diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..ba20c6e
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,30 @@
+name: Test
+
+on:
+  pull_request:
+    branches:
+      - master
+      - main
+  push:
+    branches:
+      - master
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Nix
+        uses: cachix/install-nix-action@v27
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: Build project
+        run: nix build
+
+      - name: Run tests
+        run: nix flake check
diff --git a/Changelog.md b/Changelog.md
index 04be8d4..fff3bd8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,8 @@
 # ReScript Linter Changelog
 
+### 2026-01-27 - v0.4.0
+* Updated the AST to ReScript v12.1.0
+
 ### 2025-09-30 - v0.3.3
 * Adds support for JSON output
   * To enable JSON output, use the `--json` flag when running the linter
diff --git a/jscomp/common/bs_loc.ml b/compiler/common/bs_loc.ml
similarity index 88%
rename from jscomp/common/bs_loc.ml
rename to compiler/common/bs_loc.ml
index b7e2071..ff7df2b 100644
--- a/jscomp/common/bs_loc.ml
+++ b/compiler/common/bs_loc.ml
@@ -23,9 +23,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 type t = Location.t = {
-  loc_start : Lexing.position;
-  loc_end : Lexing.position;
-  loc_ghost : bool;
+  loc_start: Lexing.position;
+  loc_end: Lexing.position;
+  loc_ghost: bool;
 }
 
 let is_ghost x = x.loc_ghost
@@ -35,7 +35,7 @@ let merge (l : t) (r : t) =
   else if is_ghost r then l
   else
     match (l, r) with
-    | { loc_start; _ }, { loc_end; _ } (* TODO: improve*) ->
-        { loc_start; loc_end; loc_ghost = false }
+    | {loc_start; _}, {loc_end; _} (* TODO: improve*) ->
+      {loc_start; loc_end; loc_ghost = false}
 
 (* let none = Location.none *)
diff --git a/jscomp/common/bs_loc.mli b/compiler/common/bs_loc.mli
similarity index 94%
rename from jscomp/common/bs_loc.mli
rename to compiler/common/bs_loc.mli
index a642957..de22c2d 100644
--- a/jscomp/common/bs_loc.mli
+++ b/compiler/common/bs_loc.mli
@@ -23,9 +23,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 type t = Location.t = {
-  loc_start : Lexing.position;
-  loc_end : Lexing.position;
-  loc_ghost : bool;
+  loc_start: Lexing.position;
+  loc_end: Lexing.position;
+  loc_ghost: bool;
 }
 
 (* val is_ghost : t -> bool *)
diff --git a/jscomp/common/bs_version.ml b/compiler/common/bs_version.ml
similarity index 96%
rename from jscomp/common/bs_version.ml
rename to compiler/common/bs_version.ml
index b60de7a..2f7032c 100644
--- a/jscomp/common/bs_version.ml
+++ b/compiler/common/bs_version.ml
@@ -21,6 +21,5 @@
  * 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. *)
-let version = "11.1.4"
+let version = "12.1.0"
 let header = "// Generated by ReScript, PLEASE EDIT WITH CARE"
-let package_name = ref "rescript"
diff --git a/jscomp/common/bs_version.mli b/compiler/common/bs_version.mli
similarity index 97%
rename from jscomp/common/bs_version.mli
rename to compiler/common/bs_version.mli
index 4d3721e..4ad826e 100644
--- a/jscomp/common/bs_version.mli
+++ b/compiler/common/bs_version.mli
@@ -25,5 +25,3 @@
 val version : string
 
 val header : string
-
-val package_name : string ref
diff --git a/jscomp/common/bs_warnings.ml b/compiler/common/bs_warnings.ml
similarity index 93%
rename from jscomp/common/bs_warnings.ml
rename to compiler/common/bs_warnings.ml
index 698a307..aeea997 100644
--- a/jscomp/common/bs_warnings.ml
+++ b/compiler/common/bs_warnings.ml
@@ -22,9 +22,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-let warn_missing_primitive loc txt =
-  Location.prerr_warning loc (Bs_unimplemented_primitive txt)
-
 let warn_literal_overflow loc =
   Location.prerr_warning loc Bs_integer_literal_overflow
 
diff --git a/jscomp/common/bs_warnings.mli b/compiler/common/bs_warnings.mli
similarity index 96%
rename from jscomp/common/bs_warnings.mli
rename to compiler/common/bs_warnings.mli
index 6533581..3807bbf 100644
--- a/jscomp/common/bs_warnings.mli
+++ b/compiler/common/bs_warnings.mli
@@ -22,8 +22,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-val warn_missing_primitive : Location.t -> string -> unit
-
 val warn_literal_overflow : Location.t -> unit
 
 val error_unescaped_delimiter : Location.t -> string -> unit
diff --git a/compiler/common/dune b/compiler/common/dune
new file mode 100644
index 0000000..b6962b3
--- /dev/null
+++ b/compiler/common/dune
@@ -0,0 +1,9 @@
+(library
+ (name common)
+ (wrapped false)
+ (preprocess
+  (action
+   (run %{bin:cppo} %{env:CPPO_FLAGS=} %{input-file})))
+ (flags
+  (:standard -w +a-9-40-42))
+ (libraries syntax))
diff --git a/jscomp/common/ext_log.ml b/compiler/common/ext_log.ml
similarity index 94%
rename from jscomp/common/ext_log.ml
rename to compiler/common/ext_log.ml
index ab58b99..5f88492 100644
--- a/jscomp/common/ext_log.ml
+++ b/compiler/common/ext_log.ml
@@ -30,7 +30,7 @@ let dwarn ?(__POS__ : (string * int * int * int) option) f =
     match __POS__ with
     | None -> Format.fprintf Format.err_formatter ("WARN: " ^^ f ^^ "@.")
     | Some (file, line, _, _) ->
-        Format.fprintf Format.err_formatter
-          ("WARN: %s,%d " ^^ f ^^ "@.")
-          file line
+      Format.fprintf Format.err_formatter
+        ("WARN: %s,%d " ^^ f ^^ "@.")
+        file line
   else Format.ifprintf Format.err_formatter ("WARN: " ^^ f ^^ "@.")
diff --git a/jscomp/common/ext_log.mli b/compiler/common/ext_log.mli
similarity index 100%
rename from jscomp/common/ext_log.mli
rename to compiler/common/ext_log.mli
diff --git a/jscomp/common/js_config.ml b/compiler/common/js_config.ml
similarity index 77%
rename from jscomp/common/js_config.ml
rename to compiler/common/js_config.ml
index 7602c68..24aa8b6 100644
--- a/jscomp/common/js_config.ml
+++ b/compiler/common/js_config.ml
@@ -24,9 +24,8 @@
 
 (** Browser is not set via command line only for internal use *)
 
-type jsx_version = Jsx_v3 | Jsx_v4
-type jsx_module = React | Generic of {moduleName: string}
-type jsx_mode = Classic | Automatic
+type jsx_version = Jsx_v4
+type jsx_module = React | Generic of {module_name: string}
 
 let no_version_header = ref false
 
@@ -51,41 +50,25 @@ let force_cmi = ref false
 let force_cmj = ref false
 let jsx_version = ref None
 let jsx_module = ref React
-let jsx_mode = ref Automatic
+let jsx_preserve = ref false
 let js_stdout = ref true
 let all_module_aliases = ref false
 let no_stdlib = ref false
 let no_export = ref false
-let as_ppx = ref false
-
 let int_of_jsx_version = function
-| Jsx_v3 -> 3
-| Jsx_v4 -> 4
+  | Jsx_v4 -> 4
 
 let string_of_jsx_module = function
-| React -> "react"
-| Generic {moduleName} -> moduleName
-
-let string_of_jsx_mode = function
-| Classic -> "classic"
-| Automatic -> "automatic"
+  | React -> "react"
+  | Generic {module_name} -> module_name
 
 let jsx_version_of_int = function
-| 3 -> Some Jsx_v3
-| 4 -> Some Jsx_v4
-| _ -> None
+  | 4 -> Some Jsx_v4
+  | _ -> None
 
 let jsx_module_of_string = function
-| "react" -> React
-| moduleName -> Generic {moduleName}
-
-let jsx_mode_of_string = function
-| "classic" -> Classic
-| "automatic" -> Automatic
-| _ -> Classic
+  | "react" -> React
+  | module_name -> Generic {module_name}
 
-(* option to config `@rescript/std`*)
-let customize_runtime : string option ref = ref None
 let as_pp = ref false
 let self_stack : string Stack.t = Stack.create ()
-let modules = ref false
\ No newline at end of file
diff --git a/jscomp/common/js_config.mli b/compiler/common/js_config.mli
similarity index 88%
rename from jscomp/common/js_config.mli
rename to compiler/common/js_config.mli
index fd9df57..d6f4bd8 100644
--- a/jscomp/common/js_config.mli
+++ b/compiler/common/js_config.mli
@@ -22,9 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-type jsx_version = Jsx_v3 | Jsx_v4
-type jsx_module = React | Generic of {moduleName: string}
-type jsx_mode = Classic | Automatic
+type jsx_version = Jsx_v4
+type jsx_module = React | Generic of {module_name: string}
 
 (* val get_packages_info :
    unit -> Js_packages_info.t *)
@@ -79,9 +78,9 @@ val force_cmj : bool ref
 
 val jsx_version : jsx_version option ref
 
-val jsx_module: jsx_module ref
+val jsx_module : jsx_module ref
 
-val jsx_mode: jsx_mode ref
+val jsx_preserve : bool ref
 
 val js_stdout : bool ref
 
@@ -91,24 +90,14 @@ val no_stdlib : bool ref
 
 val no_export : bool ref
 
-val as_ppx : bool ref
-
 val int_of_jsx_version : jsx_version -> int
 
 val string_of_jsx_module : jsx_module -> string
 
-val string_of_jsx_mode : jsx_mode -> string
-
 val jsx_version_of_int : int -> jsx_version option
 
 val jsx_module_of_string : string -> jsx_module
 
-val jsx_mode_of_string : string -> jsx_mode
-
-val customize_runtime : string option ref
-
 val as_pp : bool ref
 
 val self_stack : string Stack.t
-
-val modules : bool ref
diff --git a/compiler/common/ml_binary.ml b/compiler/common/ml_binary.ml
new file mode 100644
index 0000000..ae7e441
--- /dev/null
+++ b/compiler/common/ml_binary.ml
@@ -0,0 +1,57 @@
+(* 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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 _ kind = Ml : Parsetree.structure kind | Mli : Parsetree.signature kind
+
+type ast0 = Impl of Parsetree0.structure | Intf of Parsetree0.signature
+
+let magic_of_ast0 : ast0 -> string = function
+  | Impl _ -> Config.ast_impl_magic_number
+  | Intf _ -> Config.ast_intf_magic_number
+
+let to_ast0 : type a. a kind -> a -> ast0 =
+ fun kind ast ->
+  match kind with
+  | Ml ->
+    Impl
+      (Ast_mapper_to0.default_mapper.structure Ast_mapper_to0.default_mapper ast)
+  | Mli ->
+    Intf
+      (Ast_mapper_to0.default_mapper.signature Ast_mapper_to0.default_mapper ast)
+
+let ast0_to_structure : ast0 -> Parsetree.structure = function
+  | Impl str0 ->
+    Ast_mapper_from0.default_mapper.structure Ast_mapper_from0.default_mapper
+      str0
+  | Intf _ -> assert false
+
+let ast0_to_signature : ast0 -> Parsetree.signature = function
+  | Impl _ -> assert false
+  | Intf sig0 ->
+    Ast_mapper_from0.default_mapper.signature Ast_mapper_from0.default_mapper
+      sig0
+
+let magic_of_kind : type a. a kind -> string = function
+  | Ml -> Config.ast_impl_magic_number
+  | Mli -> Config.ast_intf_magic_number
diff --git a/jscomp/common/ml_binary.mli b/compiler/common/ml_binary.mli
similarity index 85%
rename from jscomp/common/ml_binary.mli
rename to compiler/common/ml_binary.mli
index fd40316..7749e8c 100644
--- a/jscomp/common/ml_binary.mli
+++ b/compiler/common/ml_binary.mli
@@ -27,8 +27,10 @@
 *)
 type _ kind = Ml : Parsetree.structure kind | Mli : Parsetree.signature kind
 
-val read_ast : 'a kind -> in_channel -> 'a
-
-val write_ast : 'a kind -> string -> 'a -> out_channel -> unit
+type ast0 = Impl of Parsetree0.structure | Intf of Parsetree0.signature
 
 val magic_of_kind : 'a kind -> string
+val magic_of_ast0 : ast0 -> string
+val to_ast0 : 'a kind -> 'a -> ast0
+val ast0_to_structure : ast0 -> Parsetree.structure
+val ast0_to_signature : ast0 -> Parsetree.signature
diff --git a/compiler/common/pattern_printer.ml b/compiler/common/pattern_printer.ml
new file mode 100644
index 0000000..603f980
--- /dev/null
+++ b/compiler/common/pattern_printer.ml
@@ -0,0 +1,108 @@
+open Types
+open Typedtree
+open Parsetree
+open Asttypes
+
+let mkpat desc = Ast_helper.Pat.mk desc
+
+let[@warning "-4"] is_generated_optional_constructor
+    (lid : Longident.t Location.loc) =
+  match lid.txt with
+  | Longident.Lident name ->
+    String.length name >= 2 && name.[0] = '#' && name.[1] = '$'
+  | _ -> false
+
+(* Optional fields become “option-of-option” internally: the outer layer is
+   added by the compiler to track presence, while the inner layer is the user’s
+   payload. When printing counterexamples we only need to know which of these
+   situations we saw. *)
+type optional_field_state =
+  | Field_normal (* Regular user patterns: `{b: Some(_)}`, `{b}`, `_`, etc. *)
+  | Field_missing
+    (* The outer constructor was the synthetic `#$None…`, i.e. the field was
+         not provided at all. This is what should print as `{b: ?None}`. *)
+  | Field_present_none
+(* The outer constructor was the synthetic `#$Some…` but its payload was `None`.
+         This means the optional field exists with value `None`, so we should
+         print `{b: None}`. *)
+
+(* Optional record fields are lowered into an extra option layer; we re-infer
+   whether we’re looking at a missing field vs. a present-but-`None` value so
+   we can render useful surface syntax in error messages. *)
+let[@warning "-4"] rec classify_optional_field_state pat =
+  match pat.pat_desc with
+  | Tpat_construct (lid, cstr, [])
+    when is_generated_optional_constructor lid && cstr.cstr_name = "None" ->
+    Field_missing
+  | Tpat_construct (lid, cstr, [inner])
+    when is_generated_optional_constructor lid && cstr.cstr_name = "Some" -> (
+    match classify_optional_field_state inner with
+    | Field_missing | Field_present_none -> Field_present_none
+    | Field_normal -> Field_normal)
+  | _ -> Field_normal
+
+let none_pattern =
+  mkpat (Ppat_construct (mknoloc (Longident.Lident "None"), None))
+
+let[@warning "-4"] strip_synthetic_some pat =
+  match pat.pat_desc with
+  | Tpat_construct (lid, cstr, [inner])
+    when is_generated_optional_constructor lid && cstr.cstr_name = "Some" ->
+    inner
+  | _ -> pat
+
+let untype typed =
+  let rec loop pat =
+    match pat.pat_desc with
+    | Tpat_or (p1, {pat_desc = Tpat_or (p2, p3, r_i)}, r_o) ->
+      (* Turn A | (B | C) into (A | B) | C for pretty printing without parens *)
+      let new_inner = {pat with pat_desc = Tpat_or (p1, p2, r_i)} in
+      let new_outer = {pat with pat_desc = Tpat_or (new_inner, p3, r_o)} in
+      loop new_outer
+    | Tpat_or (pa, pb, _) -> mkpat (Ppat_or (loop pa, loop pb))
+    | Tpat_any | Tpat_var _ -> mkpat Ppat_any
+    | Tpat_constant c -> mkpat (Ppat_constant (Untypeast.constant c))
+    | Tpat_alias (p, _, _) -> loop p
+    | Tpat_tuple lst -> mkpat (Ppat_tuple (List.map loop lst))
+    | Tpat_construct (cstr_lid, cstr, lst) ->
+      let lid = {cstr_lid with txt = Longident.Lident cstr.cstr_name} in
+      let arg =
+        match List.map loop lst with
+        | [] -> None
+        | [p] -> Some p
+        | lst -> Some (mkpat (Ppat_tuple lst))
+      in
+      mkpat (Ppat_construct (lid, arg))
+    | Tpat_variant (label, p_opt, _row_desc) ->
+      let arg = Option.map loop p_opt in
+      mkpat (Ppat_variant (label, arg))
+    | Tpat_record (subpatterns, closed_flag) ->
+      let fields, saw_optional_rewrite =
+        List.fold_right
+          (fun (_, lbl, p, opt) (fields, saw_optional_rewrite) ->
+            let state =
+              if lbl.lbl_optional then classify_optional_field_state p
+              else Field_normal
+            in
+            let opt, par_pat, rewrote_optional =
+              match state with
+              | Field_missing -> (true, none_pattern, true)
+              | Field_present_none -> (opt, loop (strip_synthetic_some p), true)
+              | Field_normal -> (opt, loop p, false)
+            in
+            let field =
+              {lid = mknoloc (Longident.Lident lbl.lbl_name); x = par_pat; opt}
+            in
+            (field :: fields, saw_optional_rewrite || rewrote_optional))
+          subpatterns ([], false)
+      in
+      let closed_flag = if saw_optional_rewrite then Closed else closed_flag in
+      mkpat (Ppat_record (fields, closed_flag))
+    | Tpat_array lst -> mkpat (Ppat_array (List.map loop lst))
+  in
+  loop typed
+
+let print_pattern typed =
+  let pat = untype typed in
+  let doc = Res_printer.print_pattern pat Res_comments_table.empty in
+  Res_doc.to_string ~width:80 doc
diff --git a/jscomp/common/pattern_printer.mli b/compiler/common/pattern_printer.mli
similarity index 100%
rename from jscomp/common/pattern_printer.mli
rename to compiler/common/pattern_printer.mli
diff --git a/compiler/dune b/compiler/dune
new file mode 100644
index 0000000..9739601
--- /dev/null
+++ b/compiler/dune
@@ -0,0 +1,31 @@
+(dirs
+ common
+ flow_parser
+ ext
+ ml
+ syntax)
+
+(library
+  (name compiler)
+  (wrapped false)
+  (libraries ext ml syntax))
+
+(env
+ (dev
+  (env-vars
+   (CPPO_FLAGS -U=RELEASE)))
+ (release
+  (env-vars
+   (CPPO_FLAGS -D=RELEASE))
+  (ocamlopt_flags
+   (:standard -O3 -unbox-closures)))
+ (static
+  (env-vars
+   (CPPO_FLAGS -D=RELEASE))
+  (ocamlopt_flags
+   (:standard -O3 -unbox-closures)))
+ (browser
+  (env-vars
+   (CPPO_FLAGS -D=BROWSER))
+  (ocamlopt_flags
+   (:standard -O3 -unbox-closures))))
diff --git a/jscomp/ext/README.md b/compiler/ext/README.md
similarity index 100%
rename from jscomp/ext/README.md
rename to compiler/ext/README.md
diff --git a/jscomp/ext/bs_hash_stubs.ml b/compiler/ext/bs_hash_stubs.ml
similarity index 100%
rename from jscomp/ext/bs_hash_stubs.ml
rename to compiler/ext/bs_hash_stubs.ml
diff --git a/jscomp/ext/bsb_db.ml b/compiler/ext/bsb_db.ml
similarity index 88%
rename from jscomp/ext/bsb_db.ml
rename to compiler/ext/bsb_db.ml
index 001824a..b08e694 100644
--- a/jscomp/ext/bsb_db.ml
+++ b/compiler/ext/bsb_db.ml
@@ -31,19 +31,16 @@ type info =
   | Impl
   | Impl_intf
 
-type syntax_kind = Ml | Res
-
 type module_info = {
-  mutable info : info;
-  dir : string;
-  syntax_kind : syntax_kind;
-  case : bool;
-  name_sans_extension : string;
+  mutable info: info;
+  dir: string;
+  case: bool;
+  name_sans_extension: string;
 }
 
 type map = module_info Map_string.t
 
-type 'a cat = { mutable lib : 'a; mutable dev : 'a }
+type 'a cat = {mutable lib: 'a; mutable dev: 'a}
 
 type t = map cat
 (** indexed by the group *)
diff --git a/jscomp/ext/bsb_db.mli b/compiler/ext/bsb_db.mli
similarity index 83%
rename from jscomp/ext/bsb_db.mli
rename to compiler/ext/bsb_db.mli
index 31df8b6..3b54f9f 100644
--- a/jscomp/ext/bsb_db.mli
+++ b/compiler/ext/bsb_db.mli
@@ -37,23 +37,16 @@ type info =
   | Impl
   | Impl_intf
 
-type syntax_kind = Ml | Res
-
 type module_info = {
-  mutable info : info;
-  dir : string;
-  syntax_kind : syntax_kind;
-  (* This is actually not stored in bsbuild meta info
-     since creating .d file only emit .cmj/.cmi dependencies, so it does not
-     need know which syntax it is written
-  *)
-  case : bool;
-  name_sans_extension : string;
+  mutable info: info;
+  dir: string;
+  case: bool;
+  name_sans_extension: string;
 }
 
 type map = module_info Map_string.t
 
-type 'a cat = { mutable lib : 'a; mutable dev : 'a }
+type 'a cat = {mutable lib: 'a; mutable dev: 'a}
 
 type t = map cat
 
diff --git a/compiler/ext/bsc_args.ml b/compiler/ext/bsc_args.ml
new file mode 100644
index 0000000..1f907eb
--- /dev/null
+++ b/compiler/ext/bsc_args.ml
@@ -0,0 +1,131 @@
+(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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 anon_fun = rev_args:string list -> unit
+
+type string_action =
+  | String_call of (string -> unit)
+  | String_set of string ref
+  | String_optional_set of string option ref
+  | String_list_add of string list ref
+
+type unit_action =
+  | Unit_call of (unit -> unit)
+  | Unit_lazy of unit lazy_t
+  | Unit_set of bool ref
+  | Unit_clear of bool ref
+
+type spec = Unit_dummy | Unit of unit_action | String of string_action
+
+exception Bad = Arg.Bad
+
+let bad_arg s = raise_notrace (Bad s)
+
+type error = Unknown of string | Missing of string
+
+type t = spec Ext_spec.t
+
+let ( +> ) = Ext_buffer.add_string
+
+let usage_b (buf : Ext_buffer.t) ~usage (speclist : t) =
+  buf +> usage;
+  buf +> "\nOptions:\n";
+  let max_col = ref 0 in
+  Ext_array.iter speclist (fun (key, _, _) ->
+      if String.length key > !max_col then max_col := String.length key);
+  Ext_array.iter speclist (fun (key, _, doc) ->
+      if not (Ext_string.starts_with doc "*internal*") then (
+        buf +> "  ";
+        buf +> key;
+        buf +> String.make (!max_col - String.length key + 2) ' ';
+        let cur = ref 0 in
+        let doc_length = String.length doc in
+        while !cur < doc_length do
+          match String.index_from_opt doc !cur '\n' with
+          | None ->
+            if !cur <> 0 then (
+              buf +> "\n";
+              buf +> String.make (!max_col + 4) ' ');
+            buf +> String.sub doc !cur (String.length doc - !cur);
+            cur := doc_length
+          | Some new_line_pos ->
+            if !cur <> 0 then (
+              buf +> "\n";
+              buf +> String.make (!max_col + 4) ' ');
+            buf +> String.sub doc !cur (new_line_pos - !cur);
+            cur := new_line_pos + 1
+        done;
+        buf +> "\n"))
+
+let stop_raise ~usage ~(error : error) (speclist : t) =
+  let b = Ext_buffer.create 200 in
+  (match error with
+  | Unknown ("-help" | "--help" | "-h") ->
+    usage_b b ~usage speclist;
+    Ext_buffer.output_buffer stdout b;
+    exit 0
+  | Unknown s ->
+    b +> "Unknown option \"";
+    b +> s;
+    b +> "\".\n"
+  | Missing s ->
+    b +> "Option \"";
+    b +> s;
+    b +> "\" needs an argument.\n");
+  usage_b b ~usage speclist;
+  bad_arg (Ext_buffer.contents b)
+
+let parse_exn ~usage ~argv ?(start = 1) ?(finish = Array.length argv)
+    (speclist : t) (anonfun : rev_args:string list -> unit) =
+  let current = ref start in
+  let rev_list = ref [] in
+  while !current < finish do
+    let s = argv.(!current) in
+    incr current;
+    if s <> "" && s.[0] = '-' then
+      match Ext_spec.assoc3 speclist s with
+      | Some action -> (
+        match action with
+        | Unit_dummy -> ()
+        | Unit r -> (
+          match r with
+          | Unit_set r -> r := true
+          | Unit_clear r -> r := false
+          | Unit_call f -> f ()
+          | Unit_lazy f -> Lazy.force f)
+        | String f -> (
+          if !current >= finish then
+            stop_raise ~usage ~error:(Missing s) speclist
+          else
+            let arg = argv.(!current) in
+            incr current;
+            match f with
+            | String_call f -> f arg
+            | String_set u -> u := arg
+            | String_optional_set s -> s := Some arg
+            | String_list_add s -> s := arg :: !s))
+      | None -> stop_raise ~usage ~error:(Unknown s) speclist
+    else rev_list := s :: !rev_list
+  done;
+  anonfun ~rev_args:!rev_list
diff --git a/jscomp/ext/bsc_args.mli b/compiler/ext/bsc_args.mli
similarity index 100%
rename from jscomp/ext/bsc_args.mli
rename to compiler/ext/bsc_args.mli
diff --git a/compiler/ext/bsc_warnings.ml b/compiler/ext/bsc_warnings.ml
new file mode 100644
index 0000000..83ec412
--- /dev/null
+++ b/compiler/ext/bsc_warnings.ml
@@ -0,0 +1,52 @@
+(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript 
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+
+ *
+ * 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. *)
+
+(*
+  The purpose of the default warning set is to make it strict while not annoying the user too much.
+
+  - 4 Fragile pattern matching: matching that will remain complete even if additional constructors are added to one of the variant types matched.
+  We turn it off since the following is a common pattern:
+   {[
+     switch x { | A => .. | _ => false }
+   ]}
+
+   - 9 Missing fields in a record pattern.
+   Only in some special cases that we need all fields being listed
+
+   - 41 Ambiguous constructor or label name.
+     It is turned off since it prevents such cases below:
+   {[
+     type a = A | B
+     type b = A | B | C
+   ]}
+
+   - 50 Unexpected documentation comment.
+
+   - 102 Bs_polymorphic_comparison.
+*)
+(* If you change this, don't forget to adapt docs/docson/build-schema.json as well. *)
+let defaults_w = "+a-4-9-20-41-50-102"
+
+let defaults_warn_error = "-a+5+6+101+109"
+(*TODO: add +10*)
diff --git a/compiler/ext/config.ml b/compiler/ext/config.ml
new file mode 100644
index 0000000..d9f7bb6
--- /dev/null
+++ b/compiler/ext/config.ml
@@ -0,0 +1,9 @@
+let cmi_magic_number = "Caml1999I022"
+
+and ast_impl_magic_number = "Caml1999M022"
+
+and ast_intf_magic_number = "Caml1999N022"
+
+and cmt_magic_number = "Caml1999T022"
+
+let load_path = ref ([] : string list)
diff --git a/jscomp/ext/config.mli b/compiler/ext/config.mli
similarity index 77%
rename from jscomp/ext/config.mli
rename to compiler/ext/config.mli
index d409fe0..fe13a03 100644
--- a/jscomp/ext/config.mli
+++ b/compiler/ext/config.mli
@@ -15,23 +15,8 @@
 
 (* System configuration *)
 
-val version : string
-(* The current version number of the system *)
-
-val standard_library : string
-(* The directory containing the standard libraries *)
-
-val syntax_kind : [ `ml | `rescript ] ref
-
-val bs_only : bool ref
-
-val unsafe_empty_array : bool ref
-
-val load_path : string list ref
 (* Directories in the search path for .cmi and .cmo files *)
-
-val interface_suffix : string ref
-(* Suffix for interface file names *)
+val load_path : string list ref
 
 val cmi_magic_number : string
 
@@ -44,8 +29,3 @@ val ast_impl_magic_number : string
 (* Magic number for file holding an implementation syntax tree *)
 val cmt_magic_number : string
 (* Magic number for compiled interface files *)
-
-val print_config : out_channel -> unit
-
-type uncurried = Legacy | Uncurried | Swap
-val uncurried : uncurried ref
\ No newline at end of file
diff --git a/compiler/ext/dune b/compiler/ext/dune
new file mode 100644
index 0000000..0896ec2
--- /dev/null
+++ b/compiler/ext/dune
@@ -0,0 +1,126 @@
+(library
+ (name ext)
+ (wrapped false)
+ (preprocess
+  (action
+   (run
+    %{bin:cppo}
+    -V
+    OCAML:%{ocaml_version}
+    %{env:CPPO_FLAGS=}
+    %{input-file})))
+ (flags
+  (:standard -w +a-4-42-40-9-48-70))
+ (foreign_stubs
+  (language c)
+  (names ext_basic_hash_stubs)))
+
+(ocamllex ext_json_parse)
+
+(rule
+ (targets hash_set_string.ml)
+ (deps hash_set.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_STRING %{deps} -o %{targets})))
+
+(rule
+ (targets hash_set_int.ml)
+ (deps hash_set.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_INT %{deps} -o %{targets})))
+
+(rule
+ (targets hash_set_ident.ml)
+ (deps hash_set.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_IDENT %{deps} -o %{targets})))
+
+(rule
+ (targets hash_set.ml)
+ (deps hash_set.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_FUNCTOR %{deps} -o %{targets})))
+
+(rule
+ (targets hash_set_poly.ml)
+ (deps hash_set.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_POLY %{deps} -o %{targets})))
+
+(rule
+ (targets vec_int.ml)
+ (deps vec.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_INT %{deps} -o %{targets})))
+
+(rule
+ (targets vec.ml)
+ (deps vec.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_FUNCTOR %{deps} -o %{targets})))
+
+(rule
+ (targets set_string.ml)
+ (deps set.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_STRING %{deps} -o %{targets})))
+
+(rule
+ (targets set_int.ml)
+ (deps set.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_INT %{deps} -o %{targets})))
+
+(rule
+ (targets set_ident.ml)
+ (deps set.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_IDENT %{deps} -o %{targets})))
+
+(rule
+ (targets map_string.ml)
+ (deps map.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_STRING %{deps} -o %{targets})))
+
+(rule
+ (targets map_int.ml)
+ (deps map.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_INT %{deps} -o %{targets})))
+
+(rule
+ (targets map_ident.ml)
+ (deps map.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_IDENT %{deps} -o %{targets})))
+
+(rule
+ (targets ordered_hash_map_local_ident.ml)
+ (deps ordered_hash_map.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_LOCAL_IDENT %{deps} -o %{targets})))
+
+(rule
+ (targets hash_string.ml)
+ (deps hash.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_STRING %{deps} -o %{targets})))
+
+(rule
+ (targets hash_int.ml)
+ (deps hash.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_INT %{deps} -o %{targets})))
+
+(rule
+ (targets hash_ident.ml)
+ (deps hash.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_IDENT %{deps} -o %{targets})))
+
+(rule
+ (targets hash.ml)
+ (deps hash.cppo.ml)
+ (action
+  (run %{bin:cppo} -D TYPE_FUNCTOR %{deps} -o %{targets})))
diff --git a/jscomp/ext/encoding.md b/compiler/ext/encoding.md
similarity index 100%
rename from jscomp/ext/encoding.md
rename to compiler/ext/encoding.md
diff --git a/jscomp/ext/ext_array.ml b/compiler/ext/ext_array.ml
similarity index 76%
rename from jscomp/ext/ext_array.ml
rename to compiler/ext/ext_array.ml
index 0f3f1a7..9a416e5 100644
--- a/jscomp/ext/ext_array.ml
+++ b/compiler/ext/ext_array.ml
@@ -50,15 +50,15 @@ let reverse a =
 let reverse_of_list = function
   | [] -> [||]
   | hd :: tl ->
-      let len = List.length tl in
-      let a = Array.make (len + 1) hd in
-      let rec fill i = function
-        | [] -> a
-        | hd :: tl ->
-            Array.unsafe_set a i hd;
-            fill (i - 1) tl
-      in
-      fill (len - 1) tl
+    let len = List.length tl in
+    let a = Array.make (len + 1) hd in
+    let rec fill i = function
+      | [] -> a
+      | hd :: tl ->
+        Array.unsafe_set a i hd;
+        fill (i - 1) tl
+    in
+    fill (len - 1) tl
 
 let filter a f =
   let arr_len = Array.length a in
@@ -76,7 +76,21 @@ let filter_map a (f : _ -> _ option) =
     if i = arr_len then reverse_of_list acc
     else
       let v = Array.unsafe_get a i in
-      match f v with Some v -> aux (v :: acc) (i + 1) | None -> aux acc (i + 1)
+      match f v with
+      | Some v -> aux (v :: acc) (i + 1)
+      | None -> aux acc (i + 1)
+  in
+  aux [] 0
+
+let filter_mapi a (f : _ -> _ -> _ option) =
+  let arr_len = Array.length a in
+  let rec aux acc i =
+    if i = arr_len then reverse_of_list acc
+    else
+      let v = Array.unsafe_get a i in
+      match f i v with
+      | Some v -> aux (v :: acc) (i + 1)
+      | None -> aux acc (i + 1)
   in
   aux [] 0
 
@@ -101,7 +115,9 @@ let rec tolist_aux a f i res =
   if i < 0 then res
   else
     tolist_aux a f (i - 1)
-      (match f a.!(i) with Some v -> v :: res | None -> res)
+      (match f a.!(i) with
+      | Some v -> v :: res
+      | None -> res)
 
 let to_list_map a f = tolist_aux a f (Array.length a - 1) []
 
@@ -110,50 +126,50 @@ let to_list_map_acc a acc f = tolist_aux a f (Array.length a - 1) acc
 let of_list_map a f =
   match a with
   | [] -> [||]
-  | [ a0 ] ->
-      let b0 = f a0 in
-      [| b0 |]
-  | [ a0; a1 ] ->
-      let b0 = f a0 in
-      let b1 = f a1 in
-      [| b0; b1 |]
-  | [ a0; a1; a2 ] ->
-      let b0 = f a0 in
-      let b1 = f a1 in
-      let b2 = f a2 in
-      [| b0; b1; b2 |]
-  | [ a0; a1; a2; a3 ] ->
-      let b0 = f a0 in
-      let b1 = f a1 in
-      let b2 = f a2 in
-      let b3 = f a3 in
-      [| b0; b1; b2; b3 |]
-  | [ a0; a1; a2; a3; a4 ] ->
-      let b0 = f a0 in
-      let b1 = f a1 in
-      let b2 = f a2 in
-      let b3 = f a3 in
-      let b4 = f a4 in
-      [| b0; b1; b2; b3; b4 |]
+  | [a0] ->
+    let b0 = f a0 in
+    [|b0|]
+  | [a0; a1] ->
+    let b0 = f a0 in
+    let b1 = f a1 in
+    [|b0; b1|]
+  | [a0; a1; a2] ->
+    let b0 = f a0 in
+    let b1 = f a1 in
+    let b2 = f a2 in
+    [|b0; b1; b2|]
+  | [a0; a1; a2; a3] ->
+    let b0 = f a0 in
+    let b1 = f a1 in
+    let b2 = f a2 in
+    let b3 = f a3 in
+    [|b0; b1; b2; b3|]
+  | [a0; a1; a2; a3; a4] ->
+    let b0 = f a0 in
+    let b1 = f a1 in
+    let b2 = f a2 in
+    let b3 = f a3 in
+    let b4 = f a4 in
+    [|b0; b1; b2; b3; b4|]
   | a0 :: a1 :: a2 :: a3 :: a4 :: tl ->
-      let b0 = f a0 in
-      let b1 = f a1 in
-      let b2 = f a2 in
-      let b3 = f a3 in
-      let b4 = f a4 in
-      let len = List.length tl + 5 in
-      let arr = Array.make len b0 in
-      Array.unsafe_set arr 1 b1;
-      Array.unsafe_set arr 2 b2;
-      Array.unsafe_set arr 3 b3;
-      Array.unsafe_set arr 4 b4;
-      let rec fill i = function
-        | [] -> arr
-        | hd :: tl ->
-            Array.unsafe_set arr i (f hd);
-            fill (i + 1) tl
-      in
-      fill 5 tl
+    let b0 = f a0 in
+    let b1 = f a1 in
+    let b2 = f a2 in
+    let b3 = f a3 in
+    let b4 = f a4 in
+    let len = List.length tl + 5 in
+    let arr = Array.make len b0 in
+    Array.unsafe_set arr 1 b1;
+    Array.unsafe_set arr 2 b2;
+    Array.unsafe_set arr 3 b3;
+    Array.unsafe_set arr 4 b4;
+    let rec fill i = function
+      | [] -> arr
+      | hd :: tl ->
+        Array.unsafe_set arr i (f hd);
+        fill (i + 1) tl
+    in
+    fill 5 tl
 
 (**
    {[
diff --git a/jscomp/ext/ext_array.mli b/compiler/ext/ext_array.mli
similarity index 97%
rename from jscomp/ext/ext_array.mli
rename to compiler/ext/ext_array.mli
index 6e55062..b55bd1a 100644
--- a/jscomp/ext/ext_array.mli
+++ b/compiler/ext/ext_array.mli
@@ -35,6 +35,8 @@ val filter : 'a array -> ('a -> bool) -> 'a array
 
 val filter_map : 'a array -> ('a -> 'b option) -> 'b array
 
+val filter_mapi : 'a array -> (int -> 'a -> 'b option) -> 'b array
+
 val range : int -> int -> int array
 
 val map2i : (int -> 'a -> 'b -> 'c) -> 'a array -> 'b array -> 'c array
diff --git a/jscomp/ext/ext_basic_hash_stubs.c b/compiler/ext/ext_basic_hash_stubs.c
similarity index 100%
rename from jscomp/ext/ext_basic_hash_stubs.c
rename to compiler/ext/ext_basic_hash_stubs.c
diff --git a/jscomp/ext/ext_buffer.ml b/compiler/ext/ext_buffer.ml
similarity index 98%
rename from jscomp/ext/ext_buffer.ml
rename to compiler/ext/ext_buffer.ml
index 1e478b3..5dbb839 100644
--- a/jscomp/ext/ext_buffer.ml
+++ b/compiler/ext/ext_buffer.ml
@@ -15,16 +15,12 @@
 
 (* Extensible buffers *)
 
-type t = {
-  mutable buffer : bytes;
-  mutable position : int;
-  mutable length : int;
-}
+type t = {mutable buffer: bytes; mutable position: int; mutable length: int}
 
 let create n =
   let n = if n < 1 then 1 else n in
   let s = Bytes.create n in
-  { buffer = s; position = 0; length = n }
+  {buffer = s; position = 0; length = n}
 
 let contents b = Bytes.sub_string b.buffer 0 b.position
 (* let to_bytes b = Bytes.sub b.buffer 0 b.position  *)
diff --git a/jscomp/ext/ext_buffer.mli b/compiler/ext/ext_buffer.mli
similarity index 99%
rename from jscomp/ext/ext_buffer.mli
rename to compiler/ext/ext_buffer.mli
index 38ae58e..a00115b 100644
--- a/jscomp/ext/ext_buffer.mli
+++ b/compiler/ext/ext_buffer.mli
@@ -51,7 +51,6 @@ val clear : t -> unit
 (** Empty the buffer. *)
 
 val add_char : t -> char -> unit
-  [@@inline]
 (** [add_char b c] appends the character [c] at the end of the buffer [b]. *)
 
 val add_string : t -> string -> unit
diff --git a/jscomp/ext/ext_bytes.ml b/compiler/ext/ext_bytes.ml
similarity index 99%
rename from jscomp/ext/ext_bytes.ml
rename to compiler/ext/ext_bytes.ml
index f4148eb..68808ab 100644
--- a/jscomp/ext/ext_bytes.ml
+++ b/compiler/ext/ext_bytes.ml
@@ -24,4 +24,4 @@
 
 external unsafe_blit_string : string -> int -> bytes -> int -> int -> unit
   = "caml_blit_string"
-  [@@noalloc]
+[@@noalloc]
diff --git a/jscomp/ext/ext_bytes.mli b/compiler/ext/ext_bytes.mli
similarity index 99%
rename from jscomp/ext/ext_bytes.mli
rename to compiler/ext/ext_bytes.mli
index f4148eb..68808ab 100644
--- a/jscomp/ext/ext_bytes.mli
+++ b/compiler/ext/ext_bytes.mli
@@ -24,4 +24,4 @@
 
 external unsafe_blit_string : string -> int -> bytes -> int -> int -> unit
   = "caml_blit_string"
-  [@@noalloc]
+[@@noalloc]
diff --git a/jscomp/ext/ext_char.ml b/compiler/ext/ext_char.ml
similarity index 95%
rename from jscomp/ext/ext_char.ml
rename to compiler/ext/ext_char.ml
index 9dcb31a..3754665 100644
--- a/jscomp/ext/ext_char.ml
+++ b/compiler/ext/ext_char.ml
@@ -27,7 +27,9 @@
 *)
 
 let valid_hex x =
-  match x with '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' -> true | _ -> false
+  match x with
+  | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' -> true
+  | _ -> false
 
 let is_lower_case c =
   (c >= 'a' && c <= 'z')
diff --git a/jscomp/ext/ext_char.mli b/compiler/ext/ext_char.mli
similarity index 100%
rename from jscomp/ext/ext_char.mli
rename to compiler/ext/ext_char.mli
diff --git a/jscomp/ext/ext_color.ml b/compiler/ext/ext_color.ml
similarity index 90%
rename from jscomp/ext/ext_color.ml
rename to compiler/ext/ext_color.ml
index d5ed3bb..db926ea 100644
--- a/jscomp/ext/ext_color.ml
+++ b/compiler/ext/ext_color.ml
@@ -59,11 +59,11 @@ let code_of_style = function
 (** TODO: add more styles later *)
 let style_of_tag s =
   match s with
-  | Format.String_tag "error" -> [ Bold; FG Red ]
-  | Format.String_tag "warning" -> [ Bold; FG Magenta ]
-  | Format.String_tag "info" -> [ Bold; FG Yellow ]
-  | Format.String_tag "dim" -> [ Dim ]
-  | Format.String_tag "filename" -> [ FG Cyan ]
+  | Format.String_tag "error" -> [Bold; FG Red]
+  | Format.String_tag "warning" -> [Bold; FG Magenta]
+  | Format.String_tag "info" -> [Bold; FG Yellow]
+  | Format.String_tag "dim" -> [Dim]
+  | Format.String_tag "filename" -> [FG Cyan]
   | _ -> []
 
 let ansi_of_tag s =
diff --git a/jscomp/ext/ext_color.mli b/compiler/ext/ext_color.mli
similarity index 100%
rename from jscomp/ext/ext_color.mli
rename to compiler/ext/ext_color.mli
diff --git a/jscomp/ext/ext_digest.ml b/compiler/ext/ext_digest.ml
similarity index 100%
rename from jscomp/ext/ext_digest.ml
rename to compiler/ext/ext_digest.ml
diff --git a/jscomp/ext/ext_digest.mli b/compiler/ext/ext_digest.mli
similarity index 100%
rename from jscomp/ext/ext_digest.mli
rename to compiler/ext/ext_digest.mli
diff --git a/compiler/ext/ext_file_extensions.ml b/compiler/ext/ext_file_extensions.ml
new file mode 100644
index 0000000..9004b58
--- /dev/null
+++ b/compiler/ext/ext_file_extensions.ml
@@ -0,0 +1,16 @@
+type valid_input = Res | Resi | Intf_ast | Impl_ast | Mlmap | Cmi | Unknown
+
+(** This is per-file based, 
+    when [ocamlc] [-c -o another_dir/xx.cmi] 
+    it will return (another_dir/xx)
+*)
+
+let classify_input ext =
+  match () with
+  | _ when ext = Literals.suffix_ast -> Impl_ast
+  | _ when ext = Literals.suffix_iast -> Intf_ast
+  | _ when ext = Literals.suffix_mlmap -> Mlmap
+  | _ when ext = Literals.suffix_cmi -> Cmi
+  | _ when ext = Literals.suffix_res -> Res
+  | _ when ext = Literals.suffix_resi -> Resi
+  | _ -> Unknown
diff --git a/jscomp/ext/ext_filename.ml b/compiler/ext/ext_filename.ml
similarity index 89%
rename from jscomp/ext/ext_filename.ml
rename to compiler/ext/ext_filename.ml
index a12e0cc..cb3302b 100644
--- a/jscomp/ext/ext_filename.ml
+++ b/compiler/ext/ext_filename.ml
@@ -34,7 +34,7 @@ let maybe_quote (s : string) =
     Ext_string.for_all s (function
       | '0' .. '9' | 'a' .. 'z' | 'A' .. 'Z' | '_' | '+' | '-' | '.' | '/' | '@'
         ->
-          true
+        true
       | _ -> false)
   in
   if noneed_quote then s else Filename.quote s
@@ -59,7 +59,9 @@ let get_extension_maybe name =
 let chop_all_extensions_maybe name =
   let rec search_dot i last =
     if i < 0 || is_dir_sep (String.unsafe_get name i) then
-      match last with None -> name | Some i -> String.sub name 0 i
+      match last with
+      | None -> name
+      | Some i -> String.sub name 0 i
     else if String.unsafe_get name i = '.' then search_dot (i - 1) (Some i)
     else search_dot (i - 1) last
   in
@@ -95,7 +97,7 @@ let module_name name =
   let name_len = String.length name in
   search_dot (name_len - 1) name
 
-type module_info = { module_name : string; case : bool }
+type module_info = {module_name: string; case: bool}
 
 let rec valid_module_name_aux name off len =
   if off >= len then true
@@ -103,7 +105,7 @@ let rec valid_module_name_aux name off len =
     let c = String.unsafe_get name off in
     match c with
     | 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '_' | '\'' | '.' | '[' | ']' ->
-        valid_module_name_aux name (off + 1) len
+      valid_module_name_aux name (off + 1) len
     | _ -> false
 
 type state = Invalid | Upper | Lower
@@ -115,7 +117,7 @@ let valid_module_name name len =
     match c with
     | 'A' .. 'Z' -> if valid_module_name_aux name 1 len then Upper else Invalid
     | 'a' .. 'z' | '0' .. '9' | '_' | '[' | ']' ->
-        if valid_module_name_aux name 1 len then Lower else Invalid
+      if valid_module_name_aux name 1 len then Lower else Invalid
     | _ -> Invalid
 
 let as_module ~basename =
@@ -124,17 +126,17 @@ let as_module ~basename =
       (* Input e.g, [a_b] *)
       match valid_module_name name name_len with
       | Invalid -> None
-      | Upper -> Some { module_name = name; case = true }
+      | Upper -> Some {module_name = name; case = true}
       | Lower ->
-          Some { module_name = Ext_string.capitalize_ascii name; case = false }
+        Some {module_name = Ext_string.capitalize_ascii name; case = false}
     else if String.unsafe_get name i = '.' then
       (*Input e.g, [A_b] *)
       match valid_module_name name i with
       | Invalid -> None
       | Upper ->
-          Some { module_name = Ext_string.capitalize_sub name i; case = true }
+        Some {module_name = Ext_string.capitalize_sub name i; case = true}
       | Lower ->
-          Some { module_name = Ext_string.capitalize_sub name i; case = false }
+        Some {module_name = Ext_string.capitalize_sub name i; case = false}
     else search_dot (i - 1) name name_len
   in
   let name_len = String.length basename in
diff --git a/jscomp/ext/ext_filename.mli b/compiler/ext/ext_filename.mli
similarity index 97%
rename from jscomp/ext/ext_filename.mli
rename to compiler/ext/ext_filename.mli
index e95c3f2..e111ee2 100644
--- a/jscomp/ext/ext_filename.mli
+++ b/compiler/ext/ext_filename.mli
@@ -47,6 +47,6 @@ val chop_all_extensions_maybe : string -> string
 (* OCaml specific abstraction*)
 val module_name : string -> string
 
-type module_info = { module_name : string; case : bool }
+type module_info = {module_name: string; case: bool}
 
 val as_module : basename:string -> module_info option
diff --git a/jscomp/ext/ext_fmt.ml b/compiler/ext/ext_fmt.ml
similarity index 100%
rename from jscomp/ext/ext_fmt.ml
rename to compiler/ext/ext_fmt.ml
diff --git a/compiler/ext/ext_ident.ml b/compiler/ext/ext_ident.ml
new file mode 100644
index 0000000..8a7910c
--- /dev/null
+++ b/compiler/ext/ext_ident.ml
@@ -0,0 +1,183 @@
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ * 2017 - Hongbo Zhang, Authors of ReScript
+ * 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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. *)
+
+let js_flag = 0b1_000 (* check with ocaml compiler *)
+
+(* let js_module_flag = 0b10_000 (\* javascript external modules *\) *)
+(* TODO:
+    check name conflicts with javascript conventions
+   {[
+     Ext_ident.convert "^";;
+     - : string = "$caret"
+   ]}
+*)
+let js_object_flag = 0b100_000 (* javascript object flags *)
+
+let is_js (i : Ident.t) = i.flags land js_flag <> 0
+
+let is_js_or_global (i : Ident.t) = i.flags land (8 lor 1) <> 0
+
+let is_js_object (i : Ident.t) = i.flags land js_object_flag <> 0
+
+let make_js_object (i : Ident.t) = i.flags <- i.flags lor js_object_flag
+
+(* It's a js function hard coded by js api, so when printing,
+   it should preserve the name
+*)
+let create_js (name : string) : Ident.t = {name; flags = js_flag; stamp = 0}
+
+let create = Ident.create
+
+(* FIXME: no need for `$' operator *)
+let create_tmp ?(name = Literals.tmp) () = create name
+
+let js_module_table : Ident.t Hash_string.t = Hash_string.create 31
+
+(* This is for a js exeternal module, we can change it when printing
+   for example
+   {[
+     var React$1 = require('react');
+     React$1.render(..)
+   ]}
+
+   Given a name, if duplicated, they should  have the same id
+*)
+(* let create_js_module (name : string) : Ident.t =
+    let name =
+     String.concat "" @@ Ext_list.map
+     (Ext_string.split name '-')  Ext_string.capitalize_ascii in
+    (* TODO: if we do such transformation, we should avoid       collision for example:
+       react-dom
+       react--dom
+       check collision later
+   *)
+    match Hash_string.find_exn js_module_table name  with
+    | exception Not_found ->
+     let ans = Ident.create name in
+     (* let ans = { v with flags = js_module_flag} in  *)
+     Hash_string.add js_module_table name ans;
+     ans
+    | v -> (* v *) Ident.rename v
+*)
+
+let[@inline] convert ?(op = false) (c : char) : string =
+  match c with
+  | '*' -> "$star"
+  | '\'' -> "$p"
+  | '!' -> "$bang"
+  | '>' -> "$great"
+  | '<' -> "$less"
+  | '=' -> "$eq"
+  | '+' -> "$plus"
+  | '-' -> if op then "$neg" else "$"
+  | '@' -> "$at"
+  | '^' -> "$caret"
+  | '/' -> "$slash"
+  | '|' -> "$pipe"
+  | '.' -> "$dot"
+  | '%' -> "$percent"
+  | '~' -> "$tilde"
+  | '#' -> "$hash"
+  | ':' -> "$colon"
+  | '?' -> "$question"
+  | '&' -> "$amp"
+  | '(' -> "$lpar"
+  | ')' -> "$rpar"
+  | '{' -> "$lbrace"
+  | '}' -> "$lbrace"
+  | '[' -> "$lbrack"
+  | ']' -> "$rbrack"
+  | _ -> "$unknown"
+let[@inline] no_escape (c : char) =
+  match c with
+  | 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '$' -> true
+  | _ -> false
+
+let is_uident name =
+  let len = String.length name in
+  if len > 0 then
+    match name.[0] with
+    | 'A' .. 'Z' -> true
+    | _ -> false
+  else false
+
+let is_uppercase_exotic name =
+  let len = String.length name in
+  len >= 3 && name.[0] = '\\' && name.[1] = '\"' && name.[len - 1] = '\"'
+
+let unwrap_uppercase_exotic name =
+  if is_uppercase_exotic name then
+    let len = String.length name in
+    String.sub name 2 (len - 3)
+  else name
+
+exception Not_normal_letter of int
+let name_mangle name =
+  let len = String.length name in
+  try
+    for i = 0 to len - 1 do
+      if not (no_escape (String.unsafe_get name i)) then
+        raise_notrace (Not_normal_letter i)
+    done;
+    name (* Normal letter *)
+  with Not_normal_letter i ->
+    let buffer = Ext_buffer.create len in
+    for j = 0 to len - 1 do
+      let c = String.unsafe_get name j in
+      if no_escape c then Ext_buffer.add_char buffer c
+      else Ext_buffer.add_string buffer (convert ~op:(i = 0) c)
+    done;
+    Ext_buffer.contents buffer
+
+(**
+   [convert name] if [name] is a js keyword or js global, add "$$"
+   otherwise do the name mangling to make sure ocaml identifier it is
+   a valid js identifier
+*)
+let convert (name : string) =
+  let name = unwrap_uppercase_exotic name in
+  if Js_reserved_map.is_js_keyword name || Js_reserved_map.is_js_global name
+  then "$$" ^ name
+  else name_mangle name
+
+(** keyword could be used in property *)
+
+(* It is currently made a persistent ident to avoid fresh ids
+    which would result in different signature files
+   - other solution: use lazy values
+*)
+let make_unused () = create "_"
+
+let reset () = Hash_string.clear js_module_table
+
+(* Has to be total order, [x < y]
+   and [x > y] should be consistent
+   flags are not relevant here
+*)
+let compare (x : Ident.t) (y : Ident.t) =
+  let u = x.stamp - y.stamp in
+  if u = 0 then Ext_string.compare x.name y.name else u
+
+let equal (x : Ident.t) (y : Ident.t) =
+  if x.stamp <> 0 then x.stamp = y.stamp else y.stamp = 0 && x.name = y.name
diff --git a/jscomp/ext/ext_ident.mli b/compiler/ext/ext_ident.mli
similarity index 85%
rename from jscomp/ext/ext_ident.mli
rename to compiler/ext/ext_ident.mli
index 290a635..ff21fca 100644
--- a/jscomp/ext/ext_ident.mli
+++ b/compiler/ext/ext_ident.mli
@@ -22,44 +22,37 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
-
-
-
-
-
-
 (** A wrapper around [Ident] module in compiler-libs*)
 
-val is_js : Ident.t -> bool 
+val is_js : Ident.t -> bool
 
 val is_js_object : Ident.t -> bool
 
-(** create identifiers for predefined [js] global variables *)
 val create_js : string -> Ident.t
+(** create identifiers for predefined [js] global variables *)
 
 val create : string -> Ident.t
 
-val make_js_object : Ident.t -> unit 
+val make_js_object : Ident.t -> unit
 
 val reset : unit -> unit
 
-val create_tmp :  ?name:string -> unit -> Ident.t
+val create_tmp : ?name:string -> unit -> Ident.t
+
+val make_unused : unit -> Ident.t
 
-val make_unused : unit -> Ident.t 
+val is_uident : string -> bool
 
+val is_uppercase_exotic : string -> bool
 
+val unwrap_uppercase_exotic : string -> string
 
+val convert : string -> string
 (**
    Invariant: if name is not converted, the reference should be equal
 *)
-val convert : string -> string
-
-
 
 val is_js_or_global : Ident.t -> bool
 
-
-
 val compare : Ident.t -> Ident.t -> int
-val equal : Ident.t -> Ident.t -> bool 
+val equal : Ident.t -> Ident.t -> bool
diff --git a/jscomp/ext/ext_int.ml b/compiler/ext/ext_int.ml
similarity index 81%
rename from jscomp/ext/ext_int.ml
rename to compiler/ext/ext_int.ml
index f31d425..3c71537 100644
--- a/jscomp/ext/ext_int.ml
+++ b/compiler/ext/ext_int.ml
@@ -34,3 +34,15 @@ let move = 0x1_0000_0000
 let int32_unsigned_to_int (n : int32) : int =
   let i = Int32.to_int n in
   if i < 0 then i + move else i
+
+let int32_pow (x : int32) (y : int32) =
+  let x_float = Int32.to_float x in
+  let y_float = Int32.to_float y in
+  let result = x_float ** y_float in
+  let truncated =
+    if result > 2147483647.0 || result < -2147483648.0 then
+      let i = int_of_float result in
+      i land 0xFFFFFFFF
+    else int_of_float result
+  in
+  Int32.of_int truncated
diff --git a/jscomp/ext/ext_int.mli b/compiler/ext/ext_int.mli
similarity index 97%
rename from jscomp/ext/ext_int.mli
rename to compiler/ext/ext_int.mli
index acfc7af..0c61810 100644
--- a/jscomp/ext/ext_int.mli
+++ b/compiler/ext/ext_int.mli
@@ -33,3 +33,5 @@ val int32_unsigned_to_int : int32 -> int
    works on 64 bit platform only
    given input as an uint32 and convert it io int64
 *)
+
+val int32_pow : int32 -> int32 -> int32
diff --git a/jscomp/ext/ext_io.ml b/compiler/ext/ext_io.ml
similarity index 98%
rename from jscomp/ext/ext_io.ml
rename to compiler/ext/ext_io.ml
index ee3a96e..ffb84a4 100644
--- a/jscomp/ext/ext_io.ml
+++ b/compiler/ext/ext_io.ml
@@ -35,8 +35,8 @@ let rev_lines_of_chann chan =
     match input_line chan with
     | line -> loop (line :: acc) chan
     | exception End_of_file ->
-        close_in chan;
-        acc
+      close_in chan;
+      acc
   in
   loop [] chan
 
diff --git a/jscomp/ext/ext_io.mli b/compiler/ext/ext_io.mli
similarity index 100%
rename from jscomp/ext/ext_io.mli
rename to compiler/ext/ext_io.mli
diff --git a/jscomp/ext/ext_js_file_kind.ml b/compiler/ext/ext_js_file_kind.ml
similarity index 95%
rename from jscomp/ext/ext_js_file_kind.ml
rename to compiler/ext/ext_js_file_kind.ml
index 196ba32..2efce68 100644
--- a/jscomp/ext/ext_js_file_kind.ml
+++ b/compiler/ext/ext_js_file_kind.ml
@@ -23,4 +23,4 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 type case = Upper | Little
 
-type [@warning "-69"] t = { case : case; suffix : string }
+type t = {case: case; suffix: string} [@@warning "-69"]
diff --git a/jscomp/ext/ext_json.ml b/compiler/ext/ext_json.ml
similarity index 85%
rename from jscomp/ext/ext_json.ml
rename to compiler/ext/ext_json.ml
index 3dedb8d..90915a2 100644
--- a/jscomp/ext/ext_json.ml
+++ b/compiler/ext/ext_json.ml
@@ -44,18 +44,20 @@ let test ?(fail = fun () -> ()) key (cb : callback)
     (m : Ext_json_types.t Map_string.t) =
   (match (Map_string.find_exn m key, cb) with
   | exception Not_found -> (
-      match cb with `Not_found f -> f () | _ -> fail ())
+    match cb with
+    | `Not_found f -> f ()
+    | _ -> fail ())
   | True _, `Bool cb -> cb true
   | False _, `Bool cb -> cb false
-  | Flo { flo = s }, `Flo cb -> cb s
-  | Flo { flo = s; loc }, `Flo_loc cb -> cb s loc
-  | Obj { map = b }, `Obj cb -> cb b
-  | Arr { content }, `Arr cb -> cb content
-  | Arr { content; loc_start; loc_end }, `Arr_loc cb ->
-      cb content loc_start loc_end
+  | Flo {flo = s}, `Flo cb -> cb s
+  | Flo {flo = s; loc}, `Flo_loc cb -> cb s loc
+  | Obj {map = b}, `Obj cb -> cb b
+  | Arr {content}, `Arr cb -> cb content
+  | Arr {content; loc_start; loc_end}, `Arr_loc cb ->
+    cb content loc_start loc_end
   | Null _, `Null cb -> cb ()
-  | Str { str = s }, `Str cb -> cb s
-  | Str { str = s; loc }, `Str_loc cb -> cb s loc
+  | Str {str = s}, `Str cb -> cb s
+  | Str {str = s; loc}, `Str_loc cb -> cb s loc
   | any, `Id cb -> cb any
   | _, _ -> fail ());
   m
diff --git a/jscomp/ext/ext_json.mli b/compiler/ext/ext_json.mli
similarity index 100%
rename from jscomp/ext/ext_json.mli
rename to compiler/ext/ext_json.mli
diff --git a/compiler/ext/ext_json_noloc.ml b/compiler/ext/ext_json_noloc.ml
new file mode 100644
index 0000000..4977770
--- /dev/null
+++ b/compiler/ext/ext_json_noloc.ml
@@ -0,0 +1,127 @@
+(* Copyright (C) 2017- Hongbo Zhang, Authors of ReScript
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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. *)
+
+(* This file is only used in bsb watcher searlization *)
+type t =
+  | True
+  | False
+  | Null
+  | Flo of string
+  | Str of string
+  | Arr of t array
+  | Obj of t Map_string.t
+
+(** poor man's serialization *)
+let naive_escaped (text : string) : string =
+  let ln = String.length text in
+  let buf = Buffer.create ln in
+  let rec loop i =
+    if i < ln then (
+      (match text.[i] with
+      | '\012' -> Buffer.add_string buf "\\f"
+      | '\\' -> Buffer.add_string buf "\\\\"
+      | '"' -> Buffer.add_string buf "\\\""
+      | '\n' -> Buffer.add_string buf "\\n"
+      | '\b' -> Buffer.add_string buf "\\b"
+      | '\r' -> Buffer.add_string buf "\\r"
+      | '\t' -> Buffer.add_string buf "\\t"
+      | c ->
+        let code = Char.code c in
+        if code < 0x20 then Printf.bprintf buf "\\u%04x" code
+        else Buffer.add_char buf c);
+      loop (i + 1))
+  in
+  loop 0;
+  Buffer.contents buf
+
+let quot x = "\"" ^ naive_escaped x ^ "\""
+
+let true_ = True
+
+let false_ = False
+
+let null = Null
+
+let str s = Str s
+
+let flo s = Flo s
+
+let arr s = Arr s
+
+let obj s = Obj s
+
+let kvs s = Obj (Map_string.of_list s)
+
+let rec encode_buf (x : t) (buf : Buffer.t) : unit =
+  let a str = Buffer.add_string buf str in
+  match x with
+  | Null -> a "null"
+  | Str s -> a (quot s)
+  | Flo s ->
+    a s
+    (*
+         since our parsing keep the original float representation, we just dump it as is, there is no cases like [nan] *)
+  | Arr content -> (
+    match content with
+    | [||] -> a "[]"
+    | _ ->
+      a "[ ";
+      encode_buf (Array.unsafe_get content 0) buf;
+      for i = 1 to Array.length content - 1 do
+        a " , ";
+        encode_buf (Array.unsafe_get content i) buf
+      done;
+      a " ]")
+  | True -> a "true"
+  | False -> a "false"
+  | Obj map ->
+    if Map_string.is_empty map then a "{}"
+    else (
+      (*prerr_endline "WEIRD";
+        prerr_endline (string_of_int @@ Map_string.cardinal map ); *)
+      a "{ ";
+      let (_ : int) =
+        Map_string.fold map 0 (fun k v i ->
+            if i <> 0 then a " , ";
+            a (quot k);
+            a " : ";
+            encode_buf v buf;
+            i + 1)
+      in
+      a " }")
+
+let to_string x =
+  let buf = Buffer.create 1024 in
+  encode_buf x buf;
+  Buffer.contents buf
+
+let to_channel (oc : out_channel) x =
+  let buf = Buffer.create 1024 in
+  encode_buf x buf;
+  Buffer.output_buffer oc buf
+
+let to_file name v =
+  let ochan = open_out_bin name in
+  to_channel ochan v;
+  close_out ochan
diff --git a/jscomp/ext/ext_json_noloc.mli b/compiler/ext/ext_json_noloc.mli
similarity index 100%
rename from jscomp/ext/ext_json_noloc.mli
rename to compiler/ext/ext_json_noloc.mli
diff --git a/jscomp/ext/ext_json_parse.mli b/compiler/ext/ext_json_parse.mli
similarity index 100%
rename from jscomp/ext/ext_json_parse.mli
rename to compiler/ext/ext_json_parse.mli
diff --git a/jscomp/ext/ext_json_parse.mll b/compiler/ext/ext_json_parse.mll
similarity index 100%
rename from jscomp/ext/ext_json_parse.mll
rename to compiler/ext/ext_json_parse.mll
diff --git a/jscomp/ext/ext_json_types.ml b/compiler/ext/ext_json_types.ml
similarity index 87%
rename from jscomp/ext/ext_json_types.ml
rename to compiler/ext/ext_json_types.ml
index 1eb6212..3c33844 100644
--- a/jscomp/ext/ext_json_types.ml
+++ b/compiler/ext/ext_json_types.ml
@@ -24,13 +24,13 @@
 
 type loc = Lexing.position
 
-type json_str = { str : string; loc : loc }
+type json_str = {str: string; loc: loc}
 
-type json_flo = { flo : string; loc : loc }
+type json_flo = {flo: string; loc: loc}
 
-type json_array = { content : t array; loc_start : loc; loc_end : loc }
+type json_array = {content: t array; loc_start: loc; loc_end: loc}
 
-and json_map = { map : t Map_string.t; loc : loc }
+and json_map = {map: t Map_string.t; loc: loc}
 
 and t =
   | True of loc
diff --git a/compiler/ext/ext_list.ml b/compiler/ext/ext_list.ml
new file mode 100644
index 0000000..e7681ae
--- /dev/null
+++ b/compiler/ext/ext_list.ml
@@ -0,0 +1,780 @@
+(* 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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. *)
+
+external ( .!() ) : 'a array -> int -> 'a = "%array_unsafe_get"
+
+let rec map l f =
+  match l with
+  | [] -> []
+  | [x1] ->
+    let y1 = f x1 in
+    [y1]
+  | [x1; x2] ->
+    let y1 = f x1 in
+    let y2 = f x2 in
+    [y1; y2]
+  | [x1; x2; x3] ->
+    let y1 = f x1 in
+    let y2 = f x2 in
+    let y3 = f x3 in
+    [y1; y2; y3]
+  | [x1; x2; x3; x4] ->
+    let y1 = f x1 in
+    let y2 = f x2 in
+    let y3 = f x3 in
+    let y4 = f x4 in
+    [y1; y2; y3; y4]
+  | x1 :: x2 :: x3 :: x4 :: x5 :: tail ->
+    let y1 = f x1 in
+    let y2 = f x2 in
+    let y3 = f x3 in
+    let y4 = f x4 in
+    let y5 = f x5 in
+    y1 :: y2 :: y3 :: y4 :: y5 :: map tail f
+
+let rec has_string l f =
+  match l with
+  | [] -> false
+  | [x1] -> x1 = f
+  | [x1; x2] -> x1 = f || x2 = f
+  | [x1; x2; x3] -> x1 = f || x2 = f || x3 = f
+  | x1 :: x2 :: x3 :: x4 -> x1 = f || x2 = f || x3 = f || has_string x4 f
+
+let rec map_combine l1 l2 f =
+  match (l1, l2) with
+  | [], [] -> []
+  | a1 :: l1, a2 :: l2 -> (f a1, a2) :: map_combine l1 l2 f
+  | _, _ -> invalid_arg "Ext_list.map_combine"
+
+let rec arr_list_combine_unsafe arr l i j acc f =
+  if i = j then acc
+  else
+    match l with
+    | [] -> invalid_arg "Ext_list.combine"
+    | h :: tl ->
+      (f arr.!(i), h) :: arr_list_combine_unsafe arr tl (i + 1) j acc f
+
+let combine_array_append arr l acc f =
+  let len = Array.length arr in
+  arr_list_combine_unsafe arr l 0 len acc f
+
+let combine_array arr l f =
+  let len = Array.length arr in
+  arr_list_combine_unsafe arr l 0 len [] f
+
+let rec arr_list_filter_map_unasfe arr l i j acc f =
+  if i = j then acc
+  else
+    match l with
+    | [] -> invalid_arg "Ext_list.arr_list_filter_map_unsafe"
+    | h :: tl -> (
+      match f arr.!(i) h with
+      | None -> arr_list_filter_map_unasfe arr tl (i + 1) j acc f
+      | Some v -> v :: arr_list_filter_map_unasfe arr tl (i + 1) j acc f)
+
+let array_list_filter_map arr l f =
+  let len = Array.length arr in
+  arr_list_filter_map_unasfe arr l 0 len [] f
+
+let rec map_split_opt (xs : 'a list) (f : 'a -> 'b option * 'c option) :
+    'b list * 'c list =
+  match xs with
+  | [] -> ([], [])
+  | x :: xs -> (
+    let c, d = f x in
+    let cs, ds = map_split_opt xs f in
+    ( (match c with
+      | Some c -> c :: cs
+      | None -> cs),
+      match d with
+      | Some d -> d :: ds
+      | None -> ds ))
+
+let rec map_snd l f =
+  match l with
+  | [] -> []
+  | [(v1, x1)] ->
+    let y1 = f x1 in
+    [(v1, y1)]
+  | [(v1, x1); (v2, x2)] ->
+    let y1 = f x1 in
+    let y2 = f x2 in
+    [(v1, y1); (v2, y2)]
+  | [(v1, x1); (v2, x2); (v3, x3)] ->
+    let y1 = f x1 in
+    let y2 = f x2 in
+    let y3 = f x3 in
+    [(v1, y1); (v2, y2); (v3, y3)]
+  | [(v1, x1); (v2, x2); (v3, x3); (v4, x4)] ->
+    let y1 = f x1 in
+    let y2 = f x2 in
+    let y3 = f x3 in
+    let y4 = f x4 in
+    [(v1, y1); (v2, y2); (v3, y3); (v4, y4)]
+  | (v1, x1) :: (v2, x2) :: (v3, x3) :: (v4, x4) :: (v5, x5) :: tail ->
+    let y1 = f x1 in
+    let y2 = f x2 in
+    let y3 = f x3 in
+    let y4 = f x4 in
+    let y5 = f x5 in
+    (v1, y1) :: (v2, y2) :: (v3, y3) :: (v4, y4) :: (v5, y5) :: map_snd tail f
+
+let rec map_last l f =
+  match l with
+  | [] -> []
+  | [x1] ->
+    let y1 = f true x1 in
+    [y1]
+  | [x1; x2] ->
+    let y1 = f false x1 in
+    let y2 = f true x2 in
+    [y1; y2]
+  | [x1; x2; x3] ->
+    let y1 = f false x1 in
+    let y2 = f false x2 in
+    let y3 = f true x3 in
+    [y1; y2; y3]
+  | [x1; x2; x3; x4] ->
+    let y1 = f false x1 in
+    let y2 = f false x2 in
+    let y3 = f false x3 in
+    let y4 = f true x4 in
+    [y1; y2; y3; y4]
+  | x1 :: x2 :: x3 :: x4 :: tail ->
+    (* make sure that tail is not empty *)
+    let y1 = f false x1 in
+    let y2 = f false x2 in
+    let y3 = f false x3 in
+    let y4 = f false x4 in
+    y1 :: y2 :: y3 :: y4 :: map_last tail f
+
+let rec mapi_aux lst i f tail =
+  match lst with
+  | [] -> tail
+  | a :: l ->
+    let r = f i a in
+    r :: mapi_aux l (i + 1) f tail
+
+let mapi lst f = mapi_aux lst 0 f []
+
+let mapi_append lst f tail = mapi_aux lst 0 f tail
+
+let rec last xs =
+  match xs with
+  | [x] -> x
+  | _ :: tl -> last tl
+  | [] -> invalid_arg "Ext_list.last"
+
+let rec append_aux l1 l2 =
+  match l1 with
+  | [] -> l2
+  | [a0] -> a0 :: l2
+  | [a0; a1] -> a0 :: a1 :: l2
+  | [a0; a1; a2] -> a0 :: a1 :: a2 :: l2
+  | [a0; a1; a2; a3] -> a0 :: a1 :: a2 :: a3 :: l2
+  | [a0; a1; a2; a3; a4] -> a0 :: a1 :: a2 :: a3 :: a4 :: l2
+  | a0 :: a1 :: a2 :: a3 :: a4 :: rest ->
+    a0 :: a1 :: a2 :: a3 :: a4 :: append_aux rest l2
+
+let append l1 l2 =
+  match l2 with
+  | [] -> l1
+  | _ -> append_aux l1 l2
+
+let append_one l1 x = append_aux l1 [x]
+
+let rec map_append l1 l2 f =
+  match l1 with
+  | [] -> l2
+  | [a0] -> f a0 :: l2
+  | [a0; a1] ->
+    let b0 = f a0 in
+    let b1 = f a1 in
+    b0 :: b1 :: l2
+  | [a0; a1; a2] ->
+    let b0 = f a0 in
+    let b1 = f a1 in
+    let b2 = f a2 in
+    b0 :: b1 :: b2 :: l2
+  | [a0; a1; a2; a3] ->
+    let b0 = f a0 in
+    let b1 = f a1 in
+    let b2 = f a2 in
+    let b3 = f a3 in
+    b0 :: b1 :: b2 :: b3 :: l2
+  | [a0; a1; a2; a3; a4] ->
+    let b0 = f a0 in
+    let b1 = f a1 in
+    let b2 = f a2 in
+    let b3 = f a3 in
+    let b4 = f a4 in
+    b0 :: b1 :: b2 :: b3 :: b4 :: l2
+  | a0 :: a1 :: a2 :: a3 :: a4 :: rest ->
+    let b0 = f a0 in
+    let b1 = f a1 in
+    let b2 = f a2 in
+    let b3 = f a3 in
+    let b4 = f a4 in
+    b0 :: b1 :: b2 :: b3 :: b4 :: map_append rest l2 f
+
+let rec fold_right l acc f =
+  match l with
+  | [] -> acc
+  | [a0] -> f a0 acc
+  | [a0; a1] -> f a0 (f a1 acc)
+  | [a0; a1; a2] -> f a0 (f a1 (f a2 acc))
+  | [a0; a1; a2; a3] -> f a0 (f a1 (f a2 (f a3 acc)))
+  | [a0; a1; a2; a3; a4] -> f a0 (f a1 (f a2 (f a3 (f a4 acc))))
+  | a0 :: a1 :: a2 :: a3 :: a4 :: rest ->
+    f a0 (f a1 (f a2 (f a3 (f a4 (fold_right rest acc f)))))
+
+let rec fold_right2 l r acc f =
+  match (l, r) with
+  | [], [] -> acc
+  | [a0], [b0] -> f a0 b0 acc
+  | [a0; a1], [b0; b1] -> f a0 b0 (f a1 b1 acc)
+  | [a0; a1; a2], [b0; b1; b2] -> f a0 b0 (f a1 b1 (f a2 b2 acc))
+  | [a0; a1; a2; a3], [b0; b1; b2; b3] ->
+    f a0 b0 (f a1 b1 (f a2 b2 (f a3 b3 acc)))
+  | [a0; a1; a2; a3; a4], [b0; b1; b2; b3; b4] ->
+    f a0 b0 (f a1 b1 (f a2 b2 (f a3 b3 (f a4 b4 acc))))
+  | a0 :: a1 :: a2 :: a3 :: a4 :: arest, b0 :: b1 :: b2 :: b3 :: b4 :: brest ->
+    f a0 b0
+      (f a1 b1 (f a2 b2 (f a3 b3 (f a4 b4 (fold_right2 arest brest acc f)))))
+  | _, _ -> invalid_arg "Ext_list.fold_right2"
+
+let rec fold_right3 l r last acc f =
+  match (l, r, last) with
+  | [], [], [] -> acc
+  | [a0], [b0], [c0] -> f a0 b0 c0 acc
+  | [a0; a1], [b0; b1], [c0; c1] -> f a0 b0 c0 (f a1 b1 c1 acc)
+  | [a0; a1; a2], [b0; b1; b2], [c0; c1; c2] ->
+    f a0 b0 c0 (f a1 b1 c1 (f a2 b2 c2 acc))
+  | [a0; a1; a2; a3], [b0; b1; b2; b3], [c0; c1; c2; c3] ->
+    f a0 b0 c0 (f a1 b1 c1 (f a2 b2 c2 (f a3 b3 c3 acc)))
+  | [a0; a1; a2; a3; a4], [b0; b1; b2; b3; b4], [c0; c1; c2; c3; c4] ->
+    f a0 b0 c0 (f a1 b1 c1 (f a2 b2 c2 (f a3 b3 c3 (f a4 b4 c4 acc))))
+  | ( a0 :: a1 :: a2 :: a3 :: a4 :: arest,
+      b0 :: b1 :: b2 :: b3 :: b4 :: brest,
+      c0 :: c1 :: c2 :: c3 :: c4 :: crest ) ->
+    f a0 b0 c0
+      (f a1 b1 c1
+         (f a2 b2 c2
+            (f a3 b3 c3 (f a4 b4 c4 (fold_right3 arest brest crest acc f)))))
+  | _, _, _ -> invalid_arg "Ext_list.fold_right2"
+
+let rec map2i l r f =
+  match (l, r) with
+  | [], [] -> []
+  | [a0], [b0] -> [f 0 a0 b0]
+  | [a0; a1], [b0; b1] ->
+    let c0 = f 0 a0 b0 in
+    let c1 = f 1 a1 b1 in
+    [c0; c1]
+  | [a0; a1; a2], [b0; b1; b2] ->
+    let c0 = f 0 a0 b0 in
+    let c1 = f 1 a1 b1 in
+    let c2 = f 2 a2 b2 in
+    [c0; c1; c2]
+  | [a0; a1; a2; a3], [b0; b1; b2; b3] ->
+    let c0 = f 0 a0 b0 in
+    let c1 = f 1 a1 b1 in
+    let c2 = f 2 a2 b2 in
+    let c3 = f 3 a3 b3 in
+    [c0; c1; c2; c3]
+  | [a0; a1; a2; a3; a4], [b0; b1; b2; b3; b4] ->
+    let c0 = f 0 a0 b0 in
+    let c1 = f 1 a1 b1 in
+    let c2 = f 2 a2 b2 in
+    let c3 = f 3 a3 b3 in
+    let c4 = f 4 a4 b4 in
+    [c0; c1; c2; c3; c4]
+  | a0 :: a1 :: a2 :: a3 :: a4 :: arest, b0 :: b1 :: b2 :: b3 :: b4 :: brest ->
+    let c0 = f 0 a0 b0 in
+    let c1 = f 1 a1 b1 in
+    let c2 = f 2 a2 b2 in
+    let c3 = f 3 a3 b3 in
+    let c4 = f 4 a4 b4 in
+    c0 :: c1 :: c2 :: c3 :: c4 :: map2i arest brest f
+  | _, _ -> invalid_arg "Ext_list.map2"
+
+let rec map2 l r f =
+  match (l, r) with
+  | [], [] -> []
+  | [a0], [b0] -> [f a0 b0]
+  | [a0; a1], [b0; b1] ->
+    let c0 = f a0 b0 in
+    let c1 = f a1 b1 in
+    [c0; c1]
+  | [a0; a1; a2], [b0; b1; b2] ->
+    let c0 = f a0 b0 in
+    let c1 = f a1 b1 in
+    let c2 = f a2 b2 in
+    [c0; c1; c2]
+  | [a0; a1; a2; a3], [b0; b1; b2; b3] ->
+    let c0 = f a0 b0 in
+    let c1 = f a1 b1 in
+    let c2 = f a2 b2 in
+    let c3 = f a3 b3 in
+    [c0; c1; c2; c3]
+  | [a0; a1; a2; a3; a4], [b0; b1; b2; b3; b4] ->
+    let c0 = f a0 b0 in
+    let c1 = f a1 b1 in
+    let c2 = f a2 b2 in
+    let c3 = f a3 b3 in
+    let c4 = f a4 b4 in
+    [c0; c1; c2; c3; c4]
+  | a0 :: a1 :: a2 :: a3 :: a4 :: arest, b0 :: b1 :: b2 :: b3 :: b4 :: brest ->
+    let c0 = f a0 b0 in
+    let c1 = f a1 b1 in
+    let c2 = f a2 b2 in
+    let c3 = f a3 b3 in
+    let c4 = f a4 b4 in
+    c0 :: c1 :: c2 :: c3 :: c4 :: map2 arest brest f
+  | _, _ -> invalid_arg "Ext_list.map2"
+
+let rec fold_left_with_offset l accu i f =
+  match l with
+  | [] -> accu
+  | a :: l -> fold_left_with_offset l (f a accu i) (i + 1) f
+
+let rec filter_map xs (f : 'a -> 'b option) =
+  match xs with
+  | [] -> []
+  | y :: ys -> (
+    match f y with
+    | None -> filter_map ys f
+    | Some z -> z :: filter_map ys f)
+
+let rec exclude (xs : 'a list) (p : 'a -> bool) : 'a list =
+  match xs with
+  | [] -> []
+  | x :: xs -> if p x then exclude xs p else x :: exclude xs p
+
+let rec exclude_with_val l p =
+  match l with
+  | [] -> None
+  | a0 :: xs -> (
+    if p a0 then Some (exclude xs p)
+    else
+      match xs with
+      | [] -> None
+      | a1 :: rest -> (
+        if p a1 then Some (a0 :: exclude rest p)
+        else
+          match exclude_with_val rest p with
+          | None -> None
+          | Some rest -> Some (a0 :: a1 :: rest)))
+
+let rec same_length xs ys =
+  match (xs, ys) with
+  | [], [] -> true
+  | _ :: xs, _ :: ys -> same_length xs ys
+  | _, _ -> false
+
+let init n f =
+  match n with
+  | 0 -> []
+  | 1 ->
+    let a0 = f 0 in
+    [a0]
+  | 2 ->
+    let a0 = f 0 in
+    let a1 = f 1 in
+    [a0; a1]
+  | 3 ->
+    let a0 = f 0 in
+    let a1 = f 1 in
+    let a2 = f 2 in
+    [a0; a1; a2]
+  | 4 ->
+    let a0 = f 0 in
+    let a1 = f 1 in
+    let a2 = f 2 in
+    let a3 = f 3 in
+    [a0; a1; a2; a3]
+  | 5 ->
+    let a0 = f 0 in
+    let a1 = f 1 in
+    let a2 = f 2 in
+    let a3 = f 3 in
+    let a4 = f 4 in
+    [a0; a1; a2; a3; a4]
+  | _ -> Array.to_list (Array.init n f)
+
+let rec rev_append l1 l2 =
+  match l1 with
+  | [] -> l2
+  | [a0] -> a0 :: l2 (* single element is common *)
+  | [a0; a1] -> a1 :: a0 :: l2
+  | a0 :: a1 :: a2 :: rest -> rev_append rest (a2 :: a1 :: a0 :: l2)
+
+let rev l = rev_append l []
+
+let rec small_split_at n acc l =
+  if n <= 0 then (rev acc, l)
+  else
+    match l with
+    | x :: xs -> small_split_at (n - 1) (x :: acc) xs
+    | _ -> invalid_arg "Ext_list.split_at"
+
+let split_at l n = small_split_at n [] l
+
+let rec split_at_last_aux acc x =
+  match x with
+  | [] -> invalid_arg "Ext_list.split_at_last"
+  | [x] -> (rev acc, x)
+  | y0 :: ys -> split_at_last_aux (y0 :: acc) ys
+
+let split_at_last (x : 'a list) =
+  match x with
+  | [] -> invalid_arg "Ext_list.split_at_last"
+  | [a0] -> ([], a0)
+  | [a0; a1] -> ([a0], a1)
+  | [a0; a1; a2] -> ([a0; a1], a2)
+  | [a0; a1; a2; a3] -> ([a0; a1; a2], a3)
+  | [a0; a1; a2; a3; a4] -> ([a0; a1; a2; a3], a4)
+  | a0 :: a1 :: a2 :: a3 :: a4 :: rest ->
+    let rev, last = split_at_last_aux [] rest in
+    (a0 :: a1 :: a2 :: a3 :: a4 :: rev, last)
+
+(**
+   can not do loop unroll due to state combination
+*)
+let filter_mapi xs f =
+  let rec aux i xs =
+    match xs with
+    | [] -> []
+    | y :: ys -> (
+      match f y i with
+      | None -> aux (i + 1) ys
+      | Some z -> z :: aux (i + 1) ys)
+  in
+  aux 0 xs
+
+let rec filter_map2 xs ys (f : 'a -> 'b -> 'c option) =
+  match (xs, ys) with
+  | [], [] -> []
+  | u :: us, v :: vs -> (
+    match f u v with
+    | None -> filter_map2 us vs f (* idea: rec f us vs instead? *)
+    | Some z -> z :: filter_map2 us vs f)
+  | _ -> invalid_arg "Ext_list.filter_map2"
+
+let rec rev_map_append l1 l2 f =
+  match l1 with
+  | [] -> l2
+  | a :: l -> rev_map_append l (f a :: l2) f
+
+(** It is not worth loop unrolling, 
+    it is already tail-call, and we need to be careful 
+    about evaluation order when unroll
+*)
+let rec flat_map_aux f acc append lx =
+  match lx with
+  | [] -> rev_append acc append
+  | a0 :: rest ->
+    let new_acc =
+      match f a0 with
+      | [] -> acc
+      | [a0] -> a0 :: acc
+      | [a0; a1] -> a1 :: a0 :: acc
+      | a0 :: a1 :: a2 :: rest -> rev_append rest (a2 :: a1 :: a0 :: acc)
+    in
+    flat_map_aux f new_acc append rest
+
+let flat_map lx f = flat_map_aux f [] [] lx
+
+let flat_map_append lx append f = flat_map_aux f [] append lx
+
+let rec length_compare l n =
+  if n < 0 then `Gt
+  else
+    match l with
+    | _ :: xs -> length_compare xs (n - 1)
+    | [] -> if n = 0 then `Eq else `Lt
+
+let rec length_ge l n =
+  if n > 0 then
+    match l with
+    | _ :: tl -> length_ge tl (n - 1)
+    | [] -> false
+  else true
+
+(**
+   {[length xs = length ys + n ]}
+*)
+let rec length_larger_than_n xs ys n =
+  match (xs, ys) with
+  | _, [] -> length_compare xs n = `Eq
+  | _ :: xs, _ :: ys -> length_larger_than_n xs ys n
+  | [], _ -> false
+
+let rec group (eq : 'a -> 'a -> bool) lst =
+  match lst with
+  | [] -> []
+  | x :: xs -> aux eq x (group eq xs)
+
+and aux eq (x : 'a) (xss : 'a list list) : 'a list list =
+  match xss with
+  | [] -> [[x]]
+  | (y0 :: _ as y) :: ys ->
+    (* cannot be empty *)
+    if eq x y0 then (x :: y) :: ys else y :: aux eq x ys
+  | _ :: _ -> assert false
+
+let stable_group lst eq = group eq lst |> rev
+
+let rec drop h n =
+  if n < 0 then invalid_arg "Ext_list.drop"
+  else if n = 0 then h
+  else
+    match h with
+    | [] -> invalid_arg "Ext_list.drop"
+    | _ :: tl -> drop tl (n - 1)
+
+let rec find_first x p =
+  match x with
+  | [] -> None
+  | x :: l -> if p x then Some x else find_first l p
+
+let rec find_first_not xs p =
+  match xs with
+  | [] -> None
+  | a :: l -> if p a then find_first_not l p else Some a
+
+let rec rev_iter l f =
+  match l with
+  | [] -> ()
+  | [x1] -> f x1
+  | [x1; x2] ->
+    f x2;
+    f x1
+  | [x1; x2; x3] ->
+    f x3;
+    f x2;
+    f x1
+  | [x1; x2; x3; x4] ->
+    f x4;
+    f x3;
+    f x2;
+    f x1
+  | x1 :: x2 :: x3 :: x4 :: x5 :: tail ->
+    rev_iter tail f;
+    f x5;
+    f x4;
+    f x3;
+    f x2;
+    f x1
+
+let rec iter l f =
+  match l with
+  | [] -> ()
+  | [x1] -> f x1
+  | [x1; x2] ->
+    f x1;
+    f x2
+  | [x1; x2; x3] ->
+    f x1;
+    f x2;
+    f x3
+  | [x1; x2; x3; x4] ->
+    f x1;
+    f x2;
+    f x3;
+    f x4
+  | x1 :: x2 :: x3 :: x4 :: x5 :: tail ->
+    f x1;
+    f x2;
+    f x3;
+    f x4;
+    f x5;
+    iter tail f
+
+let rec for_all lst p =
+  match lst with
+  | [] -> true
+  | a :: l -> p a && for_all l p
+
+let rec for_all_snd lst p =
+  match lst with
+  | [] -> true
+  | (_, a) :: l -> p a && for_all_snd l p
+
+let rec for_all2_no_exn l1 l2 p =
+  match (l1, l2) with
+  | [], [] -> true
+  | a1 :: l1, a2 :: l2 -> p a1 a2 && for_all2_no_exn l1 l2 p
+  | _, _ -> false
+
+let rec find_opt xs p =
+  match xs with
+  | [] -> None
+  | x :: l -> (
+    match p x with
+    | Some _ as v -> v
+    | None -> find_opt l p)
+
+let rec find_def xs p def =
+  match xs with
+  | [] -> def
+  | x :: l -> (
+    match p x with
+    | Some v -> v
+    | None -> find_def l p def)
+
+let rec split_map l f =
+  match l with
+  | [] -> ([], [])
+  | [x1] ->
+    let a0, b0 = f x1 in
+    ([a0], [b0])
+  | [x1; x2] ->
+    let a1, b1 = f x1 in
+    let a2, b2 = f x2 in
+    ([a1; a2], [b1; b2])
+  | [x1; x2; x3] ->
+    let a1, b1 = f x1 in
+    let a2, b2 = f x2 in
+    let a3, b3 = f x3 in
+    ([a1; a2; a3], [b1; b2; b3])
+  | [x1; x2; x3; x4] ->
+    let a1, b1 = f x1 in
+    let a2, b2 = f x2 in
+    let a3, b3 = f x3 in
+    let a4, b4 = f x4 in
+    ([a1; a2; a3; a4], [b1; b2; b3; b4])
+  | x1 :: x2 :: x3 :: x4 :: x5 :: tail ->
+    let a1, b1 = f x1 in
+    let a2, b2 = f x2 in
+    let a3, b3 = f x3 in
+    let a4, b4 = f x4 in
+    let a5, b5 = f x5 in
+    let ass, bss = split_map tail f in
+    (a1 :: a2 :: a3 :: a4 :: a5 :: ass, b1 :: b2 :: b3 :: b4 :: b5 :: bss)
+
+let sort_via_array lst cmp =
+  let arr = Array.of_list lst in
+  Array.sort cmp arr;
+  Array.to_list arr
+
+let sort_via_arrayf lst cmp f =
+  let arr = Array.of_list lst in
+  Array.sort cmp arr;
+  Ext_array.to_list_f arr f
+
+let rec assoc_by_string lst (k : string) def =
+  match lst with
+  | [] -> (
+    match def with
+    | None -> assert false
+    | Some x -> x)
+  | (k1, v1) :: rest -> if k1 = k then v1 else assoc_by_string rest k def
+
+let rec assoc_by_int lst (k : int) def =
+  match lst with
+  | [] -> (
+    match def with
+    | None -> assert false
+    | Some x -> x)
+  | (k1, v1) :: rest -> if k1 = k then v1 else assoc_by_int rest k def
+
+let rec nth_aux l n =
+  match l with
+  | [] -> None
+  | a :: l -> if n = 0 then Some a else nth_aux l (n - 1)
+
+let nth_opt l n = if n < 0 then None else nth_aux l n
+
+let rec iter_snd lst f =
+  match lst with
+  | [] -> ()
+  | (_, x) :: xs ->
+    f x;
+    iter_snd xs f
+
+let rec iter_fst lst f =
+  match lst with
+  | [] -> ()
+  | (x, _) :: xs ->
+    f x;
+    iter_fst xs f
+
+let rec exists l p =
+  match l with
+  | [] -> false
+  | x :: xs -> p x || exists xs p
+
+let rec exists_fst l p =
+  match l with
+  | [] -> false
+  | (a, _) :: l -> p a || exists_fst l p
+
+let rec exists_snd l p =
+  match l with
+  | [] -> false
+  | (_, a) :: l -> p a || exists_snd l p
+
+let rec concat_append (xss : 'a list list) (xs : 'a list) : 'a list =
+  match xss with
+  | [] -> xs
+  | l :: r -> append l (concat_append r xs)
+
+let rec fold_left l accu f =
+  match l with
+  | [] -> accu
+  | a :: l -> fold_left l (f accu a) f
+
+let reduce_from_left lst fn =
+  match lst with
+  | first :: rest -> fold_left rest first fn
+  | _ -> invalid_arg "Ext_list.reduce_from_left"
+
+let rec fold_left2 l1 l2 accu f =
+  match (l1, l2) with
+  | [], [] -> accu
+  | a1 :: l1, a2 :: l2 -> fold_left2 l1 l2 (f a1 a2 accu) f
+  | _, _ -> invalid_arg "Ext_list.fold_left2"
+
+let singleton_exn xs =
+  match xs with
+  | [x] -> x
+  | _ -> assert false
+
+let rec mem_string (xs : string list) (x : string) =
+  match xs with
+  | [] -> false
+  | a :: l -> a = x || mem_string l x
+
+let filter lst p =
+  let rec find ~p accu lst =
+    match lst with
+    | [] -> rev accu
+    | x :: l -> if p x then find (x :: accu) l ~p else find accu l ~p
+  in
+  find [] lst ~p
+
+let is_empty = function
+  | [] -> true
+  | _ :: _ -> false
diff --git a/jscomp/ext/ext_list.mli b/compiler/ext/ext_list.mli
similarity index 98%
rename from jscomp/ext/ext_list.mli
rename to compiler/ext/ext_list.mli
index 95a078b..c5e6514 100644
--- a/jscomp/ext/ext_list.mli
+++ b/compiler/ext/ext_list.mli
@@ -108,7 +108,7 @@ val filter_mapi : 'a list -> ('a -> int -> 'b option) -> 'b list
 
 val filter_map2 : 'a list -> 'b list -> ('a -> 'b -> 'c option) -> 'c list
 
-val length_compare : 'a list -> int -> [ `Gt | `Eq | `Lt ]
+val length_compare : 'a list -> int -> [`Gt | `Eq | `Lt]
 
 val length_ge : 'a list -> int -> bool
 
@@ -231,3 +231,5 @@ val filter : 'a list -> ('a -> bool) -> 'a list
 
 val array_list_filter_map :
   'a array -> 'b list -> ('a -> 'b -> 'c option) -> 'c list
+
+val is_empty : 'a list -> bool
diff --git a/jscomp/ext/ext_marshal.ml b/compiler/ext/ext_marshal.ml
similarity index 100%
rename from jscomp/ext/ext_marshal.ml
rename to compiler/ext/ext_marshal.ml
diff --git a/jscomp/ext/ext_marshal.mli b/compiler/ext/ext_marshal.mli
similarity index 100%
rename from jscomp/ext/ext_marshal.mli
rename to compiler/ext/ext_marshal.mli
diff --git a/compiler/ext/ext_module_system.ml b/compiler/ext/ext_module_system.ml
new file mode 100644
index 0000000..c8a0734
--- /dev/null
+++ b/compiler/ext/ext_module_system.ml
@@ -0,0 +1 @@
+type t = Commonjs | Esmodule | Es6_global
diff --git a/jscomp/ext/ext_modulename.ml b/compiler/ext/ext_modulename.ml
similarity index 91%
rename from jscomp/ext/ext_modulename.ml
rename to compiler/ext/ext_modulename.ml
index ddc0292..d2d4693 100644
--- a/jscomp/ext/ext_modulename.ml
+++ b/compiler/ext/ext_modulename.ml
@@ -25,7 +25,9 @@
 let good_hint_name module_name offset =
   let len = String.length module_name in
   len > offset
-  && (function 'a' .. 'z' | 'A' .. 'Z' -> true | _ -> false)
+  && (function
+       | 'a' .. 'z' | 'A' .. 'Z' -> true
+       | _ -> false)
        (String.unsafe_get module_name offset)
   && Ext_string.for_all_from module_name (offset + 1) (function
        | 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' -> true
@@ -37,11 +39,11 @@ let rec collect_start buf s off len =
     let next = succ off in
     match String.unsafe_get s off with
     | 'a' .. 'z' as c ->
-        Ext_buffer.add_char buf (Char.uppercase_ascii c);
-        collect_next buf s next len
+      Ext_buffer.add_char buf (Char.uppercase_ascii c);
+      collect_next buf s next len
     | 'A' .. 'Z' as c ->
-        Ext_buffer.add_char buf c;
-        collect_next buf s next len
+      Ext_buffer.add_char buf c;
+      collect_next buf s next len
     | _ -> collect_start buf s next len
 
 and collect_next buf s off len =
@@ -50,8 +52,8 @@ and collect_next buf s off len =
     let next = off + 1 in
     match String.unsafe_get s off with
     | ('a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_') as c ->
-        Ext_buffer.add_char buf c;
-        collect_next buf s next len
+      Ext_buffer.add_char buf c;
+      collect_next buf s next len
     | '.' | '-' -> collect_start buf s next len
     | _ -> collect_next buf s next len
 
diff --git a/jscomp/ext/ext_modulename.mli b/compiler/ext/ext_modulename.mli
similarity index 100%
rename from jscomp/ext/ext_modulename.mli
rename to compiler/ext/ext_modulename.mli
diff --git a/jscomp/ext/ext_namespace.ml b/compiler/ext/ext_namespace.ml
similarity index 91%
rename from jscomp/ext/ext_namespace.ml
rename to compiler/ext/ext_namespace.ml
index deccf1f..faad692 100644
--- a/jscomp/ext/ext_namespace.ml
+++ b/compiler/ext/ext_namespace.ml
@@ -43,7 +43,9 @@ let try_split_module_name name =
 
 let js_name_of_modulename s (case : Ext_js_file_kind.case) suffix : string =
   let s =
-    match case with Little -> Ext_string.uncapitalize_ascii s | Upper -> s
+    match case with
+    | Little -> Ext_string.uncapitalize_ascii s
+    | Upper -> s
   in
   change_ext_ns_suffix s suffix
 
@@ -61,10 +63,10 @@ let is_valid_npm_package_name (s : string) =
   &&
   match String.unsafe_get s 0 with
   | 'a' .. 'z' | '@' ->
-      Ext_string.for_all_from s 1 (fun x ->
-          match x with
-          | 'a' .. 'z' | '0' .. '9' | '_' | '-' -> true
-          | _ -> false)
+    Ext_string.for_all_from s 1 (fun x ->
+        match x with
+        | 'a' .. 'z' | '0' .. '9' | '_' | '-' -> true
+        | _ -> false)
   | _ -> false
 
 let namespace_of_package_name (s : string) : string =
@@ -79,8 +81,8 @@ let namespace_of_package_name (s : string) : string =
       let ch = String.unsafe_get s off in
       match ch with
       | 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' ->
-          add capital ch;
-          aux false (off + 1) len
+        add capital ch;
+        aux false (off + 1) len
       | '/' | '-' -> aux true (off + 1) len
       | _ -> aux capital (off + 1) len
   in
diff --git a/jscomp/ext/ext_namespace.mli b/compiler/ext/ext_namespace.mli
similarity index 96%
rename from jscomp/ext/ext_namespace.mli
rename to compiler/ext/ext_namespace.mli
index f562729..fa64016 100644
--- a/jscomp/ext/ext_namespace.mli
+++ b/compiler/ext/ext_namespace.mli
@@ -33,8 +33,7 @@ val try_split_module_name : string -> (string * string) option
 *)
 val change_ext_ns_suffix : string -> string -> string
 
-val js_name_of_modulename :
-  string -> Ext_js_file_kind.case -> string -> string
+val js_name_of_modulename : string -> Ext_js_file_kind.case -> string -> string
 (** [js_name_of_modulename ~little A-Ns]
 *)
 
diff --git a/jscomp/ext/ext_namespace_encode.ml b/compiler/ext/ext_namespace_encode.ml
similarity index 94%
rename from jscomp/ext/ext_namespace_encode.ml
rename to compiler/ext/ext_namespace_encode.ml
index 071a92c..87ad276 100644
--- a/jscomp/ext/ext_namespace_encode.ml
+++ b/compiler/ext/ext_namespace_encode.ml
@@ -23,4 +23,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 let make ?ns cunit =
-  match ns with None -> cunit | Some ns -> cunit ^ Literals.ns_sep ^ ns
+  match ns with
+  | None -> cunit
+  | Some ns -> cunit ^ Literals.ns_sep ^ ns
diff --git a/jscomp/ext/ext_namespace_encode.mli b/compiler/ext/ext_namespace_encode.mli
similarity index 100%
rename from jscomp/ext/ext_namespace_encode.mli
rename to compiler/ext/ext_namespace_encode.mli
diff --git a/compiler/ext/ext_obj.ml b/compiler/ext/ext_obj.ml
new file mode 100644
index 0000000..c81e86f
--- /dev/null
+++ b/compiler/ext/ext_obj.ml
@@ -0,0 +1,126 @@
+(* Copyright (C) 2019-Present Hongbo Zhang, Authors of ReScript 
+ * 
+ * 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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. *)
+
+let rec dump r =
+  if Obj.is_int r then string_of_int (Obj.magic r : int)
+  else
+    (* Block. *)
+    let rec get_fields acc = function
+      | 0 -> acc
+      | n ->
+        let n = n - 1 in
+        get_fields (Obj.field r n :: acc) n
+    in
+    let rec is_list r =
+      if Obj.is_int r then r = Obj.repr 0 (* [] *)
+      else
+        let s = Obj.size r and t = Obj.tag r in
+        t = 0 && s = 2 && is_list (Obj.field r 1)
+      (* h :: t *)
+    in
+    let rec get_list r =
+      if Obj.is_int r then []
+      else
+        let h = Obj.field r 0 and t = get_list (Obj.field r 1) in
+        h :: t
+    in
+    let opaque name =
+      (* XXX In future, print the address of value 'r'.  Not possible
+       * in pure OCaml at the moment. *)
+      "<" ^ name ^ ">"
+    in
+    let s = Obj.size r and t = Obj.tag r in
+    (* From the tag, determine the type of block. *)
+    match t with
+    | _ when is_list r ->
+      let fields = get_list r in
+      "[" ^ String.concat "; " (Ext_list.map fields dump) ^ "]"
+    | 0 ->
+      let fields = get_fields [] s in
+      "(" ^ String.concat ", " (Ext_list.map fields dump) ^ ")"
+    | x when x = Obj.lazy_tag ->
+      (* Note that [lazy_tag .. forward_tag] are < no_scan_tag.  Not
+       * clear if very large constructed values could have the same
+       * tag. XXX *)
+      opaque "lazy"
+    | x when x = Obj.closure_tag -> opaque "closure"
+    | x when x = Obj.object_tag ->
+      let fields = get_fields [] s in
+      let _clasz, id, slots =
+        match fields with
+        | h :: h' :: t -> (h, h', t)
+        | _ -> assert false
+      in
+      (* No information on decoding the class (first field).  So just print
+       * out the ID and the slots. *)
+      "Object #" ^ dump id ^ " ("
+      ^ String.concat ", " (Ext_list.map slots dump)
+      ^ ")"
+    | x when x = Obj.infix_tag -> opaque "infix"
+    | x when x = Obj.forward_tag -> opaque "forward"
+    | x when x < Obj.no_scan_tag ->
+      let fields = get_fields [] s in
+      "Tag" ^ string_of_int t ^ " ("
+      ^ String.concat ", " (Ext_list.map fields dump)
+      ^ ")"
+    | x when x = Obj.string_tag ->
+      "\"" ^ String.escaped (Obj.magic r : string) ^ "\""
+    | x when x = Obj.double_tag -> string_of_float (Obj.magic r : float)
+    | x when x = Obj.abstract_tag -> opaque "abstract"
+    | x when x = Obj.custom_tag -> opaque "custom"
+    | x when x = Obj.custom_tag -> opaque "final"
+    | x when x = Obj.double_array_tag ->
+      "[|"
+      ^ String.concat ";"
+          (Array.to_list
+             (Array.map string_of_float (Obj.magic r : float array)))
+      ^ "|]"
+    | _ -> opaque (Printf.sprintf "unknown: tag %d size %d" t s)
+
+let dump v = dump (Obj.repr v)
+
+let dump_endline ?(__LOC__ = "") v =
+  print_endline __LOC__;
+  print_endline (dump v)
+
+let pp_any fmt v = Format.fprintf fmt "@[%s@]" (dump v)
+
+let bt () =
+  let raw_bt = Printexc.backtrace_slots (Printexc.get_raw_backtrace ()) in
+  match raw_bt with
+  | None -> ()
+  | Some raw_bt ->
+    let acc = ref [] in
+    for i = Array.length raw_bt - 1 downto 0 do
+      let slot = raw_bt.(i) in
+      match Printexc.Slot.location slot with
+      | None -> ()
+      | Some bt -> (
+        match !acc with
+        | [] -> acc := [bt]
+        | hd :: _ -> if hd <> bt then acc := bt :: !acc)
+    done;
+    Ext_list.iter !acc (fun bt ->
+        Printf.eprintf "File \"%s\", line %d, characters %d-%d\n" bt.filename
+          bt.line_number bt.start_char bt.end_char)
diff --git a/jscomp/ext/ext_obj.mli b/compiler/ext/ext_obj.mli
similarity index 100%
rename from jscomp/ext/ext_obj.mli
rename to compiler/ext/ext_obj.mli
diff --git a/jscomp/ext/ext_option.ml b/compiler/ext/ext_option.ml
similarity index 86%
rename from jscomp/ext/ext_option.ml
rename to compiler/ext/ext_option.ml
index 0e4f128..92a2439 100644
--- a/jscomp/ext/ext_option.ml
+++ b/compiler/ext/ext_option.ml
@@ -22,8 +22,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-let map v f = match v with None -> None | Some x -> Some (f x)
+let map v f =
+  match v with
+  | None -> None
+  | Some x -> Some (f x)
 
-let iter v f = match v with None -> () | Some x -> f x
+let iter v f =
+  match v with
+  | None -> ()
+  | Some x -> f x
 
-let exists v f = match v with None -> false | Some x -> f x
+let exists v f =
+  match v with
+  | None -> false
+  | Some x -> f x
diff --git a/jscomp/ext/ext_option.mli b/compiler/ext/ext_option.mli
similarity index 100%
rename from jscomp/ext/ext_option.mli
rename to compiler/ext/ext_option.mli
diff --git a/jscomp/ext/ext_path.ml b/compiler/ext/ext_path.ml
similarity index 77%
rename from jscomp/ext/ext_path.ml
rename to compiler/ext/ext_path.ml
index 31bbe47..727ea43 100644
--- a/jscomp/ext/ext_path.ml
+++ b/compiler/ext/ext_path.ml
@@ -23,8 +23,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 (* [@@@warning "-37"] *)
-type t = (* | File of string  *)
-  | Dir of string [@@unboxed]
+type t =
+  (* | File of string  *)
+  | Dir of string
+[@@unboxed]
 
 let simple_convert_node_path_to_os_path =
   if Sys.unix then fun x -> x
@@ -37,37 +39,22 @@ let split_by_sep_per_os : string -> string list =
   if Ext_sys.is_windows_or_cygwin then fun x ->
     (* on Windows, we can still accept -bs-package-output lib/js *)
     Ext_string.split_by
-      (fun x -> match x with '/' | '\\' -> true | _ -> false)
+      (fun x ->
+        match x with
+        | '/' | '\\' -> true
+        | _ -> false)
       x
   else fun x -> Ext_string.split x '/'
 
-(** example
-    {[
-      "/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/external/pervasives.cmj"
-        "/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/ocaml_array.ml"
-    ]}
-
-    The other way
-    {[
-
-      "/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/ocaml_array.ml"
-        "/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/external/pervasives.cmj"
-    ]}
-    {[
-      "/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib//ocaml_array.ml"
-    ]}
-    {[
-      /a/b
-      /c/d
-    ]}
-*)
 let node_relative_path ~from:(file_or_dir_2 : t) (file_or_dir_1 : t) =
   let relevant_dir1 =
-    match file_or_dir_1 with Dir x -> x
+    match file_or_dir_1 with
+    | Dir x -> x
     (* | File file1 ->  Filename.dirname file1 *)
   in
   let relevant_dir2 =
-    match file_or_dir_2 with Dir x -> x
+    match file_or_dir_2 with
+    | Dir x -> x
     (* | File file2 -> Filename.dirname file2  *)
   in
   let dir1 = split_by_sep_per_os relevant_dir1 in
@@ -81,7 +68,7 @@ let node_relative_path ~from:(file_or_dir_2 : t) (file_or_dir_1 : t) =
   in
   match go dir1 dir2 with
   | x :: _ as ys when x = Literals.node_parent ->
-      String.concat Literals.node_sep ys
+    String.concat Literals.node_sep ys
   | ys -> String.concat Literals.node_sep @@ (Literals.node_current :: ys)
 
 let node_concat ~dir base = dir ^ Literals.node_sep ^ base
@@ -90,7 +77,7 @@ let node_rebase_file ~from ~to_ file =
   node_concat
     ~dir:
       (if from = to_ then Literals.node_current
-      else node_relative_path ~from:(Dir from) (Dir to_))
+       else node_relative_path ~from:(Dir from) (Dir to_))
     file
 
 (***
@@ -164,20 +151,20 @@ let rel_normalized_absolute_path ~from to_ =
     let rec go xss yss =
       match (xss, yss) with
       | x :: xs, y :: ys ->
-          if Ext_string.equal x y then go xs ys
-          else if x = Filename.current_dir_name then go xs yss
-          else if y = Filename.current_dir_name then go xss ys
-          else
-            let start =
-              Ext_list.fold_left xs Ext_string.parent_dir_lit (fun acc _ ->
-                  acc // Ext_string.parent_dir_lit)
-            in
-            Ext_list.fold_left yss start (fun acc v -> acc // v)
+        if Ext_string.equal x y then go xs ys
+        else if x = Filename.current_dir_name then go xs yss
+        else if y = Filename.current_dir_name then go xss ys
+        else
+          let start =
+            Ext_list.fold_left xs Ext_string.parent_dir_lit (fun acc _ ->
+                acc // Ext_string.parent_dir_lit)
+          in
+          Ext_list.fold_left yss start (fun acc v -> acc // v)
       | [], [] -> Ext_string.empty
       | [], y :: ys -> Ext_list.fold_left ys y (fun acc x -> acc // x)
       | _ :: xs, [] ->
-          Ext_list.fold_left xs Ext_string.parent_dir_lit (fun acc _ ->
-              acc // Ext_string.parent_dir_lit)
+        Ext_list.fold_left xs Ext_string.parent_dir_lit (fun acc _ ->
+            acc // Ext_string.parent_dir_lit)
     in
     let v = go paths1 paths2 in
 
@@ -211,16 +198,20 @@ let rel_normalized_absolute_path ~from to_ =
 
 (** See tests in {!Ounit_path_tests} *)
 let normalize_absolute_path x =
-  let drop_if_exist xs = match xs with [] -> [] | _ :: xs -> xs in
+  let drop_if_exist xs =
+    match xs with
+    | [] -> []
+    | _ :: xs -> xs
+  in
   let rec normalize_list acc paths =
     match paths with
     | [] -> acc
     | x :: xs ->
-        if Ext_string.equal x Ext_string.current_dir_lit then
-          normalize_list acc xs
-        else if Ext_string.equal x Ext_string.parent_dir_lit then
-          normalize_list (drop_if_exist acc) xs
-        else normalize_list (x :: acc) xs
+      if Ext_string.equal x Ext_string.current_dir_lit then
+        normalize_list acc xs
+      else if Ext_string.equal x Ext_string.parent_dir_lit then
+        normalize_list (drop_if_exist acc) xs
+      else normalize_list (x :: acc) xs
   in
   let root, paths = split_aux x in
   let rev_paths = normalize_list [] paths in
@@ -229,7 +220,9 @@ let normalize_absolute_path x =
     | [] -> Filename.concat root acc
     | last :: rest -> go (Filename.concat last acc) rest
   in
-  match rev_paths with [] -> root | last :: rest -> go last rest
+  match rev_paths with
+  | [] -> root
+  | last :: rest -> go last rest
 
 let absolute_path cwd s =
   let process s =
@@ -262,16 +255,20 @@ let check_suffix_case = Ext_string.ends_with
 
 (* Input must be absolute directory *)
 let rec find_root_filename ~cwd filenames =
-  let file_exists = Ext_list.exists filenames (fun filename ->
-    Sys.file_exists (Filename.concat cwd filename))
+  let file_exists =
+    Ext_list.exists filenames (fun filename ->
+        Sys.file_exists (Filename.concat cwd filename))
   in
   if file_exists then cwd
   else
     let cwd' = Filename.dirname cwd in
     if String.length cwd' < String.length cwd then
       find_root_filename ~cwd:cwd' filenames
-    else Ext_fmt.failwithf ~loc:__LOC__ "%s not found from %s" (List.hd filenames) cwd
+    else
+      Ext_fmt.failwithf ~loc:__LOC__ "%s not found from %s" (List.hd filenames)
+        cwd
 
-let find_config_dir cwd = find_root_filename ~cwd [Literals.rescript_json; Literals.bsconfig_json]
+let find_config_dir cwd =
+  find_root_filename ~cwd [Literals.rescript_json; Literals.bsconfig_json]
 
 let package_dir = lazy (find_config_dir (Lazy.force cwd))
diff --git a/jscomp/ext/ext_path.mli b/compiler/ext/ext_path.mli
similarity index 100%
rename from jscomp/ext/ext_path.mli
rename to compiler/ext/ext_path.mli
diff --git a/jscomp/ext/ext_pervasives.ml b/compiler/ext/ext_pervasives.ml
similarity index 96%
rename from jscomp/ext/ext_pervasives.ml
rename to compiler/ext/ext_pervasives.ml
index ede7f8a..cdc44d8 100644
--- a/jscomp/ext/ext_pervasives.ml
+++ b/compiler/ext/ext_pervasives.ml
@@ -22,16 +22,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-external reraise : exn -> 'a = "%reraise"
+external reraise : exn -> 'a = "%raise"
 
 let finally v ~clean:action f =
   match f v with
   | exception e ->
-      action v;
-      reraise e
+    action v;
+    reraise e
   | e ->
-      action v;
-      e
+    action v;
+    e
 
 (* let try_it f  =
    try ignore (f ()) with _ -> () *)
diff --git a/jscomp/ext/ext_pervasives.mli b/compiler/ext/ext_pervasives.mli
similarity index 97%
rename from jscomp/ext/ext_pervasives.mli
rename to compiler/ext/ext_pervasives.mli
index a476190..970898d 100644
--- a/jscomp/ext/ext_pervasives.mli
+++ b/compiler/ext/ext_pervasives.mli
@@ -25,7 +25,7 @@
 (** Extension to standard library [Pervavives] module, safe to open 
 *)
 
-external reraise : exn -> 'a = "%reraise"
+external reraise : exn -> 'a = "%raise"
 
 val finally : 'a -> clean:('a -> unit) -> ('a -> 'b) -> 'b
 
diff --git a/jscomp/ext/ext_position.ml b/compiler/ext/ext_position.ml
similarity index 96%
rename from jscomp/ext/ext_position.ml
rename to compiler/ext/ext_position.ml
index 96e575b..a154094 100644
--- a/jscomp/ext/ext_position.ml
+++ b/compiler/ext/ext_position.ml
@@ -23,10 +23,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 type t = Lexing.position = {
-  pos_fname : string;
-  pos_lnum : int;
-  pos_bol : int;
-  pos_cnum : int;
+  pos_fname: string;
+  pos_lnum: int;
+  pos_bol: int;
+  pos_cnum: int;
 }
 
 let offset (x : t) (y : t) =
diff --git a/jscomp/ext/ext_position.mli b/compiler/ext/ext_position.mli
similarity index 95%
rename from jscomp/ext/ext_position.mli
rename to compiler/ext/ext_position.mli
index 0d17a2c..7d0a056 100644
--- a/jscomp/ext/ext_position.mli
+++ b/compiler/ext/ext_position.mli
@@ -23,10 +23,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 type t = Lexing.position = {
-  pos_fname : string;
-  pos_lnum : int;
-  pos_bol : int;
-  pos_cnum : int;
+  pos_fname: string;
+  pos_lnum: int;
+  pos_bol: int;
+  pos_cnum: int;
 }
 
 val offset : t -> t -> t
diff --git a/jscomp/ext/ext_pp.ml b/compiler/ext/ext_pp.ml
similarity index 94%
rename from jscomp/ext/ext_pp.ml
rename to compiler/ext/ext_pp.ml
index 7ac0502..f9237c2 100644
--- a/jscomp/ext/ext_pp.ml
+++ b/compiler/ext/ext_pp.ml
@@ -31,11 +31,11 @@ end
 let indent_length = String.length L.indent_str
 
 type t = {
-  output_string : string -> unit;
-  output_char : char -> unit;
-  flush : unit -> unit;
-  mutable indent_level : int;
-  mutable last_new_line : bool;
+  output_string: string -> unit;
+  output_char: char -> unit;
+  flush: unit -> unit;
+  mutable indent_level: int;
+  mutable last_new_line: bool;
       (* only when we print newline, we print the indent *)
 }
 
@@ -160,8 +160,8 @@ let paren_vgroup st n action =
 
 let paren_group st n action = group st n (fun _ -> paren st action)
 
-let cond_paren_group st b n action =
-  if b then paren_group st n action else action ()
+let cond_paren_group st b action =
+  if b then paren_group st 0 action else action ()
 
 let brace_group st n action = group st n (fun _ -> brace st action)
 
diff --git a/jscomp/ext/ext_pp.mli b/compiler/ext/ext_pp.mli
similarity index 97%
rename from jscomp/ext/ext_pp.mli
rename to compiler/ext/ext_pp.mli
index 6db5327..aaf2176 100644
--- a/jscomp/ext/ext_pp.mli
+++ b/compiler/ext/ext_pp.mli
@@ -56,7 +56,7 @@ val brace : t -> (unit -> 'a) -> 'a
 
 val paren_group : t -> int -> (unit -> 'a) -> 'a
 
-val cond_paren_group : t -> bool -> int -> (unit -> 'a) -> 'a
+val cond_paren_group : t -> bool -> (unit -> 'a) -> 'a
 
 val paren_vgroup : t -> int -> (unit -> 'a) -> 'a
 
diff --git a/jscomp/ext/ext_pp_scope.ml b/compiler/ext/ext_pp_scope.ml
similarity index 92%
rename from jscomp/ext/ext_pp_scope.ml
rename to compiler/ext/ext_pp_scope.ml
index 66df85d..f074a41 100644
--- a/jscomp/ext/ext_pp_scope.ml
+++ b/compiler/ext/ext_pp_scope.ml
@@ -42,11 +42,11 @@ let add_ident ~mangled:name (stamp : int) (cxt : t) : int * t =
   match Map_string.find_opt cxt name with
   | None -> (0, Map_string.add cxt name (Map_int.add Map_int.empty stamp 0))
   | Some imap -> (
-      match Map_int.find_opt imap stamp with
-      | None ->
-          let v = Map_int.cardinal imap in
-          (v, Map_string.add cxt name (Map_int.add imap stamp v))
-      | Some i -> (i, cxt))
+    match Map_int.find_opt imap stamp with
+    | None ->
+      let v = Map_int.cardinal imap in
+      (v, Map_string.add cxt name (Map_int.add imap stamp v))
+    | Some i -> (i, cxt))
 
 (**
    same as {!Js_dump.ident} except it generates a string instead of doing the printing
@@ -104,10 +104,10 @@ let merge (cxt : t) (set : Set_ident.t) =
    update twice,  once is enough
 *)
 let sub_scope (scope : t) (idents : Set_ident.t) : t =
-  Set_ident.fold idents empty (fun { name } acc ->
+  Set_ident.fold idents empty (fun {name} acc ->
       let mangled = Ext_ident.convert name in
       match Map_string.find_exn scope mangled with
       | exception Not_found -> assert false
       | imap ->
-          if Map_string.mem acc mangled then acc
-          else Map_string.add acc mangled imap)
+        if Map_string.mem acc mangled then acc
+        else Map_string.add acc mangled imap)
diff --git a/jscomp/ext/ext_pp_scope.mli b/compiler/ext/ext_pp_scope.mli
similarity index 100%
rename from jscomp/ext/ext_pp_scope.mli
rename to compiler/ext/ext_pp_scope.mli
diff --git a/jscomp/ext/ext_ref.ml b/compiler/ext/ext_ref.ml
similarity index 100%
rename from jscomp/ext/ext_ref.ml
rename to compiler/ext/ext_ref.ml
diff --git a/jscomp/ext/ext_ref.mli b/compiler/ext/ext_ref.mli
similarity index 100%
rename from jscomp/ext/ext_ref.mli
rename to compiler/ext/ext_ref.mli
diff --git a/jscomp/ext/ext_scc.ml b/compiler/ext/ext_scc.ml
similarity index 100%
rename from jscomp/ext/ext_scc.ml
rename to compiler/ext/ext_scc.ml
diff --git a/jscomp/ext/ext_scc.mli b/compiler/ext/ext_scc.mli
similarity index 100%
rename from jscomp/ext/ext_scc.mli
rename to compiler/ext/ext_scc.mli
diff --git a/jscomp/ext/ext_spec.ml b/compiler/ext/ext_spec.ml
similarity index 100%
rename from jscomp/ext/ext_spec.ml
rename to compiler/ext/ext_spec.ml
diff --git a/jscomp/ext/ext_spec.mli b/compiler/ext/ext_spec.mli
similarity index 100%
rename from jscomp/ext/ext_spec.mli
rename to compiler/ext/ext_spec.mli
diff --git a/jscomp/ext/ext_string.ml b/compiler/ext/ext_string.ml
similarity index 100%
rename from jscomp/ext/ext_string.ml
rename to compiler/ext/ext_string.ml
diff --git a/jscomp/ext/ext_string.mli b/compiler/ext/ext_string.mli
similarity index 100%
rename from jscomp/ext/ext_string.mli
rename to compiler/ext/ext_string.mli
diff --git a/compiler/ext/ext_string_array.ml b/compiler/ext/ext_string_array.ml
new file mode 100644
index 0000000..0e3fb42
--- /dev/null
+++ b/compiler/ext/ext_string_array.ml
@@ -0,0 +1,91 @@
+(* Copyright (C) 2020 - Present Hongbo Zhang, Authors of ReScript
+ * 
+ * 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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. *)
+
+(* Invariant: the same as encoding Map_string.compare_key  *)
+let cmp = Ext_string.compare
+
+let rec binary_search_aux (arr : string array) (lo : int) (hi : int)
+    (key : string) : _ option =
+  let mid = (lo + hi) / 2 in
+  let mid_val = Array.unsafe_get arr mid in
+  let c = cmp key mid_val in
+  if c = 0 then Some mid
+  else if c < 0 then
+    (*  a[lo] =< key < a[mid] <= a[hi] *)
+    if hi = mid then
+      let lo_val = Array.unsafe_get arr lo in
+      if lo_val = key then Some lo else None
+    else binary_search_aux arr lo mid key
+  else if
+    (*  a[lo] =< a[mid] < key <= a[hi] *)
+    lo = mid
+  then
+    let hi_val = Array.unsafe_get arr hi in
+    if hi_val = key then Some hi else None
+  else binary_search_aux arr mid hi key
+
+let find_sorted sorted key : int option =
+  let len = Array.length sorted in
+  if len = 0 then None
+  else
+    let lo = Array.unsafe_get sorted 0 in
+    let c = cmp key lo in
+    if c < 0 then None
+    else
+      let hi = Array.unsafe_get sorted (len - 1) in
+      let c2 = cmp key hi in
+      if c2 > 0 then None else binary_search_aux sorted 0 (len - 1) key
+
+let rec binary_search_assoc (arr : (string * _) array) (lo : int) (hi : int)
+    (key : string) : _ option =
+  let mid = (lo + hi) / 2 in
+  let mid_val = Array.unsafe_get arr mid in
+  let c = cmp key (fst mid_val) in
+  if c = 0 then Some (snd mid_val)
+  else if c < 0 then
+    (*  a[lo] =< key < a[mid] <= a[hi] *)
+    if hi = mid then
+      let lo_val = Array.unsafe_get arr lo in
+      if fst lo_val = key then Some (snd lo_val) else None
+    else binary_search_assoc arr lo mid key
+  else if
+    (*  a[lo] =< a[mid] < key <= a[hi] *)
+    lo = mid
+  then
+    let hi_val = Array.unsafe_get arr hi in
+    if fst hi_val = key then Some (snd hi_val) else None
+  else binary_search_assoc arr mid hi key
+
+let find_sorted_assoc (type a) (sorted : (string * a) array) (key : string) :
+    a option =
+  let len = Array.length sorted in
+  if len = 0 then None
+  else
+    let lo = Array.unsafe_get sorted 0 in
+    let c = cmp key (fst lo) in
+    if c < 0 then None
+    else
+      let hi = Array.unsafe_get sorted (len - 1) in
+      let c2 = cmp key (fst hi) in
+      if c2 > 0 then None else binary_search_assoc sorted 0 (len - 1) key
diff --git a/jscomp/ext/ext_string_array.mli b/compiler/ext/ext_string_array.mli
similarity index 100%
rename from jscomp/ext/ext_string_array.mli
rename to compiler/ext/ext_string_array.mli
diff --git a/jscomp/ext/ext_sys.ml b/compiler/ext/ext_sys.ml
similarity index 100%
rename from jscomp/ext/ext_sys.ml
rename to compiler/ext/ext_sys.ml
diff --git a/jscomp/ext/ext_sys.mli b/compiler/ext/ext_sys.mli
similarity index 100%
rename from jscomp/ext/ext_sys.mli
rename to compiler/ext/ext_sys.mli
diff --git a/jscomp/ext/ext_utf8.ml b/compiler/ext/ext_utf8.ml
similarity index 84%
rename from jscomp/ext/ext_utf8.ml
rename to compiler/ext/ext_utf8.ml
index 0d02b2c..04846c1 100644
--- a/jscomp/ext/ext_utf8.ml
+++ b/compiler/ext/ext_utf8.ml
@@ -29,19 +29,30 @@ let classify chr =
   let c = int_of_char chr in
   (* Classify byte according to leftmost 0 bit *)
   if c land 0b1000_0000 = 0 then Single c
-  else if (* c 0b0____*)
-          c land 0b0100_0000 = 0 then Cont (c land 0b0011_1111)
-  else if (* c 0b10___*)
-          c land 0b0010_0000 = 0 then Leading (1, c land 0b0001_1111)
-  else if (* c 0b110__*)
-          c land 0b0001_0000 = 0 then Leading (2, c land 0b0000_1111)
-  else if (* c 0b1110_ *)
-          c land 0b0000_1000 = 0 then Leading (3, c land 0b0000_0111)
-  else if (* c 0b1111_0___*)
-          c land 0b0000_0100 = 0 then Leading (4, c land 0b0000_0011)
-  else if (* c 0b1111_10__*)
-          c land 0b0000_0010 = 0 then Leading (5, c land 0b0000_0001)
-    (* c 0b1111_110__ *)
+  else if
+    (* c 0b0____*)
+    c land 0b0100_0000 = 0
+  then Cont (c land 0b0011_1111)
+  else if
+    (* c 0b10___*)
+    c land 0b0010_0000 = 0
+  then Leading (1, c land 0b0001_1111)
+  else if
+    (* c 0b110__*)
+    c land 0b0001_0000 = 0
+  then Leading (2, c land 0b0000_1111)
+  else if
+    (* c 0b1110_ *)
+    c land 0b0000_1000 = 0
+  then Leading (3, c land 0b0000_0111)
+  else if
+    (* c 0b1111_0___*)
+    c land 0b0000_0100 = 0
+  then Leading (4, c land 0b0000_0011)
+  else if
+    (* c 0b1111_10__*)
+    c land 0b0000_0010 = 0
+  then Leading (5, c land 0b0000_0001) (* c 0b1111_110__ *)
   else Invalid
 
 exception Invalid_utf8 of string
@@ -74,13 +85,13 @@ let decode_utf8_string s =
     else
       match classify s.[i] with
       | Single c ->
-          add c;
-          decode_utf8_cont s (i + 1) s_len
+        add c;
+        decode_utf8_cont s (i + 1) s_len
       | Cont _ -> raise (Invalid_utf8 "Unexpected continuation byte")
       | Leading (n, c) ->
-          let c', i' = follow s n c i in
-          add c';
-          decode_utf8_cont s (i' + 1) s_len
+        let c', i' = follow s n c i in
+        add c';
+        decode_utf8_cont s (i' + 1) s_len
       | Invalid -> raise (Invalid_utf8 "Invalid byte")
   in
   decode_utf8_cont s 0 (String.length s);
@@ -128,4 +139,3 @@ let encode_codepoint c =
     Bytes.unsafe_set bytes 3
       (Char.unsafe_chr (0b1000_0000 lor (c land cont_mask)));
     Bytes.unsafe_to_string bytes
-
diff --git a/jscomp/ext/ext_utf8.mli b/compiler/ext/ext_utf8.mli
similarity index 100%
rename from jscomp/ext/ext_utf8.mli
rename to compiler/ext/ext_utf8.mli
diff --git a/jscomp/ext/ext_util.ml b/compiler/ext/ext_util.ml
similarity index 91%
rename from jscomp/ext/ext_util.ml
rename to compiler/ext/ext_util.ml
index 1be75ff..58b8ad2 100644
--- a/jscomp/ext/ext_util.ml
+++ b/compiler/ext/ext_util.ml
@@ -34,7 +34,7 @@ let rec power_2_above x n =
   else power_2_above (x * 2) n
 
 let stats_to_string
-    ({ num_bindings; num_buckets; max_bucket_length; bucket_histogram } :
+    ({num_bindings; num_buckets; max_bucket_length; bucket_histogram} :
       Hashtbl.statistics) =
   Printf.sprintf "bindings: %d,buckets: %d, longest: %d, hist:[%s]" num_bindings
     num_buckets max_bucket_length
@@ -53,9 +53,9 @@ let string_of_int_as_char (i : int) : string =
       | '\r' -> "\\r"
       | '\b' -> "\\b"
       | ' ' .. '~' as c ->
-          let s = (Bytes.create [@doesNotRaise]) 1 in
-          Bytes.unsafe_set s 0 c;
-          Bytes.unsafe_to_string s
+        let s = (Bytes.create [@doesNotRaise]) 1 in
+        Bytes.unsafe_set s 0 c;
+        Bytes.unsafe_to_string s
       | _ -> Ext_utf8.encode_codepoint i
     in
     Printf.sprintf "\'%s\'" str
diff --git a/jscomp/ext/ext_util.mli b/compiler/ext/ext_util.mli
similarity index 99%
rename from jscomp/ext/ext_util.mli
rename to compiler/ext/ext_util.mli
index d31d11a..720e5b1 100644
--- a/jscomp/ext/ext_util.mli
+++ b/compiler/ext/ext_util.mli
@@ -27,4 +27,3 @@ val power_2_above : int -> int -> int
 val stats_to_string : Hashtbl.statistics -> string
 
 val string_of_int_as_char : int -> string
-
diff --git a/jscomp/ext/hash.cppo.ml b/compiler/ext/hash.cppo.ml
similarity index 100%
rename from jscomp/ext/hash.cppo.ml
rename to compiler/ext/hash.cppo.ml
diff --git a/jscomp/ext/hash.mli b/compiler/ext/hash.mli
similarity index 100%
rename from jscomp/ext/hash.mli
rename to compiler/ext/hash.mli
diff --git a/compiler/ext/hash_gen.ml b/compiler/ext/hash_gen.ml
new file mode 100644
index 0000000..589639a
--- /dev/null
+++ b/compiler/ext/hash_gen.ml
@@ -0,0 +1,236 @@
+(***********************************************************************)
+(*                                                                     *)
+(*                                OCaml                                *)
+(*                                                                     *)
+(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
+(*                                                                     *)
+(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
+(*  en Automatique.  All rights reserved.  This file is distributed    *)
+(*  under the terms of the GNU Library General Public License, with    *)
+(*  the special exception on linking described in file ../LICENSE.     *)
+(*                                                                     *)
+(***********************************************************************)
+
+(* Hash tables *)
+
+(* We do dynamic hashing, and resize the table and rehash the elements
+   when buckets become too long. *)
+
+type ('a, 'b) bucket =
+  | Empty
+  | Cons of {mutable key: 'a; mutable data: 'b; mutable next: ('a, 'b) bucket}
+
+type ('a, 'b) t = {
+  mutable size: int;
+  (* number of entries *)
+  mutable data: ('a, 'b) bucket array;
+  (* the buckets *)
+  initial_size: int; (* initial array size *)
+}
+
+let create initial_size =
+  let s = Ext_util.power_2_above 16 initial_size in
+  {initial_size = s; size = 0; data = Array.make s Empty}
+
+let clear h =
+  h.size <- 0;
+  let len = Array.length h.data in
+  for i = 0 to len - 1 do
+    Array.unsafe_set h.data i Empty
+  done
+
+let reset h =
+  h.size <- 0;
+  h.data <- Array.make h.initial_size Empty
+
+let length h = h.size
+
+let resize indexfun h =
+  let odata = h.data in
+  let osize = Array.length odata in
+  let nsize = osize * 2 in
+  if nsize < Sys.max_array_length then (
+    let ndata = Array.make nsize Empty in
+    let ndata_tail = Array.make nsize Empty in
+    h.data <- ndata;
+    (* so that indexfun sees the new bucket count *)
+    let rec insert_bucket = function
+      | Empty -> ()
+      | Cons {key; next} as cell ->
+        let nidx = indexfun h key in
+        (match Array.unsafe_get ndata_tail nidx with
+        | Empty -> Array.unsafe_set ndata nidx cell
+        | Cons tail -> tail.next <- cell);
+        Array.unsafe_set ndata_tail nidx cell;
+        insert_bucket next
+    in
+    for i = 0 to osize - 1 do
+      insert_bucket (Array.unsafe_get odata i)
+    done;
+    for i = 0 to nsize - 1 do
+      match Array.unsafe_get ndata_tail i with
+      | Empty -> ()
+      | Cons tail -> tail.next <- Empty
+    done)
+
+let iter h f =
+  let rec do_bucket = function
+    | Empty -> ()
+    | Cons l ->
+      f l.key l.data;
+      do_bucket l.next
+  in
+  let d = h.data in
+  for i = 0 to Array.length d - 1 do
+    do_bucket (Array.unsafe_get d i)
+  done
+
+let fold h init f =
+  let rec do_bucket b accu =
+    match b with
+    | Empty -> accu
+    | Cons l -> do_bucket l.next (f l.key l.data accu)
+  in
+  let d = h.data in
+  let accu = ref init in
+  for i = 0 to Array.length d - 1 do
+    accu := do_bucket (Array.unsafe_get d i) !accu
+  done;
+  !accu
+
+let to_list h f = fold h [] (fun k data acc -> f k data :: acc)
+
+let rec small_bucket_mem (lst : _ bucket) eq key =
+  match lst with
+  | Empty -> false
+  | Cons lst -> (
+    eq key lst.key
+    ||
+    match lst.next with
+    | Empty -> false
+    | Cons lst -> (
+      eq key lst.key
+      ||
+      match lst.next with
+      | Empty -> false
+      | Cons lst -> eq key lst.key || small_bucket_mem lst.next eq key))
+
+let rec small_bucket_opt eq key (lst : _ bucket) : _ option =
+  match lst with
+  | Empty -> None
+  | Cons lst -> (
+    if eq key lst.key then Some lst.data
+    else
+      match lst.next with
+      | Empty -> None
+      | Cons lst -> (
+        if eq key lst.key then Some lst.data
+        else
+          match lst.next with
+          | Empty -> None
+          | Cons lst ->
+            if eq key lst.key then Some lst.data
+            else small_bucket_opt eq key lst.next))
+
+let rec small_bucket_key_opt eq key (lst : _ bucket) : _ option =
+  match lst with
+  | Empty -> None
+  | Cons {key = k; next} -> (
+    if eq key k then Some k
+    else
+      match next with
+      | Empty -> None
+      | Cons {key = k; next} -> (
+        if eq key k then Some k
+        else
+          match next with
+          | Empty -> None
+          | Cons {key = k; next} ->
+            if eq key k then Some k else small_bucket_key_opt eq key next))
+
+let rec small_bucket_default eq key default (lst : _ bucket) =
+  match lst with
+  | Empty -> default
+  | Cons lst -> (
+    if eq key lst.key then lst.data
+    else
+      match lst.next with
+      | Empty -> default
+      | Cons lst -> (
+        if eq key lst.key then lst.data
+        else
+          match lst.next with
+          | Empty -> default
+          | Cons lst ->
+            if eq key lst.key then lst.data
+            else small_bucket_default eq key default lst.next))
+
+let rec remove_bucket h (i : int) key ~(prec : _ bucket) (buck : _ bucket)
+    eq_key =
+  match buck with
+  | Empty -> ()
+  | Cons {key = k; next} ->
+    if eq_key k key then (
+      h.size <- h.size - 1;
+      match prec with
+      | Empty -> Array.unsafe_set h.data i next
+      | Cons c -> c.next <- next)
+    else remove_bucket h i key ~prec:buck next eq_key
+
+let rec replace_bucket key data (buck : _ bucket) eq_key =
+  match buck with
+  | Empty -> true
+  | Cons slot ->
+    if eq_key slot.key key then (
+      slot.key <- key;
+      slot.data <- data;
+      false)
+    else replace_bucket key data slot.next eq_key
+
+module type S = sig
+  type key
+
+  type 'a t
+
+  val create : int -> 'a t
+
+  val clear : 'a t -> unit
+
+  val reset : 'a t -> unit
+
+  val add : 'a t -> key -> 'a -> unit
+
+  val add_or_update : 'a t -> key -> update:('a -> 'a) -> 'a -> unit
+
+  val remove : 'a t -> key -> unit
+
+  val find_exn : 'a t -> key -> 'a
+
+  val find_all : 'a t -> key -> 'a list
+
+  val find_opt : 'a t -> key -> 'a option
+
+  val find_key_opt : 'a t -> key -> key option
+  (** return the key found in the hashtbl.
+      Use case: when you find the key existed in hashtbl, 
+      you want to use the one stored in the hashtbl. 
+      (they are semantically equivlanent, but may have other information different) 
+  *)
+
+  val find_default : 'a t -> key -> 'a -> 'a
+
+  val replace : 'a t -> key -> 'a -> unit
+
+  val mem : 'a t -> key -> bool
+
+  val iter : 'a t -> (key -> 'a -> unit) -> unit
+
+  val fold : 'a t -> 'b -> (key -> 'a -> 'b -> 'b) -> 'b
+
+  val length : 'a t -> int
+
+  (* val stats: 'a t -> Hashtbl.statistics *)
+  val to_list : 'a t -> (key -> 'a -> 'c) -> 'c list
+
+  val of_list2 : key list -> 'a list -> 'a t
+end
diff --git a/compiler/ext/hash_ident.mli b/compiler/ext/hash_ident.mli
new file mode 100644
index 0000000..4397186
--- /dev/null
+++ b/compiler/ext/hash_ident.mli
@@ -0,0 +1 @@
+include Hash_gen.S with type key = Ident.t
diff --git a/jscomp/ext/hash_int.mli b/compiler/ext/hash_int.mli
similarity index 100%
rename from jscomp/ext/hash_int.mli
rename to compiler/ext/hash_int.mli
diff --git a/jscomp/ext/hash_set.cppo.ml b/compiler/ext/hash_set.cppo.ml
similarity index 100%
rename from jscomp/ext/hash_set.cppo.ml
rename to compiler/ext/hash_set.cppo.ml
diff --git a/jscomp/ext/hash_set.mli b/compiler/ext/hash_set.mli
similarity index 100%
rename from jscomp/ext/hash_set.mli
rename to compiler/ext/hash_set.mli
diff --git a/jscomp/ext/hash_set_gen.ml b/compiler/ext/hash_set_gen.ml
similarity index 76%
rename from jscomp/ext/hash_set_gen.ml
rename to compiler/ext/hash_set_gen.ml
index a187903..db892ca 100644
--- a/jscomp/ext/hash_set_gen.ml
+++ b/compiler/ext/hash_set_gen.ml
@@ -25,21 +25,19 @@
 (* We do dynamic hashing, and resize the table and rehash the elements
    when buckets become too long. *)
 
-type 'a bucket =
-  | Empty
-  | Cons of { mutable key : 'a; mutable next : 'a bucket }
+type 'a bucket = Empty | Cons of {mutable key: 'a; mutable next: 'a bucket}
 
 type 'a t = {
-  mutable size : int;
+  mutable size: int;
   (* number of entries *)
-  mutable data : 'a bucket array;
+  mutable data: 'a bucket array;
   (* the buckets *)
-  initial_size : int; (* initial array size *)
+  initial_size: int; (* initial array size *)
 }
 
 let create initial_size =
   let s = Ext_util.power_2_above 16 initial_size in
-  { initial_size = s; size = 0; data = Array.make s Empty }
+  {initial_size = s; size = 0; data = Array.make s Empty}
 
 let clear h =
   h.size <- 0;
@@ -65,13 +63,13 @@ let resize indexfun h =
     (* so that indexfun sees the new bucket count *)
     let rec insert_bucket = function
       | Empty -> ()
-      | Cons { key; next } as cell ->
-          let nidx = indexfun h key in
-          (match Array.unsafe_get ndata_tail nidx with
-          | Empty -> Array.unsafe_set ndata nidx cell
-          | Cons tail -> tail.next <- cell);
-          Array.unsafe_set ndata_tail nidx cell;
-          insert_bucket next
+      | Cons {key; next} as cell ->
+        let nidx = indexfun h key in
+        (match Array.unsafe_get ndata_tail nidx with
+        | Empty -> Array.unsafe_set ndata nidx cell
+        | Cons tail -> tail.next <- cell);
+        Array.unsafe_set ndata_tail nidx cell;
+        insert_bucket next
     in
     for i = 0 to osize - 1 do
       insert_bucket (Array.unsafe_get odata i)
@@ -86,8 +84,8 @@ let iter h f =
   let rec do_bucket = function
     | Empty -> ()
     | Cons l ->
-        f l.key;
-        do_bucket l.next
+      f l.key;
+      do_bucket l.next
   in
   let d = h.data in
   for i = 0 to Array.length d - 1 do
@@ -96,7 +94,9 @@ let iter h f =
 
 let fold h init f =
   let rec do_bucket b accu =
-    match b with Empty -> accu | Cons l -> do_bucket l.next (f l.key accu)
+    match b with
+    | Empty -> accu
+    | Cons l -> do_bucket l.next (f l.key accu)
   in
   let d = h.data in
   let accu = ref init in
@@ -111,28 +111,28 @@ let rec small_bucket_mem eq key lst =
   match lst with
   | Empty -> false
   | Cons lst -> (
+    eq key lst.key
+    ||
+    match lst.next with
+    | Empty -> false
+    | Cons lst -> (
       eq key lst.key
       ||
       match lst.next with
       | Empty -> false
-      | Cons lst -> (
-          eq key lst.key
-          ||
-          match lst.next with
-          | Empty -> false
-          | Cons lst -> eq key lst.key || small_bucket_mem eq key lst.next))
+      | Cons lst -> eq key lst.key || small_bucket_mem eq key lst.next))
 
 let rec remove_bucket (h : _ t) (i : int) key ~(prec : _ bucket)
     (buck : _ bucket) eq_key =
   match buck with
   | Empty -> ()
-  | Cons { key = k; next } ->
-      if eq_key k key then (
-        h.size <- h.size - 1;
-        match prec with
-        | Empty -> Array.unsafe_set h.data i next
-        | Cons c -> c.next <- next)
-      else remove_bucket h i key ~prec:buck next eq_key
+  | Cons {key = k; next} ->
+    if eq_key k key then (
+      h.size <- h.size - 1;
+      match prec with
+      | Empty -> Array.unsafe_set h.data i next
+      | Cons c -> c.next <- next)
+    else remove_bucket h i key ~prec:buck next eq_key
 
 module type S = sig
   type key
diff --git a/jscomp/ext/hash_set_ident.mli b/compiler/ext/hash_set_ident.mli
similarity index 99%
rename from jscomp/ext/hash_set_ident.mli
rename to compiler/ext/hash_set_ident.mli
index 5fed77b..b32ba8a 100644
--- a/jscomp/ext/hash_set_ident.mli
+++ b/compiler/ext/hash_set_ident.mli
@@ -22,5 +22,4 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
 include Hash_set_gen.S with type key = Ident.t
diff --git a/compiler/ext/hash_set_ident_mask.ml b/compiler/ext/hash_set_ident_mask.ml
new file mode 100644
index 0000000..67a78d8
--- /dev/null
+++ b/compiler/ext/hash_set_ident_mask.ml
@@ -0,0 +1,143 @@
+(* 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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. *)
+
+(** A speicalized datastructure for scc algorithm *)
+
+type ident = Ident.t
+
+type bucket = Empty | Cons of {ident: ident; mutable mask: bool; rest: bucket}
+
+type t = {
+  mutable size: int;
+  mutable data: bucket array;
+  mutable mask_size: int; (* mark how many idents are marked *)
+}
+
+let key_index_by_ident (h : t) (key : Ident.t) =
+  Bs_hash_stubs.hash_string_int key.name key.stamp land (Array.length h.data - 1)
+
+let create initial_size =
+  let s = Ext_util.power_2_above 8 initial_size in
+  {size = 0; data = Array.make s Empty; mask_size = 0}
+
+let iter_and_unmask h f =
+  let rec iter_bucket buckets =
+    match buckets with
+    | Empty -> ()
+    | Cons k ->
+      let k_mask = k.mask in
+      f k.ident k_mask;
+      if k_mask then (
+        k.mask <- false;
+        (* we can set [h.mask_size] to zero,
+           however, it would result inconsistent state
+           once [f] throw
+        *)
+        h.mask_size <- h.mask_size - 1);
+      iter_bucket k.rest
+  in
+  let d = h.data in
+  for i = 0 to Array.length d - 1 do
+    iter_bucket (Array.unsafe_get d i)
+  done
+
+let rec small_bucket_mem key lst =
+  match lst with
+  | Empty -> false
+  | Cons rst -> (
+    Ext_ident.equal key rst.ident
+    ||
+    match rst.rest with
+    | Empty -> false
+    | Cons rst -> (
+      Ext_ident.equal key rst.ident
+      ||
+      match rst.rest with
+      | Empty -> false
+      | Cons rst ->
+        Ext_ident.equal key rst.ident || small_bucket_mem key rst.rest))
+
+let resize indexfun h =
+  let odata = h.data in
+  let osize = Array.length odata in
+  let nsize = osize * 2 in
+  if nsize < Sys.max_array_length then (
+    let ndata = Array.make nsize Empty in
+    h.data <- ndata;
+    (* so that indexfun sees the new bucket count *)
+    let rec insert_bucket = function
+      | Empty -> ()
+      | Cons {ident = key; mask; rest} ->
+        let nidx = indexfun h key in
+        Array.unsafe_set ndata nidx
+          (Cons {ident = key; mask; rest = Array.unsafe_get ndata nidx});
+        insert_bucket rest
+    in
+    for i = 0 to osize - 1 do
+      insert_bucket (Array.unsafe_get odata i)
+    done)
+
+let add_unmask (h : t) (key : Ident.t) =
+  let i = key_index_by_ident h key in
+  let h_data = h.data in
+  let old_bucket = Array.unsafe_get h_data i in
+  if not (small_bucket_mem key old_bucket) then (
+    Array.unsafe_set h_data i
+      (Cons {ident = key; mask = false; rest = old_bucket});
+    h.size <- h.size + 1;
+    if h.size > Array.length h_data lsl 1 then resize key_index_by_ident h)
+
+let rec small_bucket_mask key lst =
+  match lst with
+  | Empty -> false
+  | Cons rst -> (
+    if Ext_ident.equal key rst.ident then
+      if rst.mask then false
+      else (
+        rst.mask <- true;
+        true)
+    else
+      match rst.rest with
+      | Empty -> false
+      | Cons rst -> (
+        if Ext_ident.equal key rst.ident then
+          if rst.mask then false
+          else (
+            rst.mask <- true;
+            true)
+        else
+          match rst.rest with
+          | Empty -> false
+          | Cons rst ->
+            if Ext_ident.equal key rst.ident then
+              if rst.mask then false
+              else (
+                rst.mask <- true;
+                true)
+            else small_bucket_mask key rst.rest))
+
+let mask_and_check_all_hit (h : t) (key : Ident.t) =
+  if small_bucket_mask key (Array.unsafe_get h.data (key_index_by_ident h key))
+  then h.mask_size <- h.mask_size + 1;
+  h.size = h.mask_size
diff --git a/compiler/ext/hash_set_ident_mask.mli b/compiler/ext/hash_set_ident_mask.mli
new file mode 100644
index 0000000..1c5bb8f
--- /dev/null
+++ b/compiler/ext/hash_set_ident_mask.mli
@@ -0,0 +1,23 @@
+type ident = Ident.t
+(** Based on [hash_set] specialized for mask operations  *)
+
+type t
+
+val create : int -> t
+
+(* add one ident
+   ident is unmaksed by default
+*)
+val add_unmask : t -> ident -> unit
+
+val mask_and_check_all_hit : t -> ident -> bool
+(** [check_mask h key] if [key] exists mask it otherwise nothing
+    return true if all keys are masked otherwise false
+*)
+
+val iter_and_unmask : t -> (ident -> bool -> unit) -> unit
+(** [iter_and_unmask f h] iterating the collection and mask all idents,
+    dont consul the collection in function [f]
+    TODO: what happens if an exception raised in the callback,
+    would the hashtbl still be in consistent state?
+*)
diff --git a/jscomp/ext/hash_set_int.mli b/compiler/ext/hash_set_int.mli
similarity index 100%
rename from jscomp/ext/hash_set_int.mli
rename to compiler/ext/hash_set_int.mli
diff --git a/jscomp/ext/hash_set_poly.mli b/compiler/ext/hash_set_poly.mli
similarity index 100%
rename from jscomp/ext/hash_set_poly.mli
rename to compiler/ext/hash_set_poly.mli
diff --git a/jscomp/ext/hash_set_string.mli b/compiler/ext/hash_set_string.mli
similarity index 100%
rename from jscomp/ext/hash_set_string.mli
rename to compiler/ext/hash_set_string.mli
diff --git a/jscomp/ext/hash_string.mli b/compiler/ext/hash_string.mli
similarity index 100%
rename from jscomp/ext/hash_string.mli
rename to compiler/ext/hash_string.mli
diff --git a/compiler/ext/ident.ml b/compiler/ext/ident.ml
new file mode 100644
index 0000000..a5ca80e
--- /dev/null
+++ b/compiler/ext/ident.ml
@@ -0,0 +1,238 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Format
+
+type t = {stamp: int; name: string; mutable flags: int}
+
+let[@inlnie] max (x : int) y = if x >= y then x else y
+let global_flag = 1
+let predef_exn_flag = 2
+
+(* A stamp of 0 denotes a persistent identifier *)
+
+let currentstamp = ref 0
+
+let create s =
+  incr currentstamp;
+  {name = s; stamp = !currentstamp; flags = 0}
+
+let create_predef_exn s =
+  incr currentstamp;
+  {name = s; stamp = !currentstamp; flags = predef_exn_flag}
+
+let create_persistent s = {name = s; stamp = 0; flags = global_flag}
+
+let rename i =
+  incr currentstamp;
+  {i with stamp = !currentstamp}
+
+let name i = i.name
+
+let unique_name i = i.name ^ "_" ^ string_of_int i.stamp
+
+let unique_toplevel_name i = i.name ^ "/" ^ string_of_int i.stamp
+
+let persistent i = i.stamp = 0
+
+let equal i1 i2 = i1.name = i2.name
+
+let same ({stamp; name} : t) i2 =
+  if stamp <> 0 then stamp = i2.stamp else i2.stamp = 0 && name = i2.name
+
+let binding_time i = i.stamp
+
+let current_time () = !currentstamp
+let set_current_time t = currentstamp := max !currentstamp t
+
+let reinit_level = ref (-1)
+
+let reinit () =
+  if !reinit_level < 0 then reinit_level := !currentstamp
+  else currentstamp := !reinit_level
+
+let hide i = {i with stamp = -1}
+
+let make_global i = i.flags <- i.flags lor global_flag
+
+let global i = i.flags land global_flag <> 0
+
+let is_predef_exn i = i.flags land predef_exn_flag <> 0
+
+let print ppf i =
+  match i.stamp with
+  | 0 -> fprintf ppf "%s!" i.name
+  | -1 -> fprintf ppf "%s#" i.name
+  | n -> fprintf ppf "%s/%i%s" i.name n (if global i then "g" else "")
+
+type 'a tbl = Empty | Node of 'a tbl * 'a data * 'a tbl * int
+
+and 'a data = {ident: t; data: 'a; previous: 'a data option}
+
+let empty = Empty
+
+(* Inline expansion of height for better speed
+ * let height = function
+ *     Empty -> 0
+ *   | Node(_,_,_,h) -> h
+ *)
+
+let mknode l d r =
+  let hl =
+    match l with
+    | Empty -> 0
+    | Node (_, _, _, h) -> h
+  and hr =
+    match r with
+    | Empty -> 0
+    | Node (_, _, _, h) -> h
+  in
+  Node (l, d, r, if hl >= hr then hl + 1 else hr + 1)
+
+let balance l d r =
+  let hl =
+    match l with
+    | Empty -> 0
+    | Node (_, _, _, h) -> h
+  and hr =
+    match r with
+    | Empty -> 0
+    | Node (_, _, _, h) -> h
+  in
+  if hl > hr + 1 then
+    match l with
+    | Node (ll, ld, lr, _)
+      when (match ll with
+           | Empty -> 0
+           | Node (_, _, _, h) -> h)
+           >=
+           match lr with
+           | Empty -> 0
+           | Node (_, _, _, h) -> h ->
+      mknode ll ld (mknode lr d r)
+    | Node (ll, ld, Node (lrl, lrd, lrr, _), _) ->
+      mknode (mknode ll ld lrl) lrd (mknode lrr d r)
+    | _ -> assert false
+  else if hr > hl + 1 then
+    match r with
+    | Node (rl, rd, rr, _)
+      when (match rr with
+           | Empty -> 0
+           | Node (_, _, _, h) -> h)
+           >=
+           match rl with
+           | Empty -> 0
+           | Node (_, _, _, h) -> h ->
+      mknode (mknode l d rl) rd rr
+    | Node (Node (rll, rld, rlr, _), rd, rr, _) ->
+      mknode (mknode l d rll) rld (mknode rlr rd rr)
+    | _ -> assert false
+  else mknode l d r
+
+let rec add id data = function
+  | Empty -> Node (Empty, {ident = id; data; previous = None}, Empty, 1)
+  | Node (l, k, r, h) ->
+    let c = compare id.name k.ident.name in
+    if c = 0 then Node (l, {ident = id; data; previous = Some k}, r, h)
+    else if c < 0 then balance (add id data l) k r
+    else balance l k (add id data r)
+
+let rec find_stamp s = function
+  | None -> raise Not_found
+  | Some k -> if k.ident.stamp = s then k.data else find_stamp s k.previous
+
+let rec find_same id = function
+  | Empty -> raise Not_found
+  | Node (l, k, r, _) ->
+    let c = compare id.name k.ident.name in
+    if c = 0 then
+      if id.stamp = k.ident.stamp then k.data
+      else find_stamp id.stamp k.previous
+    else find_same id (if c < 0 then l else r)
+
+let rec find_name name = function
+  | Empty -> raise Not_found
+  | Node (l, k, r, _) ->
+    let c = compare name k.ident.name in
+    if c = 0 then (k.ident, k.data) else find_name name (if c < 0 then l else r)
+
+let rec get_all = function
+  | None -> []
+  | Some k -> (k.ident, k.data) :: get_all k.previous
+
+let rec find_all name = function
+  | Empty -> []
+  | Node (l, k, r, _) ->
+    let c = compare name k.ident.name in
+    if c = 0 then (k.ident, k.data) :: get_all k.previous
+    else find_all name (if c < 0 then l else r)
+
+let rec fold_aux f stack accu = function
+  | Empty -> (
+    match stack with
+    | [] -> accu
+    | a :: l -> fold_aux f l accu a)
+  | Node (l, k, r, _) -> fold_aux f (l :: stack) (f k accu) r
+
+let fold_name f tbl accu = fold_aux (fun k -> f k.ident k.data) [] accu tbl
+
+let rec fold_data f d accu =
+  match d with
+  | None -> accu
+  | Some k -> f k.ident k.data (fold_data f k.previous accu)
+
+let fold_all f tbl accu = fold_aux (fun k -> fold_data f (Some k)) [] accu tbl
+
+(* let keys tbl = fold_name (fun k _ accu -> k::accu) tbl [] *)
+
+let rec iter f = function
+  | Empty -> ()
+  | Node (l, k, r, _) ->
+    iter f l;
+    f k.ident k.data;
+    iter f r
+
+(* Idents for sharing keys *)
+
+(* They should be 'totally fresh' -> neg numbers *)
+let key_name = ""
+
+let make_key_generator () =
+  let c = ref 1 in
+  fun id ->
+    let stamp = !c in
+    decr c;
+    {id with name = key_name; stamp}
+
+let compare x y =
+  let c = x.stamp - y.stamp in
+  if c <> 0 then c
+  else
+    let c = compare x.name y.name in
+    if c <> 0 then c else compare x.flags y.flags
+
+let output oc id = output_string oc (unique_name id)
+let hash i = Char.code i.name.[0] lxor i.stamp
+
+let original_equal = equal
+include Identifiable.Make (struct
+  type nonrec t = t
+  let compare = compare
+  let output = output
+  let print = print
+  let hash = hash
+  let equal = same
+end)
+let equal = original_equal
diff --git a/compiler/ext/ident.mli b/compiler/ext/ident.mli
new file mode 100644
index 0000000..d73cff6
--- /dev/null
+++ b/compiler/ext/ident.mli
@@ -0,0 +1,72 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Identifiers (unique names) *)
+
+type t = {stamp: int; name: string; mutable flags: int}
+
+include Identifiable.S with type t := t
+(* Notes:
+   - [equal] compares identifiers by name
+   - [compare x y] is 0 if [same x y] is true.
+   - [compare] compares identifiers by binding location
+*)
+
+val create : string -> t
+val create_persistent : string -> t
+val create_predef_exn : string -> t
+val rename : t -> t
+val name : t -> string
+val unique_name : t -> string
+val unique_toplevel_name : t -> string
+val persistent : t -> bool
+val same : t -> t -> bool
+(* Compare identifiers by binding location.
+   Two identifiers are the same either if they are both
+   non-persistent and have been created by the same call to
+   [new], or if they are both persistent and have the same
+   name. *)
+
+val compare : t -> t -> int
+val hide : t -> t
+(* Return an identifier with same name as the given identifier,
+   but stamp different from any stamp returned by new.
+   When put in a 'a tbl, this identifier can only be looked
+   up by name. *)
+
+val make_global : t -> unit
+val global : t -> bool
+val is_predef_exn : t -> bool
+
+val binding_time : t -> int
+val current_time : unit -> int
+val set_current_time : int -> unit
+val reinit : unit -> unit
+
+type 'a tbl
+(* Association tables from identifiers to type 'a. *)
+
+val empty : 'a tbl
+val add : t -> 'a -> 'a tbl -> 'a tbl
+val find_same : t -> 'a tbl -> 'a
+val find_name : string -> 'a tbl -> t * 'a
+val find_all : string -> 'a tbl -> (t * 'a) list
+val fold_name : (t -> 'a -> 'b -> 'b) -> 'a tbl -> 'b -> 'b
+val fold_all : (t -> 'a -> 'b -> 'b) -> 'a tbl -> 'b -> 'b
+val iter : (t -> 'a -> unit) -> 'a tbl -> unit
+
+(* Idents for sharing keys *)
+
+val make_key_generator : unit -> t -> t
diff --git a/jscomp/ext/identifiable.ml b/compiler/ext/identifiable.ml
similarity index 79%
rename from jscomp/ext/identifiable.ml
rename to compiler/ext/identifiable.ml
index 6ee0519..bd6133c 100644
--- a/jscomp/ext/identifiable.ml
+++ b/compiler/ext/identifiable.ml
@@ -26,9 +26,7 @@ end
 
 module type Set = sig
   module T : Set.OrderedType
-  include Set.S
-    with type elt = T.t
-     and type t = Set.Make (T).t
+  include Set.S with type elt = T.t and type t = Set.Make(T).t
 
   val output : out_channel -> t -> unit
   val print : Format.formatter -> t -> unit
@@ -39,14 +37,17 @@ end
 
 module type Map = sig
   module T : Map.OrderedType
-  include Map.S
-    with type key = T.t
-     and type 'a t = 'a Map.Make (T).t
+  include Map.S with type key = T.t and type 'a t = 'a Map.Make(T).t
 
   val filter_map : (key -> 'a -> 'b option) -> 'a t -> 'b t
   val of_list : (key * 'a) list -> 'a t
 
-  val disjoint_union : ?eq:('a -> 'a -> bool) -> ?print:(Format.formatter -> 'a -> unit) -> 'a t -> 'a t -> 'a t
+  val disjoint_union :
+    ?eq:('a -> 'a -> bool) ->
+    ?print:(Format.formatter -> 'a -> unit) ->
+    'a t ->
+    'a t ->
+    'a t
 
   val union_right : 'a t -> 'a t -> 'a t
 
@@ -70,9 +71,7 @@ module type Tbl = sig
     include Map.OrderedType with type t := t
     include Hashtbl.HashedType with type t := t
   end
-  include Hashtbl.S
-    with type key = T.t
-     and type 'a t = 'a Hashtbl.Make (T).t
+  include Hashtbl.S with type key = T.t and type 'a t = 'a Hashtbl.Make(T).t
 
   val to_list : 'a t -> (T.t * 'a) list
   val of_list : (T.t * 'a) list -> 'a t
@@ -88,8 +87,7 @@ module Pair (A : Thing) (B : Thing) : Thing with type t = A.t * B.t = struct
 
   let compare (a1, b1) (a2, b2) =
     let c = A.compare a1 a2 in
-    if c <> 0 then c
-    else B.compare b1 b2
+    if c <> 0 then c else B.compare b1 b2
 
   let output oc (a, b) = Printf.fprintf oc " (%a, %a)" A.output a B.output b
   let hash (a, b) = Hashtbl.hash (A.hash a, B.hash b)
@@ -100,62 +98,62 @@ end
 module Make_map (T : Thing) = struct
   include Map.Make (T)
 
-  let filter_map f t  =
-    fold (fun id v map ->
+  let filter_map f t =
+    fold
+      (fun id v map ->
         match f id v with
         | None -> map
-        | Some r -> add id r map) t empty
+        | Some r -> add id r map)
+      t empty
 
-  let of_list l =
-    List.fold_left (fun map (id, v) -> add id v map) empty l
+  let of_list l = List.fold_left (fun map (id, v) -> add id v map) empty l
 
   let disjoint_union ?eq ?print m1 m2 =
-    union (fun id v1 v2 ->
-        let ok = match eq with
+    union
+      (fun id v1 v2 ->
+        let ok =
+          match eq with
           | None -> false
           | Some eq -> eq v1 v2
         in
         if not ok then
           let err =
             match print with
-            | None ->
-              Format.asprintf "Map.disjoint_union %a" T.print id
+            | None -> Format.asprintf "Map.disjoint_union %a" T.print id
             | Some print ->
-              Format.asprintf "Map.disjoint_union %a => %a <> %a"
-                T.print id print v1 print v2
+              Format.asprintf "Map.disjoint_union %a => %a <> %a" T.print id
+                print v1 print v2
           in
           Misc.fatal_error err
         else Some v1)
       m1 m2
 
   let union_right m1 m2 =
-    merge (fun _id x y -> match x, y with
+    merge
+      (fun _id x y ->
+        match (x, y) with
         | None, None -> None
-        | None, Some v
-        | Some v, None
-        | Some _, Some v -> Some v)
+        | None, Some v | Some v, None | Some _, Some v -> Some v)
       m1 m2
 
   let union_left m1 m2 = union_right m2 m1
 
   let union_merge f m1 m2 =
     let aux _ m1 m2 =
-      match m1, m2 with
+      match (m1, m2) with
       | None, m | m, None -> m
       | Some m1, Some m2 -> Some (f m1 m2)
     in
     merge aux m1 m2
 
-  let rename m v =
-    try find v m
-    with Not_found -> v
+  let rename m v = try find v m with Not_found -> v
 
-  let map_keys f m =
-    of_list (List.map (fun (k, v) -> f k, v) (bindings m))
+  let map_keys f m = of_list (List.map (fun (k, v) -> (f k, v)) (bindings m))
 
   let print f ppf s =
-    let elts ppf s = iter (fun id v ->
-        Format.fprintf ppf "@ (@[%a@ %a@])" T.print id f v) s in
+    let elts ppf s =
+      iter (fun id v -> Format.fprintf ppf "@ (@[%a@ %a@])" T.print id f v) s
+    in
     Format.fprintf ppf "@[<1>{@[%a@ @]}@]" elts s
 
   module T_set = Set.Make (T)
@@ -168,13 +166,12 @@ module Make_map (T : Thing) = struct
 
   let transpose_keys_and_data map = fold (fun k v m -> add v k m) map empty
   let transpose_keys_and_data_set map =
-    fold (fun k v m ->
+    fold
+      (fun k v m ->
         let set =
           match find v m with
-          | exception Not_found ->
-            T_set.singleton k
-          | set ->
-            T_set.add k set
+          | exception Not_found -> T_set.singleton k
+          | set -> T_set.add k set
         in
         add v set m)
       map empty
@@ -194,7 +191,8 @@ module Make_set (T : Thing) = struct
 
   let to_string s = Format.asprintf "%a" print s
 
-  let of_list l = match l with
+  let of_list l =
+    match l with
     | [] -> empty
     | [t] -> singleton t
     | t :: q -> List.fold_left (fun acc e -> add e acc) (singleton t) q
@@ -207,8 +205,7 @@ module Make_tbl (T : Thing) = struct
 
   module T_map = Make_map (T)
 
-  let to_list t =
-    fold (fun key datum elts -> (key, datum)::elts) t []
+  let to_list t = fold (fun key datum elts -> (key, datum) :: elts) t []
 
   let of_list elts =
     let t = create 42 in
@@ -222,15 +219,14 @@ module Make_tbl (T : Thing) = struct
     T_map.iter (fun k v -> add t k v) m;
     t
 
-  let memoize t f = fun key ->
-    try find t key with
-    | Not_found ->
+  let memoize t f key =
+    try find t key
+    with Not_found ->
       let r = f key in
       add t key r;
       r
 
-  let map t f =
-    of_map (T_map.map f (to_map t))
+  let map t f = of_map (T_map.map f (to_map t))
 end
 
 module type S = sig
diff --git a/jscomp/ext/identifiable.mli b/compiler/ext/identifiable.mli
similarity index 90%
rename from jscomp/ext/identifiable.mli
rename to compiler/ext/identifiable.mli
index 46e1454..9dd8def 100644
--- a/jscomp/ext/identifiable.mli
+++ b/compiler/ext/identifiable.mli
@@ -30,9 +30,7 @@ module Pair : functor (A : Thing) (B : Thing) -> Thing with type t = A.t * B.t
 
 module type Set = sig
   module T : Set.OrderedType
-  include Set.S
-    with type elt = T.t
-     and type t = Set.Make (T).t
+  include Set.S with type elt = T.t and type t = Set.Make(T).t
 
   val output : out_channel -> t -> unit
   val print : Format.formatter -> t -> unit
@@ -43,24 +41,27 @@ end
 
 module type Map = sig
   module T : Map.OrderedType
-  include Map.S
-    with type key = T.t
-     and type 'a t = 'a Map.Make (T).t
+  include Map.S with type key = T.t and type 'a t = 'a Map.Make(T).t
 
   val filter_map : (key -> 'a -> 'b option) -> 'a t -> 'b t
   val of_list : (key * 'a) list -> 'a t
 
+  val disjoint_union :
+    ?eq:('a -> 'a -> bool) ->
+    ?print:(Format.formatter -> 'a -> unit) ->
+    'a t ->
+    'a t ->
+    'a t
   (** [disjoint_union m1 m2] contains all bindings from [m1] and
       [m2]. If some binding is present in both and the associated
       value is not equal, a Fatal_error is raised *)
-  val disjoint_union : ?eq:('a -> 'a -> bool) -> ?print:(Format.formatter -> 'a -> unit) -> 'a t -> 'a t -> 'a t
 
+  val union_right : 'a t -> 'a t -> 'a t
   (** [union_right m1 m2] contains all bindings from [m1] and [m2]. If
       some binding is present in both, the one from [m2] is taken *)
-  val union_right : 'a t -> 'a t -> 'a t
 
-  (** [union_left m1 m2 = union_right m2 m1] *)
   val union_left : 'a t -> 'a t -> 'a t
+  (** [union_left m1 m2 = union_right m2 m1] *)
 
   val union_merge : ('a -> 'a -> 'a) -> 'a t -> 'a t -> 'a t
   val rename : key t -> key -> key
@@ -80,9 +81,7 @@ module type Tbl = sig
     include Map.OrderedType with type t := t
     include Hashtbl.HashedType with type t := t
   end
-  include Hashtbl.S
-    with type key = T.t
-     and type 'a t = 'a Hashtbl.Make (T).t
+  include Hashtbl.S with type key = T.t and type 'a t = 'a Hashtbl.Make(T).t
 
   val to_list : 'a t -> (T.t * 'a) list
   val of_list : (T.t * 'a) list -> 'a t
diff --git a/jscomp/ext/int_vec_util.ml b/compiler/ext/int_vec_util.ml
similarity index 100%
rename from jscomp/ext/int_vec_util.ml
rename to compiler/ext/int_vec_util.ml
diff --git a/jscomp/ext/int_vec_util.mli b/compiler/ext/int_vec_util.mli
similarity index 100%
rename from jscomp/ext/int_vec_util.mli
rename to compiler/ext/int_vec_util.mli
diff --git a/jscomp/ext/int_vec_vec.ml b/compiler/ext/int_vec_vec.ml
similarity index 100%
rename from jscomp/ext/int_vec_vec.ml
rename to compiler/ext/int_vec_vec.ml
diff --git a/jscomp/ext/int_vec_vec.mli b/compiler/ext/int_vec_vec.mli
similarity index 100%
rename from jscomp/ext/int_vec_vec.mli
rename to compiler/ext/int_vec_vec.mli
diff --git a/compiler/ext/js_reserved_map.ml b/compiler/ext/js_reserved_map.ml
new file mode 100644
index 0000000..6daaff9
--- /dev/null
+++ b/compiler/ext/js_reserved_map.ml
@@ -0,0 +1,243 @@
+(* Copyright (C) 2019-Present Hongbo Zhang, Authors of ReScript
+ * 
+ * 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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. *)
+
+module STbl = struct
+  #if OCAML_VERSION >= (5, 0, 0)
+    include Hashtbl.Make (String)
+  #else
+    module StringHash : Hashtbl.HashedType with type t = string = struct
+      type t = string
+      let equal = String.equal
+      let hash = Hashtbl.hash (* polymorphic hash function *)
+    end
+    include Hashtbl.Make (StringHash)
+  #endif
+
+  let of_array arr =
+    let tbl = create (Array.length arr) in
+    let () = Array.iter (fun el -> add tbl el ()) arr in
+    tbl
+end
+
+(** Words that can never be identifier's name.
+
+    See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#reserved_words
+ *)
+let js_keywords = STbl.of_array [|
+  "break";
+  "case";
+  "catch";
+  "class";
+  "const";
+  "continue";
+  "debugger";
+  "default";
+  "delete";
+  "do";
+  "else";
+  "export";
+  "extends";
+  "false";
+  "finally";
+  "for";
+  "function";
+  "if";
+  "import";
+  "in";
+  "instanceof";
+  "new";
+  "null";
+  "return";
+  "super";
+  "switch";
+  "this";
+  "throw";
+  "true";
+  "try";
+  "typeof";
+  "var";
+  "void";
+  "while";
+  "with";
+
+  (* The following are also reserved in strict context, including ESM *)
+  "let";
+  "static";
+  "yield";
+
+  (* `await` is reserved in async context, including ESM *)
+  "await";
+
+  (* Future reserved words *)
+  "enum";
+  "implements";
+  "interface";
+  "package";
+  "private";
+  "protected";
+  "public";
+
+  (* Special identifiers
+
+     `arguments` and `eval` is not real *keywords*
+
+     However, they cannot be as identifiers in the strict mode,
+     and the compiler output is always in strict mode.
+
+     See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#identifiers_with_special_meanings
+   *)
+  "arguments";
+  "eval";
+|]
+
+let is_js_keyword s = STbl.mem js_keywords s
+
+(** Identifiers with special meanings.
+
+    They can have different meanings depending on the context when used as identifier names, so it should be done carefully.
+
+    See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#identifiers_with_special_meanings
+
+    However, these names are actually used with no problems today. (Except `arguments` and `eval`)
+ *)
+let js_special_words = STbl.of_array [|
+  "arguments";
+  "as";
+  "async";
+  "eval";
+  "from";
+  "get";
+  "of";
+  "set";
+|]
+
+let is_js_special_word s = STbl.mem js_special_words s
+
+(** Identifier names _might_ need to care about *)
+let js_globals = STbl.of_array [|
+  (* JavaScript standards built-ins
+     See https://developer.mozilla.org/ko/docs/Web/JavaScript/Reference/Global_Objects
+  *)
+  "AggregateError";
+  "Array";
+  "ArrayBuffer";
+  "AsyncFunction";
+  "AsyncGenerator";
+  "AsyncGeneratorFunction";
+  "AsyncIterator";
+  "Atomics";
+  "BigInt";
+  "BigInt64Array";
+  "BigUint64Array";
+  "Boolean";
+  "DataView";
+  "Date";
+  "decodeURI";
+  "decodeURIComponent";
+  "encodeURI";
+  "encodeURIComponent";
+  "Error";
+  "eval";
+  "EvalError";
+  "FinalizationRegistry";
+  "Float16Array";
+  "Float32Array";
+  "Float64Array";
+  "Function";
+  "Generator";
+  "GeneratorFunction";
+  "globalThis";
+  "Infinity";
+  "Int16Array";
+  "Int32Array";
+  "Int8Array";
+  "Intl";
+  "isFinite";
+  "isNaN";
+  "Iterator";
+  "JSON";
+  "Map";
+  "Math";
+  "NaN";
+  "Number";
+  "Object";
+  "parseFloat";
+  "parseInt";
+  "Promise";
+  "Proxy";
+  "RangeError";
+  "ReferenceError";
+  "Reflect";
+  "RegExp";
+  "Set";
+  "SharedArrayBuffer";
+  "String";
+  "Symbol";
+  "SyntaxError";
+  "TypedArray";
+  "TypeError";
+  "Uint16Array";
+  "Uint32Array";
+  "Uint8Array";
+  "Uint8ClampedArray";
+  "undefined";
+  "URIError";
+  "WeakMap";
+  "WeakRef";
+  "WeakSet";
+
+  (* A few of the HTML standard globals
+  
+     See https://developer.mozilla.org/en-US/docs/Web/API/Window
+     See https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope
+    
+     But we don't actually need to protect these names.
+   
+  "window";
+  "self";
+  "document";
+  "location";
+  "navigator";
+  "origin";
+  *)
+
+  (* A few of the Node.js globals
+  
+     Specifically related to the CommonJS module system
+     They cannot be redeclared in nested scope.
+  *)
+  "__dirname";
+  "__filename";
+  "require";
+  "module";
+  "exports";
+
+  (* Bun's global namespace *)
+  "Bun";
+
+  (* Deno's global namespace *)
+  "Deno";
+|]
+
+let is_js_global s = STbl.mem js_globals s
diff --git a/jscomp/ext/js_reserved_map.mli b/compiler/ext/js_reserved_map.mli
similarity index 92%
rename from jscomp/ext/js_reserved_map.mli
rename to compiler/ext/js_reserved_map.mli
index 072737f..5ee1982 100644
--- a/jscomp/ext/js_reserved_map.mli
+++ b/compiler/ext/js_reserved_map.mli
@@ -22,4 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-val is_reserved : string -> bool
+val is_js_keyword : string -> bool
+
+val is_js_special_word : string -> bool
+
+val is_js_global : string -> bool
diff --git a/jscomp/ext/literals.ml b/compiler/ext/literals.ml
similarity index 93%
rename from jscomp/ext/literals.ml
rename to compiler/ext/literals.ml
index b1aa1c2..2b46965 100644
--- a/jscomp/ext/literals.ml
+++ b/compiler/ext/literals.ml
@@ -50,8 +50,6 @@ let runtime = "runtime" (* runtime directory *)
 
 let stdlib = "stdlib"
 
-let imul = "imul" (* signed int32 mul *)
-
 let setter_suffix = "#="
 
 let setter_suffix_len = String.length setter_suffix
@@ -99,10 +97,6 @@ let suffix_cmxa = ".cmxa"
 
 let suffix_mll = ".mll"
 
-let suffix_ml = ".ml"
-
-let suffix_mli = ".mli"
-
 let suffix_res = ".res"
 
 let suffix_resi = ".resi"
@@ -130,10 +124,10 @@ let esmodule = "esmodule"
 let commonjs = "commonjs"
 
 let es6 = "es6"
-[@@ocaml.deprecated "Will be removed in v12"]
+(* [@@deprecated "Will be removed in v12"] *)
 
 let es6_global = "es6-global"
-[@@ocaml.deprecated "Will be removed in v12"]
+(* [@@deprecated "Will be removed in v12"] *)
 
 let unused_attribute = "Unused attribute "
 
@@ -170,8 +164,4 @@ let hd = "hd"
 
 let tl = "tl"
 
-let lazy_done = "LAZY_DONE"
-
-let lazy_val = "VAL"
-
 let pure = "@__PURE__"
diff --git a/jscomp/ext/map.cppo.ml b/compiler/ext/map.cppo.ml
similarity index 100%
rename from jscomp/ext/map.cppo.ml
rename to compiler/ext/map.cppo.ml
diff --git a/compiler/ext/map_gen.ml b/compiler/ext/map_gen.ml
new file mode 100644
index 0000000..7c8af83
--- /dev/null
+++ b/compiler/ext/map_gen.ml
@@ -0,0 +1,412 @@
+(***********************************************************************)
+(*                                                                     *)
+(*                                OCaml                                *)
+(*                                                                     *)
+(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
+(*                                                                     *)
+(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
+(*  en Automatique.  All rights reserved.  This file is distributed    *)
+(*  under the terms of the GNU Library General Public License, with    *)
+(*  the special exception on linking described in file ../LICENSE.     *)
+(*                                                                     *)
+(***********************************************************************)
+
+[@@@warnerror "+55"]
+(* adapted from stdlib *)
+
+type ('key, 'a) t0 =
+  | Empty
+  | Leaf of {k: 'key; v: 'a}
+  | Node of {l: ('key, 'a) t0; k: 'key; v: 'a; r: ('key, 'a) t0; h: int}
+
+type ('key, 'a) parital_node = {
+  l: ('key, 'a) t0;
+  k: 'key;
+  v: 'a;
+  r: ('key, 'a) t0;
+  h: int;
+}
+
+external ( ~! ) : ('key, 'a) t0 -> ('key, 'a) parital_node = "%identity"
+
+let empty = Empty
+
+let rec map x f =
+  match x with
+  | Empty -> Empty
+  | Leaf {k; v} -> Leaf {k; v = f v}
+  | Node ({l; v; r} as x) ->
+    let l' = map l f in
+    let d' = f v in
+    let r' = map r f in
+    Node {x with l = l'; v = d'; r = r'}
+
+let rec mapi x f =
+  match x with
+  | Empty -> Empty
+  | Leaf {k; v} -> Leaf {k; v = f k v}
+  | Node ({l; k; v; r} as x) ->
+    let l' = mapi l f in
+    let v' = f k v in
+    let r' = mapi r f in
+    Node {x with l = l'; v = v'; r = r'}
+
+let[@inline] calc_height a b = (if a >= b then a else b) + 1
+
+let[@inline] singleton k v = Leaf {k; v}
+
+let[@inline] height = function
+  | Empty -> 0
+  | Leaf _ -> 1
+  | Node {h} -> h
+
+let[@inline] unsafe_node k v l r h = Node {l; k; v; r; h}
+
+let[@inline] unsafe_two_elements k1 v1 k2 v2 =
+  unsafe_node k2 v2 (singleton k1 v1) empty 2
+
+let[@inline] unsafe_node_maybe_leaf k v l r h =
+  if h = 1 then Leaf {k; v} else Node {l; k; v; r; h}
+
+type ('key, +'a) t = ('key, 'a) t0 = private
+  | Empty
+  | Leaf of {k: 'key; v: 'a}
+  | Node of {l: ('key, 'a) t; k: 'key; v: 'a; r: ('key, 'a) t; h: int}
+
+let rec cardinal_aux acc = function
+  | Empty -> acc
+  | Leaf _ -> acc + 1
+  | Node {l; r} -> cardinal_aux (cardinal_aux (acc + 1) r) l
+
+let cardinal s = cardinal_aux 0 s
+
+let rec bindings_aux accu = function
+  | Empty -> accu
+  | Leaf {k; v} -> (k, v) :: accu
+  | Node {l; k; v; r} -> bindings_aux ((k, v) :: bindings_aux accu r) l
+
+let bindings s = bindings_aux [] s
+
+let rec fill_array_with_f (s : _ t) i arr f : int =
+  match s with
+  | Empty -> i
+  | Leaf {k; v} ->
+    Array.unsafe_set arr i (f k v);
+    i + 1
+  | Node {l; k; v; r} ->
+    let inext = fill_array_with_f l i arr f in
+    Array.unsafe_set arr inext (f k v);
+    fill_array_with_f r (inext + 1) arr f
+
+let rec fill_array_aux (s : _ t) i arr : int =
+  match s with
+  | Empty -> i
+  | Leaf {k; v} ->
+    Array.unsafe_set arr i (k, v);
+    i + 1
+  | Node {l; k; v; r} ->
+    let inext = fill_array_aux l i arr in
+    Array.unsafe_set arr inext (k, v);
+    fill_array_aux r (inext + 1) arr
+
+let to_sorted_array (s : ('key, 'a) t) : ('key * 'a) array =
+  match s with
+  | Empty -> [||]
+  | Leaf {k; v} -> [|(k, v)|]
+  | Node {l; k; v; r} ->
+    let len = cardinal_aux (cardinal_aux 1 r) l in
+    let arr = Array.make len (k, v) in
+    ignore (fill_array_aux s 0 arr : int);
+    arr
+
+let to_sorted_array_with_f (type key a b) (s : (key, a) t) (f : key -> a -> b) :
+    b array =
+  match s with
+  | Empty -> [||]
+  | Leaf {k; v} -> [|f k v|]
+  | Node {l; k; v; r} ->
+    let len = cardinal_aux (cardinal_aux 1 r) l in
+    let arr = Array.make len (f k v) in
+    ignore (fill_array_with_f s 0 arr f : int);
+    arr
+
+let rec keys_aux accu = function
+  | Empty -> accu
+  | Leaf {k} -> k :: accu
+  | Node {l; k; r} -> keys_aux (k :: keys_aux accu r) l
+
+let keys s = keys_aux [] s
+
+let bal l x d r =
+  let hl = height l in
+  let hr = height r in
+  if hl > hr + 2 then
+    let {l = ll; r = lr; v = lv; k = lk; h = _} = ~!l in
+    let hll = height ll in
+    let hlr = height lr in
+    if hll >= hlr then
+      let hnode = calc_height hlr hr in
+      unsafe_node lk lv ll
+        (unsafe_node_maybe_leaf x d lr r hnode)
+        (calc_height hll hnode)
+    else
+      let {l = lrl; r = lrr; k = lrk; v = lrv} = ~!lr in
+      let hlrl = height lrl in
+      let hlrr = height lrr in
+      let hlnode = calc_height hll hlrl in
+      let hrnode = calc_height hlrr hr in
+      unsafe_node lrk lrv
+        (unsafe_node_maybe_leaf lk lv ll lrl hlnode)
+        (unsafe_node_maybe_leaf x d lrr r hrnode)
+        (calc_height hlnode hrnode)
+  else if hr > hl + 2 then
+    let {l = rl; r = rr; k = rk; v = rv} = ~!r in
+    let hrr = height rr in
+    let hrl = height rl in
+    if hrr >= hrl then
+      let hnode = calc_height hl hrl in
+      unsafe_node rk rv
+        (unsafe_node_maybe_leaf x d l rl hnode)
+        rr (calc_height hnode hrr)
+    else
+      let {l = rll; r = rlr; k = rlk; v = rlv} = ~!rl in
+      let hrll = height rll in
+      let hrlr = height rlr in
+      let hlnode = calc_height hl hrll in
+      let hrnode = calc_height hrlr hrr in
+      unsafe_node rlk rlv
+        (unsafe_node_maybe_leaf x d l rll hlnode)
+        (unsafe_node_maybe_leaf rk rv rlr rr hrnode)
+        (calc_height hlnode hrnode)
+  else unsafe_node_maybe_leaf x d l r (calc_height hl hr)
+
+let[@inline] is_empty = function
+  | Empty -> true
+  | _ -> false
+
+let rec min_binding_exn = function
+  | Empty -> raise Not_found
+  | Leaf {k; v} -> (k, v)
+  | Node {l; k; v} -> (
+    match l with
+    | Empty -> (k, v)
+    | Leaf _ | Node _ -> min_binding_exn l)
+
+let rec remove_min_binding = function
+  | Empty -> invalid_arg "Map.remove_min_elt"
+  | Leaf _ -> empty
+  | Node {l = Empty; r} -> r
+  | Node {l; k; v; r} -> bal (remove_min_binding l) k v r
+
+let merge t1 t2 =
+  match (t1, t2) with
+  | Empty, t -> t
+  | t, Empty -> t
+  | _, _ ->
+    let x, d = min_binding_exn t2 in
+    bal t1 x d (remove_min_binding t2)
+
+let rec iter x f =
+  match x with
+  | Empty -> ()
+  | Leaf {k; v} -> (f k v : unit)
+  | Node {l; k; v; r} ->
+    iter l f;
+    f k v;
+    iter r f
+
+let rec fold m accu f =
+  match m with
+  | Empty -> accu
+  | Leaf {k; v} -> f k v accu
+  | Node {l; k; v; r} -> fold r (f k v (fold l accu f)) f
+
+let rec for_all x p =
+  match x with
+  | Empty -> true
+  | Leaf {k; v} -> p k v
+  | Node {l; k; v; r} -> p k v && for_all l p && for_all r p
+
+let rec exists x p =
+  match x with
+  | Empty -> false
+  | Leaf {k; v} -> p k v
+  | Node {l; k; v; r} -> p k v || exists l p || exists r p
+
+(* Beware: those two functions assume that the added k is *strictly*
+   smaller (or bigger) than all the present keys in the tree; it
+   does not test for equality with the current min (or max) key.
+
+   Indeed, they are only used during the "join" operation which
+   respects this precondition.
+*)
+
+let rec add_min k v = function
+  | Empty -> singleton k v
+  | Leaf l -> unsafe_two_elements k v l.k l.v
+  | Node tree -> bal (add_min k v tree.l) tree.k tree.v tree.r
+
+let rec add_max k v = function
+  | Empty -> singleton k v
+  | Leaf l -> unsafe_two_elements l.k l.v k v
+  | Node tree -> bal tree.l tree.k tree.v (add_max k v tree.r)
+
+(* Same as create and bal, but no assumptions are made on the
+   relative heights of l and r. *)
+
+let rec join l v d r =
+  match l with
+  | Empty -> add_min v d r
+  | Leaf leaf -> add_min leaf.k leaf.v (add_min v d r)
+  | Node xl -> (
+    match r with
+    | Empty -> add_max v d l
+    | Leaf leaf -> add_max leaf.k leaf.v (add_max v d l)
+    | Node xr ->
+      let lh = xl.h in
+      let rh = xr.h in
+      if lh > rh + 2 then bal xl.l xl.k xl.v (join xl.r v d r)
+      else if rh > lh + 2 then bal (join l v d xr.l) xr.k xr.v xr.r
+      else unsafe_node v d l r (calc_height lh rh))
+
+(* Merge two trees l and r into one.
+   All elements of l must precede the elements of r.
+   No assumption on the heights of l and r. *)
+
+let concat t1 t2 =
+  match (t1, t2) with
+  | Empty, t -> t
+  | t, Empty -> t
+  | _, _ ->
+    let x, d = min_binding_exn t2 in
+    join t1 x d (remove_min_binding t2)
+
+let concat_or_join t1 v d t2 =
+  match d with
+  | Some d -> join t1 v d t2
+  | None -> concat t1 t2
+
+module type S = sig
+  type key
+
+  type +'a t
+
+  val empty : 'a t
+
+  val compare_key : key -> key -> int
+
+  val is_empty : 'a t -> bool
+
+  val mem : 'a t -> key -> bool
+
+  val to_sorted_array : 'a t -> (key * 'a) array
+
+  val to_sorted_array_with_f : 'a t -> (key -> 'a -> 'b) -> 'b array
+
+  val add : 'a t -> key -> 'a -> 'a t
+  (** [add x y m] 
+      If [x] was already bound in [m], its previous binding disappears. *)
+
+  val adjust : 'a t -> key -> ('a option -> 'a) -> 'a t
+  (** [adjust acc k replace ] if not exist [add (replace None ], otherwise 
+      [add k v (replace (Some old))]
+  *)
+
+  val singleton : key -> 'a -> 'a t
+
+  val remove : 'a t -> key -> 'a t
+  (** [remove x m] returns a map containing the same bindings as
+      [m], except for [x] which is unbound in the returned map. *)
+
+  (* val merge:
+       'a t -> 'b t ->
+       (key -> 'a option -> 'b option -> 'c option) ->  'c t *)
+  (** [merge f m1 m2] computes a map whose keys is a subset of keys of [m1]
+      and of [m2]. The presence of each such binding, and the corresponding
+      value, is determined with the function [f].
+      @since 3.12.0
+  *)
+
+  val disjoint_merge_exn : 'a t -> 'a t -> (key -> 'a -> 'a -> exn) -> 'a t
+  (* merge two maps, will raise if they have the same key *)
+
+  val iter : 'a t -> (key -> 'a -> unit) -> unit
+  (** [iter f m] applies [f] to all bindings in map [m].
+      The bindings are passed to [f] in increasing order. *)
+
+  val fold : 'a t -> 'b -> (key -> 'a -> 'b -> 'b) -> 'b
+  (** [fold f m a] computes [(f kN dN ... (f k1 d1 a)...)],
+      where [k1 ... kN] are the keys of all bindings in [m]
+      (in increasing order) *)
+
+  val for_all : 'a t -> (key -> 'a -> bool) -> bool
+  (** [for_all p m] checks if all the bindings of the map.
+      order unspecified
+  *)
+
+  val exists : 'a t -> (key -> 'a -> bool) -> bool
+  (** [exists p m] checks if at least one binding of the map
+      satisfy the predicate [p]. 
+      order unspecified
+  *)
+
+  (* val filter: 'a t -> (key -> 'a -> bool) -> 'a t *)
+  (** [filter p m] returns the map with all the bindings in [m]
+      that satisfy predicate [p].
+      order unspecified
+  *)
+
+  (* val partition: 'a t -> (key -> 'a -> bool) ->  'a t * 'a t *)
+  (** [partition p m] returns a pair of maps [(m1, m2)], where
+      [m1] contains all the bindings of [s] that satisfy the
+      predicate [p], and [m2] is the map with all the bindings of
+      [s] that do not satisfy [p].
+  *)
+
+  val cardinal : 'a t -> int
+  (** Return the number of bindings of a map. *)
+
+  val bindings : 'a t -> (key * 'a) list
+  (** Return the list of all bindings of the given map.
+      The returned list is sorted in increasing order with respect
+      to the ordering *)
+
+  val keys : 'a t -> key list
+  (* Increasing order *)
+
+  (* val split: 'a t -> key -> 'a t * 'a option * 'a t *)
+  (** [split x m] returns a triple [(l, data, r)], where
+        [l] is the map with all the bindings of [m] whose key
+      is strictly less than [x];
+        [r] is the map with all the bindings of [m] whose key
+      is strictly greater than [x];
+        [data] is [None] if [m] contains no binding for [x],
+        or [Some v] if [m] binds [v] to [x].
+      @since 3.12.0
+  *)
+
+  val find_exn : 'a t -> key -> 'a
+  (** [find x m] returns the current binding of [x] in [m],
+      or raises [Not_found] if no such binding exists. *)
+
+  val find_opt : 'a t -> key -> 'a option
+
+  val find_default : 'a t -> key -> 'a -> 'a
+
+  val map : 'a t -> ('a -> 'b) -> 'b t
+  (** [map f m] returns a map with same domain as [m], where the
+      associated value [a] of all bindings of [m] has been
+      replaced by the result of the application of [f] to [a].
+      The bindings are passed to [f] in increasing order
+      with respect to the ordering over the type of the keys. *)
+
+  val mapi : 'a t -> (key -> 'a -> 'b) -> 'b t
+  (** Same as {!Map.S.map}, but the function receives as arguments both the
+      key and the associated value for each binding of the map. *)
+
+  val of_list : (key * 'a) list -> 'a t
+
+  val of_array : (key * 'a) array -> 'a t
+
+  val add_list : (key * 'b) list -> 'b t -> 'b t
+end
diff --git a/jscomp/ext/map_gen.mli b/compiler/ext/map_gen.mli
similarity index 95%
rename from jscomp/ext/map_gen.mli
rename to compiler/ext/map_gen.mli
index 4ecd007..c5038ff 100644
--- a/jscomp/ext/map_gen.mli
+++ b/compiler/ext/map_gen.mli
@@ -1,7 +1,7 @@
 type ('key, +'a) t = private
   | Empty
-  | Leaf of { k : 'key; v : 'a }
-  | Node of { l : ('key, 'a) t; k : 'key; v : 'a; r : ('key, 'a) t; h : int }
+  | Leaf of {k: 'key; v: 'a}
+  | Node of {l: ('key, 'a) t; k: 'key; v: 'a; r: ('key, 'a) t; h: int}
 
 val cardinal : ('a, 'b) t -> int
 
@@ -22,10 +22,8 @@ val height : ('a, 'b) t -> int
 val singleton : 'a -> 'b -> ('a, 'b) t
 
 val unsafe_node : 'a -> 'b -> ('a, 'b) t -> ('a, 'b) t -> int -> ('a, 'b) t
-  [@@inline]
 
 val unsafe_two_elements : 'a -> 'b -> 'a -> 'b -> ('a, 'b) t
-  [@@inline]
 (** smaller comes first *)
 
 val bal : ('a, 'b) t -> 'a -> 'b -> ('a, 'b) t -> ('a, 'b) t
diff --git a/jscomp/ext/map_ident.mli b/compiler/ext/map_ident.mli
similarity index 96%
rename from jscomp/ext/map_ident.mli
rename to compiler/ext/map_ident.mli
index f4e717e..56b3678 100644
--- a/jscomp/ext/map_ident.mli
+++ b/compiler/ext/map_ident.mli
@@ -22,4 +22,4 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-include Map_gen.S with type key = Ident.t
\ No newline at end of file
+include Map_gen.S with type key = Ident.t
diff --git a/jscomp/ext/map_int.mli b/compiler/ext/map_int.mli
similarity index 100%
rename from jscomp/ext/map_int.mli
rename to compiler/ext/map_int.mli
diff --git a/jscomp/ext/map_string.mli b/compiler/ext/map_string.mli
similarity index 100%
rename from jscomp/ext/map_string.mli
rename to compiler/ext/map_string.mli
diff --git a/compiler/ext/misc.ml b/compiler/ext/misc.ml
new file mode 100644
index 0000000..d63856a
--- /dev/null
+++ b/compiler/ext/misc.ml
@@ -0,0 +1,583 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Errors *)
+
+exception Fatal_error
+
+let fatal_error msg =
+  prerr_string ">> Fatal error: ";
+  prerr_endline msg;
+  raise Fatal_error
+
+let fatal_errorf fmt = Format.kasprintf fatal_error fmt
+
+(* Exceptions *)
+
+let try_finally work cleanup =
+  let result =
+    try work ()
+    with e ->
+      cleanup ();
+      raise e
+  in
+  cleanup ();
+  result
+
+type ref_and_value = R : 'a ref * 'a -> ref_and_value
+
+let protect_refs =
+  let set_refs l = List.iter (fun (R (r, v)) -> r := v) l in
+  fun refs f ->
+    let backup = List.map (fun (R (r, _)) -> R (r, !r)) refs in
+    set_refs refs;
+    match f () with
+    | x ->
+      set_refs backup;
+      x
+    | exception e ->
+      set_refs backup;
+      raise e
+
+(* List functions *)
+
+let rec map_end f l1 l2 =
+  match l1 with
+  | [] -> l2
+  | hd :: tl -> f hd :: map_end f tl l2
+
+let rec map_left_right f = function
+  | [] -> []
+  | hd :: tl ->
+    let res = f hd in
+    res :: map_left_right f tl
+
+let rec for_all2 pred l1 l2 =
+  match (l1, l2) with
+  | [], [] -> true
+  | hd1 :: tl1, hd2 :: tl2 -> pred hd1 hd2 && for_all2 pred tl1 tl2
+  | _, _ -> false
+
+let rec replicate_list elem n =
+  if n <= 0 then [] else elem :: replicate_list elem (n - 1)
+
+let rec list_remove x = function
+  | [] -> []
+  | hd :: tl -> if hd = x then tl else hd :: list_remove x tl
+
+let rec split_last = function
+  | [] -> assert false
+  | [x] -> ([], x)
+  | hd :: tl ->
+    let lst, last = split_last tl in
+    (hd :: lst, last)
+
+let may = Stdlib.Option.iter
+let may_map = Stdlib.Option.map
+
+(* File functions *)
+
+let find_in_path path name =
+  if not (Filename.is_implicit name) then
+    if Sys.file_exists name then name else raise Not_found
+  else
+    let rec try_dir = function
+      | [] -> raise Not_found
+      | dir :: rem ->
+        let fullname = Filename.concat dir name in
+        if Sys.file_exists fullname then fullname else try_dir rem
+    in
+    try_dir path
+
+let find_in_path_rel path name =
+  let rec simplify s =
+    let open Filename in
+    let base = basename s in
+    let dir = dirname s in
+    if dir = s then dir
+    else if base = current_dir_name then simplify dir
+    else concat (simplify dir) base
+  in
+  let rec try_dir = function
+    | [] -> raise Not_found
+    | dir :: rem ->
+      let fullname = simplify (Filename.concat dir name) in
+      if Sys.file_exists fullname then fullname else try_dir rem
+  in
+  try_dir path
+
+let find_in_path_uncap path name =
+  let uname = String.uncapitalize_ascii name in
+  let rec try_dir = function
+    | [] -> raise Not_found
+    | dir :: rem ->
+      let fullname = Filename.concat dir name
+      and ufullname = Filename.concat dir uname in
+      if Sys.file_exists ufullname then ufullname
+      else if Sys.file_exists fullname then fullname
+      else try_dir rem
+  in
+  try_dir path
+
+let remove_file filename =
+  try if Sys.file_exists filename then Sys.remove filename
+  with Sys_error _msg -> ()
+
+(* Expand a -I option: if it starts with +, make it relative to the standard
+   library directory *)
+
+let expand_directory alt s =
+  if String.length s > 0 && s.[0] = '+' then
+    Filename.concat alt (String.sub s 1 (String.length s - 1))
+  else s
+
+(* Hashtable functions *)
+
+let create_hashtable init =
+  let size = Array.length init in
+  let tbl = Hashtbl.create size in
+  Array.iter (fun (key, data) -> Hashtbl.add tbl key data) init;
+  tbl
+
+(* File copy *)
+
+let copy_file ic oc =
+  let buff = Bytes.create 0x1000 in
+  let rec copy () =
+    let n = input ic buff 0 0x1000 in
+    if n = 0 then ()
+    else (
+      output oc buff 0 n;
+      copy ())
+  in
+  copy ()
+
+let copy_file_chunk ic oc len =
+  let buff = Bytes.create 0x1000 in
+  let rec copy n =
+    if n <= 0 then ()
+    else
+      let r = input ic buff 0 (min n 0x1000) in
+      if r = 0 then raise End_of_file
+      else (
+        output oc buff 0 r;
+        copy (n - r))
+  in
+  copy len
+
+let string_of_file ic =
+  let b = Buffer.create 0x10000 in
+  let buff = Bytes.create 0x1000 in
+  let rec copy () =
+    let n = input ic buff 0 0x1000 in
+    if n = 0 then Buffer.contents b
+    else (
+      Buffer.add_subbytes b buff 0 n;
+      copy ())
+  in
+  copy ()
+
+let output_to_bin_file_directly filename fn =
+  let oc = open_out_bin filename in
+  match fn filename oc with
+  | v ->
+    close_out oc;
+    v
+  | exception e ->
+    close_out oc;
+    raise e
+
+let output_to_file_via_temporary ?(mode = [Open_text]) filename fn =
+  let temp_filename, oc =
+    Filename.open_temp_file ~mode ~perms:0o666
+      ~temp_dir:(Filename.dirname filename)
+      (Filename.basename filename)
+      ".tmp"
+  in
+  (* The 0o666 permissions will be modified by the umask.  It's just
+     like what [open_out] and [open_out_bin] do.
+     With temp_dir = dirname filename, we ensure that the returned
+     temp file is in the same directory as filename itself, making
+     it safe to rename temp_filename to filename later.
+     With prefix = basename filename, we are almost certain that
+     the first generated name will be unique.  A fixed prefix
+     would work too but might generate more collisions if many
+     files are being produced simultaneously in the same directory. *)
+  match fn temp_filename oc with
+  | res -> (
+    close_out oc;
+    try
+      Sys.rename temp_filename filename;
+      res
+    with exn ->
+      remove_file temp_filename;
+      raise exn)
+  | exception exn ->
+    close_out oc;
+    remove_file temp_filename;
+    raise exn
+
+(* Integer operations *)
+
+let rec log2 n = if n <= 1 then 0 else 1 + log2 (n asr 1)
+
+let align n a = if n >= 0 then (n + a - 1) land -a else n land -a
+
+let no_overflow_add a b = a lxor b lor (a lxor lnot (a + b)) < 0
+
+let no_overflow_sub a b = a lxor lnot b lor (b lxor (a - b)) < 0
+
+let no_overflow_mul a b = b <> 0 && a * b / b = a
+
+let no_overflow_lsl a k =
+  0 <= k && k < Sys.word_size && min_int asr k <= a && a <= max_int asr k
+
+module Int_literal_converter = struct
+  (* To convert integer literals, allowing max_int + 1 (PR#4210) *)
+  let cvt_int_aux str neg of_string =
+    if String.length str = 0 || str.[0] = '-' then of_string str
+    else neg (of_string ("-" ^ str))
+  let int s = cvt_int_aux s ( ~- ) int_of_string
+  let int32 s = cvt_int_aux s Int32.neg Int32.of_string
+  let int64 s = cvt_int_aux s Int64.neg Int64.of_string
+end
+
+(* String operations *)
+
+let chop_extensions file =
+  let dirname = Filename.dirname file and basename = Filename.basename file in
+  try
+    let pos = String.index basename '.' in
+    let basename = String.sub basename 0 pos in
+    if Filename.is_implicit file && dirname = Filename.current_dir_name then
+      basename
+    else Filename.concat dirname basename
+  with Not_found -> file
+
+let search_substring pat str start =
+  let rec search i j =
+    if j >= String.length pat then i
+    else if i + j >= String.length str then raise Not_found
+    else if str.[i + j] = pat.[j] then search i (j + 1)
+    else search (i + 1) 0
+  in
+  search start 0
+
+let replace_substring ~before ~after str =
+  let rec search acc curr =
+    match search_substring before str curr with
+    | next ->
+      let prefix = String.sub str curr (next - curr) in
+      search (prefix :: acc) (next + String.length before)
+    | exception Not_found ->
+      let suffix = String.sub str curr (String.length str - curr) in
+      List.rev (suffix :: acc)
+  in
+  String.concat after (search [] 0)
+
+let rev_split_words s =
+  let rec split1 res i =
+    if i >= String.length s then res
+    else
+      match s.[i] with
+      | ' ' | '\t' | '\r' | '\n' -> split1 res (i + 1)
+      | _ -> split2 res i (i + 1)
+  and split2 res i j =
+    if j >= String.length s then String.sub s i (j - i) :: res
+    else
+      match s.[j] with
+      | ' ' | '\t' | '\r' | '\n' ->
+        split1 (String.sub s i (j - i) :: res) (j + 1)
+      | _ -> split2 res i (j + 1)
+  in
+  split1 [] 0
+
+let get_ref r =
+  let v = !r in
+  r := [];
+  v
+
+let fst3 (x, _, _) = x
+let snd3 (_, x, _) = x
+let thd3 (_, _, x) = x
+
+let fst4 (x, _, _, _) = x
+let snd4 (_, x, _, _) = x
+let thd4 (_, _, x, _) = x
+let for4 (_, _, _, x) = x
+
+let edit_distance a b cutoff =
+  let la, lb = (String.length a, String.length b) in
+  let cutoff =
+    (* using max_int for cutoff would cause overflows in (i + cutoff + 1);
+       we bring it back to the (max la lb) worstcase *)
+    min (max la lb) cutoff
+  in
+  if abs (la - lb) > cutoff then None
+  else
+    (* initialize with 'cutoff + 1' so that not-yet-written-to cases have
+       the worst possible cost; this is useful when computing the cost of
+       a case just at the boundary of the cutoff diagonal. *)
+    let m = Array.make_matrix (la + 1) (lb + 1) (cutoff + 1) in
+    m.(0).(0) <- 0;
+    for i = 1 to la do
+      m.(i).(0) <- i
+    done;
+    for j = 1 to lb do
+      m.(0).(j) <- j
+    done;
+    for i = 1 to la do
+      for j = max 1 (i - cutoff - 1) to min lb (i + cutoff + 1) do
+        let cost = if a.[i - 1] = b.[j - 1] then 0 else 1 in
+        let best =
+          (* insert, delete or substitute *)
+          min (1 + min m.(i - 1).(j) m.(i).(j - 1)) (m.(i - 1).(j - 1) + cost)
+        in
+        let best =
+          (* swap two adjacent letters; we use "cost" again in case of
+             a swap between two identical letters; this is slightly
+             redundant as this is a double-substitution case, but it
+             was done this way in most online implementations and
+             imitation has its virtues *)
+          if
+            not
+              (i > 1 && j > 1 && a.[i - 1] = b.[j - 2] && a.[i - 2] = b.[j - 1])
+          then best
+          else min best (m.(i - 2).(j - 2) + cost)
+        in
+        m.(i).(j) <- best
+      done
+    done;
+    let result = m.(la).(lb) in
+    if result > cutoff then None else Some result
+
+let spellcheck env name =
+  let cutoff =
+    match String.length name with
+    | 1 | 2 -> 0
+    | 3 | 4 -> 1
+    | 5 | 6 -> 2
+    | _ -> 3
+  in
+  let compare target acc head =
+    match edit_distance target head cutoff with
+    | None -> acc
+    | Some dist ->
+      let best_choice, best_dist = acc in
+      if dist < best_dist then ([head], dist)
+      else if dist = best_dist then (head :: best_choice, dist)
+      else acc
+  in
+  fst (List.fold_left (compare name) ([], max_int) env)
+
+let did_you_mean ppf get_choices =
+  (* flush now to get the error report early, in the (unheard of) case
+     where the search in the get_choices function would take a bit of
+     time; in the worst case, the user has seen the error, she can
+     interrupt the process before the spell-checking terminates. *)
+  Format.fprintf ppf "@?";
+  match get_choices () with
+  | [] -> ()
+  | choices ->
+    let rest, last = split_last choices in
+    Format.fprintf ppf "@\nHint: Did you mean %s%s%s?@?"
+      (String.concat ", " rest)
+      (if rest = [] then "" else " or ")
+      last
+
+let cut_at s c =
+  let pos = String.index s c in
+  (String.sub s 0 pos, String.sub s (pos + 1) (String.length s - pos - 1))
+
+module StringSet = Set.Make (struct
+  type t = string
+  let compare = compare
+end)
+module StringMap = Map.Make (struct
+  type t = string
+  let compare = compare
+end)
+
+(* Color handling *)
+module Color = struct
+  (* use ANSI color codes, see https://en.wikipedia.org/wiki/ANSI_escape_code *)
+  type color = Black | Red | Green | Yellow | Blue | Magenta | Cyan | White
+
+  type style =
+    | FG of color (* foreground *)
+    | BG of color (* background *)
+    | Bold
+    | Reset
+    | Dim
+
+  let ansi_of_color = function
+    | Black -> "0"
+    | Red -> "1"
+    | Green -> "2"
+    | Yellow -> "3"
+    | Blue -> "4"
+    | Magenta -> "5"
+    | Cyan -> "6"
+    | White -> "7"
+
+  let code_of_style = function
+    | FG c -> "3" ^ ansi_of_color c
+    | BG c -> "4" ^ ansi_of_color c
+    | Bold -> "1"
+    | Reset -> "0"
+    | Dim -> "2"
+
+  let ansi_of_style_l l =
+    let s =
+      match l with
+      | [] -> code_of_style Reset
+      | [s] -> code_of_style s
+      | _ -> String.concat ";" (List.map code_of_style l)
+    in
+    "\x1b[" ^ s ^ "m"
+
+  type styles = {error: style list; warning: style list; loc: style list}
+
+  let default_styles =
+    {warning = [Bold; FG Magenta]; error = [Bold; FG Red]; loc = [Bold]}
+
+  let cur_styles = ref default_styles
+  let get_styles () = !cur_styles
+  let set_styles s = cur_styles := s
+
+  (* map a tag to a style, if the tag is known.
+     @raise Not_found otherwise *)
+  let style_of_tag s =
+    match s with
+    | Format.String_tag "error" -> !cur_styles.error
+    | Format.String_tag "warning" -> !cur_styles.warning
+    | Format.String_tag "loc" -> !cur_styles.loc
+    | Format.String_tag "info" -> [Bold; FG Yellow]
+    | Format.String_tag "dim" -> [Dim]
+    | Format.String_tag "filename" -> [FG Cyan]
+    | _ -> raise Not_found
+
+  let color_enabled = ref true
+
+  (* either prints the tag of [s] or delegates to [or_else] *)
+  let mark_open_tag ~or_else s =
+    try
+      let style = style_of_tag s in
+      if !color_enabled then ansi_of_style_l style else ""
+    with Not_found -> or_else s
+
+  let mark_close_tag ~or_else s =
+    try
+      let _ = style_of_tag s in
+      if !color_enabled then ansi_of_style_l [Reset] else ""
+    with Not_found -> or_else s
+
+  (* add color handling to formatter [ppf] *)
+  let set_color_tag_handling ppf =
+    let open Format in
+    let functions = pp_get_formatter_stag_functions ppf () in
+    let functions' =
+      {
+        functions with
+        mark_open_stag = mark_open_tag ~or_else:functions.mark_open_stag;
+        mark_close_stag = mark_close_tag ~or_else:functions.mark_close_stag;
+      }
+    in
+    pp_set_mark_tags ppf true;
+    (* enable tags *)
+    pp_set_formatter_stag_functions ppf functions';
+    (* also setup margins *)
+    pp_set_margin ppf (pp_get_margin std_formatter ());
+    ()
+
+  external isatty : out_channel -> bool = "caml_sys_isatty"
+
+  (* reasonable heuristic on whether colors should be enabled *)
+  let should_enable_color () =
+    let term = try Sys.getenv "TERM" with Not_found -> "" in
+    term <> "dumb" && term <> "" && isatty stderr
+
+  type setting = Auto | Always | Never
+
+  let setup =
+    let first = ref true in
+    (* initialize only once *)
+    let formatter_l =
+      [Format.std_formatter; Format.err_formatter; Format.str_formatter]
+    in
+    fun o ->
+      if !first then (
+        first := false;
+        Format.set_mark_tags true;
+        List.iter set_color_tag_handling formatter_l;
+        color_enabled :=
+          match o with
+          | Some Always -> true
+          | Some Auto -> should_enable_color ()
+          | Some Never -> false
+          | None -> should_enable_color ());
+      ()
+end
+
+let normalise_eol s =
+  let b = Buffer.create 80 in
+  for i = 0 to String.length s - 1 do
+    if s.[i] <> '\r' then Buffer.add_char b s.[i]
+  done;
+  Buffer.contents b
+
+let delete_eol_spaces src =
+  let len_src = String.length src in
+  let dst = Bytes.create len_src in
+  let rec loop i_src i_dst =
+    if i_src = len_src then i_dst
+    else
+      match src.[i_src] with
+      | ' ' | '\t' -> loop_spaces 1 (i_src + 1) i_dst
+      | c ->
+        Bytes.set dst i_dst c;
+        loop (i_src + 1) (i_dst + 1)
+  and loop_spaces spaces i_src i_dst =
+    if i_src = len_src then i_dst
+    else
+      match src.[i_src] with
+      | ' ' | '\t' -> loop_spaces (spaces + 1) (i_src + 1) i_dst
+      | '\n' ->
+        Bytes.set dst i_dst '\n';
+        loop (i_src + 1) (i_dst + 1)
+      | _ ->
+        for n = 0 to spaces do
+          Bytes.set dst (i_dst + n) src.[i_src - spaces + n]
+        done;
+        loop (i_src + 1) (i_dst + spaces + 1)
+  in
+  let stop = loop 0 0 in
+  Bytes.sub_string dst 0 stop
+
+type hook_info = {sourcefile: string}
+
+exception
+  HookExnWrapper of {error: exn; hook_name: string; hook_info: hook_info}
+
+exception HookExn of exn
+
+let raise_direct_hook_exn e = raise (HookExn e)
+
+module type HookSig = sig
+  type t
+
+  val add_hook : string -> (hook_info -> t -> t) -> unit
+  val apply_hooks : hook_info -> t -> t
+end
diff --git a/compiler/ext/misc.mli b/compiler/ext/misc.mli
new file mode 100644
index 0000000..8e4a1cb
--- /dev/null
+++ b/compiler/ext/misc.mli
@@ -0,0 +1,278 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Miscellaneous useful types and functions *)
+
+val fatal_error : string -> 'a
+val fatal_errorf : ('a, Format.formatter, unit, 'b) format4 -> 'a
+exception Fatal_error
+
+val try_finally : (unit -> 'a) -> (unit -> unit) -> 'a
+
+val map_end : ('a -> 'b) -> 'a list -> 'b list -> 'b list
+(* [map_end f l t] is [map f l @ t], just more efficient. *)
+
+val map_left_right : ('a -> 'b) -> 'a list -> 'b list
+(* Like [List.map], with guaranteed left-to-right evaluation order *)
+
+val for_all2 : ('a -> 'b -> bool) -> 'a list -> 'b list -> bool
+(* Same as [List.for_all] but for a binary predicate.
+   In addition, this [for_all2] never fails: given two lists
+   with different lengths, it returns false. *)
+
+val replicate_list : 'a -> int -> 'a list
+(* [replicate_list elem n] is the list with [n] elements
+   all identical to [elem]. *)
+
+val list_remove : 'a -> 'a list -> 'a list
+(* [list_remove x l] returns a copy of [l] with the first
+   element equal to [x] removed. *)
+
+val split_last : 'a list -> 'a list * 'a
+(* Return the last element and the other elements of the given list. *)
+
+val may : ('a -> unit) -> 'a option -> unit
+val may_map : ('a -> 'b) -> 'a option -> 'b option
+
+type ref_and_value = R : 'a ref * 'a -> ref_and_value
+
+val protect_refs : ref_and_value list -> (unit -> 'a) -> 'a
+(** [protect_refs l f] temporarily sets [r] to [v] for each [R (r, v)] in [l]
+    while executing [f]. The previous contents of the references is restored
+    even if [f] raises an exception. *)
+
+val find_in_path : string list -> string -> string
+(* Search a file in a list of directories. *)
+
+val find_in_path_rel : string list -> string -> string
+(* Search a relative file in a list of directories. *)
+
+val find_in_path_uncap : string list -> string -> string
+(* Same, but search also for uncapitalized name, i.e.
+   if name is Foo.ml, allow /path/Foo.ml and /path/foo.ml
+   to match. *)
+
+val remove_file : string -> unit
+(* Delete the given file if it exists. Never raise an error. *)
+
+val expand_directory : string -> string -> string
+(* [expand_directory alt file] eventually expands a [+] at the
+   beginning of file into [alt] (an alternate root directory) *)
+
+val create_hashtable : ('a * 'b) array -> ('a, 'b) Hashtbl.t
+(* Create a hashtable of the given size and fills it with the
+   given bindings. *)
+
+val copy_file : in_channel -> out_channel -> unit
+(* [copy_file ic oc] reads the contents of file [ic] and copies
+   them to [oc]. It stops when encountering EOF on [ic]. *)
+
+val copy_file_chunk : in_channel -> out_channel -> int -> unit
+(* [copy_file_chunk ic oc n] reads [n] bytes from [ic] and copies
+   them to [oc]. It raises [End_of_file] when encountering
+   EOF on [ic]. *)
+
+val string_of_file : in_channel -> string
+(* [string_of_file ic] reads the contents of file [ic] and copies
+   them to a string. It stops when encountering EOF on [ic]. *)
+
+val output_to_bin_file_directly : string -> (string -> out_channel -> 'a) -> 'a
+
+val output_to_file_via_temporary :
+  ?mode:open_flag list -> string -> (string -> out_channel -> 'a) -> 'a
+(* Produce output in temporary file, then rename it
+   (as atomically as possible) to the desired output file name.
+   [output_to_file_via_temporary filename fn] opens a temporary file
+   which is passed to [fn] (name + output channel).  When [fn] returns,
+   the channel is closed and the temporary file is renamed to
+   [filename]. *)
+
+val log2 : int -> int
+(* [log2 n] returns [s] such that [n = 1 lsl s]
+   if [n] is a power of 2*)
+
+val align : int -> int -> int
+(* [align n a] rounds [n] upwards to a multiple of [a]
+   (a power of 2). *)
+
+val no_overflow_add : int -> int -> bool
+(* [no_overflow_add n1 n2] returns [true] if the computation of
+   [n1 + n2] does not overflow. *)
+
+val no_overflow_sub : int -> int -> bool
+(* [no_overflow_sub n1 n2] returns [true] if the computation of
+   [n1 - n2] does not overflow. *)
+
+val no_overflow_mul : int -> int -> bool
+(* [no_overflow_mul n1 n2] returns [true] if the computation of
+   [n1 * n2] does not overflow. *)
+
+val no_overflow_lsl : int -> int -> bool
+(* [no_overflow_lsl n k] returns [true] if the computation of
+   [n lsl k] does not overflow. *)
+
+module Int_literal_converter : sig
+  val int : string -> int
+  val int32 : string -> int32
+  val int64 : string -> int64
+end
+
+val chop_extensions : string -> string
+(* Return the given file name without its extensions. The extensions
+   is the longest suffix starting with a period and not including
+   a directory separator, [.xyz.uvw] for instance.
+
+   Return the given name if it does not contain an extension. *)
+
+val search_substring : string -> string -> int -> int
+(* [search_substring pat str start] returns the position of the first
+   occurrence of string [pat] in string [str].  Search starts
+   at offset [start] in [str].  Raise [Not_found] if [pat]
+   does not occur. *)
+
+val replace_substring : before:string -> after:string -> string -> string
+(* [replace_substring ~before ~after str] replaces all
+   occurrences of [before] with [after] in [str] and returns
+   the resulting string. *)
+
+val rev_split_words : string -> string list
+(* [rev_split_words s] splits [s] in blank-separated words, and returns
+   the list of words in reverse order. *)
+
+val get_ref : 'a list ref -> 'a list
+(* [get_ref lr] returns the content of the list reference [lr] and reset
+   its content to the empty list. *)
+
+val fst3 : 'a * 'b * 'c -> 'a
+val snd3 : 'a * 'b * 'c -> 'b
+val thd3 : 'a * 'b * 'c -> 'c
+
+val fst4 : 'a * 'b * 'c * 'd -> 'a
+val snd4 : 'a * 'b * 'c * 'd -> 'b
+val thd4 : 'a * 'b * 'c * 'd -> 'c
+val for4 : 'a * 'b * 'c * 'd -> 'd
+
+val edit_distance : string -> string -> int -> int option
+(** [edit_distance a b cutoff] computes the edit distance between
+    strings [a] and [b]. To help efficiency, it uses a cutoff: if the
+    distance [d] is smaller than [cutoff], it returns [Some d], else
+    [None].
+
+    The distance algorithm currently used is Damerau-Levenshtein: it
+    computes the number of insertion, deletion, substitution of
+    letters, or swapping of adjacent letters to go from one word to the
+    other. The particular algorithm may change in the future.
+*)
+
+val spellcheck : string list -> string -> string list
+(** [spellcheck env name] takes a list of names [env] that exist in
+    the current environment and an erroneous [name], and returns a
+    list of suggestions taken from [env], that are close enough to
+    [name] that it may be a typo for one of them. *)
+
+val did_you_mean : Format.formatter -> (unit -> string list) -> unit
+(** [did_you_mean ppf get_choices] hints that the user may have meant
+    one of the option returned by calling [get_choices]. It does nothing
+    if the returned list is empty.
+
+    The [unit -> ...] thunking is meant to delay any potentially-slow
+    computation (typically computing edit-distance with many things
+    from the current environment) to when the hint message is to be
+    printed. You should print an understandable error message before
+    calling [did_you_mean], so that users get a clear notification of
+    the failure even if producing the hint is slow.
+*)
+
+val cut_at : string -> char -> string * string
+(** [String.cut_at s c] returns a pair containing the sub-string before
+   the first occurrence of [c] in [s], and the sub-string after the
+   first occurrence of [c] in [s].
+   [let (before, after) = String.cut_at s c in
+    before ^ String.make 1 c ^ after] is the identity if [s] contains [c].
+
+   Raise [Not_found] if the character does not appear in the string
+   @since 4.01
+*)
+
+module StringSet : Set.S with type elt = string
+module StringMap : Map.S with type key = string
+(* TODO: replace all custom instantiations of StringSet/StringMap in various
+   compiler modules with this one. *)
+
+(* Color handling *)
+module Color : sig
+  type color = Black | Red | Green | Yellow | Blue | Magenta | Cyan | White
+
+  type style =
+    | FG of color (* foreground *)
+    | BG of color (* background *)
+    | Bold
+    | Reset
+    | Dim
+
+  val ansi_of_style_l : style list -> string
+  (* ANSI escape sequence for the given style *)
+
+  type styles = {error: style list; warning: style list; loc: style list}
+
+  val default_styles : styles
+  val get_styles : unit -> styles
+  val set_styles : styles -> unit
+
+  type setting = Auto | Always | Never
+
+  val setup : setting option -> unit
+  (* [setup opt] will enable or disable color handling on standard formatters
+     according to the value of color setting [opt].
+     Only the first call to this function has an effect. *)
+
+  val set_color_tag_handling : Format.formatter -> unit
+  (* adds functions to support color tags to the given formatter. *)
+end
+
+val normalise_eol : string -> string
+(** [normalise_eol s] returns a fresh copy of [s] with any '\r' characters
+   removed. Intended for pre-processing text which will subsequently be printed
+   on a channel which performs EOL transformations (i.e. Windows) *)
+
+val delete_eol_spaces : string -> string
+(** [delete_eol_spaces s] returns a fresh copy of [s] with any end of
+   line spaces removed. Intended to normalize the output of the
+   toplevel for tests. *)
+
+(** {1 Hook machinery}
+
+    Hooks machinery:
+   [add_hook name f] will register a function that will be called on the
+    argument of a later call to [apply_hooks]. Hooks are applied in the
+    lexicographical order of their names.
+*)
+
+type hook_info = {sourcefile: string}
+
+exception
+  HookExnWrapper of {error: exn; hook_name: string; hook_info: hook_info}
+(** An exception raised by a hook will be wrapped into a
+        [HookExnWrapper] constructor by the hook machinery.  *)
+
+val raise_direct_hook_exn : exn -> 'a
+(** A hook can use [raise_unwrapped_hook_exn] to raise an exception that will
+      not be wrapped into a {!HookExnWrapper}. *)
+
+module type HookSig = sig
+  type t
+  val add_hook : string -> (hook_info -> t -> t) -> unit
+  val apply_hooks : hook_info -> t -> t
+end
diff --git a/jscomp/ext/ordered_hash_map.cppo.ml b/compiler/ext/ordered_hash_map.cppo.ml
similarity index 100%
rename from jscomp/ext/ordered_hash_map.cppo.ml
rename to compiler/ext/ordered_hash_map.cppo.ml
diff --git a/jscomp/ext/ordered_hash_map_gen.ml b/compiler/ext/ordered_hash_map_gen.ml
similarity index 84%
rename from jscomp/ext/ordered_hash_map_gen.ml
rename to compiler/ext/ordered_hash_map_gen.ml
index 31ad7e6..b85ce6e 100644
--- a/jscomp/ext/ordered_hash_map_gen.ml
+++ b/compiler/ext/ordered_hash_map_gen.ml
@@ -62,19 +62,19 @@ end
    when buckets become too long. *)
 type ('a, 'b) bucket =
   | Empty
-  | Cons of { key : 'a; ord : int; data : 'b; next : ('a, 'b) bucket }
+  | Cons of {key: 'a; ord: int; data: 'b; next: ('a, 'b) bucket}
 
 type ('a, 'b) t = {
-  mutable size : int;
+  mutable size: int;
   (* number of entries *)
-  mutable data : ('a, 'b) bucket array;
+  mutable data: ('a, 'b) bucket array;
   (* the buckets *)
-  initial_size : int; (* initial array size *)
+  initial_size: int; (* initial array size *)
 }
 
 let create initial_size =
   let s = Ext_util.power_2_above 16 initial_size in
-  { initial_size = s; size = 0; data = Array.make s Empty }
+  {initial_size = s; size = 0; data = Array.make s Empty}
 
 let clear h =
   h.size <- 0;
@@ -99,11 +99,11 @@ let resize indexfun h =
     (* so that indexfun sees the new bucket count *)
     let rec insert_bucket = function
       | Empty -> ()
-      | Cons { key; ord; data; next } ->
-          let nidx = indexfun h key in
-          Array.unsafe_set ndata nidx
-            (Cons { key; ord; data; next = Array.unsafe_get ndata nidx });
-          insert_bucket next
+      | Cons {key; ord; data; next} ->
+        let nidx = indexfun h key in
+        Array.unsafe_set ndata nidx
+          (Cons {key; ord; data; next = Array.unsafe_get ndata nidx});
+        insert_bucket next
     in
     for i = 0 to osize - 1 do
       insert_bucket (Array.unsafe_get odata i)
@@ -112,9 +112,9 @@ let resize indexfun h =
 let iter h f =
   let rec do_bucket = function
     | Empty -> ()
-    | Cons { key; ord; data; next } ->
-        f key data ord;
-        do_bucket next
+    | Cons {key; ord; data; next} ->
+      f key data ord;
+      do_bucket next
   in
   let d = h.data in
   for i = 0 to Array.length d - 1 do
@@ -127,7 +127,7 @@ let choose h =
     else
       match Array.unsafe_get arr offset with
       | Empty -> aux arr (offset + 1) len
-      | Cons { key = k; _ } -> k
+      | Cons {key = k; _} -> k
   in
   aux h.data 0 (Array.length h.data)
 
@@ -143,7 +143,7 @@ let fold h init f =
   let rec do_bucket b accu =
     match b with
     | Empty -> accu
-    | Cons { key; ord; data; next } -> do_bucket next (f key data ord accu)
+    | Cons {key; ord; data; next} -> do_bucket next (f key data ord accu)
   in
   let d = h.data in
   let accu = ref init in
@@ -155,4 +155,6 @@ let fold h init f =
 let elements set = fold set [] (fun k _ _ acc -> k :: acc)
 
 let rec bucket_length acc (x : _ bucket) =
-  match x with Empty -> 0 | Cons rhs -> bucket_length (acc + 1) rhs.next
+  match x with
+  | Empty -> 0
+  | Cons rhs -> bucket_length (acc + 1) rhs.next
diff --git a/jscomp/ext/ordered_hash_map_local_ident.mli b/compiler/ext/ordered_hash_map_local_ident.mli
similarity index 99%
rename from jscomp/ext/ordered_hash_map_local_ident.mli
rename to compiler/ext/ordered_hash_map_local_ident.mli
index c22d678..66af1d0 100644
--- a/jscomp/ext/ordered_hash_map_local_ident.mli
+++ b/compiler/ext/ordered_hash_map_local_ident.mli
@@ -22,9 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
-
+include Ordered_hash_map_gen.S with type key = Ident.t
 (** Hash algorithm only hash 
     stamp, this makes sense when  all identifiers are local (no global)
 *)
-include Ordered_hash_map_gen.S with type key = Ident.t
diff --git a/compiler/ext/primitive_modules.ml b/compiler/ext/primitive_modules.ml
new file mode 100644
index 0000000..b11bc87
--- /dev/null
+++ b/compiler/ext/primitive_modules.ml
@@ -0,0 +1,55 @@
+(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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. *)
+
+let bool = "Primitive_bool"
+
+let int = "Primitive_int"
+
+let float = "Primitive_float"
+
+let bigint = "Primitive_bigint"
+
+let string = "Primitive_string"
+
+let array = "Primitive_array"
+
+let dict = "Primitive_dict"
+
+let object_ = "Primitive_object"
+
+let promise = "Primitive_promise"
+
+let module_ = "Primitive_module"
+
+let option = "Primitive_option"
+
+let hash = "Primitive_hash"
+
+let exceptions = "Primitive_exceptions"
+
+let curry = "Primitive_curry"
+
+let util = "Primitive_util"
+
+let pervasives = "Pervasives"
diff --git a/compiler/ext/runtime_package.ml b/compiler/ext/runtime_package.ml
new file mode 100644
index 0000000..34d4afd
--- /dev/null
+++ b/compiler/ext/runtime_package.ml
@@ -0,0 +1,29 @@
+let name = "@rescript/runtime"
+
+(* Simple default approach to find the runtime package path. This will not work with all package managers/layouts. *)
+let default_path =
+  let build_path rest path =
+    String.concat Filename.dir_sep (List.rev_append rest path)
+  in
+  match
+    Sys.executable_name |> Filename.dirname
+    |> String.split_on_char Filename.dir_sep.[0]
+    |> List.rev
+  with
+  (* 1. Packages installed via npm
+     - bin:     node_modules/@rescript/{platform}/bin
+     - runtime: node_modules/@rescript/runtime
+  *)
+  | "bin" :: _platform :: "@rescript" :: "node_modules" :: rest ->
+    build_path rest ["node_modules"; "@rescript"; "runtime"]
+  (* 2. Several other cases that can occur in local development, e.g.
+     - bin:     <repo>/packages/@rescript/{platform}/bin, <repo>/_build/install/default/bin
+     - runtime: <repo>/packages/@rescript/runtime
+  *)
+  | _ :: _ :: _ :: _ :: rest ->
+    build_path rest ["packages"; "@rescript"; "runtime"]
+  | _ -> ""
+
+(* To support pnpm and other package managers/layouts, we determine the path on the JS side and pass it in
+via -runtime-path to override the default. *)
+let path = ref default_path
diff --git a/compiler/ext/runtime_package.mli b/compiler/ext/runtime_package.mli
new file mode 100644
index 0000000..cf7cc9f
--- /dev/null
+++ b/compiler/ext/runtime_package.mli
@@ -0,0 +1,2 @@
+val name : string
+val path : string ref
diff --git a/jscomp/ext/set.cppo.ml b/compiler/ext/set.cppo.ml
similarity index 100%
rename from jscomp/ext/set.cppo.ml
rename to compiler/ext/set.cppo.ml
diff --git a/compiler/ext/set_gen.ml b/compiler/ext/set_gen.ml
new file mode 100644
index 0000000..0fd5e66
--- /dev/null
+++ b/compiler/ext/set_gen.ml
@@ -0,0 +1,362 @@
+(***********************************************************************)
+(*                                                                     *)
+(*                                OCaml                                *)
+(*                                                                     *)
+(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
+(*                                                                     *)
+(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
+(*  en Automatique.  All rights reserved.  This file is distributed    *)
+(*  under the terms of the GNU Library General Public License, with    *)
+(*  the special exception on linking described in file ../LICENSE.     *)
+(*                                                                     *)
+(***********************************************************************)
+[@@@warnerror "+55"]
+
+(* balanced tree based on stdlib distribution *)
+
+type 'a t0 = Empty | Leaf of 'a | Node of {l: 'a t0; v: 'a; r: 'a t0; h: int}
+
+type 'a partial_node = {l: 'a t0; v: 'a; r: 'a t0; h: int}
+
+external ( ~! ) : 'a t0 -> 'a partial_node = "%identity"
+
+let empty = Empty
+
+let[@inline] height = function
+  | Empty -> 0
+  | Leaf _ -> 1
+  | Node {h} -> h
+
+let[@inline] calc_height a b = (if a >= b then a else b) + 1
+
+(*
+     Invariants:
+     1. {[ l < v < r]}
+     2. l and r balanced
+     3. [height l] - [height r] <= 2
+*)
+let[@inline] unsafe_node v l r h = Node {l; v; r; h}
+
+let[@inline] unsafe_node_maybe_leaf v l r h =
+  if h = 1 then Leaf v else Node {l; v; r; h}
+
+let[@inline] singleton x = Leaf x
+
+let[@inline] unsafe_two_elements x v = unsafe_node v (singleton x) empty 2
+
+type 'a t = 'a t0 = private
+  | Empty
+  | Leaf of 'a
+  | Node of {l: 'a t0; v: 'a; r: 'a t0; h: int}
+
+(* Smallest and greatest element of a set *)
+
+let rec min_exn = function
+  | Empty -> raise Not_found
+  | Leaf v -> v
+  | Node {l; v} -> (
+    match l with
+    | Empty -> v
+    | Leaf _ | Node _ -> min_exn l)
+
+let[@inline] is_empty = function
+  | Empty -> true
+  | _ -> false
+
+let rec cardinal_aux acc = function
+  | Empty -> acc
+  | Leaf _ -> acc + 1
+  | Node {l; r} -> cardinal_aux (cardinal_aux (acc + 1) r) l
+
+let cardinal s = cardinal_aux 0 s
+
+let rec elements_aux accu = function
+  | Empty -> accu
+  | Leaf v -> v :: accu
+  | Node {l; v; r} -> elements_aux (v :: elements_aux accu r) l
+
+let elements s = elements_aux [] s
+
+let choose = min_exn
+
+let rec iter x f =
+  match x with
+  | Empty -> ()
+  | Leaf v -> f v
+  | Node {l; v; r} ->
+    iter l f;
+    f v;
+    iter r f
+
+let rec fold s accu f =
+  match s with
+  | Empty -> accu
+  | Leaf v -> f v accu
+  | Node {l; v; r} -> fold r (f v (fold l accu f)) f
+
+let rec for_all x p =
+  match x with
+  | Empty -> true
+  | Leaf v -> p v
+  | Node {l; v; r} -> p v && for_all l p && for_all r p
+
+let rec exists x p =
+  match x with
+  | Empty -> false
+  | Leaf v -> p v
+  | Node {l; v; r} -> p v || exists l p || exists r p
+
+exception Height_invariant_broken
+
+exception Height_diff_borken
+
+let rec check_height_and_diff = function
+  | Empty -> 0
+  | Leaf _ -> 1
+  | Node {l; r; h} ->
+    let hl = check_height_and_diff l in
+    let hr = check_height_and_diff r in
+    if h <> calc_height hl hr then raise Height_invariant_broken
+    else
+      let diff = abs (hl - hr) in
+      if diff > 2 then raise Height_diff_borken else h
+
+let check tree = ignore (check_height_and_diff tree)
+
+(* Same as create, but performs one step of rebalancing if necessary.
+    Invariants:
+    1. {[ l < v < r ]}
+    2. l and r balanced
+    3. | height l - height r | <= 3.
+
+    Proof by indunction
+
+    Lemma: the height of  [bal l v r] will bounded by [max l r] + 1
+*)
+let bal l v r : _ t =
+  let hl = height l in
+  let hr = height r in
+  if hl > hr + 2 then
+    let {l = ll; r = lr; v = lv; h = _} = ~!l in
+    let hll = height ll in
+    let hlr = height lr in
+    if hll >= hlr then
+      let hnode = calc_height hlr hr in
+      unsafe_node lv ll
+        (unsafe_node_maybe_leaf v lr r hnode)
+        (calc_height hll hnode)
+    else
+      let {l = lrl; r = lrr; v = lrv} = ~!lr in
+      let hlrl = height lrl in
+      let hlrr = height lrr in
+      let hlnode = calc_height hll hlrl in
+      let hrnode = calc_height hlrr hr in
+      unsafe_node lrv
+        (unsafe_node_maybe_leaf lv ll lrl hlnode)
+        (unsafe_node_maybe_leaf v lrr r hrnode)
+        (calc_height hlnode hrnode)
+  else if hr > hl + 2 then
+    let {l = rl; r = rr; v = rv} = ~!r in
+    let hrr = height rr in
+    let hrl = height rl in
+    if hrr >= hrl then
+      let hnode = calc_height hl hrl in
+      unsafe_node rv
+        (unsafe_node_maybe_leaf v l rl hnode)
+        rr (calc_height hnode hrr)
+    else
+      let {l = rll; r = rlr; v = rlv} = ~!rl in
+      let hrll = height rll in
+      let hrlr = height rlr in
+      let hlnode = calc_height hl hrll in
+      let hrnode = calc_height hrlr hrr in
+      unsafe_node rlv
+        (unsafe_node_maybe_leaf v l rll hlnode)
+        (unsafe_node_maybe_leaf rv rlr rr hrnode)
+        (calc_height hlnode hrnode)
+  else unsafe_node_maybe_leaf v l r (calc_height hl hr)
+
+let rec remove_min_elt = function
+  | Empty -> invalid_arg "Set.remove_min_elt"
+  | Leaf _ -> empty
+  | Node {l = Empty; r} -> r
+  | Node {l; v; r} -> bal (remove_min_elt l) v r
+
+(*
+    All elements of l must precede the elements of r.
+        Assume | height l - height r | <= 2.
+    weak form of [concat]
+*)
+
+let internal_merge l r =
+  match (l, r) with
+  | Empty, t -> t
+  | t, Empty -> t
+  | _, _ -> bal l (min_exn r) (remove_min_elt r)
+
+(* Beware: those two functions assume that the added v is *strictly*
+    smaller (or bigger) than all the present elements in the tree; it
+    does not test for equality with the current min (or max) element.
+    Indeed, they are only used during the "join" operation which
+    respects this precondition.
+*)
+
+let rec add_min v = function
+  | Empty -> singleton v
+  | Leaf x -> unsafe_two_elements v x
+  | Node n -> bal (add_min v n.l) n.v n.r
+
+let rec add_max v = function
+  | Empty -> singleton v
+  | Leaf x -> unsafe_two_elements x v
+  | Node n -> bal n.l n.v (add_max v n.r)
+
+(** 
+    Invariants:
+    1. l < v < r 
+    2. l and r are balanced 
+
+    Proof by induction
+    The height of output will be ~~ (max (height l) (height r) + 2)
+    Also use the lemma from [bal]
+*)
+let rec internal_join l v r =
+  match (l, r) with
+  | Empty, _ -> add_min v r
+  | _, Empty -> add_max v l
+  | Leaf lv, Node {h = rh} ->
+    if rh > 3 then add_min lv (add_min v r) (* FIXME: could inlined *)
+    else unsafe_node v l r (rh + 1)
+  | Leaf _, Leaf _ -> unsafe_node v l r 2
+  | Node {h = lh}, Leaf rv ->
+    if lh > 3 then add_max rv (add_max v l) else unsafe_node v l r (lh + 1)
+  | Node {l = ll; v = lv; r = lr; h = lh}, Node {l = rl; v = rv; r = rr; h = rh}
+    ->
+    if lh > rh + 2 then
+      (* proof by induction:
+         now [height of ll] is [lh - 1]
+      *)
+      bal ll lv (internal_join lr v r)
+    else if rh > lh + 2 then bal (internal_join l v rl) rv rr
+    else unsafe_node v l r (calc_height lh rh)
+
+(*
+    Required Invariants: 
+    [t1] < [t2]  
+*)
+let internal_concat t1 t2 =
+  match (t1, t2) with
+  | Empty, t -> t
+  | t, Empty -> t
+  | _, _ -> internal_join t1 (min_exn t2) (remove_min_elt t2)
+
+let rec partition x p =
+  match x with
+  | Empty -> (empty, empty)
+  | Leaf v ->
+    let pv = p v in
+    if pv then (x, empty) else (empty, x)
+  | Node {l; v; r} ->
+    (* call [p] in the expected left-to-right order *)
+    let lt, lf = partition l p in
+    let pv = p v in
+    let rt, rf = partition r p in
+    if pv then (internal_join lt v rt, internal_concat lf rf)
+    else (internal_concat lt rt, internal_join lf v rf)
+
+let of_sorted_array l =
+  let rec sub start n l =
+    if n = 0 then empty
+    else if n = 1 then
+      let x0 = Array.unsafe_get l start in
+      singleton x0
+    else if n = 2 then
+      let x0 = Array.unsafe_get l start in
+      let x1 = Array.unsafe_get l (start + 1) in
+      unsafe_node x1 (singleton x0) empty 2
+    else if n = 3 then
+      let x0 = Array.unsafe_get l start in
+      let x1 = Array.unsafe_get l (start + 1) in
+      let x2 = Array.unsafe_get l (start + 2) in
+      unsafe_node x1 (singleton x0) (singleton x2) 2
+    else
+      let nl = n / 2 in
+      let left = sub start nl l in
+      let mid = start + nl in
+      let v = Array.unsafe_get l mid in
+      let right = sub (mid + 1) (n - nl - 1) l in
+      unsafe_node v left right (calc_height (height left) (height right))
+  in
+  sub 0 (Array.length l) l
+
+let is_ordered ~cmp tree =
+  let rec is_ordered_min_max tree =
+    match tree with
+    | Empty -> `Empty
+    | Leaf v -> `V (v, v)
+    | Node {l; v; r} -> (
+      match is_ordered_min_max l with
+      | `No -> `No
+      | `Empty -> (
+        match is_ordered_min_max r with
+        | `No -> `No
+        | `Empty -> `V (v, v)
+        | `V (l, r) -> if cmp v l < 0 then `V (v, r) else `No)
+      | `V (min_v, max_v) -> (
+        match is_ordered_min_max r with
+        | `No -> `No
+        | `Empty -> if cmp max_v v < 0 then `V (min_v, v) else `No
+        | `V (min_v_r, max_v_r) ->
+          if cmp max_v min_v_r < 0 then `V (min_v, max_v_r) else `No))
+  in
+  is_ordered_min_max tree <> `No
+
+let invariant ~cmp t =
+  check t;
+  is_ordered ~cmp t
+
+module type S = sig
+  type elt
+
+  type t
+
+  val empty : t
+
+  val is_empty : t -> bool
+
+  val iter : t -> (elt -> unit) -> unit
+
+  val fold : t -> 'a -> (elt -> 'a -> 'a) -> 'a
+
+  val for_all : t -> (elt -> bool) -> bool
+
+  val exists : t -> (elt -> bool) -> bool
+
+  val singleton : elt -> t
+
+  val cardinal : t -> int
+
+  val elements : t -> elt list
+
+  val choose : t -> elt
+
+  val mem : t -> elt -> bool
+
+  val add : t -> elt -> t
+
+  val remove : t -> elt -> t
+
+  val union : t -> t -> t
+
+  val inter : t -> t -> t
+
+  val diff : t -> t -> t
+
+  val of_list : elt list -> t
+
+  val of_sorted_array : elt array -> t
+
+  val invariant : t -> bool
+
+  val print : Format.formatter -> t -> unit
+end
diff --git a/jscomp/ext/set_gen.mli b/compiler/ext/set_gen.mli
similarity index 94%
rename from jscomp/ext/set_gen.mli
rename to compiler/ext/set_gen.mli
index a1c838c..f3f39f0 100644
--- a/jscomp/ext/set_gen.mli
+++ b/compiler/ext/set_gen.mli
@@ -1,11 +1,11 @@
 type 'a t = private
   | Empty
   | Leaf of 'a
-  | Node of { l : 'a t; v : 'a; r : 'a t; h : int }
+  | Node of {l: 'a t; v: 'a; r: 'a t; h: int}
 
 val empty : 'a t
 
-val is_empty : 'a t -> bool [@@inline]
+val is_empty : 'a t -> bool
 
 val unsafe_two_elements : 'a -> 'a -> 'a t
 
diff --git a/jscomp/ext/set_ident.mli b/compiler/ext/set_ident.mli
similarity index 99%
rename from jscomp/ext/set_ident.mli
rename to compiler/ext/set_ident.mli
index 2209243..49638c9 100644
--- a/jscomp/ext/set_ident.mli
+++ b/compiler/ext/set_ident.mli
@@ -22,9 +22,4 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
 include Set_gen.S with type elt = Ident.t
-
-
-
-
diff --git a/jscomp/ext/set_int.mli b/compiler/ext/set_int.mli
similarity index 100%
rename from jscomp/ext/set_int.mli
rename to compiler/ext/set_int.mli
diff --git a/jscomp/ext/set_string.mli b/compiler/ext/set_string.mli
similarity index 100%
rename from jscomp/ext/set_string.mli
rename to compiler/ext/set_string.mli
diff --git a/jscomp/ext/vec.cppo.ml b/compiler/ext/vec.cppo.ml
similarity index 100%
rename from jscomp/ext/vec.cppo.ml
rename to compiler/ext/vec.cppo.ml
diff --git a/jscomp/ext/vec.mli b/compiler/ext/vec.mli
similarity index 100%
rename from jscomp/ext/vec.mli
rename to compiler/ext/vec.mli
diff --git a/jscomp/ext/vec_gen.ml b/compiler/ext/vec_gen.ml
similarity index 100%
rename from jscomp/ext/vec_gen.ml
rename to compiler/ext/vec_gen.ml
diff --git a/jscomp/ext/vec_int.mli b/compiler/ext/vec_int.mli
similarity index 100%
rename from jscomp/ext/vec_int.mli
rename to compiler/ext/vec_int.mli
diff --git a/compiler/ext/warnings.ml b/compiler/ext/warnings.ml
new file mode 100644
index 0000000..f25b91b
--- /dev/null
+++ b/compiler/ext/warnings.ml
@@ -0,0 +1,692 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Pierre Weis && Damien Doligez, INRIA Rocquencourt          *)
+(*                                                                        *)
+(*   Copyright 1998 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* When you change this, you need to update the documentation:
+   - man/ocamlc.m
+   - man/ocamlopt.m
+   - manual/manual/cmds/comp.etex
+   - manual/manual/cmds/native.etex
+*)
+
+type loc = {
+  loc_start: Lexing.position;
+  loc_end: Lexing.position;
+  loc_ghost: bool;
+}
+
+type top_level_unit_help = FunctionCall | Other
+
+type t =
+  | Comment_start (*  1 *)
+  | Comment_not_end (*  2 *)
+  | Deprecated of string * loc * loc * bool (*  3 *)
+  | Fragile_match of string (*  4 *)
+  | Partial_application (*  5 *)
+  | Method_override of string list (*  7 *)
+  | Partial_match of string (*  8 *)
+  | Non_closed_record_pattern of string (*  9 *)
+  | Statement_type (* 10 *)
+  | Unused_match (* 11 *)
+  | Unused_pat (* 12 *)
+  | Instance_variable_override of string list (* 13 *)
+  | Illegal_backslash (* 14 *)
+  | Implicit_public_methods of string list (* 15 *)
+  | Unerasable_optional_argument (* 16 *)
+  | Unused_argument (* 20 *)
+  | Nonreturning_statement (* 21 *)
+  | Preprocessor of string (* 22 *)
+  | Useless_record_with (* 23 *)
+  | Bad_module_name of string (* 24 *)
+  | All_clauses_guarded (* 8, used to be 25 *)
+  | Unused_var of string (* 26 *)
+  | Unused_var_strict of string (* 27 *)
+  | Wildcard_arg_to_constant_constr (* 28 *)
+  | Eol_in_string (* 29 *)
+  | Duplicate_definitions of string * string * string * string (*30 *)
+  | Unused_value_declaration of string (* 32 *)
+  | Unused_open of string (* 33 *)
+  | Unused_type_declaration of string (* 34 *)
+  | Unused_for_index of string (* 35 *)
+  | Unused_constructor of string * bool * bool (* 37 *)
+  | Unused_extension of string * bool * bool * bool (* 38 *)
+  | Unused_rec_flag (* 39 *)
+  | Ambiguous_name of string list * string list * bool (* 41 *)
+  | Nonoptional_label of string (* 43 *)
+  | Open_shadow_identifier of string * string (* 44 *)
+  | Open_shadow_label_constructor of string * string (* 45 *)
+  | Attribute_payload of string * string (* 47 *)
+  | Eliminated_optional_arguments of string list (* 48 *)
+  | No_cmi_file of string * string option (* 49 *)
+  | Bad_docstring of bool (* 50 *)
+  | Fragile_literal_pattern (* 52 *)
+  | Misplaced_attribute of string (* 53 *)
+  | Duplicated_attribute of string (* 54 *)
+  | Unreachable_case (* 56 *)
+  | Ambiguous_pattern of string list (* 57 *)
+  | Unused_module of string (* 60 *)
+  | Constraint_on_gadt (* 62 *)
+  | Bs_unused_attribute of string (* 101 *)
+  | Bs_polymorphic_comparison (* 102 *)
+  | Bs_ffi_warning of string (* 103 *)
+  | Bs_derive_warning of string (* 104 *)
+  | Bs_fragile_external of string (* 105 *)
+  | Bs_unimplemented_primitive of string (* 106 *)
+  | Bs_integer_literal_overflow (* 107 *)
+  | Bs_uninterpreted_delimiters of string (* 108 *)
+  | Bs_toplevel_expression_unit of
+      (string * top_level_unit_help) option (* 109 *)
+  | Bs_todo of string option (* 110 *)
+
+(* If you remove a warning, leave a hole in the numbering.  NEVER change
+   the numbers of existing warnings.
+   If you add a new warning, add it at the end with a new number;
+   do NOT reuse one of the holes.
+*)
+
+let number = function
+  | Comment_start -> 1
+  | Comment_not_end -> 2
+  | Deprecated _ -> 3
+  | Fragile_match _ -> 4
+  | Partial_application -> 5
+  | Method_override _ -> 7
+  | Partial_match _ -> 8
+  | Non_closed_record_pattern _ -> 9
+  | Statement_type -> 10
+  | Unused_match -> 11
+  | Unused_pat -> 12
+  | Instance_variable_override _ -> 13
+  | Illegal_backslash -> 14
+  | Implicit_public_methods _ -> 15
+  | Unerasable_optional_argument -> 16
+  | Unused_argument -> 20
+  | Nonreturning_statement -> 21
+  | Preprocessor _ -> 22
+  | Useless_record_with -> 23
+  | Bad_module_name _ -> 24
+  | All_clauses_guarded -> 8 (* used to be 25 *)
+  | Unused_var _ -> 26
+  | Unused_var_strict _ -> 27
+  | Wildcard_arg_to_constant_constr -> 28
+  | Eol_in_string -> 29
+  | Duplicate_definitions _ -> 30
+  | Unused_value_declaration _ -> 32
+  | Unused_open _ -> 33
+  | Unused_type_declaration _ -> 34
+  | Unused_for_index _ -> 35
+  | Unused_constructor _ -> 37
+  | Unused_extension _ -> 38
+  | Unused_rec_flag -> 39
+  | Ambiguous_name _ -> 41
+  | Nonoptional_label _ -> 43
+  | Open_shadow_identifier _ -> 44
+  | Open_shadow_label_constructor _ -> 45
+  | Attribute_payload _ -> 47
+  | Eliminated_optional_arguments _ -> 48
+  | No_cmi_file _ -> 49
+  | Bad_docstring _ -> 50
+  | Fragile_literal_pattern -> 52
+  | Misplaced_attribute _ -> 53
+  | Duplicated_attribute _ -> 54
+  | Unreachable_case -> 56
+  | Ambiguous_pattern _ -> 57
+  | Unused_module _ -> 60
+  | Constraint_on_gadt -> 62
+  | Bs_unused_attribute _ -> 101
+  | Bs_polymorphic_comparison -> 102
+  | Bs_ffi_warning _ -> 103
+  | Bs_derive_warning _ -> 104
+  | Bs_fragile_external _ -> 105
+  | Bs_unimplemented_primitive _ -> 106
+  | Bs_integer_literal_overflow -> 107
+  | Bs_uninterpreted_delimiters _ -> 108
+  | Bs_toplevel_expression_unit _ -> 109
+  | Bs_todo _ -> 110
+
+let last_warning_number = 110
+
+let letter_all =
+  let rec loop i = if i = 0 then [] else i :: loop (i - 1) in
+  loop last_warning_number
+
+(* Must be the max number returned by the [number] function. *)
+
+let letter = function
+  | 'a' -> letter_all
+  | 'b' -> []
+  | 'c' -> [1; 2]
+  | 'd' -> [3]
+  | 'e' -> [4]
+  | 'f' -> [5]
+  | 'g' -> []
+  | 'h' -> []
+  | 'i' -> []
+  | 'j' -> []
+  | 'k' -> [32; 33; 34; 35; 36; 37; 38; 39]
+  | 'l' -> [6]
+  | 'm' -> [7]
+  | 'n' -> []
+  | 'o' -> []
+  | 'p' -> [8]
+  | 'q' -> []
+  | 'r' -> [9]
+  | 's' -> [10]
+  | 't' -> []
+  | 'u' -> [11; 12]
+  | 'v' -> [13]
+  | 'w' -> []
+  | 'x' -> [14; 15; 16; 17; 18; 19; 20; 21; 22; 23; 24; 30]
+  | 'y' -> [26]
+  | 'z' -> [27]
+  | _ -> assert false
+
+type state = {active: bool array; error: bool array}
+
+let current =
+  ref
+    {
+      active = Array.make (last_warning_number + 1) true;
+      error = Array.make (last_warning_number + 1) false;
+    }
+
+let disabled = ref false
+
+let without_warnings f = Misc.protect_refs [Misc.R (disabled, true)] f
+
+let backup () = !current
+
+let restore x = current := x
+
+let is_active x = (not !disabled) && !current.active.(number x)
+
+let is_error x = (not !disabled) && !current.error.(number x)
+
+let mk_lazy f =
+  let state = backup () in
+  lazy
+    (let prev = backup () in
+     restore state;
+     try
+       let r = f () in
+       restore prev;
+       r
+     with exn ->
+       restore prev;
+       raise exn)
+
+let parse_opt error active flags s =
+  let set i = flags.(i) <- true in
+  let clear i = flags.(i) <- false in
+  let set_all i =
+    active.(i) <- true;
+    error.(i) <- true
+  in
+  let error () = raise (Arg.Bad "Ill-formed list of warnings") in
+  let rec get_num n i =
+    if i >= String.length s then (i, n)
+    else
+      match s.[i] with
+      | '0' .. '9' ->
+        get_num ((10 * n) + Char.code s.[i] - Char.code '0') (i + 1)
+      | _ -> (i, n)
+  in
+  let get_range i =
+    let i, n1 = get_num 0 i in
+    if i + 2 < String.length s && s.[i] = '.' && s.[i + 1] = '.' then (
+      let i, n2 = get_num 0 (i + 2) in
+      if n2 < n1 then error ();
+      (i, n1, n2))
+    else (i, n1, n1)
+  in
+  let rec loop i =
+    if i >= String.length s then ()
+    else
+      match s.[i] with
+      | 'A' .. 'Z' ->
+        List.iter set (letter (Char.lowercase_ascii s.[i]));
+        loop (i + 1)
+      | 'a' .. 'z' ->
+        List.iter clear (letter s.[i]);
+        loop (i + 1)
+      | '+' -> loop_letter_num set (i + 1)
+      | '-' -> loop_letter_num clear (i + 1)
+      | '@' -> loop_letter_num set_all (i + 1)
+      | _ -> error ()
+  and loop_letter_num myset i =
+    if i >= String.length s then error ()
+    else
+      match s.[i] with
+      | '0' .. '9' ->
+        let i, n1, n2 = get_range i in
+        for n = n1 to Ext_pervasives.min_int n2 last_warning_number do
+          myset n
+        done;
+        loop i
+      | 'A' .. 'Z' ->
+        List.iter myset (letter (Char.lowercase_ascii s.[i]));
+        loop (i + 1)
+      | 'a' .. 'z' ->
+        List.iter myset (letter s.[i]);
+        loop (i + 1)
+      | _ -> error ()
+  in
+  loop 0
+
+let parse_options errflag s =
+  let error = Array.copy !current.error in
+  let active = Array.copy !current.active in
+  parse_opt error active (if errflag then error else active) s;
+  current := {error; active}
+
+let reset () =
+  parse_options false Bsc_warnings.defaults_w;
+  parse_options true Bsc_warnings.defaults_warn_error
+
+let () = reset ()
+
+let message = function
+  | Comment_start -> "this is the start of a comment."
+  | Comment_not_end -> "this is not the end of a comment."
+  | Deprecated (s, _, _, can_be_automigrated) ->
+    (* Reduce \r\n to \n:
+         - Prevents any \r characters being printed on Unix when processing
+           Windows sources
+         - Prevents \r\r\n being generated on Windows, which affects the
+           testsuite
+    *)
+    "deprecated: " ^ Misc.normalise_eol s
+    ^
+    if can_be_automigrated then
+      "\n\n\
+      \  This can be automatically migrated by the ReScript migration tool. \
+       Run `rescript-tools migrate-all <project-root>` to run all automatic \
+       migrations available in your project, or `rescript-tools migrate \
+       <file>` to migrate a single file."
+    else ""
+  | Fragile_match "" -> "this pattern-matching is fragile."
+  | Fragile_match s ->
+    "this pattern-matching is fragile.\n\
+     It will remain exhaustive when constructors are added to type " ^ s ^ "."
+  | Partial_application ->
+    "this function application is partial,\nmaybe some arguments are missing."
+  | Method_override [lab] -> "the method " ^ lab ^ " is overridden."
+  | Method_override (cname :: slist) ->
+    String.concat " "
+      ("the following methods are overridden by the class" :: cname :: ":\n "
+     :: slist)
+  | Method_override [] -> assert false
+  | Partial_match "" ->
+    "You forgot to handle a possible case here, though we don't have more \
+     information on the value."
+  | Partial_match s ->
+    "You forgot to handle a possible case here, for example: \n  " ^ s
+  | Non_closed_record_pattern s ->
+    "the following labels are not bound in this record pattern: " ^ s
+    ^ "\nEither bind these labels explicitly or add ', _' to the pattern."
+  | Statement_type ->
+    "This expression returns a value, but you're not doing anything with it. \
+     If this is on purpose, wrap it with `ignore`."
+  | Unused_match -> "this match case is unused."
+  | Unused_pat -> "this sub-pattern is unused."
+  | Instance_variable_override [lab] ->
+    "the instance variable " ^ lab ^ " is overridden.\n"
+    ^ "The behaviour changed in ocaml 3.10 (previous behaviour was hiding.)"
+  | Instance_variable_override (cname :: slist) ->
+    String.concat " "
+      ("the following instance variables are overridden by the class" :: cname
+     :: ":\n " :: slist)
+    ^ "\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)"
+  | Instance_variable_override [] -> assert false
+  | Illegal_backslash -> "illegal backslash escape in string."
+  | Implicit_public_methods l ->
+    "the following private methods were made public implicitly:\n "
+    ^ String.concat " " l ^ "."
+  | Unerasable_optional_argument ->
+    String.concat ""
+      [
+        "This optional parameter in final position will, in practice, not be \
+         optional.\n";
+        "  Reorder the parameters so that at least one non-optional one is in \
+         final position or, if all parameters are optional, insert a final \
+         ().\n\n";
+        "  Explanation: If the final parameter is optional, it'd be unclear \
+         whether a function application that omits it should be considered \
+         fully applied, or partially applied. Imagine writing `let title = \
+         display(\"hello!\")`, only to realize `title` isn't your desired \
+         result, but a curried call that takes a final optional argument, e.g. \
+         `~showDate`.\n\n";
+        "  Formal rule: an optional argument is considered intentionally \
+         omitted when the 1st positional (i.e. neither labeled nor optional) \
+         argument defined after it is passed in.";
+      ]
+  | Unused_argument -> "this argument will not be used by the function."
+  | Nonreturning_statement ->
+    "this statement never returns (or has an unsound type.)"
+  | Preprocessor s -> s
+  | Useless_record_with ->
+    "All the fields are already explicitly listed in this record. You can \
+     remove the `...` spread."
+  | Bad_module_name modname ->
+    "This file's name is potentially invalid. The build systems conventionally \
+     turn a file name into a module name by upper-casing the first letter. "
+    ^ modname ^ " isn't a valid module name.\n"
+    ^ "Note: some build systems might e.g. turn kebab-case into CamelCase \
+       module, which is why this isn't a hard error."
+  | All_clauses_guarded ->
+    "this pattern-matching is not exhaustive.\n\
+     All clauses in this pattern-matching are guarded."
+  | Unused_var v | Unused_var_strict v ->
+    Format.sprintf
+      "unused variable %s.\n\n\
+       Fix this by:\n\
+       - Deleting the variable if it's not used anymore.\n\
+       - Prepending the variable name with `_` (like `_%s`) to ignore that the \
+       variable is unused.\n\
+       - Using the variable somewhere."
+      v v
+  | Wildcard_arg_to_constant_constr ->
+    "wildcard pattern given as argument to a constant constructor"
+  | Eol_in_string ->
+    "unescaped end-of-line in a string constant (non-portable code)"
+  | Duplicate_definitions (kind, cname, tc1, tc2) ->
+    Printf.sprintf "the %s %s is defined in both types %s and %s." kind cname
+      tc1 tc2
+  | Unused_value_declaration v -> "unused value " ^ v ^ "."
+  | Unused_open s -> "unused open " ^ s ^ "."
+  | Unused_type_declaration s -> "unused type " ^ s ^ "."
+  | Unused_for_index s -> "unused for-loop index " ^ s ^ "."
+  | Unused_constructor (s, false, false) -> "unused constructor " ^ s ^ "."
+  | Unused_constructor (s, true, _) ->
+    "constructor " ^ s
+    ^ " is never used to build values.\n\
+       (However, this constructor appears in patterns.)"
+  | Unused_constructor (s, false, true) ->
+    "constructor " ^ s
+    ^ " is never used to build values.\nIts type is exported as a private type."
+  | Unused_extension (s, is_exception, cu_pattern, cu_privatize) -> (
+    let kind = if is_exception then "exception" else "extension constructor" in
+    let name = kind ^ " " ^ s in
+    match (cu_pattern, cu_privatize) with
+    | false, false -> "unused " ^ name
+    | true, _ ->
+      name
+      ^ " is never used to build values.\n\
+         (However, this constructor appears in patterns.)"
+    | false, true ->
+      name
+      ^ " is never used to build values.\n\
+         It is exported or rebound as a private extension.")
+  | Unused_rec_flag -> "unused rec flag."
+  | Ambiguous_name ([s], tl, false) ->
+    s ^ " belongs to several types: " ^ String.concat " " tl
+    ^ "\nThe first one was selected. Disambiguate if this is wrong."
+  | Ambiguous_name (_, _, false) -> assert false
+  | Ambiguous_name (_slist, tl, true) ->
+    "these field labels belong to several types: " ^ String.concat " " tl
+    ^ "\nThe first one was selected. Disambiguate if this is wrong."
+  | Nonoptional_label s -> "the label " ^ s ^ " is not optional."
+  | Open_shadow_identifier (kind, s) ->
+    Printf.sprintf
+      "this open statement shadows the %s identifier %s (which is later used)"
+      kind s
+  | Open_shadow_label_constructor (kind, s) ->
+    Printf.sprintf "this open statement shadows the %s %s (which is later used)"
+      kind s
+  | Attribute_payload (a, s) ->
+    Printf.sprintf "illegal payload for attribute '%s'.\n%s" a s
+  | Eliminated_optional_arguments sl ->
+    Printf.sprintf "implicit elimination of optional argument%s %s"
+      (if List.length sl = 1 then "" else "s")
+      (String.concat ", " sl)
+  | No_cmi_file (name, None) ->
+    "no cmi file was found in path for module " ^ name
+  | No_cmi_file (name, Some msg) ->
+    Printf.sprintf "no valid cmi file was found in path for module %s. %s" name
+      msg
+  | Bad_docstring unattached ->
+    if unattached then "unattached documentation comment (ignored)"
+    else "ambiguous documentation comment"
+  | Fragile_literal_pattern ->
+    Printf.sprintf
+      "Code should not depend on the actual values of\n\
+       this constructor's arguments. They are only for information\n\
+       and may change in future versions. (See manual section 8.5)"
+  | Unreachable_case ->
+    "this match case is unreachable.\n\
+     Consider replacing it with a refutation case '<pat> -> .'"
+  | Misplaced_attribute attr_name ->
+    Printf.sprintf "the %S attribute cannot appear in this context" attr_name
+  | Duplicated_attribute attr_name ->
+    Printf.sprintf "the %S attribute is used more than once on this expression"
+      attr_name
+  | Ambiguous_pattern vars ->
+    let msg =
+      let vars = List.sort String.compare vars in
+      match vars with
+      | [] -> assert false
+      | [x] -> "variable " ^ x
+      | _ :: _ -> "variables " ^ String.concat "," vars
+    in
+    Printf.sprintf
+      "Ambiguous or-pattern variables under guard;\n\
+       %s may match different arguments. (See manual section 8.5)"
+      msg
+  | Unused_module s -> "unused module " ^ s ^ "."
+  | Constraint_on_gadt ->
+    "Type constraints do not apply to GADT cases of variant types."
+  | Bs_unused_attribute s ->
+    "Unused attribute: @" ^ s
+    ^ "\n\
+       This attribute has no effect here.\n\
+       For example, some attributes are only meaningful in externals.\n"
+  | Bs_polymorphic_comparison ->
+    "Polymorphic comparison introduced (maybe unsafe)"
+  | Bs_ffi_warning s -> "FFI warning: " ^ s
+  | Bs_derive_warning s -> "@deriving warning: " ^ s
+  | Bs_fragile_external s ->
+    s
+    ^ " : using an empty string as a shorthand to infer the external's name \
+       from the value's name is dangerous when refactoring, and therefore \
+       deprecated"
+  | Bs_unimplemented_primitive s -> "Unimplemented primitive used: " ^ s
+  | Bs_integer_literal_overflow ->
+    "Integer literal exceeds the range of representable integers of type int"
+  | Bs_uninterpreted_delimiters s -> "Uninterpreted delimiters " ^ s
+  | Bs_toplevel_expression_unit help ->
+    Printf.sprintf
+      "This%sis at the top level and is expected to return `unit`. But it's \
+       returning %s.\n\n\
+      \  In ReScript, anything at the top level must evaluate to `unit`. You \
+       can fix this by assigning the expression to a value, or piping it into \
+       the `ignore` function.%s"
+      (match help with
+      | Some (_, FunctionCall) -> " function call "
+      | _ -> " ")
+      (match help with
+      | Some (return_type, _) -> Printf.sprintf "`%s`" return_type
+      | None -> "something that is not `unit`")
+      (match help with
+      | Some (_, help_typ) ->
+        let help_text =
+          match help_typ with
+          | FunctionCall -> "yourFunctionCall()"
+          | Other -> "yourExpression"
+        in
+        Printf.sprintf
+          "\n\n\
+          \  Possible solutions:\n\
+          \  - Assigning to a value that is then ignored: `let _ = %s`\n\
+          \  - Piping into the built-in ignore function to ignore the result: \
+           `%s->ignore`"
+          help_text help_text
+      | _ -> "")
+  | Bs_todo maybe_text ->
+    (match maybe_text with
+    | None -> "Todo found."
+    | Some todo -> "Todo found: " ^ todo)
+    ^ "\n\n\
+      \  This code is not implemented yet and will crash at runtime. Make sure \
+       you implement this before running the code."
+
+let sub_locs = function
+  | Deprecated (_, def, use, _) ->
+    [(def, "Definition"); (use, "Expected signature")]
+  | _ -> []
+
+let has_warnings = ref false
+
+let nerrors = ref 0
+
+type reporting_information = {
+  number: int;
+  message: string;
+  is_error: bool;
+  sub_locs: (loc * string) list;
+}
+
+let report w =
+  match is_active w with
+  | false -> `Inactive
+  | true ->
+    has_warnings := true;
+    if is_error w then incr nerrors;
+    `Active
+      {
+        number = number w;
+        message = message w;
+        is_error = is_error w;
+        sub_locs = sub_locs w;
+      }
+
+exception Errors
+
+let reset_fatal () = nerrors := 0
+
+let check_fatal () =
+  if !nerrors > 0 then (
+    nerrors := 0;
+    raise Errors)
+
+let descriptions =
+  [
+    (1, "Suspicious-looking start-of-comment mark.");
+    (2, "Suspicious-looking end-of-comment mark.");
+    (3, "Deprecated feature.");
+    ( 4,
+      "Fragile pattern matching: matching that will remain complete even\n\
+      \    if additional constructors are added to one of the variant types\n\
+      \    matched." );
+    ( 5,
+      "Partially applied function: expression whose result has function\n\
+      \    type and is ignored." );
+    (7, "Method overridden.");
+    (8, "Partial match: missing cases in pattern-matching.");
+    (9, "Missing fields in a record pattern.");
+    ( 10,
+      "Expression on the left-hand side of a sequence that doesn't have type\n\
+      \    \"unit\" (and that is not a function, see warning number 5)." );
+    (11, "Redundant case in a pattern matching (unused match case).");
+    (12, "Redundant sub-pattern in a pattern-matching.");
+    (13, "Instance variable overridden.");
+    (14, "Illegal backslash escape in a string constant.");
+    (15, "Private method made public implicitly.");
+    (16, "Unerasable optional argument.");
+    (17, "Undeclared virtual method.");
+    (18, "Non-principal type.");
+    (19, "Type without principality.");
+    (20, "Unused function argument.");
+    (21, "Non-returning statement.");
+    (22, "Preprocessor warning.");
+    (23, "Useless record \"with\" clause.");
+    ( 24,
+      "Bad module name: the source file name is not a valid ReScript module \
+       name." );
+    (25, "Deprecated: now part of warning 8.");
+    ( 26,
+      "Suspicious unused variable: unused variable that is bound\n\
+      \    with \"let\" or \"as\", and doesn't start with an underscore (\"_\")\n\
+      \    character." );
+    ( 27,
+      "Innocuous unused variable: unused variable that is not bound with\n\
+      \    \"let\" nor \"as\", and doesn't start with an underscore (\"_\")\n\
+      \    character." );
+    (28, "Wildcard pattern given as argument to a constant constructor.");
+    (29, "Unescaped end-of-line in a string constant (non-portable code).");
+    ( 30,
+      "Two labels or constructors of the same name are defined in two\n\
+      \    mutually recursive types." );
+    (31, "A module is linked twice in the same executable.");
+    (32, "Unused value declaration.");
+    (33, "Unused open statement.");
+    (34, "Unused type declaration.");
+    (35, "Unused for-loop index.");
+    (36, "Unused ancestor variable.");
+    (37, "Unused constructor.");
+    (38, "Unused extension constructor.");
+    (39, "Unused rec flag.");
+    (41, "Ambiguous constructor or label name.");
+    (43, "Nonoptional label applied as optional.");
+    (44, "Open statement shadows an already defined identifier.");
+    (45, "Open statement shadows an already defined label or constructor.");
+    (46, "Error in environment variable.");
+    (47, "Illegal attribute payload.");
+    (48, "Implicit elimination of optional arguments.");
+    (49, "Absent cmi file when looking up module alias.");
+    (50, "Unexpected documentation comment.");
+    (52, "Fragile constant pattern.");
+    (53, "Attribute cannot appear in this context");
+    (54, "Attribute used more than once on an expression");
+    (55, "Inlining impossible");
+    (56, "Unreachable case in a pattern-matching (based on type information).");
+    (57, "Ambiguous or-pattern variables under guard");
+    (59, "Assignment to non-mutable value");
+    (60, "Unused module declaration");
+    (62, "Type constraint on GADT type declaration");
+    (101, "Unused bs attributes");
+    (102, "Polymorphic comparison introduced (maybe unsafe)");
+    (103, "Fragile FFI definitions");
+    (104, "@deriving warning with customized message ");
+    ( 105,
+      "External name is inferred from val name is unsafe from refactoring when \
+       changing value name" );
+    (106, "Unimplemented primitive used:");
+    ( 107,
+      "Integer literal exceeds the range of representable integers of type int"
+    );
+    (108, "Uninterpreted delimiters (for unicode)");
+    (109, "Toplevel expression has unit type");
+    (110, "Todo found");
+  ]
+
+let help_warnings () =
+  List.iter (fun (i, s) -> Printf.printf "%3i %s\n" i s) descriptions;
+  print_endline "  A all warnings";
+  for i = Char.code 'b' to Char.code 'z' do
+    let c = Char.chr i in
+    match letter c with
+    | [] -> ()
+    | [n] ->
+      Printf.printf "  %c Alias for warning %i.\n" (Char.uppercase_ascii c) n
+    | l ->
+      Printf.printf "  %c warnings %s.\n" (Char.uppercase_ascii c)
+        (String.concat ", " (List.map string_of_int l))
+  done;
+  exit 0
+
+let loc_to_string (loc : loc) : string =
+  Format.sprintf "(%02d,%02d--%02d,%02d)" loc.loc_start.pos_lnum
+    (loc.loc_start.pos_cnum - loc.loc_start.pos_bol)
+    loc.loc_end.pos_lnum
+    (loc.loc_end.pos_cnum - loc.loc_end.pos_bol)
diff --git a/jscomp/ext/warnings.mli b/compiler/ext/warnings.mli
similarity index 88%
rename from jscomp/ext/warnings.mli
rename to compiler/ext/warnings.mli
index b5dab78..ba1a03c 100644
--- a/jscomp/ext/warnings.mli
+++ b/compiler/ext/warnings.mli
@@ -14,17 +14,17 @@
 (**************************************************************************)
 
 type loc = {
-  loc_start : Lexing.position;
-  loc_end : Lexing.position;
-  loc_ghost : bool;
+  loc_start: Lexing.position;
+  loc_end: Lexing.position;
+  loc_ghost: bool;
 }
 
-type topLevelUnitHelp = FunctionCall | Other
+type top_level_unit_help = FunctionCall | Other
 
 type t =
   | Comment_start (*  1 *)
   | Comment_not_end (*  2 *)
-  | Deprecated of string * loc * loc (*  3 *)
+  | Deprecated of string * loc * loc * bool (*  3 *)
   | Fragile_match of string (*  4 *)
   | Partial_application (*  5 *)
   | Method_override of string list (*  7 *)
@@ -78,7 +78,8 @@ type t =
   | Bs_unimplemented_primitive of string (* 106 *)
   | Bs_integer_literal_overflow (* 107 *)
   | Bs_uninterpreted_delimiters of string (* 108 *)
-  | Bs_toplevel_expression_unit of (string * topLevelUnitHelp) option (* 109 *)
+  | Bs_toplevel_expression_unit of
+      (string * top_level_unit_help) option (* 109 *)
   | Bs_todo of string option (* 110 *)
 
 val parse_options : bool -> string -> unit
@@ -90,13 +91,13 @@ val is_active : t -> bool
 val is_error : t -> bool
 
 type reporting_information = {
-  number : int;
-  message : string;
-  is_error : bool;
-  sub_locs : (loc * string) list;
+  number: int;
+  message: string;
+  is_error: bool;
+  sub_locs: (loc * string) list;
 }
 
-val report : t -> [ `Active of reporting_information | `Inactive ]
+val report : t -> [`Active of reporting_information | `Inactive]
 
 exception Errors
 
@@ -125,3 +126,8 @@ val message : t -> string
 val number : t -> int
 
 val reset : unit -> unit
+
+val loc_to_string : loc -> string
+(**
+Turn the location into a string with (line,column--line,column) format.
+*)
diff --git a/jscomp/ml/annot.ml b/compiler/ml/annot.ml
similarity index 93%
rename from jscomp/ml/annot.ml
rename to compiler/ml/annot.ml
index 3cae8f2..13a5865 100644
--- a/jscomp/ml/annot.ml
+++ b/compiler/ml/annot.ml
@@ -15,10 +15,9 @@
 
 (* Data types for annotations (Stypes.ml) *)
 
-type call = Tail | Stack | Inline;;
+type call = Tail | Stack | Inline
 
 type ident =
   | Iref_internal of Location.t (* defining occurrence *)
   | Iref_external
-  | Idef of Location.t          (* scope *)
-;;
+  | Idef of Location.t (* scope *)
diff --git a/compiler/ml/ast_async.ml b/compiler/ml/ast_async.ml
new file mode 100644
index 0000000..d5494eb
--- /dev/null
+++ b/compiler/ml/ast_async.ml
@@ -0,0 +1,29 @@
+let rec dig_async_payload_from_function (expr : Parsetree.expression) =
+  match expr.pexp_desc with
+  | Pexp_fun {async} -> async
+  | Pexp_newtype (_, body) -> dig_async_payload_from_function body
+  | _ -> false
+
+let add_promise_type ?(loc = Location.none) ~async
+    (result : Parsetree.expression) =
+  if async then
+    let unsafe_async =
+      Ast_helper.Exp.ident ~loc
+        {txt = Ldot (Lident Primitive_modules.promise, "unsafe_async"); loc}
+    in
+    Ast_helper.Exp.apply ~loc unsafe_async [(Nolabel, result)]
+  else result
+
+let rec add_promise_to_result ~loc (e : Parsetree.expression) =
+  match e.pexp_desc with
+  | Pexp_fun f ->
+    let rhs = add_promise_to_result ~loc f.rhs in
+    {e with pexp_desc = Pexp_fun {f with rhs}}
+  | _ -> add_promise_type ~loc ~async:true e
+
+let make_function_async ~async (e : Parsetree.expression) =
+  if async then
+    match e.pexp_desc with
+    | Pexp_fun {lhs = {ppat_loc}} -> add_promise_to_result ~loc:ppat_loc e
+    | _ -> assert false
+  else e
diff --git a/compiler/ml/ast_await.ml b/compiler/ml/ast_await.ml
new file mode 100644
index 0000000..588a0fa
--- /dev/null
+++ b/compiler/ml/ast_await.ml
@@ -0,0 +1,61 @@
+let is_await : Parsetree.attribute -> bool =
+ fun ({txt}, _) -> txt = "await" || txt = "res.await"
+
+let create_await_expression (e : Parsetree.expression) =
+  let loc = {e.pexp_loc with loc_ghost = true} in
+  let unsafe_await =
+    Ast_helper.Exp.ident ~loc
+      {txt = Ldot (Lident Primitive_modules.promise, "unsafe_await"); loc}
+  in
+  Ast_helper.Exp.apply ~loc unsafe_await [(Nolabel, e)]
+
+let is_await_expr (e : Parsetree.expression) =
+  match e with
+  | {
+   pexp_loc = {loc_ghost = true};
+   pexp_desc =
+     Pexp_apply
+       {
+         funct =
+           {
+             pexp_loc = {loc_ghost = true};
+             pexp_desc = Pexp_ident {txt = Ldot (Lident ident, "unsafe_await")};
+           };
+         args = [(Nolabel, _)];
+       };
+  }
+    when ident = Primitive_modules.promise ->
+    true
+  | _ -> false
+
+(* Transform `@res.await M` to unpack(@res.await Js.import(module(M: __M0__))) *)
+let create_await_module_expression ~module_type_lid (e : Parsetree.module_expr)
+    =
+  let open Ast_helper in
+  let remove_await_attribute =
+    List.filter (fun ((loc, _) : Parsetree.attribute) -> loc.txt != "res.await")
+  in
+  {
+    e with
+    pmod_desc =
+      Pmod_unpack
+        (create_await_expression
+           (Exp.apply ~loc:e.pmod_loc
+              (Exp.ident ~loc:e.pmod_loc
+                 {
+                   txt =
+                     Longident.Ldot (Lident Primitive_modules.module_, "import");
+                   loc = e.pmod_loc;
+                 })
+              [
+                ( Nolabel,
+                  Exp.constraint_ ~loc:e.pmod_loc
+                    (Exp.pack ~loc:e.pmod_loc
+                       {
+                         e with
+                         pmod_attributes =
+                           remove_await_attribute e.pmod_attributes;
+                       })
+                    (Typ.package ~loc:e.pmod_loc module_type_lid []) );
+              ]));
+  }
diff --git a/compiler/ml/ast_helper.ml b/compiler/ml/ast_helper.ml
new file mode 100644
index 0000000..2fae640
--- /dev/null
+++ b/compiler/ml/ast_helper.ml
@@ -0,0 +1,448 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                         Alain Frisch, LexiFi                           *)
+(*                                                                        *)
+(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** Helpers to produce Parsetree fragments *)
+
+open Asttypes
+open Parsetree
+
+type lid = Longident.t loc
+type str = string loc
+type loc = Location.t
+type attrs = attribute list
+
+let default_loc = ref Location.none
+
+let with_default_loc l f =
+  let old = !default_loc in
+  default_loc := l;
+  try
+    let r = f () in
+    default_loc := old;
+    r
+  with exn ->
+    default_loc := old;
+    raise exn
+
+module Const = struct
+  let integer ?suffix i = Pconst_integer (i, suffix)
+  let int ?suffix i = integer ?suffix (string_of_int i)
+  let int32 ?(suffix = 'l') i = integer ~suffix (Int32.to_string i)
+  let int64 ?(suffix = 'L') i = integer ~suffix (Int64.to_string i)
+  let nativeint ?(suffix = 'n') i = integer ~suffix (Nativeint.to_string i)
+  let float ?suffix f = Pconst_float (f, suffix)
+  let char c = Pconst_char (Char.code c)
+  let string ?quotation_delimiter s = Pconst_string (s, quotation_delimiter)
+end
+
+module Typ = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) d =
+    {ptyp_desc = d; ptyp_loc = loc; ptyp_attributes = attrs}
+  let attr d a = {d with ptyp_attributes = d.ptyp_attributes @ [a]}
+
+  let any ?loc ?attrs () = mk ?loc ?attrs Ptyp_any
+  let var ?loc ?attrs a = mk ?loc ?attrs (Ptyp_var a)
+  let arrow ?loc ?attrs ~arity arg ret =
+    mk ?loc ?attrs (Ptyp_arrow {arg; ret; arity})
+  let arrows ?loc ?attrs args ret =
+    let arity = Some (List.length args) in
+    let rec build_arrows arity_to_use = function
+      | [] -> ret
+      | [arg] -> arrow ?loc ?attrs ~arity:arity_to_use arg ret
+      | arg :: rest ->
+        arrow ?loc ?attrs ~arity:arity_to_use arg (build_arrows None rest)
+    in
+    build_arrows arity args
+  let tuple ?loc ?attrs a = mk ?loc ?attrs (Ptyp_tuple a)
+  let constr ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_constr (a, b))
+  let object_ ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_object (a, b))
+  let alias ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_alias (a, b))
+  let variant ?loc ?attrs a b c = mk ?loc ?attrs (Ptyp_variant (a, b, c))
+  let poly ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_poly (a, b))
+  let package ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_package (a, b))
+  let extension ?loc ?attrs a = mk ?loc ?attrs (Ptyp_extension a)
+
+  let force_poly t =
+    match t.ptyp_desc with
+    | Ptyp_poly _ -> t
+    | _ -> poly ~loc:t.ptyp_loc [] t (* -> ghost? *)
+
+  let varify_constructors var_names t =
+    let check_variable vl loc v =
+      if List.mem v vl then raise Syntaxerr.(Error (Variable_in_scope (loc, v)))
+    in
+    let var_names = List.map (fun v -> v.txt) var_names in
+    let rec loop t =
+      let desc =
+        match t.ptyp_desc with
+        | Ptyp_any -> Ptyp_any
+        | Ptyp_var x ->
+          check_variable var_names t.ptyp_loc x;
+          Ptyp_var x
+        | Ptyp_arrow ({arg; ret} as arr) ->
+          Ptyp_arrow
+            {arr with arg = {arr.arg with typ = loop arg.typ}; ret = loop ret}
+        | Ptyp_tuple lst -> Ptyp_tuple (List.map loop lst)
+        | Ptyp_constr ({txt = Longident.Lident s}, []) when List.mem s var_names
+          ->
+          Ptyp_var s
+        | Ptyp_constr (longident, lst) ->
+          Ptyp_constr (longident, List.map loop lst)
+        | Ptyp_object (lst, o) -> Ptyp_object (List.map loop_object_field lst, o)
+        | Ptyp_alias (core_type, string) ->
+          check_variable var_names t.ptyp_loc string;
+          Ptyp_alias (loop core_type, string)
+        | Ptyp_variant (row_field_list, flag, lbl_lst_option) ->
+          Ptyp_variant
+            (List.map loop_row_field row_field_list, flag, lbl_lst_option)
+        | Ptyp_poly (string_lst, core_type) ->
+          List.iter
+            (fun v -> check_variable var_names t.ptyp_loc v.txt)
+            string_lst;
+          Ptyp_poly (string_lst, loop core_type)
+        | Ptyp_package (longident, lst) ->
+          Ptyp_package (longident, List.map (fun (n, typ) -> (n, loop typ)) lst)
+        | Ptyp_extension (s, arg) -> Ptyp_extension (s, arg)
+      in
+      {t with ptyp_desc = desc}
+    and loop_row_field = function
+      | Rtag (label, attrs, flag, lst) ->
+        Rtag (label, attrs, flag, List.map loop lst)
+      | Rinherit t -> Rinherit (loop t)
+    and loop_object_field = function
+      | Otag (label, attrs, t) -> Otag (label, attrs, loop t)
+      | Oinherit t -> Oinherit (loop t)
+    in
+    loop t
+end
+
+module Pat = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) d =
+    {ppat_desc = d; ppat_loc = loc; ppat_attributes = attrs}
+  let attr d a = {d with ppat_attributes = d.ppat_attributes @ [a]}
+
+  let any ?loc ?attrs () = mk ?loc ?attrs Ppat_any
+  let var ?loc ?attrs a = mk ?loc ?attrs (Ppat_var a)
+  let alias ?loc ?attrs a b = mk ?loc ?attrs (Ppat_alias (a, b))
+  let constant ?loc ?attrs a = mk ?loc ?attrs (Ppat_constant a)
+  let interval ?loc ?attrs a b = mk ?loc ?attrs (Ppat_interval (a, b))
+  let tuple ?loc ?attrs a = mk ?loc ?attrs (Ppat_tuple a)
+  let construct ?loc ?attrs a b = mk ?loc ?attrs (Ppat_construct (a, b))
+  let variant ?loc ?attrs a b = mk ?loc ?attrs (Ppat_variant (a, b))
+  let record ?loc ?attrs a b = mk ?loc ?attrs (Ppat_record (a, b))
+  let array ?loc ?attrs a = mk ?loc ?attrs (Ppat_array a)
+  let or_ ?loc ?attrs a b = mk ?loc ?attrs (Ppat_or (a, b))
+  let constraint_ ?loc ?attrs a b = mk ?loc ?attrs (Ppat_constraint (a, b))
+  let type_ ?loc ?attrs a = mk ?loc ?attrs (Ppat_type a)
+  let unpack ?loc ?attrs a = mk ?loc ?attrs (Ppat_unpack a)
+  let open_ ?loc ?attrs a b = mk ?loc ?attrs (Ppat_open (a, b))
+  let exception_ ?loc ?attrs a = mk ?loc ?attrs (Ppat_exception a)
+  let extension ?loc ?attrs a = mk ?loc ?attrs (Ppat_extension a)
+end
+
+module Exp = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) d =
+    {pexp_desc = d; pexp_loc = loc; pexp_attributes = attrs}
+  let attr d a = {d with pexp_attributes = d.pexp_attributes @ [a]}
+
+  let ident ?loc ?attrs a = mk ?loc ?attrs (Pexp_ident a)
+  let constant ?loc ?attrs a = mk ?loc ?attrs (Pexp_constant a)
+  let let_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_let (a, b, c))
+  let fun_ ?loc ?attrs ?(async = false) ~arity a b c d =
+    mk ?loc ?attrs
+      (Pexp_fun {arg_label = a; default = b; lhs = c; rhs = d; arity; async})
+  let apply ?loc ?attrs ?(partial = false) ?(transformed_jsx = false) funct args
+      =
+    mk ?loc ?attrs (Pexp_apply {funct; args; partial; transformed_jsx})
+  let match_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_match (a, b))
+  let try_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_try (a, b))
+  let tuple ?loc ?attrs a = mk ?loc ?attrs (Pexp_tuple a)
+  let construct ?loc ?attrs a b = mk ?loc ?attrs (Pexp_construct (a, b))
+  let variant ?loc ?attrs a b = mk ?loc ?attrs (Pexp_variant (a, b))
+  let record ?loc ?attrs a b = mk ?loc ?attrs (Pexp_record (a, b))
+  let field ?loc ?attrs a b = mk ?loc ?attrs (Pexp_field (a, b))
+  let setfield ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_setfield (a, b, c))
+  let array ?loc ?attrs a = mk ?loc ?attrs (Pexp_array a)
+  let ifthenelse ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_ifthenelse (a, b, c))
+  let sequence ?loc ?attrs a b = mk ?loc ?attrs (Pexp_sequence (a, b))
+  let while_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_while (a, b))
+  let for_ ?loc ?attrs a b c d e = mk ?loc ?attrs (Pexp_for (a, b, c, d, e))
+  let constraint_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_constraint (a, b))
+  let coerce ?loc ?attrs a c = mk ?loc ?attrs (Pexp_coerce (a, (), c))
+  let send ?loc ?attrs a b = mk ?loc ?attrs (Pexp_send (a, b))
+  let letmodule ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_letmodule (a, b, c))
+  let letexception ?loc ?attrs a b = mk ?loc ?attrs (Pexp_letexception (a, b))
+  let assert_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_assert a)
+  let newtype ?loc ?attrs a b = mk ?loc ?attrs (Pexp_newtype (a, b))
+  let pack ?loc ?attrs a = mk ?loc ?attrs (Pexp_pack a)
+  let open_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_open (a, b, c))
+  let extension ?loc ?attrs a = mk ?loc ?attrs (Pexp_extension a)
+  let await ?loc ?attrs a = mk ?loc ?attrs (Pexp_await a)
+  let jsx_fragment ?loc ?attrs a b c =
+    mk ?loc ?attrs
+      (Pexp_jsx_element
+         (Jsx_fragment
+            {
+              jsx_fragment_opening = a;
+              jsx_fragment_children = b;
+              jsx_fragment_closing = c;
+            }))
+  let jsx_unary_element ?loc ?attrs a b =
+    mk ?loc ?attrs
+      (Pexp_jsx_element
+         (Jsx_unary_element
+            {jsx_unary_element_tag_name = a; jsx_unary_element_props = b}))
+
+  let jsx_container_element ?loc ?attrs a b c d e =
+    mk ?loc ?attrs
+      (Pexp_jsx_element
+         (Jsx_container_element
+            {
+              jsx_container_element_tag_name_start = a;
+              jsx_container_element_props = b;
+              jsx_container_element_opening_tag_end = c;
+              jsx_container_element_children = d;
+              jsx_container_element_closing_tag = e;
+            }))
+
+  let case ?bar lhs ?guard rhs =
+    {pc_bar = bar; pc_lhs = lhs; pc_guard = guard; pc_rhs = rhs}
+
+  let make_list_expression loc seq ext_opt =
+    let rec handle_seq = function
+      | [] -> (
+        match ext_opt with
+        | Some ext -> ext
+        | None ->
+          let loc = {loc with Location.loc_ghost = true} in
+          let nil = Location.mkloc (Longident.Lident "[]") loc in
+          construct ~loc nil None)
+      | e1 :: el ->
+        let exp_el = handle_seq el in
+        let loc =
+          Location.
+            {
+              loc_start = e1.Parsetree.pexp_loc.Location.loc_start;
+              loc_end = exp_el.pexp_loc.loc_end;
+              loc_ghost = false;
+            }
+        in
+        let arg = tuple ~loc [e1; exp_el] in
+        construct ~loc (Location.mkloc (Longident.Lident "::") loc) (Some arg)
+    in
+    let expr = handle_seq seq in
+    {expr with pexp_loc = loc}
+end
+
+module Mty = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) d =
+    {pmty_desc = d; pmty_loc = loc; pmty_attributes = attrs}
+  let attr d a = {d with pmty_attributes = d.pmty_attributes @ [a]}
+
+  let ident ?loc ?attrs a = mk ?loc ?attrs (Pmty_ident a)
+  let alias ?loc ?attrs a = mk ?loc ?attrs (Pmty_alias a)
+  let signature ?loc ?attrs a = mk ?loc ?attrs (Pmty_signature a)
+  let functor_ ?loc ?attrs a b c = mk ?loc ?attrs (Pmty_functor (a, b, c))
+  let with_ ?loc ?attrs a b = mk ?loc ?attrs (Pmty_with (a, b))
+  let typeof_ ?loc ?attrs a = mk ?loc ?attrs (Pmty_typeof a)
+  let extension ?loc ?attrs a = mk ?loc ?attrs (Pmty_extension a)
+end
+
+module Mod = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) d =
+    {pmod_desc = d; pmod_loc = loc; pmod_attributes = attrs}
+  let attr d a = {d with pmod_attributes = d.pmod_attributes @ [a]}
+
+  let ident ?loc ?attrs x = mk ?loc ?attrs (Pmod_ident x)
+  let structure ?loc ?attrs x = mk ?loc ?attrs (Pmod_structure x)
+  let functor_ ?loc ?attrs arg arg_ty body =
+    mk ?loc ?attrs (Pmod_functor (arg, arg_ty, body))
+  let apply ?loc ?attrs m1 m2 = mk ?loc ?attrs (Pmod_apply (m1, m2))
+  let constraint_ ?loc ?attrs m mty = mk ?loc ?attrs (Pmod_constraint (m, mty))
+  let unpack ?loc ?attrs e = mk ?loc ?attrs (Pmod_unpack e)
+  let extension ?loc ?attrs a = mk ?loc ?attrs (Pmod_extension a)
+end
+
+module Sig = struct
+  let mk ?(loc = !default_loc) d = {psig_desc = d; psig_loc = loc}
+
+  let value ?loc a = mk ?loc (Psig_value a)
+  let type_ ?loc rec_flag a = mk ?loc (Psig_type (rec_flag, a))
+  let type_extension ?loc a = mk ?loc (Psig_typext a)
+  let exception_ ?loc a = mk ?loc (Psig_exception a)
+  let module_ ?loc a = mk ?loc (Psig_module a)
+  let rec_module ?loc a = mk ?loc (Psig_recmodule a)
+  let modtype ?loc a = mk ?loc (Psig_modtype a)
+  let open_ ?loc a = mk ?loc (Psig_open a)
+  let include_ ?loc a = mk ?loc (Psig_include a)
+
+  let extension ?loc ?(attrs = []) a = mk ?loc (Psig_extension (a, attrs))
+  let attribute ?loc a = mk ?loc (Psig_attribute a)
+end
+
+module Str = struct
+  let mk ?(loc = !default_loc) d = {pstr_desc = d; pstr_loc = loc}
+
+  let eval ?loc ?(attrs = []) a = mk ?loc (Pstr_eval (a, attrs))
+  let value ?loc a b = mk ?loc (Pstr_value (a, b))
+  let primitive ?loc a = mk ?loc (Pstr_primitive a)
+  let type_ ?loc rec_flag a = mk ?loc (Pstr_type (rec_flag, a))
+  let type_extension ?loc a = mk ?loc (Pstr_typext a)
+  let exception_ ?loc a = mk ?loc (Pstr_exception a)
+  let module_ ?loc a = mk ?loc (Pstr_module a)
+  let rec_module ?loc a = mk ?loc (Pstr_recmodule a)
+  let modtype ?loc a = mk ?loc (Pstr_modtype a)
+  let open_ ?loc a = mk ?loc (Pstr_open a)
+  let include_ ?loc a = mk ?loc (Pstr_include a)
+  let extension ?loc ?(attrs = []) a = mk ?loc (Pstr_extension (a, attrs))
+  let attribute ?loc a = mk ?loc (Pstr_attribute a)
+end
+
+module Val = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) ?(prim = []) name typ =
+    {
+      pval_name = name;
+      pval_type = typ;
+      pval_attributes = attrs;
+      pval_loc = loc;
+      pval_prim = prim;
+    }
+end
+
+module Md = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) name typ =
+    {pmd_name = name; pmd_type = typ; pmd_attributes = attrs; pmd_loc = loc}
+end
+
+module Mtd = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) ?typ name =
+    {pmtd_name = name; pmtd_type = typ; pmtd_attributes = attrs; pmtd_loc = loc}
+end
+
+module Mb = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) name expr =
+    {pmb_name = name; pmb_expr = expr; pmb_attributes = attrs; pmb_loc = loc}
+end
+
+module Opn = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) ?(override = Fresh) lid =
+    {
+      popen_lid = lid;
+      popen_override = override;
+      popen_loc = loc;
+      popen_attributes = attrs;
+    }
+end
+
+module Incl = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) mexpr =
+    {pincl_mod = mexpr; pincl_loc = loc; pincl_attributes = attrs}
+end
+
+module Vb = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) pat expr =
+    {pvb_pat = pat; pvb_expr = expr; pvb_attributes = attrs; pvb_loc = loc}
+end
+
+module Type = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) ?(params = []) ?(cstrs = [])
+      ?(kind = Ptype_abstract) ?(priv = Public) ?manifest name =
+    {
+      ptype_name = name;
+      ptype_params = params;
+      ptype_cstrs = cstrs;
+      ptype_kind = kind;
+      ptype_private = priv;
+      ptype_manifest = manifest;
+      ptype_attributes = attrs;
+      ptype_loc = loc;
+    }
+
+  let constructor ?(loc = !default_loc) ?(attrs = []) ?(args = Pcstr_tuple [])
+      ?res name =
+    {
+      pcd_name = name;
+      pcd_args = args;
+      pcd_res = res;
+      pcd_loc = loc;
+      pcd_attributes = attrs;
+    }
+
+  let field ?(loc = !default_loc) ?(attrs = []) ?(mut = Immutable)
+      ?(optional = false) name typ =
+    {
+      pld_name = name;
+      pld_mutable = mut;
+      pld_optional = optional;
+      pld_type = typ;
+      pld_loc = loc;
+      pld_attributes = attrs;
+    }
+end
+
+(** Type extensions *)
+module Te = struct
+  let mk ?(attrs = []) ?(params = []) ?(priv = Public) path constructors =
+    {
+      ptyext_path = path;
+      ptyext_params = params;
+      ptyext_constructors = constructors;
+      ptyext_private = priv;
+      ptyext_attributes = attrs;
+    }
+
+  let constructor ?(loc = !default_loc) ?(attrs = []) name kind =
+    {
+      pext_name = name;
+      pext_kind = kind;
+      pext_loc = loc;
+      pext_attributes = attrs;
+    }
+
+  let decl ?(loc = !default_loc) ?(attrs = []) ?(args = Pcstr_tuple []) ?res
+      name =
+    {
+      pext_name = name;
+      pext_kind = Pext_decl (args, res);
+      pext_loc = loc;
+      pext_attributes = attrs;
+    }
+
+  let rebind ?(loc = !default_loc) ?(attrs = []) name lid =
+    {
+      pext_name = name;
+      pext_kind = Pext_rebind lid;
+      pext_loc = loc;
+      pext_attributes = attrs;
+    }
+end
+
+module Jsx = struct
+  let string_of_jsx_tag_name (tag_name : Parsetree.jsx_tag_name) : string =
+    match tag_name with
+    | Parsetree.JsxLowerTag name -> name
+    | Parsetree.JsxQualifiedLowerTag {path; name} ->
+      String.concat "." (Longident.flatten path) ^ "." ^ name
+    | Parsetree.JsxUpperTag path -> String.concat "." (Longident.flatten path)
+    | Parsetree.JsxTagInvalid name -> name
+
+  let longident_of_jsx_tag_name (tag_name : Parsetree.jsx_tag_name) :
+      Longident.t =
+    match tag_name with
+    | Parsetree.JsxLowerTag name -> Longident.Lident name
+    | Parsetree.JsxQualifiedLowerTag {path; name} -> Longident.Ldot (path, name)
+    | Parsetree.JsxUpperTag path -> path
+    | Parsetree.JsxTagInvalid name -> Longident.Lident name
+end
diff --git a/compiler/ml/ast_helper.mli b/compiler/ml/ast_helper.mli
new file mode 100644
index 0000000..11227b9
--- /dev/null
+++ b/compiler/ml/ast_helper.mli
@@ -0,0 +1,432 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                         Alain Frisch, LexiFi                           *)
+(*                                                                        *)
+(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** Helpers to produce Parsetree fragments *)
+
+open Asttypes
+open Parsetree
+
+type lid = Longident.t loc
+type str = string loc
+type loc = Location.t
+type attrs = attribute list
+
+(** {1 Default locations} *)
+
+val default_loc : loc ref
+(** Default value for all optional location arguments. *)
+
+val with_default_loc : loc -> (unit -> 'a) -> 'a
+(** Set the [default_loc] within the scope of the execution
+        of the provided function. *)
+
+(** {1 Constants} *)
+
+module Const : sig
+  val char : char -> constant
+  val string : ?quotation_delimiter:string -> string -> constant
+  val integer : ?suffix:char -> string -> constant
+  val int : ?suffix:char -> int -> constant
+  val int32 : ?suffix:char -> int32 -> constant
+  val int64 : ?suffix:char -> int64 -> constant
+  val nativeint : ?suffix:char -> nativeint -> constant
+  val float : ?suffix:char -> string -> constant
+end
+
+(** {1 Core language} *)
+
+(** Type expressions *)
+module Typ : sig
+  val mk : ?loc:loc -> ?attrs:attrs -> core_type_desc -> core_type
+  val attr : core_type -> attribute -> core_type
+
+  val any : ?loc:loc -> ?attrs:attrs -> unit -> core_type
+  val var : ?loc:loc -> ?attrs:attrs -> string -> core_type
+  val arrow :
+    ?loc:loc -> ?attrs:attrs -> arity:arity -> arg -> core_type -> core_type
+  val arrows : ?loc:loc -> ?attrs:attrs -> arg list -> core_type -> core_type
+  val tuple : ?loc:loc -> ?attrs:attrs -> core_type list -> core_type
+  val constr : ?loc:loc -> ?attrs:attrs -> lid -> core_type list -> core_type
+  val object_ :
+    ?loc:loc -> ?attrs:attrs -> object_field list -> closed_flag -> core_type
+  val alias : ?loc:loc -> ?attrs:attrs -> core_type -> string -> core_type
+  val variant :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    row_field list ->
+    closed_flag ->
+    label list option ->
+    core_type
+  val poly : ?loc:loc -> ?attrs:attrs -> str list -> core_type -> core_type
+  val package :
+    ?loc:loc -> ?attrs:attrs -> lid -> (lid * core_type) list -> core_type
+  val extension : ?loc:loc -> ?attrs:attrs -> extension -> core_type
+
+  val force_poly : core_type -> core_type
+
+  val varify_constructors : str list -> core_type -> core_type
+  (** [varify_constructors newtypes te] is type expression [te], of which
+        any of nullary type constructor [tc] is replaced by type variable of
+        the same name, if [tc]'s name appears in [newtypes].
+        Raise [Syntaxerr.Variable_in_scope] if any type variable inside [te]
+        appears in [newtypes].
+        @since 4.05
+     *)
+end
+
+(** Patterns *)
+module Pat : sig
+  val mk : ?loc:loc -> ?attrs:attrs -> pattern_desc -> pattern
+  val attr : pattern -> attribute -> pattern
+
+  val any : ?loc:loc -> ?attrs:attrs -> unit -> pattern
+  val var : ?loc:loc -> ?attrs:attrs -> str -> pattern
+  val alias : ?loc:loc -> ?attrs:attrs -> pattern -> str -> pattern
+  val constant : ?loc:loc -> ?attrs:attrs -> constant -> pattern
+  val interval : ?loc:loc -> ?attrs:attrs -> constant -> constant -> pattern
+  val tuple : ?loc:loc -> ?attrs:attrs -> pattern list -> pattern
+  val construct : ?loc:loc -> ?attrs:attrs -> lid -> pattern option -> pattern
+  val variant : ?loc:loc -> ?attrs:attrs -> label -> pattern option -> pattern
+  val record :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    pattern record_element list ->
+    closed_flag ->
+    pattern
+  val array : ?loc:loc -> ?attrs:attrs -> pattern list -> pattern
+  val or_ : ?loc:loc -> ?attrs:attrs -> pattern -> pattern -> pattern
+  val constraint_ : ?loc:loc -> ?attrs:attrs -> pattern -> core_type -> pattern
+  val type_ : ?loc:loc -> ?attrs:attrs -> lid -> pattern
+  val unpack : ?loc:loc -> ?attrs:attrs -> str -> pattern
+  val open_ : ?loc:loc -> ?attrs:attrs -> lid -> pattern -> pattern
+  val exception_ : ?loc:loc -> ?attrs:attrs -> pattern -> pattern
+  val extension : ?loc:loc -> ?attrs:attrs -> extension -> pattern
+end
+
+(** Expressions *)
+module Exp : sig
+  val mk : ?loc:loc -> ?attrs:attrs -> expression_desc -> expression
+  val attr : expression -> attribute -> expression
+
+  val ident : ?loc:loc -> ?attrs:attrs -> lid -> expression
+  val constant : ?loc:loc -> ?attrs:attrs -> constant -> expression
+  val let_ :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    rec_flag ->
+    value_binding list ->
+    expression ->
+    expression
+  val fun_ :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    ?async:bool ->
+    arity:int option ->
+    arg_label ->
+    expression option ->
+    pattern ->
+    expression ->
+    expression
+  val apply :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    ?partial:bool ->
+    ?transformed_jsx:bool ->
+    expression ->
+    (arg_label * expression) list ->
+    expression
+  val match_ : ?loc:loc -> ?attrs:attrs -> expression -> case list -> expression
+  val try_ : ?loc:loc -> ?attrs:attrs -> expression -> case list -> expression
+  val tuple : ?loc:loc -> ?attrs:attrs -> expression list -> expression
+  val construct :
+    ?loc:loc -> ?attrs:attrs -> lid -> expression option -> expression
+  val variant :
+    ?loc:loc -> ?attrs:attrs -> label -> expression option -> expression
+  val record :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    expression record_element list ->
+    expression option ->
+    expression
+  val field : ?loc:loc -> ?attrs:attrs -> expression -> lid -> expression
+  val setfield :
+    ?loc:loc -> ?attrs:attrs -> expression -> lid -> expression -> expression
+  val array : ?loc:loc -> ?attrs:attrs -> expression list -> expression
+  val ifthenelse :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    expression ->
+    expression ->
+    expression option ->
+    expression
+  val sequence :
+    ?loc:loc -> ?attrs:attrs -> expression -> expression -> expression
+  val while_ :
+    ?loc:loc -> ?attrs:attrs -> expression -> expression -> expression
+  val for_ :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    pattern ->
+    expression ->
+    expression ->
+    direction_flag ->
+    expression ->
+    expression
+  val coerce : ?loc:loc -> ?attrs:attrs -> expression -> core_type -> expression
+  val constraint_ :
+    ?loc:loc -> ?attrs:attrs -> expression -> core_type -> expression
+  val send : ?loc:loc -> ?attrs:attrs -> expression -> str -> expression
+  val letmodule :
+    ?loc:loc -> ?attrs:attrs -> str -> module_expr -> expression -> expression
+  val letexception :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    extension_constructor ->
+    expression ->
+    expression
+  val assert_ : ?loc:loc -> ?attrs:attrs -> expression -> expression
+  val newtype : ?loc:loc -> ?attrs:attrs -> str -> expression -> expression
+  val pack : ?loc:loc -> ?attrs:attrs -> module_expr -> expression
+  val open_ :
+    ?loc:loc -> ?attrs:attrs -> override_flag -> lid -> expression -> expression
+  val extension : ?loc:loc -> ?attrs:attrs -> extension -> expression
+  val jsx_fragment :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    Lexing.position ->
+    Parsetree.jsx_children ->
+    Lexing.position ->
+    expression
+  val jsx_unary_element :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    Parsetree.jsx_tag_name Location.loc ->
+    Parsetree.jsx_props ->
+    expression
+  val jsx_container_element :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    Parsetree.jsx_tag_name Location.loc ->
+    Parsetree.jsx_props ->
+    Lexing.position ->
+    Parsetree.jsx_children ->
+    Parsetree.jsx_closing_container_tag option ->
+    expression
+
+  val case :
+    ?bar:Lexing.position -> pattern -> ?guard:expression -> expression -> case
+  val await : ?loc:loc -> ?attrs:attrs -> expression -> expression
+
+  val make_list_expression :
+    Location.t -> expression list -> expression option -> expression
+end
+
+(** Value declarations *)
+module Val : sig
+  val mk :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    ?prim:string list ->
+    str ->
+    core_type ->
+    value_description
+end
+
+(** Type declarations *)
+module Type : sig
+  val mk :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    ?params:(core_type * variance) list ->
+    ?cstrs:(core_type * core_type * loc) list ->
+    ?kind:type_kind ->
+    ?priv:private_flag ->
+    ?manifest:core_type ->
+    str ->
+    type_declaration
+
+  val constructor :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    ?args:constructor_arguments ->
+    ?res:core_type ->
+    str ->
+    constructor_declaration
+  val field :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    ?mut:mutable_flag ->
+    ?optional:bool ->
+    str ->
+    core_type ->
+    label_declaration
+end
+
+(** Type extensions *)
+module Te : sig
+  val mk :
+    ?attrs:attrs ->
+    ?params:(core_type * variance) list ->
+    ?priv:private_flag ->
+    lid ->
+    extension_constructor list ->
+    type_extension
+
+  val constructor :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    str ->
+    extension_constructor_kind ->
+    extension_constructor
+
+  val decl :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    ?args:constructor_arguments ->
+    ?res:core_type ->
+    str ->
+    extension_constructor
+  val rebind : ?loc:loc -> ?attrs:attrs -> str -> lid -> extension_constructor
+end
+
+module Jsx : sig
+  val string_of_jsx_tag_name : Parsetree.jsx_tag_name -> string
+  val longident_of_jsx_tag_name : Parsetree.jsx_tag_name -> Longident.t
+end
+
+(** {1 Module language} *)
+
+(** Module type expressions *)
+module Mty : sig
+  val mk : ?loc:loc -> ?attrs:attrs -> module_type_desc -> module_type
+  val attr : module_type -> attribute -> module_type
+
+  val ident : ?loc:loc -> ?attrs:attrs -> lid -> module_type
+  val alias : ?loc:loc -> ?attrs:attrs -> lid -> module_type
+  val signature : ?loc:loc -> ?attrs:attrs -> signature -> module_type
+  val functor_ :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    str ->
+    module_type option ->
+    module_type ->
+    module_type
+  val with_ :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    module_type ->
+    with_constraint list ->
+    module_type
+  val typeof_ : ?loc:loc -> ?attrs:attrs -> module_expr -> module_type
+  val extension : ?loc:loc -> ?attrs:attrs -> extension -> module_type
+end
+
+(** Module expressions *)
+module Mod : sig
+  val mk : ?loc:loc -> ?attrs:attrs -> module_expr_desc -> module_expr
+  val attr : module_expr -> attribute -> module_expr
+
+  val ident : ?loc:loc -> ?attrs:attrs -> lid -> module_expr
+  val structure : ?loc:loc -> ?attrs:attrs -> structure -> module_expr
+  val functor_ :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    str ->
+    module_type option ->
+    module_expr ->
+    module_expr
+  val apply :
+    ?loc:loc -> ?attrs:attrs -> module_expr -> module_expr -> module_expr
+  val constraint_ :
+    ?loc:loc -> ?attrs:attrs -> module_expr -> module_type -> module_expr
+  val unpack : ?loc:loc -> ?attrs:attrs -> expression -> module_expr
+  val extension : ?loc:loc -> ?attrs:attrs -> extension -> module_expr
+end
+
+(** Signature items *)
+module Sig : sig
+  val mk : ?loc:loc -> signature_item_desc -> signature_item
+
+  val value : ?loc:loc -> value_description -> signature_item
+  val type_ : ?loc:loc -> rec_flag -> type_declaration list -> signature_item
+  val type_extension : ?loc:loc -> type_extension -> signature_item
+  val exception_ : ?loc:loc -> extension_constructor -> signature_item
+  val module_ : ?loc:loc -> module_declaration -> signature_item
+  val rec_module : ?loc:loc -> module_declaration list -> signature_item
+  val modtype : ?loc:loc -> module_type_declaration -> signature_item
+  val open_ : ?loc:loc -> open_description -> signature_item
+  val include_ : ?loc:loc -> include_description -> signature_item
+  val extension : ?loc:loc -> ?attrs:attrs -> extension -> signature_item
+  val attribute : ?loc:loc -> attribute -> signature_item
+end
+
+(** Structure items *)
+module Str : sig
+  val mk : ?loc:loc -> structure_item_desc -> structure_item
+
+  val eval : ?loc:loc -> ?attrs:attributes -> expression -> structure_item
+  val value : ?loc:loc -> rec_flag -> value_binding list -> structure_item
+  val primitive : ?loc:loc -> value_description -> structure_item
+  val type_ : ?loc:loc -> rec_flag -> type_declaration list -> structure_item
+  val type_extension : ?loc:loc -> type_extension -> structure_item
+  val exception_ : ?loc:loc -> extension_constructor -> structure_item
+  val module_ : ?loc:loc -> module_binding -> structure_item
+  val rec_module : ?loc:loc -> module_binding list -> structure_item
+  val modtype : ?loc:loc -> module_type_declaration -> structure_item
+  val open_ : ?loc:loc -> open_description -> structure_item
+  val include_ : ?loc:loc -> include_declaration -> structure_item
+  val extension : ?loc:loc -> ?attrs:attrs -> extension -> structure_item
+  val attribute : ?loc:loc -> attribute -> structure_item
+end
+
+(** Module declarations *)
+module Md : sig
+  val mk : ?loc:loc -> ?attrs:attrs -> str -> module_type -> module_declaration
+end
+
+(** Module type declarations *)
+module Mtd : sig
+  val mk :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    ?typ:module_type ->
+    str ->
+    module_type_declaration
+end
+
+(** Module bindings *)
+module Mb : sig
+  val mk : ?loc:loc -> ?attrs:attrs -> str -> module_expr -> module_binding
+end
+
+(** Opens *)
+module Opn : sig
+  val mk :
+    ?loc:loc ->
+    ?attrs:attrs ->
+    ?override:override_flag ->
+    lid ->
+    open_description
+end
+
+(** Includes *)
+module Incl : sig
+  val mk : ?loc:loc -> ?attrs:attrs -> 'a -> 'a include_infos
+end
+
+(** Value bindings *)
+module Vb : sig
+  val mk : ?loc:loc -> ?attrs:attrs -> pattern -> expression -> value_binding
+end
diff --git a/compiler/ml/ast_helper0.ml b/compiler/ml/ast_helper0.ml
new file mode 100644
index 0000000..cc008b3
--- /dev/null
+++ b/compiler/ml/ast_helper0.ml
@@ -0,0 +1,368 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                         Alain Frisch, LexiFi                           *)
+(*                                                                        *)
+(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** Helpers to produce Parsetree fragments *)
+
+open Asttypes
+open Parsetree0
+
+type lid = Longident.t loc
+type str = string loc
+type loc = Location.t
+type attrs = attribute list
+
+let default_loc = ref Location.none
+
+let with_default_loc l f =
+  let old = !default_loc in
+  default_loc := l;
+  try
+    let r = f () in
+    default_loc := old;
+    r
+  with exn ->
+    default_loc := old;
+    raise exn
+
+module Const = struct
+  let integer ?suffix i = Pconst_integer (i, suffix)
+  let int ?suffix i = integer ?suffix (string_of_int i)
+  let int32 ?(suffix = 'l') i = integer ~suffix (Int32.to_string i)
+  let int64 ?(suffix = 'L') i = integer ~suffix (Int64.to_string i)
+  let nativeint ?(suffix = 'n') i = integer ~suffix (Nativeint.to_string i)
+  let float ?suffix f = Pconst_float (f, suffix)
+  let char c = Pconst_char (Char.code c)
+  let string ?quotation_delimiter s = Pconst_string (s, quotation_delimiter)
+end
+
+module Typ = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) d =
+    {ptyp_desc = d; ptyp_loc = loc; ptyp_attributes = attrs}
+  let attr d a = {d with ptyp_attributes = d.ptyp_attributes @ [a]}
+
+  let any ?loc ?attrs () = mk ?loc ?attrs Ptyp_any
+  let var ?loc ?attrs a = mk ?loc ?attrs (Ptyp_var a)
+  let arrow ?loc ?attrs a b c = mk ?loc ?attrs (Ptyp_arrow (a, b, c))
+  let tuple ?loc ?attrs a = mk ?loc ?attrs (Ptyp_tuple a)
+  let constr ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_constr (a, b))
+  let object_ ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_object (a, b))
+  let alias ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_alias (a, b))
+  let variant ?loc ?attrs a b c = mk ?loc ?attrs (Ptyp_variant (a, b, c))
+  let poly ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_poly (a, b))
+  let package ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_package (a, b))
+  let extension ?loc ?attrs a = mk ?loc ?attrs (Ptyp_extension a)
+
+  let force_poly t =
+    match t.ptyp_desc with
+    | Ptyp_poly _ -> t
+    | _ -> poly ~loc:t.ptyp_loc [] t (* -> ghost? *)
+
+  let varify_constructors var_names t =
+    let check_variable vl loc v =
+      if List.mem v vl then raise Syntaxerr.(Error (Variable_in_scope (loc, v)))
+    in
+    let var_names = List.map (fun v -> v.txt) var_names in
+    let rec loop t =
+      let desc =
+        match t.ptyp_desc with
+        | Ptyp_any -> Ptyp_any
+        | Ptyp_var x ->
+          check_variable var_names t.ptyp_loc x;
+          Ptyp_var x
+        | Ptyp_arrow (label, core_type, core_type') ->
+          Ptyp_arrow (label, loop core_type, loop core_type')
+        | Ptyp_tuple lst -> Ptyp_tuple (List.map loop lst)
+        | Ptyp_constr ({txt = Longident.Lident s}, []) when List.mem s var_names
+          ->
+          Ptyp_var s
+        | Ptyp_constr (longident, lst) ->
+          Ptyp_constr (longident, List.map loop lst)
+        | Ptyp_object (lst, o) -> Ptyp_object (List.map loop_object_field lst, o)
+        | Ptyp_class () -> assert false
+        | Ptyp_alias (core_type, string) ->
+          check_variable var_names t.ptyp_loc string;
+          Ptyp_alias (loop core_type, string)
+        | Ptyp_variant (row_field_list, flag, lbl_lst_option) ->
+          Ptyp_variant
+            (List.map loop_row_field row_field_list, flag, lbl_lst_option)
+        | Ptyp_poly (string_lst, core_type) ->
+          List.iter
+            (fun v -> check_variable var_names t.ptyp_loc v.txt)
+            string_lst;
+          Ptyp_poly (string_lst, loop core_type)
+        | Ptyp_package (longident, lst) ->
+          Ptyp_package (longident, List.map (fun (n, typ) -> (n, loop typ)) lst)
+        | Ptyp_extension (s, arg) -> Ptyp_extension (s, arg)
+      in
+      {t with ptyp_desc = desc}
+    and loop_row_field = function
+      | Rtag (label, attrs, flag, lst) ->
+        Rtag (label, attrs, flag, List.map loop lst)
+      | Rinherit t -> Rinherit (loop t)
+    and loop_object_field = function
+      | Otag (label, attrs, t) -> Otag (label, attrs, loop t)
+      | Oinherit t -> Oinherit (loop t)
+    in
+    loop t
+end
+
+module Pat = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) d =
+    {ppat_desc = d; ppat_loc = loc; ppat_attributes = attrs}
+  let attr d a = {d with ppat_attributes = d.ppat_attributes @ [a]}
+
+  let any ?loc ?attrs () = mk ?loc ?attrs Ppat_any
+  let var ?loc ?attrs a = mk ?loc ?attrs (Ppat_var a)
+  let alias ?loc ?attrs a b = mk ?loc ?attrs (Ppat_alias (a, b))
+  let constant ?loc ?attrs a = mk ?loc ?attrs (Ppat_constant a)
+  let interval ?loc ?attrs a b = mk ?loc ?attrs (Ppat_interval (a, b))
+  let tuple ?loc ?attrs a = mk ?loc ?attrs (Ppat_tuple a)
+  let construct ?loc ?attrs a b = mk ?loc ?attrs (Ppat_construct (a, b))
+  let variant ?loc ?attrs a b = mk ?loc ?attrs (Ppat_variant (a, b))
+  let record ?loc ?attrs a b = mk ?loc ?attrs (Ppat_record (a, b))
+  let array ?loc ?attrs a = mk ?loc ?attrs (Ppat_array a)
+  let or_ ?loc ?attrs a b = mk ?loc ?attrs (Ppat_or (a, b))
+  let constraint_ ?loc ?attrs a b = mk ?loc ?attrs (Ppat_constraint (a, b))
+  let type_ ?loc ?attrs a = mk ?loc ?attrs (Ppat_type a)
+  let lazy_ ?loc ?attrs a = mk ?loc ?attrs (Ppat_lazy a)
+  let unpack ?loc ?attrs a = mk ?loc ?attrs (Ppat_unpack a)
+  let open_ ?loc ?attrs a b = mk ?loc ?attrs (Ppat_open (a, b))
+  let exception_ ?loc ?attrs a = mk ?loc ?attrs (Ppat_exception a)
+  let extension ?loc ?attrs a = mk ?loc ?attrs (Ppat_extension a)
+end
+
+module Exp = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) d =
+    {pexp_desc = d; pexp_loc = loc; pexp_attributes = attrs}
+  let attr d a = {d with pexp_attributes = d.pexp_attributes @ [a]}
+
+  let ident ?loc ?attrs a = mk ?loc ?attrs (Pexp_ident a)
+  let constant ?loc ?attrs a = mk ?loc ?attrs (Pexp_constant a)
+  let let_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_let (a, b, c))
+  let fun_ ?loc ?attrs a b c d = mk ?loc ?attrs (Pexp_fun (a, b, c, d))
+  let function_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_function a)
+  let apply ?loc ?attrs a b = mk ?loc ?attrs (Pexp_apply (a, b))
+  let match_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_match (a, b))
+  let try_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_try (a, b))
+  let tuple ?loc ?attrs a = mk ?loc ?attrs (Pexp_tuple a)
+  let construct ?loc ?attrs a b = mk ?loc ?attrs (Pexp_construct (a, b))
+  let variant ?loc ?attrs a b = mk ?loc ?attrs (Pexp_variant (a, b))
+  let record ?loc ?attrs a b = mk ?loc ?attrs (Pexp_record (a, b))
+  let field ?loc ?attrs a b = mk ?loc ?attrs (Pexp_field (a, b))
+  let setfield ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_setfield (a, b, c))
+  let array ?loc ?attrs a = mk ?loc ?attrs (Pexp_array a)
+  let ifthenelse ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_ifthenelse (a, b, c))
+  let sequence ?loc ?attrs a b = mk ?loc ?attrs (Pexp_sequence (a, b))
+  let while_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_while (a, b))
+  let for_ ?loc ?attrs a b c d e = mk ?loc ?attrs (Pexp_for (a, b, c, d, e))
+  let constraint_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_constraint (a, b))
+  let coerce ?loc ?attrs a c = mk ?loc ?attrs (Pexp_coerce (a, (), c))
+  let send ?loc ?attrs a b = mk ?loc ?attrs (Pexp_send (a, b))
+  let new_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_new a)
+  let setinstvar ?loc ?attrs a b = mk ?loc ?attrs (Pexp_setinstvar (a, b))
+  let override ?loc ?attrs a = mk ?loc ?attrs (Pexp_override a)
+  let letmodule ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_letmodule (a, b, c))
+  let letexception ?loc ?attrs a b = mk ?loc ?attrs (Pexp_letexception (a, b))
+  let assert_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_assert a)
+  let lazy_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_lazy a)
+  let poly ?loc ?attrs a b = mk ?loc ?attrs (Pexp_poly (a, b))
+  let newtype ?loc ?attrs a b = mk ?loc ?attrs (Pexp_newtype (a, b))
+  let pack ?loc ?attrs a = mk ?loc ?attrs (Pexp_pack a)
+  let open_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_open (a, b, c))
+  let extension ?loc ?attrs a = mk ?loc ?attrs (Pexp_extension a)
+
+  let case lhs ?guard rhs = {pc_lhs = lhs; pc_guard = guard; pc_rhs = rhs}
+end
+
+module Mty = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) d =
+    {pmty_desc = d; pmty_loc = loc; pmty_attributes = attrs}
+  let attr d a = {d with pmty_attributes = d.pmty_attributes @ [a]}
+
+  let ident ?loc ?attrs a = mk ?loc ?attrs (Pmty_ident a)
+  let alias ?loc ?attrs a = mk ?loc ?attrs (Pmty_alias a)
+  let signature ?loc ?attrs a = mk ?loc ?attrs (Pmty_signature a)
+  let functor_ ?loc ?attrs a b c = mk ?loc ?attrs (Pmty_functor (a, b, c))
+  let with_ ?loc ?attrs a b = mk ?loc ?attrs (Pmty_with (a, b))
+  let typeof_ ?loc ?attrs a = mk ?loc ?attrs (Pmty_typeof a)
+  let extension ?loc ?attrs a = mk ?loc ?attrs (Pmty_extension a)
+end
+
+module Mod = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) d =
+    {pmod_desc = d; pmod_loc = loc; pmod_attributes = attrs}
+  let attr d a = {d with pmod_attributes = d.pmod_attributes @ [a]}
+
+  let ident ?loc ?attrs x = mk ?loc ?attrs (Pmod_ident x)
+  let structure ?loc ?attrs x = mk ?loc ?attrs (Pmod_structure x)
+  let functor_ ?loc ?attrs arg arg_ty body =
+    mk ?loc ?attrs (Pmod_functor (arg, arg_ty, body))
+  let apply ?loc ?attrs m1 m2 = mk ?loc ?attrs (Pmod_apply (m1, m2))
+  let constraint_ ?loc ?attrs m mty = mk ?loc ?attrs (Pmod_constraint (m, mty))
+  let unpack ?loc ?attrs e = mk ?loc ?attrs (Pmod_unpack e)
+  let extension ?loc ?attrs a = mk ?loc ?attrs (Pmod_extension a)
+end
+
+module Sig = struct
+  let mk ?(loc = !default_loc) d = {psig_desc = d; psig_loc = loc}
+
+  let value ?loc a = mk ?loc (Psig_value a)
+  let type_ ?loc rec_flag a = mk ?loc (Psig_type (rec_flag, a))
+  let type_extension ?loc a = mk ?loc (Psig_typext a)
+  let exception_ ?loc a = mk ?loc (Psig_exception a)
+  let module_ ?loc a = mk ?loc (Psig_module a)
+  let rec_module ?loc a = mk ?loc (Psig_recmodule a)
+  let modtype ?loc a = mk ?loc (Psig_modtype a)
+  let open_ ?loc a = mk ?loc (Psig_open a)
+  let include_ ?loc a = mk ?loc (Psig_include a)
+
+  let extension ?loc ?(attrs = []) a = mk ?loc (Psig_extension (a, attrs))
+  let attribute ?loc a = mk ?loc (Psig_attribute a)
+end
+
+module Str = struct
+  let mk ?(loc = !default_loc) d = {pstr_desc = d; pstr_loc = loc}
+
+  let eval ?loc ?(attrs = []) a = mk ?loc (Pstr_eval (a, attrs))
+  let value ?loc a b = mk ?loc (Pstr_value (a, b))
+  let primitive ?loc a = mk ?loc (Pstr_primitive a)
+  let type_ ?loc rec_flag a = mk ?loc (Pstr_type (rec_flag, a))
+  let type_extension ?loc a = mk ?loc (Pstr_typext a)
+  let exception_ ?loc a = mk ?loc (Pstr_exception a)
+  let module_ ?loc a = mk ?loc (Pstr_module a)
+  let rec_module ?loc a = mk ?loc (Pstr_recmodule a)
+  let modtype ?loc a = mk ?loc (Pstr_modtype a)
+  let open_ ?loc a = mk ?loc (Pstr_open a)
+  let include_ ?loc a = mk ?loc (Pstr_include a)
+  let extension ?loc ?(attrs = []) a = mk ?loc (Pstr_extension (a, attrs))
+  let attribute ?loc a = mk ?loc (Pstr_attribute a)
+end
+
+module Val = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) ?(prim = []) name typ =
+    {
+      pval_name = name;
+      pval_type = typ;
+      pval_attributes = attrs;
+      pval_loc = loc;
+      pval_prim = prim;
+    }
+end
+
+module Md = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) name typ =
+    {pmd_name = name; pmd_type = typ; pmd_attributes = attrs; pmd_loc = loc}
+end
+
+module Mtd = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) ?typ name =
+    {pmtd_name = name; pmtd_type = typ; pmtd_attributes = attrs; pmtd_loc = loc}
+end
+
+module Mb = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) name expr =
+    {pmb_name = name; pmb_expr = expr; pmb_attributes = attrs; pmb_loc = loc}
+end
+
+module Opn = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) ?(override = Fresh) lid =
+    {
+      popen_lid = lid;
+      popen_override = override;
+      popen_loc = loc;
+      popen_attributes = attrs;
+    }
+end
+
+module Incl = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) mexpr =
+    {pincl_mod = mexpr; pincl_loc = loc; pincl_attributes = attrs}
+end
+
+module Vb = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) pat expr =
+    {pvb_pat = pat; pvb_expr = expr; pvb_attributes = attrs; pvb_loc = loc}
+end
+
+module Type = struct
+  let mk ?(loc = !default_loc) ?(attrs = []) ?(params = []) ?(cstrs = [])
+      ?(kind = Ptype_abstract) ?(priv = Public) ?manifest name =
+    {
+      ptype_name = name;
+      ptype_params = params;
+      ptype_cstrs = cstrs;
+      ptype_kind = kind;
+      ptype_private = priv;
+      ptype_manifest = manifest;
+      ptype_attributes = attrs;
+      ptype_loc = loc;
+    }
+
+  let constructor ?(loc = !default_loc) ?(attrs = []) ?(args = Pcstr_tuple [])
+      ?res name =
+    {
+      pcd_name = name;
+      pcd_args = args;
+      pcd_res = res;
+      pcd_loc = loc;
+      pcd_attributes = attrs;
+    }
+
+  let field ?(loc = !default_loc) ?(attrs = []) ?(mut = Immutable) name typ =
+    {
+      pld_name = name;
+      pld_mutable = mut;
+      pld_type = typ;
+      pld_loc = loc;
+      pld_attributes = attrs;
+    }
+end
+
+(** Type extensions *)
+module Te = struct
+  let mk ?(attrs = []) ?(params = []) ?(priv = Public) path constructors =
+    {
+      ptyext_path = path;
+      ptyext_params = params;
+      ptyext_constructors = constructors;
+      ptyext_private = priv;
+      ptyext_attributes = attrs;
+    }
+
+  let constructor ?(loc = !default_loc) ?(attrs = []) name kind =
+    {
+      pext_name = name;
+      pext_kind = kind;
+      pext_loc = loc;
+      pext_attributes = attrs;
+    }
+
+  let decl ?(loc = !default_loc) ?(attrs = []) ?(args = Pcstr_tuple []) ?res
+      name =
+    {
+      pext_name = name;
+      pext_kind = Pext_decl (args, res);
+      pext_loc = loc;
+      pext_attributes = attrs;
+    }
+
+  let rebind ?(loc = !default_loc) ?(attrs = []) name lid =
+    {
+      pext_name = name;
+      pext_kind = Pext_rebind lid;
+      pext_loc = loc;
+      pext_attributes = attrs;
+    }
+end
diff --git a/compiler/ml/ast_iterator.ml b/compiler/ml/ast_iterator.ml
new file mode 100644
index 0000000..a430bb0
--- /dev/null
+++ b/compiler/ml/ast_iterator.ml
@@ -0,0 +1,529 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                      Nicolas Ojeda Bar, LexiFi                         *)
+(*                                                                        *)
+(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* A generic Parsetree mapping class *)
+
+(*
+[@@@warning "+9"]
+  (* Ensure that record patterns don't miss any field. *)
+*)
+
+open Parsetree
+open Location
+
+type iterator = {
+  attribute: iterator -> attribute -> unit;
+  attributes: iterator -> attribute list -> unit;
+  case: iterator -> case -> unit;
+  cases: iterator -> case list -> unit;
+  constructor_declaration: iterator -> constructor_declaration -> unit;
+  expr: iterator -> expression -> unit;
+  extension: iterator -> extension -> unit;
+  extension_constructor: iterator -> extension_constructor -> unit;
+  include_declaration: iterator -> include_declaration -> unit;
+  include_description: iterator -> include_description -> unit;
+  label_declaration: iterator -> label_declaration -> unit;
+  location: iterator -> Location.t -> unit;
+  module_binding: iterator -> module_binding -> unit;
+  module_declaration: iterator -> module_declaration -> unit;
+  module_expr: iterator -> module_expr -> unit;
+  module_type: iterator -> module_type -> unit;
+  module_type_declaration: iterator -> module_type_declaration -> unit;
+  open_description: iterator -> open_description -> unit;
+  pat: iterator -> pattern -> unit;
+  payload: iterator -> payload -> unit;
+  signature: iterator -> signature -> unit;
+  signature_item: iterator -> signature_item -> unit;
+  structure: iterator -> structure -> unit;
+  structure_item: iterator -> structure_item -> unit;
+  typ: iterator -> core_type -> unit;
+  type_declaration: iterator -> type_declaration -> unit;
+  type_extension: iterator -> type_extension -> unit;
+  type_kind: iterator -> type_kind -> unit;
+  value_binding: iterator -> value_binding -> unit;
+  value_description: iterator -> value_description -> unit;
+  with_constraint: iterator -> with_constraint -> unit;
+}
+(** A [iterator] record implements one "method" per syntactic category,
+    using an open recursion style: each method takes as its first
+    argument the iterator to be applied to children in the syntax
+    tree. *)
+
+let iter_fst f (x, _) = f x
+let iter_snd f (_, y) = f y
+let iter_tuple f1 f2 (x, y) =
+  f1 x;
+  f2 y
+let iter_tuple3 f1 f2 f3 (x, y, z) =
+  f1 x;
+  f2 y;
+  f3 z
+let iter_opt f = function
+  | None -> ()
+  | Some x -> f x
+
+let iter_loc sub {loc; txt = _} = sub.location sub loc
+
+module T = struct
+  (* Type expressions for the core language *)
+
+  let row_field sub = function
+    | Rtag (_, attrs, _, tl) ->
+      sub.attributes sub attrs;
+      List.iter (sub.typ sub) tl
+    | Rinherit t -> sub.typ sub t
+
+  let object_field sub = function
+    | Otag (_, attrs, t) ->
+      sub.attributes sub attrs;
+      sub.typ sub t
+    | Oinherit t -> sub.typ sub t
+
+  let iter sub {ptyp_desc = desc; ptyp_loc = loc; ptyp_attributes = attrs} =
+    sub.location sub loc;
+    sub.attributes sub attrs;
+    match desc with
+    | Ptyp_any | Ptyp_var _ -> ()
+    | Ptyp_arrow {arg; ret} ->
+      sub.typ sub arg.typ;
+      sub.typ sub ret
+    | Ptyp_tuple tyl -> List.iter (sub.typ sub) tyl
+    | Ptyp_constr (lid, tl) ->
+      iter_loc sub lid;
+      List.iter (sub.typ sub) tl
+    | Ptyp_object (ol, _o) -> List.iter (object_field sub) ol
+    | Ptyp_alias (t, _) -> sub.typ sub t
+    | Ptyp_variant (rl, _b, _ll) -> List.iter (row_field sub) rl
+    | Ptyp_poly (_, t) -> sub.typ sub t
+    | Ptyp_package (lid, l) ->
+      iter_loc sub lid;
+      List.iter (iter_tuple (iter_loc sub) (sub.typ sub)) l
+    | Ptyp_extension x -> sub.extension sub x
+
+  let iter_type_declaration sub
+      {
+        ptype_name;
+        ptype_params;
+        ptype_cstrs;
+        ptype_kind;
+        ptype_private = _;
+        ptype_manifest;
+        ptype_attributes;
+        ptype_loc;
+      } =
+    iter_loc sub ptype_name;
+    List.iter (iter_fst (sub.typ sub)) ptype_params;
+    List.iter
+      (iter_tuple3 (sub.typ sub) (sub.typ sub) (sub.location sub))
+      ptype_cstrs;
+    sub.type_kind sub ptype_kind;
+    iter_opt (sub.typ sub) ptype_manifest;
+    sub.location sub ptype_loc;
+    sub.attributes sub ptype_attributes
+
+  let iter_type_kind sub = function
+    | Ptype_abstract -> ()
+    | Ptype_variant l -> List.iter (sub.constructor_declaration sub) l
+    | Ptype_record l -> List.iter (sub.label_declaration sub) l
+    | Ptype_open -> ()
+
+  let iter_constructor_arguments sub = function
+    | Pcstr_tuple l -> List.iter (sub.typ sub) l
+    | Pcstr_record l -> List.iter (sub.label_declaration sub) l
+
+  let iter_type_extension sub
+      {
+        ptyext_path;
+        ptyext_params;
+        ptyext_constructors;
+        ptyext_private = _;
+        ptyext_attributes;
+      } =
+    iter_loc sub ptyext_path;
+    List.iter (sub.extension_constructor sub) ptyext_constructors;
+    List.iter (iter_fst (sub.typ sub)) ptyext_params;
+    sub.attributes sub ptyext_attributes
+
+  let iter_extension_constructor_kind sub = function
+    | Pext_decl (ctl, cto) ->
+      iter_constructor_arguments sub ctl;
+      iter_opt (sub.typ sub) cto
+    | Pext_rebind li -> iter_loc sub li
+
+  let iter_extension_constructor sub
+      {pext_name; pext_kind; pext_loc; pext_attributes} =
+    iter_loc sub pext_name;
+    iter_extension_constructor_kind sub pext_kind;
+    sub.location sub pext_loc;
+    sub.attributes sub pext_attributes
+end
+
+module MT = struct
+  (* Type expressions for the module language *)
+
+  let iter sub {pmty_desc = desc; pmty_loc = loc; pmty_attributes = attrs} =
+    sub.location sub loc;
+    sub.attributes sub attrs;
+    match desc with
+    | Pmty_ident s -> iter_loc sub s
+    | Pmty_alias s -> iter_loc sub s
+    | Pmty_signature sg -> sub.signature sub sg
+    | Pmty_functor (s, mt1, mt2) ->
+      iter_loc sub s;
+      iter_opt (sub.module_type sub) mt1;
+      sub.module_type sub mt2
+    | Pmty_with (mt, l) ->
+      sub.module_type sub mt;
+      List.iter (sub.with_constraint sub) l
+    | Pmty_typeof me -> sub.module_expr sub me
+    | Pmty_extension x -> sub.extension sub x
+
+  let iter_with_constraint sub = function
+    | Pwith_type (lid, d) ->
+      iter_loc sub lid;
+      sub.type_declaration sub d
+    | Pwith_module (lid, lid2) ->
+      iter_loc sub lid;
+      iter_loc sub lid2
+    | Pwith_typesubst (lid, d) ->
+      iter_loc sub lid;
+      sub.type_declaration sub d
+    | Pwith_modsubst (s, lid) ->
+      iter_loc sub s;
+      iter_loc sub lid
+
+  let iter_signature_item sub {psig_desc = desc; psig_loc = loc} =
+    sub.location sub loc;
+    match desc with
+    | Psig_value vd -> sub.value_description sub vd
+    | Psig_type (_rf, l) -> List.iter (sub.type_declaration sub) l
+    | Psig_typext te -> sub.type_extension sub te
+    | Psig_exception ed -> sub.extension_constructor sub ed
+    | Psig_module x -> sub.module_declaration sub x
+    | Psig_recmodule l -> List.iter (sub.module_declaration sub) l
+    | Psig_modtype x -> sub.module_type_declaration sub x
+    | Psig_open x -> sub.open_description sub x
+    | Psig_include x -> sub.include_description sub x
+    | Psig_extension (x, attrs) ->
+      sub.extension sub x;
+      sub.attributes sub attrs
+    | Psig_attribute x -> sub.attribute sub x
+end
+
+module M = struct
+  (* Value expressions for the module language *)
+
+  let iter sub {pmod_loc = loc; pmod_desc = desc; pmod_attributes = attrs} =
+    sub.location sub loc;
+    sub.attributes sub attrs;
+    match desc with
+    | Pmod_ident x -> iter_loc sub x
+    | Pmod_structure str -> sub.structure sub str
+    | Pmod_functor (arg, arg_ty, body) ->
+      iter_loc sub arg;
+      iter_opt (sub.module_type sub) arg_ty;
+      sub.module_expr sub body
+    | Pmod_apply (m1, m2) ->
+      sub.module_expr sub m1;
+      sub.module_expr sub m2
+    | Pmod_constraint (m, mty) ->
+      sub.module_expr sub m;
+      sub.module_type sub mty
+    | Pmod_unpack e -> sub.expr sub e
+    | Pmod_extension x -> sub.extension sub x
+
+  let iter_structure_item sub {pstr_loc = loc; pstr_desc = desc} =
+    sub.location sub loc;
+    match desc with
+    | Pstr_eval (x, attrs) ->
+      sub.expr sub x;
+      sub.attributes sub attrs
+    | Pstr_value (_r, vbs) -> List.iter (sub.value_binding sub) vbs
+    | Pstr_primitive vd -> sub.value_description sub vd
+    | Pstr_type (_rf, l) -> List.iter (sub.type_declaration sub) l
+    | Pstr_typext te -> sub.type_extension sub te
+    | Pstr_exception ed -> sub.extension_constructor sub ed
+    | Pstr_module x -> sub.module_binding sub x
+    | Pstr_recmodule l -> List.iter (sub.module_binding sub) l
+    | Pstr_modtype x -> sub.module_type_declaration sub x
+    | Pstr_open x -> sub.open_description sub x
+    | Pstr_include x -> sub.include_declaration sub x
+    | Pstr_extension (x, attrs) ->
+      sub.extension sub x;
+      sub.attributes sub attrs
+    | Pstr_attribute x -> sub.attribute sub x
+end
+
+module E = struct
+  let iter_jsx_children sub xs = List.iter (sub.expr sub) xs
+
+  let iter_jsx_prop sub = function
+    | JSXPropPunning (_, name) -> iter_loc sub name
+    | JSXPropValue (name, _, value) ->
+      iter_loc sub name;
+      sub.expr sub value
+    | JSXPropSpreading (_, e) -> sub.expr sub e
+
+  let iter_jsx_props sub = List.iter (iter_jsx_prop sub)
+
+  (* Value expressions for the core language *)
+
+  let iter sub {pexp_loc = loc; pexp_desc = desc; pexp_attributes = attrs} =
+    sub.location sub loc;
+    sub.attributes sub attrs;
+    match desc with
+    | Pexp_ident x -> iter_loc sub x
+    | Pexp_constant _ -> ()
+    | Pexp_let (_r, vbs, e) ->
+      List.iter (sub.value_binding sub) vbs;
+      sub.expr sub e
+    | Pexp_fun {default = def; lhs = p; rhs = e} ->
+      iter_opt (sub.expr sub) def;
+      sub.pat sub p;
+      sub.expr sub e
+    | Pexp_apply {funct = e; args = l} ->
+      sub.expr sub e;
+      List.iter (iter_snd (sub.expr sub)) l
+    | Pexp_match (e, pel) ->
+      sub.expr sub e;
+      sub.cases sub pel
+    | Pexp_try (e, pel) ->
+      sub.expr sub e;
+      sub.cases sub pel
+    | Pexp_tuple el -> List.iter (sub.expr sub) el
+    | Pexp_construct (lid, arg) ->
+      iter_loc sub lid;
+      iter_opt (sub.expr sub) arg
+    | Pexp_variant (_lab, eo) -> iter_opt (sub.expr sub) eo
+    | Pexp_record (l, eo) ->
+      List.iter
+        (fun {lid; x = exp} ->
+          iter_loc sub lid;
+          sub.expr sub exp)
+        l;
+      iter_opt (sub.expr sub) eo
+    | Pexp_field (e, lid) ->
+      sub.expr sub e;
+      iter_loc sub lid
+    | Pexp_setfield (e1, lid, e2) ->
+      sub.expr sub e1;
+      iter_loc sub lid;
+      sub.expr sub e2
+    | Pexp_array el -> List.iter (sub.expr sub) el
+    | Pexp_ifthenelse (e1, e2, e3) ->
+      sub.expr sub e1;
+      sub.expr sub e2;
+      iter_opt (sub.expr sub) e3
+    | Pexp_sequence (e1, e2) ->
+      sub.expr sub e1;
+      sub.expr sub e2
+    | Pexp_while (e1, e2) ->
+      sub.expr sub e1;
+      sub.expr sub e2
+    | Pexp_for (p, e1, e2, _d, e3) ->
+      sub.pat sub p;
+      sub.expr sub e1;
+      sub.expr sub e2;
+      sub.expr sub e3
+    | Pexp_coerce (e, (), t2) ->
+      sub.expr sub e;
+      sub.typ sub t2
+    | Pexp_constraint (e, t) ->
+      sub.expr sub e;
+      sub.typ sub t
+    | Pexp_send (e, _s) -> sub.expr sub e
+    | Pexp_letmodule (s, me, e) ->
+      iter_loc sub s;
+      sub.module_expr sub me;
+      sub.expr sub e
+    | Pexp_letexception (cd, e) ->
+      sub.extension_constructor sub cd;
+      sub.expr sub e
+    | Pexp_assert e -> sub.expr sub e
+    | Pexp_newtype (_s, e) -> sub.expr sub e
+    | Pexp_pack me -> sub.module_expr sub me
+    | Pexp_open (_ovf, lid, e) ->
+      iter_loc sub lid;
+      sub.expr sub e
+    | Pexp_extension x -> sub.extension sub x
+    | Pexp_await e -> sub.expr sub e
+    | Pexp_jsx_element (Jsx_fragment {jsx_fragment_children = children}) ->
+      iter_jsx_children sub children
+    | Pexp_jsx_element
+        (Jsx_unary_element
+           {jsx_unary_element_tag_name = name; jsx_unary_element_props = props})
+      ->
+      iter_loc sub name;
+      iter_jsx_props sub props
+    | Pexp_jsx_element
+        (Jsx_container_element
+           {
+             jsx_container_element_tag_name_start = name;
+             jsx_container_element_props = props;
+             jsx_container_element_children = children;
+           }) ->
+      iter_loc sub name;
+      iter_jsx_props sub props;
+      iter_jsx_children sub children
+end
+
+module P = struct
+  (* Patterns *)
+
+  let iter sub {ppat_desc = desc; ppat_loc = loc; ppat_attributes = attrs} =
+    sub.location sub loc;
+    sub.attributes sub attrs;
+    match desc with
+    | Ppat_any -> ()
+    | Ppat_var s -> iter_loc sub s
+    | Ppat_alias (p, s) ->
+      sub.pat sub p;
+      iter_loc sub s
+    | Ppat_constant _ -> ()
+    | Ppat_interval _ -> ()
+    | Ppat_tuple pl -> List.iter (sub.pat sub) pl
+    | Ppat_construct (l, p) ->
+      iter_loc sub l;
+      iter_opt (sub.pat sub) p
+    | Ppat_variant (_l, p) -> iter_opt (sub.pat sub) p
+    | Ppat_record (lpl, _cf) ->
+      List.iter
+        (fun {lid; x = pat} ->
+          iter_loc sub lid;
+          sub.pat sub pat)
+        lpl
+    | Ppat_array pl -> List.iter (sub.pat sub) pl
+    | Ppat_or (p1, p2) ->
+      sub.pat sub p1;
+      sub.pat sub p2
+    | Ppat_constraint (p, t) ->
+      sub.pat sub p;
+      sub.typ sub t
+    | Ppat_type s -> iter_loc sub s
+    | Ppat_unpack s -> iter_loc sub s
+    | Ppat_exception p -> sub.pat sub p
+    | Ppat_extension x -> sub.extension sub x
+    | Ppat_open (lid, p) ->
+      iter_loc sub lid;
+      sub.pat sub p
+end
+
+(* Now, a generic AST mapper, to be extended to cover all kinds and
+   cases of the OCaml grammar.  The default behavior of the mapper is
+   the identity. *)
+
+let default_iterator =
+  {
+    structure = (fun this l -> List.iter (this.structure_item this) l);
+    structure_item = M.iter_structure_item;
+    module_expr = M.iter;
+    signature = (fun this l -> List.iter (this.signature_item this) l);
+    signature_item = MT.iter_signature_item;
+    module_type = MT.iter;
+    with_constraint = MT.iter_with_constraint;
+    type_declaration = T.iter_type_declaration;
+    type_kind = T.iter_type_kind;
+    typ = T.iter;
+    type_extension = T.iter_type_extension;
+    extension_constructor = T.iter_extension_constructor;
+    value_description =
+      (fun this
+        {pval_name; pval_type; pval_prim = _; pval_loc; pval_attributes}
+      ->
+        iter_loc this pval_name;
+        this.typ this pval_type;
+        this.attributes this pval_attributes;
+        this.location this pval_loc);
+    pat = P.iter;
+    expr = E.iter;
+    module_declaration =
+      (fun this {pmd_name; pmd_type; pmd_attributes; pmd_loc} ->
+        iter_loc this pmd_name;
+        this.module_type this pmd_type;
+        this.attributes this pmd_attributes;
+        this.location this pmd_loc);
+    module_type_declaration =
+      (fun this {pmtd_name; pmtd_type; pmtd_attributes; pmtd_loc} ->
+        iter_loc this pmtd_name;
+        iter_opt (this.module_type this) pmtd_type;
+        this.attributes this pmtd_attributes;
+        this.location this pmtd_loc);
+    module_binding =
+      (fun this {pmb_name; pmb_expr; pmb_attributes; pmb_loc} ->
+        iter_loc this pmb_name;
+        this.module_expr this pmb_expr;
+        this.attributes this pmb_attributes;
+        this.location this pmb_loc);
+    open_description =
+      (fun this {popen_lid; popen_override = _; popen_attributes; popen_loc} ->
+        iter_loc this popen_lid;
+        this.location this popen_loc;
+        this.attributes this popen_attributes);
+    include_description =
+      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
+        this.module_type this pincl_mod;
+        this.location this pincl_loc;
+        this.attributes this pincl_attributes);
+    include_declaration =
+      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
+        this.module_expr this pincl_mod;
+        this.location this pincl_loc;
+        this.attributes this pincl_attributes);
+    value_binding =
+      (fun this {pvb_pat; pvb_expr; pvb_attributes; pvb_loc} ->
+        this.pat this pvb_pat;
+        this.expr this pvb_expr;
+        this.location this pvb_loc;
+        this.attributes this pvb_attributes);
+    constructor_declaration =
+      (fun this {pcd_name; pcd_args; pcd_res; pcd_loc; pcd_attributes} ->
+        iter_loc this pcd_name;
+        T.iter_constructor_arguments this pcd_args;
+        iter_opt (this.typ this) pcd_res;
+        this.location this pcd_loc;
+        this.attributes this pcd_attributes);
+    label_declaration =
+      (fun this
+        {pld_name; pld_type; pld_loc; pld_mutable = _; pld_attributes}
+      ->
+        iter_loc this pld_name;
+        this.typ this pld_type;
+        this.location this pld_loc;
+        this.attributes this pld_attributes);
+    cases = (fun this l -> List.iter (this.case this) l);
+    case =
+      (fun this {pc_lhs; pc_guard; pc_rhs} ->
+        this.pat this pc_lhs;
+        iter_opt (this.expr this) pc_guard;
+        this.expr this pc_rhs);
+    location = (fun _this _l -> ());
+    extension =
+      (fun this (s, e) ->
+        iter_loc this s;
+        this.payload this e);
+    attribute =
+      (fun this (s, e) ->
+        iter_loc this s;
+        this.payload this e);
+    attributes = (fun this l -> List.iter (this.attribute this) l);
+    payload =
+      (fun this -> function
+        | PStr x -> this.structure this x
+        | PSig x -> this.signature this x
+        | PTyp x -> this.typ this x
+        | PPat (x, g) ->
+          this.pat this x;
+          iter_opt (this.expr this) g);
+  }
diff --git a/jscomp/ml/ast_iterator.mli b/compiler/ml/ast_iterator.mli
old mode 100755
new mode 100644
similarity index 88%
rename from jscomp/ml/ast_iterator.mli
rename to compiler/ml/ast_iterator.mli
index 4f5058f..8c7b7a5
--- a/jscomp/ml/ast_iterator.mli
+++ b/compiler/ml/ast_iterator.mli
@@ -26,13 +26,6 @@ type iterator = {
   attributes: iterator -> attribute list -> unit;
   case: iterator -> case -> unit;
   cases: iterator -> case list -> unit;
-  class_expr: iterator -> class_expr -> unit;
-  class_field: iterator -> class_field -> unit;
-  class_signature: iterator -> class_signature -> unit;
-  class_structure: iterator -> class_structure -> unit;
-  class_type: iterator -> class_type -> unit;
-  class_type_declaration: iterator -> class_type_declaration -> unit;
-  class_type_field: iterator -> class_type_field -> unit;
   constructor_declaration: iterator -> constructor_declaration -> unit;
   expr: iterator -> expression -> unit;
   extension: iterator -> extension -> unit;
@@ -66,5 +59,5 @@ type iterator = {
     argument the iterator to be applied to children in the syntax
     tree. *)
 
-val default_iterator: iterator
+val default_iterator : iterator
 (** A default iterator, which implements a "do not do anything" mapping. *)
diff --git a/compiler/ml/ast_mapper.ml b/compiler/ml/ast_mapper.ml
new file mode 100644
index 0000000..6734654
--- /dev/null
+++ b/compiler/ml/ast_mapper.ml
@@ -0,0 +1,803 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                         Alain Frisch, LexiFi                           *)
+(*                                                                        *)
+(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* A generic Parsetree mapping class *)
+
+(*
+[@@@warning "+9"]
+  (* Ensure that record patterns don't miss any field. *)
+*)
+
+open Parsetree
+open Ast_helper
+open Location
+
+type mapper = {
+  attribute: mapper -> attribute -> attribute;
+  attributes: mapper -> attribute list -> attribute list;
+  case: mapper -> case -> case;
+  cases: mapper -> case list -> case list;
+  constructor_declaration:
+    mapper -> constructor_declaration -> constructor_declaration;
+  expr: mapper -> expression -> expression;
+  extension: mapper -> extension -> extension;
+  extension_constructor:
+    mapper -> extension_constructor -> extension_constructor;
+  include_declaration: mapper -> include_declaration -> include_declaration;
+  include_description: mapper -> include_description -> include_description;
+  label_declaration: mapper -> label_declaration -> label_declaration;
+  location: mapper -> Location.t -> Location.t;
+  module_binding: mapper -> module_binding -> module_binding;
+  module_declaration: mapper -> module_declaration -> module_declaration;
+  module_expr: mapper -> module_expr -> module_expr;
+  module_type: mapper -> module_type -> module_type;
+  module_type_declaration:
+    mapper -> module_type_declaration -> module_type_declaration;
+  open_description: mapper -> open_description -> open_description;
+  pat: mapper -> pattern -> pattern;
+  payload: mapper -> payload -> payload;
+  signature: mapper -> signature -> signature;
+  signature_item: mapper -> signature_item -> signature_item;
+  structure: mapper -> structure -> structure;
+  structure_item: mapper -> structure_item -> structure_item;
+  typ: mapper -> core_type -> core_type;
+  type_declaration: mapper -> type_declaration -> type_declaration;
+  type_extension: mapper -> type_extension -> type_extension;
+  type_kind: mapper -> type_kind -> type_kind;
+  value_binding: mapper -> value_binding -> value_binding;
+  value_description: mapper -> value_description -> value_description;
+  with_constraint: mapper -> with_constraint -> with_constraint;
+}
+
+let map_fst f (x, y) = (f x, y)
+let map_snd f (x, y) = (x, f y)
+let map_tuple f1 f2 (x, y) = (f1 x, f2 y)
+let map_tuple3 f1 f2 f3 (x, y, z) = (f1 x, f2 y, f3 z)
+let map_opt f = function
+  | None -> None
+  | Some x -> Some (f x)
+
+let map_loc sub {loc; txt} = {loc = sub.location sub loc; txt}
+
+module T = struct
+  (* Type expressions for the core language *)
+
+  let row_field sub = function
+    | Rtag (l, attrs, b, tl) ->
+      Rtag
+        (map_loc sub l, sub.attributes sub attrs, b, List.map (sub.typ sub) tl)
+    | Rinherit t -> Rinherit (sub.typ sub t)
+
+  let object_field sub = function
+    | Otag (l, attrs, t) ->
+      Otag (map_loc sub l, sub.attributes sub attrs, sub.typ sub t)
+    | Oinherit t -> Oinherit (sub.typ sub t)
+
+  let map sub {ptyp_desc = desc; ptyp_loc = loc; ptyp_attributes = attrs} =
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Ptyp_any -> Typ.any ~loc ~attrs ()
+    | Ptyp_var s -> Typ.var ~loc ~attrs s
+    | Ptyp_arrow {arg; ret; arity} ->
+      Typ.arrow ~loc ~attrs ~arity
+        {arg with typ = sub.typ sub arg.typ}
+        (sub.typ sub ret)
+    | Ptyp_tuple tyl -> Typ.tuple ~loc ~attrs (List.map (sub.typ sub) tyl)
+    | Ptyp_constr (lid, tl) ->
+      Typ.constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tl)
+    | Ptyp_object (l, o) ->
+      Typ.object_ ~loc ~attrs (List.map (object_field sub) l) o
+    | Ptyp_alias (t, s) -> Typ.alias ~loc ~attrs (sub.typ sub t) s
+    | Ptyp_variant (rl, b, ll) ->
+      Typ.variant ~loc ~attrs (List.map (row_field sub) rl) b ll
+    | Ptyp_poly (sl, t) ->
+      Typ.poly ~loc ~attrs (List.map (map_loc sub) sl) (sub.typ sub t)
+    | Ptyp_package (lid, l) ->
+      Typ.package ~loc ~attrs (map_loc sub lid)
+        (List.map (map_tuple (map_loc sub) (sub.typ sub)) l)
+    | Ptyp_extension x -> Typ.extension ~loc ~attrs (sub.extension sub x)
+
+  let map_type_declaration sub
+      {
+        ptype_name;
+        ptype_params;
+        ptype_cstrs;
+        ptype_kind;
+        ptype_private;
+        ptype_manifest;
+        ptype_attributes;
+        ptype_loc;
+      } =
+    Type.mk (map_loc sub ptype_name)
+      ~params:(List.map (map_fst (sub.typ sub)) ptype_params)
+      ~priv:ptype_private
+      ~cstrs:
+        (List.map
+           (map_tuple3 (sub.typ sub) (sub.typ sub) (sub.location sub))
+           ptype_cstrs)
+      ~kind:(sub.type_kind sub ptype_kind)
+      ?manifest:(map_opt (sub.typ sub) ptype_manifest)
+      ~loc:(sub.location sub ptype_loc)
+      ~attrs:(sub.attributes sub ptype_attributes)
+
+  let map_type_kind sub = function
+    | Ptype_abstract -> Ptype_abstract
+    | Ptype_variant l ->
+      Ptype_variant (List.map (sub.constructor_declaration sub) l)
+    | Ptype_record l -> Ptype_record (List.map (sub.label_declaration sub) l)
+    | Ptype_open -> Ptype_open
+
+  let map_constructor_arguments sub = function
+    | Pcstr_tuple l -> Pcstr_tuple (List.map (sub.typ sub) l)
+    | Pcstr_record l -> Pcstr_record (List.map (sub.label_declaration sub) l)
+
+  let map_type_extension sub
+      {
+        ptyext_path;
+        ptyext_params;
+        ptyext_constructors;
+        ptyext_private;
+        ptyext_attributes;
+      } =
+    Te.mk (map_loc sub ptyext_path)
+      (List.map (sub.extension_constructor sub) ptyext_constructors)
+      ~params:(List.map (map_fst (sub.typ sub)) ptyext_params)
+      ~priv:ptyext_private
+      ~attrs:(sub.attributes sub ptyext_attributes)
+
+  let map_extension_constructor_kind sub = function
+    | Pext_decl (ctl, cto) ->
+      Pext_decl (map_constructor_arguments sub ctl, map_opt (sub.typ sub) cto)
+    | Pext_rebind li -> Pext_rebind (map_loc sub li)
+
+  let map_extension_constructor sub
+      {pext_name; pext_kind; pext_loc; pext_attributes} =
+    Te.constructor (map_loc sub pext_name)
+      (map_extension_constructor_kind sub pext_kind)
+      ~loc:(sub.location sub pext_loc)
+      ~attrs:(sub.attributes sub pext_attributes)
+end
+
+module MT = struct
+  (* Type expressions for the module language *)
+
+  let map sub {pmty_desc = desc; pmty_loc = loc; pmty_attributes = attrs} =
+    let open Mty in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Pmty_ident s -> ident ~loc ~attrs (map_loc sub s)
+    | Pmty_alias s -> alias ~loc ~attrs (map_loc sub s)
+    | Pmty_signature sg -> signature ~loc ~attrs (sub.signature sub sg)
+    | Pmty_functor (s, mt1, mt2) ->
+      functor_ ~loc ~attrs (map_loc sub s)
+        (Misc.may_map (sub.module_type sub) mt1)
+        (sub.module_type sub mt2)
+    | Pmty_with (mt, l) ->
+      with_ ~loc ~attrs (sub.module_type sub mt)
+        (List.map (sub.with_constraint sub) l)
+    | Pmty_typeof me -> typeof_ ~loc ~attrs (sub.module_expr sub me)
+    | Pmty_extension x -> extension ~loc ~attrs (sub.extension sub x)
+
+  let map_with_constraint sub = function
+    | Pwith_type (lid, d) ->
+      Pwith_type (map_loc sub lid, sub.type_declaration sub d)
+    | Pwith_module (lid, lid2) ->
+      Pwith_module (map_loc sub lid, map_loc sub lid2)
+    | Pwith_typesubst (lid, d) ->
+      Pwith_typesubst (map_loc sub lid, sub.type_declaration sub d)
+    | Pwith_modsubst (s, lid) -> Pwith_modsubst (map_loc sub s, map_loc sub lid)
+
+  let map_signature_item sub {psig_desc = desc; psig_loc = loc} =
+    let open Sig in
+    let loc = sub.location sub loc in
+    match desc with
+    | Psig_value vd -> value ~loc (sub.value_description sub vd)
+    | Psig_type (rf, l) -> type_ ~loc rf (List.map (sub.type_declaration sub) l)
+    | Psig_typext te -> type_extension ~loc (sub.type_extension sub te)
+    | Psig_exception ed -> exception_ ~loc (sub.extension_constructor sub ed)
+    | Psig_module x -> module_ ~loc (sub.module_declaration sub x)
+    | Psig_recmodule l ->
+      rec_module ~loc (List.map (sub.module_declaration sub) l)
+    | Psig_modtype x -> modtype ~loc (sub.module_type_declaration sub x)
+    | Psig_open x -> open_ ~loc (sub.open_description sub x)
+    | Psig_include x -> include_ ~loc (sub.include_description sub x)
+    | Psig_extension (x, attrs) ->
+      extension ~loc (sub.extension sub x) ~attrs:(sub.attributes sub attrs)
+    | Psig_attribute x -> attribute ~loc (sub.attribute sub x)
+end
+
+module M = struct
+  (* Value expressions for the module language *)
+
+  let map sub {pmod_loc = loc; pmod_desc = desc; pmod_attributes = attrs} =
+    let open Mod in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Pmod_ident x -> ident ~loc ~attrs (map_loc sub x)
+    | Pmod_structure str -> structure ~loc ~attrs (sub.structure sub str)
+    | Pmod_functor (arg, arg_ty, body) ->
+      functor_ ~loc ~attrs (map_loc sub arg)
+        (Misc.may_map (sub.module_type sub) arg_ty)
+        (sub.module_expr sub body)
+    | Pmod_apply (m1, m2) ->
+      apply ~loc ~attrs (sub.module_expr sub m1) (sub.module_expr sub m2)
+    | Pmod_constraint (m, mty) ->
+      constraint_ ~loc ~attrs (sub.module_expr sub m) (sub.module_type sub mty)
+    | Pmod_unpack e -> unpack ~loc ~attrs (sub.expr sub e)
+    | Pmod_extension x -> extension ~loc ~attrs (sub.extension sub x)
+
+  let map_structure_item sub {pstr_loc = loc; pstr_desc = desc} =
+    let open Str in
+    let loc = sub.location sub loc in
+    match desc with
+    | Pstr_eval (x, attrs) ->
+      eval ~loc ~attrs:(sub.attributes sub attrs) (sub.expr sub x)
+    | Pstr_value (r, vbs) -> value ~loc r (List.map (sub.value_binding sub) vbs)
+    | Pstr_primitive vd -> primitive ~loc (sub.value_description sub vd)
+    | Pstr_type (rf, l) -> type_ ~loc rf (List.map (sub.type_declaration sub) l)
+    | Pstr_typext te -> type_extension ~loc (sub.type_extension sub te)
+    | Pstr_exception ed -> exception_ ~loc (sub.extension_constructor sub ed)
+    | Pstr_module x -> module_ ~loc (sub.module_binding sub x)
+    | Pstr_recmodule l -> rec_module ~loc (List.map (sub.module_binding sub) l)
+    | Pstr_modtype x -> modtype ~loc (sub.module_type_declaration sub x)
+    | Pstr_open x -> open_ ~loc (sub.open_description sub x)
+    | Pstr_include x -> include_ ~loc (sub.include_declaration sub x)
+    | Pstr_extension (x, attrs) ->
+      extension ~loc (sub.extension sub x) ~attrs:(sub.attributes sub attrs)
+    | Pstr_attribute x -> attribute ~loc (sub.attribute sub x)
+end
+
+module E = struct
+  let map_jsx_children sub xs = List.map (sub.expr sub) xs
+
+  let map_jsx_prop sub = function
+    | JSXPropPunning (optional, name) ->
+      JSXPropPunning (optional, map_loc sub name)
+    | JSXPropValue (name, optional, value) ->
+      JSXPropValue (map_loc sub name, optional, sub.expr sub value)
+    | JSXPropSpreading (loc, e) ->
+      JSXPropSpreading (sub.location sub loc, sub.expr sub e)
+
+  let map_jsx_props sub = List.map (map_jsx_prop sub)
+
+  (* Value expressions for the core language *)
+
+  let map sub {pexp_loc = loc; pexp_desc = desc; pexp_attributes = attrs} =
+    let open Exp in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Pexp_ident x -> ident ~loc ~attrs (map_loc sub x)
+    | Pexp_constant x -> constant ~loc ~attrs x
+    | Pexp_let (r, vbs, e) ->
+      let_ ~loc ~attrs r (List.map (sub.value_binding sub) vbs) (sub.expr sub e)
+    | Pexp_fun {arg_label = lab; default = def; lhs = p; rhs = e; arity; async}
+      ->
+      fun_ ~loc ~attrs ~arity ~async lab
+        (map_opt (sub.expr sub) def)
+        (sub.pat sub p) (sub.expr sub e)
+    | Pexp_apply {funct = e; args = l; partial; transformed_jsx} ->
+      apply ~loc ~attrs ~partial ~transformed_jsx (sub.expr sub e)
+        (List.map (map_snd (sub.expr sub)) l)
+    | Pexp_match (e, pel) ->
+      match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
+    | Pexp_try (e, pel) -> try_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
+    | Pexp_tuple el -> tuple ~loc ~attrs (List.map (sub.expr sub) el)
+    | Pexp_construct (lid, arg) ->
+      construct ~loc ~attrs (map_loc sub lid) (map_opt (sub.expr sub) arg)
+    | Pexp_variant (lab, eo) ->
+      variant ~loc ~attrs lab (map_opt (sub.expr sub) eo)
+    | Pexp_record (l, eo) ->
+      record ~loc ~attrs
+        (List.map
+           (fun {lid; x = exp; opt} ->
+             {lid = map_loc sub lid; x = sub.expr sub exp; opt})
+           l)
+        (map_opt (sub.expr sub) eo)
+    | Pexp_field (e, lid) ->
+      field ~loc ~attrs (sub.expr sub e) (map_loc sub lid)
+    | Pexp_setfield (e1, lid, e2) ->
+      setfield ~loc ~attrs (sub.expr sub e1) (map_loc sub lid) (sub.expr sub e2)
+    | Pexp_array el -> array ~loc ~attrs (List.map (sub.expr sub) el)
+    | Pexp_ifthenelse (e1, e2, e3) ->
+      ifthenelse ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
+        (map_opt (sub.expr sub) e3)
+    | Pexp_sequence (e1, e2) ->
+      sequence ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
+    | Pexp_while (e1, e2) ->
+      while_ ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
+    | Pexp_for (p, e1, e2, d, e3) ->
+      for_ ~loc ~attrs (sub.pat sub p) (sub.expr sub e1) (sub.expr sub e2) d
+        (sub.expr sub e3)
+    | Pexp_coerce (e, (), t2) ->
+      coerce ~loc ~attrs (sub.expr sub e) (sub.typ sub t2)
+    | Pexp_constraint (e, t) ->
+      constraint_ ~loc ~attrs (sub.expr sub e) (sub.typ sub t)
+    | Pexp_send (e, s) -> send ~loc ~attrs (sub.expr sub e) (map_loc sub s)
+    | Pexp_letmodule (s, me, e) ->
+      letmodule ~loc ~attrs (map_loc sub s) (sub.module_expr sub me)
+        (sub.expr sub e)
+    | Pexp_letexception (cd, e) ->
+      letexception ~loc ~attrs
+        (sub.extension_constructor sub cd)
+        (sub.expr sub e)
+    | Pexp_assert e -> assert_ ~loc ~attrs (sub.expr sub e)
+    | Pexp_newtype (s, e) ->
+      newtype ~loc ~attrs (map_loc sub s) (sub.expr sub e)
+    | Pexp_pack me -> pack ~loc ~attrs (sub.module_expr sub me)
+    | Pexp_open (ovf, lid, e) ->
+      open_ ~loc ~attrs ovf (map_loc sub lid) (sub.expr sub e)
+    | Pexp_extension x -> extension ~loc ~attrs (sub.extension sub x)
+    | Pexp_await e -> await ~loc ~attrs (sub.expr sub e)
+    | Pexp_jsx_element
+        (Jsx_fragment
+           {
+             jsx_fragment_opening = o;
+             jsx_fragment_children = children;
+             jsx_fragment_closing = c;
+           }) ->
+      jsx_fragment ~loc ~attrs o (map_jsx_children sub children) c
+    | Pexp_jsx_element
+        (Jsx_unary_element
+           {jsx_unary_element_tag_name = name; jsx_unary_element_props = props})
+      ->
+      jsx_unary_element ~loc ~attrs (map_loc sub name) (map_jsx_props sub props)
+    | Pexp_jsx_element
+        (Jsx_container_element
+           {
+             jsx_container_element_tag_name_start = name;
+             jsx_container_element_opening_tag_end = ote;
+             jsx_container_element_props = props;
+             jsx_container_element_children = children;
+             jsx_container_element_closing_tag = closing_tag;
+           }) ->
+      jsx_container_element ~loc ~attrs (map_loc sub name)
+        (map_jsx_props sub props) ote
+        (map_jsx_children sub children)
+        closing_tag
+end
+
+module P = struct
+  (* Patterns *)
+
+  let map sub {ppat_desc = desc; ppat_loc = loc; ppat_attributes = attrs} =
+    let open Pat in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Ppat_any -> any ~loc ~attrs ()
+    | Ppat_var s -> var ~loc ~attrs (map_loc sub s)
+    | Ppat_alias (p, s) -> alias ~loc ~attrs (sub.pat sub p) (map_loc sub s)
+    | Ppat_constant c -> constant ~loc ~attrs c
+    | Ppat_interval (c1, c2) -> interval ~loc ~attrs c1 c2
+    | Ppat_tuple pl -> tuple ~loc ~attrs (List.map (sub.pat sub) pl)
+    | Ppat_construct (l, p) ->
+      construct ~loc ~attrs (map_loc sub l) (map_opt (sub.pat sub) p)
+    | Ppat_variant (l, p) -> variant ~loc ~attrs l (map_opt (sub.pat sub) p)
+    | Ppat_record (lpl, cf) ->
+      record ~loc ~attrs
+        (List.map
+           (fun {lid; x = pat; opt} ->
+             {lid = map_loc sub lid; x = sub.pat sub pat; opt})
+           lpl)
+        cf
+    | Ppat_array pl -> array ~loc ~attrs (List.map (sub.pat sub) pl)
+    | Ppat_or (p1, p2) -> or_ ~loc ~attrs (sub.pat sub p1) (sub.pat sub p2)
+    | Ppat_constraint (p, t) ->
+      constraint_ ~loc ~attrs (sub.pat sub p) (sub.typ sub t)
+    | Ppat_type s -> type_ ~loc ~attrs (map_loc sub s)
+    | Ppat_unpack s -> unpack ~loc ~attrs (map_loc sub s)
+    | Ppat_open (lid, p) -> open_ ~loc ~attrs (map_loc sub lid) (sub.pat sub p)
+    | Ppat_exception p -> exception_ ~loc ~attrs (sub.pat sub p)
+    | Ppat_extension x -> extension ~loc ~attrs (sub.extension sub x)
+end
+
+(* Now, a generic AST mapper, to be extended to cover all kinds and
+   cases of the OCaml grammar.  The default behavior of the mapper is
+   the identity. *)
+
+let default_mapper =
+  {
+    structure = (fun this l -> List.map (this.structure_item this) l);
+    structure_item = M.map_structure_item;
+    module_expr = M.map;
+    signature = (fun this l -> List.map (this.signature_item this) l);
+    signature_item = MT.map_signature_item;
+    module_type = MT.map;
+    with_constraint = MT.map_with_constraint;
+    type_declaration = T.map_type_declaration;
+    type_kind = T.map_type_kind;
+    typ = T.map;
+    type_extension = T.map_type_extension;
+    extension_constructor = T.map_extension_constructor;
+    value_description =
+      (fun this {pval_name; pval_type; pval_prim; pval_loc; pval_attributes} ->
+        Val.mk (map_loc this pval_name) (this.typ this pval_type)
+          ~attrs:(this.attributes this pval_attributes)
+          ~loc:(this.location this pval_loc)
+          ~prim:pval_prim);
+    pat = P.map;
+    expr = E.map;
+    module_declaration =
+      (fun this {pmd_name; pmd_type; pmd_attributes; pmd_loc} ->
+        Md.mk (map_loc this pmd_name)
+          (this.module_type this pmd_type)
+          ~attrs:(this.attributes this pmd_attributes)
+          ~loc:(this.location this pmd_loc));
+    module_type_declaration =
+      (fun this {pmtd_name; pmtd_type; pmtd_attributes; pmtd_loc} ->
+        Mtd.mk (map_loc this pmtd_name)
+          ?typ:(map_opt (this.module_type this) pmtd_type)
+          ~attrs:(this.attributes this pmtd_attributes)
+          ~loc:(this.location this pmtd_loc));
+    module_binding =
+      (fun this {pmb_name; pmb_expr; pmb_attributes; pmb_loc} ->
+        Mb.mk (map_loc this pmb_name)
+          (this.module_expr this pmb_expr)
+          ~attrs:(this.attributes this pmb_attributes)
+          ~loc:(this.location this pmb_loc));
+    open_description =
+      (fun this {popen_lid; popen_override; popen_attributes; popen_loc} ->
+        Opn.mk (map_loc this popen_lid) ~override:popen_override
+          ~loc:(this.location this popen_loc)
+          ~attrs:(this.attributes this popen_attributes));
+    include_description =
+      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
+        Incl.mk
+          (this.module_type this pincl_mod)
+          ~loc:(this.location this pincl_loc)
+          ~attrs:(this.attributes this pincl_attributes));
+    include_declaration =
+      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
+        Incl.mk
+          (this.module_expr this pincl_mod)
+          ~loc:(this.location this pincl_loc)
+          ~attrs:(this.attributes this pincl_attributes));
+    value_binding =
+      (fun this {pvb_pat; pvb_expr; pvb_attributes; pvb_loc} ->
+        Vb.mk (this.pat this pvb_pat) (this.expr this pvb_expr)
+          ~loc:(this.location this pvb_loc)
+          ~attrs:(this.attributes this pvb_attributes));
+    constructor_declaration =
+      (fun this {pcd_name; pcd_args; pcd_res; pcd_loc; pcd_attributes} ->
+        Type.constructor (map_loc this pcd_name)
+          ~args:(T.map_constructor_arguments this pcd_args)
+          ?res:(map_opt (this.typ this) pcd_res)
+          ~loc:(this.location this pcd_loc)
+          ~attrs:(this.attributes this pcd_attributes));
+    label_declaration =
+      (fun this
+        {pld_name; pld_type; pld_loc; pld_mutable; pld_optional; pld_attributes}
+      ->
+        Type.field (map_loc this pld_name) (this.typ this pld_type)
+          ~mut:pld_mutable ~optional:pld_optional
+          ~loc:(this.location this pld_loc)
+          ~attrs:(this.attributes this pld_attributes));
+    cases = (fun this l -> List.map (this.case this) l);
+    case =
+      (fun this {pc_bar; pc_lhs; pc_guard; pc_rhs} ->
+        {
+          pc_bar;
+          pc_lhs = this.pat this pc_lhs;
+          pc_guard = map_opt (this.expr this) pc_guard;
+          pc_rhs = this.expr this pc_rhs;
+        });
+    location = (fun _this l -> l);
+    extension = (fun this (s, e) -> (map_loc this s, this.payload this e));
+    attribute = (fun this (s, e) -> (map_loc this s, this.payload this e));
+    attributes = (fun this l -> List.map (this.attribute this) l);
+    payload =
+      (fun this -> function
+        | PStr x -> PStr (this.structure this x)
+        | PSig x -> PSig (this.signature this x)
+        | PTyp x -> PTyp (this.typ this x)
+        | PPat (x, g) -> PPat (this.pat this x, map_opt (this.expr this) g));
+  }
+
+let rec extension_of_error {loc; msg; if_highlight; sub} =
+  ( {loc; txt = "ocaml.error"},
+    PStr
+      ([
+         Str.eval (Exp.constant (Pconst_string (msg, None)));
+         Str.eval (Exp.constant (Pconst_string (if_highlight, None)));
+       ]
+      @ List.map (fun ext -> Str.extension (extension_of_error ext)) sub) )
+
+let attribute_of_warning loc s =
+  ( {loc; txt = "ocaml.ppwarning"},
+    PStr [Str.eval ~loc (Exp.constant (Pconst_string (s, None)))] )
+
+module StringMap = Map.Make (struct
+  type t = string
+  let compare = compare
+end)
+
+let cookies = ref StringMap.empty
+
+let get_cookie k = try Some (StringMap.find k !cookies) with Not_found -> None
+
+let set_cookie k v = cookies := StringMap.add k v !cookies
+
+let tool_name_ref = ref "_none_"
+
+let tool_name () = !tool_name_ref
+
+module PpxContext = struct
+  open Longident
+  open Asttypes
+  open Ast_helper
+
+  let lid name = {txt = Lident name; loc = Location.none}
+
+  let make_string x = Exp.constant (Pconst_string (x, None))
+
+  let make_bool x =
+    if x then Exp.construct (lid "true") None
+    else Exp.construct (lid "false") None
+
+  let rec make_list f lst =
+    match lst with
+    | x :: rest ->
+      Exp.construct (lid "::") (Some (Exp.tuple [f x; make_list f rest]))
+    | [] -> Exp.construct (lid "[]") None
+
+  let make_pair f1 f2 (x1, x2) = Exp.tuple [f1 x1; f2 x2]
+
+  let get_cookies () =
+    {
+      lid = lid "cookies";
+      x =
+        make_list
+          (make_pair make_string (fun x -> x))
+          (StringMap.bindings !cookies);
+      opt = false;
+    }
+
+  let mk fields =
+    ( {txt = "ocaml.ppx.context"; loc = Location.none},
+      Parsetree.PStr [Str.eval (Exp.record fields None)] )
+
+  let make ~tool_name () =
+    let fields =
+      [
+        {lid = lid "tool_name"; x = make_string tool_name; opt = false};
+        {
+          lid = lid "include_dirs";
+          x = make_list make_string !Clflags.include_dirs;
+          opt = false;
+        };
+        {
+          lid = lid "load_path";
+          x = make_list make_string !Config.load_path;
+          opt = false;
+        };
+        {
+          lid = lid "open_modules";
+          x = make_list make_string !Clflags.open_modules;
+          opt = false;
+        };
+        {lid = lid "debug"; x = make_bool !Clflags.debug; opt = false};
+        get_cookies ();
+      ]
+    in
+    mk fields
+
+  let get_fields = function
+    | PStr
+        [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_record (fields, None)}, [])}]
+      ->
+      fields
+    | _ -> raise_errorf "Internal error: invalid [@@@ocaml.ppx.context] syntax"
+
+  let restore fields =
+    let field name payload =
+      let rec get_string = function
+        | {pexp_desc = Pexp_constant (Pconst_string (str, None))} -> str
+        | _ ->
+          raise_errorf
+            "Internal error: invalid [@@@ocaml.ppx.context { %s }] string \
+             syntax"
+            name
+      and get_bool pexp =
+        match pexp with
+        | {pexp_desc = Pexp_construct ({txt = Longident.Lident "true"}, None)}
+          ->
+          true
+        | {pexp_desc = Pexp_construct ({txt = Longident.Lident "false"}, None)}
+          ->
+          false
+        | _ ->
+          raise_errorf
+            "Internal error: invalid [@@@ocaml.ppx.context { %s }] bool syntax"
+            name
+      and get_list elem = function
+        | {
+            pexp_desc =
+              Pexp_construct
+                ( {txt = Longident.Lident "::"},
+                  Some {pexp_desc = Pexp_tuple [exp; rest]} );
+          } ->
+          elem exp :: get_list elem rest
+        | {pexp_desc = Pexp_construct ({txt = Longident.Lident "[]"}, None)} ->
+          []
+        | _ ->
+          raise_errorf
+            "Internal error: invalid [@@@ocaml.ppx.context { %s }] list syntax"
+            name
+      and get_pair f1 f2 = function
+        | {pexp_desc = Pexp_tuple [e1; e2]} -> (f1 e1, f2 e2)
+        | _ ->
+          raise_errorf
+            "Internal error: invalid [@@@ocaml.ppx.context { %s }] pair syntax"
+            name
+      in
+      match name with
+      | "tool_name" -> tool_name_ref := get_string payload
+      | "include_dirs" -> Clflags.include_dirs := get_list get_string payload
+      | "load_path" -> Config.load_path := get_list get_string payload
+      | "open_modules" -> Clflags.open_modules := get_list get_string payload
+      | "debug" -> Clflags.debug := get_bool payload
+      | "cookies" ->
+        let l = get_list (get_pair get_string (fun x -> x)) payload in
+        cookies :=
+          List.fold_left (fun s (k, v) -> StringMap.add k v s) StringMap.empty l
+      | _ -> ()
+    in
+    List.iter
+      (function
+        | {lid = {txt = Lident name}; x} -> field name x
+        | _ -> ())
+      fields
+
+  let update_cookies fields =
+    let fields =
+      Ext_list.filter fields (function
+        | {lid = {txt = Lident "cookies"}} -> false
+        | _ -> true)
+    in
+    fields @ [get_cookies ()]
+end
+
+let ppx_context = PpxContext.make
+
+let extension_of_exn exn =
+  match error_of_exn exn with
+  | Some (`Ok error) -> extension_of_error error
+  | Some `Already_displayed ->
+    ({loc = Location.none; txt = "ocaml.error"}, PStr [])
+  | None -> raise exn
+
+let apply_lazy ~source ~target mapper =
+  let implem ast =
+    let fields, ast =
+      match ast with
+      | {pstr_desc = Pstr_attribute ({txt = "ocaml.ppx.context"}, x)} :: l ->
+        (PpxContext.get_fields x, l)
+      | _ -> ([], ast)
+    in
+    PpxContext.restore fields;
+    let ast =
+      try
+        let mapper = mapper () in
+        mapper.structure mapper ast
+      with exn ->
+        [
+          {
+            pstr_desc = Pstr_extension (extension_of_exn exn, []);
+            pstr_loc = Location.none;
+          };
+        ]
+    in
+    let fields = PpxContext.update_cookies fields in
+    Str.attribute (PpxContext.mk fields) :: ast
+  in
+  let iface ast =
+    let fields, ast =
+      match ast with
+      | {psig_desc = Psig_attribute ({txt = "ocaml.ppx.context"}, x)} :: l ->
+        (PpxContext.get_fields x, l)
+      | _ -> ([], ast)
+    in
+    PpxContext.restore fields;
+    let ast =
+      try
+        let mapper = mapper () in
+        mapper.signature mapper ast
+      with exn ->
+        [
+          {
+            psig_desc = Psig_extension (extension_of_exn exn, []);
+            psig_loc = Location.none;
+          };
+        ]
+    in
+    let fields = PpxContext.update_cookies fields in
+    Sig.attribute (PpxContext.mk fields) :: ast
+  in
+
+  let ic = open_in_bin source in
+  let magic =
+    really_input_string ic (String.length Config.ast_impl_magic_number)
+  in
+
+  let rewrite transform =
+    Location.set_input_name @@ input_value ic;
+    let ast = input_value ic in
+    close_in ic;
+    let ast = transform ast in
+    let oc = open_out_bin target in
+    output_string oc magic;
+    output_value oc !Location.input_name;
+    output_value oc ast;
+    close_out oc
+  and fail () =
+    close_in ic;
+    failwith "Ast_mapper: OCaml version mismatch or malformed input"
+  in
+
+  if magic = Config.ast_impl_magic_number then
+    rewrite (implem : structure -> structure)
+  else if magic = Config.ast_intf_magic_number then
+    rewrite (iface : signature -> signature)
+  else fail ()
+
+let drop_ppx_context_str ~restore = function
+  | {pstr_desc = Pstr_attribute ({Location.txt = "ocaml.ppx.context"}, a)}
+    :: items ->
+    if restore then PpxContext.restore (PpxContext.get_fields a);
+    items
+  | items -> items
+
+let drop_ppx_context_sig ~restore = function
+  | {psig_desc = Psig_attribute ({Location.txt = "ocaml.ppx.context"}, a)}
+    :: items ->
+    if restore then PpxContext.restore (PpxContext.get_fields a);
+    items
+  | items -> items
+
+let add_ppx_context_str ~tool_name ast =
+  Ast_helper.Str.attribute (ppx_context ~tool_name ()) :: ast
+
+let add_ppx_context_sig ~tool_name ast =
+  Ast_helper.Sig.attribute (ppx_context ~tool_name ()) :: ast
+
+let apply ~source ~target mapper = apply_lazy ~source ~target (fun () -> mapper)
+
+let run_main mapper =
+  try
+    let a = Sys.argv in
+    let n = Array.length a in
+    if n > 2 then
+      let mapper () =
+        try mapper (Array.to_list (Array.sub a 1 (n - 3)))
+        with exn ->
+          (* PR#6463 *)
+          let f _ _ = raise exn in
+          {default_mapper with structure = f; signature = f}
+      in
+      apply_lazy ~source:a.(n - 2) ~target:a.(n - 1) mapper
+    else (
+      Printf.eprintf "Usage: %s [extra_args] <infile> <outfile>\n%!"
+        Sys.executable_name;
+      exit 2)
+  with exn ->
+    prerr_endline (Printexc.to_string exn);
+    exit 2
+
+let register_function = ref (fun _name f -> run_main f)
+let register name f = !register_function name f
diff --git a/jscomp/ml/ast_mapper.mli b/compiler/ml/ast_mapper.mli
similarity index 80%
rename from jscomp/ml/ast_mapper.mli
rename to compiler/ml/ast_mapper.mli
index 3a4044d..745fdb8 100644
--- a/jscomp/ml/ast_mapper.mli
+++ b/compiler/ml/ast_mapper.mli
@@ -57,20 +57,12 @@ type mapper = {
   attributes: mapper -> attribute list -> attribute list;
   case: mapper -> case -> case;
   cases: mapper -> case list -> case list;
-  class_expr: mapper -> class_expr -> class_expr;
-  class_field: mapper -> class_field -> class_field;
-  class_signature: mapper -> class_signature -> class_signature;
-  class_structure: mapper -> class_structure -> class_structure;
-  class_type: mapper -> class_type -> class_type;
-  class_type_declaration: mapper -> class_type_declaration
-                          -> class_type_declaration;
-  class_type_field: mapper -> class_type_field -> class_type_field;
-  constructor_declaration: mapper -> constructor_declaration
-                           -> constructor_declaration;
+  constructor_declaration:
+    mapper -> constructor_declaration -> constructor_declaration;
   expr: mapper -> expression -> expression;
   extension: mapper -> extension -> extension;
-  extension_constructor: mapper -> extension_constructor
-                         -> extension_constructor;
+  extension_constructor:
+    mapper -> extension_constructor -> extension_constructor;
   include_declaration: mapper -> include_declaration -> include_declaration;
   include_description: mapper -> include_description -> include_description;
   label_declaration: mapper -> label_declaration -> label_declaration;
@@ -79,8 +71,8 @@ type mapper = {
   module_declaration: mapper -> module_declaration -> module_declaration;
   module_expr: mapper -> module_expr -> module_expr;
   module_type: mapper -> module_type -> module_type;
-  module_type_declaration: mapper -> module_type_declaration
-                           -> module_type_declaration;
+  module_type_declaration:
+    mapper -> module_type_declaration -> module_type_declaration;
   open_description: mapper -> open_description -> open_description;
   pat: mapper -> pattern -> pattern;
   payload: mapper -> payload -> payload;
@@ -101,12 +93,12 @@ type mapper = {
     argument the mapper to be applied to children in the syntax
     tree. *)
 
-val default_mapper: mapper
+val default_mapper : mapper
 (** A default mapper, which implements a "deep identity" mapping. *)
 
 (** {1 Apply mappers to compilation units} *)
 
-val tool_name: unit -> string
+val tool_name : unit -> string
 (** Can be used within a ppx preprocessor to know which tool is
     calling it ["ocamlc"], ["ocamlopt"], ["ocamldoc"], ["ocamldep"],
     ["ocaml"], ...  Some global variables that reflect command-line
@@ -115,14 +107,13 @@ val tool_name: unit -> string
     {!Config.load_path}, {!Clflags.open_modules}, {!Clflags.for_package},
     {!Clflags.debug}. *)
 
-
-val apply: source:string -> target:string -> mapper -> unit
+val apply : source:string -> target:string -> mapper -> unit
 (** Apply a mapper (parametrized by the unit name) to a dumped
     parsetree found in the [source] file and put the result in the
     [target] file. The [structure] or [signature] field of the mapper
     is applied to the implementation or interface.  *)
 
-val run_main: (string list -> mapper) -> unit
+val run_main : (string list -> mapper) -> unit
 (** Entry point to call to implement a standalone -ppx rewriter from a
     mapper, parametrized by the command line arguments.  The current
     unit name can be obtained from {!Location.input_name}.  This
@@ -131,9 +122,9 @@ val run_main: (string list -> mapper) -> unit
 
 (** {1 Registration API} *)
 
-val register_function: (string -> (string list -> mapper) -> unit) ref
+val register_function : (string -> (string list -> mapper) -> unit) ref
 
-val register: string -> (string list -> mapper) -> unit
+val register : string -> (string list -> mapper) -> unit
 (** Apply the [register_function].  The default behavior is to run the
     mapper immediately, taking arguments from the process command
     line.  This is to support a scenario where a mapper is linked as a
@@ -150,42 +141,41 @@ val register: string -> (string list -> mapper) -> unit
     The first argument to [register] is a symbolic name to be used by
     the ppx driver.  *)
 
-
 (** {1 Convenience functions to write mappers} *)
 
-val map_opt: ('a -> 'b) -> 'a option -> 'b option
+val map_opt : ('a -> 'b) -> 'a option -> 'b option
 
-val extension_of_error: Location.error -> extension
+val extension_of_error : Location.error -> extension
 (** Encode an error into an 'ocaml.error' extension node which can be
     inserted in a generated Parsetree.  The compiler will be
     responsible for reporting the error. *)
 
-val attribute_of_warning: Location.t -> string -> attribute
+val attribute_of_warning : Location.t -> string -> attribute
 (** Encode a warning message into an 'ocaml.ppwarning' attribute which can be
     inserted in a generated Parsetree.  The compiler will be
     responsible for reporting the warning. *)
 
 (** {1 Helper functions to call external mappers} *)
 
-val add_ppx_context_str:
-    tool_name:string -> Parsetree.structure -> Parsetree.structure
+val add_ppx_context_str :
+  tool_name:string -> Parsetree.structure -> Parsetree.structure
 (** Extract information from the current environment and encode it
     into an attribute which is prepended to the list of structure
     items in order to pass the information to an external
     processor. *)
 
-val add_ppx_context_sig:
-    tool_name:string -> Parsetree.signature -> Parsetree.signature
+val add_ppx_context_sig :
+  tool_name:string -> Parsetree.signature -> Parsetree.signature
 (** Same as [add_ppx_context_str], but for signatures. *)
 
-val drop_ppx_context_str:
-    restore:bool -> Parsetree.structure -> Parsetree.structure
+val drop_ppx_context_str :
+  restore:bool -> Parsetree.structure -> Parsetree.structure
 (** Drop the ocaml.ppx.context attribute from a structure.  If
     [restore] is true, also restore the associated data in the current
     process. *)
 
-val drop_ppx_context_sig:
-    restore:bool -> Parsetree.signature -> Parsetree.signature
+val drop_ppx_context_sig :
+  restore:bool -> Parsetree.signature -> Parsetree.signature
 (** Same as [drop_ppx_context_str], but for signatures. *)
 
 (** {1 Cookies} *)
@@ -194,5 +184,5 @@ val drop_ppx_context_sig:
     a further invocation of itself, when called from the OCaml
     toplevel (or other tools that support cookies). *)
 
-val set_cookie: string -> Parsetree.expression -> unit
-val get_cookie: string -> Parsetree.expression option
+val set_cookie : string -> Parsetree.expression -> unit
+val get_cookie : string -> Parsetree.expression option
diff --git a/compiler/ml/ast_mapper_from0.ml b/compiler/ml/ast_mapper_from0.ml
new file mode 100644
index 0000000..3f91d6a
--- /dev/null
+++ b/compiler/ml/ast_mapper_from0.ml
@@ -0,0 +1,705 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                         Alain Frisch, LexiFi                           *)
+(*                                                                        *)
+(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* A generic Parsetree mapping class *)
+
+(*
+[@@@warning "+9"]
+  (* Ensure that record patterns don't miss any field. *)
+*)
+
+open Parsetree0
+open Ast_helper
+open Location
+module Pt = Parsetree
+
+type mapper = {
+  attribute: mapper -> attribute -> Pt.attribute;
+  attributes: mapper -> attribute list -> Pt.attribute list;
+  case: mapper -> case -> Pt.case;
+  cases: mapper -> case list -> Pt.case list;
+  constructor_declaration:
+    mapper -> constructor_declaration -> Pt.constructor_declaration;
+  expr: mapper -> expression -> Pt.expression;
+  extension: mapper -> extension -> Pt.extension;
+  extension_constructor:
+    mapper -> extension_constructor -> Pt.extension_constructor;
+  include_declaration: mapper -> include_declaration -> Pt.include_declaration;
+  include_description: mapper -> include_description -> Pt.include_description;
+  label_declaration: mapper -> label_declaration -> Pt.label_declaration;
+  location: mapper -> Location.t -> Location.t;
+  module_binding: mapper -> module_binding -> Pt.module_binding;
+  module_declaration: mapper -> module_declaration -> Pt.module_declaration;
+  module_expr: mapper -> module_expr -> Pt.module_expr;
+  module_type: mapper -> module_type -> Pt.module_type;
+  module_type_declaration:
+    mapper -> module_type_declaration -> Pt.module_type_declaration;
+  open_description: mapper -> open_description -> Pt.open_description;
+  pat: mapper -> pattern -> Pt.pattern;
+  payload: mapper -> payload -> Pt.payload;
+  signature: mapper -> signature -> Pt.signature;
+  signature_item: mapper -> signature_item -> Pt.signature_item;
+  structure: mapper -> structure -> Pt.structure;
+  structure_item: mapper -> structure_item -> Pt.structure_item;
+  typ: mapper -> core_type -> Pt.core_type;
+  type_declaration: mapper -> type_declaration -> Pt.type_declaration;
+  type_extension: mapper -> type_extension -> Pt.type_extension;
+  type_kind: mapper -> type_kind -> Pt.type_kind;
+  value_binding: mapper -> value_binding -> Pt.value_binding;
+  value_description: mapper -> value_description -> Pt.value_description;
+  with_constraint: mapper -> with_constraint -> Pt.with_constraint;
+}
+
+let map_fst f (x, y) = (f x, y)
+let map_snd f (x, y) = (x, f y)
+let map_tuple f1 f2 (x, y) = (f1 x, f2 y)
+let map_tuple3 f1 f2 f3 (x, y, z) = (f1 x, f2 y, f3 z)
+let map_opt f = function
+  | None -> None
+  | Some x -> Some (f x)
+let map_constant = function
+  | Pconst_integer (s, suffix) -> Pt.Pconst_integer (s, suffix)
+  | Pconst_char c -> Pconst_char c
+  | Pconst_string (s, q) -> Pconst_string (s, q)
+  | Pconst_float (s, suffix) -> Pconst_float (s, suffix)
+
+let map_loc sub {loc; txt} = {loc = sub.location sub loc; txt}
+
+module T = struct
+  (* Type expressions for the core language *)
+
+  let row_field sub = function
+    | Rtag (l, attrs, b, tl) ->
+      Pt.Rtag
+        (map_loc sub l, sub.attributes sub attrs, b, List.map (sub.typ sub) tl)
+    | Rinherit t -> Rinherit (sub.typ sub t)
+
+  let object_field sub = function
+    | Otag (l, attrs, t) ->
+      Pt.Otag (map_loc sub l, sub.attributes sub attrs, sub.typ sub t)
+    | Oinherit t -> Oinherit (sub.typ sub t)
+
+  let map sub {ptyp_desc = desc; ptyp_loc = loc; ptyp_attributes = attrs} =
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Ptyp_any -> Typ.any ~loc ~attrs ()
+    | Ptyp_var s -> Typ.var ~loc ~attrs s
+    | Ptyp_arrow (lbl, t1, t2) ->
+      let lbl = Asttypes.to_arg_label lbl in
+      Typ.arrow ~loc ~arity:None
+        {attrs; lbl; typ = sub.typ sub t1}
+        (sub.typ sub t2)
+    | Ptyp_tuple tyl -> Typ.tuple ~loc ~attrs (List.map (sub.typ sub) tyl)
+    | Ptyp_constr (lid, tl) -> (
+      let typ0 =
+        Typ.constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tl)
+      in
+      match typ0.ptyp_desc with
+      | Ptyp_constr (lid, [({ptyp_desc = Ptyp_arrow arr} as fun_t); t_arity])
+        when lid.txt = Lident "function$" ->
+        let decode_arity_string arity_s =
+          int_of_string
+            ((String.sub [@doesNotRaise]) arity_s 9 (String.length arity_s - 9))
+        in
+        let arity_from_type (typ : Parsetree.core_type) =
+          match typ.ptyp_desc with
+          | Ptyp_variant ([Rtag ({txt}, _, _, _)], _, _) ->
+            decode_arity_string txt
+          | _ -> assert false
+        in
+        let arity = arity_from_type t_arity in
+        {fun_t with ptyp_desc = Ptyp_arrow {arr with arity = Some arity}}
+      | _ -> typ0)
+    | Ptyp_object (l, o) ->
+      Typ.object_ ~loc ~attrs (List.map (object_field sub) l) o
+    | Ptyp_class () -> assert false
+    | Ptyp_alias (t, s) -> Typ.alias ~loc ~attrs (sub.typ sub t) s
+    | Ptyp_variant (rl, b, ll) ->
+      Typ.variant ~loc ~attrs (List.map (row_field sub) rl) b ll
+    | Ptyp_poly (sl, t) ->
+      Typ.poly ~loc ~attrs (List.map (map_loc sub) sl) (sub.typ sub t)
+    | Ptyp_package (lid, l) ->
+      Typ.package ~loc ~attrs (map_loc sub lid)
+        (List.map (map_tuple (map_loc sub) (sub.typ sub)) l)
+    | Ptyp_extension x -> Typ.extension ~loc ~attrs (sub.extension sub x)
+
+  let map_type_declaration sub
+      {
+        ptype_name;
+        ptype_params;
+        ptype_cstrs;
+        ptype_kind;
+        ptype_private;
+        ptype_manifest;
+        ptype_attributes;
+        ptype_loc;
+      } =
+    Type.mk (map_loc sub ptype_name)
+      ~params:(List.map (map_fst (sub.typ sub)) ptype_params)
+      ~priv:ptype_private
+      ~cstrs:
+        (List.map
+           (map_tuple3 (sub.typ sub) (sub.typ sub) (sub.location sub))
+           ptype_cstrs)
+      ~kind:(sub.type_kind sub ptype_kind)
+      ?manifest:(map_opt (sub.typ sub) ptype_manifest)
+      ~loc:(sub.location sub ptype_loc)
+      ~attrs:(sub.attributes sub ptype_attributes)
+
+  let map_type_kind sub = function
+    | Ptype_abstract -> Pt.Ptype_abstract
+    | Ptype_variant l ->
+      Ptype_variant (List.map (sub.constructor_declaration sub) l)
+    | Ptype_record l -> Ptype_record (List.map (sub.label_declaration sub) l)
+    | Ptype_open -> Ptype_open
+
+  let map_constructor_arguments sub = function
+    | Pcstr_tuple l -> Pt.Pcstr_tuple (List.map (sub.typ sub) l)
+    | Pcstr_record l -> Pt.Pcstr_record (List.map (sub.label_declaration sub) l)
+
+  let map_type_extension sub
+      {
+        ptyext_path;
+        ptyext_params;
+        ptyext_constructors;
+        ptyext_private;
+        ptyext_attributes;
+      } =
+    Te.mk (map_loc sub ptyext_path)
+      (List.map (sub.extension_constructor sub) ptyext_constructors)
+      ~params:(List.map (map_fst (sub.typ sub)) ptyext_params)
+      ~priv:ptyext_private
+      ~attrs:(sub.attributes sub ptyext_attributes)
+
+  let map_extension_constructor_kind sub = function
+    | Pext_decl (ctl, cto) ->
+      Pt.Pext_decl (map_constructor_arguments sub ctl, map_opt (sub.typ sub) cto)
+    | Pext_rebind li -> Pext_rebind (map_loc sub li)
+
+  let map_extension_constructor sub
+      {pext_name; pext_kind; pext_loc; pext_attributes} =
+    Te.constructor (map_loc sub pext_name)
+      (map_extension_constructor_kind sub pext_kind)
+      ~loc:(sub.location sub pext_loc)
+      ~attrs:(sub.attributes sub pext_attributes)
+end
+
+module MT = struct
+  (* Type expressions for the module language *)
+
+  let map sub {pmty_desc = desc; pmty_loc = loc; pmty_attributes = attrs} =
+    let open Mty in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Pmty_ident s -> ident ~loc ~attrs (map_loc sub s)
+    | Pmty_alias s -> alias ~loc ~attrs (map_loc sub s)
+    | Pmty_signature sg -> signature ~loc ~attrs (sub.signature sub sg)
+    | Pmty_functor (s, mt1, mt2) ->
+      functor_ ~loc ~attrs (map_loc sub s)
+        (Misc.may_map (sub.module_type sub) mt1)
+        (sub.module_type sub mt2)
+    | Pmty_with (mt, l) ->
+      with_ ~loc ~attrs (sub.module_type sub mt)
+        (List.map (sub.with_constraint sub) l)
+    | Pmty_typeof me -> typeof_ ~loc ~attrs (sub.module_expr sub me)
+    | Pmty_extension x -> extension ~loc ~attrs (sub.extension sub x)
+
+  let map_with_constraint sub = function
+    | Pwith_type (lid, d) ->
+      Pt.Pwith_type (map_loc sub lid, sub.type_declaration sub d)
+    | Pwith_module (lid, lid2) ->
+      Pwith_module (map_loc sub lid, map_loc sub lid2)
+    | Pwith_typesubst (lid, d) ->
+      Pwith_typesubst (map_loc sub lid, sub.type_declaration sub d)
+    | Pwith_modsubst (s, lid) -> Pwith_modsubst (map_loc sub s, map_loc sub lid)
+
+  let map_signature_item sub {psig_desc = desc; psig_loc = loc} =
+    let open Sig in
+    let loc = sub.location sub loc in
+    match desc with
+    | Psig_value vd -> value ~loc (sub.value_description sub vd)
+    | Psig_type (rf, l) -> type_ ~loc rf (List.map (sub.type_declaration sub) l)
+    | Psig_typext te -> type_extension ~loc (sub.type_extension sub te)
+    | Psig_exception ed -> exception_ ~loc (sub.extension_constructor sub ed)
+    | Psig_module x -> module_ ~loc (sub.module_declaration sub x)
+    | Psig_recmodule l ->
+      rec_module ~loc (List.map (sub.module_declaration sub) l)
+    | Psig_modtype x -> modtype ~loc (sub.module_type_declaration sub x)
+    | Psig_open x -> open_ ~loc (sub.open_description sub x)
+    | Psig_include x -> include_ ~loc (sub.include_description sub x)
+    | Psig_class _ -> assert false
+    | Psig_class_type _ -> assert false
+    | Psig_extension (x, attrs) ->
+      extension ~loc (sub.extension sub x) ~attrs:(sub.attributes sub attrs)
+    | Psig_attribute x -> attribute ~loc (sub.attribute sub x)
+end
+
+module M = struct
+  (* Value expressions for the module language *)
+
+  let map sub {pmod_loc = loc; pmod_desc = desc; pmod_attributes = attrs} =
+    let open Mod in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Pmod_ident x -> ident ~loc ~attrs (map_loc sub x)
+    | Pmod_structure str -> structure ~loc ~attrs (sub.structure sub str)
+    | Pmod_functor (arg, arg_ty, body) ->
+      functor_ ~loc ~attrs (map_loc sub arg)
+        (Misc.may_map (sub.module_type sub) arg_ty)
+        (sub.module_expr sub body)
+    | Pmod_apply (m1, m2) ->
+      apply ~loc ~attrs (sub.module_expr sub m1) (sub.module_expr sub m2)
+    | Pmod_constraint (m, mty) ->
+      constraint_ ~loc ~attrs (sub.module_expr sub m) (sub.module_type sub mty)
+    | Pmod_unpack e -> unpack ~loc ~attrs (sub.expr sub e)
+    | Pmod_extension x -> extension ~loc ~attrs (sub.extension sub x)
+
+  let map_structure_item sub {pstr_loc = loc; pstr_desc = desc} =
+    let open Str in
+    let loc = sub.location sub loc in
+    match desc with
+    | Pstr_eval (x, attrs) ->
+      eval ~loc ~attrs:(sub.attributes sub attrs) (sub.expr sub x)
+    | Pstr_value (r, vbs) -> value ~loc r (List.map (sub.value_binding sub) vbs)
+    | Pstr_primitive vd -> primitive ~loc (sub.value_description sub vd)
+    | Pstr_type (rf, l) -> type_ ~loc rf (List.map (sub.type_declaration sub) l)
+    | Pstr_typext te -> type_extension ~loc (sub.type_extension sub te)
+    | Pstr_exception ed -> exception_ ~loc (sub.extension_constructor sub ed)
+    | Pstr_module x -> module_ ~loc (sub.module_binding sub x)
+    | Pstr_recmodule l -> rec_module ~loc (List.map (sub.module_binding sub) l)
+    | Pstr_modtype x -> modtype ~loc (sub.module_type_declaration sub x)
+    | Pstr_open x -> open_ ~loc (sub.open_description sub x)
+    | Pstr_class () -> failwith "Pstr_class is no longer present in ReScript"
+    | Pstr_class_type () ->
+      failwith "Pstr_class_type is no longer present in ReScript"
+    | Pstr_include x -> include_ ~loc (sub.include_declaration sub x)
+    | Pstr_extension (x, attrs) ->
+      extension ~loc (sub.extension sub x) ~attrs:(sub.attributes sub attrs)
+    | Pstr_attribute x -> attribute ~loc (sub.attribute sub x)
+end
+
+module E = struct
+  (* Value expressions for the core language *)
+
+  let has_await_attribute attrs =
+    List.exists
+      (function
+        | {Location.txt = "res.await"}, _ -> true
+        | _ -> false)
+      attrs
+
+  let remove_await_attribute attrs =
+    List.filter
+      (function
+        | {Location.txt = "res.await"}, _ -> false
+        | _ -> true)
+      attrs
+
+  let map_jsx_children sub (e : expression) : Pt.jsx_children =
+    let rec visit (e : expression) : Pt.expression list =
+      match e.pexp_desc with
+      | Pexp_construct
+          ({txt = Longident.Lident "::"}, Some {pexp_desc = Pexp_tuple [e1; e2]})
+        ->
+        sub.expr sub e1 :: visit e2
+      | Pexp_construct ({txt = Longident.Lident "[]"}, ext_opt) -> (
+        match ext_opt with
+        | None -> []
+        | Some e -> visit e)
+      | _ -> [sub.expr sub e]
+    in
+    match e.pexp_desc with
+    | Pexp_construct ({txt = Longident.Lident "[]" | Longident.Lident "::"}, _)
+      ->
+      visit e
+    | _ -> [sub.expr sub e]
+
+  let try_map_jsx_prop (sub : mapper) (lbl : Asttypes.Noloc.arg_label)
+      (e : expression) : Parsetree.jsx_prop option =
+    match (lbl, e) with
+    | Asttypes.Noloc.Labelled "_spreadProps", expr ->
+      Some (Parsetree.JSXPropSpreading (Location.none, sub.expr sub expr))
+    | ( Asttypes.Noloc.Labelled name,
+        {pexp_desc = Pexp_ident {txt = Longident.Lident v}; pexp_loc = name_loc}
+      )
+      when name = v ->
+      Some (Parsetree.JSXPropPunning (false, {txt = name; loc = name_loc}))
+    | ( Asttypes.Noloc.Optional name,
+        {pexp_desc = Pexp_ident {txt = Longident.Lident v}; pexp_loc = name_loc}
+      )
+      when name = v ->
+      Some (Parsetree.JSXPropPunning (true, {txt = name; loc = name_loc}))
+    | Asttypes.Noloc.Labelled name, exp ->
+      Some
+        (Parsetree.JSXPropValue
+           ({txt = name; loc = Location.none}, false, sub.expr sub exp))
+    | Asttypes.Noloc.Optional name, exp ->
+      Some
+        (Parsetree.JSXPropValue
+           ({txt = name; loc = Location.none}, true, sub.expr sub exp))
+    | _ -> None
+
+  let extract_props_and_children (sub : mapper) items =
+    let rec visit props items =
+      match items with
+      | [] | [_] -> (List.rev props, None)
+      | [(Asttypes.Noloc.Labelled "children", children_expr); _] ->
+        (List.rev props, Some (map_jsx_children sub children_expr))
+      | (lbl, e) :: rest -> (
+        match try_map_jsx_prop sub lbl e with
+        | Some prop -> visit (prop :: props) rest
+        | None -> visit props rest)
+    in
+    let props, children = visit [] items in
+    (props, children)
+
+  let map sub e =
+    let {pexp_loc = loc; pexp_desc = desc; pexp_attributes = attrs} = e in
+    let open Exp in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    let has_jsx_attribute () =
+      attrs |> List.exists (fun ({txt}, _) -> txt = "JSX")
+    in
+    match desc with
+    | _ when has_await_attribute attrs ->
+      let attrs = remove_await_attribute e.pexp_attributes in
+      let e = sub.expr sub {e with pexp_attributes = attrs} in
+      await ~loc e
+    | Pexp_ident x -> ident ~loc ~attrs (map_loc sub x)
+    | Pexp_constant x -> constant ~loc ~attrs (map_constant x)
+    | Pexp_let (r, vbs, e) ->
+      let_ ~loc ~attrs r (List.map (sub.value_binding sub) vbs) (sub.expr sub e)
+    | Pexp_fun (lab, def, p, e) ->
+      let lab = Asttypes.to_arg_label lab in
+      let async = Ext_list.exists attrs (fun ({txt}, _) -> txt = "res.async") in
+      fun_ ~loc ~attrs ~async ~arity:None lab
+        (map_opt (sub.expr sub) def)
+        (sub.pat sub p) (sub.expr sub e)
+    | Pexp_function _ -> assert false
+    | Pexp_apply ({pexp_desc = Pexp_ident tag_name}, args)
+      when has_jsx_attribute () -> (
+      let attrs = attrs |> List.filter (fun ({txt}, _) -> txt <> "JSX") in
+      let props, children = extract_props_and_children sub args in
+      let jsx_tag : Pt.jsx_tag_name =
+        match tag_name.txt with
+        | Longident.Lident s
+          when String.length s > 0 && Char.lowercase_ascii s.[0] = s.[0] ->
+          Pt.JsxLowerTag s
+        | Longident.Lident _ -> Pt.JsxUpperTag tag_name.txt
+        | Longident.Ldot (path, last)
+          when String.length last > 0
+               && Char.lowercase_ascii last.[0] = last.[0] ->
+          Pt.JsxQualifiedLowerTag {path; name = last}
+        | _ -> Pt.JsxUpperTag tag_name.txt
+      in
+      let jsx_tag_name = {txt = jsx_tag; loc = tag_name.loc} in
+      match children with
+      | None -> jsx_unary_element ~loc ~attrs jsx_tag_name props
+      | Some children ->
+        jsx_container_element ~loc ~attrs jsx_tag_name props Lexing.dummy_pos
+          children None)
+    | Pexp_apply (e, l) ->
+      let e =
+        match (e.pexp_desc, l) with
+        | ( Pexp_ident ({txt = Longident.Lident "|."} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "->"}}
+        | ( Pexp_ident ({txt = Longident.Lident "^"} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "++"}}
+        | ( Pexp_ident ({txt = Longident.Lident "<>"} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "!="}}
+        | ( Pexp_ident ({txt = Longident.Lident "!="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {
+            e with
+            pexp_desc = Pexp_ident {lid with txt = Longident.Lident "!=="};
+          }
+        | ( Pexp_ident ({txt = Longident.Lident "="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "=="}}
+        | ( Pexp_ident ({txt = Longident.Lident "=="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {
+            e with
+            pexp_desc = Pexp_ident {lid with txt = Longident.Lident "==="};
+          }
+        | _ -> e
+      in
+      let process_partial_app_attribute attrs =
+        let rec process partial_app acc attrs =
+          match attrs with
+          | [] -> (partial_app, List.rev acc)
+          | ({Location.txt = "res.partial"}, _) :: rest -> process true acc rest
+          | attr :: rest -> process partial_app (attr :: acc) rest
+        in
+        process false [] attrs
+      in
+      let partial, attrs = process_partial_app_attribute attrs in
+      apply ~loc ~attrs ~partial (sub.expr sub e)
+        (List.map
+           (fun (lbl, e) -> (Asttypes.to_arg_label lbl, sub.expr sub e))
+           l)
+    | Pexp_match (e, pel) ->
+      match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
+    | Pexp_try (e, pel) -> try_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
+    | Pexp_tuple el -> tuple ~loc ~attrs (List.map (sub.expr sub) el)
+    (* <></> *)
+    | Pexp_construct ({txt = Longident.Lident "[]" | Longident.Lident "::"}, _)
+      when has_jsx_attribute () ->
+      let attrs = attrs |> List.filter (fun ({txt}, _) -> txt <> "JSX") in
+      jsx_fragment ~loc ~attrs loc.loc_start (map_jsx_children sub e)
+        loc.loc_end
+    | Pexp_construct (lid, arg) -> (
+      let lid1 = map_loc sub lid in
+      let arg1 = map_opt (sub.expr sub) arg in
+      let exp1 = construct ~loc ~attrs lid1 arg1 in
+      match lid.txt with
+      | Lident "Function$" -> (
+        let rec attributes_to_arity (attrs : Parsetree.attributes) =
+          match attrs with
+          | ( {txt = "res.arity"},
+              PStr
+                [
+                  {
+                    pstr_desc =
+                      Pstr_eval
+                        ( {pexp_desc = Pexp_constant (Pconst_integer (arity, _))},
+                          _ );
+                  };
+                ] )
+            :: _ ->
+            int_of_string arity
+          | _ :: rest -> attributes_to_arity rest
+          | [] -> assert false
+        in
+        match arg1 with
+        | Some ({pexp_desc = Pexp_fun f} as e1) ->
+          let arity = Some (attributes_to_arity attrs) in
+          {e1 with pexp_desc = Pexp_fun {f with arity}}
+        | _ -> exp1)
+      | _ -> exp1)
+    | Pexp_variant (lab, eo) ->
+      variant ~loc ~attrs lab (map_opt (sub.expr sub) eo)
+    | Pexp_record (l, eo) ->
+      record ~loc ~attrs
+        (Ext_list.map l (fun (lid, e) ->
+             let lid1 = map_loc sub lid in
+             let e1 = sub.expr sub e in
+             let optional, attrs =
+               Parsetree0.get_optional_attr e1.pexp_attributes
+             in
+             {
+               Pt.lid = lid1;
+               x = {e1 with pexp_attributes = attrs};
+               opt = optional;
+             }))
+        (map_opt (sub.expr sub) eo)
+    | Pexp_field (e, lid) ->
+      field ~loc ~attrs (sub.expr sub e) (map_loc sub lid)
+    | Pexp_setfield (e1, lid, e2) ->
+      setfield ~loc ~attrs (sub.expr sub e1) (map_loc sub lid) (sub.expr sub e2)
+    | Pexp_array el -> array ~loc ~attrs (List.map (sub.expr sub) el)
+    | Pexp_ifthenelse (e1, e2, e3) ->
+      ifthenelse ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
+        (map_opt (sub.expr sub) e3)
+    | Pexp_sequence (e1, e2) ->
+      sequence ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
+    | Pexp_while (e1, e2) ->
+      while_ ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
+    | Pexp_for (p, e1, e2, d, e3) ->
+      for_ ~loc ~attrs (sub.pat sub p) (sub.expr sub e1) (sub.expr sub e2) d
+        (sub.expr sub e3)
+    | Pexp_coerce (e, (), t2) ->
+      coerce ~loc ~attrs (sub.expr sub e) (sub.typ sub t2)
+    | Pexp_constraint (e, t) ->
+      constraint_ ~loc ~attrs (sub.expr sub e) (sub.typ sub t)
+    | Pexp_send (e, s) -> send ~loc ~attrs (sub.expr sub e) (map_loc sub s)
+    | Pexp_new _ -> failwith "Pexp_new is no longer present in ReScript"
+    | Pexp_setinstvar _ ->
+      failwith "Pexp_setinstvar is no longer present in ReScript"
+    | Pexp_override _ ->
+      failwith "Pexp_override is no longer present in ReScript"
+    | Pexp_letmodule (s, me, e) ->
+      letmodule ~loc ~attrs (map_loc sub s) (sub.module_expr sub me)
+        (sub.expr sub e)
+    | Pexp_letexception (cd, e) ->
+      letexception ~loc ~attrs
+        (sub.extension_constructor sub cd)
+        (sub.expr sub e)
+    | Pexp_assert e -> assert_ ~loc ~attrs (sub.expr sub e)
+    | Pexp_lazy _ -> failwith "Pexp_lazy is no longer present in ReScript"
+    | Pexp_poly _ -> failwith "Pexp_poly is no longer present in ReScript"
+    | Pexp_object () -> assert false
+    | Pexp_newtype (s, e) ->
+      newtype ~loc ~attrs (map_loc sub s) (sub.expr sub e)
+    | Pexp_pack me -> pack ~loc ~attrs (sub.module_expr sub me)
+    | Pexp_open (ovf, lid, e) ->
+      open_ ~loc ~attrs ovf (map_loc sub lid) (sub.expr sub e)
+    | Pexp_extension x -> extension ~loc ~attrs (sub.extension sub x)
+    | Pexp_unreachable -> assert false
+end
+
+module P = struct
+  (* Patterns *)
+
+  let map sub {ppat_desc = desc; ppat_loc = loc; ppat_attributes = attrs} =
+    let open Pat in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Ppat_any -> any ~loc ~attrs ()
+    | Ppat_var s -> var ~loc ~attrs (map_loc sub s)
+    | Ppat_alias (p, s) -> alias ~loc ~attrs (sub.pat sub p) (map_loc sub s)
+    | Ppat_constant c -> constant ~loc ~attrs (map_constant c)
+    | Ppat_interval (c1, c2) ->
+      interval ~loc ~attrs (map_constant c1) (map_constant c2)
+    | Ppat_tuple pl -> tuple ~loc ~attrs (List.map (sub.pat sub) pl)
+    | Ppat_construct (l, p) ->
+      construct ~loc ~attrs (map_loc sub l) (map_opt (sub.pat sub) p)
+    | Ppat_variant (l, p) -> variant ~loc ~attrs l (map_opt (sub.pat sub) p)
+    | Ppat_record (lpl, cf) ->
+      record ~loc ~attrs
+        (Ext_list.map lpl (fun (lid, p) ->
+             let lid1 = map_loc sub lid in
+             let p1 = sub.pat sub p in
+             let optional, attrs =
+               Parsetree0.get_optional_attr p1.ppat_attributes
+             in
+             {
+               Pt.lid = lid1;
+               x = {p1 with ppat_attributes = attrs};
+               opt = optional;
+             }))
+        cf
+    | Ppat_array pl -> array ~loc ~attrs (List.map (sub.pat sub) pl)
+    | Ppat_or (p1, p2) -> or_ ~loc ~attrs (sub.pat sub p1) (sub.pat sub p2)
+    | Ppat_constraint (p, t) ->
+      constraint_ ~loc ~attrs (sub.pat sub p) (sub.typ sub t)
+    | Ppat_type s -> type_ ~loc ~attrs (map_loc sub s)
+    | Ppat_lazy _ -> failwith "Ppat_lazy is no longer present in ReScript"
+    | Ppat_unpack s -> unpack ~loc ~attrs (map_loc sub s)
+    | Ppat_open (lid, p) -> open_ ~loc ~attrs (map_loc sub lid) (sub.pat sub p)
+    | Ppat_exception p -> exception_ ~loc ~attrs (sub.pat sub p)
+    | Ppat_extension x -> extension ~loc ~attrs (sub.extension sub x)
+end
+
+(* Now, a generic AST mapper, to be extended to cover all kinds and
+   cases of the OCaml grammar.  The default behavior of the mapper is
+   the identity. *)
+
+let default_mapper =
+  {
+    structure = (fun this l -> List.map (this.structure_item this) l);
+    structure_item = M.map_structure_item;
+    module_expr = M.map;
+    signature = (fun this l -> List.map (this.signature_item this) l);
+    signature_item = MT.map_signature_item;
+    module_type = MT.map;
+    with_constraint = MT.map_with_constraint;
+    type_declaration = T.map_type_declaration;
+    type_kind = T.map_type_kind;
+    typ = T.map;
+    type_extension = T.map_type_extension;
+    extension_constructor = T.map_extension_constructor;
+    value_description =
+      (fun this {pval_name; pval_type; pval_prim; pval_loc; pval_attributes} ->
+        Val.mk (map_loc this pval_name) (this.typ this pval_type)
+          ~attrs:(this.attributes this pval_attributes)
+          ~loc:(this.location this pval_loc)
+          ~prim:pval_prim);
+    pat = P.map;
+    expr = E.map;
+    module_declaration =
+      (fun this {pmd_name; pmd_type; pmd_attributes; pmd_loc} ->
+        Md.mk (map_loc this pmd_name)
+          (this.module_type this pmd_type)
+          ~attrs:(this.attributes this pmd_attributes)
+          ~loc:(this.location this pmd_loc));
+    module_type_declaration =
+      (fun this {pmtd_name; pmtd_type; pmtd_attributes; pmtd_loc} ->
+        Mtd.mk (map_loc this pmtd_name)
+          ?typ:(map_opt (this.module_type this) pmtd_type)
+          ~attrs:(this.attributes this pmtd_attributes)
+          ~loc:(this.location this pmtd_loc));
+    module_binding =
+      (fun this {pmb_name; pmb_expr; pmb_attributes; pmb_loc} ->
+        Mb.mk (map_loc this pmb_name)
+          (this.module_expr this pmb_expr)
+          ~attrs:(this.attributes this pmb_attributes)
+          ~loc:(this.location this pmb_loc));
+    open_description =
+      (fun this {popen_lid; popen_override; popen_attributes; popen_loc} ->
+        Opn.mk (map_loc this popen_lid) ~override:popen_override
+          ~loc:(this.location this popen_loc)
+          ~attrs:(this.attributes this popen_attributes));
+    include_description =
+      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
+        Incl.mk
+          (this.module_type this pincl_mod)
+          ~loc:(this.location this pincl_loc)
+          ~attrs:(this.attributes this pincl_attributes));
+    include_declaration =
+      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
+        Incl.mk
+          (this.module_expr this pincl_mod)
+          ~loc:(this.location this pincl_loc)
+          ~attrs:(this.attributes this pincl_attributes));
+    value_binding =
+      (fun this {pvb_pat; pvb_expr; pvb_attributes; pvb_loc} ->
+        Vb.mk (this.pat this pvb_pat) (this.expr this pvb_expr)
+          ~loc:(this.location this pvb_loc)
+          ~attrs:(this.attributes this pvb_attributes));
+    constructor_declaration =
+      (fun this {pcd_name; pcd_args; pcd_res; pcd_loc; pcd_attributes} ->
+        Type.constructor (map_loc this pcd_name)
+          ~args:(T.map_constructor_arguments this pcd_args)
+          ?res:(map_opt (this.typ this) pcd_res)
+          ~loc:(this.location this pcd_loc)
+          ~attrs:(this.attributes this pcd_attributes));
+    label_declaration =
+      (fun this {pld_name; pld_type; pld_loc; pld_mutable; pld_attributes} ->
+        let optional, attrs =
+          Parsetree0.get_optional_attr (this.attributes this pld_attributes)
+        in
+        Type.field (map_loc this pld_name) (this.typ this pld_type)
+          ~mut:pld_mutable ~optional
+          ~loc:(this.location this pld_loc)
+          ~attrs);
+    cases = (fun this l -> List.map (this.case this) l);
+    case =
+      (fun this {pc_lhs; pc_guard; pc_rhs} ->
+        {
+          pc_bar = None;
+          pc_lhs = this.pat this pc_lhs;
+          pc_guard = map_opt (this.expr this) pc_guard;
+          pc_rhs = this.expr this pc_rhs;
+        });
+    location = (fun _this l -> l);
+    extension = (fun this (s, e) -> (map_loc this s, this.payload this e));
+    attribute = (fun this (s, e) -> (map_loc this s, this.payload this e));
+    attributes = (fun this l -> List.map (this.attribute this) l);
+    payload =
+      (fun this -> function
+        | PStr x -> PStr (this.structure this x)
+        | PSig x -> PSig (this.signature this x)
+        | PTyp x -> PTyp (this.typ this x)
+        | PPat (x, g) -> PPat (this.pat this x, map_opt (this.expr this) g));
+  }
diff --git a/compiler/ml/ast_mapper_to0.ml b/compiler/ml/ast_mapper_to0.ml
new file mode 100644
index 0000000..d0ac43d
--- /dev/null
+++ b/compiler/ml/ast_mapper_to0.ml
@@ -0,0 +1,684 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                         Alain Frisch, LexiFi                           *)
+(*                                                                        *)
+(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* A generic Parsetree mapping class *)
+
+(*
+[@@@warning "+9"]
+  (* Ensure that record patterns don't miss any field. *)
+*)
+
+open Parsetree
+open Ast_helper0
+open Location
+module Pt = Parsetree0
+
+type mapper = {
+  attribute: mapper -> attribute -> Pt.attribute;
+  attributes: mapper -> attribute list -> Pt.attribute list;
+  case: mapper -> case -> Pt.case;
+  cases: mapper -> case list -> Pt.case list;
+  constructor_declaration:
+    mapper -> constructor_declaration -> Pt.constructor_declaration;
+  expr: mapper -> expression -> Pt.expression;
+  extension: mapper -> extension -> Pt.extension;
+  extension_constructor:
+    mapper -> extension_constructor -> Pt.extension_constructor;
+  include_declaration: mapper -> include_declaration -> Pt.include_declaration;
+  include_description: mapper -> include_description -> Pt.include_description;
+  label_declaration: mapper -> label_declaration -> Pt.label_declaration;
+  location: mapper -> Location.t -> Location.t;
+  module_binding: mapper -> module_binding -> Pt.module_binding;
+  module_declaration: mapper -> module_declaration -> Pt.module_declaration;
+  module_expr: mapper -> module_expr -> Pt.module_expr;
+  module_type: mapper -> module_type -> Pt.module_type;
+  module_type_declaration:
+    mapper -> module_type_declaration -> Pt.module_type_declaration;
+  open_description: mapper -> open_description -> Pt.open_description;
+  pat: mapper -> pattern -> Pt.pattern;
+  payload: mapper -> payload -> Pt.payload;
+  signature: mapper -> signature -> Pt.signature;
+  signature_item: mapper -> signature_item -> Pt.signature_item;
+  structure: mapper -> structure -> Pt.structure;
+  structure_item: mapper -> structure_item -> Pt.structure_item;
+  typ: mapper -> core_type -> Pt.core_type;
+  type_declaration: mapper -> type_declaration -> Pt.type_declaration;
+  type_extension: mapper -> type_extension -> Pt.type_extension;
+  type_kind: mapper -> type_kind -> Pt.type_kind;
+  value_binding: mapper -> value_binding -> Pt.value_binding;
+  value_description: mapper -> value_description -> Pt.value_description;
+  with_constraint: mapper -> with_constraint -> Pt.with_constraint;
+}
+
+let map_fst f (x, y) = (f x, y)
+let map_snd f (x, y) = (x, f y)
+let map_tuple f1 f2 (x, y) = (f1 x, f2 y)
+let map_tuple3 f1 f2 f3 (x, y, z) = (f1 x, f2 y, f3 z)
+let map_opt f = function
+  | None -> None
+  | Some x -> Some (f x)
+let map_constant = function
+  | Pconst_integer (s, suffix) -> Pt.Pconst_integer (s, suffix)
+  | Pconst_char c -> Pconst_char c
+  | Pconst_string (s, q) -> Pconst_string (s, q)
+  | Pconst_float (s, suffix) -> Pconst_float (s, suffix)
+
+let map_loc sub {loc; txt} = {loc = sub.location sub loc; txt}
+
+module T = struct
+  (* Type expressions for the core language *)
+
+  let row_field sub = function
+    | Rtag (l, attrs, b, tl) ->
+      Pt.Rtag
+        (map_loc sub l, sub.attributes sub attrs, b, List.map (sub.typ sub) tl)
+    | Rinherit t -> Rinherit (sub.typ sub t)
+
+  let object_field sub = function
+    | Otag (l, attrs, t) ->
+      Pt.Otag (map_loc sub l, sub.attributes sub attrs, sub.typ sub t)
+    | Oinherit t -> Oinherit (sub.typ sub t)
+
+  let map sub {ptyp_desc = desc; ptyp_loc = loc; ptyp_attributes = attrs} =
+    let open Typ in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Ptyp_any -> any ~loc ~attrs ()
+    | Ptyp_var s -> var ~loc ~attrs s
+    | Ptyp_arrow {arg; ret; arity} -> (
+      let lbl = Asttypes.to_noloc arg.lbl in
+      let typ0 =
+        arrow ~loc
+          ~attrs:(attrs @ sub.attributes sub arg.attrs)
+          lbl (sub.typ sub arg.typ) (sub.typ sub ret)
+      in
+      match arity with
+      | None -> typ0
+      | Some arity ->
+        let arity_string = "Has_arity" ^ string_of_int arity in
+        let arity_type =
+          Ast_helper0.Typ.variant ~loc
+            [Rtag (Location.mknoloc arity_string, [], true, [])]
+            Closed None
+        in
+        Ast_helper0.Typ.constr ~loc
+          {txt = Lident "function$"; loc}
+          [typ0; arity_type])
+    | Ptyp_tuple tyl -> tuple ~loc ~attrs (List.map (sub.typ sub) tyl)
+    | Ptyp_constr (lid, tl) ->
+      constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tl)
+    | Ptyp_object (l, o) ->
+      object_ ~loc ~attrs (List.map (object_field sub) l) o
+    | Ptyp_alias (t, s) -> alias ~loc ~attrs (sub.typ sub t) s
+    | Ptyp_variant (rl, b, ll) ->
+      variant ~loc ~attrs (List.map (row_field sub) rl) b ll
+    | Ptyp_poly (sl, t) ->
+      poly ~loc ~attrs (List.map (map_loc sub) sl) (sub.typ sub t)
+    | Ptyp_package (lid, l) ->
+      package ~loc ~attrs (map_loc sub lid)
+        (List.map (map_tuple (map_loc sub) (sub.typ sub)) l)
+    | Ptyp_extension x -> extension ~loc ~attrs (sub.extension sub x)
+
+  let map_type_declaration sub
+      {
+        ptype_name;
+        ptype_params;
+        ptype_cstrs;
+        ptype_kind;
+        ptype_private;
+        ptype_manifest;
+        ptype_attributes;
+        ptype_loc;
+      } =
+    Type.mk (map_loc sub ptype_name)
+      ~params:(List.map (map_fst (sub.typ sub)) ptype_params)
+      ~priv:ptype_private
+      ~cstrs:
+        (List.map
+           (map_tuple3 (sub.typ sub) (sub.typ sub) (sub.location sub))
+           ptype_cstrs)
+      ~kind:(sub.type_kind sub ptype_kind)
+      ?manifest:(map_opt (sub.typ sub) ptype_manifest)
+      ~loc:(sub.location sub ptype_loc)
+      ~attrs:(sub.attributes sub ptype_attributes)
+
+  let map_type_kind sub = function
+    | Ptype_abstract -> Pt.Ptype_abstract
+    | Ptype_variant l ->
+      Ptype_variant (List.map (sub.constructor_declaration sub) l)
+    | Ptype_record l -> Ptype_record (List.map (sub.label_declaration sub) l)
+    | Ptype_open -> Ptype_open
+
+  let map_constructor_arguments sub = function
+    | Pcstr_tuple l -> Pt.Pcstr_tuple (List.map (sub.typ sub) l)
+    | Pcstr_record l -> Pt.Pcstr_record (List.map (sub.label_declaration sub) l)
+
+  let map_type_extension sub
+      {
+        ptyext_path;
+        ptyext_params;
+        ptyext_constructors;
+        ptyext_private;
+        ptyext_attributes;
+      } =
+    Te.mk (map_loc sub ptyext_path)
+      (List.map (sub.extension_constructor sub) ptyext_constructors)
+      ~params:(List.map (map_fst (sub.typ sub)) ptyext_params)
+      ~priv:ptyext_private
+      ~attrs:(sub.attributes sub ptyext_attributes)
+
+  let map_extension_constructor_kind sub = function
+    | Pext_decl (ctl, cto) ->
+      Pt.Pext_decl (map_constructor_arguments sub ctl, map_opt (sub.typ sub) cto)
+    | Pext_rebind li -> Pext_rebind (map_loc sub li)
+
+  let map_extension_constructor sub
+      {pext_name; pext_kind; pext_loc; pext_attributes} =
+    Te.constructor (map_loc sub pext_name)
+      (map_extension_constructor_kind sub pext_kind)
+      ~loc:(sub.location sub pext_loc)
+      ~attrs:(sub.attributes sub pext_attributes)
+end
+
+module MT = struct
+  (* Type expressions for the module language *)
+
+  let map sub {pmty_desc = desc; pmty_loc = loc; pmty_attributes = attrs} =
+    let open Mty in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Pmty_ident s -> ident ~loc ~attrs (map_loc sub s)
+    | Pmty_alias s -> alias ~loc ~attrs (map_loc sub s)
+    | Pmty_signature sg -> signature ~loc ~attrs (sub.signature sub sg)
+    | Pmty_functor (s, mt1, mt2) ->
+      functor_ ~loc ~attrs (map_loc sub s)
+        (Misc.may_map (sub.module_type sub) mt1)
+        (sub.module_type sub mt2)
+    | Pmty_with (mt, l) ->
+      with_ ~loc ~attrs (sub.module_type sub mt)
+        (List.map (sub.with_constraint sub) l)
+    | Pmty_typeof me -> typeof_ ~loc ~attrs (sub.module_expr sub me)
+    | Pmty_extension x -> extension ~loc ~attrs (sub.extension sub x)
+
+  let map_with_constraint sub = function
+    | Pwith_type (lid, d) ->
+      Pt.Pwith_type (map_loc sub lid, sub.type_declaration sub d)
+    | Pwith_module (lid, lid2) ->
+      Pwith_module (map_loc sub lid, map_loc sub lid2)
+    | Pwith_typesubst (lid, d) ->
+      Pwith_typesubst (map_loc sub lid, sub.type_declaration sub d)
+    | Pwith_modsubst (s, lid) -> Pwith_modsubst (map_loc sub s, map_loc sub lid)
+
+  let map_signature_item sub {psig_desc = desc; psig_loc = loc} =
+    let open Sig in
+    let loc = sub.location sub loc in
+    match desc with
+    | Psig_value vd -> value ~loc (sub.value_description sub vd)
+    | Psig_type (rf, l) -> type_ ~loc rf (List.map (sub.type_declaration sub) l)
+    | Psig_typext te -> type_extension ~loc (sub.type_extension sub te)
+    | Psig_exception ed -> exception_ ~loc (sub.extension_constructor sub ed)
+    | Psig_module x -> module_ ~loc (sub.module_declaration sub x)
+    | Psig_recmodule l ->
+      rec_module ~loc (List.map (sub.module_declaration sub) l)
+    | Psig_modtype x -> modtype ~loc (sub.module_type_declaration sub x)
+    | Psig_open x -> open_ ~loc (sub.open_description sub x)
+    | Psig_include x -> include_ ~loc (sub.include_description sub x)
+    | Psig_extension (x, attrs) ->
+      extension ~loc (sub.extension sub x) ~attrs:(sub.attributes sub attrs)
+    | Psig_attribute x -> attribute ~loc (sub.attribute sub x)
+end
+
+module M = struct
+  (* Value expressions for the module language *)
+
+  let map sub {pmod_loc = loc; pmod_desc = desc; pmod_attributes = attrs} =
+    let open Mod in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Pmod_ident x -> ident ~loc ~attrs (map_loc sub x)
+    | Pmod_structure str -> structure ~loc ~attrs (sub.structure sub str)
+    | Pmod_functor (arg, arg_ty, body) ->
+      functor_ ~loc ~attrs (map_loc sub arg)
+        (Misc.may_map (sub.module_type sub) arg_ty)
+        (sub.module_expr sub body)
+    | Pmod_apply (m1, m2) ->
+      apply ~loc ~attrs (sub.module_expr sub m1) (sub.module_expr sub m2)
+    | Pmod_constraint (m, mty) ->
+      constraint_ ~loc ~attrs (sub.module_expr sub m) (sub.module_type sub mty)
+    | Pmod_unpack e -> unpack ~loc ~attrs (sub.expr sub e)
+    | Pmod_extension x -> extension ~loc ~attrs (sub.extension sub x)
+
+  let map_structure_item sub {pstr_loc = loc; pstr_desc = desc} =
+    let open Str in
+    let loc = sub.location sub loc in
+    match desc with
+    | Pstr_eval (x, attrs) ->
+      eval ~loc ~attrs:(sub.attributes sub attrs) (sub.expr sub x)
+    | Pstr_value (r, vbs) -> value ~loc r (List.map (sub.value_binding sub) vbs)
+    | Pstr_primitive vd -> primitive ~loc (sub.value_description sub vd)
+    | Pstr_type (rf, l) -> type_ ~loc rf (List.map (sub.type_declaration sub) l)
+    | Pstr_typext te -> type_extension ~loc (sub.type_extension sub te)
+    | Pstr_exception ed -> exception_ ~loc (sub.extension_constructor sub ed)
+    | Pstr_module x -> module_ ~loc (sub.module_binding sub x)
+    | Pstr_recmodule l -> rec_module ~loc (List.map (sub.module_binding sub) l)
+    | Pstr_modtype x -> modtype ~loc (sub.module_type_declaration sub x)
+    | Pstr_open x -> open_ ~loc (sub.open_description sub x)
+    | Pstr_include x -> include_ ~loc (sub.include_declaration sub x)
+    | Pstr_extension (x, attrs) ->
+      extension ~loc (sub.extension sub x) ~attrs:(sub.attributes sub attrs)
+    | Pstr_attribute x -> attribute ~loc (sub.attribute sub x)
+end
+
+module E = struct
+  let jsx_attr sub =
+    sub.attribute sub (Location.mknoloc "JSX", Parsetree.PStr [])
+
+  let offset_position (pos : Lexing.position) (offset : int) : Lexing.position =
+    if offset <= 0 then pos
+    else
+      let open Lexing in
+      let rec aux pos offset =
+        if offset <= 0 then pos
+        else if offset <= pos.pos_cnum - pos.pos_bol then
+          (* We're on the same line *)
+          {pos with pos_cnum = pos.pos_cnum - offset}
+        else
+          (* Move to previous line and continue *)
+          let remaining = offset - (pos.pos_cnum - pos.pos_bol) in
+          aux
+            {
+              pos with
+              pos_lnum = pos.pos_lnum - 1;
+              pos_cnum = pos.pos_bol;
+              pos_bol = max 0 (pos.pos_bol - remaining);
+            }
+            remaining
+      in
+      aux pos offset
+
+  let jsx_unit_expr =
+    Ast_helper0.Exp.construct ~loc:!Ast_helper0.default_loc
+      {txt = Lident "()"; loc = !Ast_helper0.default_loc}
+      None
+
+  let map_jsx_props sub props =
+    props
+    |> List.map (function
+         | JSXPropPunning (is_optional, name) ->
+           let ident =
+             Exp.ident ~loc:name.loc
+               {txt = Longident.Lident name.txt; loc = name.loc}
+           in
+           let label =
+             if is_optional then Asttypes.Noloc.Optional name.txt
+             else Asttypes.Noloc.Labelled name.txt
+           in
+           (label, ident)
+         | JSXPropValue (name, is_optional, value) ->
+           let label =
+             if is_optional then Asttypes.Noloc.Optional name.txt
+             else Asttypes.Noloc.Labelled name.txt
+           in
+           (label, sub.expr sub value)
+         | JSXPropSpreading (_, value) ->
+           (Asttypes.Noloc.Labelled "_spreadProps", sub.expr sub value))
+
+  let map_jsx_children sub loc children =
+    match children with
+    | xs ->
+      let list_expr = Ast_helper.Exp.make_list_expression loc xs None in
+      sub.expr sub list_expr
+
+  (* Value expressions for the core language *)
+
+  let map sub {pexp_loc = loc; pexp_desc = desc; pexp_attributes = attrs} =
+    let open Exp in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Pexp_ident x -> ident ~loc ~attrs (map_loc sub x)
+    | Pexp_constant x -> constant ~loc ~attrs (map_constant x)
+    | Pexp_let (r, vbs, e) ->
+      let_ ~loc ~attrs r (List.map (sub.value_binding sub) vbs) (sub.expr sub e)
+    | Pexp_fun {arg_label = lab; default = def; lhs = p; rhs = e; arity; async}
+      -> (
+      let lab = Asttypes.to_noloc lab in
+      let attrs =
+        if async then
+          ({txt = "res.async"; loc = Location.none}, Pt.PStr []) :: attrs
+        else attrs
+      in
+      let e =
+        fun_ ~loc ~attrs lab
+          (map_opt (sub.expr sub) def)
+          (sub.pat sub p) (sub.expr sub e)
+      in
+      match arity with
+      | None -> e
+      | Some arity ->
+        let arity_to_attributes arity =
+          [
+            ( Location.mknoloc "res.arity",
+              Parsetree0.PStr
+                [
+                  Ast_helper0.Str.eval
+                    (Ast_helper0.Exp.constant
+                       (Pconst_integer (string_of_int arity, None)));
+                ] );
+          ]
+        in
+        Ast_helper0.Exp.construct
+          ~attrs:(arity_to_attributes arity)
+          (Location.mkloc (Longident.Lident "Function$") e.pexp_loc)
+          (Some e))
+    | Pexp_apply {funct = e; args; partial} ->
+      let e =
+        match (e.pexp_desc, args) with
+        | ( Pexp_ident ({txt = Longident.Lident "->"} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "|."}}
+        | ( Pexp_ident ({txt = Longident.Lident "++"} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "^"}}
+        | ( Pexp_ident ({txt = Longident.Lident "!="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "<>"}}
+        | ( Pexp_ident ({txt = Longident.Lident "!=="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "!="}}
+        | ( Pexp_ident ({txt = Longident.Lident "==="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "=="}}
+        | ( Pexp_ident ({txt = Longident.Lident "=="} as lid),
+            [(Nolabel, _); (Nolabel, _)] ) ->
+          {e with pexp_desc = Pexp_ident {lid with txt = Longident.Lident "="}}
+        | _ -> e
+      in
+      let attrs =
+        if partial then (Location.mknoloc "res.partial", Pt.PStr []) :: attrs
+        else attrs
+      in
+      apply ~loc ~attrs (sub.expr sub e)
+        (List.map
+           (fun (lbl, e) -> (Asttypes.to_noloc lbl, sub.expr sub e))
+           args)
+    | Pexp_match (e, pel) ->
+      match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
+    | Pexp_try (e, pel) -> try_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
+    | Pexp_tuple el -> tuple ~loc ~attrs (List.map (sub.expr sub) el)
+    | Pexp_construct (lid, arg) ->
+      construct ~loc ~attrs (map_loc sub lid) (map_opt (sub.expr sub) arg)
+    | Pexp_variant (lab, eo) ->
+      variant ~loc ~attrs lab (map_opt (sub.expr sub) eo)
+    | Pexp_record (l, eo) ->
+      record ~loc ~attrs
+        (Ext_list.map l (fun {lid; x = e; opt = optional} ->
+             let lid1 = map_loc sub lid in
+             let e1 = sub.expr sub e in
+             let attr =
+               Parsetree0.add_optional_attr ~optional e1.pexp_attributes
+             in
+             (lid1, {e1 with pexp_attributes = attr})))
+        (map_opt (sub.expr sub) eo)
+    | Pexp_field (e, lid) ->
+      field ~loc ~attrs (sub.expr sub e) (map_loc sub lid)
+    | Pexp_setfield (e1, lid, e2) ->
+      setfield ~loc ~attrs (sub.expr sub e1) (map_loc sub lid) (sub.expr sub e2)
+    | Pexp_array el -> array ~loc ~attrs (List.map (sub.expr sub) el)
+    | Pexp_ifthenelse (e1, e2, e3) ->
+      ifthenelse ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
+        (map_opt (sub.expr sub) e3)
+    | Pexp_sequence (e1, e2) ->
+      sequence ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
+    | Pexp_while (e1, e2) ->
+      while_ ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
+    | Pexp_for (p, e1, e2, d, e3) ->
+      for_ ~loc ~attrs (sub.pat sub p) (sub.expr sub e1) (sub.expr sub e2) d
+        (sub.expr sub e3)
+    | Pexp_coerce (e, (), t2) ->
+      coerce ~loc ~attrs (sub.expr sub e) (sub.typ sub t2)
+    | Pexp_constraint (e, t) ->
+      constraint_ ~loc ~attrs (sub.expr sub e) (sub.typ sub t)
+    | Pexp_send (e, s) -> send ~loc ~attrs (sub.expr sub e) (map_loc sub s)
+    | Pexp_letmodule (s, me, e) ->
+      letmodule ~loc ~attrs (map_loc sub s) (sub.module_expr sub me)
+        (sub.expr sub e)
+    | Pexp_letexception (cd, e) ->
+      letexception ~loc ~attrs
+        (sub.extension_constructor sub cd)
+        (sub.expr sub e)
+    | Pexp_assert e -> assert_ ~loc ~attrs (sub.expr sub e)
+    | Pexp_newtype (s, e) ->
+      newtype ~loc ~attrs (map_loc sub s) (sub.expr sub e)
+    | Pexp_pack me -> pack ~loc ~attrs (sub.module_expr sub me)
+    | Pexp_open (ovf, lid, e) ->
+      open_ ~loc ~attrs ovf (map_loc sub lid) (sub.expr sub e)
+    | Pexp_extension x -> extension ~loc ~attrs (sub.extension sub x)
+    | Pexp_await e ->
+      let e = sub.expr sub e in
+      {
+        e with
+        pexp_attributes =
+          (Location.mknoloc "res.await", Pt.PStr []) :: e.pexp_attributes;
+      }
+    | Pexp_jsx_element
+        (Jsx_fragment
+           {
+             jsx_fragment_opening = o;
+             jsx_fragment_children = children;
+             jsx_fragment_closing = c;
+           }) ->
+      (*
+         The location of  Pexp_jsx_fragment is from the start of < till the end of />.
+         This is not the case in the old AST. There it is from >...</
+      *)
+      let loc = {loc with loc_start = o; loc_end = c} in
+      let mapped = map_jsx_children sub loc children in
+      {mapped with pexp_attributes = jsx_attr sub :: attrs}
+    | Pexp_jsx_element
+        (Jsx_unary_element
+           {
+             jsx_unary_element_tag_name = tag_name;
+             jsx_unary_element_props = props;
+           }) ->
+      let tag_ident : Longident.t Location.loc =
+        tag_name |> Location.map_loc Ast_helper.Jsx.longident_of_jsx_tag_name
+      in
+      let props = map_jsx_props sub props in
+      let children_expr =
+        let loc =
+          {
+            loc_ghost = true;
+            loc_start = offset_position loc.loc_end 2;
+            loc_end = offset_position loc.loc_end 1;
+          }
+        in
+        Ast_helper0.Exp.construct ~loc {txt = Lident "[]"; loc} None
+      in
+      let unit_expr =
+        Ast_helper0.Exp.construct ~loc:!Ast_helper0.default_loc
+          {txt = Lident "()"; loc = !Ast_helper0.default_loc}
+          None
+      in
+      apply ~loc ~attrs:(jsx_attr sub :: attrs) (ident tag_ident)
+        (props
+        @ [
+            (Asttypes.Noloc.Labelled "children", children_expr);
+            (Asttypes.Noloc.Nolabel, unit_expr);
+          ])
+    | Pexp_jsx_element
+        (Jsx_container_element
+           {
+             jsx_container_element_tag_name_start = tag_name;
+             jsx_container_element_props = props;
+             jsx_container_element_children = children;
+           }) ->
+      let tag_ident : Longident.t Location.loc =
+        tag_name |> Location.map_loc Ast_helper.Jsx.longident_of_jsx_tag_name
+      in
+      let props = map_jsx_props sub props in
+      let children_expr = map_jsx_children sub loc children in
+      apply ~loc ~attrs:(jsx_attr sub :: attrs) (ident tag_ident)
+        (props
+        @ [
+            (Asttypes.Noloc.Labelled "children", children_expr);
+            (Asttypes.Noloc.Nolabel, jsx_unit_expr);
+          ])
+end
+
+module P = struct
+  (* Patterns *)
+
+  let map sub {ppat_desc = desc; ppat_loc = loc; ppat_attributes = attrs} =
+    let open Pat in
+    let loc = sub.location sub loc in
+    let attrs = sub.attributes sub attrs in
+    match desc with
+    | Ppat_any -> any ~loc ~attrs ()
+    | Ppat_var s -> var ~loc ~attrs (map_loc sub s)
+    | Ppat_alias (p, s) -> alias ~loc ~attrs (sub.pat sub p) (map_loc sub s)
+    | Ppat_constant c -> constant ~loc ~attrs (map_constant c)
+    | Ppat_interval (c1, c2) ->
+      interval ~loc ~attrs (map_constant c1) (map_constant c2)
+    | Ppat_tuple pl -> tuple ~loc ~attrs (List.map (sub.pat sub) pl)
+    | Ppat_construct (l, p) ->
+      construct ~loc ~attrs (map_loc sub l) (map_opt (sub.pat sub) p)
+    | Ppat_variant (l, p) -> variant ~loc ~attrs l (map_opt (sub.pat sub) p)
+    | Ppat_record (lpl, cf) ->
+      record ~loc ~attrs
+        (Ext_list.map lpl (fun {lid; x = p; opt = optional} ->
+             let lid1 = map_loc sub lid in
+             let p1 = sub.pat sub p in
+             let attr =
+               Parsetree0.add_optional_attr ~optional p1.ppat_attributes
+             in
+             (lid1, {p1 with ppat_attributes = attr})))
+        cf
+    | Ppat_array pl -> array ~loc ~attrs (List.map (sub.pat sub) pl)
+    | Ppat_or (p1, p2) -> or_ ~loc ~attrs (sub.pat sub p1) (sub.pat sub p2)
+    | Ppat_constraint (p, t) ->
+      constraint_ ~loc ~attrs (sub.pat sub p) (sub.typ sub t)
+    | Ppat_type s -> type_ ~loc ~attrs (map_loc sub s)
+    | Ppat_unpack s -> unpack ~loc ~attrs (map_loc sub s)
+    | Ppat_open (lid, p) -> open_ ~loc ~attrs (map_loc sub lid) (sub.pat sub p)
+    | Ppat_exception p -> exception_ ~loc ~attrs (sub.pat sub p)
+    | Ppat_extension x -> extension ~loc ~attrs (sub.extension sub x)
+end
+
+(* Now, a generic AST mapper, to be extended to cover all kinds and
+   cases of the OCaml grammar.  The default behavior of the mapper is
+   the identity. *)
+
+let default_mapper =
+  {
+    structure = (fun this l -> List.map (this.structure_item this) l);
+    structure_item = M.map_structure_item;
+    module_expr = M.map;
+    signature = (fun this l -> List.map (this.signature_item this) l);
+    signature_item = MT.map_signature_item;
+    module_type = MT.map;
+    with_constraint = MT.map_with_constraint;
+    type_declaration = T.map_type_declaration;
+    type_kind = T.map_type_kind;
+    typ = T.map;
+    type_extension = T.map_type_extension;
+    extension_constructor = T.map_extension_constructor;
+    value_description =
+      (fun this {pval_name; pval_type; pval_prim; pval_loc; pval_attributes} ->
+        Val.mk (map_loc this pval_name) (this.typ this pval_type)
+          ~attrs:(this.attributes this pval_attributes)
+          ~loc:(this.location this pval_loc)
+          ~prim:pval_prim);
+    pat = P.map;
+    expr = E.map;
+    module_declaration =
+      (fun this {pmd_name; pmd_type; pmd_attributes; pmd_loc} ->
+        Md.mk (map_loc this pmd_name)
+          (this.module_type this pmd_type)
+          ~attrs:(this.attributes this pmd_attributes)
+          ~loc:(this.location this pmd_loc));
+    module_type_declaration =
+      (fun this {pmtd_name; pmtd_type; pmtd_attributes; pmtd_loc} ->
+        Mtd.mk (map_loc this pmtd_name)
+          ?typ:(map_opt (this.module_type this) pmtd_type)
+          ~attrs:(this.attributes this pmtd_attributes)
+          ~loc:(this.location this pmtd_loc));
+    module_binding =
+      (fun this {pmb_name; pmb_expr; pmb_attributes; pmb_loc} ->
+        Mb.mk (map_loc this pmb_name)
+          (this.module_expr this pmb_expr)
+          ~attrs:(this.attributes this pmb_attributes)
+          ~loc:(this.location this pmb_loc));
+    open_description =
+      (fun this {popen_lid; popen_override; popen_attributes; popen_loc} ->
+        Opn.mk (map_loc this popen_lid) ~override:popen_override
+          ~loc:(this.location this popen_loc)
+          ~attrs:(this.attributes this popen_attributes));
+    include_description =
+      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
+        Incl.mk
+          (this.module_type this pincl_mod)
+          ~loc:(this.location this pincl_loc)
+          ~attrs:(this.attributes this pincl_attributes));
+    include_declaration =
+      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
+        Incl.mk
+          (this.module_expr this pincl_mod)
+          ~loc:(this.location this pincl_loc)
+          ~attrs:(this.attributes this pincl_attributes));
+    value_binding =
+      (fun this {pvb_pat; pvb_expr; pvb_attributes; pvb_loc} ->
+        Vb.mk (this.pat this pvb_pat) (this.expr this pvb_expr)
+          ~loc:(this.location this pvb_loc)
+          ~attrs:(this.attributes this pvb_attributes));
+    constructor_declaration =
+      (fun this {pcd_name; pcd_args; pcd_res; pcd_loc; pcd_attributes} ->
+        Type.constructor (map_loc this pcd_name)
+          ~args:(T.map_constructor_arguments this pcd_args)
+          ?res:(map_opt (this.typ this) pcd_res)
+          ~loc:(this.location this pcd_loc)
+          ~attrs:(this.attributes this pcd_attributes));
+    label_declaration =
+      (fun this
+        {pld_name; pld_type; pld_loc; pld_mutable; pld_optional; pld_attributes}
+      ->
+        Type.field (map_loc this pld_name) (this.typ this pld_type)
+          ~mut:pld_mutable
+          ~loc:(this.location this pld_loc)
+          ~attrs:
+            (Parsetree0.add_optional_attr ~optional:pld_optional
+               (this.attributes this pld_attributes)));
+    cases = (fun this l -> List.map (this.case this) l);
+    case =
+      (fun this {pc_lhs; pc_guard; pc_rhs} ->
+        {
+          pc_lhs = this.pat this pc_lhs;
+          pc_guard = map_opt (this.expr this) pc_guard;
+          pc_rhs = this.expr this pc_rhs;
+        });
+    location = (fun _this l -> l);
+    extension = (fun this (s, e) -> (map_loc this s, this.payload this e));
+    attribute = (fun this (s, e) -> (map_loc this s, this.payload this e));
+    attributes = (fun this l -> List.map (this.attribute this) l);
+    payload =
+      (fun this -> function
+        | PStr x -> PStr (this.structure this x)
+        | PSig x -> PSig (this.signature this x)
+        | PTyp x -> PTyp (this.typ this x)
+        | PPat (x, g) -> PPat (this.pat this x, map_opt (this.expr this) g));
+  }
diff --git a/jscomp/ml/ast_payload.ml b/compiler/ml/ast_payload.ml
similarity index 85%
rename from jscomp/ml/ast_payload.ml
rename to compiler/ml/ast_payload.ml
index f49ac59..eb953cd 100644
--- a/jscomp/ml/ast_payload.ml
+++ b/compiler/ml/ast_payload.ml
@@ -64,7 +64,10 @@ let is_single_int (x : t) : int option =
               ({pexp_desc = Pexp_constant (Pconst_integer (name, char)); _}, _);
           _;
         };
-      ] when (match char with Some n when n = 'n' -> false | _ -> true) ->
+      ]
+    when match char with
+         | Some n when n = 'n' -> false
+         | _ -> true ->
     Some (int_of_string name)
   | _ -> None
 
@@ -89,7 +92,8 @@ let is_single_bigint (x : t) : string option =
         {
           pstr_desc =
             Pstr_eval
-              ({pexp_desc = Pexp_constant (Pconst_integer (name, Some 'n')); _}, _);
+              ( {pexp_desc = Pexp_constant (Pconst_integer (name, Some 'n')); _},
+                _ );
           _;
         };
       ] ->
@@ -143,20 +147,22 @@ let raw_as_string_exp_exn ~(kind : Js_raw_info.raw_kind) ?is_function (x : t) :
       (match kind with
       | Raw_re | Raw_exp ->
         let ((_loc, e) as prog), errors =
-          Parser_flow.parse_expression (Parser_env.init_env None str) false
+          let open Parser_flow in
+          let env = Parser_env.init_env None str in
+          do_parse env Parse.expression false
         in
         (if kind = Raw_re then
-         match e with
-         | Literal {value = RegExp _} -> ()
-         | _ ->
-           Location.raise_errorf ~loc
-             "Syntax error: a valid JS regex literal expected");
+           match e with
+           | RegExpLiteral _ -> ()
+           | _ ->
+             Location.raise_errorf ~loc
+               "Syntax error: a valid JS regex literal expected");
         (match is_function with
-          | Some is_function -> (
-            match Classify_function.classify_exp prog with
-            | Js_function {arity; _} -> is_function := Some arity
-            | _ -> ())
-          | None -> ());
+        | Some is_function -> (
+          match Classify_function.classify_exp prog with
+          | Js_function {arity; _} -> is_function := Some arity
+          | _ -> ())
+        | None -> ());
         errors
       | Raw_program -> snd (Parser_flow.parse_program false None str));
     Some {e with pexp_desc = Pexp_constant (Pconst_string (str, None))}
@@ -184,7 +190,7 @@ type action = lid * Parsetree.expression option
     {[ { x = exp }]}
 *)
 
-let unrecognizedConfigRecord loc text =
+let unrecognized_config_record loc text =
   Location.prerr_warning loc (Warnings.Bs_derive_warning text)
 
 let ident_or_record_as_config loc (x : t) :
@@ -204,14 +210,17 @@ let ident_or_record_as_config loc (x : t) :
     | None ->
       Ext_list.map label_exprs (fun u ->
           match u with
-          | ( {txt = Lident name; loc},
-              {Parsetree.pexp_desc = Pexp_ident {txt = Lident name2}} )
+          | {
+           lid = {txt = Lident name; loc};
+           x = {Parsetree.pexp_desc = Pexp_ident {txt = Lident name2}};
+          }
             when name2 = name ->
             ({Asttypes.txt = name; loc}, None)
-          | {txt = Lident name; loc}, y -> ({Asttypes.txt = name; loc}, Some y)
+          | {lid = {txt = Lident name; loc}; x = y} ->
+            ({Asttypes.txt = name; loc}, Some y)
           | _ -> Location.raise_errorf ~loc "Qualified label is not allowed")
     | Some _ ->
-      unrecognizedConfigRecord loc "`with` is not supported, discarding";
+      unrecognized_config_record loc "`with` is not supported, discarding";
       [])
   | PStr
       [
@@ -224,7 +233,7 @@ let ident_or_record_as_config loc (x : t) :
     [({Asttypes.txt; loc = lloc}, None)]
   | PStr [] -> []
   | _ ->
-    unrecognizedConfigRecord loc "invalid attribute config-record, ignoring";
+    unrecognized_config_record loc "invalid attribute config-record, ignoring";
     []
 
 let assert_strings loc (x : t) : string list =
diff --git a/jscomp/ml/ast_payload.mli b/compiler/ml/ast_payload.mli
similarity index 94%
rename from jscomp/ml/ast_payload.mli
rename to compiler/ml/ast_payload.mli
index dfd2426..493ad8e 100644
--- a/jscomp/ml/ast_payload.mli
+++ b/compiler/ml/ast_payload.mli
@@ -65,11 +65,11 @@ val assert_strings : Location.t -> t -> string list
 (** as a record or empty 
     it will accept 
 
-    {[ [@@@bs.config ]]}
+    {[ [@@@config ]]}
     or 
-    {[ [@@@bs.config no_export ] ]}
+    {[ [@@@config no_export ] ]}
     or 
-    {[ [@@@bs.config { property  .. } ]]}    
+    {[ [@@@config { property  .. } ]]}    
     Note that we only 
     {[
       { flat_property}
@@ -89,6 +89,6 @@ val empty : t
 val table_dispatch :
   (Parsetree.expression option -> 'a) Map_string.t -> action -> 'a
 
-val unrecognizedConfigRecord : Location.t -> string -> unit
+val unrecognized_config_record : Location.t -> string -> unit
 (** Report to the user, as a warning, that the bs-attribute parser is bailing out. (This is to allow
     external ppx, like ppx_deriving, to pick up where the builtin ppx leave off.) *)
diff --git a/compiler/ml/ast_uncurried.ml b/compiler/ml/ast_uncurried.ml
new file mode 100644
index 0000000..3cd794e
--- /dev/null
+++ b/compiler/ml/ast_uncurried.ml
@@ -0,0 +1,21 @@
+(* Uncurried AST *)
+
+let uncurried_type ~arity (t_arg : Parsetree.core_type) =
+  match t_arg.ptyp_desc with
+  | Ptyp_arrow arr ->
+    {t_arg with ptyp_desc = Ptyp_arrow {arr with arity = Some arity}}
+  | _ -> assert false
+
+let uncurried_fun ?(async = false) ~arity fun_expr =
+  let fun_expr =
+    match fun_expr.Parsetree.pexp_desc with
+    | Pexp_fun f ->
+      {fun_expr with pexp_desc = Pexp_fun {f with arity = Some arity; async}}
+    | _ -> assert false
+  in
+  fun_expr
+
+let expr_is_uncurried_fun (expr : Parsetree.expression) =
+  match expr.pexp_desc with
+  | Pexp_fun {arity = Some _} -> true
+  | _ -> false
diff --git a/compiler/ml/ast_untagged_variants.ml b/compiler/ml/ast_untagged_variants.ml
new file mode 100644
index 0000000..06673db
--- /dev/null
+++ b/compiler/ml/ast_untagged_variants.ml
@@ -0,0 +1,706 @@
+module Instance = struct
+  type t =
+    | Array
+    | ArrayBuffer
+    | BigInt64Array
+    | BigUint64Array
+    | Blob
+    | DataView
+    | Date
+    | File
+    | Float32Array
+    | Float64Array
+    | Int16Array
+    | Int32Array
+    | Int8Array
+    | Promise
+    | RegExp
+    | Uint16Array
+    | Uint32Array
+    | Uint8Array
+    | Uint8ClampedArray
+    | Set
+    | Map
+    | WeakSet
+    | WeakMap
+  let to_string = function
+    | Array -> "Array"
+    | ArrayBuffer -> "ArrayBuffer"
+    | BigInt64Array -> "BigInt64Array"
+    | BigUint64Array -> "BigUint64Array"
+    | Blob -> "Blob"
+    | DataView -> "DataView"
+    | Date -> "Date"
+    | File -> "File"
+    | Float32Array -> "Float32Array"
+    | Float64Array -> "Float64Array"
+    | Int16Array -> "Int16Array"
+    | Int32Array -> "Int32Array"
+    | Int8Array -> "Int8Array"
+    | Promise -> "Promise"
+    | RegExp -> "RegExp"
+    | Uint16Array -> "Uint16Array"
+    | Uint32Array -> "Uint32Array"
+    | Uint8Array -> "Uint8Array"
+    | Uint8ClampedArray -> "Uint8ClampedArray"
+    | Set -> "Set"
+    | Map -> "Map"
+    | WeakSet -> "WeakSet"
+    | WeakMap -> "WeakMap"
+end
+
+type untagged_error =
+  | OnlyOneUnknown of string
+  | AtMostOneObject
+  | AtMostOneInstance of Instance.t
+  | AtMostOneFunction
+  | AtMostOneString
+  | AtMostOneNumber
+  | AtMostOneBigint
+  | AtMostOneBoolean
+  | DuplicateLiteral of string
+  | ConstructorMoreThanOneArg of string
+type error =
+  | InvalidVariantAsAnnotation
+  | Duplicated_bs_as
+  | InvalidVariantTagAnnotation
+  | InvalidUntaggedVariantDefinition of untagged_error
+  | TagFieldNameConflict of string * string * string
+exception Error of Location.t * error
+
+let report_error ppf =
+  let open Format in
+  function
+  | InvalidVariantAsAnnotation ->
+    fprintf ppf
+      "A variant case annotation @as(...) must be a string or integer, \
+       boolean, null, undefined"
+  | Duplicated_bs_as -> fprintf ppf "duplicate @as "
+  | InvalidVariantTagAnnotation ->
+    fprintf ppf "A variant tag annotation @tag(...) must be a string"
+  | InvalidUntaggedVariantDefinition untagged_variant ->
+    fprintf ppf "This untagged variant definition is invalid: %s"
+      (match untagged_variant with
+      | OnlyOneUnknown name ->
+        "Case " ^ name
+        ^ " has a payload that is not of one of the recognized shapes (object, \
+           array, etc). Then it must be the only case with payloads."
+      | AtMostOneObject -> "At most one case can be an object type."
+      | AtMostOneInstance Array ->
+        "At most one case can be an array or tuple type."
+      | AtMostOneInstance i ->
+        "At most one case can be a " ^ Instance.to_string i ^ " type."
+      | AtMostOneFunction -> "At most one case can be a function type."
+      | AtMostOneString -> "At most one case can be a string type."
+      | AtMostOneBoolean -> "At most one case can be a boolean type."
+      | AtMostOneNumber ->
+        "At most one case can be a number type (int or float)."
+      | AtMostOneBigint -> "At most one case can be a bigint type."
+      | DuplicateLiteral s -> "Duplicate literal " ^ s ^ "."
+      | ConstructorMoreThanOneArg name ->
+        "Constructor " ^ name ^ " has more than one argument.")
+  | TagFieldNameConflict (constructor_name, field_name, runtime_value) ->
+    fprintf ppf
+      "Constructor \"%s\": the @tag name \"%s\" conflicts with the runtime \
+       value of inline record field \"%s\". Use a different @tag name or \
+       rename the field."
+      constructor_name runtime_value field_name
+
+(* Type of the runtime representation of an untagged block (case with payoad) *)
+type block_type =
+  | IntType
+  | StringType
+  | FloatType
+  | BigintType
+  | BooleanType
+  | InstanceType of Instance.t
+  | FunctionType
+  | ObjectType
+  | UnknownType
+
+let block_type_to_user_visible_string = function
+  | IntType -> "int"
+  | StringType -> "string"
+  | FloatType -> "float"
+  | BigintType -> "bigint"
+  | BooleanType -> "bool"
+  | InstanceType i -> Instance.to_string i
+  | FunctionType -> "function"
+  | ObjectType -> "object"
+  | UnknownType -> "unknown"
+
+(*
+  Type of the runtime representation of a tag.
+  Can be a literal (case with no payload), or a block (case with payload).
+  In the case of block it can be tagged or untagged.
+*)
+type tag_type =
+  | String of string
+  | Int of int
+  | Float of string
+  | BigInt of string
+  | Bool of bool
+  | Null
+  | Undefined (* literal or tagged block *)
+  | Untagged of block_type (* untagged block *)
+type tag = {name: string; tag_type: tag_type option}
+type block = {tag: tag; tag_name: string option; block_type: block_type option}
+type switch_names = {consts: tag array; blocks: block array}
+
+let tag_type_to_user_visible_string = function
+  | String _ -> "string"
+  | Int _ -> "int"
+  | Float _ -> "float"
+  | BigInt _ -> "bigint"
+  | Bool _ -> "bool"
+  | Null -> "null"
+  | Undefined -> "undefined"
+  | Untagged block_type -> block_type_to_user_visible_string block_type
+
+let untagged = "unboxed"
+
+let block_type_can_be_undefined = function
+  | IntType | StringType | FloatType | BigintType | BooleanType | InstanceType _
+  | FunctionType | ObjectType ->
+    false
+  | UnknownType -> true
+
+let tag_can_be_undefined tag =
+  match tag.tag_type with
+  | None -> false
+  | Some (String _ | Int _ | Float _ | BigInt _ | Bool _ | Null) -> false
+  | Some (Untagged block_type) -> block_type_can_be_undefined block_type
+  | Some Undefined -> true
+
+let has_untagged (attrs : Parsetree.attributes) =
+  Ext_list.exists attrs (function {txt}, _ -> txt = untagged)
+
+let process_untagged (attrs : Parsetree.attributes) =
+  let st = ref false in
+  Ext_list.iter attrs (fun ({txt}, _) ->
+      match txt with
+      | "unboxed" -> st := true
+      | _ -> ());
+  !st
+
+let extract_concrete_typedecl :
+    (Env.t -> Types.type_expr -> Path.t * Path.t * Types.type_declaration) ref =
+  ref (Obj.magic ())
+
+let expand_head : (Env.t -> Types.type_expr -> Types.type_expr) ref =
+  ref (Obj.magic ())
+
+let process_tag_type (attrs : Parsetree.attributes) =
+  let st : tag_type option ref = ref None in
+  Ext_list.iter attrs (fun (({txt; loc}, payload) as attr) ->
+      match txt with
+      | "as" ->
+        if !st = None then (
+          (match Ast_payload.is_single_string payload with
+          | None -> ()
+          | Some (s, _dec) -> st := Some (String s));
+          (match Ast_payload.is_single_int payload with
+          | None -> ()
+          | Some i -> st := Some (Int i));
+          (match Ast_payload.is_single_float payload with
+          | None -> ()
+          | Some f -> st := Some (Float f));
+          (match Ast_payload.is_single_bigint payload with
+          | None -> ()
+          | Some i -> st := Some (BigInt i));
+          (match Ast_payload.is_single_bool payload with
+          | None -> ()
+          | Some b -> st := Some (Bool b));
+          (match Ast_payload.is_single_ident payload with
+          | None -> ()
+          | Some (Lident "null") -> st := Some Null
+          | Some (Lident "undefined") -> st := Some Undefined
+          | Some _ -> raise (Error (loc, InvalidVariantAsAnnotation)));
+          if !st = None then raise (Error (loc, InvalidVariantAsAnnotation))
+          else Used_attributes.mark_used_attribute attr)
+        else raise (Error (loc, Duplicated_bs_as))
+      | _ -> ());
+  !st
+
+let () =
+  Location.register_error_of_exn (function
+    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
+    | _ -> None)
+
+let report_constructor_more_than_one_arg ~loc ~name =
+  raise
+    (Error
+       (loc, InvalidUntaggedVariantDefinition (ConstructorMoreThanOneArg name)))
+
+let type_is_builtin_object (t : Types.type_expr) =
+  match t.desc with
+  | Tconstr (Path.Pident ident, [_], _) when Ident.name ident = "dict" -> true
+  | Tconstr (path, _, _) ->
+    let name = Path.name path in
+    name = "Js.Dict.t" || name = "Js_dict.t"
+  | _ -> false
+
+let type_to_instanceof_backed_obj (t : Types.type_expr) =
+  match t.desc with
+  | Tconstr (path, _, _) when Path.same path Predef.path_promise ->
+    Some Instance.Promise
+  | Tconstr (path, _, _) when Path.same path Predef.path_array -> Some Array
+  | Tconstr (path, _, _) -> (
+    match Path.name path with
+    | "Stdlib_ArrayBuffer.t" -> Some ArrayBuffer
+    | "Stdlib.BigInt64Array.t" -> Some BigInt64Array
+    | "Stdlib.BigUint64Array.t" -> Some BigUint64Array
+    | "Stdlib.DataView.t" -> Some DataView
+    | "Stdlib_Date.t" -> Some Date
+    | "Stdlib.Float32Array.t" -> Some Float32Array
+    | "Stdlib.Float64Array.t" -> Some Float64Array
+    | "Stdlib.Int16Array.t" -> Some Int16Array
+    | "Stdlib.Int32Array.t" -> Some Int32Array
+    | "Stdlib.Int8Array.t" -> Some Int8Array
+    | "Stdlib_RegExp.t" -> Some RegExp
+    | "Stdlib.Uint16Array.t" -> Some Uint16Array
+    | "Stdlib.Uint32Array.t" -> Some Uint32Array
+    | "Stdlib.Uint8Array.t" -> Some Uint8Array
+    | "Stdlib.Uint8ClampedArray.t" -> Some Uint8ClampedArray
+    | "Js_file.t" -> Some File
+    | "Js_blob.t" -> Some Blob
+    | "Stdlib.Set.t" -> Some Set
+    | "Stdlib.Map.t" -> Some Map
+    | "Stdlib.WeakSet.t" -> Some WeakSet
+    | "Stdlib.WeakMap.t" -> Some WeakMap
+    | _ -> None)
+  | _ -> None
+
+let get_block_type_from_typ ~env (t : Types.type_expr) : block_type option =
+  (* First check the original (unexpanded) type for typed arrays and other instance types *)
+  match type_to_instanceof_backed_obj t with
+  | Some instance_type -> Some (InstanceType instance_type)
+  | None -> (
+    (* If original type didn't match, expand and try standard checks *)
+    let expanded_t = !expand_head env t in
+    match expanded_t with
+    | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_string ->
+      Some StringType
+    | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_int ->
+      Some IntType
+    | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_float ->
+      Some FloatType
+    | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_bigint ->
+      Some BigintType
+    | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_bool ->
+      Some BooleanType
+    | {desc = Tarrow _} -> Some FunctionType
+    | {desc = Tconstr _} as expanded_t when type_is_builtin_object expanded_t ->
+      Some ObjectType
+    | {desc = Tconstr _} as expanded_t
+      when type_to_instanceof_backed_obj expanded_t |> Option.is_some -> (
+      match type_to_instanceof_backed_obj expanded_t with
+      | None -> None
+      | Some instance_type -> Some (InstanceType instance_type))
+    | {desc = Ttuple _} -> Some (InstanceType Array)
+    | _ -> None)
+
+let get_block_type ~env (cstr : Types.constructor_declaration) :
+    block_type option =
+  match (process_untagged cstr.cd_attributes, cstr.cd_args) with
+  | false, _ -> None
+  | true, Cstr_tuple [t] when get_block_type_from_typ ~env t |> Option.is_some
+    ->
+    get_block_type_from_typ ~env t
+  | true, Cstr_tuple [ty] -> (
+    let default = Some UnknownType in
+    match !extract_concrete_typedecl env ty with
+    | _, _, {type_kind = Type_record (_, Record_unboxed _)} -> default
+    | _, _, {type_kind = Type_record (_, _)} -> Some ObjectType
+    | _ -> default
+    | exception _ -> default)
+  | true, Cstr_tuple (_ :: _ :: _) ->
+    (* C(_, _) with at least 2 args is an object *)
+    Some ObjectType
+  | true, Cstr_record _ ->
+    (* inline record is an object *)
+    Some ObjectType
+  | true, _ -> None (* TODO: add restrictions here *)
+
+let process_tag_name (attrs : Parsetree.attributes) =
+  let st = ref None in
+  Ext_list.iter attrs (fun ({txt; loc}, payload) ->
+      match txt with
+      | "tag" ->
+        if !st = None then (
+          (match Ast_payload.is_single_string payload with
+          | None -> ()
+          | Some (s, _dec) -> st := Some s);
+          if !st = None then raise (Error (loc, InvalidVariantTagAnnotation)))
+        else raise (Error (loc, Duplicated_bs_as))
+      | _ -> ());
+  !st
+
+let get_tag_name (cstr : Types.constructor_declaration) =
+  process_tag_name cstr.cd_attributes
+
+let is_nullary_variant (x : Types.constructor_arguments) =
+  match x with
+  | Types.Cstr_tuple [] -> true
+  | _ -> false
+
+let check_invariant ~is_untagged_def ~(consts : (Location.t * tag) list)
+    ~(blocks : (Location.t * block) list) =
+  let module StringSet = Set.Make (String) in
+  let string_literals_consts = ref StringSet.empty in
+  let string_literals_blocks = ref StringSet.empty in
+  let nonstring_literals_consts = ref StringSet.empty in
+  let nonstring_literals_blocks = ref StringSet.empty in
+  let instance_types = Hashtbl.create 1 in
+  let function_types = ref 0 in
+  let object_types = ref 0 in
+  let string_types = ref 0 in
+  let number_types = ref 0 in
+  let bigint_types = ref 0 in
+  let boolean_types = ref 0 in
+  let unknown_types = ref 0 in
+  let add_string_literal ~is_const ~loc s =
+    let set =
+      if is_const then string_literals_consts else string_literals_blocks
+    in
+    if StringSet.mem s !set then
+      raise (Error (loc, InvalidUntaggedVariantDefinition (DuplicateLiteral s)));
+    set := StringSet.add s !set
+  in
+  let add_nonstring_literal ~is_const ~loc s =
+    let set =
+      if is_const then nonstring_literals_consts else nonstring_literals_blocks
+    in
+    if StringSet.mem s !set then
+      raise (Error (loc, InvalidUntaggedVariantDefinition (DuplicateLiteral s)));
+    set := StringSet.add s !set
+  in
+  let invariant loc name =
+    if !unknown_types <> 0 && List.length blocks <> 1 then
+      raise
+        (Error (loc, InvalidUntaggedVariantDefinition (OnlyOneUnknown name)));
+    if !object_types > 1 then
+      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneObject));
+    Hashtbl.iter
+      (fun i count ->
+        if count > 1 then
+          raise
+            (Error (loc, InvalidUntaggedVariantDefinition (AtMostOneInstance i))))
+      instance_types;
+    if !function_types > 1 then
+      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneFunction));
+    if !string_types > 1 then
+      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneString));
+    if !number_types > 1 then
+      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneNumber));
+    if !bigint_types > 1 then
+      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneBigint));
+    if !boolean_types > 1 then
+      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneBoolean));
+    if
+      !boolean_types > 0
+      && (StringSet.mem "true" !nonstring_literals_consts
+         || StringSet.mem "false" !nonstring_literals_consts)
+    then raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneBoolean));
+    ()
+  in
+  let check_literal ~is_const ~loc (literal : tag) =
+    match literal.tag_type with
+    | Some (String s) -> add_string_literal ~is_const ~loc s
+    | Some (Int i) -> add_nonstring_literal ~is_const ~loc (string_of_int i)
+    | Some (Float f) -> add_nonstring_literal ~is_const ~loc f
+    | Some (BigInt i) -> add_nonstring_literal ~is_const ~loc i
+    | Some Null -> add_nonstring_literal ~is_const ~loc "null"
+    | Some Undefined -> add_nonstring_literal ~is_const ~loc "undefined"
+    | Some (Bool b) ->
+      add_nonstring_literal ~is_const ~loc (if b then "true" else "false")
+    | Some (Untagged _) -> ()
+    | None -> add_string_literal ~is_const ~loc literal.name
+  in
+
+  Ext_list.rev_iter consts (fun (loc, literal) ->
+      check_literal ~is_const:true ~loc literal);
+  if is_untagged_def then
+    Ext_list.rev_iter blocks (fun (loc, block) ->
+        match block.block_type with
+        | Some block_type ->
+          (match block_type with
+          | UnknownType -> incr unknown_types
+          | ObjectType -> incr object_types
+          | InstanceType i ->
+            let count =
+              Hashtbl.find_opt instance_types i |> Option.value ~default:0
+            in
+            Hashtbl.replace instance_types i (count + 1)
+          | FunctionType -> incr function_types
+          | IntType | FloatType -> incr number_types
+          | BigintType -> incr bigint_types
+          | BooleanType -> incr boolean_types
+          | StringType -> incr string_types);
+          invariant loc block.tag.name
+        | None -> ())
+  else
+    Ext_list.rev_iter blocks (fun (loc, block) ->
+        check_literal ~is_const:false ~loc block.tag)
+
+let get_cstr_loc_tag (cstr : Types.constructor_declaration) =
+  ( cstr.cd_loc,
+    {
+      name = Ident.name cstr.cd_id;
+      tag_type = process_tag_type cstr.cd_attributes;
+    } )
+
+let constructor_declaration_from_constructor_description ~env
+    (cd : Types.constructor_description) : Types.constructor_declaration option
+    =
+  match cd.cstr_res.desc with
+  | Tconstr (path, _, _) -> (
+    match Env.find_type path env with
+    | {type_kind = Type_variant cstrs} ->
+      Ext_list.find_opt cstrs (fun cstr ->
+          if cstr.cd_id.name = cd.cstr_name then Some cstr else None)
+    | _ -> None)
+  | _ -> None
+
+let names_from_type_variant ?(is_untagged_def = false) ~env
+    (cstrs : Types.constructor_declaration list) =
+  let get_block (cstr : Types.constructor_declaration) : block =
+    let tag = snd (get_cstr_loc_tag cstr) in
+    {tag; tag_name = get_tag_name cstr; block_type = get_block_type ~env cstr}
+  in
+  let consts, blocks =
+    Ext_list.fold_left cstrs ([], []) (fun (consts, blocks) cstr ->
+        if is_nullary_variant cstr.cd_args then
+          (get_cstr_loc_tag cstr :: consts, blocks)
+        else (consts, (cstr.cd_loc, get_block cstr) :: blocks))
+  in
+  check_invariant ~is_untagged_def ~consts ~blocks;
+  let blocks = blocks |> List.map snd in
+  let consts = consts |> List.map snd in
+  let consts = Ext_array.reverse_of_list consts in
+  let blocks = Ext_array.reverse_of_list blocks in
+  Some {consts; blocks}
+
+let check_tag_field_conflicts (cstrs : Types.constructor_declaration list) =
+  List.iter
+    (fun (cstr : Types.constructor_declaration) ->
+      let constructor_name = Ident.name cstr.cd_id in
+      let effective_tag_name =
+        match process_tag_name cstr.cd_attributes with
+        | Some explicit_tag -> explicit_tag
+        | None -> constructor_name
+      in
+      match cstr.cd_args with
+      | Cstr_record fields ->
+        List.iter
+          (fun (field : Types.label_declaration) ->
+            let field_name = Ident.name field.ld_id in
+            let effective_field_name =
+              match process_tag_type field.ld_attributes with
+              | Some (String as_name) -> as_name
+              (* @as payload types other than string have no effect on record fields *)
+              | Some _ | None -> field_name
+            in
+            (* Check if effective field name conflicts with tag *)
+            if effective_field_name = effective_tag_name then
+              raise
+                (Error
+                   ( cstr.cd_loc,
+                     TagFieldNameConflict
+                       (constructor_name, field_name, effective_field_name) )))
+          fields
+      | _ -> ())
+    cstrs
+
+type well_formedness_check = {
+  is_untagged_def: bool;
+  cstrs: Types.constructor_declaration list;
+}
+
+let check_well_formed ~env {is_untagged_def; cstrs} =
+  check_tag_field_conflicts cstrs;
+  ignore (names_from_type_variant ~env ~is_untagged_def cstrs)
+
+let has_undefined_literal attrs = process_tag_type attrs = Some Undefined
+
+let block_is_object ~env attrs = get_block_type ~env attrs = Some ObjectType
+
+module DynamicChecks = struct
+  type op = EqEqEq | NotEqEq | Or | And
+  type 'a t =
+    | BinOp of op * 'a t * 'a t
+    | TagType of tag_type
+    | TypeOf of 'a t
+    | IsInstanceOf of Instance.t * 'a t
+    | Not of 'a t
+    | Expr of 'a
+
+  let rec size = function
+    | BinOp (_, x, y) -> 1 + size x + size y
+    | TagType _ -> 1
+    | TypeOf x -> 1 + size x
+    | IsInstanceOf (_, x) -> 1 + size x
+    | Not x -> 1 + size x
+    | Expr _ -> 1
+
+  let bin op x y = BinOp (op, x, y)
+  let tag_type t = TagType t
+  let typeof x = TypeOf x
+  let str s = String s |> tag_type
+  let is_instance i x = IsInstanceOf (i, x)
+  let not x = Not x
+  let nil = Null |> tag_type
+  let undefined = Undefined |> tag_type
+  let object_ = Untagged ObjectType |> tag_type
+
+  let function_ = Untagged FunctionType |> tag_type
+  let string = Untagged StringType |> tag_type
+  let number = Untagged IntType |> tag_type
+
+  let bigint = Untagged BigintType |> tag_type
+
+  let boolean = Untagged BooleanType |> tag_type
+
+  let ( == ) x y = bin EqEqEq x y
+  let ( != ) x y = bin NotEqEq x y
+  let ( ||| ) x y = bin Or x y
+  let ( &&& ) x y = bin And x y
+
+  let rec is_a_literal_case ~(literal_cases : tag_type list) ~block_cases
+      ~list_literal_cases (e : _ t) =
+    let literals_overlaps_with_string () =
+      Ext_list.exists literal_cases (function
+        | String _ -> true
+        | _ -> false)
+    in
+    let literals_overlaps_with_number () =
+      Ext_list.exists literal_cases (function
+        | Int _ | Float _ -> true
+        | _ -> false)
+    in
+    let literals_overlaps_with_bigint () =
+      Ext_list.exists literal_cases (function
+        | BigInt _ -> true
+        | _ -> false)
+    in
+    let literals_overlaps_with_boolean () =
+      Ext_list.exists literal_cases (function
+        | Bool _ -> true
+        | _ -> false)
+    in
+    let literals_overlaps_with_object () =
+      Ext_list.exists literal_cases (function
+        | Null -> true
+        | _ -> false)
+    in
+    let is_literal_case (t : tag_type) : _ t = e == tag_type t in
+    let is_not_block_case (c : block_type) : _ t =
+      match c with
+      | StringType
+        when literals_overlaps_with_string () = false (* No overlap *) ->
+        typeof e != string
+      | IntType when literals_overlaps_with_number () = false ->
+        typeof e != number
+      | FloatType when literals_overlaps_with_number () = false ->
+        typeof e != number
+      | BigintType when literals_overlaps_with_bigint () = false ->
+        typeof e != bigint
+      | BooleanType when literals_overlaps_with_boolean () = false ->
+        typeof e != boolean
+      | InstanceType i -> not (is_instance i e)
+      | FunctionType -> typeof e != function_
+      | ObjectType when literals_overlaps_with_object () = false ->
+        typeof e != object_
+      | ObjectType (* overlap *) -> e == nil ||| (typeof e != object_)
+      | StringType (* overlap *)
+      | IntType (* overlap *)
+      | FloatType (* overlap *)
+      | BigintType (* overlap *)
+      | BooleanType (* overlap *)
+      | UnknownType -> (
+        (* We don't know the type of unknown, so we need to express:
+           this is not one of the literals *)
+        match literal_cases with
+        | [] ->
+          (* this should not happen *)
+          assert false
+        | l1 :: others ->
+          let is_literal_1 = is_literal_case l1 in
+          Ext_list.fold_right others is_literal_1 (fun literal_n acc ->
+              is_literal_case literal_n ||| acc))
+    in
+    if list_literal_cases then
+      let rec mk cases =
+        match List.rev cases with
+        | [case] -> is_literal_case case
+        | case :: rest -> is_literal_case case ||| mk rest
+        | [] -> assert false
+      in
+      mk literal_cases
+    else
+      match block_cases with
+      | [c] -> is_not_block_case c
+      | c1 :: (_ :: _ as rest) ->
+        is_not_block_case c1
+        &&& is_a_literal_case ~literal_cases ~block_cases:rest
+              ~list_literal_cases e
+      | [] -> assert false
+
+  let is_a_literal_case ~literal_cases ~block_cases e =
+    let with_literal_cases =
+      is_a_literal_case ~literal_cases ~block_cases ~list_literal_cases:true e
+    in
+    let without_literal_cases =
+      is_a_literal_case ~literal_cases ~block_cases ~list_literal_cases:false e
+    in
+    if size with_literal_cases <= size without_literal_cases then
+      with_literal_cases
+    else without_literal_cases
+
+  let is_int_tag ?(has_null_undefined_other = (false, false, false)) (e : _ t) :
+      _ t =
+    let has_null, has_undefined, has_other = has_null_undefined_other in
+    if has_null && has_undefined = false && has_other = false then
+      (* null *)
+      bin EqEqEq e nil
+    else if has_null && has_undefined && has_other = false then
+      (* null + undefined *)
+      e == nil ||| e == undefined
+    else if has_null = false && has_undefined && has_other = false then
+      (* undefined *)
+      e == undefined
+    else if has_null then
+      (* (null + undefined + other) || (null + other) *)
+      e == nil ||| typeof e != object_
+    else (* (undefiled + other) || other *)
+      typeof e != object_
+
+  let add_runtime_type_check ~tag_type ~has_null_case
+      ~(block_cases : block_type list) x y =
+    let instances =
+      Ext_list.filter_map block_cases (function
+        | InstanceType i -> Some i
+        | _ -> None)
+    in
+    match tag_type with
+    | Untagged
+        ( IntType | StringType | FloatType | BigintType | BooleanType
+        | FunctionType ) ->
+      typeof y == x
+    | Untagged ObjectType ->
+      let object_case =
+        if has_null_case then typeof y == x &&& (y != nil) else typeof y == x
+      in
+      if instances <> [] then
+        let not_one_of_the_instances =
+          Ext_list.fold_right instances object_case (fun i x ->
+              x &&& not (is_instance i y))
+        in
+        not_one_of_the_instances
+      else object_case
+    | Untagged (InstanceType i) -> is_instance i y
+    | Untagged UnknownType ->
+      (* This should not happen because unknown must be the only non-literal case *)
+      assert false
+    | Bool _ | Float _ | Int _ | BigInt _ | String _ | Null | Undefined -> x
+end
diff --git a/compiler/ml/asttypes.ml b/compiler/ml/asttypes.ml
new file mode 100644
index 0000000..e12960a
--- /dev/null
+++ b/compiler/ml/asttypes.ml
@@ -0,0 +1,87 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** Auxiliary AST types used by parsetree and typedtree. *)
+
+type constant =
+  | Const_int of int
+  | Const_char of int
+  | Const_string of string * string option
+  | Const_float of string
+  | Const_int32 of int32
+  | Const_int64 of int64
+  | Const_bigint of bool * string
+
+type rec_flag = Nonrecursive | Recursive
+
+type direction_flag = Upto | Downto
+
+(* Order matters, used in polymorphic comparison *)
+type private_flag = Private | Public
+
+type mutable_flag = Immutable | Mutable
+
+type virtual_flag = Virtual | Concrete
+
+type override_flag = Override | Fresh
+
+type closed_flag = Closed | Open
+
+type label = string
+
+type arity = int option
+
+type 'a loc = 'a Location.loc = {txt: 'a; loc: Location.t}
+
+type variance = Covariant | Contravariant | Invariant
+
+type arg_label =
+  | Nolabel (* x => ...*)
+  | Labelled of string loc (*  ~label => ... *)
+  | Optional of string loc (* ~(label=e) => ... *)
+
+module Noloc = struct
+  type arg_label =
+    | Nolabel (* x => ...*)
+    | Labelled of string (*  ~label => ... *)
+    | Optional of string (* ~(label=e) => ... *)
+end
+
+let to_arg_label ?(loc = Location.none) lbl =
+  match lbl with
+  | Noloc.Nolabel -> Nolabel
+  | Labelled s -> Labelled {loc; txt = s}
+  | Optional s -> Optional {loc; txt = s}
+
+let to_noloc = function
+  | Nolabel -> Noloc.Nolabel
+  | Labelled {txt} -> Labelled txt
+  | Optional {txt} -> Optional txt
+
+let same_arg_label (x : arg_label) y =
+  match x with
+  | Nolabel -> y = Nolabel
+  | Labelled {txt = s} -> (
+    match y with
+    | Labelled {txt = s0} -> s = s0
+    | _ -> false)
+  | Optional {txt = s} -> (
+    match y with
+    | Optional {txt = s0} -> s = s0
+    | _ -> false)
+
+let get_lbl_loc = function
+  | Nolabel -> Location.none
+  | Labelled {loc} | Optional {loc} -> loc
diff --git a/compiler/ml/bigint_utils.ml b/compiler/ml/bigint_utils.ml
new file mode 100644
index 0000000..286a805
--- /dev/null
+++ b/compiler/ml/bigint_utils.ml
@@ -0,0 +1,96 @@
+let is_neg s = String.length s > 0 && s.[0] = '-'
+let is_pos s = String.length s > 0 && s.[0] = '+'
+
+let to_string sign s = (if sign then "" else "-") ^ s
+
+let remove_leading_sign str : bool * string =
+  let len = String.length str in
+  if len = 0 then (false, str)
+  else if is_neg str || is_pos str then
+    (not (is_neg str), String.sub str 1 (len - 1))
+  else (true, str)
+
+(*
+   Removes leading zeros from the string only if the first non-zero character
+   encountered is a digit. Unlike int and float, bigint cannot be of_string, so
+   This function removes only leading 0s. Instead, values like 00x1 are not converted
+   and are intended to be syntax errors.
+
+   000n -> 0n
+   001n -> 1n
+   01_000_000n -> 1000000n
+   -00100n -> -100n
+
+   The following values are syntax errors
+
+   00o1n -> 00o1n
+   00x1_000_000n -> 00x1000000n
+*)
+let remove_leading_zeros str =
+  let aux str =
+    let len = String.length str in
+    if len = 0 then ""
+    else
+      let is_digit c = c >= '0' && c <= '9' in
+      let idx = ref 0 in
+      while !idx < len && str.[!idx] = '0' do
+        incr idx
+      done;
+      if !idx >= len then "0"
+        (* If the string contains only '0's, return '0'. *)
+      else if is_digit str.[!idx] then String.sub str !idx (len - !idx)
+        (* Remove leading zeros and return the rest of the string. *)
+      else str
+  in
+  (* Replace the delimiters '_' inside number *)
+  let str = String.concat "" (String.split_on_char '_' str) in
+  (* Check if negative *)
+  let starts_with_minus = str <> "" && str.[0] = '-' in
+  let str =
+    if is_neg str || is_pos str then String.sub str 1 (String.length str - 1)
+    else str
+  in
+  let processed_str = aux str in
+  if starts_with_minus then "-" ^ processed_str else processed_str
+
+let parse_bigint s =
+  let sign, i = remove_leading_sign s in
+  (sign, remove_leading_zeros i)
+
+let is_valid s =
+  let len = String.length s in
+  if len = 0 then false
+  else
+    let is_digit c = (c >= '0' && c <= '9') || c = '_' in
+    let first_char = s.[0] in
+    if first_char <> '-' && first_char <> '+' && not (is_digit first_char) then
+      false
+    else
+      let rec check idx =
+        if idx >= len then true
+        else
+          let c = s.[idx] in
+          if is_digit c then check (idx + 1) else false
+      in
+      check 1
+
+let compare (p0, s0) (p1, s1) =
+  match (p0, p1) with
+  | false, true -> -1 (* If only s1 is positive, s0 is smaller. *)
+  | true, false -> 1 (* If only s0 is positive, s0 is larger. *)
+  | _ ->
+    (* If both numbers are either negative or positive, compare their lengths. *)
+    let len0, len1 = (String.length s0, String.length s1) in
+    if len0 = len1 then
+      if p0 then String.compare s0 s1
+      else
+        String.compare s1
+          s0 (* If lengths are equal, compare the strings directly. *)
+    else if len0 > len1 then
+      if p0 then 1
+      else -1 (* A longer s0 means it's larger unless it's negative. *)
+    else if
+      (* len0 < len1 *)
+      p0
+    then -1
+    else 1 (* A longer s1 means s0 is smaller unless s1 is negative. *)
diff --git a/compiler/ml/bigint_utils.mli b/compiler/ml/bigint_utils.mli
new file mode 100644
index 0000000..14b09a9
--- /dev/null
+++ b/compiler/ml/bigint_utils.mli
@@ -0,0 +1,8 @@
+val is_neg : string -> bool
+val is_pos : string -> bool
+val to_string : bool -> string -> string
+val remove_leading_sign : string -> bool * string
+val remove_leading_zeros : string -> string
+val parse_bigint : string -> bool * string
+val is_valid : string -> bool
+val compare : bool * string -> bool * string -> int
diff --git a/jscomp/ml/bs_flow_ast_utils.ml b/compiler/ml/bs_flow_ast_utils.ml
similarity index 100%
rename from jscomp/ml/bs_flow_ast_utils.ml
rename to compiler/ml/bs_flow_ast_utils.ml
diff --git a/jscomp/ml/bs_flow_ast_utils.mli b/compiler/ml/bs_flow_ast_utils.mli
similarity index 100%
rename from jscomp/ml/bs_flow_ast_utils.mli
rename to compiler/ml/bs_flow_ast_utils.mli
diff --git a/compiler/ml/btype.ml b/compiler/ml/btype.ml
new file mode 100644
index 0000000..2af606a
--- /dev/null
+++ b/compiler/ml/btype.ml
@@ -0,0 +1,737 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*  Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt  *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Basic operations on core types *)
+
+open Misc
+open Asttypes
+open Types
+
+(**** Sets, maps and hashtables of types ****)
+
+module TypeSet = Set.Make (TypeOps)
+module TypeMap = Map.Make (TypeOps)
+module TypeHash = Hashtbl.Make (TypeOps)
+
+(**** Forward declarations ****)
+
+let print_raw =
+  ref (fun _ -> assert false : Format.formatter -> type_expr -> unit)
+
+(**** Type level management ****)
+
+let generic_level = 100000000
+
+(* Used to mark a type during a traversal. *)
+let lowest_level = 0
+let pivot_level = (2 * lowest_level) - 1
+(* pivot_level - lowest_level < lowest_level *)
+
+(**** Some type creators ****)
+
+let new_id = ref (-1)
+
+let newty2 level desc =
+  incr new_id;
+  {desc; level; id = !new_id}
+let newgenty desc = newty2 generic_level desc
+let newgenvar ?name () = newgenty (Tvar name)
+(*
+let newmarkedvar level =
+  incr new_id; { desc = Tvar; level = pivot_level - level; id = !new_id }
+let newmarkedgenvar () =
+  incr new_id;
+  { desc = Tvar; level = pivot_level - generic_level; id = !new_id }
+*)
+
+(**** Check some types ****)
+
+let is_Tvar = function
+  | {desc = Tvar _} -> true
+  | _ -> false
+let is_Tunivar = function
+  | {desc = Tunivar _} -> true
+  | _ -> false
+let is_Tconstr = function
+  | {desc = Tconstr _} -> true
+  | _ -> false
+
+let dummy_method = "*dummy method*"
+let default_mty = function
+  | Some mty -> mty
+  | None -> Mty_signature []
+
+(**** Definitions for backtracking ****)
+
+type change =
+  | Ctype of type_expr * type_desc
+  | Ccompress of type_expr * type_desc * type_desc
+  | Clevel of type_expr * int
+  | Cname of
+      (Path.t * type_expr list) option ref * (Path.t * type_expr list) option
+  | Crow of row_field option ref * row_field option
+  | Ckind of field_kind option ref * field_kind option
+  | Ccommu of commutable ref * commutable
+  | Cuniv of type_expr option ref * type_expr option
+  | Ctypeset of TypeSet.t ref * TypeSet.t
+
+type changes = Change of change * changes ref | Unchanged | Invalid
+
+let trail = Weak.create 1
+
+let log_change ch =
+  match Weak.get trail 0 with
+  | None -> ()
+  | Some r ->
+    let r' = ref Unchanged in
+    r := Change (ch, r');
+    Weak.set trail 0 (Some r')
+
+(**** Representative of a type ****)
+
+let rec field_kind_repr = function
+  | Fvar {contents = Some kind} -> field_kind_repr kind
+  | kind -> kind
+
+let rec repr_link compress t d = function
+  | {desc = Tlink t' as d'} -> repr_link true t d' t'
+  | {desc = Tfield (_, k, _, t') as d'} when field_kind_repr k = Fabsent ->
+    repr_link true t d' t'
+  | t' ->
+    if compress then (
+      log_change (Ccompress (t, t.desc, d));
+      t.desc <- d);
+    t'
+
+let repr t =
+  match t.desc with
+  | Tlink t' as d -> repr_link false t d t'
+  | Tfield (_, k, _, t') as d when field_kind_repr k = Fabsent ->
+    repr_link false t d t'
+  | _ -> t
+
+let rec commu_repr = function
+  | Clink r when !r <> Cunknown -> commu_repr !r
+  | c -> c
+
+let rec row_field_repr_aux tl = function
+  | Reither (_, tl', _, {contents = Some fi}) ->
+    row_field_repr_aux (tl @ tl') fi
+  | Reither (c, tl', m, r) -> Reither (c, tl @ tl', m, r)
+  | Rpresent (Some _) when tl <> [] -> Rpresent (Some (List.hd tl))
+  | fi -> fi
+
+let row_field_repr fi = row_field_repr_aux [] fi
+
+let rec rev_concat l ll =
+  match ll with
+  | [] -> l
+  | l' :: ll -> rev_concat (l' @ l) ll
+
+let rec row_repr_aux ll row =
+  match (repr row.row_more).desc with
+  | Tvariant row' ->
+    let f = row.row_fields in
+    row_repr_aux (if f = [] then ll else f :: ll) row'
+  | _ ->
+    if ll = [] then row
+    else {row with row_fields = rev_concat row.row_fields ll}
+
+let row_repr row = row_repr_aux [] row
+
+let rec row_field tag row =
+  let rec find = function
+    | (tag', f) :: fields ->
+      if tag = tag' then row_field_repr f else find fields
+    | [] -> (
+      match repr row.row_more with
+      | {desc = Tvariant row'} -> row_field tag row'
+      | _ -> Rabsent)
+  in
+  find row.row_fields
+
+let rec row_more row =
+  match repr row.row_more with
+  | {desc = Tvariant row'} -> row_more row'
+  | ty -> ty
+
+let row_fixed row =
+  let row = row_repr row in
+  row.row_fixed
+  ||
+  match (repr row.row_more).desc with
+  | Tvar _ | Tnil -> false
+  | Tunivar _ | Tconstr _ -> true
+  | _ -> assert false
+
+let static_row row =
+  let row = row_repr row in
+  row.row_closed
+  && List.for_all
+       (fun (_, f) ->
+         match row_field_repr f with
+         | Reither _ -> false
+         | _ -> true)
+       row.row_fields
+
+let hash_variant s =
+  let accu = ref 0 in
+  for i = 0 to String.length s - 1 do
+    accu := (223 * !accu) + Char.code s.[i]
+  done;
+  (* reduce to 31 bits *)
+  accu := !accu land ((1 lsl 31) - 1);
+  (* make it signed for 64 bits architectures *)
+  if !accu > 0x3FFFFFFF then !accu - (1 lsl 31) else !accu
+
+let proxy ty =
+  let ty0 = repr ty in
+  match ty0.desc with
+  | Tvariant row when not (static_row row) -> row_more row
+  | Tobject (ty, _) ->
+    let rec proxy_obj ty =
+      match ty.desc with
+      | Tfield (_, _, _, ty) | Tlink ty -> proxy_obj ty
+      | Tvar _ | Tunivar _ | Tconstr _ -> ty
+      | Tnil -> ty0
+      | _ -> assert false
+    in
+    proxy_obj ty
+  | _ -> ty0
+
+(**** Utilities for fixed row private types ****)
+
+let row_of_type t =
+  match (repr t).desc with
+  | Tobject (t, _) ->
+    let rec get_row t =
+      let t = repr t in
+      match t.desc with
+      | Tfield (_, _, _, t) -> get_row t
+      | _ -> t
+    in
+    get_row t
+  | Tvariant row -> row_more row
+  | _ -> t
+
+let has_constr_row t = (not (is_Tconstr t)) && is_Tconstr (row_of_type t)
+
+let is_row_name s =
+  let l = String.length s in
+  if l < 4 then false else String.sub s (l - 4) 4 = "#row"
+
+let is_constr_row ~allow_ident t =
+  match t.desc with
+  | Tconstr (Path.Pident id, _, _) when allow_ident ->
+    is_row_name (Ident.name id)
+  | Tconstr (Path.Pdot (_, s, _), _, _) -> is_row_name s
+  | _ -> false
+
+(**********************************)
+(*  Utilities for type traversal  *)
+(**********************************)
+
+let rec iter_row f row =
+  List.iter
+    (fun (_, fi) ->
+      match row_field_repr fi with
+      | Rpresent (Some ty) -> f ty
+      | Reither (_, tl, _, _) -> List.iter f tl
+      | _ -> ())
+    row.row_fields;
+  match (repr row.row_more).desc with
+  | Tvariant row -> iter_row f row
+  | Tvar _ | Tunivar _ | Tsubst _ | Tconstr _ | Tnil ->
+    Misc.may (fun (_, l) -> List.iter f l) row.row_name
+  | _ -> assert false
+
+let iter_type_expr f ty =
+  match ty.desc with
+  | Tvar _ -> ()
+  | Tarrow ({typ = ty1}, ty2, _, _) ->
+    f ty1;
+    f ty2
+  | Ttuple l -> List.iter f l
+  | Tconstr (_, l, _) -> List.iter f l
+  | Tobject (ty, {contents = Some (_, p)}) ->
+    f ty;
+    List.iter f p
+  | Tobject (ty, _) -> f ty
+  | Tvariant row ->
+    iter_row f row;
+    f (row_more row)
+  | Tfield (_, _, ty1, ty2) ->
+    f ty1;
+    f ty2
+  | Tnil -> ()
+  | Tlink ty -> f ty
+  | Tsubst ty -> f ty
+  | Tunivar _ -> ()
+  | Tpoly (ty, tyl) ->
+    f ty;
+    List.iter f tyl
+  | Tpackage (_, _, l) -> List.iter f l
+
+let rec iter_abbrev f = function
+  | Mnil -> ()
+  | Mcons (_, _, ty, ty', rem) ->
+    f ty;
+    f ty';
+    iter_abbrev f rem
+  | Mlink rem -> iter_abbrev f !rem
+
+type type_iterators = {
+  it_signature: type_iterators -> signature -> unit;
+  it_signature_item: type_iterators -> signature_item -> unit;
+  it_value_description: type_iterators -> value_description -> unit;
+  it_type_declaration: type_iterators -> type_declaration -> unit;
+  it_extension_constructor: type_iterators -> extension_constructor -> unit;
+  it_module_declaration: type_iterators -> module_declaration -> unit;
+  it_modtype_declaration: type_iterators -> modtype_declaration -> unit;
+  it_module_type: type_iterators -> module_type -> unit;
+  it_type_kind: type_iterators -> type_kind -> unit;
+  it_do_type_expr: type_iterators -> type_expr -> unit;
+  it_type_expr: type_iterators -> type_expr -> unit;
+  it_path: Path.t -> unit;
+}
+
+let iter_type_expr_cstr_args f = function
+  | Cstr_tuple tl -> List.iter f tl
+  | Cstr_record lbls -> List.iter (fun d -> f d.ld_type) lbls
+
+let map_type_expr_cstr_args f = function
+  | Cstr_tuple tl -> Cstr_tuple (List.map f tl)
+  | Cstr_record lbls ->
+    Cstr_record (List.map (fun d -> {d with ld_type = f d.ld_type}) lbls)
+
+let iter_type_expr_kind f = function
+  | Type_abstract -> ()
+  | Type_variant cstrs ->
+    List.iter
+      (fun cd ->
+        iter_type_expr_cstr_args f cd.cd_args;
+        Misc.may f cd.cd_res)
+      cstrs
+  | Type_record (lbls, _) -> List.iter (fun d -> f d.ld_type) lbls
+  | Type_open -> ()
+
+let type_iterators =
+  let it_signature it = List.iter (it.it_signature_item it)
+  and it_signature_item it = function
+    | Sig_value (_, vd) -> it.it_value_description it vd
+    | Sig_type (_, td, _) -> it.it_type_declaration it td
+    | Sig_typext (_, td, _) -> it.it_extension_constructor it td
+    | Sig_module (_, md, _) -> it.it_module_declaration it md
+    | Sig_modtype (_, mtd) -> it.it_modtype_declaration it mtd
+    | Sig_class () -> assert false
+    | Sig_class_type () -> assert false
+  and it_value_description it vd = it.it_type_expr it vd.val_type
+  and it_type_declaration it td =
+    List.iter (it.it_type_expr it) td.type_params;
+    may (it.it_type_expr it) td.type_manifest;
+    it.it_type_kind it td.type_kind
+  and it_extension_constructor it td =
+    it.it_path td.ext_type_path;
+    List.iter (it.it_type_expr it) td.ext_type_params;
+    iter_type_expr_cstr_args (it.it_type_expr it) td.ext_args;
+    may (it.it_type_expr it) td.ext_ret_type
+  and it_module_declaration it md = it.it_module_type it md.md_type
+  and it_modtype_declaration it mtd = may (it.it_module_type it) mtd.mtd_type
+  and it_module_type it = function
+    | Mty_ident p | Mty_alias (_, p) -> it.it_path p
+    | Mty_signature sg -> it.it_signature it sg
+    | Mty_functor (_, mto, mt) ->
+      may (it.it_module_type it) mto;
+      it.it_module_type it mt
+  and it_type_kind it kind = iter_type_expr_kind (it.it_type_expr it) kind
+  and it_do_type_expr it ty =
+    iter_type_expr (it.it_type_expr it) ty;
+    match ty.desc with
+    | Tconstr (p, _, _)
+    | Tobject (_, {contents = Some (p, _)})
+    | Tpackage (p, _, _) ->
+      it.it_path p
+    | Tvariant row -> may (fun (p, _) -> it.it_path p) (row_repr row).row_name
+    | _ -> ()
+  and it_path _p = () in
+  {
+    it_path;
+    it_type_expr = it_do_type_expr;
+    it_do_type_expr;
+    it_type_kind;
+    it_module_type;
+    it_signature;
+    it_modtype_declaration;
+    it_module_declaration;
+    it_extension_constructor;
+    it_type_declaration;
+    it_value_description;
+    it_signature_item;
+  }
+
+let copy_row f fixed row keep more =
+  let fields =
+    List.map
+      (fun (l, fi) ->
+        ( l,
+          match row_field_repr fi with
+          | Rpresent (Some ty) -> Rpresent (Some (f ty))
+          | Reither (c, tl, m, e) ->
+            let e = if keep then e else ref None in
+            let m = if row.row_fixed then fixed else m in
+            let tl = List.map f tl in
+            Reither (c, tl, m, e)
+          | _ -> fi ))
+      row.row_fields
+  in
+  let name =
+    match row.row_name with
+    | None -> None
+    | Some (path, tl) -> Some (path, List.map f tl)
+  in
+  {
+    row_fields = fields;
+    row_more = more;
+    row_fixed = row.row_fixed && fixed;
+    row_closed = row.row_closed;
+    row_name = name;
+  }
+
+let rec copy_kind = function
+  | Fvar {contents = Some k} -> copy_kind k
+  | Fvar _ -> Fvar (ref None)
+  | Fpresent -> Fpresent
+  | Fabsent -> assert false
+
+let copy_commu c = if commu_repr c = Cok then Cok else Clink (ref Cunknown)
+
+(* Since univars may be used as row variables, we need to do some
+   encoding during substitution *)
+let rec norm_univar ty =
+  match ty.desc with
+  | Tunivar _ | Tsubst _ -> ty
+  | Tlink ty -> norm_univar ty
+  | Ttuple (ty :: _) -> norm_univar ty
+  | _ -> assert false
+
+let rec copy_type_desc ?(keep_names = false) f = function
+  | Tvar _ as ty -> if keep_names then ty else Tvar None
+  | Tarrow (arg, ret, c, arity) ->
+    Tarrow ({arg with typ = f arg.typ}, f ret, copy_commu c, arity)
+  | Ttuple l -> Ttuple (List.map f l)
+  | Tconstr (p, l, _) -> Tconstr (p, List.map f l, ref Mnil)
+  | Tobject (ty, {contents = Some (p, tl)}) ->
+    Tobject (f ty, ref (Some (p, List.map f tl)))
+  | Tobject (ty, _) -> Tobject (f ty, ref None)
+  | Tvariant _ -> assert false (* too ambiguous *)
+  | Tfield (p, k, ty1, ty2) ->
+    (* the kind is kept shared *)
+    Tfield (p, field_kind_repr k, f ty1, f ty2)
+  | Tnil -> Tnil
+  | Tlink ty -> copy_type_desc f ty.desc
+  | Tsubst _ -> assert false
+  | Tunivar _ as ty -> ty (* always keep the name *)
+  | Tpoly (ty, tyl) ->
+    let tyl = List.map (fun x -> norm_univar (f x)) tyl in
+    Tpoly (f ty, tyl)
+  | Tpackage (p, n, l) -> Tpackage (p, n, List.map f l)
+
+(* Utilities for copying *)
+
+let saved_desc = ref []
+(* Saved association of generic nodes with their description. *)
+
+let save_desc ty desc = saved_desc := (ty, desc) :: !saved_desc
+
+let saved_kinds = ref [] (* duplicated kind variables *)
+let new_kinds = ref [] (* new kind variables *)
+let dup_kind r =
+  (match !r with
+  | None -> ()
+  | Some _ -> assert false);
+  if not (List.memq r !new_kinds) then (
+    saved_kinds := r :: !saved_kinds;
+    let r' = ref None in
+    new_kinds := r' :: !new_kinds;
+    r := Some (Fvar r'))
+
+(* Restored type descriptions. *)
+let cleanup_types () =
+  List.iter (fun (ty, desc) -> ty.desc <- desc) !saved_desc;
+  List.iter (fun r -> r := None) !saved_kinds;
+  saved_desc := [];
+  saved_kinds := [];
+  new_kinds := []
+
+(* Mark a type. *)
+let rec mark_type ty =
+  let ty = repr ty in
+  if ty.level >= lowest_level then (
+    ty.level <- pivot_level - ty.level;
+    iter_type_expr mark_type ty)
+
+let mark_type_node ty =
+  let ty = repr ty in
+  if ty.level >= lowest_level then ty.level <- pivot_level - ty.level
+
+let mark_type_params ty = iter_type_expr mark_type ty
+
+let type_iterators =
+  let it_type_expr it ty =
+    let ty = repr ty in
+    if ty.level >= lowest_level then (
+      mark_type_node ty;
+      it.it_do_type_expr it ty)
+  in
+  {type_iterators with it_type_expr}
+
+(* Remove marks from a type. *)
+let rec unmark_type ty =
+  let ty = repr ty in
+  if ty.level < lowest_level then (
+    ty.level <- pivot_level - ty.level;
+    iter_type_expr unmark_type ty)
+
+let unmark_iterators =
+  let it_type_expr _it ty = unmark_type ty in
+  {type_iterators with it_type_expr}
+
+let unmark_type_decl decl =
+  unmark_iterators.it_type_declaration unmark_iterators decl
+
+let unmark_extension_constructor ext =
+  List.iter unmark_type ext.ext_type_params;
+  iter_type_expr_cstr_args unmark_type ext.ext_args;
+  Misc.may unmark_type ext.ext_ret_type
+
+(*******************************************)
+(*  Memorization of abbreviation expansion *)
+(*******************************************)
+
+(* Search whether the expansion has been memorized. *)
+
+let lte_public p1 p2 =
+  (* Private <= Public *)
+  match (p1, p2) with
+  | Private, _ | _, Public -> true
+  | Public, Private -> false
+
+let rec find_expans priv p1 = function
+  | Mnil -> None
+  | Mcons (priv', p2, _ty0, ty, _) when lte_public priv priv' && Path.same p1 p2
+    ->
+    Some ty
+  | Mcons (_, _, _, _, rem) -> find_expans priv p1 rem
+  | Mlink {contents = rem} -> find_expans priv p1 rem
+
+(* debug: check for cycles in abbreviation. only works with -principal
+   let rec check_expans visited ty =
+     let ty = repr ty in
+     assert (not (List.memq ty visited));
+     match ty.desc with
+       Tconstr (path, args, abbrev) ->
+         begin match find_expans path !abbrev with
+           Some ty' -> check_expans (ty :: visited) ty'
+         | None -> ()
+         end
+     | _ -> ()
+*)
+
+let memo = ref []
+(* Contains the list of saved abbreviation expansions. *)
+
+let cleanup_abbrev () =
+  (* Remove all memorized abbreviation expansions. *)
+  List.iter (fun abbr -> abbr := Mnil) !memo;
+  memo := []
+
+let memorize_abbrev mem priv path v v' =
+  (* Memorize the expansion of an abbreviation. *)
+  mem := Mcons (priv, path, v, v', !mem);
+  (* check_expans [] v; *)
+  memo := mem :: !memo
+
+let rec forget_abbrev_rec mem path =
+  match mem with
+  | Mnil -> assert false
+  | Mcons (_, path', _, _, rem) when Path.same path path' -> rem
+  | Mcons (priv, path', v, v', rem) ->
+    Mcons (priv, path', v, v', forget_abbrev_rec rem path)
+  | Mlink mem' ->
+    mem' := forget_abbrev_rec !mem' path;
+    raise Exit
+
+let forget_abbrev mem path =
+  try mem := forget_abbrev_rec !mem path with Exit -> ()
+
+(* debug: check for invalid abbreviations
+   let rec check_abbrev_rec = function
+       Mnil -> true
+     | Mcons (_, ty1, ty2, rem) ->
+         repr ty1 != repr ty2
+     | Mlink mem' ->
+         check_abbrev_rec !mem'
+
+   let check_memorized_abbrevs () =
+     List.for_all (fun mem -> check_abbrev_rec !mem) !memo
+*)
+
+(**********************************)
+(*  Utilities for labels          *)
+(**********************************)
+
+let is_optional = function
+  | Optional _ -> true
+  | _ -> false
+
+let label_name = function
+  | Nolabel -> ""
+  | Labelled {txt} | Optional {txt} -> txt
+
+let prefixed_label_name = function
+  | Nolabel -> ""
+  | Labelled {txt = s} -> "~" ^ s
+  | Optional {txt = s} -> "?" ^ s
+
+type sargs = (Asttypes.arg_label * Parsetree.expression) list
+
+let rec extract_label_aux hd l = function
+  | [] -> None
+  | ((l', t) as p) :: ls ->
+    if label_name l' = l then Some (l', t, List.rev_append hd ls)
+    else extract_label_aux (p :: hd) l ls
+
+let extract_label l (ls : sargs) :
+    (arg_label * Parsetree.expression * sargs) option =
+  extract_label_aux [] l ls
+
+let rec label_assoc x (args : sargs) =
+  match args with
+  | [] -> false
+  | (a, _) :: l -> Asttypes.same_arg_label a x || label_assoc x l
+
+(**********************************)
+(*  Utilities for backtracking    *)
+(**********************************)
+
+let undo_change = function
+  | Ctype (ty, desc) -> ty.desc <- desc
+  | Ccompress (ty, desc, _) -> ty.desc <- desc
+  | Clevel (ty, level) -> ty.level <- level
+  | Cname (r, v) -> r := v
+  | Crow (r, v) -> r := v
+  | Ckind (r, v) -> r := v
+  | Ccommu (r, v) -> r := v
+  | Cuniv (r, v) -> r := v
+  | Ctypeset (r, v) -> r := v
+
+type snapshot = changes ref * int
+let last_snapshot = ref 0
+
+let log_type ty =
+  if ty.id <= !last_snapshot then log_change (Ctype (ty, ty.desc))
+let link_type ty ty' =
+  log_type ty;
+  let desc = ty.desc in
+  ty.desc <- Tlink ty';
+  (* Name is a user-supplied name for this unification variable (obtained
+   * through a type annotation for instance). *)
+  match (desc, ty'.desc) with
+  | Tvar name, Tvar name' -> (
+    match (name, name') with
+    | Some _, None ->
+      log_type ty';
+      ty'.desc <- Tvar name
+    | None, Some _ -> ()
+    | Some _, Some _ ->
+      if ty.level < ty'.level then (
+        log_type ty';
+        ty'.desc <- Tvar name)
+    | None, None -> ())
+  | _ -> ()
+
+(* ; assert (check_memorized_abbrevs ()) *)
+(*  ; check_expans [] ty' *)
+let set_level ty level =
+  if ty.id <= !last_snapshot then log_change (Clevel (ty, ty.level));
+  ty.level <- level
+let set_univar rty ty =
+  log_change (Cuniv (rty, !rty));
+  rty := Some ty
+let set_name nm v =
+  log_change (Cname (nm, !nm));
+  nm := v
+let set_row_field e v =
+  log_change (Crow (e, !e));
+  e := Some v
+let set_kind rk k =
+  log_change (Ckind (rk, !rk));
+  rk := Some k
+let set_commu rc c =
+  log_change (Ccommu (rc, !rc));
+  rc := c
+let set_typeset rs s =
+  log_change (Ctypeset (rs, !rs));
+  rs := s
+
+let snapshot () =
+  let old = !last_snapshot in
+  last_snapshot := !new_id;
+  match Weak.get trail 0 with
+  | Some r -> (r, old)
+  | None ->
+    let r = ref Unchanged in
+    Weak.set trail 0 (Some r);
+    (r, old)
+
+let rec rev_log accu = function
+  | Unchanged -> accu
+  | Invalid -> assert false
+  | Change (ch, next) ->
+    let d = !next in
+    next := Invalid;
+    rev_log (ch :: accu) d
+
+let backtrack (changes, old) =
+  match !changes with
+  | Unchanged -> last_snapshot := old
+  | Invalid -> failwith "Btype.backtrack"
+  | Change _ as change ->
+    cleanup_abbrev ();
+    let backlog = rev_log [] change in
+    List.iter undo_change backlog;
+    changes := Unchanged;
+    last_snapshot := old;
+    Weak.set trail 0 (Some changes)
+
+let rec rev_compress_log log r =
+  match !r with
+  | Unchanged | Invalid -> log
+  | Change (Ccompress _, next) -> rev_compress_log (r :: log) next
+  | Change (_, next) -> rev_compress_log log next
+
+let undo_compress (changes, _old) =
+  match !changes with
+  | Unchanged | Invalid -> ()
+  | Change _ ->
+    let log = rev_compress_log [] changes in
+    List.iter
+      (fun r ->
+        match !r with
+        | Change (Ccompress (ty, desc, d), next) when ty.desc == d ->
+          ty.desc <- desc;
+          r := !next
+        | _ -> ())
+      log
diff --git a/compiler/ml/btype.mli b/compiler/ml/btype.mli
new file mode 100644
index 0000000..ef099af
--- /dev/null
+++ b/compiler/ml/btype.mli
@@ -0,0 +1,242 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Basic operations on core types *)
+
+open Asttypes
+open Types
+
+(**** Sets, maps and hashtables of types ****)
+
+module TypeSet : Set.S with type elt = type_expr
+module TypeMap : Map.S with type key = type_expr
+module TypeHash : Hashtbl.S with type key = type_expr
+
+(**** Levels ****)
+
+val generic_level : int
+
+val newty2 : int -> type_desc -> type_expr
+(* Create a type *)
+
+val newgenty : type_desc -> type_expr
+(* Create a generic type *)
+
+val newgenvar : ?name:string -> unit -> type_expr
+(* Return a fresh generic variable *)
+
+(* Use Tsubst instead
+   val newmarkedvar: int -> type_expr
+           (* Return a fresh marked variable *)
+   val newmarkedgenvar: unit -> type_expr
+           (* Return a fresh marked generic variable *)
+*)
+
+(**** Types ****)
+
+val is_Tvar : type_expr -> bool
+val is_Tunivar : type_expr -> bool
+val is_Tconstr : type_expr -> bool
+val dummy_method : label
+val default_mty : module_type option -> module_type
+
+val repr : type_expr -> type_expr
+(* Return the canonical representative of a type. *)
+
+val field_kind_repr : field_kind -> field_kind
+(* Return the canonical representative of an object field
+   kind. *)
+
+val commu_repr : commutable -> commutable
+(* Return the canonical representative of a commutation lock *)
+
+(**** polymorphic variants ****)
+
+val row_repr : row_desc -> row_desc
+(* Return the canonical representative of a row description *)
+
+val row_field_repr : row_field -> row_field
+val row_field : label -> row_desc -> row_field
+(* Return the canonical representative of a row field *)
+
+val row_more : row_desc -> type_expr
+(* Return the extension variable of the row *)
+
+val row_fixed : row_desc -> bool
+(* Return whether the row should be treated as fixed or not *)
+
+val static_row : row_desc -> bool
+(* Return whether the row is static or not *)
+
+val hash_variant : label -> int
+(* Hash function for variant tags *)
+
+val proxy : type_expr -> type_expr
+(* Return the proxy representative of the type: either itself
+   or a row variable *)
+
+(**** Utilities for private abbreviations with fixed rows ****)
+val row_of_type : type_expr -> type_expr
+val has_constr_row : type_expr -> bool
+val is_row_name : string -> bool
+val is_constr_row : allow_ident:bool -> type_expr -> bool
+
+(**** Utilities for type traversal ****)
+
+val iter_type_expr : (type_expr -> unit) -> type_expr -> unit
+(* Iteration on types *)
+
+val iter_row : (type_expr -> unit) -> row_desc -> unit
+(* Iteration on types in a row *)
+
+val iter_abbrev : (type_expr -> unit) -> abbrev_memo -> unit
+(* Iteration on types in an abbreviation list *)
+
+type type_iterators = {
+  it_signature: type_iterators -> signature -> unit;
+  it_signature_item: type_iterators -> signature_item -> unit;
+  it_value_description: type_iterators -> value_description -> unit;
+  it_type_declaration: type_iterators -> type_declaration -> unit;
+  it_extension_constructor: type_iterators -> extension_constructor -> unit;
+  it_module_declaration: type_iterators -> module_declaration -> unit;
+  it_modtype_declaration: type_iterators -> modtype_declaration -> unit;
+  it_module_type: type_iterators -> module_type -> unit;
+  it_type_kind: type_iterators -> type_kind -> unit;
+  it_do_type_expr: type_iterators -> type_expr -> unit;
+  it_type_expr: type_iterators -> type_expr -> unit;
+  it_path: Path.t -> unit;
+}
+val type_iterators : type_iterators
+(* Iteration on arbitrary type information.
+   [it_type_expr] calls [mark_type_node] to avoid loops. *)
+
+val unmark_iterators : type_iterators
+(* Unmark any structure containing types. See [unmark_type] below. *)
+
+val copy_type_desc :
+  ?keep_names:bool -> (type_expr -> type_expr) -> type_desc -> type_desc
+(* Copy on types *)
+
+val copy_row :
+  (type_expr -> type_expr) -> bool -> row_desc -> bool -> type_expr -> row_desc
+val copy_kind : field_kind -> field_kind
+
+val save_desc : type_expr -> type_desc -> unit
+(* Save a type description *)
+
+val dup_kind : field_kind option ref -> unit
+(* Save a None field_kind, and make it point to a fresh Fvar *)
+
+val cleanup_types : unit -> unit
+(* Restore type descriptions *)
+
+val lowest_level : int
+(* Marked type: ty.level < lowest_level *)
+
+val pivot_level : int
+(* Type marking: ty.level <- pivot_level - ty.level *)
+
+val mark_type : type_expr -> unit
+(* Mark a type *)
+
+val mark_type_node : type_expr -> unit
+(* Mark a type node (but not its sons) *)
+
+val mark_type_params : type_expr -> unit
+(* Mark the sons of a type node *)
+
+val unmark_type : type_expr -> unit
+val unmark_type_decl : type_declaration -> unit
+val unmark_extension_constructor : extension_constructor -> unit
+
+(**** Memorization of abbreviation expansion ****)
+
+val find_expans : private_flag -> Path.t -> abbrev_memo -> type_expr option
+(* Look up a memorized abbreviation *)
+
+val cleanup_abbrev : unit -> unit
+(* Flush the cache of abbreviation expansions.
+   When some types are saved (using [output_value]), this
+   function MUST be called just before. *)
+
+val memorize_abbrev :
+  abbrev_memo ref -> private_flag -> Path.t -> type_expr -> type_expr -> unit
+(* Add an expansion in the cache *)
+
+val forget_abbrev : abbrev_memo ref -> Path.t -> unit
+(* Remove an abbreviation from the cache *)
+
+(**** Utilities for labels ****)
+
+val is_optional : arg_label -> bool
+val label_name : arg_label -> label
+
+(* Returns the label name with first character '?' or '~' as appropriate. *)
+val prefixed_label_name : arg_label -> label
+
+type sargs = (arg_label * Parsetree.expression) list
+
+val extract_label :
+  label -> sargs -> (arg_label * Parsetree.expression * sargs) option
+(* actual label, value, new list with the same order *)
+
+val label_assoc : arg_label -> sargs -> bool
+(**** Utilities for backtracking ****)
+
+type snapshot
+(* A snapshot for backtracking *)
+
+val snapshot : unit -> snapshot
+(* Make a snapshot for later backtracking. Costs nothing *)
+
+val backtrack : snapshot -> unit
+(* Backtrack to a given snapshot. Only possible if you have
+   not already backtracked to a previous snapshot.
+   Calls [cleanup_abbrev] internally *)
+
+val undo_compress : snapshot -> unit
+(* Backtrack only path compression. Only meaningful if you have
+   not already backtracked to a previous snapshot.
+   Does not call [cleanup_abbrev] *)
+
+(* Functions to use when modifying a type (only Ctype?) *)
+val link_type : type_expr -> type_expr -> unit
+(* Set the desc field of [t1] to [Tlink t2], logging the old
+   value if there is an active snapshot *)
+
+val set_level : type_expr -> int -> unit
+val set_name :
+  (Path.t * type_expr list) option ref ->
+  (Path.t * type_expr list) option ->
+  unit
+val set_row_field : row_field option ref -> row_field -> unit
+val set_univar : type_expr option ref -> type_expr -> unit
+val set_kind : field_kind option ref -> field_kind -> unit
+val set_commu : commutable ref -> commutable -> unit
+val set_typeset : TypeSet.t ref -> TypeSet.t -> unit
+(* Set references, logging the old value *)
+
+val log_type : type_expr -> unit
+(* Log the old value of a type, before modifying it by hand *)
+
+(**** Forward declarations ****)
+val print_raw : (Format.formatter -> type_expr -> unit) ref
+
+val iter_type_expr_kind : (type_expr -> unit) -> type_kind -> unit
+
+val iter_type_expr_cstr_args :
+  (type_expr -> unit) -> constructor_arguments -> unit
+val map_type_expr_cstr_args :
+  (type_expr -> type_expr) -> constructor_arguments -> constructor_arguments
diff --git a/compiler/ml/builtin_attributes.ml b/compiler/ml/builtin_attributes.ml
new file mode 100644
index 0000000..a4d0731
--- /dev/null
+++ b/compiler/ml/builtin_attributes.ml
@@ -0,0 +1,254 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                         Alain Frisch, LexiFi                           *)
+(*                                                                        *)
+(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Asttypes
+open Parsetree
+
+let string_of_cst = function
+  | Pconst_string (s, _) -> Some s
+  | _ -> None
+
+let string_of_payload = function
+  | PStr [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_constant c}, _)}] ->
+    string_of_cst c
+  | _ -> None
+
+let string_of_opt_payload p =
+  match string_of_payload p with
+  | Some s -> s
+  | None -> ""
+
+let rec error_of_extension ext =
+  match ext with
+  | {txt = ("ocaml.error" | "error") as txt; loc}, p -> (
+    let rec sub_from inner =
+      match inner with
+      | {pstr_desc = Pstr_extension (ext, _)} :: rest ->
+        error_of_extension ext :: sub_from rest
+      | _ :: rest ->
+        Location.errorf ~loc "Invalid syntax for sub-error of extension '%s'."
+          txt
+        :: sub_from rest
+      | [] -> []
+    in
+    match p with
+    | PStr [] -> raise Location.Already_displayed_error
+    | PStr
+        ({
+           pstr_desc =
+             Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string (msg, _))}, _);
+         }
+        :: {
+             pstr_desc =
+               Pstr_eval
+                 ( {pexp_desc = Pexp_constant (Pconst_string (if_highlight, _))},
+                   _ );
+           }
+        :: inner) ->
+      Location.error ~loc ~if_highlight ~sub:(sub_from inner) msg
+    | PStr
+        ({
+           pstr_desc =
+             Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string (msg, _))}, _);
+         }
+        :: inner) ->
+      Location.error ~loc ~sub:(sub_from inner) msg
+    | _ -> Location.errorf ~loc "Invalid syntax for extension '%s'." txt)
+  | {txt; loc}, _ -> Location.errorf ~loc "Uninterpreted extension '%s'." txt
+
+let cat s1 s2 =
+  if s2 = "" then s1
+  else (* 2 spaces indentation for the next line *)
+    s1 ^ "\n  " ^ s2
+
+let rec deprecated_of_attrs = function
+  | [] -> None
+  | ({txt = "ocaml.deprecated" | "deprecated"; _}, p) :: _ ->
+    Some (string_of_opt_payload p)
+  | _ :: tl -> deprecated_of_attrs tl
+
+let rec deprecated_of_attrs_with_migrate = function
+  | [] -> None
+  | ( {txt = "deprecated"; _},
+      PStr [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_record (fields, _)}, _)}]
+    )
+    :: _ -> (
+    let reason =
+      fields
+      |> List.find_map (fun field ->
+             match field with
+             | {
+              lid = {txt = Lident "reason"};
+              x = {pexp_desc = Pexp_constant (Pconst_string (reason, _))};
+             } ->
+               Some reason
+             | _ -> None)
+    in
+    let migration_template =
+      fields
+      |> List.find_map (fun field ->
+             match field with
+             | {lid = {txt = Lident "migrate"}; x = migration_template} ->
+               Some migration_template
+             | _ -> None)
+    in
+    let migration_in_pipe_chain_template =
+      fields
+      |> List.find_map (fun field ->
+             match field with
+             | {
+              lid = {txt = Lident "migrateInPipeChain"};
+              x = migration_in_pipe_chain_template;
+             } ->
+               Some migration_in_pipe_chain_template
+             | _ -> None)
+    in
+
+    (* TODO: Validate and error if expected shape mismatches *)
+    match reason with
+    | Some reason ->
+      Some (reason, migration_template, migration_in_pipe_chain_template)
+    | None -> None)
+  | ({txt = "ocaml.deprecated" | "deprecated"; _}, p) :: _ ->
+    Some (string_of_opt_payload p, None, None)
+  | _ :: tl -> deprecated_of_attrs_with_migrate tl
+
+let check_deprecated ?deprecated_context loc attrs s =
+  match deprecated_of_attrs_with_migrate attrs with
+  | None -> ()
+  | Some (txt, migration_template, migration_in_pipe_chain_template) ->
+    !Cmt_utils.record_deprecated_used
+      ?deprecated_context ?migration_template ?migration_in_pipe_chain_template
+      loc txt;
+    Location.deprecated
+      ~can_be_automigrated:
+        (Option.is_some migration_template
+        || Option.is_some migration_in_pipe_chain_template)
+      loc (cat s txt)
+
+let check_deprecated_inclusion ~def ~use loc attrs1 attrs2 s =
+  match (deprecated_of_attrs attrs1, deprecated_of_attrs attrs2) with
+  | None, _ | Some _, Some _ -> ()
+  | Some txt, None -> Location.deprecated ~def ~use loc (cat s txt)
+
+let rec deprecated_mutable_of_attrs = function
+  | [] -> None
+  | ({txt = "ocaml.deprecated_mutable" | "deprecated_mutable"; _}, p) :: _ ->
+    Some (string_of_opt_payload p)
+  | _ :: tl -> deprecated_mutable_of_attrs tl
+
+let check_deprecated_mutable loc attrs s =
+  match deprecated_mutable_of_attrs attrs with
+  | None -> ()
+  | Some txt ->
+    Location.deprecated loc (Printf.sprintf "mutating field %s" (cat s txt))
+
+let check_deprecated_mutable_inclusion ~def ~use loc attrs1 attrs2 s =
+  match
+    (deprecated_mutable_of_attrs attrs1, deprecated_mutable_of_attrs attrs2)
+  with
+  | None, _ | Some _, Some _ -> ()
+  | Some txt, None ->
+    Location.deprecated ~def ~use loc
+      (Printf.sprintf "mutating field %s" (cat s txt))
+
+let check_bs_attributes_inclusion = ref (fun _attrs1 _attrs2 _s -> None)
+
+let check_duplicated_labels : (_ -> _ option) ref = ref (fun _lbls -> None)
+
+let rec deprecated_of_sig = function
+  | {psig_desc = Psig_attribute a} :: tl -> (
+    match deprecated_of_attrs [a] with
+    | None -> deprecated_of_sig tl
+    | Some _ as r -> r)
+  | _ -> None
+
+let rec deprecated_of_str = function
+  | {pstr_desc = Pstr_attribute a} :: tl -> (
+    match deprecated_of_attrs [a] with
+    | None -> deprecated_of_str tl
+    | Some _ as r -> r)
+  | _ -> None
+
+let warning_attribute ?(ppwarning = true) =
+  let process loc txt errflag payload =
+    match string_of_payload payload with
+    | Some s -> (
+      try Warnings.parse_options errflag s
+      with Arg.Bad _ ->
+        Location.prerr_warning loc
+          (Warnings.Attribute_payload (txt, "Ill-formed list of warnings")))
+    | None ->
+      Location.prerr_warning loc
+        (Warnings.Attribute_payload (txt, "A single string literal is expected"))
+  in
+  function
+  | {txt = ("ocaml.warning" | "warning") as txt; loc}, payload ->
+    process loc txt false payload
+  | {txt = ("ocaml.warnerror" | "warnerror") as txt; loc}, payload ->
+    process loc txt true payload
+  | ( {txt = "ocaml.ppwarning" | "ppwarning"},
+      PStr
+        [
+          {
+            pstr_desc =
+              Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string (s, _))}, _);
+            pstr_loc;
+          };
+        ] )
+    when ppwarning ->
+    Location.prerr_warning pstr_loc (Warnings.Preprocessor s)
+  | _ -> ()
+
+let warning_scope ?ppwarning attrs f =
+  let prev = Warnings.backup () in
+  try
+    List.iter (warning_attribute ?ppwarning) (List.rev attrs);
+    let ret = f () in
+    Warnings.restore prev;
+    ret
+  with exn ->
+    Warnings.restore prev;
+    raise exn
+
+let warn_on_literal_pattern =
+  List.exists (function
+    | {txt = "ocaml.warn_on_literal_pattern" | "warn_on_literal_pattern"; _}, _
+      ->
+      true
+    | _ -> false)
+
+let explicit_arity =
+  List.exists (function
+    | {txt = "ocaml.explicit_arity" | "explicit_arity"; _}, _ -> true
+    | _ -> false)
+
+let immediate =
+  List.exists (function
+    | {txt = "ocaml.immediate" | "immediate"; _}, _ -> true
+    | _ -> false)
+
+(* The "ocaml.boxed (default)" and "ocaml.unboxed (default)"
+   attributes cannot be input by the user, they are added by the
+   compiler when applying the default setting. This is done to record
+   in the .cmi the default used by the compiler when compiling the
+   source file because the default can change between compiler
+   invocations. *)
+
+let check l (x, _) = List.mem x.txt l
+
+let has_unboxed attr = List.exists (check ["ocaml.unboxed"; "unboxed"]) attr
+
+let has_boxed attr = List.exists (check ["ocaml.boxed"; "boxed"]) attr
diff --git a/compiler/ml/builtin_attributes.mli b/compiler/ml/builtin_attributes.mli
new file mode 100644
index 0000000..63bf762
--- /dev/null
+++ b/compiler/ml/builtin_attributes.mli
@@ -0,0 +1,97 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                         Alain Frisch, LexiFi                           *)
+(*                                                                        *)
+(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Support for some of the builtin attributes:
+
+   ocaml.deprecated
+   ocaml.error
+   ocaml.ppwarning
+   ocaml.warning
+   ocaml.warnerror
+   ocaml.explicit_arity (for camlp4/camlp5)
+   ocaml.warn_on_literal_pattern
+   ocaml.deprecated_mutable
+   ocaml.immediate
+   ocaml.boxed / ocaml.unboxed
+*)
+
+val check_deprecated :
+  ?deprecated_context:Cmt_utils.deprecated_used_context ->
+  Location.t ->
+  Parsetree.attributes ->
+  string ->
+  unit
+val check_deprecated_inclusion :
+  def:Location.t ->
+  use:Location.t ->
+  Location.t ->
+  Parsetree.attributes ->
+  Parsetree.attributes ->
+  string ->
+  unit
+val deprecated_of_attrs : Parsetree.attributes -> string option
+val deprecated_of_sig : Parsetree.signature -> string option
+val deprecated_of_str : Parsetree.structure -> string option
+
+val check_deprecated_mutable :
+  Location.t -> Parsetree.attributes -> string -> unit
+val check_deprecated_mutable_inclusion :
+  def:Location.t ->
+  use:Location.t ->
+  Location.t ->
+  Parsetree.attributes ->
+  Parsetree.attributes ->
+  string ->
+  unit
+
+val check_bs_attributes_inclusion :
+  (Parsetree.attributes ->
+  Parsetree.attributes ->
+  string ->
+  (string * string) option)
+  ref
+
+val check_duplicated_labels :
+  (Parsetree.label_declaration list -> string Asttypes.loc option) ref
+val error_of_extension : Parsetree.extension -> Location.error
+
+val warning_attribute : ?ppwarning:bool -> Parsetree.attribute -> unit
+(** Apply warning settings from the specified attribute.
+      "ocaml.warning"/"ocaml.warnerror" (and variants without the prefix)
+      are processed and other attributes are ignored.
+
+      Also implement ocaml.ppwarning (unless ~ppwarning:false is
+      passed).
+  *)
+
+val warning_scope :
+  ?ppwarning:bool -> Parsetree.attributes -> (unit -> 'a) -> 'a
+(** Execute a function in a new scope for warning settings.  This
+      means that the effect of any call to [warning_attribute] during
+      the execution of this function will be discarded after
+      execution.
+
+      The function also takes a list of attributes which are processed
+      with [warning_attribute] in the fresh scope before the function
+      is executed.
+  *)
+
+val warn_on_literal_pattern : Parsetree.attributes -> bool
+val explicit_arity : Parsetree.attributes -> bool
+
+val immediate : Parsetree.attributes -> bool
+
+val has_unboxed : Parsetree.attributes -> bool
+val has_boxed : Parsetree.attributes -> bool
diff --git a/compiler/ml/ccomp.ml b/compiler/ml/ccomp.ml
new file mode 100644
index 0000000..d6fb5f1
--- /dev/null
+++ b/compiler/ml/ccomp.ml
@@ -0,0 +1,6 @@
+let command cmdline =
+  if !Clflags.verbose then (
+    prerr_string "+ ";
+    prerr_string cmdline;
+    prerr_newline ());
+  Sys.command cmdline
diff --git a/compiler/ml/ccomp.mli b/compiler/ml/ccomp.mli
new file mode 100644
index 0000000..87678cc
--- /dev/null
+++ b/compiler/ml/ccomp.mli
@@ -0,0 +1 @@
+val command : string -> int
diff --git a/jscomp/ml/classify_function.ml b/compiler/ml/classify_function.ml
similarity index 87%
rename from jscomp/ml/classify_function.ml
rename to compiler/ml/classify_function.ml
index 5565b23..1a7b0f4 100644
--- a/jscomp/ml/classify_function.ml
+++ b/compiler/ml/classify_function.ml
@@ -24,7 +24,10 @@
 
 let rec is_obj_literal (x : _ Flow_ast.Expression.t) : bool =
   match snd x with
-  | Identifier (_, {name = "undefined"}) | Literal _ -> true
+  | Identifier (_, {name = "undefined"})
+  | StringLiteral _ | BooleanLiteral _ | NullLiteral _ | NumberLiteral _
+  | BigIntLiteral _ | RegExpLiteral _ | ModuleRefLiteral _ ->
+    true
   | Unary {operator = Minus; argument} -> is_obj_literal argument
   | Object {properties} -> Ext_list.for_all properties is_literal_kv
   | Array {elements} ->
@@ -61,7 +64,13 @@ let classify_exp (prog : _ Flow_ast.Expression.t) : Js_raw_info.exp =
           predicate = None;
         } ) ->
     Js_function {arity = List.length params; arrow = true}
-  | _, Literal {comments} ->
+  | _, StringLiteral {comments}
+  | _, BooleanLiteral {comments}
+  | _, NullLiteral comments
+  | _, NumberLiteral {comments}
+  | _, BigIntLiteral {comments}
+  | _, RegExpLiteral {comments}
+  | _, ModuleRefLiteral {comments} ->
     let comment =
       match comments with
       | None -> None
@@ -84,7 +93,9 @@ let classify_exp (prog : _ Flow_ast.Expression.t) : Js_raw_info.exp =
 let classify ?(check : (Location.t * int) option) (prog : string) :
     Js_raw_info.exp =
   let prog, errors =
-    Parser_flow.parse_expression (Parser_env.init_env None prog) false
+    let open Parser_flow in
+    let env = Parser_env.init_env None prog in
+    do_parse env Parse.expression false
   in
   match (check, errors) with
   | Some (loc, offset), _ :: _ ->
diff --git a/jscomp/ml/classify_function.mli b/compiler/ml/classify_function.mli
similarity index 100%
rename from jscomp/ml/classify_function.mli
rename to compiler/ml/classify_function.mli
diff --git a/compiler/ml/clflags.ml b/compiler/ml/clflags.ml
new file mode 100644
index 0000000..f0cd881
--- /dev/null
+++ b/compiler/ml/clflags.ml
@@ -0,0 +1,73 @@
+let output_name = ref (None : string option) (* -o *)
+
+and include_dirs = ref ([] : string list) (* -I *)
+
+and debug = ref false (* -g *)
+
+and fast = ref false (* -unsafe *)
+
+and nopervasives = ref false (* -nopervasives *)
+
+and preprocessor = ref (None : string option) (* -pp *)
+
+and all_ppx = ref ([] : string list)
+
+(* -ppx *)
+let annotations = ref false (* -annot *)
+let binary_annotations = ref false (* -annot *)
+
+and noassert = ref false (* -noassert *)
+
+and verbose = ref false (* -verbose *)
+
+and open_modules = ref [] (* -open *)
+
+and real_paths = ref true (* -short-paths *)
+
+and applicative_functors = ref true (* -no-app-funct *)
+
+and error_size = ref 500 (* -error-size *)
+
+and transparent_modules = ref false (* -trans-mod *)
+let dump_source = ref false (* -dsource *)
+let dump_parsetree = ref false (* -dparsetree *)
+
+and dump_typedtree = ref false (* -dtypedtree *)
+
+and dump_rawlambda = ref false (* -drawlambda *)
+
+and dump_lambda = ref false (* -dlambda *)
+
+and only_parse = ref false (* -only-parse *)
+
+and editor_mode = ref false (* -editor-mode *)
+
+and ignore_parse_errors = ref false (* -ignore-parse-errors *)
+
+let dont_write_files = ref false (* set to true under ocamldoc *)
+
+let reset_dump_state () =
+  dump_source := false;
+  dump_parsetree := false;
+  dump_typedtree := false;
+  dump_rawlambda := false
+
+let keep_locs = ref true (* -keep-locs *)
+
+let parse_color_setting = function
+  | "auto" -> Some Misc.Color.Auto
+  | "always" -> Some Misc.Color.Always
+  | "never" -> Some Misc.Color.Never
+  | _ -> None
+let color = ref None
+
+(* -color *)
+
+let unboxed_types = ref false
+
+type mli_status = Mli_exists | Mli_non_exists
+let assume_no_mli = ref Mli_non_exists
+let dont_record_crc_unit : string option ref = ref None
+let bs_gentype = ref false
+let no_assert_false = ref false
+let dump_location = ref true
diff --git a/jscomp/ml/clflags.mli b/compiler/ml/clflags.mli
similarity index 87%
rename from jscomp/ml/clflags.mli
rename to compiler/ml/clflags.mli
index 80b1704..0cb5f1e 100644
--- a/jscomp/ml/clflags.mli
+++ b/compiler/ml/clflags.mli
@@ -22,24 +22,21 @@ val dump_typedtree : bool ref
 val dump_rawlambda : bool ref
 val dump_lambda : bool ref
 val dont_write_files : bool ref
-val keep_docs : bool ref
 val keep_locs : bool ref
 val only_parse : bool ref
-val ignore_parse_errors: bool ref
-
+val ignore_parse_errors : bool ref
+val editor_mode : bool ref
 
 val parse_color_setting : string -> Misc.Color.setting option
 val color : Misc.Color.setting option ref
 
 val unboxed_types : bool ref
 
-val reset_dump_state: unit -> unit 
-
+val reset_dump_state : unit -> unit
 
-type mli_status =  Mli_exists | Mli_non_exists
+type mli_status = Mli_exists | Mli_non_exists
 val assume_no_mli : mli_status ref
 val dont_record_crc_unit : string option ref
 val bs_gentype : bool ref
 val no_assert_false : bool ref
 val dump_location : bool ref
-
diff --git a/compiler/ml/cmi_format.ml b/compiler/ml/cmi_format.ml
new file mode 100644
index 0000000..1a708b9
--- /dev/null
+++ b/compiler/ml/cmi_format.ml
@@ -0,0 +1,134 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                   Fabrice Le Fessant, INRIA Saclay                     *)
+(*                                                                        *)
+(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+type pers_flags = Deprecated of string
+
+type error =
+  | Not_an_interface of string
+  | Wrong_version_interface of string * string
+  | Corrupted_interface of string
+
+exception Error of error
+
+type cmi_infos = {
+  cmi_name: string;
+  cmi_sign: Types.signature_item list;
+  cmi_crcs: (string * Digest.t option) list;
+  cmi_flags: pers_flags list;
+}
+
+let input_cmi ic =
+  let name, sign = input_value ic in
+  let crcs = input_value ic in
+  let flags = input_value ic in
+  {cmi_name = name; cmi_sign = sign; cmi_crcs = crcs; cmi_flags = flags}
+
+let read_cmi filename =
+  let ic = open_in_bin filename in
+  try
+    let buffer =
+      really_input_string ic (String.length Config.cmi_magic_number)
+    in
+    if buffer <> Config.cmi_magic_number then (
+      close_in ic;
+      let pre_len = String.length Config.cmi_magic_number - 3 in
+      if
+        String.sub buffer 0 pre_len
+        = String.sub Config.cmi_magic_number 0 pre_len
+      then
+        let msg =
+          if buffer < Config.cmi_magic_number then "an older" else "a newer"
+        in
+        raise (Error (Wrong_version_interface (filename, msg)))
+      else raise (Error (Not_an_interface filename)));
+    let cmi = input_cmi ic in
+    close_in ic;
+    cmi
+  with
+  | End_of_file | Failure _ ->
+    close_in ic;
+    raise (Error (Corrupted_interface filename))
+  | Error e ->
+    close_in ic;
+    raise (Error e)
+
+let output_cmi filename oc cmi =
+  (* beware: the provided signature must have been substituted for saving *)
+  output_string oc Config.cmi_magic_number;
+  output_value oc (cmi.cmi_name, cmi.cmi_sign);
+  flush oc;
+  let crc = Digest.file filename in
+  let crcs = (cmi.cmi_name, Some crc) :: cmi.cmi_crcs in
+  output_value oc crcs;
+  output_value oc cmi.cmi_flags;
+  crc
+
+(* This function is also called by [save_cmt] as cmi_format is subset of
+       cmt_format, so dont close the channel yet
+*)
+let create_cmi ?check_exists filename (cmi : cmi_infos) =
+  (* beware: the provided signature must have been substituted for saving *)
+  let content =
+    Config.cmi_magic_number ^ Marshal.to_string (cmi.cmi_name, cmi.cmi_sign) []
+    (* checkout [output_value] in {!Pervasives} module *)
+  in
+  let crc = Digest.string content in
+  let cmi_infos =
+    if check_exists <> None && Sys.file_exists filename then
+      Some (read_cmi filename)
+    else None
+  in
+  match cmi_infos with
+  | Some
+      {
+        cmi_name = _;
+        cmi_sign = _;
+        cmi_crcs = (old_name, Some old_crc) :: rest;
+        cmi_flags;
+      }
+  (* TODO: design the cmi format so that we don't need read the whole cmi *)
+    when cmi.cmi_name = old_name && crc = old_crc && cmi.cmi_crcs = rest
+         && cmi_flags = cmi.cmi_flags ->
+    crc
+  | _ ->
+    let crcs = (cmi.cmi_name, Some crc) :: cmi.cmi_crcs in
+    let oc = open_out_bin filename in
+    output_string oc content;
+    output_value oc crcs;
+    output_value oc cmi.cmi_flags;
+    close_out oc;
+    crc
+
+(* Error report *)
+
+open Format
+
+let report_error ppf = function
+  | Not_an_interface filename ->
+    fprintf ppf "%a@ is not a compiled interface" Location.print_filename
+      filename
+  | Wrong_version_interface (filename, older_newer) ->
+    fprintf ppf
+      "%a@ is not a compiled interface for this version of OCaml.@.It seems to \
+       be for %s version of OCaml."
+      Location.print_filename filename older_newer
+  | Corrupted_interface filename ->
+    fprintf ppf "Corrupted compiled interface@ %a" Location.print_filename
+      filename
+
+let () =
+  Location.register_error_of_exn (function
+    | Error err -> Some (Location.error_of_printer_file report_error err)
+    | _ -> None)
diff --git a/jscomp/ml/cmi_format.mli b/compiler/ml/cmi_format.mli
similarity index 86%
rename from jscomp/ml/cmi_format.mli
rename to compiler/ml/cmi_format.mli
index 7aa7f8d..ca608d3 100644
--- a/jscomp/ml/cmi_format.mli
+++ b/compiler/ml/cmi_format.mli
@@ -13,16 +13,13 @@
 (*                                                                        *)
 (**************************************************************************)
 
-type pers_flags =
-  | Deprecated of string
-
-
+type pers_flags = Deprecated of string
 
 type cmi_infos = {
-    cmi_name : string;
-    cmi_sign : Types.signature_item list;
-    cmi_crcs : (string * Digest.t option) list;
-    cmi_flags : pers_flags list;
+  cmi_name: string;
+  cmi_sign: Types.signature_item list;
+  cmi_crcs: (string * Digest.t option) list;
+  cmi_flags: pers_flags list;
 }
 
 (* write the magic + the cmi information *)
@@ -39,7 +36,7 @@ val read_cmi : string -> cmi_infos
 (* Error report *)
 
 type error =
-    Not_an_interface of string
+  | Not_an_interface of string
   | Wrong_version_interface of string * string
   | Corrupted_interface of string
 
@@ -47,4 +44,4 @@ exception Error of error
 
 open Format
 
-val report_error: formatter -> error -> unit
+val report_error : formatter -> error -> unit
diff --git a/jscomp/ml/cmt_format.ml b/compiler/ml/cmt_format.ml
similarity index 90%
rename from jscomp/ml/cmt_format.ml
rename to compiler/ml/cmt_format.ml
index b3a6b66..ff30fc0 100644
--- a/jscomp/ml/cmt_format.ml
+++ b/compiler/ml/cmt_format.ml
@@ -63,6 +63,7 @@ type cmt_infos = {
   cmt_imports : (string * Digest.t option) list;
   cmt_interface_digest : Digest.t option;
   cmt_use_summaries : bool;
+  cmt_extra_info: Cmt_utils.cmt_extra_info;
 }
 
 type error =
@@ -154,15 +155,30 @@ let read_cmi filename =
 
 let saved_types = ref []
 let value_deps = ref []
+let deprecated_used = ref []
 
 let clear () =
   saved_types := [];
-  value_deps := []
+  value_deps := [];
+  deprecated_used := []
 
 let add_saved_type b = saved_types := b :: !saved_types
 let get_saved_types () = !saved_types
 let set_saved_types l = saved_types := l
 
+let record_deprecated_used ?deprecated_context ?migration_template ?migration_in_pipe_chain_template source_loc deprecated_text =
+  deprecated_used :=
+    {
+      Cmt_utils.source_loc;
+      deprecated_text;
+      migration_template;
+      migration_in_pipe_chain_template;
+      context = deprecated_context;
+    }
+    :: !deprecated_used
+
+let _ = Cmt_utils.record_deprecated_used := record_deprecated_used
+
 let record_value_dependency vd1 vd2 =
   if vd1.Types.val_loc <> vd2.Types.val_loc then
     value_deps := (vd1, vd2) :: !value_deps
@@ -174,9 +190,7 @@ open Cmi_format
 
 let save_cmt filename modname binary_annots sourcefile initial_env cmi =
   if !Clflags.binary_annotations then begin
-    (if !Config.bs_only then Misc.output_to_bin_file_directly else 
-    Misc.output_to_file_via_temporary
-       ~mode:[Open_binary] ) filename
+    Misc.output_to_bin_file_directly filename
        (fun temp_file_name oc ->
          let this_crc =
            match cmi with
@@ -188,7 +202,7 @@ let save_cmt filename modname binary_annots sourcefile initial_env cmi =
            cmt_modname = modname;
            cmt_annots = clear_env binary_annots;
            cmt_value_dependencies = !value_deps;
-           cmt_comments = Lexer.comments ();
+           cmt_comments = [];
            cmt_args = Sys.argv;
            cmt_sourcefile = sourcefile;
            cmt_builddir =  Sys.getcwd ();
@@ -199,8 +213,9 @@ let save_cmt filename modname binary_annots sourcefile initial_env cmi =
            cmt_imports = List.sort compare (Env.imports ());
            cmt_interface_digest = this_crc;
            cmt_use_summaries = need_to_clear_env;
+           cmt_extra_info = {deprecated_used = !deprecated_used};
          } in
          output_cmt oc cmt)
   end;
   clear ()
-#endif
\ No newline at end of file
+#endif
diff --git a/jscomp/ml/cmt_format.mli b/compiler/ml/cmt_format.mli
similarity index 78%
rename from jscomp/ml/cmt_format.mli
rename to compiler/ml/cmt_format.mli
index 6daf643..66589f0 100644
--- a/jscomp/ml/cmt_format.mli
+++ b/compiler/ml/cmt_format.mli
@@ -49,27 +49,28 @@ and binary_part =
   | Partial_module_type of module_type
 
 type cmt_infos = {
-  cmt_modname : string;
-  cmt_annots : binary_annots;
-  cmt_value_dependencies :
+  cmt_modname: string;
+  cmt_annots: binary_annots;
+  cmt_value_dependencies:
     (Types.value_description * Types.value_description) list;
-  cmt_comments : (string * Location.t) list;
-  cmt_args : string array;
-  cmt_sourcefile : string option;
-  cmt_builddir : string;
-  cmt_loadpath : string list;
-  cmt_source_digest : string option;
-  cmt_initial_env : Env.t;
-  cmt_imports : (string * Digest.t option) list;
-  cmt_interface_digest : Digest.t option;
-  cmt_use_summaries : bool;
+  cmt_comments: (string * Location.t) list;
+  cmt_args: string array;
+  cmt_sourcefile: string option;
+  cmt_builddir: string;
+  cmt_loadpath: string list;
+  cmt_source_digest: string option;
+  cmt_initial_env: Env.t;
+  cmt_imports: (string * Digest.t option) list;
+  cmt_interface_digest: Digest.t option;
+  cmt_use_summaries: bool;
+  cmt_extra_info: Cmt_utils.cmt_extra_info;
 }
 
-type error =
-    Not_a_typedtree of string
+type error = Not_a_typedtree of string
 
 exception Error of error
 
+val read : string -> Cmi_format.cmi_infos option * cmt_infos option
 (** [read filename] opens filename, and extract both the cmi_infos, if
     it exists, and the cmt_infos, if it exists. Thus, it can be used
     with .cmi, .cmt and .cmti files.
@@ -78,35 +79,46 @@ exception Error of error
     only contain a cmi_infos at the beginning if there is no associated
     .cmti file.
 *)
-val read : string -> Cmi_format.cmi_infos option * cmt_infos option
 
 val read_cmt : string -> cmt_infos
 val read_cmi : string -> Cmi_format.cmi_infos
 
-(** [save_cmt filename modname binary_annots sourcefile initial_env cmi]
-    writes a cmt(i) file.  *)
 val save_cmt :
-  string ->  (* filename.cmt to generate *)
-  string ->  (* module name *)
+  string ->
+  (* filename.cmt to generate *)
+  string ->
+  (* module name *)
   binary_annots ->
-  string option ->  (* source file *)
-  Env.t -> (* initial env *)
-  Cmi_format.cmi_infos option -> (* if a .cmi was generated *)
+  string option ->
+  (* source file *)
+  Env.t ->
+  (* initial env *)
+  Cmi_format.cmi_infos option ->
+  (* if a .cmi was generated *)
   unit
+(** [save_cmt filename modname binary_annots sourcefile initial_env cmi]
+    writes a cmt(i) file.  *)
 
 (* Miscellaneous functions *)
 
 val read_magic_number : in_channel -> string
 
-val clear: unit -> unit
+val clear : unit -> unit
 
 val add_saved_type : binary_part -> unit
 val get_saved_types : unit -> binary_part list
 val set_saved_types : binary_part list -> unit
 
-val record_value_dependency:
+val record_value_dependency :
   Types.value_description -> Types.value_description -> unit
 
+val record_deprecated_used :
+  ?deprecated_context:Cmt_utils.deprecated_used_context ->
+  ?migration_template:Parsetree.expression ->
+  ?migration_in_pipe_chain_template:Parsetree.expression ->
+  Location.t ->
+  string ->
+  unit
 
 (*
 
diff --git a/compiler/ml/cmt_utils.ml b/compiler/ml/cmt_utils.ml
new file mode 100644
index 0000000..3e08cd9
--- /dev/null
+++ b/compiler/ml/cmt_utils.ml
@@ -0,0 +1,31 @@
+type deprecated_used_context = FunctionCall | Reference
+
+type deprecated_used = {
+  source_loc: Location.t;
+  deprecated_text: string;
+  migration_template: Parsetree.expression option;
+  migration_in_pipe_chain_template: Parsetree.expression option;
+  context: deprecated_used_context option;
+}
+
+type cmt_extra_info = {deprecated_used: deprecated_used list}
+
+let record_deprecated_used :
+    (?deprecated_context:deprecated_used_context ->
+    ?migration_template:Parsetree.expression ->
+    ?migration_in_pipe_chain_template:Parsetree.expression ->
+    Location.t ->
+    string ->
+    unit)
+    ref =
+  ref
+    (fun
+      ?deprecated_context
+      ?migration_template
+      ?migration_in_pipe_chain_template
+      _
+      _
+    ->
+      ignore deprecated_context;
+      ignore migration_template;
+      ignore migration_in_pipe_chain_template)
diff --git a/compiler/ml/code_frame.ml b/compiler/ml/code_frame.ml
new file mode 100644
index 0000000..9f75c76
--- /dev/null
+++ b/compiler/ml/code_frame.ml
@@ -0,0 +1,284 @@
+let digits_count n =
+  let rec loop n base count =
+    if n >= base then loop n (base * 10) (count + 1) else count
+  in
+  loop (abs n) 1 0
+
+let seek_2_lines_before src (pos : Lexing.position) =
+  let original_line = pos.pos_lnum in
+  let rec loop current_line current_char =
+    if current_line + 2 >= original_line then (current_char, current_line)
+    else
+      loop
+        (if src.[current_char] = '\n' then current_line + 1 else current_line)
+        (current_char + 1)
+  in
+  loop 1 0
+
+let seek_2_lines_after src (pos : Lexing.position) =
+  let original_line = pos.pos_lnum in
+  let rec loop current_line current_char =
+    if current_char = String.length src then (current_char, current_line)
+    else
+      match src.[current_char] with
+      | '\n' when current_line = original_line + 2 ->
+        (current_char, current_line)
+      | '\n' -> loop (current_line + 1) (current_char + 1)
+      | _ -> loop current_line (current_char + 1)
+  in
+  loop original_line pos.pos_cnum
+
+let leading_space_count str =
+  let rec loop i count =
+    if i = String.length str then count
+    else if str.[i] != ' ' then count
+    else loop (i + 1) (count + 1)
+  in
+  loop 0 0
+
+let break_long_line max_width line =
+  let rec loop pos accum =
+    if pos = String.length line then accum
+    else
+      let chunk_length = min max_width (String.length line - pos) in
+      let chunk = String.sub line pos chunk_length in
+      loop (pos + chunk_length) (chunk :: accum)
+  in
+  loop 0 [] |> List.rev
+
+let filter_mapi f l =
+  let rec loop f l i accum =
+    match l with
+    | [] -> accum
+    | head :: rest ->
+      let accum =
+        match f i head with
+        | None -> accum
+        | Some result -> result :: accum
+      in
+      loop f rest (i + 1) accum
+  in
+  loop f l 0 [] |> List.rev
+
+(* Spiritual equivalent of
+   https://github.com/ocaml/ocaml/blob/414bdec9ae387129b8102cc6bf3c0b6ae173eeb9/utils/misc.ml#L601
+*)
+module Color = struct
+  type color =
+    | Dim
+    (* | Filename *)
+    | Err
+    | Warn
+    | NoColor
+
+  let dim = "\x1b[2m"
+
+  (* let filename = "\x1b[46m" *)
+  let err = "\x1b[1;31m"
+  let warn = "\x1b[1;33m"
+  let reset = "\x1b[0m"
+
+  external isatty : out_channel -> bool = "caml_sys_isatty"
+
+  (* reasonable heuristic on whether colors should be enabled *)
+  let should_enable_color () =
+    let term = try Sys.getenv "TERM" with Not_found -> "" in
+    term <> "dumb" && term <> "" && isatty stderr
+
+  let color_enabled = ref true
+
+  let setup =
+    let first = ref true in
+    (* initialize only once *)
+    fun o ->
+      if !first then (
+        first := false;
+        color_enabled :=
+          match o with
+          | Some Misc.Color.Always -> true
+          | Some Auto -> should_enable_color ()
+          | Some Never -> false
+          | None -> should_enable_color ());
+      ()
+end
+
+let setup = Color.setup
+
+type gutter = Number of int | Elided
+type highlighted_string = {s: string; start: int; end_: int}
+type line = {gutter: gutter; content: highlighted_string list}
+
+(*
+  Features:
+  - display a line gutter
+  - break long line into multiple for terminal display
+  - peek 2 lines before & after for context
+  - center snippet when it's heavily indented
+  - ellide intermediate lines when the reported range is huge
+*)
+let print ~is_warning ~src ~(start_pos : Lexing.position)
+    ~(end_pos : Lexing.position) =
+  let indent = 2 in
+  let highlight_line_start_line = start_pos.pos_lnum in
+  let highlight_line_end_line = end_pos.pos_lnum in
+  let start_line_line_offset, first_shown_line =
+    seek_2_lines_before src start_pos
+  in
+  let end_line_line_end_offset, last_shown_line =
+    seek_2_lines_after src end_pos
+  in
+
+  let more_than_5_highlighted_lines =
+    highlight_line_end_line - highlight_line_start_line + 1 > 5
+  in
+  let max_line_digits_count = digits_count last_shown_line in
+  (* TODO: change this back to a fixed 100? *)
+  (* 3 for separator + the 2 spaces around it *)
+  let line_width = 78 - max_line_digits_count - indent - 3 in
+  let lines =
+    if
+      start_line_line_offset >= 0
+      && end_line_line_end_offset >= start_line_line_offset
+    then
+      String.sub src start_line_line_offset
+        (end_line_line_end_offset - start_line_line_offset)
+      |> String.split_on_char '\n'
+      |> filter_mapi (fun i line ->
+             let line_number = i + first_shown_line in
+             if more_than_5_highlighted_lines then
+               if line_number = highlight_line_start_line + 2 then
+                 Some (Elided, line)
+               else if
+                 line_number > highlight_line_start_line + 2
+                 && line_number < highlight_line_end_line - 1
+               then None
+               else Some (Number line_number, line)
+             else Some (Number line_number, line))
+    else []
+  in
+  let leading_space_to_cut =
+    lines
+    |> List.fold_left
+         (fun current_max (_, line) ->
+           let leading_spaces = leading_space_count line in
+           if String.length line = leading_spaces then
+             (* the line's nothing but spaces. Doesn't count *)
+             current_max
+           else min leading_spaces current_max)
+         99999
+  in
+  let separator = if leading_space_to_cut = 0 then "│" else "┆" in
+  let stripped_lines =
+    lines
+    |> List.map (fun (gutter, line) ->
+           let new_content =
+             if String.length line <= leading_space_to_cut then
+               [{s = ""; start = 0; end_ = 0}]
+             else
+               String.sub line leading_space_to_cut
+                 (String.length line - leading_space_to_cut)
+               |> break_long_line line_width
+               |> List.mapi (fun i line ->
+                      match gutter with
+                      | Elided -> {s = line; start = 0; end_ = 0}
+                      | Number line_number ->
+                        let highlight_line_start_offset =
+                          start_pos.pos_cnum - start_pos.pos_bol
+                        in
+                        let highlight_line_end_offset =
+                          end_pos.pos_cnum - end_pos.pos_bol
+                        in
+                        let start =
+                          if i = 0 && line_number = highlight_line_start_line
+                          then
+                            highlight_line_start_offset - leading_space_to_cut
+                          else 0
+                        in
+                        let end_ =
+                          if line_number < highlight_line_start_line then 0
+                          else if
+                            line_number = highlight_line_start_line
+                            && line_number = highlight_line_end_line
+                          then highlight_line_end_offset - leading_space_to_cut
+                          else if line_number = highlight_line_start_line then
+                            String.length line
+                          else if
+                            line_number > highlight_line_start_line
+                            && line_number < highlight_line_end_line
+                          then String.length line
+                          else if line_number = highlight_line_end_line then
+                            highlight_line_end_offset - leading_space_to_cut
+                          else 0
+                        in
+                        {s = line; start; end_})
+           in
+           {gutter; content = new_content})
+  in
+  let buf = Buffer.create 100 in
+  let open Color in
+  let add_ch =
+    let last_color = ref NoColor in
+    fun color ch ->
+      if (not !Color.color_enabled) || !last_color = color then
+        Buffer.add_char buf ch
+      else
+        let ansi =
+          match (!last_color, color) with
+          | NoColor, Dim -> dim
+          (* | NoColor, Filename -> filename *)
+          | NoColor, Err -> err
+          | NoColor, Warn -> warn
+          | _, NoColor -> reset
+          | _, Dim -> reset ^ dim
+          (* | _, Filename -> reset ^ filename *)
+          | _, Err -> reset ^ err
+          | _, Warn -> reset ^ warn
+        in
+        Buffer.add_string buf ansi;
+        Buffer.add_char buf ch;
+        last_color := color
+  in
+  let draw_gutter color s =
+    for _i = 1 to max_line_digits_count + indent - String.length s do
+      add_ch NoColor ' '
+    done;
+    s |> String.iter (add_ch color);
+    add_ch NoColor ' ';
+    separator |> String.iter (add_ch Dim);
+    add_ch NoColor ' '
+  in
+  stripped_lines
+  |> List.iter (fun {gutter; content} ->
+         match gutter with
+         | Elided ->
+           draw_gutter Dim ".";
+           add_ch Dim '.';
+           add_ch Dim '.';
+           add_ch Dim '.';
+           add_ch NoColor '\n'
+         | Number line_number ->
+           content
+           |> List.iteri (fun i line ->
+                  let gutter_content =
+                    if i = 0 then string_of_int line_number else ""
+                  in
+                  let gutter_color =
+                    if
+                      i = 0
+                      && line_number >= highlight_line_start_line
+                      && line_number <= highlight_line_end_line
+                    then if is_warning then Warn else Err
+                    else NoColor
+                  in
+                  draw_gutter gutter_color gutter_content;
+
+                  line.s
+                  |> String.iteri (fun ii ch ->
+                         let c =
+                           if ii >= line.start && ii < line.end_ then
+                             if is_warning then Warn else Err
+                           else NoColor
+                         in
+                         add_ch c ch);
+                  add_ch NoColor '\n'));
+  Buffer.contents buf
diff --git a/compiler/ml/consistbl.ml b/compiler/ml/consistbl.ml
new file mode 100644
index 0000000..37047a2
--- /dev/null
+++ b/compiler/ml/consistbl.ml
@@ -0,0 +1,64 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 2002 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Consistency tables: for checking consistency of module CRCs *)
+
+type t = (string, Digest.t * string) Hashtbl.t
+
+let create () = Hashtbl.create 13
+
+let clear = Hashtbl.clear
+
+exception Inconsistency of string * string * string
+
+exception Not_available of string
+
+let check tbl name crc source =
+  try
+    let old_crc, old_source = Hashtbl.find tbl name in
+    if crc <> old_crc then raise (Inconsistency (name, source, old_source))
+  with Not_found -> Hashtbl.add tbl name (crc, source)
+
+let check_noadd tbl name crc source =
+  try
+    let old_crc, old_source = Hashtbl.find tbl name in
+    if crc <> old_crc then raise (Inconsistency (name, source, old_source))
+  with Not_found -> raise (Not_available name)
+
+let set tbl name crc source = Hashtbl.add tbl name (crc, source)
+
+let source tbl name = snd (Hashtbl.find tbl name)
+
+let extract l tbl =
+  let l = List.sort_uniq String.compare l in
+  List.fold_left
+    (fun assc name ->
+      try
+        let crc, _ = Hashtbl.find tbl name in
+        (name, Some crc) :: assc
+      with Not_found -> (name, None) :: assc)
+    [] l
+
+let filter p tbl =
+  let to_remove = ref [] in
+  Hashtbl.iter
+    (fun name _ -> if not (p name) then to_remove := name :: !to_remove)
+    tbl;
+  List.iter
+    (fun name ->
+      while Hashtbl.mem tbl name do
+        Hashtbl.remove tbl name
+      done)
+    !to_remove
diff --git a/compiler/ml/consistbl.mli b/compiler/ml/consistbl.mli
new file mode 100644
index 0000000..cfee26f
--- /dev/null
+++ b/compiler/ml/consistbl.mli
@@ -0,0 +1,62 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 2002 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Consistency tables: for checking consistency of module CRCs *)
+
+type t
+
+val create : unit -> t
+
+val clear : t -> unit
+
+val check : t -> string -> Digest.t -> string -> unit
+(* [check tbl name crc source]
+     checks consistency of ([name], [crc]) with infos previously
+     stored in [tbl].  If no CRC was previously associated with
+     [name], record ([name], [crc]) in [tbl].
+     [source] is the name of the file from which the information
+     comes from.  This is used for error reporting. *)
+
+val check_noadd : t -> string -> Digest.t -> string -> unit
+(* Same as [check], but raise [Not_available] if no CRC was previously
+     associated with [name]. *)
+
+val set : t -> string -> Digest.t -> string -> unit
+(* [set tbl name crc source] forcefully associates [name] with
+   [crc] in [tbl], even if [name] already had a different CRC
+   associated with [name] in [tbl]. *)
+
+val source : t -> string -> string
+(* [source tbl name] returns the file name associated with [name]
+   if the latter has an associated CRC in [tbl].
+   Raise [Not_found] otherwise. *)
+
+val extract : string list -> t -> (string * Digest.t option) list
+(* [extract tbl names] returns an associative list mapping each string
+   in [names] to the CRC associated with it in [tbl]. If no CRC is
+   associated with a name then it is mapped to [None]. *)
+
+val filter : (string -> bool) -> t -> unit
+(* [filter pred tbl] removes from [tbl] table all (name, CRC) pairs
+   such that [pred name] is [false]. *)
+
+exception Inconsistency of string * string * string
+(* Raised by [check] when a CRC mismatch is detected.
+   First string is the name of the compilation unit.
+   Second string is the source that caused the inconsistency.
+   Third string is the source that set the CRC. *)
+
+exception Not_available of string
+(* Raised by [check_noadd] when a name doesn't have an associated CRC. *)
diff --git a/compiler/ml/ctype.ml b/compiler/ml/ctype.ml
new file mode 100644
index 0000000..e15adf3
--- /dev/null
+++ b/compiler/ml/ctype.ml
@@ -0,0 +1,4449 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*  Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt  *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Operations on core types *)
+
+open Misc
+open Asttypes
+open Types
+open Btype
+
+(*
+   Type manipulation after type inference
+   ======================================
+   If one wants to manipulate a type after type inference (for
+   instance, during code generation or in the debugger), one must
+   first make sure that the type levels are correct, using the
+   function [correct_levels]. Then, this type can be correctly
+   manipulated by [apply], [expand_head] and [moregeneral].
+*)
+
+(*
+   General notes
+   =============
+   - As much sharing as possible should be kept : it makes types
+     smaller and better abbreviated.
+     When necessary, some sharing can be lost. Types will still be
+     printed correctly (+++ TO DO...), and abbreviations defined by a
+     class do not depend on sharing thanks to constrained
+     abbreviations. (Of course, even if some sharing is lost, typing
+     will still be correct.)
+   - All nodes of a type have a level : that way, one know whether a
+     node need to be duplicated or not when instantiating a type.
+   - Levels of a type are decreasing (generic level being considered
+     as greatest).
+   - The level of a type constructor is superior to the binding
+     time of its path.
+   - Recursive types without limitation should be handled (even if
+     there is still an occur check). This avoid treating specially the
+     case for objects, for instance. Furthermore, the occur check
+     policy can then be easily changed.
+*)
+
+(**** Errors ****)
+type type_pairs = (type_expr * type_expr) list
+
+exception Unify of type_pairs
+
+exception Tags of label * label
+
+let () =
+  Location.register_error_of_exn (function
+    | Tags (l, l') ->
+      Some
+        Location.(
+          errorf ~loc:(in_file !input_name)
+            "In this program,@ variant constructors@ #%s and #%s@ have the \
+             same hash value.@ Change one of them."
+            l l')
+    | _ -> None)
+
+type subtype_context =
+  | Generic of {errorCode: string}
+  | Coercion_target_variant_not_unboxed of {
+      variant_name: Path.t;
+      primitive: Path.t;
+    }
+  | Coercion_target_variant_does_not_cover_type of {
+      variant_name: Path.t;
+      primitive: Path.t;
+    }
+  | Variant_constructor_runtime_representation_mismatch of {
+      variant_name: Path.t;
+      issues: Variant_coercion.variant_runtime_representation_issue list;
+    }
+  | Variant_configurations_mismatch of {
+      left_variant_name: Path.t;
+      right_variant_name: Path.t;
+      issue: Variant_coercion.variant_configuration_issue;
+    }
+  | Different_type_kinds of {
+      left_typename: Path.t;
+      right_typename: Path.t;
+      left_type_kind: type_kind;
+      right_type_kind: type_kind;
+    }
+  | Record_fields_mismatch of {
+      left_record_name: Path.t;
+      right_record_name: Path.t;
+      issues: Record_coercion.record_field_subtype_violation list;
+    }
+
+exception Subtype of type_pairs * type_pairs * subtype_context option
+
+exception Cannot_expand
+
+exception Cannot_apply
+
+exception Recursive_abbrev
+
+(* GADT: recursive abbrevs can appear as a result of local constraints *)
+exception Unification_recursive_abbrev of type_pairs
+
+(**** Type level management ****)
+
+let current_level = ref 0
+let nongen_level = ref 0
+let global_level = ref 1
+let saved_level = ref []
+
+type levels = {
+  current_level: int;
+  nongen_level: int;
+  global_level: int;
+  saved_level: (int * int) list;
+}
+let save_levels () =
+  {
+    current_level = !current_level;
+    nongen_level = !nongen_level;
+    global_level = !global_level;
+    saved_level = !saved_level;
+  }
+let set_levels l =
+  current_level := l.current_level;
+  nongen_level := l.nongen_level;
+  global_level := l.global_level;
+  saved_level := l.saved_level
+
+let get_current_level () = !current_level
+let init_def level =
+  current_level := level;
+  nongen_level := level
+let begin_def () =
+  saved_level := (!current_level, !nongen_level) :: !saved_level;
+  incr current_level;
+  nongen_level := !current_level
+let begin_class_def () =
+  saved_level := (!current_level, !nongen_level) :: !saved_level;
+  incr current_level
+let raise_nongen_level () =
+  saved_level := (!current_level, !nongen_level) :: !saved_level;
+  nongen_level := !current_level
+let end_def () =
+  let cl, nl = List.hd !saved_level in
+  saved_level := List.tl !saved_level;
+  current_level := cl;
+  nongen_level := nl
+
+let reset_global_level () = global_level := !current_level + 1
+let increase_global_level () =
+  let gl = !global_level in
+  global_level := !current_level;
+  gl
+let restore_global_level gl = global_level := gl
+
+(**** Whether a path points to an object type (with hidden row variable) ****)
+let is_object_type path =
+  let name =
+    match path with
+    | Path.Pident id -> Ident.name id
+    | Path.Pdot (_, s, _) -> s
+    | Path.Papply _ -> assert false
+  in
+  name.[0] = '#'
+
+(**** Control tracing of GADT instances *)
+
+let trace_gadt_instances = ref false
+let check_trace_gadt_instances env =
+  (not !trace_gadt_instances)
+  && Env.has_local_constraints env
+  &&
+  (trace_gadt_instances := true;
+   cleanup_abbrev ();
+   true)
+
+let reset_trace_gadt_instances b = if b then trace_gadt_instances := false
+
+let wrap_trace_gadt_instances env f x =
+  let b = check_trace_gadt_instances env in
+  let y = f x in
+  reset_trace_gadt_instances b;
+  y
+
+(**** Abbreviations without parameters ****)
+(* Shall reset after generalizing *)
+
+let simple_abbrevs = ref Mnil
+
+let proper_abbrevs path tl abbrev =
+  if tl <> [] || !trace_gadt_instances || is_object_type path then abbrev
+  else simple_abbrevs
+
+(**** Some type creators ****)
+
+(* Re-export generic type creators *)
+
+let newty2 = Btype.newty2
+let newty desc = newty2 !current_level desc
+
+let newvar ?name () = newty2 !current_level (Tvar name)
+let newvar2 ?name level = newty2 level (Tvar name)
+let new_global_var ?name () = newty2 !global_level (Tvar name)
+
+let newobj fields = newty (Tobject (fields, ref None))
+
+let newconstr path tyl = newty (Tconstr (path, tyl, ref Mnil))
+
+let none = newty (Ttuple []) (* Clearly ill-formed type *)
+
+(**** Representative of a type ****)
+
+(* Re-export repr *)
+let repr = repr
+
+(**** Type maps ****)
+
+module TypePairs = Hashtbl.Make (struct
+  type t = type_expr * type_expr
+  let equal (t1, t1') (t2, t2') = t1 == t2 && t1' == t2'
+  let hash (t, t') = t.id + (93 * t'.id)
+end)
+
+(**** unification mode ****)
+
+type unification_mode =
+  | Expression (* unification in expression *)
+  | Pattern (* unification in pattern which may add local constraints *)
+
+let umode = ref Expression
+let generate_equations = ref false
+let assume_injective = ref false
+let variant_is_subtype = ref (fun _env _row _p1 -> false)
+let set_mode_pattern ~generate ~injective f =
+  let old_unification_mode = !umode
+  and old_gen = !generate_equations
+  and old_inj = !assume_injective in
+  try
+    umode := Pattern;
+    generate_equations := generate;
+    assume_injective := injective;
+    let ret = f () in
+    umode := old_unification_mode;
+    generate_equations := old_gen;
+    assume_injective := old_inj;
+    ret
+  with e ->
+    umode := old_unification_mode;
+    generate_equations := old_gen;
+    assume_injective := old_inj;
+    raise e
+
+(*** Checks for type definitions ***)
+
+let in_current_module = function
+  | Path.Pident _ -> true
+  | Path.Pdot _ | Path.Papply _ -> false
+
+let in_pervasives p =
+  in_current_module p
+  &&
+  try
+    ignore (Env.find_type p Env.initial_safe_string);
+    true
+  with Not_found -> false
+
+let is_datatype decl =
+  match decl.type_kind with
+  | Type_record _ | Type_variant _ | Type_open -> true
+  | Type_abstract -> false
+
+(**********************************************)
+(*  Miscellaneous operations on object types  *)
+(**********************************************)
+
+(* Note:
+   We need to maintain some invariants:
+   * cty_self must be a Tobject
+   * ...
+*)
+type fields = (string * Types.field_kind * Types.type_expr) list
+(**** Object field manipulation. ****)
+
+let object_fields ty =
+  match (repr ty).desc with
+  | Tobject (fields, _) -> fields
+  | _ -> assert false
+
+let flatten_fields (ty : Types.type_expr) : fields * _ =
+  let rec flatten (l : fields) ty =
+    let ty = repr ty in
+    match ty.desc with
+    | Tfield (s, k, ty1, ty2) -> flatten ((s, k, ty1) :: l) ty2
+    | _ -> (l, ty)
+  in
+  let l, r = flatten [] ty in
+  (List.sort (fun (n, _, _) (n', _, _) -> compare n n') l, r)
+
+let build_fields level =
+  List.fold_right (fun (s, k, ty1) ty2 ->
+      newty2 level (Tfield (s, k, ty1, ty2)))
+
+let associate_fields (fields1 : fields) (fields2 : fields) : _ * fields * fields
+    =
+  let rec associate p s s' : fields * fields -> _ = function
+    | l, [] -> (List.rev p, List.rev s @ l, List.rev s')
+    | [], l' -> (List.rev p, List.rev s, List.rev s' @ l')
+    | (n, k, t) :: r, (n', k', t') :: r' when n = n' ->
+      associate ((n, k, t, k', t') :: p) s s' (r, r')
+    | (n, k, t) :: r, ((n', _k', _t') :: _ as l') when n < n' ->
+      associate p ((n, k, t) :: s) s' (r, l')
+    | ((_n, _k, _t) :: _ as l), (n', k', t') :: r' (* when n > n' *) ->
+      associate p s ((n', k', t') :: s') (l, r')
+  in
+  associate [] [] [] (fields1, fields2)
+
+(**** Check whether an object is open ****)
+
+(* +++ The abbreviation should eventually be expanded *)
+let rec object_row ty =
+  let ty = repr ty in
+  match ty.desc with
+  | Tobject (t, _) -> object_row t
+  | Tfield (_, _, _, t) -> object_row t
+  | _ -> ty
+
+let opened_object ty =
+  match (object_row ty).desc with
+  | Tvar _ | Tunivar _ | Tconstr _ -> true
+  | _ -> false
+
+let concrete_object ty =
+  match (object_row ty).desc with
+  | Tvar _ -> false
+  | _ -> true
+
+(**** Close an object ****)
+
+let close_object ty =
+  let rec close ty =
+    let ty = repr ty in
+    match ty.desc with
+    | Tvar _ -> link_type ty (newty2 ty.level Tnil)
+    | Tfield (_, _, _, ty') -> close ty'
+    | _ -> assert false
+  in
+  match (repr ty).desc with
+  | Tobject (ty, _) -> close ty
+  | _ -> assert false
+
+(**** Row variable of an object type ****)
+
+let row_variable ty =
+  let rec find ty =
+    let ty = repr ty in
+    match ty.desc with
+    | Tfield (_, _, _, ty) -> find ty
+    | Tvar _ -> ty
+    | _ -> assert false
+  in
+  match (repr ty).desc with
+  | Tobject (fi, _) -> find fi
+  | _ -> assert false
+
+(**** Object name manipulation ****)
+(* +++ Bientot obsolete *)
+
+let set_object_name id rv params ty =
+  match (repr ty).desc with
+  | Tobject (_fi, nm) -> set_name nm (Some (Path.Pident id, rv :: params))
+  | _ -> assert false
+
+let remove_object_name ty =
+  match (repr ty).desc with
+  | Tobject (_, nm) -> set_name nm None
+  | Tconstr (_, _, _) -> ()
+  | _ -> fatal_error "Ctype.remove_object_name"
+
+(**** Hiding of private methods ****)
+
+let hide_private_methods ty =
+  match (repr ty).desc with
+  | Tobject (fi, nm) ->
+    nm := None;
+    let fl, _ = flatten_fields fi in
+    List.iter
+      (function
+        | _, k, _ -> (
+          match field_kind_repr k with
+          | Fvar r -> set_kind r Fabsent
+          | _ -> ()))
+      fl
+  | _ -> assert false
+
+(*******************************)
+(*  Operations on class types  *)
+(*******************************)
+
+(*******************************************)
+(*  Miscellaneous operations on row types  *)
+(*******************************************)
+type row_fields = (Asttypes.label * Types.row_field) list
+type row_pairs = (Asttypes.label * Types.row_field * Types.row_field) list
+let sort_row_fields : row_fields -> row_fields =
+  List.sort (fun (p, _) (q, _) -> compare (p : string) q)
+
+let rec merge_rf (r1 : row_fields) (r2 : row_fields) (pairs : row_pairs)
+    (fi1 : row_fields) (fi2 : row_fields) =
+  match (fi1, fi2) with
+  | ((l1, f1) as p1) :: fi1', ((l2, f2) as p2) :: fi2' ->
+    if l1 = l2 then merge_rf r1 r2 ((l1, f1, f2) :: pairs) fi1' fi2'
+    else if l1 < l2 then merge_rf (p1 :: r1) r2 pairs fi1' fi2
+    else merge_rf r1 (p2 :: r2) pairs fi1 fi2'
+  | [], _ -> (List.rev r1, List.rev_append r2 fi2, pairs)
+  | _, [] -> (List.rev_append r1 fi1, List.rev r2, pairs)
+
+let merge_row_fields (fi1 : row_fields) (fi2 : row_fields) :
+    row_fields * row_fields * row_pairs =
+  match (fi1, fi2) with
+  | [], _ | _, [] -> (fi1, fi2, [])
+  | [p1], _ when not (List.mem_assoc (fst p1) fi2) -> (fi1, fi2, [])
+  | _, [p2] when not (List.mem_assoc (fst p2) fi1) -> (fi1, fi2, [])
+  | _ -> merge_rf [] [] [] (sort_row_fields fi1) (sort_row_fields fi2)
+
+let rec filter_row_fields erase = function
+  | [] -> []
+  | ((_l, f) as p) :: fi -> (
+    let fi = filter_row_fields erase fi in
+    match row_field_repr f with
+    | Rabsent -> fi
+    | Reither (_, _, false, e) when erase ->
+      set_row_field e Rabsent;
+      fi
+    | _ -> p :: fi)
+
+(**************************************)
+(*  Check genericity of type schemes  *)
+(**************************************)
+
+exception Non_closed of type_expr * bool
+
+let free_variables = ref []
+let really_closed = ref None
+
+let rec free_vars_rec real ty =
+  let ty = repr ty in
+  if ty.level >= lowest_level then (
+    ty.level <- pivot_level - ty.level;
+    match (ty.desc, !really_closed) with
+    | Tvar _, _ -> free_variables := (ty, real) :: !free_variables
+    | Tconstr (path, tl, _), Some env ->
+      (try
+         let _, body, _ = Env.find_type_expansion path env in
+         if (repr body).level <> generic_level then
+           free_variables := (ty, real) :: !free_variables
+       with Not_found -> ());
+      List.iter (free_vars_rec true) tl
+    (* Do not count "virtual" free variables
+        | Tobject(ty, {contents = Some (_, p)}) ->
+            free_vars_rec false ty; List.iter (free_vars_rec true) p
+    *)
+    | Tobject (ty, _), _ -> free_vars_rec false ty
+    | Tfield (_, _, ty1, ty2), _ ->
+      free_vars_rec true ty1;
+      free_vars_rec false ty2
+    | Tvariant row, _ ->
+      let row = row_repr row in
+      iter_row (free_vars_rec true) row;
+      if not (static_row row) then free_vars_rec false row.row_more
+    | _ -> iter_type_expr (free_vars_rec true) ty)
+
+let free_vars ?env ty =
+  free_variables := [];
+  really_closed := env;
+  free_vars_rec true ty;
+  let res = !free_variables in
+  free_variables := [];
+  really_closed := None;
+  res
+
+let free_variables ?env ty =
+  let tl = List.map fst (free_vars ?env ty) in
+  unmark_type ty;
+  tl
+
+let closed_type ty =
+  match free_vars ty with
+  | [] -> ()
+  | (v, real) :: _ -> raise (Non_closed (v, real))
+
+let closed_parameterized_type params ty =
+  List.iter mark_type params;
+  let ok =
+    try
+      closed_type ty;
+      true
+    with Non_closed _ -> false
+  in
+  List.iter unmark_type params;
+  unmark_type ty;
+  ok
+
+let closed_type_decl decl =
+  try
+    List.iter mark_type decl.type_params;
+    (match decl.type_kind with
+    | Type_abstract -> ()
+    | Type_variant v ->
+      List.iter
+        (fun {cd_args; cd_res; _} ->
+          match cd_res with
+          | Some _ -> ()
+          | None -> (
+            match cd_args with
+            | Cstr_tuple l -> List.iter closed_type l
+            | Cstr_record l -> List.iter (fun l -> closed_type l.ld_type) l))
+        v
+    | Type_record (r, _rep) -> List.iter (fun l -> closed_type l.ld_type) r
+    | Type_open -> ());
+    (match decl.type_manifest with
+    | None -> ()
+    | Some ty -> closed_type ty);
+    unmark_type_decl decl;
+    None
+  with Non_closed (ty, _) ->
+    unmark_type_decl decl;
+    Some ty
+
+let closed_extension_constructor ext =
+  try
+    List.iter mark_type ext.ext_type_params;
+    (match ext.ext_ret_type with
+    | Some _ -> ()
+    | None -> iter_type_expr_cstr_args closed_type ext.ext_args);
+    unmark_extension_constructor ext;
+    None
+  with Non_closed (ty, _) ->
+    unmark_extension_constructor ext;
+    Some ty
+
+type closed_class_failure =
+  | CC_Method of type_expr * bool * string * type_expr
+  | CC_Value of type_expr * bool * string * type_expr
+
+(**********************)
+(*  Type duplication  *)
+(**********************)
+
+(* Duplicate a type, preserving only type variables *)
+let duplicate_type ty = Subst.type_expr Subst.identity ty
+
+(* Same, for class types *)
+
+(*****************************)
+(*  Type level manipulation  *)
+(*****************************)
+
+(*
+   It would be a bit more efficient to remove abbreviation expansions
+   rather than generalizing them: these expansions will usually not be
+   used anymore. However, this is not possible in the general case, as
+   [expand_abbrev] (via [subst]) requires these expansions to be
+   preserved. Does it worth duplicating this code ?
+*)
+let rec generalize ty =
+  let ty = repr ty in
+  if ty.level > !current_level && ty.level <> generic_level then (
+    set_level ty generic_level;
+    (match ty.desc with
+    | Tconstr (_, _, abbrev) -> iter_abbrev generalize !abbrev
+    | _ -> ());
+    iter_type_expr generalize ty)
+
+let generalize ty =
+  simple_abbrevs := Mnil;
+  generalize ty
+
+(* Generalize the structure and lower the variables *)
+
+let rec generalize_structure var_level ty =
+  let ty = repr ty in
+  if ty.level <> generic_level then
+    if is_Tvar ty && ty.level > var_level then set_level ty var_level
+    else if
+      ty.level > !current_level
+      &&
+      match ty.desc with
+      | Tconstr (p, _, abbrev) ->
+        (not (is_object_type p))
+        &&
+        (abbrev := Mnil;
+         true)
+      | _ -> true
+    then (
+      set_level ty generic_level;
+      iter_type_expr (generalize_structure var_level) ty)
+
+let generalize_structure var_level ty =
+  simple_abbrevs := Mnil;
+  generalize_structure var_level ty
+
+let forward_try_expand_once =
+  (* Forward declaration *)
+  ref (fun _env _ty -> raise Cannot_expand)
+
+(*
+   Lower the levels of a type (assume [level] is not
+   [generic_level]).
+*)
+(*
+    The level of a type constructor must be greater than its binding
+    time. That way, a type constructor cannot escape the scope of its
+    definition, as would be the case in
+      let x = ref []
+      module M = struct type t let _ = (x : t list ref) end
+    (without this constraint, the type system would actually be unsound.)
+*)
+let get_level env p =
+  try
+    match (Env.find_type p env).type_newtype_level with
+    | None -> Path.binding_time p
+    | Some (x, _) -> x
+  with Not_found ->
+    (* no newtypes in predef *)
+    Path.binding_time p
+
+let rec normalize_package_path env p =
+  let t = try (Env.find_modtype p env).mtd_type with Not_found -> None in
+  match t with
+  | Some (Mty_ident p) -> normalize_package_path env p
+  | Some (Mty_signature _ | Mty_functor _ | Mty_alias _) | None -> (
+    match p with
+    | Path.Pdot (p1, s, n) ->
+      (* For module aliases *)
+      let p1' = Env.normalize_path None env p1 in
+      if Path.same p1 p1' then p
+      else normalize_package_path env (Path.Pdot (p1', s, n))
+    | _ -> p)
+
+let rec update_level env level expand ty =
+  let ty = repr ty in
+  if ty.level > level then (
+    (match Env.gadt_instance_level env ty with
+    | Some lv -> if level < lv then raise (Unify [(ty, newvar2 level)])
+    | None -> ());
+    match ty.desc with
+    | Tconstr (p, _tl, _abbrev) when level < get_level env p -> (
+      (* Try first to replace an abbreviation by its expansion. *)
+      try
+        (* if is_newtype env p then raise Cannot_expand; *)
+        link_type ty (!forward_try_expand_once env ty);
+        update_level env level expand ty
+      with Cannot_expand ->
+        (* +++ Levels should be restored... *)
+        (* Format.printf "update_level: %i < %i@." level (get_level env p); *)
+        if level < get_level env p then raise (Unify [(ty, newvar2 level)]);
+        iter_type_expr (update_level env level expand) ty)
+    | Tconstr (_, _ :: _, _) when expand -> (
+      try
+        link_type ty (!forward_try_expand_once env ty);
+        update_level env level expand ty
+      with Cannot_expand ->
+        set_level ty level;
+        iter_type_expr (update_level env level expand) ty)
+    | Tpackage (p, nl, tl) when level < Path.binding_time p ->
+      let p' = normalize_package_path env p in
+      if Path.same p p' then raise (Unify [(ty, newvar2 level)]);
+      log_type ty;
+      ty.desc <- Tpackage (p', nl, tl);
+      update_level env level expand ty
+    | Tobject (_, ({contents = Some (p, _tl)} as nm))
+      when level < get_level env p ->
+      set_name nm None;
+      update_level env level expand ty
+    | Tvariant row ->
+      let row = row_repr row in
+      (match row.row_name with
+      | Some (p, _tl) when level < get_level env p ->
+        log_type ty;
+        ty.desc <- Tvariant {row with row_name = None}
+      | _ -> ());
+      set_level ty level;
+      iter_type_expr (update_level env level expand) ty
+    | Tfield (lab, _, ty1, _)
+      when lab = dummy_method && (repr ty1).level > level ->
+      raise (Unify [(ty1, newvar2 level)])
+    | _ ->
+      set_level ty level;
+      (* XXX what about abbreviations in Tconstr ? *)
+      iter_type_expr (update_level env level expand) ty)
+
+(* First try without expanding, then expand everything,
+   to avoid combinatorial blow-up *)
+let update_level env level ty =
+  let ty = repr ty in
+  if ty.level > level then (
+    let snap = snapshot () in
+    try update_level env level false ty
+    with Unify _ ->
+      backtrack snap;
+      update_level env level true ty)
+
+(* Generalize and lower levels of contravariant branches simultaneously *)
+
+let rec generalize_expansive env var_level visited ty =
+  let ty = repr ty in
+  if ty.level = generic_level || ty.level <= var_level then ()
+  else if not (Hashtbl.mem visited ty.id) then (
+    Hashtbl.add visited ty.id ();
+    match ty.desc with
+    | Tconstr (path, tyl, abbrev) ->
+      let variance =
+        try (Env.find_type path env).type_variance
+        with Not_found -> List.map (fun _ -> Variance.may_inv) tyl
+      in
+      abbrev := Mnil;
+      List.iter2
+        (fun v t ->
+          if Variance.(mem May_weak v) then generalize_structure var_level t
+          else generalize_expansive env var_level visited t)
+        variance tyl
+    | Tpackage (_, _, tyl) -> List.iter (generalize_structure var_level) tyl
+    | Tarrow (arg, ret, _, _) ->
+      generalize_structure var_level arg.typ;
+      generalize_expansive env var_level visited ret
+    | _ -> iter_type_expr (generalize_expansive env var_level visited) ty)
+
+let generalize_expansive env ty =
+  simple_abbrevs := Mnil;
+  try generalize_expansive env !nongen_level (Hashtbl.create 7) ty
+  with Unify ([(_, ty')] as tr) -> raise (Unify ((ty, ty') :: tr))
+
+let generalize_global ty = generalize_structure !global_level ty
+let generalize_structure ty = generalize_structure !current_level ty
+
+(* Correct the levels of type [ty]. *)
+let correct_levels ty = duplicate_type ty
+
+(* Only generalize the type ty0 in ty *)
+let limited_generalize ty0 ty =
+  let ty0 = repr ty0 in
+
+  let graph = Hashtbl.create 17 in
+  let idx = ref lowest_level in
+  let roots = ref [] in
+
+  let rec inverse pty ty =
+    let ty = repr ty in
+    if ty.level > !current_level || ty.level = generic_level then (
+      decr idx;
+      Hashtbl.add graph !idx (ty, ref pty);
+      if ty.level = generic_level || ty == ty0 then roots := ty :: !roots;
+      set_level ty !idx;
+      iter_type_expr (inverse [ty]) ty)
+    else if ty.level < lowest_level then
+      let _, parents = Hashtbl.find graph ty.level in
+      parents := pty @ !parents
+  and generalize_parents ty =
+    let idx = ty.level in
+    if idx <> generic_level then (
+      set_level ty generic_level;
+      List.iter generalize_parents !(snd (Hashtbl.find graph idx));
+      (* Special case for rows: must generalize the row variable *)
+      match ty.desc with
+      | Tvariant row ->
+        let more = row_more row in
+        let lv = more.level in
+        if (lv < lowest_level || lv > !current_level) && lv <> generic_level
+        then set_level more generic_level
+      | _ -> ())
+  in
+
+  inverse [] ty;
+  if ty0.level < lowest_level then iter_type_expr (inverse []) ty0;
+  List.iter generalize_parents !roots;
+  Hashtbl.iter
+    (fun _ (ty, _) ->
+      if ty.level <> generic_level then set_level ty !current_level)
+    graph
+
+(* Compute statically the free univars of all nodes in a type *)
+(* This avoids doing it repeatedly during instantiation *)
+
+type inv_type_expr = {
+  inv_type: type_expr;
+  mutable inv_parents: inv_type_expr list;
+}
+
+let rec inv_type hash pty ty =
+  let ty = repr ty in
+  try
+    let inv = TypeHash.find hash ty in
+    inv.inv_parents <- pty @ inv.inv_parents
+  with Not_found ->
+    let inv = {inv_type = ty; inv_parents = pty} in
+    TypeHash.add hash ty inv;
+    iter_type_expr (inv_type hash [inv]) ty
+
+let compute_univars ty =
+  let inverted = TypeHash.create 17 in
+  inv_type inverted [] ty;
+  let node_univars = TypeHash.create 17 in
+  let rec add_univar univ inv =
+    match inv.inv_type.desc with
+    | Tpoly (_ty, tl) when List.memq univ (List.map repr tl) -> ()
+    | _ -> (
+      try
+        let univs = TypeHash.find node_univars inv.inv_type in
+        if not (TypeSet.mem univ !univs) then (
+          univs := TypeSet.add univ !univs;
+          List.iter (add_univar univ) inv.inv_parents)
+      with Not_found ->
+        TypeHash.add node_univars inv.inv_type (ref (TypeSet.singleton univ));
+        List.iter (add_univar univ) inv.inv_parents)
+  in
+  TypeHash.iter (fun ty inv -> if is_Tunivar ty then add_univar ty inv) inverted;
+  fun ty ->
+    try !(TypeHash.find node_univars ty) with Not_found -> TypeSet.empty
+
+(*******************)
+(*  Instantiation  *)
+(*******************)
+
+let rec find_repr p1 = function
+  | Mnil -> None
+  | Mcons (Public, p2, ty, _, _) when Path.same p1 p2 -> Some ty
+  | Mcons (_, _, _, _, rem) -> find_repr p1 rem
+  | Mlink {contents = rem} -> find_repr p1 rem
+
+(*
+   Generic nodes are duplicated, while non-generic nodes are left
+   as-is.
+   During instantiation, the description of a generic node is first
+   replaced by a link to a stub ([Tsubst (newvar ())]). Once the
+   copy is made, it replaces the stub.
+   After instantiation, the description of generic node, which was
+   stored by [save_desc], must be put back, using [cleanup_types].
+*)
+
+let abbreviations = ref (ref Mnil)
+(* Abbreviation memorized. *)
+
+(* partial: we may not wish to copy the non generic types
+   before we call type_pat *)
+let rec copy ?env ?partial ?keep_names ty =
+  let copy = copy ?env ?partial ?keep_names in
+  let ty = repr ty in
+  match ty.desc with
+  | Tsubst ty -> ty
+  | _ ->
+    if ty.level <> generic_level && partial = None then ty
+    else
+      (* We only forget types that are non generic and do not contain
+         free univars *)
+      let forget =
+        if ty.level = generic_level then generic_level
+        else
+          match partial with
+          | None -> assert false
+          | Some (free_univars, keep) ->
+            if TypeSet.is_empty (free_univars ty) then
+              if keep then ty.level else !current_level
+            else generic_level
+      in
+      if forget <> generic_level then newty2 forget (Tvar None)
+      else
+        let desc = ty.desc in
+        save_desc ty desc;
+        let t = newvar () in
+        (* Stub *)
+        (match env with
+        | Some env when Env.has_local_constraints env -> (
+          match Env.gadt_instance_level env ty with
+          | Some lv -> Env.add_gadt_instances env lv [t]
+          | None -> ())
+        | _ -> ());
+        ty.desc <- Tsubst t;
+        t.desc <-
+          (match desc with
+          | Tconstr (p, tl, _) -> (
+            let abbrevs = proper_abbrevs p tl !abbreviations in
+            match find_repr p !abbrevs with
+            | Some ty when repr ty != t -> Tlink ty
+            | _ ->
+              (*
+             One must allocate a new reference, so that abbrevia-
+             tions belonging to different branches of a type are
+             independent.
+             Moreover, a reference containing a [Mcons] must be
+             shared, so that the memorized expansion of an abbrevi-
+             ation can be released by changing the content of just
+             one reference.
+          *)
+              Tconstr
+                ( p,
+                  List.map copy tl,
+                  ref
+                    (match !(!abbreviations) with
+                    | Mcons _ -> Mlink !abbreviations
+                    | abbrev -> abbrev) ))
+          | Tvariant row0 -> (
+            let row = row_repr row0 in
+            let more = repr row.row_more in
+            (* We must substitute in a subtle way *)
+            (* Tsubst takes a tuple containing the row var and the variant *)
+            match more.desc with
+            | Tsubst {desc = Ttuple [_; ty2]} ->
+              (* This variant type has been already copied *)
+              ty.desc <- Tsubst ty2;
+              (* avoid Tlink in the new type *)
+              Tlink ty2
+            | _ ->
+              (* If the row variable is not generic, we must keep it *)
+              let keep = more.level <> generic_level in
+              let more' =
+                match more.desc with
+                | Tsubst ty -> ty
+                | Tconstr _ | Tnil ->
+                  if keep then save_desc more more.desc;
+                  copy more
+                | Tvar _ | Tunivar _ ->
+                  save_desc more more.desc;
+                  if keep then more else newty more.desc
+                | _ -> assert false
+              in
+              let row =
+                match repr more' with
+                (* PR#6163 *)
+                | {desc = Tconstr _} when not row.row_fixed ->
+                  {row with row_fixed = true}
+                | _ -> row
+              in
+              (* Open row if partial for pattern and contains Reither *)
+              let more', row =
+                match partial with
+                | Some (free_univars, false) ->
+                  let more' =
+                    if more.id != more'.id then more'
+                    else
+                      let lv = if keep then more.level else !current_level in
+                      newty2 lv (Tvar None)
+                  in
+                  let not_reither (_, f) =
+                    match row_field_repr f with
+                    | Reither _ -> false
+                    | _ -> true
+                  in
+                  if
+                    row.row_closed && (not row.row_fixed)
+                    && TypeSet.is_empty (free_univars ty)
+                    && not (List.for_all not_reither row.row_fields)
+                  then
+                    ( more',
+                      {
+                        row_fields = Ext_list.filter row.row_fields not_reither;
+                        row_more = more';
+                        row_closed = false;
+                        row_fixed = false;
+                        row_name = None;
+                      } )
+                  else (more', row)
+                | _ -> (more', row)
+              in
+              (* Register new type first for recursion *)
+              more.desc <- Tsubst (newgenty (Ttuple [more'; t]));
+              (* Return a new copy *)
+              Tvariant (copy_row copy true row keep more'))
+          | Tfield (_p, k, _ty1, ty2) -> (
+            match field_kind_repr k with
+            | Fabsent -> Tlink (copy ty2)
+            | Fpresent -> copy_type_desc copy desc
+            | Fvar r ->
+              dup_kind r;
+              copy_type_desc copy desc)
+          | Tobject (ty1, _) when partial <> None -> Tobject (copy ty1, ref None)
+          | _ -> copy_type_desc ?keep_names copy desc);
+        t
+
+let simple_copy t = copy t
+
+(**** Variants of instantiations ****)
+
+let gadt_env env = if Env.has_local_constraints env then Some env else None
+
+let instance ?partial env sch =
+  let env = gadt_env env in
+  let partial =
+    match partial with
+    | None -> None
+    | Some keep -> Some (compute_univars sch, keep)
+  in
+  let ty = copy ?env ?partial sch in
+  cleanup_types ();
+  ty
+
+let instance_def sch =
+  let ty = copy sch in
+  cleanup_types ();
+  ty
+
+let generic_instance env sch =
+  let old = !current_level in
+  current_level := generic_level;
+  let ty = instance env sch in
+  current_level := old;
+  ty
+
+let instance_list env schl =
+  let env = gadt_env env in
+  let tyl = List.map (fun t -> copy ?env t) schl in
+  cleanup_types ();
+  tyl
+
+let reified_var_counter = ref Vars.empty
+let reset_reified_var_counter () = reified_var_counter := Vars.empty
+
+(* names given to new type constructors.
+   Used for existential types and
+   local constraints *)
+let get_new_abstract_name s =
+  let index = try Vars.find s !reified_var_counter + 1 with Not_found -> 0 in
+  reified_var_counter := Vars.add s index !reified_var_counter;
+  if index = 0 && s <> "" && s.[String.length s - 1] <> '$' then s
+  else Printf.sprintf "%s%d" s index
+
+let new_declaration newtype manifest =
+  {
+    type_params = [];
+    type_arity = 0;
+    type_kind = Type_abstract;
+    type_private = Public;
+    type_manifest = manifest;
+    type_variance = [];
+    type_newtype_level = newtype;
+    type_loc = Location.none;
+    type_attributes = [];
+    type_immediate = false;
+    type_unboxed = unboxed_false_default_false;
+    type_inlined_types = [];
+  }
+
+let instance_constructor ?in_pattern cstr =
+  (match in_pattern with
+  | None -> ()
+  | Some (env, newtype_lev) ->
+    let process existential =
+      let decl = new_declaration (Some (newtype_lev, newtype_lev)) None in
+      let name =
+        match repr existential with
+        | {desc = Tvar (Some name)} -> "$" ^ cstr.cstr_name ^ "_'" ^ name
+        | _ -> "$" ^ cstr.cstr_name
+      in
+      let path = Path.Pident (Ident.create (get_new_abstract_name name)) in
+      let new_env = Env.add_local_type path decl !env in
+      env := new_env;
+      let to_unify = newty (Tconstr (path, [], ref Mnil)) in
+      let tv = copy existential in
+      assert (is_Tvar tv);
+      link_type tv to_unify
+    in
+    List.iter process cstr.cstr_existentials);
+  let ty_res = copy cstr.cstr_res in
+  let ty_args = List.map simple_copy cstr.cstr_args in
+  cleanup_types ();
+  (ty_args, ty_res)
+
+let instance_parameterized_type ?keep_names sch_args sch =
+  let ty_args = List.map (fun t -> copy ?keep_names t) sch_args in
+  let ty = copy sch in
+  cleanup_types ();
+  (ty_args, ty)
+
+let instance_parameterized_type_2 sch_args sch_lst sch =
+  let ty_args = List.map simple_copy sch_args in
+  let ty_lst = List.map simple_copy sch_lst in
+  let ty = copy sch in
+  cleanup_types ();
+  (ty_args, ty_lst, ty)
+
+let map_kind f = function
+  | Type_abstract -> Type_abstract
+  | Type_open -> Type_open
+  | Type_variant cl ->
+    Type_variant
+      (List.map
+         (fun c ->
+           {
+             c with
+             cd_args = map_type_expr_cstr_args f c.cd_args;
+             cd_res = may_map f c.cd_res;
+           })
+         cl)
+  | Type_record (fl, rr) ->
+    Type_record (List.map (fun l -> {l with ld_type = f l.ld_type}) fl, rr)
+
+let instance_declaration decl =
+  let decl =
+    {
+      decl with
+      type_params = List.map simple_copy decl.type_params;
+      type_manifest = may_map simple_copy decl.type_manifest;
+      type_kind = map_kind simple_copy decl.type_kind;
+    }
+  in
+  cleanup_types ();
+  decl
+
+(**** Instantiation for types with free universal variables ****)
+
+let rec diff_list l1 l2 =
+  if l1 == l2 then []
+  else
+    match l1 with
+    | [] -> invalid_arg "Ctype.diff_list"
+    | a :: l1 -> a :: diff_list l1 l2
+
+let conflicts free bound =
+  let bound = List.map repr bound in
+  TypeSet.exists (fun t -> List.memq (repr t) bound) free
+
+let delayed_copy = ref []
+(* copying to do later *)
+
+(* Copy without sharing until there are no free univars left *)
+(* all free univars must be included in [visited]            *)
+let rec copy_sep fixed free bound visited ty =
+  let ty = repr ty in
+  let univars = free ty in
+  if TypeSet.is_empty univars then (
+    if ty.level <> generic_level then ty
+    else
+      let t = newvar () in
+      delayed_copy := lazy (t.desc <- Tlink (copy ty)) :: !delayed_copy;
+      t)
+  else
+    try
+      let t, bound_t = List.assq ty visited in
+      let dl = if is_Tunivar ty then [] else diff_list bound bound_t in
+      if dl <> [] && conflicts univars dl then raise Not_found;
+      t
+    with Not_found ->
+      let t = newvar () in
+      (* Stub *)
+      let visited =
+        match ty.desc with
+        | Tarrow _ | Ttuple _ | Tvariant _ | Tconstr _ | Tobject _ | Tpackage _
+          ->
+          (ty, (t, bound)) :: visited
+        | _ -> visited
+      in
+      let copy_rec = copy_sep fixed free bound visited in
+      t.desc <-
+        (match ty.desc with
+        | Tvariant row0 ->
+          let row = row_repr row0 in
+          let more = repr row.row_more in
+          (* We shall really check the level on the row variable *)
+          let keep = is_Tvar more && more.level <> generic_level in
+          let more' = copy_rec more in
+          let fixed' = fixed && is_Tvar (repr more') in
+          let row = copy_row copy_rec fixed' row keep more' in
+          Tvariant row
+        | Tpoly (t1, tl) ->
+          let tl = List.map repr tl in
+          let tl' = List.map (fun t -> newty t.desc) tl in
+          let bound = tl @ bound in
+          let visited =
+            List.map2 (fun ty t -> (ty, (t, bound))) tl tl' @ visited
+          in
+          Tpoly (copy_sep fixed free bound visited t1, tl')
+        | _ -> copy_type_desc copy_rec ty.desc);
+      t
+
+let instance_poly ?(keep_names = false) fixed univars sch =
+  let univars = List.map repr univars in
+  let copy_var ty =
+    match ty.desc with
+    | Tunivar name -> if keep_names then newty (Tvar name) else newvar ()
+    | _ -> assert false
+  in
+  let vars = List.map copy_var univars in
+  let pairs = List.map2 (fun u v -> (u, (v, []))) univars vars in
+  delayed_copy := [];
+  let ty = copy_sep fixed (compute_univars sch) [] pairs sch in
+  List.iter Lazy.force !delayed_copy;
+  delayed_copy := [];
+  cleanup_types ();
+  (vars, ty)
+
+let instance_label fixed lbl =
+  let ty_res = copy lbl.lbl_res in
+  let vars, ty_arg =
+    match repr lbl.lbl_arg with
+    | {desc = Tpoly (ty, tl)} -> instance_poly fixed tl ty
+    | _ -> ([], copy lbl.lbl_arg)
+  in
+  cleanup_types ();
+  (vars, ty_arg, ty_res)
+
+(**** Instantiation with parameter substitution ****)
+
+let unify' =
+  (* Forward declaration *)
+  ref (fun _env _ty1 _ty2 -> raise (Unify []))
+
+let subst env level priv abbrev ty params args body =
+  if List.length params <> List.length args then raise (Unify []);
+  let old_level = !current_level in
+  current_level := level;
+  try
+    let body0 = newvar () in
+    (* Stub *)
+    (match ty with
+    | None -> ()
+    | Some ({desc = Tconstr (path, tl, _)} as ty) ->
+      let abbrev = proper_abbrevs path tl abbrev in
+      memorize_abbrev abbrev priv path ty body0
+    | _ -> assert false);
+    abbreviations := abbrev;
+    let params', body' = instance_parameterized_type params body in
+    abbreviations := ref Mnil;
+    !unify' env body0 body';
+    List.iter2 (!unify' env) params' args;
+    current_level := old_level;
+    body'
+  with Unify _ as exn ->
+    current_level := old_level;
+    raise exn
+
+(*
+   Only the shape of the type matters, not whether it is generic or
+   not. [generic_level] might be somewhat slower, but it ensures
+   invariants on types are enforced (decreasing levels), and we don't
+   care about efficiency here.
+*)
+let apply env params body args =
+  try subst env generic_level Public (ref Mnil) None params args body
+  with Unify _ -> raise Cannot_apply
+
+let () = Subst.ctype_apply_env_empty := apply Env.empty
+
+(****************************)
+(*  Abbreviation expansion  *)
+(****************************)
+
+(*
+   If the environment has changed, memorized expansions might not
+   be correct anymore, and so we flush the cache. This is safe but
+   quite pessimistic: it would be enough to flush the cache when a
+   type or module definition is overridden in the environment.
+*)
+let previous_env = ref Env.empty
+
+(*let string_of_kind = function Public -> "public" | Private -> "private"*)
+let check_abbrev_env env =
+  if env != !previous_env then (
+    (* prerr_endline "cleanup expansion cache"; *)
+    cleanup_abbrev ();
+    previous_env := env)
+
+(* Expand an abbreviation. The expansion is memorized. *)
+(*
+   Assume the level is greater than the path binding time of the
+   expanded abbreviation.
+*)
+(*
+   An abbreviation expansion will fail in either of these cases:
+   1. The type constructor does not correspond to a manifest type.
+   2. The type constructor is defined in an external file, and this
+      file is not in the path (missing -I options).
+   3. The type constructor is not in the "local" environment. This can
+      happens when a non-generic type variable has been instantiated
+      afterwards to the not yet defined type constructor. (Actually,
+      this cannot happen at the moment due to the strong constraints
+      between type levels and constructor binding time.)
+   4. The expansion requires the expansion of another abbreviation,
+      and this other expansion fails.
+*)
+let expand_abbrev_gen kind find_type_expansion env ty =
+  check_abbrev_env env;
+  match ty with
+  | {desc = Tconstr (path, args, abbrev); level} -> (
+    let lookup_abbrev = proper_abbrevs path args abbrev in
+    match find_expans kind path !lookup_abbrev with
+    | Some ty' ->
+      (* prerr_endline
+         ("found a "^string_of_kind kind^" expansion for "^Path.name path);*)
+      (if level <> generic_level then
+         try update_level env level ty'
+         with Unify _ ->
+           (* XXX This should not happen.
+              However, levels are not correctly restored after a
+              typing error *)
+           ());
+      let ty' = repr ty' in
+      (* assert (ty != ty'); *)
+      (* PR#7324 *)
+      ty'
+    | None -> (
+      match find_type_expansion path env with
+      | exception Not_found ->
+        (* another way to expand is to normalize the path itself *)
+        let path' = Env.normalize_path None env path in
+        if Path.same path path' then raise Cannot_expand
+        else newty2 level (Tconstr (path', args, abbrev))
+      | params, body, lv ->
+        (* prerr_endline
+           ("add a "^string_of_kind kind^" expansion for "^Path.name path);*)
+        let ty' = subst env level kind abbrev (Some ty) params args body in
+        (* For gadts, remember type as non exportable *)
+        (* The ambiguous level registered for ty' should be the highest *)
+        (if !trace_gadt_instances then
+           match
+             Ext_pervasives.max_int_option lv (Env.gadt_instance_level env ty)
+           with
+           | None -> ()
+           | Some lv ->
+             if level < lv then raise (Unify [(ty, newvar2 level)]);
+             Env.add_gadt_instances env lv [ty; ty']);
+        ty'))
+  | _ -> assert false
+
+(* Expand respecting privacy *)
+let expand_abbrev env ty =
+  expand_abbrev_gen Public Env.find_type_expansion env ty
+
+(* Expand once the head of a type *)
+let expand_head_once env ty =
+  try expand_abbrev env (repr ty) with Cannot_expand -> assert false
+
+(* Check whether a type can be expanded *)
+let safe_abbrev env ty =
+  let snap = Btype.snapshot () in
+  try
+    ignore (expand_abbrev env ty);
+    true
+  with Cannot_expand | Unify _ ->
+    Btype.backtrack snap;
+    false
+
+(* Expand the head of a type once.
+   Raise Cannot_expand if the type cannot be expanded.
+   May raise Unify, if a recursion was hidden in the type. *)
+let try_expand_once env ty =
+  let ty = repr ty in
+  match ty.desc with
+  | Tconstr _ -> repr (expand_abbrev env ty)
+  | _ -> raise Cannot_expand
+
+(* This one only raises Cannot_expand *)
+let try_expand_safe env ty =
+  let snap = Btype.snapshot () in
+  try try_expand_once env ty
+  with Unify _ ->
+    Btype.backtrack snap;
+    raise Cannot_expand
+
+(* Fully expand the head of a type. *)
+let rec try_expand_head try_once env ty =
+  let ty' = try_once env ty in
+  try try_expand_head try_once env ty' with Cannot_expand -> ty'
+
+let try_expand_head try_once env ty =
+  let ty' = try_expand_head try_once env ty in
+  (match Env.gadt_instance_level env ty' with
+  | None -> ()
+  | Some lv -> Env.add_gadt_instance_chain env lv ty);
+  ty'
+
+(* Unsafe full expansion, may raise Unify. *)
+let expand_head_unif env ty =
+  try try_expand_head try_expand_once env ty with Cannot_expand -> repr ty
+
+(* Safe version of expand_head, never fails *)
+let expand_head env ty =
+  try try_expand_head try_expand_safe env ty with Cannot_expand -> repr ty
+
+let _ = forward_try_expand_once := try_expand_safe
+
+(* Expand until we find a non-abstract type declaration *)
+
+let rec extract_concrete_typedecl env ty =
+  let ty = repr ty in
+  match ty.desc with
+  | Tconstr (p, _, _) ->
+    let decl = Env.find_type p env in
+    if decl.type_kind <> Type_abstract then (p, p, decl)
+    else
+      let ty =
+        try try_expand_once env ty with Cannot_expand -> raise Not_found
+      in
+      let _, p', decl = extract_concrete_typedecl env ty in
+      (p, p', decl)
+  | _ -> raise Not_found
+
+(* Implementing function [expand_head_opt], the compiler's own version of
+   [expand_head] used for type-based optimisations.
+   [expand_head_opt] uses [Env.find_type_expansion_opt] to access the
+   manifest type information of private abstract data types which is
+   normally hidden to the type-checker out of the implementation module of
+   the private abbreviation. *)
+
+let expand_abbrev_opt = expand_abbrev_gen Private Env.find_type_expansion_opt
+
+let try_expand_once_opt env ty =
+  let ty = repr ty in
+  match ty.desc with
+  | Tconstr _ -> repr (expand_abbrev_opt env ty)
+  | _ -> raise Cannot_expand
+
+let rec try_expand_head_opt env ty =
+  let ty' = try_expand_once_opt env ty in
+  try try_expand_head_opt env ty' with Cannot_expand -> ty'
+
+let expand_head_opt env ty =
+  let snap = Btype.snapshot () in
+  try try_expand_head_opt env ty
+  with Cannot_expand | Unify _ ->
+    (* expand_head shall never fail *)
+    Btype.backtrack snap;
+    repr ty
+
+(* Make sure that the type parameters of the type constructor [ty]
+   respect the type constraints *)
+let enforce_constraints env ty =
+  match ty with
+  | {desc = Tconstr (path, args, _abbrev); level} -> (
+    try
+      let decl = Env.find_type path env in
+      ignore
+        (subst env level Public (ref Mnil) None decl.type_params args
+           (newvar2 level))
+    with Not_found -> ())
+  | _ -> assert false
+
+(* Recursively expand the head of a type.
+   Also expand #-types. *)
+let full_expand env ty =
+  let ty = repr (expand_head env ty) in
+  match ty.desc with
+  | Tobject (fi, {contents = Some (_, v :: _)}) when is_Tvar (repr v) ->
+    newty2 ty.level (Tobject (fi, ref None))
+  | _ -> ty
+
+(*
+   Check whether the abbreviation expands to a well-defined type.
+   During the typing of a class, abbreviations for correspondings
+   types expand to non-generic types.
+*)
+let generic_abbrev env path =
+  try
+    let _, body, _ = Env.find_type_expansion path env in
+    (repr body).level = generic_level
+  with Not_found -> false
+
+let generic_private_abbrev env path =
+  try
+    match Env.find_type path env with
+    | {
+     type_kind = Type_abstract;
+     type_private = Private;
+     type_manifest = Some body;
+    } ->
+      (repr body).level = generic_level
+    | _ -> false
+  with Not_found -> false
+
+let is_contractive env p =
+  try
+    let decl = Env.find_type p env in
+    (in_pervasives p && decl.type_manifest = None) || is_datatype decl
+  with Not_found -> false
+
+(*****************)
+(*  Occur check  *)
+(*****************)
+
+exception Occur
+
+let rec occur_rec env allow_recursive visited ty0 = function
+  | {desc = Tlink ty} -> occur_rec env allow_recursive visited ty0 ty
+  | ty -> (
+    if ty == ty0 then raise Occur;
+    match ty.desc with
+    | Tconstr (p, _tl, _abbrev) -> (
+      if allow_recursive && is_contractive env p then ()
+      else
+        try
+          if TypeSet.mem ty visited then raise Occur;
+          let visited = TypeSet.add ty visited in
+          iter_type_expr (occur_rec env allow_recursive visited ty0) ty
+        with Occur -> (
+          try
+            let ty' = try_expand_head try_expand_once env ty in
+            (* This call used to be inlined, but there seems no reason for it.
+               Message was referring to change in rev. 1.58 of the CVS repo. *)
+            occur_rec env allow_recursive visited ty0 ty'
+          with Cannot_expand -> raise Occur))
+    | Tobject _ | Tvariant _ -> ()
+    | _ ->
+      if allow_recursive || TypeSet.mem ty visited then ()
+      else
+        let visited = TypeSet.add ty visited in
+        iter_type_expr (occur_rec env allow_recursive visited ty0) ty)
+
+let type_changed = ref false (* trace possible changes to the studied type *)
+
+let merge r b = if b then r := true
+
+let occur env ty0 ty =
+  let allow_recursive = (*!Clflags.recursive_types ||*) !umode = Pattern in
+  let old = !type_changed in
+  try
+    while
+      type_changed := false;
+      occur_rec env allow_recursive TypeSet.empty ty0 ty;
+      !type_changed
+    do
+      () (* prerr_endline "changed" *)
+    done;
+    merge type_changed old
+  with exn ->
+    merge type_changed old;
+    raise
+      (match exn with
+      | Occur -> Unify []
+      | _ -> exn)
+
+let occur_in env ty0 t =
+  try
+    occur env ty0 t;
+    false
+  with Unify _ -> true
+
+(* Check that a local constraint is well-founded *)
+(* PR#6405: not needed since we allow recursion and work on normalized types *)
+(* PR#6992: we actually need it for contractiveness *)
+(* This is a simplified version of occur, only for the rectypes case *)
+
+let rec local_non_recursive_abbrev strict visited env p ty =
+  (*Format.eprintf "@[Check %s =@ %a@]@." (Path.name p) !Btype.print_raw ty;*)
+  let ty = repr ty in
+  if not (List.memq ty visited) then
+    match ty.desc with
+    | Tconstr (p', args, _abbrev) -> (
+      if Path.same p p' then raise Occur;
+      if (not strict) && is_contractive env p' then ()
+      else
+        let visited = ty :: visited in
+        try
+          (* try expanding, since [p] could be hidden *)
+          local_non_recursive_abbrev strict visited env p
+            (try_expand_head try_expand_once env ty)
+        with Cannot_expand ->
+          let params =
+            try (Env.find_type p' env).type_params with Not_found -> args
+          in
+          List.iter2
+            (fun tv ty ->
+              let strict = strict || not (is_Tvar (repr tv)) in
+              local_non_recursive_abbrev strict visited env p ty)
+            params args)
+    | _ ->
+      if strict then
+        (* PR#7374 *)
+        let visited = ty :: visited in
+        iter_type_expr (local_non_recursive_abbrev true visited env p) ty
+
+let local_non_recursive_abbrev env p ty =
+  try
+    (* PR#7397: need to check trace_gadt_instances *)
+    wrap_trace_gadt_instances env (local_non_recursive_abbrev false [] env p) ty;
+    true
+  with Occur -> false
+
+(*****************************)
+(*  Polymorphic Unification  *)
+(*****************************)
+
+(* Since we cannot duplicate universal variables, unification must
+   be done at meta-level, using bindings in univar_pairs *)
+let rec unify_univar t1 t2 = function
+  | (cl1, cl2) :: rem -> (
+    let find_univ t cl =
+      try
+        let _, r = List.find (fun (t', _) -> t == repr t') cl in
+        Some r
+      with Not_found -> None
+    in
+    match (find_univ t1 cl1, find_univ t2 cl2) with
+    | Some {contents = Some t'2}, Some _ when t2 == repr t'2 -> ()
+    | Some ({contents = None} as r1), Some ({contents = None} as r2) ->
+      set_univar r1 t2;
+      set_univar r2 t1
+    | None, None -> unify_univar t1 t2 rem
+    | _ -> raise (Unify []))
+  | [] -> raise (Unify [])
+
+(* Test the occurrence of free univars in a type *)
+(* that's way too expensive. Must do some kind of caching *)
+let occur_univar env ty =
+  let visited = ref TypeMap.empty in
+  let rec occur_rec bound ty =
+    let ty = repr ty in
+    if
+      ty.level >= lowest_level
+      &&
+      if TypeSet.is_empty bound then (
+        ty.level <- pivot_level - ty.level;
+        true)
+      else
+        try
+          let bound' = TypeMap.find ty !visited in
+          if TypeSet.exists (fun x -> not (TypeSet.mem x bound)) bound' then (
+            visited := TypeMap.add ty (TypeSet.inter bound bound') !visited;
+            true)
+          else false
+        with Not_found ->
+          visited := TypeMap.add ty bound !visited;
+          true
+    then
+      match ty.desc with
+      | Tunivar _ ->
+        if not (TypeSet.mem ty bound) then raise (Unify [(ty, newgenvar ())])
+      | Tpoly (ty, tyl) ->
+        let bound = List.fold_right TypeSet.add (List.map repr tyl) bound in
+        occur_rec bound ty
+      | Tconstr (_, [], _) -> ()
+      | Tconstr (p, tl, _) -> (
+        try
+          let td = Env.find_type p env in
+          List.iter2
+            (fun t v ->
+              if Variance.(mem May_pos v || mem May_neg v) then
+                occur_rec bound t)
+            tl td.type_variance
+        with Not_found -> List.iter (occur_rec bound) tl)
+      | _ -> iter_type_expr (occur_rec bound) ty
+  in
+  try
+    occur_rec TypeSet.empty ty;
+    unmark_type ty
+  with exn ->
+    unmark_type ty;
+    raise exn
+
+(* Grouping univars by families according to their binders *)
+let add_univars = List.fold_left (fun s (t, _) -> TypeSet.add (repr t) s)
+
+let get_univar_family univar_pairs univars =
+  if univars = [] then TypeSet.empty
+  else
+    let insert s = function
+      | cl1, (_ :: _ as cl2) ->
+        if List.exists (fun (t1, _) -> TypeSet.mem (repr t1) s) cl1 then
+          add_univars s cl2
+        else s
+      | _ -> s
+    in
+    let s = List.fold_right TypeSet.add univars TypeSet.empty in
+    List.fold_left insert s univar_pairs
+
+(* Whether a family of univars escapes from a type *)
+let univars_escape env univar_pairs vl ty =
+  let family = get_univar_family univar_pairs vl in
+  let visited = ref TypeSet.empty in
+  let rec occur t =
+    let t = repr t in
+    if TypeSet.mem t !visited then ()
+    else (
+      visited := TypeSet.add t !visited;
+      match t.desc with
+      | Tpoly (t, tl) ->
+        if List.exists (fun t -> TypeSet.mem (repr t) family) tl then ()
+        else occur t
+      | Tunivar _ -> if TypeSet.mem t family then raise Occur
+      | Tconstr (_, [], _) -> ()
+      | Tconstr (p, tl, _) -> (
+        try
+          let td = Env.find_type p env in
+          List.iter2
+            (fun t v ->
+              if Variance.(mem May_pos v || mem May_neg v) then occur t)
+            tl td.type_variance
+        with Not_found -> List.iter occur tl)
+      | _ -> iter_type_expr occur t)
+  in
+  try
+    occur ty;
+    false
+  with Occur -> true
+
+(* Wrapper checking that no variable escapes and updating univar_pairs *)
+let enter_poly env univar_pairs t1 tl1 t2 tl2 f =
+  let old_univars = !univar_pairs in
+  let known_univars =
+    List.fold_left (fun s (cl, _) -> add_univars s cl) TypeSet.empty old_univars
+  in
+  let tl1 = List.map repr tl1 and tl2 = List.map repr tl2 in
+  if
+    List.exists (fun t -> TypeSet.mem t known_univars) tl1
+    && univars_escape env old_univars tl1 (newty (Tpoly (t2, tl2)))
+    || List.exists (fun t -> TypeSet.mem t known_univars) tl2
+       && univars_escape env old_univars tl2 (newty (Tpoly (t1, tl1)))
+  then raise (Unify []);
+  let cl1 = List.map (fun t -> (t, ref None)) tl1
+  and cl2 = List.map (fun t -> (t, ref None)) tl2 in
+  univar_pairs := (cl1, cl2) :: (cl2, cl1) :: old_univars;
+  try
+    let res = f t1 t2 in
+    univar_pairs := old_univars;
+    res
+  with exn ->
+    univar_pairs := old_univars;
+    raise exn
+
+let univar_pairs = ref []
+
+(*****************)
+(*  Unification  *)
+(*****************)
+
+let rec has_cached_expansion p abbrev =
+  match abbrev with
+  | Mnil -> false
+  | Mcons (_, p', _, _, rem) -> Path.same p p' || has_cached_expansion p rem
+  | Mlink rem -> has_cached_expansion p !rem
+
+(**** Transform error trace ****)
+(* +++ Move it to some other place ? *)
+
+let expand_trace env trace =
+  List.fold_right
+    (fun (t1, t2) rem ->
+      (repr t1, full_expand env t1) :: (repr t2, full_expand env t2) :: rem)
+    trace []
+
+(* build a dummy variant type *)
+let mkvariant fields closed =
+  newgenty
+    (Tvariant
+       {
+         row_fields = fields;
+         row_closed = closed;
+         row_more = newvar ();
+         row_fixed = false;
+         row_name = None;
+       })
+
+(**** Unification ****)
+
+(* Return whether [t0] occurs in [ty]. Objects are also traversed. *)
+let deep_occur t0 ty =
+  let rec occur_rec ty =
+    let ty = repr ty in
+    if ty.level >= lowest_level then (
+      if ty == t0 then raise Occur;
+      ty.level <- pivot_level - ty.level;
+      iter_type_expr occur_rec ty)
+  in
+  try
+    occur_rec ty;
+    unmark_type ty;
+    false
+  with Occur ->
+    unmark_type ty;
+    true
+
+(*
+   1. When unifying two non-abbreviated types, one type is made a link
+      to the other. When unifying an abbreviated type with a
+      non-abbreviated type, the non-abbreviated type is made a link to
+      the other one. When unifying to abbreviated types, these two
+      types are kept distincts, but they are made to (temporally)
+      expand to the same type.
+   2. Abbreviations with at least one parameter are systematically
+      expanded. The overhead does not seem too high, and that way
+      abbreviations where some parameters does not appear in the
+      expansion, such as ['a t = int], are correctly handled. In
+      particular, for this example, unifying ['a t] with ['b t] keeps
+      ['a] and ['b] distincts. (Is it really important ?)
+   3. Unifying an abbreviation ['a t = 'a] with ['a] should not yield
+      ['a t as 'a]. Indeed, the type variable would otherwise be lost.
+      This problem occurs for abbreviations expanding to a type
+      variable, but also to many other constrained abbreviations (for
+      instance, [(< x : 'a > -> unit) t = <x : 'a>]). The solution is
+      that, if an abbreviation is unified with some subpart of its
+      parameters, then the parameter actually does not get
+      abbreviated.  It would be possible to check whether some
+      information is indeed lost, but it probably does not worth it.
+*)
+
+let newtype_level = ref None
+
+let get_newtype_level () =
+  match !newtype_level with
+  | None -> assert false
+  | Some x -> x
+
+(* a local constraint can be added only if the rhs
+   of the constraint does not contain any Tvars.
+   They need to be removed using this function *)
+let reify env t =
+  let newtype_level = get_newtype_level () in
+  let create_fresh_constr lev name =
+    let decl = new_declaration (Some (newtype_level, newtype_level)) None in
+    let name =
+      match name with
+      | Some s -> "$'" ^ s
+      | _ -> "$"
+    in
+    let path = Path.Pident (Ident.create (get_new_abstract_name name)) in
+    let new_env = Env.add_local_type path decl !env in
+    let t = newty2 lev (Tconstr (path, [], ref Mnil)) in
+    env := new_env;
+    t
+  in
+  let visited = ref TypeSet.empty in
+  let rec iterator ty =
+    let ty = repr ty in
+    if TypeSet.mem ty !visited then ()
+    else (
+      visited := TypeSet.add ty !visited;
+      match ty.desc with
+      | Tvar o ->
+        let t = create_fresh_constr ty.level o in
+        link_type ty t;
+        if ty.level < newtype_level then raise (Unify [(t, newvar2 ty.level)])
+      | Tvariant r ->
+        let r = row_repr r in
+        (if not (static_row r) then
+           if r.row_fixed then iterator (row_more r)
+           else
+             let m = r.row_more in
+             match m.desc with
+             | Tvar o ->
+               let t = create_fresh_constr m.level o in
+               let row =
+                 {r with row_fields = []; row_fixed = true; row_more = t}
+               in
+               link_type m (newty2 m.level (Tvariant row));
+               if m.level < newtype_level then
+                 raise (Unify [(t, newvar2 m.level)])
+             | _ -> assert false);
+        iter_row iterator r
+      | Tconstr (p, _, _) when is_object_type p ->
+        iter_type_expr iterator (full_expand !env ty)
+      | _ -> iter_type_expr iterator ty)
+  in
+  iterator t
+
+let is_newtype env p =
+  try
+    let decl = Env.find_type p env in
+    decl.type_newtype_level <> None
+    && decl.type_kind = Type_abstract
+    && decl.type_private = Public
+  with Not_found -> false
+
+let non_aliasable p decl =
+  (* in_pervasives p ||  (subsumed by in_current_module) *)
+  in_current_module p && decl.type_newtype_level = None
+
+let is_instantiable env p =
+  try
+    let decl = Env.find_type p env in
+    decl.type_kind = Type_abstract
+    && decl.type_private = Public && decl.type_arity = 0
+    && decl.type_manifest = None
+    && not (non_aliasable p decl)
+  with Not_found -> false
+
+(* PR#7113: -safe-string should be a global property *)
+let compatible_paths p1 p2 = Path.same p1 p2
+
+(* Check for datatypes carefully; see PR#6348 *)
+let rec expands_to_datatype env ty =
+  let ty = repr ty in
+  match ty.desc with
+  | Tconstr (p, _, _) -> (
+    try
+      is_datatype (Env.find_type p env)
+      || expands_to_datatype env (try_expand_once env ty)
+    with Not_found | Cannot_expand -> false)
+  | _ -> false
+
+(* mcomp type_pairs subst env t1 t2 does not raise an
+   exception if it is possible that t1 and t2 are actually
+   equal, assuming the types in type_pairs are equal and
+   that the mapping subst holds.
+   Assumes that both t1 and t2 do not contain any tvars
+   and that both their objects and variants are closed
+*)
+
+let rec mcomp type_pairs env t1 t2 =
+  if t1 == t2 then ()
+  else
+    let t1 = repr t1 in
+    let t2 = repr t2 in
+    if t1 == t2 then ()
+    else
+      match (t1.desc, t2.desc) with
+      | Tvar _, _ | _, Tvar _ -> ()
+      | Tconstr (p1, [], _), Tconstr (p2, [], _) when Path.same p1 p2 -> ()
+      | _ -> (
+        let t1' = expand_head_opt env t1 in
+        let t2' = expand_head_opt env t2 in
+        (* Expansion may have changed the representative of the types... *)
+        let t1' = repr t1' and t2' = repr t2' in
+        if t1' == t2' then ()
+        else
+          try TypePairs.find type_pairs (t1', t2')
+          with Not_found -> (
+            TypePairs.add type_pairs (t1', t2') ();
+            match (t1'.desc, t2'.desc) with
+            | Tvar _, Tvar _ -> assert false
+            | Tarrow (arg1, ret1, _, _), Tarrow (arg2, ret2, _, _)
+              when Asttypes.same_arg_label arg1.lbl arg2.lbl
+                   || not (is_optional arg1.lbl || is_optional arg2.lbl) ->
+              mcomp type_pairs env arg1.typ arg2.typ;
+              mcomp type_pairs env ret1 ret2
+            | Ttuple tl1, Ttuple tl2 -> mcomp_list type_pairs env tl1 tl2
+            | Tconstr (p1, tl1, _), Tconstr (p2, tl2, _) ->
+              mcomp_type_decl type_pairs env p1 p2 tl1 tl2
+            | Tconstr (p, _, _), _ | _, Tconstr (p, _, _) -> (
+              try
+                let decl = Env.find_type p env in
+                if non_aliasable p decl || is_datatype decl then
+                  raise (Unify [])
+              with Not_found -> ())
+            (*
+        | (Tpackage (p1, n1, tl1), Tpackage (p2, n2, tl2)) when n1 = n2 ->
+            mcomp_list type_pairs env tl1 tl2
+        *)
+            | Tpackage _, Tpackage _ -> ()
+            | Tvariant row1, Tvariant row2 -> mcomp_row type_pairs env row1 row2
+            | Tobject (fi1, _), Tobject (fi2, _) ->
+              mcomp_fields type_pairs env fi1 fi2
+            | Tfield _, Tfield _ ->
+              (* Actually unused *)
+              mcomp_fields type_pairs env t1' t2'
+            | Tnil, Tnil -> ()
+            | Tpoly (t1, []), Tpoly (t2, []) -> mcomp type_pairs env t1 t2
+            | Tpoly (t1, tl1), Tpoly (t2, tl2) ->
+              enter_poly env univar_pairs t1 tl1 t2 tl2 (mcomp type_pairs env)
+            | Tunivar _, Tunivar _ -> unify_univar t1' t2' !univar_pairs
+            | _, _ -> raise (Unify [])))
+
+and mcomp_list type_pairs env tl1 tl2 =
+  if List.length tl1 <> List.length tl2 then raise (Unify []);
+  List.iter2 (mcomp type_pairs env) tl1 tl2
+
+and mcomp_fields type_pairs env ty1 ty2 =
+  if not (concrete_object ty1 && concrete_object ty2) then assert false;
+  let fields2, rest2 = flatten_fields ty2 in
+  let fields1, rest1 = flatten_fields ty1 in
+  let pairs, miss1, miss2 = associate_fields fields1 fields2 in
+  let has_present =
+    List.exists (fun (_, k, _) -> field_kind_repr k = Fpresent)
+  in
+  mcomp type_pairs env rest1 rest2;
+  if
+    (has_present miss1 && (object_row ty2).desc = Tnil)
+    || (has_present miss2 && (object_row ty1).desc = Tnil)
+  then raise (Unify []);
+  List.iter
+    (function
+      | _n, k1, t1, k2, t2 ->
+        mcomp_kind k1 k2;
+        mcomp type_pairs env t1 t2)
+    pairs
+
+and mcomp_kind k1 k2 =
+  let k1 = field_kind_repr k1 in
+  let k2 = field_kind_repr k2 in
+  match (k1, k2) with
+  | Fpresent, Fabsent | Fabsent, Fpresent -> raise (Unify [])
+  | _ -> ()
+
+and mcomp_row type_pairs env row1 row2 =
+  let row1 = row_repr row1 and row2 = row_repr row2 in
+  let r1, r2, pairs = merge_row_fields row1.row_fields row2.row_fields in
+  let cannot_erase (_, f) =
+    match row_field_repr f with
+    | Rpresent _ -> true
+    | Rabsent | Reither _ -> false
+  in
+  if
+    (row1.row_closed && List.exists cannot_erase r2)
+    || (row2.row_closed && List.exists cannot_erase r1)
+  then raise (Unify []);
+  List.iter
+    (fun (_, f1, f2) ->
+      match (row_field_repr f1, row_field_repr f2) with
+      | Rpresent None, (Rpresent (Some _) | Reither (_, _ :: _, _, _) | Rabsent)
+      | Rpresent (Some _), (Rpresent None | Reither (true, _, _, _) | Rabsent)
+      | (Reither (_, _ :: _, _, _) | Rabsent), Rpresent None
+      | (Reither (true, _, _, _) | Rabsent), Rpresent (Some _) ->
+        raise (Unify [])
+      | Rpresent (Some t1), Rpresent (Some t2) -> mcomp type_pairs env t1 t2
+      | Rpresent (Some t1), Reither (false, tl2, _, _) ->
+        List.iter (mcomp type_pairs env t1) tl2
+      | Reither (false, tl1, _, _), Rpresent (Some t2) ->
+        List.iter (mcomp type_pairs env t2) tl1
+      | _ -> ())
+    pairs
+
+and mcomp_type_decl type_pairs env p1 p2 tl1 tl2 =
+  try
+    let decl = Env.find_type p1 env in
+    let decl' = Env.find_type p2 env in
+    if compatible_paths p1 p2 then
+      let inj =
+        try List.map Variance.(mem Inj) (Env.find_type p1 env).type_variance
+        with Not_found -> List.map (fun _ -> false) tl1
+      in
+      List.iter2
+        (fun i (t1, t2) -> if i then mcomp type_pairs env t1 t2)
+        inj (List.combine tl1 tl2)
+    else if non_aliasable p1 decl && non_aliasable p2 decl' then
+      raise (Unify [])
+    else
+      match (decl.type_kind, decl'.type_kind) with
+      | Type_record (lst, r), Type_record (lst', r')
+        when Types.same_record_representation r r' ->
+        mcomp_list type_pairs env tl1 tl2;
+        mcomp_record_description type_pairs env lst lst'
+      | Type_variant v1, Type_variant v2 ->
+        mcomp_list type_pairs env tl1 tl2;
+        mcomp_variant_description type_pairs env v1 v2
+      | Type_open, Type_open -> mcomp_list type_pairs env tl1 tl2
+      | Type_abstract, Type_abstract -> ()
+      | Type_abstract, _ when not (non_aliasable p1 decl) -> ()
+      | _, Type_abstract when not (non_aliasable p2 decl') -> ()
+      | _ -> raise (Unify [])
+  with Not_found -> ()
+
+and mcomp_type_option type_pairs env t t' =
+  match (t, t') with
+  | None, None -> ()
+  | Some t, Some t' -> mcomp type_pairs env t t'
+  | _ -> raise (Unify [])
+
+and mcomp_variant_description type_pairs env xs ys =
+  let rec iter x y =
+    match (x, y) with
+    | c1 :: xs, c2 :: ys ->
+      mcomp_type_option type_pairs env c1.cd_res c2.cd_res;
+      (match (c1.cd_args, c2.cd_args) with
+      | Cstr_tuple l1, Cstr_tuple l2 -> mcomp_list type_pairs env l1 l2
+      | Cstr_record l1, Cstr_record l2 ->
+        mcomp_record_description type_pairs env l1 l2
+      | _ -> raise (Unify []));
+      if Ident.name c1.cd_id = Ident.name c2.cd_id then iter xs ys
+      else raise (Unify [])
+    | [], [] -> ()
+    | _ -> raise (Unify [])
+  in
+  iter xs ys
+
+and mcomp_record_description type_pairs env =
+  let rec iter x y =
+    match (x, y) with
+    | l1 :: xs, l2 :: ys ->
+      mcomp type_pairs env l1.ld_type l2.ld_type;
+      if
+        Ident.name l1.ld_id = Ident.name l2.ld_id
+        && l1.ld_mutable = l2.ld_mutable
+        && l1.ld_optional = l2.ld_optional
+      then iter xs ys
+      else raise (Unify [])
+    | [], [] -> ()
+    | _ -> raise (Unify [])
+  in
+  iter
+
+let mcomp env t1 t2 = mcomp (TypePairs.create 4) env t1 t2
+
+(* Real unification *)
+
+let find_newtype_level env path =
+  try
+    match (Env.find_type path env).type_newtype_level with
+    | Some x -> x
+    | None -> raise Not_found
+  with Not_found ->
+    let lev = Path.binding_time path in
+    (lev, lev)
+
+let add_gadt_equation env source destination =
+  if local_non_recursive_abbrev !env source destination then (
+    let destination = duplicate_type destination in
+    let source_lev = find_newtype_level !env source in
+    let decl = new_declaration (Some source_lev) (Some destination) in
+    let newtype_level = get_newtype_level () in
+    env := Env.add_local_constraint source decl newtype_level !env;
+    cleanup_abbrev ())
+
+let unify_eq_set = TypePairs.create 11
+
+let order_type_pair t1 t2 = if t1.id <= t2.id then (t1, t2) else (t2, t1)
+
+let add_type_equality t1 t2 =
+  TypePairs.add unify_eq_set (order_type_pair t1 t2) ()
+
+let eq_package_path env p1 p2 =
+  Path.same p1 p2
+  || Path.same (normalize_package_path env p1) (normalize_package_path env p2)
+
+let nondep_type' = ref (fun _ _ _ -> assert false)
+let package_subtype = ref (fun _ _ _ _ _ _ _ -> assert false)
+
+let rec concat_longident lid1 =
+  let open Longident in
+  function
+  | Lident s -> Ldot (lid1, s)
+  | Ldot (lid2, s) -> Ldot (concat_longident lid1 lid2, s)
+  | Lapply (lid2, lid) -> Lapply (concat_longident lid1 lid2, lid)
+
+let nondep_instance env level id ty =
+  let ty = !nondep_type' env id ty in
+  if level = generic_level then duplicate_type ty
+  else
+    let old = !current_level in
+    current_level := level;
+    let ty = instance env ty in
+    current_level := old;
+    ty
+
+(* Find the type paths nl1 in the module type mty2, and add them to the
+   list (nl2, tl2). raise Not_found if impossible *)
+let complete_type_list ?(allow_absent = false) env nl1 lv2 mty2 nl2 tl2 =
+  let id2 = Ident.create "Pkg" in
+  let env' = Env.add_module id2 mty2 env in
+  let rec complete nl1 ntl2 =
+    match (nl1, ntl2) with
+    | [], _ -> ntl2
+    | n :: nl, ((n2, _) as nt2) :: ntl' when Longident.cmp n n2 >= 0 ->
+      nt2 :: complete (if Longident.cmp n n2 = 0 then nl else nl1) ntl'
+    | n :: nl, _ -> (
+      try
+        let path =
+          Env.lookup_type (concat_longident (Longident.Lident "Pkg") n) env'
+        in
+        match Env.find_type path env' with
+        | {
+         type_arity = 0;
+         type_kind = Type_abstract;
+         type_private = Public;
+         type_manifest = Some t2;
+        } ->
+          (n, nondep_instance env' lv2 id2 t2) :: complete nl ntl2
+        | {
+         type_arity = 0;
+         type_kind = Type_abstract;
+         type_private = Public;
+         type_manifest = None;
+        }
+          when allow_absent ->
+          complete nl ntl2
+        | _ -> raise Exit
+      with
+      | Not_found when allow_absent -> complete nl ntl2
+      | Exit -> raise Not_found)
+  in
+  complete nl1 (List.combine nl2 tl2)
+
+(* raise Not_found rather than Unify if the module types are incompatible *)
+let unify_package env unify_list lv1 p1 n1 tl1 lv2 p2 n2 tl2 =
+  let ntl2 = complete_type_list env n1 lv2 (Mty_ident p2) n2 tl2
+  and ntl1 = complete_type_list env n2 lv1 (Mty_ident p1) n1 tl1 in
+  unify_list (List.map snd ntl1) (List.map snd ntl2);
+  if
+    eq_package_path env p1 p2
+    || !package_subtype env p1 n1 tl1 p2 n2 tl2
+       && !package_subtype env p2 n2 tl2 p1 n1 tl1
+  then ()
+  else raise Not_found
+
+(* force unification in Reither when one side has a non-conjunctive type *)
+let rigid_variants = ref false
+
+(* drop not force unification in Reither, even in fixed case
+   (not sound, only use it when checking exhaustiveness) *)
+let passive_variants = ref false
+let with_passive_variants f x =
+  if !passive_variants then f x
+  else
+    match
+      passive_variants := true;
+      f x
+    with
+    | r ->
+      passive_variants := false;
+      r
+    | exception e ->
+      passive_variants := false;
+      raise e
+
+let unify_eq t1 t2 =
+  t1 == t2
+  ||
+  match !umode with
+  | Expression -> false
+  | Pattern -> (
+    try
+      TypePairs.find unify_eq_set (order_type_pair t1 t2);
+      true
+    with Not_found -> false)
+
+let unify1_var env t1 t2 =
+  assert (is_Tvar t1);
+  occur env t1 t2;
+  occur_univar env t2;
+  let d1 = t1.desc in
+  link_type t1 t2;
+  try update_level env t1.level t2
+  with Unify _ as e ->
+    t1.desc <- d1;
+    raise e
+
+let rec unify (env : Env.t ref) t1 t2 =
+  (* First step: special cases (optimizations) *)
+  if t1 == t2 then ()
+  else
+    let t1 = repr t1 in
+    let t2 = repr t2 in
+    if unify_eq t1 t2 then ()
+    else
+      let reset_tracing = check_trace_gadt_instances !env in
+
+      try
+        type_changed := true;
+        (match (t1.desc, t2.desc) with
+        | Tvar _, Tconstr _ when deep_occur t1 t2 -> unify2 env t1 t2
+        | Tconstr _, Tvar _ when deep_occur t2 t1 -> unify2 env t1 t2
+        | Tvar _, _ -> unify1_var !env t1 t2
+        | _, Tvar _ -> unify1_var !env t2 t1
+        | Tunivar _, Tunivar _ ->
+          unify_univar t1 t2 !univar_pairs;
+          update_level !env t1.level t2;
+          link_type t1 t2
+        | Tconstr (p1, [], a1), Tconstr (p2, [], a2)
+          when Path.same p1 p2 (* && actual_mode !env = Old *)
+               (* This optimization assumes that t1 does not expand to t2
+                  (and conversely), so we fall back to the general case
+                  when any of the types has a cached expansion. *)
+               && not
+                    (has_cached_expansion p1 !a1 || has_cached_expansion p2 !a2)
+          ->
+          update_level !env t1.level t2;
+          link_type t1 t2
+        | Tconstr (p1, [], _), Tconstr (p2, [], _)
+          when Env.has_local_constraints !env
+               && is_newtype !env p1 && is_newtype !env p2 -> (
+          (* Do not use local constraints more than necessary *)
+          try
+            let[@local] ( < ) ((a : int), (b : int)) (c, d) =
+              a < c || (a = c && b < d)
+            in
+            if find_newtype_level !env p1 < find_newtype_level !env p2 then
+              unify env t1 (try_expand_once !env t2)
+            else unify env (try_expand_once !env t1) t2
+          with Cannot_expand -> unify2 env t1 t2)
+        | _ -> unify2 env t1 t2);
+        reset_trace_gadt_instances reset_tracing
+      with Unify trace ->
+        reset_trace_gadt_instances reset_tracing;
+        raise (Unify ((t1, t2) :: trace))
+
+and unify2 env t1 t2 =
+  (* Second step: expansion of abbreviations *)
+  (* Expansion may change the representative of the types. *)
+  ignore (expand_head_unif !env t1);
+  ignore (expand_head_unif !env t2);
+  let t1' = expand_head_unif !env t1 in
+  let t2' = expand_head_unif !env t2 in
+  let lv = Ext_pervasives.min_int t1'.level t2'.level in
+  update_level !env lv t2;
+  update_level !env lv t1;
+  if unify_eq t1' t2' then ()
+  else
+    let t1 = repr t1 and t2 = repr t2 in
+    (if !trace_gadt_instances then
+       (* All types in chains already have the same ambiguity levels *)
+       let ilevel t =
+         match Env.gadt_instance_level !env t with
+         | None -> 0
+         | Some lv -> lv
+       in
+       let lv1 = ilevel t1 and lv2 = ilevel t2 in
+       if lv1 > lv2 then Env.add_gadt_instance_chain !env lv1 t2
+       else if lv2 > lv1 then Env.add_gadt_instance_chain !env lv2 t1);
+    if unify_eq t1 t1' || not (unify_eq t2 t2') then unify3 env t1 t1' t2 t2'
+    else
+      try unify3 env t2 t2' t1 t1'
+      with Unify trace ->
+        raise (Unify (List.map (fun (x, y) -> (y, x)) trace))
+
+and unify3 env t1 t1' t2 t2' =
+  (* Third step: truly unification *)
+  (* Assumes either [t1 == t1'] or [t2 != t2'] *)
+  let d1 = t1'.desc and d2 = t2'.desc in
+  let create_recursion = t2 != t2' && deep_occur t1' t2 in
+
+  match (d1, d2) with
+  (* handle vars and univars specially *)
+  | Tunivar _, Tunivar _ ->
+    unify_univar t1' t2' !univar_pairs;
+    link_type t1' t2'
+  | Tvar _, _ ->
+    occur !env t1' t2;
+    occur_univar !env t2;
+    link_type t1' t2
+  | _, Tvar _ ->
+    occur !env t2' t1;
+    occur_univar !env t1;
+    link_type t2' t1
+  | Tfield _, Tfield _ ->
+    (* special case for GADTs *)
+    unify_fields env t1' t2'
+  | Tconstr (Pident {name = "function$"}, [t_fun], _), Tarrow _ ->
+    (* subtype: an uncurried function is cast to a curried one *)
+    unify2 env t_fun t2
+  | _ -> (
+    (match !umode with
+    | Expression ->
+      occur !env t1' t2';
+      link_type t1' t2
+    | Pattern -> add_type_equality t1' t2');
+    try
+      (match (d1, d2) with
+      | Tarrow (arg1, ret1, c1, a1), Tarrow (arg2, ret2, c2, a2)
+        when a1 = a2
+             && (Asttypes.same_arg_label arg1.lbl arg2.lbl
+                || !umode = Pattern
+                   && not (is_optional arg1.lbl || is_optional arg2.lbl)) -> (
+        unify env arg1.typ arg2.typ;
+        unify env ret1 ret2;
+        match (commu_repr c1, commu_repr c2) with
+        | Clink r, c2 -> set_commu r c2
+        | c1, Clink r -> set_commu r c1
+        | _ -> ())
+      | Ttuple tl1, Ttuple tl2 -> unify_list env tl1 tl2
+      | Tconstr (p1, tl1, _), Tconstr (p2, tl2, _) when Path.same p1 p2 ->
+        if !umode = Expression || not !generate_equations then
+          unify_list env tl1 tl2
+        else if !assume_injective then
+          set_mode_pattern ~generate:true ~injective:false (fun () ->
+              unify_list env tl1 tl2)
+        else if
+          in_current_module p1 (* || in_pervasives p1 *)
+          || List.exists (expands_to_datatype !env) [t1'; t1; t2]
+        then unify_list env tl1 tl2
+        else
+          let inj =
+            try
+              List.map Variance.(mem Inj) (Env.find_type p1 !env).type_variance
+            with Not_found -> List.map (fun _ -> false) tl1
+          in
+          List.iter2
+            (fun i (t1, t2) ->
+              if i then unify env t1 t2
+              else
+                set_mode_pattern ~generate:false ~injective:false (fun () ->
+                    let snap = snapshot () in
+                    try unify env t1 t2
+                    with Unify _ ->
+                      backtrack snap;
+                      reify env t1;
+                      reify env t2))
+            inj (List.combine tl1 tl2)
+      | Tconstr (path, [], _), Tconstr (path', [], _)
+        when is_instantiable !env path && is_instantiable !env path'
+             && !generate_equations ->
+        let[@local] ( > ) ((a : int), (b : int)) (c, d) =
+          a > c || (a = c && b > d)
+        in
+        let source, destination =
+          if find_newtype_level !env path > find_newtype_level !env path' then
+            (path, t2')
+          else (path', t1')
+        in
+        add_gadt_equation env source destination
+      | Tconstr (path, [], _), _
+        when is_instantiable !env path && !generate_equations ->
+        reify env t2';
+        add_gadt_equation env path t2'
+      | _, Tconstr (path, [], _)
+        when is_instantiable !env path && !generate_equations ->
+        reify env t1';
+        add_gadt_equation env path t1'
+      | (Tconstr (_, _, _), _ | _, Tconstr (_, _, _)) when !umode = Pattern ->
+        reify env t1';
+        reify env t2';
+        if !generate_equations then mcomp !env t1' t2'
+      | Tobject (fi1, nm1), Tobject (fi2, _) -> (
+        unify_fields env fi1 fi2;
+        (* Type [t2'] may have been instantiated by [unify_fields] *)
+        (* XXX One should do some kind of unification... *)
+        match (repr t2').desc with
+        | Tobject (_, {contents = Some (_, va :: _)})
+          when match (repr va).desc with
+               | Tvar _ | Tunivar _ | Tnil -> true
+               | _ -> false ->
+          ()
+        | Tobject (_, nm2) -> set_name nm2 !nm1
+        | _ -> ())
+      | Tvariant row1, Tvariant row2 -> (
+        if !umode = Expression then unify_row env row1 row2
+        else
+          let snap = snapshot () in
+          try unify_row env row1 row2
+          with Unify _ ->
+            backtrack snap;
+            reify env t1';
+            reify env t2';
+            if !generate_equations then mcomp !env t1' t2')
+      | Tfield (f, kind, _, rem), Tnil | Tnil, Tfield (f, kind, _, rem) -> (
+        match field_kind_repr kind with
+        | Fvar r when f <> dummy_method ->
+          set_kind r Fabsent;
+          if d2 = Tnil then unify env rem t2'
+          else unify env (newty2 rem.level Tnil) rem
+        | _ -> raise (Unify []))
+      | Tnil, Tnil -> ()
+      | Tpoly (t1, []), Tpoly (t2, []) -> unify env t1 t2
+      | Tpoly (t1, tl1), Tpoly (t2, tl2) ->
+        enter_poly !env univar_pairs t1 tl1 t2 tl2 (unify env)
+      | Tpackage (p1, n1, tl1), Tpackage (p2, n2, tl2) -> (
+        try
+          unify_package !env (unify_list env) t1.level p1 n1 tl1 t2.level p2 n2
+            tl2
+        with Not_found ->
+          if !umode = Expression then raise (Unify []);
+          List.iter (reify env) (tl1 @ tl2)
+          (* if !generate_equations then List.iter2 (mcomp !env) tl1 tl2 *))
+      | _, _ -> raise (Unify []));
+      (* XXX Commentaires + changer "create_recursion"
+         ||| Comments + change "create_recursion" *)
+      if create_recursion then
+        match t2.desc with
+        | Tconstr (p, tl, abbrev) ->
+          forget_abbrev abbrev p;
+          let t2'' = expand_head_unif !env t2 in
+          if not (closed_parameterized_type tl t2'') then
+            link_type (repr t2) (repr t2')
+        | _ -> () (* t2 has already been expanded by update_level *)
+    with Unify trace ->
+      t1'.desc <- d1;
+      raise (Unify trace))
+
+and unify_list env tl1 tl2 =
+  if List.length tl1 <> List.length tl2 then raise (Unify []);
+  List.iter2 (unify env) tl1 tl2
+
+(* Build a fresh row variable for unification *)
+and make_rowvar level use1 rest1 use2 rest2 =
+  let set_name ty name =
+    match ty.desc with
+    | Tvar None ->
+      log_type ty;
+      ty.desc <- Tvar name
+    | _ -> ()
+  in
+  let name =
+    match (rest1.desc, rest2.desc) with
+    | Tvar (Some _ as name1), Tvar (Some _ as name2) ->
+      if rest1.level <= rest2.level then name1 else name2
+    | Tvar (Some _ as name), _ ->
+      if use2 then set_name rest2 name;
+      name
+    | _, Tvar (Some _ as name) ->
+      if use1 then set_name rest2 name;
+      name
+    | _ -> None
+  in
+  if use1 then rest1 else if use2 then rest2 else newvar2 ?name level
+
+and unify_fields env (ty1 : Types.type_expr) (ty2 : Types.type_expr) =
+  (* Optimization *)
+  let fields1, rest1 = flatten_fields ty1
+  and fields2, rest2 = flatten_fields ty2 in
+  let pairs, miss1, miss2 = associate_fields fields1 fields2 in
+  let l1 = (repr ty1).level and l2 = (repr ty2).level in
+  let va =
+    make_rowvar
+      (Ext_pervasives.min_int l1 l2)
+      (miss2 = []) rest1 (miss1 = []) rest2
+  in
+  let d1 = rest1.desc and d2 = rest2.desc in
+  try
+    unify env (build_fields l1 miss1 va) rest2;
+    unify env rest1 (build_fields l2 miss2 va);
+    List.iter
+      (fun (n, k1, t1, k2, t2) ->
+        unify_kind k1 k2;
+        try
+          if !trace_gadt_instances then update_level !env va.level t1;
+          unify env t1 t2
+        with Unify trace ->
+          raise
+            (Unify
+               (( newty (Tfield (n, k1, t1, newty Tnil)),
+                  newty (Tfield (n, k2, t2, newty Tnil)) )
+               :: trace)))
+      pairs
+  with exn ->
+    log_type rest1;
+    rest1.desc <- d1;
+    log_type rest2;
+    rest2.desc <- d2;
+    raise exn
+
+and unify_kind k1 k2 =
+  let k1 = field_kind_repr k1 in
+  let k2 = field_kind_repr k2 in
+  if k1 == k2 then ()
+  else
+    match (k1, k2) with
+    | Fvar r, (Fvar _ | Fpresent) -> set_kind r k2
+    | Fpresent, Fvar r -> set_kind r k1
+    | Fpresent, Fpresent -> ()
+    | _ -> assert false
+
+and unify_row env row1 row2 =
+  let row1 = row_repr row1 and row2 = row_repr row2 in
+  let rm1 = row_more row1 and rm2 = row_more row2 in
+  if unify_eq rm1 rm2 then ()
+  else
+    let r1, r2, pairs = merge_row_fields row1.row_fields row2.row_fields in
+    let fixed1 = row_fixed row1 and fixed2 = row_fixed row2 in
+    let more =
+      if fixed1 then rm1
+      else if fixed2 then rm2
+      else newty2 (Ext_pervasives.min_int rm1.level rm2.level) (Tvar None)
+    in
+    let fixed = fixed1 || fixed2
+    and closed = row1.row_closed || row2.row_closed in
+    let keep switch =
+      List.for_all
+        (fun (_, f1, f2) ->
+          let f1, f2 = switch f1 f2 in
+          row_field_repr f1 = Rabsent || row_field_repr f2 <> Rabsent)
+        pairs
+    in
+    let empty fields =
+      List.for_all (fun (_, f) -> row_field_repr f = Rabsent) fields
+    in
+    (* Check whether we are going to build an empty type *)
+    if
+      closed
+      && (empty r1 || row2.row_closed)
+      && (empty r2 || row1.row_closed)
+      && List.for_all
+           (fun (_, f1, f2) ->
+             row_field_repr f1 = Rabsent || row_field_repr f2 = Rabsent)
+           pairs
+    then raise (Unify [(mkvariant [] true, mkvariant [] true)]);
+    let name =
+      if
+        row1.row_name <> None
+        && (row1.row_closed || empty r2)
+        && ((not row2.row_closed) || (keep (fun f1 f2 -> (f1, f2)) && empty r1))
+      then row1.row_name
+      else if
+        row2.row_name <> None
+        && (row2.row_closed || empty r1)
+        && ((not row1.row_closed) || (keep (fun f1 f2 -> (f2, f1)) && empty r2))
+      then row2.row_name
+      else None
+    in
+    let row0 =
+      {
+        row_fields = [];
+        row_more = more;
+        row_closed = closed;
+        row_fixed = fixed;
+        row_name = name;
+      }
+    in
+    let set_more row rest =
+      let rest =
+        if closed then filter_row_fields row.row_closed rest else rest
+      in
+      (if
+         (rest <> [] && (row.row_closed || row_fixed row))
+         || (closed && row_fixed row && not row.row_closed)
+       then
+         let t1 = mkvariant [] true and t2 = mkvariant rest false in
+         raise (Unify [(if row == row1 then (t1, t2) else (t2, t1))]));
+      (* The following test is not principal... should rather use Tnil *)
+      let rm = row_more row in
+      (*if !trace_gadt_instances && rm.desc = Tnil then () else*)
+      if !trace_gadt_instances then
+        update_level !env rm.level (newgenty (Tvariant row));
+      if row_fixed row then
+        if more == rm then ()
+        else if is_Tvar rm then link_type rm more
+        else unify env rm more
+      else
+        let ty = newgenty (Tvariant {row0 with row_fields = rest}) in
+        update_level !env rm.level ty;
+        link_type rm ty
+    in
+    let md1 = rm1.desc and md2 = rm2.desc in
+    try
+      set_more row2 r1;
+      set_more row1 r2;
+      List.iter
+        (fun (l, f1, f2) ->
+          try unify_row_field env fixed1 fixed2 more l f1 f2
+          with Unify trace ->
+            raise
+              (Unify
+                 ((mkvariant [(l, f1)] true, mkvariant [(l, f2)] true) :: trace)))
+        pairs;
+      if static_row row1 then
+        let rm = row_more row1 in
+        if is_Tvar rm then link_type rm (newty2 rm.level Tnil)
+    with exn ->
+      log_type rm1;
+      rm1.desc <- md1;
+      log_type rm2;
+      rm2.desc <- md2;
+      raise exn
+
+and unify_row_field env fixed1 fixed2 more l f1 f2 =
+  let f1 = row_field_repr f1 and f2 = row_field_repr f2 in
+  if f1 == f2 then ()
+  else
+    match (f1, f2) with
+    | Rpresent (Some t1), Rpresent (Some t2) -> unify env t1 t2
+    | Rpresent None, Rpresent None -> ()
+    | Reither (c1, tl1, m1, e1), Reither (c2, tl2, m2, e2) ->
+      if e1 == e2 then ()
+      else if
+        (fixed1 || fixed2)
+        && (not (c1 || c2))
+        && List.length tl1 = List.length tl2
+      then (
+        (* PR#7496 *)
+        let f = Reither (c1 || c2, [], m1 || m2, ref None) in
+        set_row_field e1 f;
+        set_row_field e2 f;
+        List.iter2 (unify env) tl1 tl2)
+      else
+        let redo =
+          (not !passive_variants)
+          && (m1 || m2 || fixed1 || fixed2
+             || (!rigid_variants && (List.length tl1 = 1 || List.length tl2 = 1))
+             )
+          &&
+          match tl1 @ tl2 with
+          | [] -> false
+          | t1 :: tl ->
+            if c1 || c2 then raise (Unify []);
+            List.iter (unify env t1) tl;
+            !e1 <> None || !e2 <> None
+        in
+        if redo then unify_row_field env fixed1 fixed2 more l f1 f2
+        else
+          let tl1 = List.map repr tl1 and tl2 = List.map repr tl2 in
+          let rec remq tl = function
+            | [] -> []
+            | ty :: tl' ->
+              if List.memq ty tl then remq tl tl' else ty :: remq tl tl'
+          in
+          let tl2' = remq tl2 tl1 and tl1' = remq tl1 tl2 in
+          (* PR#6744 *)
+          let split_univars =
+            List.partition (fun ty ->
+                try
+                  occur_univar !env ty;
+                  true
+                with Unify _ -> false)
+          in
+          let tl1', tlu1 = split_univars tl1'
+          and tl2', tlu2 = split_univars tl2' in
+          (match (tlu1, tlu2) with
+          | [], [] -> ()
+          | tu1 :: tlu1, _ :: _ ->
+            (* Attempt to merge all the types containing univars *)
+            if not !passive_variants then List.iter (unify env tu1) (tlu1 @ tlu2)
+          | tu :: _, [] | [], tu :: _ -> occur_univar !env tu);
+          (* Is this handling of levels really principal? *)
+          List.iter (update_level !env (repr more).level) (tl1' @ tl2');
+          let e = ref None in
+          let f1' = Reither (c1 || c2, tl1', m1 || m2, e)
+          and f2' = Reither (c1 || c2, tl2', m1 || m2, e) in
+          set_row_field e1 f1';
+          set_row_field e2 f2'
+    | Reither (_, _, false, e1), Rabsent when not fixed1 -> set_row_field e1 f2
+    | Rabsent, Reither (_, _, false, e2) when not fixed2 -> set_row_field e2 f1
+    | Rabsent, Rabsent -> ()
+    | Reither (false, tl, _, e1), Rpresent (Some t2) when not fixed1 -> (
+      set_row_field e1 f2;
+      update_level !env (repr more).level t2;
+      try List.iter (fun t1 -> unify env t1 t2) tl
+      with exn ->
+        e1 := None;
+        raise exn)
+    | Rpresent (Some t1), Reither (false, tl, _, e2) when not fixed2 -> (
+      set_row_field e2 f1;
+      update_level !env (repr more).level t1;
+      try List.iter (unify env t1) tl
+      with exn ->
+        e2 := None;
+        raise exn)
+    | Reither (true, [], _, e1), Rpresent None when not fixed1 ->
+      set_row_field e1 f2
+    | Rpresent None, Reither (true, [], _, e2) when not fixed2 ->
+      set_row_field e2 f1
+    | _ -> raise (Unify [])
+
+let unify env ty1 ty2 =
+  let snap = Btype.snapshot () in
+  try unify env ty1 ty2 with
+  | Unify trace ->
+    undo_compress snap;
+    raise (Unify (expand_trace !env trace))
+  | Recursive_abbrev ->
+    undo_compress snap;
+    raise (Unification_recursive_abbrev (expand_trace !env [(ty1, ty2)]))
+
+let unify_gadt ~newtype_level:lev (env : Env.t ref) ty1 ty2 =
+  try
+    univar_pairs := [];
+    newtype_level := Some lev;
+    set_mode_pattern ~generate:true ~injective:true (fun () ->
+        unify env ty1 ty2);
+    newtype_level := None;
+    TypePairs.clear unify_eq_set
+  with e ->
+    newtype_level := None;
+    TypePairs.clear unify_eq_set;
+    raise e
+
+let unify_var env t1 t2 =
+  let t1 = repr t1 and t2 = repr t2 in
+  if t1 == t2 then ()
+  else
+    match (t1.desc, t2.desc) with
+    | Tvar _, Tconstr _ when deep_occur t1 t2 -> unify (ref env) t1 t2
+    | Tvar _, _ -> (
+      let reset_tracing = check_trace_gadt_instances env in
+      try
+        occur env t1 t2;
+        update_level env t1.level t2;
+        link_type t1 t2;
+        reset_trace_gadt_instances reset_tracing
+      with Unify trace ->
+        reset_trace_gadt_instances reset_tracing;
+        let expanded_trace = expand_trace env ((t1, t2) :: trace) in
+        raise (Unify expanded_trace))
+    | _ -> unify (ref env) t1 t2
+
+let _ = unify' := unify_var
+
+let unify_pairs env ty1 ty2 pairs =
+  univar_pairs := pairs;
+  unify env ty1 ty2
+
+let unify env ty1 ty2 = unify_pairs (ref env) ty1 ty2 []
+
+(**** Special cases of unification ****)
+
+let expand_head_trace env t =
+  let reset_tracing = check_trace_gadt_instances env in
+  let t = expand_head_unif env t in
+  reset_trace_gadt_instances reset_tracing;
+  t
+
+(*
+   Unify [t] and [l:'a -> 'b]. Return ['a] and ['b].
+   In label mode, label mismatch is accepted when
+   (1) the requested label is ""
+   (2) the original label is not optional
+*)
+
+let filter_arrow ~env ~arity t l =
+  let t = expand_head_trace env t in
+  match t.desc with
+  | Tvar _ ->
+    let lv = t.level in
+    let t1 = newvar2 lv and t2 = newvar2 lv in
+    let t' = newty2 lv (Tarrow ({lbl = l; typ = t1}, t2, Cok, arity)) in
+    link_type t t';
+    (t1, t2)
+  | Tarrow (arg, ret, _, _) when Asttypes.same_arg_label l arg.lbl ->
+    (arg.typ, ret)
+  | _ -> raise (Unify [])
+
+(* Used by [filter_method]. *)
+let rec filter_method_field env name priv ty =
+  let ty = expand_head_trace env ty in
+  match ty.desc with
+  | Tvar _ ->
+    let level = ty.level in
+    let ty1 = newvar2 level and ty2 = newvar2 level in
+    let ty' =
+      newty2 level
+        (Tfield
+           ( name,
+             (match priv with
+             | Private -> Fvar (ref None)
+             | Public -> Fpresent),
+             ty1,
+             ty2 ))
+    in
+    link_type ty ty';
+    ty1
+  | Tfield (n, kind, ty1, ty2) ->
+    let kind = field_kind_repr kind in
+    if n = name && kind <> Fabsent then (
+      if priv = Public then unify_kind kind Fpresent;
+      ty1)
+    else filter_method_field env name priv ty2
+  | _ -> raise (Unify [])
+
+(* Unify [ty] and [< name : 'a; .. >]. Return ['a]. *)
+let filter_method env name priv ty =
+  let ty = expand_head_trace env ty in
+  match ty.desc with
+  | Tvar _ ->
+    let ty1 = newvar () in
+    let ty' = newobj ty1 in
+    update_level env ty.level ty';
+    link_type ty ty';
+    filter_method_field env name priv ty1
+  | Tobject (f, _) -> filter_method_field env name priv f
+  | _ -> raise (Unify [])
+
+let check_filter_method env name priv ty =
+  ignore (filter_method env name priv ty)
+
+let filter_self_method env lab priv meths ty =
+  let ty' = filter_method env lab priv ty in
+  try Meths.find lab !meths
+  with Not_found ->
+    let pair = (Ident.create lab, ty') in
+    meths := Meths.add lab pair !meths;
+    pair
+
+(***********************************)
+(*  Matching between type schemes  *)
+(***********************************)
+
+(*
+   Update the level of [ty]. First check that the levels of generic
+   variables from the subject are not lowered.
+*)
+let moregen_occur env level ty =
+  let rec occur ty =
+    let ty = repr ty in
+    if ty.level > level then (
+      if is_Tvar ty && ty.level >= generic_level - 1 then raise Occur;
+      ty.level <- pivot_level - ty.level;
+      match ty.desc with
+      | Tvariant row when static_row row -> iter_row occur row
+      | _ -> iter_type_expr occur ty)
+  in
+  (try
+     occur ty;
+     unmark_type ty
+   with Occur ->
+     unmark_type ty;
+     raise (Unify []));
+  (* also check for free univars *)
+  occur_univar env ty;
+  update_level env level ty
+
+let may_instantiate inst_nongen t1 =
+  if inst_nongen then t1.level <> generic_level - 1
+  else t1.level = generic_level
+
+let rec moregen inst_nongen type_pairs env t1 t2 =
+  if t1 == t2 then ()
+  else
+    let t1 = repr t1 in
+    let t2 = repr t2 in
+    if t1 == t2 then ()
+    else
+      try
+        match (t1.desc, t2.desc) with
+        | Tvar _, _ when may_instantiate inst_nongen t1 ->
+          moregen_occur env t1.level t2;
+          occur env t1 t2;
+          link_type t1 t2
+        | Tconstr (p1, [], _), Tconstr (p2, [], _) when Path.same p1 p2 -> ()
+        | _ -> (
+          let t1' = expand_head env t1 in
+          let t2' = expand_head env t2 in
+          (* Expansion may have changed the representative of the types... *)
+          let t1' = repr t1' and t2' = repr t2' in
+          if t1' == t2' then ()
+          else
+            try TypePairs.find type_pairs (t1', t2')
+            with Not_found -> (
+              TypePairs.add type_pairs (t1', t2') ();
+              match (t1'.desc, t2'.desc) with
+              | Tvar _, _ when may_instantiate inst_nongen t1' ->
+                moregen_occur env t1'.level t2;
+                link_type t1' t2
+              | Tarrow (arg1, ret1, _, _), Tarrow (arg2, ret2, _, _)
+                when Asttypes.same_arg_label arg1.lbl arg2.lbl ->
+                moregen inst_nongen type_pairs env arg1.typ arg2.typ;
+                moregen inst_nongen type_pairs env ret1 ret2
+              | Ttuple tl1, Ttuple tl2 ->
+                moregen_list inst_nongen type_pairs env tl1 tl2
+              | Tconstr (p1, tl1, _), Tconstr (p2, tl2, _) when Path.same p1 p2
+                ->
+                moregen_list inst_nongen type_pairs env tl1 tl2
+              | Tpackage (p1, n1, tl1), Tpackage (p2, n2, tl2) -> (
+                try
+                  unify_package env
+                    (moregen_list inst_nongen type_pairs env)
+                    t1'.level p1 n1 tl1 t2'.level p2 n2 tl2
+                with Not_found -> raise (Unify []))
+              | Tvariant row1, Tvariant row2 ->
+                moregen_row inst_nongen type_pairs env row1 row2
+              | Tobject (fi1, _nm1), Tobject (fi2, _nm2) ->
+                moregen_fields inst_nongen type_pairs env fi1 fi2
+              | Tfield _, Tfield _ ->
+                (* Actually unused *)
+                moregen_fields inst_nongen type_pairs env t1' t2'
+              | Tnil, Tnil -> ()
+              | Tpoly (t1, []), Tpoly (t2, []) ->
+                moregen inst_nongen type_pairs env t1 t2
+              | Tpoly (t1, tl1), Tpoly (t2, tl2) ->
+                enter_poly env univar_pairs t1 tl1 t2 tl2
+                  (moregen inst_nongen type_pairs env)
+              | Tunivar _, Tunivar _ -> unify_univar t1' t2' !univar_pairs
+              | _, _ -> raise (Unify [])))
+      with Unify trace -> raise (Unify ((t1, t2) :: trace))
+
+and moregen_list inst_nongen type_pairs env tl1 tl2 =
+  if List.length tl1 <> List.length tl2 then raise (Unify []);
+  List.iter2 (moregen inst_nongen type_pairs env) tl1 tl2
+
+and moregen_fields inst_nongen type_pairs env ty1 ty2 =
+  let fields1, rest1 = flatten_fields ty1
+  and fields2, rest2 = flatten_fields ty2 in
+  let pairs, miss1, miss2 = associate_fields fields1 fields2 in
+  if miss1 <> [] then raise (Unify []);
+  moregen inst_nongen type_pairs env rest1
+    (build_fields (repr ty2).level miss2 rest2);
+  List.iter
+    (fun (n, k1, t1, k2, t2) ->
+      moregen_kind k1 k2;
+      try moregen inst_nongen type_pairs env t1 t2
+      with Unify trace ->
+        raise
+          (Unify
+             (( newty (Tfield (n, k1, t1, rest2)),
+                newty (Tfield (n, k2, t2, rest2)) )
+             :: trace)))
+    pairs
+
+and moregen_kind k1 k2 =
+  let k1 = field_kind_repr k1 in
+  let k2 = field_kind_repr k2 in
+  if k1 == k2 then ()
+  else
+    match (k1, k2) with
+    | Fvar r, (Fvar _ | Fpresent) -> set_kind r k2
+    | Fpresent, Fpresent -> ()
+    | _ -> raise (Unify [])
+
+and moregen_row inst_nongen type_pairs env row1 row2 =
+  let row1 = row_repr row1 and row2 = row_repr row2 in
+  let rm1 = repr row1.row_more and rm2 = repr row2.row_more in
+  if rm1 == rm2 then ()
+  else
+    let may_inst =
+      (is_Tvar rm1 && may_instantiate inst_nongen rm1) || rm1.desc = Tnil
+    in
+    let r1, r2, pairs = merge_row_fields row1.row_fields row2.row_fields in
+    let r1, r2 =
+      if row2.row_closed then
+        (filter_row_fields may_inst r1, filter_row_fields false r2)
+      else (r1, r2)
+    in
+    if r1 <> [] || (row1.row_closed && ((not row2.row_closed) || r2 <> [])) then
+      raise (Unify []);
+    (match (rm1.desc, rm2.desc) with
+    | Tunivar _, Tunivar _ -> unify_univar rm1 rm2 !univar_pairs
+    | Tunivar _, _ | _, Tunivar _ -> raise (Unify [])
+    | _ when static_row row1 -> ()
+    | _ when may_inst ->
+      let ext =
+        newgenty (Tvariant {row2 with row_fields = r2; row_name = None})
+      in
+      moregen_occur env rm1.level ext;
+      link_type rm1 ext
+    | Tconstr _, Tconstr _ -> moregen inst_nongen type_pairs env rm1 rm2
+    | _ -> raise (Unify []));
+    List.iter
+      (fun (_l, f1, f2) ->
+        let f1 = row_field_repr f1 and f2 = row_field_repr f2 in
+        if f1 == f2 then ()
+        else
+          match (f1, f2) with
+          | Rpresent (Some t1), Rpresent (Some t2) ->
+            moregen inst_nongen type_pairs env t1 t2
+          | Rpresent None, Rpresent None -> ()
+          | Reither (false, tl1, _, e1), Rpresent (Some t2) when may_inst ->
+            set_row_field e1 f2;
+            List.iter (fun t1 -> moregen inst_nongen type_pairs env t1 t2) tl1
+          | Reither (c1, tl1, _, e1), Reither (c2, tl2, m2, e2) ->
+            if e1 != e2 then (
+              if c1 && not c2 then raise (Unify []);
+              set_row_field e1 (Reither (c2, [], m2, e2));
+              if List.length tl1 = List.length tl2 then
+                List.iter2 (moregen inst_nongen type_pairs env) tl1 tl2
+              else
+                match tl2 with
+                | t2 :: _ ->
+                  List.iter
+                    (fun t1 -> moregen inst_nongen type_pairs env t1 t2)
+                    tl1
+                | [] -> if tl1 <> [] then raise (Unify []))
+          | Reither (true, [], _, e1), Rpresent None when may_inst ->
+            set_row_field e1 f2
+          | Reither (_, _, _, e1), Rabsent when may_inst -> set_row_field e1 f2
+          | Rabsent, Rabsent -> ()
+          | _ -> raise (Unify []))
+      pairs
+
+(* Must empty univar_pairs first *)
+let moregen inst_nongen type_pairs env patt subj =
+  univar_pairs := [];
+  moregen inst_nongen type_pairs env patt subj
+
+(*
+   Non-generic variable can be instantiated only if [inst_nongen] is
+   true. So, [inst_nongen] should be set to false if the subject might
+   contain non-generic variables (and we do not want them to be
+   instantiated).
+   Usually, the subject is given by the user, and the pattern
+   is unimportant.  So, no need to propagate abbreviations.
+*)
+let moregeneral env inst_nongen pat_sch subj_sch =
+  let old_level = !current_level in
+  current_level := generic_level - 1;
+  (*
+     Generic variables are first duplicated with [instance].  So,
+     their levels are lowered to [generic_level - 1].  The subject is
+     then copied with [duplicate_type].  That way, its levels won't be
+     changed.
+  *)
+  let subj = duplicate_type (instance env subj_sch) in
+  current_level := generic_level;
+  (* Duplicate generic variables *)
+  let patt = instance env pat_sch in
+  let res =
+    try
+      moregen inst_nongen (TypePairs.create 13) env patt subj;
+      true
+    with Unify _ -> false
+  in
+  current_level := old_level;
+  res
+
+(* Alternative approach: "rigidify" a type scheme,
+   and check validity after unification *)
+(* Simpler, no? *)
+
+let rec rigidify_rec vars ty =
+  let ty = repr ty in
+  if ty.level >= lowest_level then (
+    ty.level <- pivot_level - ty.level;
+    match ty.desc with
+    | Tvar _ -> if not (List.memq ty !vars) then vars := ty :: !vars
+    | Tvariant row ->
+      let row = row_repr row in
+      let more = repr row.row_more in
+      (if is_Tvar more && not (row_fixed row) then
+         let more' = newty2 more.level more.desc in
+         let row' =
+           {row with row_fixed = true; row_fields = []; row_more = more'}
+         in
+         link_type more (newty2 ty.level (Tvariant row')));
+      iter_row (rigidify_rec vars) row;
+      (* only consider the row variable if the variant is not static *)
+      if not (static_row row) then rigidify_rec vars (row_more row)
+    | _ -> iter_type_expr (rigidify_rec vars) ty)
+
+let rigidify ty =
+  let vars = ref [] in
+  rigidify_rec vars ty;
+  unmark_type ty;
+  !vars
+
+let all_distinct_vars env vars =
+  let tyl = ref [] in
+  List.for_all
+    (fun ty ->
+      let ty = expand_head env ty in
+      if List.memq ty !tyl then false
+      else (
+        tyl := ty :: !tyl;
+        is_Tvar ty))
+    vars
+
+let matches env ty ty' =
+  let snap = snapshot () in
+  let vars = rigidify ty in
+  cleanup_abbrev ();
+  let ok =
+    try
+      unify env ty ty';
+      all_distinct_vars env vars
+    with Unify _ -> false
+  in
+  backtrack snap;
+  ok
+
+(*********************************************)
+(*  Equivalence between parameterized types  *)
+(*********************************************)
+
+let expand_head_rigid env ty =
+  let old = !rigid_variants in
+  rigid_variants := true;
+  let ty' = expand_head env ty in
+  rigid_variants := old;
+  ty'
+
+let normalize_subst subst =
+  if
+    List.exists
+      (function
+        | {desc = Tlink _}, _ | _, {desc = Tlink _} -> true
+        | _ -> false)
+      !subst
+  then subst := List.map (fun (t1, t2) -> (repr t1, repr t2)) !subst
+
+let rec eqtype rename type_pairs subst env t1 t2 =
+  if t1 == t2 then ()
+  else
+    let t1 = repr t1 in
+    let t2 = repr t2 in
+    if t1 == t2 then ()
+    else
+      try
+        match (t1.desc, t2.desc) with
+        | Tvar _, Tvar _ when rename -> (
+          try
+            normalize_subst subst;
+            if List.assq t1 !subst != t2 then raise (Unify [])
+          with Not_found ->
+            if List.exists (fun (_, t) -> t == t2) !subst then raise (Unify []);
+            subst := (t1, t2) :: !subst)
+        | Tconstr (p1, [], _), Tconstr (p2, [], _) when Path.same p1 p2 -> ()
+        | _ -> (
+          let t1' = expand_head_rigid env t1 in
+          let t2' = expand_head_rigid env t2 in
+          (* Expansion may have changed the representative of the types... *)
+          let t1' = repr t1' and t2' = repr t2' in
+          if t1' == t2' then ()
+          else
+            try TypePairs.find type_pairs (t1', t2')
+            with Not_found -> (
+              TypePairs.add type_pairs (t1', t2') ();
+              match (t1'.desc, t2'.desc) with
+              | Tvar _, Tvar _ when rename -> (
+                try
+                  normalize_subst subst;
+                  if List.assq t1' !subst != t2' then raise (Unify [])
+                with Not_found ->
+                  if List.exists (fun (_, t) -> t == t2') !subst then
+                    raise (Unify []);
+                  subst := (t1', t2') :: !subst)
+              | Tarrow (arg1, ret1, _, _), Tarrow (arg2, ret2, _, _)
+                when Asttypes.same_arg_label arg1.lbl arg2.lbl ->
+                eqtype rename type_pairs subst env arg1.typ arg2.typ;
+                eqtype rename type_pairs subst env ret1 ret2
+              | Ttuple tl1, Ttuple tl2 ->
+                eqtype_list rename type_pairs subst env tl1 tl2
+              | Tconstr (p1, tl1, _), Tconstr (p2, tl2, _) when Path.same p1 p2
+                ->
+                eqtype_list rename type_pairs subst env tl1 tl2
+              | Tpackage (p1, n1, tl1), Tpackage (p2, n2, tl2) -> (
+                try
+                  unify_package env
+                    (eqtype_list rename type_pairs subst env)
+                    t1'.level p1 n1 tl1 t2'.level p2 n2 tl2
+                with Not_found -> raise (Unify []))
+              | Tvariant row1, Tvariant row2 ->
+                eqtype_row rename type_pairs subst env row1 row2
+              | Tobject (fi1, _nm1), Tobject (fi2, _nm2) ->
+                eqtype_fields rename type_pairs subst env fi1 fi2
+              | Tfield _, Tfield _ ->
+                (* Actually unused *)
+                eqtype_fields rename type_pairs subst env t1' t2'
+              | Tnil, Tnil -> ()
+              | Tpoly (t1, []), Tpoly (t2, []) ->
+                eqtype rename type_pairs subst env t1 t2
+              | Tpoly (t1, tl1), Tpoly (t2, tl2) ->
+                enter_poly env univar_pairs t1 tl1 t2 tl2
+                  (eqtype rename type_pairs subst env)
+              | Tunivar _, Tunivar _ -> unify_univar t1' t2' !univar_pairs
+              | _, _ -> raise (Unify [])))
+      with Unify trace -> raise (Unify ((t1, t2) :: trace))
+
+and eqtype_list rename type_pairs subst env tl1 tl2 =
+  if List.length tl1 <> List.length tl2 then raise (Unify []);
+  List.iter2 (eqtype rename type_pairs subst env) tl1 tl2
+
+and eqtype_fields rename type_pairs subst env ty1 ty2 : unit =
+  let fields1, rest1 = flatten_fields ty1 in
+  let fields2, rest2 = flatten_fields ty2 in
+  (* First check if same row => already equal *)
+  let same_row =
+    rest1 == rest2
+    || TypePairs.mem type_pairs (rest1, rest2)
+    || (rename && List.mem (rest1, rest2) !subst)
+  in
+  if same_row then ()
+  else
+    (* Try expansion, needed when called from Includecore.type_manifest *)
+    match expand_head_rigid env rest2 with
+    | {desc = Tobject (ty2, _)} ->
+      eqtype_fields rename type_pairs subst env ty1 ty2
+    | _ ->
+      let pairs, miss1, miss2 = associate_fields fields1 fields2 in
+      eqtype rename type_pairs subst env rest1 rest2;
+      if miss1 <> [] || miss2 <> [] then raise (Unify []);
+      List.iter
+        (function
+          | n, k1, t1, k2, t2 -> (
+            eqtype_kind k1 k2;
+            try eqtype rename type_pairs subst env t1 t2
+            with Unify trace ->
+              raise
+                (Unify
+                   (( newty (Tfield (n, k1, t1, rest2)),
+                      newty (Tfield (n, k2, t2, rest2)) )
+                   :: trace))))
+        pairs
+
+and eqtype_kind k1 k2 =
+  let k1 = field_kind_repr k1 in
+  let k2 = field_kind_repr k2 in
+  match (k1, k2) with
+  | Fvar _, Fvar _ | Fpresent, Fpresent -> ()
+  | _ -> raise (Unify [])
+
+and eqtype_row rename type_pairs subst env row1 row2 =
+  (* Try expansion, needed when called from Includecore.type_manifest *)
+  match expand_head_rigid env (row_more row2) with
+  | {desc = Tvariant row2} -> eqtype_row rename type_pairs subst env row1 row2
+  | _ ->
+    let row1 = row_repr row1 and row2 = row_repr row2 in
+    let r1, r2, pairs = merge_row_fields row1.row_fields row2.row_fields in
+    if
+      row1.row_closed <> row2.row_closed
+      || ((not row1.row_closed) && (r1 <> [] || r2 <> []))
+      || filter_row_fields false (r1 @ r2) <> []
+    then raise (Unify []);
+    if not (static_row row1) then
+      eqtype rename type_pairs subst env row1.row_more row2.row_more;
+    List.iter
+      (fun (_, f1, f2) ->
+        match (row_field_repr f1, row_field_repr f2) with
+        | Rpresent (Some t1), Rpresent (Some t2) ->
+          eqtype rename type_pairs subst env t1 t2
+        | Reither (c1, [], _, _), Reither (c2, [], _, _) when c1 = c2 -> ()
+        | Reither (c1, t1 :: tl1, _, _), Reither (c2, t2 :: tl2, _, _)
+          when c1 = c2 ->
+          eqtype rename type_pairs subst env t1 t2;
+          if List.length tl1 = List.length tl2 then
+            (* if same length allow different types (meaning?) *)
+            List.iter2 (eqtype rename type_pairs subst env) tl1 tl2
+          else (
+            (* otherwise everything must be equal *)
+            List.iter (eqtype rename type_pairs subst env t1) tl2;
+            List.iter (fun t1 -> eqtype rename type_pairs subst env t1 t2) tl1)
+        | Rpresent None, Rpresent None -> ()
+        | Rabsent, Rabsent -> ()
+        | _ -> raise (Unify []))
+      pairs
+
+(* Must empty univar_pairs first *)
+let eqtype_list rename type_pairs subst env tl1 tl2 =
+  univar_pairs := [];
+  let snap = Btype.snapshot () in
+  try
+    eqtype_list rename type_pairs subst env tl1 tl2;
+    backtrack snap
+  with exn ->
+    backtrack snap;
+    raise exn
+
+(* Two modes: with or without renaming of variables *)
+let equal env rename tyl1 tyl2 =
+  try
+    eqtype_list rename (TypePairs.create 11) (ref []) env tyl1 tyl2;
+    true
+  with Unify _ -> false
+
+(*************************)
+(*  Class type matching  *)
+(*************************)
+
+type class_match_failure =
+  | CM_Virtual_class
+  | CM_Parameter_arity_mismatch of int * int
+  | CM_Type_parameter_mismatch of Env.t * (type_expr * type_expr) list
+  | CM_Parameter_mismatch of Env.t * (type_expr * type_expr) list
+  | CM_Val_type_mismatch of string * Env.t * (type_expr * type_expr) list
+  | CM_Meth_type_mismatch of string * Env.t * (type_expr * type_expr) list
+  | CM_Non_mutable_value of string
+  | CM_Non_concrete_value of string
+  | CM_Missing_value of string
+  | CM_Missing_method of string
+  | CM_Hide_public of string
+  | CM_Hide_virtual of string * string
+  | CM_Public_method of string
+  | CM_Private_method of string
+  | CM_Virtual_method of string
+
+(***************)
+(*  Subtyping  *)
+(***************)
+
+(**** Build a subtype of a given type. ****)
+
+(* build_subtype:
+   [visited] traces traversed object and variant types
+   [loops] is a mapping from variables to variables, to reproduce
+     positive loops in a class type
+   [posi] true if the current variance is positive
+   [level] number of expansions/enlargement allowed on this branch *)
+
+let warn = ref false (* whether double coercion might do better *)
+let pred_expand n = if n mod 2 = 0 && n > 0 then pred n else n
+let pred_enlarge n = if n mod 2 = 1 then pred n else n
+
+type change = Unchanged | Equiv | Changed [@@immediate]
+
+let[@inline] max (c1 : change) (c2 : change) : change =
+  Obj.magic (Ext_pervasives.max_int (Obj.magic c1 : int) (Obj.magic c2 : int))
+let collect l = List.fold_left (fun c1 (_, c2) -> max c1 c2) Unchanged l
+
+let rec filter_visited = function
+  | [] -> []
+  | {desc = Tobject _ | Tvariant _} :: _ as l -> l
+  | _ :: l -> filter_visited l
+
+let memq_warn t visited =
+  if List.memq t visited then (
+    warn := true;
+    true)
+  else false
+
+let rec lid_of_path ?(hash = "") = function
+  | Path.Pident id -> Longident.Lident (hash ^ Ident.name id)
+  | Path.Pdot (p1, s, _) -> Longident.Ldot (lid_of_path p1, hash ^ s)
+  | Path.Papply (p1, p2) ->
+    Longident.Lapply (lid_of_path ~hash p1, lid_of_path p2)
+
+let find_cltype_for_path env p =
+  let cl_path = Env.lookup_type (lid_of_path ~hash:"#" p) env in
+  let cl_abbr = Env.find_type cl_path env in
+
+  match cl_abbr.type_manifest with
+  | Some ty -> (
+    match (repr ty).desc with
+    | Tobject (_, {contents = Some (p', _)}) when Path.same p p' -> (cl_abbr, ty)
+    | _ -> raise Not_found)
+  | None -> assert false
+
+let has_constr_row' env t = has_constr_row (expand_abbrev env t)
+
+let rec build_subtype env visited loops posi level t =
+  let t = repr t in
+  match t.desc with
+  | Tvar _ ->
+    if posi then
+      try
+        let t' = List.assq t loops in
+        warn := true;
+        (t', Equiv)
+      with Not_found -> (t, Unchanged)
+    else (t, Unchanged)
+  | Tarrow (arg, ret, _, a) ->
+    if memq_warn t visited then (t, Unchanged)
+    else
+      let visited = t :: visited in
+      let t1, c1 = build_subtype env visited loops (not posi) level arg.typ in
+      let t2, c2 = build_subtype env visited loops posi level ret in
+      let c = max c1 c2 in
+      if c > Unchanged then (newty (Tarrow ({arg with typ = t1}, t2, Cok, a)), c)
+      else (t, Unchanged)
+  | Ttuple tlist ->
+    if memq_warn t visited then (t, Unchanged)
+    else
+      let visited = t :: visited in
+      let tlist' =
+        List.map (build_subtype env visited loops posi level) tlist
+      in
+      let c = collect tlist' in
+      if c > Unchanged then (newty (Ttuple (List.map fst tlist')), c)
+      else (t, Unchanged)
+  | Tconstr (p, tl, abbrev)
+    when level > 0 && generic_abbrev env p && safe_abbrev env t
+         && not (has_constr_row' env t) -> (
+    let t' = repr (expand_abbrev env t) in
+    let level' = pred_expand level in
+    try
+      match t'.desc with
+      | Tobject _ when posi && not (opened_object t') ->
+        let cl_abbr, body = find_cltype_for_path env p in
+        let ty =
+          subst env !current_level Public abbrev None cl_abbr.type_params tl
+            body
+        in
+        let ty = repr ty in
+        let ty1, tl1 =
+          match ty.desc with
+          | Tobject (ty1, {contents = Some (p', tl1)}) when Path.same p p' ->
+            (ty1, tl1)
+          | _ -> raise Not_found
+        in
+        (* Fix PR#4505: do not set ty to Tvar when it appears in tl1,
+           as this occurrence might break the occur check.
+           XXX not clear whether this correct anyway... *)
+        if List.exists (deep_occur ty) tl1 then raise Not_found;
+        ty.desc <- Tvar None;
+        let t'' = newvar () in
+        let loops = (ty, t'') :: loops in
+        (* May discard [visited] as level is going down *)
+        let ty1', c =
+          build_subtype env [t'] loops posi (pred_enlarge level') ty1
+        in
+        assert (is_Tvar t'');
+        let nm =
+          if c > Equiv || deep_occur ty ty1' then None else Some (p, tl1)
+        in
+        t''.desc <- Tobject (ty1', ref nm);
+        (try unify_var env ty t with Unify _ -> assert false);
+        (t'', Changed)
+      | _ -> raise Not_found
+    with Not_found ->
+      let t'', c = build_subtype env visited loops posi level' t' in
+      if c > Unchanged then (t'', c) else (t, Unchanged))
+  | Tconstr (p, tl, _abbrev) -> (
+    if
+      (* Must check recursion on constructors, since we do not always
+         expand them *)
+      memq_warn t visited
+    then (t, Unchanged)
+    else
+      let visited = t :: visited in
+      try
+        let decl = Env.find_type p env in
+        if
+          level = 0 && generic_abbrev env p && safe_abbrev env t
+          && not (has_constr_row' env t)
+        then warn := true;
+        let tl' =
+          List.map2
+            (fun v t ->
+              let co, cn = Variance.get_upper v in
+              if cn then
+                if co then (t, Unchanged)
+                else build_subtype env visited loops (not posi) level t
+              else if co then build_subtype env visited loops posi level t
+              else (newvar (), Changed))
+            decl.type_variance tl
+        in
+        let c = collect tl' in
+        if c > Unchanged then (newconstr p (List.map fst tl'), c)
+        else (t, Unchanged)
+      with Not_found -> (t, Unchanged))
+  | Tvariant row ->
+    let row = row_repr row in
+    if memq_warn t visited || not (static_row row) then (t, Unchanged)
+    else
+      let level' = pred_enlarge level in
+      let visited =
+        t :: (if level' < level then [] else filter_visited visited)
+      in
+      let fields = filter_row_fields false row.row_fields in
+      let fields =
+        List.map
+          (fun ((l, f) as orig) ->
+            match row_field_repr f with
+            | Rpresent None ->
+              if posi then ((l, Reither (true, [], false, ref None)), Unchanged)
+              else (orig, Unchanged)
+            | Rpresent (Some t) ->
+              let t', c = build_subtype env visited loops posi level' t in
+              let f =
+                if posi && level > 0 then Reither (false, [t'], false, ref None)
+                else Rpresent (Some t')
+              in
+              ((l, f), c)
+            | _ -> assert false)
+          fields
+      in
+      let c = collect fields in
+      let row =
+        {
+          row_fields = List.map fst fields;
+          row_more = newvar ();
+          row_closed = posi;
+          row_fixed = false;
+          row_name = (if c > Unchanged then None else row.row_name);
+        }
+      in
+      (newty (Tvariant row), Changed)
+  | Tobject (t1, _) ->
+    if memq_warn t visited || opened_object t1 then (t, Unchanged)
+    else
+      let level' = pred_enlarge level in
+      let visited =
+        t :: (if level' < level then [] else filter_visited visited)
+      in
+      let t1', c = build_subtype env visited loops posi level' t1 in
+      if c > Unchanged then (newty (Tobject (t1', ref None)), c)
+      else (t, Unchanged)
+  | Tfield (s, _, t1, t2) (* Always present *) ->
+    let t1', c1 = build_subtype env visited loops posi level t1 in
+    let t2', c2 = build_subtype env visited loops posi level t2 in
+    let c = max c1 c2 in
+    if c > Unchanged then (newty (Tfield (s, Fpresent, t1', t2')), c)
+    else (t, Unchanged)
+  | Tnil ->
+    if posi then
+      let v = newvar () in
+      (v, Changed)
+    else (
+      warn := true;
+      (t, Unchanged))
+  | Tsubst _ | Tlink _ -> assert false
+  | Tpoly (t1, tl) ->
+    let t1', c = build_subtype env visited loops posi level t1 in
+    if c > Unchanged then (newty (Tpoly (t1', tl)), c) else (t, Unchanged)
+  | Tunivar _ | Tpackage _ -> (t, Unchanged)
+
+let enlarge_type env ty =
+  warn := false;
+  (* [level = 4] allows 2 expansions involving objects/variants *)
+  let ty', _ = build_subtype env [] [] true 4 ty in
+  (ty', !warn)
+
+(**** Check whether a type is a subtype of another type. ****)
+
+(*
+    During the traversal, a trace of visited types is maintained. It
+    is printed in case of error.
+    Constraints (pairs of types that must be equals) are accumulated
+    rather than being enforced straight. Indeed, the result would
+    otherwise depend on the order in which these constraints are
+    enforced.
+    A function enforcing these constraints is returned. That way, type
+    variables can be bound to their actual values before this function
+    is called (see Typecore).
+    Only well-defined abbreviations are expanded (hence the tests
+    [generic_abbrev ...]).
+*)
+
+let subtypes = TypePairs.create 17
+
+let subtype_error ?ctx env trace =
+  raise (Subtype (expand_trace env (List.rev trace), [], ctx))
+
+let extract_concrete_typedecl_opt env t =
+  match extract_concrete_typedecl env t with
+  | v -> Some v
+  | exception Not_found -> None
+
+let rec subtype_rec env trace t1 t2 cstrs =
+  let t1 = repr t1 in
+  let t2 = repr t2 in
+  if t1 == t2 then cstrs
+  else
+    try
+      TypePairs.find subtypes (t1, t2);
+      cstrs
+    with Not_found -> (
+      TypePairs.add subtypes (t1, t2) ();
+      match (t1.desc, t2.desc) with
+      | Tvar _, _ | _, Tvar _ -> (trace, t1, t2, !univar_pairs, None) :: cstrs
+      | Tarrow (arg1, ret1, _, _), Tarrow (arg2, ret2, _, _)
+        when Asttypes.same_arg_label arg1.lbl arg2.lbl ->
+        let cstrs =
+          subtype_rec env
+            ((arg2.typ, arg1.typ) :: trace)
+            arg2.typ arg1.typ cstrs
+        in
+        subtype_rec env ((ret1, ret2) :: trace) ret1 ret2 cstrs
+      | Ttuple tl1, Ttuple tl2 ->
+        (* TODO(subtype-errors) Tuple as context *)
+        subtype_list env trace tl1 tl2 cstrs
+      | Tconstr (p1, [], _), Tconstr (p2, [], _) when Path.same p1 p2 -> cstrs
+      | Tconstr (p1, _tl1, _abbrev1), _
+        when generic_abbrev env p1 && safe_abbrev env t1 ->
+        subtype_rec env trace (expand_abbrev env t1) t2 cstrs
+      | _, Tconstr (p2, _tl2, _abbrev2)
+        when generic_abbrev env p2 && safe_abbrev env t2 ->
+        subtype_rec env trace t1 (expand_abbrev env t2) cstrs
+      | Tconstr (p1, tl1, _), Tconstr (p2, tl2, _) when Path.same p1 p2 -> (
+        try
+          let decl = Env.find_type p1 env in
+          List.fold_left2
+            (fun cstrs v (t1, t2) ->
+              let co, cn = Variance.get_upper v in
+              if co then
+                if cn then
+                  (* Invariant type argument: check both ways *)
+                  if
+                    subtype_rec env ((t1, t2) :: trace) t1 t2 [] = []
+                    && subtype_rec env ((t2, t1) :: trace) t2 t1 [] = []
+                  then cstrs
+                  else
+                    ( trace,
+                      newty2 t1.level (Ttuple [t1]),
+                      newty2 t2.level (Ttuple [t2]),
+                      !univar_pairs,
+                      None )
+                    :: cstrs
+                else subtype_rec env ((t1, t2) :: trace) t1 t2 cstrs
+              else if cn then subtype_rec env ((t2, t1) :: trace) t2 t1 cstrs
+              else cstrs)
+            cstrs decl.type_variance (List.combine tl1 tl2)
+        with Not_found -> (trace, t1, t2, !univar_pairs, None) :: cstrs)
+      | Tconstr (p1, _, _), _ when generic_private_abbrev env p1 ->
+        subtype_rec env trace (expand_abbrev_opt env t1) t2 cstrs
+      | Tconstr (p1, [], _), Tconstr (p2, [], _)
+        when Path.same p1 Predef.path_int && Path.same p2 Predef.path_float ->
+        (* Int can always be coerced to float *)
+        cstrs
+      | Tconstr (path, [], _), Tconstr (_, [], _)
+        when Variant_coercion.can_coerce_primitive path
+             && extract_concrete_typedecl_opt env t2
+                |> Variant_coercion.can_try_coerce_variant_to_primitive_opt
+                |> Option.is_some -> (
+        (* type coercion for primitives (int/float/string) to elgible unboxed variants:
+           - must be unboxed
+           - must have a constructor case with a supported and matching primitive payload *)
+        match
+          Variant_coercion.can_try_coerce_variant_to_primitive_opt
+            (extract_concrete_typedecl_opt env t2)
+        with
+        | Some (p, _, false) ->
+          (* Not @unboxed *)
+          ( trace,
+            t1,
+            t2,
+            !univar_pairs,
+            Some
+              (Coercion_target_variant_not_unboxed
+                 {variant_name = p; primitive = path}) )
+          :: cstrs
+        | Some (p, constructors, true) ->
+          if
+            Variant_coercion.variant_has_case_covering_type constructors
+              ~path_is_same_fn:(fun p -> Path.same p path)
+          then cstrs
+          else
+            ( trace,
+              t1,
+              t2,
+              !univar_pairs,
+              Some
+                (Coercion_target_variant_does_not_cover_type
+                   {variant_name = p; primitive = path}) )
+            :: cstrs
+        | None ->
+          (* Unclear when this case actually happens. *)
+          (trace, t1, t2, !univar_pairs, Some (Generic {errorCode = "VCPMMVD"}))
+          :: cstrs)
+      | Tconstr (_, [], _), Tconstr (path, [], _)
+        when Variant_coercion.can_coerce_primitive path
+             && extract_concrete_typedecl_opt env t1
+                |> Variant_coercion.can_try_coerce_variant_to_primitive_opt
+                |> Option.is_some -> (
+        (* type coercion for variants to primitives *)
+        match
+          Variant_coercion.can_try_coerce_variant_to_primitive_opt
+            (extract_concrete_typedecl_opt env t1)
+        with
+        | Some (p, constructors, unboxed) ->
+          let runtime_representation_issues =
+            constructors
+            |> Variant_coercion
+               .variant_has_same_runtime_representation_as_target
+                 ~target_path:path ~unboxed
+          in
+          if List.length runtime_representation_issues <> 0 then
+            ( trace,
+              t1,
+              t2,
+              !univar_pairs,
+              Some
+                (Variant_constructor_runtime_representation_mismatch
+                   {issues = runtime_representation_issues; variant_name = p})
+            )
+            :: cstrs
+          else cstrs
+        | None -> (trace, t1, t2, !univar_pairs, None) :: cstrs)
+      | Tconstr (_, [], _), Tconstr (_, [], _) -> (
+        (* type coercion for variants and records *)
+        match
+          (extract_concrete_typedecl env t1, extract_concrete_typedecl env t2)
+        with
+        | ( (p1, _, {type_kind = Type_variant c1; type_attributes = t1attrs}),
+            (p2, _, {type_kind = Type_variant c2; type_attributes = t2attrs}) )
+          -> (
+          match
+            Variant_coercion.variant_configuration_can_be_coerced t1attrs
+              t2attrs
+          with
+          | Error issue ->
+            ( trace,
+              t1,
+              t2,
+              !univar_pairs,
+              Some
+                (Variant_configurations_mismatch
+                   {left_variant_name = p1; right_variant_name = p2; issue}) )
+            :: cstrs
+          | Ok () ->
+            let c1_len = List.length c1 in
+            if c1_len > List.length c2 then
+              let c1_constructor_names =
+                c1 |> List.map (fun c -> c.cd_id.name)
+              in
+              let c2_constructor_names =
+                c2 |> List.map (fun c -> c.cd_id.name)
+              in
+              let incompatible_constructor_names =
+                c1_constructor_names
+                |> List.filter (fun name ->
+                       not (List.mem name c2_constructor_names))
+              in
+              ( trace,
+                t1,
+                t2,
+                !univar_pairs,
+                Some
+                  (Variant_configurations_mismatch
+                     {
+                       left_variant_name = p1;
+                       right_variant_name = p2;
+                       issue =
+                         Incompatible_constructor_count
+                           {constructor_names = incompatible_constructor_names};
+                     }) )
+              :: cstrs
+            else
+              let constructor_map = Hashtbl.create c1_len in
+              c2
+              |> List.iter (fun (c : Types.constructor_declaration) ->
+                     Hashtbl.add constructor_map (Ident.name c.cd_id) c);
+              let field_subtype_violations =
+                c1
+                |> List.filter_map (fun (c : Types.constructor_declaration) ->
+                       match
+                         ( c,
+                           Hashtbl.find_opt constructor_map (Ident.name c.cd_id)
+                         )
+                       with
+                       | ( {
+                             Types.cd_args = Cstr_record fields1;
+                             cd_attributes = c1_attributes;
+                           },
+                           Some
+                             {
+                               Types.cd_args = Cstr_record fields2;
+                               cd_attributes = c2_attributes;
+                             } ) ->
+                         if
+                           Variant_coercion.variant_representation_matches
+                             c1_attributes c2_attributes
+                         then
+                           let violations, tl1, tl2 =
+                             Record_coercion.check_record_fields fields1 fields2
+                           in
+                           match violations with
+                           | [] -> (
+                             try
+                               let lst = subtype_list env trace tl1 tl2 cstrs in
+                               if List.length lst = List.length cstrs then None
+                               else
+                                 Some
+                                   [ (* TODO(subtype-errors) Variant constructor inline record mismatch *) ]
+                             with _ ->
+                               Some
+                                 [ (* TODO(subtype-errors) Variant constructor inline record mismatch *) ]
+                             )
+                           | violations -> Some violations
+                         else
+                           Some
+                             [ (* TODO(subtype-errors) Variant constructor representation mismatch*) ]
+                       | ( {
+                             Types.cd_args = Cstr_tuple tl1;
+                             cd_attributes = c1_attributes;
+                           },
+                           Some
+                             {
+                               Types.cd_args = Cstr_tuple tl2;
+                               cd_attributes = c2_attributes;
+                             } ) ->
+                         if
+                           Variant_coercion.variant_representation_matches
+                             c1_attributes c2_attributes
+                         then
+                           try
+                             let lst = subtype_list env trace tl1 tl2 cstrs in
+                             if List.length lst = List.length cstrs then None
+                             else
+                               Some
+                                 [ (* TODO(subtype-errors) Variant constructor tuple mismatch *) ]
+                           with _ ->
+                             Some
+                               [ (* TODO(subtype-errors) Variant constructor tuple mismatch *) ]
+                         else
+                           Some
+                             [ (* TODO(subtype-errors) Variant constructor tuple mismatch *) ]
+                       | _ ->
+                         Some [ (* TODO(subtype-errors) Variant other issue *) ])
+              in
+              if field_subtype_violations = [] then cstrs
+              else (trace, t1, t2, !univar_pairs, None) :: cstrs)
+        | ( (p1, _, {type_kind = Type_record (fields1, repr1)}),
+            (p2, _, {type_kind = Type_record (fields2, repr2)}) ) ->
+          let same_repr =
+            match (repr1, repr2) with
+            | Record_regular, Record_regular ->
+              true (* handled in the fields checks *)
+            | Record_unboxed b1, Record_unboxed b2 -> b1 = b2
+            | Record_inlined _, Record_inlined _ -> repr1 = repr2
+            | Record_extension, Record_extension -> true
+            | _ -> false
+          in
+          if same_repr then
+            let violations, tl1, tl2 =
+              Record_coercion.check_record_fields fields1 fields2
+            in
+            if violations <> [] then
+              ( trace,
+                t1,
+                t2,
+                !univar_pairs,
+                Some
+                  (Record_fields_mismatch
+                     {
+                       left_record_name = p1;
+                       right_record_name = p2;
+                       issues = violations;
+                     }) )
+              :: cstrs
+            else subtype_list env trace tl1 tl2 cstrs
+          else
+            ( trace,
+              t1,
+              t2,
+              !univar_pairs,
+              None (* TODO(subtype-errors) Record representation *) )
+            :: cstrs
+        | (p1, _, {type_kind = tk1}), (p2, _, {type_kind = tk2}) ->
+          ( trace,
+            t1,
+            t2,
+            !univar_pairs,
+            Some
+              (Different_type_kinds
+                 {
+                   left_typename = p1;
+                   right_typename = p2;
+                   left_type_kind = tk1;
+                   right_type_kind = tk2;
+                 }) )
+          :: cstrs
+        | exception Not_found -> (trace, t1, t2, !univar_pairs, None) :: cstrs)
+      (* | (_, Tconstr(p2, _, _)) when generic_private_abbrev false env p2 ->
+         subtype_rec env trace t1 (expand_abbrev_opt env t2) cstrs *)
+      | Tobject (f1, _), Tobject (f2, _)
+        when is_Tvar (object_row f1) && is_Tvar (object_row f2) ->
+        (* Same row variable implies same object. *)
+        (trace, t1, t2, !univar_pairs, None) :: cstrs
+      | Tobject (f1, _), Tobject (f2, _) -> subtype_fields env trace f1 f2 cstrs
+      | Tvariant row1, Tvariant row2 -> (
+        try subtype_row env trace row1 row2 cstrs
+        with Exit -> (trace, t1, t2, !univar_pairs, None) :: cstrs)
+      | Tvariant {row_closed = true; row_fields}, Tconstr (_, [], _)
+        when extract_concrete_typedecl_opt env t2
+             |> Variant_coercion.type_is_variant -> (
+        (* TODO(subtype-errors) Polyvariant to variant *)
+        match extract_concrete_typedecl env t2 with
+        | _, _, {type_kind = Type_variant variant_constructors; type_attributes}
+          -> (
+          match
+            Variant_coercion.can_coerce_polyvariant_to_variant ~row_fields
+              ~variant_constructors ~type_attributes
+          with
+          | Ok _ -> cstrs
+          | Error _ -> (trace, t1, t2, !univar_pairs, None) :: cstrs)
+        | _ -> (trace, t1, t2, !univar_pairs, None) :: cstrs)
+      | Tvariant v, _ when !variant_is_subtype env (row_repr v) t2 -> cstrs
+      | Tpoly (u1, []), Tpoly (u2, []) -> subtype_rec env trace u1 u2 cstrs
+      | Tpoly (u1, tl1), Tpoly (u2, []) ->
+        let _, u1' = instance_poly false tl1 u1 in
+        subtype_rec env trace u1' u2 cstrs
+      | Tpoly (u1, tl1), Tpoly (u2, tl2) -> (
+        try
+          enter_poly env univar_pairs u1 tl1 u2 tl2 (fun t1 t2 ->
+              subtype_rec env trace t1 t2 cstrs)
+        with Unify _ -> (trace, t1, t2, !univar_pairs, None) :: cstrs)
+      | Tpackage (p1, nl1, tl1), Tpackage (p2, nl2, tl2) -> (
+        try
+          let ntl1 = complete_type_list env nl2 t1.level (Mty_ident p1) nl1 tl1
+          and ntl2 =
+            complete_type_list env nl1 t2.level (Mty_ident p2) nl2 tl2
+              ~allow_absent:true
+          in
+          let cstrs' =
+            List.map
+              (fun (n2, t2) ->
+                (trace, List.assoc n2 ntl1, t2, !univar_pairs, None))
+              ntl2
+          in
+          if eq_package_path env p1 p2 then cstrs' @ cstrs
+          else
+            (* need to check module subtyping *)
+            let snap = Btype.snapshot () in
+            try
+              List.iter (fun (_, t1, t2, _, _) -> unify env t1 t2) cstrs';
+              if !package_subtype env p1 nl1 tl1 p2 nl2 tl2 then (
+                Btype.backtrack snap;
+                cstrs' @ cstrs)
+              else raise (Unify [])
+            with Unify _ ->
+              Btype.backtrack snap;
+              raise Not_found
+        with Not_found -> (trace, t1, t2, !univar_pairs, None) :: cstrs)
+      | _, _ -> (trace, t1, t2, !univar_pairs, None) :: cstrs)
+
+and subtype_list env trace tl1 tl2 cstrs =
+  if List.length tl1 <> List.length tl2 then subtype_error env trace;
+  List.fold_left2
+    (fun cstrs t1 t2 -> subtype_rec env ((t1, t2) :: trace) t1 t2 cstrs)
+    cstrs tl1 tl2
+
+and subtype_fields env trace ty1 ty2 cstrs =
+  (* Assume that either rest1 or rest2 is not Tvar *)
+  let fields1, rest1 = flatten_fields ty1 in
+  let fields2, rest2 = flatten_fields ty2 in
+  let pairs, miss1, miss2 = associate_fields fields1 fields2 in
+  let cstrs =
+    if rest2.desc = Tnil then cstrs
+    else if miss1 = [] then
+      subtype_rec env ((rest1, rest2) :: trace) rest1 rest2 cstrs
+    else
+      ( trace,
+        build_fields (repr ty1).level miss1 rest1,
+        rest2,
+        !univar_pairs,
+        None )
+      :: cstrs
+  in
+  let cstrs =
+    if miss2 = [] then cstrs
+    else
+      ( trace,
+        rest1,
+        build_fields (repr ty2).level miss2 (newvar ()),
+        !univar_pairs,
+        None )
+      :: cstrs
+  in
+  List.fold_left
+    (fun cstrs (_, _k1, t1, _k2, t2) ->
+      (* These fields are always present *)
+      subtype_rec env ((t1, t2) :: trace) t1 t2 cstrs)
+    cstrs pairs
+
+and subtype_row env trace row1 row2 cstrs =
+  let row1 = row_repr row1 and row2 = row_repr row2 in
+  let r1, r2, pairs = merge_row_fields row1.row_fields row2.row_fields in
+  let more1 = repr row1.row_more and more2 = repr row2.row_more in
+  match (more1.desc, more2.desc) with
+  | Tconstr (p1, _, _), Tconstr (p2, _, _) when Path.same p1 p2 ->
+    subtype_rec env ((more1, more2) :: trace) more1 more2 cstrs
+  | (Tvar _ | Tconstr _ | Tnil), (Tvar _ | Tconstr _ | Tnil)
+    when row1.row_closed && r1 = [] ->
+    List.fold_left
+      (fun cstrs (_, f1, f2) ->
+        match (row_field_repr f1, row_field_repr f2) with
+        | (Rpresent None | Reither (true, _, _, _)), Rpresent None -> cstrs
+        | Rpresent (Some t1), Rpresent (Some t2) ->
+          subtype_rec env ((t1, t2) :: trace) t1 t2 cstrs
+        | Reither (false, t1 :: _, _, _), Rpresent (Some t2) ->
+          subtype_rec env ((t1, t2) :: trace) t1 t2 cstrs
+        | Rabsent, _ -> cstrs
+        | _ -> raise Exit)
+      cstrs pairs
+  | Tunivar _, Tunivar _
+    when row1.row_closed = row2.row_closed && r1 = [] && r2 = [] ->
+    let cstrs = subtype_rec env ((more1, more2) :: trace) more1 more2 cstrs in
+    List.fold_left
+      (fun cstrs (_, f1, f2) ->
+        match (row_field_repr f1, row_field_repr f2) with
+        | Rpresent None, Rpresent None
+        | Reither (true, [], _, _), Reither (true, [], _, _)
+        | Rabsent, Rabsent ->
+          cstrs
+        | Rpresent (Some t1), Rpresent (Some t2)
+        | Reither (false, [t1], _, _), Reither (false, [t2], _, _) ->
+          subtype_rec env ((t1, t2) :: trace) t1 t2 cstrs
+        | _ -> raise Exit)
+      cstrs pairs
+  | _ -> raise Exit
+
+let subtype env ty1 ty2 =
+  TypePairs.clear subtypes;
+  univar_pairs := [];
+  (* Build constraint set. *)
+  let cstrs = subtype_rec env [(ty1, ty2)] ty1 ty2 [] in
+  TypePairs.clear subtypes;
+  (* Enforce constraints. *)
+  function
+  | () ->
+    List.iter
+      (function
+        | trace0, t1, t2, pairs, ctx -> (
+          try unify_pairs (ref env) t1 t2 pairs
+          with Unify trace ->
+            raise
+              (Subtype
+                 ( expand_trace env (List.rev trace0),
+                   List.tl (List.tl trace),
+                   ctx ))))
+      (List.rev cstrs)
+
+(*******************)
+(*  Miscellaneous  *)
+(*******************)
+
+(* Utility for printing. The resulting type is not used in computation. *)
+let rec unalias_object ty =
+  let ty = repr ty in
+  match ty.desc with
+  | Tfield (s, k, t1, t2) ->
+    newty2 ty.level (Tfield (s, k, t1, unalias_object t2))
+  | Tvar _ | Tnil -> newty2 ty.level ty.desc
+  | Tunivar _ -> ty
+  | Tconstr _ -> newvar2 ty.level
+  | _ -> assert false
+
+let unalias ty =
+  let ty = repr ty in
+  match ty.desc with
+  | Tvar _ | Tunivar _ -> ty
+  | Tvariant row ->
+    let row = row_repr row in
+    let more = row.row_more in
+    newty2 ty.level (Tvariant {row with row_more = newty2 more.level more.desc})
+  | Tobject (ty, nm) -> newty2 ty.level (Tobject (unalias_object ty, nm))
+  | _ -> newty2 ty.level ty.desc
+
+(* Return the arity (as for curried functions) of the given type. *)
+let rec arity ty =
+  match (repr ty).desc with
+  | Tarrow (_, ret, _, _) -> 1 + arity ret
+  | _ -> 0
+
+(* Check whether an abbreviation expands to itself. *)
+let cyclic_abbrev env id ty =
+  let rec check_cycle seen ty =
+    let ty = repr ty in
+    match ty.desc with
+    | Tconstr (p, _tl, _abbrev) -> (
+      (match p with
+      | Path.Pident p -> Ident.same p id
+      | _ -> false)
+      || List.memq ty seen
+      ||
+      try check_cycle (ty :: seen) (expand_abbrev_opt env ty) with
+      | Cannot_expand -> false
+      | Unify _ -> true)
+    | _ -> false
+  in
+  check_cycle [] ty
+
+(* Check for non-generalizable type variables *)
+exception Non_closed0
+let visited = ref TypeSet.empty
+
+let rec closed_schema_rec env ty =
+  let ty = repr ty in
+  if TypeSet.mem ty !visited then ()
+  else (
+    visited := TypeSet.add ty !visited;
+    match ty.desc with
+    | Tvar _ when ty.level <> generic_level -> raise Non_closed0
+    | Tconstr _ -> (
+      let old = !visited in
+      try iter_type_expr (closed_schema_rec env) ty
+      with Non_closed0 -> (
+        try
+          visited := old;
+          closed_schema_rec env (try_expand_head try_expand_safe env ty)
+        with Cannot_expand -> raise Non_closed0))
+    | Tfield (_, kind, t1, t2) ->
+      if field_kind_repr kind = Fpresent then closed_schema_rec env t1;
+      closed_schema_rec env t2
+    | Tvariant row ->
+      let row = row_repr row in
+      iter_row (closed_schema_rec env) row;
+      if not (static_row row) then closed_schema_rec env row.row_more
+    | _ -> iter_type_expr (closed_schema_rec env) ty)
+
+(* Return whether all variables of type [ty] are generic. *)
+let closed_schema env ty =
+  visited := TypeSet.empty;
+  try
+    closed_schema_rec env ty;
+    visited := TypeSet.empty;
+    true
+  with Non_closed0 ->
+    visited := TypeSet.empty;
+    false
+
+(* Normalize a type before printing, saving... *)
+(* Cannot use mark_type because deep_occur uses it too *)
+let rec normalize_type_rec env visited ty =
+  let ty = repr ty in
+  if not (TypeSet.mem ty !visited) then (
+    visited := TypeSet.add ty !visited;
+    let tm = row_of_type ty in
+    (if (not (is_Tconstr ty)) && is_constr_row ~allow_ident:false tm then
+       match tm.desc with
+       (* PR#7348 *)
+       | Tconstr (Path.Pdot (m, i, pos), tl, _abbrev) ->
+         let i' = String.sub i 0 (String.length i - 4) in
+         log_type ty;
+         ty.desc <- Tconstr (Path.Pdot (m, i', pos), tl, ref Mnil)
+       | _ -> assert false
+     else
+       match ty.desc with
+       | Tvariant row ->
+         let row = row_repr row in
+         let fields =
+           List.map
+             (fun (l, f0) ->
+               let f = row_field_repr f0 in
+               ( l,
+                 match f with
+                 | Reither (b, ty :: (_ :: _ as tyl), m, e) ->
+                   let tyl' =
+                     List.fold_left
+                       (fun tyl ty ->
+                         if
+                           List.exists
+                             (fun ty' -> equal env false [ty] [ty'])
+                             tyl
+                         then tyl
+                         else ty :: tyl)
+                       [ty] tyl
+                   in
+                   if f != f0 || List.length tyl' < List.length tyl then
+                     Reither (b, List.rev tyl', m, e)
+                   else f
+                 | _ -> f ))
+             row.row_fields
+         in
+         let fields =
+           List.sort
+             (fun (p, _) (q, _) -> compare p q)
+             (Ext_list.filter fields (fun (_, fi) -> fi <> Rabsent))
+         in
+         log_type ty;
+         ty.desc <- Tvariant {row with row_fields = fields}
+       | Tobject (fi, nm) ->
+         (match !nm with
+         | None -> ()
+         | Some (n, v :: l) -> (
+           if deep_occur ty (newgenty (Ttuple l)) then
+             (* The abbreviation may be hiding something, so remove it *)
+             set_name nm None
+           else
+             let v' = repr v in
+             match v'.desc with
+             | Tvar _ | Tunivar _ ->
+               if v' != v then set_name nm (Some (n, v' :: l))
+             | Tnil ->
+               log_type ty;
+               ty.desc <- Tconstr (n, l, ref Mnil)
+             | _ -> set_name nm None)
+         | _ -> fatal_error "Ctype.normalize_type_rec");
+         let fi = repr fi in
+         if fi.level < lowest_level then ()
+         else
+           let fields, row = flatten_fields fi in
+           let fi' = build_fields fi.level fields row in
+           log_type ty;
+           fi.desc <- fi'.desc
+       | _ -> ());
+    iter_type_expr (normalize_type_rec env visited) ty)
+
+let normalize_type env ty = normalize_type_rec env (ref TypeSet.empty) ty
+
+(*************************)
+(*  Remove dependencies  *)
+(*************************)
+
+(*
+   Variables are left unchanged. Other type nodes are duplicated, with
+   levels set to generic level.
+   We cannot use Tsubst here, because unification may be called by
+   expand_abbrev.
+*)
+
+let nondep_hash = TypeHash.create 47
+let nondep_variants = TypeHash.create 17
+let clear_hash () =
+  TypeHash.clear nondep_hash;
+  TypeHash.clear nondep_variants
+
+let rec nondep_type_rec env id ty =
+  match ty.desc with
+  | Tvar _ | Tunivar _ -> ty
+  | Tlink ty -> nondep_type_rec env id ty
+  | _ -> (
+    try TypeHash.find nondep_hash ty
+    with Not_found ->
+      let ty' = newgenvar () in
+      (* Stub *)
+      TypeHash.add nondep_hash ty ty';
+      ty'.desc <-
+        (match ty.desc with
+        | Tconstr (p, tl, _abbrev) ->
+          if Path.isfree id p then
+            try
+              Tlink
+                (nondep_type_rec env id
+                   (expand_abbrev env (newty2 ty.level ty.desc)))
+              (*
+                 The [Tlink] is important. The expanded type may be a
+                 variable, or may not be completely copied yet
+                 (recursive type), so one cannot just take its
+                 description.
+               *)
+            with Cannot_expand | Unify _ -> raise Not_found
+          else Tconstr (p, List.map (nondep_type_rec env id) tl, ref Mnil)
+        | Tpackage (p, nl, tl) when Path.isfree id p ->
+          let p' = normalize_package_path env p in
+          if Path.isfree id p' then raise Not_found;
+          Tpackage (p', nl, List.map (nondep_type_rec env id) tl)
+        | Tobject (t1, name) ->
+          Tobject
+            ( nondep_type_rec env id t1,
+              ref
+                (match !name with
+                | None -> None
+                | Some (p, tl) ->
+                  if Path.isfree id p then None
+                  else Some (p, List.map (nondep_type_rec env id) tl)) )
+        | Tvariant row -> (
+          let row = row_repr row in
+          let more = repr row.row_more in
+          (* We must keep sharing according to the row variable *)
+          try
+            let ty2 = TypeHash.find nondep_variants more in
+            (* This variant type has been already copied *)
+            TypeHash.add nondep_hash ty ty2;
+            Tlink ty2
+          with Not_found -> (
+            (* Register new type first for recursion *)
+            TypeHash.add nondep_variants more ty';
+            let static = static_row row in
+            let more' = if static then newgenty Tnil else more in
+            (* Return a new copy *)
+            let row = copy_row (nondep_type_rec env id) true row true more' in
+            match row.row_name with
+            | Some (p, _tl) when Path.isfree id p ->
+              Tvariant {row with row_name = None}
+            | _ -> Tvariant row))
+        | _ -> copy_type_desc (nondep_type_rec env id) ty.desc);
+      ty')
+
+let nondep_type env id ty =
+  try
+    let ty' = nondep_type_rec env id ty in
+    clear_hash ();
+    ty'
+  with Not_found ->
+    clear_hash ();
+    raise Not_found
+
+let () = nondep_type' := nondep_type
+
+let unroll_abbrev id tl ty =
+  let ty = repr ty and path = Path.Pident id in
+  if is_Tvar ty || List.exists (deep_occur ty) tl || is_object_type path then ty
+  else
+    let ty' = newty2 ty.level ty.desc in
+    link_type ty (newty2 ty.level (Tconstr (path, tl, ref Mnil)));
+    ty'
+
+(* Preserve sharing inside type declarations. *)
+let nondep_type_decl env mid id is_covariant decl =
+  try
+    let params = List.map (nondep_type_rec env mid) decl.type_params in
+    let tk =
+      try map_kind (nondep_type_rec env mid) decl.type_kind
+      with Not_found when is_covariant -> Type_abstract
+    and tm =
+      try
+        match decl.type_manifest with
+        | None -> None
+        | Some ty -> Some (unroll_abbrev id params (nondep_type_rec env mid ty))
+      with Not_found when is_covariant -> None
+    in
+    clear_hash ();
+    let priv =
+      match tm with
+      | Some ty when Btype.has_constr_row ty -> Private
+      | _ -> decl.type_private
+    in
+    {
+      type_params = params;
+      type_arity = decl.type_arity;
+      type_kind = tk;
+      type_manifest = tm;
+      type_private = priv;
+      type_variance = decl.type_variance;
+      type_newtype_level = None;
+      type_loc = decl.type_loc;
+      type_attributes = decl.type_attributes;
+      type_immediate = decl.type_immediate;
+      type_unboxed = decl.type_unboxed;
+      type_inlined_types = decl.type_inlined_types;
+    }
+  with Not_found ->
+    clear_hash ();
+    raise Not_found
+
+(* Preserve sharing inside extension constructors. *)
+let nondep_extension_constructor env mid ext =
+  try
+    let type_path, type_params =
+      if Path.isfree mid ext.ext_type_path then
+        let ty =
+          newgenty (Tconstr (ext.ext_type_path, ext.ext_type_params, ref Mnil))
+        in
+        let ty' = nondep_type_rec env mid ty in
+        match (repr ty').desc with
+        | Tconstr (p, tl, _) -> (p, tl)
+        | _ -> raise Not_found
+      else
+        let type_params =
+          List.map (nondep_type_rec env mid) ext.ext_type_params
+        in
+        (ext.ext_type_path, type_params)
+    in
+    let args = map_type_expr_cstr_args (nondep_type_rec env mid) ext.ext_args in
+    let ret_type = may_map (nondep_type_rec env mid) ext.ext_ret_type in
+    clear_hash ();
+    {
+      ext_type_path = type_path;
+      ext_type_params = type_params;
+      ext_args = args;
+      ext_ret_type = ret_type;
+      ext_private = ext.ext_private;
+      ext_attributes = ext.ext_attributes;
+      ext_loc = ext.ext_loc;
+      ext_is_exception = ext.ext_is_exception;
+    }
+  with Not_found ->
+    clear_hash ();
+    raise Not_found
+
+(* collapse conjunctive types in class parameters *)
+let rec collapse_conj env visited ty =
+  let ty = repr ty in
+  if List.memq ty visited then ()
+  else
+    let visited = ty :: visited in
+    match ty.desc with
+    | Tvariant row ->
+      let row = row_repr row in
+      List.iter
+        (fun (_l, fi) ->
+          match row_field_repr fi with
+          | Reither (c, t1 :: (_ :: _ as tl), m, e) ->
+            List.iter (unify env t1) tl;
+            set_row_field e (Reither (c, [t1], m, ref None))
+          | _ -> ())
+        row.row_fields;
+      iter_row (collapse_conj env visited) row
+    | _ -> iter_type_expr (collapse_conj env visited) ty
+
+let collapse_conj_params env params = List.iter (collapse_conj env []) params
+
+let same_constr env t1 t2 =
+  let t1 = expand_head env t1 in
+  let t2 = expand_head env t2 in
+  match (t1.desc, t2.desc) with
+  | Tconstr (p1, _, _), Tconstr (p2, _, _) -> Path.same p1 p2
+  | _ -> false
+
+let () = Env.same_constr := same_constr
+
+let maybe_pointer_type env typ =
+  match (repr typ).desc with
+  | Tconstr (p, _args, _abbrev) -> (
+    try
+      let type_decl = Env.find_type p env in
+      not type_decl.type_immediate
+    with Not_found ->
+      true
+      (* This can happen due to e.g. missing -I options,
+         causing some .cmi files to be unavailable.
+         Maybe we should emit a warning. *)
+    )
+  | Tvariant row ->
+    let row = Btype.row_repr row in
+    (* if all labels are devoid of arguments, not a pointer *)
+    (not row.row_closed)
+    || List.exists
+         (function
+           | _, (Rpresent (Some _) | Reither (false, _, _, _)) -> true
+           | _ -> false)
+         row.row_fields
+  | _ -> true
+
+let get_arity env typ =
+  match (expand_head env typ).desc with
+  | Tarrow (_, _, _, arity) -> arity
+  | _ -> None
diff --git a/compiler/ml/ctype.mli b/compiler/ml/ctype.mli
new file mode 100644
index 0000000..6785374
--- /dev/null
+++ b/compiler/ml/ctype.mli
@@ -0,0 +1,363 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Operations on core types *)
+
+open Asttypes
+open Types
+
+type subtype_context =
+  | Generic of {errorCode: string}
+      (** A generic subtype error, intended to be extended to be handled later. *)
+  | Coercion_target_variant_not_unboxed of {
+      variant_name: Path.t;
+      primitive: Path.t;
+    }  (** Coercing a primitive to a variant that is not unboxed. *)
+  | Coercion_target_variant_does_not_cover_type of {
+      variant_name: Path.t;
+      primitive: Path.t;
+    }
+      (** Coercing a primitive to a variant that does not have a catch-all case. *)
+  | Variant_constructor_runtime_representation_mismatch of {
+      variant_name: Path.t;
+      issues: Variant_coercion.variant_runtime_representation_issue list;
+    }
+      (** A variant constructor's runtime representation does not match the target variant. *)
+  | Variant_configurations_mismatch of {
+      left_variant_name: Path.t;
+      right_variant_name: Path.t;
+      issue: Variant_coercion.variant_configuration_issue;
+    }  (** Variants are configured differently. *)
+  | Different_type_kinds of {
+      left_typename: Path.t;
+      right_typename: Path.t;
+      left_type_kind: type_kind;
+      right_type_kind: type_kind;
+    }  (** The types are of different kinds. *)
+  | Record_fields_mismatch of {
+      left_record_name: Path.t;
+      right_record_name: Path.t;
+      issues: Record_coercion.record_field_subtype_violation list;
+    }  (** Records have fields that are not compatible. *)
+
+type type_pairs = (type_expr * type_expr) list
+exception Unify of type_pairs
+exception Tags of label * label
+exception Subtype of type_pairs * type_pairs * subtype_context option
+exception Cannot_expand
+exception Cannot_apply
+exception Recursive_abbrev
+exception Unification_recursive_abbrev of type_pairs
+
+val init_def : int -> unit
+(* Set the initial variable level *)
+
+val begin_def : unit -> unit
+(* Raise the variable level by one at the beginning of a definition. *)
+
+val end_def : unit -> unit
+(* Lower the variable level by one at the end of a definition *)
+
+val begin_class_def : unit -> unit
+val raise_nongen_level : unit -> unit
+val reset_global_level : unit -> unit
+(* Reset the global level before typing an expression *)
+
+val increase_global_level : unit -> int
+val restore_global_level : int -> unit
+(* This pair of functions is only used in Typetexp *)
+
+type levels = {
+  current_level: int;
+  nongen_level: int;
+  global_level: int;
+  saved_level: (int * int) list;
+}
+val save_levels : unit -> levels
+val set_levels : levels -> unit
+
+val newty : type_desc -> type_expr
+val newvar : ?name:string -> unit -> type_expr
+val newvar2 : ?name:string -> int -> type_expr
+(* Return a fresh variable *)
+
+val new_global_var : ?name:string -> unit -> type_expr
+(* Return a fresh variable, bound at toplevel
+   (as type variables ['a] in type constraints). *)
+
+val newobj : type_expr -> type_expr
+val newconstr : Path.t -> type_expr list -> type_expr
+val none : type_expr
+(* A dummy type expression *)
+
+val repr : type_expr -> type_expr
+(* Return the canonical representative of a type. *)
+
+val object_fields : type_expr -> type_expr
+val flatten_fields :
+  type_expr -> (string * field_kind * type_expr) list * type_expr
+
+(* Transform a field type into a list of pairs label-type *)
+(* The fields are sorted *)
+val associate_fields :
+  (string * field_kind * type_expr) list ->
+  (string * field_kind * type_expr) list ->
+  (string * field_kind * type_expr * field_kind * type_expr) list
+  * (string * field_kind * type_expr) list
+  * (string * field_kind * type_expr) list
+val opened_object : type_expr -> bool
+val close_object : type_expr -> unit
+val row_variable : type_expr -> type_expr
+(* Return the row variable of an open object type *)
+
+val set_object_name :
+  Ident.t -> type_expr -> type_expr list -> type_expr -> unit
+val remove_object_name : type_expr -> unit
+val hide_private_methods : type_expr -> unit
+val find_cltype_for_path : Env.t -> Path.t -> type_declaration * type_expr
+val lid_of_path : ?hash:string -> Path.t -> Longident.t
+
+val sort_row_fields : (label * row_field) list -> (label * row_field) list
+val merge_row_fields :
+  (label * row_field) list ->
+  (label * row_field) list ->
+  (label * row_field) list
+  * (label * row_field) list
+  * (label * row_field * row_field) list
+val filter_row_fields :
+  bool -> (label * row_field) list -> (label * row_field) list
+
+val generalize : type_expr -> unit
+(* Generalize in-place the given type *)
+
+val generalize_expansive : Env.t -> type_expr -> unit
+(* Generalize the covariant part of a type, making
+   contravariant branches non-generalizable *)
+
+val generalize_global : type_expr -> unit
+(* Generalize the structure of a type, lowering variables
+   to !global_level *)
+
+val generalize_structure : type_expr -> unit
+(* Same, but variables are only lowered to !current_level *)
+
+val correct_levels : type_expr -> type_expr
+(* Returns a copy with decreasing levels *)
+
+val limited_generalize : type_expr -> type_expr -> unit
+(* Only generalize some part of the type
+   Make the remaining of the type non-generalizable *)
+
+val instance : ?partial:bool -> Env.t -> type_expr -> type_expr
+
+(* Take an instance of a type scheme *)
+(* partial=None  -> normal
+   partial=false -> newvar() for non generic subterms
+   partial=true  -> newty2 ty.level Tvar for non generic subterms *)
+val instance_def : type_expr -> type_expr
+(* use defaults *)
+
+val generic_instance : Env.t -> type_expr -> type_expr
+(* Same as instance, but new nodes at generic_level *)
+
+val instance_list : Env.t -> type_expr list -> type_expr list
+(* Take an instance of a list of type schemes *)
+
+val instance_constructor :
+  ?in_pattern:Env.t ref * int ->
+  constructor_description ->
+  type_expr list * type_expr
+(* Same, for a constructor *)
+
+val instance_parameterized_type :
+  ?keep_names:bool -> type_expr list -> type_expr -> type_expr list * type_expr
+val instance_parameterized_type_2 :
+  type_expr list ->
+  type_expr list ->
+  type_expr ->
+  type_expr list * type_expr list * type_expr
+val instance_declaration : type_declaration -> type_declaration
+val instance_poly :
+  ?keep_names:bool ->
+  bool ->
+  type_expr list ->
+  type_expr ->
+  type_expr list * type_expr
+(* Take an instance of a type scheme containing free univars *)
+
+val instance_label :
+  bool -> label_description -> type_expr list * type_expr * type_expr
+(* Same, for a label *)
+
+val apply : Env.t -> type_expr list -> type_expr -> type_expr list -> type_expr
+(* [apply [p1...pN] t [a1...aN]] match the arguments [ai] to
+   the parameters [pi] and returns the corresponding instance of
+   [t]. Exception [Cannot_apply] is raised in case of failure. *)
+
+val expand_head_once : Env.t -> type_expr -> type_expr
+val expand_head : Env.t -> type_expr -> type_expr
+val try_expand_once_opt : Env.t -> type_expr -> type_expr
+
+val expand_head_opt : Env.t -> type_expr -> type_expr
+(** The compiler's own version of [expand_head] necessary for type-based
+    optimisations. *)
+
+val full_expand : Env.t -> type_expr -> type_expr
+val extract_concrete_typedecl :
+  Env.t -> type_expr -> Path.t * Path.t * type_declaration
+(* Return the original path of the types, and the first concrete
+   type declaration found expanding it.
+   Raise [Not_found] if none appears or not a type constructor. *)
+
+val enforce_constraints : Env.t -> type_expr -> unit
+
+val unify : Env.t -> type_expr -> type_expr -> unit
+(* Unify the two types given. Raise [Unify] if not possible. *)
+
+val unify_gadt :
+  newtype_level:int -> Env.t ref -> type_expr -> type_expr -> unit
+(* Unify the two types given and update the environment with the
+   local constraints. Raise [Unify] if not possible. *)
+
+val unify_var : Env.t -> type_expr -> type_expr -> unit
+(* Same as [unify], but allow free univars when first type
+   is a variable. *)
+
+val with_passive_variants : ('a -> 'b) -> 'a -> 'b
+(* Call [f] in passive_variants mode, for exhaustiveness check. *)
+
+val filter_arrow :
+  env:Env.t -> arity:arity -> type_expr -> arg_label -> type_expr * type_expr
+(* A special case of unification (with l:'a -> 'b). *)
+
+val filter_method : Env.t -> string -> private_flag -> type_expr -> type_expr
+(* A special case of unification (with {m : 'a; 'b}). *)
+
+val check_filter_method : Env.t -> string -> private_flag -> type_expr -> unit
+(* A special case of unification (with {m : 'a; 'b}), returning unit. *)
+
+val occur_in : Env.t -> type_expr -> type_expr -> bool
+val deep_occur : type_expr -> type_expr -> bool
+val filter_self_method :
+  Env.t ->
+  string ->
+  private_flag ->
+  (Ident.t * type_expr) Meths.t ref ->
+  type_expr ->
+  Ident.t * type_expr
+val moregeneral : Env.t -> bool -> type_expr -> type_expr -> bool
+(* Check if the first type scheme is more general than the second. *)
+
+val rigidify : type_expr -> type_expr list
+(* "Rigidify" a type and return its type variable *)
+
+val all_distinct_vars : Env.t -> type_expr list -> bool
+(* Check those types are all distinct type variables *)
+
+val matches : Env.t -> type_expr -> type_expr -> bool
+(* Same as [moregeneral false], implemented using the two above
+   functions and backtracking. Ignore levels *)
+
+type class_match_failure =
+  | CM_Virtual_class
+  | CM_Parameter_arity_mismatch of int * int
+  | CM_Type_parameter_mismatch of Env.t * (type_expr * type_expr) list
+  | CM_Parameter_mismatch of Env.t * (type_expr * type_expr) list
+  | CM_Val_type_mismatch of string * Env.t * (type_expr * type_expr) list
+  | CM_Meth_type_mismatch of string * Env.t * (type_expr * type_expr) list
+  | CM_Non_mutable_value of string
+  | CM_Non_concrete_value of string
+  | CM_Missing_value of string
+  | CM_Missing_method of string
+  | CM_Hide_public of string
+  | CM_Hide_virtual of string * string
+  | CM_Public_method of string
+  | CM_Private_method of string
+  | CM_Virtual_method of string
+val equal : Env.t -> bool -> type_expr list -> type_expr list -> bool
+(* [equal env [x1...xn] tau [y1...yn] sigma]
+   checks whether the parameterized types
+   [/\x1.../\xn.tau] and [/\y1.../\yn.sigma] are equivalent. *)
+
+val enlarge_type : Env.t -> type_expr -> type_expr * bool
+(* Make a type larger, flag is true if some pruning had to be done *)
+
+val subtype : Env.t -> type_expr -> type_expr -> unit -> unit
+(* [subtype env t1 t2] checks that [t1] is a subtype of [t2].
+   It accumulates the constraints the type variables must
+   enforce and returns a function that enforces this
+   constraints. *)
+
+val nondep_type : Env.t -> Ident.t -> type_expr -> type_expr
+(* Return a type equivalent to the given type but without
+   references to the given module identifier. Raise [Not_found]
+   if no such type exists. *)
+
+val nondep_type_decl :
+  Env.t -> Ident.t -> Ident.t -> bool -> type_declaration -> type_declaration
+(* Same for type declarations. *)
+
+val nondep_extension_constructor :
+  Env.t -> Ident.t -> extension_constructor -> extension_constructor
+
+(* Same for extension constructor *)
+(*val correct_abbrev: Env.t -> Path.t -> type_expr list -> type_expr -> unit*)
+val cyclic_abbrev : Env.t -> Ident.t -> type_expr -> bool
+val is_contractive : Env.t -> Path.t -> bool
+val normalize_type : Env.t -> type_expr -> unit
+
+val closed_schema : Env.t -> type_expr -> bool
+(* Check whether the given type scheme contains no non-generic
+   type variables *)
+
+val free_variables : ?env:Env.t -> type_expr -> type_expr list
+(* If env present, then check for incomplete definitions too *)
+
+val closed_type_decl : type_declaration -> type_expr option
+val closed_extension_constructor : extension_constructor -> type_expr option
+type closed_class_failure =
+  | CC_Method of type_expr * bool * string * type_expr
+  | CC_Value of type_expr * bool * string * type_expr
+
+val unalias : type_expr -> type_expr
+val arity : type_expr -> int
+(* Return the arity (as for curried functions) of the given type. *)
+
+val collapse_conj_params : Env.t -> type_expr list -> unit
+(* Collapse conjunctive types in class parameters *)
+
+val get_current_level : unit -> int
+val wrap_trace_gadt_instances : Env.t -> ('a -> 'b) -> 'a -> 'b
+val reset_reified_var_counter : unit -> unit
+
+val maybe_pointer_type : Env.t -> type_expr -> bool
+(* True if type is possibly pointer, false if definitely not a pointer *)
+
+(* Stubs *)
+val package_subtype :
+  (Env.t ->
+  Path.t ->
+  Longident.t list ->
+  type_expr list ->
+  Path.t ->
+  Longident.t list ->
+  type_expr list ->
+  bool)
+  ref
+
+val variant_is_subtype :
+  (Env.t -> Types.row_desc -> Types.type_expr -> bool) ref
+
+val get_arity : Env.t -> type_expr -> int option
diff --git a/compiler/ml/datarepr.ml b/compiler/ml/datarepr.ml
new file mode 100644
index 0000000..df16f61
--- /dev/null
+++ b/compiler/ml/datarepr.ml
@@ -0,0 +1,298 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Compute constructor and label descriptions from type declarations,
+   determining their representation. *)
+
+open Asttypes
+open Types
+open Btype
+
+(* Simplified version of Ctype.free_vars *)
+let free_vars ?(param = false) ty =
+  let ret = ref TypeSet.empty in
+  let rec loop ty =
+    let ty = repr ty in
+    if ty.level >= lowest_level then (
+      ty.level <- pivot_level - ty.level;
+      match ty.desc with
+      | Tvar _ -> ret := TypeSet.add ty !ret
+      | Tvariant row -> (
+        let row = row_repr row in
+        iter_row loop row;
+        if not (static_row row) then
+          match row.row_more.desc with
+          | Tvar _ when param -> ret := TypeSet.add ty !ret
+          | _ -> loop row.row_more)
+      (* XXX: What about Tobject ? *)
+      | _ -> iter_type_expr loop ty)
+  in
+  loop ty;
+  unmark_type ty;
+  !ret
+
+let newgenconstr path tyl = newgenty (Tconstr (path, tyl, ref Mnil))
+
+let constructor_existentials cd_args cd_res =
+  let tyl =
+    match cd_args with
+    | Cstr_tuple l -> l
+    | Cstr_record l -> List.map (fun l -> l.ld_type) l
+  in
+  let existentials =
+    match cd_res with
+    | None -> []
+    | Some type_ret ->
+      let arg_vars_set = free_vars (newgenty (Ttuple tyl)) in
+      let res_vars = free_vars type_ret in
+      TypeSet.elements (TypeSet.diff arg_vars_set res_vars)
+  in
+  (tyl, existentials)
+
+let constructor_args priv cd_args cd_res path rep =
+  let tyl, existentials = constructor_existentials cd_args cd_res in
+  match cd_args with
+  | Cstr_tuple l -> (existentials, l, None)
+  | Cstr_record lbls ->
+    let arg_vars_set = free_vars ~param:true (newgenty (Ttuple tyl)) in
+    let type_params = TypeSet.elements arg_vars_set in
+    let type_unboxed =
+      match rep with
+      | Record_unboxed _ -> unboxed_true_default_false
+      | _ -> unboxed_false_default_false
+    in
+    let tdecl =
+      {
+        type_params;
+        type_arity = List.length type_params;
+        type_kind = Type_record (lbls, rep);
+        type_private = priv;
+        type_manifest = None;
+        type_variance = List.map (fun _ -> Variance.full) type_params;
+        type_newtype_level = None;
+        type_loc = Location.none;
+        type_attributes = [];
+        type_immediate = false;
+        type_unboxed;
+        type_inlined_types = [];
+      }
+    in
+    (existentials, [newgenconstr path type_params], Some tdecl)
+
+let internal_optional = "internal.optional"
+
+let optional_shape : Parsetree.attribute =
+  ({txt = internal_optional; loc = Location.none}, Parsetree.PStr [])
+
+let constructor_has_optional_shape
+    ({cstr_attributes = attrs} : constructor_description) =
+  List.exists (fun (x, _) -> x.txt = internal_optional) attrs
+
+let constructor_descrs ty_path decl cstrs =
+  let ty_res = newgenconstr ty_path decl.type_params in
+  let num_consts = ref 0 and num_nonconsts = ref 0 in
+  List.iter
+    (fun {cd_args; _} ->
+      if cd_args = Cstr_tuple [] then incr num_consts else incr num_nonconsts)
+    cstrs;
+  let rec describe_constructors idx_const idx_nonconst = function
+    | [] -> []
+    | {cd_id; cd_args; cd_res; cd_loc; cd_attributes} :: rem ->
+      let ty_res =
+        match cd_res with
+        | Some ty_res' -> ty_res'
+        | None -> ty_res
+      in
+      let tag, descr_rem =
+        match cd_args with
+        | _ when decl.type_unboxed.unboxed ->
+          assert (rem = []);
+          (Cstr_unboxed, [])
+        | Cstr_tuple [] ->
+          ( Cstr_constant idx_const,
+            describe_constructors (idx_const + 1) idx_nonconst rem )
+        | _ ->
+          ( Cstr_block idx_nonconst,
+            describe_constructors idx_const (idx_nonconst + 1) rem )
+      in
+      let cstr_name = Ident.name cd_id in
+      let existentials, cstr_args, cstr_inlined =
+        let representation =
+          if decl.type_unboxed.unboxed then Record_unboxed true
+          else
+            Record_inlined
+              {
+                tag = idx_nonconst;
+                name = cstr_name;
+                num_nonconsts = !num_nonconsts;
+                attrs = cd_attributes;
+              }
+        in
+        constructor_args decl.type_private cd_args cd_res
+          (Path.Pdot (ty_path, cstr_name, Path.nopos))
+          representation
+      in
+      let cstr =
+        {
+          cstr_name;
+          cstr_res = ty_res;
+          cstr_existentials = existentials;
+          cstr_args;
+          cstr_arity = List.length cstr_args;
+          cstr_tag = tag;
+          cstr_consts = !num_consts;
+          cstr_nonconsts = !num_nonconsts;
+          cstr_private = decl.type_private;
+          cstr_generalized = cd_res <> None;
+          cstr_loc = cd_loc;
+          cstr_attributes = cd_attributes;
+          cstr_inlined;
+        }
+      in
+      (cd_id, cstr) :: descr_rem
+  in
+  let result = describe_constructors 0 0 cstrs in
+  match result with
+  | [
+      (({Ident.name = "None"} as a_id), ({cstr_args = []} as a_descr));
+      (({Ident.name = "Some"} as b_id), ({cstr_args = [_]} as b_descr));
+    ]
+  | [
+      (({Ident.name = "Some"} as a_id), ({cstr_args = [_]} as a_descr));
+      (({Ident.name = "None"} as b_id), ({cstr_args = []} as b_descr));
+    ] ->
+    [
+      ( a_id,
+        {
+          a_descr with
+          cstr_attributes = optional_shape :: a_descr.cstr_attributes;
+        } );
+      ( b_id,
+        {
+          b_descr with
+          cstr_attributes = optional_shape :: b_descr.cstr_attributes;
+        } );
+    ]
+  | _ -> result
+
+let extension_descr path_ext ext =
+  let ty_res =
+    match ext.ext_ret_type with
+    | Some type_ret -> type_ret
+    | None -> newgenconstr ext.ext_type_path ext.ext_type_params
+  in
+  let existentials, cstr_args, cstr_inlined =
+    constructor_args ext.ext_private ext.ext_args ext.ext_ret_type path_ext
+      Record_extension
+  in
+  {
+    cstr_name = Path.last path_ext;
+    cstr_res = ty_res;
+    cstr_existentials = existentials;
+    cstr_args;
+    cstr_arity = List.length cstr_args;
+    cstr_tag = Cstr_extension path_ext;
+    cstr_consts = -1;
+    cstr_nonconsts = -1;
+    cstr_private = ext.ext_private;
+    cstr_generalized = ext.ext_ret_type <> None;
+    cstr_loc = ext.ext_loc;
+    cstr_attributes = ext.ext_attributes;
+    cstr_inlined;
+  }
+
+let none = {desc = Ttuple []; level = -1; id = -1}
+(* Clearly ill-formed type *)
+
+let dummy_label =
+  {
+    lbl_name = "";
+    lbl_res = none;
+    lbl_arg = none;
+    lbl_mut = Immutable;
+    lbl_optional = false;
+    lbl_pos = -1;
+    lbl_all = [||];
+    lbl_repres = Record_regular;
+    lbl_private = Public;
+    lbl_loc = Location.none;
+    lbl_attributes = [];
+  }
+
+let label_descrs ty_res lbls repres priv =
+  let all_labels = Array.make (List.length lbls) dummy_label in
+  let rec describe_labels num = function
+    | [] -> []
+    | l :: rest ->
+      let lbl =
+        {
+          lbl_name = Ident.name l.ld_id;
+          lbl_res = ty_res;
+          lbl_arg = l.ld_type;
+          lbl_mut = l.ld_mutable;
+          lbl_optional = l.ld_optional;
+          lbl_pos = num;
+          lbl_all = all_labels;
+          lbl_repres = repres;
+          lbl_private = priv;
+          lbl_loc = l.ld_loc;
+          lbl_attributes = l.ld_attributes;
+        }
+      in
+      all_labels.(num) <- lbl;
+      (l.ld_id, lbl) :: describe_labels (num + 1) rest
+  in
+  describe_labels 0 lbls
+
+exception Constr_not_found
+
+let rec find_constr tag num_const num_nonconst = function
+  | [] -> raise Constr_not_found
+  | ({cd_args = Cstr_tuple []; _} as c) :: rem ->
+    if Types.equal_tag tag (Cstr_constant num_const) then c
+    else find_constr tag (num_const + 1) num_nonconst rem
+  | c :: rem ->
+    if Types.equal_tag tag (Cstr_block num_nonconst) || tag = Cstr_unboxed then
+      c
+    else find_constr tag num_const (num_nonconst + 1) rem
+
+let find_constr_by_tag tag cstrlist = find_constr tag 0 0 cstrlist
+
+let constructors_of_type ty_path decl =
+  match decl.type_kind with
+  | Type_variant cstrs -> constructor_descrs ty_path decl cstrs
+  | Type_record _ | Type_abstract | Type_open -> []
+
+let labels_of_type ty_path decl =
+  match decl.type_kind with
+  | Type_record (labels, rep) ->
+    label_descrs
+      (newgenconstr ty_path decl.type_params)
+      labels rep decl.type_private
+  | Type_variant _ | Type_abstract | Type_open -> []
+
+(* Set row_name in Env, cf. GPR#1204/1329 *)
+let set_row_name decl path =
+  match decl.type_manifest with
+  | None -> ()
+  | Some ty -> (
+    let ty = repr ty in
+    match ty.desc with
+    | Tvariant row when static_row row ->
+      let row =
+        {(row_repr row) with row_name = Some (path, decl.type_params)}
+      in
+      ty.desc <- Tvariant row
+    | _ -> ())
diff --git a/compiler/ml/datarepr.mli b/compiler/ml/datarepr.mli
new file mode 100644
index 0000000..47113d8
--- /dev/null
+++ b/compiler/ml/datarepr.mli
@@ -0,0 +1,44 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Compute constructor and label descriptions from type declarations,
+   determining their representation. *)
+
+open Types
+
+val constructor_has_optional_shape : Types.constructor_description -> bool
+
+val extension_descr : Path.t -> extension_constructor -> constructor_description
+
+val labels_of_type :
+  Path.t -> type_declaration -> (Ident.t * label_description) list
+val constructors_of_type :
+  Path.t -> type_declaration -> (Ident.t * constructor_description) list
+
+exception Constr_not_found
+
+val find_constr_by_tag :
+  constructor_tag -> constructor_declaration list -> constructor_declaration
+
+val constructor_existentials :
+  constructor_arguments -> type_expr option -> type_expr list * type_expr list
+(** Takes [cd_args] and [cd_res] from a [constructor_declaration] and
+    returns:
+    - the types of the constructor's arguments
+    - the existential variables introduced by the constructor
+ *)
+
+(* Set the polymorphic variant row_name field *)
+val set_row_name : type_declaration -> Path.t -> unit
diff --git a/jscomp/ml/delayed_checks.ml b/compiler/ml/delayed_checks.ml
similarity index 83%
rename from jscomp/ml/delayed_checks.ml
rename to compiler/ml/delayed_checks.ml
index 029831a..631425c 100644
--- a/jscomp/ml/delayed_checks.ml
+++ b/compiler/ml/delayed_checks.ml
@@ -8,8 +8,10 @@ let force_delayed_checks () =
   let snap = Btype.snapshot () in
   let w_old = Warnings.backup () in
   List.iter
-    (fun (f, w) -> Warnings.restore w; f ())
+    (fun (f, w) ->
+      Warnings.restore w;
+      f ())
     (List.rev !delayed_checks);
   Warnings.restore w_old;
   reset_delayed_checks ();
-  Btype.backtrack snap
\ No newline at end of file
+  Btype.backtrack snap
diff --git a/jscomp/ml/delayed_checks.mli b/compiler/ml/delayed_checks.mli
similarity index 97%
rename from jscomp/ml/delayed_checks.mli
rename to compiler/ml/delayed_checks.mli
index df0a346..ac83a67 100644
--- a/jscomp/ml/delayed_checks.mli
+++ b/compiler/ml/delayed_checks.mli
@@ -1,6 +1,3 @@
-
-
-
 val reset_delayed_checks : unit -> unit
 val add_delayed_check : (unit -> unit) -> unit
 val force_delayed_checks : unit -> unit
diff --git a/compiler/ml/depend.ml b/compiler/ml/depend.ml
new file mode 100644
index 0000000..e5e39eb
--- /dev/null
+++ b/compiler/ml/depend.ml
@@ -0,0 +1,517 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1999 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Asttypes
+open Location
+open Longident
+open Parsetree
+
+let pp_deps = ref []
+
+module StringSet = Set.Make (struct
+  type t = string
+  let compare = compare
+end)
+module StringMap = Map.Make (String)
+
+(* Module resolution map *)
+(* Node (set of imports for this path, map for submodules) *)
+type map_tree = Node of StringSet.t * bound_map
+and bound_map = map_tree StringMap.t
+let bound = Node (StringSet.empty, StringMap.empty)
+
+(*let get_free (Node (s, _m)) = s*)
+let get_map (Node (_s, m)) = m
+let make_leaf s = Node (StringSet.singleton s, StringMap.empty)
+let make_node m = Node (StringSet.empty, m)
+let rec weaken_map s (Node (s0, m0)) =
+  Node (StringSet.union s s0, StringMap.map (weaken_map s) m0)
+let rec collect_free (Node (s, m)) =
+  StringMap.fold (fun _ n -> StringSet.union (collect_free n)) m s
+
+(* Returns the imports required to access the structure at path p *)
+(* Only raises Not_found if the head of p is not in the toplevel map *)
+let rec lookup_free p m =
+  match p with
+  | [] -> raise Not_found
+  | s :: p -> (
+    let (Node (f, m')) = StringMap.find s m in
+    try lookup_free p m' with Not_found -> f)
+
+(* Returns the node corresponding to the structure at path p *)
+let rec lookup_map lid m =
+  match lid with
+  | Lident s -> StringMap.find s m
+  | Ldot (l, s) -> StringMap.find s (get_map (lookup_map l m))
+  | Lapply _ -> raise Not_found
+
+(* Collect free module identifiers in the a.s.t. *)
+
+let free_structure_names = ref StringSet.empty
+
+let add_names s =
+  free_structure_names := StringSet.union s !free_structure_names
+
+let rec add_path bv ?(p = []) = function
+  | Lident s ->
+    let free =
+      try lookup_free (s :: p) bv with Not_found -> StringSet.singleton s
+    in
+    (*StringSet.iter (fun s -> Printf.eprintf "%s " s) free;
+      prerr_endline "";*)
+    add_names free
+  | Ldot (l, s) -> add_path bv ~p:(s :: p) l
+  | Lapply (l1, l2) ->
+    add_path bv l1;
+    add_path bv l2
+
+let open_module bv lid =
+  match lookup_map lid bv with
+  | Node (s, m) ->
+    add_names s;
+    StringMap.fold StringMap.add m bv
+  | exception Not_found ->
+    add_path bv lid;
+    bv
+
+let add_parent bv lid =
+  match lid.txt with
+  | Ldot (l, _s) -> add_path bv l
+  | _ -> ()
+
+let add = add_parent
+
+let addmodule bv lid = add_path bv lid.txt
+
+let handle_extension ext =
+  match (fst ext).txt with
+  | "error" | "ocaml.error" ->
+    raise (Location.Error (Builtin_attributes.error_of_extension ext))
+  | _ -> ()
+
+let rec add_type bv ty =
+  match ty.ptyp_desc with
+  | Ptyp_any -> ()
+  | Ptyp_var _ -> ()
+  | Ptyp_arrow {arg; ret} ->
+    add_type bv arg.typ;
+    add_type bv ret
+  | Ptyp_tuple tl -> List.iter (add_type bv) tl
+  | Ptyp_constr (c, tl) ->
+    add bv c;
+    List.iter (add_type bv) tl
+  | Ptyp_object (fl, _) ->
+    List.iter
+      (function
+        | Otag (_, _, t) -> add_type bv t
+        | Oinherit t -> add_type bv t)
+      fl
+  | Ptyp_alias (t, _) -> add_type bv t
+  | Ptyp_variant (fl, _, _) ->
+    List.iter
+      (function
+        | Rtag (_, _, _, stl) -> List.iter (add_type bv) stl
+        | Rinherit sty -> add_type bv sty)
+      fl
+  | Ptyp_poly (_, t) -> add_type bv t
+  | Ptyp_package pt -> add_package_type bv pt
+  | Ptyp_extension e -> handle_extension e
+
+and add_package_type bv (lid, l) =
+  add bv lid;
+  List.iter (add_type bv) (List.map (fun (_, e) -> e) l)
+
+let add_opt add_fn bv = function
+  | None -> ()
+  | Some x -> add_fn bv x
+
+let add_constructor_arguments bv = function
+  | Pcstr_tuple l -> List.iter (add_type bv) l
+  | Pcstr_record l -> List.iter (fun l -> add_type bv l.pld_type) l
+
+let add_constructor_decl bv pcd =
+  add_constructor_arguments bv pcd.pcd_args;
+  Misc.may (add_type bv) pcd.pcd_res
+
+let add_type_declaration bv td =
+  List.iter
+    (fun (ty1, ty2, _) ->
+      add_type bv ty1;
+      add_type bv ty2)
+    td.ptype_cstrs;
+  add_opt add_type bv td.ptype_manifest;
+  let add_tkind = function
+    | Ptype_abstract -> ()
+    | Ptype_variant cstrs -> List.iter (add_constructor_decl bv) cstrs
+    | Ptype_record lbls -> List.iter (fun pld -> add_type bv pld.pld_type) lbls
+    | Ptype_open -> ()
+  in
+  add_tkind td.ptype_kind
+
+let add_extension_constructor bv ext =
+  match ext.pext_kind with
+  | Pext_decl (args, rty) ->
+    add_constructor_arguments bv args;
+    Misc.may (add_type bv) rty
+  | Pext_rebind lid -> add bv lid
+
+let add_type_extension bv te =
+  add bv te.ptyext_path;
+  List.iter (add_extension_constructor bv) te.ptyext_constructors
+
+let pattern_bv = ref StringMap.empty
+
+let rec add_pattern bv pat =
+  match pat.ppat_desc with
+  | Ppat_any -> ()
+  | Ppat_var _ -> ()
+  | Ppat_alias (p, _) -> add_pattern bv p
+  | Ppat_interval _ | Ppat_constant _ -> ()
+  | Ppat_tuple pl -> List.iter (add_pattern bv) pl
+  | Ppat_construct (c, op) ->
+    add bv c;
+    add_opt add_pattern bv op
+  | Ppat_record (pl, _) ->
+    List.iter
+      (fun {lid = lbl; x = p} ->
+        add bv lbl;
+        add_pattern bv p)
+      pl
+  | Ppat_array pl -> List.iter (add_pattern bv) pl
+  | Ppat_or (p1, p2) ->
+    add_pattern bv p1;
+    add_pattern bv p2
+  | Ppat_constraint (p, ty) ->
+    add_pattern bv p;
+    add_type bv ty
+  | Ppat_variant (_, op) -> add_opt add_pattern bv op
+  | Ppat_type li -> add bv li
+  | Ppat_unpack id -> pattern_bv := StringMap.add id.txt bound !pattern_bv
+  | Ppat_open (m, p) ->
+    let bv = open_module bv m.txt in
+    add_pattern bv p
+  | Ppat_exception p -> add_pattern bv p
+  | Ppat_extension e -> handle_extension e
+
+let add_pattern bv pat =
+  pattern_bv := bv;
+  add_pattern bv pat;
+  !pattern_bv
+
+let rec add_expr bv exp =
+  match exp.pexp_desc with
+  | Pexp_ident l -> add bv l
+  | Pexp_constant _ -> ()
+  | Pexp_let (rf, pel, e) ->
+    let bv = add_bindings rf bv pel in
+    add_expr bv e
+  | Pexp_fun {default = opte; lhs = p; rhs = e} ->
+    add_opt add_expr bv opte;
+    add_expr (add_pattern bv p) e
+  | Pexp_apply {funct = e; args = el} ->
+    add_expr bv e;
+    List.iter (fun (_, e) -> add_expr bv e) el
+  | Pexp_match (e, pel) ->
+    add_expr bv e;
+    add_cases bv pel
+  | Pexp_try (e, pel) ->
+    add_expr bv e;
+    add_cases bv pel
+  | Pexp_tuple el -> List.iter (add_expr bv) el
+  | Pexp_construct (c, opte) ->
+    add bv c;
+    add_opt add_expr bv opte
+  | Pexp_variant (_, opte) -> add_opt add_expr bv opte
+  | Pexp_record (lblel, opte) ->
+    List.iter
+      (fun {lid = lbl; x = e} ->
+        add bv lbl;
+        add_expr bv e)
+      lblel;
+    add_opt add_expr bv opte
+  | Pexp_field (e, fld) ->
+    add_expr bv e;
+    add bv fld
+  | Pexp_setfield (e1, fld, e2) ->
+    add_expr bv e1;
+    add bv fld;
+    add_expr bv e2
+  | Pexp_array el -> List.iter (add_expr bv) el
+  | Pexp_ifthenelse (e1, e2, opte3) ->
+    add_expr bv e1;
+    add_expr bv e2;
+    add_opt add_expr bv opte3
+  | Pexp_sequence (e1, e2) ->
+    add_expr bv e1;
+    add_expr bv e2
+  | Pexp_while (e1, e2) ->
+    add_expr bv e1;
+    add_expr bv e2
+  | Pexp_for (_, e1, e2, _, e3) ->
+    add_expr bv e1;
+    add_expr bv e2;
+    add_expr bv e3
+  | Pexp_coerce (e1, (), ty3) ->
+    add_expr bv e1;
+    add_type bv ty3
+  | Pexp_constraint (e1, ty2) ->
+    add_expr bv e1;
+    add_type bv ty2
+  | Pexp_send (e, _m) -> add_expr bv e
+  | Pexp_letmodule (id, m, e) ->
+    let b = add_module_binding bv m in
+    add_expr (StringMap.add id.txt b bv) e
+  | Pexp_letexception (_, e) -> add_expr bv e
+  | Pexp_assert e -> add_expr bv e
+  | Pexp_newtype (_, e) -> add_expr bv e
+  | Pexp_pack m -> add_module bv m
+  | Pexp_open (_ovf, m, e) ->
+    let bv = open_module bv m.txt in
+    add_expr bv e
+  | Pexp_extension
+      (( {txt = "ocaml.extension_constructor" | "extension_constructor"; _},
+         PStr [item] ) as e) -> (
+    match item.pstr_desc with
+    | Pstr_eval ({pexp_desc = Pexp_construct (c, None)}, _) -> add bv c
+    | _ -> handle_extension e)
+  | Pexp_extension e -> handle_extension e
+  | Pexp_await e -> add_expr bv e
+  | Pexp_jsx_element (Jsx_fragment {jsx_fragment_children = children}) ->
+    add_jsx_children bv children
+  | Pexp_jsx_element
+      (Jsx_unary_element
+         {jsx_unary_element_tag_name = name; jsx_unary_element_props = props})
+    ->
+    (* Conservatively add all module path segments referenced by the tag name *)
+    (match name.txt with
+    | JsxLowerTag _ | JsxTagInvalid _ -> ()
+    | JsxQualifiedLowerTag {path; _} | JsxUpperTag path -> add_path bv path);
+    and_jsx_props bv props
+  | Pexp_jsx_element
+      (Jsx_container_element
+         {
+           jsx_container_element_tag_name_start = name;
+           jsx_container_element_props = props;
+           jsx_container_element_children = children;
+         }) ->
+    (match name.txt with
+    | JsxLowerTag _ | JsxTagInvalid _ -> ()
+    | JsxQualifiedLowerTag {path; _} | JsxUpperTag path -> add_path bv path);
+    and_jsx_props bv props;
+    add_jsx_children bv children
+
+and add_jsx_children bv xs = List.iter (add_expr bv) xs
+
+and add_jsx_prop bv = function
+  | JSXPropPunning (_, _) -> ()
+  | JSXPropValue (_, _, e) -> add_expr bv e
+  | JSXPropSpreading (_, e) -> add_expr bv e
+
+and and_jsx_props bv = List.iter (add_jsx_prop bv)
+
+and add_cases bv cases = List.iter (add_case bv) cases
+
+and add_case bv {pc_lhs; pc_guard; pc_rhs} =
+  let bv = add_pattern bv pc_lhs in
+  add_opt add_expr bv pc_guard;
+  add_expr bv pc_rhs
+
+and add_bindings recf bv pel =
+  let bv' = List.fold_left (fun bv x -> add_pattern bv x.pvb_pat) bv pel in
+  let bv = if recf = Recursive then bv' else bv in
+  List.iter (fun x -> add_expr bv x.pvb_expr) pel;
+  bv'
+
+and add_modtype bv mty =
+  match mty.pmty_desc with
+  | Pmty_ident l -> add bv l
+  | Pmty_alias l -> addmodule bv l
+  | Pmty_signature s -> add_signature bv s
+  | Pmty_functor (id, mty1, mty2) ->
+    Misc.may (add_modtype bv) mty1;
+    add_modtype (StringMap.add id.txt bound bv) mty2
+  | Pmty_with (mty, cstrl) ->
+    add_modtype bv mty;
+    List.iter
+      (function
+        | Pwith_type (_, td) -> add_type_declaration bv td
+        | Pwith_module (_, lid) -> addmodule bv lid
+        | Pwith_typesubst (_, td) -> add_type_declaration bv td
+        | Pwith_modsubst (_, lid) -> addmodule bv lid)
+      cstrl
+  | Pmty_typeof m -> add_module bv m
+  | Pmty_extension e -> handle_extension e
+
+and add_module_alias bv l =
+  try
+    add_parent bv l;
+    lookup_map l.txt bv
+  with Not_found -> (
+    match l.txt with
+    | Lident s -> make_leaf s
+    | _ ->
+      addmodule bv l;
+      bound (* cannot delay *))
+
+and add_modtype_binding bv mty =
+  if not !Clflags.transparent_modules then add_modtype bv mty;
+  match mty.pmty_desc with
+  | Pmty_alias l -> add_module_alias bv l
+  | Pmty_signature s -> make_node (add_signature_binding bv s)
+  | Pmty_typeof modl -> add_module_binding bv modl
+  | _ ->
+    if !Clflags.transparent_modules then add_modtype bv mty;
+    bound
+
+and add_signature bv sg = ignore (add_signature_binding bv sg)
+
+and add_signature_binding bv sg =
+  snd (List.fold_left add_sig_item (bv, StringMap.empty) sg)
+
+and add_sig_item (bv, m) item =
+  match item.psig_desc with
+  | Psig_value vd ->
+    add_type bv vd.pval_type;
+    (bv, m)
+  | Psig_type (_, dcls) ->
+    List.iter (add_type_declaration bv) dcls;
+    (bv, m)
+  | Psig_typext te ->
+    add_type_extension bv te;
+    (bv, m)
+  | Psig_exception pext ->
+    add_extension_constructor bv pext;
+    (bv, m)
+  | Psig_module pmd ->
+    let m' = add_modtype_binding bv pmd.pmd_type in
+    let add = StringMap.add pmd.pmd_name.txt m' in
+    (add bv, add m)
+  | Psig_recmodule decls ->
+    let add =
+      List.fold_right (fun pmd -> StringMap.add pmd.pmd_name.txt bound) decls
+    in
+    let bv' = add bv and m' = add m in
+    List.iter (fun pmd -> add_modtype bv' pmd.pmd_type) decls;
+    (bv', m')
+  | Psig_modtype x ->
+    (match x.pmtd_type with
+    | None -> ()
+    | Some mty -> add_modtype bv mty);
+    (bv, m)
+  | Psig_open od -> (open_module bv od.popen_lid.txt, m)
+  | Psig_include incl ->
+    let (Node (s, m')) = add_modtype_binding bv incl.pincl_mod in
+    add_names s;
+    let add = StringMap.fold StringMap.add m' in
+    (add bv, add m)
+  | Psig_attribute _ -> (bv, m)
+  | Psig_extension (e, _) ->
+    handle_extension e;
+    (bv, m)
+
+and add_module_binding bv modl =
+  if not !Clflags.transparent_modules then add_module bv modl;
+  match modl.pmod_desc with
+  | Pmod_ident l -> (
+    try
+      add_parent bv l;
+      lookup_map l.txt bv
+    with Not_found -> (
+      match l.txt with
+      | Lident s -> make_leaf s
+      | _ ->
+        addmodule bv l;
+        bound))
+  | Pmod_structure s -> make_node (snd (add_structure_binding bv s))
+  | _ ->
+    if !Clflags.transparent_modules then add_module bv modl;
+    bound
+
+and add_module bv modl =
+  match modl.pmod_desc with
+  | Pmod_ident l -> addmodule bv l
+  | Pmod_structure s -> ignore (add_structure bv s)
+  | Pmod_functor (id, mty, modl) ->
+    Misc.may (add_modtype bv) mty;
+    add_module (StringMap.add id.txt bound bv) modl
+  | Pmod_apply (mod1, mod2) ->
+    add_module bv mod1;
+    add_module bv mod2
+  | Pmod_constraint (modl, mty) ->
+    add_module bv modl;
+    add_modtype bv mty
+  | Pmod_unpack e -> add_expr bv e
+  | Pmod_extension e -> handle_extension e
+
+and add_structure bv item_list =
+  let bv, m = add_structure_binding bv item_list in
+  add_names (collect_free (make_node m));
+  bv
+
+and add_structure_binding bv item_list =
+  List.fold_left add_struct_item (bv, StringMap.empty) item_list
+
+and add_struct_item (bv, m) item : _ StringMap.t * _ StringMap.t =
+  match item.pstr_desc with
+  | Pstr_eval (e, _attrs) ->
+    add_expr bv e;
+    (bv, m)
+  | Pstr_value (rf, pel) ->
+    let bv = add_bindings rf bv pel in
+    (bv, m)
+  | Pstr_primitive vd ->
+    add_type bv vd.pval_type;
+    (bv, m)
+  | Pstr_type (_, dcls) ->
+    List.iter (add_type_declaration bv) dcls;
+    (bv, m)
+  | Pstr_typext te ->
+    add_type_extension bv te;
+    (bv, m)
+  | Pstr_exception pext ->
+    add_extension_constructor bv pext;
+    (bv, m)
+  | Pstr_module x ->
+    let b = add_module_binding bv x.pmb_expr in
+    let add = StringMap.add x.pmb_name.txt b in
+    (add bv, add m)
+  | Pstr_recmodule bindings ->
+    let add =
+      List.fold_right (fun x -> StringMap.add x.pmb_name.txt bound) bindings
+    in
+    let bv' = add bv and m = add m in
+    List.iter (fun x -> add_module bv' x.pmb_expr) bindings;
+    (bv', m)
+  | Pstr_modtype x ->
+    (match x.pmtd_type with
+    | None -> ()
+    | Some mty -> add_modtype bv mty);
+    (bv, m)
+  | Pstr_open od -> (open_module bv od.popen_lid.txt, m)
+  | Pstr_include incl ->
+    let (Node (s, m')) = add_module_binding bv incl.pincl_mod in
+    add_names s;
+    let add = StringMap.fold StringMap.add m' in
+    (add bv, add m)
+  | Pstr_attribute _ -> (bv, m)
+  | Pstr_extension (e, _) ->
+    handle_extension e;
+    (bv, m)
+
+and add_implementation bv l =
+  if !Clflags.transparent_modules then ignore (add_structure_binding bv l)
+  else ignore (add_structure bv l)
+
+and add_implementation_binding bv l = snd (add_structure_binding bv l)
diff --git a/jscomp/ml/depend.mli b/compiler/ml/depend.mli
similarity index 97%
rename from jscomp/ml/depend.mli
rename to compiler/ml/depend.mli
index 23ad60d..b4fb4c8 100644
--- a/jscomp/ml/depend.mli
+++ b/compiler/ml/depend.mli
@@ -19,7 +19,7 @@ module StringSet : Set.S with type elt = string
 module StringMap : Map.S with type key = string
 
 type map_tree = Node of StringSet.t * bound_map
-and  bound_map = map_tree StringMap.t
+and bound_map = map_tree StringMap.t
 val make_leaf : string -> map_tree
 val make_node : bound_map -> map_tree
 val weaken_map : StringSet.t -> map_tree -> map_tree
@@ -31,8 +31,6 @@ val pp_deps : string list ref
 
 val open_module : bound_map -> Longident.t -> bound_map
 
-
-
 val add_signature : bound_map -> Parsetree.signature -> unit
 
 val add_implementation : bound_map -> Parsetree.structure -> unit
diff --git a/compiler/ml/dict_type_helpers.ml b/compiler/ml/dict_type_helpers.ml
new file mode 100644
index 0000000..0f5a807
--- /dev/null
+++ b/compiler/ml/dict_type_helpers.ml
@@ -0,0 +1,49 @@
+(*
+  An overview of the implementation of dicts in ReScript:
+  ### What is a dict?
+  Dicts are effectively an object with unknown fields, but a single known type of the values it holds.
+
+  ### How are they implemented?
+  Dicts in ReScript are implemented as predefined record type, with a single (magic) field that holds 
+  the type of the dict's values. This field is called `dictValuesType`, and it represent every possible
+  key in the dict. It's just an implementation detail - it's never actually exposed to the user, just 
+  used internally. 
+
+  The compiler will route any label lookup on the dict record type to the magic field, which creates a 
+  record with unknown keys, but of a single type.
+
+  The reason for this seemingly convoluted implementation is that it allows us to piggyback on the 
+  existing record pattern matching mechanism, which means we get pattern matching on dicts for free.
+
+  ### Modifications to the type checker
+  We've made a few smaller modifications to the type checker to support this implementation:
+
+  - We've added a new predefined type `dict` that is a record with a single field called `dictValuesType`.
+    This type is used to represent the type of the values in a dict.
+  - We've modified the type checker to recognize `dict` patterns, and route them to the predefined `dict` type.
+    This allows us to get full inference for dicts in patterns. 
+    
+  ### Syntax
+  There's first class syntax support for dicts, both as expressions and as patterns.
+  A dict pattern is treated as a record pattern in the compiler and syntax, with an attriubute `@res.dictPattern`
+  attached to it. This attribute is used to tell the compiler that the pattern is a dict pattern, and is what
+  triggers the compiler to treat the dict record type differently to regular record types.
+  *)
+let dict_magic_field_name = "dictValuesType"
+
+let has_dict_pattern_attribute attrs =
+  attrs
+  |> List.find_opt (fun (({txt}, _) : Parsetree.attribute) ->
+         txt = "res.dictPattern")
+  |> Option.is_some
+
+let has_dict_attribute attrs =
+  attrs
+  |> List.find_opt (fun (({txt}, _) : Parsetree.attribute) -> txt = "res.$dict")
+  |> Option.is_some
+
+let dict_attr : Parsetree.attribute =
+  (Location.mknoloc "res.$dict", Parsetree.PStr [])
+
+let dict_magic_field_attr : Parsetree.attribute =
+  (Location.mknoloc "res.$dictMagicField", Parsetree.PStr [])
diff --git a/compiler/ml/dune b/compiler/ml/dune
new file mode 100644
index 0000000..f4dde0e
--- /dev/null
+++ b/compiler/ml/dune
@@ -0,0 +1,9 @@
+(library
+ (name ml)
+ (wrapped false)
+ (preprocess
+  (action
+   (run %{bin:cppo} %{env:CPPO_FLAGS=} %{input-file})))
+ (flags
+  (:standard -w +a-4-42-40-41-44-45-9-48-67-70))
+ (libraries ext flow_parser))
diff --git a/compiler/ml/env.ml b/compiler/ml/env.ml
new file mode 100644
index 0000000..970634b
--- /dev/null
+++ b/compiler/ml/env.ml
@@ -0,0 +1,2141 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Environment handling *)
+
+open Cmi_format
+open Config
+open Misc
+open Asttypes
+open Longident
+open Path
+open Types
+open Btype
+
+let value_declarations : (string * Location.t, unit -> unit) Hashtbl.t =
+  Hashtbl.create 16
+(* This table is used to usage of value declarations.  A declaration is
+   identified with its name and location.  The callback attached to a
+   declaration is called whenever the value is used explicitly
+   (lookup_value) or implicitly (inclusion test between signatures,
+   cf Includemod.value_descriptions). *)
+
+let type_declarations = Hashtbl.create 16
+let module_declarations = Hashtbl.create 16
+
+type constructor_usage = Positive | Pattern | Privatize
+type constructor_usages = {
+  mutable cu_positive: bool;
+  mutable cu_pattern: bool;
+  mutable cu_privatize: bool;
+}
+let add_constructor_usage cu = function
+  | Positive -> cu.cu_positive <- true
+  | Pattern -> cu.cu_pattern <- true
+  | Privatize -> cu.cu_privatize <- true
+let constructor_usages () =
+  {cu_positive = false; cu_pattern = false; cu_privatize = false}
+
+let used_constructors :
+    (string * Location.t * string, constructor_usage -> unit) Hashtbl.t =
+  Hashtbl.create 16
+
+let prefixed_sg = Hashtbl.create 113
+
+type error =
+  | Illegal_renaming of string * string * string
+  | Inconsistent_import of string * string * string
+  | Missing_module of Location.t * Path.t * Path.t
+  | Illegal_value_name of Location.t * string
+
+exception Error of error
+
+let error err = raise (Error err)
+
+module EnvLazy : sig
+  type ('a, 'b) t
+
+  type log
+
+  val force : ('a -> 'b) -> ('a, 'b) t -> 'b
+  val create : 'a -> ('a, 'b) t
+  val get_arg : ('a, 'b) t -> 'a option
+
+  (* [force_logged log f t] is equivalent to [force f t] but if [f] returns [None] then
+     [t] is recorded in [log]. [backtrack log] will then reset all the recorded [t]s back
+     to their original state. *)
+  val log : unit -> log
+  val force_logged : log -> ('a -> 'b option) -> ('a, 'b option) t -> 'b option
+  val backtrack : log -> unit
+end = struct
+  type ('a, 'b) t = ('a, 'b) eval ref
+
+  and ('a, 'b) eval = Done of 'b | Raise of exn | Thunk of 'a
+
+  type undo = Nil | Cons : ('a, 'b) t * 'a * undo -> undo
+
+  type log = undo ref
+
+  let force f x =
+    match !x with
+    | Done x -> x
+    | Raise e -> raise e
+    | Thunk e -> (
+      match f e with
+      | y ->
+        x := Done y;
+        y
+      | exception e ->
+        x := Raise e;
+        raise e)
+
+  let get_arg x =
+    match !x with
+    | Thunk a -> Some a
+    | _ -> None
+
+  let create x = ref (Thunk x)
+
+  let log () = ref Nil
+
+  let force_logged log f x =
+    match !x with
+    | Done x -> x
+    | Raise e -> raise e
+    | Thunk e -> (
+      match f e with
+      | None ->
+        x := Done None;
+        log := Cons (x, e, !log);
+        None
+      | Some _ as y ->
+        x := Done y;
+        y
+      | exception e ->
+        x := Raise e;
+        raise e)
+
+  let backtrack log =
+    let rec loop = function
+      | Nil -> ()
+      | Cons (x, e, rest) ->
+        x := Thunk e;
+        loop rest
+    in
+    loop !log
+end
+
+module PathMap = Map.Make (Path)
+
+type summary =
+  | Env_empty
+  | Env_value of summary * Ident.t * value_description
+  | Env_type of summary * Ident.t * type_declaration
+  | Env_extension of summary * Ident.t * extension_constructor
+  | Env_module of summary * Ident.t * module_declaration
+  | Env_modtype of summary * Ident.t * modtype_declaration
+  | Env_open of summary * Path.t
+  | Env_functor_arg of summary * Ident.t
+  | Env_constraints of summary * type_declaration PathMap.t
+  | Env_copy_types of summary * string list
+
+module TycompTbl = struct
+  (** This module is used to store components of types (i.e. labels
+        and constructors).  We keep a representation of each nested
+        "open" and the set of local bindings between each of them. *)
+
+  type 'a t = {
+    current: 'a Ident.tbl;  (** Local bindings since the last open. *)
+    opened: 'a opened option;
+        (** Symbolic representation of the last (innermost) open, if any. *)
+  }
+
+  and 'a opened = {
+    components: (string, 'a list) Tbl.t;
+        (** Components from the opened module. We keep a list of
+          bindings for each name, as in comp_labels and
+          comp_constrs. *)
+    using: (string -> ('a * 'a) option -> unit) option;
+        (** A callback to be applied when a component is used from this
+          "open".  This is used to detect unused "opens".  The
+          arguments are used to detect shadowing. *)
+    next: 'a t;  (** The table before opening the module. *)
+  }
+
+  let empty = {current = Ident.empty; opened = None}
+
+  let add id x tbl = {tbl with current = Ident.add id x tbl.current}
+
+  let add_open slot wrap components next =
+    let using =
+      match slot with
+      | None -> None
+      | Some f -> Some (fun s x -> f s (wrap x))
+    in
+    {current = Ident.empty; opened = Some {using; components; next}}
+
+  let rec find_same id tbl =
+    try Ident.find_same id tbl.current
+    with Not_found as exn -> (
+      match tbl.opened with
+      | Some {next; _} -> find_same id next
+      | None -> raise exn)
+
+  let nothing () = ()
+
+  let mk_callback rest name desc = function
+    | None -> nothing
+    | Some f -> (
+      fun () ->
+        match rest with
+        | [] -> f name None
+        | (hidden, _) :: _ -> f name (Some (desc, hidden)))
+
+  let rec find_all name tbl =
+    List.map
+      (fun (_id, desc) -> (desc, nothing))
+      (Ident.find_all name tbl.current)
+    @
+    match tbl.opened with
+    | None -> []
+    | Some {using; next; components} -> (
+      let rest = find_all name next in
+      match Tbl.find_str name components with
+      | exception Not_found -> rest
+      | opened ->
+        List.map (fun desc -> (desc, mk_callback rest name desc using)) opened
+        @ rest)
+
+  let rec fold_name f tbl acc =
+    let acc = Ident.fold_name (fun _id d -> f d) tbl.current acc in
+    match tbl.opened with
+    | Some {using = _; next; components} ->
+      acc
+      |> Tbl.fold (fun _name -> List.fold_right (fun desc -> f desc)) components
+      |> fold_name f next
+    | None -> acc
+
+  let rec local_keys tbl acc =
+    let acc = Ident.fold_all (fun k _ accu -> k :: accu) tbl.current acc in
+    match tbl.opened with
+    | Some o -> local_keys o.next acc
+    | None -> acc
+
+  let diff_keys is_local tbl1 tbl2 =
+    let keys2 = local_keys tbl2 [] in
+    Ext_list.filter keys2 (fun id ->
+        is_local (find_same id tbl2)
+        &&
+        try
+          ignore (find_same id tbl1);
+          false
+        with Not_found -> true)
+end
+
+module IdTbl = struct
+  (** This module is used to store all kinds of components except
+        (labels and constructors) in environments.  We keep a
+        representation of each nested "open" and the set of local
+        bindings between each of them. *)
+
+  type 'a t = {
+    current: 'a Ident.tbl;  (** Local bindings since the last open *)
+    opened: 'a opened option;
+        (** Symbolic representation of the last (innermost) open, if any. *)
+  }
+
+  and 'a opened = {
+    root: Path.t;
+        (** The path of the opened module, to be prefixed in front of
+          its local names to produce a valid path in the current
+          environment. *)
+    components: (string, 'a * int) Tbl.t;
+        (** Components from the opened module. *)
+    using: (string -> ('a * 'a) option -> unit) option;
+        (** A callback to be applied when a component is used from this
+          "open".  This is used to detect unused "opens".  The
+          arguments are used to detect shadowing. *)
+    next: 'a t;  (** The table before opening the module. *)
+  }
+
+  let empty = {current = Ident.empty; opened = None}
+
+  let add id x tbl = {tbl with current = Ident.add id x tbl.current}
+
+  let add_open slot wrap root components next =
+    let using =
+      match slot with
+      | None -> None
+      | Some f -> Some (fun s x -> f s (wrap x))
+    in
+    {current = Ident.empty; opened = Some {using; root; components; next}}
+
+  let rec find_same id tbl =
+    try Ident.find_same id tbl.current
+    with Not_found as exn -> (
+      match tbl.opened with
+      | Some {next; _} -> find_same id next
+      | None -> raise exn)
+
+  let rec find_name mark name tbl =
+    try
+      let id, desc = Ident.find_name name tbl.current in
+      (Pident id, desc)
+    with Not_found as exn -> (
+      match tbl.opened with
+      | Some {using; root; next; components} -> (
+        try
+          let descr, pos = Tbl.find_str name components in
+          let res = (Pdot (root, name, pos), descr) in
+          (if mark then
+             match using with
+             | None -> ()
+             | Some f -> (
+               try f name (Some (snd (find_name false name next), snd res))
+               with Not_found -> f name None));
+          res
+        with Not_found -> find_name mark name next)
+      | None -> raise exn)
+
+  let find_name name tbl = find_name true name tbl
+
+  let rec update name f tbl =
+    try
+      let id, desc = Ident.find_name name tbl.current in
+      let new_desc = f desc in
+      {tbl with current = Ident.add id new_desc tbl.current}
+    with Not_found -> (
+      match tbl.opened with
+      | Some {root; using; next; components} -> (
+        try
+          let desc, pos = Tbl.find_str name components in
+          let new_desc = f desc in
+          let components = Tbl.add name (new_desc, pos) components in
+          {tbl with opened = Some {root; using; next; components}}
+        with Not_found ->
+          let next = update name f next in
+          {tbl with opened = Some {root; using; next; components}})
+      | None -> tbl)
+
+  let rec find_all name tbl =
+    List.map
+      (fun (id, desc) -> (Pident id, desc))
+      (Ident.find_all name tbl.current)
+    @
+    match tbl.opened with
+    | None -> []
+    | Some {root; using = _; next; components} -> (
+      try
+        let desc, pos = Tbl.find_str name components in
+        (Pdot (root, name, pos), desc) :: find_all name next
+      with Not_found -> find_all name next)
+
+  let rec fold_name f tbl acc =
+    let acc =
+      Ident.fold_name
+        (fun id d -> f (Ident.name id) (Pident id, d))
+        tbl.current acc
+    in
+    match tbl.opened with
+    | Some {root; using = _; next; components} ->
+      acc
+      |> Tbl.fold
+           (fun name (desc, pos) -> f name (Pdot (root, name, pos), desc))
+           components
+      |> fold_name f next
+    | None -> acc
+
+  let rec local_keys tbl acc =
+    let acc = Ident.fold_all (fun k _ accu -> k :: accu) tbl.current acc in
+    match tbl.opened with
+    | Some o -> local_keys o.next acc
+    | None -> acc
+
+  let rec iter f tbl =
+    Ident.iter (fun id desc -> f id (Pident id, desc)) tbl.current;
+    match tbl.opened with
+    | Some {root; using = _; next; components} ->
+      Tbl.iter
+        (fun s (x, pos) ->
+          f (Ident.hide (Ident.create s) (* ??? *)) (Pdot (root, s, pos), x))
+        components;
+      iter f next
+    | None -> ()
+
+  let diff_keys tbl1 tbl2 =
+    let keys2 = local_keys tbl2 [] in
+    Ext_list.filter keys2 (fun id ->
+        try
+          ignore (find_same id tbl1);
+          false
+        with Not_found -> true)
+end
+
+type type_descriptions = constructor_description list * label_description list
+
+let in_signature_flag = 0x01
+let implicit_coercion_flag = 0x02
+
+type t = {
+  values: value_description IdTbl.t;
+  constrs: constructor_description TycompTbl.t;
+  labels: label_description TycompTbl.t;
+  types: (type_declaration * type_descriptions) IdTbl.t;
+  modules: (Subst.t * module_declaration, module_declaration) EnvLazy.t IdTbl.t;
+  modtypes: modtype_declaration IdTbl.t;
+  components: module_components IdTbl.t;
+  functor_args: unit Ident.tbl;
+  summary: summary;
+  local_constraints: type_declaration PathMap.t;
+  gadt_instances: (int * TypeSet.t ref) list;
+  flags: int;
+}
+
+and module_components = {
+  deprecated: string option;
+  loc: Location.t;
+  comps:
+    ( t * Subst.t * Path.t * Types.module_type,
+      module_components_repr option )
+    EnvLazy.t;
+}
+
+and module_components_repr =
+  | Structure_comps of structure_components
+  | Functor_comps of functor_components
+
+and 'a comp_tbl = (string, 'a * int) Tbl.t
+
+and structure_components = {
+  mutable comp_values: value_description comp_tbl;
+  mutable comp_constrs: (string, constructor_description list) Tbl.t;
+  mutable comp_labels: (string, label_description list) Tbl.t;
+  mutable comp_types: (type_declaration * type_descriptions) comp_tbl;
+  mutable comp_modules:
+    (Subst.t * module_declaration, module_declaration) EnvLazy.t comp_tbl;
+  mutable comp_modtypes: modtype_declaration comp_tbl;
+  mutable comp_components: module_components comp_tbl; (* warning -69*)
+}
+
+and functor_components = {
+  fcomp_param: Ident.t; (* Formal parameter *)
+  fcomp_arg: module_type option; (* Argument signature *)
+  fcomp_res: module_type; (* Result signature *)
+  fcomp_cache: (Path.t, module_components) Hashtbl.t; (* For memoization *)
+  fcomp_subst_cache: (Path.t, module_type) Hashtbl.t;
+}
+
+let copy_local ~from env =
+  {
+    env with
+    local_constraints = from.local_constraints;
+    gadt_instances = from.gadt_instances;
+    flags = from.flags;
+  }
+
+let same_constr = ref (fun _ _ _ -> assert false)
+
+(* Helper to decide whether to report an identifier shadowing
+   by some 'open'. For labels and constructors, we do not report
+   if the two elements are from the same re-exported declaration.
+
+   Later, one could also interpret some attributes on value and
+   type declarations to silence the shadowing warnings. *)
+
+let check_shadowing env = function
+  | `Constructor (Some (c1, c2))
+    when not (!same_constr env c1.cstr_res c2.cstr_res) ->
+    Some "constructor"
+  | `Label (Some (l1, l2)) when not (!same_constr env l1.lbl_res l2.lbl_res) ->
+    Some "label"
+  | `Value (Some _) -> Some "value"
+  | `Type (Some _) -> Some "type"
+  | `Module (Some _) | `Component (Some _) -> Some "module"
+  | `Module_type (Some _) -> Some "module type"
+  | `Constructor _ | `Label _
+  | `Value None
+  | `Type None
+  | `Module None
+  | `Module_type None
+  | `Component None ->
+    None
+
+let subst_modtype_maker (subst, md) =
+  if subst == Subst.identity then md
+  else {md with md_type = Subst.modtype subst md.md_type}
+
+let empty =
+  {
+    values = IdTbl.empty;
+    constrs = TycompTbl.empty;
+    labels = TycompTbl.empty;
+    types = IdTbl.empty;
+    modules = IdTbl.empty;
+    modtypes = IdTbl.empty;
+    components = IdTbl.empty;
+    summary = Env_empty;
+    local_constraints = PathMap.empty;
+    gadt_instances = [];
+    flags = 0;
+    functor_args = Ident.empty;
+  }
+
+let in_signature b env =
+  let flags =
+    if b then env.flags lor in_signature_flag
+    else env.flags land lnot in_signature_flag
+  in
+  {env with flags}
+
+let implicit_coercion env =
+  {env with flags = env.flags lor implicit_coercion_flag}
+
+let is_in_signature env = env.flags land in_signature_flag <> 0
+let is_implicit_coercion env = env.flags land implicit_coercion_flag <> 0
+
+let is_ident = function
+  | Pident _ -> true
+  | Pdot _ | Papply _ -> false
+
+let is_local_ext = function
+  | {cstr_tag = Cstr_extension p} -> is_ident p
+  | _ -> false
+
+let diff env1 env2 =
+  IdTbl.diff_keys env1.values env2.values
+  @ TycompTbl.diff_keys is_local_ext env1.constrs env2.constrs
+  @ IdTbl.diff_keys env1.modules env2.modules
+
+type can_load_cmis = Can_load_cmis | Cannot_load_cmis of EnvLazy.log
+
+let can_load_cmis = ref Can_load_cmis
+
+let without_cmis f x =
+  let log = EnvLazy.log () in
+  let res =
+    Misc.(
+      protect_refs [R (can_load_cmis, Cannot_load_cmis log)] (fun () -> f x))
+  in
+  EnvLazy.backtrack log;
+  res
+
+(* Forward declarations *)
+
+let components_of_module' =
+  ref
+    (fun ~deprecated:_ ~loc:_ _env _sub _path _mty -> assert false
+      : deprecated:string option ->
+        loc:Location.t ->
+        t ->
+        Subst.t ->
+        Path.t ->
+        module_type ->
+        module_components)
+let components_of_module_maker' =
+  ref
+    (fun (_env, _sub, _path, _mty) -> assert false
+      : t * Subst.t * Path.t * module_type -> module_components_repr option)
+let components_of_functor_appl' =
+  ref
+    (fun _f _env _p1 _p2 -> assert false
+      : functor_components -> t -> Path.t -> Path.t -> module_components)
+let check_modtype_inclusion =
+  (* to be filled with Includemod.check_modtype_inclusion *)
+  ref
+    (fun ~loc:_ _env _mty1 _path1 _mty2 -> assert false
+      : loc:Location.t -> t -> module_type -> Path.t -> module_type -> unit)
+let strengthen =
+  (* to be filled with Mtype.strengthen *)
+  ref
+    (fun ~aliasable:_ _env _mty _path -> assert false
+      : aliasable:bool -> t -> module_type -> Path.t -> module_type)
+
+let md md_type = {md_type; md_attributes = []; md_loc = Location.none}
+
+let get_components_opt c =
+  match !can_load_cmis with
+  | Can_load_cmis -> EnvLazy.force !components_of_module_maker' c.comps
+  | Cannot_load_cmis log ->
+    EnvLazy.force_logged log !components_of_module_maker' c.comps
+
+let empty_structure =
+  Structure_comps
+    {
+      comp_values = Tbl.empty;
+      comp_constrs = Tbl.empty;
+      comp_labels = Tbl.empty;
+      comp_types = Tbl.empty;
+      comp_modules = Tbl.empty;
+      comp_modtypes = Tbl.empty;
+      comp_components = Tbl.empty;
+    }
+
+let get_components c =
+  match get_components_opt c with
+  | None -> empty_structure
+  | Some c -> c
+
+(* The name of the compilation unit currently compiled.
+   "" if outside a compilation unit. *)
+
+let current_unit = ref ""
+
+(* Persistent structure descriptions *)
+
+type pers_struct = {
+  ps_name: string;
+  ps_sig: signature Lazy.t;
+  ps_comps: module_components;
+  ps_crcs: (string * Digest.t option) list;
+  ps_filename: string;
+  ps_flags: pers_flags list;
+}
+[@@warning "-69"]
+
+let persistent_structures =
+  (Hashtbl.create 17 : (string, pers_struct option) Hashtbl.t)
+
+(* Consistency between persistent structures *)
+
+let crc_units = Consistbl.create ()
+
+module StringSet = Set.Make (struct
+  type t = string
+  let compare = String.compare
+end)
+
+let imported_units = ref StringSet.empty
+
+let add_import s = imported_units := StringSet.add s !imported_units
+
+let clear_imports () =
+  Consistbl.clear crc_units;
+  imported_units := StringSet.empty
+
+let check_consistency ps =
+  try
+    List.iter
+      (fun (name, crco) ->
+        match crco with
+        | None -> ()
+        | Some crc ->
+          add_import name;
+          Consistbl.check crc_units name crc ps.ps_filename)
+      ps.ps_crcs
+  with Consistbl.Inconsistency (name, source, auth) ->
+    error (Inconsistent_import (name, auth, source))
+
+(* Reading persistent structures from .cmi files *)
+
+let save_pers_struct crc ps =
+  let modname = ps.ps_name in
+  Hashtbl.add persistent_structures modname (Some ps);
+  Consistbl.set crc_units modname crc ps.ps_filename;
+  add_import modname
+
+module Persistent_signature = struct
+  type t = {filename: string; cmi: Cmi_format.cmi_infos}
+
+  let load =
+    ref (fun ~unit_name ->
+        match find_in_path_uncap !load_path (unit_name ^ ".cmi") with
+        | filename -> Some {filename; cmi = read_cmi filename}
+        | exception Not_found -> None)
+end
+
+let acknowledge_pers_struct check modname {Persistent_signature.filename; cmi} =
+  let name = cmi.cmi_name in
+  let sign = cmi.cmi_sign in
+  let crcs = cmi.cmi_crcs in
+  let flags = cmi.cmi_flags in
+  let deprecated =
+    List.fold_left
+      (fun _ -> function
+        | Deprecated s -> Some s)
+      None flags
+  in
+  let comps =
+    !components_of_module' ~deprecated ~loc:Location.none empty Subst.identity
+      (Pident (Ident.create_persistent name))
+      (Mty_signature sign)
+  in
+  let ps =
+    {
+      ps_name = name;
+      ps_sig = lazy (Subst.signature Subst.identity sign);
+      ps_comps = comps;
+      ps_crcs = crcs;
+      ps_filename = filename;
+      ps_flags = flags;
+    }
+  in
+  if ps.ps_name <> modname then
+    error (Illegal_renaming (modname, ps.ps_name, filename));
+  if check then check_consistency ps;
+  Hashtbl.add persistent_structures modname (Some ps);
+  ps
+
+let read_pers_struct check modname filename =
+  add_import modname;
+  let cmi = read_cmi filename in
+  acknowledge_pers_struct check modname {Persistent_signature.filename; cmi}
+
+let find_pers_struct check name =
+  if name = "*predef*" then raise Not_found;
+  match Hashtbl.find persistent_structures name with
+  | Some ps -> ps
+  | None -> raise Not_found
+  | exception Not_found -> (
+    match !can_load_cmis with
+    | Cannot_load_cmis _ -> raise Not_found
+    | Can_load_cmis ->
+      let ps =
+        match !Persistent_signature.load ~unit_name:name with
+        | Some ps -> ps
+        | None ->
+          Hashtbl.add persistent_structures name None;
+          raise Not_found
+      in
+      add_import name;
+      acknowledge_pers_struct check name ps)
+
+(* Emits a warning if there is no valid cmi for name *)
+let check_pers_struct name =
+  try ignore (find_pers_struct false name) with
+  | Not_found ->
+    let warn = Warnings.No_cmi_file (name, None) in
+    Location.prerr_warning Location.none warn
+  | Cmi_format.Error err ->
+    let msg = Format.asprintf "%a" Cmi_format.report_error err in
+    let warn = Warnings.No_cmi_file (name, Some msg) in
+    Location.prerr_warning Location.none warn
+  | Error err ->
+    let msg =
+      match err with
+      | Illegal_renaming (name, ps_name, filename) ->
+        Format.asprintf
+          " %a@ contains the compiled interface for @ %s when %s was expected"
+          Location.print_filename filename ps_name name
+      | Inconsistent_import _ -> assert false
+      | Missing_module _ -> assert false
+      | Illegal_value_name _ -> assert false
+    in
+    let warn = Warnings.No_cmi_file (name, Some msg) in
+    Location.prerr_warning Location.none warn
+
+let read_pers_struct modname filename = read_pers_struct true modname filename
+
+let find_pers_struct name = find_pers_struct true name
+
+let check_pers_struct name =
+  if not (Hashtbl.mem persistent_structures name) then (
+    (* PR#6843: record the weak dependency ([add_import]) regardless of
+       whether the check succeeds, to help make builds more
+       deterministic. *)
+    add_import name;
+    if Warnings.is_active (Warnings.No_cmi_file ("", None)) then
+      Delayed_checks.add_delayed_check (fun () -> check_pers_struct name))
+
+let reset_cache () =
+  current_unit := "";
+  Hashtbl.clear persistent_structures;
+  clear_imports ();
+  Hashtbl.clear value_declarations;
+  Hashtbl.clear type_declarations;
+  Hashtbl.clear module_declarations;
+  Hashtbl.clear used_constructors;
+  Hashtbl.clear prefixed_sg
+
+let reset_cache_toplevel () =
+  (* Delete 'missing cmi' entries from the cache. *)
+  let l =
+    Hashtbl.fold
+      (fun name r acc -> if r = None then name :: acc else acc)
+      persistent_structures []
+  in
+  List.iter (Hashtbl.remove persistent_structures) l;
+  Hashtbl.clear value_declarations;
+  Hashtbl.clear type_declarations;
+  Hashtbl.clear module_declarations;
+  Hashtbl.clear used_constructors;
+  Hashtbl.clear prefixed_sg
+
+let set_unit_name name = current_unit := name
+
+let get_unit_name () = !current_unit
+
+(* Lookup by identifier *)
+
+let rec find_module_descr path env =
+  match path with
+  | Pident id -> (
+    try IdTbl.find_same id env.components
+    with Not_found ->
+      if Ident.persistent id && not (Ident.name id = !current_unit) then
+        (find_pers_struct (Ident.name id)).ps_comps
+      else raise Not_found)
+  | Pdot (p, s, _pos) -> (
+    match get_components (find_module_descr p env) with
+    | Structure_comps c ->
+      let descr, _pos = Tbl.find_str s c.comp_components in
+      descr
+    | Functor_comps _ -> raise Not_found)
+  | Papply (p1, p2) -> (
+    match get_components (find_module_descr p1 env) with
+    | Functor_comps f -> !components_of_functor_appl' f env p1 p2
+    | Structure_comps _ -> raise Not_found)
+
+let find proj1 proj2 path env =
+  match path with
+  | Pident id -> IdTbl.find_same id (proj1 env)
+  | Pdot (p, s, _pos) -> (
+    match get_components (find_module_descr p env) with
+    | Structure_comps c ->
+      let data, _pos = Tbl.find_str s (proj2 c) in
+      data
+    | Functor_comps _ -> raise Not_found)
+  | Papply _ -> raise Not_found
+
+let find_value = find (fun env -> env.values) (fun sc -> sc.comp_values)
+
+and find_type_full = find (fun env -> env.types) (fun sc -> sc.comp_types)
+
+and find_modtype = find (fun env -> env.modtypes) (fun sc -> sc.comp_modtypes)
+
+let type_of_cstr path = function
+  | {cstr_inlined = Some d; _} ->
+    (d, ([], List.map snd (Datarepr.labels_of_type path d)))
+  | _ -> assert false
+
+let find_type_full path env =
+  match Path.constructor_typath path with
+  | Regular p -> (
+    try (PathMap.find p env.local_constraints, ([], []))
+    with Not_found -> find_type_full p env)
+  | Cstr (ty_path, s) ->
+    let _, (cstrs, _) =
+      try find_type_full ty_path env with Not_found -> assert false
+    in
+    let cstr =
+      try List.find (fun cstr -> cstr.cstr_name = s) cstrs
+      with Not_found -> assert false
+    in
+    type_of_cstr path cstr
+  | LocalExt id ->
+    let cstr =
+      try TycompTbl.find_same id env.constrs with Not_found -> assert false
+    in
+    type_of_cstr path cstr
+  | Ext (mod_path, s) -> (
+    let comps =
+      try find_module_descr mod_path env with Not_found -> assert false
+    in
+    let comps =
+      match get_components comps with
+      | Structure_comps c -> c
+      | Functor_comps _ -> assert false
+    in
+    let exts =
+      Ext_list.filter
+        (try Tbl.find_str s comps.comp_constrs with Not_found -> assert false)
+        (function
+          | {cstr_tag = Cstr_extension _} -> true
+          | _ -> false)
+    in
+
+    match exts with
+    | [cstr] -> type_of_cstr path cstr
+    | _ -> assert false)
+
+let find_type p env = fst (find_type_full p env)
+let find_type_descrs p env = snd (find_type_full p env)
+
+let find_module ~alias path env =
+  match path with
+  | Pident id -> (
+    try
+      let data = IdTbl.find_same id env.modules in
+      EnvLazy.force subst_modtype_maker data
+    with Not_found ->
+      if Ident.persistent id && not (Ident.name id = !current_unit) then
+        let ps = find_pers_struct (Ident.name id) in
+        md (Mty_signature (Lazy.force ps.ps_sig))
+      else raise Not_found)
+  | Pdot (p, s, _pos) -> (
+    match get_components (find_module_descr p env) with
+    | Structure_comps c ->
+      let data, _pos = Tbl.find_str s c.comp_modules in
+      EnvLazy.force subst_modtype_maker data
+    | Functor_comps _ -> raise Not_found)
+  | Papply (p1, p2) -> (
+    let desc1 = find_module_descr p1 env in
+    match get_components desc1 with
+    | Functor_comps f ->
+      md
+        (match f.fcomp_res with
+        | Mty_alias _ as mty -> mty
+        | mty -> (
+          if alias then mty
+          else
+            try Hashtbl.find f.fcomp_subst_cache p2
+            with Not_found ->
+              let mty =
+                Subst.modtype
+                  (Subst.add_module f.fcomp_param p2 Subst.identity)
+                  f.fcomp_res
+              in
+              Hashtbl.add f.fcomp_subst_cache p2 mty;
+              mty))
+    | Structure_comps _ -> raise Not_found)
+
+let rec normalize_path lax env path =
+  let path =
+    match path with
+    | Pdot (p, s, pos) -> Pdot (normalize_path lax env p, s, pos)
+    | Papply (p1, p2) ->
+      Papply (normalize_path lax env p1, normalize_path true env p2)
+    | _ -> path
+  in
+  try
+    match find_module ~alias:true path env with
+    | {md_type = Mty_alias (_, path1)} -> normalize_path lax env path1
+    | _ -> path
+  with
+  | Not_found
+  when lax
+       ||
+       match path with
+       | Pident id -> not (Ident.persistent id)
+       | _ -> true
+  ->
+    path
+
+let normalize_path oloc env path =
+  try normalize_path (oloc = None) env path
+  with Not_found -> (
+    match oloc with
+    | None -> assert false
+    | Some loc ->
+      raise (Error (Missing_module (loc, path, normalize_path true env path))))
+
+let normalize_path_prefix oloc env path =
+  match path with
+  | Pdot (p, s, pos) -> Pdot (normalize_path oloc env p, s, pos)
+  | Pident _ -> path
+  | Papply _ -> assert false
+
+let find_module = find_module ~alias:false
+
+(* Find the manifest type associated to a type when appropriate:
+   - the type should be public or should have a private row,
+   - the type should have an associated manifest type. *)
+let find_type_expansion path env =
+  let decl = find_type path env in
+  match decl.type_manifest with
+  | Some body
+    when decl.type_private = Public
+         || decl.type_kind <> Type_abstract
+         || Btype.has_constr_row body ->
+    (decl.type_params, body, may_map snd decl.type_newtype_level)
+  (* The manifest type of Private abstract data types without
+     private row are still considered unknown to the type system.
+     Hence, this case is caught by the following clause that also handles
+     purely abstract data types without manifest type definition. *)
+  | _ -> raise Not_found
+
+(* Find the manifest type information associated to a type, i.e.
+   the necessary information for the compiler's type-based optimisations.
+   In particular, the manifest type associated to a private abstract type
+   is revealed for the sake of compiler's type-based optimisations. *)
+let find_type_expansion_opt path env =
+  let decl = find_type path env in
+  match decl.type_manifest with
+  (* The manifest type of Private abstract data types can still get
+     an approximation using their manifest type. *)
+  | Some body -> (decl.type_params, body, may_map snd decl.type_newtype_level)
+  | _ -> raise Not_found
+
+let find_modtype_expansion path env =
+  match (find_modtype path env).mtd_type with
+  | None -> raise Not_found
+  | Some mty -> mty
+
+let rec is_functor_arg path env =
+  match path with
+  | Pident id -> (
+    try
+      Ident.find_same id env.functor_args;
+      true
+    with Not_found -> false)
+  | Pdot (p, _s, _) -> is_functor_arg p env
+  | Papply _ -> true
+
+(* Lookup by name *)
+
+exception Recmodule
+
+let report_deprecated ?loc p deprecated =
+  match (loc, deprecated) with
+  | Some loc, Some txt ->
+    let txt = if txt = "" then "" else "\n" ^ txt in
+    Location.deprecated loc (Printf.sprintf "module %s%s" (Path.name p) txt)
+  | _ -> ()
+
+let mark_module_used env name loc =
+  if not (is_implicit_coercion env) then
+    try Hashtbl.find module_declarations (name, loc) () with Not_found -> ()
+
+let rec lookup_module_descr_aux ?loc lid env =
+  match lid with
+  | Lident s -> (
+    try IdTbl.find_name s env.components
+    with Not_found ->
+      if s = !current_unit then raise Not_found;
+      let ps = find_pers_struct s in
+      (Pident (Ident.create_persistent s), ps.ps_comps))
+  | Ldot (l, s) -> (
+    let p, descr = lookup_module_descr ?loc l env in
+    match get_components descr with
+    | Structure_comps c ->
+      let descr, pos = Tbl.find_str s c.comp_components in
+      (Pdot (p, s, pos), descr)
+    | Functor_comps _ -> raise Not_found)
+  | Lapply (l1, l2) -> (
+    let p1, desc1 = lookup_module_descr ?loc l1 env in
+    let p2 = lookup_module ~load:true ?loc l2 env in
+    let {md_type = mty2} = find_module p2 env in
+    match get_components desc1 with
+    | Functor_comps f ->
+      let loc =
+        match loc with
+        | Some l -> l
+        | None -> Location.none
+      in
+      Misc.may (!check_modtype_inclusion ~loc env mty2 p2) f.fcomp_arg;
+      (Papply (p1, p2), !components_of_functor_appl' f env p1 p2)
+    | Structure_comps _ -> raise Not_found)
+
+and lookup_module_descr ?loc lid env =
+  let ((p, comps) as res) = lookup_module_descr_aux ?loc lid env in
+  mark_module_used env (Path.last p) comps.loc;
+  report_deprecated ?loc p comps.deprecated;
+  res
+
+and lookup_module ~load ?loc lid env : Path.t =
+  match lid with
+  | Lident s -> (
+    try
+      let p, data = IdTbl.find_name s env.modules in
+      let {md_loc; md_attributes; md_type} =
+        EnvLazy.force subst_modtype_maker data
+      in
+      mark_module_used env s md_loc;
+      (match md_type with
+      | Mty_ident (Path.Pident id) when Ident.name id = "#recmod#" ->
+        (* see #5965 *)
+        raise Recmodule
+      | Mty_alias (_, Path.Pident id) ->
+        if (not !Clflags.transparent_modules) && Ident.persistent id then
+          find_pers_struct (Ident.name id) |> ignore
+      | _ -> ());
+      report_deprecated ?loc p
+        (Builtin_attributes.deprecated_of_attrs md_attributes);
+      p
+    with Not_found ->
+      if s = !current_unit then raise Not_found;
+      let p = Pident (Ident.create_persistent s) in
+      (if !Clflags.transparent_modules && not load then check_pers_struct s
+       else
+         let ps = find_pers_struct s in
+         report_deprecated ?loc p ps.ps_comps.deprecated);
+      p)
+  | Ldot (l, s) -> (
+    let p, descr = lookup_module_descr ?loc l env in
+    match get_components descr with
+    | Structure_comps c ->
+      let _data, pos = Tbl.find_str s c.comp_modules in
+      let comps, _ = Tbl.find_str s c.comp_components in
+      mark_module_used env s comps.loc;
+      let p = Pdot (p, s, pos) in
+      report_deprecated ?loc p comps.deprecated;
+      p
+    | Functor_comps _ -> raise Not_found)
+  | Lapply (l1, l2) -> (
+    let p1, desc1 = lookup_module_descr ?loc l1 env in
+    let p2 = lookup_module ~load:true ?loc l2 env in
+    let {md_type = mty2} = find_module p2 env in
+    let p = Papply (p1, p2) in
+    match get_components desc1 with
+    | Functor_comps f ->
+      let loc =
+        match loc with
+        | Some l -> l
+        | None -> Location.none
+      in
+      Misc.may (!check_modtype_inclusion ~loc env mty2 p2) f.fcomp_arg;
+      p
+    | Structure_comps _ -> raise Not_found)
+
+let lookup proj1 proj2 ?loc lid env =
+  match lid with
+  | Lident s -> IdTbl.find_name s (proj1 env)
+  | Ldot (l, s) -> (
+    let p, desc = lookup_module_descr ?loc l env in
+    match get_components desc with
+    | Structure_comps c ->
+      let data, pos = Tbl.find_str s (proj2 c) in
+      (Pdot (p, s, pos), data)
+    | Functor_comps _ -> raise Not_found)
+  | Lapply _ -> raise Not_found
+
+let lookup_all_simple proj1 proj2 shadow ?loc lid env =
+  match lid with
+  | Lident s ->
+    let xl = TycompTbl.find_all s (proj1 env) in
+    let rec do_shadow = function
+      | [] -> []
+      | (x, f) :: xs ->
+        (x, f)
+        :: do_shadow (Ext_list.filter xs (fun (y, _) -> not (shadow x y)))
+    in
+    do_shadow xl
+  | Ldot (l, s) -> (
+    let _p, desc = lookup_module_descr ?loc l env in
+    match get_components desc with
+    | Structure_comps c ->
+      let comps = try Tbl.find_str s (proj2 c) with Not_found -> [] in
+      List.map (fun data -> (data, fun () -> ())) comps
+    | Functor_comps _ -> raise Not_found)
+  | Lapply _ -> raise Not_found
+
+let has_local_constraints env = not (PathMap.is_empty env.local_constraints)
+
+let cstr_shadow cstr1 cstr2 =
+  match (cstr1.cstr_tag, cstr2.cstr_tag) with
+  | Cstr_extension _, Cstr_extension _ -> true
+  | _ -> false
+
+let lbl_shadow _lbl1 _lbl2 = false
+
+let lookup_value = lookup (fun env -> env.values) (fun sc -> sc.comp_values)
+let lookup_all_constructors =
+  lookup_all_simple
+    (fun env -> env.constrs)
+    (fun sc -> sc.comp_constrs)
+    cstr_shadow
+let lookup_all_labels =
+  lookup_all_simple
+    (fun env -> env.labels)
+    (fun sc -> sc.comp_labels)
+    lbl_shadow
+let lookup_type = lookup (fun env -> env.types) (fun sc -> sc.comp_types)
+let lookup_modtype =
+  lookup (fun env -> env.modtypes) (fun sc -> sc.comp_modtypes)
+
+let copy_types l env =
+  let f desc =
+    {desc with val_type = Subst.type_expr Subst.identity desc.val_type}
+  in
+  let values =
+    List.fold_left (fun env s -> IdTbl.update s f env) env.values l
+  in
+  {env with values; summary = Env_copy_types (env.summary, l)}
+
+let mark_value_used env name vd =
+  if not (is_implicit_coercion env) then
+    try Hashtbl.find value_declarations (name, vd.val_loc) ()
+    with Not_found -> ()
+
+let mark_type_used env name vd =
+  if not (is_implicit_coercion env) then
+    try Hashtbl.find type_declarations (name, vd.type_loc) ()
+    with Not_found -> ()
+
+let mark_constructor_used usage env name vd constr =
+  if not (is_implicit_coercion env) then
+    try Hashtbl.find used_constructors (name, vd.type_loc, constr) usage
+    with Not_found -> ()
+
+let mark_extension_used usage env ext name =
+  if not (is_implicit_coercion env) then
+    let ty_name = Path.last ext.ext_type_path in
+    try Hashtbl.find used_constructors (ty_name, ext.ext_loc, name) usage
+    with Not_found -> ()
+
+let set_value_used_callback name vd callback =
+  let key = (name, vd.val_loc) in
+  try
+    let old = Hashtbl.find value_declarations key in
+    Hashtbl.replace value_declarations key (fun () ->
+        old ();
+        callback ())
+    (* this is to support cases like:
+             let x = let x = 1 in x in x
+       where the two declarations have the same location
+       (e.g. resulting from Camlp4 expansion of grammar entries) *)
+  with Not_found -> Hashtbl.add value_declarations key callback
+
+let set_type_used_callback name td callback =
+  let loc = td.type_loc in
+  if loc.Location.loc_ghost then ()
+  else
+    let key = (name, loc) in
+    let old =
+      try Hashtbl.find type_declarations key with Not_found -> assert false
+    in
+    Hashtbl.replace type_declarations key (fun () -> callback old)
+
+let lookup_value ?loc lid env =
+  let ((_, desc) as r) = lookup_value ?loc lid env in
+  mark_value_used env (Longident.last lid) desc;
+  r
+
+let lookup_type ?loc lid env =
+  let path, (decl, _) = lookup_type ?loc lid env in
+  mark_type_used env (Longident.last lid) decl;
+  path
+
+let mark_type_path env path =
+  try
+    let decl = find_type path env in
+    mark_type_used env (Path.last path) decl
+  with Not_found -> ()
+
+let ty_path t =
+  match repr t with
+  | {desc = Tconstr (path, _, _)} -> path
+  | _ -> assert false
+
+let lookup_constructor ?loc lid env =
+  match lookup_all_constructors ?loc lid env with
+  | [] -> raise Not_found
+  | (desc, use) :: _ ->
+    mark_type_path env (ty_path desc.cstr_res);
+    use ();
+    desc
+
+let is_lident = function
+  | Lident _ -> true
+  | _ -> false
+
+let lookup_all_constructors ?loc lid env =
+  try
+    let cstrs = lookup_all_constructors ?loc lid env in
+    let wrap_use desc use () =
+      mark_type_path env (ty_path desc.cstr_res);
+      use ()
+    in
+    List.map (fun (cstr, use) -> (cstr, wrap_use cstr use)) cstrs
+  with Not_found when is_lident lid -> []
+
+let mark_constructor usage env name desc =
+  if not (is_implicit_coercion env) then
+    match desc.cstr_tag with
+    | Cstr_extension _ -> (
+      let ty_path = ty_path desc.cstr_res in
+      let ty_name = Path.last ty_path in
+      try Hashtbl.find used_constructors (ty_name, desc.cstr_loc, name) usage
+      with Not_found -> ())
+    | _ ->
+      let ty_path = ty_path desc.cstr_res in
+      let ty_decl =
+        try find_type ty_path env with Not_found -> assert false
+      in
+      let ty_name = Path.last ty_path in
+      mark_constructor_used usage env ty_name ty_decl name
+
+let lookup_label ?loc lid env =
+  match lookup_all_labels ?loc lid env with
+  | [] -> raise Not_found
+  | (desc, use) :: _ ->
+    mark_type_path env (ty_path desc.lbl_res);
+    use ();
+    desc
+
+let lookup_all_labels ?loc lid env =
+  try
+    let lbls = lookup_all_labels ?loc lid env in
+    let wrap_use desc use () =
+      mark_type_path env (ty_path desc.lbl_res);
+      use ()
+    in
+    List.map (fun (lbl, use) -> (lbl, wrap_use lbl use)) lbls
+  with Not_found when is_lident lid -> []
+
+(* Iter on an environment (ignoring the body of functors and
+   not yet evaluated structures) *)
+
+type iter_cont = unit -> unit
+let iter_env_cont = ref []
+
+let rec scrape_alias_for_visit env mty =
+  match mty with
+  | Mty_alias (_, Pident id)
+    when Ident.persistent id
+         && not (Hashtbl.mem persistent_structures (Ident.name id)) ->
+    false
+  | Mty_alias (_, path) -> (
+    (* PR#6600: find_module may raise Not_found *)
+    try scrape_alias_for_visit env (find_module path env).md_type
+    with Not_found -> false)
+  | _ -> true
+
+let iter_env proj1 proj2 f env () =
+  IdTbl.iter (fun id x -> f (Pident id) x) (proj1 env);
+  let rec iter_components path path' mcomps =
+    let cont () =
+      let visit =
+        match EnvLazy.get_arg mcomps.comps with
+        | None -> true
+        | Some (env, _sub, _path, mty) -> scrape_alias_for_visit env mty
+      in
+      if not visit then ()
+      else
+        match get_components mcomps with
+        | Structure_comps comps ->
+          Tbl.iter
+            (fun s (d, n) -> f (Pdot (path, s, n)) (Pdot (path', s, n), d))
+            (proj2 comps);
+          Tbl.iter
+            (fun s (c, n) ->
+              iter_components (Pdot (path, s, n)) (Pdot (path', s, n)) c)
+            comps.comp_components
+        | Functor_comps _ -> ()
+    in
+    iter_env_cont := (path, cont) :: !iter_env_cont
+  in
+  Hashtbl.iter
+    (fun s pso ->
+      match pso with
+      | None -> ()
+      | Some ps ->
+        let id = Pident (Ident.create_persistent s) in
+        iter_components id id ps.ps_comps)
+    persistent_structures;
+  IdTbl.iter
+    (fun id (path, comps) -> iter_components (Pident id) path comps)
+    env.components
+
+let run_iter_cont l =
+  iter_env_cont := [];
+  List.iter (fun c -> c ()) l;
+  let cont = List.rev !iter_env_cont in
+  iter_env_cont := [];
+  cont
+
+let iter_types f = iter_env (fun env -> env.types) (fun sc -> sc.comp_types) f
+
+let same_types env1 env2 =
+  env1.types == env2.types && env1.components == env2.components
+
+let used_persistent () =
+  let r = ref Concr.empty in
+  Hashtbl.iter
+    (fun s pso -> if pso != None then r := Concr.add s !r)
+    persistent_structures;
+  !r
+
+let find_all_comps proj s (p, mcomps) =
+  match get_components mcomps with
+  | Functor_comps _ -> []
+  | Structure_comps comps -> (
+    try
+      let c, n = Tbl.find_str s (proj comps) in
+      [(Pdot (p, s, n), c)]
+    with Not_found -> [])
+
+let rec find_shadowed_comps path env =
+  match path with
+  | Pident id -> IdTbl.find_all (Ident.name id) env.components
+  | Pdot (p, s, _) ->
+    let l = find_shadowed_comps p env in
+    let l' =
+      List.map (find_all_comps (fun comps -> comps.comp_components) s) l
+    in
+    List.flatten l'
+  | Papply _ -> []
+
+let find_shadowed proj1 proj2 path env =
+  match path with
+  | Pident id -> IdTbl.find_all (Ident.name id) (proj1 env)
+  | Pdot (p, s, _) ->
+    let l = find_shadowed_comps p env in
+    let l' = List.map (find_all_comps proj2 s) l in
+    List.flatten l'
+  | Papply _ -> []
+
+let find_shadowed_types path env =
+  List.map fst
+    (find_shadowed
+       (fun env -> env.types)
+       (fun comps -> comps.comp_types)
+       path env)
+
+(* GADT instance tracking *)
+
+let add_gadt_instance_level lv env =
+  {env with gadt_instances = (lv, ref TypeSet.empty) :: env.gadt_instances}
+
+let is_Tlink = function
+  | {desc = Tlink _} -> true
+  | _ -> false
+
+let gadt_instance_level env t =
+  let rec find_instance = function
+    | [] -> None
+    | (lv, r) :: rem ->
+      if TypeSet.exists is_Tlink !r then
+        (* Should we use set_typeset ? *)
+        r := TypeSet.fold (fun ty -> TypeSet.add (repr ty)) !r TypeSet.empty;
+      if TypeSet.mem t !r then Some lv else find_instance rem
+  in
+  find_instance env.gadt_instances
+
+let add_gadt_instances env lv tl =
+  let r =
+    try List.assoc lv env.gadt_instances with Not_found -> assert false
+  in
+  (* Format.eprintf "Added";
+     List.iter (fun ty -> Format.eprintf "@ %a" !Btype.print_raw ty) tl;
+     Format.eprintf "@."; *)
+  set_typeset r (List.fold_right TypeSet.add tl !r)
+
+(* Only use this after expand_head! *)
+let add_gadt_instance_chain env lv t =
+  let r =
+    try List.assoc lv env.gadt_instances with Not_found -> assert false
+  in
+  let rec add_instance t =
+    let t = repr t in
+    if not (TypeSet.mem t !r) then (
+      (* Format.eprintf "@ %a" !Btype.print_raw t; *)
+      set_typeset r (TypeSet.add t !r);
+      match t.desc with
+      | Tconstr (p, _, memo) -> may add_instance (find_expans Private p !memo)
+      | _ -> ())
+  in
+  (* Format.eprintf "Added chain"; *)
+  add_instance t
+(* Format.eprintf "@." *)
+
+(* Expand manifest module type names at the top of the given module type *)
+
+let rec scrape_alias env ?path mty =
+  match (mty, path) with
+  | Mty_ident p, _ -> (
+    try scrape_alias env (find_modtype_expansion p env) ?path
+    with Not_found -> mty)
+  | Mty_alias (_, path), _ -> (
+    try scrape_alias env (find_module path env).md_type ~path
+    with Not_found ->
+      (*Location.prerr_warning Location.none
+        (Warnings.No_cmi_file (Path.name path));*)
+      mty)
+  | mty, Some path -> !strengthen ~aliasable:true env mty path
+  | _ -> mty
+
+let scrape_alias env mty = scrape_alias env mty
+
+(* Given a signature and a root path, prefix all idents in the signature
+   by the root path and build the corresponding substitution. *)
+
+let rec prefix_idents root pos sub = function
+  | [] -> ([], sub)
+  | Sig_value (id, decl) :: rem ->
+    let p = Pdot (root, Ident.name id, pos) in
+    let nextpos =
+      match decl.val_kind with
+      | Val_prim _ -> pos
+      | _ -> pos + 1
+    in
+    let pl, final_sub = prefix_idents root nextpos sub rem in
+    (p :: pl, final_sub)
+  | Sig_type (id, _, _) :: rem ->
+    let p = Pdot (root, Ident.name id, nopos) in
+    let pl, final_sub = prefix_idents root pos (Subst.add_type id p sub) rem in
+    (p :: pl, final_sub)
+  | Sig_typext (id, _, _) :: rem ->
+    let p = Pdot (root, Ident.name id, pos) in
+    (* we extend the substitution in case of an inlined record *)
+    let pl, final_sub =
+      prefix_idents root (pos + 1) (Subst.add_type id p sub) rem
+    in
+    (p :: pl, final_sub)
+  | Sig_module (id, _, _) :: rem ->
+    let p = Pdot (root, Ident.name id, pos) in
+    let pl, final_sub =
+      prefix_idents root (pos + 1) (Subst.add_module id p sub) rem
+    in
+    (p :: pl, final_sub)
+  | Sig_modtype (id, _) :: rem ->
+    let p = Pdot (root, Ident.name id, nopos) in
+    let pl, final_sub =
+      prefix_idents root pos (Subst.add_modtype id (Mty_ident p) sub) rem
+    in
+    (p :: pl, final_sub)
+  | Sig_class _ :: _ -> assert false
+  | Sig_class_type _ :: _ -> assert false
+
+let prefix_idents root sub sg =
+  if sub = Subst.identity then (
+    let sgs =
+      try Hashtbl.find prefixed_sg root
+      with Not_found ->
+        let sgs = ref [] in
+        Hashtbl.add prefixed_sg root sgs;
+        sgs
+    in
+    try List.assq sg !sgs
+    with Not_found ->
+      let r = prefix_idents root 0 sub sg in
+      sgs := (sg, r) :: !sgs;
+      r)
+  else prefix_idents root 0 sub sg
+
+(* Compute structure descriptions *)
+
+let add_to_tbl id decl tbl =
+  let decls = try Tbl.find_str id tbl with Not_found -> [] in
+  Tbl.add id (decl :: decls) tbl
+
+let rec components_of_module ~deprecated ~loc env sub path mty =
+  {deprecated; loc; comps = EnvLazy.create (env, sub, path, mty)}
+
+and components_of_module_maker (env, sub, path, mty) =
+  match scrape_alias env mty with
+  | Mty_signature sg ->
+    let c =
+      {
+        comp_values = Tbl.empty;
+        comp_constrs = Tbl.empty;
+        comp_labels = Tbl.empty;
+        comp_types = Tbl.empty;
+        comp_modules = Tbl.empty;
+        comp_modtypes = Tbl.empty;
+        comp_components = Tbl.empty;
+      }
+    in
+    let pl, sub = prefix_idents path sub sg in
+    let env = ref env in
+    let pos = ref 0 in
+    List.iter2
+      (fun item path ->
+        match item with
+        | Sig_value (id, decl) -> (
+          let decl' = Subst.value_description sub decl in
+          c.comp_values <- Tbl.add (Ident.name id) (decl', !pos) c.comp_values;
+          match decl.val_kind with
+          | Val_prim _ -> ()
+          | _ -> incr pos)
+        | Sig_type (id, decl, _) ->
+          let decl' = Subst.type_declaration sub decl in
+          Datarepr.set_row_name decl' (Subst.type_path sub (Path.Pident id));
+          let constructors =
+            List.map snd (Datarepr.constructors_of_type path decl')
+          in
+          let labels = List.map snd (Datarepr.labels_of_type path decl') in
+          c.comp_types <-
+            Tbl.add (Ident.name id)
+              ((decl', (constructors, labels)), nopos)
+              c.comp_types;
+          List.iter
+            (fun descr ->
+              c.comp_constrs <- add_to_tbl descr.cstr_name descr c.comp_constrs)
+            constructors;
+          List.iter
+            (fun descr ->
+              c.comp_labels <- add_to_tbl descr.lbl_name descr c.comp_labels)
+            labels;
+          env := store_type_infos id decl !env
+        | Sig_typext (id, ext, _) ->
+          let ext' = Subst.extension_constructor sub ext in
+          let descr = Datarepr.extension_descr path ext' in
+          c.comp_constrs <- add_to_tbl (Ident.name id) descr c.comp_constrs;
+          incr pos
+        | Sig_module (id, md, _) ->
+          let md' = EnvLazy.create (sub, md) in
+          c.comp_modules <- Tbl.add (Ident.name id) (md', !pos) c.comp_modules;
+          let deprecated =
+            Builtin_attributes.deprecated_of_attrs md.md_attributes
+          in
+          let comps =
+            components_of_module ~deprecated ~loc:md.md_loc !env sub path
+              md.md_type
+          in
+          c.comp_components <-
+            Tbl.add (Ident.name id) (comps, !pos) c.comp_components;
+          env := store_module ~check:false id md !env;
+          incr pos
+        | Sig_modtype (id, decl) ->
+          let decl' = Subst.modtype_declaration sub decl in
+          c.comp_modtypes <-
+            Tbl.add (Ident.name id) (decl', nopos) c.comp_modtypes;
+          env := store_modtype id decl !env
+        | Sig_class () -> assert false
+        | Sig_class_type () -> assert false)
+      sg pl;
+    Some (Structure_comps c)
+  | Mty_functor (param, ty_arg, ty_res) ->
+    Some
+      (Functor_comps
+         {
+           fcomp_param = param;
+           (* fcomp_arg and fcomp_res must be prefixed eagerly, because
+              they are interpreted in the outer environment *)
+           fcomp_arg = may_map (Subst.modtype sub) ty_arg;
+           fcomp_res = Subst.modtype sub ty_res;
+           fcomp_cache = Hashtbl.create 17;
+           fcomp_subst_cache = Hashtbl.create 17;
+         })
+  | Mty_ident _ | Mty_alias _ -> None
+
+(* Insertion of bindings by identifier + path *)
+
+and check_usage loc id warn tbl =
+  if (not loc.Location.loc_ghost) && Warnings.is_active (warn "") then (
+    let name = Ident.name id in
+    let key = (name, loc) in
+    if Hashtbl.mem tbl key then ()
+    else
+      let used = ref false in
+      Hashtbl.add tbl key (fun () -> used := true);
+      if not (name = "" || name.[0] = '_' || name.[0] = '#') then
+        Delayed_checks.add_delayed_check (fun () ->
+            if not !used then Location.prerr_warning loc (warn name)))
+
+and check_value_name name loc =
+  (* Note: we could also check here general validity of the
+     identifier, to protect against bad identifiers forged by -pp or
+     -ppx preprocessors. *)
+  if name = "->" then raise (Error (Illegal_value_name (loc, name)))
+  else if String.length name > 0 && name.[0] = '#' then
+    for i = 1 to String.length name - 1 do
+      if name.[i] = '#' then raise (Error (Illegal_value_name (loc, name)))
+    done
+
+and store_value ?check id decl env =
+  check_value_name (Ident.name id) decl.val_loc;
+  may (fun f -> check_usage decl.val_loc id f value_declarations) check;
+  {
+    env with
+    values = IdTbl.add id decl env.values;
+    summary = Env_value (env.summary, id, decl);
+  }
+
+and store_type ~check id info env =
+  let loc = info.type_loc in
+  if check then
+    check_usage loc id
+      (fun s -> Warnings.Unused_type_declaration s)
+      type_declarations;
+  let path = Pident id in
+  let constructors = Datarepr.constructors_of_type path info in
+  let labels = Datarepr.labels_of_type path info in
+  let descrs = (List.map snd constructors, List.map snd labels) in
+
+  (if
+     check
+     && (not loc.Location.loc_ghost)
+     && Warnings.is_active (Warnings.Unused_constructor ("", false, false))
+   then
+     let ty = Ident.name id in
+     List.iter
+       (fun (_, {cstr_name = c; _}) ->
+         let k = (ty, loc, c) in
+         if not (Hashtbl.mem used_constructors k) then (
+           let used = constructor_usages () in
+           Hashtbl.add used_constructors k (add_constructor_usage used);
+           if not (ty = "" || ty.[0] = '_') then
+             Delayed_checks.add_delayed_check (fun () ->
+                 if (not (is_in_signature env)) && not used.cu_positive then
+                   Location.prerr_warning loc
+                     (Warnings.Unused_constructor
+                        (c, used.cu_pattern, used.cu_privatize)))))
+       constructors);
+  {
+    env with
+    constrs =
+      List.fold_right
+        (fun (id, descr) constrs -> TycompTbl.add id descr constrs)
+        constructors env.constrs;
+    labels =
+      List.fold_right
+        (fun (id, descr) labels -> TycompTbl.add id descr labels)
+        labels env.labels;
+    types = IdTbl.add id (info, descrs) env.types;
+    summary = Env_type (env.summary, id, info);
+  }
+
+and store_type_infos id info env =
+  (* Simplified version of store_type that doesn't compute and store
+     constructor and label infos, but simply record the arity and
+     manifest-ness of the type.  Used in components_of_module to
+     keep track of type abbreviations (e.g. type t = float) in the
+     computation of label representations. *)
+  {
+    env with
+    types = IdTbl.add id (info, ([], [])) env.types;
+    summary = Env_type (env.summary, id, info);
+  }
+
+and store_extension ~check id ext env =
+  let loc = ext.ext_loc in
+  (if
+     check
+     && (not loc.Location.loc_ghost)
+     && Warnings.is_active (Warnings.Unused_extension ("", false, false, false))
+   then
+     let ty = Path.last ext.ext_type_path in
+     let n = Ident.name id in
+     let k = (ty, loc, n) in
+     if not (Hashtbl.mem used_constructors k) then (
+       let used = constructor_usages () in
+       Hashtbl.add used_constructors k (add_constructor_usage used);
+       Delayed_checks.add_delayed_check (fun () ->
+           if (not (is_in_signature env)) && not used.cu_positive then
+             Location.prerr_warning loc
+               (Warnings.Unused_extension
+                  (n, ext.ext_is_exception, used.cu_pattern, used.cu_privatize)))));
+  {
+    env with
+    constrs =
+      TycompTbl.add id (Datarepr.extension_descr (Pident id) ext) env.constrs;
+    summary = Env_extension (env.summary, id, ext);
+  }
+
+and store_module ~check id md env =
+  let loc = md.md_loc in
+  if check then
+    check_usage loc id (fun s -> Warnings.Unused_module s) module_declarations;
+
+  let deprecated = Builtin_attributes.deprecated_of_attrs md.md_attributes in
+  {
+    env with
+    modules = IdTbl.add id (EnvLazy.create (Subst.identity, md)) env.modules;
+    components =
+      IdTbl.add id
+        (components_of_module ~deprecated ~loc:md.md_loc env Subst.identity
+           (Pident id) md.md_type)
+        env.components;
+    summary = Env_module (env.summary, id, md);
+  }
+
+and store_modtype id info env =
+  {
+    env with
+    modtypes = IdTbl.add id info env.modtypes;
+    summary = Env_modtype (env.summary, id, info);
+  }
+
+(* Compute the components of a functor application in a path. *)
+
+let components_of_functor_appl f env p1 p2 =
+  try Hashtbl.find f.fcomp_cache p2
+  with Not_found ->
+    let p = Papply (p1, p2) in
+    let sub = Subst.add_module f.fcomp_param p2 Subst.identity in
+    let mty = Subst.modtype sub f.fcomp_res in
+    let comps =
+      components_of_module ~deprecated:None ~loc:Location.none (*???*)
+        env Subst.identity p mty
+    in
+    Hashtbl.add f.fcomp_cache p2 comps;
+    comps
+
+(* Define forward functions *)
+
+let _ =
+  components_of_module' := components_of_module;
+  components_of_functor_appl' := components_of_functor_appl;
+  components_of_module_maker' := components_of_module_maker
+
+(* Insertion of bindings by identifier *)
+
+let add_functor_arg id env =
+  {
+    env with
+    functor_args = Ident.add id () env.functor_args;
+    summary = Env_functor_arg (env.summary, id);
+  }
+
+let add_value ?check id desc env = store_value ?check id desc env
+
+let add_type ~check id info env = store_type ~check id info env
+
+and add_extension ~check id ext env = store_extension ~check id ext env
+
+and add_module_declaration ?(arg = false) ~check id md env =
+  let env = store_module ~check id md env in
+  if arg then add_functor_arg id env else env
+
+and add_modtype id info env = store_modtype id info env
+
+let add_module ?arg id mty env =
+  add_module_declaration ~check:false ?arg id (md mty) env
+
+let add_local_type path info env =
+  {env with local_constraints = PathMap.add path info env.local_constraints}
+
+let add_local_constraint path info elv env =
+  match info with
+  | {type_manifest = Some _; type_newtype_level = Some (lv, _)} ->
+    (* elv is the expansion level, lv is the definition level *)
+    let info = {info with type_newtype_level = Some (lv, elv)} in
+    add_local_type path info env
+  | _ -> assert false
+
+(* Insertion of bindings by name *)
+
+let enter store_fun name data env =
+  let id = Ident.create name in
+  (id, store_fun id data env)
+
+let enter_value ?check = enter (store_value ?check)
+
+and enter_type = enter (store_type ~check:true)
+
+and enter_extension = enter (store_extension ~check:true)
+
+and enter_module_declaration ?arg id md env =
+  add_module_declaration ?arg ~check:true id md env
+(* let (id, env) = enter store_module name md env in
+   (id, add_functor_arg ?arg id env) *)
+
+and enter_modtype = enter store_modtype
+
+let enter_module ?arg s mty env =
+  let id = Ident.create s in
+  (id, enter_module_declaration ?arg id (md mty) env)
+
+(* Insertion of all components of a signature *)
+
+let add_item comp env =
+  match comp with
+  | Sig_value (id, decl) -> add_value id decl env
+  | Sig_type (id, decl, _) -> add_type ~check:false id decl env
+  | Sig_typext (id, ext, _) -> add_extension ~check:false id ext env
+  | Sig_module (id, md, _) -> add_module_declaration ~check:false id md env
+  | Sig_modtype (id, decl) -> add_modtype id decl env
+  | Sig_class () -> env
+  | Sig_class_type () -> env
+
+let rec add_signature sg env =
+  match sg with
+  | [] -> env
+  | comp :: rem -> add_signature rem (add_item comp env)
+
+(* Open a signature path *)
+
+let add_components slot root env0 comps =
+  let add_l w comps env0 = TycompTbl.add_open slot w comps env0 in
+
+  let add w comps env0 = IdTbl.add_open slot w root comps env0 in
+
+  let constrs =
+    add_l (fun x -> `Constructor x) comps.comp_constrs env0.constrs
+  in
+  let labels = add_l (fun x -> `Label x) comps.comp_labels env0.labels in
+
+  let values = add (fun x -> `Value x) comps.comp_values env0.values in
+  let types = add (fun x -> `Type x) comps.comp_types env0.types in
+  let modtypes =
+    add (fun x -> `Module_type x) comps.comp_modtypes env0.modtypes
+  in
+  let components =
+    add (fun x -> `Component x) comps.comp_components env0.components
+  in
+
+  let modules = add (fun x -> `Module x) comps.comp_modules env0.modules in
+
+  {
+    env0 with
+    summary = Env_open (env0.summary, root);
+    constrs;
+    labels;
+    values;
+    types;
+    modtypes;
+    components;
+    modules;
+  }
+
+let open_signature slot root env0 =
+  match get_components (find_module_descr root env0) with
+  | Functor_comps _ -> None
+  | Structure_comps comps -> Some (add_components slot root env0 comps)
+
+(* Open a signature from a file *)
+
+let open_signature ?(used_slot = ref false) ?(loc = Location.none)
+    ?(toplevel = false) ovf root env =
+  if
+    (not toplevel) && ovf = Asttypes.Fresh
+    && (not loc.Location.loc_ghost)
+    && (Warnings.is_active (Warnings.Unused_open "")
+       || Warnings.is_active (Warnings.Open_shadow_identifier ("", ""))
+       || Warnings.is_active (Warnings.Open_shadow_label_constructor ("", "")))
+  then (
+    let used = used_slot in
+    Delayed_checks.add_delayed_check (fun () ->
+        if not !used then (
+          used := true;
+          Location.prerr_warning loc (Warnings.Unused_open (Path.name root))));
+    let shadowed = ref [] in
+    let slot s b =
+      (match check_shadowing env b with
+      | Some kind when not (List.mem (kind, s) !shadowed) ->
+        shadowed := (kind, s) :: !shadowed;
+        let w =
+          match kind with
+          | "label" | "constructor" ->
+            Warnings.Open_shadow_label_constructor (kind, s)
+          | _ -> Warnings.Open_shadow_identifier (kind, s)
+        in
+        Location.prerr_warning loc w
+      | _ -> ());
+      used := true
+    in
+    open_signature (Some slot) root env)
+  else open_signature None root env
+
+(* Read a signature from a file *)
+
+let read_signature modname filename =
+  let ps = read_pers_struct modname filename in
+  Lazy.force ps.ps_sig
+
+(* Return the CRC of the interface of the given compilation unit *)
+
+let crc_of_unit name =
+  let ps = find_pers_struct name in
+  let crco = try List.assoc name ps.ps_crcs with Not_found -> assert false in
+  match crco with
+  | None -> assert false
+  | Some crc -> crc
+
+(* Return the list of imported interfaces with their CRCs *)
+
+let imports () =
+  let dont_record_crc_unit = !Clflags.dont_record_crc_unit in
+  match dont_record_crc_unit with
+  | None -> Consistbl.extract (StringSet.elements !imported_units) crc_units
+  | Some x ->
+    Consistbl.extract
+      (StringSet.fold
+         (fun m acc -> if m = x then acc else m :: acc)
+         !imported_units [])
+      crc_units
+
+(* Save a signature to a file *)
+
+let save_signature_with_imports ?check_exists ~deprecated sg modname filename
+    imports =
+  (*prerr_endline filename;
+    List.iter (fun (name, crc) -> prerr_endline name) imports;*)
+  Btype.cleanup_abbrev ();
+  Subst.reset_for_saving ();
+  let sg = Subst.signature (Subst.for_saving Subst.identity) sg in
+  let flags =
+    match deprecated with
+    | Some s -> [Deprecated s]
+    | None -> []
+  in
+  try
+    let cmi =
+      {cmi_name = modname; cmi_sign = sg; cmi_crcs = imports; cmi_flags = flags}
+    in
+    let crc = create_cmi ?check_exists filename cmi in
+    (* Enter signature in persistent table so that imported_unit()
+       will also return its crc *)
+    let comps =
+      components_of_module ~deprecated ~loc:Location.none empty Subst.identity
+        (Pident (Ident.create_persistent modname))
+        (Mty_signature sg)
+    in
+    let ps =
+      {
+        ps_name = modname;
+        ps_sig = lazy (Subst.signature Subst.identity sg);
+        ps_comps = comps;
+        ps_crcs = (cmi.cmi_name, Some crc) :: imports;
+        ps_filename = filename;
+        ps_flags = cmi.cmi_flags;
+      }
+    in
+    save_pers_struct crc ps;
+    cmi
+  with exn ->
+    remove_file filename;
+    raise exn
+
+let save_signature ?check_exists ~deprecated sg modname filename =
+  save_signature_with_imports ?check_exists ~deprecated sg modname filename
+    (imports ())
+
+(* Folding on environments *)
+
+let find_all proj1 proj2 f lid env acc =
+  match lid with
+  | None ->
+    IdTbl.fold_name
+      (fun name (p, data) acc -> f name p data acc)
+      (proj1 env) acc
+  | Some l -> (
+    let p, desc = lookup_module_descr l env in
+    match get_components desc with
+    | Structure_comps c ->
+      Tbl.fold
+        (fun s (data, pos) acc -> f s (Pdot (p, s, pos)) data acc)
+        (proj2 c) acc
+    | Functor_comps _ -> acc)
+
+let find_all_simple_list proj1 proj2 f lid env acc =
+  match lid with
+  | None -> TycompTbl.fold_name (fun data acc -> f data acc) (proj1 env) acc
+  | Some l -> (
+    let _p, desc = lookup_module_descr l env in
+    match get_components desc with
+    | Structure_comps c ->
+      Tbl.fold
+        (fun _s comps acc ->
+          match comps with
+          | [] -> acc
+          | data :: _ -> f data acc)
+        (proj2 c) acc
+    | Functor_comps _ -> acc)
+
+let fold_modules f lid env acc =
+  match lid with
+  | None ->
+    let acc =
+      IdTbl.fold_name
+        (fun name (p, data) acc ->
+          let data = EnvLazy.force subst_modtype_maker data in
+          f name p data acc)
+        env.modules acc
+    in
+    Hashtbl.fold
+      (fun name ps acc ->
+        match ps with
+        | None -> acc
+        | Some ps ->
+          f name
+            (Pident (Ident.create_persistent name))
+            (md (Mty_signature (Lazy.force ps.ps_sig)))
+            acc)
+      persistent_structures acc
+  | Some l -> (
+    let p, desc = lookup_module_descr l env in
+    match get_components desc with
+    | Structure_comps c ->
+      Tbl.fold
+        (fun s (data, pos) acc ->
+          f s (Pdot (p, s, pos)) (EnvLazy.force subst_modtype_maker data) acc)
+        c.comp_modules acc
+    | Functor_comps _ -> acc)
+
+let fold_values f =
+  find_all (fun env -> env.values) (fun sc -> sc.comp_values) f
+
+and fold_constructors f =
+  find_all_simple_list (fun env -> env.constrs) (fun sc -> sc.comp_constrs) f
+
+and fold_labels f =
+  find_all_simple_list (fun env -> env.labels) (fun sc -> sc.comp_labels) f
+
+and fold_types f = find_all (fun env -> env.types) (fun sc -> sc.comp_types) f
+
+and fold_modtypes f =
+  find_all (fun env -> env.modtypes) (fun sc -> sc.comp_modtypes) f
+
+(* Make the initial environment *)
+let initial_safe_string =
+  Predef.build_initial_env (add_type ~check:false)
+    (add_extension ~check:false)
+    empty
+
+(* Return the environment summary *)
+
+let summary env =
+  if PathMap.is_empty env.local_constraints then env.summary
+  else Env_constraints (env.summary, env.local_constraints)
+
+let last_env = ref empty
+let last_reduced_env = ref empty
+
+let keep_only_summary env =
+  if !last_env == env then !last_reduced_env
+  else
+    let new_env =
+      {
+        empty with
+        summary = env.summary;
+        local_constraints = env.local_constraints;
+        flags = env.flags;
+      }
+    in
+    last_env := env;
+    last_reduced_env := new_env;
+    new_env
+
+let env_of_only_summary env_from_summary env =
+  let new_env = env_from_summary env.summary Subst.identity in
+  {new_env with local_constraints = env.local_constraints; flags = env.flags}
+
+(* Error report *)
+
+open Format
+
+(* taken from https://github.com/rescript-lang/ocaml/blob/d4144647d1bf9bc7dc3aadc24c25a7efa3a67915/typing/env.ml#L1842 *)
+(* modified branches are commented *)
+let report_error ppf = function
+  | Illegal_renaming (name, modname, _filename) ->
+    (* modified *)
+    fprintf ppf
+      "@[You referred to the module %s, but we've found one called %s \
+       instead.@ Is the name's casing right?@]"
+      name modname
+  | Inconsistent_import (name, source1, source2) ->
+    (* modified *)
+    fprintf ppf
+      "@[<v>@[@{<info>It's possible that your build is stale.@}@ Try to clean \
+       the artifacts and build again?@]@,\
+       @,\
+       @[@{<info>Here's the original error message@}@]@,\
+       @]";
+    fprintf ppf
+      "@[<hov>The files %a@ and %a@ make inconsistent assumptions@ over \
+       interface %s@]"
+      Location.print_filename source1 Location.print_filename source2 name
+  | Missing_module (_, path1, path2) ->
+    fprintf ppf "@[@[<hov>";
+    if Path.same path1 path2 then
+      fprintf ppf "Internal path@ %s@ is dangling." (Path.name path1)
+    else
+      fprintf ppf "Internal path@ %s@ expands to@ %s@ which is dangling."
+        (Path.name path1) (Path.name path2);
+    fprintf ppf "@]@ @[%s@ %s@ %s.@]@]" "The compiled interface for module"
+      (Ident.name (Path.head path2))
+      "was not found"
+  | Illegal_value_name (_loc, name) ->
+    fprintf ppf "'%s' is not a valid value identifier." name
+
+let () =
+  Location.register_error_of_exn (function
+    | Error ((Missing_module (loc, _, _) | Illegal_value_name (loc, _)) as err)
+      when loc <> Location.none ->
+      Some (Location.error_of_printer loc report_error err)
+    | Error err -> Some (Location.error_of_printer_file report_error err)
+    | _ -> None)
diff --git a/compiler/ml/env.mli b/compiler/ml/env.mli
new file mode 100644
index 0000000..48eaba1
--- /dev/null
+++ b/compiler/ml/env.mli
@@ -0,0 +1,329 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Environment handling *)
+
+open Types
+
+module PathMap :
+  Map.S with type key = Path.t and type 'a t = 'a Map.Make(Path).t
+
+type summary =
+  | Env_empty
+  | Env_value of summary * Ident.t * value_description
+  | Env_type of summary * Ident.t * type_declaration
+  | Env_extension of summary * Ident.t * extension_constructor
+  | Env_module of summary * Ident.t * module_declaration
+  | Env_modtype of summary * Ident.t * modtype_declaration
+  | Env_open of summary * Path.t
+  | Env_functor_arg of summary * Ident.t
+  | Env_constraints of summary * type_declaration PathMap.t
+  | Env_copy_types of summary * string list
+
+type t
+
+val empty : t
+val initial_safe_string : t
+
+val diff : t -> t -> Ident.t list
+val copy_local : from:t -> t -> t
+
+type type_descriptions = constructor_description list * label_description list
+
+(* For short-paths *)
+type iter_cont
+val iter_types :
+  (Path.t -> Path.t * (type_declaration * type_descriptions) -> unit) ->
+  t ->
+  iter_cont
+val run_iter_cont : iter_cont list -> (Path.t * iter_cont) list
+val same_types : t -> t -> bool
+val used_persistent : unit -> Concr.t
+val find_shadowed_types : Path.t -> t -> Path.t list
+val without_cmis : ('a -> 'b) -> 'a -> 'b
+(* [without_cmis f arg] applies [f] to [arg], but does not
+   allow opening cmis during its execution *)
+
+(* Lookup by paths *)
+
+val find_value : Path.t -> t -> value_description
+val find_type : Path.t -> t -> type_declaration
+val find_type_descrs : Path.t -> t -> type_descriptions
+val find_module : Path.t -> t -> module_declaration
+val find_modtype : Path.t -> t -> modtype_declaration
+
+val find_type_expansion : Path.t -> t -> type_expr list * type_expr * int option
+val find_type_expansion_opt :
+  Path.t -> t -> type_expr list * type_expr * int option
+
+(* Find the manifest type information associated to a type for the sake
+   of the compiler's type-based optimisations. *)
+val find_modtype_expansion : Path.t -> t -> module_type
+val add_functor_arg : Ident.t -> t -> t
+val is_functor_arg : Path.t -> t -> bool
+val normalize_path : Location.t option -> t -> Path.t -> Path.t
+
+(* Normalize the path to a concrete value or module.
+   If the option is None, allow returning dangling paths.
+   Otherwise raise a Missing_module error, and may add forgotten
+   head as required global. *)
+val normalize_path_prefix : Location.t option -> t -> Path.t -> Path.t
+(* Only normalize the prefix part of the path *)
+
+val has_local_constraints : t -> bool
+val add_gadt_instance_level : int -> t -> t
+val gadt_instance_level : t -> type_expr -> int option
+val add_gadt_instances : t -> int -> type_expr list -> unit
+val add_gadt_instance_chain : t -> int -> type_expr -> unit
+
+(* Lookup by long identifiers *)
+
+(* ?loc is used to report 'deprecated module' warnings *)
+
+val lookup_value :
+  ?loc:Location.t -> Longident.t -> t -> Path.t * value_description
+val lookup_constructor :
+  ?loc:Location.t -> Longident.t -> t -> constructor_description
+val lookup_all_constructors :
+  ?loc:Location.t ->
+  Longident.t ->
+  t ->
+  (constructor_description * (unit -> unit)) list
+val lookup_label : ?loc:Location.t -> Longident.t -> t -> label_description
+val lookup_all_labels :
+  ?loc:Location.t ->
+  Longident.t ->
+  t ->
+  (label_description * (unit -> unit)) list
+val lookup_type : ?loc:Location.t -> Longident.t -> t -> Path.t
+(* Since 4.04, this function no longer returns [type_description].
+   To obtain it, you should either call [Env.find_type], or replace
+   it by [Typetexp.find_type] *)
+
+val lookup_module : load:bool -> ?loc:Location.t -> Longident.t -> t -> Path.t
+val lookup_modtype :
+  ?loc:Location.t -> Longident.t -> t -> Path.t * modtype_declaration
+
+val copy_types : string list -> t -> t
+(* Used only in Typecore.duplicate_ident_types. *)
+
+exception Recmodule
+(* Raise by lookup_module when the identifier refers
+   to one of the modules of a recursive definition
+   during the computation of its approximation (see #5965). *)
+
+(* Insertion by identifier *)
+
+val add_value :
+  ?check:(string -> Warnings.t) -> Ident.t -> value_description -> t -> t
+val add_type : check:bool -> Ident.t -> type_declaration -> t -> t
+val add_extension : check:bool -> Ident.t -> extension_constructor -> t -> t
+val add_module : ?arg:bool -> Ident.t -> module_type -> t -> t
+val add_module_declaration :
+  ?arg:bool -> check:bool -> Ident.t -> module_declaration -> t -> t
+val add_modtype : Ident.t -> modtype_declaration -> t -> t
+
+val add_local_constraint : Path.t -> type_declaration -> int -> t -> t
+val add_local_type : Path.t -> type_declaration -> t -> t
+
+(* Insertion of all fields of a signature. *)
+
+val add_item : signature_item -> t -> t
+val add_signature : signature -> t -> t
+
+(* Insertion of all fields of a signature, relative to the given path.
+   Used to implement open. Returns None if the path refers to a functor,
+   not a structure. *)
+val open_signature :
+  ?used_slot:bool ref ->
+  ?loc:Location.t ->
+  ?toplevel:bool ->
+  Asttypes.override_flag ->
+  Path.t ->
+  t ->
+  t option
+
+(* Insertion by name *)
+
+val enter_value :
+  ?check:(string -> Warnings.t) ->
+  string ->
+  value_description ->
+  t ->
+  Ident.t * t
+val enter_type : string -> type_declaration -> t -> Ident.t * t
+val enter_extension : string -> extension_constructor -> t -> Ident.t * t
+val enter_module : ?arg:bool -> string -> module_type -> t -> Ident.t * t
+val enter_module_declaration :
+  ?arg:bool -> Ident.t -> module_declaration -> t -> t
+val enter_modtype : string -> modtype_declaration -> t -> Ident.t * t
+
+(* Initialize the cache of in-core module interfaces. *)
+val reset_cache : unit -> unit
+
+(* To be called before each toplevel phrase. *)
+val reset_cache_toplevel : unit -> unit
+
+(* Remember the name of the current compilation unit. *)
+val set_unit_name : string -> unit
+val get_unit_name : unit -> string
+
+(* Read, save a signature to/from a file *)
+
+val read_signature : string -> string -> signature
+(* Arguments: module name, file name. Results: signature. *)
+
+val save_signature :
+  ?check_exists:unit ->
+  deprecated:string option ->
+  signature ->
+  string ->
+  string ->
+  Cmi_format.cmi_infos
+(* Arguments: signature, module name, file name. *)
+
+val save_signature_with_imports :
+  ?check_exists:unit ->
+  deprecated:string option ->
+  signature ->
+  string ->
+  string ->
+  (string * Digest.t option) list ->
+  Cmi_format.cmi_infos
+(* Arguments: signature, module name, file name,
+   imported units with their CRCs. *)
+
+(* Return the CRC of the interface of the given compilation unit *)
+
+val crc_of_unit : string -> Digest.t
+
+(* Return the set of compilation units imported, with their CRC *)
+
+val imports : unit -> (string * Digest.t option) list
+
+(* Direct access to the table of imported compilation units with their CRC *)
+
+val crc_units : Consistbl.t
+val add_import : string -> unit
+
+(* Summaries -- compact representation of an environment, to be
+   exported in debugging information. *)
+
+val summary : t -> summary
+
+(* Return an equivalent environment where all fields have been reset,
+   except the summary. The initial environment can be rebuilt from the
+   summary, using Envaux.env_of_only_summary. *)
+
+val keep_only_summary : t -> t
+val env_of_only_summary : (summary -> Subst.t -> t) -> t -> t
+
+(* Error report *)
+
+type error =
+  | Illegal_renaming of string * string * string
+  | Inconsistent_import of string * string * string
+  | Missing_module of Location.t * Path.t * Path.t
+  | Illegal_value_name of Location.t * string
+
+exception Error of error
+
+open Format
+
+val report_error : formatter -> error -> unit
+
+val mark_value_used : t -> string -> value_description -> unit
+val mark_module_used : t -> string -> Location.t -> unit
+val mark_type_used : t -> string -> type_declaration -> unit
+
+type constructor_usage = Positive | Pattern | Privatize
+val mark_constructor_used :
+  constructor_usage -> t -> string -> type_declaration -> string -> unit
+val mark_constructor :
+  constructor_usage -> t -> string -> constructor_description -> unit
+val mark_extension_used :
+  constructor_usage -> t -> extension_constructor -> string -> unit
+
+val in_signature : bool -> t -> t
+val implicit_coercion : t -> t
+
+val is_in_signature : t -> bool
+
+val set_value_used_callback :
+  string -> value_description -> (unit -> unit) -> unit
+val set_type_used_callback :
+  string -> type_declaration -> ((unit -> unit) -> unit) -> unit
+
+(* Forward declaration to break mutual recursion with Includemod. *)
+val check_modtype_inclusion :
+  (loc:Location.t -> t -> module_type -> Path.t -> module_type -> unit) ref
+
+(* Forward declaration to break mutual recursion with Mtype. *)
+val strengthen :
+  (aliasable:bool -> t -> module_type -> Path.t -> module_type) ref
+
+(* Forward declaration to break mutual recursion with Ctype. *)
+val same_constr : (t -> type_expr -> type_expr -> bool) ref
+
+(** Folding over all identifiers (for analysis purpose) *)
+
+val fold_values :
+  (string -> Path.t -> value_description -> 'a -> 'a) ->
+  Longident.t option ->
+  t ->
+  'a ->
+  'a
+val fold_types :
+  (string -> Path.t -> type_declaration * type_descriptions -> 'a -> 'a) ->
+  Longident.t option ->
+  t ->
+  'a ->
+  'a
+val fold_constructors :
+  (constructor_description -> 'a -> 'a) -> Longident.t option -> t -> 'a -> 'a
+val fold_labels :
+  (label_description -> 'a -> 'a) -> Longident.t option -> t -> 'a -> 'a
+
+val fold_modules :
+  (string -> Path.t -> module_declaration -> 'a -> 'a) ->
+  Longident.t option ->
+  t ->
+  'a ->
+  'a
+(** Persistent structures are only traversed if they are already loaded. *)
+
+val fold_modtypes :
+  (string -> Path.t -> modtype_declaration -> 'a -> 'a) ->
+  Longident.t option ->
+  t ->
+  'a ->
+  'a
+
+val scrape_alias : t -> module_type -> module_type
+(** Utilities *)
+
+val check_value_name : string -> Location.t -> unit
+
+module Persistent_signature : sig
+  type t = {
+    filename: string;  (** Name of the file containing the signature. *)
+    cmi: Cmi_format.cmi_infos;
+  }
+
+  val load : (unit_name:string -> t option) ref
+  (** Function used to load a persistent signature. The default is to look for
+      the .cmi file in the load path. This function can be overridden to load
+      it from memory, for instance to build a self-contained toplevel. *)
+end
diff --git a/compiler/ml/error_message_utils.ml b/compiler/ml/error_message_utils.ml
new file mode 100644
index 0000000..1805844
--- /dev/null
+++ b/compiler/ml/error_message_utils.ml
@@ -0,0 +1,932 @@
+type extract_concrete_typedecl =
+  Env.t -> Types.type_expr -> Path.t * Path.t * Types.type_declaration
+
+let configured_jsx_module : string option ref = ref None
+
+let with_configured_jsx_module s =
+  match !configured_jsx_module with
+  | None -> s
+  | Some module_name -> module_name ^ "." ^ s
+
+module Parser : sig
+  type comment
+
+  val extract_text_at_loc : Location.t -> string
+
+  val parse_source : (string -> Parsetree.structure * comment list) ref
+
+  val reprint_source : (Parsetree.structure -> comment list -> string) ref
+
+  val parse_expr_at_loc :
+    Warnings.loc -> (Parsetree.expression * comment list) option
+
+  val reprint_expr_at_loc :
+    ?mapper:(Parsetree.expression -> Parsetree.expression option) ->
+    Warnings.loc ->
+    string option
+end = struct
+  type comment
+
+  let parse_source : (string -> Parsetree.structure * comment list) ref =
+    ref (fun _ -> ([], []))
+
+  let reprint_source : (Parsetree.structure -> comment list -> string) ref =
+    ref (fun _ _ -> "")
+
+  let extract_location_string ~src (loc : Location.t) =
+    let start_pos = loc.loc_start in
+    let end_pos = loc.loc_end in
+    let start_offset = start_pos.pos_cnum in
+    let end_offset = end_pos.pos_cnum in
+    String.sub src start_offset (end_offset - start_offset)
+
+  let extract_text_at_loc loc =
+    if loc.Location.loc_start.pos_fname = "_none_" then ""
+    else
+      try
+        (* TODO: Maybe cache later on *)
+        let src = Ext_io.load_file loc.Location.loc_start.pos_fname in
+        extract_location_string ~src loc
+      with _ -> ""
+
+  let parse_expr_at_loc loc =
+    let sub_src = extract_text_at_loc loc in
+    let parsed, comments = !parse_source sub_src in
+    match parsed with
+    | [{Parsetree.pstr_desc = Pstr_eval (exp, _)}] -> Some (exp, comments)
+    | _ -> None
+
+  let wrap_in_structure exp =
+    [{Parsetree.pstr_desc = Pstr_eval (exp, []); pstr_loc = Location.none}]
+
+  let reprint_expr_at_loc ?(mapper = fun _ -> None) loc =
+    match parse_expr_at_loc loc with
+    | Some (exp, comments) -> (
+      match mapper exp with
+      | Some exp ->
+        Some (!reprint_source (wrap_in_structure exp) comments |> String.trim)
+      | None -> None)
+    | None -> None
+end
+
+let type_expr ppf typ =
+  (* print a type and avoid infinite loops *)
+  Printtyp.reset_and_mark_loops typ;
+  Printtyp.type_expr ppf typ
+
+type jsx_prop_error_info = {
+  fields: Types.label_declaration list;
+  props_record_path: Path.t;
+  jsx_type: [`Fragment | `CustomComponent | `LowercaseComponent];
+}
+
+type type_clash_statement = FunctionCall
+type type_clash_context =
+  | SetRecordField of string (* field name *)
+  | RecordField of {
+      jsx: jsx_prop_error_info option;
+      record_type: Types.type_expr;
+      field_name: string;
+      optional: bool;
+    }
+  | ArrayValue
+  | MaybeUnwrapOption
+  | IfCondition
+  | AssertCondition
+  | IfReturn
+  | TernaryReturn
+  | SwitchReturn
+  | LetUnwrapReturn
+  | TryReturn
+  | StringConcat
+  | ComparisonOperator
+  | WhileCondition
+  | MathOperator of {
+      for_float: bool;
+      operator: string;
+      is_constant: string option;
+    }
+  | FunctionArgument of {optional: bool; name: string option}
+  | BracedIdent
+  | Statement of type_clash_statement
+  | ForLoopCondition
+  | Await
+
+let context_to_string = function
+  | Some WhileCondition -> "WhileCondition"
+  | Some ForLoopCondition -> "ForLoopCondition"
+  | Some AssertCondition -> "AssertCondition"
+  | Some IfCondition -> "IfCondition"
+  | Some (Statement _) -> "Statement"
+  | Some (MathOperator _) -> "MathOperator"
+  | Some ArrayValue -> "ArrayValue"
+  | Some (SetRecordField _) -> "SetRecordField"
+  | Some (RecordField _) -> "RecordField"
+  | Some MaybeUnwrapOption -> "MaybeUnwrapOption"
+  | Some SwitchReturn -> "SwitchReturn"
+  | Some TryReturn -> "TryReturn"
+  | Some StringConcat -> "StringConcat"
+  | Some (FunctionArgument _) -> "FunctionArgument"
+  | Some ComparisonOperator -> "ComparisonOperator"
+  | Some IfReturn -> "IfReturn"
+  | Some TernaryReturn -> "TernaryReturn"
+  | Some Await -> "Await"
+  | Some BracedIdent -> "BracedIdent"
+  | Some LetUnwrapReturn -> "LetUnwrapReturn"
+  | None -> "None"
+
+let fprintf = Format.fprintf
+
+let error_type_text ppf type_clash_context =
+  let text =
+    match type_clash_context with
+    | Some (Statement FunctionCall) -> "This function call returns:"
+    | Some (MathOperator {is_constant = Some _}) -> "This value has type:"
+    | Some ArrayValue -> "This array item has type:"
+    | Some (SetRecordField _) ->
+      "You're assigning something to this field that has type:"
+    | _ -> "This has type:"
+  in
+  fprintf ppf "%s" text
+
+let error_expected_type_text ppf type_clash_context =
+  match type_clash_context with
+  | Some (FunctionArgument {optional; name}) ->
+    fprintf ppf "But this%s function argument"
+      (match optional with
+      | false -> ""
+      | true -> " optional");
+
+    (match name with
+    | Some name -> fprintf ppf " @{<info>~%s@}" name
+    | None -> ());
+
+    fprintf ppf " is expecting:"
+  | Some ComparisonOperator ->
+    fprintf ppf "But it's being compared to something of type:"
+  | Some SwitchReturn -> fprintf ppf "But this switch is expected to return:"
+  | Some LetUnwrapReturn ->
+    fprintf ppf "But this @{<info>let?@} is used where this type is expected:"
+  | Some TryReturn -> fprintf ppf "But this try/catch is expected to return:"
+  | Some WhileCondition ->
+    fprintf ppf "But a @{<info>while@} loop condition must always be of type:"
+  | Some ForLoopCondition ->
+    fprintf ppf "But a @{<info>for@} loop bounds must always be of type:"
+  | Some IfCondition ->
+    fprintf ppf "But @{<info>if@} conditions must always be of type:"
+  | Some AssertCondition -> fprintf ppf "But assertions must always be of type:"
+  | Some IfReturn ->
+    fprintf ppf "But this @{<info>if@} statement is expected to return:"
+  | Some TernaryReturn -> fprintf ppf "But this ternary is expected to return:"
+  | Some ArrayValue ->
+    fprintf ppf "But this array is expected to have items of type:"
+  | Some (SetRecordField _) -> fprintf ppf "But the record field is of type:"
+  | Some
+      (RecordField {field_name = "children"; jsx = Some {jsx_type = `Fragment}})
+    ->
+    fprintf ppf "But children of JSX fragments must be of type:"
+  | Some
+      (RecordField
+         {field_name = "children"; jsx = Some {jsx_type = `CustomComponent}}) ->
+    fprintf ppf "But children passed to this component must be of type:"
+  | Some (RecordField {field_name; jsx = Some _}) ->
+    fprintf ppf "But the component prop @{<info>%s@} is expected to have type:"
+      field_name
+  | Some (RecordField {field_name}) ->
+    fprintf ppf "But the record field @{<info>%s@} is expected to have type:"
+      field_name
+  | Some (Statement FunctionCall) -> fprintf ppf "But it's expected to return:"
+  | Some (MathOperator {operator}) ->
+    fprintf ppf
+      "But it's being used with the @{<info>%s@} operator, which works on:"
+      operator
+  | Some StringConcat -> fprintf ppf "But string concatenation is expecting:"
+  | Some Await ->
+    fprintf ppf
+      "But you're using @{<info>await@} on this expression, so it is expected \
+       to be of type:"
+  | Some MaybeUnwrapOption | Some BracedIdent | None ->
+    fprintf ppf "But it's expected to have type:"
+
+let is_record_type ~(extract_concrete_typedecl : extract_concrete_typedecl) ~env
+    ty =
+  try
+    match extract_concrete_typedecl env ty with
+    | _, _, {Types.type_kind = Type_record _; _} -> true
+    | _ -> false
+  with _ -> false
+
+let is_variant_type ~(extract_concrete_typedecl : extract_concrete_typedecl)
+    ~env ty =
+  try
+    match extract_concrete_typedecl env ty with
+    | _, _, {Types.type_kind = Type_variant _; _} -> true
+    | _ -> false
+  with _ -> false
+
+let get_variant_constructors
+    ~(extract_concrete_typedecl : extract_concrete_typedecl) ~env ty =
+  match extract_concrete_typedecl env ty with
+  | _, _, {Types.type_kind = Type_variant constructors; _} -> constructors
+  | _ -> []
+
+let extract_string_constant text =
+  match !Parser.parse_source text with
+  | ( [
+        {
+          Parsetree.pstr_desc =
+            Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string (s, _))}, _);
+        };
+      ],
+      _ ) ->
+    Some s
+  | _ -> None
+
+let print_extra_type_clash_help ~extract_concrete_typedecl ~env loc ppf
+    (bottom_aliases : (Types.type_expr * Types.type_expr) option) trace
+    type_clash_context =
+  match (type_clash_context, bottom_aliases) with
+  | Some (MathOperator {for_float; operator; is_constant}), _ -> (
+    let operator_for_other_type =
+      match operator with
+      | "+" -> "+."
+      | "+." -> "+"
+      | "/" -> "/."
+      | "/." -> "/"
+      | "-" -> "-."
+      | "*" -> "*."
+      | "*." -> "*"
+      | v -> v
+    in
+    let operator_text =
+      match operator.[0] with
+      | '+' -> "add"
+      | '-' -> "subtract"
+      | '/' -> "divide"
+      | '*' -> "multiply"
+      | _ -> "compute"
+    in
+    (* TODO check int vs float explicitly before showing this *)
+    (match (operator, bottom_aliases) with
+    | "+", Some ({Types.desc = Tconstr (p1, _, _)}, {desc = Tconstr (p2, _, _)})
+      when Path.same Predef.path_string p1 || Path.same Predef.path_string p2 ->
+      fprintf ppf
+        "\n\n\
+        \  Are you looking to concatenate strings? Use the operator \
+         @{<info>++@}, which concatenates strings.\n\n\
+        \  Possible solutions:\n\
+        \  - Change the @{<info>+@} operator to @{<info>++@} to concatenate \
+         strings instead."
+    | _ ->
+      fprintf ppf
+        "\n\n\
+        \  Floats and ints have their own mathematical operators. This means \
+         you cannot %s a float and an int without converting between the two.\n\n\
+        \  Possible solutions:\n\
+        \  - Ensure all values in this calculation have the type @{<info>%s@}. \
+         You can convert between floats and ints via @{<info>Float.toInt@} and \
+         @{<info>Int.fromFloat@}."
+        operator_text
+        (if for_float then "float" else "int"));
+    match (is_constant, bottom_aliases) with
+    | Some constant, _ ->
+      if for_float then
+        fprintf ppf
+          "\n\
+          \  - Make @{<info>%s@} a @{<info>float@} by adding a trailing dot: \
+           @{<info>%s.@}"
+          constant constant
+      else
+        fprintf ppf
+          "\n\
+          \  - Make @{<info>%s@} an @{<info>int@} by removing the dot or \
+           explicitly converting to int"
+          constant
+    | _, Some ({Types.desc = Tconstr (p1, _, _)}, {desc = Tconstr (p2, _, _)})
+      -> (
+      match (Path.name p1, Path.name p2) with
+      | "float", "int" | "int", "float" ->
+        fprintf ppf
+          "\n\
+          \  - Change the operator to @{<info>%s@}, which works on @{<info>%s@}"
+          operator_for_other_type
+          (if for_float then "int" else "float")
+      | _ -> ())
+    | _ -> ())
+  | Some SwitchReturn, _ ->
+    fprintf ppf
+      "\n\n\
+      \  All branches in a @{<info>switch@} must return the same type.@,\
+       To fix this, change your branch to return the expected type."
+  | Some LetUnwrapReturn, bottom_aliases -> (
+    let kind =
+      match bottom_aliases with
+      | Some ({Types.desc = Tconstr (p, _, _)}, _)
+        when Path.same p Predef.path_option ->
+        `Option
+      | Some (_, {Types.desc = Tconstr (p, _, _)})
+        when Path.same p Predef.path_option ->
+        `Option
+      | Some ({Types.desc = Tconstr (p, _, _)}, _)
+        when Path.same p Predef.path_result ->
+        `Result
+      | Some (_, {Types.desc = Tconstr (p, _, _)})
+        when Path.same p Predef.path_result ->
+        `Result
+      | _ -> `Unknown
+    in
+    match kind with
+    | `Option ->
+      fprintf ppf
+        "\n\n\
+        \  This @{<info>let?@} unwraps an @{<info>option@}; use it where the \
+         enclosing function or let binding returns an @{<info>option@} so \
+         @{<info>None@} can propagate.\n\n\
+        \  Possible solutions:\n\
+        \  - Change the enclosing function or let binding to return \
+         @{<info>option<'t>@} and use @{<info>Some@} for success; \
+         @{<info>let?@} will propagate @{<info>None@}.\n\
+        \  - Replace @{<info>let?@} with a @{<info>switch@} and handle the \
+         @{<info>None@} case explicitly.\n\
+        \  - If you want a default value instead of early return, unwrap using \
+         @{<info>Option.getOr(default)@}."
+    | `Result ->
+      fprintf ppf
+        "\n\n\
+        \  This @{<info>let?@} unwraps a @{<info>result@}; use it where the \
+         enclosing function or let binding returns a @{<info>result@} so \
+         @{<info>Error@} can propagate.\n\n\
+        \  Possible solutions:\n\
+        \  - Change the enclosing function or let binding to return \
+         @{<info>result<'ok, 'error>@}; use @{<info>Ok@} for success, and \
+         @{<info>let?@} will propagate @{<info>Error@}.\n\
+        \  - Replace @{<info>let?@} with a @{<info>switch@} and handle the \
+         @{<info>Error@} case explicitly.\n\
+        \  - If you want a default value instead of early return, unwrap using \
+         @{<info>Result.getOr(default)@}."
+    | `Unknown ->
+      fprintf ppf
+        "\n\n\
+        \  @{<info>let?@} can only be used in a context that expects \
+         @{<info>option@} or @{<info>result@}.\n\n\
+        \  Possible solutions:\n\
+        \  - Change the enclosing function or let binding to return an \
+         @{<info>option<'t>@} or @{<info>result<'ok, 'error>@} and propagate \
+         with @{<info>Some/Ok@}.\n\
+        \  - Replace @{<info>let?@} with a @{<info>switch@} and handle the \
+         @{<info>None/Error@} case explicitly.\n\
+        \  - If you want a default value instead of early return, unwrap using \
+         @{<info>Option.getOr(default)@} or @{<info>Result.getOr(default)@}.")
+  | Some TryReturn, _ ->
+    fprintf ppf
+      "\n\n\
+      \  The @{<info>try@} body and the @{<info>catch@} block must return the \
+       same type.@,\
+       To fix this, change your try/catch blocks to return the expected type."
+  | Some IfCondition, _ ->
+    fprintf ppf
+      "\n\n\
+      \  To fix this, change the highlighted code so it evaluates to a \
+       @{<info>bool@}."
+  | Some Await, _ ->
+    fprintf ppf
+      "\n\n\
+      \  You're trying to await something that is not a promise.\n\n\
+       Possible solutions:\n\
+      \  - Remove the @{<info>await@} if this is not expected to be a promise\n\
+      \  - Wrap the expression in @{<info>Promise.resolve@} to convert the \
+       expression to a promise"
+  | Some IfReturn, _ ->
+    fprintf ppf
+      "\n\n\
+      \  @{<info>if@} expressions must return the same type in all branches \
+       (@{<info>if@}, @{<info>else if@}, @{<info>else@})."
+  | Some TernaryReturn, _ ->
+    fprintf ppf
+      "\n\n\
+      \  Ternaries (@{<info>?@} and @{<info>:@}) must return the same type in \
+       both branches."
+  | Some MaybeUnwrapOption, _ ->
+    fprintf ppf
+      "\n\n\
+      \  Possible solutions:\n\
+      \  - Unwrap the option to its underlying value using \
+       `yourValue->Option.getOr(someDefaultValue)`"
+  | Some ComparisonOperator, _ ->
+    fprintf ppf "\n\n  You can only compare things of the same type."
+  | Some ArrayValue, _ ->
+    fprintf ppf
+      "\n\n\
+      \  Arrays can only contain items of the same type.\n\n\
+      \  Possible solutions:\n\
+      \  - Convert all values in the array to the same type.\n\
+      \  - Use a tuple, if your array is of fixed length. Tuples can mix types \
+       freely, and compiles to a JavaScript array. Example of a tuple: `let \
+       myTuple = (10, \"hello\", 15.5, true)"
+  | _, Some (_, {desc = Tconstr (p2, _, _)}) when Path.same Predef.path_dict p2
+    ->
+    fprintf ppf
+      "@,@,Dicts are written like: @{<info>dict{\"a\": 1, \"b\": 2}@}@,"
+  | ( _,
+      Some
+        (({Types.desc = Tconstr (_p1, _, _)} as ty), {desc = Tconstr (p2, _, _)})
+    )
+    when Path.same Predef.path_unit p2 ->
+    fprintf ppf "\n\n";
+    let is_jsx_element =
+      match Ctype.expand_head env ty with
+      | {desc = Tconstr (Pdot (Pident {name = "Jsx"}, "element", _), _, _)} ->
+        true
+      | _ -> false
+    in
+    if is_jsx_element then
+      fprintf ppf
+        "  - Did you forget to wrap this + adjacent JSX in a JSX fragment \
+         (@{<info><></>@})?\n\
+        \  - Did you mean to assign this to a variable?\n\n"
+    else
+      fprintf ppf
+        "  - Did you mean to assign this to a variable?\n\
+        \  - If you don't care about the result of this expression, you can \
+         assign it to @{<info>_@} via @{<info>let _ = ...@} or pipe it to \
+         @{<info>ignore@} via @{<info>expression->ignore@}\n\n"
+  | _, Some ({desc = Tobject _}, ({Types.desc = Tconstr _} as t1))
+    when is_record_type ~extract_concrete_typedecl ~env t1 ->
+    fprintf ppf
+      "@,\
+       @,\
+       You're passing a @{<error>ReScript object@} where a @{<info>record@} is \
+       expected. Objects are written with quoted keys, and records with \
+       unquoted keys.";
+
+    let suggested_rewrite =
+      Parser.reprint_expr_at_loc loc ~mapper:(fun exp ->
+          match exp.Parsetree.pexp_desc with
+          | Pexp_extension
+              ( {txt = "obj"},
+                PStr
+                  [
+                    {
+                      pstr_desc =
+                        Pstr_eval (({pexp_desc = Pexp_record _} as record), _);
+                    };
+                  ] ) ->
+            Some record
+          | _ -> None)
+    in
+    fprintf ppf
+      "@,\
+       @,\
+       Possible solutions: @,\
+       - Rewrite the object to a record%s@{<info>%s@}@,"
+      (match suggested_rewrite with
+      | Some _ -> ", like: "
+      | None -> "")
+      (match suggested_rewrite with
+      | Some rewrite -> rewrite
+      | None -> "")
+  | _, Some ({Types.desc = Tconstr (p1, _, _)}, _)
+    when Path.same p1 Predef.path_promise ->
+    fprintf ppf "\n\n  - Did you mean to await this promise before using it?\n"
+  | _, Some ({Types.desc = Tconstr (p1, _, _)}, {Types.desc = Ttuple _})
+    when Path.same p1 Predef.path_array ->
+    let suggested_rewrite =
+      Parser.reprint_expr_at_loc loc ~mapper:(fun exp ->
+          match exp.Parsetree.pexp_desc with
+          | Pexp_array items ->
+            Some {exp with Parsetree.pexp_desc = Pexp_tuple items}
+          | _ -> None)
+    in
+    fprintf ppf
+      "\n\n  - Fix this by passing a tuple instead of an array%s@{<info>%s@}\n"
+      (match suggested_rewrite with
+      | Some _ -> ", like: "
+      | None -> "")
+      (match suggested_rewrite with
+      | Some rewrite -> rewrite
+      | None -> "")
+  | ( _,
+      Some
+        ( {desc = Tconstr (p, type_params, _)},
+          {desc = Tconstr (Pdot (Pident {name = "Jsx"}, "element", _), _, _)} )
+    ) -> (
+    (* Looking for a JSX element but got something else *)
+    let is_jsx_element ty =
+      match Ctype.expand_head env ty with
+      | {desc = Tconstr (Pdot (Pident {name = "Jsx"}, "element", _), _, _)} ->
+        true
+      | _ -> false
+    in
+
+    let print_jsx_msg ?(extra = "") name target_fn =
+      fprintf ppf
+        "@,\
+         @,\
+         In JSX, all content must be JSX elements. You can convert %s to a JSX \
+         element with @{<info>%s@}%s.@,"
+        name target_fn extra
+    in
+
+    match type_params with
+    | _ when Path.same p Predef.path_int ->
+      print_jsx_msg "int" (with_configured_jsx_module "int")
+    | _ when Path.same p Predef.path_string ->
+      print_jsx_msg "string" (with_configured_jsx_module "string")
+    | _ when Path.same p Predef.path_float ->
+      print_jsx_msg "float" (with_configured_jsx_module "float")
+    | [_] when Path.same p Predef.path_option ->
+      fprintf ppf
+        "@,\
+         @,\
+         You need to unwrap this option to its underlying value first, then \
+         turn that value into a JSX element.@,\
+         For @{<info>None@}, you can use @{<info>%s@} to output nothing into \
+         JSX.@,"
+        (with_configured_jsx_module "null")
+    | [tp] when Path.same p Predef.path_array && is_jsx_element tp ->
+      print_jsx_msg
+        ~extra:
+          (" (for example by using a pipe: ->"
+          ^ with_configured_jsx_module "array"
+          ^ ".")
+        "array"
+        (with_configured_jsx_module "array")
+    | [_] when Path.same p Predef.path_array ->
+      fprintf ppf
+        "@,\
+         @,\
+         You need to convert each item in this array to a JSX element first, \
+         then use @{<info>%s@} to convert the array of JSX elements into a \
+         single JSX element.@,"
+        (with_configured_jsx_module "array")
+    | _ -> ())
+  | ( Some (RecordField {optional = true; field_name; jsx = None}),
+      Some ({desc = Tconstr (p, _, _)}, _) )
+    when Path.same Predef.path_option p ->
+    fprintf ppf
+      "@,\
+       @,\
+       @{<info>%s@} is an optional record field, and you're passing an \
+       optional value to it.@,\
+       Values passed to an optional record field don't need to be wrapped in \
+       an option. You might need to adjust the type of the value supplied.\n\
+      \       @,\
+       Possible solutions: @,\
+       - Unwrap the option from the value you're passing in@,\
+       - If you really do want to pass the optional value, prepend the value \
+       with @{<info>?@} to show you want to pass the option, like: \
+       @{<info>{%s: ?%s@}}"
+      field_name field_name
+      (Parser.extract_text_at_loc loc)
+  | ( Some (RecordField {optional = true; field_name; jsx = Some _}),
+      Some ({desc = Tconstr (p, _, _)}, _) )
+    when Path.same Predef.path_option p ->
+    fprintf ppf
+      "@,\
+       @,\
+       @{<info>%s@} is an optional component prop, and you're passing an \
+       optional value to it.@,\
+       Values passed to an optional component prop don't need to be wrapped in \
+       an option. You might need to adjust the type of the value supplied.\n\
+      \       @,\
+       Possible solutions: @,\
+       - Unwrap the option from the value you're passing in@,\
+       - If you really do want to pass the optional value, prepend the value \
+       with @{<info>?@} to show you want to pass the option, like: \
+       @{<info>%s=?%s@}"
+      field_name field_name
+      (Parser.extract_text_at_loc loc)
+  | ( Some (FunctionArgument {optional = true}),
+      Some ({desc = Tconstr (p, _, _)}, _) )
+    when Path.same Predef.path_option p ->
+    fprintf ppf
+      "@,\
+       @,\
+       You're passing an optional value into an optional function argument.@,\
+       Values passed to an optional function argument don't need to be wrapped \
+       in an option. You might need to adjust the type of the value supplied.\n\
+      \       @,\
+       Possible solutions: @,\
+       - Unwrap the option from the value you're passing in@,\
+       - If you really do want to pass the optional value, prepend the value \
+       with @{<info>?@} to show you want to pass the option, like: \
+       @{<info>?%s@}"
+      (Parser.extract_text_at_loc loc)
+  | Some BracedIdent, Some (_, ({desc = Tconstr (_, _, _)} as t))
+    when is_record_type ~extract_concrete_typedecl ~env t ->
+    fprintf ppf
+      "@,\
+       @,\
+       You might have meant to pass this as a record, but wrote it as a block.@,\
+       Braces with a single identifier counts as a block, not a record with a \
+       single (punned) field.@,\
+       @,\
+       Possible solutions: @,\
+       - Write out the full record with field and value, like: @{<info>%s@}@,\
+       - Return the expected record from the block"
+      (match
+         Parser.reprint_expr_at_loc
+           ~mapper:(fun e ->
+             match e.pexp_desc with
+             | Pexp_ident {txt} ->
+               Some
+                 {
+                   e with
+                   pexp_desc =
+                     Pexp_record
+                       ([{lid = Location.mknoloc txt; opt = false; x = e}], None);
+                 }
+             | _ -> None)
+           loc
+       with
+      | None -> ""
+      | Some s -> s)
+  | _, Some ({Types.desc = Tconstr (p1, _, _)}, {desc = Tvariant row_desc})
+    when Path.same Predef.path_string p1 -> (
+    (* Check if we have a string constant that could be a polymorphic variant constructor *)
+    let target_expr_text = Parser.extract_text_at_loc loc in
+    match extract_string_constant target_expr_text with
+    | Some string_value -> (
+      let variant_constructors = List.map fst row_desc.row_fields in
+      let reprinted =
+        Parser.reprint_expr_at_loc loc ~mapper:(fun exp ->
+            match exp.Parsetree.pexp_desc with
+            | Pexp_constant (Pconst_string (s, _)) ->
+              Some {exp with Parsetree.pexp_desc = Pexp_variant (s, None)}
+            | _ -> None)
+      in
+      match (reprinted, List.mem string_value variant_constructors) with
+      | Some reprinted, true ->
+        fprintf ppf
+          "\n\n\
+          \  Possible solutions:\n\
+          \  - The constant passed matches one of the expected polymorphic \
+           variant constructors. Did you mean to pass this as a polymorphic \
+           variant? If so, rewrite @{<info>\"%s\"@} to @{<info>%s@}"
+          string_value reprinted
+      | _ -> ())
+    | None -> ())
+  | _, Some ({Types.desc = Tconstr (p1, _, _)}, ({desc = Tconstr _} as t2))
+    when Path.same Predef.path_string p1
+         && is_variant_type ~extract_concrete_typedecl ~env t2 -> (
+    (* Check if we have a string constant that could be a regular variant constructor *)
+    let target_expr_text = Parser.extract_text_at_loc loc in
+    match extract_string_constant target_expr_text with
+    | Some string_value -> (
+      let constructors =
+        get_variant_constructors ~extract_concrete_typedecl ~env t2
+      in
+      (* Extract runtime representations from constructor declarations *)
+      let constructor_mappings =
+        List.filter_map
+          (fun (cd : Types.constructor_declaration) ->
+            let constructor_name = Ident.name cd.cd_id in
+            let runtime_repr =
+              match Ast_untagged_variants.process_tag_type cd.cd_attributes with
+              | Some (String s) -> Some s (* @as("string_value") *)
+              | Some _ -> None (* @as with non-string values *)
+              | None -> Some constructor_name (* No @as, use constructor name *)
+            in
+            match runtime_repr with
+            | Some repr -> Some (repr, constructor_name)
+            | None -> None)
+          constructors
+      in
+      let matching_constructor =
+        List.find_opt
+          (fun (runtime_repr, _) -> runtime_repr = string_value)
+          constructor_mappings
+      in
+      match matching_constructor with
+      | Some (_, constructor_name) -> (
+        let reprinted =
+          Parser.reprint_expr_at_loc loc ~mapper:(fun exp ->
+              match exp.Parsetree.pexp_desc with
+              | Pexp_constant (Pconst_string (_, _)) ->
+                Some
+                  {
+                    exp with
+                    Parsetree.pexp_desc =
+                      Pexp_construct
+                        ( {txt = Lident constructor_name; loc = exp.pexp_loc},
+                          None );
+                  }
+              | _ -> None)
+        in
+        match reprinted with
+        | Some reprinted ->
+          fprintf ppf
+            "\n\n\
+            \  Possible solutions:\n\
+            \  - The constant passed matches the runtime representation of one \
+             of the expected variant constructors. Did you mean to pass this \
+             as a variant constructor? If so, rewrite @{<info>\"%s\"@} to \
+             @{<info>%s@}"
+            string_value reprinted
+        | None -> ())
+      | None -> ())
+    | _ -> ())
+  | _, Some (_supplied_type, target_type) ->
+    (* Coercion should always target the top level types. *)
+    let top_level_types =
+      match trace with
+      | (_, t1_top) :: (_, t2_top) :: _ -> Some (t1_top, t2_top)
+      | _ -> None
+    in
+    let can_show_coercion_message =
+      match top_level_types with
+      | Some ({Types.desc = Tvariant _}, {Types.desc = Tvariant _}) ->
+        (* Subtyping polymorphic variants give some weird messages sometimes,
+        so let's turn it off for now. For an example, turn them on again and try:
+        ```
+        let a: [#Resize | #KeyDown] = #Resize
+        let b: [#Click] = a
+        ```
+        *)
+        false
+      | Some (t1, t2) -> (
+        try
+          Ctype.subtype env t1 t2 ();
+          true
+        with _ -> false)
+      | None -> false
+    in
+    let target_type_string = Format.asprintf "%a" type_expr target_type in
+    let target_expr_text = Parser.extract_text_at_loc loc in
+    let suggested_rewrite =
+      match
+        !Parser.parse_source
+          (Printf.sprintf "(%s :> %s)" target_expr_text target_type_string)
+      with
+      | [], _ -> None
+      | structure, comments -> Some (!Parser.reprint_source structure comments)
+    in
+
+    (* Suggesting coercion only makes sense for non-constant values. *)
+    let is_constant =
+      match !Parser.parse_source target_expr_text with
+      | ( [{Parsetree.pstr_desc = Pstr_eval ({pexp_desc = Pexp_constant _}, _)}],
+          _ ) ->
+        true
+      | _ -> false
+    in
+
+    if can_show_coercion_message && not is_constant then (
+      fprintf ppf
+        "@,\
+         @,\
+         Possible solutions: @,\
+         - These types are compatible at runtime. You can use the coercion \
+         operator to convert to the expected type";
+      match suggested_rewrite with
+      | Some rewrite -> fprintf ppf ": @{<info>%s@}@," rewrite
+      | None -> fprintf ppf ": @{<info>:>@}@,")
+  | _ -> ()
+
+let type_clash_context_from_function sexp sfunct =
+  let is_constant =
+    match sexp.Parsetree.pexp_desc with
+    | Pexp_constant (Pconst_integer (txt, _) | Pconst_float (txt, _)) ->
+      Some txt
+    | _ -> None
+  in
+  match sfunct.Parsetree.pexp_desc with
+  | Pexp_ident
+      {txt = Lident ("==" | "===" | "!=" | "!==" | ">" | ">=" | "<" | "<=")} ->
+    Some ComparisonOperator
+  | Pexp_ident {txt = Lident "++"} -> Some StringConcat
+  | Pexp_ident {txt = Lident (("/." | "*." | "+." | "-.") as operator)} ->
+    Some (MathOperator {for_float = true; operator; is_constant})
+  | Pexp_ident {txt = Lident (("/" | "*" | "+" | "-") as operator)} ->
+    Some (MathOperator {for_float = false; operator; is_constant})
+  | _ -> if Ast_await.is_await_expr sexp then Some Await else None
+
+let type_clash_context_for_function_argument ~label type_clash_context sarg0 =
+  match type_clash_context with
+  | Some (MathOperator {for_float; operator}) ->
+    Some
+      (MathOperator
+         {
+           for_float;
+           operator;
+           is_constant =
+             (match sarg0.Parsetree.pexp_desc with
+             | Pexp_constant (Pconst_integer (txt, _) | Pconst_float (txt, _))
+               ->
+               Some txt
+             | _ -> None);
+         })
+  | None ->
+    Some
+      (FunctionArgument
+         {
+           optional = false;
+           name =
+             (match label with
+             | Asttypes.Nolabel -> None
+             | Optional {txt = l} | Labelled {txt = l} -> Some l);
+         })
+  | type_clash_context -> type_clash_context
+
+let type_clash_context_maybe_option ty_expected ty_res =
+  match (ty_expected, ty_res) with
+  | ( {Types.desc = Tconstr (expected_path, _, _)},
+      {Types.desc = Tconstr (type_path, _, _)} )
+    when Path.same Predef.path_option type_path
+         && Path.same expected_path Predef.path_option = false ->
+    Some MaybeUnwrapOption
+  | _ -> None
+
+let type_clash_context_in_statement sexp =
+  match sexp.Parsetree.pexp_desc with
+  | Pexp_apply {transformed_jsx = false} -> Some (Statement FunctionCall)
+  | _ -> None
+
+let print_contextual_unification_error ppf t1 t2 =
+  (* TODO: Maybe we should do the same for Null.t and Nullable.t as we do for options
+     below, now that they also are more first class for values that might not exist? *)
+  match (t1.Types.desc, t2.Types.desc) with
+  | Tconstr (p1, _, _), Tconstr (p2, _, _)
+    when Path.same p1 Predef.path_option
+         && Path.same p2 Predef.path_option <> true ->
+    fprintf ppf
+      "@,\
+       @\n\
+       @[<v 0>You're expecting the value you're pattern matching on to be an \
+       @{<info>option@}, but the value is actually not an option.@ Change your \
+       pattern match to work on the concrete value (remove @{<error>Some(_)@} \
+       or @{<error>None@} from the pattern) to make it work.@]"
+  | Tconstr (p1, _, _), Tconstr (p2, _, _)
+    when Path.same p2 Predef.path_option
+         && Path.same p1 Predef.path_option <> true ->
+    fprintf ppf
+      "@,\
+       @\n\
+       @[<v 0>The value you're pattern matching on here is wrapped in an \
+       @{<info>option@}, but you're trying to match on the actual value.@ Wrap \
+       the highlighted pattern in @{<info>Some()@} to make it work.@]"
+  | _ -> ()
+
+let attributes_include_jsx_component_props (attrs : Parsetree.attributes) =
+  attrs
+  |> List.exists (fun ({Location.txt}, _) -> txt = "res.jsxComponentProps")
+
+let path_to_jsx_component_name p =
+  match p |> Path.name |> String.split_on_char '.' |> List.rev with
+  | "props" :: component_name :: _ -> Some component_name
+  | _ -> None
+
+let get_jsx_component_props
+    ~(extract_concrete_typedecl : extract_concrete_typedecl) env ty p =
+  match p with
+  | Path.Pdot (Path.Pident {Ident.name = jsx_module_name}, "fragmentProps", _)
+    when Some jsx_module_name = !configured_jsx_module ->
+    Some {props_record_path = p; fields = []; jsx_type = `Fragment}
+  | _ -> (
+    (* TODO: handle lowercase components using JSXDOM.domProps *)
+    match Path.last p with
+    | "props" -> (
+      try
+        match extract_concrete_typedecl env ty with
+        | ( _p0,
+            _p,
+            {Types.type_kind = Type_record (fields, _repr); type_attributes} )
+          when attributes_include_jsx_component_props type_attributes ->
+          Some {props_record_path = p; fields; jsx_type = `CustomComponent}
+        | _ -> None
+      with _ -> None)
+    | _ -> None)
+
+let print_component_name ppf (p : Path.t) =
+  match path_to_jsx_component_name p with
+  | Some component_name -> fprintf ppf "@{<info><%s />@} " component_name
+  | None -> ()
+
+let print_component_wrong_prop_error ppf (p : Path.t)
+    (_fields : Types.label_declaration list) name =
+  fprintf ppf "@[<v>";
+  (match name with
+  | "children" ->
+    fprintf ppf
+      "@[<2>This JSX component does not accept child elements. It has no \
+       @{<error>children@} prop "
+  | _ ->
+    fprintf ppf
+      "@[<2>The prop @{<error>%s@} does not belong to the JSX component " name);
+  print_component_name ppf p;
+  fprintf ppf "@]@,@,"
+
+let print_component_labels_missing_error ppf labels
+    (error_info : jsx_prop_error_info) =
+  fprintf ppf "@[<hov>The component ";
+  print_component_name ppf error_info.props_record_path;
+  fprintf ppf "is missing these required props:@\n";
+  labels |> List.iter (fun lbl -> fprintf ppf "@ %s" lbl);
+  fprintf ppf "@]"
+
+let get_jsx_component_error_info ~extract_concrete_typedecl opath env ty_record
+    () =
+  match opath with
+  | Some (p, _) ->
+    get_jsx_component_props ~extract_concrete_typedecl env ty_record p
+  | None -> None
diff --git a/compiler/ml/experimental_features.ml b/compiler/ml/experimental_features.ml
new file mode 100644
index 0000000..662157b
--- /dev/null
+++ b/compiler/ml/experimental_features.ml
@@ -0,0 +1,25 @@
+type feature = LetUnwrap
+
+let to_string (f : feature) : string =
+  match f with
+  | LetUnwrap -> "LetUnwrap"
+
+let from_string (s : string) : feature option =
+  match s with
+  | "LetUnwrap" -> Some LetUnwrap
+  | _ -> None
+
+module FeatureSet = Set.Make (struct
+  type t = feature
+  let compare = compare
+end)
+
+let enabled_features : FeatureSet.t ref = ref FeatureSet.empty
+let enable_from_string (s : string) =
+  match from_string s with
+  | Some f -> enabled_features := FeatureSet.add f !enabled_features
+  | None -> ()
+
+let reset () = enabled_features := FeatureSet.empty
+
+let is_enabled (f : feature) = FeatureSet.mem f !enabled_features
diff --git a/compiler/ml/experimental_features.mli b/compiler/ml/experimental_features.mli
new file mode 100644
index 0000000..5c28eca
--- /dev/null
+++ b/compiler/ml/experimental_features.mli
@@ -0,0 +1,6 @@
+type feature = LetUnwrap
+
+val enable_from_string : string -> unit
+val is_enabled : feature -> bool
+val to_string : feature -> string
+val reset : unit -> unit
diff --git a/compiler/ml/includecore.ml b/compiler/ml/includecore.ml
new file mode 100644
index 0000000..05753d3
--- /dev/null
+++ b/compiler/ml/includecore.ml
@@ -0,0 +1,486 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Inclusion checks for the core language *)
+
+open Asttypes
+open Path
+open Types
+open Typedtree
+
+(* Inclusion between value descriptions *)
+
+exception Dont_match
+
+(* When comparing externals in signatures, re-derive arity/from_constructor from
+   the value's type so abstract aliases (e.g. opaque function types) don't keep
+   default zeros stored in the primitive descriptor, which would make equal
+   externals look different. *)
+let normalize_primitive ~env val_type (prim : Primitive.description) =
+  match Ctype.get_arity env val_type with
+  | Some prim_arity ->
+    let prim_from_constructor =
+      match (Ctype.repr val_type).desc with
+      | Tconstr _ -> true
+      | _ -> prim.prim_from_constructor
+    in
+    Primitive.with_arity prim ~arity:prim_arity
+      ~from_constructor:prim_from_constructor
+  | None -> prim
+
+let value_descriptions ~loc env name (vd1 : Types.value_description)
+    (vd2 : Types.value_description) =
+  Builtin_attributes.check_deprecated_inclusion ~def:vd1.val_loc
+    ~use:vd2.val_loc loc vd1.val_attributes vd2.val_attributes (Ident.name name);
+  if Ctype.moregeneral env true vd1.val_type vd2.val_type then
+    match (vd1.val_kind, vd2.val_kind) with
+    | Val_prim p1, Val_prim p2 ->
+      let p1 = normalize_primitive ~env vd1.val_type p1 in
+      let p2 = normalize_primitive ~env vd2.val_type p2 in
+      if !Primitive.coerce p1 p2 then Tcoerce_none else raise Dont_match
+    | Val_prim p, _ ->
+      let pc =
+        {
+          pc_desc = p;
+          pc_type = vd2.Types.val_type;
+          pc_env = env;
+          pc_loc = vd1.Types.val_loc;
+          pc_id = name;
+        }
+      in
+      Tcoerce_primitive pc
+    | _, Val_prim _ -> raise Dont_match
+    | _, _ -> Tcoerce_none
+  else raise Dont_match
+
+(* Inclusion between "private" annotations *)
+
+let private_flags decl1 decl2 =
+  match (decl1.type_private, decl2.type_private) with
+  | Private, Public ->
+    decl2.type_kind = Type_abstract
+    && (decl2.type_manifest = None || decl1.type_kind <> Type_abstract)
+  | _, _ -> true
+
+(* Inclusion between manifest types (particularly for private row types) *)
+
+let is_absrow env ty =
+  match ty.desc with
+  | Tconstr (Pident _, _, _) -> (
+    match Ctype.expand_head env ty with
+    | {desc = Tobject _ | Tvariant _} -> true
+    | _ -> false)
+  | _ -> false
+
+let type_manifest env ty1 params1 ty2 params2 priv2 =
+  let ty1' = Ctype.expand_head env ty1 and ty2' = Ctype.expand_head env ty2 in
+  match (ty1'.desc, ty2'.desc) with
+  | Tvariant row1, Tvariant row2 when is_absrow env (Btype.row_more row2) ->
+    let row1 = Btype.row_repr row1 and row2 = Btype.row_repr row2 in
+    Ctype.equal env true (ty1 :: params1) (row2.row_more :: params2)
+    && (match row1.row_more with
+       | {desc = Tvar _ | Tconstr _ | Tnil} -> true
+       | _ -> false)
+    &&
+    let r1, r2, pairs =
+      Ctype.merge_row_fields row1.row_fields row2.row_fields
+    in
+    ((not row2.row_closed)
+    || (row1.row_closed && Ctype.filter_row_fields false r1 = []))
+    && List.for_all
+         (fun (_, f) ->
+           match Btype.row_field_repr f with
+           | Rabsent | Reither _ -> true
+           | Rpresent _ -> false)
+         r2
+    &&
+    let to_equal = ref (List.combine params1 params2) in
+    List.for_all
+      (fun (_, f1, f2) ->
+        match (Btype.row_field_repr f1, Btype.row_field_repr f2) with
+        | Rpresent (Some t1), (Rpresent (Some t2) | Reither (false, [t2], _, _))
+          ->
+          to_equal := (t1, t2) :: !to_equal;
+          true
+        | Rpresent None, (Rpresent None | Reither (true, [], _, _)) -> true
+        | Reither (c1, tl1, _, _), Reither (c2, tl2, _, _)
+          when List.length tl1 = List.length tl2 && c1 = c2 ->
+          to_equal := List.combine tl1 tl2 @ !to_equal;
+          true
+        | Rabsent, (Reither _ | Rabsent) -> true
+        | _ -> false)
+      pairs
+    &&
+    let tl1, tl2 = List.split !to_equal in
+    Ctype.equal env true tl1 tl2
+  | Tobject (fi1, _), Tobject (fi2, _)
+    when is_absrow env (snd (Ctype.flatten_fields fi2)) ->
+    let fields2, rest2 = Ctype.flatten_fields fi2 in
+    Ctype.equal env true (ty1 :: params1) (rest2 :: params2)
+    &&
+    let fields1, rest1 = Ctype.flatten_fields fi1 in
+    (match rest1 with
+    | {desc = Tnil | Tvar _ | Tconstr _} -> true
+    | _ -> false)
+    &&
+    let pairs, _miss1, miss2 = Ctype.associate_fields fields1 fields2 in
+    miss2 = []
+    &&
+    let tl1, tl2 =
+      List.split (List.map (fun (_, _, t1, _, t2) -> (t1, t2)) pairs)
+    in
+    Ctype.equal env true (params1 @ tl1) (params2 @ tl2)
+  | _ ->
+    let rec check_super ty1 =
+      Ctype.equal env true (ty1 :: params1) (ty2 :: params2)
+      || priv2 = Private
+         &&
+         try
+           check_super
+             (Ctype.try_expand_once_opt env (Ctype.expand_head env ty1))
+         with Ctype.Cannot_expand -> false
+    in
+    check_super ty1
+
+(* Inclusion between type declarations *)
+
+type type_mismatch =
+  | Arity
+  | Privacy
+  | Kind
+  | Constraint
+  | Manifest
+  | Variance
+  | Field_type of Ident.t
+  | Field_mutable of Ident.t
+  | Field_optional of Ident.t
+  | Field_arity of Ident.t
+  | Field_names of int * string * string
+  | Field_missing of bool * Ident.t
+  | Record_representation of record_representation * record_representation
+  | Unboxed_representation of bool (* true means second one is unboxed *)
+  | Immediate
+  | Tag_name
+  | Variant_representation of Ident.t
+
+let report_type_mismatch0 first second decl ppf err =
+  let pr fmt = Format.fprintf ppf fmt in
+  match err with
+  | Arity -> pr "They have different arities"
+  | Privacy -> pr "A private type would be revealed"
+  | Kind -> pr "Their kinds differ"
+  | Constraint -> pr "Their constraints differ"
+  | Manifest -> ()
+  | Variance -> pr "Their variances do not agree"
+  | Field_type s -> pr "The types for field %s are not equal" (Ident.name s)
+  | Field_mutable s ->
+    pr "The mutability of field %s is different" (Ident.name s)
+  | Field_optional s ->
+    pr "The optional attribute of field %s is different" (Ident.name s)
+  | Field_arity s -> pr "The arities for field %s differ" (Ident.name s)
+  | Field_names (n, name1, name2) ->
+    pr "Fields number %i have different names, %s and %s" n name1 name2
+  | Field_missing (b, s) ->
+    pr "The field %s is only present in %s %s" (Ident.name s)
+      (if b then second else first)
+      decl
+  | Record_representation (_rep1, _rep2) ->
+    pr "Their internal representations differ"
+  | Unboxed_representation b ->
+    pr "Their internal representations differ:@ %s %s %s"
+      (if b then second else first)
+      decl "uses unboxed representation"
+  | Immediate -> pr "%s is not an immediate type" first
+  | Tag_name -> pr "Their @tag annotations differ"
+  | Variant_representation s ->
+    pr "The internal representations for case %s are not equal" (Ident.name s)
+
+let report_type_mismatch first second decl ppf =
+  List.iter (fun err ->
+      if err = Manifest then ()
+      else
+        Format.fprintf ppf "@ %a." (report_type_mismatch0 first second decl) err)
+
+let rec compare_constructor_arguments ~loc env cstr params1 params2 arg1 arg2 =
+  match (arg1, arg2) with
+  | Types.Cstr_tuple arg1, Types.Cstr_tuple arg2 ->
+    if List.length arg1 <> List.length arg2 then [Field_arity cstr]
+    else if
+      (* Ctype.equal must be called on all arguments at once, cf. PR#7378 *)
+      Ctype.equal env true (params1 @ arg1) (params2 @ arg2)
+    then []
+    else [Field_type cstr]
+  | Types.Cstr_record l1, Types.Cstr_record l2 ->
+    compare_records env ~loc params1 params2 0 l1 l2
+  | _ -> [Field_type cstr]
+
+and compare_variants ~loc env params1 params2 n
+    (cstrs1 : Types.constructor_declaration list)
+    (cstrs2 : Types.constructor_declaration list) =
+  match (cstrs1, cstrs2) with
+  | [], [] -> []
+  | [], c :: _ -> [Field_missing (true, c.Types.cd_id)]
+  | c :: _, [] -> [Field_missing (false, c.Types.cd_id)]
+  | cd1 :: rem1, cd2 :: rem2 ->
+    if Ident.name cd1.cd_id <> Ident.name cd2.cd_id then
+      [Field_names (n, cd1.cd_id.name, cd2.cd_id.name)]
+    else (
+      Builtin_attributes.check_deprecated_inclusion ~def:cd1.cd_loc
+        ~use:cd2.cd_loc loc cd1.cd_attributes cd2.cd_attributes
+        (Ident.name cd1.cd_id);
+      let r =
+        match (cd1.cd_res, cd2.cd_res) with
+        | Some r1, Some r2 ->
+          if Ctype.equal env true [r1] [r2] then
+            compare_constructor_arguments ~loc env cd1.cd_id [r1] [r2]
+              cd1.cd_args cd2.cd_args
+          else [Field_type cd1.cd_id]
+        | Some _, None | None, Some _ -> [Field_type cd1.cd_id]
+        | _ ->
+          compare_constructor_arguments ~loc env cd1.cd_id params1 params2
+            cd1.cd_args cd2.cd_args
+      in
+      let r =
+        if r <> [] then r
+        else
+          match Ast_untagged_variants.is_nullary_variant cd1.cd_args with
+          | true ->
+            let tag_type1 =
+              Ast_untagged_variants.process_tag_type cd1.cd_attributes
+            in
+            let tag_type2 =
+              Ast_untagged_variants.process_tag_type cd2.cd_attributes
+            in
+            if tag_type1 <> tag_type2 then [Variant_representation cd1.cd_id]
+            else []
+          | false -> r
+      in
+      if r <> [] then r
+      else compare_variants ~loc env params1 params2 (n + 1) rem1 rem2)
+
+and compare_records ~loc env params1_ params2_ n_
+    (labels1_ : Types.label_declaration list)
+    (labels2_ : Types.label_declaration list) =
+  (* First try a fast path that checks if all the fields at once are consistent.
+     When that fails, try a slow path that blames the first inconsistent field *)
+  let rec aux ~fast params1 params2 n labels1 labels2 =
+    match (labels1, labels2) with
+    | [], [] ->
+      if fast then
+        if Ctype.equal env true params1 params2 then []
+        else aux ~fast:false params1_ params2_ n_ labels1_ labels2_
+      else []
+    | [], l :: _ -> [Field_missing (true, l.Types.ld_id)]
+    | l :: _, [] -> [Field_missing (false, l.Types.ld_id)]
+    | ld1 :: rem1, ld2 :: rem2 ->
+      if Ident.name ld1.ld_id <> Ident.name ld2.ld_id then
+        [Field_names (n, ld1.ld_id.name, ld2.ld_id.name)]
+      else if ld1.ld_mutable <> ld2.ld_mutable then [Field_mutable ld1.ld_id]
+      else if ld1.ld_optional <> ld2.ld_optional then [Field_optional ld1.ld_id]
+      else (
+        Builtin_attributes.check_deprecated_mutable_inclusion ~def:ld1.ld_loc
+          ~use:ld2.ld_loc loc ld1.ld_attributes ld2.ld_attributes
+          (Ident.name ld1.ld_id);
+        let field_mismatch =
+          !Builtin_attributes.check_bs_attributes_inclusion
+            ld1.ld_attributes ld2.ld_attributes (Ident.name ld1.ld_id)
+        in
+        match field_mismatch with
+        | Some (a, b) -> [Field_names (n, a, b)]
+        | None ->
+          let current_field_consistent =
+            if fast then true
+            else
+              Ctype.equal env true (ld1.ld_type :: params1)
+                (ld2.ld_type :: params2)
+          in
+          if current_field_consistent then
+            (* add arguments to the parameters, cf. PR#7378 *)
+            aux ~fast (ld1.ld_type :: params1) (ld2.ld_type :: params2) (n + 1)
+              rem1 rem2
+          else [Field_type ld1.ld_id])
+  in
+  aux ~fast:true params1_ params2_ n_ labels1_ labels2_
+
+let type_declarations ?(equality = false) ~loc env name decl1 id decl2 =
+  Builtin_attributes.check_deprecated_inclusion ~def:decl1.type_loc
+    ~use:decl2.type_loc loc decl1.type_attributes decl2.type_attributes name;
+  if decl1.type_arity <> decl2.type_arity then [Arity]
+  else if not (private_flags decl1 decl2) then [Privacy]
+  else
+    let err =
+      match (decl1.type_manifest, decl2.type_manifest) with
+      | _, None ->
+        if Ctype.equal env true decl1.type_params decl2.type_params then []
+        else [Constraint]
+      | Some ty1, Some ty2 ->
+        if
+          type_manifest env ty1 decl1.type_params ty2 decl2.type_params
+            decl2.type_private
+        then []
+        else [Manifest]
+      | None, Some ty2 ->
+        let ty1 =
+          Btype.newgenty (Tconstr (Pident id, decl2.type_params, ref Mnil))
+        in
+        if Ctype.equal env true decl1.type_params decl2.type_params then
+          if Ctype.equal env false [ty1] [ty2] then [] else [Manifest]
+        else [Constraint]
+    in
+    if err <> [] then err
+    else
+      let err =
+        let untagged1 =
+          Ast_untagged_variants.process_untagged decl1.type_attributes
+        in
+        let untagged2 =
+          Ast_untagged_variants.process_untagged decl2.type_attributes
+        in
+        match
+          ( decl2.type_kind,
+            decl1.type_unboxed.unboxed || untagged1,
+            decl2.type_unboxed.unboxed || untagged2 )
+        with
+        | Type_abstract, _, _ -> []
+        | _, true, false -> [Unboxed_representation false]
+        | _, false, true -> [Unboxed_representation true]
+        | _ -> []
+      in
+      if err <> [] then err
+      else
+        let err =
+          let tag1 =
+            Ast_untagged_variants.process_tag_name decl1.type_attributes
+          in
+          let tag2 =
+            Ast_untagged_variants.process_tag_name decl2.type_attributes
+          in
+          if tag1 <> tag2 then [Tag_name] else err
+        in
+        if err <> [] then err
+        else
+          let err =
+            match (decl1.type_kind, decl2.type_kind) with
+            | _, Type_abstract -> []
+            | Type_variant cstrs1, Type_variant cstrs2 ->
+              let mark cstrs usage name decl =
+                List.iter
+                  (fun c ->
+                    Env.mark_constructor_used usage env name decl
+                      (Ident.name c.Types.cd_id))
+                  cstrs
+              in
+              let usage =
+                if decl1.type_private = Private || decl2.type_private = Public
+                then Env.Positive
+                else Env.Privatize
+              in
+              mark cstrs1 usage name decl1;
+              if equality then mark cstrs2 Env.Positive (Ident.name id) decl2;
+              compare_variants ~loc env decl1.type_params decl2.type_params 1
+                cstrs1 cstrs2
+            | Type_record (labels1, rep1), Type_record (labels2, rep2) ->
+              let err =
+                compare_records ~loc env decl1.type_params decl2.type_params 1
+                  labels1 labels2
+              in
+              if err <> [] || rep1 = rep2 then err
+              else [Record_representation (rep1, rep2)]
+            | Type_open, Type_open -> []
+            | _, _ -> [Kind]
+          in
+          if err <> [] then err
+          else
+            let abstr =
+              decl2.type_kind = Type_abstract && decl2.type_manifest = None
+            in
+            (* If attempt to assign a non-immediate type (e.g. string) to a type that
+             * must be immediate, then we error *)
+            let err =
+              if abstr && (not decl1.type_immediate) && decl2.type_immediate
+              then [Immediate]
+              else []
+            in
+            if err <> [] then err
+            else
+              let need_variance =
+                abstr
+                || decl1.type_private = Private
+                || decl1.type_kind = Type_open
+              in
+              if not need_variance then []
+              else
+                let abstr = abstr || decl2.type_private = Private in
+                let opn =
+                  decl2.type_kind = Type_open && decl2.type_manifest = None
+                in
+                let constrained ty = not Btype.(is_Tvar (repr ty)) in
+                if
+                  List.for_all2
+                    (fun ty (v1, v2) ->
+                      let open Variance in
+                      let imp a b = (not a) || b in
+                      let co1, cn1 = get_upper v1 and co2, cn2 = get_upper v2 in
+                      (if abstr then imp co1 co2 && imp cn1 cn2
+                       else if opn || constrained ty then co1 = co2 && cn1 = cn2
+                       else true)
+                      &&
+                      let p1, n1, i1, j1 = get_lower v1
+                      and p2, n2, i2, j2 = get_lower v2 in
+                      imp abstr
+                        (imp p2 p1 && imp n2 n1 && imp i2 i1 && imp j2 j1))
+                    decl2.type_params
+                    (List.combine decl1.type_variance decl2.type_variance)
+                then []
+                else [Variance]
+
+(* Inclusion between extension constructors *)
+
+let extension_constructors ~loc env id ext1 ext2 =
+  let usage =
+    if ext1.ext_private = Private || ext2.ext_private = Public then Env.Positive
+    else Env.Privatize
+  in
+  Env.mark_extension_used usage env ext1 (Ident.name id);
+  let ty1 =
+    Btype.newgenty
+      (Tconstr (ext1.ext_type_path, ext1.ext_type_params, ref Mnil))
+  in
+  let ty2 =
+    Btype.newgenty
+      (Tconstr (ext2.ext_type_path, ext2.ext_type_params, ref Mnil))
+  in
+  if
+    Ctype.equal env true
+      (ty1 :: ext1.ext_type_params)
+      (ty2 :: ext2.ext_type_params)
+  then
+    if
+      compare_constructor_arguments ~loc env (Ident.create "")
+        ext1.ext_type_params ext2.ext_type_params ext1.ext_args ext2.ext_args
+      = []
+    then
+      if
+        match (ext1.ext_ret_type, ext2.ext_ret_type) with
+        | Some r1, Some r2 when not (Ctype.equal env true [r1] [r2]) -> false
+        | Some _, None | None, Some _ -> false
+        | _ -> true
+      then
+        match (ext1.ext_private, ext2.ext_private) with
+        | Private, Public -> false
+        | _, _ -> true
+      else false
+    else false
+  else false
diff --git a/jscomp/ml/includecore.mli b/compiler/ml/includecore.mli
similarity index 76%
rename from jscomp/ml/includecore.mli
rename to compiler/ml/includecore.mli
index 2908a07..aec316d 100644
--- a/jscomp/ml/includecore.mli
+++ b/compiler/ml/includecore.mli
@@ -21,7 +21,7 @@ open Types
 exception Dont_match
 
 type type_mismatch =
-    Arity
+  | Arity
   | Privacy
   | Kind
   | Constraint
@@ -29,6 +29,7 @@ type type_mismatch =
   | Variance
   | Field_type of Ident.t
   | Field_mutable of Ident.t
+  | Field_optional of Ident.t
   | Field_arity of Ident.t
   | Field_names of int * string * string
   | Field_missing of bool * Ident.t
@@ -38,24 +39,35 @@ type type_mismatch =
   | Tag_name
   | Variant_representation of Ident.t
 
-val value_descriptions:
-  loc:Location.t -> Env.t -> Ident.t ->
-  value_description -> value_description -> module_coercion    
-  
-val type_declarations:
+val value_descriptions :
+  loc:Location.t ->
+  Env.t ->
+  Ident.t ->
+  value_description ->
+  value_description ->
+  module_coercion
+
+val type_declarations :
   ?equality:bool ->
   loc:Location.t ->
-  Env.t -> string ->
-  type_declaration -> Ident.t -> type_declaration -> type_mismatch list
+  Env.t ->
+  string ->
+  type_declaration ->
+  Ident.t ->
+  type_declaration ->
+  type_mismatch list
 
-val extension_constructors:
+val extension_constructors :
   loc:Location.t ->
-  Env.t -> Ident.t ->
-  extension_constructor -> extension_constructor -> bool
+  Env.t ->
+  Ident.t ->
+  extension_constructor ->
+  extension_constructor ->
+  bool
 (*
 val class_types:
         Env.t -> class_type -> class_type -> bool
 *)
 
-val report_type_mismatch:
-    string -> string -> string -> Format.formatter -> type_mismatch list -> unit
+val report_type_mismatch :
+  string -> string -> string -> Format.formatter -> type_mismatch list -> unit
diff --git a/compiler/ml/includemod.ml b/compiler/ml/includemod.ml
new file mode 100644
index 0000000..d4c01d4
--- /dev/null
+++ b/compiler/ml/includemod.ml
@@ -0,0 +1,643 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Inclusion checks for the module language *)
+
+open Misc
+open Path
+open Typedtree
+open Types
+
+type symptom =
+  | Missing_field of Ident.t * Location.t * string (* kind *)
+  | Value_descriptions of Ident.t * value_description * value_description
+  | Type_declarations of
+      Ident.t
+      * type_declaration
+      * type_declaration
+      * Includecore.type_mismatch list
+  | Extension_constructors of
+      Ident.t * extension_constructor * extension_constructor
+  | Module_types of module_type * module_type
+  | Modtype_infos of Ident.t * modtype_declaration * modtype_declaration
+  | Modtype_permutation
+  | Interface_mismatch of string * string
+  | Unbound_modtype_path of Path.t
+  | Unbound_module_path of Path.t
+  | Invalid_module_alias of Path.t
+
+type pos =
+  | Module of Ident.t
+  | Modtype of Ident.t
+  | Arg of Ident.t
+  | Body of Ident.t
+type error = pos list * Env.t * symptom
+
+exception Error of error list
+
+(* All functions "blah env x1 x2" check that x1 is included in x2,
+   i.e. that x1 is the type of an implementation that fulfills the
+   specification x2. If not, Error is raised with a backtrace of the error. *)
+
+(* Inclusion between value descriptions *)
+
+let value_descriptions ~loc env cxt subst id vd1 vd2 =
+  Cmt_format.record_value_dependency vd1 vd2;
+  Env.mark_value_used env (Ident.name id) vd1;
+  let vd2 = Subst.value_description subst vd2 in
+  try Includecore.value_descriptions ~loc env id vd1 vd2
+  with Includecore.Dont_match ->
+    raise (Error [(cxt, env, Value_descriptions (id, vd1, vd2))])
+
+(* Inclusion between type declarations *)
+
+let type_declarations ~loc env ?(old_env = env) cxt subst id decl1 decl2 =
+  Env.mark_type_used env (Ident.name id) decl1;
+  let decl2 = Subst.type_declaration subst decl2 in
+  let err =
+    Includecore.type_declarations ~loc env (Ident.name id) decl1 id decl2
+  in
+  if err <> [] then
+    raise (Error [(cxt, old_env, Type_declarations (id, decl1, decl2, err))])
+
+(* Inclusion between extension constructors *)
+
+let extension_constructors ~loc env cxt subst id ext1 ext2 =
+  let ext2 = Subst.extension_constructor subst ext2 in
+  if Includecore.extension_constructors ~loc env id ext1 ext2 then ()
+  else raise (Error [(cxt, env, Extension_constructors (id, ext1, ext2))])
+
+(* Expand a module type identifier when possible *)
+
+exception Dont_match
+
+let may_expand_module_path env path =
+  try
+    ignore (Env.find_modtype_expansion path env);
+    true
+  with Not_found -> false
+
+let expand_module_path env cxt path =
+  try Env.find_modtype_expansion path env
+  with Not_found -> raise (Error [(cxt, env, Unbound_modtype_path path)])
+
+let expand_module_alias env cxt path =
+  try (Env.find_module path env).md_type
+  with Not_found -> raise (Error [(cxt, env, Unbound_module_path path)])
+
+(*
+let rec normalize_module_path env cxt path =
+  match expand_module_alias env cxt path with
+    Mty_alias path' -> normalize_module_path env cxt path'
+  | _ -> path
+*)
+
+(* Extract name, kind and ident from a signature item *)
+
+type field_desc =
+  | Field_value of string
+  | Field_type of string
+  | Field_typext of string
+  | Field_module of string
+  | Field_modtype of string
+
+let kind_of_field_desc = function
+  | Field_value _ -> "value"
+  | Field_type _ -> "type"
+  | Field_typext _ -> "extension constructor"
+  | Field_module _ -> "module"
+  | Field_modtype _ -> "module type"
+
+let item_ident_name = function
+  | Sig_value (id, d) -> (id, d.val_loc, Field_value (Ident.name id))
+  | Sig_type (id, d, _) -> (id, d.type_loc, Field_type (Ident.name id))
+  | Sig_typext (id, d, _) -> (id, d.ext_loc, Field_typext (Ident.name id))
+  | Sig_module (id, d, _) -> (id, d.md_loc, Field_module (Ident.name id))
+  | Sig_modtype (id, d) -> (id, d.mtd_loc, Field_modtype (Ident.name id))
+  | Sig_class () -> assert false
+  | Sig_class_type () -> assert false
+
+let is_runtime_component = function
+  | Sig_value (_, {val_kind = Val_prim _})
+  | Sig_type (_, _, _)
+  | Sig_modtype (_, _)
+  | Sig_class_type () ->
+    false
+  | Sig_value (_, _)
+  | Sig_typext (_, _, _)
+  | Sig_module (_, _, _)
+  | Sig_class () ->
+    true
+
+(* Print a coercion *)
+
+let rec print_list pr ppf = function
+  | [] -> ()
+  | [a] -> pr ppf a
+  | a :: l ->
+    pr ppf a;
+    Format.fprintf ppf ";@ ";
+    print_list pr ppf l
+let print_list pr ppf l = Format.fprintf ppf "[@[%a@]]" (print_list pr) l
+
+let rec print_coercion ppf c =
+  let pr fmt = Format.fprintf ppf fmt in
+  match c with
+  | Tcoerce_none -> pr "id"
+  | Tcoerce_structure (fl, nl, _) ->
+    pr "@[<2>struct@ %a@ %a@]"
+      (print_list print_coercion2)
+      fl
+      (print_list print_coercion3)
+      nl
+  | Tcoerce_functor (inp, out) ->
+    pr "@[<2>functor@ (%a)@ (%a)@]" print_coercion inp print_coercion out
+  | Tcoerce_primitive {pc_desc; pc_env = _; pc_type} ->
+    pr "prim %s@ (%a)" pc_desc.Primitive.prim_name Printtyp.raw_type_expr
+      pc_type
+  | Tcoerce_alias (p, c) ->
+    pr "@[<2>alias %a@ (%a)@]" Printtyp.path p print_coercion c
+
+and print_coercion2 ppf (n, c) =
+  Format.fprintf ppf "@[%d,@ %a@]" n print_coercion c
+
+and print_coercion3 ppf (i, n, c) =
+  Format.fprintf ppf "@[%s, %d,@ %a@]" (Ident.unique_name i) n print_coercion c
+
+(* Simplify a structure coercion *)
+
+let simplify_structure_coercion cc id_pos_list runtime_fields =
+  let rec is_identity_coercion pos = function
+    | [] -> true
+    | (n, c) :: rem ->
+      n = pos && c = Tcoerce_none && is_identity_coercion (pos + 1) rem
+  in
+  if is_identity_coercion 0 cc then Tcoerce_none
+  else Tcoerce_structure (cc, id_pos_list, runtime_fields)
+
+(* Inclusion between module types.
+   Return the restriction that transforms a value of the smaller type
+   into a value of the bigger type. *)
+
+let rec modtypes ~loc env cxt subst mty1 mty2 =
+  try try_modtypes ~loc env cxt subst mty1 mty2 with
+  | Dont_match ->
+    raise (Error [(cxt, env, Module_types (mty1, Subst.modtype subst mty2))])
+  | Error reasons as err -> (
+    match (mty1, mty2) with
+    | Mty_alias _, _ | _, Mty_alias _ -> raise err
+    | _ ->
+      raise
+        (Error
+           ((cxt, env, Module_types (mty1, Subst.modtype subst mty2)) :: reasons))
+    )
+
+and try_modtypes ~loc env cxt subst mty1 mty2 =
+  match (mty1, mty2) with
+  | Mty_alias (pres1, p1), Mty_alias (pres2, p2) -> (
+    if Env.is_functor_arg p2 env then
+      raise (Error [(cxt, env, Invalid_module_alias p2)]);
+    (if not (Path.same p1 p2) then
+       let p1 = Env.normalize_path None env p1
+       and p2 = Env.normalize_path None env (Subst.module_path subst p2) in
+       if not (Path.same p1 p2) then raise Dont_match);
+    match (pres1, pres2) with
+    | Mta_present, Mta_present ->
+      Tcoerce_none (* Should really be Tcoerce_ignore if it existed *)
+    | Mta_absent, Mta_absent ->
+      Tcoerce_none (* Should really be Tcoerce_empty if it existed *)
+    | Mta_present, Mta_absent -> Tcoerce_none
+    | Mta_absent, Mta_present ->
+      let p1 =
+        try Env.normalize_path (Some Location.none) env p1
+        with Env.Error (Env.Missing_module (_, _, path)) ->
+          raise (Error [(cxt, env, Unbound_module_path path)])
+      in
+      Tcoerce_alias (p1, Tcoerce_none))
+  | Mty_alias (pres1, p1), _ -> (
+    let p1 =
+      try Env.normalize_path (Some Location.none) env p1
+      with Env.Error (Env.Missing_module (_, _, path)) ->
+        raise (Error [(cxt, env, Unbound_module_path path)])
+    in
+    let mty1 =
+      Mtype.strengthen ~aliasable:true env (expand_module_alias env cxt p1) p1
+    in
+    let cc = modtypes ~loc env cxt subst mty1 mty2 in
+    match pres1 with
+    | Mta_present -> cc
+    | Mta_absent -> Tcoerce_alias (p1, cc))
+  | Mty_ident p1, _ when may_expand_module_path env p1 ->
+    try_modtypes ~loc env cxt subst (expand_module_path env cxt p1) mty2
+  | _, Mty_ident _ -> try_modtypes2 ~loc env cxt mty1 (Subst.modtype subst mty2)
+  | Mty_signature sig1, Mty_signature sig2 ->
+    signatures ~loc env cxt subst sig1 sig2
+  | Mty_functor (param1, None, res1), Mty_functor (_param2, None, res2) -> (
+    match modtypes ~loc env (Body param1 :: cxt) subst res1 res2 with
+    | Tcoerce_none -> Tcoerce_none
+    | cc -> Tcoerce_functor (Tcoerce_none, cc))
+  | Mty_functor (param1, Some arg1, res1), Mty_functor (param2, Some arg2, res2)
+    -> (
+    let arg2' = Subst.modtype subst arg2 in
+    let cc_arg =
+      modtypes ~loc env (Arg param1 :: cxt) Subst.identity arg2' arg1
+    in
+    let cc_res =
+      modtypes ~loc
+        (Env.add_module param1 arg2' env)
+        (Body param1 :: cxt)
+        (Subst.add_module param2 (Pident param1) subst)
+        res1 res2
+    in
+    match (cc_arg, cc_res) with
+    | Tcoerce_none, Tcoerce_none -> Tcoerce_none
+    | _ -> Tcoerce_functor (cc_arg, cc_res))
+  | _, _ -> raise Dont_match
+
+and try_modtypes2 ~loc env cxt mty1 mty2 =
+  (* mty2 is an identifier *)
+  match (mty1, mty2) with
+  | Mty_ident p1, Mty_ident p2
+    when Path.same
+           (Env.normalize_path_prefix None env p1)
+           (Env.normalize_path_prefix None env p2) ->
+    Tcoerce_none
+  | _, Mty_ident p2 when may_expand_module_path env p2 ->
+    try_modtypes ~loc env cxt Subst.identity mty1
+      (expand_module_path env cxt p2)
+  | _, _ -> raise Dont_match
+
+(* Inclusion between signatures *)
+
+and signatures ~loc env cxt subst sig1 sig2 =
+  (* Environment used to check inclusion of components *)
+  let new_env = Env.add_signature sig1 (Env.in_signature true env) in
+  (* Keep ids for module aliases *)
+  let id_pos_list, _ =
+    List.fold_left
+      (fun ((l, pos) as id_pos) -> function
+        | Sig_module (id, _, _) -> ((id, pos, Tcoerce_none) :: l, pos + 1)
+        | item -> if is_runtime_component item then (l, pos + 1) else id_pos)
+      ([], 0) sig1
+  in
+
+  let runtime_fields =
+    let get_id = function
+      | Sig_value (i, _)
+      | Sig_module (i, _, _)
+      | Sig_typext (i, _, _)
+      | Sig_modtype (i, _)
+      | Sig_type (i, _, _) ->
+        Ident.name i
+      | Sig_class () | Sig_class_type () -> assert false
+    in
+    List.fold_right
+      (fun item fields ->
+        if is_runtime_component item then get_id item :: fields else fields)
+      sig2 []
+  in
+
+  (* Build a table of the components of sig1, along with their positions.
+     The table is indexed by kind and name of component *)
+  let rec build_component_table pos tbl = function
+    | [] -> (pos, tbl)
+    | item :: rem ->
+      let id, _loc, name = item_ident_name item in
+      let nextpos = if is_runtime_component item then pos + 1 else pos in
+      build_component_table nextpos (Tbl.add name (id, item, pos) tbl) rem
+  in
+  let len1, comps1 = build_component_table 0 Tbl.empty sig1 in
+  let len2 =
+    List.fold_left
+      (fun n i -> if is_runtime_component i then n + 1 else n)
+      0 sig2
+  in
+  (* Pair each component of sig2 with a component of sig1,
+     identifying the names along the way.
+     Return a coercion list indicating, for all run-time components
+     of sig2, the position of the matching run-time components of sig1
+     and the coercion to be applied to it. *)
+  let rec pair_components subst paired unpaired = function
+    | [] -> (
+      match unpaired with
+      | [] ->
+        let cc =
+          signature_components ~loc env new_env cxt subst (List.rev paired)
+        in
+        if len1 = len2 then
+          (* see PR#5098 *)
+          simplify_structure_coercion cc id_pos_list runtime_fields
+        else Tcoerce_structure (cc, id_pos_list, runtime_fields)
+      | _ -> raise (Error unpaired))
+    | item2 :: rem -> (
+      let id2, loc, name2 = item_ident_name item2 in
+      let name2, report =
+        match (item2, name2) with
+        | Sig_type (_, {type_manifest = None}, _), Field_type s
+          when Btype.is_row_name s ->
+          (* Do not report in case of failure,
+             as the main type will generate an error *)
+          (Field_type (String.sub s 0 (String.length s - 4)), false)
+        | _ -> (name2, true)
+      in
+      match Tbl.find name2 comps1 with
+      | id1, item1, pos1 ->
+        let new_subst =
+          match item2 with
+          | Sig_type _ -> Subst.add_type id2 (Pident id1) subst
+          | Sig_module _ -> Subst.add_module id2 (Pident id1) subst
+          | Sig_modtype _ ->
+            Subst.add_modtype id2 (Mty_ident (Pident id1)) subst
+          | Sig_value _ | Sig_typext _ | Sig_class _ | Sig_class_type () ->
+            subst
+        in
+        pair_components new_subst ((item1, item2, pos1) :: paired) unpaired rem
+      | exception Not_found ->
+        let unpaired =
+          if report then
+            (cxt, env, Missing_field (id2, loc, kind_of_field_desc name2))
+            :: unpaired
+          else unpaired
+        in
+        pair_components subst paired unpaired rem)
+  in
+  (* Do the pairing and checking, and return the final coercion *)
+  pair_components subst [] [] sig2
+
+(* Inclusion between signature components *)
+
+and signature_components ~loc old_env env cxt subst paired =
+  let comps_rec rem = signature_components ~loc old_env env cxt subst rem in
+  match paired with
+  | [] -> []
+  | (Sig_value (id1, valdecl1), Sig_value (_id2, valdecl2), pos) :: rem -> (
+    let cc = value_descriptions ~loc env cxt subst id1 valdecl1 valdecl2 in
+    match valdecl2.val_kind with
+    | Val_prim _ -> comps_rec rem
+    | _ -> (pos, cc) :: comps_rec rem)
+  | (Sig_type (id1, tydecl1, _), Sig_type (_id2, tydecl2, _), _pos) :: rem ->
+    type_declarations ~loc ~old_env env cxt subst id1 tydecl1 tydecl2;
+    comps_rec rem
+  | (Sig_typext (id1, ext1, _), Sig_typext (_id2, ext2, _), pos) :: rem ->
+    extension_constructors ~loc env cxt subst id1 ext1 ext2;
+    (pos, Tcoerce_none) :: comps_rec rem
+  | (Sig_module (id1, mty1, _), Sig_module (_id2, mty2, _), pos) :: rem ->
+    let cc = module_declarations ~loc env cxt subst id1 mty1 mty2 in
+    (pos, cc) :: comps_rec rem
+  | (Sig_modtype (id1, info1), Sig_modtype (_id2, info2), _pos) :: rem ->
+    modtype_infos ~loc env cxt subst id1 info1 info2;
+    comps_rec rem
+  | (Sig_class (), Sig_class (), _) :: _ -> assert false
+  | (Sig_class_type (), Sig_class_type (), _pos) :: _ -> assert false
+  | _ -> assert false
+
+and module_declarations ~loc env cxt subst id1 md1 md2 =
+  Builtin_attributes.check_deprecated_inclusion ~def:md1.md_loc ~use:md2.md_loc
+    loc md1.md_attributes md2.md_attributes (Ident.name id1);
+  let p1 = Pident id1 in
+  Env.mark_module_used env (Ident.name id1) md1.md_loc;
+  modtypes ~loc env (Module id1 :: cxt) subst
+    (Mtype.strengthen ~aliasable:true env md1.md_type p1)
+    md2.md_type
+
+(* Inclusion between module type specifications *)
+
+and modtype_infos ~loc env cxt subst id info1 info2 =
+  Builtin_attributes.check_deprecated_inclusion ~def:info1.mtd_loc
+    ~use:info2.mtd_loc loc info1.mtd_attributes info2.mtd_attributes
+    (Ident.name id);
+  let info2 = Subst.modtype_declaration subst info2 in
+  let cxt' = Modtype id :: cxt in
+  try
+    match (info1.mtd_type, info2.mtd_type) with
+    | None, None -> ()
+    | Some _, None -> ()
+    | Some mty1, Some mty2 -> check_modtype_equiv ~loc env cxt' mty1 mty2
+    | None, Some mty2 ->
+      check_modtype_equiv ~loc env cxt' (Mty_ident (Pident id)) mty2
+  with Error reasons ->
+    raise (Error ((cxt, env, Modtype_infos (id, info1, info2)) :: reasons))
+
+and check_modtype_equiv ~loc env cxt mty1 mty2 =
+  match
+    ( modtypes ~loc env cxt Subst.identity mty1 mty2,
+      modtypes ~loc env cxt Subst.identity mty2 mty1 )
+  with
+  | Tcoerce_none, Tcoerce_none -> ()
+  | _c1, _c2 ->
+    (* Format.eprintf "@[c1 = %a@ c2 = %a@]@."
+       print_coercion _c1 print_coercion _c2; *)
+    raise (Error [(cxt, env, Modtype_permutation)])
+
+(* Simplified inclusion check between module types (for Env) *)
+
+let can_alias env path =
+  let rec no_apply = function
+    | Pident _ -> true
+    | Pdot (p, _, _) -> no_apply p
+    | Papply _ -> false
+  in
+  no_apply path && not (Env.is_functor_arg path env)
+
+let check_modtype_inclusion ~loc env mty1 path1 mty2 =
+  try
+    let aliasable = can_alias env path1 in
+    ignore
+      (modtypes ~loc env [] Subst.identity
+         (Mtype.strengthen ~aliasable env mty1 path1)
+         mty2)
+  with Error _ -> raise Not_found
+
+let _ = Env.check_modtype_inclusion := check_modtype_inclusion
+
+(* Check that an implementation of a compilation unit meets its
+   interface. *)
+
+let compunit env impl_name impl_sig intf_name intf_sig =
+  try
+    signatures
+      ~loc:(Location.in_file impl_name)
+      env [] Subst.identity impl_sig intf_sig
+  with Error reasons ->
+    raise
+      (Error
+         (([], Env.empty, Interface_mismatch (impl_name, intf_name)) :: reasons))
+
+(* Hide the context and substitution parameters to the outside world *)
+
+let modtypes ~loc env mty1 mty2 = modtypes ~loc env [] Subst.identity mty1 mty2
+let signatures env sig1 sig2 =
+  signatures ~loc:Location.none env [] Subst.identity sig1 sig2
+let type_declarations ~loc env id decl1 decl2 =
+  type_declarations ~loc env [] Subst.identity id decl1 decl2
+
+(*
+let modtypes env m1 m2 =
+  let c = modtypes env m1 m2 in
+  Format.eprintf "@[<2>modtypes@ %a@ %a =@ %a@]@."
+    Printtyp.modtype m1 Printtyp.modtype m2
+    print_coercion c;
+  c
+*)
+
+(* Error report *)
+
+open Format
+open Printtyp
+
+let show_loc msg ppf loc =
+  fprintf ppf "@\n@[<2>%a:@ %s@]" Location.print_loc loc msg
+
+let show_locs ppf (loc1, loc2) =
+  show_loc "Expected declaration" ppf loc2;
+  show_loc "Actual declaration" ppf loc1
+
+let include_err ppf = function
+  | Missing_field (id, loc, kind) ->
+    fprintf ppf "The %s `%a' is required but not provided" kind ident id;
+    show_loc "Expected declaration" ppf loc
+  | Value_descriptions (id, d1, d2) ->
+    let curry_kind_1, curry_kind_2 = ("", "") in
+    fprintf ppf
+      "@[<hv 2>Values do not match:@ %a%s@;<1 -2>is not included in@ %a%s@]"
+      (value_description id) d1 curry_kind_1 (value_description id) d2
+      curry_kind_2;
+    show_locs ppf (d1.val_loc, d2.val_loc)
+  | Type_declarations (id, d1, d2, errs) ->
+    fprintf ppf "@[<v>@[<hv>%s:@;<1 2>%a@ %s@;<1 2>%a@]%a%a@]"
+      "Type declarations do not match" (type_declaration id) d1
+      "is not included in" (type_declaration id) d2 show_locs
+      (d1.type_loc, d2.type_loc)
+      (Includecore.report_type_mismatch "the first" "the second" "declaration")
+      errs
+  | Extension_constructors (id, x1, x2) ->
+    fprintf ppf
+      "@[<hv 2>Extension declarations do not match:@ %a@;\
+       <1 -2>is not included in@ %a@]"
+      (extension_constructor id) x1 (extension_constructor id) x2;
+    show_locs ppf (x1.ext_loc, x2.ext_loc)
+  | Module_types (mty1, mty2) ->
+    fprintf ppf
+      "@[<hv 2>Modules do not match:@ %a@;<1 -2>is not included in@ %a@]"
+      modtype mty1 modtype mty2
+  | Modtype_infos (id, d1, d2) ->
+    fprintf ppf
+      "@[<hv 2>Module type declarations do not match:@ %a@;\
+       <1 -2>does not match@ %a@]"
+      (modtype_declaration id) d1 (modtype_declaration id) d2
+  | Modtype_permutation -> fprintf ppf "Illegal permutation of structure fields"
+  | Interface_mismatch (impl_name, intf_name) ->
+    fprintf ppf "@[The implementation %s@ does not match the interface %s:"
+      impl_name intf_name
+  | Unbound_modtype_path path ->
+    fprintf ppf "Unbound module type %a" Printtyp.path path
+  | Unbound_module_path path ->
+    fprintf ppf "Unbound module %a" Printtyp.path path
+  | Invalid_module_alias path ->
+    fprintf ppf "Module %a cannot be aliased" Printtyp.path path
+
+let rec context ppf = function
+  | Module id :: rem -> fprintf ppf "@[<2>module %a%a@]" ident id args rem
+  | Modtype id :: rem ->
+    fprintf ppf "@[<2>module type %a =@ %a@]" ident id context_mty rem
+  | Body x :: rem ->
+    fprintf ppf "functor (%s) ->@ %a" (argname x) context_mty rem
+  | Arg x :: rem ->
+    fprintf ppf "functor (%a : %a) -> ..." ident x context_mty rem
+  | [] -> fprintf ppf "<here>"
+
+and context_mty ppf = function
+  | (Module _ | Modtype _) :: _ as rem ->
+    fprintf ppf "@[<2>sig@ %a@;<1 -2>end@]" context rem
+  | cxt -> context ppf cxt
+
+and args ppf = function
+  | Body x :: rem -> fprintf ppf "(%s)%a" (argname x) args rem
+  | Arg x :: rem -> fprintf ppf "(%a :@ %a) : ..." ident x context_mty rem
+  | cxt -> fprintf ppf " :@ %a" context_mty cxt
+
+and argname x =
+  let s = Ident.name x in
+  if s = "*" then "" else s
+
+let path_of_context = function
+  | Module id :: rem ->
+    let rec subm path = function
+      | [] -> path
+      | Module id :: rem -> subm (Pdot (path, Ident.name id, -1)) rem
+      | _ -> assert false
+    in
+    subm (Pident id) rem
+  | _ -> assert false
+
+let context ppf cxt =
+  if cxt = [] then ()
+  else if
+    List.for_all
+      (function
+        | Module _ -> true
+        | _ -> false)
+      cxt
+  then fprintf ppf "In module %a:@ " path (path_of_context cxt)
+  else fprintf ppf "@[<hv 2>At position@ %a@]@ " context cxt
+
+let include_err ppf (cxt, env, err) =
+  Printtyp.wrap_printing_env env (fun () ->
+      fprintf ppf "@[<v>%a%a@]" context (List.rev cxt) include_err err)
+
+let buffer = ref Bytes.empty
+let is_big obj =
+  let size = !Clflags.error_size in
+  size > 0
+  &&
+  (if Bytes.length !buffer < size then buffer := Bytes.create size;
+   try
+     ignore (Marshal.to_buffer !buffer 0 size obj []);
+     false
+   with _ -> true)
+
+let report_error ppf errs =
+  if errs = [] then ()
+  else
+    let errs, err = split_last errs in
+    let pe = ref true in
+    let include_err' ppf ((_, _, obj) as err) =
+      if not (is_big obj) then fprintf ppf "%a@ " include_err err
+      else if !pe then (
+        fprintf ppf "...@ ";
+        pe := false)
+    in
+    let print_errs ppf = List.iter (include_err' ppf) in
+    fprintf ppf "@[<v>%a%a@]" print_errs errs include_err err
+
+let better_candidate_loc (x : error list) =
+  match x with
+  | [(_, _, Interface_mismatch _); (_, _, descr)] -> (
+    match descr with
+    | Value_descriptions (_, d1, _) -> Some d1.val_loc
+    | Type_declarations (_, tdcl1, _, _) -> Some tdcl1.type_loc
+    | Missing_field (_, loc, _) -> Some loc
+    | _ -> None)
+  | _ -> None
+
+(* We could do a better job to split the individual error items
+   as sub-messages of the main interface mismatch on the whole unit. *)
+let () =
+  Location.register_error_of_exn (function
+    | Error err -> (
+      match better_candidate_loc err with
+      | None -> Some (Location.error_of_printer_file report_error err)
+      | Some loc -> Some (Location.error_of_printer loc report_error err))
+    | _ -> None)
diff --git a/compiler/ml/includemod.mli b/compiler/ml/includemod.mli
new file mode 100644
index 0000000..9399f2b
--- /dev/null
+++ b/compiler/ml/includemod.mli
@@ -0,0 +1,68 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Inclusion checks for the module language *)
+
+open Typedtree
+open Types
+open Format
+
+val modtypes :
+  loc:Location.t -> Env.t -> module_type -> module_type -> module_coercion
+
+val signatures : Env.t -> signature -> signature -> module_coercion
+
+val compunit :
+  Env.t -> string -> signature -> string -> signature -> module_coercion
+
+val type_declarations :
+  loc:Location.t ->
+  Env.t ->
+  Ident.t ->
+  type_declaration ->
+  type_declaration ->
+  unit
+
+val print_coercion : formatter -> module_coercion -> unit
+
+type symptom =
+  | Missing_field of Ident.t * Location.t * string (* kind *)
+  | Value_descriptions of Ident.t * value_description * value_description
+  | Type_declarations of
+      Ident.t
+      * type_declaration
+      * type_declaration
+      * Includecore.type_mismatch list
+  | Extension_constructors of
+      Ident.t * extension_constructor * extension_constructor
+  | Module_types of module_type * module_type
+  | Modtype_infos of Ident.t * modtype_declaration * modtype_declaration
+  | Modtype_permutation
+  | Interface_mismatch of string * string
+  | Unbound_modtype_path of Path.t
+  | Unbound_module_path of Path.t
+  | Invalid_module_alias of Path.t
+
+type pos =
+  | Module of Ident.t
+  | Modtype of Ident.t
+  | Arg of Ident.t
+  | Body of Ident.t
+type error = pos list * Env.t * symptom
+
+exception Error of error list
+
+val report_error : formatter -> error list -> unit
+val expand_module_alias : Env.t -> pos list -> Path.t -> Types.module_type
diff --git a/jscomp/ml/js_raw_info.ml b/compiler/ml/js_raw_info.ml
similarity index 100%
rename from jscomp/ml/js_raw_info.ml
rename to compiler/ml/js_raw_info.ml
diff --git a/compiler/ml/lambda.ml b/compiler/ml/lambda.ml
new file mode 100644
index 0000000..db810d4
--- /dev/null
+++ b/compiler/ml/lambda.ml
@@ -0,0 +1,731 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+type loc_kind = Loc_FILE | Loc_LINE | Loc_MODULE | Loc_LOC | Loc_POS
+
+type tag_info =
+  | Blk_constructor of {
+      name: string;
+      num_nonconst: int;
+      tag: int;
+      attrs: Parsetree.attributes;
+    }
+  | Blk_record_inlined of {
+      name: string;
+      num_nonconst: int;
+      tag: int;
+      fields: (string * bool (* optional *)) array;
+      mutable_flag: Asttypes.mutable_flag;
+      attrs: Parsetree.attributes;
+    }
+  | Blk_tuple
+  | Blk_poly_var of string
+  | Blk_record of {
+      fields: (string * bool (* optional *)) array;
+      mutable_flag: Asttypes.mutable_flag;
+    }
+  | Blk_module of string list
+  | Blk_module_export of Ident.t list
+  | Blk_extension
+  | Blk_some
+  | Blk_some_not_nested
+    (* ['a option] where ['a] can not inhabit a non-like value *)
+  | Blk_record_ext of {
+      fields: string array;
+      mutable_flag: Asttypes.mutable_flag;
+    }
+
+let tag_of_tag_info (tag : tag_info) =
+  match tag with
+  | Blk_constructor {tag} | Blk_record_inlined {tag} -> tag
+  | Blk_tuple | Blk_poly_var _ | Blk_record _ | Blk_module _
+  | Blk_module_export _ | Blk_extension | Blk_some (* tag not make sense *)
+  | Blk_some_not_nested (* tag not make sense *)
+  | Blk_record_ext _ (* similar to Blk_extension*) ->
+    0
+
+let mutable_flag_of_tag_info (tag : tag_info) =
+  match tag with
+  | Blk_record_inlined {mutable_flag}
+  | Blk_record {mutable_flag}
+  | Blk_record_ext {mutable_flag} ->
+    mutable_flag
+  | Blk_tuple | Blk_constructor _ | Blk_poly_var _ | Blk_module _
+  | Blk_module_export _ | Blk_extension | Blk_some_not_nested | Blk_some ->
+    Immutable
+
+type label = Types.label_description
+
+let find_name (attr : Parsetree.attribute) =
+  match attr with
+  | ( {txt = "as"},
+      PStr
+        [
+          {
+            pstr_desc =
+              Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string (s, _))}, _);
+          };
+        ] ) ->
+    Some s
+  | _ -> None
+
+let blk_record (fields : (label * _ * _) array) mut =
+  let all_labels_info =
+    Ext_array.map fields (fun (lbl, _, _) ->
+        ( Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name,
+          lbl.lbl_optional ))
+  in
+  Blk_record {fields = all_labels_info; mutable_flag = mut}
+
+let blk_record_ext fields mutable_flag =
+  let all_labels_info =
+    Array.map
+      (fun ((lbl : label), _, _) ->
+        Ext_list.find_def lbl.Types.lbl_attributes find_name lbl.lbl_name)
+      fields
+  in
+  Blk_record_ext {fields = all_labels_info; mutable_flag}
+
+let blk_record_inlined fields name num_nonconst ~tag ~attrs mutable_flag =
+  let fields =
+    Array.map
+      (fun ((lbl : label), _, _) ->
+        ( Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name,
+          lbl.lbl_optional ))
+      fields
+  in
+  Blk_record_inlined {fields; name; num_nonconst; tag; mutable_flag; attrs}
+
+let ref_tag_info : tag_info =
+  Blk_record {fields = [|("contents", false)|]; mutable_flag = Mutable}
+
+type field_dbg_info =
+  | Fld_record of {name: string; mutable_flag: Asttypes.mutable_flag}
+  | Fld_module of {name: string}
+  | Fld_record_inline of {name: string}
+  | Fld_record_extension of {name: string}
+  | Fld_tuple
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+  | Fld_extension
+  | Fld_variant
+  | Fld_cons
+
+let fld_record (lbl : label) =
+  Fld_record
+    {
+      name = Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name;
+      mutable_flag = lbl.lbl_mut;
+    }
+
+let fld_record_extension (lbl : label) =
+  Fld_record_extension
+    {name = Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name}
+
+let ref_field_info : field_dbg_info =
+  Fld_record {name = "contents"; mutable_flag = Mutable}
+
+type set_field_dbg_info =
+  | Fld_record_set of string
+  | Fld_record_inline_set of string
+  | Fld_record_extension_set of string
+
+let ref_field_set_info : set_field_dbg_info = Fld_record_set "contents"
+let fld_record_set (lbl : label) =
+  Fld_record_set (Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
+
+let fld_record_inline (lbl : label) =
+  Fld_record_inline
+    {name = Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name}
+
+let fld_record_inline_set (lbl : label) =
+  Fld_record_inline_set
+    (Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
+
+let fld_record_extension_set (lbl : label) =
+  Fld_record_extension_set
+    (Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
+
+type immediate_or_pointer = Immediate | Pointer
+
+type primitive =
+  | Pidentity
+  | Pignore
+  | Pdebugger
+  | Ptypeof
+  | Pnull
+  | Pundefined
+  | Pfn_arity
+  | Prevapply
+  | Pdirapply
+  | Ploc of loc_kind (* Globals *)
+  | Pgetglobal of Ident.t
+  (* Operations on heap blocks *)
+  | Pmakeblock of tag_info
+  | Pfield of int * field_dbg_info
+  | Psetfield of int * set_field_dbg_info
+  | Pduprecord
+  (* External call *)
+  | Pccall of Primitive.description
+  (* Exceptions *)
+  | Praise of raise_kind
+  (* object operations *)
+  | Pobjcomp of comparison
+  | Pobjorder
+  | Pobjmin
+  | Pobjmax
+  | Pobjtag
+  | Pobjsize
+  (* Boolean operations *)
+  | Psequand
+  | Psequor
+  | Pnot
+  | Pboolcomp of comparison
+  | Pboolorder
+  | Pboolmin
+  | Pboolmax
+  (* Integer operations *)
+  | Pnegint
+  | Paddint
+  | Psubint
+  | Pmulint
+  | Pdivint
+  | Pmodint
+  | Ppowint
+  | Pandint
+  | Porint
+  | Pxorint
+  | Pnotint
+  | Plslint
+  | Plsrint
+  | Pasrint
+  | Pintcomp of comparison
+  | Pintorder
+  | Pintmin
+  | Pintmax
+  | Poffsetint of int
+  | Poffsetref of int
+  (* Float operations *)
+  | Pintoffloat
+  | Pfloatofint
+  | Pnegfloat
+  | Pabsfloat
+  | Pmodfloat
+  | Paddfloat
+  | Psubfloat
+  | Pmulfloat
+  | Pdivfloat
+  | Ppowfloat
+  | Pfloatcomp of comparison
+  | Pfloatorder
+  | Pfloatmin
+  | Pfloatmax
+  (* BigInt operations *)
+  | Pnegbigint
+  | Paddbigint
+  | Psubbigint
+  | Ppowbigint
+  | Pmulbigint
+  | Pdivbigint
+  | Pmodbigint
+  | Pandbigint
+  | Porbigint
+  | Pxorbigint
+  | Pnotbigint
+  | Plslbigint
+  | Pasrbigint
+  | Pbigintcomp of comparison
+  | Pbigintorder
+  | Pbigintmin
+  | Pbigintmax
+  (* String operations *)
+  | Pstringlength
+  | Pstringrefu
+  | Pstringrefs
+  | Pstringcomp of comparison
+  | Pstringorder
+  | Pstringmin
+  | Pstringmax
+  | Pstringadd
+  (* Array operations *)
+  | Pmakearray of Asttypes.mutable_flag
+  | Parraylength
+  | Parrayrefu
+  | Parraysetu
+  | Parrayrefs
+  | Parraysets
+  (* List primitives *)
+  | Pmakelist of Asttypes.mutable_flag
+  (* dict primitives *)
+  | Pmakedict
+  | Pdict_has
+  (* promise *)
+  | Pawait
+  (* module *)
+  | Pimport
+  | Pinit_mod
+  | Pupdate_mod
+  (* hash *)
+  | Phash
+  | Phash_mixint
+  | Phash_mixstring
+  | Phash_finalmix
+  (* Test if the argument is a block or an immediate integer *)
+  | Pisint
+  (* Test if the (integer) argument is outside an interval *)
+  | Pisout
+  (* Test if the argument is null or undefined *)
+  | Pisnullable
+  (* exn *)
+  | Pcreate_extension of string
+  | Pextension_slot_eq
+  | Pwrap_exn
+  (* js *)
+  | Pcurry_apply of int
+  | Pjscomp of comparison
+  | Pnull_to_opt
+  | Pnullable_to_opt
+  | Pis_not_none
+  | Pval_from_option
+  | Pval_from_option_not_nest
+  | Pis_poly_var_block
+  | Pjs_raw_expr
+  | Pjs_raw_stmt
+  | Pjs_fn_make of int
+  | Pjs_fn_make_unit
+  | Pjs_fn_method
+
+and comparison = Ceq | Cneq | Clt | Cgt | Cle | Cge
+
+and value_kind = Pgenval
+
+and raise_kind = Raise_regular | Raise_reraise
+
+type pointer_info =
+  | Pt_constructor of {
+      name: string;
+      const: int;
+      non_const: int;
+      attrs: Parsetree.attributes;
+    }
+  | Pt_variant of {name: string}
+  | Pt_module_alias
+  | Pt_shape_none
+  | Pt_assertfalse
+
+type structured_constant =
+  | Const_base of Asttypes.constant
+  | Const_pointer of int * pointer_info
+  | Const_block of tag_info * structured_constant list
+  | Const_immstring of string
+  | Const_false
+  | Const_true
+type inline_attribute =
+  | Always_inline (* [@inline] or [@inline always] *)
+  | Never_inline (* [@inline never] *)
+  | Default_inline (* no [@inline] attribute *)
+
+type let_kind = Strict | Alias | StrictOpt | Variable
+
+type function_attribute = {
+  inline: inline_attribute;
+  is_a_functor: bool;
+  return_unit: bool;
+  async: bool;
+  directive: string option;
+  one_unit_arg: bool;
+}
+
+type lambda =
+  | Lvar of Ident.t
+  | Lconst of structured_constant
+  | Lapply of lambda_apply
+  | Lfunction of lfunction
+  | Llet of let_kind * value_kind * Ident.t * lambda * lambda
+  | Lletrec of (Ident.t * lambda) list * lambda
+  | Lprim of primitive * lambda list * Location.t
+  | Lswitch of lambda * lambda_switch * Location.t
+  | Lstringswitch of
+      lambda * (string * lambda) list * lambda option * Location.t
+  | Lstaticraise of int * lambda list
+  | Lstaticcatch of lambda * (int * Ident.t list) * lambda
+  | Ltrywith of lambda * Ident.t * lambda
+  | Lifthenelse of lambda * lambda * lambda
+  | Lsequence of lambda * lambda
+  | Lwhile of lambda * lambda
+  | Lfor of Ident.t * lambda * lambda * Asttypes.direction_flag * lambda
+  | Lassign of Ident.t * lambda
+  | Lsend of string * lambda * Location.t
+
+and lfunction = {
+  params: Ident.t list;
+  body: lambda;
+  attr: function_attribute; (* specified with [@inline] attribute *)
+  loc: Location.t;
+}
+
+and lambda_apply = {
+  ap_func: lambda;
+  ap_args: lambda list;
+  ap_loc: Location.t;
+  ap_inlined: inline_attribute;
+  ap_transformed_jsx: bool;
+}
+
+and lambda_switch = {
+  sw_numconsts: int;
+  sw_consts: (int * lambda) list;
+  sw_numblocks: int;
+  sw_blocks: (int * lambda) list;
+  sw_failaction: lambda option;
+  sw_names: Ast_untagged_variants.switch_names option;
+}
+
+(* This is actually a dummy value
+    not necessary "()", it can be used as a place holder for module
+    alias etc.
+*)
+let const_unit =
+  Const_pointer
+    (0, Pt_constructor {name = "()"; const = 1; non_const = 0; attrs = []})
+
+let lambda_assert_false = Lconst (Const_pointer (0, Pt_assertfalse))
+
+let lambda_module_alias = Lconst (Const_pointer (0, Pt_module_alias))
+
+let lambda_unit = Lconst const_unit
+
+let default_function_attribute =
+  {
+    inline = Default_inline;
+    is_a_functor = false;
+    return_unit = false;
+    async = false;
+    one_unit_arg = false;
+    directive = None;
+  }
+
+(* Build sharing keys *)
+(*
+   Those keys are later compared with Pervasives.compare.
+   For that reason, they should not include cycles.
+*)
+
+exception Not_simple
+
+let max_raw = 32
+
+let make_key e =
+  let count = ref 0 (* Used for controling size *)
+  and make_key = Ident.make_key_generator () in
+  (* make_key is used for normalizing let-bound variables *)
+  let rec tr_rec env e =
+    incr count;
+    if !count > max_raw then raise_notrace Not_simple;
+    (* Too big ! *)
+    match e with
+    | Lvar id -> ( try Ident.find_same id env with Not_found -> e)
+    | Lconst (Const_base (Const_string _)) ->
+      (* Mutable constants are not shared *)
+      raise_notrace Not_simple
+    | Lconst _ -> e
+    | Lapply ap ->
+      Lapply
+        {
+          ap with
+          ap_func = tr_rec env ap.ap_func;
+          ap_args = tr_recs env ap.ap_args;
+          ap_loc = Location.none;
+        }
+    | Llet (Alias, _k, x, ex, e) ->
+      (* Ignore aliases -> substitute *)
+      let ex = tr_rec env ex in
+      tr_rec (Ident.add x ex env) e
+    | Llet ((Strict | StrictOpt), _k, x, ex, Lvar v) when Ident.same v x ->
+      tr_rec env ex
+    | Llet (str, k, x, ex, e) ->
+      (* Because of side effects, keep other lets with normalized names *)
+      let ex = tr_rec env ex in
+      let y = make_key x in
+      Llet (str, k, y, ex, tr_rec (Ident.add x (Lvar y) env) e)
+    | Lprim (p, es, _) -> Lprim (p, tr_recs env es, Location.none)
+    | Lswitch (e, sw, loc) -> Lswitch (tr_rec env e, tr_sw env sw, loc)
+    | Lstringswitch (e, sw, d, _) ->
+      Lstringswitch
+        ( tr_rec env e,
+          List.map (fun (s, e) -> (s, tr_rec env e)) sw,
+          tr_opt env d,
+          Location.none )
+    | Lstaticraise (i, es) -> Lstaticraise (i, tr_recs env es)
+    | Lstaticcatch (e1, xs, e2) ->
+      Lstaticcatch (tr_rec env e1, xs, tr_rec env e2)
+    | Ltrywith (e1, x, e2) -> Ltrywith (tr_rec env e1, x, tr_rec env e2)
+    | Lifthenelse (cond, ifso, ifnot) ->
+      Lifthenelse (tr_rec env cond, tr_rec env ifso, tr_rec env ifnot)
+    | Lsequence (e1, e2) -> Lsequence (tr_rec env e1, tr_rec env e2)
+    | Lassign (x, e) -> Lassign (x, tr_rec env e)
+    | Lsend (m, e1, _loc) -> Lsend (m, tr_rec env e1, Location.none)
+    | Lletrec _ | Lfunction _ | Lfor _ | Lwhile _ -> raise_notrace Not_simple
+  and tr_recs env es = List.map (tr_rec env) es
+  and tr_sw env sw =
+    {
+      sw with
+      sw_consts = List.map (fun (i, e) -> (i, tr_rec env e)) sw.sw_consts;
+      sw_blocks = List.map (fun (i, e) -> (i, tr_rec env e)) sw.sw_blocks;
+      sw_failaction = tr_opt env sw.sw_failaction;
+    }
+  and tr_opt env = function
+    | None -> None
+    | Some e -> Some (tr_rec env e)
+  in
+
+  try Some (tr_rec Ident.empty e) with Not_simple -> None
+
+(***************)
+
+let name_lambda strict arg fn =
+  match arg with
+  | Lvar id -> fn id
+  | _ ->
+    let id = Ident.create "let" in
+    Llet (strict, Pgenval, id, arg, fn id)
+
+let iter_opt f = function
+  | None -> ()
+  | Some e -> f e
+
+let iter f = function
+  | Lvar _ | Lconst _ -> ()
+  | Lapply {ap_func = fn; ap_args = args} ->
+    f fn;
+    List.iter f args
+  | Lfunction {body} -> f body
+  | Llet (_str, _k, _id, arg, body) ->
+    f arg;
+    f body
+  | Lletrec (decl, body) ->
+    f body;
+    List.iter (fun (_id, exp) -> f exp) decl
+  | Lprim (_p, args, _loc) -> List.iter f args
+  | Lswitch (arg, sw, _) ->
+    f arg;
+    List.iter (fun (_key, case) -> f case) sw.sw_consts;
+    List.iter (fun (_key, case) -> f case) sw.sw_blocks;
+    iter_opt f sw.sw_failaction
+  | Lstringswitch (arg, cases, default, _) ->
+    f arg;
+    List.iter (fun (_, act) -> f act) cases;
+    iter_opt f default
+  | Lstaticraise (_, args) -> List.iter f args
+  | Lstaticcatch (e1, _, e2) ->
+    f e1;
+    f e2
+  | Ltrywith (e1, _, e2) ->
+    f e1;
+    f e2
+  | Lifthenelse (e1, e2, e3) ->
+    f e1;
+    f e2;
+    f e3
+  | Lsequence (e1, e2) ->
+    f e1;
+    f e2
+  | Lwhile (e1, e2) ->
+    f e1;
+    f e2
+  | Lfor (_v, e1, e2, _dir, e3) ->
+    f e1;
+    f e2;
+    f e3
+  | Lassign (_, e) -> f e
+  | Lsend (_k, obj, _) -> f obj
+
+module IdentSet = Set.Make (Ident)
+
+let free_ids get l =
+  let fv = ref IdentSet.empty in
+  let rec free l =
+    iter free l;
+    fv := List.fold_right IdentSet.add (get l) !fv;
+    match l with
+    | Lfunction {params} ->
+      List.iter (fun param -> fv := IdentSet.remove param !fv) params
+    | Llet (_str, _k, id, _arg, _body) -> fv := IdentSet.remove id !fv
+    | Lletrec (decl, _body) ->
+      List.iter (fun (id, _exp) -> fv := IdentSet.remove id !fv) decl
+    | Lstaticcatch (_e1, (_, vars), _e2) ->
+      List.iter (fun id -> fv := IdentSet.remove id !fv) vars
+    | Ltrywith (_e1, exn, _e2) -> fv := IdentSet.remove exn !fv
+    | Lfor (v, _e1, _e2, _dir, _e3) -> fv := IdentSet.remove v !fv
+    | Lassign (id, _e) -> fv := IdentSet.add id !fv
+    | Lvar _ | Lconst _ | Lapply _ | Lprim _ | Lswitch _ | Lstringswitch _
+    | Lstaticraise _ | Lifthenelse _ | Lsequence _ | Lwhile _ | Lsend _ ->
+      ()
+  in
+  free l;
+  !fv
+
+let free_variables l =
+  free_ids
+    (function
+      | Lvar id -> [id]
+      | _ -> [])
+    l
+
+(* Check if an action has a "when" guard *)
+let raise_count = ref 0
+
+let next_raise_count () =
+  incr raise_count;
+  !raise_count
+
+let negative_raise_count = ref 0
+
+let next_negative_raise_count () =
+  decr negative_raise_count;
+  !negative_raise_count
+
+(* Anticipated staticraise, for guards *)
+let staticfail = Lstaticraise (0, [])
+
+let rec is_guarded = function
+  | Lifthenelse (_cond, _body, Lstaticraise (0, [])) -> true
+  | Llet (_str, _k, _id, _lam, body) -> is_guarded body
+  | _ -> false
+
+let rec patch_guarded patch = function
+  | Lifthenelse (cond, body, Lstaticraise (0, [])) ->
+    Lifthenelse (cond, body, patch)
+  | Llet (str, k, id, lam, body) ->
+    Llet (str, k, id, lam, patch_guarded patch body)
+  | _ -> assert false
+
+(* Translate an access path *)
+
+let rec transl_normal_path = function
+  | Path.Pident id ->
+    if Ident.global id then Lprim (Pgetglobal id, [], Location.none)
+    else Lvar id
+  | Pdot (p, s, pos) ->
+    Lprim
+      ( Pfield (pos, Fld_module {name = s}),
+        [transl_normal_path p],
+        Location.none )
+  | Papply _ -> assert false
+
+(* Translation of identifiers *)
+
+let transl_module_path ?(loc = Location.none) env path =
+  transl_normal_path (Env.normalize_path (Some loc) env path)
+
+let transl_value_path ?(loc = Location.none) env path =
+  transl_normal_path (Env.normalize_path_prefix (Some loc) env path)
+
+let transl_extension_path = transl_value_path
+
+(* Apply a substitution to a lambda-term.
+   Assumes that the bound variables of the lambda-term do not
+   belong to the domain of the substitution.
+   Assumes that the image of the substitution is out of reach
+   of the bound variables of the lambda-term (no capture). *)
+
+let subst_lambda s lam =
+  let rec subst = function
+    | Lvar id as l -> ( try Ident.find_same id s with Not_found -> l)
+    | Lconst _ as l -> l
+    | Lapply ap ->
+      Lapply
+        {
+          ap with
+          ap_func = subst ap.ap_func;
+          ap_args = List.map subst ap.ap_args;
+        }
+    | Lfunction {params; body; attr; loc} ->
+      Lfunction {params; body = subst body; attr; loc}
+    | Llet (str, k, id, arg, body) -> Llet (str, k, id, subst arg, subst body)
+    | Lletrec (decl, body) -> Lletrec (List.map subst_decl decl, subst body)
+    | Lprim (p, args, loc) -> Lprim (p, List.map subst args, loc)
+    | Lswitch (arg, sw, loc) ->
+      Lswitch
+        ( subst arg,
+          {
+            sw with
+            sw_consts = List.map subst_case sw.sw_consts;
+            sw_blocks = List.map subst_case sw.sw_blocks;
+            sw_failaction = subst_opt sw.sw_failaction;
+          },
+          loc )
+    | Lstringswitch (arg, cases, default, loc) ->
+      Lstringswitch
+        (subst arg, List.map subst_strcase cases, subst_opt default, loc)
+    | Lstaticraise (i, args) -> Lstaticraise (i, List.map subst args)
+    | Lstaticcatch (e1, io, e2) -> Lstaticcatch (subst e1, io, subst e2)
+    | Ltrywith (e1, exn, e2) -> Ltrywith (subst e1, exn, subst e2)
+    | Lifthenelse (e1, e2, e3) -> Lifthenelse (subst e1, subst e2, subst e3)
+    | Lsequence (e1, e2) -> Lsequence (subst e1, subst e2)
+    | Lwhile (e1, e2) -> Lwhile (subst e1, subst e2)
+    | Lfor (v, e1, e2, dir, e3) -> Lfor (v, subst e1, subst e2, dir, subst e3)
+    | Lassign (id, e) -> Lassign (id, subst e)
+    | Lsend (k, obj, loc) -> Lsend (k, subst obj, loc)
+  and subst_decl (id, exp) = (id, subst exp)
+  and subst_case (key, case) = (key, subst case)
+  and subst_strcase (key, case) = (key, subst case)
+  and subst_opt = function
+    | None -> None
+    | Some e -> Some (subst e)
+  in
+  subst lam
+
+(* To let-bind expressions to variables *)
+
+let bind str var exp body =
+  match exp with
+  | Lvar var' when Ident.same var var' -> body
+  | _ -> Llet (str, Pgenval, var, exp, body)
+
+let raise_kind = function
+  | Raise_regular -> "raise"
+  | Raise_reraise -> "reraise"
+
+let lam_of_loc kind loc =
+  let loc_start = loc.Location.loc_start in
+  let file, lnum, cnum = Location.get_pos_info loc_start in
+  let file = Filename.basename file in
+  let enum =
+    loc.Location.loc_end.Lexing.pos_cnum - loc_start.Lexing.pos_cnum + cnum
+  in
+  match kind with
+  | Loc_POS ->
+    Lconst
+      (Const_block
+         ( Blk_tuple,
+           [
+             Const_immstring file;
+             Const_base (Const_int lnum);
+             Const_base (Const_int cnum);
+             Const_base (Const_int enum);
+           ] ))
+  | Loc_FILE -> Lconst (Const_immstring file)
+  | Loc_MODULE ->
+    let filename = Filename.basename file in
+    let name = Env.get_unit_name () in
+    let module_name = if name = "" then "//" ^ filename ^ "//" else name in
+    Lconst (Const_immstring module_name)
+  | Loc_LOC ->
+    let loc =
+      Printf.sprintf "File %S, line %d, characters %d-%d" file lnum cnum enum
+    in
+    Lconst (Const_immstring loc)
+  | Loc_LINE -> Lconst (Const_base (Const_int lnum))
diff --git a/compiler/ml/lambda.mli b/compiler/ml/lambda.mli
new file mode 100644
index 0000000..d8eaf57
--- /dev/null
+++ b/compiler/ml/lambda.mli
@@ -0,0 +1,422 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* The "lambda" intermediate code *)
+
+open Asttypes
+
+type loc_kind = Loc_FILE | Loc_LINE | Loc_MODULE | Loc_LOC | Loc_POS
+
+type tag_info =
+  | Blk_constructor of {
+      name: string;
+      num_nonconst: int;
+      tag: int;
+      attrs: Parsetree.attributes;
+    }
+  | Blk_record_inlined of {
+      name: string;
+      num_nonconst: int;
+      tag: int;
+      fields: (string * bool (* optional *)) array;
+      mutable_flag: mutable_flag;
+      attrs: Parsetree.attributes;
+    }
+  | Blk_tuple
+  | Blk_poly_var of string
+  | Blk_record of {
+      fields: (string * bool (* optional *)) array;
+      mutable_flag: mutable_flag;
+    }
+  | Blk_module of string list
+  | Blk_module_export of Ident.t list
+  | Blk_extension
+    (* underlying is the same as tuple, immutable block
+       {[
+          exception A of int * int
+       ]}
+       is translated into
+       {[
+         [A, x, y]
+       ]}
+    *)
+  | Blk_some
+  | Blk_some_not_nested
+    (* ['a option] where ['a] can not inhabit a non-like value *)
+  | Blk_record_ext of {fields: string array; mutable_flag: mutable_flag}
+
+val find_name : Parsetree.attribute -> Asttypes.label option
+
+val tag_of_tag_info : tag_info -> int
+val mutable_flag_of_tag_info : tag_info -> mutable_flag
+val blk_record :
+  (Types.label_description * Typedtree.record_label_definition * bool) array ->
+  mutable_flag ->
+  tag_info
+
+val blk_record_ext :
+  (Types.label_description * Typedtree.record_label_definition * bool) array ->
+  mutable_flag ->
+  tag_info
+
+val blk_record_inlined :
+  (Types.label_description * Typedtree.record_label_definition * bool) array ->
+  string ->
+  int ->
+  tag:int ->
+  attrs:Parsetree.attributes ->
+  mutable_flag ->
+  tag_info
+
+val ref_tag_info : tag_info
+
+type field_dbg_info =
+  | Fld_record of {name: string; mutable_flag: Asttypes.mutable_flag}
+  | Fld_module of {name: string}
+  | Fld_record_inline of {name: string}
+  | Fld_record_extension of {name: string}
+  | Fld_tuple
+  | Fld_poly_var_tag
+  | Fld_poly_var_content
+  | Fld_extension
+  | Fld_variant
+  | Fld_cons
+
+val fld_record : Types.label_description -> field_dbg_info
+
+val fld_record_inline : Types.label_description -> field_dbg_info
+
+val fld_record_extension : Types.label_description -> field_dbg_info
+
+val ref_field_info : field_dbg_info
+
+type set_field_dbg_info =
+  | Fld_record_set of string
+  | Fld_record_inline_set of string
+  | Fld_record_extension_set of string
+
+val ref_field_set_info : set_field_dbg_info
+
+val fld_record_set : Types.label_description -> set_field_dbg_info
+
+val fld_record_inline_set : Types.label_description -> set_field_dbg_info
+
+val fld_record_extension_set : Types.label_description -> set_field_dbg_info
+
+type immediate_or_pointer = Immediate | Pointer
+
+type pointer_info =
+  | Pt_constructor of {
+      name: string;
+      const: int;
+      non_const: int;
+      attrs: Parsetree.attributes;
+    }
+  | Pt_variant of {name: string}
+  | Pt_module_alias
+  | Pt_shape_none
+  | Pt_assertfalse
+
+type primitive =
+  | Pidentity
+  | Pignore
+  | Pdebugger
+  | Ptypeof
+  | Pnull
+  | Pundefined
+  | Pfn_arity
+  | Prevapply
+  | Pdirapply
+  | Ploc of loc_kind (* Globals *)
+  | Pgetglobal of Ident.t
+  (* Operations on heap blocks *)
+  | Pmakeblock of tag_info
+  | Pfield of int * field_dbg_info
+  | Psetfield of int * set_field_dbg_info
+  | Pduprecord
+  (* External call *)
+  | Pccall of Primitive.description
+  (* Exceptions *)
+  | Praise of raise_kind
+  (* object primitives *)
+  | Pobjcomp of comparison
+  | Pobjorder
+  | Pobjmin
+  | Pobjmax
+  | Pobjtag
+  | Pobjsize
+  (* Boolean operations *)
+  | Psequand
+  | Psequor
+  | Pnot
+  | Pboolcomp of comparison
+  | Pboolorder
+  | Pboolmin
+  | Pboolmax
+  (* Integer operations *)
+  | Pnegint
+  | Paddint
+  | Psubint
+  | Pmulint
+  | Pdivint
+  | Pmodint
+  | Ppowint
+  | Pandint
+  | Porint
+  | Pxorint
+  | Pnotint
+  | Plslint
+  | Plsrint
+  | Pasrint
+  | Pintcomp of comparison
+  | Pintorder
+  | Pintmin
+  | Pintmax
+  | Poffsetint of int
+  | Poffsetref of int
+  (* Float operations *)
+  | Pintoffloat
+  | Pfloatofint
+  | Pnegfloat
+  | Pabsfloat
+  | Pmodfloat
+  | Paddfloat
+  | Psubfloat
+  | Pmulfloat
+  | Pdivfloat
+  | Ppowfloat
+  | Pfloatcomp of comparison
+  | Pfloatorder
+  | Pfloatmin
+  | Pfloatmax
+  (* BigInt operations *)
+  | Pnegbigint
+  | Paddbigint
+  | Psubbigint
+  | Ppowbigint
+  | Pmulbigint
+  | Pdivbigint
+  | Pmodbigint
+  | Pandbigint
+  | Porbigint
+  | Pxorbigint
+  | Pnotbigint
+  | Plslbigint
+  | Pasrbigint
+  | Pbigintcomp of comparison
+  | Pbigintorder
+  | Pbigintmin
+  | Pbigintmax
+  (* String operations *)
+  | Pstringlength
+  | Pstringrefu
+  | Pstringrefs
+  | Pstringcomp of comparison
+  | Pstringorder
+  | Pstringmin
+  | Pstringmax
+  | Pstringadd
+  (* Array operations *)
+  | Pmakearray of mutable_flag
+  | Parraylength
+  | Parrayrefu
+  | Parraysetu
+  | Parrayrefs
+  | Parraysets
+  (* List primitives *)
+  | Pmakelist of Asttypes.mutable_flag
+  (* dict primitives *)
+  | Pmakedict
+  | Pdict_has
+  (* promise *)
+  | Pawait
+  (* modules *)
+  | Pimport
+  | Pinit_mod
+  | Pupdate_mod
+  (* hash *)
+  | Phash
+  | Phash_mixint
+  | Phash_mixstring
+  | Phash_finalmix
+  (* Test if the argument is a block or an immediate integer *)
+  | Pisint
+  (* Test if the (integer) argument is outside an interval *)
+  | Pisout
+  (* Test if the argument is null or undefined *)
+  | Pisnullable
+  (* exn *)
+  | Pcreate_extension of string
+  | Pextension_slot_eq
+  | Pwrap_exn
+  (* js *)
+  | Pcurry_apply of int
+  | Pjscomp of comparison
+  | Pnull_to_opt
+  | Pnullable_to_opt
+  | Pis_not_none
+  | Pval_from_option
+  | Pval_from_option_not_nest
+  | Pis_poly_var_block
+  | Pjs_raw_expr
+  | Pjs_raw_stmt
+  | Pjs_fn_make of int
+  | Pjs_fn_make_unit
+  | Pjs_fn_method
+
+and comparison = Ceq | Cneq | Clt | Cgt | Cle | Cge
+
+and value_kind = Pgenval
+
+and raise_kind = Raise_regular | Raise_reraise
+
+type structured_constant =
+  | Const_base of constant
+  | Const_pointer of int * pointer_info
+  | Const_block of tag_info * structured_constant list
+  | Const_immstring of string
+  | Const_false
+  | Const_true
+
+type inline_attribute =
+  | Always_inline (* [@inline] or [@inline always] *)
+  | Never_inline (* [@inline never] *)
+  | Default_inline (* no [@inline] attribute *)
+
+type let_kind = Strict | Alias | StrictOpt | Variable
+(* Meaning of kinds for let x = e in e':
+    Strict: e may have side-effects; always evaluate e first
+      (If e is a simple expression, e.g. a variable or constant,
+       we may still substitute e'[x/e].)
+    Alias: e is pure, we can substitute e'[x/e] if x has 0 or 1 occurrences
+      in e'
+    StrictOpt: e does not have side-effects, but depend on the store;
+      we can discard e if x does not appear in e'
+    Variable: the variable x is assigned later in e'
+*)
+
+(* [true] means yes, [false] may mean unknown *)
+type function_attribute = {
+  inline: inline_attribute;
+  is_a_functor: bool;
+  return_unit: bool;
+  async: bool;
+  directive: string option;
+  one_unit_arg: bool;
+}
+
+type lambda =
+  | Lvar of Ident.t
+  | Lconst of structured_constant
+  | Lapply of lambda_apply
+  | Lfunction of lfunction
+  | Llet of let_kind * value_kind * Ident.t * lambda * lambda
+  | Lletrec of (Ident.t * lambda) list * lambda
+  | Lprim of primitive * lambda list * Location.t
+  | Lswitch of lambda * lambda_switch * Location.t
+  (* switch on strings, clauses are sorted by string order,
+     strings are pairwise distinct *)
+  | Lstringswitch of
+      lambda * (string * lambda) list * lambda option * Location.t
+  | Lstaticraise of int * lambda list
+  | Lstaticcatch of lambda * (int * Ident.t list) * lambda
+  | Ltrywith of lambda * Ident.t * lambda
+  | Lifthenelse of lambda * lambda * lambda
+  | Lsequence of lambda * lambda
+  | Lwhile of lambda * lambda
+  | Lfor of Ident.t * lambda * lambda * direction_flag * lambda
+  | Lassign of Ident.t * lambda
+  | Lsend of string * lambda * Location.t
+
+and lfunction = {
+  params: Ident.t list;
+  body: lambda;
+  attr: function_attribute; (* specified with [@inline] attribute *)
+  loc: Location.t;
+}
+
+and lambda_apply = {
+  ap_func: lambda;
+  ap_args: lambda list;
+  ap_loc: Location.t;
+  ap_inlined: inline_attribute; (* specified with the [@inlined] attribute *)
+  ap_transformed_jsx: bool;
+}
+
+and lambda_switch = {
+  sw_numconsts: int; (* Number of integer cases *)
+  sw_consts: (int * lambda) list; (* Integer cases *)
+  sw_numblocks: int; (* Number of tag block cases *)
+  sw_blocks: (int * lambda) list; (* Tag block cases *)
+  sw_failaction: lambda option; (* Action to take if failure *)
+  sw_names: Ast_untagged_variants.switch_names option;
+}
+
+(* Lambda code for the middle-end.
+   * In the closure case the code is a sequence of assignments to a
+     preallocated block of size [main_module_block_size] using
+     (Setfield(Getglobal(module_ident))). The size is used to preallocate
+     the block.
+   * In the flambda case the code is an expression returning a block
+     value of size [main_module_block_size]. The size is used to build
+     the module root as an initialize_symbol
+     Initialize_symbol(module_name, 0,
+       [getfield 0; ...; getfield (main_module_block_size - 1)])
+*)
+
+(* Sharing key *)
+val make_key : lambda -> lambda option
+
+val const_unit : structured_constant
+val lambda_assert_false : lambda
+val lambda_unit : lambda
+val lambda_module_alias : lambda
+val name_lambda : let_kind -> lambda -> (Ident.t -> lambda) -> lambda
+
+val iter : (lambda -> unit) -> lambda -> unit
+module IdentSet : Set.S with type elt = Ident.t
+val free_variables : lambda -> IdentSet.t
+
+val transl_normal_path : Path.t -> lambda (* Path.t is already normal *)
+
+val transl_module_path : ?loc:Location.t -> Env.t -> Path.t -> lambda
+val transl_value_path : ?loc:Location.t -> Env.t -> Path.t -> lambda
+val transl_extension_path : ?loc:Location.t -> Env.t -> Path.t -> lambda
+
+val subst_lambda : lambda Ident.tbl -> lambda -> lambda
+val bind : let_kind -> Ident.t -> lambda -> lambda -> lambda
+
+val default_function_attribute : function_attribute
+
+(***********************)
+(* For static failures *)
+(***********************)
+
+(* Get a new static failure ident *)
+val next_raise_count : unit -> int
+val next_negative_raise_count : unit -> int
+(* Negative raise counts are used to compile 'match ... with
+   exception x -> ...'.  This disabled some simplifications
+   performed by the Simplif module that assume that static raises
+   are in tail position in their handler. *)
+
+val staticfail : lambda (* Anticipated static failure *)
+
+(* Check anticipated failure, substitute its final value *)
+val is_guarded : lambda -> bool
+val patch_guarded : lambda -> lambda -> lambda
+
+val raise_kind : raise_kind -> string
+val lam_of_loc : loc_kind -> Location.t -> lambda
diff --git a/compiler/ml/location.ml b/compiler/ml/location.ml
new file mode 100644
index 0000000..fa2e806
--- /dev/null
+++ b/compiler/ml/location.ml
@@ -0,0 +1,305 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Lexing
+
+type t = Warnings.loc = {
+  loc_start: position;
+  loc_end: position;
+  loc_ghost: bool;
+}
+
+let in_file name =
+  let loc = {pos_fname = name; pos_lnum = 1; pos_bol = 0; pos_cnum = -1} in
+  {loc_start = loc; loc_end = loc; loc_ghost = true}
+
+let none = in_file "_none_"
+
+let input_name = ref "_none_"
+let set_input_name name = if name <> "" then input_name := name
+(* Terminal info *)
+
+(* Print the location in some way or another *)
+
+open Format
+
+let show_filename file = if file = "_none_" then !input_name else file
+
+let print_filename ppf file = Format.fprintf ppf "%s" (show_filename file)
+
+(* return file, line, char from the given position *)
+let get_pos_info pos = (pos.pos_fname, pos.pos_lnum, pos.pos_cnum - pos.pos_bol)
+
+let setup_colors () =
+  Misc.Color.setup !Clflags.color;
+  Code_frame.setup !Clflags.color
+
+(* ocaml's reported line/col numbering is horrible and super error-prone
+   when being handled programmatically (or humanly for that matter. If you're
+   an ocaml contributor reading this: who the heck reads the character count
+   starting from the first erroring character?) *)
+let normalize_range loc =
+  (* TODO: lots of the handlings here aren't needed anymore because the new
+     rescript syntax has much stronger invariants regarding positions, e.g.
+     no -1 *)
+  let _, start_line, start_char = get_pos_info loc.loc_start in
+  let _, end_line, end_char = get_pos_info loc.loc_end in
+  (* line is 1-indexed, column is 0-indexed. We convert all of them to 1-indexed to avoid confusion *)
+  (* start_char is inclusive, end_char is exclusive *)
+  if start_char == -1 || end_char == -1 then
+    (* happens sometimes. Syntax error for example *)
+    None
+  else if start_line = end_line && start_char >= end_char then
+    (* in some errors, starting char and ending char can be the same. But
+       since ending char was supposed to be exclusive, here it might end up
+       smaller than the starting char if we naively did start_char + 1 to
+       just the starting char and forget ending char *)
+    let same_char = start_char + 1 in
+    Some ((start_line, same_char), (end_line, same_char))
+  else
+    (* again: end_char is exclusive, so +1-1=0 *)
+    Some ((start_line, start_char + 1), (end_line, end_char))
+
+let print_loc ppf (loc : t) =
+  setup_colors ();
+  let normalized_range = normalize_range loc in
+  let dim_loc ppf = function
+    | None -> ()
+    | Some ((start_line, start_line_start_char), (end_line, end_line_end_char))
+      ->
+      if start_line = end_line then
+        if start_line_start_char = end_line_end_char then
+          fprintf ppf ":@{<dim>%i:%i@}" start_line start_line_start_char
+        else
+          fprintf ppf ":@{<dim>%i:%i-%i@}" start_line start_line_start_char
+            end_line_end_char
+      else
+        fprintf ppf ":@{<dim>%i:%i-%i:%i@}" start_line start_line_start_char
+          end_line end_line_end_char
+  in
+  fprintf ppf "@{<filename>%a@}%a" print_filename loc.loc_start.pos_fname
+    dim_loc normalized_range
+
+let print ?(src = None) ~message_kind intro ppf (loc : t) =
+  (match message_kind with
+  | `warning -> fprintf ppf "@[@{<info>%s@}@]@," intro
+  | `warning_as_error ->
+    fprintf ppf "@[@{<error>%s@} (configured as error) @]@," intro
+  | `error -> fprintf ppf "@[@{<error>%s@}@]@," intro);
+  (* ocaml's reported line/col numbering is horrible and super error-prone
+     when being handled programmatically (or humanly for that matter. If you're
+     an ocaml contributor reading this: who the heck reads the character count
+     starting from the first erroring character?) *)
+  let file, start_line, start_char = get_pos_info loc.loc_start in
+  let _, end_line, end_char = get_pos_info loc.loc_end in
+  (* line is 1-indexed, column is 0-indexed. We convert all of them to 1-indexed to avoid confusion *)
+  (* start_char is inclusive, end_char is exclusive *)
+  let normalized_range =
+    (* TODO: lots of the handlings here aren't needed anymore because the new
+       rescript syntax has much stronger invariants regarding positions, e.g.
+       no -1 *)
+    if start_char == -1 || end_char == -1 then
+      (* happens sometimes. Syntax error for example *)
+      None
+    else if start_line = end_line && start_char >= end_char then
+      (* in some errors, starting char and ending char can be the same. But
+         since ending char was supposed to be exclusive, here it might end up
+         smaller than the starting char if we naively did start_char + 1 to
+         just the starting char and forget ending char *)
+      let same_char = start_char + 1 in
+      Some ((start_line, same_char), (end_line, same_char))
+    else
+      (* again: end_char is exclusive, so +1-1=0 *)
+      Some ((start_line, start_char + 1), (end_line, end_char))
+  in
+  fprintf ppf "  @[%a@]@," print_loc loc;
+  match normalized_range with
+  | None -> ()
+  | Some _ -> (
+    try
+      (* Print a syntax error that is a list of Res_diagnostics.t.
+         Instead of reading file for every error, it uses the source that the parser already has. *)
+      let src =
+        match src with
+        | Some src -> src
+        | None -> Ext_io.load_file file
+      in
+      (* we're putting the line break `@,` here rather than above, because this
+         branch might not be reached (aka no inline file content display) so
+         we don't wanna end up with two line breaks in the the consequent *)
+      fprintf ppf "@,%s"
+        (Code_frame.print ~is_warning:(message_kind = `warning) ~src
+           ~start_pos:loc.loc_start ~end_pos:loc.loc_end)
+    with
+    (* this might happen if the file is e.g. "", "_none_" or any of the fake file name placeholders.
+       we've already printed the location above, so nothing more to do here. *)
+    | Sys_error _ ->
+      ())
+
+let default_warning_printer loc ppf w =
+  match Warnings.report w with
+  | `Inactive -> ()
+  | `Active {Warnings.number = _; message = _; is_error; sub_locs = _} ->
+    setup_colors ();
+    let message_kind = if is_error then `warning_as_error else `warning in
+    Format.fprintf ppf "@[<v>@,  %a@,  %s@,@]@."
+      (print ~message_kind
+         ("Warning number " ^ (Warnings.number w |> string_of_int)))
+      loc (Warnings.message w)
+(* at this point, you can display sub_locs too, from e.g. https://github.com/ocaml/ocaml/commit/f6d53cc38f87c67fbf49109f5fb79a0334bab17a
+   but we won't bother for now *)
+
+let warning_printer = ref default_warning_printer
+
+let print_warning loc ppf w = !warning_printer loc ppf w
+
+let formatter_for_warnings = ref err_formatter
+let prerr_warning loc w = print_warning loc !formatter_for_warnings w
+
+type 'a loc = {txt: 'a; loc: t}
+
+let mkloc txt loc = {txt; loc}
+let mknoloc txt = mkloc txt none
+
+type error = {
+  loc: t;
+  msg: string;
+  sub: error list;
+  if_highlight: string; (* alternative message if locations are highlighted *)
+}
+
+let pp_ksprintf ?before k fmt =
+  let buf = Buffer.create 64 in
+  let ppf = Format.formatter_of_buffer buf in
+  Misc.Color.set_color_tag_handling ppf;
+  (match before with
+  | None -> ()
+  | Some f -> f ppf);
+  kfprintf
+    (fun _ ->
+      pp_print_flush ppf ();
+      let msg = Buffer.contents buf in
+      k msg)
+    ppf fmt
+
+(* taken from https://github.com/rescript-lang/ocaml/blob/d4144647d1bf9bc7dc3aadc24c25a7efa3a67915/parsing/location.ml#L354 *)
+(* Shift the formatter's offset by the length of the error prefix, which
+   is always added by the compiler after the message has been formatted *)
+let print_phanton_error_prefix ppf =
+  (* modified from the original. We use only 2 indentations for error report
+     (see super_error_reporter above) *)
+  Format.pp_print_as ppf 2 ""
+
+let errorf ?(loc = none) ?(sub = []) ?(if_highlight = "") fmt =
+  pp_ksprintf ~before:print_phanton_error_prefix
+    (fun msg -> {loc; msg; sub; if_highlight})
+    fmt
+
+let error ?(loc = none) ?(sub = []) ?(if_highlight = "") msg =
+  {loc; msg; sub; if_highlight}
+
+let error_of_exn : (exn -> error option) list ref = ref []
+
+let register_error_of_exn f = error_of_exn := f :: !error_of_exn
+
+exception Already_displayed_error = Warnings.Errors
+
+let error_of_exn exn =
+  match exn with
+  | Already_displayed_error -> Some `Already_displayed
+  | _ ->
+    let rec loop = function
+      | [] -> None
+      | f :: rest -> (
+        match f exn with
+        | Some error -> Some (`Ok error)
+        | None -> loop rest)
+    in
+    loop !error_of_exn
+
+(* taken from https://github.com/rescript-lang/ocaml/blob/d4144647d1bf9bc7dc3aadc24c25a7efa3a67915/parsing/location.ml#L380 *)
+(* This is the error report entry point. We'll replace the default reporter with this one. *)
+let rec default_error_reporter ?(custom_intro = None) ?(src = None) ppf
+    {loc; msg; sub} =
+  setup_colors ();
+  (* open a vertical box. Everything in our message is indented 2 spaces *)
+  (* If src is given, it will display a syntax error after parsing. *)
+  let intro =
+    match (custom_intro, src) with
+    | Some intro, _ -> intro
+    | None, Some _ -> "Syntax error!"
+    | None, None -> "We've found a bug for you!"
+  in
+  Format.fprintf ppf "@[<v>@,  %a@,  %s@,@]"
+    (print ~src ~message_kind:`error intro)
+    loc msg;
+  List.iter
+    (Format.fprintf ppf "@,@[%a@]" (default_error_reporter ~custom_intro ~src))
+    sub
+(* no need to flush here; location's report_exception (which uses this ultimately) flushes *)
+
+let error_reporter = ref default_error_reporter
+
+let report_error ?(custom_intro = None) ?(src = None) ppf err =
+  !error_reporter ~custom_intro ~src ppf err
+
+let error_of_printer loc print x = errorf ~loc "%a@?" print x
+
+let error_of_printer_file print x =
+  error_of_printer (in_file !input_name) print x
+
+let () =
+  register_error_of_exn (function
+    | Sys_error msg ->
+      Some (errorf ~loc:(in_file !input_name) "I/O error: %s" msg)
+    | Misc.HookExnWrapper {error = e; hook_name; hook_info = {Misc.sourcefile}}
+      ->
+      let sub =
+        match error_of_exn e with
+        | None | Some `Already_displayed -> error (Printexc.to_string e)
+        | Some (`Ok err) -> err
+      in
+      Some (errorf ~loc:(in_file sourcefile) "In hook %S:" hook_name ~sub:[sub])
+    | _ -> None)
+
+external reraise : exn -> 'a = "%reraise"
+
+let rec report_exception_rec n ppf exn =
+  try
+    match error_of_exn exn with
+    | None -> reraise exn
+    | Some `Already_displayed -> ()
+    | Some (`Ok err) ->
+      fprintf ppf "@[%a@]@." (report_error ~custom_intro:None ~src:None) err
+  with exn when n > 0 -> report_exception_rec (n - 1) ppf exn
+
+let report_exception ppf exn = report_exception_rec 5 ppf exn
+
+exception Error of error
+
+let () =
+  register_error_of_exn (function
+    | Error e -> Some e
+    | _ -> None)
+
+let raise_errorf ?(loc = none) ?(sub = []) ?(if_highlight = "") =
+  pp_ksprintf ~before:print_phanton_error_prefix (fun msg ->
+      raise (Error {loc; msg; sub; if_highlight}))
+
+let deprecated ?(can_be_automigrated = false) ?(def = none) ?(use = none) loc
+    msg =
+  prerr_warning loc (Warnings.Deprecated (msg, def, use, can_be_automigrated))
+
+let map_loc f {txt; loc} = {txt = f txt; loc}
diff --git a/compiler/ml/location.mli b/compiler/ml/location.mli
new file mode 100644
index 0000000..76f4db2
--- /dev/null
+++ b/compiler/ml/location.mli
@@ -0,0 +1,136 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** Source code locations (ranges of positions), used in parsetree. *)
+
+open Format
+
+type t = Warnings.loc = {
+  loc_start: Lexing.position;
+  loc_end: Lexing.position;
+  loc_ghost: bool;
+}
+
+(** Note on the use of Lexing.position in this module.
+   If [pos_fname = ""], then use [!input_name] instead.
+   If [pos_lnum = -1], then [pos_bol = 0]. Use [pos_cnum] and
+     re-parse the file to get the line and character numbers.
+   Else all fields are correct.
+*)
+
+val none : t
+(** An arbitrary value of type [t]; describes an empty ghost range. *)
+
+val in_file : string -> t
+(** Return an empty ghost range located in a given file. *)
+
+val input_name : string ref
+val set_input_name : string -> unit
+
+val get_pos_info : Lexing.position -> string * int * int (* file, line, char *)
+val print_loc : formatter -> t -> unit
+
+val prerr_warning : t -> Warnings.t -> unit
+
+val warning_printer : (t -> formatter -> Warnings.t -> unit) ref
+(** Hook for intercepting warnings. *)
+
+val formatter_for_warnings : formatter ref
+
+val default_warning_printer : t -> formatter -> Warnings.t -> unit
+(** Original warning printer for use in hooks. *)
+
+type 'a loc = {txt: 'a; loc: t}
+
+val mknoloc : 'a -> 'a loc
+val mkloc : 'a -> t -> 'a loc
+
+val print_filename : formatter -> string -> unit
+
+val show_filename : string -> string
+
+(** Support for located errors *)
+
+type error = {
+  loc: t;
+  msg: string;
+  sub: error list;
+  if_highlight: string; (* alternative message if locations are highlighted *)
+}
+
+exception Already_displayed_error
+exception Error of error
+
+val error : ?loc:t -> ?sub:error list -> ?if_highlight:string -> string -> error
+
+val errorf :
+  ?loc:t ->
+  ?sub:error list ->
+  ?if_highlight:string ->
+  ('a, Format.formatter, unit, error) format4 ->
+  'a
+
+val raise_errorf :
+  ?loc:t ->
+  ?sub:error list ->
+  ?if_highlight:string ->
+  ('a, Format.formatter, unit, 'b) format4 ->
+  'a
+
+val error_of_printer : t -> (formatter -> 'a -> unit) -> 'a -> error
+
+val error_of_printer_file : (formatter -> 'a -> unit) -> 'a -> error
+
+val error_of_exn : exn -> [`Ok of error | `Already_displayed] option
+
+val register_error_of_exn : (exn -> error option) -> unit
+(** Each compiler module which defines a custom type of exception
+    which can surface as a user-visible error should register
+    a "printer" for this exception using [register_error_of_exn].
+    The result of the printer is an [error] value containing
+    a location, a message, and optionally sub-messages (each of them
+    being located as well). *)
+
+val report_error :
+  ?custom_intro:string option ->
+  ?src:string option ->
+  formatter ->
+  error ->
+  unit
+
+val error_reporter :
+  (?custom_intro:string option ->
+  ?src:string option ->
+  formatter ->
+  error ->
+  unit)
+  ref
+(** Hook for intercepting error reports. *)
+
+val default_error_reporter :
+  ?custom_intro:string option ->
+  ?src:string option ->
+  formatter ->
+  error ->
+  unit
+(** Original error reporter for use in hooks. *)
+
+val report_exception : formatter -> exn -> unit
+(** Reraise the exception if it is unknown. *)
+
+val deprecated :
+  ?can_be_automigrated:bool -> ?def:t -> ?use:t -> t -> string -> unit
+
+val map_loc : ('a -> 'b) -> 'a loc -> 'b loc
diff --git a/compiler/ml/longident.ml b/compiler/ml/longident.ml
new file mode 100644
index 0000000..721a131
--- /dev/null
+++ b/compiler/ml/longident.ml
@@ -0,0 +1,65 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+type t = Lident of string | Ldot of t * string | Lapply of t * t
+let rec cmp : t -> t -> int =
+ fun a b ->
+  if a == b then 0
+  else
+    match (a, b) with
+    | Lident a, Lident b -> compare a b
+    | Lident _, _ -> -1
+    | _, Lident _ -> 1
+    | Ldot (a, b), Ldot (c, d) -> (
+      match cmp a c with
+      | 0 -> compare b d
+      | n -> n)
+    | Ldot _, _ -> -1
+    | _, Ldot _ -> 1
+    | Lapply (a, b), Lapply (c, d) -> (
+      match cmp a c with
+      | 0 -> cmp b d
+      | n -> n)
+
+let rec flat accu = function
+  | Lident s -> s :: accu
+  | Ldot (lid, s) -> flat (s :: accu) lid
+  | Lapply (_, _) -> Misc.fatal_error "Longident.flat"
+
+let flatten lid = flat [] lid
+
+let last = function
+  | Lident s -> s
+  | Ldot (_, s) -> s
+  | Lapply (_, _) -> Misc.fatal_error "Longident.last"
+
+let rec split_at_dots s pos =
+  try
+    let dot = String.index_from s pos '.' in
+    String.sub s pos (dot - pos) :: split_at_dots s (dot + 1)
+  with Not_found -> [String.sub s pos (String.length s - pos)]
+
+let unflatten l =
+  match l with
+  | [] -> None
+  | hd :: tl -> Some (List.fold_left (fun p s -> Ldot (p, s)) (Lident hd) tl)
+
+let parse s =
+  match unflatten (split_at_dots s 0) with
+  | None ->
+    Lident ""
+    (* should not happen, but don't put assert false
+       so as not to crash the toplevel (see Genprintval) *)
+  | Some v -> v
diff --git a/jscomp/ml/longident.mli b/compiler/ml/longident.mli
similarity index 84%
rename from jscomp/ml/longident.mli
rename to compiler/ml/longident.mli
index 4c65fa6..26ed938 100644
--- a/jscomp/ml/longident.mli
+++ b/compiler/ml/longident.mli
@@ -15,13 +15,10 @@
 
 (** Long identifiers, used in parsetree. *)
 
-type t =
-    Lident of string
-  | Ldot of t * string
-  | Lapply of t * t
+type t = Lident of string | Ldot of t * string | Lapply of t * t
 
-val cmp : t -> t -> int   
-val flatten: t -> string list
-val unflatten: string list -> t option
-val last: t -> string
-val parse: string -> t
+val cmp : t -> t -> int
+val flatten : t -> string list
+val unflatten : string list -> t option
+val last : t -> string
+val parse : string -> t
diff --git a/compiler/ml/matching.ml b/compiler/ml/matching.ml
new file mode 100644
index 0000000..b84339a
--- /dev/null
+++ b/compiler/ml/matching.ml
@@ -0,0 +1,2978 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Compilation of pattern matching *)
+
+open Misc
+open Asttypes
+open Types
+open Typedtree
+open Lambda
+open Parmatch
+open Printf
+
+let dbg = false
+
+(* See Peyton-Jones, ``The Implementation of functional programming
+   languages'', chapter 5. *)
+(*
+  Well, it was true at the beginning of the world.
+  Now, see Lefessant-Maranget ``Optimizing Pattern-Matching'' ICFP'2001
+*)
+
+(*
+   Compatibility predicate that considers potential rebindings of constructors
+   of an extension type.
+
+   "may_compat p q" returns false when p and q never admit a common instance;
+   returns true when they may have a common instance.
+*)
+
+let equal_cd c1 c2 = Types.may_equal_constr c1 c2
+
+let may_compat = Parmatch.Compat.compat ~equal_cd
+
+and may_compats = Parmatch.Compat.compats ~equal_cd
+
+(*
+   Many functions on the various data structures of the algorithm :
+     - Pattern matrices.
+     - Default environments: mapping from matrices to exit numbers.
+     - Contexts:  matrices whose column are partitioned into
+       left and right.
+     - Jump summaries: mapping from exit numbers to contexts
+*)
+
+let string_of_lam lam =
+  Printlambda.lambda Format.str_formatter lam;
+  Format.flush_str_formatter ()
+
+type matrix = pattern list list
+
+let add_omega_column pss = List.map (fun ps -> omega :: ps) pss
+
+type ctx = {left: pattern list; right: pattern list}
+
+let pretty_ctx ctx =
+  List.iter
+    (fun {left; right} ->
+      prerr_string "LEFT:";
+      pretty_line left;
+      prerr_string " RIGHT:";
+      pretty_line right;
+      prerr_endline "")
+    ctx
+
+let le_ctx c1 c2 = le_pats c1.left c2.left && le_pats c1.right c2.right
+
+let lshift {left; right} =
+  match right with
+  | x :: xs -> {left = x :: left; right = xs}
+  | _ -> assert false
+
+let lforget {left; right} =
+  match right with
+  | _ :: xs -> {left = omega :: left; right = xs}
+  | _ -> assert false
+
+let rec small_enough n = function
+  | [] -> true
+  | _ :: rem -> if n <= 0 then false else small_enough (n - 1) rem
+
+let ctx_lshift ctx =
+  if small_enough 31 ctx then List.map lshift ctx
+  else (* Context pruning *) get_mins le_ctx (List.map lforget ctx)
+
+let rshift {left; right} =
+  match left with
+  | p :: ps -> {left = ps; right = p :: right}
+  | _ -> assert false
+
+let ctx_rshift ctx = List.map rshift ctx
+
+let rec nchars n ps =
+  if n <= 0 then ([], ps)
+  else
+    match ps with
+    | p :: rem ->
+      let chars, cdrs = nchars (n - 1) rem in
+      (p :: chars, cdrs)
+    | _ -> assert false
+
+let rshift_num n {left; right} =
+  let shifted, left = nchars n left in
+  {left; right = shifted @ right}
+
+let ctx_rshift_num n ctx = List.map (rshift_num n) ctx
+
+(* Recombination of contexts (eg: (_,_)::p1::p2::rem ->  (p1,p2)::rem)
+   All mutable fields are replaced by '_', since side-effects in
+   guards can alter these fields *)
+
+let combine {left; right} =
+  match left with
+  | p :: ps -> {left = ps; right = set_args_erase_mutable p right}
+  | _ -> assert false
+
+let ctx_combine ctx = List.map combine ctx
+
+let ncols = function
+  | [] -> 0
+  | ps :: _ -> List.length ps
+
+exception NoMatch
+exception OrPat
+
+let filter_matrix matcher pss =
+  let rec filter_rec = function
+    | (p :: ps) :: rem -> (
+      match p.pat_desc with
+      | Tpat_alias (p, _, _) -> filter_rec ((p :: ps) :: rem)
+      | Tpat_var _ -> filter_rec ((omega :: ps) :: rem)
+      | _ -> (
+        let rem = filter_rec rem in
+        try matcher p ps :: rem with
+        | NoMatch -> rem
+        | OrPat -> (
+          match p.pat_desc with
+          | Tpat_or (p1, p2, _) -> filter_rec [p1 :: ps; p2 :: ps] @ rem
+          | _ -> assert false)))
+    | [] -> []
+    | _ ->
+      pretty_matrix pss;
+      fatal_error "Matching.filter_matrix"
+  in
+  filter_rec pss
+
+let make_default matcher env =
+  let rec make_rec = function
+    | [] -> []
+    | ([[]], i) :: _ -> [([[]], i)]
+    | (pss, i) :: rem -> (
+      let rem = make_rec rem in
+      match filter_matrix matcher pss with
+      | [] -> rem
+      | [] :: _ -> ([[]], i) :: rem
+      | pss -> (pss, i) :: rem)
+  in
+  make_rec env
+
+let ctx_matcher p =
+  let p = normalize_pat p in
+  match p.pat_desc with
+  | Tpat_construct (_, cstr, omegas) -> (
+    fun q rem ->
+      match q.pat_desc with
+      | Tpat_construct (_, cstr', args)
+      (* NB:  may_constr_equal considers (potential) constructor rebinding *)
+        when Types.may_equal_constr cstr cstr' ->
+        (p, args @ rem)
+      | Tpat_any -> (p, omegas @ rem)
+      | _ -> raise NoMatch)
+  | Tpat_constant cst -> (
+    fun q rem ->
+      match q.pat_desc with
+      | Tpat_constant cst' when const_compare cst cst' = 0 -> (p, rem)
+      | Tpat_any -> (p, rem)
+      | _ -> raise NoMatch)
+  | Tpat_variant (lab, Some omega, _) -> (
+    fun q rem ->
+      match q.pat_desc with
+      | Tpat_variant (lab', Some arg, _) when lab = lab' -> (p, arg :: rem)
+      | Tpat_any -> (p, omega :: rem)
+      | _ -> raise NoMatch)
+  | Tpat_variant (lab, None, _) -> (
+    fun q rem ->
+      match q.pat_desc with
+      | Tpat_variant (lab', None, _) when lab = lab' -> (p, rem)
+      | Tpat_any -> (p, rem)
+      | _ -> raise NoMatch)
+  | Tpat_array omegas -> (
+    let len = List.length omegas in
+    fun q rem ->
+      match q.pat_desc with
+      | Tpat_array args when List.length args = len -> (p, args @ rem)
+      | Tpat_any -> (p, omegas @ rem)
+      | _ -> raise NoMatch)
+  | Tpat_tuple omegas -> (
+    let len = List.length omegas in
+    fun q rem ->
+      match q.pat_desc with
+      | Tpat_tuple args when List.length args = len -> (p, args @ rem)
+      | Tpat_any -> (p, omegas @ rem)
+      | _ -> raise NoMatch)
+  | Tpat_record (((_, lbl, _, _) :: _ as l), _) -> (
+    (* Records are normalized *)
+    let len = Array.length lbl.lbl_all in
+    fun q rem ->
+      match q.pat_desc with
+      | Tpat_record (((_, lbl', _, _) :: _ as l'), _)
+        when Array.length lbl'.lbl_all = len ->
+        let l' = all_record_args l' in
+        (p, List.fold_right (fun (_, _, p, _) r -> p :: r) l' rem)
+      | Tpat_any -> (p, List.fold_right (fun (_, _, p, _) r -> p :: r) l rem)
+      | _ -> raise NoMatch)
+  | _ -> fatal_error "Matching.ctx_matcher"
+
+let filter_ctx q ctx =
+  let matcher = ctx_matcher q in
+
+  let rec filter_rec = function
+    | ({right = p :: ps} as l) :: rem -> (
+      match p.pat_desc with
+      | Tpat_or (p1, p2, _) ->
+        filter_rec
+          ({l with right = p1 :: ps} :: {l with right = p2 :: ps} :: rem)
+      | Tpat_alias (p, _, _) -> filter_rec ({l with right = p :: ps} :: rem)
+      | Tpat_var _ -> filter_rec ({l with right = omega :: ps} :: rem)
+      | _ -> (
+        let rem = filter_rec rem in
+        try
+          let to_left, right = matcher p ps in
+          {left = to_left :: l.left; right} :: rem
+        with NoMatch -> rem))
+    | [] -> []
+    | _ -> fatal_error "Matching.filter_ctx"
+  in
+
+  filter_rec ctx
+
+let select_columns pss ctx =
+  let n = ncols pss in
+  List.fold_right
+    (fun ps r ->
+      List.fold_right
+        (fun {left; right} r ->
+          let transfert, right = nchars n right in
+          try {left = lubs transfert ps @ left; right} :: r with Empty -> r)
+        ctx r)
+    pss []
+
+let ctx_lub p ctx =
+  List.fold_right
+    (fun {left; right} r ->
+      match right with
+      | q :: rem -> ( try {left; right = lub p q :: rem} :: r with Empty -> r)
+      | _ -> fatal_error "Matching.ctx_lub")
+    ctx []
+
+let ctx_match ctx pss =
+  List.exists
+    (fun {right = qs} -> List.exists (fun ps -> may_compats qs ps) pss)
+    ctx
+
+type jumps = (int * ctx list) list
+
+let pretty_jumps (env : jumps) =
+  match env with
+  | [] -> ()
+  | _ ->
+    List.iter
+      (fun (i, ctx) ->
+        Printf.fprintf stderr "jump for %d\n" i;
+        pretty_ctx ctx)
+      env
+
+let rec jumps_extract (i : int) = function
+  | [] -> ([], [])
+  | ((j, pss) as x) :: rem as all ->
+    if i = j then (pss, rem)
+    else if j < i then ([], all)
+    else
+      let r, rem = jumps_extract i rem in
+      (r, x :: rem)
+
+let rec jumps_remove (i : int) = function
+  | [] -> []
+  | (j, _) :: rem when i = j -> rem
+  | x :: rem -> x :: jumps_remove i rem
+
+let jumps_empty = []
+
+and jumps_is_empty = function
+  | [] -> true
+  | _ -> false
+
+let jumps_singleton i = function
+  | [] -> []
+  | ctx -> [(i, ctx)]
+
+let jumps_add i pss jumps =
+  match pss with
+  | [] -> jumps
+  | _ ->
+    let rec add = function
+      | [] -> [(i, pss)]
+      | ((j, qss) as x) :: rem as all ->
+        if (j : int) > i then x :: add rem
+        else if j < i then (i, pss) :: all
+        else (i, get_mins le_ctx (pss @ qss)) :: rem
+    in
+    add jumps
+
+let rec jumps_union (env1 : (int * ctx list) list) env2 =
+  match (env1, env2) with
+  | [], _ -> env2
+  | _, [] -> env1
+  | ((i1, pss1) as x1) :: rem1, ((i2, pss2) as x2) :: rem2 ->
+    if i1 = i2 then (i1, get_mins le_ctx (pss1 @ pss2)) :: jumps_union rem1 rem2
+    else if i1 > i2 then x1 :: jumps_union rem1 env2
+    else x2 :: jumps_union env1 rem2
+
+let rec merge = function
+  | env1 :: env2 :: rem -> jumps_union env1 env2 :: merge rem
+  | envs -> envs
+
+let rec jumps_unions envs =
+  match envs with
+  | [] -> []
+  | [env] -> env
+  | _ -> jumps_unions (merge envs)
+
+let jumps_map f env = List.map (fun (i, pss) -> (i, f pss)) env
+
+(* Pattern matching before any compilation *)
+
+type pattern_matching = {
+  mutable cases: (pattern list * lambda) list;
+  args: (lambda * let_kind) list;
+  default: (matrix * int) list;
+}
+
+(* Pattern matching after application of both the or-pat rule and the
+   mixture rule *)
+
+type pm_or_compiled = {
+  body: pattern_matching;
+  handlers: (matrix * int * Ident.t list * pattern_matching) list;
+  or_matrix: matrix;
+}
+
+type pm_half_compiled =
+  | PmOr of pm_or_compiled
+  | PmVar of pm_var_compiled
+  | Pm of pattern_matching
+
+and pm_var_compiled = {inside: pm_half_compiled; var_arg: lambda}
+
+type pm_half_compiled_info = {
+  me: pm_half_compiled;
+  matrix: matrix;
+  top_default: (matrix * int) list;
+}
+
+let pretty_cases cases =
+  List.iter
+    (fun (ps, _l) ->
+      List.iter
+        (fun p ->
+          Parmatch.top_pretty Format.str_formatter p;
+          prerr_string " ";
+          prerr_string (Format.flush_str_formatter ()))
+        ps;
+      (*
+      prerr_string " -> " ;
+      Printlambda.lambda Format.str_formatter l ;
+      prerr_string (Format.flush_str_formatter ()) ;
+*)
+      prerr_endline "")
+    cases
+
+let pretty_def def =
+  prerr_endline "+++++ Defaults +++++";
+  List.iter
+    (fun (pss, i) ->
+      Printf.fprintf stderr "Matrix for %d\n" i;
+      pretty_matrix pss)
+    def;
+  prerr_endline "+++++++++++++++++++++"
+
+let pretty_pm pm =
+  pretty_cases pm.cases;
+  if pm.default <> [] then pretty_def pm.default
+
+let rec pretty_precompiled = function
+  | Pm pm ->
+    prerr_endline "++++ PM ++++";
+    pretty_pm pm
+  | PmVar x ->
+    prerr_endline "++++ VAR ++++";
+    pretty_precompiled x.inside
+  | PmOr x ->
+    prerr_endline "++++ OR ++++";
+    pretty_pm x.body;
+    pretty_matrix x.or_matrix;
+    List.iter
+      (fun (_, i, _, pm) ->
+        eprintf "++ Handler %d ++\n" i;
+        pretty_pm pm)
+      x.handlers
+
+let pretty_precompiled_res first nexts =
+  pretty_precompiled first;
+  List.iter
+    (fun (e, pmh) ->
+      eprintf "** DEFAULT %d **\n" e;
+      pretty_precompiled pmh)
+    nexts
+
+(* Identifying some semantically equivalent lambda-expressions,
+   Our goal here is also to
+   find alpha-equivalent (simple) terms *)
+
+(* However, as shown by PR#6359 such sharing may hinders the
+   lambda-code invariant that all bound idents are unique,
+   when switches are compiled to test sequences.
+   The definitive fix is the systematic introduction of exit/catch
+   in case action sharing is present.
+*)
+
+module StoreExp = Switch.Store (struct
+  type t = lambda
+  type key = lambda
+  let compare_key = compare
+  let make_key = Lambda.make_key
+end)
+
+let make_exit i = Lstaticraise (i, [])
+
+(* Introduce a catch, if worth it *)
+let make_catch d k =
+  match d with
+  | Lstaticraise (_, []) -> k d
+  | _ ->
+    let e = next_raise_count () in
+    Lstaticcatch (k (make_exit e), (e, []), d)
+
+(* Introduce a catch, if worth it, delayed version *)
+let rec as_simple_exit = function
+  | Lstaticraise (i, []) -> Some i
+  | Llet (Alias, _k, _, _, e) -> as_simple_exit e
+  | _ -> None
+
+let make_catch_delayed handler =
+  match as_simple_exit handler with
+  | Some i -> (i, fun act -> act)
+  | None -> (
+    let i = next_raise_count () in
+    (*
+    Printf.eprintf "SHARE LAMBDA: %i\n%s\n" i (string_of_lam handler);
+*)
+    ( i,
+      fun body ->
+        match body with
+        | Lstaticraise (j, _) -> if i = j then handler else body
+        | _ -> Lstaticcatch (body, (i, []), handler) ))
+
+let raw_action l =
+  match make_key l with
+  | Some l -> l
+  | None -> l
+
+let tr_raw act =
+  match make_key act with
+  | Some act -> act
+  | None -> raise Exit
+
+let same_actions = function
+  | [] -> None
+  | [(_, act)] -> Some act
+  | (_, act0) :: rem -> (
+    try
+      let raw_act0 = tr_raw act0 in
+      let rec s_rec = function
+        | [] -> Some act0
+        | (_, act) :: rem -> if raw_act0 = tr_raw act then s_rec rem else None
+      in
+      s_rec rem
+    with Exit -> None)
+
+(* Test for swapping two clauses *)
+
+let up_ok_action act1 act2 =
+  try
+    let raw1 = tr_raw act1 and raw2 = tr_raw act2 in
+    raw1 = raw2
+  with Exit -> false
+
+let up_ok (ps, act_p) l =
+  List.for_all
+    (fun (qs, act_q) -> up_ok_action act_p act_q || not (may_compats ps qs))
+    l
+
+(*
+   The simplify function normalizes the first column of the match
+     - records are expanded so that they possess all fields
+     - aliases are removed and replaced by bindings in actions.
+   However or-patterns are simplified differently,
+     - aliases are not removed
+     - or-patterns (_|p) are changed into _
+*)
+
+exception Var of pattern
+
+let simplify_or p =
+  let rec simpl_rec p =
+    match p with
+    | {pat_desc = Tpat_any | Tpat_var _} -> raise (Var p)
+    | {pat_desc = Tpat_alias (q, id, s)} -> (
+      try {p with pat_desc = Tpat_alias (simpl_rec q, id, s)}
+      with Var q -> raise (Var {p with pat_desc = Tpat_alias (q, id, s)}))
+    | {pat_desc = Tpat_or (p1, p2, o)} -> (
+      let q1 = simpl_rec p1 in
+      try
+        let q2 = simpl_rec p2 in
+        {p with pat_desc = Tpat_or (q1, q2, o)}
+      with Var q2 -> raise (Var {p with pat_desc = Tpat_or (q1, q2, o)}))
+    | {pat_desc = Tpat_record (lbls, closed)} ->
+      let all_lbls = all_record_args lbls in
+      {p with pat_desc = Tpat_record (all_lbls, closed)}
+    | _ -> p
+  in
+  try simpl_rec p with Var p -> p
+
+let simplify_cases args cls =
+  match args with
+  | [] -> assert false
+  | (arg, _) :: _ ->
+    let rec simplify = function
+      | [] -> []
+      | ((pat :: patl, action) as cl) :: rem -> (
+        match pat.pat_desc with
+        | Tpat_var (id, _) ->
+          (omega :: patl, bind Alias id arg action) :: simplify rem
+        | Tpat_any -> cl :: simplify rem
+        | Tpat_alias (p, id, _) ->
+          simplify ((p :: patl, bind Alias id arg action) :: rem)
+        | Tpat_record ([], _) -> (omega :: patl, action) :: simplify rem
+        | Tpat_record (lbls, closed) ->
+          let all_lbls = all_record_args lbls in
+          let full_pat = {pat with pat_desc = Tpat_record (all_lbls, closed)} in
+          (full_pat :: patl, action) :: simplify rem
+        | Tpat_or _ -> (
+          let pat_simple = simplify_or pat in
+          match pat_simple.pat_desc with
+          | Tpat_or _ -> (pat_simple :: patl, action) :: simplify rem
+          | _ -> simplify ((pat_simple :: patl, action) :: rem))
+        | _ -> cl :: simplify rem)
+      | _ -> assert false
+    in
+
+    simplify cls
+
+(* Once matchings are simplified one can easily find
+   their nature *)
+
+let rec what_is_cases cases =
+  match cases with
+  | ({pat_desc = Tpat_any} :: _, _) :: rem -> what_is_cases rem
+  | ({pat_desc = Tpat_var _ | Tpat_or (_, _, _) | Tpat_alias (_, _, _)} :: _, _)
+    :: _ ->
+    assert false (* applies to simplified matchings only *)
+  | (p :: _, _) :: _ -> p
+  | [] -> omega
+  | _ -> assert false
+
+(* A few operations on default environments *)
+let as_matrix cases = get_mins le_pats (List.map (fun (ps, _) -> ps) cases)
+
+let cons_default matrix raise_num default =
+  match matrix with
+  | [] -> default
+  | _ -> (matrix, raise_num) :: default
+
+let default_compat p def =
+  List.fold_right
+    (fun (pss, i) r ->
+      let qss =
+        List.fold_right
+          (fun qs r ->
+            match qs with
+            | q :: rem when may_compat p q -> rem :: r
+            | _ -> r)
+          pss []
+      in
+      match qss with
+      | [] -> r
+      | _ -> (qss, i) :: r)
+    def []
+
+(* Or-pattern expansion, variables are a complication w.r.t. the article *)
+let rec extract_vars r p =
+  match p.pat_desc with
+  | Tpat_var (id, _) -> IdentSet.add id r
+  | Tpat_alias (p, id, _) -> extract_vars (IdentSet.add id r) p
+  | Tpat_tuple pats -> List.fold_left extract_vars r pats
+  | Tpat_record (lpats, _) ->
+    List.fold_left (fun r (_, _, p, _) -> extract_vars r p) r lpats
+  | Tpat_construct (_, _, pats) -> List.fold_left extract_vars r pats
+  | Tpat_array pats -> List.fold_left extract_vars r pats
+  | Tpat_variant (_, Some p, _) -> extract_vars r p
+  | Tpat_or (p, _, _) -> extract_vars r p
+  | Tpat_constant _ | Tpat_any | Tpat_variant (_, None, _) -> r
+
+exception Cannot_flatten
+
+let mk_alpha_env arg aliases ids =
+  List.map
+    (fun id ->
+      ( id,
+        if List.mem id aliases then
+          match arg with
+          | Some v -> v
+          | _ -> raise Cannot_flatten
+        else Ident.create (Ident.name id) ))
+    ids
+
+let rec explode_or_pat arg patl mk_action rem vars aliases = function
+  | {pat_desc = Tpat_or (p1, p2, _)} ->
+    explode_or_pat arg patl mk_action
+      (explode_or_pat arg patl mk_action rem vars aliases p2)
+      vars aliases p1
+  | {pat_desc = Tpat_alias (p, id, _)} ->
+    explode_or_pat arg patl mk_action rem vars (id :: aliases) p
+  | {pat_desc = Tpat_var (x, _)} ->
+    let env = mk_alpha_env arg (x :: aliases) vars in
+    (omega :: patl, mk_action (List.map snd env)) :: rem
+  | p ->
+    let env = mk_alpha_env arg aliases vars in
+    (alpha_pat env p :: patl, mk_action (List.map snd env)) :: rem
+
+let pm_free_variables {cases} =
+  List.fold_right
+    (fun (_, act) r -> IdentSet.union (free_variables act) r)
+    cases IdentSet.empty
+
+(* Basic grouping predicates *)
+let pat_as_constr = function
+  | {pat_desc = Tpat_construct (_, cstr, _)} -> cstr
+  | _ -> fatal_error "Matching.pat_as_constr"
+
+let group_constant = function
+  | {pat_desc = Tpat_constant _} -> true
+  | _ -> false
+
+and group_constructor = function
+  | {pat_desc = Tpat_construct (_, _, _)} -> true
+  | _ -> false
+
+and group_variant = function
+  | {pat_desc = Tpat_variant (_, _, _)} -> true
+  | _ -> false
+
+and group_var = function
+  | {pat_desc = Tpat_any} -> true
+  | _ -> false
+
+and group_tuple = function
+  | {pat_desc = Tpat_tuple _ | Tpat_any} -> true
+  | _ -> false
+
+and group_record = function
+  | {pat_desc = Tpat_record _ | Tpat_any} -> true
+  | _ -> false
+
+and group_array = function
+  | {pat_desc = Tpat_array _} -> true
+  | _ -> false
+
+let get_group p =
+  match p.pat_desc with
+  | Tpat_any -> group_var
+  | Tpat_constant _ -> group_constant
+  | Tpat_construct _ -> group_constructor
+  | Tpat_tuple _ -> group_tuple
+  | Tpat_record _ -> group_record
+  | Tpat_array _ -> group_array
+  | Tpat_variant (_, _, _) -> group_variant
+  | _ -> fatal_error "Matching.get_group"
+
+let is_or p =
+  match p.pat_desc with
+  | Tpat_or _ -> true
+  | _ -> false
+
+(* Conditions for appending to the Or matrix *)
+let conda p q = not (may_compat p q)
+
+and condb act ps qs = (not (is_guarded act)) && Parmatch.le_pats qs ps
+
+let or_ok p ps l =
+  List.for_all
+    (function
+      | ({pat_desc = Tpat_or _} as q) :: qs, act -> conda p q || condb act ps qs
+      | _ -> true)
+    l
+
+(* Insert or append a pattern in the Or matrix *)
+
+let equiv_pat p q = le_pat p q && le_pat q p
+
+let rec get_equiv p l =
+  match l with
+  | ((q :: _, _) as cl) :: rem ->
+    if equiv_pat p q then
+      let others, rem = get_equiv p rem in
+      (cl :: others, rem)
+    else ([], l)
+  | _ -> ([], l)
+
+let insert_or_append p ps act ors no =
+  let rec attempt seen = function
+    | ((q :: qs, act_q) as cl) :: rem ->
+      if is_or q then
+        if may_compat p q then
+          if
+            IdentSet.is_empty (extract_vars IdentSet.empty p)
+            && IdentSet.is_empty (extract_vars IdentSet.empty q)
+            && equiv_pat p q
+          then
+            (* attempt insert, for equivalent orpats with no variables *)
+            let _, not_e = get_equiv q rem in
+            if
+              or_ok p ps not_e
+              &&
+              (* check append condition for head of O *)
+              List.for_all (* check insert condition for tail of O *)
+                (fun cl ->
+                  match cl with
+                  | q :: _, _ -> not (may_compat p q)
+                  | _ -> assert false)
+                seen
+            then
+              (* insert *)
+              (List.rev_append seen ((p :: ps, act) :: cl :: rem), no)
+            else (* fail to insert or append *)
+              (ors, (p :: ps, act) :: no)
+          else if condb act_q ps qs then
+            (* check condition (b) for append *)
+            attempt (cl :: seen) rem
+          else (ors, (p :: ps, act) :: no)
+        else (* p # q, go on with append/insert *)
+          attempt (cl :: seen) rem
+      else
+        (* q is not an or-pat, go on with append/insert *)
+        attempt (cl :: seen) rem
+    | _ ->
+      (* [] in fact *)
+      ((p :: ps, act) :: ors, no)
+  in
+  (* success in appending *)
+  attempt [] ors
+
+(* Reconstruct default information from half_compiled  pm list *)
+
+let rec rebuild_matrix pmh =
+  match pmh with
+  | Pm pm -> as_matrix pm.cases
+  | PmOr {or_matrix = m} -> m
+  | PmVar x -> add_omega_column (rebuild_matrix x.inside)
+
+let rec rebuild_default nexts def =
+  match nexts with
+  | [] -> def
+  | (e, pmh) :: rem ->
+    (add_omega_column (rebuild_matrix pmh), e) :: rebuild_default rem def
+
+let rebuild_nexts arg nexts k =
+  List.fold_right
+    (fun (e, pm) k -> (e, PmVar {inside = pm; var_arg = arg}) :: k)
+    nexts k
+
+(*
+  Split a matching.
+    Splitting is first directed by or-patterns, then by
+    tests (e.g. constructors)/variable transitions.
+
+    The approach is greedy, every split function attempts to
+    raise rows as much as possible in the top matrix,
+    then splitting applies again to the remaining rows.
+
+    Some precompilation of or-patterns and
+    variable pattern occurs. Mostly this means that bindings
+    are performed now,  being replaced by let-bindings
+    in actions (cf. simplify_cases).
+
+    Additionally, if the match argument is a variable, matchings whose
+    first column is made of variables only are splitted further
+    (cf. precompile_var).
+
+*)
+
+let rec split_or argo cls args def =
+  let cls = simplify_cases args cls in
+
+  let rec do_split before ors no = function
+    | [] -> cons_next (List.rev before) (List.rev ors) (List.rev no)
+    | ((p :: ps, act) as cl) :: rem ->
+      if up_ok cl no then
+        if is_or p then
+          let ors, no = insert_or_append p ps act ors no in
+          do_split before ors no rem
+        else if up_ok cl ors then do_split (cl :: before) ors no rem
+        else if or_ok p ps ors then do_split before (cl :: ors) no rem
+        else do_split before ors (cl :: no) rem
+      else do_split before ors (cl :: no) rem
+    | _ -> assert false
+  and cons_next yes yesor = function
+    | [] -> precompile_or argo yes yesor args def []
+    | rem ->
+      let {me = next; matrix; top_default = def}, nexts =
+        do_split [] [] [] rem
+      in
+      let idef = next_raise_count () in
+      precompile_or argo yes yesor args
+        (cons_default matrix idef def)
+        ((idef, next) :: nexts)
+  in
+
+  do_split [] [] [] cls
+
+(* Ultra-naive splitting, close to semantics, used for extension,
+   as potential rebind prevents any kind of optimisation *)
+
+and split_naive cls args def k =
+  let rec split_exc cstr0 yes = function
+    | [] ->
+      let yes = List.rev yes in
+      ( {
+          me = Pm {cases = yes; args; default = def};
+          matrix = as_matrix yes;
+          top_default = def;
+        },
+        k )
+    | ((p :: _, _) as cl) :: rem ->
+      if group_constructor p then
+        let cstr = pat_as_constr p in
+        if cstr = cstr0 then split_exc cstr0 (cl :: yes) rem
+        else
+          let yes = List.rev yes in
+          let {me = next; matrix; top_default = def}, nexts =
+            split_exc cstr [cl] rem
+          in
+          let idef = next_raise_count () in
+          let def = cons_default matrix idef def in
+          ( {
+              me = Pm {cases = yes; args; default = def};
+              matrix = as_matrix yes;
+              top_default = def;
+            },
+            (idef, next) :: nexts )
+      else
+        let yes = List.rev yes in
+        let {me = next; matrix; top_default = def}, nexts =
+          split_noexc [cl] rem
+        in
+        let idef = next_raise_count () in
+        let def = cons_default matrix idef def in
+        ( {
+            me = Pm {cases = yes; args; default = def};
+            matrix = as_matrix yes;
+            top_default = def;
+          },
+          (idef, next) :: nexts )
+    | _ -> assert false
+  and split_noexc yes = function
+    | [] -> precompile_var args (List.rev yes) def k
+    | ((p :: _, _) as cl) :: rem ->
+      if group_constructor p then
+        let yes = List.rev yes in
+        let {me = next; matrix; top_default = def}, nexts =
+          split_exc (pat_as_constr p) [cl] rem
+        in
+        let idef = next_raise_count () in
+        precompile_var args yes
+          (cons_default matrix idef def)
+          ((idef, next) :: nexts)
+      else split_noexc (cl :: yes) rem
+    | _ -> assert false
+  in
+
+  match cls with
+  | [] -> assert false
+  | ((p :: _, _) as cl) :: rem ->
+    if group_constructor p then split_exc (pat_as_constr p) [cl] rem
+    else split_noexc [cl] rem
+  | _ -> assert false
+
+and split_constr cls args def k =
+  let ex_pat = what_is_cases cls in
+  match ex_pat.pat_desc with
+  | Tpat_any -> precompile_var args cls def k
+  | Tpat_construct (_, {cstr_tag = Cstr_extension _}, _) ->
+    split_naive cls args def k
+  | _ -> (
+    let group = get_group ex_pat in
+
+    let rec split_ex yes no = function
+      | [] -> (
+        let yes = List.rev yes and no = List.rev no in
+        match no with
+        | [] ->
+          ( {
+              me = Pm {cases = yes; args; default = def};
+              matrix = as_matrix yes;
+              top_default = def;
+            },
+            k )
+        | cl :: rem -> (
+          match yes with
+          | [] ->
+            (* Could not success in raising up a constr matching up *)
+            split_noex [cl] [] rem
+          | _ ->
+            let {me = next; matrix; top_default = def}, nexts =
+              split_noex [cl] [] rem
+            in
+            let idef = next_raise_count () in
+            let def = cons_default matrix idef def in
+            ( {
+                me = Pm {cases = yes; args; default = def};
+                matrix = as_matrix yes;
+                top_default = def;
+              },
+              (idef, next) :: nexts )))
+      | ((p :: _, _) as cl) :: rem ->
+        if group p && up_ok cl no then split_ex (cl :: yes) no rem
+        else split_ex yes (cl :: no) rem
+      | _ -> assert false
+    and split_noex yes no = function
+      | [] -> (
+        let yes = List.rev yes and no = List.rev no in
+        match no with
+        | [] -> precompile_var args yes def k
+        | cl :: rem ->
+          let {me = next; matrix; top_default = def}, nexts =
+            split_ex [cl] [] rem
+          in
+          let idef = next_raise_count () in
+          precompile_var args yes
+            (cons_default matrix idef def)
+            ((idef, next) :: nexts))
+      | [((ps, _) as cl)] when List.for_all group_var ps && yes <> [] ->
+        (* This enables an extra division in some frequent cases :
+           last row is made of variables only *)
+        split_noex yes (cl :: no) []
+      | ((p :: _, _) as cl) :: rem ->
+        if (not (group p)) && up_ok cl no then split_noex (cl :: yes) no rem
+        else split_noex yes (cl :: no) rem
+      | _ -> assert false
+    in
+
+    match cls with
+    | ((p :: _, _) as cl) :: rem ->
+      if group p then split_ex [cl] [] rem else split_noex [cl] [] rem
+    | _ -> assert false)
+
+and precompile_var args cls def k =
+  match args with
+  | [] -> assert false
+  | _ :: (((Lvar v as av), _) as arg) :: rargs -> (
+    match cls with
+    | [_] ->
+      (* as splitted as it can *)
+      dont_precompile_var args cls def k
+    | _ -> (
+      (* Precompile *)
+      let var_cls =
+        List.map
+          (fun (ps, act) ->
+            match ps with
+            | _ :: ps -> (ps, act)
+            | _ -> assert false)
+          cls
+      and var_def = make_default (fun _ rem -> rem) def in
+      let {me = first; matrix}, nexts =
+        split_or (Some v) var_cls (arg :: rargs) var_def
+      in
+
+      (* Compute top information *)
+      match nexts with
+      | [] ->
+        (* If you need *)
+        dont_precompile_var args cls def k
+      | _ ->
+        let rfirst =
+          {
+            me = PmVar {inside = first; var_arg = av};
+            matrix = add_omega_column matrix;
+            top_default = rebuild_default nexts def;
+          }
+        and rnexts = rebuild_nexts av nexts k in
+        (rfirst, rnexts)))
+  | _ -> dont_precompile_var args cls def k
+
+and dont_precompile_var args cls def k =
+  ( {
+      me = Pm {cases = cls; args; default = def};
+      matrix = as_matrix cls;
+      top_default = def;
+    },
+    k )
+
+and precompile_or argo cls ors args def k =
+  match ors with
+  | [] -> split_constr cls args def k
+  | _ ->
+    let rec do_cases = function
+      | (({pat_desc = Tpat_or _} as orp) :: patl, action) :: rem ->
+        let others, rem = get_equiv orp rem in
+        let orpm =
+          {
+            cases =
+              (patl, action)
+              :: List.map
+                   (function
+                     | _ :: ps, action -> (ps, action)
+                     | _ -> assert false)
+                   others;
+            args =
+              (match args with
+              | _ :: r -> r
+              | _ -> assert false);
+            default = default_compat orp def;
+          }
+        in
+        let vars =
+          IdentSet.elements
+            (IdentSet.inter
+               (extract_vars IdentSet.empty orp)
+               (pm_free_variables orpm))
+        in
+        let or_num = next_raise_count () in
+        let new_patl = Parmatch.omega_list patl in
+
+        let mk_new_action vs =
+          Lstaticraise (or_num, List.map (fun v -> Lvar v) vs)
+        in
+
+        let body, handlers = do_cases rem in
+        ( explode_or_pat argo new_patl mk_new_action body vars [] orp,
+          let mat = [[orp]] in
+          (mat, or_num, vars, orpm) :: handlers )
+      | cl :: rem ->
+        let new_ord, new_to_catch = do_cases rem in
+        (cl :: new_ord, new_to_catch)
+      | [] -> ([], [])
+    in
+
+    let end_body, handlers = do_cases ors in
+    let matrix = as_matrix (cls @ ors)
+    and body = {cases = cls @ end_body; args; default = def} in
+    ( {me = PmOr {body; handlers; or_matrix = matrix}; matrix; top_default = def},
+      k )
+
+let split_precompile argo pm =
+  let {me = next}, nexts = split_or argo pm.cases pm.args pm.default in
+  if
+    dbg
+    && (nexts <> []
+       ||
+       match next with
+       | PmOr _ -> true
+       | _ -> false)
+  then (
+    prerr_endline "** SPLIT **";
+    pretty_pm pm;
+    pretty_precompiled_res next nexts);
+  (next, nexts)
+
+(* General divide functions *)
+
+let add_line patl_action pm =
+  pm.cases <- patl_action :: pm.cases;
+  pm
+
+type cell = {pm: pattern_matching; ctx: ctx list; pat: pattern}
+
+let add make_matching_fun division eq_key key patl_action args =
+  try
+    let _, cell = List.find (fun (k, _) -> eq_key key k) division in
+    cell.pm.cases <- patl_action :: cell.pm.cases;
+    division
+  with Not_found ->
+    let cell = make_matching_fun args in
+    cell.pm.cases <- [patl_action];
+    (key, cell) :: division
+
+let divide make eq_key get_key get_args ctx pm =
+  let rec divide_rec = function
+    | (p :: patl, action) :: rem ->
+      let this_match = divide_rec rem in
+      add (make p pm.default ctx) this_match eq_key (get_key p)
+        (get_args p patl, action)
+        pm.args
+    | _ -> []
+  in
+
+  divide_rec pm.cases
+
+let divide_line make_ctx make get_args pat ctx pm =
+  let rec divide_rec = function
+    | (p :: patl, action) :: rem ->
+      let this_match = divide_rec rem in
+      add_line (get_args p patl, action) this_match
+    | _ -> make pm.default pm.args
+  in
+
+  {pm = divide_rec pm.cases; ctx = make_ctx ctx; pat}
+
+(* Then come various functions,
+   There is one set of functions per matching style
+   (constants, constructors etc.)
+
+   - matcher functions are arguments to make_default (for default handlers)
+   They may raise NoMatch or OrPat and perform the full
+   matching (selection + arguments).
+
+
+   - get_args and get_key are for the compiled matrices, note that
+   selection and getting arguments are separated.
+
+   - make_ _matching combines the previous functions for producing
+   new  ``pattern_matching'' records.
+*)
+
+let rec matcher_const cst p rem =
+  match p.pat_desc with
+  | Tpat_or (p1, p2, _) -> (
+    try matcher_const cst p1 rem with NoMatch -> matcher_const cst p2 rem)
+  | Tpat_constant c1 when const_compare c1 cst = 0 -> rem
+  | Tpat_any -> rem
+  | _ -> raise NoMatch
+
+let get_key_constant caller = function
+  | {pat_desc = Tpat_constant cst} -> cst
+  | p ->
+    prerr_endline ("BAD: " ^ caller);
+    pretty_pat p;
+    assert false
+
+let get_args_constant _ rem = rem
+
+let make_constant_matching p def ctx = function
+  | [] -> fatal_error "Matching.make_constant_matching"
+  | _ :: argl ->
+    let def = make_default (matcher_const (get_key_constant "make" p)) def
+    and ctx = filter_ctx p ctx in
+    {pm = {cases = []; args = argl; default = def}; ctx; pat = normalize_pat p}
+
+let divide_constant ctx m =
+  divide make_constant_matching
+    (fun c d -> const_compare c d = 0)
+    (get_key_constant "divide")
+    get_args_constant ctx m
+
+(* Matching against a constructor *)
+
+let make_field_args ~fld_info loc binding_kind arg first_pos last_pos argl =
+  let rec make_args pos =
+    if pos > last_pos then argl
+    else
+      (Lprim (Pfield (pos, fld_info), [arg], loc), binding_kind)
+      :: make_args (pos + 1)
+  in
+  make_args first_pos
+
+let get_key_constr = function
+  | {pat_desc = Tpat_construct (_, cstr, _)} -> cstr.cstr_tag
+  | _ -> assert false
+
+let get_args_constr p rem =
+  match p with
+  | {pat_desc = Tpat_construct (_, _, args)} -> args @ rem
+  | _ -> assert false
+
+(* NB: matcher_constr applies to default matrices.
+
+       In that context, matching by constructors of extensible
+       types degrades to arity checking, due to potential rebinding.
+       This comparison is performed by Types.may_equal_constr.
+*)
+
+let matcher_constr cstr =
+  match cstr.cstr_arity with
+  | 0 ->
+    let rec matcher_rec q rem =
+      match q.pat_desc with
+      | Tpat_or (p1, p2, _) -> (
+        try matcher_rec p1 rem with NoMatch -> matcher_rec p2 rem)
+      | Tpat_construct (_, cstr', []) when Types.may_equal_constr cstr cstr' ->
+        rem
+      | Tpat_any -> rem
+      | _ -> raise NoMatch
+    in
+    matcher_rec
+  | 1 ->
+    let rec matcher_rec q rem =
+      match q.pat_desc with
+      | Tpat_or (p1, p2, _) -> (
+        let r1 = try Some (matcher_rec p1 rem) with NoMatch -> None
+        and r2 = try Some (matcher_rec p2 rem) with NoMatch -> None in
+        match (r1, r2) with
+        | None, None -> raise NoMatch
+        | Some r1, None -> r1
+        | None, Some r2 -> r2
+        | Some (a1 :: _), Some (a2 :: _) ->
+          {a1 with pat_loc = Location.none; pat_desc = Tpat_or (a1, a2, None)}
+          :: rem
+        | _, _ -> assert false)
+      | Tpat_construct (_, cstr', [arg]) when Types.may_equal_constr cstr cstr'
+        ->
+        arg :: rem
+      | Tpat_any -> omega :: rem
+      | _ -> raise NoMatch
+    in
+    matcher_rec
+  | _ -> (
+    fun q rem ->
+      match q.pat_desc with
+      | Tpat_or (_, _, _) -> raise OrPat
+      | Tpat_construct (_, cstr', args) when Types.may_equal_constr cstr cstr'
+        ->
+        args @ rem
+      | Tpat_any -> Parmatch.omegas cstr.cstr_arity @ rem
+      | _ -> raise NoMatch)
+
+let make_constr_matching p def ctx = function
+  | [] -> fatal_error "Matching.make_constr_matching"
+  | (arg, _mut) :: argl ->
+    let cstr = pat_as_constr p in
+    let untagged = Ast_untagged_variants.has_untagged cstr.cstr_attributes in
+    let newargs =
+      if cstr.cstr_inlined <> None || (untagged && cstr.cstr_args <> []) then
+        (arg, Alias) :: argl
+      else
+        match cstr.cstr_tag with
+        | Cstr_block _ when Datarepr.constructor_has_optional_shape cstr ->
+          let from_option =
+            match p.pat_desc with
+            | Tpat_construct (_, _, [{pat_type; pat_env}])
+              when Typeopt.type_cannot_contain_undefined pat_type pat_env ->
+              Pval_from_option_not_nest
+            | _ -> Pval_from_option
+          in
+          (Lprim (from_option, [arg], p.pat_loc), Alias) :: argl
+        | Cstr_constant _ | Cstr_block _ ->
+          make_field_args p.pat_loc Alias arg 0 (cstr.cstr_arity - 1) argl
+            ~fld_info:(if cstr.cstr_name = "::" then Fld_cons else Fld_variant)
+        | Cstr_unboxed -> (arg, Alias) :: argl
+        | Cstr_extension _ ->
+          make_field_args p.pat_loc Alias arg 1 cstr.cstr_arity argl
+            ~fld_info:Fld_extension
+    in
+    {
+      pm =
+        {
+          cases = [];
+          args = newargs;
+          default = make_default (matcher_constr cstr) def;
+        };
+      ctx = filter_ctx p ctx;
+      pat = normalize_pat p;
+    }
+
+let divide_constructor ctx pm =
+  divide make_constr_matching Types.equal_tag get_key_constr get_args_constr ctx
+    pm
+
+(* Matching against a variant *)
+
+let rec matcher_variant_const lab p rem =
+  match p.pat_desc with
+  | Tpat_or (p1, p2, _) -> (
+    try matcher_variant_const lab p1 rem
+    with NoMatch -> matcher_variant_const lab p2 rem)
+  | Tpat_variant (lab1, _, _) when lab1 = lab -> rem
+  | Tpat_any -> rem
+  | _ -> raise NoMatch
+
+let make_variant_matching_constant p lab def ctx = function
+  | [] -> fatal_error "Matching.make_variant_matching_constant"
+  | _ :: argl ->
+    let def = make_default (matcher_variant_const lab) def
+    and ctx = filter_ctx p ctx in
+    {pm = {cases = []; args = argl; default = def}; ctx; pat = normalize_pat p}
+
+let matcher_variant_nonconst lab p rem =
+  match p.pat_desc with
+  | Tpat_or (_, _, _) -> raise OrPat
+  | Tpat_variant (lab1, Some arg, _) when lab1 = lab -> arg :: rem
+  | Tpat_any -> omega :: rem
+  | _ -> raise NoMatch
+
+let make_variant_matching_nonconst p lab def ctx = function
+  | [] -> fatal_error "Matching.make_variant_matching_nonconst"
+  | (arg, _mut) :: argl ->
+    let def = make_default (matcher_variant_nonconst lab) def
+    and ctx = filter_ctx p ctx in
+    {
+      pm =
+        {
+          cases = [];
+          args =
+            (Lprim (Pfield (1, Fld_poly_var_content), [arg], p.pat_loc), Alias)
+            :: argl;
+          default = def;
+        };
+      ctx;
+      pat = normalize_pat p;
+    }
+
+let divide_variant row ctx {cases = cl; args = al; default = def} =
+  let row = Btype.row_repr row in
+  let rec divide = function
+    | (({pat_desc = Tpat_variant (lab, pato, _)} as p) :: patl, action) :: rem
+      -> (
+      let variants = divide rem in
+      if
+        try Btype.row_field_repr (List.assoc lab row.row_fields) = Rabsent
+        with Not_found -> true
+      then variants
+      else
+        let tag = Btype.hash_variant lab in
+        let ( = ) ((a : string), (b : Types.constructor_tag)) (c, d) =
+          a = c && Types.equal_tag b d
+        in
+        match pato with
+        | None ->
+          add
+            (make_variant_matching_constant p lab def ctx)
+            variants ( = ) (lab, Cstr_constant tag) (patl, action) al
+        | Some pat ->
+          add
+            (make_variant_matching_nonconst p lab def ctx)
+            variants ( = ) (lab, Cstr_block tag)
+            (pat :: patl, action)
+            al)
+    | _ -> []
+  in
+  divide cl
+
+(*
+  Three ``no-test'' cases
+  *)
+
+(* Matching against a variable *)
+
+let get_args_var _ rem = rem
+
+let make_var_matching def = function
+  | [] -> fatal_error "Matching.make_var_matching"
+  | _ :: argl ->
+    {cases = []; args = argl; default = make_default get_args_var def}
+
+let divide_var ctx pm =
+  divide_line ctx_lshift make_var_matching get_args_var omega ctx pm
+
+(* Matching against a tuple pattern *)
+
+let get_args_tuple arity p rem =
+  match p with
+  | {pat_desc = Tpat_any} -> omegas arity @ rem
+  | {pat_desc = Tpat_tuple args} -> args @ rem
+  | _ -> assert false
+
+let matcher_tuple arity p rem =
+  match p.pat_desc with
+  | Tpat_or (_, _, _) -> raise OrPat
+  | Tpat_any | Tpat_var _ -> omegas arity @ rem
+  | Tpat_tuple args when List.length args = arity -> args @ rem
+  | _ -> raise NoMatch
+
+let make_tuple_matching loc arity def = function
+  | [] -> fatal_error "Matching.make_tuple_matching"
+  | (arg, _mut) :: argl ->
+    let rec make_args pos =
+      if pos >= arity then argl
+      else
+        (Lprim (Pfield (pos, Fld_tuple), [arg], loc), Alias)
+        :: make_args (pos + 1)
+    in
+    {
+      cases = [];
+      args = make_args 0;
+      default = make_default (matcher_tuple arity) def;
+    }
+
+let divide_tuple arity p ctx pm =
+  divide_line (filter_ctx p)
+    (make_tuple_matching p.pat_loc arity)
+    (get_args_tuple arity) p ctx pm
+
+(* Matching against a record pattern *)
+
+let record_matching_line num_fields lbl_pat_list =
+  let patv = Array.make num_fields omega in
+  List.iter (fun (_, lbl, pat, _) -> patv.(lbl.lbl_pos) <- pat) lbl_pat_list;
+  Array.to_list patv
+
+let get_args_record num_fields p rem =
+  match p with
+  | {pat_desc = Tpat_any} -> record_matching_line num_fields [] @ rem
+  | {pat_desc = Tpat_record (lbl_pat_list, _)} ->
+    record_matching_line num_fields lbl_pat_list @ rem
+  | _ -> assert false
+
+let matcher_record num_fields p rem =
+  match p.pat_desc with
+  | Tpat_or (_, _, _) -> raise OrPat
+  | Tpat_any | Tpat_var _ -> record_matching_line num_fields [] @ rem
+  | Tpat_record ([], _) when num_fields = 0 -> rem
+  | Tpat_record (((_, lbl, _, _) :: _ as lbl_pat_list), _)
+    when Array.length lbl.lbl_all = num_fields ->
+    record_matching_line num_fields lbl_pat_list @ rem
+  | _ -> raise NoMatch
+
+let make_record_matching loc all_labels def = function
+  | [] -> fatal_error "Matching.make_record_matching"
+  | (arg, _mut) :: argl ->
+    let rec make_args pos =
+      if pos >= Array.length all_labels then argl
+      else
+        let lbl = all_labels.(pos) in
+        let access =
+          match lbl.lbl_repres with
+          | Record_float_unused -> assert false
+          | Record_regular ->
+            Lprim (Pfield (lbl.lbl_pos, Lambda.fld_record lbl), [arg], loc)
+          | Record_inlined _ ->
+            Lprim
+              (Pfield (lbl.lbl_pos, Lambda.fld_record_inline lbl), [arg], loc)
+          | Record_unboxed _ -> arg
+          | Record_extension ->
+            Lprim
+              ( Pfield (lbl.lbl_pos + 1, Lambda.fld_record_extension lbl),
+                [arg],
+                loc )
+        in
+        let str =
+          match lbl.lbl_mut with
+          | Immutable -> Alias
+          | Mutable -> StrictOpt
+        in
+        (access, str) :: make_args (pos + 1)
+    in
+    let nfields = Array.length all_labels in
+    let def = make_default (matcher_record nfields) def in
+    {cases = []; args = make_args 0; default = def}
+
+let divide_record all_labels p ctx pm =
+  let get_args = get_args_record (Array.length all_labels) in
+  divide_line (filter_ctx p)
+    (make_record_matching p.pat_loc all_labels)
+    get_args p ctx pm
+
+(* Matching against an array pattern *)
+
+let get_key_array = function
+  | {pat_desc = Tpat_array patl} -> List.length patl
+  | _ -> assert false
+
+let get_args_array p rem =
+  match p with
+  | {pat_desc = Tpat_array patl} -> patl @ rem
+  | _ -> assert false
+
+let matcher_array len p rem =
+  match p.pat_desc with
+  | Tpat_or (_, _, _) -> raise OrPat
+  | Tpat_array args when List.length args = len -> args @ rem
+  | Tpat_any -> Parmatch.omegas len @ rem
+  | _ -> raise NoMatch
+
+let make_array_matching p def ctx = function
+  | [] -> fatal_error "Matching.make_array_matching"
+  | (arg, _mut) :: argl ->
+    let len = get_key_array p in
+    let rec make_args pos =
+      if pos >= len then argl
+      else
+        ( Lprim
+            (Parrayrefu, [arg; Lconst (Const_base (Const_int pos))], p.pat_loc),
+          StrictOpt )
+        :: make_args (pos + 1)
+    in
+    let def = make_default (matcher_array len) def and ctx = filter_ctx p ctx in
+    {
+      pm = {cases = []; args = make_args 0; default = def};
+      ctx;
+      pat = normalize_pat p;
+    }
+
+let divide_array ctx pm =
+  divide make_array_matching ( = ) get_key_array get_args_array ctx pm
+
+(*
+   Specific string test sequence
+   Will be called by the bytecode compiler, from bytegen.ml.
+   The strategy is first dichotomic search (we perform 3-way tests
+   with compare_string), then sequence of equality tests
+   when there are less then T=strings_test_threshold static strings to match.
+
+  Increasing T entails (slightly) less code, decreasing T
+  (slightly) favors runtime speed.
+  T=8 looks a decent tradeoff.
+*)
+
+(* Utilities *)
+
+let strings_test_threshold = 8
+
+let bind_sw arg k =
+  match arg with
+  | Lvar _ -> k arg
+  | _ ->
+    let id = Ident.create "switch" in
+    Llet (Strict, Pgenval, id, arg, k (Lvar id))
+
+(* Sequential equality tests *)
+
+let make_string_test_sequence loc arg sw d =
+  let d, sw =
+    match d with
+    | None -> (
+      match sw with
+      | (_, d) :: sw -> (d, sw)
+      | [] -> assert false)
+    | Some d -> (d, sw)
+  in
+  bind_sw arg (fun arg ->
+      List.fold_right
+        (fun (s, lam) k ->
+          Lifthenelse
+            ( Lprim (Pstringcomp Cneq, [arg; Lconst (Const_immstring s)], loc),
+              k,
+              lam ))
+        sw d)
+
+let rec split k xs =
+  match xs with
+  | [] -> assert false
+  | x0 :: xs ->
+    if k <= 1 then ([], x0, xs)
+    else
+      let xs, y0, ys = split (k - 2) xs in
+      (x0 :: xs, y0, ys)
+
+let zero_lam = Lconst (Const_base (Const_int 0))
+
+let tree_way_test loc arg lt eq gt =
+  Lifthenelse
+    ( Lprim (Pintcomp Clt, [arg; zero_lam], loc),
+      lt,
+      Lifthenelse (Lprim (Pintcomp Clt, [zero_lam; arg], loc), gt, eq) )
+
+(* Dichotomic tree *)
+
+let rec do_make_string_test_tree loc arg sw delta d =
+  let len = List.length sw in
+  if len <= strings_test_threshold + delta then
+    make_string_test_sequence loc arg sw d
+  else
+    let lt, (s, act), gt = split len sw in
+    bind_sw
+      (Lprim (Pstringcomp Ceq, [arg; Lconst (Const_immstring s)], loc))
+      (fun r ->
+        tree_way_test loc r
+          (do_make_string_test_tree loc arg lt delta d)
+          act
+          (do_make_string_test_tree loc arg gt delta d))
+
+(* Entry point *)
+let expand_stringswitch loc arg sw d =
+  match d with
+  | None -> bind_sw arg (fun arg -> do_make_string_test_tree loc arg sw 0 None)
+  | Some e ->
+    bind_sw arg (fun arg ->
+        make_catch e (fun d -> do_make_string_test_tree loc arg sw 1 (Some d)))
+
+(**********************)
+(* Generic test trees *)
+(**********************)
+
+(* Sharing *)
+
+(* Add handler, if shared *)
+let handle_shared () =
+  let hs = ref (fun x -> x) in
+  let handle_shared act =
+    match act with
+    | Switch.Single act -> act
+    | Switch.Shared act ->
+      let i, h = make_catch_delayed act in
+      let ohs = !hs in
+      (hs := fun act -> h (ohs act));
+      make_exit i
+  in
+  (hs, handle_shared)
+
+let share_actions_tree sw d =
+  let store = StoreExp.mk_store () in
+  (* Default action is always shared *)
+  let d =
+    match d with
+    | None -> None
+    | Some d -> Some (store.Switch.act_store_shared d)
+  in
+  (* Store all other actions *)
+  let sw = List.map (fun (cst, act) -> (cst, store.Switch.act_store act)) sw in
+
+  (* Retrieve all actions, including potential default *)
+  let acts = store.Switch.act_get_shared () in
+
+  (* Array of actual actions *)
+  let hs, handle_shared = handle_shared () in
+  let acts = Array.map handle_shared acts in
+
+  (* Reconstruct default and switch list *)
+  let d =
+    match d with
+    | None -> None
+    | Some d -> Some acts.(d)
+  in
+  let sw = List.map (fun (cst, j) -> (cst, acts.(j))) sw in
+  (!hs, sw, d)
+
+(* Note: dichotomic search requires sorted input with no duplicates *)
+let rec uniq_lambda_list sw =
+  match sw with
+  | [] | [_] -> sw
+  | ((c1, _) as p1) :: ((c2, _) :: sw2 as sw1) ->
+    if const_compare c1 c2 = 0 then uniq_lambda_list (p1 :: sw2)
+    else p1 :: uniq_lambda_list sw1
+
+let sort_lambda_list l =
+  let l = List.stable_sort (fun (x, _) (y, _) -> const_compare x y) l in
+  uniq_lambda_list l
+
+let rec cut n l =
+  if n = 0 then ([], l)
+  else
+    match l with
+    | [] -> raise (Invalid_argument "cut")
+    | a :: l ->
+      let l1, l2 = cut (n - 1) l in
+      (a :: l1, l2)
+
+let rec do_tests_fail loc fail tst arg = function
+  | [] -> fail
+  | (c, act) :: rem ->
+    Lifthenelse
+      ( Lprim (tst, [arg; Lconst (Const_base c)], loc),
+        do_tests_fail loc fail tst arg rem,
+        act )
+
+let rec do_tests_nofail loc tst arg = function
+  | [] -> fatal_error "Matching.do_tests_nofail"
+  | [(_, act)] -> act
+  | (c, act) :: rem ->
+    Lifthenelse
+      ( Lprim (tst, [arg; Lconst (Const_base c)], loc),
+        do_tests_nofail loc tst arg rem,
+        act )
+
+let make_test_sequence loc fail tst lt_tst arg const_lambda_list =
+  let const_lambda_list = sort_lambda_list const_lambda_list in
+  let hs, const_lambda_list, fail = share_actions_tree const_lambda_list fail in
+
+  let rec make_test_sequence const_lambda_list =
+    if List.length const_lambda_list >= 4 && lt_tst <> Pignore then
+      split_sequence const_lambda_list
+    else
+      match fail with
+      | None -> do_tests_nofail loc tst arg const_lambda_list
+      | Some fail -> do_tests_fail loc fail tst arg const_lambda_list
+  and split_sequence const_lambda_list =
+    let list1, list2 =
+      cut (List.length const_lambda_list / 2) const_lambda_list
+    in
+    Lifthenelse
+      ( Lprim (lt_tst, [arg; Lconst (Const_base (fst (List.hd list2)))], loc),
+        make_test_sequence list1,
+        make_test_sequence list2 )
+  in
+  hs (make_test_sequence const_lambda_list)
+
+module SArg = struct
+  type primitive = Lambda.primitive
+
+  let eqint = Pintcomp Ceq
+  let neint = Pintcomp Cneq
+  let leint = Pintcomp Cle
+  let ltint = Pintcomp Clt
+  let geint = Pintcomp Cge
+  let gtint = Pintcomp Cgt
+
+  type act = Lambda.lambda
+
+  let make_prim p args = Lprim (p, args, Location.none)
+  let make_offset arg n =
+    match n with
+    | 0 -> arg
+    | _ -> Lprim (Poffsetint n, [arg], Location.none)
+
+  let bind arg body =
+    let newvar, newarg =
+      match arg with
+      | Lvar v -> (v, arg)
+      | _ ->
+        let newvar = Ident.create "switcher" in
+        (newvar, Lvar newvar)
+    in
+    bind Alias newvar arg (body newarg)
+  let make_const i = Lconst (Const_base (Const_int i))
+  let make_isout h arg = Lprim (Pisout, [h; arg], Location.none)
+  let make_isin h arg = Lprim (Pnot, [make_isout h arg], Location.none)
+  let make_if cond ifso ifnot = Lifthenelse (cond, ifso, ifnot)
+  let make_switch loc arg cases acts ~offset sw_names =
+    let l = ref [] in
+    for i = Array.length cases - 1 downto 0 do
+      l := (offset + i, acts.(cases.(i))) :: !l
+    done;
+    Lswitch
+      ( arg,
+        {
+          sw_numconsts = Array.length cases;
+          sw_consts = !l;
+          sw_numblocks = 0;
+          sw_blocks = [];
+          sw_failaction = None;
+          sw_names;
+        },
+        loc )
+  let make_catch = make_catch_delayed
+  let make_exit = make_exit
+end
+
+(* Action sharing for Lswitch argument *)
+let share_actions_sw sw =
+  (* Attempt sharing on all actions *)
+  let store = StoreExp.mk_store () in
+  let fail =
+    match sw.sw_failaction with
+    | None -> None
+    | Some fail ->
+      (* Fail is translated to exit, whatever happens *)
+      Some (store.Switch.act_store_shared fail)
+  in
+  let consts =
+    List.map (fun (i, e) -> (i, store.Switch.act_store e)) sw.sw_consts
+  and blocks =
+    List.map (fun (i, e) -> (i, store.Switch.act_store e)) sw.sw_blocks
+  in
+  let acts = store.Switch.act_get_shared () in
+  let hs, handle_shared = handle_shared () in
+  let acts = Array.map handle_shared acts in
+  let fail =
+    match fail with
+    | None -> None
+    | Some fail -> Some acts.(fail)
+  in
+  ( !hs,
+    {
+      sw with
+      sw_consts = List.map (fun (i, j) -> (i, acts.(j))) consts;
+      sw_blocks = List.map (fun (i, j) -> (i, acts.(j))) blocks;
+      sw_failaction = fail;
+    } )
+
+(* Reintroduce fail action in switch argument,
+   for the sake of avoiding carrying over huge switches *)
+
+let reintroduce_fail sw =
+  match sw.sw_failaction with
+  | None ->
+    let t = Hashtbl.create 17 in
+    let seen (_, l) =
+      match as_simple_exit l with
+      | Some i ->
+        let old = try Hashtbl.find t i with Not_found -> 0 in
+        Hashtbl.replace t i (old + 1)
+      | None -> ()
+    in
+    List.iter seen sw.sw_consts;
+    List.iter seen sw.sw_blocks;
+    let i_max = ref (-1) and max = ref (-1) in
+    Hashtbl.iter
+      (fun i c ->
+        if
+          c > !max || (c = !max && i > !i_max)
+          (* tie-break for determinism: choose the largest index *)
+        then (
+          i_max := i;
+          max := c))
+      t;
+    if !max >= 3 then
+      let default = !i_max in
+      let remove ls =
+        Ext_list.filter ls (fun (_, lam) ->
+            match as_simple_exit lam with
+            | Some j -> j <> default
+            | None -> true)
+      in
+      {
+        sw with
+        sw_consts = remove sw.sw_consts;
+        sw_blocks = remove sw.sw_blocks;
+        sw_failaction = Some (make_exit default);
+      }
+    else sw
+  | Some _ -> sw
+
+module Switcher = Switch.Make (SArg)
+open Switch
+
+let rec last def = function
+  | [] -> def
+  | [(x, _)] -> x
+  | _ :: rem -> last def rem
+
+let get_edges low high l =
+  match l with
+  | [] -> (low, high)
+  | (x, _) :: _ -> (x, last high l)
+
+let as_interval_canfail fail low high l =
+  let store = StoreExp.mk_store () in
+
+  let do_store _tag act =
+    let i = store.act_store act in
+    (*
+    eprintf "STORE [%s] %i %s\n" tag i (string_of_lam act) ;
+*)
+    i
+  in
+
+  let rec nofail_rec cur_low cur_high cur_act = function
+    | [] ->
+      if cur_high = high then [(cur_low, cur_high, cur_act)]
+      else [(cur_low, cur_high, cur_act); (cur_high + 1, high, 0)]
+    | (i, act_i) :: rem as all ->
+      let act_index = do_store "NO" act_i in
+      if cur_high + 1 = i then
+        if act_index = cur_act then nofail_rec cur_low i cur_act rem
+        else if act_index = 0 then (cur_low, i - 1, cur_act) :: fail_rec i i rem
+        else (cur_low, i - 1, cur_act) :: nofail_rec i i act_index rem
+      else if act_index = 0 then
+        (cur_low, cur_high, cur_act)
+        :: fail_rec (cur_high + 1) (cur_high + 1) all
+      else
+        (cur_low, cur_high, cur_act)
+        :: (cur_high + 1, i - 1, 0)
+        :: nofail_rec i i act_index rem
+  and fail_rec cur_low cur_high = function
+    | [] -> [(cur_low, cur_high, 0)]
+    | (i, act_i) :: rem ->
+      let index = do_store "YES" act_i in
+      if index = 0 then fail_rec cur_low i rem
+      else (cur_low, i - 1, 0) :: nofail_rec i i index rem
+  in
+
+  let init_rec = function
+    | [] -> [(low, high, 0)]
+    | (i, act_i) :: rem ->
+      let index = do_store "INIT" act_i in
+      if index = 0 then fail_rec low i rem
+      else if low < i then (low, i - 1, 0) :: nofail_rec i i index rem
+      else nofail_rec i i index rem
+  in
+
+  assert (do_store "FAIL" fail = 0);
+  (* fail has action index 0 *)
+  let r = init_rec l in
+  (Array.of_list r, store)
+
+let as_interval_nofail l =
+  let store = StoreExp.mk_store () in
+  let rec some_hole = function
+    | [] | [_] -> false
+    | (i, _) :: ((j, _) :: _ as rem) -> j > i + 1 || some_hole rem
+  in
+  let rec i_rec cur_low cur_high cur_act = function
+    | [] -> [(cur_low, cur_high, cur_act)]
+    | (i, act) :: rem ->
+      let act_index = store.act_store act in
+      if act_index = cur_act then i_rec cur_low i cur_act rem
+      else (cur_low, cur_high, cur_act) :: i_rec i i act_index rem
+  in
+  let inters =
+    match l with
+    | (i, act) :: rem ->
+      let act_index =
+        (* In case there is some hole and that a switch is emitted,
+           action 0 will be used as the action of unreachable
+           cases (cf. switch.ml, make_switch).
+           Hence, this action will be shared *)
+        if some_hole rem then store.act_store_shared act
+        else store.act_store act
+      in
+      assert (act_index = 0);
+      i_rec i i act_index rem
+    | _ -> assert false
+  in
+
+  (Array.of_list inters, store)
+
+let sort_int_lambda_list l =
+  List.sort
+    (fun (i1, _) (i2, _) -> if i1 < i2 then -1 else if i2 < i1 then 1 else 0)
+    l
+
+let as_interval fail low high l =
+  let l = sort_int_lambda_list l in
+  ( get_edges low high l,
+    match fail with
+    | None -> as_interval_nofail l
+    | Some act -> as_interval_canfail act low high l )
+
+let call_switcher loc fail arg low high int_lambda_list sw_names =
+  let edges, (cases, actions) = as_interval fail low high int_lambda_list in
+  Switcher.zyva loc edges arg cases actions sw_names
+
+let rec list_as_pat = function
+  | [] -> fatal_error "Matching.list_as_pat"
+  | [pat] -> pat
+  | pat :: rem -> {pat with pat_desc = Tpat_or (pat, list_as_pat rem, None)}
+
+let complete_pats_constrs = function
+  | p :: _ as pats ->
+    List.map (pat_of_constr p)
+      (complete_constrs p (List.map get_key_constr pats))
+  | _ -> assert false
+
+(*
+     Following two ``failaction'' function compute n, the trap handler
+    to jump to in case of failure of elementary tests
+*)
+
+let mk_failaction_neg partial ctx def =
+  match partial with
+  | Partial -> (
+    match def with
+    | (_, idef) :: _ ->
+      (Some (Lstaticraise (idef, [])), jumps_singleton idef ctx)
+    | [] ->
+      (* Act as Total, this means
+         If no appropriate default matrix exists,
+         then this switch cannot fail *)
+      (None, jumps_empty))
+  | Total -> (None, jumps_empty)
+
+(* In line with the article and simpler than before *)
+let mk_failaction_pos partial seen ctx defs =
+  if dbg then (
+    prerr_endline "**POS**";
+    pretty_def defs;
+    ());
+  let rec scan_def env to_test defs =
+    match (to_test, defs) with
+    | [], _ | _, [] ->
+      List.fold_left
+        (fun (klist, jumps) (pats, i) ->
+          let action = Lstaticraise (i, []) in
+          let klist =
+            List.fold_right
+              (fun pat r -> (get_key_constr pat, action) :: r)
+              pats klist
+          and jumps = jumps_add i (ctx_lub (list_as_pat pats) ctx) jumps in
+          (klist, jumps))
+        ([], jumps_empty) env
+    | _, (pss, idef) :: rem -> (
+      let now, later =
+        List.partition (fun (_p, p_ctx) -> ctx_match p_ctx pss) to_test
+      in
+      match now with
+      | [] -> scan_def env to_test rem
+      | _ -> scan_def ((List.map fst now, idef) :: env) later rem)
+  in
+
+  let fail_pats = complete_pats_constrs seen in
+  if List.length fail_pats < 32 then (
+    let fail, jmps =
+      scan_def [] (List.map (fun pat -> (pat, ctx_lub pat ctx)) fail_pats) defs
+    in
+    if dbg then (
+      eprintf "POSITIVE JUMPS [%i]:\n" (List.length fail_pats);
+      pretty_jumps jmps);
+    (None, fail, jmps))
+  else (
+    (* Too many non-matched constructors -> reduced information *)
+    if dbg then eprintf "POS->NEG!!!\n%!";
+    let fail, jumps = mk_failaction_neg partial ctx defs in
+    if dbg then
+      eprintf "FAIL: %s\n"
+        (match fail with
+        | None -> "<none>"
+        | Some lam -> string_of_lam lam);
+    (fail, [], jumps))
+
+let combine_constant names loc arg cst partial ctx def
+    (const_lambda_list, total, _pats) =
+  let fail, local_jumps = mk_failaction_neg partial ctx def in
+  let lambda1 =
+    match cst with
+    | Const_int _ ->
+      let int_lambda_list =
+        List.map
+          (function
+            | Const_int n, l -> (n, l)
+            | _ -> assert false)
+          const_lambda_list
+      in
+      call_switcher loc fail arg min_int max_int int_lambda_list names
+    | Const_char _ ->
+      let int_lambda_list =
+        List.map
+          (function
+            | Const_char c, l -> (c, l)
+            | _ -> assert false)
+          const_lambda_list
+      in
+      call_switcher loc fail arg 0 max_int int_lambda_list names
+    | Const_string _ ->
+      (* Note as the bytecode compiler may resort to dichotomic search,
+         the clauses of stringswitch  are sorted with duplicates removed.
+         This partly applies to the native code compiler, which requires
+         no duplicates *)
+      let const_lambda_list = sort_lambda_list const_lambda_list in
+      let sw =
+        List.map
+          (fun (c, act) ->
+            match c with
+            | Const_string (s, _) -> (s, act)
+            | _ -> assert false)
+          const_lambda_list
+      in
+      let hs, sw, fail = share_actions_tree sw fail in
+      hs (Lstringswitch (arg, sw, fail, loc))
+    | Const_float _ ->
+      make_test_sequence loc fail (Pfloatcomp Cneq) (Pfloatcomp Clt) arg
+        const_lambda_list
+    | Const_int32 _ -> assert false
+    | Const_int64 _ -> assert false
+    | Const_bigint _ ->
+      make_test_sequence loc fail (Pbigintcomp Cneq) (Pbigintcomp Clt) arg
+        const_lambda_list
+  in
+  (lambda1, jumps_union local_jumps total)
+
+let split_cases tag_lambda_list =
+  let rec split_rec = function
+    | [] -> ([], [])
+    | (cstr, act) :: rem -> (
+      let consts, nonconsts = split_rec rem in
+      match cstr with
+      | Cstr_constant n -> ((n, act) :: consts, nonconsts)
+      | Cstr_block n -> (consts, (n, act) :: nonconsts)
+      | Cstr_unboxed -> (consts, (0, act) :: nonconsts)
+      | Cstr_extension _ -> assert false)
+  in
+  let const, nonconst = split_rec tag_lambda_list in
+  (sort_int_lambda_list const, sort_int_lambda_list nonconst)
+
+(* refine [split_cases] and [split_variant_cases] *)
+let split_variant_cases tag_lambda_list =
+  let rec split_rec = function
+    | [] -> ([], [])
+    | ((name, cstr), act) :: rem -> (
+      let consts, nonconsts = split_rec rem in
+      match cstr with
+      | Cstr_constant n -> ((n, (name, act)) :: consts, nonconsts)
+      | Cstr_block n -> (consts, (n, (name, act)) :: nonconsts)
+      | Cstr_unboxed -> assert false
+      | Cstr_extension _ -> assert false)
+  in
+  let const, nonconst = split_rec tag_lambda_list in
+  (sort_int_lambda_list const, sort_int_lambda_list nonconst)
+
+let get_extension_cases tag_lambda_list =
+  let rec split_rec = function
+    | [] -> []
+    | (cstr, act) :: rem -> (
+      let nonconsts = split_rec rem in
+      match cstr with
+      | Cstr_extension path -> (path, act) :: nonconsts
+      | _ -> assert false)
+  in
+  split_rec tag_lambda_list
+
+let combine_constructor sw_names loc arg ex_pat cstr partial ctx def
+    (tag_lambda_list, total1, pats) =
+  if cstr.cstr_consts < 0 then
+    (* Special cases for extensions *)
+    let fail, local_jumps = mk_failaction_neg partial ctx def in
+    let lambda1 =
+      let extension_cases = get_extension_cases tag_lambda_list in
+      let default, extension_cases =
+        match fail with
+        | None -> (
+          match extension_cases with
+          | (_, act) :: rem -> (act, rem)
+          | _ -> assert false)
+        | Some fail -> (fail, extension_cases)
+      in
+      match extension_cases with
+      | [] -> default
+      | _ ->
+        let tag = Ident.create "tag" in
+        let tests =
+          List.fold_right
+            (fun (path, act) rem ->
+              let ext = transl_extension_path ex_pat.pat_env path in
+              Lifthenelse
+                (Lprim (Pextension_slot_eq, [Lvar tag; ext], loc), act, rem))
+            extension_cases default
+        in
+        Llet (Alias, Pgenval, tag, arg, tests)
+    in
+    (lambda1, jumps_union local_jumps total1)
+  else
+    (* Regular concrete type *)
+    let ncases = List.length tag_lambda_list
+    and nconstrs = cstr.cstr_consts + cstr.cstr_nonconsts in
+    let sig_complete = ncases = nconstrs in
+    let fail_opt, fails, local_jumps =
+      if sig_complete then (None, [], jumps_empty)
+      else mk_failaction_pos partial pats ctx def
+    in
+
+    let tag_lambda_list = fails @ tag_lambda_list in
+    let consts, nonconsts = split_cases tag_lambda_list in
+    let lambda1 =
+      match (fail_opt, same_actions tag_lambda_list) with
+      | None, Some act -> act (* Identical actions, no failure *)
+      | _ -> (
+        match (cstr.cstr_consts, cstr.cstr_nonconsts, consts, nonconsts) with
+        | 1, 1, [(0, act1)], [(0, act2)]
+          when cstr.cstr_name = "::" || cstr.cstr_name = "[]"
+               || Datarepr.constructor_has_optional_shape cstr ->
+          (* Typically, match on lists, will avoid isint primitive in that
+             case *)
+          let arg =
+            if Datarepr.constructor_has_optional_shape cstr then
+              Lprim (Pis_not_none, [arg], loc)
+            else
+              Lprim (Pjscomp Cneq, [arg; Lconst (Const_base (Const_int 0))], loc)
+          in
+          Lifthenelse (arg, act2, act1)
+        | 2, 0, [(i1, act1); (_, act2)], []
+          when cstr.cstr_name = "true" || cstr.cstr_name = "false" ->
+          if i1 = 0 then Lifthenelse (arg, act2, act1)
+          else Lifthenelse (arg, act1, act2)
+        | n, 0, _, [] when false (* relies on tag being an int *) ->
+          (* The type defines constant constructors only *)
+          call_switcher loc fail_opt arg 0 (n - 1) consts sw_names
+        | n, _, _, _ -> (
+          let act0 =
+            (* = Some act when all non-const constructors match to act *)
+            match (fail_opt, nonconsts) with
+            | Some a, [] -> Some a
+            | Some _, _ ->
+              if List.length nonconsts = cstr.cstr_nonconsts then
+                same_actions nonconsts
+              else None
+            | None, _ -> same_actions nonconsts
+          in
+          match act0 with
+          | Some act when false (* relies on tag being an int *) ->
+            Lifthenelse
+              ( Lprim (Pisint, [arg], loc),
+                call_switcher loc fail_opt arg 0 (n - 1) consts sw_names,
+                act )
+          (* Emit a switch, as bytecode implements this sophisticated instruction *)
+          | _ ->
+            let sw =
+              {
+                sw_numconsts = cstr.cstr_consts;
+                sw_consts = consts;
+                sw_numblocks = cstr.cstr_nonconsts;
+                sw_blocks = nonconsts;
+                sw_failaction = fail_opt;
+                sw_names;
+              }
+            in
+            let hs, sw = share_actions_sw sw in
+            let sw = reintroduce_fail sw in
+            hs (Lswitch (arg, sw, loc))))
+    in
+    (lambda1, jumps_union local_jumps total1)
+
+let make_test_sequence_variant_constant fail arg int_lambda_list =
+  let _, (cases, actions) =
+    as_interval fail min_int max_int
+      (List.map (fun (a, (_, c)) -> (a, c)) int_lambda_list)
+  in
+  Switcher.test_sequence arg cases actions
+
+let call_switcher_variant_constant loc fail arg int_lambda_list names =
+  call_switcher loc fail arg min_int max_int
+    (List.map (fun (a, (_, c)) -> (a, c)) int_lambda_list)
+    names
+
+let call_switcher_variant_constr loc fail arg int_lambda_list names =
+  let v = Ident.create "variant" in
+  Llet
+    ( Alias,
+      Pgenval,
+      v,
+      Lprim (Pfield (0, Fld_poly_var_tag), [arg], loc),
+      call_switcher loc fail (Lvar v) min_int max_int
+        (List.map (fun (a, (_, c)) -> (a, c)) int_lambda_list)
+        names )
+
+let call_switcher_variant_constant :
+    (Location.t ->
+    Lambda.lambda option ->
+    Lambda.lambda ->
+    (int * (string * Lambda.lambda)) list ->
+    Ast_untagged_variants.switch_names option ->
+    Lambda.lambda)
+    ref =
+  ref call_switcher_variant_constant
+
+let call_switcher_variant_constr :
+    (Location.t ->
+    Lambda.lambda option ->
+    Lambda.lambda ->
+    (int * (string * Lambda.lambda)) list ->
+    Ast_untagged_variants.switch_names option ->
+    Lambda.lambda)
+    ref =
+  ref call_switcher_variant_constr
+
+let make_test_sequence_variant_constant :
+    (Lambda.lambda option ->
+    Lambda.lambda ->
+    (int * (string * Lambda.lambda)) list ->
+    Lambda.lambda)
+    ref =
+  ref make_test_sequence_variant_constant
+
+let combine_variant names loc row arg partial ctx def
+    (tag_lambda_list, total1, _pats) =
+  let row = Btype.row_repr row in
+  let num_constr = ref 0 in
+  if row.row_closed then
+    List.iter
+      (fun (_, f) ->
+        match Btype.row_field_repr f with
+        | Rabsent | Reither (true, _ :: _, _, _) -> ()
+        | _ -> incr num_constr)
+      row.row_fields
+  else num_constr := max_int;
+  let test_int_or_block arg if_int if_block =
+    Lifthenelse (Lprim (Pis_poly_var_block, [arg], loc), if_block, if_int)
+  in
+  let sig_complete = List.length tag_lambda_list = !num_constr
+  and one_action = same_actions tag_lambda_list in
+  (* reduandant work under bs context *)
+  let fail, local_jumps =
+    if
+      sig_complete
+      ||
+      match partial with
+      | Total -> true
+      | _ -> false
+    then (None, jumps_empty)
+    else mk_failaction_neg partial ctx def
+  in
+  let consts, nonconsts = split_variant_cases tag_lambda_list in
+  let lambda1 =
+    match (fail, one_action) with
+    | None, Some act -> act
+    | _, _ -> (
+      match (consts, nonconsts) with
+      | [(_, (_, act1))], [(_, (_, act2))] when fail = None ->
+        test_int_or_block arg act1 act2
+      | _, [] ->
+        (* One can compare integers and pointers *)
+        !make_test_sequence_variant_constant fail arg consts
+      | [], _ -> (
+        let lam = !call_switcher_variant_constr loc fail arg nonconsts names in
+        (* One must not dereference integers *)
+        match fail with
+        | None -> lam
+        | Some fail -> test_int_or_block arg fail lam)
+      | _, _ ->
+        let lam_const =
+          !call_switcher_variant_constant loc fail arg consts names
+        and lam_nonconst =
+          !call_switcher_variant_constr loc fail arg nonconsts names
+        in
+        test_int_or_block arg lam_const lam_nonconst)
+  in
+  (lambda1, jumps_union local_jumps total1)
+
+let combine_array names loc arg partial ctx def (len_lambda_list, total1, _pats)
+    =
+  let fail, local_jumps = mk_failaction_neg partial ctx def in
+  let lambda1 =
+    let newvar = Ident.create "len" in
+    let switch =
+      call_switcher loc fail (Lvar newvar) 0 max_int len_lambda_list names
+    in
+    bind Alias newvar (Lprim (Parraylength, [arg], loc)) switch
+  in
+  (lambda1, jumps_union local_jumps total1)
+
+(* Insertion of debugging events *)
+
+(* let[@inline] event_branch _repr lam = lam *)
+
+(*
+   This exception is raised when the compiler cannot produce code
+   because control cannot reach the compiled clause,
+
+   Unused is raised initially in compile_test.
+
+   compile_list (for compiling switch results) catch Unused
+
+   comp_match_handlers (for compiling splitted matches)
+   may reraise Unused
+
+
+*)
+
+exception Unused
+
+let compile_list compile_fun division =
+  let rec c_rec totals = function
+    | [] -> ([], jumps_unions totals, [])
+    | (key, cell) :: rem -> (
+      match cell.ctx with
+      | [] -> c_rec totals rem
+      | _ -> (
+        try
+          let lambda1, total1 = compile_fun cell.ctx cell.pm in
+          let c_rem, total, new_pats =
+            c_rec (jumps_map ctx_combine total1 :: totals) rem
+          in
+          ((key, lambda1) :: c_rem, total, cell.pat :: new_pats)
+        with Unused -> c_rec totals rem))
+  in
+  c_rec [] division
+
+let compile_orhandlers compile_fun lambda1 total1 ctx to_catch =
+  let rec do_rec r total_r = function
+    | [] -> (r, total_r)
+    | (mat, i, vars, pm) :: rem -> (
+      try
+        let ctx = select_columns mat ctx in
+        let handler_i, total_i = compile_fun ctx pm in
+        match raw_action r with
+        | Lstaticraise (j, args) ->
+          if i = j then
+            ( List.fold_right2 (bind Alias) vars args handler_i,
+              jumps_map (ctx_rshift_num (ncols mat)) total_i )
+          else do_rec r total_r rem
+        | _ ->
+          do_rec
+            (Lstaticcatch (r, (i, vars), handler_i))
+            (jumps_union (jumps_remove i total_r)
+               (jumps_map (ctx_rshift_num (ncols mat)) total_i))
+            rem
+      with Unused ->
+        do_rec (Lstaticcatch (r, (i, vars), lambda_unit)) total_r rem)
+  in
+  do_rec lambda1 total1 to_catch
+
+let compile_test compile_fun partial divide combine ctx to_match =
+  let division = divide ctx to_match in
+  let c_div = compile_list compile_fun division in
+  match c_div with
+  | [], _, _ -> (
+    match mk_failaction_neg partial ctx to_match.default with
+    | None, _ -> raise Unused
+    | Some l, total -> (l, total))
+  | _ -> combine ctx to_match.default c_div
+
+(* Attempt to avoid some useless bindings by lowering them *)
+
+(* Approximation of v present in lam *)
+let rec approx_present v = function
+  | Lconst _ -> false
+  | Lstaticraise (_, args) -> List.exists (fun lam -> approx_present v lam) args
+  | Lprim (_, args, _) -> List.exists (fun lam -> approx_present v lam) args
+  | Llet (Alias, _k, _, l1, l2) -> approx_present v l1 || approx_present v l2
+  | Lvar vv -> Ident.same v vv
+  | _ -> true
+
+let rec lower_bind v arg lam =
+  match lam with
+  | Lifthenelse (cond, ifso, ifnot) -> (
+    let pcond = approx_present v cond
+    and pso = approx_present v ifso
+    and pnot = approx_present v ifnot in
+    match (pcond, pso, pnot) with
+    | false, false, false -> lam
+    | false, true, false -> Lifthenelse (cond, lower_bind v arg ifso, ifnot)
+    | false, false, true -> Lifthenelse (cond, ifso, lower_bind v arg ifnot)
+    | _, _, _ -> bind Alias v arg lam)
+  | Lswitch (ls, ({sw_consts = [(i, act)]; sw_blocks = []} as sw), loc)
+    when not (approx_present v ls) ->
+    Lswitch (ls, {sw with sw_consts = [(i, lower_bind v arg act)]}, loc)
+  | Lswitch (ls, ({sw_consts = []; sw_blocks = [(i, act)]} as sw), loc)
+    when not (approx_present v ls) ->
+    Lswitch (ls, {sw with sw_blocks = [(i, lower_bind v arg act)]}, loc)
+  | Llet (Alias, k, vv, lv, l) ->
+    if approx_present v lv then bind Alias v arg lam
+    else Llet (Alias, k, vv, lv, lower_bind v arg l)
+  | Lvar u when Ident.same u v && Ident.name u = "*sth*" ->
+    arg (* eliminate let *sth* = from_option x in *sth* *)
+  | _ -> bind Alias v arg lam
+
+let bind_check str v arg lam =
+  match (str, arg) with
+  | _, Lvar _ -> bind str v arg lam
+  | Alias, _ -> lower_bind v arg lam
+  | _, _ -> bind str v arg lam
+
+let comp_exit ctx m =
+  match m.default with
+  | (_, i) :: _ -> (Lstaticraise (i, []), jumps_singleton i ctx)
+  | _ -> fatal_error "Matching.comp_exit"
+
+let rec comp_match_handlers comp_fun partial ctx arg first_match next_matchs =
+  match next_matchs with
+  | [] -> comp_fun partial ctx arg first_match
+  | rem -> (
+    let rec c_rec body total_body = function
+      | [] -> (body, total_body)
+      (* Hum, -1 means never taken
+         | (-1,pm)::rem -> c_rec body total_body rem *)
+      | (i, pm) :: rem -> (
+        let ctx_i, total_rem = jumps_extract i total_body in
+        match ctx_i with
+        | [] -> c_rec body total_body rem
+        | _ -> (
+          try
+            let li, total_i =
+              comp_fun
+                (match rem with
+                | [] -> partial
+                | _ -> Partial)
+                ctx_i arg pm
+            in
+            c_rec
+              (Lstaticcatch (body, (i, []), li))
+              (jumps_union total_i total_rem)
+              rem
+          with Unused ->
+            c_rec (Lstaticcatch (body, (i, []), lambda_unit)) total_rem rem))
+    in
+    try
+      let first_lam, total = comp_fun Partial ctx arg first_match in
+      c_rec first_lam total rem
+    with Unused -> (
+      match next_matchs with
+      | [] -> raise Unused
+      | (_, x) :: xs -> comp_match_handlers comp_fun partial ctx arg x xs))
+
+(* To find reasonable names for variables *)
+
+let rec name_pattern default = function
+  | (pat :: _, _) :: rem -> (
+    match Typecore.id_of_pattern pat with
+    | Some id -> id
+    | None -> name_pattern default rem)
+  | _ -> Ident.create default
+
+let arg_to_var arg cls =
+  match arg with
+  | Lvar v -> (v, arg)
+  | _ ->
+    let v = name_pattern "match" cls in
+    (v, Lvar v)
+
+(* To be set by Lam_compile *)
+let names_from_construct_pattern :
+    (pattern -> Ast_untagged_variants.switch_names option) ref =
+  ref (fun _ -> None)
+
+(*
+  The main compilation function.
+   Input:
+      repr=used for inserting debug events
+      partial=exhaustiveness information from Parmatch
+      ctx=a context
+      m=a pattern matching
+
+   Output: a lambda term, a jump summary {..., exit number -> context, .. }
+*)
+
+let rec compile_match repr partial ctx m =
+  match m with
+  | {cases = []; args = []} -> comp_exit ctx m
+  | {cases = ([], action) :: rem} ->
+    if is_guarded action then
+      let lambda, total = compile_match None partial ctx {m with cases = rem} in
+      (patch_guarded lambda action, total)
+    else (action, jumps_empty)
+  | {args = (arg, str) :: argl} ->
+    let v, newarg = arg_to_var arg m.cases in
+    let first_match, rem =
+      split_precompile (Some v) {m with args = (newarg, Alias) :: argl}
+    in
+    let lam, total =
+      comp_match_handlers
+        ((if dbg then do_compile_matching_pr else do_compile_matching) repr)
+        partial ctx newarg first_match rem
+    in
+    (bind_check str v arg lam, total)
+  | _ -> assert false
+
+(* verbose version of do_compile_matching, for debug *)
+
+and do_compile_matching_pr repr partial ctx arg x =
+  prerr_string "COMPILE: ";
+  prerr_endline
+    (match partial with
+    | Partial -> "Partial"
+    | Total -> "Total");
+  prerr_endline "MATCH";
+  pretty_precompiled x;
+  prerr_endline "CTX";
+  pretty_ctx ctx;
+  let ((_, jumps) as r) = do_compile_matching repr partial ctx arg x in
+  prerr_endline "JUMPS";
+  pretty_jumps jumps;
+  r
+
+and do_compile_matching repr partial ctx arg pmh =
+  match pmh with
+  | Pm pm -> (
+    let pat = what_is_cases pm.cases in
+    match pat.pat_desc with
+    | Tpat_any -> compile_no_test divide_var ctx_rshift repr partial ctx pm
+    | Tpat_tuple patl ->
+      compile_no_test
+        (divide_tuple (List.length patl) (normalize_pat pat))
+        ctx_combine repr partial ctx pm
+    | Tpat_record ((_, lbl, _, _) :: _, _) ->
+      compile_no_test
+        (divide_record lbl.lbl_all (normalize_pat pat))
+        ctx_combine repr partial ctx pm
+    | Tpat_constant cst ->
+      let names = None in
+      compile_test
+        (compile_match repr partial)
+        partial divide_constant
+        (combine_constant names pat.pat_loc arg cst partial)
+        ctx pm
+    | Tpat_construct (_, cstr, _) ->
+      let sw_names = !names_from_construct_pattern pat in
+      compile_test
+        (compile_match repr partial)
+        partial divide_constructor
+        (combine_constructor sw_names pat.pat_loc arg pat cstr partial)
+        ctx pm
+    | Tpat_array _ ->
+      let names = None in
+      compile_test
+        (compile_match repr partial)
+        partial divide_array
+        (combine_array names pat.pat_loc arg partial)
+        ctx pm
+    | Tpat_variant (_, _, row) ->
+      let names = None in
+      compile_test
+        (compile_match repr partial)
+        partial (divide_variant !row)
+        (combine_variant names pat.pat_loc !row arg partial)
+        ctx pm
+    | _ -> assert false)
+  | PmVar {inside = pmh; var_arg = arg} ->
+    let lam, total =
+      do_compile_matching repr partial (ctx_lshift ctx) arg pmh
+    in
+    (lam, jumps_map ctx_rshift total)
+  | PmOr {body; handlers} ->
+    let lam, total = compile_match repr partial ctx body in
+    compile_orhandlers (compile_match repr partial) lam total ctx handlers
+
+and compile_no_test divide up_ctx repr partial ctx to_match =
+  let {pm = this_match; ctx = this_ctx} = divide ctx to_match in
+  let lambda, total = compile_match repr partial this_ctx this_match in
+  (lambda, jumps_map up_ctx total)
+
+(* The entry points *)
+
+(*
+   If there is a guard in a matching or a lazy pattern,
+   then set exhaustiveness info to Partial.
+   (because of side effects, assume the worst).
+
+   Notice that exhaustiveness information is trusted by the compiler,
+   that is, a match flagged as Total should not fail at runtime.
+   More specifically, for instance if match y with x::_ -> x is flagged
+   total (as it happens during JoCaml compilation) then y cannot be []
+   at runtime. As a consequence, the static Total exhaustiveness information
+   have to be downgraded to Partial, in the dubious cases where guards
+   or lazy pattern execute arbitrary code that may perform side effects
+   and change the subject values.
+LM:
+   Lazy pattern was PR#5992, initial patch by lpw25.
+   I have  generalized the patch, so as to also find mutable fields.
+*)
+
+let find_in_pat pred =
+  let rec find_rec p =
+    pred p.pat_desc
+    ||
+    match p.pat_desc with
+    | Tpat_alias (p, _, _) | Tpat_variant (_, Some p, _) -> find_rec p
+    | Tpat_tuple ps | Tpat_construct (_, _, ps) | Tpat_array ps ->
+      List.exists find_rec ps
+    | Tpat_record (lpats, _) ->
+      List.exists (fun (_, _, p, _) -> find_rec p) lpats
+    | Tpat_or (p, q, _) -> find_rec p || find_rec q
+    | Tpat_constant _ | Tpat_var _ | Tpat_any | Tpat_variant (_, None, _) ->
+      false
+  in
+  find_rec
+
+let have_mutable_field p =
+  match p with
+  | Tpat_record (lps, _) ->
+    List.exists
+      (fun (_, lbl, _, _) ->
+        match lbl.Types.lbl_mut with
+        | Mutable -> true
+        | Immutable -> false)
+      lps
+  | Tpat_alias _ | Tpat_variant _ | Tpat_tuple _ | Tpat_construct _
+  | Tpat_array _ | Tpat_or _ | Tpat_constant _ | Tpat_var _ | Tpat_any ->
+    false
+
+let is_mutable p = find_in_pat have_mutable_field p
+
+(* Downgrade Total when
+   1. Matching accesses some mutable fields;
+   2. And there are  guards or lazy patterns.
+*)
+
+let check_partial is_mutable pat_act_list = function
+  | Partial -> Partial
+  | Total ->
+    if
+      pat_act_list = []
+      ||
+      (* allow empty case list *)
+      List.exists
+        (fun (pats, lam) -> is_mutable pats && is_guarded lam)
+        pat_act_list
+    then Partial
+    else Total
+
+let check_partial_list = check_partial (List.exists is_mutable)
+let check_partial = check_partial is_mutable
+
+(* have toplevel handler when appropriate *)
+
+let start_ctx n = [{left = []; right = omegas n}]
+
+let check_total total lambda i handler_fun =
+  if jumps_is_empty total then lambda
+  else Lstaticcatch (lambda, (i, []), handler_fun ())
+
+let compile_matching repr handler_fun arg pat_act_list partial =
+  let partial = check_partial pat_act_list partial in
+  match partial with
+  | Partial -> (
+    let raise_num = next_raise_count () in
+    let pm =
+      {
+        cases = List.map (fun (pat, act) -> ([pat], act)) pat_act_list;
+        args = [(arg, Strict)];
+        default = [([[omega]], raise_num)];
+      }
+    in
+    try
+      let lambda, total = compile_match repr partial (start_ctx 1) pm in
+      check_total total lambda raise_num handler_fun
+    with Unused -> assert false (* ; handler_fun() *))
+  | Total ->
+    let pm =
+      {
+        cases = List.map (fun (pat, act) -> ([pat], act)) pat_act_list;
+        args = [(arg, Strict)];
+        default = [];
+      }
+    in
+    let lambda, total = compile_match repr partial (start_ctx 1) pm in
+    assert (jumps_is_empty total);
+    lambda
+
+let partial_function loc () =
+  (* [Location.get_pos_info] is too expensive *)
+  let fname, line, char = Location.get_pos_info loc.Location.loc_start in
+  let fname = Filename.basename fname in
+  Lprim
+    ( Praise Raise_regular,
+      [
+        Lprim
+          ( Pmakeblock Blk_extension,
+            [
+              transl_normal_path Predef.path_match_failure;
+              Lconst
+                (Const_block
+                   ( Blk_tuple,
+                     [
+                       Const_base (Const_string (fname, None));
+                       Const_base (Const_int line);
+                       Const_base (Const_int char);
+                     ] ));
+            ],
+            loc );
+      ],
+      loc )
+
+let for_function loc repr param pat_act_list partial =
+  compile_matching repr (partial_function loc) param pat_act_list partial
+
+(* In the following two cases, exhaustiveness info is not available! *)
+let for_trywith param pat_act_list =
+  compile_matching None
+    (fun () -> Lprim (Praise Raise_reraise, [param], Location.none))
+    param pat_act_list Partial
+
+let simple_for_let loc param pat body =
+  compile_matching None (partial_function loc) param [(pat, body)] Partial
+
+(* Optimize binding of immediate tuples
+
+   The goal of the implementation of 'for_let' below, which replaces
+   'simple_for_let', is to avoid tuple allocation in cases such as
+   this one:
+
+     let (x,y) =
+        let foo = ... in
+        if foo then (1, 2) else (3,4)
+     in bar
+
+   The compiler easily optimizes the simple `let (x,y) = (1,2) in ...`
+   case (call to Matching.for_multiple_match from Translcore), but
+   didn't optimize situations where the rhs tuples are hidden under
+   a more complex context.
+
+   The idea comes from Alain Frisch who suggested and implemented
+   the following compilation method, based on Lassign:
+
+     let x = dummy in let y = dummy in
+     begin
+      let foo = ... in
+      if foo then
+        (let x1 = 1 in let y1 = 2 in x <- x1; y <- y1)
+      else
+        (let x2 = 3 in let y2 = 4 in x <- x2; y <- y2)
+     end;
+     bar
+
+   The current implementation from Gabriel Scherer uses Lstaticcatch /
+   Lstaticraise instead:
+
+     catch
+       let foo = ... in
+       if foo then
+         (let x1 = 1 in let y1 = 2 in exit x1 y1)
+       else
+        (let x2 = 3 in let y2 = 4 in exit x2 y2)
+     with x y ->
+       bar
+
+   The catch/exit is used to avoid duplication of the let body ('bar'
+   in the example), on 'if' branches for example; it is useless for
+   linear contexts such as 'let', but we don't need to be careful to
+   generate nice code because Simplif will remove such useless
+   catch/exit.
+*)
+
+let for_let loc param pat body =
+  match pat.pat_desc with
+  | Tpat_any ->
+    (* This eliminates a useless variable (and stack slot in bytecode)
+       for "let _ = ...". See #6865. *)
+    Lsequence (param, body)
+  | Tpat_var (id, _) ->
+    (* fast path, and keep track of simple bindings to unboxable numbers *)
+    Llet (Strict, Pgenval, id, param, body)
+  | _ -> simple_for_let loc param pat body
+
+(* Handling of tupled functions and matchings *)
+
+(* Easy case since variables are available *)
+let for_tupled_function loc paraml pats_act_list partial =
+  let partial = check_partial_list pats_act_list partial in
+  let raise_num = next_raise_count () in
+  let omegas = [List.map (fun _ -> omega) paraml] in
+  let pm =
+    {
+      cases = pats_act_list;
+      args = List.map (fun id -> (Lvar id, Strict)) paraml;
+      default = [(omegas, raise_num)];
+    }
+  in
+  try
+    let lambda, total =
+      compile_match None partial (start_ctx (List.length paraml)) pm
+    in
+    check_total total lambda raise_num (partial_function loc)
+  with Unused -> partial_function loc ()
+
+let flatten_pattern size p =
+  match p.pat_desc with
+  | Tpat_tuple args -> args
+  | Tpat_any -> omegas size
+  | _ -> raise Cannot_flatten
+
+let rec flatten_pat_line size p k =
+  match p.pat_desc with
+  | Tpat_any -> omegas size :: k
+  | Tpat_tuple args -> args :: k
+  | Tpat_or (p1, p2, _) -> flatten_pat_line size p1 (flatten_pat_line size p2 k)
+  | Tpat_alias (p, _, _) ->
+    (* Note: if this 'as' pat is here, then this is a
+       useless binding, solves PR#3780 *)
+    flatten_pat_line size p k
+  | _ -> fatal_error "Matching.flatten_pat_line"
+
+let flatten_cases size cases =
+  List.map
+    (fun (ps, action) ->
+      match ps with
+      | [p] -> (flatten_pattern size p, action)
+      | _ -> fatal_error "Matching.flatten_case")
+    cases
+
+let flatten_matrix size pss =
+  List.fold_right
+    (fun ps r ->
+      match ps with
+      | [p] -> flatten_pat_line size p r
+      | _ -> fatal_error "Matching.flatten_matrix")
+    pss []
+
+let flatten_def size def =
+  List.map (fun (pss, i) -> (flatten_matrix size pss, i)) def
+
+let flatten_pm size args pm =
+  {
+    args;
+    cases = flatten_cases size pm.cases;
+    default = flatten_def size pm.default;
+  }
+
+let flatten_precompiled size args pmh =
+  match pmh with
+  | Pm pm -> Pm (flatten_pm size args pm)
+  | PmOr {body = b; handlers = hs; or_matrix = m} ->
+    PmOr
+      {
+        body = flatten_pm size args b;
+        handlers =
+          List.map
+            (fun (mat, i, vars, pm) -> (flatten_matrix size mat, i, vars, pm))
+            hs;
+        or_matrix = flatten_matrix size m;
+      }
+  | PmVar _ -> assert false
+
+(*
+   compiled_flattened is a ``comp_fun'' argument to comp_match_handlers.
+   Hence it needs a fourth argument, which it ignores
+*)
+
+let compile_flattened repr partial ctx _ pmh =
+  match pmh with
+  | Pm pm -> compile_match repr partial ctx pm
+  | PmOr {body = b; handlers = hs} ->
+    let lam, total = compile_match repr partial ctx b in
+    compile_orhandlers (compile_match repr partial) lam total ctx hs
+  | PmVar _ -> assert false
+
+let do_for_multiple_match loc paraml pat_act_list partial =
+  let repr = None in
+  let partial = check_partial pat_act_list partial in
+  let raise_num, pm1 =
+    match partial with
+    | Partial ->
+      let raise_num = next_raise_count () in
+      ( raise_num,
+        {
+          cases = List.map (fun (pat, act) -> ([pat], act)) pat_act_list;
+          args = [(Lprim (Pmakeblock Blk_tuple, paraml, loc), Strict)];
+          default = [([[omega]], raise_num)];
+        } )
+    | _ ->
+      ( -1,
+        {
+          cases = List.map (fun (pat, act) -> ([pat], act)) pat_act_list;
+          args = [(Lprim (Pmakeblock Blk_tuple, paraml, loc), Strict)];
+          default = [];
+        } )
+  in
+
+  try
+    try
+      (* Once for checking that compilation is possible *)
+      let next, nexts = split_precompile None pm1 in
+
+      let size = List.length paraml
+      and idl = List.map (fun _ -> Ident.create "match") paraml in
+      let args = List.map (fun id -> (Lvar id, Alias)) idl in
+
+      let flat_next = flatten_precompiled size args next
+      and flat_nexts =
+        List.map (fun (e, pm) -> (e, flatten_precompiled size args pm)) nexts
+      in
+
+      let lam, total =
+        comp_match_handlers (compile_flattened repr) partial (start_ctx size) ()
+          flat_next flat_nexts
+      in
+      List.fold_right2 (bind Strict) idl paraml
+        (match partial with
+        | Partial -> check_total total lam raise_num (partial_function loc)
+        | Total ->
+          assert (jumps_is_empty total);
+          lam)
+    with Cannot_flatten -> (
+      let lambda, total = compile_match None partial (start_ctx 1) pm1 in
+      match partial with
+      | Partial -> check_total total lambda raise_num (partial_function loc)
+      | Total ->
+        assert (jumps_is_empty total);
+        lambda)
+  with Unused -> assert false (* ; partial_function loc () *)
+
+(* PR#4828: Believe it or not, the 'paraml' argument below
+   may not be side effect free. *)
+
+let param_to_var param =
+  match param with
+  | Lvar v -> (v, None)
+  | _ -> (Ident.create "match", Some param)
+
+let bind_opt (v, eo) k =
+  match eo with
+  | None -> k
+  | Some e -> Lambda.bind Strict v e k
+
+let for_multiple_match loc paraml pat_act_list partial =
+  let v_paraml = List.map param_to_var paraml in
+  let paraml = List.map (fun (v, _) -> Lvar v) v_paraml in
+  List.fold_right bind_opt v_paraml
+    (do_for_multiple_match loc paraml pat_act_list partial)
diff --git a/compiler/ml/matching.mli b/compiler/ml/matching.mli
new file mode 100644
index 0000000..43d1d2c
--- /dev/null
+++ b/compiler/ml/matching.mli
@@ -0,0 +1,76 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Compilation of pattern-matching *)
+
+open Typedtree
+open Lambda
+
+val call_switcher_variant_constant :
+  (Location.t ->
+  Lambda.lambda option ->
+  Lambda.lambda ->
+  (int * (string * Lambda.lambda)) list ->
+  Ast_untagged_variants.switch_names option ->
+  Lambda.lambda)
+  ref
+
+val call_switcher_variant_constr :
+  (Location.t ->
+  Lambda.lambda option ->
+  Lambda.lambda ->
+  (int * (string * Lambda.lambda)) list ->
+  Ast_untagged_variants.switch_names option ->
+  Lambda.lambda)
+  ref
+
+val make_test_sequence_variant_constant :
+  (Lambda.lambda option ->
+  Lambda.lambda ->
+  (int * (string * Lambda.lambda)) list ->
+  Lambda.lambda)
+  ref
+
+(* Entry points to match compiler *)
+val for_function :
+  Location.t ->
+  int ref option ->
+  lambda ->
+  (pattern * lambda) list ->
+  partial ->
+  lambda
+val for_trywith : lambda -> (pattern * lambda) list -> lambda
+val for_let : Location.t -> lambda -> pattern -> lambda -> lambda
+val for_multiple_match :
+  Location.t -> lambda list -> (pattern * lambda) list -> partial -> lambda
+
+val for_tupled_function :
+  Location.t ->
+  Ident.t list ->
+  (pattern list * lambda) list ->
+  partial ->
+  lambda
+
+exception Cannot_flatten
+
+val flatten_pattern : int -> pattern -> pattern list
+
+(* Expand stringswitch to  string test tree *)
+val expand_stringswitch :
+  Location.t -> lambda -> (string * lambda) list -> lambda option -> lambda
+
+(* To be set by Lam_compile *)
+val names_from_construct_pattern :
+  (pattern -> Ast_untagged_variants.switch_names option) ref
diff --git a/compiler/ml/mtype.ml b/compiler/ml/mtype.ml
new file mode 100644
index 0000000..449d89a
--- /dev/null
+++ b/compiler/ml/mtype.ml
@@ -0,0 +1,410 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Operations on module types *)
+
+open Asttypes
+open Path
+open Types
+
+let rec scrape env mty =
+  match mty with
+  | Mty_ident p -> (
+    try scrape env (Env.find_modtype_expansion p env) with Not_found -> mty)
+  | _ -> mty
+
+let freshen mty = Subst.modtype Subst.identity mty
+
+let rec strengthen ~aliasable env mty p =
+  match scrape env mty with
+  | Mty_signature sg -> Mty_signature (strengthen_sig ~aliasable env sg p 0)
+  | Mty_functor (param, arg, res)
+    when !Clflags.applicative_functors && Ident.name param <> "*" ->
+    Mty_functor
+      ( param,
+        arg,
+        strengthen ~aliasable:false env res (Papply (p, Pident param)) )
+  | mty -> mty
+
+and strengthen_sig ~aliasable env sg p pos =
+  match sg with
+  | [] -> []
+  | (Sig_value (_, desc) as sigelt) :: rem ->
+    let nextpos =
+      match desc.val_kind with
+      | Val_prim _ -> pos
+      | _ -> pos + 1
+    in
+    sigelt :: strengthen_sig ~aliasable env rem p nextpos
+  | Sig_type (id, {type_kind = Type_abstract}, _)
+    :: (Sig_type (id', {type_private = Private}, _) :: _ as rem)
+    when Ident.name id = Ident.name id' ^ "#row" ->
+    strengthen_sig ~aliasable env rem p pos
+  | Sig_type (id, decl, rs) :: rem ->
+    let newdecl =
+      match (decl.type_manifest, decl.type_private, decl.type_kind) with
+      | Some _, Public, _ -> decl
+      | Some _, Private, (Type_record _ | Type_variant _) -> decl
+      | _ ->
+        let manif =
+          Some
+            (Btype.newgenty
+               (Tconstr
+                  (Pdot (p, Ident.name id, nopos), decl.type_params, ref Mnil)))
+        in
+        if decl.type_kind = Type_abstract then
+          {decl with type_private = Public; type_manifest = manif}
+        else {decl with type_manifest = manif}
+    in
+    Sig_type (id, newdecl, rs) :: strengthen_sig ~aliasable env rem p pos
+  | (Sig_typext _ as sigelt) :: rem ->
+    sigelt :: strengthen_sig ~aliasable env rem p (pos + 1)
+  | Sig_module (id, md, rs) :: rem ->
+    let str =
+      strengthen_decl ~aliasable env md (Pdot (p, Ident.name id, pos))
+    in
+    Sig_module (id, str, rs)
+    :: strengthen_sig ~aliasable
+         (Env.add_module_declaration ~check:false id md env)
+         rem p (pos + 1)
+    (* Need to add the module in case it defines manifest module types *)
+  | Sig_modtype (id, decl) :: rem ->
+    let newdecl =
+      match decl.mtd_type with
+      | None ->
+        {decl with mtd_type = Some (Mty_ident (Pdot (p, Ident.name id, nopos)))}
+      | Some _ -> decl
+    in
+    Sig_modtype (id, newdecl)
+    :: strengthen_sig ~aliasable (Env.add_modtype id decl env) rem p pos
+    (* Need to add the module type in case it is manifest *)
+  | (Sig_class _ as sigelt) :: rem ->
+    sigelt :: strengthen_sig ~aliasable env rem p (pos + 1)
+  | (Sig_class_type _ as sigelt) :: rem ->
+    sigelt :: strengthen_sig ~aliasable env rem p pos
+
+and strengthen_decl ~aliasable env md p =
+  match md.md_type with
+  | Mty_alias _ -> md
+  | _ when aliasable -> {md with md_type = Mty_alias (Mta_present, p)}
+  | mty -> {md with md_type = strengthen ~aliasable env mty p}
+
+let () = Env.strengthen := strengthen
+
+(* In nondep_supertype, env is only used for the type it assigns to id.
+   Hence there is no need to keep env up-to-date by adding the bindings
+   traversed. *)
+
+type variance = Co | Contra | Strict
+
+let nondep_supertype env mid mty =
+  let rec nondep_mty env va mty =
+    match mty with
+    | Mty_ident p ->
+      if Path.isfree mid p then
+        nondep_mty env va (Env.find_modtype_expansion p env)
+      else mty
+    | Mty_alias (_, p) ->
+      if Path.isfree mid p then
+        nondep_mty env va (Env.find_module p env).md_type
+      else mty
+    | Mty_signature sg -> Mty_signature (nondep_sig env va sg)
+    | Mty_functor (param, arg, res) ->
+      let var_inv =
+        match va with
+        | Co -> Contra
+        | Contra -> Co
+        | Strict -> Strict
+      in
+      Mty_functor
+        ( param,
+          Misc.may_map (nondep_mty env var_inv) arg,
+          nondep_mty
+            (Env.add_module ~arg:true param (Btype.default_mty arg) env)
+            va res )
+  and nondep_sig env va = function
+    | [] -> []
+    | item :: rem -> (
+      let rem' = nondep_sig env va rem in
+      match item with
+      | Sig_value (id, d) ->
+        Sig_value (id, {d with val_type = Ctype.nondep_type env mid d.val_type})
+        :: rem'
+      | Sig_type (id, d, rs) ->
+        Sig_type (id, Ctype.nondep_type_decl env mid id (va = Co) d, rs) :: rem'
+      | Sig_typext (id, ext, es) ->
+        Sig_typext (id, Ctype.nondep_extension_constructor env mid ext, es)
+        :: rem'
+      | Sig_module (id, md, rs) ->
+        Sig_module (id, {md with md_type = nondep_mty env va md.md_type}, rs)
+        :: rem'
+      | Sig_modtype (id, d) -> (
+        try Sig_modtype (id, nondep_modtype_decl env d) :: rem'
+        with Not_found -> (
+          match va with
+          | Co ->
+            Sig_modtype
+              ( id,
+                {mtd_type = None; mtd_loc = Location.none; mtd_attributes = []}
+              )
+            :: rem'
+          | _ -> raise Not_found))
+      | Sig_class () -> assert false
+      | Sig_class_type () -> assert false)
+  and nondep_modtype_decl env mtd =
+    {mtd with mtd_type = Misc.may_map (nondep_mty env Strict) mtd.mtd_type}
+  in
+
+  nondep_mty env Co mty
+
+let enrich_typedecl env p decl =
+  match decl.type_manifest with
+  | Some _ -> decl
+  | None -> (
+    try
+      let orig_decl = Env.find_type p env in
+      if orig_decl.type_arity <> decl.type_arity then decl
+      else
+        {
+          decl with
+          type_manifest =
+            Some (Btype.newgenty (Tconstr (p, decl.type_params, ref Mnil)));
+        }
+    with Not_found -> decl)
+
+let rec enrich_modtype env p mty =
+  match mty with
+  | Mty_signature sg -> Mty_signature (List.map (enrich_item env p) sg)
+  | _ -> mty
+
+and enrich_item env p = function
+  | Sig_type (id, decl, rs) ->
+    Sig_type (id, enrich_typedecl env (Pdot (p, Ident.name id, nopos)) decl, rs)
+  | Sig_module (id, md, rs) ->
+    Sig_module
+      ( id,
+        {
+          md with
+          md_type =
+            enrich_modtype env (Pdot (p, Ident.name id, nopos)) md.md_type;
+        },
+        rs )
+  | item -> item
+
+let rec type_paths env p mty =
+  match scrape env mty with
+  | Mty_ident _ -> []
+  | Mty_alias _ -> []
+  | Mty_signature sg -> type_paths_sig env p 0 sg
+  | Mty_functor _ -> []
+
+and type_paths_sig env p pos sg =
+  match sg with
+  | [] -> []
+  | Sig_value (_id, decl) :: rem ->
+    let pos' =
+      match decl.val_kind with
+      | Val_prim _ -> pos
+      | _ -> pos + 1
+    in
+    type_paths_sig env p pos' rem
+  | Sig_type (id, _decl, _) :: rem ->
+    Pdot (p, Ident.name id, nopos) :: type_paths_sig env p pos rem
+  | Sig_module (id, md, _) :: rem ->
+    type_paths env (Pdot (p, Ident.name id, pos)) md.md_type
+    @ type_paths_sig
+        (Env.add_module_declaration ~check:false id md env)
+        p (pos + 1) rem
+  | Sig_modtype (id, decl) :: rem ->
+    type_paths_sig (Env.add_modtype id decl env) p pos rem
+  | (Sig_typext _ | Sig_class _) :: rem -> type_paths_sig env p (pos + 1) rem
+  | Sig_class_type _ :: rem -> type_paths_sig env p pos rem
+
+let rec no_code_needed env mty =
+  match scrape env mty with
+  | Mty_ident _ -> false
+  | Mty_signature sg -> no_code_needed_sig env sg
+  | Mty_functor (_, _, _) -> false
+  | Mty_alias (Mta_absent, _) -> true
+  | Mty_alias (Mta_present, _) -> false
+
+and no_code_needed_sig env sg =
+  match sg with
+  | [] -> true
+  | Sig_value (_id, decl) :: rem -> (
+    match decl.val_kind with
+    | Val_prim _ -> no_code_needed_sig env rem
+    | _ -> false)
+  | Sig_module (id, md, _) :: rem ->
+    no_code_needed env md.md_type
+    && no_code_needed_sig
+         (Env.add_module_declaration ~check:false id md env)
+         rem
+  | (Sig_type _ | Sig_modtype _ | Sig_class_type _) :: rem ->
+    no_code_needed_sig env rem
+  | (Sig_typext _ | Sig_class _) :: _ -> false
+
+(* Check whether a module type may return types *)
+
+let rec contains_type env = function
+  | Mty_ident path -> (
+    try
+      match (Env.find_modtype path env).mtd_type with
+      | None -> raise Exit (* PR#6427 *)
+      | Some mty -> contains_type env mty
+    with Not_found -> raise Exit)
+  | Mty_signature sg -> contains_type_sig env sg
+  | Mty_functor (_, _, body) -> contains_type env body
+  | Mty_alias _ -> ()
+
+and contains_type_sig env = List.iter (contains_type_item env)
+
+and contains_type_item env = function
+  | Sig_type
+      ( _,
+        ( {type_manifest = None}
+        | {type_kind = Type_abstract; type_private = Private} ),
+        _ )
+  | Sig_modtype _
+  | Sig_typext (_, {ext_args = Cstr_record _}, _) ->
+    (* We consider that extension constructors with an inlined
+       record create a type (the inlined record), even though
+       it would be technically safe to ignore that considering
+       the current constraints which guarantee that this type
+       is kept local to expressions. *)
+    raise Exit
+  | Sig_module (_, {md_type = mty}, _) -> contains_type env mty
+  | Sig_value _ | Sig_type _ | Sig_typext _ | Sig_class _ | Sig_class_type _ ->
+    ()
+
+let contains_type env mty =
+  try
+    contains_type env mty;
+    false
+  with Exit -> true
+
+(* Remove module aliases from a signature *)
+
+module PathSet = Set.Make (Path)
+module PathMap = Map.Make (Path)
+module IdentSet = Set.Make (Ident)
+
+let rec get_prefixes = function
+  | Pident _ -> PathSet.empty
+  | Pdot (p, _, _) | Papply (p, _) -> PathSet.add p (get_prefixes p)
+
+let rec get_arg_paths = function
+  | Pident _ -> PathSet.empty
+  | Pdot (p, _, _) -> get_arg_paths p
+  | Papply (p1, p2) ->
+    PathSet.add p2
+      (PathSet.union (get_prefixes p2)
+         (PathSet.union (get_arg_paths p1) (get_arg_paths p2)))
+
+let rec rollback_path subst p =
+  try Pident (PathMap.find p subst)
+  with Not_found -> (
+    match p with
+    | Pident _ | Papply _ -> p
+    | Pdot (p1, s, n) ->
+      let p1' = rollback_path subst p1 in
+      if Path.same p1 p1' then p else rollback_path subst (Pdot (p1', s, n)))
+
+let rec collect_ids subst bindings p =
+  match rollback_path subst p with
+  | Pident id ->
+    let ids =
+      try collect_ids subst bindings (Ident.find_same id bindings)
+      with Not_found -> IdentSet.empty
+    in
+    IdentSet.add id ids
+  | _ -> IdentSet.empty
+
+let collect_arg_paths mty =
+  let open Btype in
+  let paths = ref PathSet.empty
+  and subst = ref PathMap.empty
+  and bindings = ref Ident.empty in
+  (* let rt = Ident.create "Root" in
+     and prefix = ref (Path.Pident rt) in *)
+  let it_path p = paths := PathSet.union (get_arg_paths p) !paths
+  and it_signature_item it si =
+    type_iterators.it_signature_item it si;
+    match si with
+    | Sig_module (id, {md_type = Mty_alias (_, p)}, _) ->
+      bindings := Ident.add id p !bindings
+    | Sig_module (id, {md_type = Mty_signature sg}, _) ->
+      List.iter
+        (function
+          | Sig_module (id', _, _) ->
+            subst :=
+              PathMap.add (Pdot (Pident id, Ident.name id', -1)) id' !subst
+          | _ -> ())
+        sg
+    | _ -> ()
+  in
+  let it = {type_iterators with it_path; it_signature_item} in
+  it.it_module_type it mty;
+  it.it_module_type unmark_iterators mty;
+  PathSet.fold
+    (fun p -> IdentSet.union (collect_ids !subst !bindings p))
+    !paths IdentSet.empty
+
+let rec remove_aliases env excl mty =
+  match mty with
+  | Mty_signature sg -> Mty_signature (remove_aliases_sig env excl sg)
+  | Mty_alias _ ->
+    let mty' = Env.scrape_alias env mty in
+    if mty' = mty then mty
+    else (* nested polymorphic comparison *)
+      remove_aliases env excl mty'
+  | mty -> mty
+
+and remove_aliases_sig env excl sg =
+  match sg with
+  | [] -> []
+  | Sig_module (id, md, rs) :: rem ->
+    let mty =
+      match md.md_type with
+      | Mty_alias _ when IdentSet.mem id excl -> md.md_type
+      | mty -> remove_aliases env excl mty
+    in
+    Sig_module (id, {md with md_type = mty}, rs)
+    :: remove_aliases_sig (Env.add_module id mty env) excl rem
+  | Sig_modtype (id, mtd) :: rem ->
+    Sig_modtype (id, mtd)
+    :: remove_aliases_sig (Env.add_modtype id mtd env) excl rem
+  | it :: rem -> it :: remove_aliases_sig env excl rem
+
+let remove_aliases env sg =
+  let excl = collect_arg_paths sg in
+  (* PathSet.iter (fun p -> Format.eprintf "%a@ " Printtyp.path p) excl;
+     Format.eprintf "@."; *)
+  remove_aliases env excl sg
+
+(* Lower non-generalizable type variables *)
+
+let lower_nongen nglev mty =
+  let open Btype in
+  let it_type_expr it ty =
+    let ty = repr ty in
+    match ty with
+    | {desc = Tvar _; level} ->
+      if level < generic_level && level > nglev then set_level ty nglev
+    | _ -> type_iterators.it_type_expr it ty
+  in
+  let it = {type_iterators with it_type_expr} in
+  it.it_module_type it mty;
+  it.it_module_type unmark_iterators mty
diff --git a/compiler/ml/mtype.mli b/compiler/ml/mtype.mli
new file mode 100644
index 0000000..64198df
--- /dev/null
+++ b/compiler/ml/mtype.mli
@@ -0,0 +1,50 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Operations on module types *)
+
+open Types
+
+val scrape : Env.t -> module_type -> module_type
+(* Expand toplevel module type abbreviations
+   till hitting a "hard" module type (signature, functor,
+   or abstract module type ident. *)
+
+val freshen : module_type -> module_type
+(* Return an alpha-equivalent copy of the given module type
+   where bound identifiers are fresh. *)
+
+val strengthen : aliasable:bool -> Env.t -> module_type -> Path.t -> module_type
+(* Strengthen abstract type components relative to the
+   given path. *)
+
+val strengthen_decl :
+  aliasable:bool -> Env.t -> module_declaration -> Path.t -> module_declaration
+val nondep_supertype : Env.t -> Ident.t -> module_type -> module_type
+(* Return the smallest supertype of the given type
+   in which the given ident does not appear.
+   Raise [Not_found] if no such type exists. *)
+
+val no_code_needed : Env.t -> module_type -> bool
+val no_code_needed_sig : Env.t -> signature -> bool
+(* Determine whether a module needs no implementation code,
+   i.e. consists only of type definitions. *)
+
+val enrich_modtype : Env.t -> Path.t -> module_type -> module_type
+val enrich_typedecl : Env.t -> Path.t -> type_declaration -> type_declaration
+val type_paths : Env.t -> Path.t -> module_type -> Path.t list
+val contains_type : Env.t -> module_type -> bool
+val remove_aliases : Env.t -> module_type -> module_type
+val lower_nongen : int -> module_type -> unit
diff --git a/compiler/ml/oprint.ml b/compiler/ml/oprint.ml
new file mode 100644
index 0000000..153d68f
--- /dev/null
+++ b/compiler/ml/oprint.ml
@@ -0,0 +1,732 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                   Projet Cristal, INRIA Rocquencourt                   *)
+(*                                                                        *)
+(*   Copyright 2002 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Format
+open Outcometree
+
+exception Ellipsis
+
+let cautious f ppf arg = try f ppf arg with Ellipsis -> fprintf ppf "..."
+
+let out_ident = ref pp_print_string
+let map_primitive_name = ref (fun x -> x)
+
+let print_lident ppf = function
+  | "::" -> !out_ident ppf "(::)"
+  | s -> !out_ident ppf s
+
+let rec print_ident ppf = function
+  | Oide_ident s -> print_lident ppf s
+  | Oide_dot (id, s) ->
+    print_ident ppf id;
+    pp_print_char ppf '.';
+    print_lident ppf s
+  | Oide_apply (id1, id2) ->
+    fprintf ppf "%a(%a)" print_ident id1 print_ident id2
+
+let parenthesized_ident name =
+  List.mem name ["or"; "mod"; "land"; "lor"; "lxor"; "lsl"; "lsr"; "asr"]
+  ||
+  match name.[0] with
+  | 'a' .. 'z' | 'A' .. 'Z' | '\223' .. '\246' | '\248' .. '\255' | '_' -> false
+  | _ -> true
+
+let value_ident ppf name =
+  if parenthesized_ident name then fprintf ppf "( %s )" name
+  else pp_print_string ppf name
+
+(* Values *)
+
+let valid_float_lexeme s =
+  let l = String.length s in
+  let rec loop i =
+    if i >= l then s ^ "."
+    else
+      match s.[i] with
+      | '0' .. '9' | '-' -> loop (i + 1)
+      | _ -> s
+  in
+  loop 0
+
+let float_repres f =
+  match classify_float f with
+  | FP_nan -> "nan"
+  | FP_infinite -> if f < 0.0 then "neg_infinity" else "infinity"
+  | _ ->
+    let float_val =
+      let s1 = Printf.sprintf "%.12g" f in
+      if f = float_of_string s1 then s1
+      else
+        let s2 = Printf.sprintf "%.15g" f in
+        if f = float_of_string s2 then s2 else Printf.sprintf "%.18g" f
+    in
+    valid_float_lexeme float_val
+
+let parenthesize_if_neg ppf fmt v isneg =
+  if isneg then pp_print_char ppf '(';
+  fprintf ppf fmt v;
+  if isneg then pp_print_char ppf ')'
+
+let escape_string s =
+  (* Escape only C0 control characters (bytes <= 0x1F), DEL(0x7F), '\\' and '"' *)
+  let n = ref 0 in
+  for i = 0 to String.length s - 1 do
+    n :=
+      !n
+      +
+      match String.unsafe_get s i with
+      | '\"' | '\\' | '\n' | '\t' | '\r' | '\b' -> 2
+      | '\x00' .. '\x1F' | '\x7F' -> 4
+      | _ -> 1
+  done;
+  if !n = String.length s then s
+  else
+    let s' = Bytes.create !n in
+    n := 0;
+    for i = 0 to String.length s - 1 do
+      (match String.unsafe_get s i with
+      | ('\"' | '\\') as c ->
+        Bytes.unsafe_set s' !n '\\';
+        incr n;
+        Bytes.unsafe_set s' !n c
+      | '\n' ->
+        Bytes.unsafe_set s' !n '\\';
+        incr n;
+        Bytes.unsafe_set s' !n 'n'
+      | '\t' ->
+        Bytes.unsafe_set s' !n '\\';
+        incr n;
+        Bytes.unsafe_set s' !n 't'
+      | '\r' ->
+        Bytes.unsafe_set s' !n '\\';
+        incr n;
+        Bytes.unsafe_set s' !n 'r'
+      | '\b' ->
+        Bytes.unsafe_set s' !n '\\';
+        incr n;
+        Bytes.unsafe_set s' !n 'b'
+      | ('\x00' .. '\x1F' | '\x7F') as c ->
+        let a = Char.code c in
+        Bytes.unsafe_set s' !n '\\';
+        incr n;
+        Bytes.unsafe_set s' !n (Char.chr (48 + (a / 100)));
+        incr n;
+        Bytes.unsafe_set s' !n (Char.chr (48 + (a / 10 mod 10)));
+        incr n;
+        Bytes.unsafe_set s' !n (Char.chr (48 + (a mod 10)))
+      | c -> Bytes.unsafe_set s' !n c);
+      incr n
+    done;
+    Bytes.to_string s'
+
+let print_out_string ppf s =
+  let not_escaped =
+    (* let the user dynamically choose if strings should be escaped: *)
+    match Sys.getenv_opt "OCAMLTOP_UTF_8" with
+    | None -> true
+    | Some x -> (
+      match bool_of_string_opt x with
+      | None -> true
+      | Some f -> f)
+  in
+  if not_escaped then fprintf ppf "\"%s\"" (escape_string s)
+  else fprintf ppf "%S" s
+
+let print_out_value ppf tree =
+  let rec print_tree_1 ppf = function
+    | Oval_constr (name, [param]) ->
+      fprintf ppf "@[<1>%a@ %a@]" print_ident name print_constr_param param
+    | Oval_constr (name, (_ :: _ as params)) ->
+      fprintf ppf "@[<1>%a@ (%a)@]" print_ident name
+        (print_tree_list print_tree_1 ",")
+        params
+    | Oval_variant (name, Some param) ->
+      fprintf ppf "@[<2>`%s@ %a@]" name print_constr_param param
+    | tree -> print_simple_tree ppf tree
+  and print_constr_param ppf = function
+    | Oval_int i -> parenthesize_if_neg ppf "%i" i (i < 0)
+    | Oval_int32 i -> parenthesize_if_neg ppf "%lil" i (i < 0l)
+    | Oval_int64 i -> parenthesize_if_neg ppf "%LiL" i (i < 0L)
+    | Oval_nativeint i -> parenthesize_if_neg ppf "%nin" i (i < 0n)
+    | Oval_float f -> parenthesize_if_neg ppf "%s" (float_repres f) (f < 0.0)
+    | Oval_string (_, _, Ostr_bytes) as tree ->
+      pp_print_char ppf '(';
+      print_simple_tree ppf tree;
+      pp_print_char ppf ')'
+    | tree -> print_simple_tree ppf tree
+  and print_simple_tree ppf = function
+    | Oval_int i -> fprintf ppf "%i" i
+    | Oval_int32 i -> fprintf ppf "%lil" i
+    | Oval_int64 i -> fprintf ppf "%LiL" i
+    | Oval_nativeint i -> fprintf ppf "%nin" i
+    | Oval_float f -> pp_print_string ppf (float_repres f)
+    | Oval_char c -> fprintf ppf "%C" c
+    | Oval_string (s, maxlen, kind) -> (
+      try
+        let len = String.length s in
+        let s = if len > maxlen then String.sub s 0 maxlen else s in
+        (match kind with
+        | Ostr_bytes -> fprintf ppf "Bytes.of_string %S" s
+        | Ostr_string -> print_out_string ppf s);
+        if len > maxlen then
+          fprintf ppf "... (* string length %d; truncated *)" len
+      with Invalid_argument _ (* "String.create" *) ->
+        fprintf ppf "<huge string>")
+    | Oval_list tl ->
+      fprintf ppf "@[<1>[%a]@]" (print_tree_list print_tree_1 ";") tl
+    | Oval_array tl ->
+      fprintf ppf "@[<2>[|%a|]@]" (print_tree_list print_tree_1 ";") tl
+    | Oval_constr (name, []) -> print_ident ppf name
+    | Oval_variant (name, None) -> fprintf ppf "`%s" name
+    | Oval_stuff s -> pp_print_string ppf s
+    | Oval_record fel ->
+      fprintf ppf "@[<1>{%a}@]" (cautious (print_fields true)) fel
+    | Oval_ellipsis -> raise Ellipsis
+    | Oval_printer f -> f ppf
+    | Oval_tuple tree_list ->
+      fprintf ppf "@[<1>(%a)@]" (print_tree_list print_tree_1 ",") tree_list
+    | tree -> fprintf ppf "@[<1>(%a)@]" (cautious print_tree_1) tree
+  and print_fields first ppf = function
+    | [] -> ()
+    | (name, tree) :: fields ->
+      if not first then fprintf ppf ";@ ";
+      fprintf ppf "@[<1>%a@ =@ %a@]" print_ident name (cautious print_tree_1)
+        tree;
+      print_fields false ppf fields
+  and print_tree_list print_item sep ppf tree_list =
+    let rec print_list first ppf = function
+      | [] -> ()
+      | tree :: tree_list ->
+        if not first then fprintf ppf "%s@ " sep;
+        print_item ppf tree;
+        print_list false ppf tree_list
+    in
+    cautious (print_list true) ppf tree_list
+  in
+  cautious print_tree_1 ppf tree
+
+let out_value = ref print_out_value
+
+(* Types *)
+
+let rec print_list_init pr sep ppf = function
+  | [] -> ()
+  | a :: l ->
+    sep ppf;
+    pr ppf a;
+    print_list_init pr sep ppf l
+
+let rec print_list pr sep ppf = function
+  | [] -> ()
+  | [a] -> pr ppf a
+  | a :: l ->
+    pr ppf a;
+    sep ppf;
+    print_list pr sep ppf l
+
+let pr_present =
+  print_list (fun ppf s -> fprintf ppf "`%s" s) (fun ppf -> fprintf ppf "@ ")
+
+let pr_vars =
+  print_list (fun ppf s -> fprintf ppf "'%s" s) (fun ppf -> fprintf ppf "@ ")
+
+let rec print_out_type ppf = function
+  | Otyp_alias (ty, s) -> fprintf ppf "@[%a@ as '%s@]" print_out_type ty s
+  | Otyp_poly (sl, ty) ->
+    fprintf ppf "@[<hov 2>%a.@ %a@]" pr_vars sl print_out_type ty
+  | ty -> print_out_type_1 ppf ty
+
+and print_out_type_1 ppf = function
+  | Otyp_arrow (lab, ty1, ty2, _) ->
+    pp_open_box ppf 0;
+    if lab <> "" then (
+      pp_print_string ppf lab;
+      pp_print_char ppf ':');
+    print_out_type_2 ppf ty1;
+    pp_print_string ppf " ->";
+    pp_print_space ppf ();
+    print_out_type_1 ppf ty2;
+    pp_close_box ppf ()
+  | ty -> print_out_type_2 ppf ty
+
+and print_out_type_2 ppf = function
+  | Otyp_tuple tyl ->
+    fprintf ppf "@[<0>%a@]" (print_typlist print_simple_out_type " *") tyl
+  | ty -> print_simple_out_type ppf ty
+
+and print_simple_out_type ppf = function
+  | Otyp_class (ng, id, tyl) ->
+    fprintf ppf "@[%a%s#%a@]" print_typargs tyl
+      (if ng then "_" else "")
+      print_ident id
+  | Otyp_constr (id, tyl) ->
+    pp_open_box ppf 0;
+    print_typargs ppf tyl;
+    print_ident ppf id;
+    pp_close_box ppf ()
+  | Otyp_object (fields, rest) ->
+    fprintf ppf "@[<2>< %a >@]" (print_fields rest) fields
+  | Otyp_stuff s -> pp_print_string ppf s
+  | Otyp_var (ng, s) -> fprintf ppf "'%s%s" (if ng then "_" else "") s
+  | Otyp_variant (non_gen, row_fields, closed, tags) ->
+    let print_present ppf = function
+      | None | Some [] -> ()
+      | Some l -> fprintf ppf "@;<1 -2>> @[<hov>%a@]" pr_present l
+    in
+    let print_fields ppf = function
+      | Ovar_fields fields ->
+        print_list print_row_field
+          (fun ppf -> fprintf ppf "@;<1 -2>| ")
+          ppf fields
+      | Ovar_typ typ -> print_simple_out_type ppf typ
+    in
+    fprintf ppf "%s[%s@[<hv>@[<hv>%a@]%a ]@]"
+      (if non_gen then "_" else "")
+      (if closed then if tags = None then " " else "< "
+       else if tags = None then "> "
+       else "? ")
+      print_fields row_fields print_present tags
+  | (Otyp_alias _ | Otyp_poly _ | Otyp_arrow _ | Otyp_tuple _) as ty ->
+    pp_open_box ppf 1;
+    pp_print_char ppf '(';
+    print_out_type ppf ty;
+    pp_print_char ppf ')';
+    pp_close_box ppf ()
+  | Otyp_abstract | Otyp_open | Otyp_sum _ | Otyp_manifest (_, _) -> ()
+  | Otyp_record lbls -> print_record_decl ppf lbls
+  | Otyp_module (p, n, tyl) ->
+    fprintf ppf "@[<1>(module %s" p;
+    let first = ref true in
+    List.iter2
+      (fun s t ->
+        let sep =
+          if !first then (
+            first := false;
+            "with")
+          else "and"
+        in
+        fprintf ppf " %s type %s = %a" sep s print_out_type t)
+      n tyl;
+    fprintf ppf ")@]"
+  | Otyp_attribute (t, attr) ->
+    fprintf ppf "@[<1>(%a [@@%s])@]" print_out_type t attr.oattr_name
+
+and print_record_decl ppf lbls =
+  fprintf ppf "{%a@;<1 -2>}"
+    (print_list_init print_out_label (fun ppf -> fprintf ppf "@ "))
+    lbls
+
+and print_fields rest ppf = function
+  | [] -> (
+    match rest with
+    | Some non_gen -> fprintf ppf "%s.." (if non_gen then "_" else "")
+    | None -> ())
+  | [(s, t)] ->
+    fprintf ppf "%s : %a" s print_out_type t;
+    (match rest with
+    | Some _ -> fprintf ppf ";@ "
+    | None -> ());
+    print_fields rest ppf []
+  | (s, t) :: l ->
+    fprintf ppf "%s : %a;@ %a" s print_out_type t (print_fields rest) l
+
+and print_row_field ppf (l, opt_amp, tyl) =
+  let pr_of ppf =
+    if opt_amp then fprintf ppf " of@ &@ "
+    else if tyl <> [] then fprintf ppf " of@ "
+    else fprintf ppf ""
+  in
+  fprintf ppf "@[<hv 2>`%s%t%a@]" l pr_of
+    (print_typlist print_out_type " &")
+    tyl
+
+and print_typlist print_elem sep ppf = function
+  | [] -> ()
+  | [ty] -> print_elem ppf ty
+  | ty :: tyl ->
+    print_elem ppf ty;
+    pp_print_string ppf sep;
+    pp_print_space ppf ();
+    print_typlist print_elem sep ppf tyl
+
+and print_typargs ppf = function
+  | [] -> ()
+  | [ty1] ->
+    print_simple_out_type ppf ty1;
+    pp_print_space ppf ()
+  | tyl ->
+    pp_open_box ppf 1;
+    pp_print_char ppf '(';
+    print_typlist print_out_type "," ppf tyl;
+    pp_print_char ppf ')';
+    pp_close_box ppf ();
+    pp_print_space ppf ()
+
+and print_out_label ppf (name, mut, opt, arg) =
+  fprintf ppf "@[<2>%s%s%s :@ %a@];"
+    (if opt then "@optional " else "")
+    (if mut then "mutable " else "")
+    name print_out_type arg
+
+let out_type = ref print_out_type
+
+(* Class types *)
+
+let type_parameter ppf (ty, (co, cn)) =
+  fprintf ppf "%s%s"
+    (if not cn then "+" else if not co then "-" else "")
+    (if ty = "_" then ty else "'" ^ ty)
+
+let print_out_class_params ppf = function
+  | [] -> ()
+  | tyl ->
+    fprintf ppf "@[<1>[%a]@]@ "
+      (print_list type_parameter (fun ppf -> fprintf ppf ", "))
+      tyl
+
+let rec print_out_class_type ppf = function
+  | Octy_constr (id, tyl) ->
+    let pr_tyl ppf = function
+      | [] -> ()
+      | tyl -> fprintf ppf "@[<1>[%a]@]@ " (print_typlist !out_type ",") tyl
+    in
+    fprintf ppf "@[%a%a@]" pr_tyl tyl print_ident id
+  | Octy_arrow (lab, ty, cty) ->
+    fprintf ppf "@[%s%a ->@ %a@]"
+      (if lab <> "" then lab ^ ":" else "")
+      print_out_type_2 ty print_out_class_type cty
+  | Octy_signature (self_ty, csil) ->
+    let pr_param ppf = function
+      | Some ty -> fprintf ppf "@ @[(%a)@]" !out_type ty
+      | None -> ()
+    in
+    fprintf ppf "@[<hv 2>@[<2>object%a@]@ %a@;<1 -2>end@]" pr_param self_ty
+      (print_list print_out_class_sig_item (fun ppf -> fprintf ppf "@ "))
+      csil
+
+and print_out_class_sig_item ppf = function
+  | Ocsg_constraint (ty1, ty2) ->
+    fprintf ppf "@[<2>constraint %a =@ %a@]" !out_type ty1 !out_type ty2
+  | Ocsg_method (name, priv, virt, ty) ->
+    fprintf ppf "@[<2>method %s%s%s :@ %a@]"
+      (if priv then "private " else "")
+      (if virt then "virtual " else "")
+      name !out_type ty
+  | Ocsg_value (name, mut, vr, ty) ->
+    fprintf ppf "@[<2>val %s%s%s :@ %a@]"
+      (if mut then "mutable " else "")
+      (if vr then "virtual " else "")
+      name !out_type ty
+
+let out_class_type = ref print_out_class_type
+
+(* Signature *)
+
+let out_module_type = ref (fun _ -> failwith "Oprint.out_module_type")
+let out_sig_item = ref (fun _ -> failwith "Oprint.out_sig_item")
+let out_signature = ref (fun _ -> failwith "Oprint.out_signature")
+let out_type_extension = ref (fun _ -> failwith "Oprint.out_type_extension")
+
+let rec print_out_functor funct ppf = function
+  | Omty_functor (_, None, mty_res) ->
+    if funct then fprintf ppf "() %a" (print_out_functor true) mty_res
+    else fprintf ppf "functor@ () %a" (print_out_functor true) mty_res
+  | Omty_functor (name, Some mty_arg, mty_res) -> (
+    match (name, funct) with
+    | "_", true ->
+      fprintf ppf "->@ %a ->@ %a" print_out_module_type mty_arg
+        (print_out_functor false) mty_res
+    | "_", false ->
+      fprintf ppf "%a ->@ %a" print_out_module_type mty_arg
+        (print_out_functor false) mty_res
+    | name, true ->
+      fprintf ppf "(%s : %a) %a" name print_out_module_type mty_arg
+        (print_out_functor true) mty_res
+    | name, false ->
+      fprintf ppf "functor@ (%s : %a) %a" name print_out_module_type mty_arg
+        (print_out_functor true) mty_res)
+  | m ->
+    if funct then fprintf ppf "->@ %a" print_out_module_type m
+    else print_out_module_type ppf m
+
+and print_out_module_type ppf = function
+  | Omty_abstract -> ()
+  | Omty_functor _ as t -> fprintf ppf "@[<2>%a@]" (print_out_functor false) t
+  | Omty_ident id -> fprintf ppf "%a" print_ident id
+  | Omty_signature sg ->
+    fprintf ppf "@[<hv 2>sig@ %a@;<1 -2>end@]" !out_signature sg
+  | Omty_alias id -> fprintf ppf "(module %a)" print_ident id
+
+and print_out_signature ppf = function
+  | [] -> ()
+  | [item] -> !out_sig_item ppf item
+  | Osig_typext (ext, Oext_first) :: items ->
+    (* Gather together the extension constructors *)
+    let rec gather_extensions acc items =
+      match items with
+      | Osig_typext (ext, Oext_next) :: items ->
+        gather_extensions
+          ((ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)
+          :: acc)
+          items
+      | _ -> (List.rev acc, items)
+    in
+    let exts, items =
+      gather_extensions
+        [(ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)]
+        items
+    in
+    let te =
+      {
+        otyext_name = ext.oext_type_name;
+        otyext_params = ext.oext_type_params;
+        otyext_constructors = exts;
+        otyext_private = ext.oext_private;
+      }
+    in
+    fprintf ppf "%a@ %a" !out_type_extension te print_out_signature items
+  | item :: items ->
+    fprintf ppf "%a@ %a" !out_sig_item item print_out_signature items
+
+and print_out_sig_item ppf = function
+  | Osig_class (vir_flag, name, params, clt, rs) ->
+    fprintf ppf "@[<2>%s%s@ %a%s@ :@ %a@]"
+      (if rs = Orec_next then "and" else "class")
+      (if vir_flag then " virtual" else "")
+      print_out_class_params params name !out_class_type clt
+  | Osig_class_type (vir_flag, name, params, clt, rs) ->
+    fprintf ppf "@[<2>%s%s@ %a%s@ =@ %a@]"
+      (if rs = Orec_next then "and" else "class type")
+      (if vir_flag then " virtual" else "")
+      print_out_class_params params name !out_class_type clt
+  | Osig_typext (ext, Oext_exception) ->
+    fprintf ppf "@[<2>exception %a@]" print_out_constr
+      (ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)
+  | Osig_typext (ext, _es) -> print_out_extension_constructor ppf ext
+  | Osig_modtype (name, Omty_abstract) ->
+    fprintf ppf "@[<2>module type %s@]" name
+  | Osig_modtype (name, mty) ->
+    fprintf ppf "@[<2>module type %s =@ %a@]" name !out_module_type mty
+  | Osig_module (name, Omty_alias id, _) ->
+    fprintf ppf "@[<2>module %s =@ %a@]" name print_ident id
+  | Osig_module (name, mty, rs) ->
+    fprintf ppf "@[<2>%s %s :@ %a@]"
+      (match rs with
+      | Orec_not -> "module"
+      | Orec_first -> "module rec"
+      | Orec_next -> "and")
+      name !out_module_type mty
+  | Osig_type (td, rs) ->
+    print_out_type_decl
+      (match rs with
+      | Orec_not -> "type nonrec"
+      | Orec_first -> "type"
+      | Orec_next -> "and")
+      ppf td
+  | Osig_value vd ->
+    let kwd = if vd.oval_prims = [] then "val" else "external" in
+    let pr_prims ppf = function
+      | [] -> ()
+      | s :: sl ->
+        fprintf ppf "@ = \"%s\"" s;
+        List.iter
+          (fun s ->
+            (* TODO: in general, we should print bs attributes, some attributes like
+               variadic do need it *)
+            fprintf ppf "@ \"%s\"" (!map_primitive_name s))
+          sl
+    in
+    fprintf ppf "@[<2>%s %a :@ %a%a%a@]" kwd value_ident vd.oval_name !out_type
+      vd.oval_type pr_prims vd.oval_prims
+      (fun ppf -> List.iter (fun a -> fprintf ppf "@ [@@@@%s]" a.oattr_name))
+      vd.oval_attributes
+  | Osig_ellipsis -> fprintf ppf "..."
+
+and print_out_type_decl kwd ppf td =
+  let print_constraints ppf =
+    List.iter
+      (fun (ty1, ty2) ->
+        fprintf ppf "@ @[<2>constraint %a =@ %a@]" !out_type ty1 !out_type ty2)
+      td.otype_cstrs
+  in
+  let type_defined ppf =
+    match td.otype_params with
+    | [] -> pp_print_string ppf td.otype_name
+    | [param] -> fprintf ppf "@[%a@ %s@]" type_parameter param td.otype_name
+    | _ ->
+      fprintf ppf "@[(@[%a)@]@ %s@]"
+        (print_list type_parameter (fun ppf -> fprintf ppf ",@ "))
+        td.otype_params td.otype_name
+  in
+  let print_manifest ppf = function
+    | Otyp_manifest (ty, _) -> fprintf ppf " =@ %a" !out_type ty
+    | _ -> ()
+  in
+  let print_name_params ppf =
+    fprintf ppf "%s %t%a" kwd type_defined print_manifest td.otype_type
+  in
+  let ty =
+    match td.otype_type with
+    | Otyp_manifest (_, ty) -> ty
+    | _ -> td.otype_type
+  in
+  let print_private ppf = function
+    | Asttypes.Private -> fprintf ppf " private"
+    | Asttypes.Public -> ()
+  in
+  let print_immediate ppf =
+    if td.otype_immediate then fprintf ppf " [%@%@immediate]" else ()
+  in
+  let print_unboxed ppf =
+    if td.otype_unboxed then fprintf ppf " [%@%@unboxed]" else ()
+  in
+  let print_out_tkind ppf = function
+    | Otyp_abstract -> ()
+    | Otyp_record lbls ->
+      fprintf ppf " =%a %a" print_private td.otype_private print_record_decl
+        lbls
+    | Otyp_sum constrs ->
+      fprintf ppf " =%a@;<1 2>%a" print_private td.otype_private
+        (print_list print_out_constr (fun ppf -> fprintf ppf "@ | "))
+        constrs
+    | Otyp_open -> fprintf ppf " =%a .." print_private td.otype_private
+    | ty ->
+      fprintf ppf " =%a@;<1 2>%a" print_private td.otype_private !out_type ty
+  in
+  fprintf ppf "@[<2>@[<hv 2>%t%a@]%t%t%t@]" print_name_params print_out_tkind ty
+    print_constraints print_immediate print_unboxed
+
+and print_out_constr ppf (name, tyl, ret_type_opt, repr) =
+  let () =
+    match repr with
+    | None -> ()
+    | Some s -> pp_print_string ppf s
+  in
+  let name =
+    match name with
+    | "::" -> "(::)" (* #7200 *)
+    | s -> s
+  in
+  match ret_type_opt with
+  | None -> (
+    match tyl with
+    | [] -> pp_print_string ppf name
+    | _ ->
+      fprintf ppf "@[<2>%s of@ %a@]" name
+        (print_typlist print_simple_out_type " *")
+        tyl)
+  | Some ret_type -> (
+    match tyl with
+    | [] -> fprintf ppf "@[<2>%s :@ %a@]" name print_simple_out_type ret_type
+    | _ ->
+      fprintf ppf "@[<2>%s :@ %a -> %a@]" name
+        (print_typlist print_simple_out_type " *")
+        tyl print_simple_out_type ret_type)
+
+and print_out_extension_constructor ppf ext =
+  let print_extended_type ppf =
+    let print_type_parameter ppf ty =
+      fprintf ppf "%s" (if ty = "_" then ty else "'" ^ ty)
+    in
+    match ext.oext_type_params with
+    | [] -> fprintf ppf "%s" ext.oext_type_name
+    | [ty_param] ->
+      fprintf ppf "@[%a@ %s@]" print_type_parameter ty_param ext.oext_type_name
+    | _ ->
+      fprintf ppf "@[(@[%a)@]@ %s@]"
+        (print_list print_type_parameter (fun ppf -> fprintf ppf ",@ "))
+        ext.oext_type_params ext.oext_type_name
+  in
+  fprintf ppf "@[<hv 2>type %t +=%s@;<1 2>%a@]" print_extended_type
+    (if ext.oext_private = Asttypes.Private then " private" else "")
+    print_out_constr
+    (ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)
+
+and print_out_type_extension ppf te =
+  let print_extended_type ppf =
+    let print_type_parameter ppf ty =
+      fprintf ppf "%s" (if ty = "_" then ty else "'" ^ ty)
+    in
+    match te.otyext_params with
+    | [] -> fprintf ppf "%s" te.otyext_name
+    | [param] ->
+      fprintf ppf "@[%a@ %s@]" print_type_parameter param te.otyext_name
+    | _ ->
+      fprintf ppf "@[(@[%a)@]@ %s@]"
+        (print_list print_type_parameter (fun ppf -> fprintf ppf ",@ "))
+        te.otyext_params te.otyext_name
+  in
+  fprintf ppf "@[<hv 2>type %t +=%s@;<1 2>%a@]" print_extended_type
+    (if te.otyext_private = Asttypes.Private then " private" else "")
+    (print_list print_out_constr (fun ppf -> fprintf ppf "@ | "))
+    te.otyext_constructors
+
+let _ = out_module_type := print_out_module_type
+let _ = out_signature := print_out_signature
+let _ = out_sig_item := print_out_sig_item
+let _ = out_type_extension := print_out_type_extension
+
+(* Phrases *)
+
+let print_out_exception ppf exn outv =
+  match exn with
+  | Sys.Break -> fprintf ppf "Interrupted.@."
+  | Out_of_memory -> fprintf ppf "Out of memory during evaluation.@."
+  | Stack_overflow ->
+    fprintf ppf "Stack overflow during evaluation (looping recursion?).@."
+  | _ -> fprintf ppf "@[Exception:@ %a.@]@." !out_value outv
+
+let rec print_items ppf = function
+  | [] -> ()
+  | (Osig_typext (ext, Oext_first), None) :: items ->
+    (* Gather together extension constructors *)
+    let rec gather_extensions acc items =
+      match items with
+      | (Osig_typext (ext, Oext_next), None) :: items ->
+        gather_extensions
+          ((ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)
+          :: acc)
+          items
+      | _ -> (List.rev acc, items)
+    in
+    let exts, items =
+      gather_extensions
+        [(ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)]
+        items
+    in
+    let te =
+      {
+        otyext_name = ext.oext_type_name;
+        otyext_params = ext.oext_type_params;
+        otyext_constructors = exts;
+        otyext_private = ext.oext_private;
+      }
+    in
+    fprintf ppf "@[%a@]" !out_type_extension te;
+    if items <> [] then fprintf ppf "@ %a" print_items items
+  | (tree, valopt) :: items ->
+    (match valopt with
+    | Some v -> fprintf ppf "@[<2>%a =@ %a@]" !out_sig_item tree !out_value v
+    | None -> fprintf ppf "@[%a@]" !out_sig_item tree);
+    if items <> [] then fprintf ppf "@ %a" print_items items
+
+let print_out_phrase ppf = function
+  | Ophr_eval (outv, ty) ->
+    fprintf ppf "@[- : %a@ =@ %a@]@." !out_type ty !out_value outv
+  | Ophr_signature [] -> ()
+  | Ophr_signature items -> fprintf ppf "@[<v>%a@]@." print_items items
+  | Ophr_exception (exn, outv) -> print_out_exception ppf exn outv
+
+let out_phrase = ref print_out_phrase
diff --git a/jscomp/ml/oprint.mli b/compiler/ml/oprint.mli
similarity index 99%
rename from jscomp/ml/oprint.mli
rename to compiler/ml/oprint.mli
index 7c53634..4bdd95a 100644
--- a/jscomp/ml/oprint.mli
+++ b/compiler/ml/oprint.mli
@@ -16,7 +16,6 @@
 open Format
 open Outcometree
 
-
 val out_ident : (formatter -> string -> unit) ref
 val map_primitive_name : (string -> string) ref
 
diff --git a/compiler/ml/outcometree.ml b/compiler/ml/outcometree.ml
new file mode 100644
index 0000000..1372420
--- /dev/null
+++ b/compiler/ml/outcometree.ml
@@ -0,0 +1,146 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*      Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt          *)
+(*                                                                        *)
+(*   Copyright 2001 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Module [Outcometree]: results displayed by the toplevel *)
+
+(* These types represent messages that the toplevel displays as normal
+   results or errors. The real displaying is customisable using the hooks:
+      [Toploop.print_out_value]
+      [Toploop.print_out_type]
+      [Toploop.print_out_sig_item]
+      [Toploop.print_out_phrase] *)
+
+type out_ident =
+  | Oide_apply of out_ident * out_ident
+  | Oide_dot of out_ident * string
+  | Oide_ident of string
+
+type out_string = Ostr_string | Ostr_bytes
+
+type out_attribute = {oattr_name: string}
+
+type out_value =
+  | Oval_array of out_value list
+  | Oval_char of char
+  | Oval_constr of out_ident * out_value list
+  | Oval_ellipsis
+  | Oval_float of float
+  | Oval_int of int
+  | Oval_int32 of int32
+  | Oval_int64 of int64
+  | Oval_nativeint of nativeint
+  | Oval_list of out_value list
+  | Oval_printer of (Format.formatter -> unit)
+  | Oval_record of (out_ident * out_value) list
+  | Oval_string of string * int * out_string (* string, size-to-print, kind *)
+  | Oval_stuff of string
+  | Oval_tuple of out_value list
+  | Oval_variant of string * out_value option
+
+type out_type =
+  | Otyp_abstract
+  | Otyp_open
+  | Otyp_alias of out_type * string
+  | Otyp_arrow of string * out_type * out_type * Asttypes.arity
+  | Otyp_class of bool * out_ident * out_type list
+  | Otyp_constr of out_ident * out_type list
+  | Otyp_manifest of out_type * out_type
+  | Otyp_object of (string * out_type) list * bool option
+  | Otyp_record of (string * bool * bool * out_type) list
+  | Otyp_stuff of string
+  | Otyp_sum of (string * out_type list * out_type option * string option) list
+  | Otyp_tuple of out_type list
+  | Otyp_var of bool * string
+  | Otyp_variant of bool * out_variant * bool * string list option
+  | Otyp_poly of string list * out_type
+  | Otyp_module of string * string list * out_type list
+  | Otyp_attribute of out_type * out_attribute
+
+and out_variant =
+  | Ovar_fields of (string * bool * out_type list) list
+  | Ovar_typ of out_type
+
+type out_class_type =
+  | Octy_constr of out_ident * out_type list
+  | Octy_arrow of string * out_type * out_class_type
+  | Octy_signature of out_type option * out_class_sig_item list
+and out_class_sig_item =
+  | Ocsg_constraint of out_type * out_type
+  | Ocsg_method of string * bool * bool * out_type
+  | Ocsg_value of string * bool * bool * out_type
+
+type out_module_type =
+  | Omty_abstract
+  | Omty_functor of string * out_module_type option * out_module_type
+  | Omty_ident of out_ident
+  | Omty_signature of out_sig_item list
+  | Omty_alias of out_ident
+and out_sig_item =
+  | Osig_class of
+      bool
+      * string
+      * (string * (bool * bool)) list
+      * out_class_type
+      * out_rec_status
+  | Osig_class_type of
+      bool
+      * string
+      * (string * (bool * bool)) list
+      * out_class_type
+      * out_rec_status
+  | Osig_typext of out_extension_constructor * out_ext_status
+  | Osig_modtype of string * out_module_type
+  | Osig_module of string * out_module_type * out_rec_status
+  | Osig_type of out_type_decl * out_rec_status
+  | Osig_value of out_val_decl
+  | Osig_ellipsis
+and out_type_decl = {
+  otype_name: string;
+  otype_params: (string * (bool * bool)) list;
+  otype_type: out_type;
+  otype_private: Asttypes.private_flag;
+  otype_immediate: bool;
+  otype_unboxed: bool;
+  otype_cstrs: (out_type * out_type) list;
+}
+and out_extension_constructor = {
+  oext_name: string;
+  oext_type_name: string;
+  oext_type_params: string list;
+  oext_args: out_type list;
+  oext_ret_type: out_type option;
+  oext_repr: string option;
+  oext_private: Asttypes.private_flag;
+}
+and out_type_extension = {
+  otyext_name: string;
+  otyext_params: string list;
+  otyext_constructors:
+    (string * out_type list * out_type option * string option) list;
+  otyext_private: Asttypes.private_flag;
+}
+and out_val_decl = {
+  oval_name: string;
+  oval_type: out_type;
+  oval_prims: string list;
+  oval_attributes: out_attribute list;
+}
+and out_rec_status = Orec_not | Orec_first | Orec_next
+and out_ext_status = Oext_first | Oext_next | Oext_exception
+
+type out_phrase =
+  | Ophr_eval of out_value * out_type
+  | Ophr_signature of (out_sig_item * out_value option) list
+  | Ophr_exception of (exn * out_value)
diff --git a/compiler/ml/parmatch.ml b/compiler/ml/parmatch.ml
new file mode 100644
index 0000000..9e66800
--- /dev/null
+++ b/compiler/ml/parmatch.ml
@@ -0,0 +1,2555 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Detection of partial matches and unused match cases. *)
+
+open Misc
+open Asttypes
+open Types
+open Typedtree
+
+(*************************************)
+(* Utilities for building patterns   *)
+(*************************************)
+
+let make_pat desc ty tenv =
+  {
+    pat_desc = desc;
+    pat_loc = Location.none;
+    pat_extra = [];
+    pat_type = ty;
+    pat_env = tenv;
+    pat_attributes = [];
+  }
+
+let omega = make_pat Tpat_any Ctype.none Env.empty
+
+let extra_pat =
+  make_pat (Tpat_var (Ident.create "+", mknoloc "+")) Ctype.none Env.empty
+
+let rec omegas i = if i <= 0 then [] else omega :: omegas (i - 1)
+
+let omega_list l = List.map (fun _ -> omega) l
+
+let zero = make_pat (Tpat_constant (Const_int 0)) Ctype.none Env.empty
+
+(*******************)
+(* Coherence check *)
+(*******************)
+
+(* For some of the operations we do in this module, we would like (because it
+   simplifies matters) to assume that patterns appearing on a given column in a
+   pattern matrix are /coherent/ (think "of the same type").
+   Unfortunately that is not always true.
+
+   Consider the following (well-typed) example:
+   {[
+     type _ t = S : string t | U : unit t
+
+     let f (type a) (t1 : a t) (t2 : a t) (a : a) =
+       match t1, t2, a with
+       | U, _, () -> ()
+       | _, S, "" -> ()
+   ]}
+
+   Clearly the 3rd column contains incoherent patterns.
+
+   On the example above, most of the algorithms will explore the pattern matrix
+   as illustrated by the following tree:
+
+   {v
+                                                   S
+                                                -------> | "" |
+                             U     | S, "" | __/         | () |
+                         --------> | _, () |   \  ¬ S
+        | U, _, () | __/                        -------> | () |
+        | _, S, "" |   \
+                        ---------> | S, "" | ----------> | "" |
+                           ¬ U                    S
+   v}
+
+   where following an edge labelled by a pattern P means "assuming the value I
+   am matching on is filtered by [P] on the column I am currently looking at,
+   then the following submatrix is still reachable".
+
+   Notice that at any point of that tree, if the first column of a matrix is
+   incoherent, then the branch leading to it can only be taken if the scrutinee
+   is ill-typed.
+   In the example above the only case where we have a matrix with an incoherent
+   first column is when we consider [t1, t2, a] to be [U, S, ...]. However such
+   a value would be ill-typed, so we can never actually get there.
+
+   Checking the first column at each step of the recursion and making the
+   concious decision of "aborting" the algorithm whenever the first column
+   becomes incoherent, allows us to retain the initial assumption in later
+   stages of the algorithms.
+
+   ---
+
+   N.B. two patterns can be considered coherent even though they might not be of
+   the same type.
+
+   That's in part because we only care about the "head" of patterns and leave
+   checking coherence of subpatterns for the next steps of the algorithm:
+   ('a', 'b') and (1, ()) will be deemed coherent because they are both a tuples
+   of arity 2 (we'll notice at a later stage the incoherence of 'a' and 1).
+
+   But also because it can be hard/costly to determine exactly whether two
+   patterns are of the same type or not (eg. in the example above with _ and S,
+   but see also the module [Coherence_illustration] in
+   testsuite/tests/basic-more/robustmatch.ml).
+
+   For the moment our weak, loosely-syntactic, coherence check seems to be
+   enough and we leave it to each user to consider (and document!) what happens
+   when an "incoherence" is not detected by this check.
+*)
+
+let simplify_head_pat p k =
+  let rec simplify_head_pat p k =
+    match p.pat_desc with
+    | Tpat_alias (p, _, _) -> simplify_head_pat p k
+    | Tpat_var (_, _) -> omega :: k
+    | Tpat_or (p1, p2, _) -> simplify_head_pat p1 (simplify_head_pat p2 k)
+    | _ -> p :: k
+  in
+  simplify_head_pat p k
+
+let rec simplified_first_col = function
+  | [] -> []
+  | [] :: _ -> assert false (* the rows are non-empty! *)
+  | (p :: _) :: rows -> simplify_head_pat p (simplified_first_col rows)
+
+(* Given the simplified first column of a matrix, this function first looks for
+   a "discriminating" pattern on that column (i.e. a non-omega one) and then
+   check that every other head pattern in the column is coherent with that one.
+*)
+let all_coherent column =
+  let coherent_heads hp1 hp2 =
+    match (hp1.pat_desc, hp2.pat_desc) with
+    | (Tpat_var _ | Tpat_alias _ | Tpat_or _), _
+    | _, (Tpat_var _ | Tpat_alias _ | Tpat_or _) ->
+      assert false
+    | Tpat_construct (_, c, _), Tpat_construct (_, c', _) ->
+      c.cstr_consts = c'.cstr_consts && c.cstr_nonconsts = c'.cstr_nonconsts
+    | Tpat_constant c1, Tpat_constant c2 -> (
+      match (c1, c2) with
+      | Const_char _, Const_char _
+      | Const_int _, Const_int _
+      | Const_int32 _, Const_int32 _
+      | Const_int64 _, Const_int64 _
+      | Const_bigint _, Const_bigint _
+      | Const_float _, Const_float _
+      | Const_string _, Const_string _ ->
+        true
+      | ( ( Const_char _ | Const_int _ | Const_int32 _ | Const_int64 _
+          | Const_bigint _ | Const_float _ | Const_string _ ),
+          _ ) ->
+        false)
+    | Tpat_tuple l1, Tpat_tuple l2 -> List.length l1 = List.length l2
+    | ( Tpat_record ((_, lbl1, _, _) :: _, _),
+        Tpat_record ((_, lbl2, _, _) :: _, _) ) ->
+      Array.length lbl1.lbl_all = Array.length lbl2.lbl_all
+    | Tpat_any, _
+    | _, Tpat_any
+    | Tpat_record ([], _), Tpat_record (_, _)
+    | Tpat_record (_, _), Tpat_record ([], _)
+    | Tpat_variant _, Tpat_variant _
+    | Tpat_array _, Tpat_array _ ->
+      true
+    | _, _ -> false
+  in
+  match
+    List.find
+      (fun head_pat ->
+        match head_pat.pat_desc with
+        | Tpat_var _ | Tpat_alias _ | Tpat_or _ -> assert false
+        | Tpat_any -> false
+        | _ -> true)
+      column
+  with
+  | exception Not_found ->
+    (* only omegas on the column: the column is coherent. *)
+    true
+  | discr_pat -> List.for_all (coherent_heads discr_pat) column
+
+let first_column simplified_matrix = List.map fst simplified_matrix
+
+(***********************)
+(* Compatibility check *)
+(***********************)
+
+(* Patterns p and q compatible means:
+    there exists value V that matches both, However....
+
+   The case of extension types is dubious, as constructor rebind permits
+   that different constructors are the same (and are thus compatible).
+
+   Compilation must take this into account, consider:
+
+   type t = ..
+   type t += A|B
+   type t += C=A
+
+   let f x y = match x,y with
+   | true,A  -> '1'
+   | _,C     -> '2'
+   | false,A -> '3'
+   | _,_     -> '_'
+
+   As C is bound to A the value of f false A is '2' (and not '3' as it would
+   be in the absence of rebinding).
+
+   Not considering rebinding, patterns "false,A" and "_,C" are incompatible
+   and the compiler can swap the second and third clause, resulting in the
+   (more efficiently compiled) matching
+
+   match x,y with
+   | true,A  -> '1'
+   | false,A -> '3'
+   | _,C     -> '2'
+   | _,_     -> '_'
+
+   This is not correct: when C is bound to A, "f false A" returns '2' (not '3')
+
+
+   However, diagnostics do not take constructor rebinding into account.
+   Notice, that due to module abstraction constructor rebinding is hidden.
+
+   module X : sig type t = .. type t += A|B end = struct
+     type t = ..
+     type t += A
+     type t += B=A
+   end
+
+   open X
+
+   let f x = match x with
+   | A -> '1'
+   | B -> '2'
+   | _ -> '_'
+
+   The second clause above will NOT (and cannot) be flagged as useless.
+
+   Finally, there are two compatibility fonction
+    compat p q      ---> 'syntactic compatibility, used for diagnostics.
+    may_compat p q --->   a safe approximation of possible compat,
+                          for compilation
+*)
+
+let is_absent tag row = Btype.row_field tag !row = Rabsent
+
+let is_absent_pat p =
+  match p.pat_desc with
+  | Tpat_variant (tag, _, row) -> is_absent tag row
+  | _ -> false
+
+let const_compare x y =
+  match (x, y) with
+  | Const_float f1, Const_float f2 ->
+    compare (float_of_string f1) (float_of_string f2)
+  | Const_bigint (s1, b1), Const_bigint (s2, b2) ->
+    Bigint_utils.compare (s1, b1) (s2, b2)
+  | Const_string (s1, _), Const_string (s2, _) -> String.compare s1 s2
+  | _, _ -> compare x y
+
+let records_args l1 l2 =
+  (* Invariant: fields are already sorted by Typecore.type_label_a_list *)
+  let rec combine r1 r2 l1 l2 =
+    match (l1, l2) with
+    | [], [] -> (List.rev r1, List.rev r2)
+    | [], (_, _, p2, _) :: rem2 -> combine (omega :: r1) (p2 :: r2) [] rem2
+    | (_, _, p1, _) :: rem1, [] -> combine (p1 :: r1) (omega :: r2) rem1 []
+    | (_, lbl1, p1, _) :: rem1, (_, lbl2, p2, _) :: rem2 ->
+      if lbl1.lbl_pos < lbl2.lbl_pos then
+        combine (p1 :: r1) (omega :: r2) rem1 l2
+      else if lbl1.lbl_pos > lbl2.lbl_pos then
+        combine (omega :: r1) (p2 :: r2) l1 rem2
+      else (* same label on both sides *)
+        combine (p1 :: r1) (p2 :: r2) rem1 rem2
+  in
+  combine [] [] l1 l2
+
+module Compat = struct
+  type eq_cd = constructor_description -> constructor_description -> bool
+
+  let rec compat ~(equal_cd : eq_cd) p q =
+    match (p.pat_desc, q.pat_desc) with
+    (* Variables match any value *)
+    | (Tpat_any | Tpat_var _), _ | _, (Tpat_any | Tpat_var _) -> true
+    (* Structural induction *)
+    | Tpat_alias (p, _, _), _ -> compat ~equal_cd p q
+    | _, Tpat_alias (q, _, _) -> compat ~equal_cd p q
+    | Tpat_or (p1, p2, _), _ -> compat ~equal_cd p1 q || compat ~equal_cd p2 q
+    | _, Tpat_or (q1, q2, _) -> compat ~equal_cd p q1 || compat ~equal_cd p q2
+    (* Constructors, with special case for extension *)
+    | Tpat_construct (_, c1, ps1), Tpat_construct (_, c2, ps2) ->
+      equal_cd c1 c2 && compats ~equal_cd ps1 ps2
+    (* More standard stuff *)
+    | Tpat_variant (l1, op1, _), Tpat_variant (l2, op2, _) ->
+      l1 = l2 && ocompat ~equal_cd op1 op2
+    | Tpat_constant c1, Tpat_constant c2 -> const_compare c1 c2 = 0
+    | Tpat_tuple ps, Tpat_tuple qs -> compats ~equal_cd ps qs
+    | Tpat_record (l1, _), Tpat_record (l2, _) ->
+      let ps, qs = records_args l1 l2 in
+      compats ~equal_cd ps qs
+    | Tpat_array ps, Tpat_array qs ->
+      List.length ps = List.length qs && compats ~equal_cd ps qs
+    | _, _ -> false
+
+  and ocompat ~equal_cd op oq =
+    match (op, oq) with
+    | None, None -> true
+    | Some p, Some q -> compat ~equal_cd p q
+    | None, Some _ | Some _, None -> false
+
+  and compats ~equal_cd ps qs =
+    match (ps, qs) with
+    | [], [] -> true
+    | p :: ps, q :: qs -> compat ~equal_cd p q && compats ~equal_cd ps qs
+    | _, _ -> false
+end
+
+let equal_tag c1 c2 = Types.equal_tag c1.cstr_tag c2.cstr_tag
+
+let compat = Compat.compat ~equal_cd:equal_tag
+
+and compats = Compat.compats ~equal_cd:equal_tag
+
+(* Due to (potential) rebinding, two extension constructors
+   of the same arity type may equal *)
+
+exception Empty (* Empty pattern *)
+
+(****************************************)
+(* Utilities for retrieving type paths  *)
+(****************************************)
+
+(* May need a clean copy, cf. PR#4745 *)
+let clean_copy ty =
+  if ty.level = Btype.generic_level then ty
+  else Subst.type_expr Subst.identity ty
+
+let get_type_path ty tenv =
+  let ty = Ctype.repr (Ctype.expand_head tenv (clean_copy ty)) in
+  match ty.desc with
+  | Tconstr (path, _, _) -> path
+  | _ -> fatal_error "Parmatch.get_type_path"
+
+(*************************************)
+(* Values as patterns pretty printer *)
+(*************************************)
+
+let print_res_pat : (Typedtree.pattern -> string) ref =
+  ref (fun _ -> assert false)
+
+open Format
+
+let is_cons = function
+  | {cstr_name = "::"} -> true
+  | _ -> false
+
+let pretty_const c =
+  match c with
+  | Const_int i -> Printf.sprintf "%d" i
+  | Const_char i -> Printf.sprintf "%s" (Pprintast.string_of_int_as_char i)
+  | Const_string (s, _) -> Printf.sprintf "%S" s
+  | Const_float f -> Printf.sprintf "%s" f
+  | Const_int32 i -> Printf.sprintf "%ldl" i
+  | Const_int64 i -> Printf.sprintf "%LdL" i
+  | Const_bigint (sign, i) ->
+    Printf.sprintf "%s" (Bigint_utils.to_string sign i)
+
+let rec pretty_val ppf v =
+  match v.pat_extra with
+  | (cstr, _loc, _attrs) :: rem -> (
+    match cstr with
+    | Tpat_unpack ->
+      fprintf ppf "@[(module %a)@]" pretty_val {v with pat_extra = rem}
+    | Tpat_constraint _ ->
+      fprintf ppf "@[(%a : _)@]" pretty_val {v with pat_extra = rem}
+    | Tpat_type _ ->
+      fprintf ppf "@[(# %a)@]" pretty_val {v with pat_extra = rem}
+    | Tpat_open _ ->
+      fprintf ppf "@[(# %a)@]" pretty_val {v with pat_extra = rem})
+  | [] -> (
+    match v.pat_desc with
+    | Tpat_any -> fprintf ppf "_"
+    | Tpat_var (x, _) -> fprintf ppf "%s" (Ident.name x)
+    | Tpat_constant c -> fprintf ppf "%s" (pretty_const c)
+    | Tpat_tuple vs -> fprintf ppf "@[(%a)@]" (pretty_vals ",") vs
+    | Tpat_construct (_, cstr, []) -> fprintf ppf "%s" cstr.cstr_name
+    | Tpat_construct (_, cstr, [w]) ->
+      fprintf ppf "@[<2>%s(%a)@]" cstr.cstr_name pretty_arg w
+    | Tpat_construct (_, cstr, vs) -> (
+      let name = cstr.cstr_name in
+      match (name, vs) with
+      | "::", [v1; v2] -> fprintf ppf "@[%a::@,%a@]" pretty_car v1 pretty_cdr v2
+      | _ -> fprintf ppf "@[<2>%s@ @[(%a)@]@]" name (pretty_vals ",") vs)
+    | Tpat_variant (l, None, _) -> fprintf ppf "#%s" l
+    | Tpat_variant (l, Some w, _) -> fprintf ppf "@[<2>#%s(%a)@]" l pretty_arg w
+    | Tpat_record (lvs, _) -> (
+      let filtered_lvs =
+        Ext_list.filter lvs (function
+          | _, _, {pat_desc = Tpat_any}, _ -> false (* do not show lbl=_ *)
+          | _ -> true)
+      in
+      match filtered_lvs with
+      | [] -> fprintf ppf "_"
+      | (_, _lbl, _, _) :: _q ->
+        let elision_mark _ = () in
+        fprintf ppf "@[{%a%t}@]" pretty_lvals filtered_lvs elision_mark)
+    | Tpat_array vs -> fprintf ppf "@[[%a]@]" (pretty_vals ",") vs
+    | Tpat_alias (v, x, _) ->
+      fprintf ppf "@[(%a@ as %a)@]" pretty_val v Ident.print x
+    | Tpat_or (v, w, _) -> fprintf ppf "@[%a | @,%a@]" pretty_or v pretty_or w)
+
+and pretty_car ppf v =
+  match v.pat_desc with
+  | Tpat_construct (_, cstr, [_; _]) when is_cons cstr ->
+    fprintf ppf "(%a)" pretty_val v
+  | _ -> pretty_val ppf v
+
+and pretty_cdr ppf v =
+  match v.pat_desc with
+  | Tpat_construct (_, cstr, [v1; v2]) when is_cons cstr ->
+    fprintf ppf "%a::@,%a" pretty_car v1 pretty_cdr v2
+  | _ -> pretty_val ppf v
+
+and pretty_arg ppf v =
+  match v.pat_desc with
+  | Tpat_construct (_, _, _ :: _) | Tpat_variant (_, Some _, _) ->
+    fprintf ppf "(%a)" pretty_val v
+  | _ -> pretty_val ppf v
+
+and pretty_or ppf v =
+  match v.pat_desc with
+  | Tpat_or (v, w, _) -> fprintf ppf "%a | @,%a" pretty_or v pretty_or w
+  | _ -> pretty_val ppf v
+
+and pretty_vals sep ppf = function
+  | [] -> ()
+  | [v] -> pretty_val ppf v
+  | v :: vs -> fprintf ppf "%a%s@ %a" pretty_val v sep (pretty_vals sep) vs
+
+and pretty_lvals ppf = function
+  | [] -> ()
+  | [(_, lbl, v, _)] -> fprintf ppf "%s: %a" lbl.lbl_name pretty_val v
+  | (_, lbl, v, _) :: rest ->
+    fprintf ppf "%s: %a,@ %a" lbl.lbl_name pretty_val v pretty_lvals rest
+
+let top_pretty ppf v = fprintf ppf "@[%a@]@?" pretty_val v
+
+let pretty_pat p =
+  top_pretty Format.str_formatter p;
+  prerr_string (Format.flush_str_formatter ())
+
+type matrix = pattern list list
+
+let pretty_line ps =
+  List.iter
+    (fun p ->
+      top_pretty Format.str_formatter p;
+      prerr_string " <";
+      prerr_string (Format.flush_str_formatter ());
+      prerr_string ">")
+    ps
+
+let pretty_matrix (pss : matrix) =
+  prerr_endline "begin matrix";
+  List.iter
+    (fun ps ->
+      pretty_line ps;
+      prerr_endline "")
+    pss;
+  prerr_endline "end matrix"
+
+(****************************)
+(* Utilities for matching   *)
+(****************************)
+
+(* Check top matching *)
+let simple_match p1 p2 =
+  match (p1.pat_desc, p2.pat_desc) with
+  | Tpat_construct (_, c1, _), Tpat_construct (_, c2, _) ->
+    Types.equal_tag c1.cstr_tag c2.cstr_tag
+  | Tpat_variant (l1, _, _), Tpat_variant (l2, _, _) -> l1 = l2
+  | Tpat_constant c1, Tpat_constant c2 -> const_compare c1 c2 = 0
+  | Tpat_record _, Tpat_record _ -> true
+  | Tpat_tuple p1s, Tpat_tuple p2s | Tpat_array p1s, Tpat_array p2s ->
+    List.length p1s = List.length p2s
+  | _, (Tpat_any | Tpat_var _) -> true
+  | _, _ -> false
+
+(* extract record fields as a whole *)
+let record_arg p =
+  match p.pat_desc with
+  | Tpat_any -> []
+  | Tpat_record (args, _) -> args
+  | _ -> fatal_error "Parmatch.as_record"
+
+(* Raise Not_found when pos is not present in arg *)
+let get_field pos arg =
+  let _, _, p, _ = List.find (fun (_, lbl, _, _) -> pos = lbl.lbl_pos) arg in
+  p
+
+let extract_fields omegas arg =
+  List.map
+    (fun (_, lbl, _, _) ->
+      try get_field lbl.lbl_pos arg with Not_found -> omega)
+    omegas
+
+let all_record_args lbls =
+  match lbls with
+  | (_, {lbl_all}, _, opt) :: _ ->
+    let t =
+      Array.map
+        (fun lbl -> (mknoloc (Longident.Lident "?temp?"), lbl, omega, opt))
+        lbl_all
+    in
+    List.iter
+      (fun ((id, lbl, pat, o) as x) ->
+        let lbl_is_optional () =
+          match lbl.lbl_repres with
+          | Record_inlined _ -> false
+          | _ -> lbl.lbl_optional
+        in
+        let x =
+          match pat.pat_desc with
+          | Tpat_construct
+              ( {txt = Longident.Ldot (Longident.Lident "*predef*", "Some")},
+                _,
+                [({pat_desc = Tpat_constant _} as c)] )
+            when lbl_is_optional () ->
+            (id, lbl, c, o)
+          | Tpat_construct
+              ( {txt = Longident.Ldot (Longident.Lident "*predef*", "Some")},
+                _,
+                [({pat_desc = Tpat_construct (_, cd, _)} as pat_construct)] )
+            when lbl_is_optional () -> (
+            let cdecl =
+              Ast_untagged_variants
+              .constructor_declaration_from_constructor_description
+                ~env:pat.pat_env cd
+            in
+            match cdecl with
+            | None -> x
+            | Some cstr -> (
+              match
+                Ast_untagged_variants.get_block_type ~env:pat.pat_env cstr
+              with
+              | Some block_type
+                when not
+                       (Ast_untagged_variants.block_type_can_be_undefined
+                          block_type) ->
+                (id, lbl, pat_construct, o)
+              | _ -> x))
+          | _ -> x
+        in
+        t.(lbl.lbl_pos) <- x)
+      lbls;
+    Array.to_list t
+  | _ -> fatal_error "Parmatch.all_record_args"
+
+(* Build argument list when p2 >= p1, where p1 is a simple pattern *)
+let rec simple_match_args p1 p2 =
+  match p2.pat_desc with
+  | Tpat_alias (p2, _, _) -> simple_match_args p1 p2
+  | Tpat_construct (_, _, args) -> args
+  | Tpat_variant (_, Some arg, _) -> [arg]
+  | Tpat_tuple args -> args
+  | Tpat_record (args, _) -> extract_fields (record_arg p1) args
+  | Tpat_array args -> args
+  | Tpat_any | Tpat_var _ -> (
+    match p1.pat_desc with
+    | Tpat_construct (_, _, args) -> omega_list args
+    | Tpat_variant (_, Some _, _) -> [omega]
+    | Tpat_tuple args -> omega_list args
+    | Tpat_record (args, _) -> omega_list args
+    | Tpat_array args -> omega_list args
+    | _ -> [])
+  | _ -> []
+
+(*
+  Normalize a pattern ->
+   all arguments are omega (simple pattern) and no more variables
+*)
+
+let rec normalize_pat q =
+  match q.pat_desc with
+  | Tpat_any | Tpat_constant _ -> q
+  | Tpat_var _ -> make_pat Tpat_any q.pat_type q.pat_env
+  | Tpat_alias (p, _, _) -> normalize_pat p
+  | Tpat_tuple args ->
+    make_pat (Tpat_tuple (omega_list args)) q.pat_type q.pat_env
+  | Tpat_construct (lid, c, args) ->
+    make_pat (Tpat_construct (lid, c, omega_list args)) q.pat_type q.pat_env
+  | Tpat_variant (l, arg, row) ->
+    make_pat
+      (Tpat_variant (l, may_map (fun _ -> omega) arg, row))
+      q.pat_type q.pat_env
+  | Tpat_array args ->
+    make_pat (Tpat_array (omega_list args)) q.pat_type q.pat_env
+  | Tpat_record (largs, closed) ->
+    make_pat
+      (Tpat_record
+         ( List.map (fun (lid, lbl, _, opt) -> (lid, lbl, omega, opt)) largs,
+           closed ))
+      q.pat_type q.pat_env
+  | Tpat_or _ -> fatal_error "Parmatch.normalize_pat"
+
+(*
+  Build normalized (cf. supra) discriminating pattern,
+  in the non-data type case
+*)
+
+let discr_pat q pss =
+  let rec acc_pat acc pss =
+    match pss with
+    | ({pat_desc = Tpat_alias (p, _, _)} :: ps) :: pss ->
+      acc_pat acc ((p :: ps) :: pss)
+    | ({pat_desc = Tpat_or (p1, p2, _)} :: ps) :: pss ->
+      acc_pat acc ((p1 :: ps) :: (p2 :: ps) :: pss)
+    | ({pat_desc = Tpat_any | Tpat_var _} :: _) :: pss -> acc_pat acc pss
+    | (({pat_desc = Tpat_tuple _} as p) :: _) :: _ -> normalize_pat p
+    | (({pat_desc = Tpat_record (largs, closed)} as p) :: _) :: pss ->
+      let new_omegas =
+        List.fold_right
+          (fun (lid, lbl, _, opt) r ->
+            try
+              let _ = get_field lbl.lbl_pos r in
+              r
+            with Not_found -> (lid, lbl, omega, opt) :: r)
+          largs (record_arg acc)
+      in
+      acc_pat
+        (make_pat (Tpat_record (new_omegas, closed)) p.pat_type p.pat_env)
+        pss
+    | _ -> acc
+  in
+
+  match normalize_pat q with
+  | {pat_desc = Tpat_any | Tpat_record _} as q -> acc_pat q pss
+  | q -> q
+
+(*
+   In case a matching value is found, set actual arguments
+   of the matching pattern.
+*)
+
+let rec read_args xs r =
+  match (xs, r) with
+  | [], _ -> ([], r)
+  | _ :: xs, arg :: rest ->
+    let args, rest = read_args xs rest in
+    (arg :: args, rest)
+  | _, _ -> fatal_error "Parmatch.read_args"
+
+let do_set_args erase_mutable q r =
+  match q with
+  | {pat_desc = Tpat_tuple omegas} ->
+    let args, rest = read_args omegas r in
+    make_pat (Tpat_tuple args) q.pat_type q.pat_env :: rest
+  | {pat_desc = Tpat_record (omegas, closed)} ->
+    let args, rest = read_args omegas r in
+    make_pat
+      (Tpat_record
+         ( List.map2
+             (fun (lid, lbl, _, opt) arg ->
+               if
+                 erase_mutable
+                 &&
+                 match lbl.lbl_mut with
+                 | Mutable -> true
+                 | Immutable -> false
+               then (lid, lbl, omega, opt)
+               else (lid, lbl, arg, opt))
+             omegas args,
+           closed ))
+      q.pat_type q.pat_env
+    :: rest
+  | {pat_desc = Tpat_construct (lid, c, omegas)} ->
+    let args, rest = read_args omegas r in
+    make_pat (Tpat_construct (lid, c, args)) q.pat_type q.pat_env :: rest
+  | {pat_desc = Tpat_variant (l, omega, row)} ->
+    let arg, rest =
+      match (omega, r) with
+      | Some _, a :: r -> (Some a, r)
+      | None, r -> (None, r)
+      | _ -> assert false
+    in
+    make_pat (Tpat_variant (l, arg, row)) q.pat_type q.pat_env :: rest
+  | {pat_desc = Tpat_array omegas} ->
+    let args, rest = read_args omegas r in
+    make_pat (Tpat_array args) q.pat_type q.pat_env :: rest
+  | {pat_desc = Tpat_constant _ | Tpat_any} ->
+    q :: r (* case any is used in matching.ml *)
+  | _ -> fatal_error "Parmatch.set_args"
+
+let set_args q r = do_set_args false q r
+
+and set_args_erase_mutable q r = do_set_args true q r
+
+(* filter pss according to pattern q *)
+let filter_one q pss =
+  let rec filter_rec = function
+    | ({pat_desc = Tpat_alias (p, _, _)} :: ps) :: pss ->
+      filter_rec ((p :: ps) :: pss)
+    | ({pat_desc = Tpat_or (p1, p2, _)} :: ps) :: pss ->
+      filter_rec ((p1 :: ps) :: (p2 :: ps) :: pss)
+    | (p :: ps) :: pss ->
+      if simple_match q p then (simple_match_args q p @ ps) :: filter_rec pss
+      else filter_rec pss
+    | _ -> []
+  in
+  filter_rec pss
+
+(*
+  Filter pss in the ``extra case''. This applies :
+  - According to an extra constructor (datatype case, non-complete signature).
+  - According to anything (all-variables case).
+*)
+let filter_extra pss =
+  let rec filter_rec = function
+    | ({pat_desc = Tpat_alias (p, _, _)} :: ps) :: pss ->
+      filter_rec ((p :: ps) :: pss)
+    | ({pat_desc = Tpat_or (p1, p2, _)} :: ps) :: pss ->
+      filter_rec ((p1 :: ps) :: (p2 :: ps) :: pss)
+    | ({pat_desc = Tpat_any | Tpat_var _} :: qs) :: pss -> qs :: filter_rec pss
+    | _ :: pss -> filter_rec pss
+    | [] -> []
+  in
+  filter_rec pss
+
+(*
+  Pattern p0 is the discriminating pattern,
+  returns [(q0,pss0) ; ... ; (qn,pssn)]
+  where the qi's are simple patterns and the pssi's are
+  matched matrices.
+
+  NOTES
+   * (qi,[]) is impossible.
+   * In the case when matching is useless (all-variable case),
+     returns []
+*)
+
+let filter_all pat0 pss =
+  let rec insert q qs env =
+    match env with
+    | [] ->
+      let q0 = normalize_pat q in
+      [(q0, [simple_match_args q0 q @ qs])]
+    | ((q0, pss) as c) :: env ->
+      if simple_match q0 q then
+        (q0, (simple_match_args q0 q @ qs) :: pss) :: env
+      else c :: insert q qs env
+  in
+
+  let rec filter_rec env = function
+    | ({pat_desc = Tpat_alias (p, _, _)} :: ps) :: pss ->
+      filter_rec env ((p :: ps) :: pss)
+    | ({pat_desc = Tpat_or (p1, p2, _)} :: ps) :: pss ->
+      filter_rec env ((p1 :: ps) :: (p2 :: ps) :: pss)
+    | ({pat_desc = Tpat_any | Tpat_var _} :: _) :: pss -> filter_rec env pss
+    | (p :: ps) :: pss -> filter_rec (insert p ps env) pss
+    | _ -> env
+  and filter_omega env = function
+    | ({pat_desc = Tpat_alias (p, _, _)} :: ps) :: pss ->
+      filter_omega env ((p :: ps) :: pss)
+    | ({pat_desc = Tpat_or (p1, p2, _)} :: ps) :: pss ->
+      filter_omega env ((p1 :: ps) :: (p2 :: ps) :: pss)
+    | ({pat_desc = Tpat_any | Tpat_var _} :: ps) :: pss ->
+      filter_omega
+        (List.map
+           (fun (q, qss) -> (q, (simple_match_args q omega @ ps) :: qss))
+           env)
+        pss
+    | _ :: pss -> filter_omega env pss
+    | [] -> env
+  in
+
+  filter_omega
+    (filter_rec
+       (match pat0.pat_desc with
+       | Tpat_record _ | Tpat_tuple _ -> [(pat0, [])]
+       | _ -> [])
+       pss)
+    pss
+
+(* Variant related functions *)
+
+let rec set_last a = function
+  | [] -> []
+  | [_] -> [a]
+  | x :: l -> x :: set_last a l
+
+(* mark constructor lines for failure when they are incomplete *)
+let rec mark_partial = function
+  | ({pat_desc = Tpat_alias (p, _, _)} :: ps) :: pss ->
+    mark_partial ((p :: ps) :: pss)
+  | ({pat_desc = Tpat_or (p1, p2, _)} :: ps) :: pss ->
+    mark_partial ((p1 :: ps) :: (p2 :: ps) :: pss)
+  | ({pat_desc = Tpat_any | Tpat_var _} :: _ as ps) :: pss ->
+    ps :: mark_partial pss
+  | ps :: pss -> set_last zero ps :: mark_partial pss
+  | [] -> []
+
+let close_variant env row =
+  let row = Btype.row_repr row in
+  let nm =
+    List.fold_left
+      (fun nm (_tag, f) ->
+        match Btype.row_field_repr f with
+        | Reither (_, _, false, e) ->
+          (* m=false means that this tag is not explicitly matched *)
+          Btype.set_row_field e Rabsent;
+          None
+        | Rabsent | Reither (_, _, true, _) | Rpresent _ -> nm)
+      row.row_name row.row_fields
+  in
+  if (not row.row_closed) || nm != row.row_name then
+    (* this unification cannot fail *)
+    Ctype.unify env row.row_more
+      (Btype.newgenty
+         (Tvariant
+            {
+              row with
+              row_fields = [];
+              row_more = Btype.newgenvar ();
+              row_closed = true;
+              row_name = nm;
+            }))
+
+let row_of_pat pat =
+  match Ctype.expand_head pat.pat_env pat.pat_type with
+  | {desc = Tvariant row} -> Btype.row_repr row
+  | _ -> assert false
+
+(*
+  Check whether the first column of env makes up a complete signature or
+  not.
+*)
+
+let full_match closing env =
+  match env with
+  | ({pat_desc = Tpat_construct (_, c, _)}, _) :: _ ->
+    if c.cstr_consts < 0 then false (* extensions *)
+    else List.length env = c.cstr_consts + c.cstr_nonconsts
+  | (({pat_desc = Tpat_variant _} as p), _) :: _ ->
+    let fields =
+      List.map
+        (function
+          | {pat_desc = Tpat_variant (tag, _, _)}, _ -> tag
+          | _ -> assert false)
+        env
+    in
+    let row = row_of_pat p in
+    if closing && not (Btype.row_fixed row) then
+      (* closing=true, we are considering the variant as closed *)
+      List.for_all
+        (fun (tag, f) ->
+          match Btype.row_field_repr f with
+          | Rabsent | Reither (_, _, false, _) -> true
+          | Reither (_, _, true, _)
+          (* m=true, do not discard matched tags, rather warn *)
+          | Rpresent _ ->
+            List.mem tag fields)
+        row.row_fields
+    else
+      row.row_closed
+      && List.for_all
+           (fun (tag, f) ->
+             Btype.row_field_repr f = Rabsent || List.mem tag fields)
+           row.row_fields
+  | ({pat_desc = Tpat_constant _}, _) :: _ -> false
+  | ({pat_desc = Tpat_tuple _}, _) :: _ -> true
+  | ({pat_desc = Tpat_record _}, _) :: _ -> true
+  | ({pat_desc = Tpat_array _}, _) :: _ -> false
+  | ({pat_desc = Tpat_any | Tpat_var _ | Tpat_alias _ | Tpat_or _}, _) :: _ | []
+    ->
+    assert false
+
+(* Written as a non-fragile matching, PR#7451 originated from a fragile matching below. *)
+let should_extend ext env =
+  match ext with
+  | None -> false
+  | Some ext -> (
+    match env with
+    | [] -> assert false
+    | (p, _) :: _ -> (
+      match p.pat_desc with
+      | Tpat_construct
+          (_, {cstr_tag = Cstr_constant _ | Cstr_block _ | Cstr_unboxed}, _) ->
+        let path = get_type_path p.pat_type p.pat_env in
+        Path.same path ext
+      | Tpat_construct (_, {cstr_tag = Cstr_extension _}, _) -> false
+      | Tpat_constant _ | Tpat_tuple _ | Tpat_variant _ | Tpat_record _
+      | Tpat_array _ ->
+        false
+      | Tpat_any | Tpat_var _ | Tpat_alias _ | Tpat_or _ -> assert false))
+
+module ConstructorTagHashtbl = Hashtbl.Make (struct
+  type t = Types.constructor_tag
+  let hash = Hashtbl.hash
+  let equal = Types.equal_tag
+end)
+
+(* complement constructor tags *)
+let complete_tags nconsts nconstrs tags =
+  let seen_const = Array.make nconsts false
+  and seen_constr = Array.make nconstrs false in
+  List.iter
+    (function
+      | Cstr_constant i -> seen_const.(i) <- true
+      | Cstr_block i -> seen_constr.(i) <- true
+      | _ -> assert false)
+    tags;
+  let r = ConstructorTagHashtbl.create (nconsts + nconstrs) in
+  for i = 0 to nconsts - 1 do
+    if not seen_const.(i) then ConstructorTagHashtbl.add r (Cstr_constant i) ()
+  done;
+  for i = 0 to nconstrs - 1 do
+    if not seen_constr.(i) then ConstructorTagHashtbl.add r (Cstr_block i) ()
+  done;
+  r
+
+(* build a pattern from a constructor list *)
+let pat_of_constr ex_pat cstr =
+  {
+    ex_pat with
+    pat_desc =
+      Tpat_construct
+        ( mknoloc (Longident.Lident "?pat_of_constr?"),
+          cstr,
+          omegas cstr.cstr_arity );
+  }
+
+let orify x y = make_pat (Tpat_or (x, y, None)) x.pat_type x.pat_env
+
+let rec orify_many = function
+  | [] -> assert false
+  | [x] -> x
+  | x :: xs -> orify x (orify_many xs)
+
+let pat_of_constrs ex_pat cstrs =
+  if cstrs = [] then raise Empty
+  else orify_many (List.map (pat_of_constr ex_pat) cstrs)
+
+let pats_of_type ?(always = false) env ty =
+  let ty' = Ctype.expand_head env ty in
+  match ty'.desc with
+  | Tconstr (path, _, _) -> (
+    try
+      match (Env.find_type path env).type_kind with
+      | Type_variant cl
+        when always
+             || List.length cl = 1
+             || List.for_all (fun cd -> cd.Types.cd_res <> None) cl ->
+        let cstrs = fst (Env.find_type_descrs path env) in
+        List.map (pat_of_constr (make_pat Tpat_any ty env)) cstrs
+      | Type_record _ ->
+        let labels = snd (Env.find_type_descrs path env) in
+        let fields =
+          List.map
+            (fun ld ->
+              (mknoloc (Longident.Lident "?pat_of_label?"), ld, omega, false))
+            labels
+        in
+        [make_pat (Tpat_record (fields, Closed)) ty env]
+      | _ -> [omega]
+    with Not_found -> [omega])
+  | Ttuple tl -> [make_pat (Tpat_tuple (omegas (List.length tl))) ty env]
+  | _ -> [omega]
+
+let rec get_variant_constructors env ty =
+  match (Ctype.repr ty).desc with
+  | Tconstr (path, _, _) -> (
+    try
+      match Env.find_type path env with
+      | {type_kind = Type_variant _} -> fst (Env.find_type_descrs path env)
+      | {type_manifest = Some _} ->
+        get_variant_constructors env
+          (Ctype.expand_head_once env (clean_copy ty))
+      | _ -> fatal_error "Parmatch.get_variant_constructors"
+    with Not_found -> fatal_error "Parmatch.get_variant_constructors")
+  | _ -> fatal_error "Parmatch.get_variant_constructors"
+
+(* Sends back a pattern that complements constructor tags all_tag *)
+let complete_constrs p all_tags =
+  let c =
+    match p.pat_desc with
+    | Tpat_construct (_, c, _) -> c
+    | _ -> assert false
+  in
+  let not_tags = complete_tags c.cstr_consts c.cstr_nonconsts all_tags in
+  let constrs = get_variant_constructors p.pat_env c.cstr_res in
+  let others =
+    Ext_list.filter constrs (fun cnstr ->
+        ConstructorTagHashtbl.mem not_tags cnstr.cstr_tag)
+  in
+  let const, nonconst =
+    List.partition (fun cnstr -> cnstr.cstr_arity = 0) others
+  in
+  const @ nonconst
+
+let build_other_constrs env p =
+  match p.pat_desc with
+  | Tpat_construct (_, {cstr_tag = Cstr_constant _ | Cstr_block _}, _) ->
+    let get_tag = function
+      | {pat_desc = Tpat_construct (_, c, _)} -> c.cstr_tag
+      | _ -> fatal_error "Parmatch.get_tag"
+    in
+    let all_tags = List.map (fun (p, _) -> get_tag p) env in
+    pat_of_constrs p (complete_constrs p all_tags)
+  | _ -> extra_pat
+
+(* Auxiliary for build_other *)
+
+let build_other_constant proj make first next p env =
+  let all = List.map (fun (p, _) -> proj p.pat_desc) env in
+  let rec try_const i =
+    if List.mem i all then try_const (next i)
+    else make_pat (make i) p.pat_type p.pat_env
+  in
+  try_const first
+
+(*
+  Builds a pattern that is incompatible with all patterns in
+  in the first column of env
+*)
+
+let some_other_tag = "<some other tag>"
+
+let build_other ext env : Typedtree.pattern =
+  match env with
+  | ({pat_desc = Tpat_construct (lid, {cstr_tag = Cstr_extension _}, _)}, _)
+    :: _ ->
+    (* let c = {c with cstr_name = "*extension*"} in *)
+    (* PR#7330 *)
+    make_pat
+      (Tpat_var (Ident.create "*extension*", {lid with txt = "*extension*"}))
+      Ctype.none Env.empty
+  | (({pat_desc = Tpat_construct _} as p), _) :: _ -> (
+    match ext with
+    | Some ext when Path.same ext (get_type_path p.pat_type p.pat_env) ->
+      extra_pat
+    | _ -> build_other_constrs env p)
+  | (({pat_desc = Tpat_variant (_, _, r)} as p), _) :: _ -> (
+    let tags =
+      List.map
+        (function
+          | {pat_desc = Tpat_variant (tag, _, _)}, _ -> tag
+          | _ -> assert false)
+        env
+    in
+    let row = row_of_pat p in
+    let make_other_pat tag const =
+      let arg = if const then None else Some omega in
+      make_pat (Tpat_variant (tag, arg, r)) p.pat_type p.pat_env
+    in
+    match
+      List.fold_left
+        (fun others (tag, f) ->
+          if List.mem tag tags then others
+          else
+            match Btype.row_field_repr f with
+            | Rabsent (* | Reither _ *) -> others
+            (* This one is called after erasing pattern info *)
+            | Reither (c, _, _, _) -> make_other_pat tag c :: others
+            | Rpresent arg -> make_other_pat tag (arg = None) :: others)
+        [] row.row_fields
+    with
+    | [] -> make_other_pat some_other_tag true
+    | pat :: other_pats ->
+      List.fold_left
+        (fun p_res pat ->
+          make_pat (Tpat_or (pat, p_res, None)) p.pat_type p.pat_env)
+        pat other_pats)
+  | (({pat_desc = Tpat_constant (Const_int _)} as p), _) :: _ ->
+    build_other_constant
+      (function
+        | Tpat_constant (Const_int i) -> i
+        | _ -> assert false)
+      (function
+        | i -> Tpat_constant (Const_int i))
+      0 succ p env
+  | (({pat_desc = Tpat_constant (Const_char _)} as p), _) :: _ ->
+    build_other_constant
+      (function
+        | Tpat_constant (Const_char i) -> i
+        | _ -> assert false)
+      (function
+        | i -> Tpat_constant (Const_char i))
+      0 succ p env
+  | (({pat_desc = Tpat_constant (Const_int32 _)} as p), _) :: _ ->
+    build_other_constant
+      (function
+        | Tpat_constant (Const_int32 i) -> i
+        | _ -> assert false)
+      (function
+        | i -> Tpat_constant (Const_int32 i))
+      0l Int32.succ p env
+  | (({pat_desc = Tpat_constant (Const_int64 _)} as p), _) :: _ ->
+    build_other_constant
+      (function
+        | Tpat_constant (Const_int64 i) -> i
+        | _ -> assert false)
+      (function
+        | i -> Tpat_constant (Const_int64 i))
+      0L Int64.succ p env
+  | (({pat_desc = Tpat_constant (Const_bigint _)} as p), _) :: _ ->
+    build_other_constant
+      (function
+        | Tpat_constant (Const_bigint (sign, i)) ->
+          String.length (Bigint_utils.to_string sign i)
+        | _ -> assert false)
+      (function
+        | i -> Tpat_constant (Const_bigint (true, string_of_int i)))
+      0 succ p env
+  | (({pat_desc = Tpat_constant (Const_string _)} as p), _) :: _ ->
+    build_other_constant
+      (function
+        | Tpat_constant (Const_string (s, _)) -> String.length s
+        | _ -> assert false)
+      (function
+        | i -> Tpat_constant (Const_string (String.make i '*', None)))
+      0 succ p env
+  | (({pat_desc = Tpat_constant (Const_float _)} as p), _) :: _ ->
+    build_other_constant
+      (function
+        | Tpat_constant (Const_float f) -> float_of_string f
+        | _ -> assert false)
+      (function
+        | f -> Tpat_constant (Const_float (string_of_float f)))
+      0.0
+      (fun f -> f +. 1.0)
+      p env
+  | (({pat_desc = Tpat_array _} as p), _) :: _ ->
+    let all_lengths =
+      List.map
+        (fun (p, _) ->
+          match p.pat_desc with
+          | Tpat_array args -> List.length args
+          | _ -> assert false)
+        env
+    in
+    let rec try_arrays l =
+      if List.mem l all_lengths then try_arrays (l + 1)
+      else make_pat (Tpat_array (omegas l)) p.pat_type p.pat_env
+    in
+    try_arrays 0
+  | [] -> omega
+  | _ -> omega
+
+(*
+  Core function :
+  Is the last row of pattern matrix pss + qs satisfiable ?
+  That is :
+    Does there exists at least one value vector, es such that :
+     1- for all ps in pss ps # es (ps and es are not compatible)
+     2- qs <= es                  (es matches qs)
+*)
+
+let rec has_instance p =
+  match p.pat_desc with
+  | Tpat_variant (l, _, r) when is_absent l r -> false
+  | Tpat_any | Tpat_var _ | Tpat_constant _ | Tpat_variant (_, None, _) -> true
+  | Tpat_alias (p, _, _) | Tpat_variant (_, Some p, _) -> has_instance p
+  | Tpat_or (p1, p2, _) -> has_instance p1 || has_instance p2
+  | Tpat_construct (_, _, ps) | Tpat_tuple ps | Tpat_array ps ->
+    has_instances ps
+  | Tpat_record (lps, _) -> has_instances (List.map (fun (_, _, x, _) -> x) lps)
+
+and has_instances = function
+  | [] -> true
+  | q :: rem -> has_instance q && has_instances rem
+
+(*
+   In two places in the following function, we check the coherence of the first
+   column of (pss + qs).
+   If it is incoherent, then we exit early saying that (pss + qs) is not
+   satisfiable (which is equivalent to saying "oh, we shouldn't have considered
+   that branch, no good result came come from here").
+
+   But what happens if we have a coherent but ill-typed column?
+   - we might end up returning [false], which is equivalent to noticing the
+   incompatibility: clearly this is fine.
+   - if we end up returning [true] then we're saying that [qs] is useful while
+   it is not. This is sad but not the end of the world, we're just allowing dead
+   code to survive.
+*)
+let rec satisfiable pss qs =
+  match pss with
+  | [] -> has_instances qs
+  | _ -> (
+    match qs with
+    | [] -> false
+    | {pat_desc = Tpat_or (q1, q2, _)} :: qs ->
+      satisfiable pss (q1 :: qs) || satisfiable pss (q2 :: qs)
+    | {pat_desc = Tpat_alias (q, _, _)} :: qs -> satisfiable pss (q :: qs)
+    | {pat_desc = Tpat_any | Tpat_var _} :: qs -> (
+      if not (all_coherent (simplified_first_col pss)) then false
+      else
+        let q0 = discr_pat omega pss in
+        match filter_all q0 pss with
+        (* first column of pss is made of variables only *)
+        | [] -> satisfiable (filter_extra pss) qs
+        | constrs ->
+          if full_match false constrs then
+            List.exists
+              (fun (p, pss) ->
+                (not (is_absent_pat p))
+                && satisfiable pss (simple_match_args p omega @ qs))
+              constrs
+          else satisfiable (filter_extra pss) qs)
+    | {pat_desc = Tpat_variant (l, _, r)} :: _ when is_absent l r -> false
+    | q :: qs ->
+      if not (all_coherent (q :: simplified_first_col pss)) then false
+      else
+        let q0 = discr_pat q pss in
+        satisfiable (filter_one q0 pss) (simple_match_args q0 q @ qs))
+
+(* Also return the remaining cases, to enable GADT handling
+
+   For considerations regarding the coherence check, see the comment on
+   [satisfiable] above. *)
+let rec satisfiables pss qs =
+  match pss with
+  | [] -> if has_instances qs then [qs] else []
+  | _ -> (
+    match qs with
+    | [] -> []
+    | {pat_desc = Tpat_or (q1, q2, _)} :: qs ->
+      satisfiables pss (q1 :: qs) @ satisfiables pss (q2 :: qs)
+    | {pat_desc = Tpat_alias (q, _, _)} :: qs -> satisfiables pss (q :: qs)
+    | {pat_desc = Tpat_any | Tpat_var _} :: qs -> (
+      if not (all_coherent (simplified_first_col pss)) then []
+      else
+        let q0 = discr_pat omega pss in
+        let wild p =
+          List.map (fun qs -> p :: qs) (satisfiables (filter_extra pss) qs)
+        in
+        match filter_all q0 pss with
+        (* first column of pss is made of variables only *)
+        | [] -> wild omega
+        | (p, _) :: _ as constrs -> (
+          let for_constrs () =
+            List.flatten
+              (List.map
+                 (fun (p, pss) ->
+                   if is_absent_pat p then []
+                   else
+                     List.map (set_args p)
+                       (satisfiables pss (simple_match_args p omega @ qs)))
+                 constrs)
+          in
+          if full_match false constrs then for_constrs ()
+          else
+            match p.pat_desc with
+            | Tpat_construct _ ->
+              (* activate this code for checking non-gadt constructors *)
+              wild (build_other_constrs constrs p) @ for_constrs ()
+            | _ -> wild omega))
+    | {pat_desc = Tpat_variant (l, _, r)} :: _ when is_absent l r -> []
+    | q :: qs ->
+      if not (all_coherent (q :: simplified_first_col pss)) then []
+      else
+        let q0 = discr_pat q pss in
+        List.map (set_args q0)
+          (satisfiables (filter_one q0 pss) (simple_match_args q0 q @ qs)))
+
+(*
+  Now another satisfiable function that additionally
+  supplies an example of a matching value.
+
+  This function should be called for exhaustiveness check only.
+*)
+
+type 'a result =
+  | Rnone (* No matching value *)
+  | Rsome of 'a (* This matching value *)
+
+(*
+let rec try_many  f = function
+  | [] -> Rnone
+  | (p,pss)::rest ->
+      match f (p,pss) with
+      | Rnone -> try_many  f rest
+      | r -> r
+*)
+
+let rappend r1 r2 =
+  match (r1, r2) with
+  | Rnone, _ -> r2
+  | _, Rnone -> r1
+  | Rsome l1, Rsome l2 -> Rsome (l1 @ l2)
+
+let rec try_many_gadt f = function
+  | [] -> Rnone
+  | (p, pss) :: rest -> rappend (f (p, pss)) (try_many_gadt f rest)
+
+(*
+let rec exhaust ext pss n = match pss with
+| []    ->  Rsome (omegas n)
+| []::_ ->  Rnone
+| pss   ->
+    let q0 = discr_pat omega pss in
+    begin match filter_all q0 pss with
+          (* first column of pss is made of variables only *)
+    | [] ->
+        begin match exhaust ext (filter_extra pss) (n-1) with
+        | Rsome r -> Rsome (q0::r)
+        | r -> r
+      end
+    | constrs ->
+        let try_non_omega (p,pss) =
+          if is_absent_pat p then
+            Rnone
+          else
+            match
+              exhaust
+                ext pss (List.length (simple_match_args p omega) + n - 1)
+            with
+            | Rsome r -> Rsome (set_args p r)
+            | r       -> r in
+        if
+          full_match true false constrs && not (should_extend ext constrs)
+        then
+          try_many try_non_omega constrs
+        else
+          (*
+             D = filter_extra pss is the default matrix
+             as it is included in pss, one can avoid
+             recursive calls on specialized matrices,
+             Essentially :
+             * D exhaustive => pss exhaustive
+             * D non-exhaustive => we have a non-filtered value
+          *)
+          let r =  exhaust ext (filter_extra pss) (n-1) in
+          match r with
+          | Rnone -> Rnone
+          | Rsome r ->
+              try
+                Rsome (build_other ext constrs::r)
+              with
+      (* cannot occur, since constructors don't make a full signature *)
+              | Empty -> fatal_error "Parmatch.exhaust"
+    end
+
+let combinations f lst lst' =
+  let rec iter2 x =
+    function
+        [] -> []
+      | y :: ys ->
+          f x y :: iter2 x ys
+  in
+  let rec iter =
+    function
+        [] -> []
+      | x :: xs -> iter2 x lst' @ iter xs
+  in
+  iter lst
+*)
+(*
+let print_pat pat =
+  let rec string_of_pat pat =
+    match pat.pat_desc with
+        Tpat_var _ -> "v"
+      | Tpat_any -> "_"
+      | Tpat_alias (p, x) -> Printf.sprintf "(%s) as ?"  (string_of_pat p)
+      | Tpat_constant n -> "0"
+      | Tpat_construct (_, lid, _) ->
+        Printf.sprintf "%s" (String.concat "." (Longident.flatten lid.txt))
+      | Tpat_lazy p ->
+        Printf.sprintf "(lazy %s)" (string_of_pat p)
+      | Tpat_or (p1,p2,_) ->
+        Printf.sprintf "(%s | %s)" (string_of_pat p1) (string_of_pat p2)
+      | Tpat_tuple list ->
+        Printf.sprintf "(%s)" (String.concat "," (List.map string_of_pat list))
+      | Tpat_variant (_, _, _) -> "variant"
+      | Tpat_record (_, _) -> "record"
+      | Tpat_array _ -> "array"
+  in
+  Printf.fprintf stderr "PAT[%s]\n%!" (string_of_pat pat)
+*)
+
+(* strictly more powerful than exhaust; however, exhaust
+   was kept for backwards compatibility *)
+
+(* Limit to prevent exponential blowup in exhaustiveness checking.
+   When the limit is exceeded, we conservatively report the pattern as
+   non-exhaustive (Rnone) which may cause false warnings but prevents hangs. *)
+let exhaust_gadt_limit = 1000
+
+let rec exhaust_gadt_aux count (ext : Path.t option) pss n =
+  (* Bail out if we've done too many recursive calls to prevent exponential blowup *)
+  if !count > exhaust_gadt_limit then Rnone
+  else (
+    incr count;
+    match pss with
+    | [] -> Rsome [omegas n]
+    | [] :: _ -> Rnone
+    | pss -> (
+      if not (all_coherent (simplified_first_col pss)) then
+        (* We're considering an ill-typed branch, we won't actually be able to
+         produce a well typed value taking that branch. *)
+        Rnone
+      else
+        (* Assuming the first column is ill-typed but considered coherent, we
+         might end up producing an ill-typed witness of non-exhaustivity
+         corresponding to the current branch.
+
+         If [exhaust] has been called by [do_check_partial], then the witnesses
+         produced get typechecked and the ill-typed ones are discarded.
+
+         If [exhaust] has been called by [do_check_fragile], then it is possible
+         we might fail to warn the user that the matching is fragile. See for
+         example testsuite/tests/warnings/w04_failure.ml. *)
+        let q0 = discr_pat omega pss in
+        match filter_all q0 pss with
+        (* first column of pss is made of variables only *)
+        | [] -> (
+          match exhaust_gadt_aux count ext (filter_extra pss) (n - 1) with
+          | Rsome r -> Rsome (List.map (fun row -> q0 :: row) r)
+          | r -> r)
+        | constrs -> (
+          let try_non_omega (p, pss) =
+            if is_absent_pat p then Rnone
+            else
+              match
+                exhaust_gadt_aux count ext pss
+                  (List.length (simple_match_args p omega) + n - 1)
+              with
+              | Rsome r -> Rsome (List.map (fun row -> set_args p row) r)
+              | r -> r
+          in
+          let before = try_many_gadt try_non_omega constrs in
+          if full_match false constrs && not (should_extend ext constrs) then
+            before
+          else
+            (*
+              D = filter_extra pss is the default matrix
+              as it is included in pss, one can avoid
+              recursive calls on specialized matrices,
+              Essentially :
+            * D exhaustive => pss exhaustive
+            * D non-exhaustive => we have a non-filtered value
+            *)
+            let r = exhaust_gadt_aux count ext (filter_extra pss) (n - 1) in
+            match r with
+            | Rnone -> before
+            | Rsome r -> (
+              try
+                let p = build_other ext constrs in
+                let dug = List.map (fun tail -> p :: tail) r in
+                match before with
+                | Rnone -> Rsome dug
+                | Rsome x -> Rsome (x @ dug)
+              with
+              (* cannot occur, since constructors don't make a full signature *)
+              | Empty ->
+                fatal_error "Parmatch.exhaust"))))
+
+let exhaust_gadt ext pss n =
+  let count = ref 0 in
+  let ret = exhaust_gadt_aux count ext pss n in
+  match ret with
+  | Rnone -> Rnone
+  | Rsome lst ->
+    (* The following line is needed to compile stdlib/printf.ml *)
+    if lst = [] then Rsome (omegas n)
+    else
+      let singletons =
+        List.map
+          (function
+            | [x] -> x
+            | _ -> assert false)
+          lst
+      in
+      Rsome [orify_many singletons]
+
+(*
+   Another exhaustiveness check, enforcing variant typing.
+   Note that it does not check exact exhaustiveness, but whether a
+   matching could be made exhaustive by closing all variant types.
+   When this is true of all other columns, the current column is left
+   open (even if it means that the whole matching is not exhaustive as
+   a result).
+   When this is false for the matrix minus the current column, and the
+   current column is composed of variant tags, we close the variant
+   (even if it doesn't help in making the matching exhaustive).
+*)
+
+let rec pressure_variants tdefs = function
+  | [] -> false
+  | [] :: _ -> true
+  | pss -> (
+    if not (all_coherent (simplified_first_col pss)) then true
+    else
+      let q0 = discr_pat omega pss in
+      match filter_all q0 pss with
+      | [] -> pressure_variants tdefs (filter_extra pss)
+      | constrs ->
+        let rec try_non_omega = function
+          | (_p, pss) :: rem ->
+            let ok = pressure_variants tdefs pss in
+            try_non_omega rem && ok
+          | [] -> true
+        in
+        if full_match (tdefs = None) constrs then try_non_omega constrs
+        else if tdefs = None then pressure_variants None (filter_extra pss)
+        else
+          let full = full_match true constrs in
+          let ok =
+            if full then try_non_omega constrs
+            else try_non_omega (filter_all q0 (mark_partial pss))
+          in
+          (match (constrs, tdefs) with
+          | (({pat_desc = Tpat_variant _} as p), _) :: _, Some env ->
+            let row = row_of_pat p in
+            if Btype.row_fixed row || pressure_variants None (filter_extra pss)
+            then ()
+            else close_variant env row
+          | _ -> ());
+          ok)
+
+(* Yet another satisfiable function *)
+
+(*
+   This time every_satisfiable pss qs checks the
+   utility of every expansion of qs.
+   Expansion means expansion of or-patterns inside qs
+*)
+
+type answer =
+  | Used (* Useful pattern *)
+  | Unused (* Useless pattern *)
+  | Upartial of Typedtree.pattern list (* Mixed, with list of useless ones *)
+
+(* this row type enable column processing inside the matrix
+    - left  ->  elements not to be processed,
+    - right ->  elements to be processed
+*)
+type 'a row = {no_ors: 'a list; ors: 'a list; active: 'a list}
+
+(*
+let pretty_row {ors=ors ; no_ors=no_ors; active=active} =
+  pretty_line ors ; prerr_string " *" ;
+  pretty_line no_ors ; prerr_string " *" ;
+  pretty_line active
+
+let pretty_rows rs =
+  prerr_endline "begin matrix" ;
+  List.iter
+    (fun r ->
+      pretty_row r ;
+      prerr_endline "")
+    rs ;
+  prerr_endline "end matrix"
+*)
+
+(* Initial build *)
+let make_row ps = {ors = []; no_ors = []; active = ps}
+
+let make_rows pss = List.map make_row pss
+
+(* Useful to detect and expand  or pats inside as pats *)
+let rec unalias p =
+  match p.pat_desc with
+  | Tpat_alias (p, _, _) -> unalias p
+  | _ -> p
+
+let is_var p =
+  match (unalias p).pat_desc with
+  | Tpat_any | Tpat_var _ -> true
+  | _ -> false
+
+let is_var_column rs =
+  List.for_all
+    (fun r ->
+      match r.active with
+      | p :: _ -> is_var p
+      | [] -> assert false)
+    rs
+
+(* Standard or-args for left-to-right matching *)
+let rec or_args p =
+  match p.pat_desc with
+  | Tpat_or (p1, p2, _) -> (p1, p2)
+  | Tpat_alias (p, _, _) -> or_args p
+  | _ -> assert false
+
+(* Just remove current column *)
+let remove r =
+  match r.active with
+  | _ :: rem -> {r with active = rem}
+  | [] -> assert false
+
+let remove_column rs = List.map remove rs
+
+(* Current column has been processed *)
+let push_no_or r =
+  match r.active with
+  | p :: rem -> {r with no_ors = p :: r.no_ors; active = rem}
+  | [] -> assert false
+
+let push_or r =
+  match r.active with
+  | p :: rem -> {r with ors = p :: r.ors; active = rem}
+  | [] -> assert false
+
+let push_or_column rs = List.map push_or rs
+
+and push_no_or_column rs = List.map push_no_or rs
+
+(* Those are adaptations of the previous homonymous functions that
+   work on the current column, instead of the first column
+*)
+
+let discr_pat q rs = discr_pat q (List.map (fun r -> r.active) rs)
+
+let filter_one q rs =
+  let rec filter_rec rs =
+    match rs with
+    | [] -> []
+    | r :: rem -> (
+      match r.active with
+      | [] -> assert false
+      | {pat_desc = Tpat_alias (p, _, _)} :: ps ->
+        filter_rec ({r with active = p :: ps} :: rem)
+      | {pat_desc = Tpat_or (p1, p2, _)} :: ps ->
+        filter_rec
+          ({r with active = p1 :: ps} :: {r with active = p2 :: ps} :: rem)
+      | p :: ps ->
+        if simple_match q p then
+          {r with active = simple_match_args q p @ ps} :: filter_rec rem
+        else filter_rec rem)
+  in
+  filter_rec rs
+
+(* Back to normal matrices *)
+let make_vector r = List.rev r.no_ors
+
+let make_matrix rs = List.map make_vector rs
+
+(* Standard union on answers *)
+let union_res r1 r2 =
+  match (r1, r2) with
+  | Unused, _ | _, Unused -> Unused
+  | Used, _ -> r2
+  | _, Used -> r1
+  | Upartial u1, Upartial u2 -> Upartial (u1 @ u2)
+
+(* propose or pats for expansion *)
+let extract_elements qs =
+  let rec do_rec seen = function
+    | [] -> []
+    | q :: rem ->
+      {no_ors = List.rev_append seen rem @ qs.no_ors; ors = []; active = [q]}
+      :: do_rec (q :: seen) rem
+  in
+  do_rec [] qs.ors
+
+(* idem for matrices *)
+let transpose rs =
+  match rs with
+  | [] -> assert false
+  | r :: rem ->
+    let i = List.map (fun x -> [x]) r in
+    List.fold_left (List.map2 (fun r x -> x :: r)) i rem
+
+let extract_columns pss qs =
+  match pss with
+  | [] -> List.map (fun _ -> []) qs.ors
+  | _ ->
+    let rows = List.map extract_elements pss in
+    transpose rows
+
+(* Core function
+   The idea is to first look for or patterns (recursive case), then
+   check or-patterns argument usefulness (terminal case)
+*)
+let rec simplified_first_usefulness_col = function
+  | [] -> []
+  | row :: rows -> (
+    match row.active with
+    | [] -> assert false (* the rows are non-empty! *)
+    | p :: _ -> simplify_head_pat p (simplified_first_usefulness_col rows))
+
+let rec every_satisfiables pss qs =
+  match qs.active with
+  | [] -> (
+    (* qs is now partitionned,  check usefulness *)
+    match qs.ors with
+    | [] ->
+      (* no or-patterns *)
+      if satisfiable (make_matrix pss) (make_vector qs) then Used else Unused
+    | _ ->
+      (* n or-patterns -> 2n expansions *)
+      List.fold_right2
+        (fun pss qs r ->
+          match r with
+          | Unused -> Unused
+          | _ -> (
+            match qs.active with
+            | [q] ->
+              let q1, q2 = or_args q in
+              let r_loc = every_both pss qs q1 q2 in
+              union_res r r_loc
+            | _ -> assert false))
+        (extract_columns pss qs) (extract_elements qs) Used)
+  | q :: rem -> (
+    let uq = unalias q in
+    match uq.pat_desc with
+    | Tpat_any | Tpat_var _ ->
+      if is_var_column pss then
+        (* forget about ``all-variable''  columns now *)
+        every_satisfiables (remove_column pss) (remove qs)
+      else
+        (* otherwise this is direct food for satisfiable *)
+        every_satisfiables (push_no_or_column pss) (push_no_or qs)
+    | Tpat_or (q1, q2, _) ->
+      if q1.pat_loc.Location.loc_ghost && q2.pat_loc.Location.loc_ghost then
+        (* syntactically generated or-pats should not be expanded *)
+        every_satisfiables (push_no_or_column pss) (push_no_or qs)
+      else
+        (* this is a real or-pattern *)
+        every_satisfiables (push_or_column pss) (push_or qs)
+    | Tpat_variant (l, _, r) when is_absent l r ->
+      (* Ah Jacques... *)
+      Unused
+    | _ ->
+      (* standard case, filter matrix *)
+      (* The handling of incoherent matrices is kept in line with
+                [satisfiable] *)
+      if not (all_coherent (uq :: simplified_first_usefulness_col pss)) then
+        Unused
+      else
+        let q0 = discr_pat q pss in
+        every_satisfiables (filter_one q0 pss)
+          {qs with active = simple_match_args q0 q @ rem})
+
+(*
+  This function ``every_both'' performs the usefulness check
+  of or-pat q1|q2.
+  The trick is to call every_satisfied twice with
+  current active columns restricted to q1 and q2,
+  That way,
+  - others orpats in qs.ors will not get expanded.
+  - all matching work performed on qs.no_ors is not performed again.
+  *)
+and every_both pss qs q1 q2 =
+  let qs1 = {qs with active = [q1]} and qs2 = {qs with active = [q2]} in
+  let r1 = every_satisfiables pss qs1
+  and r2 = every_satisfiables (if compat q1 q2 then qs1 :: pss else pss) qs2 in
+  match r1 with
+  | Unused -> (
+    match r2 with
+    | Unused -> Unused
+    | Used -> Upartial [q1]
+    | Upartial u2 -> Upartial (q1 :: u2))
+  | Used -> (
+    match r2 with
+    | Unused -> Upartial [q2]
+    | _ -> r2)
+  | Upartial u1 -> (
+    match r2 with
+    | Unused -> Upartial (u1 @ [q2])
+    | Used -> r1
+    | Upartial u2 -> Upartial (u1 @ u2))
+
+(* le_pat p q  means, forall V,  V matches q implies V matches p *)
+let rec le_pat p q =
+  match (p.pat_desc, q.pat_desc) with
+  | (Tpat_var _ | Tpat_any), _ -> true
+  | Tpat_alias (p, _, _), _ -> le_pat p q
+  | _, Tpat_alias (q, _, _) -> le_pat p q
+  | Tpat_constant c1, Tpat_constant c2 -> const_compare c1 c2 = 0
+  | Tpat_construct (_, c1, ps), Tpat_construct (_, c2, qs) ->
+    Types.equal_tag c1.cstr_tag c2.cstr_tag && le_pats ps qs
+  | Tpat_variant (l1, Some p1, _), Tpat_variant (l2, Some p2, _) ->
+    l1 = l2 && le_pat p1 p2
+  | Tpat_variant (l1, None, _r1), Tpat_variant (l2, None, _) -> l1 = l2
+  | Tpat_variant (_, _, _), Tpat_variant (_, _, _) -> false
+  | Tpat_tuple ps, Tpat_tuple qs -> le_pats ps qs
+  | Tpat_record (l1, _), Tpat_record (l2, _) ->
+    let ps, qs = records_args l1 l2 in
+    le_pats ps qs
+  | Tpat_array ps, Tpat_array qs -> Ext_list.same_length ps qs && le_pats ps qs
+  (* In all other cases, enumeration is performed *)
+  | _, _ -> not (satisfiable [[p]] [q])
+
+and le_pats ps qs =
+  match (ps, qs) with
+  | p :: ps, q :: qs -> le_pat p q && le_pats ps qs
+  | _, _ -> true
+
+let get_mins le ps =
+  let rec select_rec r = function
+    | [] -> r
+    | p :: ps ->
+      if List.exists (fun p0 -> le p0 p) ps then select_rec r ps
+      else select_rec (p :: r) ps
+  in
+  select_rec [] (select_rec [] ps)
+
+(*
+  lub p q is a pattern that matches all values matched by p and q
+  may raise Empty, when p and q are not compatible
+*)
+
+let rec lub p q =
+  match (p.pat_desc, q.pat_desc) with
+  | Tpat_alias (p, _, _), _ -> lub p q
+  | _, Tpat_alias (q, _, _) -> lub p q
+  | (Tpat_any | Tpat_var _), _ -> q
+  | _, (Tpat_any | Tpat_var _) -> p
+  | Tpat_or (p1, p2, _), _ -> orlub p1 p2 q
+  | _, Tpat_or (q1, q2, _) -> orlub q1 q2 p (* Thanks god, lub is commutative *)
+  | Tpat_constant c1, Tpat_constant c2 when const_compare c1 c2 = 0 -> p
+  | Tpat_tuple ps, Tpat_tuple qs ->
+    let rs = lubs ps qs in
+    make_pat (Tpat_tuple rs) p.pat_type p.pat_env
+  | Tpat_construct (lid, c1, ps1), Tpat_construct (_, c2, ps2)
+    when Types.equal_tag c1.cstr_tag c2.cstr_tag ->
+    let rs = lubs ps1 ps2 in
+    make_pat (Tpat_construct (lid, c1, rs)) p.pat_type p.pat_env
+  | Tpat_variant (l1, Some p1, row), Tpat_variant (l2, Some p2, _) when l1 = l2
+    ->
+    let r = lub p1 p2 in
+    make_pat (Tpat_variant (l1, Some r, row)) p.pat_type p.pat_env
+  | Tpat_variant (l1, None, _row), Tpat_variant (l2, None, _) when l1 = l2 -> p
+  | Tpat_record (l1, closed), Tpat_record (l2, _) ->
+    let rs = record_lubs l1 l2 in
+    make_pat (Tpat_record (rs, closed)) p.pat_type p.pat_env
+  | Tpat_array ps, Tpat_array qs when List.length ps = List.length qs ->
+    let rs = lubs ps qs in
+    make_pat (Tpat_array rs) p.pat_type p.pat_env
+  | _, _ -> raise Empty
+
+and orlub p1 p2 q =
+  try
+    let r1 = lub p1 q in
+    try {q with pat_desc = Tpat_or (r1, lub p2 q, None)} with Empty -> r1
+  with Empty -> lub p2 q
+
+and record_lubs l1 l2 =
+  let rec lub_rec l1 l2 =
+    match (l1, l2) with
+    | [], _ -> l2
+    | _, [] -> l1
+    | (lid1, lbl1, p1, o1) :: rem1, (lid2, lbl2, p2, o2) :: rem2 ->
+      if lbl1.lbl_pos < lbl2.lbl_pos then
+        (lid1, lbl1, p1, o1) :: lub_rec rem1 l2
+      else if lbl2.lbl_pos < lbl1.lbl_pos then
+        (lid2, lbl2, p2, o2) :: lub_rec l1 rem2
+      else
+        let o = if o1 = o2 then o1 else raise Empty in
+        (lid1, lbl1, lub p1 p2, o) :: lub_rec rem1 rem2
+  in
+  lub_rec l1 l2
+
+and lubs ps qs =
+  match (ps, qs) with
+  | p :: ps, q :: qs -> lub p q :: lubs ps qs
+  | _, _ -> []
+
+(******************************)
+(* Exported variant closing   *)
+(******************************)
+
+(* Apply pressure to variants *)
+
+let pressure_variants tdefs patl =
+  let pss = List.map (fun p -> [p; omega]) patl in
+  ignore (pressure_variants (Some tdefs) pss)
+
+(*****************************)
+(* Utilities for diagnostics *)
+(*****************************)
+
+(*
+  Build up a working pattern matrix by forgetting
+  about guarded patterns
+*)
+
+let rec initial_matrix = function
+  | [] -> []
+  | {c_guard = Some _} :: rem -> initial_matrix rem
+  | {c_guard = None; c_lhs = p} :: rem -> [p] :: initial_matrix rem
+
+(******************************************)
+(* Look for a row that matches some value *)
+(******************************************)
+
+(*
+  Useful for seeing if the example of
+  non-matched value can indeed be matched
+  (by a guarded clause)
+*)
+
+exception NoGuard
+
+let rec initial_all no_guard = function
+  | [] -> if no_guard then raise NoGuard else []
+  | {c_lhs = pat; c_guard; _} :: rem ->
+    ([pat], pat.pat_loc) :: initial_all (no_guard && c_guard = None) rem
+
+let rec do_filter_var = function
+  | (_ :: ps, loc) :: rem -> (ps, loc) :: do_filter_var rem
+  | _ -> []
+
+let do_filter_one q pss =
+  let rec filter_rec = function
+    | ({pat_desc = Tpat_alias (p, _, _)} :: ps, loc) :: pss ->
+      filter_rec ((p :: ps, loc) :: pss)
+    | ({pat_desc = Tpat_or (p1, p2, _)} :: ps, loc) :: pss ->
+      filter_rec ((p1 :: ps, loc) :: (p2 :: ps, loc) :: pss)
+    | (p :: ps, loc) :: pss ->
+      if simple_match q p then
+        (simple_match_args q p @ ps, loc) :: filter_rec pss
+      else filter_rec pss
+    | _ -> []
+  in
+  filter_rec pss
+
+let rec do_match pss qs =
+  match qs with
+  | [] -> (
+    match pss with
+    | ([], loc) :: _ -> Some loc
+    | _ -> None)
+  | q :: qs -> (
+    match q with
+    | {pat_desc = Tpat_or (q1, q2, _)} -> (
+      match do_match pss (q1 :: qs) with
+      | None -> do_match pss (q2 :: qs)
+      | r -> r)
+    | {pat_desc = Tpat_any} -> do_match (do_filter_var pss) qs
+    | _ ->
+      let q0 = normalize_pat q in
+      (* [pss] will (or won't) match [q0 :: qs] regardless of the coherence of
+         its first column. *)
+      do_match (do_filter_one q0 pss) (simple_match_args q0 q @ qs))
+
+let check_partial_all v casel =
+  try
+    let pss = initial_all true casel in
+    do_match pss [v]
+  with NoGuard -> None
+
+(************************)
+(* Exhaustiveness check *)
+(************************)
+
+(* conversion from Typedtree.pattern to Parsetree.pattern list *)
+module Conv = struct
+  open Parsetree
+  let mkpat desc = Ast_helper.Pat.mk desc
+
+  let name_counter = ref 0
+  let fresh name =
+    let current = !name_counter in
+    name_counter := !name_counter + 1;
+    "#$" ^ name ^ string_of_int current
+
+  let conv typed =
+    let constrs = Hashtbl.create 7 in
+    let labels = Hashtbl.create 7 in
+    let rec loop pat =
+      match pat.pat_desc with
+      | Tpat_or (pa, pb, _) -> mkpat (Ppat_or (loop pa, loop pb))
+      | Tpat_var (_, ({txt = "*extension*"} as nm)) ->
+        (* PR#7330 *)
+        mkpat (Ppat_var nm)
+      | Tpat_any | Tpat_var _ -> mkpat Ppat_any
+      | Tpat_constant c -> mkpat (Ppat_constant (Untypeast.constant c))
+      | Tpat_alias (p, _, _) -> loop p
+      | Tpat_tuple lst -> mkpat (Ppat_tuple (List.map loop lst))
+      | Tpat_construct (cstr_lid, cstr, lst) ->
+        let id = fresh cstr.cstr_name in
+        let lid = {cstr_lid with txt = Longident.Lident id} in
+        Hashtbl.add constrs id cstr;
+        let arg =
+          match List.map loop lst with
+          | [] -> None
+          | [p] -> Some p
+          | lst -> Some (mkpat (Ppat_tuple lst))
+        in
+        mkpat (Ppat_construct (lid, arg))
+      | Tpat_variant (label, p_opt, _row_desc) ->
+        let arg = Misc.may_map loop p_opt in
+        mkpat (Ppat_variant (label, arg))
+      | Tpat_record (subpatterns, _closed_flag) ->
+        let fields =
+          List.map
+            (fun (_, lbl, p, optional) ->
+              let id = fresh lbl.lbl_name in
+              Hashtbl.add labels id lbl;
+              {lid = mknoloc (Longident.Lident id); x = loop p; opt = optional})
+            subpatterns
+        in
+        mkpat (Ppat_record (fields, Open))
+      | Tpat_array lst -> mkpat (Ppat_array (List.map loop lst))
+    in
+    let ps = loop typed in
+    (ps, constrs, labels)
+end
+
+(* Whether the counter-example contains an extension pattern *)
+let contains_extension pat =
+  let r = ref false in
+  let rec loop = function
+    | {pat_desc = Tpat_var (_, {txt = "*extension*"})} -> r := true
+    | p -> Typedtree.iter_pattern_desc loop p.pat_desc
+  in
+  loop pat;
+  !r
+
+(* Build an untyped or-pattern from its expected type *)
+let ppat_of_type env ty =
+  match pats_of_type env ty with
+  | [{pat_desc = Tpat_any}] ->
+    (Conv.mkpat Parsetree.Ppat_any, Hashtbl.create 0, Hashtbl.create 0)
+  | pats -> Conv.conv (orify_many pats)
+
+let do_check_partial ?partial_match_warning_hint ?pred exhaust loc casel pss =
+  match pss with
+  | [] ->
+    (*
+          This can occur
+          - For empty matches generated by ocamlp4 (no warning)
+          - when all patterns have guards (then, casel <> [])
+          (specific warning)
+          Then match MUST be considered non-exhaustive,
+          otherwise compilation of PM is broken.
+          *)
+    (match casel with
+    | [] -> ()
+    | _ ->
+      if Warnings.is_active Warnings.All_clauses_guarded then
+        Location.prerr_warning loc Warnings.All_clauses_guarded);
+    Partial
+  | ps :: _ -> (
+    match exhaust None pss (List.length ps) with
+    | Rnone -> Total
+    | Rsome [u] -> (
+      let v =
+        match pred with
+        | Some pred ->
+          let pattern, constrs, labels = Conv.conv u in
+          let u' = pred constrs labels pattern in
+          (* pretty_pat u;
+             begin match u' with
+               None -> prerr_endline ": impossible"
+             | Some _ -> prerr_endline ": possible"
+             end; *)
+          u'
+        | None -> Some u
+      in
+      match v with
+      | None -> Total
+      | Some v ->
+        (if Warnings.is_active (Warnings.Partial_match "") then
+           let errmsg =
+             try
+               let buf = Buffer.create 16 in
+               Buffer.add_string buf "| ";
+               Buffer.add_string buf (!print_res_pat v);
+               (match check_partial_all v casel with
+               | None -> ()
+               | Some _ ->
+                 (* This is 'Some loc', where loc is the location of
+                    a possibly matching clause.
+                    Forget about loc, because printing two locations
+                    is a pain in the top-level *)
+                 Buffer.add_string buf
+                   "\n(However, some guarded clause may match this value.)");
+               if contains_extension v then
+                 Buffer.add_string buf
+                   "\n\
+                    Matching over values of extensible variant types (the \
+                    *extension* above)\n\
+                    must include a wild card pattern in order to be exhaustive.";
+               (match partial_match_warning_hint with
+               | None -> ()
+               | Some h when String.length h > 0 ->
+                 Buffer.add_string buf ("\n\n  " ^ h)
+               | Some _ -> ());
+               Buffer.contents buf
+             with _ -> ""
+           in
+           Location.prerr_warning loc (Warnings.Partial_match errmsg));
+        Partial)
+    | _ -> fatal_error "Parmatch.check_partial")
+
+(*
+let do_check_partial_normal loc casel pss =
+  do_check_partial exhaust loc casel pss
+ *)
+
+let do_check_partial_gadt ?partial_match_warning_hint pred loc casel pss =
+  do_check_partial ?partial_match_warning_hint ~pred exhaust_gadt loc casel pss
+
+(*****************)
+(* Fragile check *)
+(*****************)
+
+(* Collect all data types in a pattern *)
+
+let rec add_path path = function
+  | [] -> [path]
+  | x :: rem as paths ->
+    if Path.same path x then paths else x :: add_path path rem
+
+let extendable_path path =
+  not
+    (Path.same path Predef.path_bool
+    || Path.same path Predef.path_list
+    || Path.same path Predef.path_unit
+    || Path.same path Predef.path_option)
+
+let rec collect_paths_from_pat r p =
+  match p.pat_desc with
+  | Tpat_construct
+      (_, {cstr_tag = Cstr_constant _ | Cstr_block _ | Cstr_unboxed}, ps) ->
+    let path = get_type_path p.pat_type p.pat_env in
+    List.fold_left collect_paths_from_pat
+      (if extendable_path path then add_path path r else r)
+      ps
+  | Tpat_any | Tpat_var _ | Tpat_constant _ | Tpat_variant (_, None, _) -> r
+  | Tpat_tuple ps
+  | Tpat_array ps
+  | Tpat_construct (_, {cstr_tag = Cstr_extension _}, ps) ->
+    List.fold_left collect_paths_from_pat r ps
+  | Tpat_record (lps, _) ->
+    List.fold_left (fun r (_, _, p, _) -> collect_paths_from_pat r p) r lps
+  | Tpat_variant (_, Some p, _) | Tpat_alias (p, _, _) ->
+    collect_paths_from_pat r p
+  | Tpat_or (p1, p2, _) ->
+    collect_paths_from_pat (collect_paths_from_pat r p1) p2
+
+(*
+  Actual fragile check
+   1. Collect data types in the patterns of the match.
+   2. One exhaustivity check per datatype, considering that
+      the type is extended.
+*)
+
+let do_check_fragile_param exhaust loc casel pss =
+  let exts =
+    List.fold_left (fun r c -> collect_paths_from_pat r c.c_lhs) [] casel
+  in
+  match exts with
+  | [] -> ()
+  | _ -> (
+    match pss with
+    | [] -> ()
+    | ps :: _ ->
+      List.iter
+        (fun ext ->
+          match exhaust (Some ext) pss (List.length ps) with
+          | Rnone ->
+            Location.prerr_warning loc (Warnings.Fragile_match (Path.name ext))
+          | Rsome _ -> ())
+        exts)
+
+(*let do_check_fragile_normal = do_check_fragile_param exhaust*)
+let do_check_fragile_gadt = do_check_fragile_param exhaust_gadt
+
+(********************************)
+(* Exported unused clause check *)
+(********************************)
+
+let check_unused pred casel =
+  if Warnings.is_active Warnings.Unused_match then
+    let rec do_rec pref = function
+      | [] -> ()
+      | {c_lhs = q; c_guard} :: rem ->
+        let qs = [q] in
+        (try
+           let pss = get_mins le_pats (Ext_list.filter pref (compats qs)) in
+           (* First look for redundant or partially redundant patterns *)
+           let r = every_satisfiables (make_rows pss) (make_row qs) in
+           (* Do not warn for unused [pat -> .] *)
+           let r =
+             (* Do not refine if there are no other lines *)
+             let skip =
+               r = Unused || pref = []
+               || not (Warnings.is_active Warnings.Unreachable_case)
+             in
+             if skip then r
+             else
+               (* Then look for empty patterns *)
+               let sfs = satisfiables pss qs in
+               if sfs = [] then Unused
+               else
+                 let sfs =
+                   List.map
+                     (function
+                       | [u] -> u
+                       | _ -> assert false)
+                     sfs
+                 in
+                 let u = orify_many sfs in
+                 (*Format.eprintf "%a@." pretty_val u;*)
+                 let pattern, constrs, labels = Conv.conv u in
+                 let pattern = {pattern with Parsetree.ppat_loc = q.pat_loc} in
+                 match pred constrs labels pattern with
+                 | None ->
+                   Location.prerr_warning q.pat_loc Warnings.Unreachable_case;
+                   Used
+                 | _ -> r
+           in
+           match r with
+           | Unused -> Location.prerr_warning q.pat_loc Warnings.Unused_match
+           | Upartial ps ->
+             ps
+             |> List.filter (fun p ->
+                    not (Variant_type_spread.is_pat_from_variant_spread_attr p))
+             |> List.iter (fun p ->
+                    Location.prerr_warning p.pat_loc Warnings.Unused_pat)
+           | Used -> ()
+         with Empty | Not_found | NoGuard -> assert false);
+
+        if c_guard <> None then do_rec pref rem else do_rec ([q] :: pref) rem
+    in
+
+    do_rec [] casel
+
+(*********************************)
+(* Exported irrefutability tests *)
+(*********************************)
+
+let irrefutable pat = le_pat pat omega
+
+let inactive ~partial pat =
+  match partial with
+  | Partial -> false
+  | Total ->
+    let rec loop pat =
+      match pat.pat_desc with
+      | Tpat_array _ -> false
+      | Tpat_any | Tpat_var _ | Tpat_variant (_, None, _) -> true
+      | Tpat_constant c -> (
+        match c with
+        | Const_string _ -> true (*Config.safe_string*)
+        | Const_int _ | Const_char _ | Const_float _ | Const_int32 _
+        | Const_int64 _ | Const_bigint _ ->
+          true)
+      | Tpat_tuple ps | Tpat_construct (_, _, ps) ->
+        List.for_all (fun p -> loop p) ps
+      | Tpat_alias (p, _, _) | Tpat_variant (_, Some p, _) -> loop p
+      | Tpat_record (ldps, _) ->
+        List.for_all
+          (fun (_, lbl, p, _) -> lbl.lbl_mut = Immutable && loop p)
+          ldps
+      | Tpat_or (p, q, _) -> loop p && loop q
+    in
+    loop pat
+
+(*********************************)
+(* Exported exhaustiveness check *)
+(*********************************)
+
+(*
+   Fragile check is performed when required and
+   on exhaustive matches only.
+*)
+
+let check_partial_param do_check_partial do_check_fragile loc casel =
+  let pss = initial_matrix casel in
+  let pss = get_mins le_pats pss in
+  let total = do_check_partial loc casel pss in
+  if total = Total && Warnings.is_active (Warnings.Fragile_match "") then
+    do_check_fragile loc casel pss;
+  total
+
+(*let check_partial =
+    check_partial_param
+      do_check_partial_normal
+      do_check_fragile_normal*)
+
+let check_partial_gadt ?partial_match_warning_hint pred loc casel =
+  check_partial_param
+    (do_check_partial_gadt ?partial_match_warning_hint pred)
+    do_check_fragile_gadt loc casel
+
+(*************************************)
+(* Ambiguous variable in or-patterns *)
+(*************************************)
+
+(* Specification: ambiguous variables in or-patterns.
+
+   The semantics of or-patterns in OCaml is specified with
+   a left-to-right bias: a value [v] matches the pattern [p | q] if it
+   matches [p] or [q], but if it matches both, the environment
+   captured by the match is the environment captured by [p], never the
+   one captured by [q].
+
+   While this property is generally well-understood, one specific case
+   where users expect a different semantics is when a pattern is
+   followed by a when-guard: [| p when g -> e]. Consider for example:
+
+     | ((Const x, _) | (_, Const x)) when is_neutral x -> branch
+
+   The semantics is clear: match the scrutinee against the pattern, if
+   it matches, test the guard, and if the guard passes, take the
+   branch.
+
+   However, consider the input [(Const a, Const b)], where [a] fails
+   the test [is_neutral f], while [b] passes the test [is_neutral
+   b]. With the left-to-right semantics, the clause above is *not*
+   taken by its input: matching [(Const a, Const b)] against the
+   or-pattern succeeds in the left branch, it returns the environment
+   [x -> a], and then the guard [is_neutral a] is tested and fails,
+   the branch is not taken. Most users, however, intuitively expect
+   that any pair that has one side passing the test will take the
+   branch. They assume it is equivalent to the following:
+
+     | (Const x, _) when is_neutral x -> branch
+     | (_, Const x) when is_neutral x -> branch
+
+   while it is not.
+
+   The code below is dedicated to finding these confusing cases: the
+   cases where a guard uses "ambiguous" variables, that are bound to
+   different parts of the scrutinees by different sides of
+   a or-pattern. In other words, it finds the cases where the
+   specified left-to-right semantics is not equivalent to
+   a non-deterministic semantics (any branch can be taken) relatively
+   to a specific guard.
+*)
+
+module IdSet = Set.Make (Ident)
+
+let pattern_vars p = IdSet.of_list (Typedtree.pat_bound_idents p)
+
+(* Row for ambiguous variable search,
+   unseen is the traditional pattern row,
+   seen   is a list of position bindings *)
+
+type amb_row = {unseen: pattern list; seen: IdSet.t list}
+
+(* Push binding variables now *)
+
+let rec do_push r p ps seen k =
+  match p.pat_desc with
+  | Tpat_alias (p, x, _) -> do_push (IdSet.add x r) p ps seen k
+  | Tpat_var (x, _) -> (omega, {unseen = ps; seen = IdSet.add x r :: seen}) :: k
+  | Tpat_or (p1, p2, _) -> do_push r p1 ps seen (do_push r p2 ps seen k)
+  | _ -> (p, {unseen = ps; seen = r :: seen}) :: k
+
+let rec push_vars = function
+  | [] -> []
+  | {unseen = []} :: _ -> assert false
+  | {unseen = p :: ps; seen} :: rem ->
+    do_push IdSet.empty p ps seen (push_vars rem)
+
+let collect_stable = function
+  | [] -> assert false
+  | {seen = xss; _} :: rem ->
+    let rec c_rec xss = function
+      | [] -> xss
+      | {seen = yss; _} :: rem ->
+        let xss = List.map2 IdSet.inter xss yss in
+        c_rec xss rem
+    in
+    let inters = c_rec xss rem in
+    List.fold_left IdSet.union IdSet.empty inters
+
+(*********************************************)
+(* Filtering utilities for our specific rows *)
+(*********************************************)
+
+(* Take a pattern matrix as a list (rows) of lists (columns) of patterns
+     | p1, p2, .., pn
+     | q1, q2, .., qn
+     | r1, r2, .., rn
+     | ...
+
+   We split this matrix into a list of sub-matrices, one for each head
+   constructor appearing in the leftmost column. For each row whose
+   left column starts with a head constructor, remove this head
+   column, prepend one column for each argument of the constructor,
+   and add the resulting row in the sub-matrix corresponding to this
+   head constructor.
+
+   Rows whose left column is omega (the Any pattern _) may match any
+   head constructor, so they are added to all groups.
+
+   The list of sub-matrices is represented as a list of pair
+     (head constructor, submatrix)
+*)
+
+let filter_all =
+  (* the head constructor (as a pattern with omega arguments) of
+     a pattern *)
+  let discr_head pat =
+    match pat.pat_desc with
+    | Tpat_record (lbls, closed) ->
+      (* a partial record pattern { f1 = p1; f2 = p2; _ }
+         needs to be expanded, otherwise matching against this head
+         would drop the pattern arguments for non-mentioned fields *)
+      let lbls = all_record_args lbls in
+      normalize_pat {pat with pat_desc = Tpat_record (lbls, closed)}
+    | _ -> normalize_pat pat
+  in
+
+  (* insert a row of head [p] and rest [r] into the right group *)
+  let rec insert p r env =
+    match env with
+    | [] ->
+      (* if no group matched this row, it has a head constructor that
+         was never seen before; add a new sub-matrix for this head *)
+      let p0 = discr_head p in
+      [(p0, [{r with unseen = simple_match_args p0 p @ r.unseen}])]
+    | ((q0, rs) as bd) :: env ->
+      if simple_match q0 p then
+        let r = {r with unseen = simple_match_args q0 p @ r.unseen} in
+        (q0, r :: rs) :: env
+      else bd :: insert p r env
+  in
+
+  (* insert a row of head omega into all groups *)
+  let insert_omega r env =
+    List.map
+      (fun (q0, rs) ->
+        let r = {r with unseen = simple_match_args q0 omega @ r.unseen} in
+        (q0, r :: rs))
+      env
+  in
+
+  let rec filter_rec env = function
+    | [] -> env
+    | ({pat_desc = Tpat_var _ | Tpat_alias _ | Tpat_or _}, _) :: _ ->
+      assert false
+    | ({pat_desc = Tpat_any}, _) :: rs -> filter_rec env rs
+    | (p, r) :: rs -> filter_rec (insert p r env) rs
+  in
+
+  let rec filter_omega env = function
+    | [] -> env
+    | ({pat_desc = Tpat_var _ | Tpat_alias _ | Tpat_or _}, _) :: _ ->
+      assert false
+    | ({pat_desc = Tpat_any}, r) :: rs -> filter_omega (insert_omega r env) rs
+    | _ :: rs -> filter_omega env rs
+  in
+
+  fun rs ->
+    (* first insert the rows with head constructors,
+       to get the definitive list of groups *)
+    let env = filter_rec [] rs in
+    (* then add the omega rows to all groups *)
+    filter_omega env rs
+
+(* Compute stable bindings *)
+
+let rec do_stable rs =
+  match rs with
+  | [] -> assert false (* No empty matrix *)
+  | {unseen = []; _} :: _ -> collect_stable rs
+  | _ -> (
+    let rs = push_vars rs in
+    if not (all_coherent (first_column rs)) then
+      (* If the first column is incoherent, then all the variables of this
+         matrix are stable. *)
+      List.fold_left
+        (fun acc (_, {seen; _}) -> List.fold_left IdSet.union acc seen)
+        IdSet.empty rs
+    else
+      (* If the column is ill-typed but deemed coherent, we might spuriously
+         warn about some variables being unstable.
+         As sad as that might be, the warning can be silenced by splitting the
+         or-pattern... *)
+      match filter_all rs with
+      | [] -> do_stable (List.map snd rs)
+      | (_, rs) :: env ->
+        List.fold_left
+          (fun xs (_, rs) -> IdSet.inter xs (do_stable rs))
+          (do_stable rs) env)
+
+let stable p = do_stable [{unseen = [p]; seen = []}]
+
+(* All identifier paths that appear in an expression that occurs
+    as a clause right hand side or guard.
+
+   The function is rather complex due to the compilation of
+   unpack patterns by introducing code in rhs expressions
+   and **guards**.
+
+   For pattern (module M:S)  -> e the code is
+   let module M_mod = unpack M .. in e
+
+   Hence M is "free" in e iff M_mod is free in e.
+
+   Not doing so will yield excessive  warning in
+   (module (M:S) } ...) when true -> ....
+   as M is always present in
+   let module M_mod = unpack M .. in true
+*)
+
+let all_rhs_idents exp =
+  let ids = ref IdSet.empty in
+  let module Iterator = TypedtreeIter.MakeIterator (struct
+    include TypedtreeIter.DefaultIteratorArgument
+    let enter_expression exp =
+      match exp.exp_desc with
+      | Texp_ident (path, _lid, _descr) ->
+        List.iter (fun id -> ids := IdSet.add id !ids) (Path.heads path)
+      | _ -> ()
+
+    (* Very hackish, detect unpack pattern  compilation
+       and perform "indirect check for them" *)
+    let is_unpack exp =
+      List.exists (fun (attr, _) -> attr.txt = "#modulepat") exp.exp_attributes
+
+    let leave_expression exp =
+      if is_unpack exp then
+        match exp.exp_desc with
+        | Texp_letmodule
+            ( id_mod,
+              _,
+              {
+                mod_desc =
+                  Tmod_unpack
+                    ({exp_desc = Texp_ident (Path.Pident id_exp, _, _)}, _);
+              },
+              _ ) ->
+          assert (IdSet.mem id_exp !ids);
+          if not (IdSet.mem id_mod !ids) then ids := IdSet.remove id_exp !ids
+        | _ -> assert false
+  end) in
+  Iterator.iter_expression exp;
+  !ids
+
+let check_ambiguous_bindings =
+  let open Warnings in
+  let warn0 = Ambiguous_pattern [] in
+  fun cases ->
+    if is_active warn0 then
+      List.iter
+        (fun case ->
+          match case with
+          | {c_guard = None; _} -> ()
+          | {c_lhs = p; c_guard = Some g; _} ->
+            let all = IdSet.inter (pattern_vars p) (all_rhs_idents g) in
+            if not (IdSet.is_empty all) then
+              let st = stable p in
+              let ambiguous = IdSet.diff all st in
+              if not (IdSet.is_empty ambiguous) then
+                let pps = IdSet.elements ambiguous |> List.map Ident.name in
+                let warn = Ambiguous_pattern pps in
+                Location.prerr_warning p.pat_loc warn)
+        cases
diff --git a/compiler/ml/parmatch.mli b/compiler/ml/parmatch.mli
new file mode 100644
index 0000000..517206a
--- /dev/null
+++ b/compiler/ml/parmatch.mli
@@ -0,0 +1,100 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Detection of partial matches and unused match cases. *)
+open Asttypes
+open Typedtree
+open Types
+
+val top_pretty : Format.formatter -> pattern -> unit
+val pretty_pat : pattern -> unit
+val pretty_line : pattern list -> unit
+val pretty_matrix : pattern list list -> unit
+
+val print_res_pat : (Typedtree.pattern -> string) ref
+
+val omega : pattern
+val omegas : int -> pattern list
+val omega_list : 'a list -> pattern list
+val normalize_pat : pattern -> pattern
+val all_record_args :
+  (Longident.t loc * label_description * pattern * bool) list ->
+  (Longident.t loc * label_description * pattern * bool) list
+val const_compare : constant -> constant -> int
+
+val le_pat : pattern -> pattern -> bool
+val le_pats : pattern list -> pattern list -> bool
+
+(* Exported compatibility, abstracted over constructor equality *)
+module Compat : sig
+  type eq_cd = constructor_description -> constructor_description -> bool
+  val compat : equal_cd:eq_cd -> pattern -> pattern -> bool
+  val compats : equal_cd:eq_cd -> pattern list -> pattern list -> bool
+end
+
+exception Empty
+val lub : pattern -> pattern -> pattern
+val lubs : pattern list -> pattern list -> pattern list
+
+val get_mins : ('a -> 'a -> bool) -> 'a list -> 'a list
+
+(* Those two functions recombine one pattern and its arguments:
+   For instance:
+     (_,_)::p1::p2::rem -> (p1, p2)::rem
+   The second one will replace mutable arguments by '_'
+*)
+val set_args_erase_mutable : pattern -> pattern list -> pattern list
+
+val pat_of_constr : pattern -> constructor_description -> pattern
+val complete_constrs :
+  pattern -> constructor_tag list -> constructor_description list
+val ppat_of_type :
+  Env.t ->
+  type_expr ->
+  Parsetree.pattern
+  * (string, constructor_description) Hashtbl.t
+  * (string, label_description) Hashtbl.t
+
+val pressure_variants : Env.t -> pattern list -> unit
+val check_partial_gadt :
+  ?partial_match_warning_hint:string ->
+  ((string, constructor_description) Hashtbl.t ->
+  (string, label_description) Hashtbl.t ->
+  Parsetree.pattern ->
+  pattern option) ->
+  Location.t ->
+  case list ->
+  partial
+val check_unused :
+  ((string, constructor_description) Hashtbl.t ->
+  (string, label_description) Hashtbl.t ->
+  Parsetree.pattern ->
+  pattern option) ->
+  case list ->
+  unit
+
+(* Irrefutability tests *)
+val irrefutable : pattern -> bool
+
+val inactive : partial:partial -> pattern -> bool
+(** An inactive pattern is a pattern, matching against which can be duplicated, erased or
+    delayed without change in observable behavior of the program.  Patterns containing
+    (lazy _) subpatterns or reads of mutable fields are active. *)
+
+(* Ambiguous bindings *)
+val check_ambiguous_bindings : case list -> unit
+
+(* The tag used for open polymorphic variant types *)
+val some_other_tag : label
diff --git a/compiler/ml/parsetree.ml b/compiler/ml/parsetree.ml
new file mode 100644
index 0000000..78c9899
--- /dev/null
+++ b/compiler/ml/parsetree.ml
@@ -0,0 +1,665 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** Abstract syntax tree produced by parsing *)
+
+open Asttypes
+
+type constant =
+  | Pconst_integer of string * char option
+  (* 3 3l 3L 3n
+
+     Suffixes [g-z][G-Z] are accepted by the parser.
+     Suffixes except 'l', 'L' are rejected by the typechecker
+  *)
+  | Pconst_char of int
+  (* 'c' *)
+  | Pconst_string of string * string option
+  (* "constant"
+     {delim|other constant|delim}
+  *)
+  | Pconst_float of string * char option
+(* 3.4 2e5 1.4e-4
+
+   Suffixes [g-z][G-Z] are accepted by the parser.
+   Suffixes are rejected by the typechecker.
+*)
+
+(** {1 Extension points} *)
+
+type attribute = string loc * payload
+(* [@id ARG]
+   [@@id ARG]
+
+   Metadata containers passed around within the AST.
+   The compiler ignores unknown attributes.
+*)
+
+and extension = string loc * payload
+(* [%id ARG]
+   [%%id ARG]
+
+   Sub-language placeholder -- rejected by the typechecker.
+*)
+
+and attributes = attribute list
+
+and payload =
+  | PStr of structure
+  | PSig of signature (* : SIG *)
+  | PTyp of core_type (* : T *)
+  | PPat of pattern * expression option
+(* ? P  or  ? P when E *)
+
+(* Type expressions *)
+
+(** {1 Core language} *)
+
+and core_type = {
+  ptyp_desc: core_type_desc;
+  ptyp_loc: Location.t;
+  ptyp_attributes: attributes; (* ... [@id1] [@id2] *)
+}
+
+and arg = {attrs: attributes; lbl: arg_label; typ: core_type}
+
+and core_type_desc =
+  | Ptyp_any (*  _ *)
+  | Ptyp_var of string (* 'a *)
+  | Ptyp_arrow of {arg: arg; ret: core_type; arity: arity}
+    (* T1 -> T2       Simple
+       ~l:T1 -> T2    Labelled
+       ?l:T1 -> T2    Optional
+    *)
+  | Ptyp_tuple of core_type list
+    (* T1 * ... * Tn
+
+       Invariant: n >= 2
+    *)
+  | Ptyp_constr of Longident.t loc * core_type list
+    (* tconstr
+       T tconstr
+       (T1, ..., Tn) tconstr
+    *)
+  | Ptyp_object of object_field list * closed_flag
+    (* < l1:T1; ...; ln:Tn >     (flag = Closed)
+       < l1:T1; ...; ln:Tn; .. > (flag = Open)
+    *)
+  | Ptyp_alias of core_type * string (* T as 'a *)
+  | Ptyp_variant of row_field list * closed_flag * label list option
+    (* [ `A|`B ]         (flag = Closed; labels = None)
+       [> `A|`B ]        (flag = Open;   labels = None)
+       [< `A|`B ]        (flag = Closed; labels = Some [])
+       [< `A|`B > `X `Y ](flag = Closed; labels = Some ["X";"Y"])
+    *)
+  | Ptyp_poly of string loc list * core_type
+    (* 'a1 ... 'an. T
+
+       Can only appear in the following context:
+
+       - As the core_type of a Ppat_constraint node corresponding
+         to a constraint on a let-binding: let x : 'a1 ... 'an. T
+         = e ...
+
+       - Under Cfk_virtual for methods (not values).
+
+       - As the core_type of a Pctf_method node.
+
+       - As the core_type of a Pexp_poly node.
+
+       - As the pld_type field of a label_declaration.
+
+       - As a core_type of a Ptyp_object node.
+    *)
+  | Ptyp_package of package_type (* (module S) *)
+  | Ptyp_extension of extension
+(* [%id] *)
+
+and package_type = Longident.t loc * (Longident.t loc * core_type) list
+(*
+        (module S)
+        (module S with type t1 = T1 and ... and tn = Tn)
+       *)
+
+and row_field =
+  | Rtag of label loc * attributes * bool * core_type list
+    (* [`A]                   ( true,  [] )
+        [`A of T]              ( false, [T] )
+        [`A of T1 & .. & Tn]   ( false, [T1;...Tn] )
+        [`A of & T1 & .. & Tn] ( true,  [T1;...Tn] )
+
+       - The 2nd field is true if the tag contains a
+         constant (empty) constructor.
+       - '&' occurs when several types are used for the same constructor
+         (see 4.2 in the manual)
+
+       - TODO: switch to a record representation, and keep location
+    *)
+  | Rinherit of core_type
+(* [ T ] *)
+
+and object_field =
+  | Otag of label loc * attributes * core_type
+  | Oinherit of core_type
+
+(* Patterns *)
+and pattern = {
+  ppat_desc: pattern_desc;
+  ppat_loc: Location.t;
+  ppat_attributes: attributes; (* ... [@id1] [@id2] *)
+}
+
+and pattern_desc =
+  | Ppat_any (* _ *)
+  | Ppat_var of string loc (* x *)
+  | Ppat_alias of pattern * string loc (* P as 'a *)
+  | Ppat_constant of constant (* 1, 'a', "true", 1.0, 1l, 1L, 1n *)
+  | Ppat_interval of constant * constant
+    (* 'a'..'z'
+
+       Other forms of interval are recognized by the parser
+       but rejected by the type-checker. *)
+  | Ppat_tuple of pattern list (* (P1, ..., Pn)
+
+       Invariant: n >= 2
+    *)
+  | Ppat_construct of Longident.t loc * pattern option
+    (* C                None
+       C P              Some P
+       C (P1, ..., Pn)  Some (Ppat_tuple [P1; ...; Pn])
+    *)
+  | Ppat_variant of label * pattern option
+    (* `A             (None)
+       `A P           (Some P)
+    *)
+  | Ppat_record of pattern record_element list * closed_flag
+    (* { l1=P1; ...; ln=Pn }     (flag = Closed)
+       { l1=P1; ...; ln=Pn; _}   (flag = Open)
+
+       Invariant: n > 0
+    *)
+  | Ppat_array of pattern list (* [| P1; ...; Pn |] *)
+  | Ppat_or of pattern * pattern (* P1 | P2 *)
+  | Ppat_constraint of pattern * core_type (* (P : T) *)
+  | Ppat_type of Longident.t loc (* #tconst *)
+  | Ppat_unpack of string loc
+    (* (module P)
+       Note: (module P : S) is represented as
+       Ppat_constraint(Ppat_unpack, Ptyp_package)
+    *)
+  | Ppat_exception of pattern (* exception P *)
+  | Ppat_extension of extension (* [%id] *)
+  | Ppat_open of Longident.t loc * pattern
+(* M.(P) *)
+
+and pat_record_label = Longident.t loc * pattern * bool (* optional *)
+
+(* Value expressions *)
+and expression = {
+  pexp_desc: expression_desc;
+  pexp_loc: Location.t;
+  (* Hack: made pexp_attributes mutable for use in analysis exe. Please do not use elsewhere! *)
+  mutable pexp_attributes: attributes; (* ... [@id1] [@id2] *)
+}
+
+and expression_desc =
+  | Pexp_ident of Longident.t loc (* x
+       M.x
+    *)
+  | Pexp_constant of constant (* 1, 'a', "true", 1.0, 1l, 1L, 1n *)
+  | Pexp_let of rec_flag * value_binding list * expression
+    (* let P1 = E1 and ... and Pn = EN in E       (flag = Nonrecursive)
+       let rec P1 = E1 and ... and Pn = EN in E   (flag = Recursive)
+    *)
+  | Pexp_fun of {
+      arg_label: arg_label;
+      default: expression option;
+      lhs: pattern;
+      rhs: expression;
+      arity: arity;
+      async: bool;
+    }
+    (* fun P -> E1                          (Simple, None)
+       fun ~l:P -> E1                       (Labelled l, None)
+       fun ?l:P -> E1                       (Optional l, None)
+       fun ?l:(P = E0) -> E1                (Optional l, Some E0)
+
+       Notes:
+       - If E0 is provided, only Optional is allowed.
+       - "fun P1 P2 .. Pn -> E1" is represented as nested Pexp_fun.
+       - "let f P = E" is represented using Pexp_fun.
+    *)
+  | Pexp_apply of {
+      funct: expression;
+      args: (arg_label * expression) list;
+      partial: bool;
+      transformed_jsx: bool;
+    }
+    (* E0 ~l1:E1 ... ~ln:En
+       li can be empty (non labeled argument) or start with '?'
+       (optional argument).
+
+       Invariant: n > 0
+    *)
+  | Pexp_match of expression * case list
+    (* match E0 with P1 -> E1 | ... | Pn -> En *)
+  | Pexp_try of expression * case list
+    (* try E0 with P1 -> E1 | ... | Pn -> En *)
+  | Pexp_tuple of expression list
+    (* (E1, ..., En)
+
+       Invariant: n >= 2
+    *)
+  | Pexp_construct of Longident.t loc * expression option
+    (* C                None
+       C E              Some E
+       C (E1, ..., En)  Some (Pexp_tuple[E1;...;En])
+    *)
+  | Pexp_variant of label * expression option
+    (* `A             (None)
+       `A E           (Some E)
+    *)
+  | Pexp_record of expression record_element list * expression option
+    (* { l1=P1; ...; ln=Pn }     (None)
+       { E0 with l1=P1; ...; ln=Pn }   (Some E0)
+
+       Invariant: n > 0
+    *)
+  | Pexp_field of expression * Longident.t loc (* E.l *)
+  | Pexp_setfield of expression * Longident.t loc * expression (* E1.l <- E2 *)
+  | Pexp_array of expression list (* [| E1; ...; En |] *)
+  | Pexp_ifthenelse of expression * expression * expression option
+    (* if E1 then E2 else E3 *)
+  | Pexp_sequence of expression * expression (* E1; E2 *)
+  | Pexp_while of expression * expression (* while E1 do E2 done *)
+  | Pexp_for of pattern * expression * expression * direction_flag * expression
+    (* for i = E1 to E2 do E3 done      (flag = Upto)
+       for i = E1 downto E2 do E3 done  (flag = Downto)
+    *)
+  | Pexp_constraint of expression * core_type (* (E : T) *)
+  | Pexp_coerce of expression * unit * core_type
+    (* (E :> T)        (None, T)
+         *)
+  | Pexp_send of expression * label loc (*  E # m *)
+  | Pexp_letmodule of string loc * module_expr * expression
+    (* let module M = ME in E *)
+  | Pexp_letexception of extension_constructor * expression
+    (* let exception C in E *)
+  | Pexp_assert of expression
+    (* assert E
+       Note: "assert false" is treated in a special way by the
+       type-checker. *)
+  | Pexp_newtype of string loc * expression (* fun (type t) -> E *)
+  | Pexp_pack of module_expr
+    (* (module ME)
+
+       (module ME : S) is represented as
+       Pexp_constraint(Pexp_pack, Ptyp_package S) *)
+  | Pexp_open of override_flag * Longident.t loc * expression
+    (* M.(E)
+       let open M in E
+       let! open M in E *)
+  | Pexp_extension of extension
+  (* [%id] *)
+  (* . *)
+  | Pexp_await of expression
+  | Pexp_jsx_element of jsx_element
+
+(* an element of a record pattern or expression *)
+and 'a record_element = {lid: Longident.t loc; x: 'a; opt: bool (* optional *)}
+
+and jsx_element =
+  | Jsx_fragment of jsx_fragment
+  | Jsx_unary_element of jsx_unary_element
+  | Jsx_container_element of jsx_container_element
+
+and jsx_tag_name =
+  | JsxLowerTag of string
+  | JsxQualifiedLowerTag of {path: Longident.t; name: string}
+  | JsxUpperTag of Longident.t
+  | JsxTagInvalid of string
+
+and jsx_fragment = {
+  (* > *) jsx_fragment_opening: Lexing.position;
+  (* children *) jsx_fragment_children: jsx_children;
+  (* </ *) jsx_fragment_closing: Lexing.position;
+}
+
+and jsx_unary_element = {
+  jsx_unary_element_tag_name: jsx_tag_name loc;
+  jsx_unary_element_props: jsx_props;
+}
+
+and jsx_container_element = {
+  (* jsx_container_element_opening_tag_start: Lexing.position; *)
+  jsx_container_element_tag_name_start: jsx_tag_name loc;
+  (* > *)
+  jsx_container_element_opening_tag_end: Lexing.position;
+  jsx_container_element_props: jsx_props;
+  jsx_container_element_children: jsx_children;
+  jsx_container_element_closing_tag: jsx_closing_container_tag option;
+}
+
+and jsx_prop =
+  (*
+   *   |  lident
+   *   | ?lident
+   *)
+  | JSXPropPunning of (* optional *) bool * (* name *) string loc
+  (*
+   *   |  lident =  jsx_expr
+   *   |  lident = ?jsx_expr
+   *)
+  | JSXPropValue of
+      (* name *) string loc * (* optional *) bool * (* value *) expression
+  (*
+   *   |  {...jsx_expr}
+   *)
+  | JSXPropSpreading of
+      (* entire {...expr} location *)
+      Location.t
+      * expression
+
+and jsx_children = expression list
+
+and jsx_props = jsx_prop list
+
+and jsx_closing_container_tag = {
+  (* </ *)
+  jsx_closing_container_tag_start: Lexing.position;
+  (* name *)
+  jsx_closing_container_tag_name: jsx_tag_name loc;
+  (* > *)
+  jsx_closing_container_tag_end: Lexing.position;
+}
+
+and case = {
+  (* (P -> E) or (P when E0 -> E) *)
+  pc_bar: Lexing.position option;
+  pc_lhs: pattern;
+  pc_guard: expression option;
+  pc_rhs: expression;
+}
+
+(* Value descriptions *)
+and value_description = {
+  pval_name: string loc;
+  pval_type: core_type;
+  pval_prim: string list;
+  pval_attributes: attributes; (* ... [@@id1] [@@id2] *)
+  pval_loc: Location.t;
+}
+
+(*
+  val x: T                            (prim = [])
+  external x: T = "s1" ... "sn"       (prim = ["s1";..."sn"])
+*)
+
+(* Type declarations *)
+and type_declaration = {
+  ptype_name: string loc;
+  ptype_params: (core_type * variance) list;
+      (* ('a1,...'an) t; None represents  _*)
+  ptype_cstrs: (core_type * core_type * Location.t) list;
+      (* ... constraint T1=T1'  ... constraint Tn=Tn' *)
+  ptype_kind: type_kind;
+  ptype_private: private_flag; (* = private ... *)
+  ptype_manifest: core_type option; (* = T *)
+  ptype_attributes: attributes; (* ... [@@id1] [@@id2] *)
+  ptype_loc: Location.t;
+}
+
+(*
+  type t                     (abstract, no manifest)
+  type t = T0                (abstract, manifest=T0)
+  type t = C of T | ...      (variant,  no manifest)
+  type t = T0 = C of T | ... (variant,  manifest=T0)
+  type t = {l: T; ...}       (record,   no manifest)
+  type t = T0 = {l : T; ...} (record,   manifest=T0)
+  type t = ..                (open,     no manifest)
+*)
+and type_kind =
+  | Ptype_abstract
+  | Ptype_variant of constructor_declaration list
+    (* Invariant: non-empty list *)
+  | Ptype_record of label_declaration list (* Invariant: non-empty list *)
+  | Ptype_open
+
+and label_declaration = {
+  pld_name: string loc;
+  pld_mutable: mutable_flag;
+  pld_optional: bool;
+  pld_type: core_type;
+  pld_loc: Location.t;
+  pld_attributes: attributes; (* l : T [@id1] [@id2] *)
+}
+
+(* { ...; l: T; ... }            (mutable=Immutable)
+   { ...; mutable l: T; ... }    (mutable=Mutable)
+
+   Note: T can be a Ptyp_poly.
+*)
+and constructor_declaration = {
+  pcd_name: string loc;
+  pcd_args: constructor_arguments;
+  pcd_res: core_type option;
+  pcd_loc: Location.t;
+  pcd_attributes: attributes; (* C of ... [@id1] [@id2] *)
+}
+
+and constructor_arguments =
+  | Pcstr_tuple of core_type list
+  | Pcstr_record of label_declaration list
+
+(*
+  | C of T1 * ... * Tn     (res = None,    args = Pcstr_tuple [])
+  | C: T0                  (res = Some T0, args = [])
+  | C: T1 * ... * Tn -> T0 (res = Some T0, args = Pcstr_tuple)
+  | C of {...}             (res = None,    args = Pcstr_record)
+  | C: {...} -> T0         (res = Some T0, args = Pcstr_record)
+  | C of {...} as t        (res = None,    args = Pcstr_record)
+*)
+and type_extension = {
+  ptyext_path: Longident.t loc;
+  ptyext_params: (core_type * variance) list;
+  ptyext_constructors: extension_constructor list;
+  ptyext_private: private_flag;
+  ptyext_attributes: attributes; (* ... [@@id1] [@@id2] *)
+}
+(*
+  type t += ...
+*)
+
+and extension_constructor = {
+  pext_name: string loc;
+  pext_kind: extension_constructor_kind;
+  pext_loc: Location.t;
+  pext_attributes: attributes; (* C of ... [@id1] [@id2] *)
+}
+
+and extension_constructor_kind =
+  | Pext_decl of constructor_arguments * core_type option
+    (*
+         | C of T1 * ... * Tn     ([T1; ...; Tn], None)
+         | C: T0                  ([], Some T0)
+         | C: T1 * ... * Tn -> T0 ([T1; ...; Tn], Some T0)
+       *)
+  | Pext_rebind of Longident.t loc
+(*
+         | C = D
+       *)
+
+(* Type expressions for the module language *)
+
+(** {1 Module language} *)
+
+and module_type = {
+  pmty_desc: module_type_desc;
+  pmty_loc: Location.t;
+  pmty_attributes: attributes; (* ... [@id1] [@id2] *)
+}
+
+and module_type_desc =
+  | Pmty_ident of Longident.t loc (* S *)
+  | Pmty_signature of signature (* sig ... end *)
+  | Pmty_functor of string loc * module_type option * module_type
+    (* functor(X : MT1) -> MT2 *)
+  | Pmty_with of module_type * with_constraint list (* MT with ... *)
+  | Pmty_typeof of module_expr (* module type of ME *)
+  | Pmty_extension of extension (* [%id] *)
+  | Pmty_alias of Longident.t loc
+(* (module M) *)
+
+and signature = signature_item list
+
+and signature_item = {psig_desc: signature_item_desc; psig_loc: Location.t}
+
+and signature_item_desc =
+  | Psig_value of value_description
+    (*
+          val x: T
+          external x: T = "s1" ... "sn"
+         *)
+  | Psig_type of rec_flag * type_declaration list
+    (* type t1 = ... and ... and tn = ... *)
+  | Psig_typext of type_extension (* type t1 += ... *)
+  | Psig_exception of extension_constructor (* exception C of T *)
+  | Psig_module of module_declaration (* module X : MT *)
+  | Psig_recmodule of module_declaration list
+    (* module rec X1 : MT1 and ... and Xn : MTn *)
+  | Psig_modtype of module_type_declaration
+    (* module type S = MT
+       module type S *)
+  | Psig_open of open_description (* open X *)
+  | Psig_include of include_description (* include MT *)
+  | Psig_attribute of attribute (* [@@@id] *)
+  | Psig_extension of extension * attributes
+(* [%%id] *)
+
+and module_declaration = {
+  pmd_name: string loc;
+  pmd_type: module_type;
+  pmd_attributes: attributes; (* ... [@@id1] [@@id2] *)
+  pmd_loc: Location.t;
+}
+(* S : MT *)
+
+and module_type_declaration = {
+  pmtd_name: string loc;
+  pmtd_type: module_type option;
+  pmtd_attributes: attributes; (* ... [@@id1] [@@id2] *)
+  pmtd_loc: Location.t;
+}
+(* S = MT
+   S       (abstract module type declaration, pmtd_type = None)
+*)
+
+and open_description = {
+  popen_lid: Longident.t loc;
+  popen_override: override_flag;
+  popen_loc: Location.t;
+  popen_attributes: attributes;
+}
+(* open! X - popen_override = Override (silences the 'used identifier
+                              shadowing' warning)
+   open  X - popen_override = Fresh
+*)
+
+and 'a include_infos = {
+  pincl_mod: 'a;
+  pincl_loc: Location.t;
+  pincl_attributes: attributes;
+}
+
+and include_description = module_type include_infos
+(* include MT *)
+
+and include_declaration = module_expr include_infos
+(* include ME *)
+
+and with_constraint =
+  | Pwith_type of Longident.t loc * type_declaration
+    (* with type X.t = ...
+
+       Note: the last component of the longident must match
+       the name of the type_declaration. *)
+  | Pwith_module of Longident.t loc * Longident.t loc (* with module X.Y = Z *)
+  | Pwith_typesubst of Longident.t loc * type_declaration
+    (* with type X.t := ..., same format as [Pwith_type] *)
+  | Pwith_modsubst of Longident.t loc * Longident.t loc
+(* with module X.Y := Z *)
+
+(* Value expressions for the module language *)
+
+and module_expr = {
+  pmod_desc: module_expr_desc;
+  pmod_loc: Location.t;
+  pmod_attributes: attributes; (* ... [@id1] [@id2] *)
+}
+
+and module_expr_desc =
+  | Pmod_ident of Longident.t loc (* X *)
+  | Pmod_structure of structure (* struct ... end *)
+  | Pmod_functor of string loc * module_type option * module_expr
+    (* functor(X : MT1) -> ME *)
+  | Pmod_apply of module_expr * module_expr (* ME1(ME2) *)
+  | Pmod_constraint of module_expr * module_type (* (ME : MT) *)
+  | Pmod_unpack of expression (* (val E) *)
+  | Pmod_extension of extension
+(* [%id] *)
+
+and structure = structure_item list
+
+and structure_item = {pstr_desc: structure_item_desc; pstr_loc: Location.t}
+
+and structure_item_desc =
+  | Pstr_eval of expression * attributes (* E *)
+  | Pstr_value of rec_flag * value_binding list
+    (* let P1 = E1 and ... and Pn = EN       (flag = Nonrecursive)
+       let rec P1 = E1 and ... and Pn = EN   (flag = Recursive)
+    *)
+  | Pstr_primitive of value_description
+    (* val x: T
+       external x: T = "s1" ... "sn" *)
+  | Pstr_type of rec_flag * type_declaration list
+    (* type t1 = ... and ... and tn = ... *)
+  | Pstr_typext of type_extension (* type t1 += ... *)
+  | Pstr_exception of extension_constructor
+    (* exception C of T
+       exception C = M.X *)
+  | Pstr_module of module_binding (* module X = ME *)
+  | Pstr_recmodule of module_binding list
+    (* module rec X1 = ME1 and ... and Xn = MEn *)
+  | Pstr_modtype of module_type_declaration (* module type S = MT *)
+  | Pstr_open of open_description (* open X *)
+  | Pstr_include of include_declaration (* include ME *)
+  | Pstr_attribute of attribute (* [@@@id] *)
+  | Pstr_extension of extension * attributes
+(* [%%id] *)
+
+and value_binding = {
+  pvb_pat: pattern;
+  pvb_expr: expression;
+  pvb_attributes: attributes;
+  pvb_loc: Location.t;
+}
+
+and module_binding = {
+  pmb_name: string loc;
+  pmb_expr: module_expr;
+  pmb_attributes: attributes;
+  pmb_loc: Location.t;
+}
+(* X = ME *)
diff --git a/compiler/ml/parsetree0.ml b/compiler/ml/parsetree0.ml
new file mode 100644
index 0000000..ef786df
--- /dev/null
+++ b/compiler/ml/parsetree0.ml
@@ -0,0 +1,610 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** Abstract syntax tree produced by parsing *)
+
+open Asttypes
+
+type constant =
+  | Pconst_integer of string * char option
+  (* 3 3l 3L 3n
+
+     Suffixes [g-z][G-Z] are accepted by the parser.
+     Suffixes except 'l', 'L' are rejected by the typechecker
+  *)
+  | Pconst_char of int
+  (* 'c' *)
+  | Pconst_string of string * string option
+  (* "constant"
+     {delim|other constant|delim}
+  *)
+  | Pconst_float of string * char option
+(* 3.4 2e5 1.4e-4
+
+   Suffixes [g-z][G-Z] are accepted by the parser.
+   Suffixes are rejected by the typechecker.
+*)
+
+(** {1 Extension points} *)
+
+type attribute = string loc * payload
+(* [@id ARG]
+   [@@id ARG]
+
+   Metadata containers passed around within the AST.
+   The compiler ignores unknown attributes.
+*)
+
+and extension = string loc * payload
+(* [%id ARG]
+   [%%id ARG]
+
+   Sub-language placeholder -- rejected by the typechecker.
+*)
+
+and attributes = attribute list
+
+and payload =
+  | PStr of structure
+  | PSig of signature (* : SIG *)
+  | PTyp of core_type (* : T *)
+  | PPat of pattern * expression option
+(* ? P  or  ? P when E *)
+
+(* Type expressions *)
+
+(** {1 Core language} *)
+
+and core_type = {
+  ptyp_desc: core_type_desc;
+  ptyp_loc: Location.t;
+  ptyp_attributes: attributes; (* ... [@id1] [@id2] *)
+}
+
+and core_type_desc =
+  | Ptyp_any (*  _ *)
+  | Ptyp_var of string (* 'a *)
+  | Ptyp_arrow of Noloc.arg_label * core_type * core_type
+    (* T1 -> T2       Simple
+       ~l:T1 -> T2    Labelled
+       ?l:T1 -> T2    Optional
+    *)
+  | Ptyp_tuple of core_type list
+    (* T1 * ... * Tn
+
+       Invariant: n >= 2
+    *)
+  | Ptyp_constr of Longident.t loc * core_type list
+    (* tconstr
+       T tconstr
+       (T1, ..., Tn) tconstr
+    *)
+  | Ptyp_object of object_field list * closed_flag
+    (* < l1:T1; ...; ln:Tn >     (flag = Closed)
+       < l1:T1; ...; ln:Tn; .. > (flag = Open)
+    *)
+  | Ptyp_class of unit (* dummy AST node *)
+  | Ptyp_alias of core_type * string (* T as 'a *)
+  | Ptyp_variant of row_field list * closed_flag * label list option
+    (* [ `A|`B ]         (flag = Closed; labels = None)
+       [> `A|`B ]        (flag = Open;   labels = None)
+       [< `A|`B ]        (flag = Closed; labels = Some [])
+       [< `A|`B > `X `Y ](flag = Closed; labels = Some ["X";"Y"])
+    *)
+  | Ptyp_poly of string loc list * core_type
+    (* 'a1 ... 'an. T
+
+       Can only appear in the following context:
+
+       - As the core_type of a Ppat_constraint node corresponding
+         to a constraint on a let-binding: let x : 'a1 ... 'an. T
+         = e ...
+
+       - Under Cfk_virtual for methods (not values).
+
+       - As the core_type of a Pctf_method node.
+
+       - As the core_type of a Pexp_poly node.
+
+       - As the pld_type field of a label_declaration.
+
+       - As a core_type of a Ptyp_object node.
+    *)
+  | Ptyp_package of package_type (* (module S) *)
+  | Ptyp_extension of extension
+(* [%id] *)
+
+and package_type = Longident.t loc * (Longident.t loc * core_type) list
+(*
+        (module S)
+        (module S with type t1 = T1 and ... and tn = Tn)
+       *)
+
+and row_field =
+  | Rtag of label loc * attributes * bool * core_type list
+    (* [`A]                   ( true,  [] )
+        [`A of T]              ( false, [T] )
+        [`A of T1 & .. & Tn]   ( false, [T1;...Tn] )
+        [`A of & T1 & .. & Tn] ( true,  [T1;...Tn] )
+
+       - The 2nd field is true if the tag contains a
+         constant (empty) constructor.
+       - '&' occurs when several types are used for the same constructor
+         (see 4.2 in the manual)
+
+       - TODO: switch to a record representation, and keep location
+    *)
+  | Rinherit of core_type
+(* [ T ] *)
+
+and object_field =
+  | Otag of label loc * attributes * core_type
+  | Oinherit of core_type
+
+(* Patterns *)
+and pattern = {
+  ppat_desc: pattern_desc;
+  ppat_loc: Location.t;
+  ppat_attributes: attributes; (* ... [@id1] [@id2] *)
+}
+
+and pattern_desc =
+  | Ppat_any (* _ *)
+  | Ppat_var of string loc (* x *)
+  | Ppat_alias of pattern * string loc (* P as 'a *)
+  | Ppat_constant of constant (* 1, 'a', "true", 1.0, 1l, 1L, 1n *)
+  | Ppat_interval of constant * constant
+    (* 'a'..'z'
+
+       Other forms of interval are recognized by the parser
+       but rejected by the type-checker. *)
+  | Ppat_tuple of pattern list (* (P1, ..., Pn)
+
+       Invariant: n >= 2
+    *)
+  | Ppat_construct of Longident.t loc * pattern option
+    (* C                None
+       C P              Some P
+       C (P1, ..., Pn)  Some (Ppat_tuple [P1; ...; Pn])
+    *)
+  | Ppat_variant of label * pattern option
+    (* `A             (None)
+       `A P           (Some P)
+    *)
+  | Ppat_record of (Longident.t loc * pattern) list * closed_flag
+    (* { l1=P1; ...; ln=Pn }     (flag = Closed)
+       { l1=P1; ...; ln=Pn; _}   (flag = Open)
+
+       Invariant: n > 0
+    *)
+  | Ppat_array of pattern list (* [| P1; ...; Pn |] *)
+  | Ppat_or of pattern * pattern (* P1 | P2 *)
+  | Ppat_constraint of pattern * core_type (* (P : T) *)
+  | Ppat_type of Longident.t loc (* #tconst *)
+  | Ppat_lazy of pattern (* lazy P *)
+  | Ppat_unpack of string loc
+    (* (module P)
+       Note: (module P : S) is represented as
+       Ppat_constraint(Ppat_unpack, Ptyp_package)
+    *)
+  | Ppat_exception of pattern (* exception P *)
+  | Ppat_extension of extension (* [%id] *)
+  | Ppat_open of Longident.t loc * pattern
+(* M.(P) *)
+
+(* Value expressions *)
+
+and expression = {
+  pexp_desc: expression_desc;
+  pexp_loc: Location.t;
+  (* Hack: made pexp_attributes mutable for use in analysis exe. Please do not use elsewhere! *)
+  mutable pexp_attributes: attributes; (* ... [@id1] [@id2] *)
+}
+
+and expression_desc =
+  | Pexp_ident of Longident.t loc (* x
+       M.x
+    *)
+  | Pexp_constant of constant (* 1, 'a', "true", 1.0, 1l, 1L, 1n *)
+  | Pexp_let of rec_flag * value_binding list * expression
+    (* let P1 = E1 and ... and Pn = EN in E       (flag = Nonrecursive)
+       let rec P1 = E1 and ... and Pn = EN in E   (flag = Recursive)
+    *)
+  | Pexp_function of case list (* function P1 -> E1 | ... | Pn -> En *)
+  | Pexp_fun of Noloc.arg_label * expression option * pattern * expression
+    (* fun P -> E1                          (Simple, None)
+       fun ~l:P -> E1                       (Labelled l, None)
+       fun ?l:P -> E1                       (Optional l, None)
+       fun ?l:(P = E0) -> E1                (Optional l, Some E0)
+
+       Notes:
+       - If E0 is provided, only Optional is allowed.
+       - "fun P1 P2 .. Pn -> E1" is represented as nested Pexp_fun.
+       - "let f P = E" is represented using Pexp_fun.
+    *)
+  | Pexp_apply of expression * (Noloc.arg_label * expression) list
+    (* E0 ~l1:E1 ... ~ln:En
+       li can be empty (non labeled argument) or start with '?'
+       (optional argument).
+
+       Invariant: n > 0
+    *)
+  | Pexp_match of expression * case list
+    (* match E0 with P1 -> E1 | ... | Pn -> En *)
+  | Pexp_try of expression * case list
+    (* try E0 with P1 -> E1 | ... | Pn -> En *)
+  | Pexp_tuple of expression list
+    (* (E1, ..., En)
+
+       Invariant: n >= 2
+    *)
+  | Pexp_construct of Longident.t loc * expression option
+    (* C                None
+       C E              Some E
+       C (E1, ..., En)  Some (Pexp_tuple[E1;...;En])
+    *)
+  | Pexp_variant of label * expression option
+    (* `A             (None)
+       `A E           (Some E)
+    *)
+  | Pexp_record of (Longident.t loc * expression) list * expression option
+    (* { l1=P1; ...; ln=Pn }     (None)
+       { E0 with l1=P1; ...; ln=Pn }   (Some E0)
+
+       Invariant: n > 0
+    *)
+  | Pexp_field of expression * Longident.t loc (* E.l *)
+  | Pexp_setfield of expression * Longident.t loc * expression (* E1.l <- E2 *)
+  | Pexp_array of expression list (* [| E1; ...; En |] *)
+  | Pexp_ifthenelse of expression * expression * expression option
+    (* if E1 then E2 else E3 *)
+  | Pexp_sequence of expression * expression (* E1; E2 *)
+  | Pexp_while of expression * expression (* while E1 do E2 done *)
+  | Pexp_for of pattern * expression * expression * direction_flag * expression
+    (* for i = E1 to E2 do E3 done      (flag = Upto)
+       for i = E1 downto E2 do E3 done  (flag = Downto)
+    *)
+  | Pexp_constraint of expression * core_type (* (E : T) *)
+  | Pexp_coerce of expression * unit * core_type
+    (* (E :> T)        (None, T)
+         *)
+  | Pexp_send of expression * label loc (*  E # m *)
+  | Pexp_new of Longident.t loc (* new M.c *)
+  | Pexp_setinstvar of label loc * expression (* x <- 2 *)
+  | Pexp_override of (label loc * expression) list
+    (* {< x1 = E1; ...; Xn = En >} *)
+  | Pexp_letmodule of string loc * module_expr * expression
+    (* let module M = ME in E *)
+  | Pexp_letexception of extension_constructor * expression
+    (* let exception C in E *)
+  | Pexp_assert of expression
+    (* assert E
+       Note: "assert false" is treated in a special way by the
+       type-checker. *)
+  | Pexp_lazy of expression (* lazy E *)
+  | Pexp_poly of expression * core_type option
+    (* Used for method bodies.
+
+       Can only be used as the expression under Cfk_concrete
+       for methods (not values). *)
+  | Pexp_object of unit (* dummy AST node *)
+  | Pexp_newtype of string loc * expression (* fun (type t) -> E *)
+  | Pexp_pack of module_expr
+    (* (module ME)
+
+       (module ME : S) is represented as
+       Pexp_constraint(Pexp_pack, Ptyp_package S) *)
+  | Pexp_open of override_flag * Longident.t loc * expression
+    (* M.(E)
+       let open M in E
+       let! open M in E *)
+  | Pexp_extension of extension (* [%id] *)
+  | Pexp_unreachable
+(* . *)
+
+and case = {
+  (* (P -> E) or (P when E0 -> E) *)
+  pc_lhs: pattern;
+  pc_guard: expression option;
+  pc_rhs: expression;
+}
+
+(* Value descriptions *)
+and value_description = {
+  pval_name: string loc;
+  pval_type: core_type;
+  pval_prim: string list;
+  pval_attributes: attributes; (* ... [@@id1] [@@id2] *)
+  pval_loc: Location.t;
+}
+
+(*
+  val x: T                            (prim = [])
+  external x: T = "s1" ... "sn"       (prim = ["s1";..."sn"])
+*)
+
+(* Type declarations *)
+and type_declaration = {
+  ptype_name: string loc;
+  ptype_params: (core_type * variance) list;
+      (* ('a1,...'an) t; None represents  _*)
+  ptype_cstrs: (core_type * core_type * Location.t) list;
+      (* ... constraint T1=T1'  ... constraint Tn=Tn' *)
+  ptype_kind: type_kind;
+  ptype_private: private_flag; (* = private ... *)
+  ptype_manifest: core_type option; (* = T *)
+  ptype_attributes: attributes; (* ... [@@id1] [@@id2] *)
+  ptype_loc: Location.t;
+}
+
+(*
+  type t                     (abstract, no manifest)
+  type t = T0                (abstract, manifest=T0)
+  type t = C of T | ...      (variant,  no manifest)
+  type t = T0 = C of T | ... (variant,  manifest=T0)
+  type t = {l: T; ...}       (record,   no manifest)
+  type t = T0 = {l : T; ...} (record,   manifest=T0)
+  type t = ..                (open,     no manifest)
+*)
+and type_kind =
+  | Ptype_abstract
+  | Ptype_variant of constructor_declaration list
+    (* Invariant: non-empty list *)
+  | Ptype_record of label_declaration list (* Invariant: non-empty list *)
+  | Ptype_open
+
+and label_declaration = {
+  pld_name: string loc;
+  pld_mutable: mutable_flag;
+  pld_type: core_type;
+  pld_loc: Location.t;
+  pld_attributes: attributes; (* l : T [@id1] [@id2] *)
+}
+
+(* { ...; l: T; ... }            (mutable=Immutable)
+   { ...; mutable l: T; ... }    (mutable=Mutable)
+
+   Note: T can be a Ptyp_poly.
+*)
+and constructor_declaration = {
+  pcd_name: string loc;
+  pcd_args: constructor_arguments;
+  pcd_res: core_type option;
+  pcd_loc: Location.t;
+  pcd_attributes: attributes; (* C of ... [@id1] [@id2] *)
+}
+
+and constructor_arguments =
+  | Pcstr_tuple of core_type list
+  | Pcstr_record of label_declaration list
+
+(*
+  | C of T1 * ... * Tn     (res = None,    args = Pcstr_tuple [])
+  | C: T0                  (res = Some T0, args = [])
+  | C: T1 * ... * Tn -> T0 (res = Some T0, args = Pcstr_tuple)
+  | C of {...}             (res = None,    args = Pcstr_record)
+  | C: {...} -> T0         (res = Some T0, args = Pcstr_record)
+  | C of {...} as t        (res = None,    args = Pcstr_record)
+*)
+and type_extension = {
+  ptyext_path: Longident.t loc;
+  ptyext_params: (core_type * variance) list;
+  ptyext_constructors: extension_constructor list;
+  ptyext_private: private_flag;
+  ptyext_attributes: attributes; (* ... [@@id1] [@@id2] *)
+}
+(*
+  type t += ...
+*)
+
+and extension_constructor = {
+  pext_name: string loc;
+  pext_kind: extension_constructor_kind;
+  pext_loc: Location.t;
+  pext_attributes: attributes; (* C of ... [@id1] [@id2] *)
+}
+
+and extension_constructor_kind =
+  | Pext_decl of constructor_arguments * core_type option
+    (*
+         | C of T1 * ... * Tn     ([T1; ...; Tn], None)
+         | C: T0                  ([], Some T0)
+         | C: T1 * ... * Tn -> T0 ([T1; ...; Tn], Some T0)
+       *)
+  | Pext_rebind of Longident.t loc
+(*
+         | C = D
+       *)
+
+(* Type expressions for the module language *)
+
+(** {1 Module language} *)
+
+and module_type = {
+  pmty_desc: module_type_desc;
+  pmty_loc: Location.t;
+  pmty_attributes: attributes; (* ... [@id1] [@id2] *)
+}
+
+and module_type_desc =
+  | Pmty_ident of Longident.t loc (* S *)
+  | Pmty_signature of signature (* sig ... end *)
+  | Pmty_functor of string loc * module_type option * module_type
+    (* functor(X : MT1) -> MT2 *)
+  | Pmty_with of module_type * with_constraint list (* MT with ... *)
+  | Pmty_typeof of module_expr (* module type of ME *)
+  | Pmty_extension of extension (* [%id] *)
+  | Pmty_alias of Longident.t loc
+(* (module M) *)
+
+and signature = signature_item list
+
+and signature_item = {psig_desc: signature_item_desc; psig_loc: Location.t}
+
+and signature_item_desc =
+  | Psig_value of value_description
+    (*
+          val x: T
+          external x: T = "s1" ... "sn"
+         *)
+  | Psig_type of rec_flag * type_declaration list
+    (* type t1 = ... and ... and tn = ... *)
+  | Psig_typext of type_extension (* type t1 += ... *)
+  | Psig_exception of extension_constructor (* exception C of T *)
+  | Psig_module of module_declaration (* module X : MT *)
+  | Psig_recmodule of module_declaration list
+    (* module rec X1 : MT1 and ... and Xn : MTn *)
+  | Psig_modtype of module_type_declaration
+    (* module type S = MT
+       module type S *)
+  | Psig_open of open_description (* open X *)
+  | Psig_include of include_description (* include MT *)
+  | Psig_class of unit (* Dummy AST node *)
+  | Psig_class_type of unit (* Dummy AST node *)
+  | Psig_attribute of attribute (* [@@@id] *)
+  | Psig_extension of extension * attributes
+(* [%%id] *)
+
+and module_declaration = {
+  pmd_name: string loc;
+  pmd_type: module_type;
+  pmd_attributes: attributes; (* ... [@@id1] [@@id2] *)
+  pmd_loc: Location.t;
+}
+(* S : MT *)
+
+and module_type_declaration = {
+  pmtd_name: string loc;
+  pmtd_type: module_type option;
+  pmtd_attributes: attributes; (* ... [@@id1] [@@id2] *)
+  pmtd_loc: Location.t;
+}
+(* S = MT
+   S       (abstract module type declaration, pmtd_type = None)
+*)
+
+and open_description = {
+  popen_lid: Longident.t loc;
+  popen_override: override_flag;
+  popen_loc: Location.t;
+  popen_attributes: attributes;
+}
+(* open! X - popen_override = Override (silences the 'used identifier
+                              shadowing' warning)
+   open  X - popen_override = Fresh
+*)
+
+and 'a include_infos = {
+  pincl_mod: 'a;
+  pincl_loc: Location.t;
+  pincl_attributes: attributes;
+}
+
+and include_description = module_type include_infos
+(* include MT *)
+
+and include_declaration = module_expr include_infos
+(* include ME *)
+
+and with_constraint =
+  | Pwith_type of Longident.t loc * type_declaration
+    (* with type X.t = ...
+
+       Note: the last component of the longident must match
+       the name of the type_declaration. *)
+  | Pwith_module of Longident.t loc * Longident.t loc (* with module X.Y = Z *)
+  | Pwith_typesubst of Longident.t loc * type_declaration
+    (* with type X.t := ..., same format as [Pwith_type] *)
+  | Pwith_modsubst of Longident.t loc * Longident.t loc
+(* with module X.Y := Z *)
+
+(* Value expressions for the module language *)
+
+and module_expr = {
+  pmod_desc: module_expr_desc;
+  pmod_loc: Location.t;
+  pmod_attributes: attributes; (* ... [@id1] [@id2] *)
+}
+
+and module_expr_desc =
+  | Pmod_ident of Longident.t loc (* X *)
+  | Pmod_structure of structure (* struct ... end *)
+  | Pmod_functor of string loc * module_type option * module_expr
+    (* functor(X : MT1) -> ME *)
+  | Pmod_apply of module_expr * module_expr (* ME1(ME2) *)
+  | Pmod_constraint of module_expr * module_type (* (ME : MT) *)
+  | Pmod_unpack of expression (* (val E) *)
+  | Pmod_extension of extension
+(* [%id] *)
+
+and structure = structure_item list
+
+and structure_item = {pstr_desc: structure_item_desc; pstr_loc: Location.t}
+
+and structure_item_desc =
+  | Pstr_eval of expression * attributes (* E *)
+  | Pstr_value of rec_flag * value_binding list
+    (* let P1 = E1 and ... and Pn = EN       (flag = Nonrecursive)
+       let rec P1 = E1 and ... and Pn = EN   (flag = Recursive)
+    *)
+  | Pstr_primitive of value_description
+    (* val x: T
+       external x: T = "s1" ... "sn" *)
+  | Pstr_type of rec_flag * type_declaration list
+    (* type t1 = ... and ... and tn = ... *)
+  | Pstr_typext of type_extension (* type t1 += ... *)
+  | Pstr_exception of extension_constructor
+    (* exception C of T
+       exception C = M.X *)
+  | Pstr_module of module_binding (* module X = ME *)
+  | Pstr_recmodule of module_binding list
+    (* module rec X1 = ME1 and ... and Xn = MEn *)
+  | Pstr_modtype of module_type_declaration (* module type S = MT *)
+  | Pstr_open of open_description (* open X *)
+  | Pstr_class of unit (* Dummy AST node *)
+  | Pstr_class_type of unit (* Dummy AST node *)
+  | Pstr_include of include_declaration (* include ME *)
+  | Pstr_attribute of attribute (* [@@@id] *)
+  | Pstr_extension of extension * attributes
+(* [%%id] *)
+
+and value_binding = {
+  pvb_pat: pattern;
+  pvb_expr: expression;
+  pvb_attributes: attributes;
+  pvb_loc: Location.t;
+}
+
+and module_binding = {
+  pmb_name: string loc;
+  pmb_expr: module_expr;
+  pmb_attributes: attributes;
+  pmb_loc: Location.t;
+}
+(* X = ME *)
+
+let optional_attr = (Location.mknoloc "res.optional", Parsetree.PStr [])
+let optional_attr0 = (Location.mknoloc "res.optional", PStr [])
+
+let add_optional_attr ~optional attrs =
+  if optional then optional_attr0 :: attrs else attrs
+
+let get_optional_attr attrs_ =
+  let remove_optional_attr attrs =
+    List.filter (fun a -> a <> optional_attr) attrs
+  in
+  let attrs = remove_optional_attr attrs_ in
+  let optional = List.length attrs <> List.length attrs_ in
+  (optional, attrs)
diff --git a/compiler/ml/path.ml b/compiler/ml/path.ml
new file mode 100644
index 0000000..d3c78a3
--- /dev/null
+++ b/compiler/ml/path.ml
@@ -0,0 +1,106 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+type t = Pident of Ident.t | Pdot of t * string * int | Papply of t * t
+
+let nopos = -1
+
+let rec same p1 p2 =
+  match (p1, p2) with
+  | Pident id1, Pident id2 -> Ident.same id1 id2
+  | Pdot (p1, s1, _pos1), Pdot (p2, s2, _pos2) -> s1 = s2 && same p1 p2
+  | Papply (fun1, arg1), Papply (fun2, arg2) -> same fun1 fun2 && same arg1 arg2
+  | _, _ -> false
+
+let rec compare p1 p2 =
+  match (p1, p2) with
+  | Pident id1, Pident id2 -> Ident.compare id1 id2
+  | Pdot (p1, s1, _pos1), Pdot (p2, s2, _pos2) ->
+    let h = compare p1 p2 in
+    if h <> 0 then h else String.compare s1 s2
+  | Papply (fun1, arg1), Papply (fun2, arg2) ->
+    let h = compare fun1 fun2 in
+    if h <> 0 then h else compare arg1 arg2
+  | (Pident _ | Pdot _), (Pdot _ | Papply _) -> -1
+  | (Pdot _ | Papply _), (Pident _ | Pdot _) -> 1
+
+let rec isfree id = function
+  | Pident id' -> Ident.same id id'
+  | Pdot (p, _s, _pos) -> isfree id p
+  | Papply (p1, p2) -> isfree id p1 || isfree id p2
+
+let rec binding_time = function
+  | Pident id -> Ident.binding_time id
+  | Pdot (p, _s, _pos) -> binding_time p
+  | Papply (p1, p2) ->
+    Ext_pervasives.max_int (binding_time p1) (binding_time p2)
+
+let kfalse _ = false
+
+let rec name ?(paren = kfalse) = function
+  | Pident id -> Ident.name id
+  | Pdot (p, s, _pos) ->
+    name ~paren p ^ if paren s then ".( " ^ s ^ " )" else "." ^ s
+  | Papply (p1, p2) -> name ~paren p1 ^ "(" ^ name ~paren p2 ^ ")"
+
+let rec head = function
+  | Pident id -> id
+  | Pdot (p, _s, _pos) -> head p
+  | Papply _ -> assert false
+
+let flatten =
+  let rec flatten acc = function
+    | Pident id -> `Ok (id, acc)
+    | Pdot (p, s, _) -> flatten (s :: acc) p
+    | Papply _ -> `Contains_apply
+  in
+  fun t -> flatten [] t
+
+let heads p =
+  let rec heads p acc =
+    match p with
+    | Pident id -> id :: acc
+    | Pdot (p, _s, _pos) -> heads p acc
+    | Papply (p1, p2) -> heads p1 (heads p2 acc)
+  in
+  heads p []
+
+let rec last = function
+  | Pident id -> Ident.name id
+  | Pdot (_, s, _) -> s
+  | Papply (_, p) -> last p
+
+let is_uident s =
+  assert (s <> "");
+  match s.[0] with
+  | 'A' .. 'Z' -> true
+  | _ -> false
+
+type typath =
+  | Regular of t
+  | Ext of t * string
+  | LocalExt of Ident.t
+  | Cstr of t * string
+
+let constructor_typath = function
+  | Pident id when is_uident (Ident.name id) -> LocalExt id
+  | Pdot (ty_path, s, _) when is_uident s ->
+    if is_uident (last ty_path) then Ext (ty_path, s) else Cstr (ty_path, s)
+  | p -> Regular p
+
+let is_constructor_typath p =
+  match constructor_typath p with
+  | Regular _ -> false
+  | _ -> true
diff --git a/compiler/ml/path.mli b/compiler/ml/path.mli
new file mode 100644
index 0000000..0c24ae1
--- /dev/null
+++ b/compiler/ml/path.mli
@@ -0,0 +1,44 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Access paths *)
+
+type t = Pident of Ident.t | Pdot of t * string * int | Papply of t * t
+
+val same : t -> t -> bool
+val compare : t -> t -> int
+val isfree : Ident.t -> t -> bool
+val binding_time : t -> int
+val flatten : t -> [`Contains_apply | `Ok of Ident.t * string list]
+
+val nopos : int
+
+val name : ?paren:(string -> bool) -> t -> string
+(* [paren] tells whether a path suffix needs parentheses *)
+
+val head : t -> Ident.t
+
+val heads : t -> Ident.t list
+
+val last : t -> string
+
+type typath =
+  | Regular of t
+  | Ext of t * string
+  | LocalExt of Ident.t
+  | Cstr of t * string
+
+val constructor_typath : t -> typath
+val is_constructor_typath : t -> bool
diff --git a/compiler/ml/pprintast.ml b/compiler/ml/pprintast.ml
new file mode 100644
index 0000000..585ac64
--- /dev/null
+++ b/compiler/ml/pprintast.ml
@@ -0,0 +1,1361 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                      Thomas Gazagnaire, OCamlPro                       *)
+(*                   Fabrice Le Fessant, INRIA Saclay                     *)
+(*               Hongbo Zhang, University of Pennsylvania                 *)
+(*                                                                        *)
+(*   Copyright 2007 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Original Code from Ber-metaocaml, modified for 3.12.0 and fixed *)
+(* Printing code expressions *)
+(* Authors:  Ed Pizzi, Fabrice Le Fessant *)
+(* Extensive Rewrite: Hongbo Zhang: University of Pennsylvania *)
+(* TODO more fine-grained precedence pretty-printing *)
+
+open Asttypes
+open Format
+open Location
+open Longident
+open Parsetree
+open Ast_helper
+
+let prefix_symbols = ['!'; '?'; '~']
+let infix_symbols =
+  ['='; '<'; '>'; '@'; '^'; '|'; '&'; '+'; '-'; '*'; '/'; '$'; '%'; '#']
+
+(* type fixity = Infix| Prefix  *)
+let special_infix_strings =
+  ["asr"; "land"; "lor"; "lsl"; "lsr"; "lxor"; "mod"; "or"; ":="; "!="; "::"]
+
+(* determines if the string is an infix string.
+   checks backwards, first allowing a renaming postfix ("_102") which
+   may have resulted from Pexp -> Texp -> Pexp translation, then checking
+   if all the characters in the beginning of the string are valid infix
+   characters. *)
+let fixity_of_string = function
+  | s when List.mem s special_infix_strings -> `Infix s
+  | s when List.mem s.[0] infix_symbols -> `Infix s
+  | s when List.mem s.[0] prefix_symbols -> `Prefix s
+  | s when s.[0] = '.' -> `Mixfix s
+  | _ -> `Normal
+
+let view_fixity_of_exp = function
+  | {pexp_desc = Pexp_ident {txt = Lident l; _}; pexp_attributes = []} ->
+    fixity_of_string l
+  | _ -> `Normal
+
+let is_infix = function
+  | `Infix _ -> true
+  | _ -> false
+let is_mixfix = function
+  | `Mixfix _ -> true
+  | _ -> false
+
+(* which identifiers are in fact operators needing parentheses *)
+let needs_parens txt =
+  let fix = fixity_of_string txt in
+  is_infix fix || is_mixfix fix || List.mem txt.[0] prefix_symbols
+
+(* some infixes need spaces around parens to avoid clashes with comment
+   syntax *)
+let needs_spaces txt = txt.[0] = '*' || txt.[String.length txt - 1] = '*'
+
+(* add parentheses to binders when they are in fact infix or prefix operators *)
+let protect_ident ppf txt =
+  let format : (_, _, _) format =
+    if not (needs_parens txt) then "%s"
+    else if needs_spaces txt then "(@;%s@;)"
+    else "(%s)"
+  in
+  fprintf ppf format txt
+
+let protect_longident ppf print_longident longprefix txt =
+  let format : (_, _, _) format =
+    if not (needs_parens txt) then "%a.%s"
+    else if needs_spaces txt then "%a.(@;%s@;)"
+    else "%a.(%s)"
+  in
+  fprintf ppf format print_longident longprefix txt
+
+type space_formatter = (unit, Format.formatter, unit) format
+
+let override = function
+  | Override -> "!"
+  | Fresh -> ""
+
+(* variance encoding: need to sync up with the [parser.mly] *)
+let type_variance = function
+  | Invariant -> ""
+  | Covariant -> "+"
+  | Contravariant -> "-"
+
+type construct =
+  [ `cons of expression list
+  | `list of expression list
+  | `nil
+  | `normal
+  | `simple of Longident.t
+  | `tuple ]
+
+let view_expr x =
+  match x.pexp_desc with
+  | Pexp_construct ({txt = Lident "()"; _}, _) -> `tuple
+  | Pexp_construct ({txt = Lident "[]"; _}, _) -> `nil
+  | Pexp_construct ({txt = Lident "::"; _}, Some _) ->
+    let rec loop exp acc =
+      match exp with
+      | {
+       pexp_desc = Pexp_construct ({txt = Lident "[]"; _}, _);
+       pexp_attributes = [];
+      } ->
+        (List.rev acc, true)
+      | {
+       pexp_desc =
+         Pexp_construct
+           ( {txt = Lident "::"; _},
+             Some {pexp_desc = Pexp_tuple [e1; e2]; pexp_attributes = []} );
+       pexp_attributes = [];
+      } ->
+        loop e2 (e1 :: acc)
+      | e -> (List.rev (e :: acc), false)
+    in
+    let ls, b = loop x [] in
+    if b then `list ls else `cons ls
+  | Pexp_construct (x, None) -> `simple x.txt
+  | _ -> `normal
+
+let is_simple_construct : construct -> bool = function
+  | `nil | `tuple | `list _ | `simple _ -> true
+  | `cons _ | `normal -> false
+
+let pp = fprintf
+
+type ctxt = {pipe: bool; semi: bool; ifthenelse: bool}
+
+let reset_ctxt = {pipe = false; semi = false; ifthenelse = false}
+let under_pipe ctxt = {ctxt with pipe = true}
+let under_semi ctxt = {ctxt with semi = true}
+let under_ifthenelse ctxt = {ctxt with ifthenelse = true}
+(*
+let reset_semi ctxt = { ctxt with semi=false }
+let reset_ifthenelse ctxt = { ctxt with ifthenelse=false }
+let reset_pipe ctxt = { ctxt with pipe=false }
+*)
+
+let list :
+    'a.
+    ?sep:space_formatter ->
+    ?first:space_formatter ->
+    ?last:space_formatter ->
+    (Format.formatter -> 'a -> unit) ->
+    Format.formatter ->
+    'a list ->
+    unit =
+ fun ?sep ?first ?last fu f xs ->
+  let first =
+    match first with
+    | Some x -> x
+    | None -> ("" : _ format6)
+  and last =
+    match last with
+    | Some x -> x
+    | None -> ("" : _ format6)
+  and sep =
+    match sep with
+    | Some x -> x
+    | None -> ("@ " : _ format6)
+  in
+  let aux f = function
+    | [] -> ()
+    | [x] -> fu f x
+    | xs ->
+      let rec loop f = function
+        | [x] -> fu f x
+        | x :: xs ->
+          fu f x;
+          pp f sep;
+          loop f xs
+        | _ -> assert false
+      in
+      pp f first;
+      loop f xs;
+      pp f last
+  in
+  aux f xs
+
+let option :
+    'a.
+    ?first:space_formatter ->
+    ?last:space_formatter ->
+    (Format.formatter -> 'a -> unit) ->
+    Format.formatter ->
+    'a option ->
+    unit =
+ fun ?first ?last fu f a ->
+  let first =
+    match first with
+    | Some x -> x
+    | None -> ("" : _ format6)
+  and last =
+    match last with
+    | Some x -> x
+    | None -> ("" : _ format6)
+  in
+  match a with
+  | None -> ()
+  | Some x ->
+    pp f first;
+    fu f x;
+    pp f last
+
+let paren :
+    'a.
+    ?first:space_formatter ->
+    ?last:space_formatter ->
+    bool ->
+    (Format.formatter -> 'a -> unit) ->
+    Format.formatter ->
+    'a ->
+    unit =
+ fun ?(first = ("" : _ format6)) ?(last = ("" : _ format6)) b fu f x ->
+  if b then (
+    pp f "(";
+    pp f first;
+    fu f x;
+    pp f last;
+    pp f ")")
+  else fu f x
+
+let rec longident f = function
+  | Lident s -> protect_ident f s
+  | Ldot (y, s) -> protect_longident f longident y s
+  | Lapply (y, s) -> pp f "%a(%a)" longident y longident s
+
+let longident_loc f x = pp f "%a" longident x.txt
+
+let string_of_int_as_char i = Ext_util.string_of_int_as_char i
+
+let constant f = function
+  | Pconst_char i -> pp f "%s" (string_of_int_as_char i)
+  | Pconst_string (i, None) -> pp f "%S" i
+  | Pconst_string (i, Some delim) -> pp f "{%s|%s|%s}" delim i delim
+  | Pconst_integer (i, None) -> paren (i.[0] = '-') (fun f -> pp f "%s") f i
+  | Pconst_integer (i, Some m) ->
+    paren (i.[0] = '-') (fun f (i, m) -> pp f "%s%c" i m) f (i, m)
+  | Pconst_float (i, None) -> paren (i.[0] = '-') (fun f -> pp f "%s") f i
+  | Pconst_float (i, Some m) ->
+    paren (i.[0] = '-') (fun f (i, m) -> pp f "%s%c" i m) f (i, m)
+
+(* trailing space*)
+let mutable_flag f = function
+  | Immutable -> ()
+  | Mutable -> pp f "mutable@;"
+
+let optional_flag f = function
+  | false -> ()
+  | true -> pp f "?"
+
+(* trailing space added *)
+let rec_flag f rf =
+  match rf with
+  | Nonrecursive -> ()
+  | Recursive -> pp f "rec "
+let nonrec_flag f rf =
+  match rf with
+  | Nonrecursive -> pp f "nonrec "
+  | Recursive -> ()
+let direction_flag f = function
+  | Upto -> pp f "to@ "
+  | Downto -> pp f "downto@ "
+let private_flag f = function
+  | Public -> ()
+  | Private -> pp f "private@ "
+
+let constant_string f s = pp f "%S" s
+let tyvar f str = pp f "'%s" str
+let tyvar_loc f str = pp f "'%s" str.txt
+let string_quot f x = pp f "`%s" x
+
+let rec type_with_label ctxt f arg =
+  match arg.lbl with
+  | Nolabel ->
+    pp f "%a%a" (core_type1 ctxt) arg.typ (attributes ctxt) arg.attrs
+    (* otherwise parenthesize *)
+  | Labelled {txt = s} ->
+    pp f "%s:%a%a" s (core_type1 ctxt) arg.typ (attributes ctxt) arg.attrs
+  | Optional {txt = s} ->
+    pp f "?%s:%a%a" s (core_type1 ctxt) arg.typ (attributes ctxt) arg.attrs
+
+and core_type ctxt f x =
+  if x.ptyp_attributes <> [] then
+    pp f "((%a)%a)" (core_type ctxt)
+      {x with ptyp_attributes = []}
+      (attributes ctxt) x.ptyp_attributes
+  else
+    match x.ptyp_desc with
+    | Ptyp_arrow {arg; ret; arity} ->
+      pp f "@[<2>%a@;->@;%a%s@]" (* FIXME remove parens later *)
+        (type_with_label ctxt) arg (core_type ctxt) ret
+        (match arity with
+        | None -> ""
+        | Some n -> " (a:" ^ string_of_int n ^ ")")
+    | Ptyp_alias (ct, s) -> pp f "@[<2>%a@;as@;'%s@]" (core_type1 ctxt) ct s
+    | Ptyp_poly ([], ct) -> core_type ctxt f ct
+    | Ptyp_poly (sl, ct) ->
+      pp f "@[<2>%a%a@]"
+        (fun f l ->
+          pp f "%a"
+            (fun f l ->
+              match l with
+              | [] -> ()
+              | _ -> pp f "%a@;.@;" (list tyvar_loc ~sep:"@;") l)
+            l)
+        sl (core_type ctxt) ct
+    | _ -> pp f "@[<2>%a@]" (core_type1 ctxt) x
+
+and core_type1 ctxt f x =
+  if x.ptyp_attributes <> [] then core_type ctxt f x
+  else
+    match x.ptyp_desc with
+    | Ptyp_any -> pp f "_"
+    | Ptyp_var s -> tyvar f s
+    | Ptyp_tuple l -> pp f "(%a)" (list (core_type1 ctxt) ~sep:"@;*@;") l
+    | Ptyp_constr (li, l) ->
+      pp f (* "%a%a@;" *) "%a%a"
+        (fun f l ->
+          match l with
+          | [] -> ()
+          | [x] -> pp f "%a@;" (core_type1 ctxt) x
+          | _ -> list ~first:"(" ~last:")@;" (core_type ctxt) ~sep:",@;" f l)
+        l longident_loc li
+    | Ptyp_variant (l, closed, low) ->
+      let type_variant_helper f x =
+        match x with
+        | Rtag (l, attrs, _, ctl) ->
+          pp f "@[<2>%a%a@;%a@]" string_quot l.txt
+            (fun f l ->
+              match l with
+              | [] -> ()
+              | _ -> pp f "@;of@;%a" (list (core_type ctxt) ~sep:"&") ctl)
+            ctl (attributes ctxt) attrs
+        | Rinherit ct -> core_type ctxt f ct
+      in
+      pp f "@[<2>[%a%a]@]"
+        (fun f l ->
+          match (l, closed) with
+          | [], Closed -> ()
+          | [], Open -> pp f ">" (* Cf #7200: print [>] correctly *)
+          | _ ->
+            pp f "%s@;%a"
+              (match (closed, low) with
+              | Closed, None -> ""
+              | Closed, Some _ -> "<" (* FIXME desugar the syntax sugar*)
+              | Open, _ -> ">")
+              (list type_variant_helper ~sep:"@;<1 -2>| ")
+              l)
+        l
+        (fun f low ->
+          match low with
+          | Some [] | None -> ()
+          | Some xs -> pp f ">@ %a" (list string_quot) xs)
+        low
+    | Ptyp_object (l, o) ->
+      let core_field_type f = function
+        | Otag (l, attrs, ct) ->
+          pp f "@[<hov2>%s: %a@ %a@ @]" l.txt (core_type ctxt) ct
+            (attributes ctxt) attrs (* Cf #7200 *)
+        | Oinherit ct -> pp f "@[<hov2>%a@ @]" (core_type ctxt) ct
+      in
+      let field_var f = function
+        | Asttypes.Closed -> ()
+        | Asttypes.Open -> (
+          match l with
+          | [] -> pp f ".."
+          | _ -> pp f " ;..")
+      in
+      pp f "@[<hov2><@ %a%a@ > @]"
+        (list core_field_type ~sep:";")
+        l field_var o (* Cf #7200 *)
+    | Ptyp_package (lid, cstrs) -> (
+      let aux f (s, ct) =
+        pp f "type %a@ =@ %a" longident_loc s (core_type ctxt) ct
+      in
+      match cstrs with
+      | [] -> pp f "@[<hov2>(module@ %a)@]" longident_loc lid
+      | _ ->
+        pp f "@[<hov2>(module@ %a@ with@ %a)@]" longident_loc lid
+          (list aux ~sep:"@ and@ ") cstrs)
+    | Ptyp_extension e -> extension ctxt f e
+    | _ -> paren true (core_type ctxt) f x
+
+(********************pattern********************)
+(* be cautious when use [pattern], [pattern1] is preferred *)
+and pattern ctxt f x =
+  let rec list_of_pattern acc = function
+    (* only consider ((A|B)|C)*)
+    | {ppat_desc = Ppat_or (p1, p2); ppat_attributes = []} ->
+      list_of_pattern (p2 :: acc) p1
+    | x -> x :: acc
+  in
+  if x.ppat_attributes <> [] then
+    pp f "((%a)%a)" (pattern ctxt)
+      {x with ppat_attributes = []}
+      (attributes ctxt) x.ppat_attributes
+  else
+    match x.ppat_desc with
+    | Ppat_alias (p, s) ->
+      pp f "@[<2>%a@;as@;%a@]" (pattern ctxt) p protect_ident s.txt (* RA*)
+    | Ppat_or _ ->
+      (* *)
+      pp f "@[<hov0>%a@]"
+        (list ~sep:"@,|" (pattern ctxt))
+        (list_of_pattern [] x)
+    | _ -> pattern1 ctxt f x
+
+and pattern1 ctxt (f : Format.formatter) (x : pattern) : unit =
+  let rec pattern_list_helper f = function
+    | {
+        ppat_desc =
+          Ppat_construct
+            ( {txt = Lident "::"; _},
+              Some {ppat_desc = Ppat_tuple [pat1; pat2]; _} );
+        ppat_attributes = [];
+      } ->
+      pp f "%a::%a" (simple_pattern ctxt) pat1 pattern_list_helper pat2 (*RA*)
+    | p -> pattern1 ctxt f p
+  in
+  if x.ppat_attributes <> [] then pattern ctxt f x
+  else
+    match x.ppat_desc with
+    | Ppat_variant (l, Some p) ->
+      pp f "@[<2>`%s@;%a@]" l (simple_pattern ctxt) p
+    | Ppat_construct ({txt = Lident ("()" | "[]"); _}, _) ->
+      simple_pattern ctxt f x
+    | Ppat_construct (({txt; _} as li), po) -> (
+      if
+        (* FIXME The third field always false *)
+        txt = Lident "::"
+      then pp f "%a" pattern_list_helper x
+      else
+        match po with
+        | Some x -> pp f "%a@;%a" longident_loc li (simple_pattern ctxt) x
+        | None -> pp f "%a" longident_loc li)
+    | _ -> simple_pattern ctxt f x
+
+and simple_pattern ctxt (f : Format.formatter) (x : pattern) : unit =
+  if x.ppat_attributes <> [] then pattern ctxt f x
+  else
+    match x.ppat_desc with
+    | Ppat_construct ({txt = Lident (("()" | "[]") as x); _}, _) -> pp f "%s" x
+    | Ppat_any -> pp f "_"
+    | Ppat_var {txt; _} -> protect_ident f txt
+    | Ppat_array l -> pp f "@[<2>[|%a|]@]" (list (pattern1 ctxt) ~sep:";") l
+    | Ppat_unpack s -> pp f "(module@ %s)@ " s.txt
+    | Ppat_type li -> pp f "#%a" longident_loc li
+    | Ppat_record (l, closed) -> (
+      let longident_x_pattern f {lid = li; x = p; opt} =
+        let opt_str = if opt then "?" else "" in
+        match (li, p) with
+        | ( {txt = Lident s; _},
+            {ppat_desc = Ppat_var {txt; _}; ppat_attributes = []; _} )
+          when s = txt ->
+          pp f "@[<2>%a%s@]" longident_loc li opt_str
+        | _ ->
+          pp f "@[<2>%a%s@;=@;%a@]" longident_loc li opt_str (pattern1 ctxt) p
+      in
+      match closed with
+      | Closed -> pp f "@[<2>{@;%a@;}@]" (list longident_x_pattern ~sep:";@;") l
+      | _ -> pp f "@[<2>{@;%a;_}@]" (list longident_x_pattern ~sep:";@;") l)
+    | Ppat_tuple l ->
+      pp f "@[<1>(%a)@]" (list ~sep:",@;" (pattern1 ctxt)) l (* level1*)
+    | Ppat_constant c -> pp f "%a" constant c
+    | Ppat_interval (c1, c2) -> pp f "%a..%a" constant c1 constant c2
+    | Ppat_variant (l, None) -> pp f "`%s" l
+    | Ppat_constraint (p, ct) ->
+      pp f "@[<2>(%a@;:@;%a)@]" (pattern1 ctxt) p (core_type ctxt) ct
+    | Ppat_exception p -> pp f "@[<2>exception@;%a@]" (pattern1 ctxt) p
+    | Ppat_extension e -> extension ctxt f e
+    | Ppat_open (lid, p) ->
+      let with_paren =
+        match p.ppat_desc with
+        | Ppat_array _ | Ppat_record _
+        | Ppat_construct ({txt = Lident ("()" | "[]"); _}, _) ->
+          false
+        | _ -> true
+      in
+      pp f "@[<2>%a.%a @]" longident_loc lid
+        (paren with_paren @@ pattern1 ctxt)
+        p
+    | _ -> paren true (pattern ctxt) f x
+
+and label_exp ctxt f (l, opt, p) =
+  match l with
+  | Nolabel ->
+    (* single case pattern parens needed here *)
+    pp f "%a@ " (simple_pattern ctxt) p
+  | Optional {txt = rest} -> (
+    match p with
+    | {ppat_desc = Ppat_var {txt; _}; ppat_attributes = []} when txt = rest -> (
+      match opt with
+      | Some o -> pp f "?(%s=@;%a)@;" rest (expression ctxt) o
+      | None -> pp f "?%s@ " rest)
+    | _ -> (
+      match opt with
+      | Some o ->
+        pp f "?%s:(%a=@;%a)@;" rest (pattern1 ctxt) p (expression ctxt) o
+      | None -> pp f "?%s:%a@;" rest (simple_pattern ctxt) p))
+  | Labelled {txt = l} -> (
+    match p with
+    | {ppat_desc = Ppat_var {txt; _}; ppat_attributes = []} when txt = l ->
+      pp f "~%s@;" l
+    | _ -> pp f "~%s:%a@;" l (simple_pattern ctxt) p)
+
+and sugar_expr ctxt f e =
+  if e.pexp_attributes <> [] then false
+  else
+    match e.pexp_desc with
+    | Pexp_apply
+        {
+          funct = {pexp_desc = Pexp_ident {txt = id; _}; pexp_attributes = []; _};
+          args;
+        }
+      when List.for_all (fun (lab, _) -> lab = Nolabel) args -> (
+      let print_indexop a path_prefix assign left right print_index indices
+          rem_args =
+        let print_path ppf = function
+          | None -> ()
+          | Some m -> pp ppf ".%a" longident m
+        in
+        match (assign, rem_args) with
+        | false, [] ->
+          pp f "@[%a%a%s%a%s@]" (simple_expr ctxt) a print_path path_prefix left
+            (list ~sep:"," print_index)
+            indices right;
+          true
+        | true, [v] ->
+          pp f "@[%a%a%s%a%s@ <-@;<1 2>%a@]" (simple_expr ctxt) a print_path
+            path_prefix left
+            (list ~sep:"," print_index)
+            indices right (simple_expr ctxt) v;
+          true
+        | _ -> false
+      in
+      match (id, List.map snd args) with
+      | Lident "!", [e] ->
+        pp f "@[<hov>!%a@]" (simple_expr ctxt) e;
+        true
+      | Ldot (path, (("get" | "set") as func)), a :: other_args -> (
+        let assign = func = "set" in
+        let print = print_indexop a None assign in
+        match (path, other_args) with
+        | Lident "Array", i :: rest -> print ".(" ")" (expression ctxt) [i] rest
+        | Lident "String", i :: rest ->
+          print ".[" "]" (expression ctxt) [i] rest
+        | Ldot (Lident "Bigarray", "Array1"), i1 :: rest ->
+          print ".{" "}" (simple_expr ctxt) [i1] rest
+        | Ldot (Lident "Bigarray", "Array2"), i1 :: i2 :: rest ->
+          print ".{" "}" (simple_expr ctxt) [i1; i2] rest
+        | Ldot (Lident "Bigarray", "Array3"), i1 :: i2 :: i3 :: rest ->
+          print ".{" "}" (simple_expr ctxt) [i1; i2; i3] rest
+        | ( Ldot (Lident "Bigarray", "Genarray"),
+            {pexp_desc = Pexp_array indexes; pexp_attributes = []} :: rest ) ->
+          print ".{" "}" (simple_expr ctxt) indexes rest
+        | _ -> false)
+      | (Lident s | Ldot (_, s)), a :: i :: rest when s.[0] = '.' ->
+        let n = String.length s in
+        (* extract operator:
+           assignment operators end with [right_bracket ^ "<-"],
+           access operators end with [right_bracket] directly
+        *)
+        let assign = s.[n - 1] = '-' in
+        let kind =
+          (* extract the right end bracket *)
+          if assign then s.[n - 3] else s.[n - 1]
+        in
+        let left, right =
+          match kind with
+          | ')' -> ('(', ")")
+          | ']' -> ('[', "]")
+          | '}' -> ('{', "}")
+          | _ -> assert false
+        in
+        let path_prefix =
+          match id with
+          | Ldot (m, _) -> Some m
+          | _ -> None
+        in
+        let left = String.sub s 0 (1 + String.index s left) in
+        print_indexop a path_prefix assign left right (expression ctxt) [i] rest
+      | _ -> false)
+    | _ -> false
+
+and expression ctxt f x =
+  if x.pexp_attributes <> [] then
+    pp f "((%a)@,%a)" (expression ctxt)
+      {x with pexp_attributes = []}
+      (attributes ctxt) x.pexp_attributes
+  else
+    match x.pexp_desc with
+    | (Pexp_fun _ | Pexp_match _ | Pexp_try _ | Pexp_sequence _)
+      when ctxt.pipe || ctxt.semi ->
+      paren true (expression reset_ctxt) f x
+    | (Pexp_ifthenelse _ | Pexp_sequence _) when ctxt.ifthenelse ->
+      paren true (expression reset_ctxt) f x
+    | (Pexp_let _ | Pexp_letmodule _ | Pexp_open _ | Pexp_letexception _)
+      when ctxt.semi ->
+      paren true (expression reset_ctxt) f x
+    | Pexp_fun {arg_label = l; default = e0; lhs = p; rhs = e; arity; async} ->
+      let arity_str =
+        match arity with
+        | None -> ""
+        | Some arity -> "[arity:" ^ string_of_int arity ^ "]"
+      in
+      let async_str = if async then "async " else "" in
+      pp f "@[<2>%sfun@;%s%a->@;%a@]" async_str arity_str (label_exp ctxt)
+        (l, e0, p) (expression ctxt) e
+    | Pexp_match (e, l) ->
+      pp f "@[<hv0>@[<hv0>@[<2>match %a@]@ with@]%a@]" (expression reset_ctxt) e
+        (case_list ctxt) l
+    | Pexp_try (e, l) ->
+      pp f "@[<0>@[<hv2>try@ %a@]@ @[<0>with%a@]@]"
+        (* "try@;@[<2>%a@]@\nwith@\n%a"*)
+        (expression reset_ctxt)
+        e (case_list ctxt) l
+    | Pexp_let (rf, l, e) ->
+      (* pp f "@[<2>let %a%a in@;<1 -2>%a@]"
+         (*no indentation here, a new line*) *)
+      (*   rec_flag rf *)
+      pp f "@[<2>%a in@;<1 -2>%a@]" (bindings reset_ctxt) (rf, l)
+        (expression ctxt) e
+    | Pexp_apply {funct = e; args = l; partial} -> (
+      if not (sugar_expr ctxt f x) then
+        match view_fixity_of_exp e with
+        | `Infix s -> (
+          match l with
+          | [((Nolabel, _) as arg1); ((Nolabel, _) as arg2)] ->
+            (* FIXME associativity label_x_expression_param *)
+            pp f "@[<2>%a@;%s@;%a@]"
+              (label_x_expression_param reset_ctxt)
+              arg1 s
+              (label_x_expression_param ctxt)
+              arg2
+          | _ ->
+            pp f "@[<2>%a %a@]" (simple_expr ctxt) e
+              (list (label_x_expression_param ctxt))
+              l)
+        | `Prefix s -> (
+          let s =
+            if
+              List.mem s ["~+"; "~-"; "~+."; "~-."; "~~"]
+              &&
+              match l with
+              (* See #7200: avoid turning (~- 1) into (- 1) which is
+                 parsed as an int literal *)
+              | [(_, {pexp_desc = Pexp_constant _})] -> false
+              | _ -> true
+            then String.sub s 1 (String.length s - 1)
+            else s
+          in
+          match l with
+          | [(Nolabel, x)] -> pp f "@[<2>%s@;%a@]" s (simple_expr ctxt) x
+          | _ ->
+            pp f "@[<2>%a %a@]" (simple_expr ctxt) e
+              (list (label_x_expression_param ctxt))
+              l)
+        | _ ->
+          let partial_str = if partial then " ..." else "" in
+          pp f "@[<hov2>%a%s@]"
+            (fun f (e, l) ->
+              pp f "%a@ %a" (expression2 ctxt) e
+                (list (label_x_expression_param reset_ctxt))
+                l)
+              (* reset here only because [function,match,try,sequence]
+                 are lower priority *)
+            (e, l) partial_str)
+    | Pexp_construct (li, Some eo) when not (is_simple_construct (view_expr x))
+      -> (
+      (* Not efficient FIXME*)
+      match view_expr x with
+      | `cons ls -> list (simple_expr ctxt) f ls ~sep:"@;::@;"
+      | `normal -> pp f "@[<2>%a@;%a@]" longident_loc li (simple_expr ctxt) eo
+      | _ -> assert false)
+    | Pexp_setfield (e1, li, e2) ->
+      pp f "@[<2>%a.%a@ <-@ %a@]" (simple_expr ctxt) e1 longident_loc li
+        (simple_expr ctxt) e2
+    | Pexp_ifthenelse (e1, e2, eo) ->
+      (* @;@[<2>else@ %a@]@] *)
+      let fmt : (_, _, _) format =
+        "@[<hv0>@[<2>if@ %a@]@;@[<2>then@ %a@]%a@]"
+      in
+      let expression_under_ifthenelse = expression (under_ifthenelse ctxt) in
+      pp f fmt expression_under_ifthenelse e1 expression_under_ifthenelse e2
+        (fun f eo ->
+          match eo with
+          | Some x -> pp f "@;@[<2>else@;%a@]" (expression (under_semi ctxt)) x
+          | None -> () (* pp f "()" *))
+        eo
+    | Pexp_sequence _ ->
+      let rec sequence_helper acc = function
+        | {pexp_desc = Pexp_sequence (e1, e2); pexp_attributes = []} ->
+          sequence_helper (e1 :: acc) e2
+        | v -> List.rev (v :: acc)
+      in
+      let lst = sequence_helper [] x in
+      pp f "@[<hv>%a@]" (list (expression (under_semi ctxt)) ~sep:";@;") lst
+    | Pexp_letmodule (s, me, e) ->
+      pp f "@[<hov2>let@ module@ %s@ =@ %a@ in@ %a@]" s.txt
+        (module_expr reset_ctxt) me (expression ctxt) e
+    | Pexp_letexception (cd, e) ->
+      pp f "@[<hov2>let@ exception@ %a@ in@ %a@]"
+        (extension_constructor ctxt)
+        cd (expression ctxt) e
+    | Pexp_assert e -> pp f "@[<hov2>assert@ %a@]" (simple_expr ctxt) e
+    | Pexp_open (ovf, lid, e) ->
+      pp f "@[<2>let open%s %a in@;%a@]" (override ovf) longident_loc lid
+        (expression ctxt) e
+    | Pexp_variant (l, Some eo) -> pp f "@[<2>`%s@;%a@]" l (simple_expr ctxt) eo
+    | Pexp_extension e -> extension ctxt f e
+    | Pexp_await e -> pp f "@[<hov2>await@ %a@]" (simple_expr ctxt) e
+    | _ -> expression1 ctxt f x
+
+and expression1 ctxt f x =
+  if x.pexp_attributes <> [] then expression ctxt f x else expression2 ctxt f x
+(* used in [Pexp_apply] *)
+
+and expression2 ctxt f x =
+  if x.pexp_attributes <> [] then expression ctxt f x
+  else
+    match x.pexp_desc with
+    | Pexp_field (e, li) ->
+      pp f "@[<hov2>%a.%a@]" (simple_expr ctxt) e longident_loc li
+    | Pexp_send (e, s) -> pp f "@[<hov2>%a#%s@]" (simple_expr ctxt) e s.txt
+    | _ -> simple_expr ctxt f x
+
+and simple_expr ctxt f x =
+  if x.pexp_attributes <> [] then expression ctxt f x
+  else
+    match x.pexp_desc with
+    | Pexp_construct _ when is_simple_construct (view_expr x) -> (
+      match view_expr x with
+      | `nil -> pp f "[]"
+      | `tuple -> pp f "()"
+      | `list xs ->
+        pp f "@[<hv0>[%a]@]" (list (expression (under_semi ctxt)) ~sep:";@;") xs
+      | `simple x -> longident f x
+      | _ -> assert false)
+    | Pexp_ident li -> longident_loc f li
+    (* (match view_fixity_of_exp x with *)
+    (* |`Normal -> longident_loc f li *)
+    (* | `Prefix _ | `Infix _ -> pp f "( %a )" longident_loc li) *)
+    | Pexp_constant c -> constant f c
+    | Pexp_pack me -> pp f "(module@;%a)" (module_expr ctxt) me
+    | Pexp_newtype (lid, e) ->
+      pp f "fun@;(type@;%s)@;->@;%a" lid.txt (expression ctxt) e
+    | Pexp_tuple l ->
+      pp f "@[<hov2>(%a)@]" (list (simple_expr ctxt) ~sep:",@;") l
+    | Pexp_constraint (e, ct) ->
+      pp f "(%a : %a)" (expression ctxt) e (core_type ctxt) ct
+    | Pexp_coerce (e, (), ct) ->
+      pp f "(%a :> %a)" (expression ctxt) e (core_type ctxt) ct
+    | Pexp_variant (l, None) -> pp f "`%s" l
+    | Pexp_record (l, eo) ->
+      let longident_x_expression f {lid = li; x = e; opt} =
+        let opt_str = if opt then "?" else "" in
+        match e with
+        | {pexp_desc = Pexp_ident {txt; _}; pexp_attributes = []; _}
+          when li.txt = txt ->
+          pp f "@[<hov2>%a%s@]" longident_loc li opt_str
+        | _ ->
+          pp f "@[<hov2>%a@;=@;%s%a@]" longident_loc li opt_str
+            (simple_expr ctxt) e
+      in
+      pp f "@[<hv0>@[<hv2>{@;%a%a@]@;}@]" (* "@[<hov2>{%a%a}@]" *)
+        (option ~last:" with@;" (simple_expr ctxt))
+        eo
+        (list longident_x_expression ~sep:";@;")
+        l
+    | Pexp_array l ->
+      pp f "@[<0>@[<2>[|%a|]@]@]"
+        (list (simple_expr (under_semi ctxt)) ~sep:";")
+        l
+    | Pexp_while (e1, e2) ->
+      let fmt : (_, _, _) format = "@[<2>while@;%a@;do@;%a@;done@]" in
+      pp f fmt (expression ctxt) e1 (expression ctxt) e2
+    | Pexp_for (s, e1, e2, df, e3) ->
+      let fmt : (_, _, _) format =
+        "@[<hv0>@[<hv2>@[<2>for %a =@;%a@;%a%a@;do@]@;%a@]@;done@]"
+      in
+      let expression = expression ctxt in
+      pp f fmt (pattern ctxt) s expression e1 direction_flag df expression e2
+        expression e3
+    | Pexp_jsx_element (Jsx_fragment {jsx_fragment_children = children}) ->
+      pp f "<>%a</>" (list (simple_expr ctxt)) children
+    | Pexp_jsx_element
+        (Jsx_unary_element
+           {
+             jsx_unary_element_tag_name = tag_name;
+             jsx_unary_element_props = props;
+           }) -> (
+      let name = Ast_helper.Jsx.string_of_jsx_tag_name tag_name.txt in
+      match props with
+      | [] -> pp f "<%s />" name
+      | _ -> pp f "<%s %a />" name (print_jsx_props ctxt) props)
+    | Pexp_jsx_element
+        (Jsx_container_element
+           {
+             jsx_container_element_tag_name_start = tag_name;
+             jsx_container_element_props = props;
+             jsx_container_element_children = children;
+             jsx_container_element_closing_tag = closing_tag;
+           }) -> (
+      let name = Ast_helper.Jsx.string_of_jsx_tag_name tag_name.txt in
+      let closing_name =
+        match closing_tag with
+        | None -> ""
+        | Some closing_tag ->
+          Format.sprintf "</%s>"
+            (Ast_helper.Jsx.string_of_jsx_tag_name
+               closing_tag.jsx_closing_container_tag_name.txt)
+      in
+      match props with
+      | [] ->
+        pp f "<%s>%a%s" name (list (simple_expr ctxt)) children closing_name
+      | _ ->
+        pp f "<%s %a>%a%s" name (print_jsx_props ctxt) props
+          (list (simple_expr ctxt))
+          children closing_name)
+    | _ -> paren true (expression ctxt) f x
+
+and print_jsx_prop ctxt f = function
+  | JSXPropPunning (is_optional, name) ->
+    pp f "%s" (if is_optional then "?" ^ name.txt else name.txt)
+  | JSXPropValue (name, is_optional, value) ->
+    pp f "%s=%s%a" name.txt
+      (if is_optional then "?" else "")
+      (simple_expr ctxt) value
+  | JSXPropSpreading (_, expr) -> pp f "{...%a}" (simple_expr ctxt) expr
+
+and print_jsx_props ctxt f = list ~sep:" " (print_jsx_prop ctxt) f
+
+and attributes ctxt f l = List.iter (attribute ctxt f) l
+
+and item_attributes ctxt f l = List.iter (item_attribute ctxt f) l
+
+and attribute ctxt f (s, e) = pp f "@[<2>[@@%s@ %a]@]" s.txt (payload ctxt) e
+
+and item_attribute ctxt f (s, e) =
+  pp f "@[<2>[@@@@%s@ %a]@]" s.txt (payload ctxt) e
+
+and floating_attribute ctxt f (s, e) =
+  pp f "@[<2>[@@@@@@%s@ %a]@]" s.txt (payload ctxt) e
+
+and value_description ctxt f x =
+  (* note: value_description has an attribute field,
+           but they're already printed by the callers this method *)
+  pp f "@[<hov2>%a%a@]" (core_type ctxt) x.pval_type
+    (fun f x ->
+      if x.pval_prim <> [] then
+        pp f "@ =@ %a" (list constant_string) x.pval_prim)
+    x
+
+and extension ctxt f (s, e) = pp f "@[<2>[%%%s@ %a]@]" s.txt (payload ctxt) e
+
+and item_extension ctxt f (s, e) =
+  pp f "@[<2>[%%%%%s@ %a]@]" s.txt (payload ctxt) e
+
+and exception_declaration ctxt f ext =
+  pp f "@[<hov2>exception@ %a@]" (extension_constructor ctxt) ext
+
+and module_type ctxt f x =
+  if x.pmty_attributes <> [] then
+    pp f "((%a)%a)" (module_type ctxt)
+      {x with pmty_attributes = []}
+      (attributes ctxt) x.pmty_attributes
+  else
+    match x.pmty_desc with
+    | Pmty_ident li -> pp f "%a" longident_loc li
+    | Pmty_alias li -> pp f "(module %a)" longident_loc li
+    | Pmty_signature s ->
+      pp f "@[<hv0>@[<hv2>sig@ %a@]@ end@]" (* "@[<hov>sig@ %a@ end@]" *)
+        (list (signature_item ctxt))
+        s (* FIXME wrong indentation*)
+    | Pmty_functor (_, None, mt2) ->
+      pp f "@[<hov2>functor () ->@ %a@]" (module_type ctxt) mt2
+    | Pmty_functor (s, Some mt1, mt2) ->
+      if s.txt = "_" then
+        pp f "@[<hov2>%a@ ->@ %a@]" (module_type ctxt) mt1 (module_type ctxt)
+          mt2
+      else
+        pp f "@[<hov2>functor@ (%s@ :@ %a)@ ->@ %a@]" s.txt (module_type ctxt)
+          mt1 (module_type ctxt) mt2
+    | Pmty_with (mt, l) -> (
+      let with_constraint f = function
+        | Pwith_type (li, ({ptype_params = ls; _} as td)) ->
+          let ls = List.map fst ls in
+          pp f "type@ %a %a =@ %a"
+            (list (core_type ctxt) ~sep:"," ~first:"(" ~last:")")
+            ls longident_loc li (type_declaration ctxt) td
+        | Pwith_module (li, li2) ->
+          pp f "module %a =@ %a" longident_loc li longident_loc li2
+        | Pwith_typesubst (li, ({ptype_params = ls; _} as td)) ->
+          let ls = List.map fst ls in
+          pp f "type@ %a %a :=@ %a"
+            (list (core_type ctxt) ~sep:"," ~first:"(" ~last:")")
+            ls longident_loc li (type_declaration ctxt) td
+        | Pwith_modsubst (li, li2) ->
+          pp f "module %a :=@ %a" longident_loc li longident_loc li2
+      in
+      match l with
+      | [] -> pp f "@[<hov2>%a@]" (module_type ctxt) mt
+      | _ ->
+        pp f "@[<hov2>(%a@ with@ %a)@]" (module_type ctxt) mt
+          (list with_constraint ~sep:"@ and@ ")
+          l)
+    | Pmty_typeof me ->
+      pp f "@[<hov2>module@ type@ of@ %a@]" (module_expr ctxt) me
+    | Pmty_extension e -> extension ctxt f e
+
+and signature ctxt f x = list ~sep:"@\n" (signature_item ctxt) f x
+
+and signature_item ctxt f x : unit =
+  match x.psig_desc with
+  | Psig_type (rf, l) -> type_def_list ctxt f (rf, l)
+  | Psig_value vd ->
+    let intro = if vd.pval_prim = [] then "val" else "external" in
+    pp f "@[<2>%s@ %a@ :@ %a@]%a" intro protect_ident vd.pval_name.txt
+      (value_description ctxt) vd (item_attributes ctxt) vd.pval_attributes
+  | Psig_typext te -> type_extension ctxt f te
+  | Psig_exception ed -> exception_declaration ctxt f ed
+  | Psig_module
+      ({pmd_type = {pmty_desc = Pmty_alias alias; pmty_attributes = []; _}; _}
+       as pmd) ->
+    pp f "@[<hov>module@ %s@ =@ %a@]%a" pmd.pmd_name.txt longident_loc alias
+      (item_attributes ctxt) pmd.pmd_attributes
+  | Psig_module pmd ->
+    pp f "@[<hov>module@ %s@ :@ %a@]%a" pmd.pmd_name.txt (module_type ctxt)
+      pmd.pmd_type (item_attributes ctxt) pmd.pmd_attributes
+  | Psig_open od ->
+    pp f "@[<hov2>open%s@ %a@]%a"
+      (override od.popen_override)
+      longident_loc od.popen_lid (item_attributes ctxt) od.popen_attributes
+  | Psig_include incl ->
+    pp f "@[<hov2>include@ %a@]%a" (module_type ctxt) incl.pincl_mod
+      (item_attributes ctxt) incl.pincl_attributes
+  | Psig_modtype {pmtd_name = s; pmtd_type = md; pmtd_attributes = attrs} ->
+    pp f "@[<hov2>module@ type@ %s%a@]%a" s.txt
+      (fun f md ->
+        match md with
+        | None -> ()
+        | Some mt ->
+          pp_print_space f ();
+          pp f "@ =@ %a" (module_type ctxt) mt)
+      md (item_attributes ctxt) attrs
+  | Psig_recmodule decls ->
+    let rec string_x_module_type_list f ?(first = true) l =
+      match l with
+      | [] -> ()
+      | pmd :: tl ->
+        if not first then
+          pp f "@ @[<hov2>and@ %s:@ %a@]%a" pmd.pmd_name.txt (module_type ctxt)
+            pmd.pmd_type (item_attributes ctxt) pmd.pmd_attributes
+        else
+          pp f "@[<hov2>module@ rec@ %s:@ %a@]%a" pmd.pmd_name.txt
+            (module_type ctxt) pmd.pmd_type (item_attributes ctxt)
+            pmd.pmd_attributes;
+        string_x_module_type_list f ~first:false tl
+    in
+    string_x_module_type_list f decls
+  | Psig_attribute a -> floating_attribute ctxt f a
+  | Psig_extension (e, a) ->
+    item_extension ctxt f e;
+    item_attributes ctxt f a
+
+and module_expr ctxt f x =
+  if x.pmod_attributes <> [] then
+    pp f "((%a)%a)" (module_expr ctxt)
+      {x with pmod_attributes = []}
+      (attributes ctxt) x.pmod_attributes
+  else
+    match x.pmod_desc with
+    | Pmod_structure s ->
+      pp f "@[<hv2>struct@;@[<0>%a@]@;<1 -2>end@]"
+        (list (structure_item ctxt) ~sep:"@\n")
+        s
+    | Pmod_constraint (me, mt) ->
+      pp f "@[<hov2>(%a@ :@ %a)@]" (module_expr ctxt) me (module_type ctxt) mt
+    | Pmod_ident li -> pp f "%a" longident_loc li
+    | Pmod_functor (_, None, me) ->
+      pp f "functor ()@;->@;%a" (module_expr ctxt) me
+    | Pmod_functor (s, Some mt, me) ->
+      pp f "functor@ (%s@ :@ %a)@;->@;%a" s.txt (module_type ctxt) mt
+        (module_expr ctxt) me
+    | Pmod_apply (me1, me2) ->
+      pp f "(%a)(%a)" (module_expr ctxt) me1 (module_expr ctxt) me2
+      (* Cf: #7200 *)
+    | Pmod_unpack e -> pp f "(val@ %a)" (expression ctxt) e
+    | Pmod_extension e -> extension ctxt f e
+
+and structure ctxt f x = list ~sep:"@\n" (structure_item ctxt) f x
+
+and payload ctxt f = function
+  | PStr [{pstr_desc = Pstr_eval (e, attrs)}] ->
+    pp f "@[<2>%a@]%a" (expression ctxt) e (item_attributes ctxt) attrs
+  | PStr x -> structure ctxt f x
+  | PTyp x ->
+    pp f ":";
+    core_type ctxt f x
+  | PSig x ->
+    pp f ":";
+    signature ctxt f x
+  | PPat (x, None) ->
+    pp f "?";
+    pattern ctxt f x
+  | PPat (x, Some e) ->
+    pp f "?";
+    pattern ctxt f x;
+    pp f " when ";
+    expression ctxt f e
+
+(* transform [f = fun g h -> ..] to [f g h = ... ] could be improved *)
+and binding ctxt f {pvb_pat = p; pvb_expr = x; _} =
+  (* .pvb_attributes have already been printed by the caller, #bindings *)
+  let rec pp_print_pexp_function f x =
+    if x.pexp_attributes <> [] then pp f "=@;%a" (expression ctxt) x
+    else
+      match x.pexp_desc with
+      | Pexp_fun
+          {arg_label = label; default = eo; lhs = p; rhs = e; arity; async} ->
+        let arity_str =
+          match arity with
+          | None -> ""
+          | Some arity -> "[arity:" ^ string_of_int arity ^ "]"
+        in
+        let async_str = if async then "async " else "" in
+        if label = Nolabel then
+          pp f "%s%s%a@ %a" async_str arity_str (simple_pattern ctxt) p
+            pp_print_pexp_function e
+        else
+          pp f "%s%s%a@ %a" async_str arity_str (label_exp ctxt) (label, eo, p)
+            pp_print_pexp_function e
+      | Pexp_newtype (str, e) ->
+        pp f "(type@ %s)@ %a" str.txt pp_print_pexp_function e
+      | _ -> pp f "=@;%a" (expression ctxt) x
+  in
+  let tyvars_str tyvars = List.map (fun v -> v.txt) tyvars in
+  let is_desugared_gadt p e =
+    let gadt_pattern =
+      match p with
+      | {
+       ppat_desc =
+         Ppat_constraint
+           ( ({ppat_desc = Ppat_var _} as pat),
+             {ptyp_desc = Ptyp_poly (args_tyvars, rt)} );
+       ppat_attributes = [];
+      } ->
+        Some (pat, args_tyvars, rt)
+      | _ -> None
+    in
+    let rec gadt_exp tyvars e =
+      match e with
+      | {pexp_desc = Pexp_newtype (tyvar, e); pexp_attributes = []} ->
+        gadt_exp (tyvar :: tyvars) e
+      | {pexp_desc = Pexp_constraint (e, ct); pexp_attributes = []} ->
+        Some (List.rev tyvars, e, ct)
+      | _ -> None
+    in
+    let gadt_exp = gadt_exp [] e in
+    match (gadt_pattern, gadt_exp) with
+    | Some (p, pt_tyvars, pt_ct), Some (e_tyvars, e, e_ct)
+      when tyvars_str pt_tyvars = tyvars_str e_tyvars ->
+      let ety = Typ.varify_constructors e_tyvars e_ct in
+      if ety = pt_ct then Some (p, pt_tyvars, e_ct, e) else None
+    | _ -> None
+  in
+  if x.pexp_attributes <> [] then
+    pp f "%a@;=@;%a" (pattern ctxt) p (expression ctxt) x
+  else
+    match is_desugared_gadt p x with
+    | Some (p, [], ct, e) ->
+      pp f "%a@;: %a@;=@;%a" (simple_pattern ctxt) p (core_type ctxt) ct
+        (expression ctxt) e
+    | Some (p, tyvars, ct, e) ->
+      pp f "%a@;: type@;%a.@;%a@;=@;%a" (simple_pattern ctxt) p
+        (list pp_print_string ~sep:"@;")
+        (tyvars_str tyvars) (core_type ctxt) ct (expression ctxt) e
+    | None -> (
+      match p with
+      | {ppat_desc = Ppat_constraint (p, ty); ppat_attributes = []} -> (
+        (* special case for the first*)
+        match ty with
+        | {ptyp_desc = Ptyp_poly _; ptyp_attributes = []} ->
+          pp f "%a@;:@;%a@;=@;%a" (simple_pattern ctxt) p (core_type ctxt) ty
+            (expression ctxt) x
+        | _ ->
+          pp f "(%a@;:@;%a)@;=@;%a" (simple_pattern ctxt) p (core_type ctxt) ty
+            (expression ctxt) x)
+      | {ppat_desc = Ppat_var _; ppat_attributes = []} ->
+        pp f "%a@ %a" (simple_pattern ctxt) p pp_print_pexp_function x
+      | _ -> pp f "%a@;=@;%a" (pattern ctxt) p (expression ctxt) x)
+
+(* [in] is not printed *)
+and bindings ctxt f (rf, l) =
+  let binding kwd rf f x =
+    pp f "@[<2>%s %a%a@]%a" kwd rec_flag rf (binding ctxt) x
+      (item_attributes ctxt) x.pvb_attributes
+  in
+  match l with
+  | [] -> ()
+  | [x] -> binding "let" rf f x
+  | x :: xs ->
+    pp f "@[<v>%a@,%a@]" (binding "let" rf) x
+      (list ~sep:"@," (binding "and" Nonrecursive))
+      xs
+
+and structure_item ctxt f x =
+  match x.pstr_desc with
+  | Pstr_eval (e, attrs) ->
+    pp f "@[<hov2>;;%a@]%a" (expression ctxt) e (item_attributes ctxt) attrs
+  | Pstr_type (_, []) -> assert false
+  | Pstr_type (rf, l) -> type_def_list ctxt f (rf, l)
+  | Pstr_value (rf, l) ->
+    (* pp f "@[<hov2>let %a%a@]"  rec_flag rf bindings l *)
+    pp f "@[<2>%a@]" (bindings ctxt) (rf, l)
+  | Pstr_typext te -> type_extension ctxt f te
+  | Pstr_exception ed -> exception_declaration ctxt f ed
+  | Pstr_module x ->
+    let rec module_helper = function
+      | {pmod_desc = Pmod_functor (s, mt, me'); pmod_attributes = []} ->
+        if mt = None then pp f "()"
+        else Misc.may (pp f "(%s:%a)" s.txt (module_type ctxt)) mt;
+        module_helper me'
+      | me -> me
+    in
+    pp f "@[<hov2>module %s%a@]%a" x.pmb_name.txt
+      (fun f me ->
+        let me = module_helper me in
+        match me with
+        | {
+         pmod_desc =
+           Pmod_constraint
+             (me', ({pmty_desc = Pmty_ident _ | Pmty_signature _; _} as mt));
+         pmod_attributes = [];
+        } ->
+          pp f " :@;%a@;=@;%a@;" (module_type ctxt) mt (module_expr ctxt) me'
+        | _ -> pp f " =@ %a" (module_expr ctxt) me)
+      x.pmb_expr (item_attributes ctxt) x.pmb_attributes
+  | Pstr_open od ->
+    pp f "@[<2>open%s@;%a@]%a"
+      (override od.popen_override)
+      longident_loc od.popen_lid (item_attributes ctxt) od.popen_attributes
+  | Pstr_modtype {pmtd_name = s; pmtd_type = md; pmtd_attributes = attrs} ->
+    pp f "@[<hov2>module@ type@ %s%a@]%a" s.txt
+      (fun f md ->
+        match md with
+        | None -> ()
+        | Some mt ->
+          pp_print_space f ();
+          pp f "@ =@ %a" (module_type ctxt) mt)
+      md (item_attributes ctxt) attrs
+  | Pstr_primitive vd ->
+    pp f "@[<hov2>external@ %a@ :@ %a@]%a" protect_ident vd.pval_name.txt
+      (value_description ctxt) vd (item_attributes ctxt) vd.pval_attributes
+  | Pstr_include incl ->
+    pp f "@[<hov2>include@ %a@]%a" (module_expr ctxt) incl.pincl_mod
+      (item_attributes ctxt) incl.pincl_attributes
+  | Pstr_recmodule decls -> (
+    (* 3.07 *)
+    let aux f = function
+      | {pmb_expr = {pmod_desc = Pmod_constraint (expr, typ)}} as pmb ->
+        pp f "@[<hov2>@ and@ %s:%a@ =@ %a@]%a" pmb.pmb_name.txt
+          (module_type ctxt) typ (module_expr ctxt) expr (item_attributes ctxt)
+          pmb.pmb_attributes
+      | _ -> assert false
+    in
+    match decls with
+    | ({pmb_expr = {pmod_desc = Pmod_constraint (expr, typ)}} as pmb) :: l2 ->
+      pp f "@[<hv>@[<hov2>module@ rec@ %s:%a@ =@ %a@]%a@ %a@]" pmb.pmb_name.txt
+        (module_type ctxt) typ (module_expr ctxt) expr (item_attributes ctxt)
+        pmb.pmb_attributes
+        (fun f l2 -> List.iter (aux f) l2)
+        l2
+    | _ -> assert false)
+  | Pstr_attribute a -> floating_attribute ctxt f a
+  | Pstr_extension (e, a) ->
+    item_extension ctxt f e;
+    item_attributes ctxt f a
+
+and type_param ctxt f (ct, a) =
+  pp f "%s%a" (type_variance a) (core_type ctxt) ct
+
+and type_params ctxt f = function
+  | [] -> ()
+  | l -> pp f "%a " (list (type_param ctxt) ~first:"(" ~last:")" ~sep:",@;") l
+
+and type_def_list ctxt f (rf, l) =
+  let type_decl kwd rf f x =
+    let eq =
+      if x.ptype_kind = Ptype_abstract && x.ptype_manifest = None then ""
+      else " ="
+    in
+    pp f "@[<2>%s %a%a%s%s%a@]%a" kwd nonrec_flag rf (type_params ctxt)
+      x.ptype_params x.ptype_name.txt eq (type_declaration ctxt) x
+      (item_attributes ctxt) x.ptype_attributes
+  in
+  match l with
+  | [] -> assert false
+  | [x] -> type_decl "type" rf f x
+  | x :: xs ->
+    pp f "@[<v>%a@,%a@]" (type_decl "type" rf) x
+      (list ~sep:"@," (type_decl "and" Recursive))
+      xs
+
+and record_declaration ctxt f lbls =
+  let type_record_field f pld =
+    pp f "@[<2>%a%s%a:@;%a@;%a@]" mutable_flag pld.pld_mutable pld.pld_name.txt
+      optional_flag pld.pld_optional (core_type ctxt) pld.pld_type
+      (attributes ctxt) pld.pld_attributes
+  in
+  pp f "{@\n%a}" (list type_record_field ~sep:";@\n") lbls
+
+and type_declaration ctxt f x =
+  (* type_declaration has an attribute field,
+     but it's been printed by the caller of this method *)
+  let priv f =
+    match x.ptype_private with
+    | Public -> ()
+    | Private -> pp f "@;private"
+  in
+  let manifest f =
+    match x.ptype_manifest with
+    | None -> ()
+    | Some y ->
+      if x.ptype_kind = Ptype_abstract then
+        pp f "%t@;%a" priv (core_type ctxt) y
+      else pp f "@;%a" (core_type ctxt) y
+  in
+  let constructor_declaration f pcd =
+    pp f "|@;";
+    constructor_declaration ctxt f
+      (pcd.pcd_name.txt, pcd.pcd_args, pcd.pcd_res, pcd.pcd_attributes)
+  in
+  let repr f =
+    let intro f = if x.ptype_manifest = None then () else pp f "@;=" in
+    match x.ptype_kind with
+    | Ptype_variant xs ->
+      pp f "%t%t@\n%a" intro priv (list ~sep:"@\n" constructor_declaration) xs
+    | Ptype_abstract -> ()
+    | Ptype_record l -> pp f "%t%t@;%a" intro priv (record_declaration ctxt) l
+    | Ptype_open -> pp f "%t%t@;.." intro priv
+  in
+  let constraints f =
+    List.iter
+      (fun (ct1, ct2, _) ->
+        pp f "@[<hov2>@ constraint@ %a@ =@ %a@]" (core_type ctxt) ct1
+          (core_type ctxt) ct2)
+      x.ptype_cstrs
+  in
+  pp f "%t%t%t" manifest repr constraints
+
+and type_extension ctxt f x =
+  let extension_constructor f x =
+    pp f "@\n|@;%a" (extension_constructor ctxt) x
+  in
+  pp f "@[<2>type %a%a += %a@ %a@]%a"
+    (fun f -> function
+      | [] -> ()
+      | l ->
+        pp f "%a@;" (list (type_param ctxt) ~first:"(" ~last:")" ~sep:",") l)
+    x.ptyext_params longident_loc x.ptyext_path private_flag
+    x.ptyext_private (* Cf: #7200 *)
+    (list ~sep:"" extension_constructor)
+    x.ptyext_constructors (item_attributes ctxt) x.ptyext_attributes
+
+and constructor_declaration ctxt f (name, args, res, attrs) =
+  let name =
+    match name with
+    | "::" -> "(::)"
+    | s -> s
+  in
+  match res with
+  | None ->
+    pp f "%s%a@;%a" name
+      (fun f -> function
+        | Pcstr_tuple [] -> ()
+        | Pcstr_tuple l ->
+          pp f "@;of@;%a" (list (core_type1 ctxt) ~sep:"@;*@;") l
+        | Pcstr_record l -> pp f "@;of@;%a" (record_declaration ctxt) l)
+      args (attributes ctxt) attrs
+  | Some r ->
+    pp f "%s:@;%a@;%a" name
+      (fun f -> function
+        | Pcstr_tuple [] -> core_type1 ctxt f r
+        | Pcstr_tuple l ->
+          pp f "%a@;->@;%a"
+            (list (core_type1 ctxt) ~sep:"@;*@;")
+            l (core_type1 ctxt) r
+        | Pcstr_record l ->
+          pp f "%a@;->@;%a" (record_declaration ctxt) l (core_type1 ctxt) r)
+      args (attributes ctxt) attrs
+
+and extension_constructor ctxt f x =
+  (* Cf: #7200 *)
+  match x.pext_kind with
+  | Pext_decl (l, r) ->
+    constructor_declaration ctxt f (x.pext_name.txt, l, r, x.pext_attributes)
+  | Pext_rebind li ->
+    pp f "%s%a@;=@;%a" x.pext_name.txt (attributes ctxt) x.pext_attributes
+      longident_loc li
+
+and case_list ctxt f l : unit =
+  let aux f {pc_lhs; pc_guard; pc_rhs} =
+    pp f "@;| @[<2>%a%a@;->@;%a@]" (pattern ctxt) pc_lhs
+      (option (expression ctxt) ~first:"@;when@;")
+      pc_guard
+      (expression (under_pipe ctxt))
+      pc_rhs
+  in
+  list aux f l ~sep:""
+
+and label_x_expression_param ctxt f (l, e) =
+  let simple_name =
+    match e with
+    | {pexp_desc = Pexp_ident {txt = Lident l; _}; pexp_attributes = []} ->
+      Some l
+    | _ -> None
+  in
+  match l with
+  | Nolabel -> expression2 ctxt f e (* level 2*)
+  | Optional {txt = str} ->
+    if Some str = simple_name then pp f "?%s" str
+    else pp f "?%s:%a" str (simple_expr ctxt) e
+  | Labelled {txt = lbl} ->
+    if Some lbl = simple_name then pp f "~%s" lbl
+    else pp f "~%s:%a" lbl (simple_expr ctxt) e
+
+let expression f x = pp f "@[%a@]" (expression reset_ctxt) x
+
+let string_of_expression x =
+  ignore (flush_str_formatter ());
+  let f = str_formatter in
+  expression f x;
+  flush_str_formatter ()
+
+let string_of_structure x =
+  ignore (flush_str_formatter ());
+  let f = str_formatter in
+  structure reset_ctxt f x;
+  flush_str_formatter ()
+
+let core_type = core_type reset_ctxt
+let pattern = pattern reset_ctxt
+let signature = signature reset_ctxt
+let structure = structure reset_ctxt
diff --git a/jscomp/ml/pprintast.mli b/compiler/ml/pprintast.mli
similarity index 78%
rename from jscomp/ml/pprintast.mli
rename to compiler/ml/pprintast.mli
index 7da9ee0..fb26664 100644
--- a/jscomp/ml/pprintast.mli
+++ b/compiler/ml/pprintast.mli
@@ -15,13 +15,12 @@
 
 type space_formatter = (unit, Format.formatter, unit) format
 
-
 val expression : Format.formatter -> Parsetree.expression -> unit
 val string_of_expression : Parsetree.expression -> string
 
-val core_type: Format.formatter -> Parsetree.core_type -> unit
-val pattern: Format.formatter -> Parsetree.pattern -> unit
-val signature: Format.formatter -> Parsetree.signature -> unit
-val structure: Format.formatter -> Parsetree.structure -> unit
-val string_of_structure: Parsetree.structure -> string
-val string_of_int_as_char: int -> string
+val core_type : Format.formatter -> Parsetree.core_type -> unit
+val pattern : Format.formatter -> Parsetree.pattern -> unit
+val signature : Format.formatter -> Parsetree.signature -> unit
+val structure : Format.formatter -> Parsetree.structure -> unit
+val string_of_structure : Parsetree.structure -> string
+val string_of_int_as_char : int -> string
diff --git a/compiler/ml/predef.ml b/compiler/ml/predef.ml
new file mode 100644
index 0000000..5913791
--- /dev/null
+++ b/compiler/ml/predef.ml
@@ -0,0 +1,417 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Predefined type constructors (with special typing rules in typecore) *)
+
+open Path
+open Types
+open Btype
+
+let builtin_idents = ref []
+
+let wrap create s =
+  let id = create s in
+  builtin_idents := (s, id) :: !builtin_idents;
+  id
+
+let ident_create = wrap Ident.create
+let ident_create_predef_exn = wrap Ident.create_predef_exn
+
+let ident_int = ident_create "int"
+
+and ident_char = ident_create "char"
+
+and ident_float = ident_create "float"
+
+and ident_bool = ident_create "bool"
+
+and ident_unit = ident_create "unit"
+
+and ident_exn = ident_create "exn"
+
+and ident_array = ident_create "array"
+
+and ident_list = ident_create "list"
+
+and ident_option = ident_create "option"
+
+and ident_result = ident_create "result"
+
+and ident_dict = ident_create "dict"
+
+and ident_bigint = ident_create "bigint"
+
+and ident_string = ident_create "string"
+
+and ident_extension_constructor = ident_create "extension_constructor"
+
+and ident_unknown = ident_create "unknown"
+
+and ident_promise = ident_create "promise"
+
+type test = For_sure_yes | For_sure_no | NA
+
+let type_is_builtin_path_but_option (p : Path.t) : test =
+  match p with
+  | Pident {stamp} when stamp = ident_option.stamp -> For_sure_no
+  | Pident {stamp} when stamp = ident_unit.stamp -> For_sure_no
+  | Pident {stamp} when stamp >= ident_int.stamp && stamp <= ident_promise.stamp
+    ->
+    For_sure_yes
+  | _ -> NA
+
+let path_int = Pident ident_int
+
+and path_char = Pident ident_char
+
+and path_float = Pident ident_float
+
+and path_bool = Pident ident_bool
+
+and path_unit = Pident ident_unit
+
+and path_exn = Pident ident_exn
+
+and path_array = Pident ident_array
+
+and path_list = Pident ident_list
+
+and path_option = Pident ident_option
+
+and path_result = Pident ident_result
+
+and path_dict = Pident ident_dict
+
+and path_bigint = Pident ident_bigint
+
+and path_string = Pident ident_string
+
+and path_unkonwn = Pident ident_unknown
+
+and path_extension_constructor = Pident ident_extension_constructor
+
+and path_promise = Pident ident_promise
+
+let type_int = newgenty (Tconstr (path_int, [], ref Mnil))
+
+and type_char = newgenty (Tconstr (path_char, [], ref Mnil))
+
+and type_float = newgenty (Tconstr (path_float, [], ref Mnil))
+
+and type_bool = newgenty (Tconstr (path_bool, [], ref Mnil))
+
+and type_unit = newgenty (Tconstr (path_unit, [], ref Mnil))
+
+and type_exn = newgenty (Tconstr (path_exn, [], ref Mnil))
+
+and type_array t = newgenty (Tconstr (path_array, [t], ref Mnil))
+
+and type_list t = newgenty (Tconstr (path_list, [t], ref Mnil))
+
+and type_option t = newgenty (Tconstr (path_option, [t], ref Mnil))
+
+and type_result t1 t2 = newgenty (Tconstr (path_result, [t1; t2], ref Mnil))
+
+and type_dict t = newgenty (Tconstr (path_dict, [t], ref Mnil))
+
+and type_bigint = newgenty (Tconstr (path_bigint, [], ref Mnil))
+
+and type_string = newgenty (Tconstr (path_string, [], ref Mnil))
+
+and type_unknown = newgenty (Tconstr (path_unkonwn, [], ref Mnil))
+
+and type_extension_constructor =
+  newgenty (Tconstr (path_extension_constructor, [], ref Mnil))
+
+let ident_match_failure = ident_create_predef_exn "Match_failure"
+
+and ident_invalid_argument = ident_create_predef_exn "Invalid_argument"
+
+and ident_failure = ident_create_predef_exn "Failure"
+
+and ident_ok = ident_create_predef_exn "Ok"
+
+and ident_error = ident_create_predef_exn "Error"
+
+and ident_dict_magic_field_name =
+  ident_create Dict_type_helpers.dict_magic_field_name
+
+and ident_js_exn = ident_create_predef_exn "JsExn"
+
+and ident_not_found = ident_create_predef_exn "Not_found"
+
+and ident_end_of_file = ident_create_predef_exn "End_of_file"
+
+and ident_division_by_zero = ident_create_predef_exn "Division_by_zero"
+
+and ident_assert_failure = ident_create_predef_exn "Assert_failure"
+
+and ident_undefined_recursive_module =
+  ident_create_predef_exn "Undefined_recursive_module"
+
+let all_predef_exns =
+  [
+    ident_match_failure;
+    ident_invalid_argument;
+    ident_failure;
+    ident_js_exn;
+    ident_not_found;
+    ident_end_of_file;
+    ident_division_by_zero;
+    ident_assert_failure;
+    ident_undefined_recursive_module;
+  ]
+
+let path_match_failure = Pident ident_match_failure
+
+and path_assert_failure = Pident ident_assert_failure
+
+and path_undefined_recursive_module = Pident ident_undefined_recursive_module
+
+let decl_abstr =
+  {
+    type_params = [];
+    type_arity = 0;
+    type_kind = Type_abstract;
+    type_loc = Location.none;
+    type_private = Asttypes.Public;
+    type_manifest = None;
+    type_variance = [];
+    type_newtype_level = None;
+    type_attributes = [];
+    type_immediate = false;
+    type_unboxed = unboxed_false_default_false;
+    type_inlined_types = [];
+  }
+
+let decl_abstr_imm = {decl_abstr with type_immediate = true}
+
+let cstr id args =
+  {
+    cd_id = id;
+    cd_args = Cstr_tuple args;
+    cd_res = None;
+    cd_loc = Location.none;
+    cd_attributes = [];
+  }
+
+let ident_false = ident_create "false"
+
+and ident_true = ident_create "true"
+
+and ident_void = ident_create "()"
+
+and ident_nil = ident_create "[]"
+
+and ident_cons = ident_create "::"
+
+and ident_none = ident_create "None"
+
+and ident_some = ident_create "Some"
+
+and ident_ctor_unknown = ident_create "Unknown"
+
+let common_initial_env add_type add_extension empty_env =
+  let decl_bool =
+    {
+      decl_abstr with
+      type_kind = Type_variant [cstr ident_false []; cstr ident_true []];
+      type_immediate = true;
+    }
+  and decl_unit =
+    {
+      decl_abstr with
+      type_kind = Type_variant [cstr ident_void []];
+      type_immediate = true;
+    }
+  and decl_exn = {decl_abstr with type_kind = Type_open}
+  and decl_array =
+    let tvar = newgenvar () in
+    {
+      decl_abstr with
+      type_params = [tvar];
+      type_arity = 1;
+      type_variance = [Variance.full];
+    }
+  and decl_list =
+    let tvar = newgenvar () in
+    {
+      decl_abstr with
+      type_params = [tvar];
+      type_arity = 1;
+      type_kind =
+        Type_variant [cstr ident_nil []; cstr ident_cons [tvar; type_list tvar]];
+      type_variance = [Variance.covariant];
+    }
+  and decl_option =
+    let tvar = newgenvar () in
+    {
+      decl_abstr with
+      type_params = [tvar];
+      type_arity = 1;
+      type_kind = Type_variant [cstr ident_none []; cstr ident_some [tvar]];
+      type_variance = [Variance.covariant];
+    }
+  and decl_result =
+    let tvar1, tvar2 = (newgenvar (), newgenvar ()) in
+    {
+      decl_abstr with
+      type_params = [tvar1; tvar2];
+      type_arity = 2;
+      type_kind = Type_variant [cstr ident_ok [tvar1]; cstr ident_error [tvar2]];
+      type_variance = [Variance.covariant; Variance.covariant];
+    }
+  and decl_dict =
+    let tvar = newgenvar () in
+    (* Dicts are implemented as a single "magic" field record. This magic field
+       is the medium through which we can piggy back on the existing record pattern
+       matching mechanism. We do this by letting the compiler route any label lookup
+       for the dict record type to the magic field, which has the type of the values
+       of the dict.
+
+       So, this definition is important for the dict pattern matching functionality,
+       but not something intended to be exposed to the user. *)
+    {
+      decl_abstr with
+      type_attributes =
+        [
+          Dict_type_helpers.dict_attr;
+          (Location.mknoloc "live", Parsetree.PStr []);
+        ];
+      type_params = [tvar];
+      type_arity = 1;
+      type_variance = [Variance.full];
+      type_kind =
+        Type_record
+          ( [
+              {
+                ld_id = ident_dict_magic_field_name;
+                ld_attributes = [Dict_type_helpers.dict_magic_field_attr];
+                ld_loc = Location.none;
+                ld_mutable = Immutable;
+                ld_optional = true;
+                ld_type = newgenty (Tconstr (path_option, [tvar], ref Mnil));
+              };
+            ],
+            Record_regular );
+    }
+  and decl_unknown =
+    let tvar = newgenvar () in
+    {
+      decl_abstr with
+      type_params = [];
+      type_arity = 0;
+      type_kind =
+        Type_variant
+          [
+            {
+              cd_id = ident_ctor_unknown;
+              cd_args = Cstr_tuple [tvar];
+              cd_res = Some type_unknown;
+              cd_loc = Location.none;
+              cd_attributes = [];
+            };
+          ];
+      type_unboxed = Types.unboxed_true_default_false;
+    }
+  and decl_promise =
+    let tvar = newgenvar () in
+    {
+      decl_abstr with
+      type_params = [tvar];
+      type_arity = 1;
+      type_variance = [Variance.covariant];
+    }
+  in
+
+  let add_exception id l =
+    add_extension id
+      {
+        ext_type_path = path_exn;
+        ext_type_params = [];
+        ext_args = Cstr_tuple l;
+        ext_ret_type = None;
+        ext_private = Asttypes.Public;
+        ext_loc = Location.none;
+        ext_attributes =
+          [
+            ( {
+                Asttypes.txt = "ocaml.warn_on_literal_pattern";
+                loc = Location.none;
+              },
+              Parsetree.PStr [] );
+          ];
+        ext_is_exception = true;
+      }
+  in
+  empty_env
+  |> add_type ident_bool decl_bool
+  |> add_type ident_int decl_abstr_imm
+  |> add_type ident_float decl_abstr
+  |> add_type ident_bigint decl_abstr
+  |> add_type ident_string decl_abstr
+  |> add_type ident_unit decl_unit
+  |> add_type ident_extension_constructor decl_abstr
+  |> add_type ident_exn decl_exn
+  |> add_type ident_option decl_option
+  |> add_type ident_result decl_result
+  |> add_type ident_promise decl_promise
+  |> add_type ident_array decl_array
+  |> add_type ident_list decl_list
+  |> add_type ident_dict decl_dict
+  |> add_type ident_unknown decl_unknown
+  |> add_exception ident_undefined_recursive_module
+       [newgenty (Ttuple [type_string; type_int; type_int])]
+  |> add_exception ident_assert_failure
+       [newgenty (Ttuple [type_string; type_int; type_int])]
+  |> add_exception ident_division_by_zero []
+  |> add_exception ident_end_of_file []
+  |> add_exception ident_not_found []
+  |> add_exception ident_failure [type_string]
+  |> add_exception ident_js_exn [type_unknown]
+  |> add_exception ident_invalid_argument [type_string]
+  |> add_exception ident_match_failure
+       [newgenty (Ttuple [type_string; type_int; type_int])]
+
+let build_initial_env add_type add_exception empty_env =
+  let common = common_initial_env add_type add_exception empty_env in
+  let decl_type_char =
+    {decl_abstr with type_manifest = Some type_int; type_private = Private}
+  in
+  add_type ident_char decl_type_char common
+
+let builtin_values =
+  List.map
+    (fun id ->
+      Ident.make_global id;
+      (Ident.name id, id))
+    [
+      ident_match_failure;
+      ident_invalid_argument;
+      ident_failure;
+      ident_js_exn;
+      ident_not_found;
+      ident_end_of_file;
+      ident_division_by_zero;
+      ident_assert_failure;
+      ident_undefined_recursive_module;
+    ]
+
+(* Start non-predef identifiers at 1000.  This way, more predefs can
+   be defined in this file (above!) without breaking .cmi
+   compatibility. *)
+
+let _ = Ident.set_current_time 999
+let builtin_idents = List.rev !builtin_idents
diff --git a/compiler/ml/predef.mli b/compiler/ml/predef.mli
new file mode 100644
index 0000000..8e3330f
--- /dev/null
+++ b/compiler/ml/predef.mli
@@ -0,0 +1,82 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Predefined type constructors (with special typing rules in typecore) *)
+
+open Types
+
+val type_int : type_expr
+val type_char : type_expr
+val type_string : type_expr
+val type_float : type_expr
+val type_bool : type_expr
+val type_unit : type_expr
+val type_exn : type_expr
+val type_array : type_expr -> type_expr
+val type_list : type_expr -> type_expr
+val type_option : type_expr -> type_expr
+val type_result : type_expr -> type_expr -> type_expr
+val type_dict : type_expr -> type_expr
+
+val type_bigint : type_expr
+val type_extension_constructor : type_expr
+
+val path_int : Path.t
+val path_char : Path.t
+val path_string : Path.t
+val path_float : Path.t
+val path_bool : Path.t
+val path_unit : Path.t
+val path_exn : Path.t
+val path_array : Path.t
+val path_list : Path.t
+val path_option : Path.t
+val path_result : Path.t
+val path_dict : Path.t
+
+val path_bigint : Path.t
+val path_extension_constructor : Path.t
+val path_promise : Path.t
+
+val path_match_failure : Path.t
+val path_assert_failure : Path.t
+val path_undefined_recursive_module : Path.t
+
+(* To build the initial environment. Since there is a nasty mutual
+   recursion between predef and env, we break it by parameterizing
+   over Env.t, Env.add_type and Env.add_extension. *)
+
+val build_initial_env :
+  (Ident.t -> type_declaration -> 'a -> 'a) ->
+  (Ident.t -> extension_constructor -> 'a -> 'a) ->
+  'a ->
+  'a
+
+(* To initialize linker tables *)
+
+val builtin_values : (string * Ident.t) list
+val builtin_idents : (string * Ident.t) list
+
+val ident_division_by_zero : Ident.t
+(** All predefined exceptions, exposed as [Ident.t] for flambda (for
+    building value approximations).
+    The [Ident.t] for division by zero is also exported explicitly
+    so flambda can generate code to raise it. *)
+
+val all_predef_exns : Ident.t list
+
+type test = For_sure_yes | For_sure_no | NA
+
+val type_is_builtin_path_but_option : Path.t -> test
diff --git a/compiler/ml/primitive.ml b/compiler/ml/primitive.ml
new file mode 100644
index 0000000..f632606
--- /dev/null
+++ b/compiler/ml/primitive.ml
@@ -0,0 +1,62 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Description of primitive functions *)
+
+open Misc
+open Parsetree
+
+type description = {
+  prim_name: string; (* Name of primitive  or C function *)
+  prim_arity: int; (* Number of arguments *)
+  prim_alloc: bool; (* Does it allocates or raise? *)
+  prim_native_name: string; (* Name of C function for the nat. code gen. *)
+  prim_from_constructor: bool;
+      (* Is it from a type constructor instead of a concrete function type? *)
+  transformed_jsx: bool;
+}
+
+let set_transformed_jsx d ~transformed_jsx = {d with transformed_jsx}
+
+let with_arity d ~arity ~from_constructor =
+  {d with prim_arity = arity; prim_from_constructor = from_constructor}
+
+let coerce : (description -> description -> bool) ref =
+  ref (fun (p1 : description) (p2 : description) -> p1 = p2)
+
+let parse_declaration valdecl ~arity ~from_constructor =
+  let name, native_name =
+    match valdecl.pval_prim with
+    | name :: name2 :: _ -> (name, name2)
+    | name :: _ -> (name, "")
+    | [] -> fatal_error "Primitive.parse_declaration"
+  in
+  {
+    prim_name = name;
+    prim_arity = arity;
+    prim_alloc = true;
+    prim_native_name = native_name;
+    prim_from_constructor = from_constructor;
+    transformed_jsx = false;
+  }
+
+open Outcometree
+
+let print p osig_val_decl =
+  let prims =
+    if p.prim_native_name <> "" then [p.prim_name; p.prim_native_name]
+    else [p.prim_name]
+  in
+  {osig_val_decl with oval_prims = prims; oval_attributes = []}
diff --git a/compiler/ml/primitive.mli b/compiler/ml/primitive.mli
new file mode 100644
index 0000000..c5b43c3
--- /dev/null
+++ b/compiler/ml/primitive.mli
@@ -0,0 +1,43 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Description of primitive functions *)
+
+type description = private {
+  prim_name: string; (* Name of primitive  or C function *)
+  prim_arity: int; (* Number of arguments *)
+  prim_alloc: bool; (* Does it allocates or raise? *)
+  prim_native_name: string; (* Name of C function for the nat. code gen. *)
+  prim_from_constructor: bool;
+      (* Is it from a type constructor instead of a concrete function type? *)
+  transformed_jsx: bool;
+}
+
+val set_transformed_jsx : description -> transformed_jsx:bool -> description
+
+val with_arity :
+  description -> arity:int -> from_constructor:bool -> description
+
+(* Invariant [List.length d.prim_native_repr_args = d.prim_arity] *)
+
+val parse_declaration :
+  Parsetree.value_description ->
+  arity:int ->
+  from_constructor:bool ->
+  description
+
+val print : description -> Outcometree.out_val_decl -> Outcometree.out_val_decl
+
+val coerce : (description -> description -> bool) ref
diff --git a/compiler/ml/printast.ml b/compiler/ml/printast.ml
new file mode 100644
index 0000000..44d699e
--- /dev/null
+++ b/compiler/ml/printast.ml
@@ -0,0 +1,732 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*              Damien Doligez, projet Para, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1999 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Asttypes
+open Format
+open Lexing
+open Location
+open Parsetree
+
+let fmt_position with_name f l =
+  let fname = if with_name then l.pos_fname else "" in
+  if l.pos_lnum = -1 then fprintf f "%s[%d]" fname l.pos_cnum
+  else
+    fprintf f "%s[%d,%d+%d]" fname l.pos_lnum l.pos_bol (l.pos_cnum - l.pos_bol)
+
+let fmt_location f loc =
+  if !Clflags.dump_location then (
+    let p_2nd_name = loc.loc_start.pos_fname <> loc.loc_end.pos_fname in
+    fprintf f "(%a..%a)" (fmt_position true) loc.loc_start
+      (fmt_position p_2nd_name) loc.loc_end;
+    if loc.loc_ghost then fprintf f " ghost")
+
+let rec fmt_longident_aux f x =
+  match x with
+  | Longident.Lident s -> fprintf f "%s" s
+  | Longident.Ldot (y, s) -> fprintf f "%a.%s" fmt_longident_aux y s
+  | Longident.Lapply (y, z) ->
+    fprintf f "%a(%a)" fmt_longident_aux y fmt_longident_aux z
+
+let fmt_longident_loc f (x : Longident.t loc) =
+  fprintf f "\"%a\" %a" fmt_longident_aux x.txt fmt_location x.loc
+
+let fmt_jsx_tag_name f (x : jsx_tag_name loc) =
+  let loc = x.loc in
+  match x.txt with
+  | JsxLowerTag name -> fprintf f "\"%s\" %a" name fmt_location loc
+  | JsxQualifiedLowerTag {path; name} ->
+    fprintf f "\"%a.%s\" %a" fmt_longident_aux path name fmt_location loc
+  | JsxUpperTag path ->
+    fprintf f "\"%a\" %a" fmt_longident_aux path fmt_location loc
+  | JsxTagInvalid name -> fprintf f "\"%s\" %a" name fmt_location loc
+
+let fmt_string_loc f (x : string loc) =
+  fprintf f "\"%s\" %a" x.txt fmt_location x.loc
+
+let fmt_char_option f = function
+  | None -> fprintf f "None"
+  | Some c -> fprintf f "Some %c" c
+
+let fmt_constant f x =
+  match x with
+  | Pconst_integer (i, m) -> fprintf f "PConst_int (%s,%a)" i fmt_char_option m
+  | Pconst_char c -> fprintf f "PConst_char %02x" c
+  | Pconst_string (s, None) -> fprintf f "PConst_string(%S,None)" s
+  | Pconst_string (s, Some delim) ->
+    fprintf f "PConst_string (%S,Some %S)" s delim
+  | Pconst_float (s, m) -> fprintf f "PConst_float (%s,%a)" s fmt_char_option m
+
+let fmt_mutable_flag f x =
+  match x with
+  | Immutable -> fprintf f "Immutable"
+  | Mutable -> fprintf f "Mutable"
+
+let fmt_override_flag f x =
+  match x with
+  | Override -> fprintf f "Override"
+  | Fresh -> fprintf f "Fresh"
+
+let fmt_closed_flag f x =
+  match x with
+  | Closed -> fprintf f "Closed"
+  | Open -> fprintf f "Open"
+
+let fmt_rec_flag f x =
+  match x with
+  | Nonrecursive -> fprintf f "Nonrec"
+  | Recursive -> fprintf f "Rec"
+
+let fmt_direction_flag f x =
+  match x with
+  | Upto -> fprintf f "Up"
+  | Downto -> fprintf f "Down"
+
+let fmt_private_flag f x =
+  match x with
+  | Public -> fprintf f "Public"
+  | Private -> fprintf f "Private"
+
+let line i f s (*...*) =
+  fprintf f "%s" (String.make (2 * i mod 72) ' ');
+  fprintf f s (*...*)
+
+let list i f ppf l =
+  match l with
+  | [] -> line i ppf "[]\n"
+  | _ :: _ ->
+    line i ppf "[\n";
+    List.iter (f (i + 1) ppf) l;
+    line i ppf "]\n"
+
+let option i f ppf x =
+  match x with
+  | None -> line i ppf "None\n"
+  | Some x ->
+    line i ppf "Some\n";
+    f (i + 1) ppf x
+
+let longident_loc i ppf li = line i ppf "%a\n" fmt_longident_loc li
+let string i ppf s = line i ppf "\"%s\"\n" s
+let string_loc i ppf s = line i ppf "%a\n" fmt_string_loc s
+
+let arg_label_loc i ppf = function
+  | Nolabel -> line i ppf "Nolabel\n"
+  | Optional {txt = s} -> line i ppf "Optional \"%s\"\n" s
+  | Labelled {txt = s} -> line i ppf "Labelled \"%s\"\n" s
+
+let rec core_type i ppf x =
+  line i ppf "core_type %a\n" fmt_location x.ptyp_loc;
+  attributes i ppf x.ptyp_attributes;
+  let i = i + 1 in
+  match x.ptyp_desc with
+  | Ptyp_any -> line i ppf "Ptyp_any\n"
+  | Ptyp_var s -> line i ppf "Ptyp_var %s\n" s
+  | Ptyp_arrow {arg; ret; arity} ->
+    line i ppf "Ptyp_arrow\n";
+    let () =
+      match arity with
+      | None -> ()
+      | Some n -> line i ppf "arity = %d\n" n
+    in
+    arg_label_loc i ppf arg.lbl;
+    core_type i ppf arg.typ;
+    core_type i ppf ret
+  | Ptyp_tuple l ->
+    line i ppf "Ptyp_tuple\n";
+    list i core_type ppf l
+  | Ptyp_constr (li, l) ->
+    line i ppf "Ptyp_constr %a\n" fmt_longident_loc li;
+    list i core_type ppf l
+  | Ptyp_variant (l, closed, low) ->
+    line i ppf "Ptyp_variant closed=%a\n" fmt_closed_flag closed;
+    list i label_x_bool_x_core_type_list ppf l;
+    option i (fun i -> list i string) ppf low
+  | Ptyp_object (l, c) ->
+    line i ppf "Ptyp_object %a\n" fmt_closed_flag c;
+    let i = i + 1 in
+    List.iter
+      (function
+        | Otag (l, attrs, t) ->
+          line i ppf "method %s\n" l.txt;
+          attributes i ppf attrs;
+          core_type (i + 1) ppf t
+        | Oinherit ct ->
+          line i ppf "Oinherit\n";
+          core_type (i + 1) ppf ct)
+      l
+  | Ptyp_alias (ct, s) ->
+    line i ppf "Ptyp_alias \"%s\"\n" s;
+    core_type i ppf ct
+  | Ptyp_poly (sl, ct) ->
+    line i ppf "Ptyp_poly%a\n"
+      (fun ppf -> List.iter (fun x -> fprintf ppf " '%s" x.txt))
+      sl;
+    core_type i ppf ct
+  | Ptyp_package (s, l) ->
+    line i ppf "Ptyp_package %a\n" fmt_longident_loc s;
+    list i package_with ppf l
+  | Ptyp_extension (s, arg) ->
+    line i ppf "Ptyp_extension \"%s\"\n" s.txt;
+    payload i ppf arg
+
+and package_with i ppf (s, t) =
+  line i ppf "with type %a\n" fmt_longident_loc s;
+  core_type i ppf t
+
+and pattern i ppf x =
+  line i ppf "pattern %a\n" fmt_location x.ppat_loc;
+  attributes i ppf x.ppat_attributes;
+  let i = i + 1 in
+  match x.ppat_desc with
+  | Ppat_any -> line i ppf "Ppat_any\n"
+  | Ppat_var s -> line i ppf "Ppat_var %a\n" fmt_string_loc s
+  | Ppat_alias (p, s) ->
+    line i ppf "Ppat_alias %a\n" fmt_string_loc s;
+    pattern i ppf p
+  | Ppat_constant c -> line i ppf "Ppat_constant %a\n" fmt_constant c
+  | Ppat_interval (c1, c2) ->
+    line i ppf "Ppat_interval %a..%a\n" fmt_constant c1 fmt_constant c2
+  | Ppat_tuple l ->
+    line i ppf "Ppat_tuple\n";
+    list i pattern ppf l
+  | Ppat_construct (li, po) ->
+    line i ppf "Ppat_construct %a\n" fmt_longident_loc li;
+    option i pattern ppf po
+  | Ppat_variant (l, po) ->
+    line i ppf "Ppat_variant \"%s\"\n" l;
+    option i pattern ppf po
+  | Ppat_record (l, c) ->
+    line i ppf "Ppat_record %a\n" fmt_closed_flag c;
+    list i longident_x_pattern ppf l
+  | Ppat_array l ->
+    line i ppf "Ppat_array\n";
+    list i pattern ppf l
+  | Ppat_or (p1, p2) ->
+    line i ppf "Ppat_or\n";
+    pattern i ppf p1;
+    pattern i ppf p2
+  | Ppat_constraint (p, ct) ->
+    line i ppf "Ppat_constraint\n";
+    pattern i ppf p;
+    core_type i ppf ct
+  | Ppat_type li ->
+    line i ppf "Ppat_type\n";
+    longident_loc i ppf li
+  | Ppat_unpack s -> line i ppf "Ppat_unpack %a\n" fmt_string_loc s
+  | Ppat_exception p ->
+    line i ppf "Ppat_exception\n";
+    pattern i ppf p
+  | Ppat_open (m, p) ->
+    line i ppf "Ppat_open \"%a\"\n" fmt_longident_loc m;
+    pattern i ppf p
+  | Ppat_extension (s, arg) ->
+    line i ppf "Ppat_extension \"%s\"\n" s.txt;
+    payload i ppf arg
+
+and expression i ppf x =
+  line i ppf "expression %a\n" fmt_location x.pexp_loc;
+  attributes i ppf x.pexp_attributes;
+  let i = i + 1 in
+  match x.pexp_desc with
+  | Pexp_ident li -> line i ppf "Pexp_ident %a\n" fmt_longident_loc li
+  | Pexp_constant c -> line i ppf "Pexp_constant %a\n" fmt_constant c
+  | Pexp_let (rf, l, e) ->
+    line i ppf "Pexp_let %a\n" fmt_rec_flag rf;
+    list i value_binding ppf l;
+    expression i ppf e
+  | Pexp_fun {arg_label = l; default = eo; lhs = p; rhs = e; arity; async} ->
+    line i ppf "Pexp_fun\n";
+    let () = if async then line i ppf "async\n" in
+    let () =
+      match arity with
+      | None -> ()
+      | Some arity -> line i ppf "arity:%d\n" arity
+    in
+    arg_label_loc i ppf l;
+    option i expression ppf eo;
+    pattern i ppf p;
+    expression i ppf e
+  | Pexp_apply {funct = e; args = l; partial; transformed_jsx} ->
+    line i ppf "Pexp_apply\n";
+    if partial then line i ppf "partial\n";
+    expression i ppf e;
+    list i label_x_expression ppf l;
+    line i ppf "transformed_jsx: %b\n" transformed_jsx
+  | Pexp_match (e, l) ->
+    line i ppf "Pexp_match\n";
+    expression i ppf e;
+    list i case ppf l
+  | Pexp_try (e, l) ->
+    line i ppf "Pexp_try\n";
+    expression i ppf e;
+    list i case ppf l
+  | Pexp_tuple l ->
+    line i ppf "Pexp_tuple\n";
+    list i expression ppf l
+  | Pexp_construct (li, eo) ->
+    line i ppf "Pexp_construct %a\n" fmt_longident_loc li;
+    option i expression ppf eo
+  | Pexp_variant (l, eo) ->
+    line i ppf "Pexp_variant \"%s\"\n" l;
+    option i expression ppf eo
+  | Pexp_record (l, eo) ->
+    line i ppf "Pexp_record\n";
+    list i longident_x_expression ppf l;
+    option i expression ppf eo
+  | Pexp_field (e, li) ->
+    line i ppf "Pexp_field\n";
+    expression i ppf e;
+    longident_loc i ppf li
+  | Pexp_setfield (e1, li, e2) ->
+    line i ppf "Pexp_setfield\n";
+    expression i ppf e1;
+    longident_loc i ppf li;
+    expression i ppf e2
+  | Pexp_array l ->
+    line i ppf "Pexp_array\n";
+    list i expression ppf l
+  | Pexp_ifthenelse (e1, e2, eo) ->
+    line i ppf "Pexp_ifthenelse\n";
+    expression i ppf e1;
+    expression i ppf e2;
+    option i expression ppf eo
+  | Pexp_sequence (e1, e2) ->
+    line i ppf "Pexp_sequence\n";
+    expression i ppf e1;
+    expression i ppf e2
+  | Pexp_while (e1, e2) ->
+    line i ppf "Pexp_while\n";
+    expression i ppf e1;
+    expression i ppf e2
+  | Pexp_for (p, e1, e2, df, e3) ->
+    line i ppf "Pexp_for %a\n" fmt_direction_flag df;
+    pattern i ppf p;
+    expression i ppf e1;
+    expression i ppf e2;
+    expression i ppf e3
+  | Pexp_constraint (e, ct) ->
+    line i ppf "Pexp_constraint\n";
+    expression i ppf e;
+    core_type i ppf ct
+  | Pexp_coerce (e, (), cto2) ->
+    line i ppf "Pexp_coerce\n";
+    expression i ppf e;
+    core_type i ppf cto2
+  | Pexp_send (e, s) ->
+    line i ppf "Pexp_send \"%s\"\n" s.txt;
+    expression i ppf e
+  | Pexp_letmodule (s, me, e) ->
+    line i ppf "Pexp_letmodule %a\n" fmt_string_loc s;
+    module_expr i ppf me;
+    expression i ppf e
+  | Pexp_letexception (cd, e) ->
+    line i ppf "Pexp_letexception\n";
+    extension_constructor i ppf cd;
+    expression i ppf e
+  | Pexp_assert e ->
+    line i ppf "Pexp_assert\n";
+    expression i ppf e
+  | Pexp_newtype (s, e) ->
+    line i ppf "Pexp_newtype \"%s\"\n" s.txt;
+    expression i ppf e
+  | Pexp_pack me ->
+    line i ppf "Pexp_pack\n";
+    module_expr i ppf me
+  | Pexp_open (ovf, m, e) ->
+    line i ppf "Pexp_open %a \"%a\"\n" fmt_override_flag ovf fmt_longident_loc m;
+    expression i ppf e
+  | Pexp_extension (s, arg) ->
+    line i ppf "Pexp_extension \"%s\"\n" s.txt;
+    payload i ppf arg
+  | Pexp_await e ->
+    line i ppf "Pexp_await\n";
+    expression i ppf e
+  | Pexp_jsx_element (Jsx_fragment {jsx_fragment_children = children}) ->
+    line i ppf "Pexp_jsx_fragment";
+    jsx_children i ppf children
+  | Pexp_jsx_element
+      (Jsx_unary_element
+         {jsx_unary_element_tag_name = name; jsx_unary_element_props = props})
+    ->
+    line i ppf "Pexp_jsx_unary_element %a\n" fmt_jsx_tag_name name;
+    jsx_props i ppf props
+  | Pexp_jsx_element
+      (Jsx_container_element
+         {
+           jsx_container_element_tag_name_start = name;
+           jsx_container_element_props = props;
+           jsx_container_element_opening_tag_end = gt;
+           jsx_container_element_children = children;
+           jsx_container_element_closing_tag = closing_tag;
+         }) -> (
+    line i ppf "Pexp_jsx_container_element %a\n" fmt_jsx_tag_name name;
+    jsx_props i ppf props;
+    if !Clflags.dump_location then line i ppf "> %a\n" (fmt_position false) gt;
+    jsx_children i ppf children;
+    match closing_tag with
+    | None -> ()
+    | Some closing_tag ->
+      line i ppf "closing_tag =%a\n" fmt_jsx_tag_name
+        closing_tag.jsx_closing_container_tag_name)
+
+and jsx_children i ppf children =
+  line i ppf "jsx_children =\n";
+  list (i + 1) expression ppf children
+
+and jsx_prop i ppf = function
+  | JSXPropPunning (opt, name) ->
+    line i ppf "%s%s" (if opt then "?" else "") name.txt
+  | JSXPropValue (name, opt, expr) ->
+    line i ppf "%s=%s" name.txt (if opt then "?" else "");
+    expression i ppf expr
+  | JSXPropSpreading (loc, e) ->
+    line i ppf "{... %a\n" fmt_location loc;
+    expression (i + 1) ppf e;
+    line i ppf "}\n"
+
+and jsx_props i ppf xs =
+  line i ppf "jsx_props =\n";
+  list (i + 1) jsx_prop ppf xs
+
+and value_description i ppf x =
+  line i ppf "value_description %a %a\n" fmt_string_loc x.pval_name fmt_location
+    x.pval_loc;
+  attributes i ppf x.pval_attributes;
+  core_type (i + 1) ppf x.pval_type;
+  list (i + 1) string ppf x.pval_prim
+
+and type_parameter i ppf (x, _variance) = core_type i ppf x
+
+and type_declaration i ppf x =
+  line i ppf "type_declaration %a %a\n" fmt_string_loc x.ptype_name fmt_location
+    x.ptype_loc;
+  attributes i ppf x.ptype_attributes;
+  let i = i + 1 in
+  line i ppf "ptype_params =\n";
+  list (i + 1) type_parameter ppf x.ptype_params;
+  line i ppf "ptype_cstrs =\n";
+  list (i + 1) core_type_x_core_type_x_location ppf x.ptype_cstrs;
+  line i ppf "ptype_kind =\n";
+  type_kind (i + 1) ppf x.ptype_kind;
+  line i ppf "ptype_private = %a\n" fmt_private_flag x.ptype_private;
+  line i ppf "ptype_manifest =\n";
+  option (i + 1) core_type ppf x.ptype_manifest
+
+and attributes i ppf l =
+  let i = i + 1 in
+  List.iter
+    (fun (s, arg) ->
+      line i ppf "attribute %a \"%s\"\n" fmt_location (s : _ Asttypes.loc).loc
+        s.txt;
+      payload (i + 1) ppf arg)
+    l
+
+and payload i ppf = function
+  | PStr x -> structure i ppf x
+  | PSig x -> signature i ppf x
+  | PTyp x -> core_type i ppf x
+  | PPat (x, None) -> pattern i ppf x
+  | PPat (x, Some g) ->
+    pattern i ppf x;
+    line i ppf "<when>\n";
+    expression (i + 1) ppf g
+
+and type_kind i ppf x =
+  match x with
+  | Ptype_abstract -> line i ppf "Ptype_abstract\n"
+  | Ptype_variant l ->
+    line i ppf "Ptype_variant\n";
+    list (i + 1) constructor_decl ppf l
+  | Ptype_record l ->
+    line i ppf "Ptype_record\n";
+    list (i + 1) label_decl ppf l
+  | Ptype_open -> line i ppf "Ptype_open\n"
+
+and type_extension i ppf x =
+  line i ppf "type_extension\n";
+  attributes i ppf x.ptyext_attributes;
+  let i = i + 1 in
+  line i ppf "ptyext_path = %a\n" fmt_longident_loc x.ptyext_path;
+  line i ppf "ptyext_params =\n";
+  list (i + 1) type_parameter ppf x.ptyext_params;
+  line i ppf "ptyext_constructors =\n";
+  list (i + 1) extension_constructor ppf x.ptyext_constructors;
+  line i ppf "ptyext_private = %a\n" fmt_private_flag x.ptyext_private
+
+and extension_constructor i ppf x =
+  line i ppf "extension_constructor %a\n" fmt_location x.pext_loc;
+  attributes i ppf x.pext_attributes;
+  let i = i + 1 in
+  line i ppf "pext_name = \"%s\"\n" x.pext_name.txt;
+  line i ppf "pext_kind =\n";
+  extension_constructor_kind (i + 1) ppf x.pext_kind
+
+and extension_constructor_kind i ppf x =
+  match x with
+  | Pext_decl (a, r) ->
+    line i ppf "Pext_decl\n";
+    constructor_arguments (i + 1) ppf a;
+    option (i + 1) core_type ppf r
+  | Pext_rebind li ->
+    line i ppf "Pext_rebind\n";
+    line (i + 1) ppf "%a\n" fmt_longident_loc li
+
+and module_type i ppf x =
+  line i ppf "module_type %a\n" fmt_location x.pmty_loc;
+  attributes i ppf x.pmty_attributes;
+  let i = i + 1 in
+  match x.pmty_desc with
+  | Pmty_ident li -> line i ppf "Pmty_ident %a\n" fmt_longident_loc li
+  | Pmty_alias li -> line i ppf "Pmty_alias %a\n" fmt_longident_loc li
+  | Pmty_signature s ->
+    line i ppf "Pmty_signature\n";
+    signature i ppf s
+  | Pmty_functor (s, mt1, mt2) ->
+    line i ppf "Pmty_functor %a\n" fmt_string_loc s;
+    Misc.may (module_type i ppf) mt1;
+    module_type i ppf mt2
+  | Pmty_with (mt, l) ->
+    line i ppf "Pmty_with\n";
+    module_type i ppf mt;
+    list i with_constraint ppf l
+  | Pmty_typeof m ->
+    line i ppf "Pmty_typeof\n";
+    module_expr i ppf m
+  | Pmty_extension (s, arg) ->
+    line i ppf "Pmod_extension \"%s\"\n" s.txt;
+    payload i ppf arg
+
+and signature i ppf x = list i signature_item ppf x
+
+and signature_item i ppf x =
+  line i ppf "signature_item %a\n" fmt_location x.psig_loc;
+  let i = i + 1 in
+  match x.psig_desc with
+  | Psig_value vd ->
+    line i ppf "Psig_value\n";
+    value_description i ppf vd
+  | Psig_type (rf, l) ->
+    line i ppf "Psig_type %a\n" fmt_rec_flag rf;
+    list i type_declaration ppf l
+  | Psig_typext te ->
+    line i ppf "Psig_typext\n";
+    type_extension i ppf te
+  | Psig_exception ext ->
+    line i ppf "Psig_exception\n";
+    extension_constructor i ppf ext
+  | Psig_module pmd ->
+    line i ppf "Psig_module %a\n" fmt_string_loc pmd.pmd_name;
+    attributes i ppf pmd.pmd_attributes;
+    module_type i ppf pmd.pmd_type
+  | Psig_recmodule decls ->
+    line i ppf "Psig_recmodule\n";
+    list i module_declaration ppf decls
+  | Psig_modtype x ->
+    line i ppf "Psig_modtype %a\n" fmt_string_loc x.pmtd_name;
+    attributes i ppf x.pmtd_attributes;
+    modtype_declaration i ppf x.pmtd_type
+  | Psig_open od ->
+    line i ppf "Psig_open %a %a\n" fmt_override_flag od.popen_override
+      fmt_longident_loc od.popen_lid;
+    attributes i ppf od.popen_attributes
+  | Psig_include incl ->
+    line i ppf "Psig_include\n";
+    module_type i ppf incl.pincl_mod;
+    attributes i ppf incl.pincl_attributes
+  | Psig_extension ((s, arg), attrs) ->
+    line i ppf "Psig_extension \"%s\"\n" s.txt;
+    attributes i ppf attrs;
+    payload i ppf arg
+  | Psig_attribute (s, arg) ->
+    line i ppf "Psig_attribute \"%s\"\n" s.txt;
+    payload i ppf arg
+
+and modtype_declaration i ppf = function
+  | None -> line i ppf "#abstract"
+  | Some mt -> module_type (i + 1) ppf mt
+
+and with_constraint i ppf x =
+  match x with
+  | Pwith_type (lid, td) ->
+    line i ppf "Pwith_type %a\n" fmt_longident_loc lid;
+    type_declaration (i + 1) ppf td
+  | Pwith_typesubst (lid, td) ->
+    line i ppf "Pwith_typesubst %a\n" fmt_longident_loc lid;
+    type_declaration (i + 1) ppf td
+  | Pwith_module (lid1, lid2) ->
+    line i ppf "Pwith_module %a = %a\n" fmt_longident_loc lid1 fmt_longident_loc
+      lid2
+  | Pwith_modsubst (lid1, lid2) ->
+    line i ppf "Pwith_modsubst %a = %a\n" fmt_longident_loc lid1
+      fmt_longident_loc lid2
+
+and module_expr i ppf x =
+  line i ppf "module_expr %a\n" fmt_location x.pmod_loc;
+  attributes i ppf x.pmod_attributes;
+  let i = i + 1 in
+  match x.pmod_desc with
+  | Pmod_ident li -> line i ppf "Pmod_ident %a\n" fmt_longident_loc li
+  | Pmod_structure s ->
+    line i ppf "Pmod_structure\n";
+    structure i ppf s
+  | Pmod_functor (s, mt, me) ->
+    line i ppf "Pmod_functor %a\n" fmt_string_loc s;
+    Misc.may (module_type i ppf) mt;
+    module_expr i ppf me
+  | Pmod_apply (me1, me2) ->
+    line i ppf "Pmod_apply\n";
+    module_expr i ppf me1;
+    module_expr i ppf me2
+  | Pmod_constraint (me, mt) ->
+    line i ppf "Pmod_constraint\n";
+    module_expr i ppf me;
+    module_type i ppf mt
+  | Pmod_unpack e ->
+    line i ppf "Pmod_unpack\n";
+    expression i ppf e
+  | Pmod_extension (s, arg) ->
+    line i ppf "Pmod_extension \"%s\"\n" s.txt;
+    payload i ppf arg
+
+and structure i ppf x = list i structure_item ppf x
+
+and structure_item i ppf x =
+  line i ppf "structure_item %a\n" fmt_location x.pstr_loc;
+  let i = i + 1 in
+  match x.pstr_desc with
+  | Pstr_eval (e, attrs) ->
+    line i ppf "Pstr_eval\n";
+    attributes i ppf attrs;
+    expression i ppf e
+  | Pstr_value (rf, l) ->
+    line i ppf "Pstr_value %a\n" fmt_rec_flag rf;
+    list i value_binding ppf l
+  | Pstr_primitive vd ->
+    line i ppf "Pstr_primitive\n";
+    value_description i ppf vd
+  | Pstr_type (rf, l) ->
+    line i ppf "Pstr_type %a\n" fmt_rec_flag rf;
+    list i type_declaration ppf l
+  | Pstr_typext te ->
+    line i ppf "Pstr_typext\n";
+    type_extension i ppf te
+  | Pstr_exception ext ->
+    line i ppf "Pstr_exception\n";
+    extension_constructor i ppf ext
+  | Pstr_module x ->
+    line i ppf "Pstr_module\n";
+    module_binding i ppf x
+  | Pstr_recmodule bindings ->
+    line i ppf "Pstr_recmodule\n";
+    list i module_binding ppf bindings
+  | Pstr_modtype x ->
+    line i ppf "Pstr_modtype %a\n" fmt_string_loc x.pmtd_name;
+    attributes i ppf x.pmtd_attributes;
+    modtype_declaration i ppf x.pmtd_type
+  | Pstr_open od ->
+    line i ppf "Pstr_open %a %a\n" fmt_override_flag od.popen_override
+      fmt_longident_loc od.popen_lid;
+    attributes i ppf od.popen_attributes
+  | Pstr_include incl ->
+    line i ppf "Pstr_include";
+    attributes i ppf incl.pincl_attributes;
+    module_expr i ppf incl.pincl_mod
+  | Pstr_extension ((s, arg), attrs) ->
+    line i ppf "Pstr_extension \"%s\"\n" s.txt;
+    attributes i ppf attrs;
+    payload i ppf arg
+  | Pstr_attribute (s, arg) ->
+    line i ppf "Pstr_attribute \"%s\"\n" s.txt;
+    payload i ppf arg
+
+and module_declaration i ppf pmd =
+  string_loc i ppf pmd.pmd_name;
+  attributes i ppf pmd.pmd_attributes;
+  module_type (i + 1) ppf pmd.pmd_type
+
+and module_binding i ppf x =
+  string_loc i ppf x.pmb_name;
+  attributes i ppf x.pmb_attributes;
+  module_expr (i + 1) ppf x.pmb_expr
+
+and core_type_x_core_type_x_location i ppf (ct1, ct2, l) =
+  line i ppf "<constraint> %a\n" fmt_location l;
+  core_type (i + 1) ppf ct1;
+  core_type (i + 1) ppf ct2
+
+and constructor_decl i ppf
+    {pcd_name; pcd_args; pcd_res; pcd_loc; pcd_attributes} =
+  line i ppf "%a\n" fmt_location pcd_loc;
+  line (i + 1) ppf "%a\n" fmt_string_loc pcd_name;
+  attributes i ppf pcd_attributes;
+  constructor_arguments (i + 1) ppf pcd_args;
+  option (i + 1) core_type ppf pcd_res
+
+and constructor_arguments i ppf = function
+  | Pcstr_tuple l -> list i core_type ppf l
+  | Pcstr_record l -> list i label_decl ppf l
+
+and label_decl i ppf {pld_name; pld_mutable; pld_type; pld_loc; pld_attributes}
+    =
+  line i ppf "%a\n" fmt_location pld_loc;
+  attributes i ppf pld_attributes;
+  line (i + 1) ppf "%a\n" fmt_mutable_flag pld_mutable;
+  line (i + 1) ppf "%a" fmt_string_loc pld_name;
+  core_type (i + 1) ppf pld_type
+
+and longident_x_pattern i ppf {lid = li; x = p; opt} =
+  line i ppf "%a%s\n" fmt_longident_loc li (if opt then "?" else "");
+  pattern (i + 1) ppf p
+
+and case i ppf {pc_bar; pc_lhs; pc_guard; pc_rhs} =
+  line i ppf "<case>\n";
+  pc_bar
+  |> Option.iter (fun bar -> line i ppf "| %a\n" (fmt_position false) bar);
+  pattern (i + 1) ppf pc_lhs;
+  (match pc_guard with
+  | None -> ()
+  | Some g ->
+    line (i + 1) ppf "<when>\n";
+    expression (i + 2) ppf g);
+  expression (i + 1) ppf pc_rhs
+
+and value_binding i ppf x =
+  line i ppf "<def>\n";
+  attributes (i + 1) ppf x.pvb_attributes;
+  pattern (i + 1) ppf x.pvb_pat;
+  expression (i + 1) ppf x.pvb_expr
+
+and longident_x_expression i ppf {lid = li; x = e; opt} =
+  line i ppf "%a%s\n" fmt_longident_loc li (if opt then "?" else "");
+  expression (i + 1) ppf e
+
+and label_x_expression i ppf (l, e) =
+  line i ppf "<arg>\n";
+  arg_label_loc i ppf l;
+  expression (i + 1) ppf e
+
+and label_x_bool_x_core_type_list i ppf x =
+  match x with
+  | Rtag (l, attrs, b, ctl) ->
+    line i ppf "Rtag \"%s\" %s\n" l.txt (string_of_bool b);
+    attributes (i + 1) ppf attrs;
+    list (i + 1) core_type ppf ctl
+  | Rinherit ct ->
+    line i ppf "Rinherit\n";
+    core_type (i + 1) ppf ct
+
+let interface ppf x = list 0 signature_item ppf x
+
+let implementation ppf x = list 0 structure_item ppf x
diff --git a/jscomp/ml/printast.mli b/compiler/ml/printast.mli
similarity index 77%
rename from jscomp/ml/printast.mli
rename to compiler/ml/printast.mli
index eb94a3b..87da253 100644
--- a/jscomp/ml/printast.mli
+++ b/compiler/ml/printast.mli
@@ -13,13 +13,12 @@
 (*                                                                        *)
 (**************************************************************************)
 
-open Parsetree;;
-open Format;;
+open Parsetree
+open Format
 
-val interface : formatter -> signature_item list -> unit;;
-val implementation : formatter -> structure_item list -> unit;;
+val interface : formatter -> signature_item list -> unit
+val implementation : formatter -> structure_item list -> unit
 
-
-val expression: int -> formatter -> expression -> unit
-val structure: int -> formatter -> structure -> unit
-val payload: int -> formatter -> payload -> unit
+val expression : int -> formatter -> expression -> unit
+val structure : int -> formatter -> structure -> unit
+val payload : int -> formatter -> payload -> unit
diff --git a/compiler/ml/printlambda.ml b/compiler/ml/printlambda.ml
new file mode 100644
index 0000000..0282f6e
--- /dev/null
+++ b/compiler/ml/printlambda.ml
@@ -0,0 +1,398 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Format
+open Asttypes
+open Primitive
+open Lambda
+
+let rec struct_const ppf = function
+  | Const_base (Const_int n) -> fprintf ppf "%i" n
+  | Const_base (Const_char i) ->
+    fprintf ppf "%s" (Pprintast.string_of_int_as_char i)
+  | Const_base (Const_string (s, _)) -> fprintf ppf "%S" s
+  | Const_immstring s -> fprintf ppf "#%S" s
+  | Const_base (Const_float f) -> fprintf ppf "%s" f
+  | Const_base (Const_int32 n) -> fprintf ppf "%lil" n
+  | Const_base (Const_int64 n) -> fprintf ppf "%LiL" n
+  | Const_base (Const_bigint (sign, n)) ->
+    fprintf ppf "%sn" (Bigint_utils.to_string sign n)
+  | Const_pointer (n, _) -> fprintf ppf "%ia" n
+  | Const_block (tag_info, []) ->
+    let tag = Lambda.tag_of_tag_info tag_info in
+    fprintf ppf "[%i]" tag
+  | Const_block (tag_info, sc1 :: scl) ->
+    let tag = Lambda.tag_of_tag_info tag_info in
+    let sconsts ppf scl =
+      List.iter (fun sc -> fprintf ppf "@ %a" struct_const sc) scl
+    in
+    fprintf ppf "@[<1>[%i:@ @[%a%a@]]@]" tag struct_const sc1 sconsts scl
+  | Const_false -> fprintf ppf "false"
+  | Const_true -> fprintf ppf "true"
+
+let value_kind = function
+  | Pgenval -> ""
+
+(* let field_kind = function
+   | Pgenval -> "*"
+   | Pintval -> "int"
+   | Pfloatval -> "float"
+   | Pboxedintval bi -> boxed_integer_name bi *)
+
+let string_of_loc_kind = function
+  | Loc_FILE -> "loc_FILE"
+  | Loc_LINE -> "loc_LINE"
+  | Loc_MODULE -> "loc_MODULE"
+  | Loc_POS -> "loc_POS"
+  | Loc_LOC -> "loc_LOC"
+
+(* let block_shape ppf shape = match shape with
+   | None | Some [] -> ()
+   | Some l when List.for_all ((=) Pgenval) l -> ()
+   | Some [elt] ->
+       Format.fprintf ppf " (%s)" (field_kind elt)
+   | Some (h :: t) ->
+       Format.fprintf ppf " (%s" (field_kind h);
+       List.iter (fun elt ->
+           Format.fprintf ppf ",%s" (field_kind elt))
+         t;
+       Format.fprintf ppf ")" *)
+
+let str_of_field_info (fld_info : Lambda.field_dbg_info) =
+  match fld_info with
+  | Fld_module {name}
+  | Fld_record {name}
+  | Fld_record_inline {name}
+  | Fld_record_extension {name} ->
+    name
+  | Fld_tuple -> "[]"
+  | Fld_poly_var_tag -> "`"
+  | Fld_poly_var_content -> "#"
+  | Fld_extension -> "ext"
+  | Fld_variant -> "var"
+  | Fld_cons -> "cons"
+let print_taginfo ppf = function
+  | Blk_extension -> fprintf ppf "ext"
+  | Blk_record_ext {fields = ss} ->
+    fprintf ppf "[%s]" (String.concat ";" (Array.to_list ss))
+  | Blk_tuple -> fprintf ppf "tuple"
+  | Blk_constructor {name; num_nonconst} ->
+    fprintf ppf "%s/%i" name num_nonconst
+  | Blk_poly_var name -> fprintf ppf "`%s" name
+  | Blk_record {fields = ss} ->
+    fprintf ppf "[%s]" (String.concat ";" (List.map fst (Array.to_list ss)))
+  | Blk_module ss -> fprintf ppf "[%s]" (String.concat ";" ss)
+  | Blk_some -> fprintf ppf "some"
+  | Blk_some_not_nested -> fprintf ppf "some_not_nested"
+  | Blk_module_export _ -> fprintf ppf "module/exports"
+  | Blk_record_inlined {fields = ss} ->
+    fprintf ppf "[%s]" (String.concat ";" (List.map fst (Array.to_list ss)))
+
+let primitive ppf = function
+  | Pidentity -> fprintf ppf "id"
+  | Pignore -> fprintf ppf "ignore"
+  | Pdebugger -> fprintf ppf "debugger"
+  | Ptypeof -> fprintf ppf "typeof"
+  | Pnull -> fprintf ppf "null"
+  | Pundefined -> fprintf ppf "undefined"
+  | Pfn_arity -> fprintf ppf "fn.length"
+  | Prevapply -> fprintf ppf "revapply"
+  | Pdirapply -> fprintf ppf "dirapply"
+  | Ploc kind -> fprintf ppf "%s" (string_of_loc_kind kind)
+  | Pgetglobal id -> fprintf ppf "global %a" Ident.print id
+  | Pmakeblock taginfo -> fprintf ppf "makeblock %a" print_taginfo taginfo
+  | Pfield (n, fld) -> fprintf ppf "field:%s/%i" (str_of_field_info fld) n
+  | Psetfield (n, _) -> fprintf ppf "setfield %i" n
+  | Pduprecord -> fprintf ppf "duprecord"
+  | Pccall p -> fprintf ppf "%s" p.prim_name
+  | Praise k -> fprintf ppf "%s" (Lambda.raise_kind k)
+  | Pobjcomp Ceq -> fprintf ppf "=="
+  | Pobjcomp Cneq -> fprintf ppf "!="
+  | Pobjcomp Clt -> fprintf ppf "<"
+  | Pobjcomp Cle -> fprintf ppf "<="
+  | Pobjcomp Cgt -> fprintf ppf ">"
+  | Pobjcomp Cge -> fprintf ppf ">="
+  | Pobjorder -> fprintf ppf "compare"
+  | Pobjmin -> fprintf ppf "min"
+  | Pobjmax -> fprintf ppf "max"
+  | Pobjtag -> fprintf ppf "tag"
+  | Pobjsize -> fprintf ppf "length"
+  | Psequand -> fprintf ppf "&&"
+  | Psequor -> fprintf ppf "||"
+  | Pnot -> fprintf ppf "not"
+  | Pboolcomp Ceq -> fprintf ppf "=="
+  | Pboolcomp Cneq -> fprintf ppf "!="
+  | Pboolcomp Clt -> fprintf ppf "<"
+  | Pboolcomp Cle -> fprintf ppf "<="
+  | Pboolcomp Cgt -> fprintf ppf ">"
+  | Pboolcomp Cge -> fprintf ppf ">="
+  | Pboolorder -> fprintf ppf "compare"
+  | Pboolmin -> fprintf ppf "min"
+  | Pboolmax -> fprintf ppf "max"
+  | Pnegint -> fprintf ppf "~-"
+  | Paddint -> fprintf ppf "+"
+  | Psubint -> fprintf ppf "-"
+  | Pmulint -> fprintf ppf "*"
+  | Pdivint -> fprintf ppf "/"
+  | Pmodint -> fprintf ppf "mod"
+  | Ppowint -> fprintf ppf "**"
+  | Pandint -> fprintf ppf "and"
+  | Porint -> fprintf ppf "or"
+  | Pxorint -> fprintf ppf "xor"
+  | Pnotint -> fprintf ppf "~~"
+  | Plslint -> fprintf ppf "lsl"
+  | Plsrint -> fprintf ppf "lsr"
+  | Pasrint -> fprintf ppf "asr"
+  | Pintcomp Ceq -> fprintf ppf "=="
+  | Pintcomp Cneq -> fprintf ppf "!="
+  | Pintcomp Clt -> fprintf ppf "<"
+  | Pintcomp Cle -> fprintf ppf "<="
+  | Pintcomp Cgt -> fprintf ppf ">"
+  | Pintcomp Cge -> fprintf ppf ">="
+  | Pintorder -> fprintf ppf "compare"
+  | Pintmin -> fprintf ppf "min"
+  | Pintmax -> fprintf ppf "max"
+  | Poffsetint n -> fprintf ppf "%i+" n
+  | Poffsetref n -> fprintf ppf "+:=%i" n
+  | Pintoffloat -> fprintf ppf "int_of_float"
+  | Pfloatofint -> fprintf ppf "float_of_int"
+  | Pnegfloat -> fprintf ppf "~-."
+  | Pabsfloat -> fprintf ppf "abs."
+  | Paddfloat -> fprintf ppf "+."
+  | Psubfloat -> fprintf ppf "-."
+  | Pmulfloat -> fprintf ppf "*."
+  | Pdivfloat -> fprintf ppf "/."
+  | Pmodfloat -> fprintf ppf "mod"
+  | Ppowfloat -> fprintf ppf "**"
+  | Pfloatcomp Ceq -> fprintf ppf "==."
+  | Pfloatcomp Cneq -> fprintf ppf "!=."
+  | Pfloatcomp Clt -> fprintf ppf "<."
+  | Pfloatcomp Cle -> fprintf ppf "<=."
+  | Pfloatcomp Cgt -> fprintf ppf ">."
+  | Pfloatcomp Cge -> fprintf ppf ">=."
+  | Pfloatorder -> fprintf ppf "compare"
+  | Pfloatmin -> fprintf ppf "min"
+  | Pfloatmax -> fprintf ppf "max"
+  | Pnegbigint -> fprintf ppf "~-"
+  | Paddbigint -> fprintf ppf "+"
+  | Psubbigint -> fprintf ppf "-"
+  | Pmulbigint -> fprintf ppf "*"
+  | Ppowbigint -> fprintf ppf "**"
+  | Pandbigint -> fprintf ppf "and"
+  | Porbigint -> fprintf ppf "or"
+  | Pxorbigint -> fprintf ppf "xor"
+  | Pnotbigint -> fprintf ppf "~~"
+  | Plslbigint -> fprintf ppf "lsl"
+  | Pasrbigint -> fprintf ppf "asr"
+  | Pdivbigint -> fprintf ppf "/"
+  | Pmodbigint -> fprintf ppf "mod"
+  | Pbigintcomp Ceq -> fprintf ppf "==,"
+  | Pbigintcomp Cneq -> fprintf ppf "!=,"
+  | Pbigintcomp Clt -> fprintf ppf "<,"
+  | Pbigintcomp Cle -> fprintf ppf "<=,"
+  | Pbigintcomp Cgt -> fprintf ppf ">,"
+  | Pbigintcomp Cge -> fprintf ppf ">=,"
+  | Pbigintorder -> fprintf ppf "compare"
+  | Pbigintmin -> fprintf ppf "min"
+  | Pbigintmax -> fprintf ppf "max"
+  | Pstringlength -> fprintf ppf "string.length"
+  | Pstringrefu -> fprintf ppf "string.unsafe_get"
+  | Pstringrefs -> fprintf ppf "string.get"
+  | Pstringcomp Ceq -> fprintf ppf "=="
+  | Pstringcomp Cneq -> fprintf ppf "!="
+  | Pstringcomp Clt -> fprintf ppf "<"
+  | Pstringcomp Cle -> fprintf ppf "<="
+  | Pstringcomp Cgt -> fprintf ppf ">"
+  | Pstringcomp Cge -> fprintf ppf ">="
+  | Pstringorder -> fprintf ppf "compare"
+  | Pstringmin -> fprintf ppf "min"
+  | Pstringmax -> fprintf ppf "max"
+  | Pstringadd -> fprintf ppf "string.concat"
+  | Parraylength -> fprintf ppf "array.length"
+  | Pmakearray Mutable -> fprintf ppf "makearray"
+  | Pmakearray Immutable -> fprintf ppf "makearray_imm"
+  | Parrayrefu -> fprintf ppf "array.unsafe_get"
+  | Parraysetu -> fprintf ppf "array.unsafe_set"
+  | Parrayrefs -> fprintf ppf "array.get"
+  | Parraysets -> fprintf ppf "array.set"
+  | Pmakelist Mutable -> fprintf ppf "makelist"
+  | Pmakelist Immutable -> fprintf ppf "makelist_imm"
+  | Pmakedict -> fprintf ppf "makedict"
+  | Pdict_has -> fprintf ppf "dict.has"
+  | Pisint -> fprintf ppf "isint"
+  | Pisout -> fprintf ppf "isout"
+  | Pisnullable -> fprintf ppf "isnullable"
+  | Pcreate_extension s -> fprintf ppf "extension[%s]" s
+  | Pextension_slot_eq -> fprintf ppf "#extension_slot_eq"
+  | Pwrap_exn -> fprintf ppf "wrap_exn"
+  | Pawait -> fprintf ppf "await"
+  | Pimport -> fprintf ppf "import"
+  | Pinit_mod -> fprintf ppf "#init_mod"
+  | Pupdate_mod -> fprintf ppf "#update_mod"
+  | Phash -> fprintf ppf "hash"
+  | Phash_mixint -> fprintf ppf "hash_mix_int"
+  | Phash_mixstring -> fprintf ppf "hash_mix_string"
+  | Phash_finalmix -> fprintf ppf "hash_final_mix"
+  | Pcurry_apply i -> fprintf ppf "apply[%d]" i
+  | Pjscomp Ceq -> fprintf ppf "=="
+  | Pjscomp Cneq -> fprintf ppf "!="
+  | Pjscomp Clt -> fprintf ppf "<"
+  | Pjscomp Cle -> fprintf ppf "<="
+  | Pjscomp Cgt -> fprintf ppf ">"
+  | Pjscomp Cge -> fprintf ppf ">="
+  | Pnull_to_opt -> fprintf ppf "null_to_opt"
+  | Pnullable_to_opt -> fprintf ppf "nullable_to_opt"
+  | Pis_not_none -> fprintf ppf "#is_not_none"
+  | Pval_from_option -> fprintf ppf "#val_from_option"
+  | Pval_from_option_not_nest -> fprintf ppf "#val_from_option_not_nest"
+  | Pis_poly_var_block -> fprintf ppf "#is_poly_var_block"
+  | Pjs_raw_expr -> fprintf ppf "#raw_expr"
+  | Pjs_raw_stmt -> fprintf ppf "#raw_stmt"
+  | Pjs_fn_make arity -> fprintf ppf "#fn_mk(%d)" arity
+  | Pjs_fn_make_unit -> fprintf ppf "#fn_mk_unit"
+  | Pjs_fn_method -> fprintf ppf "#fn_method"
+
+let function_attribute ppf {inline; is_a_functor; return_unit} =
+  if is_a_functor then fprintf ppf "is_a_functor@ ";
+  if return_unit then fprintf ppf "void@ ";
+  match inline with
+  | Default_inline -> ()
+  | Always_inline -> fprintf ppf "always_inline@ "
+  | Never_inline -> fprintf ppf "never_inline@ "
+
+let apply_inlined_attribute ppf = function
+  | Default_inline -> ()
+  | Always_inline -> fprintf ppf " always_inline"
+  | Never_inline -> fprintf ppf " never_inline"
+
+let rec lam ppf = function
+  | Lvar id -> Ident.print ppf id
+  | Lconst cst -> struct_const ppf cst
+  | Lapply ap ->
+    let lams ppf largs = List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
+    fprintf ppf "@[<2>(apply@ %a%a%a)@]" lam ap.ap_func lams ap.ap_args
+      apply_inlined_attribute ap.ap_inlined
+  | Lfunction {params; body; attr} ->
+    let pr_params ppf params =
+      List.iter (fun param -> fprintf ppf "@ %a" Ident.print param) params
+    in
+    fprintf ppf "@[<2>(function%a@ %a%a)@]" pr_params params function_attribute
+      attr lam body
+  | Llet (str, k, id, arg, body) ->
+    let kind = function
+      | Alias -> "a"
+      | Strict -> ""
+      | StrictOpt -> "o"
+      | Variable -> "v"
+    in
+    let rec letbody = function
+      | Llet (str, k, id, arg, body) ->
+        fprintf ppf "@ @[<2>%a =%s%s@ %a@]" Ident.print id (kind str)
+          (value_kind k) lam arg;
+        letbody body
+      | expr -> expr
+    in
+    fprintf ppf "@[<2>(let@ @[<hv 1>(@[<2>%a =%s%s@ %a@]" Ident.print id
+      (kind str) (value_kind k) lam arg;
+    let expr = letbody body in
+    fprintf ppf ")@]@ %a)@]" lam expr
+  | Lletrec (id_arg_list, body) ->
+    let bindings ppf id_arg_list =
+      let spc = ref false in
+      List.iter
+        (fun (id, l) ->
+          if !spc then fprintf ppf "@ " else spc := true;
+          fprintf ppf "@[<2>%a@ %a@]" Ident.print id lam l)
+        id_arg_list
+    in
+    fprintf ppf "@[<2>(letrec@ (@[<hv 1>%a@])@ %a)@]" bindings id_arg_list lam
+      body
+  | Lprim (prim, largs, _) ->
+    let lams ppf largs = List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
+    fprintf ppf "@[<2>(%a%a)@]" primitive prim lams largs
+  | Lswitch (larg, sw, _loc) ->
+    let switch ppf sw =
+      let spc = ref false in
+      List.iter
+        (fun (n, l) ->
+          if !spc then fprintf ppf "@ " else spc := true;
+          fprintf ppf "@[<hv 1>case int %i:@ %a@]" n lam l)
+        sw.sw_consts;
+      List.iter
+        (fun (n, l) ->
+          if !spc then fprintf ppf "@ " else spc := true;
+          fprintf ppf "@[<hv 1>case tag %i:@ %a@]" n lam l)
+        sw.sw_blocks;
+      match sw.sw_failaction with
+      | None -> ()
+      | Some l ->
+        if !spc then fprintf ppf "@ " else spc := true;
+        fprintf ppf "@[<hv 1>default:@ %a@]" lam l
+    in
+    fprintf ppf "@[<1>(%s %a@ @[<v 0>%a@])@]"
+      (match sw.sw_failaction with
+      | None -> "switch*"
+      | _ -> "switch")
+      lam larg switch sw
+  | Lstringswitch (arg, cases, default, _) ->
+    let switch ppf cases =
+      let spc = ref false in
+      List.iter
+        (fun (s, l) ->
+          if !spc then fprintf ppf "@ " else spc := true;
+          fprintf ppf "@[<hv 1>case \"%s\":@ %a@]" (String.escaped s) lam l)
+        cases;
+      match default with
+      | Some default ->
+        if !spc then fprintf ppf "@ " else spc := true;
+        fprintf ppf "@[<hv 1>default:@ %a@]" lam default
+      | None -> ()
+    in
+    fprintf ppf "@[<1>(stringswitch %a@ @[<v 0>%a@])@]" lam arg switch cases
+  | Lstaticraise (i, ls) ->
+    let lams ppf largs = List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
+    fprintf ppf "@[<2>(exit@ %d%a)@]" i lams ls
+  | Lstaticcatch (lbody, (i, vars), lhandler) ->
+    fprintf ppf "@[<2>(catch@ %a@;<1 -1>with (%d%a)@ %a)@]" lam lbody i
+      (fun ppf vars ->
+        match vars with
+        | [] -> ()
+        | _ -> List.iter (fun x -> fprintf ppf " %a" Ident.print x) vars)
+      vars lam lhandler
+  | Ltrywith (lbody, param, lhandler) ->
+    fprintf ppf "@[<2>(try@ %a@;<1 -1>with %a@ %a)@]" lam lbody Ident.print
+      param lam lhandler
+  | Lifthenelse (lcond, lif, lelse) ->
+    fprintf ppf "@[<2>(if@ %a@ %a@ %a)@]" lam lcond lam lif lam lelse
+  | Lsequence (l1, l2) -> fprintf ppf "@[<2>(seq@ %a@ %a)@]" lam l1 sequence l2
+  | Lwhile (lcond, lbody) ->
+    fprintf ppf "@[<2>(while@ %a@ %a)@]" lam lcond lam lbody
+  | Lfor (param, lo, hi, dir, body) ->
+    fprintf ppf "@[<2>(for %a@ %a@ %s@ %a@ %a)@]" Ident.print param lam lo
+      (match dir with
+      | Upto -> "to"
+      | Downto -> "downto")
+      lam hi lam body
+  | Lassign (id, expr) ->
+    fprintf ppf "@[<2>(assign@ %a@ %a)@]" Ident.print id lam expr
+  | Lsend (name, obj, _) -> fprintf ppf "@[<2>(send%s@ %a@ )@]" name lam obj
+
+and sequence ppf = function
+  | Lsequence (l1, l2) -> fprintf ppf "%a@ %a" sequence l1 sequence l2
+  | l -> lam ppf l
+
+let structured_constant = struct_const
+
+let lambda = lam
diff --git a/jscomp/ml/printlambda.mli b/compiler/ml/printlambda.mli
similarity index 82%
rename from jscomp/ml/printlambda.mli
rename to compiler/ml/printlambda.mli
index d9d2420..d20fa3e 100644
--- a/jscomp/ml/printlambda.mli
+++ b/compiler/ml/printlambda.mli
@@ -17,9 +17,5 @@ open Lambda
 
 open Format
 
-val structured_constant: formatter -> structured_constant -> unit
-val lambda: formatter -> lambda -> unit
-
-val primitive: formatter -> primitive -> unit
-val name_of_primitive : primitive -> string
-val value_kind : value_kind -> string
+val structured_constant : formatter -> structured_constant -> unit
+val lambda : formatter -> lambda -> unit
diff --git a/compiler/ml/printtyp.ml b/compiler/ml/printtyp.ml
new file mode 100644
index 0000000..9cf370d
--- /dev/null
+++ b/compiler/ml/printtyp.ml
@@ -0,0 +1,1829 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*  Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt  *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Printing functions *)
+
+open Misc
+open Ctype
+open Format
+open Longident
+open Path
+open Asttypes
+open Types
+open Btype
+open Outcometree
+
+type printing_context = {inlined_types: type_inlined_type list}
+
+let print_res_poly_identifier : (string -> string) ref =
+  ref (fun _ -> assert false)
+
+(* Print a long identifier *)
+
+let rec longident ppf = function
+  | Lident s -> pp_print_string ppf s
+  | Ldot (p, s) -> fprintf ppf "%a.%s" longident p s
+  | Lapply (p1, p2) -> fprintf ppf "%a(%a)" longident p1 longident p2
+
+(* Print an identifier *)
+
+let unique_names = ref Ident.empty
+
+let ident_name id =
+  try Ident.find_same id !unique_names with Not_found -> Ident.name id
+
+let add_unique id =
+  try ignore (Ident.find_same id !unique_names)
+  with Not_found ->
+    unique_names := Ident.add id (Ident.unique_toplevel_name id) !unique_names
+
+let ident ppf id = pp_print_string ppf (ident_name id)
+
+(* Print a path *)
+
+let ident_pervasives = Ident.create_persistent "Pervasives"
+let ident_stdlib = Ident.create_persistent "Stdlib"
+let printing_env = ref Env.empty
+let non_shadowed_pervasive_or_stdlib = function
+  | Pdot (Pident id, s, _pos) as path -> (
+    (Ident.same id ident_pervasives || Ident.same id ident_stdlib)
+    &&
+    try Path.same path (Env.lookup_type (Lident s) !printing_env)
+    with Not_found -> true)
+  | _ -> false
+
+let rec tree_of_path = function
+  | Pident id -> Oide_ident (ident_name id)
+  | Pdot (_, s, _pos) as path when non_shadowed_pervasive_or_stdlib path ->
+    Oide_ident s
+  | Pdot (p, s, _pos) when String.starts_with (Path.name p) ~prefix:"Stdlib_" ->
+    let path_name = Path.name p in
+    let ident_without_stdlib_prefix =
+      String.sub path_name 7 (String.length path_name - 7)
+    in
+    Oide_dot (Oide_ident ident_without_stdlib_prefix, s)
+  | Pdot (p, s, _pos) -> Oide_dot (tree_of_path p, s)
+  | Papply (p1, p2) -> Oide_apply (tree_of_path p1, tree_of_path p2)
+
+let rec path ppf = function
+  | Pident id -> ident ppf id
+  | Pdot (_, s, _pos) as path when non_shadowed_pervasive_or_stdlib path ->
+    pp_print_string ppf s
+  | Pdot (p, s, _pos) ->
+    path ppf p;
+    pp_print_char ppf '.';
+    pp_print_string ppf s
+  | Papply (p1, p2) -> fprintf ppf "%a(%a)" path p1 path p2
+
+let rec string_of_out_ident = function
+  | Oide_ident s -> s
+  | Oide_dot (id, s) -> String.concat "." [string_of_out_ident id; s]
+  | Oide_apply (id1, id2) ->
+    String.concat ""
+      [string_of_out_ident id1; "("; string_of_out_ident id2; ")"]
+
+let string_of_path p = string_of_out_ident (tree_of_path p)
+
+(* Print a recursive annotation *)
+
+let tree_of_rec = function
+  | Trec_not -> Orec_not
+  | Trec_first -> Orec_first
+  | Trec_next -> Orec_next
+
+(* Print a raw type expression, with sharing *)
+
+let raw_list pr ppf = function
+  | [] -> fprintf ppf "[]"
+  | a :: l ->
+    fprintf ppf "@[<1>[%a%t]@]" pr a (fun ppf ->
+        List.iter (fun x -> fprintf ppf ";@,%a" pr x) l)
+
+let kind_vars = ref []
+let kind_count = ref 0
+
+let rec safe_kind_repr v = function
+  | Fvar {contents = Some k} ->
+    if List.memq k v then "Fvar loop" else safe_kind_repr (k :: v) k
+  | Fvar r ->
+    let vid =
+      try List.assq r !kind_vars
+      with Not_found ->
+        let c =
+          incr kind_count;
+          !kind_count
+        in
+        kind_vars := (r, c) :: !kind_vars;
+        c
+    in
+    Printf.sprintf "Fvar {None}@%d" vid
+  | Fpresent -> "Fpresent"
+  | Fabsent -> "Fabsent"
+
+let rec safe_commu_repr v = function
+  | Cok -> "Cok"
+  | Cunknown -> "Cunknown"
+  | Clink r ->
+    if List.memq r v then "Clink loop" else safe_commu_repr (r :: v) !r
+
+let rec safe_repr v = function
+  | {desc = Tlink t} when not (List.memq t v) -> safe_repr (t :: v) t
+  | t -> t
+
+let rec list_of_memo = function
+  | Mnil -> []
+  | Mcons (_priv, p, _t1, _t2, rem) -> p :: list_of_memo rem
+  | Mlink rem -> list_of_memo !rem
+
+let print_name ppf = function
+  | None -> fprintf ppf "None"
+  | Some name -> fprintf ppf "\"%s\"" name
+
+let string_of_label = function
+  | Nolabel -> ""
+  | Labelled {txt} -> txt
+  | Optional {txt} -> "?" ^ txt
+
+let string_of_arity = function
+  | None -> ""
+  | Some arity -> string_of_int arity
+
+let visited = ref []
+let rec raw_type ppf ty =
+  let ty = safe_repr [] ty in
+  if List.memq ty !visited then fprintf ppf "{id=%d}" ty.id
+  else (
+    visited := ty :: !visited;
+    fprintf ppf "@[<1>{id=%d;level=%d;desc=@,%a}@]" ty.id ty.level raw_type_desc
+      ty.desc)
+
+and raw_type_list tl = raw_list raw_type tl
+
+and raw_type_desc ppf = function
+  | Tvar name -> fprintf ppf "Tvar %a" print_name name
+  | Tarrow (arg, ret, c, a) ->
+    fprintf ppf "@[<hov1>Tarrow(\"%s\",@,%a,@,%a,@,%s,@,%s)@]"
+      (string_of_label arg.lbl) raw_type arg.typ raw_type ret
+      (safe_commu_repr [] c) (string_of_arity a)
+  | Ttuple tl -> fprintf ppf "@[<1>Ttuple@,%a@]" raw_type_list tl
+  | Tconstr (p, tl, abbrev) ->
+    fprintf ppf "@[<hov1>Tconstr(@,%a,@,%a,@,%a)@]" path p raw_type_list tl
+      (raw_list path) (list_of_memo !abbrev)
+  | Tobject (t, nm) ->
+    fprintf ppf "@[<hov1>Tobject(@,%a,@,@[<1>ref%t@])@]" raw_type t (fun ppf ->
+        match !nm with
+        | None -> fprintf ppf " None"
+        | Some (p, tl) ->
+          fprintf ppf "(Some(@,%a,@,%a))" path p raw_type_list tl)
+  | Tfield (f, k, t1, t2) ->
+    fprintf ppf "@[<hov1>Tfield(@,%s,@,%s,@,%a,@;<0 -1>%a)@]" f
+      (safe_kind_repr [] k) raw_type t1 raw_type t2
+  | Tnil -> fprintf ppf "Tnil"
+  | Tlink t -> fprintf ppf "@[<1>Tlink@,%a@]" raw_type t
+  | Tsubst t -> fprintf ppf "@[<1>Tsubst@,%a@]" raw_type t
+  | Tunivar name -> fprintf ppf "Tunivar %a" print_name name
+  | Tpoly (t, tl) ->
+    fprintf ppf "@[<hov1>Tpoly(@,%a,@,%a)@]" raw_type t raw_type_list tl
+  | Tvariant row ->
+    fprintf ppf
+      "@[<hov1>{@[%s@,%a;@]@ @[%s@,%a;@]@ %s%B;@ %s%B;@ @[<1>%s%t@]}@]"
+      "row_fields="
+      (raw_list (fun ppf (l, f) -> fprintf ppf "@[%s,@ %a@]" l raw_field f))
+      row.row_fields "row_more=" raw_type row.row_more "row_closed="
+      row.row_closed "row_fixed=" row.row_fixed "row_name="
+      (fun ppf ->
+        match row.row_name with
+        | None -> fprintf ppf "None"
+        | Some (p, tl) -> fprintf ppf "Some(@,%a,@,%a)" path p raw_type_list tl)
+  | Tpackage (p, _, tl) ->
+    fprintf ppf "@[<hov1>Tpackage(@,%a@,%a)@]" path p raw_type_list tl
+
+and raw_field ppf = function
+  | Rpresent None -> fprintf ppf "Rpresent None"
+  | Rpresent (Some t) -> fprintf ppf "@[<1>Rpresent(Some@,%a)@]" raw_type t
+  | Reither (c, tl, m, e) ->
+    fprintf ppf "@[<hov1>Reither(%B,@,%a,@,%B,@,@[<1>ref%t@])@]" c raw_type_list
+      tl m (fun ppf ->
+        match !e with
+        | None -> fprintf ppf " None"
+        | Some f -> fprintf ppf "@,@[<1>(%a)@]" raw_field f)
+  | Rabsent -> fprintf ppf "Rabsent"
+
+let raw_type_expr ppf t =
+  visited := [];
+  kind_vars := [];
+  kind_count := 0;
+  raw_type ppf t;
+  visited := [];
+  kind_vars := []
+
+let () = Btype.print_raw := raw_type_expr
+
+(* Normalize paths *)
+
+type param_subst = Id | Nth of int | Map of int list
+
+let is_nth = function
+  | Nth _ -> true
+  | _ -> false
+
+let compose l1 = function
+  | Id -> Map l1
+  | Map l2 -> Map (List.map (List.nth l1) l2)
+  | Nth n -> Nth (List.nth l1 n)
+
+let apply_subst s1 tyl =
+  if tyl = [] then []
+    (* cf. PR#7543: Typemod.type_package doesn't respect type constructor arity *)
+  else
+    match s1 with
+    | Nth n1 -> [List.nth tyl n1]
+    | Map l1 -> List.map (List.nth tyl) l1
+    | Id -> tyl
+
+type best_path = Paths of Path.t list | Best of Path.t
+
+let printing_depth = ref 0
+let printing_cont = ref ([] : Env.iter_cont list)
+let printing_old = ref Env.empty
+let printing_pers = ref Concr.empty
+module PathMap = Map.Make (Path)
+let printing_map = ref PathMap.empty
+
+let same_type t t' = repr t == repr t'
+
+let rec index l x =
+  match l with
+  | [] -> raise Not_found
+  | a :: l -> if x == a then 0 else 1 + index l x
+
+let rec uniq = function
+  | [] -> true
+  | a :: l -> (not (List.memq a l)) && uniq l
+
+let rec normalize_type_path ?(cache = false) env p =
+  try
+    let params, ty, _ = Env.find_type_expansion p env in
+    let params = List.map repr params in
+    match repr ty with
+    | {desc = Tconstr (p1, tyl, _)} ->
+      let tyl = List.map repr tyl in
+      if List.length params = List.length tyl && List.for_all2 ( == ) params tyl
+      then normalize_type_path ~cache env p1
+      else if cache || List.length params <= List.length tyl || not (uniq tyl)
+      then (p, Id)
+      else
+        let l1 = List.map (index params) tyl in
+        let p2, s2 = normalize_type_path ~cache env p1 in
+        (p2, compose l1 s2)
+    | ty -> (p, Nth (index params ty))
+  with Not_found -> (Env.normalize_path None env p, Id)
+
+let penalty s =
+  if s <> "" && s.[0] = '_' then 10
+  else
+    try
+      for i = 0 to String.length s - 2 do
+        if s.[i] = '_' && s.[i + 1] = '_' then raise Exit
+      done;
+      1
+    with Exit -> 10
+
+let rec path_size = function
+  | Pident id -> (penalty (Ident.name id), -Ident.binding_time id)
+  | Pdot (p, _, _) ->
+    let l, b = path_size p in
+    (1 + l, b)
+  | Papply (p1, p2) ->
+    let l, b = path_size p1 in
+    (l + fst (path_size p2), b)
+
+let same_printing_env env =
+  let used_pers = Env.used_persistent () in
+  Env.same_types !printing_old env && Concr.equal !printing_pers used_pers
+
+let set_printing_env env =
+  printing_env := env;
+  if !Clflags.real_paths || !printing_env == Env.empty || same_printing_env env
+  then ()
+  else (
+    (* printf "Reset printing_map@."; *)
+    printing_old := env;
+    printing_pers := Env.used_persistent ();
+    printing_map := PathMap.empty;
+    printing_depth := 0;
+    (* printf "Recompute printing_map.@."; *)
+    let cont =
+      Env.iter_types
+        (fun p (p', _decl) ->
+          let p1, s1 = normalize_type_path env p' ~cache:true in
+          (* Format.eprintf "%a -> %a = %a@." path p path p' path p1 *)
+          if s1 = Id then
+            try
+              let r = PathMap.find p1 !printing_map in
+              match !r with
+              | Paths l -> r := Paths (p :: l)
+              | Best p' -> r := Paths [p; p']
+              (* assert false *)
+            with Not_found ->
+              printing_map := PathMap.add p1 (ref (Paths [p])) !printing_map)
+        env
+    in
+    printing_cont := [cont])
+
+let wrap_printing_env env f =
+  set_printing_env env;
+  try_finally f (fun () -> set_printing_env Env.empty)
+
+let wrap_printing_env env f = Env.without_cmis (wrap_printing_env env) f
+
+let is_unambiguous path env =
+  let l = Env.find_shadowed_types path env in
+  List.exists (Path.same path) l
+  ||
+  (* concrete paths are ok *)
+  match l with
+  | [] -> true
+  | p :: rem ->
+    (* allow also coherent paths:  *)
+    let normalize p = fst (normalize_type_path ~cache:true env p) in
+    let p' = normalize p in
+    List.for_all (fun p -> Path.same (normalize p) p') rem
+    ||
+    (* also allow repeatedly defining and opening (for toplevel) *)
+    let id = lid_of_path p in
+    List.for_all (fun p -> lid_of_path p = id) rem
+    && Path.same p (Env.lookup_type id env)
+
+let rec get_best_path r =
+  match !r with
+  | Best p' -> p'
+  | Paths [] -> raise Not_found
+  | Paths l ->
+    r := Paths [];
+    List.iter
+      (fun p ->
+        (* Format.eprintf "evaluating %a@." path p; *)
+        match !r with
+        | Best p' when path_size p >= path_size p' -> ()
+        | _ -> if is_unambiguous p !printing_env then r := Best p)
+        (* else Format.eprintf "%a ignored as ambiguous@." path p *)
+      l;
+    get_best_path r
+
+let best_type_path p =
+  if !Clflags.real_paths || !printing_env == Env.empty then (p, Id)
+  else
+    let p', s = normalize_type_path !printing_env p in
+    let get_path () = get_best_path (PathMap.find p' !printing_map) in
+    while
+      !printing_cont <> []
+      &&
+      try fst (path_size (get_path ())) > !printing_depth
+      with Not_found -> true
+    do
+      printing_cont := List.map snd (Env.run_iter_cont !printing_cont);
+      incr printing_depth
+    done;
+    let p'' = try get_path () with Not_found -> p' in
+    (* Format.eprintf "%a = %a -> %a@." path p path p' path p''; *)
+    (p'', s)
+
+(* Print a type expression *)
+
+let names = ref ([] : (type_expr * string) list)
+let name_counter = ref 0
+let named_vars = ref ([] : string list)
+
+let weak_counter = ref 1
+let weak_var_map = ref TypeMap.empty
+let named_weak_vars = ref StringSet.empty
+
+let reset_names () =
+  names := [];
+  name_counter := 0;
+  named_vars := []
+let add_named_var ty =
+  match ty.desc with
+  | Tvar (Some name) | Tunivar (Some name) ->
+    if List.mem name !named_vars then () else named_vars := name :: !named_vars
+  | _ -> ()
+
+let name_is_already_used name =
+  List.mem name !named_vars
+  || List.exists (fun (_, name') -> name = name') !names
+  || StringSet.mem name !named_weak_vars
+
+let rec new_name () =
+  let name =
+    if !name_counter < 26 then String.make 1 (Char.chr (97 + !name_counter))
+    else
+      String.make 1 (Char.chr (97 + (!name_counter mod 26)))
+      ^ string_of_int (!name_counter / 26)
+  in
+  incr name_counter;
+  if name_is_already_used name then new_name () else name
+
+let rec new_weak_name ty () =
+  let name = "weak" ^ string_of_int !weak_counter in
+  incr weak_counter;
+  if name_is_already_used name then new_weak_name ty ()
+  else (
+    named_weak_vars := StringSet.add name !named_weak_vars;
+    weak_var_map := TypeMap.add ty name !weak_var_map;
+    name)
+
+let name_of_type name_generator t =
+  (* We've already been through repr at this stage, so t is our representative
+     of the union-find class. *)
+  try List.assq t !names
+  with Not_found -> (
+    try TypeMap.find t !weak_var_map
+    with Not_found ->
+      let name =
+        match t.desc with
+        | Tvar (Some name) | Tunivar (Some name) ->
+          (* Some part of the type we've already printed has assigned another
+           * unification variable to that name. We want to keep the name, so try
+           * adding a number until we find a name that's not taken. *)
+          let current_name = ref name in
+          let i = ref 0 in
+          while List.exists (fun (_, name') -> !current_name = name') !names do
+            current_name := name ^ string_of_int !i;
+            i := !i + 1
+          done;
+          !current_name
+        | _ ->
+          (* No name available, create a new one *)
+          name_generator ()
+      in
+      (* Exception for type declarations *)
+      if name <> "_" then names := (t, name) :: !names;
+      name)
+
+let check_name_of_type t = ignore (name_of_type new_name t)
+
+let remove_names tyl =
+  let tyl = List.map repr tyl in
+  names := Ext_list.filter !names (fun (ty, _) -> not (List.memq ty tyl))
+
+let visited_objects = ref ([] : type_expr list)
+let aliased = ref ([] : type_expr list)
+let delayed = ref ([] : type_expr list)
+
+let add_delayed t = if not (List.memq t !delayed) then delayed := t :: !delayed
+
+let is_aliased ty = List.memq (proxy ty) !aliased
+let add_alias ty =
+  let px = proxy ty in
+  if not (is_aliased px) then (
+    aliased := px :: !aliased;
+    add_named_var px)
+
+let aliasable ty =
+  match ty.desc with
+  | Tvar _ | Tunivar _ | Tpoly _ -> false
+  | Tconstr (p, _, _) -> not (is_nth (snd (best_type_path p)))
+  | _ -> true
+
+let namable_row row =
+  row.row_name <> None
+  && List.for_all
+       (fun (_, f) ->
+         match row_field_repr f with
+         | Reither (c, l, _, _) ->
+           row.row_closed && if c then l = [] else List.length l = 1
+         | _ -> true)
+       row.row_fields
+
+let rec mark_loops_rec visited ty =
+  let ty = repr ty in
+  let px = proxy ty in
+  if List.memq px visited && aliasable ty then add_alias px
+  else
+    let visited = px :: visited in
+    match ty.desc with
+    | Tvar _ -> add_named_var ty
+    | Tarrow (arg, ret, _, _) ->
+      mark_loops_rec visited arg.typ;
+      mark_loops_rec visited ret
+    | Ttuple tyl -> List.iter (mark_loops_rec visited) tyl
+    | Tconstr (p, tyl, _) ->
+      let _p', s = best_type_path p in
+      List.iter (mark_loops_rec visited) (apply_subst s tyl)
+    | Tpackage (_, _, tyl) -> List.iter (mark_loops_rec visited) tyl
+    | Tvariant row -> (
+      if List.memq px !visited_objects then add_alias px
+      else
+        let row = row_repr row in
+        if not (static_row row) then visited_objects := px :: !visited_objects;
+        match row.row_name with
+        | Some (_p, tyl) when namable_row row ->
+          List.iter (mark_loops_rec visited) tyl
+        | _ -> iter_row (mark_loops_rec visited) row)
+    | Tobject (fi, nm) ->
+      if List.memq px !visited_objects then add_alias px
+      else (
+        if opened_object ty then visited_objects := px :: !visited_objects;
+        match !nm with
+        | None ->
+          let fields, _ = flatten_fields fi in
+          List.iter
+            (fun (_, kind, ty) ->
+              if field_kind_repr kind = Fpresent then mark_loops_rec visited ty)
+            fields
+        | Some (_, l) -> List.iter (mark_loops_rec visited) (List.tl l))
+    | Tfield (_, kind, ty1, ty2) when field_kind_repr kind = Fpresent ->
+      mark_loops_rec visited ty1;
+      mark_loops_rec visited ty2
+    | Tfield (_, _, _, ty2) -> mark_loops_rec visited ty2
+    | Tnil -> ()
+    | Tsubst ty -> mark_loops_rec visited ty
+    | Tlink _ -> fatal_error "Printtyp.mark_loops_rec (2)"
+    | Tpoly (ty, tyl) ->
+      List.iter (fun t -> add_alias t) tyl;
+      mark_loops_rec visited ty
+    | Tunivar _ -> add_named_var ty
+
+let mark_loops ty =
+  normalize_type Env.empty ty;
+  mark_loops_rec [] ty
+
+let reset_loop_marks () =
+  visited_objects := [];
+  aliased := [];
+  delayed := []
+
+let reset () =
+  unique_names := Ident.empty;
+  reset_names ();
+  reset_loop_marks ()
+
+let reset_and_mark_loops ty =
+  reset ();
+  mark_loops ty
+
+let reset_and_mark_loops_list tyl =
+  reset ();
+  List.iter mark_loops tyl
+
+let filter_params tyl =
+  let params =
+    List.fold_left
+      (fun tyl ty ->
+        let ty = repr ty in
+        if List.memq ty tyl then Btype.newgenty (Tsubst ty) :: tyl
+        else ty :: tyl)
+      [] tyl
+  in
+  List.rev params
+
+let mark_loops_constructor_arguments = function
+  | Cstr_tuple l -> List.iter mark_loops l
+  | Cstr_record l -> List.iter (fun l -> mark_loops l.ld_type) l
+
+let find_inlined_type name (printing_context : printing_context option) =
+  match printing_context with
+  | None -> None
+  | Some {inlined_types} ->
+    inlined_types
+    |> List.find_opt (fun inlined_type ->
+           match inlined_type with
+           | Record {type_name} -> type_name = name)
+
+(* Disabled in classic mode when printing an unification error *)
+
+let rec tree_of_typexp ?(printing_context : printing_context option) sch ty =
+  let ty = repr ty in
+  let px = proxy ty in
+  if List.mem_assq px !names && not (List.memq px !delayed) then
+    let mark = is_non_gen sch ty in
+    let name = name_of_type (if mark then new_weak_name ty else new_name) px in
+    Otyp_var (mark, name)
+  else
+    let pr_typ () =
+      match ty.desc with
+      | Tvar _ ->
+        (*let lev =
+          if is_non_gen sch ty then "/" ^ string_of_int ty.level else "" in*)
+        let non_gen = is_non_gen sch ty in
+        let name_gen = if non_gen then new_weak_name ty else new_name in
+        Otyp_var (non_gen, name_of_type name_gen ty)
+      | Tarrow (arg, ret, _, arity) ->
+        let lab = string_of_label arg.lbl in
+        let t1 =
+          if is_optional arg.lbl then
+            match (repr arg.typ).desc with
+            | Tconstr (path, [ty], _) when Path.same path Predef.path_option ->
+              tree_of_typexp ?printing_context sch ty
+            | _ -> Otyp_stuff "<hidden>"
+          else tree_of_typexp ?printing_context sch arg.typ
+        in
+        (* should pass arity here? *)
+        Otyp_arrow (lab, t1, tree_of_typexp ?printing_context sch ret, arity)
+      | Ttuple tyl -> Otyp_tuple (tree_of_typlist ?printing_context sch tyl)
+      | Tconstr (p, _tyl, _abbrev)
+        when printing_context
+             |> find_inlined_type (Path.name p)
+             |> Option.is_some -> (
+        match
+          find_inlined_type (Path.name p) printing_context |> Option.get
+        with
+        | Record {labels} ->
+          (* Print inlined records as actual inlined record structures, not a reference to the inlined type only. *)
+          Otyp_record (List.map (tree_of_label ?printing_context) labels))
+      | Tconstr (p, tyl, _abbrev) ->
+        let p', s = best_type_path p in
+        let tyl' = apply_subst s tyl in
+        if is_nth s && not (tyl' = []) then
+          tree_of_typexp ?printing_context sch (List.hd tyl')
+        else
+          Otyp_constr
+            (tree_of_path p', tree_of_typlist ?printing_context sch tyl')
+      | Tvariant row -> (
+        let row = row_repr row in
+        let fields =
+          if row.row_closed then
+            Ext_list.filter row.row_fields (fun (_, f) ->
+                row_field_repr f <> Rabsent)
+          else row.row_fields
+        in
+        let present =
+          Ext_list.filter fields (fun (_, f) ->
+              match row_field_repr f with
+              | Rpresent _ -> true
+              | _ -> false)
+        in
+        let all_present = List.length present = List.length fields in
+        match row.row_name with
+        | Some (p, tyl) when namable_row row ->
+          let p', s = best_type_path p in
+          let id = tree_of_path p' in
+          let args =
+            tree_of_typlist ?printing_context sch (apply_subst s tyl)
+          in
+          let out_variant =
+            if is_nth s then List.hd args else Otyp_constr (id, args)
+          in
+          if row.row_closed && all_present then out_variant
+          else
+            let non_gen = is_non_gen sch px in
+            let tags =
+              if all_present then None else Some (List.map fst present)
+            in
+            Otyp_variant (non_gen, Ovar_typ out_variant, row.row_closed, tags)
+        | _ ->
+          let non_gen =
+            (not (row.row_closed && all_present)) && is_non_gen sch px
+          in
+          let fields =
+            List.map (tree_of_row_field ?printing_context sch) fields
+          in
+          let tags =
+            if all_present then None else Some (List.map fst present)
+          in
+          Otyp_variant (non_gen, Ovar_fields fields, row.row_closed, tags))
+      | Tobject (fi, nm) -> tree_of_typobject ?printing_context sch fi !nm
+      | Tnil | Tfield _ -> tree_of_typobject ?printing_context sch ty None
+      | Tsubst ty -> tree_of_typexp ?printing_context sch ty
+      | Tlink _ -> fatal_error "Printtyp.tree_of_typexp"
+      | Tpoly (ty, []) -> tree_of_typexp ?printing_context sch ty
+      | Tpoly (ty, tyl) ->
+        (*let print_names () =
+          List.iter (fun (_, name) -> prerr_string (name ^ " ")) !names;
+          prerr_string "; " in *)
+        let tyl = List.map repr tyl in
+        if tyl = [] then tree_of_typexp ?printing_context sch ty
+        else
+          let old_delayed = !delayed in
+          (* Make the names delayed, so that the real type is
+             printed once when used as proxy *)
+          List.iter add_delayed tyl;
+          let tl = List.map (name_of_type new_name) tyl in
+          let tr = Otyp_poly (tl, tree_of_typexp ?printing_context sch ty) in
+          (* Forget names when we leave scope *)
+          remove_names tyl;
+          delayed := old_delayed;
+          tr
+      | Tunivar _ -> Otyp_var (false, name_of_type new_name ty)
+      | Tpackage (p, n, tyl) ->
+        let n =
+          List.map (fun li -> String.concat "." (Longident.flatten li)) n
+        in
+        Otyp_module (Path.name p, n, tree_of_typlist ?printing_context sch tyl)
+    in
+    if List.memq px !delayed then
+      delayed := Ext_list.filter !delayed (( != ) px);
+    if is_aliased px && aliasable ty then (
+      check_name_of_type px;
+      Otyp_alias (pr_typ (), name_of_type new_name px))
+    else pr_typ ()
+
+and tree_of_row_field ?printing_context sch (l, f) =
+  match row_field_repr f with
+  | Rpresent None | Reither (true, [], _, _) -> (l, false, [])
+  | Rpresent (Some ty) -> (l, false, [tree_of_typexp ?printing_context sch ty])
+  | Reither (c, tyl, _, _) ->
+    if c (* contradiction: constant constructor with an argument *) then
+      (l, true, tree_of_typlist ?printing_context sch tyl)
+    else (l, false, tree_of_typlist ?printing_context sch tyl)
+  | Rabsent -> (l, false, [] (* actually, an error *))
+
+and tree_of_typlist ?printing_context sch tyl =
+  List.map ((tree_of_typexp ?printing_context) sch) tyl
+
+and tree_of_typobject ?printing_context sch fi nm =
+  match nm with
+  | None ->
+    let pr_fields fi =
+      let fields, rest = flatten_fields fi in
+      let present_fields =
+        List.fold_right
+          (fun (n, k, t) l ->
+            match field_kind_repr k with
+            | Fpresent -> (n, t) :: l
+            | _ -> l)
+          fields []
+      in
+      let sorted_fields =
+        List.sort (fun (n, _) (n', _) -> String.compare n n') present_fields
+      in
+      tree_of_typfields ?printing_context sch rest sorted_fields
+    in
+    let fields, rest = pr_fields fi in
+    Otyp_object (fields, rest)
+  | Some (p, ty :: tyl) ->
+    let non_gen = is_non_gen sch (repr ty) in
+    let args = tree_of_typlist ?printing_context sch tyl in
+    let p', s = best_type_path p in
+    assert (s = Id);
+    Otyp_class (non_gen, tree_of_path p', args)
+  | _ -> fatal_error "Printtyp.tree_of_typobject"
+
+and is_non_gen sch ty = sch && is_Tvar ty && ty.level <> generic_level
+
+and tree_of_typfields ?printing_context sch rest = function
+  | [] ->
+    let rest =
+      match rest.desc with
+      | Tvar _ | Tunivar _ -> Some (is_non_gen sch rest)
+      | Tconstr _ -> Some false
+      | Tnil -> None
+      | _ -> fatal_error "typfields (1)"
+    in
+    ([], rest)
+  | (s, t) :: l ->
+    let field = (s, tree_of_typexp ?printing_context sch t) in
+    let fields, rest = tree_of_typfields ?printing_context sch rest l in
+    (field :: fields, rest)
+
+and tree_of_type_decl id decl =
+  reset ();
+
+  let inlined_types = decl.type_inlined_types in
+  let printing_context = {inlined_types} in
+  let params = filter_params decl.type_params in
+
+  (match decl.type_manifest with
+  | Some ty ->
+    let vars = free_variables ty in
+    List.iter
+      (function
+        | {desc = Tvar (Some "_")} as ty ->
+          if List.memq ty vars then ty.desc <- Tvar None
+        | _ -> ())
+      params
+  | None -> ());
+
+  List.iter add_alias params;
+  List.iter mark_loops params;
+  List.iter check_name_of_type (List.map proxy params);
+  let ty_manifest =
+    match decl.type_manifest with
+    | None -> None
+    | Some ty ->
+      let ty =
+        (* Special hack to hide variant name *)
+        match repr ty with
+        | {desc = Tvariant row} -> (
+          let row = row_repr row in
+          match row.row_name with
+          | Some (Pident id', _) when Ident.same id id' ->
+            newgenty (Tvariant {row with row_name = None})
+          | _ -> ty)
+        | _ -> ty
+      in
+      mark_loops ty;
+      Some ty
+  in
+  (match decl.type_kind with
+  | Type_abstract -> ()
+  | Type_variant cstrs ->
+    List.iter
+      (fun c ->
+        mark_loops_constructor_arguments c.cd_args;
+        may mark_loops c.cd_res)
+      cstrs
+  | Type_record (l, _rep) -> List.iter (fun l -> mark_loops l.ld_type) l
+  | Type_open -> ());
+
+  let type_param = function
+    | Otyp_var (_, id) -> id
+    | _ -> "?"
+  in
+  let type_defined decl =
+    let abstr =
+      match decl.type_kind with
+      | Type_abstract ->
+        decl.type_manifest = None || decl.type_private = Private
+      | Type_record _ -> decl.type_private = Private
+      | Type_variant tll ->
+        decl.type_private = Private
+        || List.exists (fun cd -> cd.cd_res <> None) tll
+      | Type_open -> decl.type_manifest = None
+    in
+    let vari =
+      List.map2
+        (fun ty v ->
+          if abstr || not (is_Tvar (repr ty)) then Variance.get_upper v
+          else (true, true))
+        decl.type_params decl.type_variance
+    in
+    ( Ident.name id,
+      List.map2
+        (fun ty cocn ->
+          (type_param (tree_of_typexp ~printing_context false ty), cocn))
+        params vari )
+  in
+  let tree_of_manifest ty1 =
+    match ty_manifest with
+    | None -> ty1
+    | Some ty -> Otyp_manifest (tree_of_typexp ~printing_context false ty, ty1)
+  in
+  let name, args = type_defined decl in
+  let constraints = tree_of_constraints ~printing_context params in
+  let untagged = ref false in
+  let ty, priv =
+    match decl.type_kind with
+    | Type_abstract -> (
+      match ty_manifest with
+      | None -> (Otyp_abstract, Public)
+      | Some ty -> (tree_of_typexp ~printing_context false ty, decl.type_private)
+      )
+    | Type_variant cstrs ->
+      untagged := Ast_untagged_variants.process_untagged decl.type_attributes;
+      ( tree_of_manifest
+          (Otyp_sum (List.map (tree_of_constructor ~printing_context) cstrs)),
+        decl.type_private )
+    | Type_record (lbls, _rep) ->
+      ( tree_of_manifest
+          (Otyp_record (List.map (tree_of_label ~printing_context) lbls)),
+        decl.type_private )
+    | Type_open -> (tree_of_manifest Otyp_open, decl.type_private)
+  in
+  let immediate = Builtin_attributes.immediate decl.type_attributes in
+  {
+    otype_name = name;
+    otype_params = args;
+    otype_type = ty;
+    otype_private = priv;
+    otype_immediate = immediate;
+    otype_unboxed = decl.type_unboxed.unboxed || !untagged;
+    otype_cstrs = constraints;
+  }
+
+and tree_of_constructor_arguments ?printing_context = function
+  | Cstr_tuple l -> tree_of_typlist ?printing_context false l
+  | Cstr_record l -> [Otyp_record (List.map tree_of_label l)]
+
+and tree_of_constructor ?printing_context cd =
+  let name = Ident.name cd.cd_id in
+  let nullary = Ast_untagged_variants.is_nullary_variant cd.cd_args in
+  let repr =
+    if not nullary then None
+    else
+      match Ast_untagged_variants.process_tag_type cd.cd_attributes with
+      | Some Null -> Some "@as(null)"
+      | Some Undefined -> Some "@as(undefined)"
+      | Some (String s) -> Some (Printf.sprintf "@as(%S)" s)
+      | Some (Int i) -> Some (Printf.sprintf "@as(%d)" i)
+      | Some (Float f) -> Some (Printf.sprintf "@as(%s)" f)
+      | Some (Bool b) -> Some (Printf.sprintf "@as(%b)" b)
+      | Some (BigInt s) -> Some (Printf.sprintf "@as(%sn)" s)
+      | Some (Untagged _) (* should never happen *) | None -> None
+  in
+  let arg () = tree_of_constructor_arguments ?printing_context cd.cd_args in
+  match cd.cd_res with
+  | None -> (name, arg (), None, repr)
+  | Some res ->
+    let nm = !names in
+    names := [];
+    let ret = tree_of_typexp ?printing_context false res in
+    let args = arg () in
+    names := nm;
+    (name, args, Some ret, repr)
+
+and tree_of_label ?printing_context l =
+  let opt = l.ld_optional in
+  let typ =
+    match l.ld_type.desc with
+    | Tconstr (p, [t1], _) when opt && Path.same p Predef.path_option -> t1
+    | _ -> l.ld_type
+  in
+  ( Ident.name l.ld_id,
+    l.ld_mutable = Mutable,
+    opt,
+    tree_of_typexp ?printing_context false typ )
+
+and tree_of_constraints ?printing_context params =
+  List.fold_right
+    (fun ty list ->
+      let ty' = unalias ty in
+      if proxy ty != proxy ty' then
+        let tr = tree_of_typexp ?printing_context true ty in
+        (tr, tree_of_typexp ?printing_context true ty') :: list
+      else list)
+    params []
+
+let typexp ?printing_context sch ppf ty =
+  !Oprint.out_type ppf (tree_of_typexp ?printing_context sch ty)
+
+let type_expr ppf ty = typexp false ppf ty
+
+and type_sch ppf ty = typexp true ppf ty
+
+and type_scheme ppf ty =
+  reset_and_mark_loops ty;
+  typexp true ppf ty
+
+(* Maxence *)
+let type_scheme_max ?(b_reset_names = true) ppf ty =
+  if b_reset_names then reset_names ();
+  typexp true ppf ty
+(* End Maxence *)
+
+let tree_of_type_scheme ty =
+  reset_and_mark_loops ty;
+  tree_of_typexp true ty
+
+(* Print one type declaration *)
+
+let tree_of_type_declaration id decl rs =
+  Osig_type (tree_of_type_decl id decl, tree_of_rec rs)
+
+let type_declaration id ppf decl =
+  !Oprint.out_sig_item ppf (tree_of_type_declaration id decl Trec_not)
+
+let constructor_arguments ppf a =
+  let tys = tree_of_constructor_arguments a in
+  !Oprint.out_type ppf (Otyp_tuple tys)
+
+(* Print an extension declaration *)
+
+let tree_of_extension_constructor id ext es =
+  reset ();
+  let ty_name = Path.name ext.ext_type_path in
+  let ty_params = filter_params ext.ext_type_params in
+  List.iter add_alias ty_params;
+  List.iter mark_loops ty_params;
+  List.iter check_name_of_type (List.map proxy ty_params);
+  mark_loops_constructor_arguments ext.ext_args;
+  may mark_loops ext.ext_ret_type;
+  let type_param = function
+    | Otyp_var (_, id) -> id
+    | _ -> "?"
+  in
+  let ty_params =
+    List.map (fun ty -> type_param (tree_of_typexp false ty)) ty_params
+  in
+  let name = Ident.name id in
+  let args, ret =
+    match ext.ext_ret_type with
+    | None -> (tree_of_constructor_arguments ext.ext_args, None)
+    | Some res ->
+      let nm = !names in
+      names := [];
+      let ret = tree_of_typexp false res in
+      let args = tree_of_constructor_arguments ext.ext_args in
+      names := nm;
+      (args, Some ret)
+  in
+  let ext =
+    {
+      oext_name = name;
+      oext_type_name = ty_name;
+      oext_type_params = ty_params;
+      oext_args = args;
+      oext_ret_type = ret;
+      oext_repr = None;
+      oext_private = ext.ext_private;
+    }
+  in
+  let es =
+    match es with
+    | Text_first -> Oext_first
+    | Text_next -> Oext_next
+    | Text_exception -> Oext_exception
+  in
+  Osig_typext (ext, es)
+
+let extension_constructor id ppf ext =
+  !Oprint.out_sig_item ppf (tree_of_extension_constructor id ext Text_first)
+
+(* Print a value declaration *)
+
+let tree_of_value_description id decl =
+  (* Format.eprintf "@[%a@]@." raw_type_expr decl.val_type; *)
+  let id = Ident.name id in
+  let ty = tree_of_type_scheme decl.val_type in
+  let vd =
+    {oval_name = id; oval_type = ty; oval_prims = []; oval_attributes = []}
+  in
+  let vd =
+    match decl.val_kind with
+    | Val_prim p -> Primitive.print p vd
+    | _ -> vd
+  in
+  Osig_value vd
+
+let value_description id ppf decl =
+  !Oprint.out_sig_item ppf (tree_of_value_description id decl)
+
+(* Print a class type *)
+
+(* Print a module type *)
+
+let wrap_env fenv ftree arg =
+  let env = !printing_env in
+  set_printing_env (fenv env);
+  let tree = ftree arg in
+  set_printing_env env;
+  tree
+
+let filter_rem_sig item rem =
+  match (item, rem) with
+  | Sig_class_type _, tydecl1 :: tydecl2 :: rem -> ([tydecl1; tydecl2], rem)
+  | _ -> ([], rem)
+
+let dummy =
+  {
+    type_params = [];
+    type_arity = 0;
+    type_kind = Type_abstract;
+    type_private = Public;
+    type_manifest = None;
+    type_variance = [];
+    type_newtype_level = None;
+    type_loc = Location.none;
+    type_attributes = [];
+    type_immediate = false;
+    type_unboxed = unboxed_false_default_false;
+    type_inlined_types = [];
+  }
+
+let hide_rec_items = function
+  | Sig_type (id, _decl, rs) :: rem
+    when rs = Trec_first && not !Clflags.real_paths ->
+    let rec get_ids = function
+      | Sig_type (id, _, Trec_next) :: rem -> id :: get_ids rem
+      | _ -> []
+    in
+    let ids = id :: get_ids rem in
+    set_printing_env
+      (List.fold_right
+         (fun id -> Env.add_type ~check:false (Ident.rename id) dummy)
+         ids !printing_env)
+  | _ -> ()
+
+let rec tree_of_modtype ?(ellipsis = false) = function
+  | Mty_ident p -> Omty_ident (tree_of_path p)
+  | Mty_signature sg ->
+    Omty_signature (if ellipsis then [Osig_ellipsis] else tree_of_signature sg)
+  | Mty_functor (param, ty_arg, ty_res) ->
+    let res =
+      match ty_arg with
+      | None -> tree_of_modtype ~ellipsis ty_res
+      | Some mty ->
+        wrap_env
+          (Env.add_module ~arg:true param mty)
+          (tree_of_modtype ~ellipsis)
+          ty_res
+    in
+    Omty_functor
+      (Ident.name param, may_map (tree_of_modtype ~ellipsis:false) ty_arg, res)
+  | Mty_alias (_, p) -> Omty_alias (tree_of_path p)
+
+and tree_of_signature sg =
+  wrap_env (fun env -> env) (tree_of_signature_rec !printing_env false) sg
+
+and tree_of_signature_rec env' in_type_group = function
+  | [] -> []
+  | item :: rem as items ->
+    let in_type_group =
+      match (in_type_group, item) with
+      | true, Sig_type (_, _, Trec_next) -> true
+      | _, Sig_type (_, _, (Trec_not | Trec_first)) ->
+        set_printing_env env';
+        true
+      | _ ->
+        set_printing_env env';
+        false
+    in
+    let sg, rem = filter_rem_sig item rem in
+    hide_rec_items items;
+    let trees = trees_of_sigitem item in
+    let env' = Env.add_signature (item :: sg) env' in
+    trees @ tree_of_signature_rec env' in_type_group rem
+
+and trees_of_sigitem = function
+  | Sig_value (id, decl) -> [tree_of_value_description id decl]
+  | Sig_type (id, _, _) when is_row_name (Ident.name id) -> []
+  | Sig_type (id, decl, rs) -> [tree_of_type_declaration id decl rs]
+  | Sig_typext (id, ext, es) -> [tree_of_extension_constructor id ext es]
+  | Sig_module (id, md, rs) ->
+    let ellipsis =
+      List.exists
+        (function
+          | {txt = "..."}, Parsetree.PStr [] -> true
+          | _ -> false)
+        md.md_attributes
+    in
+    [tree_of_module id md.md_type rs ~ellipsis]
+  | Sig_modtype (id, decl) -> [tree_of_modtype_declaration id decl]
+  | Sig_class () -> []
+  | Sig_class_type () -> []
+
+and tree_of_modtype_declaration id decl =
+  let mty =
+    match decl.mtd_type with
+    | None -> Omty_abstract
+    | Some mty -> tree_of_modtype mty
+  in
+  Osig_modtype (Ident.name id, mty)
+
+and tree_of_module id ?ellipsis mty rs =
+  Osig_module (Ident.name id, tree_of_modtype ?ellipsis mty, tree_of_rec rs)
+
+let modtype ppf mty = !Oprint.out_module_type ppf (tree_of_modtype mty)
+let modtype_declaration id ppf decl =
+  !Oprint.out_sig_item ppf (tree_of_modtype_declaration id decl)
+
+(* For the toplevel: merge with tree_of_signature? *)
+
+(* Refresh weak variable map in the toplevel *)
+let refresh_weak () =
+  let refresh t name (m, s) =
+    if is_non_gen true (repr t) then (TypeMap.add t name m, StringSet.add name s)
+    else (m, s)
+  in
+  let m, s =
+    TypeMap.fold refresh !weak_var_map (TypeMap.empty, StringSet.empty)
+  in
+  named_weak_vars := s;
+  weak_var_map := m
+
+let print_items showval env x =
+  refresh_weak ();
+  let rec print showval env = function
+    | [] -> []
+    | item :: rem as items ->
+      let _sg, rem = filter_rem_sig item rem in
+      hide_rec_items items;
+      let trees = trees_of_sigitem item in
+      List.map (fun d -> (d, showval env item)) trees @ print showval env rem
+  in
+  print showval env x
+
+(* Print a signature body (used by -i when compiling a .ml) *)
+
+let print_signature ppf tree =
+  fprintf ppf "@[<v>%a@]" !Oprint.out_signature tree
+
+let signature ppf sg = fprintf ppf "%a" print_signature (tree_of_signature sg)
+
+(* Print an unification error *)
+
+let same_path t t' =
+  let t = repr t and t' = repr t' in
+  t == t'
+  ||
+  match (t.desc, t'.desc) with
+  | Tconstr (p, tl, _), Tconstr (p', tl', _) -> (
+    let p1, s1 = best_type_path p and p2, s2 = best_type_path p' in
+    match (s1, s2) with
+    | Nth n1, Nth n2 when n1 = n2 -> true
+    | (Id | Map _), (Id | Map _) when Path.same p1 p2 ->
+      let tl = apply_subst s1 tl and tl' = apply_subst s2 tl' in
+      List.length tl = List.length tl' && List.for_all2 same_type tl tl'
+    | _ -> false)
+  | _ -> false
+
+let type_expansion t ppf t' =
+  if same_path t t' then (
+    add_delayed (proxy t);
+    type_expr ppf t)
+  else
+    let t' = if proxy t == proxy t' then unalias t' else t' in
+    fprintf ppf "@[<2>%a@ =@ %a@]" type_expr t type_expr t'
+
+let type_path_expansion tp ppf tp' =
+  if Path.same tp tp' then path ppf tp
+  else fprintf ppf "@[<2>%a@ =@ %a@]" path tp path tp'
+
+let rec trace fst txt ppf = function
+  | (t1, t1') :: (t2, t2') :: rem ->
+    if not fst then fprintf ppf "@,";
+    fprintf ppf "@[Type@;<1 2>%a@ %s@;<1 2>%a@] %a" (type_expansion t1) t1' txt
+      (type_expansion t2) t2' (trace false txt) rem
+  | _ -> ()
+
+let rec filter_trace keep_last = function
+  | [(_, t1'); (_, t2')] when is_Tvar t1' || is_Tvar t2' -> []
+  | (t1, t1') :: (t2, t2') :: rem ->
+    let rem' = filter_trace keep_last rem in
+    if
+      is_constr_row ~allow_ident:true t1'
+      || is_constr_row ~allow_ident:true t2'
+      || (same_path t1 t1' && same_path t2 t2' && not (keep_last && rem' = []))
+    then rem'
+    else (t1, t1') :: (t2, t2') :: rem'
+  | _ -> []
+
+let rec type_path_list ppf = function
+  | [(tp, tp')] -> type_path_expansion tp ppf tp'
+  | (tp, tp') :: rem ->
+    fprintf ppf "%a@;<2 0>%a" (type_path_expansion tp) tp' type_path_list rem
+  | [] -> ()
+
+(* Hide variant name and var, to force printing the expanded type *)
+let hide_variant_name t =
+  match repr t with
+  | {desc = Tvariant row} as t when (row_repr row).row_name <> None ->
+    newty2 t.level
+      (Tvariant
+         {
+           (row_repr row) with
+           row_name = None;
+           row_more = newvar2 (row_more row).level;
+         })
+  | _ -> t
+
+let prepare_expansion (t, t') =
+  let t' = hide_variant_name t' in
+  mark_loops t;
+  if not (same_path t t') then mark_loops t';
+  (t, t')
+
+let may_prepare_expansion compact (t, t') =
+  match (repr t').desc with
+  | (Tvariant _ | Tobject _) when compact ->
+    mark_loops t;
+    (t, t)
+  | _ -> prepare_expansion (t, t')
+
+let print_tags ppf fields =
+  match fields with
+  | [] -> ()
+  | (t, _) :: fields ->
+    fprintf ppf "%s" (!print_res_poly_identifier t);
+    List.iter
+      (fun (t, _) -> fprintf ppf ",@ %s" (!print_res_poly_identifier t))
+      fields
+
+let has_explanation t3 t4 =
+  match (t3.desc, t4.desc) with
+  | Tfield _, (Tnil | Tconstr _)
+  | (Tnil | Tconstr _), Tfield _
+  | Tnil, Tconstr _
+  | Tconstr _, Tnil
+  | _, Tvar _
+  | Tvar _, _
+  | Tvariant _, Tvariant _ ->
+    true
+  | Tfield (l, _, _, {desc = Tnil}), Tfield (l', _, _, {desc = Tnil}) -> l = l'
+  | _ -> false
+
+let rec mismatch = function
+  | (_, t) :: (_, t') :: rem -> (
+    match mismatch rem with
+    | Some _ as m -> m
+    | None -> if has_explanation t t' then Some (t, t') else None)
+  | [] -> None
+  | _ -> assert false
+
+let explanation unif t3 t4 ppf =
+  match (t3.desc, t4.desc) with
+  | Ttuple [], Tvar _ | Tvar _, Ttuple [] ->
+    fprintf ppf "@,Self type cannot escape its class"
+  | Tconstr (p, _, _), Tvar _ when unif && t4.level < Path.binding_time p ->
+    fprintf ppf "@,@[The type constructor@;<1 2>%a@ would escape its scope@]"
+      path p
+  | Tvar _, Tconstr (p, _, _) when unif && t3.level < Path.binding_time p ->
+    fprintf ppf "@,@[The type constructor@;<1 2>%a@ would escape its scope@]"
+      path p
+  | Tvar _, Tunivar _ | Tunivar _, Tvar _ ->
+    fprintf ppf "@,The universal variable %a would escape its scope" type_expr
+      (if is_Tunivar t3 then t3 else t4)
+  | Tvar _, _ | _, Tvar _ ->
+    let t, t' = if is_Tvar t3 then (t3, t4) else (t4, t3) in
+    if occur_in Env.empty t t' then
+      fprintf ppf "@,@[<hov>The type variable %a occurs inside@ %a@]" type_expr
+        t type_expr t'
+    else
+      fprintf ppf "@,@[<hov>This instance of %a is ambiguous:@ %s@]" type_expr
+        t' "it would escape the scope of its equation"
+  | Tfield (lab, _, _, _), _ when lab = dummy_method ->
+    fprintf ppf "@,Self type cannot be unified with a closed object type"
+  | _, Tfield (lab, _, _, _) when lab = dummy_method ->
+    fprintf ppf "@,Self type cannot be unified with a closed object type"
+  | Tfield (l, _, f1, {desc = Tnil}), Tfield (l', _, f2, {desc = Tnil})
+    when l = l' ->
+    fprintf ppf
+      "@,\
+       @,\
+       Types for field @{<info>\"%s\"@} are incompatible:@,\
+       Field @{<info>\"%s\"@} in the passed object has type @{<error>%a@}, but \
+       is expected to have type @{<info>%a@}."
+      l l type_expr f1 type_expr f2
+  | (Tnil | Tconstr _), Tfield (l, _, f1, _) ->
+    fprintf ppf
+      "@,\
+       @,\
+       @[The first object is expected to have a field @{<info>\"%s\"@} of type \
+       @{<info>%a@}, but it does not.@]"
+      l type_expr f1
+  | Tfield (l, _, f1, _), (Tnil | Tconstr _) ->
+    fprintf ppf
+      "@,\
+       @,\
+       @[The second object is expected to have a field @{<info>\"%s\"@} of \
+       type @{<info>%a@}, but it does not.@]"
+      l type_expr f1
+  | Tnil, Tconstr _ | Tconstr _, Tnil ->
+    fprintf ppf
+      "@,@[The %s object type has an abstract row, it cannot be closed@]"
+      (if t4.desc = Tnil then "first" else "second")
+  | Tvariant row1, Tvariant row2 -> (
+    let row1 = row_repr row1 and row2 = row_repr row2 in
+    match
+      (row1.row_fields, row1.row_closed, row2.row_fields, row2.row_closed)
+    with
+    | [], true, [], true ->
+      fprintf ppf
+        "@,\
+         @,\
+         These polymorphic variants are incompatible - they share no common \
+         constructors."
+    | [], true, (_ :: _ as fields), _ ->
+      (* TODO(ai) Future opportunity to provide a way for an LLM to lookup the 
+      full polyvariant type definitions if wanted.*)
+      let constructors_txt =
+        if List.length fields = 1 then "constructor" else "constructors"
+      in
+      fprintf ppf
+        "@,\
+         @,\
+         The first polymorphic variant is @{<info>closed@} and doesn't include \
+         the %s: @{<error>%a@}.@,\
+         @,\
+         Possible solutions:\n\
+        \  - Either make the first variant @{<info>open@} so it can accept \
+         additional constructors. To do this, make sure the type starts with \
+         @{<info>[>@} instead of @{<info>[@}\n\
+        \  - Or add the missing %s to it."
+        constructors_txt print_tags fields constructors_txt
+    | (_ :: _ as fields), _, [], true ->
+      let constructors_txt =
+        if List.length fields = 1 then "constructor" else "constructors"
+      in
+      fprintf ppf
+        "@,\
+         @,\
+         The second polymorphic variant is @{<info>closed@} and doesn't \
+         include the %s: @{<error>%a@}.@,\
+         @,\
+         Possible solutions:\n\
+        \  - Either make the second variant @{<info>open@} so it can accept \
+         additional constructors. To do this, make sure the type starts with \
+         @{<info>[>@} instead of @{<info>[@}\n\
+        \  - Or add the missing %s to it."
+        constructors_txt print_tags fields constructors_txt
+    | [(l1, _)], true, [(l2, _)], true when l1 = l2 ->
+      fprintf ppf
+        "@,\
+         @,\
+         Both polymorphic variants have the constructor @{<info>%s@}, but \
+         their payload types are incompatible.@,\
+         Make sure the payload types for @{<info>%s@} match exactly in both \
+         polymorphic variants."
+        (!print_res_poly_identifier l1)
+        (!print_res_poly_identifier l1)
+    | _ -> ())
+  | _ -> ()
+
+let warn_on_missing_def env ppf t =
+  match t.desc with
+  | Tconstr (p, _, _) -> (
+    try ignore (Env.find_type p env : Types.type_declaration)
+    with Not_found ->
+      fprintf ppf
+        "@,\
+         @[%a is abstract because no corresponding cmi file was found in \
+         path.@]"
+        path p)
+  | _ -> ()
+
+let explanation unif mis ppf =
+  match mis with
+  | None -> ()
+  | Some (t3, t4) -> explanation unif t3 t4 ppf
+
+let ident_same_name id1 id2 =
+  if Ident.equal id1 id2 && not (Ident.same id1 id2) then (
+    add_unique id1;
+    add_unique id2)
+
+let rec path_same_name p1 p2 =
+  match (p1, p2) with
+  | Pident id1, Pident id2 -> ident_same_name id1 id2
+  | Pdot (p1, s1, _), Pdot (p2, s2, _) when s1 = s2 -> path_same_name p1 p2
+  | Papply (p1, p1'), Papply (p2, p2') ->
+    path_same_name p1 p2;
+    path_same_name p1' p2'
+  | _ -> ()
+
+let type_same_name t1 t2 =
+  match ((repr t1).desc, (repr t2).desc) with
+  | Tconstr (p1, _, _), Tconstr (p2, _, _) ->
+    path_same_name (fst (best_type_path p1)) (fst (best_type_path p2))
+  | _ -> ()
+
+let rec trace_same_names = function
+  | (t1, t1') :: (t2, t2') :: rem ->
+    type_same_name t1 t2;
+    type_same_name t1' t2';
+    trace_same_names rem
+  | _ -> ()
+
+let unification_error env unif tr txt1 ppf txt2 =
+  reset ();
+  trace_same_names tr;
+  let tr = List.map (fun (t, t') -> (t, hide_variant_name t')) tr in
+  let mis = mismatch tr in
+  match tr with
+  | [] | _ :: [] -> assert false
+  | t1 :: t2 :: tr -> (
+    try
+      let tr = filter_trace (mis = None) tr in
+      let t1, t1' = may_prepare_expansion (tr = []) t1
+      and t2, t2' = may_prepare_expansion (tr = []) t2 in
+      let tr = List.map prepare_expansion tr in
+      fprintf ppf "@[<v>@[%t@;<1 2>%a@ %t@;<1 2>%a@]%a%t@]" txt1
+        (type_expansion t1) t1' txt2 (type_expansion t2) t2'
+        (trace false "is not compatible with type")
+        tr (explanation unif mis);
+      if env <> Env.empty then (
+        warn_on_missing_def env ppf t1;
+        warn_on_missing_def env ppf t2)
+    with exn -> raise exn)
+
+let report_unification_error ppf env ?(unif = true) tr txt1 txt2 =
+  wrap_printing_env env (fun () -> unification_error env unif tr txt1 ppf txt2)
+
+let super_type_expansion ~tag t ppf t' =
+  let tag = Format.String_tag tag in
+  if same_path t t' then (
+    Format.pp_open_stag ppf tag;
+    type_expr ppf t;
+    Format.pp_close_stag ppf ())
+  else
+    let t' = if proxy t == proxy t' then unalias t' else t' in
+    fprintf ppf "@[<2>";
+    Format.pp_open_stag ppf tag;
+    fprintf ppf "%a" type_expr t;
+    Format.pp_close_stag ppf ();
+    fprintf ppf "@ @{<dim>(defined as@}@ ";
+    Format.pp_open_stag ppf tag;
+    fprintf ppf "%a" type_expr t';
+    Format.pp_close_stag ppf ();
+    fprintf ppf "@{<dim>)@}";
+    fprintf ppf "@]"
+
+let super_trace ppf =
+  let rec super_trace first_report ppf = function
+    | (t1, t1') :: (t2, t2') :: rem ->
+      fprintf ppf "@,@,@[<v 2>";
+      if first_report then fprintf ppf "The incompatible parts:@,"
+      else fprintf ppf "Further expanded:@,";
+      fprintf ppf "@[<hov>%a@ vs@ %a@]%a"
+        (super_type_expansion ~tag:"error" t1)
+        t1'
+        (super_type_expansion ~tag:"info" t2)
+        t2' (super_trace false) rem;
+      fprintf ppf "@]"
+    | _ -> ()
+  in
+  super_trace true ppf
+
+let super_unification_error ?print_extra_info unif tr txt1 ppf txt2 =
+  reset ();
+  trace_same_names tr;
+  let tr = List.map (fun (t, t') -> (t, hide_variant_name t')) tr in
+  let mis = mismatch tr in
+  match tr with
+  | [] | _ :: [] -> assert false
+  | t1 :: t2 :: tr -> (
+    try
+      let tr = filter_trace (mis = None) tr in
+      let t1, t1' = may_prepare_expansion (tr = []) t1
+      and t2, t2' = may_prepare_expansion (tr = []) t2 in
+      let tr = List.map prepare_expansion tr in
+      fprintf ppf "@[<v 0>@[<hov 2>%t@ %a@]@,@[<hov 2>%t@ %a@]%a%t%t@]" txt1
+        (super_type_expansion ~tag:"error" t1) t1' txt2
+        (super_type_expansion ~tag:"info" t2)
+        t2' super_trace tr (explanation unif mis) (fun ppf ->
+          match print_extra_info with
+          | None -> ()
+          | Some f -> f ppf t1 t2)
+    with exn -> raise exn)
+
+let super_report_unification_error ?print_extra_info ppf env ?(unif = true) tr
+    txt1 txt2 =
+  wrap_printing_env env (fun () ->
+      super_unification_error ?print_extra_info unif tr txt1 ppf txt2)
+
+let trace fst keep_last txt ppf tr =
+  trace_same_names tr;
+  try
+    match tr with
+    | t1 :: t2 :: tr' ->
+      if fst then trace fst txt ppf (t1 :: t2 :: filter_trace keep_last tr')
+      else trace fst txt ppf (filter_trace keep_last tr)
+    | _ -> ()
+  with exn -> raise exn
+
+let print_variant_runtime_representation_issue ppf variant_name
+    (issue : Variant_coercion.variant_runtime_representation_issue) =
+  match issue with
+  | Cannot_coerce_non_unboxed_with_payload {constructor_name; expected_typename}
+    ->
+    fprintf ppf
+      "The constructor @{<info>%s@} of variant @{<info>%s@} has a payload, but \
+       the variant itself is not unboxed. @ This means that the constructor \
+       @{<info>%s@} will be encoded as an object at runtime, which is not \
+       compatible with @{<info>%s@}."
+      constructor_name (Path.name variant_name) constructor_name
+      (Path.name expected_typename)
+  | Inline_record_cannot_be_coerced {constructor_name} ->
+    fprintf ppf
+      "The constructor @{<info>%s@} of variant @{<info>%s@} has an inline \
+       record as payload. Currently, inline records cannot be coerced."
+      constructor_name (Path.name variant_name)
+  | As_payload_not_elgible_for_coercion
+      {constructor_name; as_payload; expected_typename} ->
+    fprintf ppf
+      "The constructor @{<info>%s@} of variant @{<info>%s@} has an \
+       @{<info>@as@} payload that has a runtime representation of \
+       @{<info>%s@}, which is not compatible with the expected @{<info>%s@}."
+      constructor_name (Path.name variant_name)
+      (Ast_untagged_variants.tag_type_to_user_visible_string as_payload)
+      (Path.name expected_typename)
+  | Mismatched_unboxed_payload _ -> ()
+  | Mismatched_as_payload {constructor_name; expected_typename; as_payload} ->
+    fprintf ppf "The constructor @{<info>%s@} of variant @{<info>%s@} has "
+      constructor_name (Path.name variant_name);
+    (match as_payload with
+    | None ->
+      fprintf ppf
+        "no @{<info>@as@} payload, which makes it a @{<info>string@} at \
+         runtime."
+    | Some payload ->
+      fprintf ppf
+        "an @{<info>@as@} payload that gives it the runtime type of \
+         @{<info>%s@}."
+        (Ast_untagged_variants.tag_type_to_user_visible_string payload));
+    fprintf ppf
+      "@ That runtime representation is not compatible with the expected \
+       runtime representation of @{<info>%s@}."
+      (Path.name expected_typename);
+    fprintf ppf
+      "@,\
+       @ Fix this by making sure all constructors in variant @{<info>%s@} has \
+       a runtime representation of @{<info>%s@}."
+      (Path.name variant_name)
+      (Path.name expected_typename)
+
+let print_variant_configuration_issue ppf
+    (issue : Variant_coercion.variant_configuration_issue) ~left_variant_name
+    ~right_variant_name =
+  match issue with
+  | Unboxed_config_not_matching {left_unboxed; right_unboxed} ->
+    fprintf ppf
+      "@ The variants have different @{<info>@unboxed@} configurations.";
+    let print_unboxed_status ppf unboxed name =
+      fprintf ppf "@ - Variant @{<info>%s@} is @{<error>%s@}unboxed."
+        (Path.name name)
+        (if unboxed then "not " else "")
+    in
+    print_unboxed_status ppf left_unboxed left_variant_name;
+    print_unboxed_status ppf right_unboxed right_variant_name;
+    fprintf ppf
+      "@,\
+       @ Fix this by making sure the variants either both have, or don't have, \
+       the @{<info>@unboxed@} attribute."
+  | Tag_name_not_matching {left_tag; right_tag} ->
+    fprintf ppf "@ The variants have different @{<info>@tag@} configurations.";
+    let print_tag ppf tag variant_name =
+      match tag with
+      | Some tag ->
+        fprintf ppf "@ - @{<info>%s@} has tag @{<info>%s@}."
+          (Path.name variant_name) tag
+      | None ->
+        fprintf ppf "@ - @{<info>%s@} has no explicit tag."
+          (Path.name variant_name)
+    in
+    print_tag ppf left_tag left_variant_name;
+    print_tag ppf right_tag right_variant_name;
+    fprintf ppf
+      "@,\
+       @ Fix this by making sure the variants either have the exact same \
+       @{<info>@tag@} configuration, or no @{<info>@tag@} at all."
+  | Incompatible_constructor_count {constructor_names} ->
+    let total_constructor_count = List.length constructor_names in
+    let constructor_names_to_print =
+      match constructor_names with
+      | a :: b :: c :: _ -> [a; b; c]
+      | names -> names
+    in
+    let not_printed_constructor_count =
+      total_constructor_count - List.length constructor_names_to_print
+    in
+    fprintf ppf
+      "@ @{<info>%s@} has %i constructor%s that @{<info>%s@} does not have: "
+      (Path.name left_variant_name)
+      total_constructor_count
+      (if total_constructor_count = 1 then "" else "s")
+      (Path.name right_variant_name);
+
+    constructor_names_to_print
+    |> List.iteri (fun index name ->
+           if index = 0 then () else fprintf ppf ", ";
+           fprintf ppf "@{<info>%s@}" name);
+    if not_printed_constructor_count > 0 then
+      fprintf ppf " (+%i more)" not_printed_constructor_count;
+
+    fprintf ppf
+      "@ Therefore, it is not possible for @{<info>%s@} to represent \
+       @{<info>%s@}."
+      (Path.name right_variant_name)
+      (Path.name left_variant_name)
+
+let print_record_field_subtype_violation ppf
+    (issue : Record_coercion.record_field_subtype_violation) ~left_record_name
+    ~right_record_name =
+  match issue with
+  | Optional_mismatch {label; left_optional; right_optional} -> (
+    fprintf ppf "The field @{<info>%s@} " label;
+    match (left_optional, right_optional) with
+    | true, false ->
+      fprintf ppf
+        "is optional in record @{<info>%s@}, but is not optional in record \
+         @{<info>%s@}"
+        (Path.name left_record_name)
+        (Path.name right_record_name)
+    | false, true ->
+      fprintf ppf
+        "is not optional in record @{<info>%s@}, but is optional in record \
+         @{<info>%s@}"
+        (Path.name left_record_name)
+        (Path.name right_record_name)
+    | _ -> failwith "Invalid optional mismatch")
+  | Field_runtime_name_mismatch {label; left_as; right_as} ->
+    fprintf ppf "Field @{<info>%s@} runtime representation" label;
+    (match left_as with
+    | Some as_name ->
+      fprintf ppf
+        " is configured to be @{<info>\"%s\"@} (via the @as attribute)" as_name
+    | None -> fprintf ppf " is @{<info>\"%s\"@}" label);
+    fprintf ppf " in record @{<info>%s@}, but in record @{<info>%s@}"
+      (Path.name right_record_name)
+      (Path.name left_record_name);
+    (match right_as with
+    | Some as_name ->
+      fprintf ppf
+        " it is configured to be @{<info>\"%s\"@} (via the @as attribute)."
+        as_name
+    | None -> fprintf ppf " it is @{<info>\"%s\"@}." label);
+    fprintf ppf " Runtime representations must match."
+  | Field_missing {label} ->
+    fprintf ppf
+      "The field @{<info>%s@} is missing in record @{<info>%s@}, but present \
+       in record @{<info>%s@}"
+      label
+      (Path.name right_record_name)
+      (Path.name left_record_name)
+
+let report_subtyping_error ppf env tr1 txt1 tr2 ctx =
+  wrap_printing_env env (fun () ->
+      reset ();
+      let tr1 = List.map prepare_expansion tr1
+      and tr2 = List.map prepare_expansion tr2 in
+      fprintf ppf "@[<v>%a" (trace true (tr2 = []) txt1) tr1;
+      (if tr2 = [] then fprintf ppf "@]"
+       else
+         let mis = mismatch tr2 in
+         fprintf ppf "%a%t@]"
+           (trace false (mis = None) "is not compatible with type")
+           tr2 (explanation true mis));
+      match ctx with
+      | Some ctx -> (
+        fprintf ppf "@,@,@[<v 2>";
+        match ctx with
+        | Generic {errorCode} -> fprintf ppf "Error: %s" errorCode
+        | Coercion_target_variant_not_unboxed {variant_name; primitive} ->
+          fprintf ppf
+            "@ The variant @{<info>%s@} is not unboxed, so it cannot be \
+             coerced to a @{<info>%s@}. @ Fix this by adding the \
+             @{<info>@unboxed@} attribute to the variant @{<info>%s@}."
+            (Path.name variant_name) (Path.name primitive)
+            (Path.name variant_name)
+        | Coercion_target_variant_does_not_cover_type {variant_name; primitive}
+          ->
+          fprintf ppf
+            "@ The variant @{<info>%s@} is unboxed, but has no catch-all case \
+             for the primitive @{<info>%s@}, and therefore does not cover all \
+             values of type @{<info>%s@}. @ Fix this by adding a catch-all for \
+             @{<info>%s@} to @{<info>%s@}, like @{<info>%s(%s)@}."
+            (Path.name variant_name) (Path.name primitive) (Path.name primitive)
+            (Path.name variant_name) (Path.name primitive)
+            (String.capitalize_ascii (Path.name primitive))
+            (Path.name primitive)
+        | Variant_constructor_runtime_representation_mismatch
+            {variant_name; issues} ->
+          List.iter
+            (fun issue ->
+              fprintf ppf "@ ";
+              print_variant_runtime_representation_issue ppf variant_name issue)
+            issues
+        | Variant_configurations_mismatch
+            {left_variant_name; right_variant_name; issue} ->
+          print_variant_configuration_issue ppf issue ~left_variant_name
+            ~right_variant_name
+        | Different_type_kinds
+            {left_typename; right_typename; left_type_kind; right_type_kind} ->
+          let type_kind_to_string = function
+            | Type_abstract -> "an abstract type"
+            | Type_record _ -> "a record"
+            | Type_variant _ -> "a variant"
+            | Type_open -> "an open type"
+          in
+          fprintf ppf
+            "@ The types of @{<info>%s@} and @{<info>%s@} are different:"
+            (Path.name left_typename) (Path.name right_typename);
+          fprintf ppf "@ - @{<info>%s@} is %s" (Path.name left_typename)
+            (type_kind_to_string left_type_kind);
+          fprintf ppf "@ - @{<info>%s@} is %s" (Path.name right_typename)
+            (type_kind_to_string right_type_kind)
+        | Record_fields_mismatch {left_record_name; right_record_name; issues}
+          ->
+          fprintf ppf
+            "@ The record @{<info>%s@} cannot be coerced to the record \
+             @{<info>%s@} because:"
+            (Path.name left_record_name)
+            (Path.name right_record_name);
+          List.iter
+            (fun issue ->
+              fprintf ppf "@ - ";
+              print_record_field_subtype_violation ppf issue ~left_record_name
+                ~right_record_name)
+            issues)
+      | None -> ())
+
+let report_ambiguous_type_error ppf env (tp0, tp0') tpl txt1 txt2 txt3 =
+  wrap_printing_env env (fun () ->
+      reset ();
+      List.iter
+        (fun (tp, tp') ->
+          path_same_name tp0 tp;
+          path_same_name tp0' tp')
+        tpl;
+      match tpl with
+      | [] -> assert false
+      | [(tp, tp')] ->
+        fprintf ppf "@[%t@;<1 2>%a@ %t@;<1 2>%a@]" txt1 (type_path_expansion tp)
+          tp' txt3 (type_path_expansion tp0) tp0'
+      | _ ->
+        fprintf ppf "@[%t@;<1 2>@[<hv>%a@]@ %t@;<1 2>%a@]" txt2 type_path_list
+          tpl txt3 (type_path_expansion tp0) tp0')
diff --git a/compiler/ml/printtyp.mli b/compiler/ml/printtyp.mli
new file mode 100644
index 0000000..0fe84f3
--- /dev/null
+++ b/compiler/ml/printtyp.mli
@@ -0,0 +1,117 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Printing functions *)
+
+open Format
+open Types
+open Outcometree
+
+type printing_context = {inlined_types: type_inlined_type list}
+(** Tracks things like inlined records, to help with printing. *)
+
+val print_res_poly_identifier : (string -> string) ref
+val longident : formatter -> Longident.t -> unit
+val ident : formatter -> Ident.t -> unit
+val tree_of_path : Path.t -> out_ident
+val path : formatter -> Path.t -> unit
+val string_of_path : Path.t -> string
+val raw_type_expr : formatter -> type_expr -> unit
+val string_of_label : Asttypes.arg_label -> string
+
+val wrap_printing_env : Env.t -> (unit -> 'a) -> 'a
+(* Call the function using the environment for type path shortening *)
+(* This affects all the printing functions below *)
+
+val reset : unit -> unit
+val mark_loops : type_expr -> unit
+val reset_and_mark_loops : type_expr -> unit
+val reset_and_mark_loops_list : type_expr list -> unit
+val type_expr : formatter -> type_expr -> unit
+val constructor_arguments : formatter -> constructor_arguments -> unit
+val tree_of_type_scheme : type_expr -> out_type
+val type_sch : formatter -> type_expr -> unit
+val type_scheme : formatter -> type_expr -> unit
+
+(* Maxence *)
+val reset_names : unit -> unit
+val type_scheme_max : ?b_reset_names:bool -> formatter -> type_expr -> unit
+
+(* End Maxence *)
+val tree_of_value_description : Ident.t -> value_description -> out_sig_item
+val value_description : Ident.t -> formatter -> value_description -> unit
+val tree_of_type_declaration :
+  Ident.t -> type_declaration -> rec_status -> out_sig_item
+val type_declaration : Ident.t -> formatter -> type_declaration -> unit
+val tree_of_extension_constructor :
+  Ident.t -> extension_constructor -> ext_status -> out_sig_item
+val extension_constructor :
+  Ident.t -> formatter -> extension_constructor -> unit
+val tree_of_module :
+  Ident.t -> ?ellipsis:bool -> module_type -> rec_status -> out_sig_item
+val modtype : formatter -> module_type -> unit
+val signature : formatter -> signature -> unit
+val tree_of_modtype_declaration : Ident.t -> modtype_declaration -> out_sig_item
+val tree_of_signature : Types.signature -> out_sig_item list
+val tree_of_typexp :
+  ?printing_context:printing_context -> bool -> type_expr -> out_type
+val modtype_declaration : Ident.t -> formatter -> modtype_declaration -> unit
+val type_expansion : type_expr -> Format.formatter -> type_expr -> unit
+val prepare_expansion : type_expr * type_expr -> type_expr * type_expr
+val trace :
+  bool -> bool -> string -> formatter -> (type_expr * type_expr) list -> unit
+val report_unification_error :
+  formatter ->
+  Env.t ->
+  ?unif:bool ->
+  (type_expr * type_expr) list ->
+  (formatter -> unit) ->
+  (formatter -> unit) ->
+  unit
+
+val super_report_unification_error :
+  ?print_extra_info:(formatter -> type_expr -> type_expr -> unit) ->
+  formatter ->
+  Env.t ->
+  ?unif:bool ->
+  (type_expr * type_expr) list ->
+  (formatter -> unit) ->
+  (formatter -> unit) ->
+  unit
+
+val report_subtyping_error :
+  formatter ->
+  Env.t ->
+  Ctype.type_pairs ->
+  string ->
+  Ctype.type_pairs ->
+  Ctype.subtype_context option ->
+  unit
+val report_ambiguous_type_error :
+  formatter ->
+  Env.t ->
+  Path.t * Path.t ->
+  (Path.t * Path.t) list ->
+  (formatter -> unit) ->
+  (formatter -> unit) ->
+  (formatter -> unit) ->
+  unit
+
+(* for toploop *)
+val print_items :
+  (Env.t -> signature_item -> 'a option) ->
+  Env.t ->
+  signature_item list ->
+  (out_sig_item * 'a option) list
diff --git a/compiler/ml/printtyped.ml b/compiler/ml/printtyped.ml
new file mode 100644
index 0000000..6e36b42
--- /dev/null
+++ b/compiler/ml/printtyped.ml
@@ -0,0 +1,675 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                   Fabrice Le Fessant, INRIA Saclay                     *)
+(*                                                                        *)
+(*   Copyright 1999 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Asttypes
+open Format
+open Lexing
+open Location
+open Typedtree
+
+let fmt_position f l =
+  if l.pos_lnum = -1 then fprintf f "%s[%d]" l.pos_fname l.pos_cnum
+  else
+    fprintf f "%s[%d,%d+%d]" l.pos_fname l.pos_lnum l.pos_bol
+      (l.pos_cnum - l.pos_bol)
+
+let fmt_location f loc =
+  if !Clflags.dump_location then (
+    fprintf f "(%a..%a)" fmt_position loc.loc_start fmt_position loc.loc_end;
+    if loc.loc_ghost then fprintf f " ghost")
+
+let rec fmt_longident_aux f x =
+  match x with
+  | Longident.Lident s -> fprintf f "%s" s
+  | Longident.Ldot (y, s) -> fprintf f "%a.%s" fmt_longident_aux y s
+  | Longident.Lapply (y, z) ->
+    fprintf f "%a(%a)" fmt_longident_aux y fmt_longident_aux z
+
+let fmt_longident f x = fprintf f "\"%a\"" fmt_longident_aux x.txt
+
+let fmt_ident = Ident.print
+
+let rec fmt_path_aux f x =
+  match x with
+  | Path.Pident s -> fprintf f "%a" fmt_ident s
+  | Path.Pdot (y, s, _pos) -> fprintf f "%a.%s" fmt_path_aux y s
+  | Path.Papply (y, z) -> fprintf f "%a(%a)" fmt_path_aux y fmt_path_aux z
+
+let fmt_path f x = fprintf f "\"%a\"" fmt_path_aux x
+
+let fmt_constant f x =
+  match x with
+  | Const_int i -> fprintf f "Const_int %d" i
+  | Const_char c -> fprintf f "Const_char %02x" c
+  | Const_string (s, None) -> fprintf f "Const_string(%S,None)" s
+  | Const_string (s, Some delim) ->
+    fprintf f "Const_string (%S,Some %S)" s delim
+  | Const_float s -> fprintf f "Const_float %s" s
+  | Const_int32 i -> fprintf f "Const_int32 %ld" i
+  | Const_int64 i -> fprintf f "Const_int64 %Ld" i
+  | Const_bigint (sign, i) ->
+    fprintf f "Const_bigint %s" (Bigint_utils.to_string sign i)
+
+let fmt_mutable_flag f x =
+  match x with
+  | Immutable -> fprintf f "Immutable"
+  | Mutable -> fprintf f "Mutable"
+
+let fmt_override_flag f x =
+  match x with
+  | Override -> fprintf f "Override"
+  | Fresh -> fprintf f "Fresh"
+
+let fmt_closed_flag f x =
+  match x with
+  | Closed -> fprintf f "Closed"
+  | Open -> fprintf f "Open"
+
+let fmt_rec_flag f x =
+  match x with
+  | Nonrecursive -> fprintf f "Nonrec"
+  | Recursive -> fprintf f "Rec"
+
+let fmt_direction_flag f x =
+  match x with
+  | Upto -> fprintf f "Up"
+  | Downto -> fprintf f "Down"
+
+let fmt_private_flag f x =
+  match x with
+  | Public -> fprintf f "Public"
+  | Private -> fprintf f "Private"
+
+let line i f s (*...*) =
+  fprintf f "%s" (String.make (2 * i) ' ');
+  fprintf f s (*...*)
+
+let list i f ppf l =
+  match l with
+  | [] -> line i ppf "[]\n"
+  | _ :: _ ->
+    line i ppf "[\n";
+    List.iter (f (i + 1) ppf) l;
+    line i ppf "]\n"
+
+let array i f ppf a =
+  if Array.length a = 0 then line i ppf "[]\n"
+  else (
+    line i ppf "[\n";
+    Array.iter (f (i + 1) ppf) a;
+    line i ppf "]\n")
+
+let option i f ppf x =
+  match x with
+  | None -> line i ppf "None\n"
+  | Some x ->
+    line i ppf "Some\n";
+    f (i + 1) ppf x
+
+let longident i ppf li = line i ppf "%a\n" fmt_longident li
+let string i ppf s = line i ppf "\"%s\"\n" s
+let arg_label i ppf = function
+  | Nolabel -> line i ppf "Nolabel\n"
+  | Optional {txt} -> line i ppf "Optional \"%s\"\n" txt
+  | Labelled {txt} -> line i ppf "Labelled \"%s\"\n" txt
+
+let record_representation i ppf =
+  let open Types in
+  function
+  | Record_regular -> line i ppf "Record_regular\n"
+  | Record_float_unused -> assert false
+  | Record_unboxed b -> line i ppf "Record_unboxed %b\n" b
+  | Record_inlined {tag = i} -> line i ppf "Record_inlined %d\n" i
+  | Record_extension -> line i ppf "Record_extension\n"
+
+let attributes i ppf l =
+  let i = i + 1 in
+  List.iter
+    (fun (s, arg) ->
+      line i ppf "attribute \"%s\"\n" s.txt;
+      Printast.payload (i + 1) ppf arg)
+    l
+
+let rec core_type i ppf x =
+  line i ppf "core_type %a\n" fmt_location x.ctyp_loc;
+  attributes i ppf x.ctyp_attributes;
+  let i = i + 1 in
+  match x.ctyp_desc with
+  | Ttyp_any -> line i ppf "Ttyp_any\n"
+  | Ttyp_var s -> line i ppf "Ttyp_var %s\n" s
+  | Ttyp_arrow (arg, ret, _) ->
+    line i ppf "Ttyp_arrow\n";
+    arg_label i ppf arg.lbl;
+    attributes i ppf arg.attrs;
+    core_type i ppf arg.typ;
+    core_type i ppf ret
+  | Ttyp_tuple l ->
+    line i ppf "Ttyp_tuple\n";
+    list i core_type ppf l
+  | Ttyp_constr (li, _, l) ->
+    line i ppf "Ttyp_constr %a\n" fmt_path li;
+    list i core_type ppf l
+  | Ttyp_variant (l, closed, low) ->
+    line i ppf "Ttyp_variant closed=%a\n" fmt_closed_flag closed;
+    list i label_x_bool_x_core_type_list ppf l;
+    option i (fun i -> list i string) ppf low
+  | Ttyp_object (l, c) ->
+    line i ppf "Ttyp_object %a\n" fmt_closed_flag c;
+    let i = i + 1 in
+    List.iter
+      (function
+        | OTtag (s, attrs, t) ->
+          line i ppf "method %s\n" s.txt;
+          attributes i ppf attrs;
+          core_type (i + 1) ppf t
+        | OTinherit ct ->
+          line i ppf "OTinherit\n";
+          core_type (i + 1) ppf ct)
+      l
+  | Ttyp_alias (ct, s) ->
+    line i ppf "Ttyp_alias \"%s\"\n" s;
+    core_type i ppf ct
+  | Ttyp_poly (sl, ct) ->
+    line i ppf "Ttyp_poly%a\n"
+      (fun ppf -> List.iter (fun x -> fprintf ppf " '%s" x))
+      sl;
+    core_type i ppf ct
+  | Ttyp_package {pack_path = s; pack_fields = l} ->
+    line i ppf "Ttyp_package %a\n" fmt_path s;
+    list i package_with ppf l
+
+and package_with i ppf (s, t) =
+  line i ppf "with type %a\n" fmt_longident s;
+  core_type i ppf t
+
+and pattern i ppf x =
+  line i ppf "pattern %a\n" fmt_location x.pat_loc;
+  attributes i ppf x.pat_attributes;
+  let i = i + 1 in
+  match x.pat_extra with
+  | (Tpat_unpack, _, attrs) :: rem ->
+    line i ppf "Tpat_unpack\n";
+    attributes i ppf attrs;
+    pattern i ppf {x with pat_extra = rem}
+  | (Tpat_constraint cty, _, attrs) :: rem ->
+    line i ppf "Tpat_constraint\n";
+    attributes i ppf attrs;
+    core_type i ppf cty;
+    pattern i ppf {x with pat_extra = rem}
+  | (Tpat_type (id, _), _, attrs) :: rem ->
+    line i ppf "Tpat_type %a\n" fmt_path id;
+    attributes i ppf attrs;
+    pattern i ppf {x with pat_extra = rem}
+  | (Tpat_open (id, _, _), _, attrs) :: rem ->
+    line i ppf "Tpat_open \"%a\"\n" fmt_path id;
+    attributes i ppf attrs;
+    pattern i ppf {x with pat_extra = rem}
+  | [] -> (
+    match x.pat_desc with
+    | Tpat_any -> line i ppf "Tpat_any\n"
+    | Tpat_var (s, _) -> line i ppf "Tpat_var \"%a\"\n" fmt_ident s
+    | Tpat_alias (p, s, _) ->
+      line i ppf "Tpat_alias \"%a\"\n" fmt_ident s;
+      pattern i ppf p
+    | Tpat_constant c -> line i ppf "Tpat_constant %a\n" fmt_constant c
+    | Tpat_tuple l ->
+      line i ppf "Tpat_tuple\n";
+      list i pattern ppf l
+    | Tpat_construct (li, _, po) ->
+      line i ppf "Tpat_construct %a\n" fmt_longident li;
+      list i pattern ppf po
+    | Tpat_variant (l, po, _) ->
+      line i ppf "Tpat_variant \"%s\"\n" l;
+      option i pattern ppf po
+    | Tpat_record (l, _c) ->
+      line i ppf "Tpat_record\n";
+      list i longident_x_pattern ppf l
+    | Tpat_array l ->
+      line i ppf "Tpat_array\n";
+      list i pattern ppf l
+    | Tpat_or (p1, p2, _) ->
+      line i ppf "Tpat_or\n";
+      pattern i ppf p1;
+      pattern i ppf p2)
+
+and expression_extra i ppf x attrs =
+  match x with
+  | Texp_constraint ct ->
+    line i ppf "Texp_constraint\n";
+    attributes i ppf attrs;
+    core_type i ppf ct
+  | Texp_coerce cto2 ->
+    line i ppf "Texp_coerce\n";
+    attributes i ppf attrs;
+    core_type i ppf cto2
+  | Texp_open (ovf, m, _, _) ->
+    line i ppf "Texp_open %a \"%a\"\n" fmt_override_flag ovf fmt_path m;
+    attributes i ppf attrs
+  | Texp_newtype s ->
+    line i ppf "Texp_newtype \"%s\"\n" s;
+    attributes i ppf attrs
+
+and expression i ppf x =
+  line i ppf "expression %a\n" fmt_location x.exp_loc;
+  attributes i ppf x.exp_attributes;
+  let i =
+    List.fold_left
+      (fun i (extra, _, attrs) ->
+        expression_extra i ppf extra attrs;
+        i + 1)
+      (i + 1) x.exp_extra
+  in
+  match x.exp_desc with
+  | Texp_ident (li, _, _) -> line i ppf "Texp_ident %a\n" fmt_path li
+  | Texp_constant c -> line i ppf "Texp_constant %a\n" fmt_constant c
+  | Texp_let (rf, l, e) ->
+    line i ppf "Texp_let %a\n" fmt_rec_flag rf;
+    list i value_binding ppf l;
+    expression i ppf e
+  | Texp_function
+      {arg_label = p; arity; async; param; case = case_; partial = _} ->
+    line i ppf "Texp_function\n";
+    if async then line i ppf "async\n";
+    (match arity with
+    | Some arity -> line i ppf "arity: %d\n" arity
+    | None -> ());
+    line i ppf "%a" Ident.print param;
+    arg_label i ppf p;
+    case i ppf case_
+  | Texp_apply {funct = e; args = l; partial} ->
+    if partial then line i ppf "partial\n";
+    line i ppf "Texp_apply\n";
+    expression i ppf e;
+    list i label_x_expression ppf l
+  | Texp_match (e, l1, l2, _partial) ->
+    line i ppf "Texp_match\n";
+    expression i ppf e;
+    list i case ppf l1;
+    list i case ppf l2
+  | Texp_try (e, l) ->
+    line i ppf "Texp_try\n";
+    expression i ppf e;
+    list i case ppf l
+  | Texp_tuple l ->
+    line i ppf "Texp_tuple\n";
+    list i expression ppf l
+  | Texp_construct (li, _, eo) ->
+    line i ppf "Texp_construct %a\n" fmt_longident li;
+    list i expression ppf eo
+  | Texp_variant (l, eo) ->
+    line i ppf "Texp_variant \"%s\"\n" l;
+    option i expression ppf eo
+  | Texp_record {fields; representation; extended_expression} ->
+    line i ppf "Texp_record\n";
+    let i = i + 1 in
+    line i ppf "fields =\n";
+    array (i + 1) record_field ppf fields;
+    line i ppf "representation =\n";
+    record_representation (i + 1) ppf representation;
+    line i ppf "extended_expression =\n";
+    option (i + 1) expression ppf extended_expression
+  | Texp_field (e, li, _) ->
+    line i ppf "Texp_field\n";
+    expression i ppf e;
+    longident i ppf li
+  | Texp_setfield (e1, li, _, e2) ->
+    line i ppf "Texp_setfield\n";
+    expression i ppf e1;
+    longident i ppf li;
+    expression i ppf e2
+  | Texp_array l ->
+    line i ppf "Texp_array\n";
+    list i expression ppf l
+  | Texp_ifthenelse (e1, e2, eo) ->
+    line i ppf "Texp_ifthenelse\n";
+    expression i ppf e1;
+    expression i ppf e2;
+    option i expression ppf eo
+  | Texp_sequence (e1, e2) ->
+    line i ppf "Texp_sequence\n";
+    expression i ppf e1;
+    expression i ppf e2
+  | Texp_while (e1, e2) ->
+    line i ppf "Texp_while\n";
+    expression i ppf e1;
+    expression i ppf e2
+  | Texp_for (s, _, e1, e2, df, e3) ->
+    line i ppf "Texp_for \"%a\" %a\n" fmt_ident s fmt_direction_flag df;
+    expression i ppf e1;
+    expression i ppf e2;
+    expression i ppf e3
+  | Texp_send (e, Tmeth_name s, eo) ->
+    line i ppf "Texp_send \"%s\"\n" s;
+    expression i ppf e;
+    option i expression ppf eo
+  | Texp_letmodule (s, _, me, e) ->
+    line i ppf "Texp_letmodule \"%a\"\n" fmt_ident s;
+    module_expr i ppf me;
+    expression i ppf e
+  | Texp_letexception (cd, e) ->
+    line i ppf "Texp_letexception\n";
+    extension_constructor i ppf cd;
+    expression i ppf e
+  | Texp_assert e ->
+    line i ppf "Texp_assert";
+    expression i ppf e
+  | Texp_pack me ->
+    line i ppf "Texp_pack";
+    module_expr i ppf me
+  | Texp_extension_constructor (li, _) ->
+    line i ppf "Texp_extension_constructor %a" fmt_longident li
+
+and value_description i ppf x =
+  line i ppf "value_description %a %a\n" fmt_ident x.val_id fmt_location
+    x.val_loc;
+  attributes i ppf x.val_attributes;
+  core_type (i + 1) ppf x.val_desc;
+  list (i + 1) string ppf x.val_prim
+
+and type_parameter i ppf (x, _variance) = core_type i ppf x
+
+and type_declaration i ppf x =
+  line i ppf "type_declaration %a %a\n" fmt_ident x.typ_id fmt_location
+    x.typ_loc;
+  attributes i ppf x.typ_attributes;
+  let i = i + 1 in
+  line i ppf "ptype_params =\n";
+  list (i + 1) type_parameter ppf x.typ_params;
+  line i ppf "ptype_cstrs =\n";
+  list (i + 1) core_type_x_core_type_x_location ppf x.typ_cstrs;
+  line i ppf "ptype_kind =\n";
+  type_kind (i + 1) ppf x.typ_kind;
+  line i ppf "ptype_private = %a\n" fmt_private_flag x.typ_private;
+  line i ppf "ptype_manifest =\n";
+  option (i + 1) core_type ppf x.typ_manifest
+
+and type_kind i ppf x =
+  match x with
+  | Ttype_abstract -> line i ppf "Ttype_abstract\n"
+  | Ttype_variant l ->
+    line i ppf "Ttype_variant\n";
+    list (i + 1) constructor_decl ppf l
+  | Ttype_record l ->
+    line i ppf "Ttype_record\n";
+    list (i + 1) label_decl ppf l
+  | Ttype_open -> line i ppf "Ttype_open\n"
+
+and type_extension i ppf x =
+  line i ppf "type_extension\n";
+  attributes i ppf x.tyext_attributes;
+  let i = i + 1 in
+  line i ppf "ptyext_path = %a\n" fmt_path x.tyext_path;
+  line i ppf "ptyext_params =\n";
+  list (i + 1) type_parameter ppf x.tyext_params;
+  line i ppf "ptyext_constructors =\n";
+  list (i + 1) extension_constructor ppf x.tyext_constructors;
+  line i ppf "ptyext_private = %a\n" fmt_private_flag x.tyext_private
+
+and extension_constructor i ppf x =
+  line i ppf "extension_constructor %a\n" fmt_location x.ext_loc;
+  attributes i ppf x.ext_attributes;
+  let i = i + 1 in
+  line i ppf "pext_name = \"%a\"\n" fmt_ident x.ext_id;
+  line i ppf "pext_kind =\n";
+  extension_constructor_kind (i + 1) ppf x.ext_kind
+
+and extension_constructor_kind i ppf x =
+  match x with
+  | Text_decl (a, r) ->
+    line i ppf "Text_decl\n";
+    constructor_arguments (i + 1) ppf a;
+    option (i + 1) core_type ppf r
+  | Text_rebind (p, _) ->
+    line i ppf "Text_rebind\n";
+    line (i + 1) ppf "%a\n" fmt_path p
+
+and module_type i ppf x =
+  line i ppf "module_type %a\n" fmt_location x.mty_loc;
+  attributes i ppf x.mty_attributes;
+  let i = i + 1 in
+  match x.mty_desc with
+  | Tmty_ident (li, _) -> line i ppf "Tmty_ident %a\n" fmt_path li
+  | Tmty_alias (li, _) -> line i ppf "Tmty_alias %a\n" fmt_path li
+  | Tmty_signature s ->
+    line i ppf "Tmty_signature\n";
+    signature i ppf s
+  | Tmty_functor (s, _, mt1, mt2) ->
+    line i ppf "Tmty_functor \"%a\"\n" fmt_ident s;
+    Misc.may (module_type i ppf) mt1;
+    module_type i ppf mt2
+  | Tmty_with (mt, l) ->
+    line i ppf "Tmty_with\n";
+    module_type i ppf mt;
+    list i longident_x_with_constraint ppf l
+  | Tmty_typeof m ->
+    line i ppf "Tmty_typeof\n";
+    module_expr i ppf m
+
+and signature i ppf x = list i signature_item ppf x.sig_items
+
+and signature_item i ppf x =
+  line i ppf "signature_item %a\n" fmt_location x.sig_loc;
+  let i = i + 1 in
+  match x.sig_desc with
+  | Tsig_value vd ->
+    line i ppf "Tsig_value\n";
+    value_description i ppf vd
+  | Tsig_type (rf, l) ->
+    line i ppf "Tsig_type %a\n" fmt_rec_flag rf;
+    list i type_declaration ppf l
+  | Tsig_typext e ->
+    line i ppf "Tsig_typext\n";
+    type_extension i ppf e
+  | Tsig_exception ext ->
+    line i ppf "Tsig_exception\n";
+    extension_constructor i ppf ext
+  | Tsig_module md ->
+    line i ppf "Tsig_module \"%a\"\n" fmt_ident md.md_id;
+    attributes i ppf md.md_attributes;
+    module_type i ppf md.md_type
+  | Tsig_recmodule decls ->
+    line i ppf "Tsig_recmodule\n";
+    list i module_declaration ppf decls
+  | Tsig_modtype x ->
+    line i ppf "Tsig_modtype \"%a\"\n" fmt_ident x.mtd_id;
+    attributes i ppf x.mtd_attributes;
+    modtype_declaration i ppf x.mtd_type
+  | Tsig_open od ->
+    line i ppf "Tsig_open %a %a\n" fmt_override_flag od.open_override fmt_path
+      od.open_path;
+    attributes i ppf od.open_attributes
+  | Tsig_include incl ->
+    line i ppf "Tsig_include\n";
+    attributes i ppf incl.incl_attributes;
+    module_type i ppf incl.incl_mod
+  | Tsig_attribute (s, arg) ->
+    line i ppf "Tsig_attribute \"%s\"\n" s.txt;
+    Printast.payload i ppf arg
+
+and module_declaration i ppf md =
+  line i ppf "%a" fmt_ident md.md_id;
+  attributes i ppf md.md_attributes;
+  module_type (i + 1) ppf md.md_type
+
+and module_binding i ppf x =
+  line i ppf "%a\n" fmt_ident x.mb_id;
+  attributes i ppf x.mb_attributes;
+  module_expr (i + 1) ppf x.mb_expr
+
+and modtype_declaration i ppf = function
+  | None -> line i ppf "#abstract"
+  | Some mt -> module_type (i + 1) ppf mt
+
+and with_constraint i ppf x =
+  match x with
+  | Twith_type td ->
+    line i ppf "Twith_type\n";
+    type_declaration (i + 1) ppf td
+  | Twith_typesubst td ->
+    line i ppf "Twith_typesubst\n";
+    type_declaration (i + 1) ppf td
+  | Twith_module (li, _) -> line i ppf "Twith_module %a\n" fmt_path li
+  | Twith_modsubst (li, _) -> line i ppf "Twith_modsubst %a\n" fmt_path li
+
+and module_expr i ppf x =
+  line i ppf "module_expr %a\n" fmt_location x.mod_loc;
+  attributes i ppf x.mod_attributes;
+  let i = i + 1 in
+  match x.mod_desc with
+  | Tmod_ident (li, _) -> line i ppf "Tmod_ident %a\n" fmt_path li
+  | Tmod_structure s ->
+    line i ppf "Tmod_structure\n";
+    structure i ppf s
+  | Tmod_functor (s, _, mt, me) ->
+    line i ppf "Tmod_functor \"%a\"\n" fmt_ident s;
+    Misc.may (module_type i ppf) mt;
+    module_expr i ppf me
+  | Tmod_apply (me1, me2, _) ->
+    line i ppf "Tmod_apply\n";
+    module_expr i ppf me1;
+    module_expr i ppf me2
+  | Tmod_constraint (me, _, Tmodtype_explicit mt, _) ->
+    line i ppf "Tmod_constraint\n";
+    module_expr i ppf me;
+    module_type i ppf mt
+  | Tmod_constraint (me, _, Tmodtype_implicit, _) -> module_expr i ppf me
+  | Tmod_unpack (e, _) ->
+    line i ppf "Tmod_unpack\n";
+    expression i ppf e
+
+and structure i ppf x = list i structure_item ppf x.str_items
+
+and structure_item i ppf x =
+  line i ppf "structure_item %a\n" fmt_location x.str_loc;
+  let i = i + 1 in
+  match x.str_desc with
+  | Tstr_eval (e, attrs) ->
+    line i ppf "Tstr_eval\n";
+    attributes i ppf attrs;
+    expression i ppf e
+  | Tstr_value (rf, l) ->
+    line i ppf "Tstr_value %a\n" fmt_rec_flag rf;
+    list i value_binding ppf l
+  | Tstr_primitive vd ->
+    line i ppf "Tstr_primitive\n";
+    value_description i ppf vd
+  | Tstr_type (rf, l) ->
+    line i ppf "Tstr_type %a\n" fmt_rec_flag rf;
+    list i type_declaration ppf l
+  | Tstr_typext te ->
+    line i ppf "Tstr_typext\n";
+    type_extension i ppf te
+  | Tstr_exception ext ->
+    line i ppf "Tstr_exception\n";
+    extension_constructor i ppf ext
+  | Tstr_module x ->
+    line i ppf "Tstr_module\n";
+    module_binding i ppf x
+  | Tstr_recmodule bindings ->
+    line i ppf "Tstr_recmodule\n";
+    list i module_binding ppf bindings
+  | Tstr_modtype x ->
+    line i ppf "Tstr_modtype \"%a\"\n" fmt_ident x.mtd_id;
+    attributes i ppf x.mtd_attributes;
+    modtype_declaration i ppf x.mtd_type
+  | Tstr_open od ->
+    line i ppf "Tstr_open %a %a\n" fmt_override_flag od.open_override fmt_path
+      od.open_path;
+    attributes i ppf od.open_attributes
+  | Tstr_include incl ->
+    line i ppf "Tstr_include";
+    attributes i ppf incl.incl_attributes;
+    module_expr i ppf incl.incl_mod
+  | Tstr_attribute (s, arg) ->
+    line i ppf "Tstr_attribute \"%s\"\n" s.txt;
+    Printast.payload i ppf arg
+
+and longident_x_with_constraint i ppf (li, _, wc) =
+  line i ppf "%a\n" fmt_path li;
+  with_constraint (i + 1) ppf wc
+
+and core_type_x_core_type_x_location i ppf (ct1, ct2, l) =
+  line i ppf "<constraint> %a\n" fmt_location l;
+  core_type (i + 1) ppf ct1;
+  core_type (i + 1) ppf ct2
+
+and constructor_decl i ppf
+    {cd_id; cd_name = _; cd_args; cd_res; cd_loc; cd_attributes} =
+  line i ppf "%a\n" fmt_location cd_loc;
+  line (i + 1) ppf "%a\n" fmt_ident cd_id;
+  attributes i ppf cd_attributes;
+  constructor_arguments (i + 1) ppf cd_args;
+  option (i + 1) core_type ppf cd_res
+
+and constructor_arguments i ppf = function
+  | Cstr_tuple l -> list i core_type ppf l
+  | Cstr_record l -> list i label_decl ppf l
+
+and label_decl i ppf
+    {ld_id; ld_name = _; ld_mutable; ld_type; ld_loc; ld_attributes} =
+  line i ppf "%a\n" fmt_location ld_loc;
+  attributes i ppf ld_attributes;
+  line (i + 1) ppf "%a\n" fmt_mutable_flag ld_mutable;
+  line (i + 1) ppf "%a" fmt_ident ld_id;
+  core_type (i + 1) ppf ld_type
+
+and longident_x_pattern i ppf (li, _, p, opt) =
+  line i ppf "%a%s\n" fmt_longident li (if opt then "?" else "");
+  pattern (i + 1) ppf p
+
+and case i ppf {c_lhs; c_guard; c_rhs} =
+  line i ppf "<case>\n";
+  pattern (i + 1) ppf c_lhs;
+  (match c_guard with
+  | None -> ()
+  | Some g ->
+    line (i + 1) ppf "<when>\n";
+    expression (i + 2) ppf g);
+  expression (i + 1) ppf c_rhs
+
+and value_binding i ppf x =
+  line i ppf "<def>\n";
+  attributes (i + 1) ppf x.vb_attributes;
+  pattern (i + 1) ppf x.vb_pat;
+  expression (i + 1) ppf x.vb_expr
+
+and record_field i ppf = function
+  | _, Overridden (li, e), opt ->
+    line i ppf "%a%s\n" fmt_longident li (if opt then "?" else "");
+    expression (i + 1) ppf e
+  | _, Kept _, _ -> line i ppf "<kept>"
+
+and label_x_expression i ppf (l, e) =
+  line i ppf "<arg>\n";
+  arg_label (i + 1) ppf l;
+  match e with
+  | None -> ()
+  | Some e -> expression (i + 1) ppf e
+
+and label_x_bool_x_core_type_list i ppf x =
+  match x with
+  | Ttag (l, attrs, b, ctl) ->
+    line i ppf "Ttag \"%s\" %s\n" l.txt (string_of_bool b);
+    attributes (i + 1) ppf attrs;
+    list (i + 1) core_type ppf ctl
+  | Tinherit ct ->
+    line i ppf "Tinherit\n";
+    core_type (i + 1) ppf ct
+
+let interface ppf x = list 0 signature_item ppf x.sig_items
+
+let implementation ppf x = list 0 structure_item ppf x.str_items
+
+let implementation_with_coercion ppf (x, _) = implementation ppf x
diff --git a/jscomp/ml/printtyped.mli b/compiler/ml/printtyped.mli
similarity index 85%
rename from jscomp/ml/printtyped.mli
rename to compiler/ml/printtyped.mli
index ded42bb..11837f1 100644
--- a/jscomp/ml/printtyped.mli
+++ b/compiler/ml/printtyped.mli
@@ -13,11 +13,11 @@
 (*                                                                        *)
 (**************************************************************************)
 
-open Typedtree;;
-open Format;;
+open Typedtree
+open Format
 
-val interface : formatter -> signature -> unit;;
-val implementation : formatter -> structure -> unit;;
+val interface : formatter -> signature -> unit
+val implementation : formatter -> structure -> unit
 
 val implementation_with_coercion :
-    formatter -> (structure * module_coercion) -> unit;;
+  formatter -> structure * module_coercion -> unit
diff --git a/compiler/ml/rec_check.ml b/compiler/ml/rec_check.ml
new file mode 100644
index 0000000..3d016a7
--- /dev/null
+++ b/compiler/ml/rec_check.ml
@@ -0,0 +1,464 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+type error = Illegal_letrec_expr
+
+exception Error of Location.t * error
+
+module Rec_context = struct
+  type access =
+    | Dereferenced
+        (** [Dereferenced] indicates that the value (not just the address) of a
+        variable is accessed *)
+    | Guarded
+        (** [Guarded] indicates that the address of a variable is used in a
+        guarded context, i.e. under a constructor.  A variable that is
+        dereferenced within a function body or lazy context is also considered
+        guarded. *)
+    | Unguarded
+        (** [Unguarded] indicates that the address of a variable is used in an
+        unguarded context, i.e. not under a constructor. *)
+
+  (** [guard] represents guarded contexts such as [C -] and [{l = -}] *)
+  let guard : access -> access = function
+    | Dereferenced -> Dereferenced
+    | Guarded -> Guarded
+    | Unguarded -> Guarded
+
+  (** [inspect] represents elimination contexts such as [match - with cases],
+      [e -] and [- e] *)
+  let inspect : access -> access = function
+    | Dereferenced -> Dereferenced
+    | Guarded -> Dereferenced
+    | Unguarded -> Dereferenced
+
+  (** [delay] represents contexts that delay evaluation such as [fun p -> -]
+      or [lazy -] *)
+  let delay : access -> access = function
+    | Dereferenced -> Guarded
+    | Guarded -> Guarded
+    | Unguarded -> Guarded
+
+  module Use : sig
+    type t
+
+    val guard : t -> t
+    (** An expression appears in a guarded context *)
+
+    val discard : t -> t
+    (** The address of a subexpression is not used, but may be bound *)
+
+    val inspect : t -> t
+    (** The value of a subexpression is inspected with match, application, etc. *)
+
+    val delay : t -> t
+    (** An expression appears under 'fun p ->' or 'lazy' *)
+
+    val join : t -> t -> t
+    (** Combine the access information of two expressions *)
+
+    val single : Ident.t -> access -> t
+    (** Combine the access information of two expressions *)
+
+    val empty : t
+    (** No variables are accessed in an expression; it might be a
+        constant or a global identifier *)
+
+    val unguarded : t -> Ident.t list
+    (** The list of identifiers that are used in an unguarded context *)
+
+    val dependent : t -> Ident.t list
+    (** The list of all used identifiers *)
+  end = struct
+    module M = Map.Make (Ident)
+
+    type t = access M.t
+    (** A "t" maps each rec-bound variable to an access status *)
+
+    let map f tbl = M.map f tbl
+
+    let guard t = map guard t
+
+    let inspect t = map inspect t
+
+    let delay t = map delay t
+
+    let discard = guard
+
+    let prec x y =
+      match (x, y) with
+      | Dereferenced, _ | _, Dereferenced -> Dereferenced
+      | Unguarded, _ | _, Unguarded -> Unguarded
+      | _ -> Guarded
+
+    let join x y =
+      M.fold
+        (fun id v tbl ->
+          let v' = try M.find id tbl with Not_found -> Guarded in
+          M.add id (prec v v') tbl)
+        x y
+
+    let single id access = M.add id access M.empty
+
+    let empty = M.empty
+
+    let list_matching p t =
+      let r = ref [] in
+      M.iter (fun id v -> if p v then r := id :: !r) t;
+      !r
+
+    let unguarded =
+      list_matching (function
+        | Unguarded | Dereferenced -> true
+        | _ -> false)
+
+    let dependent = list_matching (function _ -> true)
+  end
+
+  module Env = struct
+    (* A typing environment maps identifiers to types *)
+    type env = Use.t Ident.tbl
+
+    let empty = Ident.empty
+
+    let join x y =
+      let r =
+        Ident.fold_all
+          (fun id v tbl ->
+            let v' = try Ident.find_same id tbl with Not_found -> Use.empty in
+            Ident.add id (Use.join v v') tbl)
+          x y
+      in
+      r
+  end
+end
+
+let rec pattern_variables : Typedtree.pattern -> Ident.t list =
+ fun pat ->
+  match pat.pat_desc with
+  | Tpat_any -> []
+  | Tpat_var (id, _) -> [id]
+  | Tpat_alias (pat, id, _) -> id :: pattern_variables pat
+  | Tpat_constant _ -> []
+  | Tpat_tuple pats -> List.concat (List.map pattern_variables pats)
+  | Tpat_construct (_, _, pats) -> List.concat (List.map pattern_variables pats)
+  | Tpat_variant (_, Some pat, _) -> pattern_variables pat
+  | Tpat_variant (_, None, _) -> []
+  | Tpat_record (fields, _) ->
+    List.concat (List.map (fun (_, _, p, _) -> pattern_variables p) fields)
+  | Tpat_array pats -> List.concat (List.map pattern_variables pats)
+  | Tpat_or (l, r, _) -> pattern_variables l @ pattern_variables r
+
+open Rec_context
+open Asttypes
+open Typedtree
+
+let build_unguarded_env : Ident.t list -> Env.env =
+ fun idlist ->
+  List.fold_left
+    (fun env id -> Ident.add id (Use.single id Unguarded) env)
+    Env.empty idlist
+
+let is_ref : Types.value_description -> bool = function
+  | {
+      Types.val_kind =
+        Types.Val_prim {Primitive.prim_name = "%makeref"; prim_arity = 1};
+    } ->
+    true
+  | _ -> false
+
+type sd = Static | Dynamic
+
+let value_default f ~default a =
+  match a with
+  | None -> default
+  | Some a -> f a
+
+let rec classify_expression : Typedtree.expression -> sd =
+ fun exp ->
+  match exp.exp_desc with
+  | Texp_let (_, _, e)
+  | Texp_letmodule (_, _, _, e)
+  | Texp_sequence (_, e)
+  | Texp_letexception (_, e) ->
+    classify_expression e
+  | Texp_ident _ | Texp_for _ | Texp_constant _ | Texp_tuple _ | Texp_array _
+  | Texp_construct _ | Texp_variant _ | Texp_record _ | Texp_setfield _
+  | Texp_while _ | Texp_pack _ | Texp_function _ | Texp_extension_constructor _
+    ->
+    Static
+  | Texp_apply {funct = {exp_desc = Texp_ident (_, _, vd)}} when is_ref vd ->
+    Static
+  | Texp_apply _ | Texp_match _ | Texp_ifthenelse _ | Texp_send _ | Texp_field _
+  | Texp_assert _ | Texp_try _ ->
+    Dynamic
+
+let rec expression : Env.env -> Typedtree.expression -> Use.t =
+ fun env exp ->
+  match exp.exp_desc with
+  | Texp_ident (pth, _, _) -> path env pth
+  | Texp_let (rec_flag, bindings, body) ->
+    let env', ty = value_bindings rec_flag env bindings in
+    (* Here and in other binding constructs 'discard' is used in a
+       similar way to the way it's used in sequence: uses are
+       propagated, but unguarded access are not. *)
+    Use.join (Use.discard ty) (expression (Env.join env env') body)
+  | Texp_letmodule (x, _, m, e) ->
+    let ty = modexp env m in
+    Use.join (Use.discard ty) (expression (Ident.add x ty env) e)
+  | Texp_match (e, val_cases, exn_cases, _) ->
+    let t = expression env e in
+    let exn_case env {Typedtree.c_rhs} = expression env c_rhs in
+    let cs = list (case ~scrutinee:t) env val_cases
+    and es = list exn_case env exn_cases in
+    Use.(join cs es)
+  | Texp_for (_, _, e1, e2, _, e3) ->
+    Use.(
+      join
+        (join (inspect (expression env e1)) (inspect (expression env e2)))
+        (* The body is evaluated, but not used, and not available
+           for inclusion in another value *)
+        (discard (expression env e3)))
+  | Texp_constant _ -> Use.empty
+  | Texp_apply
+      {funct = {exp_desc = Texp_ident (_, _, vd)}; args = [(_, Some arg)]}
+    when is_ref vd ->
+    Use.guard (expression env arg)
+  | Texp_apply {funct = e; args} ->
+    let arg env (_, eo) = option expression env eo in
+    Use.(join (inspect (expression env e)) (inspect (list arg env args)))
+  | Texp_tuple exprs -> Use.guard (list expression env exprs)
+  | Texp_array exprs -> Use.guard (list expression env exprs)
+  | Texp_construct (_, desc, exprs) ->
+    let access_constructor =
+      match desc.cstr_tag with
+      | Cstr_extension pth -> Use.inspect (path env pth)
+      | _ -> Use.empty
+    in
+    let use =
+      match desc.cstr_tag with
+      | Cstr_unboxed -> fun x -> x
+      | Cstr_constant _ | Cstr_block _ | Cstr_extension _ -> Use.guard
+    in
+    Use.join access_constructor (use (list expression env exprs))
+  | Texp_variant (_, eo) -> Use.guard (option expression env eo)
+  | Texp_record {fields = es; extended_expression = eo; representation = rep} ->
+    let use =
+      match rep with
+      | Record_unboxed _ -> fun x -> x
+      | Record_float_unused -> assert false
+      | Record_regular | Record_inlined _ | Record_extension -> Use.guard
+    in
+    let field env = function
+      | _, Kept _, _ -> Use.empty
+      | _, Overridden (_, e), _ -> expression env e
+    in
+    Use.join (use (array field env es)) (option expression env eo)
+  | Texp_ifthenelse (cond, ifso, ifnot) ->
+    Use.(
+      join
+        (inspect (expression env cond))
+        (join (expression env ifso) (option expression env ifnot)))
+  | Texp_setfield (e1, _, _, e2) ->
+    Use.(join (inspect (expression env e1)) (inspect (expression env e2)))
+  | Texp_sequence (e1, e2) ->
+    Use.(join (discard (expression env e1)) (expression env e2))
+  | Texp_while (e1, e2) ->
+    Use.(join (inspect (expression env e1)) (discard (expression env e2)))
+  | Texp_send (e1, _, eo) ->
+    Use.(
+      join (inspect (expression env e1)) (inspect (option expression env eo)))
+  | Texp_field (e, _, _) -> Use.(inspect (expression env e))
+  | Texp_letexception (_, e) -> expression env e
+  | Texp_assert e -> Use.inspect (expression env e)
+  | Texp_pack m -> modexp env m
+  | Texp_try (e, cases) ->
+    (* This is more permissive than the old check. *)
+    let case env {Typedtree.c_rhs} = expression env c_rhs in
+    Use.join (expression env e) (list case env cases)
+  | Texp_function {case = case_} ->
+    Use.delay (list (case ~scrutinee:Use.empty) env [case_])
+  | Texp_extension_constructor _ -> Use.empty
+
+and option : 'a. (Env.env -> 'a -> Use.t) -> Env.env -> 'a option -> Use.t =
+ fun f env -> value_default (f env) ~default:Use.empty
+
+and list : 'a. (Env.env -> 'a -> Use.t) -> Env.env -> 'a list -> Use.t =
+ fun f env ->
+  List.fold_left (fun typ item -> Use.join (f env item) typ) Use.empty
+
+and array : 'a. (Env.env -> 'a -> Use.t) -> Env.env -> 'a array -> Use.t =
+ fun f env ->
+  Array.fold_left (fun typ item -> Use.join (f env item) typ) Use.empty
+
+and modexp : Env.env -> Typedtree.module_expr -> Use.t =
+ fun env m ->
+  match m.mod_desc with
+  | Tmod_ident (pth, _) -> path env pth
+  | Tmod_structure s -> structure env s
+  | Tmod_functor (_, _, _, e) -> Use.delay (modexp env e)
+  | Tmod_apply (f, p, _) ->
+    Use.(join (inspect (modexp env f)) (inspect (modexp env p)))
+  | Tmod_constraint (m, _, _, Tcoerce_none) -> modexp env m
+  | Tmod_constraint (m, _, _, _) -> Use.inspect (modexp env m)
+  | Tmod_unpack (e, _) -> expression env e
+
+and path : Env.env -> Path.t -> Use.t =
+ fun env pth ->
+  match pth with
+  | Path.Pident x -> ( try Ident.find_same x env with Not_found -> Use.empty)
+  | Path.Pdot (t, _, _) -> Use.inspect (path env t)
+  | Path.Papply (f, p) -> Use.(inspect (join (path env f) (path env p)))
+
+and structure : Env.env -> Typedtree.structure -> Use.t =
+ fun env s ->
+  let _, ty =
+    List.fold_left
+      (fun (env, ty) item ->
+        let env', ty' = structure_item env item in
+        (Env.join env env', Use.join ty ty'))
+      (env, Use.empty) s.str_items
+  in
+  Use.guard ty
+
+and structure_item : Env.env -> Typedtree.structure_item -> Env.env * Use.t =
+ fun env s ->
+  match s.str_desc with
+  | Tstr_eval (e, _) -> (Env.empty, expression env e)
+  | Tstr_value (rec_flag, valbinds) -> value_bindings rec_flag env valbinds
+  | Tstr_module {mb_id; mb_expr} ->
+    let ty = modexp env mb_expr in
+    (Ident.add mb_id ty Env.empty, ty)
+  | Tstr_recmodule mbs ->
+    let modbind env {mb_expr} = modexp env mb_expr in
+    (* Over-approximate: treat any access as a use *)
+    (Env.empty, Use.inspect (list modbind env mbs))
+  | Tstr_primitive _ -> (Env.empty, Use.empty)
+  | Tstr_type _ -> (Env.empty, Use.empty)
+  | Tstr_typext _ -> (Env.empty, Use.empty)
+  | Tstr_exception _ -> (Env.empty, Use.empty)
+  | Tstr_modtype _ -> (Env.empty, Use.empty)
+  | Tstr_open _ -> (Env.empty, Use.empty)
+  | Tstr_include inc ->
+    (* This is a kind of projection.  There's no need to add
+       anything to the environment because everything is used in
+       the type component already *)
+    (Env.empty, Use.inspect (modexp env inc.incl_mod))
+  | Tstr_attribute _ -> (Env.empty, Use.empty)
+
+and case : Env.env -> Typedtree.case -> scrutinee:Use.t -> Use.t =
+ fun env {Typedtree.c_lhs; c_guard; c_rhs} ~scrutinee:ty ->
+  let ty =
+    if is_destructuring_pattern c_lhs then Use.inspect ty else Use.discard ty
+    (* as in 'let' *)
+  in
+  let vars = pattern_variables c_lhs in
+  let env = List.fold_left (fun env id -> Ident.add id ty env) env vars in
+  Use.(
+    join ty
+      (join (expression env c_rhs) (inspect (option expression env c_guard))))
+
+and value_bindings :
+    rec_flag -> Env.env -> Typedtree.value_binding list -> Env.env * Use.t =
+ fun rec_flag env bindings ->
+  match rec_flag with
+  | Recursive ->
+    (* Approximation:
+          let rec y =
+            let rec x1 = e1
+                and x2 = e2
+              in e
+       treated as
+          let rec y =
+             let rec x = (e1, e2)[x1:=fst x, x2:=snd x] in
+                e[x1:=fst x, x2:=snd x]
+       Further, use the fact that x1,x2 cannot occur unguarded in e1, e2
+       to avoid recursive trickiness.
+    *)
+    let ids, ty =
+      List.fold_left
+        (fun (pats, tys) {vb_pat = p; vb_expr = e} ->
+          (pattern_variables p @ pats, Use.join (expression env e) tys))
+        ([], Use.empty) bindings
+    in
+    ( List.fold_left
+        (fun (env : Env.env) (id : Ident.t) -> Ident.add id ty env)
+        Env.empty ids,
+      ty )
+  | Nonrecursive ->
+    List.fold_left
+      (fun (env2, ty) binding ->
+        let env', ty' = value_binding env binding in
+        (Env.join env2 env', Use.join ty ty'))
+      (Env.empty, Use.empty) bindings
+
+and value_binding : Env.env -> Typedtree.value_binding -> Env.env * Use.t =
+ (* NB: returns new environment only *)
+ fun env {vb_pat; vb_expr} ->
+  let vars = pattern_variables vb_pat in
+  let ty = expression env vb_expr in
+  let ty = if is_destructuring_pattern vb_pat then Use.inspect ty else ty in
+  (List.fold_left (fun env id -> Ident.add id ty env) Env.empty vars, ty)
+
+and is_destructuring_pattern : Typedtree.pattern -> bool =
+ fun pat ->
+  match pat.pat_desc with
+  | Tpat_any -> false
+  | Tpat_var (_, _) -> false
+  | Tpat_alias (pat, _, _) -> is_destructuring_pattern pat
+  | Tpat_constant _ -> true
+  | Tpat_tuple _ -> true
+  | Tpat_construct (_, _, _) -> true
+  | Tpat_variant _ -> true
+  | Tpat_record (_, _) -> true
+  | Tpat_array _ -> true
+  | Tpat_or (l, r, _) ->
+    is_destructuring_pattern l || is_destructuring_pattern r
+
+let check_recursive_expression idlist expr =
+  let ty = expression (build_unguarded_env idlist) expr in
+  match (Use.unguarded ty, Use.dependent ty, classify_expression expr) with
+  | _ :: _, _, _ (* The expression inspects rec-bound variables *)
+  | _, _ :: _, Dynamic ->
+    (* The expression depends on rec-bound variables
+       and its size is unknown *)
+    raise (Error (expr.exp_loc, Illegal_letrec_expr))
+  | [], _, Static (* The expression has known size *) | [], [], Dynamic ->
+    (* The expression has unknown size,
+       but does not depend on rec-bound variables *)
+    ()
+
+let check_recursive_bindings valbinds =
+  let ids =
+    List.concat (List.map (fun b -> pattern_variables b.vb_pat) valbinds)
+  in
+  Ext_list.iter valbinds (fun {vb_expr} ->
+      match vb_expr.exp_desc with
+      | Texp_record
+          {fields = [|(_, Overridden (_, {exp_desc = Texp_function _}), _)|]}
+      | Texp_function _ ->
+        ()
+      (*TODO: add uncurried function too*)
+      | _ -> check_recursive_expression ids vb_expr)
+
+let report_error ppf = function
+  | Illegal_letrec_expr ->
+    Format.fprintf ppf
+      "This kind of expression is not allowed as right-hand side of `let rec'"
+
+let () =
+  Location.register_error_of_exn (function
+    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
+    | _ -> None)
diff --git a/compiler/ml/rec_check.mli b/compiler/ml/rec_check.mli
new file mode 100644
index 0000000..28469fa
--- /dev/null
+++ b/compiler/ml/rec_check.mli
@@ -0,0 +1 @@
+val check_recursive_bindings : Typedtree.value_binding list -> unit
diff --git a/compiler/ml/record_coercion.ml b/compiler/ml/record_coercion.ml
new file mode 100644
index 0000000..1c14225
--- /dev/null
+++ b/compiler/ml/record_coercion.ml
@@ -0,0 +1,60 @@
+type record_field_subtype_violation =
+  | Optional_mismatch of {
+      label: string;
+      left_optional: bool;
+      right_optional: bool;
+    }
+  | Field_runtime_name_mismatch of {
+      label: string;
+      left_as: string option;
+      right_as: string option;
+    }
+  | Field_missing of {label: string}
+
+let check_record_fields (fields1 : Types.label_declaration list)
+    (fields2 : Types.label_declaration list) =
+  let violations = ref [] in
+  let add_violation v = violations := v :: !violations in
+  let label_decl_sub (acc1, acc2) (ld2 : Types.label_declaration) =
+    match
+      Ext_list.find_first fields1 (fun ld1 -> ld1.ld_id.name = ld2.ld_id.name)
+    with
+    | Some ld1 ->
+      if ld1.ld_optional <> ld2.ld_optional then
+        (* optional field can't be modified *)
+        add_violation
+          (Optional_mismatch
+             {
+               label = ld1.ld_id.name;
+               left_optional = ld1.ld_optional;
+               right_optional = ld2.ld_optional;
+             });
+      let get_as (({txt}, payload) : Parsetree.attribute) =
+        if txt = "as" then Ast_payload.is_single_string payload else None
+      in
+      let get_as_name (ld : Types.label_declaration) =
+        match Ext_list.filter_map ld.ld_attributes get_as with
+        | [] -> None
+        | (s, _) :: _ -> Some s
+      in
+      let get_label_runtime_name (ld : Types.label_declaration) =
+        match get_as_name ld with
+        | None -> ld.ld_id.name
+        | Some s -> s
+      in
+      if get_label_runtime_name ld1 <> get_label_runtime_name ld2 then
+        add_violation
+          (Field_runtime_name_mismatch
+             {
+               label = ld1.ld_id.name;
+               left_as = get_as_name ld1;
+               right_as = get_as_name ld2;
+             });
+      (ld1.ld_type :: acc1, ld2.ld_type :: acc2)
+    | None ->
+      (* field must be present *)
+      add_violation (Field_missing {label = ld2.ld_id.name});
+      (acc1, acc2)
+  in
+  let tl1, tl2 = List.fold_left label_decl_sub ([], []) fields2 in
+  (!violations, tl1, tl2)
diff --git a/compiler/ml/record_type_spread.ml b/compiler/ml/record_type_spread.ml
new file mode 100644
index 0000000..bf7b286
--- /dev/null
+++ b/compiler/ml/record_type_spread.ml
@@ -0,0 +1,140 @@
+module StringMap = Map.Make (String)
+
+let t_equals t1 t2 = t1.Types.level = t2.Types.level && t1.id = t2.id
+
+let substitute_types ~type_map (t : Types.type_expr) =
+  if StringMap.is_empty type_map then t
+  else
+    let apply_substitution type_variable_name t =
+      match StringMap.find_opt type_variable_name type_map with
+      | None -> t
+      | Some substituted_type -> substituted_type
+    in
+    let rec loop (t : Types.type_expr) =
+      match t.desc with
+      | Tlink t -> {t with desc = Tlink (loop t)}
+      | Tvar (Some type_variable_name) ->
+        apply_substitution type_variable_name t
+      | Tvar None -> t
+      | Tunivar _ -> t
+      | Tconstr (path, args, _memo) ->
+        {t with desc = Tconstr (path, args |> List.map loop, ref Types.Mnil)}
+      | Tsubst t -> {t with desc = Tsubst (loop t)}
+      | Tvariant rd -> {t with desc = Tvariant (row_desc rd)}
+      | Tnil -> t
+      | Tarrow (arg, ret, c, arity) ->
+        {
+          t with
+          desc = Tarrow ({arg with typ = loop arg.typ}, loop ret, c, arity);
+        }
+      | Ttuple tl -> {t with desc = Ttuple (tl |> List.map loop)}
+      | Tobject (t, r) -> {t with desc = Tobject (loop t, r)}
+      | Tfield (n, k, t1, t2) -> {t with desc = Tfield (n, k, loop t1, loop t2)}
+      | Tpoly (t, []) -> loop t
+      | Tpoly (t, tl) -> {t with desc = Tpoly (loop t, tl |> List.map loop)}
+      | Tpackage (p, l, tl) ->
+        {t with desc = Tpackage (p, l, tl |> List.map loop)}
+    and row_desc (rd : Types.row_desc) =
+      let row_fields =
+        rd.row_fields |> List.map (fun (l, rf) -> (l, row_field rf))
+      in
+      let row_more = loop rd.row_more in
+      let row_name =
+        match rd.row_name with
+        | None -> None
+        | Some (p, tl) -> Some (p, tl |> List.map loop)
+      in
+      {rd with row_fields; row_more; row_name}
+    and row_field (rf : Types.row_field) =
+      match rf with
+      | Rpresent None -> rf
+      | Rpresent (Some t) -> Rpresent (Some (loop t))
+      | Reither (b1, tl, b2, r) -> Reither (b1, tl |> List.map loop, b2, r)
+      | Rabsent -> Rabsent
+    in
+    loop t
+
+let substitute_type_vars (type_vars : (string * Types.type_expr) list)
+    (typ : Types.type_expr) =
+  let type_map =
+    type_vars
+    |> List.fold_left
+         (fun acc (tvar_name, tvar_typ) -> StringMap.add tvar_name tvar_typ acc)
+         StringMap.empty
+  in
+  substitute_types ~type_map typ
+
+let has_type_spread (lbls : Typedtree.label_declaration list) =
+  lbls
+  |> List.exists (fun (l : Typedtree.label_declaration) ->
+         match l with
+         | {ld_name = {txt = "..."}} -> true
+         | _ -> false)
+
+let extract_type_vars (type_params : Types.type_expr list)
+    (typ : Types.type_expr) =
+  (* The type variables applied to the record spread itself. *)
+  let applied_type_vars =
+    match Ctype.repr typ with
+    | {desc = Tpoly ({desc = Tconstr (_, tvars, _)}, _)} -> tvars
+    | _ -> []
+  in
+  if List.length type_params = List.length applied_type_vars then
+    (* Track which type param in the record we're spreading
+       belongs to which type variable applied to the spread itself. *)
+    let paired_type_vars = List.combine type_params applied_type_vars in
+    paired_type_vars
+    |> List.filter_map (fun (t, applied_tvar) ->
+           match t.Types.desc with
+           | Tvar (Some tname) -> Some (tname, applied_tvar)
+           | _ -> None)
+  else []
+
+let expand_labels_with_type_spreads (env : Env.t)
+    (lbls : Typedtree.label_declaration list)
+    (lbls' : Types.label_declaration list) =
+  match has_type_spread lbls with
+  | false -> Some (lbls, lbls')
+  | true ->
+    let rec extract (t : Types.type_expr) =
+      match t.desc with
+      | Tpoly (t, []) -> extract t
+      | _ -> Ctype.repr t
+    in
+    let mk_lbl (l : Types.label_declaration) (ld_type : Typedtree.core_type)
+        (type_vars : (string * Types.type_expr) list) :
+        Typedtree.label_declaration =
+      {
+        ld_id = l.ld_id;
+        ld_name = {txt = Ident.name l.ld_id; loc = l.ld_loc};
+        ld_mutable = l.ld_mutable;
+        ld_optional = l.ld_optional;
+        ld_type =
+          {ld_type with ctyp_type = substitute_type_vars type_vars l.ld_type};
+        ld_loc = l.ld_loc;
+        ld_attributes = l.ld_attributes;
+      }
+    in
+    let rec process_lbls acc (lbls : Typedtree.label_declaration list)
+        (lbls' : Types.label_declaration list) =
+      match (lbls, lbls') with
+      | {ld_name = {txt = "..."}; ld_type} :: rest, _ :: rest' -> (
+        match
+          Ctype.extract_concrete_typedecl env (extract ld_type.ctyp_type)
+        with
+        | _p0, _p, {type_kind = Type_record (fields, _repr); type_params} ->
+          let type_vars = extract_type_vars type_params ld_type.ctyp_type in
+          process_lbls
+            ( fst acc @ Ext_list.map fields (fun l -> mk_lbl l ld_type type_vars),
+              snd acc
+              @ Ext_list.map fields (fun l ->
+                    {l with ld_type = substitute_type_vars type_vars l.ld_type})
+            )
+            rest rest'
+        | _ -> None
+        | exception _ -> None)
+      | lbl :: rest, lbl' :: rest' ->
+        process_lbls (fst acc @ [lbl], snd acc @ [lbl']) rest rest'
+      | _ -> Some acc
+    in
+    process_lbls ([], []) lbls lbls'
diff --git a/compiler/ml/stypes.ml b/compiler/ml/stypes.ml
new file mode 100644
index 0000000..0584b16
--- /dev/null
+++ b/compiler/ml/stypes.ml
@@ -0,0 +1,188 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*           Damien Doligez, projet Moscova, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 2003 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Recording and dumping (partial) type information *)
+
+(*
+  We record all types in a list as they are created.
+  This means we can dump type information even if type inference fails,
+  which is extremely important, since type information is most
+  interesting in case of errors.
+*)
+
+open Annot
+open Lexing
+open Location
+open Typedtree
+
+let output_int oc i = output_string oc (string_of_int i)
+
+type annotation =
+  | Ti_pat of pattern
+  | Ti_expr of expression
+  | Ti_class of unit
+  | Ti_mod of module_expr
+  | An_call of Location.t * Annot.call
+  | An_ident of Location.t * string * Annot.ident
+
+let get_location ti =
+  match ti with
+  | Ti_pat p -> p.pat_loc
+  | Ti_expr e -> e.exp_loc
+  | Ti_class () -> assert false
+  | Ti_mod m -> m.mod_loc
+  | An_call (l, _k) -> l
+  | An_ident (l, _s, _k) -> l
+
+let annotations = ref ([] : annotation list)
+let phrases = ref ([] : Location.t list)
+
+let record ti =
+  if !Clflags.annotations && not (get_location ti).Location.loc_ghost then
+    annotations := ti :: !annotations
+
+let record_phrase loc = if !Clflags.annotations then phrases := loc :: !phrases
+
+(* comparison order:
+   the intervals are sorted by order of increasing upper bound
+   same upper bound -> sorted by decreasing lower bound
+*)
+let cmp_loc_inner_first loc1 loc2 =
+  match compare loc1.loc_end.pos_cnum loc2.loc_end.pos_cnum with
+  | 0 -> compare loc2.loc_start.pos_cnum loc1.loc_start.pos_cnum
+  | x -> x
+let cmp_ti_inner_first ti1 ti2 =
+  cmp_loc_inner_first (get_location ti1) (get_location ti2)
+
+let print_position pp pos =
+  if pos = dummy_pos then output_string pp "--"
+  else (
+    output_char pp '\"';
+    output_string pp (String.escaped pos.pos_fname);
+    output_string pp "\" ";
+    output_int pp pos.pos_lnum;
+    output_char pp ' ';
+    output_int pp pos.pos_bol;
+    output_char pp ' ';
+    output_int pp pos.pos_cnum)
+
+let print_location pp loc =
+  print_position pp loc.loc_start;
+  output_char pp ' ';
+  print_position pp loc.loc_end
+
+let sort_filter_phrases () =
+  let ph = List.sort (fun x y -> cmp_loc_inner_first y x) !phrases in
+  let rec loop accu cur l =
+    match l with
+    | [] -> accu
+    | loc :: t ->
+      if
+        cur.loc_start.pos_cnum <= loc.loc_start.pos_cnum
+        && cur.loc_end.pos_cnum >= loc.loc_end.pos_cnum
+      then loop accu cur t
+      else loop (loc :: accu) loc t
+  in
+  phrases := loop [] Location.none ph
+
+let rec printtyp_reset_maybe loc =
+  match !phrases with
+  | cur :: t when cur.loc_start.pos_cnum <= loc.loc_start.pos_cnum ->
+    Printtyp.reset ();
+    phrases := t;
+    printtyp_reset_maybe loc
+  | _ -> ()
+
+let call_kind_string k =
+  match k with
+  | Tail -> "tail"
+  | Stack -> "stack"
+  | Inline -> "inline"
+
+let print_ident_annot pp str k =
+  match k with
+  | Idef l ->
+    output_string pp "def ";
+    output_string pp str;
+    output_char pp ' ';
+    print_location pp l;
+    output_char pp '\n'
+  | Iref_internal l ->
+    output_string pp "int_ref ";
+    output_string pp str;
+    output_char pp ' ';
+    print_location pp l;
+    output_char pp '\n'
+  | Iref_external ->
+    output_string pp "ext_ref ";
+    output_string pp str;
+    output_char pp '\n'
+
+(* The format of the annotation file is documented in emacs/caml-types.el. *)
+
+let print_info pp prev_loc ti =
+  match ti with
+  | Ti_class _ | Ti_mod _ -> prev_loc
+  | Ti_pat {pat_loc = loc; pat_type = typ; pat_env = env}
+  | Ti_expr {exp_loc = loc; exp_type = typ; exp_env = env} ->
+    if loc <> prev_loc then (
+      print_location pp loc;
+      output_char pp '\n');
+    output_string pp "type(\n";
+    printtyp_reset_maybe loc;
+    Printtyp.mark_loops typ;
+    Format.pp_print_string Format.str_formatter "  ";
+    Printtyp.wrap_printing_env env (fun () ->
+        Printtyp.type_sch Format.str_formatter typ);
+    Format.pp_print_newline Format.str_formatter ();
+    let s = Format.flush_str_formatter () in
+    output_string pp s;
+    output_string pp ")\n";
+    loc
+  | An_call (loc, k) ->
+    if loc <> prev_loc then (
+      print_location pp loc;
+      output_char pp '\n');
+    output_string pp "call(\n  ";
+    output_string pp (call_kind_string k);
+    output_string pp "\n)\n";
+    loc
+  | An_ident (loc, str, k) ->
+    if loc <> prev_loc then (
+      print_location pp loc;
+      output_char pp '\n');
+    output_string pp "ident(\n  ";
+    print_ident_annot pp str k;
+    output_string pp ")\n";
+    loc
+
+let get_info () =
+  let info = List.fast_sort cmp_ti_inner_first !annotations in
+  annotations := [];
+  info
+
+let dump filename =
+  if !Clflags.annotations then (
+    let do_dump _temp_filename pp =
+      let info = get_info () in
+      sort_filter_phrases ();
+      ignore (List.fold_left (print_info pp) Location.none info)
+    in
+    (match filename with
+    | None -> do_dump "" stdout
+    | Some filename ->
+      Misc.output_to_file_via_temporary ~mode:[Open_text] filename do_dump);
+    phrases := [])
+  else annotations := []
diff --git a/jscomp/ml/stypes.mli b/compiler/ml/stypes.mli
similarity index 81%
rename from jscomp/ml/stypes.mli
rename to compiler/ml/stypes.mli
index 770956c..3182f7e 100644
--- a/jscomp/ml/stypes.mli
+++ b/compiler/ml/stypes.mli
@@ -17,20 +17,19 @@
 
 (* Clflags.save_types must be true *)
 
-open Typedtree;;
+open Typedtree
 
 type annotation =
-  | Ti_pat   of pattern
-  | Ti_expr  of expression
+  | Ti_pat of pattern
+  | Ti_expr of expression
   | Ti_class of unit
-  | Ti_mod   of module_expr
+  | Ti_mod of module_expr
   | An_call of Location.t * Annot.call
   | An_ident of Location.t * string * Annot.ident
-;;
 
-val record : annotation -> unit;;
-val record_phrase : Location.t -> unit;;
-val dump : string option -> unit;;
+val record : annotation -> unit
+val record_phrase : Location.t -> unit
+val dump : string option -> unit
 
-val get_location : annotation -> Location.t;;
-val get_info : unit -> annotation list;;
+val get_location : annotation -> Location.t
+val get_info : unit -> annotation list
diff --git a/compiler/ml/subst.ml b/compiler/ml/subst.ml
new file mode 100644
index 0000000..b30d32c
--- /dev/null
+++ b/compiler/ml/subst.ml
@@ -0,0 +1,392 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Substitutions *)
+
+open Misc
+open Path
+open Types
+open Btype
+
+type type_replacement =
+  | Path of Path.t
+  | Type_function of {params: type_expr list; body: type_expr}
+
+module PathMap = Map.Make (Path)
+
+type t = {
+  types: type_replacement PathMap.t;
+  modules: Path.t PathMap.t;
+  modtypes: (Ident.t, module_type) Tbl.t;
+  for_saving: bool;
+}
+
+let identity =
+  {
+    types = PathMap.empty;
+    modules = PathMap.empty;
+    modtypes = Tbl.empty;
+    for_saving = false;
+  }
+
+let add_type_path id p s = {s with types = PathMap.add id (Path p) s.types}
+let add_type id p s = add_type_path (Pident id) p s
+
+let add_type_function id ~params ~body s =
+  {s with types = PathMap.add id (Type_function {params; body}) s.types}
+
+let add_module_path id p s = {s with modules = PathMap.add id p s.modules}
+let add_module id p s = add_module_path (Pident id) p s
+
+let add_modtype id ty s = {s with modtypes = Tbl.add id ty s.modtypes}
+
+let for_saving s = {s with for_saving = true}
+
+let loc s x =
+  if s.for_saving && not !Clflags.keep_locs then Location.none else x
+
+let remove_loc =
+  let open Ast_mapper in
+  {default_mapper with location = (fun _this _loc -> Location.none)}
+
+let attrs s x =
+  if s.for_saving && not !Clflags.keep_locs then
+    remove_loc.Ast_mapper.attributes remove_loc x
+  else x
+
+let rec module_path s path =
+  try PathMap.find path s.modules
+  with Not_found -> (
+    match path with
+    | Pident _ -> path
+    | Pdot (p, n, pos) -> Pdot (module_path s p, n, pos)
+    | Papply (p1, p2) -> Papply (module_path s p1, module_path s p2))
+
+let modtype_path s = function
+  | Pident id as p -> (
+    try
+      match Tbl.find id s.modtypes with
+      | Mty_ident p -> p
+      | _ -> fatal_error "Subst.modtype_path"
+    with Not_found -> p)
+  | Pdot (p, n, pos) -> Pdot (module_path s p, n, pos)
+  | Papply _ -> fatal_error "Subst.modtype_path"
+
+let type_path s path =
+  match PathMap.find path s.types with
+  | Path p -> p
+  | Type_function _ -> assert false
+  | exception Not_found -> (
+    match path with
+    | Pident _ -> path
+    | Pdot (p, n, pos) -> Pdot (module_path s p, n, pos)
+    | Papply _ -> fatal_error "Subst.type_path")
+
+let type_path s p =
+  match Path.constructor_typath p with
+  | Regular p -> type_path s p
+  | Cstr (ty_path, cstr) -> Pdot (type_path s ty_path, cstr, nopos)
+  | LocalExt _ -> type_path s p
+  | Ext (p, cstr) -> Pdot (module_path s p, cstr, nopos)
+
+let to_subst_by_type_function s p =
+  match PathMap.find p s.types with
+  | Path _ -> false
+  | Type_function _ -> true
+  | exception Not_found -> false
+
+(* Special type ids for saved signatures *)
+
+let new_id = ref (-1)
+let reset_for_saving () = new_id := -1
+
+let newpersty desc =
+  decr new_id;
+  {desc; level = generic_level; id = !new_id}
+
+(* ensure that all occurrences of 'Tvar None' are physically shared *)
+let tvar_none = Tvar None
+let tunivar_none = Tunivar None
+let norm = function
+  | Tvar None -> tvar_none
+  | Tunivar None -> tunivar_none
+  | d -> d
+
+let ctype_apply_env_empty = ref (fun _ -> assert false)
+
+(* Similar to [Ctype.nondep_type_rec]. *)
+let rec typexp s ty =
+  let ty = repr ty in
+  match ty.desc with
+  | (Tvar _ | Tunivar _) as desc ->
+    if s.for_saving || ty.id < 0 then (
+      let ty' =
+        if s.for_saving then newpersty (norm desc) else newty2 ty.level desc
+      in
+      save_desc ty desc;
+      ty.desc <- Tsubst ty';
+      ty')
+    else ty
+  | Tsubst ty -> ty
+  | Tfield (m, k, _t1, _t2)
+    when (not s.for_saving) && m = dummy_method
+         && field_kind_repr k <> Fabsent
+         && (repr ty).level < generic_level ->
+    (* do not copy the type of self when it is not generalized *)
+    ty
+  (* cannot do it, since it would omit substitution
+     | Tvariant row when not (static_row row) ->
+         ty
+  *)
+  | _ ->
+    let desc = ty.desc in
+    save_desc ty desc;
+    let tm = row_of_type ty in
+    let has_fixed_row =
+      (not (is_Tconstr ty)) && is_constr_row ~allow_ident:false tm
+    in
+    (* Make a stub *)
+    let ty' = if s.for_saving then newpersty (Tvar None) else newgenvar () in
+    ty.desc <- Tsubst ty';
+    ty'.desc <-
+      (if has_fixed_row then
+         match tm.desc with
+         (* PR#7348 *)
+         | Tconstr (Pdot (m, i, pos), tl, _abbrev) ->
+           let i' = String.sub i 0 (String.length i - 4) in
+           Tconstr (type_path s (Pdot (m, i', pos)), tl, ref Mnil)
+         | _ -> assert false
+       else
+         match desc with
+         | Tconstr (p, args, _abbrev) -> (
+           let args = List.map (typexp s) args in
+           match PathMap.find p s.types with
+           | exception Not_found -> Tconstr (type_path s p, args, ref Mnil)
+           | Path _ -> Tconstr (type_path s p, args, ref Mnil)
+           | Type_function {params; body} ->
+             (!ctype_apply_env_empty params body args).desc)
+         | Tpackage (p, n, tl) ->
+           Tpackage (modtype_path s p, n, List.map (typexp s) tl)
+         | Tobject (t1, name) ->
+           Tobject
+             ( typexp s t1,
+               ref
+                 (match !name with
+                 | None -> None
+                 | Some (p, tl) ->
+                   if to_subst_by_type_function s p then None
+                   else Some (type_path s p, List.map (typexp s) tl)) )
+         | Tvariant row -> (
+           let row = row_repr row in
+           let more = repr row.row_more in
+           (* We must substitute in a subtle way *)
+           (* Tsubst takes a tuple containing the row var and the variant *)
+           match more.desc with
+           | Tsubst {desc = Ttuple [_; ty2]} ->
+             (* This variant type has been already copied *)
+             ty.desc <- Tsubst ty2;
+             (* avoid Tlink in the new type *)
+             Tlink ty2
+           | _ -> (
+             let dup =
+               s.for_saving || more.level = generic_level || static_row row
+               ||
+               match more.desc with
+               | Tconstr _ -> true
+               | _ -> false
+             in
+             (* Various cases for the row variable *)
+             let more' =
+               match more.desc with
+               | Tsubst ty -> ty
+               | Tconstr _ | Tnil -> typexp s more
+               | Tunivar _ | Tvar _ ->
+                 save_desc more more.desc;
+                 if s.for_saving then newpersty (norm more.desc)
+                 else if dup && is_Tvar more then newgenty more.desc
+                 else more
+               | _ -> assert false
+             in
+             (* Register new type first for recursion *)
+             more.desc <- Tsubst (newgenty (Ttuple [more'; ty']));
+             (* Return a new copy *)
+             let row = copy_row (typexp s) true row (not dup) more' in
+             match row.row_name with
+             | Some (p, tl) ->
+               Tvariant
+                 {
+                   row with
+                   row_name =
+                     (if to_subst_by_type_function s p then None
+                      else Some (type_path s p, tl));
+                 }
+             | None -> Tvariant row))
+         | Tfield (_label, kind, _t1, t2) when field_kind_repr kind = Fabsent ->
+           Tlink (typexp s t2)
+         | _ -> copy_type_desc (typexp s) desc);
+    ty'
+
+(*
+   Always make a copy of the type. If this is not done, type levels
+   might not be correct.
+*)
+let type_expr s ty =
+  let ty' = typexp s ty in
+  cleanup_types ();
+  ty'
+
+let label_declaration s l =
+  {
+    ld_id = l.ld_id;
+    ld_mutable = l.ld_mutable;
+    ld_optional = l.ld_optional;
+    ld_type = typexp s l.ld_type;
+    ld_loc = loc s l.ld_loc;
+    ld_attributes = attrs s l.ld_attributes;
+  }
+
+let constructor_arguments s = function
+  | Cstr_tuple l -> Cstr_tuple (List.map (typexp s) l)
+  | Cstr_record l -> Cstr_record (List.map (label_declaration s) l)
+
+let constructor_declaration s c =
+  {
+    cd_id = c.cd_id;
+    cd_args = constructor_arguments s c.cd_args;
+    cd_res = may_map (typexp s) c.cd_res;
+    cd_loc = loc s c.cd_loc;
+    cd_attributes = attrs s c.cd_attributes;
+  }
+
+let type_declaration s decl =
+  let decl =
+    {
+      type_params = List.map (typexp s) decl.type_params;
+      type_arity = decl.type_arity;
+      type_kind =
+        (match decl.type_kind with
+        | Type_abstract -> Type_abstract
+        | Type_variant cstrs ->
+          Type_variant (List.map (constructor_declaration s) cstrs)
+        | Type_record (lbls, rep) ->
+          Type_record (List.map (label_declaration s) lbls, rep)
+        | Type_open -> Type_open);
+      type_manifest =
+        (match decl.type_manifest with
+        | None -> None
+        | Some ty -> Some (typexp s ty));
+      type_private = decl.type_private;
+      type_variance = decl.type_variance;
+      type_newtype_level = None;
+      type_loc = loc s decl.type_loc;
+      type_attributes = attrs s decl.type_attributes;
+      type_immediate = decl.type_immediate;
+      type_unboxed = decl.type_unboxed;
+      type_inlined_types = decl.type_inlined_types;
+    }
+  in
+  cleanup_types ();
+  decl
+
+let value_description s descr =
+  {
+    val_type = type_expr s descr.val_type;
+    val_kind = descr.val_kind;
+    val_loc = loc s descr.val_loc;
+    val_attributes = attrs s descr.val_attributes;
+  }
+
+let extension_constructor s ext =
+  let ext =
+    {
+      ext_type_path = type_path s ext.ext_type_path;
+      ext_type_params = List.map (typexp s) ext.ext_type_params;
+      ext_args = constructor_arguments s ext.ext_args;
+      ext_ret_type = may_map (typexp s) ext.ext_ret_type;
+      ext_private = ext.ext_private;
+      ext_attributes = attrs s ext.ext_attributes;
+      ext_loc = (if s.for_saving then Location.none else ext.ext_loc);
+      ext_is_exception = ext.ext_is_exception;
+    }
+  in
+  cleanup_types ();
+  ext
+
+let rec rename_bound_idents s idents = function
+  | [] -> (List.rev idents, s)
+  | Sig_type (id, _, _) :: sg ->
+    let id' = Ident.rename id in
+    rename_bound_idents (add_type id (Pident id') s) (id' :: idents) sg
+  | Sig_module (id, _, _) :: sg ->
+    let id' = Ident.rename id in
+    rename_bound_idents (add_module id (Pident id') s) (id' :: idents) sg
+  | Sig_modtype (id, _) :: sg ->
+    let id' = Ident.rename id in
+    rename_bound_idents
+      (add_modtype id (Mty_ident (Pident id')) s)
+      (id' :: idents) sg
+  | Sig_class_type () :: _ -> assert false
+  | (Sig_value (id, _) | Sig_typext (id, _, _)) :: sg ->
+    let id' = Ident.rename id in
+    rename_bound_idents s (id' :: idents) sg
+  | Sig_class _ :: _ -> assert false
+let rec modtype s = function
+  | Mty_ident p as mty -> (
+    match p with
+    | Pident id -> ( try Tbl.find id s.modtypes with Not_found -> mty)
+    | Pdot (p, n, pos) -> Mty_ident (Pdot (module_path s p, n, pos))
+    | Papply _ -> fatal_error "Subst.modtype")
+  | Mty_signature sg -> Mty_signature (signature s sg)
+  | Mty_functor (id, arg, res) ->
+    let id' = Ident.rename id in
+    Mty_functor
+      (id', may_map (modtype s) arg, modtype (add_module id (Pident id') s) res)
+  | Mty_alias (pres, p) -> Mty_alias (pres, module_path s p)
+
+and signature s sg =
+  (* Components of signature may be mutually recursive (e.g. type declarations
+     or class and type declarations), so first build global renaming
+     substitution... *)
+  let new_idents, s' = rename_bound_idents s [] sg in
+  (* ... then apply it to each signature component in turn *)
+  List.map2 (signature_component s') sg new_idents
+
+and signature_component s comp newid =
+  match comp with
+  | Sig_value (_id, d) -> Sig_value (newid, value_description s d)
+  | Sig_type (_id, d, rs) -> Sig_type (newid, type_declaration s d, rs)
+  | Sig_typext (_id, ext, es) ->
+    Sig_typext (newid, extension_constructor s ext, es)
+  | Sig_module (_id, d, rs) -> Sig_module (newid, module_declaration s d, rs)
+  | Sig_modtype (_id, d) -> Sig_modtype (newid, modtype_declaration s d)
+  | Sig_class () -> Sig_class ()
+  | Sig_class_type () -> Sig_class_type ()
+
+and module_declaration s decl =
+  {
+    md_type = modtype s decl.md_type;
+    md_attributes = attrs s decl.md_attributes;
+    md_loc = loc s decl.md_loc;
+  }
+
+and modtype_declaration s decl =
+  {
+    mtd_type = may_map (modtype s) decl.mtd_type;
+    mtd_attributes = attrs s decl.mtd_attributes;
+    mtd_loc = loc s decl.mtd_loc;
+  }
+
+(* For every binding k |-> d of m1, add k |-> f d to m2
+   and return resulting merged map. *)
diff --git a/compiler/ml/subst.mli b/compiler/ml/subst.mli
new file mode 100644
index 0000000..62ed5d5
--- /dev/null
+++ b/compiler/ml/subst.mli
@@ -0,0 +1,62 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Substitutions *)
+
+open Types
+
+type t
+
+(*
+   Substitutions are used to translate a type from one context to
+   another.  This requires substituting paths for identifiers, and
+   possibly also lowering the level of non-generic variables so that
+   they are inferior to the maximum level of the new context.
+
+   Substitutions can also be used to create a "clean" copy of a type.
+   Indeed, non-variable node of a type are duplicated, with their
+   levels set to generic level.  That way, the resulting type is
+   well-formed (decreasing levels), even if the original one was not.
+*)
+
+val identity : t
+
+val add_type : Ident.t -> Path.t -> t -> t
+val add_type_path : Path.t -> Path.t -> t -> t
+val add_type_function :
+  Path.t -> params:type_expr list -> body:type_expr -> t -> t
+val add_module : Ident.t -> Path.t -> t -> t
+val add_module_path : Path.t -> Path.t -> t -> t
+val add_modtype : Ident.t -> module_type -> t -> t
+val for_saving : t -> t
+val reset_for_saving : unit -> unit
+
+val module_path : t -> Path.t -> Path.t
+val type_path : t -> Path.t -> Path.t
+
+val type_expr : t -> type_expr -> type_expr
+val value_description : t -> value_description -> value_description
+val type_declaration : t -> type_declaration -> type_declaration
+val extension_constructor : t -> extension_constructor -> extension_constructor
+
+val modtype : t -> module_type -> module_type
+val signature : t -> signature -> signature
+val modtype_declaration : t -> modtype_declaration -> modtype_declaration
+val module_declaration : t -> module_declaration -> module_declaration
+val typexp : t -> Types.type_expr -> Types.type_expr
+
+(* A forward reference to be filled in ctype.ml. *)
+val ctype_apply_env_empty :
+  (type_expr list -> type_expr -> type_expr list -> type_expr) ref
diff --git a/compiler/ml/switch.ml b/compiler/ml/switch.ml
new file mode 100644
index 0000000..9626f06
--- /dev/null
+++ b/compiler/ml/switch.ml
@@ -0,0 +1,739 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Luc Maranget, projet Moscova, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 2000 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+type 'a shared = Shared of 'a | Single of 'a
+
+type 'a t_store = {
+  act_get_shared: unit -> 'a shared array;
+  act_store: 'a -> int;
+  act_store_shared: 'a -> int;
+}
+
+exception Not_simple
+
+module type Stored = sig
+  type t
+  type key
+  val compare_key : key -> key -> int
+  val make_key : t -> key option
+end
+
+module Store (A : Stored) = struct
+  module AMap = Map.Make (struct
+    type t = A.key
+    let compare = A.compare_key
+  end)
+
+  type intern = {
+    mutable map: (bool * int) AMap.t;
+    mutable next: int;
+    mutable acts: (bool * A.t) list;
+  }
+
+  let mk_store () =
+    let st = {map = AMap.empty; next = 0; acts = []} in
+
+    let add mustshare act =
+      let i = st.next in
+      st.acts <- (mustshare, act) :: st.acts;
+      st.next <- i + 1;
+      i
+    in
+
+    let store mustshare act =
+      match A.make_key act with
+      | Some key -> (
+        try
+          let shared, i = AMap.find key st.map in
+          if not shared then st.map <- AMap.add key (true, i) st.map;
+          i
+        with Not_found ->
+          let i = add mustshare act in
+          st.map <- AMap.add key (mustshare, i) st.map;
+          i)
+      | None -> add mustshare act
+    and get_shared () =
+      let acts =
+        Array.of_list
+          (List.rev_map
+             (fun (shared, act) -> if shared then Shared act else Single act)
+             st.acts)
+      in
+      AMap.iter
+        (fun _ (shared, i) ->
+          if shared then
+            match acts.(i) with
+            | Single act -> acts.(i) <- Shared act
+            | Shared _ -> ())
+        st.map;
+      acts
+    in
+    {
+      act_store = store false;
+      act_store_shared = store true;
+      act_get_shared = get_shared;
+    }
+end
+
+module type S = sig
+  type primitive
+  val eqint : primitive
+  val neint : primitive
+  val leint : primitive
+  val ltint : primitive
+  val geint : primitive
+  val gtint : primitive
+  type act
+
+  val bind : act -> (act -> act) -> act
+  val make_const : int -> act
+  val make_offset : act -> int -> act
+  val make_prim : primitive -> act list -> act
+  val make_isout : act -> act -> act
+  val make_isin : act -> act -> act
+  val make_if : act -> act -> act -> act
+  val make_switch :
+    Location.t ->
+    act ->
+    int array ->
+    act array ->
+    offset:int ->
+    Ast_untagged_variants.switch_names option ->
+    act
+  val make_catch : act -> int * (act -> act)
+  val make_exit : int -> act
+end
+
+(* The module will ``produce good code for the case statement'' *)
+(*
+  Adaptation of
+   R.L. Berstein
+   ``Producing good code for the case statement''
+   Sofware Practice and Experience, 15(10) (1985)
+ and
+   D.L. Spuler
+    ``Two-Way Comparison Search Trees, a Generalisation of Binary Search Trees
+      and Split Trees''
+    ``Compiler Code Generation for Multiway Branch Statement as
+      a Static Search Problem''
+   Technical Reports, James Cook University
+*)
+(*
+  Main adaptation is considering interval tests
+ (implemented as one addition + one unsigned test and branch)
+  which leads to exhaustive search for finding the optimal
+  test sequence in small cases and heuristics otherwise.
+*)
+module Make (Arg : S) = struct
+  type 'a inter = {cases: (int * int * int) array; actions: 'a array}
+
+  type 'a t_ctx = {off: int; arg: 'a}
+
+  let cut = ref 8
+
+  and more_cut = ref 16
+
+  (*
+let pint chan i =
+  if i = min_int then Printf.fprintf chan "-oo"
+  else if i=max_int then Printf.fprintf chan "oo"
+  else Printf.fprintf chan "%d" i
+
+let pcases chan cases =
+  for i =0 to Array.length cases-1 do
+    let l,h,act = cases.(i) in
+    if l=h then
+      Printf.fprintf chan "%d:%d " l act
+    else
+      Printf.fprintf chan "%a..%a:%d " pint l pint h act
+  done
+
+let prerr_inter i = Printf.fprintf stderr
+        "cases=%a" pcases i.cases
+*)
+
+  let get_act cases i =
+    let _, _, r = cases.(i) in
+    r
+
+  and get_low cases i =
+    let r, _, _ = cases.(i) in
+    r
+
+  type ctests = {mutable n: int; mutable ni: int}
+
+  let too_much = {n = max_int; ni = max_int}
+
+  (*
+let ptests chan {n=n ; ni=ni} =
+  Printf.fprintf chan "{n=%d ; ni=%d}" n ni
+
+let pta chan t =
+  for i =0 to Array.length t-1 do
+    Printf.fprintf chan "%d: %a\n" i ptests t.(i)
+  done
+*)
+
+  let less_tests c1 c2 =
+    if c1.n < c2.n then true
+    else if c1.n = c2.n then if c1.ni < c2.ni then true else false
+    else false
+
+  and eq_tests c1 c2 = c1.n = c2.n && c1.ni = c2.ni
+
+  let less2tests (c1, d1) (c2, d2) =
+    if eq_tests c1 c2 then less_tests d1 d2 else less_tests c1 c2
+
+  let add_test t1 t2 =
+    t1.n <- t1.n + t2.n;
+    t1.ni <- t1.ni + t2.ni
+
+  type t_ret = Inter of int * int | Sep of int | No
+
+  (*
+let pret chan = function
+  | Inter (i,j)-> Printf.fprintf chan "Inter %d %d" i j
+  | Sep i -> Printf.fprintf chan "Sep %d" i
+  | No -> Printf.fprintf chan "No"
+*)
+
+  let coupe cases i =
+    let l, _, _ = cases.(i) in
+    (l, Array.sub cases 0 i, Array.sub cases i (Array.length cases - i))
+
+  let case_append c1 c2 =
+    let len1 = Array.length c1 and len2 = Array.length c2 in
+    match (len1, len2) with
+    | 0, _ -> c2
+    | _, 0 -> c1
+    | _, _ ->
+      let l1, h1, act1 = c1.(Array.length c1 - 1) and l2, h2, act2 = c2.(0) in
+      if act1 = act2 then (
+        let r = Array.make (len1 + len2 - 1) c1.(0) in
+        for i = 0 to len1 - 2 do
+          r.(i) <- c1.(i)
+        done;
+
+        let l =
+          if len1 - 2 >= 0 then
+            let _, h, _ = r.(len1 - 2) in
+            if h + 1 < l1 then h + 1 else l1
+          else l1
+        and h =
+          if 1 < len2 - 1 then
+            let l, _, _ = c2.(1) in
+            if h2 + 1 < l then l - 1 else h2
+          else h2
+        in
+        r.(len1 - 1) <- (l, h, act1);
+        for i = 1 to len2 - 1 do
+          r.(len1 - 1 + i) <- c2.(i)
+        done;
+        r)
+      else if h1 > l1 then (
+        let r = Array.make (len1 + len2) c1.(0) in
+        for i = 0 to len1 - 2 do
+          r.(i) <- c1.(i)
+        done;
+        r.(len1 - 1) <- (l1, l2 - 1, act1);
+        for i = 0 to len2 - 1 do
+          r.(len1 + i) <- c2.(i)
+        done;
+        r)
+      else if h2 > l2 then (
+        let r = Array.make (len1 + len2) c1.(0) in
+        for i = 0 to len1 - 1 do
+          r.(i) <- c1.(i)
+        done;
+        r.(len1) <- (h1 + 1, h2, act2);
+        for i = 1 to len2 - 1 do
+          r.(len1 + i) <- c2.(i)
+        done;
+        r)
+      else Array.append c1 c2
+
+  let coupe_inter i j cases =
+    let lcases = Array.length cases in
+    let low, _, _ = cases.(i) and _, high, _ = cases.(j) in
+    ( low,
+      high,
+      Array.sub cases i (j - i + 1),
+      case_append (Array.sub cases 0 i)
+        (Array.sub cases (j + 1) (lcases - (j + 1))) )
+
+  type kind = Kvalue of int | Kinter of int | Kempty
+
+  (*
+let pkind chan = function
+  | Kvalue i ->Printf.fprintf chan "V%d" i
+  | Kinter i -> Printf.fprintf chan "I%d" i
+  | Kempty -> Printf.fprintf chan "E"
+
+let rec pkey chan  = function
+  | [] -> ()
+  | [k] -> pkind chan k
+  | k::rem ->
+      Printf.fprintf chan "%a %a" pkey rem pkind k
+*)
+
+  let t = Hashtbl.create 17
+
+  let make_key cases =
+    let seen = ref [] and count = ref 0 in
+    let rec got_it act = function
+      | [] ->
+        seen := (act, !count) :: !seen;
+        let r = !count in
+        incr count;
+        r
+      | (act0, index) :: rem -> if act0 = act then index else got_it act rem
+    in
+
+    let make_one (l : int) h act =
+      if l = h then Kvalue (got_it act !seen) else Kinter (got_it act !seen)
+    in
+
+    let rec make_rec i pl =
+      if i < 0 then []
+      else
+        let l, h, act = cases.(i) in
+        if pl = h + 1 then make_one l h act :: make_rec (i - 1) l
+        else Kempty :: make_one l h act :: make_rec (i - 1) l
+    in
+
+    let l, h, act = cases.(Array.length cases - 1) in
+    make_one l h act :: make_rec (Array.length cases - 2) l
+
+  let same_act t =
+    let len = Array.length t in
+    let a = get_act t (len - 1) in
+    let rec do_rec i =
+      if i < 0 then true
+      else
+        let b = get_act t i in
+        b = a && do_rec (i - 1)
+    in
+    do_rec (len - 2)
+
+  (*
+  Interval test x in [l,h] works by checking x-l in [0,h-l]
+   * This may be false for arithmetic modulo 2^31
+   * Subtracting l may change the relative ordering of values
+     and invalid the invariant that matched values are given in
+     increasing order
+
+   To avoid this, interval check is allowed only when the
+   integers indeed present in the whole case interval are
+   in [-2^16 ; 2^16]
+
+   This condition is checked by zyva
+   *)
+
+  let inter_limit = 1 lsl 16
+
+  let ok_inter = ref false
+
+  let rec opt_count top cases =
+    let key = make_key cases in
+    try Hashtbl.find t key
+    with Not_found ->
+      let r =
+        let lcases = Array.length cases in
+        match lcases with
+        | 0 -> assert false
+        | _ when same_act cases -> (No, ({n = 0; ni = 0}, {n = 0; ni = 0}))
+        | _ ->
+          if lcases < !cut then enum top cases
+          else if lcases < !more_cut then heuristic cases
+          else divide cases
+      in
+      Hashtbl.add t key r;
+      r
+
+  and divide cases =
+    let lcases = Array.length cases in
+    let m = lcases / 2 in
+    let _, left, right = coupe cases m in
+    let ci = {n = 1; ni = 0}
+    and cm = {n = 1; ni = 0}
+    and _, (cml, cleft) = opt_count false left
+    and _, (cmr, cright) = opt_count false right in
+    add_test ci cleft;
+    add_test ci cright;
+    if less_tests cml cmr then add_test cm cmr else add_test cm cml;
+    (Sep m, (cm, ci))
+
+  and heuristic cases =
+    let lcases = Array.length cases in
+
+    let sep, csep = divide cases
+    and inter, cinter =
+      if !ok_inter then
+        let _, _, act0 = cases.(0) and _, _, act1 = cases.(lcases - 1) in
+        if act0 = act1 then (
+          let low, high, inside, outside = coupe_inter 1 (lcases - 2) cases in
+          let _, (cmi, cinside) = opt_count false inside
+          and _, (cmo, coutside) = opt_count false outside
+          and cmij = {n = 1; ni = (if low = high then 0 else 1)}
+          and cij = {n = 1; ni = (if low = high then 0 else 1)} in
+          add_test cij cinside;
+          add_test cij coutside;
+          if less_tests cmi cmo then add_test cmij cmo else add_test cmij cmi;
+          (Inter (1, lcases - 2), (cmij, cij)))
+        else (Inter (-1, -1), (too_much, too_much))
+      else (Inter (-1, -1), (too_much, too_much))
+    in
+    if less2tests csep cinter then (sep, csep) else (inter, cinter)
+
+  and enum top cases =
+    let lcases = Array.length cases in
+    let lim, with_sep =
+      let best = ref (-1) and best_cost = ref (too_much, too_much) in
+
+      for i = 1 to lcases - 1 do
+        let _, left, right = coupe cases i in
+        let ci = {n = 1; ni = 0}
+        and cm = {n = 1; ni = 0}
+        and _, (cml, cleft) = opt_count false left
+        and _, (cmr, cright) = opt_count false right in
+        add_test ci cleft;
+        add_test ci cright;
+        if less_tests cml cmr then add_test cm cmr else add_test cm cml;
+
+        if less2tests (cm, ci) !best_cost then (
+          if top then Printf.fprintf stderr "Get it: %d\n" i;
+          best := i;
+          best_cost := (cm, ci))
+      done;
+      (!best, !best_cost)
+    in
+
+    let ilow, ihigh, with_inter =
+      if not !ok_inter then (
+        let rlow = ref (-1)
+        and rhigh = ref (-1)
+        and best_cost = ref (too_much, too_much) in
+        for i = 1 to lcases - 2 do
+          let low, high, inside, outside = coupe_inter i i cases in
+          if low = high then (
+            let _, (cmi, cinside) = opt_count false inside
+            and _, (cmo, coutside) = opt_count false outside
+            and cmij = {n = 1; ni = 0}
+            and cij = {n = 1; ni = 0} in
+            add_test cij cinside;
+            add_test cij coutside;
+            if less_tests cmi cmo then add_test cmij cmo else add_test cmij cmi;
+            if less2tests (cmij, cij) !best_cost then (
+              rlow := i;
+              rhigh := i;
+              best_cost := (cmij, cij)))
+        done;
+        (!rlow, !rhigh, !best_cost))
+      else
+        let rlow = ref (-1)
+        and rhigh = ref (-1)
+        and best_cost = ref (too_much, too_much) in
+        for i = 1 to lcases - 2 do
+          for j = i to lcases - 2 do
+            let low, high, inside, outside = coupe_inter i j cases in
+            let _, (cmi, cinside) = opt_count false inside
+            and _, (cmo, coutside) = opt_count false outside
+            and cmij = {n = 1; ni = (if low = high then 0 else 1)}
+            and cij = {n = 1; ni = (if low = high then 0 else 1)} in
+            add_test cij cinside;
+            add_test cij coutside;
+            if less_tests cmi cmo then add_test cmij cmo else add_test cmij cmi;
+            if less2tests (cmij, cij) !best_cost then (
+              rlow := i;
+              rhigh := j;
+              best_cost := (cmij, cij))
+          done
+        done;
+        (!rlow, !rhigh, !best_cost)
+    in
+    let r = ref (Inter (ilow, ihigh)) and rc = ref with_inter in
+    if less2tests with_sep !rc then (
+      r := Sep lim;
+      rc := with_sep);
+    (!r, !rc)
+
+  let make_if_test test arg i ifso ifnot =
+    Arg.make_if (Arg.make_prim test [arg; Arg.make_const i]) ifso ifnot
+
+  let make_if_lt arg i ifso ifnot =
+    match i with
+    | 1 -> make_if_test Arg.leint arg 0 ifso ifnot
+    | _ -> make_if_test Arg.ltint arg i ifso ifnot
+
+  and make_if_ge arg i ifso ifnot =
+    match i with
+    | 1 -> make_if_test Arg.gtint arg 0 ifso ifnot
+    | _ -> make_if_test Arg.geint arg i ifso ifnot
+
+  and make_if_eq arg i ifso ifnot = make_if_test Arg.eqint arg i ifso ifnot
+
+  and make_if_ne arg i ifso ifnot = make_if_test Arg.neint arg i ifso ifnot
+
+  let do_make_if_out h arg ifso ifno =
+    Arg.make_if (Arg.make_isout h arg) ifso ifno
+
+  let make_if_out ctx l d mk_ifso mk_ifno =
+    match l with
+    | 0 -> do_make_if_out (Arg.make_const d) ctx.arg (mk_ifso ctx) (mk_ifno ctx)
+    | _ ->
+      do_make_if_out (Arg.make_const d)
+        (Arg.make_offset ctx.arg (-l))
+        (mk_ifso ctx) (mk_ifno ctx)
+
+  let do_make_if_in h arg ifso ifno =
+    Arg.make_if (Arg.make_isin h arg) ifso ifno
+
+  let make_if_in ctx l d mk_ifso mk_ifno =
+    match l with
+    | 0 -> do_make_if_in (Arg.make_const d) ctx.arg (mk_ifso ctx) (mk_ifno ctx)
+    | _ ->
+      do_make_if_in (Arg.make_const d)
+        (Arg.make_offset ctx.arg (-l))
+        (mk_ifso ctx) (mk_ifno ctx)
+
+  let rec c_test ctx ({cases; actions} as s) =
+    let lcases = Array.length cases in
+    assert (lcases > 0);
+    if lcases = 1 then actions.(get_act cases 0) ctx
+    else
+      let w, _c = opt_count false cases in
+      (*
+  Printf.fprintf stderr
+  "off=%d tactic=%a for %a\n"
+  ctx.off pret w pcases cases ;
+  *)
+      match w with
+      | No -> actions.(get_act cases 0) ctx
+      | Inter (i, j) ->
+        let low, high, inside, outside = coupe_inter i j cases in
+        let _, (cinside, _) = opt_count false inside
+        and _, (coutside, _) = opt_count false outside in
+        (* Costs are retrieved to put the code with more remaining tests
+           in the privileged (positive) branch of ``if'' *)
+        if low = high then
+          if less_tests coutside cinside then
+            make_if_eq ctx.arg (low + ctx.off)
+              (c_test ctx {s with cases = inside})
+              (c_test ctx {s with cases = outside})
+          else
+            make_if_ne ctx.arg (low + ctx.off)
+              (c_test ctx {s with cases = outside})
+              (c_test ctx {s with cases = inside})
+        else if less_tests coutside cinside then
+          make_if_in ctx (low + ctx.off) (high - low)
+            (fun ctx -> c_test ctx {s with cases = inside})
+            (fun ctx -> c_test ctx {s with cases = outside})
+        else
+          make_if_out ctx (low + ctx.off) (high - low)
+            (fun ctx -> c_test ctx {s with cases = outside})
+            (fun ctx -> c_test ctx {s with cases = inside})
+      | Sep i ->
+        let lim, left, right = coupe cases i in
+        let _, (cleft, _) = opt_count false left
+        and _, (cright, _) = opt_count false right in
+        let left = {s with cases = left} and right = {s with cases = right} in
+
+        if i = 1 && lim + ctx.off = 1 && get_low cases 0 + ctx.off = 0 then
+          make_if_ne ctx.arg 0 (c_test ctx right) (c_test ctx left)
+        else if less_tests cright cleft then
+          make_if_lt ctx.arg (lim + ctx.off) (c_test ctx left)
+            (c_test ctx right)
+        else
+          make_if_ge ctx.arg (lim + ctx.off) (c_test ctx right)
+            (c_test ctx left)
+
+  (* Minimal density of switches *)
+  let theta = ref 0.33333
+
+  (* Minimal number of tests to make a switch *)
+  let switch_min = ref 3
+
+  (* Particular case 0, 1, 2 *)
+  let particular_case cases i j =
+    j - i = 2
+    &&
+    let l1, _h1, act1 = cases.(i)
+    and l2, _h2, _act2 = cases.(i + 1)
+    and l3, h3, act3 = cases.(i + 2) in
+    l1 + 1 = l2 && l2 + 1 = l3 && l3 = h3 && act1 <> act3
+
+  let approx_count cases i j =
+    let l = j - i + 1 in
+    if l < !cut then
+      let _, (_, {n = ntests}) = opt_count false (Array.sub cases i l) in
+      ntests
+    else l - 1
+
+  (* Sends back a boolean that says whether is switch is worth or not *)
+
+  let dense {cases} i j =
+    if i = j then true
+    else
+      let l, _, _ = cases.(i) and _, h, _ = cases.(j) in
+      let ntests = approx_count cases i j in
+      (*
+  (ntests+1) >= theta * (h-l+1)
+*)
+      particular_case cases i j
+      || ntests >= !switch_min
+         && float_of_int ntests +. 1.0
+            >= !theta *. (float_of_int h -. float_of_int l +. 1.0)
+
+  (* Compute clusters by dynamic programming
+     Adaptation of the correction to Bernstein
+     ``Correction to `Producing Good Code for the Case Statement' ''
+     S.K. Kannan and T.A. Proebsting
+     Software Practice and Experience Vol. 24(2) 233 (Feb 1994)
+  *)
+
+  let comp_clusters s =
+    let len = Array.length s.cases in
+    let min_clusters = Array.make len max_int and k = Array.make len 0 in
+    let get_min i = if i < 0 then 0 else min_clusters.(i) in
+
+    for i = 0 to len - 1 do
+      for j = 0 to i do
+        if dense s j i && get_min (j - 1) + 1 < min_clusters.(i) then (
+          k.(i) <- j;
+          min_clusters.(i) <- get_min (j - 1) + 1)
+      done
+    done;
+    (min_clusters.(len - 1), k)
+
+  (* Assume j > i *)
+  let make_switch loc {cases; actions} i j sw_names =
+    let ll, _, _ = cases.(i) and _, hh, _ = cases.(j) in
+    let tbl = Array.make (hh - ll + 1) 0
+    and t = Hashtbl.create 17
+    and index = ref 0 in
+    let get_index act =
+      try Hashtbl.find t act
+      with Not_found ->
+        let i = !index in
+        incr index;
+        Hashtbl.add t act i;
+        i
+    in
+
+    for k = i to j do
+      let l, h, act = cases.(k) in
+      let index = get_index act in
+      for kk = l - ll to h - ll do
+        tbl.(kk) <- index
+      done
+    done;
+    let acts = Array.make !index actions.(0) in
+    Hashtbl.iter (fun act i -> acts.(i) <- actions.(act)) t;
+    fun ctx ->
+      Arg.make_switch ~offset:(ll + ctx.off) loc ctx.arg tbl acts sw_names
+
+  let make_clusters loc ({cases; actions} as s) n_clusters k sw_names =
+    let len = Array.length cases in
+    let r = Array.make n_clusters (0, 0, 0)
+    and t = Hashtbl.create 17
+    and index = ref 0
+    and bidon = ref (Array.length actions) in
+    let get_index act =
+      try
+        let i, _ = Hashtbl.find t act in
+        i
+      with Not_found ->
+        let i = !index in
+        incr index;
+        Hashtbl.add t act (i, fun _ -> actions.(act));
+        i
+    and add_index act =
+      let i = !index in
+      incr index;
+      incr bidon;
+      Hashtbl.add t !bidon (i, act);
+      i
+    in
+
+    let rec zyva j ir =
+      let i = k.(j) in
+      (if i = j then
+         let l, h, act = cases.(i) in
+         r.(ir) <- (l, h, get_index act)
+       else
+         (* assert i < j *)
+         let l, _, _ = cases.(i) and _, h, _ = cases.(j) in
+         r.(ir) <- (l, h, add_index (make_switch loc s i j sw_names)));
+      if i > 0 then zyva (i - 1) (ir - 1)
+    in
+
+    zyva (len - 1) (n_clusters - 1);
+    let acts = Array.make !index (fun _ -> assert false) in
+    Hashtbl.iter (fun _ (i, act) -> acts.(i) <- act) t;
+    {cases = r; actions = acts}
+
+  let do_zyva loc (low, high) arg cases actions sw_names =
+    let old_ok = !ok_inter in
+    ok_inter := abs low <= inter_limit && abs high <= inter_limit;
+    if !ok_inter <> old_ok then Hashtbl.clear t;
+
+    let s = {cases; actions} in
+
+    (*
+  Printf.eprintf "ZYVA: %B [low=%i,high=%i]\n" !ok_inter low high ;
+  pcases stderr cases ;
+  prerr_endline "" ;
+*)
+    let n_clusters, k = comp_clusters s in
+    let clusters = make_clusters loc s n_clusters k sw_names in
+    c_test {arg; off = 0} clusters
+
+  let abstract_shared actions =
+    let handlers = ref (fun x -> x) in
+    let actions =
+      Array.map
+        (fun act ->
+          match act with
+          | Single act -> act
+          | Shared act ->
+            let i, h = Arg.make_catch act in
+            let oh = !handlers in
+            (handlers := fun act -> h (oh act));
+            Arg.make_exit i)
+        actions
+    in
+    (!handlers, actions)
+
+  let zyva loc lh arg cases actions names =
+    assert (Array.length cases > 0);
+    let actions = actions.act_get_shared () in
+    let hs, actions = abstract_shared actions in
+    hs (do_zyva loc lh arg cases actions names)
+
+  and test_sequence arg cases actions =
+    assert (Array.length cases > 0);
+    let actions = actions.act_get_shared () in
+    let hs, actions = abstract_shared actions in
+    let old_ok = !ok_inter in
+    ok_inter := false;
+    if !ok_inter <> old_ok then Hashtbl.clear t;
+    let s = {cases; actions = Array.map (fun act _ -> act) actions} in
+    (*
+  Printf.eprintf "SEQUENCE: %B\n" !ok_inter ;
+  pcases stderr cases ;
+  prerr_endline "" ;
+*)
+    hs (c_test {arg; off = 0} s)
+end
diff --git a/compiler/ml/switch.mli b/compiler/ml/switch.mli
new file mode 100644
index 0000000..89bce41
--- /dev/null
+++ b/compiler/ml/switch.mli
@@ -0,0 +1,120 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Luc Maranget, projet Moscova, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 2000 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(*
+  This module transforms generic switches in combinations
+  of if tests and switches.
+*)
+
+(* For detecting action sharing, object style *)
+
+(* Store for actions in object style:
+   act_store : store an action, returns index in table
+               In case an action with equal key exists, returns index
+               of the stored action. Otherwise add entry in table.
+   act_store_shared : This stored action will always be shared.
+   act_get   : retrieve table
+   act_get_shared : retrieve table, with sharing explicit
+*)
+
+type 'a shared = Shared of 'a | Single of 'a
+
+type 'a t_store = {
+  act_get_shared: unit -> 'a shared array;
+  act_store: 'a -> int;
+  act_store_shared: 'a -> int;
+}
+
+exception Not_simple
+
+module type Stored = sig
+  type t
+  type key
+  val compare_key : key -> key -> int
+  val make_key : t -> key option
+end
+
+module Store (A : Stored) : sig
+  val mk_store : unit -> A.t t_store
+end
+
+(* Arguments to the Make functor *)
+module type S = sig
+  (* type of basic tests *)
+  type primitive
+
+  (* basic tests themselves *)
+  val eqint : primitive
+  val neint : primitive
+  val leint : primitive
+  val ltint : primitive
+  val geint : primitive
+  val gtint : primitive
+
+  (* type of actions *)
+  type act
+
+  (* Various constructors, for making a binder,
+      adding one integer, etc. *)
+  val bind : act -> (act -> act) -> act
+  val make_const : int -> act
+  val make_offset : act -> int -> act
+  val make_prim : primitive -> act list -> act
+  val make_isout : act -> act -> act
+  val make_isin : act -> act -> act
+  val make_if : act -> act -> act -> act
+
+  (* construct an actual switch :
+     make_switch arg cases acts
+     NB:  cases is in the value form *)
+  val make_switch :
+    Location.t ->
+    act ->
+    int array ->
+    act array ->
+    offset:int ->
+    Ast_untagged_variants.switch_names option ->
+    act
+
+  (* Build last minute sharing of action stuff *)
+  val make_catch : act -> int * (act -> act)
+  val make_exit : int -> act
+end
+
+(*
+  Make.zyva arg low high cases actions where
+    - arg is the argument of the switch.
+    - low, high are the interval limits.
+    - cases is a list of sub-interval and action indices
+    - actions is an array of actions.
+
+  All these arguments specify a switch construct and zyva
+  returns an action that performs the switch.
+*)
+module Make : functor (Arg : S) -> sig
+  (* Standard entry point, sharing is tracked *)
+  val zyva :
+    Location.t ->
+    int * int ->
+    Arg.act ->
+    (int * int * int) array ->
+    Arg.act t_store ->
+    Ast_untagged_variants.switch_names option ->
+    Arg.act
+
+  (* Output test sequence, sharing tracked *)
+  val test_sequence :
+    Arg.act -> (int * int * int) array -> Arg.act t_store -> Arg.act
+end
diff --git a/compiler/ml/syntaxerr.ml b/compiler/ml/syntaxerr.ml
new file mode 100644
index 0000000..11a12f4
--- /dev/null
+++ b/compiler/ml/syntaxerr.ml
@@ -0,0 +1,20 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1997 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Auxiliary type for reporting syntax errors *)
+
+type error = Variable_in_scope of Location.t * string
+
+exception Error of error
diff --git a/compiler/ml/syntaxerr.mli b/compiler/ml/syntaxerr.mli
new file mode 100644
index 0000000..8d4606d
--- /dev/null
+++ b/compiler/ml/syntaxerr.mli
@@ -0,0 +1,20 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1997 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** Auxiliary type for reporting syntax errors *)
+
+type error = Variable_in_scope of Location.t * string
+
+exception Error of error
diff --git a/compiler/ml/tast_iterator.ml b/compiler/ml/tast_iterator.ml
new file mode 100644
index 0000000..5c12d3d
--- /dev/null
+++ b/compiler/ml/tast_iterator.ml
@@ -0,0 +1,349 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                          Isaac "Izzy" Avram                            *)
+(*                                                                        *)
+(*   Copyright 2019 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Asttypes
+open Typedtree
+
+type iterator = {
+  case: iterator -> case -> unit;
+  cases: iterator -> case list -> unit;
+  env: iterator -> Env.t -> unit;
+  expr: iterator -> expression -> unit;
+  extension_constructor: iterator -> extension_constructor -> unit;
+  module_binding: iterator -> module_binding -> unit;
+  module_coercion: iterator -> module_coercion -> unit;
+  module_declaration: iterator -> module_declaration -> unit;
+  module_expr: iterator -> module_expr -> unit;
+  module_type: iterator -> module_type -> unit;
+  module_type_declaration: iterator -> module_type_declaration -> unit;
+  package_type: iterator -> package_type -> unit;
+  pat: iterator -> pattern -> unit;
+  row_field: iterator -> row_field -> unit;
+  object_field: iterator -> object_field -> unit;
+  signature: iterator -> signature -> unit;
+  signature_item: iterator -> signature_item -> unit;
+  structure: iterator -> structure -> unit;
+  structure_item: iterator -> structure_item -> unit;
+  typ: iterator -> core_type -> unit;
+  type_declaration: iterator -> type_declaration -> unit;
+  type_declarations: iterator -> rec_flag * type_declaration list -> unit;
+  type_extension: iterator -> type_extension -> unit;
+  type_kind: iterator -> type_kind -> unit;
+  value_binding: iterator -> value_binding -> unit;
+  value_bindings: iterator -> rec_flag * value_binding list -> unit;
+  value_description: iterator -> value_description -> unit;
+  with_constraint: iterator -> with_constraint -> unit;
+}
+
+let structure sub {str_items; str_final_env; _} =
+  List.iter (sub.structure_item sub) str_items;
+  sub.env sub str_final_env
+
+let module_type_declaration sub {mtd_type; _} =
+  Option.iter (sub.module_type sub) mtd_type
+
+let module_declaration sub {md_type; _} = sub.module_type sub md_type
+let include_infos f {incl_mod; _} = f incl_mod
+
+let structure_item sub {str_desc; str_env; _} =
+  sub.env sub str_env;
+  match str_desc with
+  | Tstr_eval (exp, _) -> sub.expr sub exp
+  | Tstr_value (rec_flag, list) -> sub.value_bindings sub (rec_flag, list)
+  | Tstr_primitive v -> sub.value_description sub v
+  | Tstr_type (rec_flag, list) -> sub.type_declarations sub (rec_flag, list)
+  | Tstr_typext te -> sub.type_extension sub te
+  | Tstr_exception ext -> sub.extension_constructor sub ext
+  | Tstr_module mb -> sub.module_binding sub mb
+  | Tstr_recmodule list -> List.iter (sub.module_binding sub) list
+  | Tstr_modtype x -> sub.module_type_declaration sub x
+  | Tstr_include incl -> include_infos (sub.module_expr sub) incl
+  | Tstr_open _ -> ()
+  | Tstr_attribute _ -> ()
+
+let value_description sub x = sub.typ sub x.val_desc
+let label_decl sub {ld_type; _} = sub.typ sub ld_type
+
+let constructor_args sub = function
+  | Cstr_tuple l -> List.iter (sub.typ sub) l
+  | Cstr_record l -> List.iter (label_decl sub) l
+
+let constructor_decl sub {cd_args; cd_res; _} =
+  constructor_args sub cd_args;
+  Option.iter (sub.typ sub) cd_res
+
+let type_kind sub = function
+  | Ttype_abstract -> ()
+  | Ttype_variant list -> List.iter (constructor_decl sub) list
+  | Ttype_record list -> List.iter (label_decl sub) list
+  | Ttype_open -> ()
+
+let type_declaration sub {typ_cstrs; typ_kind; typ_manifest; typ_params; _} =
+  List.iter
+    (fun (c1, c2, _) ->
+      sub.typ sub c1;
+      sub.typ sub c2)
+    typ_cstrs;
+  sub.type_kind sub typ_kind;
+  Option.iter (sub.typ sub) typ_manifest;
+  List.iter (fun (c, _) -> sub.typ sub c) typ_params
+
+let type_declarations sub (_, list) = List.iter (sub.type_declaration sub) list
+
+let type_extension sub {tyext_constructors; tyext_params; _} =
+  List.iter (fun (c, _) -> sub.typ sub c) tyext_params;
+  List.iter (sub.extension_constructor sub) tyext_constructors
+
+let extension_constructor sub {ext_kind; _} =
+  match ext_kind with
+  | Text_decl (ctl, cto) ->
+    constructor_args sub ctl;
+    Option.iter (sub.typ sub) cto
+  | Text_rebind _ -> ()
+
+let pat sub {pat_extra; pat_desc; pat_env; _} =
+  let extra = function
+    | Tpat_type _ -> ()
+    | Tpat_unpack -> ()
+    | Tpat_open (_, _, env) -> sub.env sub env
+    | Tpat_constraint ct -> sub.typ sub ct
+  in
+  sub.env sub pat_env;
+  List.iter (fun (e, _, _) -> extra e) pat_extra;
+  match pat_desc with
+  | Tpat_any -> ()
+  | Tpat_var _ -> ()
+  | Tpat_constant _ -> ()
+  | Tpat_tuple l -> List.iter (sub.pat sub) l
+  | Tpat_construct (_, _, l) -> List.iter (sub.pat sub) l
+  | Tpat_variant (_, po, _) -> Option.iter (sub.pat sub) po
+  | Tpat_record (l, _) -> List.iter (fun (_, _, i, _) -> sub.pat sub i) l
+  | Tpat_array l -> List.iter (sub.pat sub) l
+  | Tpat_or (p1, p2, _) ->
+    sub.pat sub p1;
+    sub.pat sub p2
+  | Tpat_alias (p, _, _) -> sub.pat sub p
+
+let expr sub {exp_extra; exp_desc; exp_env; _} =
+  let extra = function
+    | Texp_constraint cty -> sub.typ sub cty
+    | Texp_coerce cty2 -> sub.typ sub cty2
+    | Texp_newtype _ -> ()
+    | Texp_open (_, _, _, _) -> ()
+  in
+  List.iter (fun (e, _, _) -> extra e) exp_extra;
+  sub.env sub exp_env;
+  match exp_desc with
+  | Texp_ident _ -> ()
+  | Texp_constant _ -> ()
+  | Texp_let (rec_flag, list, exp) ->
+    sub.value_bindings sub (rec_flag, list);
+    sub.expr sub exp
+  | Texp_function {case; _} -> sub.case sub case
+  | Texp_apply {funct = exp; args = list} ->
+    sub.expr sub exp;
+    List.iter (fun (_, o) -> Option.iter (sub.expr sub) o) list
+  | Texp_match (exp, list1, list2, _) ->
+    sub.expr sub exp;
+    sub.cases sub list1;
+    sub.cases sub list2
+  | Texp_try (exp, cases) ->
+    sub.expr sub exp;
+    sub.cases sub cases
+  | Texp_tuple list -> List.iter (sub.expr sub) list
+  | Texp_construct (_, _, args) -> List.iter (sub.expr sub) args
+  | Texp_variant (_, expo) -> Option.iter (sub.expr sub) expo
+  | Texp_record {fields; extended_expression; _} ->
+    Array.iter
+      (function
+        | _, Kept _, _ -> ()
+        | _, Overridden (_, exp), _ -> sub.expr sub exp)
+      fields;
+    Option.iter (sub.expr sub) extended_expression
+  | Texp_field (exp, _, _) -> sub.expr sub exp
+  | Texp_setfield (exp1, _, _, exp2) ->
+    sub.expr sub exp1;
+    sub.expr sub exp2
+  | Texp_array list -> List.iter (sub.expr sub) list
+  | Texp_ifthenelse (exp1, exp2, expo) ->
+    sub.expr sub exp1;
+    sub.expr sub exp2;
+    Option.iter (sub.expr sub) expo
+  | Texp_sequence (exp1, exp2) ->
+    sub.expr sub exp1;
+    sub.expr sub exp2
+  | Texp_while (exp1, exp2) ->
+    sub.expr sub exp1;
+    sub.expr sub exp2
+  | Texp_for (_, _, exp1, exp2, _, exp3) ->
+    sub.expr sub exp1;
+    sub.expr sub exp2;
+    sub.expr sub exp3
+  | Texp_send (exp, _, expo) ->
+    sub.expr sub exp;
+    Option.iter (sub.expr sub) expo
+  | Texp_letmodule (_, _, mexpr, exp) ->
+    sub.module_expr sub mexpr;
+    sub.expr sub exp
+  | Texp_letexception (cd, exp) ->
+    sub.extension_constructor sub cd;
+    sub.expr sub exp
+  | Texp_assert exp -> sub.expr sub exp
+  | Texp_pack mexpr -> sub.module_expr sub mexpr
+  | Texp_extension_constructor _ -> ()
+
+let package_type sub {pack_fields; _} =
+  List.iter (fun (_, p) -> sub.typ sub p) pack_fields
+
+let signature sub {sig_items; sig_final_env; _} =
+  sub.env sub sig_final_env;
+  List.iter (sub.signature_item sub) sig_items
+
+let signature_item sub {sig_desc; sig_env; _} =
+  sub.env sub sig_env;
+  match sig_desc with
+  | Tsig_value v -> sub.value_description sub v
+  | Tsig_type (rf, tdl) -> sub.type_declarations sub (rf, tdl)
+  | Tsig_typext te -> sub.type_extension sub te
+  | Tsig_exception ext -> sub.extension_constructor sub ext
+  | Tsig_module x -> sub.module_declaration sub x
+  | Tsig_recmodule list -> List.iter (sub.module_declaration sub) list
+  | Tsig_modtype x -> sub.module_type_declaration sub x
+  | Tsig_include incl -> include_infos (sub.module_type sub) incl
+  | Tsig_open _od -> ()
+  | Tsig_attribute _ -> ()
+
+let module_type sub {mty_desc; mty_env; _} =
+  sub.env sub mty_env;
+  match mty_desc with
+  | Tmty_ident _ -> ()
+  | Tmty_alias _ -> ()
+  | Tmty_signature sg -> sub.signature sub sg
+  | Tmty_functor (_, _, mtype1, mtype2) ->
+    Option.iter (sub.module_type sub) mtype1;
+    sub.module_type sub mtype2
+  | Tmty_with (mtype, list) ->
+    sub.module_type sub mtype;
+    List.iter (fun (_, _, e) -> sub.with_constraint sub e) list
+  | Tmty_typeof mexpr -> sub.module_expr sub mexpr
+
+let with_constraint sub = function
+  | Twith_type decl -> sub.type_declaration sub decl
+  | Twith_typesubst decl -> sub.type_declaration sub decl
+  | Twith_module _ -> ()
+  | Twith_modsubst _ -> ()
+
+let module_coercion sub = function
+  | Tcoerce_none -> ()
+  | Tcoerce_functor (c1, c2) ->
+    sub.module_coercion sub c1;
+    sub.module_coercion sub c2
+  | Tcoerce_alias (_, c1) -> sub.module_coercion sub c1
+  | Tcoerce_structure (l1, l2, _) ->
+    List.iter (fun (_, c) -> sub.module_coercion sub c) l1;
+    List.iter (fun (_, _, c) -> sub.module_coercion sub c) l2
+  | Tcoerce_primitive {pc_env; _} -> sub.env sub pc_env
+
+let module_expr sub {mod_desc; mod_env; _} =
+  sub.env sub mod_env;
+  match mod_desc with
+  | Tmod_ident _ -> ()
+  | Tmod_structure st -> sub.structure sub st
+  | Tmod_functor (_, _, mtype, mexpr) ->
+    Option.iter (sub.module_type sub) mtype;
+    sub.module_expr sub mexpr
+  | Tmod_apply (mexp1, mexp2, c) ->
+    sub.module_expr sub mexp1;
+    sub.module_expr sub mexp2;
+    sub.module_coercion sub c
+  | Tmod_constraint (mexpr, _, Tmodtype_implicit, c) ->
+    sub.module_expr sub mexpr;
+    sub.module_coercion sub c
+  | Tmod_constraint (mexpr, _, Tmodtype_explicit mtype, c) ->
+    sub.module_expr sub mexpr;
+    sub.module_type sub mtype;
+    sub.module_coercion sub c
+  | Tmod_unpack (exp, _) -> sub.expr sub exp
+
+let module_binding sub {mb_expr; _} = sub.module_expr sub mb_expr
+
+let typ sub {ctyp_desc; ctyp_env; _} =
+  sub.env sub ctyp_env;
+  match ctyp_desc with
+  | Ttyp_any -> ()
+  | Ttyp_var _ -> ()
+  | Ttyp_arrow (arg, ret, _) ->
+    sub.typ sub arg.typ;
+    sub.typ sub ret
+  | Ttyp_tuple list -> List.iter (sub.typ sub) list
+  | Ttyp_constr (_, _, list) -> List.iter (sub.typ sub) list
+  | Ttyp_object (list, _) -> List.iter (sub.object_field sub) list
+  | Ttyp_alias (ct, _) -> sub.typ sub ct
+  | Ttyp_variant (list, _, _) -> List.iter (sub.row_field sub) list
+  | Ttyp_poly (_, ct) -> sub.typ sub ct
+  | Ttyp_package pack -> sub.package_type sub pack
+
+let row_field sub = function
+  | Ttag (_label, _attrs, _bool, list) -> List.iter (sub.typ sub) list
+  | Tinherit ct -> sub.typ sub ct
+
+let object_field sub = function
+  | OTtag (_, _, ct) | OTinherit ct -> sub.typ sub ct
+
+let value_bindings sub (_, list) = List.iter (sub.value_binding sub) list
+let cases sub l = List.iter (sub.case sub) l
+
+let case sub {c_lhs; c_guard; c_rhs} =
+  sub.pat sub c_lhs;
+  Option.iter (sub.expr sub) c_guard;
+  sub.expr sub c_rhs
+
+let value_binding sub {vb_pat; vb_expr; _} =
+  sub.pat sub vb_pat;
+  sub.expr sub vb_expr
+
+let env _sub _ = ()
+
+let default_iterator =
+  {
+    case;
+    cases;
+    env;
+    expr;
+    extension_constructor;
+    module_binding;
+    module_coercion;
+    module_declaration;
+    module_expr;
+    module_type;
+    module_type_declaration;
+    package_type;
+    pat;
+    object_field;
+    row_field;
+    signature;
+    signature_item;
+    structure;
+    structure_item;
+    typ;
+    type_declaration;
+    type_declarations;
+    type_extension;
+    type_kind;
+    value_binding;
+    value_bindings;
+    value_description;
+    with_constraint;
+  }
diff --git a/compiler/ml/tast_iterator.mli b/compiler/ml/tast_iterator.mli
new file mode 100644
index 0000000..85df043
--- /dev/null
+++ b/compiler/ml/tast_iterator.mli
@@ -0,0 +1,54 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                           Isaac "Izzy" Avram                           *)
+(*                                                                        *)
+(*   Copyright 2019 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(**
+Allows the implementation of typed tree inspection using open recursion
+*)
+
+open Asttypes
+open Typedtree
+
+type iterator = {
+  case: iterator -> case -> unit;
+  cases: iterator -> case list -> unit;
+  env: iterator -> Env.t -> unit;
+  expr: iterator -> expression -> unit;
+  extension_constructor: iterator -> extension_constructor -> unit;
+  module_binding: iterator -> module_binding -> unit;
+  module_coercion: iterator -> module_coercion -> unit;
+  module_declaration: iterator -> module_declaration -> unit;
+  module_expr: iterator -> module_expr -> unit;
+  module_type: iterator -> module_type -> unit;
+  module_type_declaration: iterator -> module_type_declaration -> unit;
+  package_type: iterator -> package_type -> unit;
+  pat: iterator -> pattern -> unit;
+  row_field: iterator -> row_field -> unit;
+  object_field: iterator -> object_field -> unit;
+  signature: iterator -> signature -> unit;
+  signature_item: iterator -> signature_item -> unit;
+  structure: iterator -> structure -> unit;
+  structure_item: iterator -> structure_item -> unit;
+  typ: iterator -> core_type -> unit;
+  type_declaration: iterator -> type_declaration -> unit;
+  type_declarations: iterator -> rec_flag * type_declaration list -> unit;
+  type_extension: iterator -> type_extension -> unit;
+  type_kind: iterator -> type_kind -> unit;
+  value_binding: iterator -> value_binding -> unit;
+  value_bindings: iterator -> rec_flag * value_binding list -> unit;
+  value_description: iterator -> value_description -> unit;
+  with_constraint: iterator -> with_constraint -> unit;
+}
+
+val default_iterator : iterator
diff --git a/compiler/ml/tast_mapper.ml b/compiler/ml/tast_mapper.ml
new file mode 100644
index 0000000..54eba02
--- /dev/null
+++ b/compiler/ml/tast_mapper.ml
@@ -0,0 +1,435 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                        Alain Frisch, LexiFi                            *)
+(*                                                                        *)
+(*   Copyright 2015 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Asttypes
+open Typedtree
+
+(* TODO: add 'methods' for location, attribute, extension,
+   open_description, include_declaration, include_description *)
+
+type mapper = {
+  case: mapper -> case -> case;
+  cases: mapper -> case list -> case list;
+  env: mapper -> Env.t -> Env.t;
+  expr: mapper -> expression -> expression;
+  extension_constructor:
+    mapper -> extension_constructor -> extension_constructor;
+  module_binding: mapper -> module_binding -> module_binding;
+  module_coercion: mapper -> module_coercion -> module_coercion;
+  module_declaration: mapper -> module_declaration -> module_declaration;
+  module_expr: mapper -> module_expr -> module_expr;
+  module_type: mapper -> module_type -> module_type;
+  module_type_declaration:
+    mapper -> module_type_declaration -> module_type_declaration;
+  package_type: mapper -> package_type -> package_type;
+  pat: mapper -> pattern -> pattern;
+  row_field: mapper -> row_field -> row_field;
+  object_field: mapper -> object_field -> object_field;
+  signature: mapper -> signature -> signature;
+  signature_item: mapper -> signature_item -> signature_item;
+  structure: mapper -> structure -> structure;
+  structure_item: mapper -> structure_item -> structure_item;
+  typ: mapper -> core_type -> core_type;
+  type_declaration: mapper -> type_declaration -> type_declaration;
+  type_declarations:
+    mapper ->
+    rec_flag * type_declaration list ->
+    rec_flag * type_declaration list;
+  type_extension: mapper -> type_extension -> type_extension;
+  type_kind: mapper -> type_kind -> type_kind;
+  value_binding: mapper -> value_binding -> value_binding;
+  value_bindings:
+    mapper -> rec_flag * value_binding list -> rec_flag * value_binding list;
+  value_description: mapper -> value_description -> value_description;
+  with_constraint: mapper -> with_constraint -> with_constraint;
+}
+
+let id x = x
+let tuple2 f1 f2 (x, y) = (f1 x, f2 y)
+let tuple3 f1 f2 f3 (x, y, z) = (f1 x, f2 y, f3 z)
+let tuple4 f1 f2 f3 f4 (x, y, z, w) = (f1 x, f2 y, f3 z, f4 w)
+let opt f = function
+  | None -> None
+  | Some x -> Some (f x)
+
+let structure sub {str_items; str_type; str_final_env} =
+  {
+    str_items = List.map (sub.structure_item sub) str_items;
+    str_final_env = sub.env sub str_final_env;
+    str_type;
+  }
+
+let module_type_declaration sub x =
+  let mtd_type = opt (sub.module_type sub) x.mtd_type in
+  {x with mtd_type}
+
+let module_declaration sub x =
+  let md_type = sub.module_type sub x.md_type in
+  {x with md_type}
+
+let include_infos f x = {x with incl_mod = f x.incl_mod}
+
+let structure_item sub {str_desc; str_loc; str_env} =
+  let str_env = sub.env sub str_env in
+  let str_desc =
+    match str_desc with
+    | Tstr_eval (exp, attrs) -> Tstr_eval (sub.expr sub exp, attrs)
+    | Tstr_value (rec_flag, list) ->
+      let rec_flag, list = sub.value_bindings sub (rec_flag, list) in
+      Tstr_value (rec_flag, list)
+    | Tstr_primitive v -> Tstr_primitive (sub.value_description sub v)
+    | Tstr_type (rec_flag, list) ->
+      let rec_flag, list = sub.type_declarations sub (rec_flag, list) in
+      Tstr_type (rec_flag, list)
+    | Tstr_typext te -> Tstr_typext (sub.type_extension sub te)
+    | Tstr_exception ext -> Tstr_exception (sub.extension_constructor sub ext)
+    | Tstr_module mb -> Tstr_module (sub.module_binding sub mb)
+    | Tstr_recmodule list ->
+      Tstr_recmodule (List.map (sub.module_binding sub) list)
+    | Tstr_modtype x -> Tstr_modtype (sub.module_type_declaration sub x)
+    | Tstr_include incl ->
+      Tstr_include (include_infos (sub.module_expr sub) incl)
+    | (Tstr_open _ | Tstr_attribute _) as d -> d
+  in
+  {str_desc; str_env; str_loc}
+
+let value_description sub x =
+  let val_desc = sub.typ sub x.val_desc in
+  {x with val_desc}
+
+let label_decl sub x =
+  let ld_type = sub.typ sub x.ld_type in
+  {x with ld_type}
+
+let constructor_args sub = function
+  | Cstr_tuple l -> Cstr_tuple (List.map (sub.typ sub) l)
+  | Cstr_record l -> Cstr_record (List.map (label_decl sub) l)
+
+let constructor_decl sub cd =
+  let cd_args = constructor_args sub cd.cd_args in
+  let cd_res = opt (sub.typ sub) cd.cd_res in
+  {cd with cd_args; cd_res}
+
+let type_kind sub = function
+  | Ttype_abstract -> Ttype_abstract
+  | Ttype_variant list -> Ttype_variant (List.map (constructor_decl sub) list)
+  | Ttype_record list -> Ttype_record (List.map (label_decl sub) list)
+  | Ttype_open -> Ttype_open
+
+let type_declaration sub x =
+  let typ_cstrs =
+    List.map (tuple3 (sub.typ sub) (sub.typ sub) id) x.typ_cstrs
+  in
+  let typ_kind = sub.type_kind sub x.typ_kind in
+  let typ_manifest = opt (sub.typ sub) x.typ_manifest in
+  let typ_params = List.map (tuple2 (sub.typ sub) id) x.typ_params in
+  {x with typ_cstrs; typ_kind; typ_manifest; typ_params}
+
+let type_declarations sub (rec_flag, list) =
+  (rec_flag, List.map (sub.type_declaration sub) list)
+
+let type_extension sub x =
+  let tyext_params = List.map (tuple2 (sub.typ sub) id) x.tyext_params in
+  let tyext_constructors =
+    List.map (sub.extension_constructor sub) x.tyext_constructors
+  in
+  {x with tyext_constructors; tyext_params}
+
+let extension_constructor sub x =
+  let ext_kind =
+    match x.ext_kind with
+    | Text_decl (ctl, cto) ->
+      Text_decl (constructor_args sub ctl, opt (sub.typ sub) cto)
+    | Text_rebind _ as d -> d
+  in
+  {x with ext_kind}
+
+let pat sub x =
+  let extra = function
+    | (Tpat_type _ | Tpat_unpack) as d -> d
+    | Tpat_open (path, loc, env) -> Tpat_open (path, loc, sub.env sub env)
+    | Tpat_constraint ct -> Tpat_constraint (sub.typ sub ct)
+  in
+  let pat_env = sub.env sub x.pat_env in
+  let pat_extra = List.map (tuple3 extra id id) x.pat_extra in
+  let pat_desc =
+    match x.pat_desc with
+    | (Tpat_any | Tpat_var _ | Tpat_constant _) as d -> d
+    | Tpat_tuple l -> Tpat_tuple (List.map (sub.pat sub) l)
+    | Tpat_construct (loc, cd, l) ->
+      Tpat_construct (loc, cd, List.map (sub.pat sub) l)
+    | Tpat_variant (l, po, rd) -> Tpat_variant (l, opt (sub.pat sub) po, rd)
+    | Tpat_record (l, closed) ->
+      Tpat_record (List.map (tuple4 id id (sub.pat sub) id) l, closed)
+    | Tpat_array l -> Tpat_array (List.map (sub.pat sub) l)
+    | Tpat_or (p1, p2, rd) -> Tpat_or (sub.pat sub p1, sub.pat sub p2, rd)
+    | Tpat_alias (p, id, s) -> Tpat_alias (sub.pat sub p, id, s)
+  in
+  {x with pat_extra; pat_desc; pat_env}
+
+let expr sub x =
+  let extra = function
+    | Texp_constraint cty -> Texp_constraint (sub.typ sub cty)
+    | Texp_coerce cty2 -> Texp_coerce (sub.typ sub cty2)
+    | Texp_open (ovf, path, loc, env) ->
+      Texp_open (ovf, path, loc, sub.env sub env)
+    | Texp_newtype _ as d -> d
+  in
+  let exp_extra = List.map (tuple3 extra id id) x.exp_extra in
+  let exp_env = sub.env sub x.exp_env in
+  let exp_desc =
+    match x.exp_desc with
+    | (Texp_ident _ | Texp_constant _) as d -> d
+    | Texp_let (rec_flag, list, exp) ->
+      let rec_flag, list = sub.value_bindings sub (rec_flag, list) in
+      Texp_let (rec_flag, list, sub.expr sub exp)
+    | Texp_function {arg_label; arity; param; case; partial; async} ->
+      Texp_function
+        {arg_label; arity; param; case = sub.case sub case; partial; async}
+    | Texp_apply {funct = exp; args = list; partial; transformed_jsx} ->
+      Texp_apply
+        {
+          funct = sub.expr sub exp;
+          args = List.map (tuple2 id (opt (sub.expr sub))) list;
+          partial;
+          transformed_jsx;
+        }
+    | Texp_match (exp, cases, exn_cases, p) ->
+      Texp_match
+        (sub.expr sub exp, sub.cases sub cases, sub.cases sub exn_cases, p)
+    | Texp_try (exp, cases) -> Texp_try (sub.expr sub exp, sub.cases sub cases)
+    | Texp_tuple list -> Texp_tuple (List.map (sub.expr sub) list)
+    | Texp_construct (lid, cd, args) ->
+      Texp_construct (lid, cd, List.map (sub.expr sub) args)
+    | Texp_variant (l, expo) -> Texp_variant (l, opt (sub.expr sub) expo)
+    | Texp_record {fields; representation; extended_expression} ->
+      let fields =
+        Array.map
+          (function
+            | label, Kept t, o -> (label, Kept t, o)
+            | label, Overridden (lid, exp), o ->
+              (label, Overridden (lid, sub.expr sub exp), o))
+          fields
+      in
+      Texp_record
+        {
+          fields;
+          representation;
+          extended_expression = opt (sub.expr sub) extended_expression;
+        }
+    | Texp_field (exp, lid, ld) -> Texp_field (sub.expr sub exp, lid, ld)
+    | Texp_setfield (exp1, lid, ld, exp2) ->
+      Texp_setfield (sub.expr sub exp1, lid, ld, sub.expr sub exp2)
+    | Texp_array list -> Texp_array (List.map (sub.expr sub) list)
+    | Texp_ifthenelse (exp1, exp2, expo) ->
+      Texp_ifthenelse
+        (sub.expr sub exp1, sub.expr sub exp2, opt (sub.expr sub) expo)
+    | Texp_sequence (exp1, exp2) ->
+      Texp_sequence (sub.expr sub exp1, sub.expr sub exp2)
+    | Texp_while (exp1, exp2) ->
+      Texp_while (sub.expr sub exp1, sub.expr sub exp2)
+    | Texp_for (id, p, exp1, exp2, dir, exp3) ->
+      Texp_for
+        (id, p, sub.expr sub exp1, sub.expr sub exp2, dir, sub.expr sub exp3)
+    | Texp_send (exp, meth, expo) ->
+      Texp_send (sub.expr sub exp, meth, opt (sub.expr sub) expo)
+    | Texp_letmodule (id, s, mexpr, exp) ->
+      Texp_letmodule (id, s, sub.module_expr sub mexpr, sub.expr sub exp)
+    | Texp_letexception (cd, exp) ->
+      Texp_letexception (sub.extension_constructor sub cd, sub.expr sub exp)
+    | Texp_assert exp -> Texp_assert (sub.expr sub exp)
+    | Texp_pack mexpr -> Texp_pack (sub.module_expr sub mexpr)
+    | Texp_extension_constructor _ as e -> e
+  in
+  {x with exp_extra; exp_desc; exp_env}
+
+let package_type sub x =
+  let pack_fields = List.map (tuple2 id (sub.typ sub)) x.pack_fields in
+  {x with pack_fields}
+
+let signature sub x =
+  let sig_final_env = sub.env sub x.sig_final_env in
+  let sig_items = List.map (sub.signature_item sub) x.sig_items in
+  {x with sig_items; sig_final_env}
+
+let signature_item sub x =
+  let sig_env = sub.env sub x.sig_env in
+  let sig_desc =
+    match x.sig_desc with
+    | Tsig_value v -> Tsig_value (sub.value_description sub v)
+    | Tsig_type (rec_flag, list) ->
+      let rec_flag, list = sub.type_declarations sub (rec_flag, list) in
+      Tsig_type (rec_flag, list)
+    | Tsig_typext te -> Tsig_typext (sub.type_extension sub te)
+    | Tsig_exception ext -> Tsig_exception (sub.extension_constructor sub ext)
+    | Tsig_module x -> Tsig_module (sub.module_declaration sub x)
+    | Tsig_recmodule list ->
+      Tsig_recmodule (List.map (sub.module_declaration sub) list)
+    | Tsig_modtype x -> Tsig_modtype (sub.module_type_declaration sub x)
+    | Tsig_include incl ->
+      Tsig_include (include_infos (sub.module_type sub) incl)
+    | (Tsig_open _ | Tsig_attribute _) as d -> d
+  in
+  {x with sig_desc; sig_env}
+
+let module_type sub x =
+  let mty_env = sub.env sub x.mty_env in
+  let mty_desc =
+    match x.mty_desc with
+    | (Tmty_ident _ | Tmty_alias _) as d -> d
+    | Tmty_signature sg -> Tmty_signature (sub.signature sub sg)
+    | Tmty_functor (id, s, mtype1, mtype2) ->
+      Tmty_functor
+        (id, s, opt (sub.module_type sub) mtype1, sub.module_type sub mtype2)
+    | Tmty_with (mtype, list) ->
+      Tmty_with
+        ( sub.module_type sub mtype,
+          List.map (tuple3 id id (sub.with_constraint sub)) list )
+    | Tmty_typeof mexpr -> Tmty_typeof (sub.module_expr sub mexpr)
+  in
+  {x with mty_desc; mty_env}
+
+let with_constraint sub = function
+  | Twith_type decl -> Twith_type (sub.type_declaration sub decl)
+  | Twith_typesubst decl -> Twith_typesubst (sub.type_declaration sub decl)
+  | (Twith_module _ | Twith_modsubst _) as d -> d
+
+let module_coercion sub = function
+  | Tcoerce_none -> Tcoerce_none
+  | Tcoerce_functor (c1, c2) ->
+    Tcoerce_functor (sub.module_coercion sub c1, sub.module_coercion sub c2)
+  | Tcoerce_alias (p, c1) -> Tcoerce_alias (p, sub.module_coercion sub c1)
+  | Tcoerce_structure (l1, l2, runtime_fields) ->
+    let l1' = List.map (fun (i, c) -> (i, sub.module_coercion sub c)) l1 in
+    let l2' =
+      List.map (fun (id, i, c) -> (id, i, sub.module_coercion sub c)) l2
+    in
+    Tcoerce_structure (l1', l2', runtime_fields)
+  | Tcoerce_primitive pc ->
+    Tcoerce_primitive {pc with pc_env = sub.env sub pc.pc_env}
+
+let module_expr sub x =
+  let mod_env = sub.env sub x.mod_env in
+  let mod_desc =
+    match x.mod_desc with
+    | Tmod_ident _ as d -> d
+    | Tmod_structure st -> Tmod_structure (sub.structure sub st)
+    | Tmod_functor (id, s, mtype, mexpr) ->
+      Tmod_functor
+        (id, s, opt (sub.module_type sub) mtype, sub.module_expr sub mexpr)
+    | Tmod_apply (mexp1, mexp2, c) ->
+      Tmod_apply
+        ( sub.module_expr sub mexp1,
+          sub.module_expr sub mexp2,
+          sub.module_coercion sub c )
+    | Tmod_constraint (mexpr, mt, Tmodtype_implicit, c) ->
+      Tmod_constraint
+        ( sub.module_expr sub mexpr,
+          mt,
+          Tmodtype_implicit,
+          sub.module_coercion sub c )
+    | Tmod_constraint (mexpr, mt, Tmodtype_explicit mtype, c) ->
+      Tmod_constraint
+        ( sub.module_expr sub mexpr,
+          mt,
+          Tmodtype_explicit (sub.module_type sub mtype),
+          sub.module_coercion sub c )
+    | Tmod_unpack (exp, mty) -> Tmod_unpack (sub.expr sub exp, mty)
+  in
+  {x with mod_desc; mod_env}
+
+let module_binding sub x =
+  let mb_expr = sub.module_expr sub x.mb_expr in
+  {x with mb_expr}
+
+let typ sub x =
+  let ctyp_env = sub.env sub x.ctyp_env in
+  let ctyp_desc =
+    match x.ctyp_desc with
+    | (Ttyp_any | Ttyp_var _) as d -> d
+    | Ttyp_arrow (arg, ret, arity) ->
+      Ttyp_arrow ({arg with typ = sub.typ sub arg.typ}, sub.typ sub ret, arity)
+    | Ttyp_tuple list -> Ttyp_tuple (List.map (sub.typ sub) list)
+    | Ttyp_constr (path, lid, list) ->
+      Ttyp_constr (path, lid, List.map (sub.typ sub) list)
+    | Ttyp_object (list, closed) ->
+      Ttyp_object (List.map (sub.object_field sub) list, closed)
+    | Ttyp_alias (ct, s) -> Ttyp_alias (sub.typ sub ct, s)
+    | Ttyp_variant (list, closed, labels) ->
+      Ttyp_variant (List.map (sub.row_field sub) list, closed, labels)
+    | Ttyp_poly (sl, ct) -> Ttyp_poly (sl, sub.typ sub ct)
+    | Ttyp_package pack -> Ttyp_package (sub.package_type sub pack)
+  in
+  {x with ctyp_desc; ctyp_env}
+
+let row_field sub = function
+  | Ttag (label, attrs, b, list) ->
+    Ttag (label, attrs, b, List.map (sub.typ sub) list)
+  | Tinherit ct -> Tinherit (sub.typ sub ct)
+
+let object_field sub = function
+  | OTtag (label, attrs, ct) -> OTtag (label, attrs, sub.typ sub ct)
+  | OTinherit ct -> OTinherit (sub.typ sub ct)
+
+let value_bindings sub (rec_flag, list) =
+  (rec_flag, List.map (sub.value_binding sub) list)
+
+let cases sub l = List.map (sub.case sub) l
+
+let case sub {c_lhs; c_guard; c_rhs} =
+  {
+    c_lhs = sub.pat sub c_lhs;
+    c_guard = opt (sub.expr sub) c_guard;
+    c_rhs = sub.expr sub c_rhs;
+  }
+
+let value_binding sub x =
+  let vb_pat = sub.pat sub x.vb_pat in
+  let vb_expr = sub.expr sub x.vb_expr in
+  {x with vb_pat; vb_expr}
+
+let env _sub x = x
+
+let default =
+  {
+    case;
+    cases;
+    env;
+    expr;
+    extension_constructor;
+    module_binding;
+    module_coercion;
+    module_declaration;
+    module_expr;
+    module_type;
+    module_type_declaration;
+    package_type;
+    pat;
+    row_field;
+    object_field;
+    signature;
+    signature_item;
+    structure;
+    structure_item;
+    typ;
+    type_declaration;
+    type_declarations;
+    type_extension;
+    type_kind;
+    value_binding;
+    value_bindings;
+    value_description;
+    with_constraint;
+  }
diff --git a/compiler/ml/tast_mapper.mli b/compiler/ml/tast_mapper.mli
new file mode 100644
index 0000000..50f3ba2
--- /dev/null
+++ b/compiler/ml/tast_mapper.mli
@@ -0,0 +1,58 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                        Alain Frisch, LexiFi                            *)
+(*                                                                        *)
+(*   Copyright 2015 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Asttypes
+open Typedtree
+
+(** {1 A generic Typedtree mapper} *)
+
+type mapper = {
+  case: mapper -> case -> case;
+  cases: mapper -> case list -> case list;
+  env: mapper -> Env.t -> Env.t;
+  expr: mapper -> expression -> expression;
+  extension_constructor:
+    mapper -> extension_constructor -> extension_constructor;
+  module_binding: mapper -> module_binding -> module_binding;
+  module_coercion: mapper -> module_coercion -> module_coercion;
+  module_declaration: mapper -> module_declaration -> module_declaration;
+  module_expr: mapper -> module_expr -> module_expr;
+  module_type: mapper -> module_type -> module_type;
+  module_type_declaration:
+    mapper -> module_type_declaration -> module_type_declaration;
+  package_type: mapper -> package_type -> package_type;
+  pat: mapper -> pattern -> pattern;
+  row_field: mapper -> row_field -> row_field;
+  object_field: mapper -> object_field -> object_field;
+  signature: mapper -> signature -> signature;
+  signature_item: mapper -> signature_item -> signature_item;
+  structure: mapper -> structure -> structure;
+  structure_item: mapper -> structure_item -> structure_item;
+  typ: mapper -> core_type -> core_type;
+  type_declaration: mapper -> type_declaration -> type_declaration;
+  type_declarations:
+    mapper ->
+    rec_flag * type_declaration list ->
+    rec_flag * type_declaration list;
+  type_extension: mapper -> type_extension -> type_extension;
+  type_kind: mapper -> type_kind -> type_kind;
+  value_binding: mapper -> value_binding -> value_binding;
+  value_bindings:
+    mapper -> rec_flag * value_binding list -> rec_flag * value_binding list;
+  value_description: mapper -> value_description -> value_description;
+  with_constraint: mapper -> with_constraint -> with_constraint;
+}
+
+val default : mapper
diff --git a/compiler/ml/tbl.ml b/compiler/ml/tbl.ml
new file mode 100644
index 0000000..d37ba50
--- /dev/null
+++ b/compiler/ml/tbl.ml
@@ -0,0 +1,111 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+type ('k, 'v) t = Empty | Node of ('k, 'v) t * 'k * 'v * ('k, 'v) t * int
+
+let empty = Empty
+
+let height = function
+  | Empty -> 0
+  | Node (_, _, _, _, h) -> h
+
+let create l x d r =
+  let hl = height l and hr = height r in
+  Node (l, x, d, r, if hl >= hr then hl + 1 else hr + 1)
+
+let bal l x d r =
+  let hl = height l and hr = height r in
+  if hl > hr + 1 then
+    match l with
+    | Node (ll, lv, ld, lr, _) when height ll >= height lr ->
+      create ll lv ld (create lr x d r)
+    | Node (ll, lv, ld, Node (lrl, lrv, lrd, lrr, _), _) ->
+      create (create ll lv ld lrl) lrv lrd (create lrr x d r)
+    | _ -> assert false
+  else if hr > hl + 1 then
+    match r with
+    | Node (rl, rv, rd, rr, _) when height rr >= height rl ->
+      create (create l x d rl) rv rd rr
+    | Node (Node (rll, rlv, rld, rlr, _), rv, rd, rr, _) ->
+      create (create l x d rll) rlv rld (create rlr rv rd rr)
+    | _ -> assert false
+  else create l x d r
+
+let rec add x data = function
+  | Empty -> Node (Empty, x, data, Empty, 1)
+  | Node (l, v, d, r, h) ->
+    let c = compare x v in
+    if c = 0 then Node (l, x, data, r, h)
+    else if c < 0 then bal (add x data l) v d r
+    else bal l v d (add x data r)
+
+let rec find x = function
+  | Empty -> raise Not_found
+  | Node (l, v, d, r, _) ->
+    let c = compare x v in
+    if c = 0 then d else find x (if c < 0 then l else r)
+
+let rec find_str (x : string) = function
+  | Empty -> raise Not_found
+  | Node (l, v, d, r, _) ->
+    let c = compare x v in
+    if c = 0 then d else find_str x (if c < 0 then l else r)
+
+let rec mem x = function
+  | Empty -> false
+  | Node (l, v, _d, r, _) ->
+    let c = compare x v in
+    c = 0 || mem x (if c < 0 then l else r)
+
+let rec merge t1 t2 =
+  match (t1, t2) with
+  | Empty, t -> t
+  | t, Empty -> t
+  | Node (l1, v1, d1, r1, _h1), Node (l2, v2, d2, r2, _h2) ->
+    bal l1 v1 d1 (bal (merge r1 l2) v2 d2 r2)
+
+let rec remove x = function
+  | Empty -> Empty
+  | Node (l, v, d, r, _h) ->
+    let c = compare x v in
+    if c = 0 then merge l r
+    else if c < 0 then bal (remove x l) v d r
+    else bal l v d (remove x r)
+
+let rec iter f = function
+  | Empty -> ()
+  | Node (l, v, d, r, _) ->
+    iter f l;
+    f v d;
+    iter f r
+
+let rec map f = function
+  | Empty -> Empty
+  | Node (l, v, d, r, h) -> Node (map f l, v, f v d, map f r, h)
+
+let rec fold f m accu =
+  match m with
+  | Empty -> accu
+  | Node (l, v, d, r, _) -> fold f r (f v d (fold f l accu))
+
+open Format
+
+let print print_key print_data ppf tbl =
+  let print_tbl ppf tbl =
+    iter
+      (fun k d -> fprintf ppf "@[<2>%a ->@ %a;@]@ " print_key k print_data d)
+      tbl
+  in
+  fprintf ppf "@[<hv 2>[[%a]]@]" print_tbl tbl
diff --git a/compiler/ml/tbl.mli b/compiler/ml/tbl.mli
new file mode 100644
index 0000000..7d9296e
--- /dev/null
+++ b/compiler/ml/tbl.mli
@@ -0,0 +1,38 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Association tables from any ordered type to any type.
+   We use the generic ordering to compare keys. *)
+
+type ('k, 'v) t
+
+val empty : ('k, 'v) t
+val add : 'k -> 'v -> ('k, 'v) t -> ('k, 'v) t
+val find : 'k -> ('k, 'v) t -> 'v
+val find_str : string -> (string, 'v) t -> 'v
+val mem : 'k -> ('k, 'v) t -> bool
+val remove : 'k -> ('k, 'v) t -> ('k, 'v) t
+val iter : ('k -> 'v -> unit) -> ('k, 'v) t -> unit
+val map : ('k -> 'v1 -> 'v2) -> ('k, 'v1) t -> ('k, 'v2) t
+val fold : ('k -> 'v -> 'acc -> 'acc) -> ('k, 'v) t -> 'acc -> 'acc
+
+open Format
+
+val print :
+  (formatter -> 'k -> unit) ->
+  (formatter -> 'v -> unit) ->
+  formatter ->
+  ('k, 'v) t ->
+  unit
diff --git a/compiler/ml/transl_recmodule.ml b/compiler/ml/transl_recmodule.ml
new file mode 100644
index 0000000..6b89d29
--- /dev/null
+++ b/compiler/ml/transl_recmodule.ml
@@ -0,0 +1,257 @@
+open Types
+open Typedtree
+open Lambda
+
+type error = Circular_dependency of Ident.t
+
+exception Error of Location.t * error
+(* Reorder bindings to honor dependencies.  *)
+
+(* Utilities for compiling "module rec" definitions *)
+
+let undefined_location loc =
+  let fname, line, char = Location.get_pos_info loc.Location.loc_start in
+  let fname = Filename.basename fname in
+  Lconst
+    (Const_block
+       ( Lambda.Blk_tuple,
+         [
+           Const_base (Const_string (fname, None));
+           Const_base (Const_int line);
+           Const_base (Const_int char);
+         ] ))
+
+let cstr_const = 3
+
+let cstr_non_const = 2
+
+let init_shape modl =
+  let add_name x id =
+    Const_block (Blk_tuple, [x; Const_base (Const_string (Ident.name id, None))])
+  in
+  let module_tag_info : Lambda.tag_info =
+    Blk_constructor {name = "Module"; num_nonconst = 2; tag = 0; attrs = []}
+  in
+  let value_tag_info : Lambda.tag_info =
+    Blk_constructor {name = "value"; num_nonconst = 2; tag = 1; attrs = []}
+  in
+  let rec init_shape_mod env mty =
+    match Mtype.scrape env mty with
+    | Mty_ident _ -> raise Not_found
+    | Mty_alias _ ->
+      Const_block (value_tag_info, [Const_pointer (0, Pt_module_alias)])
+    | Mty_signature sg ->
+      Const_block
+        (module_tag_info, [Const_block (Blk_tuple, init_shape_struct env sg)])
+    | Mty_functor _ -> raise Not_found
+  (* can we do better? *)
+  and init_shape_struct env sg =
+    match sg with
+    | [] -> []
+    | Sig_value (id, {val_kind = Val_reg; val_type = ty}) :: rem ->
+      let is_function t =
+        match t.desc with
+        | Tarrow _ -> true
+        | _ -> false
+      in
+      let init_v =
+        match Ctype.expand_head env ty with
+        | t when is_function t ->
+          Const_pointer
+            ( 0,
+              Pt_constructor
+                {
+                  name = "Function";
+                  const = cstr_const;
+                  non_const = cstr_non_const;
+                  attrs = [];
+                } )
+        | _ -> raise Not_found
+      in
+      add_name init_v id :: init_shape_struct env rem
+    | Sig_value (_, {val_kind = Val_prim _}) :: rem -> init_shape_struct env rem
+    | Sig_type (id, tdecl, _) :: rem ->
+      init_shape_struct (Env.add_type ~check:false id tdecl env) rem
+    | Sig_typext _ :: _ -> raise Not_found
+    | Sig_module (id, md, _) :: rem ->
+      add_name (init_shape_mod env md.md_type) id
+      :: init_shape_struct
+           (Env.add_module_declaration ~check:false id md env)
+           rem
+    | Sig_modtype (id, minfo) :: rem ->
+      init_shape_struct (Env.add_modtype id minfo env) rem
+    | Sig_class _ :: _ -> assert false
+    | Sig_class_type _ :: rem -> init_shape_struct env rem
+  in
+  try
+    Some
+      ( undefined_location modl.mod_loc,
+        Lconst (init_shape_mod modl.mod_env modl.mod_type) )
+  with Not_found -> None
+
+type binding_status = Undefined | Inprogress | Defined
+
+let reorder_rec_bindings bindings =
+  let id = Array.of_list (List.map (fun (id, _, _, _) -> id) bindings)
+  and loc = Array.of_list (List.map (fun (_, loc, _, _) -> loc) bindings)
+  and init = Array.of_list (List.map (fun (_, _, init, _) -> init) bindings)
+  and rhs = Array.of_list (List.map (fun (_, _, _, rhs) -> rhs) bindings) in
+  let fv = Array.map Lambda.free_variables rhs in
+  let num_bindings = Array.length id in
+  let status = Array.make num_bindings Undefined in
+  let res = ref [] in
+  let rec emit_binding i =
+    match status.(i) with
+    | Defined -> ()
+    | Inprogress -> raise (Error (loc.(i), Circular_dependency id.(i)))
+    | Undefined ->
+      if init.(i) = None then (
+        status.(i) <- Inprogress;
+        for j = 0 to num_bindings - 1 do
+          if IdentSet.mem id.(j) fv.(i) then emit_binding j
+        done);
+      res := (id.(i), init.(i), rhs.(i)) :: !res;
+      status.(i) <- Defined
+  in
+  for i = 0 to num_bindings - 1 do
+    match status.(i) with
+    | Undefined -> emit_binding i
+    | Inprogress -> assert false
+    | Defined -> ()
+  done;
+  List.rev !res
+
+type t = Lambda.lambda
+
+(* Utilities for compiling "module rec" definitions *)
+
+type loc = t
+
+type shape = t
+
+type binding = Ident.t * (loc * shape) option * t
+
+let eval_rec_bindings_aux (bindings : binding list) (cont : t) : t =
+  let rec bind_inits args acc =
+    match args with
+    | [] -> acc
+    | (_id, None, _rhs) :: rem -> bind_inits rem acc
+    | (id, Some (loc, shape), _rhs) :: rem ->
+      Lambda.Llet
+        ( Strict,
+          Pgenval,
+          id,
+          Lprim (Pinit_mod, [loc; shape], Location.none),
+          bind_inits rem acc )
+  in
+  let rec bind_strict args acc =
+    match args with
+    | [] -> acc
+    | (id, None, rhs) :: rem ->
+      Lambda.Llet (Strict, Pgenval, id, rhs, bind_strict rem acc)
+    | (_id, Some _, _rhs) :: rem -> bind_strict rem acc
+  in
+  let rec patch_forwards args =
+    match args with
+    | [] -> cont
+    | (_id, None, _rhs) :: rem -> patch_forwards rem
+    | (id, Some (_loc, shape), rhs) :: rem ->
+      Lsequence
+        ( Lprim (Pupdate_mod, [shape; Lvar id; rhs], Location.none),
+          patch_forwards rem )
+  in
+  bind_inits bindings (bind_strict bindings (patch_forwards bindings))
+
+(* collect all function declarations
+    if the module creation is just a set of function declarations and consts,
+    it is good
+*)
+let rec is_function_or_const_block (lam : Lambda.lambda) acc =
+  match lam with
+  | Lprim (Pmakeblock _, args, _) ->
+    Ext_list.for_all args (fun x ->
+        match x with
+        | Lvar id -> Set_ident.mem acc id
+        | Lfunction _ | Lconst _ -> true
+        | _ -> false)
+  | Llet (_, _, id, Lfunction _, cont) ->
+    is_function_or_const_block cont (Set_ident.add acc id)
+  | Lletrec (bindings, cont) -> (
+    let rec aux_bindings bindings acc =
+      match bindings with
+      | [] -> Some acc
+      | (id, Lambda.Lfunction _) :: rest ->
+        aux_bindings rest (Set_ident.add acc id)
+      | (_, _) :: _ -> None
+    in
+    match aux_bindings bindings acc with
+    | None -> false
+    | Some acc -> is_function_or_const_block cont acc)
+  | Llet (_, _, _, Lconst _, cont) -> is_function_or_const_block cont acc
+  | Llet (_, _, id1, Lvar id2, cont) when Set_ident.mem acc id2 ->
+    is_function_or_const_block cont (Set_ident.add acc id1)
+  | _ -> false
+
+let is_strict_or_all_functions (xs : binding list) =
+  Ext_list.for_all xs (fun (_, opt, rhs) ->
+      match opt with
+      | None -> true
+      | _ -> is_function_or_const_block rhs Set_ident.empty)
+
+(* Without such optimizations:
+
+   {[
+     module rec X : sig
+       val f : int -> int
+     end = struct
+       let f x = x + 1
+     end
+     and Y : sig
+       val f : int -> int
+     end = struct
+       let f x  = x + 2
+     end
+   ]}
+   would generate such rawlambda:
+
+   {[
+     (setglobal Debug_tmp!
+        (let
+          (X/1002 = (#init_mod [0: "debug_tmp.ml" 15 6] [0: [0: [0: 0a "f"]]])
+             Y/1003 = (#init_mod [0: "debug_tmp.ml" 20 6] [0: [0: [0: 0a "f"]]]))
+            (seq
+               (#update_mod [0: [0: [0: 0a "f"]]] X/1002
+                  (let (f/1010 = (function x/1011 (+ x/1011 1)))
+                       (makeblock 0/[f] f/1010)))
+               (#update_mod [0: [0: [0: 0a "f"]]] Y/1003
+                  (let (f/1012 = (function x/1013 (+ x/1013 2)))
+                       (makeblock 0/[f] f/1012)))
+               (makeblock 0/module/exports X/1002 Y/1003))))
+
+   ]}
+*)
+let eval_rec_bindings (bindings : binding list) (cont : t) : t =
+  if is_strict_or_all_functions bindings then
+    Lambda.Lletrec (Ext_list.map bindings (fun (id, _, rhs) -> (id, rhs)), cont)
+  else eval_rec_bindings_aux bindings cont
+
+let compile_recmodule compile_rhs bindings cont =
+  eval_rec_bindings
+    (reorder_rec_bindings
+       (List.map
+          (fun {mb_id = id; mb_expr = modl; mb_loc = loc; _} ->
+            (id, modl.mod_loc, init_shape modl, compile_rhs id modl loc))
+          bindings))
+    cont
+
+let report_error ppf = function
+  | Circular_dependency id ->
+    Format.fprintf ppf
+      "@[Cannot safely evaluate the definition@ of the recursively-defined \
+       module %a@]"
+      Printtyp.ident id
+
+let () =
+  Location.register_error_of_exn (function
+    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
+    | _ -> None)
diff --git a/jscomp/ml/transl_recmodule.mli b/compiler/ml/transl_recmodule.mli
similarity index 99%
rename from jscomp/ml/transl_recmodule.mli
rename to compiler/ml/transl_recmodule.mli
index a94a418..8261108 100644
--- a/jscomp/ml/transl_recmodule.mli
+++ b/compiler/ml/transl_recmodule.mli
@@ -21,7 +21,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-
 val compile_recmodule :
   (Ident.t -> Typedtree.module_expr -> Location.t -> Lambda.lambda) ->
   Typedtree.module_binding list ->
diff --git a/compiler/ml/translattribute.ml b/compiler/ml/translattribute.ml
new file mode 100644
index 0000000..ed63ecb
--- /dev/null
+++ b/compiler/ml/translattribute.ml
@@ -0,0 +1,128 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*                      Pierre Chambart, OCamlPro                         *)
+(*                                                                        *)
+(*   Copyright 2015 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+type t = Parsetree.attribute
+
+let is_inline_attribute (attr : t) =
+  match attr with
+  | {txt = "inline"}, _ -> true
+  | _ -> false
+
+let is_inlined_attribute (attr : t) =
+  match attr with
+  | {txt = "inlined"}, _ -> true
+  | _ -> false
+
+let find_attribute p (attributes : t list) =
+  let inline_attribute, other_attributes = List.partition p attributes in
+  let attr =
+    match inline_attribute with
+    | [] -> None
+    | [attr] -> Some attr
+    | _ :: ({txt; loc}, _) :: _ ->
+      Location.prerr_warning loc (Warnings.Duplicated_attribute txt);
+      None
+  in
+  (attr, other_attributes)
+
+let parse_inline_attribute (attr : t option) : Lambda.inline_attribute =
+  match attr with
+  | None -> Default_inline
+  | Some ({txt; loc}, payload) -> (
+    let open Parsetree in
+    (* the 'inline' and 'inlined' attributes can be used as
+       [@inline], [@inline never] or [@inline always].
+       [@inline] is equivalent to [@inline always] *)
+    let warning txt =
+      Warnings.Attribute_payload
+        (txt, "It must be either empty, 'always' or 'never'")
+    in
+    match payload with
+    | PStr [] -> Always_inline
+    | PStr [{pstr_desc = Pstr_eval ({pexp_desc}, [])}] -> (
+      match pexp_desc with
+      | Pexp_ident {txt = Longident.Lident "never"} -> Never_inline
+      | Pexp_ident {txt = Longident.Lident "always"} -> Always_inline
+      | _ ->
+        Location.prerr_warning loc (warning txt);
+        Default_inline)
+    | _ ->
+      Location.prerr_warning loc (warning txt);
+      Default_inline)
+
+let get_inline_attribute l =
+  let attr, _ = find_attribute is_inline_attribute l in
+  parse_inline_attribute attr
+
+let rec add_inline_attribute (expr : Lambda.lambda) loc attributes =
+  match (expr, get_inline_attribute attributes) with
+  | expr, Default_inline -> expr
+  | Lfunction ({attr} as funct), inline ->
+    (match attr.inline with
+    | Default_inline -> ()
+    | Always_inline | Never_inline ->
+      Location.prerr_warning loc (Warnings.Duplicated_attribute "inline"));
+    let attr = {attr with inline} in
+    Lfunction {funct with attr}
+  | Lprim (((Pjs_fn_make _ | Pjs_fn_make_unit) as p), [e], l), _ ->
+    Lambda.Lprim (p, [add_inline_attribute e loc attributes], l)
+  | expr, Always_inline ->
+    Location.prerr_warning loc (Warnings.Misplaced_attribute "inline1");
+    expr
+  | expr, Never_inline ->
+    Location.prerr_warning loc (Warnings.Misplaced_attribute "inline2");
+    expr
+
+(* Get the [@inlined] attribute payload (or default if not present).
+   It also returns the expression without this attribute. This is
+   used to ensure that this attribute is not misplaced: If it
+   appears on any expression, it is an error, otherwise it would
+   have been removed by this function *)
+let get_and_remove_inlined_attribute (e : Typedtree.expression) =
+  let attr, exp_attributes =
+    find_attribute is_inlined_attribute e.exp_attributes
+  in
+  let inlined = parse_inline_attribute attr in
+  (inlined, {e with exp_attributes})
+
+let get_and_remove_inlined_attribute_on_module (e : Typedtree.module_expr) =
+  let attr, mod_attributes =
+    find_attribute is_inlined_attribute e.mod_attributes
+  in
+  let inlined = parse_inline_attribute attr in
+  (inlined, {e with mod_attributes})
+
+let check_attribute (e : Typedtree.expression) (({txt; loc}, _) : t) =
+  match txt with
+  | "inline" -> (
+    match e.exp_desc with
+    | Texp_function _ -> ()
+    | _ -> Location.prerr_warning loc (Warnings.Misplaced_attribute txt))
+  | "inlined" ->
+    (* Removed by the Texp_apply cases *)
+    Location.prerr_warning loc (Warnings.Misplaced_attribute txt)
+  | _ -> ()
+
+let check_attribute_on_module (e : Typedtree.module_expr) (({txt; loc}, _) : t)
+    =
+  match txt with
+  | "inline" -> (
+    match e.mod_desc with
+    | Tmod_functor _ -> ()
+    | _ -> Location.prerr_warning loc (Warnings.Misplaced_attribute txt))
+  | "inlined" ->
+    (* Removed by the Texp_apply cases *)
+    Location.prerr_warning loc (Warnings.Misplaced_attribute txt)
+  | _ -> ()
diff --git a/jscomp/ml/translattribute.mli b/compiler/ml/translattribute.mli
similarity index 100%
rename from jscomp/ml/translattribute.mli
rename to compiler/ml/translattribute.mli
diff --git a/compiler/ml/translcore.ml b/compiler/ml/translcore.ml
new file mode 100644
index 0000000..078cbf1
--- /dev/null
+++ b/compiler/ml/translcore.ml
@@ -0,0 +1,1284 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Translation from typed abstract syntax to lambda terms,
+   for the core language *)
+
+open Misc
+open Asttypes
+open Primitive
+open Types
+open Typedtree
+open Typeopt
+open Lambda
+
+type error = Unknown_builtin_primitive of string
+
+exception Error of Location.t * error
+
+(* Forward declaration -- to be filled in by Translmod.transl_module *)
+let transl_module =
+  ref
+    (fun _cc _rootpath _modl -> assert false
+      : module_coercion -> Path.t option -> module_expr -> lambda)
+
+(* Compile an exception/extension definition *)
+
+let transl_extension_constructor env path ext =
+  let name =
+    match path (*!Clflags.for_package*) with
+    | None -> Ident.name ext.ext_id
+    | Some p -> Path.name p
+  in
+  let loc = ext.ext_loc in
+  match ext.ext_kind with
+  | Text_decl _ -> Lprim (Pcreate_extension name, [], loc)
+  | Text_rebind (path, _lid) -> transl_extension_path ~loc env path
+
+(* Translation of primitives *)
+
+(** This is ad-hoc translation for unifying specific primitive operations
+     See [Unified_ops] module for detailed explanation.
+  *)
+let translate_unified_ops (prim : Primitive.description) (env : Env.t)
+    (lhs_type : type_expr) : Lambda.primitive option =
+  (* lhs_type is already unified in type-level *)
+  let entry = Hashtbl.find_opt Unified_ops.index_by_name prim.prim_name in
+  match entry with
+  | Some {specialization} -> (
+    match specialization with
+    | {int}
+      when is_base_type env lhs_type Predef.path_int
+           || maybe_pointer_type env lhs_type = Immediate ->
+      Some int
+    | {float = Some float} when is_base_type env lhs_type Predef.path_float ->
+      Some float
+    | {bigint = Some bigint} when is_base_type env lhs_type Predef.path_bigint
+      ->
+      Some bigint
+    | {string = Some string} when is_base_type env lhs_type Predef.path_string
+      ->
+      Some string
+    | {bool = Some bool} when is_base_type env lhs_type Predef.path_bool ->
+      Some bool
+    | {int} -> Some int)
+  | _ -> None
+
+type specialized = {
+  objcomp: Lambda.primitive;
+  intcomp: Lambda.primitive;
+  boolcomp: Lambda.primitive;
+  floatcomp: Lambda.primitive;
+  stringcomp: Lambda.primitive;
+  bigintcomp: Lambda.primitive;
+  simplify_constant_constructor: bool;
+}
+
+let comparisons_table =
+  create_hashtable
+    [|
+      ( "%equal",
+        {
+          objcomp = Pobjcomp Ceq;
+          intcomp = Pintcomp Ceq;
+          boolcomp = Pboolcomp Ceq;
+          floatcomp = Pfloatcomp Ceq;
+          stringcomp = Pstringcomp Ceq;
+          bigintcomp = Pbigintcomp Ceq;
+          simplify_constant_constructor = true;
+        } );
+      ( "%notequal",
+        {
+          objcomp = Pobjcomp Cneq;
+          intcomp = Pintcomp Cneq;
+          boolcomp = Pboolcomp Cneq;
+          floatcomp = Pfloatcomp Cneq;
+          stringcomp = Pstringcomp Cneq;
+          bigintcomp = Pbigintcomp Cneq;
+          simplify_constant_constructor = true;
+        } );
+      ( "%lessthan",
+        {
+          objcomp = Pobjcomp Clt;
+          intcomp = Pintcomp Clt;
+          boolcomp = Pboolcomp Clt;
+          floatcomp = Pfloatcomp Clt;
+          stringcomp = Pstringcomp Clt;
+          bigintcomp = Pbigintcomp Clt;
+          simplify_constant_constructor = false;
+        } );
+      ( "%greaterthan",
+        {
+          objcomp = Pobjcomp Cgt;
+          intcomp = Pintcomp Cgt;
+          boolcomp = Pboolcomp Cgt;
+          floatcomp = Pfloatcomp Cgt;
+          stringcomp = Pstringcomp Cgt;
+          bigintcomp = Pbigintcomp Cgt;
+          simplify_constant_constructor = false;
+        } );
+      ( "%lessequal",
+        {
+          objcomp = Pobjcomp Cle;
+          intcomp = Pintcomp Cle;
+          boolcomp = Pboolcomp Cle;
+          floatcomp = Pfloatcomp Cle;
+          stringcomp = Pstringcomp Cle;
+          bigintcomp = Pbigintcomp Cle;
+          simplify_constant_constructor = false;
+        } );
+      ( "%greaterequal",
+        {
+          objcomp = Pobjcomp Cge;
+          intcomp = Pintcomp Cge;
+          boolcomp = Pboolcomp Cge;
+          floatcomp = Pfloatcomp Cge;
+          stringcomp = Pstringcomp Cge;
+          bigintcomp = Pbigintcomp Cge;
+          simplify_constant_constructor = false;
+        } );
+      ( "%compare",
+        {
+          objcomp = Pobjorder;
+          intcomp = Pintorder;
+          boolcomp = Pboolorder;
+          floatcomp = Pfloatorder;
+          stringcomp = Pstringorder;
+          bigintcomp = Pbigintorder;
+          simplify_constant_constructor = false;
+        } );
+      ( "%max",
+        {
+          objcomp = Pobjmax;
+          intcomp = Pintmax;
+          boolcomp = Pboolmax;
+          floatcomp = Pfloatmax;
+          stringcomp = Pstringmax;
+          bigintcomp = Pbigintmax;
+          simplify_constant_constructor = false;
+        } );
+      ( "%min",
+        {
+          objcomp = Pobjmin;
+          intcomp = Pintmin;
+          boolcomp = Pboolmin;
+          floatcomp = Pfloatmin;
+          stringcomp = Pstringmin;
+          bigintcomp = Pbigintmin;
+          simplify_constant_constructor = false;
+        } );
+      ( "%equal_null",
+        {
+          objcomp = Pobjcomp Ceq;
+          intcomp = Pintcomp Ceq;
+          boolcomp = Pboolcomp Ceq;
+          floatcomp = Pfloatcomp Ceq;
+          stringcomp = Pstringcomp Ceq;
+          bigintcomp = Pbigintcomp Ceq;
+          simplify_constant_constructor = false;
+        } );
+      ( "%equal_undefined",
+        {
+          objcomp = Pobjcomp Ceq;
+          intcomp = Pintcomp Ceq;
+          boolcomp = Pboolcomp Ceq;
+          floatcomp = Pfloatcomp Ceq;
+          stringcomp = Pstringcomp Ceq;
+          bigintcomp = Pbigintcomp Ceq;
+          simplify_constant_constructor = false;
+        } );
+      ( "%equal_nullable",
+        {
+          objcomp = Pobjcomp Ceq;
+          intcomp = Pintcomp Ceq;
+          boolcomp = Pboolcomp Ceq;
+          floatcomp = Pfloatcomp Ceq;
+          stringcomp = Pstringcomp Ceq;
+          bigintcomp = Pbigintcomp Ceq;
+          simplify_constant_constructor = false;
+        } );
+      (* FIXME: Core compatibility *)
+      ( "%bs_min",
+        {
+          objcomp = Pobjmin;
+          intcomp = Pintmin;
+          boolcomp = Pboolmin;
+          floatcomp = Pfloatmin;
+          stringcomp = Pstringmin;
+          bigintcomp = Pbigintmin;
+          simplify_constant_constructor = false;
+        } );
+      ( "%bs_max",
+        {
+          objcomp = Pobjmax;
+          intcomp = Pintmax;
+          boolcomp = Pboolmax;
+          floatcomp = Pfloatmax;
+          stringcomp = Pstringmax;
+          bigintcomp = Pbigintmax;
+          simplify_constant_constructor = false;
+        } );
+    |]
+
+let primitives_table =
+  create_hashtable
+    [|
+      ("%identity", Pidentity);
+      ("%ignore", Pignore);
+      ("%revapply", Prevapply);
+      ("%apply", Pdirapply);
+      ("%loc_LOC", Ploc Loc_LOC);
+      ("%loc_FILE", Ploc Loc_FILE);
+      ("%loc_LINE", Ploc Loc_LINE);
+      ("%loc_POS", Ploc Loc_POS);
+      ("%loc_MODULE", Ploc Loc_MODULE);
+      (* BEGIN Triples for  ref data type *)
+      ("%makeref", Pmakeblock Lambda.ref_tag_info);
+      ("%refset", Psetfield (0, Lambda.ref_field_set_info));
+      ("%refget", Pfield (0, Lambda.ref_field_info));
+      ("%incr", Poffsetref 1);
+      ("%decr", Poffsetref (-1));
+      (* Finish Triples for  ref data type *)
+      ("%field0", Pfield (0, Fld_tuple));
+      ("%field1", Pfield (1, Fld_tuple));
+      ("%obj_dup", Pduprecord);
+      ("%obj_tag", Pobjtag);
+      ("%obj_size", Pobjsize);
+      ("%obj_get_field", Parrayrefu);
+      ("%obj_set_field", Parraysetu);
+      ("%raise", Praise Raise_regular);
+      (* bool primitives *)
+      ("%sequand", Psequand);
+      ("%sequor", Psequor);
+      ("%boolnot", Pnot);
+      ("%boolorder", Pboolorder);
+      ("%boolmin", Pboolmin);
+      ("%boolmax", Pboolmax);
+      (* int primitives *)
+      ("%obj_is_int", Pisint);
+      ("%negint", Pnegint);
+      ("%succint", Poffsetint 1);
+      ("%predint", Poffsetint (-1));
+      ("%addint", Paddint);
+      ("%subint", Psubint);
+      ("%mulint", Pmulint);
+      ("%divint", Pdivint);
+      ("%modint", Pmodint);
+      ("%bitnot_int", Pnotint);
+      ("%andint", Pandint);
+      ("%orint", Porint);
+      ("%xorint", Pxorint);
+      ("%lslint", Plslint);
+      ("%lsrint", Plsrint);
+      ("%asrint", Pasrint);
+      ("%eq", Pintcomp Ceq);
+      ("%noteq", Pintcomp Cneq);
+      ("%ltint", Pintcomp Clt);
+      ("%leint", Pintcomp Cle);
+      ("%gtint", Pintcomp Cgt);
+      ("%geint", Pintcomp Cge);
+      ("%intorder", Pintorder);
+      ("%intmin", Pintmin);
+      ("%intmax", Pintmax);
+      (* float primitives *)
+      ("%negfloat", Pnegfloat);
+      ("%absfloat", Pabsfloat);
+      ("%addfloat", Paddfloat);
+      ("%subfloat", Psubfloat);
+      ("%mulfloat", Pmulfloat);
+      ("%divfloat", Pdivfloat);
+      ("%modfloat", Pmodfloat);
+      ("%eqfloat", Pfloatcomp Ceq);
+      ("%noteqfloat", Pfloatcomp Cneq);
+      ("%ltfloat", Pfloatcomp Clt);
+      ("%lefloat", Pfloatcomp Cle);
+      ("%gtfloat", Pfloatcomp Cgt);
+      ("%gefloat", Pfloatcomp Cge);
+      ("%floatorder", Pfloatorder);
+      ("%floatmin", Pfloatmin);
+      ("%floatmax", Pfloatmax);
+      (* bigint primitives *)
+      ("%negbigint", Pnegbigint);
+      ("%addbigint", Paddbigint);
+      ("%subbigint", Psubbigint);
+      ("%mulbigint", Pmulbigint);
+      ("%divbigint", Pdivbigint);
+      ("%powbigint", Ppowbigint);
+      ("%modbigint", Pmodbigint);
+      ("%eqbigint", Pbigintcomp Ceq);
+      ("%noteqbigint", Pbigintcomp Cneq);
+      ("%ltbigint", Pbigintcomp Clt);
+      ("%lebigint", Pbigintcomp Cle);
+      ("%gtbigint", Pbigintcomp Cgt);
+      ("%gebigint", Pbigintcomp Cge);
+      ("%bitnot_bigint", Pnotbigint);
+      ("%andbigint", Pandbigint);
+      ("%orbigint", Porbigint);
+      ("%xorbigint", Pxorbigint);
+      ("%lslbigint", Plslbigint);
+      ("%asrbigint", Pasrbigint);
+      ("%bigintorder", Pbigintorder);
+      ("%bigintmin", Pbigintmin);
+      ("%bigintmax", Pbigintmax);
+      (* string primitives *)
+      ("%string_length", Pstringlength);
+      ("%string_safe_get", Pstringrefs);
+      ("%string_unsafe_get", Pstringrefu);
+      ("%stringorder", Pstringorder);
+      ("%stringmin", Pstringmin);
+      ("%stringmax", Pstringmax);
+      ("%string_concat", Pstringadd);
+      (* array primitives *)
+      ("%array_length", Parraylength);
+      ("%array_safe_get", Parrayrefs);
+      ("%array_safe_set", Parraysets);
+      ("%array_unsafe_get", Parrayrefu);
+      ("%array_unsafe_set", Parraysetu);
+      (* dict primitives *)
+      ("%makedict", Pmakedict);
+      ("%dict_has", Pdict_has);
+      (* promise *)
+      ("%await", Pawait);
+      (* module *)
+      ("%import", Pimport);
+      (* hash *)
+      ("%hash", Phash);
+      ("%hash_mix_int", Phash_mixint);
+      ("%hash_mix_string", Phash_mixstring);
+      ("%hash_final_mix", Phash_finalmix);
+      (* etc *)
+      ("%typeof", Ptypeof);
+      ("%debugger", Pdebugger);
+      ("%intoffloat", Pintoffloat);
+      ("%floatofint", Pfloatofint);
+      ("%unsafe_eq", Pjscomp Ceq);
+      ("%unsafe_neq", Pjscomp Cneq);
+      ("%unsafe_lt", Pjscomp Clt);
+      ("%unsafe_le", Pjscomp Cle);
+      ("%unsafe_gt", Pjscomp Cgt);
+      ("%unsafe_ge", Pjscomp Cge);
+      ("%null", Pnull);
+      ("%undefined", Pundefined);
+      ("%is_nullable", Pisnullable);
+      ("%null_to_opt", Pnull_to_opt);
+      ("%nullable_to_opt", Pnullable_to_opt);
+      ("%function_arity", Pfn_arity);
+      ("%wrap_exn", Pwrap_exn);
+      ("%curry_apply1", Pcurry_apply 1);
+      ("%curry_apply2", Pcurry_apply 2);
+      ("%curry_apply3", Pcurry_apply 3);
+      ("%curry_apply4", Pcurry_apply 4);
+      ("%curry_apply5", Pcurry_apply 5);
+      ("%curry_apply6", Pcurry_apply 6);
+      ("%curry_apply7", Pcurry_apply 7);
+      ("%curry_apply8", Pcurry_apply 8);
+      ("%makemutablelist", Pmakelist Mutable);
+      ("%unsafe_to_method", Pjs_fn_method);
+      (* Compiler internals, never expose to ReScript files *)
+      ("#raw_expr", Pjs_raw_expr);
+      ("#raw_stmt", Pjs_raw_stmt);
+      (* FIXME: Core compatibility *)
+      ("#null", Pnull);
+      ("#undefined", Pundefined);
+      ("#typeof", Ptypeof);
+      ("#is_nullable", Pisnullable);
+      ("#null_to_opt", Pnull_to_opt);
+      ("#nullable_to_opt", Pnullable_to_opt);
+      ("#makemutablelist", Pmakelist Mutable);
+      ("#import", Pimport);
+      (* FIXME: Deprecated *)
+      ("%obj_field", Parrayrefu);
+    |]
+
+let find_primitive prim_name = Hashtbl.find primitives_table prim_name
+
+let specialize_comparison
+    ({objcomp; intcomp; floatcomp; stringcomp; bigintcomp; boolcomp} :
+      specialized) env ty =
+  match () with
+  | ()
+    when is_base_type env ty Predef.path_int
+         || is_base_type env ty Predef.path_char
+         || maybe_pointer_type env ty = Immediate ->
+    intcomp
+  | () when is_base_type env ty Predef.path_float -> floatcomp
+  | () when is_base_type env ty Predef.path_string -> stringcomp
+  | () when is_base_type env ty Predef.path_bigint -> bigintcomp
+  | () when is_base_type env ty Predef.path_bool -> boolcomp
+  | () -> objcomp
+
+(* Specialize a primitive from available type information,
+   raise Not_found if primitive is unknown *)
+
+let specialize_primitive p env ty (* ~has_constant_constructor *) =
+  let fn_expr = is_function_type env ty in
+  let unified =
+    match fn_expr with
+    | Some (lhs, _) -> translate_unified_ops p env lhs
+    | None -> None
+  in
+  match unified with
+  | Some primitive -> primitive
+  | None -> (
+    try
+      let table = Hashtbl.find comparisons_table p.prim_name in
+      match fn_expr with
+      | Some (lhs, _rhs) -> specialize_comparison table env lhs
+      | None -> table.objcomp
+    with Not_found -> find_primitive p.prim_name)
+
+(* Eta-expand a primitive *)
+
+let transl_primitive loc p env ty =
+  (* Printf.eprintf "----transl_primitive %s----\n" p.prim_name; *)
+  let prim =
+    try specialize_primitive p env ty (* ~has_constant_constructor:false *)
+    with Not_found -> Pccall p
+  in
+  match prim with
+  | Ploc kind -> (
+    let lam = lam_of_loc kind loc in
+    match p.prim_arity with
+    | 0 -> lam
+    | 1 ->
+      (* TODO: we should issue a warning ? *)
+      let param = Ident.create "prim" in
+      Lfunction
+        {
+          params = [param];
+          attr = default_function_attribute;
+          loc;
+          body = Lprim (Pmakeblock Blk_tuple, [lam; Lvar param], loc);
+        }
+    | _ -> assert false)
+  | _ ->
+    let rec make_params n total =
+      if n <= 0 then []
+      else
+        Ident.create ("prim" ^ string_of_int (total - n))
+        :: make_params (n - 1) total
+    in
+    let prim_arity = p.prim_arity in
+    if p.prim_from_constructor || prim_arity = 0 then Lprim (prim, [], loc)
+    else
+      let params =
+        if prim_arity = 1 then [Ident.create "prim"]
+        else make_params prim_arity prim_arity
+      in
+      Lfunction
+        {
+          params;
+          attr = default_function_attribute;
+          loc;
+          body = Lprim (prim, List.map (fun id -> Lvar id) params, loc);
+        }
+
+let transl_primitive_application loc prim env ty args =
+  let prim_name = prim.prim_name in
+  let unified =
+    match args with
+    | [arg1] | [arg1; _] -> translate_unified_ops prim env arg1.exp_type
+    | _ -> None
+  in
+  match unified with
+  | Some primitive -> primitive
+  | None -> (
+    try
+      match args with
+      | [arg1; _]
+        when is_base_type env arg1.exp_type Predef.path_bool
+             && Hashtbl.mem comparisons_table prim_name ->
+        (Hashtbl.find comparisons_table prim_name).boolcomp
+      | _ ->
+        let has_constant_constructor =
+          match args with
+          | [
+              _; {exp_desc = Texp_construct (_, {cstr_tag = Cstr_constant _}, _)};
+            ]
+          | [
+              {exp_desc = Texp_construct (_, {cstr_tag = Cstr_constant _}, _)}; _;
+            ]
+          | [_; {exp_desc = Texp_variant (_, None)}]
+          | [{exp_desc = Texp_variant (_, None)}; _] ->
+            true
+          | _ -> false
+        in
+        if has_constant_constructor then
+          match Hashtbl.find_opt comparisons_table prim_name with
+          | Some table when table.simplify_constant_constructor -> table.intcomp
+          | Some _ | None -> specialize_primitive prim env ty
+          (* ~has_constant_constructor*)
+        else specialize_primitive prim env ty
+    with Not_found ->
+      if String.length prim_name > 0 && prim_name.[0] = '%' then
+        raise (Error (loc, Unknown_builtin_primitive prim_name));
+      Pccall prim)
+
+(* To propagate structured constants *)
+
+exception Not_constant
+
+let extract_constant = function
+  | Lconst sc -> sc
+  | _ -> raise_notrace Not_constant
+
+(* Push the default values under the functional abstractions *)
+(* Also push bindings of module patterns, since this sound *)
+
+type binding =
+  | Bind_value of value_binding list
+  | Bind_module of Ident.t * string loc * module_expr
+
+let rec push_defaults loc bindings case partial =
+  match case with
+  | {
+   c_lhs = pat;
+   c_guard = None;
+   c_rhs =
+     {exp_desc = Texp_function {arg_label; arity; param; case; partial; async}}
+     as exp;
+  } ->
+    let case = push_defaults exp.exp_loc bindings case partial in
+
+    {
+      c_lhs = pat;
+      c_guard = None;
+      c_rhs =
+        {
+          exp with
+          exp_desc =
+            Texp_function {arg_label; arity; param; case; partial; async};
+        };
+    }
+  | {
+   c_lhs = pat;
+   c_guard = None;
+   c_rhs =
+     {
+       exp_attributes = [({txt = "#default"}, _)];
+       exp_desc =
+         Texp_let (Nonrecursive, binds, ({exp_desc = Texp_function _} as e2));
+     };
+  } ->
+    push_defaults loc
+      (Bind_value binds :: bindings)
+      {c_lhs = pat; c_guard = None; c_rhs = e2}
+      partial
+  | {
+   c_lhs = pat;
+   c_guard = None;
+   c_rhs =
+     {
+       exp_attributes = [({txt = "#modulepat"}, _)];
+       exp_desc =
+         Texp_letmodule (id, name, mexpr, ({exp_desc = Texp_function _} as e2));
+     };
+  } ->
+    push_defaults loc
+      (Bind_module (id, name, mexpr) :: bindings)
+      {c_lhs = pat; c_guard = None; c_rhs = e2}
+      partial
+  | case ->
+    let exp =
+      List.fold_left
+        (fun exp binds ->
+          {
+            exp with
+            exp_desc =
+              (match binds with
+              | Bind_value binds -> Texp_let (Nonrecursive, binds, exp)
+              | Bind_module (id, name, mexpr) ->
+                Texp_letmodule (id, name, mexpr, exp));
+          })
+        case.c_rhs bindings
+    in
+    {case with c_rhs = exp}
+
+(* Assertions *)
+
+let assert_failed exp =
+  let fname, line, char =
+    Location.get_pos_info exp.exp_loc.Location.loc_start
+  in
+  let fname = Filename.basename fname in
+  Lprim
+    ( Praise Raise_regular,
+      [
+        Lprim
+          ( Pmakeblock Blk_extension,
+            [
+              transl_normal_path Predef.path_assert_failure;
+              Lconst
+                (Const_block
+                   ( Blk_tuple,
+                     [
+                       Const_base (Const_string (fname, None));
+                       Const_base (Const_int line);
+                       Const_base (Const_int char);
+                     ] ));
+            ],
+            exp.exp_loc );
+      ],
+      exp.exp_loc )
+
+let rec cut n l =
+  if n = 0 then ([], l)
+  else
+    match l with
+    | [] -> failwith "Translcore.cut"
+    | a :: l ->
+      let l1, l2 = cut (n - 1) l in
+      (a :: l1, l2)
+
+(* Translation of expressions *)
+
+let try_ids = Hashtbl.create 8
+
+let extract_directive_for_fn exp =
+  exp.exp_attributes
+  |> List.find_map (fun ({txt}, payload) ->
+         if txt = "directive" then Ast_payload.is_single_string payload
+         else None)
+
+let rec transl_exp e =
+  List.iter (Translattribute.check_attribute e) e.exp_attributes;
+  transl_exp0 e
+
+and transl_exp0 (e : Typedtree.expression) : Lambda.lambda =
+  match e.exp_desc with
+  | Texp_ident (_, _, {val_kind = Val_prim p}) ->
+    transl_primitive e.exp_loc p e.exp_env e.exp_type
+  | Texp_ident (path, _, {val_kind = Val_reg}) ->
+    transl_value_path ~loc:e.exp_loc e.exp_env path
+  | Texp_constant cst -> Lconst (Const_base cst)
+  | Texp_let (rec_flag, pat_expr_list, body) ->
+    transl_let rec_flag pat_expr_list (transl_exp body)
+  | Texp_function {arg_label = _; arity; param; case; partial; async} -> (
+    let directive =
+      match extract_directive_for_fn e with
+      | None -> None
+      | Some (directive, _) -> Some directive
+    in
+    let params, body, return_unit =
+      let pl = push_defaults e.exp_loc [] case partial in
+      transl_function e.exp_loc partial param pl
+    in
+    let attr =
+      {
+        default_function_attribute with
+        inline = Translattribute.get_inline_attribute e.exp_attributes;
+        async;
+        return_unit;
+        directive;
+      }
+    in
+    let loc = e.exp_loc in
+    let lambda = Lfunction {params; body; attr; loc} in
+    match arity with
+    | Some arity ->
+      let prim =
+        let expanded = Ctype.expand_head e.exp_env e.exp_type in
+        match (Btype.repr expanded).desc with
+        | Tarrow ({lbl = Nolabel; typ}, _, _, _) -> (
+          match (Ctype.expand_head e.exp_env typ).desc with
+          | Tconstr (Pident {name = "unit"}, [], _) -> Pjs_fn_make_unit
+          | _ -> Pjs_fn_make arity)
+        | _ -> Pjs_fn_make arity
+      in
+      Lprim
+        ( prim (* could be replaced with Opaque in the future except arity 0*),
+          [lambda],
+          loc )
+    | None -> lambda)
+  | Texp_apply
+      {
+        funct =
+          {
+            exp_desc = Texp_ident (_, _, {val_kind = Val_prim p});
+            exp_type = prim_type;
+          } as funct;
+        args = oargs;
+        transformed_jsx;
+      }
+    when List.length oargs >= p.prim_arity
+         && List.for_all (fun (_, arg) -> arg <> None) oargs -> (
+    let args, args' = cut p.prim_arity oargs in
+    let wrap f =
+      if args' = [] then f
+      else
+        let inlined, _ =
+          Translattribute.get_and_remove_inlined_attribute funct
+        in
+        transl_apply ~inlined ~transformed_jsx f args' e.exp_loc
+    in
+    let args =
+      List.map
+        (function
+          | _, Some x -> x
+          | _ -> assert false)
+        args
+    in
+    let argl = transl_list args in
+    let prim =
+      transl_primitive_application e.exp_loc p e.exp_env prim_type args
+    in
+    match (prim, args) with
+    | Praise k, [_] ->
+      let targ = List.hd argl in
+      let k =
+        match (k, targ) with
+        | Raise_regular, Lvar id when Hashtbl.mem try_ids id -> Raise_reraise
+        | _ -> k
+      in
+      wrap (Lprim (Praise k, [targ], e.exp_loc))
+    | Ploc kind, [] -> lam_of_loc kind e.exp_loc
+    | Ploc kind, [arg1] ->
+      let lam = lam_of_loc kind arg1.exp_loc in
+      Lprim (Pmakeblock Blk_tuple, lam :: argl, e.exp_loc)
+    | Ploc _, _ -> assert false
+    | _, _ -> (
+      match (prim, argl) with
+      | Pccall d, _ ->
+        wrap
+          (Lprim
+             (Pccall (set_transformed_jsx d ~transformed_jsx), argl, e.exp_loc))
+      | _ -> wrap (Lprim (prim, argl, e.exp_loc))))
+  | Texp_apply {funct; args = oargs; partial; transformed_jsx} ->
+    let inlined, funct =
+      Translattribute.get_and_remove_inlined_attribute funct
+    in
+    let uncurried_partial_application =
+      (* In case of partial application foo(args, ...) when some args are missing,
+         get the arity *)
+      if partial then
+        let arity_opt = Ctype.get_arity funct.exp_env funct.exp_type in
+        match arity_opt with
+        | Some arity ->
+          let real_args = List.filter (fun (_, x) -> Option.is_some x) oargs in
+          if arity > List.length real_args then Some arity else None
+        | None -> None
+      else None
+    in
+    transl_apply ~inlined ~uncurried_partial_application ~transformed_jsx
+      (transl_exp funct) oargs e.exp_loc
+  | Texp_match (arg, pat_expr_list, exn_pat_expr_list, partial) ->
+    transl_match e arg pat_expr_list exn_pat_expr_list partial
+  | Texp_try (body, pat_expr_list) ->
+    let id = Typecore.name_pattern "exn" pat_expr_list in
+    Ltrywith
+      ( transl_exp body,
+        id,
+        Matching.for_trywith (Lvar id) (transl_cases_try pat_expr_list) )
+  | Texp_tuple el -> (
+    let ll = transl_list el in
+    try Lconst (Const_block (Blk_tuple, List.map extract_constant ll))
+    with Not_constant -> Lprim (Pmakeblock Blk_tuple, ll, e.exp_loc))
+  | Texp_construct ({txt = Lident "false"}, _, []) -> Lconst Const_false
+  | Texp_construct ({txt = Lident "true"}, _, []) -> Lconst Const_true
+  | Texp_construct (lid, cstr, args) -> (
+    let ll = transl_list args in
+    if cstr.cstr_inlined <> None then
+      match ll with
+      | [x] -> x
+      | _ -> assert false
+    else
+      match cstr.cstr_tag with
+      | Cstr_constant n ->
+        Lconst
+          (Const_pointer
+             ( n,
+               match lid.txt with
+               | Longident.Ldot (Longident.Lident "*predef*", "None")
+               | Longident.Lident "None"
+                 when Datarepr.constructor_has_optional_shape cstr ->
+                 Pt_shape_none
+               | _ ->
+                 if Datarepr.constructor_has_optional_shape cstr then
+                   Pt_shape_none
+                 else
+                   Pt_constructor
+                     {
+                       name = cstr.cstr_name;
+                       const = cstr.cstr_consts;
+                       non_const = cstr.cstr_nonconsts;
+                       attrs = cstr.cstr_attributes;
+                     } ))
+      | Cstr_unboxed -> (
+        match ll with
+        | [v] -> v
+        | _ -> assert false)
+      | Cstr_block n -> (
+        let tag_info : Lambda.tag_info =
+          if Datarepr.constructor_has_optional_shape cstr then
+            match args with
+            | [arg]
+              when Typeopt.type_cannot_contain_undefined arg.exp_type
+                     arg.exp_env ->
+              (* Format.fprintf Format.err_formatter "@[special boxingl@]@."; *)
+              Blk_some_not_nested
+            | _ -> Blk_some
+          else
+            Blk_constructor
+              {
+                name = cstr.cstr_name;
+                num_nonconst = cstr.cstr_nonconsts;
+                tag = n;
+                attrs = cstr.cstr_attributes;
+              }
+        in
+        try Lconst (Const_block (tag_info, List.map extract_constant ll))
+        with Not_constant -> Lprim (Pmakeblock tag_info, ll, e.exp_loc))
+      | Cstr_extension path ->
+        Lprim
+          ( Pmakeblock Blk_extension,
+            transl_extension_path e.exp_env path :: ll,
+            e.exp_loc ))
+  | Texp_extension_constructor (_, path) -> transl_extension_path e.exp_env path
+  | Texp_variant (l, arg) -> (
+    let tag = Btype.hash_variant l in
+    match arg with
+    | None -> Lconst (Const_pointer (tag, Pt_variant {name = l}))
+    | Some arg -> (
+      let lam = transl_exp arg in
+      let tag_info = Blk_poly_var l in
+      try
+        Lconst
+          (Const_block
+             (tag_info, [Const_base (Const_int tag); extract_constant lam]))
+      with Not_constant ->
+        Lprim
+          ( Pmakeblock tag_info,
+            [Lconst (Const_base (Const_int tag)); lam],
+            e.exp_loc )))
+  | Texp_record {fields; representation; extended_expression} ->
+    transl_record e.exp_loc e.exp_env fields representation extended_expression
+  | Texp_field (arg, _, lbl) -> (
+    let targ = transl_exp arg in
+    match lbl.lbl_repres with
+    | Record_float_unused -> assert false
+    | Record_regular ->
+      Lprim (Pfield (lbl.lbl_pos, Lambda.fld_record lbl), [targ], e.exp_loc)
+    | Record_inlined _ ->
+      Lprim
+        (Pfield (lbl.lbl_pos, Lambda.fld_record_inline lbl), [targ], e.exp_loc)
+    | Record_unboxed _ -> targ
+    | Record_extension ->
+      Lprim
+        ( Pfield (lbl.lbl_pos + 1, Lambda.fld_record_extension lbl),
+          [targ],
+          e.exp_loc ))
+  | Texp_setfield (arg, _, lbl, newval) ->
+    let access =
+      match lbl.lbl_repres with
+      | Record_float_unused -> assert false
+      | Record_regular -> Psetfield (lbl.lbl_pos, Lambda.fld_record_set lbl)
+      | Record_inlined _ ->
+        Psetfield (lbl.lbl_pos, Lambda.fld_record_inline_set lbl)
+      | Record_unboxed _ -> assert false
+      | Record_extension ->
+        Psetfield (lbl.lbl_pos + 1, Lambda.fld_record_extension_set lbl)
+    in
+    Lprim (access, [transl_exp arg; transl_exp newval], e.exp_loc)
+  | Texp_array expr_list ->
+    let ll = transl_list expr_list in
+    Lprim (Pmakearray Mutable, ll, e.exp_loc)
+  | Texp_ifthenelse (cond, ifso, Some ifnot) ->
+    Lifthenelse (transl_exp cond, transl_exp ifso, transl_exp ifnot)
+  | Texp_ifthenelse (cond, ifso, None) ->
+    Lifthenelse (transl_exp cond, transl_exp ifso, lambda_unit)
+  | Texp_sequence (expr1, expr2) ->
+    Lsequence (transl_exp expr1, transl_exp expr2)
+  | Texp_while (cond, body) -> Lwhile (transl_exp cond, transl_exp body)
+  | Texp_for (param, _, low, high, dir, body) ->
+    Lfor (param, transl_exp low, transl_exp high, dir, transl_exp body)
+  | Texp_send (expr, Tmeth_name nm, _) ->
+    let obj = transl_exp expr in
+    Lsend (nm, obj, e.exp_loc)
+  | Texp_letmodule (id, _loc, modl, body) ->
+    let defining_expr = !transl_module Tcoerce_none None modl in
+    Llet (Strict, Pgenval, id, defining_expr, transl_exp body)
+  | Texp_letexception (cd, body) ->
+    Llet
+      ( Strict,
+        Pgenval,
+        cd.ext_id,
+        transl_extension_constructor e.exp_env None cd,
+        transl_exp body )
+  | Texp_pack modl -> !transl_module Tcoerce_none None modl
+  | Texp_assert {exp_desc = Texp_construct (_, {cstr_name = "false"}, _)} ->
+    if !Clflags.no_assert_false then Lambda.lambda_assert_false
+    else assert_failed e
+  | Texp_assert cond ->
+    if !Clflags.noassert then lambda_unit
+    else Lifthenelse (transl_exp cond, lambda_unit, assert_failed e)
+
+and transl_list expr_list = List.map transl_exp expr_list
+
+and transl_guard guard rhs =
+  let expr = transl_exp rhs in
+  match guard with
+  | None -> expr
+  | Some cond -> Lifthenelse (transl_exp cond, expr, staticfail)
+
+and transl_case {c_lhs; c_guard; c_rhs} = (c_lhs, transl_guard c_guard c_rhs)
+
+and transl_cases cases = List.map transl_case cases
+
+and transl_case_try {c_lhs; c_guard; c_rhs} =
+  match c_lhs.pat_desc with
+  | Tpat_var (id, _) | Tpat_alias (_, id, _) ->
+    Hashtbl.replace try_ids id ();
+    Misc.try_finally
+      (fun () -> (c_lhs, transl_guard c_guard c_rhs))
+      (fun () -> Hashtbl.remove try_ids id)
+  | _ -> (c_lhs, transl_guard c_guard c_rhs)
+
+and transl_cases_try cases = List.map transl_case_try cases
+
+and transl_apply ?(inlined = Default_inline)
+    ?(uncurried_partial_application = None) ?(transformed_jsx = false) lam sargs
+    loc =
+  let lapply ap_func ap_args =
+    Lapply
+      {
+        ap_loc = loc;
+        ap_func;
+        ap_args;
+        ap_inlined = inlined;
+        ap_transformed_jsx = transformed_jsx;
+      }
+  in
+  let rec build_apply lam args = function
+    | (None, optional) :: l ->
+      let defs = ref [] in
+      let protect name lam =
+        match lam with
+        | Lvar _ | Lconst _ -> lam
+        | _ ->
+          let id = Ident.create name in
+          defs := (id, lam) :: !defs;
+          Lvar id
+      in
+      let args, args' =
+        if List.for_all (fun (_, opt) -> opt) args then ([], args)
+        else (args, [])
+      in
+      let lam = if args = [] then lam else lapply lam (List.rev_map fst args) in
+      let handle = protect "func" lam
+      and l = List.map (fun (arg, opt) -> (may_map (protect "arg") arg, opt)) l
+      and id_arg = Ident.create "param" in
+      let body =
+        match build_apply handle ((Lvar id_arg, optional) :: args') l with
+        | Lfunction {params = ids; body = lam; attr; loc} ->
+          Lfunction {params = id_arg :: ids; body = lam; attr; loc}
+        | lam ->
+          Lfunction
+            {
+              params = [id_arg];
+              body = lam;
+              attr = default_function_attribute;
+              loc;
+            }
+      in
+      List.fold_left
+        (fun body (id, lam) -> Llet (Strict, Pgenval, id, lam, body))
+        body !defs
+    | (Some arg, optional) :: l -> build_apply lam ((arg, optional) :: args) l
+    | [] -> lapply lam (List.rev_map fst args)
+  in
+  match uncurried_partial_application with
+  | Some arity ->
+    let extra_arity = arity - List.length sargs in
+    let none_ids = ref [] in
+    let args =
+      Ext_list.filter_map sargs (function
+        | _, Some e -> Some (transl_exp e)
+        | _, None ->
+          let id_arg = Ident.create "none" in
+          none_ids := id_arg :: !none_ids;
+          Some (Lvar id_arg))
+    in
+    let extra_ids =
+      Array.init extra_arity (fun _ -> Ident.create "extra") |> Array.to_list
+    in
+    let extra_args = Ext_list.map extra_ids (fun id -> Lvar id) in
+    let ap_args = args @ extra_args in
+    let l0 =
+      Lapply
+        {
+          ap_func = lam;
+          ap_args;
+          ap_inlined = inlined;
+          ap_loc = loc;
+          ap_transformed_jsx = transformed_jsx;
+        }
+    in
+    Lfunction
+      {
+        params = List.rev_append !none_ids extra_ids;
+        body = l0;
+        attr = default_function_attribute;
+        loc;
+      }
+  | _ ->
+    (build_apply lam []
+       (List.map
+          (fun (l, x) -> (may_map transl_exp x, Btype.is_optional l))
+          sargs)
+      : Lambda.lambda)
+
+and transl_function loc partial param case =
+  match case with
+  | {
+   c_lhs = pat;
+   c_guard = None;
+   c_rhs =
+     {
+       exp_desc =
+         Texp_function
+           {
+             arg_label = _;
+             arity = None;
+             param = param';
+             case;
+             partial = partial';
+             async;
+           };
+     } as exp;
+  }
+    when Parmatch.inactive ~partial pat && not async ->
+    let params, body, return_unit =
+      transl_function exp.exp_loc partial' param' case
+    in
+    ( param :: params,
+      Matching.for_function loc None (Lvar param) [(pat, body)] partial,
+      return_unit )
+  | {c_rhs = {exp_env; exp_type}; _} ->
+    ( [param],
+      Matching.for_function loc None (Lvar param) [transl_case case] partial,
+      is_base_type exp_env exp_type Predef.path_unit )
+
+and transl_let rec_flag pat_expr_list body =
+  match rec_flag with
+  | Nonrecursive ->
+    let rec transl = function
+      | [] -> body
+      | {vb_pat = pat; vb_expr = expr; vb_attributes = attr; vb_loc} :: rem ->
+        let lam = transl_exp expr in
+        let lam = Translattribute.add_inline_attribute lam vb_loc attr in
+        Matching.for_let pat.pat_loc lam pat (transl rem)
+    in
+    transl pat_expr_list
+  | Recursive ->
+    let transl_case {vb_expr = expr; vb_attributes; vb_loc; vb_pat = pat} =
+      let id =
+        match pat.pat_desc with
+        | Tpat_var (id, _) -> id
+        | Tpat_alias ({pat_desc = Tpat_any}, id, _) -> id
+        | _ -> assert false
+        (* Illegal_letrec_pat
+           Only variables are allowed as left-hand side of `let rec'
+        *)
+      in
+      let lam = transl_exp expr in
+      let lam = Translattribute.add_inline_attribute lam vb_loc vb_attributes in
+      (id, lam)
+    in
+    Lletrec (Ext_list.map pat_expr_list transl_case, body)
+
+and transl_record loc env fields repres opt_init_expr =
+  match (opt_init_expr, repres, fields) with
+  | None, Record_unboxed _, [|({lbl_name; lbl_loc}, Overridden (_, expr), _)|]
+    ->
+    (* ReScript uncurried encoding *)
+    let loc = lbl_loc in
+    let lambda = transl_exp expr in
+    if lbl_name.[0] = 'I' then
+      let arity_s = String.sub lbl_name 1 (String.length lbl_name - 1) in
+      let arity = Int32.of_string arity_s |> Int32.to_int in
+      Lprim
+        ( Pjs_fn_make arity,
+          (* could be replaced with Opaque in the future except arity 0*)
+          [lambda],
+          loc )
+    else lambda
+  | _ -> (
+    let size = Array.length fields in
+    let optional =
+      Ext_array.exists fields (fun (ld, _, _) -> ld.lbl_optional)
+    in
+    (* Determine if there are "enough" fields (only relevant if this is a
+       functional-style record update *)
+    let no_init =
+      match opt_init_expr with
+      | None -> true
+      | _ -> false
+    in
+    if
+      no_init || (size < 20 && not optional)
+      (* TODO: More strategies
+         3 + 2 * List.length lbl_expr_list >= size (density)
+      *)
+    then
+      (* Allocate new record with given fields (and remaining fields
+         taken from init_expr if any *)
+      let init_id = Ident.create "init" in
+      let lv =
+        Array.mapi
+          (fun i (lbl, definition, _) ->
+            match definition with
+            | Kept _ ->
+              let access =
+                match repres with
+                | Record_float_unused -> assert false
+                | Record_regular -> Pfield (i, Lambda.fld_record lbl)
+                | Record_inlined _ -> Pfield (i, Lambda.fld_record_inline lbl)
+                | Record_unboxed _ -> assert false
+                | Record_extension ->
+                  Pfield (i + 1, Lambda.fld_record_extension lbl)
+              in
+              Lprim (access, [Lvar init_id], loc)
+            | Overridden (_lid, expr) -> transl_exp expr)
+          fields
+      in
+      let ll = Array.to_list lv in
+      let mut =
+        if Array.exists (fun (lbl, _, _) -> lbl.lbl_mut = Mutable) fields then
+          Mutable
+        else Immutable
+      in
+      let lam =
+        try
+          if mut = Mutable then raise Not_constant;
+          let cl = List.map extract_constant ll in
+          match repres with
+          | Record_float_unused -> assert false
+          | Record_regular ->
+            Lconst (Const_block (Lambda.blk_record fields mut, cl))
+          | Record_inlined {tag; name; num_nonconsts; attrs} ->
+            Lconst
+              (Const_block
+                 ( Lambda.blk_record_inlined fields name num_nonconsts ~tag
+                     ~attrs mut,
+                   cl ))
+          | Record_unboxed _ ->
+            Lconst
+              (match cl with
+              | [v] -> v
+              | _ -> assert false)
+          | Record_extension -> raise Not_constant
+        with Not_constant -> (
+          match repres with
+          | Record_regular ->
+            Lprim (Pmakeblock (Lambda.blk_record fields mut), ll, loc)
+          | Record_float_unused -> assert false
+          | Record_inlined {tag; name; num_nonconsts; attrs} ->
+            Lprim
+              ( Pmakeblock
+                  (Lambda.blk_record_inlined fields name num_nonconsts ~tag
+                     ~attrs mut),
+                ll,
+                loc )
+          | Record_unboxed _ -> (
+            match ll with
+            | [v] -> v
+            | _ -> assert false)
+          | Record_extension ->
+            let path =
+              let label, _, _ = fields.(0) in
+              match label.lbl_res.desc with
+              | Tconstr (p, _, _) -> p
+              | _ -> assert false
+            in
+            let slot = transl_extension_path env path in
+            Lprim
+              (Pmakeblock (Lambda.blk_record_ext fields mut), slot :: ll, loc))
+      in
+      match opt_init_expr with
+      | None -> lam
+      | Some init_expr ->
+        Llet (Strict, Pgenval, init_id, transl_exp init_expr, lam)
+    else
+      (* Take a shallow copy of the init record, then mutate the fields
+         of the copy *)
+      let copy_id = Ident.create "newrecord" in
+      let update_field cont (lbl, definition, _opt) =
+        match definition with
+        | Kept _type -> cont
+        | Overridden (_lid, expr) ->
+          let upd =
+            match repres with
+            | Record_float_unused -> assert false
+            | Record_regular ->
+              Psetfield (lbl.lbl_pos, Lambda.fld_record_set lbl)
+            | Record_inlined _ ->
+              Psetfield (lbl.lbl_pos, Lambda.fld_record_inline_set lbl)
+            | Record_unboxed _ -> assert false
+            | Record_extension ->
+              Psetfield (lbl.lbl_pos + 1, Lambda.fld_record_extension_set lbl)
+          in
+          Lsequence (Lprim (upd, [Lvar copy_id; transl_exp expr], loc), cont)
+      in
+      match opt_init_expr with
+      | None -> assert false
+      | Some init_expr ->
+        Llet
+          ( Strict,
+            Pgenval,
+            copy_id,
+            Lprim (Pduprecord, [transl_exp init_expr], loc),
+            Array.fold_left update_field (Lvar copy_id) fields ))
+
+and transl_match e arg pat_expr_list exn_pat_expr_list partial =
+  let id = Typecore.name_pattern "exn" exn_pat_expr_list
+  and cases = transl_cases pat_expr_list
+  and exn_cases = transl_cases_try exn_pat_expr_list in
+  let static_catch body val_ids handler =
+    let static_exception_id = next_negative_raise_count () in
+    Lstaticcatch
+      ( Ltrywith
+          ( Lstaticraise (static_exception_id, body),
+            id,
+            Matching.for_trywith (Lvar id) exn_cases ),
+        (static_exception_id, val_ids),
+        handler )
+  in
+  match (arg, exn_cases) with
+  | {exp_desc = Texp_tuple argl}, [] ->
+    Matching.for_multiple_match e.exp_loc (transl_list argl) cases partial
+  | {exp_desc = Texp_tuple argl}, _ :: _ ->
+    let val_ids = List.map (fun _ -> Typecore.name_pattern "val" []) argl in
+    let lvars = List.map (fun id -> Lvar id) val_ids in
+    static_catch (transl_list argl) val_ids
+      (Matching.for_multiple_match e.exp_loc lvars cases partial)
+  | arg, [] ->
+    Matching.for_function e.exp_loc None (transl_exp arg) cases partial
+  | arg, _ :: _ ->
+    let val_id = Typecore.name_pattern "val" pat_expr_list in
+    static_catch
+      [transl_exp arg]
+      [val_id]
+      (Matching.for_function e.exp_loc None (Lvar val_id) cases partial)
+
+open Format
+
+let report_error ppf = function
+  | Unknown_builtin_primitive prim_name ->
+    fprintf ppf "Unknown builtin primitive \"%s\"" prim_name
+
+let () =
+  Location.register_error_of_exn (function
+    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
+    | _ -> None)
diff --git a/jscomp/ml/translcore.mli b/compiler/ml/translcore.mli
similarity index 99%
rename from jscomp/ml/translcore.mli
rename to compiler/ml/translcore.mli
index eaf38f2..1847a48 100644
--- a/jscomp/ml/translcore.mli
+++ b/compiler/ml/translcore.mli
@@ -16,7 +16,6 @@
 (* Translation from typed abstract syntax to lambda terms,
    for the core language *)
 
-
 val transl_exp : Typedtree.expression -> Lambda.lambda
 
 val transl_let :
diff --git a/compiler/ml/translmod.ml b/compiler/ml/translmod.ml
new file mode 100644
index 0000000..87471ac
--- /dev/null
+++ b/compiler/ml/translmod.ml
@@ -0,0 +1,494 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Translation from typed abstract syntax to lambda terms,
+   for the module language *)
+
+open Typedtree
+
+type error = Fragile_pattern_in_toplevel
+
+exception Error of Location.t * error
+
+(* Keep track of the root path (from the root of the namespace to the
+   currently compiled module expression).  Useful for naming extensions. *)
+
+let global_path glob : Path.t option = Some (Pident glob)
+
+let is_top (rootpath : Path.t option) =
+  match rootpath with
+  | Some (Pident _) -> true
+  | _ -> false
+
+let functor_path path param : Path.t option =
+  match path with
+  | None -> None
+  | Some p -> Some (Papply (p, Pident param))
+
+let field_path path field : Path.t option =
+  match path with
+  | None -> None
+  | Some p -> Some (Pdot (p, Ident.name field, Path.nopos))
+
+(* Compile type extensions *)
+
+let transl_type_extension env rootpath (tyext : Typedtree.type_extension) body :
+    Lambda.lambda =
+  List.fold_right
+    (fun ext body ->
+      let lam =
+        Translcore.transl_extension_constructor env
+          (field_path rootpath ext.ext_id)
+          ext
+      in
+      Lambda.Llet (Strict, Pgenval, ext.ext_id, lam, body))
+    tyext.tyext_constructors body
+
+(* Compile a coercion *)
+
+let rec apply_coercion loc strict (restr : Typedtree.module_coercion) arg =
+  match restr with
+  | Tcoerce_none -> arg
+  | Tcoerce_structure (pos_cc_list, id_pos_list, runtime_fields) ->
+    Lambda.name_lambda strict arg (fun id ->
+        let get_field_name name pos =
+          Lambda.Lprim (Pfield (pos, Fld_module {name}), [Lvar id], loc)
+        in
+        let lam =
+          Lambda.Lprim
+            ( Pmakeblock (Blk_module runtime_fields),
+              Ext_list.map2 pos_cc_list runtime_fields (fun (pos, cc) name ->
+                  apply_coercion loc Alias cc
+                    (Lprim (Pfield (pos, Fld_module {name}), [Lvar id], loc))),
+              loc )
+        in
+        wrap_id_pos_list loc id_pos_list get_field_name lam)
+  | Tcoerce_functor (cc_arg, cc_res) ->
+    let param = Ident.create "funarg" in
+    let carg = apply_coercion loc Alias cc_arg (Lvar param) in
+    apply_coercion_result loc strict arg param carg cc_res
+  | Tcoerce_primitive {pc_loc; pc_desc; pc_env; pc_type} ->
+    Translcore.transl_primitive pc_loc pc_desc pc_env pc_type
+  | Tcoerce_alias (path, cc) ->
+    Lambda.name_lambda strict arg (fun _ ->
+        apply_coercion loc Alias cc (Lambda.transl_normal_path path))
+
+and apply_coercion_result loc strict funct param arg cc_res =
+  Lambda.name_lambda strict funct (fun id ->
+      Lfunction
+        {
+          params = [param];
+          attr = {Lambda.default_function_attribute with is_a_functor = true};
+          loc;
+          body =
+            apply_coercion loc Strict cc_res
+              (Lapply
+                 {
+                   ap_loc = loc;
+                   ap_func = Lvar id;
+                   ap_args = [arg];
+                   ap_inlined = Default_inline;
+                   ap_transformed_jsx = false;
+                 });
+        })
+
+and wrap_id_pos_list loc id_pos_list get_field lam =
+  let fv = Lambda.free_variables lam in
+  (*Format.eprintf "%a@." Printlambda.lambda lam;
+    IdentSet.iter (fun id -> Format.eprintf "%a " Ident.print id) fv;
+    Format.eprintf "@.";*)
+  let lam, s =
+    List.fold_left
+      (fun (lam, s) (id', pos, c) ->
+        if Lambda.IdentSet.mem id' fv then
+          let id'' = Ident.create (Ident.name id') in
+          ( Lambda.Llet
+              ( Alias,
+                Pgenval,
+                id'',
+                apply_coercion loc Alias c (get_field (Ident.name id') pos),
+                lam ),
+            Ident.add id' (Lambda.Lvar id'') s )
+        else (lam, s))
+      (lam, Ident.empty) id_pos_list
+  in
+  if s == Ident.empty then lam else Lambda.subst_lambda s lam
+
+(* Compose two coercions
+   apply_coercion c1 (apply_coercion c2 e) behaves like
+   apply_coercion (compose_coercions c1 c2) e. *)
+
+let rec compose_coercions c1 c2 =
+  match (c1, c2) with
+  | Tcoerce_none, c2 -> c2
+  | c1, Tcoerce_none -> c1
+  | ( Tcoerce_structure (pc1, ids1, runtime_fields1),
+      Tcoerce_structure (pc2, ids2, _runtime_fields2) ) ->
+    let v2 = Array.of_list pc2 in
+    let ids1 =
+      List.map
+        (fun (id, pos1, c1) ->
+          let pos2, c2 = v2.(pos1) in
+          (id, pos2, compose_coercions c1 c2))
+        ids1
+    in
+    Tcoerce_structure
+      ( List.map
+          (function
+            | (_p1, Tcoerce_primitive _) as x ->
+              x (* (p1, Tcoerce_primitive p) *)
+            | p1, c1 ->
+              let p2, c2 = v2.(p1) in
+              (p2, compose_coercions c1 c2))
+          pc1,
+        ids1 @ ids2,
+        runtime_fields1 )
+  | Tcoerce_functor (arg1, res1), Tcoerce_functor (arg2, res2) ->
+    Tcoerce_functor (compose_coercions arg2 arg1, compose_coercions res1 res2)
+  | c1, Tcoerce_alias (path, c2) -> Tcoerce_alias (path, compose_coercions c1 c2)
+  | _, _ -> Misc.fatal_error "Translmod.compose_coercions"
+
+(*
+let apply_coercion a b c =
+  Format.eprintf "@[<2>apply_coercion@ %a@]@." Includemod.print_coercion b;
+  apply_coercion a b c
+
+let compose_coercions c1 c2 =
+  let c3 = compose_coercions c1 c2 in
+  let open Includemod in
+  Format.eprintf "@[<2>compose_coercions@ (%a)@ (%a) =@ %a@]@."
+    print_coercion c1 print_coercion c2 print_coercion c3;
+  c3
+*)
+
+(* Record the primitive declarations occurring in the module compiled *)
+
+let rec pure_module m : Lambda.let_kind =
+  match m.mod_desc with
+  | Tmod_ident _ -> Alias
+  | Tmod_constraint (m, _, _, _) -> pure_module m
+  | _ -> Strict
+
+(* Generate lambda-code for a reordered list of bindings *)
+
+(* Extract the list of "value" identifiers bound by a signature.
+   "Value" identifiers are identifiers for signature components that
+   correspond to a run-time value: values, extensions, modules, classes.
+   Note: manifest primitives do not correspond to a run-time value! *)
+
+let rec bound_value_identifiers : Types.signature_item list -> Ident.t list =
+  function
+  | [] -> []
+  | Sig_value (id, {val_kind = Val_reg}) :: rem ->
+    id :: bound_value_identifiers rem
+  | Sig_typext (id, _, _) :: rem -> id :: bound_value_identifiers rem
+  | Sig_module (id, _, _) :: rem -> id :: bound_value_identifiers rem
+  | Sig_class _ :: _ -> assert false
+  | _ :: rem -> bound_value_identifiers rem
+
+(* Compile one or more functors, merging curried functors to produce
+   multi-argument functors.  Any [@inline] attribute on a functor that is
+   merged must be consistent with any other [@inline] attribute(s) on the
+   functor(s) being merged with.  Such an attribute will be placed on the
+   resulting merged functor. *)
+
+let get_functor_params mexp coercion root_path =
+  match mexp.mod_desc with
+  | Tmod_functor (param, _, _, body) ->
+    let inline_attribute =
+      Translattribute.get_inline_attribute mexp.mod_attributes
+    in
+    let arg_coercion, res_coercion =
+      match coercion with
+      | Tcoerce_none -> (Tcoerce_none, Tcoerce_none)
+      | Tcoerce_functor (arg_coercion, res_coercion) ->
+        (arg_coercion, res_coercion)
+      | _ -> Misc.fatal_error "Translmod.get_functor_params: bad coercion"
+    in
+    let loc = mexp.mod_loc in
+    let path = functor_path root_path param in
+    ((param, loc, arg_coercion), body, path, res_coercion, inline_attribute)
+  | _ -> assert false
+
+let export_identifiers : Ident.t list ref = ref []
+
+let rec compile_functor mexp coercion root_path loc =
+  let functor_param, body, body_path, res_coercion, inline_attribute =
+    get_functor_params mexp coercion root_path
+  in
+  (* cf. [transl_module] *)
+  let param, loc_, arg_coercion = functor_param in
+  let param' = Ident.rename param in
+  let arg = apply_coercion loc_ Alias arg_coercion (Lvar param') in
+  let body =
+    Lambda.Llet
+      (Alias, Pgenval, param, arg, transl_module res_coercion body_path body)
+  in
+  Lambda.Lfunction
+    {
+      params = [param'];
+      attr =
+        {
+          inline = inline_attribute;
+          is_a_functor = true;
+          return_unit = false;
+          async = false;
+          one_unit_arg = false;
+          directive = None;
+        };
+      loc;
+      body;
+    }
+
+(* Compile a module expression *)
+and transl_module cc rootpath mexp =
+  List.iter (Translattribute.check_attribute_on_module mexp) mexp.mod_attributes;
+  let loc = mexp.mod_loc in
+  match mexp.mod_type with
+  | Mty_alias (Mta_absent, _) ->
+    apply_coercion loc Alias cc Lambda.lambda_module_alias
+  | _ -> (
+    match mexp.mod_desc with
+    | Tmod_ident (path, _) ->
+      apply_coercion loc Strict cc
+        (Lambda.transl_module_path ~loc mexp.mod_env path)
+    | Tmod_structure str -> fst (transl_struct loc [] cc rootpath str)
+    | Tmod_functor _ -> compile_functor mexp cc rootpath loc
+    | Tmod_apply (funct, arg, ccarg) ->
+      let inlined_attribute, funct =
+        Translattribute.get_and_remove_inlined_attribute_on_module funct
+      in
+      apply_coercion loc Strict cc
+        (Lapply
+           {
+             ap_loc = loc;
+             ap_func = transl_module Tcoerce_none None funct;
+             ap_args = [transl_module ccarg None arg];
+             ap_inlined = inlined_attribute;
+             ap_transformed_jsx = false;
+           })
+    | Tmod_constraint (arg, _, _, ccarg) ->
+      transl_module (compose_coercions cc ccarg) rootpath arg
+    | Tmod_unpack (arg, _) ->
+      apply_coercion loc Strict cc (Translcore.transl_exp arg))
+
+and transl_struct loc fields cc rootpath str =
+  transl_structure loc fields cc rootpath str.str_final_env str.str_items
+
+and transl_structure loc fields cc rootpath final_env = function
+  | [] -> (
+    let is_top_root_path = is_top rootpath in
+
+    match cc with
+    | Tcoerce_none ->
+      let block_fields =
+        List.fold_left
+          (fun acc id ->
+            if is_top_root_path then
+              export_identifiers := id :: !export_identifiers;
+            Lambda.Lvar id :: acc)
+          [] fields
+      in
+      ( Lambda.Lprim
+          ( Pmakeblock
+              (if is_top_root_path then Blk_module_export !export_identifiers
+               else Blk_module (List.rev_map (fun id -> id.Ident.name) fields)),
+            block_fields,
+            loc ),
+        List.length fields )
+    | Tcoerce_structure (pos_cc_list, id_pos_list, runtime_fields) ->
+      (* Do not ignore id_pos_list ! *)
+      (*Format.eprintf "%a@.@[" Includemod.print_coercion cc;
+        List.iter (fun l -> Format.eprintf "%a@ " Ident.print l)
+          fields;
+        Format.eprintf "@]@.";*)
+      assert (List.length runtime_fields = List.length pos_cc_list);
+      let v = Ext_array.reverse_of_list fields in
+      let get_field pos = Lambda.Lvar v.(pos)
+      and ids =
+        List.fold_right Lambda.IdentSet.add fields Lambda.IdentSet.empty
+      in
+      let get_field_name _name = get_field in
+      let result =
+        List.fold_right
+          (fun (pos, cc) code ->
+            match cc with
+            | Tcoerce_primitive p ->
+              if is_top rootpath then
+                export_identifiers := p.pc_id :: !export_identifiers;
+              Translcore.transl_primitive p.pc_loc p.pc_desc p.pc_env p.pc_type
+              :: code
+            | _ ->
+              if is_top rootpath then
+                export_identifiers := v.(pos) :: !export_identifiers;
+              apply_coercion loc Strict cc (get_field pos) :: code)
+          pos_cc_list []
+      in
+      let lam =
+        Lambda.Lprim
+          ( Pmakeblock
+              (if is_top_root_path then Blk_module_export !export_identifiers
+               else Blk_module runtime_fields),
+            result,
+            loc )
+      and id_pos_list =
+        Ext_list.filter id_pos_list (fun (id, _, _) ->
+            not (Lambda.IdentSet.mem id ids))
+      in
+      ( wrap_id_pos_list loc id_pos_list get_field_name lam,
+        List.length pos_cc_list )
+    | _ -> Misc.fatal_error "Translmod.transl_structure")
+  | item :: rem -> (
+    match item.str_desc with
+    | Tstr_eval (expr, _) ->
+      let body, size = transl_structure loc fields cc rootpath final_env rem in
+      (Lsequence (Translcore.transl_exp expr, body), size)
+    | Tstr_value (rec_flag, pat_expr_list) ->
+      let ext_fields = rev_let_bound_idents pat_expr_list @ fields in
+      let body, size =
+        transl_structure loc ext_fields cc rootpath final_env rem
+      in
+      (* Recursve already excludes complex pattern bindings*)
+      if is_top rootpath && rec_flag = Nonrecursive then
+        Ext_list.iter pat_expr_list (fun {vb_pat} ->
+            match vb_pat.pat_desc with
+            | Tpat_var _ | Tpat_alias _ -> ()
+            | _ ->
+              if not (Parmatch.irrefutable vb_pat) then
+                raise (Error (vb_pat.pat_loc, Fragile_pattern_in_toplevel)));
+      (Translcore.transl_let rec_flag pat_expr_list body, size)
+    | Tstr_typext tyext ->
+      let ids = List.map (fun ext -> ext.ext_id) tyext.tyext_constructors in
+      let body, size =
+        transl_structure loc
+          (List.rev_append ids fields)
+          cc rootpath final_env rem
+      in
+      (transl_type_extension item.str_env rootpath tyext body, size)
+    | Tstr_exception ext ->
+      let id = ext.ext_id in
+      let path = field_path rootpath id in
+      let body, size =
+        transl_structure loc (id :: fields) cc rootpath final_env rem
+      in
+      ( Llet
+          ( Strict,
+            Pgenval,
+            id,
+            Translcore.transl_extension_constructor item.str_env path ext,
+            body ),
+        size )
+    | Tstr_module mb as s ->
+      let id = mb.mb_id in
+      let body, size =
+        transl_structure loc
+          (if Typemod.rescript_hide s then fields else id :: fields)
+          cc rootpath final_env rem
+      in
+      let module_body =
+        transl_module Tcoerce_none (field_path rootpath id) mb.mb_expr
+      in
+      let module_body =
+        Translattribute.add_inline_attribute module_body mb.mb_loc
+          mb.mb_attributes
+      in
+      (Llet (pure_module mb.mb_expr, Pgenval, id, module_body, body), size)
+    | Tstr_recmodule bindings ->
+      let ext_fields =
+        List.rev_append (List.map (fun mb -> mb.mb_id) bindings) fields
+      in
+      let body, size =
+        transl_structure loc ext_fields cc rootpath final_env rem
+      in
+      let lam =
+        Transl_recmodule.compile_recmodule
+          (fun id modl _loc ->
+            transl_module Tcoerce_none (field_path rootpath id) modl)
+          bindings body
+      in
+      (lam, size)
+    | Tstr_include incl ->
+      let ids = bound_value_identifiers incl.incl_type in
+      let modl = incl.incl_mod in
+      let mid = Ident.create "include" in
+      let rec rebind_idents pos newfields = function
+        | [] -> transl_structure loc newfields cc rootpath final_env rem
+        | id :: ids ->
+          let body, size = rebind_idents (pos + 1) (id :: newfields) ids in
+          ( Llet
+              ( Alias,
+                Pgenval,
+                id,
+                Lprim
+                  ( Pfield (pos, Fld_module {name = Ident.name id}),
+                    [Lvar mid],
+                    incl.incl_loc ),
+                body ),
+            size )
+      in
+      let body, size = rebind_idents 0 fields ids in
+      ( Llet
+          ( pure_module modl,
+            Pgenval,
+            mid,
+            transl_module Tcoerce_none None modl,
+            body ),
+        size )
+    | Tstr_primitive _ | Tstr_type _ | Tstr_modtype _ | Tstr_open _
+    | Tstr_attribute _ ->
+      transl_structure loc fields cc rootpath final_env rem)
+
+(* Update forward declaration in Translcore *)
+let _ = Translcore.transl_module := transl_module
+
+(* Introduce dependencies on modules referenced only by "external". *)
+
+(* Compile an implementation *)
+
+let transl_implementation module_name (str, cc) =
+  export_identifiers := [];
+  let module_id = Ident.create_persistent module_name in
+  let body, _ = transl_struct Location.none [] cc (global_path module_id) str in
+  (body, !export_identifiers)
+
+(* Build the list of value identifiers defined by a toplevel structure
+   (excluding primitive declarations). *)
+
+(* second level idents (module M = struct ... let id = ... end),
+   and all sub-levels idents *)
+(* A variant of transl_structure used to compile toplevel structure definitions
+   for the native-code compiler. Store the defined values in the fields
+   of the global as soon as they are defined, in order to reduce register
+   pressure.  Also rewrites the defining expressions so that they
+   refer to earlier fields of the structure through the fields of
+   the global, not by their names.
+   "map" is a table from defined idents to (pos in global block, coercion).
+   "prim" is a list of (pos in global block, primitive declaration). *)
+
+(* Compile an implementation using transl_store_structure
+   (for the native-code compiler). *)
+
+(* Compile a toplevel phrase *)
+
+(* Error report *)
+
+let report_error ppf = function
+  | Fragile_pattern_in_toplevel ->
+    Format.fprintf ppf "@[Such fragile pattern not allowed in the toplevel@]"
+
+let () =
+  Location.register_error_of_exn (function
+    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
+    | _ -> None)
diff --git a/jscomp/ml/translmod.mli b/compiler/ml/translmod.mli
similarity index 99%
rename from jscomp/ml/translmod.mli
rename to compiler/ml/translmod.mli
index af45c84..74ef747 100644
--- a/jscomp/ml/translmod.mli
+++ b/compiler/ml/translmod.mli
@@ -25,6 +25,3 @@ type error
 (* exception Error of Location.t * error *)
 
 val report_error : Format.formatter -> error -> unit
-
-
-
diff --git a/compiler/ml/typecore.ml b/compiler/ml/typecore.ml
new file mode 100644
index 0000000..ee304df
--- /dev/null
+++ b/compiler/ml/typecore.ml
@@ -0,0 +1,4802 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Typechecking for the core language *)
+
+open Misc
+open Asttypes
+open Parsetree
+open Types
+open Typedtree
+open Btype
+open Ctype
+open Error_message_utils
+
+type error =
+  | Polymorphic_label of Longident.t
+  | Constructor_arity_mismatch of {
+      name: Longident.t;
+      constuctor: constructor_description;
+      expected: int;
+      provided: int;
+    }
+  | Label_mismatch of Longident.t * (type_expr * type_expr) list
+  | Pattern_type_clash of (type_expr * type_expr) list
+  | Or_pattern_type_clash of Ident.t * (type_expr * type_expr) list
+  | Multiply_bound_variable of string
+  | Orpat_vars of Ident.t * Ident.t list
+  | Expr_type_clash of {
+      trace: (type_expr * type_expr) list;
+      context: type_clash_context option;
+    }
+  | Apply_non_function of type_expr
+  | Apply_wrong_label of arg_label * type_expr
+  | Label_multiply_defined of {
+      label: string;
+      jsx_component_info: jsx_prop_error_info option;
+    }
+  | Labels_missing of {
+      labels: string list;
+      jsx_component_info: jsx_prop_error_info option;
+    }
+  | Label_not_mutable of Longident.t
+  | Wrong_name of string * type_expr * string * Path.t * string * string list
+  | Name_type_mismatch of
+      string * Longident.t * (Path.t * Path.t) * (Path.t * Path.t) list
+  | Undefined_method of type_expr * string * string list option
+  | Private_type of type_expr
+  | Private_label of Longident.t * type_expr
+  | Not_subtype of
+      Ctype.type_pairs * Ctype.type_pairs * Ctype.subtype_context option
+  | Too_many_arguments of bool * type_expr
+  | Abstract_wrong_label of arg_label * type_expr
+  | Scoping_let_module of string * type_expr
+  | Not_a_variant_type of Longident.t
+  | Incoherent_label_order
+  | Less_general of string * (type_expr * type_expr) list
+  | Modules_not_allowed
+  | Cannot_infer_signature
+  | Not_a_packed_module of type_expr
+  | Recursive_local_constraint of (type_expr * type_expr) list
+  | Unexpected_existential
+  | Unqualified_gadt_pattern of Path.t * string
+  | Invalid_interval
+  | Invalid_for_loop_index
+  | No_value_clauses
+  | Exception_pattern_below_toplevel
+  | Inlined_record_escape
+  | Inlined_record_expected
+  | Invalid_extension_constructor_payload
+  | Not_an_extension_constructor
+  | Literal_overflow of string
+  | Unknown_literal of string * char
+  | Illegal_letrec_pat
+  | Empty_record_literal
+  | Uncurried_arity_mismatch of {
+      function_type: type_expr;
+      expected_arity: int;
+      provided_arity: int;
+      provided_args: Asttypes.arg_label list;
+      function_name: Longident.t option;
+    }
+  | Field_not_optional of string * type_expr
+  | Type_params_not_supported of Longident.t
+  | Field_access_on_dict_type
+  | Jsx_not_enabled
+
+exception Error of Location.t * Env.t * error
+exception Error_forward of Location.error
+
+(* Forward declaration, to be filled in by Typemod.type_module *)
+
+let type_module =
+  ref
+    (fun _env _md -> assert false
+      : Env.t -> Parsetree.module_expr -> Typedtree.module_expr)
+
+(* Forward declaration, to be filled in by Typemod.type_open *)
+
+let type_open :
+    (?used_slot:bool ref ->
+    override_flag ->
+    Env.t ->
+    Location.t ->
+    Longident.t loc ->
+    Path.t * Env.t)
+    ref =
+  ref (fun ?used_slot:_ _ -> assert false)
+
+(* Forward declaration, to be filled in by Typemod.type_package *)
+
+let type_package = ref (fun _ -> assert false)
+
+(* Forward declaration, to be filled in by Typemod.type_package *)
+
+(*
+  Saving and outputting type information.
+  We keep these function names short, because they have to be
+  called each time we create a record of type [Typedtree.expression]
+  or [Typedtree.pattern] that will end up in the typed AST.
+*)
+let re node =
+  Cmt_format.add_saved_type (Cmt_format.Partial_expression node);
+  Stypes.record (Stypes.Ti_expr node);
+  node
+let rp node =
+  Cmt_format.add_saved_type (Cmt_format.Partial_pattern node);
+  Stypes.record (Stypes.Ti_pat node);
+  node
+
+type recarg = Allowed | Required | Rejected
+
+let case lhs rhs = {c_lhs = lhs; c_guard = None; c_rhs = rhs}
+
+(* Upper approximation of free identifiers on the parse tree *)
+
+let iter_expression f e =
+  let rec expr e =
+    f e;
+    match e.pexp_desc with
+    | Pexp_extension _ (* we don't iterate under extension point *)
+    | Pexp_ident _ | Pexp_constant _ ->
+      ()
+    | Pexp_fun {default = eo; rhs = e} ->
+      may expr eo;
+      expr e
+    | Pexp_apply {funct = e; args = lel} ->
+      expr e;
+      List.iter (fun (_, e) -> expr e) lel
+    | Pexp_let (_, pel, e) ->
+      expr e;
+      List.iter binding pel
+    | Pexp_match (e, pel) | Pexp_try (e, pel) ->
+      expr e;
+      List.iter case pel
+    | Pexp_array el | Pexp_tuple el -> List.iter expr el
+    | Pexp_construct (_, eo) | Pexp_variant (_, eo) -> may expr eo
+    | Pexp_record (iel, eo) ->
+      may expr eo;
+      List.iter (fun {x = e} -> expr e) iel
+    | Pexp_open (_, _, e)
+    | Pexp_newtype (_, e)
+    | Pexp_assert e
+    | Pexp_send (e, _)
+    | Pexp_constraint (e, _)
+    | Pexp_coerce (e, _, _)
+    | Pexp_letexception (_, e)
+    | Pexp_field (e, _) ->
+      expr e
+    | Pexp_while (e1, e2) | Pexp_sequence (e1, e2) | Pexp_setfield (e1, _, e2)
+      ->
+      expr e1;
+      expr e2
+    | Pexp_ifthenelse (e1, e2, eo) ->
+      expr e1;
+      expr e2;
+      may expr eo
+    | Pexp_for (_, e1, e2, _, e3) ->
+      expr e1;
+      expr e2;
+      expr e3
+    | Pexp_letmodule (_, me, e) ->
+      expr e;
+      module_expr me
+    | Pexp_pack me -> module_expr me
+    | Pexp_await _ -> assert false (* should be handled earlier *)
+    | Pexp_jsx_element _ ->
+      raise (Error (e.pexp_loc, Env.empty, Jsx_not_enabled))
+  and case {pc_lhs = _; pc_guard; pc_rhs} =
+    may expr pc_guard;
+    expr pc_rhs
+  and binding x = expr x.pvb_expr
+  and module_expr me =
+    match me.pmod_desc with
+    | Pmod_extension _ | Pmod_ident _ -> ()
+    | Pmod_structure str -> List.iter structure_item str
+    | Pmod_constraint (me, _) | Pmod_functor (_, _, me) -> module_expr me
+    | Pmod_apply (me1, me2) ->
+      module_expr me1;
+      module_expr me2
+    | Pmod_unpack e -> expr e
+  and structure_item str =
+    match str.pstr_desc with
+    | Pstr_eval (e, _) -> expr e
+    | Pstr_value (_, pel) -> List.iter binding pel
+    | Pstr_primitive _ | Pstr_type _ | Pstr_typext _ | Pstr_exception _
+    | Pstr_modtype _ | Pstr_open _ | Pstr_attribute _ | Pstr_extension _ ->
+      ()
+    | Pstr_include {pincl_mod = me} | Pstr_module {pmb_expr = me} ->
+      module_expr me
+    | Pstr_recmodule l -> List.iter (fun x -> module_expr x.pmb_expr) l
+  in
+
+  expr e
+
+let all_idents_cases el =
+  let idents = Hashtbl.create 8 in
+  let f = function
+    | {pexp_desc = Pexp_ident {txt = Longident.Lident id; _}; _} ->
+      Hashtbl.replace idents id ()
+    | _ -> ()
+  in
+  List.iter
+    (fun cp ->
+      may (iter_expression f) cp.pc_guard;
+      iter_expression f cp.pc_rhs)
+    el;
+  Hashtbl.fold (fun x () rest -> x :: rest) idents []
+
+(* Typing of constants *)
+
+let type_constant = function
+  | Const_int _ -> instance_def Predef.type_int
+  | Const_char _ -> instance_def Predef.type_char
+  | Const_string _ -> instance_def Predef.type_string
+  | Const_float _ -> instance_def Predef.type_float
+  | Const_int64 _ -> assert false
+  | Const_bigint _ -> instance_def Predef.type_bigint
+  | Const_int32 _ -> assert false
+
+let constant : Parsetree.constant -> (Asttypes.constant, error) result =
+  function
+  | Pconst_integer (i, None) -> (
+    try Ok (Const_int (Misc.Int_literal_converter.int i))
+    with Failure _ -> Error (Literal_overflow "int"))
+  | Pconst_integer (i, Some 'n') ->
+    let sign, i = Bigint_utils.parse_bigint i in
+    Ok (Const_bigint (sign, i))
+  | Pconst_integer (i, Some c) -> Error (Unknown_literal (i, c))
+  | Pconst_char c -> Ok (Const_char c)
+  | Pconst_string (s, d) -> Ok (Const_string (s, d))
+  | Pconst_float (f, None) -> Ok (Const_float f)
+  | Pconst_float (f, Some c) -> Error (Unknown_literal (f, c))
+
+let constant_or_raise env loc cst =
+  match constant cst with
+  | Ok c -> c
+  | Error err -> raise (Error (loc, env, err))
+
+(* Specific version of type_option, using newty rather than newgenty *)
+
+let type_option ty = newty (Tconstr (Predef.path_option, [ty], ref Mnil))
+
+let mkexp exp_desc exp_type exp_loc exp_env =
+  {exp_desc; exp_type; exp_loc; exp_env; exp_extra = []; exp_attributes = []}
+
+let option_none ty loc =
+  let lid = Longident.Lident "None" and env = Env.initial_safe_string in
+  let cnone = Env.lookup_constructor lid env in
+  mkexp (Texp_construct (mknoloc lid, cnone, [])) ty loc env
+
+let option_some texp =
+  let lid = Longident.Lident "Some" in
+  let csome = Env.lookup_constructor lid Env.initial_safe_string in
+  mkexp
+    (Texp_construct (mknoloc lid, csome, [texp]))
+    (type_option texp.exp_type)
+    texp.exp_loc texp.exp_env
+
+let extract_option_type env ty =
+  match expand_head env ty with
+  | {desc = Tconstr (path, [ty], _)} when Path.same path Predef.path_option ->
+    ty
+  | _ -> assert false
+
+let extract_concrete_record env ty =
+  match extract_concrete_typedecl env ty with
+  | p0, p, {type_kind = Type_record (fields, repr)} -> (p0, p, fields, repr)
+  | _ -> raise Not_found
+
+let extract_concrete_variant env ty =
+  match extract_concrete_typedecl env ty with
+  | p0, p, {type_kind = Type_variant cstrs} -> (p0, p, cstrs)
+  | p0, p, {type_kind = Type_open} -> (p0, p, [])
+  | _ -> raise Not_found
+
+let label_is_optional ld = ld.lbl_optional
+
+let check_optional_attr env ld optional loc =
+  let check_redundant () =
+    if not (label_is_optional ld) then
+      raise (Error (loc, env, Field_not_optional (ld.lbl_name, ld.lbl_res)));
+    true
+  in
+  optional && check_redundant ()
+
+(* unification inside type_pat*)
+let unify_pat_types loc env ty ty' =
+  try unify env ty ty' with
+  | Unify trace -> raise (Error (loc, env, Pattern_type_clash trace))
+  | Tags (l1, l2) ->
+    raise (Typetexp.Error (loc, env, Typetexp.Variant_tags (l1, l2)))
+
+(* unification inside type_exp and type_expect *)
+let unify_exp_types ~context loc env ty expected_ty =
+  try unify env ty expected_ty with
+  | Unify trace -> raise (Error (loc, env, Expr_type_clash {trace; context}))
+  | Tags (l1, l2) ->
+    raise (Typetexp.Error (loc, env, Typetexp.Variant_tags (l1, l2)))
+
+(* level at which to create the local type declarations *)
+let newtype_level = ref None
+let get_newtype_level () =
+  match !newtype_level with
+  | Some y -> y
+  | None -> assert false
+
+let unify_pat_types_gadt loc env ty ty' =
+  let newtype_level =
+    match !newtype_level with
+    | None -> assert false
+    | Some x -> x
+  in
+  try unify_gadt ~newtype_level env ty ty' with
+  | Unify trace -> raise (Error (loc, !env, Pattern_type_clash trace))
+  | Tags (l1, l2) ->
+    raise (Typetexp.Error (loc, !env, Typetexp.Variant_tags (l1, l2)))
+  | Unification_recursive_abbrev trace ->
+    raise (Error (loc, !env, Recursive_local_constraint trace))
+
+(* Creating new conjunctive types is not allowed when typing patterns *)
+
+let unify_pat env pat expected_ty =
+  unify_pat_types pat.pat_loc env pat.pat_type expected_ty
+
+(* make all Reither present in open variants *)
+let finalize_variant pat =
+  match pat.pat_desc with
+  | Tpat_variant (tag, opat, r) -> (
+    let row =
+      match expand_head pat.pat_env pat.pat_type with
+      | {desc = Tvariant row} ->
+        r := row;
+        row_repr row
+      | _ -> assert false
+    in
+    match row_field tag row with
+    | Rabsent -> () (* assert false *)
+    | Reither (true, [], _, e) when not row.row_closed ->
+      set_row_field e (Rpresent None)
+    | Reither (false, ty :: tl, _, e) when not row.row_closed -> (
+      set_row_field e (Rpresent (Some ty));
+      match opat with
+      | None -> assert false
+      | Some pat -> List.iter (unify_pat pat.pat_env pat) (ty :: tl))
+    | Reither (c, _l, true, e) when not (row_fixed row) ->
+      set_row_field e (Reither (c, [], false, ref None))
+    | _ -> ()
+    (* Force check of well-formedness   WHY? *)
+    (* unify_pat pat.pat_env pat
+       (newty(Tvariant{row_fields=[]; row_more=newvar(); row_closed=false;
+                       row_bound=(); row_fixed=false; row_name=None})); *)
+    )
+  | _ -> ()
+
+let rec iter_pattern f p =
+  f p;
+  iter_pattern_desc (iter_pattern f) p.pat_desc
+
+let has_variants p =
+  try
+    iter_pattern
+      (function
+        | {pat_desc = Tpat_variant _} -> raise Exit
+        | _ -> ())
+      p;
+    false
+  with Exit -> true
+
+(* pattern environment *)
+let pattern_variables =
+  ref
+    ([]
+      : (Ident.t * type_expr * string loc * Location.t * bool (* as-variable *))
+        list)
+let pattern_force = ref ([] : (unit -> unit) list)
+let pattern_scope = ref (None : Annot.ident option)
+let allow_modules = ref false
+let module_variables = ref ([] : (string loc * Location.t) list)
+let reset_pattern scope allow =
+  pattern_variables := [];
+  pattern_force := [];
+  pattern_scope := scope;
+  allow_modules := allow;
+  module_variables := []
+
+let enter_variable ?(is_module = false) ?(is_as_variable = false) loc name ty =
+  if
+    List.exists
+      (fun (id, _, _, _, _) -> Ident.name id = name.txt)
+      !pattern_variables
+  then raise (Error (loc, Env.empty, Multiply_bound_variable name.txt));
+  let id = Ident.create name.txt in
+  pattern_variables := (id, ty, name, loc, is_as_variable) :: !pattern_variables;
+  if is_module then (
+    (* Note: unpack patterns enter a variable of the same name *)
+    if not !allow_modules then
+      raise (Error (loc, Env.empty, Modules_not_allowed));
+    module_variables := (name, loc) :: !module_variables)
+  else
+    (* moved to genannot *)
+    may
+      (fun s -> Stypes.record (Stypes.An_ident (name.loc, name.txt, s)))
+      !pattern_scope;
+  id
+
+let sort_pattern_variables vs =
+  List.sort
+    (fun (x, _, _, _, _) (y, _, _, _, _) ->
+      compare (Ident.name x) (Ident.name y))
+    vs
+
+let enter_orpat_variables loc env p1_vs p2_vs =
+  (* unify_vars operate on sorted lists *)
+  let p1_vs = sort_pattern_variables p1_vs
+  and p2_vs = sort_pattern_variables p2_vs in
+
+  let rec unify_vars p1_vs p2_vs =
+    let vars vs = List.map (fun (x, _t, _, _l, _a) -> x) vs in
+    match (p1_vs, p2_vs) with
+    | (x1, t1, _, _l1, _a1) :: rem1, (x2, t2, _, _l2, _a2) :: rem2
+      when Ident.equal x1 x2 ->
+      if x1 == x2 then unify_vars rem1 rem2
+      else (
+        (try unify env t1 t2
+         with Unify trace ->
+           raise (Error (loc, env, Or_pattern_type_clash (x1, trace))));
+        (x2, x1) :: unify_vars rem1 rem2)
+    | [], [] -> []
+    | (x, _, _, _, _) :: _, [] -> raise (Error (loc, env, Orpat_vars (x, [])))
+    | [], (y, _, _, _, _) :: _ -> raise (Error (loc, env, Orpat_vars (y, [])))
+    | (x, _, _, _, _) :: _, (y, _, _, _, _) :: _ ->
+      let err =
+        if Ident.name x < Ident.name y then Orpat_vars (x, vars p2_vs)
+        else Orpat_vars (y, vars p1_vs)
+      in
+      raise (Error (loc, env, err))
+  in
+  unify_vars p1_vs p2_vs
+
+let rec build_as_type env p =
+  match p.pat_desc with
+  | Tpat_alias (p1, _, _) -> build_as_type env p1
+  | Tpat_tuple pl ->
+    let tyl = List.map (build_as_type env) pl in
+    newty (Ttuple tyl)
+  | Tpat_construct (_, cstr, pl) ->
+    let keep = cstr.cstr_private = Private || cstr.cstr_existentials <> [] in
+    if keep then p.pat_type
+    else
+      let tyl = List.map (build_as_type env) pl in
+      let ty_args, ty_res = instance_constructor cstr in
+      List.iter2
+        (fun (p, ty) -> unify_pat env {p with pat_type = ty})
+        (List.combine pl tyl) ty_args;
+      ty_res
+  | Tpat_variant (l, p', _) ->
+    let ty = may_map (build_as_type env) p' in
+    newty
+      (Tvariant
+         {
+           row_fields = [(l, Rpresent ty)];
+           row_more = newvar ();
+           row_name = None;
+           row_fixed = false;
+           row_closed = false;
+         })
+  | Tpat_record (lpl, _) ->
+    let lbl = snd4 (List.hd lpl) in
+    if lbl.lbl_private = Private then p.pat_type
+    else
+      let ty = newvar () in
+      let ppl = List.map (fun (_, l, p, _) -> (l.lbl_pos, p)) lpl in
+      let do_label lbl =
+        let _, ty_arg, ty_res = instance_label false lbl in
+        unify_pat env {p with pat_type = ty} ty_res;
+        let refinable =
+          lbl.lbl_mut = Immutable
+          && List.mem_assoc lbl.lbl_pos ppl
+          &&
+          match (repr lbl.lbl_arg).desc with
+          | Tpoly _ -> false
+          | _ -> true
+        in
+        if refinable then
+          let arg = List.assoc lbl.lbl_pos ppl in
+          unify_pat env {arg with pat_type = build_as_type env arg} ty_arg
+        else
+          let _, ty_arg', ty_res' = instance_label false lbl in
+          unify env ty_arg ty_arg';
+          unify_pat env p ty_res'
+      in
+      Array.iter do_label lbl.lbl_all;
+      ty
+  | Tpat_or (p1, p2, row) -> (
+    match row with
+    | None ->
+      let ty1 = build_as_type env p1 and ty2 = build_as_type env p2 in
+      unify_pat env {p2 with pat_type = ty2} ty1;
+      ty1
+    | Some row ->
+      let row = row_repr row in
+      newty (Tvariant {row with row_closed = false; row_more = newvar ()}))
+  | Tpat_any | Tpat_var _ | Tpat_constant _ | Tpat_array _ -> p.pat_type
+
+let build_or_pat env loc lid =
+  let path, decl = Typetexp.find_type env lid.loc lid.txt in
+  let tyl = List.map (fun _ -> newvar ()) decl.type_params in
+  let row0 =
+    let ty = expand_head env (newty (Tconstr (path, tyl, ref Mnil))) in
+    match ty.desc with
+    | Tvariant row when static_row row -> row
+    | _ -> raise (Error (lid.loc, env, Not_a_variant_type lid.txt))
+  in
+  let pats, fields =
+    List.fold_left
+      (fun (pats, fields) (l, f) ->
+        match row_field_repr f with
+        | Rpresent None ->
+          ((l, None) :: pats, (l, Reither (true, [], true, ref None)) :: fields)
+        | Rpresent (Some ty) ->
+          ( ( l,
+              Some
+                {
+                  pat_desc = Tpat_any;
+                  pat_loc = Location.none;
+                  pat_env = env;
+                  pat_type = ty;
+                  pat_extra = [];
+                  pat_attributes = [];
+                } )
+            :: pats,
+            (l, Reither (false, [ty], true, ref None)) :: fields )
+        | _ -> (pats, fields))
+      ([], []) (row_repr row0).row_fields
+  in
+  let row =
+    {
+      row_fields = List.rev fields;
+      row_more = newvar ();
+      row_closed = false;
+      row_fixed = false;
+      row_name = Some (path, tyl);
+    }
+  in
+  let ty = newty (Tvariant row) in
+  let gloc = {loc with Location.loc_ghost = true} in
+  let row' = ref {row with row_more = newvar ()} in
+  let pats =
+    List.map
+      (fun (l, p) ->
+        {
+          pat_desc = Tpat_variant (l, p, row');
+          pat_loc = gloc;
+          pat_env = env;
+          pat_type = ty;
+          pat_extra = [];
+          pat_attributes = [];
+        })
+      pats
+  in
+  match pats with
+  | [] -> raise (Error (lid.loc, env, Not_a_variant_type lid.txt))
+  | pat :: pats ->
+    let r =
+      List.fold_left
+        (fun pat pat0 ->
+          {
+            pat_desc = Tpat_or (pat0, pat, Some row0);
+            pat_extra = [];
+            pat_loc = gloc;
+            pat_env = env;
+            pat_type = ty;
+            pat_attributes = [];
+          })
+        pat pats
+    in
+    (path, rp {r with pat_loc = loc}, ty)
+
+let extract_type_from_pat_variant_spread env lid expected_ty =
+  let path, decl = Typetexp.find_type env lid.loc lid.txt in
+  match decl with
+  | {type_kind = Type_variant constructors; type_params} ->
+    if List.length type_params > 0 then
+      raise (Error (lid.loc, env, Type_params_not_supported lid.txt));
+    let ty = newgenty (Tconstr (path, [], ref Mnil)) in
+    (try Ctype.subtype env ty expected_ty ()
+     with Ctype.Subtype (tr1, tr2, ctx) ->
+       raise (Error (lid.loc, env, Not_subtype (tr1, tr2, ctx))));
+    (path, decl, constructors, ty)
+  | _ -> raise (Error (lid.loc, env, Not_a_variant_type lid.txt))
+
+let build_ppat_or_for_variant_spread pat env expected_ty =
+  match pat with
+  | {ppat_desc = Ppat_type lident; ppat_attributes}
+    when Variant_coercion.has_res_pat_variant_spread_attribute ppat_attributes
+    ->
+    let _, _, constructors, ty =
+      extract_type_from_pat_variant_spread !env lident expected_ty
+    in
+    let synthetic_or_patterns =
+      constructors
+      |> List.map (fun (c : Types.constructor_declaration) ->
+             Ast_helper.Pat.mk
+               ~attrs:[Variant_type_spread.mk_pat_from_variant_spread_attr ()]
+               ~loc:lident.loc
+               (Ppat_construct
+                  ( Location.mkloc
+                      (Longident.Lident (Ident.name c.cd_id))
+                      lident.loc,
+                    match c.cd_args with
+                    | Cstr_tuple [] -> None
+                    | _ -> Some (Ast_helper.Pat.any ()) )))
+      |> List.rev
+    in
+    let pat =
+      match synthetic_or_patterns with
+      | [] -> pat
+      | pat :: pats ->
+        List.fold_left (fun p1 p2 -> Ast_helper.Pat.or_ p1 p2) pat pats
+    in
+    Some (pat, ty)
+  | _ -> None
+
+let maybe_expand_variant_spread_in_pattern pattern env expected_ty =
+  match pattern.Parsetree.ppat_desc with
+  | Ppat_type _
+    when Variant_coercion.has_res_pat_variant_spread_attribute
+           pattern.ppat_attributes -> (
+    match build_ppat_or_for_variant_spread pattern env expected_ty with
+    | None -> assert false (* TODO: Fix. *)
+    | Some (pattern, _) -> pattern)
+  | _ -> pattern
+
+(* Type paths *)
+
+let rec expand_path env p =
+  let decl = try Some (Env.find_type p env) with Not_found -> None in
+  match decl with
+  | Some {type_manifest = Some ty} -> (
+    match repr ty with
+    | {desc = Tconstr (p, _, _)} -> expand_path env p
+    | _ -> p (* PR#6394: recursive module may introduce incoherent manifest *))
+  | _ ->
+    let p' = Env.normalize_path None env p in
+    if Path.same p p' then p else expand_path env p'
+
+let compare_type_path env tpath1 tpath2 =
+  Path.same (expand_path env tpath1) (expand_path env tpath2)
+
+let fprintf = Format.fprintf
+
+let rec bottom_aliases = function
+  | (_, one) :: (_, two) :: rest -> (
+    match bottom_aliases rest with
+    | Some types -> Some types
+    | None -> Some (one, two))
+  | _ -> None
+
+let simple_conversions =
+  [
+    (("float", "int"), "Float.toInt");
+    (("float", "string"), "Float.toString");
+    (("int", "float"), "Int.toFloat");
+    (("int", "string"), "Int.toString");
+    (("string", "float"), "Float.fromString");
+    (("string", "int"), "Int.fromString");
+  ]
+
+let print_simple_conversion ppf (actual, expected) =
+  try
+    let converter = List.assoc (actual, expected) simple_conversions in
+    fprintf ppf
+      "@,\
+       @,\
+       @[<v 2>You can convert @{<info>%s@} to @{<info>%s@} with @{<info>%s@}.@]"
+      actual expected converter
+  with Not_found -> ()
+
+let print_simple_message ppf = function
+  | "float", "int" ->
+    fprintf ppf
+      "@ If this is a literal, try a number without a trailing dot (e.g. \
+       @{<info>20@})."
+  | "int", "float" ->
+    fprintf ppf
+      "@ If this is a literal, try a number with a trailing dot (e.g. \
+       @{<info>20.@})."
+  | _ -> ()
+
+let show_extra_help ppf _env trace =
+  match bottom_aliases trace with
+  | Some
+      ( {Types.desc = Tconstr (actual_path, actual_args, _)},
+        {desc = Tconstr (expected_path, expexted_args, _)} ) -> (
+    match (actual_path, actual_args, expected_path, expexted_args) with
+    | Pident {name = actual_name}, [], Pident {name = expected_name}, [] ->
+      print_simple_conversion ppf (actual_name, expected_name);
+      print_simple_message ppf (actual_name, expected_name)
+    | _ -> ())
+  | _ -> ()
+
+let rec collect_missing_arguments env type1 type2 =
+  match type1 with
+  (* why do we use Ctype.matches here? Please see https://github.com/rescript-lang/rescript-compiler/pull/2554 *)
+  | {Types.desc = Tarrow (arg, ret, _, _)} when Ctype.matches env ret type2 ->
+    Some [(arg.lbl, arg.typ)]
+  | {desc = Tarrow (arg, ret, _, _)} -> (
+    match collect_missing_arguments env ret type2 with
+    | Some res -> Some ((arg.lbl, arg.typ) :: res)
+    | None -> None)
+  | _ -> None
+
+let print_expr_type_clash ~context env loc trace ppf =
+  (* this is the most frequent error. We should do whatever we can to provide
+      specific guidance to this generic error before giving up *)
+  let bottom_aliases_result = bottom_aliases trace in
+  let missing_arguments =
+    match bottom_aliases_result with
+    | Some (actual, expected) -> collect_missing_arguments env actual expected
+    | None -> assert false
+  in
+  let print_arguments =
+    Format.pp_print_list
+      ~pp_sep:(fun ppf _ -> fprintf ppf ",@ ")
+      (fun ppf (label, argtype) ->
+        match label with
+        | Asttypes.Nolabel -> fprintf ppf "@[%a@]" Printtyp.type_expr argtype
+        | Labelled {txt = label} ->
+          fprintf ppf "@[(~%s: %a)@]" label Printtyp.type_expr argtype
+        | Optional {txt = label} ->
+          fprintf ppf "@[(?%s: %a)@]" label Printtyp.type_expr argtype)
+  in
+  match missing_arguments with
+  | Some [single_argument] ->
+    (* btw, you can't say "final arguments". Intermediate labeled
+        arguments might be the ones missing *)
+    fprintf ppf "@[@{<info>This call is missing an argument@} of type@ %a@]"
+      print_arguments [single_argument]
+  | Some arguments ->
+    fprintf ppf "@[<hv>@{<info>This call is missing arguments@} of type:@ %a@]"
+      print_arguments arguments
+  | None ->
+    let missing_parameters =
+      match bottom_aliases_result with
+      | Some (actual, expected) -> collect_missing_arguments env expected actual
+      | None -> assert false
+    in
+    (match missing_parameters with
+    | Some [single_parameter] ->
+      fprintf ppf
+        "@[This value might need to be @{<info>wrapped in a function@ that@ \
+         takes@ an@ extra@ parameter@}@ of@ type@ %a@]@,\
+         @,"
+        print_arguments [single_parameter];
+      fprintf ppf "@[@{<info>Here's the original error message@}@]@,"
+    | Some arguments ->
+      fprintf ppf
+        "@[This value seems to @{<info>need to be wrapped in a function that \
+         takes extra@ arguments@}@ of@ type:@ @[<hv>%a@]@]@,\
+         @,"
+        print_arguments arguments;
+      fprintf ppf "@[@{<info>Here's the original error message@}@]@,"
+    | None -> ());
+
+    Printtyp.super_report_unification_error ppf env trace
+      (function
+        | ppf -> error_type_text ppf context)
+      (function ppf -> error_expected_type_text ppf context);
+    print_extra_type_clash_help ~extract_concrete_typedecl ~env loc ppf
+      bottom_aliases_result trace context;
+    show_extra_help ppf env trace
+
+let report_arity_mismatch ~arity_a ~arity_b ppf =
+  fprintf ppf
+    "This function is expected to have @{<info>%s@} %s, but%s has @{<error>%s@}"
+    arity_b
+    (if arity_b = "1" then "argument" else "arguments")
+    (if int_of_string arity_a < int_of_string arity_b then " only" else "")
+    arity_a
+
+(* Records *)
+let label_of_kind kind = if kind = "record" then "field" else "constructor"
+
+module NameChoice (Name : sig
+  type t
+  val type_kind : string
+  val get_name : t -> string
+  val get_type : t -> type_expr
+  val get_descrs : Env.type_descriptions -> t list
+
+  val unsafe_do_not_use__add_with_name : t -> string -> t
+  val unbound_name_error :
+    ?from_type:type_expr -> Env.t -> Longident.t loc -> 'a
+end) =
+struct
+  open Name
+
+  let get_type_path d =
+    match (repr (get_type d)).desc with
+    | Tconstr (p, _, _) -> p
+    | _ -> assert false
+
+  let lookup_from_type env tpath (lid : Longident.t loc) : Name.t =
+    let descrs = get_descrs (Env.find_type_descrs tpath env) in
+    Env.mark_type_used env (Path.last tpath) (Env.find_type tpath env);
+    if Path.same tpath Predef.path_dict then
+      (* [dict] Handle directing any label lookup to the magic dict field. *)
+      match lid.txt with
+      | Longident.Lident s ->
+        let x =
+          List.find
+            (fun nd -> get_name nd = Dict_type_helpers.dict_magic_field_name)
+            descrs
+        in
+        unsafe_do_not_use__add_with_name x s
+      | _ -> raise Not_found
+    else
+      match lid.txt with
+      | Longident.Lident s -> (
+        try List.find (fun nd -> get_name nd = s) descrs
+        with Not_found ->
+          let names = List.map get_name descrs in
+          raise
+            (Error
+               ( lid.loc,
+                 env,
+                 Wrong_name ("", newvar (), type_kind, tpath, s, names) )))
+      | _ -> raise Not_found
+
+  let rec unique eq acc = function
+    | [] -> List.rev acc
+    | x :: rem ->
+      if List.exists (eq x) acc then unique eq acc rem
+      else unique eq (x :: acc) rem
+
+  let ambiguous_types env lbl others =
+    let tpath = get_type_path lbl in
+    let others = List.map (fun (lbl, _) -> get_type_path lbl) others in
+    let tpaths = unique (compare_type_path env) [tpath] others in
+    match tpaths with
+    | [_] -> []
+    | _ -> List.map Printtyp.string_of_path tpaths
+
+  let disambiguate_by_type env tpath lbls =
+    let check_type (lbl, _) =
+      let lbl_tpath = get_type_path lbl in
+      compare_type_path env tpath lbl_tpath
+    in
+    List.find check_type lbls
+
+  let disambiguate ?(warn = Location.prerr_warning) ?(check_lk = fun _ _ -> ())
+      ?(from_type : Types.type_expr option) ?scope lid env opath lbls =
+    let scope =
+      match scope with
+      | None -> lbls
+      | Some l -> l
+    in
+    let lbl =
+      match opath with
+      | None -> (
+        match lbls with
+        | [] -> unbound_name_error ?from_type env lid
+        | (lbl, use) :: rest ->
+          use ();
+          let paths = ambiguous_types env lbl rest in
+          if paths <> [] then
+            warn lid.loc
+              (Warnings.Ambiguous_name ([Longident.last lid.txt], paths, false));
+          lbl)
+      | Some (tpath0, tpath) -> (
+        try
+          let lbl, use = disambiguate_by_type env tpath scope in
+          use ();
+          lbl
+        with Not_found -> (
+          try
+            let lbl = lookup_from_type env tpath lid in
+            check_lk tpath lbl;
+            lbl
+          with Not_found ->
+            if lbls = [] then unbound_name_error ?from_type env lid
+            else
+              let tp = (tpath0, expand_path env tpath) in
+              let tpl =
+                List.map
+                  (fun (lbl, _) ->
+                    let tp0 = get_type_path lbl in
+                    let tp = expand_path env tp0 in
+                    (tp0, tp))
+                  lbls
+              in
+              raise
+                (Error
+                   ( lid.loc,
+                     env,
+                     Name_type_mismatch (type_kind, lid.txt, tp, tpl) ))))
+    in
+    lbl
+end
+
+let wrap_disambiguate kind ty f x =
+  try f x
+  with Error (loc, env, Wrong_name ("", _, tk, tp, name, valid_names)) ->
+    raise (Error (loc, env, Wrong_name (kind, ty, tk, tp, name, valid_names)))
+
+module Label = NameChoice (struct
+  type t = label_description
+  let type_kind = "record"
+  let get_name lbl = lbl.lbl_name
+
+  let unsafe_do_not_use__add_with_name lbl name =
+    (* [dict] This is used in dicts and shouldn't be used anywhere else.
+       It adds a new field to an existing record type, to "fool" the pattern
+       matching into thinking the label exists. *)
+    let l =
+      {
+        lbl with
+        lbl_name = name;
+        lbl_pos = Array.length lbl.lbl_all;
+        lbl_repres = Record_regular;
+      }
+    in
+    let lbl_all_list = Array.to_list lbl.lbl_all @ [l] in
+    let lbl_all = Array.of_list lbl_all_list in
+    Ext_array.iter lbl_all (fun lbl -> lbl.lbl_all <- lbl_all);
+    l
+  let get_type lbl = lbl.lbl_res
+  let get_descrs = snd
+  let unbound_name_error = Typetexp.unbound_label_error
+end)
+
+let disambiguate_label_by_ids closed ids labels =
+  let check_ids (lbl, _) =
+    (* check that all ids are present *)
+    let lbls = Hashtbl.create 8 in
+    Array.iter (fun lbl -> Hashtbl.add lbls lbl.lbl_name ()) lbl.lbl_all;
+    List.for_all (Hashtbl.mem lbls) ids
+  in
+  let mandatory_labels_are_present num_ids lbl =
+    (* check that all mandatory labels are present *)
+    let has_optional_labels = Ext_array.exists lbl.lbl_all label_is_optional in
+    if has_optional_labels then (
+      let mandatory_lbls = ref 0 in
+      Ext_array.iter lbl.lbl_all (fun l ->
+          if not (label_is_optional l) then incr mandatory_lbls);
+      num_ids >= !mandatory_lbls)
+    else num_ids = Array.length lbl.lbl_all
+  in
+  let check_closed (lbl, _) =
+    (not closed) || mandatory_labels_are_present (List.length ids) lbl
+  in
+  let labels' = Ext_list.filter labels check_ids in
+  if labels' = [] then (false, labels)
+  else
+    let labels'' = Ext_list.filter labels' check_closed in
+    if labels'' = [] then (false, labels') else (true, labels'')
+
+(* Only issue warnings once per record constructor/pattern *)
+let disambiguate_record_elem_list loc closed env opath record_elem_list =
+  let ids = List.map (fun {lid} -> Longident.last lid.txt) record_elem_list in
+  let w_amb = ref [] in
+  let warn loc msg =
+    let open Warnings in
+    match msg with
+    | Ambiguous_name ([s], l, _) -> w_amb := (s, l) :: !w_amb
+    | _ -> Location.prerr_warning loc msg
+  in
+  let process_label lid =
+    (* Strategy for each field:
+       * collect all the labels in scope for that name
+       * if the type is known and principal, just eventually warn
+         if the real label was not in scope
+       * fail if there is no known type and no label found
+       * otherwise use other fields to reduce the list of candidates
+       * if there is no known type reduce it incrementally, so that
+         there is still at least one candidate (for error message)
+       * if the reduced list is valid, call Label.disambiguate
+    *)
+    let scope = Typetexp.find_all_labels env lid.loc lid.txt in
+    if opath = None && scope = [] then Typetexp.unbound_label_error env lid;
+    let ok, labels =
+      match opath with
+      | Some _ -> (true, scope) (* disambiguate only checks scope *)
+      | _ -> disambiguate_label_by_ids closed ids scope
+    in
+    if ok then Label.disambiguate lid env opath labels ~warn ~scope
+    else fst (List.hd labels)
+    (* will fail later *)
+  in
+  let lbl_a_list =
+    List.map
+      (fun {lid; x; opt} -> (lid, process_label lid, x, opt))
+      record_elem_list
+  in
+  (match List.rev !w_amb with
+  | (_, types) :: _ as amb ->
+    let paths =
+      List.map (fun (_, lbl, _, _) -> Label.get_type_path lbl) lbl_a_list
+    in
+    let path = List.hd paths in
+    if List.for_all (compare_type_path env path) (List.tl paths) then
+      Location.prerr_warning loc
+        (Warnings.Ambiguous_name (List.map fst amb, types, true))
+    else
+      List.iter
+        (fun (s, l) ->
+          Location.prerr_warning loc (Warnings.Ambiguous_name ([s], l, false)))
+        amb
+  | _ -> ());
+  lbl_a_list
+
+let rec find_record_qual = function
+  | [] -> None
+  | {lid = {txt = Longident.Ldot (modname, _)}} :: _ -> Some modname
+  | _ :: rest -> find_record_qual rest
+
+let map_fold_cont f xs k =
+  List.fold_right
+    (fun x k ys -> f x (fun y -> k (y :: ys)))
+    xs
+    (fun ys -> k (List.rev ys))
+    []
+
+let type_record_elem_list ?labels loc closed env type_lbl_a opath
+    record_elem_list k =
+  let lbl_a_list =
+    match (record_elem_list, labels) with
+    | {lid = {txt = Longident.Lident s}} :: _, Some labels
+      when Hashtbl.mem labels s ->
+      (* Special case for rebuilt syntax trees *)
+      List.map
+        (function
+          | {lid; x = a; opt} -> (
+            match lid.txt with
+            | Longident.Lident s -> (lid, Hashtbl.find labels s, a, opt)
+            | _ -> assert false))
+        record_elem_list
+    | _ ->
+      let record_elem_list =
+        match find_record_qual record_elem_list with
+        | None -> record_elem_list
+        | Some modname ->
+          List.map
+            (fun ({lid; x = a; opt} as el) ->
+              match lid.txt with
+              | Longident.Lident s ->
+                {lid = {lid with txt = Longident.Ldot (modname, s)}; x = a; opt}
+              | _ -> el)
+            record_elem_list
+      in
+      disambiguate_record_elem_list loc closed env opath record_elem_list
+  in
+  (* Invariant: records are sorted in the typed tree *)
+  let lbl_a_list =
+    List.sort
+      (fun (_, lbl1, _, _) (_, lbl2, _, _) -> compare lbl1.lbl_pos lbl2.lbl_pos)
+      lbl_a_list
+  in
+  map_fold_cont type_lbl_a lbl_a_list k
+
+(* Checks over the labels mentioned in a record pattern:
+   no duplicate definitions (error); properly closed (warning) *)
+
+let check_recordpat_labels ~get_jsx_component_error_info loc lbl_pat_list closed
+    =
+  match lbl_pat_list with
+  | [] -> () (* should not happen *)
+  | ((l : Longident.t loc), label1, _, _) :: _ ->
+    let all = label1.lbl_all in
+    let defined = Array.make (Array.length all) false in
+    let check_defined (_, label, _, _) =
+      if defined.(label.lbl_pos) then
+        raise
+          (Error
+             ( l.loc,
+               Env.empty,
+               Label_multiply_defined
+                 {
+                   label = label.lbl_name;
+                   jsx_component_info = get_jsx_component_error_info ();
+                 } ))
+      else defined.(label.lbl_pos) <- true
+    in
+    List.iter check_defined lbl_pat_list;
+    if
+      closed = Closed
+      && Warnings.is_active (Warnings.Non_closed_record_pattern "")
+    then (
+      let undefined = ref [] in
+      for i = 0 to Array.length all - 1 do
+        if not defined.(i) then undefined := all.(i).lbl_name :: !undefined
+      done;
+      if !undefined <> [] then
+        let u = String.concat ", " (List.rev !undefined) in
+        Location.prerr_warning loc (Warnings.Non_closed_record_pattern u))
+
+(* Constructors *)
+
+module Constructor = NameChoice (struct
+  type t = constructor_description
+  let type_kind = "variant"
+  let get_name cstr = cstr.cstr_name
+  let get_type cstr = cstr.cstr_res
+
+  let unsafe_do_not_use__add_with_name _cstr _name = assert false
+  let get_descrs = fst
+  let unbound_name_error = Typetexp.unbound_constructor_error
+end)
+
+(* unification of a type with a tconstr with
+   freshly created arguments *)
+let unify_head_only loc env ty constr =
+  let _, ty_res = instance_constructor constr in
+  match (repr ty_res).desc with
+  | Tconstr (p, args, m) ->
+    ty_res.desc <- Tconstr (p, List.map (fun _ -> newvar ()) args, m);
+    enforce_constraints env ty_res;
+    unify_pat_types loc env ty_res ty
+  | _ -> assert false
+
+(* Typing of patterns *)
+
+(* Remember current state for backtracking.
+   No variable information, as we only backtrack on
+   patterns without variables (cf. assert statements). *)
+type state = {snapshot: Btype.snapshot; levels: Ctype.levels; env: Env.t}
+let save_state env =
+  {snapshot = Btype.snapshot (); levels = Ctype.save_levels (); env = !env}
+let set_state s env =
+  Btype.backtrack s.snapshot;
+  Ctype.set_levels s.levels;
+  env := s.env
+
+(* type_pat does not generate local constraints inside or patterns *)
+type type_pat_mode =
+  | Normal
+  | Splitting_or (* splitting an or-pattern *)
+  | Inside_or (* inside a non-split or-pattern *)
+  | Split_or (* always split or-patterns *)
+
+exception Need_backtrack
+
+(* type_pat propagates the expected type as well as maps for
+   constructors and labels.
+   Unification may update the typing environment. *)
+(* constrs <> None => called from parmatch: backtrack on or-patterns
+   explode > 0 => explode Ppat_any for gadts *)
+let rec type_pat ~constrs ~labels ~no_existentials ~mode ~explode ~env sp
+    expected_ty k =
+  Builtin_attributes.warning_scope sp.ppat_attributes (fun () ->
+      type_pat_aux ~constrs ~labels ~no_existentials ~mode ~explode ~env sp
+        expected_ty k)
+
+and type_pat_aux ~constrs ~labels ~no_existentials ~mode ~explode ~env sp
+    expected_ty k =
+  let sp = maybe_expand_variant_spread_in_pattern sp env expected_ty in
+  let mode' = if mode = Splitting_or then Normal else mode in
+  let type_pat ?(constrs = constrs) ?(labels = labels) ?(mode = mode')
+      ?(explode = explode) ?(env = env) =
+    type_pat ~constrs ~labels ~no_existentials ~mode ~explode ~env
+  in
+  let loc = sp.ppat_loc in
+  let rp k x : pattern = if constrs = None then k (rp x) else k x in
+  match sp.ppat_desc with
+  | Ppat_any ->
+    let k' d =
+      rp k
+        {
+          pat_desc = d;
+          pat_loc = loc;
+          pat_extra = [];
+          pat_type = expected_ty;
+          pat_attributes = sp.ppat_attributes;
+          pat_env = !env;
+        }
+    in
+    if explode > 0 then
+      let sp, constrs, labels = Parmatch.ppat_of_type !env expected_ty in
+      if sp.ppat_desc = Parsetree.Ppat_any then k' Tpat_any
+      else if mode = Inside_or then raise Need_backtrack
+      else
+        let explode =
+          match sp.ppat_desc with
+          | Parsetree.Ppat_or _ -> explode - 5
+          | _ -> explode - 1
+        in
+        type_pat ~constrs:(Some constrs) ~labels:(Some labels) ~explode sp
+          expected_ty k
+    else k' Tpat_any
+  | Ppat_var name ->
+    let id =
+      (* PR#7330 *)
+      if name.txt = "*extension*" then Ident.create name.txt
+      else enter_variable loc name expected_ty
+    in
+    rp k
+      {
+        pat_desc = Tpat_var (id, name);
+        pat_loc = loc;
+        pat_extra = [];
+        pat_type = expected_ty;
+        pat_attributes = sp.ppat_attributes;
+        pat_env = !env;
+      }
+  | Ppat_unpack name ->
+    assert (constrs = None);
+    let id = enter_variable loc name expected_ty ~is_module:true in
+    rp k
+      {
+        pat_desc = Tpat_var (id, name);
+        pat_loc = sp.ppat_loc;
+        pat_extra = [(Tpat_unpack, loc, sp.ppat_attributes)];
+        pat_type = expected_ty;
+        pat_attributes = [];
+        pat_env = !env;
+      }
+  | Ppat_constraint
+      ( {ppat_desc = Ppat_var name; ppat_loc = lloc},
+        ({ptyp_desc = Ptyp_poly _} as sty) ) -> (
+    (* explicitly polymorphic type *)
+    assert (constrs = None);
+    let cty, force = Typetexp.transl_simple_type_delayed !env sty in
+    let ty = cty.ctyp_type in
+    unify_pat_types lloc !env ty expected_ty;
+    pattern_force := force :: !pattern_force;
+    match ty.desc with
+    | Tpoly (body, tyl) ->
+      begin_def ();
+      let _, ty' = instance_poly ~keep_names:true false tyl body in
+      end_def ();
+      generalize ty';
+      let id = enter_variable lloc name ty' in
+      rp k
+        {
+          pat_desc = Tpat_var (id, name);
+          pat_loc = lloc;
+          pat_extra = [(Tpat_constraint cty, loc, sp.ppat_attributes)];
+          pat_type = ty;
+          pat_attributes = [];
+          pat_env = !env;
+        }
+    | _ -> assert false)
+  | Ppat_alias (sq, name) ->
+    let override_type_from_variant_spread, sq =
+      match sq with
+      | {ppat_desc = Ppat_type _; ppat_attributes}
+        when Variant_coercion.has_res_pat_variant_spread_attribute
+               ppat_attributes -> (
+        match build_ppat_or_for_variant_spread sq env expected_ty with
+        | Some (p, ty) -> (Some ty, p)
+        | None -> (None, sq))
+      | _ -> (None, sq)
+    in
+    assert (constrs = None);
+    type_pat sq expected_ty (fun q ->
+        begin_def ();
+        let ty_var =
+          match override_type_from_variant_spread with
+          | Some ty -> ty
+          | None -> build_as_type !env q
+        in
+        end_def ();
+        generalize ty_var;
+        let id = enter_variable ~is_as_variable:true loc name ty_var in
+        rp k
+          {
+            pat_desc = Tpat_alias (q, id, name);
+            pat_loc = loc;
+            pat_extra = [];
+            pat_type = q.pat_type;
+            pat_attributes = sp.ppat_attributes;
+            pat_env = !env;
+          })
+  | Ppat_constant cst ->
+    let cst = constant_or_raise !env loc cst in
+    unify_pat_types loc !env (type_constant cst) expected_ty;
+    rp k
+      {
+        pat_desc = Tpat_constant cst;
+        pat_loc = loc;
+        pat_extra = [];
+        pat_type = expected_ty;
+        pat_attributes = sp.ppat_attributes;
+        pat_env = !env;
+      }
+  | Ppat_interval (Pconst_char c1, Pconst_char c2) ->
+    let open Ast_helper.Pat in
+    let gloc = {loc with Location.loc_ghost = true} in
+    let rec loop c1 c2 =
+      if c1 = c2 then constant ~loc:gloc (Pconst_char c1)
+      else
+        or_ ~loc:gloc (constant ~loc:gloc (Pconst_char c1)) (loop (c1 + 1) c2)
+    in
+    let p = if c1 <= c2 then loop c1 c2 else loop c2 c1 in
+    let p = {p with ppat_loc = loc} in
+    type_pat ~explode:0 p expected_ty k
+    (* TODO: record 'extra' to remember about interval *)
+  | Ppat_interval _ -> raise (Error (loc, !env, Invalid_interval))
+  | Ppat_tuple spl ->
+    assert (List.length spl >= 2);
+    let spl_ann = List.map (fun p -> (p, newvar ())) spl in
+    let ty = newty (Ttuple (List.map snd spl_ann)) in
+    unify_pat_types loc !env ty expected_ty;
+    map_fold_cont
+      (fun (p, t) -> type_pat p t)
+      spl_ann
+      (fun pl ->
+        rp k
+          {
+            pat_desc = Tpat_tuple pl;
+            pat_loc = loc;
+            pat_extra = [];
+            pat_type = expected_ty;
+            pat_attributes = sp.ppat_attributes;
+            pat_env = !env;
+          })
+  | Ppat_construct (lid, sarg) ->
+    let opath =
+      try
+        let p0, p, _ = extract_concrete_variant !env expected_ty in
+        Some (p0, p)
+      with Not_found -> None
+    in
+    let candidates =
+      match (lid.txt, constrs) with
+      | Longident.Lident s, Some constrs when Hashtbl.mem constrs s ->
+        [(Hashtbl.find constrs s, fun () -> ())]
+      | _ -> Typetexp.find_all_constructors !env lid.loc lid.txt
+    in
+    let check_lk tpath constr =
+      if constr.cstr_generalized then
+        raise
+          (Error
+             (lid.loc, !env, Unqualified_gadt_pattern (tpath, constr.cstr_name)))
+    in
+    let constr =
+      wrap_disambiguate "This variant pattern is expected to have" expected_ty
+        (Constructor.disambiguate lid !env opath ~check_lk)
+        candidates
+    in
+    if constr.cstr_generalized && constrs <> None && mode = Inside_or then
+      raise Need_backtrack;
+    Env.mark_constructor Env.Pattern !env (Longident.last lid.txt) constr;
+    Builtin_attributes.check_deprecated loc constr.cstr_attributes
+      constr.cstr_name;
+    if no_existentials && constr.cstr_existentials <> [] then
+      raise (Error (loc, !env, Unexpected_existential));
+    (* if constructor is gadt, we must verify that the expected type has the
+       correct head *)
+    if constr.cstr_generalized then unify_head_only loc !env expected_ty constr;
+    let sargs =
+      match sarg with
+      | None -> []
+      | Some {ppat_desc = Ppat_tuple spl}
+        when constr.cstr_arity > 1
+             || Builtin_attributes.explicit_arity sp.ppat_attributes ->
+        spl
+      | Some ({ppat_desc = Ppat_any} as sp) when constr.cstr_arity <> 1 ->
+        if constr.cstr_arity = 0 then
+          Location.prerr_warning sp.ppat_loc
+            Warnings.Wildcard_arg_to_constant_constr;
+        replicate_list sp constr.cstr_arity
+      | Some sp -> [sp]
+    in
+    (match sargs with
+    | [({ppat_desc = Ppat_constant _} as sp)]
+      when Builtin_attributes.warn_on_literal_pattern constr.cstr_attributes ->
+      Location.prerr_warning sp.ppat_loc Warnings.Fragile_literal_pattern
+    | _ -> ());
+    if List.length sargs <> constr.cstr_arity then
+      raise
+        (Error
+           ( loc,
+             !env,
+             Constructor_arity_mismatch
+               {
+                 name = lid.txt;
+                 constuctor = constr;
+                 expected = constr.cstr_arity;
+                 provided = List.length sargs;
+               } ));
+    let ty_args, ty_res =
+      instance_constructor ~in_pattern:(env, get_newtype_level ()) constr
+    in
+    (* PR#7214: do not use gadt unification for toplevel lets *)
+    if (not constr.cstr_generalized) || mode = Inside_or || no_existentials then
+      unify_pat_types loc !env ty_res expected_ty
+    else unify_pat_types_gadt loc env ty_res expected_ty;
+
+    let rec check_non_escaping p =
+      match p.ppat_desc with
+      | Ppat_or (p1, p2) ->
+        check_non_escaping p1;
+        check_non_escaping p2
+      | Ppat_alias (p, _) -> check_non_escaping p
+      | Ppat_constraint _ ->
+        raise (Error (p.ppat_loc, !env, Inlined_record_escape))
+      | _ -> ()
+    in
+    if constr.cstr_inlined <> None then List.iter check_non_escaping sargs;
+
+    map_fold_cont
+      (fun (p, t) -> type_pat p t)
+      (List.combine sargs ty_args)
+      (fun args ->
+        rp k
+          {
+            pat_desc = Tpat_construct (lid, constr, args);
+            pat_loc = loc;
+            pat_extra = [];
+            pat_type = expected_ty;
+            pat_attributes = sp.ppat_attributes;
+            pat_env = !env;
+          })
+  | Ppat_variant (l, sarg) -> (
+    let arg_type =
+      match sarg with
+      | None -> []
+      | Some _ -> [newvar ()]
+    in
+    let row =
+      {
+        row_fields = [(l, Reither (sarg = None, arg_type, true, ref None))];
+        row_closed = false;
+        row_more = newvar ();
+        row_fixed = false;
+        row_name = None;
+      }
+    in
+    (* PR#7404: allow some_other_tag blindly, as it would not unify with
+       the abstract row variable *)
+    if l = Parmatch.some_other_tag then assert (constrs <> None)
+    else unify_pat_types loc !env (newty (Tvariant row)) expected_ty;
+    let k arg =
+      rp k
+        {
+          pat_desc = Tpat_variant (l, arg, ref {row with row_more = newvar ()});
+          pat_loc = loc;
+          pat_extra = [];
+          pat_type = expected_ty;
+          pat_attributes = sp.ppat_attributes;
+          pat_env = !env;
+        }
+    in
+    (* PR#6235: propagate type information *)
+    match (sarg, arg_type) with
+    | Some p, [ty] -> type_pat p ty (fun p -> k (Some p))
+    | _ -> k None)
+  | Ppat_record (lid_sp_list, closed) ->
+    let has_dict_pattern_attr =
+      Dict_type_helpers.has_dict_pattern_attribute sp.ppat_attributes
+    in
+    let opath, record_ty =
+      if has_dict_pattern_attr then
+        ( (* [dict] Make sure dict patterns are inferred as actual dicts *)
+          Some (Predef.path_dict, Predef.path_dict),
+          newgenty (Tconstr (Predef.path_dict, [newvar ()], ref Mnil)) )
+      else
+        try
+          let p0, p, _, _ = extract_concrete_record !env expected_ty in
+          (Some (p0, p), expected_ty)
+        with Not_found -> (None, newvar ())
+    in
+    let get_jsx_component_error_info =
+      get_jsx_component_error_info ~extract_concrete_typedecl opath !env
+        record_ty
+    in
+    let process_optional_label (ld, pat, optional) =
+      let exp_optional_attr =
+        check_optional_attr !env ld optional pat.ppat_loc
+      in
+      let is_from_pamatch =
+        match pat.ppat_desc with
+        | Ppat_construct ({txt = Lident s}, _) ->
+          String.length s >= 2 && s.[0] = '#' && s.[1] = '$'
+        | _ -> false
+      in
+      if label_is_optional ld && (not exp_optional_attr) && not is_from_pamatch
+      then
+        let lid = mknoloc Longident.(Ldot (Lident "*predef*", "Some")) in
+        Ast_helper.Pat.construct ~loc:pat.ppat_loc lid (Some pat)
+      else pat
+    in
+    let type_label_pat (label_lid, label, sarg, opt) k =
+      let sarg = process_optional_label (label, sarg, opt) in
+      begin_def ();
+      let vars, ty_arg, ty_res = instance_label false label in
+      if vars = [] then end_def ();
+      (try unify_pat_types loc !env ty_res record_ty
+       with Unify trace ->
+         raise
+           (Error (label_lid.loc, !env, Label_mismatch (label_lid.txt, trace))));
+      type_pat sarg ty_arg (fun arg ->
+          if vars <> [] then (
+            end_def ();
+            generalize ty_arg;
+            List.iter generalize vars;
+            let instantiated tv =
+              let tv = expand_head !env tv in
+              (not (is_Tvar tv)) || tv.level <> generic_level
+            in
+            if List.exists instantiated vars then
+              raise
+                (Error (label_lid.loc, !env, Polymorphic_label label_lid.txt)));
+          k (label_lid, label, arg, opt))
+    in
+    let k' k lbl_pat_list =
+      check_recordpat_labels ~get_jsx_component_error_info loc lbl_pat_list
+        closed;
+      unify_pat_types loc !env record_ty expected_ty;
+      rp k
+        {
+          pat_desc = Tpat_record (lbl_pat_list, closed);
+          pat_loc = loc;
+          pat_extra = [];
+          pat_type = expected_ty;
+          pat_attributes = sp.ppat_attributes;
+          pat_env = !env;
+        }
+    in
+    if constrs = None then
+      k
+        (wrap_disambiguate "This record pattern is expected to have" expected_ty
+           (type_record_elem_list ?labels loc false !env type_label_pat opath
+              lid_sp_list)
+           (k' (fun x -> x)))
+    else
+      type_record_elem_list ?labels loc false !env type_label_pat opath
+        lid_sp_list (k' k)
+  | Ppat_array spl ->
+    let ty_elt = newvar () in
+    unify_pat_types loc !env
+      (instance_def (Predef.type_array ty_elt))
+      expected_ty;
+    let spl_ann = List.map (fun p -> (p, newvar ())) spl in
+    map_fold_cont
+      (fun (p, _) -> type_pat p ty_elt)
+      spl_ann
+      (fun pl ->
+        rp k
+          {
+            pat_desc = Tpat_array pl;
+            pat_loc = loc;
+            pat_extra = [];
+            pat_type = expected_ty;
+            pat_attributes = sp.ppat_attributes;
+            pat_env = !env;
+          })
+  | Ppat_or (sp1, sp2) -> (
+    let state = save_state env in
+    match
+      if mode = Split_or || mode = Splitting_or then raise Need_backtrack;
+      let initial_pattern_variables = !pattern_variables in
+      let initial_module_variables = !module_variables in
+      let p1 =
+        try Some (type_pat ~mode:Inside_or sp1 expected_ty (fun x -> x))
+        with Need_backtrack -> None
+      in
+      let p1_variables = !pattern_variables in
+      let p1_module_variables = !module_variables in
+      pattern_variables := initial_pattern_variables;
+      module_variables := initial_module_variables;
+      let p2 =
+        try Some (type_pat ~mode:Inside_or sp2 expected_ty (fun x -> x))
+        with Need_backtrack -> None
+      in
+      let p2_variables = !pattern_variables in
+      match (p1, p2) with
+      | None, None -> raise Need_backtrack
+      | Some p, None | None, Some p -> p (* no variables in this case *)
+      | Some p1, Some p2 ->
+        let alpha_env =
+          enter_orpat_variables loc !env p1_variables p2_variables
+        in
+        pattern_variables := p1_variables;
+        module_variables := p1_module_variables;
+        {
+          pat_desc = Tpat_or (p1, alpha_pat alpha_env p2, None);
+          pat_loc = loc;
+          pat_extra = [];
+          pat_type = expected_ty;
+          pat_attributes = sp.ppat_attributes;
+          pat_env = !env;
+        }
+    with
+    | p -> rp k p
+    | exception Need_backtrack when mode <> Inside_or -> (
+      assert (constrs <> None);
+      set_state state env;
+      let mode = if mode = Split_or then mode else Splitting_or in
+      try type_pat ~mode sp1 expected_ty k
+      with Error _ ->
+        set_state state env;
+        type_pat ~mode sp2 expected_ty k))
+  | Ppat_constraint (sp, sty) ->
+    (* Separate when not already separated by !principal *)
+    let separate = true in
+    if separate then begin_def ();
+    let cty, force = Typetexp.transl_simple_type_delayed !env sty in
+    let ty = cty.ctyp_type in
+    let ty, expected_ty' =
+      if separate then (
+        end_def ();
+        generalize_structure ty;
+        (instance !env ty, instance !env ty))
+      else (ty, ty)
+    in
+    unify_pat_types loc !env ty expected_ty;
+    type_pat sp expected_ty' (fun p ->
+        (*Format.printf "%a@.%a@."
+          Printtyp.raw_type_expr ty
+          Printtyp.raw_type_expr p.pat_type;*)
+        pattern_force := force :: !pattern_force;
+        let extra = (Tpat_constraint cty, loc, sp.ppat_attributes) in
+        let p =
+          if not separate then p
+          else
+            match p.pat_desc with
+            | Tpat_var (id, s) ->
+              {
+                p with
+                pat_type = ty;
+                pat_desc =
+                  Tpat_alias
+                    ({p with pat_desc = Tpat_any; pat_attributes = []}, id, s);
+                pat_extra = [extra];
+              }
+            | _ -> {p with pat_type = ty; pat_extra = extra :: p.pat_extra}
+        in
+        k p)
+  | Ppat_type lid ->
+    let path, p, ty = build_or_pat !env loc lid in
+    unify_pat_types loc !env ty expected_ty;
+    k
+      {
+        p with
+        pat_extra =
+          (Tpat_type (path, lid), loc, sp.ppat_attributes) :: p.pat_extra;
+      }
+  | Ppat_open (lid, p) ->
+    let path, new_env = !type_open Asttypes.Fresh !env sp.ppat_loc lid in
+    let new_env = ref new_env in
+    type_pat ~env:new_env p expected_ty (fun p ->
+        env := Env.copy_local !env ~from:!new_env;
+        k
+          {
+            p with
+            pat_extra =
+              (Tpat_open (path, lid, !new_env), loc, sp.ppat_attributes)
+              :: p.pat_extra;
+          })
+  | Ppat_exception _ ->
+    raise (Error (loc, !env, Exception_pattern_below_toplevel))
+  | Ppat_extension ext ->
+    raise (Error_forward (Builtin_attributes.error_of_extension ext))
+
+let type_pat ?(allow_existentials = false) ?constrs ?labels ?(mode = Normal)
+    ?(explode = 0) ?(lev = get_current_level ()) env sp expected_ty =
+  newtype_level := Some lev;
+  try
+    let r =
+      type_pat ~no_existentials:(not allow_existentials) ~constrs ~labels ~mode
+        ~explode ~env sp expected_ty (fun x -> x)
+    in
+    iter_pattern (fun p -> p.pat_env <- !env) r;
+    newtype_level := None;
+    r
+  with e ->
+    newtype_level := None;
+    raise e
+
+(* this function is passed to Partial.parmatch
+   to type check gadt nonexhaustiveness *)
+let partial_pred ~lev ?mode ?explode env expected_ty constrs labels p =
+  let env = ref env in
+  let state = save_state env in
+  try
+    reset_pattern None true;
+    let typed_p =
+      Ctype.with_passive_variants
+        (type_pat ~allow_existentials:true ~lev ~constrs ~labels ?mode ?explode
+           env p)
+        expected_ty
+    in
+    set_state state env;
+    (* types are invalidated but we don't need them here *)
+    Some typed_p
+  with Error _ ->
+    set_state state env;
+    None
+
+let check_partial ?(lev = get_current_level ()) ?partial_match_warning_hint env
+    expected_ty loc cases =
+  let explode =
+    match cases with
+    | [_] -> 5
+    | _ -> 0
+  in
+  Parmatch.check_partial_gadt ?partial_match_warning_hint
+    (partial_pred ~lev ~explode env expected_ty)
+    loc cases
+
+let check_unused ?(lev = get_current_level ()) env expected_ty cases =
+  Parmatch.check_unused
+    (fun constrs labels spat ->
+      partial_pred ~lev ~mode:Split_or ~explode:5 env expected_ty constrs labels
+        spat)
+    cases
+
+let add_pattern_variables ?check ?check_as env =
+  let pv = get_ref pattern_variables in
+  ( List.fold_right
+      (fun (id, ty, _name, loc, as_var) env ->
+        let check = if as_var then check_as else check in
+        Env.add_value ?check id
+          {
+            val_type = ty;
+            val_kind = Val_reg;
+            Types.val_loc = loc;
+            val_attributes = [];
+          }
+          env)
+      pv env,
+    get_ref module_variables )
+
+let type_pattern ~lev env spat scope expected_ty =
+  reset_pattern scope true;
+  let new_env = ref env in
+  let pat = type_pat ~allow_existentials:true ~lev new_env spat expected_ty in
+  let new_env, unpacks =
+    add_pattern_variables !new_env
+      ~check:(fun s -> Warnings.Unused_var_strict s)
+      ~check_as:(fun s -> Warnings.Unused_var s)
+  in
+  (pat, new_env, get_ref pattern_force, unpacks)
+
+let type_pattern_list env spatl scope expected_tys allow =
+  reset_pattern scope allow;
+  let new_env = ref env in
+  let type_pat (attrs, pat) ty =
+    Builtin_attributes.warning_scope ~ppwarning:false attrs (fun () ->
+        type_pat new_env pat ty)
+  in
+  let patl = List.map2 type_pat spatl expected_tys in
+  let new_env, unpacks = add_pattern_variables !new_env in
+  (patl, new_env, get_ref pattern_force, unpacks)
+
+let rec final_subexpression sexp =
+  match sexp.pexp_desc with
+  | Pexp_let (_, _, e)
+  | Pexp_sequence (_, e)
+  | Pexp_try (e, _)
+  | Pexp_ifthenelse (_, e, _)
+  | Pexp_match (_, {pc_rhs = e} :: _) ->
+    final_subexpression e
+  | _ -> sexp
+
+(* Generalization criterion for expressions *)
+
+let rec is_nonexpansive exp =
+  List.exists
+    (function
+      | (({txt = "internal.expansive"}, _) : Parsetree.attribute) -> true
+      | _ -> false)
+    exp.exp_attributes
+  ||
+  match exp.exp_desc with
+  | Texp_ident (_, _, _) -> true
+  | Texp_constant _ -> true
+  | Texp_let (_rec_flag, pat_exp_list, body) ->
+    List.for_all (fun vb -> is_nonexpansive vb.vb_expr) pat_exp_list
+    && is_nonexpansive body
+  | Texp_function _ -> true
+  | Texp_apply {funct = e; args = (_, None) :: el} ->
+    is_nonexpansive e && List.for_all is_nonexpansive_opt (List.map snd el)
+  | Texp_match (e, cases, [], _) ->
+    is_nonexpansive e
+    && List.for_all
+         (fun {c_lhs = _; c_guard; c_rhs} ->
+           is_nonexpansive_opt c_guard && is_nonexpansive c_rhs)
+         cases
+  | Texp_tuple el -> List.for_all is_nonexpansive el
+  | Texp_construct (_, _, el) -> List.for_all is_nonexpansive el
+  | Texp_variant (_, arg) -> is_nonexpansive_opt arg
+  | Texp_record {fields; extended_expression} ->
+    Array.for_all
+      (fun (lbl, definition, _) ->
+        match definition with
+        | Overridden (_, exp) -> lbl.lbl_mut = Immutable && is_nonexpansive exp
+        | Kept _ -> true)
+      fields
+    && is_nonexpansive_opt extended_expression
+  | Texp_field (exp, _, _) -> is_nonexpansive exp
+  | Texp_array [] -> false
+  | Texp_ifthenelse (_cond, ifso, ifnot) ->
+    is_nonexpansive ifso && is_nonexpansive_opt ifnot
+  | Texp_sequence (_e1, e2) -> is_nonexpansive e2 (* PR#4354 *)
+  (* Note: nonexpansive only means no _observable_ side effects *)
+  | Texp_letmodule (_, _, mexp, e) ->
+    is_nonexpansive_mod mexp && is_nonexpansive e
+  | Texp_pack mexp -> is_nonexpansive_mod mexp
+  (* Computations which raise exceptions are nonexpansive, since (raise e) is equivalent
+     to (raise e; diverge), and a nonexpansive "diverge" can be produced using lazy values
+     or the relaxed value restriction. See GPR#1142 *)
+  | Texp_assert exp -> is_nonexpansive exp
+  | Texp_apply
+      {
+        funct =
+          {
+            exp_desc =
+              Texp_ident
+                (_, _, {val_kind = Val_prim {Primitive.prim_name = "%raise"}});
+          };
+        args = [(Nolabel, Some e)];
+      } ->
+    is_nonexpansive e
+  | _ -> false
+
+and is_nonexpansive_mod mexp =
+  match mexp.mod_desc with
+  | Tmod_ident _ -> true
+  | Tmod_functor _ -> true
+  | Tmod_unpack (e, _) -> is_nonexpansive e
+  | Tmod_constraint (m, _, _, _) -> is_nonexpansive_mod m
+  | Tmod_structure str ->
+    List.for_all
+      (fun item ->
+        match item.str_desc with
+        | Tstr_eval _ | Tstr_primitive _ | Tstr_type _ | Tstr_modtype _
+        | Tstr_open _ ->
+          true
+        | Tstr_value (_, pat_exp_list) ->
+          List.for_all (fun vb -> is_nonexpansive vb.vb_expr) pat_exp_list
+        | Tstr_module {mb_expr = m; _} | Tstr_include {incl_mod = m; _} ->
+          is_nonexpansive_mod m
+        | Tstr_recmodule id_mod_list ->
+          List.for_all
+            (fun {mb_expr = m; _} -> is_nonexpansive_mod m)
+            id_mod_list
+        | Tstr_exception {ext_kind = Text_decl _} ->
+          false (* true would be unsound *)
+        | Tstr_exception {ext_kind = Text_rebind _} -> true
+        | Tstr_typext te ->
+          List.for_all
+            (function
+              | {ext_kind = Text_decl _} -> false
+              | {ext_kind = Text_rebind _} -> true)
+            te.tyext_constructors
+        | Tstr_attribute _ -> true)
+      str.str_items
+  | Tmod_apply _ -> false
+
+and is_nonexpansive_opt = function
+  | None -> true
+  | Some e -> is_nonexpansive e
+
+(* Approximate the type of an expression, for better recursion *)
+
+let rec approx_type env sty =
+  match sty.ptyp_desc with
+  | Ptyp_arrow {arg = {lbl = p}; ret = sty; arity} ->
+    let ty1 = if is_optional p then type_option (newvar ()) else newvar () in
+    newty (Tarrow ({lbl = p; typ = ty1}, approx_type env sty, Cok, arity))
+  | Ptyp_tuple args -> newty (Ttuple (List.map (approx_type env) args))
+  | Ptyp_constr (lid, ctl) -> (
+    try
+      let path = Env.lookup_type lid.txt env in
+      let decl = Env.find_type path env in
+      if List.length ctl <> decl.type_arity then raise Not_found;
+      let tyl = List.map (approx_type env) ctl in
+      newconstr path tyl
+    with Not_found -> newvar ())
+  | Ptyp_poly (_, sty) -> approx_type env sty
+  | _ -> newvar ()
+
+let rec type_approx env sexp =
+  match sexp.pexp_desc with
+  | Pexp_let (_, _, e) -> type_approx env e
+  | Pexp_fun {arg_label = p; rhs = e; arity} ->
+    let ty = if is_optional p then type_option (newvar ()) else newvar () in
+    newty (Tarrow ({lbl = p; typ = ty}, type_approx env e, Cok, arity))
+  | Pexp_match (_, {pc_rhs = e} :: _) -> type_approx env e
+  | Pexp_try (e, _) -> type_approx env e
+  | Pexp_tuple l -> newty (Ttuple (List.map (type_approx env) l))
+  | Pexp_ifthenelse (_, e, _) -> type_approx env e
+  | Pexp_sequence (_, e) -> type_approx env e
+  | Pexp_constraint (e, sty) ->
+    let ty = type_approx env e in
+    let ty1 = approx_type env sty in
+    (try unify env ty ty1
+     with Unify trace ->
+       raise
+         (Error (sexp.pexp_loc, env, Expr_type_clash {trace; context = None})));
+    ty1
+  | Pexp_coerce (e, (), sty2) ->
+    let approx_ty_opt = function
+      | None -> newvar ()
+      | Some sty -> approx_type env sty
+    in
+    let ty = type_approx env e
+    and ty1 = approx_ty_opt None
+    and ty2 = approx_type env sty2 in
+    (try unify env ty ty1
+     with Unify trace ->
+       raise
+         (Error (sexp.pexp_loc, env, Expr_type_clash {trace; context = None})));
+    ty2
+  | _ -> newvar ()
+
+(* List labels in a function type, and whether return type is a variable *)
+let rec list_labels_aux env visited ls ty_fun =
+  let ty = expand_head env ty_fun in
+  if List.memq ty visited then (List.rev ls, false)
+  else
+    match ty.desc with
+    | Tarrow (arg, ty_res, _, arity) when arity = None || visited = [] ->
+      list_labels_aux env (ty :: visited) (arg.lbl :: ls) ty_res
+    | _ -> (List.rev ls, is_Tvar ty)
+
+let list_labels env ty =
+  wrap_trace_gadt_instances env (list_labels_aux env [] []) ty
+
+(* Check that all univars are safe in a type *)
+let check_univars env expans kind exp ty_expected vars =
+  if expans && not (is_nonexpansive exp) then
+    generalize_expansive env exp.exp_type;
+  (* need to expand twice? cf. Ctype.unify2 *)
+  let vars = List.map (expand_head env) vars in
+  let vars = List.map (expand_head env) vars in
+  let vars' =
+    Ext_list.filter vars (fun t ->
+        let t = repr t in
+        generalize t;
+        match t.desc with
+        | Tvar name when t.level = generic_level ->
+          log_type t;
+          t.desc <- Tunivar name;
+          true
+        | _ -> false)
+  in
+  if List.length vars = List.length vars' then ()
+  else
+    let ty = newgenty (Tpoly (repr exp.exp_type, vars'))
+    and ty_expected = repr ty_expected in
+    raise
+      (Error
+         ( exp.exp_loc,
+           env,
+           Less_general (kind, [(ty, ty); (ty_expected, ty_expected)]) ))
+
+(* Check that a type is not a function *)
+let check_application_result env statement exp =
+  let loc = exp.exp_loc in
+  match (expand_head env exp.exp_type).desc with
+  | Tarrow _ -> Location.prerr_warning exp.exp_loc Warnings.Partial_application
+  | Tvar _ -> ()
+  | Tconstr (p, _, _) when Path.same p Predef.path_unit -> ()
+  | _ -> if statement then Location.prerr_warning loc Warnings.Statement_type
+
+(* Check that a type is generalizable at some level *)
+let generalizable level ty =
+  let rec check ty =
+    let ty = repr ty in
+    if ty.level < lowest_level then ()
+    else if ty.level <= level then raise Exit
+    else (
+      mark_type_node ty;
+      iter_type_expr check ty)
+  in
+  try
+    check ty;
+    unmark_type ty;
+    true
+  with Exit ->
+    unmark_type ty;
+    false
+
+(* Helpers for packaged modules. *)
+
+let wrap_unpacks sexp unpacks =
+  let open Ast_helper in
+  List.fold_left
+    (fun sexp (name, loc) ->
+      Exp.letmodule ~loc:sexp.pexp_loc
+        ~attrs:[(mknoloc "#modulepat", PStr [])]
+        name
+        (Mod.unpack ~loc
+           (Exp.ident ~loc:name.loc
+              (mkloc (Longident.Lident name.txt) name.loc)))
+        sexp)
+    sexp unpacks
+
+(* Helpers for type_cases *)
+
+let contains_variant_either ty =
+  let rec loop ty =
+    let ty = repr ty in
+    if ty.level >= lowest_level then (
+      mark_type_node ty;
+      match ty.desc with
+      | Tvariant row ->
+        let row = row_repr row in
+        if not row.row_fixed then
+          List.iter
+            (fun (_, f) ->
+              match row_field_repr f with
+              | Reither _ -> raise Exit
+              | _ -> ())
+            row.row_fields;
+        iter_row loop row
+      | _ -> iter_type_expr loop ty)
+  in
+  try
+    loop ty;
+    unmark_type ty;
+    false
+  with Exit ->
+    unmark_type ty;
+    true
+
+let iter_ppat f p =
+  match p.ppat_desc with
+  | Ppat_any | Ppat_var _ | Ppat_constant _ | Ppat_interval _ | Ppat_extension _
+  | Ppat_type _ | Ppat_unpack _ ->
+    ()
+  | Ppat_array pats -> List.iter f pats
+  | Ppat_or (p1, p2) ->
+    f p1;
+    f p2
+  | Ppat_variant (_, arg) | Ppat_construct (_, arg) -> may f arg
+  | Ppat_tuple lst -> List.iter f lst
+  | Ppat_exception p
+  | Ppat_alias (p, _)
+  | Ppat_open (_, p)
+  | Ppat_constraint (p, _) ->
+    f p
+  | Ppat_record (args, _flag) -> List.iter (fun {x = p} -> f p) args
+
+let contains_polymorphic_variant p =
+  let rec loop p =
+    match p.ppat_desc with
+    | Ppat_variant _ | Ppat_type _ -> raise Exit
+    | _ -> iter_ppat loop p
+  in
+  try
+    loop p;
+    false
+  with Exit -> true
+
+let contains_gadt env p =
+  let rec loop env p =
+    match p.ppat_desc with
+    | Ppat_construct (lid, _) ->
+      (try
+         let cstrs = Env.lookup_all_constructors lid.txt env in
+         List.iter
+           (fun (cstr, _) -> if cstr.cstr_generalized then raise_notrace Exit)
+           cstrs
+       with Not_found -> ());
+      iter_ppat (loop env) p
+    | Ppat_open (lid, sub_p) ->
+      let _, new_env = !type_open Asttypes.Override env p.ppat_loc lid in
+      loop new_env sub_p
+    | _ -> iter_ppat (loop env) p
+  in
+  try
+    loop env p;
+    false
+  with Exit -> true
+
+let check_absent_variant env =
+  iter_pattern (function
+    | {pat_desc = Tpat_variant (s, arg, row)} as pat ->
+      let row = row_repr !row in
+      if
+        List.exists
+          (fun (s', fi) -> s = s' && row_field_repr fi <> Rabsent)
+          row.row_fields
+        || ((not row.row_fixed) && not (static_row row))
+        (* same as Ctype.poly *)
+      then ()
+      else
+        let ty_arg =
+          match arg with
+          | None -> []
+          | Some p -> [correct_levels p.pat_type]
+        in
+        let row' =
+          {
+            row_fields = [(s, Reither (arg = None, ty_arg, true, ref None))];
+            row_more = newvar ();
+            row_closed = false;
+            row_fixed = false;
+            row_name = None;
+          }
+        in
+        (* Should fail *)
+        unify_pat env
+          {pat with pat_type = newty (Tvariant row')}
+          (correct_levels pat.pat_type)
+    | _ -> ())
+
+(* Duplicate types of values in the environment *)
+(* XXX Should we do something about global type variables too? *)
+
+let duplicate_ident_types caselist env =
+  let caselist =
+    Ext_list.filter caselist (fun {pc_lhs} -> contains_gadt env pc_lhs)
+  in
+  Env.copy_types (all_idents_cases caselist) env
+
+(* type_label_a_list returns a list of labels sorted by lbl_pos *)
+(* note: check_duplicates would better be implemented in
+         type_label_a_list directly *)
+let rec check_duplicates ~get_jsx_component_error_info loc env = function
+  | (_, lbl1, _, _) :: ((l : Longident.t loc), lbl2, _, _) :: _
+    when lbl1.lbl_pos = lbl2.lbl_pos ->
+    raise
+      (Error
+         ( l.loc,
+           env,
+           Label_multiply_defined
+             {
+               label = lbl1.lbl_name;
+               jsx_component_info = get_jsx_component_error_info ();
+             } ))
+  | _ :: rem -> check_duplicates ~get_jsx_component_error_info loc env rem
+  | [] -> ()
+
+(* Getting proper location of already typed expressions.
+
+   Used to avoid confusing locations on type error messages in presence of
+   type constraints.
+   For example:
+
+       (* Before patch *)
+       # let x : string = (5 : int);;
+                           ^
+       (* After patch *)
+       # let x : string = (5 : int);;
+                          ^^^^^^^^^
+*)
+let proper_exp_loc exp =
+  let rec aux = function
+    | [] -> exp.exp_loc
+    | ((Texp_constraint _ | Texp_coerce _), loc, _) :: _ -> loc
+    | _ :: rest -> aux rest
+  in
+  aux exp.exp_extra
+
+let id_of_pattern : Typedtree.pattern -> Ident.t option =
+ fun pat ->
+  match pat.pat_desc with
+  | Tpat_var (id, _) -> Some id
+  | Tpat_alias (_, id, _) -> Some id
+  | Tpat_construct
+      (_, _, [{pat_desc = Tpat_var (id, _) | Tpat_alias (_, id, _)}]) ->
+    Some (Ident.rename id)
+  | _ -> None
+(* To find reasonable names for let-bound and lambda-bound idents *)
+
+let rec name_pattern default = function
+  | [] -> Ident.create default
+  | {c_lhs = p; _} :: rem -> (
+    match id_of_pattern p with
+    | None -> name_pattern default rem
+    | Some id -> id)
+
+(* Typing of expressions *)
+
+let unify_exp ~context env exp expected_ty =
+  let loc = proper_exp_loc exp in
+  unify_exp_types ~context loc env exp.exp_type expected_ty
+
+let is_ignore ~env ~arity funct =
+  match funct.exp_desc with
+  | Texp_ident (_, _, {val_kind = Val_prim {Primitive.prim_name = "%ignore"}})
+    -> (
+    try
+      ignore (filter_arrow ~env ~arity (instance env funct.exp_type) Nolabel);
+      true
+    with Unify _ -> false)
+  | _ -> false
+
+let not_identity = function
+  | Texp_ident (_, _, {val_kind = Val_prim {Primitive.prim_name = "%identity"}})
+    ->
+    false
+  | _ -> true
+
+let rec lower_args env seen ty_fun =
+  let ty = expand_head env ty_fun in
+  if List.memq ty seen then ()
+  else
+    match ty.desc with
+    | Tarrow (arg, ty_fun, _com, _) ->
+      (try unify_var env (newvar ()) arg.typ with Unify _ -> assert false);
+      lower_args env (ty :: seen) ty_fun
+    | _ -> ()
+
+let not_function env ty =
+  let ls, tvar = list_labels env ty in
+  ls = [] && not tvar
+
+let extract_function_name funct =
+  match funct.exp_desc with
+  | Texp_ident (path, _, _) -> Some (Longident.parse (Path.name path))
+  | _ -> None
+
+type lazy_args =
+  (Asttypes.arg_label * (unit -> Typedtree.expression) option) list
+
+type targs = (Asttypes.arg_label * Typedtree.expression option) list
+let rec type_exp ?deprecated_context ~context ?recarg env sexp =
+  (* We now delegate everything to type_expect *)
+  type_expect ?deprecated_context ~context ?recarg env sexp (newvar ())
+
+(* Typing of an expression with an expected type.
+   This provide better error messages, and allows controlled
+   propagation of return type information.
+   In the principal case, [type_expected'] may be at generic_level.
+*)
+
+and type_expect ~context ?deprecated_context ?in_function ?recarg env sexp
+    ty_expected =
+  (* Special errors for braced identifiers passed to records *)
+  let context =
+    match sexp.pexp_desc with
+    | Pexp_ident _ ->
+      if
+        sexp.pexp_attributes
+        |> List.exists (fun (attr, _) -> attr.txt = "res.braces")
+      then Some Error_message_utils.BracedIdent
+      else context
+    | _ -> context
+  in
+  let previous_saved_types = Cmt_format.get_saved_types () in
+  let exp =
+    Builtin_attributes.warning_scope sexp.pexp_attributes (fun () ->
+        type_expect_ ?deprecated_context ~context ?in_function ?recarg env sexp
+          ty_expected)
+  in
+  Cmt_format.set_saved_types
+    (Cmt_format.Partial_expression exp :: previous_saved_types);
+  exp
+
+and type_expect_ ?deprecated_context ~context ?in_function ?(recarg = Rejected)
+    env sexp ty_expected =
+  let loc = sexp.pexp_loc in
+  (* Record the expression type before unifying it with the expected type *)
+  let rue exp =
+    unify_exp ~context env (re exp) (instance env ty_expected);
+    exp
+  in
+  let process_optional_label (id, ld, e, opt) =
+    let exp_optional_attr = check_optional_attr env ld opt e.pexp_loc in
+    if label_is_optional ld && not exp_optional_attr then
+      let lid = mknoloc Longident.(Ldot (Lident "*predef*", "Some")) in
+      let e = Ast_helper.Exp.construct ~loc:e.pexp_loc lid (Some e) in
+      (id, ld, e, opt)
+    else (id, ld, e, opt)
+  in
+  match sexp.pexp_desc with
+  | Pexp_ident lid ->
+    let path, desc =
+      Typetexp.find_value
+        ?deprecated_context:
+          (match deprecated_context with
+          | None -> Some Reference
+          | v -> v)
+        env lid.loc lid.txt
+    in
+    (if !Clflags.annotations then
+       let dloc = desc.Types.val_loc in
+       let annot =
+         if dloc.Location.loc_ghost then Annot.Iref_external
+         else Annot.Iref_internal dloc
+       in
+       let name = Path.name ~paren:Oprint.parenthesized_ident path in
+       Stypes.record (Stypes.An_ident (loc, name, annot)));
+    let is_recarg =
+      match (repr desc.val_type).desc with
+      | Tconstr (p, _, _) -> Path.is_constructor_typath p
+      | _ -> false
+    in
+
+    (match (is_recarg, recarg, (repr desc.val_type).desc) with
+    | _, Allowed, _ | true, Required, _ | false, Rejected, _ -> ()
+    | true, Rejected, _ | false, Required, (Tvar _ | Tconstr _) ->
+      raise (Error (loc, env, Inlined_record_escape))
+    | false, Required, _ -> () (* will fail later *));
+    rue
+      {
+        exp_desc = Texp_ident (path, lid, desc);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = instance env desc.val_type;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_constant cst ->
+    let cst = constant_or_raise env loc cst in
+    rue
+      {
+        exp_desc = Texp_constant cst;
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = type_constant cst;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_let
+      ( Nonrecursive,
+        [{pvb_pat = spat; pvb_expr = sval; pvb_attributes = []}],
+        sbody )
+    when contains_gadt env spat ->
+    (* TODO: allow non-empty attributes? *)
+    type_expect ~context:None ?in_function env
+      {
+        sexp with
+        pexp_desc = Pexp_match (sval, [Ast_helper.Exp.case spat sbody]);
+      }
+      ty_expected
+  | Pexp_let (rec_flag, spat_sexp_list, sbody) ->
+    let scp =
+      match (sexp.pexp_attributes, rec_flag) with
+      | [({txt = "#default"}, _)], _ -> None
+      | _, Recursive -> Some (Annot.Idef loc)
+      | _, Nonrecursive -> Some (Annot.Idef sbody.pexp_loc)
+    in
+    let pat_exp_list, new_env, unpacks =
+      type_let ~context:None env rec_flag spat_sexp_list scp true
+    in
+    let body =
+      type_expect ~context:None new_env (wrap_unpacks sbody unpacks) ty_expected
+    in
+    let () =
+      if rec_flag = Recursive then
+        Rec_check.check_recursive_bindings pat_exp_list
+    in
+    re
+      {
+        exp_desc = Texp_let (rec_flag, pat_exp_list, body);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = body.exp_type;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_fun
+      {
+        arg_label = l;
+        default = Some default;
+        lhs = spat;
+        rhs = sbody;
+        arity;
+        async;
+      } ->
+    assert (is_optional l);
+    (* default allowed only with optional argument *)
+    let open Ast_helper in
+    let default_loc = default.pexp_loc in
+    let scases =
+      [
+        Exp.case
+          (Pat.construct ~loc:default_loc
+             (mknoloc Longident.(Ldot (Lident "*predef*", "Some")))
+             (Some (Pat.var ~loc:default_loc (mknoloc "*sth*"))))
+          (Exp.ident ~loc:default_loc (mknoloc (Longident.Lident "*sth*")));
+        Exp.case
+          (Pat.construct ~loc:default_loc
+             (mknoloc Longident.(Ldot (Lident "*predef*", "None")))
+             None)
+          default;
+      ]
+    in
+    let sloc =
+      {
+        Location.loc_start = spat.ppat_loc.Location.loc_start;
+        loc_end = default_loc.Location.loc_end;
+        loc_ghost = true;
+      }
+    in
+    let smatch =
+      Exp.match_ ~loc:sloc
+        (Exp.ident ~loc (mknoloc (Longident.Lident "*opt*")))
+        scases
+    in
+    let pat = Pat.var ~loc:sloc (mknoloc "*opt*") in
+    let body =
+      Exp.let_ ~loc Nonrecursive
+        ~attrs:[(mknoloc "#default", PStr [])]
+        [Vb.mk spat smatch]
+        sbody
+    in
+    type_function ?in_function ~arity ~async loc sexp.pexp_attributes env
+      ty_expected l
+      [Exp.case pat body]
+  | Pexp_fun
+      {arg_label = l; default = None; lhs = spat; rhs = sbody; arity; async} ->
+    type_function ?in_function ~arity ~async loc sexp.pexp_attributes env
+      ty_expected l
+      [Ast_helper.Exp.case spat sbody]
+  | Pexp_apply {funct = sfunct; args = sargs; partial; transformed_jsx} ->
+    assert (sargs <> []);
+    begin_def ();
+    (* one more level for non-returning functions *)
+    let funct =
+      type_exp ~deprecated_context:FunctionCall ~context:None env sfunct
+    in
+    let ty = instance env funct.exp_type in
+    end_def ();
+    wrap_trace_gadt_instances env (lower_args env []) ty;
+    begin_def ();
+    let total_app = not partial in
+    let context = type_clash_context_from_function sexp sfunct in
+    let args, ty_res, fully_applied =
+      match translate_unified_ops env funct sargs with
+      | Some (targs, result_type) -> (targs, result_type, true)
+      | None -> type_application ~context total_app env funct sargs
+    in
+    end_def ();
+    unify_var env (newvar ()) funct.exp_type;
+
+    let mk_apply funct args =
+      rue
+        {
+          exp_desc = Texp_apply {funct; args; partial; transformed_jsx};
+          exp_loc = loc;
+          exp_extra = [];
+          exp_type = ty_res;
+          exp_attributes = sexp.pexp_attributes;
+          exp_env = env;
+        }
+    in
+
+    let is_primitive =
+      match funct.exp_desc with
+      | Texp_ident (_, _, {val_kind = Val_prim _}) -> true
+      | _ -> false
+    in
+
+    if fully_applied && not is_primitive then rue (mk_apply funct args)
+    else rue (mk_apply funct args)
+  | Pexp_match (sarg, caselist) ->
+    begin_def ();
+    let arg = type_exp ~context:None env sarg in
+    end_def ();
+    if not (is_nonexpansive arg) then generalize_expansive env arg.exp_type;
+    generalize arg.exp_type;
+    let rec split_cases vc ec = function
+      | [] -> (List.rev vc, List.rev ec)
+      | ({pc_lhs = {ppat_desc = Ppat_exception p}} as c) :: rest ->
+        split_cases vc ({c with pc_lhs = p} :: ec) rest
+      | c :: rest -> split_cases (c :: vc) ec rest
+    in
+    let val_caselist, exn_caselist = split_cases [] [] caselist in
+    if val_caselist = [] && exn_caselist <> [] then
+      raise (Error (loc, env, No_value_clauses));
+    (* Note: val_caselist = [] and exn_caselist = [], i.e. a fully
+       empty pattern matching can be generated by Camlp4 with its
+       revised syntax.  Let's accept it for backward compatibility. *)
+    let call_context =
+      if
+        Ext_list.exists sexp.pexp_attributes (fun ({txt}, _) ->
+            match txt with
+            | "let.unwrap" -> true
+            | _ -> false)
+      then `LetUnwrap
+      else `Switch
+    in
+    let val_cases, partial =
+      type_cases ~call_context env arg.exp_type ty_expected true loc
+        val_caselist
+    in
+    let exn_cases, _ =
+      type_cases ~call_context env Predef.type_exn ty_expected false loc
+        exn_caselist
+    in
+    re
+      {
+        exp_desc = Texp_match (arg, val_cases, exn_cases, partial);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = instance env ty_expected;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_try (sbody, caselist) ->
+    let body = type_expect ~context:None env sbody ty_expected in
+    let cases, _ =
+      type_cases ~call_context:`Try env Predef.type_exn ty_expected false loc
+        caselist
+    in
+    re
+      {
+        exp_desc = Texp_try (body, cases);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = body.exp_type;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_tuple sexpl ->
+    assert (List.length sexpl >= 2);
+    let subtypes = List.map (fun _ -> newgenvar ()) sexpl in
+    let to_unify = newgenty (Ttuple subtypes) in
+    unify_exp_types ~context:None loc env to_unify ty_expected;
+    let expl =
+      List.map2
+        (fun body ty -> type_expect ~context:None env body ty)
+        sexpl subtypes
+    in
+    re
+      {
+        exp_desc = Texp_tuple expl;
+        exp_loc = loc;
+        exp_extra = [];
+        (* Keep sharing *)
+        exp_type = newty (Ttuple (List.map (fun e -> e.exp_type) expl));
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_construct (lid, sarg) ->
+    type_construct ~context env loc lid sarg ty_expected sexp.pexp_attributes
+  | Pexp_variant (l, sarg) -> (
+    (* Keep sharing *)
+    let ty_expected0 = instance env ty_expected in
+    try
+      match
+        (sarg, expand_head env ty_expected, expand_head env ty_expected0)
+      with
+      | Some sarg, {desc = Tvariant row}, {desc = Tvariant row0} -> (
+        let row = row_repr row in
+        match
+          ( row_field_repr (List.assoc l row.row_fields),
+            row_field_repr (List.assoc l row0.row_fields) )
+        with
+        | Rpresent (Some ty), Rpresent (Some ty0) ->
+          let arg = type_argument ~context:None env sarg ty ty0 in
+          re
+            {
+              exp_desc = Texp_variant (l, Some arg);
+              exp_loc = loc;
+              exp_extra = [];
+              exp_type = ty_expected0;
+              exp_attributes = sexp.pexp_attributes;
+              exp_env = env;
+            }
+        | _ -> raise Not_found)
+      | _ -> raise Not_found
+    with Not_found ->
+      let arg =
+        may_map
+          (fun sarg -> type_expect ~context:None env sarg (newvar ()))
+          sarg
+      in
+      let arg_type = may_map (fun arg -> arg.exp_type) arg in
+      rue
+        {
+          exp_desc = Texp_variant (l, arg);
+          exp_loc = loc;
+          exp_extra = [];
+          exp_type =
+            newty
+              (Tvariant
+                 {
+                   row_fields = [(l, Rpresent arg_type)];
+                   row_more = newvar ();
+                   row_closed = false;
+                   row_fixed = false;
+                   row_name = None;
+                 });
+          exp_attributes = sexp.pexp_attributes;
+          exp_env = env;
+        })
+  | Pexp_record (lid_sexp_list, None) ->
+    let ty_record, opath, fields, repr_opt =
+      match extract_concrete_record env ty_expected with
+      | p0, p, fields, repr ->
+        (* XXX level may be wrong *)
+        (ty_expected, Some (p0, p), fields, Some repr)
+      | exception Not_found -> (newvar (), None, [], None)
+    in
+
+    let get_jsx_component_error_info () =
+      match opath with
+      | Some (p, _) ->
+        get_jsx_component_props ~extract_concrete_typedecl env ty_record p
+      | None -> None
+    in
+    let jsx_component_error_info = get_jsx_component_error_info () in
+    let lbl_exp_list =
+      wrap_disambiguate "This record expression is expected to have" ty_record
+        (type_record_elem_list loc true env
+           (fun e k ->
+             k
+               (type_label_exp ~call_context:(`Regular jsx_component_error_info)
+                  true env loc ty_record (process_optional_label e)))
+           opath lid_sexp_list)
+        (fun x -> x)
+    in
+    unify_exp_types ~context:None loc env ty_record (instance env ty_expected);
+    check_duplicates ~get_jsx_component_error_info loc env lbl_exp_list;
+    let label_descriptions, representation =
+      match (lbl_exp_list, repr_opt) with
+      | ( (_, {lbl_all = label_descriptions; lbl_repres = representation}, _, _)
+          :: _,
+          _ ) ->
+        (label_descriptions, representation)
+      | [], Some representation when lid_sexp_list = [] ->
+        let filter_missing (ld : Types.label_declaration) =
+          if ld.ld_optional then None else Some (Ident.name ld.ld_id)
+        in
+        let labels_missing = fields |> List.filter_map filter_missing in
+        if labels_missing <> [] then
+          raise
+            (Error
+               ( loc,
+                 env,
+                 Labels_missing
+                   {
+                     labels = labels_missing;
+                     jsx_component_info = jsx_component_error_info;
+                   } ));
+        ([||], representation)
+      | [], _ ->
+        if fields = [] && repr_opt <> None then ([||], Record_regular)
+        else raise (Error (loc, env, Empty_record_literal))
+    in
+    let labels_missing = ref [] in
+    let label_definitions =
+      let matching_label lbl =
+        List.find
+          (fun (_, lbl', _, _) -> lbl'.lbl_pos = lbl.lbl_pos)
+          lbl_exp_list
+      in
+      Array.map
+        (fun lbl ->
+          match matching_label lbl with
+          | lid, _lbl, lbl_exp, _ -> Overridden (lid, lbl_exp)
+          | exception Not_found ->
+            if not (label_is_optional lbl) then
+              labels_missing := lbl.lbl_name :: !labels_missing;
+            Overridden
+              ({loc; txt = Lident lbl.lbl_name}, option_none lbl.lbl_arg loc))
+        label_descriptions
+    in
+    if !labels_missing <> [] then
+      raise
+        (Error
+           ( loc,
+             env,
+             Labels_missing
+               {
+                 labels = List.rev !labels_missing;
+                 jsx_component_info = jsx_component_error_info;
+               } ));
+    let fields =
+      Array.map2
+        (fun descr def -> (descr, def, false))
+        label_descriptions label_definitions
+    in
+    re
+      {
+        exp_desc =
+          Texp_record {fields; representation; extended_expression = None};
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = instance env ty_expected;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_record (lid_sexp_list, Some sexp) ->
+    assert (lid_sexp_list <> []);
+    let exp = type_exp ~context:None ~recarg env sexp in
+    let ty_record, opath =
+      let get_path ty =
+        try
+          let p0, p, _, _ = extract_concrete_record env ty in
+          (* XXX level may be wrong *)
+          Some (p0, p)
+        with Not_found -> None
+      in
+      match get_path ty_expected with
+      | None -> (
+        match get_path exp.exp_type with
+        | None -> (newvar (), None)
+        | Some (_, p') as op ->
+          let decl = Env.find_type p' env in
+          begin_def ();
+          let ty = newconstr p' (instance_list env decl.type_params) in
+          end_def ();
+          generalize_structure ty;
+          (ty, op))
+      | op -> (ty_expected, op)
+    in
+    let get_jsx_component_error_info =
+      get_jsx_component_error_info ~extract_concrete_typedecl opath env
+        ty_record
+    in
+    let closed = false in
+    let jsx_component_error_info = get_jsx_component_error_info () in
+    let lbl_exp_list =
+      wrap_disambiguate "This record expression is expected to have" ty_record
+        (type_record_elem_list loc closed env
+           (fun e k ->
+             k
+               (type_label_exp ~call_context:(`Regular jsx_component_error_info)
+                  true env loc ty_record (process_optional_label e)))
+           opath lid_sexp_list)
+        (fun x -> x)
+    in
+    unify_exp_types ~context:None loc env ty_record (instance env ty_expected);
+    check_duplicates ~get_jsx_component_error_info loc env lbl_exp_list;
+    let opt_exp, label_definitions =
+      let _lid, lbl, _lbl_exp, _opt = List.hd lbl_exp_list in
+      let matching_label lbl =
+        List.find
+          (fun (_, lbl', _, _) -> lbl'.lbl_pos = lbl.lbl_pos)
+          lbl_exp_list
+      in
+      let ty_exp = instance env exp.exp_type in
+      let unify_kept lbl =
+        let _, ty_arg1, ty_res1 = instance_label false lbl in
+        unify_exp_types ~context:None exp.exp_loc env ty_exp ty_res1;
+        match matching_label lbl with
+        | lid, _lbl, lbl_exp, _ ->
+          (* do not connect result types for overridden labels *)
+          Overridden (lid, lbl_exp)
+        | exception Not_found ->
+          let _, ty_arg2, ty_res2 = instance_label false lbl in
+          unify_exp_types ~context:None loc env ty_arg1 ty_arg2;
+          unify_exp_types ~context:None loc env (instance env ty_expected)
+            ty_res2;
+          Kept ty_arg1
+      in
+      let label_definitions = Array.map unify_kept lbl.lbl_all in
+      (Some {exp with exp_type = ty_exp}, label_definitions)
+    in
+    let num_fields =
+      match lbl_exp_list with
+      | [] -> assert false
+      | (_, lbl, _, _) :: _ -> Array.length lbl.lbl_all
+    in
+    let opt_exp =
+      if List.length lid_sexp_list = num_fields then (
+        Location.prerr_warning loc Warnings.Useless_record_with;
+        None)
+      else opt_exp
+    in
+    let label_descriptions, representation =
+      let _, {lbl_all; lbl_repres}, _, _ = List.hd lbl_exp_list in
+      (lbl_all, lbl_repres)
+    in
+    let fields =
+      Array.map2
+        (fun descr def -> (descr, def, false))
+        label_descriptions label_definitions
+    in
+    re
+      {
+        exp_desc =
+          Texp_record {fields; representation; extended_expression = opt_exp};
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = instance env ty_expected;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_field (srecord, lid) ->
+    let record, label, _ = type_label_access env srecord lid in
+    let _, ty_arg, ty_res = instance_label false label in
+    unify_exp ~context:None env record ty_res;
+    rue
+      {
+        exp_desc = Texp_field (record, lid, label);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = ty_arg;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_setfield (srecord, lid, snewval) ->
+    let record, label, opath = type_label_access env srecord lid in
+    let ty_record = if opath = None then newvar () else record.exp_type in
+    let label_loc, label, newval, _ =
+      type_label_exp ~call_context:`SetRecordField false env loc ty_record
+        (lid, label, snewval, false)
+    in
+    unify_exp ~context:None env record ty_record;
+    if label.lbl_mut = Immutable then
+      raise (Error (loc, env, Label_not_mutable lid.txt));
+    Builtin_attributes.check_deprecated_mutable lid.loc label.lbl_attributes
+      (Longident.last lid.txt);
+    rue
+      {
+        exp_desc = Texp_setfield (record, label_loc, label, newval);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = instance_def Predef.type_unit;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_array sargl ->
+    let ty = newgenvar () in
+    let to_unify = Predef.type_array ty in
+    unify_exp_types ~context:None loc env to_unify ty_expected;
+    let argl =
+      List.map
+        (fun sarg -> type_expect ~context:(Some ArrayValue) env sarg ty)
+        sargl
+    in
+    re
+      {
+        exp_desc = Texp_array argl;
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = instance env ty_expected;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_ifthenelse (scond, sifso, sifnot) -> (
+    (* TODO(attributes) Unify the attribute handling in the parser and rest of the compiler. *)
+    let is_ternary =
+      let rec has_ternary = function
+        | [] -> false
+        | ({Location.txt = "res.ternary"}, _) :: _ -> true
+        | _ :: rest -> has_ternary rest
+      in
+      has_ternary sexp.pexp_attributes
+    in
+    let return_context =
+      if is_ternary then Some TernaryReturn else Some IfReturn
+    in
+    let cond =
+      type_expect ~context:(Some IfCondition) env scond Predef.type_bool
+    in
+    match sifnot with
+    | None ->
+      let ifso =
+        type_expect ~context:return_context env sifso Predef.type_unit
+      in
+      rue
+        {
+          exp_desc = Texp_ifthenelse (cond, ifso, None);
+          exp_loc = loc;
+          exp_extra = [];
+          exp_type = ifso.exp_type;
+          exp_attributes = sexp.pexp_attributes;
+          exp_env = env;
+        }
+    | Some sifnot ->
+      let ifso = type_expect ~context:return_context env sifso ty_expected in
+      let ifnot = type_expect ~context:return_context env sifnot ty_expected in
+      (* Keep sharing *)
+      unify_exp ~context:return_context env ifnot ifso.exp_type;
+      re
+        {
+          exp_desc = Texp_ifthenelse (cond, ifso, Some ifnot);
+          exp_loc = loc;
+          exp_extra = [];
+          exp_type = ifso.exp_type;
+          exp_attributes = sexp.pexp_attributes;
+          exp_env = env;
+        })
+  | Pexp_sequence (sexp1, sexp2) ->
+    let exp1 = type_statement ~context:None env sexp1 in
+    let exp2 = type_expect ~context:None env sexp2 ty_expected in
+    re
+      {
+        exp_desc = Texp_sequence (exp1, exp2);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = exp2.exp_type;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_while (scond, sbody) ->
+    let cond =
+      type_expect ~context:(Some WhileCondition) env scond Predef.type_bool
+    in
+    let body = type_statement ~context:None env sbody in
+    rue
+      {
+        exp_desc = Texp_while (cond, body);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = instance_def Predef.type_unit;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_for (param, slow, shigh, dir, sbody) ->
+    let low =
+      type_expect ~context:(Some ForLoopCondition) env slow Predef.type_int
+    in
+    let high =
+      type_expect ~context:(Some ForLoopCondition) env shigh Predef.type_int
+    in
+    let id, new_env =
+      match param.ppat_desc with
+      | Ppat_any -> (Ident.create "_for", env)
+      | Ppat_var {txt} ->
+        Env.enter_value txt
+          {
+            val_type = instance_def Predef.type_int;
+            val_attributes = [];
+            val_kind = Val_reg;
+            Types.val_loc = loc;
+          }
+          env
+          ~check:(fun s -> Warnings.Unused_for_index s)
+      | _ -> raise (Error (param.ppat_loc, env, Invalid_for_loop_index))
+    in
+    let body = type_statement ~context:None new_env sbody in
+    rue
+      {
+        exp_desc = Texp_for (id, param, low, high, dir, body);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = instance_def Predef.type_unit;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_constraint (sarg, sty) ->
+    let separate = true in
+    (* always separate, 1% slowdown for lablgtk *)
+    if separate then begin_def ();
+    let cty = Typetexp.transl_simple_type env false sty in
+    let ty = cty.ctyp_type in
+    let arg, ty' =
+      if separate then (
+        end_def ();
+        generalize_structure ty;
+        ( type_argument ~context:None env sarg ty (instance env ty),
+          instance env ty ))
+      else (type_argument ~context:None env sarg ty ty, ty)
+    in
+    rue
+      {
+        exp_desc = arg.exp_desc;
+        exp_loc = arg.exp_loc;
+        exp_type = ty';
+        exp_attributes = arg.exp_attributes;
+        exp_env = env;
+        exp_extra =
+          (Texp_constraint cty, loc, sexp.pexp_attributes) :: arg.exp_extra;
+      }
+  | Pexp_coerce (sarg, (), sty') ->
+    let separate = true in
+    (* always separate, 1% slowdown for lablgtk *)
+    (* Also see PR#7199 for a problem with the following:
+       let separate =  Env.has_local_constraints env in*)
+    let arg, ty', cty' =
+      let cty', force = Typetexp.transl_simple_type_delayed env sty' in
+      let ty' = cty'.ctyp_type in
+      if separate then begin_def ();
+      let arg = type_exp ~context:None env sarg in
+      let gen =
+        if separate then (
+          end_def ();
+          let tv = newvar () in
+          let gen = generalizable tv.level arg.exp_type in
+          (try unify_var env tv arg.exp_type
+           with Unify trace ->
+             raise
+               (Error (arg.exp_loc, env, Expr_type_clash {trace; context = None})));
+          gen)
+        else true
+      in
+      (if
+         (not gen)
+         &&
+         (* first try a single coercion *)
+         let snap = snapshot () in
+         let ty, _b = enlarge_type env ty' in
+         try
+           force ();
+           Ctype.unify env arg.exp_type ty;
+           true
+         with Unify _ ->
+           backtrack snap;
+           false
+       then ()
+       else
+         try
+           let force' = subtype env arg.exp_type ty' in
+           force ();
+           force' ()
+         with Subtype (tr1, tr2, ctx) ->
+           (* prerr_endline "coercion failed"; *)
+           raise (Error (loc, env, Not_subtype (tr1, tr2, ctx))));
+      (arg, ty', cty')
+    in
+    rue
+      {
+        exp_desc = arg.exp_desc;
+        exp_loc = arg.exp_loc;
+        exp_type = ty';
+        exp_attributes = arg.exp_attributes;
+        exp_env = env;
+        exp_extra =
+          (Texp_coerce cty', loc, sexp.pexp_attributes) :: arg.exp_extra;
+      }
+  | Pexp_send (e, {txt = met}) -> (
+    let obj = type_exp ~context:None env e in
+    let obj_meths = ref None in
+    try
+      let meth, exp, typ =
+        match obj.exp_desc with
+        | _ -> (Tmeth_name met, None, filter_method env met Public obj.exp_type)
+      in
+      let typ =
+        match repr typ with
+        | {desc = Tpoly (ty, [])} -> instance env ty
+        | {desc = Tpoly (ty, tl); level = _} -> snd (instance_poly false tl ty)
+        | {desc = Tvar _} as ty ->
+          let ty' = newvar () in
+          unify env (instance_def ty) (newty (Tpoly (ty', [])));
+          (* if not !Clflags.nolabels then
+             Location.prerr_warning loc (Warnings.Unknown_method met); *)
+          ty'
+        | _ -> assert false
+      in
+      rue
+        {
+          exp_desc = Texp_send (obj, meth, exp);
+          exp_loc = loc;
+          exp_extra = [];
+          exp_type = typ;
+          exp_attributes = sexp.pexp_attributes;
+          exp_env = env;
+        }
+    with Unify _ ->
+      let valid_methods =
+        match !obj_meths with
+        | Some meths ->
+          Some (Meths.fold (fun meth _meth_ty li -> meth :: li) !meths [])
+        | None -> (
+          match (expand_head env obj.exp_type).desc with
+          | Tobject (fields, _) ->
+            let fields, _ = Ctype.flatten_fields fields in
+            let collect_fields li (meth, meth_kind, _meth_ty) =
+              if meth_kind = Fpresent then meth :: li else li
+            in
+            Some (List.fold_left collect_fields [] fields)
+          | _ -> None)
+      in
+      raise
+        (Error
+           (e.pexp_loc, env, Undefined_method (obj.exp_type, met, valid_methods)))
+    )
+  | Pexp_letmodule (name, smodl, sbody) ->
+    let ty = newvar () in
+    (* remember original level *)
+    begin_def ();
+    Ident.set_current_time ty.level;
+    let context = Typetexp.narrow () in
+    let modl = !type_module env smodl in
+    let id, new_env = Env.enter_module name.txt modl.mod_type env in
+    Ctype.init_def (Ident.current_time ());
+    Typetexp.widen context;
+    let body = type_expect ~context:None new_env sbody ty_expected in
+    (* go back to original level *)
+    end_def ();
+    (* Unification of body.exp_type with the fresh variable ty
+       fails if and only if the prefix condition is violated,
+       i.e. if generative types rooted at id show up in the
+       type body.exp_type.  Thus, this unification enforces the
+       scoping condition on "let module". *)
+    (* Note that this code will only be reached if ty_expected
+       is a generic type variable, otherwise the error will occur
+       above in type_expect *)
+    (try Ctype.unify_var new_env ty body.exp_type
+     with Unify _ ->
+       raise (Error (loc, env, Scoping_let_module (name.txt, body.exp_type))));
+    re
+      {
+        exp_desc = Texp_letmodule (id, name, modl, body);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = ty;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_letexception (cd, sbody) ->
+    let cd, newenv = Typedecl.transl_exception env cd in
+    let body = type_expect ~context:None newenv sbody ty_expected in
+    re
+      {
+        exp_desc = Texp_letexception (cd, body);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = body.exp_type;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_assert e ->
+    let cond =
+      type_expect ~context:(Some AssertCondition) env e Predef.type_bool
+    in
+    let exp_type =
+      match cond.exp_desc with
+      | Texp_construct (_, {cstr_name = "false"}, _) -> instance env ty_expected
+      | _ -> instance_def Predef.type_unit
+    in
+    rue
+      {
+        exp_desc = Texp_assert cond;
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type;
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_newtype ({txt = name}, sbody) ->
+    let ty = newvar () in
+    (* remember original level *)
+    begin_def ();
+    (* Create a fake abstract type declaration for name. *)
+    let level = get_current_level () in
+    let decl =
+      {
+        type_params = [];
+        type_arity = 0;
+        type_kind = Type_abstract;
+        type_private = Public;
+        type_manifest = None;
+        type_variance = [];
+        type_newtype_level = Some (level, level);
+        type_loc = loc;
+        type_attributes = [];
+        type_immediate = false;
+        type_unboxed = unboxed_false_default_false;
+        type_inlined_types = [];
+      }
+    in
+    Ident.set_current_time ty.level;
+    let id, new_env = Env.enter_type name decl env in
+    Ctype.init_def (Ident.current_time ());
+
+    let body = type_exp ~context:None new_env sbody in
+    (* Replace every instance of this type constructor in the resulting
+       type. *)
+    let seen = Hashtbl.create 8 in
+    let rec replace t =
+      if Hashtbl.mem seen t.id then ()
+      else (
+        Hashtbl.add seen t.id ();
+        match t.desc with
+        | Tconstr (Path.Pident id', _, _) when id == id' -> link_type t ty
+        | _ -> Btype.iter_type_expr replace t)
+    in
+    let ety = Subst.type_expr Subst.identity body.exp_type in
+    replace ety;
+    (* back to original level *)
+    end_def ();
+
+    (* lower the levels of the result type *)
+    (* unify_var env ty ety; *)
+
+    (* non-expansive if the body is non-expansive, so we don't introduce
+       any new extra node in the typed AST. *)
+    rue
+      {
+        body with
+        exp_loc = loc;
+        exp_type = ety;
+        exp_extra =
+          (Texp_newtype name, loc, sexp.pexp_attributes) :: body.exp_extra;
+      }
+  | Pexp_pack m ->
+    let p, nl =
+      match Ctype.expand_head env (instance env ty_expected) with
+      | {desc = Tpackage (p, nl, _tl)} -> (p, nl)
+      | {desc = Tvar _} -> raise (Error (loc, env, Cannot_infer_signature))
+      | _ -> raise (Error (loc, env, Not_a_packed_module ty_expected))
+    in
+    let modl, tl' = !type_package env m p nl in
+    rue
+      {
+        exp_desc = Texp_pack modl;
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = newty (Tpackage (p, nl, tl'));
+        exp_attributes = sexp.pexp_attributes;
+        exp_env = env;
+      }
+  | Pexp_open (ovf, lid, e) ->
+    let path, newenv = !type_open ovf env sexp.pexp_loc lid in
+    let exp = type_expect ~context:None newenv e ty_expected in
+    {
+      exp with
+      exp_extra =
+        (Texp_open (ovf, path, lid, newenv), loc, sexp.pexp_attributes)
+        :: exp.exp_extra;
+    }
+  | Pexp_extension
+      ( {txt = "ocaml.extension_constructor" | "extension_constructor"; _},
+        payload ) -> (
+    match payload with
+    | PStr
+        [
+          {
+            pstr_desc =
+              Pstr_eval ({pexp_desc = Pexp_construct (lid, None); _}, _);
+          };
+        ] ->
+      let path =
+        match (Typetexp.find_constructor env lid.loc lid.txt).cstr_tag with
+        | Cstr_extension path -> path
+        | _ -> raise (Error (lid.loc, env, Not_an_extension_constructor))
+      in
+      rue
+        {
+          exp_desc = Texp_extension_constructor (lid, path);
+          exp_loc = loc;
+          exp_extra = [];
+          exp_type = instance_def Predef.type_extension_constructor;
+          exp_attributes = sexp.pexp_attributes;
+          exp_env = env;
+        }
+    | _ -> raise (Error (loc, env, Invalid_extension_constructor_payload)))
+  | Pexp_extension ext ->
+    raise (Error_forward (Builtin_attributes.error_of_extension ext))
+  | Pexp_await _ -> (* should be handled earlier *) assert false
+  | Pexp_jsx_element _ ->
+    raise (Error (sexp.pexp_loc, Env.empty, Jsx_not_enabled))
+
+and type_function ?in_function ~arity ~async loc attrs env ty_expected_ l
+    caselist =
+  let state = Warnings.backup () in
+  (* Disable Unerasable_optional_argument for uncurried functions *)
+  let unerasable_optional_argument =
+    Warnings.number Unerasable_optional_argument
+  in
+  Warnings.parse_options false ("-" ^ string_of_int unerasable_optional_argument);
+  let ty_expected =
+    match arity with
+    | None -> ty_expected_
+    | Some arity ->
+      let fun_t =
+        newty (Tarrow ({lbl = l; typ = newvar ()}, newvar (), Cok, Some arity))
+      in
+      unify_exp_types ~context:None loc env fun_t ty_expected_;
+      fun_t
+  in
+  let loc_fun, ty_fun =
+    match in_function with
+    | Some p -> p
+    | None -> (loc, instance env ty_expected)
+  in
+  let separate = Env.has_local_constraints env in
+  if separate then begin_def ();
+  let ty_arg, ty_res =
+    try filter_arrow ~env ~arity (instance env ty_expected) l
+    with Unify _ -> (
+      match expand_head env ty_expected with
+      | {desc = Tarrow _} as ty ->
+        raise (Error (loc, env, Abstract_wrong_label (l, ty)))
+      | _ ->
+        raise
+          (Error (loc_fun, env, Too_many_arguments (in_function <> None, ty_fun))))
+  in
+  let ty_arg =
+    if is_optional l then (
+      let tv = newvar () in
+      (try unify env ty_arg (type_option tv) with Unify _ -> assert false);
+      type_option tv)
+    else ty_arg
+  in
+  if separate then (
+    end_def ();
+    generalize_structure ty_arg;
+    generalize_structure ty_res);
+  let cases, partial =
+    type_cases ~call_context:`Function ~in_function:(loc_fun, ty_fun) env ty_arg
+      ty_res true loc caselist
+  in
+  let case = List.hd cases in
+  if is_optional l && not_function env ty_res then
+    Location.prerr_warning case.c_lhs.pat_loc
+      Warnings.Unerasable_optional_argument;
+  let param = name_pattern "param" cases in
+  let exp_type =
+    instance env
+      (newgenty (Tarrow ({lbl = l; typ = ty_arg}, ty_res, Cok, arity)))
+  in
+  Warnings.restore state;
+  re
+    {
+      exp_desc =
+        Texp_function {arg_label = l; arity; param; case; partial; async};
+      exp_loc = loc;
+      exp_extra = [];
+      exp_type;
+      exp_attributes = attrs;
+      exp_env = env;
+    }
+
+and type_label_access env srecord lid =
+  let record = type_exp ~context:None ~recarg:Allowed env srecord in
+  let ty_exp = record.exp_type in
+  let opath =
+    try
+      match extract_concrete_typedecl env ty_exp with
+      | p0, _, {type_attributes}
+        when Path.same p0 Predef.path_dict
+             && Dict_type_helpers.has_dict_attribute type_attributes ->
+        (* [dict] Cover the case when trying to direct field access on a dict, e.g. `someDict.name`.
+           We need to disallow this because the fact that a dict is represented as a single magic
+           field record internally is just an implementation detail, and not intended to be exposed
+           to the user. *)
+        raise (Error (lid.loc, env, Field_access_on_dict_type))
+      | p0, p, {type_kind = Type_record _} -> Some (p0, p)
+      | _ -> None
+    with Not_found -> None
+  in
+  let labels = Typetexp.find_all_labels env lid.loc lid.txt in
+  let label =
+    wrap_disambiguate "This expression has" ty_exp
+      (Label.disambiguate ~from_type:ty_exp lid env opath)
+      labels
+  in
+  (record, label, opath)
+
+(* Typing format strings for printing or reading.
+   These formats are used by functions in modules Printf, Format, and Scanf.
+   (Handling of * modifiers contributed by Thorsten Ohl.) *)
+and type_label_exp ~call_context create env loc ty_expected
+    (lid, label, sarg, opt) =
+  (* Here also ty_expected may be at generic_level *)
+  begin_def ();
+  let separate = Env.has_local_constraints env in
+  if separate then (
+    begin_def ();
+    begin_def ());
+  let vars, ty_arg, ty_res = instance_label true label in
+  if separate then (
+    end_def ();
+    (* Generalize label information *)
+    generalize_structure ty_arg;
+    generalize_structure ty_res);
+  (try unify env (instance_def ty_res) (instance env ty_expected)
+   with Unify trace ->
+     raise (Error (lid.loc, env, Label_mismatch (lid.txt, trace))));
+  (* Instantiate so that we can generalize internal nodes *)
+  let ty_arg = instance_def ty_arg in
+  if separate then (
+    end_def ();
+    (* Generalize information merged from ty_expected *)
+    generalize_structure ty_arg);
+  if label.lbl_private = Private then
+    if create then raise (Error (loc, env, Private_type ty_expected))
+    else raise (Error (lid.loc, env, Private_label (lid.txt, ty_expected)));
+  let arg =
+    let snap = if vars = [] then None else Some (Btype.snapshot ()) in
+    let field_name = Longident.last lid.txt in
+    let field_context =
+      match call_context with
+      | `SetRecordField -> Some (Error_message_utils.SetRecordField field_name)
+      | `Regular jsx ->
+        Some
+          (Error_message_utils.RecordField
+             {jsx; record_type = ty_expected; field_name; optional = false})
+    in
+    let arg =
+      type_argument ~context:field_context env sarg ty_arg (instance env ty_arg)
+    in
+    end_def ();
+    try
+      check_univars env (vars <> []) "field value" arg label.lbl_arg vars;
+      arg
+    with exn when not (is_nonexpansive arg) -> (
+      try
+        (* Try to retype without propagating ty_arg, cf PR#4862 *)
+        may Btype.backtrack snap;
+        begin_def ();
+        let arg = type_exp ~context:field_context env sarg in
+        end_def ();
+        generalize_expansive env arg.exp_type;
+        unify_exp ~context:field_context env arg ty_arg;
+        check_univars env false "field value" arg label.lbl_arg vars;
+        arg
+      with
+      | Error (_, _, Less_general _) as e -> raise e
+      | _ -> raise exn (* In case of failure return the first error *))
+  in
+  (lid, label, {arg with exp_type = instance env arg.exp_type}, opt)
+
+and type_argument ~context ?recarg env sarg ty_expected' ty_expected =
+  let texp = type_expect ~context ?recarg env sarg ty_expected' in
+  unify_exp ~context env texp ty_expected;
+  texp
+
+(** This is ad-hoc translation for unifying specific primitive operations
+     See [Unified_ops] module for detailed explanation.
+  *)
+and translate_unified_ops (env : Env.t) (funct : Typedtree.expression)
+    (sargs : sargs) : (targs * Types.type_expr) option =
+  match funct.exp_desc with
+  | Texp_ident (path, _, _) -> (
+    let entry = Hashtbl.find_opt Unified_ops.index_by_path (Path.name path) in
+    match (entry, sargs) with
+    | Some {form = Unary; specialization}, [(lhs_label, lhs_expr)] ->
+      let lhs = type_exp ~context:None env lhs_expr in
+      let lhs_type = expand_head env lhs.exp_type in
+      let result_type =
+        match (lhs_type.desc, specialization) with
+        | Tconstr (path, _, _), _ when Path.same path Predef.path_int ->
+          instance_def Predef.type_int
+        | Tconstr (path, _, _), {bool = Some _}
+          when Path.same path Predef.path_bool ->
+          instance_def Predef.type_bool
+        | Tconstr (path, _, _), {float = Some _}
+          when Path.same path Predef.path_float ->
+          instance_def Predef.type_float
+        | Tconstr (path, _, _), {bigint = Some _}
+          when Path.same path Predef.path_bigint ->
+          instance_def Predef.type_bigint
+        | Tconstr (path, _, _), {string = Some _}
+          when Path.same path Predef.path_string ->
+          instance_def Predef.type_string
+        | _ -> (
+          try
+            unify env lhs_type (instance_def Predef.type_int);
+            instance_def Predef.type_int
+          with Ctype.Unify trace ->
+            raise
+              (Error (lhs.exp_loc, env, Expr_type_clash {trace; context = None}))
+          )
+      in
+      let targs = [(lhs_label, Some lhs)] in
+      Some (targs, result_type)
+    | ( Some {form = Binary; specialization},
+        [(lhs_label, lhs_expr); (rhs_label, rhs_expr)] ) ->
+      let lhs = type_exp ~context:None env lhs_expr in
+      let lhs_type = expand_head env lhs.exp_type in
+      let rhs = type_exp ~context:None env rhs_expr in
+      let rhs_type = expand_head env rhs.exp_type in
+      let lhs, rhs, result_type =
+        (* Rule 1. Try unifying to lhs *)
+        match (lhs_type.desc, specialization) with
+        | Tconstr (path, _, _), _ when Path.same path Predef.path_int ->
+          let rhs = type_expect ~context:None env rhs_expr Predef.type_int in
+          (lhs, rhs, instance_def Predef.type_int)
+        | Tconstr (path, _, _), {bool = Some _}
+          when Path.same path Predef.path_bool ->
+          let rhs = type_expect ~context:None env rhs_expr Predef.type_bool in
+          (lhs, rhs, instance_def Predef.type_bool)
+        | Tconstr (path, _, _), {float = Some _}
+          when Path.same path Predef.path_float ->
+          let rhs = type_expect ~context:None env rhs_expr Predef.type_float in
+          (lhs, rhs, instance_def Predef.type_float)
+        | Tconstr (path, _, _), {bigint = Some _}
+          when Path.same path Predef.path_bigint ->
+          let rhs = type_expect ~context:None env rhs_expr Predef.type_bigint in
+          (lhs, rhs, instance_def Predef.type_bigint)
+        | Tconstr (path, _, _), {string = Some _}
+          when Path.same path Predef.path_string ->
+          let rhs = type_expect ~context:None env rhs_expr Predef.type_string in
+          (lhs, rhs, instance_def Predef.type_string)
+        | _ -> (
+          (* Rule 2. Try unifying to rhs *)
+          match (rhs_type.desc, specialization) with
+          | Tconstr (path, _, _), _ when Path.same path Predef.path_int ->
+            let lhs = type_expect ~context:None env lhs_expr Predef.type_int in
+            (lhs, rhs, instance_def Predef.type_int)
+          | Tconstr (path, _, _), {bool = Some _}
+            when Path.same path Predef.path_bool ->
+            let lhs = type_expect ~context:None env lhs_expr Predef.type_bool in
+            (lhs, rhs, instance_def Predef.type_bool)
+          | Tconstr (path, _, _), {float = Some _}
+            when Path.same path Predef.path_float ->
+            let lhs =
+              type_expect ~context:None env lhs_expr Predef.type_float
+            in
+            (lhs, rhs, instance_def Predef.type_float)
+          | Tconstr (path, _, _), {bigint = Some _}
+            when Path.same path Predef.path_bigint ->
+            let lhs =
+              type_expect ~context:None env lhs_expr Predef.type_bigint
+            in
+            (lhs, rhs, instance_def Predef.type_bigint)
+          | Tconstr (path, _, _), {string = Some _}
+            when Path.same path Predef.path_string ->
+            let lhs =
+              type_expect ~context:None env lhs_expr Predef.type_string
+            in
+            (lhs, rhs, instance_def Predef.type_string)
+          | _ ->
+            (* Rule 3. Fallback to int *)
+            let lhs = type_expect ~context:None env lhs_expr Predef.type_int in
+            let rhs = type_expect ~context:None env rhs_expr Predef.type_int in
+            (lhs, rhs, instance_def Predef.type_int))
+      in
+      let targs = [(lhs_label, Some lhs); (rhs_label, Some rhs)] in
+      Some (targs, result_type)
+    | _ -> None)
+  | _ -> None
+
+and type_application ~context total_app env funct (sargs : sargs) :
+    targs * Types.type_expr * bool =
+  let result_type omitted ty_fun =
+    List.fold_left
+      (fun ty_fun (l, ty, lv) ->
+        newty2 lv (Tarrow ({lbl = l; typ = ty}, ty_fun, Cok, None)))
+      ty_fun omitted
+  in
+  let has_label l ty_fun =
+    let ls, tvar = list_labels env ty_fun in
+    tvar || List.mem l ls
+  in
+  let ignored = ref [] in
+  let force_tvar =
+    let t = funct.exp_type in
+    match (expand_head env t).desc with
+    | Tvar _ when total_app -> true
+    | _ -> false
+  in
+  let has_arity funct =
+    if force_tvar then Some (List.length sargs)
+    else
+      match (expand_head env funct.exp_type).desc with
+      | Tarrow (_, _, _, Some arity) -> Some arity
+      | _ -> None
+  in
+  let force_uncurried_type funct =
+    if force_tvar then ()
+    else if Ctype.get_arity env funct.exp_type = None then
+      raise
+        (Error
+           ( funct.exp_loc,
+             env,
+             Apply_non_function (expand_head env funct.exp_type) ))
+  in
+  let get_max_arity funct =
+    match has_arity funct with
+    | Some arity ->
+      if List.length sargs > arity then
+        raise
+          (Error
+             ( funct.exp_loc,
+               env,
+               Uncurried_arity_mismatch
+                 {
+                   function_type = funct.exp_type;
+                   expected_arity = arity;
+                   provided_arity = List.length sargs;
+                   provided_args = sargs |> List.map (fun (a, _) -> a);
+                   function_name = extract_function_name funct;
+                 } ));
+      arity
+    | None -> max_int
+  in
+  let update_uncurried_arity ~nargs funct new_t =
+    match has_arity funct with
+    | Some arity ->
+      let newarity = arity - nargs in
+      let fully_applied = newarity <= 0 in
+      (if total_app && not fully_applied then
+         let required_args = List.length sargs in
+         raise
+           (Error
+              ( funct.exp_loc,
+                env,
+                Uncurried_arity_mismatch
+                  {
+                    function_type = funct.exp_type;
+                    expected_arity = required_args + newarity;
+                    provided_arity = required_args;
+                    provided_args = sargs |> List.map (fun (a, _) -> a);
+                    function_name = extract_function_name funct;
+                  } )));
+      let new_t =
+        if fully_applied then new_t
+        else
+          match new_t.desc with
+          | Tarrow (arg, ret, c, _) ->
+            {new_t with desc = Tarrow (arg, ret, c, Some newarity)}
+          | _ -> new_t
+      in
+      (fully_applied, new_t)
+    | None -> (false, new_t)
+  in
+  let rec type_unknown_args max_arity ~(args : lazy_args) ~top_arity omitted
+      ty_fun (syntax_args : sargs) : targs * _ =
+    match syntax_args with
+    | [] ->
+      let collect_args () =
+        ( List.map
+            (function
+              | l, None -> (l, None)
+              | l, Some f -> (l, Some (f ())))
+            (List.rev args),
+          instance env (result_type omitted ty_fun) )
+      in
+      if List.length args < max_arity && total_app then
+        match (expand_head env ty_fun).desc with
+        | Tarrow ({lbl; typ = t1}, t2, _, _) when is_optional lbl ->
+          ignored := (lbl, t1, ty_fun.level) :: !ignored;
+          let arg =
+            (lbl, Some (fun () -> option_none (instance env t1) Location.none))
+          in
+          type_unknown_args max_arity ~args:(arg :: args) ~top_arity:None
+            omitted t2 []
+        | _ -> collect_args ()
+      else collect_args ()
+    | [(Nolabel, {pexp_desc = Pexp_construct ({txt = Lident "()"}, None)})]
+      when total_app && omitted = [] && args <> []
+           && List.length args = List.length !ignored ->
+      (* foo(. ) treated as empty application if all args are optional (hence ignored) *)
+      type_unknown_args max_arity ~args ~top_arity:None omitted ty_fun []
+    | (l1, sarg1) :: sargl ->
+      let ty1, ty2 =
+        let ty_fun = expand_head env ty_fun in
+        let arity_ok = List.length args < max_arity in
+        match ty_fun.desc with
+        | Tvar _ when force_tvar ->
+          (* This is a total application when the toplevel type is a polymorphic variable,
+          so the function type including arity can be inferred. *)
+          let t1 = newvar () and t2 = newvar () in
+          if ty_fun.level >= t1.level && not_identity funct.exp_desc then
+            Location.prerr_warning sarg1.pexp_loc Warnings.Unused_argument;
+          unify env ty_fun
+            (newty
+               (Tarrow
+                  ({lbl = l1; typ = t1}, t2, Clink (ref Cunknown), top_arity)));
+          (t1, t2)
+        | Tarrow ({lbl = l; typ = t1}, t2, _, _)
+          when Asttypes.same_arg_label l l1 && arity_ok ->
+          (t1, t2)
+        | td -> (
+          let ty_fun =
+            match td with
+            | Tarrow _ -> newty td
+            | _ -> ty_fun
+          in
+          let ty_res = result_type (omitted @ !ignored) ty_fun in
+          match ty_res.desc with
+          | Tarrow _ ->
+            if not arity_ok then
+              raise
+                (Error
+                   (sarg1.pexp_loc, env, Apply_wrong_label (l1, funct.exp_type)))
+            else if not (has_label l1 ty_fun) then
+              raise
+                (Error (sarg1.pexp_loc, env, Apply_wrong_label (l1, ty_res)))
+            else raise (Error (funct.exp_loc, env, Incoherent_label_order))
+          | _ ->
+            raise
+              (Error
+                 ( funct.exp_loc,
+                   env,
+                   Apply_non_function (expand_head env funct.exp_type) )))
+      in
+      let optional = is_optional l1 in
+      let arg1 () =
+        let arg1 = type_expect ~context env sarg1 ty1 in
+        if optional then unify_exp ~context env arg1 (type_option (newvar ()));
+        arg1
+      in
+      type_unknown_args max_arity ~args:((l1, Some arg1) :: args)
+        ~top_arity:None omitted ty2 sargl
+  in
+  let rec type_args ~context max_arity args omitted ~ty_fun ty_fun0
+      ~(sargs : sargs) ~top_arity =
+    match (expand_head env ty_fun, expand_head env ty_fun0) with
+    | ( {desc = Tarrow ({lbl = l; typ = ty}, ty_fun, com, _); level = lv},
+        {desc = Tarrow ({typ = ty0}, ty_fun0, _, _)} )
+      when sargs <> [] && commu_repr com = Cok && List.length args < max_arity
+      ->
+      let name = label_name l and optional = is_optional l in
+      let sargs, omitted, arg =
+        match extract_label name sargs with
+        | None ->
+          if optional && (total_app || label_assoc Nolabel sargs) then (
+            ignored := (l, ty, lv) :: !ignored;
+            ( sargs,
+              omitted,
+              Some (fun () -> option_none (instance env ty) Location.none) ))
+          else (sargs, (l, ty, lv) :: omitted, None)
+        | Some (l', sarg0, sargs) ->
+          if (not optional) && is_optional l' then
+            Location.prerr_warning sarg0.pexp_loc
+              (Warnings.Nonoptional_label (Printtyp.string_of_label l));
+          ( sargs,
+            omitted,
+            Some
+              (if (not optional) || is_optional l' then fun () ->
+                 type_argument
+                   ~context:
+                     (type_clash_context_for_function_argument ~label:l' context
+                        sarg0)
+                   env sarg0 ty ty0
+               else fun () ->
+                 option_some
+                   (type_argument
+                      ~context:
+                        (Some
+                           (FunctionArgument
+                              {
+                                optional = true;
+                                name =
+                                  (match l' with
+                                  | Nolabel -> None
+                                  | Optional l | Labelled l -> Some l.txt);
+                              }))
+                      env sarg0
+                      (extract_option_type env ty)
+                      (extract_option_type env ty0))) )
+      in
+      type_args ~context max_arity ((l, arg) :: args) omitted ~ty_fun ty_fun0
+        ~sargs ~top_arity
+    | _ ->
+      type_unknown_args max_arity ~args ~top_arity omitted ty_fun0
+        sargs (* This is the hot path for non-labeled function*)
+  in
+  if total_app then force_uncurried_type funct;
+  let max_arity = get_max_arity funct in
+  let top_arity = if total_app then Some max_arity else None in
+  match sargs with
+  (* Special case for ignore: avoid discarding warning *)
+  | [(Nolabel, sarg)] when is_ignore ~env ~arity:top_arity funct ->
+    let ty_arg, ty_res =
+      filter_arrow ~env ~arity:top_arity (instance env funct.exp_type) Nolabel
+    in
+    let exp = type_expect ~context env sarg ty_arg in
+    (match (expand_head env exp.exp_type).desc with
+    | Tarrow _ when not total_app ->
+      Location.prerr_warning exp.exp_loc Warnings.Partial_application
+    | Tvar _ ->
+      Delayed_checks.add_delayed_check (fun () ->
+          check_application_result env false exp)
+    | _ -> ());
+    ([(Nolabel, Some exp)], ty_res, false)
+  | _ ->
+    let targs, ret_t =
+      type_args ~context max_arity [] [] ~ty_fun:funct.exp_type
+        (instance env funct.exp_type)
+        ~sargs ~top_arity
+    in
+    let fully_applied, ret_t =
+      update_uncurried_arity funct
+        ~nargs:(List.length !ignored + List.length sargs)
+        ret_t
+    in
+    (targs, ret_t, fully_applied)
+
+and type_construct ~context env loc lid sarg ty_expected attrs =
+  let opath =
+    try
+      let p0, p, _ = extract_concrete_variant env ty_expected in
+      Some (p0, p)
+    with Not_found -> None
+  in
+  let constrs = Typetexp.find_all_constructors env lid.loc lid.txt in
+  let constr =
+    wrap_disambiguate "This variant expression is expected to have" ty_expected
+      (Constructor.disambiguate lid env opath)
+      constrs
+  in
+  Env.mark_constructor Env.Positive env (Longident.last lid.txt) constr;
+  Builtin_attributes.check_deprecated loc constr.cstr_attributes
+    constr.cstr_name;
+  let sargs =
+    match sarg with
+    | None -> []
+    | Some {pexp_desc = Pexp_tuple sel}
+      when constr.cstr_arity > 1 || Builtin_attributes.explicit_arity attrs ->
+      sel
+    | Some se -> [se]
+  in
+  if List.length sargs <> constr.cstr_arity then
+    raise
+      (Error
+         ( loc,
+           env,
+           Constructor_arity_mismatch
+             {
+               name = lid.txt;
+               constuctor = constr;
+               expected = constr.cstr_arity;
+               provided = List.length sargs;
+             } ));
+  let separate = Env.has_local_constraints env in
+  if separate then (
+    begin_def ();
+    begin_def ());
+  let ty_args, ty_res = instance_constructor constr in
+  let texp =
+    re
+      {
+        exp_desc = Texp_construct (lid, constr, []);
+        exp_loc = loc;
+        exp_extra = [];
+        exp_type = ty_res;
+        exp_attributes = attrs;
+        exp_env = env;
+      }
+  in
+  (* Forward context if this is a Some constructor injected (meaning it's
+    an optional field) *)
+  let context =
+    match lid.txt with
+    | Longident.Ldot (Lident "*predef*", "Some") -> (
+      match context with
+      | Some (RecordField {record_type; jsx; field_name}) ->
+        Some
+          (Error_message_utils.RecordField
+             {record_type; jsx; field_name; optional = true})
+      | _ -> None)
+    | _ -> None
+  in
+  if separate then (
+    end_def ();
+    generalize_structure ty_res;
+    unify_exp ~context env
+      {texp with exp_type = instance_def ty_res}
+      (instance env ty_expected);
+    end_def ();
+    List.iter generalize_structure ty_args;
+    generalize_structure ty_res);
+  let ty_args0, ty_res =
+    match instance_list env (ty_res :: ty_args) with
+    | t :: tl -> (tl, t)
+    | _ -> assert false
+  in
+  let texp = {texp with exp_type = ty_res} in
+  if not separate then unify_exp ~context env texp (instance env ty_expected);
+  let recarg =
+    match constr.cstr_inlined with
+    | None -> Rejected
+    | Some _ -> (
+      match sargs with
+      | [
+       {
+         pexp_desc =
+           ( Pexp_ident _
+           | Pexp_record (_, (Some {pexp_desc = Pexp_ident _} | None)) );
+       };
+      ] ->
+        Required
+      | _ -> raise (Error (loc, env, Inlined_record_expected)))
+  in
+  let args =
+    List.map2
+      (fun e (t, t0) -> type_argument ~context ~recarg env e t t0)
+      sargs
+      (List.combine ty_args ty_args0)
+  in
+  if constr.cstr_private = Private then
+    raise (Error (loc, env, Private_type ty_res));
+  (* NOTE: shouldn't we call "re" on this final expression? -- AF *)
+  {texp with exp_desc = Texp_construct (lid, constr, args)}
+
+(* Typing of statements (expressions whose values are discarded) *)
+
+and type_statement ~context env sexp =
+  let loc = (final_subexpression sexp).pexp_loc in
+  begin_def ();
+  let exp = type_exp ~context env sexp in
+  end_def ();
+  let ty = expand_head env exp.exp_type and tv = newvar () in
+  if is_Tvar ty && ty.level > tv.level then
+    Location.prerr_warning loc Warnings.Nonreturning_statement;
+  let expected_ty = instance_def Predef.type_unit in
+  let context = type_clash_context_in_statement sexp in
+  unify_exp ~context env exp expected_ty;
+  exp
+
+(* Typing of match cases *)
+
+and type_cases ~(call_context : [`LetUnwrap | `Switch | `Function | `Try])
+    ?in_function env ty_arg ty_res partial_flag loc caselist :
+    _ * Typedtree.partial =
+  (* ty_arg is _fully_ generalized *)
+  let patterns = List.map (fun {pc_lhs = p} -> p) caselist in
+  let contains_polyvars = List.exists contains_polymorphic_variant patterns in
+  let erase_either = contains_polyvars && contains_variant_either ty_arg
+  and has_gadts = List.exists (contains_gadt env) patterns in
+  (*  prerr_endline ( if has_gadts then "contains gadt" else "no gadt"); *)
+  let ty_arg =
+    if has_gadts || erase_either then correct_levels ty_arg else ty_arg
+  and ty_res, env =
+    if has_gadts then (correct_levels ty_res, duplicate_ident_types caselist env)
+    else (ty_res, env)
+  in
+  let rec is_var spat =
+    match spat.ppat_desc with
+    | Ppat_any | Ppat_var _ -> true
+    | Ppat_alias (spat, _) -> is_var spat
+    | _ -> false
+  in
+  let needs_exhaust_check =
+    match caselist with
+    | [{pc_lhs}] when is_var pc_lhs -> false
+    | _ -> true
+  in
+  let init_env () =
+    (* raise level for existentials *)
+    begin_def ();
+    Ident.set_current_time (get_current_level ());
+    let lev = Ident.current_time () in
+    Ctype.init_def (lev + 1000);
+    (* up to 1000 existentials *)
+    (lev, Env.add_gadt_instance_level lev env)
+  in
+  let lev, env =
+    if has_gadts then init_env () else (get_current_level (), env)
+  in
+  (* if has_gadts then
+     Format.printf "lev = %d@.%a@." lev Printtyp.raw_type_expr ty_res; *)
+  (* Do we need to propagate polymorphism *)
+  let propagate =
+    has_gadts
+    || (repr ty_arg).level = generic_level
+    ||
+    match caselist with
+    | [{pc_lhs}] when is_var pc_lhs -> false
+    | _ -> true
+  in
+  if propagate then begin_def ();
+  (* propagation of the argument *)
+  let pattern_force = ref [] in
+  (* Format.printf "@[%i %i@ %a@]@." lev (get_current_level())
+     Printtyp.raw_type_expr ty_arg; *)
+  let pat_env_list =
+    List.map
+      (fun {pc_lhs; pc_guard; pc_rhs} ->
+        let loc =
+          let open Location in
+          match pc_guard with
+          | None -> pc_rhs.pexp_loc
+          | Some g -> {pc_rhs.pexp_loc with loc_start = g.pexp_loc.loc_start}
+        in
+        let scope = Some (Annot.Idef loc) in
+        let pat, ext_env, force, unpacks =
+          let partial = if erase_either then Some false else None in
+          let ty_arg = instance ?partial env ty_arg in
+          type_pattern ~lev env pc_lhs scope ty_arg
+        in
+        pattern_force := force @ !pattern_force;
+        (pat, (ext_env, unpacks)))
+      caselist
+  in
+  (* Unify all cases (delayed to keep it order-free) *)
+  let ty_arg' = newvar () in
+  let unify_pats ty =
+    List.iter (fun (pat, (ext_env, _)) -> unify_pat ext_env pat ty) pat_env_list
+  in
+  unify_pats ty_arg';
+  (* Check for polymorphic variants to close *)
+  let patl = List.map fst pat_env_list in
+  if List.exists has_variants patl then (
+    Parmatch.pressure_variants env patl;
+    List.iter (iter_pattern finalize_variant) patl);
+  (* `Contaminating' unifications start here *)
+  List.iter (fun f -> f ()) !pattern_force;
+  (* Post-processing and generalization *)
+  if propagate || erase_either then unify_pats (instance env ty_arg);
+  if propagate then (
+    List.iter
+      (iter_pattern (fun {pat_type = t} -> unify_var env t (newvar ())))
+      patl;
+    end_def ();
+    List.iter (iter_pattern (fun {pat_type = t} -> generalize t)) patl);
+  (* type bodies *)
+  let in_function = if List.length caselist = 1 then in_function else None in
+  let cases =
+    List.map2
+      (fun (pat, (ext_env, unpacks)) {pc_lhs; pc_guard; pc_rhs} ->
+        let sexp = wrap_unpacks pc_rhs unpacks in
+        let ty_res' =
+          if contains_gadt env pc_lhs then correct_levels ty_res else ty_res
+        in
+        (* Format.printf "@[%i %i, ty_res' =@ %a@]@." lev (get_current_level())
+           Printtyp.raw_type_expr ty_res'; *)
+        let guard =
+          match pc_guard with
+          | None -> None
+          | Some scond ->
+            Some
+              (type_expect ~context:(Some IfCondition) ext_env
+                 (wrap_unpacks scond unpacks)
+                 Predef.type_bool)
+        in
+        let exp =
+          type_expect
+            ~context:
+              (match call_context with
+              | `Switch -> Some SwitchReturn
+              | `Try -> Some TryReturn
+              | `LetUnwrap -> Some LetUnwrapReturn
+              | `Function -> None)
+            ?in_function ext_env sexp ty_res'
+        in
+        {
+          c_lhs = pat;
+          c_guard = guard;
+          c_rhs = {exp with exp_type = instance env ty_res'};
+        })
+      pat_env_list caselist
+  in
+  (if has_gadts then
+     let ty_res' = instance env ty_res in
+     List.iter (fun c -> unify_exp ~context:None env c.c_rhs ty_res') cases);
+  let do_init = has_gadts || needs_exhaust_check in
+  let lev, env = if do_init && not has_gadts then init_env () else (lev, env) in
+  let ty_arg_check =
+    if do_init then
+      (* Hack: use for_saving to copy variables too *)
+      Subst.type_expr (Subst.for_saving Subst.identity) ty_arg
+    else ty_arg
+  in
+  let partial =
+    if partial_flag then check_partial ~lev env ty_arg_check loc cases
+    else Partial
+  in
+  let unused_check () =
+    List.iter (fun (pat, (env, _)) -> check_absent_variant env pat) pat_env_list;
+    check_unused ~lev env (instance env ty_arg_check) cases;
+    Parmatch.check_ambiguous_bindings cases
+  in
+  if contains_polyvars || do_init then
+    Delayed_checks.add_delayed_check unused_check
+  else unused_check ();
+  (* Check for unused cases, do not delay because of gadts *)
+  if do_init then (
+    end_def ();
+    (* Ensure that existential types do not escape *)
+    unify_exp_types ~context:None loc env (instance env ty_res) (newvar ()));
+  (cases, partial)
+
+(* Typing of let bindings *)
+
+and type_let ~context ?(check = fun s -> Warnings.Unused_var s)
+    ?(check_strict = fun s -> Warnings.Unused_var_strict s) env rec_flag
+    spat_sexp_list scope allow =
+  begin_def ();
+  let is_fake_let =
+    match spat_sexp_list with
+    | [
+     {
+       pvb_expr =
+         {
+           pexp_desc =
+             Pexp_match
+               ({pexp_desc = Pexp_ident {txt = Longident.Lident "*opt*"}}, _);
+         };
+     };
+    ] ->
+      true (* the fake let-declaration introduced by fun ?(x = e) -> ... *)
+    | _ -> false
+  in
+  let check = if is_fake_let then check_strict else check in
+
+  let spatl =
+    List.map
+      (fun {pvb_pat = spat; pvb_attributes = attrs} -> (attrs, spat))
+      spat_sexp_list
+  in
+  let nvs = List.map (fun _ -> newvar ()) spatl in
+  let pat_list, new_env, force, unpacks =
+    type_pattern_list env spatl scope nvs allow
+  in
+  let attrs_list = List.map fst spatl in
+  let is_recursive = rec_flag = Recursive in
+  (* If recursive, first unify with an approximation of the expression *)
+  if is_recursive then
+    List.iter2
+      (fun pat binding ->
+        let pat =
+          match pat.pat_type.desc with
+          | Tpoly (ty, tl) ->
+            {
+              pat with
+              pat_type = snd (instance_poly ~keep_names:true false tl ty);
+            }
+          | _ -> pat
+        in
+        unify_pat env pat (type_approx env binding.pvb_expr))
+      pat_list spat_sexp_list;
+  (* Polymorphic variant processing *)
+  List.iter
+    (fun pat ->
+      if has_variants pat then (
+        Parmatch.pressure_variants env [pat];
+        iter_pattern finalize_variant pat))
+    pat_list;
+  (* Only bind pattern variables after generalizing *)
+  List.iter (fun f -> f ()) force;
+  let exp_env = if is_recursive then new_env else env in
+
+  let current_slot = ref None in
+  let rec_needed = ref false in
+  let warn_about_unused_bindings =
+    List.exists
+      (fun attrs ->
+        Builtin_attributes.warning_scope ~ppwarning:false attrs (fun () ->
+            Warnings.is_active (check "")
+            || Warnings.is_active (check_strict "")
+            || (is_recursive && Warnings.is_active Warnings.Unused_rec_flag)))
+      attrs_list
+  in
+  let pat_slot_list =
+    (* Algorithm to detect unused declarations in recursive bindings:
+       - During type checking of the definitions, we capture the 'value_used'
+         events on the bound identifiers and record them in a slot corresponding
+         to the current definition (!current_slot).
+         In effect, this creates a dependency graph between definitions.
+
+       - After type checking the definition (!current_slot = None),
+         when one of the bound identifier is effectively used, we trigger
+         again all the events recorded in the corresponding slot.
+         The effect is to traverse the transitive closure of the graph created
+         in the first step.
+
+       We also keep track of whether *all* variables in a given pattern
+       are unused. If this is the case, for local declarations, the issued
+       warning is 26, not 27.
+    *)
+    List.map2
+      (fun attrs pat ->
+        Builtin_attributes.warning_scope ~ppwarning:false attrs (fun () ->
+            if not warn_about_unused_bindings then (pat, None)
+            else
+              let some_used = ref false in
+              (* has one of the identifier of this pattern been used? *)
+              let slot = ref [] in
+              List.iter
+                (fun id ->
+                  let vd = Env.find_value (Path.Pident id) new_env in
+                  (* note: Env.find_value does not trigger the value_used event *)
+                  let name = Ident.name id in
+                  let used = ref false in
+                  if not (name = "" || name.[0] = '_' || name.[0] = '#') then
+                    Delayed_checks.add_delayed_check (fun () ->
+                        if not !used then
+                          Location.prerr_warning vd.Types.val_loc
+                            ((if !some_used then check_strict else check) name));
+                  Env.set_value_used_callback name vd (fun () ->
+                      match !current_slot with
+                      | Some slot ->
+                        slot := (name, vd) :: !slot;
+                        rec_needed := true
+                      | None ->
+                        List.iter
+                          (fun (name, vd) -> Env.mark_value_used env name vd)
+                          (get_ref slot);
+                        used := true;
+                        some_used := true))
+                (Typedtree.pat_bound_idents pat);
+              (pat, Some slot)))
+      attrs_list pat_list
+  in
+  let exp_list =
+    List.map2
+      (fun {pvb_expr = sexp; pvb_attributes; _} (pat, slot) ->
+        let sexp =
+          if rec_flag = Recursive then wrap_unpacks sexp unpacks else sexp
+        in
+        if is_recursive then current_slot := slot;
+        match pat.pat_type.desc with
+        | Tpoly (ty, tl) ->
+          begin_def ();
+          let vars, ty' = instance_poly ~keep_names:true true tl ty in
+          let exp =
+            Builtin_attributes.warning_scope pvb_attributes (fun () ->
+                type_expect ~context exp_env sexp ty')
+          in
+          end_def ();
+          check_univars env true "definition" exp pat.pat_type vars;
+          {exp with exp_type = instance env exp.exp_type}
+        | _ ->
+          Builtin_attributes.warning_scope pvb_attributes (fun () ->
+              type_expect ~context exp_env sexp pat.pat_type))
+      spat_sexp_list pat_slot_list
+  in
+  current_slot := None;
+  (if
+     is_recursive && (not !rec_needed)
+     && Warnings.is_active Warnings.Unused_rec_flag
+   then
+     let {pvb_pat; pvb_attributes} = List.hd spat_sexp_list in
+     (* See PR#6677 *)
+     Builtin_attributes.warning_scope ~ppwarning:false pvb_attributes (fun () ->
+         Location.prerr_warning pvb_pat.ppat_loc Warnings.Unused_rec_flag));
+  List.iter2
+    (fun pat (attrs, exp) ->
+      Builtin_attributes.warning_scope ~ppwarning:false attrs (fun () ->
+          let partial_match_warning_hint =
+            if Experimental_features.is_enabled Experimental_features.LetUnwrap
+            then
+              let ty = repr (Ctype.expand_head env pat.pat_type) in
+              match ty.desc with
+              | Tconstr (path, _, _)
+                when Path.same path Predef.path_option
+                     || Path.same path Predef.path_result ->
+                Some
+                  "Hint: You can use `let?` to automatically unwrap this \
+                   expression."
+              | _ -> None
+            else None
+          in
+          ignore
+            (check_partial ?partial_match_warning_hint env pat.pat_type
+               pat.pat_loc
+               [case pat exp])))
+    pat_list
+    (List.map2 (fun (attrs, _) e -> (attrs, e)) spatl exp_list);
+  end_def ();
+  List.iter2
+    (fun pat exp ->
+      if not (is_nonexpansive exp) then
+        iter_pattern (fun pat -> generalize_expansive env pat.pat_type) pat)
+    pat_list exp_list;
+  List.iter
+    (fun pat -> iter_pattern (fun pat -> generalize pat.pat_type) pat)
+    pat_list;
+  let l = List.combine pat_list exp_list in
+  let l =
+    List.map2
+      (fun (p, e) pvb ->
+        {
+          vb_pat = p;
+          vb_expr = e;
+          vb_attributes = pvb.pvb_attributes;
+          vb_loc = pvb.pvb_loc;
+        })
+      l spat_sexp_list
+  in
+  if is_recursive then
+    List.iter
+      (fun {vb_pat = pat} ->
+        match pat.pat_desc with
+        | Tpat_var _ -> ()
+        | Tpat_alias ({pat_desc = Tpat_any}, _, _) -> ()
+        | _ -> raise (Error (pat.pat_loc, env, Illegal_letrec_pat)))
+      l;
+  (l, new_env, unpacks)
+
+(* Typing of toplevel bindings *)
+
+let type_binding ~context env rec_flag spat_sexp_list scope =
+  Typetexp.reset_type_variables ();
+  let pat_exp_list, new_env, _unpacks =
+    type_let
+      ~check:(fun s -> Warnings.Unused_value_declaration s)
+      ~check_strict:(fun s -> Warnings.Unused_value_declaration s)
+      ~context env rec_flag spat_sexp_list scope false
+  in
+  (pat_exp_list, new_env)
+
+(* Typing of toplevel expressions *)
+
+let type_expression ~context env sexp =
+  Typetexp.reset_type_variables ();
+  begin_def ();
+  let exp = type_exp ~context env sexp in
+  (if Warnings.is_active (Bs_toplevel_expression_unit None) then
+     try unify env exp.exp_type (instance_def Predef.type_unit) with
+     | Unify _ ->
+       let buffer = Buffer.create 10 in
+       let formatter = Format.formatter_of_buffer buffer in
+       Printtyp.type_expr formatter exp.exp_type;
+       Format.pp_print_flush formatter ();
+       let return_type = Buffer.contents buffer in
+       Location.prerr_warning sexp.pexp_loc
+         (Bs_toplevel_expression_unit
+            (match sexp.pexp_desc with
+            | Pexp_apply _ -> Some (return_type, FunctionCall)
+            | _ -> Some (return_type, Other)))
+     | Tags _ ->
+       Location.prerr_warning sexp.pexp_loc (Bs_toplevel_expression_unit None));
+  end_def ();
+  if not (is_nonexpansive exp) then generalize_expansive env exp.exp_type;
+  generalize exp.exp_type;
+  match sexp.pexp_desc with
+  | Pexp_ident lid ->
+    (* Special case for keeping type variables when looking-up a variable *)
+    let _path, desc = Env.lookup_value lid.txt env in
+    {exp with exp_type = desc.val_type}
+  | _ -> exp
+
+(* Error report *)
+
+let spellcheck ppf unbound_name valid_names =
+  Misc.did_you_mean ppf (fun () -> Misc.spellcheck valid_names unbound_name)
+
+let spellcheck_idents ppf unbound valid_idents =
+  spellcheck ppf (Ident.name unbound) (List.map Ident.name valid_idents)
+
+let strip_arity_suffix name =
+  let len = String.length name in
+  let rec scan_back i =
+    if i < 0 || name.[i] < '0' || name.[i] > '9' then i + 1
+    else scan_back (i - 1)
+  in
+  let start_of_digits = scan_back (len - 1) in
+  if start_of_digits > 0 && start_of_digits < len then
+    String.sub name 0 start_of_digits
+  else name
+
+let find_arity_suggestion env function_name target_arity =
+  let base_name = strip_arity_suffix function_name in
+  let candidate =
+    if target_arity = 1 then base_name
+    else base_name ^ string_of_int target_arity
+  in
+  try
+    let path, desc = Env.lookup_value (Longident.parse candidate) env in
+    if Builtin_attributes.deprecated_of_attrs desc.val_attributes <> None then
+      None
+    else
+      let expanded_type = Ctype.expand_head env desc.val_type in
+      let actual_arity =
+        match Ctype.get_arity env expanded_type with
+        | Some arity -> arity
+        | None -> 0
+      in
+      if actual_arity = target_arity then Some (Printtyp.string_of_path path)
+      else None
+  with
+  | Not_found -> None
+  | _ -> None
+
+open Format
+let longident = Printtyp.longident
+let super_report_unification_error = Printtyp.super_report_unification_error
+let report_ambiguous_type_error = Printtyp.report_ambiguous_type_error
+let report_subtyping_error = Printtyp.report_subtyping_error
+
+let type_expr = Error_message_utils.type_expr
+
+let report_error env loc ppf error =
+  match error with
+  | Polymorphic_label lid ->
+    fprintf ppf "@[The record field %a is polymorphic.@ %s@]" longident lid
+      "You cannot instantiate it in a pattern."
+  | Constructor_arity_mismatch {name; constuctor; expected; provided} ->
+    (* modified *)
+    let is_inline_record = Option.is_some constuctor.cstr_inlined in
+    if is_inline_record && expected = 1 then
+      fprintf ppf
+        "@[This variant constructor @{<info>%a@} expects an inline record as \
+         payload%s.@]"
+        longident name
+        (if provided = 0 then ", but it's not being passed any arguments"
+         else "")
+    else
+      fprintf ppf
+        "@[This variant constructor @{<info>%a@} expects %i %s, but it's%s \
+         being passed %i.@]"
+        longident name expected
+        (if expected == 1 then "argument" else "arguments")
+        (if provided < expected then " only" else "")
+        provided
+  | Label_mismatch (lid, trace) ->
+    (* modified *)
+    super_report_unification_error ppf env trace
+      (function
+        | ppf ->
+          fprintf ppf "The record field %a@ belongs to the type" longident lid)
+      (function ppf -> fprintf ppf "but is mixed here with fields of type")
+  | Pattern_type_clash trace ->
+    (* modified *)
+    super_report_unification_error ppf env trace
+      ~print_extra_info:Error_message_utils.print_contextual_unification_error
+      (function
+        | ppf -> fprintf ppf "This pattern matches values of type")
+      (function
+        | ppf ->
+        fprintf ppf "but a pattern was expected which matches values of type")
+  | Or_pattern_type_clash (id, trace) ->
+    (* modified *)
+    super_report_unification_error ppf env trace
+      (function
+        | ppf ->
+          fprintf ppf
+            "The variable %s on the left-hand side of this or-pattern has type"
+            (Ident.name id))
+      (function ppf -> fprintf ppf "but on the right-hand side it has type")
+  | Multiply_bound_variable name ->
+    fprintf ppf "Variable %s is bound several times in this matching" name
+  | Orpat_vars (id, valid_idents) ->
+    fprintf ppf "Variable %s must occur on both sides of this | pattern"
+      (Ident.name id);
+    spellcheck_idents ppf id valid_idents
+  | Expr_type_clash
+      {
+        trace =
+          (_, {desc = Tarrow (_, _, _, None)})
+          :: (_, {desc = Tarrow (_, _, _, Some _)})
+          :: _;
+      } ->
+    fprintf ppf
+      "This function is a curried function where an uncurried function is \
+       expected"
+  | Expr_type_clash
+      {
+        trace =
+          (_, {desc = Tarrow (_, _, _, Some arity_a)})
+          :: (_, {desc = Tarrow (_, _, _, Some arity_b)})
+          :: _;
+      }
+    when arity_a <> arity_b ->
+    let arity_a = arity_a |> string_of_int in
+    let arity_b = arity_b |> string_of_int in
+    report_arity_mismatch ~arity_a ~arity_b ppf
+  | Expr_type_clash {trace; context} ->
+    (* modified *)
+    fprintf ppf "@[<v>";
+    print_expr_type_clash ~context env loc trace ppf;
+    fprintf ppf "@]"
+  | Apply_non_function typ -> (
+    (* modified *)
+    match (repr typ).desc with
+    | Tarrow (_, return_type, _, _) ->
+      let rec count_number_of_args count {Types.desc} =
+        match desc with
+        | Tarrow (_, return_type, _, _) ->
+          count_number_of_args (count + 1) return_type
+        | _ -> count
+      in
+      let count_number_of_args = count_number_of_args 1 in
+      let accepts_count = count_number_of_args return_type in
+      fprintf ppf "@[<v>@[<2>This function has type@ @{<info>%a@}@]" type_expr
+        typ;
+      fprintf ppf "@ @[It only accepts %i %s; here, it's called with more.@]@]"
+        accepts_count
+        (if accepts_count == 1 then "argument" else "arguments")
+    | _ ->
+      fprintf ppf
+        "@[<v>@[<2>This can't be called, it's not a function.@]@,\
+         The function has type: %a@]"
+        type_expr typ)
+  | Apply_wrong_label (l, ty) ->
+    let print_message ppf = function
+      | Nolabel ->
+        fprintf ppf "The argument at this position should be labelled."
+      | l ->
+        fprintf ppf "This function does not take the argument @{<info>%s@}."
+          (prefixed_label_name l)
+    in
+    fprintf ppf "@[<v>@[<2>%a@]@,This function has type: %a@]" print_message l
+      type_expr ty
+  | Label_multiply_defined {label; jsx_component_info = Some jsx_component_info}
+    ->
+    fprintf ppf
+      "The prop @{<info>%s@} has already been passed to the component " label;
+    print_component_name ppf jsx_component_info.props_record_path;
+    fprintf ppf "@,@,You can't pass the same prop more than once."
+  | Label_multiply_defined {label} ->
+    fprintf ppf "The record field label %s is defined several times" label
+  | Labels_missing {labels; jsx_component_info = Some jsx_component_info} ->
+    print_component_labels_missing_error ppf labels jsx_component_info
+  | Labels_missing {labels} ->
+    let print_labels ppf = List.iter (fun lbl -> fprintf ppf "@ %s" lbl) in
+    fprintf ppf "@[<hov>Some required record fields are missing:%a.@]"
+      print_labels labels
+  | Label_not_mutable lid ->
+    fprintf ppf "The record field %a is not mutable" longident lid
+  | Wrong_name (eorp, ty, kind, p, name, valid_names) -> (
+    match get_jsx_component_props ~extract_concrete_typedecl env ty p with
+    | Some {fields} ->
+      print_component_wrong_prop_error ppf p fields name;
+      spellcheck ppf name valid_names
+    | None ->
+      (* modified *)
+      if Path.is_constructor_typath p then
+        fprintf ppf
+          "@[The field %s is not part of the record argument for the %a \
+           constructor@]"
+          name Printtyp.path p
+      else (
+        fprintf ppf "@[<v>";
+
+        fprintf ppf
+          "@[<2>The %s @{<error>%s@} does not belong to type @{<info>%a@}@]@,@,"
+          (label_of_kind kind) name (*kind*) Printtyp.path p;
+
+        fprintf ppf "@[<2>%s type@ @{<info>%a@}@]" eorp type_expr ty;
+
+        fprintf ppf "@]");
+      spellcheck ppf name valid_names)
+  | Name_type_mismatch (kind, lid, tp, tpl) ->
+    let name = label_of_kind kind in
+    report_ambiguous_type_error ppf env tp tpl
+      (function
+        | ppf ->
+          fprintf ppf "The %s %a@ belongs to the %s type" name longident lid
+            kind)
+      (function
+        | ppf ->
+          fprintf ppf "The %s %a@ belongs to one of the following %s types:"
+            name longident lid kind)
+      (function
+        | ppf ->
+        fprintf ppf "but a %s was expected belonging to the %s type" name kind)
+  | Undefined_method (ty, me, valid_methods) -> (
+    fprintf ppf
+      "@[<v>@[This expression has type@;<1 2>%a@]@,It has no field %s@]"
+      type_expr ty me;
+    match valid_methods with
+    | None -> ()
+    | Some valid_methods -> spellcheck ppf me valid_methods)
+  | Not_subtype (tr1, tr2, ctx) ->
+    report_subtyping_error ppf env tr1 "is not a subtype of" tr2 ctx
+  | Too_many_arguments (in_function, ty) ->
+    if
+      (* modified *)
+      in_function
+    then (
+      fprintf ppf "@[This function expects too many arguments,@ ";
+      fprintf ppf "it should have type@ %a@]" type_expr ty)
+    else (
+      fprintf ppf "@[This expression should not be a function,@ ";
+      fprintf ppf "the expected type is@ %a@]" type_expr ty)
+  | Abstract_wrong_label (l, ty) ->
+    let label_mark = function
+      | Nolabel -> "but its first argument is not labelled"
+      | l ->
+        sprintf "but its first argument is labelled %s" (prefixed_label_name l)
+    in
+    fprintf ppf "@[<v>@[<2>This function should have type@ %a@]@,%s@]" type_expr
+      ty (label_mark l)
+  | Scoping_let_module (id, ty) ->
+    fprintf ppf "This `let module' expression has type@ %a@ " type_expr ty;
+    fprintf ppf
+      "In this type, the locally bound module name %s escapes its scope" id
+  | Private_type ty ->
+    fprintf ppf "Cannot create values of the private type %a" type_expr ty
+  | Private_label (lid, ty) ->
+    fprintf ppf "Cannot assign field %a of the private type %a" longident lid
+      type_expr ty
+  | Not_a_variant_type lid ->
+    fprintf ppf "The type %a@ is not a variant type" longident lid
+  | Incoherent_label_order ->
+    fprintf ppf "This labeled function is applied to arguments@ ";
+    fprintf ppf "in an order different from other calls.@ ";
+    fprintf ppf "This is only allowed when the real type is known."
+  | Less_general (kind, trace) ->
+    (* modified *)
+    super_report_unification_error ppf env trace
+      (fun ppf -> fprintf ppf "This %s has type" kind)
+      (fun ppf -> fprintf ppf "which is less general than")
+  | Modules_not_allowed ->
+    fprintf ppf "Modules are not allowed in this pattern."
+  | Cannot_infer_signature ->
+    fprintf ppf "The signature for this packaged module couldn't be inferred."
+  | Not_a_packed_module ty ->
+    fprintf ppf "This expression is packed module, but the expected type is@ %a"
+      type_expr ty
+  | Recursive_local_constraint trace ->
+    (* modified *)
+    super_report_unification_error ppf env trace
+      (function
+        | ppf -> fprintf ppf "Recursive local constraint when unifying")
+      (function ppf -> fprintf ppf "with")
+  | Unexpected_existential -> fprintf ppf "Unexpected existential"
+  | Unqualified_gadt_pattern (tpath, name) ->
+    fprintf ppf "@[The GADT constructor %s of type %a@ %s.@]" name Printtyp.path
+      tpath "must be qualified in this pattern"
+  | Invalid_interval ->
+    fprintf ppf "@[Only character intervals are supported in patterns.@]"
+  | Invalid_for_loop_index ->
+    fprintf ppf "@[Invalid for-loop index: only variables and _ are allowed.@]"
+  | No_value_clauses ->
+    fprintf ppf "None of the patterns in this 'match' expression match values."
+  | Exception_pattern_below_toplevel ->
+    fprintf ppf
+      "@[Exception patterns must be at the top level of a match case.@]"
+  | Inlined_record_escape ->
+    fprintf ppf
+      "@[This use of an inlined record is not allowed: its anonymous type \
+       would escape its constructor scope.@,\
+       @,\
+       Possible solutions: @,\
+       - Destructure the fields you're interested in from the inline record@,\
+       - Change the underlying type to use a defined record as payload instead \
+       of an inline record. That will let you use the payload without \
+       destructuring it first"
+  | Inlined_record_expected ->
+    fprintf ppf "@[This constructor expects an inlined record argument.@]"
+  | Invalid_extension_constructor_payload ->
+    fprintf ppf
+      "Invalid [%%extension_constructor] payload, a constructor is expected."
+  | Not_an_extension_constructor ->
+    fprintf ppf "This constructor is not an extension constructor."
+  | Literal_overflow ty ->
+    fprintf ppf
+      "Integer literal exceeds the range of representable integers of type %s"
+      ty
+  | Unknown_literal (n, m) ->
+    fprintf ppf "Unknown modifier '%c' for literal %s%c" m n m
+  | Illegal_letrec_pat ->
+    fprintf ppf "Only variables are allowed as left-hand side of `let rec'"
+  | Empty_record_literal ->
+    fprintf ppf
+      "Empty record literal {} should be type annotated or used in a record \
+       context."
+  | Uncurried_arity_mismatch
+      {
+        function_type = typ;
+        expected_arity = arity;
+        provided_arity = args;
+        provided_args = sargs;
+        function_name = function_name_opt;
+      } ->
+    (* We need:
+    - Any arg that's required but isn't passed
+    - Any arg that is passed but isn't in the fn definition (optional or labelled)
+    - Any mismatch in the number of unlabelled args (since all of them are required)
+    *)
+    let rec collect_args ?(acc = []) typ =
+      match typ.desc with
+      | Tarrow (arg, next, _, _) -> collect_args ~acc:(arg.lbl :: acc) next
+      | _ -> acc
+    in
+    let args_from_type = collect_args typ in
+
+    (* Unlabelled arg counts *)
+    let args_from_type_unlabelled =
+      args_from_type |> List.filter (fun arg -> arg = Nolabel) |> List.length
+    in
+    let sargs_unlabelled =
+      sargs |> List.filter (fun arg -> arg = Nolabel) |> List.length
+    in
+    let mismatch_in_unlabelled_args =
+      args_from_type_unlabelled <> sargs_unlabelled
+    in
+
+    (* Required args that aren't passed *)
+    let required_args =
+      args_from_type
+      |> List.filter_map (fun arg ->
+             match arg with
+             | Labelled {txt = n} -> Some n
+             | Optional _ | Nolabel -> None)
+    in
+    let passed_named_args =
+      sargs
+      |> List.filter_map (fun arg ->
+             match arg with
+             | Labelled {txt} | Optional {txt} -> Some txt
+             | Nolabel -> None)
+    in
+    let missing_required_args =
+      required_args
+      |> List.filter (fun arg -> not (List.mem arg passed_named_args))
+    in
+
+    (* Passed args that the fn does not take *)
+    let named_args_of_fn_type =
+      args_from_type
+      |> List.filter_map (fun arg ->
+             match arg with
+             | Labelled {txt = n} | Optional {txt = n} -> Some n
+             | Nolabel -> None)
+    in
+    let superfluous_args =
+      passed_named_args
+      |> List.filter (fun arg -> not (List.mem arg named_args_of_fn_type))
+    in
+
+    let is_fallback =
+      List.length missing_required_args = 0
+      && List.length superfluous_args = 0
+      && mismatch_in_unlabelled_args = false
+    in
+
+    fprintf ppf "@[<v>@[<2>This function call is incorrect.@]";
+    fprintf ppf "@,The function has type:@ %a" type_expr typ;
+
+    if not is_fallback then fprintf ppf "@,";
+
+    if List.length missing_required_args > 0 then (
+      fprintf ppf "@,- Missing arguments that must be provided: %s"
+        (missing_required_args
+        |> List.map (fun v -> "~" ^ v)
+        |> String.concat ", ");
+
+      fprintf ppf
+        "@,\
+         - Hint: Did you want to partially apply the function? You can do that \
+         by putting `...` just before the closing parens of the function call. \
+         Example: @{<info>yourFn(~arg1=someVar, ...)@}");
+
+    if List.length superfluous_args > 0 then
+      fprintf ppf "@,- Called with arguments it does not take: %s"
+        (superfluous_args |> String.concat ", ");
+
+    let unlabelled_msg a b pos =
+      match (a, pos) with
+      | 0, `left -> "no"
+      | 0, `right -> "none"
+      | _ when a > b -> string_of_int a
+      | _ -> "just " ^ string_of_int a
+    in
+
+    if mismatch_in_unlabelled_args then
+      fprintf ppf
+        "@,\
+         - The function takes @{<info>%s@} unlabelled argument%s, but is \
+         called with @{<error>%s@}"
+        (unlabelled_msg args_from_type_unlabelled sargs_unlabelled `left)
+        (if args_from_type_unlabelled = 1 then "" else "s")
+        (unlabelled_msg sargs_unlabelled args_from_type_unlabelled `right);
+
+    (* Print fallback if nothing above matched *)
+    if is_fallback then
+      fprintf ppf
+        "@,\
+         @,\
+         It is called with @{<error>%d@} argument%s but%s requires \
+         @{<info>%d@}."
+        args
+        (if args = 1 then "" else "s")
+        (if args > arity then " just" else "")
+        arity;
+
+    (* Add suggestions for related functions with correct arity *)
+    (match function_name_opt with
+    | Some function_name -> (
+      let function_name_str =
+        let buffer = Buffer.create 16 in
+        let formatter = Format.formatter_of_buffer buffer in
+        Printtyp.longident formatter function_name;
+        Format.pp_print_flush formatter ();
+        Buffer.contents buffer
+      in
+      let suggestion = find_arity_suggestion env function_name_str args in
+      match suggestion with
+      | None -> ()
+      | Some suggestion_str ->
+        fprintf ppf
+          "@,@,Hint: Try @{<info>%s@} instead (takes @{<info>%d@} argument%s)."
+          suggestion_str args
+          (if args = 1 then "" else "s"))
+    | None -> ());
+
+    fprintf ppf "@]"
+  | Field_not_optional (name, typ) ->
+    fprintf ppf "Field @{<info>%s@} is not optional in type %a. Use without ?"
+      name type_expr typ
+  | Type_params_not_supported lid ->
+    fprintf ppf
+      "The type %a@ has type parameters, but type parameters is not supported \
+       here."
+      longident lid
+  | Field_access_on_dict_type ->
+    fprintf ppf
+      "Direct field access on a dict is not supported. Use Dict.get instead."
+  | Jsx_not_enabled ->
+    fprintf ppf
+      "Cannot compile JSX expression because JSX support is not enabled. Add \
+       \"jsx\" settings to rescript.json to enable JSX support."
+
+let report_error env loc ppf err =
+  Printtyp.wrap_printing_env env (fun () -> report_error env loc ppf err)
+
+let () =
+  Location.register_error_of_exn (function
+    | Error (loc, env, err) ->
+      Some (Location.error_of_printer loc (report_error env loc) err)
+    | Error_forward err -> Some err
+    | _ -> None)
+
+let type_exp env e = type_exp env e
diff --git a/compiler/ml/typecore.mli b/compiler/ml/typecore.mli
new file mode 100644
index 0000000..eef17d0
--- /dev/null
+++ b/compiler/ml/typecore.mli
@@ -0,0 +1,160 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Type inference for the core language *)
+
+open Asttypes
+open Types
+open Format
+
+val is_nonexpansive : Typedtree.expression -> bool
+
+val type_binding :
+  context:Error_message_utils.type_clash_context option ->
+  Env.t ->
+  rec_flag ->
+  Parsetree.value_binding list ->
+  Annot.ident option ->
+  Typedtree.value_binding list * Env.t
+val type_expression :
+  context:Error_message_utils.type_clash_context option ->
+  Env.t ->
+  Parsetree.expression ->
+  Typedtree.expression
+val check_partial :
+  ?lev:int ->
+  ?partial_match_warning_hint:string ->
+  Env.t ->
+  type_expr ->
+  Location.t ->
+  Typedtree.case list ->
+  Typedtree.partial
+val type_exp :
+  Env.t ->
+  Parsetree.expression ->
+  context:Error_message_utils.type_clash_context option ->
+  Typedtree.expression
+val type_approx : Env.t -> Parsetree.expression -> type_expr
+
+val option_some : Typedtree.expression -> Typedtree.expression
+val option_none : type_expr -> Location.t -> Typedtree.expression
+val extract_option_type : Env.t -> type_expr -> type_expr
+val iter_pattern : (Typedtree.pattern -> unit) -> Typedtree.pattern -> unit
+val generalizable : int -> type_expr -> bool
+
+val id_of_pattern : Typedtree.pattern -> Ident.t option
+val name_pattern : string -> Typedtree.case list -> Ident.t
+
+type error =
+  | Polymorphic_label of Longident.t
+  | Constructor_arity_mismatch of {
+      name: Longident.t;
+      constuctor: constructor_description;
+      expected: int;
+      provided: int;
+    }
+  | Label_mismatch of Longident.t * (type_expr * type_expr) list
+  | Pattern_type_clash of (type_expr * type_expr) list
+  | Or_pattern_type_clash of Ident.t * (type_expr * type_expr) list
+  | Multiply_bound_variable of string
+  | Orpat_vars of Ident.t * Ident.t list
+  | Expr_type_clash of {
+      trace: (type_expr * type_expr) list;
+      context: Error_message_utils.type_clash_context option;
+    }
+  | Apply_non_function of type_expr
+  | Apply_wrong_label of arg_label * type_expr
+  | Label_multiply_defined of {
+      label: string;
+      jsx_component_info: Error_message_utils.jsx_prop_error_info option;
+    }
+  | Labels_missing of {
+      labels: string list;
+      jsx_component_info: Error_message_utils.jsx_prop_error_info option;
+    }
+  | Label_not_mutable of Longident.t
+  | Wrong_name of string * type_expr * string * Path.t * string * string list
+  | Name_type_mismatch of
+      string * Longident.t * (Path.t * Path.t) * (Path.t * Path.t) list
+  | Undefined_method of type_expr * string * string list option
+  | Private_type of type_expr
+  | Private_label of Longident.t * type_expr
+  | Not_subtype of
+      Ctype.type_pairs * Ctype.type_pairs * Ctype.subtype_context option
+  | Too_many_arguments of bool * type_expr
+  | Abstract_wrong_label of arg_label * type_expr
+  | Scoping_let_module of string * type_expr
+  | Not_a_variant_type of Longident.t
+  | Incoherent_label_order
+  | Less_general of string * (type_expr * type_expr) list
+  | Modules_not_allowed
+  | Cannot_infer_signature
+  | Not_a_packed_module of type_expr
+  | Recursive_local_constraint of (type_expr * type_expr) list
+  | Unexpected_existential
+  | Unqualified_gadt_pattern of Path.t * string
+  | Invalid_interval
+  | Invalid_for_loop_index
+  | No_value_clauses
+  | Exception_pattern_below_toplevel
+  | Inlined_record_escape
+  | Inlined_record_expected
+  | Invalid_extension_constructor_payload
+  | Not_an_extension_constructor
+  | Literal_overflow of string
+  | Unknown_literal of string * char
+  | Illegal_letrec_pat
+  | Empty_record_literal
+  | Uncurried_arity_mismatch of {
+      function_type: type_expr;
+      expected_arity: int;
+      provided_arity: int;
+      provided_args: Asttypes.arg_label list;
+      function_name: Longident.t option;
+    }
+  | Field_not_optional of string * type_expr
+  | Type_params_not_supported of Longident.t
+  | Field_access_on_dict_type
+  | Jsx_not_enabled
+
+exception Error of Location.t * Env.t * error
+exception Error_forward of Location.error
+
+val report_error : Env.t -> Location.t -> formatter -> error -> unit
+(* Deprecated.  Use Location.{error_of_exn, report_error}. *)
+
+(* Forward declaration, to be filled in by Typemod.type_module *)
+val type_module : (Env.t -> Parsetree.module_expr -> Typedtree.module_expr) ref
+
+(* Forward declaration, to be filled in by Typemod.type_open *)
+val type_open :
+  (?used_slot:bool ref ->
+  override_flag ->
+  Env.t ->
+  Location.t ->
+  Longident.t loc ->
+  Path.t * Env.t)
+  ref
+
+(* Forward declaration, to be filled in by Typemod.type_package *)
+val type_package :
+  (Env.t ->
+  Parsetree.module_expr ->
+  Path.t ->
+  Longident.t list ->
+  Typedtree.module_expr * type_expr list)
+  ref
+
+val constant : Parsetree.constant -> (Asttypes.constant, error) result
diff --git a/compiler/ml/typedecl.ml b/compiler/ml/typedecl.ml
new file mode 100644
index 0000000..da35de5
--- /dev/null
+++ b/compiler/ml/typedecl.ml
@@ -0,0 +1,2325 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*  Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt  *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(**** Typing of type definitions ****)
+
+open Misc
+open Asttypes
+open Parsetree
+open Primitive
+open Types
+open Typetexp
+
+type native_repr_kind = Unboxed | Untagged
+
+type error =
+  | Repeated_parameter
+  | Duplicate_constructor of string
+  | Duplicate_label of string * string option
+  | Object_spread_with_record_field of string
+  | Recursive_abbrev of string
+  | Cycle_in_def of string * type_expr
+  | Definition_mismatch of type_expr * Includecore.type_mismatch list
+  | Constraint_failed of type_expr * type_expr
+  | Inconsistent_constraint of Env.t * (type_expr * type_expr) list
+  | Type_clash of Env.t * (type_expr * type_expr) list
+  | Parameters_differ of Path.t * type_expr * type_expr
+  | Null_arity_external
+  | Unbound_type_var of type_expr * type_declaration
+  | Cannot_extend_private_type of Path.t
+  | Not_extensible_type of Path.t
+  | Extension_mismatch of Path.t * Includecore.type_mismatch list
+  | Rebind_wrong_type of Longident.t * Env.t * (type_expr * type_expr) list
+  | Rebind_mismatch of Longident.t * Path.t * Path.t
+  | Rebind_private of Longident.t
+  | Bad_variance of int * (bool * bool * bool) * (bool * bool * bool)
+  | Unavailable_type_constructor of Path.t
+  | Bad_fixed_type of string
+  | Unbound_type_var_ext of type_expr * extension_constructor
+  | Varying_anonymous
+  | Val_in_structure
+  | Invalid_attribute of string
+  | Bad_immediate_attribute
+  | Bad_unboxed_attribute of string
+  | Boxed_and_unboxed
+  | Nonrec_gadt
+  | Variant_runtime_representation_mismatch of Variant_coercion.variant_error
+  | Variant_spread_fail of Variant_type_spread.variant_type_spread_error
+
+open Typedtree
+
+exception Error of Location.t * error
+
+(* Note: do not factor the branches in the following pattern-matching:
+   the records must be constants for the compiler to do sharing on them.
+*)
+let get_unboxed_from_attributes sdecl =
+  let unboxed = Builtin_attributes.has_unboxed sdecl.ptype_attributes in
+  let boxed = Builtin_attributes.has_boxed sdecl.ptype_attributes in
+  match (boxed, unboxed, !Clflags.unboxed_types) with
+  | true, true, _ -> raise (Error (sdecl.ptype_loc, Boxed_and_unboxed))
+  | true, false, _ -> unboxed_false_default_false
+  | false, true, _ -> unboxed_true_default_false
+  | false, false, false -> unboxed_false_default_true
+  | false, false, true -> unboxed_true_default_true
+
+(* Enter all declared types in the environment as abstract types *)
+
+let enter_type rec_flag env sdecl id =
+  let needed =
+    match rec_flag with
+    | Asttypes.Nonrecursive ->
+      (match sdecl.ptype_kind with
+      | Ptype_variant scds ->
+        List.iter
+          (fun cd ->
+            if cd.pcd_res <> None then raise (Error (cd.pcd_loc, Nonrec_gadt)))
+          scds
+      | _ -> ());
+      Btype.is_row_name (Ident.name id)
+    | Asttypes.Recursive -> true
+  in
+  if not needed then env
+  else
+    let decl =
+      {
+        type_params = List.map (fun _ -> Btype.newgenvar ()) sdecl.ptype_params;
+        type_arity = List.length sdecl.ptype_params;
+        type_kind = Type_abstract;
+        type_private = sdecl.ptype_private;
+        type_manifest =
+          (match sdecl.ptype_manifest with
+          | None -> None
+          | Some _ -> Some (Ctype.newvar ()));
+        type_variance = List.map (fun _ -> Variance.full) sdecl.ptype_params;
+        type_newtype_level = None;
+        type_loc = sdecl.ptype_loc;
+        type_attributes = sdecl.ptype_attributes;
+        type_immediate = false;
+        type_unboxed = unboxed_false_default_false;
+        type_inlined_types = [];
+      }
+    in
+    Env.add_type ~check:true id decl env
+
+let update_type temp_env env id loc =
+  let path = Path.Pident id in
+  let decl = Env.find_type path temp_env in
+  match decl.type_manifest with
+  | None -> ()
+  | Some ty -> (
+    let params = List.map (fun _ -> Ctype.newvar ()) decl.type_params in
+    try Ctype.unify env (Ctype.newconstr path params) ty
+    with Ctype.Unify trace -> raise (Error (loc, Type_clash (env, trace))))
+
+(* We use the Ctype.expand_head_opt version of expand_head to get access
+   to the manifest type of private abbreviations. *)
+let rec get_unboxed_type_representation env ty fuel =
+  if fuel < 0 then None
+  else
+    let ty = Ctype.repr (Ctype.expand_head_opt env ty) in
+    match ty.desc with
+    | Tconstr (p, args, _) -> (
+      match Env.find_type p env with
+      | exception Not_found -> Some ty
+      | {type_unboxed = {unboxed = false}} -> Some ty
+      | {
+       type_params;
+       type_kind =
+         ( Type_record ([{ld_type = ty2; _}], _)
+         | Type_variant [{cd_args = Cstr_tuple [ty2]; _}]
+         | Type_variant [{cd_args = Cstr_record [{ld_type = ty2; _}]; _}] );
+      } ->
+        get_unboxed_type_representation env
+          (Ctype.apply env type_params ty2 args)
+          (fuel - 1)
+      | {type_kind = Type_abstract} ->
+        None
+        (* This case can occur when checking a recursive unboxed type
+           declaration. *)
+      | _ -> assert false (* only the above can be unboxed *))
+    | _ -> Some ty
+
+let get_unboxed_type_representation env ty =
+  (* Do not give too much fuel: PR#7424 *)
+  get_unboxed_type_representation env ty 100
+
+(* Determine if a type definition defines a fixed type. (PW) *)
+let is_fixed_type sd =
+  let rec has_row_var sty =
+    match sty.ptyp_desc with
+    | Ptyp_alias (sty, _) -> has_row_var sty
+    | Ptyp_object (_, Open)
+    | Ptyp_variant (_, Open, _)
+    | Ptyp_variant (_, Closed, Some _) ->
+      true
+    | _ -> false
+  in
+  match sd.ptype_manifest with
+  | None -> false
+  | Some sty ->
+    sd.ptype_kind = Ptype_abstract
+    && sd.ptype_private = Private && has_row_var sty
+
+(* Set the row variable in a fixed type *)
+let set_fixed_row env loc p decl =
+  let tm =
+    match decl.type_manifest with
+    | None -> assert false
+    | Some t -> Ctype.expand_head env t
+  in
+  let rv =
+    match tm.desc with
+    | Tvariant row ->
+      let row = Btype.row_repr row in
+      tm.desc <- Tvariant {row with row_fixed = true};
+      if Btype.static_row row then Btype.newgenty Tnil else row.row_more
+    | Tobject (ty, _) -> snd (Ctype.flatten_fields ty)
+    | _ -> raise (Error (loc, Bad_fixed_type "is not an object or variant"))
+  in
+  if not (Btype.is_Tvar rv) then
+    raise (Error (loc, Bad_fixed_type "has no row variable"));
+  rv.desc <- Tconstr (p, decl.type_params, ref Mnil)
+
+(* Translate one type declaration *)
+
+module StringSet = Set.Make (struct
+  type t = string
+  let compare (x : t) y = compare x y
+end)
+
+let make_params env params =
+  let make_param (sty, v) =
+    try (transl_type_param env sty, v)
+    with Already_bound -> raise (Error (sty.ptyp_loc, Repeated_parameter))
+  in
+  List.map make_param params
+
+let transl_labels ?record_name env closed lbls =
+  (match !Builtin_attributes.check_duplicated_labels lbls with
+  | None -> ()
+  | Some {loc; txt = name} ->
+    raise (Error (loc, Duplicate_label (name, record_name))));
+  let mk
+      {
+        pld_name = name;
+        pld_mutable = mut;
+        pld_optional = optional;
+        pld_type = arg;
+        pld_loc = loc;
+        pld_attributes = attrs;
+      } =
+    Builtin_attributes.warning_scope attrs (fun () ->
+        let arg = Ast_helper.Typ.force_poly arg in
+        let cty = transl_simple_type env closed arg in
+        {
+          ld_id = Ident.create name.txt;
+          ld_name = name;
+          ld_mutable = mut;
+          ld_optional = optional;
+          ld_type = cty;
+          ld_loc = loc;
+          ld_attributes = attrs;
+        })
+  in
+  let lbls = List.map mk lbls in
+  let lbls' =
+    List.map
+      (fun ld ->
+        let ty = ld.ld_type.ctyp_type in
+        let ty =
+          match ty.desc with
+          | Tpoly (t, []) -> t
+          | _ -> ty
+        in
+        {
+          Types.ld_id = ld.ld_id;
+          ld_mutable = ld.ld_mutable;
+          ld_optional = ld.ld_optional;
+          ld_type = ty;
+          ld_loc = ld.ld_loc;
+          ld_attributes = ld.ld_attributes;
+        })
+      lbls
+  in
+  (lbls, lbls')
+
+let first_non_spread_field (lbls_ : Parsetree.label_declaration list) =
+  List.find_map
+    (fun (ld : Parsetree.label_declaration) ->
+      if ld.pld_name.txt <> "..." then Some ld else None)
+    lbls_
+
+let transl_constructor_arguments env closed = function
+  | Pcstr_tuple l ->
+    let l = List.map (transl_simple_type env closed) l in
+    (Types.Cstr_tuple (List.map (fun t -> t.ctyp_type) l), Cstr_tuple l)
+  | Pcstr_record l -> (
+    let lbls, lbls' = transl_labels env closed l in
+    let expanded =
+      Record_type_spread.expand_labels_with_type_spreads env lbls lbls'
+    in
+    match expanded with
+    | Some (lbls, lbls') -> (Types.Cstr_record lbls', Cstr_record lbls)
+    | None -> (
+      match l with
+      | [{pld_name = {txt = "..."}; pld_type = spread_typ; _}] ->
+        (* Ambiguous `{...t}`: if only spread present and it doesn't resolve to a
+           record type, treat it as an object-typed tuple argument. *)
+        let obj_ty =
+          Ast_helper.Typ.object_ ~loc:spread_typ.ptyp_loc
+            [Parsetree.Oinherit spread_typ]
+            Asttypes.Closed
+        in
+        let cty = transl_simple_type env closed obj_ty in
+        (Types.Cstr_tuple [cty.ctyp_type], Cstr_tuple [cty])
+      | _ -> (
+        (* Could not resolve spread to a record type, but additional record
+           fields are present. Mirror declaration logic and reject mixing
+           object-type spreads with record fields. *)
+        match first_non_spread_field l with
+        | Some ld ->
+          raise
+            (Error (ld.pld_loc, Object_spread_with_record_field ld.pld_name.txt))
+        | None -> (
+          (* Be defensive: treat as an object-typed tuple if somehow only spreads
+             are present but not caught by the single-spread case. *)
+          let fields =
+            Ext_list.filter_map l (fun ld ->
+                match ld.pld_name.txt with
+                | "..." -> Some (Parsetree.Oinherit ld.pld_type)
+                | _ -> None)
+          in
+          match fields with
+          | [] -> (Types.Cstr_record lbls', Cstr_record lbls)
+          | _ ->
+            let obj_ty =
+              Ast_helper.Typ.object_ ~loc:(List.hd l).pld_loc fields
+                Asttypes.Closed
+            in
+            let cty = transl_simple_type env closed obj_ty in
+            (Types.Cstr_tuple [cty.ctyp_type], Cstr_tuple [cty])))))
+
+let make_constructor env type_path type_params sargs sret_type =
+  match sret_type with
+  | None ->
+    let args, targs = transl_constructor_arguments env true sargs in
+    (targs, None, args, None, type_params)
+  | Some sret_type ->
+    (* if it's a generalized constructor we must first narrow and
+       then widen so as to not introduce any new constraints *)
+    let z = narrow () in
+    reset_type_variables ();
+    let args, targs = transl_constructor_arguments env false sargs in
+    let tret_type = transl_simple_type env false sret_type in
+    let ret_type = tret_type.ctyp_type in
+    let params =
+      match (Ctype.repr ret_type).desc with
+      | Tconstr (p', params, _) when Path.same type_path p' -> params
+      | _ ->
+        raise
+          (Error
+             ( sret_type.ptyp_loc,
+               Constraint_failed
+                 (ret_type, Ctype.newconstr type_path type_params) ))
+    in
+    widen z;
+    (targs, Some tret_type, args, Some ret_type, params)
+
+let is_not_undefined_attr (attr : attribute) =
+  match attr with
+  | {Location.txt = "notUndefined"; _}, _ -> true
+  | _ -> false
+
+(* Check that all the variables found in [ty] are in [univ].
+   Because [ty] is the argument to an abstract type, the representation
+   of that abstract type could be any subexpression of [ty], in particular
+   any type variable present in [ty].
+*)
+
+let transl_declaration ~type_record_as_object ~untagged_wfc env sdecl id =
+  (* Check for @notUndefined attribute *)
+  let has_not_undefined =
+    List.exists is_not_undefined_attr sdecl.ptype_attributes
+  in
+  (if has_not_undefined then
+     match (sdecl.ptype_kind, sdecl.ptype_manifest) with
+     | Ptype_abstract, None -> ()
+     | _ ->
+       raise
+         (Error
+            ( sdecl.ptype_loc,
+              Invalid_attribute
+                "@notUndefined can only be used on abstract types" )));
+
+  (* Bind type parameters *)
+  reset_type_variables ();
+  Ctype.begin_def ();
+  let tparams = make_params env sdecl.ptype_params in
+  let params = List.map (fun (cty, _) -> cty.ctyp_type) tparams in
+  let cstrs =
+    List.map
+      (fun (sty, sty', loc) ->
+        ( transl_simple_type env false sty,
+          transl_simple_type env false sty',
+          loc ))
+      sdecl.ptype_cstrs
+  in
+  let raw_status = get_unboxed_from_attributes sdecl in
+
+  let check_untagged_variant () =
+    match sdecl.ptype_kind with
+    | Ptype_variant cds ->
+      Ext_list.for_all cds (function
+        | {pcd_args = Pcstr_tuple ([] | [_])} ->
+          (* at most one payload allowed for untagged  variants *)
+          true
+        | {pcd_args = Pcstr_tuple (_ :: _ :: _); pcd_name = {txt = name}} ->
+          Ast_untagged_variants.report_constructor_more_than_one_arg
+            ~loc:sdecl.ptype_loc ~name
+        | {pcd_args = Pcstr_record _} -> true)
+    | _ -> false
+  in
+
+  (if
+     raw_status.unboxed && (not raw_status.default)
+     && not (check_untagged_variant ())
+   then
+     match sdecl.ptype_kind with
+     | Ptype_abstract ->
+       raise (Error (sdecl.ptype_loc, Bad_unboxed_attribute "it is abstract"))
+     | Ptype_variant _ -> ()
+     | Ptype_record [{pld_mutable = Immutable; _}] -> ()
+     | Ptype_record [{pld_mutable = Mutable; _}] ->
+       raise (Error (sdecl.ptype_loc, Bad_unboxed_attribute "it is mutable"))
+     | Ptype_record _ ->
+       raise
+         (Error
+            (sdecl.ptype_loc, Bad_unboxed_attribute "it has more than one field"))
+     | Ptype_open ->
+       raise
+         (Error
+            ( sdecl.ptype_loc,
+              Bad_unboxed_attribute "extensible variant types cannot be unboxed"
+            )));
+  let unboxed_status =
+    match sdecl.ptype_kind with
+    | Ptype_variant [{pcd_args = Pcstr_tuple []; _}] ->
+      unboxed_false_default_false
+    | Ptype_variant [{pcd_args = Pcstr_tuple _; _}]
+    | Ptype_variant
+        [{pcd_args = Pcstr_record [{pld_mutable = Immutable; _}]; _}]
+    | Ptype_record [{pld_mutable = Immutable; _}] ->
+      raw_status
+    | _ ->
+      (* The type is not unboxable, mark it as boxed *)
+      unboxed_false_default_false
+  in
+  let unbox = unboxed_status.unboxed in
+  let tkind, kind, sdecl =
+    match sdecl.ptype_kind with
+    | Ptype_abstract -> (Ttype_abstract, Type_abstract, sdecl)
+    | Ptype_variant scstrs ->
+      assert (scstrs <> []);
+      (if List.exists (fun cstr -> cstr.pcd_res <> None) scstrs then
+         match cstrs with
+         | [] -> ()
+         | (_, _, loc) :: _ ->
+           Location.prerr_warning loc Warnings.Constraint_on_gadt);
+      let scstrs =
+        Ext_list.map scstrs (fun ({pcd_args} as cstr) ->
+            match pcd_args with
+            | Pcstr_tuple _ -> cstr
+            | Pcstr_record lds ->
+              {
+                cstr with
+                pcd_args =
+                  Pcstr_record
+                    (Ext_list.map lds (fun ld ->
+                         if ld.pld_optional then
+                           let typ = ld.pld_type in
+                           let typ =
+                             {
+                               typ with
+                               ptyp_desc =
+                                 Ptyp_constr
+                                   ( {txt = Lident "option"; loc = typ.ptyp_loc},
+                                     [typ] );
+                             }
+                           in
+                           {ld with pld_type = typ}
+                         else ld));
+              })
+      in
+      let all_constrs = ref StringSet.empty in
+      List.iter
+        (fun {pcd_name = {txt = name}} ->
+          if StringSet.mem name !all_constrs then
+            raise (Error (sdecl.ptype_loc, Duplicate_constructor name));
+          all_constrs := StringSet.add name !all_constrs)
+        scstrs;
+      let copy_tag_attr_from_decl attr =
+        let tag_attrs =
+          Ext_list.filter sdecl.ptype_attributes (fun ({txt}, _) ->
+              txt = "tag" || txt = Ast_untagged_variants.untagged)
+        in
+        if tag_attrs = [] then attr else tag_attrs @ attr
+      in
+      let constructors_from_variant_spreads = Hashtbl.create 10 in
+      let make_cstr scstr =
+        let name = Ident.create scstr.pcd_name.txt in
+        let targs, tret_type, args, ret_type, _cstr_params =
+          make_constructor env (Path.Pident id) params scstr.pcd_args
+            scstr.pcd_res
+        in
+        if String.starts_with scstr.pcd_name.txt ~prefix:"..." then (
+          (* Any constructor starting with "..." represents a variant type spread, and
+             will have the spread variant itself as a single argument.
+
+             We pull that variant type out, and then track the type of each of its
+             constructors, so that we can replace our dummy constructors added before
+             type checking  with the realtypes for each constructor.
+          *)
+          (match args with
+          | Cstr_tuple [spread_variant] -> (
+            match Ctype.extract_concrete_typedecl env spread_variant with
+            | _, _, {type_kind = Type_variant constructors} ->
+              constructors
+              |> List.iter (fun (c : Types.constructor_declaration) ->
+                     Hashtbl.add constructors_from_variant_spreads c.cd_id.name
+                       c)
+            | _ -> ())
+          | _ -> ());
+          None)
+        else
+          (* Check if this constructor is from a variant spread. If so, we need to replace
+             its type with the right type we've pulled from the type checked spread variant
+             itself. *)
+          let tcstr, cstr =
+            match
+              Hashtbl.find_opt constructors_from_variant_spreads
+                (Ident.name name)
+            with
+            | Some cstr ->
+              let tcstr =
+                {
+                  cd_id = name;
+                  cd_name = scstr.pcd_name;
+                  cd_args =
+                    (match cstr.cd_args with
+                    | Cstr_tuple args ->
+                      Cstr_tuple
+                        (args
+                        |> List.map (fun texpr : Typedtree.core_type ->
+                               {
+                                 ctyp_attributes = cstr.cd_attributes;
+                                 ctyp_loc = cstr.cd_loc;
+                                 ctyp_env = env;
+                                 ctyp_type = texpr;
+                                 ctyp_desc = Ttyp_any;
+                                 (* This is fine because the type checker seems to only look at `ctyp_type` for type checking. *)
+                               }))
+                    | Cstr_record lbls ->
+                      Cstr_record
+                        (lbls
+                        |> List.map
+                             (fun
+                               (l : Types.label_declaration)
+                               :
+                               Typedtree.label_declaration
+                             ->
+                               {
+                                 ld_id = l.ld_id;
+                                 ld_name =
+                                   Location.mkloc (Ident.name l.ld_id) l.ld_loc;
+                                 ld_mutable = l.ld_mutable;
+                                 ld_optional = l.ld_optional;
+                                 ld_type =
+                                   {
+                                     ctyp_desc = Ttyp_any;
+                                     ctyp_type = l.ld_type;
+                                     ctyp_env = env;
+                                     ctyp_loc = l.ld_loc;
+                                     ctyp_attributes = [];
+                                   };
+                                 ld_loc = l.ld_loc;
+                                 ld_attributes = l.ld_attributes;
+                               })));
+                  cd_res = tret_type;
+                  (* This is also strictly wrong, but is fine because the type checker does not look at this field. *)
+                  cd_loc = scstr.pcd_loc;
+                  cd_attributes =
+                    scstr.pcd_attributes |> copy_tag_attr_from_decl;
+                }
+              in
+              (tcstr, cstr)
+            | None ->
+              let tcstr =
+                {
+                  cd_id = name;
+                  cd_name = scstr.pcd_name;
+                  cd_args = targs;
+                  cd_res = tret_type;
+                  cd_loc = scstr.pcd_loc;
+                  cd_attributes =
+                    scstr.pcd_attributes |> copy_tag_attr_from_decl;
+                }
+              in
+              let cstr =
+                {
+                  Types.cd_id = name;
+                  cd_args = args;
+                  cd_res = ret_type;
+                  cd_loc = scstr.pcd_loc;
+                  cd_attributes =
+                    scstr.pcd_attributes |> copy_tag_attr_from_decl;
+                }
+              in
+              (tcstr, cstr)
+          in
+          Some (tcstr, cstr)
+      in
+      let make_cstr scstr =
+        Builtin_attributes.warning_scope scstr.pcd_attributes (fun () ->
+            make_cstr scstr)
+      in
+      let tcstrs, cstrs = List.split (List.filter_map make_cstr scstrs) in
+      let is_untagged_def =
+        Ast_untagged_variants.has_untagged sdecl.ptype_attributes
+      in
+      let well_formedness_check : Ast_untagged_variants.well_formedness_check =
+        {is_untagged_def; cstrs}
+      in
+      (* delay the check until the newenv is created to handle recursive types *)
+      untagged_wfc := well_formedness_check :: !untagged_wfc;
+      (Ttype_variant tcstrs, Type_variant cstrs, sdecl)
+    | Ptype_record lbls_ -> (
+      let optional_labels =
+        Ext_list.filter_map lbls_ (fun lbl ->
+            if lbl.pld_optional then Some lbl.pld_name.txt else None)
+      in
+      let lbls =
+        if optional_labels = [] then lbls_
+        else
+          Ext_list.map lbls_ (fun lbl ->
+              let typ = lbl.pld_type in
+              let typ =
+                if lbl.pld_optional then
+                  {
+                    typ with
+                    ptyp_desc =
+                      Ptyp_constr
+                        ({txt = Lident "option"; loc = typ.ptyp_loc}, [typ]);
+                  }
+                else typ
+              in
+              {lbl with pld_type = typ})
+      in
+      let lbls, lbls' =
+        transl_labels ~record_name:sdecl.ptype_name.txt env true lbls
+      in
+      let lbls_opt =
+        Record_type_spread.expand_labels_with_type_spreads env lbls lbls'
+      in
+      let rec check_duplicates loc (lbls : Typedtree.label_declaration list)
+          seen =
+        match lbls with
+        | [] -> ()
+        | lbl :: rest ->
+          let name = lbl.ld_id.name in
+          if StringSet.mem name seen then
+            raise
+              (Error (loc, Duplicate_label (name, Some sdecl.ptype_name.txt)));
+          check_duplicates loc rest (StringSet.add name seen)
+      in
+      match lbls_opt with
+      | Some (lbls, lbls') ->
+        check_duplicates sdecl.ptype_loc lbls StringSet.empty;
+        let optional = Ext_list.exists lbls (fun lbl -> lbl.ld_optional) in
+        ( Ttype_record lbls,
+          Type_record
+            ( lbls',
+              if unbox then Record_unboxed false
+              else if optional then Record_regular
+              else Record_regular ),
+          sdecl )
+      | None -> (
+        (* Could not find record type decl for ...t. This happens when the spread
+           target is not a record type (e.g. an object type). If additional
+           fields are present in the record, this mixes a record field with an
+           object-type spread and should be rejected. If only the spread exists,
+           reinterpret as an object type for backwards compatibility. *)
+        (* TODO: We really really need to make this "spread that needs to be resolved" 
+        concept 1st class in the AST or similar. This is quite hacky and fragile as
+        is.*)
+        match first_non_spread_field lbls_ with
+        | Some ld ->
+          (* Error on the first record field mixed with an object spread. *)
+          raise
+            (Error (ld.pld_loc, Object_spread_with_record_field ld.pld_name.txt))
+        | None ->
+          (* Only a spread present: treat as object type (syntax ambiguity). *)
+          type_record_as_object := true;
+          let fields =
+            Ext_list.map lbls_ (fun ld ->
+                match ld.pld_name.txt with
+                | "..." -> Parsetree.Oinherit ld.pld_type
+                | _ -> Otag (ld.pld_name, ld.pld_attributes, ld.pld_type))
+          in
+          let sdecl =
+            {
+              sdecl with
+              ptype_kind = Ptype_abstract;
+              ptype_manifest =
+                Some (Ast_helper.Typ.object_ ~loc:sdecl.ptype_loc fields Closed);
+            }
+          in
+          (Ttype_abstract, Type_abstract, sdecl)))
+    | Ptype_open -> (Ttype_open, Type_open, sdecl)
+  in
+  let tman, man =
+    match sdecl.ptype_manifest with
+    | None -> (None, None)
+    | Some sty ->
+      let no_row = not (is_fixed_type sdecl) in
+      let cty = transl_simple_type env no_row sty in
+      (Some cty, Some cty.ctyp_type)
+  in
+  let decl =
+    {
+      type_params = params;
+      type_arity = List.length params;
+      type_kind = kind;
+      type_private = sdecl.ptype_private;
+      type_manifest = man;
+      type_variance = List.map (fun _ -> Variance.full) params;
+      type_newtype_level = None;
+      type_loc = sdecl.ptype_loc;
+      type_attributes = sdecl.ptype_attributes;
+      type_immediate = false;
+      type_unboxed = unboxed_status;
+      type_inlined_types = [];
+    }
+  in
+
+  (* Check constraints *)
+  List.iter
+    (fun (cty, cty', loc) ->
+      let ty = cty.ctyp_type in
+      let ty' = cty'.ctyp_type in
+      try Ctype.unify env ty ty'
+      with Ctype.Unify tr ->
+        raise (Error (loc, Inconsistent_constraint (env, tr))))
+    cstrs;
+  Ctype.end_def ();
+  (* Add abstract row *)
+  (if is_fixed_type sdecl then
+     let p =
+       try Env.lookup_type (Longident.Lident (Ident.name id ^ "#row")) env
+       with Not_found -> assert false
+     in
+     set_fixed_row env sdecl.ptype_loc p decl);
+  (* Check for cyclic abbreviations *)
+  (match decl.type_manifest with
+  | None -> ()
+  | Some ty ->
+    if Ctype.cyclic_abbrev env id ty then
+      raise (Error (sdecl.ptype_loc, Recursive_abbrev sdecl.ptype_name.txt)));
+  {
+    typ_id = id;
+    typ_name = sdecl.ptype_name;
+    typ_params = tparams;
+    typ_type = decl;
+    typ_cstrs = cstrs;
+    typ_loc = sdecl.ptype_loc;
+    typ_manifest = tman;
+    typ_kind = tkind;
+    typ_private = sdecl.ptype_private;
+    typ_attributes = sdecl.ptype_attributes;
+  }
+
+(* Generalize a type declaration *)
+
+let generalize_decl decl =
+  List.iter Ctype.generalize decl.type_params;
+  Btype.iter_type_expr_kind Ctype.generalize decl.type_kind;
+  match decl.type_manifest with
+  | None -> ()
+  | Some ty -> Ctype.generalize ty
+
+(* Check that all constraints are enforced *)
+
+module TypeSet = Btype.TypeSet
+module TypeMap = Btype.TypeMap
+
+let rec check_constraints_rec env loc visited ty =
+  let ty = Ctype.repr ty in
+  if TypeSet.mem ty !visited then ()
+  else (
+    visited := TypeSet.add ty !visited;
+    match ty.desc with
+    | Tconstr (path, args, _) ->
+      let args' = List.map (fun _ -> Ctype.newvar ()) args in
+      let ty' = Ctype.newconstr path args' in
+      (try Ctype.enforce_constraints env ty' with
+      | Ctype.Unify _ -> assert false
+      | Not_found -> raise (Error (loc, Unavailable_type_constructor path)));
+      if not (Ctype.matches env ty ty') then
+        raise (Error (loc, Constraint_failed (ty, ty')));
+      List.iter (check_constraints_rec env loc visited) args
+    | Tpoly (ty, tl) ->
+      let _, ty = Ctype.instance_poly false tl ty in
+      check_constraints_rec env loc visited ty
+    | _ -> Btype.iter_type_expr (check_constraints_rec env loc visited) ty)
+
+module SMap = Map.Make (String)
+
+let check_constraints_labels env visited l pl =
+  let rec get_loc name = function
+    | [] -> Location.none
+    | pld :: tl ->
+      if name = pld.pld_name.txt then pld.pld_type.ptyp_loc else get_loc name tl
+  in
+  List.iter
+    (fun {Types.ld_id = name; ld_type = ty} ->
+      check_constraints_rec env (get_loc (Ident.name name) pl) visited ty)
+    l
+
+let check_constraints ~type_record_as_object env sdecl (_, decl) =
+  let visited = ref TypeSet.empty in
+  (match decl.type_kind with
+  | Type_abstract -> ()
+  | Type_variant l ->
+    let find_pl = function
+      | Ptype_variant pl -> pl
+      | Ptype_record _ | Ptype_abstract | Ptype_open -> assert false
+    in
+    let pl = find_pl sdecl.ptype_kind in
+    let pl_index =
+      let foldf acc x = SMap.add x.pcd_name.txt x acc in
+      List.fold_left foldf SMap.empty pl
+    in
+    List.iter
+      (fun {Types.cd_id = name; cd_args; cd_res} ->
+        let {pcd_args; pcd_res; _} =
+          try SMap.find (Ident.name name) pl_index
+          with Not_found -> assert false
+        in
+        (match (cd_args, pcd_args) with
+        | Cstr_tuple tyl, Pcstr_tuple styl ->
+          List.iter2
+            (fun sty ty -> check_constraints_rec env sty.ptyp_loc visited ty)
+            styl tyl
+        | Cstr_record tyl, Pcstr_record styl ->
+          check_constraints_labels env visited tyl styl
+        | ( Cstr_tuple [ty],
+            Pcstr_record [{pld_name = {txt = "..."}; pld_type; _}] ) ->
+          (* Ambiguous `{...t}` parsed as record with a single spread; typer may
+             reinterpret as an object tuple argument. Accept this and check the
+             single tuple arg against the source location of the spread type. *)
+          check_constraints_rec env pld_type.ptyp_loc visited ty
+        | _ -> assert false);
+        match (pcd_res, cd_res) with
+        | Some sr, Some r -> check_constraints_rec env sr.ptyp_loc visited r
+        | _ -> ())
+      l
+  | Type_record (l, _) ->
+    let find_pl = function
+      | Ptype_record pl -> pl
+      | Ptype_variant _ | Ptype_abstract | Ptype_open -> assert false
+    in
+    let pl = find_pl sdecl.ptype_kind in
+    check_constraints_labels env visited l pl
+  | Type_open -> ());
+  match decl.type_manifest with
+  | None -> ()
+  | Some ty ->
+    if not !type_record_as_object then
+      let sty =
+        match sdecl.ptype_manifest with
+        | Some sty -> sty
+        | _ -> assert false
+      in
+      check_constraints_rec env sty.ptyp_loc visited ty
+
+(*
+   If both a variant/record definition and a type equation are given,
+   need to check that the equation refers to a type of the same kind
+   with the same constructors and labels.
+*)
+let check_coherence env loc id decl =
+  match decl with
+  | {
+   type_kind = Type_variant _ | Type_record _ | Type_open;
+   type_manifest = Some ty;
+  } -> (
+    match (Ctype.repr ty).desc with
+    | Tconstr (path, args, _) -> (
+      try
+        let decl' = Env.find_type path env in
+        let err =
+          if List.length args <> List.length decl.type_params then
+            [Includecore.Arity]
+          else if not (Ctype.equal env false args decl.type_params) then
+            [Includecore.Constraint]
+          else
+            Includecore.type_declarations ~loc ~equality:true env
+              (Path.last path) decl' id
+              (Subst.type_declaration
+                 (Subst.add_type id path Subst.identity)
+                 decl)
+        in
+        if err <> [] then raise (Error (loc, Definition_mismatch (ty, err)))
+      with Not_found -> raise (Error (loc, Unavailable_type_constructor path)))
+    | _ -> raise (Error (loc, Definition_mismatch (ty, []))))
+  | _ -> ()
+
+let check_abbrev env sdecl (id, decl) =
+  check_coherence env sdecl.ptype_loc id decl
+
+(* Check that recursion is well-founded *)
+
+let check_well_founded env loc path to_check ty =
+  let visited = ref TypeMap.empty in
+  let rec check ty0 parents ty =
+    let ty = Btype.repr ty in
+    if TypeSet.mem ty parents then
+      (*Format.eprintf "@[%a@]@." Printtyp.raw_type_expr ty;*)
+      if
+        match ty0.desc with
+        | Tconstr (p, _, _) -> Path.same p path
+        | _ -> false
+      then raise (Error (loc, Recursive_abbrev (Path.name path)))
+      else raise (Error (loc, Cycle_in_def (Path.name path, ty0)));
+    let fini, parents =
+      try
+        let prev = TypeMap.find ty !visited in
+        if TypeSet.subset parents prev then (true, parents)
+        else (false, TypeSet.union parents prev)
+      with Not_found -> (false, parents)
+    in
+    if fini then ()
+    else
+      let rec_ok =
+        match ty.desc with
+        | Tconstr (_p, _, _) ->
+          false (*!Clflags.recursive_types && Ctype.is_contractive env p*)
+        | Tobject _ | Tvariant _ -> true
+        | _ -> false (* !Clflags.recursive_types*)
+      in
+      let visited' = TypeMap.add ty parents !visited in
+      let arg_exn =
+        try
+          visited := visited';
+          let parents =
+            if rec_ok then TypeSet.empty else TypeSet.add ty parents
+          in
+          Btype.iter_type_expr (check ty0 parents) ty;
+          None
+        with e ->
+          visited := visited';
+          Some e
+      in
+      match ty.desc with
+      | Tconstr (p, _, _) when arg_exn <> None || to_check p -> (
+        if to_check p then may raise arg_exn
+        else Btype.iter_type_expr (check ty0 TypeSet.empty) ty;
+        try
+          let ty' = Ctype.try_expand_once_opt env ty in
+          let ty0 = if TypeSet.is_empty parents then ty else ty0 in
+          check ty0 (TypeSet.add ty parents) ty'
+        with Ctype.Cannot_expand -> may raise arg_exn)
+      | _ -> may raise arg_exn
+  in
+  let snap = Btype.snapshot () in
+  try Ctype.wrap_trace_gadt_instances env (check ty TypeSet.empty) ty
+  with Ctype.Unify _ ->
+    (* Will be detected by check_recursion *)
+    Btype.backtrack snap
+
+let check_well_founded_manifest env loc path decl =
+  if decl.type_manifest = None then ()
+  else
+    let args = List.map (fun _ -> Ctype.newvar ()) decl.type_params in
+    check_well_founded env loc path (Path.same path) (Ctype.newconstr path args)
+
+let check_well_founded_decl env loc path decl to_check =
+  let open Btype in
+  let it =
+    {
+      type_iterators with
+      it_type_expr = (fun _ -> check_well_founded env loc path to_check);
+    }
+  in
+  it.it_type_declaration it (Ctype.instance_declaration decl)
+
+(* Check for ill-defined abbrevs *)
+
+let check_recursion env loc path decl to_check =
+  (* to_check is true for potentially mutually recursive paths.
+     (path, decl) is the type declaration to be checked. *)
+  if decl.type_params = [] then ()
+  else
+    let visited = ref [] in
+
+    let rec check_regular cpath args prev_exp ty =
+      let ty = Ctype.repr ty in
+      if not (List.memq ty !visited) then (
+        visited := ty :: !visited;
+        match ty.desc with
+        | Tconstr (path', args', _) ->
+          (if Path.same path path' then (
+             if not (Ctype.equal env false args args') then
+               raise
+                 (Error
+                    ( loc,
+                      Parameters_differ (cpath, ty, Ctype.newconstr path args)
+                    )))
+           else if
+             (* Attempt to expand a type abbreviation if:
+                 1- [to_check path'] holds
+                    (otherwise the expansion cannot involve [path]);
+                 2- we haven't expanded this type constructor before
+                    (otherwise we could loop if [path'] is itself
+                    a non-regular abbreviation). *)
+             to_check path' && not (List.mem path' prev_exp)
+           then
+             try
+               (* Attempt expansion *)
+               let params0, body0, _ = Env.find_type_expansion path' env in
+               let params, body =
+                 Ctype.instance_parameterized_type params0 body0
+               in
+               (try List.iter2 (Ctype.unify env) params args'
+                with Ctype.Unify _ ->
+                  raise
+                    (Error
+                       ( loc,
+                         Constraint_failed (ty, Ctype.newconstr path' params0)
+                       )));
+               check_regular path' args (path' :: prev_exp) body
+             with Not_found -> ());
+          List.iter (check_regular cpath args prev_exp) args'
+        | Tpoly (ty, tl) ->
+          let _, ty = Ctype.instance_poly ~keep_names:true false tl ty in
+          check_regular cpath args prev_exp ty
+        | _ -> Btype.iter_type_expr (check_regular cpath args prev_exp) ty)
+    in
+
+    Misc.may
+      (fun body ->
+        let args, body =
+          Ctype.instance_parameterized_type ~keep_names:true decl.type_params
+            body
+        in
+        check_regular path args [] body)
+      decl.type_manifest
+
+let check_abbrev_recursion env id_loc_list to_check tdecl =
+  let decl = tdecl.typ_type in
+  let id = tdecl.typ_id in
+  check_recursion env (List.assoc id id_loc_list) (Path.Pident id) decl to_check
+
+(* Compute variance *)
+
+let get_variance ty visited =
+  try TypeMap.find ty !visited with Not_found -> Variance.null
+
+let compute_variance env visited vari ty =
+  let rec compute_variance_rec vari ty =
+    (* Format.eprintf "%a: %x@." Printtyp.type_expr ty (Obj.magic vari); *)
+    let ty = Ctype.repr ty in
+    let vari' = get_variance ty visited in
+    if Variance.subset vari vari' then ()
+    else
+      let vari = Variance.union vari vari' in
+      visited := TypeMap.add ty vari !visited;
+      let compute_same = compute_variance_rec vari in
+      match ty.desc with
+      | Tarrow (arg, ret, _, _) ->
+        let open Variance in
+        let v = conjugate vari in
+        let v1 =
+          if mem May_pos v || mem May_neg v then set May_weak true v else v
+        in
+        compute_variance_rec v1 arg.typ;
+        compute_same ret
+      | Ttuple tl -> List.iter compute_same tl
+      | Tconstr (path, tl, _) -> (
+        let open Variance in
+        if tl = [] then ()
+        else
+          try
+            let decl = Env.find_type path env in
+            let cvari f = mem f vari in
+            List.iter2
+              (fun ty v ->
+                let cv f = mem f v in
+                let strict =
+                  (cvari Inv && cv Inj) || ((cvari Pos || cvari Neg) && cv Inv)
+                in
+                if strict then compute_variance_rec full ty
+                else
+                  let p1 = inter v vari and n1 = inter v (conjugate vari) in
+                  let v1 =
+                    union
+                      (inter covariant (union p1 (conjugate p1)))
+                      (inter (conjugate covariant) (union n1 (conjugate n1)))
+                  and weak =
+                    (cvari May_weak && (cv May_pos || cv May_neg))
+                    || ((cvari May_pos || cvari May_neg) && cv May_weak)
+                  in
+                  let v2 = set May_weak weak v1 in
+                  compute_variance_rec v2 ty)
+              tl decl.type_variance
+          with Not_found -> List.iter (compute_variance_rec may_inv) tl)
+      | Tobject (ty, _) -> compute_same ty
+      | Tfield (_, _, ty1, ty2) ->
+        compute_same ty1;
+        compute_same ty2
+      | Tsubst ty -> compute_same ty
+      | Tvariant row ->
+        let row = Btype.row_repr row in
+        List.iter
+          (fun (_, f) ->
+            match Btype.row_field_repr f with
+            | Rpresent (Some ty) -> compute_same ty
+            | Reither (_, tyl, _, _) ->
+              let open Variance in
+              let upper =
+                List.fold_left
+                  (fun s f -> set f true s)
+                  null
+                  [May_pos; May_neg; May_weak]
+              in
+              let v = inter vari upper in
+              (* cf PR#7269:
+                 if List.length tyl > 1 then upper else inter vari upper *)
+              List.iter (compute_variance_rec v) tyl
+            | _ -> ())
+          row.row_fields;
+        compute_same row.row_more
+      | Tpoly (ty, _) -> compute_same ty
+      | Tvar _ | Tnil | Tlink _ | Tunivar _ -> ()
+      | Tpackage (_, _, tyl) ->
+        let v =
+          Variance.(if mem Pos vari || mem Neg vari then full else may_inv)
+        in
+        List.iter (compute_variance_rec v) tyl
+  in
+  compute_variance_rec vari ty
+
+let make p n i =
+  let open Variance in
+  set May_pos p (set May_neg n (set May_weak n (set Inj i null)))
+
+let compute_variance_type env check (required, loc) decl tyl =
+  (* Requirements *)
+  let required =
+    List.map
+      (fun (c, n, i) -> if c || n then (c, n, i) else (true, true, i))
+      required
+  in
+  (* Prepare *)
+  let params = List.map Btype.repr decl.type_params in
+  let tvl = ref TypeMap.empty in
+  (* Compute occurrences in the body *)
+  let open Variance in
+  List.iter
+    (fun (cn, ty) ->
+      compute_variance env tvl (if cn then full else covariant) ty)
+    tyl;
+  if check then (
+    (* Check variance of parameters *)
+    let pos = ref 0 in
+    List.iter2
+      (fun ty (c, n, i) ->
+        incr pos;
+        let var = get_variance ty tvl in
+        let co, cn = get_upper var and ij = mem Inj var in
+        if
+          Btype.is_Tvar ty && ((co && not c) || (cn && not n) || ((not ij) && i))
+        then raise (Error (loc, Bad_variance (!pos, (co, cn, ij), (c, n, i)))))
+      params required;
+    (* Check propagation from constrained parameters *)
+    let args = Btype.newgenty (Ttuple params) in
+    let fvl = Ctype.free_variables args in
+    let fvl = Ext_list.filter fvl (fun v -> not (List.memq v params)) in
+    (* If there are no extra variables there is nothing to do *)
+    if fvl = [] then ()
+    else
+      let tvl2 = ref TypeMap.empty in
+      List.iter2
+        (fun ty (p, n, _) ->
+          if Btype.is_Tvar ty then ()
+          else
+            let v =
+              if p then if n then full else covariant else conjugate covariant
+            in
+            compute_variance env tvl2 v ty)
+        params required;
+      let visited = ref TypeSet.empty in
+      let rec check ty =
+        let ty = Ctype.repr ty in
+        if TypeSet.mem ty !visited then ()
+        else
+          let visited' = TypeSet.add ty !visited in
+          visited := visited';
+          let v1 = get_variance ty tvl in
+          let snap = Btype.snapshot () in
+          let v2 =
+            TypeMap.fold
+              (fun t vt v ->
+                if Ctype.equal env false [ty] [t] then union vt v else v)
+              !tvl2 null
+          in
+          Btype.backtrack snap;
+          let c1, n1 = get_upper v1 and c2, n2, _, i2 = get_lower v2 in
+          if (c1 && not c2) || (n1 && not n2) then
+            if List.memq ty fvl then
+              let code = if not i2 then -2 else if c2 || n2 then -1 else -3 in
+              raise
+                (Error
+                   (loc, Bad_variance (code, (c1, n1, false), (c2, n2, false))))
+            else Btype.iter_type_expr check ty
+      in
+      List.iter (fun (_, ty) -> check ty) tyl);
+  List.map2
+    (fun ty (p, n, i) ->
+      let v = get_variance ty tvl in
+      let tr = decl.type_private in
+      (* Use required variance where relevant *)
+      let concr =
+        decl.type_kind <> Type_abstract
+        (*|| tr = Type_new*)
+      in
+      let p, n =
+        if tr = Private || not (Btype.is_Tvar ty) then (p, n) (* set *)
+        else (false, false)
+      (* only check *)
+      and i = concr || (i && tr = Private) in
+      let v = union v (make p n i) in
+      let v =
+        if not concr then v
+        else if mem Pos v && mem Neg v then full
+        else if Btype.is_Tvar ty then v
+        else
+          union v
+            (if p then if n then full else covariant else conjugate covariant)
+      in
+      if decl.type_kind = Type_abstract && tr = Public then v
+      else set May_weak (mem May_neg v) v)
+    params required
+
+let add_false = List.map (fun ty -> (false, ty))
+
+(* A parameter is constrained if it is either instantiated,
+   or it is a variable appearing in another parameter *)
+let constrained vars ty =
+  match ty.desc with
+  | Tvar _ -> List.exists (fun tl -> List.memq ty tl) vars
+  | _ -> true
+
+let for_constr = function
+  | Types.Cstr_tuple l -> add_false l
+  | Types.Cstr_record l ->
+    List.map
+      (fun {Types.ld_mutable; ld_type} -> (ld_mutable = Mutable, ld_type))
+      l
+
+let compute_variance_gadt env check ((required, loc) as rloc) decl
+    (tl, ret_type_opt) =
+  match ret_type_opt with
+  | None ->
+    compute_variance_type env check rloc
+      {decl with type_private = Private}
+      (for_constr tl)
+  | Some ret_type -> (
+    match Ctype.repr ret_type with
+    | {desc = Tconstr (_, tyl, _)} ->
+      (* let tyl = List.map (Ctype.expand_head env) tyl in *)
+      let tyl = List.map Ctype.repr tyl in
+      let fvl = List.map (Ctype.free_variables ?env:None) tyl in
+      let _ =
+        List.fold_left2
+          (fun (fv1, fv2) ty (c, n, _) ->
+            match fv2 with
+            | [] -> assert false
+            | fv :: fv2 ->
+              (* fv1 @ fv2 = free_variables of other parameters *)
+              if (c || n) && constrained (fv1 @ fv2) ty then
+                raise (Error (loc, Varying_anonymous));
+              (fv :: fv1, fv2))
+          ([], fvl) tyl required
+      in
+      compute_variance_type env check rloc
+        {decl with type_params = tyl; type_private = Private}
+        (for_constr tl)
+    | _ -> assert false)
+
+let compute_variance_extension env check decl ext rloc =
+  compute_variance_gadt env check rloc
+    {decl with type_params = ext.ext_type_params}
+    (ext.ext_args, ext.ext_ret_type)
+
+let compute_variance_decl env check decl ((required, _) as rloc) =
+  if
+    (decl.type_kind = Type_abstract || decl.type_kind = Type_open)
+    && decl.type_manifest = None
+  then
+    List.map
+      (fun (c, n, i) ->
+        make (not n) (not c) (decl.type_kind <> Type_abstract || i))
+      required
+  else
+    let mn =
+      match decl.type_manifest with
+      | None -> []
+      | Some ty -> [(false, ty)]
+    in
+    match decl.type_kind with
+    | Type_abstract | Type_open -> compute_variance_type env check rloc decl mn
+    | Type_variant tll -> (
+      if List.for_all (fun c -> c.Types.cd_res = None) tll then
+        compute_variance_type env check rloc decl
+          (mn
+          @ List.flatten (List.map (fun c -> for_constr c.Types.cd_args) tll))
+      else
+        let mn = List.map (fun (_, ty) -> (Types.Cstr_tuple [ty], None)) mn in
+        let tll =
+          mn @ List.map (fun c -> (c.Types.cd_args, c.Types.cd_res)) tll
+        in
+        match List.map (compute_variance_gadt env check rloc decl) tll with
+        | vari :: rem ->
+          let varl = List.fold_left (List.map2 Variance.union) vari rem in
+          List.map
+            Variance.(fun v -> if mem Pos v && mem Neg v then full else v)
+            varl
+        | _ -> assert false)
+    | Type_record (ftl, _) ->
+      compute_variance_type env check rloc decl
+        (mn
+        @ List.map
+            (fun {Types.ld_mutable; ld_type} -> (ld_mutable = Mutable, ld_type))
+            ftl)
+
+let is_hash id =
+  let s = Ident.name id in
+  String.length s > 0 && s.[0] = '#'
+
+let marked_as_immediate decl = Builtin_attributes.immediate decl.type_attributes
+
+let compute_immediacy env tdecl =
+  match (tdecl.type_kind, tdecl.type_manifest) with
+  | Type_variant [{cd_args = Cstr_tuple [arg]; _}], _
+  | Type_variant [{cd_args = Cstr_record [{ld_type = arg; _}]; _}], _
+  | Type_record ([{ld_type = arg; _}], _), _
+    when tdecl.type_unboxed.unboxed -> (
+    match get_unboxed_type_representation env arg with
+    | Some argrepr -> not (Ctype.maybe_pointer_type env argrepr)
+    | None -> false)
+  | Type_variant (_ :: _ as cstrs), _ ->
+    not (List.exists (fun c -> c.Types.cd_args <> Types.Cstr_tuple []) cstrs)
+  | Type_abstract, Some typ -> not (Ctype.maybe_pointer_type env typ)
+  | Type_abstract, None -> marked_as_immediate tdecl
+  | _ -> false
+
+(* Computes the fixpoint for the variance and immediacy of type declarations *)
+
+let rec compute_properties_fixpoint env decls required variances immediacies =
+  let new_decls =
+    List.map2
+      (fun (id, decl) (variance, immediacy) ->
+        (id, {decl with type_variance = variance; type_immediate = immediacy}))
+      decls
+      (List.combine variances immediacies)
+  in
+  let new_env =
+    List.fold_right
+      (fun (id, decl) env -> Env.add_type ~check:true id decl env)
+      new_decls env
+  in
+  let new_variances =
+    List.map2
+      (fun (_id, decl) -> compute_variance_decl new_env false decl)
+      new_decls required
+  in
+  let new_variances =
+    List.map2 (List.map2 Variance.union) new_variances variances
+  in
+  let new_immediacies =
+    List.map (fun (_id, decl) -> compute_immediacy new_env decl) new_decls
+  in
+  if new_variances <> variances || new_immediacies <> immediacies then
+    compute_properties_fixpoint env decls required new_variances new_immediacies
+  else (
+    (* List.iter (fun (id, decl) ->
+       Printf.eprintf "%s:" (Ident.name id);
+       List.iter (fun (v : Variance.t) ->
+         Printf.eprintf " %x" (Obj.magic v : int))
+         decl.type_variance;
+       prerr_endline "")
+       new_decls; *)
+    List.iter
+      (fun (_, decl) ->
+        if marked_as_immediate decl && not decl.type_immediate then
+          raise (Error (decl.type_loc, Bad_immediate_attribute))
+        else ())
+      new_decls;
+    List.iter2
+      (fun (id, decl) req ->
+        if not (is_hash id) then
+          ignore (compute_variance_decl new_env true decl req))
+      new_decls required;
+    (new_decls, new_env))
+
+let init_variance (_id, decl) =
+  List.map (fun _ -> Variance.null) decl.type_params
+
+let add_injectivity =
+  List.map (function
+    | Covariant -> (true, false, false)
+    | Contravariant -> (false, true, false)
+    | Invariant -> (false, false, false))
+
+(* Check multiple declarations of labels/constructors *)
+
+let check_duplicates sdecl_list =
+  let labels = Hashtbl.create 7 and constrs = Hashtbl.create 7 in
+  List.iter
+    (fun sdecl ->
+      match sdecl.ptype_kind with
+      | Ptype_variant cl ->
+        List.iter
+          (fun pcd ->
+            try
+              let name' = Hashtbl.find constrs pcd.pcd_name.txt in
+              Location.prerr_warning pcd.pcd_loc
+                (Warnings.Duplicate_definitions
+                   ("constructor", pcd.pcd_name.txt, name', sdecl.ptype_name.txt))
+            with Not_found ->
+              Hashtbl.add constrs pcd.pcd_name.txt sdecl.ptype_name.txt)
+          cl
+      | Ptype_record fl ->
+        List.iter
+          (fun {pld_name = cname; pld_loc = loc} ->
+            try
+              let name' = Hashtbl.find labels cname.txt in
+              if cname.txt <> "..." then
+                Location.prerr_warning loc
+                  (Warnings.Duplicate_definitions
+                     ("label", cname.txt, name', sdecl.ptype_name.txt))
+            with Not_found ->
+              Hashtbl.add labels cname.txt sdecl.ptype_name.txt)
+          fl
+      | Ptype_abstract -> ()
+      | Ptype_open -> ())
+    sdecl_list
+
+(* Force recursion to go through id for private types*)
+let name_recursion sdecl id decl =
+  match decl with
+  | {type_kind = Type_abstract; type_manifest = Some ty; type_private = Private}
+    when is_fixed_type sdecl ->
+    let ty = Ctype.repr ty in
+    let ty' = Btype.newty2 ty.level ty.desc in
+    if Ctype.deep_occur ty ty' then (
+      let td = Tconstr (Path.Pident id, decl.type_params, ref Mnil) in
+      Btype.link_type ty (Btype.newty2 ty.level td);
+      {decl with type_manifest = Some ty'})
+    else decl
+  | _ -> decl
+
+(* Translate a set of type declarations, mutually recursive or not *)
+let transl_type_decl env rec_flag sdecl_list =
+  (* Add dummy types for fixed rows *)
+  let fixed_types = Ext_list.filter sdecl_list is_fixed_type in
+  let sdecl_list =
+    List.map
+      (fun sdecl ->
+        let ptype_name =
+          mkloc (sdecl.ptype_name.txt ^ "#row") sdecl.ptype_name.loc
+        in
+        {
+          sdecl with
+          ptype_name;
+          ptype_kind = Ptype_abstract;
+          ptype_manifest = None;
+        })
+      fixed_types
+    @
+    try sdecl_list |> Variant_type_spread.expand_variant_spreads env with
+    | Variant_coercion.VariantConfigurationError
+        (VariantError {left_loc} as err) ->
+      raise (Error (left_loc, Variant_runtime_representation_mismatch err))
+    | Variant_type_spread.VariantTypeSpreadError (loc, err) ->
+      raise (Error (loc, Variant_spread_fail err))
+  in
+
+  (* Create identifiers. *)
+  let id_list =
+    List.map (fun sdecl -> Ident.create sdecl.ptype_name.txt) sdecl_list
+  in
+  (*
+     Since we've introduced fresh idents, make sure the definition
+     level is at least the binding time of these events. Otherwise,
+     passing one of the recursively-defined type constrs as argument
+     to an abbreviation may fail.
+  *)
+  Ctype.init_def (Ident.current_time ());
+  Ctype.begin_def ();
+  (* Enter types. *)
+  let temp_env = List.fold_left2 (enter_type rec_flag) env sdecl_list id_list in
+  (* Translate each declaration. *)
+  let current_slot = ref None in
+  let warn_unused = Warnings.is_active (Warnings.Unused_type_declaration "") in
+  let id_slots id =
+    match rec_flag with
+    | Asttypes.Recursive when warn_unused ->
+      (* See typecore.ml for a description of the algorithm used
+           to detect unused declarations in a set of recursive definitions. *)
+      let slot = ref [] in
+      let td = Env.find_type (Path.Pident id) temp_env in
+      let name = Ident.name id in
+      Env.set_type_used_callback name td (fun old_callback ->
+          match !current_slot with
+          | Some slot -> slot := (name, td) :: !slot
+          | None ->
+            List.iter
+              (fun (name, d) -> Env.mark_type_used env name d)
+              (get_ref slot);
+            old_callback ());
+      (id, Some slot)
+    | Asttypes.Recursive | Asttypes.Nonrecursive -> (id, None)
+  in
+  let type_record_as_object = ref false in
+  let untagged_wfc = ref [] in
+  let transl_declaration name_sdecl (id, slot) =
+    current_slot := slot;
+    Builtin_attributes.warning_scope name_sdecl.ptype_attributes (fun () ->
+        transl_declaration ~type_record_as_object ~untagged_wfc temp_env
+          name_sdecl id)
+  in
+  let tdecls =
+    List.map2 transl_declaration sdecl_list (List.map id_slots id_list)
+  in
+  let inline_types =
+    tdecls
+    |> List.filter (fun tdecl ->
+           tdecl.typ_attributes
+           |> List.find_opt (fun (({txt}, _) : Parsetree.attribute) ->
+                  txt = "res.inlineRecordDefinition")
+           |> Option.is_some)
+    |> List.filter_map (fun tdecl ->
+           match tdecl.typ_type.type_kind with
+           | Type_record (labels, _) ->
+             Some (Record {type_name = tdecl.typ_name.txt; labels})
+           | _ -> None)
+  in
+  let decls =
+    List.map
+      (fun tdecl ->
+        (tdecl.typ_id, {tdecl.typ_type with type_inlined_types = inline_types}))
+      tdecls
+  in
+  let sdecl_list =
+    Variant_type_spread.expand_dummy_constructor_args sdecl_list decls
+  in
+  current_slot := None;
+  (* Check for duplicates *)
+  check_duplicates sdecl_list;
+  (* Build the final env. *)
+  let newenv =
+    List.fold_right
+      (fun (id, decl) env -> Env.add_type ~check:true id decl env)
+      decls env
+  in
+  (* Update stubs *)
+  (match rec_flag with
+  | Asttypes.Nonrecursive -> ()
+  | Asttypes.Recursive ->
+    List.iter2
+      (fun id sdecl -> update_type temp_env newenv id sdecl.ptype_loc)
+      id_list sdecl_list);
+  (* Generalize type declarations. *)
+  Ctype.end_def ();
+  List.iter (fun (_, decl) -> generalize_decl decl) decls;
+  (* Check for ill-formed abbrevs *)
+  let id_loc_list =
+    List.map2 (fun id sdecl -> (id, sdecl.ptype_loc)) id_list sdecl_list
+  in
+  List.iter
+    (fun (id, decl) ->
+      check_well_founded_manifest newenv
+        (List.assoc id id_loc_list)
+        (Path.Pident id) decl)
+    decls;
+  let to_check = function
+    | Path.Pident id -> List.mem_assoc id id_loc_list
+    | _ -> false
+  in
+  List.iter
+    (fun (id, decl) ->
+      check_well_founded_decl newenv
+        (List.assoc id id_loc_list)
+        (Path.Pident id) decl to_check)
+    decls;
+  List.iter (check_abbrev_recursion newenv id_loc_list to_check) tdecls;
+  (* Check that all type variables are closed *)
+  List.iter2
+    (fun sdecl tdecl ->
+      let decl = tdecl.typ_type in
+      match Ctype.closed_type_decl decl with
+      | Some ty -> raise (Error (sdecl.ptype_loc, Unbound_type_var (ty, decl)))
+      | None -> ())
+    sdecl_list tdecls;
+  (* Check that constraints are enforced *)
+  List.iter
+    (fun check -> Ast_untagged_variants.check_well_formed ~env:newenv check)
+    !untagged_wfc;
+  List.iter2 (check_constraints ~type_record_as_object newenv) sdecl_list decls;
+  (* Name recursion *)
+  let decls =
+    List.map2
+      (fun sdecl (id, decl) -> (id, name_recursion sdecl id decl))
+      sdecl_list decls
+  in
+  (* Add variances to the environment *)
+  let required =
+    List.map
+      (fun sdecl ->
+        (add_injectivity (List.map snd sdecl.ptype_params), sdecl.ptype_loc))
+      sdecl_list
+  in
+  let final_decls, final_env =
+    compute_properties_fixpoint env decls required
+      (List.map init_variance decls)
+      (List.map (fun _ -> false) decls)
+  in
+  (* Check re-exportation *)
+  List.iter2 (check_abbrev final_env) sdecl_list final_decls;
+  (* Keep original declaration *)
+  let final_decls =
+    List.map2
+      (fun tdecl (_id2, decl) -> {tdecl with typ_type = decl})
+      tdecls final_decls
+  in
+  (* Done *)
+  (final_decls, final_env)
+
+(* Translating type extensions *)
+
+let transl_extension_constructor env type_path type_params typext_params priv
+    sext =
+  let id = Ident.create sext.pext_name.txt in
+  let args, ret_type, kind =
+    match sext.pext_kind with
+    | Pext_decl (sargs, sret_type) ->
+      let targs, tret_type, args, ret_type, _ =
+        make_constructor env type_path typext_params sargs sret_type
+      in
+      (args, ret_type, Text_decl (targs, tret_type))
+    | Pext_rebind lid ->
+      let cdescr = Typetexp.find_constructor env lid.loc lid.txt in
+      let usage =
+        if cdescr.cstr_private = Private || priv = Public then Env.Positive
+        else Env.Privatize
+      in
+      Env.mark_constructor usage env (Longident.last lid.txt) cdescr;
+      let args, cstr_res = Ctype.instance_constructor cdescr in
+      let res, ret_type =
+        if cdescr.cstr_generalized then
+          let params = Ctype.instance_list env type_params in
+          let res = Ctype.newconstr type_path params in
+          let ret_type = Some (Ctype.newconstr type_path params) in
+          (res, ret_type)
+        else (Ctype.newconstr type_path typext_params, None)
+      in
+      (try Ctype.unify env cstr_res res
+       with Ctype.Unify trace ->
+         raise (Error (lid.loc, Rebind_wrong_type (lid.txt, env, trace))));
+      (* Remove "_" names from parameters used in the constructor *)
+      (if not cdescr.cstr_generalized then
+         let vars = Ctype.free_variables (Btype.newgenty (Ttuple args)) in
+         List.iter
+           (function
+             | {desc = Tvar (Some "_")} as ty ->
+               if List.memq ty vars then ty.desc <- Tvar None
+             | _ -> ())
+           typext_params);
+      (* Ensure that constructor's type matches the type being extended *)
+      let cstr_type_path, cstr_type_params =
+        match cdescr.cstr_res.desc with
+        | Tconstr (p, _, _) ->
+          let decl = Env.find_type p env in
+          (p, decl.type_params)
+        | _ -> assert false
+      in
+      let cstr_types =
+        Btype.newgenty (Tconstr (cstr_type_path, cstr_type_params, ref Mnil))
+        :: cstr_type_params
+      in
+      let ext_types =
+        Btype.newgenty (Tconstr (type_path, type_params, ref Mnil))
+        :: type_params
+      in
+      if not (Ctype.equal env true cstr_types ext_types) then
+        raise
+          (Error (lid.loc, Rebind_mismatch (lid.txt, cstr_type_path, type_path)));
+      (* Disallow rebinding private constructors to non-private *)
+      (match (cdescr.cstr_private, priv) with
+      | Private, Public -> raise (Error (lid.loc, Rebind_private lid.txt))
+      | _ -> ());
+      let path =
+        match cdescr.cstr_tag with
+        | Cstr_extension path -> path
+        | _ -> assert false
+      in
+      let args =
+        match cdescr.cstr_inlined with
+        | None -> Types.Cstr_tuple args
+        | Some decl ->
+          let tl =
+            match args with
+            | [{desc = Tconstr (_, tl, _)}] -> tl
+            | _ -> assert false
+          in
+          let decl = Ctype.instance_declaration decl in
+          assert (List.length decl.type_params = List.length tl);
+          List.iter2 (Ctype.unify env) decl.type_params tl;
+          let lbls =
+            match decl.type_kind with
+            | Type_record (lbls, Record_extension) -> lbls
+            | _ -> assert false
+          in
+          Types.Cstr_record lbls
+      in
+      (args, ret_type, Text_rebind (path, lid))
+  in
+  let is_exception = Path.same type_path Predef.path_exn in
+  let ext =
+    {
+      Types.ext_type_path = type_path;
+      ext_type_params = typext_params;
+      ext_args = args;
+      ext_ret_type = ret_type;
+      ext_private = priv;
+      ext_loc = sext.pext_loc;
+      ext_attributes = sext.pext_attributes;
+      ext_is_exception = is_exception;
+    }
+  in
+  {
+    Typedtree.ext_id = id;
+    ext_name = sext.pext_name;
+    ext_type = ext;
+    ext_kind = kind;
+    ext_loc = sext.pext_loc;
+    ext_attributes = sext.pext_attributes;
+  }
+
+let transl_extension_constructor env type_path type_params typext_params priv
+    sext =
+  Builtin_attributes.warning_scope sext.pext_attributes (fun () ->
+      transl_extension_constructor env type_path type_params typext_params priv
+        sext)
+
+let transl_type_extension extend env loc styext =
+  reset_type_variables ();
+  Ctype.begin_def ();
+  let type_path, type_decl =
+    let lid = styext.ptyext_path in
+    Typetexp.find_type env lid.loc lid.txt
+  in
+  (match type_decl.type_kind with
+  | Type_open -> (
+    match type_decl.type_private with
+    | Private when extend -> (
+      match
+        List.find
+          (function
+            | {pext_kind = Pext_decl _} -> true
+            | {pext_kind = Pext_rebind _} -> false)
+          styext.ptyext_constructors
+      with
+      | {pext_loc} ->
+        raise (Error (pext_loc, Cannot_extend_private_type type_path))
+      | exception Not_found -> ())
+    | _ -> ())
+  | _ -> raise (Error (loc, Not_extensible_type type_path)));
+  let type_variance =
+    List.map
+      (fun v ->
+        let co, cn = Variance.get_upper v in
+        (not cn, not co, false))
+      type_decl.type_variance
+  in
+  let err =
+    if type_decl.type_arity <> List.length styext.ptyext_params then
+      [Includecore.Arity]
+    else if
+      List.for_all2
+        (fun (c1, n1, _) (c2, n2, _) -> ((not c2) || c1) && ((not n2) || n1))
+        type_variance
+        (add_injectivity (List.map snd styext.ptyext_params))
+    then []
+    else [Includecore.Variance]
+  in
+  if err <> [] then raise (Error (loc, Extension_mismatch (type_path, err)));
+  let ttype_params = make_params env styext.ptyext_params in
+  let type_params = List.map (fun (cty, _) -> cty.ctyp_type) ttype_params in
+  List.iter2 (Ctype.unify_var env)
+    (Ctype.instance_list env type_decl.type_params)
+    type_params;
+  let constructors =
+    List.map
+      (transl_extension_constructor env type_path type_decl.type_params
+         type_params styext.ptyext_private)
+      styext.ptyext_constructors
+  in
+  Ctype.end_def ();
+  (* Generalize types *)
+  List.iter Ctype.generalize type_params;
+  List.iter
+    (fun ext ->
+      Btype.iter_type_expr_cstr_args Ctype.generalize ext.ext_type.ext_args;
+      may Ctype.generalize ext.ext_type.ext_ret_type)
+    constructors;
+  (* Check that all type variables are closed *)
+  List.iter
+    (fun ext ->
+      match Ctype.closed_extension_constructor ext.ext_type with
+      | Some ty ->
+        raise (Error (ext.ext_loc, Unbound_type_var_ext (ty, ext.ext_type)))
+      | None -> ())
+    constructors;
+  (* Check variances are correct *)
+  List.iter
+    (fun ext ->
+      ignore
+        (compute_variance_extension env true type_decl ext.ext_type
+           (type_variance, loc)))
+    constructors;
+  (* Add extension constructors to the environment *)
+  let newenv =
+    List.fold_left
+      (fun env ext -> Env.add_extension ~check:true ext.ext_id ext.ext_type env)
+      env constructors
+  in
+  let tyext =
+    {
+      tyext_path = type_path;
+      tyext_txt = styext.ptyext_path;
+      tyext_params = ttype_params;
+      tyext_constructors = constructors;
+      tyext_private = styext.ptyext_private;
+      tyext_attributes = styext.ptyext_attributes;
+    }
+  in
+  (tyext, newenv)
+
+let transl_type_extension extend env loc styext =
+  Builtin_attributes.warning_scope styext.ptyext_attributes (fun () ->
+      transl_type_extension extend env loc styext)
+
+let transl_exception env sext =
+  reset_type_variables ();
+  Ctype.begin_def ();
+  let ext =
+    transl_extension_constructor env Predef.path_exn [] [] Asttypes.Public sext
+  in
+  Ctype.end_def ();
+  (* Generalize types *)
+  Btype.iter_type_expr_cstr_args Ctype.generalize ext.ext_type.ext_args;
+  may Ctype.generalize ext.ext_type.ext_ret_type;
+  (* Check that all type variables are closed *)
+  (match Ctype.closed_extension_constructor ext.ext_type with
+  | Some ty ->
+    raise (Error (ext.ext_loc, Unbound_type_var_ext (ty, ext.ext_type)))
+  | None -> ());
+  let newenv = Env.add_extension ~check:true ext.ext_id ext.ext_type env in
+  (ext, newenv)
+
+let rec arity_from_arrow_type env core_type ty =
+  match (core_type.ptyp_desc, (Ctype.repr ty).desc) with
+  | Ptyp_arrow {ret = ct2}, Tarrow (_, ret, _, _) ->
+    1 + arity_from_arrow_type env ct2 ret
+  | Ptyp_arrow _, _ | _, Tarrow _ -> assert false
+  | _ -> 0
+
+let parse_arity env core_type ty =
+  match Ctype.get_arity env ty with
+  | Some arity ->
+    let from_constructor =
+      match ty.desc with
+      | Tconstr (_, _, _) -> true
+      | _ -> false
+    in
+    (arity, from_constructor)
+  | None -> (arity_from_arrow_type env core_type ty, false)
+
+(* Translate a value declaration *)
+let transl_value_decl env loc valdecl =
+  let cty = Typetexp.transl_type_scheme env valdecl.pval_type in
+  let ty = cty.ctyp_type in
+  let v =
+    match valdecl.pval_prim with
+    | [] when Env.is_in_signature env ->
+      {
+        val_type = ty;
+        val_kind = Val_reg;
+        Types.val_loc = loc;
+        val_attributes = valdecl.pval_attributes;
+      }
+    | [] -> raise (Error (valdecl.pval_loc, Val_in_structure))
+    | _ ->
+      let arity, from_constructor = parse_arity env valdecl.pval_type ty in
+      let prim = Primitive.parse_declaration valdecl ~arity ~from_constructor in
+      let prim_native_name = prim.prim_native_name in
+      if
+        prim.prim_arity = 0
+        && (not
+              (String.length prim_native_name >= 20
+              && String.unsafe_get prim_native_name 0 = '\132'
+              && String.unsafe_get prim_native_name 1 = '\149'))
+        && (prim.prim_name = ""
+           || (prim.prim_name.[0] <> '%' && prim.prim_name.[0] <> '#'))
+      then raise (Error (valdecl.pval_type.ptyp_loc, Null_arity_external));
+      {
+        val_type = ty;
+        val_kind = Val_prim prim;
+        Types.val_loc = loc;
+        val_attributes = valdecl.pval_attributes;
+      }
+  in
+  let id, newenv =
+    Env.enter_value valdecl.pval_name.txt v env ~check:(fun s ->
+        Warnings.Unused_value_declaration s)
+  in
+  let desc =
+    {
+      val_id = id;
+      val_name = valdecl.pval_name;
+      val_desc = cty;
+      val_val = v;
+      val_prim = valdecl.pval_prim;
+      val_loc = valdecl.pval_loc;
+      val_attributes = valdecl.pval_attributes;
+    }
+  in
+  (desc, newenv)
+
+let transl_value_decl env loc valdecl =
+  Builtin_attributes.warning_scope valdecl.pval_attributes (fun () ->
+      transl_value_decl env loc valdecl)
+
+(* Translate a "with" constraint -- much simplified version of
+    transl_type_decl. *)
+let transl_with_constraint env id row_path orig_decl sdecl =
+  Env.mark_type_used env (Ident.name id) orig_decl;
+  reset_type_variables ();
+  Ctype.begin_def ();
+  let tparams = make_params env sdecl.ptype_params in
+  let params = List.map (fun (cty, _) -> cty.ctyp_type) tparams in
+  let orig_decl = Ctype.instance_declaration orig_decl in
+  let arity_ok = List.length params = orig_decl.type_arity in
+  if arity_ok then List.iter2 (Ctype.unify_var env) params orig_decl.type_params;
+  let constraints =
+    List.map
+      (function
+        | ty, ty', loc -> (
+          try
+            let cty = transl_simple_type env false ty in
+            let cty' = transl_simple_type env false ty' in
+            let ty = cty.ctyp_type in
+            let ty' = cty'.ctyp_type in
+            Ctype.unify env ty ty';
+            (cty, cty', loc)
+          with Ctype.Unify tr ->
+            raise (Error (loc, Inconsistent_constraint (env, tr)))))
+      sdecl.ptype_cstrs
+  in
+  let no_row = not (is_fixed_type sdecl) in
+  let tman, man =
+    match sdecl.ptype_manifest with
+    | None -> (None, None)
+    | Some sty ->
+      let cty = transl_simple_type env no_row sty in
+      (Some cty, Some cty.ctyp_type)
+  in
+  let priv =
+    if sdecl.ptype_private = Private then Private
+    else if arity_ok && orig_decl.type_kind <> Type_abstract then
+      orig_decl.type_private
+    else sdecl.ptype_private
+  in
+  if
+    arity_ok
+    && orig_decl.type_kind <> Type_abstract
+    && sdecl.ptype_private = Private
+  then Location.deprecated sdecl.ptype_loc "spurious use of private";
+  let type_kind, type_unboxed =
+    if arity_ok && man <> None then (orig_decl.type_kind, orig_decl.type_unboxed)
+    else (Type_abstract, unboxed_false_default_false)
+  in
+  let decl =
+    {
+      type_params = params;
+      type_arity = List.length params;
+      type_kind;
+      type_private = priv;
+      type_manifest = man;
+      type_variance = [];
+      type_newtype_level = None;
+      type_loc = sdecl.ptype_loc;
+      type_attributes = sdecl.ptype_attributes;
+      type_immediate = false;
+      type_unboxed;
+      type_inlined_types = [];
+    }
+  in
+  (match row_path with
+  | None -> ()
+  | Some p -> set_fixed_row env sdecl.ptype_loc p decl);
+  (match Ctype.closed_type_decl decl with
+  | None -> ()
+  | Some ty -> raise (Error (sdecl.ptype_loc, Unbound_type_var (ty, decl))));
+  let decl = name_recursion sdecl id decl in
+  let type_variance =
+    compute_variance_decl env true decl
+      (add_injectivity (List.map snd sdecl.ptype_params), sdecl.ptype_loc)
+  in
+  let type_immediate = compute_immediacy env decl in
+  let decl = {decl with type_variance; type_immediate} in
+  Ctype.end_def ();
+  generalize_decl decl;
+  {
+    typ_id = id;
+    typ_name = sdecl.ptype_name;
+    typ_params = tparams;
+    typ_type = decl;
+    typ_cstrs = constraints;
+    typ_loc = sdecl.ptype_loc;
+    typ_manifest = tman;
+    typ_kind = Ttype_abstract;
+    typ_private = sdecl.ptype_private;
+    typ_attributes = sdecl.ptype_attributes;
+  }
+
+(* Approximate a type declaration: just make all types abstract *)
+
+let abstract_type_decl arity =
+  let rec make_params n =
+    if n <= 0 then [] else Ctype.newvar () :: make_params (n - 1)
+  in
+  Ctype.begin_def ();
+  let decl =
+    {
+      type_params = make_params arity;
+      type_arity = arity;
+      type_kind = Type_abstract;
+      type_private = Public;
+      type_manifest = None;
+      type_variance = replicate_list Variance.full arity;
+      type_newtype_level = None;
+      type_loc = Location.none;
+      type_attributes = [];
+      type_immediate = false;
+      type_unboxed = unboxed_false_default_false;
+      type_inlined_types = [];
+    }
+  in
+  Ctype.end_def ();
+  generalize_decl decl;
+  decl
+
+let approx_type_decl sdecl_list =
+  List.map
+    (fun sdecl ->
+      ( Ident.create sdecl.ptype_name.txt,
+        abstract_type_decl (List.length sdecl.ptype_params) ))
+    sdecl_list
+
+(* Variant of check_abbrev_recursion to check the well-formedness
+   conditions on type abbreviations defined within recursive modules. *)
+
+let check_recmod_typedecl env loc recmod_ids path decl =
+  (* recmod_ids is the list of recursively-defined module idents.
+     (path, decl) is the type declaration to be checked. *)
+  let to_check path = List.exists (fun id -> Path.isfree id path) recmod_ids in
+  check_well_founded_decl env loc path decl to_check;
+  check_recursion env loc path decl to_check
+
+(**** Error report ****)
+
+open Format
+
+let explain_unbound_gen ppf tv tl typ kwd pr =
+  try
+    let ti = List.find (fun ti -> Ctype.deep_occur tv (typ ti)) tl in
+    let ty0 =
+      (* Hack to force aliasing when needed *)
+      Btype.newgenty (Tobject (tv, ref None))
+    in
+    Printtyp.reset_and_mark_loops_list [typ ti; ty0];
+    fprintf ppf ".@.@[<hov2>In %s@ %a@;<1 -2>the variable %a is unbound@]" kwd
+      pr ti Printtyp.type_expr tv
+  with Not_found -> ()
+
+let explain_unbound ppf tv tl typ kwd lab =
+  explain_unbound_gen ppf tv tl typ kwd (fun ppf ti ->
+      fprintf ppf "%s%a" (lab ti) Printtyp.type_expr (typ ti))
+
+let explain_unbound_single ppf tv ty =
+  let trivial ty =
+    explain_unbound ppf tv [ty] (fun t -> t) "type" (fun _ -> "")
+  in
+  match (Ctype.repr ty).desc with
+  | Tobject (fi, _) ->
+    let tl, rv = Ctype.flatten_fields fi in
+    if rv == tv then trivial ty
+    else
+      explain_unbound ppf tv tl
+        (fun (_, _, t) -> t)
+        "method"
+        (fun (lab, _, _) -> lab ^ ": ")
+  | Tvariant row ->
+    let row = Btype.row_repr row in
+    if row.row_more == tv then trivial ty
+    else
+      explain_unbound ppf tv row.row_fields
+        (fun (_l, f) ->
+          match Btype.row_field_repr f with
+          | Rpresent (Some t) -> t
+          | Reither (_, [t], _, _) -> t
+          | Reither (_, tl, _, _) -> Btype.newgenty (Ttuple tl)
+          | _ -> Btype.newgenty (Ttuple []))
+        "case"
+        (fun (lab, _) -> "`" ^ lab ^ " of ")
+  | _ -> trivial ty
+
+let tys_of_constr_args = function
+  | Types.Cstr_tuple tl -> tl
+  | Types.Cstr_record lbls -> List.map (fun l -> l.Types.ld_type) lbls
+
+let report_error ppf = function
+  | Repeated_parameter -> fprintf ppf "A type parameter occurs several times"
+  | Duplicate_constructor s -> fprintf ppf "Two constructors are named %s" s
+  | Duplicate_label (s, None) ->
+    fprintf ppf
+      "The field @{<info>%s@} is defined several times in this record. Fields \
+       can only be added once to a record."
+      s
+  | Object_spread_with_record_field field_name ->
+    fprintf ppf
+      "@[You cannot mix a record field with an object type spread.@\n\
+       Remove the record field or change it to an object field (e.g. \"%s\": \
+       ...).@]"
+      field_name
+  | Invalid_attribute msg -> fprintf ppf "%s" msg
+  | Duplicate_label (s, Some record_name) ->
+    fprintf ppf
+      "The field @{<info>%s@} is defined several times in the record \
+       @{<info>%s@}. Fields can only be added once to a record."
+      s record_name
+  | Recursive_abbrev s -> fprintf ppf "The type abbreviation %s is cyclic" s
+  | Cycle_in_def (s, ty) ->
+    Printtyp.reset_and_mark_loops ty;
+    fprintf ppf "@[<v>The definition of %s contains a cycle:@ %a@]" s
+      Printtyp.type_expr ty
+  | Definition_mismatch (ty, errs) ->
+    Printtyp.reset_and_mark_loops ty;
+    fprintf ppf "@[<v>@[<hov>%s@ %s@;<1 2>%a@]%a@]"
+      "This variant or record definition" "does not match that of type"
+      Printtyp.type_expr ty
+      (Includecore.report_type_mismatch "the original" "this" "definition")
+      errs
+  | Constraint_failed (ty, ty') ->
+    Printtyp.reset_and_mark_loops ty;
+    Printtyp.mark_loops ty';
+    fprintf ppf "@[%s@ @[<hv>Type@ %a@ should be an instance of@ %a@]@]"
+      "Constraints are not satisfied in this type." Printtyp.type_expr ty
+      Printtyp.type_expr ty'
+  | Parameters_differ (path, ty, ty') ->
+    Printtyp.reset_and_mark_loops ty;
+    Printtyp.mark_loops ty';
+    fprintf ppf "@[<hv>In the definition of %s, type@ %a@ should be@ %a@]"
+      (Path.name path) Printtyp.type_expr ty Printtyp.type_expr ty'
+  | Inconsistent_constraint (env, trace) ->
+    fprintf ppf "The type constraints are not consistent.@.";
+    Printtyp.report_unification_error ppf env trace
+      (fun ppf -> fprintf ppf "Type")
+      (fun ppf -> fprintf ppf "is not compatible with type")
+  | Type_clash (env, trace) ->
+    Printtyp.report_unification_error ppf env trace
+      (function
+        | ppf -> fprintf ppf "This type constructor expands to type")
+      (function ppf -> fprintf ppf "but is used here with type")
+  | Null_arity_external -> fprintf ppf "External identifiers must be functions"
+  | Unbound_type_var (ty, decl) -> (
+    fprintf ppf "A type variable is unbound in this type declaration";
+    let ty = Ctype.repr ty in
+    match (decl.type_kind, decl.type_manifest) with
+    | Type_variant tl, _ ->
+      explain_unbound_gen ppf ty tl
+        (fun c ->
+          let tl = tys_of_constr_args c.Types.cd_args in
+          Btype.newgenty (Ttuple tl))
+        "case"
+        (fun ppf c ->
+          fprintf ppf "%s of %a" (Ident.name c.Types.cd_id)
+            Printtyp.constructor_arguments c.Types.cd_args)
+    | Type_record (tl, _), _ ->
+      explain_unbound ppf ty tl
+        (fun l -> l.Types.ld_type)
+        "field"
+        (fun l -> Ident.name l.Types.ld_id ^ ": ")
+    | Type_abstract, Some ty' -> explain_unbound_single ppf ty ty'
+    | _ -> ())
+  | Unbound_type_var_ext (ty, ext) ->
+    fprintf ppf "A type variable is unbound in this extension constructor";
+    let args = tys_of_constr_args ext.ext_args in
+    explain_unbound ppf ty args (fun c -> c) "type" (fun _ -> "")
+  | Cannot_extend_private_type path ->
+    fprintf ppf "@[%s@ %a@]" "Cannot extend private type definition"
+      Printtyp.path path
+  | Not_extensible_type path ->
+    fprintf ppf "@[%s@ %a@ %s@]" "Type definition" Printtyp.path path
+      "is not extensible"
+  | Extension_mismatch (path, errs) ->
+    fprintf ppf "@[<v>@[<hov>%s@ %s@;<1 2>%s@]%a@]" "This extension"
+      "does not match the definition of type" (Path.name path)
+      (Includecore.report_type_mismatch "the type" "this extension" "definition")
+      errs
+  | Rebind_wrong_type (lid, env, trace) ->
+    Printtyp.report_unification_error ppf env trace
+      (function
+        | ppf ->
+          fprintf ppf "The constructor %a@ has type" Printtyp.longident lid)
+      (function ppf -> fprintf ppf "but was expected to be of type")
+  | Rebind_mismatch (lid, p, p') ->
+    fprintf ppf "@[%s@ %a@ %s@ %s@ %s@ %s@ %s@]" "The constructor"
+      Printtyp.longident lid "extends type" (Path.name p)
+      "whose declaration does not match" "the declaration of type"
+      (Path.name p')
+  | Rebind_private lid ->
+    fprintf ppf "@[%s@ %a@ %s@]" "The constructor" Printtyp.longident lid
+      "is private"
+  | Bad_variance (n, v1, v2) ->
+    let variance (p, n, i) =
+      let inj = if i then "injective " else "" in
+      match (p, n) with
+      | true, true -> inj ^ "invariant"
+      | true, false -> inj ^ "covariant"
+      | false, true -> inj ^ "contravariant"
+      | false, false -> if inj = "" then "unrestricted" else inj
+    in
+    let suffix n =
+      let teen = n mod 100 / 10 = 1 in
+      match n mod 10 with
+      | 1 when not teen -> "st"
+      | 2 when not teen -> "nd"
+      | 3 when not teen -> "rd"
+      | _ -> "th"
+    in
+    if n = -1 then
+      fprintf ppf "@[%s@ %s@ It"
+        "In this definition, a type variable has a variance that"
+        "is not reflected by its occurrence in type parameters."
+    else if n = -2 then
+      fprintf ppf "@[%s@ %s@]"
+        "In this definition, a type variable cannot be deduced"
+        "from the type parameters."
+    else if n = -3 then
+      fprintf ppf "@[%s@ %s@ It"
+        "In this definition, a type variable has a variance that"
+        "cannot be deduced from the type parameters."
+    else
+      fprintf ppf "@[%s@ %s@ The %d%s type parameter"
+        "In this definition, expected parameter" "variances are not satisfied."
+        n (suffix n);
+    if n <> -2 then
+      fprintf ppf " was expected to be %s,@ but it is %s.@]" (variance v2)
+        (variance v1)
+  | Unavailable_type_constructor p ->
+    fprintf ppf "The definition of type %a@ is unavailable" Printtyp.path p
+  | Bad_fixed_type r -> fprintf ppf "This fixed type %s" r
+  | Varying_anonymous ->
+    fprintf ppf "@[%s@ %s@ %s@]" "In this GADT definition,"
+      "the variance of some parameter" "cannot be checked"
+  | Val_in_structure ->
+    fprintf ppf "Value declarations are only allowed in signatures"
+  | Bad_immediate_attribute ->
+    fprintf ppf "@[%s@ %s@]" "Types marked with the immediate attribute must be"
+      "non-pointer types like int or bool"
+  | Bad_unboxed_attribute msg ->
+    fprintf ppf "@[This type cannot be unboxed because@ %s.@]" msg
+  | Boxed_and_unboxed ->
+    fprintf ppf "@[A type cannot be boxed and unboxed at the same time.@]"
+  | Nonrec_gadt ->
+    fprintf ppf "@[GADT case syntax cannot be used in a 'nonrec' block.@]"
+  | Variant_runtime_representation_mismatch
+      (Variant_coercion.VariantError
+         {
+           is_spread_context;
+           error = Variant_coercion.Untagged {left_is_unboxed};
+         }) ->
+    let other_variant_text =
+      if is_spread_context then "the variant where this is spread"
+      else "the other variant"
+    in
+    fprintf ppf "@[%s.@]"
+      ("This variant is "
+      ^ (if left_is_unboxed then "unboxed" else "not unboxed")
+      ^ ", but " ^ other_variant_text
+      ^ " is not. Both variants unboxed configuration must match")
+  | Variant_runtime_representation_mismatch
+      (Variant_coercion.VariantError
+         {is_spread_context; error = Variant_coercion.TagName _}) ->
+    let other_variant_text =
+      if is_spread_context then "the variant where this is spread"
+      else "the other variant"
+    in
+    fprintf ppf "@[%s.@]"
+      ("The @tag attribute does not match for this variant and "
+     ^ other_variant_text
+     ^ ". Both variants must have the same @tag attribute configuration, or no \
+        @tag attribute at all")
+  | Variant_spread_fail Variant_type_spread.InvalidType ->
+    fprintf ppf
+      "@[This type is not a valid type to spread. It's only possible to spread \
+       other variants.@]"
+  | Variant_spread_fail Variant_type_spread.CouldNotFindType ->
+    fprintf ppf
+      "@[This type could not be found. It's only possible to spread variants \
+       that are known as the spread happens. This means for example that you \
+       can't spread variants in recursive definitions.@]"
+  | Variant_spread_fail Variant_type_spread.HasTypeParams ->
+    fprintf ppf "@[Type parameters are not supported in variant type spreads.@]"
+  | Variant_spread_fail
+      (Variant_type_spread.DuplicateConstructor
+         {variant_with_overlapping_constructor; overlapping_constructor_name})
+    ->
+    fprintf ppf
+      "@[Variant %s has a constructor named %s, but a constructor named %s \
+       already exists in the variant it's spread into.@ You cannot spread \
+       variants with overlapping constructors.@]"
+      variant_with_overlapping_constructor overlapping_constructor_name
+      overlapping_constructor_name
+
+let () =
+  Location.register_error_of_exn (function
+    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
+    | _ -> None)
diff --git a/compiler/ml/typedecl.mli b/compiler/ml/typedecl.mli
new file mode 100644
index 0000000..b9910bf
--- /dev/null
+++ b/compiler/ml/typedecl.mli
@@ -0,0 +1,73 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Typing of type definitions and primitive definitions *)
+
+open Types
+open Format
+
+val transl_type_decl :
+  Env.t ->
+  Asttypes.rec_flag ->
+  Parsetree.type_declaration list ->
+  Typedtree.type_declaration list * Env.t
+
+val transl_exception :
+  Env.t ->
+  Parsetree.extension_constructor ->
+  Typedtree.extension_constructor * Env.t
+
+val transl_type_extension :
+  bool ->
+  Env.t ->
+  Location.t ->
+  Parsetree.type_extension ->
+  Typedtree.type_extension * Env.t
+
+val transl_value_decl :
+  Env.t ->
+  Location.t ->
+  Parsetree.value_description ->
+  Typedtree.value_description * Env.t
+
+val transl_with_constraint :
+  Env.t ->
+  Ident.t ->
+  Path.t option ->
+  Types.type_declaration ->
+  Parsetree.type_declaration ->
+  Typedtree.type_declaration
+
+val abstract_type_decl : int -> type_declaration
+val approx_type_decl :
+  Parsetree.type_declaration list -> (Ident.t * type_declaration) list
+val check_recmod_typedecl :
+  Env.t -> Location.t -> Ident.t list -> Path.t -> type_declaration -> unit
+val check_coherence : Env.t -> Location.t -> Ident.t -> type_declaration -> unit
+
+(* for fixed types *)
+val is_fixed_type : Parsetree.type_declaration -> bool
+
+(* for typeopt.ml *)
+val get_unboxed_type_representation : Env.t -> type_expr -> type_expr option
+val is_not_undefined_attr : Parsetree.attribute -> bool
+
+type native_repr_kind = Unboxed | Untagged
+
+type error
+
+exception Error of Location.t * error
+
+val report_error : formatter -> error -> unit
diff --git a/compiler/ml/typedtree.ml b/compiler/ml/typedtree.ml
new file mode 100644
index 0000000..e7274f1
--- /dev/null
+++ b/compiler/ml/typedtree.ml
@@ -0,0 +1,489 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Abstract syntax tree after typing *)
+
+open Misc
+open Asttypes
+open Types
+
+(* Value expressions for the core language *)
+
+type partial = Partial | Total
+
+type attribute = Parsetree.attribute
+type attributes = attribute list
+
+type pattern = {
+  pat_desc: pattern_desc;
+  pat_loc: Location.t;
+  pat_extra: (pat_extra * Location.t * attribute list) list;
+  pat_type: type_expr;
+  mutable pat_env: Env.t;
+  pat_attributes: attribute list;
+}
+
+and pat_extra =
+  | Tpat_constraint of core_type
+  | Tpat_type of Path.t * Longident.t loc
+  | Tpat_open of Path.t * Longident.t loc * Env.t
+  | Tpat_unpack
+
+and pattern_desc =
+  | Tpat_any
+  | Tpat_var of Ident.t * string loc
+  | Tpat_alias of pattern * Ident.t * string loc
+  | Tpat_constant of constant
+  | Tpat_tuple of pattern list
+  | Tpat_construct of Longident.t loc * constructor_description * pattern list
+  | Tpat_variant of label * pattern option * row_desc ref
+  | Tpat_record of
+      (Longident.t loc * label_description * pattern * bool (* optional *)) list
+      * closed_flag
+  | Tpat_array of pattern list
+  | Tpat_or of pattern * pattern * row_desc option
+
+and expression = {
+  exp_desc: expression_desc;
+  exp_loc: Location.t;
+  exp_extra: (exp_extra * Location.t * attribute list) list;
+  exp_type: type_expr;
+  exp_env: Env.t;
+  exp_attributes: attribute list;
+}
+
+and exp_extra =
+  | Texp_constraint of core_type
+  | Texp_coerce of core_type
+  | Texp_open of override_flag * Path.t * Longident.t loc * Env.t
+  | Texp_newtype of string
+
+and expression_desc =
+  | Texp_ident of Path.t * Longident.t loc * Types.value_description
+  | Texp_constant of constant
+  | Texp_let of rec_flag * value_binding list * expression
+  | Texp_function of {
+      arg_label: arg_label;
+      arity: arity;
+      param: Ident.t;
+      case: case;
+      partial: partial;
+      async: bool;
+    }
+  | Texp_apply of {
+      funct: expression;
+      args: (arg_label * expression option) list;
+      partial: bool;
+      transformed_jsx: bool;
+    }
+  | Texp_match of expression * case list * case list * partial
+  | Texp_try of expression * case list
+  | Texp_tuple of expression list
+  | Texp_construct of
+      Longident.t loc * constructor_description * expression list
+  | Texp_variant of label * expression option
+  | Texp_record of {
+      fields:
+        (Types.label_description
+        * record_label_definition
+        * bool (* optional *))
+        array;
+      representation: Types.record_representation;
+      extended_expression: expression option;
+    }
+  | Texp_field of expression * Longident.t loc * label_description
+  | Texp_setfield of
+      expression * Longident.t loc * label_description * expression
+  | Texp_array of expression list
+  | Texp_ifthenelse of expression * expression * expression option
+  | Texp_sequence of expression * expression
+  | Texp_while of expression * expression
+  | Texp_for of
+      Ident.t
+      * Parsetree.pattern
+      * expression
+      * expression
+      * direction_flag
+      * expression
+  | Texp_send of expression * meth * expression option
+  | Texp_letmodule of Ident.t * string loc * module_expr * expression
+  | Texp_letexception of extension_constructor * expression
+  | Texp_assert of expression
+  | Texp_pack of module_expr
+  | Texp_extension_constructor of Longident.t loc * Path.t
+
+and meth = Tmeth_name of string
+
+and case = {c_lhs: pattern; c_guard: expression option; c_rhs: expression}
+
+and record_label_definition =
+  | Kept of Types.type_expr
+  | Overridden of Longident.t loc * expression
+
+(* Value expressions for the module language *)
+and module_expr = {
+  mod_desc: module_expr_desc;
+  mod_loc: Location.t;
+  mod_type: Types.module_type;
+  mod_env: Env.t;
+  mod_attributes: attribute list;
+}
+
+and module_type_constraint =
+  | Tmodtype_implicit
+  | Tmodtype_explicit of module_type
+
+and module_expr_desc =
+  | Tmod_ident of Path.t * Longident.t loc
+  | Tmod_structure of structure
+  | Tmod_functor of Ident.t * string loc * module_type option * module_expr
+  | Tmod_apply of module_expr * module_expr * module_coercion
+  | Tmod_constraint of
+      module_expr * Types.module_type * module_type_constraint * module_coercion
+  | Tmod_unpack of expression * Types.module_type
+
+and structure = {
+  str_items: structure_item list;
+  str_type: Types.signature;
+  str_final_env: Env.t;
+}
+
+and structure_item = {
+  str_desc: structure_item_desc;
+  str_loc: Location.t;
+  str_env: Env.t;
+}
+
+and structure_item_desc =
+  | Tstr_eval of expression * attributes
+  | Tstr_value of rec_flag * value_binding list
+  | Tstr_primitive of value_description
+  | Tstr_type of rec_flag * type_declaration list
+  | Tstr_typext of type_extension
+  | Tstr_exception of extension_constructor
+  | Tstr_module of module_binding
+  | Tstr_recmodule of module_binding list
+  | Tstr_modtype of module_type_declaration
+  | Tstr_open of open_description
+  | Tstr_include of include_declaration
+  | Tstr_attribute of attribute
+
+and module_binding = {
+  mb_id: Ident.t;
+  mb_name: string loc;
+  mb_expr: module_expr;
+  mb_attributes: attribute list;
+  mb_loc: Location.t;
+}
+
+and value_binding = {
+  vb_pat: pattern;
+  vb_expr: expression;
+  vb_attributes: attributes;
+  vb_loc: Location.t;
+}
+
+and module_coercion =
+  | Tcoerce_none
+  | Tcoerce_structure of
+      (int * module_coercion) list
+      * (Ident.t * int * module_coercion) list
+      * string list (* runtime fields *)
+  | Tcoerce_functor of module_coercion * module_coercion
+  | Tcoerce_primitive of primitive_coercion
+  | Tcoerce_alias of Path.t * module_coercion
+
+and module_type = {
+  mty_desc: module_type_desc;
+  mty_type: Types.module_type;
+  mty_env: Env.t;
+  mty_loc: Location.t;
+  mty_attributes: attribute list;
+}
+
+and module_type_desc =
+  | Tmty_ident of Path.t * Longident.t loc
+  | Tmty_signature of signature
+  | Tmty_functor of Ident.t * string loc * module_type option * module_type
+  | Tmty_with of module_type * (Path.t * Longident.t loc * with_constraint) list
+  | Tmty_typeof of module_expr
+  | Tmty_alias of Path.t * Longident.t loc
+
+(* Keep primitive type information for type-based lambda-code specialization *)
+and primitive_coercion = {
+  pc_desc: Primitive.description;
+  pc_type: type_expr;
+  pc_env: Env.t;
+  pc_loc: Location.t;
+  pc_id: Ident.t; (*RE:Added *)
+}
+
+and signature = {
+  sig_items: signature_item list;
+  sig_type: Types.signature;
+  sig_final_env: Env.t;
+}
+
+and signature_item = {
+  sig_desc: signature_item_desc;
+  sig_env: Env.t; (* BINANNOT ADDED *)
+  sig_loc: Location.t;
+}
+
+and signature_item_desc =
+  | Tsig_value of value_description
+  | Tsig_type of rec_flag * type_declaration list
+  | Tsig_typext of type_extension
+  | Tsig_exception of extension_constructor
+  | Tsig_module of module_declaration
+  | Tsig_recmodule of module_declaration list
+  | Tsig_modtype of module_type_declaration
+  | Tsig_open of open_description
+  | Tsig_include of include_description
+  | Tsig_attribute of attribute
+
+and module_declaration = {
+  md_id: Ident.t;
+  md_name: string loc;
+  md_type: module_type;
+  md_attributes: attribute list;
+  md_loc: Location.t;
+}
+
+and module_type_declaration = {
+  mtd_id: Ident.t;
+  mtd_name: string loc;
+  mtd_type: module_type option;
+  mtd_attributes: attribute list;
+  mtd_loc: Location.t;
+}
+
+and open_description = {
+  open_path: Path.t;
+  open_txt: Longident.t loc;
+  open_override: override_flag;
+  open_loc: Location.t;
+  open_attributes: attribute list;
+}
+
+and 'a include_infos = {
+  incl_mod: 'a;
+  incl_type: Types.signature;
+  incl_loc: Location.t;
+  incl_attributes: attribute list;
+}
+
+and include_description = module_type include_infos
+
+and include_declaration = module_expr include_infos
+
+and with_constraint =
+  | Twith_type of type_declaration
+  | Twith_module of Path.t * Longident.t loc
+  | Twith_typesubst of type_declaration
+  | Twith_modsubst of Path.t * Longident.t loc
+
+and core_type = {
+  ctyp_desc: core_type_desc;
+  ctyp_type: type_expr;
+  ctyp_env: Env.t; (* BINANNOT ADDED *)
+  ctyp_loc: Location.t;
+  ctyp_attributes: attribute list;
+}
+
+and arg = {attrs: attributes; lbl: arg_label; typ: core_type}
+
+and core_type_desc =
+  | Ttyp_any
+  | Ttyp_var of string
+  | Ttyp_arrow of arg * core_type * arity
+  | Ttyp_tuple of core_type list
+  | Ttyp_constr of Path.t * Longident.t loc * core_type list
+  | Ttyp_object of object_field list * closed_flag
+  | Ttyp_alias of core_type * string
+  | Ttyp_variant of row_field list * closed_flag * label list option
+  | Ttyp_poly of string list * core_type
+  | Ttyp_package of package_type
+
+and package_type = {
+  pack_path: Path.t;
+  pack_fields: (Longident.t loc * core_type) list;
+  pack_type: Types.module_type;
+  pack_txt: Longident.t loc;
+}
+
+and row_field =
+  | Ttag of string loc * attributes * bool * core_type list
+  | Tinherit of core_type
+
+and object_field =
+  | OTtag of string loc * attributes * core_type
+  | OTinherit of core_type
+
+and value_description = {
+  val_id: Ident.t;
+  val_name: string loc;
+  val_desc: core_type;
+  val_val: Types.value_description;
+  val_prim: string list;
+  val_loc: Location.t;
+  val_attributes: attribute list;
+}
+
+and type_declaration = {
+  typ_id: Ident.t;
+  typ_name: string loc;
+  typ_params: (core_type * variance) list;
+  typ_type: Types.type_declaration;
+  typ_cstrs: (core_type * core_type * Location.t) list;
+  typ_kind: type_kind;
+  typ_private: private_flag;
+  typ_manifest: core_type option;
+  typ_loc: Location.t;
+  typ_attributes: attribute list;
+}
+
+and type_kind =
+  | Ttype_abstract
+  | Ttype_variant of constructor_declaration list
+  | Ttype_record of label_declaration list
+  | Ttype_open
+
+and label_declaration = {
+  ld_id: Ident.t;
+  ld_name: string loc;
+  ld_mutable: mutable_flag;
+  ld_optional: bool;
+  ld_type: core_type;
+  ld_loc: Location.t;
+  ld_attributes: attribute list;
+}
+
+and constructor_declaration = {
+  cd_id: Ident.t;
+  cd_name: string loc;
+  cd_args: constructor_arguments;
+  cd_res: core_type option;
+  cd_loc: Location.t;
+  cd_attributes: attribute list;
+}
+
+and constructor_arguments =
+  | Cstr_tuple of core_type list
+  | Cstr_record of label_declaration list
+
+and type_extension = {
+  tyext_path: Path.t;
+  tyext_txt: Longident.t loc;
+  tyext_params: (core_type * variance) list;
+  tyext_constructors: extension_constructor list;
+  tyext_private: private_flag;
+  tyext_attributes: attribute list;
+}
+
+and extension_constructor = {
+  ext_id: Ident.t;
+  ext_name: string loc;
+  ext_type: Types.extension_constructor;
+  ext_kind: extension_constructor_kind;
+  ext_loc: Location.t;
+  ext_attributes: attribute list;
+}
+
+and extension_constructor_kind =
+  | Text_decl of constructor_arguments * core_type option
+  | Text_rebind of Path.t * Longident.t loc
+
+(* Auxiliary functions over the a.s.t. *)
+
+let iter_pattern_desc f = function
+  | Tpat_alias (p, _, _) -> f p
+  | Tpat_tuple patl -> List.iter f patl
+  | Tpat_construct (_, _, patl) -> List.iter f patl
+  | Tpat_variant (_, pat, _) -> may f pat
+  | Tpat_record (lbl_pat_list, _) ->
+    List.iter (fun (_, _, pat, _) -> f pat) lbl_pat_list
+  | Tpat_array patl -> List.iter f patl
+  | Tpat_or (p1, p2, _) ->
+    f p1;
+    f p2
+  | Tpat_any | Tpat_var _ | Tpat_constant _ -> ()
+
+let map_pattern_desc f d =
+  match d with
+  | Tpat_alias (p1, id, s) -> Tpat_alias (f p1, id, s)
+  | Tpat_tuple pats -> Tpat_tuple (List.map f pats)
+  | Tpat_record (lpats, closed) ->
+    Tpat_record (List.map (fun (lid, l, p, o) -> (lid, l, f p, o)) lpats, closed)
+  | Tpat_construct (lid, c, pats) -> Tpat_construct (lid, c, List.map f pats)
+  | Tpat_array pats -> Tpat_array (List.map f pats)
+  | Tpat_variant (x1, Some p1, x2) -> Tpat_variant (x1, Some (f p1), x2)
+  | Tpat_or (p1, p2, path) -> Tpat_or (f p1, f p2, path)
+  | Tpat_var _ | Tpat_constant _ | Tpat_any | Tpat_variant (_, None, _) -> d
+
+(* List the identifiers bound by a pattern or a let *)
+
+let idents = ref ([] : (Ident.t * string loc) list)
+
+let rec bound_idents pat =
+  match pat.pat_desc with
+  | Tpat_var (id, s) -> idents := (id, s) :: !idents
+  | Tpat_alias (p, id, s) ->
+    bound_idents p;
+    idents := (id, s) :: !idents
+  | Tpat_or (p1, _, _) ->
+    (* Invariant : both arguments binds the same variables *)
+    bound_idents p1
+  | d -> iter_pattern_desc bound_idents d
+
+let pat_bound_idents pat =
+  idents := [];
+  bound_idents pat;
+  let res = !idents in
+  idents := [];
+  List.map fst res
+
+let rev_let_bound_idents_with_loc bindings =
+  idents := [];
+  List.iter (fun vb -> bound_idents vb.vb_pat) bindings;
+  let res = !idents in
+  idents := [];
+  res
+
+let let_bound_idents_with_loc pat_expr_list =
+  List.rev (rev_let_bound_idents_with_loc pat_expr_list)
+
+let rev_let_bound_idents pat = List.map fst (rev_let_bound_idents_with_loc pat)
+let let_bound_idents pat = List.map fst (let_bound_idents_with_loc pat)
+
+let alpha_var env id = List.assoc id env
+
+let rec alpha_pat env p =
+  match p.pat_desc with
+  | Tpat_var (id, s) ->
+    (* note the ``Not_found'' case *)
+    {
+      p with
+      pat_desc =
+        (try Tpat_var (alpha_var env id, s) with Not_found -> Tpat_any);
+    }
+  | Tpat_alias (p1, id, s) -> (
+    let new_p = alpha_pat env p1 in
+    try {p with pat_desc = Tpat_alias (new_p, alpha_var env id, s)}
+    with Not_found -> new_p)
+  | d -> {p with pat_desc = map_pattern_desc (alpha_pat env) d}
+
+let mkloc = Location.mkloc
+let mknoloc = Location.mknoloc
diff --git a/compiler/ml/typedtree.mli b/compiler/ml/typedtree.mli
new file mode 100644
index 0000000..b1e7083
--- /dev/null
+++ b/compiler/ml/typedtree.mli
@@ -0,0 +1,529 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** Abstract syntax tree after typing *)
+
+(** By comparison with {!Parsetree}:
+    - Every {!Longindent.t} is accompanied by a resolved {!Path.t}.
+
+*)
+
+open Asttypes
+open Types
+
+(* Value expressions for the core language *)
+
+type partial = Partial | Total
+
+(** {1 Extension points} *)
+
+type attribute = Parsetree.attribute
+type attributes = attribute list
+
+(** {1 Core language} *)
+
+type pattern = {
+  pat_desc: pattern_desc;
+  pat_loc: Location.t;
+  pat_extra: (pat_extra * Location.t * attributes) list;
+  pat_type: type_expr;
+  mutable pat_env: Env.t;
+  pat_attributes: attributes;
+}
+
+and pat_extra =
+  | Tpat_constraint of core_type
+      (** P : T          { pat_desc = P
+                           ; pat_extra = (Tpat_constraint T, _, _) :: ... }
+         *)
+  | Tpat_type of Path.t * Longident.t loc
+      (** #tconst        { pat_desc = disjunction
+                           ; pat_extra = (Tpat_type (P, "tconst"), _, _) :: ...}
+
+                           where [disjunction] is a [Tpat_or _] representing the
+                           branches of [tconst].
+         *)
+  | Tpat_open of Path.t * Longident.t loc * Env.t
+  | Tpat_unpack
+      (** (module P)     { pat_desc  = Tpat_var "P"
+                           ; pat_extra = (Tpat_unpack, _, _) :: ... }
+         *)
+
+and pattern_desc =
+  | Tpat_any  (** _ *)
+  | Tpat_var of Ident.t * string loc  (** x *)
+  | Tpat_alias of pattern * Ident.t * string loc  (** P as a *)
+  | Tpat_constant of constant  (** 1, 'a', "true", 1.0, 1l, 1L, 1n *)
+  | Tpat_tuple of pattern list
+      (** (P1, ..., Pn)
+
+            Invariant: n >= 2
+         *)
+  | Tpat_construct of Longident.t loc * constructor_description * pattern list
+      (** C                []
+            C P              [P]
+            C (P1, ..., Pn)  [P1; ...; Pn]
+          *)
+  | Tpat_variant of label * pattern option * row_desc ref
+      (** `A             (None)
+            `A P           (Some P)
+
+            See {!Types.row_desc} for an explanation of the last parameter.
+         *)
+  | Tpat_record of
+      (Longident.t loc * label_description * pattern * bool (* optional *)) list
+      * closed_flag
+      (** { l1=P1; ...; ln=Pn }     (flag = Closed)
+            { l1=P1; ...; ln=Pn; _}   (flag = Open)
+
+            Invariant: n > 0
+         *)
+  | Tpat_array of pattern list  (** [| P1; ...; Pn |] *)
+  | Tpat_or of pattern * pattern * row_desc option
+      (** P1 | P2
+
+            [row_desc] = [Some _] when translating [Ppat_type _],
+                         [None] otherwise.
+         *)
+
+and expression = {
+  exp_desc: expression_desc;
+  exp_loc: Location.t;
+  exp_extra: (exp_extra * Location.t * attributes) list;
+  exp_type: type_expr;
+  exp_env: Env.t;
+  exp_attributes: attributes;
+}
+
+and exp_extra =
+  | Texp_constraint of core_type  (** E : T *)
+  | Texp_coerce of core_type  (** E :> T           [Texp_coerce T]
+         *)
+  | Texp_open of override_flag * Path.t * Longident.t loc * Env.t
+      (** let open[!] M in    [Texp_open (!, P, M, env)]
+                                where [env] is the environment after opening [P]
+         *)
+  | Texp_newtype of string  (** fun (type t) ->  *)
+
+and expression_desc =
+  | Texp_ident of Path.t * Longident.t loc * Types.value_description
+      (** x
+            M.x
+         *)
+  | Texp_constant of constant  (** 1, 'a', "true", 1.0, 1l, 1L, 1n *)
+  | Texp_let of rec_flag * value_binding list * expression
+      (** let P1 = E1 and ... and Pn = EN in E       (flag = Nonrecursive)
+            let rec P1 = E1 and ... and Pn = EN in E   (flag = Recursive)
+         *)
+  | Texp_function of {
+      arg_label: arg_label;
+      arity: arity;
+      param: Ident.t;
+      case: case;
+      partial: partial;
+      async: bool;
+    }
+      (** [Pexp_fun] and [Pexp_function] both translate to [Texp_function].
+            See {!Parsetree} for more details.
+
+            [param] is the identifier that is to be used to name the
+            parameter of the function.
+
+            partial =
+              [Partial] if the pattern match is partial
+              [Total] otherwise.
+         *)
+  | Texp_apply of {
+      funct: expression;
+      args: (arg_label * expression option) list;
+      partial: bool;
+      transformed_jsx: bool;
+    }
+      (** E0 ~l1:E1 ... ~ln:En
+
+            The expression can be None if the expression is abstracted over
+            this argument. It currently appears when a label is applied.
+
+            For example:
+            let f x ~y = x + y in
+            f ~y:3
+
+            The resulting typedtree for the application is:
+            Texp_apply (Texp_ident "f/1037",
+                        [(Nolabel, None);
+                         (Labelled "y", Some (Texp_constant Const_int 3))
+                        ])
+         *)
+  | Texp_match of expression * case list * case list * partial
+      (** match E0 with
+            | P1 -> E1
+            | P2 -> E2
+            | exception P3 -> E3
+
+            [Texp_match (E0, [(P1, E1); (P2, E2)], [(P3, E3)], _)]
+         *)
+  | Texp_try of expression * case list
+      (** try E with P1 -> E1 | ... | PN -> EN *)
+  | Texp_tuple of expression list  (** (E1, ..., EN) *)
+  | Texp_construct of
+      Longident.t loc * constructor_description * expression list
+      (** C                []
+            C E              [E]
+            C (E1, ..., En)  [E1;...;En]
+         *)
+  | Texp_variant of label * expression option
+  | Texp_record of {
+      fields:
+        (Types.label_description
+        * record_label_definition
+        * bool (* optional *))
+        array;
+      representation: Types.record_representation;
+      extended_expression: expression option;
+    }
+      (** { l1=P1; ...; ln=Pn }           (extended_expression = None)
+            { E0 with l1=P1; ...; ln=Pn }   (extended_expression = Some E0)
+
+            Invariant: n > 0
+
+            If the type is { l1: t1; l2: t2 }, the expression
+            { E0 with t2=P2 } is represented as
+            Texp_record
+              { fields = [| l1, Kept t1; l2 Override P2 |]; representation;
+                extended_expression = Some E0 }
+        *)
+  | Texp_field of expression * Longident.t loc * label_description
+  | Texp_setfield of
+      expression * Longident.t loc * label_description * expression
+  | Texp_array of expression list
+  | Texp_ifthenelse of expression * expression * expression option
+  | Texp_sequence of expression * expression
+  | Texp_while of expression * expression
+  | Texp_for of
+      Ident.t
+      * Parsetree.pattern
+      * expression
+      * expression
+      * direction_flag
+      * expression
+  | Texp_send of expression * meth * expression option
+  | Texp_letmodule of Ident.t * string loc * module_expr * expression
+  | Texp_letexception of extension_constructor * expression
+  | Texp_assert of expression
+  | Texp_pack of module_expr
+  | Texp_extension_constructor of Longident.t loc * Path.t
+
+and meth = Tmeth_name of string
+
+and case = {c_lhs: pattern; c_guard: expression option; c_rhs: expression}
+
+and record_label_definition =
+  | Kept of Types.type_expr
+  | Overridden of Longident.t loc * expression
+
+(* Value expressions for the module language *)
+and module_expr = {
+  mod_desc: module_expr_desc;
+  mod_loc: Location.t;
+  mod_type: Types.module_type;
+  mod_env: Env.t;
+  mod_attributes: attributes;
+}
+
+(** Annotations for [Tmod_constraint]. *)
+and module_type_constraint =
+  | Tmodtype_implicit
+      (** The module type constraint has been synthesized during typechecking. *)
+  | Tmodtype_explicit of module_type
+      (** The module type was in the source file. *)
+
+and module_expr_desc =
+  | Tmod_ident of Path.t * Longident.t loc
+  | Tmod_structure of structure
+  | Tmod_functor of Ident.t * string loc * module_type option * module_expr
+  | Tmod_apply of module_expr * module_expr * module_coercion
+  | Tmod_constraint of
+      module_expr * Types.module_type * module_type_constraint * module_coercion
+      (** ME          (constraint = Tmodtype_implicit)
+        (ME : MT)   (constraint = Tmodtype_explicit MT)
+     *)
+  | Tmod_unpack of expression * Types.module_type
+
+and structure = {
+  str_items: structure_item list;
+  str_type: Types.signature;
+  str_final_env: Env.t;
+}
+
+and structure_item = {
+  str_desc: structure_item_desc;
+  str_loc: Location.t;
+  str_env: Env.t;
+}
+
+and structure_item_desc =
+  | Tstr_eval of expression * attributes
+  | Tstr_value of rec_flag * value_binding list
+  | Tstr_primitive of value_description
+  | Tstr_type of rec_flag * type_declaration list
+  | Tstr_typext of type_extension
+  | Tstr_exception of extension_constructor
+  | Tstr_module of module_binding
+  | Tstr_recmodule of module_binding list
+  | Tstr_modtype of module_type_declaration
+  | Tstr_open of open_description
+  | Tstr_include of include_declaration
+  | Tstr_attribute of attribute
+
+and module_binding = {
+  mb_id: Ident.t;
+  mb_name: string loc;
+  mb_expr: module_expr;
+  mb_attributes: attributes;
+  mb_loc: Location.t;
+}
+
+and value_binding = {
+  vb_pat: pattern;
+  vb_expr: expression;
+  vb_attributes: attributes;
+  vb_loc: Location.t;
+}
+
+and module_coercion =
+  | Tcoerce_none
+  | Tcoerce_structure of
+      (int * module_coercion) list
+      * (Ident.t * int * module_coercion) list
+      * string list (* runtime fields *)
+  | Tcoerce_functor of module_coercion * module_coercion
+  | Tcoerce_primitive of primitive_coercion
+  | Tcoerce_alias of Path.t * module_coercion
+
+and module_type = {
+  mty_desc: module_type_desc;
+  mty_type: Types.module_type;
+  mty_env: Env.t;
+  mty_loc: Location.t;
+  mty_attributes: attributes;
+}
+
+and module_type_desc =
+  | Tmty_ident of Path.t * Longident.t loc
+  | Tmty_signature of signature
+  | Tmty_functor of Ident.t * string loc * module_type option * module_type
+  | Tmty_with of module_type * (Path.t * Longident.t loc * with_constraint) list
+  | Tmty_typeof of module_expr
+  | Tmty_alias of Path.t * Longident.t loc
+
+and primitive_coercion = {
+  pc_desc: Primitive.description;
+  pc_type: type_expr;
+  pc_env: Env.t;
+  pc_loc: Location.t;
+  pc_id: Ident.t;
+}
+
+and signature = {
+  sig_items: signature_item list;
+  sig_type: Types.signature;
+  sig_final_env: Env.t;
+}
+
+and signature_item = {
+  sig_desc: signature_item_desc;
+  sig_env: Env.t; (* BINANNOT ADDED *)
+  sig_loc: Location.t;
+}
+
+and signature_item_desc =
+  | Tsig_value of value_description
+  | Tsig_type of rec_flag * type_declaration list
+  | Tsig_typext of type_extension
+  | Tsig_exception of extension_constructor
+  | Tsig_module of module_declaration
+  | Tsig_recmodule of module_declaration list
+  | Tsig_modtype of module_type_declaration
+  | Tsig_open of open_description
+  | Tsig_include of include_description
+  | Tsig_attribute of attribute
+
+and module_declaration = {
+  md_id: Ident.t;
+  md_name: string loc;
+  md_type: module_type;
+  md_attributes: attributes;
+  md_loc: Location.t;
+}
+
+and module_type_declaration = {
+  mtd_id: Ident.t;
+  mtd_name: string loc;
+  mtd_type: module_type option;
+  mtd_attributes: attributes;
+  mtd_loc: Location.t;
+}
+
+and open_description = {
+  open_path: Path.t;
+  open_txt: Longident.t loc;
+  open_override: override_flag;
+  open_loc: Location.t;
+  open_attributes: attribute list;
+}
+
+and 'a include_infos = {
+  incl_mod: 'a;
+  incl_type: Types.signature;
+  incl_loc: Location.t;
+  incl_attributes: attribute list;
+}
+
+and include_description = module_type include_infos
+
+and include_declaration = module_expr include_infos
+
+and with_constraint =
+  | Twith_type of type_declaration
+  | Twith_module of Path.t * Longident.t loc
+  | Twith_typesubst of type_declaration
+  | Twith_modsubst of Path.t * Longident.t loc
+
+and core_type = {
+  ctyp_desc: core_type_desc;
+  ctyp_type: type_expr;
+  ctyp_env: Env.t; (* BINANNOT ADDED *)
+  ctyp_loc: Location.t;
+  ctyp_attributes: attributes;
+}
+
+and arg = {attrs: attributes; lbl: arg_label; typ: core_type}
+
+and core_type_desc =
+  | Ttyp_any
+  | Ttyp_var of string
+  | Ttyp_arrow of arg * core_type * arity
+  | Ttyp_tuple of core_type list
+  | Ttyp_constr of Path.t * Longident.t loc * core_type list
+  | Ttyp_object of object_field list * closed_flag
+  | Ttyp_alias of core_type * string
+  | Ttyp_variant of row_field list * closed_flag * label list option
+  | Ttyp_poly of string list * core_type
+  | Ttyp_package of package_type
+
+and package_type = {
+  pack_path: Path.t;
+  pack_fields: (Longident.t loc * core_type) list;
+  pack_type: Types.module_type;
+  pack_txt: Longident.t loc;
+}
+
+and row_field =
+  | Ttag of string loc * attributes * bool * core_type list
+  | Tinherit of core_type
+
+and object_field =
+  | OTtag of string loc * attributes * core_type
+  | OTinherit of core_type
+
+and value_description = {
+  val_id: Ident.t;
+  val_name: string loc;
+  val_desc: core_type;
+  val_val: Types.value_description;
+  val_prim: string list;
+  val_loc: Location.t;
+  val_attributes: attributes;
+}
+
+and type_declaration = {
+  typ_id: Ident.t;
+  typ_name: string loc;
+  typ_params: (core_type * variance) list;
+  typ_type: Types.type_declaration;
+  typ_cstrs: (core_type * core_type * Location.t) list;
+  typ_kind: type_kind;
+  typ_private: private_flag;
+  typ_manifest: core_type option;
+  typ_loc: Location.t;
+  typ_attributes: attributes;
+}
+
+and type_kind =
+  | Ttype_abstract
+  | Ttype_variant of constructor_declaration list
+  | Ttype_record of label_declaration list
+  | Ttype_open
+
+and label_declaration = {
+  ld_id: Ident.t;
+  ld_name: string loc;
+  ld_mutable: mutable_flag;
+  ld_optional: bool;
+  ld_type: core_type;
+  ld_loc: Location.t;
+  ld_attributes: attributes;
+}
+
+and constructor_declaration = {
+  cd_id: Ident.t;
+  cd_name: string loc;
+  cd_args: constructor_arguments;
+  cd_res: core_type option;
+  cd_loc: Location.t;
+  cd_attributes: attributes;
+}
+
+and constructor_arguments =
+  | Cstr_tuple of core_type list
+  | Cstr_record of label_declaration list
+
+and type_extension = {
+  tyext_path: Path.t;
+  tyext_txt: Longident.t loc;
+  tyext_params: (core_type * variance) list;
+  tyext_constructors: extension_constructor list;
+  tyext_private: private_flag;
+  tyext_attributes: attributes;
+}
+
+and extension_constructor = {
+  ext_id: Ident.t;
+  ext_name: string loc;
+  ext_type: Types.extension_constructor;
+  ext_kind: extension_constructor_kind;
+  ext_loc: Location.t;
+  ext_attributes: attributes;
+}
+
+and extension_constructor_kind =
+  | Text_decl of constructor_arguments * core_type option
+  | Text_rebind of Path.t * Longident.t loc
+
+(* Auxiliary functions over the a.s.t. *)
+
+val iter_pattern_desc : (pattern -> unit) -> pattern_desc -> unit
+val map_pattern_desc : (pattern -> pattern) -> pattern_desc -> pattern_desc
+
+val let_bound_idents : value_binding list -> Ident.t list
+val rev_let_bound_idents : value_binding list -> Ident.t list
+
+val alpha_pat : (Ident.t * Ident.t) list -> pattern -> pattern
+(** Alpha conversion of patterns *)
+
+val mknoloc : 'a -> 'a Asttypes.loc
+val mkloc : 'a -> Location.t -> 'a Asttypes.loc
+
+val pat_bound_idents : pattern -> Ident.t list
diff --git a/compiler/ml/typedtreeIter.ml b/compiler/ml/typedtreeIter.ml
new file mode 100644
index 0000000..9a31b9b
--- /dev/null
+++ b/compiler/ml/typedtreeIter.ml
@@ -0,0 +1,446 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*    Thomas Gazagnaire (OCamlPro), Fabrice Le Fessant (INRIA Saclay)     *)
+(*                                                                        *)
+(*   Copyright 2007 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(*
+TODO:
+ - 2012/05/10: Follow camlp4 way of building map and iter using classes
+     and inheritance ?
+*)
+
+open Asttypes
+open Typedtree
+
+module type IteratorArgument = sig
+  val enter_structure : structure -> unit
+  val enter_value_description : value_description -> unit
+  val enter_type_extension : type_extension -> unit
+  val enter_extension_constructor : extension_constructor -> unit
+  val enter_pattern : pattern -> unit
+  val enter_expression : expression -> unit
+  val enter_package_type : package_type -> unit
+  val enter_signature : signature -> unit
+  val enter_signature_item : signature_item -> unit
+  val enter_module_type_declaration : module_type_declaration -> unit
+  val enter_module_type : module_type -> unit
+  val enter_module_expr : module_expr -> unit
+  val enter_with_constraint : with_constraint -> unit
+
+  val enter_core_type : core_type -> unit
+  val enter_structure_item : structure_item -> unit
+
+  val leave_structure : structure -> unit
+  val leave_value_description : value_description -> unit
+  val leave_type_extension : type_extension -> unit
+  val leave_extension_constructor : extension_constructor -> unit
+  val leave_pattern : pattern -> unit
+  val leave_expression : expression -> unit
+  val leave_package_type : package_type -> unit
+  val leave_signature : signature -> unit
+  val leave_signature_item : signature_item -> unit
+  val leave_module_type_declaration : module_type_declaration -> unit
+  val leave_module_type : module_type -> unit
+  val leave_module_expr : module_expr -> unit
+  val leave_with_constraint : with_constraint -> unit
+
+  val leave_core_type : core_type -> unit
+  val leave_structure_item : structure_item -> unit
+
+  val enter_bindings : rec_flag -> unit
+  val enter_binding : value_binding -> unit
+  val leave_binding : value_binding -> unit
+  val leave_bindings : rec_flag -> unit
+
+  val enter_type_declarations : rec_flag -> unit
+  val enter_type_declaration : type_declaration -> unit
+  val leave_type_declaration : type_declaration -> unit
+  val leave_type_declarations : rec_flag -> unit
+end
+
+module MakeIterator (Iter : IteratorArgument) : sig
+  val iter_structure : structure -> unit
+  val iter_signature : signature -> unit
+  val iter_structure_item : structure_item -> unit
+  val iter_signature_item : signature_item -> unit
+  val iter_expression : expression -> unit
+  val iter_module_type : module_type -> unit
+  val iter_pattern : pattern -> unit
+end = struct
+  let may_iter f v =
+    match v with
+    | None -> ()
+    | Some x -> f x
+
+  let rec iter_structure str =
+    Iter.enter_structure str;
+    List.iter iter_structure_item str.str_items;
+    Iter.leave_structure str
+
+  and iter_binding vb =
+    Iter.enter_binding vb;
+    iter_pattern vb.vb_pat;
+    iter_expression vb.vb_expr;
+    Iter.leave_binding vb
+
+  and iter_bindings rec_flag list =
+    Iter.enter_bindings rec_flag;
+    List.iter iter_binding list;
+    Iter.leave_bindings rec_flag
+
+  and iter_case {c_lhs; c_guard; c_rhs} =
+    iter_pattern c_lhs;
+    may_iter iter_expression c_guard;
+    iter_expression c_rhs
+
+  and iter_cases cases = List.iter iter_case cases
+
+  and iter_structure_item item =
+    Iter.enter_structure_item item;
+    (match item.str_desc with
+    | Tstr_eval (exp, _attrs) -> iter_expression exp
+    | Tstr_value (rec_flag, list) -> iter_bindings rec_flag list
+    | Tstr_primitive vd -> iter_value_description vd
+    | Tstr_type (rf, list) -> iter_type_declarations rf list
+    | Tstr_typext tyext -> iter_type_extension tyext
+    | Tstr_exception ext -> iter_extension_constructor ext
+    | Tstr_module x -> iter_module_binding x
+    | Tstr_recmodule list -> List.iter iter_module_binding list
+    | Tstr_modtype mtd -> iter_module_type_declaration mtd
+    | Tstr_open _ -> ()
+    | Tstr_include incl -> iter_module_expr incl.incl_mod
+    | Tstr_attribute _ -> ());
+    Iter.leave_structure_item item
+
+  and iter_module_binding x = iter_module_expr x.mb_expr
+
+  and iter_value_description v =
+    Iter.enter_value_description v;
+    iter_core_type v.val_desc;
+    Iter.leave_value_description v
+
+  and iter_constructor_arguments = function
+    | Cstr_tuple l -> List.iter iter_core_type l
+    | Cstr_record l -> List.iter (fun ld -> iter_core_type ld.ld_type) l
+
+  and iter_constructor_declaration cd =
+    iter_constructor_arguments cd.cd_args;
+    option iter_core_type cd.cd_res
+
+  and iter_type_parameter (ct, _v) = iter_core_type ct
+
+  and iter_type_declaration decl =
+    Iter.enter_type_declaration decl;
+    List.iter iter_type_parameter decl.typ_params;
+    List.iter
+      (fun (ct1, ct2, _loc) ->
+        iter_core_type ct1;
+        iter_core_type ct2)
+      decl.typ_cstrs;
+    (match decl.typ_kind with
+    | Ttype_abstract -> ()
+    | Ttype_variant list -> List.iter iter_constructor_declaration list
+    | Ttype_record list -> List.iter (fun ld -> iter_core_type ld.ld_type) list
+    | Ttype_open -> ());
+    option iter_core_type decl.typ_manifest;
+    Iter.leave_type_declaration decl
+
+  and iter_type_declarations rec_flag decls =
+    Iter.enter_type_declarations rec_flag;
+    List.iter iter_type_declaration decls;
+    Iter.leave_type_declarations rec_flag
+
+  and iter_extension_constructor ext =
+    Iter.enter_extension_constructor ext;
+    (match ext.ext_kind with
+    | Text_decl (args, ret) ->
+      iter_constructor_arguments args;
+      option iter_core_type ret
+    | Text_rebind _ -> ());
+    Iter.leave_extension_constructor ext
+
+  and iter_type_extension tyext =
+    Iter.enter_type_extension tyext;
+    List.iter iter_type_parameter tyext.tyext_params;
+    List.iter iter_extension_constructor tyext.tyext_constructors;
+    Iter.leave_type_extension tyext
+
+  and iter_pattern pat =
+    Iter.enter_pattern pat;
+    List.iter
+      (fun (cstr, _, _attrs) ->
+        match cstr with
+        | Tpat_type _ -> ()
+        | Tpat_unpack -> ()
+        | Tpat_open _ -> ()
+        | Tpat_constraint ct -> iter_core_type ct)
+      pat.pat_extra;
+    (match pat.pat_desc with
+    | Tpat_any -> ()
+    | Tpat_var _ -> ()
+    | Tpat_alias (pat1, _, _) -> iter_pattern pat1
+    | Tpat_constant _ -> ()
+    | Tpat_tuple list -> List.iter iter_pattern list
+    | Tpat_construct (_, _, args) -> List.iter iter_pattern args
+    | Tpat_variant (_, pato, _) -> (
+      match pato with
+      | None -> ()
+      | Some pat -> iter_pattern pat)
+    | Tpat_record (list, _closed) ->
+      List.iter (fun (_, _, pat, _) -> iter_pattern pat) list
+    | Tpat_array list -> List.iter iter_pattern list
+    | Tpat_or (p1, p2, _) ->
+      iter_pattern p1;
+      iter_pattern p2);
+    Iter.leave_pattern pat
+
+  and option f x =
+    match x with
+    | None -> ()
+    | Some e -> f e
+
+  and iter_expression exp =
+    Iter.enter_expression exp;
+    List.iter
+      (function
+        | cstr, _, _attrs -> (
+          match cstr with
+          | Texp_constraint ct -> iter_core_type ct
+          | Texp_coerce cty2 -> iter_core_type cty2
+          | Texp_open _ -> ()
+          | Texp_newtype _ -> ()))
+      exp.exp_extra;
+    (match exp.exp_desc with
+    | Texp_ident _ -> ()
+    | Texp_constant _ -> ()
+    | Texp_let (rec_flag, list, exp) ->
+      iter_bindings rec_flag list;
+      iter_expression exp
+    | Texp_function {case; _} -> iter_case case
+    | Texp_apply {funct = exp; args = list} ->
+      iter_expression exp;
+      List.iter
+        (fun (_label, expo) ->
+          match expo with
+          | None -> ()
+          | Some exp -> iter_expression exp)
+        list
+    | Texp_match (exp, list1, list2, _) ->
+      iter_expression exp;
+      iter_cases list1;
+      iter_cases list2
+    | Texp_try (exp, list) ->
+      iter_expression exp;
+      iter_cases list
+    | Texp_tuple list -> List.iter iter_expression list
+    | Texp_construct (_, _, args) -> List.iter iter_expression args
+    | Texp_variant (_label, expo) -> (
+      match expo with
+      | None -> ()
+      | Some exp -> iter_expression exp)
+    | Texp_record {fields; extended_expression; _} -> (
+      Array.iter
+        (function
+          | _, Kept _, _ -> ()
+          | _, Overridden (_, exp), _ -> iter_expression exp)
+        fields;
+      match extended_expression with
+      | None -> ()
+      | Some exp -> iter_expression exp)
+    | Texp_field (exp, _, _label) -> iter_expression exp
+    | Texp_setfield (exp1, _, _label, exp2) ->
+      iter_expression exp1;
+      iter_expression exp2
+    | Texp_array list -> List.iter iter_expression list
+    | Texp_ifthenelse (exp1, exp2, expo) -> (
+      iter_expression exp1;
+      iter_expression exp2;
+      match expo with
+      | None -> ()
+      | Some exp -> iter_expression exp)
+    | Texp_sequence (exp1, exp2) ->
+      iter_expression exp1;
+      iter_expression exp2
+    | Texp_while (exp1, exp2) ->
+      iter_expression exp1;
+      iter_expression exp2
+    | Texp_for (_id, _, exp1, exp2, _dir, exp3) ->
+      iter_expression exp1;
+      iter_expression exp2;
+      iter_expression exp3
+    | Texp_send (exp, _meth, expo) -> (
+      iter_expression exp;
+      match expo with
+      | None -> ()
+      | Some exp -> iter_expression exp)
+    | Texp_letmodule (_id, _, mexpr, exp) ->
+      iter_module_expr mexpr;
+      iter_expression exp
+    | Texp_letexception (cd, exp) ->
+      iter_extension_constructor cd;
+      iter_expression exp
+    | Texp_assert exp -> iter_expression exp
+    | Texp_pack mexpr -> iter_module_expr mexpr
+    | Texp_extension_constructor _ -> ());
+    Iter.leave_expression exp
+
+  and iter_package_type pack =
+    Iter.enter_package_type pack;
+    List.iter (fun (_s, ct) -> iter_core_type ct) pack.pack_fields;
+    Iter.leave_package_type pack
+
+  and iter_signature sg =
+    Iter.enter_signature sg;
+    List.iter iter_signature_item sg.sig_items;
+    Iter.leave_signature sg
+
+  and iter_signature_item item =
+    Iter.enter_signature_item item;
+    (match item.sig_desc with
+    | Tsig_value vd -> iter_value_description vd
+    | Tsig_type (rf, list) -> iter_type_declarations rf list
+    | Tsig_exception ext -> iter_extension_constructor ext
+    | Tsig_typext tyext -> iter_type_extension tyext
+    | Tsig_module md -> iter_module_type md.md_type
+    | Tsig_recmodule list ->
+      List.iter (fun md -> iter_module_type md.md_type) list
+    | Tsig_modtype mtd -> iter_module_type_declaration mtd
+    | Tsig_open _ -> ()
+    | Tsig_include incl -> iter_module_type incl.incl_mod
+    | Tsig_attribute _ -> ());
+    Iter.leave_signature_item item
+
+  and iter_module_type_declaration mtd =
+    Iter.enter_module_type_declaration mtd;
+    (match mtd.mtd_type with
+    | None -> ()
+    | Some mtype -> iter_module_type mtype);
+    Iter.leave_module_type_declaration mtd
+
+  and iter_module_type mty =
+    Iter.enter_module_type mty;
+    (match mty.mty_desc with
+    | Tmty_ident _ -> ()
+    | Tmty_alias _ -> ()
+    | Tmty_signature sg -> iter_signature sg
+    | Tmty_functor (_, _, mtype1, mtype2) ->
+      Misc.may iter_module_type mtype1;
+      iter_module_type mtype2
+    | Tmty_with (mtype, list) ->
+      iter_module_type mtype;
+      List.iter (fun (_path, _, withc) -> iter_with_constraint withc) list
+    | Tmty_typeof mexpr -> iter_module_expr mexpr);
+    Iter.leave_module_type mty
+
+  and iter_with_constraint cstr =
+    Iter.enter_with_constraint cstr;
+    (match cstr with
+    | Twith_type decl -> iter_type_declaration decl
+    | Twith_module _ -> ()
+    | Twith_typesubst decl -> iter_type_declaration decl
+    | Twith_modsubst _ -> ());
+    Iter.leave_with_constraint cstr
+
+  and iter_module_expr mexpr =
+    Iter.enter_module_expr mexpr;
+    (match mexpr.mod_desc with
+    | Tmod_ident _ -> ()
+    | Tmod_structure st -> iter_structure st
+    | Tmod_functor (_, _, mtype, mexpr) ->
+      Misc.may iter_module_type mtype;
+      iter_module_expr mexpr
+    | Tmod_apply (mexp1, mexp2, _) ->
+      iter_module_expr mexp1;
+      iter_module_expr mexp2
+    | Tmod_constraint (mexpr, _, Tmodtype_implicit, _) -> iter_module_expr mexpr
+    | Tmod_constraint (mexpr, _, Tmodtype_explicit mtype, _) ->
+      iter_module_expr mexpr;
+      iter_module_type mtype
+    | Tmod_unpack (exp, _mty) -> iter_expression exp)
+    (*          iter_module_type mty *);
+    Iter.leave_module_expr mexpr
+
+  and iter_core_type ct =
+    Iter.enter_core_type ct;
+    (match ct.ctyp_desc with
+    | Ttyp_any -> ()
+    | Ttyp_var _ -> ()
+    | Ttyp_arrow (arg, ret, _) ->
+      iter_core_type arg.typ;
+      iter_core_type ret
+    | Ttyp_tuple list -> List.iter iter_core_type list
+    | Ttyp_constr (_path, _, list) -> List.iter iter_core_type list
+    | Ttyp_object (list, _o) -> List.iter iter_object_field list
+    | Ttyp_alias (ct, _s) -> iter_core_type ct
+    | Ttyp_variant (list, _bool, _labels) -> List.iter iter_row_field list
+    | Ttyp_poly (_list, ct) -> iter_core_type ct
+    | Ttyp_package pack -> iter_package_type pack);
+    Iter.leave_core_type ct
+
+  and iter_row_field rf =
+    match rf with
+    | Ttag (_label, _attrs, _bool, list) -> List.iter iter_core_type list
+    | Tinherit ct -> iter_core_type ct
+
+  and iter_object_field ofield =
+    match ofield with
+    | OTtag (_, _, ct) | OTinherit ct -> iter_core_type ct
+end
+
+module DefaultIteratorArgument = struct
+  let enter_structure _ = ()
+  let enter_value_description _ = ()
+  let enter_type_extension _ = ()
+  let enter_extension_constructor _ = ()
+  let enter_pattern _ = ()
+  let enter_expression _ = ()
+  let enter_package_type _ = ()
+  let enter_signature _ = ()
+  let enter_signature_item _ = ()
+  let enter_module_type_declaration _ = ()
+  let enter_module_type _ = ()
+  let enter_module_expr _ = ()
+  let enter_with_constraint _ = ()
+
+  let enter_core_type _ = ()
+  let enter_structure_item _ = ()
+
+  let leave_structure _ = ()
+  let leave_value_description _ = ()
+  let leave_type_extension _ = ()
+  let leave_extension_constructor _ = ()
+  let leave_pattern _ = ()
+  let leave_expression _ = ()
+  let leave_package_type _ = ()
+  let leave_signature _ = ()
+  let leave_signature_item _ = ()
+  let leave_module_type_declaration _ = ()
+  let leave_module_type _ = ()
+  let leave_module_expr _ = ()
+  let leave_with_constraint _ = ()
+
+  let leave_core_type _ = ()
+  let leave_structure_item _ = ()
+
+  let enter_binding _ = ()
+  let leave_binding _ = ()
+
+  let enter_bindings _ = ()
+  let leave_bindings _ = ()
+
+  let enter_type_declaration _ = ()
+  let leave_type_declaration _ = ()
+
+  let enter_type_declarations _ = ()
+  let leave_type_declarations _ = ()
+end
diff --git a/compiler/ml/typedtreeIter.mli b/compiler/ml/typedtreeIter.mli
new file mode 100644
index 0000000..17adaa6
--- /dev/null
+++ b/compiler/ml/typedtreeIter.mli
@@ -0,0 +1,74 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*    Thomas Gazagnaire (OCamlPro), Fabrice Le Fessant (INRIA Saclay)     *)
+(*                                                                        *)
+(*   Copyright 2007 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Asttypes
+open Typedtree
+
+module type IteratorArgument = sig
+  val enter_structure : structure -> unit
+  val enter_value_description : value_description -> unit
+  val enter_type_extension : type_extension -> unit
+  val enter_extension_constructor : extension_constructor -> unit
+  val enter_pattern : pattern -> unit
+  val enter_expression : expression -> unit
+  val enter_package_type : package_type -> unit
+  val enter_signature : signature -> unit
+  val enter_signature_item : signature_item -> unit
+  val enter_module_type_declaration : module_type_declaration -> unit
+  val enter_module_type : module_type -> unit
+  val enter_module_expr : module_expr -> unit
+  val enter_with_constraint : with_constraint -> unit
+  val enter_core_type : core_type -> unit
+  val enter_structure_item : structure_item -> unit
+
+  val leave_structure : structure -> unit
+  val leave_value_description : value_description -> unit
+  val leave_type_extension : type_extension -> unit
+  val leave_extension_constructor : extension_constructor -> unit
+  val leave_pattern : pattern -> unit
+  val leave_expression : expression -> unit
+  val leave_package_type : package_type -> unit
+  val leave_signature : signature -> unit
+  val leave_signature_item : signature_item -> unit
+  val leave_module_type_declaration : module_type_declaration -> unit
+  val leave_module_type : module_type -> unit
+  val leave_module_expr : module_expr -> unit
+  val leave_with_constraint : with_constraint -> unit
+  val leave_core_type : core_type -> unit
+  val leave_structure_item : structure_item -> unit
+
+  val enter_bindings : rec_flag -> unit
+  val enter_binding : value_binding -> unit
+  val leave_binding : value_binding -> unit
+  val leave_bindings : rec_flag -> unit
+
+  val enter_type_declarations : rec_flag -> unit
+  val enter_type_declaration : type_declaration -> unit
+  val leave_type_declaration : type_declaration -> unit
+  val leave_type_declarations : rec_flag -> unit
+end
+
+module MakeIterator : functor (Iter : IteratorArgument) -> sig
+  val iter_structure : structure -> unit
+  val iter_signature : signature -> unit
+  val iter_structure_item : structure_item -> unit
+  val iter_signature_item : signature_item -> unit
+  val iter_expression : expression -> unit
+  val iter_module_type : module_type -> unit
+  val iter_pattern : pattern -> unit
+end
+[@@warning "-67"]
+
+module DefaultIteratorArgument : IteratorArgument
diff --git a/compiler/ml/typemod.ml b/compiler/ml/typemod.ml
new file mode 100644
index 0000000..0932c62
--- /dev/null
+++ b/compiler/ml/typemod.ml
@@ -0,0 +1,1908 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Misc
+open Longident
+open Path
+open Asttypes
+open Parsetree
+open Types
+open Format
+
+type error =
+  | Cannot_apply of module_type
+  | Not_included of Includemod.error list
+  | Cannot_eliminate_dependency of module_type
+  | Signature_expected
+  | Structure_expected of module_type
+  | With_no_component of Longident.t
+  | With_mismatch of Longident.t * Includemod.error list
+  | With_makes_applicative_functor_ill_typed of
+      Longident.t * Path.t * Includemod.error list
+  | With_changes_module_alias of Longident.t * Ident.t * Path.t
+  | With_cannot_remove_constrained_type
+  | Repeated_name of string * string * Warnings.loc
+  | Non_generalizable of type_expr
+  | Non_generalizable_module of module_type
+  | Interface_not_compiled of string
+  | Not_allowed_in_functor_body
+  | Not_a_packed_module of type_expr
+  | Incomplete_packed_module of type_expr
+  | Scoping_pack of Longident.t * type_expr
+  | Recursive_module_require_explicit_type
+  | Apply_generative
+  | Cannot_scrape_alias of Path.t
+
+exception Error of Location.t * Env.t * error
+exception Error_forward of Location.error
+
+let rescript_hide_attributes (x : Typedtree.attributes) =
+  match x with
+  | [] -> false
+  | ({txt = "internal.local"; _}, _) :: _ -> true
+  | _ :: rest -> Ext_list.exists rest (fun (x, _) -> x.txt = "internal.local")
+
+let rescript_hide (x : Typedtree.structure_item_desc) =
+  match x with
+  | Tstr_module {mb_attributes} -> rescript_hide_attributes mb_attributes
+  | _ -> false
+
+open Typedtree
+
+let fst3 (x, _, _) = x
+
+let rec path_concat head p =
+  match p with
+  | Pident tail -> Pdot (Pident head, Ident.name tail, 0)
+  | Pdot (pre, s, pos) -> Pdot (path_concat head pre, s, pos)
+  | Papply _ -> assert false
+
+(* Extract a signature from a module type *)
+
+let extract_sig env loc mty =
+  match Env.scrape_alias env mty with
+  | Mty_signature sg -> sg
+  | Mty_alias (_, path) -> raise (Error (loc, env, Cannot_scrape_alias path))
+  | _ -> raise (Error (loc, env, Signature_expected))
+
+let extract_sig_open env loc mty =
+  match Env.scrape_alias env mty with
+  | Mty_signature sg -> sg
+  | Mty_alias (_, path) -> raise (Error (loc, env, Cannot_scrape_alias path))
+  | mty -> raise (Error (loc, env, Structure_expected mty))
+
+(* Compute the environment after opening a module *)
+
+let type_open_ ?used_slot ?toplevel ovf env loc lid =
+  let path = Typetexp.lookup_module ~load:true env lid.loc lid.txt in
+  match Env.open_signature ~loc ?used_slot ?toplevel ovf path env with
+  | Some env -> (path, env)
+  | None ->
+    let md = Env.find_module path env in
+    ignore (extract_sig_open env lid.loc md.md_type);
+    assert false
+
+let type_open ?toplevel env sod =
+  let path, newenv =
+    Builtin_attributes.warning_scope sod.popen_attributes (fun () ->
+        type_open_ ?toplevel sod.popen_override env sod.popen_loc sod.popen_lid)
+  in
+  let od =
+    {
+      open_override = sod.popen_override;
+      open_path = path;
+      open_txt = sod.popen_lid;
+      open_attributes = sod.popen_attributes;
+      open_loc = sod.popen_loc;
+    }
+  in
+  (path, newenv, od)
+
+(* Record a module type *)
+let rm node =
+  Stypes.record (Stypes.Ti_mod node);
+  node
+
+(* Forward declaration, to be filled in by type_module_type_of *)
+let type_module_type_of_fwd :
+    (Env.t ->
+    Parsetree.module_expr ->
+    Typedtree.module_expr * Types.module_type)
+    ref =
+  ref (fun _env _m -> assert false)
+
+(* Merge one "with" constraint in a signature *)
+
+let rec add_rec_types env = function
+  | Sig_type (id, decl, Trec_next) :: rem ->
+    add_rec_types (Env.add_type ~check:true id decl env) rem
+  | _ -> env
+
+let check_type_decl env loc id row_id newdecl decl rs rem =
+  let env = Env.add_type ~check:true id newdecl env in
+  let env =
+    match row_id with
+    | None -> env
+    | Some id -> Env.add_type ~check:false id newdecl env
+  in
+  let env = if rs = Trec_not then env else add_rec_types env rem in
+  Includemod.type_declarations ~loc env id newdecl decl;
+  Typedecl.check_coherence env loc id newdecl
+
+let update_rec_next rs rem =
+  match rs with
+  | Trec_next -> rem
+  | Trec_first | Trec_not -> (
+    match rem with
+    | Sig_type (id, decl, Trec_next) :: rem -> Sig_type (id, decl, rs) :: rem
+    | Sig_module (id, mty, Trec_next) :: rem -> Sig_module (id, mty, rs) :: rem
+    | _ -> rem)
+
+let make p n i =
+  let open Variance in
+  set May_pos p (set May_neg n (set May_weak n (set Inj i null)))
+
+let rec iter_path_apply p ~f =
+  match p with
+  | Pident _ -> ()
+  | Pdot (p, _, _) -> iter_path_apply p ~f
+  | Papply (p1, p2) ->
+    iter_path_apply p1 ~f;
+    iter_path_apply p2 ~f;
+    f p1 p2 (* after recursing, so we know both paths are well typed *)
+
+let path_is_strict_prefix =
+  let rec list_is_strict_prefix l ~prefix =
+    match (l, prefix) with
+    | [], [] -> false
+    | _ :: _, [] -> true
+    | [], _ :: _ -> false
+    | s1 :: t1, s2 :: t2 ->
+      String.equal s1 s2 && list_is_strict_prefix t1 ~prefix:t2
+  in
+  fun path ~prefix ->
+    match (Path.flatten path, Path.flatten prefix) with
+    | `Contains_apply, _ | _, `Contains_apply -> false
+    | `Ok (ident1, l1), `Ok (ident2, l2) ->
+      Ident.same ident1 ident2 && list_is_strict_prefix l1 ~prefix:l2
+
+let iterator_with_env env =
+  let env = ref env in
+  let super = Btype.type_iterators in
+  ( env,
+    {
+      super with
+      Btype.it_signature =
+        (fun self sg ->
+          (* add all items to the env before recursing down, to handle recursive
+             definitions *)
+          let env_before = !env in
+          List.iter (fun i -> env := Env.add_item i !env) sg;
+          super.Btype.it_signature self sg;
+          env := env_before);
+      Btype.it_module_type =
+        (fun self -> function
+          | Mty_functor (param, mty_arg, mty_body) ->
+            may (self.Btype.it_module_type self) mty_arg;
+            let env_before = !env in
+            env :=
+              Env.add_module ~arg:true param (Btype.default_mty mty_arg) !env;
+            self.Btype.it_module_type self mty_body;
+            env := env_before
+          | mty -> super.Btype.it_module_type self mty);
+    } )
+
+let retype_applicative_functor_type ~loc env funct arg =
+  let mty_functor = (Env.find_module funct env).md_type in
+  let mty_arg = (Env.find_module arg env).md_type in
+  let mty_param =
+    match Env.scrape_alias env mty_functor with
+    | Mty_functor (_, Some mty_param, _) -> mty_param
+    | _ -> assert false (* could trigger due to MPR#7611 *)
+  in
+  let aliasable = not (Env.is_functor_arg arg env) in
+  ignore
+    (Includemod.modtypes ~loc env
+       (Mtype.strengthen ~aliasable env mty_arg arg)
+       mty_param)
+
+(* When doing a deep destructive substitution with type M.N.t := .., we change M
+   and M.N and so we have to check that uses of the modules other than just
+   extracting components from them still make sense. There are only two such
+   kinds of uses:
+   - applicative functor types: F(M).t might not be well typed anymore
+   - aliases: module A = M still makes sense but it doesn't mean the same thing
+     anymore, so it's forbidden until it's clear what we should do with it.
+   This function would be called with M.N.t and N.t to check for these uses. *)
+let check_usage_of_path_of_substituted_item paths env signature ~loc ~lid =
+  let iterator =
+    let env, super = iterator_with_env env in
+    {
+      super with
+      Btype.it_signature_item =
+        (fun self -> function
+          | Sig_module (id, {md_type = Mty_alias (_, aliased_path); _}, _)
+            when List.exists
+                   (fun path -> path_is_strict_prefix path ~prefix:aliased_path)
+                   paths ->
+            let e = With_changes_module_alias (lid.txt, id, aliased_path) in
+            raise (Error (loc, !env, e))
+          | sig_item -> super.Btype.it_signature_item self sig_item);
+      Btype.it_path =
+        (fun referenced_path ->
+          iter_path_apply referenced_path ~f:(fun funct arg ->
+              if
+                List.exists
+                  (fun path -> path_is_strict_prefix path ~prefix:arg)
+                  paths
+              then
+                let env = !env in
+                try retype_applicative_functor_type ~loc env funct arg
+                with Includemod.Error explanation ->
+                  raise
+                    (Error
+                       ( loc,
+                         env,
+                         With_makes_applicative_functor_ill_typed
+                           (lid.txt, referenced_path, explanation) ))));
+    }
+  in
+  iterator.Btype.it_signature iterator signature;
+  Btype.unmark_iterators.Btype.it_signature Btype.unmark_iterators signature
+
+let type_decl_is_alias sdecl =
+  (* assuming no explicit constraint *)
+  match sdecl.ptype_manifest with
+  | Some {ptyp_desc = Ptyp_constr (lid, stl)}
+    when List.length stl = List.length sdecl.ptype_params -> (
+    match
+      List.iter2
+        (fun x (y, _) ->
+          match (x, y) with
+          | {ptyp_desc = Ptyp_var sx}, {ptyp_desc = Ptyp_var sy} when sx = sy ->
+            ()
+          | _, _ -> raise Exit)
+        stl sdecl.ptype_params
+    with
+    | exception Exit -> None
+    | () -> Some lid)
+  | _ -> None
+
+let params_are_constrained =
+  let rec loop = function
+    | [] -> false
+    | hd :: tl -> (
+      match (Btype.repr hd).desc with
+      | Tvar _ -> List.memq hd tl || loop tl
+      | _ -> true)
+  in
+  loop
+
+let merge_constraint initial_env loc sg constr =
+  let lid =
+    match constr with
+    | Pwith_type (lid, _)
+    | Pwith_module (lid, _)
+    | Pwith_typesubst (lid, _)
+    | Pwith_modsubst (lid, _) ->
+      lid
+  in
+  let destructive_substitution =
+    match constr with
+    | Pwith_type _ | Pwith_module _ -> false
+    | Pwith_typesubst _ | Pwith_modsubst _ -> true
+  in
+  let real_ids = ref [] in
+  let rec merge env sg namelist row_id =
+    match (sg, namelist, constr) with
+    | [], _, _ -> raise (Error (loc, env, With_no_component lid.txt))
+    | ( Sig_type (id, decl, rs) :: rem,
+        [s],
+        Pwith_type (_, ({ptype_kind = Ptype_abstract} as sdecl)) )
+      when Ident.name id = s && Typedecl.is_fixed_type sdecl ->
+      let decl_row =
+        {
+          type_params = List.map (fun _ -> Btype.newgenvar ()) sdecl.ptype_params;
+          type_arity = List.length sdecl.ptype_params;
+          type_kind = Type_abstract;
+          type_private = Private;
+          type_manifest = None;
+          type_variance =
+            List.map
+              (fun (_, v) ->
+                let c, n =
+                  match v with
+                  | Covariant -> (true, false)
+                  | Contravariant -> (false, true)
+                  | Invariant -> (false, false)
+                in
+                make (not n) (not c) false)
+              sdecl.ptype_params;
+          type_loc = sdecl.ptype_loc;
+          type_newtype_level = None;
+          type_attributes = [];
+          type_immediate = false;
+          type_unboxed = unboxed_false_default_false;
+          type_inlined_types = [];
+        }
+      and id_row = Ident.create (s ^ "#row") in
+      let initial_env = Env.add_type ~check:false id_row decl_row initial_env in
+      let tdecl =
+        Typedecl.transl_with_constraint initial_env id (Some (Pident id_row))
+          decl sdecl
+      in
+      let newdecl = tdecl.typ_type in
+      check_type_decl env sdecl.ptype_loc id row_id newdecl decl rs rem;
+      let decl_row = {decl_row with type_params = newdecl.type_params} in
+      let rs' = if rs = Trec_first then Trec_not else rs in
+      ( (Pident id, lid, Twith_type tdecl),
+        Sig_type (id_row, decl_row, rs') :: Sig_type (id, newdecl, rs) :: rem )
+    | Sig_type (id, decl, rs) :: rem, [s], Pwith_type (_, sdecl)
+      when Ident.name id = s ->
+      let tdecl =
+        Typedecl.transl_with_constraint initial_env id None decl sdecl
+      in
+      let newdecl = tdecl.typ_type in
+      check_type_decl env sdecl.ptype_loc id row_id newdecl decl rs rem;
+      ((Pident id, lid, Twith_type tdecl), Sig_type (id, newdecl, rs) :: rem)
+    | Sig_type (id, _, _) :: rem, [s], (Pwith_type _ | Pwith_typesubst _)
+      when Ident.name id = s ^ "#row" ->
+      merge env rem namelist (Some id)
+    | Sig_type (id, decl, rs) :: rem, [s], Pwith_typesubst (_, sdecl)
+      when Ident.name id = s ->
+      (* Check as for a normal with constraint, but discard definition *)
+      let tdecl =
+        Typedecl.transl_with_constraint initial_env id None decl sdecl
+      in
+      let newdecl = tdecl.typ_type in
+      check_type_decl env sdecl.ptype_loc id row_id newdecl decl rs rem;
+      real_ids := [Pident id];
+      ((Pident id, lid, Twith_typesubst tdecl), update_rec_next rs rem)
+    | Sig_module (id, md, rs) :: rem, [s], Pwith_module (_, lid')
+      when Ident.name id = s ->
+      let path, md' = Typetexp.find_module initial_env loc lid'.txt in
+      let md'' = {md' with md_type = Mtype.remove_aliases env md'.md_type} in
+      let newmd = Mtype.strengthen_decl ~aliasable:false env md'' path in
+      ignore (Includemod.modtypes ~loc env newmd.md_type md.md_type);
+      ( (Pident id, lid, Twith_module (path, lid')),
+        Sig_module (id, newmd, rs) :: rem )
+    | Sig_module (id, md, rs) :: rem, [s], Pwith_modsubst (_, lid')
+      when Ident.name id = s ->
+      let path, md' = Typetexp.find_module initial_env loc lid'.txt in
+      let newmd = Mtype.strengthen_decl ~aliasable:false env md' path in
+      ignore (Includemod.modtypes ~loc env newmd.md_type md.md_type);
+      real_ids := [Pident id];
+      ((Pident id, lid, Twith_modsubst (path, lid')), update_rec_next rs rem)
+    | Sig_module (id, md, rs) :: rem, s :: namelist, _ when Ident.name id = s ->
+      let (path, _path_loc, tcstr), newsg =
+        merge env (extract_sig env loc md.md_type) namelist None
+      in
+      let path = path_concat id path in
+      real_ids := path :: !real_ids;
+      let item = Sig_module (id, {md with md_type = Mty_signature newsg}, rs) in
+      ((path, lid, tcstr), item :: rem)
+    | item :: rem, _, _ ->
+      let cstr, items = merge (Env.add_item item env) rem namelist row_id in
+      (cstr, item :: items)
+  in
+  try
+    let names = Longident.flatten lid.txt in
+    let tcstr, sg = merge initial_env sg names None in
+    (if destructive_substitution then
+       match List.rev !real_ids with
+       | [] -> assert false
+       | last :: rest -> (
+         (* The last item is the one that's removed. We don't need to check how
+            it's used since it's replaced by a more specific type/module. *)
+         assert (
+           match last with
+           | Pident _ -> true
+           | _ -> false);
+         match rest with
+         | [] -> ()
+         | _ :: _ ->
+           check_usage_of_path_of_substituted_item rest initial_env sg ~loc ~lid
+         ));
+    let sg =
+      match tcstr with
+      | _, _, Twith_typesubst tdecl ->
+        let how_to_extend_subst =
+          let sdecl =
+            match constr with
+            | Pwith_typesubst (_, sdecl) -> sdecl
+            | _ -> assert false
+          in
+          match type_decl_is_alias sdecl with
+          | Some lid ->
+            let replacement =
+              try Env.lookup_type lid.txt initial_env
+              with Not_found -> assert false
+            in
+            fun s path -> Subst.add_type_path path replacement s
+          | None ->
+            let body =
+              match tdecl.typ_type.type_manifest with
+              | None -> assert false
+              | Some x -> x
+            in
+            let params = tdecl.typ_type.type_params in
+            if params_are_constrained params then
+              raise
+                (Error (loc, initial_env, With_cannot_remove_constrained_type));
+            fun s path -> Subst.add_type_function path ~params ~body s
+        in
+        let sub = List.fold_left how_to_extend_subst Subst.identity !real_ids in
+        Subst.signature sub sg
+      | _, _, Twith_modsubst (real_path, _) ->
+        let sub =
+          List.fold_left
+            (fun s path -> Subst.add_module_path path real_path s)
+            Subst.identity !real_ids
+        in
+        Subst.signature sub sg
+      | _ -> sg
+    in
+    (tcstr, sg)
+  with Includemod.Error explanation ->
+    raise (Error (loc, initial_env, With_mismatch (lid.txt, explanation)))
+
+(* Add recursion flags on declarations arising from a mutually recursive
+   block. *)
+
+let map_rec fn decls rem =
+  match decls with
+  | [] -> rem
+  | d1 :: dl -> fn Trec_first d1 :: map_end (fn Trec_next) dl rem
+
+let map_rec_type ~rec_flag fn decls rem =
+  match decls with
+  | [] -> rem
+  | d1 :: dl ->
+    let first =
+      match rec_flag with
+      | Recursive -> Trec_first
+      | Nonrecursive -> Trec_not
+    in
+    fn first d1 :: map_end (fn Trec_next) dl rem
+
+let rec map_rec_type_with_row_types ~rec_flag fn decls rem =
+  match decls with
+  | [] -> rem
+  | d1 :: dl ->
+    if Btype.is_row_name (Ident.name d1.typ_id) then
+      fn Trec_not d1 :: map_rec_type_with_row_types ~rec_flag fn dl rem
+    else map_rec_type ~rec_flag fn decls rem
+
+(* Add type extension flags to extension constructors *)
+let map_ext fn exts rem =
+  match exts with
+  | [] -> rem
+  | d1 :: dl -> fn Text_first d1 :: map_end (fn Text_next) dl rem
+
+(* Auxiliary for translating recursively-defined module types.
+   Return a module type that approximates the shape of the given module
+   type AST.  Retain only module, type, and module type
+   components of signatures.  For types, retain only their arity,
+   making them abstract otherwise. *)
+
+let rec approx_modtype env smty =
+  match smty.pmty_desc with
+  | Pmty_ident lid ->
+    let path, _info = Typetexp.find_modtype env smty.pmty_loc lid.txt in
+    Mty_ident path
+  | Pmty_alias lid ->
+    let path = Typetexp.lookup_module env smty.pmty_loc lid.txt in
+    Mty_alias (Mta_absent, path)
+  | Pmty_signature ssg -> Mty_signature (approx_sig env ssg)
+  | Pmty_functor (param, sarg, sres) ->
+    let arg = may_map (approx_modtype env) sarg in
+    let id, newenv =
+      Env.enter_module ~arg:true param.txt (Btype.default_mty arg) env
+    in
+    let res = approx_modtype newenv sres in
+    Mty_functor (id, arg, res)
+  | Pmty_with (sbody, _constraints) -> approx_modtype env sbody
+  | Pmty_typeof smod ->
+    let _, mty = !type_module_type_of_fwd env smod in
+    mty
+  | Pmty_extension ext ->
+    raise (Error_forward (Builtin_attributes.error_of_extension ext))
+
+and approx_module_declaration env pmd =
+  {
+    Types.md_type = approx_modtype env pmd.pmd_type;
+    md_attributes = pmd.pmd_attributes;
+    md_loc = pmd.pmd_loc;
+  }
+
+and approx_sig env ssg =
+  match ssg with
+  | [] -> []
+  | item :: srem -> (
+    match item.psig_desc with
+    | Psig_type (rec_flag, sdecls) ->
+      let decls = Typedecl.approx_type_decl sdecls in
+      let rem = approx_sig env srem in
+      map_rec_type ~rec_flag
+        (fun rs (id, info) -> Sig_type (id, info, rs))
+        decls rem
+    | Psig_module pmd ->
+      let id = Ident.create pmd.pmd_name.txt in
+      let md = approx_module_declaration env pmd in
+      let newenv = Env.enter_module_declaration id md env in
+      Sig_module (id, md, Trec_not) :: approx_sig newenv srem
+    | Psig_recmodule sdecls ->
+      let decls =
+        List.map
+          (fun pmd ->
+            (Ident.create pmd.pmd_name.txt, approx_module_declaration env pmd))
+          sdecls
+      in
+      let newenv =
+        List.fold_left
+          (fun env (id, md) ->
+            Env.add_module_declaration ~check:false id md env)
+          env decls
+      in
+      map_rec
+        (fun rs (id, md) -> Sig_module (id, md, rs))
+        decls (approx_sig newenv srem)
+    | Psig_modtype d ->
+      let info = approx_modtype_info env d in
+      let id, newenv = Env.enter_modtype d.pmtd_name.txt info env in
+      Sig_modtype (id, info) :: approx_sig newenv srem
+    | Psig_open sod ->
+      let _path, mty, _od = type_open env sod in
+      approx_sig mty srem
+    | Psig_include sincl ->
+      let smty = sincl.pincl_mod in
+      let mty = approx_modtype env smty in
+      let sg =
+        Subst.signature Subst.identity (extract_sig env smty.pmty_loc mty)
+      in
+      let newenv = Env.add_signature sg env in
+      sg @ approx_sig newenv srem
+    | _ -> approx_sig env srem)
+
+and approx_modtype_info env sinfo =
+  {
+    mtd_type = may_map (approx_modtype env) sinfo.pmtd_type;
+    mtd_attributes = sinfo.pmtd_attributes;
+    mtd_loc = sinfo.pmtd_loc;
+  }
+
+let approx_modtype env smty =
+  Warnings.without_warnings (fun () -> approx_modtype env smty)
+
+(* Additional validity checks on type definitions arising from
+   recursive modules *)
+
+let check_recmod_typedecls env sdecls decls =
+  let recmod_ids = List.map fst3 decls in
+  List.iter2
+    (fun pmd (id, _, mty) ->
+      let mty = mty.mty_type in
+      List.iter
+        (fun path ->
+          Typedecl.check_recmod_typedecl env pmd.pmd_type.pmty_loc recmod_ids
+            path (Env.find_type path env))
+        (Mtype.type_paths env (Pident id) mty))
+    sdecls decls
+
+(* Auxiliaries for checking uniqueness of names in signatures and structures *)
+
+module StringSet = Set.Make (struct
+  type t = string
+  let compare (x : t) y = String.compare x y
+end)
+
+let check cl loc tbl name =
+  match Hashtbl.find_opt tbl name with
+  | Some repeated_loc ->
+    raise (Error (loc, Env.empty, Repeated_name (cl, name, repeated_loc)))
+  | None -> Hashtbl.add tbl name loc
+
+type names = {
+  types: (string, Warnings.loc) Hashtbl.t;
+  modules: (string, Warnings.loc) Hashtbl.t;
+  modtypes: (string, Warnings.loc) Hashtbl.t;
+  typexts: (string, Warnings.loc) Hashtbl.t;
+}
+
+let new_names () =
+  {
+    types = Hashtbl.create 10;
+    modules = Hashtbl.create 10;
+    modtypes = Hashtbl.create 10;
+    typexts = Hashtbl.create 10;
+  }
+
+let check_name check names name = check names name.loc name.txt
+let check_type names loc s = check "type" loc names.types s
+let check_module names loc s = check "module" loc names.modules s
+let check_modtype names loc s = check "module type" loc names.modtypes s
+let check_typext names loc s = check "extension constructor" loc names.typexts s
+
+let check_sig_item names loc = function
+  | Sig_type (id, _, _) -> check_type names loc (Ident.name id)
+  | Sig_module (id, _, _) -> check_module names loc (Ident.name id)
+  | Sig_modtype (id, _) -> check_modtype names loc (Ident.name id)
+  | Sig_typext (id, _, _) -> check_typext names loc (Ident.name id)
+  | _ -> ()
+
+(* Simplify multiple specifications of a value or an extension in a signature.
+   (Other signature components, e.g. types, modules, etc, are checked for
+   name uniqueness.)  If multiple specifications with the same name,
+   keep only the last (rightmost) one. *)
+
+let simplify_signature sg =
+  let rec aux = function
+    | [] -> ([], StringSet.empty)
+    | (Sig_value (id, _descr) as component) :: sg ->
+      let ((sg, val_names) as k) = aux sg in
+      let name = Ident.name id in
+      if StringSet.mem name val_names then k
+      else (component :: sg, StringSet.add name val_names)
+    | component :: sg ->
+      let sg, val_names = aux sg in
+      (component :: sg, val_names)
+  in
+  let sg, _ = aux sg in
+  sg
+
+(* Check and translate a module type expression *)
+
+let transl_modtype_longident loc env lid =
+  let path, _info = Typetexp.find_modtype env loc lid in
+  path
+
+let transl_module_alias loc env lid = Typetexp.lookup_module env loc lid
+
+let mkmty desc typ env loc attrs =
+  let mty =
+    {
+      mty_desc = desc;
+      mty_type = typ;
+      mty_loc = loc;
+      mty_env = env;
+      mty_attributes = attrs;
+    }
+  in
+  Cmt_format.add_saved_type (Cmt_format.Partial_module_type mty);
+  mty
+
+let mksig desc env loc =
+  let sg = {sig_desc = desc; sig_loc = loc; sig_env = env} in
+  Cmt_format.add_saved_type (Cmt_format.Partial_signature_item sg);
+  sg
+
+(* let signature sg = List.map (fun item -> item.sig_type) sg *)
+
+let rec transl_modtype env smty =
+  Builtin_attributes.warning_scope smty.pmty_attributes (fun () ->
+      transl_modtype_aux env smty)
+
+and transl_modtype_aux env smty =
+  let loc = smty.pmty_loc in
+  match smty.pmty_desc with
+  | Pmty_ident lid ->
+    let path = transl_modtype_longident loc env lid.txt in
+    mkmty (Tmty_ident (path, lid)) (Mty_ident path) env loc smty.pmty_attributes
+  | Pmty_alias lid ->
+    let path = transl_module_alias loc env lid.txt in
+    mkmty
+      (Tmty_alias (path, lid))
+      (Mty_alias (Mta_absent, path))
+      env loc smty.pmty_attributes
+  | Pmty_signature ssg ->
+    let sg = transl_signature env ssg in
+    mkmty (Tmty_signature sg) (Mty_signature sg.sig_type) env loc
+      smty.pmty_attributes
+  | Pmty_functor (param, sarg, sres) ->
+    let arg = Misc.may_map (transl_modtype env) sarg in
+    let ty_arg = Misc.may_map (fun m -> m.mty_type) arg in
+    let id, newenv =
+      Env.enter_module ~arg:true param.txt (Btype.default_mty ty_arg) env
+    in
+    Ctype.init_def (Ident.current_time ());
+    (* PR#6513 *)
+    let res = transl_modtype newenv sres in
+    mkmty
+      (Tmty_functor (id, param, arg, res))
+      (Mty_functor (id, ty_arg, res.mty_type))
+      env loc smty.pmty_attributes
+  | Pmty_with (sbody, constraints) ->
+    let body = transl_modtype env sbody in
+    let init_sg = extract_sig env sbody.pmty_loc body.mty_type in
+    let rev_tcstrs, final_sg =
+      List.fold_left
+        (fun (rev_tcstrs, sg) sdecl ->
+          let tcstr, sg = merge_constraint env smty.pmty_loc sg sdecl in
+          (tcstr :: rev_tcstrs, sg))
+        ([], init_sg) constraints
+    in
+    mkmty
+      (Tmty_with (body, List.rev rev_tcstrs))
+      (Mtype.freshen (Mty_signature final_sg))
+      env loc smty.pmty_attributes
+  | Pmty_typeof smod ->
+    let env = Env.in_signature false env in
+    let tmty, mty = !type_module_type_of_fwd env smod in
+    mkmty (Tmty_typeof tmty) mty env loc smty.pmty_attributes
+  | Pmty_extension ext ->
+    raise (Error_forward (Builtin_attributes.error_of_extension ext))
+
+and transl_signature env sg =
+  let names = new_names () in
+  let rec transl_sig env sg =
+    Ctype.init_def (Ident.current_time ());
+    match sg with
+    | [] -> ([], [], env)
+    | item :: srem -> (
+      let loc = item.psig_loc in
+      match item.psig_desc with
+      | Psig_value sdesc ->
+        let tdesc, newenv =
+          Typedecl.transl_value_decl env item.psig_loc sdesc
+        in
+        let trem, rem, final_env = transl_sig newenv srem in
+        ( mksig (Tsig_value tdesc) env loc :: trem,
+          Sig_value (tdesc.val_id, tdesc.val_val) :: rem,
+          final_env )
+      | Psig_type (rec_flag, sdecls) ->
+        List.iter
+          (fun decl -> check_name check_type names decl.ptype_name)
+          sdecls;
+        let decls, newenv = Typedecl.transl_type_decl env rec_flag sdecls in
+        let trem, rem, final_env = transl_sig newenv srem in
+        ( mksig (Tsig_type (rec_flag, decls)) env loc :: trem,
+          map_rec_type_with_row_types ~rec_flag
+            (fun rs td -> Sig_type (td.typ_id, td.typ_type, rs))
+            decls rem,
+          final_env )
+      | Psig_typext styext ->
+        List.iter
+          (fun pext -> check_name check_typext names pext.pext_name)
+          styext.ptyext_constructors;
+        let tyext, newenv =
+          Typedecl.transl_type_extension false env item.psig_loc styext
+        in
+        let trem, rem, final_env = transl_sig newenv srem in
+        let constructors = tyext.tyext_constructors in
+        ( mksig (Tsig_typext tyext) env loc :: trem,
+          map_ext
+            (fun es ext -> Sig_typext (ext.ext_id, ext.ext_type, es))
+            constructors rem,
+          final_env )
+      | Psig_exception sext ->
+        check_name check_typext names sext.pext_name;
+        let ext, newenv = Typedecl.transl_exception env sext in
+        let trem, rem, final_env = transl_sig newenv srem in
+        ( mksig (Tsig_exception ext) env loc :: trem,
+          Sig_typext (ext.ext_id, ext.ext_type, Text_exception) :: rem,
+          final_env )
+      | Psig_module pmd ->
+        check_name check_module names pmd.pmd_name;
+        let id = Ident.create pmd.pmd_name.txt in
+        let tmty =
+          Builtin_attributes.warning_scope pmd.pmd_attributes (fun () ->
+              transl_modtype env pmd.pmd_type)
+        in
+        let md =
+          {
+            md_type = tmty.mty_type;
+            md_attributes = pmd.pmd_attributes;
+            md_loc = pmd.pmd_loc;
+          }
+        in
+        let newenv = Env.enter_module_declaration id md env in
+        let trem, rem, final_env = transl_sig newenv srem in
+        ( mksig
+            (Tsig_module
+               {
+                 md_id = id;
+                 md_name = pmd.pmd_name;
+                 md_type = tmty;
+                 md_loc = pmd.pmd_loc;
+                 md_attributes = pmd.pmd_attributes;
+               })
+            env loc
+          :: trem,
+          Sig_module (id, md, Trec_not) :: rem,
+          final_env )
+      | Psig_recmodule sdecls ->
+        List.iter (fun pmd -> check_name check_module names pmd.pmd_name) sdecls;
+        let decls, newenv = transl_recmodule_modtypes env sdecls in
+        let trem, rem, final_env = transl_sig newenv srem in
+        ( mksig (Tsig_recmodule decls) env loc :: trem,
+          map_rec
+            (fun rs md ->
+              let d =
+                {
+                  Types.md_type = md.md_type.mty_type;
+                  md_attributes = md.md_attributes;
+                  md_loc = md.md_loc;
+                }
+              in
+              Sig_module (md.md_id, d, rs))
+            decls rem,
+          final_env )
+      | Psig_modtype pmtd ->
+        let newenv, mtd, sg = transl_modtype_decl names env pmtd in
+        let trem, rem, final_env = transl_sig newenv srem in
+        (mksig (Tsig_modtype mtd) env loc :: trem, sg :: rem, final_env)
+      | Psig_open sod ->
+        let _path, newenv, od = type_open env sod in
+        let trem, rem, final_env = transl_sig newenv srem in
+        (mksig (Tsig_open od) env loc :: trem, rem, final_env)
+      | Psig_include sincl ->
+        let smty = sincl.pincl_mod in
+        let tmty =
+          Builtin_attributes.warning_scope sincl.pincl_attributes (fun () ->
+              transl_modtype env smty)
+        in
+        let mty = tmty.mty_type in
+        let sg =
+          Subst.signature Subst.identity (extract_sig env smty.pmty_loc mty)
+        in
+        List.iter (check_sig_item names item.psig_loc) sg;
+        let newenv = Env.add_signature sg env in
+        let incl =
+          {
+            incl_mod = tmty;
+            incl_type = sg;
+            incl_attributes = sincl.pincl_attributes;
+            incl_loc = sincl.pincl_loc;
+          }
+        in
+        let trem, rem, final_env = transl_sig newenv srem in
+        (mksig (Tsig_include incl) env loc :: trem, sg @ rem, final_env)
+      | Psig_attribute x ->
+        Builtin_attributes.warning_attribute x;
+        let trem, rem, final_env = transl_sig env srem in
+        (mksig (Tsig_attribute x) env loc :: trem, rem, final_env)
+      | Psig_extension (ext, _attrs) ->
+        raise (Error_forward (Builtin_attributes.error_of_extension ext)))
+  in
+  let previous_saved_types = Cmt_format.get_saved_types () in
+  Builtin_attributes.warning_scope [] (fun () ->
+      let trem, rem, final_env = transl_sig (Env.in_signature true env) sg in
+      let rem = simplify_signature rem in
+      let sg = {sig_items = trem; sig_type = rem; sig_final_env = final_env} in
+      Cmt_format.set_saved_types
+        (Cmt_format.Partial_signature sg :: previous_saved_types);
+      sg)
+
+and transl_modtype_decl names env pmtd =
+  Builtin_attributes.warning_scope pmtd.pmtd_attributes (fun () ->
+      transl_modtype_decl_aux names env pmtd)
+
+and transl_modtype_decl_aux names env
+    {pmtd_name; pmtd_type; pmtd_attributes; pmtd_loc} =
+  check_name check_modtype names pmtd_name;
+  let tmty = Misc.may_map (transl_modtype env) pmtd_type in
+  let decl =
+    {
+      Types.mtd_type = may_map (fun t -> t.mty_type) tmty;
+      mtd_attributes = pmtd_attributes;
+      mtd_loc = pmtd_loc;
+    }
+  in
+  let id, newenv = Env.enter_modtype pmtd_name.txt decl env in
+  let mtd =
+    {
+      mtd_id = id;
+      mtd_name = pmtd_name;
+      mtd_type = tmty;
+      mtd_attributes = pmtd_attributes;
+      mtd_loc = pmtd_loc;
+    }
+  in
+  (newenv, mtd, Sig_modtype (id, decl))
+
+and transl_recmodule_modtypes env sdecls =
+  let make_env curr =
+    List.fold_left
+      (fun env (id, _, mty) -> Env.add_module ~arg:true id mty env)
+      env curr
+  in
+  let make_env2 curr =
+    List.fold_left
+      (fun env (id, _, mty) -> Env.add_module ~arg:true id mty.mty_type env)
+      env curr
+  in
+  let transition env_c curr =
+    List.map2
+      (fun pmd (id, id_loc, _mty) ->
+        let tmty =
+          Builtin_attributes.warning_scope pmd.pmd_attributes (fun () ->
+              transl_modtype env_c pmd.pmd_type)
+        in
+        (id, id_loc, tmty))
+      sdecls curr
+  in
+  let ids = List.map (fun x -> Ident.create x.pmd_name.txt) sdecls in
+  let approx_env =
+    (*
+       cf #5965
+       We use a dummy module type in order to detect a reference to one
+       of the module being defined during the call to approx_modtype.
+       It will be detected in Env.lookup_module.
+    *)
+    List.fold_left
+      (fun env id ->
+        let dummy = Mty_ident (Path.Pident (Ident.create "#recmod#")) in
+        Env.add_module ~arg:true id dummy env)
+      env ids
+  in
+  Ctype.init_def (Ident.current_time ());
+  (* PR#7082 *)
+  let init =
+    List.map2
+      (fun id pmd -> (id, pmd.pmd_name, approx_modtype approx_env pmd.pmd_type))
+      ids sdecls
+  in
+  let env0 = make_env init in
+  let dcl1 = Warnings.without_warnings (fun () -> transition env0 init) in
+  let env1 = make_env2 dcl1 in
+  check_recmod_typedecls env1 sdecls dcl1;
+  let dcl2 = transition env1 dcl1 in
+  (*
+  List.iter
+    (fun (id, mty) ->
+      Format.printf "%a: %a@." Printtyp.ident id Printtyp.modtype mty)
+    dcl2;
+*)
+  let env2 = make_env2 dcl2 in
+  check_recmod_typedecls env2 sdecls dcl2;
+  let dcl2 =
+    List.map2
+      (fun pmd (id, id_loc, mty) ->
+        {
+          md_id = id;
+          md_name = id_loc;
+          md_type = mty;
+          md_loc = pmd.pmd_loc;
+          md_attributes = pmd.pmd_attributes;
+        })
+      sdecls dcl2
+  in
+  (dcl2, env2)
+
+(* Try to convert a module expression to a module path. *)
+
+exception Not_a_path
+
+let rec path_of_module mexp =
+  match mexp.mod_desc with
+  | Tmod_ident (p, _) -> p
+  | Tmod_apply (funct, arg, _coercion) when !Clflags.applicative_functors ->
+    Papply (path_of_module funct, path_of_module arg)
+  | Tmod_constraint (mexp, _, _, _) -> path_of_module mexp
+  | _ -> raise Not_a_path
+
+let path_of_module mexp =
+  try Some (path_of_module mexp) with Not_a_path -> None
+
+(* Check that all core type schemes in a structure are closed *)
+
+let rec closed_modtype env = function
+  | Mty_ident _ -> true
+  | Mty_alias _ -> true
+  | Mty_signature sg ->
+    let env = Env.add_signature sg env in
+    List.for_all (closed_signature_item env) sg
+  | Mty_functor (id, param, body) ->
+    let env = Env.add_module ~arg:true id (Btype.default_mty param) env in
+    closed_modtype env body
+
+and closed_signature_item env = function
+  | Sig_value (_id, desc) -> Ctype.closed_schema env desc.val_type
+  | Sig_module (_id, md, _) -> closed_modtype env md.md_type
+  | _ -> true
+
+let check_nongen_scheme env sig_item =
+  match sig_item with
+  | Sig_value (_id, vd) ->
+    if not (Ctype.closed_schema env vd.val_type) then
+      raise (Error (vd.val_loc, env, Non_generalizable vd.val_type))
+  | Sig_module (_id, md, _) ->
+    if not (closed_modtype env md.md_type) then
+      raise (Error (md.md_loc, env, Non_generalizable_module md.md_type))
+  | _ -> ()
+
+let check_nongen_schemes env sg = List.iter (check_nongen_scheme env) sg
+
+(* Helpers for typing recursive modules *)
+
+let anchor_submodule name anchor =
+  match anchor with
+  | None -> None
+  | Some p -> Some (Pdot (p, name, nopos))
+let anchor_recmodule id = Some (Pident id)
+
+let enrich_type_decls anchor decls oldenv newenv =
+  match anchor with
+  | None -> newenv
+  | Some p ->
+    List.fold_left
+      (fun e info ->
+        let id = info.typ_id in
+        let info' =
+          Mtype.enrich_typedecl oldenv
+            (Pdot (p, Ident.name id, nopos))
+            info.typ_type
+        in
+        Env.add_type ~check:true id info' e)
+      oldenv decls
+
+let enrich_module_type anchor name mty env =
+  match anchor with
+  | None -> mty
+  | Some p -> Mtype.enrich_modtype env (Pdot (p, name, nopos)) mty
+
+let check_recmodule_inclusion env bindings =
+  (* PR#4450, PR#4470: consider
+        module rec X : DECL = MOD  where MOD has inferred type ACTUAL
+     The "natural" typing condition
+        E, X: ACTUAL |- ACTUAL <: DECL
+     leads to circularities through manifest types.
+     Instead, we "unroll away" the potential circularities a finite number
+     of times.  The (weaker) condition we implement is:
+        E, X: DECL,
+           X1: ACTUAL,
+           X2: ACTUAL{X <- X1}/X1
+           ...
+           Xn: ACTUAL{X <- X(n-1)}/X(n-1)
+        |- ACTUAL{X <- Xn}/Xn <: DECL{X <- Xn}
+     so that manifest types rooted at X(n+1) are expanded in terms of X(n),
+     avoiding circularities.  The strengthenings ensure that
+     Xn.t = X(n-1).t = ... = X2.t = X1.t.
+     N can be chosen arbitrarily; larger values of N result in more
+     recursive definitions being accepted.  A good choice appears to be
+     the number of mutually recursive declarations. *)
+  let subst_and_strengthen env s id mty =
+    Mtype.strengthen ~aliasable:false env (Subst.modtype s mty)
+      (Subst.module_path s (Pident id))
+  in
+
+  let rec check_incl first_time n env s =
+    if n > 0 then
+      (* Generate fresh names Y_i for the rec. bound module idents X_i *)
+      let bindings1 =
+        List.map
+          (fun (id, _, _mty_decl, _modl, mty_actual, _attrs, _loc) ->
+            (id, Ident.rename id, mty_actual))
+          bindings
+      in
+      (* Enter the Y_i in the environment with their actual types substituted
+         by the input substitution s *)
+      let env' =
+        List.fold_left
+          (fun env (id, id', mty_actual) ->
+            let mty_actual' =
+              if first_time then mty_actual
+              else subst_and_strengthen env s id mty_actual
+            in
+            Env.add_module ~arg:false id' mty_actual' env)
+          env bindings1
+      in
+      (* Build the output substitution Y_i <- X_i *)
+      let s' =
+        List.fold_left
+          (fun s (id, id', _mty_actual) -> Subst.add_module id (Pident id') s)
+          Subst.identity bindings1
+      in
+      (* Recurse with env' and s' *)
+      check_incl false (n - 1) env' s'
+    else
+      (* Base case: check inclusion of s(mty_actual) in s(mty_decl)
+         and insert coercion if needed *)
+      let check_inclusion (id, id_loc, mty_decl, modl, mty_actual, attrs, loc) =
+        let mty_decl' = Subst.modtype s mty_decl.mty_type
+        and mty_actual' = subst_and_strengthen env s id mty_actual in
+        let coercion =
+          try Includemod.modtypes ~loc:modl.mod_loc env mty_actual' mty_decl'
+          with Includemod.Error msg ->
+            raise (Error (modl.mod_loc, env, Not_included msg))
+        in
+        let modl' =
+          {
+            mod_desc =
+              Tmod_constraint
+                (modl, mty_decl.mty_type, Tmodtype_explicit mty_decl, coercion);
+            mod_type = mty_decl.mty_type;
+            mod_env = env;
+            mod_loc = modl.mod_loc;
+            mod_attributes = [];
+          }
+        in
+        {
+          mb_id = id;
+          mb_name = id_loc;
+          mb_expr = modl';
+          mb_attributes = attrs;
+          mb_loc = loc;
+        }
+      in
+      List.map check_inclusion bindings
+  in
+  check_incl true (List.length bindings) env Subst.identity
+
+(* Helper for unpack *)
+
+let rec package_constraints env loc mty constrs =
+  if constrs = [] then mty
+  else
+    let sg = extract_sig env loc mty in
+    let sg' =
+      List.map
+        (function
+          | Sig_type (id, ({type_params = []} as td), rs)
+            when List.mem_assoc [Ident.name id] constrs ->
+            let ty = List.assoc [Ident.name id] constrs in
+            Sig_type (id, {td with type_manifest = Some ty}, rs)
+          | Sig_module (id, md, rs) ->
+            let rec aux = function
+              | (m :: (_ :: _ as l), t) :: rest when m = Ident.name id ->
+                (l, t) :: aux rest
+              | _ :: rest -> aux rest
+              | [] -> []
+            in
+            let md =
+              {
+                md with
+                md_type = package_constraints env loc md.md_type (aux constrs);
+              }
+            in
+            Sig_module (id, md, rs)
+          | item -> item)
+        sg
+    in
+    Mty_signature sg'
+
+let modtype_of_package env loc p nl tl =
+  try
+    match (Env.find_modtype p env).mtd_type with
+    | Some mty when nl <> [] ->
+      package_constraints env loc mty
+        (List.combine (List.map Longident.flatten nl) tl)
+    | _ ->
+      if nl = [] then Mty_ident p
+      else raise (Error (loc, env, Signature_expected))
+  with Not_found ->
+    let error = Typetexp.Unbound_modtype (Ctype.lid_of_path p) in
+    raise (Typetexp.Error (loc, env, error))
+
+let package_subtype env p1 nl1 tl1 p2 nl2 tl2 =
+  let mkmty p nl tl =
+    let ntl =
+      Ext_list.filter (List.combine nl tl) (fun (_n, t) ->
+          Ctype.free_variables t = [])
+    in
+    let nl, tl = List.split ntl in
+    modtype_of_package env Location.none p nl tl
+  in
+  let mty1 = mkmty p1 nl1 tl1 and mty2 = mkmty p2 nl2 tl2 in
+  try Includemod.modtypes ~loc:Location.none env mty1 mty2 = Tcoerce_none
+  with Includemod.Error _msg -> false
+(* raise(Error(Location.none, env, Not_included msg)) *)
+
+let () = Ctype.package_subtype := package_subtype
+
+let wrap_constraint env arg mty explicit =
+  let coercion =
+    try Includemod.modtypes ~loc:arg.mod_loc env arg.mod_type mty
+    with Includemod.Error msg ->
+      raise (Error (arg.mod_loc, env, Not_included msg))
+  in
+  {
+    mod_desc = Tmod_constraint (arg, mty, explicit, coercion);
+    mod_type = mty;
+    mod_env = env;
+    mod_attributes = [];
+    mod_loc = arg.mod_loc;
+  }
+
+(* Type a module value expression *)
+
+let rec type_module ?(alias = false) sttn funct_body anchor env smod =
+  Builtin_attributes.warning_scope smod.pmod_attributes (fun () ->
+      type_module_aux ~alias sttn funct_body anchor env smod)
+
+and type_module_aux ~alias sttn funct_body anchor env smod =
+  match smod.pmod_desc with
+  | Pmod_ident lid ->
+    let path =
+      Typetexp.lookup_module ~load:(not alias) env smod.pmod_loc lid.txt
+    in
+    let md =
+      {
+        mod_desc = Tmod_ident (path, lid);
+        mod_type = Mty_alias (Mta_absent, path);
+        mod_env = env;
+        mod_attributes = smod.pmod_attributes;
+        mod_loc = smod.pmod_loc;
+      }
+    in
+    let aliasable = not (Env.is_functor_arg path env) in
+    let md =
+      if alias && aliasable then md
+      else
+        match (Env.find_module path env).md_type with
+        | Mty_alias (_, p1) when not alias ->
+          let p1 = Env.normalize_path (Some smod.pmod_loc) env p1 in
+          let mty = Includemod.expand_module_alias env [] p1 in
+          {
+            md with
+            mod_desc =
+              Tmod_constraint
+                (md, mty, Tmodtype_implicit, Tcoerce_alias (p1, Tcoerce_none));
+            mod_type =
+              (if sttn then Mtype.strengthen ~aliasable:true env mty p1 else mty);
+          }
+        | mty ->
+          let mty =
+            if sttn then Mtype.strengthen ~aliasable env mty path else mty
+          in
+          {md with mod_type = mty}
+    in
+    rm md
+  | Pmod_structure sstr ->
+    let str, sg, _finalenv =
+      type_structure funct_body anchor env sstr smod.pmod_loc
+    in
+    let md =
+      rm
+        {
+          mod_desc = Tmod_structure str;
+          mod_type = Mty_signature sg;
+          mod_env = env;
+          mod_attributes = smod.pmod_attributes;
+          mod_loc = smod.pmod_loc;
+        }
+    in
+    let sg' = simplify_signature sg in
+    if List.length sg' = List.length sg then md
+    else
+      wrap_constraint
+        (Env.implicit_coercion env)
+        md (Mty_signature sg') Tmodtype_implicit
+  | Pmod_functor (name, smty, sbody) ->
+    let mty = may_map (transl_modtype env) smty in
+    let ty_arg = may_map (fun m -> m.mty_type) mty in
+    let (id, newenv), funct_body =
+      match ty_arg with
+      | None -> ((Ident.create "*", env), false)
+      | Some mty -> (Env.enter_module ~arg:true name.txt mty env, true)
+    in
+    Ctype.init_def (Ident.current_time ());
+    (* PR#6981 *)
+    let body = type_module sttn funct_body None newenv sbody in
+    rm
+      {
+        mod_desc = Tmod_functor (id, name, mty, body);
+        mod_type = Mty_functor (id, ty_arg, body.mod_type);
+        mod_env = env;
+        mod_attributes = smod.pmod_attributes;
+        mod_loc = smod.pmod_loc;
+      }
+  | Pmod_apply (sfunct, sarg) -> (
+    let arg = type_module true funct_body None env sarg in
+    let path = path_of_module arg in
+    let funct = type_module (sttn && path <> None) funct_body None env sfunct in
+    match Env.scrape_alias env funct.mod_type with
+    | Mty_functor (param, mty_param, mty_res) as mty_functor ->
+      let generative, mty_param =
+        (mty_param = None, Btype.default_mty mty_param)
+      in
+      if generative then (
+        if sarg.pmod_desc <> Pmod_structure [] then
+          raise (Error (sfunct.pmod_loc, env, Apply_generative));
+        if funct_body && Mtype.contains_type env funct.mod_type then
+          raise (Error (smod.pmod_loc, env, Not_allowed_in_functor_body)));
+      let coercion =
+        try Includemod.modtypes ~loc:sarg.pmod_loc env arg.mod_type mty_param
+        with Includemod.Error msg ->
+          raise (Error (sarg.pmod_loc, env, Not_included msg))
+      in
+      let mty_appl =
+        match path with
+        | Some path ->
+          Subst.modtype (Subst.add_module param path Subst.identity) mty_res
+        | None -> (
+          if generative then mty_res
+          else
+            try
+              Mtype.nondep_supertype
+                (Env.add_module ~arg:true param arg.mod_type env)
+                param mty_res
+            with Not_found ->
+              raise
+                (Error
+                   (smod.pmod_loc, env, Cannot_eliminate_dependency mty_functor))
+          )
+      in
+      rm
+        {
+          mod_desc = Tmod_apply (funct, arg, coercion);
+          mod_type = mty_appl;
+          mod_env = env;
+          mod_attributes = smod.pmod_attributes;
+          mod_loc = smod.pmod_loc;
+        }
+    | Mty_alias (_, path) ->
+      raise (Error (sfunct.pmod_loc, env, Cannot_scrape_alias path))
+    | _ -> raise (Error (sfunct.pmod_loc, env, Cannot_apply funct.mod_type)))
+  | Pmod_constraint (sarg, smty) ->
+    let arg = type_module ~alias true funct_body anchor env sarg in
+    let mty = transl_modtype env smty in
+    rm
+      {
+        (wrap_constraint env arg mty.mty_type (Tmodtype_explicit mty)) with
+        mod_loc = smod.pmod_loc;
+        mod_attributes = smod.pmod_attributes;
+      }
+  | Pmod_unpack sexp ->
+    let exp = Typecore.type_exp ~context:None env sexp in
+    let mty =
+      match Ctype.expand_head env exp.exp_type with
+      | {desc = Tpackage (p, nl, tl)} ->
+        if List.exists (fun t -> Ctype.free_variables t <> []) tl then
+          raise
+            (Error (smod.pmod_loc, env, Incomplete_packed_module exp.exp_type));
+        modtype_of_package env smod.pmod_loc p nl tl
+      | {desc = Tvar _} ->
+        raise
+          (Typecore.Error (smod.pmod_loc, env, Typecore.Cannot_infer_signature))
+      | _ ->
+        raise (Error (smod.pmod_loc, env, Not_a_packed_module exp.exp_type))
+    in
+    if funct_body && Mtype.contains_type env mty then
+      raise (Error (smod.pmod_loc, env, Not_allowed_in_functor_body));
+    rm
+      {
+        mod_desc = Tmod_unpack (exp, mty);
+        mod_type = mty;
+        mod_env = env;
+        mod_attributes = smod.pmod_attributes;
+        mod_loc = smod.pmod_loc;
+      }
+  | Pmod_extension ext ->
+    raise (Error_forward (Builtin_attributes.error_of_extension ext))
+
+and type_structure ?(toplevel = false) funct_body anchor env sstr scope =
+  let names = new_names () in
+
+  let type_str_item env srem {pstr_loc = loc; pstr_desc = desc} =
+    match desc with
+    | Pstr_eval (sexpr, attrs) ->
+      let expr =
+        Builtin_attributes.warning_scope attrs (fun () ->
+            Typecore.type_expression ~context:None env sexpr)
+      in
+      (Tstr_eval (expr, attrs), [], env)
+    | Pstr_value (rec_flag, sdefs) ->
+      let scope =
+        match rec_flag with
+        | Recursive ->
+          Some
+            (Annot.Idef {scope with Location.loc_start = loc.Location.loc_start})
+        | Nonrecursive ->
+          let start =
+            match srem with
+            | [] -> loc.Location.loc_end
+            | {pstr_loc = loc2} :: _ -> loc2.Location.loc_start
+          in
+          Some (Annot.Idef {scope with Location.loc_start = start})
+      in
+      let defs, newenv =
+        Typecore.type_binding ~context:None env rec_flag sdefs scope
+      in
+      let () =
+        if rec_flag = Recursive then Rec_check.check_recursive_bindings defs
+      in
+      (* Note: Env.find_value does not trigger the value_used event. Values
+         will be marked as being used during the signature inclusion test. *)
+      ( Tstr_value (rec_flag, defs),
+        List.map
+          (fun id -> Sig_value (id, Env.find_value (Pident id) newenv))
+          (let_bound_idents defs),
+        newenv )
+    | Pstr_primitive sdesc ->
+      let desc, newenv = Typedecl.transl_value_decl env loc sdesc in
+      (Tstr_primitive desc, [Sig_value (desc.val_id, desc.val_val)], newenv)
+    | Pstr_type (rec_flag, sdecls) ->
+      List.iter (fun decl -> check_name check_type names decl.ptype_name) sdecls;
+      let decls, newenv = Typedecl.transl_type_decl env rec_flag sdecls in
+      ( Tstr_type (rec_flag, decls),
+        map_rec_type_with_row_types ~rec_flag
+          (fun rs info -> Sig_type (info.typ_id, info.typ_type, rs))
+          decls [],
+        enrich_type_decls anchor decls env newenv )
+    | Pstr_typext styext ->
+      List.iter
+        (fun pext -> check_name check_typext names pext.pext_name)
+        styext.ptyext_constructors;
+      let tyext, newenv = Typedecl.transl_type_extension true env loc styext in
+      ( Tstr_typext tyext,
+        map_ext
+          (fun es ext -> Sig_typext (ext.ext_id, ext.ext_type, es))
+          tyext.tyext_constructors [],
+        newenv )
+    | Pstr_exception sext ->
+      check_name check_typext names sext.pext_name;
+      let ext, newenv = Typedecl.transl_exception env sext in
+      ( Tstr_exception ext,
+        [Sig_typext (ext.ext_id, ext.ext_type, Text_exception)],
+        newenv )
+    | Pstr_module
+        {pmb_name = name; pmb_expr = smodl; pmb_attributes = attrs; pmb_loc} ->
+      check_name check_module names name;
+      let id = Ident.create name.txt in
+      (* create early for PR#6752 *)
+      let modl =
+        Builtin_attributes.warning_scope attrs (fun () ->
+            type_module ~alias:true true funct_body
+              (anchor_submodule name.txt anchor)
+              env smodl)
+      in
+      let md =
+        {
+          md_type = enrich_module_type anchor name.txt modl.mod_type env;
+          md_attributes = attrs;
+          md_loc = pmb_loc;
+        }
+      in
+      (*prerr_endline (Ident.unique_toplevel_name id);*)
+      Mtype.lower_nongen (Ident.binding_time id - 1) md.md_type;
+      let newenv = Env.enter_module_declaration id md env in
+      ( Tstr_module
+          {
+            mb_id = id;
+            mb_name = name;
+            mb_expr = modl;
+            mb_attributes = attrs;
+            mb_loc = pmb_loc;
+          },
+        [
+          Sig_module
+            ( id,
+              {md_type = modl.mod_type; md_attributes = attrs; md_loc = pmb_loc},
+              Trec_not );
+        ],
+        newenv )
+    | Pstr_recmodule sbind ->
+      let sbind =
+        List.map
+          (function
+            | {
+                pmb_name = name;
+                pmb_expr = {pmod_desc = Pmod_constraint (expr, typ)};
+                pmb_attributes = attrs;
+                pmb_loc = loc;
+              } ->
+              (name, typ, expr, attrs, loc)
+            | mb ->
+              raise
+                (Error
+                   ( mb.pmb_expr.pmod_loc,
+                     env,
+                     Recursive_module_require_explicit_type )))
+          sbind
+      in
+      List.iter
+        (fun (name, _, _, _, _) -> check_name check_module names name)
+        sbind;
+      let decls, newenv =
+        transl_recmodule_modtypes env
+          (List.map
+             (fun (name, smty, _smodl, attrs, loc) ->
+               {
+                 pmd_name = name;
+                 pmd_type = smty;
+                 pmd_attributes = attrs;
+                 pmd_loc = loc;
+               })
+             sbind)
+      in
+      let bindings1 =
+        List.map2
+          (fun {md_id = id; md_type = mty} (name, _, smodl, attrs, loc) ->
+            let modl =
+              Builtin_attributes.warning_scope attrs (fun () ->
+                  type_module true funct_body (anchor_recmodule id) newenv smodl)
+            in
+            let mty' =
+              enrich_module_type anchor (Ident.name id) modl.mod_type newenv
+            in
+            (id, name, mty, modl, mty', attrs, loc))
+          decls sbind
+      in
+      let newenv =
+        (* allow aliasing recursive modules from outside *)
+        List.fold_left
+          (fun env md ->
+            let mdecl =
+              {
+                md_type = md.md_type.mty_type;
+                md_attributes = md.md_attributes;
+                md_loc = md.md_loc;
+              }
+            in
+            Env.add_module_declaration ~check:true md.md_id mdecl env)
+          env decls
+      in
+      let bindings2 = check_recmodule_inclusion newenv bindings1 in
+      ( Tstr_recmodule bindings2,
+        map_rec
+          (fun rs mb ->
+            Sig_module
+              ( mb.mb_id,
+                {
+                  md_type = mb.mb_expr.mod_type;
+                  md_attributes = mb.mb_attributes;
+                  md_loc = mb.mb_loc;
+                },
+                rs ))
+          bindings2 [],
+        newenv )
+    | Pstr_modtype pmtd ->
+      (* check that it is non-abstract *)
+      let newenv, mtd, sg = transl_modtype_decl names env pmtd in
+      (Tstr_modtype mtd, [sg], newenv)
+    | Pstr_open sod ->
+      let _path, newenv, od = type_open ~toplevel env sod in
+      (Tstr_open od, [], newenv)
+    | Pstr_include sincl ->
+      let smodl = sincl.pincl_mod in
+      let modl =
+        Builtin_attributes.warning_scope sincl.pincl_attributes (fun () ->
+            type_module true funct_body None env smodl)
+      in
+      (* Rename all identifiers bound by this signature to avoid clashes *)
+      let sg =
+        Subst.signature Subst.identity
+          (extract_sig_open env smodl.pmod_loc modl.mod_type)
+      in
+      List.iter (check_sig_item names loc) sg;
+      let new_env = Env.add_signature sg env in
+      let incl =
+        {
+          incl_mod = modl;
+          incl_type = sg;
+          incl_attributes = sincl.pincl_attributes;
+          incl_loc = sincl.pincl_loc;
+        }
+      in
+      (Tstr_include incl, sg, new_env)
+    | Pstr_extension (ext, _attrs) ->
+      raise (Error_forward (Builtin_attributes.error_of_extension ext))
+    | Pstr_attribute x ->
+      Builtin_attributes.warning_attribute x;
+      (Tstr_attribute x, [], env)
+  in
+  let rec type_struct env sstr =
+    Ctype.init_def (Ident.current_time ());
+    match sstr with
+    | [] -> ([], [], env)
+    | pstr :: srem ->
+      let previous_saved_types = Cmt_format.get_saved_types () in
+      let desc, sg, new_env = type_str_item env srem pstr in
+      let str = {str_desc = desc; str_loc = pstr.pstr_loc; str_env = env} in
+      Cmt_format.set_saved_types
+        (Cmt_format.Partial_structure_item str :: previous_saved_types);
+      let str_rem, sig_rem, final_env = type_struct new_env srem in
+      let new_sg = if rescript_hide desc then sig_rem else sg @ sig_rem in
+      (str :: str_rem, new_sg, final_env)
+  in
+  if !Clflags.annotations then
+    (* moved to genannot *)
+    List.iter
+      (function
+        | {pstr_loc = l} -> Stypes.record_phrase l)
+      sstr;
+  let previous_saved_types = Cmt_format.get_saved_types () in
+  let run () =
+    let items, sg, final_env = type_struct env sstr in
+    let str = {str_items = items; str_type = sg; str_final_env = final_env} in
+    Cmt_format.set_saved_types
+      (Cmt_format.Partial_structure str :: previous_saved_types);
+    (str, sg, final_env)
+  in
+  if toplevel then run () else Builtin_attributes.warning_scope [] run
+
+let type_toplevel_phrase env s =
+  type_structure ~toplevel:true false None env s Location.none
+
+let type_module_alias = type_module ~alias:true true false None
+let type_module = type_module true false None
+let type_structure = type_structure false None
+
+(* Normalize types in a signature *)
+
+let rec normalize_modtype env = function
+  | Mty_ident _ | Mty_alias _ -> ()
+  | Mty_signature sg -> normalize_signature env sg
+  | Mty_functor (_id, _param, body) -> normalize_modtype env body
+
+and normalize_signature env = List.iter (normalize_signature_item env)
+
+and normalize_signature_item env = function
+  | Sig_value (_id, desc) -> Ctype.normalize_type env desc.val_type
+  | Sig_module (_id, md, _) -> normalize_modtype env md.md_type
+  | _ -> ()
+
+(* Extract the module type of a module expression *)
+
+let type_module_type_of env smod =
+  let tmty =
+    match smod.pmod_desc with
+    | Pmod_ident lid ->
+      (* turn off strengthening in this case *)
+      let path, md = Typetexp.find_module env smod.pmod_loc lid.txt in
+      rm
+        {
+          mod_desc = Tmod_ident (path, lid);
+          mod_type = md.md_type;
+          mod_env = env;
+          mod_attributes = smod.pmod_attributes;
+          mod_loc = smod.pmod_loc;
+        }
+    | _ -> type_module env smod
+  in
+  let mty = tmty.mod_type in
+  (* PR#6307: expand aliases at root and submodules *)
+  let mty = Mtype.remove_aliases env mty in
+  (* PR#5036: must not contain non-generalized type variables *)
+  if not (closed_modtype env mty) then
+    raise (Error (smod.pmod_loc, env, Non_generalizable_module mty));
+  (tmty, mty)
+
+(* For Typecore *)
+
+let type_package env m p nl =
+  (* Same as Pexp_letmodule *)
+  (* remember original level *)
+  let lv = Ctype.get_current_level () in
+  Ctype.begin_def ();
+  Ident.set_current_time lv;
+  let context = Typetexp.narrow () in
+  let modl = type_module env m in
+  Ctype.init_def (Ident.current_time ());
+  Typetexp.widen context;
+  let mp, env =
+    match modl.mod_desc with
+    | Tmod_ident (mp, _) -> (mp, env)
+    | Tmod_constraint ({mod_desc = Tmod_ident (mp, _)}, _, Tmodtype_implicit, _)
+      ->
+      (mp, env) (* PR#6982 *)
+    | _ ->
+      let id, new_env = Env.enter_module ~arg:true "%M" modl.mod_type env in
+      (Pident id, new_env)
+  in
+  let rec mkpath mp = function
+    | Lident name -> Pdot (mp, name, nopos)
+    | Ldot (m, name) -> Pdot (mkpath mp m, name, nopos)
+    | _ -> assert false
+  in
+  let tl' =
+    List.map
+      (fun name -> Btype.newgenty (Tconstr (mkpath mp name, [], ref Mnil)))
+      (* beware of interactions with Printtyp and short-path:
+         mp.name may have an arity > 0, cf. PR#7534 *)
+      nl
+  in
+  (* go back to original level *)
+  Ctype.end_def ();
+  if nl = [] then (wrap_constraint env modl (Mty_ident p) Tmodtype_implicit, [])
+  else
+    let mty = modtype_of_package env modl.mod_loc p nl tl' in
+    List.iter2
+      (fun n ty ->
+        try Ctype.unify env ty (Ctype.newvar ())
+        with Ctype.Unify _ ->
+          raise (Error (m.pmod_loc, env, Scoping_pack (n, ty))))
+      nl tl';
+    (wrap_constraint env modl mty Tmodtype_implicit, tl')
+
+(* Fill in the forward declarations *)
+let () =
+  Typecore.type_module := type_module_alias;
+  Typetexp.transl_modtype_longident := transl_modtype_longident;
+  Typetexp.transl_modtype := transl_modtype;
+  Typecore.type_open := type_open_ ?toplevel:None;
+  Typecore.type_package := type_package;
+  type_module_type_of_fwd := type_module_type_of
+
+(* Typecheck an implementation file *)
+
+let type_implementation_more ?check_exists sourcefile outputprefix modulename
+    initial_env ast =
+  Cmt_format.clear ();
+  try
+    Delayed_checks.reset_delayed_checks ();
+    let str, sg, finalenv =
+      type_structure initial_env ast (Location.in_file sourcefile)
+    in
+    let simple_sg = simplify_signature sg in
+    let mli_status = !Clflags.assume_no_mli in
+    if mli_status = Clflags.Mli_exists then (
+      let intf_file =
+        try find_in_path_uncap !Config.load_path (modulename ^ ".cmi")
+        with Not_found ->
+          let sourceintf =
+            Filename.remove_extension sourcefile ^ Literals.suffix_resi
+          in
+          raise
+            (Error
+               ( Location.in_file sourcefile,
+                 Env.empty,
+                 Interface_not_compiled sourceintf ))
+      in
+      let dclsig = Env.read_signature modulename intf_file in
+      let coercion =
+        Includemod.compunit initial_env sourcefile sg intf_file dclsig
+      in
+      Delayed_checks.force_delayed_checks ();
+      (* It is important to run these checks after the inclusion test above,
+         so that value declarations which are not used internally but exported
+         are not reported as being unused. *)
+      Cmt_format.save_cmt (outputprefix ^ ".cmt") modulename
+        (Cmt_format.Implementation str) (Some sourcefile) initial_env None;
+      (str, coercion, finalenv, dclsig)
+      (* identifier is useless might read from serialized cmi files*))
+    else
+      let coercion =
+        Includemod.compunit initial_env sourcefile sg "(inferred signature)"
+          simple_sg
+      in
+      check_nongen_schemes finalenv simple_sg;
+      normalize_signature finalenv simple_sg;
+      Delayed_checks.force_delayed_checks ();
+      (* See comment above. Here the target signature contains all
+         the value being exported. We can still capture unused
+         declarations like "let x = true;; let x = 1;;", because in this
+         case, the inferred signature contains only the last declaration. *)
+      (if not !Clflags.dont_write_files then
+         let deprecated = Builtin_attributes.deprecated_of_str ast in
+         let cmi =
+           Env.save_signature ?check_exists ~deprecated simple_sg modulename
+             (outputprefix ^ ".cmi")
+         in
+         Cmt_format.save_cmt (outputprefix ^ ".cmt") modulename
+           (Cmt_format.Implementation str) (Some sourcefile) initial_env
+           (Some cmi));
+      (str, coercion, finalenv, simple_sg)
+  with e ->
+    Cmt_format.save_cmt (outputprefix ^ ".cmt") modulename
+      (Cmt_format.Partial_implementation
+         (Array.of_list (Cmt_format.get_saved_types ())))
+      (Some sourcefile) initial_env None;
+    raise e
+
+let save_signature modname tsg outputprefix source_file initial_env cmi =
+  Cmt_format.save_cmt (outputprefix ^ ".cmti") modname
+    (Cmt_format.Interface tsg) (Some source_file) initial_env (Some cmi)
+
+(* "Packaging" of several compilation units into one unit
+   having them as sub-modules. *)
+
+(* Error report *)
+
+open Printtyp
+
+let non_generalizable_msg ppf print_fallback_msg =
+  fprintf ppf
+    "%a@,\
+     @,\
+     @[This happens when the type system senses there's a \
+     mutation/side-effect,@ in combination with a polymorphic value.@,\
+     @{<info>Using or annotating that value usually solves it.@}@]"
+    print_fallback_msg ()
+
+let report_error ppf = function
+  | Cannot_apply mty ->
+    fprintf ppf "@[This module is not a functor; it has type@ %a@]" modtype mty
+  | Not_included errs ->
+    fprintf ppf "@[<v>Signature mismatch:@ %a@]" Includemod.report_error errs
+  | Cannot_eliminate_dependency mty ->
+    fprintf ppf
+      "@[This functor has type@ %a@ The parameter cannot be eliminated in the \
+       result type.@  Bind the argument to a module identifier.@]"
+      modtype mty
+  | Signature_expected -> fprintf ppf "This module type is not a signature"
+  | Structure_expected mty ->
+    fprintf ppf "@[This module is not a structure; it has type@ %a" modtype mty
+  | With_no_component lid ->
+    fprintf ppf
+      "@[The signature constrained by `with' has no component named %a@]"
+      longident lid
+  | With_mismatch (lid, explanation) ->
+    fprintf ppf
+      "@[<v>@[In this `with' constraint, the new definition of %a@ does not \
+       match its original definition@ in the constrained signature:@]@ %a@]"
+      longident lid Includemod.report_error explanation
+  | With_makes_applicative_functor_ill_typed (lid, path, explanation) ->
+    fprintf ppf
+      "@[<v>@[This `with' constraint on %a makes the applicative functor @ \
+       type %s ill-typed in the constrained signature:@]@ %a@]"
+      longident lid (Path.name path) Includemod.report_error explanation
+  | With_changes_module_alias (lid, id, path) ->
+    fprintf ppf
+      "@[<v>@[This `with' constraint on %a changes %s, which is aliased @ in \
+       the constrained signature (as %s)@].@]"
+      longident lid (Path.name path) (Ident.name id)
+  | With_cannot_remove_constrained_type ->
+    fprintf ppf
+      "@[<v>Destructive substitutions are not supported for constrained @ \
+       types (other than when replacing a type constructor with @ a type \
+       constructor with the same arguments).@]"
+  | Repeated_name (kind, name, repeated_loc) ->
+    fprintf ppf
+      "@[Multiple definition of the %s name %s @ at @{<loc>%a@}@ @ Names must \
+       be unique in a given structure or signature.@]"
+      kind name Location.print_loc repeated_loc
+  | Non_generalizable typ ->
+    (* modified *)
+    fprintf ppf "@[<v>";
+    non_generalizable_msg ppf (fun ppf () ->
+        fprintf ppf
+          "@[This expression's type contains type variables that cannot be \
+           generalized:@,\
+           @{<error>%a@}@]"
+          type_scheme typ);
+    fprintf ppf "@]"
+  | Non_generalizable_module mty ->
+    (* modified *)
+    fprintf ppf "@[<v>";
+    non_generalizable_msg ppf (fun ppf () ->
+        fprintf ppf
+          "@[The type of this module contains type variables that cannot be \
+           generalized:@,\
+           @{<error>%a@}@]"
+          modtype mty);
+    fprintf ppf "@]"
+  | Interface_not_compiled intf_name ->
+    fprintf ppf "@[Could not find the .cmi file for interface@ %a.@]"
+      Location.print_filename intf_name
+  | Not_allowed_in_functor_body ->
+    fprintf ppf "@[This expression creates fresh types.@ %s@]"
+      "It is not allowed inside applicative functors."
+  | Not_a_packed_module ty ->
+    fprintf ppf "This expression is not a packed module. It has type@ %a"
+      type_expr ty
+  | Incomplete_packed_module ty ->
+    fprintf ppf "The type of this packed module contains variables:@ %a"
+      type_expr ty
+  | Scoping_pack (lid, ty) ->
+    fprintf ppf "The type %a in this module cannot be exported.@ " longident lid;
+    fprintf ppf "Its type contains local dependencies:@ %a" type_expr ty
+  | Recursive_module_require_explicit_type ->
+    fprintf ppf "Recursive modules require an explicit module type."
+  | Apply_generative ->
+    fprintf ppf "This is a generative functor. It can only be applied to ()"
+  | Cannot_scrape_alias p ->
+    fprintf ppf "This is an alias for module %a, which is missing" path p
+
+let report_error env ppf err =
+  Printtyp.wrap_printing_env env (fun () -> report_error ppf err)
+
+let () =
+  Location.register_error_of_exn (function
+    | Error (loc, env, err) ->
+      Some (Location.error_of_printer loc (report_error env) err)
+    | Error_forward err -> Some err
+    | _ -> None)
diff --git a/compiler/ml/typemod.mli b/compiler/ml/typemod.mli
new file mode 100644
index 0000000..0f36cf6
--- /dev/null
+++ b/compiler/ml/typemod.mli
@@ -0,0 +1,91 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** Type-checking of the module language and typed ast plugin hooks *)
+
+open Types
+open Format
+
+val type_module : Env.t -> Parsetree.module_expr -> Typedtree.module_expr
+val type_structure :
+  Env.t ->
+  Parsetree.structure ->
+  Location.t ->
+  Typedtree.structure * Types.signature * Env.t
+val type_toplevel_phrase :
+  Env.t -> Parsetree.structure -> Typedtree.structure * Types.signature * Env.t
+
+val rescript_hide : Typedtree.structure_item_desc -> bool
+
+val type_implementation_more :
+  ?check_exists:unit ->
+  string ->
+  string ->
+  string ->
+  Env.t ->
+  Parsetree.structure ->
+  Typedtree.structure * Typedtree.module_coercion * Env.t * Types.signature
+
+val transl_signature : Env.t -> Parsetree.signature -> Typedtree.signature
+val check_nongen_schemes : Env.t -> Types.signature -> unit
+val type_open_ :
+  ?used_slot:bool ref ->
+  ?toplevel:bool ->
+  Asttypes.override_flag ->
+  Env.t ->
+  Location.t ->
+  Longident.t Asttypes.loc ->
+  Path.t * Env.t
+val simplify_signature : signature -> signature
+
+val path_of_module : Typedtree.module_expr -> Path.t option
+
+val save_signature :
+  string ->
+  Typedtree.signature ->
+  string ->
+  string ->
+  Env.t ->
+  Cmi_format.cmi_infos ->
+  unit
+
+type error =
+  | Cannot_apply of module_type
+  | Not_included of Includemod.error list
+  | Cannot_eliminate_dependency of module_type
+  | Signature_expected
+  | Structure_expected of module_type
+  | With_no_component of Longident.t
+  | With_mismatch of Longident.t * Includemod.error list
+  | With_makes_applicative_functor_ill_typed of
+      Longident.t * Path.t * Includemod.error list
+  | With_changes_module_alias of Longident.t * Ident.t * Path.t
+  | With_cannot_remove_constrained_type
+  | Repeated_name of string * string * Warnings.loc
+  | Non_generalizable of type_expr
+  | Non_generalizable_module of module_type
+  | Interface_not_compiled of string
+  | Not_allowed_in_functor_body
+  | Not_a_packed_module of type_expr
+  | Incomplete_packed_module of type_expr
+  | Scoping_pack of Longident.t * type_expr
+  | Recursive_module_require_explicit_type
+  | Apply_generative
+  | Cannot_scrape_alias of Path.t
+
+exception Error of Location.t * Env.t * error
+exception Error_forward of Location.error
+
+val report_error : Env.t -> formatter -> error -> unit
diff --git a/compiler/ml/typeopt.ml b/compiler/ml/typeopt.ml
new file mode 100644
index 0000000..7f2cfe7
--- /dev/null
+++ b/compiler/ml/typeopt.ml
@@ -0,0 +1,105 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1998 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Auxiliaries for type-based optimizations, e.g. array kinds *)
+
+open Types
+open Lambda
+
+let scrape_ty env ty =
+  let ty = Ctype.expand_head_opt env (Ctype.correct_levels ty) in
+  match ty.desc with
+  | Tconstr (p, _, _) -> (
+    match Env.find_type p env with
+    | {type_unboxed = {unboxed = true; _}; _} -> (
+      match Typedecl.get_unboxed_type_representation env ty with
+      | None -> ty
+      | Some ty2 -> ty2)
+    | _ -> ty
+    | exception Not_found -> ty)
+  | _ -> ty
+
+let scrape env ty = (scrape_ty env ty).desc
+
+(**  [Types.constructor_description]
+     records the type at the definition type so for ['a option]
+     it will always be [Tvar]
+*)
+let rec type_cannot_contain_undefined (typ : Types.type_expr) (env : Env.t) =
+  match scrape env typ with
+  | Tconstr (p, _, _) -> (
+    (* all built in types could not inhabit none-like values:
+       int, char, float, bool, unit, exn, array, list, nativeint,
+       int32, int64, bytes
+    *)
+    match Predef.type_is_builtin_path_but_option p with
+    | For_sure_yes -> true
+    | For_sure_no -> false
+    | NA -> (
+      let decl = Env.find_type p env in
+      match decl.type_kind with
+      | exception _ -> false
+      | Type_abstract ->
+        List.exists Typedecl.is_not_undefined_attr decl.type_attributes
+      | Type_open -> false
+      | Type_record _ -> true
+      | Type_variant
+          ( [
+              {cd_id = {name = "None"}; cd_args = Cstr_tuple []};
+              {cd_id = {name = "Some"}; cd_args = Cstr_tuple [_]};
+            ]
+          | [
+              {cd_id = {name = "Some"}; cd_args = Cstr_tuple [_]};
+              {cd_id = {name = "None"}; cd_args = Cstr_tuple []};
+            ]
+          | [{cd_id = {name = "()"}; cd_args = Cstr_tuple []}] ) ->
+        false (* conservative *)
+      | Type_variant cdecls ->
+        let untagged =
+          Ast_untagged_variants.has_untagged decl.type_attributes
+        in
+        Ext_list.for_all cdecls (fun cd ->
+            if Ast_untagged_variants.has_undefined_literal cd.cd_attributes then
+              false
+            else if untagged then
+              match cd.cd_args with
+              | Cstr_tuple [t] ->
+                Ast_untagged_variants.type_is_builtin_object t
+                || type_cannot_contain_undefined t env
+              | Cstr_tuple [] -> true
+              | Cstr_tuple (_ :: _ :: _) ->
+                true (* Not actually possible for untagged *)
+              | Cstr_record [{ld_type = t}] ->
+                Ast_untagged_variants.type_is_builtin_object t
+                || type_cannot_contain_undefined t env
+              | Cstr_record ([] | _ :: _ :: _) -> true
+            else true)))
+  | Ttuple _ | Tvariant _ | Tpackage _ | Tarrow _ -> true
+  | Tfield _ | Tpoly _ | Tunivar _ | Tlink _ | Tsubst _ | Tnil | Tvar _
+  | Tobject _ ->
+    false
+
+let is_function_type env ty =
+  match scrape env ty with
+  | Tarrow (arg, rhs, _, _) -> Some (arg.typ, rhs)
+  | _ -> None
+
+let is_base_type env ty base_ty_path =
+  match scrape env ty with
+  | Tconstr (p, _, _) -> Path.same p base_ty_path
+  | _ -> false
+
+let maybe_pointer_type env ty =
+  if Ctype.maybe_pointer_type env ty then Pointer else Immediate
diff --git a/compiler/ml/typeopt.mli b/compiler/ml/typeopt.mli
new file mode 100644
index 0000000..f51b022
--- /dev/null
+++ b/compiler/ml/typeopt.mli
@@ -0,0 +1,24 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1998 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Auxiliaries for type-based optimizations, e.g. array kinds *)
+
+val is_function_type :
+  Env.t -> Types.type_expr -> (Types.type_expr * Types.type_expr) option
+val is_base_type : Env.t -> Types.type_expr -> Path.t -> bool
+
+val maybe_pointer_type : Env.t -> Types.type_expr -> Lambda.immediate_or_pointer
+
+val type_cannot_contain_undefined : Types.type_expr -> Env.t -> bool
diff --git a/compiler/ml/types.ml b/compiler/ml/types.ml
new file mode 100644
index 0000000..eeca29a
--- /dev/null
+++ b/compiler/ml/types.ml
@@ -0,0 +1,320 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Representation of types and declarations *)
+
+open Asttypes
+
+(* Type expressions for the core language *)
+
+type type_expr = {mutable desc: type_desc; mutable level: int; id: int}
+
+and arg = {lbl: arg_label; typ: type_expr}
+
+and type_desc =
+  | Tvar of string option
+  | Tarrow of arg * type_expr * commutable * arity
+  | Ttuple of type_expr list
+  | Tconstr of Path.t * type_expr list * abbrev_memo ref
+  | Tobject of type_expr * (Path.t * type_expr list) option ref
+  | Tfield of string * field_kind * type_expr * type_expr
+  | Tnil
+  | Tlink of type_expr
+  | Tsubst of type_expr (* for copying *)
+  | Tvariant of row_desc
+  | Tunivar of string option
+  | Tpoly of type_expr * type_expr list
+  | Tpackage of Path.t * Longident.t list * type_expr list
+
+and row_desc = {
+  row_fields: (label * row_field) list;
+  row_more: type_expr;
+  row_closed: bool;
+  row_fixed: bool;
+  row_name: (Path.t * type_expr list) option;
+}
+
+and row_field =
+  | Rpresent of type_expr option
+  | Reither of bool * type_expr list * bool * row_field option ref
+  (* 1st true denotes a constant constructor *)
+  (* 2nd true denotes a tag in a pattern matching, and
+     is erased later *)
+  | Rabsent
+
+and abbrev_memo =
+  | Mnil
+  | Mcons of private_flag * Path.t * type_expr * type_expr * abbrev_memo
+  | Mlink of abbrev_memo ref
+
+and field_kind = Fvar of field_kind option ref | Fpresent | Fabsent
+
+and commutable = Cok | Cunknown | Clink of commutable ref
+
+module TypeOps = struct
+  type t = type_expr
+  let compare t1 t2 = t1.id - t2.id
+  let hash t = t.id
+  let equal t1 t2 = t1 == t2
+end
+
+(* Maps of methods and instance variables *)
+
+module OrderedString = struct
+  type t = string
+  let compare (x : t) y = compare x y
+end
+module Meths = Map.Make (OrderedString)
+module Vars = Meths
+
+(* Value descriptions *)
+
+type value_description = {
+  val_type: type_expr; (* Type of the value *)
+  val_kind: value_kind;
+  val_loc: Location.t;
+  val_attributes: Parsetree.attributes;
+}
+
+and value_kind =
+  | Val_reg (* Regular value *)
+  | Val_prim of Primitive.description (* Primitive *)
+
+(* Variance *)
+
+module Variance = struct
+  type t = int
+  type f = May_pos | May_neg | May_weak | Inj | Pos | Neg | Inv
+  let single = function
+    | May_pos -> 1
+    | May_neg -> 2
+    | May_weak -> 4
+    | Inj -> 8
+    | Pos -> 16
+    | Neg -> 32
+    | Inv -> 64
+  let union v1 v2 = v1 lor v2
+  let inter v1 v2 = v1 land v2
+  let subset v1 v2 = v1 land v2 = v1
+  let set x b v = if b then v lor single x else v land lnot (single x)
+  let mem x = subset (single x)
+  let null = 0
+  let may_inv = 7
+  let full = 127
+  let covariant = single May_pos lor single Pos lor single Inj
+  let swap f1 f2 v =
+    let v' = set f1 (mem f2 v) v in
+    set f2 (mem f1 v) v'
+  let conjugate v = swap May_pos May_neg (swap Pos Neg v)
+  let get_upper v = (mem May_pos v, mem May_neg v)
+  let get_lower v = (mem Pos v, mem Neg v, mem Inv v, mem Inj v)
+end
+
+(* Type definitions *)
+
+type type_declaration = {
+  type_params: type_expr list;
+  type_arity: int;
+  type_kind: type_kind;
+  type_private: private_flag;
+  type_manifest: type_expr option;
+  type_variance: Variance.t list;
+  type_newtype_level: (int * int) option;
+  type_loc: Location.t;
+  type_attributes: Parsetree.attributes;
+  type_immediate: bool;
+  type_unboxed: unboxed_status;
+  type_inlined_types: type_inlined_type list;
+}
+
+and type_inlined_type =
+  | Record of {type_name: string; labels: label_declaration list}
+
+and type_kind =
+  | Type_abstract
+  | Type_record of label_declaration list * record_representation
+  | Type_variant of constructor_declaration list
+  | Type_open
+
+and record_representation =
+  | Record_regular (* All fields are boxed / tagged *)
+  | Record_float_unused (* Was: all fields are floats. Now: unused *)
+  | Record_unboxed of bool (* Unboxed single-field record, inlined or not *)
+  | Record_inlined of
+      (* Inlined record *)
+       {
+      tag: int;
+      name: string;
+      num_nonconsts: int;
+      attrs: Parsetree.attributes;
+    }
+  | Record_extension (* Inlined record under extension *)
+
+and label_declaration = {
+  ld_id: Ident.t;
+  ld_mutable: mutable_flag;
+  ld_optional: bool;
+  ld_type: type_expr;
+  ld_loc: Location.t;
+  ld_attributes: Parsetree.attributes;
+}
+
+and constructor_declaration = {
+  cd_id: Ident.t;
+  cd_args: constructor_arguments;
+  cd_res: type_expr option;
+  cd_loc: Location.t;
+  cd_attributes: Parsetree.attributes;
+}
+
+and constructor_arguments =
+  | Cstr_tuple of type_expr list
+  | Cstr_record of label_declaration list
+
+and unboxed_status = {
+  unboxed: bool;
+  default: bool; (* False if the unboxed field was set from an attribute. *)
+}
+
+let unboxed_false_default_false = {unboxed = false; default = false}
+let unboxed_false_default_true = {unboxed = false; default = true}
+let unboxed_true_default_false = {unboxed = true; default = false}
+let unboxed_true_default_true = {unboxed = true; default = true}
+
+type extension_constructor = {
+  ext_type_path: Path.t;
+  ext_type_params: type_expr list;
+  ext_args: constructor_arguments;
+  ext_ret_type: type_expr option;
+  ext_private: private_flag;
+  ext_loc: Location.t;
+  ext_attributes: Parsetree.attributes;
+  ext_is_exception: bool;
+}
+
+(* Type expressions for the class language *)
+
+module Concr = Set.Make (OrderedString)
+
+(* Type expressions for the module language *)
+
+type module_type =
+  | Mty_ident of Path.t
+  | Mty_signature of signature
+  | Mty_functor of Ident.t * module_type option * module_type
+  | Mty_alias of alias_presence * Path.t
+
+and alias_presence = Mta_present | Mta_absent
+
+and signature = signature_item list
+
+and signature_item =
+  | Sig_value of Ident.t * value_description
+  | Sig_type of Ident.t * type_declaration * rec_status
+  | Sig_typext of Ident.t * extension_constructor * ext_status
+  | Sig_module of Ident.t * module_declaration * rec_status
+  | Sig_modtype of Ident.t * modtype_declaration
+  | Sig_class of unit
+  | Sig_class_type of unit (* Dummy AST node *)
+
+and module_declaration = {
+  md_type: module_type;
+  md_attributes: Parsetree.attributes;
+  md_loc: Location.t;
+}
+
+and modtype_declaration = {
+  mtd_type: module_type option; (* Note: abstract *)
+  mtd_attributes: Parsetree.attributes;
+  mtd_loc: Location.t;
+}
+
+and rec_status =
+  | Trec_not (* first in a nonrecursive group *)
+  | Trec_first (* first in a recursive group *)
+  | Trec_next (* not first in a recursive/nonrecursive group *)
+
+and ext_status =
+  | Text_first (* first constructor of an extension *)
+  | Text_next (* not first constructor of an extension *)
+  | Text_exception (* an exception *)
+
+(* Constructor and record label descriptions inserted held in typing
+   environments *)
+
+type constructor_description = {
+  cstr_name: string; (* Constructor name *)
+  cstr_res: type_expr; (* Type of the result *)
+  cstr_existentials: type_expr list; (* list of existentials *)
+  cstr_args: type_expr list; (* Type of the arguments *)
+  cstr_arity: int; (* Number of arguments *)
+  cstr_tag: constructor_tag; (* Tag for heap blocks *)
+  cstr_consts: int; (* Number of constant constructors *)
+  cstr_nonconsts: int; (* Number of non-const constructors *)
+  cstr_generalized: bool; (* Constrained return type? *)
+  cstr_private: private_flag; (* Read-only constructor? *)
+  cstr_loc: Location.t;
+  cstr_attributes: Parsetree.attributes;
+  cstr_inlined: type_declaration option;
+}
+
+and constructor_tag =
+  | Cstr_constant of int (* Constant constructor (an int) *)
+  | Cstr_block of int (* Regular constructor (a block) *)
+  | Cstr_unboxed (* Constructor of an unboxed type *)
+  | Cstr_extension of Path.t (* Extension constructor *)
+
+let equal_tag t1 t2 =
+  match (t1, t2) with
+  | Cstr_constant i1, Cstr_constant i2 -> i2 = i1
+  | Cstr_block i1, Cstr_block i2 -> i2 = i1
+  | Cstr_unboxed, Cstr_unboxed -> true
+  | Cstr_extension path1, Cstr_extension path2 -> Path.same path1 path2
+  | (Cstr_constant _ | Cstr_block _ | Cstr_unboxed | Cstr_extension _), _ ->
+    false
+
+let may_equal_constr c1 c2 =
+  match (c1.cstr_tag, c2.cstr_tag) with
+  | Cstr_extension _, Cstr_extension _ -> c1.cstr_arity = c2.cstr_arity
+  | tag1, tag2 -> equal_tag tag1 tag2
+
+type label_description = {
+  lbl_name: string; (* Short name *)
+  lbl_res: type_expr; (* Type of the result *)
+  lbl_arg: type_expr; (* Type of the argument *)
+  lbl_mut: mutable_flag; (* Is this a mutable field? *)
+  lbl_optional: bool; (* Is this an optional field? *)
+  lbl_pos: int; (* Position in block *)
+  mutable lbl_all: label_description array;
+      (* All the labels in this type. This is mutable only because of a specific feature related to dicts, and should not be mutated elsewhere. *)
+  lbl_repres: record_representation; (* Representation for this record *)
+  lbl_private: private_flag; (* Read-only field? *)
+  lbl_loc: Location.t;
+  lbl_attributes: Parsetree.attributes;
+}
+let same_record_representation x y =
+  match x with
+  | Record_regular -> y = Record_regular
+  | Record_float_unused -> y = Record_float_unused
+  | Record_inlined {tag; name; num_nonconsts} -> (
+    match y with
+    | Record_inlined y ->
+      tag = y.tag && name = y.name && num_nonconsts = y.num_nonconsts
+    | _ -> false)
+  | Record_extension -> y = Record_extension
+  | Record_unboxed x -> (
+    match y with
+    | Record_unboxed y -> x = y
+    | _ -> false)
diff --git a/compiler/ml/types.mli b/compiler/ml/types.mli
new file mode 100644
index 0000000..cb9bf06
--- /dev/null
+++ b/compiler/ml/types.mli
@@ -0,0 +1,433 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(** {0 Representation of types and declarations} *)
+
+(** [Types] defines the representation of types and declarations (that is, the
+    content of module signatures).
+
+    CMI files are made of marshalled types.
+*)
+
+open Asttypes
+(** Asttypes exposes basic definitions shared both by Parsetree and Types. *)
+
+type type_expr = {mutable desc: type_desc; mutable level: int; id: int}
+(** Type expressions for the core language.
+
+    The [type_desc] variant defines all the possible type expressions one can
+    find in OCaml. [type_expr] wraps this with some annotations.
+
+    The [level] field tracks the level of polymorphism associated to a type,
+    guiding the generalization algorithm.
+    Put shortly, when referring to a type in a given environment, both the type
+    and the environment have a level. If the type has an higher level, then it
+    can be considered fully polymorphic (type variables will be printed as
+    ['a]), otherwise it'll be weakly polymorphic, or non generalized (type
+    variables printed as ['_a]).
+    See [http://okmij.org/ftp/ML/generalization.html] for more information.
+
+    Note about [type_declaration]: one should not make the confusion between
+    [type_expr] and [type_declaration].
+
+    [type_declaration] refers specifically to the [type] construct in OCaml
+    language, where you create and name a new type or type alias.
+
+    [type_expr] is used when you refer to existing types, e.g. when annotating
+    the expected type of a value.
+
+    Also, as the type system of OCaml is generative, a [type_declaration] can
+    have the side-effect of introducing a new type constructor, different from
+    all other known types.
+    Whereas [type_expr] is a pure construct which allows referring to existing
+    types.
+
+    Note on mutability: TBD.
+ *)
+
+and arg = {lbl: arg_label; typ: type_expr}
+
+and type_desc =
+  | Tvar of string option
+      (** [Tvar (Some "a")] ==> ['a] or ['_a]
+      [Tvar None]       ==> [_] *)
+  | Tarrow of arg * type_expr * commutable * arity
+      (** [Tarrow (Nolabel,      e1, e2, c)] ==> [e1    -> e2]
+      [Tarrow (Labelled {txt="l"}, e1, e2, c)] ==> [l:e1  -> e2]
+      [Tarrow (Optional {txt="l"}, e1, e2, c)] ==> [?l:e1 -> e2]
+
+      See [commutable] for the last argument. *)
+  | Ttuple of type_expr list  (** [Ttuple [t1;...;tn]] ==> [(t1 * ... * tn)] *)
+  | Tconstr of Path.t * type_expr list * abbrev_memo ref
+      (** [Tconstr (`A.B.t', [t1;...;tn], _)] ==> [(t1,...,tn) A.B.t]
+      The last parameter keep tracks of known expansions, see [abbrev_memo]. *)
+  | Tobject of type_expr * (Path.t * type_expr list) option ref
+      (** [Tobject (`f1:t1;...;fn: tn', `None')] ==> [< f1: t1; ...; fn: tn >]
+      f1, fn are represented as a linked list of types using Tfield and Tnil
+      constructors.
+
+      [Tobject (_, `Some (`A.ct', [t1;...;tn]')] ==> [(t1, ..., tn) A.ct].
+      where A.ct is the type of some class.
+
+      There are also special cases for so-called "class-types", cf. [Typeclass]
+      and [Ctype.set_object_name]:
+
+        [Tobject (Tfield(_,_,...(Tfield(_,_,rv)...),
+                         Some(`A.#ct`, [rv;t1;...;tn])]
+             ==> [(t1, ..., tn) #A.ct]
+        [Tobject (_, Some(`A.#ct`, [Tnil;t1;...;tn])] ==> [(t1, ..., tn) A.ct]
+
+      where [rv] is the hidden row variable.
+  *)
+  | Tfield of string * field_kind * type_expr * type_expr
+      (** [Tfield ("foo", Fpresent, t, ts)] ==> [<...; foo : t; ts>] *)
+  | Tnil  (** [Tnil] ==> [<...; >] *)
+  | Tlink of type_expr  (** Indirection used by unification engine. *)
+  | Tsubst of type_expr (* for copying *)
+      (** [Tsubst] is used temporarily to store information in low-level
+      functions manipulating representation of types, such as
+      instantiation or copy.
+      This constructor should not appear outside of these cases. *)
+  | Tvariant of row_desc
+      (** Representation of polymorphic variants, see [row_desc]. *)
+  | Tunivar of string option
+      (** Occurrence of a type variable introduced by a
+      forall quantifier / [Tpoly]. *)
+  | Tpoly of type_expr * type_expr list
+      (** [Tpoly (ty,tyl)] ==> ['a1... 'an. ty],
+      where 'a1 ... 'an are names given to types in tyl
+      and occurrences of those types in ty. *)
+  | Tpackage of Path.t * Longident.t list * type_expr list
+      (** Type of a first-class module (a.k.a package). *)
+
+and row_desc = {
+  row_fields: (label * row_field) list;
+  row_more: type_expr;
+  row_closed: bool;
+  row_fixed: bool;
+  row_name: (Path.t * type_expr list) option;
+}
+(** [  `X | `Y ]       (row_closed = true)
+    [< `X | `Y ]       (row_closed = true)
+    [> `X | `Y ]       (row_closed = false)
+    [< `X | `Y > `X ]  (row_closed = true)
+
+    type t = [> `X ] as 'a      (row_more = Tvar a)
+    type t = private [> `X ]    (row_more = Tconstr (t#row, [], ref Mnil)
+
+    And for:
+
+        let f = function `X -> `X -> | `Y -> `X
+
+    the type of "f" will be a [Tarrow] whose lhs will (basically) be:
+
+        Tvariant { row_fields = [("X", _)];
+                   row_more   =
+                     Tvariant { row_fields = [("Y", _)];
+                                row_more   =
+                                  Tvariant { row_fields = [];
+                                             row_more   = _;
+                                             _ };
+                                _ };
+                   _
+                 }
+
+*)
+
+and row_field =
+  | Rpresent of type_expr option
+  | Reither of bool * type_expr list * bool * row_field option ref
+  (* 1st true denotes a constant constructor *)
+  (* 2nd true denotes a tag in a pattern matching, and
+     is erased later *)
+  | Rabsent
+
+(** [abbrev_memo] allows one to keep track of different expansions of a type
+    alias. This is done for performance purposes.
+
+    For instance, when defining [type 'a pair = 'a * 'a], when one refers to an
+    ['a pair], it is just a shortcut for the ['a * 'a] type.
+    This expansion will be stored in the [abbrev_memo] of the corresponding
+    [Tconstr] node.
+
+    In practice, [abbrev_memo] behaves like list of expansions with a mutable
+    tail.
+
+    Note on marshalling: [abbrev_memo] must not appear in saved types.
+    [Btype], with [cleanup_abbrev] and [memo], takes care of tracking and
+    removing abbreviations.
+*)
+and abbrev_memo =
+  | Mnil  (** No known abbreviation *)
+  | Mcons of private_flag * Path.t * type_expr * type_expr * abbrev_memo
+      (** Found one abbreviation.
+      A valid abbreviation should be at least as visible and reachable by the
+      same path.
+      The first expression is the abbreviation and the second the expansion. *)
+  | Mlink of abbrev_memo ref
+      (** Abbreviations can be found after this indirection *)
+
+and field_kind = Fvar of field_kind option ref | Fpresent | Fabsent
+
+(** [commutable] is a flag appended to every arrow type.
+
+    When typing an application, if the type of the functional is
+    known, its type is instantiated with [Cok] arrows, otherwise as
+    [Clink (ref Cunknown)].
+
+    When the type is not known, the application will be used to infer
+    the actual type.  This is fragile in presence of labels where
+    there is no principal type.
+
+    Two incompatible applications relying on [Cunknown] arrows will
+    trigger an error.
+
+    let f g =
+      g ~a:() ~b:();
+      g ~b:() ~a:();
+
+    Error: This function is applied to arguments
+    in an order different from other calls.
+    This is only allowed when the real type is known.
+*)
+and commutable = Cok | Cunknown | Clink of commutable ref
+
+module TypeOps : sig
+  type t = type_expr
+  val compare : t -> t -> int
+  val equal : t -> t -> bool
+  val hash : t -> int
+end
+
+(* Maps of methods and instance variables *)
+
+module Meths : Map.S with type key = string
+module Vars : Map.S with type key = string
+
+(* Value descriptions *)
+
+type value_description = {
+  val_type: type_expr; (* Type of the value *)
+  val_kind: value_kind;
+  val_loc: Location.t;
+  val_attributes: Parsetree.attributes;
+}
+
+and value_kind =
+  | Val_reg (* Regular value *)
+  | Val_prim of Primitive.description (* Primitive *)
+
+(* Variance *)
+
+module Variance : sig
+  type t
+  type f = May_pos | May_neg | May_weak | Inj | Pos | Neg | Inv
+  val null : t (* no occurrence *)
+  val full : t (* strictly invariant *)
+  val covariant : t (* strictly covariant *)
+  val may_inv : t (* maybe invariant *)
+  val union : t -> t -> t
+  val inter : t -> t -> t
+  val subset : t -> t -> bool
+  val set : f -> bool -> t -> t
+  val mem : f -> t -> bool
+  val conjugate : t -> t (* exchange positive and negative *)
+  val get_upper : t -> bool * bool (* may_pos, may_neg   *)
+  val get_lower : t -> bool * bool * bool * bool (* pos, neg, inv, inj *)
+end
+
+(* Type definitions *)
+
+type type_declaration = {
+  type_params: type_expr list;
+  type_arity: int;
+  type_kind: type_kind;
+  type_private: private_flag;
+  type_manifest: type_expr option;
+  type_variance: Variance.t list;
+  (* covariant, contravariant, weakly contravariant, injective *)
+  type_newtype_level: (int * int) option;
+  (* definition level * expansion level *)
+  type_loc: Location.t;
+  type_attributes: Parsetree.attributes;
+  type_immediate: bool; (* true iff type should not be a pointer *)
+  type_unboxed: unboxed_status;
+  type_inlined_types: type_inlined_type list;
+      (** Representation of inlined types, needed for printing *)
+}
+
+and type_inlined_type =
+  | Record of {type_name: string; labels: label_declaration list}
+
+and type_kind =
+  | Type_abstract
+  | Type_record of label_declaration list * record_representation
+  | Type_variant of constructor_declaration list
+  | Type_open
+
+and record_representation =
+  | Record_regular (* All fields are boxed / tagged *)
+  | Record_float_unused (* Was: all fields are floats. Now: unused *)
+  | Record_unboxed of bool (* Unboxed single-field record, inlined or not *)
+  | Record_inlined of
+      (* Inlined record *)
+       {
+      tag: int;
+      name: string;
+      num_nonconsts: int;
+      attrs: Parsetree.attributes;
+    }
+  | Record_extension (* Inlined record under extension *)
+
+and label_declaration = {
+  ld_id: Ident.t;
+  ld_mutable: mutable_flag;
+  ld_optional: bool;
+  ld_type: type_expr;
+  ld_loc: Location.t;
+  ld_attributes: Parsetree.attributes;
+}
+
+and constructor_declaration = {
+  cd_id: Ident.t;
+  cd_args: constructor_arguments;
+  cd_res: type_expr option;
+  cd_loc: Location.t;
+  cd_attributes: Parsetree.attributes;
+}
+
+and constructor_arguments =
+  | Cstr_tuple of type_expr list
+  | Cstr_record of label_declaration list
+
+and unboxed_status =
+  private
+  (* This type must be private in order to ensure perfect sharing of the
+     four possible values. Otherwise, ocamlc.byte and ocamlc.opt produce
+     different executables. *) {
+  unboxed: bool;
+  default: bool; (* True for unannotated unboxable types. *)
+}
+
+val unboxed_false_default_false : unboxed_status
+val unboxed_false_default_true : unboxed_status
+val unboxed_true_default_false : unboxed_status
+val unboxed_true_default_true : unboxed_status
+
+type extension_constructor = {
+  ext_type_path: Path.t;
+  ext_type_params: type_expr list;
+  ext_args: constructor_arguments;
+  ext_ret_type: type_expr option;
+  ext_private: private_flag;
+  ext_loc: Location.t;
+  ext_attributes: Parsetree.attributes;
+  ext_is_exception: bool;
+}
+
+module Concr : Set.S with type elt = string
+
+(* Type expressions for the module language *)
+
+type module_type =
+  | Mty_ident of Path.t
+  | Mty_signature of signature
+  | Mty_functor of Ident.t * module_type option * module_type
+  | Mty_alias of alias_presence * Path.t
+
+and alias_presence = Mta_present | Mta_absent
+
+and signature = signature_item list
+
+and signature_item =
+  | Sig_value of Ident.t * value_description
+  | Sig_type of Ident.t * type_declaration * rec_status
+  | Sig_typext of Ident.t * extension_constructor * ext_status
+  | Sig_module of Ident.t * module_declaration * rec_status
+  | Sig_modtype of Ident.t * modtype_declaration
+  | Sig_class of unit
+  | Sig_class_type of unit (* Dummy AST node *)
+
+and module_declaration = {
+  md_type: module_type;
+  md_attributes: Parsetree.attributes;
+  md_loc: Location.t;
+}
+
+and modtype_declaration = {
+  mtd_type: module_type option; (* None: abstract *)
+  mtd_attributes: Parsetree.attributes;
+  mtd_loc: Location.t;
+}
+
+and rec_status =
+  | Trec_not (* first in a nonrecursive group *)
+  | Trec_first (* first in a recursive group *)
+  | Trec_next (* not first in a recursive/nonrecursive group *)
+
+and ext_status =
+  | Text_first (* first constructor in an extension *)
+  | Text_next (* not first constructor in an extension *)
+  | Text_exception
+
+(* Constructor and record label descriptions inserted held in typing
+   environments *)
+
+type constructor_description = {
+  cstr_name: string; (* Constructor name *)
+  cstr_res: type_expr; (* Type of the result *)
+  cstr_existentials: type_expr list; (* list of existentials *)
+  cstr_args: type_expr list; (* Type of the arguments *)
+  cstr_arity: int; (* Number of arguments *)
+  cstr_tag: constructor_tag; (* Tag for heap blocks *)
+  cstr_consts: int; (* Number of constant constructors *)
+  cstr_nonconsts: int; (* Number of non-const constructors *)
+  cstr_generalized: bool; (* Constrained return type? *)
+  cstr_private: private_flag; (* Read-only constructor? *)
+  cstr_loc: Location.t;
+  cstr_attributes: Parsetree.attributes;
+  cstr_inlined: type_declaration option;
+}
+
+and constructor_tag =
+  | Cstr_constant of int (* Constant constructor (an int) *)
+  | Cstr_block of int (* Regular constructor (a block) *)
+  | Cstr_unboxed (* Constructor of an unboxed type *)
+  | Cstr_extension of Path.t (* Extension constructor *)
+
+(* Constructors are the same *)
+val equal_tag : constructor_tag -> constructor_tag -> bool
+
+(* Constructors may be the same, given potential rebinding *)
+val may_equal_constr :
+  constructor_description -> constructor_description -> bool
+
+type label_description = {
+  lbl_name: string; (* Short name *)
+  lbl_res: type_expr; (* Type of the result *)
+  lbl_arg: type_expr; (* Type of the argument *)
+  lbl_mut: mutable_flag; (* Is this a mutable field? *)
+  lbl_optional: bool; (* Is this an optional field? *)
+  lbl_pos: int; (* Position in block *)
+  mutable lbl_all: label_description array;
+  (* All the labels in this type. This is mutable only because of a specific feature related to dicts, and should not be mutated elsewhere. *)
+  lbl_repres: record_representation; (* Representation for this record *)
+  lbl_private: private_flag; (* Read-only field? *)
+  lbl_loc: Location.t;
+  lbl_attributes: Parsetree.attributes;
+}
+
+val same_record_representation :
+  record_representation -> record_representation -> bool
diff --git a/compiler/ml/typetexp.ml b/compiler/ml/typetexp.ml
new file mode 100644
index 0000000..9867baa
--- /dev/null
+++ b/compiler/ml/typetexp.ml
@@ -0,0 +1,989 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* typetexp.ml,v 1.34.4.9 2002/01/07 08:39:16 garrigue Exp *)
+
+(* Typechecking of type expressions for the core language *)
+
+open Asttypes
+open Parsetree
+open Typedtree
+open Types
+open Ctype
+
+exception Already_bound
+
+type error =
+  | Unbound_type_variable of string
+  | Unbound_type_constructor of Longident.t
+  | Unbound_type_constructor_2 of Path.t
+  | Type_arity_mismatch of Longident.t * int * int
+  | Type_mismatch of (type_expr * type_expr) list
+  | Alias_type_mismatch of (type_expr * type_expr) list
+  | Present_has_conjunction of string
+  | Present_has_no_type of string
+  | Constructor_mismatch of type_expr * type_expr
+  | Not_a_variant of type_expr
+  | Variant_tags of string * string
+  | Invalid_variable_name of string
+  | Cannot_quantify of string * type_expr
+  | Multiple_constraints_on_type of Longident.t
+  | Method_mismatch of string * type_expr * type_expr
+  | Unbound_value of Longident.t
+  | Unbound_constructor of Longident.t
+  | Unbound_label of Longident.t * type_expr option
+  | Unbound_module of Longident.t
+  | Unbound_modtype of Longident.t
+  | Ill_typed_functor_application of Longident.t
+  | Illegal_reference_to_recursive_module
+  | Access_functor_as_structure of Longident.t
+  | Apply_structure_as_functor of Longident.t
+  | Cannot_scrape_alias of Longident.t * Path.t
+  | Opened_object of Path.t option
+  | Not_an_object of type_expr
+
+exception Error of Location.t * Env.t * error
+exception Error_forward of Location.error
+
+type variable_context = int * (string, type_expr) Tbl.t
+
+(* Local definitions *)
+
+let instance_list = Ctype.instance_list Env.empty
+
+(* Narrowing unbound identifier errors. *)
+
+let rec narrow_unbound_lid_error : 'a. _ -> _ -> _ -> _ -> 'a =
+ fun env loc lid make_error ->
+  let check_module mlid =
+    try ignore (Env.lookup_module ~load:true mlid env) with
+    | Not_found ->
+      narrow_unbound_lid_error env loc mlid (fun lid -> Unbound_module lid)
+    | Env.Recmodule ->
+      raise (Error (loc, env, Illegal_reference_to_recursive_module))
+  in
+  (match lid with
+  | Longident.Lident _ -> ()
+  | Longident.Ldot (mlid, _) -> (
+    check_module mlid;
+    let md = Env.find_module (Env.lookup_module ~load:true mlid env) env in
+    match Env.scrape_alias env md.md_type with
+    | Mty_functor _ ->
+      raise (Error (loc, env, Access_functor_as_structure mlid))
+    | Mty_alias (_, p) ->
+      raise (Error (loc, env, Cannot_scrape_alias (mlid, p)))
+    | _ -> ())
+  | Longident.Lapply (flid, mlid) -> (
+    check_module flid;
+    let fmd = Env.find_module (Env.lookup_module ~load:true flid env) env in
+    (match Env.scrape_alias env fmd.md_type with
+    | Mty_signature _ ->
+      raise (Error (loc, env, Apply_structure_as_functor flid))
+    | Mty_alias (_, p) ->
+      raise (Error (loc, env, Cannot_scrape_alias (flid, p)))
+    | _ -> ());
+    check_module mlid;
+    let mmd = Env.find_module (Env.lookup_module ~load:true mlid env) env in
+    match Env.scrape_alias env mmd.md_type with
+    | Mty_alias (_, p) ->
+      raise (Error (loc, env, Cannot_scrape_alias (mlid, p)))
+    | _ -> raise (Error (loc, env, Ill_typed_functor_application lid))));
+  raise (Error (loc, env, make_error lid))
+
+let find_component (lookup : ?loc:_ -> _) make_error env loc lid =
+  try
+    match lid with
+    | Longident.Ldot (Longident.Lident "*predef*", s) ->
+      lookup ~loc (Longident.Lident s) Env.initial_safe_string
+    | _ -> lookup ~loc lid env
+  with
+  | Not_found -> narrow_unbound_lid_error env loc lid make_error
+  | Env.Recmodule ->
+    raise (Error (loc, env, Illegal_reference_to_recursive_module))
+
+let find_type env loc lid =
+  let path =
+    find_component Env.lookup_type
+      (fun lid -> Unbound_type_constructor lid)
+      env loc lid
+  in
+  let decl = Env.find_type path env in
+  Builtin_attributes.check_deprecated ~deprecated_context:Cmt_utils.Reference
+    loc decl.type_attributes (Path.name path);
+  (path, decl)
+
+let find_constructor =
+  find_component Env.lookup_constructor (fun lid -> Unbound_constructor lid)
+let find_all_constructors =
+  find_component Env.lookup_all_constructors (fun lid ->
+      Unbound_constructor lid)
+let find_all_labels =
+  find_component Env.lookup_all_labels (fun lid -> Unbound_label (lid, None))
+
+let find_value ?deprecated_context env loc lid =
+  Env.check_value_name (Longident.last lid) loc;
+  let ((path, decl) as r) =
+    find_component Env.lookup_value (fun lid -> Unbound_value lid) env loc lid
+  in
+  Builtin_attributes.check_deprecated ?deprecated_context loc
+    decl.val_attributes (Path.name path);
+  r
+
+let lookup_module ?(load = false) env loc lid =
+  find_component
+    (fun ?loc lid env -> Env.lookup_module ~load ?loc lid env)
+    (fun lid -> Unbound_module lid)
+    env loc lid
+
+let find_module env loc lid =
+  let path = lookup_module ~load:true env loc lid in
+  let decl = Env.find_module path env in
+  (* No need to check for deprecated here, this is done in Env. *)
+  (path, decl)
+
+let find_modtype env loc lid =
+  let ((path, decl) as r) =
+    find_component Env.lookup_modtype
+      (fun lid -> Unbound_modtype lid)
+      env loc lid
+  in
+  Builtin_attributes.check_deprecated loc decl.mtd_attributes (Path.name path);
+  r
+
+let unbound_constructor_error ?from_type env lid =
+  ignore from_type;
+  narrow_unbound_lid_error env lid.loc lid.txt (fun lid ->
+      Unbound_constructor lid)
+
+let unbound_label_error ?from_type env lid =
+  narrow_unbound_lid_error env lid.loc lid.txt (fun lid ->
+      Unbound_label (lid, from_type))
+
+(* Support for first-class modules. *)
+
+let transl_modtype_longident = ref (fun _ -> assert false)
+let transl_modtype = ref (fun _ -> assert false)
+
+let create_package_mty fake loc env (p, l) =
+  let l =
+    List.sort
+      (fun (s1, _t1) (s2, _t2) ->
+        if s1.txt = s2.txt then
+          raise (Error (loc, env, Multiple_constraints_on_type s1.txt));
+        compare s1.txt s2.txt)
+      l
+  in
+  ( l,
+    List.fold_left
+      (fun mty (s, t) ->
+        let d =
+          {
+            ptype_name = mkloc (Longident.last s.txt) s.loc;
+            ptype_params = [];
+            ptype_cstrs = [];
+            ptype_kind = Ptype_abstract;
+            ptype_private = Asttypes.Public;
+            ptype_manifest = (if fake then None else Some t);
+            ptype_attributes = [];
+            ptype_loc = loc;
+          }
+        in
+        Ast_helper.Mty.mk ~loc
+          (Pmty_with (mty, [Pwith_type ({txt = s.txt; loc}, d)])))
+      (Ast_helper.Mty.mk ~loc (Pmty_ident p))
+      l )
+
+(* Translation of type expressions *)
+
+let type_variables = ref (Tbl.empty : (string, type_expr) Tbl.t)
+let univars = ref ([] : (string * type_expr) list)
+let pre_univars = ref ([] : type_expr list)
+let used_variables = ref (Tbl.empty : (string, type_expr * Location.t) Tbl.t)
+
+let reset_type_variables () =
+  reset_global_level ();
+  Ctype.reset_reified_var_counter ();
+  type_variables := Tbl.empty
+
+let narrow () = (increase_global_level (), !type_variables)
+
+let widen (gl, tv) =
+  restore_global_level gl;
+  type_variables := tv
+
+let strict_ident c = c = '_' || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
+
+let validate_name = function
+  | None -> None
+  | Some name as s -> if name <> "" && strict_ident name.[0] then s else None
+
+let new_global_var ?name () = new_global_var ?name:(validate_name name) ()
+let newvar ?name () = newvar ?name:(validate_name name) ()
+
+let transl_type_param env styp =
+  let loc = styp.ptyp_loc in
+  match styp.ptyp_desc with
+  | Ptyp_any ->
+    let ty = new_global_var ~name:"_" () in
+    {
+      ctyp_desc = Ttyp_any;
+      ctyp_type = ty;
+      ctyp_env = env;
+      ctyp_loc = loc;
+      ctyp_attributes = styp.ptyp_attributes;
+    }
+  | Ptyp_var name ->
+    let ty =
+      try
+        if name <> "" && name.[0] = '_' then
+          raise (Error (loc, Env.empty, Invalid_variable_name ("'" ^ name)));
+        ignore (Tbl.find name !type_variables);
+        raise Already_bound
+      with Not_found ->
+        let v = new_global_var ~name () in
+        type_variables := Tbl.add name v !type_variables;
+        v
+    in
+    {
+      ctyp_desc = Ttyp_var name;
+      ctyp_type = ty;
+      ctyp_env = env;
+      ctyp_loc = loc;
+      ctyp_attributes = styp.ptyp_attributes;
+    }
+  | _ -> assert false
+
+let transl_type_param env styp =
+  (* Currently useless, since type parameters cannot hold attributes
+     (but this could easily be lifted in the future). *)
+  Builtin_attributes.warning_scope styp.ptyp_attributes (fun () ->
+      transl_type_param env styp)
+
+let new_pre_univar ?name () =
+  let v = newvar ?name () in
+  pre_univars := v :: !pre_univars;
+  v
+
+let rec swap_list = function
+  | x :: y :: l -> y :: x :: swap_list l
+  | l -> l
+
+type policy = Fixed | Extensible | Univars
+
+let rec transl_type env policy styp =
+  Builtin_attributes.warning_scope styp.ptyp_attributes (fun () ->
+      transl_type_aux env policy styp)
+
+and transl_type_aux env policy styp =
+  let loc = styp.ptyp_loc in
+  let ctyp ctyp_desc ctyp_type =
+    {
+      ctyp_desc;
+      ctyp_type;
+      ctyp_env = env;
+      ctyp_loc = loc;
+      ctyp_attributes = styp.ptyp_attributes;
+    }
+  in
+  match styp.ptyp_desc with
+  | Ptyp_any ->
+    let ty =
+      if policy = Univars then new_pre_univar ()
+      else if policy = Fixed then
+        raise (Error (styp.ptyp_loc, env, Unbound_type_variable "_"))
+      else newvar ()
+    in
+    ctyp Ttyp_any ty
+  | Ptyp_var name ->
+    let ty =
+      if name <> "" && name.[0] = '_' then
+        raise (Error (styp.ptyp_loc, env, Invalid_variable_name ("'" ^ name)));
+      try instance env (List.assoc name !univars)
+      with Not_found -> (
+        try instance env (fst (Tbl.find name !used_variables))
+        with Not_found ->
+          let v =
+            if policy = Univars then new_pre_univar ~name ()
+            else newvar ~name ()
+          in
+          used_variables := Tbl.add name (v, styp.ptyp_loc) !used_variables;
+          v)
+    in
+    ctyp (Ttyp_var name) ty
+  | Ptyp_arrow {arg; ret; arity} ->
+    let lbl = arg.lbl in
+    let cty1 = transl_type env policy arg.typ in
+    let cty2 = transl_type env policy ret in
+    let ty1 = cty1.ctyp_type in
+    let ty1 =
+      if Btype.is_optional lbl then
+        newty (Tconstr (Predef.path_option, [ty1], ref Mnil))
+      else ty1
+    in
+    let ty = newty (Tarrow ({lbl; typ = ty1}, cty2.ctyp_type, Cok, arity)) in
+    ctyp (Ttyp_arrow ({attrs = arg.attrs; lbl; typ = cty1}, cty2, arity)) ty
+  | Ptyp_tuple stl ->
+    assert (List.length stl >= 2);
+    let ctys = List.map (transl_type env policy) stl in
+    let ty = newty (Ttuple (List.map (fun ctyp -> ctyp.ctyp_type) ctys)) in
+    ctyp (Ttyp_tuple ctys) ty
+  | Ptyp_constr (lid, stl) ->
+    let path, decl = find_type env lid.loc lid.txt in
+    let stl =
+      match stl with
+      | [({ptyp_desc = Ptyp_any} as t)] when decl.type_arity > 1 ->
+        List.map (fun _ -> t) decl.type_params
+      | _ -> stl
+    in
+    if List.length stl <> decl.type_arity then
+      raise
+        (Error
+           ( styp.ptyp_loc,
+             env,
+             Type_arity_mismatch (lid.txt, decl.type_arity, List.length stl) ));
+    let args = List.map (transl_type env policy) stl in
+    let params = instance_list decl.type_params in
+    let unify_param =
+      match decl.type_manifest with
+      | None -> unify_var
+      | Some ty ->
+        if (repr ty).level = Btype.generic_level then unify_var else unify
+    in
+    List.iter2
+      (fun (sty, cty) ty' ->
+        try unify_param env ty' cty.ctyp_type
+        with Unify trace ->
+          raise (Error (sty.ptyp_loc, env, Type_mismatch (swap_list trace))))
+      (List.combine stl args) params;
+    let constr = newconstr path (List.map (fun ctyp -> ctyp.ctyp_type) args) in
+    (try Ctype.enforce_constraints env constr
+     with Unify trace ->
+       raise (Error (styp.ptyp_loc, env, Type_mismatch trace)));
+    ctyp (Ttyp_constr (path, lid, args)) constr
+  | Ptyp_object (fields, o) ->
+    let ty, fields = transl_fields env policy o fields in
+    ctyp (Ttyp_object (fields, o)) (newobj ty)
+  | Ptyp_alias (st, alias) ->
+    let cty =
+      try
+        let t =
+          try List.assoc alias !univars
+          with Not_found ->
+            instance env (fst (Tbl.find alias !used_variables))
+        in
+        let ty = transl_type env policy st in
+        (try unify_var env t ty.ctyp_type
+         with Unify trace ->
+           let trace = swap_list trace in
+           raise (Error (styp.ptyp_loc, env, Alias_type_mismatch trace)));
+        ty
+      with Not_found ->
+        let t = newvar () in
+        used_variables := Tbl.add alias (t, styp.ptyp_loc) !used_variables;
+        let ty = transl_type env policy st in
+        (try unify_var env t ty.ctyp_type
+         with Unify trace ->
+           let trace = swap_list trace in
+           raise (Error (styp.ptyp_loc, env, Alias_type_mismatch trace)));
+        let t = instance env t in
+        let px = Btype.proxy t in
+        (match px.desc with
+        | Tvar None ->
+          Btype.log_type px;
+          px.desc <- Tvar (Some alias)
+        | Tunivar None ->
+          Btype.log_type px;
+          px.desc <- Tunivar (Some alias)
+        | _ -> ());
+        {ty with ctyp_type = t}
+    in
+    ctyp (Ttyp_alias (cty, alias)) cty.ctyp_type
+  | Ptyp_variant (fields, closed, present) ->
+    let name = ref None in
+    let mkfield l f =
+      newty
+        (Tvariant
+           {
+             row_fields = [(l, f)];
+             row_more = newvar ();
+             row_closed = true;
+             row_fixed = false;
+             row_name = None;
+           })
+    in
+    let hfields = Hashtbl.create 17 in
+    let add_typed_field loc l f =
+      try
+        let _, f' = Hashtbl.find hfields l in
+        let ty = mkfield l f and ty' = mkfield l f' in
+        if equal env false [ty] [ty'] then ()
+        else
+          try unify env ty ty'
+          with Unify _trace ->
+            raise (Error (loc, env, Constructor_mismatch (ty, ty')))
+      with Not_found -> Hashtbl.add hfields l (l, f)
+    in
+    let add_field = function
+      | Rtag (l, attrs, c, stl) ->
+        name := None;
+        let tl =
+          Builtin_attributes.warning_scope attrs (fun () ->
+              List.map (transl_type env policy) stl)
+        in
+        let f =
+          match present with
+          | Some present when not (List.mem l.txt present) ->
+            let ty_tl = List.map (fun cty -> cty.ctyp_type) tl in
+            Reither (c, ty_tl, false, ref None)
+          | _ -> (
+            if List.length stl > 1 || (c && stl <> []) then
+              raise (Error (styp.ptyp_loc, env, Present_has_conjunction l.txt));
+            match tl with
+            | [] -> Rpresent None
+            | st :: _ -> Rpresent (Some st.ctyp_type))
+        in
+        add_typed_field styp.ptyp_loc l.txt f;
+        Ttag (l, attrs, c, tl)
+      | Rinherit sty ->
+        let cty = transl_type env policy sty in
+        let ty = cty.ctyp_type in
+        let nm =
+          match repr cty.ctyp_type with
+          | {desc = Tconstr (p, tl, _)} -> Some (p, tl)
+          | _ -> None
+        in
+        (* Set name if there are no fields yet *)
+        if Hashtbl.length hfields <> 0 then name := None else name := nm;
+        let fl =
+          match (expand_head env cty.ctyp_type, nm) with
+          | {desc = Tvariant row}, _ when Btype.static_row row ->
+            let row = Btype.row_repr row in
+            row.row_fields
+          | {desc = Tvar _}, Some (p, _) ->
+            raise (Error (sty.ptyp_loc, env, Unbound_type_constructor_2 p))
+          | _ -> raise (Error (sty.ptyp_loc, env, Not_a_variant ty))
+        in
+        List.iter
+          (fun (l, f) ->
+            let f =
+              match present with
+              | Some present when not (List.mem l present) -> (
+                match f with
+                | Rpresent (Some ty) -> Reither (false, [ty], false, ref None)
+                | Rpresent None -> Reither (true, [], false, ref None)
+                | _ -> assert false)
+              | _ -> f
+            in
+            add_typed_field sty.ptyp_loc l f)
+          fl;
+        Tinherit cty
+    in
+    let tfields = List.map add_field fields in
+    let fields = Hashtbl.fold (fun _ p l -> p :: l) hfields [] in
+    (match present with
+    | None -> ()
+    | Some present ->
+      List.iter
+        (fun l ->
+          if not (List.mem_assoc l fields) then
+            raise (Error (styp.ptyp_loc, env, Present_has_no_type l)))
+        present);
+    let row =
+      {
+        row_fields = List.rev fields;
+        row_more = newvar ();
+        row_closed = closed = Closed;
+        row_fixed = false;
+        row_name = !name;
+      }
+    in
+    let static = Btype.static_row row in
+    let row =
+      if static then {row with row_more = newty Tnil}
+      else if policy <> Univars then row
+      else {row with row_more = new_pre_univar ()}
+    in
+    let ty = newty (Tvariant row) in
+    ctyp (Ttyp_variant (tfields, closed, present)) ty
+  | Ptyp_poly (vars, st) ->
+    let vars = List.map (fun v -> v.txt) vars in
+    begin_def ();
+    let new_univars = List.map (fun name -> (name, newvar ~name ())) vars in
+    let old_univars = !univars in
+    univars := new_univars @ !univars;
+    let cty = transl_type env policy st in
+    let ty = cty.ctyp_type in
+    univars := old_univars;
+    end_def ();
+    generalize ty;
+    let ty_list =
+      List.fold_left
+        (fun tyl (name, ty1) ->
+          let v = Btype.proxy ty1 in
+          if deep_occur v ty then
+            match v.desc with
+            | Tvar name when v.level = Btype.generic_level ->
+              v.desc <- Tunivar name;
+              v :: tyl
+            | _ -> raise (Error (styp.ptyp_loc, env, Cannot_quantify (name, v)))
+          else tyl)
+        [] new_univars
+    in
+    let ty' = Btype.newgenty (Tpoly (ty, List.rev ty_list)) in
+    unify_var env (newvar ()) ty';
+    ctyp (Ttyp_poly (vars, cty)) ty'
+  | Ptyp_package (p, l) ->
+    let l, mty = create_package_mty true styp.ptyp_loc env (p, l) in
+    let z = narrow () in
+    let mty = !transl_modtype env mty in
+    widen z;
+    let ptys = List.map (fun (s, pty) -> (s, transl_type env policy pty)) l in
+    let path = !transl_modtype_longident styp.ptyp_loc env p.txt in
+    let ty =
+      newty
+        (Tpackage
+           ( path,
+             List.map (fun (s, _pty) -> s.txt) l,
+             List.map (fun (_, cty) -> cty.ctyp_type) ptys ))
+    in
+    ctyp
+      (Ttyp_package
+         {
+           pack_path = path;
+           pack_type = mty.mty_type;
+           pack_fields = ptys;
+           pack_txt = p;
+         })
+      ty
+  | Ptyp_extension ext ->
+    raise (Error_forward (Builtin_attributes.error_of_extension ext))
+
+and transl_poly_type env policy t =
+  transl_type env policy (Ast_helper.Typ.force_poly t)
+
+and transl_fields env policy o fields =
+  let hfields = Hashtbl.create 17 in
+  let add_typed_field loc l ty =
+    try
+      let ty' = Hashtbl.find hfields l in
+      if equal env false [ty] [ty'] then ()
+      else
+        try unify env ty ty'
+        with Unify _trace ->
+          raise (Error (loc, env, Method_mismatch (l, ty, ty')))
+    with Not_found -> Hashtbl.add hfields l ty
+  in
+  let add_field = function
+    | Otag (s, a, ty1) ->
+      let ty1 =
+        Builtin_attributes.warning_scope a (fun () ->
+            transl_poly_type env policy ty1)
+      in
+      let field = OTtag (s, a, ty1) in
+      add_typed_field ty1.ctyp_loc s.txt ty1.ctyp_type;
+      field
+    | Oinherit sty -> (
+      let cty = transl_type env policy sty in
+      let nm =
+        match repr cty.ctyp_type with
+        | {desc = Tconstr (p, _, _)} -> Some p
+        | _ -> None
+      in
+      let t = expand_head env cty.ctyp_type in
+      match (t, nm) with
+      | {desc = Tobject ({desc = (Tfield _ | Tnil) as tf}, _)}, _ ->
+        if opened_object t then
+          raise (Error (sty.ptyp_loc, env, Opened_object nm));
+        let rec iter_add = function
+          | Tfield (s, _k, ty1, ty2) ->
+            add_typed_field sty.ptyp_loc s ty1;
+            iter_add ty2.desc
+          | Tnil -> ()
+          | _ -> assert false
+        in
+        iter_add tf;
+        OTinherit cty
+      | {desc = Tvar _}, Some p ->
+        raise (Error (sty.ptyp_loc, env, Unbound_type_constructor_2 p))
+      | _ -> raise (Error (sty.ptyp_loc, env, Not_an_object t)))
+  in
+  let object_fields = List.map add_field fields in
+  let fields = Hashtbl.fold (fun s ty l -> (s, ty) :: l) hfields [] in
+  let ty_init =
+    match (o, policy) with
+    | Closed, _ -> newty Tnil
+    | Open, Univars -> new_pre_univar ()
+    | Open, _ -> newvar ()
+  in
+  let ty =
+    List.fold_left
+      (fun ty (s, ty') -> newty (Tfield (s, Fpresent, ty', ty)))
+      ty_init fields
+  in
+  (ty, object_fields)
+
+(* Make the rows "fixed" in this type, to make universal check easier *)
+let rec make_fixed_univars ty =
+  let ty = repr ty in
+  if ty.level >= Btype.lowest_level then (
+    Btype.mark_type_node ty;
+    match ty.desc with
+    | Tvariant row ->
+      let row = Btype.row_repr row in
+      if Btype.is_Tunivar (Btype.row_more row) then
+        ty.desc <-
+          Tvariant
+            {
+              row with
+              row_fixed = true;
+              row_fields =
+                List.map
+                  (fun ((s, f) as p) ->
+                    match Btype.row_field_repr f with
+                    | Reither (c, tl, _m, r) -> (s, Reither (c, tl, true, r))
+                    | _ -> p)
+                  row.row_fields;
+            };
+      Btype.iter_row make_fixed_univars row
+    | _ -> Btype.iter_type_expr make_fixed_univars ty)
+
+let make_fixed_univars ty =
+  make_fixed_univars ty;
+  Btype.unmark_type ty
+
+let globalize_used_variables env fixed =
+  let r = ref [] in
+  Tbl.iter
+    (fun name (ty, loc) ->
+      let v = new_global_var () in
+      let snap = Btype.snapshot () in
+      if
+        try
+          unify env v ty;
+          true
+        with _ ->
+          Btype.backtrack snap;
+          false
+      then (
+        try r := (loc, v, Tbl.find name !type_variables) :: !r
+        with Not_found ->
+          if fixed && Btype.is_Tvar (repr ty) then
+            raise (Error (loc, env, Unbound_type_variable ("'" ^ name)));
+          let v2 = new_global_var () in
+          r := (loc, v, v2) :: !r;
+          type_variables := Tbl.add name v2 !type_variables))
+    !used_variables;
+  used_variables := Tbl.empty;
+  fun () ->
+    List.iter
+      (function
+        | loc, t1, t2 -> (
+          try unify env t1 t2
+          with Unify trace -> raise (Error (loc, env, Type_mismatch trace))))
+      !r
+
+let transl_simple_type env fixed styp =
+  univars := [];
+  used_variables := Tbl.empty;
+  let typ = transl_type env (if fixed then Fixed else Extensible) styp in
+  globalize_used_variables env fixed ();
+  make_fixed_univars typ.ctyp_type;
+  typ
+
+let transl_simple_type_delayed env styp =
+  univars := [];
+  used_variables := Tbl.empty;
+  let typ = transl_type env Extensible styp in
+  make_fixed_univars typ.ctyp_type;
+  (typ, globalize_used_variables env false)
+
+let transl_type_scheme env styp =
+  reset_type_variables ();
+  begin_def ();
+  let typ = transl_simple_type env false styp in
+  end_def ();
+  generalize typ.ctyp_type;
+  typ
+
+(* Error report *)
+
+open Format
+open Printtyp
+
+let did_you_mean ppf choices : bool =
+  (* flush now to get the error report early, in the (unheard of) case
+     where the linear search would take a bit of time; in the worst
+     case, the user has seen the error, she can interrupt the process
+     before the spell-checking terminates. *)
+  Format.fprintf ppf "@?";
+  match choices () with
+  | [] -> false
+  | last :: rev_rest ->
+    Format.fprintf ppf "@[<v 2>@,@,@{<info>Hint: Did you mean %s%s%s?@}@]"
+      (String.concat ", " (List.rev rev_rest))
+      (if rev_rest = [] then "" else " or ")
+      last;
+    true
+
+let super_spellcheck ppf fold env lid =
+  let choices path name : string list =
+    let env : string list = fold (fun x _ _ xs -> x :: xs) path env [] in
+    Misc.spellcheck env name
+  in
+  match lid with
+  | Longident.Lapply _ -> false
+  | Longident.Lident s -> did_you_mean ppf (fun _ -> choices None s)
+  | Longident.Ldot (r, s) -> did_you_mean ppf (fun _ -> choices (Some r) s)
+
+let spellcheck ppf fold env lid =
+  let choices ~path name =
+    let env = fold (fun x xs -> x :: xs) path env [] in
+    Misc.spellcheck env name
+  in
+  match lid with
+  | Longident.Lapply _ -> ()
+  | Longident.Lident s -> Misc.did_you_mean ppf (fun () -> choices ~path:None s)
+  | Longident.Ldot (r, s) ->
+    Misc.did_you_mean ppf (fun () -> choices ~path:(Some r) s)
+
+let fold_descr fold get_name f = fold (fun descr acc -> f (get_name descr) acc)
+let fold_simple fold4 f = fold4 (fun name _path _descr acc -> f name acc)
+
+let fold_constructors = fold_descr Env.fold_constructors (fun d -> d.cstr_name)
+let fold_labels = fold_descr Env.fold_labels (fun d -> d.lbl_name)
+let fold_modtypes = fold_simple Env.fold_modtypes
+
+let report_error env ppf = function
+  | Unbound_type_variable name ->
+    (* we don't use "spellcheck" here: the function that raises this
+       error seems not to be called anywhere, so it's unclear how it
+       should be handled *)
+    fprintf ppf "Unbound type parameter %s@." name
+  | Unbound_type_constructor lid ->
+    (* modified *)
+    Format.fprintf ppf "@[<v>This type constructor, `%a`, can't be found.@ "
+      Printtyp.longident lid;
+    let has_candidate = super_spellcheck ppf Env.fold_types env lid in
+    if not has_candidate then
+      Format.fprintf ppf
+        "If you wanted to write a recursive type, don't forget the `rec` in \
+         `type rec`@]"
+  | Unbound_type_constructor_2 p ->
+    fprintf ppf "The type constructor@ %a@ is not yet completely defined" path p
+  | Type_arity_mismatch (lid, expected, provided) ->
+    if expected == 0 then
+      fprintf ppf
+        "@[The type %a is not generic so expects no arguments,@ but is here \
+         applied to %i argument(s).@ Have you tried removing the angular \
+         brackets `<` and `>` and the@ arguments within them and just writing \
+         `%a` instead? @]"
+        longident lid provided longident lid
+    else
+      fprintf ppf
+        "@[The type constructor %a@ expects %i argument(s),@ but is here \
+         applied to %i argument(s)@]"
+        longident lid expected provided
+  | Type_mismatch trace ->
+    Printtyp.report_unification_error ppf Env.empty trace
+      (function
+        | ppf -> fprintf ppf "This type")
+      (function ppf -> fprintf ppf "should be an instance of type")
+  | Alias_type_mismatch trace ->
+    Printtyp.report_unification_error ppf Env.empty trace
+      (function
+        | ppf -> fprintf ppf "This alias is bound to type")
+      (function ppf -> fprintf ppf "but is used as an instance of type")
+  | Present_has_conjunction l ->
+    fprintf ppf "The present constructor %s has a conjunctive type" l
+  | Present_has_no_type l ->
+    fprintf ppf "The present constructor %s has no type" l
+  | Constructor_mismatch (ty, ty') ->
+    wrap_printing_env env (fun () ->
+        Printtyp.reset_and_mark_loops_list [ty; ty'];
+        fprintf ppf "@[<hov>%s %a@ %s@ %a@]"
+          "This variant type contains a constructor" Printtyp.type_expr ty
+          "which should be" Printtyp.type_expr ty')
+  | Not_a_variant ty -> (
+    Printtyp.reset_and_mark_loops ty;
+    fprintf ppf "@[The type %a@ does not expand to a polymorphic variant type@]"
+      Printtyp.type_expr ty;
+    match ty.desc with
+    | Tvar (Some s) ->
+      (* PR#7012: help the user that wrote 'Foo instead of `Foo *)
+      Misc.did_you_mean ppf (fun () -> ["`" ^ s])
+    | _ -> ())
+  | Variant_tags (lab1, lab2) ->
+    fprintf ppf "@[Variant tags %s@ and %s have the same hash value.@ %s@]"
+      (!Printtyp.print_res_poly_identifier lab1)
+      (!Printtyp.print_res_poly_identifier lab2)
+      "Change one of them."
+  | Invalid_variable_name name ->
+    fprintf ppf "The type variable name %s is not allowed in programs" name
+  | Cannot_quantify (name, v) ->
+    fprintf ppf
+      "@[<hov>The universal type variable '%s cannot be generalized:@ %s.@]"
+      name
+      (if Btype.is_Tvar v then "it escapes its scope"
+       else if Btype.is_Tunivar v then "it is already bound to another variable"
+       else "it is not a variable")
+  | Multiple_constraints_on_type s ->
+    fprintf ppf "Multiple constraints for type %a" longident s
+  | Method_mismatch (l, ty, ty') ->
+    wrap_printing_env env (fun () ->
+        Printtyp.reset_and_mark_loops_list [ty; ty'];
+        fprintf ppf "@[<hov>Method '%s' has type %a,@ which should be %a@]" l
+          Printtyp.type_expr ty Printtyp.type_expr ty')
+  | Unbound_value lid -> (
+    (* modified *)
+    (match lid with
+    | Ldot (outer, inner) ->
+      Format.fprintf ppf "The value %s can't be found in %a" inner
+        Printtyp.longident outer
+    | other_ident ->
+      Format.fprintf ppf "The value %a can't be found" Printtyp.longident
+        other_ident);
+    let did_spellcheck = super_spellcheck ppf Env.fold_values env lid in
+    (* For cases such as when the user refers to something that's a value with 
+      a lowercase identifier in JS but a module in ReScript.
+      
+      'Console' is a typical example, where JS is `console.log` and ReScript is `Console.log`. *)
+    (* TODO(codemods) Add codemod for refering to the module instead. *)
+    let as_module =
+      match lid with
+      | Lident name -> (
+        try
+          Some
+            (env
+            |> Env.lookup_module ~load:false
+                 (Lident (String.capitalize_ascii name)))
+        with _ -> None)
+      | _ -> None
+    in
+    match as_module with
+    | None -> ()
+    | Some module_path ->
+      Format.fprintf ppf "@,@[<v 2>@,@[%s to use the module @{<info>%a@}?@]@]"
+        (if did_spellcheck then "Or did you mean" else "Maybe you meant")
+        Printtyp.path module_path)
+  | Unbound_module lid ->
+    (* modified *)
+    (match lid with
+    | Lident "Str" ->
+      Format.fprintf ppf
+        "@[@{<info>The module or file %a can't be found.@}@,\
+         @,\
+         Are you trying to use the standard library's Str?@ If you're \
+         compiling to JavaScript,@ use @{<info>Js.Re@} instead.@ Otherwise, \
+         add str.cma to your ocamlc/ocamlopt command.@]"
+        Printtyp.longident lid
+    | lid ->
+      Format.fprintf ppf
+        "@[<v>@{<info>The module or file %a can't be found.@}@,\
+         @[<v 2>- If it's a third-party dependency:@,\
+         - Did you add it to the \"dependencies\" or \"dev-dependencies\" in \
+         rescript.json?@]@,\
+         - Did you include the file's directory to the \"sources\" in \
+         rescript.json?@,"
+        Printtyp.longident lid);
+    super_spellcheck ppf Env.fold_modules env lid |> ignore
+  | Unbound_constructor lid ->
+    (* modified *)
+    Format.fprintf ppf
+      "@[<v>@{<info>The variant constructor %a can't be found.@}@,\
+       @,\
+       @[<v 2>- If it's defined in another module or file, bring it into scope \
+       by:@,\
+       @[- Prefixing it with said module name:@ @{<info>TheModule.%a@}@]@,\
+       @[- Or specifying its type:@ @{<info>let theValue: TheModule.theType = \
+       %a@}@]@]@,\
+       - @[Constructors and modules are both capitalized.@ Did you want the \
+       latter?@ Then instead of @{<dim>let foo = Bar@}, try @{<info>module Foo \
+       = Bar@}.@]@]"
+      Printtyp.longident lid Printtyp.longident lid Printtyp.longident lid;
+    spellcheck ppf fold_constructors env lid
+  | Unbound_label (lid, from_type) ->
+    (* modified *)
+    (match from_type with
+    | Some {desc = Tconstr (p, _, _)} when Path.same p Predef.path_option ->
+      (* TODO: Extend for nullable/null? *)
+      Format.fprintf ppf
+        "@[<v>You're trying to access the record field @{<info>%a@}, but the \
+         value you're trying to access it on is an @{<info>option@}.@ You need \
+         to unwrap the option first before accessing the record field.@,\
+         @\n\
+         Possible solutions:@,\
+         @[- Use @{<info>Option.map@} to transform the option: \
+         @{<info>xx->Option.map(field => field.%a)@}@]@,\
+         @[- Or use @{<info>Option.getOr@} with a default: \
+         @{<info>xx->Option.getOr(defaultRecord).%a@}@]@]"
+        Printtyp.longident lid Printtyp.longident lid Printtyp.longident lid
+    | Some {desc = Tconstr (p, _, _)} when Path.same p Predef.path_array ->
+      Format.fprintf ppf
+        "@[<v>You're trying to access the record field @{<info>%a@}, but the \
+         value you're trying to access it on is an @{<info>array@}.@ You need \
+         to access an individual element of the array if you want to access an \
+         individual record field.@]"
+        Printtyp.longident lid
+    | Some ({desc = Tconstr (_p, _, _)} as t1) ->
+      Format.fprintf ppf
+        "@[<v>You're trying to access the record field @{<info>%a@}, but the \
+         thing you're trying to access it on is not a record. @,\n\
+         The type of the thing you're trying to access it on is:@,\n\
+         %a@,\n\
+         @,\
+         Only records have fields that can be accessed with dot notation.@]"
+        Printtyp.longident lid Error_message_utils.type_expr t1
+    | None | Some _ ->
+      Format.fprintf ppf
+        "@[<v>@{<info>%a@} refers to a record field, but no corresponding \
+         record type is in scope.@,\
+         @,\
+         If it's defined in another module or file, bring it into scope by:@,\
+         @[- Prefixing the field name with the module name:@ \
+         @{<info>TheModule.%a@}@]@,\
+         @[- Or specifying the record type explicitly:@ @{<info>let theValue: \
+         TheModule.theType = {%a: VALUE}@}@]@]"
+        Printtyp.longident lid Printtyp.longident lid Printtyp.longident lid);
+    spellcheck ppf fold_labels env lid
+  | Unbound_modtype lid ->
+    fprintf ppf "Unbound module type %a" longident lid;
+    spellcheck ppf fold_modtypes env lid
+  | Ill_typed_functor_application lid ->
+    fprintf ppf "Ill-typed functor application %a" longident lid
+  | Illegal_reference_to_recursive_module ->
+    fprintf ppf "Illegal recursive module reference"
+  | Access_functor_as_structure lid ->
+    fprintf ppf "The module %a is a functor, not a structure" longident lid
+  | Apply_structure_as_functor lid ->
+    fprintf ppf "The module %a is a structure, not a functor" longident lid
+  | Cannot_scrape_alias (lid, p) ->
+    fprintf ppf "The module %a is an alias for module %a, which is missing"
+      longident lid path p
+  | Opened_object nm ->
+    fprintf ppf "Illegal open object type%a"
+      (fun ppf -> function
+        | Some p -> fprintf ppf "@ %a" path p
+        | None -> fprintf ppf "")
+      nm
+  | Not_an_object ty ->
+    Printtyp.reset_and_mark_loops ty;
+    fprintf ppf "@[The type %a@ is not an object type@]" Printtyp.type_expr ty
+
+let () =
+  Location.register_error_of_exn (function
+    | Error (loc, env, err) ->
+      Some (Location.error_of_printer loc (report_error env) err)
+    | Error_forward err -> Some err
+    | _ -> None)
diff --git a/compiler/ml/typetexp.mli b/compiler/ml/typetexp.mli
new file mode 100644
index 0000000..8f40096
--- /dev/null
+++ b/compiler/ml/typetexp.mli
@@ -0,0 +1,106 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
+(*                                                                        *)
+(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* Typechecking of type expressions for the core language *)
+
+open Types
+
+val transl_simple_type :
+  Env.t -> bool -> Parsetree.core_type -> Typedtree.core_type
+val transl_simple_type_delayed :
+  Env.t -> Parsetree.core_type -> Typedtree.core_type * (unit -> unit)
+(* Translate a type, but leave type variables unbound. Returns
+   the type and a function that binds the type variable. *)
+
+val transl_type_scheme : Env.t -> Parsetree.core_type -> Typedtree.core_type
+val reset_type_variables : unit -> unit
+val transl_type_param : Env.t -> Parsetree.core_type -> Typedtree.core_type
+
+type variable_context
+val narrow : unit -> variable_context
+val widen : variable_context -> unit
+
+exception Already_bound
+
+type error =
+  | Unbound_type_variable of string
+  | Unbound_type_constructor of Longident.t
+  | Unbound_type_constructor_2 of Path.t
+  | Type_arity_mismatch of Longident.t * int * int
+  | Type_mismatch of (type_expr * type_expr) list
+  | Alias_type_mismatch of (type_expr * type_expr) list
+  | Present_has_conjunction of string
+  | Present_has_no_type of string
+  | Constructor_mismatch of type_expr * type_expr
+  | Not_a_variant of type_expr
+  | Variant_tags of string * string
+  | Invalid_variable_name of string
+  | Cannot_quantify of string * type_expr
+  | Multiple_constraints_on_type of Longident.t
+  | Method_mismatch of string * type_expr * type_expr
+  | Unbound_value of Longident.t
+  | Unbound_constructor of Longident.t
+  | Unbound_label of Longident.t * type_expr option
+  | Unbound_module of Longident.t
+  | Unbound_modtype of Longident.t
+  | Ill_typed_functor_application of Longident.t
+  | Illegal_reference_to_recursive_module
+  | Access_functor_as_structure of Longident.t
+  | Apply_structure_as_functor of Longident.t
+  | Cannot_scrape_alias of Longident.t * Path.t
+  | Opened_object of Path.t option
+  | Not_an_object of type_expr
+
+exception Error of Location.t * Env.t * error
+
+val report_error : Env.t -> Format.formatter -> error -> unit
+
+(* Support for first-class modules. *)
+val transl_modtype_longident :
+  (* from Typemod *)
+  (Location.t -> Env.t -> Longident.t -> Path.t) ref
+val transl_modtype :
+  (* from Typemod *)
+  (Env.t -> Parsetree.module_type -> Typedtree.module_type) ref
+
+val find_type : Env.t -> Location.t -> Longident.t -> Path.t * type_declaration
+val find_constructor :
+  Env.t -> Location.t -> Longident.t -> constructor_description
+val find_all_constructors :
+  Env.t ->
+  Location.t ->
+  Longident.t ->
+  (constructor_description * (unit -> unit)) list
+val find_all_labels :
+  Env.t ->
+  Location.t ->
+  Longident.t ->
+  (label_description * (unit -> unit)) list
+val find_value :
+  ?deprecated_context:Cmt_utils.deprecated_used_context ->
+  Env.t ->
+  Location.t ->
+  Longident.t ->
+  Path.t * value_description
+val find_module :
+  Env.t -> Location.t -> Longident.t -> Path.t * module_declaration
+val lookup_module : ?load:bool -> Env.t -> Location.t -> Longident.t -> Path.t
+val find_modtype :
+  Env.t -> Location.t -> Longident.t -> Path.t * modtype_declaration
+
+val unbound_constructor_error :
+  ?from_type:type_expr -> Env.t -> Longident.t Location.loc -> 'a
+val unbound_label_error :
+  ?from_type:type_expr -> Env.t -> Longident.t Location.loc -> 'a
diff --git a/compiler/ml/unified_ops.ml b/compiler/ml/unified_ops.ml
new file mode 100644
index 0000000..50d0ed9
--- /dev/null
+++ b/compiler/ml/unified_ops.ml
@@ -0,0 +1,268 @@
+open Misc
+
+(*
+  Unified_ops is for specialization of some primitive operators.
+
+  For example adding two values. We have `+` for ints, `+.` for floats, and `++` for strings.
+  That because we don't allow implicit conversion or overloading for operations.
+
+  It is a fundamental property of the ReScript language, but it is far from the best DX we can think of,
+  and it became a problem when new primitives like bigint were introduced.
+
+  See discussion: https://github.com/rescript-lang/rescript-compiler/issues/6525
+
+  Unified ops mitigate the problem by adding ad-hoc translation rules on applications of the core built-in operators
+  which have form of binary infix ('a -> 'a -> 'a) or unary ('a -> 'a)
+
+  Translation rules should be applied in its application, in both type-level and IR(lambda)-level.
+
+  The rules:
+
+  1. If the lhs type is a primitive type, unify the rhs and the result type to the lhs type.
+  2. If the lhs type is not a primitive type but the rhs type is, unify lhs and the result type to the rhs type.
+  3. If both lhs type and rhs type is not a primitive type, unify the whole types to the int. 
+
+  Since these are simple ad-hoc translations for primitive applications, we cannot use the result type defined in other contexts.
+  So falling back to int type is the simplest behavior that ensures backwards compatibility.
+
+  Actual implementations of translation are colocated into core modules
+
+  You can find it in:
+  - Type-level : ml/typecore.ml
+  - IR-level   : ml/translcore.ml
+
+  With function name "translate_unified_ops"
+*)
+
+type form = Unary | Binary
+
+(* Note: unified op must support int type *)
+type specialization = {
+  int: Lambda.primitive;
+  bool: Lambda.primitive option;
+  float: Lambda.primitive option;
+  bigint: Lambda.primitive option;
+  string: Lambda.primitive option;
+}
+
+type entry = {
+  path: string;
+      (** TODO: Maybe it can be a Path.t in Predef instead of string *)
+  name: string;
+  form: form;
+  specialization: specialization;
+}
+
+let builtin x = Primitive_modules.pervasives ^ "." ^ x
+
+let entries =
+  [|
+    {
+      path = builtin "~+";
+      name = "%plus";
+      form = Unary;
+      specialization =
+        {
+          int = Pidentity;
+          bool = None;
+          float = Some Pidentity;
+          bigint = Some Pidentity;
+          string = None;
+        };
+    };
+    {
+      path = builtin "~-";
+      name = "%neg";
+      form = Unary;
+      specialization =
+        {
+          int = Pnegint;
+          bool = None;
+          float = Some Pnegfloat;
+          bigint = Some Pnegbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin "+";
+      name = "%add";
+      form = Binary;
+      specialization =
+        {
+          int = Paddint;
+          bool = None;
+          float = Some Paddfloat;
+          bigint = Some Paddbigint;
+          string = Some Pstringadd;
+        };
+    };
+    {
+      path = builtin "-";
+      name = "%sub";
+      form = Binary;
+      specialization =
+        {
+          int = Psubint;
+          bool = None;
+          float = Some Psubfloat;
+          bigint = Some Psubbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin "*";
+      name = "%mul";
+      form = Binary;
+      specialization =
+        {
+          int = Pmulint;
+          bool = None;
+          float = Some Pmulfloat;
+          bigint = Some Pmulbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin "/";
+      name = "%div";
+      form = Binary;
+      specialization =
+        {
+          int = Pdivint;
+          bool = None;
+          float = Some Pdivfloat;
+          bigint = Some Pdivbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin "%";
+      name = "%mod";
+      form = Binary;
+      specialization =
+        {
+          int = Pmodint;
+          bool = None;
+          float = Some Pmodfloat;
+          bigint = Some Pmodbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin "<<";
+      name = "%lsl";
+      form = Binary;
+      specialization =
+        {
+          int = Plslint;
+          bool = None;
+          float = None;
+          bigint = Some Plslbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin ">>";
+      name = "%asr";
+      form = Binary;
+      specialization =
+        {
+          int = Pasrint;
+          bool = None;
+          float = None;
+          bigint = Some Pasrbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin ">>>";
+      name = "%lsr";
+      form = Binary;
+      specialization =
+        {int = Plsrint; bool = None; float = None; bigint = None; string = None};
+    };
+    {
+      path = builtin "mod";
+      name = "%mod";
+      form = Binary;
+      specialization =
+        {
+          int = Pmodint;
+          bool = None;
+          float = Some Pmodfloat;
+          bigint = Some Pmodbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin "**";
+      name = "%pow";
+      form = Binary;
+      specialization =
+        {
+          int = Ppowint;
+          bool = None;
+          float = Some Ppowfloat;
+          bigint = Some Ppowbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin "~~~";
+      name = "%bitnot";
+      form = Unary;
+      specialization =
+        {
+          int = Pnotint;
+          bool = None;
+          float = None;
+          bigint = Some Pnotbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin "|||";
+      name = "%bitor";
+      form = Binary;
+      specialization =
+        {
+          int = Porint;
+          bool = None;
+          float = None;
+          bigint = Some Porbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin "^^^";
+      name = "%bitxor";
+      form = Binary;
+      specialization =
+        {
+          int = Pxorint;
+          bool = None;
+          float = None;
+          bigint = Some Pxorbigint;
+          string = None;
+        };
+    };
+    {
+      path = builtin "&&&";
+      name = "%bitand";
+      form = Binary;
+      specialization =
+        {
+          int = Pandint;
+          bool = None;
+          float = None;
+          bigint = Some Pandbigint;
+          string = None;
+        };
+    };
+  |]
+
+let index_by_path =
+  entries |> Array.map (fun entry -> (entry.path, entry)) |> create_hashtable
+
+let index_by_name =
+  entries |> Array.map (fun entry -> (entry.name, entry)) |> create_hashtable
diff --git a/compiler/ml/unified_ops.mli b/compiler/ml/unified_ops.mli
new file mode 100644
index 0000000..b52e052
--- /dev/null
+++ b/compiler/ml/unified_ops.mli
@@ -0,0 +1,20 @@
+type form = Unary | Binary
+
+type specialization = {
+  int: Lambda.primitive;
+  bool: Lambda.primitive option;
+  float: Lambda.primitive option;
+  bigint: Lambda.primitive option;
+  string: Lambda.primitive option;
+}
+
+type entry = {
+  path: string;
+  name: string;
+  form: form;
+  specialization: specialization;
+}
+
+val index_by_path : (string, entry) Hashtbl.t
+
+val index_by_name : (string, entry) Hashtbl.t
diff --git a/compiler/ml/untypeast.ml b/compiler/ml/untypeast.ml
new file mode 100644
index 0000000..1ae24b6
--- /dev/null
+++ b/compiler/ml/untypeast.ml
@@ -0,0 +1,27 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*    Thomas Gazagnaire (OCamlPro), Fabrice Le Fessant (INRIA Saclay)     *)
+(*                                                                        *)
+(*   Copyright 2007 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+open Asttypes
+open Parsetree
+
+let constant = function
+  | Const_char c -> Pconst_char c
+  | Const_string (s, d) -> Pconst_string (s, d)
+  | Const_int i -> Pconst_integer (string_of_int i, None)
+  | Const_int32 i -> Pconst_integer (Int32.to_string i, Some 'l')
+  | Const_int64 i -> Pconst_integer (Int64.to_string i, Some 'L')
+  | Const_bigint (sign, i) ->
+    Pconst_integer (Bigint_utils.to_string sign i, Some 'n')
+  | Const_float f -> Pconst_float (f, None)
diff --git a/compiler/ml/untypeast.mli b/compiler/ml/untypeast.mli
new file mode 100644
index 0000000..b4471a1
--- /dev/null
+++ b/compiler/ml/untypeast.mli
@@ -0,0 +1,16 @@
+(**************************************************************************)
+(*                                                                        *)
+(*                                 OCaml                                  *)
+(*                                                                        *)
+(*      Thomas Gazagnaire (OCamlPro), Fabrice Le Fessant (INRIA Saclay)   *)
+(*                                                                        *)
+(*   Copyright 2007 Institut National de Recherche en Informatique et     *)
+(*     en Automatique.                                                    *)
+(*                                                                        *)
+(*   All rights reserved.  This file is distributed under the terms of    *)
+(*   the GNU Lesser General Public License version 2.1, with the          *)
+(*   special exception on linking described in the file LICENSE.          *)
+(*                                                                        *)
+(**************************************************************************)
+
+val constant : Asttypes.constant -> Parsetree.constant
diff --git a/compiler/ml/used_attributes.ml b/compiler/ml/used_attributes.ml
new file mode 100644
index 0000000..0dcdf9f
--- /dev/null
+++ b/compiler/ml/used_attributes.ml
@@ -0,0 +1,18 @@
+let used_attributes : string Asttypes.loc Hash_set_poly.t =
+  Hash_set_poly.create 16
+
+(* let dump_attribute fmt = (fun ( (sloc : string Asttypes.loc)) ->
+       Format.fprintf fmt "@[%s@]" sloc.txt
+     )
+
+   let dump_used_attributes fmt =
+     Format.fprintf fmt "Used attributes Listing Start:@.";
+     Hash_set_poly.iter  used_attributes (fun attr -> dump_attribute fmt attr) ;
+     Format.fprintf fmt "Used attributes Listing End:@." *)
+
+(* only mark non-ghost used bs attribute *)
+let mark_used_attribute ((x, _) : Parsetree.attribute) =
+  if not x.loc.loc_ghost then Hash_set_poly.add used_attributes x
+
+let is_used_attribute (sloc : string Asttypes.loc) =
+  Hash_set_poly.mem used_attributes sloc
diff --git a/compiler/ml/used_attributes.mli b/compiler/ml/used_attributes.mli
new file mode 100644
index 0000000..52dfa56
--- /dev/null
+++ b/compiler/ml/used_attributes.mli
@@ -0,0 +1,3 @@
+val mark_used_attribute : Parsetree.attribute -> unit
+
+val is_used_attribute : string Asttypes.loc -> bool
diff --git a/compiler/ml/variant_coercion.ml b/compiler/ml/variant_coercion.ml
new file mode 100644
index 0000000..b3599dc
--- /dev/null
+++ b/compiler/ml/variant_coercion.ml
@@ -0,0 +1,299 @@
+type variant_runtime_representation_issue =
+  | Mismatched_unboxed_payload of {
+      constructor_name: string;
+      expected_typename: Path.t;
+    }
+  | Mismatched_as_payload of {
+      constructor_name: string;
+      expected_typename: Path.t;
+      as_payload: Ast_untagged_variants.tag_type option;
+    }
+  | As_payload_not_elgible_for_coercion of {
+      constructor_name: string;
+      expected_typename: Path.t;
+      as_payload: Ast_untagged_variants.tag_type;
+    }
+  | Inline_record_cannot_be_coerced of {constructor_name: string}
+  | Cannot_coerce_non_unboxed_with_payload of {
+      constructor_name: string;
+      expected_typename: Path.t;
+    }
+
+(* Right now we only allow coercing to primitives string/int/float *)
+let can_coerce_primitive (path : Path.t) =
+  Path.same path Predef.path_string
+  || Path.same path Predef.path_int
+  || Path.same path Predef.path_float
+  || Path.same path Predef.path_bigint
+
+let check_paths_same p1 p2 target_path =
+  Path.same p1 target_path && Path.same p2 target_path
+
+let variant_has_case_covering_type
+    (constructors : Types.constructor_declaration list) ~path_is_same_fn =
+  let has_catch_all_string_case (c : Types.constructor_declaration) =
+    let args = c.cd_args in
+    match args with
+    | Cstr_tuple [{desc = Tconstr (p, [], _)}] -> path_is_same_fn p
+    | _ -> false
+  in
+
+  constructors |> List.exists has_catch_all_string_case
+
+(* Checks if every case of the variant has the same runtime representation as the target type. *)
+let variant_has_same_runtime_representation_as_target ~(target_path : Path.t)
+    ~unboxed (constructors : Types.constructor_declaration list) =
+  (* Helper function to check if a constructor has the same runtime representation as the target type *)
+  let has_same_runtime_representation (c : Types.constructor_declaration) =
+    let args = c.cd_args in
+    let as_payload = Ast_untagged_variants.process_tag_type c.cd_attributes in
+
+    match args with
+    | Cstr_tuple [{desc = Tconstr (p, [], _)}] when unboxed ->
+      (* Unboxed type, and the constructor has a single item payload.*)
+      let path_same = check_paths_same p target_path in
+      if
+        (* unboxed String(string) :> string *)
+        path_same Predef.path_string
+        (* unboxed Number(float) :> float *)
+        || path_same Predef.path_float
+        ||
+        (* unboxed BigInt(bigint) :> bigint *)
+        path_same Predef.path_bigint
+      then None
+      else
+        Some
+          (Mismatched_unboxed_payload
+             {
+               constructor_name = Ident.name c.cd_id;
+               expected_typename = target_path;
+             })
+    | Cstr_tuple [] -> (
+      (* Check that @as payloads match with the target path to coerce to.
+           No @as means the default encoding, which is string *)
+      match as_payload with
+      | None | Some (String _) ->
+        if Path.same target_path Predef.path_string then None
+        else
+          Some
+            (Mismatched_as_payload
+               {
+                 constructor_name = Ident.name c.cd_id;
+                 expected_typename = target_path;
+                 as_payload;
+               })
+      | Some (Int _) ->
+        if Path.same target_path Predef.path_int then None
+        else
+          Some
+            (Mismatched_as_payload
+               {
+                 constructor_name = Ident.name c.cd_id;
+                 expected_typename = target_path;
+                 as_payload;
+               })
+      | Some (Float _) ->
+        if Path.same target_path Predef.path_float then None
+        else
+          Some
+            (Mismatched_as_payload
+               {
+                 constructor_name = Ident.name c.cd_id;
+                 expected_typename = target_path;
+                 as_payload;
+               })
+      | Some (BigInt _) ->
+        if Path.same target_path Predef.path_bigint then None
+        else
+          Some
+            (Mismatched_as_payload
+               {
+                 constructor_name = Ident.name c.cd_id;
+                 expected_typename = target_path;
+                 as_payload;
+               })
+      | Some ((Null | Undefined | Bool _ | Untagged _) as as_payload) ->
+        Some
+          (As_payload_not_elgible_for_coercion
+             {
+               constructor_name = Ident.name c.cd_id;
+               as_payload;
+               expected_typename = target_path;
+             }))
+    | Cstr_tuple _ ->
+      Some
+        (Cannot_coerce_non_unboxed_with_payload
+           {
+             constructor_name = Ident.name c.cd_id;
+             expected_typename = target_path;
+           })
+    | Cstr_record _ ->
+      Some
+        (Inline_record_cannot_be_coerced {constructor_name = Ident.name c.cd_id})
+  in
+
+  List.filter_map has_same_runtime_representation constructors
+
+let can_try_coerce_variant_to_primitive
+    ((_, p, typedecl) : Path.t * Path.t * Types.type_declaration) =
+  match typedecl with
+  | {type_kind = Type_variant constructors; type_params = []; type_attributes}
+    when not (Path.same p Predef.path_bool) ->
+    (* bool is represented as a variant internally, so we need to account for that *)
+    (* TODO(subtype-errors) Report about bool? *)
+    Some (p, constructors, type_attributes |> Ast_untagged_variants.has_untagged)
+  | _ -> None
+
+let can_try_coerce_variant_to_primitive_opt p =
+  match p with
+  | None -> None
+  | Some p -> can_try_coerce_variant_to_primitive p
+
+let variant_representation_matches (c1_attrs : Parsetree.attributes)
+    (c2_attrs : Parsetree.attributes) =
+  match
+    ( Ast_untagged_variants.process_tag_type c1_attrs,
+      Ast_untagged_variants.process_tag_type c2_attrs )
+  with
+  | None, None -> true
+  | Some s1, Some s2 when s1 = s2 -> true
+  | _ -> false
+
+type variant_configuration_error =
+  | Untagged of {left_is_unboxed: bool}
+  | TagName of {left_tag: string option; right_tag: string option}
+
+type variant_error =
+  | VariantError of {
+      left_loc: Location.t;
+      right_loc: Location.t;
+      error: variant_configuration_error;
+      is_spread_context: bool;
+    }
+
+exception VariantConfigurationError of variant_error
+
+type variant_configuration_issue =
+  | Unboxed_config_not_matching of {left_unboxed: bool; right_unboxed: bool}
+  | Tag_name_not_matching of {left_tag: string option; right_tag: string option}
+  | Incompatible_constructor_count of {constructor_names: string list}
+
+let variant_configuration_can_be_coerced (a1 : Parsetree.attributes)
+    (a2 : Parsetree.attributes) =
+  let unboxed =
+    match
+      ( Ast_untagged_variants.process_untagged a1,
+        Ast_untagged_variants.process_untagged a2 )
+    with
+    | true, true | false, false -> Ok ()
+    | left, right ->
+      Error
+        (Unboxed_config_not_matching
+           {left_unboxed = left; right_unboxed = right})
+  in
+  let tag =
+    match
+      ( Ast_untagged_variants.process_tag_name a1,
+        Ast_untagged_variants.process_tag_name a2 )
+    with
+    | Some tag1, Some tag2 when tag1 = tag2 -> Ok ()
+    | None, None -> Ok ()
+    | tag1, tag2 ->
+      Error (Tag_name_not_matching {left_tag = tag1; right_tag = tag2})
+  in
+  match (unboxed, tag) with
+  | Ok (), Ok () -> Ok ()
+  | Error e, _ | _, Error e -> Error e
+
+let variant_configuration_can_be_coerced_raises ~is_spread_context ~left_loc
+    ~right_loc ~(left_attributes : Parsetree.attributes)
+    ~(right_attributes : Parsetree.attributes) =
+  (match
+     ( Ast_untagged_variants.process_untagged left_attributes,
+       Ast_untagged_variants.process_untagged right_attributes )
+   with
+  | true, true | false, false -> ()
+  | left, _right ->
+    raise
+      (VariantConfigurationError
+         (VariantError
+            {
+              is_spread_context;
+              left_loc;
+              right_loc;
+              error = Untagged {left_is_unboxed = left};
+            })));
+
+  match
+    ( Ast_untagged_variants.process_tag_name left_attributes,
+      Ast_untagged_variants.process_tag_name right_attributes )
+  with
+  | Some host_tag, Some spread_tag when host_tag = spread_tag -> ()
+  | None, None -> ()
+  | left_tag, right_tag ->
+    raise
+      (VariantConfigurationError
+         (VariantError
+            {
+              is_spread_context;
+              left_loc;
+              right_loc;
+              error = TagName {left_tag; right_tag};
+            }))
+
+let can_coerce_polyvariant_to_variant ~row_fields ~variant_constructors
+    ~type_attributes =
+  let polyvariant_runtime_representations =
+    row_fields
+    |> List.filter_map (fun (label, (field : Types.row_field)) ->
+           (* Check that there's no payload in the polyvariant *)
+           match field with
+           | Rpresent None -> Some label
+           | _ -> None)
+  in
+  if List.length polyvariant_runtime_representations <> List.length row_fields
+  then
+    (* Error: At least one polyvariant constructor has a payload. Cannot have payloads. *)
+    Error `PolyvariantConstructorHasPayload
+  else
+    let is_unboxed = Ast_untagged_variants.has_untagged type_attributes in
+    if
+      List.for_all
+        (fun polyvariant_value ->
+          variant_constructors
+          |> List.exists (fun (c : Types.constructor_declaration) ->
+                 let constructor_name = Ident.name c.cd_id in
+                 match
+                   Ast_untagged_variants.process_tag_type c.cd_attributes
+                 with
+                 | Some (String as_runtime_string) ->
+                   (* `@as("")`, does the configured string match the polyvariant value? *)
+                   as_runtime_string = polyvariant_value
+                 | Some _ ->
+                   (* Any other `@as` can't match since it's by definition not a string *)
+                   false
+                 | None -> (
+                   (* No `@as` means the runtime representation will be the constructor
+                      name as a string.
+
+                      However, there's a special case with unboxed types where there's a
+                      string catch-all case. In that case, any polyvariant will match,
+                      since the catch-all case will match any string. *)
+                   match (is_unboxed, c.cd_args) with
+                   | true, Cstr_tuple [{desc = Tconstr (p, _, _)}] ->
+                     Path.same p Predef.path_string
+                   | _ -> polyvariant_value = constructor_name)))
+        polyvariant_runtime_representations
+    then Ok ()
+    else Error `Unknown
+
+let type_is_variant (typ : (Path.t * Path.t * Types.type_declaration) option) =
+  match typ with
+  | Some (_, _, {type_kind = Type_variant _; _}) -> true
+  | _ -> false
+
+let has_res_pat_variant_spread_attribute attrs =
+  attrs
+  |> List.find_opt (fun (({txt}, _) : Parsetree.attribute) ->
+         txt = "res.patVariantSpread")
+  |> Option.is_some
diff --git a/jscomp/ml/variant_type_spread.ml b/compiler/ml/variant_type_spread.ml
similarity index 94%
rename from jscomp/ml/variant_type_spread.ml
rename to compiler/ml/variant_type_spread.ml
index bb1c380..029d98c 100644
--- a/jscomp/ml/variant_type_spread.ml
+++ b/compiler/ml/variant_type_spread.ml
@@ -1,6 +1,16 @@
 let mk_constructor_comes_from_spread_attr () : Parsetree.attribute =
   (Location.mknoloc "res.constructor_from_spread", PStr [])
 
+let mk_pat_from_variant_spread_attr () : Parsetree.attribute =
+  (Location.mknoloc "res.patFromVariantSpread", PStr [])
+
+let is_pat_from_variant_spread_attr pat =
+  pat.Typedtree.pat_attributes
+  |> List.exists (fun (a : Parsetree.attribute) ->
+         match a with
+         | {txt = "res.patFromVariantSpread"}, PStr [] -> true
+         | _ -> false)
+
 type variant_type_spread_error =
   | CouldNotFindType
   | HasTypeParams
@@ -32,7 +42,8 @@ let map_constructors ~(sdecl : Parsetree.type_declaration) ~all_constructors env
     in
 
     match type_decl with
-    | {type_kind = Type_variant [] } -> raise (VariantTypeSpreadError (loc.loc, InvalidType))
+    | {type_kind = Type_variant []} ->
+      raise (VariantTypeSpreadError (loc.loc, InvalidType))
     | {type_kind = Type_variant cstrs; type_attributes; type_params} ->
       if List.length type_params > 0 then
         raise (VariantTypeSpreadError (loc.loc, HasTypeParams));
@@ -167,6 +178,7 @@ let expand_dummy_constructor_args (sdecl_list : Parsetree.type_declaration list)
                                           pld_mutable = l.ld_mutable;
                                           pld_loc = l.ld_loc;
                                           pld_attributes = [];
+                                          pld_optional = l.ld_optional;
                                           pld_type =
                                             {
                                               ptyp_desc = Ptyp_any;
diff --git a/jscomp/syntax/LICENSE b/compiler/syntax/LICENSE
similarity index 100%
rename from jscomp/syntax/LICENSE
rename to compiler/syntax/LICENSE
diff --git a/compiler/syntax/cli/dune b/compiler/syntax/cli/dune
new file mode 100644
index 0000000..ba5f1ea
--- /dev/null
+++ b/compiler/syntax/cli/dune
@@ -0,0 +1,14 @@
+(env
+ (static
+  (flags
+   (:standard -ccopt -static))))
+
+(executable
+ (name res_cli)
+ (public_name res_parser)
+ (package rescript)
+ (enabled_if
+  (<> %{profile} browser))
+ (flags
+  (:standard -w +a-4-42-40-9-48-70))
+ (libraries syntax))
diff --git a/compiler/syntax/cli/res_cli.ml b/compiler/syntax/cli/res_cli.ml
new file mode 100644
index 0000000..201a3ac
--- /dev/null
+++ b/compiler/syntax/cli/res_cli.ml
@@ -0,0 +1,327 @@
+(*
+  This CLI isn't used apart for this repo's testing purposes. The syntax
+  itself is used by ReScript's compiler programmatically through various other apis.
+*)
+
+(*
+  This is OCaml's Misc.ml's Color module. More specifically, this is
+  ReScript's OCaml fork's Misc.ml's Color module:
+  https://github.com/rescript-lang/ocaml/blob/92e58bedced8d7e3e177677800a38922327ab860/utils/misc.ml#L540
+
+  The syntax's printing's coloring logic depends on:
+    1. a global mutable variable that's set in the compiler: Misc.Color.color_enabled
+    2. the colors tags supported by Misc.Color, e.g. style_of_tag, which Format
+      tags like @{<error>hello@} use
+    3. etc.
+
+  When this syntax is programmatically used inside ReScript, the various
+  Format tags like <error> and <dim> get properly colored depending on the
+  above points.
+
+  But when used by this cli file, that coloring logic doesn't render properly
+  because we're compiling against vanilla OCaml 4.06 instead of ReScript's
+  OCaml fork. For example, the vanilla compiler doesn't support the `dim`
+  color (grey). So we emulate the right coloring logic by copy pasting how our
+  forked OCaml compiler does it.
+*)
+module Color = struct
+  (* use ANSI color codes, see https://en.wikipedia.org/wiki/ANSI_escape_code *)
+  type[@warning "-37"] color =
+    | Black
+    | Red
+    | Green
+    | Yellow
+    | Blue
+    | Magenta
+    | Cyan
+    | White
+
+  type[@warning "-37"] style =
+    | FG of color (* foreground *)
+    | BG of color (* background *)
+    | Bold
+    | Reset
+    | Dim
+
+  let ansi_of_color = function
+    | Black -> "0"
+    | Red -> "1"
+    | Green -> "2"
+    | Yellow -> "3"
+    | Blue -> "4"
+    | Magenta -> "5"
+    | Cyan -> "6"
+    | White -> "7"
+
+  let code_of_style = function
+    | FG c -> "3" ^ ansi_of_color c
+    | BG c -> "4" ^ ansi_of_color c
+    | Bold -> "1"
+    | Reset -> "0"
+    | Dim -> "2"
+
+  let ansi_of_style_l l =
+    let s =
+      match l with
+      | [] -> code_of_style Reset
+      | [s] -> code_of_style s
+      | _ -> String.concat ";" (List.map code_of_style l)
+    in
+    "\x1b[" ^ s ^ "m"
+
+  type styles = {error: style list; warning: style list; loc: style list}
+
+  let default_styles =
+    {warning = [Bold; FG Magenta]; error = [Bold; FG Red]; loc = [Bold]}
+
+  let cur_styles = ref default_styles
+
+  (* let get_styles () = !cur_styles *)
+  (* let set_styles s = cur_styles := s *)
+
+  (* map a tag to a style, if the tag is known.
+     @raise Not_found otherwise *)
+  let style_of_tag s =
+    match s with
+    | Format.String_tag "error" -> !cur_styles.error
+    | Format.String_tag "warning" -> !cur_styles.warning
+    | Format.String_tag "loc" -> !cur_styles.loc
+    | Format.String_tag "info" -> [Bold; FG Yellow]
+    | Format.String_tag "dim" -> [Dim]
+    | Format.String_tag "filename" -> [FG Cyan]
+    | _ -> raise Not_found
+  [@@raises Not_found]
+
+  let color_enabled = ref true
+
+  (* either prints the tag of [s] or delegates to [or_else] *)
+  let mark_open_tag ~or_else s =
+    try
+      let style = style_of_tag s in
+      if !color_enabled then ansi_of_style_l style else ""
+    with Not_found -> or_else s
+
+  let mark_close_tag ~or_else s =
+    try
+      let _ = style_of_tag s in
+      if !color_enabled then ansi_of_style_l [Reset] else ""
+    with Not_found -> or_else s
+
+  (* add color handling to formatter [ppf] *)
+  let set_color_tag_handling ppf =
+    let open Format in
+    let functions = pp_get_formatter_stag_functions ppf () in
+    let functions' =
+      {
+        functions with
+        mark_open_stag = mark_open_tag ~or_else:functions.mark_open_stag;
+        mark_close_stag = mark_close_tag ~or_else:functions.mark_close_stag;
+      }
+    in
+    pp_set_mark_tags ppf true;
+    (* enable tags *)
+    pp_set_formatter_stag_functions ppf functions';
+    (* also setup margins *)
+    pp_set_margin ppf (pp_get_margin std_formatter ());
+    ()
+
+  external isatty : out_channel -> bool = "caml_sys_isatty"
+
+  (* reasonable heuristic on whether colors should be enabled *)
+  let should_enable_color () =
+    let term = try Sys.getenv "TERM" with Not_found -> "" in
+    term <> "dumb" && term <> "" && isatty stderr
+
+  type[@warning "-37"] setting = Auto | Always | Never
+
+  let setup =
+    let first = ref true in
+    (* initialize only once *)
+    let formatter_l =
+      [Format.std_formatter; Format.err_formatter; Format.str_formatter]
+    in
+    fun o ->
+      if !first then (
+        first := false;
+        Format.set_mark_tags true;
+        List.iter set_color_tag_handling formatter_l;
+        color_enabled :=
+          match o with
+          | Some Always -> true
+          | Some Auto -> should_enable_color ()
+          | Some Never -> false
+          | None -> should_enable_color ());
+      ()
+end
+
+(* command line flags *)
+module ResClflags : sig
+  val recover : bool ref
+  val print : string ref
+  val width : int ref
+  val file : string ref
+  val interface : bool ref
+  val jsx_version : int ref
+  val jsx_module : string ref
+  val typechecker : bool ref
+  val test_ast_conversion : bool ref
+
+  val parse : unit -> unit
+end = struct
+  let recover = ref false
+  let width = ref 100
+
+  let print = ref "res"
+  let interface = ref false
+  let jsx_version = ref (-1)
+  let jsx_module = ref "react"
+  let file = ref ""
+  let typechecker = ref false
+  let test_ast_conversion = ref false
+
+  let usage =
+    "\n\
+     **This command line is for the repo developer's testing purpose only. DO \
+     NOT use it in production**!\n\n"
+    ^ "Usage:\n  res_parser <options> <file>\n\n" ^ "Examples:\n"
+    ^ "  res_parser myFile.res\n"
+    ^ "  res_parser -parse ml -print res myFile.ml\n"
+    ^ "  res_parser -parse res -print binary -interface myFile.resi\n\n"
+    ^ "Options are:"
+
+  let spec =
+    [
+      ("-recover", Arg.Unit (fun () -> recover := true), "Emit partial ast");
+      ( "-print",
+        Arg.String (fun txt -> print := txt),
+        "Print either binary, ml, ast, sexp, comments, tokens or res. Default: \
+         res" );
+      ( "-width",
+        Arg.Int (fun w -> width := w),
+        "Specify the line length for the printer (formatter)" );
+      ( "-interface",
+        Arg.Unit (fun () -> interface := true),
+        "Parse as interface" );
+      ( "-jsx-version",
+        Arg.Int (fun i -> jsx_version := i),
+        "Apply a specific built-in ppx before parsing, none or 3, 4. Default: \
+         none" );
+      ( "-jsx-module",
+        Arg.String (fun txt -> jsx_module := txt),
+        "Specify the jsx module. Default: react" );
+      ( "-typechecker",
+        Arg.Unit (fun () -> typechecker := true),
+        "Parses the ast as it would be passed to the typechecker and not the \
+         printer" );
+      ( "-test-ast-conversion",
+        Arg.Unit (fun () -> test_ast_conversion := true),
+        "Test the ast conversion" );
+    ]
+
+  let parse () = Arg.parse spec (fun f -> file := f) usage
+end
+
+module CliArgProcessor = struct
+  type backend = Parser : 'diagnostics Res_driver.parsing_engine -> backend
+  [@@unboxed]
+
+  let process_file ~is_interface ~width ~recover ~target ~jsx_version
+      ~jsx_module ~typechecker ~test_ast_conversion filename =
+    let len = String.length filename in
+    let process_interface =
+      is_interface
+      || (len > 0 && (String.get [@doesNotRaise]) filename (len - 1) = 'i')
+    in
+    let parsing_engine = Parser Res_driver.parsing_engine in
+    let print_engine =
+      match target with
+      | "binary" -> Res_driver_binary.print_engine
+      | "ml" -> Res_driver_ml_printer.print_engine
+      | "ast" -> Res_ast_debugger.print_engine
+      | "sexp" -> Res_ast_debugger.sexp_print_engine
+      | "comments" -> Res_ast_debugger.comments_print_engine
+      | "tokens" -> Res_token_debugger.token_print_engine
+      | "res" -> Res_driver.print_engine
+      | target ->
+        print_endline
+          ("-print needs to be either binary, ml, ast, sexp, comments, tokens \
+            or res. You provided " ^ target);
+        exit 1
+    in
+
+    let for_printer =
+      match target with
+      | ("res" | "sexp") when not typechecker -> true
+      | _ -> false
+    in
+
+    let (Parser backend) = parsing_engine in
+    (* This is the whole purpose of the Color module above *)
+    Color.setup None;
+
+    (* Special case for tokens - bypass parsing entirely *)
+    if target = "tokens" then
+      print_engine.print_implementation ~width ~filename ~comments:[] []
+    else if process_interface then
+      let parse_result = backend.parse_interface ~for_printer ~filename in
+      if parse_result.invalid then (
+        backend.string_of_diagnostics ~source:parse_result.source
+          ~filename:parse_result.filename parse_result.diagnostics;
+        if recover then
+          print_engine.print_interface ~width ~filename
+            ~comments:parse_result.comments parse_result.parsetree
+        else exit 1)
+      else
+        let parsetree =
+          if not test_ast_conversion then parse_result.parsetree
+          else
+            let tree0 =
+              Ast_mapper_to0.default_mapper.signature
+                Ast_mapper_to0.default_mapper parse_result.parsetree
+            in
+            Ast_mapper_from0.default_mapper.signature
+              Ast_mapper_from0.default_mapper tree0
+        in
+        let parsetree =
+          Jsx_ppx.rewrite_signature ~jsx_version ~jsx_module parsetree
+        in
+        print_engine.print_interface ~width ~filename
+          ~comments:parse_result.comments parsetree
+    else
+      let parse_result = backend.parse_implementation ~for_printer ~filename in
+      if parse_result.invalid then (
+        backend.string_of_diagnostics ~source:parse_result.source
+          ~filename:parse_result.filename parse_result.diagnostics;
+        if recover then
+          print_engine.print_implementation ~width ~filename
+            ~comments:parse_result.comments parse_result.parsetree
+        else exit 1)
+      else
+        let parsetree =
+          if not test_ast_conversion then parse_result.parsetree
+          else
+            let tree0 =
+              Ast_mapper_to0.default_mapper.structure
+                Ast_mapper_to0.default_mapper parse_result.parsetree
+            in
+            Ast_mapper_from0.default_mapper.structure
+              Ast_mapper_from0.default_mapper tree0
+        in
+        let parsetree =
+          Jsx_ppx.rewrite_implementation ~jsx_version ~jsx_module parsetree
+        in
+        print_engine.print_implementation ~width ~filename
+          ~comments:parse_result.comments parsetree
+  [@@raises exit]
+end
+
+let () =
+  if not !Sys.interactive then (
+    ResClflags.parse ();
+    CliArgProcessor.process_file ~is_interface:!ResClflags.interface
+      ~width:!ResClflags.width ~recover:!ResClflags.recover
+      ~target:!ResClflags.print ~jsx_version:!ResClflags.jsx_version
+      ~jsx_module:!ResClflags.jsx_module ~typechecker:!ResClflags.typechecker
+      !ResClflags.file
+      ~test_ast_conversion:!ResClflags.test_ast_conversion)
+[@@raises exit]
diff --git a/compiler/syntax/dune b/compiler/syntax/dune
new file mode 100644
index 0000000..ae61e90
--- /dev/null
+++ b/compiler/syntax/dune
@@ -0,0 +1,9 @@
+(dirs compiler-libs-406 src)
+
+(env
+ (dev
+  (flags
+   (:standard -w +a-4-42-40-9-48)))
+ (release
+  (flags
+   (:standard -w +a-4-42-40-9-48))))
diff --git a/compiler/syntax/src/dune b/compiler/syntax/src/dune
new file mode 100644
index 0000000..7765dcb
--- /dev/null
+++ b/compiler/syntax/src/dune
@@ -0,0 +1,6 @@
+(library
+ (name syntax)
+ (wrapped false)
+ (flags
+  (:standard -w +a-4-42-40-9-48-70))
+ (libraries ml))
diff --git a/compiler/syntax/src/jsx_common.ml b/compiler/syntax/src/jsx_common.ml
new file mode 100644
index 0000000..a48cf11
--- /dev/null
+++ b/compiler/syntax/src/jsx_common.ml
@@ -0,0 +1,58 @@
+open Asttypes
+open Parsetree
+
+type jsx_config = {
+  mutable version: int;
+  mutable module_: string;
+  mutable nested_modules: string list;
+  mutable has_component: bool;
+}
+
+(* Helper method to look up the [@react.component] attribute *)
+let has_attr (loc, _) =
+  match loc.txt with
+  | "react.component" | "jsx.component" -> true
+  | _ -> false
+
+let has_attr_with_props (loc, _) =
+  match loc.txt with
+  | "react.componentWithProps" | "jsx.componentWithProps" -> true
+  | _ -> false
+
+(* Iterate over the attributes and try to find the [@react.component] attribute *)
+let has_attr_on_binding pred {pvb_attributes} =
+  List.find_opt pred pvb_attributes <> None
+
+let core_type_of_attrs attributes =
+  List.find_map
+    (fun ({txt}, payload) ->
+      match (txt, payload) with
+      | ("react.component" | "jsx.component"), PTyp core_type -> Some core_type
+      | _ -> None)
+    attributes
+
+let typ_vars_of_core_type {ptyp_desc} =
+  match ptyp_desc with
+  | Ptyp_constr (_, core_types) ->
+    List.filter
+      (fun {ptyp_desc} ->
+        match ptyp_desc with
+        | Ptyp_var _ -> true
+        | _ -> false)
+      core_types
+  | _ -> []
+
+let raise_error ~loc msg = Location.raise_errorf ~loc msg
+
+let raise_error_multiple_component ~loc =
+  raise_error ~loc
+    "Only one component definition is allowed for each module. Move to a \
+     submodule or other file if necessary."
+
+let async_component ~async expr =
+  if async then
+    let open Ast_helper in
+    Exp.apply
+      (Exp.ident {loc = Location.none; txt = Ldot (Lident "Jsx", "promise")})
+      [(Nolabel, expr)]
+  else expr
diff --git a/compiler/syntax/src/jsx_ppx.ml b/compiler/syntax/src/jsx_ppx.ml
new file mode 100644
index 0000000..4b05e19
--- /dev/null
+++ b/compiler/syntax/src/jsx_ppx.ml
@@ -0,0 +1,162 @@
+open Ast_mapper
+open Asttypes
+open Parsetree
+open Longident
+
+let get_payload_fields payload =
+  match payload with
+  | PStr
+      ({
+         pstr_desc =
+           Pstr_eval ({pexp_desc = Pexp_record (record_fields, None)}, _);
+       }
+      :: _rest) ->
+    record_fields
+  | _ -> []
+
+type config_key = Int | String
+
+let get_jsx_config_by_key ~key ~type_ record_fields =
+  let values =
+    List.filter_map
+      (fun ({lid; x = expr} : expression record_element) ->
+        match (type_, lid, expr) with
+        | ( Int,
+            {txt = Lident k},
+            {pexp_desc = Pexp_constant (Pconst_integer (value, None))} )
+          when k = key ->
+          Some value
+        | ( String,
+            {txt = Lident k},
+            (* accept both normal strings and "js" strings *)
+            {pexp_desc = Pexp_constant (Pconst_string (value, _))} )
+          when k = key ->
+          Some value
+        | _ -> None)
+      record_fields
+  in
+  match values with
+  | [] -> None
+  | [v] | v :: _ -> Some v
+
+let get_int ~key fields =
+  match fields |> get_jsx_config_by_key ~key ~type_:Int with
+  | None -> None
+  | Some s -> int_of_string_opt s
+
+let get_string ~key fields = fields |> get_jsx_config_by_key ~key ~type_:String
+
+let update_config config payload =
+  let fields = get_payload_fields payload in
+  let module_raw = get_string ~key:"module_" fields in
+  let is_generic =
+    match module_raw |> Option.map (fun m -> String.lowercase_ascii m) with
+    | Some "react" | None -> false
+    | Some _ -> true
+  in
+  (match (is_generic, get_int ~key:"version" fields) with
+  | true, _ -> config.Jsx_common.version <- 4
+  | false, Some i -> config.Jsx_common.version <- i
+  | _ -> ());
+  match module_raw with
+  | None -> ()
+  | Some s -> config.module_ <- s
+
+let is_jsx_config_attr ((loc, _) : attribute) = loc.txt = "jsxConfig"
+
+let process_config_attribute attribute config =
+  if is_jsx_config_attr attribute then update_config config (snd attribute)
+
+let get_mapper ~config =
+  let ( expr4,
+        module_binding4,
+        transform_signature_item4,
+        transform_structure_item4 ) =
+    Jsx_v4.jsx_mapper ~config
+  in
+
+  let expr mapper e =
+    match config.version with
+    | 4 -> expr4 mapper e
+    | _ -> default_mapper.expr mapper e
+  in
+  let module_binding mapper mb =
+    match config.version with
+    | 4 -> module_binding4 mapper mb
+    | _ -> default_mapper.module_binding mapper mb
+  in
+  let save_config () =
+    {
+      config with
+      version = config.version;
+      module_ = config.module_;
+      has_component = config.has_component;
+    }
+  in
+  let restore_config old_config =
+    config.version <- old_config.Jsx_common.version;
+    config.module_ <- old_config.module_;
+    config.has_component <- old_config.has_component
+  in
+  let signature mapper items =
+    let old_config = save_config () in
+    config.has_component <- false;
+    let result =
+      List.map
+        (fun item ->
+          (match item.psig_desc with
+          | Psig_attribute attr -> process_config_attribute attr config
+          | _ -> ());
+          let item = default_mapper.signature_item mapper item in
+          if config.version = 4 then transform_signature_item4 item else [item])
+        items
+      |> List.flatten
+    in
+    restore_config old_config;
+    result
+  in
+  let structure mapper items =
+    let old_config = save_config () in
+    config.has_component <- false;
+    let result =
+      List.map
+        (fun item ->
+          (match item.pstr_desc with
+          | Pstr_attribute attr -> process_config_attribute attr config
+          | _ -> ());
+          let item = default_mapper.structure_item mapper item in
+          if config.version = 4 then transform_structure_item4 item else [item])
+        items
+      |> List.flatten
+    in
+    restore_config old_config;
+    result
+  in
+
+  {default_mapper with expr; module_binding; signature; structure}
+
+let rewrite_implementation ~jsx_version ~jsx_module (code : Parsetree.structure)
+    : Parsetree.structure =
+  let config =
+    {
+      Jsx_common.version = jsx_version;
+      module_ = jsx_module;
+      nested_modules = [];
+      has_component = false;
+    }
+  in
+  let mapper = get_mapper ~config in
+  mapper.structure mapper code
+
+let rewrite_signature ~jsx_version ~jsx_module (code : Parsetree.signature) :
+    Parsetree.signature =
+  let config =
+    {
+      Jsx_common.version = jsx_version;
+      module_ = jsx_module;
+      nested_modules = [];
+      has_component = false;
+    }
+  in
+  let mapper = get_mapper ~config in
+  mapper.signature mapper code
diff --git a/compiler/syntax/src/jsx_ppx.mli b/compiler/syntax/src/jsx_ppx.mli
new file mode 100644
index 0000000..36ff84f
--- /dev/null
+++ b/compiler/syntax/src/jsx_ppx.mli
@@ -0,0 +1,18 @@
+(*
+  This is the module that handles turning Reason JSX' agnostic function call into
+  a ReasonReact-specific function call. Aka, this is a macro, using OCaml's ppx
+  facilities; https://whitequark.org/blog/2014/04/16/a-guide-to-extension-
+  points-in-ocaml/
+*)
+
+val rewrite_implementation :
+  jsx_version:int ->
+  jsx_module:string ->
+  Parsetree.structure ->
+  Parsetree.structure
+
+val rewrite_signature :
+  jsx_version:int ->
+  jsx_module:string ->
+  Parsetree.signature ->
+  Parsetree.signature
diff --git a/compiler/syntax/src/jsx_v4.ml b/compiler/syntax/src/jsx_v4.ml
new file mode 100644
index 0000000..4cf9c9a
--- /dev/null
+++ b/compiler/syntax/src/jsx_v4.ml
@@ -0,0 +1,1369 @@
+open! Ast_helper
+open Ast_mapper
+open Asttypes
+open! Parsetree
+open Longident
+
+let module_access_name config value =
+  String.capitalize_ascii config.Jsx_common.module_ ^ "." ^ value
+  |> Longident.parse
+
+let nolabel = Nolabel
+
+let is_optional str =
+  match str with
+  | Optional _ -> true
+  | _ -> false
+
+let is_labelled str =
+  match str with
+  | Labelled _ -> true
+  | _ -> false
+
+let is_forward_ref = function
+  | {pexp_desc = Pexp_ident {txt = Ldot (Lident "React", "forwardRef")}} -> true
+  | _ -> false
+
+let get_label str =
+  match str with
+  | Optional {txt = str} | Labelled {txt = str} -> str
+  | Nolabel -> ""
+
+let constant_string ~loc str =
+  Ast_helper.Exp.constant ~loc (Pconst_string (str, None))
+
+let unit_expr ~loc = Exp.construct ~loc (Location.mkloc (Lident "()") loc) None
+
+let safe_type_from_value value_str =
+  let value_str = get_label value_str in
+  if value_str = "" || (value_str.[0] [@doesNotRaise]) <> '_' then value_str
+  else "T" ^ value_str
+
+let ref_type_var loc = Typ.var ~loc "ref"
+
+let ref_type loc =
+  Typ.constr ~loc
+    {loc; txt = Ldot (Ldot (Lident "Js", "Nullable"), "t")}
+    [ref_type_var loc]
+
+let jsx_element_type config ~loc =
+  Typ.constr ~loc {loc; txt = module_access_name config "element"} []
+
+(* Helper method to filter out any attribute that isn't [@react.component] *)
+let other_attrs_pure (loc, _) =
+  match loc.txt with
+  | "react.component" | "jsx.component" | "react.componentWithProps"
+  | "jsx.componentWithProps" ->
+    false
+  | _ -> true
+
+(* Finds the name of the variable the binding is assigned to, otherwise raises Invalid_argument *)
+let rec get_fn_name binding =
+  match binding with
+  | {ppat_desc = Ppat_var {txt}} -> txt
+  | {ppat_desc = Ppat_constraint (pat, _)} -> get_fn_name pat
+  | {ppat_loc} ->
+    Jsx_common.raise_error ~loc:ppat_loc
+      "JSX component calls cannot be destructured."
+
+let make_new_binding binding expression new_name =
+  match binding with
+  | {pvb_pat = {ppat_desc = Ppat_var ppat_var} as pvb_pat} ->
+    {
+      binding with
+      pvb_pat =
+        {pvb_pat with ppat_desc = Ppat_var {ppat_var with txt = new_name}};
+      pvb_expr = expression;
+      pvb_attributes = [];
+    }
+  | {pvb_loc} ->
+    Jsx_common.raise_error ~loc:pvb_loc
+      "JSX component calls cannot be destructured."
+
+(* Lookup the filename from the location information on the AST node and turn it into a valid module identifier *)
+let filename_from_loc (pstr_loc : Location.t) =
+  let file_name =
+    match pstr_loc.loc_start.pos_fname with
+    | "" -> !Location.input_name
+    | file_name -> file_name
+  in
+  let file_name =
+    try Filename.chop_extension (Filename.basename file_name)
+    with Invalid_argument _ -> file_name
+  in
+  let file_name = String.capitalize_ascii file_name in
+  file_name
+
+(* Build a string representation of a module name with segments separated by $ *)
+let make_module_name file_name nested_modules fn_name =
+  let full_module_name =
+    match (file_name, nested_modules, fn_name) with
+    (* TODO: is this even reachable? It seems like the fileName always exists *)
+    | "", nested_modules, "make" -> nested_modules
+    | "", nested_modules, fn_name -> List.rev (fn_name :: nested_modules)
+    | file_name, nested_modules, "make" -> file_name :: List.rev nested_modules
+    | file_name, nested_modules, fn_name ->
+      file_name :: List.rev (fn_name :: nested_modules)
+  in
+  let full_module_name = String.concat "$" full_module_name in
+  full_module_name
+
+(* make type params for make fn arguments *)
+(* let make = ({id, name, children}: props<'id, 'name, 'children>) *)
+let make_props_type_params_tvar named_type_list =
+  named_type_list
+  |> List.filter_map (fun (_isOptional, label, _, loc, _interiorType) ->
+         if label = "key" then None
+         else
+           Some
+             (Typ.var ~loc
+             @@ safe_type_from_value
+                  (Labelled {txt = label; loc = Location.none})))
+
+let strip_option core_type =
+  match core_type with
+  | {ptyp_desc = Ptyp_constr ({txt = Lident "option"}, core_types)} ->
+    List.nth_opt core_types 0 [@doesNotRaise]
+  | _ -> Some core_type
+
+let strip_js_nullable core_type =
+  match core_type with
+  | {
+   ptyp_desc =
+     Ptyp_constr ({txt = Ldot (Ldot (Lident "Js", "Nullable"), "t")}, core_types);
+  } ->
+    List.nth_opt core_types 0 [@doesNotRaise]
+  | _ -> Some core_type
+
+(* Make type params of the props type *)
+(* (Sig) let make: React.componentLike<props<string>, React.element> *)
+(* (Str) let make = ({x, _}: props<'x>) => body *)
+(* (Str) external make: React.componentLike<props< .. >, React.element> = "default" *)
+let make_props_type_params ?(strip_explicit_option = false)
+    ?(strip_explicit_js_nullable_of_ref = false) named_type_list =
+  named_type_list
+  |> List.filter_map (fun (is_optional, label, _, loc, interior_type) ->
+         if label = "key" then None
+           (* TODO: Worth thinking how about "ref_" or "_ref" usages *)
+         else if label = "ref" then
+           (*
+                If ref has a type annotation then use it, else 'ref.
+                For example, if JSX ppx is used for React Native, type would be different.
+             *)
+           match interior_type with
+           | {ptyp_desc = Ptyp_any} -> Some (ref_type_var loc)
+           | _ ->
+             (* Strip explicit Js.Nullable.t in case of forwardRef *)
+             if strip_explicit_js_nullable_of_ref then
+               strip_js_nullable interior_type
+             else Some interior_type
+           (* Strip the explicit option type in implementation *)
+           (* let make = (~x: option<string>=?) => ... *)
+         else if is_optional && strip_explicit_option then
+           strip_option interior_type
+         else Some interior_type)
+
+let make_label_decls named_type_list =
+  let rec check_duplicated_label l =
+    let rec mem_label ((_, (la : string), _, _, _) as x) = function
+      | [] -> false
+      | (_, (lb : string), _, _, _) :: l -> lb = la || mem_label x l
+    in
+    match l with
+    | [] -> ()
+    | hd :: tl ->
+      if mem_label hd tl then
+        let _, label, _, loc, _ = hd in
+        Jsx_common.raise_error ~loc
+          "The prop `%s` is defined several times in this component." label
+      else check_duplicated_label tl
+  in
+  let () = named_type_list |> List.rev |> check_duplicated_label in
+
+  named_type_list
+  |> List.map (fun (is_optional, label, attrs, loc, interior_type) ->
+         if label = "key" then
+           Type.field ~loc ~attrs ~optional:true {txt = label; loc}
+             interior_type
+         else if is_optional then
+           Type.field ~loc ~attrs ~optional:true {txt = label; loc}
+             (Typ.var @@ safe_type_from_value
+             @@ Labelled {txt = label; loc = Location.none})
+         else
+           Type.field ~loc ~attrs {txt = label; loc}
+             (Typ.var @@ safe_type_from_value
+             @@ Labelled {txt = label; loc = Location.none}))
+
+let make_type_decls ~attrs props_name loc named_type_list =
+  let label_decl_list = make_label_decls named_type_list in
+  (* 'id, 'className, ... *)
+  let params =
+    make_props_type_params_tvar named_type_list
+    |> List.map (fun core_type -> (core_type, Invariant))
+  in
+  [
+    Type.mk ~attrs ~loc ~params {txt = props_name; loc}
+      ~kind:(Ptype_record label_decl_list);
+  ]
+
+let make_type_decls_with_core_type props_name loc core_type typ_vars =
+  [
+    Type.mk ~loc {txt = props_name; loc} ~kind:Ptype_abstract
+      ~params:(typ_vars |> List.map (fun v -> (v, Invariant)))
+      ~manifest:core_type;
+  ]
+
+let live_attr = ({txt = "live"; loc = Location.none}, PStr [])
+let jsx_component_props_attr =
+  ({txt = "res.jsxComponentProps"; loc = Location.none}, PStr [])
+
+(* type props<'x, 'y, ...> = { x: 'x, y?: 'y, ... } *)
+let make_props_record_type ~core_type_of_attr ~external_ ~typ_vars_of_core_type
+    props_name loc named_type_list =
+  let attrs =
+    if external_ then [jsx_component_props_attr; live_attr]
+    else [jsx_component_props_attr]
+  in
+  Str.type_ Nonrecursive
+    (match core_type_of_attr with
+    | None -> make_type_decls ~attrs props_name loc named_type_list
+    | Some core_type ->
+      make_type_decls_with_core_type props_name loc core_type
+        typ_vars_of_core_type)
+
+(* type props<'x, 'y, ...> = { x: 'x, y?: 'y, ... } *)
+let make_props_record_type_sig ~core_type_of_attr ~external_
+    ~typ_vars_of_core_type props_name loc named_type_list =
+  let attrs =
+    if external_ then [jsx_component_props_attr; live_attr]
+    else [jsx_component_props_attr]
+  in
+  Sig.type_ Nonrecursive
+    (match core_type_of_attr with
+    | None -> make_type_decls ~attrs props_name loc named_type_list
+    | Some core_type ->
+      make_type_decls_with_core_type props_name loc core_type
+        typ_vars_of_core_type)
+
+let rec recursively_transform_named_args_for_make expr args newtypes core_type =
+  match expr.pexp_desc with
+  (* TODO: make this show up with a loc. *)
+  | Pexp_fun {arg_label = Labelled {txt = "key"} | Optional {txt = "key"}} ->
+    Jsx_common.raise_error ~loc:expr.pexp_loc
+      "Key cannot be accessed inside of a component. Don't worry - you can \
+       always key a component from its parent!"
+  | Pexp_fun {arg_label = arg; default; lhs = pattern; rhs = expression}
+    when is_optional arg || is_labelled arg ->
+    let () =
+      match (is_optional arg, pattern, default) with
+      | true, {ppat_desc = Ppat_constraint (_, {ptyp_desc})}, None -> (
+        match ptyp_desc with
+        | Ptyp_constr ({txt = Lident "option"}, [_]) -> ()
+        | _ ->
+          let current_type =
+            match ptyp_desc with
+            | Ptyp_constr ({txt}, []) ->
+              String.concat "." (Longident.flatten txt)
+            | Ptyp_constr ({txt}, _innerTypeArgs) ->
+              String.concat "." (Longident.flatten txt) ^ "(...)"
+            | _ -> "..."
+          in
+          Location.prerr_warning pattern.ppat_loc
+            (Preprocessor
+               (Printf.sprintf
+                  "React: optional argument annotations must have explicit \
+                   `option`. Did you mean `option<%s>=?`?"
+                  current_type)))
+      | _ -> ()
+    in
+    let alias =
+      match pattern with
+      | {
+       ppat_desc =
+         ( Ppat_alias (_, {txt})
+         | Ppat_var {txt}
+         | Ppat_constraint ({ppat_desc = Ppat_var {txt}}, _) );
+      } ->
+        txt
+      | {ppat_desc = Ppat_any} -> "_"
+      | _ -> get_label arg
+    in
+    let type_ =
+      match pattern with
+      | {ppat_desc = Ppat_constraint (_, {ptyp_desc = Ptyp_package _})} -> None
+      | {ppat_desc = Ppat_constraint (_, type_)} -> Some type_
+      | _ -> None
+    in
+
+    recursively_transform_named_args_for_make expression
+      ((arg, default, pattern, alias, pattern.ppat_loc, type_) :: args)
+      newtypes core_type
+  | Pexp_fun
+      {
+        arg_label = Nolabel;
+        lhs = {ppat_desc = Ppat_construct ({txt = Lident "()"}, _) | Ppat_any};
+      } ->
+    (args, newtypes, core_type)
+  | Pexp_fun
+      {
+        arg_label = Nolabel;
+        lhs =
+          {
+            ppat_desc =
+              Ppat_var {txt} | Ppat_constraint ({ppat_desc = Ppat_var {txt}}, _);
+          } as pattern;
+      } ->
+    if txt = "ref" then
+      let type_ =
+        match pattern with
+        | {ppat_desc = Ppat_constraint (_, type_)} -> Some type_
+        | _ -> None
+      in
+      (* The ref arguement of forwardRef should be optional *)
+      ( ( Optional {txt = "ref"; loc = Location.none},
+          None,
+          pattern,
+          txt,
+          pattern.ppat_loc,
+          type_ )
+        :: args,
+        newtypes,
+        core_type )
+    else (args, newtypes, core_type)
+  | Pexp_fun {arg_label = Nolabel; lhs = pattern} ->
+    Location.raise_errorf ~loc:pattern.ppat_loc
+      "React: react.component refs only support plain arguments and type \
+       annotations."
+  | Pexp_newtype (label, expression) ->
+    recursively_transform_named_args_for_make expression args
+      (label :: newtypes) core_type
+  | Pexp_constraint (expression, core_type) ->
+    recursively_transform_named_args_for_make expression args newtypes
+      (Some core_type)
+  | _ -> (args, newtypes, core_type)
+
+let arg_to_type types
+    ((name, default, {ppat_attributes = attrs}, _alias, loc, type_) :
+      arg_label * expression option * pattern * label * 'loc * core_type option)
+    =
+  match (type_, name, default) with
+  | Some type_, name, _ when is_optional name ->
+    (true, get_label name, attrs, loc, type_) :: types
+  | Some type_, name, _ -> (false, get_label name, attrs, loc, type_) :: types
+  | None, name, _ when is_optional name ->
+    (true, get_label name, attrs, loc, Typ.any ~loc ()) :: types
+  | None, name, _ when is_labelled name ->
+    (false, get_label name, attrs, loc, Typ.any ~loc ()) :: types
+  | _ -> types
+
+let has_default_value name_arg_list =
+  name_arg_list
+  |> List.exists (fun (name, default, _, _, _, _) ->
+         Option.is_some default && is_optional name)
+
+let arg_to_concrete_type types (name, attrs, loc, type_) =
+  match name with
+  | name when is_labelled name ->
+    (false, get_label name, attrs, loc, type_) :: types
+  | name when is_optional name ->
+    (true, get_label name, attrs, loc, type_) :: types
+  | _ -> types
+
+let check_string_int_attribute_iter =
+  let attribute _ ({txt; loc}, _) =
+    if txt = "string" || txt = "int" then
+      Jsx_common.raise_error ~loc
+        "@string and @int attributes not supported. See \
+         https://github.com/rescript-lang/rescript-compiler/issues/5724"
+  in
+
+  {Ast_iterator.default_iterator with attribute}
+
+let check_multiple_components ~config ~loc =
+  (* If there is another component, throw error *)
+  if config.Jsx_common.has_component then
+    Jsx_common.raise_error_multiple_component ~loc
+  else config.has_component <- true
+
+let modified_binding_old binding =
+  let expression = binding.pvb_expr in
+  (* TODO: there is a long-tail of unsupported features inside of blocks - Pexp_letmodule , Pexp_letexception , Pexp_ifthenelse *)
+  let rec spelunk_for_fun_expression expression =
+    match expression with
+    (* let make = (~prop) => ... *)
+    | {pexp_desc = Pexp_fun _} | {pexp_desc = Pexp_newtype _} -> expression
+    (* let make = {let foo = bar in (~prop) => ...} *)
+    | {pexp_desc = Pexp_let (_recursive, _vbs, return_expression)} ->
+      (* here's where we spelunk! *)
+      spelunk_for_fun_expression return_expression
+    (* let make = React.forwardRef((~prop) => ...) *)
+    | {pexp_desc = Pexp_apply {args = [(Nolabel, inner_function_expression)]}}
+      ->
+      spelunk_for_fun_expression inner_function_expression
+    | {
+     pexp_desc = Pexp_sequence (_wrapperExpression, inner_function_expression);
+    } ->
+      spelunk_for_fun_expression inner_function_expression
+    | {pexp_desc = Pexp_constraint (inner_function_expression, _typ)} ->
+      spelunk_for_fun_expression inner_function_expression
+    | {pexp_loc} ->
+      Jsx_common.raise_error ~loc:pexp_loc
+        "JSX component calls can only be on function definitions or component \
+         wrappers (forwardRef, memo)."
+  in
+  spelunk_for_fun_expression expression
+
+let modified_binding ~binding_loc ~binding_pat_loc ~fn_name binding =
+  let has_application = ref false in
+  let wrap_expression_with_binding expression_fn expression =
+    Vb.mk ~loc:binding_loc ~attrs:binding.pvb_attributes
+      (Pat.var ~loc:binding_pat_loc {loc = binding_pat_loc; txt = fn_name})
+      (expression_fn expression)
+  in
+  let expression = binding.pvb_expr in
+  (* TODO: there is a long-tail of unsupported features inside of blocks - Pexp_letmodule , Pexp_letexception , Pexp_ifthenelse *)
+  let rec spelunk_for_fun_expression expression =
+    match expression with
+    (* let make = (~prop) => ... with no final unit *)
+    | {
+     pexp_desc =
+       Pexp_fun
+         ({
+            arg_label = Labelled _ | Optional _;
+            rhs = {pexp_desc = Pexp_fun _} as internal_expression;
+          } as f);
+    } ->
+      let wrap, has_forward_ref, exp =
+        spelunk_for_fun_expression internal_expression
+      in
+      ( wrap,
+        has_forward_ref,
+        {expression with pexp_desc = Pexp_fun {f with rhs = exp}} )
+    (* let make = (()) => ... *)
+    (* let make = (_) => ... *)
+    | {
+     pexp_desc =
+       Pexp_fun
+         {
+           arg_label = Nolabel;
+           lhs =
+             {ppat_desc = Ppat_construct ({txt = Lident "()"}, _) | Ppat_any};
+         };
+    } ->
+      ((fun a -> a), false, expression)
+    (* let make = (~prop) => ... *)
+    | {pexp_desc = Pexp_fun {arg_label = Labelled _ | Optional _}} ->
+      ((fun a -> a), false, expression)
+    (* let make = (prop) => ... *)
+    | {pexp_desc = Pexp_fun {lhs = pattern}} ->
+      if !has_application then ((fun a -> a), false, expression)
+      else
+        Location.raise_errorf ~loc:pattern.ppat_loc
+          "React: props need to be labelled arguments.\n\
+          \  If you are working with refs be sure to wrap with React.forwardRef.\n\
+          \  If your component doesn't have any props use () or _ instead of a \
+           name."
+    (* let make = {let foo = bar in (~prop) => ...} *)
+    | {pexp_desc = Pexp_let (recursive, vbs, internal_expression)} ->
+      (* here's where we spelunk! *)
+      let wrap, has_forward_ref, exp =
+        spelunk_for_fun_expression internal_expression
+      in
+      ( wrap,
+        has_forward_ref,
+        {expression with pexp_desc = Pexp_let (recursive, vbs, exp)} )
+    (* let make = React.forwardRef((~prop) => ...) *)
+    | {
+     pexp_desc =
+       Pexp_apply
+         {funct = wrapper_expression; args = [(Nolabel, internal_expression)]};
+    } ->
+      let () = has_application := true in
+      let _, _, exp = spelunk_for_fun_expression internal_expression in
+      let has_forward_ref = is_forward_ref wrapper_expression in
+      ( (fun exp -> Exp.apply wrapper_expression [(nolabel, exp)]),
+        has_forward_ref,
+        exp )
+    | {pexp_desc = Pexp_sequence (wrapper_expression, internal_expression)} ->
+      let wrap, has_forward_ref, exp =
+        spelunk_for_fun_expression internal_expression
+      in
+      ( wrap,
+        has_forward_ref,
+        {expression with pexp_desc = Pexp_sequence (wrapper_expression, exp)} )
+    | e -> ((fun a -> a), false, e)
+  in
+  let wrap_expression, has_forward_ref, expression =
+    spelunk_for_fun_expression expression
+  in
+  (wrap_expression_with_binding wrap_expression, has_forward_ref, expression)
+
+let vb_match ~expr (name, default, _, alias, loc, _) =
+  let label = get_label name in
+  match default with
+  | Some default ->
+    let value_binding =
+      Vb.mk
+        (Pat.var (Location.mkloc alias loc))
+        (Exp.match_
+           (Exp.ident {txt = Lident ("__" ^ alias); loc = Location.none})
+           [
+             Exp.case
+               (Pat.construct
+                  (Location.mknoloc @@ Lident "Some")
+                  (Some (Pat.var (Location.mknoloc label))))
+               (Exp.ident (Location.mknoloc @@ Lident label));
+             Exp.case
+               (Pat.construct (Location.mknoloc @@ Lident "None") None)
+               default;
+           ])
+    in
+    Exp.let_ Nonrecursive [value_binding] expr
+  | None -> expr
+
+let vb_match_expr named_arg_list expr =
+  let rec aux named_arg_list =
+    match named_arg_list with
+    | [] -> expr
+    | named_arg :: rest -> vb_match named_arg ~expr:(aux rest)
+  in
+  aux (List.rev named_arg_list)
+
+let map_binding ~config ~empty_loc ~pstr_loc ~file_name ~rec_flag binding =
+  (* Traverse the component body and force every reachable return expression to
+   be annotated as `Jsx.element`. This walks through the wrapper constructs the
+   PPX introduces (fun/newtype/let/sequence) so that the constraint ends up on
+   the real return position even after we rewrite the function. *)
+  let rec constrain_jsx_return expr =
+    let jsx_element_constraint expr =
+      Exp.constraint_ expr (jsx_element_type config ~loc:expr.pexp_loc)
+    in
+    match expr.pexp_desc with
+    | Pexp_fun ({rhs} as desc) ->
+      {
+        expr with
+        pexp_desc = Pexp_fun {desc with rhs = constrain_jsx_return rhs};
+      }
+    | Pexp_newtype (param, inner) ->
+      {expr with pexp_desc = Pexp_newtype (param, constrain_jsx_return inner)}
+    | Pexp_constraint (inner, _) ->
+      let constrained_inner = constrain_jsx_return inner in
+      jsx_element_constraint constrained_inner
+    | Pexp_let (rec_flag, bindings, body) ->
+      {
+        expr with
+        pexp_desc = Pexp_let (rec_flag, bindings, constrain_jsx_return body);
+      }
+    | Pexp_sequence (first, second) ->
+      {expr with pexp_desc = Pexp_sequence (first, constrain_jsx_return second)}
+    | _ -> jsx_element_constraint expr
+  in
+  if Jsx_common.has_attr_on_binding Jsx_common.has_attr binding then (
+    check_multiple_components ~config ~loc:pstr_loc;
+    let core_type_of_attr =
+      Jsx_common.core_type_of_attrs binding.pvb_attributes
+    in
+    let typ_vars_of_core_type =
+      core_type_of_attr
+      |> Option.map Jsx_common.typ_vars_of_core_type
+      |> Option.value ~default:[]
+    in
+    let binding_loc = binding.pvb_loc in
+    let binding_pat_loc = binding.pvb_pat.ppat_loc in
+    let binding =
+      {
+        binding with
+        pvb_pat = {binding.pvb_pat with ppat_loc = empty_loc};
+        pvb_loc = empty_loc;
+        pvb_attributes = binding.pvb_attributes |> List.filter other_attrs_pure;
+      }
+    in
+    let fn_name = get_fn_name binding.pvb_pat in
+    let internal_fn_name = fn_name ^ "$Internal" in
+    let full_module_name =
+      make_module_name file_name config.nested_modules fn_name
+    in
+    let binding_wrapper, has_forward_ref, expression =
+      modified_binding ~binding_loc ~binding_pat_loc ~fn_name binding
+    in
+    let is_async = Ast_async.dig_async_payload_from_function binding.pvb_expr in
+    let named_arg_list, newtypes, _typeConstraints =
+      recursively_transform_named_args_for_make
+        (modified_binding_old binding)
+        [] [] None
+    in
+    let named_type_list = List.fold_left arg_to_type [] named_arg_list in
+    (* type props = { ... } *)
+    let props_record_type =
+      make_props_record_type ~core_type_of_attr ~external_:false
+        ~typ_vars_of_core_type "props" pstr_loc named_type_list
+    in
+    let inner_expression =
+      Exp.apply
+        (Exp.ident
+           (Location.mknoloc
+           @@ Lident
+                (match rec_flag with
+                | Recursive -> internal_fn_name
+                | Nonrecursive -> fn_name)))
+        ([(Nolabel, Exp.ident (Location.mknoloc @@ Lident "props"))]
+        @
+        match has_forward_ref with
+        | true -> [(Nolabel, Exp.ident (Location.mknoloc @@ Lident "ref"))]
+        | false -> [])
+    in
+    let make_props_pattern = function
+      | [] -> Pat.var @@ Location.mknoloc "props"
+      | _ ->
+        Pat.constraint_
+          (Pat.var @@ Location.mknoloc "props")
+          (Typ.constr (Location.mknoloc @@ Lident "props") [Typ.any ()])
+    in
+    let inner_expression =
+      Jsx_common.async_component ~async:is_async inner_expression
+    in
+    let full_expression =
+      (* React component name should start with uppercase letter *)
+      (* let make = { let \"App" = props => make(props); \"App" } *)
+      (* let make = React.forwardRef({
+           let \"App" = (props, ref) => make({...props, ref: @optional (Js.Nullabel.toOption(ref))})
+         })*)
+      let total_arity = if has_forward_ref then 2 else 1 in
+      Exp.fun_ ~arity:(Some total_arity) Nolabel None
+        (match core_type_of_attr with
+        | None -> make_props_pattern named_type_list
+        | Some _ -> make_props_pattern typ_vars_of_core_type)
+        (if has_forward_ref then
+           Exp.fun_ ~arity:None Nolabel None
+             (Pat.var @@ Location.mknoloc "ref")
+             inner_expression
+         else inner_expression)
+        ~attrs:binding.pvb_expr.pexp_attributes
+    in
+    let full_expression =
+      match full_module_name with
+      | "" -> full_expression
+      | txt ->
+        Exp.let_ Nonrecursive
+          [
+            Vb.mk ~loc:empty_loc
+              (Pat.var ~loc:empty_loc {loc = empty_loc; txt})
+              full_expression;
+          ]
+          (Exp.ident ~loc:pstr_loc {loc = empty_loc; txt = Lident txt})
+    in
+    let rec strip_constraint_unpack ~label pattern =
+      match pattern with
+      | {ppat_desc = Ppat_constraint (_, {ptyp_desc = Ptyp_package _})} ->
+        pattern
+      | {ppat_desc = Ppat_constraint (pattern, _)} ->
+        strip_constraint_unpack ~label pattern
+      | _ -> pattern
+    in
+    let safe_pattern_label pattern =
+      match pattern with
+      | {ppat_desc = Ppat_var {txt; loc}} ->
+        {pattern with ppat_desc = Ppat_var {txt = "__" ^ txt; loc}}
+      | {ppat_desc = Ppat_alias (p, {txt; loc})} ->
+        {pattern with ppat_desc = Ppat_alias (p, {txt = "__" ^ txt; loc})}
+      | _ -> pattern
+    in
+    let rec returned_expression patterns_with_label patterns_with_nolabel
+        ({pexp_desc} as expr) =
+      match pexp_desc with
+      | Pexp_newtype (_, expr) ->
+        returned_expression patterns_with_label patterns_with_nolabel expr
+      | Pexp_constraint (expr, _) ->
+        returned_expression patterns_with_label patterns_with_nolabel expr
+      | Pexp_fun
+          {
+            lhs = {ppat_desc = Ppat_construct ({txt = Lident "()"}, _)};
+            rhs = expr;
+          } ->
+        (patterns_with_label, patterns_with_nolabel, expr)
+      | Pexp_fun
+          {
+            arg_label;
+            default;
+            lhs = {ppat_loc; ppat_desc} as pattern;
+            rhs = expr;
+          } -> (
+        let pattern_without_constraint =
+          strip_constraint_unpack ~label:(get_label arg_label) pattern
+        in
+        (*
+           If prop has the default value as Ident, it will get a build error
+           when the referenced Ident value and the prop have the same name.
+           So we add a "__" to label to resolve the build error.
+        *)
+        let pattern_with_safe_label =
+          match default with
+          | Some _ -> safe_pattern_label pattern_without_constraint
+          | _ -> pattern_without_constraint
+        in
+        if is_labelled arg_label || is_optional arg_label then
+          returned_expression
+            ({
+               lid = {loc = ppat_loc; txt = Lident (get_label arg_label)};
+               x =
+                 {
+                   pattern_with_safe_label with
+                   ppat_attributes = pattern.ppat_attributes;
+                 };
+               opt = is_optional arg_label;
+             }
+            :: patterns_with_label)
+            patterns_with_nolabel expr
+        else
+          (* Special case of nolabel arg "ref" in forwardRef fn *)
+          (* let make = React.forwardRef(ref => body) *)
+          match ppat_desc with
+          | Ppat_var {txt} | Ppat_constraint ({ppat_desc = Ppat_var {txt}}, _)
+            ->
+            returned_expression patterns_with_label
+              (( {loc = ppat_loc; txt = Lident txt},
+                 {pattern with ppat_attributes = pattern.ppat_attributes},
+                 true )
+              :: patterns_with_nolabel)
+              expr
+          | _ ->
+            returned_expression patterns_with_label patterns_with_nolabel expr)
+      | _ -> (patterns_with_label, patterns_with_nolabel, expr)
+    in
+    let patterns_with_label, patterns_with_nolabel, expression =
+      returned_expression [] [] expression
+    in
+    (* add pattern matching for optional prop value *)
+    let expression =
+      if has_default_value named_arg_list then
+        vb_match_expr named_arg_list expression
+      else expression
+    in
+    let expression = constrain_jsx_return expression in
+    (* (ref) => expr *)
+    let expression =
+      List.fold_left
+        (fun expr (_, pattern, _opt) ->
+          let pattern =
+            match pattern.ppat_desc with
+            | Ppat_var {txt} when txt = "ref" ->
+              Pat.constraint_ pattern (ref_type Location.none)
+            | _ -> pattern
+          in
+          Exp.fun_ ~arity:None Nolabel None pattern expr)
+        expression patterns_with_nolabel
+    in
+    (* ({a, b, _}: props<'a, 'b>) *)
+    let record_pattern =
+      match patterns_with_label with
+      | [] -> Pat.any ()
+      | _ -> Pat.record (List.rev patterns_with_label) Open
+    in
+    let expression =
+      (* Shape internal implementation to match wrapper: uncurried when using forwardRef. *)
+      let total_arity = if has_forward_ref then 2 else 1 in
+      Exp.fun_ ~arity:(Some total_arity) ~async:is_async Nolabel None
+        (Pat.constraint_ record_pattern
+           (Typ.constr ~loc:empty_loc
+              {txt = Lident "props"; loc = empty_loc}
+              (match core_type_of_attr with
+              | None ->
+                make_props_type_params ~strip_explicit_option:true
+                  ~strip_explicit_js_nullable_of_ref:has_forward_ref
+                  named_type_list
+              | Some _ -> (
+                match typ_vars_of_core_type with
+                | [] -> []
+                | _ -> [Typ.any ()]))))
+        expression
+    in
+    let expression =
+      (* Add new tupes (type a,b,c) to make's definition *)
+      newtypes
+      |> List.fold_left (fun e newtype -> Exp.newtype newtype e) expression
+    in
+    (* let make = ({id, name, ...}: props<'id, 'name, ...>) => { ... } *)
+    let binding, new_binding =
+      match rec_flag with
+      | Recursive ->
+        ( binding_wrapper
+            (Exp.let_ ~loc:empty_loc Nonrecursive
+               [make_new_binding binding expression internal_fn_name]
+               (Exp.let_ ~loc:empty_loc Nonrecursive
+                  [
+                    Vb.mk
+                      (Pat.var {loc = empty_loc; txt = fn_name})
+                      full_expression;
+                  ]
+                  (Exp.ident {loc = empty_loc; txt = Lident fn_name}))),
+          None )
+      | Nonrecursive ->
+        ( {
+            binding with
+            pvb_expr = expression;
+            pvb_pat = Pat.var {txt = fn_name; loc = Location.none};
+          },
+          Some (binding_wrapper full_expression) )
+    in
+    (Some props_record_type, binding, new_binding))
+  else if Jsx_common.has_attr_on_binding Jsx_common.has_attr_with_props binding
+  then
+    let modified_binding =
+      {
+        binding with
+        pvb_attributes = binding.pvb_attributes |> List.filter other_attrs_pure;
+      }
+    in
+    let fn_name = get_fn_name modified_binding.pvb_pat in
+    let internal_fn_name = fn_name ^ "$Internal" in
+    let full_module_name =
+      make_module_name file_name config.nested_modules fn_name
+    in
+
+    let is_async =
+      Ast_async.dig_async_payload_from_function modified_binding.pvb_expr
+    in
+
+    let make_new_binding ~loc ~full_module_name binding =
+      let props_pattern =
+        match binding.pvb_expr with
+        | {
+         pexp_desc =
+           Pexp_apply {funct = wrapper_expr; args = [(Nolabel, func_expr)]};
+        }
+          when is_forward_ref wrapper_expr ->
+          (* Case when using React.forwardRef *)
+          let rec check_invalid_forward_ref expr =
+            match expr.pexp_desc with
+            | Pexp_fun {arg_label = Labelled _ | Optional _} ->
+              Location.raise_errorf ~loc:expr.pexp_loc
+                "Components using React.forwardRef cannot use \
+                 @react.componentWithProps. Use @react.component instead."
+            | Pexp_fun {arg_label = Nolabel; rhs = body} ->
+              check_invalid_forward_ref body
+            | _ -> ()
+          in
+          check_invalid_forward_ref func_expr;
+          Pat.var {txt = "props"; loc}
+        | {pexp_desc = Pexp_fun {lhs = {ppat_desc = Ppat_constraint (_, typ)}}}
+          -> (
+          match typ with
+          | {ptyp_desc = Ptyp_constr ({txt = Lident "props"}, args)} ->
+            (* props<_> *)
+            if List.length args > 0 then
+              Pat.constraint_
+                (Pat.var {txt = "props"; loc})
+                (Typ.constr {txt = Lident "props"; loc} [Typ.any ()])
+              (* props *)
+            else
+              Pat.constraint_
+                (Pat.var {txt = "props"; loc})
+                (Typ.constr {txt = Lident "props"; loc} [])
+          | _ -> Pat.var {txt = "props"; loc})
+        | _ -> Pat.var {txt = "props"; loc}
+      in
+
+      let applied_expression =
+        Exp.apply
+          (Exp.ident
+             {
+               txt =
+                 Lident
+                   (match rec_flag with
+                   | Recursive -> internal_fn_name
+                   | Nonrecursive -> fn_name);
+               loc;
+             })
+          [(Nolabel, Exp.ident {txt = Lident "props"; loc})]
+      in
+      let applied_expression =
+        Jsx_common.async_component ~async:is_async applied_expression
+      in
+      let applied_expression = constrain_jsx_return applied_expression in
+      let wrapper_expr =
+        Exp.fun_ ~arity:(Some 1) Nolabel None props_pattern
+          ~attrs:binding.pvb_expr.pexp_attributes applied_expression
+      in
+      let internal_expression =
+        Exp.let_ Nonrecursive
+          [Vb.mk (Pat.var {txt = full_module_name; loc}) wrapper_expr]
+          (Exp.ident {txt = Lident full_module_name; loc})
+      in
+
+      Vb.mk ~attrs:modified_binding.pvb_attributes
+        (Pat.var {txt = fn_name; loc})
+        internal_expression
+    in
+
+    let new_binding =
+      match rec_flag with
+      | Recursive -> None
+      | Nonrecursive ->
+        Some
+          (make_new_binding ~loc:empty_loc ~full_module_name modified_binding)
+    in
+    let binding_expr =
+      {
+        binding.pvb_expr with
+        (* moved to wrapper_expr *)
+        pexp_attributes = [];
+      }
+    in
+    ( None,
+      {
+        binding with
+        pvb_attributes = binding.pvb_attributes |> List.filter other_attrs_pure;
+        pvb_expr = binding_expr |> constrain_jsx_return;
+      },
+      new_binding )
+  else (None, binding, None)
+
+let rec collect_prop_types types {ptyp_loc; ptyp_desc} =
+  match ptyp_desc with
+  | Ptyp_arrow {arg; ret = {ptyp_desc = Ptyp_arrow _} as rest}
+    when is_labelled arg.lbl || is_optional arg.lbl ->
+    collect_prop_types ((arg.lbl, arg.attrs, ptyp_loc, arg.typ) :: types) rest
+  | Ptyp_arrow {arg = {lbl = Nolabel}; ret} -> collect_prop_types types ret
+  | Ptyp_arrow {arg; ret = return_value}
+    when is_labelled arg.lbl || is_optional arg.lbl ->
+    (arg.lbl, arg.attrs, return_value.ptyp_loc, arg.typ) :: types
+  | _ -> types
+
+let transform_structure_item ~config item =
+  match item with
+  (* external *)
+  | {
+      pstr_loc;
+      pstr_desc =
+        Pstr_primitive ({pval_attributes; pval_type} as value_description);
+    } as pstr -> (
+    match
+      ( List.filter Jsx_common.has_attr pval_attributes,
+        List.filter Jsx_common.has_attr_with_props pval_attributes )
+    with
+    | [], [] -> [item]
+    | _, [_] ->
+      Jsx_common.raise_error ~loc:pstr_loc
+        "Components cannot be defined as externals when using \
+         @react.componentWithProps.\n\n\
+         If you intended to define an external for a React component using a \
+         props type,\n\
+         use the type React.component<props> instead.\n\
+         Alternatively, use @react.component for an external definition with \
+         labeled arguments."
+    | [_], [] ->
+      check_multiple_components ~config ~loc:pstr_loc;
+      check_string_int_attribute_iter.structure_item
+        check_string_int_attribute_iter item;
+      let core_type_of_attr = Jsx_common.core_type_of_attrs pval_attributes in
+      let typ_vars_of_core_type =
+        core_type_of_attr
+        |> Option.map Jsx_common.typ_vars_of_core_type
+        |> Option.value ~default:[]
+      in
+      let prop_types = collect_prop_types [] pval_type in
+      let named_type_list = List.fold_left arg_to_concrete_type [] prop_types in
+      let ret_props_type =
+        Typ.constr ~loc:pstr_loc
+          (Location.mkloc (Lident "props") pstr_loc)
+          (match core_type_of_attr with
+          | None -> make_props_type_params named_type_list
+          | Some _ -> (
+            match typ_vars_of_core_type with
+            | [] -> []
+            | _ -> [Typ.any ()]))
+      in
+      (* type props<'x, 'y> = { x: 'x, y?: 'y, ... } *)
+      let props_record_type =
+        make_props_record_type ~core_type_of_attr ~external_:true
+          ~typ_vars_of_core_type "props" pstr_loc named_type_list
+      in
+      (* can't be an arrow because it will defensively uncurry *)
+      let new_external_type =
+        Ptyp_constr
+          ( {loc = pstr_loc; txt = module_access_name config "component"},
+            [ret_props_type] )
+      in
+      let new_structure =
+        {
+          pstr with
+          pstr_desc =
+            Pstr_primitive
+              {
+                value_description with
+                pval_type = {pval_type with ptyp_desc = new_external_type};
+                pval_attributes = List.filter other_attrs_pure pval_attributes;
+              };
+        }
+      in
+      [props_record_type; new_structure]
+    | _ ->
+      Jsx_common.raise_error ~loc:pstr_loc
+        "Only one JSX component call can exist on a component at one time")
+  (* let component = ... *)
+  | {pstr_loc; pstr_desc = Pstr_value (rec_flag, value_bindings)} -> (
+    let file_name = filename_from_loc pstr_loc in
+    let empty_loc = Location.in_file file_name in
+    let process_binding binding (new_items, bindings, new_bindings) =
+      let new_item, binding, new_binding =
+        map_binding ~config ~empty_loc ~pstr_loc ~file_name ~rec_flag binding
+      in
+      let new_items =
+        match new_item with
+        | Some item -> item :: new_items
+        | None -> new_items
+      in
+      let new_bindings =
+        match new_binding with
+        | Some new_binding -> new_binding :: new_bindings
+        | None -> new_bindings
+      in
+      (new_items, binding :: bindings, new_bindings)
+    in
+    let new_items, bindings, new_bindings =
+      List.fold_right process_binding value_bindings ([], [], [])
+    in
+    new_items
+    @ [{pstr_loc; pstr_desc = Pstr_value (rec_flag, bindings)}]
+    @
+    match new_bindings with
+    | [] -> []
+    | new_bindings ->
+      [{pstr_loc = empty_loc; pstr_desc = Pstr_value (rec_flag, new_bindings)}])
+  | _ -> [item]
+
+let transform_signature_item ~config item =
+  match item with
+  | {
+      psig_loc;
+      psig_desc = Psig_value ({pval_attributes; pval_type} as psig_desc);
+    } as psig -> (
+    match List.filter Jsx_common.has_attr pval_attributes with
+    | [] -> [item]
+    | [_] ->
+      check_multiple_components ~config ~loc:psig_loc;
+      check_string_int_attribute_iter.signature_item
+        check_string_int_attribute_iter item;
+      let core_type_of_attr = Jsx_common.core_type_of_attrs pval_attributes in
+      let typ_vars_of_core_type =
+        core_type_of_attr
+        |> Option.map Jsx_common.typ_vars_of_core_type
+        |> Option.value ~default:[]
+      in
+      let prop_types = collect_prop_types [] pval_type in
+      let named_type_list = List.fold_left arg_to_concrete_type [] prop_types in
+      let ret_props_type =
+        Typ.constr
+          (Location.mkloc (Lident "props") psig_loc)
+          (match core_type_of_attr with
+          | None -> make_props_type_params named_type_list
+          | Some _ -> (
+            match typ_vars_of_core_type with
+            | [] -> []
+            | _ -> [Typ.any ()]))
+      in
+      let external_ = psig_desc.pval_prim <> [] in
+      let props_record_type =
+        make_props_record_type_sig ~core_type_of_attr ~external_
+          ~typ_vars_of_core_type "props" psig_loc named_type_list
+      in
+      (* can't be an arrow because it will defensively uncurry *)
+      let new_external_type =
+        Ptyp_constr
+          ( {loc = psig_loc; txt = module_access_name config "component"},
+            [ret_props_type] )
+      in
+      let new_structure =
+        {
+          psig with
+          psig_desc =
+            Psig_value
+              {
+                psig_desc with
+                pval_type = {pval_type with ptyp_desc = new_external_type};
+                pval_attributes = List.filter other_attrs_pure pval_attributes;
+              };
+        }
+      in
+      [props_record_type; new_structure]
+    | _ ->
+      Jsx_common.raise_error ~loc:psig_loc
+        "Only one JSX component call can exist on a component at one time")
+  | _ -> [item]
+
+(* There appear to be slightly different rules of transformation whether the component is upper-, lowercase or a fragment *)
+type componentDescription =
+  | LowercasedComponent
+  | UppercasedComponent
+  | FragmentComponent
+
+let loc_from_prop = function
+  | JSXPropPunning (_, name) -> name.loc
+  | JSXPropValue (name, _, value) ->
+    {name.loc with loc_end = value.pexp_loc.loc_end}
+  | JSXPropSpreading (loc, _) -> loc
+
+let mk_record_from_props mapper (jsx_expr_loc : Location.t) (props : jsx_props)
+    : expression =
+  (* Create an artificial range from the first till the last prop *)
+  let loc =
+    match props with
+    | [] -> jsx_expr_loc
+    | head :: tail ->
+      let rec visit props =
+        match props with
+        | [] -> head
+        | [last] -> last
+        | _ :: rest -> visit rest
+      in
+      let first_item = head |> loc_from_prop in
+      let last_item = visit tail |> loc_from_prop in
+      {
+        loc_start = first_item.loc_start;
+        loc_end = last_item.loc_end;
+        loc_ghost = false;
+      }
+  in
+  (* key should be filtered out *)
+  let props =
+    props
+    |> List.filter (function
+         | JSXPropPunning (_, {txt = "key"}) | JSXPropValue ({txt = "key"}, _, _)
+           ->
+           false
+         | _ -> true)
+  in
+  let props, spread_props =
+    match props with
+    | JSXPropSpreading (_, expr) :: rest ->
+      (rest, Some (mapper.expr mapper expr))
+    | _ -> (props, None)
+  in
+
+  let record_fields =
+    props
+    |> List.map (function
+         | JSXPropPunning (is_optional, name) ->
+           {
+             lid = {txt = Lident name.txt; loc = name.loc};
+             x = Exp.ident ~loc:name.loc {txt = Lident name.txt; loc = name.loc};
+             opt = is_optional;
+           }
+         | JSXPropValue (name, is_optional, value) ->
+           {
+             lid = {txt = Lident name.txt; loc = name.loc};
+             x = mapper.expr mapper value;
+             opt = is_optional;
+           }
+         | JSXPropSpreading (loc, _) ->
+           (* There can only be one spread expression and it is expected to be the first prop *)
+           Jsx_common.raise_error ~loc
+             "JSX: use {...p} {x: v} not {x: v} {...p} \n\
+             \     multiple spreads {...p} {...p} not allowed.")
+  in
+  match (record_fields, spread_props) with
+  | [], Some spread_props ->
+    {pexp_desc = spread_props.pexp_desc; pexp_loc = loc; pexp_attributes = []}
+  | record_fields, spread_props ->
+    {
+      pexp_desc = Pexp_record (record_fields, spread_props);
+      pexp_loc = loc;
+      pexp_attributes = [];
+    }
+
+let try_find_key_prop (props : jsx_props) : (arg_label * expression) option =
+  props
+  |> List.find_map (function
+       | JSXPropPunning (is_optional, ({txt = "key"} as name)) ->
+         let arg_label = if is_optional then Optional name else Labelled name in
+         Some (arg_label, Exp.ident {txt = Lident "key"; loc = name.loc})
+       | JSXPropValue (({txt = "key"} as name), is_optional, expr) ->
+         let arg_label = if is_optional then Optional name else Labelled name in
+         Some (arg_label, expr)
+       | _ -> None)
+
+let append_children_prop (config : Jsx_common.jsx_config) mapper
+    (component_description : componentDescription) (props : jsx_props)
+    (children : jsx_children) : jsx_props =
+  match children with
+  | [] -> props
+  | [child] ->
+    let expr =
+      (* I don't quite know why fragment and uppercase don't do this additional ReactDOM.someElement wrapping *)
+      match component_description with
+      | FragmentComponent | UppercasedComponent -> mapper.expr mapper child
+      | LowercasedComponent ->
+        let element_binding =
+          match config.module_ |> String.lowercase_ascii with
+          | "react" -> Lident "ReactDOM"
+          | _generic -> module_access_name config "Elements"
+        in
+        Exp.apply
+          (Exp.ident
+             {txt = Ldot (element_binding, "someElement"); loc = Location.none})
+          [(Nolabel, mapper.expr mapper child)]
+    in
+    let is_optional =
+      match component_description with
+      | LowercasedComponent -> true
+      | FragmentComponent | UppercasedComponent -> false
+    in
+    props
+    @ [
+        JSXPropValue
+          ({txt = "children"; loc = child.pexp_loc}, is_optional, expr);
+      ]
+  | head :: _ as xs ->
+    let loc =
+      match List.rev xs with
+      | [] -> head.pexp_loc
+      | lastChild :: _ ->
+        {head.pexp_loc with loc_end = lastChild.pexp_loc.loc_end}
+    in
+    (* this is a hack to support react components that introspect into their children *)
+    props
+    @ [
+        JSXPropValue
+          ( {txt = "children"; loc},
+            false,
+            Exp.apply ~loc
+              (Exp.ident {txt = module_access_name config "array"; loc})
+              [(Nolabel, Exp.array (List.map (mapper.expr mapper) xs))] );
+      ]
+
+let mk_react_jsx (config : Jsx_common.jsx_config) mapper loc attrs
+    (component_description : componentDescription) (elementTag : expression)
+    (props : jsx_props) (children : jsx_children) : expression =
+  let more_than_one_children = List.length children > 1 in
+  let props_with_children =
+    append_children_prop config mapper component_description props children
+  in
+  let props_record = mk_record_from_props mapper loc props_with_children in
+  let jsx_expr, key_and_unit =
+    let mk_element_bind (jsx_part : string) : Longident.t =
+      match component_description with
+      | FragmentComponent | UppercasedComponent ->
+        module_access_name config jsx_part
+      | LowercasedComponent ->
+        let element_binding =
+          match config.module_ |> String.lowercase_ascii with
+          | "react" -> Lident "ReactDOM"
+          | _generic -> module_access_name config "Elements"
+        in
+        Ldot (element_binding, jsx_part)
+    in
+    match try_find_key_prop props with
+    | None ->
+      ( Exp.ident
+          {
+            loc = Location.none;
+            txt =
+              mk_element_bind (if more_than_one_children then "jsxs" else "jsx");
+          },
+        [] )
+    | Some key_prop ->
+      ( Exp.ident
+          {
+            loc = Location.none;
+            txt =
+              mk_element_bind
+                (if more_than_one_children then "jsxsKeyed" else "jsxKeyed");
+          },
+        [key_prop; (nolabel, unit_expr ~loc:Location.none)] )
+  in
+  let args = [(nolabel, elementTag); (nolabel, props_record)] @ key_and_unit in
+  Exp.apply ~loc ~attrs ~transformed_jsx:true jsx_expr args
+
+(* In most situations, the component name is the make function from a module. 
+    However, if the name contains a lowercase letter, it means it probably an external component.
+    In this case, we use the name as is.
+    See tests/syntax_tests/data/ppx/react/externalWithCustomName.res
+*)
+let mk_uppercase_tag_name_expr tag_name =
+  let tag_identifier : Longident.t =
+    match tag_name.txt with
+    | JsxTagInvalid _ | JsxLowerTag _ ->
+      failwith "Unreachable code at mk_uppercase_tag_name_expr"
+    | JsxQualifiedLowerTag {path; name} -> Longident.Ldot (path, name)
+    | JsxUpperTag path -> Longident.Ldot (path, "make")
+  in
+  let loc = tag_name.loc in
+  Exp.ident ~loc {txt = tag_identifier; loc}
+
+let expr ~(config : Jsx_common.jsx_config) mapper expression =
+  match expression with
+  | {
+   pexp_desc = Pexp_jsx_element jsx_element;
+   pexp_loc = loc;
+   pexp_attributes = attrs;
+  } -> (
+    match jsx_element with
+    | Jsx_fragment {jsx_fragment_children = children} ->
+      let fragment =
+        Exp.ident ~loc {loc; txt = module_access_name config "jsxFragment"}
+      in
+      mk_react_jsx config mapper loc attrs FragmentComponent fragment []
+        children
+    | Jsx_unary_element
+        {jsx_unary_element_tag_name = tag_name; jsx_unary_element_props = props}
+      -> (
+      let name = Ast_helper.Jsx.string_of_jsx_tag_name tag_name.txt in
+      let tag_loc = tag_name.loc in
+      match tag_name.txt with
+      | JsxLowerTag _ ->
+        (* For example 'input' *)
+        let component_name_expr = constant_string ~loc:tag_loc name in
+        mk_react_jsx config mapper loc attrs LowercasedComponent
+          component_name_expr props []
+      | JsxUpperTag _ | JsxQualifiedLowerTag _ ->
+        (* MyModule.make *)
+        let make_id = mk_uppercase_tag_name_expr tag_name in
+        mk_react_jsx config mapper loc attrs UppercasedComponent make_id props
+          []
+      | JsxTagInvalid name ->
+        Jsx_common.raise_error ~loc
+          "JSX: element name is neither upper- or lowercase, got \"%s\"" name)
+    | Jsx_container_element
+        {
+          jsx_container_element_tag_name_start = tag_name;
+          jsx_container_element_props = props;
+          jsx_container_element_children = children;
+        } -> (
+      let name, tag_loc =
+        (Ast_helper.Jsx.string_of_jsx_tag_name tag_name.txt, tag_name.loc)
+      in
+      (* For example: <div> <h1></h1> <br /> </div>
+         This has an impact if we want to use ReactDOM.jsx or ReactDOM.jsxs
+           *)
+      match tag_name.txt with
+      | JsxLowerTag _ ->
+        let component_name_expr = constant_string ~loc:tag_loc name in
+        mk_react_jsx config mapper loc attrs LowercasedComponent
+          component_name_expr props children
+      | JsxQualifiedLowerTag _ | JsxUpperTag _ ->
+        (* MyModule.make *)
+        let make_id = mk_uppercase_tag_name_expr tag_name in
+        mk_react_jsx config mapper loc attrs UppercasedComponent make_id props
+          children
+      | JsxTagInvalid name ->
+        Jsx_common.raise_error ~loc
+          "JSX: element name is neither upper- or lowercase, got \"%s\"" name))
+  | e -> default_mapper.expr mapper e
+
+let module_binding ~(config : Jsx_common.jsx_config) mapper module_binding =
+  config.nested_modules <- module_binding.pmb_name.txt :: config.nested_modules;
+  let mapped = default_mapper.module_binding mapper module_binding in
+  let () =
+    match config.nested_modules with
+    | _ :: rest -> config.nested_modules <- rest
+    | [] -> ()
+  in
+  mapped
+
+(* TODO: some line number might still be wrong *)
+let jsx_mapper ~config =
+  let expr = expr ~config in
+  let module_binding = module_binding ~config in
+  let transform_structure_item = transform_structure_item ~config in
+  let transform_signature_item = transform_signature_item ~config in
+  (expr, module_binding, transform_signature_item, transform_structure_item)
diff --git a/compiler/syntax/src/jsx_v4.mli b/compiler/syntax/src/jsx_v4.mli
new file mode 100644
index 0000000..b582340
--- /dev/null
+++ b/compiler/syntax/src/jsx_v4.mli
@@ -0,0 +1,8 @@
+open Parsetree
+
+val jsx_mapper :
+  config:Jsx_common.jsx_config ->
+  (Ast_mapper.mapper -> expression -> expression)
+  * (Ast_mapper.mapper -> module_binding -> module_binding)
+  * (signature_item -> signature_item list)
+  * (structure_item -> structure_item list)
diff --git a/compiler/syntax/src/res_ast_debugger.ml b/compiler/syntax/src/res_ast_debugger.ml
new file mode 100644
index 0000000..52a57b8
--- /dev/null
+++ b/compiler/syntax/src/res_ast_debugger.ml
@@ -0,0 +1,972 @@
+module Doc = Res_doc
+module CommentTable = Res_comments_table
+
+let print_engine =
+  Res_driver.
+    {
+      print_implementation =
+        (fun ~width:_ ~filename:_ ~comments:_ structure ->
+          Printast.implementation Format.std_formatter structure);
+      print_interface =
+        (fun ~width:_ ~filename:_ ~comments:_ signature ->
+          Printast.interface Format.std_formatter signature);
+    }
+
+module Sexp : sig
+  type t
+
+  val atom : string -> t
+  val list : t list -> t
+  val to_string : t -> string
+end = struct
+  type t = Atom of string | List of t list
+
+  let atom s = Atom s
+  let list l = List l
+
+  let rec to_doc t =
+    match t with
+    | Atom s -> Doc.text s
+    | List [] -> Doc.text "()"
+    | List [sexpr] -> Doc.concat [Doc.lparen; to_doc sexpr; Doc.rparen]
+    | List (hd :: tail) ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.lparen;
+             to_doc hd;
+             Doc.indent
+               (Doc.concat
+                  [Doc.line; Doc.join ~sep:Doc.line (List.map to_doc tail)]);
+             Doc.rparen;
+           ])
+
+  let to_string sexpr =
+    let doc = to_doc sexpr in
+    Doc.to_string ~width:80 doc
+end
+
+module SexpAst = struct
+  open Parsetree
+
+  let map_empty ~f items =
+    match items with
+    | [] -> [Sexp.list []]
+    | items -> List.map f items
+
+  let string txt =
+    Sexp.atom ("\"" ^ Ext_ident.unwrap_uppercase_exotic txt ^ "\"")
+
+  let char c = Sexp.atom ("'" ^ Char.escaped c ^ "'")
+
+  let opt_char oc =
+    match oc with
+    | None -> Sexp.atom "None"
+    | Some c -> Sexp.list [Sexp.atom "Some"; char c]
+
+  let longident l =
+    let rec loop l =
+      match l with
+      | Longident.Lident ident -> Sexp.list [Sexp.atom "Lident"; string ident]
+      | Longident.Ldot (lident, txt) ->
+        Sexp.list [Sexp.atom "Ldot"; loop lident; string txt]
+      | Longident.Lapply (l1, l2) ->
+        Sexp.list [Sexp.atom "Lapply"; loop l1; loop l2]
+    in
+    Sexp.list [Sexp.atom "longident"; loop l]
+
+  let closed_flag flag =
+    match flag with
+    | Asttypes.Closed -> Sexp.atom "Closed"
+    | Open -> Sexp.atom "Open"
+
+  let direction_flag flag =
+    match flag with
+    | Asttypes.Upto -> Sexp.atom "Upto"
+    | Downto -> Sexp.atom "Downto"
+
+  let rec_flag flag =
+    match flag with
+    | Asttypes.Recursive -> Sexp.atom "Recursive"
+    | Nonrecursive -> Sexp.atom "Nonrecursive"
+
+  let override_flag flag =
+    match flag with
+    | Asttypes.Override -> Sexp.atom "Override"
+    | Fresh -> Sexp.atom "Fresh"
+
+  let private_flag flag =
+    match flag with
+    | Asttypes.Public -> Sexp.atom "Public"
+    | Private -> Sexp.atom "Private"
+
+  let mutable_flag flag =
+    match flag with
+    | Asttypes.Immutable -> Sexp.atom "Immutable"
+    | Mutable -> Sexp.atom "Mutable"
+
+  let variance v =
+    match v with
+    | Asttypes.Covariant -> Sexp.atom "Covariant"
+    | Contravariant -> Sexp.atom "Contravariant"
+    | Invariant -> Sexp.atom "Invariant"
+
+  let arg_label_loc lbl =
+    match lbl with
+    | Asttypes.Nolabel -> Sexp.atom "Nolabel"
+    | Labelled {txt} -> Sexp.list [Sexp.atom "Labelled"; string txt]
+    | Optional {txt} -> Sexp.list [Sexp.atom "Optional"; string txt]
+
+  let constant c =
+    let sexpr =
+      match c with
+      | Pconst_integer (txt, tag) ->
+        Sexp.list [Sexp.atom "Pconst_integer"; string txt; opt_char tag]
+      | Pconst_char _ -> Sexp.list [Sexp.atom "Pconst_char"]
+      | Pconst_string (_, Some "INTERNAL_RES_CHAR_CONTENTS") ->
+        Sexp.list [Sexp.atom "Pconst_char"]
+      | Pconst_string (txt, tag) ->
+        Sexp.list
+          [
+            Sexp.atom "Pconst_string";
+            string txt;
+            (match tag with
+            | Some txt -> Sexp.list [Sexp.atom "Some"; string txt]
+            | None -> Sexp.atom "None");
+          ]
+      | Pconst_float (txt, tag) ->
+        Sexp.list [Sexp.atom "Pconst_float"; string txt; opt_char tag]
+    in
+    Sexp.list [Sexp.atom "constant"; sexpr]
+
+  let rec structure s =
+    Sexp.list (Sexp.atom "structure" :: List.map structure_item s)
+
+  and structure_item si =
+    let desc =
+      match si.pstr_desc with
+      | Pstr_eval (expr, attrs) ->
+        Sexp.list [Sexp.atom "Pstr_eval"; expression expr; attributes attrs]
+      | Pstr_value (flag, vbs) ->
+        Sexp.list
+          [
+            Sexp.atom "Pstr_value";
+            rec_flag flag;
+            Sexp.list (map_empty ~f:value_binding vbs);
+          ]
+      | Pstr_primitive vd ->
+        Sexp.list [Sexp.atom "Pstr_primitive"; value_description vd]
+      | Pstr_type (flag, tds) ->
+        Sexp.list
+          [
+            Sexp.atom "Pstr_type";
+            rec_flag flag;
+            Sexp.list (map_empty ~f:type_declaration tds);
+          ]
+      | Pstr_typext typext ->
+        Sexp.list [Sexp.atom "Pstr_type"; type_extension typext]
+      | Pstr_exception ec ->
+        Sexp.list [Sexp.atom "Pstr_exception"; extension_constructor ec]
+      | Pstr_module mb -> Sexp.list [Sexp.atom "Pstr_module"; module_binding mb]
+      | Pstr_recmodule mbs ->
+        Sexp.list
+          [
+            Sexp.atom "Pstr_recmodule";
+            Sexp.list (map_empty ~f:module_binding mbs);
+          ]
+      | Pstr_modtype mod_typ_decl ->
+        Sexp.list
+          [Sexp.atom "Pstr_modtype"; module_type_declaration mod_typ_decl]
+      | Pstr_open open_desc ->
+        Sexp.list [Sexp.atom "Pstr_open"; open_description open_desc]
+      | Pstr_include id ->
+        Sexp.list [Sexp.atom "Pstr_include"; include_declaration id]
+      | Pstr_attribute attr ->
+        Sexp.list [Sexp.atom "Pstr_attribute"; attribute attr]
+      | Pstr_extension (ext, attrs) ->
+        Sexp.list [Sexp.atom "Pstr_extension"; extension ext; attributes attrs]
+    in
+    Sexp.list [Sexp.atom "structure_item"; desc]
+
+  and include_declaration id =
+    Sexp.list
+      [
+        Sexp.atom "include_declaration";
+        module_expression id.pincl_mod;
+        attributes id.pincl_attributes;
+      ]
+
+  and open_description od =
+    Sexp.list
+      [
+        Sexp.atom "open_description";
+        longident od.popen_lid.Asttypes.txt;
+        attributes od.popen_attributes;
+      ]
+
+  and module_type_declaration mtd =
+    Sexp.list
+      [
+        Sexp.atom "module_type_declaration";
+        string mtd.pmtd_name.Asttypes.txt;
+        (match mtd.pmtd_type with
+        | None -> Sexp.atom "None"
+        | Some mod_type -> Sexp.list [Sexp.atom "Some"; module_type mod_type]);
+        attributes mtd.pmtd_attributes;
+      ]
+
+  and module_binding mb =
+    Sexp.list
+      [
+        Sexp.atom "module_binding";
+        string mb.pmb_name.Asttypes.txt;
+        module_expression mb.pmb_expr;
+        attributes mb.pmb_attributes;
+      ]
+
+  and module_expression me =
+    let desc =
+      match me.pmod_desc with
+      | Pmod_ident mod_name ->
+        Sexp.list [Sexp.atom "Pmod_ident"; longident mod_name.Asttypes.txt]
+      | Pmod_structure s -> Sexp.list [Sexp.atom "Pmod_structure"; structure s]
+      | Pmod_functor (lbl, opt_mod_type, mod_expr) ->
+        Sexp.list
+          [
+            Sexp.atom "Pmod_functor";
+            string lbl.Asttypes.txt;
+            (match opt_mod_type with
+            | None -> Sexp.atom "None"
+            | Some mod_type ->
+              Sexp.list [Sexp.atom "Some"; module_type mod_type]);
+            module_expression mod_expr;
+          ]
+      | Pmod_apply (call_mod_expr, mod_expr_arg) ->
+        Sexp.list
+          [
+            Sexp.atom "Pmod_apply";
+            module_expression call_mod_expr;
+            module_expression mod_expr_arg;
+          ]
+      | Pmod_constraint (mod_expr, mod_type) ->
+        Sexp.list
+          [
+            Sexp.atom "Pmod_constraint";
+            module_expression mod_expr;
+            module_type mod_type;
+          ]
+      | Pmod_unpack expr -> Sexp.list [Sexp.atom "Pmod_unpack"; expression expr]
+      | Pmod_extension ext ->
+        Sexp.list [Sexp.atom "Pmod_extension"; extension ext]
+    in
+    Sexp.list [Sexp.atom "module_expr"; desc; attributes me.pmod_attributes]
+
+  and module_type mt =
+    let desc =
+      match mt.pmty_desc with
+      | Pmty_ident longident_loc ->
+        Sexp.list [Sexp.atom "Pmty_ident"; longident longident_loc.Asttypes.txt]
+      | Pmty_signature s -> Sexp.list [Sexp.atom "Pmty_signature"; signature s]
+      | Pmty_functor (lbl, opt_mod_type, mod_type) ->
+        Sexp.list
+          [
+            Sexp.atom "Pmty_functor";
+            string lbl.Asttypes.txt;
+            (match opt_mod_type with
+            | None -> Sexp.atom "None"
+            | Some mod_type ->
+              Sexp.list [Sexp.atom "Some"; module_type mod_type]);
+            module_type mod_type;
+          ]
+      | Pmty_alias longident_loc ->
+        Sexp.list [Sexp.atom "Pmty_alias"; longident longident_loc.Asttypes.txt]
+      | Pmty_extension ext ->
+        Sexp.list [Sexp.atom "Pmty_extension"; extension ext]
+      | Pmty_typeof mod_expr ->
+        Sexp.list [Sexp.atom "Pmty_typeof"; module_expression mod_expr]
+      | Pmty_with (mod_type, with_constraints) ->
+        Sexp.list
+          [
+            Sexp.atom "Pmty_with";
+            module_type mod_type;
+            Sexp.list (map_empty ~f:with_constraint with_constraints);
+          ]
+    in
+    Sexp.list [Sexp.atom "module_type"; desc; attributes mt.pmty_attributes]
+
+  and with_constraint wc =
+    match wc with
+    | Pwith_type (longident_loc, td) ->
+      Sexp.list
+        [
+          Sexp.atom "Pmty_with";
+          longident longident_loc.Asttypes.txt;
+          type_declaration td;
+        ]
+    | Pwith_module (l1, l2) ->
+      Sexp.list
+        [
+          Sexp.atom "Pwith_module";
+          longident l1.Asttypes.txt;
+          longident l2.Asttypes.txt;
+        ]
+    | Pwith_typesubst (longident_loc, td) ->
+      Sexp.list
+        [
+          Sexp.atom "Pwith_typesubst";
+          longident longident_loc.Asttypes.txt;
+          type_declaration td;
+        ]
+    | Pwith_modsubst (l1, l2) ->
+      Sexp.list
+        [
+          Sexp.atom "Pwith_modsubst";
+          longident l1.Asttypes.txt;
+          longident l2.Asttypes.txt;
+        ]
+
+  and signature s =
+    Sexp.list (Sexp.atom "signature" :: List.map signature_item s)
+
+  and signature_item si =
+    let descr =
+      match si.psig_desc with
+      | Psig_value vd ->
+        Sexp.list [Sexp.atom "Psig_value"; value_description vd]
+      | Psig_type (flag, type_declarations) ->
+        Sexp.list
+          [
+            Sexp.atom "Psig_type";
+            rec_flag flag;
+            Sexp.list (map_empty ~f:type_declaration type_declarations);
+          ]
+      | Psig_typext typ_ext ->
+        Sexp.list [Sexp.atom "Psig_typext"; type_extension typ_ext]
+      | Psig_exception ext_constr ->
+        Sexp.list [Sexp.atom "Psig_exception"; extension_constructor ext_constr]
+      | Psig_module mod_decl ->
+        Sexp.list [Sexp.atom "Psig_module"; module_declaration mod_decl]
+      | Psig_recmodule mod_decls ->
+        Sexp.list
+          [
+            Sexp.atom "Psig_recmodule";
+            Sexp.list (map_empty ~f:module_declaration mod_decls);
+          ]
+      | Psig_modtype mod_typ_decl ->
+        Sexp.list
+          [Sexp.atom "Psig_modtype"; module_type_declaration mod_typ_decl]
+      | Psig_open open_desc ->
+        Sexp.list [Sexp.atom "Psig_open"; open_description open_desc]
+      | Psig_include incl_decl ->
+        Sexp.list [Sexp.atom "Psig_include"; include_description incl_decl]
+      | Psig_attribute attr ->
+        Sexp.list [Sexp.atom "Psig_attribute"; attribute attr]
+      | Psig_extension (ext, attrs) ->
+        Sexp.list [Sexp.atom "Psig_extension"; extension ext; attributes attrs]
+    in
+    Sexp.list [Sexp.atom "signature_item"; descr]
+
+  and include_description id =
+    Sexp.list
+      [
+        Sexp.atom "include_description";
+        module_type id.pincl_mod;
+        attributes id.pincl_attributes;
+      ]
+
+  and module_declaration md =
+    Sexp.list
+      [
+        Sexp.atom "module_declaration";
+        string md.pmd_name.Asttypes.txt;
+        module_type md.pmd_type;
+        attributes md.pmd_attributes;
+      ]
+
+  and value_binding vb =
+    Sexp.list
+      [
+        Sexp.atom "value_binding";
+        pattern vb.pvb_pat;
+        expression vb.pvb_expr;
+        attributes vb.pvb_attributes;
+      ]
+
+  and value_description vd =
+    Sexp.list
+      [
+        Sexp.atom "value_description";
+        string vd.pval_name.Asttypes.txt;
+        core_type vd.pval_type;
+        Sexp.list (map_empty ~f:string vd.pval_prim);
+        attributes vd.pval_attributes;
+      ]
+
+  and type_declaration td =
+    Sexp.list
+      [
+        Sexp.atom "type_declaration";
+        string td.ptype_name.Asttypes.txt;
+        Sexp.list
+          [
+            Sexp.atom "ptype_params";
+            Sexp.list
+              (map_empty
+                 ~f:(fun (typexpr, var) ->
+                   Sexp.list [core_type typexpr; variance var])
+                 td.ptype_params);
+          ];
+        Sexp.list
+          [
+            Sexp.atom "ptype_cstrs";
+            Sexp.list
+              (map_empty
+                 ~f:(fun (typ1, typ2, _loc) ->
+                   Sexp.list [core_type typ1; core_type typ2])
+                 td.ptype_cstrs);
+          ];
+        Sexp.list [Sexp.atom "ptype_kind"; type_kind td.ptype_kind];
+        Sexp.list
+          [
+            Sexp.atom "ptype_manifest";
+            (match td.ptype_manifest with
+            | None -> Sexp.atom "None"
+            | Some typ -> Sexp.list [Sexp.atom "Some"; core_type typ]);
+          ];
+        Sexp.list [Sexp.atom "ptype_private"; private_flag td.ptype_private];
+        attributes td.ptype_attributes;
+      ]
+
+  and extension_constructor ec =
+    Sexp.list
+      [
+        Sexp.atom "extension_constructor";
+        string ec.pext_name.Asttypes.txt;
+        extension_constructor_kind ec.pext_kind;
+        attributes ec.pext_attributes;
+      ]
+
+  and extension_constructor_kind kind =
+    match kind with
+    | Pext_decl (args, opt_typ_expr) ->
+      Sexp.list
+        [
+          Sexp.atom "Pext_decl";
+          constructor_arguments args;
+          (match opt_typ_expr with
+          | None -> Sexp.atom "None"
+          | Some typ -> Sexp.list [Sexp.atom "Some"; core_type typ]);
+        ]
+    | Pext_rebind longident_loc ->
+      Sexp.list [Sexp.atom "Pext_rebind"; longident longident_loc.Asttypes.txt]
+
+  and type_extension te =
+    Sexp.list
+      [
+        Sexp.atom "type_extension";
+        Sexp.list
+          [Sexp.atom "ptyext_path"; longident te.ptyext_path.Asttypes.txt];
+        Sexp.list
+          [
+            Sexp.atom "ptyext_parms";
+            Sexp.list
+              (map_empty
+                 ~f:(fun (typexpr, var) ->
+                   Sexp.list [core_type typexpr; variance var])
+                 te.ptyext_params);
+          ];
+        Sexp.list
+          [
+            Sexp.atom "ptyext_constructors";
+            Sexp.list
+              (map_empty ~f:extension_constructor te.ptyext_constructors);
+          ];
+        Sexp.list [Sexp.atom "ptyext_private"; private_flag te.ptyext_private];
+        attributes te.ptyext_attributes;
+      ]
+
+  and type_kind kind =
+    match kind with
+    | Ptype_abstract -> Sexp.atom "Ptype_abstract"
+    | Ptype_variant constr_decls ->
+      Sexp.list
+        [
+          Sexp.atom "Ptype_variant";
+          Sexp.list (map_empty ~f:constructor_declaration constr_decls);
+        ]
+    | Ptype_record lbl_decls ->
+      Sexp.list
+        [
+          Sexp.atom "Ptype_record";
+          Sexp.list (map_empty ~f:label_declaration lbl_decls);
+        ]
+    | Ptype_open -> Sexp.atom "Ptype_open"
+
+  and constructor_declaration cd =
+    Sexp.list
+      [
+        Sexp.atom "constructor_declaration";
+        string cd.pcd_name.Asttypes.txt;
+        Sexp.list [Sexp.atom "pcd_args"; constructor_arguments cd.pcd_args];
+        Sexp.list
+          [
+            Sexp.atom "pcd_res";
+            (match cd.pcd_res with
+            | None -> Sexp.atom "None"
+            | Some typ -> Sexp.list [Sexp.atom "Some"; core_type typ]);
+          ];
+        attributes cd.pcd_attributes;
+      ]
+
+  and constructor_arguments args =
+    match args with
+    | Pcstr_tuple types ->
+      Sexp.list
+        [Sexp.atom "Pcstr_tuple"; Sexp.list (map_empty ~f:core_type types)]
+    | Pcstr_record lds ->
+      Sexp.list
+        [
+          Sexp.atom "Pcstr_record";
+          Sexp.list (map_empty ~f:label_declaration lds);
+        ]
+
+  and label_declaration ld =
+    Sexp.list
+      [
+        Sexp.atom "label_declaration";
+        string ld.pld_name.Asttypes.txt;
+        mutable_flag ld.pld_mutable;
+        core_type ld.pld_type;
+        attributes ld.pld_attributes;
+      ]
+
+  and expression expr =
+    let desc =
+      match expr.pexp_desc with
+      | Pexp_ident longident_loc ->
+        Sexp.list [Sexp.atom "Pexp_ident"; longident longident_loc.Asttypes.txt]
+      | Pexp_constant c -> Sexp.list [Sexp.atom "Pexp_constant"; constant c]
+      | Pexp_let (flag, vbs, expr) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_let";
+            rec_flag flag;
+            Sexp.list (map_empty ~f:value_binding vbs);
+            expression expr;
+          ]
+      | Pexp_fun
+          {arg_label = arg_lbl; default = expr_opt; lhs = pat; rhs = expr} ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_fun";
+            arg_label_loc arg_lbl;
+            (match expr_opt with
+            | None -> Sexp.atom "None"
+            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
+            pattern pat;
+            expression expr;
+          ]
+      | Pexp_apply {funct = expr; args} ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_apply";
+            expression expr;
+            Sexp.list
+              (map_empty
+                 ~f:(fun (arg_lbl, expr) ->
+                   Sexp.list [arg_label_loc arg_lbl; expression expr])
+                 args);
+          ]
+      | Pexp_match (expr, cases) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_match";
+            expression expr;
+            Sexp.list (map_empty ~f:case cases);
+          ]
+      | Pexp_try (expr, cases) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_try";
+            expression expr;
+            Sexp.list (map_empty ~f:case cases);
+          ]
+      | Pexp_tuple exprs ->
+        Sexp.list
+          [Sexp.atom "Pexp_tuple"; Sexp.list (map_empty ~f:expression exprs)]
+      | Pexp_construct (longident_loc, expr_opt) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_construct";
+            longident longident_loc.Asttypes.txt;
+            (match expr_opt with
+            | None -> Sexp.atom "None"
+            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
+          ]
+      | Pexp_variant (lbl, expr_opt) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_variant";
+            string lbl;
+            (match expr_opt with
+            | None -> Sexp.atom "None"
+            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
+          ]
+      | Pexp_record (rows, opt_expr) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_record";
+            Sexp.list
+              (map_empty
+                 ~f:(fun {lid = longident_loc; x = expr} ->
+                   Sexp.list
+                     [longident longident_loc.Asttypes.txt; expression expr])
+                 rows);
+            (match opt_expr with
+            | None -> Sexp.atom "None"
+            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
+          ]
+      | Pexp_field (expr, longident_loc) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_field";
+            expression expr;
+            longident longident_loc.Asttypes.txt;
+          ]
+      | Pexp_setfield (expr1, longident_loc, expr2) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_setfield";
+            expression expr1;
+            longident longident_loc.Asttypes.txt;
+            expression expr2;
+          ]
+      | Pexp_array exprs ->
+        Sexp.list
+          [Sexp.atom "Pexp_array"; Sexp.list (map_empty ~f:expression exprs)]
+      | Pexp_ifthenelse (expr1, expr2, opt_expr) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_ifthenelse";
+            expression expr1;
+            expression expr2;
+            (match opt_expr with
+            | None -> Sexp.atom "None"
+            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
+          ]
+      | Pexp_sequence (expr1, expr2) ->
+        Sexp.list
+          [Sexp.atom "Pexp_sequence"; expression expr1; expression expr2]
+      | Pexp_while (expr1, expr2) ->
+        Sexp.list [Sexp.atom "Pexp_while"; expression expr1; expression expr2]
+      | Pexp_for (pat, e1, e2, flag, e3) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_for";
+            pattern pat;
+            expression e1;
+            expression e2;
+            direction_flag flag;
+            expression e3;
+          ]
+      | Pexp_constraint (expr, typexpr) ->
+        Sexp.list
+          [Sexp.atom "Pexp_constraint"; expression expr; core_type typexpr]
+      | Pexp_coerce (expr, (), typexpr) ->
+        Sexp.list [Sexp.atom "Pexp_coerce"; expression expr; core_type typexpr]
+      | Pexp_send _ -> Sexp.list [Sexp.atom "Pexp_send"]
+      | Pexp_letmodule (mod_name, mod_expr, expr) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_letmodule";
+            string mod_name.Asttypes.txt;
+            module_expression mod_expr;
+            expression expr;
+          ]
+      | Pexp_letexception (ext_constr, expr) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_letexception";
+            extension_constructor ext_constr;
+            expression expr;
+          ]
+      | Pexp_assert expr -> Sexp.list [Sexp.atom "Pexp_assert"; expression expr]
+      | Pexp_newtype (lbl, expr) ->
+        Sexp.list
+          [Sexp.atom "Pexp_newtype"; string lbl.Asttypes.txt; expression expr]
+      | Pexp_pack mod_expr ->
+        Sexp.list [Sexp.atom "Pexp_pack"; module_expression mod_expr]
+      | Pexp_open (flag, longident_loc, expr) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_open";
+            override_flag flag;
+            longident longident_loc.Asttypes.txt;
+            expression expr;
+          ]
+      | Pexp_extension ext ->
+        Sexp.list [Sexp.atom "Pexp_extension"; extension ext]
+      | Pexp_await e -> Sexp.list [Sexp.atom "Pexp_await"; expression e]
+      | Pexp_jsx_element (Jsx_fragment {jsx_fragment_children = xs}) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_jsx_fragment"; Sexp.list (map_empty ~f:expression xs);
+          ]
+      | Pexp_jsx_element (Jsx_unary_element {jsx_unary_element_props = props})
+        ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_jsx_unary_element";
+            Sexp.list (map_empty ~f:jsx_prop props);
+          ]
+      | Pexp_jsx_element
+          (Jsx_container_element
+             {
+               jsx_container_element_props = props;
+               jsx_container_element_children = xs;
+             }) ->
+        Sexp.list
+          [
+            Sexp.atom "Pexp_jsx_container_element";
+            Sexp.list (map_empty ~f:jsx_prop props);
+            Sexp.list (map_empty ~f:expression xs);
+          ]
+    in
+    Sexp.list [Sexp.atom "expression"; desc]
+
+  and jsx_prop = function
+    | JSXPropPunning (_, name) -> Sexp.atom name.txt
+    | JSXPropValue (name, _, expr) ->
+      Sexp.list [Sexp.atom name.txt; expression expr]
+    | JSXPropSpreading (_, expr) -> expression expr
+
+  and case c =
+    Sexp.list
+      [
+        Sexp.atom "case";
+        Sexp.list [Sexp.atom "pc_lhs"; pattern c.pc_lhs];
+        Sexp.list
+          [
+            Sexp.atom "pc_guard";
+            (match c.pc_guard with
+            | None -> Sexp.atom "None"
+            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
+          ];
+        Sexp.list [Sexp.atom "pc_rhs"; expression c.pc_rhs];
+      ]
+
+  and pattern p =
+    let descr =
+      match p.ppat_desc with
+      | Ppat_any -> Sexp.atom "Ppat_any"
+      | Ppat_var var ->
+        Sexp.list [Sexp.atom "Ppat_var"; string var.Location.txt]
+      | Ppat_alias (p, alias) ->
+        Sexp.list [Sexp.atom "Ppat_alias"; pattern p; string alias.txt]
+      | Ppat_constant c -> Sexp.list [Sexp.atom "Ppat_constant"; constant c]
+      | Ppat_interval (lo, hi) ->
+        Sexp.list [Sexp.atom "Ppat_interval"; constant lo; constant hi]
+      | Ppat_tuple patterns ->
+        Sexp.list
+          [Sexp.atom "Ppat_tuple"; Sexp.list (map_empty ~f:pattern patterns)]
+      | Ppat_construct (longident_loc, opt_pattern) ->
+        Sexp.list
+          [
+            Sexp.atom "Ppat_construct";
+            longident longident_loc.Location.txt;
+            (match opt_pattern with
+            | None -> Sexp.atom "None"
+            | Some p -> Sexp.list [Sexp.atom "some"; pattern p]);
+          ]
+      | Ppat_variant (lbl, opt_pattern) ->
+        Sexp.list
+          [
+            Sexp.atom "Ppat_variant";
+            string lbl;
+            (match opt_pattern with
+            | None -> Sexp.atom "None"
+            | Some p -> Sexp.list [Sexp.atom "Some"; pattern p]);
+          ]
+      | Ppat_record (rows, flag) ->
+        Sexp.list
+          [
+            Sexp.atom "Ppat_record";
+            closed_flag flag;
+            Sexp.list
+              (map_empty
+                 ~f:(fun {lid = longident_loc; x = p} ->
+                   Sexp.list [longident longident_loc.Location.txt; pattern p])
+                 rows);
+          ]
+      | Ppat_array patterns ->
+        Sexp.list
+          [Sexp.atom "Ppat_array"; Sexp.list (map_empty ~f:pattern patterns)]
+      | Ppat_or (p1, p2) ->
+        Sexp.list [Sexp.atom "Ppat_or"; pattern p1; pattern p2]
+      | Ppat_constraint (p, typexpr) ->
+        Sexp.list [Sexp.atom "Ppat_constraint"; pattern p; core_type typexpr]
+      | Ppat_type longident_loc ->
+        Sexp.list [Sexp.atom "Ppat_type"; longident longident_loc.Location.txt]
+      | Ppat_unpack string_loc ->
+        Sexp.list [Sexp.atom "Ppat_unpack"; string string_loc.Location.txt]
+      | Ppat_exception p -> Sexp.list [Sexp.atom "Ppat_exception"; pattern p]
+      | Ppat_extension ext ->
+        Sexp.list [Sexp.atom "Ppat_extension"; extension ext]
+      | Ppat_open (longident_loc, p) ->
+        Sexp.list
+          [
+            Sexp.atom "Ppat_open";
+            longident longident_loc.Location.txt;
+            pattern p;
+          ]
+    in
+    Sexp.list [Sexp.atom "pattern"; descr]
+
+  and object_field field =
+    match field with
+    | Otag (lbl_loc, attrs, typexpr) ->
+      Sexp.list
+        [
+          Sexp.atom "Otag";
+          string lbl_loc.txt;
+          attributes attrs;
+          core_type typexpr;
+        ]
+    | Oinherit typexpr -> Sexp.list [Sexp.atom "Oinherit"; core_type typexpr]
+
+  and row_field field =
+    match field with
+    | Rtag (label_loc, attrs, truth, types) ->
+      Sexp.list
+        [
+          Sexp.atom "Rtag";
+          string label_loc.txt;
+          attributes attrs;
+          Sexp.atom (if truth then "true" else "false");
+          Sexp.list (map_empty ~f:core_type types);
+        ]
+    | Rinherit typexpr -> Sexp.list [Sexp.atom "Rinherit"; core_type typexpr]
+
+  and package_type (mod_name_loc, package_constraints) =
+    Sexp.list
+      [
+        Sexp.atom "package_type";
+        longident mod_name_loc.Asttypes.txt;
+        Sexp.list
+          (map_empty
+             ~f:(fun (mod_name_loc, typexpr) ->
+               Sexp.list
+                 [longident mod_name_loc.Asttypes.txt; core_type typexpr])
+             package_constraints);
+      ]
+
+  and core_type typexpr =
+    let desc =
+      match typexpr.ptyp_desc with
+      | Ptyp_any -> Sexp.atom "Ptyp_any"
+      | Ptyp_var var -> Sexp.list [Sexp.atom "Ptyp_var"; string var]
+      | Ptyp_arrow {arg; ret} ->
+        Sexp.list
+          [
+            Sexp.atom "Ptyp_arrow";
+            arg_label_loc arg.lbl;
+            core_type arg.typ;
+            core_type ret;
+          ]
+      | Ptyp_tuple types ->
+        Sexp.list
+          [Sexp.atom "Ptyp_tuple"; Sexp.list (map_empty ~f:core_type types)]
+      | Ptyp_constr (longident_loc, types) ->
+        Sexp.list
+          [
+            Sexp.atom "Ptyp_constr";
+            longident longident_loc.txt;
+            Sexp.list (map_empty ~f:core_type types);
+          ]
+      | Ptyp_alias (typexpr, alias) ->
+        Sexp.list [Sexp.atom "Ptyp_alias"; core_type typexpr; string alias]
+      | Ptyp_object (fields, flag) ->
+        Sexp.list
+          [
+            Sexp.atom "Ptyp_object";
+            closed_flag flag;
+            Sexp.list (map_empty ~f:object_field fields);
+          ]
+      | Ptyp_variant (fields, flag, opt_labels) ->
+        Sexp.list
+          [
+            Sexp.atom "Ptyp_variant";
+            Sexp.list (map_empty ~f:row_field fields);
+            closed_flag flag;
+            (match opt_labels with
+            | None -> Sexp.atom "None"
+            | Some lbls -> Sexp.list (map_empty ~f:string lbls));
+          ]
+      | Ptyp_poly (lbls, typexpr) ->
+        Sexp.list
+          [
+            Sexp.atom "Ptyp_poly";
+            Sexp.list (map_empty ~f:(fun lbl -> string lbl.Asttypes.txt) lbls);
+            core_type typexpr;
+          ]
+      | Ptyp_package package ->
+        Sexp.list [Sexp.atom "Ptyp_package"; package_type package]
+      | Ptyp_extension ext ->
+        Sexp.list [Sexp.atom "Ptyp_extension"; extension ext]
+    in
+    Sexp.list [Sexp.atom "core_type"; desc]
+
+  and payload p =
+    match p with
+    | PStr s -> Sexp.list (Sexp.atom "PStr" :: map_empty ~f:structure_item s)
+    | PSig s -> Sexp.list [Sexp.atom "PSig"; signature s]
+    | PTyp ct -> Sexp.list [Sexp.atom "PTyp"; core_type ct]
+    | PPat (pat, opt_expr) ->
+      Sexp.list
+        [
+          Sexp.atom "PPat";
+          pattern pat;
+          (match opt_expr with
+          | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]
+          | None -> Sexp.atom "None");
+        ]
+
+  and attribute (string_loc, p) =
+    Sexp.list
+      [Sexp.atom "attribute"; Sexp.atom string_loc.Asttypes.txt; payload p]
+
+  and extension (string_loc, p) =
+    Sexp.list
+      [Sexp.atom "extension"; Sexp.atom string_loc.Asttypes.txt; payload p]
+
+  and attributes attrs =
+    let sexprs = map_empty ~f:attribute attrs in
+    Sexp.list (Sexp.atom "attributes" :: sexprs)
+
+  let print_engine =
+    Res_driver.
+      {
+        print_implementation =
+          (fun ~width:_ ~filename:_ ~comments:_ parsetree ->
+            parsetree |> structure |> Sexp.to_string |> print_string);
+        print_interface =
+          (fun ~width:_ ~filename:_ ~comments:_ parsetree ->
+            parsetree |> signature |> Sexp.to_string |> print_string);
+      }
+end
+
+let sexp_print_engine = SexpAst.print_engine
+
+let comments_print_engine =
+  {
+    Res_driver.print_implementation =
+      (fun ~width:_ ~filename:_ ~comments s ->
+        let cmt_tbl = CommentTable.make () in
+        CommentTable.walk_structure s cmt_tbl comments;
+        CommentTable.log cmt_tbl);
+    print_interface =
+      (fun ~width:_ ~filename:_ ~comments s ->
+        let cmt_tbl = CommentTable.make () in
+        CommentTable.walk_signature s cmt_tbl comments;
+        CommentTable.log cmt_tbl);
+  }
diff --git a/compiler/syntax/src/res_ast_debugger.mli b/compiler/syntax/src/res_ast_debugger.mli
new file mode 100644
index 0000000..66588af
--- /dev/null
+++ b/compiler/syntax/src/res_ast_debugger.mli
@@ -0,0 +1,3 @@
+val print_engine : Res_driver.print_engine
+val sexp_print_engine : Res_driver.print_engine
+val comments_print_engine : Res_driver.print_engine
diff --git a/compiler/syntax/src/res_comment.ml b/compiler/syntax/src/res_comment.ml
new file mode 100644
index 0000000..f03209f
--- /dev/null
+++ b/compiler/syntax/src/res_comment.ml
@@ -0,0 +1,64 @@
+type style = SingleLine | MultiLine | DocComment | ModuleComment
+
+let style_to_string s =
+  match s with
+  | SingleLine -> "SingleLine"
+  | MultiLine -> "MultiLine"
+  | DocComment -> "DocComment"
+  | ModuleComment -> "ModuleComment"
+
+type t = {
+  txt: string;
+  style: style;
+  loc: Location.t;
+  mutable prev_tok_end_pos: Lexing.position;
+}
+
+let loc t = t.loc
+let txt t = t.txt
+let prev_tok_end_pos t = t.prev_tok_end_pos
+
+let set_prev_tok_end_pos t pos = t.prev_tok_end_pos <- pos
+
+let is_single_line_comment t = t.style = SingleLine
+
+let is_doc_comment t = t.style = DocComment
+
+let is_module_comment t = t.style = ModuleComment
+
+let to_string t =
+  let {Location.loc_start; loc_end} = t.loc in
+  Format.sprintf "(txt: %s\nstyle: %s\nlocation: %d,%d-%d,%d)" t.txt
+    (style_to_string t.style) loc_start.pos_lnum
+    (loc_start.pos_cnum - loc_start.pos_bol)
+    loc_end.pos_lnum
+    (loc_end.pos_cnum - loc_end.pos_bol)
+
+let make_single_line_comment ~loc txt =
+  {txt; loc; style = SingleLine; prev_tok_end_pos = Lexing.dummy_pos}
+
+let make_multi_line_comment ~loc ~doc_comment ~standalone txt =
+  {
+    txt;
+    loc;
+    style =
+      (if doc_comment then if standalone then ModuleComment else DocComment
+       else MultiLine);
+    prev_tok_end_pos = Lexing.dummy_pos;
+  }
+
+let trim_spaces s =
+  let len = String.length s in
+  if len = 0 then s
+  else if String.unsafe_get s 0 = ' ' || String.unsafe_get s (len - 1) = ' '
+  then (
+    let i = ref 0 in
+    while !i < len && String.unsafe_get s !i = ' ' do
+      incr i
+    done;
+    let j = ref (len - 1) in
+    while !j >= !i && String.unsafe_get s !j = ' ' do
+      decr j
+    done;
+    if !j >= !i then (String.sub [@doesNotRaise]) s !i (!j - !i + 1) else "")
+  else s
diff --git a/compiler/syntax/src/res_comment.mli b/compiler/syntax/src/res_comment.mli
new file mode 100644
index 0000000..ce788dd
--- /dev/null
+++ b/compiler/syntax/src/res_comment.mli
@@ -0,0 +1,20 @@
+type t
+
+val to_string : t -> string
+
+val loc : t -> Location.t
+val txt : t -> string
+val prev_tok_end_pos : t -> Lexing.position
+
+val set_prev_tok_end_pos : t -> Lexing.position -> unit
+
+val is_doc_comment : t -> bool
+
+val is_module_comment : t -> bool
+
+val is_single_line_comment : t -> bool
+
+val make_single_line_comment : loc:Location.t -> string -> t
+val make_multi_line_comment :
+  loc:Location.t -> doc_comment:bool -> standalone:bool -> string -> t
+val trim_spaces : string -> string
diff --git a/compiler/syntax/src/res_comments_table.ml b/compiler/syntax/src/res_comments_table.ml
new file mode 100644
index 0000000..6774b2b
--- /dev/null
+++ b/compiler/syntax/src/res_comments_table.ml
@@ -0,0 +1,2335 @@
+module Comment = Res_comment
+module Doc = Res_doc
+module ParsetreeViewer = Res_parsetree_viewer
+
+type t = {
+  leading: (Location.t, Comment.t list) Hashtbl.t;
+  inside: (Location.t, Comment.t list) Hashtbl.t;
+  trailing: (Location.t, Comment.t list) Hashtbl.t;
+}
+
+let make () =
+  {
+    leading = Hashtbl.create 100;
+    inside = Hashtbl.create 100;
+    trailing = Hashtbl.create 100;
+  }
+
+let copy tbl =
+  {
+    leading = Hashtbl.copy tbl.leading;
+    inside = Hashtbl.copy tbl.inside;
+    trailing = Hashtbl.copy tbl.trailing;
+  }
+
+let empty = make ()
+
+let rec list_last = function
+  | [] -> failwith "list_last: empty list"
+  | [x] -> x
+  | _ :: rest -> list_last rest
+
+let print_location (k : Warnings.loc) =
+  Doc.concat
+    [
+      Doc.lbracket;
+      Doc.text (string_of_int k.loc_start.pos_lnum);
+      Doc.text ":";
+      Doc.text (string_of_int (k.loc_start.pos_cnum - k.loc_start.pos_bol));
+      Doc.text "-";
+      Doc.text (string_of_int k.loc_end.pos_lnum);
+      Doc.text ":";
+      Doc.text (string_of_int (k.loc_end.pos_cnum - k.loc_end.pos_bol));
+      Doc.rbracket;
+    ]
+
+let print_entries tbl =
+  Hashtbl.fold
+    (fun (k : Location.t) (v : Comment.t list) acc ->
+      let loc = print_location k in
+      let doc =
+        Doc.breakable_group ~force_break:true
+          (Doc.concat
+             [
+               loc;
+               Doc.indent
+                 (Doc.concat
+                    [
+                      Doc.line;
+                      Doc.join
+                        ~sep:(Doc.concat [Doc.comma; Doc.line])
+                        (List.map (fun c -> Doc.text (Comment.txt c)) v);
+                    ]);
+               Doc.line;
+             ])
+      in
+      doc :: acc)
+    tbl []
+
+let log t =
+  let leading_stuff = print_entries t.leading in
+  let trailing_stuff = print_entries t.trailing in
+  let stuff_inside = print_entries t.inside in
+  Doc.breakable_group ~force_break:true
+    (Doc.concat
+       [
+         Doc.text "leading comments:";
+         Doc.indent (Doc.concat [Doc.line; Doc.concat leading_stuff]);
+         Doc.line;
+         Doc.text "comments inside:";
+         Doc.indent (Doc.concat [Doc.line; Doc.concat stuff_inside]);
+         Doc.line;
+         Doc.text "trailing comments:";
+         Doc.indent (Doc.concat [Doc.line; Doc.concat trailing_stuff]);
+         Doc.line;
+       ])
+  |> Doc.to_string ~width:80 |> print_endline
+
+let attach tbl loc comments =
+  match comments with
+  | [] -> ()
+  | comments -> Hashtbl.replace tbl loc comments
+
+(* Partitions a list of comments into three groups based on their position relative to a location:
+ * - leading: comments that end before the location's start position
+ * - inside: comments that overlap with the location
+ * - trailing: comments that start after the location's end position
+ *
+ * For example, given code:
+ *   /* comment1 */ let x = /* comment2 */ 5 /* comment3 */
+ *
+ * When splitting around the location of `x = 5`:
+ * - leading: [comment1]
+ * - inside: [comment2]  
+ * - trailing: [comment3]
+ * 
+ * This is the primary comment partitioning function used for associating comments
+ * with AST nodes during the tree traversal.
+ *
+ * Parameters:
+ * - comments: list of comments to partition
+ * - loc: location to split around
+ *
+ * Returns: (leading_comments, inside_comments, trailing_comments)
+ *)
+let partition_by_loc comments loc =
+  let rec loop (leading, inside, trailing) comments =
+    let open Location in
+    match comments with
+    | comment :: rest ->
+      let cmt_loc = Comment.loc comment in
+      if cmt_loc.loc_end.pos_cnum <= loc.loc_start.pos_cnum then
+        loop (comment :: leading, inside, trailing) rest
+      else if cmt_loc.loc_start.pos_cnum >= loc.loc_end.pos_cnum then
+        loop (leading, inside, comment :: trailing) rest
+      else loop (leading, comment :: inside, trailing) rest
+    | [] -> (List.rev leading, List.rev inside, List.rev trailing)
+  in
+  loop ([], [], []) comments
+
+(* Splits a list of comments into two groups based on their position relative to a location:
+ * - leading: comments that end before the location's start
+ * - trailing: comments that start at or after the location's start
+ *
+ * For example, given the code:
+ *   /* comment1 */ let /* comment2 */ x = 1 /* comment3 */
+ *
+ * When splitting around `x`'s location:
+ * - leading: [comment1, comment2]
+ * - trailing: [comment3]
+ *
+ * Parameters:
+ * - comments: list of comments to partition
+ * - loc: location to split around
+ *
+ * Returns: (leading_comments, trailing_comments)
+ *)
+let partition_leading_trailing comments loc =
+  let rec loop (leading, trailing) comments =
+    let open Location in
+    match comments with
+    | comment :: rest ->
+      let cmt_loc = Comment.loc comment in
+      if cmt_loc.loc_end.pos_cnum <= loc.loc_start.pos_cnum then
+        loop (comment :: leading, trailing) rest
+      else loop (leading, comment :: trailing) rest
+    | [] -> (List.rev leading, List.rev trailing)
+  in
+  loop ([], []) comments
+
+(* Splits comments into two groups based on whether they start on the same line as a location's end position.
+ *
+ * This is particularly useful for handling comments that appear on the same line as a syntax element
+ * versus comments that appear on subsequent lines.
+ *
+ * For example, given code:
+ *   let x = 1 /* same line comment */
+ *   /* different line comment */
+ *
+ * When splitting around `x = 1`'s location:
+ * - on_same_line: [/* same line comment */]
+ * - on_other_line: [/* different line comment */]
+ *
+ * This function is often used for formatting decisions where comments on the same line
+ * should be treated differently than comments on different lines (like in JSX elements).
+ *
+ * Parameters:
+ * - loc: location to compare line numbers against
+ * - comments: list of comments to partition
+ *
+ * Returns: (on_same_line_comments, on_other_line_comments)
+ *)
+let partition_by_on_same_line loc comments =
+  let rec loop (on_same_line, on_other_line) comments =
+    let open Location in
+    match comments with
+    | [] -> (List.rev on_same_line, List.rev on_other_line)
+    | comment :: rest ->
+      let cmt_loc = Comment.loc comment in
+      if cmt_loc.loc_start.pos_lnum == loc.loc_end.pos_lnum then
+        loop (comment :: on_same_line, on_other_line) rest
+      else loop (on_same_line, comment :: on_other_line) rest
+  in
+  loop ([], []) comments
+
+let partition_adjacent_trailing loc1 comments =
+  let open Location in
+  let open Lexing in
+  let rec loop ~prev_end_pos after_loc1 comments =
+    match comments with
+    | [] -> (List.rev after_loc1, [])
+    | comment :: rest as comments ->
+      let cmt_prev_end_pos = Comment.prev_tok_end_pos comment in
+      if prev_end_pos.Lexing.pos_cnum == cmt_prev_end_pos.pos_cnum then
+        let comment_end = (Comment.loc comment).loc_end in
+        loop ~prev_end_pos:comment_end (comment :: after_loc1) rest
+      else (List.rev after_loc1, comments)
+  in
+  loop ~prev_end_pos:loc1.loc_end [] comments
+
+(* Splits comments that follow a location but come before another token.
+ * This is particularly useful for handling comments between two tokens
+ * where traditional leading/trailing partitioning isn't precise enough.
+ *
+ * For example, given code:
+ *   let x = 1 /* comment */ + 2
+ *
+ * When splitting comments between `1` and `+`:
+ * - first_part: [/* comment */]  (comments on same line as loc and before next_token)
+ * - rest: []                     (remaining comments)
+ *
+ * Parameters:
+ * - loc: location of the reference token
+ * - next_token: location of the next token
+ * - comments: list of comments to partition
+ *
+ * Returns: (first_part, rest) where first_part contains comments on the same line as loc
+ * that appear entirely before next_token, and rest contains all other comments.
+ *
+ * This function is useful for precisely attaching comments between specific tokens
+ * in constructs like JSX props, function arguments, and other multi-token expressions.
+ *)
+let partition_adjacent_trailing_before_next_token_on_same_line
+    (loc : Warnings.loc) (next_token : Warnings.loc) (comments : Comment.t list)
+    : Comment.t list * Comment.t list =
+  let open Location in
+  let open Lexing in
+  let rec loop after_loc comments =
+    match comments with
+    | [] -> (List.rev after_loc, [])
+    | comment :: rest ->
+      (* Check if the comment is on the same line as the loc, and is entirely before the next_token *)
+      let cmt_loc = Comment.loc comment in
+      if
+        (* Same line *)
+        cmt_loc.loc_start.pos_lnum == loc.loc_end.pos_lnum
+        (* comment after loc *)
+        && cmt_loc.loc_start.pos_cnum > loc.loc_end.pos_cnum
+        (* comment before next_token *)
+        && cmt_loc.loc_end.pos_cnum <= next_token.loc_start.pos_cnum
+      then loop (comment :: after_loc) rest
+      else (List.rev after_loc, comments)
+  in
+  loop [] comments
+
+(* Extracts comments that appear between two specified line numbers in a source file.
+ *
+ * This function is particularly useful for handling comments that should be preserved
+ * between two syntax elements that appear on different lines, such as comments between
+ * opening and closing tags in JSX elements.
+ *
+ * For example, given code:
+ *   <div>
+ *     // comment 1
+ *     // comment 2
+ *   </div>
+ *
+ * When calling partition_between_lines with the line numbers of the opening and closing tags:
+ * - between_comments: [comment 1, comment 2]
+ * - rest: any comments that appear before or after the specified lines
+ *
+ * Parameters:
+ * - start_line: the line number after which to start collecting comments
+ * - end_line: the line number before which to stop collecting comments
+ * - comments: list of comments to partition
+ *
+ * Returns: (between_comments, rest) where between_comments contains all comments
+ * entirely between the start_line and end_line, and rest contains all other comments.
+ *)
+let partition_between_lines start_line end_line comments =
+  let open Location in
+  let open Lexing in
+  let rec loop between_comments comments =
+    match comments with
+    | [] -> (List.rev between_comments, [])
+    | comment :: rest ->
+      (* Check if the comment is between the start_line and end_line *)
+      let cmt_loc = Comment.loc comment in
+      if
+        cmt_loc.loc_start.pos_lnum > start_line
+        && cmt_loc.loc_end.pos_lnum < end_line
+      then loop (comment :: between_comments) rest
+      else (List.rev between_comments, comments)
+  in
+  loop [] comments
+
+let rec collect_list_patterns acc pattern =
+  let open Parsetree in
+  match pattern.ppat_desc with
+  | Ppat_construct
+      ({txt = Longident.Lident "::"}, Some {ppat_desc = Ppat_tuple [pat; rest]})
+    ->
+    collect_list_patterns (pat :: acc) rest
+  | Ppat_construct ({txt = Longident.Lident "[]"}, None) -> List.rev acc
+  | _ -> List.rev (pattern :: acc)
+
+let rec collect_list_exprs acc expr =
+  let open Parsetree in
+  match expr.pexp_desc with
+  | Pexp_construct
+      ({txt = Longident.Lident "::"}, Some {pexp_desc = Pexp_tuple [expr; rest]})
+    ->
+    collect_list_exprs (expr :: acc) rest
+  | Pexp_construct ({txt = Longident.Lident "[]"}, _) -> List.rev acc
+  | _ -> List.rev (expr :: acc)
+
+(* TODO: use ParsetreeViewer *)
+let arrow_type ct =
+  let open Parsetree in
+  let rec process attrs_before acc typ =
+    match typ with
+    | {
+     ptyp_desc = Ptyp_arrow {arg = {lbl = Nolabel} as arg; ret};
+     ptyp_attributes = [];
+    } ->
+      let arg = ([], arg.lbl, arg.typ) in
+      process attrs_before (arg :: acc) ret
+    | {
+     ptyp_desc = Ptyp_arrow {arg = {lbl = Nolabel} as arg; ret};
+     ptyp_attributes = [({txt = "bs"}, _)] as attrs;
+    } ->
+      let arg = (attrs, arg.lbl, arg.typ) in
+      process attrs_before (arg :: acc) ret
+    | {ptyp_desc = Ptyp_arrow {arg = {lbl = Nolabel}}} as return_type ->
+      let args = List.rev acc in
+      (attrs_before, args, return_type)
+    | {ptyp_desc = Ptyp_arrow {arg; ret}; ptyp_attributes = attrs} ->
+      let arg = (attrs, arg.lbl, arg.typ) in
+      process attrs_before (arg :: acc) ret
+    | typ -> (attrs_before, List.rev acc, typ)
+  in
+  match ct with
+  | {ptyp_desc = Ptyp_arrow {arg = {lbl = Nolabel}}; ptyp_attributes = attrs} as
+    typ ->
+    process attrs [] {typ with ptyp_attributes = []}
+  | typ -> process [] [] typ
+
+(* TODO: avoiding the dependency on ParsetreeViewer here, is this a good idea? *)
+let mod_expr_apply mod_expr =
+  let rec loop acc mod_expr =
+    match mod_expr with
+    | {Parsetree.pmod_desc = Pmod_apply (next, arg)} -> loop (arg :: acc) next
+    | _ -> mod_expr :: acc
+  in
+  loop [] mod_expr
+
+(* TODO: avoiding the dependency on ParsetreeViewer here, is this a good idea? *)
+let mod_expr_functor mod_expr =
+  let rec loop acc mod_expr =
+    match mod_expr with
+    | {
+     Parsetree.pmod_desc = Pmod_functor (lbl, mod_type, return_mod_expr);
+     pmod_attributes = attrs;
+    } ->
+      let param = (attrs, lbl, mod_type) in
+      loop (param :: acc) return_mod_expr
+    | return_mod_expr -> (List.rev acc, return_mod_expr)
+  in
+  loop [] mod_expr
+
+let functor_type modtype =
+  let rec process acc modtype =
+    match modtype with
+    | {
+     Parsetree.pmty_desc = Pmty_functor (lbl, arg_type, return_type);
+     pmty_attributes = attrs;
+    } ->
+      let arg = (attrs, lbl, arg_type) in
+      process (arg :: acc) return_type
+    | mod_type -> (List.rev acc, mod_type)
+  in
+  process [] modtype
+
+let fun_expr expr =
+  let open Parsetree in
+  (* Turns (type t, type u, type z) into "type t u z" *)
+  let rec collect_new_types acc return_expr =
+    match return_expr with
+    | {pexp_desc = Pexp_newtype (string_loc, return_expr); pexp_attributes = []}
+      ->
+      collect_new_types (string_loc :: acc) return_expr
+    | return_expr ->
+      let loc =
+        match (acc, List.rev acc) with
+        | _startLoc :: _, end_loc :: _ ->
+          {end_loc.loc with loc_end = end_loc.loc.loc_end}
+        | _ -> Location.none
+      in
+      let txt =
+        List.fold_right
+          (fun curr acc -> acc ^ " " ^ curr.Location.txt)
+          acc "type"
+      in
+      (Location.mkloc txt loc, return_expr)
+  in
+  (* For simplicity reason Pexp_newtype gets converted to a Nolabel parameter,
+   * otherwise this function would need to return a variant:
+   * | NormalParamater(...)
+   * | NewType(...)
+   * This complicates printing with an extra variant/boxing/allocation for a code-path
+   * that is not often used. Lets just keep it simple for now *)
+  let rec collect attrs_before acc expr =
+    match expr with
+    | {
+     pexp_desc =
+       Pexp_fun
+         {
+           arg_label = lbl;
+           default = default_expr;
+           lhs = pattern;
+           rhs = return_expr;
+         };
+     pexp_attributes = [];
+    } ->
+      let parameter = ([], lbl, default_expr, pattern) in
+      collect attrs_before (parameter :: acc) return_expr
+    | {pexp_desc = Pexp_newtype (string_loc, rest); pexp_attributes = attrs} ->
+      let var, return_expr = collect_new_types [string_loc] rest in
+      let parameter =
+        ( attrs,
+          Asttypes.Nolabel,
+          None,
+          Ast_helper.Pat.var ~loc:string_loc.loc var )
+      in
+      collect attrs_before (parameter :: acc) return_expr
+    | {
+     pexp_desc =
+       Pexp_fun
+         {
+           arg_label = lbl;
+           default = default_expr;
+           lhs = pattern;
+           rhs = return_expr;
+         };
+     pexp_attributes = [({txt = "bs"}, _)] as attrs;
+    } ->
+      let parameter = (attrs, lbl, default_expr, pattern) in
+      collect attrs_before (parameter :: acc) return_expr
+    | {
+     pexp_desc =
+       Pexp_fun
+         {
+           arg_label = (Labelled _ | Optional _) as lbl;
+           default = default_expr;
+           lhs = pattern;
+           rhs = return_expr;
+         };
+     pexp_attributes = attrs;
+    } ->
+      let parameter = (attrs, lbl, default_expr, pattern) in
+      collect attrs_before (parameter :: acc) return_expr
+    | expr -> (attrs_before, List.rev acc, expr)
+  in
+  match expr with
+  | {pexp_desc = Pexp_fun {arg_label = Nolabel}; pexp_attributes = attrs} as
+    expr ->
+    collect attrs [] {expr with pexp_attributes = []}
+  | expr -> collect [] [] expr
+
+let rec is_block_expr expr =
+  let open Parsetree in
+  match expr.pexp_desc with
+  | Pexp_letmodule _ | Pexp_letexception _ | Pexp_let _ | Pexp_open _
+  | Pexp_sequence _ ->
+    true
+  | Pexp_apply {funct = call_expr} when is_block_expr call_expr -> true
+  | Pexp_constraint (expr, _) when is_block_expr expr -> true
+  | Pexp_field (expr, _) when is_block_expr expr -> true
+  | Pexp_setfield (expr, _, _) when is_block_expr expr -> true
+  | _ -> false
+
+let is_if_then_else_expr expr =
+  let open Parsetree in
+  match expr.pexp_desc with
+  | Pexp_ifthenelse _ -> true
+  | _ -> false
+
+type node =
+  | Case of Parsetree.case
+  | CoreType of Parsetree.core_type
+  | ExprArgument of {expr: Parsetree.expression; loc: Location.t}
+  | Expression of Parsetree.expression
+  | ExprRecordRow of Longident.t Asttypes.loc * Parsetree.expression
+  | ExtensionConstructor of Parsetree.extension_constructor
+  | LabelDeclaration of Parsetree.label_declaration
+  | ModuleBinding of Parsetree.module_binding
+  | ModuleDeclaration of Parsetree.module_declaration
+  | ModuleExpr of Parsetree.module_expr
+  | ObjectField of Parsetree.object_field
+  | PackageConstraint of Longident.t Asttypes.loc * Parsetree.core_type
+  | Pattern of Parsetree.pattern
+  | PatternRecordRow of Longident.t Asttypes.loc * Parsetree.pattern
+  | RowField of Parsetree.row_field
+  | SignatureItem of Parsetree.signature_item
+  | StructureItem of Parsetree.structure_item
+  | TypeDeclaration of Parsetree.type_declaration
+  | ValueBinding of Parsetree.value_binding
+  | JsxProp of Parsetree.jsx_prop
+
+let get_loc node =
+  let open Parsetree in
+  match node with
+  | Case case ->
+    {
+      case.pc_lhs.ppat_loc with
+      loc_end =
+        (match ParsetreeViewer.process_braces_attr case.pc_rhs with
+        | None, _ -> case.pc_rhs.pexp_loc.loc_end
+        | Some ({loc}, _), _ -> loc.Location.loc_end);
+    }
+  | CoreType ct -> ct.ptyp_loc
+  | ExprArgument {loc} -> loc
+  | Expression e -> (
+    match e.pexp_attributes with
+    | ({txt = "res.braces" | "ns.braces"; loc}, _) :: _ -> loc
+    | _ -> e.pexp_loc)
+  | ExprRecordRow (li, e) -> {li.loc with loc_end = e.pexp_loc.loc_end}
+  | ExtensionConstructor ec -> ec.pext_loc
+  | LabelDeclaration ld -> ld.pld_loc
+  | ModuleBinding mb -> mb.pmb_loc
+  | ModuleDeclaration md -> md.pmd_loc
+  | ModuleExpr me -> me.pmod_loc
+  | ObjectField field -> (
+    match field with
+    | Parsetree.Otag (lbl, _, typ) ->
+      {lbl.loc with loc_end = typ.ptyp_loc.loc_end}
+    | _ -> Location.none)
+  | PackageConstraint (li, te) -> {li.loc with loc_end = te.ptyp_loc.loc_end}
+  | Pattern p -> p.ppat_loc
+  | PatternRecordRow (li, p) -> {li.loc with loc_end = p.ppat_loc.loc_end}
+  | RowField rf -> (
+    match rf with
+    | Parsetree.Rtag ({loc}, _, _, _) -> loc
+    | Rinherit {ptyp_loc} -> ptyp_loc)
+  | SignatureItem si -> si.psig_loc
+  | StructureItem si -> si.pstr_loc
+  | TypeDeclaration td -> td.ptype_loc
+  | ValueBinding vb -> vb.pvb_loc
+  | JsxProp prop -> ParsetreeViewer.get_jsx_prop_loc prop
+
+let rec walk_structure s t comments =
+  match s with
+  | _ when comments = [] -> ()
+  | [] -> attach t.inside Location.none comments
+  | s -> walk_list (s |> List.map (fun si -> StructureItem si)) t comments
+
+and walk_structure_item si t comments =
+  match si.Parsetree.pstr_desc with
+  | _ when comments = [] -> ()
+  | Pstr_primitive value_description ->
+    walk_value_description value_description t comments
+  | Pstr_open open_description ->
+    walk_open_description open_description t comments
+  | Pstr_value (_, value_bindings) ->
+    walk_value_bindings value_bindings t comments
+  | Pstr_type (_, type_declarations) ->
+    walk_type_declarations type_declarations t comments
+  | Pstr_eval (expr, _) -> walk_expression expr t comments
+  | Pstr_module module_binding -> walk_module_binding module_binding t comments
+  | Pstr_recmodule module_bindings ->
+    walk_list
+      (module_bindings |> List.map (fun mb -> ModuleBinding mb))
+      t comments
+  | Pstr_modtype mod_typ_decl ->
+    walk_module_type_declaration mod_typ_decl t comments
+  | Pstr_attribute attribute -> walk_attribute attribute t comments
+  | Pstr_extension (extension, _) -> walk_extension extension t comments
+  | Pstr_include include_declaration ->
+    walk_include_declaration include_declaration t comments
+  | Pstr_exception extension_constructor ->
+    walk_extension_constructor extension_constructor t comments
+  | Pstr_typext type_extension -> walk_type_extension type_extension t comments
+
+and walk_value_description vd t comments =
+  let leading, trailing =
+    partition_leading_trailing comments vd.pval_name.loc
+  in
+  attach t.leading vd.pval_name.loc leading;
+  let after_name, rest =
+    partition_adjacent_trailing vd.pval_name.loc trailing
+  in
+  attach t.trailing vd.pval_name.loc after_name;
+  let before, inside, after = partition_by_loc rest vd.pval_type.ptyp_loc in
+  attach t.leading vd.pval_type.ptyp_loc before;
+  walk_core_type vd.pval_type t inside;
+  attach t.trailing vd.pval_type.ptyp_loc after
+
+and walk_type_extension te t comments =
+  let leading, trailing =
+    partition_leading_trailing comments te.ptyext_path.loc
+  in
+  attach t.leading te.ptyext_path.loc leading;
+  let after_path, rest =
+    partition_adjacent_trailing te.ptyext_path.loc trailing
+  in
+  attach t.trailing te.ptyext_path.loc after_path;
+
+  (* type params *)
+  let rest =
+    match te.ptyext_params with
+    | [] -> rest
+    | type_params ->
+      visit_list_but_continue_with_remaining_comments
+        ~get_loc:(fun (typexpr, _variance) -> typexpr.Parsetree.ptyp_loc)
+        ~walk_node:walk_type_param ~newline_delimited:false type_params t rest
+  in
+  walk_list
+    (te.ptyext_constructors |> List.map (fun ec -> ExtensionConstructor ec))
+    t rest
+
+and walk_include_declaration incl_decl t comments =
+  let before, inside, after =
+    partition_by_loc comments incl_decl.pincl_mod.pmod_loc
+  in
+  attach t.leading incl_decl.pincl_mod.pmod_loc before;
+  walk_module_expr incl_decl.pincl_mod t inside;
+  attach t.trailing incl_decl.pincl_mod.pmod_loc after
+
+and walk_module_type_declaration mtd t comments =
+  let leading, trailing =
+    partition_leading_trailing comments mtd.pmtd_name.loc
+  in
+  attach t.leading mtd.pmtd_name.loc leading;
+  match mtd.pmtd_type with
+  | None -> attach t.trailing mtd.pmtd_name.loc trailing
+  | Some mod_type ->
+    let after_name, rest =
+      partition_adjacent_trailing mtd.pmtd_name.loc trailing
+    in
+    attach t.trailing mtd.pmtd_name.loc after_name;
+    let before, inside, after = partition_by_loc rest mod_type.pmty_loc in
+    attach t.leading mod_type.pmty_loc before;
+    walk_mod_type mod_type t inside;
+    attach t.trailing mod_type.pmty_loc after
+
+and walk_module_binding mb t comments =
+  let leading, trailing = partition_leading_trailing comments mb.pmb_name.loc in
+  attach t.leading mb.pmb_name.loc leading;
+  let after_name, rest = partition_adjacent_trailing mb.pmb_name.loc trailing in
+  attach t.trailing mb.pmb_name.loc after_name;
+  let leading, inside, trailing = partition_by_loc rest mb.pmb_expr.pmod_loc in
+  (match mb.pmb_expr.pmod_desc with
+  | Pmod_constraint _ ->
+    walk_module_expr mb.pmb_expr t (List.concat [leading; inside])
+  | _ ->
+    attach t.leading mb.pmb_expr.pmod_loc leading;
+    walk_module_expr mb.pmb_expr t inside);
+  attach t.trailing mb.pmb_expr.pmod_loc trailing
+
+and walk_signature signature t comments =
+  match signature with
+  | _ when comments = [] -> ()
+  | [] -> attach t.inside Location.none comments
+  | _s ->
+    walk_list (signature |> List.map (fun si -> SignatureItem si)) t comments
+
+and walk_signature_item (si : Parsetree.signature_item) t comments =
+  match si.psig_desc with
+  | _ when comments = [] -> ()
+  | Psig_value value_description ->
+    walk_value_description value_description t comments
+  | Psig_type (_, type_declarations) ->
+    walk_type_declarations type_declarations t comments
+  | Psig_typext type_extension -> walk_type_extension type_extension t comments
+  | Psig_exception extension_constructor ->
+    walk_extension_constructor extension_constructor t comments
+  | Psig_module module_declaration ->
+    walk_module_declaration module_declaration t comments
+  | Psig_recmodule module_declarations ->
+    walk_list
+      (module_declarations |> List.map (fun md -> ModuleDeclaration md))
+      t comments
+  | Psig_modtype module_type_declaration ->
+    walk_module_type_declaration module_type_declaration t comments
+  | Psig_open open_description ->
+    walk_open_description open_description t comments
+  | Psig_include include_description ->
+    walk_include_description include_description t comments
+  | Psig_attribute attribute -> walk_attribute attribute t comments
+  | Psig_extension (extension, _) -> walk_extension extension t comments
+
+and walk_include_description id t comments =
+  let before, inside, after = partition_by_loc comments id.pincl_mod.pmty_loc in
+  attach t.leading id.pincl_mod.pmty_loc before;
+  walk_mod_type id.pincl_mod t inside;
+  attach t.trailing id.pincl_mod.pmty_loc after
+
+and walk_module_declaration md t comments =
+  let leading, trailing = partition_leading_trailing comments md.pmd_name.loc in
+  attach t.leading md.pmd_name.loc leading;
+  let after_name, rest = partition_adjacent_trailing md.pmd_name.loc trailing in
+  attach t.trailing md.pmd_name.loc after_name;
+  let leading, inside, trailing = partition_by_loc rest md.pmd_type.pmty_loc in
+  attach t.leading md.pmd_type.pmty_loc leading;
+  walk_mod_type md.pmd_type t inside;
+  attach t.trailing md.pmd_type.pmty_loc trailing
+
+and walk_node node tbl comments =
+  match node with
+  | Case c -> walk_case c tbl comments
+  | CoreType ct -> walk_core_type ct tbl comments
+  | ExprArgument ea -> walk_expr_argument ea.expr ea.loc tbl comments
+  | Expression e -> walk_expression e tbl comments
+  | ExprRecordRow (ri, e) -> walk_expr_record_row (ri, e) tbl comments
+  | ExtensionConstructor ec -> walk_extension_constructor ec tbl comments
+  | LabelDeclaration ld -> walk_label_declaration ld tbl comments
+  | ModuleBinding mb -> walk_module_binding mb tbl comments
+  | ModuleDeclaration md -> walk_module_declaration md tbl comments
+  | ModuleExpr me -> walk_module_expr me tbl comments
+  | ObjectField f -> walk_object_field f tbl comments
+  | PackageConstraint (li, te) -> walk_package_constraint (li, te) tbl comments
+  | Pattern p -> walk_pattern p tbl comments
+  | PatternRecordRow (li, p) -> walk_pattern_record_row (li, p) tbl comments
+  | RowField rf -> walk_row_field rf tbl comments
+  | SignatureItem si -> walk_signature_item si tbl comments
+  | StructureItem si -> walk_structure_item si tbl comments
+  | TypeDeclaration td -> walk_type_declaration td tbl comments
+  | ValueBinding vb -> walk_value_binding vb tbl comments
+  | JsxProp prop -> walk_jsx_prop prop tbl comments
+
+and walk_list : ?prev_loc:Location.t -> node list -> t -> Comment.t list -> unit
+    =
+ fun ?prev_loc l t comments ->
+  match l with
+  | _ when comments = [] -> ()
+  | [] -> (
+    match prev_loc with
+    | Some loc -> attach t.trailing loc comments
+    | None -> ())
+  | node :: rest ->
+    let curr_loc = get_loc node in
+    let leading, inside, trailing = partition_by_loc comments curr_loc in
+    (match prev_loc with
+    | None ->
+      (* first node, all leading comments attach here *)
+      attach t.leading curr_loc leading
+    | Some prev_loc ->
+      (* Same line *)
+      if prev_loc.loc_end.pos_lnum == curr_loc.loc_start.pos_lnum then (
+        let after_prev, before_curr =
+          partition_adjacent_trailing prev_loc leading
+        in
+        attach t.trailing prev_loc after_prev;
+        attach t.leading curr_loc before_curr)
+      else
+        let on_same_line_as_prev, after_prev =
+          partition_by_on_same_line prev_loc leading
+        in
+        attach t.trailing prev_loc on_same_line_as_prev;
+        let leading, _inside, _trailing =
+          partition_by_loc after_prev curr_loc
+        in
+        attach t.leading curr_loc leading);
+    walk_node node t inside;
+    walk_list ~prev_loc:curr_loc rest t trailing
+
+(* The parsetree doesn't always contain location info about the opening or
+ * closing token of a "list-of-things". This routine visits the whole list,
+ * but returns any remaining comments that likely fall after the whole list. *)
+and visit_list_but_continue_with_remaining_comments :
+    'node.
+    ?prev_loc:Location.t ->
+    newline_delimited:bool ->
+    get_loc:('node -> Location.t) ->
+    walk_node:('node -> t -> Comment.t list -> unit) ->
+    'node list ->
+    t ->
+    Comment.t list ->
+    Comment.t list =
+ fun ?prev_loc ~newline_delimited ~get_loc ~walk_node l t comments ->
+  let open Location in
+  match l with
+  | _ when comments = [] -> []
+  | [] -> (
+    match prev_loc with
+    | Some loc ->
+      let after_prev, rest =
+        if newline_delimited then partition_by_on_same_line loc comments
+        else partition_adjacent_trailing loc comments
+      in
+      attach t.trailing loc after_prev;
+      rest
+    | None -> comments)
+  | node :: rest ->
+    let curr_loc = get_loc node in
+    let leading, inside, trailing = partition_by_loc comments curr_loc in
+    let () =
+      match prev_loc with
+      | None ->
+        (* first node, all leading comments attach here *)
+        attach t.leading curr_loc leading;
+        ()
+      | Some prev_loc ->
+        (* Same line *)
+        if prev_loc.loc_end.pos_lnum == curr_loc.loc_start.pos_lnum then
+          let after_prev, before_curr =
+            partition_adjacent_trailing prev_loc leading
+          in
+          let () = attach t.trailing prev_loc after_prev in
+          let () = attach t.leading curr_loc before_curr in
+          ()
+        else
+          let on_same_line_as_prev, after_prev =
+            partition_by_on_same_line prev_loc leading
+          in
+          let () = attach t.trailing prev_loc on_same_line_as_prev in
+          let leading, _inside, _trailing =
+            partition_by_loc after_prev curr_loc
+          in
+          let () = attach t.leading curr_loc leading in
+          ()
+    in
+    walk_node node t inside;
+    visit_list_but_continue_with_remaining_comments ~prev_loc:curr_loc ~get_loc
+      ~walk_node ~newline_delimited rest t trailing
+
+and walk_value_bindings vbs t comments =
+  walk_list (vbs |> List.map (fun vb -> ValueBinding vb)) t comments
+
+and walk_open_description open_description t comments =
+  let loc = open_description.popen_lid.loc in
+  let leading, trailing = partition_leading_trailing comments loc in
+  attach t.leading loc leading;
+  attach t.trailing loc trailing
+
+and walk_type_declarations type_declarations t comments =
+  walk_list
+    (type_declarations |> List.map (fun td -> TypeDeclaration td))
+    t comments
+
+and walk_type_param (typexpr, _variance) t comments =
+  walk_core_type typexpr t comments
+
+and walk_type_declaration (td : Parsetree.type_declaration) t comments =
+  let before_name, rest =
+    partition_leading_trailing comments td.ptype_name.loc
+  in
+  attach t.leading td.ptype_name.loc before_name;
+
+  let after_name, rest = partition_adjacent_trailing td.ptype_name.loc rest in
+  attach t.trailing td.ptype_name.loc after_name;
+
+  (* type params *)
+  let rest =
+    match td.ptype_params with
+    | [] -> rest
+    | type_params ->
+      visit_list_but_continue_with_remaining_comments
+        ~get_loc:(fun (typexpr, _variance) -> typexpr.Parsetree.ptyp_loc)
+        ~walk_node:walk_type_param ~newline_delimited:false type_params t rest
+  in
+
+  (* manifest:  = typexpr *)
+  let rest =
+    match td.ptype_manifest with
+    | Some typexpr ->
+      let before_typ, inside_typ, after_typ =
+        partition_by_loc rest typexpr.ptyp_loc
+      in
+      attach t.leading typexpr.ptyp_loc before_typ;
+      walk_core_type typexpr t inside_typ;
+      let after_typ, rest =
+        partition_adjacent_trailing typexpr.Parsetree.ptyp_loc after_typ
+      in
+      attach t.trailing typexpr.ptyp_loc after_typ;
+      rest
+    | None -> rest
+  in
+
+  let rest =
+    match td.ptype_kind with
+    | Ptype_abstract | Ptype_open -> rest
+    | Ptype_record label_declarations ->
+      let () =
+        if label_declarations = [] then attach t.inside td.ptype_loc rest
+        else
+          walk_list
+            (label_declarations |> List.map (fun ld -> LabelDeclaration ld))
+            t rest
+      in
+      []
+    | Ptype_variant constructor_declarations ->
+      walk_constructor_declarations constructor_declarations t rest
+  in
+  attach t.trailing td.ptype_loc rest
+
+and walk_label_declarations lds t comments =
+  visit_list_but_continue_with_remaining_comments
+    ~get_loc:(fun ld -> ld.Parsetree.pld_loc)
+    ~walk_node:walk_label_declaration ~newline_delimited:false lds t comments
+
+and walk_label_declaration ld t comments =
+  let before_name, rest = partition_leading_trailing comments ld.pld_name.loc in
+  attach t.leading ld.pld_name.loc before_name;
+  let after_name, rest = partition_adjacent_trailing ld.pld_name.loc rest in
+  attach t.trailing ld.pld_name.loc after_name;
+  let before_typ, inside_typ, after_typ =
+    partition_by_loc rest ld.pld_type.ptyp_loc
+  in
+  attach t.leading ld.pld_type.ptyp_loc before_typ;
+  walk_core_type ld.pld_type t inside_typ;
+  attach t.trailing ld.pld_type.ptyp_loc after_typ
+
+and walk_constructor_declarations cds t comments =
+  visit_list_but_continue_with_remaining_comments
+    ~get_loc:(fun cd -> cd.Parsetree.pcd_loc)
+    ~walk_node:walk_constructor_declaration ~newline_delimited:false cds t
+    comments
+
+and walk_constructor_declaration cd t comments =
+  let before_name, rest = partition_leading_trailing comments cd.pcd_name.loc in
+  attach t.leading cd.pcd_name.loc before_name;
+  let after_name, rest = partition_adjacent_trailing cd.pcd_name.loc rest in
+  attach t.trailing cd.pcd_name.loc after_name;
+  let rest = walk_constructor_arguments cd.pcd_args t rest in
+
+  let rest =
+    match cd.pcd_res with
+    | Some typexpr ->
+      let before_typ, inside_typ, after_typ =
+        partition_by_loc rest typexpr.ptyp_loc
+      in
+      attach t.leading typexpr.ptyp_loc before_typ;
+      walk_core_type typexpr t inside_typ;
+      let after_typ, rest =
+        partition_adjacent_trailing typexpr.Parsetree.ptyp_loc after_typ
+      in
+      attach t.trailing typexpr.ptyp_loc after_typ;
+      rest
+    | None -> rest
+  in
+  attach t.trailing cd.pcd_loc rest
+
+and walk_constructor_arguments args t comments =
+  match args with
+  | Pcstr_tuple typexprs ->
+    visit_list_but_continue_with_remaining_comments
+      ~get_loc:(fun n -> n.Parsetree.ptyp_loc)
+      ~walk_node:walk_core_type ~newline_delimited:false typexprs t comments
+  | Pcstr_record label_declarations ->
+    walk_label_declarations label_declarations t comments
+
+and walk_value_binding vb t comments =
+  let open Location in
+  let vb =
+    let open Parsetree in
+    match (vb.pvb_pat, vb.pvb_expr) with
+    | ( {ppat_desc = Ppat_constraint (pat, {ptyp_desc = Ptyp_poly ([], t)})},
+        {pexp_desc = Pexp_constraint (expr, _typ)} ) ->
+      {
+        vb with
+        pvb_pat =
+          Ast_helper.Pat.constraint_
+            ~loc:{pat.ppat_loc with loc_end = t.Parsetree.ptyp_loc.loc_end}
+            pat t;
+        pvb_expr = expr;
+      }
+    | ( {ppat_desc = Ppat_constraint (pat, {ptyp_desc = Ptyp_poly (_ :: _, t)})},
+        {pexp_desc = Pexp_fun _} ) ->
+      {
+        vb with
+        pvb_pat =
+          {
+            vb.pvb_pat with
+            ppat_loc = {pat.ppat_loc with loc_end = t.ptyp_loc.loc_end};
+          };
+      }
+    | ( ({
+           ppat_desc =
+             Ppat_constraint (pat, ({ptyp_desc = Ptyp_poly (_ :: _, t)} as typ));
+         } as constrained_pattern),
+        {pexp_desc = Pexp_newtype (_, {pexp_desc = Pexp_constraint (expr, _)})}
+      ) ->
+      (*
+       * The location of the Ptyp_poly on the pattern is the whole thing.
+       * let x:
+       *   type t. (int, int) => int =
+       *   (a, b) => {
+       *     // comment
+       *     a + b
+       *   }
+       *)
+      {
+        vb with
+        pvb_pat =
+          {
+            constrained_pattern with
+            ppat_desc = Ppat_constraint (pat, typ);
+            ppat_loc =
+              {constrained_pattern.ppat_loc with loc_end = t.ptyp_loc.loc_end};
+          };
+        pvb_expr = expr;
+      }
+    | _ -> vb
+  in
+  let pattern_loc = vb.Parsetree.pvb_pat.ppat_loc in
+  let expr_loc = vb.Parsetree.pvb_expr.pexp_loc in
+  let expr = vb.pvb_expr in
+
+  let leading, inside, trailing = partition_by_loc comments pattern_loc in
+
+  (* everything before start of pattern can only be leading on the pattern:
+   *   let |* before *| a = 1 *)
+  attach t.leading pattern_loc leading;
+  walk_pattern vb.Parsetree.pvb_pat t inside;
+  let after_pat, surrounding_expr =
+    partition_adjacent_trailing pattern_loc trailing
+  in
+  attach t.trailing pattern_loc after_pat;
+  let before_expr, inside_expr, after_expr =
+    partition_by_loc surrounding_expr expr_loc
+  in
+  if is_block_expr expr then
+    walk_expression expr t (List.concat [before_expr; inside_expr; after_expr])
+  else (
+    attach t.leading expr_loc before_expr;
+    walk_expression expr t inside_expr;
+    attach t.trailing expr_loc after_expr)
+
+and walk_expression expr t comments =
+  let open Location in
+  let walk_apply_expr call_expr arguments t comments =
+    let before, inside, after =
+      partition_by_loc comments call_expr.Parsetree.pexp_loc
+    in
+    let after =
+      if is_block_expr call_expr then (
+        let after_expr, rest =
+          partition_adjacent_trailing call_expr.Parsetree.pexp_loc after
+        in
+        walk_expression call_expr t (List.concat [before; inside; after_expr]);
+        rest)
+      else (
+        attach t.leading call_expr.Parsetree.pexp_loc before;
+        walk_expression call_expr t inside;
+        after)
+    in
+    let after_expr, rest =
+      partition_adjacent_trailing call_expr.Parsetree.pexp_loc after
+    in
+    attach t.trailing call_expr.Parsetree.pexp_loc after_expr;
+    walk_list
+      (arguments
+      |> List.map (fun (lbl, expr) ->
+             let loc =
+               match lbl with
+               | Asttypes.Labelled {loc} | Optional {loc} ->
+                 {loc with loc_end = expr.Parsetree.pexp_loc.loc_end}
+               | _ -> expr.pexp_loc
+             in
+             ExprArgument {expr; loc}))
+      t rest
+  in
+  match expr.Parsetree.pexp_desc with
+  | _ when comments = [] -> ()
+  | Pexp_constant _ ->
+    let leading, trailing = partition_leading_trailing comments expr.pexp_loc in
+    attach t.leading expr.pexp_loc leading;
+    attach t.trailing expr.pexp_loc trailing
+  | Pexp_ident longident ->
+    let leading, trailing = partition_leading_trailing comments longident.loc in
+    attach t.leading longident.loc leading;
+    attach t.trailing longident.loc trailing
+  | Pexp_let
+      ( _recFlag,
+        value_bindings,
+        {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, None)} ) ->
+    walk_value_bindings value_bindings t comments
+  | Pexp_let (_recFlag, value_bindings, expr2) ->
+    let comments =
+      visit_list_but_continue_with_remaining_comments
+        ~get_loc:(fun n ->
+          if n.Parsetree.pvb_pat.ppat_loc.loc_ghost then n.pvb_expr.pexp_loc
+          else n.Parsetree.pvb_loc)
+        ~walk_node:walk_value_binding ~newline_delimited:true value_bindings t
+        comments
+    in
+    if is_block_expr expr2 then walk_expression expr2 t comments
+    else
+      let leading, inside, trailing =
+        partition_by_loc comments expr2.pexp_loc
+      in
+      attach t.leading expr2.pexp_loc leading;
+      walk_expression expr2 t inside;
+      attach t.trailing expr2.pexp_loc trailing
+  | Pexp_sequence (expr1, expr2) ->
+    let leading, inside, trailing = partition_by_loc comments expr1.pexp_loc in
+    let comments =
+      if is_block_expr expr1 then (
+        let after_expr, comments =
+          partition_by_on_same_line expr1.pexp_loc trailing
+        in
+        walk_expression expr1 t (List.concat [leading; inside; after_expr]);
+        comments)
+      else (
+        attach t.leading expr1.pexp_loc leading;
+        walk_expression expr1 t inside;
+        let after_expr, comments =
+          partition_by_on_same_line expr1.pexp_loc trailing
+        in
+        attach t.trailing expr1.pexp_loc after_expr;
+        comments)
+    in
+    if is_block_expr expr2 then walk_expression expr2 t comments
+    else
+      let leading, inside, trailing =
+        partition_by_loc comments expr2.pexp_loc
+      in
+      attach t.leading expr2.pexp_loc leading;
+      walk_expression expr2 t inside;
+      attach t.trailing expr2.pexp_loc trailing
+  | Pexp_open (_override, longident, expr2) ->
+    let leading, comments = partition_leading_trailing comments expr.pexp_loc in
+    attach t.leading
+      {expr.pexp_loc with loc_end = longident.loc.loc_end}
+      leading;
+    let leading, trailing = partition_leading_trailing comments longident.loc in
+    attach t.leading longident.loc leading;
+    let after_longident, rest =
+      partition_by_on_same_line longident.loc trailing
+    in
+    attach t.trailing longident.loc after_longident;
+    if is_block_expr expr2 then walk_expression expr2 t rest
+    else
+      let leading, inside, trailing = partition_by_loc rest expr2.pexp_loc in
+      attach t.leading expr2.pexp_loc leading;
+      walk_expression expr2 t inside;
+      attach t.trailing expr2.pexp_loc trailing
+  | Pexp_extension
+      ( {txt = "obj"},
+        PStr [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_record (rows, _)}, [])}]
+      ) ->
+    walk_list
+      (Ext_list.map rows (fun {lid; x = e} -> ExprRecordRow (lid, e)))
+      t comments
+  | Pexp_extension extension -> walk_extension extension t comments
+  | Pexp_letexception (extension_constructor, expr2) ->
+    let leading, comments = partition_leading_trailing comments expr.pexp_loc in
+    attach t.leading
+      {expr.pexp_loc with loc_end = extension_constructor.pext_loc.loc_end}
+      leading;
+    let leading, inside, trailing =
+      partition_by_loc comments extension_constructor.pext_loc
+    in
+    attach t.leading extension_constructor.pext_loc leading;
+    walk_extension_constructor extension_constructor t inside;
+    let after_ext_constr, rest =
+      partition_by_on_same_line extension_constructor.pext_loc trailing
+    in
+    attach t.trailing extension_constructor.pext_loc after_ext_constr;
+    if is_block_expr expr2 then walk_expression expr2 t rest
+    else
+      let leading, inside, trailing = partition_by_loc rest expr2.pexp_loc in
+      attach t.leading expr2.pexp_loc leading;
+      walk_expression expr2 t inside;
+      attach t.trailing expr2.pexp_loc trailing
+  | Pexp_letmodule (string_loc, mod_expr, expr2) ->
+    let leading, comments = partition_leading_trailing comments expr.pexp_loc in
+    attach t.leading
+      {expr.pexp_loc with loc_end = mod_expr.pmod_loc.loc_end}
+      leading;
+    let leading, trailing =
+      partition_leading_trailing comments string_loc.loc
+    in
+    attach t.leading string_loc.loc leading;
+    let after_string, rest =
+      partition_adjacent_trailing string_loc.loc trailing
+    in
+    attach t.trailing string_loc.loc after_string;
+    let before_mod_expr, inside_mod_expr, after_mod_expr =
+      partition_by_loc rest mod_expr.pmod_loc
+    in
+    attach t.leading mod_expr.pmod_loc before_mod_expr;
+    walk_module_expr mod_expr t inside_mod_expr;
+    let after_mod_expr, rest =
+      partition_by_on_same_line mod_expr.pmod_loc after_mod_expr
+    in
+    attach t.trailing mod_expr.pmod_loc after_mod_expr;
+    if is_block_expr expr2 then walk_expression expr2 t rest
+    else
+      let leading, inside, trailing = partition_by_loc rest expr2.pexp_loc in
+      attach t.leading expr2.pexp_loc leading;
+      walk_expression expr2 t inside;
+      attach t.trailing expr2.pexp_loc trailing
+  | Pexp_assert expr ->
+    if is_block_expr expr then walk_expression expr t comments
+    else
+      let leading, inside, trailing = partition_by_loc comments expr.pexp_loc in
+      attach t.leading expr.pexp_loc leading;
+      walk_expression expr t inside;
+      attach t.trailing expr.pexp_loc trailing
+  | Pexp_coerce (expr, (), typexpr) ->
+    let leading, inside, trailing = partition_by_loc comments expr.pexp_loc in
+    attach t.leading expr.pexp_loc leading;
+    walk_expression expr t inside;
+    let after_expr, rest = partition_adjacent_trailing expr.pexp_loc trailing in
+    attach t.trailing expr.pexp_loc after_expr;
+    let leading, inside, trailing = partition_by_loc rest typexpr.ptyp_loc in
+    attach t.leading typexpr.ptyp_loc leading;
+    walk_core_type typexpr t inside;
+    attach t.trailing typexpr.ptyp_loc trailing
+  | Pexp_constraint (expr, typexpr) ->
+    let leading, inside, trailing = partition_by_loc comments expr.pexp_loc in
+    attach t.leading expr.pexp_loc leading;
+    walk_expression expr t inside;
+    let after_expr, rest = partition_adjacent_trailing expr.pexp_loc trailing in
+    attach t.trailing expr.pexp_loc after_expr;
+    let leading, inside, trailing = partition_by_loc rest typexpr.ptyp_loc in
+    attach t.leading typexpr.ptyp_loc leading;
+    walk_core_type typexpr t inside;
+    attach t.trailing typexpr.ptyp_loc trailing
+  | Pexp_tuple []
+  | Pexp_array []
+  | Pexp_construct ({txt = Longident.Lident "[]"}, _) ->
+    attach t.inside expr.pexp_loc comments
+  | Pexp_construct ({txt = Longident.Lident "::"}, _) ->
+    walk_list
+      (collect_list_exprs [] expr |> List.map (fun e -> Expression e))
+      t comments
+  | Pexp_construct (longident, args) -> (
+    let leading, trailing = partition_leading_trailing comments longident.loc in
+    attach t.leading longident.loc leading;
+    match args with
+    | Some expr ->
+      let after_longident, rest =
+        partition_adjacent_trailing longident.loc trailing
+      in
+      attach t.trailing longident.loc after_longident;
+      walk_expression expr t rest
+    | None -> attach t.trailing longident.loc trailing)
+  | Pexp_variant (_label, None) -> ()
+  | Pexp_variant (_label, Some expr) -> walk_expression expr t comments
+  | Pexp_array exprs | Pexp_tuple exprs ->
+    walk_list (exprs |> List.map (fun e -> Expression e)) t comments
+  | Pexp_record (rows, spread_expr) ->
+    if rows = [] then attach t.inside expr.pexp_loc comments
+    else
+      let comments =
+        match spread_expr with
+        | None -> comments
+        | Some expr ->
+          let leading, inside, trailing =
+            partition_by_loc comments expr.pexp_loc
+          in
+          attach t.leading expr.pexp_loc leading;
+          walk_expression expr t inside;
+          let after_expr, rest =
+            partition_adjacent_trailing expr.pexp_loc trailing
+          in
+          attach t.trailing expr.pexp_loc after_expr;
+          rest
+      in
+      walk_list
+        (Ext_list.map rows (fun {lid; x = e} -> ExprRecordRow (lid, e)))
+        t comments
+  | Pexp_field (expr, longident) ->
+    let leading, inside, trailing = partition_by_loc comments expr.pexp_loc in
+    let trailing =
+      if is_block_expr expr then (
+        let after_expr, rest =
+          partition_adjacent_trailing expr.pexp_loc trailing
+        in
+        walk_expression expr t (List.concat [leading; inside; after_expr]);
+        rest)
+      else (
+        attach t.leading expr.pexp_loc leading;
+        walk_expression expr t inside;
+        trailing)
+    in
+    let after_expr, rest = partition_adjacent_trailing expr.pexp_loc trailing in
+    attach t.trailing expr.pexp_loc after_expr;
+    let leading, trailing = partition_leading_trailing rest longident.loc in
+    attach t.leading longident.loc leading;
+    attach t.trailing longident.loc trailing
+  | Pexp_setfield (expr1, longident, expr2) ->
+    let leading, inside, trailing = partition_by_loc comments expr1.pexp_loc in
+    let rest =
+      if is_block_expr expr1 then (
+        let after_expr, rest =
+          partition_adjacent_trailing expr1.pexp_loc trailing
+        in
+        walk_expression expr1 t (List.concat [leading; inside; after_expr]);
+        rest)
+      else
+        let after_expr, rest =
+          partition_adjacent_trailing expr1.pexp_loc trailing
+        in
+        attach t.leading expr1.pexp_loc leading;
+        walk_expression expr1 t inside;
+        attach t.trailing expr1.pexp_loc after_expr;
+        rest
+    in
+    let before_longident, after_longident =
+      partition_leading_trailing rest longident.loc
+    in
+    attach t.leading longident.loc before_longident;
+    let after_longident, rest =
+      partition_adjacent_trailing longident.loc after_longident
+    in
+    attach t.trailing longident.loc after_longident;
+    if is_block_expr expr2 then walk_expression expr2 t rest
+    else
+      let leading, inside, trailing = partition_by_loc rest expr2.pexp_loc in
+      attach t.leading expr2.pexp_loc leading;
+      walk_expression expr2 t inside;
+      attach t.trailing expr2.pexp_loc trailing
+  | Pexp_ifthenelse (if_expr, then_expr, else_expr) -> (
+    let leading, rest = partition_leading_trailing comments expr.pexp_loc in
+    attach t.leading expr.pexp_loc leading;
+    let leading, inside, trailing = partition_by_loc rest if_expr.pexp_loc in
+    let comments =
+      if is_block_expr if_expr then (
+        let after_expr, comments =
+          partition_adjacent_trailing if_expr.pexp_loc trailing
+        in
+        walk_expression if_expr t (List.concat [leading; inside; after_expr]);
+        comments)
+      else (
+        attach t.leading if_expr.pexp_loc leading;
+        walk_expression if_expr t inside;
+        let after_expr, comments =
+          partition_adjacent_trailing if_expr.pexp_loc trailing
+        in
+        attach t.trailing if_expr.pexp_loc after_expr;
+        comments)
+    in
+    let leading, inside, trailing =
+      partition_by_loc comments then_expr.pexp_loc
+    in
+    let comments =
+      if is_block_expr then_expr then (
+        let after_expr, trailing =
+          partition_adjacent_trailing then_expr.pexp_loc trailing
+        in
+        walk_expression then_expr t (List.concat [leading; inside; after_expr]);
+        trailing)
+      else (
+        attach t.leading then_expr.pexp_loc leading;
+        walk_expression then_expr t inside;
+        let after_expr, comments =
+          partition_adjacent_trailing then_expr.pexp_loc trailing
+        in
+        attach t.trailing then_expr.pexp_loc after_expr;
+        comments)
+    in
+    match else_expr with
+    | None -> ()
+    | Some expr ->
+      if is_block_expr expr || is_if_then_else_expr expr then
+        walk_expression expr t comments
+      else
+        let leading, inside, trailing =
+          partition_by_loc comments expr.pexp_loc
+        in
+        attach t.leading expr.pexp_loc leading;
+        walk_expression expr t inside;
+        attach t.trailing expr.pexp_loc trailing)
+  | Pexp_while (expr1, expr2) ->
+    let leading, inside, trailing = partition_by_loc comments expr1.pexp_loc in
+    let rest =
+      if is_block_expr expr1 then (
+        let after_expr, rest =
+          partition_adjacent_trailing expr1.pexp_loc trailing
+        in
+        walk_expression expr1 t (List.concat [leading; inside; after_expr]);
+        rest)
+      else (
+        attach t.leading expr1.pexp_loc leading;
+        walk_expression expr1 t inside;
+        let after_expr, rest =
+          partition_adjacent_trailing expr1.pexp_loc trailing
+        in
+        attach t.trailing expr1.pexp_loc after_expr;
+        rest)
+    in
+    if is_block_expr expr2 then walk_expression expr2 t rest
+    else
+      let leading, inside, trailing = partition_by_loc rest expr2.pexp_loc in
+      attach t.leading expr2.pexp_loc leading;
+      walk_expression expr2 t inside;
+      attach t.trailing expr2.pexp_loc trailing
+  | Pexp_for (pat, expr1, expr2, _, expr3) ->
+    let leading, inside, trailing = partition_by_loc comments pat.ppat_loc in
+    attach t.leading pat.ppat_loc leading;
+    walk_pattern pat t inside;
+    let after_pat, rest = partition_adjacent_trailing pat.ppat_loc trailing in
+    attach t.trailing pat.ppat_loc after_pat;
+    let leading, inside, trailing = partition_by_loc rest expr1.pexp_loc in
+    attach t.leading expr1.pexp_loc leading;
+    walk_expression expr1 t inside;
+    let after_expr, rest =
+      partition_adjacent_trailing expr1.pexp_loc trailing
+    in
+    attach t.trailing expr1.pexp_loc after_expr;
+    let leading, inside, trailing = partition_by_loc rest expr2.pexp_loc in
+    attach t.leading expr2.pexp_loc leading;
+    walk_expression expr2 t inside;
+    let after_expr, rest =
+      partition_adjacent_trailing expr2.pexp_loc trailing
+    in
+    attach t.trailing expr2.pexp_loc after_expr;
+    if is_block_expr expr3 then walk_expression expr3 t rest
+    else
+      let leading, inside, trailing = partition_by_loc rest expr3.pexp_loc in
+      attach t.leading expr3.pexp_loc leading;
+      walk_expression expr3 t inside;
+      attach t.trailing expr3.pexp_loc trailing
+  | Pexp_pack mod_expr ->
+    let before, inside, after = partition_by_loc comments mod_expr.pmod_loc in
+    attach t.leading mod_expr.pmod_loc before;
+    walk_module_expr mod_expr t inside;
+    attach t.trailing mod_expr.pmod_loc after
+  | Pexp_match (expr1, [case; else_branch])
+    when Res_parsetree_viewer.has_if_let_attribute expr.pexp_attributes ->
+    let before, inside, after =
+      partition_by_loc comments case.pc_lhs.ppat_loc
+    in
+    attach t.leading case.pc_lhs.ppat_loc before;
+    walk_pattern case.pc_lhs t inside;
+    let after_pat, rest =
+      partition_adjacent_trailing case.pc_lhs.ppat_loc after
+    in
+    attach t.trailing case.pc_lhs.ppat_loc after_pat;
+    let before, inside, after = partition_by_loc rest expr1.pexp_loc in
+    attach t.leading expr1.pexp_loc before;
+    walk_expression expr1 t inside;
+    let after_expr, rest = partition_adjacent_trailing expr1.pexp_loc after in
+    attach t.trailing expr1.pexp_loc after_expr;
+    let before, inside, after = partition_by_loc rest case.pc_rhs.pexp_loc in
+    let after =
+      if is_block_expr case.pc_rhs then (
+        let after_expr, rest =
+          partition_adjacent_trailing case.pc_rhs.pexp_loc after
+        in
+        walk_expression case.pc_rhs t (List.concat [before; inside; after_expr]);
+        rest)
+      else (
+        attach t.leading case.pc_rhs.pexp_loc before;
+        walk_expression case.pc_rhs t inside;
+        after)
+    in
+    let after_expr, rest =
+      partition_adjacent_trailing case.pc_rhs.pexp_loc after
+    in
+    attach t.trailing case.pc_rhs.pexp_loc after_expr;
+    let before, inside, after =
+      partition_by_loc rest else_branch.pc_rhs.pexp_loc
+    in
+    let after =
+      if is_block_expr else_branch.pc_rhs then (
+        let after_expr, rest =
+          partition_adjacent_trailing else_branch.pc_rhs.pexp_loc after
+        in
+        walk_expression else_branch.pc_rhs t
+          (List.concat [before; inside; after_expr]);
+        rest)
+      else (
+        attach t.leading else_branch.pc_rhs.pexp_loc before;
+        walk_expression else_branch.pc_rhs t inside;
+        after)
+    in
+    attach t.trailing else_branch.pc_rhs.pexp_loc after
+  | Pexp_match (expr, cases) | Pexp_try (expr, cases) ->
+    let before, inside, after = partition_by_loc comments expr.pexp_loc in
+    let after =
+      if is_block_expr expr then (
+        let after_expr, rest =
+          partition_adjacent_trailing expr.pexp_loc after
+        in
+        walk_expression expr t (List.concat [before; inside; after_expr]);
+        rest)
+      else (
+        attach t.leading expr.pexp_loc before;
+        walk_expression expr t inside;
+        after)
+    in
+    let after_expr, rest = partition_adjacent_trailing expr.pexp_loc after in
+    attach t.trailing expr.pexp_loc after_expr;
+    walk_list (cases |> List.map (fun case -> Case case)) t rest
+    (* unary expression: todo use parsetreeviewer *)
+  | Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc =
+              Pexp_ident
+                {
+                  txt =
+                    Longident.Lident
+                      ("~+" | "~+." | "~-" | "~-." | "~~~" | "not" | "!");
+                };
+          };
+        args = [(Nolabel, arg_expr)];
+      } ->
+    let before, inside, after = partition_by_loc comments arg_expr.pexp_loc in
+    attach t.leading arg_expr.pexp_loc before;
+    walk_expression arg_expr t inside;
+    attach t.trailing arg_expr.pexp_loc after
+  (* binary expression *)
+  | Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc =
+              Pexp_ident
+                {
+                  txt =
+                    Longident.Lident
+                      ( ":=" | "||" | "&&" | "==" | "===" | "<" | ">" | "!="
+                      | "!==" | "<=" | ">=" | "+" | "+." | "-" | "-." | "++"
+                      | "|||" | "^^^" | "&&&" | "*" | "*." | "/" | "/." | "**"
+                      | "->" | "<>" );
+                };
+          };
+        args = [(Nolabel, operand1); (Nolabel, operand2)];
+      } ->
+    let before, inside, after = partition_by_loc comments operand1.pexp_loc in
+    attach t.leading operand1.pexp_loc before;
+    walk_expression operand1 t inside;
+    let after_operand1, rest =
+      partition_adjacent_trailing operand1.pexp_loc after
+    in
+    attach t.trailing operand1.pexp_loc after_operand1;
+    let before, inside, after = partition_by_loc rest operand2.pexp_loc in
+    attach t.leading operand2.pexp_loc before;
+    walk_expression operand2 t inside;
+    (* (List.concat [inside; after]); *)
+    attach t.trailing operand2.pexp_loc after
+  | Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "get")};
+          };
+        args = [(Nolabel, parent_expr); (Nolabel, member_expr)];
+      } ->
+    walk_list [Expression parent_expr; Expression member_expr] t comments
+  | Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "set")};
+          };
+        args =
+          [
+            (Nolabel, parent_expr);
+            (Nolabel, member_expr);
+            (Nolabel, target_expr);
+          ];
+      } ->
+    walk_list
+      [Expression parent_expr; Expression member_expr; Expression target_expr]
+      t comments
+  | Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc =
+              Pexp_ident
+                {txt = Longident.Ldot (Lident "Primitive_dict", "make")};
+          };
+        args = [(Nolabel, key_values)];
+      }
+    when Res_parsetree_viewer.is_tuple_array key_values ->
+    walk_list [Expression key_values] t comments
+  | Pexp_apply {funct = call_expr; args = arguments} -> (
+    (* Special handling for Belt.Array.concatMany - treat like an array *)
+    match call_expr.pexp_desc with
+    | Pexp_ident
+        {
+          txt =
+            Longident.Ldot
+              (Longident.Ldot (Longident.Lident "Belt", "Array"), "concatMany");
+        }
+      when List.length arguments = 1 -> (
+      match arguments with
+      | [(_, {pexp_desc = Pexp_array sub_arrays})] ->
+        (* Collect all individual expressions from sub-arrays *)
+        let all_exprs =
+          List.fold_left
+            (fun acc sub_array ->
+              match sub_array.Parsetree.pexp_desc with
+              | Pexp_array exprs -> acc @ exprs
+              | _ -> acc @ [sub_array])
+            [] sub_arrays
+        in
+        walk_list (all_exprs |> List.map (fun e -> Expression e)) t comments
+      | _ ->
+        (* Fallback to regular apply handling *)
+        walk_apply_expr call_expr arguments t comments)
+    | _ ->
+      (* Regular apply handling *)
+      walk_apply_expr call_expr arguments t comments)
+  | Pexp_fun _ | Pexp_newtype _ -> (
+    let _, parameters, return_expr = fun_expr expr in
+    let comments =
+      visit_list_but_continue_with_remaining_comments ~newline_delimited:false
+        ~walk_node:walk_expr_parameter
+        ~get_loc:(fun (_attrs, argLbl, expr_opt, pattern) ->
+          let label_loc = Asttypes.get_lbl_loc argLbl in
+          let open Parsetree in
+          let start_pos =
+            if label_loc <> Location.none then label_loc.loc_start
+            else pattern.ppat_loc.loc_start
+          in
+          match expr_opt with
+          | None -> {pattern.ppat_loc with loc_start = start_pos}
+          | Some expr ->
+            {
+              pattern.ppat_loc with
+              loc_start = start_pos;
+              loc_end = expr.pexp_loc.loc_end;
+            })
+        parameters t comments
+    in
+    match return_expr.pexp_desc with
+    | Pexp_constraint (expr, typ)
+      when expr.pexp_loc.loc_start.pos_cnum >= typ.ptyp_loc.loc_end.pos_cnum ->
+      let leading, inside, trailing = partition_by_loc comments typ.ptyp_loc in
+      attach t.leading typ.ptyp_loc leading;
+      walk_core_type typ t inside;
+      let after_typ, comments =
+        partition_adjacent_trailing typ.ptyp_loc trailing
+      in
+      attach t.trailing typ.ptyp_loc after_typ;
+      if is_block_expr expr then walk_expression expr t comments
+      else
+        let leading, inside, trailing =
+          partition_by_loc comments expr.pexp_loc
+        in
+        attach t.leading expr.pexp_loc leading;
+        walk_expression expr t inside;
+        attach t.trailing expr.pexp_loc trailing
+    | _ ->
+      if is_block_expr return_expr then walk_expression return_expr t comments
+      else
+        let leading, inside, trailing =
+          partition_by_loc comments return_expr.pexp_loc
+        in
+        attach t.leading return_expr.pexp_loc leading;
+        walk_expression return_expr t inside;
+        attach t.trailing return_expr.pexp_loc trailing)
+  | Pexp_jsx_element
+      (Jsx_fragment
+         {
+           jsx_fragment_opening = opening_greater_than;
+           jsx_fragment_children = children;
+           jsx_fragment_closing = _closing_lesser_than;
+         }) ->
+    let opening_token = {expr.pexp_loc with loc_end = opening_greater_than} in
+    let on_same_line, rest = partition_by_on_same_line opening_token comments in
+    attach t.trailing opening_token on_same_line;
+    let xs = children |> List.map (fun e -> Expression e) in
+    walk_list xs t rest
+  | Pexp_jsx_element
+      (Jsx_unary_element
+         {
+           jsx_unary_element_tag_name = tag_name;
+           jsx_unary_element_props = props;
+         }) -> (
+    let closing_token_loc =
+      ParsetreeViewer.unary_element_closing_token expr.pexp_loc
+    in
+
+    let after_opening_tag_name, rest =
+      (* Either the first prop or the closing /> token *)
+      let next_token =
+        match props with
+        | [] -> closing_token_loc
+        | head :: _ -> ParsetreeViewer.get_jsx_prop_loc head
+      in
+      let name_loc = tag_name.loc in
+      partition_adjacent_trailing_before_next_token_on_same_line name_loc
+        next_token comments
+    in
+
+    (* Only attach comments to the element name if they are on the same line *)
+    let name_loc = tag_name.loc in
+    attach t.trailing name_loc after_opening_tag_name;
+    match props with
+    | [] ->
+      let before_closing_token, _rest =
+        partition_leading_trailing rest closing_token_loc
+      in
+      (* attach comments to the closing /> token *)
+      attach t.leading closing_token_loc before_closing_token
+      (* the _rest comments are going to be attached after the entire expression,
+         dealt with in the parent node. *)
+    | props ->
+      let comments_for_props, _rest =
+        partition_leading_trailing rest closing_token_loc
+      in
+      let prop_nodes = List.map (fun prop -> JsxProp prop) props in
+      walk_list prop_nodes t comments_for_props)
+  | Pexp_jsx_element
+      (Jsx_container_element
+         {
+           jsx_container_element_tag_name_start = tag_name_start;
+           jsx_container_element_props = props;
+           jsx_container_element_opening_tag_end = opening_greater_than;
+           jsx_container_element_children = children;
+           jsx_container_element_closing_tag = closing_tag;
+         }) -> (
+    let opening_greater_than_loc =
+      {
+        loc_start = opening_greater_than;
+        loc_end = opening_greater_than;
+        loc_ghost = false;
+      }
+    in
+    let after_opening_tag_name, rest =
+      (* Either the first prop or the closing > token *)
+      let next_token =
+        match props with
+        | [] -> opening_greater_than_loc
+        | head :: _ -> ParsetreeViewer.get_jsx_prop_loc head
+      in
+      let name_loc = tag_name_start.loc in
+      partition_adjacent_trailing_before_next_token_on_same_line name_loc
+        next_token comments
+    in
+    (* Only attach comments to the element name if they are on the same line *)
+    let name_loc = tag_name_start.loc in
+    attach t.trailing name_loc after_opening_tag_name;
+    let rest =
+      match props with
+      | [] ->
+        let before_greater_than, rest =
+          partition_leading_trailing rest opening_greater_than_loc
+        in
+        (* attach comments to the closing > token *)
+        attach t.leading opening_greater_than_loc before_greater_than;
+        rest
+      | props ->
+        let comments_for_props, rest =
+          partition_leading_trailing rest opening_greater_than_loc
+        in
+        let prop_nodes = List.map (fun prop -> JsxProp prop) props in
+        walk_list prop_nodes t comments_for_props;
+        rest
+    in
+
+    (* comments after '>' on the same line should be attached to '>' *)
+    let after_opening_greater_than, rest =
+      partition_by_on_same_line opening_greater_than_loc rest
+    in
+    attach t.trailing opening_greater_than_loc after_opening_greater_than;
+
+    let comments_for_children, _rest =
+      match closing_tag with
+      | None -> (rest, [])
+      | Some closing_tag ->
+        let closing_tag_loc =
+          ParsetreeViewer.container_element_closing_tag_loc closing_tag
+        in
+        partition_leading_trailing rest closing_tag_loc
+    in
+    match children with
+    | [] -> (
+      (* attach all comments to the closing tag if there are no children *)
+      match closing_tag with
+      | None ->
+        (* if there is no closing tag, the comments will attached after the expression *)
+        ()
+      | Some closing_tag ->
+        let closing_tag_loc =
+          ParsetreeViewer.container_element_closing_tag_loc closing_tag
+        in
+        if
+          opening_greater_than_loc.loc_end.pos_lnum
+          < closing_tag_loc.loc_start.pos_lnum + 1
+        then (
+          (* In this case, there are no children but there are comments between the opening and closing tag,
+             We can attach these the inside table, to easily print them later as indented comments
+             For example:
+             <div>
+                // comment 1
+                // comment 2
+            </div>
+          *)
+          let inside_comments, leading_for_closing_tag =
+            partition_between_lines opening_greater_than_loc.loc_end.pos_lnum
+              closing_tag_loc.loc_start.pos_lnum comments_for_children
+          in
+          attach t.inside expr.pexp_loc inside_comments;
+          attach t.leading closing_tag_loc leading_for_closing_tag)
+        else
+          (* if the closing tag is on the same line, attach comments to the opening tag *)
+          attach t.leading closing_tag_loc comments_for_children)
+    | children ->
+      let children_nodes = List.map (fun e -> Expression e) children in
+
+      walk_list children_nodes t comments_for_children
+    (* It is less likely that there are comments inside the closing tag, 
+       so we don't process them right now,
+       if you ever need this, feel free to update process _rest. 
+       Comments after the closing tag will already be taking into account by the parent node. *)
+    )
+  | Pexp_await expr -> walk_expression expr t comments
+  | Pexp_send _ -> ()
+
+and walk_expr_parameter (_attrs, _argLbl, expr_opt, pattern) t comments =
+  let leading, inside, trailing = partition_by_loc comments pattern.ppat_loc in
+  attach t.leading pattern.ppat_loc leading;
+  walk_pattern pattern t inside;
+  match expr_opt with
+  | Some expr ->
+    let _afterPat, rest =
+      partition_adjacent_trailing pattern.ppat_loc trailing
+    in
+    attach t.trailing pattern.ppat_loc trailing;
+    if is_block_expr expr then walk_expression expr t rest
+    else
+      let leading, inside, trailing = partition_by_loc rest expr.pexp_loc in
+      attach t.leading expr.pexp_loc leading;
+      walk_expression expr t inside;
+      attach t.trailing expr.pexp_loc trailing
+  | None -> attach t.trailing pattern.ppat_loc trailing
+
+and walk_expr_argument expr loc t comments =
+  let leading, trailing = partition_leading_trailing comments loc in
+  attach t.leading loc leading;
+  let after_label, rest = partition_adjacent_trailing loc trailing in
+  attach t.trailing loc after_label;
+  let before, inside, after = partition_by_loc rest expr.pexp_loc in
+  attach t.leading expr.pexp_loc before;
+  walk_expression expr t inside;
+  attach t.trailing expr.pexp_loc after
+
+and walk_case (case : Parsetree.case) t comments =
+  let before, inside, after = partition_by_loc comments case.pc_lhs.ppat_loc in
+  (* cases don't have a location on their own, leading comments should go
+   * after the bar on the pattern *)
+  walk_pattern case.pc_lhs t (List.concat [before; inside]);
+  let after_pat, rest =
+    partition_adjacent_trailing case.pc_lhs.ppat_loc after
+  in
+  attach t.trailing case.pc_lhs.ppat_loc after_pat;
+  let comments =
+    match case.pc_guard with
+    | Some expr ->
+      let before, inside, after = partition_by_loc rest expr.pexp_loc in
+      let after_expr, rest = partition_adjacent_trailing expr.pexp_loc after in
+      if is_block_expr expr then
+        walk_expression expr t (List.concat [before; inside; after_expr])
+      else (
+        attach t.leading expr.pexp_loc before;
+        walk_expression expr t inside;
+        attach t.trailing expr.pexp_loc after_expr);
+      rest
+    | None -> rest
+  in
+  if is_block_expr case.pc_rhs then walk_expression case.pc_rhs t comments
+  else
+    let before, inside, after =
+      partition_by_loc comments case.pc_rhs.pexp_loc
+    in
+    attach t.leading case.pc_rhs.pexp_loc before;
+    walk_expression case.pc_rhs t inside;
+    attach t.trailing case.pc_rhs.pexp_loc after
+
+and walk_expr_record_row (longident, expr) t comments =
+  let before_longident, after_longident =
+    partition_leading_trailing comments longident.loc
+  in
+  attach t.leading longident.loc before_longident;
+  let after_longident, rest =
+    partition_adjacent_trailing longident.loc after_longident
+  in
+  attach t.trailing longident.loc after_longident;
+  let leading, inside, trailing = partition_by_loc rest expr.pexp_loc in
+  attach t.leading expr.pexp_loc leading;
+  walk_expression expr t inside;
+  attach t.trailing expr.pexp_loc trailing
+
+and walk_extension_constructor ext_constr t comments =
+  let leading, trailing =
+    partition_leading_trailing comments ext_constr.pext_name.loc
+  in
+  attach t.leading ext_constr.pext_name.loc leading;
+  let after_name, rest =
+    partition_adjacent_trailing ext_constr.pext_name.loc trailing
+  in
+  attach t.trailing ext_constr.pext_name.loc after_name;
+  walk_extension_constructor_kind ext_constr.pext_kind t rest
+
+and walk_extension_constructor_kind kind t comments =
+  match kind with
+  | Pext_rebind longident ->
+    let leading, trailing = partition_leading_trailing comments longident.loc in
+    attach t.leading longident.loc leading;
+    attach t.trailing longident.loc trailing
+  | Pext_decl (constructor_arguments, maybe_typ_expr) -> (
+    let rest = walk_constructor_arguments constructor_arguments t comments in
+    match maybe_typ_expr with
+    | None -> ()
+    | Some typexpr ->
+      let before, inside, after = partition_by_loc rest typexpr.ptyp_loc in
+      attach t.leading typexpr.ptyp_loc before;
+      walk_core_type typexpr t inside;
+      attach t.trailing typexpr.ptyp_loc after)
+
+and walk_module_expr mod_expr t comments =
+  match mod_expr.pmod_desc with
+  | Pmod_ident longident ->
+    let before, after = partition_leading_trailing comments longident.loc in
+    attach t.leading longident.loc before;
+    attach t.trailing longident.loc after
+  | Pmod_structure [] -> attach t.inside mod_expr.pmod_loc comments
+  | Pmod_structure structure -> walk_structure structure t comments
+  | Pmod_extension extension -> walk_extension extension t comments
+  | Pmod_unpack expr ->
+    let before, inside, after = partition_by_loc comments expr.pexp_loc in
+    attach t.leading expr.pexp_loc before;
+    walk_expression expr t inside;
+    attach t.trailing expr.pexp_loc after
+  | Pmod_constraint (modexpr, modtype) ->
+    if modtype.pmty_loc.loc_start >= modexpr.pmod_loc.loc_end then (
+      let before, inside, after = partition_by_loc comments modexpr.pmod_loc in
+      attach t.leading modexpr.pmod_loc before;
+      walk_module_expr modexpr t inside;
+      let after, rest = partition_adjacent_trailing modexpr.pmod_loc after in
+      attach t.trailing modexpr.pmod_loc after;
+      let before, inside, after = partition_by_loc rest modtype.pmty_loc in
+      attach t.leading modtype.pmty_loc before;
+      walk_mod_type modtype t inside;
+      attach t.trailing modtype.pmty_loc after)
+    else
+      let before, inside, after = partition_by_loc comments modtype.pmty_loc in
+      attach t.leading modtype.pmty_loc before;
+      walk_mod_type modtype t inside;
+      let after, rest = partition_adjacent_trailing modtype.pmty_loc after in
+      attach t.trailing modtype.pmty_loc after;
+      let before, inside, after = partition_by_loc rest modexpr.pmod_loc in
+      attach t.leading modexpr.pmod_loc before;
+      walk_module_expr modexpr t inside;
+      attach t.trailing modexpr.pmod_loc after
+  | Pmod_apply (_callModExpr, _argModExpr) ->
+    let mod_exprs = mod_expr_apply mod_expr in
+    walk_list (mod_exprs |> List.map (fun me -> ModuleExpr me)) t comments
+  | Pmod_functor _ -> (
+    let parameters, return_mod_expr = mod_expr_functor mod_expr in
+    let comments =
+      visit_list_but_continue_with_remaining_comments
+        ~get_loc:(fun (_, lbl, mod_type_option) ->
+          match mod_type_option with
+          | None -> lbl.Asttypes.loc
+          | Some mod_type ->
+            {lbl.loc with loc_end = mod_type.Parsetree.pmty_loc.loc_end})
+        ~walk_node:walk_mod_expr_parameter ~newline_delimited:false parameters t
+        comments
+    in
+    match return_mod_expr.pmod_desc with
+    | Pmod_constraint (mod_expr, mod_type)
+      when mod_type.pmty_loc.loc_end.pos_cnum
+           <= mod_expr.pmod_loc.loc_start.pos_cnum ->
+      let before, inside, after = partition_by_loc comments mod_type.pmty_loc in
+      attach t.leading mod_type.pmty_loc before;
+      walk_mod_type mod_type t inside;
+      let after, rest = partition_adjacent_trailing mod_type.pmty_loc after in
+      attach t.trailing mod_type.pmty_loc after;
+      let before, inside, after = partition_by_loc rest mod_expr.pmod_loc in
+      attach t.leading mod_expr.pmod_loc before;
+      walk_module_expr mod_expr t inside;
+      attach t.trailing mod_expr.pmod_loc after
+    | _ ->
+      let before, inside, after =
+        partition_by_loc comments return_mod_expr.pmod_loc
+      in
+      attach t.leading return_mod_expr.pmod_loc before;
+      walk_module_expr return_mod_expr t inside;
+      attach t.trailing return_mod_expr.pmod_loc after)
+
+and walk_mod_expr_parameter parameter t comments =
+  let _attrs, lbl, mod_type_option = parameter in
+  let leading, trailing = partition_leading_trailing comments lbl.loc in
+  attach t.leading lbl.loc leading;
+  match mod_type_option with
+  | None -> attach t.trailing lbl.loc trailing
+  | Some mod_type ->
+    let after_lbl, rest = partition_adjacent_trailing lbl.loc trailing in
+    attach t.trailing lbl.loc after_lbl;
+    let before, inside, after = partition_by_loc rest mod_type.pmty_loc in
+    attach t.leading mod_type.pmty_loc before;
+    walk_mod_type mod_type t inside;
+    attach t.trailing mod_type.pmty_loc after
+
+and walk_mod_type mod_type t comments =
+  match mod_type.pmty_desc with
+  | Pmty_ident longident | Pmty_alias longident ->
+    let leading, trailing = partition_leading_trailing comments longident.loc in
+    attach t.leading longident.loc leading;
+    attach t.trailing longident.loc trailing
+  | Pmty_signature [] -> attach t.inside mod_type.pmty_loc comments
+  | Pmty_signature signature -> walk_signature signature t comments
+  | Pmty_extension extension -> walk_extension extension t comments
+  | Pmty_typeof mod_expr ->
+    let before, inside, after = partition_by_loc comments mod_expr.pmod_loc in
+    attach t.leading mod_expr.pmod_loc before;
+    walk_module_expr mod_expr t inside;
+    attach t.trailing mod_expr.pmod_loc after
+  | Pmty_with (mod_type, _withConstraints) ->
+    let before, inside, after = partition_by_loc comments mod_type.pmty_loc in
+    attach t.leading mod_type.pmty_loc before;
+    walk_mod_type mod_type t inside;
+    attach t.trailing mod_type.pmty_loc after
+    (* TODO: withConstraints*)
+  | Pmty_functor _ ->
+    let parameters, return_mod_type = functor_type mod_type in
+    let comments =
+      visit_list_but_continue_with_remaining_comments
+        ~get_loc:(fun (_, lbl, mod_type_option) ->
+          match mod_type_option with
+          | None -> lbl.Asttypes.loc
+          | Some mod_type ->
+            if lbl.txt = "_" then mod_type.Parsetree.pmty_loc
+            else {lbl.loc with loc_end = mod_type.Parsetree.pmty_loc.loc_end})
+        ~walk_node:walk_mod_type_parameter ~newline_delimited:false parameters t
+        comments
+    in
+    let before, inside, after =
+      partition_by_loc comments return_mod_type.pmty_loc
+    in
+    attach t.leading return_mod_type.pmty_loc before;
+    walk_mod_type return_mod_type t inside;
+    attach t.trailing return_mod_type.pmty_loc after
+
+and walk_mod_type_parameter (_, lbl, mod_type_option) t comments =
+  let leading, trailing = partition_leading_trailing comments lbl.loc in
+  attach t.leading lbl.loc leading;
+  match mod_type_option with
+  | None -> attach t.trailing lbl.loc trailing
+  | Some mod_type ->
+    let after_lbl, rest = partition_adjacent_trailing lbl.loc trailing in
+    attach t.trailing lbl.loc after_lbl;
+    let before, inside, after = partition_by_loc rest mod_type.pmty_loc in
+    attach t.leading mod_type.pmty_loc before;
+    walk_mod_type mod_type t inside;
+    attach t.trailing mod_type.pmty_loc after
+
+and walk_pattern pat t comments =
+  let open Location in
+  match pat.Parsetree.ppat_desc with
+  | _ when comments = [] -> ()
+  | Ppat_alias (pat, alias) ->
+    let leading, inside, trailing = partition_by_loc comments pat.ppat_loc in
+    attach t.leading pat.ppat_loc leading;
+    walk_pattern pat t inside;
+    let after_pat, rest = partition_adjacent_trailing pat.ppat_loc trailing in
+    attach t.leading pat.ppat_loc leading;
+    attach t.trailing pat.ppat_loc after_pat;
+    let before_alias, after_alias = partition_leading_trailing rest alias.loc in
+    attach t.leading alias.loc before_alias;
+    attach t.trailing alias.loc after_alias
+  | Ppat_tuple []
+  | Ppat_array []
+  | Ppat_construct ({txt = Longident.Lident "()"}, _)
+  | Ppat_construct ({txt = Longident.Lident "[]"}, _) ->
+    attach t.inside pat.ppat_loc comments
+  | Ppat_array patterns ->
+    walk_list (patterns |> List.map (fun p -> Pattern p)) t comments
+  | Ppat_tuple patterns ->
+    walk_list (patterns |> List.map (fun p -> Pattern p)) t comments
+  | Ppat_construct ({txt = Longident.Lident "::"}, _) ->
+    walk_list
+      (collect_list_patterns [] pat |> List.map (fun p -> Pattern p))
+      t comments
+  | Ppat_construct (constr, None) ->
+    let before_constr, after_constr =
+      partition_leading_trailing comments constr.loc
+    in
+    attach t.leading constr.loc before_constr;
+    attach t.trailing constr.loc after_constr
+  | Ppat_construct (constr, Some pat) ->
+    let leading, trailing = partition_leading_trailing comments constr.loc in
+    attach t.leading constr.loc leading;
+    let after_constructor, rest =
+      partition_adjacent_trailing constr.loc trailing
+    in
+    attach t.trailing constr.loc after_constructor;
+    let leading, inside, trailing = partition_by_loc rest pat.ppat_loc in
+    attach t.leading pat.ppat_loc leading;
+    walk_pattern pat t inside;
+    attach t.trailing pat.ppat_loc trailing
+  | Ppat_variant (_label, None) -> ()
+  | Ppat_variant (_label, Some pat) -> walk_pattern pat t comments
+  | Ppat_type _ -> ()
+  | Ppat_record (record_rows, _) ->
+    walk_list
+      (Ext_list.map record_rows (fun {lid; x = p} -> PatternRecordRow (lid, p)))
+      t comments
+  | Ppat_or _ ->
+    walk_list
+      (Res_parsetree_viewer.collect_or_pattern_chain pat
+      |> List.map (fun pat -> Pattern pat))
+      t comments
+  | Ppat_constraint (pattern, typ) ->
+    let before_pattern, inside_pattern, after_pattern =
+      partition_by_loc comments pattern.ppat_loc
+    in
+    attach t.leading pattern.ppat_loc before_pattern;
+    walk_pattern pattern t inside_pattern;
+    let after_pattern, rest =
+      partition_adjacent_trailing pattern.ppat_loc after_pattern
+    in
+    attach t.trailing pattern.ppat_loc after_pattern;
+    let before_typ, inside_typ, after_typ =
+      partition_by_loc rest typ.ptyp_loc
+    in
+    attach t.leading typ.ptyp_loc before_typ;
+    walk_core_type typ t inside_typ;
+    attach t.trailing typ.ptyp_loc after_typ
+  | Ppat_exception pattern ->
+    let leading, inside, trailing =
+      partition_by_loc comments pattern.ppat_loc
+    in
+    attach t.leading pattern.ppat_loc leading;
+    walk_pattern pattern t inside;
+    attach t.trailing pattern.ppat_loc trailing
+  | Ppat_unpack string_loc ->
+    let leading, trailing =
+      partition_leading_trailing comments string_loc.loc
+    in
+    attach t.leading string_loc.loc leading;
+    attach t.trailing string_loc.loc trailing
+  | Ppat_extension extension -> walk_extension extension t comments
+  | _ -> ()
+
+(* name: firstName *)
+and walk_pattern_record_row row t comments =
+  match row with
+  (* punned {x}*)
+  | ( {Location.txt = Longident.Lident ident; loc = longident_loc},
+      {Parsetree.ppat_desc = Ppat_var {txt; _}} )
+    when ident = txt ->
+    let before_lbl, after_lbl =
+      partition_leading_trailing comments longident_loc
+    in
+    attach t.leading longident_loc before_lbl;
+    attach t.trailing longident_loc after_lbl
+  | longident, pattern ->
+    let before_lbl, after_lbl =
+      partition_leading_trailing comments longident.loc
+    in
+    attach t.leading longident.loc before_lbl;
+    let after_lbl, rest = partition_adjacent_trailing longident.loc after_lbl in
+    attach t.trailing longident.loc after_lbl;
+    let leading, inside, trailing = partition_by_loc rest pattern.ppat_loc in
+    attach t.leading pattern.ppat_loc leading;
+    walk_pattern pattern t inside;
+    attach t.trailing pattern.ppat_loc trailing
+
+and walk_row_field (row_field : Parsetree.row_field) t comments =
+  match row_field with
+  | Parsetree.Rtag ({loc}, _, _, _) ->
+    let before, after = partition_leading_trailing comments loc in
+    attach t.leading loc before;
+    attach t.trailing loc after
+  | Rinherit _ -> ()
+
+and walk_core_type typ t comments =
+  match typ.Parsetree.ptyp_desc with
+  | _ when comments = [] -> ()
+  | Ptyp_tuple typexprs ->
+    walk_list (typexprs |> List.map (fun ct -> CoreType ct)) t comments
+  | Ptyp_extension extension -> walk_extension extension t comments
+  | Ptyp_package package_type -> walk_package_type package_type t comments
+  | Ptyp_alias (typexpr, _alias) ->
+    let before_typ, inside_typ, after_typ =
+      partition_by_loc comments typexpr.ptyp_loc
+    in
+    attach t.leading typexpr.ptyp_loc before_typ;
+    walk_core_type typexpr t inside_typ;
+    attach t.trailing typexpr.ptyp_loc after_typ
+  | Ptyp_poly (strings, typexpr) ->
+    let comments =
+      visit_list_but_continue_with_remaining_comments
+        ~get_loc:(fun n -> n.Asttypes.loc)
+        ~walk_node:(fun longident t comments ->
+          let before_longident, after_longident =
+            partition_leading_trailing comments longident.loc
+          in
+          attach t.leading longident.loc before_longident;
+          attach t.trailing longident.loc after_longident)
+        ~newline_delimited:false strings t comments
+    in
+    let before_typ, inside_typ, after_typ =
+      partition_by_loc comments typexpr.ptyp_loc
+    in
+    attach t.leading typexpr.ptyp_loc before_typ;
+    walk_core_type typexpr t inside_typ;
+    attach t.trailing typexpr.ptyp_loc after_typ
+  | Ptyp_variant (row_fields, _, _) ->
+    walk_list (row_fields |> List.map (fun rf -> RowField rf)) t comments
+  | Ptyp_constr (longident, typexprs) ->
+    let before_longident, _afterLongident =
+      partition_leading_trailing comments longident.loc
+    in
+    let after_longident, rest =
+      partition_adjacent_trailing longident.loc comments
+    in
+    attach t.leading longident.loc before_longident;
+    attach t.trailing longident.loc after_longident;
+    walk_list (typexprs |> List.map (fun ct -> CoreType ct)) t rest
+  | Ptyp_arrow _ ->
+    let _, parameters, typexpr = arrow_type typ in
+    let comments = walk_type_parameters parameters t comments in
+    let before_typ, inside_typ, after_typ =
+      partition_by_loc comments typexpr.ptyp_loc
+    in
+    attach t.leading typexpr.ptyp_loc before_typ;
+    walk_core_type typexpr t inside_typ;
+    attach t.trailing typexpr.ptyp_loc after_typ
+  | Ptyp_object (fields, _) -> walk_typ_object_fields fields t comments
+  | _ -> ()
+
+and walk_typ_object_fields fields t comments =
+  walk_list (fields |> List.map (fun f -> ObjectField f)) t comments
+
+and walk_object_field field t comments =
+  match field with
+  | Otag (lbl, _, typexpr) ->
+    let before_lbl, after_lbl = partition_leading_trailing comments lbl.loc in
+    attach t.leading lbl.loc before_lbl;
+    let after_lbl, rest = partition_adjacent_trailing lbl.loc after_lbl in
+    attach t.trailing lbl.loc after_lbl;
+    let before_typ, inside_typ, after_typ =
+      partition_by_loc rest typexpr.ptyp_loc
+    in
+    attach t.leading typexpr.ptyp_loc before_typ;
+    walk_core_type typexpr t inside_typ;
+    attach t.trailing typexpr.ptyp_loc after_typ
+  | _ -> ()
+
+and walk_type_parameters type_parameters t comments =
+  visit_list_but_continue_with_remaining_comments
+    ~get_loc:(fun (_, lbl, typexpr) ->
+      let lbl_loc = Asttypes.get_lbl_loc lbl in
+      if lbl_loc <> Location.none then
+        {lbl_loc with loc_end = typexpr.Parsetree.ptyp_loc.loc_end}
+      else typexpr.ptyp_loc)
+    ~walk_node:walk_type_parameter ~newline_delimited:false type_parameters t
+    comments
+
+and walk_type_parameter (_attrs, _lbl, typexpr) t comments =
+  let before_typ, inside_typ, after_typ =
+    partition_by_loc comments typexpr.ptyp_loc
+  in
+  attach t.leading typexpr.ptyp_loc before_typ;
+  walk_core_type typexpr t inside_typ;
+  attach t.trailing typexpr.ptyp_loc after_typ
+
+and walk_package_type package_type t comments =
+  let longident, package_constraints = package_type in
+  let before_longident, after_longident =
+    partition_leading_trailing comments longident.loc
+  in
+  attach t.leading longident.loc before_longident;
+  let after_longident, rest =
+    partition_adjacent_trailing longident.loc after_longident
+  in
+  attach t.trailing longident.loc after_longident;
+  walk_package_constraints package_constraints t rest
+
+and walk_package_constraints package_constraints t comments =
+  walk_list
+    (package_constraints
+    |> List.map (fun (li, te) -> PackageConstraint (li, te)))
+    t comments
+
+and walk_package_constraint package_constraint t comments =
+  let longident, typexpr = package_constraint in
+  let before_longident, after_longident =
+    partition_leading_trailing comments longident.loc
+  in
+  attach t.leading longident.loc before_longident;
+  let after_longident, rest =
+    partition_adjacent_trailing longident.loc after_longident
+  in
+  attach t.trailing longident.loc after_longident;
+  let before_typ, inside_typ, after_typ =
+    partition_by_loc rest typexpr.ptyp_loc
+  in
+  attach t.leading typexpr.ptyp_loc before_typ;
+  walk_core_type typexpr t inside_typ;
+  attach t.trailing typexpr.ptyp_loc after_typ
+
+and walk_extension extension t comments =
+  let id, payload = extension in
+  let before_id, after_id = partition_leading_trailing comments id.loc in
+  attach t.leading id.loc before_id;
+  let after_id, rest = partition_adjacent_trailing id.loc after_id in
+  attach t.trailing id.loc after_id;
+  walk_payload payload t rest
+
+and walk_attribute (id, payload) t comments =
+  let before_id, after_id = partition_leading_trailing comments id.loc in
+  attach t.leading id.loc before_id;
+  let after_id, rest = partition_adjacent_trailing id.loc after_id in
+  attach t.trailing id.loc after_id;
+  walk_payload payload t rest
+
+and walk_payload payload t comments =
+  match payload with
+  | PStr s -> walk_structure s t comments
+  | _ -> ()
+
+and walk_jsx_prop prop t comments =
+  match prop with
+  | Parsetree.JSXPropPunning _ ->
+    (* this is covered by walk_list, as the location for the prop is cover there. *)
+    ()
+  | Parsetree.JSXPropValue (name, _, value) ->
+    if name.loc.loc_end.pos_lnum == value.pexp_loc.loc_start.pos_lnum then
+      (* In the rare case that comments are found between name=value,
+         where both are on the same line,
+         we assign them to the value, and not to the name. *)
+      walk_list [Expression value] t comments
+    else
+      (* otherwise we attach comments that come directly after the name to the name *)
+      let after_name, rest = partition_by_on_same_line name.loc comments in
+      attach t.trailing name.loc after_name;
+      walk_list [Expression value] t rest
+  | Parsetree.JSXPropSpreading (_, value) ->
+    (* We assign all comments to the spreaded expression *)
+    walk_list [Expression value] t comments
diff --git a/compiler/syntax/src/res_core.ml b/compiler/syntax/src/res_core.ml
new file mode 100644
index 0000000..0d7ef55
--- /dev/null
+++ b/compiler/syntax/src/res_core.ml
@@ -0,0 +1,7365 @@
+module Doc = Res_doc
+module Grammar = Res_grammar
+module Token = Res_token
+module Diagnostics = Res_diagnostics
+module CommentTable = Res_comments_table
+module ResPrinter = Res_printer
+module Scanner = Res_scanner
+module Parser = Res_parser
+
+let mk_loc start_loc end_loc =
+  Location.{loc_start = start_loc; loc_end = end_loc; loc_ghost = false}
+
+let rec skip_doc_comments p =
+  match p.Parser.token with
+  | DocComment _ ->
+    Parser.next p;
+    skip_doc_comments p
+  | _ -> ()
+
+type inline_types_context = {
+  mutable found_inline_types:
+    (string * Warnings.loc * Parsetree.type_kind) list;
+  params: (Parsetree.core_type * Asttypes.variance) list;
+}
+
+let extend_current_type_name_path current_type_name_path field_name =
+  match current_type_name_path with
+  | None -> None
+  | Some path -> Some (path @ [field_name])
+
+module Recover = struct
+  let default_expr () =
+    let id = Location.mknoloc "rescript.exprhole" in
+    Ast_helper.Exp.mk (Pexp_extension (id, PStr []))
+
+  let default_type () =
+    let id = Location.mknoloc "rescript.typehole" in
+    Ast_helper.Typ.extension (id, PStr [])
+
+  let default_pattern () =
+    let id = Location.mknoloc "rescript.patternhole" in
+    Ast_helper.Pat.extension (id, PStr [])
+
+  let default_module_expr () = Ast_helper.Mod.structure []
+  let default_module_type () = Ast_helper.Mty.signature []
+
+  let default_signature_item =
+    let id = Location.mknoloc "rescript.sigitemhole" in
+    Ast_helper.Sig.extension (id, PStr [])
+
+  let recover_equal_greater p =
+    Parser.expect EqualGreater p;
+    match p.Parser.token with
+    | MinusGreater -> Parser.next p
+    | _ -> ()
+
+  let should_abort_list_parse p =
+    let rec check breadcrumbs =
+      match breadcrumbs with
+      | [] -> false
+      | (grammar, _) :: rest ->
+        if Grammar.is_part_of_list grammar p.Parser.token then true
+        else check rest
+    in
+    check p.breadcrumbs
+end
+
+module ErrorMessages = struct
+  let list_pattern_spread =
+    "List pattern matches only supports one `...` spread, at the end.\n\
+     Explanation: a list spread at the tail is efficient, but a spread in the \
+     middle would create new lists; out of performance concern, our pattern \
+     matching currently guarantees to never create new intermediate data."
+
+  let record_pattern_spread =
+    "Record spread (`...`) is not supported in pattern matches.\n\
+     Explanation: you can't collect a subset of a record's field into its own \
+     record, since a record needs an explicit declaration and that subset \
+     wouldn't have one.\n\
+     Solution: you need to pull out each field you want explicitly."
+  (* let recordPatternUnderscore = "Record patterns only support one `_`, at the end." *)
+  [@@live]
+
+  let array_pattern_spread =
+    "Array spread (`...`) is not supported in pattern matches.\n\n\
+     Explanation: Allowing `...` here would require creating a new subarray at \
+     match time, but for performance reasons pattern matching is guaranteed to \
+     never create intermediate data.\n\n\
+     Possible solutions:\n\
+     - To validate specific elements: Use `if` with length checks and \
+     `Array.get`\n\
+     - To extract a subarray: Use `Array.slice`"
+
+  let record_expr_spread =
+    "Records can only have one `...` spread, at the beginning.\n\
+     Explanation: since records have a known, fixed shape, a spread like `{a, \
+     ...b}` wouldn't make sense, as `b` would override every field of `a` \
+     anyway."
+
+  let dict_expr_spread = "Dict literals do not support spread (`...`) yet."
+
+  let record_field_missing_colon =
+    "Records use `:` when assigning fields. Example: `{field: value}`"
+
+  let record_pattern_field_missing_colon =
+    "Record patterns use `:` when matching fields. Example: `{field: value}`"
+
+  let record_type_field_missing_colon =
+    "Record fields in type declarations use `:`. Example: `{field: string}`"
+
+  let dict_field_missing_colon =
+    "Dict entries use `:` to separate keys from values. Example: `{\"k\": v}`"
+
+  let labelled_argument_missing_equal =
+    "Use `=` to pass a labelled argument. Example: `~label=value`"
+
+  let optional_labelled_argument_missing_equal =
+    "Optional labelled arguments use `=?`. Example: `~label=?value`"
+
+  let variant_ident =
+    "A polymorphic variant (e.g. #id) must start with an alphabetical letter \
+     or be a number (e.g. #742)"
+
+  let experimental_if_let expr =
+    let switch_expr = {expr with Parsetree.pexp_attributes = []} in
+    Doc.concat
+      [
+        Doc.text "If-let is currently highly experimental.";
+        Doc.line;
+        Doc.text "Use a regular `switch` with pattern matching instead:";
+        Doc.concat
+          [
+            Doc.hard_line;
+            Doc.hard_line;
+            ResPrinter.print_expression switch_expr CommentTable.empty;
+          ];
+      ]
+    |> Doc.to_string ~width:80
+
+  let experimental_let_unwrap_rec =
+    "let? is not allowed to be recursive. Use a regular `let` or remove `rec`."
+
+  let experimental_let_unwrap_sig =
+    "let? is not allowed in signatures. Use a regular `let` instead."
+
+  let type_param =
+    "A type param consists of a singlequote followed by a name like `'a` or \
+     `'A`"
+  let type_var =
+    "A type variable consists of a singlequote followed by a name like `'a` or \
+     `'A`"
+
+  let attribute_without_node (attr : Parsetree.attribute) =
+    let {Asttypes.txt = attr_name}, _ = attr in
+    "Did you forget to attach `" ^ attr_name
+    ^ "` to an item?\n  Standalone attributes start with `@@` like: `@@"
+    ^ attr_name ^ "`"
+
+  let type_declaration_name_longident longident =
+    "A type declaration's name cannot contain a module access. Did you mean `"
+    ^ Longident.last longident ^ "`?"
+
+  let tuple_single_element = "A tuple needs at least two elements"
+
+  let missing_tilde_labeled_parameter name =
+    if name = "" then "A labeled parameter starts with a `~`."
+    else "A labeled parameter starts with a `~`. Did you mean: `~" ^ name ^ "`?"
+
+  let string_interpolation_in_pattern =
+    "String interpolation is not supported in pattern matching."
+
+  let object_quoted_field_name name =
+    "An object type declaration needs quoted field names. Did you mean \""
+    ^ name ^ "\"?"
+
+  let forbidden_inline_record_declaration =
+    "An inline record type declaration is only allowed in a variant \
+     constructor's declaration or nested inside of a record type declaration"
+
+  let poly_var_int_with_suffix number =
+    "A numeric polymorphic variant cannot be followed by a letter. Did you \
+     mean `#" ^ number ^ "`?"
+
+  let multiple_inline_record_definitions_at_same_path =
+    "Only one inline record definition is allowed per record field. This \
+     defines more than one inline record."
+
+  let keyword_field_in_expr keyword_txt =
+    "Cannot use keyword `" ^ keyword_txt
+    ^ "` as a record field name. Suggestion: rename it (e.g. `" ^ keyword_txt
+    ^ "_`)"
+
+  let keyword_field_in_pattern keyword_txt =
+    "Cannot use keyword `" ^ keyword_txt
+    ^ "` here. Keywords are not allowed as record field names."
+
+  let keyword_field_in_type keyword_txt =
+    "Cannot use keyword `" ^ keyword_txt
+    ^ "` as a record field name. Suggestion: rename it (e.g. `" ^ keyword_txt
+    ^ "_`)\n  If you need the field to be \"" ^ keyword_txt
+    ^ "\" at runtime, annotate the field: `@as(\"" ^ keyword_txt ^ "\") "
+    ^ keyword_txt ^ "_ : ...`"
+
+  let type_definition_in_function =
+    "Type definitions are not allowed inside functions.\n"
+    ^ "  Move this `type` declaration to the top level or into a module."
+
+  let spread_children_no_longer_supported =
+    "Spreading JSX children is no longer supported."
+end
+
+module InExternal = struct
+  let status = ref false
+end
+
+let ternary_attr = (Location.mknoloc "res.ternary", Parsetree.PStr [])
+let if_let_attr = (Location.mknoloc "res.iflet", Parsetree.PStr [])
+let make_await_attr loc = (Location.mkloc "res.await" loc, Parsetree.PStr [])
+let suppress_fragile_match_warning_attr =
+  ( Location.mknoloc "warning",
+    Parsetree.PStr
+      [
+        Ast_helper.Str.eval
+          (Ast_helper.Exp.constant (Pconst_string ("-4", None)));
+      ] )
+let make_braces_attr loc = (Location.mkloc "res.braces" loc, Parsetree.PStr [])
+let template_literal_attr = (Location.mknoloc "res.template", Parsetree.PStr [])
+let make_pat_variant_spread_attr =
+  (Location.mknoloc "res.patVariantSpread", Parsetree.PStr [])
+
+let tagged_template_literal_attr =
+  (Location.mknoloc "res.taggedTemplate", Parsetree.PStr [])
+
+let spread_attr = (Location.mknoloc "res.spread", Parsetree.PStr [])
+
+type argument = {label: Asttypes.arg_label; expr: Parsetree.expression}
+
+type type_parameter = {
+  attrs: Ast_helper.attrs;
+  label: Asttypes.arg_label;
+  typ: Parsetree.core_type;
+  start_pos: Lexing.position;
+}
+
+type typ_def_or_ext =
+  | TypeDef of {
+      rec_flag: Asttypes.rec_flag;
+      types: Parsetree.type_declaration list;
+    }
+  | TypeExt of Parsetree.type_extension
+
+type fundef_type_param = {
+  attrs: Parsetree.attributes;
+  locs: string Location.loc list;
+  p_pos: Lexing.position;
+}
+
+type fundef_term_param = {
+  attrs: Parsetree.attributes;
+  p_label: Asttypes.arg_label;
+  expr: Parsetree.expression option;
+  pat: Parsetree.pattern;
+  p_pos: Lexing.position;
+}
+
+(* Single parameter of a function definition  (type a b, x, ~y) *)
+type fundef_parameter =
+  | TermParameter of fundef_term_param
+  | TypeParameter of fundef_type_param
+
+type record_pattern_item =
+  | PatUnderscore
+  | PatField of Parsetree.pattern Parsetree.record_element
+
+type context = OrdinaryExpr | TernaryTrueBranchExpr | WhenExpr
+
+(* Extracts type and term parameters from a list of function definition parameters, combining all type parameters into one *)
+let rec extract_fundef_params ~(type_acc : fundef_type_param option)
+    ~(term_acc : fundef_term_param list) (params : fundef_parameter list) :
+    fundef_type_param option * fundef_term_param list =
+  match params with
+  | TermParameter tp :: rest ->
+    extract_fundef_params ~type_acc ~term_acc:(tp :: term_acc) rest
+  | TypeParameter tp :: rest ->
+    let type_acc =
+      match type_acc with
+      | Some tpa ->
+        Some
+          {
+            attrs = tpa.attrs @ tp.attrs;
+            locs = tpa.locs @ tp.locs;
+            p_pos = tpa.p_pos;
+          }
+      | None -> Some tp
+    in
+    extract_fundef_params ~type_acc ~term_acc rest
+  | [] -> (type_acc, List.rev term_acc)
+
+let get_closing_token = function
+  | Token.Lparen -> Token.Rparen
+  | Lbrace -> Rbrace
+  | Lbracket -> Rbracket
+  | List -> Rbrace
+  | Dict -> Rbrace
+  | LessThan -> GreaterThan
+  | _ -> assert false
+
+let rec go_to_closing closing_token state =
+  match (state.Parser.token, closing_token) with
+  | Rparen, Token.Rparen
+  | Rbrace, Rbrace
+  | Rbracket, Rbracket
+  | GreaterThan, GreaterThan ->
+    Parser.next state;
+    ()
+  | ((Token.Lbracket | Lparen | Lbrace | List | Dict | LessThan) as t), _ ->
+    Parser.next state;
+    go_to_closing (get_closing_token t) state;
+    go_to_closing closing_token state
+  | (Rparen | Token.Rbrace | Rbracket | Eof), _ ->
+    () (* TODO: how do report errors here? *)
+  | _ ->
+    Parser.next state;
+    go_to_closing closing_token state
+
+(* Madness *)
+let is_es6_arrow_expression ~in_ternary p =
+  Parser.lookahead p (fun state ->
+      let _async =
+        match state.Parser.token with
+        | Lident "async" ->
+          Parser.next state;
+          true
+        | _ -> false
+      in
+      match state.Parser.token with
+      | Lident _ | Underscore -> (
+        Parser.next state;
+        match state.Parser.token with
+        (* Don't think that this valid
+         * Imagine: let x = (a: int)
+         * This is a parenthesized expression with a type constraint, wait for
+         * the arrow *)
+        (* | Colon when not inTernary -> true *)
+        | EqualGreater -> true
+        | _ -> false)
+      | Lparen -> (
+        let prev_end_pos = state.prev_end_pos in
+        Parser.next state;
+        match state.token with
+        (* arrived at `()` here *)
+        | Rparen -> (
+          Parser.next state;
+          match state.Parser.token with
+          (* arrived at `() :` here *)
+          | Colon when not in_ternary -> (
+            Parser.next state;
+            match state.Parser.token with
+            (* arrived at `() :typ` here *)
+            | Lident _ -> (
+              Parser.next state;
+              (match state.Parser.token with
+              (* arrived at `() :typ<` here *)
+              | LessThan ->
+                Scanner.set_diamond_mode state.scanner;
+                Parser.next state;
+                go_to_closing GreaterThan state;
+                Scanner.pop_mode state.scanner Diamond
+              | _ -> ());
+              match state.Parser.token with
+              (* arrived at `() :typ =>` or `() :typ<'a,'b> =>` here *)
+              | EqualGreater -> true
+              | _ -> false)
+            | _ -> true)
+          | EqualGreater -> true
+          | _ -> false)
+        | Dot (* uncurried *) -> true
+        | Backtick ->
+          false
+          (* (` always indicates the start of an expr, can't be es6 parameter *)
+        | _ -> (
+          go_to_closing Rparen state;
+          match state.Parser.token with
+          | EqualGreater -> true
+          (* | Lbrace TODO: detect missing =>, is this possible? *)
+          | Colon when not in_ternary -> true
+          | Rparen ->
+            (* imagine having something as :
+             * switch colour {
+             * | Red
+             *    when l == l'
+             *    || (&Clflags.classic && (l == Nolabel && !is_optional(l'))) => (t1, t2)
+             * We'll arrive at the outer rparen just before the =>.
+             * This is not an es6 arrow.
+             *)
+            false
+          | _ -> (
+            Parser.next_unsafe state;
+            (* error recovery, peek at the next token,
+             * (elements, providerId] => {
+             *  in the example above, we have an unbalanced ] here
+             *)
+            match state.Parser.token with
+            | EqualGreater
+              when state.start_pos.pos_lnum == prev_end_pos.pos_lnum ->
+              true
+            | _ -> false)))
+      | _ -> false)
+
+let is_es6_arrow_functor p =
+  Parser.lookahead p (fun state ->
+      match state.Parser.token with
+      (* | Uident _ | Underscore -> *)
+      (* Parser.next state; *)
+      (* begin match state.Parser.token with *)
+      (* | EqualGreater -> true *)
+      (* | _ -> false *)
+      (* end *)
+      | Lparen -> (
+        Parser.next state;
+        match state.token with
+        | Rparen -> (
+          Parser.next state;
+          match state.token with
+          | Colon | EqualGreater -> true
+          | _ -> false)
+        | _ -> (
+          go_to_closing Rparen state;
+          match state.Parser.token with
+          | EqualGreater | Lbrace -> true
+          | Colon -> true
+          | _ -> false))
+      | _ -> false)
+
+let is_es6_arrow_type p =
+  Parser.lookahead p (fun state ->
+      match state.Parser.token with
+      | Lparen -> (
+        Parser.next state;
+        match state.Parser.token with
+        | Rparen -> (
+          Parser.next state;
+          match state.Parser.token with
+          | EqualGreater -> true
+          | _ -> false)
+        | Tilde | Dot -> true
+        | _ -> (
+          go_to_closing Rparen state;
+          match state.Parser.token with
+          | EqualGreater -> true
+          | _ -> false))
+      | Tilde -> true
+      | _ -> false)
+
+let build_longident words =
+  match List.rev words with
+  | [] -> assert false
+  | hd :: tl -> List.fold_left (fun p s -> Longident.Ldot (p, s)) (Lident hd) tl
+
+let emit_keyword_field_error (p : Parser.t) ~mk_message =
+  let keyword_txt = Token.to_string p.token in
+  let keyword_start = p.Parser.start_pos in
+  let keyword_end = p.Parser.end_pos in
+  Parser.err ~start_pos:keyword_start ~end_pos:keyword_end p
+    (Diagnostics.message (mk_message keyword_txt))
+
+(* Recovers a keyword used as field name if it's probable that it's a full
+   field name (not punning etc), by checking if there's a colon after it. *)
+let recover_keyword_field_name_if_probably_field p ~mk_message :
+    (string * Location.t) option =
+  if
+    Token.is_keyword p.Parser.token
+    && Parser.lookahead p (fun st ->
+           Parser.next st;
+           st.Parser.token = Colon)
+  then (
+    emit_keyword_field_error p ~mk_message;
+    let loc = mk_loc p.Parser.start_pos p.Parser.end_pos in
+    let recovered_field_name = Token.to_string p.token ^ "_" in
+    Parser.next p;
+    Some (recovered_field_name, loc))
+  else None
+
+let make_infix_operator (p : Parser.t) token start_pos end_pos =
+  let stringified_token =
+    if token = Token.Equal then (
+      (* TODO: could have a totally different meaning like x->fooSet(y)*)
+      Parser.err ~start_pos ~end_pos p
+        (Diagnostics.message "Did you mean `==` here?");
+      "=")
+    else Token.to_string token
+  in
+  let loc = mk_loc start_pos end_pos in
+  let operator = Location.mkloc (Longident.Lident stringified_token) loc in
+  Ast_helper.Exp.ident ~loc operator
+
+let negate_string s =
+  if String.length s > 0 && (s.[0] [@doesNotRaise]) = '-' then
+    (String.sub [@doesNotRaise]) s 1 (String.length s - 1)
+  else "-" ^ s
+
+let make_unary_expr start_pos token_end token operand =
+  match (token, operand.Parsetree.pexp_desc) with
+  | (Token.Plus | PlusDot), Pexp_constant (Pconst_integer _ | Pconst_float _) ->
+    operand
+  | Minus, Pexp_constant (Pconst_integer (n, m)) ->
+    {
+      operand with
+      pexp_desc = Pexp_constant (Pconst_integer (negate_string n, m));
+    }
+  | (Minus | MinusDot), Pexp_constant (Pconst_float (n, m)) ->
+    {operand with pexp_desc = Pexp_constant (Pconst_float (negate_string n, m))}
+  | (Token.Plus | PlusDot | Minus | MinusDot | Bnot), _ ->
+    let token_loc = mk_loc start_pos token_end in
+    let token_string = Token.to_string token in
+    let operator =
+      if token_string.[0] = '~' then token_string else "~" ^ token_string
+    in
+    Ast_helper.Exp.apply
+      ~loc:(mk_loc start_pos operand.Parsetree.pexp_loc.loc_end)
+      (Ast_helper.Exp.ident ~loc:token_loc
+         (Location.mkloc (Longident.Lident operator) token_loc))
+      [(Nolabel, operand)]
+  | Token.Bang, _ ->
+    let token_loc = mk_loc start_pos token_end in
+    Ast_helper.Exp.apply
+      ~loc:(mk_loc start_pos operand.Parsetree.pexp_loc.loc_end)
+      (Ast_helper.Exp.ident ~loc:token_loc
+         (Location.mkloc (Longident.Lident "not") token_loc))
+      [(Nolabel, operand)]
+  | _ -> operand
+
+let make_list_pattern loc seq ext_opt =
+  let rec handle_seq = function
+    | [] ->
+      let base_case =
+        match ext_opt with
+        | Some ext -> ext
+        | None ->
+          let loc = {loc with Location.loc_ghost = true} in
+          let nil = {Location.txt = Longident.Lident "[]"; loc} in
+          Ast_helper.Pat.construct ~loc nil None
+      in
+      base_case
+    | p1 :: pl ->
+      let pat_pl = handle_seq pl in
+      let loc =
+        mk_loc p1.Parsetree.ppat_loc.loc_start pat_pl.ppat_loc.loc_end
+      in
+      let arg = Ast_helper.Pat.mk ~loc (Ppat_tuple [p1; pat_pl]) in
+      Ast_helper.Pat.mk ~loc
+        (Ppat_construct (Location.mkloc (Longident.Lident "::") loc, Some arg))
+  in
+  handle_seq seq
+
+(* TODO: diagnostic reporting *)
+let lident_of_path longident =
+  match Longident.flatten longident |> List.rev with
+  | [] -> ""
+  | ident :: _ -> ident
+
+let make_newtypes ~attrs ~loc newtypes exp =
+  let expr =
+    List.fold_right
+      (fun newtype exp -> Ast_helper.Exp.mk ~loc (Pexp_newtype (newtype, exp)))
+      newtypes exp
+  in
+  {expr with pexp_attributes = attrs}
+
+(* locally abstract types syntax sugar
+ * Transforms
+ *  let f: type t u v. = (foo : list</t, u, v/>) => ...
+ * into
+ *  let f = (type t u v. foo : list</t, u, v/>) => ...
+ *)
+let wrap_type_annotation ~loc newtypes core_type body =
+  let exp =
+    make_newtypes ~attrs:[] ~loc newtypes
+      (Ast_helper.Exp.constraint_ ~loc body core_type)
+  in
+  let typ =
+    Ast_helper.Typ.poly ~loc newtypes
+      (Ast_helper.Typ.varify_constructors newtypes core_type)
+  in
+  (exp, typ)
+
+(**
+  * process the occurrence of _ in the arguments of a function application
+  * replace _ with a new variable, currently __x, in the arguments
+  * return a wrapping function that wraps ((__x) => ...) around an expression
+  * e.g. foo(_, 3) becomes (__x) => foo(__x, 3)
+  *)
+let process_underscore_application args =
+  let exp_question = ref None in
+  let hidden_var = "__x" in
+  let check_arg ((lab, exp) as arg) =
+    match exp.Parsetree.pexp_desc with
+    | Pexp_ident ({txt = Lident "_"} as id) ->
+      let new_id = Location.mkloc (Longident.Lident hidden_var) id.loc in
+      let new_exp = Ast_helper.Exp.mk (Pexp_ident new_id) ~loc:exp.pexp_loc in
+      exp_question := Some new_exp;
+      (lab, new_exp)
+    | _ -> arg
+  in
+  let args = List.map check_arg args in
+  let wrap (exp_apply : Parsetree.expression) =
+    match !exp_question with
+    | Some {pexp_loc = loc} ->
+      let pattern =
+        Ast_helper.Pat.mk
+          (Ppat_var (Location.mkloc hidden_var loc))
+          ~loc:Location.none
+      in
+      Ast_helper.Exp.fun_ ~loc ~arity:(Some 1) Nolabel None pattern exp_apply
+    | None -> exp_apply
+  in
+  (args, wrap)
+
+(* Transform A.a into a. For use with punned record fields as in {A.a, b}. *)
+let remove_module_name_from_punned_field_value exp =
+  match exp.Parsetree.pexp_desc with
+  | Pexp_ident path_ident ->
+    {
+      exp with
+      pexp_desc =
+        Pexp_ident
+          {path_ident with txt = Lident (Longident.last path_ident.txt)};
+    }
+  | _ -> exp
+
+let rec parse_lident p =
+  let recover_lident p =
+    if
+      Token.is_keyword p.Parser.token
+      && p.Parser.prev_end_pos.pos_lnum == p.start_pos.pos_lnum
+    then (
+      Parser.err p (Diagnostics.lident p.Parser.token);
+      Parser.next p;
+      None)
+    else
+      let rec loop p =
+        if (not (Recover.should_abort_list_parse p)) && p.token <> Eof then (
+          Parser.next p;
+          loop p)
+      in
+      Parser.err p (Diagnostics.lident p.Parser.token);
+      Parser.next p;
+      loop p;
+      match p.Parser.token with
+      | Lident _ -> Some ()
+      | _ -> None
+  in
+  let start_pos = p.Parser.start_pos in
+  match p.Parser.token with
+  | Lident ident ->
+    Parser.next p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    (ident, loc)
+  | Eof ->
+    Parser.err ~start_pos p
+      (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
+    ("_", mk_loc start_pos p.prev_end_pos)
+  | _ -> (
+    match recover_lident p with
+    | Some () -> parse_lident p
+    | None -> ("_", mk_loc start_pos p.prev_end_pos))
+
+let parse_ident ~msg ~start_pos p =
+  match p.Parser.token with
+  | Lident ident | Uident ident ->
+    Parser.next p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    (ident, loc)
+  | token
+    when Token.is_keyword token
+         && p.prev_end_pos.pos_lnum == p.start_pos.pos_lnum ->
+    let token_txt = Token.to_string token in
+    let msg =
+      "`" ^ token_txt
+      ^ "` is a reserved keyword. Keywords need to be escaped: \\\"" ^ token_txt
+      ^ "\""
+    in
+    Parser.err ~start_pos p (Diagnostics.message msg);
+    Parser.next p;
+    (token_txt, mk_loc start_pos p.prev_end_pos)
+  | _token ->
+    Parser.err ~start_pos p (Diagnostics.message msg);
+    Parser.next p;
+    ("", mk_loc start_pos p.prev_end_pos)
+
+let parse_hash_ident ~start_pos p =
+  Parser.expect Hash p;
+  match p.token with
+  | String text ->
+    Parser.next p;
+    (text, mk_loc start_pos p.prev_end_pos)
+  | Int {i; suffix} ->
+    let () =
+      match suffix with
+      | Some _ ->
+        Parser.err p
+          (Diagnostics.message (ErrorMessages.poly_var_int_with_suffix i))
+      | None -> ()
+    in
+    Parser.next p;
+    (i, mk_loc start_pos p.prev_end_pos)
+  | Eof ->
+    Parser.err ~start_pos p (Diagnostics.unexpected p.token p.breadcrumbs);
+    ("", mk_loc start_pos p.prev_end_pos)
+  | _ -> parse_ident ~start_pos ~msg:ErrorMessages.variant_ident p
+
+(* Ldot (Ldot (Lident "Foo", "Bar"), "baz") *)
+let parse_value_path p =
+  let start_pos = p.Parser.start_pos in
+  let rec aux p path =
+    let start_pos = p.Parser.start_pos in
+    let token = p.token in
+
+    Parser.next p;
+    if p.Parser.token = Dot then (
+      Parser.expect Dot p;
+
+      match p.Parser.token with
+      | Lident ident -> Longident.Ldot (path, ident)
+      | Uident uident -> aux p (Ldot (path, uident))
+      | token ->
+        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+        Longident.Ldot (path, "_"))
+    else (
+      Parser.err p ~start_pos ~end_pos:p.prev_end_pos (Diagnostics.lident token);
+      path)
+  in
+  let ident =
+    match p.Parser.token with
+    | Lident ident ->
+      Parser.next p;
+      Longident.Lident ident
+    | Uident ident ->
+      let res = aux p (Lident ident) in
+      Parser.next_unsafe p;
+      res
+    | token ->
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      Parser.next_unsafe p;
+      Longident.Lident "_"
+  in
+  Location.mkloc ident (mk_loc start_pos p.prev_end_pos)
+
+let parse_value_path_after_dot p =
+  let start_pos = p.Parser.start_pos in
+  match p.Parser.token with
+  | Lident _ | Uident _ -> parse_value_path p
+  | token ->
+    Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+    Location.mkloc (Longident.Lident "_") (mk_loc start_pos p.prev_end_pos)
+
+let parse_value_path_tail p start_pos ident =
+  let rec loop p path =
+    match p.Parser.token with
+    | Lident ident ->
+      Parser.next p;
+      Location.mkloc
+        (Longident.Ldot (path, ident))
+        (mk_loc start_pos p.prev_end_pos)
+    | Uident ident ->
+      Parser.next p;
+      Parser.expect Dot p;
+      loop p (Longident.Ldot (path, ident))
+    | token ->
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      Location.mkloc
+        (Longident.Ldot (path, "_"))
+        (mk_loc start_pos p.prev_end_pos)
+  in
+  loop p ident
+
+let parse_module_long_ident_tail ~lowercase p start_pos ident =
+  let rec loop p acc =
+    match p.Parser.token with
+    | Lident ident when lowercase ->
+      Parser.next p;
+      let lident = Longident.Ldot (acc, ident) in
+      Location.mkloc lident (mk_loc start_pos p.prev_end_pos)
+    | Uident ident -> (
+      Parser.next p;
+      let end_pos = p.prev_end_pos in
+      let lident = Longident.Ldot (acc, ident) in
+      match p.Parser.token with
+      | Dot ->
+        Parser.next p;
+        loop p lident
+      | _ -> Location.mkloc lident (mk_loc start_pos end_pos))
+    | t ->
+      Parser.err p (Diagnostics.uident t);
+      Location.mkloc
+        (Longident.Ldot (acc, "_"))
+        (mk_loc start_pos p.prev_end_pos)
+  in
+  loop p ident
+
+(* jsx allows for `-` token in the name, we need to combine some tokens into a single ident *)
+(* This function returns Some token when a combined token is created, None when no change is needed.
+   When it returns Some token:
+   - All immediately following ("-" IDENT) chunks have been consumed from the scanner
+   - No hyphen that belongs to the JSX name remains unconsumed
+   - The returned token is the combined Lident/Uident for the full name *)
+(* Non-mutating helpers to parse JSX identifiers with optional hyphen chains *)
+type jsx_ident_kind = [`Lower | `Upper]
+
+(* Inspect current token; do not advance *)
+let peek_ident (p : Parser.t) : (string * Location.t * jsx_ident_kind) option =
+  match p.Parser.token with
+  | Lident txt -> Some (txt, mk_loc p.start_pos p.end_pos, `Lower)
+  | Uident txt -> Some (txt, mk_loc p.start_pos p.end_pos, `Upper)
+  | _ -> None
+
+(* Consume one Lident/Uident if present *)
+let expect_ident (p : Parser.t) : (string * Location.t * jsx_ident_kind) option
+    =
+  match peek_ident p with
+  | None -> None
+  | Some (txt, loc, k) ->
+    Parser.next p;
+    Some (txt, loc, k)
+
+(* Consume ("-" IDENT)*, appending to buffer; update last_end; diagnose trailing '-' *)
+let rec read_hyphen_chain (p : Parser.t) (buf : Buffer.t)
+    (last_end : Lexing.position ref) : unit =
+  match p.Parser.token with
+  | Minus -> (
+    Parser.next p;
+    (* after '-' *)
+    match peek_ident p with
+    | Some (txt, _loc, _) ->
+      Buffer.add_char buf '-';
+      Buffer.add_string buf txt;
+      (* consume ident *)
+      Parser.next p;
+      last_end := p.prev_end_pos;
+      read_hyphen_chain p buf last_end
+    | None ->
+      (* Match previous behavior: rely on parser's current location *)
+      Parser.err p
+        (Diagnostics.message "JSX identifier cannot end with a hyphen"))
+  | _ -> ()
+
+(* Read local jsx name: returns combined name + loc + kind of head ident *)
+let read_local_jsx_name (p : Parser.t) :
+    (string * Location.t * jsx_ident_kind) option =
+  match expect_ident p with
+  | None -> None
+  | Some (head, head_loc, kind) ->
+    let buf = Buffer.create (String.length head + 8) in
+    Buffer.add_string buf head;
+    let start_pos = head_loc.Location.loc_start in
+    let last_end = ref head_loc.Location.loc_end in
+    read_hyphen_chain p buf last_end;
+    let name = Buffer.contents buf in
+    let loc = mk_loc start_pos !last_end in
+    Some (name, loc, kind)
+
+(* Build a Longident from a non-empty list of segments *)
+let longident_of_segments (segs : string list) : Longident.t =
+  match segs with
+  | [] -> invalid_arg "longident_of_segments: empty list"
+  | hd :: tl ->
+    List.fold_left
+      (fun acc s -> Longident.Ldot (acc, s))
+      (Longident.Lident hd) tl
+
+(* Read a JSX tag name and return a jsx_tag_name; does not mutate tokens beyond what it consumes *)
+let read_jsx_tag_name (p : Parser.t) :
+    (Parsetree.jsx_tag_name Location.loc, string) result =
+  match peek_ident p with
+  | None -> Error ""
+  | Some (_, _, `Lower) ->
+    read_local_jsx_name p
+    |> Option.map (fun (name, loc, _) ->
+           {Location.txt = Parsetree.JsxLowerTag name; loc})
+    |> Option.to_result ~none:""
+  | Some (first_seg, first_loc, `Upper) ->
+    let start_pos = first_loc.Location.loc_start in
+    (* consume first Uident *)
+    Parser.next p;
+    let string_of_rev_segments segs = String.concat "." (List.rev segs) in
+    let rec loop rev_segs last_end =
+      match p.Parser.token with
+      | Dot -> (
+        Parser.next p;
+        (* after '.' *)
+        match peek_ident p with
+        | None ->
+          Parser.err p
+            (Diagnostics.message "expected identifier after '.' in JSX tag name");
+          Error (string_of_rev_segments rev_segs ^ ".")
+        | Some (txt, _loc, `Upper) ->
+          (* another path segment *)
+          Parser.next p;
+          loop (txt :: rev_segs) p.prev_end_pos
+        | Some (_, _, `Lower) -> (
+          (* final lowercase with optional hyphens *)
+          match read_local_jsx_name p with
+          | Some (lname, l_loc, _) -> (
+            match rev_segs with
+            | [] -> Error ""
+            | _ ->
+              let path = longident_of_segments (List.rev rev_segs) in
+              let loc = mk_loc start_pos l_loc.Location.loc_end in
+              Ok
+                {
+                  Location.txt =
+                    Parsetree.JsxQualifiedLowerTag {path; name = lname};
+                  loc;
+                })
+          | None -> Error ""))
+      | _ -> (
+        (* pure Upper path *)
+        match rev_segs with
+        | [] -> Error ""
+        | _ ->
+          let path = longident_of_segments (List.rev rev_segs) in
+          let loc = mk_loc start_pos last_end in
+          Ok {txt = Parsetree.JsxUpperTag path; loc})
+    in
+    (* seed with the first segment already consumed *)
+    loop [first_seg] first_loc.Location.loc_end
+
+(* Parses module identifiers:
+     Foo
+     Foo.Bar *)
+let parse_module_long_ident ~lowercase p =
+  (* Parser.leaveBreadcrumb p Reporting.ModuleLongIdent; *)
+  let start_pos = p.Parser.start_pos in
+  let module_ident =
+    match p.Parser.token with
+    | Lident ident when lowercase ->
+      let loc = mk_loc start_pos p.end_pos in
+      let lident = Longident.Lident ident in
+      Parser.next p;
+      Location.mkloc lident loc
+    | Uident ident -> (
+      let lident = Longident.Lident ident in
+      let end_pos = p.end_pos in
+      Parser.next p;
+      match p.Parser.token with
+      | Dot ->
+        Parser.next p;
+        parse_module_long_ident_tail ~lowercase p start_pos lident
+      | _ -> Location.mkloc lident (mk_loc start_pos end_pos))
+    | t ->
+      Parser.err p (Diagnostics.uident t);
+      Location.mkloc (Longident.Lident "_") (mk_loc start_pos p.prev_end_pos)
+  in
+  (* Parser.eatBreadcrumb p; *)
+  module_ident
+
+(* open-def ::=
+ *   | open module-path
+ *   | open! module-path *)
+let parse_open_description ~attrs p =
+  Parser.leave_breadcrumb p Grammar.OpenDescription;
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Open p;
+  let override =
+    if Parser.optional p Token.Bang then Asttypes.Override else Asttypes.Fresh
+  in
+  let modident = parse_module_long_ident ~lowercase:false p in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Parser.eat_breadcrumb p;
+  Ast_helper.Opn.mk ~loc ~attrs ~override modident
+
+(* constant	::=	integer-literal   *)
+(* ∣	 float-literal   *)
+(* ∣	 string-literal   *)
+let parse_constant p =
+  let is_negative =
+    match p.Parser.token with
+    | Token.Minus ->
+      Parser.next p;
+      true
+    | Plus ->
+      Parser.next p;
+      false
+    | _ -> false
+  in
+  let constant =
+    match p.Parser.token with
+    | Int {i; suffix} ->
+      (* Only decimal literal is allowed for bigint *)
+      if suffix = Some 'n' && not (Bigint_utils.is_valid i) then
+        Parser.err p
+          (Diagnostics.message
+             "Invalid bigint literal. Only decimal literal is allowed for \
+              bigint.");
+      let int_txt = if is_negative then "-" ^ i else i in
+      Parsetree.Pconst_integer (int_txt, suffix)
+    | Float {f; suffix} ->
+      let float_txt = if is_negative then "-" ^ f else f in
+      Parsetree.Pconst_float (float_txt, suffix)
+    | String s ->
+      Pconst_string (s, if p.mode = ParseForTypeChecker then Some "js" else None)
+    | Codepoint {c; original} ->
+      if p.mode = ParseForTypeChecker then Pconst_char c
+      else
+        (* Pconst_char char does not have enough information for formatting.
+         * When parsing for the printer, we encode the char contents as a string
+         * with a special prefix. *)
+        Pconst_string (original, Some "INTERNAL_RES_CHAR_CONTENTS")
+    | token ->
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      Pconst_string ("", None)
+  in
+  Parser.next_unsafe p;
+  constant
+
+let parse_template_constant ~prefix (p : Parser.t) =
+  (* Arrived at the ` char *)
+  let start_pos = p.start_pos in
+  Parser.next_template_literal_token p;
+  match p.token with
+  | TemplateTail (txt, _) ->
+    Parser.next p;
+    Parsetree.Pconst_string (txt, prefix)
+  | _ ->
+    let rec skip_tokens () =
+      if p.token <> Eof then (
+        Parser.next p;
+        match p.token with
+        | Backtick ->
+          Parser.next p;
+          ()
+        | _ -> skip_tokens ())
+    in
+    skip_tokens ();
+    Parser.err ~start_pos ~end_pos:p.prev_end_pos p
+      (Diagnostics.message ErrorMessages.string_interpolation_in_pattern);
+    Pconst_string ("", None)
+
+let parse_comma_delimited_region p ~grammar ~closing ~f =
+  Parser.leave_breadcrumb p grammar;
+  let rec loop nodes =
+    match f p with
+    | Some node -> (
+      match p.Parser.token with
+      | Comma ->
+        Parser.next p;
+        loop (node :: nodes)
+      | token when token = closing || token = Eof -> List.rev (node :: nodes)
+      | _ when Grammar.is_list_element grammar p.token ->
+        (* missing comma between nodes in the region and the current token
+         * looks like the start of something valid in the current region.
+         * Example:
+         *   type student<'extraInfo> = {
+         *     name: string,
+         *     age: int
+         *     otherInfo: 'extraInfo
+         *   }
+         * There is a missing comma between `int` and `otherInfo`.
+         * `otherInfo` looks like a valid start of the record declaration.
+         * We report the error here and then continue parsing the region.
+         *)
+        Parser.expect Comma p;
+        loop (node :: nodes)
+      | _ ->
+        if
+          not
+            (p.token = Eof || p.token = closing
+            || Recover.should_abort_list_parse p)
+        then Parser.expect Comma p;
+        if p.token = Semicolon then Parser.next p;
+        loop (node :: nodes))
+    | None ->
+      if p.token = Eof || p.token = closing || Recover.should_abort_list_parse p
+      then List.rev nodes
+      else (
+        Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
+        Parser.next p;
+        loop nodes)
+  in
+  let nodes = loop [] in
+  Parser.eat_breadcrumb p;
+  nodes
+
+let parse_comma_delimited_reversed_list p ~grammar ~closing ~f =
+  Parser.leave_breadcrumb p grammar;
+  let rec loop nodes =
+    match f p with
+    | Some node -> (
+      match p.Parser.token with
+      | Comma ->
+        Parser.next p;
+        loop (node :: nodes)
+      | token when token = closing || token = Eof -> node :: nodes
+      | _ when Grammar.is_list_element grammar p.token ->
+        (* missing comma between nodes in the region and the current token
+         * looks like the start of something valid in the current region.
+         * Example:
+         *   type student<'extraInfo> = {
+         *     name: string,
+         *     age: int
+         *     otherInfo: 'extraInfo
+         *   }
+         * There is a missing comma between `int` and `otherInfo`.
+         * `otherInfo` looks like a valid start of the record declaration.
+         * We report the error here and then continue parsing the region.
+         *)
+        Parser.expect Comma p;
+        loop (node :: nodes)
+      | _ ->
+        if
+          not
+            (p.token = Eof || p.token = closing
+            || Recover.should_abort_list_parse p)
+        then Parser.expect Comma p;
+        if p.token = Semicolon then Parser.next p;
+        loop (node :: nodes))
+    | None ->
+      if p.token = Eof || p.token = closing || Recover.should_abort_list_parse p
+      then nodes
+      else (
+        Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
+        Parser.next p;
+        loop nodes)
+  in
+  let nodes = loop [] in
+  Parser.eat_breadcrumb p;
+  nodes
+
+let parse_delimited_region p ~grammar ~closing ~f =
+  Parser.leave_breadcrumb p grammar;
+  let rec loop nodes =
+    match f p with
+    | Some node -> loop (node :: nodes)
+    | None ->
+      if
+        p.Parser.token = Token.Eof || p.token = closing
+        || Recover.should_abort_list_parse p
+      then List.rev nodes
+      else (
+        Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
+        Parser.next p;
+        loop nodes)
+  in
+  let nodes = loop [] in
+  Parser.eat_breadcrumb p;
+  nodes
+
+let parse_region p ~grammar ~f =
+  Parser.leave_breadcrumb p grammar;
+  let rec loop nodes =
+    match f p with
+    | Some node -> loop (node :: nodes)
+    | None ->
+      if p.Parser.token = Token.Eof || Recover.should_abort_list_parse p then
+        List.rev nodes
+      else (
+        Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
+        Parser.next p;
+        loop nodes)
+  in
+  let nodes = loop [] in
+  Parser.eat_breadcrumb p;
+  nodes
+
+(* let-binding	::=	pattern =  expr   *)
+(* ∣	 value-name  { parameter }  [: typexpr]  [:> typexpr] =  expr   *)
+(* ∣	 value-name :  poly-typexpr =  expr   *)
+
+(* pattern	::=	value-name   *)
+(* ∣	 _   *)
+(* ∣	 constant   *)
+(* ∣	 pattern as  value-name   *)
+(* ∣	 ( pattern )   *)
+(* ∣	 ( pattern :  typexpr )   *)
+(* ∣	 pattern |  pattern   *)
+(* ∣	 constr  pattern   *)
+(* ∣	 #variant variant-pattern *)
+(* ∣	 #...type  *)
+(* ∣	 / pattern  { , pattern }+  /   *)
+(* ∣	 { field  [: typexpr]  [= pattern] { ; field  [: typexpr]  [= pattern] }  [; _ ] [ ; ] }   *)
+(* ∣	 [ pattern  { ; pattern }  [ ; ] ]   *)
+(* ∣	 pattern ::  pattern   *)
+(* ∣	 [| pattern  { ; pattern }  [ ; ] |]   *)
+(* ∣	 char-literal ..  char-literal *)
+(*	∣	 exception pattern  *)
+let rec parse_pattern ?(alias = true) ?(or_ = true) p =
+  let start_pos = p.Parser.start_pos in
+  let attrs = parse_attributes p in
+  let pat =
+    match p.Parser.token with
+    | (True | False) as token ->
+      let end_pos = p.end_pos in
+      Parser.next p;
+      let loc = mk_loc start_pos end_pos in
+      Ast_helper.Pat.construct ~loc
+        (Location.mkloc (Longident.Lident (Token.to_string token)) loc)
+        None
+    | Int _ | String _ | Float _ | Codepoint _ | Minus | Plus -> (
+      let c = parse_constant p in
+      match p.token with
+      | DotDot ->
+        Parser.next p;
+        let c2 = parse_constant p in
+        Ast_helper.Pat.interval ~loc:(mk_loc start_pos p.prev_end_pos) c c2
+      | _ -> Ast_helper.Pat.constant ~loc:(mk_loc start_pos p.prev_end_pos) c)
+    | Backtick ->
+      let constant = parse_template_constant ~prefix:(Some "js") p in
+      Ast_helper.Pat.constant ~attrs:[template_literal_attr]
+        ~loc:(mk_loc start_pos p.prev_end_pos)
+        constant
+    | Lparen -> (
+      Parser.next p;
+      match p.token with
+      | Rparen ->
+        Parser.next p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let lid = Location.mkloc (Longident.Lident "()") loc in
+        Ast_helper.Pat.construct ~loc lid None
+      | _ -> (
+        let pat = parse_constrained_pattern p in
+        match p.token with
+        | Comma ->
+          Parser.next p;
+          parse_tuple_pattern ~attrs ~first:pat ~start_pos p
+        | _ ->
+          Parser.expect Rparen p;
+          let loc = mk_loc start_pos p.prev_end_pos in
+          {
+            pat with
+            ppat_loc = loc;
+            ppat_attributes = attrs @ pat.Parsetree.ppat_attributes;
+          }))
+    | Lbracket -> parse_array_pattern ~attrs p
+    | Lbrace -> parse_record_pattern ~attrs p
+    | Underscore ->
+      let end_pos = p.end_pos in
+      let loc = mk_loc start_pos end_pos in
+      Parser.next p;
+      Ast_helper.Pat.any ~loc ~attrs ()
+    | Lident ident -> (
+      let end_pos = p.end_pos in
+      let loc = mk_loc start_pos end_pos in
+      Parser.next p;
+      match p.token with
+      | Backtick ->
+        let constant = parse_template_constant ~prefix:(Some ident) p in
+        Ast_helper.Pat.constant ~loc:(mk_loc start_pos p.prev_end_pos) constant
+      | _ -> Ast_helper.Pat.var ~loc ~attrs (Location.mkloc ident loc))
+    | Uident _ -> (
+      let constr = parse_module_long_ident ~lowercase:false p in
+      match p.Parser.token with
+      | Lparen -> parse_constructor_pattern_args p constr start_pos attrs
+      | _ -> Ast_helper.Pat.construct ~loc:constr.loc ~attrs constr None)
+    | DotDotDot ->
+      Parser.next p;
+      let ident = parse_value_path p in
+      let loc = mk_loc start_pos ident.loc.loc_end in
+      Ast_helper.Pat.type_ ~loc
+        ~attrs:(make_pat_variant_spread_attr :: attrs)
+        ident
+    | Hash -> (
+      Parser.next p;
+      if p.Parser.token == DotDotDot then (
+        Parser.next p;
+        let ident = parse_value_path p in
+        let loc = mk_loc start_pos ident.loc.loc_end in
+        Ast_helper.Pat.type_ ~loc ~attrs ident)
+      else
+        let ident, loc =
+          match p.token with
+          | String text ->
+            Parser.next p;
+            (text, mk_loc start_pos p.prev_end_pos)
+          | Int {i; suffix} ->
+            let () =
+              match suffix with
+              | Some _ ->
+                Parser.err p
+                  (Diagnostics.message
+                     (ErrorMessages.poly_var_int_with_suffix i))
+              | None -> ()
+            in
+            Parser.next p;
+            (i, mk_loc start_pos p.prev_end_pos)
+          | Eof ->
+            Parser.err ~start_pos p
+              (Diagnostics.unexpected p.token p.breadcrumbs);
+            ("", mk_loc start_pos p.prev_end_pos)
+          | _ -> parse_ident ~msg:ErrorMessages.variant_ident ~start_pos p
+        in
+        match p.Parser.token with
+        | Lparen -> parse_variant_pattern_args p ident start_pos attrs
+        | _ -> Ast_helper.Pat.variant ~loc ~attrs ident None)
+    | Exception ->
+      Parser.next p;
+      let pat = parse_pattern ~alias:false ~or_:false p in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Pat.exception_ ~loc ~attrs pat
+    | List ->
+      Parser.next p;
+      parse_list_pattern ~start_pos ~attrs p
+    | Dict ->
+      Parser.next p;
+      parse_dict_pattern ~start_pos ~attrs p
+    | Module -> parse_module_pattern ~attrs p
+    | Percent ->
+      let extension = parse_extension p in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Pat.extension ~loc ~attrs extension
+    | Eof ->
+      Parser.err p (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
+      Recover.default_pattern ()
+    | token -> (
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      match
+        skip_tokens_and_maybe_retry p
+          ~is_start_of_grammar:Grammar.is_atomic_pattern_start
+      with
+      | None -> Recover.default_pattern ()
+      | Some () -> parse_pattern p)
+  in
+  let pat = if alias then parse_alias_pattern ~attrs pat p else pat in
+  if or_ then parse_or_pattern pat p else pat
+
+and skip_tokens_and_maybe_retry p ~is_start_of_grammar =
+  if
+    Token.is_keyword p.Parser.token
+    && p.Parser.prev_end_pos.pos_lnum == p.start_pos.pos_lnum
+  then (
+    Parser.next p;
+    None)
+  else if Recover.should_abort_list_parse p then
+    if is_start_of_grammar p.Parser.token then (
+      Parser.next p;
+      Some ())
+    else None
+  else (
+    Parser.next p;
+    let rec loop p =
+      if not (Recover.should_abort_list_parse p) then (
+        Parser.next p;
+        loop p)
+    in
+    loop p;
+    if is_start_of_grammar p.Parser.token then Some () else None)
+
+(* alias ::= pattern as lident *)
+and parse_alias_pattern ~attrs pattern p =
+  match p.Parser.token with
+  | As ->
+    Parser.next p;
+    let name, loc = parse_lident p in
+    let name = Location.mkloc name loc in
+    Ast_helper.Pat.alias
+      ~loc:{pattern.ppat_loc with loc_end = p.prev_end_pos}
+      ~attrs pattern name
+  | _ -> pattern
+
+(* or ::= pattern | pattern
+ * precedence: Red | Blue | Green is interpreted as (Red | Blue) | Green *)
+and parse_or_pattern pattern1 p =
+  let rec loop pattern1 =
+    match p.Parser.token with
+    | Bar ->
+      Parser.next p;
+      let pattern2 = parse_pattern ~or_:false p in
+      let loc =
+        {pattern1.Parsetree.ppat_loc with loc_end = pattern2.ppat_loc.loc_end}
+      in
+      loop (Ast_helper.Pat.or_ ~loc pattern1 pattern2)
+    | _ -> pattern1
+  in
+  loop pattern1
+
+and parse_non_spread_pattern ~msg p =
+  let () =
+    match p.Parser.token with
+    | DotDotDot ->
+      Parser.err p (Diagnostics.message msg);
+      Parser.next p
+    | _ -> ()
+  in
+  match p.Parser.token with
+  | token when Grammar.is_pattern_start token -> (
+    let pat = parse_pattern p in
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      let typ = parse_typ_expr p in
+      let loc = mk_loc pat.ppat_loc.loc_start typ.Parsetree.ptyp_loc.loc_end in
+      Some (Ast_helper.Pat.constraint_ ~loc pat typ)
+    | _ -> Some pat)
+  | _ -> None
+
+and parse_constrained_pattern p =
+  let pat = parse_pattern p in
+  match p.Parser.token with
+  | Colon ->
+    Parser.next p;
+    let typ = parse_typ_expr p in
+    let loc = mk_loc pat.ppat_loc.loc_start typ.Parsetree.ptyp_loc.loc_end in
+    Ast_helper.Pat.constraint_ ~loc pat typ
+  | _ -> pat
+
+and parse_constrained_pattern_region p =
+  match p.Parser.token with
+  | token when Grammar.is_pattern_start token ->
+    Some (parse_constrained_pattern p)
+  | _ -> None
+
+and parse_optional_label p =
+  match p.Parser.token with
+  | Question ->
+    Parser.next p;
+    true
+  | _ -> false
+
+(* field ::=
+ *   | longident
+ *   | longident : pattern
+ *   | longident as lident
+ *
+ *  row ::=
+ *	 | field ,
+ *	 | field , _
+ *	 | field , _,
+ *)
+and parse_record_pattern_row_field ~attrs p =
+  let label = parse_value_path p in
+  let pattern, optional =
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      let optional = parse_optional_label p in
+      let pat = parse_pattern p in
+      (pat, optional)
+    | Equal ->
+      Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+        (Diagnostics.message ErrorMessages.record_pattern_field_missing_colon);
+      Parser.next p;
+      let optional = parse_optional_label p in
+      let pat = parse_pattern p in
+      (pat, optional)
+    | _ ->
+      ( Ast_helper.Pat.var ~loc:label.loc ~attrs
+          (Location.mkloc (Longident.last label.txt) label.loc),
+        false )
+  in
+  {Parsetree.lid = label; x = pattern; opt = optional}
+
+(* TODO: there are better representations than PatField|Underscore ? *)
+and parse_record_pattern_row p =
+  let attrs = parse_attributes p in
+  match p.Parser.token with
+  | DotDotDot ->
+    Parser.next p;
+    Some (true, PatField (parse_record_pattern_row_field ~attrs p))
+  | Uident _ | Lident _ ->
+    Some (false, PatField (parse_record_pattern_row_field ~attrs p))
+  | Question -> (
+    Parser.next p;
+    match p.token with
+    | Uident _ | Lident _ ->
+      let {Parsetree.lid; x = pat} = parse_record_pattern_row_field ~attrs p in
+      Some (false, PatField {lid; x = pat; opt = true})
+    | _ -> None)
+  | Underscore ->
+    Parser.next p;
+    Some (false, PatUnderscore)
+  | _ ->
+    if Token.is_keyword p.token then (
+      match
+        recover_keyword_field_name_if_probably_field p
+          ~mk_message:ErrorMessages.keyword_field_in_pattern
+      with
+      | Some (recovered_field_name, loc) ->
+        Parser.expect Colon p;
+        let optional = parse_optional_label p in
+        let pat = parse_pattern p in
+        let field =
+          Location.mkloc (Longident.Lident recovered_field_name) loc
+        in
+        Some (false, PatField {lid = field; x = pat; opt = optional})
+      | None ->
+        emit_keyword_field_error p
+          ~mk_message:ErrorMessages.keyword_field_in_pattern;
+        None)
+    else None
+
+and parse_record_pattern ~attrs p =
+  let start_pos = p.start_pos in
+  Parser.expect Lbrace p;
+  let raw_fields =
+    parse_comma_delimited_reversed_list p ~grammar:PatternRecord ~closing:Rbrace
+      ~f:parse_record_pattern_row
+  in
+  Parser.expect Rbrace p;
+  let fields, closed_flag =
+    let raw_fields, flag =
+      match raw_fields with
+      | (_hasSpread, PatUnderscore) :: rest -> (rest, Asttypes.Open)
+      | raw_fields -> (raw_fields, Asttypes.Closed)
+    in
+    List.fold_left
+      (fun (fields, flag) curr ->
+        let has_spread, field = curr in
+        match field with
+        | PatField field ->
+          (if has_spread then
+             let pattern = field.x in
+             Parser.err ~start_pos:pattern.Parsetree.ppat_loc.loc_start p
+               (Diagnostics.message ErrorMessages.record_pattern_spread));
+          (field :: fields, flag)
+        | PatUnderscore -> (fields, flag))
+      ([], flag) raw_fields
+  in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Pat.record ~loc ~attrs fields closed_flag
+
+and parse_tuple_pattern ~attrs ~first ~start_pos p =
+  let patterns =
+    first
+    :: parse_comma_delimited_region p ~grammar:Grammar.PatternList
+         ~closing:Rparen ~f:parse_constrained_pattern_region
+  in
+  Parser.expect Rparen p;
+  let () =
+    match patterns with
+    | [_] ->
+      Parser.err ~start_pos ~end_pos:p.prev_end_pos p
+        (Diagnostics.message ErrorMessages.tuple_single_element)
+    | _ -> ()
+  in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Pat.tuple ~loc ~attrs patterns
+
+and parse_pattern_region p =
+  match p.Parser.token with
+  | DotDotDot ->
+    Parser.next p;
+    Some (true, parse_constrained_pattern p)
+  | token when Grammar.is_pattern_start token ->
+    Some (false, parse_constrained_pattern p)
+  | _ -> None
+
+and parse_module_pattern ~attrs p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Module p;
+  Parser.expect Lparen p;
+  let uident =
+    match p.token with
+    | Uident uident ->
+      let loc = mk_loc p.start_pos p.end_pos in
+      Parser.next p;
+      Location.mkloc uident loc
+    | _ ->
+      (* TODO: error recovery *)
+      Location.mknoloc "_"
+  in
+  match p.token with
+  | Colon ->
+    let colon_start = p.Parser.start_pos in
+    Parser.next p;
+    let package_typ_attrs = parse_attributes p in
+    let package_type =
+      parse_package_type ~start_pos:colon_start ~attrs:package_typ_attrs p
+    in
+    Parser.expect Rparen p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    let unpack = Ast_helper.Pat.unpack ~loc:uident.loc uident in
+    Ast_helper.Pat.constraint_ ~loc ~attrs unpack package_type
+  | _ ->
+    Parser.expect Rparen p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Pat.unpack ~loc ~attrs uident
+
+and parse_list_pattern ~start_pos ~attrs p =
+  let list_patterns =
+    parse_comma_delimited_reversed_list p ~grammar:Grammar.PatternOcamlList
+      ~closing:Rbrace ~f:parse_pattern_region
+  in
+  Parser.expect Rbrace p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  let filter_spread (has_spread, pattern) =
+    if has_spread then (
+      Parser.err ~start_pos:pattern.Parsetree.ppat_loc.loc_start p
+        (Diagnostics.message ErrorMessages.list_pattern_spread);
+      pattern)
+    else pattern
+  in
+  match list_patterns with
+  | (true, pattern) :: patterns ->
+    let patterns = patterns |> List.map filter_spread |> List.rev in
+    let pat = make_list_pattern loc patterns (Some pattern) in
+    {pat with ppat_loc = loc; ppat_attributes = attrs}
+  | patterns ->
+    let patterns = patterns |> List.map filter_spread |> List.rev in
+    let pat = make_list_pattern loc patterns None in
+    {pat with ppat_loc = loc; ppat_attributes = attrs}
+
+and parse_dict_pattern_row p =
+  match p.Parser.token with
+  | String s ->
+    let loc = mk_loc p.start_pos p.end_pos in
+    Parser.next p;
+    let fieldName = Location.mkloc (Longident.Lident s) loc in
+    Parser.expect Colon p;
+    let optional = parse_optional_label p in
+    let pat = parse_pattern p in
+    Some {Parsetree.lid = fieldName; x = pat; opt = optional}
+  | _ -> None
+
+and parse_dict_pattern ~start_pos ~attrs (p : Parser.t) =
+  let fields =
+    parse_comma_delimited_region p ~grammar:DictRows ~closing:Rbrace
+      ~f:parse_dict_pattern_row
+  in
+  Parser.expect Rbrace p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Pat.record ~loc
+    ~attrs:((Location.mknoloc "res.dictPattern", PStr []) :: attrs)
+    fields Open
+
+and parse_array_pattern ~attrs p =
+  let start_pos = p.start_pos in
+  Parser.expect Lbracket p;
+  let patterns =
+    parse_comma_delimited_region p ~grammar:Grammar.PatternList
+      ~closing:Rbracket
+      ~f:(parse_non_spread_pattern ~msg:ErrorMessages.array_pattern_spread)
+  in
+  Parser.expect Rbracket p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Pat.array ~loc ~attrs patterns
+
+and parse_constructor_pattern_args p constr start_pos attrs =
+  let lparen = p.start_pos in
+  Parser.expect Lparen p;
+  let args =
+    parse_comma_delimited_region p ~grammar:Grammar.PatternList ~closing:Rparen
+      ~f:parse_constrained_pattern_region
+  in
+  Parser.expect Rparen p;
+  let args =
+    match args with
+    | [] ->
+      let loc = mk_loc lparen p.prev_end_pos in
+      Some
+        (Ast_helper.Pat.construct ~loc
+           (Location.mkloc (Longident.Lident "()") loc)
+           None)
+    | [({ppat_desc = Ppat_tuple _} as pat)] as patterns ->
+      if p.mode = ParseForTypeChecker then
+        (* Some(1, 2) for type-checker *)
+        Some pat
+      else
+        (* Some((1, 2)) for printer *)
+        Some (Ast_helper.Pat.tuple ~loc:(mk_loc lparen p.end_pos) patterns)
+    | [pattern] -> Some pattern
+    | patterns ->
+      Some (Ast_helper.Pat.tuple ~loc:(mk_loc lparen p.end_pos) patterns)
+  in
+  Ast_helper.Pat.construct
+    ~loc:(mk_loc start_pos p.prev_end_pos)
+    ~attrs constr args
+
+and parse_variant_pattern_args p ident start_pos attrs =
+  let lparen = p.start_pos in
+  Parser.expect Lparen p;
+  let patterns =
+    parse_comma_delimited_region p ~grammar:Grammar.PatternList ~closing:Rparen
+      ~f:parse_constrained_pattern_region
+  in
+  let args =
+    match patterns with
+    | [] ->
+      let loc = mk_loc lparen p.prev_end_pos in
+      Some
+        (Ast_helper.Pat.construct ~loc
+           (Location.mkloc (Longident.Lident "()") loc)
+           None)
+    | [({ppat_desc = Ppat_tuple _} as pat)] as patterns ->
+      if p.mode = ParseForTypeChecker then
+        (* #ident(1, 2) for type-checker *)
+        Some pat
+      else
+        (* #ident((1, 2)) for printer *)
+        Some (Ast_helper.Pat.tuple ~loc:(mk_loc lparen p.end_pos) patterns)
+    | [pattern] -> Some pattern
+    | patterns ->
+      Some (Ast_helper.Pat.tuple ~loc:(mk_loc lparen p.end_pos) patterns)
+  in
+  Parser.expect Rparen p;
+  Ast_helper.Pat.variant
+    ~loc:(mk_loc start_pos p.prev_end_pos)
+    ~attrs ident args
+
+and parse_expr ?(context = OrdinaryExpr) p =
+  let expr = parse_operand_expr ~context p in
+  let expr = parse_binary_expr ~context ~a:expr p 1 in
+  parse_ternary_expr expr p
+
+(* expr ? expr : expr *)
+and parse_ternary_expr left_operand p =
+  match p.Parser.token with
+  | Question ->
+    Parser.leave_breadcrumb p Grammar.Ternary;
+    Parser.next p;
+    let true_branch = parse_expr ~context:TernaryTrueBranchExpr p in
+    Parser.expect Colon p;
+    let false_branch = parse_expr p in
+    Parser.eat_breadcrumb p;
+    let loc =
+      {
+        left_operand.Parsetree.pexp_loc with
+        loc_start = left_operand.pexp_loc.loc_start;
+        loc_end = false_branch.Parsetree.pexp_loc.loc_end;
+      }
+    in
+    Ast_helper.Exp.ifthenelse ~attrs:[ternary_attr] ~loc left_operand
+      true_branch (Some false_branch)
+  | _ -> left_operand
+
+and parse_es6_arrow_expression ?(arrow_attrs = []) ?(arrow_start_pos = None)
+    ?context ?term_parameters ~async p =
+  let start_pos = p.Parser.start_pos in
+  Parser.leave_breadcrumb p Grammar.Es6ArrowExpr;
+  (* Parsing function parameters and attributes:
+     1. Basically, attributes outside of `(...)` are added to the function, except
+     the uncurried attribute `(.)` is added to the function. e.g. async, uncurried
+
+     2. Attributes inside `(...)` are added to the arguments regardless of whether
+     labeled, optional or nolabeled *)
+  let parameters =
+    match term_parameters with
+    | Some params -> (None, params)
+    | None -> parse_parameters p
+  in
+  let parameters =
+    let update_attrs attrs = arrow_attrs @ attrs in
+    let update_pos pos =
+      match arrow_start_pos with
+      | Some start_pos -> start_pos
+      | None -> pos
+    in
+    match parameters with
+    | None, termp :: rest ->
+      ( None,
+        {
+          termp with
+          attrs = update_attrs termp.attrs;
+          p_pos = update_pos termp.p_pos;
+        }
+        :: rest )
+    | Some (tpa : fundef_type_param), term_params ->
+      ( Some
+          {
+            tpa with
+            attrs = update_attrs tpa.attrs;
+            p_pos = update_pos tpa.p_pos;
+          },
+        term_params )
+    | _ -> parameters
+  in
+  let return_type =
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      Some (parse_typ_expr ~es6_arrow:false p)
+    | _ -> None
+  in
+  Parser.expect EqualGreater p;
+  let body =
+    let expr = parse_expr ?context p in
+    match return_type with
+    | Some typ ->
+      Ast_helper.Exp.constraint_
+        ~loc:(mk_loc expr.pexp_loc.loc_start typ.Parsetree.ptyp_loc.loc_end)
+        expr typ
+    | None -> expr
+  in
+  Parser.eat_breadcrumb p;
+  let end_pos = p.prev_end_pos in
+  let type_param_opt, term_parameters = parameters in
+  let arrow_expr =
+    List.fold_right
+      (fun parameter expr ->
+        let {attrs; p_label = lbl; expr = default_expr; pat; p_pos = start_pos}
+            =
+          parameter
+        in
+        let loc = mk_loc start_pos end_pos in
+        Ast_helper.Exp.fun_ ~loc ~attrs ~arity:None lbl default_expr pat expr)
+      term_parameters body
+  in
+  let arrow_expr =
+    Ast_uncurried.uncurried_fun
+      ~arity:(List.length term_parameters)
+      ~async arrow_expr
+  in
+  let arrow_expr =
+    match type_param_opt with
+    | None -> arrow_expr
+    | Some {attrs; locs = newtypes; p_pos = start_pos} ->
+      make_newtypes ~attrs ~loc:(mk_loc start_pos end_pos) newtypes arrow_expr
+  in
+  {arrow_expr with pexp_loc = {arrow_expr.pexp_loc with loc_start = start_pos}}
+
+(*
+ * dotted_parameter ::=
+ *   | . parameter
+ *
+ * parameter ::=
+ *   | pattern
+ *   | pattern : type
+ *   | ~ labelName
+ *   | ~ labelName as pattern
+ *   | ~ labelName as pattern : type
+ *   | ~ labelName = expr
+ *   | ~ labelName as pattern = expr
+ *   | ~ labelName as pattern : type = expr
+ *   | ~ labelName = ?
+ *   | ~ labelName as pattern = ?
+ *   | ~ labelName as pattern : type = ?
+ *
+ * labelName ::= lident
+ *)
+and parse_parameter p =
+  if
+    p.Parser.token = Token.Typ || p.token = Tilde || p.token = Dot
+    || Grammar.is_pattern_start p.token
+  then
+    let start_pos = p.Parser.start_pos in
+    let _ =
+      Parser.optional p Token.Dot
+      (* dot is ignored *)
+    in
+    let attrs = parse_attributes p in
+    if p.Parser.token = Typ then (
+      Parser.next p;
+      let lidents = parse_lident_list p in
+      Some (TypeParameter {attrs; locs = lidents; p_pos = start_pos}))
+    else
+      let attrs, lbl, lbl_loc, pat =
+        match p.Parser.token with
+        | Tilde -> (
+          Parser.next p;
+          let lbl_name, lbl_loc = parse_lident p in
+          match p.Parser.token with
+          | Comma | Equal | Rparen ->
+            let loc = mk_loc start_pos p.prev_end_pos in
+            ( [],
+              Asttypes.Labelled {txt = lbl_name; loc = lbl_loc},
+              lbl_loc,
+              Ast_helper.Pat.var ~attrs ~loc (Location.mkloc lbl_name loc) )
+          | Colon ->
+            let lbl_end = p.prev_end_pos in
+            Parser.next p;
+            let typ = parse_typ_expr p in
+            let loc = mk_loc start_pos lbl_end in
+            let pat =
+              let pat = Ast_helper.Pat.var ~loc (Location.mkloc lbl_name loc) in
+              let loc = mk_loc start_pos p.prev_end_pos in
+              Ast_helper.Pat.constraint_ ~attrs ~loc pat typ
+            in
+            ([], Asttypes.Labelled {txt = lbl_name; loc = lbl_loc}, lbl_loc, pat)
+          | As ->
+            Parser.next p;
+            let pat =
+              let pat = parse_constrained_pattern p in
+              {pat with ppat_attributes = attrs @ pat.ppat_attributes}
+            in
+            ([], Asttypes.Labelled {txt = lbl_name; loc = lbl_loc}, lbl_loc, pat)
+          | t ->
+            Parser.err p (Diagnostics.unexpected t p.breadcrumbs);
+            let loc = mk_loc start_pos p.prev_end_pos in
+            ( [],
+              Asttypes.Labelled {txt = lbl_name; loc = lbl_loc},
+              lbl_loc,
+              Ast_helper.Pat.var ~attrs ~loc (Location.mkloc lbl_name loc) ))
+        | _ ->
+          let pattern = parse_constrained_pattern p in
+          let attrs = List.concat [pattern.ppat_attributes; attrs] in
+          ( [],
+            Asttypes.Nolabel,
+            Location.none,
+            {pattern with ppat_attributes = attrs} )
+      in
+      match p.Parser.token with
+      | Equal -> (
+        Parser.next p;
+        let lbl =
+          match lbl with
+          | Asttypes.Labelled lbl_name -> Asttypes.Optional lbl_name
+          | Asttypes.Nolabel ->
+            let lbl_name =
+              match pat.ppat_desc with
+              | Ppat_var var -> var.txt
+              | _ -> ""
+            in
+            Parser.err ~start_pos ~end_pos:p.prev_end_pos p
+              (Diagnostics.message
+                 (ErrorMessages.missing_tilde_labeled_parameter lbl_name));
+            Asttypes.Optional {txt = lbl_name; loc = lbl_loc}
+          | lbl -> lbl
+        in
+        match p.Parser.token with
+        | Question ->
+          Parser.next p;
+          Some
+            (TermParameter
+               {attrs; p_label = lbl; expr = None; pat; p_pos = start_pos})
+        | _ ->
+          let expr = parse_constrained_or_coerced_expr p in
+          Some
+            (TermParameter
+               {attrs; p_label = lbl; expr = Some expr; pat; p_pos = start_pos})
+        )
+      | _ ->
+        Some
+          (TermParameter
+             {attrs; p_label = lbl; expr = None; pat; p_pos = start_pos})
+  else None
+
+and parse_parameter_list p =
+  let parameters =
+    parse_comma_delimited_region ~grammar:Grammar.ParameterList
+      ~f:parse_parameter ~closing:Rparen p
+  in
+  Parser.expect Rparen p;
+  extract_fundef_params ~type_acc:None ~term_acc:[] parameters
+
+(* parameters ::=
+ *   | _
+ *   | lident
+ *   | ()
+ *   | (.)
+ *   | ( parameter {, parameter} [,] )
+ *)
+and parse_parameters p : fundef_type_param option * fundef_term_param list =
+  let start_pos = p.Parser.start_pos in
+  let unit_term_parameter () =
+    let loc = mk_loc start_pos p.Parser.prev_end_pos in
+    let unit_pattern =
+      Ast_helper.Pat.construct ~loc
+        (Location.mkloc (Longident.Lident "()") loc)
+        None
+    in
+    {
+      attrs = [];
+      p_label = Asttypes.Nolabel;
+      expr = None;
+      pat = unit_pattern;
+      p_pos = start_pos;
+    }
+  in
+  match p.Parser.token with
+  | Lident ident ->
+    Parser.next p;
+    let loc = mk_loc start_pos p.Parser.prev_end_pos in
+    ( None,
+      [
+        {
+          attrs = [];
+          p_label = Asttypes.Nolabel;
+          expr = None;
+          pat = Ast_helper.Pat.var ~loc (Location.mkloc ident loc);
+          p_pos = start_pos;
+        };
+      ] )
+  | Underscore ->
+    Parser.next p;
+    let loc = mk_loc start_pos p.Parser.prev_end_pos in
+    ( None,
+      [
+        {
+          attrs = [];
+          p_label = Asttypes.Nolabel;
+          expr = None;
+          pat = Ast_helper.Pat.any ~loc ();
+          p_pos = start_pos;
+        };
+      ] )
+  | Lparen ->
+    Parser.next p;
+    ignore (Parser.optional p Dot);
+    let type_params, term_params = parse_parameter_list p in
+    let term_params =
+      if term_params <> [] then term_params else [unit_term_parameter ()]
+    in
+    (type_params, term_params)
+  | token ->
+    Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+    (None, [])
+
+and parse_coerced_expr ~(expr : Parsetree.expression) p =
+  Parser.expect ColonGreaterThan p;
+  let typ = parse_typ_expr p in
+  let loc = mk_loc expr.pexp_loc.loc_start p.prev_end_pos in
+  Ast_helper.Exp.coerce ~loc expr typ
+
+and parse_constrained_or_coerced_expr p =
+  let expr = parse_expr p in
+  match p.Parser.token with
+  | ColonGreaterThan -> parse_coerced_expr ~expr p
+  | Colon -> (
+    Parser.next p;
+    match p.token with
+    | _ -> (
+      let typ = parse_typ_expr p in
+      let loc = mk_loc expr.pexp_loc.loc_start typ.ptyp_loc.loc_end in
+      let expr = Ast_helper.Exp.constraint_ ~loc expr typ in
+      match p.token with
+      | ColonGreaterThan -> parse_coerced_expr ~expr p
+      | _ -> expr))
+  | _ -> expr
+
+and parse_constrained_expr_region p =
+  match p.Parser.token with
+  | token when Grammar.is_expr_start token -> (
+    let expr = parse_expr p in
+    match p.Parser.token with
+    | ColonGreaterThan -> Some (parse_coerced_expr ~expr p)
+    | Colon ->
+      Parser.next p;
+      let typ = parse_typ_expr p in
+      let loc = mk_loc expr.pexp_loc.loc_start typ.ptyp_loc.loc_end in
+      Some (Ast_helper.Exp.constraint_ ~loc expr typ)
+    | _ -> Some expr)
+  | _ -> None
+
+and parse_regex ~start_pos p pattern flags =
+  Parser.next p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  let payload =
+    Parsetree.PStr
+      [
+        Ast_helper.Str.eval ~loc
+          (Ast_helper.Exp.constant ~loc
+             (Pconst_string
+                ( "/" ^ pattern ^ "/" ^ flags,
+                  if p.mode = ParseForTypeChecker then Some "js" else None )));
+      ]
+  in
+  Ast_helper.Exp.extension (Location.mkloc "re" loc, payload)
+
+(* Atomic expressions represent unambiguous expressions.
+ * This means that regardless of the context, these expressions
+ * are always interpreted correctly. *)
+and parse_atomic_expr p =
+  Parser.leave_breadcrumb p Grammar.ExprOperand;
+  let start_pos = p.Parser.start_pos in
+  let expr =
+    match p.Parser.token with
+    | (True | False) as token ->
+      Parser.next p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Exp.construct ~loc
+        (Location.mkloc (Longident.Lident (Token.to_string token)) loc)
+        None
+    | Int _ | String _ | Float _ | Codepoint _ ->
+      let c = parse_constant p in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Exp.constant ~loc c
+    | Backtick ->
+      let expr = parse_template_expr p in
+      {expr with pexp_loc = mk_loc start_pos p.prev_end_pos}
+    | Uident _ | Lident _ -> parse_value_or_constructor p
+    | Hash -> parse_poly_variant_expr p
+    | Lparen -> (
+      Parser.next p;
+      match p.Parser.token with
+      | Rparen ->
+        Parser.next p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        Ast_helper.Exp.construct ~loc
+          (Location.mkloc (Longident.Lident "()") loc)
+          None
+      | _t -> (
+        let expr = parse_constrained_or_coerced_expr p in
+        match p.token with
+        | Comma ->
+          Parser.next p;
+          parse_tuple_expr ~start_pos ~first:expr p
+        | _ ->
+          Parser.expect Rparen p;
+          expr
+        (* {expr with pexp_loc = mkLoc startPos p.prevEndPos}
+         * What does this location mean here? It means that when there's
+         * a parenthesized we keep the location here for whitespace interleaving.
+         * Without the closing paren in the location there will always be an extra
+         * line. For now we don't include it, because it does weird things
+         * with for comments. *)))
+    | List ->
+      Parser.next p;
+      parse_list_expr ~start_pos p
+    | Dict ->
+      Parser.next p;
+      parse_dict_expr ~start_pos p
+    | Module ->
+      Parser.next p;
+      parse_first_class_module_expr ~start_pos p
+    | Lbracket -> parse_array_exp p
+    | Lbrace -> parse_braced_or_record_expr p
+    | LessThan -> parse_jsx p
+    | Percent ->
+      let extension = parse_extension p in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Exp.extension ~loc extension
+    | Underscore as token ->
+      (* This case is for error recovery. Not sure if it's the correct place *)
+      Parser.err p (Diagnostics.lident token);
+      Parser.next p;
+      Recover.default_expr ()
+    | Eof ->
+      Parser.err ~start_pos:p.prev_end_pos p
+        (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
+      Recover.default_expr ()
+    | Forwardslash -> (
+      Parser.next_regex_token p;
+      match p.token with
+      | Regex (pattern, flags) -> parse_regex ~start_pos p pattern flags
+      | _ -> Ast_helper.Exp.extension (Location.mknoloc "re", Parsetree.PStr [])
+      )
+    | ForwardslashDot -> (
+      Parser.next_regex_token p;
+      match p.token with
+      | Regex (pattern, flags) -> parse_regex ~start_pos p ("." ^ pattern) flags
+      | _ -> Ast_helper.Exp.extension (Location.mknoloc "re", Parsetree.PStr [])
+      )
+    | token -> (
+      let err_pos = p.prev_end_pos in
+      Parser.err ~start_pos:err_pos p
+        (Diagnostics.unexpected token p.breadcrumbs);
+      match
+        skip_tokens_and_maybe_retry p
+          ~is_start_of_grammar:Grammar.is_atomic_expr_start
+      with
+      | None -> Recover.default_expr ()
+      | Some () -> parse_atomic_expr p)
+  in
+  Parser.eat_breadcrumb p;
+  expr
+
+(* module(module-expr)
+ * module(module-expr : package-type) *)
+and parse_first_class_module_expr ~start_pos p =
+  Parser.expect Lparen p;
+
+  let mod_expr = parse_module_expr p in
+  let mod_end_loc = p.prev_end_pos in
+  match p.Parser.token with
+  | Colon ->
+    let colon_start = p.Parser.start_pos in
+    Parser.next p;
+    let attrs = parse_attributes p in
+    let package_type = parse_package_type ~start_pos:colon_start ~attrs p in
+    Parser.expect Rparen p;
+    let loc = mk_loc start_pos mod_end_loc in
+    let first_class_module = Ast_helper.Exp.pack ~loc mod_expr in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Exp.constraint_ ~loc first_class_module package_type
+  | _ ->
+    Parser.expect Rparen p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Exp.pack ~loc mod_expr
+
+and parse_bracket_access p expr start_pos =
+  Parser.leave_breadcrumb p Grammar.ExprArrayAccess;
+  let lbracket = p.start_pos in
+  Parser.expect Lbracket p;
+  let string_start = p.start_pos in
+  match p.Parser.token with
+  | String s -> (
+    Parser.next p;
+    let string_end = p.prev_end_pos in
+    Parser.expect Rbracket p;
+    Parser.eat_breadcrumb p;
+    let rbracket = p.prev_end_pos in
+    let e =
+      let ident_loc = mk_loc string_start string_end in
+      let loc = mk_loc start_pos rbracket in
+      Ast_helper.Exp.send ~loc expr (Location.mkloc s ident_loc)
+    in
+    let e = parse_primary_expr ~operand:e p in
+    let equal_start = p.start_pos in
+    match p.token with
+    | Equal ->
+      Parser.next p;
+      let equal_end = p.prev_end_pos in
+      let rhs_expr = parse_expr p in
+      let loc = mk_loc start_pos rhs_expr.pexp_loc.loc_end in
+      let operator_loc = mk_loc equal_start equal_end in
+      Ast_helper.Exp.apply ~loc
+        (Ast_helper.Exp.ident ~loc:operator_loc
+           (Location.mkloc (Longident.Lident "#=") operator_loc))
+        [(Nolabel, e); (Nolabel, rhs_expr)]
+    | _ -> e)
+  | _ -> (
+    let access_expr = parse_constrained_or_coerced_expr p in
+    Parser.expect Rbracket p;
+    Parser.eat_breadcrumb p;
+    let rbracket = p.prev_end_pos in
+    let array_loc = mk_loc lbracket rbracket in
+    match p.token with
+    | Equal ->
+      Parser.leave_breadcrumb p ExprArrayMutation;
+      Parser.next p;
+      let rhs_expr = parse_expr p in
+      (* FIXME: Do not implicitly rely on specific module name, even primitive one
+
+         This can be abused like
+           module Array = MyModule
+
+         Find better mechanism to support it
+      *)
+      let array_set =
+        Location.mkloc (Longident.Ldot (Lident "Array", "set")) array_loc
+      in
+      let end_pos = p.prev_end_pos in
+      let array_set =
+        Ast_helper.Exp.apply ~loc:(mk_loc start_pos end_pos)
+          (Ast_helper.Exp.ident ~loc:array_loc array_set)
+          [(Nolabel, expr); (Nolabel, access_expr); (Nolabel, rhs_expr)]
+      in
+      Parser.eat_breadcrumb p;
+      array_set
+    | _ ->
+      let end_pos = p.prev_end_pos in
+      let e =
+        Ast_helper.Exp.apply ~loc:(mk_loc start_pos end_pos)
+          (Ast_helper.Exp.ident ~loc:array_loc
+             (Location.mkloc (Longident.Ldot (Lident "Array", "get")) array_loc))
+          [(Nolabel, expr); (Nolabel, access_expr)]
+      in
+      parse_primary_expr ~operand:e p)
+
+(* * A primary expression represents
+ *  - atomic-expr
+ *  - john.age
+ *  - array[0]
+ *  - applyFunctionTo(arg1, arg2)
+ *
+ *  The "operand" represents the expression that is operated on
+ *)
+and parse_primary_expr ~operand ?(no_call = false) p =
+  let start_pos = operand.pexp_loc.loc_start in
+  let rec loop p expr =
+    match p.Parser.token with
+    | Dot -> (
+      Parser.next p;
+      let lident = parse_value_path_after_dot p in
+      match p.Parser.token with
+      | Equal when no_call = false ->
+        Parser.leave_breadcrumb p Grammar.ExprSetField;
+        Parser.next p;
+        let target_expr = parse_expr p in
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let setfield = Ast_helper.Exp.setfield ~loc expr lident target_expr in
+        Parser.eat_breadcrumb p;
+        setfield
+      | _ ->
+        let end_pos = p.prev_end_pos in
+        let loc = mk_loc start_pos end_pos in
+        loop p (Ast_helper.Exp.field ~loc expr lident))
+    | Lbracket
+      when no_call = false && p.prev_end_pos.pos_lnum == p.start_pos.pos_lnum ->
+      parse_bracket_access p expr start_pos
+    | Lparen
+      when no_call = false && p.prev_end_pos.pos_lnum == p.start_pos.pos_lnum ->
+      loop p (parse_call_expr p expr)
+    | Backtick
+      when no_call = false && p.prev_end_pos.pos_lnum == p.start_pos.pos_lnum
+      -> (
+      match expr.pexp_desc with
+      | Pexp_ident long_ident -> parse_template_expr ~prefix:long_ident p
+      | _ ->
+        Parser.err ~start_pos:expr.pexp_loc.loc_start
+          ~end_pos:expr.pexp_loc.loc_end p
+          (Diagnostics.message
+             "Tagged template literals are currently restricted to names like: \
+              myTagFunction`foo ${bar}`.");
+        parse_template_expr p)
+    | _ -> expr
+  in
+  loop p operand
+
+(* a unary expression is an expression with only one operand and
+ * unary operator. Examples:
+ *   -1
+ *   !condition
+ *   -. 1.6
+ *)
+and parse_unary_expr p =
+  let start_pos = p.Parser.start_pos in
+  match p.Parser.token with
+  | (Minus | MinusDot | Plus | PlusDot | Bang | Bnot) as token ->
+    Parser.leave_breadcrumb p Grammar.ExprUnary;
+    let token_end = p.end_pos in
+    Parser.next p;
+    let operand = parse_unary_expr p in
+    let unary_expr = make_unary_expr start_pos token_end token operand in
+    Parser.eat_breadcrumb p;
+    unary_expr
+  | _ -> parse_primary_expr ~operand:(parse_atomic_expr p) p
+
+(* Represents an "operand" in a binary expression.
+ * If you have `a + b`, `a` and `b` both represent
+ * the operands of the binary expression with opeartor `+` *)
+and parse_operand_expr ~context p =
+  let start_pos = p.Parser.start_pos in
+  let attrs = ref (parse_attributes p) in
+  let expr =
+    match p.Parser.token with
+    | Assert ->
+      Parser.next p;
+      let expr = parse_expr p in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Exp.assert_ ~loc expr
+    | Lident "async"
+    (* we need to be careful when we're in a ternary true branch:
+       `condition ? ternary-true-branch : false-branch`
+       Arrow expressions could be of the form: `async (): int => stuff()`
+       But if we're in a ternary, the `:` of the ternary takes precedence
+    *)
+      when is_es6_arrow_expression
+             ~in_ternary:(context = TernaryTrueBranchExpr)
+             p ->
+      let arrow_attrs = !attrs in
+      let () = attrs := [] in
+      parse_async_arrow_expression ~arrow_attrs p
+    | Await -> parse_await_expression p
+    | Try -> parse_try_expression p
+    | If -> parse_if_or_if_let_expression p
+    | For -> parse_for_expression p
+    | While -> parse_while_expression p
+    | Switch -> parse_switch_expression p
+    | _ ->
+      if
+        context != WhenExpr
+        && is_es6_arrow_expression
+             ~in_ternary:(context = TernaryTrueBranchExpr)
+             p
+      then
+        let arrow_attrs = !attrs in
+        let () = attrs := [] in
+        parse_es6_arrow_expression ~async:false ~arrow_attrs ~context p
+      else parse_unary_expr p
+  in
+  (* let endPos = p.Parser.prevEndPos in *)
+  {
+    expr with
+    pexp_attributes = List.concat [expr.Parsetree.pexp_attributes; !attrs];
+    (* pexp_loc = mkLoc startPos endPos *)
+  }
+
+(* a binary expression is an expression that combines two expressions with an
+ * operator. Examples:
+ *    a + b
+ *    f(x) |> g(y)
+ *)
+and parse_binary_expr ?(context = OrdinaryExpr) ?a p prec =
+  let a =
+    match a with
+    | Some e -> e
+    | None -> parse_operand_expr ~context p
+  in
+  let rec loop a =
+    let token = p.Parser.token in
+    let token_prec =
+      match token with
+      (* Can the minus be interpreted as a binary operator? Or is it a unary?
+       * let w = {
+       *   x
+       *   -10
+       * }
+       * vs
+       * let w = {
+       *   width
+       *   - gap
+       * }
+       *
+       * First case is unary, second is a binary operator.
+       * See Scanner.isBinaryOp *)
+      | (Minus | MinusDot | LessThan | Percent)
+        when (not
+                (Scanner.is_binary_op p.scanner.src p.start_pos.pos_cnum
+                   p.end_pos.pos_cnum))
+             && p.start_pos.pos_lnum > p.prev_end_pos.pos_lnum ->
+        -1
+      | token -> Token.precedence token
+    in
+    if token_prec < prec then a
+    else (
+      Parser.leave_breadcrumb p (Grammar.ExprBinaryAfterOp token);
+      let start_pos = p.start_pos in
+      Parser.next p;
+      let end_pos = p.prev_end_pos in
+      let token_prec =
+        (* exponentiation operator is right-associative *)
+        if token = Exponentiation then token_prec else token_prec + 1
+      in
+      let b = parse_binary_expr ~context p token_prec in
+      let loc = mk_loc a.Parsetree.pexp_loc.loc_start b.pexp_loc.loc_end in
+      let expr =
+        Ast_helper.Exp.apply ~loc
+          (make_infix_operator p token start_pos end_pos)
+          [(Nolabel, a); (Nolabel, b)]
+      in
+      Parser.eat_breadcrumb p;
+      loop expr)
+  in
+  loop a
+
+(* If we even need this, determines if < might be the start of jsx. Not 100% complete *)
+(* and isStartOfJsx p = *)
+(* Parser.lookahead p (fun p -> *)
+(* match p.Parser.token with *)
+(* | LessThan -> *)
+(* Parser.next p; *)
+(* begin match p.token with *)
+(* | GreaterThan (* <> *) -> true *)
+(* | Lident _ | Uident _ | List -> *)
+(* ignore (parseJsxName p); *)
+(* begin match p.token with *)
+(* | GreaterThan (* <div> *) -> true *)
+(* | Question (*<Component ? *) -> true *)
+(* | Lident _ | List -> *)
+(* Parser.next p; *)
+(* begin match p.token with *)
+(* | Equal (* <Component handleClick= *) -> true *)
+(* | _ -> false (* TODO *) *)
+(* end *)
+(* | Forwardslash (* <Component / *)-> *)
+(* Parser.next p; *)
+(* begin match p.token with *)
+(* | GreaterThan (* <Component /> *) -> true *)
+(* | _ -> false *)
+(* end *)
+(* | _ -> *)
+(* false *)
+(* end *)
+(* | _ -> false *)
+(* end *)
+(* | _ -> false *)
+(* ) *)
+
+and parse_template_expr ?prefix p =
+  let part_prefix =
+    (* we could stop treating json prefix as something special
+       but we would first need to remove @as(json`true`) feature *)
+    match prefix with
+    | Some {txt = Longident.Lident ("json" as prefix); _} -> Some prefix
+    | _ -> Some "js"
+  in
+
+  let parse_parts p =
+    let rec aux acc =
+      let start_pos = p.Parser.start_pos in
+      Parser.next_template_literal_token p;
+      match p.token with
+      | TemplateTail (txt, last_pos) ->
+        Parser.next p;
+        let loc = mk_loc start_pos last_pos in
+        let str =
+          Ast_helper.Exp.constant ~attrs:[template_literal_attr] ~loc
+            (Pconst_string (txt, part_prefix))
+        in
+        List.rev ((str, None) :: acc)
+      | TemplatePart (txt, last_pos) ->
+        Parser.next p;
+        let loc = mk_loc start_pos last_pos in
+        let expr = parse_expr_block p in
+        let str =
+          Ast_helper.Exp.constant ~attrs:[template_literal_attr] ~loc
+            (Pconst_string (txt, part_prefix))
+        in
+        aux ((str, Some expr) :: acc)
+      | token ->
+        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+        []
+    in
+    aux []
+  in
+  let parts = parse_parts p in
+  let strings = List.map fst parts in
+  let values = Ext_list.filter_map parts snd in
+
+  let gen_tagged_template_call (lident_loc : Longident.t Location.loc) =
+    let ident = Ast_helper.Exp.ident ~attrs:[] ~loc:lident_loc.loc lident_loc in
+    let strings_array =
+      Ast_helper.Exp.array ~attrs:[] ~loc:Location.none strings
+    in
+    let values_array =
+      Ast_helper.Exp.array ~attrs:[] ~loc:Location.none values
+    in
+    Ast_helper.Exp.apply
+      ~attrs:[tagged_template_literal_attr]
+      ~loc:lident_loc.loc ident
+      [(Nolabel, strings_array); (Nolabel, values_array)]
+  in
+
+  let hidden_operator =
+    let op = Location.mknoloc (Longident.Lident "++") in
+    Ast_helper.Exp.ident op
+  in
+  let concat (e1 : Parsetree.expression) (e2 : Parsetree.expression) =
+    let loc = mk_loc e1.pexp_loc.loc_start e2.pexp_loc.loc_end in
+    Ast_helper.Exp.apply ~attrs:[template_literal_attr] ~loc hidden_operator
+      [(Nolabel, e1); (Nolabel, e2)]
+  in
+  let gen_interpolated_string () =
+    let subparts =
+      List.flatten
+        (List.map
+           (fun part ->
+             match part with
+             | s, Some v -> [s; v]
+             | s, None -> [s])
+           parts)
+    in
+    let expr_option =
+      List.fold_left
+        (fun acc subpart ->
+          Some
+            (match acc with
+            | Some expr -> concat expr subpart
+            | None -> subpart))
+        None subparts
+    in
+    match expr_option with
+    | Some expr -> expr
+    | None -> Ast_helper.Exp.constant (Pconst_string ("", None))
+  in
+
+  match prefix with
+  | Some {txt = Longident.Lident "json"; _} | None -> gen_interpolated_string ()
+  | Some lident_loc -> gen_tagged_template_call lident_loc
+
+(* Overparse: let f = a : int => a + 1, is it (a : int) => or (a): int =>
+ * Also overparse constraints:
+ *  let x = {
+ *    let a = 1
+ *    a + pi: int
+ *  }
+ *
+ *  We want to give a nice error message in these cases
+ *)
+and over_parse_constrained_or_coerced_or_arrow_expression p expr =
+  match p.Parser.token with
+  | ColonGreaterThan -> parse_coerced_expr ~expr p
+  | Colon -> (
+    Parser.next p;
+    let typ = parse_typ_expr ~es6_arrow:false p in
+    match p.Parser.token with
+    | EqualGreater ->
+      Parser.next p;
+      let body = parse_expr p in
+      let pat, expr_is_unit =
+        match expr.pexp_desc with
+        | Pexp_ident longident ->
+          ( Ast_helper.Pat.var ~loc:expr.pexp_loc
+              (Location.mkloc
+                 (Longident.flatten longident.txt |> String.concat ".")
+                 longident.loc),
+            false )
+        | Pexp_construct (({txt = Longident.Lident "()"} as lid), None) ->
+          (Ast_helper.Pat.construct ~loc:expr.pexp_loc lid None, true)
+        (* TODO: can we convert more expressions to patterns?*)
+        | _ ->
+          ( Ast_helper.Pat.var ~loc:expr.pexp_loc
+              (Location.mkloc "pattern" expr.pexp_loc),
+            false )
+      in
+      let arrow1 =
+        Ast_helper.Exp.fun_
+          ~loc:(mk_loc expr.pexp_loc.loc_start body.pexp_loc.loc_end)
+          ~arity:None Asttypes.Nolabel None pat
+          (Ast_helper.Exp.constraint_ body typ)
+      in
+      (* When the "expr" was `()`, the colon must apply to the return type, so
+         skip the ambiguity diagnostic and keep the parameter as unit. *)
+      if expr_is_unit then arrow1
+      else
+        let arrow2 =
+          Ast_helper.Exp.fun_
+            ~loc:(mk_loc expr.pexp_loc.loc_start body.pexp_loc.loc_end)
+            ~arity:None Asttypes.Nolabel None
+            (Ast_helper.Pat.constraint_ pat typ)
+            body
+        in
+        let msg =
+          Doc.breakable_group ~force_break:true
+            (Doc.concat
+               [
+                 Doc.text
+                   "Did you mean to annotate the parameter type or the return \
+                    type?";
+                 Doc.indent
+                   (Doc.concat
+                      [
+                        Doc.line;
+                        Doc.text "1) ";
+                        ResPrinter.print_expression arrow1 CommentTable.empty;
+                        Doc.line;
+                        Doc.text "2) ";
+                        ResPrinter.print_expression arrow2 CommentTable.empty;
+                      ]);
+               ])
+          |> Doc.to_string ~width:80
+        in
+        Parser.err ~start_pos:expr.pexp_loc.loc_start
+          ~end_pos:body.pexp_loc.loc_end p (Diagnostics.message msg);
+        arrow1
+    | _ ->
+      let loc = mk_loc expr.pexp_loc.loc_start typ.ptyp_loc.loc_end in
+      let expr = Ast_helper.Exp.constraint_ ~loc expr typ in
+      let () =
+        Parser.err ~start_pos:expr.pexp_loc.loc_start
+          ~end_pos:typ.ptyp_loc.loc_end p
+          (Diagnostics.message
+             (Doc.breakable_group ~force_break:true
+                (Doc.concat
+                   [
+                     Doc.text
+                       "Expressions with type constraints need to be wrapped \
+                        in parens:";
+                     Doc.indent
+                       (Doc.concat
+                          [
+                            Doc.line;
+                            ResPrinter.add_parens
+                              (ResPrinter.print_expression expr
+                                 CommentTable.empty);
+                          ]);
+                   ])
+             |> Doc.to_string ~width:80))
+      in
+      expr)
+  | _ -> expr
+
+and parse_let_binding_body ~start_pos ~attrs p =
+  Parser.begin_region p;
+  Parser.leave_breadcrumb p Grammar.LetBinding;
+  let pat, exp =
+    Parser.leave_breadcrumb p Grammar.Pattern;
+    let pat = parse_pattern p in
+    Parser.eat_breadcrumb p;
+    match p.Parser.token with
+    | Colon -> (
+      Parser.next p;
+      match p.token with
+      | Typ ->
+        (* locally abstract types *)
+        Parser.next p;
+        let newtypes = parse_lident_list p in
+        Parser.expect Dot p;
+        let typ = parse_typ_expr p in
+        Parser.expect Equal p;
+        let expr = parse_expr p in
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let exp, poly = wrap_type_annotation ~loc newtypes typ expr in
+        let pat = Ast_helper.Pat.constraint_ ~loc pat poly in
+        (pat, exp)
+      | _ ->
+        let poly_type = parse_poly_type_expr p in
+        let loc =
+          {pat.ppat_loc with loc_end = poly_type.Parsetree.ptyp_loc.loc_end}
+        in
+        let pat = Ast_helper.Pat.constraint_ ~loc pat poly_type in
+        Parser.expect Token.Equal p;
+        let exp = parse_expr p in
+        let exp = over_parse_constrained_or_coerced_or_arrow_expression p exp in
+        (pat, exp))
+    | _ ->
+      Parser.expect Token.Equal p;
+      let exp =
+        over_parse_constrained_or_coerced_or_arrow_expression p (parse_expr p)
+      in
+      (pat, exp)
+  in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  let vb = Ast_helper.Vb.mk ~loc ~attrs pat exp in
+  Parser.eat_breadcrumb p;
+  Parser.end_region p;
+  vb
+
+(* TODO: find a better way? Is it possible?
+ * let a = 1
+ * @attr
+ * and b = 2
+ *
+ * The problem is that without semi we need a lookahead to determine
+ * if the attr is on the letbinding or the start of a new thing
+ *
+ * let a = 1
+ * @attr
+ * let b = 1
+ *
+ * Here @attr should attach to something "new": `let b = 1`
+ * The parser state is forked, which is quite expensive…
+ *)
+and parse_attributes_and_binding (p : Parser.t) =
+  let err = p.scanner.err in
+  let ch = p.scanner.ch in
+  let offset = p.scanner.offset in
+  let offset16 = p.scanner.offset16 in
+  let line_offset = p.scanner.line_offset in
+  let lnum = p.scanner.lnum in
+  let mode = p.scanner.mode in
+  let token = p.token in
+  let start_pos = p.start_pos in
+  let end_pos = p.end_pos in
+  let prev_end_pos = p.prev_end_pos in
+  let breadcrumbs = p.breadcrumbs in
+  let errors = p.errors in
+  let diagnostics = p.diagnostics in
+  let comments = p.comments in
+
+  match p.Parser.token with
+  | At | DocComment (_, _) -> (
+    let attrs = parse_attributes p in
+    match p.Parser.token with
+    | And -> attrs
+    | _ ->
+      p.scanner.err <- err;
+      p.scanner.ch <- ch;
+      p.scanner.offset <- offset;
+      p.scanner.offset16 <- offset16;
+      p.scanner.line_offset <- line_offset;
+      p.scanner.lnum <- lnum;
+      p.scanner.mode <- mode;
+      p.token <- token;
+      p.start_pos <- start_pos;
+      p.end_pos <- end_pos;
+      p.prev_end_pos <- prev_end_pos;
+      p.breadcrumbs <- breadcrumbs;
+      p.errors <- errors;
+      p.diagnostics <- diagnostics;
+      p.comments <- comments;
+      [])
+  | _ -> []
+
+(* definition	::=	let [rec] let-binding  { and let-binding }   *)
+and parse_let_bindings ~unwrap ~attrs ~start_pos p =
+  Parser.optional p (Let {unwrap}) |> ignore;
+  let rec_flag =
+    if Parser.optional p Token.Rec then Asttypes.Recursive
+    else Asttypes.Nonrecursive
+  in
+  let end_pos = p.Parser.start_pos in
+  if rec_flag = Asttypes.Recursive && unwrap then
+    Parser.err ~start_pos ~end_pos p
+      (Diagnostics.message ErrorMessages.experimental_let_unwrap_rec);
+  let add_unwrap_attr ~unwrap ~start_pos ~end_pos attrs =
+    if unwrap then
+      ( {Asttypes.txt = "let.unwrap"; loc = mk_loc start_pos end_pos},
+        Ast_payload.empty )
+      :: attrs
+    else attrs
+  in
+  let attrs = add_unwrap_attr ~unwrap ~start_pos ~end_pos attrs in
+  let first = parse_let_binding_body ~start_pos ~attrs p in
+
+  let rec loop p bindings =
+    let start_pos = p.Parser.start_pos in
+    let end_pos = p.Parser.end_pos in
+    let attrs = parse_attributes_and_binding p in
+    let attrs = add_unwrap_attr ~unwrap ~start_pos ~end_pos attrs in
+    match p.Parser.token with
+    | And ->
+      Parser.next p;
+      ignore (Parser.optional p (Let {unwrap = false}));
+      (* overparse for fault tolerance *)
+      let let_binding = parse_let_binding_body ~start_pos ~attrs p in
+      loop p (let_binding :: bindings)
+    | _ -> List.rev bindings
+  in
+  (rec_flag, loop p [first])
+
+and parse_jsx_name p : Parsetree.jsx_tag_name Location.loc =
+  match read_jsx_tag_name p with
+  | Ok name -> name
+  | Error invalid_str ->
+    let msg =
+      "A jsx name must be a lowercase or uppercase name, like: div in <div /> \
+       or Navbar in <Navbar />"
+    in
+    Parser.err p (Diagnostics.message msg);
+    {txt = Parsetree.JsxTagInvalid invalid_str; loc = Location.none}
+
+and parse_jsx_opening_or_self_closing_element (* start of the opening < *)
+    ~start_pos p : Parsetree.expression =
+  let name = parse_jsx_name p in
+  let jsx_props = parse_jsx_props p in
+  match p.Parser.token with
+  | Forwardslash ->
+    (* <foo a=b /> *)
+    Parser.next p;
+    let jsx_end_pos = p.end_pos in
+    Parser.expect GreaterThan p;
+    let loc = mk_loc start_pos jsx_end_pos in
+    Ast_helper.Exp.jsx_unary_element ~loc name jsx_props
+  | GreaterThan -> (
+    (* <foo a=b> bar </foo> *)
+    let opening_tag_end = p.Parser.start_pos in
+    Parser.next p;
+    let children = parse_jsx_children p in
+    let closing_tag_start =
+      match p.token with
+      | LessThan when Scanner.peekSlash p.scanner ->
+        let pos = p.start_pos in
+        (* Move to slash *)
+        Parser.next p;
+        (* Move to ident *)
+        Parser.next p;
+        Some pos
+      | token when Grammar.is_structure_item_start token -> None
+      | _ ->
+        Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+          (Diagnostics.message "Did you forget a `</` here?");
+        None
+    in
+    (* Read the closing tag name and verify it matches the opening name *)
+    let token0 = p.Parser.token in
+    match token0 with
+    | Lident _ | Uident _ -> (
+      (* Consume the closing name without mutating tokens beforehand *)
+      let closing_name_res = read_jsx_tag_name p in
+      match closing_name_res with
+      | Ok closing_name
+        when Ast_helper.Jsx.longident_of_jsx_tag_name closing_name.txt
+             = Ast_helper.Jsx.longident_of_jsx_tag_name name.txt ->
+        let end_tag_name = closing_name in
+        let closing_tag_end = p.start_pos in
+        Parser.expect GreaterThan p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let closing_tag =
+          closing_tag_start
+          |> Option.map (fun closing_tag_start ->
+                 {
+                   Parsetree.jsx_closing_container_tag_start = closing_tag_start;
+                   jsx_closing_container_tag_name = end_tag_name;
+                   jsx_closing_container_tag_end = closing_tag_end;
+                 })
+        in
+        Ast_helper.Exp.jsx_container_element ~loc name jsx_props opening_tag_end
+          children closing_tag
+      | _ ->
+        let () =
+          if Grammar.is_structure_item_start token0 then (
+            let closing =
+              "</" ^ Ast_helper.Jsx.string_of_jsx_tag_name name.txt ^ ">"
+            in
+            let msg = Diagnostics.message ("Missing " ^ closing) in
+            Parser.err ~start_pos ~end_pos:p.prev_end_pos p msg;
+            (* We attempted to read a closing name; consume the '>' to keep AST shape stable *)
+            Parser.expect GreaterThan p)
+          else
+            let opening =
+              "</" ^ Ast_helper.Jsx.string_of_jsx_tag_name name.txt ^ ">"
+            in
+            let msg =
+              "Closing jsx name should be the same as the opening name. Did \
+               you mean " ^ opening ^ " ?"
+            in
+            Parser.err ~start_pos ~end_pos:p.prev_end_pos p
+              (Diagnostics.message msg);
+            (* read_jsx_tag_name already consumed the name; expect the '>') *)
+            Parser.expect GreaterThan p
+        in
+        let end_tag_name =
+          match closing_name_res with
+          | Ok closing_name -> closing_name
+          | Error invalid_str ->
+            {txt = Parsetree.JsxTagInvalid invalid_str; loc = Location.none}
+        in
+        let closing_tag_end = p.prev_end_pos in
+        let closing_tag =
+          closing_tag_start
+          |> Option.map (fun closing_tag_start ->
+                 {
+                   Parsetree.jsx_closing_container_tag_start = closing_tag_start;
+                   jsx_closing_container_tag_name = end_tag_name;
+                   jsx_closing_container_tag_end = closing_tag_end;
+                 })
+        in
+        Ast_helper.Exp.jsx_container_element
+          ~loc:(mk_loc start_pos p.prev_end_pos)
+          name jsx_props opening_tag_end children closing_tag)
+    | token ->
+      let () =
+        if Grammar.is_structure_item_start token then
+          let closing =
+            "</" ^ Ast_helper.Jsx.string_of_jsx_tag_name name.txt ^ ">"
+          in
+          let msg = Diagnostics.message ("Missing " ^ closing) in
+          Parser.err ~start_pos ~end_pos:p.prev_end_pos p msg
+        else
+          let opening =
+            "</" ^ Ast_helper.Jsx.string_of_jsx_tag_name name.txt ^ ">"
+          in
+          let msg =
+            "Closing jsx name should be the same as the opening name. Did you \
+             mean " ^ opening ^ " ?"
+          in
+          Parser.err ~start_pos ~end_pos:p.prev_end_pos p
+            (Diagnostics.message msg)
+      in
+      Ast_helper.Exp.jsx_container_element
+        ~loc:(mk_loc start_pos p.prev_end_pos)
+        name jsx_props opening_tag_end children None)
+  | token ->
+    Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+    Ast_helper.Exp.jsx_unary_element
+      ~loc:(mk_loc start_pos p.prev_end_pos)
+      name jsx_props
+
+(*
+ *  jsx ::=
+ *    | <> jsx-children </>
+ *    | <element-name {jsx-prop} />
+ *    | <element-name {jsx-prop}> jsx-children </element-name>
+ *
+ *  jsx-children ::= primary-expr*          * => 0 or more
+ *)
+and parse_jsx p =
+  Parser.leave_breadcrumb p Grammar.Jsx;
+  let start_pos = p.Parser.start_pos in
+  Parser.expect LessThan p;
+  let jsx_expr =
+    match p.Parser.token with
+    | Lident _ | Uident _ ->
+      parse_jsx_opening_or_self_closing_element ~start_pos p
+    | GreaterThan ->
+      (* fragment: <> foo </> *)
+      parse_jsx_fragment start_pos p
+    | _ ->
+      let tag_name = parse_jsx_name p in
+      let (loc : Location.t) = tag_name.loc in
+      let lid = Ast_helper.Jsx.longident_of_jsx_tag_name tag_name.txt in
+      Ast_helper.Exp.ident ~loc (Location.mkloc lid loc)
+  in
+  Parser.eat_breadcrumb p;
+  jsx_expr
+
+(*
+ * jsx-fragment ::=
+ *  | <> </>
+ *  | <> jsx-children </>
+ *)
+and parse_jsx_fragment start_pos p =
+  let children_start_pos = p.Parser.start_pos in
+  Parser.expect GreaterThan p;
+  let children = parse_jsx_children p in
+  let children_end_pos = p.Parser.start_pos in
+  Parser.expect LessThan p;
+  Parser.expect Forwardslash p;
+  let end_pos = p.Parser.end_pos in
+  Parser.expect GreaterThan p;
+  (* location is from starting < till closing >  *)
+  let loc = mk_loc start_pos end_pos in
+  Ast_helper.Exp.jsx_fragment ~attrs:[] ~loc children_start_pos children
+    children_end_pos
+
+(*
+ * jsx-prop ::=
+ *   |  lident
+ *   | ?lident
+ *   |  lident =  jsx_expr
+ *   |  lident = ?jsx_expr
+ *   |  {...jsx_expr}
+ *)
+and parse_jsx_prop p : Parsetree.jsx_prop option =
+  match p.Parser.token with
+  | Question | Lident _ -> (
+    let optional = Parser.optional p Question in
+    (* allow hyphens inside prop names by reading a local jsx name *)
+    match read_local_jsx_name p with
+    | Some (name, loc, `Lower) -> (
+      if optional then Some (Parsetree.JSXPropPunning (true, {txt = name; loc}))
+      else
+        match p.Parser.token with
+        | Equal ->
+          Parser.next p;
+          let optional = Parser.optional p Question in
+          let attr_expr = parse_primary_expr ~operand:(parse_atomic_expr p) p in
+          Some (Parsetree.JSXPropValue ({txt = name; loc}, optional, attr_expr))
+        | _ -> Some (Parsetree.JSXPropPunning (false, {txt = name; loc})))
+    | Some (_name, _loc, `Upper) ->
+      Parser.err p (Diagnostics.message "JSX prop names must be lowercase");
+      None
+    | None -> None)
+  (* {...props} *)
+  | Lbrace -> (
+    let spread_start = p.Parser.start_pos in
+    Parser.next p;
+    match p.Parser.token with
+    | DotDotDot -> (
+      Parser.next p;
+      let attr_expr = parse_primary_expr ~operand:(parse_expr p) p in
+      match p.Parser.token with
+      | Rbrace ->
+        let spread_end = p.Parser.end_pos in
+        let loc = mk_loc spread_start spread_end in
+        Parser.next p;
+        Some (Parsetree.JSXPropSpreading (loc, attr_expr))
+        (* Some (label, attr_expr) *)
+      | _ -> None)
+    | _ -> None)
+  | _ -> None
+
+and parse_jsx_props p : Parsetree.jsx_prop list =
+  parse_region ~grammar:Grammar.JsxAttribute ~f:parse_jsx_prop p
+
+and parse_jsx_children p : Parsetree.jsx_children =
+  let rec loop p children =
+    match p.Parser.token with
+    | Token.Eof -> children
+    | LessThan when Scanner.peekSlash p.scanner -> children
+    | LessThan ->
+      (* Imagine: <div> <Navbar /> <
+       * is `<` the start of a jsx-child? <div …
+       * or is it the start of a closing tag?  </div>
+       * reconsiderLessThan peeks at the next token and
+       * determines the correct token to disambiguate *)
+      let child =
+        parse_primary_expr ~operand:(parse_atomic_expr p) ~no_call:true p
+      in
+      loop p (child :: children)
+    | token when Grammar.is_jsx_child_start token ->
+      let child =
+        parse_primary_expr ~operand:(parse_atomic_expr p) ~no_call:true p
+      in
+      loop p (child :: children)
+    | _ -> children
+  in
+  match p.Parser.token with
+  | DotDotDot ->
+    Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+      (Diagnostics.message ErrorMessages.spread_children_no_longer_supported);
+    Parser.next p;
+    [parse_primary_expr ~operand:(parse_atomic_expr p) ~no_call:true p]
+  | _ -> List.rev (loop p [])
+
+and parse_braced_or_record_expr p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Lbrace p;
+  match p.Parser.token with
+  | token when Token.is_keyword token -> (
+    match
+      recover_keyword_field_name_if_probably_field p
+        ~mk_message:ErrorMessages.keyword_field_in_expr
+    with
+    | Some (recovered_field_name, loc) ->
+      Parser.expect Colon p;
+      let optional = parse_optional_label p in
+      let field_expr = parse_expr p in
+      let field = Location.mkloc (Longident.Lident recovered_field_name) loc in
+      let first_row = {Parsetree.lid = field; x = field_expr; opt = optional} in
+      let expr = parse_record_expr ~start_pos [first_row] p in
+      Parser.expect Rbrace p;
+      expr
+    | None ->
+      let expr = parse_expr_block p in
+      Parser.expect Rbrace p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      let braces = make_braces_attr loc in
+      {expr with pexp_attributes = braces :: expr.pexp_attributes})
+  | Rbrace ->
+    Parser.next p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Exp.record ~loc [] None
+  | DotDotDot ->
+    (* beginning of record spread, parse record *)
+    Parser.next p;
+    let spread_expr = parse_constrained_or_coerced_expr p in
+    Parser.expect Comma p;
+    let expr = parse_record_expr ~start_pos ~spread:(Some spread_expr) [] p in
+    Parser.expect Rbrace p;
+    expr
+  | String s -> (
+    let field =
+      let loc = mk_loc p.start_pos p.end_pos in
+      Parser.next p;
+      Location.mkloc (Longident.Lident s) loc
+    in
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      let field_expr = parse_expr p in
+      Parser.optional p Comma |> ignore;
+      let expr =
+        parse_record_expr_with_string_keys ~start_pos
+          {Parsetree.lid = field; x = field_expr; opt = false}
+          p
+      in
+      Parser.expect Rbrace p;
+      expr
+    | Equal ->
+      Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+        (Diagnostics.message ErrorMessages.record_field_missing_colon);
+      Parser.next p;
+      let field_expr = parse_expr p in
+      Parser.optional p Comma |> ignore;
+      let expr =
+        parse_record_expr_with_string_keys ~start_pos
+          {Parsetree.lid = field; x = field_expr; opt = false}
+          p
+      in
+      Parser.expect Rbrace p;
+      expr
+    | _ -> (
+      let tag = if p.mode = ParseForTypeChecker then Some "js" else None in
+      let constant =
+        Ast_helper.Exp.constant ~loc:field.loc
+          (Parsetree.Pconst_string (s, tag))
+      in
+      let a = parse_primary_expr ~operand:constant p in
+      let e = parse_binary_expr ~a p 1 in
+      let e = parse_ternary_expr e p in
+      match p.Parser.token with
+      | Semicolon ->
+        let expr = parse_expr_block ~first:e p in
+        Parser.expect Rbrace p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let braces = make_braces_attr loc in
+        {
+          expr with
+          Parsetree.pexp_attributes = braces :: expr.Parsetree.pexp_attributes;
+        }
+      | Rbrace ->
+        Parser.next p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let braces = make_braces_attr loc in
+        {e with pexp_attributes = braces :: e.pexp_attributes}
+      | _ ->
+        let expr = parse_expr_block ~first:e p in
+        Parser.expect Rbrace p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let braces = make_braces_attr loc in
+        {expr with pexp_attributes = braces :: expr.pexp_attributes}))
+  | Question ->
+    let expr = parse_record_expr ~start_pos [] p in
+    Parser.expect Rbrace p;
+    expr
+  (*
+    The branch below takes care of the "braced" expression {async}.
+    The big reason that we need all these branches is that {x} isn't a record with a punned field x, but a braced expression… There's lots of "ambiguity" between a record with a single punned field and a braced expression…
+    What is {x}?
+      1) record {x: x}
+      2) expression x which happens to wrapped in braces
+    Due to historical reasons, we always follow 2
+  *)
+  | Lident "async" when is_es6_arrow_expression ~in_ternary:false p ->
+    let expr = parse_async_arrow_expression p in
+    let expr = parse_expr_block ~first:expr p in
+    Parser.expect Rbrace p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    let braces = make_braces_attr loc in
+    {expr with pexp_attributes = braces :: expr.pexp_attributes}
+  | Uident _ | Lident _ -> (
+    let start_token = p.token in
+    let value_or_constructor = parse_value_or_constructor p in
+    match value_or_constructor.pexp_desc with
+    | Pexp_ident path_ident -> (
+      let ident_end_pos = p.prev_end_pos in
+      match p.Parser.token with
+      | Comma ->
+        Parser.next p;
+        let value_or_constructor =
+          match start_token with
+          | Uident _ ->
+            remove_module_name_from_punned_field_value value_or_constructor
+          | _ -> value_or_constructor
+        in
+        let expr =
+          parse_record_expr ~start_pos
+            [
+              {Parsetree.lid = path_ident; x = value_or_constructor; opt = false};
+            ]
+            p
+        in
+        Parser.expect Rbrace p;
+        expr
+      | Colon -> (
+        Parser.next p;
+        let optional = parse_optional_label p in
+        let field_expr = parse_expr p in
+        match p.token with
+        | Rbrace ->
+          Parser.next p;
+          let loc = mk_loc start_pos p.prev_end_pos in
+          Ast_helper.Exp.record ~loc
+            [{lid = path_ident; x = field_expr; opt = optional}]
+            None
+        | _ ->
+          Parser.expect Comma p;
+          let expr =
+            parse_record_expr ~start_pos
+              [{lid = path_ident; x = field_expr; opt = optional}]
+              p
+          in
+          Parser.expect Rbrace p;
+          expr)
+      | Equal -> (
+        Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+          (Diagnostics.message ErrorMessages.record_field_missing_colon);
+        Parser.next p;
+        let optional = parse_optional_label p in
+        let field_expr = parse_expr p in
+        match p.Parser.token with
+        | Rbrace ->
+          Parser.next p;
+          let loc = mk_loc start_pos p.prev_end_pos in
+          Ast_helper.Exp.record ~loc
+            [{lid = path_ident; x = field_expr; opt = optional}]
+            None
+        | _ ->
+          Parser.expect Comma p;
+          let expr =
+            parse_record_expr ~start_pos
+              [{lid = path_ident; x = field_expr; opt = optional}]
+              p
+          in
+          Parser.expect Rbrace p;
+          expr)
+      (* error case *)
+      | Lident _ ->
+        if p.prev_end_pos.pos_lnum < p.start_pos.pos_lnum then (
+          Parser.expect Comma p;
+          let expr =
+            parse_record_expr ~start_pos
+              [{lid = path_ident; x = value_or_constructor; opt = false}]
+              p
+          in
+          Parser.expect Rbrace p;
+          expr)
+        else (
+          Parser.expect Colon p;
+          let expr =
+            parse_record_expr ~start_pos
+              [{lid = path_ident; x = value_or_constructor; opt = false}]
+              p
+          in
+          Parser.expect Rbrace p;
+          expr)
+      | Semicolon ->
+        let expr =
+          parse_expr_block ~first:(Ast_helper.Exp.ident path_ident) p
+        in
+        Parser.expect Rbrace p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let braces = make_braces_attr loc in
+        {expr with pexp_attributes = braces :: expr.pexp_attributes}
+      | Rbrace ->
+        Parser.next p;
+        let expr = Ast_helper.Exp.ident ~loc:path_ident.loc path_ident in
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let braces = make_braces_attr loc in
+        {expr with pexp_attributes = braces :: expr.pexp_attributes}
+      | EqualGreater -> (
+        let loc = mk_loc start_pos ident_end_pos in
+        let ident = Location.mkloc (Longident.last path_ident.txt) loc in
+        let a =
+          parse_es6_arrow_expression ~async:false
+            ~term_parameters:
+              [
+                {
+                  attrs = [];
+                  p_label = Nolabel;
+                  expr = None;
+                  pat = Ast_helper.Pat.var ~loc:ident.loc ident;
+                  p_pos = start_pos;
+                };
+              ]
+            p
+        in
+        let e = parse_binary_expr ~a p 1 in
+        let e = parse_ternary_expr e p in
+        match p.Parser.token with
+        | Semicolon ->
+          let expr = parse_expr_block ~first:e p in
+          Parser.expect Rbrace p;
+          let loc = mk_loc start_pos p.prev_end_pos in
+          let braces = make_braces_attr loc in
+          {expr with pexp_attributes = braces :: expr.pexp_attributes}
+        | Rbrace ->
+          Parser.next p;
+          let loc = mk_loc start_pos p.prev_end_pos in
+          let braces = make_braces_attr loc in
+          {e with pexp_attributes = braces :: e.pexp_attributes}
+        | _ ->
+          let expr = parse_expr_block ~first:e p in
+          Parser.expect Rbrace p;
+          let loc = mk_loc start_pos p.prev_end_pos in
+          let braces = make_braces_attr loc in
+          {expr with pexp_attributes = braces :: expr.pexp_attributes})
+      | _ -> (
+        Parser.leave_breadcrumb p Grammar.ExprBlock;
+        let a =
+          parse_primary_expr
+            ~operand:(Ast_helper.Exp.ident ~loc:path_ident.loc path_ident)
+            p
+        in
+        let e = parse_binary_expr ~a p 1 in
+        let e = parse_ternary_expr e p in
+        Parser.eat_breadcrumb p;
+        match p.Parser.token with
+        | Semicolon ->
+          let expr = parse_expr_block ~first:e p in
+          Parser.expect Rbrace p;
+          let loc = mk_loc start_pos p.prev_end_pos in
+          let braces = make_braces_attr loc in
+          {expr with pexp_attributes = braces :: expr.pexp_attributes}
+        | Rbrace ->
+          Parser.next p;
+          let loc = mk_loc start_pos p.prev_end_pos in
+          let braces = make_braces_attr loc in
+          {e with pexp_attributes = braces :: e.pexp_attributes}
+        | _ ->
+          let expr = parse_expr_block ~first:e p in
+          Parser.expect Rbrace p;
+          let loc = mk_loc start_pos p.prev_end_pos in
+          let braces = make_braces_attr loc in
+          {expr with pexp_attributes = braces :: expr.pexp_attributes}))
+    | _ -> (
+      Parser.leave_breadcrumb p Grammar.ExprBlock;
+      let a = parse_primary_expr ~operand:value_or_constructor p in
+      let e = parse_binary_expr ~a p 1 in
+      let e = parse_ternary_expr e p in
+      Parser.eat_breadcrumb p;
+      match p.Parser.token with
+      | Semicolon ->
+        let expr = parse_expr_block ~first:e p in
+        Parser.expect Rbrace p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let braces = make_braces_attr loc in
+        {expr with pexp_attributes = braces :: expr.pexp_attributes}
+      | Rbrace ->
+        Parser.next p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let braces = make_braces_attr loc in
+        {e with pexp_attributes = braces :: e.pexp_attributes}
+      | _ ->
+        let expr = parse_expr_block ~first:e p in
+        Parser.expect Rbrace p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let braces = make_braces_attr loc in
+        {expr with pexp_attributes = braces :: expr.pexp_attributes}))
+  | _ ->
+    let expr = parse_expr_block p in
+    Parser.expect Rbrace p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    let braces = make_braces_attr loc in
+    {expr with pexp_attributes = braces :: expr.pexp_attributes}
+
+and parse_record_expr_row_with_string_key p :
+    Parsetree.expression Parsetree.record_element option =
+  match p.Parser.token with
+  | String s -> (
+    let loc = mk_loc p.start_pos p.end_pos in
+    Parser.next p;
+    let field = Location.mkloc (Longident.Lident s) loc in
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      let field_expr = parse_expr p in
+      Some {lid = field; x = field_expr; opt = false}
+    | Equal ->
+      Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+        (Diagnostics.message ErrorMessages.record_field_missing_colon);
+      Parser.next p;
+      let field_expr = parse_expr p in
+      Some {lid = field; x = field_expr; opt = false}
+    | _ ->
+      Some
+        {
+          lid = field;
+          x = Ast_helper.Exp.ident ~loc:field.loc field;
+          opt = false;
+        })
+  | _ -> None
+
+and parse_record_expr_row p :
+    Parsetree.expression Parsetree.record_element option =
+  let attrs = parse_attributes p in
+  let () =
+    match p.Parser.token with
+    | Token.DotDotDot ->
+      Parser.err p (Diagnostics.message ErrorMessages.record_expr_spread);
+      Parser.next p
+    | _ -> ()
+  in
+  match p.Parser.token with
+  | Lident _ | Uident _ -> (
+    let start_token = p.token in
+    let field = parse_value_path p in
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      let optional = parse_optional_label p in
+      let field_expr = parse_expr p in
+      Some {lid = field; x = field_expr; opt = optional}
+    | Equal ->
+      Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+        (Diagnostics.message ErrorMessages.record_field_missing_colon);
+      Parser.next p;
+      let optional = parse_optional_label p in
+      let field_expr = parse_expr p in
+      Some {lid = field; x = field_expr; opt = optional}
+    | _ ->
+      let value = Ast_helper.Exp.ident ~loc:field.loc ~attrs field in
+      let value =
+        match start_token with
+        | Uident _ -> remove_module_name_from_punned_field_value value
+        | _ -> value
+      in
+      Some {lid = field; x = value; opt = false})
+  | Question -> (
+    Parser.next p;
+    match p.Parser.token with
+    | Lident _ | Uident _ ->
+      let start_token = p.token in
+      let field = parse_value_path p in
+      let value = Ast_helper.Exp.ident ~loc:field.loc ~attrs field in
+      let value =
+        match start_token with
+        | Uident _ -> remove_module_name_from_punned_field_value value
+        | _ -> value
+      in
+      Some {lid = field; x = value; opt = true}
+    | _ -> None)
+  | _ ->
+    if Token.is_keyword p.token then (
+      match
+        recover_keyword_field_name_if_probably_field p
+          ~mk_message:ErrorMessages.keyword_field_in_expr
+      with
+      | Some (recovered_field_name, loc) ->
+        Parser.expect Colon p;
+        let optional = parse_optional_label p in
+        let field_expr = parse_expr p in
+        let field =
+          Location.mkloc (Longident.Lident recovered_field_name) loc
+        in
+        Some {lid = field; x = field_expr; opt = optional}
+      | None ->
+        emit_keyword_field_error p
+          ~mk_message:ErrorMessages.keyword_field_in_expr;
+        None)
+    else None
+
+and parse_dict_expr_row p =
+  match p.Parser.token with
+  | DotDotDot ->
+    Parser.err p (Diagnostics.message ErrorMessages.dict_expr_spread);
+    Parser.next p;
+    (* Parse the expr so it's consumed *)
+    let _spread_expr = parse_constrained_or_coerced_expr p in
+    None
+  | String s -> (
+    let loc = mk_loc p.start_pos p.end_pos in
+    Parser.next p;
+    let field = Location.mkloc (Longident.Lident s) loc in
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      let fieldExpr = parse_expr p in
+      Some (field, fieldExpr)
+    | Equal ->
+      Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+        (Diagnostics.message ErrorMessages.dict_field_missing_colon);
+      Parser.next p;
+      let fieldExpr = parse_expr p in
+      Some (field, fieldExpr)
+    | _ -> Some (field, Ast_helper.Exp.ident ~loc:field.loc field))
+  | _ -> None
+
+and parse_record_expr_with_string_keys ~start_pos first_row p =
+  let rows =
+    first_row
+    :: parse_comma_delimited_region ~grammar:Grammar.RecordRowsStringKey
+         ~closing:Rbrace ~f:parse_record_expr_row_with_string_key p
+  in
+  let loc = mk_loc start_pos p.end_pos in
+  let record_str_expr =
+    Ast_helper.Str.eval ~loc (Ast_helper.Exp.record ~loc rows None)
+  in
+  Ast_helper.Exp.extension ~loc
+    (Location.mkloc "obj" loc, Parsetree.PStr [record_str_expr])
+
+and parse_record_expr ~start_pos ?(spread = None) rows p =
+  let exprs =
+    parse_comma_delimited_region ~grammar:Grammar.RecordRows ~closing:Rbrace
+      ~f:parse_record_expr_row p
+  in
+  let rows = rows @ exprs in
+  let () =
+    match rows with
+    | [] ->
+      let msg = "Record spread needs at least one field that's updated" in
+      Parser.err p (Diagnostics.message msg)
+    | _rows -> ()
+  in
+  let loc = mk_loc start_pos p.end_pos in
+  Ast_helper.Exp.record ~loc rows spread
+
+and parse_newline_or_semicolon_expr_block p =
+  match p.Parser.token with
+  | Semicolon -> Parser.next p
+  | token when Grammar.is_block_expr_start token ->
+    if p.prev_end_pos.pos_lnum < p.start_pos.pos_lnum then ()
+    else
+      Parser.err ~start_pos:p.prev_end_pos ~end_pos:p.end_pos p
+        (Diagnostics.message
+           "consecutive expressions on a line must be separated by ';' or a \
+            newline")
+  | _ -> ()
+
+and parse_expr_block_item p =
+  let start_pos = p.Parser.start_pos in
+  let attrs = parse_attributes p in
+  match p.Parser.token with
+  | Module -> (
+    Parser.next p;
+    match p.token with
+    | Lparen ->
+      let expr = parse_first_class_module_expr ~start_pos p in
+      let a = parse_primary_expr ~operand:expr p in
+      let expr = parse_binary_expr ~a p 1 in
+      parse_ternary_expr expr p
+    | _ ->
+      let name =
+        match p.Parser.token with
+        | Uident ident ->
+          let loc = mk_loc p.start_pos p.end_pos in
+          Parser.next p;
+          Location.mkloc ident loc
+        | t ->
+          Parser.err p (Diagnostics.uident t);
+          Location.mknoloc "_"
+      in
+      let body = parse_module_binding_body p in
+      parse_newline_or_semicolon_expr_block p;
+      let expr = parse_expr_block p in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Exp.letmodule ~loc name body expr)
+  | Exception ->
+    let extension_constructor = parse_exception_def ~attrs p in
+    parse_newline_or_semicolon_expr_block p;
+    let block_expr = parse_expr_block p in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Exp.letexception ~loc extension_constructor block_expr
+  | Open ->
+    let od = parse_open_description ~attrs p in
+    parse_newline_or_semicolon_expr_block p;
+    let block_expr = parse_expr_block p in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Exp.open_ ~loc od.popen_override od.popen_lid block_expr
+  | Let {unwrap} ->
+    let rec_flag, let_bindings =
+      parse_let_bindings ~unwrap ~attrs ~start_pos p
+    in
+    parse_newline_or_semicolon_expr_block p;
+    let next =
+      if Grammar.is_block_expr_start p.Parser.token then parse_expr_block p
+      else
+        let loc = mk_loc p.start_pos p.end_pos in
+        Ast_helper.Exp.construct ~loc
+          (Location.mkloc (Longident.Lident "()") loc)
+          None
+    in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Exp.let_ ~loc rec_flag let_bindings next
+  | Typ ->
+    (* Parse to be able to give a good error message. *)
+    let type_start = start_pos in
+    Parser.begin_region p;
+    let _ = parse_type_definition_or_extension ~attrs p in
+    Parser.end_region p;
+    Parser.err ~start_pos:type_start ~end_pos:p.prev_end_pos p
+      (Diagnostics.message ErrorMessages.type_definition_in_function);
+    parse_newline_or_semicolon_expr_block p;
+    parse_expr_block p
+  | _ ->
+    let e1 =
+      let expr = parse_expr p in
+      {expr with pexp_attributes = List.concat [attrs; expr.pexp_attributes]}
+    in
+    parse_newline_or_semicolon_expr_block p;
+    if Grammar.is_block_expr_start p.Parser.token then
+      let e2 = parse_expr_block p in
+      let loc = {e1.pexp_loc with loc_end = e2.pexp_loc.loc_end} in
+      Ast_helper.Exp.sequence ~loc e1 e2
+    else e1
+
+(* blockExpr ::= expr
+ *            |  expr          ;
+ *            |  expr          ; blockExpr
+ *            |  module    ... ; blockExpr
+ *            |  open      ... ; blockExpr
+ *            |  exception ... ; blockExpr
+ *            |  let       ...
+ *            |  let       ... ;
+ *            |  let       ... ; blockExpr
+ *
+ *  note: semi should be made optional
+ *  a block of expression is always
+ *)
+and parse_expr_block ?first p =
+  Parser.leave_breadcrumb p Grammar.ExprBlock;
+  let item =
+    match first with
+    | Some e -> e
+    | None -> parse_expr_block_item p
+  in
+  parse_newline_or_semicolon_expr_block p;
+  let block_expr =
+    if Grammar.is_block_expr_start p.Parser.token then
+      let next = parse_expr_block_item p in
+      let loc = {item.pexp_loc with loc_end = next.pexp_loc.loc_end} in
+      Ast_helper.Exp.sequence ~loc item next
+    else item
+  in
+  Parser.eat_breadcrumb p;
+  over_parse_constrained_or_coerced_or_arrow_expression p block_expr
+
+and parse_async_arrow_expression ?(arrow_attrs = []) p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect (Lident "async") p;
+  parse_es6_arrow_expression ~async:true ~arrow_attrs
+    ~arrow_start_pos:(Some start_pos) p
+
+and parse_await_expression p =
+  let await_loc = mk_loc p.Parser.start_pos p.end_pos in
+  Parser.expect Await p;
+  let token_prec = Token.precedence MinusGreater in
+  let expr = parse_binary_expr ~context:OrdinaryExpr p token_prec in
+  Ast_helper.Exp.await
+    ~loc:{expr.pexp_loc with loc_start = await_loc.loc_start}
+    ~attrs:[] expr
+
+and parse_try_expression p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Try p;
+  let expr = parse_expr ~context:WhenExpr p in
+  Parser.expect Res_token.catch p;
+  Parser.expect Lbrace p;
+  let cases = parse_pattern_matching p in
+  Parser.expect Rbrace p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Exp.try_ ~loc expr cases
+
+and parse_if_condition p =
+  Parser.leave_breadcrumb p Grammar.IfCondition;
+  (* doesn't make sense to try es6 arrow here? *)
+  let condition_expr = parse_expr ~context:WhenExpr p in
+  Parser.eat_breadcrumb p;
+  condition_expr
+
+and parse_then_branch p =
+  Parser.leave_breadcrumb p IfBranch;
+  Parser.expect Lbrace p;
+  let then_expr = parse_expr_block p in
+  Parser.expect Rbrace p;
+  Parser.eat_breadcrumb p;
+  then_expr
+
+and parse_else_branch p =
+  Parser.expect Lbrace p;
+  let block_expr = parse_expr_block p in
+  Parser.expect Rbrace p;
+  block_expr
+
+and parse_if_expr start_pos p =
+  let condition_expr = parse_if_condition p in
+  let then_expr = parse_then_branch p in
+  let else_expr =
+    match p.Parser.token with
+    | Else ->
+      Parser.end_region p;
+      Parser.leave_breadcrumb p Grammar.ElseBranch;
+      Parser.next p;
+      Parser.begin_region p;
+      let else_expr =
+        match p.token with
+        | If -> parse_if_or_if_let_expression p
+        | _ -> parse_else_branch p
+      in
+      Parser.eat_breadcrumb p;
+      Parser.end_region p;
+      Some else_expr
+    | _ ->
+      Parser.end_region p;
+      None
+  in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Exp.ifthenelse ~loc condition_expr then_expr else_expr
+
+and parse_if_let_expr start_pos p =
+  let pattern = parse_pattern p in
+  Parser.expect Equal p;
+  let condition_expr = parse_if_condition p in
+  let then_expr = parse_then_branch p in
+  let else_expr =
+    match p.Parser.token with
+    | Else ->
+      Parser.end_region p;
+      Parser.leave_breadcrumb p Grammar.ElseBranch;
+      Parser.next p;
+      Parser.begin_region p;
+      let else_expr =
+        match p.token with
+        | If -> parse_if_or_if_let_expression p
+        | _ -> parse_else_branch p
+      in
+      Parser.eat_breadcrumb p;
+      Parser.end_region p;
+      else_expr
+    | _ ->
+      Parser.end_region p;
+      let start_pos = p.Parser.start_pos in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Exp.construct ~loc
+        (Location.mkloc (Longident.Lident "()") loc)
+        None
+  in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Exp.match_
+    ~attrs:[if_let_attr; suppress_fragile_match_warning_attr]
+    ~loc condition_expr
+    [
+      Ast_helper.Exp.case pattern then_expr;
+      Ast_helper.Exp.case (Ast_helper.Pat.any ()) else_expr;
+    ]
+
+and parse_if_or_if_let_expression p =
+  Parser.begin_region p;
+  Parser.leave_breadcrumb p Grammar.ExprIf;
+  let start_pos = p.Parser.start_pos in
+  Parser.expect If p;
+  let expr =
+    match p.Parser.token with
+    | Let _ ->
+      Parser.next p;
+      let if_let_expr = parse_if_let_expr start_pos p in
+      Parser.err ~start_pos:if_let_expr.pexp_loc.loc_start
+        ~end_pos:if_let_expr.pexp_loc.loc_end p
+        (Diagnostics.message (ErrorMessages.experimental_if_let if_let_expr));
+      if_let_expr
+    | _ -> parse_if_expr start_pos p
+  in
+  Parser.eat_breadcrumb p;
+  expr
+
+and parse_for_rest has_opening_paren pattern start_pos p =
+  Parser.expect In p;
+  let e1 = parse_expr p in
+  let direction =
+    match p.Parser.token with
+    | Lident "to" -> Asttypes.Upto
+    | Lident "downto" -> Asttypes.Downto
+    | token ->
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      Asttypes.Upto
+  in
+  if p.Parser.token = Eof then
+    Parser.err ~start_pos:p.start_pos p
+      (Diagnostics.unexpected p.Parser.token p.breadcrumbs)
+  else Parser.next p;
+  let e2 = parse_expr ~context:WhenExpr p in
+  if has_opening_paren then Parser.expect Rparen p;
+  Parser.expect Lbrace p;
+  let body_expr = parse_expr_block p in
+  Parser.expect Rbrace p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Exp.for_ ~loc pattern e1 e2 direction body_expr
+
+and parse_for_expression p =
+  let start_pos = p.Parser.start_pos in
+  Parser.leave_breadcrumb p Grammar.ExprFor;
+  Parser.expect For p;
+  Parser.begin_region p;
+  let for_expr =
+    match p.token with
+    | Lparen -> (
+      let lparen = p.start_pos in
+      Parser.next p;
+      match p.token with
+      | Rparen ->
+        Parser.next p;
+        let unit_pattern =
+          let loc = mk_loc lparen p.prev_end_pos in
+          let lid = Location.mkloc (Longident.Lident "()") loc in
+          Ast_helper.Pat.construct lid None
+        in
+        parse_for_rest false
+          (parse_alias_pattern ~attrs:[] unit_pattern p)
+          start_pos p
+      | _ -> (
+        Parser.leave_breadcrumb p Grammar.Pattern;
+        let pat = parse_pattern p in
+        Parser.eat_breadcrumb p;
+        match p.token with
+        | Comma ->
+          Parser.next p;
+          let tuple_pattern =
+            parse_tuple_pattern ~attrs:[] ~start_pos:lparen ~first:pat p
+          in
+          let pattern = parse_alias_pattern ~attrs:[] tuple_pattern p in
+          parse_for_rest false pattern start_pos p
+        | _ -> parse_for_rest true pat start_pos p))
+    | _ ->
+      Parser.leave_breadcrumb p Grammar.Pattern;
+      let pat = parse_pattern p in
+      Parser.eat_breadcrumb p;
+      parse_for_rest false pat start_pos p
+  in
+  Parser.eat_breadcrumb p;
+  Parser.end_region p;
+  for_expr
+
+and parse_while_expression p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect While p;
+  let expr1 = parse_expr ~context:WhenExpr p in
+  Parser.expect Lbrace p;
+  let expr2 = parse_expr_block p in
+  Parser.expect Rbrace p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Exp.while_ ~loc expr1 expr2
+
+and parse_pattern_guard p =
+  match p.Parser.token with
+  | When | If ->
+    Parser.next p;
+    Some (parse_expr ~context:WhenExpr p)
+  | _ -> None
+
+and parse_pattern_match_case p =
+  Parser.begin_region p;
+  Parser.leave_breadcrumb p Grammar.PatternMatchCase;
+  match p.Parser.token with
+  | Token.Bar ->
+    let bar = p.start_pos in
+    Parser.next p;
+    Parser.leave_breadcrumb p Grammar.Pattern;
+    let lhs = parse_pattern p in
+    Parser.eat_breadcrumb p;
+    let guard = parse_pattern_guard p in
+    let () =
+      match p.token with
+      | EqualGreater -> Parser.next p
+      | _ -> Recover.recover_equal_greater p
+    in
+    let rhs = parse_expr_block p in
+    Parser.end_region p;
+    Parser.eat_breadcrumb p;
+    Some (Ast_helper.Exp.case ~bar lhs ?guard rhs)
+  | _ ->
+    Parser.end_region p;
+    Parser.eat_breadcrumb p;
+    None
+
+and parse_pattern_matching p =
+  let cases =
+    parse_delimited_region ~grammar:Grammar.PatternMatching ~closing:Rbrace
+      ~f:parse_pattern_match_case p
+  in
+  let () =
+    match cases with
+    | [] ->
+      Parser.err ~start_pos:p.prev_end_pos p
+        (Diagnostics.message "Pattern matching needs at least one case")
+    | _ -> ()
+  in
+  cases
+
+and parse_switch_expression p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Switch p;
+  let switch_expr = parse_expr ~context:WhenExpr p in
+  Parser.expect Lbrace p;
+  let cases = parse_pattern_matching p in
+  Parser.expect Rbrace p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Exp.match_ ~loc switch_expr cases
+
+(*
+ * argument ::=
+ *   | _                            (* syntax sugar *)
+ *   | expr
+ *   | expr : type
+ *   | ~ label-name
+ *   | ~ label-name
+ *   | ~ label-name ?
+ *   | ~ label-name =   expr
+ *   | ~ label-name =   _           (* syntax sugar *)
+ *   | ~ label-name =   expr : type
+ *   | ~ label-name = ? expr
+ *   | ~ label-name = ? _           (* syntax sugar *)
+ *   | ~ label-name = ? expr : type
+ *
+ *  dotted_argument ::=
+ *   | . argument
+ *)
+and parse_argument p : argument option =
+  if
+    p.Parser.token = Token.Tilde
+    || p.token = Dot || p.token = Underscore
+    || Grammar.is_expr_start p.token
+  then
+    match p.Parser.token with
+    | Dot -> (
+      Parser.next p;
+      match p.token with
+      (* apply(.) *)
+      | Rparen ->
+        let unit_expr =
+          Ast_helper.Exp.construct
+            (Location.mknoloc (Longident.Lident "()"))
+            None
+        in
+        Some {label = Asttypes.Nolabel; expr = unit_expr}
+      | _ -> parse_argument2 p)
+    | _ -> parse_argument2 p
+  else None
+
+and parse_argument2 p : argument option =
+  match p.Parser.token with
+  (* foo(_), do not confuse with foo(_ => x), TODO: performance *)
+  | Underscore when not (is_es6_arrow_expression ~in_ternary:false p) ->
+    let loc = mk_loc p.start_pos p.end_pos in
+    Parser.next p;
+    let expr =
+      Ast_helper.Exp.ident ~loc (Location.mkloc (Longident.Lident "_") loc)
+    in
+    Some {label = Nolabel; expr}
+  | Tilde -> (
+    Parser.next p;
+    (* TODO: nesting of pattern matches not intuitive for error recovery *)
+    match p.Parser.token with
+    | Lident ident -> (
+      let start_pos = p.start_pos in
+      Parser.next p;
+      let end_pos = p.prev_end_pos in
+      let loc = mk_loc start_pos end_pos in
+      let named_arg_loc = loc in
+      let ident_expr =
+        Ast_helper.Exp.ident ~loc (Location.mkloc (Longident.Lident ident) loc)
+      in
+      match p.Parser.token with
+      | Question ->
+        Parser.next p;
+        Some
+          {
+            label = Optional {txt = ident; loc = named_arg_loc};
+            expr = ident_expr;
+          }
+      | Equal ->
+        Parser.next p;
+        let label =
+          match p.Parser.token with
+          | Question ->
+            Parser.next p;
+            Asttypes.Optional {txt = ident; loc = named_arg_loc}
+          | _ -> Asttypes.Labelled {txt = ident; loc = named_arg_loc}
+        in
+        let expr =
+          match p.Parser.token with
+          | Underscore when not (is_es6_arrow_expression ~in_ternary:false p) ->
+            let loc = mk_loc p.start_pos p.end_pos in
+            Parser.next p;
+            Ast_helper.Exp.ident ~loc
+              (Location.mkloc (Longident.Lident "_") loc)
+          | _ -> parse_constrained_or_coerced_expr p
+        in
+        Some {label; expr}
+      | Colon ->
+        let colon_start = p.start_pos in
+        Parser.next p;
+        let colon_end = p.prev_end_pos in
+        if Grammar.is_typ_expr_start p.Parser.token then
+          let typ = parse_typ_expr p in
+          let loc = mk_loc start_pos p.prev_end_pos in
+          let expr = Ast_helper.Exp.constraint_ ~loc ident_expr typ in
+          Some
+            {label = Asttypes.Labelled {txt = ident; loc = named_arg_loc}; expr}
+        else
+          let label, expr =
+            match p.Parser.token with
+            | Question ->
+              Parser.err ~start_pos:colon_start ~end_pos:colon_end p
+                (Diagnostics.message
+                   ErrorMessages.optional_labelled_argument_missing_equal);
+              Parser.next p;
+              let expr = parse_constrained_or_coerced_expr p in
+              (Asttypes.Optional {txt = ident; loc = named_arg_loc}, expr)
+            | _ ->
+              Parser.err ~start_pos:colon_start ~end_pos:colon_end p
+                (Diagnostics.message
+                   ErrorMessages.labelled_argument_missing_equal);
+              let expr =
+                match p.Parser.token with
+                | Underscore
+                  when not (is_es6_arrow_expression ~in_ternary:false p) ->
+                  let loc = mk_loc p.start_pos p.end_pos in
+                  Parser.next p;
+                  Ast_helper.Exp.ident ~loc
+                    (Location.mkloc (Longident.Lident "_") loc)
+                | _ -> parse_constrained_or_coerced_expr p
+              in
+              (Asttypes.Labelled {txt = ident; loc = named_arg_loc}, expr)
+          in
+          Some {label; expr}
+      | _ ->
+        Some
+          {
+            label = Asttypes.Labelled {txt = ident; loc = named_arg_loc};
+            expr = ident_expr;
+          })
+    | t ->
+      Parser.err p (Diagnostics.lident t);
+      Some {label = Nolabel; expr = Recover.default_expr ()})
+  | _ -> Some {label = Nolabel; expr = parse_constrained_or_coerced_expr p}
+
+and parse_call_expr p fun_expr =
+  Parser.expect Lparen p;
+  let start_pos = p.Parser.start_pos in
+  Parser.leave_breadcrumb p Grammar.ExprCall;
+  let args =
+    parse_comma_delimited_region ~grammar:Grammar.ArgumentList ~closing:Rparen
+      ~f:parse_argument p
+  in
+  let partial =
+    match p.token with
+    | DotDotDot when args <> [] ->
+      Parser.next p;
+      true
+    | _ -> false
+  in
+  Parser.expect Rparen p;
+  let args =
+    match args with
+    | [] ->
+      let loc = mk_loc start_pos p.prev_end_pos in
+      (* No args -> unit sugar: `foo()` *)
+      [
+        {
+          label = Nolabel;
+          expr =
+            Ast_helper.Exp.construct ~loc
+              (Location.mkloc (Longident.Lident "()") loc)
+              None;
+        };
+      ]
+    | args -> args
+  in
+  let loc = {fun_expr.pexp_loc with loc_end = p.prev_end_pos} in
+  let args =
+    match args with
+    | {label = lbl; expr} :: args ->
+      let group (grp, acc) {label = lbl; expr} = ((lbl, expr) :: grp, acc) in
+      let grp, acc = List.fold_left group ([(lbl, expr)], []) args in
+      List.rev (List.rev grp :: acc)
+    | [] -> []
+  in
+  let apply =
+    Ext_list.fold_left args fun_expr (fun call_body args ->
+        let args, wrap = process_underscore_application args in
+        let exp = Ast_helper.Exp.apply ~loc ~partial call_body args in
+        wrap exp)
+  in
+
+  Parser.eat_breadcrumb p;
+  apply
+
+and parse_value_or_constructor p =
+  let start_pos = p.Parser.start_pos in
+  let rec aux p acc =
+    match p.Parser.token with
+    | Uident ident -> (
+      let end_pos_lident = p.end_pos in
+      Parser.next p;
+      match p.Parser.token with
+      | Dot ->
+        Parser.next p;
+        aux p (ident :: acc)
+      | Lparen when p.prev_end_pos.pos_lnum == p.start_pos.pos_lnum ->
+        let lparen = p.start_pos in
+        let args = parse_constructor_args p in
+        let rparen = p.prev_end_pos in
+        let lident = build_longident (ident :: acc) in
+        let tail =
+          match args with
+          | [] -> None
+          | [({Parsetree.pexp_desc = Pexp_tuple _} as arg)] as args ->
+            let loc = mk_loc lparen rparen in
+            if p.mode = ParseForTypeChecker then
+              (* Some(1, 2) for type-checker *)
+              Some arg
+            else
+              (* Some((1, 2)) for printer *)
+              Some (Ast_helper.Exp.tuple ~loc args)
+          | [arg] -> Some arg
+          | args ->
+            let loc = mk_loc lparen rparen in
+            Some (Ast_helper.Exp.tuple ~loc args)
+        in
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let ident_loc = mk_loc start_pos end_pos_lident in
+        Ast_helper.Exp.construct ~loc (Location.mkloc lident ident_loc) tail
+      | _ ->
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let lident = build_longident (ident :: acc) in
+        Ast_helper.Exp.construct ~loc (Location.mkloc lident loc) None)
+    | Lident ident ->
+      Parser.next p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      let lident = build_longident (ident :: acc) in
+      Ast_helper.Exp.ident ~loc (Location.mkloc lident loc)
+    | token ->
+      if acc = [] then (
+        Parser.next_unsafe p;
+        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+        Recover.default_expr ())
+      else
+        let loc = mk_loc start_pos p.prev_end_pos in
+        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+        let lident = build_longident ("_" :: acc) in
+        Ast_helper.Exp.ident ~loc (Location.mkloc lident loc)
+  in
+  aux p []
+
+and parse_poly_variant_expr p =
+  let start_pos = p.start_pos in
+  let ident, _loc = parse_hash_ident ~start_pos p in
+  match p.Parser.token with
+  | Lparen when p.prev_end_pos.pos_lnum == p.start_pos.pos_lnum ->
+    let lparen = p.start_pos in
+    let args = parse_constructor_args p in
+    let rparen = p.prev_end_pos in
+    let loc_paren = mk_loc lparen rparen in
+    let tail =
+      match args with
+      | [] -> None
+      | [({Parsetree.pexp_desc = Pexp_tuple _} as expr)] as args ->
+        if p.mode = ParseForTypeChecker then
+          (* #a(1, 2) for type-checker *)
+          Some expr
+        else
+          (* #a((1, 2)) for type-checker *)
+          Some (Ast_helper.Exp.tuple ~loc:loc_paren args)
+      | [arg] -> Some arg
+      | args ->
+        (* #a((1, 2)) for printer *)
+        Some (Ast_helper.Exp.tuple ~loc:loc_paren args)
+    in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Exp.variant ~loc ident tail
+  | _ ->
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Exp.variant ~loc ident None
+
+and parse_constructor_args p =
+  let lparen = p.Parser.start_pos in
+  Parser.expect Lparen p;
+  let args =
+    parse_comma_delimited_region ~grammar:Grammar.ExprList
+      ~f:parse_constrained_expr_region ~closing:Rparen p
+  in
+  Parser.expect Rparen p;
+  match args with
+  | [] ->
+    let loc = mk_loc lparen p.prev_end_pos in
+    [
+      Ast_helper.Exp.construct ~loc
+        (Location.mkloc (Longident.Lident "()") loc)
+        None;
+    ]
+  | args -> args
+
+and parse_tuple_expr ~first ~start_pos p =
+  let exprs =
+    first
+    :: parse_comma_delimited_region p ~grammar:Grammar.ExprList ~closing:Rparen
+         ~f:parse_constrained_expr_region
+  in
+  Parser.expect Rparen p;
+  let () =
+    match exprs with
+    | [_] ->
+      Parser.err ~start_pos ~end_pos:p.prev_end_pos p
+        (Diagnostics.message ErrorMessages.tuple_single_element)
+    | _ -> ()
+  in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Exp.tuple ~loc exprs
+
+and parse_spread_expr_region_with_loc p =
+  let start_pos = p.Parser.prev_end_pos in
+  match p.Parser.token with
+  | DotDotDot ->
+    Parser.next p;
+    let expr = parse_constrained_or_coerced_expr p in
+    Some (true, expr, start_pos, p.prev_end_pos)
+  | token when Grammar.is_expr_start token ->
+    Some (false, parse_constrained_or_coerced_expr p, start_pos, p.prev_end_pos)
+  | _ -> None
+
+and parse_list_expr ~start_pos p =
+  let split_by_spread exprs =
+    List.fold_left
+      (fun acc curr ->
+        match (curr, acc) with
+        | (true, expr, start_pos, end_pos), _ ->
+          (* find a spread expression, prepend a new sublist *)
+          ([], Some expr, start_pos, end_pos) :: acc
+        | ( (false, expr, start_pos, _endPos),
+            (no_spreads, spread, _accStartPos, acc_end_pos) :: acc ) ->
+          (* find a non-spread expression, and the accumulated is not empty,
+           * prepend to the first sublist, and update the loc of the first sublist *)
+          (expr :: no_spreads, spread, start_pos, acc_end_pos) :: acc
+        | (false, expr, start_pos, end_pos), [] ->
+          (* find a non-spread expression, and the accumulated is empty *)
+          [([expr], None, start_pos, end_pos)])
+      [] exprs
+  in
+  let make_sub_expr = function
+    | exprs, Some spread, start_pos, end_pos ->
+      Ast_helper.Exp.make_list_expression (mk_loc start_pos end_pos) exprs
+        (Some spread)
+    | exprs, None, start_pos, end_pos ->
+      Ast_helper.Exp.make_list_expression (mk_loc start_pos end_pos) exprs None
+  in
+  let list_exprs_rev =
+    parse_comma_delimited_reversed_list p ~grammar:Grammar.ListExpr
+      ~closing:Rbrace ~f:parse_spread_expr_region_with_loc
+  in
+  Parser.expect Rbrace p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  match split_by_spread list_exprs_rev with
+  | [] -> Ast_helper.Exp.make_list_expression loc [] None
+  | [(exprs, Some spread, _, _)] ->
+    Ast_helper.Exp.make_list_expression loc exprs (Some spread)
+  | [(exprs, None, _, _)] -> Ast_helper.Exp.make_list_expression loc exprs None
+  | exprs ->
+    let list_exprs = List.map make_sub_expr exprs in
+    Ast_helper.Exp.apply ~loc
+      (Ast_helper.Exp.ident ~loc ~attrs:[spread_attr]
+         (Location.mkloc
+            (Longident.Ldot
+               (Longident.Ldot (Longident.Lident "Belt", "List"), "concatMany"))
+            loc))
+      [(Asttypes.Nolabel, Ast_helper.Exp.array ~loc list_exprs)]
+
+and parse_dict_expr ~start_pos p =
+  let rows =
+    parse_comma_delimited_region ~grammar:Grammar.DictRows ~closing:Rbrace
+      ~f:parse_dict_expr_row p
+  in
+  let loc = mk_loc start_pos p.end_pos in
+  let to_key_value_pair
+      (record_item : Longident.t Location.loc * Parsetree.expression) =
+    match record_item with
+    | ( {Location.txt = Longident.Lident key; loc = keyLoc},
+        ({pexp_loc = value_loc} as value_expr) ) ->
+      Some
+        (Ast_helper.Exp.tuple
+           ~loc:(mk_loc keyLoc.loc_start value_loc.loc_end)
+           [
+             Ast_helper.Exp.constant ~loc:keyLoc (Pconst_string (key, None));
+             value_expr;
+           ])
+    | _ -> None
+  in
+  let key_value_pairs = List.filter_map to_key_value_pair rows in
+  Parser.expect Rbrace p;
+  Ast_helper.Exp.apply ~loc
+    (Ast_helper.Exp.ident ~loc
+       (Location.mkloc
+          (Longident.Ldot (Longident.Lident Primitive_modules.dict, "make"))
+          loc))
+    [(Asttypes.Nolabel, Ast_helper.Exp.array ~loc key_value_pairs)]
+
+and parse_array_exp p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Lbracket p;
+  let split_by_spread exprs =
+    List.fold_left
+      (fun acc curr ->
+        match (curr, acc) with
+        | (true, expr, start_pos, end_pos), _ ->
+          (* find a spread expression, prepend a new sublist *)
+          ([], Some expr, start_pos, end_pos) :: acc
+        | ( (false, expr, start_pos, _endPos),
+            (no_spreads, spread, _accStartPos, acc_end_pos) :: acc ) ->
+          (* find a non-spread expression, and the accumulated is not empty,
+           * prepend to the first sublist, and update the loc of the first sublist *)
+          (expr :: no_spreads, spread, start_pos, acc_end_pos) :: acc
+        | (false, expr, start_pos, end_pos), [] ->
+          (* find a non-spread expression, and the accumulated is empty *)
+          [([expr], None, start_pos, end_pos)])
+      [] exprs
+  in
+  let list_exprs_rev =
+    parse_comma_delimited_reversed_list p ~grammar:Grammar.ExprList
+      ~closing:Rbracket ~f:parse_spread_expr_region_with_loc
+  in
+  Parser.expect Rbracket p;
+  let loc = mk_loc start_pos p.prev_end_pos in
+  let collect_exprs = function
+    | [], Some spread, _startPos, _endPos -> [spread]
+    | exprs, Some spread, _startPos, _endPos ->
+      let els = Ast_helper.Exp.array ~loc exprs in
+      [els; spread]
+    | exprs, None, _startPos, _endPos ->
+      let els = Ast_helper.Exp.array ~loc exprs in
+      [els]
+  in
+  match split_by_spread list_exprs_rev with
+  | [] -> Ast_helper.Exp.array ~loc:(mk_loc start_pos p.prev_end_pos) []
+  | [(exprs, None, _, _)] ->
+    Ast_helper.Exp.array ~loc:(mk_loc start_pos p.prev_end_pos) exprs
+  | exprs ->
+    let xs = List.map collect_exprs exprs in
+    let list_exprs =
+      List.fold_right
+        (fun exprs1 acc ->
+          List.fold_right (fun expr1 acc1 -> expr1 :: acc1) exprs1 acc)
+        xs []
+    in
+    Ast_helper.Exp.apply ~loc
+      (Ast_helper.Exp.ident ~loc ~attrs:[spread_attr]
+         (Location.mkloc
+            (Longident.Ldot
+               (Longident.Ldot (Longident.Lident "Belt", "Array"), "concatMany"))
+            loc))
+      [(Nolabel, Ast_helper.Exp.array ~loc list_exprs)]
+
+(* TODO: check attributes in the case of poly type vars,
+ * might be context dependend: parseFieldDeclaration (see ocaml) *)
+and parse_poly_type_expr ?current_type_name_path ?inline_types_context p =
+  let start_pos = p.Parser.start_pos in
+  match p.Parser.token with
+  | SingleQuote -> (
+    let vars = parse_type_var_list p in
+    match vars with
+    | _v1 :: _v2 :: _ ->
+      Parser.expect Dot p;
+      let typ = parse_typ_expr p in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Typ.poly ~loc vars typ
+    | [var] -> (
+      match p.Parser.token with
+      | Dot ->
+        Parser.next p;
+        let typ = parse_typ_expr p in
+        let loc = mk_loc start_pos p.prev_end_pos in
+        Ast_helper.Typ.poly ~loc vars typ
+      | EqualGreater ->
+        Parser.next p;
+        let typ = Ast_helper.Typ.var ~loc:var.loc var.txt in
+        let return_type = parse_typ_expr ~alias:false p in
+        let loc = mk_loc typ.Parsetree.ptyp_loc.loc_start p.prev_end_pos in
+        Ast_helper.Typ.arrow ~loc ~arity:(Some 1)
+          {attrs = []; lbl = Nolabel; typ}
+          return_type
+      | _ -> Ast_helper.Typ.var ~loc:var.loc var.txt)
+    | _ -> assert false)
+  | _ -> parse_typ_expr ?current_type_name_path ?inline_types_context p
+
+(* 'a 'b 'c *)
+and parse_type_var_list p =
+  let rec loop p vars =
+    match p.Parser.token with
+    | SingleQuote ->
+      Parser.next p;
+      let lident, loc =
+        parse_ident ~msg:ErrorMessages.type_param ~start_pos:p.start_pos p
+      in
+      let var = Location.mkloc lident loc in
+      loop p (var :: vars)
+    | _ -> List.rev vars
+  in
+  loop p []
+
+and parse_lident_list p =
+  let rec loop p ls =
+    match p.Parser.token with
+    | Lident lident ->
+      let loc = mk_loc p.start_pos p.end_pos in
+      Parser.next p;
+      loop p (Location.mkloc lident loc :: ls)
+    | _ -> List.rev ls
+  in
+  loop p []
+
+and parse_atomic_typ_expr ?current_type_name_path ?inline_types_context ~attrs p
+    =
+  Parser.leave_breadcrumb p Grammar.AtomicTypExpr;
+  let start_pos = p.Parser.start_pos in
+  let typ =
+    match p.Parser.token with
+    | SingleQuote ->
+      Parser.next p;
+      let ident, loc =
+        if p.Parser.token = Eof then (
+          Parser.err ~start_pos:p.start_pos p
+            (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
+          ("", mk_loc p.start_pos p.prev_end_pos))
+        else parse_ident ~msg:ErrorMessages.type_var ~start_pos:p.start_pos p
+      in
+      Ast_helper.Typ.var ~loc ~attrs ident
+    | Underscore ->
+      let end_pos = p.end_pos in
+      Parser.next p;
+      Ast_helper.Typ.any ~loc:(mk_loc start_pos end_pos) ~attrs ()
+    | Lparen -> (
+      Parser.next p;
+      match p.Parser.token with
+      | Rparen ->
+        Parser.next p;
+        let loc = mk_loc start_pos p.prev_end_pos in
+        let unit_constr = Location.mkloc (Longident.Lident "unit") loc in
+        Ast_helper.Typ.constr ~attrs unit_constr []
+      | _ -> (
+        let t = parse_typ_expr p in
+        match p.token with
+        | Comma ->
+          Parser.next p;
+          parse_tuple_type ~attrs ~first:t ~start_pos p
+        | _ ->
+          Parser.expect Rparen p;
+          {
+            t with
+            ptyp_loc = mk_loc start_pos p.prev_end_pos;
+            ptyp_attributes = List.concat [attrs; t.ptyp_attributes];
+          }))
+    | Lbracket -> parse_polymorphic_variant_type ~attrs p
+    | Uident _ | Lident _ ->
+      let constr = parse_value_path p in
+      let args =
+        parse_type_constructor_args ?inline_types_context
+          ?current_type_name_path ~constr_name:constr p
+      in
+      let number_of_inline_records_in_args =
+        match inline_types_context with
+        | None -> 0
+        | Some inline_types_context ->
+          let inline_types = inline_types_context.found_inline_types in
+          args
+          |> List.filter (fun (c : Parsetree.core_type) ->
+                 match c.ptyp_desc with
+                 | Ptyp_constr ({txt = Lident typename}, _) ->
+                   inline_types
+                   |> List.exists (fun (name, _, _) -> name = typename)
+                 | _ -> false)
+          |> List.length
+      in
+      if number_of_inline_records_in_args > 1 then
+        Parser.err ~start_pos ~end_pos:p.prev_end_pos p
+          (Diagnostics.message
+             ErrorMessages.multiple_inline_record_definitions_at_same_path);
+      Ast_helper.Typ.constr
+        ~loc:(mk_loc start_pos p.prev_end_pos)
+        ~attrs constr args
+    | Module ->
+      Parser.next p;
+      Parser.expect Lparen p;
+      let package_type = parse_package_type ~start_pos ~attrs p in
+      Parser.expect Rparen p;
+      {package_type with ptyp_loc = mk_loc start_pos p.prev_end_pos}
+    | Percent ->
+      let extension = parse_extension p in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Typ.extension ~attrs ~loc extension
+    | Lbrace ->
+      parse_record_or_object_type ?current_type_name_path ?inline_types_context
+        ~attrs p
+    | Eof ->
+      Parser.err p (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
+      Recover.default_type ()
+    | token -> (
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      match
+        skip_tokens_and_maybe_retry p
+          ~is_start_of_grammar:Grammar.is_atomic_typ_expr_start
+      with
+      | Some () -> parse_atomic_typ_expr ~attrs p
+      | None ->
+        Parser.err ~start_pos:p.prev_end_pos p
+          (Diagnostics.unexpected token p.breadcrumbs);
+        Recover.default_type ())
+  in
+  Parser.eat_breadcrumb p;
+  typ
+
+(* package-type	::=
+    | modtype-path
+    ∣ modtype-path with package-constraint  { and package-constraint }
+*)
+and parse_package_type ~start_pos ~attrs p =
+  let mod_type_path = parse_module_long_ident ~lowercase:true p in
+  match p.Parser.token with
+  | Lident "with" ->
+    Parser.next p;
+    let constraints = parse_package_constraints p in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Typ.package ~loc ~attrs mod_type_path constraints
+  | _ ->
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Typ.package ~loc ~attrs mod_type_path []
+
+(* package-constraint  { and package-constraint } *)
+and parse_package_constraints p =
+  let first =
+    Parser.expect Typ p;
+    let type_constr = parse_value_path p in
+    Parser.expect Equal p;
+    let typ = parse_typ_expr p in
+    (type_constr, typ)
+  in
+  let rest =
+    parse_region ~grammar:Grammar.PackageConstraint ~f:parse_package_constraint
+      p
+  in
+  first :: rest
+
+(* and type typeconstr = typexpr *)
+and parse_package_constraint p =
+  match p.Parser.token with
+  | And ->
+    Parser.next p;
+    Parser.expect Typ p;
+    let type_constr = parse_value_path p in
+    Parser.expect Equal p;
+    let typ = parse_typ_expr p in
+    Some (type_constr, typ)
+  | _ -> None
+
+and parse_record_or_object_type ?current_type_name_path ?inline_types_context
+    ~attrs p =
+  (* for inline record in constructor *)
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Lbrace p;
+  let closed_flag =
+    match p.token with
+    | DotDot ->
+      Parser.next p;
+      Asttypes.Open
+    | Dot ->
+      Parser.next p;
+      Asttypes.Closed
+    | _ -> Asttypes.Closed
+  in
+  match (inline_types_context, current_type_name_path) with
+  | Some inline_types_context, Some current_type_name_path
+    when Grammar.is_record_decl_start p.token ->
+    let labels =
+      parse_comma_delimited_region ~grammar:Grammar.RecordDecl ~closing:Rbrace
+        ~f:
+          (parse_field_declaration_region ~current_type_name_path
+             ~inline_types_context)
+        p
+    in
+    Parser.expect Rbrace p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    let inline_type_name = current_type_name_path |> String.concat "." in
+
+    inline_types_context.found_inline_types <-
+      (inline_type_name, loc, Parsetree.Ptype_record labels)
+      :: inline_types_context.found_inline_types;
+
+    let lid = Location.mkloc (Longident.Lident inline_type_name) loc in
+    Ast_helper.Typ.constr ~loc lid (inline_types_context.params |> List.map fst)
+  | _ ->
+    let () =
+      match p.token with
+      | Lident _ ->
+        Parser.err p
+          (Diagnostics.message ErrorMessages.forbidden_inline_record_declaration)
+      | _ -> ()
+    in
+    let fields =
+      parse_comma_delimited_region ~grammar:Grammar.StringFieldDeclarations
+        ~closing:Rbrace ~f:parse_string_field_declaration p
+    in
+    Parser.expect Rbrace p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Typ.object_ ~loc ~attrs fields closed_flag
+
+(* TODO: check associativity in combination with attributes *)
+and parse_type_alias p typ =
+  match p.Parser.token with
+  | As ->
+    Parser.next p;
+    Parser.expect SingleQuote p;
+    let ident, _loc =
+      parse_ident ~msg:ErrorMessages.type_param ~start_pos:p.start_pos p
+    in
+    (* TODO: how do we parse attributes here? *)
+    Ast_helper.Typ.alias
+      ~loc:(mk_loc typ.Parsetree.ptyp_loc.loc_start p.prev_end_pos)
+      typ ident
+  | _ -> typ
+
+(* type_parameter ::=
+ *  | type_expr
+ *  | ~ident: type_expr
+ *  | ~ident: type_expr=?
+ *
+ * note:
+ *  | attrs ~ident: type_expr    -> attrs are on the arrow
+ *  | attrs type_expr            -> attrs are here part of the type_expr
+ *
+ * dotted_type_parameter ::=
+ *  | . type_parameter
+ *)
+and parse_type_parameter p =
+  let doc_attr : Parsetree.attributes =
+    match p.Parser.token with
+    | DocComment (loc, s) ->
+      Parser.next p;
+      [doc_comment_to_attribute loc s]
+    | _ -> []
+  in
+  if
+    p.Parser.token = Token.Tilde
+    || p.token = Dot
+    || Grammar.is_typ_expr_start p.token
+  then
+    let start_pos = p.Parser.start_pos in
+    let _ =
+      Parser.optional p Dot
+      (* dot is ignored *)
+    in
+    let attrs = doc_attr @ parse_attributes p in
+    match p.Parser.token with
+    | Tilde -> (
+      Parser.next p;
+      let name, loc = parse_lident p in
+      Parser.expect ~grammar:Grammar.TypeExpression Colon p;
+      let typ = parse_typ_expr p in
+      match p.Parser.token with
+      | Equal ->
+        Parser.next p;
+        Parser.expect Question p;
+        Some {attrs; label = Optional {txt = name; loc}; typ; start_pos}
+      | _ -> Some {attrs; label = Labelled {txt = name; loc}; typ; start_pos})
+    | Lident _ -> (
+      let name, loc = parse_lident p in
+      match p.token with
+      | Colon -> (
+        let () =
+          let error =
+            Diagnostics.message
+              (ErrorMessages.missing_tilde_labeled_parameter name)
+          in
+          Parser.err ~start_pos:loc.loc_start ~end_pos:loc.loc_end p error
+        in
+        Parser.next p;
+        let typ = parse_typ_expr p in
+        match p.Parser.token with
+        | Equal ->
+          Parser.next p;
+          Parser.expect Question p;
+          Some {attrs; label = Optional {txt = name; loc}; typ; start_pos}
+        | _ -> Some {attrs; label = Labelled {txt = name; loc}; typ; start_pos})
+      | _ ->
+        let constr = Location.mkloc (Longident.Lident name) loc in
+        let args = parse_type_constructor_args ~constr_name:constr p in
+        let typ =
+          Ast_helper.Typ.constr
+            ~loc:(mk_loc start_pos p.prev_end_pos)
+            ~attrs constr args
+        in
+
+        let typ = parse_arrow_type_rest ~es6_arrow:true ~start_pos typ p in
+        let typ = parse_type_alias p typ in
+        Some {attrs = []; label = Nolabel; typ; start_pos})
+    | _ ->
+      let typ = parse_typ_expr p in
+      let typ_with_attributes =
+        {typ with ptyp_attributes = List.concat [attrs; typ.ptyp_attributes]}
+      in
+      Some {attrs = []; label = Nolabel; typ = typ_with_attributes; start_pos}
+  else None
+
+(* (int, ~x:string, float) *)
+and parse_type_parameters p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Lparen p;
+  match p.Parser.token with
+  | Rparen ->
+    Parser.next p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    let unit_constr = Location.mkloc (Longident.Lident "unit") loc in
+    let typ = Ast_helper.Typ.constr unit_constr [] in
+    [{attrs = []; label = Nolabel; typ; start_pos}]
+  | _ ->
+    let params =
+      parse_comma_delimited_region ~grammar:Grammar.TypeParameters
+        ~closing:Rparen ~f:parse_type_parameter p
+    in
+    Parser.expect Rparen p;
+    params
+
+and parse_es6_arrow_type ~attrs p =
+  let start_pos = p.Parser.start_pos in
+  match p.Parser.token with
+  | Tilde ->
+    Parser.next p;
+    let name, label_loc = parse_lident p in
+    Parser.expect ~grammar:Grammar.TypeExpression Colon p;
+    let typ = parse_typ_expr ~alias:false ~es6_arrow:false p in
+    let lbl =
+      match p.Parser.token with
+      | Equal ->
+        Parser.next p;
+        Parser.expect Question p;
+        Asttypes.Optional {txt = name; loc = label_loc}
+      | _ -> Asttypes.Labelled {txt = name; loc = label_loc}
+    in
+    Parser.expect EqualGreater p;
+    let return_type = parse_typ_expr ~alias:false p in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Typ.arrow ~loc ~arity:None {attrs; lbl; typ} return_type
+  | DocComment _ -> assert false
+  | _ ->
+    let parameters = parse_type_parameters p in
+    Parser.expect EqualGreater p;
+    let return_type = parse_typ_expr ~alias:false p in
+    let end_pos = p.prev_end_pos in
+    let return_type_arity = 0 in
+    let _paramNum, typ, _arity =
+      List.fold_right
+        (fun {attrs; label = arg_lbl; typ; start_pos} (param_num, t, arity) ->
+          let loc = mk_loc start_pos end_pos in
+          let arity =
+            (* Workaround for ~lbl: @as(json`false`) _, which changes the arity *)
+            match arg_lbl with
+            | Labelled _s ->
+              let typ_is_any =
+                match typ.ptyp_desc with
+                | Ptyp_any -> true
+                | _ -> false
+              in
+              let has_as =
+                Ext_list.exists typ.ptyp_attributes (fun (x, _) -> x.txt = "as")
+              in
+              if !InExternal.status && typ_is_any && has_as then arity - 1
+              else arity
+            | _ -> arity
+          in
+          let t_arg =
+            Ast_helper.Typ.arrow ~loc ~arity:None {attrs; lbl = arg_lbl; typ} t
+          in
+          if param_num = 1 then
+            (param_num - 1, Ast_uncurried.uncurried_type ~arity t_arg, 1)
+          else (param_num - 1, t_arg, arity + 1))
+        parameters
+        (List.length parameters, return_type, return_type_arity + 1)
+    in
+    {
+      typ with
+      ptyp_attributes = List.concat [typ.ptyp_attributes; attrs];
+      ptyp_loc = mk_loc start_pos p.prev_end_pos;
+    }
+
+(*
+ * typexpr ::=
+ *  | 'ident
+ *  | _
+ *  | (typexpr)
+ *  | typexpr => typexpr            --> es6 arrow
+ *  | (typexpr, typexpr) => typexpr --> es6 arrow
+ *  | /typexpr, typexpr, typexpr/  --> tuple
+ *  | typeconstr
+ *  | typeconstr<typexpr>
+ *  | typeconstr<typexpr, typexpr,>
+ *  | typexpr as 'ident
+ *  | %attr-id                      --> extension
+ *  | %attr-id(payload)             --> extension
+ *
+ * typeconstr ::=
+ *  | lident
+ *  | uident.lident
+ *  | uident.uident.lident     --> long module path
+ *)
+and parse_typ_expr ?current_type_name_path ?inline_types_context ?attrs
+    ?(es6_arrow = true) ?(alias = true) p =
+  (* Parser.leaveBreadcrumb p Grammar.TypeExpression; *)
+  let start_pos = p.Parser.start_pos in
+  let attrs =
+    match attrs with
+    | Some attrs -> attrs
+    | None -> parse_attributes p
+  in
+  let typ =
+    if es6_arrow && is_es6_arrow_type p then parse_es6_arrow_type ~attrs p
+    else
+      let typ =
+        parse_atomic_typ_expr ?current_type_name_path ?inline_types_context
+          ~attrs p
+      in
+      parse_arrow_type_rest ~es6_arrow ~start_pos typ p
+  in
+  let typ = if alias then parse_type_alias p typ else typ in
+  (* Parser.eatBreadcrumb p; *)
+  typ
+
+and parse_arrow_type_rest ~es6_arrow ~start_pos typ p =
+  match p.Parser.token with
+  | (EqualGreater | MinusGreater) as token when es6_arrow == true ->
+    (* error recovery *)
+    if token = MinusGreater then Parser.expect EqualGreater p;
+    Parser.next p;
+    let return_type = parse_typ_expr ~alias:false p in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Typ.arrow ~loc ~arity:(Some 1)
+      {attrs = []; lbl = Nolabel; typ}
+      return_type
+  | _ -> typ
+
+and parse_typ_expr_region p =
+  if Grammar.is_typ_expr_start p.Parser.token then Some (parse_typ_expr p)
+  else None
+
+and parse_tuple_type ~attrs ~first ~start_pos p =
+  let typexprs =
+    first
+    :: parse_comma_delimited_region ~grammar:Grammar.TypExprList ~closing:Rparen
+         ~f:parse_typ_expr_region p
+  in
+  Parser.expect Rparen p;
+  let () =
+    match typexprs with
+    | [_] ->
+      Parser.err ~start_pos ~end_pos:p.prev_end_pos p
+        (Diagnostics.message ErrorMessages.tuple_single_element)
+    | _ -> ()
+  in
+  let tuple_loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Typ.tuple ~attrs ~loc:tuple_loc typexprs
+
+and parse_type_constructor_arg_region ?inline_types_context
+    ?current_type_name_path p =
+  if Grammar.is_typ_expr_start p.Parser.token then
+    Some (parse_typ_expr ?inline_types_context ?current_type_name_path p)
+  else if p.token = LessThan then (
+    Parser.next p;
+    parse_type_constructor_arg_region ?inline_types_context
+      ?current_type_name_path p)
+  else None
+
+(* Js.Nullable.value<'a> *)
+and parse_type_constructor_args ?inline_types_context ?current_type_name_path
+    ~constr_name p =
+  let opening = p.Parser.token in
+  let opening_start_pos = p.start_pos in
+  match opening with
+  | LessThan | Lparen ->
+    Scanner.set_diamond_mode p.scanner;
+    Parser.next p;
+    let type_args =
+      (* TODO: change Grammar.TypExprList to TypArgList!!! Why did I wrote this? *)
+      parse_comma_delimited_region ~grammar:Grammar.TypExprList
+        ~closing:GreaterThan
+        ~f:
+          (parse_type_constructor_arg_region ?inline_types_context
+             ?current_type_name_path)
+        p
+    in
+    let () =
+      match p.token with
+      | Rparen when opening = Token.Lparen ->
+        let typ = Ast_helper.Typ.constr constr_name type_args in
+        let msg =
+          Doc.breakable_group ~force_break:true
+            (Doc.concat
+               [
+                 Doc.text "Type parameters require angle brackets:";
+                 Doc.indent
+                   (Doc.concat
+                      [
+                        Doc.line;
+                        ResPrinter.print_typ_expr typ CommentTable.empty;
+                      ]);
+               ])
+          |> Doc.to_string ~width:80
+        in
+        Parser.err ~start_pos:opening_start_pos p (Diagnostics.message msg);
+        Parser.next p
+      | _ -> Parser.expect GreaterThan p
+    in
+    Scanner.pop_mode p.scanner Diamond;
+    type_args
+  | _ -> []
+
+(* string-field-decl ::=
+ *  | string: poly-typexpr
+ *  | attributes string-field-decl *)
+and parse_string_field_declaration p =
+  let attrs = parse_attributes p in
+  match p.Parser.token with
+  | String name ->
+    let name_start_pos = p.start_pos in
+    let name_end_pos = p.end_pos in
+    Parser.next p;
+    let field_name = Location.mkloc name (mk_loc name_start_pos name_end_pos) in
+    (match p.Parser.token with
+    | Colon -> Parser.next p
+    | Equal ->
+      Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+        (Diagnostics.message ErrorMessages.record_type_field_missing_colon);
+      Parser.next p
+    | _ -> Parser.expect ~grammar:Grammar.TypeExpression Colon p);
+    let typ = parse_poly_type_expr p in
+    Some (Parsetree.Otag (field_name, attrs, typ))
+  | DotDotDot ->
+    Parser.next p;
+    let typ = parse_typ_expr p in
+    Some (Parsetree.Oinherit typ)
+  | Lident name ->
+    let name_loc = mk_loc p.start_pos p.end_pos in
+    Parser.err p
+      (Diagnostics.message (ErrorMessages.object_quoted_field_name name));
+    Parser.next p;
+    let field_name = Location.mkloc name name_loc in
+    (match p.Parser.token with
+    | Colon -> Parser.next p
+    | Equal ->
+      Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+        (Diagnostics.message ErrorMessages.record_type_field_missing_colon);
+      Parser.next p
+    | _ -> Parser.expect ~grammar:Grammar.TypeExpression Colon p);
+    let typ = parse_poly_type_expr p in
+    Some (Parsetree.Otag (field_name, attrs, typ))
+  | _token -> None
+
+(* field-decl	::=
+ *  | [mutable] field-name : poly-typexpr
+ *  | attributes field-decl *)
+and parse_field_declaration ?current_type_name_path ?inline_types_context p =
+  let start_pos = p.Parser.start_pos in
+  let attrs = parse_attributes p in
+  let mut =
+    if Parser.optional p Token.Mutable then Asttypes.Mutable
+    else Asttypes.Immutable
+  in
+  let lident, loc =
+    match p.token with
+    | _ -> parse_lident p
+  in
+  let optional = parse_optional_label p in
+  let name = Location.mkloc lident loc in
+  let typ =
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      let current_type_name_path =
+        extend_current_type_name_path current_type_name_path name.txt
+      in
+      parse_poly_type_expr ?current_type_name_path ?inline_types_context p
+    | Equal ->
+      Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+        (Diagnostics.message ErrorMessages.record_type_field_missing_colon);
+      Parser.next p;
+      let current_type_name_path =
+        extend_current_type_name_path current_type_name_path name.txt
+      in
+      parse_poly_type_expr ?current_type_name_path ?inline_types_context p
+    | _ ->
+      Ast_helper.Typ.constr ~loc:name.loc {name with txt = Lident name.txt} []
+  in
+  let loc = mk_loc start_pos typ.ptyp_loc.loc_end in
+  Ast_helper.Type.field ~attrs ~loc ~mut ~optional name typ
+
+and parse_field_declaration_region ?current_type_name_path ?inline_types_context
+    ?found_object_field p =
+  let start_pos = p.Parser.start_pos in
+  let attrs = parse_attributes p in
+  let mut =
+    if Parser.optional p Token.Mutable then Asttypes.Mutable
+    else Asttypes.Immutable
+  in
+  match p.token with
+  | DotDotDot ->
+    Parser.next p;
+    let name = Location.mkloc "..." (mk_loc start_pos p.prev_end_pos) in
+    let typ = parse_poly_type_expr p in
+    let loc = mk_loc start_pos typ.ptyp_loc.loc_end in
+    Some (Ast_helper.Type.field ~attrs ~loc ~mut name typ)
+  | String s when found_object_field <> None ->
+    Option.get found_object_field := true;
+    Parser.next p;
+    let name = Location.mkloc s (mk_loc start_pos p.prev_end_pos) in
+    Parser.expect Colon p;
+    let typ = parse_poly_type_expr p in
+    let loc = mk_loc start_pos typ.ptyp_loc.loc_end in
+    Some (Ast_helper.Type.field ~attrs ~loc ~mut name typ)
+  | Lident _ ->
+    let lident, loc = parse_lident p in
+    let name = Location.mkloc lident loc in
+    let current_type_name_path =
+      extend_current_type_name_path current_type_name_path name.txt
+    in
+    let optional = parse_optional_label p in
+    let typ =
+      match p.Parser.token with
+      | Colon ->
+        Parser.next p;
+        parse_poly_type_expr ?current_type_name_path ?inline_types_context p
+      | Equal ->
+        Parser.err ~start_pos:p.start_pos ~end_pos:p.end_pos p
+          (Diagnostics.message ErrorMessages.record_type_field_missing_colon);
+        Parser.next p;
+        parse_poly_type_expr ?current_type_name_path ?inline_types_context p
+      | _ ->
+        Ast_helper.Typ.constr ~loc:name.loc ~attrs
+          {name with txt = Lident name.txt}
+          []
+    in
+    let loc = mk_loc start_pos typ.ptyp_loc.loc_end in
+    Some (Ast_helper.Type.field ~attrs ~loc ~mut ~optional name typ)
+  | _ ->
+    if Token.is_keyword p.token then (
+      match
+        recover_keyword_field_name_if_probably_field p
+          ~mk_message:ErrorMessages.keyword_field_in_type
+      with
+      | Some (recovered_field_name, name_loc) ->
+        let optional = parse_optional_label p in
+        Parser.expect Colon p;
+        let typ =
+          parse_poly_type_expr ?current_type_name_path ?inline_types_context p
+        in
+        let loc = mk_loc start_pos typ.ptyp_loc.loc_end in
+        let name = Location.mkloc recovered_field_name name_loc in
+        Some (Ast_helper.Type.field ~attrs ~loc ~mut ~optional name typ)
+      | None ->
+        emit_keyword_field_error p
+          ~mk_message:ErrorMessages.keyword_field_in_type;
+        None)
+    else (
+      if attrs <> [] then
+        Parser.err ~start_pos p
+          (Diagnostics.message
+             "Attributes and doc comments can only be used at the beginning of \
+              a field declaration");
+      if mut = Mutable then
+        Parser.err ~start_pos p
+          (Diagnostics.message
+             "The `mutable` qualifier can only be used at the beginning of a \
+              field declaration");
+      None)
+
+(* record-decl ::=
+ *  | { field-decl }
+ *  | { field-decl, field-decl }
+ *  | { field-decl, field-decl, field-decl, }
+ *)
+and parse_record_declaration ?current_type_name_path ?inline_types_context p =
+  Parser.leave_breadcrumb p Grammar.RecordDecl;
+  Parser.expect Lbrace p;
+  let rows =
+    parse_comma_delimited_region ~grammar:Grammar.RecordDecl ~closing:Rbrace
+      ~f:
+        (parse_field_declaration_region ?current_type_name_path
+           ?inline_types_context)
+      p
+  in
+  Parser.expect Rbrace p;
+  Parser.eat_breadcrumb p;
+  rows
+
+(* constr-args ::=
+ *  | (typexpr)
+ *  | (typexpr, typexpr)
+ *  | (typexpr, typexpr, typexpr,)
+ *  | (record-decl)
+ *
+ * TODO: should we overparse inline-records in every position?
+ * Give a good error message afterwards?
+ *)
+and parse_constr_decl_args p =
+  let constr_args =
+    match p.Parser.token with
+    | Lparen -> (
+      Parser.next p;
+      (* TODO: this could use some cleanup/stratification *)
+      match p.Parser.token with
+      | Lbrace -> (
+        Parser.next p;
+        let start_pos = p.Parser.start_pos in
+        match p.Parser.token with
+        | DotDot | Dot ->
+          let closed_flag =
+            match p.token with
+            | DotDot ->
+              Parser.next p;
+              Asttypes.Open
+            | Dot ->
+              Parser.next p;
+              Asttypes.Closed
+            | _ -> Asttypes.Closed
+          in
+          let fields =
+            parse_comma_delimited_region
+              ~grammar:Grammar.StringFieldDeclarations ~closing:Rbrace
+              ~f:parse_string_field_declaration p
+          in
+          Parser.expect Rbrace p;
+          let loc = mk_loc start_pos p.prev_end_pos in
+          let typ = Ast_helper.Typ.object_ ~loc ~attrs:[] fields closed_flag in
+          Parser.optional p Comma |> ignore;
+          let more_args =
+            parse_comma_delimited_region ~grammar:Grammar.TypExprList
+              ~closing:Rparen ~f:parse_typ_expr_region p
+          in
+          Parser.expect Rparen p;
+          Parsetree.Pcstr_tuple (typ :: more_args)
+        | DotDotDot -> (
+          let dotdotdot_start = p.start_pos in
+          let dotdotdot_end = p.end_pos in
+          (* start of spread, e.g. `User({...a, "u": int})` *)
+          Parser.next p;
+          let spread_typ = parse_typ_expr p in
+          match p.token with
+          | Rbrace ->
+            (* {...x}, spread without extra fields *)
+            Parser.next p;
+            let spread_field_name =
+              Location.mkloc "..." (mk_loc dotdotdot_start dotdotdot_end)
+            in
+            let spread_field_loc =
+              mk_loc start_pos spread_typ.ptyp_loc.loc_end
+            in
+            let spread_field =
+              Ast_helper.Type.field ~attrs:[] ~loc:spread_field_loc
+                ~mut:Asttypes.Immutable spread_field_name spread_typ
+            in
+            Parser.optional p Comma |> ignore;
+            Parser.expect Rparen p;
+            Parsetree.Pcstr_record [spread_field]
+          | _ -> (
+            let res =
+              parse_spread_tail_classified ~start_pos ~spread_typ
+                ~grammar:Grammar.FieldDeclarations p
+            in
+            match res with
+            | `Record fields ->
+              let spread_field_name =
+                Location.mkloc "..." (mk_loc dotdotdot_start dotdotdot_end)
+              in
+              let spread_field_loc =
+                mk_loc start_pos spread_typ.ptyp_loc.loc_end
+              in
+              let spread_field =
+                Ast_helper.Type.field ~attrs:[] ~loc:spread_field_loc
+                  ~mut:Asttypes.Immutable spread_field_name spread_typ
+              in
+              Parser.optional p Comma |> ignore;
+              Parser.expect Rparen p;
+              Parsetree.Pcstr_record (spread_field :: fields)
+            | `Object typ ->
+              Parser.optional p Comma |> ignore;
+              let more_args =
+                parse_comma_delimited_region ~grammar:Grammar.TypExprList
+                  ~closing:Rparen ~f:parse_typ_expr_region p
+              in
+              Parser.expect Rparen p;
+              Parsetree.Pcstr_tuple (typ :: more_args)))
+        | _ -> (
+          let attrs = parse_attributes p in
+          match p.Parser.token with
+          | String _ ->
+            let closed_flag = Asttypes.Closed in
+            let fields =
+              match attrs with
+              | [] ->
+                parse_comma_delimited_region
+                  ~grammar:Grammar.StringFieldDeclarations ~closing:Rbrace
+                  ~f:parse_string_field_declaration p
+              | attrs ->
+                let first =
+                  Parser.leave_breadcrumb p Grammar.StringFieldDeclarations;
+                  let field =
+                    match parse_string_field_declaration p with
+                    | Some field -> field
+                    | None -> assert false
+                  in
+                  (* parse comma after first *)
+                  let () =
+                    match p.Parser.token with
+                    | Rbrace | Eof -> ()
+                    | Comma -> Parser.next p
+                    | _ -> Parser.expect Comma p
+                  in
+                  Parser.eat_breadcrumb p;
+                  match field with
+                  | Parsetree.Otag (label, _, ct) ->
+                    Parsetree.Otag (label, attrs, ct)
+                  | Oinherit ct -> Oinherit ct
+                in
+                first
+                :: parse_comma_delimited_region
+                     ~grammar:Grammar.StringFieldDeclarations ~closing:Rbrace
+                     ~f:parse_string_field_declaration p
+            in
+            Parser.expect Rbrace p;
+            let loc = mk_loc start_pos p.prev_end_pos in
+            let typ =
+              Ast_helper.Typ.object_ ~loc ~attrs:[] fields closed_flag
+              |> parse_type_alias p
+            in
+            let typ = parse_arrow_type_rest ~es6_arrow:true ~start_pos typ p in
+            Parser.optional p Comma |> ignore;
+            let more_args =
+              parse_comma_delimited_region ~grammar:Grammar.TypExprList
+                ~closing:Rparen ~f:parse_typ_expr_region p
+            in
+            Parser.expect Rparen p;
+            Parsetree.Pcstr_tuple (typ :: more_args)
+          | _ ->
+            let fields =
+              match attrs with
+              | [] ->
+                parse_comma_delimited_region ~grammar:Grammar.FieldDeclarations
+                  ~closing:Rbrace ~f:parse_field_declaration_region p
+              | attrs ->
+                let first =
+                  let field = parse_field_declaration p in
+                  {field with Parsetree.pld_attributes = attrs}
+                in
+                if p.token = Rbrace then [first]
+                else (
+                  Parser.expect Comma p;
+                  first
+                  :: parse_comma_delimited_region
+                       ~grammar:Grammar.FieldDeclarations ~closing:Rbrace
+                       ~f:parse_field_declaration_region p)
+            in
+            Parser.expect Rbrace p;
+            Parser.optional p Comma |> ignore;
+            Parser.expect Rparen p;
+            Parsetree.Pcstr_record fields))
+      | _ ->
+        let args =
+          parse_comma_delimited_region ~grammar:Grammar.TypExprList
+            ~closing:Rparen ~f:parse_typ_expr_region p
+        in
+        Parser.expect Rparen p;
+        Parsetree.Pcstr_tuple args)
+    | _ -> Pcstr_tuple []
+  in
+  let res =
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      Some (parse_typ_expr p)
+    | _ -> None
+  in
+  (constr_args, res)
+
+(* Helper to check if current token is a bar or doc comment followed by a bar *)
+and is_bar_or_doc_comment_then_bar p =
+  Parser.lookahead p (fun state ->
+      match state.Parser.token with
+      | DocComment _ -> (
+        Parser.next state;
+        match state.token with
+        | Bar -> true
+        | _ -> false)
+      | Bar -> true
+      | _ -> false)
+
+(* constr-decl ::=
+ *  | constr-name
+ *  | attrs constr-name
+ *  | constr-name const-args
+ *  | attrs constr-name const-args *)
+and parse_type_constructor_declaration_with_bar p =
+  if is_bar_or_doc_comment_then_bar p then (
+    let doc_comment_attrs =
+      match p.Parser.token with
+      | DocComment (loc, s) ->
+        Parser.next p;
+        [doc_comment_to_attribute loc s]
+      | _ -> []
+    in
+    let start_pos = p.Parser.start_pos in
+    Parser.next p;
+    let constr = parse_type_constructor_declaration ~start_pos p in
+    Some
+      {
+        constr with
+        Parsetree.pcd_attributes =
+          doc_comment_attrs @ constr.Parsetree.pcd_attributes;
+      })
+  else None
+
+and parse_type_constructor_declaration ~start_pos p =
+  Parser.leave_breadcrumb p Grammar.ConstructorDeclaration;
+  let attrs = parse_attributes p in
+  match p.Parser.token with
+  | DotDotDot ->
+    Parser.next p;
+    let name = Location.mkloc "..." (mk_loc start_pos p.prev_end_pos) in
+    let typ = parse_poly_type_expr p in
+    let loc = mk_loc start_pos typ.ptyp_loc.loc_end in
+    Ast_helper.Type.constructor ~loc ~attrs ~args:(Pcstr_tuple [typ]) name
+  | Uident uident ->
+    let uident_loc = mk_loc p.start_pos p.end_pos in
+    Parser.next p;
+    let args, res = parse_constr_decl_args p in
+    Parser.eat_breadcrumb p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Type.constructor ~loc ~attrs ?res ~args
+      (Location.mkloc uident uident_loc)
+  | t ->
+    Parser.err p (Diagnostics.uident t);
+    Ast_helper.Type.constructor (Location.mknoloc "_")
+
+(* [|] constr-decl  { | constr-decl }   *)
+and parse_type_constructor_declarations ?first p =
+  let first_constr_decl =
+    match first with
+    | None ->
+      let doc_comment_attrs =
+        match p.Parser.token with
+        | DocComment (loc, s) ->
+          Parser.next p;
+          [doc_comment_to_attribute loc s]
+        | _ -> []
+      in
+      let start_pos = p.Parser.start_pos in
+      ignore (Parser.optional p Token.Bar);
+      let constr = parse_type_constructor_declaration ~start_pos p in
+      {constr with pcd_attributes = doc_comment_attrs @ constr.pcd_attributes}
+    | Some first_constr_decl -> first_constr_decl
+  in
+  first_constr_decl
+  :: parse_region ~grammar:Grammar.ConstructorDeclaration
+       ~f:parse_type_constructor_declaration_with_bar p
+
+(*
+ * type-representation ::=
+ *  ∣	 = [ | ] constr-decl  { | constr-decl }
+ *  ∣	 = private [ | ] constr-decl  { | constr-decl }
+ *  |  = |
+ *  ∣	 = private |
+ *  ∣	 = record-decl
+ *  ∣	 = private record-decl
+ *  |  = ..
+ *)
+and parse_type_representation ?current_type_name_path ?inline_types_context p =
+  Parser.leave_breadcrumb p Grammar.TypeRepresentation;
+  (* = consumed *)
+  let private_flag =
+    if Parser.optional p Token.Private then Asttypes.Private
+    else Asttypes.Public
+  in
+  let kind =
+    match p.Parser.token with
+    | Bar | Uident _ | DocComment _ ->
+      Parsetree.Ptype_variant (parse_type_constructor_declarations p)
+    | At -> (
+      (* Attributes can prefix either a variant (constructor list), a record, or an
+         open/extensible variant marker (`..`). Peek past attributes and any doc
+         comments to decide which kind it is. *)
+      let after_attrs =
+        Parser.lookahead p (fun state ->
+            ignore (parse_attributes state);
+            skip_doc_comments state;
+            state.Parser.token)
+      in
+      match after_attrs with
+      | Lbrace ->
+        (* consume the attributes and any doc comments before the record *)
+        ignore (parse_attributes p);
+        skip_doc_comments p;
+        Parsetree.Ptype_record
+          (parse_record_declaration ?current_type_name_path
+             ?inline_types_context p)
+      | DotDot ->
+        (* attributes before an open variant marker; consume attrs/docs then handle `..` *)
+        ignore (parse_attributes p);
+        skip_doc_comments p;
+        Parser.next p;
+        (* consume DotDot *)
+        Ptype_open
+      | _ ->
+        (* fall back to variant constructor declarations; leave attributes for the
+             constructor parsing so they attach to the first constructor. *)
+        Parsetree.Ptype_variant (parse_type_constructor_declarations p))
+    | Lbrace ->
+      Parsetree.Ptype_record
+        (parse_record_declaration ?current_type_name_path ?inline_types_context
+           p)
+    | DotDot ->
+      Parser.next p;
+      Ptype_open
+    | token ->
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      (* TODO: I have no idea if this is even remotely a good idea *)
+      Parsetree.Ptype_variant []
+  in
+  Parser.eat_breadcrumb p;
+  (private_flag, kind)
+
+(* type-param	::=
+ *  | variance 'lident
+ *  | variance 'uident
+ *  | variance _
+ *
+ * variance ::=
+ *   | +
+ *   | -
+ *   | (* empty *)
+ *)
+and parse_type_param p =
+  let variance =
+    match p.Parser.token with
+    | Plus ->
+      Parser.next p;
+      Asttypes.Covariant
+    | Minus ->
+      Parser.next p;
+      Contravariant
+    | _ -> Invariant
+  in
+  match p.Parser.token with
+  | SingleQuote ->
+    Parser.next p;
+    let ident, loc =
+      if p.Parser.token = Eof then (
+        Parser.err ~start_pos:p.start_pos p
+          (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
+        ("", mk_loc p.start_pos p.prev_end_pos))
+      else parse_ident ~msg:ErrorMessages.type_param ~start_pos:p.start_pos p
+    in
+    Some (Ast_helper.Typ.var ~loc ident, variance)
+  | Underscore ->
+    let loc = mk_loc p.start_pos p.end_pos in
+    Parser.next p;
+    Some (Ast_helper.Typ.any ~loc (), variance)
+  | (Uident _ | Lident _) as token ->
+    Parser.err p
+      (Diagnostics.message
+         ("Type params start with a singlequote: '" ^ Token.to_string token));
+    let ident, loc =
+      parse_ident ~msg:ErrorMessages.type_param ~start_pos:p.start_pos p
+    in
+    Some (Ast_helper.Typ.var ~loc ident, variance)
+  | _token -> None
+
+(* type-params	::=
+ *  | <type-param>
+ *  ∣	<type-param, type-param>
+ *  ∣	<type-param, type-param, type-param>
+ *  ∣	<type-param, type-param, type-param,>
+ *
+ *  TODO: when we have pretty-printer show an error
+ *  with the actual code corrected. *)
+and parse_type_params ~parent p =
+  let opening = p.Parser.token in
+  match opening with
+  | (LessThan | Lparen) when p.start_pos.pos_lnum == p.prev_end_pos.pos_lnum ->
+    Scanner.set_diamond_mode p.scanner;
+    let opening_start_pos = p.start_pos in
+    Parser.leave_breadcrumb p Grammar.TypeParams;
+    Parser.next p;
+    let params =
+      parse_comma_delimited_region ~grammar:Grammar.TypeParams
+        ~closing:GreaterThan ~f:parse_type_param p
+    in
+    let () =
+      match p.token with
+      | Rparen when opening = Token.Lparen ->
+        let msg =
+          Doc.breakable_group ~force_break:true
+            (Doc.concat
+               [
+                 Doc.text "Type parameters require angle brackets:";
+                 Doc.indent
+                   (Doc.concat
+                      [
+                        Doc.line;
+                        Doc.concat
+                          [
+                            ResPrinter.print_longident parent.Location.txt;
+                            ResPrinter.print_type_params params
+                              CommentTable.empty;
+                          ];
+                      ]);
+               ])
+          |> Doc.to_string ~width:80
+        in
+        Parser.err ~start_pos:opening_start_pos p (Diagnostics.message msg);
+        Parser.next p
+      | _ -> Parser.expect GreaterThan p
+    in
+    Scanner.pop_mode p.scanner Diamond;
+    Parser.eat_breadcrumb p;
+    params
+  | _ -> []
+
+(* type-constraint	::=	constraint ' ident =  typexpr *)
+and parse_type_constraint p =
+  let start_pos = p.Parser.start_pos in
+  match p.Parser.token with
+  | Token.Constraint -> (
+    Parser.next p;
+    Parser.expect SingleQuote p;
+    match p.Parser.token with
+    | Lident ident | Uident ident ->
+      let ident_loc = mk_loc start_pos p.end_pos in
+      Parser.next p;
+      Parser.expect Equal p;
+      let typ = parse_typ_expr p in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Some (Ast_helper.Typ.var ~loc:ident_loc ident, typ, loc)
+    | t ->
+      Parser.err p (Diagnostics.lident t);
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Some (Ast_helper.Typ.any (), parse_typ_expr p, loc))
+  | _ -> None
+
+(* type-constraints ::=
+ *  | (* empty *)
+ *  | type-constraint
+ *  | type-constraint type-constraint
+ *  | type-constraint type-constraint type-constraint (* 0 or more *)
+ *)
+and parse_type_constraints p =
+  parse_region ~grammar:Grammar.TypeConstraint ~f:parse_type_constraint p
+
+and parse_type_equation_or_constr_decl p =
+  let uident_start_pos = p.Parser.start_pos in
+  match p.Parser.token with
+  | Uident uident -> (
+    Parser.next p;
+    match p.Parser.token with
+    | Dot -> (
+      Parser.next p;
+      let type_constr =
+        parse_value_path_tail p uident_start_pos (Longident.Lident uident)
+      in
+      let loc = mk_loc uident_start_pos p.prev_end_pos in
+      let typ =
+        parse_type_alias p
+          (Ast_helper.Typ.constr ~loc type_constr
+             (parse_type_constructor_args ~constr_name:type_constr p))
+      in
+      match p.token with
+      | Equal ->
+        Parser.next p;
+        let priv, kind = parse_type_representation p in
+        (Some typ, priv, kind)
+      | EqualGreater ->
+        Parser.next p;
+        let return_type = parse_typ_expr ~alias:false p in
+        let loc = mk_loc uident_start_pos p.prev_end_pos in
+        let arrow_type =
+          Ast_helper.Typ.arrow ~loc ~arity:(Some 1)
+            {attrs = []; lbl = Nolabel; typ}
+            return_type
+        in
+        let typ = parse_type_alias p arrow_type in
+        (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
+      | _ -> (Some typ, Asttypes.Public, Parsetree.Ptype_abstract))
+    | _ ->
+      let uident_end_pos = p.prev_end_pos in
+      let args, res = parse_constr_decl_args p in
+      let first =
+        Some
+          (let uident_loc = mk_loc uident_start_pos uident_end_pos in
+           Ast_helper.Type.constructor
+             ~loc:(mk_loc uident_start_pos p.prev_end_pos)
+             ?res ~args
+             (Location.mkloc uident uident_loc))
+      in
+      ( None,
+        Asttypes.Public,
+        Parsetree.Ptype_variant (parse_type_constructor_declarations p ?first)
+      ))
+  | t ->
+    Parser.err p (Diagnostics.uident t);
+    (* TODO: is this a good idea? *)
+    (None, Asttypes.Public, Parsetree.Ptype_abstract)
+
+and parse_spread_tail_classified ?current_type_name_path ?inline_types_context
+    ~start_pos ~spread_typ ~grammar p =
+  match p.token with
+  | Rbrace ->
+    (* `{...t}` no extra fields: treat as record without tail fields *)
+    Parser.next p;
+    `Record []
+  | _ ->
+    Parser.expect Comma p;
+    let found_object_field = ref false in
+    let (fields : Parsetree.label_declaration list) =
+      parse_comma_delimited_region ~grammar ~closing:Rbrace
+        ~f:
+          (parse_field_declaration_region ?current_type_name_path
+             ?inline_types_context ~found_object_field)
+        p
+    in
+    Parser.expect Rbrace p;
+    if !found_object_field then
+      (* Object-style: build an object type that inherits the spread *)
+      let obj_fields =
+        let convert (ld : Parsetree.label_declaration) =
+          let ({Parsetree.pld_name; pld_type; pld_attributes; _}
+                : Parsetree.label_declaration) =
+            ld
+          in
+          match pld_name.txt with
+          | "..." -> Parsetree.Oinherit pld_type
+          | _ -> Otag (pld_name, pld_attributes, pld_type)
+        in
+        Parsetree.Oinherit spread_typ :: List.map convert fields
+      in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      let typ =
+        Ast_helper.Typ.object_ ~loc obj_fields Asttypes.Closed
+        |> parse_type_alias p
+      in
+      let typ = parse_arrow_type_rest ~es6_arrow:true ~start_pos typ p in
+      `Object typ
+    else `Record fields
+
+and parse_record_or_object_decl ?current_type_name_path ?inline_types_context p
+    =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Lbrace p;
+  match p.Parser.token with
+  | DotDot | Dot ->
+    let closed_flag =
+      match p.token with
+      | DotDot ->
+        Parser.next p;
+        Asttypes.Open
+      | Dot ->
+        Parser.next p;
+        Asttypes.Closed
+      | _ -> Asttypes.Closed
+    in
+    let fields =
+      parse_comma_delimited_region ~grammar:Grammar.StringFieldDeclarations
+        ~closing:Rbrace ~f:parse_string_field_declaration p
+    in
+    Parser.expect Rbrace p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    let typ =
+      Ast_helper.Typ.object_ ~loc ~attrs:[] fields closed_flag
+      |> parse_type_alias p
+    in
+    let typ = parse_arrow_type_rest ~es6_arrow:true ~start_pos typ p in
+    (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
+  | DotDotDot -> (
+    let dotdotdot_start = p.start_pos in
+    let dotdotdot_end = p.end_pos in
+    (* start of object type spreading, e.g. `type u = {...a, "u": int}` *)
+    Parser.next p;
+    let typ = parse_typ_expr p in
+    match p.token with
+    | Rbrace ->
+      (* {...x}, spread without extra fields *)
+      Parser.next p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      let dot_field =
+        Ast_helper.Type.field ~loc
+          {txt = "..."; loc = mk_loc dotdotdot_start dotdotdot_end}
+          typ
+      in
+      let kind = Parsetree.Ptype_record [dot_field] in
+      (None, Public, kind)
+    | _ ->
+      Parser.expect Comma p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      let dot_field =
+        Ast_helper.Type.field ~loc
+          {txt = "..."; loc = mk_loc dotdotdot_start dotdotdot_end}
+          typ
+      in
+      let found_object_field = ref false in
+      let fields =
+        parse_comma_delimited_region ~grammar:Grammar.RecordDecl ~closing:Rbrace
+          ~f:
+            (parse_field_declaration_region ?current_type_name_path
+               ?inline_types_context ~found_object_field)
+          p
+      in
+      Parser.expect Rbrace p;
+      if !found_object_field then
+        let fields =
+          Ext_list.map fields (fun ld ->
+              match ld.pld_name.txt with
+              | "..." -> Parsetree.Oinherit ld.pld_type
+              | _ -> Otag (ld.pld_name, ld.pld_attributes, ld.pld_type))
+        in
+        let dot_field = Parsetree.Oinherit typ in
+        let typ_obj = Ast_helper.Typ.object_ (dot_field :: fields) Closed in
+        let typ_obj = parse_type_alias p typ_obj in
+        let typ_obj =
+          parse_arrow_type_rest ~es6_arrow:true ~start_pos typ_obj p
+        in
+        (Some typ_obj, Public, Ptype_abstract)
+      else
+        let kind = Parsetree.Ptype_record (dot_field :: fields) in
+        (None, Public, kind))
+  | _ -> (
+    let attrs = parse_attributes p in
+    match p.Parser.token with
+    | String _ ->
+      let closed_flag = Asttypes.Closed in
+      let fields =
+        match attrs with
+        | [] ->
+          parse_comma_delimited_region ~grammar:Grammar.StringFieldDeclarations
+            ~closing:Rbrace ~f:parse_string_field_declaration p
+        | attrs ->
+          let first =
+            Parser.leave_breadcrumb p Grammar.StringFieldDeclarations;
+            let field =
+              match parse_string_field_declaration p with
+              | Some field -> field
+              | None -> assert false
+            in
+            (* parse comma after first *)
+            let () =
+              match p.Parser.token with
+              | Rbrace | Eof -> ()
+              | Comma -> Parser.next p
+              | _ -> Parser.expect Comma p
+            in
+            Parser.eat_breadcrumb p;
+            match field with
+            | Parsetree.Otag (label, _, ct) -> Parsetree.Otag (label, attrs, ct)
+            | Oinherit ct -> Oinherit ct
+          in
+          first
+          :: parse_comma_delimited_region
+               ~grammar:Grammar.StringFieldDeclarations ~closing:Rbrace
+               ~f:parse_string_field_declaration p
+      in
+      Parser.expect Rbrace p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      let typ =
+        Ast_helper.Typ.object_ ~loc ~attrs:[] fields closed_flag
+        |> parse_type_alias p
+      in
+      let typ = parse_arrow_type_rest ~es6_arrow:true ~start_pos typ p in
+      (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
+    | _ ->
+      Parser.leave_breadcrumb p Grammar.RecordDecl;
+      let fields =
+        (* XXX *)
+        match attrs with
+        | [] ->
+          parse_comma_delimited_region ~grammar:Grammar.FieldDeclarations
+            ~closing:Rbrace
+            ~f:
+              (parse_field_declaration_region ?current_type_name_path
+                 ?inline_types_context)
+            p
+        | attr :: _ as attrs ->
+          let first =
+            let field =
+              parse_field_declaration ?current_type_name_path
+                ?inline_types_context p
+            in
+            Parser.optional p Comma |> ignore;
+            {
+              field with
+              Parsetree.pld_attributes = attrs;
+              pld_loc =
+                {
+                  field.Parsetree.pld_loc with
+                  loc_start = (attr |> fst).loc.loc_start;
+                };
+            }
+          in
+          first
+          :: parse_comma_delimited_region ~grammar:Grammar.FieldDeclarations
+               ~closing:Rbrace
+               ~f:
+                 (parse_field_declaration_region ?current_type_name_path
+                    ?inline_types_context)
+               p
+      in
+      Parser.expect Rbrace p;
+      Parser.eat_breadcrumb p;
+      (None, Asttypes.Public, Parsetree.Ptype_record fields))
+
+and parse_private_eq_or_repr p =
+  Parser.expect Private p;
+  match p.Parser.token with
+  | Lbrace ->
+    let manifest, _, kind = parse_record_or_object_decl p in
+    (manifest, Asttypes.Private, kind)
+  | Uident _ ->
+    let manifest, _, kind = parse_type_equation_or_constr_decl p in
+    (manifest, Asttypes.Private, kind)
+  | Bar | DotDot ->
+    let _, kind = parse_type_representation p in
+    (None, Asttypes.Private, kind)
+  | t when Grammar.is_typ_expr_start t ->
+    (Some (parse_typ_expr p), Asttypes.Private, Parsetree.Ptype_abstract)
+  | _ ->
+    let _, kind = parse_type_representation p in
+    (None, Asttypes.Private, kind)
+
+(*
+  polymorphic-variant-type	::=
+                            | [ tag-spec-first  { | tag-spec } ]
+                            | [> [ tag-spec ]  { | tag-spec } ]
+                            | [< [|] tag-spec-full  { | tag-spec-full }  [ > { `tag-name }+ ] ]
+
+            tag-spec-first	::=	`tag-name  [ of typexpr ]
+                            |	[ typexpr ] |  tag-spec
+
+                  tag-spec	::=	`tag-name  [ of typexpr ]
+                            |	typexpr
+
+              tag-spec-full	::=	`tag-name  [ of [&] typexpr  { & typexpr } ]
+                             |	typexpr
+*)
+and parse_polymorphic_variant_type ~attrs p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Lbracket p;
+  match p.token with
+  | GreaterThan ->
+    Parser.next p;
+    let row_fields =
+      match p.token with
+      | Rbracket -> []
+      | Bar -> parse_tag_specs p
+      | _ ->
+        let row_field = parse_tag_spec p in
+        row_field :: parse_tag_specs p
+    in
+    let variant =
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Typ.variant ~attrs ~loc row_fields Open None
+    in
+    Parser.expect Rbracket p;
+    variant
+  | LessThan ->
+    Parser.next p;
+    Parser.optional p Bar |> ignore;
+    let row_field = parse_tag_spec_full p in
+    let row_fields = parse_tag_spec_fulls p in
+    let tag_names = parse_tag_names p in
+    let variant =
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Typ.variant ~attrs ~loc (row_field :: row_fields) Closed
+        (Some tag_names)
+    in
+    Parser.expect Rbracket p;
+    variant
+  | _ ->
+    let row_fields1 = parse_tag_spec_first p in
+    let row_fields2 = parse_tag_specs p in
+    let variant =
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Typ.variant ~attrs ~loc (row_fields1 @ row_fields2) Closed None
+    in
+    Parser.expect Rbracket p;
+    variant
+
+and parse_tag_name p =
+  match p.Parser.token with
+  | Hash ->
+    let ident, _loc = parse_hash_ident ~start_pos:p.start_pos p in
+    Some ident
+  | _ -> None
+
+and parse_tag_names p =
+  if p.Parser.token == GreaterThan then (
+    Parser.next p;
+    parse_region p ~grammar:Grammar.TagNames ~f:parse_tag_name)
+  else []
+
+and parse_tag_spec_fulls p =
+  match p.Parser.token with
+  | Rbracket -> []
+  | GreaterThan -> []
+  | Bar ->
+    Parser.next p;
+    let row_field = parse_tag_spec_full p in
+    row_field :: parse_tag_spec_fulls p
+  | _ -> []
+
+and parse_tag_spec_full p =
+  let attrs = parse_attributes p in
+  match p.Parser.token with
+  | Hash -> parse_polymorphic_variant_type_spec_hash ~attrs ~full:true p
+  | _ ->
+    let typ = parse_typ_expr ~attrs p in
+    Parsetree.Rinherit typ
+
+and parse_tag_specs p =
+  match p.Parser.token with
+  | (Bar | DocComment _) when is_bar_or_doc_comment_then_bar p ->
+    let doc_comment_attrs =
+      match p.Parser.token with
+      | DocComment (loc, s) ->
+        Parser.next p;
+        [doc_comment_to_attribute loc s]
+      | _ -> []
+    in
+    Parser.expect Bar p;
+    let tag = parse_tag_spec p in
+    let tag_with_doc =
+      match tag with
+      | Parsetree.Rtag (name, attrs, contains_constant, types) ->
+        Parsetree.Rtag
+          (name, doc_comment_attrs @ attrs, contains_constant, types)
+      | Rinherit typ ->
+        Rinherit
+          {typ with ptyp_attributes = doc_comment_attrs @ typ.ptyp_attributes}
+    in
+    tag_with_doc :: parse_tag_specs p
+  | _ -> []
+
+and parse_tag_spec p =
+  let doc_comment_attrs =
+    match p.Parser.token with
+    | DocComment (loc, s) ->
+      Parser.next p;
+      [doc_comment_to_attribute loc s]
+    | _ -> []
+  in
+  let attrs = doc_comment_attrs @ parse_attributes p in
+  match p.Parser.token with
+  | Hash -> parse_polymorphic_variant_type_spec_hash ~attrs ~full:false p
+  | _ ->
+    let typ = parse_typ_expr ~attrs p in
+    Parsetree.Rinherit typ
+
+and parse_tag_spec_first p =
+  match p.Parser.token with
+  | (Bar | DocComment _) when is_bar_or_doc_comment_then_bar p ->
+    let doc_comment_attrs =
+      match p.Parser.token with
+      | DocComment (loc, s) ->
+        Parser.next p;
+        [doc_comment_to_attribute loc s]
+      | _ -> []
+    in
+    Parser.expect Bar p;
+    let tag = parse_tag_spec p in
+    (match tag with
+    | Parsetree.Rtag (name, attrs, contains_constant, types) ->
+      Parsetree.Rtag (name, doc_comment_attrs @ attrs, contains_constant, types)
+    | Rinherit typ ->
+      Rinherit
+        {typ with ptyp_attributes = doc_comment_attrs @ typ.ptyp_attributes})
+    :: parse_tag_specs p
+  | DocComment _ | Hash | At -> (
+    let doc_comment_attrs =
+      match p.Parser.token with
+      | DocComment (loc, s) ->
+        Parser.next p;
+        [doc_comment_to_attribute loc s]
+      | _ -> []
+    in
+    let attrs = doc_comment_attrs @ parse_attributes p in
+    match p.Parser.token with
+    | Hash -> [parse_polymorphic_variant_type_spec_hash ~attrs ~full:false p]
+    | _ -> (
+      let typ = parse_typ_expr ~attrs p in
+      match p.token with
+      | Rbracket ->
+        (* example: [ListStyleType.t] *)
+        [Parsetree.Rinherit typ]
+      | _ ->
+        Parser.expect Bar p;
+        [Parsetree.Rinherit typ; parse_tag_spec p]))
+  | _ -> (
+    let typ = parse_typ_expr p in
+    match p.token with
+    | Rbracket ->
+      (* example: [ListStyleType.t] *)
+      [Parsetree.Rinherit typ]
+    | _ ->
+      Parser.expect Bar p;
+      [Parsetree.Rinherit typ; parse_tag_spec p])
+
+and parse_polymorphic_variant_type_spec_hash ~attrs ~full p :
+    Parsetree.row_field =
+  let start_pos = p.Parser.start_pos in
+  let ident, loc = parse_hash_ident ~start_pos p in
+  let rec loop p =
+    match p.Parser.token with
+    | Ampersand when full ->
+      Parser.next p;
+      let row_field = parse_polymorphic_variant_type_args p in
+      row_field :: loop p
+    | _ -> []
+  in
+  let first_tuple, tag_contains_a_constant_empty_constructor =
+    match p.Parser.token with
+    | Ampersand when full ->
+      Parser.next p;
+      ([parse_polymorphic_variant_type_args p], true)
+    | Lparen -> ([parse_polymorphic_variant_type_args p], false)
+    | _ -> ([], true)
+  in
+  let tuples = first_tuple @ loop p in
+  Parsetree.Rtag
+    ( Location.mkloc ident loc,
+      attrs,
+      tag_contains_a_constant_empty_constructor,
+      tuples )
+
+and parse_polymorphic_variant_type_args p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Lparen p;
+  let args =
+    parse_comma_delimited_region ~grammar:Grammar.TypExprList ~closing:Rparen
+      ~f:parse_typ_expr_region p
+  in
+  Parser.expect Rparen p;
+  let attrs = [] in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  match args with
+  | [({ptyp_desc = Ptyp_tuple _} as typ)] as types ->
+    if p.mode = ParseForTypeChecker then typ
+    else Ast_helper.Typ.tuple ~loc ~attrs types
+  | [typ] -> typ
+  | types -> Ast_helper.Typ.tuple ~loc ~attrs types
+
+and parse_type_equation_and_representation ?current_type_name_path
+    ?inline_types_context p =
+  match p.Parser.token with
+  | (Equal | Bar) as token -> (
+    if token = Bar then Parser.expect Equal p;
+    Parser.next p;
+    match p.Parser.token with
+    | Uident _ -> parse_type_equation_or_constr_decl p
+    | Lbrace ->
+      parse_record_or_object_decl ?current_type_name_path ?inline_types_context
+        p
+    | Private -> parse_private_eq_or_repr p
+    | Bar | DotDot | DocComment _ ->
+      let priv, kind = parse_type_representation p in
+      (None, priv, kind)
+    | At -> (
+      (* Attributes can start a representation (variant/record/open variant) or a manifest.
+         Look ahead past attributes (and doc comments). If a representation-like token follows,
+         parse it as a representation; otherwise treat as a manifest. *)
+      let is_representation_after_attrs =
+        Parser.lookahead p (fun state ->
+            ignore (parse_attributes state);
+            (* optionally skip a run of doc comments before deciding *)
+            skip_doc_comments state;
+            match state.Parser.token with
+            | Lbrace -> (
+              (* Disambiguate record declaration vs object type.
+                 Peek inside the braces; if it looks like an object (String/Dot/DotDot/DotDotDot),
+                 then this is a manifest type expression, not a representation. If it looks like
+                 a record field (e.g. Lident or attributes before one), treat as representation. *)
+              Parser.next state;
+              (* consume Lbrace *)
+              ignore (parse_attributes state);
+              skip_doc_comments state;
+              match state.Parser.token with
+              | String _ | Dot | DotDot | DotDotDot ->
+                false (* object type => manifest *)
+              | _ -> true
+              (* record decl => representation *))
+            | Bar -> true (* variant constructor list *)
+            | DotDot -> true (* extensible/open variant ".." *)
+            | Uident _ -> (
+              (* constructor vs module-qualified manifest *)
+              Parser.next state;
+              match state.Parser.token with
+              | Dot -> false (* M.t => manifest *)
+              | _ -> true
+              (* Uident starting a constructor *))
+            | DocComment _ -> true (* doc before constructor list *)
+            | _ -> false)
+      in
+      if is_representation_after_attrs then
+        let priv, kind = parse_type_representation p in
+        (None, priv, kind)
+      else
+        let manifest = Some (parse_typ_expr p) in
+        match p.Parser.token with
+        | Equal ->
+          Parser.next p;
+          let priv, kind =
+            parse_type_representation ?current_type_name_path
+              ?inline_types_context p
+          in
+          (manifest, priv, kind)
+        | _ -> (manifest, Public, Parsetree.Ptype_abstract))
+    | _ -> (
+      let manifest = Some (parse_typ_expr p) in
+      match p.Parser.token with
+      | Equal ->
+        Parser.next p;
+        let priv, kind =
+          parse_type_representation ?current_type_name_path
+            ?inline_types_context p
+        in
+        (manifest, priv, kind)
+      | _ -> (manifest, Public, Parsetree.Ptype_abstract)))
+  | _ -> (None, Public, Parsetree.Ptype_abstract)
+
+(* type-definition	::=	type [rec] typedef  { and typedef }
+ * typedef	::=	typeconstr-name [type-params] type-information
+ * type-information	::=	[type-equation]  [type-representation]  { type-constraint }
+ * type-equation	::=	= typexpr *)
+and parse_type_def ~attrs ~start_pos p =
+  Parser.leave_breadcrumb p Grammar.TypeDef;
+  (* let attrs = match attrs with | Some attrs -> attrs | None -> parseAttributes p in *)
+  Parser.leave_breadcrumb p Grammar.TypeConstrName;
+  let name, loc = parse_lident p in
+  let type_constr_name = Location.mkloc name loc in
+  Parser.eat_breadcrumb p;
+  let params =
+    let constr_name = Location.mkloc (Longident.Lident name) loc in
+    parse_type_params ~parent:constr_name p
+  in
+  let type_def =
+    let manifest, priv, kind = parse_type_equation_and_representation p in
+    let cstrs = parse_type_constraints p in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Type.mk ~loc ~attrs ~priv ~kind ~params ~cstrs ?manifest
+      type_constr_name
+  in
+  Parser.eat_breadcrumb p;
+  type_def
+
+and parse_type_extension ~params ~attrs ~name p =
+  Parser.expect PlusEqual p;
+  let priv =
+    if Parser.optional p Token.Private then Asttypes.Private
+    else Asttypes.Public
+  in
+  let constr_start = p.Parser.start_pos in
+  Parser.optional p Bar |> ignore;
+  let first =
+    let attrs, name, kind =
+      match p.Parser.token with
+      | Bar ->
+        Parser.next p;
+        parse_constr_def ~parse_attrs:true p
+      | _ -> parse_constr_def ~parse_attrs:true p
+    in
+    let loc = mk_loc constr_start p.prev_end_pos in
+    Ast_helper.Te.constructor ~loc ~attrs name kind
+  in
+  let rec loop p cs =
+    match p.Parser.token with
+    | Bar ->
+      let start_pos = p.Parser.start_pos in
+      Parser.next p;
+      let attrs, name, kind = parse_constr_def ~parse_attrs:true p in
+      let ext_constr =
+        Ast_helper.Te.constructor ~attrs
+          ~loc:(mk_loc start_pos p.prev_end_pos)
+          name kind
+      in
+      loop p (ext_constr :: cs)
+    | _ -> List.rev cs
+  in
+  let constructors = loop p [first] in
+  Ast_helper.Te.mk ~attrs ~params ~priv name constructors
+
+and parse_type_definitions ~current_type_name_path ~inline_types_context ~attrs
+    ~name ~params ~start_pos p =
+  let type_def =
+    let manifest, priv, kind =
+      parse_type_equation_and_representation ~current_type_name_path
+        ~inline_types_context p
+    in
+    let cstrs = parse_type_constraints p in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Type.mk ~loc ~attrs ~priv ~kind ~params ~cstrs ?manifest
+      {name with txt = lident_of_path name.Location.txt}
+  in
+  let rec loop p defs =
+    let start_pos = p.Parser.start_pos in
+    let attrs = parse_attributes_and_binding p in
+    match p.Parser.token with
+    | And ->
+      Parser.next p;
+      let type_def = parse_type_def ~attrs ~start_pos p in
+      loop p (type_def :: defs)
+    | _ -> List.rev defs
+  in
+  loop p [type_def]
+
+(* TODO: decide if we really want type extensions (eg. type x += Blue)
+ * It adds quite a bit of complexity that can be avoided,
+ * implemented for now. Needed to get a feel for the complexities of
+ * this territory of the grammar *)
+and parse_type_definition_or_extension ~attrs p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Token.Typ p;
+  let rec_flag =
+    match p.token with
+    | Rec ->
+      Parser.next p;
+      Asttypes.Recursive
+    | Lident "nonrec" ->
+      Parser.next p;
+      Asttypes.Nonrecursive
+    | _ -> Asttypes.Nonrecursive
+  in
+  let name = parse_value_path p in
+  let params = parse_type_params ~parent:name p in
+  match p.Parser.token with
+  | PlusEqual -> TypeExt (parse_type_extension ~params ~attrs ~name p)
+  | _ ->
+    (* shape of type name should be Lident, i.e. `t` is accepted. `User.t` not *)
+    let () =
+      match name.Location.txt with
+      | Lident _ -> ()
+      | longident ->
+        Parser.err ~start_pos:name.loc.loc_start ~end_pos:name.loc.loc_end p
+          (longident |> ErrorMessages.type_declaration_name_longident
+         |> Diagnostics.message)
+    in
+    let current_type_name_path = Longident.flatten name.txt in
+    let inline_types_context = {found_inline_types = []; params} in
+    let type_defs =
+      parse_type_definitions ~inline_types_context ~current_type_name_path
+        ~attrs ~name ~params ~start_pos p
+    in
+    let rec_flag =
+      if List.length inline_types_context.found_inline_types > 0 then
+        Asttypes.Recursive
+      else rec_flag
+    in
+    let inline_types =
+      inline_types_context.found_inline_types
+      |> List.map (fun (inline_type_name, loc, kind) ->
+             Ast_helper.Type.mk ~params
+               ~attrs:[(Location.mknoloc "res.inlineRecordDefinition", PStr [])]
+               ~loc ~kind
+               {name with txt = inline_type_name})
+    in
+    TypeDef {rec_flag; types = inline_types @ type_defs}
+
+(* external value-name : typexp = external-declaration *)
+and parse_external_def ~attrs ~start_pos p =
+  let in_external = !InExternal.status in
+  InExternal.status := true;
+  Parser.leave_breadcrumb p Grammar.External;
+  Parser.expect Token.External p;
+  let name, loc = parse_lident p in
+  let name = Location.mkloc name loc in
+  Parser.expect ~grammar:Grammar.TypeExpression Colon p;
+  let typ_expr = parse_typ_expr p in
+  let equal_start = p.start_pos in
+  let equal_end = p.end_pos in
+  Parser.expect Equal p;
+  let prim =
+    match p.token with
+    | String s ->
+      Parser.next p;
+      [s]
+    | _ ->
+      Parser.err ~start_pos:equal_start ~end_pos:equal_end p
+        (Diagnostics.message
+           ("An external requires the name of the JS value you're referring \
+             to, like \"" ^ name.txt ^ "\"."));
+      []
+  in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  let vb = Ast_helper.Val.mk ~loc ~attrs ~prim name typ_expr in
+  Parser.eat_breadcrumb p;
+  InExternal.status := in_external;
+  vb
+
+(* constr-def ::=
+ *  | constr-decl
+ *  | constr-name = constr
+ *
+ *  constr-decl ::= constr-name constr-args
+ *  constr-name ::= uident
+ *  constr      ::= path-uident *)
+and parse_constr_def ~parse_attrs p =
+  let attrs = if parse_attrs then parse_attributes p else [] in
+  let name =
+    match p.Parser.token with
+    | Uident name ->
+      let loc = mk_loc p.start_pos p.end_pos in
+      Parser.next p;
+      Location.mkloc name loc
+    | t ->
+      Parser.err p (Diagnostics.uident t);
+      Location.mknoloc "_"
+  in
+  let kind =
+    match p.Parser.token with
+    | Lparen ->
+      let args, res = parse_constr_decl_args p in
+      Parsetree.Pext_decl (args, res)
+    | Equal ->
+      Parser.next p;
+      let longident = parse_module_long_ident ~lowercase:false p in
+      Parsetree.Pext_rebind longident
+    | Colon ->
+      Parser.next p;
+      let typ = parse_typ_expr p in
+      Parsetree.Pext_decl (Pcstr_tuple [], Some typ)
+    | _ -> Parsetree.Pext_decl (Pcstr_tuple [], None)
+  in
+  (attrs, name, kind)
+
+(*
+ * exception-definition	::=
+ *  | exception constr-decl
+ *  ∣	exception constr-name = constr
+ *
+ *  constr-name ::= uident
+ *  constr ::= long_uident *)
+and parse_exception_def ~attrs p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Token.Exception p;
+  let _, name, kind = parse_constr_def ~parse_attrs:false p in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Te.constructor ~loc ~attrs name kind
+
+and parse_newline_or_semicolon_structure p =
+  match p.Parser.token with
+  | Semicolon -> Parser.next p
+  | token when Grammar.is_structure_item_start token ->
+    if p.prev_end_pos.pos_lnum < p.start_pos.pos_lnum then ()
+    else
+      Parser.err ~start_pos:p.prev_end_pos ~end_pos:p.end_pos p
+        (Diagnostics.message
+           "consecutive statements on a line must be separated by ';' or a \
+            newline")
+  | _ -> ()
+
+and parse_structure_item_region p =
+  let start_pos = p.Parser.start_pos in
+  let attrs = parse_attributes p in
+  match p.Parser.token with
+  | Open ->
+    let open_description = parse_open_description ~attrs p in
+    parse_newline_or_semicolon_structure p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Str.open_ ~loc open_description)
+  | Let {unwrap} ->
+    let rec_flag, let_bindings =
+      parse_let_bindings ~unwrap ~attrs ~start_pos p
+    in
+    parse_newline_or_semicolon_structure p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Str.value ~loc rec_flag let_bindings)
+  | Typ -> (
+    Parser.begin_region p;
+    match parse_type_definition_or_extension ~attrs p with
+    | TypeDef {rec_flag; types} ->
+      parse_newline_or_semicolon_structure p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Parser.end_region p;
+      Some (Ast_helper.Str.type_ ~loc rec_flag types)
+    | TypeExt ext ->
+      parse_newline_or_semicolon_structure p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Parser.end_region p;
+      Some (Ast_helper.Str.type_extension ~loc ext))
+  | External ->
+    let external_def = parse_external_def ~attrs ~start_pos p in
+    parse_newline_or_semicolon_structure p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Str.primitive ~loc external_def)
+  | Exception ->
+    let exception_def = parse_exception_def ~attrs p in
+    parse_newline_or_semicolon_structure p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Str.exception_ ~loc exception_def)
+  | Include ->
+    let include_statement = parse_include_statement ~attrs p in
+    parse_newline_or_semicolon_structure p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Str.include_ ~loc include_statement)
+  | Module ->
+    Parser.begin_region p;
+    let structure_item =
+      parse_module_or_module_type_impl_or_pack_expr ~attrs p
+    in
+    parse_newline_or_semicolon_structure p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Parser.end_region p;
+    Some {structure_item with pstr_loc = loc}
+  | ModuleComment (loc, s) ->
+    Parser.next p;
+    Some
+      (Ast_helper.Str.attribute ~loc
+         ( {txt = "res.doc"; loc},
+           PStr
+             [
+               Ast_helper.Str.eval ~loc
+                 (Ast_helper.Exp.constant ~loc (Pconst_string (s, None)));
+             ] ))
+  | AtAt ->
+    let attr = parse_standalone_attribute p in
+    parse_newline_or_semicolon_structure p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Str.attribute ~loc attr)
+  | PercentPercent ->
+    let extension = parse_extension ~module_language:true p in
+    parse_newline_or_semicolon_structure p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Str.extension ~attrs ~loc extension)
+  | token when Grammar.is_expr_start token ->
+    let prev_end_pos = p.Parser.end_pos in
+    let exp = parse_expr p in
+    parse_newline_or_semicolon_structure p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Parser.check_progress ~prev_end_pos
+      ~result:(Ast_helper.Str.eval ~loc ~attrs exp)
+      p
+  | _ -> (
+    match attrs with
+    | (({Asttypes.loc = attr_loc}, _) as attr) :: _ ->
+      Parser.err ~start_pos:attr_loc.loc_start ~end_pos:attr_loc.loc_end p
+        (Diagnostics.message (ErrorMessages.attribute_without_node attr));
+      let expr = parse_expr p in
+      Some
+        (Ast_helper.Str.eval
+           ~loc:(mk_loc p.start_pos p.prev_end_pos)
+           ~attrs expr)
+    | _ -> None)
+[@@progress Parser.next, Parser.expect]
+
+(* include-statement ::= include module-expr *)
+and parse_include_statement ~attrs p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Token.Include p;
+  let mod_expr = parse_module_expr p in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Incl.mk ~loc ~attrs mod_expr
+
+and parse_atomic_module_expr p =
+  let start_pos = p.Parser.start_pos in
+  match p.Parser.token with
+  | Uident _ident ->
+    let longident = parse_module_long_ident ~lowercase:false p in
+    Ast_helper.Mod.ident ~loc:longident.loc longident
+  | Lbrace ->
+    Parser.next p;
+    let structure =
+      Ast_helper.Mod.structure
+        (parse_delimited_region ~grammar:Grammar.Structure ~closing:Rbrace
+           ~f:parse_structure_item_region p)
+    in
+    Parser.expect Rbrace p;
+    let end_pos = p.prev_end_pos in
+    {structure with pmod_loc = mk_loc start_pos end_pos}
+  | Lparen ->
+    Parser.next p;
+    let mod_expr =
+      match p.token with
+      | Rparen ->
+        Ast_helper.Mod.structure ~loc:(mk_loc start_pos p.prev_end_pos) []
+      | _ -> parse_constrained_mod_expr p
+    in
+    Parser.expect Rparen p;
+    mod_expr
+  | Lident "unpack" -> (
+    (* TODO: should this be made a keyword?? *)
+    Parser.next p;
+    Parser.expect Lparen p;
+    let expr = parse_expr p in
+    match p.Parser.token with
+    | Colon ->
+      let colon_start = p.Parser.start_pos in
+      Parser.next p;
+      let attrs = parse_attributes p in
+      let package_type = parse_package_type ~start_pos:colon_start ~attrs p in
+      Parser.expect Rparen p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      let constraint_expr = Ast_helper.Exp.constraint_ ~loc expr package_type in
+      Ast_helper.Mod.unpack ~loc constraint_expr
+    | _ ->
+      Parser.expect Rparen p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Mod.unpack ~loc expr)
+  | Percent ->
+    let extension = parse_extension p in
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Ast_helper.Mod.extension ~loc extension
+  | token ->
+    Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+    Recover.default_module_expr ()
+
+and parse_primary_mod_expr p =
+  let start_pos = p.Parser.start_pos in
+  let mod_expr = parse_atomic_module_expr p in
+  let rec loop p mod_expr =
+    match p.Parser.token with
+    | Lparen when p.prev_end_pos.pos_lnum == p.start_pos.pos_lnum ->
+      loop p (parse_module_application p mod_expr)
+    | _ -> mod_expr
+  in
+  let mod_expr = loop p mod_expr in
+  {mod_expr with pmod_loc = mk_loc start_pos p.prev_end_pos}
+
+(*
+ * functor-arg ::=
+ *  | uident : modtype
+ *  | _ : modtype
+ *  | modtype           --> "punning" for _ : modtype
+ *  | attributes functor-arg
+ *)
+and parse_functor_arg p =
+  let start_pos = p.Parser.start_pos in
+  let attrs = parse_attributes p in
+  match p.Parser.token with
+  | Uident ident -> (
+    Parser.next p;
+    let uident_end_pos = p.prev_end_pos in
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      let module_type = parse_module_type p in
+      let loc = mk_loc start_pos uident_end_pos in
+      let arg_name = Location.mkloc ident loc in
+      Some (attrs, arg_name, Some module_type, start_pos)
+    | Dot ->
+      Parser.next p;
+      let module_type =
+        let module_long_ident =
+          parse_module_long_ident_tail ~lowercase:false p start_pos
+            (Longident.Lident ident)
+        in
+        Ast_helper.Mty.ident ~loc:module_long_ident.loc module_long_ident
+      in
+      let arg_name = Location.mknoloc "_" in
+      Some (attrs, arg_name, Some module_type, start_pos)
+    | _ ->
+      let loc = mk_loc start_pos uident_end_pos in
+      let mod_ident = Location.mkloc (Longident.Lident ident) loc in
+      let module_type = Ast_helper.Mty.ident ~loc mod_ident in
+      let arg_name = Location.mknoloc "_" in
+      Some (attrs, arg_name, Some module_type, start_pos))
+  | Underscore ->
+    Parser.next p;
+    let arg_name = Location.mkloc "_" (mk_loc start_pos p.prev_end_pos) in
+    Parser.expect Colon p;
+    let module_type = parse_module_type p in
+    Some (attrs, arg_name, Some module_type, start_pos)
+  | Lparen ->
+    Parser.next p;
+    Parser.expect Rparen p;
+    let arg_name = Location.mkloc "*" (mk_loc start_pos p.prev_end_pos) in
+    Some (attrs, arg_name, None, start_pos)
+  | _ -> None
+
+and parse_functor_args p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Lparen p;
+  let args =
+    parse_comma_delimited_region ~grammar:Grammar.FunctorArgs ~closing:Rparen
+      ~f:parse_functor_arg p
+  in
+  Parser.expect Rparen p;
+  match args with
+  | [] ->
+    [
+      ([], Location.mkloc "*" (mk_loc start_pos p.prev_end_pos), None, start_pos);
+    ]
+  | args -> args
+
+and parse_functor_module_expr p =
+  let start_pos = p.Parser.start_pos in
+  let args = parse_functor_args p in
+  let return_type =
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      Some (parse_module_type ~es6_arrow:false p)
+    | _ -> None
+  in
+  Parser.expect EqualGreater p;
+  let rhs_module_expr =
+    let mod_expr = parse_module_expr p in
+    match return_type with
+    | Some mod_type ->
+      Ast_helper.Mod.constraint_
+        ~loc:
+          (mk_loc mod_expr.pmod_loc.loc_start
+             mod_type.Parsetree.pmty_loc.loc_end)
+        mod_expr mod_type
+    | None -> mod_expr
+  in
+  let end_pos = p.prev_end_pos in
+  let mod_expr =
+    List.fold_right
+      (fun (attrs, name, module_type, start_pos) acc ->
+        Ast_helper.Mod.functor_ ~loc:(mk_loc start_pos end_pos) ~attrs name
+          module_type acc)
+      args rhs_module_expr
+  in
+  {mod_expr with pmod_loc = mk_loc start_pos end_pos}
+
+(* module-expr	::=
+ *  | module-path
+ *  ∣	{ structure-items }
+ *  ∣	functorArgs =>  module-expr
+ *  ∣	module-expr(module-expr)
+ *  ∣	( module-expr )
+ *  ∣	( module-expr : module-type )
+ *  | extension
+ *  | attributes module-expr *)
+and parse_module_expr p =
+  let has_await, loc_await =
+    let start_pos = p.start_pos in
+    match p.Parser.token with
+    | Await ->
+      Parser.expect Await p;
+      let end_pos = p.end_pos in
+      (true, mk_loc start_pos end_pos)
+    | _ -> (false, mk_loc start_pos start_pos)
+  in
+  let attrs = parse_attributes p in
+  let attrs = if has_await then make_await_attr loc_await :: attrs else attrs in
+  let mod_expr =
+    if is_es6_arrow_functor p then parse_functor_module_expr p
+    else parse_primary_mod_expr p
+  in
+  {
+    mod_expr with
+    pmod_attributes = List.concat [mod_expr.pmod_attributes; attrs];
+  }
+
+and parse_constrained_mod_expr p =
+  let mod_expr = parse_module_expr p in
+  match p.Parser.token with
+  | Colon ->
+    Parser.next p;
+    let mod_type = parse_module_type p in
+    let loc = mk_loc mod_expr.pmod_loc.loc_start mod_type.pmty_loc.loc_end in
+    Ast_helper.Mod.constraint_ ~loc mod_expr mod_type
+  | _ -> mod_expr
+
+and parse_constrained_mod_expr_region p =
+  if Grammar.is_mod_expr_start p.Parser.token then
+    Some (parse_constrained_mod_expr p)
+  else None
+
+and parse_module_application p mod_expr =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Lparen p;
+  let args =
+    parse_comma_delimited_region ~grammar:Grammar.ModExprList ~closing:Rparen
+      ~f:parse_constrained_mod_expr_region p
+  in
+  Parser.expect Rparen p;
+  let args =
+    match args with
+    | [] ->
+      let loc = mk_loc start_pos p.prev_end_pos in
+      [Ast_helper.Mod.structure ~loc []]
+    | args -> args
+  in
+  List.fold_left
+    (fun mod_expr arg ->
+      Ast_helper.Mod.apply
+        ~loc:
+          (mk_loc mod_expr.Parsetree.pmod_loc.loc_start
+             arg.Parsetree.pmod_loc.loc_end)
+        mod_expr arg)
+    mod_expr args
+
+and parse_module_or_module_type_impl_or_pack_expr ~attrs p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Module p;
+  match p.Parser.token with
+  | Typ -> parse_module_type_impl ~attrs start_pos p
+  | Lparen ->
+    let expr = parse_first_class_module_expr ~start_pos p in
+    let a = parse_primary_expr ~operand:expr p in
+    let expr = parse_binary_expr ~a p 1 in
+    let expr = parse_ternary_expr expr p in
+    Ast_helper.Str.eval ~attrs expr
+  | _ -> parse_maybe_rec_module_binding ~attrs ~start_pos p
+
+and parse_module_type_impl ~attrs start_pos p =
+  Parser.expect Typ p;
+  let name_start = p.Parser.start_pos in
+  let name =
+    match p.Parser.token with
+    | Lident ident ->
+      Parser.next p;
+      let loc = mk_loc name_start p.prev_end_pos in
+      Location.mkloc ident loc
+    | Uident ident ->
+      Parser.next p;
+      let loc = mk_loc name_start p.prev_end_pos in
+      Location.mkloc ident loc
+    | t ->
+      Parser.err p (Diagnostics.uident t);
+      Location.mknoloc "_"
+  in
+  Parser.expect Equal p;
+  let module_type = parse_module_type p in
+  let module_type_declaration =
+    Ast_helper.Mtd.mk ~attrs
+      ~loc:(mk_loc name_start p.prev_end_pos)
+      ~typ:module_type name
+  in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Str.modtype ~loc module_type_declaration
+
+(* definition	::=
+   ∣	 module rec module-name :  module-type =  module-expr   { and module-name
+   :  module-type =  module-expr } *)
+and parse_maybe_rec_module_binding ~attrs ~start_pos p =
+  match p.Parser.token with
+  | Token.Rec ->
+    Parser.next p;
+    Ast_helper.Str.rec_module (parse_module_bindings ~start_pos ~attrs p)
+  | _ ->
+    Ast_helper.Str.module_
+      (parse_module_binding ~attrs ~start_pos:p.Parser.start_pos p)
+
+and parse_module_binding ~attrs ~start_pos p =
+  let name =
+    match p.Parser.token with
+    | Uident ident ->
+      let start_pos = p.Parser.start_pos in
+      Parser.next p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Location.mkloc ident loc
+    | t ->
+      Parser.err p (Diagnostics.uident t);
+      Location.mknoloc "_"
+  in
+  let body = parse_module_binding_body p in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Mb.mk ~attrs ~loc name body
+
+and parse_module_binding_body p =
+  (* TODO: make required with good error message when rec module binding *)
+  let return_mod_type =
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      Some (parse_module_type p)
+    | _ -> None
+  in
+  Parser.expect Equal p;
+  let mod_expr = parse_module_expr p in
+  match return_mod_type with
+  | Some mod_type ->
+    Ast_helper.Mod.constraint_
+      ~loc:(mk_loc mod_type.pmty_loc.loc_start mod_expr.pmod_loc.loc_end)
+      mod_expr mod_type
+  | None -> mod_expr
+
+(* module-name :  module-type =  module-expr
+ * { and module-name :  module-type =  module-expr } *)
+and parse_module_bindings ~attrs ~start_pos p =
+  let rec loop p acc =
+    let start_pos = p.Parser.start_pos in
+    let doc_attr : Parsetree.attributes =
+      match p.Parser.token with
+      | DocComment (loc, s) ->
+        Parser.next p;
+        [doc_comment_to_attribute loc s]
+      | _ -> []
+    in
+    let attrs = doc_attr @ parse_attributes_and_binding p in
+    match p.Parser.token with
+    | And ->
+      Parser.next p;
+      ignore (Parser.optional p Module);
+      (* over-parse for fault-tolerance *)
+      let mod_binding = parse_module_binding ~attrs ~start_pos p in
+      loop p (mod_binding :: acc)
+    | _ -> List.rev acc
+  in
+  let first = parse_module_binding ~attrs ~start_pos p in
+  loop p [first]
+
+and parse_atomic_module_type p =
+  let start_pos = p.Parser.start_pos in
+  let module_type =
+    match p.Parser.token with
+    | Uident _ | Lident _ ->
+      (* Ocaml allows module types to end with lowercase: module Foo : bar = { ... }
+       * lets go with uppercase terminal for now *)
+      let module_long_ident = parse_module_long_ident ~lowercase:true p in
+      Ast_helper.Mty.ident ~loc:module_long_ident.loc module_long_ident
+    | Lparen ->
+      Parser.next p;
+      let mty = parse_module_type p in
+      Parser.expect Rparen p;
+      {mty with pmty_loc = mk_loc start_pos p.prev_end_pos}
+    | Lbrace ->
+      Parser.next p;
+      let spec =
+        parse_delimited_region ~grammar:Grammar.Signature ~closing:Rbrace
+          ~f:parse_signature_item_region p
+      in
+      Parser.expect Rbrace p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Mty.signature ~loc spec
+    | Module ->
+      (* TODO: check if this is still atomic when implementing first class modules*)
+      parse_module_type_of p
+    | Percent ->
+      let extension = parse_extension p in
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Ast_helper.Mty.extension ~loc extension
+    | token ->
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      Recover.default_module_type ()
+  in
+  let module_type_loc = mk_loc start_pos p.prev_end_pos in
+  {module_type with pmty_loc = module_type_loc}
+
+and parse_functor_module_type p =
+  let start_pos = p.Parser.start_pos in
+  let args = parse_functor_args p in
+  Parser.expect EqualGreater p;
+  let rhs = parse_module_type p in
+  let end_pos = p.prev_end_pos in
+  let mod_type =
+    List.fold_right
+      (fun (attrs, name, module_type, start_pos) acc ->
+        Ast_helper.Mty.functor_ ~loc:(mk_loc start_pos end_pos) ~attrs name
+          module_type acc)
+      args rhs
+  in
+  {mod_type with pmty_loc = mk_loc start_pos end_pos}
+
+(* Module types are the module-level equivalent of type expressions: they
+ * specify the general shape and type properties of modules.
+ *
+ * module-type ::=
+ *  | modtype-path
+ *  | { signature }
+ *  | ( module-type )               --> parenthesized module-type
+ *  | functor-args => module-type   --> functor
+ *  | module-type => module-type    --> functor
+ *  | module type of module-expr
+ *  | attributes module-type
+ *  | module-type with-mod-constraints
+ *  | extension
+ *)
+and parse_module_type ?(es6_arrow = true) ?(with_ = true) p =
+  let attrs = parse_attributes p in
+  let modty =
+    if es6_arrow && is_es6_arrow_functor p then parse_functor_module_type p
+    else
+      let modty = parse_atomic_module_type p in
+      match p.Parser.token with
+      | EqualGreater when es6_arrow == true ->
+        Parser.next p;
+        let rhs = parse_module_type ~with_:false p in
+        let str = Location.mknoloc "_" in
+        let loc = mk_loc modty.pmty_loc.loc_start p.prev_end_pos in
+        Ast_helper.Mty.functor_ ~loc str (Some modty) rhs
+      | _ -> modty
+  in
+  let module_type =
+    {modty with pmty_attributes = List.concat [modty.pmty_attributes; attrs]}
+  in
+  if with_ then parse_with_constraints module_type p else module_type
+
+and parse_with_constraints module_type p =
+  match p.Parser.token with
+  | Lident "with" ->
+    Parser.next p;
+    let first = parse_with_constraint p in
+    let rec loop p acc =
+      match p.Parser.token with
+      | And ->
+        Parser.next p;
+        loop p (parse_with_constraint p :: acc)
+      | _ -> List.rev acc
+    in
+    let constraints = loop p [first] in
+    let loc = mk_loc module_type.pmty_loc.loc_start p.prev_end_pos in
+    Ast_helper.Mty.with_ ~loc module_type constraints
+  | _ -> module_type
+
+(* mod-constraint	::=
+ *  |  type typeconstr<type-params> type-equation type-constraints?
+ *  ∣	 type typeconstr-name<type-params> := typexpr
+ *  ∣	 module module-path = extended-module-path
+ *  ∣	 module module-path :=  extended-module-path
+ *
+ *  TODO: split this up into multiple functions, better errors *)
+and parse_with_constraint p =
+  match p.Parser.token with
+  | Module -> (
+    Parser.next p;
+    let module_path = parse_module_long_ident ~lowercase:false p in
+    match p.Parser.token with
+    | ColonEqual ->
+      Parser.next p;
+      let lident = parse_module_long_ident ~lowercase:false p in
+      Parsetree.Pwith_modsubst (module_path, lident)
+    | Equal ->
+      Parser.next p;
+      let lident = parse_module_long_ident ~lowercase:false p in
+      Parsetree.Pwith_module (module_path, lident)
+    | token ->
+      (* TODO: revisit *)
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      let lident = parse_module_long_ident ~lowercase:false p in
+      Parsetree.Pwith_modsubst (module_path, lident))
+  | Typ -> (
+    Parser.next p;
+    let type_constr = parse_value_path p in
+    let params = parse_type_params ~parent:type_constr p in
+    match p.Parser.token with
+    | ColonEqual ->
+      Parser.next p;
+      let typ_expr = parse_typ_expr p in
+      Parsetree.Pwith_typesubst
+        ( type_constr,
+          Ast_helper.Type.mk ~loc:type_constr.loc ~params ~manifest:typ_expr
+            (Location.mkloc (Longident.last type_constr.txt) type_constr.loc) )
+    | Equal ->
+      Parser.next p;
+      let private_flag =
+        if Parser.optional p Token.Private then Asttypes.Private
+        else Asttypes.Public
+      in
+      let typ_expr = parse_typ_expr p in
+      let type_constraints = parse_type_constraints p in
+      Parsetree.Pwith_type
+        ( type_constr,
+          Ast_helper.Type.mk ~loc:type_constr.loc ~priv:private_flag ~params
+            ~manifest:typ_expr ~cstrs:type_constraints
+            (Location.mkloc (Longident.last type_constr.txt) type_constr.loc) )
+    | token ->
+      (* TODO: revisit *)
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      let typ_expr = parse_typ_expr p in
+      let type_constraints = parse_type_constraints p in
+      Parsetree.Pwith_type
+        ( type_constr,
+          Ast_helper.Type.mk ~loc:type_constr.loc ~params ~manifest:typ_expr
+            ~cstrs:type_constraints
+            (Location.mkloc (Longident.last type_constr.txt) type_constr.loc) ))
+  | token ->
+    (* TODO: implement recovery strategy *)
+    Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+    Parsetree.Pwith_type
+      ( Location.mknoloc (Longident.Lident ""),
+        Ast_helper.Type.mk ~params:[] ~manifest:(Recover.default_type ())
+          ~cstrs:[] (Location.mknoloc "") )
+
+and parse_module_type_of p =
+  let start_pos = p.Parser.start_pos in
+  Parser.expect Module p;
+  Parser.expect Typ p;
+  Parser.expect Of p;
+  let module_expr = parse_module_expr p in
+  Ast_helper.Mty.typeof_ ~loc:(mk_loc start_pos p.prev_end_pos) module_expr
+
+and parse_newline_or_semicolon_signature p =
+  match p.Parser.token with
+  | Semicolon -> Parser.next p
+  | token when Grammar.is_signature_item_start token ->
+    if p.prev_end_pos.pos_lnum < p.start_pos.pos_lnum then ()
+    else
+      Parser.err ~start_pos:p.prev_end_pos ~end_pos:p.end_pos p
+        (Diagnostics.message
+           "consecutive specifications on a line must be separated by ';' or a \
+            newline")
+  | _ -> ()
+
+and parse_signature_item_region p =
+  let start_pos = p.Parser.start_pos in
+  let attrs = parse_attributes p in
+  match p.Parser.token with
+  | Let {unwrap} ->
+    if unwrap then (
+      Parser.err ~start_pos ~end_pos:p.Parser.end_pos p
+        (Diagnostics.message ErrorMessages.experimental_let_unwrap_sig);
+      Parser.next p);
+    Parser.begin_region p;
+    let value_desc = parse_sign_let_desc ~attrs p in
+    parse_newline_or_semicolon_signature p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Parser.end_region p;
+    Some (Ast_helper.Sig.value ~loc value_desc)
+  | Typ -> (
+    Parser.begin_region p;
+    match parse_type_definition_or_extension ~attrs p with
+    | TypeDef {rec_flag; types} ->
+      parse_newline_or_semicolon_signature p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Parser.end_region p;
+      Some (Ast_helper.Sig.type_ ~loc rec_flag types)
+    | TypeExt ext ->
+      parse_newline_or_semicolon_signature p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Parser.end_region p;
+      Some (Ast_helper.Sig.type_extension ~loc ext))
+  | External ->
+    let external_def = parse_external_def ~attrs ~start_pos p in
+    parse_newline_or_semicolon_signature p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Sig.value ~loc external_def)
+  | Exception ->
+    let exception_def = parse_exception_def ~attrs p in
+    parse_newline_or_semicolon_signature p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Sig.exception_ ~loc exception_def)
+  | Open ->
+    let open_description = parse_open_description ~attrs p in
+    parse_newline_or_semicolon_signature p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Sig.open_ ~loc open_description)
+  | Include ->
+    Parser.next p;
+    let module_type = parse_module_type p in
+    let include_description =
+      Ast_helper.Incl.mk
+        ~loc:(mk_loc start_pos p.prev_end_pos)
+        ~attrs module_type
+    in
+    parse_newline_or_semicolon_signature p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Sig.include_ ~loc include_description)
+  | Module -> (
+    Parser.begin_region p;
+    Parser.next p;
+    match p.Parser.token with
+    | Uident _ ->
+      let mod_decl = parse_module_declaration_or_alias ~attrs p in
+      parse_newline_or_semicolon_signature p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Parser.end_region p;
+      Some (Ast_helper.Sig.module_ ~loc mod_decl)
+    | Rec ->
+      let rec_module = parse_rec_module_spec ~attrs ~start_pos p in
+      parse_newline_or_semicolon_signature p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Parser.end_region p;
+      Some (Ast_helper.Sig.rec_module ~loc rec_module)
+    | Typ ->
+      let mod_type_decl = parse_module_type_declaration ~attrs ~start_pos p in
+      Parser.end_region p;
+      Some mod_type_decl
+    | _t ->
+      let mod_decl = parse_module_declaration_or_alias ~attrs p in
+      parse_newline_or_semicolon_signature p;
+      let loc = mk_loc start_pos p.prev_end_pos in
+      Parser.end_region p;
+      Some (Ast_helper.Sig.module_ ~loc mod_decl))
+  | AtAt ->
+    let attr = parse_standalone_attribute p in
+    parse_newline_or_semicolon_signature p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Sig.attribute ~loc attr)
+  | ModuleComment (loc, s) ->
+    Parser.next p;
+    Some
+      (Ast_helper.Sig.attribute ~loc
+         ( {txt = "res.doc"; loc},
+           PStr
+             [
+               Ast_helper.Str.eval ~loc
+                 (Ast_helper.Exp.constant ~loc (Pconst_string (s, None)));
+             ] ))
+  | PercentPercent ->
+    let extension = parse_extension ~module_language:true p in
+    parse_newline_or_semicolon_signature p;
+    let loc = mk_loc start_pos p.prev_end_pos in
+    Some (Ast_helper.Sig.extension ~attrs ~loc extension)
+  | _ -> (
+    match attrs with
+    | (({Asttypes.loc = attr_loc}, _) as attr) :: _ ->
+      Parser.err ~start_pos:attr_loc.loc_start ~end_pos:attr_loc.loc_end p
+        (Diagnostics.message (ErrorMessages.attribute_without_node attr));
+      Some Recover.default_signature_item
+    | _ -> None)
+[@@progress Parser.next, Parser.expect]
+
+(* module rec module-name :  module-type  { and module-name:  module-type } *)
+and parse_rec_module_spec ~attrs ~start_pos p =
+  Parser.expect Rec p;
+  let rec loop p spec =
+    let start_pos = p.Parser.start_pos in
+    let attrs = parse_attributes_and_binding p in
+    match p.Parser.token with
+    | And ->
+      (* TODO: give a good error message when with constraint, no parens
+       * and ASet: (Set.S with type elt = A.t)
+       * and BTree: (Btree.S with type elt = A.t)
+       * Without parens, the `and` signals the start of another
+       * `with-constraint`
+       *)
+      Parser.expect And p;
+      let decl = parse_rec_module_declaration ~attrs ~start_pos p in
+      loop p (decl :: spec)
+    | _ -> List.rev spec
+  in
+  let first = parse_rec_module_declaration ~attrs ~start_pos p in
+  loop p [first]
+
+(* module-name : module-type *)
+and parse_rec_module_declaration ~attrs ~start_pos p =
+  let name =
+    match p.Parser.token with
+    | Uident mod_name ->
+      let loc = mk_loc p.start_pos p.end_pos in
+      Parser.next p;
+      Location.mkloc mod_name loc
+    | t ->
+      Parser.err p (Diagnostics.uident t);
+      Location.mknoloc "_"
+  in
+  Parser.expect Colon p;
+  let mod_type = parse_module_type p in
+  Ast_helper.Md.mk ~loc:(mk_loc start_pos p.prev_end_pos) ~attrs name mod_type
+
+and parse_module_declaration_or_alias ~attrs p =
+  let start_pos = p.Parser.start_pos in
+  let module_name =
+    match p.Parser.token with
+    | Uident ident ->
+      let loc = mk_loc p.Parser.start_pos p.end_pos in
+      Parser.next p;
+      Location.mkloc ident loc
+    | t ->
+      Parser.err p (Diagnostics.uident t);
+      Location.mknoloc "_"
+  in
+  let body =
+    match p.Parser.token with
+    | Colon ->
+      Parser.next p;
+      parse_module_type p
+    | Equal -> (
+      Parser.next p;
+      match p.Parser.token with
+      | Lbrace ->
+        (* Parse `module M = {` as `module M : {` *)
+        parse_module_type p
+      | _ ->
+        let lident = parse_module_long_ident ~lowercase:false p in
+        Ast_helper.Mty.alias lident)
+    | token ->
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      Recover.default_module_type ()
+  in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Md.mk ~loc ~attrs module_name body
+
+and parse_module_type_declaration ~attrs ~start_pos p =
+  Parser.expect Typ p;
+  let module_name =
+    match p.Parser.token with
+    | Uident ident ->
+      let loc = mk_loc p.start_pos p.end_pos in
+      Parser.next p;
+      Location.mkloc ident loc
+    | Lident ident ->
+      let loc = mk_loc p.start_pos p.end_pos in
+      Parser.next p;
+      Location.mkloc ident loc
+    | t ->
+      Parser.err p (Diagnostics.uident t);
+      Location.mknoloc "_"
+  in
+  let typ =
+    match p.Parser.token with
+    | Equal ->
+      Parser.next p;
+      Some (parse_module_type p)
+    | _ -> None
+  in
+  let module_decl = Ast_helper.Mtd.mk ~attrs ?typ module_name in
+  Ast_helper.Sig.modtype ~loc:(mk_loc start_pos p.prev_end_pos) module_decl
+
+and parse_sign_let_desc ~attrs p =
+  let start_pos = p.Parser.start_pos in
+  Parser.optional p (Let {unwrap = false}) |> ignore;
+  let name, loc = parse_lident p in
+  let name = Location.mkloc name loc in
+  Parser.expect Colon p;
+  let typ_expr = parse_poly_type_expr p in
+  let loc = mk_loc start_pos p.prev_end_pos in
+  Ast_helper.Val.mk ~loc ~attrs name typ_expr
+
+(* attr-id	::=	lowercase-ident
+   ∣	  capitalized-ident
+   ∣	  attr-id .  attr-id *)
+and parse_attribute_id ~start_pos p =
+  let rec loop p acc =
+    match p.Parser.token with
+    | Lident ident | Uident ident -> (
+      Parser.next p;
+      let id = acc ^ ident in
+      match p.Parser.token with
+      | Dot ->
+        Parser.next p;
+        loop p (id ^ ".")
+      | _ -> id)
+    | token when Token.is_keyword token -> (
+      Parser.next p;
+      let id = acc ^ Token.to_string token in
+      match p.Parser.token with
+      | Dot ->
+        Parser.next p;
+        loop p (id ^ ".")
+      | _ -> id)
+    | token ->
+      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
+      acc
+  in
+  let id = loop p "" in
+  let end_pos = p.prev_end_pos in
+  Location.mkloc id (mk_loc start_pos end_pos)
+
+(*
+ * payload ::=  empty
+ *          |  ( structure-item )
+ *
+ * TODO: what about multiple structure items?
+ * @attr({let x = 1; let x = 2})
+ *
+ * Also what about type-expressions and specifications?
+ * @attr(:myType) ???
+ *)
+and parse_payload p =
+  match p.Parser.token with
+  | Lparen when p.start_pos.pos_cnum = p.prev_end_pos.pos_cnum -> (
+    Parser.leave_breadcrumb p Grammar.AttributePayload;
+    Parser.next p;
+    match p.token with
+    | Colon ->
+      Parser.next p;
+      let payload =
+        if Grammar.is_signature_item_start p.token then
+          Parsetree.PSig
+            (parse_delimited_region ~grammar:Grammar.Signature ~closing:Rparen
+               ~f:parse_signature_item_region p)
+        else Parsetree.PTyp (parse_typ_expr p)
+      in
+      Parser.expect Rparen p;
+      Parser.eat_breadcrumb p;
+      payload
+    | Question ->
+      Parser.next p;
+      let pattern = parse_pattern p in
+      let expr =
+        match p.token with
+        | When | If ->
+          Parser.next p;
+          Some (parse_expr p)
+        | _ -> None
+      in
+      Parser.expect Rparen p;
+      Parser.eat_breadcrumb p;
+      Parsetree.PPat (pattern, expr)
+    | _ ->
+      let items =
+        parse_delimited_region ~grammar:Grammar.Structure ~closing:Rparen
+          ~f:parse_structure_item_region p
+      in
+      Parser.expect Rparen p;
+      Parser.eat_breadcrumb p;
+      Parsetree.PStr items)
+  | _ -> Parsetree.PStr []
+
+(* type attribute = string loc * payload *)
+and parse_attribute p =
+  match p.Parser.token with
+  | At ->
+    let start_pos = p.start_pos in
+    Parser.next p;
+    let attr_id = parse_attribute_id ~start_pos p in
+    let payload = parse_payload p in
+    Some (attr_id, payload)
+  | DocComment (loc, s) ->
+    Parser.next p;
+    Some (doc_comment_to_attribute loc s)
+  | _ -> None
+
+and doc_comment_to_attribute loc s : Parsetree.attribute =
+  ( {txt = "res.doc"; loc},
+    PStr
+      [
+        Ast_helper.Str.eval ~loc
+          (Ast_helper.Exp.constant ~loc (Pconst_string (s, None)));
+      ] )
+
+and parse_attributes p =
+  parse_region p ~grammar:Grammar.Attribute ~f:parse_attribute
+
+(*
+ * standalone-attribute ::=
+ *  | @@ atribute-id
+ *  | @@ attribute-id ( structure-item )
+ *)
+and parse_standalone_attribute p =
+  let start_pos = p.start_pos in
+  Parser.expect AtAt p;
+  let attr_id = parse_attribute_id ~start_pos p in
+  let payload = parse_payload p in
+  (attr_id, payload)
+
+(* extension	::=	% attr-id  attr-payload
+ *              | %% attr-id(
+ *  expr	::=	 ...
+ *    ∣	 extension
+ *
+ *  typexpr	::=	 ...
+ *    ∣	 extension
+ *
+ *  pattern	::=	 ...
+ *    ∣	 extension
+ *
+ *  module-expr	::=	 ...
+ *    ∣	 extension
+ *
+ *  module-type	::=	 ...
+ *    ∣	 extension
+ *
+ *  class-expr	::=	 ...
+ *    ∣	 extension
+ *
+ *  class-type	::=	 ...
+ *    ∣	 extension
+ *
+ *
+ * item extension nodes usable in structures and signature
+ *
+ * item-extension ::= %% attr-id
+ *                  | %% attr-id(structure-item)
+ *
+ *  attr-payload ::= structure-item
+ *
+ *  ~moduleLanguage represents whether we're on the module level or not
+ *)
+and parse_extension ?(module_language = false) p =
+  let start_pos = p.Parser.start_pos in
+  if module_language then Parser.expect PercentPercent p
+  else Parser.expect Percent p;
+  let attr_id = parse_attribute_id ~start_pos p in
+  let payload = parse_payload p in
+  (attr_id, payload)
+
+(* module signature on the file level *)
+let parse_specification p : Parsetree.signature =
+  parse_region p ~grammar:Grammar.Specification ~f:parse_signature_item_region
+
+(* module structure on the file level *)
+let parse_implementation p : Parsetree.structure =
+  parse_region p ~grammar:Grammar.Implementation ~f:parse_structure_item_region
diff --git a/compiler/syntax/src/res_core.mli b/compiler/syntax/src/res_core.mli
new file mode 100644
index 0000000..30d1e5f
--- /dev/null
+++ b/compiler/syntax/src/res_core.mli
@@ -0,0 +1,2 @@
+val parse_implementation : Res_parser.t -> Parsetree.structure
+val parse_specification : Res_parser.t -> Parsetree.signature
diff --git a/compiler/syntax/src/res_diagnostics.ml b/compiler/syntax/src/res_diagnostics.ml
new file mode 100644
index 0000000..76c39a3
--- /dev/null
+++ b/compiler/syntax/src/res_diagnostics.ml
@@ -0,0 +1,199 @@
+module Grammar = Res_grammar
+module Token = Res_token
+
+type category =
+  | Unexpected of {token: Token.t; context: (Grammar.t * Lexing.position) list}
+  | Expected of {
+      context: Grammar.t option;
+      pos: Lexing.position; (* prev token end*)
+      token: Token.t;
+    }
+  | Message of string
+  | Uident of Token.t
+  | Lident of Token.t
+  | UnclosedString
+  | UnclosedTemplate
+  | UnclosedComment
+  | UnknownUchar of Char.t
+
+type t = {
+  start_pos: Lexing.position;
+  end_pos: Lexing.position;
+  category: category;
+}
+
+type report = t list
+
+let get_start_pos t = t.start_pos
+let get_end_pos t = t.end_pos
+
+let default_unexpected token =
+  "I'm not sure what to parse here when looking at \"" ^ Token.to_string token
+  ^ "\"."
+
+let reserved_keyword token =
+  let token_txt = Token.to_string token in
+  "`" ^ token_txt ^ "` is a reserved keyword. Keywords need to be escaped: \\\""
+  ^ token_txt ^ "\""
+
+let explain t =
+  match t.category with
+  | Uident current_token -> (
+    match current_token with
+    | Lident lident ->
+      let guess = String.capitalize_ascii lident in
+      "Did you mean `" ^ guess ^ "` instead of `" ^ lident ^ "`?"
+    | t when Token.is_keyword t ->
+      let token = Token.to_string t in
+      "`" ^ token ^ "` is a reserved keyword."
+    | _ ->
+      "At this point, I'm looking for an uppercased name like `Belt` or `Array`"
+    )
+  | Lident current_token -> (
+    match current_token with
+    | Uident uident ->
+      let guess = String.uncapitalize_ascii uident in
+      "Did you mean `" ^ guess ^ "` instead of `" ^ uident ^ "`?"
+    | t when Token.is_keyword t ->
+      let token = Token.to_string t in
+      "`" ^ token ^ "` is a reserved keyword. Keywords need to be escaped: \\\""
+      ^ token ^ "\""
+    | Underscore -> "`_` isn't a valid name."
+    | _ -> "I'm expecting a lowercase name like `user or `age`")
+  | Message txt -> txt
+  | UnclosedString -> "This string is missing a double quote at the end"
+  | UnclosedTemplate ->
+    "Did you forget to close this template expression with a backtick?"
+  | UnclosedComment -> "This comment seems to be missing a closing `*/`"
+  | UnknownUchar uchar ->
+    "Not sure what to do with this character: \"" ^ Char.escaped uchar ^ "\"."
+  | Expected {context; token = t} ->
+    let hint =
+      match context with
+      | Some grammar -> " It signals the start of " ^ Grammar.to_string grammar
+      | None -> ""
+    in
+    "Did you forget a `" ^ Token.to_string t ^ "` here?" ^ hint
+  | Unexpected {token = t; context = breadcrumbs} -> (
+    let name = Token.to_string t in
+    match breadcrumbs with
+    | (AtomicTypExpr, _) :: breadcrumbs -> (
+      match (breadcrumbs, t) with
+      | ( ((StringFieldDeclarations | FieldDeclarations), _) :: _,
+          (String _ | At | Rbrace | Comma | Eof) ) ->
+        "I'm missing a type here"
+      | _, t when Grammar.is_structure_item_start t || t = Eof ->
+        "Missing a type here"
+      | _ -> default_unexpected t)
+    | (ExprOperand, _) :: breadcrumbs -> (
+      match (breadcrumbs, t) with
+      | (ExprBlock, _) :: _, Rbrace ->
+        "It seems that this expression block is empty"
+      | (ExprBlock, _) :: _, Bar ->
+        (* Pattern matching *)
+        "Looks like there might be an expression missing here"
+      | (ExprSetField, _) :: _, _ ->
+        "It seems that this record field mutation misses an expression"
+      | (ExprArrayMutation, _) :: _, _ ->
+        "Seems that an expression is missing, with what do I mutate the array?"
+      | ((ExprBinaryAfterOp _ | ExprUnary), _) :: _, _ ->
+        "Did you forget to write an expression here?"
+      | (Grammar.LetBinding, _) :: _, _ ->
+        "This let-binding misses an expression"
+      | _ :: _, (Rbracket | Rbrace | Eof) -> "Missing expression"
+      | _ -> "I'm not sure what to parse here when looking at \"" ^ name ^ "\"."
+      )
+    | (TypeParam, _) :: _ -> (
+      match t with
+      | Lident ident ->
+        "Did you mean '" ^ ident ^ "? A Type parameter starts with a quote."
+      | _ -> "I'm not sure what to parse here when looking at \"" ^ name ^ "\"."
+      )
+    | (Pattern, _) :: breadcrumbs -> (
+      match (t, breadcrumbs) with
+      | Equal, (LetBinding, _) :: _ ->
+        "I was expecting a name for this let-binding. Example: `let message = \
+         \"hello\"`"
+      | In, (ExprFor, _) :: _ ->
+        "A for-loop has the following form: `for i in 0 to 10`. Did you forget \
+         to supply a name before `in`?"
+      | EqualGreater, (PatternMatchCase, _) :: _ ->
+        "I was expecting a pattern to match on before the `=>`"
+      | token, _ when Token.is_keyword t -> reserved_keyword token
+      | token, _ -> default_unexpected token)
+    | _ ->
+      (* TODO: match on circumstance to verify Lident needed ? *)
+      if Token.is_keyword t then
+        "`" ^ name
+        ^ "` is a reserved keyword. Keywords need to be escaped: \\\""
+        ^ Token.to_string t ^ "\""
+      else "I'm not sure what to parse here when looking at \"" ^ name ^ "\".")
+
+let make ~start_pos ~end_pos category = {start_pos; end_pos; category}
+
+let print_report ?(custom_intro = None) ?(formatter = Format.err_formatter)
+    diagnostics src =
+  let rec print diagnostics src =
+    match diagnostics with
+    | [] -> ()
+    | d :: rest ->
+      (* A few specializations for best-effort error messages for old syntax etc. *)
+      let msg =
+        match d.category with
+        | Unexpected {token = Token.Bar; _} ->
+          let idx_prev = d.start_pos.pos_cnum - 1 in
+          let idx_next = d.end_pos.pos_cnum in
+          if
+            idx_prev >= 0
+            && idx_prev < String.length src
+            && String.get src idx_prev = '['
+          then
+            let base = explain d in
+            base
+            ^ "\n\n\
+              \  Did you mean to write an array literal? Arrays are written \
+               with `[ ... ]` (not `[| ... |]`)."
+            ^ "\n  Quick fix: replace `[|` with `[` and `|]` with `]`."
+            ^ "\n  Example: `[|1, 2, 3|]` -> `[1, 2, 3]`"
+          else if
+            idx_next >= 0
+            && idx_next < String.length src
+            && String.get src idx_next = '>'
+          then
+            let base = explain d in
+            base
+            ^ "\n\n\
+              \  The old data-last pipe `|>` has been removed from the language.\n\
+              \  Refactor to use a data-first `->` pipe instead."
+          else explain d
+        | _ -> explain d
+      in
+      Location.report_error ~custom_intro ~src:(Some src) formatter
+        Location.
+          {
+            loc =
+              {loc_start = d.start_pos; loc_end = d.end_pos; loc_ghost = false};
+            msg;
+            sub = [];
+            if_highlight = "";
+          };
+      (match rest with
+      | [] -> ()
+      | _ -> Format.fprintf formatter "@.");
+      print rest src
+  in
+  Format.fprintf formatter "@[<v>";
+  print (List.rev diagnostics) src;
+  Format.fprintf formatter "@]@."
+
+let unexpected token context = Unexpected {token; context}
+
+let expected ?grammar pos token = Expected {context = grammar; pos; token}
+
+let uident current_token = Uident current_token
+let lident current_token = Lident current_token
+let unclosed_string = UnclosedString
+let unclosed_comment = UnclosedComment
+let unclosed_template = UnclosedTemplate
+let unknown_uchar code = UnknownUchar code
+let message txt = Message txt
diff --git a/compiler/syntax/src/res_diagnostics.mli b/compiler/syntax/src/res_diagnostics.mli
new file mode 100644
index 0000000..694788a
--- /dev/null
+++ b/compiler/syntax/src/res_diagnostics.mli
@@ -0,0 +1,30 @@
+module Token = Res_token
+module Grammar = Res_grammar
+
+type t
+type category
+type report
+
+val get_start_pos : t -> Lexing.position [@@live] (* for playground *)
+val get_end_pos : t -> Lexing.position [@@live] (* for playground *)
+
+val explain : t -> string [@@live] (* for playground *)
+
+val unexpected : Token.t -> (Grammar.t * Lexing.position) list -> category
+val expected : ?grammar:Grammar.t -> Lexing.position -> Token.t -> category
+val uident : Token.t -> category
+val lident : Token.t -> category
+val unclosed_string : category
+val unclosed_template : category
+val unclosed_comment : category
+val unknown_uchar : Char.t -> category
+val message : string -> category
+
+val make : start_pos:Lexing.position -> end_pos:Lexing.position -> category -> t
+
+val print_report :
+  ?custom_intro:string option ->
+  ?formatter:Format.formatter ->
+  t list ->
+  string ->
+  unit
diff --git a/compiler/syntax/src/res_doc.ml b/compiler/syntax/src/res_doc.ml
new file mode 100644
index 0000000..301c052
--- /dev/null
+++ b/compiler/syntax/src/res_doc.ml
@@ -0,0 +1,355 @@
+module MiniBuffer = Res_minibuffer
+
+type mode = Break | Flat
+
+type line_style =
+  | Classic (* fits? -> replace with space *)
+  | Soft (* fits? -> replaced with nothing *)
+  | Hard
+  (* always included, forces breaks in parents *)
+  (* always included, forces breaks in parents, but doesn't increase indentation
+     use case: template literals, multiline string content *)
+  | Literal
+
+type t =
+  | Nil
+  | Text of string
+  | Concat of t list
+  | Indent of t
+  | IfBreaks of {yes: t; no: t; mutable broken: bool}
+    (* when broken is true, treat as the yes branch *)
+  | LineSuffix of t
+  | LineBreak of line_style
+  | Group of {mutable should_break: bool; doc: t}
+  | CustomLayout of t list
+  | BreakParent
+
+let nil = Nil
+let line = LineBreak Classic
+let hard_line = LineBreak Hard
+let soft_line = LineBreak Soft
+let literal_line = LineBreak Literal
+let text s = Text s
+
+(* Optimization. We eagerly collapse and reduce whatever allocation we can *)
+let rec _concat acc l =
+  match l with
+  | Text s1 :: Text s2 :: rest -> Text (s1 ^ s2) :: _concat acc rest
+  | Nil :: rest -> _concat acc rest
+  | Concat l2 :: rest ->
+    _concat (_concat acc rest) l2 (* notice the order here *)
+  | x :: rest ->
+    let rest1 = _concat acc rest in
+    if rest1 == rest then l else x :: rest1
+  | [] -> acc
+
+let concat l = Concat (_concat [] l)
+
+let indent d = Indent d
+let if_breaks t f = IfBreaks {yes = t; no = f; broken = false}
+let line_suffix d = LineSuffix d
+let group d = Group {should_break = false; doc = d}
+let breakable_group ~force_break d = Group {should_break = force_break; doc = d}
+let custom_layout gs = CustomLayout gs
+let break_parent = BreakParent
+
+let space = Text " "
+let comma = Text ","
+let dot = Text "."
+let dotdot = Text ".."
+let dotdotdot = Text "..."
+let less_than = Text "<"
+let greater_than = Text ">"
+let lbrace = Text "{"
+let rbrace = Text "}"
+let lparen = Text "("
+let rparen = Text ")"
+let lbracket = Text "["
+let rbracket = Text "]"
+let question = Text "?"
+let tilde = Text "~"
+let equal = Text "="
+let trailing_comma = if_breaks comma nil
+let double_quote = Text "\""
+
+let propagate_forced_breaks doc =
+  let rec walk doc =
+    match doc with
+    | Text _ | Nil | LineSuffix _ -> false
+    | BreakParent -> true
+    | LineBreak (Hard | Literal) -> true
+    | LineBreak (Classic | Soft) -> false
+    | Indent children ->
+      let child_forces_break = walk children in
+      child_forces_break
+    | IfBreaks ({yes = true_doc; no = false_doc} as ib) ->
+      let false_force_break = walk false_doc in
+      if false_force_break then (
+        let _ = walk true_doc in
+        ib.broken <- true;
+        true)
+      else
+        let force_break = walk true_doc in
+        force_break
+    | Group ({should_break = force_break; doc = children} as gr) ->
+      let child_forces_break = walk children in
+      let should_break = force_break || child_forces_break in
+      gr.should_break <- should_break;
+      should_break
+    | Concat children ->
+      List.fold_left
+        (fun force_break child ->
+          let child_forces_break = walk child in
+          force_break || child_forces_break)
+        false children
+    | CustomLayout children ->
+      (* When using CustomLayout, we don't want to propagate forced breaks
+       * from the children up. By definition it picks the first layout that fits
+       * otherwise it takes the last of the list.
+       * However we do want to propagate forced breaks in the sublayouts. They
+       * might need to be broken. We just don't propagate them any higher here *)
+      let _ = walk (Concat children) in
+      false
+  in
+  let _ = walk doc in
+  ()
+
+(* See documentation in interface file *)
+let rec will_break doc =
+  match doc with
+  | LineBreak (Hard | Literal) | BreakParent | Group {should_break = true} ->
+    true
+  | Group {doc} | Indent doc | CustomLayout (doc :: _) -> will_break doc
+  | Concat docs -> List.exists will_break docs
+  | IfBreaks {yes; no} -> will_break yes || will_break no
+  | _ -> false
+
+let join ~sep docs =
+  let rec loop acc sep docs =
+    match docs with
+    | [] -> List.rev acc
+    | [x] -> List.rev (x :: acc)
+    | x :: xs -> loop (sep :: x :: acc) sep xs
+  in
+  concat (loop [] sep docs)
+
+let join_with_sep docs_with_sep =
+  let rec loop acc docs =
+    match docs with
+    | [] -> List.rev acc
+    | [(x, _sep)] -> List.rev (x :: acc)
+    | (x, sep) :: xs -> loop (sep :: x :: acc) xs
+  in
+  concat (loop [] docs_with_sep)
+
+let fits w stack =
+  let width = ref w in
+  let result = ref None in
+
+  let rec calculate indent mode doc =
+    match (mode, doc) with
+    | _ when result.contents != None -> ()
+    | _ when width.contents < 0 -> result := Some false
+    | _, Nil | _, LineSuffix _ | _, BreakParent -> ()
+    | _, Text txt -> width := width.contents - String.length txt
+    | _, Indent doc -> calculate (indent + 2) mode doc
+    | Flat, LineBreak Hard | Flat, LineBreak Literal -> result := Some true
+    | Flat, LineBreak Classic -> width := width.contents - 1
+    | Flat, LineBreak Soft -> ()
+    | Break, LineBreak _ -> result := Some true
+    | _, Group {should_break = true; doc} -> calculate indent Break doc
+    | _, Group {doc} -> calculate indent mode doc
+    | _, IfBreaks {yes = break_doc; broken = true} ->
+      calculate indent mode break_doc
+    | Break, IfBreaks {yes = break_doc} -> calculate indent mode break_doc
+    | Flat, IfBreaks {no = flat_doc} -> calculate indent mode flat_doc
+    | _, Concat docs -> calculate_concat indent mode docs
+    | _, CustomLayout (hd :: _) ->
+      (* TODO: if we have nested custom layouts, what we should do here? *)
+      calculate indent mode hd
+    | _, CustomLayout [] -> ()
+  and calculate_concat indent mode docs =
+    if result.contents == None then
+      match docs with
+      | [] -> ()
+      | doc :: rest ->
+        calculate indent mode doc;
+        calculate_concat indent mode rest
+  in
+  let rec calculate_all stack =
+    match (result.contents, stack) with
+    | Some r, _ -> r
+    | None, [] -> !width >= 0
+    | None, (indent, mode, doc) :: rest ->
+      calculate indent mode doc;
+      calculate_all rest
+  in
+  calculate_all stack
+
+let to_string ~width doc =
+  propagate_forced_breaks doc;
+  let buffer = MiniBuffer.create 1000 in
+
+  let rec process ~pos line_suffices stack =
+    match stack with
+    | ((ind, mode, doc) as cmd) :: rest -> (
+      match doc with
+      | Nil | BreakParent -> process ~pos line_suffices rest
+      | Text txt ->
+        MiniBuffer.add_string buffer txt;
+        process ~pos:(String.length txt + pos) line_suffices rest
+      | LineSuffix doc -> process ~pos ((ind, mode, doc) :: line_suffices) rest
+      | Concat docs ->
+        let ops = List.map (fun doc -> (ind, mode, doc)) docs in
+        process ~pos line_suffices (List.append ops rest)
+      | Indent doc -> process ~pos line_suffices ((ind + 2, mode, doc) :: rest)
+      | IfBreaks {yes = break_doc; broken = true} ->
+        process ~pos line_suffices ((ind, mode, break_doc) :: rest)
+      | IfBreaks {yes = break_doc; no = flat_doc} ->
+        if mode = Break then
+          process ~pos line_suffices ((ind, mode, break_doc) :: rest)
+        else process ~pos line_suffices ((ind, mode, flat_doc) :: rest)
+      | LineBreak line_style ->
+        if mode = Break then
+          match line_suffices with
+          | [] ->
+            if line_style = Literal then (
+              MiniBuffer.add_char buffer '\n';
+              process ~pos:0 [] rest)
+            else (
+              MiniBuffer.flush_newline buffer;
+              MiniBuffer.add_string buffer (String.make ind ' ' [@doesNotRaise]);
+              process ~pos:ind [] rest)
+          | _docs ->
+            process ~pos:ind []
+              (List.concat [List.rev line_suffices; cmd :: rest])
+        else
+          (* mode = Flat *)
+          let pos =
+            match line_style with
+            | Classic ->
+              MiniBuffer.add_string buffer " ";
+              pos + 1
+            | Hard ->
+              MiniBuffer.flush_newline buffer;
+              0
+            | Literal ->
+              MiniBuffer.add_char buffer '\n';
+              0
+            | Soft -> pos
+          in
+          process ~pos line_suffices rest
+      | Group {should_break; doc} ->
+        if should_break || not (fits (width - pos) ((ind, Flat, doc) :: rest))
+        then process ~pos line_suffices ((ind, Break, doc) :: rest)
+        else process ~pos line_suffices ((ind, Flat, doc) :: rest)
+      | CustomLayout docs ->
+        let rec find_group_that_fits groups =
+          match groups with
+          | [] -> Nil
+          | [last_group] -> last_group
+          | doc :: docs ->
+            if fits (width - pos) ((ind, Flat, doc) :: rest) then doc
+            else find_group_that_fits docs
+        in
+        let doc = find_group_that_fits docs in
+        process ~pos line_suffices ((ind, Flat, doc) :: rest))
+    | [] -> (
+      match line_suffices with
+      | [] -> ()
+      | suffices -> process ~pos:0 [] (List.rev suffices))
+  in
+  process ~pos:0 [] [(0, Flat, doc)];
+  MiniBuffer.contents buffer
+
+let debug t =
+  let rec to_doc = function
+    | Nil -> text "nil"
+    | BreakParent -> text "breakparent"
+    | Text txt -> text ("text(\"" ^ txt ^ "\")")
+    | LineSuffix doc ->
+      group
+        (concat
+           [
+             text "linesuffix(";
+             indent (concat [line; to_doc doc]);
+             line;
+             text ")";
+           ])
+    | Concat [] -> text "concat()"
+    | Concat docs ->
+      group
+        (concat
+           [
+             text "concat(";
+             indent
+               (concat
+                  [
+                    line;
+                    join ~sep:(concat [text ","; line]) (List.map to_doc docs);
+                  ]);
+             line;
+             text ")";
+           ])
+    | CustomLayout docs ->
+      group
+        (concat
+           [
+             text "customLayout(";
+             indent
+               (concat
+                  [
+                    line;
+                    join ~sep:(concat [text ","; line]) (List.map to_doc docs);
+                  ]);
+             line;
+             text ")";
+           ])
+    | Indent doc ->
+      concat [text "indent("; soft_line; to_doc doc; soft_line; text ")"]
+    | IfBreaks {yes = true_doc; broken = true} -> to_doc true_doc
+    | IfBreaks {yes = true_doc; no = false_doc} ->
+      group
+        (concat
+           [
+             text "ifBreaks(";
+             indent
+               (concat
+                  [
+                    line;
+                    to_doc true_doc;
+                    concat [text ","; line];
+                    to_doc false_doc;
+                  ]);
+             line;
+             text ")";
+           ])
+    | LineBreak break ->
+      let break_txt =
+        match break with
+        | Classic -> "Classic"
+        | Soft -> "Soft"
+        | Hard -> "Hard"
+        | Literal -> "Liteal"
+      in
+      text ("LineBreak(" ^ break_txt ^ ")")
+    | Group {should_break; doc} ->
+      group
+        (concat
+           [
+             text "Group(";
+             indent
+               (concat
+                  [
+                    line;
+                    text ("{shouldBreak: " ^ string_of_bool should_break ^ "}");
+                    concat [text ","; line];
+                    to_doc doc;
+                  ]);
+             line;
+             text ")";
+           ])
+  in
+  let doc = to_doc t in
+  to_string ~width:10 doc |> print_endline
+[@@live]
diff --git a/jscomp/syntax/src/res_doc.mli b/compiler/syntax/src/res_doc.mli
similarity index 78%
rename from jscomp/syntax/src/res_doc.mli
rename to compiler/syntax/src/res_doc.mli
index f1a0c6e..763c202 100644
--- a/jscomp/syntax/src/res_doc.mli
+++ b/compiler/syntax/src/res_doc.mli
@@ -2,34 +2,34 @@ type t
 
 val nil : t
 val line : t
-val hardLine : t
-val softLine : t
-val literalLine : t
+val hard_line : t
+val soft_line : t
+val literal_line : t
 val text : string -> t
 val concat : t list -> t
 val indent : t -> t
-val ifBreaks : t -> t -> t
-val lineSuffix : t -> t
+val if_breaks : t -> t -> t
+val line_suffix : t -> t
 val group : t -> t
-val breakableGroup : forceBreak:bool -> t -> t
+val breakable_group : force_break:bool -> t -> t
 
 (* `customLayout docs` will pick the layout that fits from `docs`.
  * This is a very expensive computation as every layout from the list
  * will be checked until one fits. *)
-val customLayout : t list -> t
-val breakParent : t
+val custom_layout : t list -> t
+val break_parent : t
 val join : sep:t -> t list -> t
 
 (* [(doc1, sep1); (doc2,sep2)] joins as doc1 sep1 doc2 *)
-val joinWithSep : (t * t) list -> t
+val join_with_sep : (t * t) list -> t
 
 val space : t
 val comma : t
 val dot : t
 val dotdot : t
 val dotdotdot : t
-val lessThan : t
-val greaterThan : t
+val less_than : t
+val greater_than : t
 val lbrace : t
 val rbrace : t
 val lparen : t
@@ -39,8 +39,8 @@ val rbracket : t
 val question : t
 val tilde : t
 val equal : t
-val trailingComma : t
-val doubleQuote : t [@@live]
+val trailing_comma : t
+val double_quote : t [@@live]
 
 (*
  * `willBreak doc` checks whether `doc` contains forced line breaks.
@@ -61,7 +61,7 @@ val doubleQuote : t [@@live]
  *  The consumer can then manually insert a `breakParent` doc, to manually propagate the
  *  force breaks from bottom to top.
  *)
-val willBreak : t -> bool
+val will_break : t -> bool
 
-val toString : width:int -> t -> string
+val to_string : width:int -> t -> string
 val debug : t -> unit [@@live]
diff --git a/compiler/syntax/src/res_driver.ml b/compiler/syntax/src/res_driver.ml
new file mode 100644
index 0000000..64039e7
--- /dev/null
+++ b/compiler/syntax/src/res_driver.ml
@@ -0,0 +1,162 @@
+module IO = Res_io
+
+type ('ast, 'diagnostics) parse_result = {
+  filename: string; [@live]
+  source: string;
+  parsetree: 'ast;
+  diagnostics: 'diagnostics;
+  invalid: bool;
+  comments: Res_comment.t list;
+}
+
+type 'diagnostics parsing_engine = {
+  parse_implementation:
+    for_printer:bool ->
+    filename:string ->
+    (Parsetree.structure, 'diagnostics) parse_result;
+  parse_interface:
+    for_printer:bool ->
+    filename:string ->
+    (Parsetree.signature, 'diagnostics) parse_result;
+  string_of_diagnostics:
+    source:string -> filename:string -> 'diagnostics -> unit;
+}
+
+type print_engine = {
+  print_implementation:
+    width:int ->
+    filename:string ->
+    comments:Res_comment.t list ->
+    Parsetree.structure ->
+    unit;
+  print_interface:
+    width:int ->
+    filename:string ->
+    comments:Res_comment.t list ->
+    Parsetree.signature ->
+    unit;
+}
+
+let setup ~filename ~for_printer () =
+  let src = IO.read_file ~filename in
+  let mode = if for_printer then Res_parser.Default else ParseForTypeChecker in
+  Res_parser.make ~mode src filename
+
+let setup_from_source ~display_filename ~source ~for_printer () =
+  let mode = if for_printer then Res_parser.Default else ParseForTypeChecker in
+  Res_parser.make ~mode source display_filename
+
+let parsing_engine =
+  {
+    parse_implementation =
+      (fun ~for_printer ~filename ->
+        let engine = setup ~filename ~for_printer () in
+        let structure = Res_core.parse_implementation engine in
+        let invalid, diagnostics =
+          match engine.diagnostics with
+          | [] as diagnostics -> (false, diagnostics)
+          | _ as diagnostics -> (true, diagnostics)
+        in
+        {
+          filename = engine.scanner.filename;
+          source = engine.scanner.src;
+          parsetree = structure;
+          diagnostics;
+          invalid;
+          comments = List.rev engine.comments;
+        });
+    parse_interface =
+      (fun ~for_printer ~filename ->
+        let engine = setup ~filename ~for_printer () in
+        let signature = Res_core.parse_specification engine in
+        let invalid, diagnostics =
+          match engine.diagnostics with
+          | [] as diagnostics -> (false, diagnostics)
+          | _ as diagnostics -> (true, diagnostics)
+        in
+        {
+          filename = engine.scanner.filename;
+          source = engine.scanner.src;
+          parsetree = signature;
+          diagnostics;
+          invalid;
+          comments = List.rev engine.comments;
+        });
+    string_of_diagnostics =
+      (fun ~source ~filename:_ diagnostics ->
+        Res_diagnostics.print_report diagnostics source);
+  }
+
+let parse_implementation_from_source ~for_printer ~display_filename ~source =
+  let engine = setup_from_source ~display_filename ~source ~for_printer () in
+  let structure = Res_core.parse_implementation engine in
+  let invalid, diagnostics =
+    match engine.diagnostics with
+    | [] as diagnostics -> (false, diagnostics)
+    | _ as diagnostics -> (true, diagnostics)
+  in
+  {
+    filename = engine.scanner.filename;
+    source = engine.scanner.src;
+    parsetree = structure;
+    diagnostics;
+    invalid;
+    comments = List.rev engine.comments;
+  }
+
+let parse_interface_from_source ~for_printer ~display_filename ~source =
+  let engine = setup_from_source ~display_filename ~source ~for_printer () in
+  let signature = Res_core.parse_specification engine in
+  let invalid, diagnostics =
+    match engine.diagnostics with
+    | [] as diagnostics -> (false, diagnostics)
+    | _ as diagnostics -> (true, diagnostics)
+  in
+  {
+    filename = engine.scanner.filename;
+    source = engine.scanner.src;
+    parsetree = signature;
+    diagnostics;
+    invalid;
+    comments = List.rev engine.comments;
+  }
+
+let print_engine =
+  {
+    print_implementation =
+      (fun ~width ~filename:_ ~comments structure ->
+        print_string
+          (Res_printer.print_implementation ~width structure ~comments));
+    print_interface =
+      (fun ~width ~filename:_ ~comments signature ->
+        print_string (Res_printer.print_interface ~width signature ~comments));
+  }
+
+let parse_implementation ?(ignore_parse_errors = false) sourcefile =
+  Location.input_name := sourcefile;
+  let parse_result =
+    parsing_engine.parse_implementation ~for_printer:false ~filename:sourcefile
+  in
+  if parse_result.invalid then (
+    Res_diagnostics.print_report parse_result.diagnostics parse_result.source;
+    if not ignore_parse_errors then exit 1);
+  parse_result.parsetree
+[@@raises exit]
+
+let parse_interface ?(ignore_parse_errors = false) sourcefile =
+  Location.input_name := sourcefile;
+  let parse_result =
+    parsing_engine.parse_interface ~for_printer:false ~filename:sourcefile
+  in
+  if parse_result.invalid then (
+    Res_diagnostics.print_report parse_result.diagnostics parse_result.source;
+    if not ignore_parse_errors then exit 1);
+  parse_result.parsetree
+[@@raises exit]
+
+(* suppress unused optional arg *)
+let _ =
+ fun s ->
+  ( parse_implementation ~ignore_parse_errors:false s,
+    parse_interface ~ignore_parse_errors:false s )
+[@@raises exit]
diff --git a/compiler/syntax/src/res_driver.mli b/compiler/syntax/src/res_driver.mli
new file mode 100644
index 0000000..2b71701
--- /dev/null
+++ b/compiler/syntax/src/res_driver.mli
@@ -0,0 +1,63 @@
+type ('ast, 'diagnostics) parse_result = {
+  filename: string; [@live]
+  source: string;
+  parsetree: 'ast;
+  diagnostics: 'diagnostics;
+  invalid: bool;
+  comments: Res_comment.t list;
+}
+
+type 'diagnostics parsing_engine = {
+  parse_implementation:
+    for_printer:bool ->
+    filename:string ->
+    (Parsetree.structure, 'diagnostics) parse_result;
+  parse_interface:
+    for_printer:bool ->
+    filename:string ->
+    (Parsetree.signature, 'diagnostics) parse_result;
+  string_of_diagnostics:
+    source:string -> filename:string -> 'diagnostics -> unit;
+}
+
+val parse_implementation_from_source :
+  for_printer:bool ->
+  display_filename:string ->
+  source:string ->
+  (Parsetree.structure, Res_diagnostics.t list) parse_result
+[@@live]
+
+val parse_interface_from_source :
+  for_printer:bool ->
+  display_filename:string ->
+  source:string ->
+  (Parsetree.signature, Res_diagnostics.t list) parse_result
+[@@live]
+
+type print_engine = {
+  print_implementation:
+    width:int ->
+    filename:string ->
+    comments:Res_comment.t list ->
+    Parsetree.structure ->
+    unit;
+  print_interface:
+    width:int ->
+    filename:string ->
+    comments:Res_comment.t list ->
+    Parsetree.signature ->
+    unit;
+}
+
+val parsing_engine : Res_diagnostics.t list parsing_engine
+
+val print_engine : print_engine
+
+(* ReScript implementation parsing compatible with ocaml pparse driver. Used by the compiler. *)
+val parse_implementation :
+  ?ignore_parse_errors:bool -> string -> Parsetree.structure
+[@@live] [@@raises Location.Error]
+
+(* ReScript interface parsing compatible with ocaml pparse driver. Used by the compiler *)
+val parse_interface : ?ignore_parse_errors:bool -> string -> Parsetree.signature
+[@@live] [@@raises Location.Error]
diff --git a/jscomp/syntax/src/res_driver_binary.ml b/compiler/syntax/src/res_driver_binary.ml
similarity index 85%
rename from jscomp/syntax/src/res_driver_binary.ml
rename to compiler/syntax/src/res_driver_binary.ml
index 58a8153..71eb12b 100644
--- a/jscomp/syntax/src/res_driver_binary.ml
+++ b/compiler/syntax/src/res_driver_binary.ml
@@ -1,12 +1,12 @@
-let printEngine =
+let print_engine =
   Res_driver.
     {
-      printImplementation =
+      print_implementation =
         (fun ~width:_ ~filename ~comments:_ structure ->
           output_string stdout Config.ast_impl_magic_number;
           output_value stdout filename;
           output_value stdout structure);
-      printInterface =
+      print_interface =
         (fun ~width:_ ~filename ~comments:_ signature ->
           output_string stdout Config.ast_intf_magic_number;
           output_value stdout filename;
diff --git a/compiler/syntax/src/res_driver_binary.mli b/compiler/syntax/src/res_driver_binary.mli
new file mode 100644
index 0000000..46358ea
--- /dev/null
+++ b/compiler/syntax/src/res_driver_binary.mli
@@ -0,0 +1 @@
+val print_engine : Res_driver.print_engine
diff --git a/compiler/syntax/src/res_driver_ml_printer.ml b/compiler/syntax/src/res_driver_ml_printer.ml
new file mode 100644
index 0000000..651ab05
--- /dev/null
+++ b/compiler/syntax/src/res_driver_ml_printer.ml
@@ -0,0 +1,10 @@
+let print_engine =
+  Res_driver.
+    {
+      print_implementation =
+        (fun ~width:_ ~filename:_ ~comments:_ structure ->
+          Pprintast.structure Format.std_formatter structure);
+      print_interface =
+        (fun ~width:_ ~filename:_ ~comments:_ signature ->
+          Pprintast.signature Format.std_formatter signature);
+    }
diff --git a/compiler/syntax/src/res_driver_ml_printer.mli b/compiler/syntax/src/res_driver_ml_printer.mli
new file mode 100644
index 0000000..46358ea
--- /dev/null
+++ b/compiler/syntax/src/res_driver_ml_printer.mli
@@ -0,0 +1 @@
+val print_engine : Res_driver.print_engine
diff --git a/compiler/syntax/src/res_grammar.ml b/compiler/syntax/src/res_grammar.ml
new file mode 100644
index 0000000..8bfbbee
--- /dev/null
+++ b/compiler/syntax/src/res_grammar.ml
@@ -0,0 +1,335 @@
+module Token = Res_token
+
+type t =
+  | OpenDescription (* open Belt *)
+  | ModuleLongIdent (* Foo or Foo.Bar *) [@live]
+  | Ternary (* condExpr ? trueExpr : falseExpr *)
+  | Es6ArrowExpr
+  | Jsx
+  | JsxAttribute
+  | JsxChild [@live]
+  | ExprOperand
+  | ExprUnary
+  | ExprSetField
+  | ExprBinaryAfterOp of Token.t
+  | ExprBlock
+  | ExprCall
+  | ExprList
+  | ExprArrayAccess
+  | ExprArrayMutation
+  | ExprIf
+  | ExprFor
+  | IfCondition
+  | IfBranch
+  | ElseBranch
+  | TypeExpression
+  | External
+  | PatternMatching
+  | PatternMatchCase
+  | LetBinding
+  | PatternList
+  | PatternOcamlList
+  | PatternRecord
+  | TypeDef
+  | TypeConstrName
+  | TypeParams
+  | TypeParam [@live]
+  | PackageConstraint
+  | TypeRepresentation
+  | RecordDecl
+  | ConstructorDeclaration
+  | ParameterList
+  | StringFieldDeclarations
+  | FieldDeclarations
+  | TypExprList
+  | FunctorArgs
+  | ModExprList
+  | TypeParameters
+  | RecordRows
+  | RecordRowsStringKey
+  | ArgumentList
+  | Signature
+  | Specification
+  | Structure
+  | Implementation
+  | Attribute
+  | TypeConstraint
+  | AtomicTypExpr
+  | ListExpr
+  | Pattern
+  | AttributePayload
+  | TagNames
+  | DictRows
+
+let to_string = function
+  | OpenDescription -> "an open description"
+  | ModuleLongIdent -> "a module path"
+  | Ternary -> "a ternary expression"
+  | Es6ArrowExpr -> "an es6 arrow function"
+  | Jsx -> "a jsx expression"
+  | JsxAttribute -> "a jsx attribute"
+  | ExprOperand -> "a basic expression"
+  | ExprUnary -> "a unary expression"
+  | ExprBinaryAfterOp op ->
+    "an expression after the operator \"" ^ Token.to_string op ^ "\""
+  | ExprIf -> "an if expression"
+  | IfCondition -> "the condition of an if expression"
+  | IfBranch -> "the true-branch of an if expression"
+  | ElseBranch -> "the else-branch of an if expression"
+  | TypeExpression -> "a type"
+  | External -> "an external"
+  | PatternMatching -> "the cases of a pattern match"
+  | ExprBlock -> "a block with expressions"
+  | ExprSetField -> "a record field mutation"
+  | ExprCall -> "a function application"
+  | ExprArrayAccess -> "an array access expression"
+  | ExprArrayMutation -> "an array mutation"
+  | LetBinding -> "a let binding"
+  | TypeDef -> "a type definition"
+  | TypeParams -> "type parameters"
+  | TypeParam -> "a type parameter"
+  | TypeConstrName -> "a type-constructor name"
+  | TypeRepresentation -> "a type representation"
+  | RecordDecl -> "a record declaration"
+  | PatternMatchCase -> "a pattern match case"
+  | ConstructorDeclaration -> "a constructor declaration"
+  | ExprList -> "multiple expressions"
+  | PatternList -> "multiple patterns"
+  | PatternOcamlList -> "a list pattern"
+  | PatternRecord -> "a record pattern"
+  | ParameterList -> "parameters"
+  | StringFieldDeclarations -> "string field declarations"
+  | FieldDeclarations -> "field declarations"
+  | TypExprList -> "list of types"
+  | FunctorArgs -> "functor arguments"
+  | ModExprList -> "list of module expressions"
+  | TypeParameters -> "list of type parameters"
+  | RecordRows -> "rows of a record"
+  | RecordRowsStringKey -> "rows of a record with string keys"
+  | ArgumentList -> "arguments"
+  | Signature -> "signature"
+  | Specification -> "specification"
+  | Structure -> "structure"
+  | Implementation -> "implementation"
+  | Attribute -> "an attribute"
+  | TypeConstraint -> "constraints on a type"
+  | AtomicTypExpr -> "a type"
+  | ListExpr -> "an ocaml list expr"
+  | PackageConstraint -> "a package constraint"
+  | JsxChild -> "jsx child"
+  | Pattern -> "pattern"
+  | ExprFor -> "a for expression"
+  | AttributePayload -> "an attribute payload"
+  | TagNames -> "tag names"
+  | DictRows -> "rows of a dict"
+
+let is_signature_item_start = function
+  | Token.At | Let _ | Typ | External | Exception | Open | Include | Module
+  | AtAt | PercentPercent ->
+    true
+  | _ -> false
+
+let is_atomic_pattern_start = function
+  | Token.Int _ | String _ | Codepoint _ | Backtick | Lparen | Lbracket | Lbrace
+  | Underscore | Lident _ | Uident _ | List | Dict | Exception | Percent ->
+    true
+  | _ -> false
+
+let is_atomic_expr_start = function
+  | Token.True | False | Int _ | String _ | Float _ | Codepoint _ | Backtick
+  | Uident _ | Lident _ | Hash | Lparen | List | Lbracket | Lbrace | LessThan
+  | Module | Percent | Forwardslash | ForwardslashDot | Dict ->
+    true
+  | _ -> false
+
+let is_atomic_typ_expr_start = function
+  | Token.SingleQuote | Underscore | Lparen | Lbrace | Uident _ | Lident _
+  | Percent ->
+    true
+  | _ -> false
+
+let is_expr_start = function
+  | Token.Assert | At | Await | Backtick | Bang | Codepoint _ | False | Float _
+  | For | Hash | If | Int _ | Lbrace | Lbracket | LessThan | Lident _ | List
+  | Lparen | Minus | MinusDot | Module | Percent | Plus | PlusDot | Bnot | Bor
+  | Bxor | Band | String _ | Switch | True | Try | Uident _
+  | Underscore (* _ => doThings() *)
+  | While | Forwardslash | ForwardslashDot | Dict ->
+    true
+  | _ -> false
+
+let is_jsx_attribute_start = function
+  | Token.Lident _ | Question | Lbrace -> true
+  | _ -> false
+
+let is_structure_item_start = function
+  | Token.Open | Let _ | Typ | External | Exception | Include | Module | AtAt
+  | PercentPercent | At ->
+    true
+  | t when is_expr_start t -> true
+  | _ -> false
+
+let is_pattern_start = function
+  | Token.Int _ | Float _ | String _ | Codepoint _ | Backtick | True | False
+  | Minus | Plus | Lparen | Lbracket | Lbrace | List | Dict | Underscore
+  | DotDotDot | Lident _ | Uident _ | Hash | Exception | Percent | Module | At
+    ->
+    true
+  | _ -> false
+
+let is_parameter_start = function
+  | Token.Typ | Tilde | Dot -> true
+  | token when is_pattern_start token -> true
+  | _ -> false
+
+(* TODO: overparse Uident ? *)
+let is_string_field_decl_start = function
+  | Token.String _ | Lident _ | At | DotDotDot -> true
+  | _ -> false
+
+(* TODO: overparse Uident ? *)
+let is_field_decl_start = function
+  | Token.At | Mutable | Lident _ -> true
+  (* recovery, TODO: this is not ideal… *)
+  | Uident _ -> true
+  | t when Token.is_keyword t -> true
+  | _ -> false
+
+let is_record_decl_start = function
+  | Token.At | Mutable | Lident _ | DotDotDot -> true
+  | _ -> false
+
+let is_typ_expr_start = function
+  | Token.At | SingleQuote | Underscore | Lparen | Lbracket | Uident _
+  | Lident _ | Module | Percent | Lbrace ->
+    true
+  | _ -> false
+
+let is_type_parameter_start = function
+  | Token.Tilde | Dot -> true
+  | token when is_typ_expr_start token -> true
+  | _ -> false
+
+let is_type_param_start = function
+  | Token.Plus | Minus | SingleQuote | Underscore -> true
+  | _ -> false
+
+let is_functor_arg_start = function
+  | Token.At | Uident _ | Underscore | Percent | Lbrace | Lparen -> true
+  | _ -> false
+
+let is_mod_expr_start = function
+  | Token.At | Percent | Uident _ | Lbrace | Lparen | Lident "unpack" | Await ->
+    true
+  | _ -> false
+
+let is_dict_row_start = function
+  | Token.String _ -> true
+  | _ -> false
+
+let is_record_row_start = function
+  | Token.DotDotDot -> true
+  | Token.Uident _ | Lident _ -> true
+  (* TODO *)
+  | t when Token.is_keyword t -> true
+  | _ -> false
+
+let is_record_row_string_key_start = function
+  | Token.String _ -> true
+  | _ -> false
+
+let is_argument_start = function
+  | Token.Tilde | Dot | Underscore -> true
+  | t when is_expr_start t -> true
+  | _ -> false
+
+let is_pattern_match_start = function
+  | Token.Bar -> true
+  | t when is_pattern_start t -> true
+  | _ -> false
+
+let is_pattern_ocaml_list_start = function
+  | Token.DotDotDot -> true
+  | t when is_pattern_start t -> true
+  | _ -> false
+
+let is_pattern_record_item_start = function
+  | Token.DotDotDot | Uident _ | Lident _ | Underscore -> true
+  | _ -> false
+
+let is_attribute_start = function
+  | Token.At -> true
+  | _ -> false
+
+let is_jsx_child_start = is_atomic_expr_start
+
+let is_block_expr_start = function
+  | Token.Assert | At | Await | Backtick | Bang | Codepoint _ | Exception
+  | False | Float _ | For | Forwardslash | ForwardslashDot | Hash | If | Int _
+  | Lbrace | Lbracket | LessThan | Let _ | Lident _ | List | Lparen | Minus
+  | MinusDot | Module | Open | Percent | Plus | PlusDot | String _ | Switch
+  | True | Try | Uident _ | Underscore | While | Dict ->
+    true
+  | _ -> false
+
+let is_list_element grammar token =
+  match grammar with
+  | ExprList -> token = Token.DotDotDot || is_expr_start token
+  | ListExpr -> token = DotDotDot || is_expr_start token
+  | PatternList -> token = DotDotDot || is_pattern_start token
+  | ParameterList -> is_parameter_start token
+  | StringFieldDeclarations -> is_string_field_decl_start token
+  | FieldDeclarations -> is_field_decl_start token
+  | RecordDecl -> is_record_decl_start token
+  | TypExprList -> is_typ_expr_start token || token = Token.LessThan
+  | TypeParams -> is_type_param_start token
+  | FunctorArgs -> is_functor_arg_start token
+  | ModExprList -> is_mod_expr_start token
+  | TypeParameters -> is_type_parameter_start token
+  | DictRows -> is_dict_row_start token
+  | RecordRows -> is_record_row_start token
+  | RecordRowsStringKey -> is_record_row_string_key_start token
+  | ArgumentList -> is_argument_start token
+  | Signature | Specification -> is_signature_item_start token
+  | Structure | Implementation -> is_structure_item_start token
+  | PatternMatching -> is_pattern_match_start token
+  | PatternOcamlList -> is_pattern_ocaml_list_start token
+  | PatternRecord -> is_pattern_record_item_start token
+  | Attribute -> is_attribute_start token
+  | TypeConstraint -> token = Constraint
+  | PackageConstraint -> token = And
+  | ConstructorDeclaration -> token = Bar
+  | JsxAttribute -> is_jsx_attribute_start token
+  | AttributePayload -> token = Lparen
+  | TagNames -> token = Hash
+  | _ -> false
+
+let is_list_terminator grammar token =
+  match (grammar, token) with
+  | _, Token.Eof
+  | ExprList, (Rparen | Forwardslash | Rbracket)
+  | ListExpr, Rparen
+  | ArgumentList, (Rparen | DotDotDot)
+  | TypExprList, (Rparen | Forwardslash | GreaterThan | Equal)
+  | ModExprList, Rparen
+  | ( (PatternList | PatternOcamlList | PatternRecord),
+      ( Forwardslash | Rbracket | Rparen | EqualGreater (* pattern matching => *)
+      | In (* for expressions *)
+      | Equal (* let {x} = foo *) ) )
+  | ExprBlock, Rbrace
+  | (Structure | Signature), Rbrace
+  | TypeParams, Rparen
+  | ParameterList, (EqualGreater | Lbrace)
+  | JsxAttribute, (Forwardslash | GreaterThan)
+  | StringFieldDeclarations, Rbrace ->
+    true
+  | Attribute, token when token <> At -> true
+  | TypeConstraint, token when token <> Constraint -> true
+  | PackageConstraint, token when token <> And -> true
+  | ConstructorDeclaration, token when token <> Bar -> true
+  | AttributePayload, Rparen -> true
+  | TagNames, Rbracket -> true
+  | _ -> false
+
+let is_part_of_list grammar token =
+  is_list_element grammar token || is_list_terminator grammar token
diff --git a/compiler/syntax/src/res_io.ml b/compiler/syntax/src/res_io.ml
new file mode 100644
index 0000000..1912705
--- /dev/null
+++ b/compiler/syntax/src/res_io.ml
@@ -0,0 +1,14 @@
+let read_file ~filename =
+  let chan = open_in_bin filename in
+  let content =
+    try really_input_string chan (in_channel_length chan)
+    with End_of_file -> ""
+  in
+  close_in_noerr chan;
+  content
+
+let write_file ~filename ~contents:txt =
+  let chan = open_out_bin filename in
+  output_string chan txt;
+  close_out chan
+[@@raises Sys_error] [@@dead "+write_file"]
diff --git a/compiler/syntax/src/res_io.mli b/compiler/syntax/src/res_io.mli
new file mode 100644
index 0000000..b0ec5ff
--- /dev/null
+++ b/compiler/syntax/src/res_io.mli
@@ -0,0 +1,8 @@
+(* utilities to read and write to/from files or stdin *)
+
+(* reads the contents of "filename" into a string *)
+val read_file : filename:string -> string
+
+(* writes "content" into file with name "filename" *)
+val write_file : filename:string -> contents:string -> unit
+[@@dead "+write_file"]
diff --git a/jscomp/syntax/src/res_minibuffer.ml b/compiler/syntax/src/res_minibuffer.ml
similarity index 100%
rename from jscomp/syntax/src/res_minibuffer.ml
rename to compiler/syntax/src/res_minibuffer.ml
diff --git a/jscomp/syntax/src/res_minibuffer.mli b/compiler/syntax/src/res_minibuffer.mli
similarity index 100%
rename from jscomp/syntax/src/res_minibuffer.mli
rename to compiler/syntax/src/res_minibuffer.mli
diff --git a/compiler/syntax/src/res_multi_printer.ml b/compiler/syntax/src/res_multi_printer.ml
new file mode 100644
index 0000000..711241a
--- /dev/null
+++ b/compiler/syntax/src/res_multi_printer.ml
@@ -0,0 +1,33 @@
+(* print res files to res syntax *)
+let print_res ~ignore_parse_errors ~is_interface ~filename =
+  if is_interface then (
+    let parse_result =
+      Res_driver.parsing_engine.parse_interface ~for_printer:true ~filename
+    in
+    if parse_result.invalid then (
+      Res_diagnostics.print_report parse_result.diagnostics parse_result.source;
+      if not ignore_parse_errors then exit 1);
+    Res_printer.print_interface ~width:Res_printer.default_print_width
+      ~comments:parse_result.comments parse_result.parsetree)
+  else
+    let parse_result =
+      Res_driver.parsing_engine.parse_implementation ~for_printer:true ~filename
+    in
+    if parse_result.invalid then (
+      Res_diagnostics.print_report parse_result.diagnostics parse_result.source;
+      if not ignore_parse_errors then exit 1);
+    Res_printer.print_implementation ~width:Res_printer.default_print_width
+      ~comments:parse_result.comments parse_result.parsetree
+[@@raises exit]
+
+(* print the given file named input to from "language" to res, general interface exposed by the compiler *)
+let print ?(ignore_parse_errors = false) input =
+  let is_interface =
+    let len = String.length input in
+    len > 0 && String.unsafe_get input (len - 1) = 'i'
+  in
+  print_res ~ignore_parse_errors ~is_interface ~filename:input
+[@@raises exit]
+
+(* suppress unused optional arg *)
+let _ = fun s -> print ~ignore_parse_errors:false s [@@raises exit]
diff --git a/compiler/syntax/src/res_multi_printer.mli b/compiler/syntax/src/res_multi_printer.mli
new file mode 100644
index 0000000..bb66106
--- /dev/null
+++ b/compiler/syntax/src/res_multi_printer.mli
@@ -0,0 +1,3 @@
+(* Interface to print source code to res.
+ * Takes a filename called "input" and returns the corresponding formatted res syntax *)
+val print : ?ignore_parse_errors:bool -> string -> string [@@dead "+print"]
diff --git a/compiler/syntax/src/res_outcome_printer.ml b/compiler/syntax/src/res_outcome_printer.ml
new file mode 100644
index 0000000..f6fd5ae
--- /dev/null
+++ b/compiler/syntax/src/res_outcome_printer.ml
@@ -0,0 +1,1094 @@
+(* For the curious: the outcome printer is a printer to print data
+ * from the outcometree.mli file in the ocaml compiler.
+ * The outcome tree is used by:
+ *  - ocaml's toplevel/repl, print results/errors
+ *  - super errors, print nice errors
+ *  - editor tooling, e.g. show type on hover
+ *
+ * In general it represent messages to show results or errors to the user. *)
+
+module Doc = Res_doc
+module Printer = Res_printer
+
+(* ReScript doesn't have parenthesized identifiers.
+ * We don't support custom operators. *)
+let parenthesized_ident _name = true
+
+(* TODO: better allocation strategy for the buffer *)
+let escape_string_contents s =
+  let len = String.length s in
+  let b = Buffer.create len in
+  for i = 0 to len - 1 do
+    let c = (String.get [@doesNotRaise]) s i in
+    if c = '\008' then (
+      Buffer.add_char b '\\';
+      Buffer.add_char b 'b')
+    else if c = '\009' then (
+      Buffer.add_char b '\\';
+      Buffer.add_char b 't')
+    else if c = '\010' then (
+      Buffer.add_char b '\\';
+      Buffer.add_char b 'n')
+    else if c = '\013' then (
+      Buffer.add_char b '\\';
+      Buffer.add_char b 'r')
+    else if c = '\034' then (
+      Buffer.add_char b '\\';
+      Buffer.add_char b '"')
+    else if c = '\092' then (
+      Buffer.add_char b '\\';
+      Buffer.add_char b '\\')
+    else Buffer.add_char b c
+  done;
+  Buffer.contents b
+
+(* let rec print_ident fmt ident = match ident with
+   | Outcometree.Oide_ident s -> Format.pp_print_string fmt s
+   | Oide_dot (id, s) ->
+     print_ident fmt id;
+     Format.pp_print_char fmt '.';
+     Format.pp_print_string fmt s
+   | Oide_apply (id1, id2) ->
+     print_ident fmt id1;
+     Format.pp_print_char fmt '(';
+     print_ident fmt id2;
+     Format.pp_print_char fmt ')' *)
+
+let rec print_out_ident_doc ?(allow_uident = true)
+    (ident : Outcometree.out_ident) =
+  match ident with
+  | Oide_ident s -> Printer.print_ident_like ~allow_uident s
+  | Oide_dot (ident, s) ->
+    Doc.concat [print_out_ident_doc ident; Doc.dot; Doc.text s]
+  | Oide_apply (call, arg) ->
+    Doc.concat
+      [
+        print_out_ident_doc call; Doc.lparen; print_out_ident_doc arg; Doc.rparen;
+      ]
+
+let print_out_attribute_doc (out_attribute : Outcometree.out_attribute) =
+  Doc.concat [Doc.text "@"; Doc.text out_attribute.oattr_name]
+
+let print_out_attributes_doc (attrs : Outcometree.out_attribute list) =
+  match attrs with
+  | [] -> Doc.nil
+  | attrs ->
+    Doc.concat
+      [
+        Doc.group
+          (Doc.join ~sep:Doc.line (List.map print_out_attribute_doc attrs));
+        Doc.line;
+      ]
+
+let rec collect_arrow_args (out_type : Outcometree.out_type) args =
+  match out_type with
+  | Otyp_arrow (label, arg_type, return_type, arity)
+    when arity = None || args = [] ->
+    let arg = (label, arg_type) in
+    collect_arrow_args return_type (arg :: args)
+  | _ as return_type -> (List.rev args, return_type)
+
+let rec collect_functor_args (out_module_type : Outcometree.out_module_type)
+    args =
+  match out_module_type with
+  | Omty_functor (lbl, opt_mod_type, return_mod_type) ->
+    let arg = (lbl, opt_mod_type) in
+    collect_functor_args return_mod_type (arg :: args)
+  | _ -> (List.rev args, out_module_type)
+
+let rec print_out_type_doc (out_type : Outcometree.out_type) =
+  match out_type with
+  | Otyp_abstract | Otyp_open -> Doc.nil
+  | Otyp_variant (non_gen, out_variant, closed, labels) ->
+    (* bool * out_variant * bool * (string list) option *)
+    let opening =
+      match (closed, labels) with
+      | true, None -> (* [#A | #B] *) Doc.soft_line
+      | false, None ->
+        (* [> #A | #B] *)
+        Doc.concat [Doc.greater_than; Doc.line]
+      | true, Some [] ->
+        (* [< #A | #B] *)
+        Doc.concat [Doc.less_than; Doc.line]
+      | true, Some _ ->
+        (* [< #A | #B > #X #Y ] *)
+        Doc.concat [Doc.less_than; Doc.line]
+      | false, Some _ ->
+        (* impossible!? ocaml seems to print ?, see oprint.ml in 4.06 *)
+        Doc.concat [Doc.text "?"; Doc.line]
+    in
+    Doc.group
+      (Doc.concat
+         [
+           (if non_gen then Doc.text "_" else Doc.nil);
+           Doc.lbracket;
+           Doc.indent (Doc.concat [opening; print_out_variant out_variant]);
+           Doc.soft_line;
+           Doc.rbracket;
+         ])
+  | Otyp_alias (typ, alias_txt) ->
+    Doc.concat
+      [
+        Doc.lparen;
+        print_out_type_doc typ;
+        Doc.text " as '";
+        Doc.text alias_txt;
+        Doc.rparen;
+      ]
+  | Otyp_constr (out_ident, []) ->
+    print_out_ident_doc ~allow_uident:false out_ident
+  | Otyp_manifest (typ1, typ2) ->
+    Doc.concat
+      [print_out_type_doc typ1; Doc.text " = "; print_out_type_doc typ2]
+  | Otyp_record record -> print_record_declaration_doc ~inline:true record
+  | Otyp_stuff txt -> Doc.text txt
+  | Otyp_var (ng, s) ->
+    Doc.concat [Doc.text ("'" ^ if ng then "_" else ""); Doc.text s]
+  | Otyp_object (fields, rest) -> print_object_fields fields rest
+  | Otyp_class _ -> Doc.nil
+  | Otyp_attribute (typ, attribute) ->
+    Doc.group
+      (Doc.concat
+         [print_out_attribute_doc attribute; Doc.line; print_out_type_doc typ])
+  (* example: Red | Blue | Green | CustomColour(float, float, float) *)
+  | Otyp_sum constructors -> print_out_constructors_doc constructors
+  (* example: {"name": string, "age": int} *)
+  | Otyp_constr (Oide_dot (Oide_ident "Js", "t"), [Otyp_object (fields, rest)])
+    ->
+    print_object_fields fields rest
+  (* example: node<root, 'value> *)
+  | Otyp_constr (out_ident, args) ->
+    let args_doc =
+      match args with
+      | [] -> Doc.nil
+      | args ->
+        Doc.concat
+          [
+            Doc.less_than;
+            Doc.indent
+              (Doc.concat
+                 [
+                   Doc.soft_line;
+                   Doc.join
+                     ~sep:(Doc.concat [Doc.comma; Doc.line])
+                     (List.map print_out_type_doc args);
+                 ]);
+            Doc.trailing_comma;
+            Doc.soft_line;
+            Doc.greater_than;
+          ]
+    in
+    Doc.group (Doc.concat [print_out_ident_doc out_ident; args_doc])
+  | Otyp_tuple tuple_args ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.lparen;
+           Doc.indent
+             (Doc.concat
+                [
+                  Doc.soft_line;
+                  Doc.join
+                    ~sep:(Doc.concat [Doc.comma; Doc.line])
+                    (List.map print_out_type_doc tuple_args);
+                ]);
+           Doc.trailing_comma;
+           Doc.soft_line;
+           Doc.rparen;
+         ])
+  | Otyp_poly (vars, out_type) ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.join ~sep:Doc.space
+             (List.map (fun var -> Doc.text ("'" ^ var)) vars);
+           Doc.dot;
+           Doc.space;
+           print_out_type_doc out_type;
+         ])
+  | Otyp_arrow _ as typ -> print_out_arrow_type typ
+  | Otyp_module (mod_name, string_list, out_types) ->
+    let package_type_doc =
+      match (string_list, out_types) with
+      | [], [] -> Doc.nil
+      | labels, types ->
+        let i = ref 0 in
+        let package =
+          Doc.join ~sep:Doc.line
+            ((List.map2 [@doesNotRaise])
+               (fun lbl typ ->
+                 let result =
+                   Doc.concat
+                     [
+                       Doc.text
+                         (if i.contents > 0 then "and type " else "with type ");
+                       Doc.text lbl;
+                       Doc.text " = ";
+                       print_out_type_doc typ;
+                     ]
+                 in
+                 incr i;
+                 result)
+               labels types)
+        in
+        Doc.indent (Doc.concat [Doc.line; package])
+    in
+    Doc.concat
+      [
+        Doc.text "module";
+        Doc.lparen;
+        Doc.text mod_name;
+        package_type_doc;
+        Doc.rparen;
+      ]
+
+and print_out_arrow_type typ =
+  let typ_args, typ = collect_arrow_args typ [] in
+  let args =
+    Doc.join
+      ~sep:(Doc.concat [Doc.comma; Doc.line])
+      (List.map
+         (fun (lbl, typ) ->
+           let lbl_len = String.length lbl in
+           if lbl_len = 0 then print_out_type_doc typ
+           else
+             let lbl, optional_indicator =
+               (* the ocaml compiler hardcodes the optional label inside the string of the label in printtyp.ml *)
+               match String.unsafe_get lbl 0 with
+               | '?' ->
+                 ( (String.sub [@doesNotRaise]) lbl 1 (lbl_len - 1),
+                   Doc.text "=?" )
+               | _ -> (lbl, Doc.nil)
+             in
+             Doc.group
+               (Doc.concat
+                  [
+                    Doc.text ("~" ^ lbl ^ ": ");
+                    print_out_type_doc typ;
+                    optional_indicator;
+                  ]))
+         typ_args)
+  in
+  let args_doc =
+    let needs_parens =
+      match typ_args with
+      | [(_, (Otyp_tuple _ | Otyp_arrow _))] -> true
+      (* single argument should not be wrapped *)
+      | [("", _)] -> false
+      | _ -> true
+    in
+    if needs_parens then
+      Doc.group
+        (Doc.concat
+           [
+             Doc.lparen;
+             Doc.indent (Doc.concat [Doc.soft_line; args]);
+             Doc.trailing_comma;
+             Doc.soft_line;
+             Doc.rparen;
+           ])
+    else args
+  in
+  Doc.concat [args_doc; Doc.text " => "; print_out_type_doc typ]
+
+and print_out_variant variant =
+  match variant with
+  | Ovar_fields fields ->
+    (* (string * bool * out_type list) list *)
+    Doc.join ~sep:Doc.line
+      ((*
+        * [< | #T([< u2]) & ([< u2]) & ([< u1])]  --> no ampersand
+        * [< | #S & ([< u2]) & ([< u2]) & ([< u1])] --> ampersand
+        *)
+       List.mapi
+         (fun i (name, ampersand, types) ->
+           let needs_parens =
+             match types with
+             | [Outcometree.Otyp_tuple _] -> false
+             | _ -> true
+           in
+           Doc.concat
+             [
+               (if i > 0 then Doc.text "| "
+                else Doc.if_breaks (Doc.text "| ") Doc.nil);
+               Doc.group
+                 (Doc.concat
+                    [
+                      Doc.text "#";
+                      Printer.print_poly_var_ident name;
+                      (match types with
+                      | [] -> Doc.nil
+                      | types ->
+                        Doc.concat
+                          [
+                            (if ampersand then Doc.text " & " else Doc.nil);
+                            Doc.indent
+                              (Doc.concat
+                                 [
+                                   Doc.join
+                                     ~sep:(Doc.concat [Doc.text " &"; Doc.line])
+                                     (List.map
+                                        (fun typ ->
+                                          let out_type_doc =
+                                            print_out_type_doc typ
+                                          in
+                                          if needs_parens then
+                                            Doc.concat
+                                              [
+                                                Doc.lparen;
+                                                out_type_doc;
+                                                Doc.rparen;
+                                              ]
+                                          else out_type_doc)
+                                        types);
+                                 ]);
+                          ]);
+                    ]);
+             ])
+         fields)
+  | Ovar_typ typ -> print_out_type_doc typ
+
+and print_object_fields fields rest =
+  let dots =
+    match rest with
+    | Some non_gen -> Doc.text ((if non_gen then "_" else "") ^ "..")
+    | None -> if fields = [] then Doc.dot else Doc.nil
+  in
+  Doc.group
+    (Doc.concat
+       [
+         Doc.lbrace;
+         dots;
+         Doc.indent
+           (Doc.concat
+              [
+                Doc.soft_line;
+                Doc.join
+                  ~sep:(Doc.concat [Doc.comma; Doc.line])
+                  (List.map
+                     (fun (lbl, out_type) ->
+                       Doc.group
+                         (Doc.concat
+                            [
+                              Doc.text ("\"" ^ lbl ^ "\": ");
+                              print_out_type_doc out_type;
+                            ]))
+                     fields);
+              ]);
+         Doc.trailing_comma;
+         Doc.soft_line;
+         Doc.rbrace;
+       ])
+
+and print_out_constructors_doc constructors =
+  Doc.group
+    (Doc.indent
+       (Doc.concat
+          [
+            Doc.soft_line;
+            Doc.join ~sep:Doc.line
+              (List.mapi
+                 (fun i constructor ->
+                   Doc.concat
+                     [
+                       (if i > 0 then Doc.text "| "
+                        else Doc.if_breaks (Doc.text "| ") Doc.nil);
+                       print_out_constructor_doc constructor;
+                     ])
+                 constructors);
+          ]))
+
+and print_out_constructor_doc (name, args, gadt, repr) =
+  let repr_doc =
+    match repr with
+    | None -> Doc.nil
+    | Some s -> Doc.text (s ^ " ")
+  in
+  let gadt_doc =
+    match gadt with
+    | Some out_type -> Doc.concat [Doc.text ": "; print_out_type_doc out_type]
+    | None -> Doc.nil
+  in
+  let args_doc =
+    match args with
+    | [] -> Doc.nil
+    | [Otyp_record record] ->
+      (* inline records
+       *   | Root({
+       *      mutable value: 'value,
+       *      mutable updatedTime: float,
+       *    })
+       *)
+      Doc.concat
+        [
+          Doc.lparen;
+          Doc.indent (print_record_declaration_doc ~inline:true record);
+          Doc.rparen;
+        ]
+    | _types ->
+      Doc.indent
+        (Doc.concat
+           [
+             Doc.lparen;
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    Doc.join
+                      ~sep:(Doc.concat [Doc.comma; Doc.line])
+                      (List.map print_out_type_doc args);
+                  ]);
+             Doc.trailing_comma;
+             Doc.soft_line;
+             Doc.rparen;
+           ])
+  in
+  Doc.group (Doc.concat [repr_doc; Doc.text name; args_doc; gadt_doc])
+
+and print_record_decl_row_doc (name, mut, opt, arg) =
+  Doc.group
+    (Doc.concat
+       [
+         (if mut then Doc.text "mutable " else Doc.nil);
+         Printer.print_ident_like ~allow_uident:false name;
+         (if opt then Doc.text "?" else Doc.nil);
+         Doc.text ": ";
+         print_out_type_doc arg;
+       ])
+
+and print_record_declaration_doc ~inline rows =
+  let content =
+    Doc.concat
+      [
+        Doc.lbrace;
+        Doc.indent
+          (Doc.concat
+             [
+               Doc.soft_line;
+               Doc.join
+                 ~sep:(Doc.concat [Doc.comma; Doc.line])
+                 (List.map print_record_decl_row_doc rows);
+             ]);
+        Doc.trailing_comma;
+        Doc.soft_line;
+        Doc.rbrace;
+      ]
+  in
+  if not inline then Doc.group content else content
+
+let print_out_type fmt out_type =
+  Format.pp_print_string fmt
+    (Doc.to_string ~width:80 (print_out_type_doc out_type))
+
+let print_type_parameter_doc (typ, (co, cn)) =
+  Doc.concat
+    [
+      (if not cn then Doc.text "+" else if not co then Doc.text "-" else Doc.nil);
+      (if typ = "_" then Doc.text "_" else Doc.text ("'" ^ typ));
+    ]
+
+let rec print_out_sig_item_doc ?(print_name_as_is = false)
+    (out_sig_item : Outcometree.out_sig_item) =
+  match out_sig_item with
+  | Osig_class _ | Osig_class_type _ -> Doc.nil
+  | Osig_ellipsis -> Doc.dotdotdot
+  | Osig_value value_decl ->
+    Doc.group
+      (Doc.concat
+         [
+           print_out_attributes_doc value_decl.oval_attributes;
+           Doc.text
+             (match value_decl.oval_prims with
+             | [] -> "let "
+             | _ -> "external ");
+           Doc.text value_decl.oval_name;
+           Doc.text ":";
+           Doc.space;
+           print_out_type_doc value_decl.oval_type;
+           (match value_decl.oval_prims with
+           | [] -> Doc.nil
+           | primitives ->
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.text " =";
+                    Doc.line;
+                    Doc.group
+                      (Doc.join ~sep:Doc.line
+                         (List.map
+                            (fun prim ->
+                              let prim =
+                                if
+                                  prim <> ""
+                                  && (prim.[0] [@doesNotRaise]) = '\132'
+                                then "#rescript-external"
+                                else prim
+                              in
+                              (* not display those garbage '\132' is a magic number for marshal *)
+                              Doc.text ("\"" ^ prim ^ "\""))
+                            primitives));
+                  ]));
+         ])
+  | Osig_typext (out_extension_constructor, _outExtStatus) ->
+    print_out_extension_constructor_doc out_extension_constructor
+  | Osig_modtype (mod_name, Omty_signature []) ->
+    Doc.concat [Doc.text "module type "; Doc.text mod_name]
+  | Osig_modtype (mod_name, out_module_type) ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.text "module type ";
+           Doc.text mod_name;
+           Doc.text " = ";
+           print_out_module_type_doc out_module_type;
+         ])
+  | Osig_module (mod_name, Omty_alias ident, _) ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.text "module ";
+           Doc.text mod_name;
+           Doc.text " =";
+           Doc.line;
+           print_out_ident_doc ident;
+         ])
+  | Osig_module (mod_name, out_mod_type, out_rec_status) ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.text
+             (match out_rec_status with
+             | Orec_not -> "module "
+             | Orec_first -> "module rec "
+             | Orec_next -> "and ");
+           Doc.text mod_name;
+           Doc.text ": ";
+           print_out_module_type_doc out_mod_type;
+         ])
+  | Osig_type (out_type_decl, out_rec_status) ->
+    (* TODO: manifest ? *)
+    let attrs =
+      match (out_type_decl.otype_immediate, out_type_decl.otype_unboxed) with
+      | false, false -> Doc.nil
+      | true, false -> Doc.concat [Doc.text "@immediate"; Doc.line]
+      | false, true -> Doc.concat [Doc.text "@unboxed"; Doc.line]
+      | true, true -> Doc.concat [Doc.text "@immediate @unboxed"; Doc.line]
+    in
+    let kw =
+      Doc.text
+        (match out_rec_status with
+        | Orec_not -> "type "
+        | Orec_first -> "type rec "
+        | Orec_next -> "and ")
+    in
+    let type_params =
+      match out_type_decl.otype_params with
+      | [] -> Doc.nil
+      | _params ->
+        Doc.group
+          (Doc.concat
+             [
+               Doc.less_than;
+               Doc.indent
+                 (Doc.concat
+                    [
+                      Doc.soft_line;
+                      Doc.join
+                        ~sep:(Doc.concat [Doc.comma; Doc.line])
+                        (List.map print_type_parameter_doc
+                           out_type_decl.otype_params);
+                    ]);
+               Doc.trailing_comma;
+               Doc.soft_line;
+               Doc.greater_than;
+             ])
+    in
+    let private_doc =
+      match out_type_decl.otype_private with
+      | Asttypes.Private -> Doc.text "private "
+      | Public -> Doc.nil
+    in
+    let kind =
+      match out_type_decl.otype_type with
+      | Otyp_open -> Doc.concat [Doc.text " = "; private_doc; Doc.text ".."]
+      | Otyp_abstract -> Doc.nil
+      | Otyp_record record ->
+        Doc.concat
+          [
+            Doc.text " = ";
+            private_doc;
+            print_record_declaration_doc ~inline:false record;
+          ]
+      | typ -> Doc.concat [Doc.text " = "; print_out_type_doc typ]
+    in
+    let constraints =
+      match out_type_decl.otype_cstrs with
+      | [] -> Doc.nil
+      | _ ->
+        Doc.group
+          (Doc.indent
+             (Doc.concat
+                [
+                  Doc.hard_line;
+                  Doc.join ~sep:Doc.line
+                    (List.map
+                       (fun (typ1, typ2) ->
+                         Doc.group
+                           (Doc.concat
+                              [
+                                Doc.text "constraint ";
+                                print_out_type_doc typ1;
+                                Doc.text " =";
+                                Doc.space;
+                                print_out_type_doc typ2;
+                              ]))
+                       out_type_decl.otype_cstrs);
+                ]))
+    in
+    Doc.group
+      (Doc.concat
+         [
+           attrs;
+           Doc.group
+             (Doc.concat
+                [
+                  kw;
+                  (if print_name_as_is then Doc.text out_type_decl.otype_name
+                   else
+                     Printer.print_ident_like ~allow_uident:false
+                       out_type_decl.otype_name);
+                  type_params;
+                  kind;
+                ]);
+           constraints;
+         ])
+
+and print_out_module_type_doc (out_mod_type : Outcometree.out_module_type) =
+  match out_mod_type with
+  | Omty_abstract -> Doc.nil
+  | Omty_ident ident -> print_out_ident_doc ident
+  (* example: module Increment = (M: X_int) => X_int *)
+  | Omty_functor _ ->
+    let args, return_mod_type = collect_functor_args out_mod_type [] in
+    let args_doc =
+      match args with
+      | [(_, None)] -> Doc.text "()"
+      | args ->
+        Doc.group
+          (Doc.concat
+             [
+               Doc.lparen;
+               Doc.indent
+                 (Doc.concat
+                    [
+                      Doc.soft_line;
+                      Doc.join
+                        ~sep:(Doc.concat [Doc.comma; Doc.line])
+                        (List.map
+                           (fun (lbl, opt_mod_type) ->
+                             Doc.group
+                               (Doc.concat
+                                  [
+                                    Doc.text lbl;
+                                    (match opt_mod_type with
+                                    | None -> Doc.nil
+                                    | Some mod_type ->
+                                      Doc.concat
+                                        [
+                                          Doc.text ": ";
+                                          print_out_module_type_doc mod_type;
+                                        ]);
+                                  ]))
+                           args);
+                    ]);
+               Doc.trailing_comma;
+               Doc.soft_line;
+               Doc.rparen;
+             ])
+    in
+    Doc.group
+      (Doc.concat
+         [args_doc; Doc.text " => "; print_out_module_type_doc return_mod_type])
+  | Omty_signature [] -> Doc.nil
+  | Omty_signature signature ->
+    Doc.breakable_group ~force_break:true
+      (Doc.concat
+         [
+           Doc.lbrace;
+           Doc.indent (Doc.concat [Doc.line; print_out_signature_doc signature]);
+           Doc.soft_line;
+           Doc.rbrace;
+         ])
+  | Omty_alias _ident -> Doc.nil
+
+and print_out_signature_doc (signature : Outcometree.out_sig_item list) =
+  let rec loop signature acc =
+    match signature with
+    | [] -> List.rev acc
+    | Outcometree.Osig_typext (ext, Oext_first) :: items ->
+      (* Gather together the extension constructors *)
+      let rec gather_extensions acc items =
+        match items with
+        | Outcometree.Osig_typext (ext, Oext_next) :: items ->
+          gather_extensions
+            ((ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)
+            :: acc)
+            items
+        | _ -> (List.rev acc, items)
+      in
+      let exts, items =
+        gather_extensions
+          [(ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)]
+          items
+      in
+      let te =
+        {
+          Outcometree.otyext_name = ext.oext_type_name;
+          otyext_params = ext.oext_type_params;
+          otyext_constructors = exts;
+          otyext_private = ext.oext_private;
+        }
+      in
+      let doc = print_out_type_extension_doc te in
+      loop items (doc :: acc)
+    | item :: items ->
+      let doc = print_out_sig_item_doc ~print_name_as_is:false item in
+      loop items (doc :: acc)
+  in
+  match loop signature [] with
+  | [doc] -> doc
+  | docs -> Doc.breakable_group ~force_break:true (Doc.join ~sep:Doc.line docs)
+
+and print_out_extension_constructor_doc
+    (out_ext : Outcometree.out_extension_constructor) =
+  let type_params =
+    match out_ext.oext_type_params with
+    | [] -> Doc.nil
+    | params ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.less_than;
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    Doc.join
+                      ~sep:(Doc.concat [Doc.comma; Doc.line])
+                      (List.map
+                         (fun ty ->
+                           Doc.text (if ty = "_" then ty else "'" ^ ty))
+                         params);
+                  ]);
+             Doc.soft_line;
+             Doc.greater_than;
+           ])
+  in
+
+  Doc.group
+    (Doc.concat
+       [
+         Doc.text "type ";
+         Printer.print_ident_like ~allow_uident:false out_ext.oext_type_name;
+         type_params;
+         Doc.text " += ";
+         Doc.line;
+         (if out_ext.oext_private = Asttypes.Private then Doc.text "private "
+          else Doc.nil);
+         print_out_constructor_doc
+           ( out_ext.oext_name,
+             out_ext.oext_args,
+             out_ext.oext_ret_type,
+             out_ext.oext_repr );
+       ])
+
+and print_out_type_extension_doc
+    (type_extension : Outcometree.out_type_extension) =
+  let type_params =
+    match type_extension.otyext_params with
+    | [] -> Doc.nil
+    | params ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.less_than;
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    Doc.join
+                      ~sep:(Doc.concat [Doc.comma; Doc.line])
+                      (List.map
+                         (fun ty ->
+                           Doc.text (if ty = "_" then ty else "'" ^ ty))
+                         params);
+                  ]);
+             Doc.soft_line;
+             Doc.greater_than;
+           ])
+  in
+
+  Doc.group
+    (Doc.concat
+       [
+         Doc.text "type ";
+         Printer.print_ident_like ~allow_uident:false type_extension.otyext_name;
+         type_params;
+         Doc.text " += ";
+         (if type_extension.otyext_private = Asttypes.Private then
+            Doc.text "private "
+          else Doc.nil);
+         print_out_constructors_doc type_extension.otyext_constructors;
+       ])
+
+let print_out_sig_item fmt out_sig_item =
+  Format.pp_print_string fmt
+    (Doc.to_string ~width:80 (print_out_sig_item_doc out_sig_item))
+
+let print_out_signature fmt signature =
+  Format.pp_print_string fmt
+    (Doc.to_string ~width:80 (print_out_signature_doc signature))
+
+let valid_float_lexeme s =
+  let l = String.length s in
+  let rec loop i =
+    if i >= l then s ^ "."
+    else
+      match s.[i] [@doesNotRaise] with
+      | '0' .. '9' | '-' -> loop (i + 1)
+      | _ -> s
+  in
+  loop 0
+
+let float_repres f =
+  match classify_float f with
+  | FP_nan -> "nan"
+  | FP_infinite -> if f < 0.0 then "neg_infinity" else "infinity"
+  | _ ->
+    let float_val =
+      let s1 = Printf.sprintf "%.12g" f in
+      if f = (float_of_string [@doesNotRaise]) s1 then s1
+      else
+        let s2 = Printf.sprintf "%.15g" f in
+        if f = (float_of_string [@doesNotRaise]) s2 then s2
+        else Printf.sprintf "%.18g" f
+    in
+    valid_float_lexeme float_val
+
+let rec print_out_value_doc (out_value : Outcometree.out_value) =
+  match out_value with
+  | Oval_array out_values ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.lbracket;
+           Doc.indent
+             (Doc.concat
+                [
+                  Doc.soft_line;
+                  Doc.join
+                    ~sep:(Doc.concat [Doc.comma; Doc.line])
+                    (List.map print_out_value_doc out_values);
+                ]);
+           Doc.trailing_comma;
+           Doc.soft_line;
+           Doc.rbracket;
+         ])
+  | Oval_char c -> Doc.text ("'" ^ Char.escaped c ^ "'")
+  | Oval_constr (out_ident, out_values) ->
+    Doc.group
+      (Doc.concat
+         [
+           print_out_ident_doc out_ident;
+           Doc.lparen;
+           Doc.indent
+             (Doc.concat
+                [
+                  Doc.soft_line;
+                  Doc.join
+                    ~sep:(Doc.concat [Doc.comma; Doc.line])
+                    (List.map print_out_value_doc out_values);
+                ]);
+           Doc.trailing_comma;
+           Doc.soft_line;
+           Doc.rparen;
+         ])
+  | Oval_ellipsis -> Doc.text "..."
+  | Oval_int i -> Doc.text (Format.sprintf "%i" i)
+  | Oval_int32 i -> Doc.text (Format.sprintf "%lil" i)
+  | Oval_int64 i -> Doc.text (Format.sprintf "%LiL" i)
+  | Oval_nativeint i -> Doc.text (Format.sprintf "%nin" i)
+  | Oval_float f -> Doc.text (float_repres f)
+  | Oval_list out_values ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.text "list[";
+           Doc.indent
+             (Doc.concat
+                [
+                  Doc.soft_line;
+                  Doc.join
+                    ~sep:(Doc.concat [Doc.comma; Doc.line])
+                    (List.map print_out_value_doc out_values);
+                ]);
+           Doc.trailing_comma;
+           Doc.soft_line;
+           Doc.rbracket;
+         ])
+  | Oval_printer fn ->
+    let fmt = Format.str_formatter in
+    fn fmt;
+    let str = Format.flush_str_formatter () in
+    Doc.text str
+  | Oval_record rows ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.lparen;
+           Doc.indent
+             (Doc.concat
+                [
+                  Doc.soft_line;
+                  Doc.join
+                    ~sep:(Doc.concat [Doc.comma; Doc.line])
+                    (List.map
+                       (fun (out_ident, out_value) ->
+                         Doc.group
+                           (Doc.concat
+                              [
+                                print_out_ident_doc out_ident;
+                                Doc.text ": ";
+                                print_out_value_doc out_value;
+                              ]))
+                       rows);
+                ]);
+           Doc.trailing_comma;
+           Doc.soft_line;
+           Doc.rparen;
+         ])
+  | Oval_string (txt, _sizeToPrint, _kind) ->
+    Doc.text (escape_string_contents txt)
+  | Oval_stuff txt -> Doc.text txt
+  | Oval_tuple out_values ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.lparen;
+           Doc.indent
+             (Doc.concat
+                [
+                  Doc.soft_line;
+                  Doc.join
+                    ~sep:(Doc.concat [Doc.comma; Doc.line])
+                    (List.map print_out_value_doc out_values);
+                ]);
+           Doc.trailing_comma;
+           Doc.soft_line;
+           Doc.rparen;
+         ])
+  (* Not supported by ReScript *)
+  | Oval_variant _ -> Doc.nil
+
+let print_out_exception_doc exc out_value =
+  match exc with
+  | Sys.Break -> Doc.text "Interrupted."
+  | Out_of_memory -> Doc.text "Out of memory during evaluation."
+  | Stack_overflow ->
+    Doc.text "Stack overflow during evaluation (looping recursion?)."
+  | _ ->
+    Doc.group
+      (Doc.indent
+         (Doc.concat
+            [Doc.text "Exception:"; Doc.line; print_out_value_doc out_value]))
+
+let print_out_phrase_signature signature =
+  let rec loop signature acc =
+    match signature with
+    | [] -> List.rev acc
+    | (Outcometree.Osig_typext (ext, Oext_first), None) :: signature ->
+      (* Gather together extension constructors *)
+      let rec gather_extensions acc items =
+        match items with
+        | (Outcometree.Osig_typext (ext, Oext_next), None) :: items ->
+          gather_extensions
+            ((ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)
+            :: acc)
+            items
+        | _ -> (List.rev acc, items)
+      in
+      let exts, signature =
+        gather_extensions
+          [(ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)]
+          signature
+      in
+      let te =
+        {
+          Outcometree.otyext_name = ext.oext_type_name;
+          otyext_params = ext.oext_type_params;
+          otyext_constructors = exts;
+          otyext_private = ext.oext_private;
+        }
+      in
+      let doc = print_out_type_extension_doc te in
+      loop signature (doc :: acc)
+    | (sig_item, opt_out_value) :: signature ->
+      let doc =
+        match opt_out_value with
+        | None -> print_out_sig_item_doc sig_item
+        | Some out_value ->
+          Doc.group
+            (Doc.concat
+               [
+                 print_out_sig_item_doc sig_item;
+                 Doc.text " = ";
+                 print_out_value_doc out_value;
+               ])
+      in
+      loop signature (doc :: acc)
+  in
+  Doc.breakable_group ~force_break:true
+    (Doc.join ~sep:Doc.line (loop signature []))
+
+let print_out_phrase_doc (out_phrase : Outcometree.out_phrase) =
+  match out_phrase with
+  | Ophr_eval (out_value, out_type) ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.text "- : ";
+           print_out_type_doc out_type;
+           Doc.text " =";
+           Doc.indent (Doc.concat [Doc.line; print_out_value_doc out_value]);
+         ])
+  | Ophr_signature [] -> Doc.nil
+  | Ophr_signature signature -> print_out_phrase_signature signature
+  | Ophr_exception (exc, out_value) -> print_out_exception_doc exc out_value
+
+let print_out_phrase fmt out_phrase =
+  Format.pp_print_string fmt
+    (Doc.to_string ~width:80 (print_out_phrase_doc out_phrase))
+
+let print_out_module_type fmt out_module_type =
+  Format.pp_print_string fmt
+    (Doc.to_string ~width:80 (print_out_module_type_doc out_module_type))
+
+let print_out_type_extension fmt type_extension =
+  Format.pp_print_string fmt
+    (Doc.to_string ~width:80 (print_out_type_extension_doc type_extension))
+
+let print_out_value fmt out_value =
+  Format.pp_print_string fmt
+    (Doc.to_string ~width:80 (print_out_value_doc out_value))
+
+(* Not supported in ReScript *)
+(* Oprint.out_class_type *)
+let setup =
+  lazy
+    (Oprint.out_value := print_out_value;
+     Oprint.out_type := print_out_type;
+     Oprint.out_module_type := print_out_module_type;
+     Oprint.out_sig_item := print_out_sig_item;
+     Oprint.out_signature := print_out_signature;
+     Oprint.out_type_extension := print_out_type_extension;
+     Oprint.out_phrase := print_out_phrase)
diff --git a/jscomp/syntax/src/res_outcome_printer.mli b/compiler/syntax/src/res_outcome_printer.mli
similarity index 76%
rename from jscomp/syntax/src/res_outcome_printer.mli
rename to compiler/syntax/src/res_outcome_printer.mli
index c51bb09..609644e 100644
--- a/jscomp/syntax/src/res_outcome_printer.mli
+++ b/compiler/syntax/src/res_outcome_printer.mli
@@ -12,7 +12,7 @@ val parenthesized_ident : string -> bool [@@live]
 val setup : unit lazy_t [@@live]
 
 (* Needed for e.g. the playground to print typedtree data *)
-val printOutTypeDoc : Outcometree.out_type -> Res_doc.t [@@live]
-val printOutSigItemDoc :
-  ?printNameAsIs:bool -> Outcometree.out_sig_item -> Res_doc.t
+val print_out_type_doc : Outcometree.out_type -> Res_doc.t [@@live]
+val print_out_sig_item_doc :
+  ?print_name_as_is:bool -> Outcometree.out_sig_item -> Res_doc.t
 [@@live]
diff --git a/compiler/syntax/src/res_parens.ml b/compiler/syntax/src/res_parens.ml
new file mode 100644
index 0000000..8d8aeef
--- /dev/null
+++ b/compiler/syntax/src/res_parens.ml
@@ -0,0 +1,463 @@
+module ParsetreeViewer = Res_parsetree_viewer
+type kind = Parenthesized | Braced of Location.t | Nothing
+
+let expr expr =
+  let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+  match opt_braces with
+  | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+  | _ -> (
+    match expr with
+    | {
+     Parsetree.pexp_desc =
+       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+    } ->
+      Nothing
+    | {pexp_desc = Pexp_constraint _} -> Parenthesized
+    | _ -> Nothing)
+
+let expr_record_row_rhs ~optional e =
+  let kind = expr e in
+  match kind with
+  | Nothing when optional -> (
+    match e.pexp_desc with
+    | Pexp_ifthenelse _ | Pexp_fun _ -> Parenthesized
+    | _ when ParsetreeViewer.is_binary_expression e -> Parenthesized
+    | _ -> kind)
+  | _ -> kind
+
+let call_expr expr =
+  let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+  match opt_braces with
+  | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+  | _ -> (
+    match expr with
+    | {Parsetree.pexp_attributes = attrs}
+      when match ParsetreeViewer.filter_parsing_attrs attrs with
+           | _ :: _ -> true
+           | [] -> false ->
+      Parenthesized
+    | _
+      when ParsetreeViewer.is_unary_expression expr
+           || ParsetreeViewer.is_binary_expression expr ->
+      Parenthesized
+    | {
+     Parsetree.pexp_desc =
+       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+    } ->
+      Nothing
+    | {pexp_desc = Pexp_fun _}
+      when ParsetreeViewer.is_underscore_apply_sugar expr ->
+      Nothing
+    | {
+     pexp_desc =
+       ( Pexp_assert _ | Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _
+       | Pexp_setfield _ | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _
+       | Pexp_ifthenelse _ );
+    } ->
+      Parenthesized
+    | _ when Ast_uncurried.expr_is_uncurried_fun expr -> Parenthesized
+    | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
+    | _ -> Nothing)
+
+let structure_expr expr =
+  let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+  match opt_braces with
+  | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+  | None -> (
+    match expr with
+    | {pexp_desc = Pexp_jsx_element _} -> Nothing
+    | _ when ParsetreeViewer.has_attributes expr.pexp_attributes ->
+      Parenthesized
+    | {
+     Parsetree.pexp_desc =
+       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+    } ->
+      Nothing
+    | {pexp_desc = Pexp_constraint _} -> Parenthesized
+    | _ -> Nothing)
+
+let unary_expr_operand expr =
+  let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+  match opt_braces with
+  | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+  | None -> (
+    match expr with
+    | {Parsetree.pexp_attributes = attrs}
+      when match ParsetreeViewer.filter_parsing_attrs attrs with
+           | _ :: _ -> true
+           | [] -> false ->
+      Parenthesized
+    | expr
+      when ParsetreeViewer.is_unary_expression expr
+           || ParsetreeViewer.is_binary_expression expr ->
+      Parenthesized
+    | {
+     pexp_desc =
+       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+    } ->
+      Nothing
+    | {pexp_desc = Pexp_fun _}
+      when ParsetreeViewer.is_underscore_apply_sugar expr ->
+      Nothing
+    | {
+     pexp_desc =
+       ( Pexp_assert _ | Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _
+       | Pexp_setfield _ | Pexp_extension _ (* readability? maybe remove *)
+       | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _
+       | Pexp_ifthenelse _ );
+    } ->
+      Parenthesized
+    | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
+    | _ -> Nothing)
+
+let binary_expr_operand ~is_lhs expr =
+  let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+  match opt_braces with
+  | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+  | None -> (
+    match expr with
+    | {
+     Parsetree.pexp_desc =
+       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+    } ->
+      Nothing
+    | {pexp_desc = Pexp_fun _}
+      when ParsetreeViewer.is_underscore_apply_sugar expr ->
+      Nothing
+    | {pexp_desc = Pexp_constraint _ | Pexp_fun _ | Pexp_newtype _} ->
+      Parenthesized
+    | _ when Ast_uncurried.expr_is_uncurried_fun expr -> Parenthesized
+    | expr when ParsetreeViewer.is_binary_expression expr -> Parenthesized
+    | expr when ParsetreeViewer.is_ternary_expr expr -> Parenthesized
+    | {pexp_desc = Pexp_assert _} when is_lhs -> Parenthesized
+    | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
+    | {Parsetree.pexp_attributes = attrs} ->
+      if ParsetreeViewer.has_printable_attributes attrs then Parenthesized
+      else Nothing)
+
+let sub_binary_expr_operand parent_operator child_operator =
+  let open ParsetreeViewer in
+  let prec_parent = operator_precedence parent_operator in
+  let prec_child = operator_precedence child_operator in
+  prec_parent > prec_child
+  || is_equality_operator parent_operator
+     && is_equality_operator child_operator
+  ||
+  (* a && b || c, add parens to (a && b) for readability, who knows the difference by heart… *)
+  (parent_operator = "||" && child_operator = "&&")
+
+let rhs_binary_expr_operand parent_operator rhs =
+  match rhs.Parsetree.pexp_desc with
+  | Parsetree.Pexp_apply
+      {
+        funct =
+          {
+            pexp_attributes = [];
+            pexp_desc =
+              Pexp_ident {txt = Longident.Lident operator; loc = operator_loc};
+          };
+        args = [(_, _left); (_, _right)];
+      }
+    when ParsetreeViewer.not_ghost_operator operator operator_loc ->
+    let prec_parent = ParsetreeViewer.operator_precedence parent_operator in
+    let prec_child = ParsetreeViewer.operator_precedence operator in
+    prec_parent == prec_child
+  | _ -> false
+
+let flatten_operand_rhs parent_operator rhs =
+  match rhs.Parsetree.pexp_desc with
+  | Parsetree.Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc =
+              Pexp_ident {txt = Longident.Lident operator; loc = operator_loc};
+          };
+        args = [(_, _left); (_, _right)];
+      }
+    when ParsetreeViewer.not_ghost_operator operator operator_loc ->
+    let prec_parent = ParsetreeViewer.operator_precedence parent_operator in
+    let prec_child = ParsetreeViewer.operator_precedence operator in
+    prec_parent >= prec_child || rhs.pexp_attributes <> []
+  | Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _}) ->
+    false
+  | Pexp_fun {lhs = {ppat_desc = Ppat_var {txt = "__x"}}} -> false
+  | Pexp_fun _ | Pexp_newtype _ | Pexp_setfield _ | Pexp_constraint _ -> true
+  | _ when ParsetreeViewer.is_ternary_expr rhs -> true
+  | _ -> false
+
+let binary_operator_inside_await_needs_parens operator =
+  ParsetreeViewer.operator_precedence operator
+  < ParsetreeViewer.operator_precedence "->"
+
+let assert_or_await_expr_rhs ?(in_await = false) expr =
+  let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+  match opt_braces with
+  | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+  | None -> (
+    match expr with
+    | {Parsetree.pexp_attributes = attrs}
+      when match ParsetreeViewer.filter_parsing_attrs attrs with
+           | _ :: _ -> true
+           | [] -> false ->
+      Parenthesized
+    | {
+     pexp_desc =
+       Pexp_apply
+         {funct = {pexp_desc = Pexp_ident {txt = Longident.Lident operator}}};
+    }
+      when ParsetreeViewer.is_binary_expression expr ->
+      if in_await && not (binary_operator_inside_await_needs_parens operator)
+      then Nothing
+      else Parenthesized
+    | {
+     pexp_desc =
+       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+    } ->
+      Nothing
+    | {pexp_desc = Pexp_fun _}
+      when ParsetreeViewer.is_underscore_apply_sugar expr ->
+      Nothing
+    | {
+     pexp_desc =
+       ( Pexp_assert _ | Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _
+       | Pexp_setfield _ | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _
+       | Pexp_ifthenelse _ );
+    } ->
+      Parenthesized
+    | _ when (not in_await) && ParsetreeViewer.expr_is_await expr ->
+      Parenthesized
+    | _ -> Nothing)
+
+let is_negative_constant constant =
+  let is_neg txt =
+    let len = String.length txt in
+    len > 0 && (String.get [@doesNotRaise]) txt 0 = '-'
+  in
+  match constant with
+  | (Parsetree.Pconst_integer (i, _) | Pconst_float (i, _)) when is_neg i ->
+    true
+  | _ -> false
+
+let field_expr expr =
+  let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+  match opt_braces with
+  | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+  | None -> (
+    match expr with
+    | {Parsetree.pexp_attributes = attrs}
+      when match ParsetreeViewer.filter_parsing_attrs attrs with
+           | _ :: _ -> true
+           | [] -> false ->
+      Parenthesized
+    | expr
+      when ParsetreeViewer.is_binary_expression expr
+           || ParsetreeViewer.is_unary_expression expr ->
+      Parenthesized
+    | {
+     pexp_desc =
+       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+    } ->
+      Nothing
+    | {pexp_desc = Pexp_constant c} when is_negative_constant c -> Parenthesized
+    | {pexp_desc = Pexp_fun _}
+      when ParsetreeViewer.is_underscore_apply_sugar expr ->
+      Nothing
+    | {
+     pexp_desc =
+       ( Pexp_assert _ | Pexp_extension _ (* %extension.x vs (%extension).x *)
+       | Pexp_fun _ | Pexp_newtype _ | Pexp_constraint _ | Pexp_setfield _
+       | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _
+       | Pexp_ifthenelse _ );
+    } ->
+      Parenthesized
+    | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
+    | _ -> Nothing)
+
+let set_field_expr_rhs expr =
+  let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+  match opt_braces with
+  | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+  | None -> (
+    match expr with
+    | {
+     Parsetree.pexp_desc =
+       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+    } ->
+      Nothing
+    | {pexp_desc = Pexp_constraint _} -> Parenthesized
+    | _ -> Nothing)
+
+let ternary_operand expr =
+  let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+  match opt_braces with
+  | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+  | None -> (
+    match expr with
+    | {
+     Parsetree.pexp_desc =
+       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+    } ->
+      Nothing
+    | {pexp_desc = Pexp_constraint _} -> Parenthesized
+    | _ when Res_parsetree_viewer.is_fun_newtype expr -> (
+      let _, _parameters, return_expr = ParsetreeViewer.fun_expr expr in
+      match return_expr.pexp_desc with
+      | Pexp_constraint _ -> Parenthesized
+      | _ -> Nothing)
+    | _ -> Nothing)
+
+let starts_with_minus txt =
+  let len = String.length txt in
+  if len == 0 then false
+  else
+    let s = (String.get [@doesNotRaise]) txt 0 in
+    s = '-'
+
+let jsx_prop_expr expr =
+  match expr.Parsetree.pexp_desc with
+  | Parsetree.Pexp_let _ | Pexp_sequence _ | Pexp_letexception _
+  | Pexp_letmodule _ | Pexp_open _ ->
+    Nothing
+  | _ -> (
+    let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+    match opt_braces with
+    | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+    | None -> (
+      match expr with
+      | {
+       Parsetree.pexp_desc =
+         Pexp_constant (Pconst_integer (x, _) | Pconst_float (x, _));
+       pexp_attributes = [];
+      }
+        when starts_with_minus x ->
+        Parenthesized
+      | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
+      | {
+       Parsetree.pexp_desc =
+         ( Pexp_ident _ | Pexp_constant _ | Pexp_field _ | Pexp_construct _
+         | Pexp_variant _ | Pexp_array _ | Pexp_pack _ | Pexp_record _
+         | Pexp_extension _ | Pexp_letmodule _ | Pexp_letexception _
+         | Pexp_open _ | Pexp_sequence _ | Pexp_let _ | Pexp_tuple _ );
+       pexp_attributes = [];
+      } ->
+        Nothing
+      | {
+       Parsetree.pexp_desc =
+         Pexp_constraint
+           ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+       pexp_attributes = [];
+      } ->
+        Nothing
+      | _ -> Parenthesized))
+
+let jsx_child_expr expr =
+  match expr.Parsetree.pexp_desc with
+  | Parsetree.Pexp_let _ | Pexp_sequence _ | Pexp_letexception _
+  | Pexp_letmodule _ | Pexp_open _ ->
+    Nothing
+  | _ -> (
+    let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+    match opt_braces with
+    | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+    | _ -> (
+      match expr with
+      | {
+       Parsetree.pexp_desc =
+         Pexp_constant (Pconst_integer (x, _) | Pconst_float (x, _));
+       pexp_attributes = [];
+      }
+        when starts_with_minus x ->
+        Parenthesized
+      | _ when ParsetreeViewer.expr_is_await expr -> Parenthesized
+      | {
+       Parsetree.pexp_desc =
+         ( Pexp_ident _ | Pexp_constant _ | Pexp_field _ | Pexp_construct _
+         | Pexp_variant _ | Pexp_array _ | Pexp_pack _ | Pexp_record _
+         | Pexp_extension _ | Pexp_letmodule _ | Pexp_letexception _
+         | Pexp_open _ | Pexp_sequence _ | Pexp_let _ | Pexp_jsx_element _ );
+       pexp_attributes = [];
+      } ->
+        Nothing
+      | {
+       Parsetree.pexp_desc =
+         Pexp_constraint
+           ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
+       pexp_attributes = [];
+      } ->
+        Nothing
+      | {pexp_desc = Pexp_jsx_element _} -> Nothing
+      | _ -> Parenthesized))
+
+let binary_expr expr =
+  let opt_braces, _ = ParsetreeViewer.process_braces_attr expr in
+  match opt_braces with
+  | Some ({Location.loc = braces_loc}, _) -> Braced braces_loc
+  | None -> (
+    match expr with
+    | {Parsetree.pexp_attributes = _ :: _} as expr
+      when ParsetreeViewer.is_binary_expression expr ->
+      Parenthesized
+    | _ -> Nothing)
+
+let mod_type_functor_return mod_type =
+  match mod_type with
+  | {Parsetree.pmty_desc = Pmty_with _} -> true
+  | _ -> false
+
+(* Add parens for readability:
+     module type Functor = SetLike => Set with type t = A.t
+   This is actually:
+     module type Functor = (SetLike => Set) with type t = A.t
+*)
+let mod_type_with_operand mod_type =
+  match mod_type with
+  | {Parsetree.pmty_desc = Pmty_functor _ | Pmty_with _} -> true
+  | _ -> false
+
+let mod_expr_functor_constraint mod_type =
+  match mod_type with
+  | {Parsetree.pmty_desc = Pmty_functor _ | Pmty_with _} -> true
+  | _ -> false
+
+let braced_expr expr =
+  match expr.Parsetree.pexp_desc with
+  | Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _}) ->
+    false
+  | Pexp_constraint _ -> true
+  | _ -> false
+
+let include_mod_expr mod_expr =
+  match mod_expr.Parsetree.pmod_desc with
+  | Parsetree.Pmod_constraint _ -> true
+  | _ -> false
+
+let mod_expr_parens mod_expr =
+  match mod_expr with
+  | {
+   Parsetree.pmod_desc =
+     Pmod_constraint
+       ( {Parsetree.pmod_desc = Pmod_structure _},
+         {Parsetree.pmty_desc = Pmty_signature [{psig_desc = Psig_module _}]} );
+  } ->
+    false
+  | {
+   Parsetree.pmod_desc =
+     Pmod_constraint
+       (_, {Parsetree.pmty_desc = Pmty_signature [{psig_desc = Psig_module _}]});
+  } ->
+    true
+  | _ -> false
+
+let arrow_return_typ_expr typ_expr =
+  match typ_expr.Parsetree.ptyp_desc with
+  | Ptyp_arrow _ -> true
+  | _ -> false
+
+let pattern_record_row_rhs (pattern : Parsetree.pattern) =
+  match pattern.ppat_desc with
+  | Ppat_constraint ({ppat_desc = Ppat_unpack _}, {ptyp_desc = Ptyp_package _})
+    ->
+    false
+  | Ppat_constraint _ -> true
+  | _ -> false
diff --git a/compiler/syntax/src/res_parens.mli b/compiler/syntax/src/res_parens.mli
new file mode 100644
index 0000000..0264264
--- /dev/null
+++ b/compiler/syntax/src/res_parens.mli
@@ -0,0 +1,41 @@
+type kind = Parenthesized | Braced of Location.t | Nothing
+
+val expr : Parsetree.expression -> kind
+val structure_expr : Parsetree.expression -> kind
+
+val unary_expr_operand : Parsetree.expression -> kind
+
+val binary_expr_operand : is_lhs:bool -> Parsetree.expression -> kind
+val sub_binary_expr_operand : string -> string -> bool
+val rhs_binary_expr_operand : string -> Parsetree.expression -> bool
+val flatten_operand_rhs : string -> Parsetree.expression -> bool
+
+val binary_operator_inside_await_needs_parens : string -> bool
+val assert_or_await_expr_rhs : ?in_await:bool -> Parsetree.expression -> kind
+
+val field_expr : Parsetree.expression -> kind
+
+val set_field_expr_rhs : Parsetree.expression -> kind
+
+val ternary_operand : Parsetree.expression -> kind
+
+val jsx_prop_expr : Parsetree.expression -> kind
+val jsx_child_expr : Parsetree.expression -> kind
+
+val binary_expr : Parsetree.expression -> kind
+val mod_type_functor_return : Parsetree.module_type -> bool
+val mod_type_with_operand : Parsetree.module_type -> bool
+val mod_expr_functor_constraint : Parsetree.module_type -> bool
+
+val braced_expr : Parsetree.expression -> bool
+val call_expr : Parsetree.expression -> kind
+
+val include_mod_expr : Parsetree.module_expr -> bool
+
+val mod_expr_parens : Parsetree.module_expr -> bool
+
+val arrow_return_typ_expr : Parsetree.core_type -> bool
+
+val pattern_record_row_rhs : Parsetree.pattern -> bool
+
+val expr_record_row_rhs : optional:bool -> Parsetree.expression -> kind
diff --git a/compiler/syntax/src/res_parser.ml b/compiler/syntax/src/res_parser.ml
new file mode 100644
index 0000000..9daf79d
--- /dev/null
+++ b/compiler/syntax/src/res_parser.ml
@@ -0,0 +1,200 @@
+module Scanner = Res_scanner
+module Diagnostics = Res_diagnostics
+module Token = Res_token
+module Grammar = Res_grammar
+module Reporting = Res_reporting
+
+module Comment = Res_comment
+
+type mode = ParseForTypeChecker | Default
+
+type region_status = Report | Silent
+
+type t = {
+  mode: mode;
+  mutable scanner: Scanner.t;
+  mutable token: Token.t;
+  mutable start_pos: Lexing.position;
+  mutable end_pos: Lexing.position;
+  mutable prev_end_pos: Lexing.position;
+  mutable breadcrumbs: (Grammar.t * Lexing.position) list;
+  mutable errors: Reporting.parse_error list;
+  mutable diagnostics: Diagnostics.t list;
+  mutable comments: Comment.t list;
+  mutable regions: region_status ref list;
+}
+
+let err ?start_pos ?end_pos p error =
+  match p.regions with
+  | ({contents = Report} as region) :: _ ->
+    let d =
+      Diagnostics.make
+        ~start_pos:
+          (match start_pos with
+          | Some pos -> pos
+          | None -> p.start_pos)
+        ~end_pos:
+          (match end_pos with
+          | Some pos -> pos
+          | None -> p.end_pos)
+        error
+    in
+    p.diagnostics <- d :: p.diagnostics;
+    region := Silent
+  | _ -> ()
+
+let begin_region p = p.regions <- ref Report :: p.regions
+let end_region p =
+  match p.regions with
+  | [] -> ()
+  | _ :: rest -> p.regions <- rest
+
+let doc_comment_to_attribute_token comment =
+  let txt = Comment.txt comment in
+  let loc = Comment.loc comment in
+  Token.DocComment (loc, txt)
+
+let module_comment_to_attribute_token comment =
+  let txt = Comment.txt comment in
+  let loc = Comment.loc comment in
+  Token.ModuleComment (loc, txt)
+
+(* Advance to the next non-comment token and store any encountered comment
+ * in the parser's state. Every comment contains the end position of its
+ * previous token to facilite comment interleaving *)
+let rec next ?prev_end_pos p =
+  if p.token = Eof then assert false;
+  let prev_end_pos =
+    match prev_end_pos with
+    | Some pos -> pos
+    | None -> p.end_pos
+  in
+  let start_pos, end_pos, token = Scanner.scan p.scanner in
+  match token with
+  | Comment c ->
+    if Comment.is_doc_comment c then (
+      p.token <- doc_comment_to_attribute_token c;
+      p.prev_end_pos <- prev_end_pos;
+      p.start_pos <- start_pos;
+      p.end_pos <- end_pos)
+    else if Comment.is_module_comment c then (
+      p.token <- module_comment_to_attribute_token c;
+      p.prev_end_pos <- prev_end_pos;
+      p.start_pos <- start_pos;
+      p.end_pos <- end_pos)
+    else (
+      Comment.set_prev_tok_end_pos c p.end_pos;
+      p.comments <- c :: p.comments;
+      p.prev_end_pos <- p.end_pos;
+      p.end_pos <- end_pos;
+      next ~prev_end_pos p)
+  | _ ->
+    p.token <- token;
+    p.prev_end_pos <- prev_end_pos;
+    p.start_pos <- start_pos;
+    p.end_pos <- end_pos
+
+let next_unsafe p = if p.token <> Eof then next p
+
+let next_template_literal_token p =
+  let start_pos, end_pos, token =
+    Scanner.scan_template_literal_token p.scanner
+  in
+  p.token <- token;
+  p.prev_end_pos <- p.end_pos;
+  p.start_pos <- start_pos;
+  p.end_pos <- end_pos
+
+let next_regex_token p =
+  let start_pos, end_pos, token = Scanner.scan_regex p.scanner in
+  p.token <- token;
+  p.prev_end_pos <- p.end_pos;
+  p.start_pos <- start_pos;
+  p.end_pos <- end_pos
+
+let check_progress ~prev_end_pos ~result p =
+  if p.end_pos == prev_end_pos then None else Some result
+
+let make ?(mode = ParseForTypeChecker) src filename =
+  let scanner = Scanner.make ~filename src in
+  let parser_state =
+    {
+      mode;
+      scanner;
+      token = Token.Semicolon;
+      start_pos = Lexing.dummy_pos;
+      prev_end_pos = Lexing.dummy_pos;
+      end_pos = Lexing.dummy_pos;
+      breadcrumbs = [];
+      errors = [];
+      diagnostics = [];
+      comments = [];
+      regions = [ref Report];
+    }
+  in
+  parser_state.scanner.err <-
+    (fun ~start_pos ~end_pos error ->
+      let diagnostic = Diagnostics.make ~start_pos ~end_pos error in
+      parser_state.diagnostics <- diagnostic :: parser_state.diagnostics);
+  next parser_state;
+  parser_state
+
+let leave_breadcrumb p circumstance =
+  let crumb = (circumstance, p.start_pos) in
+  p.breadcrumbs <- crumb :: p.breadcrumbs
+
+let eat_breadcrumb p =
+  match p.breadcrumbs with
+  | [] -> ()
+  | _ :: crumbs -> p.breadcrumbs <- crumbs
+
+let optional p token =
+  if p.token = token then
+    let () = next p in
+    true
+  else false
+
+let expect ?grammar token p =
+  if p.token = token then next p
+  else
+    let error = Diagnostics.expected ?grammar p.prev_end_pos token in
+    err ~start_pos:p.prev_end_pos p error
+
+(* Don't use immutable copies here, it trashes certain heuristics
+ * in the ocaml compiler, resulting in massive slowdowns of the parser *)
+let lookahead p callback =
+  let err = p.scanner.err in
+  let ch = p.scanner.ch in
+  let offset = p.scanner.offset in
+  let offset16 = p.scanner.offset16 in
+  let line_offset = p.scanner.line_offset in
+  let lnum = p.scanner.lnum in
+  let mode = p.scanner.mode in
+  let token = p.token in
+  let start_pos = p.start_pos in
+  let end_pos = p.end_pos in
+  let prev_end_pos = p.prev_end_pos in
+  let breadcrumbs = p.breadcrumbs in
+  let errors = p.errors in
+  let diagnostics = p.diagnostics in
+  let comments = p.comments in
+
+  let res = callback p in
+
+  p.scanner.err <- err;
+  p.scanner.ch <- ch;
+  p.scanner.offset <- offset;
+  p.scanner.offset16 <- offset16;
+  p.scanner.line_offset <- line_offset;
+  p.scanner.lnum <- lnum;
+  p.scanner.mode <- mode;
+  p.token <- token;
+  p.start_pos <- start_pos;
+  p.end_pos <- end_pos;
+  p.prev_end_pos <- prev_end_pos;
+  p.breadcrumbs <- breadcrumbs;
+  p.errors <- errors;
+  p.diagnostics <- diagnostics;
+  p.comments <- comments;
+
+  res
diff --git a/compiler/syntax/src/res_parser.mli b/compiler/syntax/src/res_parser.mli
new file mode 100644
index 0000000..978cc18
--- /dev/null
+++ b/compiler/syntax/src/res_parser.mli
@@ -0,0 +1,48 @@
+module Scanner = Res_scanner
+module Token = Res_token
+module Grammar = Res_grammar
+module Reporting = Res_reporting
+module Diagnostics = Res_diagnostics
+module Comment = Res_comment
+
+type mode = ParseForTypeChecker | Default
+
+type region_status = Report | Silent
+
+type t = {
+  mode: mode;
+  mutable scanner: Scanner.t;
+  mutable token: Token.t;
+  mutable start_pos: Lexing.position;
+  mutable end_pos: Lexing.position;
+  mutable prev_end_pos: Lexing.position;
+  mutable breadcrumbs: (Grammar.t * Lexing.position) list;
+  mutable errors: Reporting.parse_error list;
+  mutable diagnostics: Diagnostics.t list;
+  mutable comments: Comment.t list;
+  mutable regions: region_status ref list;
+}
+
+val make : ?mode:mode -> string -> string -> t
+
+val expect : ?grammar:Grammar.t -> Token.t -> t -> unit
+val optional : t -> Token.t -> bool
+val next : ?prev_end_pos:Lexing.position -> t -> unit
+val next_unsafe : t -> unit (* Does not assert on Eof, makes no progress *)
+val next_template_literal_token : t -> unit
+val next_regex_token : t -> unit
+val lookahead : t -> (t -> 'a) -> 'a
+val err :
+  ?start_pos:Lexing.position ->
+  ?end_pos:Lexing.position ->
+  t ->
+  Diagnostics.category ->
+  unit
+
+val leave_breadcrumb : t -> Grammar.t -> unit
+val eat_breadcrumb : t -> unit
+
+val begin_region : t -> unit
+val end_region : t -> unit
+
+val check_progress : prev_end_pos:Lexing.position -> result:'a -> t -> 'a option
diff --git a/compiler/syntax/src/res_parsetree_viewer.ml b/compiler/syntax/src/res_parsetree_viewer.ml
new file mode 100644
index 0000000..391e51b
--- /dev/null
+++ b/compiler/syntax/src/res_parsetree_viewer.ml
@@ -0,0 +1,833 @@
+open Parsetree
+
+let arrow_type ?(max_arity = max_int) ct =
+  let has_as_attr attrs =
+    Ext_list.exists attrs (fun (x, _) -> x.Asttypes.txt = "as")
+  in
+  let rec process attrs_before acc typ max_arity =
+    match typ with
+    | _ when max_arity < 0 -> (attrs_before, List.rev acc, typ)
+    | {ptyp_desc = Ptyp_arrow {arity = Some _; arg = {attrs = []}}}
+      when acc <> [] ->
+      (attrs_before, List.rev acc, typ)
+    | {ptyp_desc = Ptyp_arrow {arg = {lbl = Nolabel; attrs = []} as arg; ret}}
+      ->
+      process attrs_before (arg :: acc) ret (max_arity - 1)
+    | {ptyp_desc = Ptyp_arrow {arg = {lbl = Nolabel}}; ptyp_attributes = _attrs}
+      as return_type ->
+      let args = List.rev acc in
+      (attrs_before, args, return_type)
+    | {
+     ptyp_desc = Ptyp_arrow {arg = {lbl = Labelled _ | Optional _} as arg; ret};
+     ptyp_attributes = _attrs;
+    } ->
+      (* Res_core.parse_es6_arrow_type has a workaround that removed an extra arity for the function if the
+         argument is a Ptyp_any with @as attribute i.e. ~x: @as(`{prop: value}`) _.
+
+         When this case is encountered we add that missing arity so the arrow is printed properly.
+      *)
+      let arity =
+        match arg.typ with
+        | {ptyp_desc = Ptyp_any; ptyp_attributes = attrs1}
+          when has_as_attr attrs1 ->
+          max_arity
+        | _ -> max_arity - 1
+      in
+      process attrs_before (arg :: acc) ret arity
+    | typ -> (attrs_before, List.rev acc, typ)
+  in
+  match ct with
+  | {ptyp_desc = Ptyp_arrow _; ptyp_attributes = attrs1} as typ ->
+    process attrs1 [] {typ with ptyp_attributes = []} max_arity
+  | typ -> process [] [] typ max_arity
+
+let functor_type modtype =
+  let rec process acc modtype =
+    match modtype with
+    | {
+     pmty_desc = Pmty_functor (lbl, arg_type, return_type);
+     pmty_attributes = attrs;
+    } ->
+      let arg = (attrs, lbl, arg_type) in
+      process (arg :: acc) return_type
+    | mod_type -> (List.rev acc, mod_type)
+  in
+  process [] modtype
+
+let has_await_attribute attrs =
+  List.exists
+    (function
+      | {Location.txt = "res.await"}, _ -> true
+      | _ -> false)
+    attrs
+
+let expr_is_await e =
+  match e.pexp_desc with
+  | Pexp_await _ -> true
+  | _ -> false
+
+let has_inline_record_definition_attribute attrs =
+  List.exists
+    (function
+      | {Location.txt = "res.inlineRecordDefinition"}, _ -> true
+      | _ -> false)
+    attrs
+
+let has_res_pat_variant_spread_attribute attrs =
+  List.exists
+    (function
+      | {Location.txt = "res.patVariantSpread"}, _ -> true
+      | _ -> false)
+    attrs
+
+let has_dict_pattern_attribute attrs =
+  attrs
+  |> List.find_opt (fun (({txt}, _) : Parsetree.attribute) ->
+         txt = "res.dictPattern")
+  |> Option.is_some
+
+let collect_array_expressions expr =
+  match expr.pexp_desc with
+  | Pexp_array exprs -> (exprs, None)
+  | _ -> ([], Some expr)
+
+let collect_list_expressions expr =
+  let rec collect acc expr =
+    match expr.pexp_desc with
+    | Pexp_construct ({txt = Longident.Lident "[]"}, _) -> (List.rev acc, None)
+    | Pexp_construct
+        ( {txt = Longident.Lident "::"},
+          Some {pexp_desc = Pexp_tuple (hd :: [tail])} ) ->
+      collect (hd :: acc) tail
+    | _ -> (List.rev acc, Some expr)
+  in
+  collect [] expr
+
+(* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
+let rewrite_underscore_apply expr =
+  match expr.pexp_desc with
+  | Pexp_fun
+      {
+        arg_label = Nolabel;
+        default = None;
+        lhs = {ppat_desc = Ppat_var {txt = "__x"}};
+        rhs = {pexp_desc = Pexp_apply {funct = call_expr; args}} as e;
+      } ->
+    let new_args =
+      List.map
+        (fun arg ->
+          match arg with
+          | ( lbl,
+              ({pexp_desc = Pexp_ident ({txt = Longident.Lident "__x"} as lid)}
+               as arg_expr) ) ->
+            ( lbl,
+              {
+                arg_expr with
+                pexp_desc = Pexp_ident {lid with txt = Longident.Lident "_"};
+              } )
+          | arg -> arg)
+        args
+    in
+    {
+      e with
+      pexp_desc =
+        Pexp_apply
+          {
+            funct = call_expr;
+            args = new_args;
+            partial = false;
+            transformed_jsx = false;
+          };
+    }
+  | _ -> expr
+
+(* For pipe RHS: (__x) => f(__x, a, b) -----> f(a, b)
+   Note: Ppat_var "__x" and Pexp_ident "__x" represent `_` placeholders in user code.
+   Omits the first __x argument only if it's the sole occurrence.
+   If multiple __x exist (e.g., f(__x, __x, b)), keeps all to preserve semantics. *)
+let rewrite_underscore_apply_in_pipe expr =
+  let is_underscore_arg = function
+    | _, {pexp_desc = Pexp_ident {txt = Longident.Lident "__x"}} -> true
+    | _ -> false
+  in
+  let convert_underscore_to_placeholder arg =
+    match arg with
+    | ( lbl,
+        ({pexp_desc = Pexp_ident ({txt = Longident.Lident "__x"} as lid)} as
+         arg_expr) ) ->
+      ( lbl,
+        {
+          arg_expr with
+          pexp_desc = Pexp_ident {lid with txt = Longident.Lident "_"};
+        } )
+    | arg -> arg
+  in
+  match expr.pexp_desc with
+  | Pexp_fun
+      {
+        arg_label = Nolabel;
+        default = None;
+        lhs = {ppat_desc = Ppat_var {txt = "__x"}};
+        rhs = {pexp_desc = Pexp_apply {funct; args}} as e;
+      } -> (
+    match args with
+    | first_arg :: rest_args when is_underscore_arg first_arg ->
+      if List.exists is_underscore_arg rest_args then
+        (* Multiple __x - keep all to preserve semantics *)
+        rewrite_underscore_apply expr
+      else
+        (* Single __x in first position - safe to omit *)
+        {
+          e with
+          pexp_desc =
+            Pexp_apply
+              {
+                funct;
+                args = List.map convert_underscore_to_placeholder rest_args;
+                partial = false;
+                transformed_jsx = false;
+              };
+        }
+    | _ -> rewrite_underscore_apply expr)
+  | _ -> expr
+
+type fun_param_kind =
+  | Parameter of {
+      attrs: Parsetree.attributes;
+      lbl: Asttypes.arg_label;
+      default_expr: Parsetree.expression option;
+      pat: Parsetree.pattern;
+    }
+  | NewTypes of {attrs: Parsetree.attributes; locs: string Asttypes.loc list}
+
+let fun_expr expr_ =
+  let async = Ast_async.dig_async_payload_from_function expr_ in
+  let rec collect_params ~n_fun ~params expr =
+    match expr with
+    | {
+     pexp_desc =
+       Pexp_fun
+         {
+           arg_label = lbl;
+           default = default_expr;
+           lhs = pattern;
+           rhs = return_expr;
+           arity;
+         };
+     pexp_attributes = attrs;
+    }
+      when arity = None || n_fun = 0 ->
+      let parameter = Parameter {attrs; lbl; default_expr; pat = pattern} in
+      collect_params ~n_fun:(n_fun + 1) ~params:(parameter :: params)
+        return_expr
+    | _ -> (async, List.rev params, expr)
+  in
+  (* Turns (type t, type u, type z) into "type t u z" *)
+  let rec collect_new_types acc return_expr =
+    match return_expr with
+    | {pexp_desc = Pexp_newtype (string_loc, return_expr)} ->
+      collect_new_types (string_loc :: acc) return_expr
+    | return_expr -> (List.rev acc, return_expr)
+  in
+  match expr_ with
+  | {pexp_desc = Pexp_newtype (string_loc, rest)} ->
+    let string_locs, return_expr = collect_new_types [string_loc] rest in
+    let param = NewTypes {attrs = []; locs = string_locs} in
+    collect_params ~n_fun:0 ~params:[param] return_expr
+  | _ -> collect_params ~n_fun:0 ~params:[] {expr_ with pexp_attributes = []}
+
+let process_braces_attr expr =
+  match expr.pexp_attributes with
+  | (({txt = "res.braces" | "ns.braces"}, _) as attr) :: attrs ->
+    (Some attr, {expr with pexp_attributes = attrs})
+  | _ -> (None, expr)
+
+let filter_parsing_attrs attrs =
+  List.filter
+    (fun attr ->
+      match attr with
+      | ( {
+            Location.txt =
+              ( "res.braces" | "ns.braces" | "res.iflet" | "res.ternary"
+              | "res.await" | "res.template" | "res.taggedTemplate"
+              | "res.patVariantSpread" | "res.dictPattern"
+              | "res.inlineRecordDefinition" );
+          },
+          _ ) ->
+        false
+      | _ -> true)
+    attrs
+
+let is_block_expr expr =
+  match expr.pexp_desc with
+  | Pexp_letmodule _ | Pexp_letexception _ | Pexp_let _ | Pexp_open _
+  | Pexp_sequence _ ->
+    true
+  | _ -> false
+
+let is_braced_expr expr =
+  match process_braces_attr expr with
+  | Some _, _ -> true
+  | _ -> false
+
+let is_multiline_text txt =
+  let len = String.length txt in
+  let rec check i =
+    if i >= len then false
+    else
+      let c = String.unsafe_get txt i in
+      match c with
+      | '\010' | '\013' -> true
+      | '\\' -> if i + 2 = len then false else check (i + 2)
+      | _ -> check (i + 1)
+  in
+  check 0
+
+let is_huggable_expression expr =
+  match expr.pexp_desc with
+  | Pexp_array _ | Pexp_tuple _
+  | Pexp_constant (Pconst_string (_, Some _))
+  | Pexp_construct ({txt = Longident.Lident ("::" | "[]")}, _)
+  | Pexp_extension ({txt = "obj"}, _)
+  | Pexp_record _ ->
+    true
+  | _ when is_block_expr expr -> true
+  | _ when is_braced_expr expr -> true
+  | Pexp_constant (Pconst_string (txt, None)) when is_multiline_text txt -> true
+  | _ -> false
+
+let is_huggable_rhs expr =
+  match expr.pexp_desc with
+  | Pexp_array _ | Pexp_tuple _
+  | Pexp_extension ({txt = "obj"}, _)
+  | Pexp_record _ ->
+    true
+  | _ when is_braced_expr expr -> true
+  | _ -> false
+
+let is_huggable_pattern pattern =
+  match pattern.ppat_desc with
+  | Ppat_array _ | Ppat_tuple _ | Ppat_record _ | Ppat_variant _
+  | Ppat_construct _ ->
+    true
+  | _ -> false
+
+let operator_precedence operator =
+  match operator with
+  | ":=" -> 1
+  | "||" -> 2
+  | "&&" -> 3
+  | "|||" -> 4
+  | "^^^" -> 5
+  | "&&&" -> 6
+  | "==" | "===" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" -> 7
+  | "<<" | ">>" | ">>>" -> 8
+  | "+" | "+." | "-" | "-." | "++" -> 9
+  | "*" | "*." | "/" | "/." | "%" -> 10
+  | "**" -> 11
+  | "#" | "##" | "->" -> 12
+  | _ -> 0
+
+let is_unary_operator operator =
+  match operator with
+  | "~+" | "~+." | "~-" | "~-." | "~~~" | "not" -> true
+  | _ -> false
+
+let is_unary_expression expr =
+  match expr.pexp_desc with
+  | Pexp_apply
+      {
+        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident operator}};
+        args = [(Nolabel, _arg)];
+      }
+    when is_unary_operator operator ->
+    true
+  | _ -> false
+
+let is_binary_operator operator =
+  match operator with
+  | ":=" | "||" | "&&" | "==" | "===" | "<" | ">" | "!=" | "!==" | "<=" | ">="
+  | "+" | "+." | "-" | "-." | "++" | "*" | "*." | "/" | "/." | "**" | "->"
+  | "<>" | "%" | "|||" | "^^^" | "&&&" | "<<" | ">>" | ">>>" ->
+    true
+  | _ -> false
+
+let not_ghost_operator operator (loc : Location.t) =
+  is_binary_operator operator && not (loc.loc_ghost && operator = "++")
+
+let is_binary_expression expr =
+  match expr.pexp_desc with
+  | Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc =
+              Pexp_ident {txt = Longident.Lident operator; loc = operator_loc};
+          };
+        args = [(Nolabel, _operand1); (Nolabel, _operand2)];
+      }
+    when not_ghost_operator operator operator_loc ->
+    true
+  | _ -> false
+
+let is_equality_operator operator =
+  match operator with
+  | "==" | "===" | "!=" | "!==" -> true
+  | _ -> false
+
+let is_rhs_binary_operator operator =
+  match operator with
+  | "**" -> true
+  | _ -> false
+
+let flattenable_operators parent_operator child_operator =
+  let prec_parent = operator_precedence parent_operator in
+  let prec_child = operator_precedence child_operator in
+  if prec_parent == prec_child then
+    not
+      (is_equality_operator parent_operator
+      && is_equality_operator child_operator)
+  else false
+
+let rec has_if_let_attribute attrs =
+  match attrs with
+  | [] -> false
+  | ({Location.txt = "res.iflet"}, _) :: _ -> true
+  | _ :: attrs -> has_if_let_attribute attrs
+
+let is_if_let_expr expr =
+  match expr with
+  | {pexp_attributes = attrs; pexp_desc = Pexp_match _}
+    when has_if_let_attribute attrs ->
+    true
+  | _ -> false
+
+let has_attributes attrs =
+  List.exists
+    (fun attr ->
+      match attr with
+      | ( {
+            Location.txt =
+              ( "res.braces" | "ns.braces" | "res.iflet" | "res.ternary"
+              | "res.await" | "res.template" | "res.inlineRecordDefinition" );
+          },
+          _ ) ->
+        false
+      (* Remove the fragile pattern warning for iflet expressions *)
+      | ( {Location.txt = "warning"},
+          PStr
+            [
+              {
+                pstr_desc =
+                  Pstr_eval
+                    ({pexp_desc = Pexp_constant (Pconst_string ("-4", None))}, _);
+              };
+            ] ) ->
+        not (has_if_let_attribute attrs)
+      | _ -> true)
+    attrs
+
+let is_array_access expr =
+  match expr.pexp_desc with
+  | Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc =
+              Pexp_ident
+                {txt = Longident.Ldot (Longident.Lident "Array", "get")};
+          };
+        args = [(Nolabel, _parentExpr); (Nolabel, _memberExpr)];
+      } ->
+    true
+  | _ -> false
+
+type if_condition_kind =
+  | If of Parsetree.expression
+  | IfLet of Parsetree.pattern * Parsetree.expression
+
+let collect_if_expressions expr =
+  let rec collect acc expr =
+    let expr_loc = expr.pexp_loc in
+    match expr.pexp_desc with
+    | Pexp_ifthenelse (if_expr, then_expr, Some else_expr) ->
+      collect ((expr_loc, If if_expr, then_expr) :: acc) else_expr
+    | Pexp_ifthenelse (if_expr, then_expr, (None as else_expr)) ->
+      let ifs = List.rev ((expr_loc, If if_expr, then_expr) :: acc) in
+      (ifs, else_expr)
+    | Pexp_match
+        ( condition,
+          [
+            {pc_lhs = pattern; pc_guard = None; pc_rhs = then_expr};
+            {
+              pc_rhs =
+                {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)};
+            };
+          ] )
+      when is_if_let_expr expr ->
+      let ifs =
+        List.rev ((expr_loc, IfLet (pattern, condition), then_expr) :: acc)
+      in
+      (ifs, None)
+    | Pexp_match
+        ( condition,
+          [
+            {pc_lhs = pattern; pc_guard = None; pc_rhs = then_expr};
+            {pc_rhs = else_expr};
+          ] )
+      when is_if_let_expr expr ->
+      collect
+        ((expr_loc, IfLet (pattern, condition), then_expr) :: acc)
+        else_expr
+    | _ -> (List.rev acc, Some expr)
+  in
+  collect [] expr
+
+let rec has_ternary_attribute attrs =
+  match attrs with
+  | [] -> false
+  | ({Location.txt = "res.ternary"}, _) :: _ -> true
+  | _ :: attrs -> has_ternary_attribute attrs
+
+let is_ternary_expr expr =
+  match expr with
+  | {pexp_attributes = attrs; pexp_desc = Pexp_ifthenelse _}
+    when has_ternary_attribute attrs ->
+    true
+  | _ -> false
+
+let collect_ternary_parts expr =
+  let rec collect acc expr =
+    match expr with
+    | {
+     pexp_attributes = attrs;
+     pexp_desc = Pexp_ifthenelse (condition, consequent, Some alternate);
+    }
+      when has_ternary_attribute attrs ->
+      collect ((condition, consequent) :: acc) alternate
+    | alternate -> (List.rev acc, alternate)
+  in
+  collect [] expr
+
+let parameters_should_hug parameters =
+  match parameters with
+  | [Parameter {attrs = []; lbl = Nolabel; default_expr = None; pat}]
+    when is_huggable_pattern pat ->
+    true
+  | _ -> false
+
+let filter_ternary_attributes attrs =
+  List.filter
+    (fun attr ->
+      match attr with
+      | {Location.txt = "res.ternary"}, _ -> false
+      | _ -> true)
+    attrs
+
+let filter_fragile_match_attributes attrs =
+  List.filter
+    (fun attr ->
+      match attr with
+      | ( {Location.txt = "warning"},
+          PStr
+            [
+              {
+                pstr_desc =
+                  Pstr_eval
+                    ({pexp_desc = Pexp_constant (Pconst_string ("-4", _))}, _);
+              };
+            ] ) ->
+        false
+      | _ -> true)
+    attrs
+
+let should_indent_binary_expr expr =
+  let same_precedence_sub_expression operator sub_expression =
+    match sub_expression with
+    | {
+     pexp_desc =
+       Pexp_apply
+         {
+           funct = {pexp_desc = Pexp_ident {txt = Longident.Lident sub_operator}};
+           args = [(Nolabel, _lhs); (Nolabel, _rhs)];
+         };
+    }
+      when is_binary_operator sub_operator ->
+      flattenable_operators operator sub_operator
+    | _ -> true
+  in
+  match expr with
+  | {
+   pexp_desc =
+     Pexp_apply
+       {
+         funct = {pexp_desc = Pexp_ident {txt = Longident.Lident operator}};
+         args = [(Nolabel, lhs); (Nolabel, _rhs)];
+       };
+  }
+    when is_binary_operator operator ->
+    is_equality_operator operator
+    || (not (same_precedence_sub_expression operator lhs))
+    || operator = ":="
+  | _ -> false
+
+let should_inline_rhs_binary_expr rhs =
+  match rhs.pexp_desc with
+  | Parsetree.Pexp_constant _ | Pexp_let _ | Pexp_letmodule _
+  | Pexp_letexception _ | Pexp_sequence _ | Pexp_open _ | Pexp_ifthenelse _
+  | Pexp_for _ | Pexp_while _ | Pexp_try _ | Pexp_array _ | Pexp_record _ ->
+    true
+  | _ -> false
+
+let is_printable_attribute attr =
+  match attr with
+  | ( {
+        Location.txt =
+          ( "res.iflet" | "res.braces" | "ns.braces" | "JSX" | "res.await"
+          | "res.template" | "res.taggedTemplate" | "res.ternary"
+          | "res.inlineRecordDefinition" );
+      },
+      _ ) ->
+    false
+  | _ -> true
+
+let has_printable_attributes attrs = List.exists is_printable_attribute attrs
+
+let filter_printable_attributes attrs = List.filter is_printable_attribute attrs
+
+let partition_printable_attributes attrs =
+  List.partition is_printable_attribute attrs
+
+let partition_doc_comment_attributes attrs =
+  List.partition
+    (fun ((id, payload) : Parsetree.attribute) ->
+      match (id, payload) with
+      | ( {txt = "res.doc"},
+          PStr
+            [
+              {
+                pstr_desc =
+                  Pstr_eval
+                    ({pexp_desc = Pexp_constant (Pconst_string (_, _))}, _);
+              };
+            ] ) ->
+        true
+      | _ -> false)
+    attrs
+
+let is_fun_newtype expr =
+  match expr.pexp_desc with
+  | Pexp_fun _ | Pexp_newtype _ -> true
+  | _ -> false
+
+let requires_special_callback_printing_last_arg args =
+  let rec loop args =
+    match args with
+    | [] -> false
+    | [(_, expr)] when is_fun_newtype expr -> true
+    | (_, expr) :: _ when is_fun_newtype expr -> false
+    | _ :: rest -> loop rest
+  in
+  loop args
+
+let requires_special_callback_printing_first_arg args =
+  let rec loop args =
+    match args with
+    | [] -> true
+    | (_, expr) :: _ when is_fun_newtype expr -> false
+    | _ :: rest -> loop rest
+  in
+  match args with
+  | [(_, expr)] when is_fun_newtype expr -> false
+  | (_, expr) :: rest when is_fun_newtype expr -> loop rest
+  | _ -> false
+
+let mod_expr_apply mod_expr =
+  let rec loop acc mod_expr =
+    match mod_expr with
+    | {pmod_desc = Pmod_apply (next, arg)} -> loop (arg :: acc) next
+    | _ -> (acc, mod_expr)
+  in
+  loop [] mod_expr
+
+let mod_expr_functor mod_expr =
+  let rec loop acc mod_expr =
+    match mod_expr with
+    | {
+     pmod_desc = Pmod_functor (lbl, mod_type, return_mod_expr);
+     pmod_attributes = attrs;
+    } ->
+      let param = (attrs, lbl, mod_type) in
+      loop (param :: acc) return_mod_expr
+    | return_mod_expr -> (List.rev acc, return_mod_expr)
+  in
+  loop [] mod_expr
+
+let rec collect_patterns_from_list_construct acc pattern =
+  let open Parsetree in
+  match pattern.ppat_desc with
+  | Ppat_construct
+      ({txt = Longident.Lident "::"}, Some {ppat_desc = Ppat_tuple [pat; rest]})
+    ->
+    collect_patterns_from_list_construct (pat :: acc) rest
+  | _ -> (List.rev acc, pattern)
+
+let has_template_literal_attr attrs =
+  List.exists
+    (fun attr ->
+      match attr with
+      | {Location.txt = "res.template"}, _ -> true
+      | _ -> false)
+    attrs
+
+let has_tagged_template_literal_attr attrs =
+  List.exists
+    (fun attr ->
+      match attr with
+      | {Location.txt = "res.taggedTemplate"}, _ -> true
+      | _ -> false)
+    attrs
+
+let is_template_literal expr =
+  match expr.pexp_desc with
+  | Pexp_apply
+      {
+        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "++"}};
+        args = [(Nolabel, _); (Nolabel, _)];
+      }
+    when has_template_literal_attr expr.pexp_attributes ->
+    true
+  | Pexp_constant (Pconst_string (_, Some "")) -> true
+  | Pexp_constant _ when has_template_literal_attr expr.pexp_attributes -> true
+  | _ -> false
+
+let is_tagged_template_literal expr =
+  match expr with
+  | {pexp_desc = Pexp_apply _; pexp_attributes = attrs} ->
+    has_tagged_template_literal_attr attrs
+  | _ -> false
+
+let has_spread_attr attrs =
+  List.exists
+    (fun attr ->
+      match attr with
+      | {Location.txt = "res.spread"}, _ -> true
+      | _ -> false)
+    attrs
+
+let is_spread_belt_list_concat expr =
+  match expr.pexp_desc with
+  | Pexp_ident
+      {
+        txt =
+          Longident.Ldot
+            (Longident.Ldot (Longident.Lident "Belt", "List"), "concatMany");
+      } ->
+    has_spread_attr expr.pexp_attributes
+  | _ -> false
+
+let is_spread_belt_array_concat expr =
+  match expr.pexp_desc with
+  | Pexp_ident
+      {
+        txt =
+          Longident.Ldot
+            (Longident.Ldot (Longident.Lident "Belt", "Array"), "concatMany");
+      } ->
+    has_spread_attr expr.pexp_attributes
+  | _ -> false
+
+(* Blue | Red | Green -> [Blue; Red; Green] *)
+let collect_or_pattern_chain pat =
+  let rec loop pattern chain =
+    match pattern.ppat_desc with
+    | Ppat_or (left, right) -> loop left (right :: chain)
+    | _ -> pattern :: chain
+  in
+  loop pat []
+
+let is_single_pipe_expr expr =
+  (* handles:
+   *   x
+   *   ->Js.Dict.get("wm-property")
+   *   ->Option.flatMap(Js.Json.decodeString)
+   *   ->Option.flatMap(x =>
+   *     switch x {
+   *     | "like-of" => Some(#like)
+   *     | "repost-of" => Some(#repost)
+   *     | _ => None
+   *     }
+   *   )
+   *)
+  let is_pipe_expr expr =
+    match expr.pexp_desc with
+    | Pexp_apply
+        {
+          funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "->"}};
+          args = [(Nolabel, _operand1); (Nolabel, _operand2)];
+        } ->
+      true
+    | _ -> false
+  in
+  match expr.pexp_desc with
+  | Pexp_apply
+      {
+        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "->"}};
+        args = [(Nolabel, operand1); (Nolabel, _operand2)];
+      }
+    when not (is_pipe_expr operand1) ->
+    true
+  | _ -> false
+
+let is_underscore_apply_sugar expr =
+  match expr.pexp_desc with
+  | Pexp_fun
+      {
+        arg_label = Nolabel;
+        default = None;
+        lhs = {ppat_desc = Ppat_var {txt = "__x"}};
+        rhs = {pexp_desc = Pexp_apply _};
+      } ->
+    true
+  | _ -> false
+
+let is_rewritten_underscore_apply_sugar expr =
+  match expr.pexp_desc with
+  | Pexp_ident {txt = Longident.Lident "_"} -> true
+  | _ -> false
+
+let is_tuple_array (expr : Parsetree.expression) =
+  let is_plain_tuple (expr : Parsetree.expression) =
+    match expr with
+    | {pexp_desc = Pexp_tuple _} -> true
+    | _ -> false
+  in
+  match expr with
+  | {pexp_desc = Pexp_array items} -> List.for_all is_plain_tuple items
+  | _ -> false
+
+let get_jsx_prop_loc = function
+  | Parsetree.JSXPropPunning (_, name) -> name.loc
+  | Parsetree.JSXPropValue (name, _, value) ->
+    {name.loc with loc_end = value.pexp_loc.loc_end}
+  | Parsetree.JSXPropSpreading (loc, _) -> loc
+
+let container_element_closing_tag_loc
+    (tag : Parsetree.jsx_closing_container_tag) =
+  {
+    tag.jsx_closing_container_tag_name.loc with
+    loc_start = tag.jsx_closing_container_tag_start;
+    loc_end = tag.jsx_closing_container_tag_end;
+  }
+
+(** returns the location of the /> token in a unary element *)
+let unary_element_closing_token (expression_loc : Warnings.loc) =
+  {
+    expression_loc with
+    loc_start =
+      {
+        expression_loc.loc_end with
+        pos_cnum = expression_loc.loc_end.pos_cnum - 2;
+        pos_bol = expression_loc.loc_end.pos_bol - 2;
+      };
+  }
diff --git a/compiler/syntax/src/res_parsetree_viewer.mli b/compiler/syntax/src/res_parsetree_viewer.mli
new file mode 100644
index 0000000..5fcfb68
--- /dev/null
+++ b/compiler/syntax/src/res_parsetree_viewer.mli
@@ -0,0 +1,168 @@
+(* Restructures a nested tree of arrow types into its args & returnType
+ * The parsetree contains: a => b => c => d, for printing purposes
+ * we restructure the tree into (a, b, c) and its returnType d *)
+val arrow_type :
+  ?max_arity:int ->
+  Parsetree.core_type ->
+  Parsetree.attributes * Parsetree.arg list * Parsetree.core_type
+
+val functor_type :
+  Parsetree.module_type ->
+  (Parsetree.attributes * string Asttypes.loc * Parsetree.module_type option)
+  list
+  * Parsetree.module_type
+
+val expr_is_await : Parsetree.expression -> bool
+val has_await_attribute : Parsetree.attributes -> bool
+val has_inline_record_definition_attribute : Parsetree.attributes -> bool
+val has_res_pat_variant_spread_attribute : Parsetree.attributes -> bool
+val has_dict_pattern_attribute : Parsetree.attributes -> bool
+
+type if_condition_kind =
+  | If of Parsetree.expression
+  | IfLet of Parsetree.pattern * Parsetree.expression
+
+(* if ... else if ... else ... is represented as nested expressions: if ... else { if ... }
+ * The purpose of this function is to flatten nested ifs into one sequence.
+ * Basically compute: ([if, else if, else if, else if], else) *)
+val collect_if_expressions :
+  Parsetree.expression ->
+  (Location.t * if_condition_kind * Parsetree.expression) list
+  * Parsetree.expression option
+
+val collect_array_expressions :
+  Parsetree.expression ->
+  Parsetree.expression list * Parsetree.expression option
+
+val collect_list_expressions :
+  Parsetree.expression ->
+  Parsetree.expression list * Parsetree.expression option
+
+type fun_param_kind =
+  | Parameter of {
+      attrs: Parsetree.attributes;
+      lbl: Asttypes.arg_label;
+      default_expr: Parsetree.expression option;
+      pat: Parsetree.pattern;
+    }
+  | NewTypes of {attrs: Parsetree.attributes; locs: string Asttypes.loc list}
+
+val fun_expr :
+  Parsetree.expression -> bool * fun_param_kind list * Parsetree.expression
+
+(* example:
+ *  `makeCoordinate({
+ *    x: 1,
+ *    y: 2,
+ *  })`
+ *  Notice howe `({` and `})` "hug" or stick to each other *)
+val is_huggable_expression : Parsetree.expression -> bool
+
+val is_huggable_pattern : Parsetree.pattern -> bool
+
+val is_huggable_rhs : Parsetree.expression -> bool
+
+val operator_precedence : string -> int
+
+val not_ghost_operator : string -> Location.t -> bool
+val is_unary_expression : Parsetree.expression -> bool
+val is_binary_operator : string -> bool
+val is_binary_expression : Parsetree.expression -> bool
+val is_rhs_binary_operator : string -> bool
+val is_equality_operator : string -> bool
+
+val flattenable_operators : string -> string -> bool
+
+val has_attributes : Parsetree.attributes -> bool
+
+val is_array_access : Parsetree.expression -> bool
+val is_ternary_expr : Parsetree.expression -> bool
+val is_if_let_expr : Parsetree.expression -> bool
+
+val collect_ternary_parts :
+  Parsetree.expression ->
+  (Parsetree.expression * Parsetree.expression) list * Parsetree.expression
+
+val parameters_should_hug : fun_param_kind list -> bool
+
+val filter_ternary_attributes : Parsetree.attributes -> Parsetree.attributes
+val filter_fragile_match_attributes :
+  Parsetree.attributes -> Parsetree.attributes
+
+val should_indent_binary_expr : Parsetree.expression -> bool
+val should_inline_rhs_binary_expr : Parsetree.expression -> bool
+val has_printable_attributes : Parsetree.attributes -> bool
+val filter_printable_attributes : Parsetree.attributes -> Parsetree.attributes
+val partition_printable_attributes :
+  Parsetree.attributes -> Parsetree.attributes * Parsetree.attributes
+val partition_doc_comment_attributes :
+  Parsetree.attributes -> Parsetree.attributes * Parsetree.attributes
+
+val requires_special_callback_printing_last_arg :
+  (Asttypes.arg_label * Parsetree.expression) list -> bool
+val requires_special_callback_printing_first_arg :
+  (Asttypes.arg_label * Parsetree.expression) list -> bool
+
+val mod_expr_apply :
+  Parsetree.module_expr -> Parsetree.module_expr list * Parsetree.module_expr
+
+(* Collection of utilities to view the ast in a more a convenient form,
+ * allowing for easier processing.
+ * Example: given a ptyp_arrow type, what are its arguments and what is the
+ * returnType? *)
+
+val mod_expr_functor :
+  Parsetree.module_expr ->
+  (Parsetree.attributes * string Asttypes.loc * Parsetree.module_type option)
+  list
+  * Parsetree.module_expr
+
+val collect_patterns_from_list_construct :
+  Parsetree.pattern list ->
+  Parsetree.pattern ->
+  Parsetree.pattern list * Parsetree.pattern
+
+val is_block_expr : Parsetree.expression -> bool
+
+val is_template_literal : Parsetree.expression -> bool
+val is_tagged_template_literal : Parsetree.expression -> bool
+val has_template_literal_attr : Parsetree.attributes -> bool
+
+val is_spread_belt_list_concat : Parsetree.expression -> bool
+
+val is_spread_belt_array_concat : Parsetree.expression -> bool
+
+val collect_or_pattern_chain : Parsetree.pattern -> Parsetree.pattern list
+
+val process_braces_attr :
+  Parsetree.expression -> Parsetree.attribute option * Parsetree.expression
+
+val filter_parsing_attrs : Parsetree.attributes -> Parsetree.attributes
+
+val is_braced_expr : Parsetree.expression -> bool
+
+val is_single_pipe_expr : Parsetree.expression -> bool
+
+(* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
+val rewrite_underscore_apply : Parsetree.expression -> Parsetree.expression
+
+val rewrite_underscore_apply_in_pipe :
+  Parsetree.expression -> Parsetree.expression
+
+(* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
+val is_underscore_apply_sugar : Parsetree.expression -> bool
+
+val has_if_let_attribute : Parsetree.attributes -> bool
+
+val is_rewritten_underscore_apply_sugar : Parsetree.expression -> bool
+
+val is_fun_newtype : Parsetree.expression -> bool
+
+val is_tuple_array : Parsetree.expression -> bool
+
+val get_jsx_prop_loc : Parsetree.jsx_prop -> Warnings.loc
+
+val container_element_closing_tag_loc :
+  Parsetree.jsx_closing_container_tag -> Warnings.loc
+
+val unary_element_closing_token : Warnings.loc -> Warnings.loc
diff --git a/compiler/syntax/src/res_printer.ml b/compiler/syntax/src/res_printer.ml
new file mode 100644
index 0000000..2010d23
--- /dev/null
+++ b/compiler/syntax/src/res_printer.ml
@@ -0,0 +1,6138 @@
+module Doc = Res_doc
+module CommentTable = Res_comments_table
+module Comment = Res_comment
+module Token = Res_token
+module Parens = Res_parens
+module ParsetreeViewer = Res_parsetree_viewer
+
+let default_print_width = 100
+
+type callback_style =
+  (* regular arrow function, example: `let f = x => x + 1` *)
+  | NoCallback
+  (* `Thing.map(foo, (arg1, arg2) => MyModuleBlah.toList(argument))` *)
+  | FitsOnOneLine
+  (* Thing.map(longArgumet, veryLooooongArgument, (arg1, arg2) =>
+   *   MyModuleBlah.toList(argument)
+   * )
+   *)
+  | ArgumentsFitOnOneLine
+
+let add_parens doc =
+  Doc.group
+    (Doc.concat
+       [
+         Doc.lparen;
+         Doc.indent (Doc.concat [Doc.soft_line; doc]);
+         Doc.soft_line;
+         Doc.rparen;
+       ])
+
+let add_braces doc =
+  Doc.group
+    (Doc.concat
+       [
+         Doc.lbrace;
+         Doc.indent (Doc.concat [Doc.soft_line; doc]);
+         Doc.soft_line;
+         Doc.rbrace;
+       ])
+
+let add_async doc = Doc.concat [Doc.text "async "; doc]
+
+let has_inline_type_definitions type_declarations =
+  type_declarations
+  |> List.find_opt (fun (td : Parsetree.type_declaration) ->
+         Res_parsetree_viewer.has_inline_record_definition_attribute
+           td.ptype_attributes)
+  |> Option.is_some
+
+let get_first_leading_comment tbl loc =
+  match Hashtbl.find tbl.CommentTable.leading loc with
+  | comment :: _ -> Some comment
+  | [] -> None
+  | exception Not_found -> None
+
+(* Checks if `loc` has a leading line comment, i.e. `// comment above`*)
+let has_leading_line_comment tbl loc =
+  match get_first_leading_comment tbl loc with
+  | Some comment -> Comment.is_single_line_comment comment
+  | None -> false
+
+let get_leading_line_comment_count tbl loc =
+  match Hashtbl.find_opt tbl.CommentTable.leading loc with
+  | Some comments ->
+    List.filter Comment.is_single_line_comment comments |> List.length
+  | None -> 0
+
+let has_trailing_single_line_comment tbl loc =
+  match Hashtbl.find_opt tbl.CommentTable.trailing loc with
+  | Some (comment :: _) -> Comment.is_single_line_comment comment
+  | _ -> false
+
+let has_comment_below tbl loc =
+  match Hashtbl.find tbl.CommentTable.trailing loc with
+  | comment :: _ ->
+    let comment_loc = Comment.loc comment in
+    comment_loc.Location.loc_start.pos_lnum > loc.Location.loc_end.pos_lnum
+  | [] -> false
+  | exception Not_found -> false
+
+let has_comments_inside tbl loc =
+  match Hashtbl.find_opt tbl.CommentTable.inside loc with
+  | None -> false
+  | _ -> true
+
+let has_trailing_comments tbl loc =
+  match Hashtbl.find_opt tbl.CommentTable.trailing loc with
+  | None -> false
+  | _ -> true
+
+let has_leading_comments tbl loc =
+  match Hashtbl.find_opt tbl.CommentTable.leading loc with
+  | None -> false
+  | _ -> true
+
+let print_multiline_comment_content txt =
+  (* Turns
+   *         |* first line
+   *  * second line
+   *      * third line *|
+   * Into
+   * |* first line
+   *  * second line
+   *  * third line *|
+   *
+   * What makes a comment suitable for this kind of indentation?
+   *  ->  multiple lines + every line starts with a star
+   *)
+  let rec indent_stars lines acc =
+    match lines with
+    | [] -> Doc.nil
+    | [last_line] ->
+      let line = String.trim last_line in
+      let doc = Doc.text (" " ^ line) in
+      let trailing_space = if line = "" then Doc.nil else Doc.space in
+      List.rev (trailing_space :: doc :: acc) |> Doc.concat
+    | line :: lines ->
+      let line = String.trim line in
+      if line != "" && String.unsafe_get line 0 == '*' then
+        let doc = Doc.text (" " ^ line) in
+        indent_stars lines (Doc.hard_line :: doc :: acc)
+      else
+        let trailing_space =
+          let len = String.length txt in
+          if len > 0 && String.unsafe_get txt (len - 1) = ' ' then Doc.space
+          else Doc.nil
+        in
+        let content = Comment.trim_spaces txt in
+        Doc.concat [Doc.text content; trailing_space]
+  in
+  let lines = String.split_on_char '\n' txt in
+  match lines with
+  | [] -> Doc.text "/* */"
+  | [line] ->
+    Doc.concat
+      [Doc.text "/* "; Doc.text (Comment.trim_spaces line); Doc.text " */"]
+  | first :: rest ->
+    let first_line = Comment.trim_spaces first in
+    Doc.concat
+      [
+        Doc.text "/*";
+        (match first_line with
+        | "" | "*" -> Doc.nil
+        | _ -> Doc.space);
+        indent_stars rest [Doc.hard_line; Doc.text first_line];
+        Doc.text "*/";
+      ]
+
+let print_trailing_comment (prev_loc : Location.t) (node_loc : Location.t)
+    comment =
+  let single_line = Comment.is_single_line_comment comment in
+  let content =
+    let txt = Comment.txt comment in
+    if single_line then Doc.text ("//" ^ txt)
+    else print_multiline_comment_content txt
+  in
+  let diff =
+    let cmt_start = (Comment.loc comment).loc_start in
+    cmt_start.pos_lnum - prev_loc.loc_end.pos_lnum
+  in
+  let is_below =
+    (Comment.loc comment).loc_start.pos_lnum > node_loc.loc_end.pos_lnum
+  in
+  if diff > 0 || is_below then
+    Doc.concat
+      [
+        Doc.break_parent;
+        Doc.line_suffix
+          (Doc.concat
+             [
+               Doc.hard_line;
+               (if diff > 1 then Doc.hard_line else Doc.nil);
+               content;
+             ]);
+      ]
+  else if not single_line then Doc.concat [Doc.space; content]
+  else Doc.line_suffix (Doc.concat [Doc.space; content])
+
+let print_leading_comment ?next_comment comment =
+  let single_line = Comment.is_single_line_comment comment in
+  let content =
+    let txt = Comment.txt comment in
+    if single_line then Doc.text ("//" ^ txt)
+    else print_multiline_comment_content txt
+  in
+  let separator =
+    Doc.concat
+      [
+        (if single_line then Doc.concat [Doc.hard_line; Doc.break_parent]
+         else Doc.nil);
+        (match next_comment with
+        | Some next ->
+          let next_loc = Comment.loc next in
+          let curr_loc = Comment.loc comment in
+          let diff =
+            next_loc.Location.loc_start.pos_lnum
+            - curr_loc.Location.loc_end.pos_lnum
+          in
+          let next_single_line = Comment.is_single_line_comment next in
+          if single_line && next_single_line then
+            if diff > 1 then Doc.hard_line else Doc.nil
+          else if single_line && not next_single_line then
+            if diff > 1 then Doc.hard_line else Doc.nil
+          else if diff > 1 then Doc.concat [Doc.hard_line; Doc.hard_line]
+          else if diff == 1 then Doc.hard_line
+          else Doc.space
+        | None -> Doc.nil);
+      ]
+  in
+  Doc.concat [content; separator]
+
+(* This function is used for printing comments inside an empty block *)
+let print_comments_inside cmt_tbl loc =
+  let print_comment comment =
+    let single_line = Comment.is_single_line_comment comment in
+    let txt = Comment.txt comment in
+    if single_line then Doc.text ("//" ^ txt)
+    else print_multiline_comment_content txt
+  in
+  let force_break =
+    loc.Location.loc_start.pos_lnum <> loc.Location.loc_end.pos_lnum
+  in
+  let rec loop acc comments =
+    match comments with
+    | [] -> Doc.nil
+    | [comment] ->
+      let cmt_doc = print_comment comment in
+      let cmts_doc = Doc.concat (Doc.soft_line :: List.rev (cmt_doc :: acc)) in
+      let doc =
+        Doc.breakable_group ~force_break
+          (Doc.concat
+             [Doc.if_breaks (Doc.indent cmts_doc) cmts_doc; Doc.soft_line])
+      in
+      doc
+    | comment :: rest ->
+      let cmt_doc = Doc.concat [print_comment comment; Doc.line] in
+      loop (cmt_doc :: acc) rest
+  in
+  match Hashtbl.find cmt_tbl.CommentTable.inside loc with
+  | exception Not_found -> Doc.nil
+  | comments ->
+    Hashtbl.remove cmt_tbl.inside loc;
+    loop [] comments
+
+(* This function is used for printing comments inside an empty file *)
+let print_comments_inside_file cmt_tbl =
+  let rec loop acc comments =
+    match comments with
+    | [] -> Doc.nil
+    | [comment] ->
+      let cmt_doc = print_leading_comment comment in
+      let doc =
+        Doc.group (Doc.concat [Doc.concat (List.rev (cmt_doc :: acc))])
+      in
+      doc
+    | comment :: (next_comment :: _comments as rest) ->
+      let cmt_doc = print_leading_comment ~next_comment comment in
+      loop (cmt_doc :: acc) rest
+  in
+  match Hashtbl.find cmt_tbl.CommentTable.inside Location.none with
+  | exception Not_found -> Doc.nil
+  | comments ->
+    Hashtbl.remove cmt_tbl.inside Location.none;
+    Doc.group (loop [] comments)
+
+let print_leading_comments node tbl loc =
+  let rec loop acc comments =
+    match comments with
+    | [] -> node
+    | [comment] ->
+      let cmt_doc = print_leading_comment comment in
+      let diff =
+        loc.Location.loc_start.pos_lnum
+        - (Comment.loc comment).Location.loc_end.pos_lnum
+      in
+      let separator =
+        if Comment.is_single_line_comment comment then
+          if diff > 1 then Doc.hard_line else Doc.nil
+        else if diff == 0 then Doc.space
+        else if diff > 1 then Doc.concat [Doc.hard_line; Doc.hard_line]
+        else Doc.hard_line
+      in
+      let doc =
+        Doc.group
+          (Doc.concat [Doc.concat (List.rev (cmt_doc :: acc)); separator; node])
+      in
+      doc
+    | comment :: (next_comment :: _comments as rest) ->
+      let cmt_doc = print_leading_comment ~next_comment comment in
+      loop (cmt_doc :: acc) rest
+  in
+  match Hashtbl.find tbl loc with
+  | exception Not_found -> node
+  | comments ->
+    (* Remove comments from tbl: Some ast nodes have the same location.
+     * We only want to print comments once *)
+    Hashtbl.remove tbl loc;
+    loop [] comments
+
+let print_trailing_comments node tbl loc =
+  let rec loop prev acc comments =
+    match comments with
+    | [] -> Doc.concat (List.rev acc)
+    | comment :: comments ->
+      let cmt_doc = print_trailing_comment prev loc comment in
+      loop (Comment.loc comment) (cmt_doc :: acc) comments
+  in
+  match Hashtbl.find tbl loc with
+  | exception Not_found -> node
+  | [] -> node
+  | _first :: _ as comments ->
+    (* Remove comments from tbl: Some ast nodes have the same location.
+     * We only want to print comments once *)
+    Hashtbl.remove tbl loc;
+    let cmts_doc = loop loc [] comments in
+    Doc.concat [node; cmts_doc]
+
+let print_comments doc (tbl : CommentTable.t) loc =
+  let doc_with_leading_comments = print_leading_comments doc tbl.leading loc in
+  print_trailing_comments doc_with_leading_comments tbl.trailing loc
+
+let print_list ~get_loc ~nodes ~print ?(force_break = false) t =
+  let rec loop (prev_loc : Location.t) acc nodes =
+    match nodes with
+    | [] -> (prev_loc, Doc.concat (List.rev acc))
+    | node :: nodes ->
+      let loc = get_loc node in
+      let start_pos =
+        match get_first_leading_comment t loc with
+        | None -> loc.loc_start
+        | Some comment -> (Comment.loc comment).loc_start
+      in
+      let sep =
+        if start_pos.pos_lnum - prev_loc.loc_end.pos_lnum > 1 then
+          Doc.concat [Doc.hard_line; Doc.hard_line]
+        else Doc.hard_line
+      in
+      let doc = print_comments (print node t) t loc in
+      loop loc (doc :: sep :: acc) nodes
+  in
+  match nodes with
+  | [] -> Doc.nil
+  | node :: nodes ->
+    let first_loc = get_loc node in
+    let doc = print_comments (print node t) t first_loc in
+    let last_loc, docs = loop first_loc [doc] nodes in
+    let force_break =
+      force_break || first_loc.loc_start.pos_lnum != last_loc.loc_end.pos_lnum
+    in
+    Doc.breakable_group ~force_break docs
+
+let print_listi ~get_loc ~nodes ~print ?(ignore_empty_lines = false)
+    ?(force_break = false) t =
+  let rec loop i (prev_loc : Location.t) acc nodes =
+    match nodes with
+    | [] -> (prev_loc, Doc.concat (List.rev acc))
+    | node :: nodes ->
+      let loc = get_loc node in
+      let start_pos =
+        match get_first_leading_comment t loc with
+        | None -> loc.loc_start
+        | Some comment -> (Comment.loc comment).loc_start
+      in
+      let sep =
+        if
+          start_pos.pos_lnum - prev_loc.loc_end.pos_lnum > 1
+          && not ignore_empty_lines
+        then Doc.concat [Doc.hard_line; Doc.hard_line]
+        else Doc.line
+      in
+      let doc = print_comments (print node t i) t loc in
+      loop (i + 1) loc (doc :: sep :: acc) nodes
+  in
+  match nodes with
+  | [] -> Doc.nil
+  | node :: nodes ->
+    let first_loc = get_loc node in
+    let doc = print_comments (print node t 0) t first_loc in
+    let last_loc, docs = loop 1 first_loc [doc] nodes in
+    let force_break =
+      force_break || first_loc.loc_start.pos_lnum != last_loc.loc_end.pos_lnum
+    in
+    Doc.breakable_group ~force_break docs
+
+let rec print_longident_aux accu = function
+  | Longident.Lident s -> Doc.text s :: accu
+  | Ldot (lid, s) -> print_longident_aux (Doc.text s :: accu) lid
+  | Lapply (lid1, lid2) ->
+    let d1 = Doc.join ~sep:Doc.dot (print_longident_aux [] lid1) in
+    let d2 = Doc.join ~sep:Doc.dot (print_longident_aux [] lid2) in
+    Doc.concat [d1; Doc.lparen; d2; Doc.rparen] :: accu
+
+let print_longident = function
+  | Longident.Lident txt -> Doc.text txt
+  | lid -> Doc.join ~sep:Doc.dot (print_longident_aux [] lid)
+
+type identifier_style = UppercaseExoticIdent | ExoticIdent | NormalIdent
+
+let classify_ident_content ?(allow_uident = false) ?(allow_hyphen = false) txt =
+  if Token.is_keyword_txt txt then ExoticIdent
+  else
+    let len = String.length txt in
+    let rec loop i =
+      if i == len then NormalIdent
+      else if i == 0 then
+        match String.unsafe_get txt i with
+        | '\\' -> UppercaseExoticIdent
+        | 'A' .. 'Z' when allow_uident -> loop (i + 1)
+        | 'a' .. 'z' | '_' -> loop (i + 1)
+        | _ -> ExoticIdent
+      else
+        match String.unsafe_get txt i with
+        | 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '\'' | '_' -> loop (i + 1)
+        | '-' when allow_hyphen -> loop (i + 1)
+        | _ -> ExoticIdent
+    in
+    loop 0
+
+let print_ident_like ?allow_uident ?allow_hyphen txt =
+  match classify_ident_content ?allow_uident ?allow_hyphen txt with
+  | ExoticIdent -> Doc.concat [Doc.text "\\\""; Doc.text txt; Doc.text "\""]
+  | UppercaseExoticIdent | NormalIdent -> Doc.text txt
+
+let rec unsafe_for_all_range s ~start ~finish p =
+  start > finish
+  || p (String.unsafe_get s start)
+     && unsafe_for_all_range s ~start:(start + 1) ~finish p
+
+let for_all_from s start p =
+  let len = String.length s in
+  unsafe_for_all_range s ~start ~finish:(len - 1) p
+
+(* See https://github.com/rescript-lang/rescript-compiler/blob/726cfa534314b586e5b5734471bc2023ad99ebd9/jscomp/ext/ext_string.ml#L510 *)
+let is_valid_numeric_polyvar_number (x : string) =
+  let len = String.length x in
+  len > 0
+  &&
+  let a = Char.code (String.unsafe_get x 0) in
+  a <= 57
+  &&
+  if len > 1 then
+    a > 48
+    && for_all_from x 1 (function
+         | '0' .. '9' -> true
+         | _ -> false)
+  else a >= 48
+
+(* Exotic identifiers in poly-vars have a "lighter" syntax: #"ease-in" *)
+let print_poly_var_ident txt =
+  (* numeric poly-vars don't need quotes: #644 *)
+  if is_valid_numeric_polyvar_number txt then Doc.text txt
+  else
+    match classify_ident_content ~allow_uident:true txt with
+    | UppercaseExoticIdent ->
+      let len = String.length txt in
+      (* UppercaseExoticIdent follows the \"..." format,
+         so removing the leading backslash is enough to transform it into polyvar style *)
+      Doc.text ((String.sub [@doesNotRaise]) txt 1 (len - 1))
+    | ExoticIdent -> Doc.concat [Doc.text "\""; Doc.text txt; Doc.text "\""]
+    | NormalIdent -> (
+      match txt with
+      | "" -> Doc.concat [Doc.text "\""; Doc.text txt; Doc.text "\""]
+      | _ -> Doc.text txt)
+
+let polyvar_ident_to_string poly_var_ident =
+  Doc.concat [Doc.text "#"; print_poly_var_ident poly_var_ident]
+  |> Doc.to_string ~width:80
+
+let find_inline_record_definition inline_record_name
+    (inline_record_definitions : Parsetree.type_declaration list option) =
+  match inline_record_definitions with
+  | None -> None
+  | Some inline_record_definitions ->
+    inline_record_definitions
+    |> List.find_opt (fun (r : Parsetree.type_declaration) ->
+           r.ptype_name.txt = inline_record_name)
+
+let print_lident l =
+  let flat_lid_opt lid =
+    let rec flat accu = function
+      | Longident.Lident s -> Some (s :: accu)
+      | Ldot (lid, s) -> flat (s :: accu) lid
+      | Lapply (_, _) -> None
+    in
+    flat [] lid
+  in
+  match l with
+  | Longident.Lident txt -> print_ident_like txt
+  | Longident.Ldot (path, txt) ->
+    let doc =
+      match flat_lid_opt path with
+      | Some txts ->
+        Doc.concat
+          [
+            Doc.join ~sep:Doc.dot (List.map Doc.text txts);
+            Doc.dot;
+            print_ident_like txt;
+          ]
+      | None -> Doc.text "printLident: Longident.Lapply is not supported"
+    in
+    doc
+  | Lapply (_, _) -> Doc.text "printLident: Longident.Lapply is not supported"
+
+let print_longident_location l cmt_tbl =
+  let doc = print_longident l.Location.txt in
+  print_comments doc cmt_tbl l.loc
+
+(* Module.SubModule.x *)
+let print_lident_path path cmt_tbl =
+  let doc = print_lident path.Location.txt in
+  print_comments doc cmt_tbl path.loc
+
+(* Module.SubModule.x or Module.SubModule.X *)
+let print_ident_path path cmt_tbl =
+  let doc = print_lident path.Location.txt in
+  print_comments doc cmt_tbl path.loc
+
+let print_string_loc sloc cmt_tbl =
+  let doc = print_ident_like sloc.Location.txt in
+  print_comments doc cmt_tbl sloc.loc
+
+let print_string_contents txt =
+  let lines = String.split_on_char '\n' txt in
+  Doc.join ~sep:Doc.literal_line (List.map Doc.text lines)
+
+let print_constant ?(template_literal = false) c =
+  match c with
+  | Parsetree.Pconst_integer (s, suffix) -> (
+    match suffix with
+    | Some c -> Doc.text (s ^ Char.escaped c)
+    | None -> Doc.text s)
+  | Pconst_string (txt, None) ->
+    Doc.concat [Doc.text "\""; print_string_contents txt; Doc.text "\""]
+  | Pconst_string (txt, Some prefix) ->
+    if prefix = "INTERNAL_RES_CHAR_CONTENTS" then
+      Doc.concat [Doc.text "'"; Doc.text txt; Doc.text "'"]
+    else
+      let lquote, rquote =
+        if template_literal then ("`", "`") else ("\"", "\"")
+      in
+      Doc.concat
+        [
+          (if prefix = "js" then Doc.nil else Doc.text prefix);
+          Doc.text lquote;
+          print_string_contents txt;
+          Doc.text rquote;
+        ]
+  | Pconst_float (s, _) -> Doc.text s
+  | Pconst_char c ->
+    let str =
+      match Char.unsafe_chr c with
+      | '\'' -> "\\'"
+      | '\\' -> "\\\\"
+      | '\n' -> "\\n"
+      | '\t' -> "\\t"
+      | '\r' -> "\\r"
+      | '\b' -> "\\b"
+      | ' ' .. '~' as c ->
+        let s = (Bytes.create [@doesNotRaise]) 1 in
+        Bytes.unsafe_set s 0 c;
+        Bytes.unsafe_to_string s
+      | _ -> Res_utf8.encode_code_point c
+    in
+    Doc.text ("'" ^ str ^ "'")
+
+module State = struct
+  let custom_layout_threshold = 2
+
+  type t = {custom_layout: int}
+
+  let init () = {custom_layout = 0}
+
+  let next_custom_layout t = {custom_layout = t.custom_layout + 1}
+
+  let should_break_callback t = t.custom_layout > custom_layout_threshold
+end
+
+let rec print_structure ~state (s : Parsetree.structure) t =
+  match s with
+  | [] -> print_comments_inside_file t
+  | structure ->
+    print_list
+      ~get_loc:(fun s -> s.Parsetree.pstr_loc)
+      ~nodes:structure
+      ~print:(print_structure_item ~state)
+      t
+
+and print_structure_item ~state (si : Parsetree.structure_item) cmt_tbl =
+  match si.pstr_desc with
+  | Pstr_value (rec_flag, value_bindings) ->
+    let rec_flag =
+      match rec_flag with
+      | Asttypes.Nonrecursive -> Doc.nil
+      | Asttypes.Recursive -> Doc.text "rec "
+    in
+    print_value_bindings ~state ~rec_flag value_bindings cmt_tbl
+  | Pstr_type (rec_flag, type_declarations) ->
+    print_type_declarations ~state ~rec_flag type_declarations cmt_tbl
+  | Pstr_primitive value_description ->
+    print_value_description ~state value_description cmt_tbl
+  | Pstr_eval (expr, attrs) ->
+    let expr_doc =
+      let doc = print_expression_with_comments ~state expr cmt_tbl in
+      match Parens.structure_expr expr with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc expr braces
+      | Nothing -> doc
+    in
+    Doc.concat [print_attributes ~state attrs cmt_tbl; expr_doc]
+  | Pstr_attribute attr ->
+    fst (print_attribute ~state ~standalone:true attr cmt_tbl)
+  | Pstr_extension (extension, attrs) ->
+    Doc.concat
+      [
+        print_attributes ~state attrs cmt_tbl;
+        Doc.concat
+          [print_extension ~state ~at_module_lvl:true extension cmt_tbl];
+      ]
+  | Pstr_include include_declaration ->
+    print_include_declaration ~state include_declaration cmt_tbl
+  | Pstr_open open_description ->
+    print_open_description ~state open_description cmt_tbl
+  | Pstr_modtype mod_type_decl ->
+    print_module_type_declaration ~state mod_type_decl cmt_tbl
+  | Pstr_module module_binding ->
+    print_module_binding ~state ~is_rec:false module_binding cmt_tbl 0
+  | Pstr_recmodule module_bindings ->
+    print_listi
+      ~get_loc:(fun mb -> mb.Parsetree.pmb_loc)
+      ~nodes:module_bindings
+      ~print:(print_module_binding ~state ~is_rec:true)
+      cmt_tbl
+  | Pstr_exception extension_constructor ->
+    print_exception_def ~state extension_constructor cmt_tbl
+  | Pstr_typext type_extension ->
+    print_type_extension ~state type_extension cmt_tbl
+
+and print_type_extension ~state (te : Parsetree.type_extension) cmt_tbl =
+  let prefix = Doc.text "type " in
+  let name = print_lident_path te.ptyext_path cmt_tbl in
+  let type_params = print_type_params ~state te.ptyext_params cmt_tbl in
+  let extension_constructors =
+    let ecs = te.ptyext_constructors in
+    let force_break =
+      match (ecs, List.rev ecs) with
+      | first :: _, last :: _ ->
+        first.pext_loc.loc_start.pos_lnum > te.ptyext_path.loc.loc_end.pos_lnum
+        || first.pext_loc.loc_start.pos_lnum < last.pext_loc.loc_end.pos_lnum
+      | _ -> false
+    in
+    let private_flag =
+      match te.ptyext_private with
+      | Asttypes.Private -> Doc.concat [Doc.text "private"; Doc.line]
+      | Public -> Doc.nil
+    in
+    let rows =
+      print_listi
+        ~get_loc:(fun n -> n.Parsetree.pext_loc)
+        ~print:(print_extension_constructor ~state)
+        ~nodes:ecs ~force_break cmt_tbl
+    in
+    Doc.breakable_group ~force_break
+      (Doc.indent
+         (Doc.concat
+            [
+              Doc.line;
+              private_flag;
+              rows;
+              (* Doc.join ~sep:Doc.line ( *)
+              (* List.mapi printExtensionConstructor ecs *)
+              (* ) *)
+            ]))
+  in
+  Doc.group
+    (Doc.concat
+       [
+         print_attributes ~state ~loc:te.ptyext_path.loc te.ptyext_attributes
+           cmt_tbl;
+         prefix;
+         name;
+         type_params;
+         Doc.text " +=";
+         extension_constructors;
+       ])
+
+and print_module_binding ~state ~is_rec module_binding cmt_tbl i =
+  let prefix =
+    if i = 0 then
+      Doc.concat
+        [Doc.text "module "; (if is_rec then Doc.text "rec " else Doc.nil)]
+    else Doc.text "and "
+  in
+  let mod_expr_doc, mod_constraint_doc =
+    match module_binding.pmb_expr with
+    | {pmod_desc = Pmod_constraint (mod_expr, mod_type)}
+      when not
+             (ParsetreeViewer.has_await_attribute
+                module_binding.pmb_expr.pmod_attributes) ->
+      ( print_mod_expr ~state mod_expr cmt_tbl,
+        Doc.concat [Doc.text ": "; print_mod_type ~state mod_type cmt_tbl] )
+    | mod_expr -> (print_mod_expr ~state mod_expr cmt_tbl, Doc.nil)
+  in
+  let mod_expr_doc_parens =
+    if Parens.mod_expr_parens module_binding.pmb_expr then
+      Doc.concat [Doc.lparen; mod_expr_doc; Doc.rparen]
+    else mod_expr_doc
+  in
+  let mod_name =
+    let doc = Doc.text module_binding.pmb_name.Location.txt in
+    print_comments doc cmt_tbl module_binding.pmb_name.loc
+  in
+  let doc =
+    Doc.concat
+      [
+        print_attributes ~state ~loc:module_binding.pmb_name.loc
+          module_binding.pmb_attributes cmt_tbl;
+        prefix;
+        mod_name;
+        mod_constraint_doc;
+        Doc.text " = ";
+        mod_expr_doc_parens;
+      ]
+  in
+  print_comments doc cmt_tbl module_binding.pmb_loc
+
+and print_module_type_declaration ~state
+    (mod_type_decl : Parsetree.module_type_declaration) cmt_tbl =
+  let mod_name =
+    let doc = Doc.text mod_type_decl.pmtd_name.txt in
+    print_comments doc cmt_tbl mod_type_decl.pmtd_name.loc
+  in
+  Doc.concat
+    [
+      print_attributes ~state mod_type_decl.pmtd_attributes cmt_tbl;
+      Doc.text "module type ";
+      mod_name;
+      (match mod_type_decl.pmtd_type with
+      | None -> Doc.nil
+      | Some mod_type ->
+        Doc.concat [Doc.text " = "; print_mod_type ~state mod_type cmt_tbl]);
+    ]
+
+and print_mod_type ~state mod_type cmt_tbl =
+  let mod_type_doc =
+    match mod_type.pmty_desc with
+    | Parsetree.Pmty_ident longident ->
+      Doc.concat
+        [
+          print_attributes ~state ~loc:longident.loc mod_type.pmty_attributes
+            cmt_tbl;
+          print_longident_location longident cmt_tbl;
+        ]
+    | Pmty_signature [] ->
+      if has_comments_inside cmt_tbl mod_type.pmty_loc then
+        let doc = print_comments_inside cmt_tbl mod_type.pmty_loc in
+        Doc.concat [Doc.lbrace; doc; Doc.rbrace]
+      else
+        let should_break =
+          mod_type.pmty_loc.loc_start.pos_lnum
+          < mod_type.pmty_loc.loc_end.pos_lnum
+        in
+        Doc.breakable_group ~force_break:should_break
+          (Doc.concat [Doc.lbrace; Doc.soft_line; Doc.soft_line; Doc.rbrace])
+    | Pmty_signature signature ->
+      let signature_doc =
+        Doc.breakable_group ~force_break:true
+          (Doc.concat
+             [
+               Doc.lbrace;
+               Doc.indent
+                 (Doc.concat
+                    [Doc.line; print_signature ~state signature cmt_tbl]);
+               Doc.line;
+               Doc.rbrace;
+             ])
+      in
+      Doc.concat
+        [
+          print_attributes ~state mod_type.pmty_attributes cmt_tbl; signature_doc;
+        ]
+    | Pmty_functor _ ->
+      let parameters, return_type = ParsetreeViewer.functor_type mod_type in
+      let parameters_doc =
+        match parameters with
+        | [] -> Doc.nil
+        | [(attrs, {Location.txt = "_"; loc}, Some mod_type)] ->
+          let cmt_loc =
+            {loc with loc_end = mod_type.Parsetree.pmty_loc.loc_end}
+          in
+          let attrs = print_attributes ~state attrs cmt_tbl in
+          let doc =
+            Doc.concat [attrs; print_mod_type ~state mod_type cmt_tbl]
+          in
+          print_comments doc cmt_tbl cmt_loc
+        | [(attrs, {Location.txt = "*"; loc}, None)] ->
+          let attrs = print_attributes ~state attrs cmt_tbl in
+          let doc = Doc.concat [attrs; Doc.text "()"] in
+          print_comments doc cmt_tbl loc
+        | params ->
+          Doc.group
+            (Doc.concat
+               [
+                 Doc.lparen;
+                 Doc.indent
+                   (Doc.concat
+                      [
+                        Doc.soft_line;
+                        Doc.join
+                          ~sep:(Doc.concat [Doc.comma; Doc.line])
+                          (List.map
+                             (fun (attrs, lbl, mod_type) ->
+                               let cmt_loc =
+                                 match mod_type with
+                                 | None -> lbl.Asttypes.loc
+                                 | Some mod_type ->
+                                   {
+                                     lbl.Asttypes.loc with
+                                     loc_end =
+                                       mod_type.Parsetree.pmty_loc.loc_end;
+                                   }
+                               in
+                               let attrs =
+                                 print_attributes ~state attrs cmt_tbl
+                               in
+                               let lbl_doc =
+                                 if lbl.Location.txt = "_" then Doc.nil
+                                 else if lbl.txt = "*" then
+                                   let doc = Doc.text "()" in
+                                   print_comments doc cmt_tbl lbl.loc
+                                 else
+                                   let doc = Doc.text lbl.txt in
+                                   print_comments doc cmt_tbl lbl.loc
+                               in
+                               let doc =
+                                 Doc.concat
+                                   [
+                                     attrs;
+                                     lbl_doc;
+                                     (match mod_type with
+                                     | None -> Doc.nil
+                                     | Some mod_type ->
+                                       Doc.concat
+                                         [
+                                           (if lbl.txt = "_" then Doc.nil
+                                            else Doc.text ": ");
+                                           print_mod_type ~state mod_type
+                                             cmt_tbl;
+                                         ]);
+                                   ]
+                               in
+                               print_comments doc cmt_tbl cmt_loc)
+                             params);
+                      ]);
+                 Doc.trailing_comma;
+                 Doc.soft_line;
+                 Doc.rparen;
+               ])
+      in
+      let return_doc =
+        let doc = print_mod_type ~state return_type cmt_tbl in
+        if Parens.mod_type_functor_return return_type then add_parens doc
+        else doc
+      in
+      Doc.group
+        (Doc.concat
+           [
+             parameters_doc;
+             Doc.group (Doc.concat [Doc.text " =>"; Doc.line; return_doc]);
+           ])
+    | Pmty_typeof mod_expr ->
+      Doc.concat
+        [Doc.text "module type of "; print_mod_expr ~state mod_expr cmt_tbl]
+    | Pmty_extension extension ->
+      print_extension ~state ~at_module_lvl:false extension cmt_tbl
+    | Pmty_alias longident ->
+      Doc.concat
+        [Doc.text "module "; print_longident_location longident cmt_tbl]
+    | Pmty_with (mod_type, with_constraints) ->
+      let operand =
+        let doc = print_mod_type ~state mod_type cmt_tbl in
+        if Parens.mod_type_with_operand mod_type then add_parens doc else doc
+      in
+      Doc.group
+        (Doc.concat
+           [
+             operand;
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.line;
+                    print_with_constraints ~state with_constraints cmt_tbl;
+                  ]);
+           ])
+  in
+  let attrs_already_printed =
+    match mod_type.pmty_desc with
+    | Pmty_functor _ | Pmty_signature _ | Pmty_ident _ -> true
+    | _ -> false
+  in
+  let doc =
+    Doc.concat
+      [
+        (if attrs_already_printed then Doc.nil
+         else print_attributes ~state mod_type.pmty_attributes cmt_tbl);
+        mod_type_doc;
+      ]
+  in
+  print_comments doc cmt_tbl mod_type.pmty_loc
+
+and print_with_constraints ~state with_constraints cmt_tbl =
+  let rows =
+    List.mapi
+      (fun i with_constraint ->
+        Doc.group
+          (Doc.concat
+             [
+               (if i == 0 then Doc.text "with " else Doc.text "and ");
+               print_with_constraint ~state with_constraint cmt_tbl;
+             ]))
+      with_constraints
+  in
+  Doc.join ~sep:Doc.line rows
+
+and print_with_constraint ~state (with_constraint : Parsetree.with_constraint)
+    cmt_tbl =
+  match with_constraint with
+  (* with type X.t = ... *)
+  | Pwith_type (longident, type_declaration) ->
+    Doc.group
+      (print_type_declaration ~state
+         ~name:(print_lident_path longident cmt_tbl)
+         ~equal_sign:"=" ~rec_flag:Doc.nil 0 type_declaration CommentTable.empty)
+  (* with module X.Y = Z *)
+  | Pwith_module ({txt = longident1}, {txt = longident2}) ->
+    Doc.concat
+      [
+        Doc.text "module ";
+        print_longident longident1;
+        Doc.text " =";
+        Doc.indent (Doc.concat [Doc.line; print_longident longident2]);
+      ]
+  (* with type X.t := ..., same format as [Pwith_type] *)
+  | Pwith_typesubst (longident, type_declaration) ->
+    Doc.group
+      (print_type_declaration ~state
+         ~name:(print_lident_path longident cmt_tbl)
+         ~equal_sign:":=" ~rec_flag:Doc.nil 0 type_declaration
+         CommentTable.empty)
+  | Pwith_modsubst ({txt = longident1}, {txt = longident2}) ->
+    Doc.concat
+      [
+        Doc.text "module ";
+        print_longident longident1;
+        Doc.text " :=";
+        Doc.indent (Doc.concat [Doc.line; print_longident longident2]);
+      ]
+
+and print_signature ~state signature cmt_tbl =
+  match signature with
+  | [] -> print_comments_inside_file cmt_tbl
+  | signature ->
+    print_list
+      ~get_loc:(fun s -> s.Parsetree.psig_loc)
+      ~nodes:signature
+      ~print:(print_signature_item ~state)
+      cmt_tbl
+
+and print_signature_item ~state (si : Parsetree.signature_item) cmt_tbl =
+  match si.psig_desc with
+  | Parsetree.Psig_value value_description ->
+    print_value_description ~state value_description cmt_tbl
+  | Psig_type (rec_flag, type_declarations) ->
+    print_type_declarations ~state ~rec_flag type_declarations cmt_tbl
+  | Psig_typext type_extension ->
+    print_type_extension ~state type_extension cmt_tbl
+  | Psig_exception extension_constructor ->
+    print_exception_def ~state extension_constructor cmt_tbl
+  | Psig_module module_declaration ->
+    print_module_declaration ~state module_declaration cmt_tbl
+  | Psig_recmodule module_declarations ->
+    print_rec_module_declarations ~state module_declarations cmt_tbl
+  | Psig_modtype mod_type_decl ->
+    print_module_type_declaration ~state mod_type_decl cmt_tbl
+  | Psig_open open_description ->
+    print_open_description ~state open_description cmt_tbl
+  | Psig_include include_description ->
+    print_include_description ~state include_description cmt_tbl
+  | Psig_attribute attr ->
+    fst (print_attribute ~state ~standalone:true attr cmt_tbl)
+  | Psig_extension (extension, attrs) ->
+    Doc.concat
+      [
+        print_attributes ~state attrs cmt_tbl;
+        Doc.concat
+          [print_extension ~state ~at_module_lvl:true extension cmt_tbl];
+      ]
+
+and print_rec_module_declarations ~state module_declarations cmt_tbl =
+  print_listi
+    ~get_loc:(fun n -> n.Parsetree.pmd_loc)
+    ~nodes:module_declarations
+    ~print:(print_rec_module_declaration ~state)
+    cmt_tbl
+
+and print_rec_module_declaration ~state md cmt_tbl i =
+  let body =
+    match md.pmd_type.pmty_desc with
+    | Parsetree.Pmty_alias longident ->
+      Doc.concat [Doc.text " = "; print_longident_location longident cmt_tbl]
+    | _ ->
+      let needs_parens =
+        match md.pmd_type.pmty_desc with
+        | Pmty_with _ -> true
+        | _ -> false
+      in
+      let mod_type_doc =
+        let doc = print_mod_type ~state md.pmd_type cmt_tbl in
+        if needs_parens then add_parens doc else doc
+      in
+      Doc.concat [Doc.text ": "; mod_type_doc]
+  in
+  let prefix = if i < 1 then "module rec " else "and " in
+  Doc.concat
+    [
+      print_attributes ~state ~loc:md.pmd_name.loc md.pmd_attributes cmt_tbl;
+      Doc.text prefix;
+      print_comments (Doc.text md.pmd_name.txt) cmt_tbl md.pmd_name.loc;
+      body;
+    ]
+
+and print_module_declaration ~state (md : Parsetree.module_declaration) cmt_tbl
+    =
+  let body =
+    match md.pmd_type.pmty_desc with
+    | Parsetree.Pmty_alias longident ->
+      Doc.concat [Doc.text " = "; print_longident_location longident cmt_tbl]
+    | _ -> Doc.concat [Doc.text ": "; print_mod_type ~state md.pmd_type cmt_tbl]
+  in
+  Doc.concat
+    [
+      print_attributes ~state ~loc:md.pmd_name.loc md.pmd_attributes cmt_tbl;
+      Doc.text "module ";
+      print_comments (Doc.text md.pmd_name.txt) cmt_tbl md.pmd_name.loc;
+      body;
+    ]
+
+and print_open_description ~state
+    (open_description : Parsetree.open_description) cmt_tbl =
+  Doc.concat
+    [
+      print_attributes ~state open_description.popen_attributes cmt_tbl;
+      Doc.text "open";
+      (match open_description.popen_override with
+      | Asttypes.Fresh -> Doc.space
+      | Asttypes.Override -> Doc.text "! ");
+      print_longident_location open_description.popen_lid cmt_tbl;
+    ]
+
+and print_include_description ~state
+    (include_description : Parsetree.include_description) cmt_tbl =
+  Doc.concat
+    [
+      print_attributes ~state include_description.pincl_attributes cmt_tbl;
+      Doc.text "include ";
+      print_mod_type ~state include_description.pincl_mod cmt_tbl;
+    ]
+
+and print_include_declaration ~state
+    (include_declaration : Parsetree.include_declaration) cmt_tbl =
+  Doc.concat
+    [
+      print_attributes ~state include_declaration.pincl_attributes cmt_tbl;
+      Doc.text "include ";
+      (let include_doc =
+         match include_declaration.pincl_mod.pmod_desc with
+         (* 
+           include Module.Name({ type t = t })
+           try as oneliner if there is a single type alias declaration
+          *)
+         | Pmod_apply
+             ( {pmod_desc = Pmod_ident longident_loc},
+               {
+                 pmod_desc =
+                   Pmod_structure
+                     [
+                       ({
+                          pstr_desc =
+                            Pstr_type
+                              ( _,
+                                [
+                                  {
+                                    ptype_kind = Ptype_abstract;
+                                    ptype_manifest = Some _;
+                                  };
+                                ] );
+                        } as structure_item);
+                     ];
+               } ) ->
+           Doc.concat
+             [
+               print_longident_location longident_loc cmt_tbl;
+               Doc.lparen;
+               Doc.breakable_group ~force_break:false
+                 (Doc.concat
+                    [
+                      Doc.lbrace;
+                      Doc.indent
+                        (Doc.concat
+                           [
+                             Doc.soft_line;
+                             print_structure_item ~state structure_item cmt_tbl;
+                           ]);
+                      Doc.soft_line;
+                      Doc.rbrace;
+                    ]);
+               Doc.rparen;
+             ]
+         | _ -> print_mod_expr ~state include_declaration.pincl_mod cmt_tbl
+       in
+       if Parens.include_mod_expr include_declaration.pincl_mod then
+         add_parens include_doc
+       else include_doc);
+    ]
+
+and print_value_bindings ~state ~rec_flag (vbs : Parsetree.value_binding list)
+    cmt_tbl =
+  print_listi
+    ~get_loc:(fun vb -> vb.Parsetree.pvb_loc)
+    ~nodes:vbs
+    ~print:(print_value_binding ~state ~rec_flag)
+    cmt_tbl
+
+and print_value_description ~state value_description cmt_tbl =
+  let is_external =
+    match value_description.pval_prim with
+    | [] -> false
+    | _ -> true
+  in
+  let attrs =
+    print_attributes ~state ~loc:value_description.pval_name.loc
+      value_description.pval_attributes cmt_tbl
+  in
+  let header = if is_external then "external " else "let " in
+  Doc.group
+    (Doc.concat
+       [
+         attrs;
+         Doc.text header;
+         print_comments
+           (print_ident_like value_description.pval_name.txt)
+           cmt_tbl value_description.pval_name.loc;
+         Doc.text ": ";
+         print_typ_expr ~state value_description.pval_type cmt_tbl;
+         (if is_external then
+            Doc.group
+              (Doc.concat
+                 [
+                   Doc.text " =";
+                   Doc.indent
+                     (Doc.concat
+                        [
+                          Doc.line;
+                          Doc.join ~sep:Doc.line
+                            (List.map
+                               (fun s ->
+                                 Doc.concat
+                                   [Doc.text "\""; Doc.text s; Doc.text "\""])
+                               value_description.pval_prim);
+                        ]);
+                 ])
+          else Doc.nil);
+       ])
+
+and print_type_declarations ~state ~rec_flag type_declarations cmt_tbl =
+  if has_inline_type_definitions type_declarations then
+    let inline_record_definitions, regular_declarations =
+      type_declarations
+      |> List.partition (fun (td : Parsetree.type_declaration) ->
+             Res_parsetree_viewer.has_inline_record_definition_attribute
+               td.ptype_attributes)
+    in
+    let adjusted_rec_flag =
+      match rec_flag with
+      | Recursive ->
+        if List.length regular_declarations > 1 then Doc.text "rec "
+        else Doc.nil
+      | Nonrecursive -> Doc.nil
+    in
+    print_listi
+      ~get_loc:(fun n -> n.Parsetree.ptype_loc)
+      ~nodes:regular_declarations
+      ~print:
+        (print_type_declaration2 ~inline_record_definitions ~state
+           ~rec_flag:adjusted_rec_flag)
+      cmt_tbl
+  else
+    print_listi
+      ~get_loc:(fun n -> n.Parsetree.ptype_loc)
+      ~nodes:type_declarations
+      ~print:
+        (print_type_declaration2 ~state
+           ~rec_flag:
+             (match rec_flag with
+             | Nonrecursive -> Doc.nil
+             | Recursive -> Doc.text "rec "))
+      cmt_tbl
+
+(*
+ * type_declaration = {
+ *    ptype_name: string loc;
+ *    ptype_params: (core_type * variance) list;
+ *          (* ('a1,...'an) t; None represents  _*)
+ *    ptype_cstrs: (core_type * core_type * Location.t) list;
+ *          (* ... constraint T1=T1'  ... constraint Tn=Tn' *)
+ *    ptype_kind: type_kind;
+ *    ptype_private: private_flag;   (* = private ... *)
+ *    ptype_manifest: core_type option;  (* = T *)
+ *    ptype_attributes: attributes;   (* ... [@@id1] [@@id2] *)
+ *    ptype_loc: Location.t;
+ * }
+ *
+ *
+ *  type t                     (abstract, no manifest)
+ *  type t = T0                (abstract, manifest=T0)
+ *  type t = C of T | ...      (variant,  no manifest)
+ *  type t = T0 = C of T | ... (variant,  manifest=T0)
+ *  type t = {l: T; ...}       (record,   no manifest)
+ *  type t = T0 = {l : T; ...} (record,   manifest=T0)
+ *  type t = ..                (open,     no manifest)
+ *
+ *
+ * and type_kind =
+ *  | Ptype_abstract
+ *  | Ptype_variant of constructor_declaration list
+ *        (* Invariant: non-empty list *)
+ *  | Ptype_record of label_declaration list
+ *        (* Invariant: non-empty list *)
+ *  | Ptype_open
+ *)
+and print_type_declaration ~state ~name ~equal_sign ~rec_flag i
+    (td : Parsetree.type_declaration) cmt_tbl =
+  let attrs =
+    print_attributes ~state ~loc:td.ptype_loc td.ptype_attributes cmt_tbl
+  in
+  let prefix =
+    if i > 0 then Doc.text "and " else Doc.concat [Doc.text "type "; rec_flag]
+  in
+  let type_name = name in
+  let type_params = print_type_params ~state td.ptype_params cmt_tbl in
+  let manifest_and_kind =
+    match td.ptype_kind with
+    | Ptype_abstract -> (
+      match td.ptype_manifest with
+      | None -> Doc.nil
+      | Some typ ->
+        Doc.concat
+          [
+            Doc.concat [Doc.space; Doc.text equal_sign; Doc.space];
+            print_private_flag td.ptype_private;
+            print_typ_expr ~state typ cmt_tbl;
+          ])
+    | Ptype_open ->
+      Doc.concat
+        [
+          Doc.concat [Doc.space; Doc.text equal_sign; Doc.space];
+          print_private_flag td.ptype_private;
+          Doc.text "..";
+        ]
+    | Ptype_record lds ->
+      let manifest =
+        match td.ptype_manifest with
+        | None -> Doc.nil
+        | Some typ ->
+          Doc.concat
+            [
+              Doc.concat [Doc.space; Doc.text equal_sign; Doc.space];
+              print_typ_expr ~state typ cmt_tbl;
+            ]
+      in
+      Doc.concat
+        [
+          manifest;
+          Doc.concat [Doc.space; Doc.text equal_sign; Doc.space];
+          print_private_flag td.ptype_private;
+          print_record_declaration ~record_loc:td.ptype_loc ~state lds cmt_tbl;
+        ]
+    | Ptype_variant cds ->
+      let manifest =
+        match td.ptype_manifest with
+        | None -> Doc.nil
+        | Some typ ->
+          Doc.concat
+            [
+              Doc.concat [Doc.space; Doc.text equal_sign; Doc.space];
+              print_typ_expr ~state typ cmt_tbl;
+            ]
+      in
+      Doc.concat
+        [
+          manifest;
+          Doc.concat [Doc.space; Doc.text equal_sign];
+          print_constructor_declarations ~state ~private_flag:td.ptype_private
+            cds cmt_tbl;
+        ]
+  in
+  let constraints = print_type_definition_constraints ~state td.ptype_cstrs in
+  Doc.group
+    (Doc.concat
+       [attrs; prefix; type_name; type_params; manifest_and_kind; constraints])
+
+and print_type_declaration2 ?inline_record_definitions ~state ~rec_flag
+    (td : Parsetree.type_declaration) cmt_tbl i =
+  let name =
+    let doc = print_ident_like td.Parsetree.ptype_name.txt in
+    print_comments doc cmt_tbl td.ptype_name.loc
+  in
+  let equal_sign = "=" in
+  let attrs =
+    print_attributes ~state ~loc:td.ptype_loc td.ptype_attributes cmt_tbl
+  in
+  let prefix =
+    if i > 0 then Doc.text "and " else Doc.concat [Doc.text "type "; rec_flag]
+  in
+  let type_name = name in
+  let type_params = print_type_params ~state td.ptype_params cmt_tbl in
+  let manifest_and_kind =
+    match td.ptype_kind with
+    | Ptype_abstract -> (
+      match td.ptype_manifest with
+      | None -> Doc.nil
+      | Some typ ->
+        Doc.concat
+          [
+            Doc.concat [Doc.space; Doc.text equal_sign; Doc.space];
+            print_private_flag td.ptype_private;
+            print_typ_expr ~state typ cmt_tbl;
+          ])
+    | Ptype_open ->
+      Doc.concat
+        [
+          Doc.concat [Doc.space; Doc.text equal_sign; Doc.space];
+          print_private_flag td.ptype_private;
+          Doc.text "..";
+        ]
+    | Ptype_record lds ->
+      if lds = [] then
+        Doc.concat
+          [
+            Doc.space;
+            Doc.text equal_sign;
+            Doc.space;
+            print_private_flag td.ptype_private;
+            Doc.lbrace;
+            print_comments_inside cmt_tbl td.ptype_loc;
+            Doc.rbrace;
+          ]
+      else
+        let manifest =
+          match td.ptype_manifest with
+          | None -> Doc.nil
+          | Some typ ->
+            Doc.concat
+              [
+                Doc.concat [Doc.space; Doc.text equal_sign; Doc.space];
+                print_typ_expr ~state typ cmt_tbl;
+              ]
+        in
+        Doc.concat
+          [
+            manifest;
+            Doc.concat [Doc.space; Doc.text equal_sign; Doc.space];
+            print_private_flag td.ptype_private;
+            print_record_declaration ?inline_record_definitions
+              ~record_loc:td.ptype_loc ~state lds cmt_tbl;
+          ]
+    | Ptype_variant cds ->
+      let manifest =
+        match td.ptype_manifest with
+        | None -> Doc.nil
+        | Some typ ->
+          Doc.concat
+            [
+              Doc.concat [Doc.space; Doc.text equal_sign; Doc.space];
+              print_typ_expr ~state typ cmt_tbl;
+            ]
+      in
+      Doc.concat
+        [
+          manifest;
+          Doc.concat [Doc.space; Doc.text equal_sign];
+          print_constructor_declarations ~state ~private_flag:td.ptype_private
+            cds cmt_tbl;
+        ]
+  in
+  let constraints = print_type_definition_constraints ~state td.ptype_cstrs in
+  Doc.group
+    (Doc.concat
+       [attrs; prefix; type_name; type_params; manifest_and_kind; constraints])
+
+and print_type_definition_constraints ~state cstrs =
+  match cstrs with
+  | [] -> Doc.nil
+  | cstrs ->
+    Doc.indent
+      (Doc.group
+         (Doc.concat
+            [
+              Doc.line;
+              Doc.group
+                (Doc.join ~sep:Doc.line
+                   (List.map (print_type_definition_constraint ~state) cstrs));
+            ]))
+
+and print_type_definition_constraint ~state
+    ((typ1, typ2, _loc) :
+      Parsetree.core_type * Parsetree.core_type * Location.t) =
+  Doc.concat
+    [
+      Doc.text "constraint ";
+      print_typ_expr ~state typ1 CommentTable.empty;
+      Doc.text " = ";
+      print_typ_expr ~state typ2 CommentTable.empty;
+    ]
+
+and print_private_flag (flag : Asttypes.private_flag) =
+  match flag with
+  | Private -> Doc.text "private "
+  | Public -> Doc.nil
+
+and print_type_params ~state type_params cmt_tbl =
+  match type_params with
+  | [] -> Doc.nil
+  | type_params ->
+    Doc.group
+      (Doc.concat
+         [
+           Doc.less_than;
+           Doc.indent
+             (Doc.concat
+                [
+                  Doc.soft_line;
+                  Doc.join
+                    ~sep:(Doc.concat [Doc.comma; Doc.line])
+                    (List.map
+                       (fun type_param ->
+                         let doc = print_type_param ~state type_param cmt_tbl in
+                         print_comments doc cmt_tbl
+                           (fst type_param).Parsetree.ptyp_loc)
+                       type_params);
+                ]);
+           Doc.trailing_comma;
+           Doc.soft_line;
+           Doc.greater_than;
+         ])
+
+and print_type_param ~state (param : Parsetree.core_type * Asttypes.variance)
+    cmt_tbl =
+  let typ, variance = param in
+  let printed_variance =
+    match variance with
+    | Covariant -> Doc.text "+"
+    | Contravariant -> Doc.text "-"
+    | Invariant -> Doc.nil
+  in
+  Doc.concat [printed_variance; print_typ_expr ~state typ cmt_tbl]
+
+and print_record_declaration ?check_break_from_loc ?inline_record_definitions
+    ?record_loc ~state (lds : Parsetree.label_declaration list) cmt_tbl =
+  let get_field_start_line (ld : Parsetree.label_declaration) =
+    (* For spread fields (...), use the type location instead of pld_loc
+       because pld_loc may incorrectly include preceding whitespace *)
+    if ld.pld_name.txt = "..." then ld.pld_type.ptyp_loc.loc_start.pos_lnum
+    else ld.pld_loc.loc_start.pos_lnum
+  in
+  let force_break =
+    match (check_break_from_loc, record_loc, lds) with
+    | Some loc, _, _ -> loc.Location.loc_start.pos_lnum < loc.loc_end.pos_lnum
+    | None, Some loc, first :: _ ->
+      (* Check if first field is on a different line than the opening brace *)
+      loc.loc_start.pos_lnum < get_field_start_line first
+    | None, None, first :: _ ->
+      let last = List.hd (List.rev lds) in
+      get_field_start_line first < last.pld_loc.loc_end.pos_lnum
+    | _, _, _ -> false
+  in
+  Doc.breakable_group ~force_break
+    (Doc.concat
+       [
+         Doc.lbrace;
+         Doc.indent
+           (Doc.concat
+              [
+                Doc.soft_line;
+                Doc.join
+                  ~sep:(Doc.concat [Doc.comma; Doc.line])
+                  (List.map
+                     (fun ld ->
+                       let doc =
+                         print_label_declaration ?inline_record_definitions
+                           ~state ld cmt_tbl
+                       in
+                       print_comments doc cmt_tbl ld.Parsetree.pld_loc)
+                     lds);
+              ]);
+         Doc.trailing_comma;
+         Doc.soft_line;
+         Doc.rbrace;
+       ])
+
+and print_literal_dict_expr ~state (e : Parsetree.expression) cmt_tbl =
+  let force_break =
+    e.pexp_loc.loc_start.pos_lnum < e.pexp_loc.loc_end.pos_lnum
+  in
+  let tuple_to_row (e : Parsetree.expression) =
+    match e with
+    | {
+     pexp_desc =
+       Pexp_tuple
+         [
+           {pexp_desc = Pexp_constant (Pconst_string (name, _)); pexp_loc}; value;
+         ];
+    } ->
+      Some ((Location.mkloc (Longident.Lident name) pexp_loc, value), e)
+    | _ -> None
+  in
+  let rows =
+    match e with
+    | {pexp_desc = Pexp_array expressions} ->
+      List.filter_map tuple_to_row expressions
+    | _ -> []
+  in
+  Doc.breakable_group ~force_break
+    (Doc.concat
+       [
+         Doc.indent
+           (Doc.concat
+              [
+                (if rows = [] then Doc.nil else Doc.soft_line);
+                Doc.join
+                  ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                  (List.map
+                     (fun ((row, e) :
+                            (Longident.t Location.loc * Parsetree.expression)
+                            * Parsetree.expression) ->
+                       let doc = print_bs_object_row ~state row cmt_tbl in
+                       print_comments doc cmt_tbl e.pexp_loc)
+                     rows);
+              ]);
+         (if rows = [] then Doc.nil
+          else Doc.concat [Doc.trailing_comma; Doc.soft_line]);
+       ])
+
+and print_constructor_declarations ~state ~private_flag
+    (cds : Parsetree.constructor_declaration list) cmt_tbl =
+  let force_break =
+    match (cds, List.rev cds) with
+    | first :: _, last :: _ ->
+      first.pcd_loc.loc_start.pos_lnum < last.pcd_loc.loc_end.pos_lnum
+    | _ -> false
+  in
+  let private_flag =
+    match private_flag with
+    | Asttypes.Private -> Doc.concat [Doc.text "private"; Doc.line]
+    | Public -> Doc.nil
+  in
+  let rows =
+    print_listi
+      ~get_loc:(fun cd -> cd.Parsetree.pcd_loc)
+      ~nodes:cds
+      ~print:(fun cd cmt_tbl i ->
+        let doc = print_constructor_declaration2 ~state i cd cmt_tbl in
+        print_comments doc cmt_tbl cd.Parsetree.pcd_loc)
+      ~force_break cmt_tbl ~ignore_empty_lines:true
+  in
+  Doc.breakable_group ~force_break
+    (Doc.indent (Doc.concat [Doc.line; private_flag; rows]))
+
+and print_constructor_declaration2 ~state i
+    (cd : Parsetree.constructor_declaration) cmt_tbl =
+  let comment_attrs, attrs =
+    ParsetreeViewer.partition_doc_comment_attributes cd.pcd_attributes
+  in
+  let comment_doc =
+    match comment_attrs with
+    | [] -> Doc.nil
+    | comment_attrs ->
+      print_doc_comments ~sep:Doc.hard_line ~state cmt_tbl comment_attrs
+  in
+  let attrs = print_attributes ~state attrs cmt_tbl in
+  let is_dot_dot_dot = cd.pcd_name.txt = "..." in
+  let bar =
+    if i > 0 || cd.pcd_attributes <> [] || is_dot_dot_dot then Doc.text "| "
+    else Doc.if_breaks (Doc.text "| ") Doc.nil
+  in
+  let constr_name =
+    let doc = Doc.text cd.pcd_name.txt in
+    print_comments doc cmt_tbl cd.pcd_name.loc
+  in
+  let constr_args =
+    print_constructor_arguments ~is_dot_dot_dot ~state ~indent:true cd.pcd_args
+      cmt_tbl
+  in
+  let gadt =
+    match cd.pcd_res with
+    | None -> Doc.nil
+    | Some typ ->
+      Doc.indent (Doc.concat [Doc.text ": "; print_typ_expr ~state typ cmt_tbl])
+  in
+  Doc.concat
+    [
+      comment_doc;
+      bar;
+      Doc.group
+        (Doc.concat
+           [
+             attrs;
+             (* TODO: fix parsing of attributes, so when can print them above the bar? *)
+             constr_name;
+             constr_args;
+             gadt;
+           ]);
+    ]
+
+and print_constructor_arguments ?(is_dot_dot_dot = false) ~state ~indent
+    (cd_args : Parsetree.constructor_arguments) cmt_tbl =
+  match cd_args with
+  | Pcstr_tuple [] -> Doc.nil
+  | Pcstr_tuple types ->
+    let args =
+      Doc.concat
+        [
+          (if is_dot_dot_dot then Doc.nil else Doc.lparen);
+          Doc.indent
+            (Doc.concat
+               [
+                 Doc.soft_line;
+                 Doc.join
+                   ~sep:(Doc.concat [Doc.comma; Doc.line])
+                   (List.map
+                      (fun typexpr -> print_typ_expr ~state typexpr cmt_tbl)
+                      types);
+               ]);
+          Doc.trailing_comma;
+          Doc.soft_line;
+          (if is_dot_dot_dot then Doc.nil else Doc.rparen);
+        ]
+    in
+    Doc.group (if indent then Doc.indent args else args)
+  | Pcstr_record lds ->
+    let args =
+      Doc.concat
+        [
+          Doc.lparen;
+          (* manually inline the printRecordDeclaration, gives better layout *)
+          Doc.lbrace;
+          Doc.indent
+            (Doc.concat
+               [
+                 Doc.soft_line;
+                 Doc.join
+                   ~sep:(Doc.concat [Doc.comma; Doc.line])
+                   (List.map
+                      (fun ld ->
+                        let doc = print_label_declaration ~state ld cmt_tbl in
+                        print_comments doc cmt_tbl ld.Parsetree.pld_loc)
+                      lds);
+               ]);
+          Doc.trailing_comma;
+          Doc.soft_line;
+          Doc.rbrace;
+          Doc.rparen;
+        ]
+    in
+    if indent then Doc.indent args else args
+
+and print_label_declaration ?inline_record_definitions ~state
+    (ld : Parsetree.label_declaration) cmt_tbl =
+  let attrs =
+    print_attributes ~state ~loc:ld.pld_name.loc ld.pld_attributes cmt_tbl
+  in
+  let mutable_flag =
+    match ld.pld_mutable with
+    | Mutable -> Doc.text "mutable "
+    | Immutable -> Doc.nil
+  in
+  let name, is_dot =
+    let doc, is_dot =
+      if ld.pld_name.txt = "..." then (Doc.text ld.pld_name.txt, true)
+      else (print_ident_like ld.pld_name.txt, false)
+    in
+    (print_comments doc cmt_tbl ld.pld_name.loc, is_dot)
+  in
+  let optional = if ld.pld_optional then Doc.text "?" else Doc.nil in
+  Doc.group
+    (Doc.concat
+       [
+         attrs;
+         mutable_flag;
+         name;
+         optional;
+         (if is_dot then Doc.nil else Doc.text ": ");
+         print_typ_expr ?inline_record_definitions ~state ld.pld_type cmt_tbl;
+       ])
+
+and print_typ_expr ?inline_record_definitions ~(state : State.t)
+    (typ_expr : Parsetree.core_type) cmt_tbl =
+  let print_arrow ~arity typ_expr =
+    let max_arity =
+      match arity with
+      | Some arity -> arity
+      | None -> max_int
+    in
+    let attrs_before, args, return_type =
+      ParsetreeViewer.arrow_type ~max_arity typ_expr
+    in
+    let return_type_needs_parens =
+      match return_type.ptyp_desc with
+      | Ptyp_alias _ -> true
+      | _ -> false
+    in
+    let return_doc =
+      let doc = print_typ_expr ~state return_type cmt_tbl in
+      if return_type_needs_parens then Doc.concat [Doc.lparen; doc; Doc.rparen]
+      else doc
+    in
+    match args with
+    | [] -> Doc.nil
+    | [{attrs = []; lbl = Nolabel; typ}] ->
+      let has_attrs_before = not (attrs_before = []) in
+      let attrs =
+        if has_attrs_before then
+          print_attributes ~state ~inline:true attrs_before cmt_tbl
+        else Doc.nil
+      in
+      let typ_doc =
+        let doc = print_typ_expr ~state typ cmt_tbl in
+        match typ.ptyp_desc with
+        | Ptyp_arrow _ | Ptyp_tuple _ | Ptyp_alias _ -> add_parens doc
+        | _ -> doc
+      in
+      Doc.group
+        (Doc.concat
+           [
+             Doc.group attrs;
+             Doc.group
+               (if has_attrs_before then
+                  Doc.concat
+                    [
+                      Doc.lparen;
+                      Doc.indent
+                        (Doc.concat
+                           [Doc.soft_line; typ_doc; Doc.text " => "; return_doc]);
+                      Doc.soft_line;
+                      Doc.rparen;
+                    ]
+                else Doc.concat [typ_doc; Doc.text " => "; return_doc]);
+           ])
+    | args ->
+      let attrs = print_attributes ~state ~inline:true attrs_before cmt_tbl in
+      let rendered_args =
+        Doc.concat
+          [
+            attrs;
+            Doc.text "(";
+            Doc.indent
+              (Doc.concat
+                 [
+                   Doc.soft_line;
+                   Doc.join
+                     ~sep:(Doc.concat [Doc.comma; Doc.line])
+                     (List.map
+                        (fun tp -> print_type_parameter ~state tp cmt_tbl)
+                        args);
+                 ]);
+            Doc.trailing_comma;
+            Doc.soft_line;
+            Doc.text ")";
+          ]
+      in
+      Doc.group (Doc.concat [rendered_args; Doc.text " => "; return_doc])
+  in
+  let rendered_type =
+    match typ_expr.ptyp_desc with
+    | Ptyp_any -> Doc.text "_"
+    | Ptyp_var var ->
+      Doc.concat [Doc.text "'"; print_ident_like ~allow_uident:true var]
+    | Ptyp_extension extension ->
+      print_extension ~state ~at_module_lvl:false extension cmt_tbl
+    | Ptyp_alias (typ, alias) ->
+      let typ =
+        (* Technically type t = (string, float) => unit as 'x, doesn't require
+         * parens around the arrow expression. This is very confusing though.
+         * Is the "as" part of "unit" or "(string, float) => unit". By printing
+         * parens we guide the user towards its meaning.*)
+        let needs_parens =
+          match typ.ptyp_desc with
+          | Ptyp_arrow _ -> true
+          | _ -> false
+        in
+        let doc = print_typ_expr ~state typ cmt_tbl in
+        if needs_parens then Doc.concat [Doc.lparen; doc; Doc.rparen] else doc
+      in
+      Doc.concat
+        [
+          typ; Doc.text " as "; Doc.concat [Doc.text "'"; print_ident_like alias];
+        ]
+    (* object printings *)
+    | Ptyp_object (fields, open_flag) ->
+      print_object ~state ~inline:false fields open_flag cmt_tbl
+    | Ptyp_arrow {arity} -> print_arrow ~arity typ_expr
+    | Ptyp_constr ({txt = Lident inline_record_name}, _)
+      when inline_record_definitions
+           |> find_inline_record_definition inline_record_name
+           |> Option.is_some -> (
+      match
+        inline_record_definitions
+        |> find_inline_record_definition inline_record_name
+      with
+      | Some {ptype_kind = Ptype_record lds; ptype_loc} ->
+        print_record_declaration ~check_break_from_loc:ptype_loc
+          ~inline_record_definitions:(inline_record_definitions |> Option.get)
+          ~state lds cmt_tbl
+      | _ -> assert false)
+    | Ptyp_constr
+        (longident_loc, [{ptyp_desc = Ptyp_object (fields, open_flag)}]) ->
+      (* for foo<{"a": b}>, when the object is long and needs a line break, we
+         want the <{ and }> to stay hugged together *)
+      let constr_name = print_lident_path longident_loc cmt_tbl in
+      Doc.concat
+        [
+          constr_name;
+          Doc.less_than;
+          print_object ~state ~inline:true fields open_flag cmt_tbl;
+          Doc.greater_than;
+        ]
+    | Ptyp_constr (longident_loc, [{ptyp_desc = Parsetree.Ptyp_tuple tuple}]) ->
+      let constr_name = print_lident_path longident_loc cmt_tbl in
+      Doc.group
+        (Doc.concat
+           [
+             constr_name;
+             Doc.less_than;
+             print_tuple_type ~state ~inline:true tuple cmt_tbl;
+             Doc.greater_than;
+           ])
+    | Ptyp_constr (longident_loc, constr_args) -> (
+      let constr_name = print_lident_path longident_loc cmt_tbl in
+      match constr_args with
+      | [] -> constr_name
+      | _args ->
+        Doc.group
+          (Doc.concat
+             [
+               constr_name;
+               Doc.less_than;
+               Doc.indent
+                 (Doc.concat
+                    [
+                      Doc.soft_line;
+                      Doc.join
+                        ~sep:(Doc.concat [Doc.comma; Doc.line])
+                        (List.map
+                           (fun typexpr ->
+                             print_typ_expr ?inline_record_definitions ~state
+                               typexpr cmt_tbl)
+                           constr_args);
+                    ]);
+               Doc.trailing_comma;
+               Doc.soft_line;
+               Doc.greater_than;
+             ]))
+    | Ptyp_tuple types -> print_tuple_type ~state ~inline:false types cmt_tbl
+    | Ptyp_poly ([], typ) ->
+      print_typ_expr ?inline_record_definitions ~state typ cmt_tbl
+    | Ptyp_poly (string_locs, typ) ->
+      Doc.concat
+        [
+          Doc.join ~sep:Doc.space
+            (List.map
+               (fun {Location.txt; loc} ->
+                 let doc = Doc.concat [Doc.text "'"; Doc.text txt] in
+                 print_comments doc cmt_tbl loc)
+               string_locs);
+          Doc.dot;
+          Doc.space;
+          print_typ_expr ~state typ cmt_tbl;
+        ]
+    | Ptyp_package package_type ->
+      print_package_type ~state ~print_module_keyword_and_parens:true
+        package_type cmt_tbl
+    | Ptyp_variant (row_fields, closed_flag, labels_opt) ->
+      let force_break =
+        typ_expr.ptyp_loc.Location.loc_start.pos_lnum
+        < typ_expr.ptyp_loc.loc_end.pos_lnum
+      in
+      let print_row_field i = function
+        | Parsetree.Rtag ({txt; loc}, attrs, true, []) ->
+          let comment_attrs, attrs =
+            ParsetreeViewer.partition_doc_comment_attributes attrs
+          in
+          let comment_doc =
+            match comment_attrs with
+            | [] -> Doc.nil
+            | comment_attrs ->
+              print_doc_comments ~sep:Doc.hard_line ~state cmt_tbl comment_attrs
+          in
+          let bar =
+            if i > 0 || comment_attrs <> [] then Doc.text "| "
+            else Doc.if_breaks (Doc.text "| ") Doc.nil
+          in
+          let tag_doc =
+            Doc.group
+              (Doc.concat
+                 [
+                   print_attributes ~state attrs cmt_tbl;
+                   Doc.concat [Doc.text "#"; print_poly_var_ident txt];
+                 ])
+          in
+          Doc.concat [comment_doc; bar; print_comments tag_doc cmt_tbl loc]
+        | Rtag ({txt; loc}, attrs, truth, types) ->
+          let comment_attrs, attrs =
+            ParsetreeViewer.partition_doc_comment_attributes attrs
+          in
+          let comment_doc =
+            match comment_attrs with
+            | [] -> Doc.nil
+            | comment_attrs ->
+              print_doc_comments ~sep:Doc.hard_line ~state cmt_tbl comment_attrs
+          in
+          let bar =
+            if i > 0 || comment_attrs <> [] then Doc.text "| "
+            else Doc.if_breaks (Doc.text "| ") Doc.nil
+          in
+          let do_type t =
+            match t.Parsetree.ptyp_desc with
+            | Ptyp_tuple _ -> print_typ_expr ~state t cmt_tbl
+            | _ ->
+              Doc.concat
+                [Doc.lparen; print_typ_expr ~state t cmt_tbl; Doc.rparen]
+          in
+          let printed_types = List.map do_type types in
+          let cases =
+            Doc.join ~sep:(Doc.concat [Doc.line; Doc.text "& "]) printed_types
+          in
+          let cases =
+            if truth then Doc.concat [Doc.line; Doc.text "& "; cases] else cases
+          in
+          let tag_doc =
+            Doc.group
+              (Doc.concat
+                 [
+                   print_attributes ~state attrs cmt_tbl;
+                   Doc.concat [Doc.text "#"; print_poly_var_ident txt];
+                   cases;
+                 ])
+          in
+          Doc.concat [comment_doc; bar; print_comments tag_doc cmt_tbl loc]
+        | Rinherit core_type ->
+          let bar =
+            if i > 0 then Doc.text "| "
+            else Doc.if_breaks (Doc.text "| ") Doc.nil
+          in
+          Doc.concat [bar; print_typ_expr ~state core_type cmt_tbl]
+      in
+      let docs = List.mapi print_row_field row_fields in
+      let cases = Doc.join ~sep:Doc.line docs in
+      let opening_symbol =
+        if closed_flag = Open then Doc.concat [Doc.greater_than; Doc.line]
+        else if labels_opt = None then Doc.soft_line
+        else Doc.concat [Doc.less_than; Doc.line]
+      in
+      let labels =
+        match labels_opt with
+        | None | Some [] -> Doc.nil
+        | Some labels ->
+          Doc.concat
+            (List.map
+               (fun label ->
+                 Doc.concat [Doc.line; Doc.text "#"; print_poly_var_ident label])
+               labels)
+      in
+      let closing_symbol =
+        match labels_opt with
+        | None | Some [] -> Doc.nil
+        | _ -> Doc.text " >"
+      in
+      Doc.breakable_group ~force_break
+        (Doc.concat
+           [
+             Doc.lbracket;
+             Doc.indent
+               (Doc.concat [opening_symbol; cases; closing_symbol; labels]);
+             Doc.soft_line;
+             Doc.rbracket;
+           ])
+  in
+  let should_print_its_own_attributes =
+    match typ_expr.ptyp_desc with
+    | Ptyp_arrow _ (* es6 arrow types print their own attributes *) -> true
+    | _ -> false
+  in
+  let doc =
+    match typ_expr.ptyp_attributes with
+    | _ :: _ as attrs when not should_print_its_own_attributes ->
+      let doc_comment_attr, attrs =
+        ParsetreeViewer.partition_doc_comment_attributes attrs
+      in
+      let comment_doc =
+        match doc_comment_attr with
+        | [] -> Doc.nil
+        | _ -> print_doc_comments ~state ~sep:Doc.space cmt_tbl doc_comment_attr
+      in
+      let attrs_doc =
+        match attrs with
+        | [] -> Doc.nil
+        | _ -> print_attributes ~state attrs cmt_tbl
+      in
+      Doc.group (Doc.concat [comment_doc; attrs_doc; rendered_type])
+    | _ -> rendered_type
+  in
+  print_comments doc cmt_tbl typ_expr.ptyp_loc
+
+and print_object ~state ~inline fields open_flag cmt_tbl =
+  let doc =
+    match fields with
+    | [] ->
+      Doc.concat
+        [
+          Doc.lbrace;
+          (match open_flag with
+          | Asttypes.Closed -> Doc.dot
+          | Open -> Doc.dotdot);
+          Doc.rbrace;
+        ]
+    | fields ->
+      Doc.concat
+        [
+          Doc.lbrace;
+          (match open_flag with
+          | Asttypes.Closed -> Doc.nil
+          | Open -> (
+            match fields with
+            (* handle `type t = {.. ...objType, "x": int}`
+             * .. and ... should have a space in between *)
+            | Oinherit _ :: _ -> Doc.text ".. "
+            | _ -> Doc.dotdot));
+          Doc.indent
+            (Doc.concat
+               [
+                 Doc.soft_line;
+                 Doc.join
+                   ~sep:(Doc.concat [Doc.comma; Doc.line])
+                   (List.map
+                      (fun field -> print_object_field ~state field cmt_tbl)
+                      fields);
+               ]);
+          Doc.trailing_comma;
+          Doc.soft_line;
+          Doc.rbrace;
+        ]
+  in
+  if inline then doc else Doc.group doc
+
+and print_tuple_type ~state ~inline (types : Parsetree.core_type list) cmt_tbl =
+  let tuple =
+    Doc.concat
+      [
+        Doc.lparen;
+        Doc.indent
+          (Doc.concat
+             [
+               Doc.soft_line;
+               Doc.join
+                 ~sep:(Doc.concat [Doc.comma; Doc.line])
+                 (List.map
+                    (fun typexpr -> print_typ_expr ~state typexpr cmt_tbl)
+                    types);
+             ]);
+        Doc.trailing_comma;
+        Doc.soft_line;
+        Doc.rparen;
+      ]
+  in
+  if inline == false then Doc.group tuple else tuple
+
+and print_object_field ~state (field : Parsetree.object_field) cmt_tbl =
+  match field with
+  | Otag (label_loc, attrs, typ) ->
+    let lbl =
+      let doc = Doc.text ("\"" ^ label_loc.txt ^ "\"") in
+      print_comments doc cmt_tbl label_loc.loc
+    in
+    let doc =
+      Doc.concat
+        [
+          print_attributes ~state ~loc:label_loc.loc attrs cmt_tbl;
+          lbl;
+          Doc.text ": ";
+          print_typ_expr ~state typ cmt_tbl;
+        ]
+    in
+    let cmt_loc = {label_loc.loc with loc_end = typ.ptyp_loc.loc_end} in
+    print_comments doc cmt_tbl cmt_loc
+  | Oinherit typexpr ->
+    Doc.concat [Doc.dotdotdot; print_typ_expr ~state typexpr cmt_tbl]
+
+(* es6 arrow type arg
+ * type t = (~foo: string, ~bar: float=?, unit) => unit
+ * i.e. ~foo: string, ~bar: float *)
+and print_type_parameter ~state {attrs; lbl; typ} cmt_tbl =
+  (* Converting .ml code to .res requires processing uncurried attributes *)
+  let attrs = print_attributes ~state attrs cmt_tbl in
+  let label =
+    match lbl with
+    | Asttypes.Nolabel -> Doc.nil
+    | Labelled {txt = lbl} ->
+      Doc.concat [Doc.text "~"; print_ident_like lbl; Doc.text ": "]
+    | Optional {txt = lbl} ->
+      Doc.concat [Doc.text "~"; print_ident_like lbl; Doc.text ": "]
+  in
+  let optional_indicator =
+    match lbl with
+    | Nolabel | Labelled _ -> Doc.nil
+    | Optional _ -> Doc.text "=?"
+  in
+  let loc = {(Asttypes.get_lbl_loc lbl) with loc_end = typ.ptyp_loc.loc_end} in
+  let doc =
+    Doc.group
+      (Doc.concat
+         [attrs; label; print_typ_expr ~state typ cmt_tbl; optional_indicator])
+  in
+  print_comments doc cmt_tbl loc
+
+and print_value_binding ~state ~rec_flag (vb : Parsetree.value_binding) cmt_tbl
+    i =
+  let has_unwrap = ref false in
+  let attrs =
+    vb.pvb_attributes
+    |> List.filter_map (function
+         | {Asttypes.txt = "let.unwrap"}, _ ->
+           has_unwrap := true;
+           None
+         | attr -> Some attr)
+  in
+  let attrs = print_attributes ~state ~loc:vb.pvb_pat.ppat_loc attrs cmt_tbl in
+  let header =
+    if i == 0 then
+      Doc.concat [Doc.text (if !has_unwrap then "let? " else "let "); rec_flag]
+    else Doc.text "and "
+  in
+  match vb with
+  | {
+   pvb_pat =
+     {
+       ppat_desc =
+         Ppat_constraint (pattern, ({ptyp_desc = Ptyp_poly _} as pat_typ));
+     };
+   pvb_expr = {pexp_desc = Pexp_newtype _} as expr;
+  } -> (
+    let _, parameters, return_expr = ParsetreeViewer.fun_expr expr in
+    let abstract_type =
+      match parameters with
+      | [NewTypes {locs = vars}] ->
+        Doc.concat
+          [
+            Doc.text "type ";
+            Doc.join ~sep:Doc.space
+              (List.map (fun var -> Doc.text var.Asttypes.txt) vars);
+            Doc.dot;
+          ]
+      | _ -> Doc.nil
+    in
+    match return_expr.pexp_desc with
+    | Pexp_constraint (expr, typ) ->
+      Doc.group
+        (Doc.concat
+           [
+             attrs;
+             header;
+             print_pattern ~state pattern cmt_tbl;
+             Doc.text ":";
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.line;
+                    abstract_type;
+                    Doc.space;
+                    print_typ_expr ~state typ cmt_tbl;
+                    Doc.text " =";
+                    Doc.concat
+                      [
+                        Doc.line;
+                        print_expression_with_comments ~state expr cmt_tbl;
+                      ];
+                  ]);
+           ])
+    | _ ->
+      (* Example:
+       * let cancel_and_collect_callbacks:
+       *   'a 'u 'c. (list<packed_callbacks>, promise<'a, 'u, 'c>) => list<packed_callbacks> =         *  (type x, callbacks_accumulator, p: promise<_, _, c>)
+       *)
+      Doc.group
+        (Doc.concat
+           [
+             attrs;
+             header;
+             print_pattern ~state pattern cmt_tbl;
+             Doc.text ":";
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.line;
+                    abstract_type;
+                    Doc.space;
+                    print_typ_expr ~state pat_typ cmt_tbl;
+                    Doc.text " =";
+                    Doc.concat
+                      [
+                        Doc.line;
+                        print_expression_with_comments ~state expr cmt_tbl;
+                      ];
+                  ]);
+           ]))
+  | _ ->
+    let opt_braces, expr = ParsetreeViewer.process_braces_attr vb.pvb_expr in
+    let printed_expr =
+      let doc = print_expression_with_comments ~state vb.pvb_expr cmt_tbl in
+      match Parens.expr vb.pvb_expr with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc expr braces
+      | Nothing -> doc
+    in
+    let pattern_doc = print_pattern ~state vb.pvb_pat cmt_tbl in
+    (*
+     * we want to optimize the layout of one pipe:
+     *   let tbl = data->Js.Array2.reduce((map, curr) => {
+     *     ...
+     *   })
+     * important is that we don't do this for multiple pipes:
+     *   let decoratorTags =
+     *     items
+     *     ->Js.Array2.filter(items => {items.category === Decorators})
+     *     ->Belt.Array.map(...)
+     * Multiple pipes chained together lend themselves more towards the last layout.
+     *)
+    if ParsetreeViewer.is_single_pipe_expr vb.pvb_expr then
+      Doc.custom_layout
+        [
+          Doc.group
+            (Doc.concat
+               [
+                 attrs;
+                 header;
+                 pattern_doc;
+                 Doc.text " =";
+                 Doc.space;
+                 printed_expr;
+               ]);
+          Doc.group
+            (Doc.concat
+               [
+                 attrs;
+                 header;
+                 pattern_doc;
+                 Doc.text " =";
+                 Doc.indent (Doc.concat [Doc.line; printed_expr]);
+               ]);
+        ]
+    else
+      let should_indent =
+        match opt_braces with
+        | Some _ -> false
+        | _ -> (
+          ParsetreeViewer.is_binary_expression expr
+          ||
+          match vb.pvb_expr with
+          | {
+           pexp_attributes = [({Location.txt = "res.ternary"}, _)];
+           pexp_desc = Pexp_ifthenelse (if_expr, _, _);
+          } ->
+            ParsetreeViewer.is_binary_expression if_expr
+            || ParsetreeViewer.has_attributes if_expr.pexp_attributes
+          | {pexp_desc = Pexp_newtype _} -> false
+          | {pexp_attributes = [({Location.txt = "res.taggedTemplate"}, _)]} ->
+            false
+          | {pexp_desc = Pexp_jsx_element _} -> true
+          | e ->
+            ParsetreeViewer.has_attributes e.pexp_attributes
+            || ParsetreeViewer.is_array_access e)
+      in
+      Doc.group
+        (Doc.concat
+           [
+             attrs;
+             header;
+             pattern_doc;
+             Doc.text " =";
+             (if should_indent then
+                Doc.indent (Doc.concat [Doc.line; printed_expr])
+              else Doc.concat [Doc.space; printed_expr]);
+           ])
+
+and print_package_type ~state ~print_module_keyword_and_parens
+    (package_type : Parsetree.package_type) cmt_tbl =
+  let doc =
+    match package_type with
+    | longident_loc, [] ->
+      Doc.group (Doc.concat [print_longident_location longident_loc cmt_tbl])
+    | longident_loc, package_constraints ->
+      Doc.group
+        (Doc.concat
+           [
+             print_longident_location longident_loc cmt_tbl;
+             print_package_constraints ~state package_constraints cmt_tbl;
+             Doc.soft_line;
+           ])
+  in
+  if print_module_keyword_and_parens then
+    Doc.concat [Doc.text "module("; doc; Doc.rparen]
+  else doc
+
+and print_package_constraints ~state package_constraints cmt_tbl =
+  Doc.concat
+    [
+      Doc.text " with";
+      Doc.indent
+        (Doc.concat
+           [
+             Doc.line;
+             Doc.join ~sep:Doc.line
+               (List.mapi
+                  (fun i pc ->
+                    let longident, typexpr = pc in
+                    let cmt_loc =
+                      {
+                        longident.Asttypes.loc with
+                        loc_end = typexpr.Parsetree.ptyp_loc.loc_end;
+                      }
+                    in
+                    let doc = print_package_constraint ~state i cmt_tbl pc in
+                    print_comments doc cmt_tbl cmt_loc)
+                  package_constraints);
+           ]);
+    ]
+
+and print_package_constraint ~state i cmt_tbl (longident_loc, typ) =
+  let prefix = if i == 0 then Doc.text "type " else Doc.text "and type " in
+  Doc.concat
+    [
+      prefix;
+      print_longident_location longident_loc cmt_tbl;
+      Doc.text " = ";
+      print_typ_expr ~state typ cmt_tbl;
+    ]
+
+and print_extension ~state ~at_module_lvl (string_loc, payload) cmt_tbl =
+  let txt = string_loc.Location.txt in
+  let ext_name =
+    let doc =
+      Doc.concat
+        [
+          Doc.text "%";
+          (if at_module_lvl then Doc.text "%" else Doc.nil);
+          Doc.text txt;
+        ]
+    in
+    print_comments doc cmt_tbl string_loc.Location.loc
+  in
+  Doc.group (Doc.concat [ext_name; print_payload ~state payload cmt_tbl])
+
+and print_pattern ~state (p : Parsetree.pattern) cmt_tbl =
+  let pattern_without_attributes =
+    match p.ppat_desc with
+    | Ppat_any -> Doc.text "_"
+    | Ppat_var var -> print_ident_like var.txt
+    | Ppat_constant c ->
+      let template_literal =
+        ParsetreeViewer.has_template_literal_attr p.ppat_attributes
+      in
+      print_constant ~template_literal c
+    | Ppat_tuple patterns ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.lparen;
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    Doc.join
+                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                      (List.map
+                         (fun pat -> print_pattern ~state pat cmt_tbl)
+                         patterns);
+                  ]);
+             Doc.trailing_comma;
+             Doc.soft_line;
+             Doc.rparen;
+           ])
+    | Ppat_array [] ->
+      Doc.concat
+        [Doc.lbracket; print_comments_inside cmt_tbl p.ppat_loc; Doc.rbracket]
+    | Ppat_array patterns ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.text "[";
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    Doc.join
+                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                      (List.map
+                         (fun pat -> print_pattern ~state pat cmt_tbl)
+                         patterns);
+                  ]);
+             Doc.trailing_comma;
+             Doc.soft_line;
+             Doc.text "]";
+           ])
+    | Ppat_construct ({txt = Longident.Lident "()"}, _) ->
+      Doc.concat
+        [Doc.lparen; print_comments_inside cmt_tbl p.ppat_loc; Doc.rparen]
+    | Ppat_construct ({txt = Longident.Lident "[]"}, _) ->
+      Doc.concat
+        [Doc.text "list{"; print_comments_inside cmt_tbl p.ppat_loc; Doc.rbrace]
+    | Ppat_construct ({txt = Longident.Lident "::"}, _) ->
+      let patterns, tail =
+        ParsetreeViewer.collect_patterns_from_list_construct [] p
+      in
+      let should_hug =
+        match (patterns, tail) with
+        | [pat], {ppat_desc = Ppat_construct ({txt = Longident.Lident "[]"}, _)}
+          when ParsetreeViewer.is_huggable_pattern pat ->
+          true
+        | _ -> false
+      in
+      let children =
+        Doc.concat
+          [
+            (if should_hug then Doc.nil else Doc.soft_line);
+            Doc.join
+              ~sep:(Doc.concat [Doc.text ","; Doc.line])
+              (List.map (fun pat -> print_pattern ~state pat cmt_tbl) patterns);
+            (match tail.Parsetree.ppat_desc with
+            | Ppat_construct ({txt = Longident.Lident "[]"}, _) -> Doc.nil
+            | _ ->
+              let doc =
+                Doc.concat [Doc.text "..."; print_pattern ~state tail cmt_tbl]
+              in
+              let tail = print_comments doc cmt_tbl tail.ppat_loc in
+              Doc.concat [Doc.text ","; Doc.line; tail]);
+          ]
+      in
+      Doc.group
+        (Doc.concat
+           [
+             Doc.text "list{";
+             (if should_hug then children
+              else
+                Doc.concat
+                  [
+                    Doc.indent children;
+                    Doc.if_breaks (Doc.text ",") Doc.nil;
+                    Doc.soft_line;
+                  ]);
+             Doc.rbrace;
+           ])
+    | Ppat_construct (constr_name, constructor_args) ->
+      let constr_name = print_longident_location constr_name cmt_tbl in
+      let args_doc =
+        match constructor_args with
+        | None -> Doc.nil
+        | Some
+            {
+              ppat_loc;
+              ppat_desc = Ppat_construct ({txt = Longident.Lident "()"}, _);
+            } ->
+          Doc.concat
+            [Doc.lparen; print_comments_inside cmt_tbl ppat_loc; Doc.rparen]
+        | Some {ppat_desc = Ppat_tuple []; ppat_loc = loc} ->
+          Doc.concat [Doc.lparen; print_comments_inside cmt_tbl loc; Doc.rparen]
+        (* Some((1, 2) *)
+        | Some {ppat_desc = Ppat_tuple [({ppat_desc = Ppat_tuple _} as arg)]} ->
+          Doc.concat [Doc.lparen; print_pattern ~state arg cmt_tbl; Doc.rparen]
+        | Some {ppat_desc = Ppat_tuple patterns} ->
+          Doc.concat
+            [
+              Doc.lparen;
+              Doc.indent
+                (Doc.concat
+                   [
+                     Doc.soft_line;
+                     Doc.join
+                       ~sep:(Doc.concat [Doc.comma; Doc.line])
+                       (List.map
+                          (fun pat -> print_pattern ~state pat cmt_tbl)
+                          patterns);
+                   ]);
+              Doc.trailing_comma;
+              Doc.soft_line;
+              Doc.rparen;
+            ]
+        | Some arg ->
+          let arg_doc = print_pattern ~state arg cmt_tbl in
+          let should_hug = ParsetreeViewer.is_huggable_pattern arg in
+          Doc.concat
+            [
+              Doc.lparen;
+              (if should_hug then arg_doc
+               else
+                 Doc.concat
+                   [
+                     Doc.indent (Doc.concat [Doc.soft_line; arg_doc]);
+                     Doc.trailing_comma;
+                     Doc.soft_line;
+                   ]);
+              Doc.rparen;
+            ]
+      in
+      Doc.group (Doc.concat [constr_name; args_doc])
+    | Ppat_variant (label, None) ->
+      Doc.concat [Doc.text "#"; print_poly_var_ident label]
+    | Ppat_variant (label, variant_args) ->
+      let variant_name =
+        Doc.concat [Doc.text "#"; print_poly_var_ident label]
+      in
+      let args_doc =
+        match variant_args with
+        | None -> Doc.nil
+        | Some {ppat_desc = Ppat_construct ({txt = Longident.Lident "()"}, _)}
+          ->
+          Doc.text "()"
+        | Some {ppat_desc = Ppat_tuple []; ppat_loc = loc} ->
+          Doc.concat [Doc.lparen; print_comments_inside cmt_tbl loc; Doc.rparen]
+        (* Some((1, 2) *)
+        | Some {ppat_desc = Ppat_tuple [({ppat_desc = Ppat_tuple _} as arg)]} ->
+          Doc.concat [Doc.lparen; print_pattern ~state arg cmt_tbl; Doc.rparen]
+        | Some {ppat_desc = Ppat_tuple patterns} ->
+          Doc.concat
+            [
+              Doc.lparen;
+              Doc.indent
+                (Doc.concat
+                   [
+                     Doc.soft_line;
+                     Doc.join
+                       ~sep:(Doc.concat [Doc.comma; Doc.line])
+                       (List.map
+                          (fun pat -> print_pattern ~state pat cmt_tbl)
+                          patterns);
+                   ]);
+              Doc.trailing_comma;
+              Doc.soft_line;
+              Doc.rparen;
+            ]
+        | Some arg ->
+          let arg_doc = print_pattern ~state arg cmt_tbl in
+          let should_hug = ParsetreeViewer.is_huggable_pattern arg in
+          Doc.concat
+            [
+              Doc.lparen;
+              (if should_hug then arg_doc
+               else
+                 Doc.concat
+                   [
+                     Doc.indent (Doc.concat [Doc.soft_line; arg_doc]);
+                     Doc.trailing_comma;
+                     Doc.soft_line;
+                   ]);
+              Doc.rparen;
+            ]
+      in
+      Doc.group (Doc.concat [variant_name; args_doc])
+    | Ppat_type ident
+      when ParsetreeViewer.has_res_pat_variant_spread_attribute
+             p.ppat_attributes ->
+      Doc.concat [Doc.text "..."; print_ident_path ident cmt_tbl]
+    | Ppat_type ident ->
+      Doc.concat [Doc.text "#..."; print_ident_path ident cmt_tbl]
+    | Ppat_record (rows, _)
+      when ParsetreeViewer.has_dict_pattern_attribute p.ppat_attributes ->
+      Doc.concat
+        [
+          Doc.text "dict{";
+          Doc.indent
+            (Doc.concat
+               [
+                 Doc.soft_line;
+                 Doc.join
+                   ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                   (Ext_list.map rows (fun row ->
+                        print_pattern_dict_row ~state row cmt_tbl));
+               ]);
+          Doc.if_breaks (Doc.text ",") Doc.nil;
+          Doc.soft_line;
+          Doc.rbrace;
+        ]
+    | Ppat_record ([], Open) ->
+      Doc.concat [Doc.lbrace; Doc.text "_"; Doc.rbrace]
+    | Ppat_record (rows, open_flag) ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.lbrace;
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    Doc.join
+                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                      (List.map
+                         (fun row ->
+                           print_pattern_record_row ~state row cmt_tbl)
+                         rows);
+                    (match open_flag with
+                    | Open -> Doc.concat [Doc.text ","; Doc.line; Doc.text "_"]
+                    | Closed -> Doc.nil);
+                  ]);
+             Doc.if_breaks (Doc.text ",") Doc.nil;
+             Doc.soft_line;
+             Doc.rbrace;
+           ])
+    | Ppat_exception p ->
+      let needs_parens =
+        match p.ppat_desc with
+        | Ppat_or (_, _) | Ppat_alias (_, _) -> true
+        | _ -> false
+      in
+      let pat =
+        let p = print_pattern ~state p cmt_tbl in
+        if needs_parens then Doc.concat [Doc.text "("; p; Doc.text ")"] else p
+      in
+      Doc.group (Doc.concat [Doc.text "exception"; Doc.line; pat])
+    | Ppat_or _ ->
+      (* Blue | Red | Green -> [Blue; Red; Green] *)
+      let or_chain = ParsetreeViewer.collect_or_pattern_chain p in
+      let docs =
+        List.mapi
+          (fun i pat ->
+            let pattern_doc = print_pattern ~state pat cmt_tbl in
+            Doc.concat
+              [
+                (if i == 0 then Doc.nil else Doc.concat [Doc.line; Doc.text "| "]);
+                (match pat.ppat_desc with
+                (* (Blue | Red) | (Green | Black) | White *)
+                | Ppat_or _ -> add_parens pattern_doc
+                | _ -> pattern_doc);
+              ])
+          or_chain
+      in
+      let is_spread_over_multiple_lines =
+        match (or_chain, List.rev or_chain) with
+        | first :: _, last :: _ ->
+          first.ppat_loc.loc_start.pos_lnum < last.ppat_loc.loc_end.pos_lnum
+        | _ -> false
+      in
+      Doc.breakable_group ~force_break:is_spread_over_multiple_lines
+        (Doc.concat docs)
+    | Ppat_extension ext ->
+      print_extension ~state ~at_module_lvl:false ext cmt_tbl
+    | Ppat_alias (p, alias_loc) ->
+      let needs_parens =
+        match p.ppat_desc with
+        | Ppat_or (_, _) | Ppat_alias (_, _) -> true
+        | _ -> false
+      in
+      let rendered_pattern =
+        let p = print_pattern ~state p cmt_tbl in
+        if needs_parens then Doc.concat [Doc.text "("; p; Doc.text ")"] else p
+      in
+      Doc.concat
+        [rendered_pattern; Doc.text " as "; print_string_loc alias_loc cmt_tbl]
+    (* Note: module(P : S) is represented as *)
+    (* Ppat_constraint(Ppat_unpack, Ptyp_package) *)
+    | Ppat_constraint
+        ( {ppat_desc = Ppat_unpack string_loc},
+          {ptyp_desc = Ptyp_package package_type; ptyp_loc} ) ->
+      Doc.concat
+        [
+          Doc.text "module(";
+          print_comments (Doc.text string_loc.txt) cmt_tbl string_loc.loc;
+          Doc.text ": ";
+          print_comments
+            (print_package_type ~state ~print_module_keyword_and_parens:false
+               package_type cmt_tbl)
+            cmt_tbl ptyp_loc;
+          Doc.rparen;
+        ]
+    | Ppat_constraint (pattern, typ) ->
+      Doc.concat
+        [
+          print_pattern ~state pattern cmt_tbl;
+          Doc.text ": ";
+          print_typ_expr ~state typ cmt_tbl;
+        ]
+    (* Note: module(P : S) is represented as *)
+    (* Ppat_constraint(Ppat_unpack, Ptyp_package) *)
+    | Ppat_unpack string_loc ->
+      Doc.concat
+        [
+          Doc.text "module(";
+          print_comments (Doc.text string_loc.txt) cmt_tbl string_loc.loc;
+          Doc.rparen;
+        ]
+    | Ppat_interval (a, b) ->
+      Doc.concat [print_constant a; Doc.text " .. "; print_constant b]
+    | Ppat_open _ -> Doc.nil
+  in
+  let doc =
+    match p.ppat_attributes with
+    | [] -> pattern_without_attributes
+    | attrs ->
+      Doc.group
+        (Doc.concat
+           [print_attributes ~state attrs cmt_tbl; pattern_without_attributes])
+  in
+  print_comments doc cmt_tbl p.ppat_loc
+
+and print_pattern_record_row ~state row cmt_tbl =
+  match row with
+  (* punned {x}*)
+  | {
+   lid = {Location.txt = Longident.Lident ident} as longident;
+   x = {Parsetree.ppat_desc = Ppat_var {txt; _}; ppat_attributes};
+   opt;
+  }
+    when ident = txt ->
+    Doc.concat
+      [
+        (if opt then Doc.text "?" else Doc.nil);
+        print_attributes ~state ppat_attributes cmt_tbl;
+        print_lident_path longident cmt_tbl;
+      ]
+  | {lid = longident; x = pattern; opt} ->
+    let loc_for_comments =
+      {longident.loc with loc_end = pattern.Parsetree.ppat_loc.loc_end}
+    in
+    let rhs_doc =
+      let doc = print_pattern ~state pattern cmt_tbl in
+      let doc =
+        if Parens.pattern_record_row_rhs pattern then add_parens doc else doc
+      in
+      if opt then Doc.concat [Doc.text "?"; doc] else doc
+    in
+    let doc =
+      Doc.group
+        (Doc.concat
+           [
+             print_lident_path longident cmt_tbl;
+             Doc.text ":";
+             (if ParsetreeViewer.is_huggable_pattern pattern then
+                Doc.concat [Doc.space; rhs_doc]
+              else Doc.indent (Doc.concat [Doc.line; rhs_doc]));
+           ])
+    in
+    print_comments doc cmt_tbl loc_for_comments
+
+and print_pattern_dict_row ~state
+    ({lid = longident; x = pattern; opt} :
+      Parsetree.pattern Parsetree.record_element) cmt_tbl =
+  let loc_for_comments =
+    {longident.loc with loc_end = pattern.ppat_loc.loc_end}
+  in
+  let rhs_doc =
+    let doc = print_pattern ~state pattern cmt_tbl in
+    let doc =
+      if Parens.pattern_record_row_rhs pattern then add_parens doc else doc
+    in
+    if opt then Doc.concat [Doc.text "?"; doc] else doc
+  in
+  let lbl_doc =
+    Doc.concat [Doc.text "\""; print_longident longident.txt; Doc.text "\""]
+  in
+  let doc =
+    Doc.group
+      (Doc.concat
+         [
+           lbl_doc;
+           Doc.text ":";
+           (if ParsetreeViewer.is_huggable_pattern pattern then
+              Doc.concat [Doc.space; rhs_doc]
+            else Doc.indent (Doc.concat [Doc.line; rhs_doc]));
+         ])
+  in
+  print_comments doc cmt_tbl loc_for_comments
+
+and print_expression_with_comments ~state expr cmt_tbl : Doc.t =
+  let doc = print_expression ~state expr cmt_tbl in
+  print_comments doc cmt_tbl expr.Parsetree.pexp_loc
+
+and print_if_chain ~state pexp_attributes ifs else_expr cmt_tbl =
+  let if_docs =
+    Doc.join ~sep:Doc.space
+      (List.mapi
+         (fun i (outer_loc, if_expr, then_expr) ->
+           let if_txt = if i > 0 then Doc.text "else if " else Doc.text "if " in
+           let doc =
+             match if_expr with
+             | ParsetreeViewer.If if_expr ->
+               let condition =
+                 if ParsetreeViewer.is_block_expr if_expr then
+                   print_expression_block ~state ~braces:true if_expr cmt_tbl
+                 else
+                   let doc =
+                     print_expression_with_comments ~state if_expr cmt_tbl
+                   in
+                   match Parens.expr if_expr with
+                   | Parens.Parenthesized -> add_parens doc
+                   | Braced braces -> print_braces doc if_expr braces
+                   | Nothing -> Doc.if_breaks (add_parens doc) doc
+               in
+               Doc.concat
+                 [
+                   if_txt;
+                   Doc.group condition;
+                   Doc.space;
+                   (let then_expr =
+                      match ParsetreeViewer.process_braces_attr then_expr with
+                      (* This case only happens when coming from Reason, we strip braces *)
+                      | Some _, expr -> expr
+                      | _ -> then_expr
+                    in
+                    print_expression_block ~state ~braces:true then_expr cmt_tbl);
+                 ]
+             | IfLet (pattern, condition_expr) ->
+               let condition_doc =
+                 let doc =
+                   print_expression_with_comments ~state condition_expr cmt_tbl
+                 in
+                 match Parens.expr condition_expr with
+                 | Parens.Parenthesized -> add_parens doc
+                 | Braced braces -> print_braces doc condition_expr braces
+                 | Nothing -> doc
+               in
+               Doc.concat
+                 [
+                   if_txt;
+                   Doc.text "let ";
+                   print_pattern ~state pattern cmt_tbl;
+                   Doc.text " = ";
+                   condition_doc;
+                   Doc.space;
+                   print_expression_block ~state ~braces:true then_expr cmt_tbl;
+                 ]
+           in
+           print_leading_comments doc cmt_tbl.leading outer_loc)
+         ifs)
+  in
+  let else_doc =
+    match else_expr with
+    | None -> Doc.nil
+    | Some expr ->
+      Doc.concat
+        [
+          Doc.text " else ";
+          print_expression_block ~state ~braces:true expr cmt_tbl;
+        ]
+  in
+  let attrs = ParsetreeViewer.filter_fragile_match_attributes pexp_attributes in
+  Doc.concat [print_attributes ~state attrs cmt_tbl; if_docs; else_doc]
+
+and print_expression ~state (e : Parsetree.expression) cmt_tbl =
+  let print_arrow e =
+    let async, parameters, return_expr = ParsetreeViewer.fun_expr e in
+    let attrs_on_arrow = e.pexp_attributes in
+    let return_expr, typ_constraint =
+      match return_expr.pexp_desc with
+      | Pexp_constraint (expr, typ) ->
+        ( {
+            expr with
+            pexp_attributes =
+              List.concat [expr.pexp_attributes; return_expr.pexp_attributes];
+          },
+          Some typ )
+      | _ -> (return_expr, None)
+    in
+    let has_constraint =
+      match typ_constraint with
+      | Some _ -> true
+      | None -> false
+    in
+    let parameters_doc =
+      print_expr_fun_parameters ~state ~in_callback:NoCallback ~async
+        ~has_constraint parameters cmt_tbl
+    in
+    let return_expr_doc =
+      let opt_braces, _ = ParsetreeViewer.process_braces_attr return_expr in
+      let should_inline =
+        match (return_expr.pexp_desc, opt_braces) with
+        | _, Some _ -> true
+        | ( ( Pexp_array _ | Pexp_tuple _
+            | Pexp_construct (_, Some _)
+            | Pexp_record _ ),
+            _ ) ->
+          true
+        | _ -> false
+      in
+      let should_indent =
+        match return_expr.pexp_desc with
+        | Pexp_sequence _ | Pexp_let _ | Pexp_letmodule _ | Pexp_letexception _
+        | Pexp_open _
+        | Pexp_jsx_element (Jsx_fragment _) ->
+          false
+        | _ -> true
+      in
+      let return_doc =
+        let doc = print_expression_with_comments ~state return_expr cmt_tbl in
+        match Parens.expr return_expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc return_expr braces
+        | Nothing -> doc
+      in
+      if should_inline then Doc.concat [Doc.space; return_doc]
+      else
+        Doc.group
+          (if should_indent then Doc.indent (Doc.concat [Doc.line; return_doc])
+           else Doc.concat [Doc.space; return_doc])
+    in
+    let typ_constraint_doc =
+      match typ_constraint with
+      | Some typ ->
+        let typ_doc =
+          let doc = print_typ_expr ~state typ cmt_tbl in
+          if Parens.arrow_return_typ_expr typ then add_parens doc else doc
+        in
+        Doc.concat [Doc.text ": "; typ_doc]
+      | _ -> Doc.nil
+    in
+    let attrs = print_attributes ~state attrs_on_arrow cmt_tbl in
+    Doc.group
+      (Doc.concat
+         [
+           attrs;
+           parameters_doc;
+           typ_constraint_doc;
+           Doc.text " =>";
+           return_expr_doc;
+         ])
+  in
+  let printed_expression =
+    match e.pexp_desc with
+    | Pexp_fun
+        {
+          arg_label = Nolabel;
+          default = None;
+          lhs = {ppat_desc = Ppat_var {txt = "__x"}};
+          rhs = {pexp_desc = Pexp_apply _};
+        } ->
+      (* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
+      print_expression_with_comments ~state
+        (ParsetreeViewer.rewrite_underscore_apply e)
+        cmt_tbl
+    | Pexp_fun _ | Pexp_newtype _ -> print_arrow e
+    | Parsetree.Pexp_constant c ->
+      print_constant ~template_literal:(ParsetreeViewer.is_template_literal e) c
+    | Pexp_jsx_element
+        (Jsx_fragment
+           {
+             jsx_fragment_opening = o;
+             jsx_fragment_children = children;
+             jsx_fragment_closing = c;
+           }) ->
+      print_jsx_fragment ~state o children c e.pexp_loc cmt_tbl
+    | Pexp_jsx_element
+        (Jsx_unary_element
+           {
+             jsx_unary_element_tag_name = tag_name;
+             jsx_unary_element_props = props;
+           }) ->
+      print_jsx_unary_tag ~state tag_name props e.pexp_loc cmt_tbl
+    | Pexp_jsx_element
+        (Jsx_container_element
+           {
+             jsx_container_element_tag_name_start = tag_name;
+             jsx_container_element_opening_tag_end = opening_greater_than;
+             jsx_container_element_props = props;
+             jsx_container_element_children = children;
+             jsx_container_element_closing_tag = closing_tag;
+           }) ->
+      print_jsx_container_tag ~state tag_name opening_greater_than props
+        children closing_tag e.pexp_loc cmt_tbl
+    | Pexp_construct ({txt = Longident.Lident "()"}, _) -> Doc.text "()"
+    | Pexp_construct ({txt = Longident.Lident "[]"}, _) ->
+      Doc.concat
+        [Doc.text "list{"; print_comments_inside cmt_tbl e.pexp_loc; Doc.rbrace]
+    | Pexp_construct ({txt = Longident.Lident "::"}, _) ->
+      let expressions, spread = ParsetreeViewer.collect_list_expressions e in
+      let spread_doc =
+        match spread with
+        | Some expr ->
+          Doc.concat
+            [
+              Doc.text ",";
+              Doc.line;
+              Doc.dotdotdot;
+              (let doc = print_expression_with_comments ~state expr cmt_tbl in
+               match Parens.expr expr with
+               | Parens.Parenthesized -> add_parens doc
+               | Braced braces -> print_braces doc expr braces
+               | Nothing -> doc);
+            ]
+        | None -> Doc.nil
+      in
+      Doc.group
+        (Doc.concat
+           [
+             Doc.text "list{";
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    Doc.join
+                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                      (List.map
+                         (fun expr ->
+                           let doc =
+                             print_expression_with_comments ~state expr cmt_tbl
+                           in
+                           match Parens.expr expr with
+                           | Parens.Parenthesized -> add_parens doc
+                           | Braced braces -> print_braces doc expr braces
+                           | Nothing -> doc)
+                         expressions);
+                    spread_doc;
+                  ]);
+             Doc.trailing_comma;
+             Doc.soft_line;
+             Doc.rbrace;
+           ])
+    | Pexp_construct (longident_loc, args) ->
+      let constr = print_longident_location longident_loc cmt_tbl in
+      let args =
+        match args with
+        | None -> Doc.nil
+        | Some {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)}
+          ->
+          Doc.text "()"
+        (* Some((1, 2)) *)
+        | Some {pexp_desc = Pexp_tuple [({pexp_desc = Pexp_tuple _} as arg)]} ->
+          Doc.concat
+            [
+              Doc.lparen;
+              (let doc = print_expression_with_comments ~state arg cmt_tbl in
+               match Parens.expr arg with
+               | Parens.Parenthesized -> add_parens doc
+               | Braced braces -> print_braces doc arg braces
+               | Nothing -> doc);
+              Doc.rparen;
+            ]
+        | Some {pexp_desc = Pexp_tuple args} ->
+          Doc.concat
+            [
+              Doc.lparen;
+              Doc.indent
+                (Doc.concat
+                   [
+                     Doc.soft_line;
+                     Doc.join
+                       ~sep:(Doc.concat [Doc.comma; Doc.line])
+                       (List.map
+                          (fun expr ->
+                            let doc =
+                              print_expression_with_comments ~state expr cmt_tbl
+                            in
+                            match Parens.expr expr with
+                            | Parens.Parenthesized -> add_parens doc
+                            | Braced braces -> print_braces doc expr braces
+                            | Nothing -> doc)
+                          args);
+                   ]);
+              Doc.trailing_comma;
+              Doc.soft_line;
+              Doc.rparen;
+            ]
+        | Some arg ->
+          let arg_doc =
+            let doc = print_expression_with_comments ~state arg cmt_tbl in
+            match Parens.expr arg with
+            | Parens.Parenthesized -> add_parens doc
+            | Braced braces -> print_braces doc arg braces
+            | Nothing -> doc
+          in
+          let should_hug = ParsetreeViewer.is_huggable_expression arg in
+          Doc.concat
+            [
+              Doc.lparen;
+              (if should_hug then arg_doc
+               else
+                 Doc.concat
+                   [
+                     Doc.indent (Doc.concat [Doc.soft_line; arg_doc]);
+                     Doc.trailing_comma;
+                     Doc.soft_line;
+                   ]);
+              Doc.rparen;
+            ]
+      in
+      Doc.group (Doc.concat [constr; args])
+    | Pexp_ident path -> print_lident_path path cmt_tbl
+    | Pexp_tuple exprs ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.lparen;
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    Doc.join
+                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                      (List.map
+                         (fun expr ->
+                           let doc =
+                             print_expression_with_comments ~state expr cmt_tbl
+                           in
+                           match Parens.expr expr with
+                           | Parens.Parenthesized -> add_parens doc
+                           | Braced braces -> print_braces doc expr braces
+                           | Nothing -> doc)
+                         exprs);
+                  ]);
+             Doc.if_breaks (Doc.text ",") Doc.nil;
+             Doc.soft_line;
+             Doc.rparen;
+           ])
+    | Pexp_array [] ->
+      Doc.concat
+        [Doc.lbracket; print_comments_inside cmt_tbl e.pexp_loc; Doc.rbracket]
+    | Pexp_array exprs ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.lbracket;
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    Doc.join
+                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                      (List.map
+                         (fun expr ->
+                           let doc =
+                             print_expression_with_comments ~state expr cmt_tbl
+                           in
+                           match Parens.expr expr with
+                           | Parens.Parenthesized -> add_parens doc
+                           | Braced braces -> print_braces doc expr braces
+                           | Nothing -> doc)
+                         exprs);
+                  ]);
+             Doc.trailing_comma;
+             Doc.soft_line;
+             Doc.rbracket;
+           ])
+    | Pexp_variant (label, args) ->
+      let variant_name =
+        Doc.concat [Doc.text "#"; print_poly_var_ident label]
+      in
+      let args =
+        match args with
+        | None -> Doc.nil
+        | Some {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)}
+          ->
+          Doc.text "()"
+        (* #poly((1, 2) *)
+        | Some {pexp_desc = Pexp_tuple [({pexp_desc = Pexp_tuple _} as arg)]} ->
+          Doc.concat
+            [
+              Doc.lparen;
+              (let doc = print_expression_with_comments ~state arg cmt_tbl in
+               match Parens.expr arg with
+               | Parens.Parenthesized -> add_parens doc
+               | Braced braces -> print_braces doc arg braces
+               | Nothing -> doc);
+              Doc.rparen;
+            ]
+        | Some {pexp_desc = Pexp_tuple args} ->
+          Doc.concat
+            [
+              Doc.lparen;
+              Doc.indent
+                (Doc.concat
+                   [
+                     Doc.soft_line;
+                     Doc.join
+                       ~sep:(Doc.concat [Doc.comma; Doc.line])
+                       (List.map
+                          (fun expr ->
+                            let doc =
+                              print_expression_with_comments ~state expr cmt_tbl
+                            in
+                            match Parens.expr expr with
+                            | Parens.Parenthesized -> add_parens doc
+                            | Braced braces -> print_braces doc expr braces
+                            | Nothing -> doc)
+                          args);
+                   ]);
+              Doc.trailing_comma;
+              Doc.soft_line;
+              Doc.rparen;
+            ]
+        | Some arg ->
+          let arg_doc =
+            let doc = print_expression_with_comments ~state arg cmt_tbl in
+            match Parens.expr arg with
+            | Parens.Parenthesized -> add_parens doc
+            | Braced braces -> print_braces doc arg braces
+            | Nothing -> doc
+          in
+          let should_hug = ParsetreeViewer.is_huggable_expression arg in
+          Doc.concat
+            [
+              Doc.lparen;
+              (if should_hug then arg_doc
+               else
+                 Doc.concat
+                   [
+                     Doc.indent (Doc.concat [Doc.soft_line; arg_doc]);
+                     Doc.trailing_comma;
+                     Doc.soft_line;
+                   ]);
+              Doc.rparen;
+            ]
+      in
+      Doc.group (Doc.concat [variant_name; args])
+    | Pexp_record (rows, spread_expr) ->
+      if rows = [] then
+        Doc.concat
+          [Doc.lbrace; print_comments_inside cmt_tbl e.pexp_loc; Doc.rbrace]
+      else
+        let spread =
+          match spread_expr with
+          | None -> Doc.nil
+          | Some ({pexp_desc} as expr) ->
+            let doc =
+              match pexp_desc with
+              | Pexp_ident {txt = expr} -> print_lident expr
+              | _ -> print_expression ~state expr cmt_tbl
+            in
+            let doc_with_spread =
+              Doc.concat
+                [
+                  Doc.dotdotdot;
+                  (match Parens.expr expr with
+                  | Parens.Parenthesized -> add_parens doc
+                  | Braced braces -> print_braces doc expr braces
+                  | Nothing -> doc);
+                ]
+            in
+            Doc.concat
+              [
+                print_comments doc_with_spread cmt_tbl expr.Parsetree.pexp_loc;
+                Doc.comma;
+                Doc.line;
+              ]
+        in
+        (* If the record is written over multiple lines, break automatically
+         * `let x = {a: 1, b: 3}` -> same line, break when line-width exceeded
+         * `let x = {
+         *   a: 1,
+         *   b: 2,
+         *  }` -> record is written on multiple lines, break the group *)
+        let force_break =
+          match (spread_expr, rows) with
+          | Some expr, _ ->
+            (* If there's a spread, compare with spread expression's location *)
+            e.pexp_loc.loc_start.pos_lnum < expr.pexp_loc.loc_start.pos_lnum
+          | None, first_row :: _ ->
+            (* Otherwise, compare with the first row's location *)
+            e.pexp_loc.loc_start.pos_lnum < first_row.lid.loc.loc_start.pos_lnum
+          | None, [] -> false
+        in
+        let punning_allowed =
+          match (spread_expr, rows) with
+          | None, [_] -> false (* disallow punning for single-element records *)
+          | _ -> true
+        in
+        Doc.breakable_group ~force_break
+          (Doc.concat
+             [
+               Doc.lbrace;
+               Doc.indent
+                 (Doc.concat
+                    [
+                      Doc.soft_line;
+                      spread;
+                      Doc.join
+                        ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                        (List.map
+                           (fun row ->
+                             print_expression_record_row ~state row cmt_tbl
+                               punning_allowed)
+                           rows);
+                    ]);
+               Doc.trailing_comma;
+               Doc.soft_line;
+               Doc.rbrace;
+             ])
+    | Pexp_extension extension -> (
+      match extension with
+      | ( {txt = "obj"},
+          PStr
+            [
+              {
+                pstr_loc = loc;
+                pstr_desc = Pstr_eval ({pexp_desc = Pexp_record (rows, _)}, []);
+              };
+            ] ) ->
+        (* If the object is written over multiple lines, break automatically
+         * `let x = {"a": 1, "b": 3}` -> same line, break when line-width exceeded
+         * `let x = {
+         *   "a": 1,
+         *   "b": 2,
+         *  }` -> object is written on multiple lines, break the group *)
+        let force_break = loc.loc_start.pos_lnum < loc.loc_end.pos_lnum in
+        Doc.breakable_group ~force_break
+          (Doc.concat
+             [
+               Doc.lbrace;
+               Doc.indent
+                 (Doc.concat
+                    [
+                      Doc.soft_line;
+                      Doc.join
+                        ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                        (Ext_list.map rows (fun {lid; x = e} ->
+                             print_bs_object_row ~state (lid, e) cmt_tbl));
+                    ]);
+               Doc.trailing_comma;
+               Doc.soft_line;
+               Doc.rbrace;
+             ])
+      | ( {txt = "re"},
+          PStr
+            [
+              {
+                pstr_desc =
+                  Pstr_eval
+                    ({pexp_desc = Pexp_constant (Pconst_string (expr, _))}, []);
+              };
+            ] ) ->
+        Doc.text expr
+      | extension ->
+        print_extension ~state ~at_module_lvl:false extension cmt_tbl)
+    | Pexp_apply
+        {funct = e; args = [(Nolabel, {pexp_desc = Pexp_array sub_lists})]}
+      when ParsetreeViewer.is_spread_belt_array_concat e ->
+      print_belt_array_concat_apply ~state sub_lists cmt_tbl
+    | Pexp_apply
+        {funct = e; args = [(Nolabel, {pexp_desc = Pexp_array sub_lists})]}
+      when ParsetreeViewer.is_spread_belt_list_concat e ->
+      print_belt_list_concat_apply ~state sub_lists cmt_tbl
+    | Pexp_apply {funct = call_expr; args} ->
+      if ParsetreeViewer.is_unary_expression e then
+        print_unary_expression ~state e cmt_tbl
+      else if ParsetreeViewer.is_template_literal e then
+        print_template_literal ~state e cmt_tbl
+      else if ParsetreeViewer.is_tagged_template_literal e then
+        print_tagged_template_literal ~state call_expr args cmt_tbl
+      else if ParsetreeViewer.is_binary_expression e then
+        print_binary_expression ~state e cmt_tbl
+      else print_pexp_apply ~state e cmt_tbl
+    | Pexp_field (expr, longident_loc) ->
+      let lhs =
+        let doc = print_expression_with_comments ~state expr cmt_tbl in
+        match Parens.field_expr expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc expr braces
+        | Nothing -> doc
+      in
+      Doc.concat [lhs; Doc.dot; print_lident_path longident_loc cmt_tbl]
+    | Pexp_setfield (expr1, longident_loc, expr2) ->
+      print_set_field_expr ~state e.pexp_attributes expr1 longident_loc expr2
+        e.pexp_loc cmt_tbl
+    | Pexp_ifthenelse (_ifExpr, _thenExpr, _elseExpr)
+      when ParsetreeViewer.is_ternary_expr e ->
+      let parts, alternate = ParsetreeViewer.collect_ternary_parts e in
+      let ternary_doc =
+        match parts with
+        | (condition1, consequent1) :: rest ->
+          Doc.group
+            (Doc.concat
+               [
+                 print_ternary_operand ~state condition1 cmt_tbl;
+                 Doc.indent
+                   (Doc.concat
+                      [
+                        Doc.line;
+                        Doc.indent
+                          (Doc.concat
+                             [
+                               Doc.text "? ";
+                               print_ternary_operand ~state consequent1 cmt_tbl;
+                             ]);
+                        Doc.concat
+                          (List.map
+                             (fun (condition, consequent) ->
+                               Doc.concat
+                                 [
+                                   Doc.line;
+                                   Doc.text ": ";
+                                   print_ternary_operand ~state condition
+                                     cmt_tbl;
+                                   Doc.line;
+                                   Doc.text "? ";
+                                   print_ternary_operand ~state consequent
+                                     cmt_tbl;
+                                 ])
+                             rest);
+                        Doc.line;
+                        Doc.text ": ";
+                        Doc.indent
+                          (print_ternary_operand ~state alternate cmt_tbl);
+                      ]);
+               ])
+        | _ -> Doc.nil
+      in
+      let attrs = ParsetreeViewer.filter_ternary_attributes e.pexp_attributes in
+      let needs_parens =
+        match ParsetreeViewer.filter_parsing_attrs attrs with
+        | [] -> false
+        | _ -> true
+      in
+      Doc.concat
+        [
+          print_attributes ~state attrs cmt_tbl;
+          (if needs_parens then add_parens ternary_doc else ternary_doc);
+        ]
+    | Pexp_ifthenelse (_ifExpr, _thenExpr, _elseExpr) ->
+      let ifs, else_expr = ParsetreeViewer.collect_if_expressions e in
+      print_if_chain ~state e.pexp_attributes ifs else_expr cmt_tbl
+    | Pexp_while (expr1, expr2) ->
+      let condition =
+        let doc = print_expression_with_comments ~state expr1 cmt_tbl in
+        match Parens.expr expr1 with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc expr1 braces
+        | Nothing -> doc
+      in
+      Doc.breakable_group ~force_break:true
+        (Doc.concat
+           [
+             Doc.text "while ";
+             (if ParsetreeViewer.is_block_expr expr1 then condition
+              else Doc.group (Doc.if_breaks (add_parens condition) condition));
+             Doc.space;
+             print_expression_block ~state ~braces:true expr2 cmt_tbl;
+           ])
+    | Pexp_for (pattern, from_expr, to_expr, direction_flag, body) ->
+      Doc.breakable_group ~force_break:true
+        (Doc.concat
+           [
+             Doc.text "for ";
+             print_pattern ~state pattern cmt_tbl;
+             Doc.text " in ";
+             (let doc =
+                print_expression_with_comments ~state from_expr cmt_tbl
+              in
+              match Parens.expr from_expr with
+              | Parens.Parenthesized -> add_parens doc
+              | Braced braces -> print_braces doc from_expr braces
+              | Nothing -> doc);
+             print_direction_flag direction_flag;
+             (let doc = print_expression_with_comments ~state to_expr cmt_tbl in
+              match Parens.expr to_expr with
+              | Parens.Parenthesized -> add_parens doc
+              | Braced braces -> print_braces doc to_expr braces
+              | Nothing -> doc);
+             Doc.space;
+             print_expression_block ~state ~braces:true body cmt_tbl;
+           ])
+    | Pexp_constraint
+        ( {pexp_desc = Pexp_pack mod_expr},
+          {ptyp_desc = Ptyp_package package_type; ptyp_loc} ) ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.text "module(";
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    print_mod_expr ~state mod_expr cmt_tbl;
+                    Doc.text ": ";
+                    print_comments
+                      (print_package_type ~state
+                         ~print_module_keyword_and_parens:false package_type
+                         cmt_tbl)
+                      cmt_tbl ptyp_loc;
+                  ]);
+             Doc.soft_line;
+             Doc.rparen;
+           ])
+    | Pexp_constraint (expr, typ) ->
+      let expr_doc =
+        let doc = print_expression_with_comments ~state expr cmt_tbl in
+        match Parens.expr expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc expr braces
+        | Nothing -> doc
+      in
+      Doc.concat [expr_doc; Doc.text ": "; print_typ_expr ~state typ cmt_tbl]
+    | Pexp_letmodule ({txt = _modName}, _modExpr, _expr) ->
+      print_expression_block ~state ~braces:true e cmt_tbl
+    | Pexp_letexception (_extensionConstructor, _expr) ->
+      print_expression_block ~state ~braces:true e cmt_tbl
+    | Pexp_assert expr ->
+      let expr = print_expression_with_comments ~state expr cmt_tbl in
+      Doc.concat [Doc.text "assert("; expr; Doc.text ")"]
+    | Pexp_open (_overrideFlag, _longidentLoc, _expr) ->
+      print_expression_block ~state ~braces:true e cmt_tbl
+    | Pexp_pack mod_expr ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.text "module(";
+             Doc.indent
+               (Doc.concat
+                  [Doc.soft_line; print_mod_expr ~state mod_expr cmt_tbl]);
+             Doc.soft_line;
+             Doc.rparen;
+           ])
+    | Pexp_sequence _ -> print_expression_block ~state ~braces:true e cmt_tbl
+    | Pexp_let _ -> print_expression_block ~state ~braces:true e cmt_tbl
+    | Pexp_try (expr, cases) ->
+      let expr_doc =
+        let doc = print_expression_with_comments ~state expr cmt_tbl in
+        match Parens.expr expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc expr braces
+        | Nothing -> doc
+      in
+      Doc.concat
+        [
+          Doc.text "try ";
+          expr_doc;
+          Doc.text " catch ";
+          print_cases ~state cases cmt_tbl;
+        ]
+    | Pexp_match (_, [_; _]) when ParsetreeViewer.is_if_let_expr e ->
+      let ifs, else_expr = ParsetreeViewer.collect_if_expressions e in
+      print_if_chain ~state e.pexp_attributes ifs else_expr cmt_tbl
+    | Pexp_match (expr, cases) ->
+      let expr_doc =
+        let doc = print_expression_with_comments ~state expr cmt_tbl in
+        match Parens.expr expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc expr braces
+        | Nothing -> doc
+      in
+      Doc.concat
+        [
+          Doc.text "switch ";
+          expr_doc;
+          Doc.space;
+          print_cases ~state cases cmt_tbl;
+        ]
+    | Pexp_coerce (expr, (), typ) ->
+      let doc_expr = print_expression_with_comments ~state expr cmt_tbl in
+      let doc_typ = print_typ_expr ~state typ cmt_tbl in
+      Doc.concat [Doc.lparen; doc_expr; Doc.text " :> "; doc_typ; Doc.rparen]
+    | Pexp_send (parent_expr, label) ->
+      let parent_doc =
+        let doc = print_expression_with_comments ~state parent_expr cmt_tbl in
+        match Parens.unary_expr_operand parent_expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc parent_expr braces
+        | Nothing -> doc
+      in
+      let member =
+        let member_doc =
+          print_comments (Doc.text label.txt) cmt_tbl label.loc
+        in
+        Doc.concat [Doc.text "\""; member_doc; Doc.text "\""]
+      in
+      Doc.group (Doc.concat [parent_doc; Doc.lbracket; member; Doc.rbracket])
+    | Pexp_await e ->
+      let printed_expression =
+        print_expression_with_comments ~state e cmt_tbl
+      in
+      let rhs =
+        match
+          Parens.assert_or_await_expr_rhs ~in_await:true
+            {
+              e with
+              pexp_attributes =
+                List.filter
+                  (function
+                    | {Location.txt = "res.braces" | "ns.braces"}, _ -> false
+                    | _ -> true)
+                  e.pexp_attributes;
+            }
+        with
+        | Parens.Parenthesized -> add_parens printed_expression
+        | Braced braces -> print_braces printed_expression e braces
+        | Nothing -> printed_expression
+      in
+      Doc.concat [Doc.text "await "; rhs]
+  in
+  let should_print_its_own_attributes =
+    match e.pexp_desc with
+    | Pexp_apply _ | Pexp_fun _ | Pexp_newtype _ | Pexp_setfield _
+    | Pexp_ifthenelse _ ->
+      true
+    | Pexp_match _ when ParsetreeViewer.is_if_let_expr e -> true
+    | Pexp_jsx_element _ -> true
+    | _ -> false
+  in
+  match e.pexp_attributes with
+  | [] -> printed_expression
+  | attrs when not should_print_its_own_attributes ->
+    Doc.group
+      (Doc.concat [print_attributes ~state attrs cmt_tbl; printed_expression])
+  | _ -> printed_expression
+
+and print_pexp_fun ~state ~in_callback e cmt_tbl =
+  let async, parameters, return_expr = ParsetreeViewer.fun_expr e in
+  let attrs_on_arrow = e.pexp_attributes in
+  let return_expr, typ_constraint =
+    match return_expr.pexp_desc with
+    | Pexp_constraint (expr, typ) ->
+      ( {
+          expr with
+          pexp_attributes =
+            List.concat [expr.pexp_attributes; return_expr.pexp_attributes];
+        },
+        Some typ )
+    | _ -> (return_expr, None)
+  in
+  let parameters_doc =
+    print_expr_fun_parameters ~state ~in_callback ~async
+      ~has_constraint:
+        (match typ_constraint with
+        | Some _ -> true
+        | None -> false)
+      parameters cmt_tbl
+  in
+  let return_should_indent =
+    match return_expr.pexp_desc with
+    | Pexp_sequence _ | Pexp_let _ | Pexp_letmodule _ | Pexp_letexception _
+    | Pexp_open _ ->
+      false
+    | _ -> true
+  in
+  let return_expr_doc =
+    let opt_braces, _ = ParsetreeViewer.process_braces_attr return_expr in
+    let should_inline =
+      match (return_expr.pexp_desc, opt_braces) with
+      | _, Some _ -> true
+      | ( ( Pexp_array _ | Pexp_tuple _
+          | Pexp_construct (_, Some _)
+          | Pexp_record _ ),
+          _ ) ->
+        true
+      | _ -> false
+    in
+    let return_doc =
+      let doc = print_expression_with_comments ~state return_expr cmt_tbl in
+      match Parens.expr return_expr with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc return_expr braces
+      | Nothing -> doc
+    in
+    if should_inline then Doc.concat [Doc.space; return_doc]
+    else
+      Doc.group
+        (if return_should_indent then
+           Doc.concat
+             [
+               Doc.indent (Doc.concat [Doc.line; return_doc]);
+               (match in_callback with
+               | FitsOnOneLine | ArgumentsFitOnOneLine -> Doc.soft_line
+               | _ -> Doc.nil);
+             ]
+         else Doc.concat [Doc.space; return_doc])
+  in
+  let typ_constraint_doc =
+    match typ_constraint with
+    | Some typ -> Doc.concat [Doc.text ": "; print_typ_expr ~state typ cmt_tbl]
+    | _ -> Doc.nil
+  in
+  Doc.concat
+    [
+      print_attributes ~state attrs_on_arrow cmt_tbl;
+      parameters_doc;
+      typ_constraint_doc;
+      Doc.text " =>";
+      return_expr_doc;
+    ]
+
+and print_ternary_operand ~state expr cmt_tbl =
+  let doc = print_expression_with_comments ~state expr cmt_tbl in
+  match Parens.ternary_operand expr with
+  | Parens.Parenthesized -> add_parens doc
+  | Braced braces -> print_braces doc expr braces
+  | Nothing -> doc
+
+and print_set_field_expr ~state attrs lhs longident_loc rhs loc cmt_tbl =
+  let rhs_doc =
+    let doc = print_expression_with_comments ~state rhs cmt_tbl in
+    match Parens.set_field_expr_rhs rhs with
+    | Parens.Parenthesized -> add_parens doc
+    | Braced braces -> print_braces doc rhs braces
+    | Nothing -> doc
+  in
+  let lhs_doc =
+    let doc = print_expression_with_comments ~state lhs cmt_tbl in
+    match Parens.field_expr lhs with
+    | Parens.Parenthesized -> add_parens doc
+    | Braced braces -> print_braces doc lhs braces
+    | Nothing -> doc
+  in
+  let should_indent = ParsetreeViewer.is_binary_expression rhs in
+  let doc =
+    Doc.group
+      (Doc.concat
+         [
+           lhs_doc;
+           Doc.dot;
+           print_lident_path longident_loc cmt_tbl;
+           Doc.text " =";
+           (if should_indent then
+              Doc.group (Doc.indent (Doc.concat [Doc.line; rhs_doc]))
+            else Doc.concat [Doc.space; rhs_doc]);
+         ])
+  in
+  let doc =
+    match attrs with
+    | [] -> doc
+    | attrs ->
+      Doc.group (Doc.concat [print_attributes ~state attrs cmt_tbl; doc])
+  in
+  print_comments doc cmt_tbl loc
+
+and print_template_literal ~state expr cmt_tbl =
+  let tag = ref "js" in
+  let rec walk_expr expr =
+    let open Parsetree in
+    match expr.pexp_desc with
+    | Pexp_apply
+        {
+          funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "++"}};
+          args = [(Nolabel, arg1); (Nolabel, arg2)];
+        } ->
+      let lhs = walk_expr arg1 in
+      let rhs = walk_expr arg2 in
+      Doc.concat [lhs; rhs]
+    | Pexp_constant (Pconst_string (txt, Some prefix)) ->
+      tag := prefix;
+      print_string_contents txt
+    | _ ->
+      let doc = print_expression_with_comments ~state expr cmt_tbl in
+      let doc =
+        match Parens.expr expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc expr braces
+        | Nothing -> doc
+      in
+      Doc.group (Doc.concat [Doc.text "${"; Doc.indent doc; Doc.rbrace])
+  in
+  let content = walk_expr expr in
+  Doc.concat
+    [
+      (if !tag = "js" then Doc.nil else Doc.text !tag);
+      Doc.text "`";
+      content;
+      Doc.text "`";
+    ]
+
+and print_tagged_template_literal ~state call_expr args cmt_tbl =
+  let strings_list, values_list =
+    match args with
+    | [
+     (_, {Parsetree.pexp_desc = Pexp_array strings});
+     (_, {Parsetree.pexp_desc = Pexp_array values});
+    ] ->
+      (strings, values)
+    | _ -> assert false
+  in
+
+  let strings =
+    List.map
+      (fun x ->
+        match x with
+        | {Parsetree.pexp_desc = Pexp_constant (Pconst_string (txt, _))} ->
+          print_string_contents txt
+        | _ -> assert false)
+      strings_list
+  in
+
+  let values =
+    List.map
+      (fun x ->
+        Doc.concat
+          [
+            Doc.text "${";
+            print_expression_with_comments ~state x cmt_tbl;
+            Doc.text "}";
+          ])
+      values_list
+  in
+
+  let process strings values =
+    let rec aux acc = function
+      | [], [] -> acc
+      | a_head :: a_rest, b -> aux (Doc.concat [acc; a_head]) (b, a_rest)
+      | _ -> assert false
+    in
+    aux Doc.nil (strings, values)
+  in
+
+  let content : Doc.t = process strings values in
+
+  let tag = print_expression_with_comments ~state call_expr cmt_tbl in
+  Doc.concat [tag; Doc.text "`"; content; Doc.text "`"]
+
+and print_unary_expression ~state expr cmt_tbl =
+  let print_unary_operator op =
+    Doc.text
+      (match op with
+      | "~+" -> "+"
+      | "~+." -> "+."
+      | "~-" -> "-"
+      | "~-." -> "-."
+      | "~~~" -> "~~~"
+      | "not" -> "!"
+      | _ -> assert false)
+  in
+  match expr.pexp_desc with
+  | Pexp_apply
+      {
+        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident operator}};
+        args = [(Nolabel, operand)];
+      } ->
+    let printed_operand =
+      let doc = print_expression_with_comments ~state operand cmt_tbl in
+      match Parens.unary_expr_operand operand with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc operand braces
+      | Nothing -> doc
+    in
+    let doc = Doc.concat [print_unary_operator operator; printed_operand] in
+    print_comments doc cmt_tbl expr.pexp_loc
+  | _ -> assert false
+
+and print_binary_expression ~state (expr : Parsetree.expression) cmt_tbl =
+  let print_binary_operator ~inline_rhs operator =
+    let spacing_before_operator =
+      if operator = "->" then Doc.soft_line else Doc.space
+    in
+    let spacing_after_operator =
+      if operator = "->" then Doc.nil
+      else if inline_rhs then Doc.space
+      else Doc.line
+    in
+    Doc.concat
+      [spacing_before_operator; Doc.text operator; spacing_after_operator]
+  in
+  let print_operand ~is_lhs ~is_multiline expr parent_operator =
+    let rec flatten ~is_lhs ~is_multiline expr parent_operator =
+      if ParsetreeViewer.is_binary_expression expr then
+        match expr with
+        | {
+         pexp_desc =
+           Pexp_apply
+             {
+               funct = {pexp_desc = Pexp_ident {txt = Longident.Lident operator}};
+               args = [(_, left); (_, right)];
+             };
+        } ->
+          if
+            ParsetreeViewer.flattenable_operators parent_operator operator
+            && not (ParsetreeViewer.has_attributes expr.pexp_attributes)
+          then
+            let left_printed =
+              flatten ~is_lhs:true ~is_multiline left operator
+            in
+            let right_printed =
+              let right_printeable_attrs, right_internal_attrs =
+                ParsetreeViewer.partition_printable_attributes
+                  right.pexp_attributes
+              in
+              let doc =
+                print_expression_with_comments ~state
+                  {right with pexp_attributes = right_internal_attrs}
+                  cmt_tbl
+              in
+              let doc =
+                if Parens.flatten_operand_rhs parent_operator right then
+                  Doc.concat [Doc.lparen; doc; Doc.rparen]
+                else doc
+              in
+              let doc =
+                Doc.concat
+                  [print_attributes ~state right_printeable_attrs cmt_tbl; doc]
+              in
+              match right_printeable_attrs with
+              | [] -> doc
+              | _ -> add_parens doc
+            in
+            let doc =
+              if ParsetreeViewer.expr_is_await expr then
+                let parens =
+                  Res_parens.binary_operator_inside_await_needs_parens operator
+                in
+                Doc.concat
+                  [
+                    Doc.lparen;
+                    Doc.text "await ";
+                    (if parens then Doc.lparen else Doc.nil);
+                    left_printed;
+                    print_binary_operator ~inline_rhs:false operator;
+                    right_printed;
+                    (if parens then Doc.rparen else Doc.nil);
+                    Doc.rparen;
+                  ]
+              else
+                match operator with
+                | "->" when is_multiline ->
+                  (* If the pipe-chain is written over multiple lines, break automatically
+                   * `let x = a->b->c -> same line, break when line-width exceeded
+                   * `let x = a->
+                   *   b->c` -> pipe-chain is written on multiple lines, break the group *)
+                  Doc.breakable_group ~force_break:true
+                    (Doc.concat
+                       [
+                         left_printed;
+                         print_binary_operator ~inline_rhs:false operator;
+                         right_printed;
+                       ])
+                | _ ->
+                  Doc.concat
+                    [
+                      left_printed;
+                      print_binary_operator ~inline_rhs:false operator;
+                      right_printed;
+                    ]
+            in
+
+            let doc =
+              if (not is_lhs) && Parens.rhs_binary_expr_operand operator expr
+              then Doc.concat [Doc.lparen; doc; Doc.rparen]
+              else doc
+            in
+            print_comments doc cmt_tbl expr.pexp_loc
+          else
+            let printeable_attrs, internal_attrs =
+              ParsetreeViewer.partition_printable_attributes
+                expr.pexp_attributes
+            in
+            let doc =
+              print_expression_with_comments ~state
+                {expr with pexp_attributes = internal_attrs}
+                cmt_tbl
+            in
+            let doc =
+              if
+                Parens.sub_binary_expr_operand parent_operator operator
+                || printeable_attrs <> []
+                   && (ParsetreeViewer.is_binary_expression expr
+                      || ParsetreeViewer.is_ternary_expr expr)
+              then Doc.concat [Doc.lparen; doc; Doc.rparen]
+              else doc
+            in
+            Doc.concat [print_attributes ~state printeable_attrs cmt_tbl; doc]
+        | _ -> assert false
+      else
+        match expr.pexp_desc with
+        | Pexp_apply
+            {
+              funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "++"; loc}};
+              args = [(Nolabel, _); (Nolabel, _)];
+            }
+          when loc.loc_ghost ->
+          let doc = print_template_literal ~state expr cmt_tbl in
+          print_comments doc cmt_tbl expr.Parsetree.pexp_loc
+        | Pexp_setfield (lhs, field, rhs) ->
+          let doc =
+            print_set_field_expr ~state expr.pexp_attributes lhs field rhs
+              expr.pexp_loc cmt_tbl
+          in
+          if is_lhs then add_parens doc else doc
+        | Pexp_apply
+            {
+              funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "#="}};
+              args = [(Nolabel, lhs); (Nolabel, rhs)];
+            } ->
+          let rhs_doc = print_expression_with_comments ~state rhs cmt_tbl in
+          let lhs_doc = print_expression_with_comments ~state lhs cmt_tbl in
+          (* TODO: unify indentation of "=" *)
+          let should_indent = ParsetreeViewer.is_binary_expression rhs in
+          let doc =
+            Doc.group
+              (Doc.concat
+                 [
+                   lhs_doc;
+                   Doc.text " =";
+                   (if should_indent then
+                      Doc.group (Doc.indent (Doc.concat [Doc.line; rhs_doc]))
+                    else Doc.concat [Doc.space; rhs_doc]);
+                 ])
+          in
+          let doc =
+            match expr.pexp_attributes with
+            | [] -> doc
+            | attrs ->
+              Doc.group
+                (Doc.concat [print_attributes ~state attrs cmt_tbl; doc])
+          in
+          if is_lhs then add_parens doc else doc
+        | _ -> (
+          let doc = print_expression_with_comments ~state expr cmt_tbl in
+          match Parens.binary_expr_operand ~is_lhs expr with
+          | Parens.Parenthesized -> add_parens doc
+          | Braced braces -> print_braces doc expr braces
+          | Nothing -> doc)
+    in
+    flatten ~is_lhs ~is_multiline expr parent_operator
+  in
+  match expr.pexp_desc with
+  | Pexp_apply
+      {
+        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident ("->" as op)}};
+        args = [(Nolabel, lhs); (Nolabel, rhs)];
+      }
+    when not
+           (ParsetreeViewer.is_binary_expression lhs
+           || ParsetreeViewer.is_binary_expression rhs
+           || print_attributes ~state expr.pexp_attributes cmt_tbl <> Doc.nil)
+    ->
+    let lhs_has_comment_below = has_comment_below cmt_tbl lhs.pexp_loc in
+    let lhs_doc = print_operand ~is_lhs:true ~is_multiline:false lhs op in
+    (* For pipe RHS, use pipe-specific rewrite to omit redundant first underscore *)
+    let rhs =
+      if op = "->" then ParsetreeViewer.rewrite_underscore_apply_in_pipe rhs
+      else rhs
+    in
+    let rhs_doc = print_operand ~is_lhs:false ~is_multiline:false rhs op in
+    Doc.group
+      (Doc.concat
+         [
+           print_attributes ~state expr.pexp_attributes cmt_tbl;
+           lhs_doc;
+           (match (lhs_has_comment_below, op) with
+           | true, "->" -> Doc.concat [Doc.soft_line; Doc.text "->"]
+           | false, "->" -> Doc.text "->"
+           | _ -> Doc.nil);
+           rhs_doc;
+         ])
+  | Pexp_apply
+      {
+        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident operator}};
+        args = [(Nolabel, lhs); (Nolabel, rhs)];
+      } ->
+    let is_multiline =
+      lhs.pexp_loc.loc_start.pos_lnum < rhs.pexp_loc.loc_start.pos_lnum
+    in
+
+    let right =
+      let operator_with_rhs =
+        let rhs_doc =
+          print_operand
+            ~is_lhs:(ParsetreeViewer.is_rhs_binary_operator operator)
+            ~is_multiline rhs operator
+        in
+        Doc.concat
+          [
+            print_binary_operator
+              ~inline_rhs:(ParsetreeViewer.should_inline_rhs_binary_expr rhs)
+              operator;
+            rhs_doc;
+          ]
+      in
+      if ParsetreeViewer.should_indent_binary_expr expr then
+        Doc.group (Doc.indent operator_with_rhs)
+      else operator_with_rhs
+    in
+    let doc =
+      Doc.group
+        (Doc.concat
+           [
+             print_operand
+               ~is_lhs:(not @@ ParsetreeViewer.is_rhs_binary_operator operator)
+               ~is_multiline lhs operator;
+             right;
+           ])
+    in
+    Doc.group
+      (Doc.concat
+         [
+           print_attributes ~state expr.pexp_attributes cmt_tbl;
+           (match
+              Parens.binary_expr
+                {
+                  expr with
+                  pexp_attributes =
+                    ParsetreeViewer.filter_printable_attributes
+                      expr.pexp_attributes;
+                }
+            with
+           | Braced braces_loc -> print_braces doc expr braces_loc
+           | Parenthesized -> add_parens doc
+           | Nothing -> doc);
+         ])
+  | _ -> Doc.nil
+
+and print_belt_array_concat_apply ~state sub_lists cmt_tbl =
+  let make_spread_doc comma_before_spread = function
+    | Some expr ->
+      (* Extract leading comments before dotdotdot *)
+      let leading_comments_doc =
+        print_leading_comments Doc.nil cmt_tbl.CommentTable.leading
+          expr.Parsetree.pexp_loc
+      in
+      (* Print expression without leading comments (they're already extracted) *)
+      let expr_doc =
+        let doc = print_expression ~state expr cmt_tbl in
+        match Parens.expr expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc expr braces
+        | Nothing -> doc
+      in
+      (* Print trailing comments with the expression *)
+      let expr_with_trailing_comments =
+        print_trailing_comments expr_doc cmt_tbl.CommentTable.trailing
+          expr.Parsetree.pexp_loc
+      in
+      Doc.concat
+        [
+          comma_before_spread;
+          leading_comments_doc;
+          Doc.dotdotdot;
+          expr_with_trailing_comments;
+        ]
+    | None -> Doc.nil
+  in
+  let make_sub_list_doc (expressions, spread) =
+    let comma_before_spread =
+      match expressions with
+      | [] -> Doc.nil
+      | _ -> Doc.concat [Doc.text ","; Doc.line]
+    in
+    let spread_doc = make_spread_doc comma_before_spread spread in
+    let expressions_doc =
+      Doc.join
+        ~sep:(Doc.concat [Doc.text ","; Doc.line])
+        (List.map
+           (fun expr ->
+             let doc = print_expression_with_comments ~state expr cmt_tbl in
+             match Parens.expr expr with
+             | Parens.Parenthesized -> add_parens doc
+             | Braced braces -> print_braces doc expr braces
+             | Nothing -> doc)
+           expressions)
+    in
+    Doc.concat [expressions_doc; spread_doc]
+  in
+  Doc.group
+    (Doc.concat
+       [
+         Doc.lbracket;
+         Doc.indent
+           (Doc.concat
+              [
+                Doc.soft_line;
+                Doc.join
+                  ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                  (List.map make_sub_list_doc
+                     (List.map ParsetreeViewer.collect_array_expressions
+                        sub_lists));
+              ]);
+         Doc.trailing_comma;
+         Doc.soft_line;
+         Doc.rbracket;
+       ])
+
+and print_belt_list_concat_apply ~state sub_lists cmt_tbl =
+  let make_spread_doc comma_before_spread = function
+    | Some expr ->
+      Doc.concat
+        [
+          comma_before_spread;
+          Doc.dotdotdot;
+          (let doc = print_expression_with_comments ~state expr cmt_tbl in
+           match Parens.expr expr with
+           | Parens.Parenthesized -> add_parens doc
+           | Braced braces -> print_braces doc expr braces
+           | Nothing -> doc);
+        ]
+    | None -> Doc.nil
+  in
+  let make_sub_list_doc (expressions, spread) =
+    let comma_before_spread =
+      match expressions with
+      | [] -> Doc.nil
+      | _ -> Doc.concat [Doc.text ","; Doc.line]
+    in
+    let spread_doc = make_spread_doc comma_before_spread spread in
+    Doc.concat
+      [
+        Doc.join
+          ~sep:(Doc.concat [Doc.text ","; Doc.line])
+          (List.map
+             (fun expr ->
+               let doc = print_expression_with_comments ~state expr cmt_tbl in
+               match Parens.expr expr with
+               | Parens.Parenthesized -> add_parens doc
+               | Braced braces -> print_braces doc expr braces
+               | Nothing -> doc)
+             expressions);
+        spread_doc;
+      ]
+  in
+  Doc.group
+    (Doc.concat
+       [
+         Doc.text "list{";
+         Doc.indent
+           (Doc.concat
+              [
+                Doc.soft_line;
+                Doc.join
+                  ~sep:(Doc.concat [Doc.text ","; Doc.line])
+                  (List.map make_sub_list_doc
+                     (List.map ParsetreeViewer.collect_list_expressions
+                        sub_lists));
+              ]);
+         Doc.trailing_comma;
+         Doc.soft_line;
+         Doc.rbrace;
+       ])
+
+(* callExpr(arg1, arg2) *)
+and print_pexp_apply ~state expr cmt_tbl =
+  match expr.pexp_desc with
+  | Pexp_apply
+      {
+        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "##"}};
+        args = [(Nolabel, parent_expr); (Nolabel, member_expr)];
+      } ->
+    let parent_doc =
+      let doc = print_expression_with_comments ~state parent_expr cmt_tbl in
+      match Parens.unary_expr_operand parent_expr with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc parent_expr braces
+      | Nothing -> doc
+    in
+    let member =
+      let member_doc =
+        match member_expr.pexp_desc with
+        | Pexp_ident lident ->
+          print_comments
+            (print_longident lident.txt)
+            cmt_tbl member_expr.pexp_loc
+        | _ -> print_expression_with_comments ~state member_expr cmt_tbl
+      in
+      Doc.concat [Doc.text "\""; member_doc; Doc.text "\""]
+    in
+    Doc.group
+      (Doc.concat
+         [
+           print_attributes ~state expr.pexp_attributes cmt_tbl;
+           parent_doc;
+           Doc.lbracket;
+           member;
+           Doc.rbracket;
+         ])
+  | Pexp_apply
+      {
+        funct = {pexp_desc = Pexp_ident {txt = Longident.Lident "#="}};
+        args = [(Nolabel, lhs); (Nolabel, rhs)];
+      } -> (
+    let rhs_doc =
+      let doc = print_expression_with_comments ~state rhs cmt_tbl in
+      match Parens.expr rhs with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc rhs braces
+      | Nothing -> doc
+    in
+    (* TODO: unify indentation of "=" *)
+    let should_indent =
+      (not (ParsetreeViewer.is_braced_expr rhs))
+      && ParsetreeViewer.is_binary_expression rhs
+    in
+    let doc =
+      Doc.group
+        (Doc.concat
+           [
+             print_expression_with_comments ~state lhs cmt_tbl;
+             Doc.text " =";
+             (if should_indent then
+                Doc.group (Doc.indent (Doc.concat [Doc.line; rhs_doc]))
+              else Doc.concat [Doc.space; rhs_doc]);
+           ])
+    in
+    match expr.pexp_attributes with
+    | [] -> doc
+    | attrs ->
+      Doc.group (Doc.concat [print_attributes ~state attrs cmt_tbl; doc]))
+  | Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc =
+              Pexp_ident
+                {txt = Longident.Ldot (Lident "Primitive_dict", "make")};
+          };
+        args = [(Nolabel, key_values)];
+      }
+    when Res_parsetree_viewer.is_tuple_array key_values ->
+    Doc.concat
+      [
+        Doc.text "dict{";
+        print_comments_inside cmt_tbl expr.pexp_loc;
+        print_literal_dict_expr ~state key_values cmt_tbl;
+        Doc.rbrace;
+      ]
+  | Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "get")};
+          };
+        args = [(Nolabel, parent_expr); (Nolabel, member_expr)];
+      }
+    when not (ParsetreeViewer.is_rewritten_underscore_apply_sugar parent_expr)
+    ->
+    (* Don't print the Array.get(_, 0) sugar a.k.a. (__x) => Array.get(__x, 0) as _[0] *)
+    let member =
+      let member_doc =
+        let doc = print_expression_with_comments ~state member_expr cmt_tbl in
+        match Parens.expr member_expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc member_expr braces
+        | Nothing -> doc
+      in
+      let should_inline =
+        match member_expr.pexp_desc with
+        | Pexp_constant _ | Pexp_ident _ -> true
+        | _ -> false
+      in
+      if should_inline then member_doc
+      else
+        Doc.concat
+          [Doc.indent (Doc.concat [Doc.soft_line; member_doc]); Doc.soft_line]
+    in
+    let parent_doc =
+      let doc = print_expression_with_comments ~state parent_expr cmt_tbl in
+      match Parens.unary_expr_operand parent_expr with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc parent_expr braces
+      | Nothing -> doc
+    in
+    Doc.group
+      (Doc.concat
+         [
+           print_attributes ~state expr.pexp_attributes cmt_tbl;
+           parent_doc;
+           Doc.lbracket;
+           member;
+           Doc.rbracket;
+         ])
+  | Pexp_apply
+      {
+        funct =
+          {
+            pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "set")};
+          };
+        args =
+          [
+            (Nolabel, parent_expr);
+            (Nolabel, member_expr);
+            (Nolabel, target_expr);
+          ];
+      } ->
+    let member =
+      let member_doc =
+        let doc = print_expression_with_comments ~state member_expr cmt_tbl in
+        match Parens.expr member_expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc member_expr braces
+        | Nothing -> doc
+      in
+      let should_inline =
+        match member_expr.pexp_desc with
+        | Pexp_constant _ | Pexp_ident _ -> true
+        | _ -> false
+      in
+      if should_inline then member_doc
+      else
+        Doc.concat
+          [Doc.indent (Doc.concat [Doc.soft_line; member_doc]); Doc.soft_line]
+    in
+    let should_indent_target_expr =
+      if ParsetreeViewer.is_braced_expr target_expr then false
+      else
+        ParsetreeViewer.is_binary_expression target_expr
+        ||
+        match target_expr with
+        | {
+         pexp_attributes = [({Location.txt = "res.ternary"}, _)];
+         pexp_desc = Pexp_ifthenelse (if_expr, _, _);
+        } ->
+          ParsetreeViewer.is_binary_expression if_expr
+          || ParsetreeViewer.has_attributes if_expr.pexp_attributes
+        | {pexp_desc = Pexp_newtype _} -> false
+        | e ->
+          ParsetreeViewer.has_attributes e.pexp_attributes
+          || ParsetreeViewer.is_array_access e
+    in
+    let target_expr =
+      let doc = print_expression_with_comments ~state target_expr cmt_tbl in
+      match Parens.expr target_expr with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc target_expr braces
+      | Nothing -> doc
+    in
+    let parent_doc =
+      let doc = print_expression_with_comments ~state parent_expr cmt_tbl in
+      match Parens.unary_expr_operand parent_expr with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc parent_expr braces
+      | Nothing -> doc
+    in
+    Doc.group
+      (Doc.concat
+         [
+           print_attributes ~state expr.pexp_attributes cmt_tbl;
+           parent_doc;
+           Doc.lbracket;
+           member;
+           Doc.rbracket;
+           Doc.text " =";
+           (if should_indent_target_expr then
+              Doc.indent (Doc.concat [Doc.line; target_expr])
+            else Doc.concat [Doc.space; target_expr]);
+         ])
+  | Pexp_apply {funct = call_expr; args; partial} ->
+    let args =
+      List.map
+        (fun (lbl, arg) -> (lbl, ParsetreeViewer.rewrite_underscore_apply arg))
+        args
+    in
+    let attrs = expr.pexp_attributes in
+    let args =
+      if partial then
+        let dummy = Ast_helper.Exp.constant ~attrs (Ast_helper.Const.int 0) in
+        args @ [(Asttypes.Labelled {txt = "..."; loc = Location.none}, dummy)]
+      else args
+    in
+    let call_expr_doc =
+      let doc = print_expression_with_comments ~state call_expr cmt_tbl in
+      match Parens.call_expr call_expr with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc call_expr braces
+      | Nothing -> doc
+    in
+    if ParsetreeViewer.requires_special_callback_printing_first_arg args then
+      let args_doc =
+        print_arguments_with_callback_in_first_position ~state ~partial args
+          cmt_tbl
+      in
+      Doc.concat
+        [print_attributes ~state attrs cmt_tbl; call_expr_doc; args_doc]
+    else if ParsetreeViewer.requires_special_callback_printing_last_arg args
+    then
+      let args_doc =
+        print_arguments_with_callback_in_last_position ~state ~partial args
+          cmt_tbl
+      in
+      (*
+       * Fixes the following layout (the `[` and `]` should break):
+       *   [fn(x => {
+       *     let _ = x
+       *   }), fn(y => {
+       *     let _ = y
+       *   }), fn(z => {
+       *     let _ = z
+       *   })]
+       * See `Doc.willBreak documentation in interface file for more context.
+       * Context:
+       *  https://github.com/rescript-lang/syntax/issues/111
+       *  https://github.com/rescript-lang/syntax/issues/166
+       *)
+      let maybe_break_parent =
+        if Doc.will_break args_doc then Doc.break_parent else Doc.nil
+      in
+      Doc.concat
+        [
+          maybe_break_parent;
+          print_attributes ~state attrs cmt_tbl;
+          call_expr_doc;
+          args_doc;
+        ]
+    else
+      let args_doc = print_arguments ~state ~partial args cmt_tbl in
+      Doc.concat
+        [print_attributes ~state attrs cmt_tbl; call_expr_doc; args_doc]
+  | _ -> assert false
+
+and print_jsx_unary_tag ~state tag_name props expr_loc cmt_tbl =
+  let name = print_jsx_name tag_name.txt in
+  let formatted_props = print_jsx_props ~state props cmt_tbl in
+  let tag_loc = tag_name.loc in
+  let tag_has_trailing_comment = has_trailing_comments cmt_tbl tag_loc in
+  let tag_has_no_props = List.length props == 0 in
+  let closing_token_loc =
+    ParsetreeViewer.unary_element_closing_token expr_loc
+  in
+  let props_doc =
+    if tag_has_no_props then
+      if has_leading_comments cmt_tbl closing_token_loc then Doc.soft_line
+      else if tag_has_trailing_comment then Doc.nil
+      else Doc.space
+    else
+      Doc.concat
+        [
+          Doc.indent
+            (Doc.concat
+               [Doc.line; Doc.group (Doc.join ~sep:Doc.line formatted_props)]);
+          Doc.line;
+        ]
+  in
+  let opening_tag =
+    print_comments (Doc.concat [Doc.less_than; name]) cmt_tbl tag_loc
+  in
+  let opening_tag_doc =
+    if tag_has_trailing_comment && not tag_has_no_props then
+      Doc.indent opening_tag
+    else opening_tag
+  in
+  let closing_tag_doc =
+    print_comments (Doc.text "/>") cmt_tbl closing_token_loc
+  in
+  Doc.group
+    (Doc.concat
+       [
+         opening_tag_doc;
+         props_doc;
+         (if tag_has_trailing_comment && tag_has_no_props then Doc.space
+          else Doc.nil);
+         closing_tag_doc;
+       ])
+
+and print_jsx_container_tag ~state tag_name
+    (opening_greater_than : Lexing.position) props
+    (children : Parsetree.jsx_children)
+    (closing_tag : Parsetree.jsx_closing_container_tag option)
+    (pexp_loc : Location.t) cmt_tbl =
+  let name = print_jsx_name tag_name.txt in
+  let opening_greater_than_loc =
+    {
+      Warnings.loc_start = opening_greater_than;
+      loc_end = opening_greater_than;
+      loc_ghost = false;
+    }
+  in
+  let _opening_greater_than_has_leading_comments, opening_greater_than_doc =
+    let has_leading_comments =
+      has_leading_comments cmt_tbl opening_greater_than_loc
+    in
+    ( has_leading_comments,
+      print_comments Doc.greater_than cmt_tbl opening_greater_than_loc )
+  in
+  let formatted_props = print_jsx_props ~state props cmt_tbl in
+  (* <div className="test" /> *)
+  let has_children =
+    match children with
+    | _ :: _ -> true
+    | [] -> false
+  in
+  let line_sep = get_line_sep_for_jsx_children children in
+  let print_children children =
+    Doc.concat
+      [
+        Doc.indent
+          (Doc.concat [Doc.line; print_jsx_children ~state children cmt_tbl]);
+        line_sep;
+      ]
+  in
+
+  (* comments between the opening and closing tag *)
+  let has_comments_inside = has_comments_inside cmt_tbl pexp_loc in
+  let closing_element_doc =
+    match closing_tag with
+    | None -> Doc.nil
+    | Some closing_tag ->
+      let closing_tag_loc =
+        ParsetreeViewer.container_element_closing_tag_loc closing_tag
+      in
+      let closing_name =
+        print_jsx_name closing_tag.jsx_closing_container_tag_name.txt
+      in
+      print_comments
+        (Doc.concat [Doc.text "</"; closing_name; Doc.greater_than])
+        cmt_tbl closing_tag_loc
+  in
+  Doc.group
+    (Doc.concat
+       [
+         Doc.group
+           (Doc.concat
+              [
+                (* Opening tag name and props *)
+                (let tag_loc = tag_name.loc in
+
+                 let opening_tag_name_doc =
+                   print_comments
+                     (Doc.concat [Doc.less_than; name])
+                     cmt_tbl tag_loc
+                 in
+                 let props_block_doc =
+                   if List.length formatted_props == 0 then Doc.nil
+                   else
+                     Doc.indent
+                       (Doc.concat
+                          [
+                            Doc.line;
+                            Doc.group (Doc.join formatted_props ~sep:Doc.line);
+                          ])
+                 in
+                 let after_name_and_props_doc =
+                   (* if the element name has a single comment on the same line, force newline before '>' *)
+                   if has_trailing_single_line_comment cmt_tbl tag_loc then
+                     Doc.concat [Doc.hard_line; opening_greater_than_doc]
+                   else Doc.concat [Doc.soft_line; opening_greater_than_doc]
+                 in
+                 Doc.concat
+                   [
+                     opening_tag_name_doc;
+                     props_block_doc;
+                     after_name_and_props_doc;
+                   ]);
+              ]);
+         Doc.concat
+           [
+             (if has_children then print_children children
+              else if not has_comments_inside then Doc.soft_line
+              else print_comments_inside cmt_tbl pexp_loc);
+             closing_element_doc;
+           ];
+       ])
+
+and print_jsx_fragment ~state (opening_greater_than : Lexing.position)
+    (children : Parsetree.jsx_children) (closing_lesser_than : Lexing.position)
+    (fragment_loc : Warnings.loc) cmt_tbl =
+  let opening =
+    let loc : Location.t = {fragment_loc with loc_end = opening_greater_than} in
+    print_comments (Doc.text "<>") cmt_tbl loc
+  in
+  let closing =
+    let loc : Location.t =
+      {fragment_loc with loc_start = closing_lesser_than}
+    in
+    print_comments (Doc.text "</>") cmt_tbl loc
+  in
+  let has_children =
+    match children with
+    | [] -> false
+    | _ :: _ -> true
+  in
+  let line_sep = get_line_sep_for_jsx_children children in
+  Doc.group
+    (Doc.concat
+       [
+         opening;
+         Doc.indent
+           (Doc.concat [Doc.line; print_jsx_children ~state children cmt_tbl]);
+         (if has_children then line_sep else Doc.nil);
+         closing;
+       ])
+
+and get_line_sep_for_jsx_children (children : Parsetree.jsx_children) =
+  if
+    List.length children > 1
+    || List.exists
+         (function
+           | {Parsetree.pexp_desc = Pexp_jsx_element _} -> true
+           | _ -> false)
+         children
+  then Doc.hard_line
+  else Doc.line
+
+and print_jsx_children ~state (children : Parsetree.jsx_children) cmt_tbl =
+  let open Parsetree in
+  let get_loc (expr : Parsetree.expression) =
+    let braces =
+      expr.pexp_attributes
+      |> List.find_map (fun (attr, _) ->
+             match attr with
+             | {Location.txt = "res.braces"; loc} -> Some loc
+             | _ -> None)
+    in
+    match braces with
+    | None -> expr.pexp_loc
+    | Some loc -> loc
+  in
+  let sep = get_line_sep_for_jsx_children children in
+  let print_expr (expr : Parsetree.expression) =
+    let leading_line_comment_present =
+      has_leading_line_comment cmt_tbl expr.pexp_loc
+    in
+    let expr_doc = print_expression_with_comments ~state expr cmt_tbl in
+    let add_parens_or_braces expr_doc =
+      (* {(20: int)} make sure that we also protect the expression inside *)
+      let inner_doc =
+        if Parens.braced_expr expr then add_parens expr_doc else expr_doc
+      in
+      if leading_line_comment_present then add_braces inner_doc
+      else Doc.concat [Doc.lbrace; inner_doc; Doc.rbrace]
+    in
+    match Parens.jsx_child_expr expr with
+    | Nothing -> print_comments expr_doc cmt_tbl (get_loc expr)
+    | Parenthesized -> add_parens_or_braces expr_doc
+    | Braced braces_loc ->
+      print_comments (add_parens_or_braces expr_doc) cmt_tbl braces_loc
+  in
+  match children with
+  | [] -> Doc.nil
+  | children ->
+    let rec visit acc children =
+      match children with
+      | [] -> acc
+      | [x] -> Doc.concat [acc; print_expr x]
+      | x :: (y :: _ as rest) ->
+        let end_line_x =
+          let loc = get_loc x in
+          loc.loc_end.pos_lnum
+        in
+        let start_line_y =
+          let loc = get_loc y in
+          loc.loc_start.pos_lnum
+        in
+        let lines_between = start_line_y - end_line_x - 1 in
+        let leading_single_line_comments =
+          get_leading_line_comment_count cmt_tbl (get_loc y)
+        in
+        (* If there are lines between the jsx elements, we preserve at least one line *)
+        if
+          (* Unless they are all comments *)
+          (* The edge case of comment followed by blank line is not caught here *)
+          lines_between > 0 && not (lines_between = leading_single_line_comments)
+        then
+          let doc = Doc.concat [print_expr x; sep; Doc.hard_line] in
+          visit (Doc.concat [acc; doc]) rest
+        else
+          let doc = Doc.concat [print_expr x; sep] in
+          visit (Doc.concat [acc; doc]) rest
+    in
+    visit Doc.nil children
+
+and print_jsx_prop ~state prop cmt_tbl =
+  let open Parsetree in
+  let prop_loc = ParsetreeViewer.get_jsx_prop_loc prop in
+  let doc =
+    match prop with
+    | JSXPropPunning (is_optional, name) ->
+      (* We don't print any comments here because they will be attached to the entire prop_loc *)
+      if is_optional then Doc.concat [Doc.question; print_ident_like name.txt]
+      else print_ident_like name.txt
+    | JSXPropValue (name, is_optional, value) ->
+      let has_trailing_comment_after_name =
+        has_trailing_single_line_comment cmt_tbl name.loc
+      in
+      let value_doc =
+        let leading_line_comment_present =
+          (* If the value expression has braces, these will be representend as an attribute containing the brace range *)
+          (* comment assignment is a little weird that this point, it will be assigned to a child node of the value expression *)
+          match (Parens.jsx_prop_expr value, value.pexp_desc) with
+          | ( Braced _,
+              Parsetree.Pexp_apply {funct = fun_expr; args = (_, head_arg) :: _}
+            ) ->
+            has_leading_line_comment cmt_tbl fun_expr.pexp_loc
+            || has_leading_line_comment cmt_tbl head_arg.pexp_loc
+          | _ -> has_leading_line_comment cmt_tbl value.pexp_loc
+        in
+        let doc = print_expression_with_comments ~state value cmt_tbl in
+        match Parens.jsx_prop_expr value with
+        | Parenthesized | Braced _ ->
+          (* {(20: int)} make sure that we also protect the expression inside *)
+          let inner_doc =
+            if Parens.braced_expr value then add_parens doc else doc
+          in
+          if leading_line_comment_present then add_braces inner_doc
+          else Doc.concat [Doc.lbrace; inner_doc; Doc.rbrace]
+        | _ -> doc
+      in
+      let doc =
+        Doc.concat
+          [
+            print_comments (print_ident_like name.txt) cmt_tbl name.loc;
+            Doc.equal;
+            (if is_optional then Doc.question else Doc.nil);
+            (if has_trailing_comment_after_name then Doc.hard_line else Doc.nil);
+            Doc.group value_doc;
+          ]
+      in
+      print_comments doc cmt_tbl value.pexp_loc
+    | JSXPropSpreading (_, value) ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.lbrace;
+             Doc.dotdotdot;
+             print_expression_with_comments ~state value cmt_tbl;
+             Doc.rbrace;
+           ])
+  in
+  print_comments doc cmt_tbl prop_loc
+
+and print_jsx_props ~state props cmt_tbl : Doc.t list =
+  props |> List.map (fun prop -> print_jsx_prop ~state prop cmt_tbl)
+
+and print_jsx_name (tag_name : Parsetree.jsx_tag_name) =
+  match tag_name with
+  | Parsetree.JsxTagInvalid invalid ->
+    (* Preserve exactly what the parser recorded as invalid *)
+    Doc.text invalid
+  | Parsetree.JsxLowerTag name ->
+    print_ident_like ~allow_uident:true ~allow_hyphen:true name
+  | Parsetree.JsxQualifiedLowerTag {path; name} ->
+    let upper_segs = Longident.flatten path in
+    let printed_upper =
+      upper_segs |> List.map (print_ident_like ~allow_uident:true)
+    in
+    let printed_lower =
+      print_ident_like ~allow_uident:true ~allow_hyphen:true name
+    in
+    Doc.join ~sep:Doc.dot (printed_upper @ [printed_lower])
+  | Parsetree.JsxUpperTag path ->
+    let segs = Longident.flatten path in
+    let printed = segs |> List.map (print_ident_like ~allow_uident:true) in
+    Doc.join ~sep:Doc.dot printed
+
+and print_arguments_with_callback_in_first_position ~state ~partial args cmt_tbl
+    =
+  (* Because the same subtree gets printed twice, we need to copy the cmt_tbl.
+   * consumed comments need to be marked not-consumed and reprinted…
+   * Cheng's different comment algorithm will solve this. *)
+  let state = State.next_custom_layout state in
+  let cmt_tbl_copy = CommentTable.copy cmt_tbl in
+  let callback, printed_args =
+    match args with
+    | (lbl, expr) :: args ->
+      let lbl_doc =
+        match lbl with
+        | Asttypes.Nolabel -> Doc.nil
+        | Asttypes.Labelled {txt} ->
+          Doc.concat [Doc.tilde; print_ident_like txt; Doc.equal]
+        | Asttypes.Optional {txt} ->
+          Doc.concat [Doc.tilde; print_ident_like txt; Doc.equal; Doc.question]
+      in
+      let callback =
+        Doc.concat
+          [
+            lbl_doc;
+            print_pexp_fun ~state ~in_callback:FitsOnOneLine expr cmt_tbl;
+          ]
+      in
+      let callback = lazy (print_comments callback cmt_tbl expr.pexp_loc) in
+      let printed_args =
+        lazy
+          (Doc.join
+             ~sep:(Doc.concat [Doc.comma; Doc.line])
+             (List.map (fun arg -> print_argument ~state arg cmt_tbl) args))
+      in
+      (callback, printed_args)
+    | _ -> assert false
+  in
+
+  (* Thing.map((arg1, arg2) => MyModuleBlah.toList(argument), foo) *)
+  (* Thing.map((arg1, arg2) => {
+   *   MyModuleBlah.toList(argument)
+   * }, longArgumet, veryLooooongArgument)
+   *)
+  let fits_on_one_line =
+    lazy
+      (Doc.concat
+         [
+           Doc.lparen;
+           Lazy.force callback;
+           Doc.comma;
+           Doc.line;
+           Lazy.force printed_args;
+           Doc.rparen;
+         ])
+  in
+
+  (* Thing.map(
+   *   (param1, parm2) => doStuff(param1, parm2),
+   *   arg1,
+   *   arg2,
+   *   arg3,
+   * )
+   *)
+  let break_all_args =
+    lazy (print_arguments ~state ~partial args cmt_tbl_copy)
+  in
+
+  (* Sometimes one of the non-callback arguments will break.
+   * There might be a single line comment in there, or a multiline string etc.
+   * showDialog(
+   *   ~onConfirm={() => ()},
+   *   `
+   *   Do you really want to leave this workspace?
+   *   Some more text with detailed explanations...
+   *   `,
+   *   ~danger=true,
+   *   // comment   --> here a single line comment
+   *   ~confirmText="Yes, I am sure!",
+   *  )
+   * In this case, we always want the arguments broken over multiple lines,
+   * like a normal function call.
+   *)
+  if state |> State.should_break_callback then Lazy.force break_all_args
+  else if Doc.will_break (Lazy.force printed_args) then
+    Lazy.force break_all_args
+  else
+    Doc.custom_layout [Lazy.force fits_on_one_line; Lazy.force break_all_args]
+
+and print_arguments_with_callback_in_last_position ~state ~partial args cmt_tbl
+    =
+  (* Because the same subtree gets printed twice, we need to copy the cmt_tbl.
+   * consumed comments need to be marked not-consumed and reprinted…
+   * Cheng's different comment algorithm will solve this. *)
+  let state = state |> State.next_custom_layout in
+  let cmt_tbl_copy = CommentTable.copy cmt_tbl in
+  let cmt_tbl_copy2 = CommentTable.copy cmt_tbl in
+  let rec loop acc args =
+    match args with
+    | [] -> (lazy Doc.nil, lazy Doc.nil, lazy Doc.nil)
+    | [(lbl, expr)] ->
+      let lbl_doc =
+        match lbl with
+        | Asttypes.Nolabel -> Doc.nil
+        | Asttypes.Labelled {txt} ->
+          Doc.concat [Doc.tilde; print_ident_like txt; Doc.equal]
+        | Asttypes.Optional {txt} ->
+          Doc.concat [Doc.tilde; print_ident_like txt; Doc.equal; Doc.question]
+      in
+      let callback_fits_on_one_line =
+        lazy
+          (let pexp_fun_doc =
+             print_pexp_fun ~state ~in_callback:FitsOnOneLine expr cmt_tbl
+           in
+           let doc = Doc.concat [lbl_doc; pexp_fun_doc] in
+           print_comments doc cmt_tbl expr.pexp_loc)
+      in
+      let callback_arguments_fits_on_one_line =
+        lazy
+          (let pexp_fun_doc =
+             print_pexp_fun ~state ~in_callback:ArgumentsFitOnOneLine expr
+               cmt_tbl_copy
+           in
+           let doc = Doc.concat [lbl_doc; pexp_fun_doc] in
+           print_comments doc cmt_tbl_copy expr.pexp_loc)
+      in
+      ( lazy (Doc.concat (List.rev acc)),
+        callback_fits_on_one_line,
+        callback_arguments_fits_on_one_line )
+    | arg :: args ->
+      let arg_doc = print_argument ~state arg cmt_tbl in
+      loop (Doc.line :: Doc.comma :: arg_doc :: acc) args
+  in
+  let printed_args, callback, callback2 = loop [] args in
+
+  (* Thing.map(foo, (arg1, arg2) => MyModuleBlah.toList(argument)) *)
+  let fits_on_one_line =
+    lazy
+      (Doc.concat
+         [Doc.lparen; Lazy.force printed_args; Lazy.force callback; Doc.rparen])
+  in
+
+  (* Thing.map(longArgumet, veryLooooongArgument, (arg1, arg2) =>
+   *   MyModuleBlah.toList(argument)
+   * )
+   *)
+  let arugments_fit_on_one_line =
+    lazy
+      (Doc.concat
+         [
+           Doc.lparen;
+           Lazy.force printed_args;
+           Doc.breakable_group ~force_break:true (Lazy.force callback2);
+           Doc.rparen;
+         ])
+  in
+
+  (* Thing.map(
+   *   arg1,
+   *   arg2,
+   *   arg3,
+   *   (param1, parm2) => doStuff(param1, parm2)
+   * )
+   *)
+  let break_all_args =
+    lazy (print_arguments ~state ~partial args cmt_tbl_copy2)
+  in
+
+  (* Sometimes one of the non-callback arguments will break.
+   * There might be a single line comment in there, or a multiline string etc.
+   * showDialog(
+   *   `
+   *   Do you really want to leave this workspace?
+   *   Some more text with detailed explanations...
+   *   `,
+   *   ~danger=true,
+   *   // comment   --> here a single line comment
+   *   ~confirmText="Yes, I am sure!",
+   *   ~onConfirm={() => ()},
+   *  )
+   * In this case, we always want the arguments broken over multiple lines,
+   * like a normal function call.
+   *)
+  if state |> State.should_break_callback then Lazy.force break_all_args
+  else if Doc.will_break (Lazy.force printed_args) then
+    Lazy.force break_all_args
+  else
+    Doc.custom_layout
+      [
+        Lazy.force fits_on_one_line;
+        Lazy.force arugments_fit_on_one_line;
+        Lazy.force break_all_args;
+      ]
+
+and print_arguments ~state ~partial
+    (args : (Asttypes.arg_label * Parsetree.expression) list) cmt_tbl =
+  match args with
+  | [
+   ( Nolabel,
+     {
+       pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _);
+       pexp_loc = loc;
+     } );
+  ] ->
+    if has_leading_line_comment cmt_tbl loc then
+      let cmt = print_comments Doc.nil cmt_tbl loc in
+      Doc.concat
+        [
+          Doc.lparen;
+          Doc.indent (Doc.group (Doc.concat [Doc.soft_line; cmt]));
+          Doc.rparen;
+        ]
+    else Doc.text "()"
+  | [(Nolabel, arg)] when ParsetreeViewer.is_huggable_expression arg ->
+    let arg_doc =
+      let doc = print_expression_with_comments ~state arg cmt_tbl in
+      match Parens.expr arg with
+      | Parens.Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc arg braces
+      | Nothing -> doc
+    in
+    Doc.concat [Doc.lparen; arg_doc; Doc.rparen]
+  | args ->
+    (* Avoid printing trailing comma when there is ... in function application *)
+    let printed_args =
+      List.map (fun arg -> print_argument ~state arg cmt_tbl) args
+    in
+    Doc.group
+      (Doc.concat
+         [
+           Doc.lparen;
+           Doc.indent
+             (Doc.concat
+                [
+                  Doc.soft_line;
+                  Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) printed_args;
+                ]);
+           (if partial then Doc.nil else Doc.trailing_comma);
+           Doc.soft_line;
+           Doc.rparen;
+         ])
+
+(*
+ * argument ::=
+ *   | _                            (* syntax sugar *)
+ *   | expr
+ *   | expr : type
+ *   | ~ label-name
+ *   | ~ label-name
+ *   | ~ label-name ?
+ *   | ~ label-name =   expr
+ *   | ~ label-name =   _           (* syntax sugar *)
+ *   | ~ label-name =   expr : type
+ *   | ~ label-name = ? expr
+ *   | ~ label-name = ? _           (* syntax sugar *)
+ *   | ~ label-name = ? expr : type *)
+and print_argument ~state (arg_lbl, arg) cmt_tbl =
+  match (arg_lbl, arg) with
+  (* ~a (punned)*)
+  | ( Labelled {txt = lbl; loc = l0},
+      {
+        pexp_attributes = [];
+        pexp_desc = Pexp_ident {txt = Longident.Lident name};
+      } )
+    when lbl = name && not (ParsetreeViewer.is_braced_expr arg) ->
+    let loc = {l0 with loc_end = arg.pexp_loc.loc_end} in
+    let doc = Doc.concat [Doc.tilde; print_ident_like lbl] in
+    print_comments doc cmt_tbl loc
+  (* ~a: int (punned)*)
+  | ( Labelled {txt = lbl; loc = l0},
+      {
+        pexp_desc =
+          Pexp_constraint
+            ( ({pexp_desc = Pexp_ident {txt = Longident.Lident name}} as arg_expr),
+              typ );
+        pexp_attributes = [];
+      } )
+    when lbl = name && not (ParsetreeViewer.is_braced_expr arg_expr) ->
+    let loc = {l0 with loc_end = arg.pexp_loc.loc_end} in
+    let doc =
+      Doc.concat
+        [
+          Doc.tilde;
+          print_ident_like lbl;
+          Doc.text ": ";
+          print_typ_expr ~state typ cmt_tbl;
+        ]
+    in
+    print_comments doc cmt_tbl loc
+  (* ~a? (optional lbl punned)*)
+  | ( Optional {txt = lbl; loc},
+      {
+        pexp_desc = Pexp_ident {txt = Longident.Lident name};
+        pexp_attributes = [];
+      } )
+    when lbl = name ->
+    let doc = Doc.concat [Doc.tilde; print_ident_like lbl; Doc.question] in
+    print_comments doc cmt_tbl loc
+  | _lbl, expr ->
+    let arg_loc, printed_lbl, dotdotdot =
+      match arg_lbl with
+      | Nolabel -> (expr.pexp_loc, Doc.nil, false)
+      | Labelled {txt = "..."; loc} ->
+        let arg_loc = loc in
+        let doc = Doc.text "..." in
+        (loc, print_comments doc cmt_tbl arg_loc, true)
+      | Labelled {txt = lbl; loc} ->
+        let arg_loc = loc in
+        let doc = Doc.concat [Doc.tilde; print_ident_like lbl; Doc.equal] in
+        (loc, print_comments doc cmt_tbl arg_loc, false)
+      | Optional {txt = lbl; loc} ->
+        let arg_loc = loc in
+        let doc =
+          Doc.concat [Doc.tilde; print_ident_like lbl; Doc.equal; Doc.question]
+        in
+        (loc, print_comments doc cmt_tbl arg_loc, false)
+    in
+    let printed_expr =
+      let doc = print_expression_with_comments ~state expr cmt_tbl in
+      match Parens.expr expr with
+      | Parenthesized -> add_parens doc
+      | Braced braces -> print_braces doc expr braces
+      | Nothing -> doc
+    in
+    let loc = {arg_loc with loc_end = expr.pexp_loc.loc_end} in
+    let doc =
+      if dotdotdot then printed_lbl else Doc.concat [printed_lbl; printed_expr]
+    in
+    print_comments doc cmt_tbl loc
+
+and print_cases ~state (cases : Parsetree.case list) cmt_tbl =
+  Doc.breakable_group ~force_break:true
+    (Doc.concat
+       [
+         Doc.lbrace;
+         Doc.concat
+           [
+             Doc.line;
+             print_list
+               ~get_loc:(fun n ->
+                 {
+                   n.Parsetree.pc_lhs.ppat_loc with
+                   loc_end =
+                     (match ParsetreeViewer.process_braces_attr n.pc_rhs with
+                     | None, _ -> n.pc_rhs.pexp_loc.loc_end
+                     | Some ({loc}, _), _ -> loc.Location.loc_end);
+                 })
+               ~print:(print_case ~state) ~nodes:cases cmt_tbl;
+           ];
+         Doc.line;
+         Doc.rbrace;
+       ])
+
+and print_case ~state (case : Parsetree.case) cmt_tbl =
+  let rhs =
+    match case.pc_rhs.pexp_desc with
+    | Pexp_let _ | Pexp_letmodule _ | Pexp_letexception _ | Pexp_open _
+    | Pexp_sequence _ ->
+      print_expression_block ~state
+        ~braces:(ParsetreeViewer.is_braced_expr case.pc_rhs)
+        case.pc_rhs cmt_tbl
+    | _ -> (
+      let doc = print_expression_with_comments ~state case.pc_rhs cmt_tbl in
+      match Parens.expr case.pc_rhs with
+      | Parenthesized -> add_parens doc
+      | _ -> doc)
+  in
+
+  let guard =
+    match case.pc_guard with
+    | None -> Doc.nil
+    | Some expr ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.line;
+             Doc.text "if ";
+             print_expression_with_comments ~state expr cmt_tbl;
+           ])
+  in
+  let should_inline_rhs =
+    match case.pc_rhs.pexp_desc with
+    | Pexp_construct ({txt = Longident.Lident ("()" | "true" | "false")}, _)
+    | Pexp_constant _ | Pexp_ident _ ->
+      true
+    | _ when ParsetreeViewer.is_huggable_rhs case.pc_rhs -> true
+    | _ -> false
+  in
+  let should_indent_pattern =
+    match case.pc_lhs.ppat_desc with
+    | Ppat_or _ -> false
+    | _ -> true
+  in
+  let pattern_doc =
+    let doc = print_pattern ~state case.pc_lhs cmt_tbl in
+    match case.pc_lhs.ppat_desc with
+    | Ppat_constraint _ -> add_parens doc
+    | _ -> doc
+  in
+  let content =
+    Doc.concat
+      [
+        (if should_indent_pattern then Doc.indent pattern_doc else pattern_doc);
+        Doc.indent guard;
+        Doc.text " =>";
+        Doc.indent
+          (Doc.concat
+             [(if should_inline_rhs then Doc.space else Doc.line); rhs]);
+      ]
+  in
+  Doc.group (Doc.concat [Doc.text "| "; content])
+
+and print_expr_fun_parameters ~state ~in_callback ~async ~has_constraint
+    parameters cmt_tbl =
+  match parameters with
+  (* let f = _ => () *)
+  | [
+   ParsetreeViewer.Parameter
+     {
+       attrs = [];
+       lbl = Nolabel;
+       default_expr = None;
+       pat = {Parsetree.ppat_desc = Ppat_any; ppat_loc};
+     };
+  ] ->
+    let any =
+      let doc = if has_constraint then Doc.text "(_)" else Doc.text "_" in
+      print_comments doc cmt_tbl ppat_loc
+    in
+    if async then add_async any else any
+  (* let f = a => () *)
+  | [
+   ParsetreeViewer.Parameter
+     {
+       attrs = [];
+       lbl = Nolabel;
+       default_expr = None;
+       pat =
+         {
+           Parsetree.ppat_desc = Ppat_var string_loc;
+           Parsetree.ppat_attributes = attrs;
+         };
+     };
+  ] ->
+    let txt_doc =
+      let var = print_ident_like string_loc.txt in
+      let var =
+        match attrs with
+        | [] -> if has_constraint then add_parens var else var
+        | attrs ->
+          let attrs = print_attributes ~state attrs cmt_tbl in
+          add_parens (Doc.concat [attrs; var])
+      in
+      if async then add_async var else var
+    in
+    print_comments txt_doc cmt_tbl string_loc.loc
+  (* let f = () => () *)
+  | [
+   ParsetreeViewer.Parameter
+     {
+       attrs = [];
+       lbl = Nolabel;
+       default_expr = None;
+       pat =
+         {ppat_desc = Ppat_construct ({txt = Longident.Lident "()"; loc}, None)};
+     };
+  ] ->
+    let doc =
+      let lparen_rparen = Doc.text "()" in
+      if async then add_async lparen_rparen else lparen_rparen
+    in
+    print_comments doc cmt_tbl loc
+  (* let f = (~greeting, ~from as hometown, ~x=?) => () *)
+  | parameters ->
+    let in_callback =
+      match in_callback with
+      | FitsOnOneLine -> true
+      | _ -> false
+    in
+    let maybe_async_lparen =
+      let lparen = Doc.lparen in
+      if async then add_async lparen else lparen
+    in
+    let should_hug = ParsetreeViewer.parameters_should_hug parameters in
+    let printed_paramaters =
+      Doc.concat
+        [
+          (if should_hug || in_callback then Doc.nil else Doc.soft_line);
+          Doc.join
+            ~sep:(Doc.concat [Doc.comma; Doc.line])
+            (List.map
+               (fun p -> print_exp_fun_parameter ~state p cmt_tbl)
+               parameters);
+        ]
+    in
+    Doc.group
+      (Doc.concat
+         [
+           maybe_async_lparen;
+           (if should_hug || in_callback then printed_paramaters
+            else
+              Doc.concat
+                [
+                  Doc.indent printed_paramaters;
+                  Doc.trailing_comma;
+                  Doc.soft_line;
+                ]);
+           Doc.rparen;
+         ])
+
+and print_exp_fun_parameter ~state parameter cmt_tbl =
+  match parameter with
+  | ParsetreeViewer.NewTypes {attrs; locs = lbls} ->
+    Doc.group
+      (Doc.concat
+         [
+           print_attributes ~state attrs cmt_tbl;
+           Doc.text "type ";
+           (* XX *)
+           Doc.join ~sep:Doc.space
+             (List.map
+                (fun lbl ->
+                  print_comments
+                    (print_ident_like lbl.Asttypes.txt)
+                    cmt_tbl lbl.Asttypes.loc)
+                lbls);
+         ])
+  | Parameter {attrs; lbl; default_expr; pat = pattern} ->
+    let attrs = print_attributes ~state attrs cmt_tbl in
+    (* =defaultValue *)
+    let default_expr_doc =
+      match default_expr with
+      | Some expr ->
+        Doc.concat
+          [Doc.text "="; print_expression_with_comments ~state expr cmt_tbl]
+      | None -> Doc.nil
+    in
+    (* ~from as hometown
+     * ~from                   ->  punning *)
+    let label_with_pattern =
+      match (lbl, pattern) with
+      | Nolabel, pattern -> print_pattern ~state pattern cmt_tbl
+      | ( (Labelled {txt = lbl} | Optional {txt = lbl}),
+          {ppat_desc = Ppat_var string_loc; ppat_attributes} )
+        when lbl = string_loc.txt ->
+        (* ~d *)
+        Doc.concat
+          [
+            print_attributes ~state ppat_attributes cmt_tbl;
+            Doc.text "~";
+            print_ident_like lbl;
+          ]
+      | ( (Labelled {txt = lbl} | Optional {txt = lbl}),
+          {
+            ppat_desc = Ppat_constraint ({ppat_desc = Ppat_var {txt}}, typ);
+            ppat_attributes;
+          } )
+        when lbl = txt ->
+        (* ~d: e *)
+        Doc.concat
+          [
+            print_attributes ~state ppat_attributes cmt_tbl;
+            Doc.text "~";
+            print_ident_like lbl;
+            Doc.text ": ";
+            print_typ_expr ~state typ cmt_tbl;
+          ]
+      | (Labelled {txt = lbl} | Optional {txt = lbl}), pattern ->
+        (* ~b as c *)
+        Doc.concat
+          [
+            Doc.text "~";
+            print_ident_like lbl;
+            Doc.text " as ";
+            print_pattern ~state pattern cmt_tbl;
+          ]
+    in
+    let optional_label_suffix =
+      match (lbl, default_expr) with
+      | Optional _, None -> Doc.text "=?"
+      | _ -> Doc.nil
+    in
+    let doc =
+      Doc.group
+        (Doc.concat
+           [attrs; label_with_pattern; default_expr_doc; optional_label_suffix])
+    in
+    let lbl_loc = Asttypes.get_lbl_loc lbl in
+    let cmt_loc =
+      match default_expr with
+      | None -> {lbl_loc with loc_end = pattern.ppat_loc.loc_end}
+      | Some expr -> {lbl_loc with loc_end = expr.pexp_loc.loc_end}
+    in
+    print_comments doc cmt_tbl cmt_loc
+
+and print_expression_block ~state ~braces expr cmt_tbl =
+  let rec collect_rows acc expr =
+    match expr.Parsetree.pexp_desc with
+    | Parsetree.Pexp_letmodule (mod_name, mod_expr, expr2) ->
+      let name =
+        let doc = Doc.text mod_name.txt in
+        print_comments doc cmt_tbl mod_name.loc
+      in
+      let name, mod_expr =
+        match mod_expr.pmod_desc with
+        | Pmod_constraint (mod_expr2, mod_type)
+          when not
+                 (ParsetreeViewer.has_await_attribute mod_expr.pmod_attributes)
+          ->
+          let name =
+            Doc.concat
+              [name; Doc.text ": "; print_mod_type ~state mod_type cmt_tbl]
+          in
+          (name, mod_expr2)
+        | _ -> (name, mod_expr)
+      in
+      let let_module_doc =
+        Doc.concat
+          [
+            Doc.text "module ";
+            name;
+            Doc.text " = ";
+            print_mod_expr ~state mod_expr cmt_tbl;
+          ]
+      in
+      let loc = {expr.pexp_loc with loc_end = mod_expr.pmod_loc.loc_end} in
+      collect_rows ((loc, let_module_doc) :: acc) expr2
+    | Pexp_letexception (extension_constructor, expr2) ->
+      let loc =
+        let loc =
+          {expr.pexp_loc with loc_end = extension_constructor.pext_loc.loc_end}
+        in
+        match get_first_leading_comment cmt_tbl loc with
+        | None -> loc
+        | Some comment ->
+          let cmt_loc = Comment.loc comment in
+          {cmt_loc with loc_end = loc.loc_end}
+      in
+      let let_exception_doc =
+        print_exception_def ~state extension_constructor cmt_tbl
+      in
+      collect_rows ((loc, let_exception_doc) :: acc) expr2
+    | Pexp_open (override_flag, longident_loc, expr2) ->
+      let open_doc =
+        Doc.concat
+          [
+            Doc.text "open";
+            print_override_flag override_flag;
+            Doc.space;
+            print_longident_location longident_loc cmt_tbl;
+          ]
+      in
+      let loc = {expr.pexp_loc with loc_end = longident_loc.loc.loc_end} in
+      collect_rows ((loc, open_doc) :: acc) expr2
+    | Pexp_sequence (expr1, expr2) ->
+      let expr_doc =
+        let doc = print_expression ~state expr1 cmt_tbl in
+        match Parens.expr expr1 with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc expr1 braces
+        | Nothing -> doc
+      in
+      let loc = expr1.pexp_loc in
+      collect_rows ((loc, expr_doc) :: acc) expr2
+    | Pexp_let (rec_flag, value_bindings, expr2) -> (
+      let loc =
+        let loc =
+          match (value_bindings, List.rev value_bindings) with
+          | vb :: _, last_vb :: _ ->
+            {vb.pvb_loc with loc_end = last_vb.pvb_loc.loc_end}
+          | _ -> Location.none
+        in
+        match get_first_leading_comment cmt_tbl loc with
+        | None -> loc
+        | Some comment ->
+          let cmt_loc = Comment.loc comment in
+          {cmt_loc with loc_end = loc.loc_end}
+      in
+      let rec_flag =
+        match rec_flag with
+        | Asttypes.Nonrecursive -> Doc.nil
+        | Asttypes.Recursive -> Doc.text "rec "
+      in
+      let let_doc =
+        print_value_bindings ~state ~rec_flag value_bindings cmt_tbl
+      in
+      (* let () = {
+       *   let () = foo()
+       *   ()
+       * }
+       * We don't need to print the () on the last line of the block
+       *)
+      match expr2.pexp_desc with
+      | Pexp_construct ({txt = Longident.Lident "()"}, _) ->
+        List.rev ((loc, let_doc) :: acc)
+      | _ -> collect_rows ((loc, let_doc) :: acc) expr2)
+    | _ ->
+      let expr_doc =
+        let doc = print_expression ~state expr cmt_tbl in
+        match Parens.expr expr with
+        | Parens.Parenthesized -> add_parens doc
+        | Braced braces -> print_braces doc expr braces
+        | Nothing -> doc
+      in
+      List.rev ((expr.pexp_loc, expr_doc) :: acc)
+  in
+  let rows = collect_rows [] expr in
+  let block =
+    print_list ~get_loc:fst ~nodes:rows
+      ~print:(fun (_, doc) _ -> doc)
+      ~force_break:true cmt_tbl
+  in
+  Doc.breakable_group ~force_break:true
+    (if braces then
+       Doc.concat
+         [
+           Doc.lbrace;
+           Doc.indent (Doc.concat [Doc.line; block]);
+           Doc.line;
+           Doc.rbrace;
+         ]
+     else block)
+
+(*
+ * // user types:
+ * let f = (a, b) => { a + b }
+ *
+ * // printer: everything is on one line
+ * let f = (a, b) => { a + b }
+ *
+ * // user types: over multiple lines
+ * let f = (a, b) => {
+ *   a + b
+ * }
+ *
+ * // printer: over multiple lines
+ * let f = (a, b) => {
+ *   a + b
+ * }
+ *)
+and print_braces doc expr braces_loc =
+  let over_multiple_lines =
+    let open Location in
+    braces_loc.loc_end.pos_lnum > braces_loc.loc_start.pos_lnum
+  in
+  match expr.Parsetree.pexp_desc with
+  | Pexp_letmodule _ | Pexp_letexception _ | Pexp_let _ | Pexp_open _
+  | Pexp_sequence _ ->
+    (* already has braces *)
+    doc
+  | _ ->
+    Doc.breakable_group ~force_break:over_multiple_lines
+      (Doc.concat
+         [
+           Doc.lbrace;
+           Doc.indent
+             (Doc.concat
+                [
+                  Doc.soft_line;
+                  (if Parens.braced_expr expr then add_parens doc else doc);
+                ]);
+           Doc.soft_line;
+           Doc.rbrace;
+         ])
+
+and print_override_flag override_flag =
+  match override_flag with
+  | Asttypes.Override -> Doc.text "!"
+  | Fresh -> Doc.nil
+
+and print_direction_flag flag =
+  match flag with
+  | Asttypes.Downto -> Doc.text " downto "
+  | Asttypes.Upto -> Doc.text " to "
+
+and print_expression_record_row ~state {lid = lbl; x = expr; opt = optional}
+    cmt_tbl punning_allowed =
+  let cmt_loc = {lbl.loc with loc_end = expr.pexp_loc.loc_end} in
+  let doc =
+    Doc.group
+      (match expr.pexp_desc with
+      | Pexp_ident {txt = Lident key; loc = _keyLoc}
+        when punning_allowed && Longident.last lbl.txt = key ->
+        (* print punned field *)
+        Doc.concat
+          [
+            print_attributes ~state expr.pexp_attributes cmt_tbl;
+            (if optional then Doc.text "?" else Doc.nil);
+            print_lident_path lbl cmt_tbl;
+          ]
+      | _ ->
+        Doc.concat
+          [
+            print_lident_path lbl cmt_tbl;
+            Doc.text ": ";
+            (if optional then Doc.text "?" else Doc.nil);
+            (let doc = print_expression_with_comments ~state expr cmt_tbl in
+             match Parens.expr_record_row_rhs ~optional expr with
+             | Parens.Parenthesized -> add_parens doc
+             | Braced braces -> print_braces doc expr braces
+             | Nothing -> doc);
+          ])
+  in
+  print_comments doc cmt_tbl cmt_loc
+
+and print_bs_object_row ~state (lbl, expr) cmt_tbl =
+  let cmt_loc = {lbl.loc with loc_end = expr.pexp_loc.loc_end} in
+  let lbl_doc =
+    let doc =
+      Doc.concat [Doc.text "\""; print_longident lbl.txt; Doc.text "\""]
+    in
+    print_comments doc cmt_tbl lbl.loc
+  in
+  let doc =
+    Doc.concat
+      [
+        lbl_doc;
+        Doc.text ": ";
+        (let doc = print_expression_with_comments ~state expr cmt_tbl in
+         match Parens.expr expr with
+         | Parens.Parenthesized -> add_parens doc
+         | Braced braces -> print_braces doc expr braces
+         | Nothing -> doc);
+      ]
+  in
+  print_comments doc cmt_tbl cmt_loc
+
+and print_doc_comments ~state ?(sep = Doc.hard_line) cmt_tbl attrs =
+  Doc.concat
+    [
+      Doc.group
+        (Doc.join_with_sep
+           (List.map (fun attr -> print_attribute ~state attr cmt_tbl) attrs));
+      sep;
+    ]
+
+(* The optional loc indicates whether we need to print the attributes in
+ * relation to some location. In practise this means the following:
+ *  `@attr type t = string` -> on the same line, print on the same line
+ *  `@attr
+ *   type t = string` -> attr is on prev line, print the attributes
+ *   with a line break between, we respect the users' original layout *)
+and print_attributes ?loc ?(inline = false) ~state
+    (attrs : Parsetree.attributes) cmt_tbl =
+  match ParsetreeViewer.filter_parsing_attrs attrs with
+  | [] -> Doc.nil
+  | attrs ->
+    let comment_attrs, attrs =
+      ParsetreeViewer.partition_doc_comment_attributes attrs
+    in
+    let line_break =
+      match loc with
+      | None -> Doc.line
+      | Some loc -> (
+        match List.rev attrs with
+        | ({loc = first_loc}, _) :: _
+          when loc.loc_start.pos_lnum > first_loc.loc_end.pos_lnum ->
+          Doc.hard_line
+        | _ ->
+          let has_comment_attrs = not (comment_attrs = []) in
+          if has_comment_attrs then Doc.space else Doc.line)
+    in
+    let comment_doc =
+      match comment_attrs with
+      | [] -> Doc.nil
+      | comment_attrs -> print_doc_comments ~state cmt_tbl comment_attrs
+    in
+    let attrs_doc =
+      match attrs with
+      | [] -> Doc.nil
+      | _ ->
+        Doc.concat
+          [
+            Doc.group
+              (Doc.join_with_sep
+                 (List.map
+                    (fun attr -> print_attribute ~state attr cmt_tbl)
+                    attrs));
+            (if inline then Doc.space else line_break);
+          ]
+    in
+    Doc.concat [comment_doc; attrs_doc]
+
+and print_payload ~state (payload : Parsetree.payload) cmt_tbl =
+  match payload with
+  | PStr [] -> Doc.nil
+  | PStr [{pstr_desc = Pstr_eval (expr, attrs)}] ->
+    let expr_doc = print_expression_with_comments ~state expr cmt_tbl in
+    let needs_parens =
+      match attrs with
+      | [] -> false
+      | _ -> true
+    in
+    let should_hug = ParsetreeViewer.is_huggable_expression expr in
+    if should_hug then
+      Doc.concat
+        [
+          Doc.lparen;
+          print_attributes ~state attrs cmt_tbl;
+          (if needs_parens then add_parens expr_doc else expr_doc);
+          Doc.rparen;
+        ]
+    else
+      Doc.concat
+        [
+          Doc.lparen;
+          Doc.indent
+            (Doc.concat
+               [
+                 Doc.soft_line;
+                 print_attributes ~state attrs cmt_tbl;
+                 (if needs_parens then add_parens expr_doc else expr_doc);
+               ]);
+          Doc.soft_line;
+          Doc.rparen;
+        ]
+  | PStr [({pstr_desc = Pstr_value (_recFlag, _bindings)} as si)] ->
+    add_parens (print_structure_item ~state si cmt_tbl)
+  | PStr structure -> add_parens (print_structure ~state structure cmt_tbl)
+  | PTyp typ ->
+    Doc.concat
+      [
+        Doc.lparen;
+        Doc.text ":";
+        Doc.indent (Doc.concat [Doc.line; print_typ_expr ~state typ cmt_tbl]);
+        Doc.soft_line;
+        Doc.rparen;
+      ]
+  | PPat (pat, opt_expr) ->
+    let when_doc =
+      match opt_expr with
+      | Some expr ->
+        Doc.concat
+          [
+            Doc.line;
+            Doc.text "if ";
+            print_expression_with_comments ~state expr cmt_tbl;
+          ]
+      | None -> Doc.nil
+    in
+    Doc.concat
+      [
+        Doc.lparen;
+        Doc.indent
+          (Doc.concat
+             [
+               Doc.soft_line;
+               Doc.text "? ";
+               print_pattern ~state pat cmt_tbl;
+               when_doc;
+             ]);
+        Doc.soft_line;
+        Doc.rparen;
+      ]
+  | PSig signature ->
+    Doc.concat
+      [
+        Doc.lparen;
+        Doc.text ":";
+        Doc.indent
+          (Doc.concat [Doc.line; print_signature ~state signature cmt_tbl]);
+        Doc.soft_line;
+        Doc.rparen;
+      ]
+
+and print_attribute ?(standalone = false) ~state
+    ((id, payload) : Parsetree.attribute) cmt_tbl =
+  match (id, payload) with
+  | ( {txt = "res.doc"},
+      PStr
+        [
+          {
+            pstr_desc =
+              Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string (txt, _))}, _);
+          };
+        ] ) ->
+    ( Doc.concat
+        [
+          Doc.text (if standalone then "/***" else "/**");
+          Doc.text txt;
+          Doc.text "*/";
+        ],
+      Doc.hard_line )
+  | _ ->
+    ( Doc.group
+        (Doc.concat
+           [
+             Doc.text (if standalone then "@@" else "@");
+             Doc.text id.txt;
+             print_payload ~state payload cmt_tbl;
+           ]),
+      Doc.line )
+
+and print_mod_expr ~state mod_expr cmt_tbl =
+  let doc =
+    match mod_expr.pmod_desc with
+    | Pmod_ident longident_loc -> print_longident_location longident_loc cmt_tbl
+    | Pmod_structure [] ->
+      let should_break =
+        mod_expr.pmod_loc.loc_start.pos_lnum
+        < mod_expr.pmod_loc.loc_end.pos_lnum
+      in
+      Doc.breakable_group ~force_break:should_break
+        (Doc.concat
+           [
+             Doc.lbrace;
+             print_comments_inside cmt_tbl mod_expr.pmod_loc;
+             Doc.rbrace;
+           ])
+    | Pmod_structure structure ->
+      Doc.breakable_group ~force_break:true
+        (Doc.concat
+           [
+             Doc.lbrace;
+             Doc.indent
+               (Doc.concat
+                  [Doc.soft_line; print_structure ~state structure cmt_tbl]);
+             Doc.soft_line;
+             Doc.rbrace;
+           ])
+    | Pmod_unpack expr ->
+      let should_hug =
+        match expr.pexp_desc with
+        | Pexp_let _ -> true
+        | Pexp_constraint
+            ({pexp_desc = Pexp_let _}, {ptyp_desc = Ptyp_package _packageType})
+          ->
+          true
+        | _ -> false
+      in
+      let expr, module_constraint =
+        match expr.pexp_desc with
+        | Pexp_constraint
+            (expr, {ptyp_desc = Ptyp_package package_type; ptyp_loc}) ->
+          let package_doc =
+            let doc =
+              print_package_type ~state ~print_module_keyword_and_parens:false
+                package_type cmt_tbl
+            in
+            print_comments doc cmt_tbl ptyp_loc
+          in
+          let type_doc =
+            Doc.group
+              (Doc.concat
+                 [Doc.text ":"; Doc.indent (Doc.concat [Doc.line; package_doc])])
+          in
+          (expr, type_doc)
+        | _ -> (expr, Doc.nil)
+      in
+      let unpack_doc =
+        Doc.group
+          (Doc.concat
+             [
+               print_expression_with_comments ~state expr cmt_tbl;
+               module_constraint;
+             ])
+      in
+      Doc.group
+        (Doc.concat
+           [
+             Doc.text "unpack(";
+             (if should_hug then unpack_doc
+              else
+                Doc.concat
+                  [
+                    Doc.indent (Doc.concat [Doc.soft_line; unpack_doc]);
+                    Doc.soft_line;
+                  ]);
+             Doc.rparen;
+           ])
+    | Pmod_extension extension ->
+      print_extension ~state ~at_module_lvl:false extension cmt_tbl
+    | Pmod_apply _ ->
+      let args, call_expr = ParsetreeViewer.mod_expr_apply mod_expr in
+      let is_unit_sugar =
+        match args with
+        | [{pmod_desc = Pmod_structure []}] -> true
+        | _ -> false
+      in
+      let should_hug =
+        match args with
+        | [{pmod_desc = Pmod_structure _}] -> true
+        | _ -> false
+      in
+      Doc.group
+        (Doc.concat
+           [
+             print_mod_expr ~state call_expr cmt_tbl;
+             (if is_unit_sugar then
+                print_mod_apply_arg ~state
+                  (List.hd args [@doesNotRaise])
+                  cmt_tbl
+              else
+                Doc.concat
+                  [
+                    Doc.lparen;
+                    (if should_hug then
+                       print_mod_apply_arg ~state
+                         (List.hd args [@doesNotRaise])
+                         cmt_tbl
+                     else
+                       Doc.indent
+                         (Doc.concat
+                            [
+                              Doc.soft_line;
+                              Doc.join
+                                ~sep:(Doc.concat [Doc.comma; Doc.line])
+                                (List.map
+                                   (fun mod_arg ->
+                                     print_mod_apply_arg ~state mod_arg cmt_tbl)
+                                   args);
+                            ]));
+                    (if not should_hug then
+                       Doc.concat [Doc.trailing_comma; Doc.soft_line]
+                     else Doc.nil);
+                    Doc.rparen;
+                  ]);
+           ])
+    | Pmod_constraint (mod_expr, mod_type) ->
+      Doc.concat
+        [
+          print_mod_expr ~state mod_expr cmt_tbl;
+          Doc.text ": ";
+          print_mod_type ~state mod_type cmt_tbl;
+        ]
+    | Pmod_functor _ -> print_mod_functor ~state mod_expr cmt_tbl
+  in
+  let doc =
+    if ParsetreeViewer.has_await_attribute mod_expr.pmod_attributes then
+      match mod_expr.pmod_desc with
+      | Pmod_constraint _ ->
+        Doc.concat [Doc.text "await "; Doc.lparen; doc; Doc.rparen]
+      | _ -> Doc.concat [Doc.text "await "; doc]
+    else doc
+  in
+  print_comments doc cmt_tbl mod_expr.pmod_loc
+
+and print_mod_functor ~state mod_expr cmt_tbl =
+  let parameters, return_mod_expr = ParsetreeViewer.mod_expr_functor mod_expr in
+  (* let shouldInline = match returnModExpr.pmod_desc with *)
+  (* | Pmod_structure _ | Pmod_ident _ -> true *)
+  (* | Pmod_constraint ({pmod_desc = Pmod_structure _}, _) -> true *)
+  (* | _ -> false *)
+  (* in *)
+  let return_constraint, return_mod_expr =
+    match return_mod_expr.pmod_desc with
+    | Pmod_constraint (mod_expr, mod_type) ->
+      let constraint_doc =
+        let doc = print_mod_type ~state mod_type cmt_tbl in
+        if Parens.mod_expr_functor_constraint mod_type then add_parens doc
+        else doc
+      in
+      let mod_constraint = Doc.concat [Doc.text ": "; constraint_doc] in
+      (mod_constraint, print_mod_expr ~state mod_expr cmt_tbl)
+    | _ -> (Doc.nil, print_mod_expr ~state return_mod_expr cmt_tbl)
+  in
+  let parameters_doc =
+    match parameters with
+    | [(attrs, {txt = "*"}, None)] ->
+      Doc.group
+        (Doc.concat [print_attributes ~state attrs cmt_tbl; Doc.text "()"])
+    | [([], {txt = lbl}, None)] -> Doc.text lbl
+    | parameters ->
+      Doc.group
+        (Doc.concat
+           [
+             Doc.lparen;
+             Doc.indent
+               (Doc.concat
+                  [
+                    Doc.soft_line;
+                    Doc.join
+                      ~sep:(Doc.concat [Doc.comma; Doc.line])
+                      (List.map
+                         (fun param ->
+                           print_mod_functor_param ~state param cmt_tbl)
+                         parameters);
+                  ]);
+             Doc.trailing_comma;
+             Doc.soft_line;
+             Doc.rparen;
+           ])
+  in
+  Doc.group
+    (Doc.concat
+       [parameters_doc; return_constraint; Doc.text " => "; return_mod_expr])
+
+and print_mod_functor_param ~state (attrs, lbl, opt_mod_type) cmt_tbl =
+  let cmt_loc =
+    match opt_mod_type with
+    | None -> lbl.Asttypes.loc
+    | Some mod_type ->
+      {lbl.loc with loc_end = mod_type.Parsetree.pmty_loc.loc_end}
+  in
+  let attrs = print_attributes ~state attrs cmt_tbl in
+  let lbl_doc =
+    let doc = if lbl.txt = "*" then Doc.text "()" else Doc.text lbl.txt in
+    print_comments doc cmt_tbl lbl.loc
+  in
+  let doc =
+    Doc.group
+      (Doc.concat
+         [
+           attrs;
+           lbl_doc;
+           (match opt_mod_type with
+           | None -> Doc.nil
+           | Some mod_type ->
+             Doc.concat [Doc.text ": "; print_mod_type ~state mod_type cmt_tbl]);
+         ])
+  in
+  print_comments doc cmt_tbl cmt_loc
+
+and print_mod_apply_arg ~state mod_expr cmt_tbl =
+  match mod_expr.pmod_desc with
+  | Pmod_structure [] -> Doc.text "()"
+  | _ -> print_mod_expr ~state mod_expr cmt_tbl
+
+and print_exception_def ~state (constr : Parsetree.extension_constructor)
+    cmt_tbl =
+  let kind =
+    match constr.pext_kind with
+    | Pext_rebind longident ->
+      Doc.indent
+        (Doc.concat
+           [Doc.text " ="; Doc.line; print_longident_location longident cmt_tbl])
+    | Pext_decl (Pcstr_tuple [], None) -> Doc.nil
+    | Pext_decl (args, gadt) ->
+      let gadt_doc =
+        match gadt with
+        | Some typ ->
+          Doc.concat [Doc.text ": "; print_typ_expr ~state typ cmt_tbl]
+        | None -> Doc.nil
+      in
+      Doc.concat
+        [
+          print_constructor_arguments ~state ~indent:false args cmt_tbl; gadt_doc;
+        ]
+  in
+  let name =
+    print_comments (Doc.text constr.pext_name.txt) cmt_tbl constr.pext_name.loc
+  in
+  let doc =
+    Doc.group
+      (Doc.concat
+         [
+           print_attributes ~state constr.pext_attributes cmt_tbl;
+           Doc.text "exception ";
+           name;
+           kind;
+         ])
+  in
+  print_comments doc cmt_tbl constr.pext_loc
+
+and print_extension_constructor ~state
+    (constr : Parsetree.extension_constructor) cmt_tbl i =
+  let attrs = print_attributes ~state constr.pext_attributes cmt_tbl in
+  let bar =
+    if i > 0 then Doc.text "| " else Doc.if_breaks (Doc.text "| ") Doc.nil
+  in
+  let kind =
+    match constr.pext_kind with
+    | Pext_rebind longident ->
+      Doc.indent
+        (Doc.concat
+           [Doc.text " ="; Doc.line; print_longident_location longident cmt_tbl])
+    | Pext_decl (Pcstr_tuple [], None) -> Doc.nil
+    | Pext_decl (args, gadt) ->
+      let gadt_doc =
+        match gadt with
+        | Some typ ->
+          Doc.concat [Doc.text ": "; print_typ_expr ~state typ cmt_tbl]
+        | None -> Doc.nil
+      in
+      Doc.concat
+        [
+          print_constructor_arguments ~state ~indent:false args cmt_tbl; gadt_doc;
+        ]
+  in
+  let name =
+    print_comments (Doc.text constr.pext_name.txt) cmt_tbl constr.pext_name.loc
+  in
+  Doc.concat [bar; Doc.group (Doc.concat [attrs; name; kind])]
+
+let print_type_params params = print_type_params ~state:(State.init ()) params
+let print_typ_expr t = print_typ_expr ~state:(State.init ()) t
+let print_expression e = print_expression ~state:(State.init ()) e
+let print_pattern p = print_pattern ~state:(State.init ()) p
+
+let print_implementation ?(width = default_print_width)
+    (s : Parsetree.structure) ~comments =
+  let cmt_tbl = CommentTable.make () in
+  CommentTable.walk_structure s cmt_tbl comments;
+  (* CommentTable.log cmt_tbl; *)
+  let doc = print_structure ~state:(State.init ()) s cmt_tbl in
+  (* Doc.debug doc; *)
+  Doc.to_string ~width doc ^ "\n"
+
+let print_interface ?(width = default_print_width) (s : Parsetree.signature)
+    ~comments =
+  let cmt_tbl = CommentTable.make () in
+  CommentTable.walk_signature s cmt_tbl comments;
+  Doc.to_string ~width (print_signature ~state:(State.init ()) s cmt_tbl) ^ "\n"
+
+let print_structure = print_structure ~state:(State.init ())
diff --git a/compiler/syntax/src/res_printer.mli b/compiler/syntax/src/res_printer.mli
new file mode 100644
index 0000000..33461d7
--- /dev/null
+++ b/compiler/syntax/src/res_printer.mli
@@ -0,0 +1,32 @@
+val default_print_width : int
+
+val print_type_params :
+  (Parsetree.core_type * Asttypes.variance) list ->
+  Res_comments_table.t ->
+  Res_doc.t
+
+val print_longident : Longident.t -> Res_doc.t
+
+val print_typ_expr : Parsetree.core_type -> Res_comments_table.t -> Res_doc.t
+
+val add_parens : Res_doc.t -> Res_doc.t
+
+val print_expression : Parsetree.expression -> Res_comments_table.t -> Res_doc.t
+
+val print_pattern : Parsetree.pattern -> Res_comments_table.t -> Res_doc.t
+[@@live]
+
+val print_structure : Parsetree.structure -> Res_comments_table.t -> Res_doc.t
+[@@live]
+
+val print_implementation :
+  ?width:int -> Parsetree.structure -> comments:Res_comment.t list -> string
+val print_interface :
+  ?width:int -> Parsetree.signature -> comments:Res_comment.t list -> string
+
+val print_ident_like :
+  ?allow_uident:bool -> ?allow_hyphen:bool -> string -> Res_doc.t
+
+val print_poly_var_ident : string -> Res_doc.t
+
+val polyvar_ident_to_string : string -> string [@@live]
diff --git a/jscomp/syntax/src/res_reporting.ml b/compiler/syntax/src/res_reporting.ml
similarity index 87%
rename from jscomp/syntax/src/res_reporting.ml
rename to compiler/syntax/src/res_reporting.ml
index 77d370a..53a3eed 100644
--- a/jscomp/syntax/src/res_reporting.ml
+++ b/compiler/syntax/src/res_reporting.ml
@@ -13,4 +13,4 @@ type problem =
   | Lident [@live]
   | Unbalanced of Token.t [@live]
 
-type parseError = Lexing.position * problem
+type parse_error = Lexing.position * problem
diff --git a/compiler/syntax/src/res_scanner.ml b/compiler/syntax/src/res_scanner.ml
new file mode 100644
index 0000000..5615b32
--- /dev/null
+++ b/compiler/syntax/src/res_scanner.ml
@@ -0,0 +1,1057 @@
+module Diagnostics = Res_diagnostics
+module Token = Res_token
+module Comment = Res_comment
+
+type mode = Diamond
+
+(* We hide the implementation detail of the scanner reading character. Our char
+   will also contain the special -1 value to indicate end-of-file. This isn't
+   ideal; we should clean this up *)
+let hacky_eof_char = Char.unsafe_chr (-1)
+type char_encoding = Char.t
+
+type t = {
+  filename: string;
+  src: string;
+  mutable err:
+    start_pos:Lexing.position ->
+    end_pos:Lexing.position ->
+    Diagnostics.category ->
+    unit;
+  mutable ch: char_encoding; (* current character *)
+  mutable offset: int; (* current byte offset *)
+  mutable offset16: int;
+      (* current number of utf16 code units since line start *)
+  mutable line_offset: int; (* current line offset *)
+  mutable lnum: int; (* current line number *)
+  mutable mode: mode list;
+}
+
+let set_diamond_mode scanner = scanner.mode <- Diamond :: scanner.mode
+
+let pop_mode scanner mode =
+  match scanner.mode with
+  | m :: ms when m = mode -> scanner.mode <- ms
+  | _ -> ()
+
+let in_diamond_mode scanner =
+  match scanner.mode with
+  | Diamond :: _ -> true
+  | _ -> false
+
+let position scanner =
+  Lexing.
+    {
+      pos_fname = scanner.filename;
+      (* line number *)
+      pos_lnum = scanner.lnum;
+      (* offset of the beginning of the line (number
+         of bytes between the beginning of the scanner and the beginning
+         of the line) *)
+      pos_bol = scanner.line_offset;
+      (* [pos_cnum - pos_bol]  is the number of utf16 code units since line start *)
+      pos_cnum = scanner.line_offset + scanner.offset16;
+    }
+
+(* Small debugging util
+   ❯ echo 'let msg = "hello"' | ./lib/rescript-legacy.exe
+   let msg = "hello"
+   ^-^ let 0-3
+   let msg = "hello"
+       ^-^ msg 4-7
+   let msg = "hello"
+           ^ = 8-9
+   let msg = "hello"
+             ^-----^ string "hello" 10-17
+   let msg = "hello"
+                     ^ eof 18-18
+   let msg = "hello"
+*)
+let _printDebug ~start_pos ~end_pos scanner token =
+  let open Lexing in
+  print_string scanner.src;
+  print_string ((String.make [@doesNotRaise]) start_pos.pos_cnum ' ');
+  print_char '^';
+  (match end_pos.pos_cnum - start_pos.pos_cnum with
+  | 0 -> if token = Token.Eof then () else assert false
+  | 1 -> ()
+  | n ->
+    print_string ((String.make [@doesNotRaise]) (n - 2) '-');
+    print_char '^');
+  print_char ' ';
+  print_string (Res_token.to_string token);
+  print_char ' ';
+  print_int start_pos.pos_cnum;
+  print_char '-';
+  print_int end_pos.pos_cnum;
+  print_endline ""
+[@@live]
+
+let next scanner =
+  let next_offset = scanner.offset + 1 in
+  let utf16len =
+    match Ext_utf8.classify scanner.ch with
+    | Single _ | Invalid -> 1
+    | Leading (n, _) -> ( (((n + 1) / 2) [@doesNotRaise]))
+    | Cont _ -> 0
+  in
+  let newline =
+    scanner.ch = '\n'
+    (* What about CRLF (\r + \n) on windows?
+       \r\n will always be terminated by a \n
+       -> we can just bump the line count on \n *)
+  in
+  if newline then (
+    scanner.line_offset <- next_offset;
+    scanner.offset16 <- 0;
+    scanner.lnum <- scanner.lnum + 1)
+  else scanner.offset16 <- scanner.offset16 + utf16len;
+  if next_offset < String.length scanner.src then (
+    scanner.offset <- next_offset;
+    scanner.ch <- String.unsafe_get scanner.src next_offset)
+  else (
+    scanner.offset <- String.length scanner.src;
+    scanner.offset16 <- scanner.offset - scanner.line_offset;
+    scanner.ch <- hacky_eof_char)
+
+let next2 scanner =
+  next scanner;
+  next scanner
+
+let next3 scanner =
+  next scanner;
+  next scanner;
+  next scanner
+
+let peek scanner =
+  if scanner.offset + 1 < String.length scanner.src then
+    String.unsafe_get scanner.src (scanner.offset + 1)
+  else hacky_eof_char
+
+let peek2 scanner =
+  if scanner.offset + 2 < String.length scanner.src then
+    String.unsafe_get scanner.src (scanner.offset + 2)
+  else hacky_eof_char
+
+let peek3 scanner =
+  if scanner.offset + 3 < String.length scanner.src then
+    String.unsafe_get scanner.src (scanner.offset + 3)
+  else hacky_eof_char
+
+let peekChar scanner target_char =
+  let rec skip_whitespace_and_check offset =
+    if offset < String.length scanner.src then
+      let ch = String.unsafe_get scanner.src offset in
+      match ch with
+      | ' ' | '\t' | '\n' | '\r' -> skip_whitespace_and_check (offset + 1)
+      | c -> c = target_char
+    else false
+  in
+  skip_whitespace_and_check scanner.offset
+
+let peekMinus scanner = peekChar scanner '-'
+let peekSlash scanner = peekChar scanner '/'
+
+let make ~filename src =
+  {
+    filename;
+    src;
+    err = (fun ~start_pos:_ ~end_pos:_ _ -> ());
+    ch = (if src = "" then hacky_eof_char else String.unsafe_get src 0);
+    offset = 0;
+    offset16 = 0;
+    line_offset = 0;
+    lnum = 1;
+    mode = [];
+  }
+
+(* generic helpers *)
+
+let is_whitespace ch =
+  match ch with
+  | ' ' | '\t' | '\n' | '\r' -> true
+  | _ -> false
+
+let rec skip_whitespace scanner =
+  if is_whitespace scanner.ch then (
+    next scanner;
+    skip_whitespace scanner)
+
+let digit_value ch =
+  match ch with
+  | '0' .. '9' -> Char.code ch - 48
+  | 'a' .. 'f' -> Char.code ch - Char.code 'a' + 10
+  | 'A' .. 'F' -> Char.code ch + 32 - Char.code 'a' + 10
+  | _ -> 16 (* larger than any legal value *)
+
+(* scanning helpers *)
+
+let scan_identifier scanner =
+  let start_off = scanner.offset in
+  let rec skip_good_chars scanner =
+    match scanner.ch with
+    | 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '_' | '\'' ->
+      next scanner;
+      skip_good_chars scanner
+    | _ -> ()
+  in
+  skip_good_chars scanner;
+  let str =
+    (String.sub [@doesNotRaise]) scanner.src start_off
+      (scanner.offset - start_off)
+  in
+  match (scanner, str) with
+  | {ch = '{'}, "list" ->
+    next scanner;
+    (* TODO: this isn't great *)
+    Token.lookup_keyword "list{"
+  | {ch = '{'}, "dict" ->
+    next scanner;
+    (* TODO: this isn't great *)
+    Token.lookup_keyword "dict{"
+  | {ch = '?'}, "let" ->
+    next scanner;
+    (* TODO: this isn't great *)
+    Token.lookup_keyword "let?"
+  | _ -> Token.lookup_keyword str
+
+let scan_digits scanner ~base =
+  if base <= 10 then
+    let rec loop scanner found_digits =
+      match scanner.ch with
+      | '0' .. '9' ->
+        next scanner;
+        loop scanner true
+      | '_' ->
+        next scanner;
+        loop scanner false
+      | _ -> found_digits
+    in
+    loop scanner false
+  else
+    let rec loop scanner found_digits =
+      match scanner.ch with
+      (* hex *)
+      | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' ->
+        next scanner;
+        loop scanner true
+      | '_' ->
+        next scanner;
+        loop scanner false
+      | _ -> found_digits
+    in
+    loop scanner false
+
+(* float: (0…9) { 0…9∣ _ } [. { 0…9∣ _ }] [(e∣ E) [+∣ -] (0…9) { 0…9∣ _ }]   *)
+let scan_number scanner =
+  let start_off = scanner.offset in
+
+  (* integer part *)
+  let base =
+    match scanner.ch with
+    | '0' -> (
+      match peek scanner with
+      | 'x' | 'X' ->
+        next2 scanner;
+        16
+      | 'o' | 'O' ->
+        next2 scanner;
+        8
+      | 'b' | 'B' ->
+        next2 scanner;
+        2
+      | _ ->
+        next scanner;
+        8)
+    | _ -> 10
+  in
+  let _ : bool = scan_digits scanner ~base in
+
+  (* *)
+  let is_float =
+    if '.' == scanner.ch then (
+      next scanner;
+      let _ : bool = scan_digits scanner ~base in
+      true)
+    else false
+  in
+
+  (* exponent part *)
+  let is_float =
+    let start_pos = position scanner in
+    match scanner.ch with
+    | 'e' | 'E' | 'p' | 'P' ->
+      (match peek scanner with
+      | '+' | '-' -> next2 scanner
+      | _ -> next scanner);
+      let end_pos = position scanner in
+      let found_digits = scan_digits scanner ~base in
+      if not found_digits then
+        scanner.err ~start_pos ~end_pos
+          (Diagnostics.message "Expected digits after exponential notation.");
+      true
+    | _ -> is_float
+  in
+  let literal =
+    (String.sub [@doesNotRaise]) scanner.src start_off
+      (scanner.offset - start_off)
+  in
+
+  (* suffix *)
+  let suffix =
+    match scanner.ch with
+    | ('g' .. 'z' | 'G' .. 'Z') as ch ->
+      next scanner;
+      Some ch
+    | _ -> None
+  in
+  if is_float then Token.Float {f = literal; suffix}
+  else Token.Int {i = literal; suffix}
+
+let scan_exotic_identifier scanner =
+  let start_pos = position scanner in
+  let start_off = scanner.offset in
+
+  next2 scanner;
+
+  let rec scan () =
+    match scanner.ch with
+    | '"' -> next scanner
+    | '\n' | '\r' ->
+      (* line break *)
+      let end_pos = position scanner in
+      scanner.err ~start_pos ~end_pos
+        (Diagnostics.message "A quoted identifier can't contain line breaks.");
+      next scanner
+    | ch when ch == hacky_eof_char ->
+      let end_pos = position scanner in
+      scanner.err ~start_pos ~end_pos
+        (Diagnostics.message "Did you forget a \" here?")
+    | _ ->
+      next scanner;
+      scan ()
+  in
+  scan ();
+
+  let ident =
+    (String.sub [@doesNotRaise]) scanner.src start_off
+      (scanner.offset - start_off)
+  in
+  let name = Ext_ident.unwrap_uppercase_exotic ident in
+  if name = String.empty then (
+    let end_pos = position scanner in
+    scanner.err ~start_pos ~end_pos
+      (Diagnostics.message "A quoted identifier can't be empty string.");
+    Token.Lident ident)
+  else if Ext_ident.is_uident name then Token.Lident ident
+    (* Exotic ident with uppercase letter should be encoded to avoid confusing in OCaml parsetree *)
+  else Token.Lident name
+
+let scan_string_escape_sequence ~start_pos scanner =
+  let scan ~n ~base ~max =
+    let rec loop n x =
+      if n == 0 then x
+      else
+        let d = digit_value scanner.ch in
+        if d >= base then (
+          let pos = position scanner in
+          let msg =
+            if scanner.ch == hacky_eof_char then "unclosed escape sequence"
+            else "unknown escape sequence"
+          in
+          scanner.err ~start_pos ~end_pos:pos (Diagnostics.message msg);
+          -1)
+        else
+          let () = next scanner in
+          loop (n - 1) ((x * base) + d)
+    in
+    let x = loop n 0 in
+    if x > max || (0xD800 <= x && x < 0xE000) then
+      let pos = position scanner in
+      let msg = "escape sequence is invalid unicode code point" in
+      scanner.err ~start_pos ~end_pos:pos (Diagnostics.message msg)
+  in
+  match scanner.ch with
+  (* \ already consumed *)
+  | 'n' | 't' | 'b' | 'r' | '\\' | ' ' | '\'' | '"' -> next scanner
+  | '0'
+    when let c = peek scanner in
+         c < '0' || c > '9' ->
+    (* Allow \0 *)
+    next scanner
+  | '0' .. '9' -> scan ~n:3 ~base:10 ~max:255
+  | 'x' ->
+    (* hex *)
+    next scanner;
+    scan ~n:2 ~base:16 ~max:255
+  | 'u' -> (
+    next scanner;
+    match scanner.ch with
+    | '{' -> (
+      (* unicode code point escape sequence: '\u{7A}', one or more hex digits *)
+      next scanner;
+      let x = ref 0 in
+      while
+        match scanner.ch with
+        | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' -> true
+        | _ -> false
+      do
+        x := (!x * 16) + digit_value scanner.ch;
+        next scanner
+      done;
+      (* consume '}' in '\u{7A}' *)
+      match scanner.ch with
+      | '}' -> next scanner
+      | _ -> ())
+    | _ -> scan ~n:4 ~base:16 ~max:Res_utf8.max)
+  | _ ->
+    (* unknown escape sequence
+     * TODO: we should warn the user here. Let's not make it a hard error for now, for reason compat *)
+    (*
+      let pos = position scanner in
+      let msg =
+        if ch == -1 then "unclosed escape sequence"
+        else "unknown escape sequence"
+      in
+      scanner.err ~startPos ~endPos:pos (Diagnostics.message msg)
+     *)
+    ()
+
+let scan_string scanner =
+  (* assumption: we've just matched a quote *)
+  let start_pos_with_quote = position scanner in
+  next scanner;
+
+  (* If the text needs changing, a buffer is used *)
+  let buf = Buffer.create 0 in
+  let first_char_offset = scanner.offset in
+  let last_offset_in_buf = ref first_char_offset in
+
+  let bring_buf_up_to_date ~start_offset =
+    let str_up_to_now =
+      (String.sub scanner.src !last_offset_in_buf
+         (start_offset - !last_offset_in_buf) [@doesNotRaise])
+    in
+    Buffer.add_string buf str_up_to_now;
+    last_offset_in_buf := start_offset
+  in
+
+  let result ~first_char_offset ~last_char_offset =
+    if Buffer.length buf = 0 then
+      (String.sub [@doesNotRaise]) scanner.src first_char_offset
+        (last_char_offset - first_char_offset)
+    else (
+      bring_buf_up_to_date ~start_offset:last_char_offset;
+      Buffer.contents buf)
+  in
+
+  let rec scan () =
+    match scanner.ch with
+    | '"' ->
+      let last_char_offset = scanner.offset in
+      next scanner;
+      result ~first_char_offset ~last_char_offset
+    | '\\' ->
+      let start_pos = position scanner in
+      let start_offset = scanner.offset + 1 in
+      next scanner;
+      scan_string_escape_sequence ~start_pos scanner;
+      let end_offset = scanner.offset in
+      convert_octal_to_hex ~start_offset ~end_offset
+    | ch when ch == hacky_eof_char ->
+      let end_pos = position scanner in
+      scanner.err ~start_pos:start_pos_with_quote ~end_pos
+        Diagnostics.unclosed_string;
+      let last_char_offset = scanner.offset in
+      result ~first_char_offset ~last_char_offset
+    | _ ->
+      next scanner;
+      scan ()
+  and convert_octal_to_hex ~start_offset ~end_offset =
+    let len = end_offset - start_offset in
+    let is_digit = function
+      | '0' .. '9' -> true
+      | _ -> false
+    in
+    let txt = scanner.src in
+    let is_numeric_escape =
+      len = 3
+      && (is_digit txt.[start_offset] [@doesNotRaise])
+      && (is_digit txt.[start_offset + 1] [@doesNotRaise])
+      && (is_digit txt.[start_offset + 2] [@doesNotRaise])
+    in
+    if is_numeric_escape then (
+      let str_decimal = (String.sub txt start_offset 3 [@doesNotRaise]) in
+      bring_buf_up_to_date ~start_offset;
+      let str_hex = Res_string.convert_decimal_to_hex ~str_decimal in
+      last_offset_in_buf := start_offset + 3;
+      Buffer.add_string buf str_hex;
+      scan ())
+    else scan ()
+  in
+  Token.String (scan ())
+
+let scan_escape scanner =
+  (* '\' consumed *)
+  let offset = scanner.offset - 1 in
+  let convert_number scanner ~n ~base =
+    let x = ref 0 in
+    for _ = n downto 1 do
+      let d = digit_value scanner.ch in
+      x := (!x * base) + d;
+      next scanner
+    done;
+    let c = !x in
+    if Res_utf8.is_valid_code_point c then c else Res_utf8.repl
+  in
+  let codepoint =
+    match scanner.ch with
+    | '0' .. '9' -> convert_number scanner ~n:3 ~base:10
+    | 'b' ->
+      next scanner;
+      8
+    | 'n' ->
+      next scanner;
+      10
+    | 'r' ->
+      next scanner;
+      13
+    | 't' ->
+      next scanner;
+      009
+    | 'x' ->
+      next scanner;
+      convert_number scanner ~n:2 ~base:16
+    | 'o' ->
+      next scanner;
+      convert_number scanner ~n:3 ~base:8
+    | 'u' -> (
+      next scanner;
+      match scanner.ch with
+      | '{' ->
+        (* unicode code point escape sequence: '\u{7A}', one or more hex digits *)
+        next scanner;
+        let x = ref 0 in
+        while
+          match scanner.ch with
+          | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' -> true
+          | _ -> false
+        do
+          x := (!x * 16) + digit_value scanner.ch;
+          next scanner
+        done;
+        (* consume '}' in '\u{7A}' *)
+        (match scanner.ch with
+        | '}' -> next scanner
+        | _ -> ());
+        let c = !x in
+        if Res_utf8.is_valid_code_point c then c else Res_utf8.repl
+      | _ ->
+        (* unicode escape sequence: '\u007A', exactly 4 hex digits *)
+        convert_number scanner ~n:4 ~base:16)
+    | ch ->
+      next scanner;
+      Char.code ch
+  in
+  let contents =
+    (String.sub [@doesNotRaise]) scanner.src offset (scanner.offset - offset)
+  in
+  next scanner;
+  (* Consume \' *)
+  (* TODO: do we know it's \' ? *)
+  Token.Codepoint {c = codepoint; original = contents}
+
+let scan_regex scanner =
+  let start_pos = position scanner in
+  let buf = Buffer.create 0 in
+  let first_char_offset = scanner.offset in
+  let last_offset_in_buf = ref first_char_offset in
+
+  let bring_buf_up_to_date ~start_offset =
+    let str_up_to_now =
+      (String.sub scanner.src !last_offset_in_buf
+         (start_offset - !last_offset_in_buf) [@doesNotRaise])
+    in
+    Buffer.add_string buf str_up_to_now;
+    last_offset_in_buf := start_offset
+  in
+
+  let result ~first_char_offset ~last_char_offset =
+    if Buffer.length buf = 0 then
+      (String.sub [@doesNotRaise]) scanner.src first_char_offset
+        (last_char_offset - first_char_offset)
+    else (
+      bring_buf_up_to_date ~start_offset:last_char_offset;
+      Buffer.contents buf)
+  in
+  let rec scan ?(in_char_class = false) () =
+    match scanner.ch with
+    | '/' when not in_char_class ->
+      let last_char_offset = scanner.offset in
+      next scanner;
+      let pattern = result ~first_char_offset ~last_char_offset in
+      let flags =
+        let flags_buf = Buffer.create 0 in
+        let rec scan_flags () =
+          match scanner.ch with
+          | 'd' | 'g' | 'i' | 'm' | 's' | 'u' | 'v' | 'y' ->
+            Buffer.add_char flags_buf scanner.ch;
+            next scanner;
+            scan_flags ()
+          | _ -> Buffer.contents flags_buf
+        in
+        scan_flags ()
+      in
+      (pattern, flags)
+    | ch when ch == '\n' || ch == hacky_eof_char ->
+      let end_pos = position scanner in
+      scanner.err ~start_pos ~end_pos (Diagnostics.message "unterminated regex");
+      ("", "")
+    | '\\' ->
+      next scanner;
+      next scanner;
+      scan ~in_char_class ()
+    | '[' when not in_char_class ->
+      next scanner;
+      scan ~in_char_class:true ()
+    | ']' when in_char_class ->
+      next scanner;
+      scan ~in_char_class:false ()
+    | _ ->
+      next scanner;
+      scan ~in_char_class ()
+  in
+  let pattern, flags = scan () in
+  let end_pos = position scanner in
+  (start_pos, end_pos, Token.Regex (pattern, flags))
+
+let scan_single_line_comment scanner =
+  let start_off = scanner.offset in
+  let start_pos = position scanner in
+  let rec skip scanner =
+    match scanner.ch with
+    | '\n' | '\r' -> ()
+    | ch when ch == hacky_eof_char -> ()
+    | _ ->
+      next scanner;
+      skip scanner
+  in
+  skip scanner;
+  let end_pos = position scanner in
+  Token.Comment
+    (Comment.make_single_line_comment
+       ~loc:
+         Location.{loc_start = start_pos; loc_end = end_pos; loc_ghost = false}
+       ((String.sub [@doesNotRaise]) scanner.src start_off
+          (scanner.offset - start_off)))
+
+let scan_multi_line_comment scanner =
+  (* assumption: we're only ever using this helper in `scan` after detecting a comment *)
+  let doc_comment =
+    peek2 scanner = '*' && peek3 scanner <> '/'
+    (* no /**/ *)
+  in
+  let standalone =
+    doc_comment && peek3 scanner = '*'
+    (* /*** *)
+  in
+  let content_start_off =
+    scanner.offset + if doc_comment then if standalone then 4 else 3 else 2
+  in
+  let start_pos = position scanner in
+  let rec scan ~depth =
+    (* invariant: depth > 0 right after this match. See assumption *)
+    match (scanner.ch, peek scanner) with
+    | '/', '*' ->
+      next2 scanner;
+      scan ~depth:(depth + 1)
+    | '*', '/' ->
+      next2 scanner;
+      if depth > 1 then scan ~depth:(depth - 1)
+    | ch, _ when ch == hacky_eof_char ->
+      let end_pos = position scanner in
+      scanner.err ~start_pos ~end_pos Diagnostics.unclosed_comment
+    | _ ->
+      next scanner;
+      scan ~depth
+  in
+  scan ~depth:0;
+  let length = scanner.offset - 2 - content_start_off in
+  let length = if length < 0 (* in case of EOF *) then 0 else length in
+  Token.Comment
+    (Comment.make_multi_line_comment ~doc_comment ~standalone
+       ~loc:
+         Location.
+           {
+             loc_start = start_pos;
+             loc_end = position scanner;
+             loc_ghost = false;
+           }
+       ((String.sub [@doesNotRaise]) scanner.src content_start_off length))
+
+let scan_template_literal_token scanner =
+  let start_off = scanner.offset in
+
+  (* if starting } here, consume it *)
+  if scanner.ch == '}' then next scanner;
+
+  let start_pos = position scanner in
+
+  let rec scan () =
+    let last_pos = position scanner in
+    match scanner.ch with
+    | '`' ->
+      next scanner;
+      let contents =
+        (String.sub [@doesNotRaise]) scanner.src start_off
+          (scanner.offset - 1 - start_off)
+      in
+      Token.TemplateTail (contents, last_pos)
+    | '$' -> (
+      match peek scanner with
+      | '{' ->
+        next2 scanner;
+        let contents =
+          (String.sub [@doesNotRaise]) scanner.src start_off
+            (scanner.offset - 2 - start_off)
+        in
+        Token.TemplatePart (contents, last_pos)
+      | _ ->
+        next scanner;
+        scan ())
+    | '\\' -> (
+      match peek scanner with
+      | '`' | '\\' | '$' | '\n' | '\r' ->
+        (* line break *)
+        next2 scanner;
+        scan ()
+      | _ ->
+        next scanner;
+        scan ())
+    | ch when ch = hacky_eof_char ->
+      let end_pos = position scanner in
+      scanner.err ~start_pos ~end_pos Diagnostics.unclosed_template;
+      let contents =
+        (String.sub [@doesNotRaise]) scanner.src start_off
+          (max (scanner.offset - 1 - start_off) 0)
+      in
+      Token.TemplateTail (contents, last_pos)
+    | _ ->
+      next scanner;
+      scan ()
+  in
+  let token = scan () in
+  let end_pos = position scanner in
+  (start_pos, end_pos, token)
+
+let rec scan scanner =
+  skip_whitespace scanner;
+  let start_pos = position scanner in
+
+  let token =
+    match scanner.ch with
+    (* peeking 0 char *)
+    | 'A' .. 'Z' | 'a' .. 'z' -> scan_identifier scanner
+    | '0' .. '9' -> scan_number scanner
+    | '`' ->
+      next scanner;
+      Token.Backtick
+    | '~' -> (
+      match (peek scanner, peek2 scanner) with
+      | '~', '~' ->
+        next3 scanner;
+        Token.Bnot
+      | _ ->
+        next scanner;
+        Token.Tilde)
+    | '?' ->
+      next scanner;
+      Token.Question
+    | ';' ->
+      next scanner;
+      Token.Semicolon
+    | '(' ->
+      next scanner;
+      Token.Lparen
+    | ')' ->
+      next scanner;
+      Token.Rparen
+    | '[' ->
+      next scanner;
+      Token.Lbracket
+    | ']' ->
+      next scanner;
+      Token.Rbracket
+    | '{' ->
+      next scanner;
+      Token.Lbrace
+    | '}' ->
+      next scanner;
+      Token.Rbrace
+    | ',' ->
+      next scanner;
+      Token.Comma
+    | '"' -> scan_string scanner
+    (* peeking 1 char *)
+    | '_' -> (
+      match peek scanner with
+      | 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '_' -> scan_identifier scanner
+      | _ ->
+        next scanner;
+        Token.Underscore)
+    | '#' -> (
+      match peek scanner with
+      | '=' ->
+        next2 scanner;
+        Token.HashEqual
+      | _ ->
+        next scanner;
+        Token.Hash)
+    | '*' -> (
+      match peek scanner with
+      | '*' ->
+        next2 scanner;
+        Token.Exponentiation
+      | '.' ->
+        next2 scanner;
+        Token.AsteriskDot
+      | _ ->
+        next scanner;
+        Token.Asterisk)
+    | '@' -> (
+      match peek scanner with
+      | '@' ->
+        next2 scanner;
+        Token.AtAt
+      | _ ->
+        next scanner;
+        Token.At)
+    | '%' -> (
+      match peek scanner with
+      | '%' ->
+        next2 scanner;
+        Token.PercentPercent
+      | _ ->
+        next scanner;
+        Token.Percent)
+    | '|' -> (
+      match (peek scanner, peek2 scanner) with
+      | '|', '|' ->
+        next3 scanner;
+        Token.Bor
+      | '|', _ ->
+        next2 scanner;
+        Token.Lor
+      | _ ->
+        next scanner;
+        Token.Bar)
+    | '&' -> (
+      match (peek scanner, peek2 scanner) with
+      | '&', '&' ->
+        next3 scanner;
+        Token.Band
+      | '&', _ ->
+        next2 scanner;
+        Token.Land
+      | _ ->
+        next scanner;
+        Token.Ampersand)
+    | '^' -> (
+      match (peek scanner, peek2 scanner) with
+      | '^', '^' ->
+        next3 scanner;
+        Token.Bxor
+      | _ ->
+        next scanner;
+        Token.Caret)
+    | ':' -> (
+      match peek scanner with
+      | '=' ->
+        next2 scanner;
+        Token.ColonEqual
+      | '>' ->
+        next2 scanner;
+        Token.ColonGreaterThan
+      | _ ->
+        next scanner;
+        Token.Colon)
+    | '\\' -> scan_exotic_identifier scanner
+    | '/' -> (
+      match peek scanner with
+      | '/' ->
+        next2 scanner;
+        scan_single_line_comment scanner
+      | '*' -> scan_multi_line_comment scanner
+      | '.' ->
+        next2 scanner;
+        Token.ForwardslashDot
+      | _ ->
+        next scanner;
+        Token.Forwardslash)
+    | '-' -> (
+      match peek scanner with
+      | '.' ->
+        next2 scanner;
+        Token.MinusDot
+      | '>' ->
+        next2 scanner;
+        Token.MinusGreater
+      | _ ->
+        next scanner;
+        Token.Minus)
+    | '+' -> (
+      match peek scanner with
+      | '.' ->
+        next2 scanner;
+        Token.PlusDot
+      | '+' ->
+        next2 scanner;
+        Token.PlusPlus
+      | '=' ->
+        next2 scanner;
+        Token.PlusEqual
+      | _ ->
+        next scanner;
+        Token.Plus)
+    | '>' when not (in_diamond_mode scanner) -> (
+      match peek scanner with
+      | '=' ->
+        next2 scanner;
+        Token.GreaterEqual
+      | '>' -> (
+        match peek2 scanner with
+        | '>' ->
+          next3 scanner;
+          Token.RightShiftUnsigned
+        | _ ->
+          next2 scanner;
+          Token.RightShift)
+      | _ ->
+        next scanner;
+        Token.GreaterThan)
+    | '>' ->
+      next scanner;
+      Token.GreaterThan
+    | '<' -> (
+      match peek scanner with
+      | '<' when not (in_diamond_mode scanner) ->
+        next2 scanner;
+        Token.LeftShift
+      | '=' ->
+        next2 scanner;
+        Token.LessEqual
+      | _ ->
+        next scanner;
+        Token.LessThan)
+    (* peeking 2 chars *)
+    | '.' -> (
+      match (peek scanner, peek2 scanner) with
+      | '.', '.' ->
+        next3 scanner;
+        Token.DotDotDot
+      | '.', _ ->
+        next2 scanner;
+        Token.DotDot
+      | _ ->
+        next scanner;
+        Token.Dot)
+    | '\'' -> (
+      match (peek scanner, peek2 scanner) with
+      | '\\', '"' ->
+        (* careful with this one! We're next-ing _once_ (not twice),
+           then relying on matching on the quote *)
+        next scanner;
+        SingleQuote
+      | '\\', _ ->
+        next2 scanner;
+        scan_escape scanner
+      | ch, '\'' ->
+        let offset = scanner.offset + 1 in
+        next3 scanner;
+        Token.Codepoint
+          {
+            c = Char.code ch;
+            original = (String.sub [@doesNotRaise]) scanner.src offset 1;
+          }
+      | ch, _ ->
+        next scanner;
+        let offset = scanner.offset in
+        let offset16 = scanner.offset16 in
+        let codepoint, length =
+          Res_utf8.decode_code_point scanner.offset scanner.src
+            (String.length scanner.src)
+        in
+        for _ = 0 to length - 1 do
+          next scanner
+        done;
+        if scanner.ch = '\'' then (
+          let contents =
+            (String.sub [@doesNotRaise]) scanner.src offset length
+          in
+          next scanner;
+          Token.Codepoint {c = codepoint; original = contents})
+        else (
+          scanner.ch <- ch;
+          scanner.offset <- offset;
+          scanner.offset16 <- offset16;
+          SingleQuote))
+    | '!' -> (
+      match (peek scanner, peek2 scanner) with
+      | '=', '=' ->
+        next3 scanner;
+        Token.BangEqualEqual
+      | '=', _ ->
+        next2 scanner;
+        Token.BangEqual
+      | _ ->
+        next scanner;
+        Token.Bang)
+    | '=' -> (
+      match (peek scanner, peek2 scanner) with
+      | '=', '=' ->
+        next3 scanner;
+        Token.EqualEqualEqual
+      | '=', _ ->
+        next2 scanner;
+        Token.EqualEqual
+      | '>', _ ->
+        next2 scanner;
+        Token.EqualGreater
+      | _ ->
+        next scanner;
+        Token.Equal)
+    (* special cases *)
+    | ch when ch == hacky_eof_char ->
+      next scanner;
+      Token.Eof
+    | ch ->
+      (* if we arrive here, we're dealing with an unknown character,
+       * report the error and continue scanning… *)
+      next scanner;
+      let end_pos = position scanner in
+      scanner.err ~start_pos ~end_pos (Diagnostics.unknown_uchar ch);
+      let _, _, token = scan scanner in
+      token
+  in
+  let end_pos = position scanner in
+  (* _printDebug ~startPos ~endPos scanner token; *)
+  (start_pos, end_pos, token)
+
+(* misc helpers used elsewhere *)
+
+(* If an operator has whitespace around both sides, it's a binary operator *)
+(* TODO: this helper seems out of place *)
+let is_binary_op src start_cnum end_cnum =
+  if start_cnum == 0 then false
+  else (
+    (* we're gonna put some assertions and invariant checks here because this is
+       used outside of the scanner's normal invariant assumptions *)
+    assert (end_cnum >= 0);
+    assert (start_cnum > 0 && start_cnum < String.length src);
+    let left_ok = is_whitespace (String.unsafe_get src (start_cnum - 1)) in
+    (* we need some stronger confidence that endCnum is ok *)
+    let right_ok =
+      end_cnum >= String.length src
+      || is_whitespace (String.unsafe_get src end_cnum)
+    in
+    left_ok && right_ok)
diff --git a/compiler/syntax/src/res_scanner.mli b/compiler/syntax/src/res_scanner.mli
new file mode 100644
index 0000000..e558967
--- /dev/null
+++ b/compiler/syntax/src/res_scanner.mli
@@ -0,0 +1,41 @@
+type mode = Diamond
+
+type char_encoding
+
+type t = {
+  filename: string;
+  src: string;
+  mutable err:
+    start_pos:Lexing.position ->
+    end_pos:Lexing.position ->
+    Res_diagnostics.category ->
+    unit;
+  mutable ch: char_encoding; (* current character *)
+  mutable offset: int; (* current byte offset *)
+  mutable offset16: int;
+      (* current number of utf16 code units since line start *)
+  mutable line_offset: int; (* current line offset *)
+  mutable lnum: int; (* current line number *)
+  mutable mode: mode list;
+}
+
+val make : filename:string -> string -> t
+
+(* TODO: make this a record *)
+val scan : t -> Lexing.position * Lexing.position * Res_token.t
+
+val is_binary_op : string -> int -> int -> bool
+
+val set_diamond_mode : t -> unit
+val pop_mode : t -> mode -> unit
+
+val scan_template_literal_token :
+  t -> Lexing.position * Lexing.position * Res_token.t
+
+val scan_regex : t -> Lexing.position * Lexing.position * Res_token.t
+
+(* Look ahead to see if the next non-whitespace character is a minus *)
+val peekMinus : t -> bool
+
+(* Look ahead to see if the next non-whitespace character is a slash *)
+val peekSlash : t -> bool
diff --git a/compiler/syntax/src/res_string.ml b/compiler/syntax/src/res_string.ml
new file mode 100644
index 0000000..6ef33a2
--- /dev/null
+++ b/compiler/syntax/src/res_string.ml
@@ -0,0 +1,11 @@
+let hex_table =
+  [| '0'; '1'; '2'; '3'; '4'; '5'; '6'; '7'; '8'; '9'; 'a'; 'b'; 'c'; 'd'; 'e'; 'f'; |]
+  [@ocamlformat "disable"]
+
+let convert_decimal_to_hex ~str_decimal =
+  try
+    let int_num = int_of_string str_decimal in
+    let c1 = Array.get hex_table (int_num lsr 4) in
+    let c2 = Array.get hex_table (int_num land 15) in
+    "x" ^ String.concat "" [String.make 1 c1; String.make 1 c2]
+  with Invalid_argument _ | Failure _ -> str_decimal
diff --git a/jscomp/syntax/src/res_token.ml b/compiler/syntax/src/res_token.ml
similarity index 75%
rename from jscomp/syntax/src/res_token.ml
rename to compiler/syntax/src/res_token.ml
index 5d12e0f..192c976 100644
--- a/jscomp/syntax/src/res_token.ml
+++ b/compiler/syntax/src/res_token.ml
@@ -17,7 +17,7 @@ type t =
   | DotDotDot
   | Bang
   | Semicolon
-  | Let
+  | Let of {unwrap: bool}
   | And
   | Rec
   | Underscore
@@ -25,6 +25,7 @@ type t =
   | Equal
   | EqualEqual
   | EqualEqualEqual
+  | Ampersand
   | Bar
   | Lparen
   | Rparen
@@ -39,6 +40,7 @@ type t =
   | Backslash [@live]
   | Forwardslash
   | ForwardslashDot
+  | Regex of string * string
   | Asterisk
   | AsteriskDot
   | Exponentiation
@@ -51,11 +53,9 @@ type t =
   | ColonGreaterThan
   | GreaterThan
   | LessThan
-  | LessThanSlash
   | Hash
   | HashEqual
   | Assert
-  | Lazy
   | Tilde
   | Question
   | If
@@ -77,7 +77,11 @@ type t =
   | Of
   | Land
   | Lor
-  | Band (* Bitwise and: & *)
+  | Bnot (* Bitwise not: ~~~ *)
+  | Bor (* Bitwise or: ||| *)
+  | Bxor (* Bitwise xor: ^^^ *)
+  | Band (* Bitwise and: &&& *)
+  | Caret
   | BangEqual
   | BangEqualEqual
   | LessEqual
@@ -89,29 +93,36 @@ type t =
   | PercentPercent
   | Comment of Comment.t
   | List
+  | Dict
   | TemplateTail of string * Lexing.position
   | TemplatePart of string * Lexing.position
   | Backtick
-  | BarGreater
   | Try
   | DocComment of Location.t * string
   | ModuleComment of Location.t * string
+  | LeftShift
+  | RightShift
+  | RightShiftUnsigned
 
 let precedence = function
   | HashEqual | ColonEqual -> 1
   | Lor -> 2
   | Land -> 3
+  | Bor -> 4
+  | Bxor -> 5
+  | Band -> 6
   | Equal | EqualEqual | EqualEqualEqual | LessThan | GreaterThan | BangEqual
-  | BangEqualEqual | LessEqual | GreaterEqual | BarGreater ->
-    4
-  | Plus | PlusDot | Minus | MinusDot | PlusPlus -> 5
-  | Asterisk | AsteriskDot | Forwardslash | ForwardslashDot -> 6
-  | Exponentiation -> 7
-  | MinusGreater -> 8
-  | Dot -> 9
+  | BangEqualEqual | LessEqual | GreaterEqual ->
+    7
+  | LeftShift | RightShift | RightShiftUnsigned -> 8
+  | Plus | PlusDot | Minus | MinusDot | PlusPlus -> 9
+  | Asterisk | AsteriskDot | Forwardslash | ForwardslashDot | Percent -> 10
+  | Exponentiation -> 11
+  | MinusGreater -> 12
+  | Dot -> 13
   | _ -> 0
 
-let toString = function
+let to_string = function
   | Await -> "await"
   | Open -> "open"
   | True -> "true"
@@ -127,7 +138,8 @@ let toString = function
   | Float {f} -> "Float: " ^ f
   | Bang -> "!"
   | Semicolon -> ";"
-  | Let -> "let"
+  | Let {unwrap = true} -> "let?"
+  | Let {unwrap = false} -> "let"
   | And -> "and"
   | Rec -> "rec"
   | Underscore -> "_"
@@ -136,6 +148,7 @@ let toString = function
   | EqualEqual -> "=="
   | EqualEqualEqual -> "==="
   | Eof -> "eof"
+  | Ampersand -> "&"
   | Bar -> "|"
   | As -> "as"
   | Lparen -> "("
@@ -154,6 +167,7 @@ let toString = function
   | PlusPlus -> "++"
   | PlusEqual -> "+="
   | Backslash -> "\\"
+  | Regex (pattern, flags) -> "regex: /" ^ pattern ^ "/" ^ flags
   | Forwardslash -> "/"
   | ForwardslashDot -> "/."
   | Exception -> "exception"
@@ -161,13 +175,11 @@ let toString = function
   | HashEqual -> "#="
   | GreaterThan -> ">"
   | LessThan -> "<"
-  | LessThanSlash -> "</"
   | Asterisk -> "*"
   | AsteriskDot -> "*."
   | Exponentiation -> "**"
   | Assert -> "assert"
-  | Lazy -> "lazy"
-  | Tilde -> "tilde"
+  | Tilde -> "~"
   | Question -> "?"
   | If -> "if"
   | Else -> "else"
@@ -187,7 +199,11 @@ let toString = function
   | Module -> "module"
   | Of -> "of"
   | Lor -> "||"
-  | Band -> "&"
+  | Bnot -> "~~~"
+  | Bor -> "|||"
+  | Bxor -> "^^^"
+  | Band -> "&&&"
+  | Caret -> "^"
   | Land -> "&&"
   | BangEqual -> "!="
   | BangEqualEqual -> "!=="
@@ -198,17 +214,20 @@ let toString = function
   | AtAt -> "@@"
   | Percent -> "%"
   | PercentPercent -> "%%"
-  | Comment c -> "Comment" ^ Comment.toString c
+  | Comment c -> "Comment" ^ Comment.to_string c
   | List -> "list{"
+  | Dict -> "dict{"
   | TemplatePart (text, _) -> text ^ "${"
   | TemplateTail (text, _) -> "TemplateTail(" ^ text ^ ")"
   | Backtick -> "`"
-  | BarGreater -> "|>"
   | Try -> "try"
   | DocComment (_loc, s) -> "DocComment " ^ s
   | ModuleComment (_loc, s) -> "ModuleComment " ^ s
+  | LeftShift -> "<<"
+  | RightShift -> ">>"
+  | RightShiftUnsigned -> ">>>"
 
-let keywordTable = function
+let keyword_table = function
   | "and" -> And
   | "as" -> As
   | "assert" -> Assert
@@ -222,9 +241,10 @@ let keywordTable = function
   | "if" -> If
   | "in" -> In
   | "include" -> Include
-  | "lazy" -> Lazy
-  | "let" -> Let
+  | "let?" -> Let {unwrap = true}
+  | "let" -> Let {unwrap = false}
   | "list{" -> List
+  | "dict{" -> Dict
   | "module" -> Module
   | "mutable" -> Mutable
   | "of" -> Of
@@ -240,23 +260,23 @@ let keywordTable = function
   | _ -> raise Not_found
 [@@raises Not_found]
 
-let isKeyword = function
+let is_keyword = function
   | Await | And | As | Assert | Constraint | Else | Exception | External | False
-  | For | If | In | Include | Land | Lazy | Let | List | Lor | Module | Mutable
-  | Of | Open | Private | Rec | Switch | True | Try | Typ | When | While ->
+  | For | If | In | Include | Land | Let _ | List | Lor | Module | Mutable | Of
+  | Open | Private | Rec | Switch | True | Try | Typ | When | While | Dict ->
     true
   | _ -> false
 
-let lookupKeyword str =
-  try keywordTable str
+let lookup_keyword str =
+  try keyword_table str
   with Not_found -> (
     match str.[0] [@doesNotRaise] with
     | 'A' .. 'Z' -> Uident str
     | _ -> Lident str)
 
-let isKeywordTxt str =
+let is_keyword_txt str =
   try
-    let _ = keywordTable str in
+    let _ = keyword_table str in
     true
   with Not_found -> false
 
diff --git a/compiler/syntax/src/res_token_debugger.ml b/compiler/syntax/src/res_token_debugger.ml
new file mode 100644
index 0000000..93a4b9f
--- /dev/null
+++ b/compiler/syntax/src/res_token_debugger.ml
@@ -0,0 +1,145 @@
+let dump_tokens filename =
+  let src =
+    try
+      let ic = open_in filename in
+      let content = really_input_string ic (in_channel_length ic) in
+      close_in ic;
+      content
+    with e ->
+      Printf.printf "Error reading file %s: %s\n" filename
+        (Printexc.to_string e);
+      exit 1
+  in
+
+  let scanner = Res_scanner.make ~filename src in
+
+  let rec visit scanner =
+    let start_pos, end_pos, token = Res_scanner.scan scanner in
+    let token_str =
+      match token with
+      | Res_token.Await -> "Await"
+      | Res_token.Open -> "Open"
+      | Res_token.True -> "True"
+      | Res_token.False -> "False"
+      | Res_token.Codepoint {original} -> "Codepoint(\"" ^ original ^ "\")"
+      | Res_token.Int {i} -> "Int(\"" ^ i ^ "\")"
+      | Res_token.Float {f} -> "Float(\"" ^ f ^ "\")"
+      | Res_token.String s -> "String(\"" ^ s ^ "\")"
+      | Res_token.Lident str -> "Lident(\"" ^ str ^ "\")"
+      | Res_token.Uident str -> "Uident(\"" ^ str ^ "\")"
+      | Res_token.As -> "As"
+      | Res_token.Dot -> "Dot"
+      | Res_token.DotDot -> "DotDot"
+      | Res_token.DotDotDot -> "DotDotDot"
+      | Res_token.Bang -> "Bang"
+      | Res_token.Semicolon -> "Semicolon"
+      | Res_token.Let {unwrap} -> "Let" ^ if unwrap then "?" else ""
+      | Res_token.And -> "And"
+      | Res_token.Rec -> "Rec"
+      | Res_token.Underscore -> "Underscore"
+      | Res_token.SingleQuote -> "SingleQuote"
+      | Res_token.Equal -> "Equal"
+      | Res_token.EqualEqual -> "EqualEqual"
+      | Res_token.EqualEqualEqual -> "EqualEqualEqual"
+      | Res_token.Ampersand -> "Ampersand"
+      | Res_token.Bar -> "Bar"
+      | Res_token.Lparen -> "Lparen"
+      | Res_token.Rparen -> "Rparen"
+      | Res_token.Lbracket -> "Lbracket"
+      | Res_token.Rbracket -> "Rbracket"
+      | Res_token.Lbrace -> "Lbrace"
+      | Res_token.Rbrace -> "Rbrace"
+      | Res_token.Colon -> "Colon"
+      | Res_token.Comma -> "Comma"
+      | Res_token.Eof -> "Eof"
+      | Res_token.Exception -> "Exception"
+      | Res_token.Backslash -> "Backslash"
+      | Res_token.Forwardslash -> "Forwardslash"
+      | Res_token.ForwardslashDot -> "ForwardslashDot"
+      | Res_token.Regex (pattern, flags) ->
+        "Regex(\"" ^ pattern ^ "\", \"" ^ flags ^ "\")"
+      | Res_token.Asterisk -> "Asterisk"
+      | Res_token.AsteriskDot -> "AsteriskDot"
+      | Res_token.Exponentiation -> "Exponentiation"
+      | Res_token.Minus -> "Minus"
+      | Res_token.MinusDot -> "MinusDot"
+      | Res_token.Plus -> "Plus"
+      | Res_token.PlusDot -> "PlusDot"
+      | Res_token.PlusPlus -> "PlusPlus"
+      | Res_token.PlusEqual -> "PlusEqual"
+      | Res_token.ColonGreaterThan -> "ColonGreaterThan"
+      | Res_token.GreaterThan -> "GreaterThan"
+      | Res_token.LessThan -> "LessThan"
+      | Res_token.Hash -> "Hash"
+      | Res_token.HashEqual -> "HashEqual"
+      | Res_token.Assert -> "Assert"
+      | Res_token.Tilde -> "Tilde"
+      | Res_token.Question -> "Question"
+      | Res_token.If -> "If"
+      | Res_token.Else -> "Else"
+      | Res_token.For -> "For"
+      | Res_token.In -> "In"
+      | Res_token.While -> "While"
+      | Res_token.Switch -> "Switch"
+      | Res_token.When -> "When"
+      | Res_token.EqualGreater -> "EqualGreater"
+      | Res_token.MinusGreater -> "MinusGreater"
+      | Res_token.External -> "External"
+      | Res_token.Typ -> "Typ"
+      | Res_token.Private -> "Private"
+      | Res_token.Constraint -> "Constraint"
+      | Res_token.Mutable -> "Mutable"
+      | Res_token.Include -> "Include"
+      | Res_token.Module -> "Module"
+      | Res_token.Of -> "Of"
+      | Res_token.Land -> "Land"
+      | Res_token.Lor -> "Lor"
+      | Res_token.Bnot -> "Bnot"
+      | Res_token.Bor -> "Bor"
+      | Res_token.Band -> "Band"
+      | Res_token.Bxor -> "Bxor"
+      | Res_token.Caret -> "Caret"
+      | Res_token.BangEqual -> "BangEqual"
+      | Res_token.BangEqualEqual -> "BangEqualEqual"
+      | Res_token.LessEqual -> "LessEqual"
+      | Res_token.GreaterEqual -> "GreaterEqual"
+      | Res_token.ColonEqual -> "ColonEqual"
+      | Res_token.At -> "At"
+      | Res_token.AtAt -> "AtAt"
+      | Res_token.Percent -> "Percent"
+      | Res_token.PercentPercent -> "PercentPercent"
+      | Res_token.Comment c -> "Comment(" ^ Res_comment.to_string c ^ ")"
+      | Res_token.List -> "List"
+      | Res_token.Dict -> "Dict"
+      | Res_token.TemplateTail (text, _) -> "TemplateTail(\"" ^ text ^ "\")"
+      | Res_token.TemplatePart (text, _) -> "TemplatePart(\"" ^ text ^ "\")"
+      | Res_token.Backtick -> "Backtick"
+      | Res_token.Try -> "Try"
+      | Res_token.DocComment (_, s) -> "DocComment(\"" ^ s ^ "\")"
+      | Res_token.ModuleComment (_, s) -> "ModuleComment(\"" ^ s ^ "\")"
+      | Res_token.LeftShift -> "LeftShift"
+      | Res_token.RightShift -> "RightShift"
+      | Res_token.RightShiftUnsigned -> "RightShiftUnsigned"
+    in
+
+    let start_line = start_pos.Lexing.pos_lnum in
+    let start_col = start_pos.Lexing.pos_cnum - start_pos.Lexing.pos_bol + 1 in
+    let end_line = end_pos.Lexing.pos_lnum in
+    let end_col = end_pos.Lexing.pos_cnum - end_pos.Lexing.pos_bol + 1 in
+
+    Printf.printf "%s (%d,%d-%d,%d)\n" token_str start_line start_col end_line
+      end_col;
+
+    match token with
+    | Res_token.Eof -> ()
+    | _ -> visit scanner
+  in
+  visit scanner
+
+let token_print_engine =
+  {
+    Res_driver.print_implementation =
+      (fun ~width:_ ~filename ~comments:_ _ -> dump_tokens filename);
+    print_interface =
+      (fun ~width:_ ~filename ~comments:_ _ -> dump_tokens filename);
+  }
diff --git a/compiler/syntax/src/res_token_debugger.mli b/compiler/syntax/src/res_token_debugger.mli
new file mode 100644
index 0000000..f8dea07
--- /dev/null
+++ b/compiler/syntax/src/res_token_debugger.mli
@@ -0,0 +1 @@
+val token_print_engine : Res_driver.print_engine
diff --git a/jscomp/syntax/src/res_utf8.ml b/compiler/syntax/src/res_utf8.ml
similarity index 94%
rename from jscomp/syntax/src/res_utf8.ml
rename to compiler/syntax/src/res_utf8.ml
index 69c7d23..c416217 100644
--- a/jscomp/syntax/src/res_utf8.ml
+++ b/compiler/syntax/src/res_utf8.ml
@@ -6,8 +6,8 @@ let repl = 0xFFFD
 (* let min = 0x0000 *)
 let max = 0x10FFFF
 
-let surrogateMin = 0xD800
-let surrogateMax = 0xDFFF
+let surrogate_min = 0xD800
+let surrogate_max = 0xDFFF
 
 (*
  * Char. number range  |        UTF-8 octet sequence
@@ -29,7 +29,7 @@ type category = {low: int; high: int; size: int}
 let locb = 0b1000_0000
 let hicb = 0b1011_1111
 
-let categoryTable = [|
+let category_table = [|
   (* 0 *) {low = -1; high= -1; size= 1}; (* invalid *)
   (* 1 *) {low = 1; high= -1; size= 1}; (* ascii *)
   (* 2 *) {low = locb; high= hicb; size= 2};
@@ -62,7 +62,7 @@ let categories = [|
   6; 7; 7 ;7; 8; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0; 0;
 |] [@@ocamlformat "disable"]
 
-let decodeCodePoint i s len =
+let decode_code_point i s len =
   if len < 1 then (repl, 1)
   else
     let first = int_of_char (String.unsafe_get s i) in
@@ -71,7 +71,7 @@ let decodeCodePoint i s len =
       let index = Array.unsafe_get categories first in
       if index = 0 then (repl, 1)
       else
-        let cat = Array.unsafe_get categoryTable index in
+        let cat = Array.unsafe_get category_table index in
         if len < i + cat.size then (repl, 1)
         else if cat.size == 2 then
           let c1 = int_of_char (String.unsafe_get s (i + 1)) in
@@ -108,7 +108,7 @@ let decodeCodePoint i s len =
             let uc = i0 lor i3 lor i2 lor i1 in
             (uc, 4)
 
-let encodeCodePoint c =
+let encode_code_point c =
   if c <= 127 then (
     let bytes = (Bytes.create [@doesNotRaise]) 1 in
     Bytes.unsafe_set bytes 0 (Char.unsafe_chr c);
@@ -139,5 +139,5 @@ let encodeCodePoint c =
       (Char.unsafe_chr (0b1000_0000 lor (c land cont_mask)));
     Bytes.unsafe_to_string bytes
 
-let isValidCodePoint c =
-  (0 <= c && c < surrogateMin) || (surrogateMax < c && c <= max)
+let is_valid_code_point c =
+  (0 <= c && c < surrogate_min) || (surrogate_max < c && c <= max)
diff --git a/compiler/syntax/src/res_utf8.mli b/compiler/syntax/src/res_utf8.mli
new file mode 100644
index 0000000..fc80c8b
--- /dev/null
+++ b/compiler/syntax/src/res_utf8.mli
@@ -0,0 +1,9 @@
+val repl : int
+
+val max : int
+
+val decode_code_point : int -> string -> int -> int * int
+
+val encode_code_point : int -> string
+
+val is_valid_code_point : int -> bool
diff --git a/dune b/dune
index edfc76e..ca0859c 100644
--- a/dune
+++ b/dune
@@ -1,4 +1,4 @@
-(dirs bin lib jscomp test)
+(dirs bin lib compiler test)
 
 (env
  (dev
diff --git a/dune-project b/dune-project
index e8c0376..ac1ebe9 100644
--- a/dune-project
+++ b/dune-project
@@ -2,7 +2,7 @@
 
 (name rescript_linter)
 
-(version 0.3.3)
+(version 0.4.0)
 
 (generate_opam_files true)
 
@@ -19,4 +19,4 @@
  (name rescript_linter)
  (synopsis "AST-based linter for ReScript")
  (description "AST-based linter for ReScript")
- (depends dune yojson))
+ (depends dune yojson flow_parser))
diff --git a/flake.nix b/flake.nix
index 4089ba4..6763ccc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,6 +29,33 @@
         # Library functions from nixpkgs
         lib = legacyPackages.lib;
 
+        # Custom flow_parser package from rescript-lang fork
+        flow_parser = ocamlPackages.buildDunePackage {
+          pname = "flow_parser";
+          version = "0.267.0";
+          duneVersion = "3";
+
+          src = legacyPackages.fetchFromGitHub {
+            owner = "rescript-lang";
+            repo = "flow";
+            rev = "9ea4062c0b7e037415c4413a7634c459ebd5c31b";
+            sha256 = "sha256-jm8FCscyeBQMyObi90sCMiKFXxh4EHt/3nYWit4qwFs=";
+          };
+
+          buildInputs = [
+            ocamlPackages.ppx_deriving
+            ocamlPackages.ppx_gen_rec
+          ];
+
+          propagatedBuildInputs = [
+            ocamlPackages.base
+            ocamlPackages.ppxlib
+            ocamlPackages.wtf8
+          ];
+
+          strictDeps = true;
+        };
+
         project-sources = nix-filter.lib {
           root = ./.;
           include = [
@@ -49,7 +76,7 @@
             (nix-filter.lib.inDirectory "doc")
             (nix-filter.lib.inDirectory "lib")
             (nix-filter.lib.inDirectory "test")
-            (nix-filter.lib.inDirectory "jscomp")
+            (nix-filter.lib.inDirectory "compiler")
           ];
         };
 
@@ -100,7 +127,7 @@
 
           rescript-linter = ocamlPackages.buildDunePackage {
             pname = "rescript_linter";
-            version = "0.3.3";
+            version = "0.4.0";
             duneVersion = "3";
             src = sources.all;
 
@@ -108,6 +135,7 @@
               ocamlPackages.cppo
             ];
             buildInputs = [
+              flow_parser
               ocamlPackages.yojson
               ocamlPackages.ppx_deriving_yojson
               ocamlPackages.ounit2
diff --git a/jscomp/bsb/.ocamlformat b/jscomp/bsb/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/bsb/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/bsb/bsb.md b/jscomp/bsb/bsb.md
deleted file mode 100644
index e081fa4..0000000
--- a/jscomp/bsb/bsb.md
+++ /dev/null
@@ -1,201 +0,0 @@
-# Phony targets
-
-
-# collect file groups
-
-1. we need check integrity of files here?
-cases:
-one directory have two same files -- ignore, does not matter here?
-two directories ha
-
-# generate ninja from file groups
-
-`Bsb_file_groups.file_group list`
-one directory, one kind --
-when we merge we will have two `dirs`
-
-do we allow duplicate modules?
-
-suppose :
-lib -> 0
-
-dev -> 1
-dev -> 2 
-dev -> 3 
-
-so that they can have same names
-
-
-.default
-All  output (not just js in case we support native build)
-
-.install
-
-It's hard to bake it in built rules, since it is flag dependent, if you have `-bin-annot` 
-then you would like to install `cmt` too, however, it might be or not be there 
-
-# meta-data files 
-
-- .bsbuild
-- .bsdeps
-- .sourcedirs
-# post-build
-
-Here we have `js` generated, we can do either post-build or
-create a new rule.
-
-Note creating new rules will get more concurrency while post-build is easy 
-and can do in source modification
-
-https://groups.google.com/forum/#!searchin/ninja-build/post$20process%7Csort:relevance/ninja-build/Q4hpcDmhPzw/KZpDyOEFuTkJ 
-
-# Performance tweaks
-
-Writing(truncating) files are significantly slower (20~30x) and it destroys cache(see Appendix), we should 
-try to avoid writing too many files.
-
-bsb is optimized for incremental build (especially for modifying files ).
-
-There is a trade off here: if we generate `.bsdep` file, whenever adding or removing file, `.bscache` will not 
-impact the integrity of `.bsdep`, so that it will run `.bsdep -> .d`.
-
-The downside is 
-1. clean build will generate more smaller files (slow down), 
-2. build system has to track more outputs  (latency, stat more files almost doubled)
-
-Whenever we change a file it will regenerate the ast, optionally update `.bsdep`      
-
-So assuming that merge `.bsdep` into `.mlast`, build system will track not more files.
-The integrity of `.mlast` is not impacted by `.bscache`.
-`.mlast -> .d` can be still improved, not as good as `.bsdep -> .d` since `.bsdep` 
-can check `.bsdep` time stamp.
-
-So let's change the `.mlast` to such format
-
-----------
-magic number
-length of dependent modules
-dependent modules
-binary ast   
-----------
-
-This file is integrity is not impacted by `.bscache`. whenever `.bscache` changes we check if we need regenerate `.d`
-
-# Appendix
-[source,ocaml]
---------------
-module Set_string = Set.Make(String)
-
-(* let v = Set_string.of_list ["List" ; "Set" ; "String" ; "Test_order"] *)
-let v = Set_string.of_list []
-let deseralize f =
-  let ichan  = open_in_bin f in
-  let v : Set_string.t = input_value ichan  in
-  close_in ichan ;
-  v
-
-let time f arg =
-  let v0 = Unix.gettimeofday () in
-  ignore @@ f arg;
-  let v1 = Unix.gettimeofday ()  in
-  print_endline (Printf.sprintf "%f elapsed" (v1 -. v0))
-
-let deseralize_and_compare f =
-  ignore @@ Set_string.equal v (deseralize f)
-
-let  seralize f =
-  let ochan = open_out_bin f in
-  output_value ochan  v ;
-  close_out ochan
-
-let try_seralize f =
-  match open_in_bin f with
-  | ichan ->
-    close_in ichan ;
-    let ochan = open_out_bin f in
-    output_value ochan  v ;
-    close_out ochan
-  | exception _ ->
-    let ochan = open_out_bin f in
-    output_value ochan  v ;
-    close_out ochan
-
-let try_seralize2 f =
-  if Sys.file_exists f then
-    let ochan = open_out_bin f in
-    output_value ochan  v ;
-    close_out ochan
-  else
-    let ochan = open_out_bin f in
-    output_value ochan  v ;
-    close_out ochan
-
-
-
-let () =
-  let file = "/Users/hzhang295/git/tmp/bench/e.mldeps" in
-  time try_seralize file;
-  Unix.unlink file ;
-  time try_seralize2 file;
-  Unix.unlink file ;
-  time seralize file;
-  time deseralize_and_compare file;
-  Unix.unlink file
-
-(*                                                                                                                                                                                                                                                              
-0.002452 elapsed                                                                                                                                                                                                                                                
-0.002440 elapsed                                                                                                                                                                                                                                                
-0.001954 elapsed                                                                                                                                                                                                                                                
-0.000079 elapsed                                                                                                                                                                                                                                                
-                                                                                                                                                                                                                                                                
-*)
-
---------------
-
-# package-flags
-
- when designing bsc command line flags, we ask user to specify the output path of package output 
- instead of calculating, 
- the reason is that the user input can be absolute path or relative path, to calculate 
- we also need the location of package.json.
-
-
- ## document when regenerating `build.ninja`
- 
- - when `bsb.exe` path is changed
- - when `bsb.exe` version is changed 
-
- ## other internal options
- 
--no-dev -- don't build dev directory group
--install -- install files
-
-## document when regenerating `.merlin`
-
-## TODO: seems we can do it 
-
-1. instead of specifying the whole relative path, just specifying the offset 
- ```
--bs-package-output commonjs:+lib/js -bs-package-output amdjs:+lib/amdjs xx.mlast
- ```   
-
- With this we would simplify the build a lot.
-
- on Windows
- ```
- -bs-package-output commonjs:+lib\js -bs-package-output:+lib\amdjs xx.ml a/b/c/xx.mlast
- ``` 
-
- so when the user input is relative path, we do the concat,
- if it is absolute path, we calculate the relative path first.
-
- This is complicated vs  
- 
- ```
- -bs-package-output commonjs -bs-package-output amdjs
- ```
-
- however, the bsc is almost sitting in `lib/bs`
-
-2. caching Directory operations
-3. Read `bsconfig.json` from watchcer  side, so that we can caching io operations more effeciently?
diff --git a/jscomp/bsb/bsb_arg.ml b/jscomp/bsb/bsb_arg.ml
deleted file mode 100644
index 2e5e4cf..0000000
--- a/jscomp/bsb/bsb_arg.ml
+++ /dev/null
@@ -1,119 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 anon_fun = rev_args:string list -> unit
-
-type string_action =
-  | String_call of (string -> unit)
-  | String_set of string ref
-
-type unit_action = Unit_call of (unit -> unit) | Unit_set of bool ref
-
-type spec = Unit of unit_action | String of string_action
-
-type error = Unknown of string | Missing of string
-
-type t = spec Ext_spec.t
-
-exception Bad of string
-
-let bad_arg s = raise_notrace (Bad s)
-
-let ( +> ) = Ext_buffer.add_string
-
-let usage_b (buf : Ext_buffer.t) ~usage (speclist : t) =
-  buf +> usage;
-  if Ext_array.is_empty speclist then ()
-  else (
-    buf +> "\nOptions:\n";
-    let max_col = ref 0 in
-    Ext_array.iter speclist (fun (key, _, _) ->
-        if String.length key > !max_col then max_col := String.length key);
-    Ext_array.iter speclist (fun (key, _, doc) ->
-        if not (Ext_string.starts_with doc "*internal*") then (
-          buf +> "  ";
-          buf +> key;
-          buf +> String.make (!max_col - String.length key + 2) ' ';
-          let cur = ref 0 in
-          let doc_length = String.length doc in
-          while !cur < doc_length do
-            if !cur <> 0 then (
-              buf +> "\n";
-              buf +> String.make (!max_col + 4) ' ');
-            match String.index_from_opt doc !cur '\n' with
-            | None ->
-                buf +> String.sub doc !cur (String.length doc - !cur);
-                cur := doc_length
-            | Some new_line_pos ->
-                buf +> String.sub doc !cur (new_line_pos - !cur);
-                cur := new_line_pos + 1
-          done;
-          buf +> "\n")))
-
-let stop_raise ~usage ~(error : error) (speclist : t) =
-  let b = Ext_buffer.create 200 in
-  (match error with
-  | Unknown ("-help" | "--help" | "-h") ->
-      usage_b b ~usage speclist;
-      Ext_buffer.output_buffer stdout b;
-      exit 0
-  | Unknown s ->
-      b +> "Unknown option \"";
-      b +> s;
-      b +> "\".\n"
-  | Missing s ->
-      b +> "Option \"";
-      b +> s;
-      b +> "\" needs an argument.\n");
-  usage_b b ~usage speclist;
-  bad_arg (Ext_buffer.contents b)
-
-let parse_exn ~usage ~argv ?(start = 1) ?(finish = Array.length argv)
-    (speclist : t) anonfun =
-  let current = ref start in
-  let rev_list = ref [] in
-  while !current < finish do
-    let s = argv.(!current) in
-    incr current;
-    if s <> "" && s.[0] = '-' then
-      match Ext_spec.assoc3 speclist s with
-      | Some action -> (
-          match action with
-          | Unit r -> (
-              match r with
-              | Unit_set r -> r.contents <- true
-              | Unit_call f -> f ())
-          | String f -> (
-              if !current >= finish then
-                stop_raise ~usage ~error:(Missing s) speclist
-              else
-                let arg = argv.(!current) in
-                incr current;
-                match f with
-                | String_call f -> f arg
-                | String_set u -> u.contents <- arg))
-      | None -> stop_raise ~usage ~error:(Unknown s) speclist
-    else rev_list := s :: !rev_list
-  done;
-  anonfun ~rev_args:!rev_list
diff --git a/jscomp/bsb/bsb_arg.mli b/jscomp/bsb/bsb_arg.mli
deleted file mode 100644
index 60d21f2..0000000
--- a/jscomp/bsb/bsb_arg.mli
+++ /dev/null
@@ -1,46 +0,0 @@
-(* Copyright (C) 2020 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 string_action =
-  | String_call of (string -> unit)
-  | String_set of string ref
-
-type unit_action = Unit_call of (unit -> unit) | Unit_set of bool ref
-
-type spec = Unit of unit_action | String of string_action
-
-type anon_fun = rev_args:string list -> unit
-
-exception Bad of string
-
-val parse_exn :
-  usage:string ->
-  argv:string array ->
-  ?start:int ->
-  ?finish:int ->
-  (string * spec * string) array ->
-  anon_fun ->
-  unit
-
-val bad_arg : string -> 'a
diff --git a/jscomp/bsb/bsb_build_schemas.ml b/jscomp/bsb/bsb_build_schemas.ml
deleted file mode 100644
index 5436f1c..0000000
--- a/jscomp/bsb/bsb_build_schemas.ml
+++ /dev/null
@@ -1,71 +0,0 @@
-(* Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let name = "name"
-
-let ppx_flags = "ppx-flags"
-let pp_flags = "pp-flags"
-let bs_external_includes = "bs-external-includes"
-let bs_dependencies = "bs-dependencies"
-let pinned_dependencies = "pinned-dependencies"
-let bs_dev_dependencies = "bs-dev-dependencies"
-let sources = "sources"
-let dir = "dir"
-let files = "files"
-let subdirs = "subdirs"
-let bsc_flags = "bsc-flags"
-let excludes = "excludes"
-let slow_re = "slow-re"
-let resources = "resources"
-let public = "public"
-let js_post_build = "js-post-build"
-let cmd = "cmd"
-let package_specs = "package-specs"
-let type_ = "type"
-let export_all = "all"
-let export_none = "none"
-let use_stdlib = "use-stdlib"
-let external_stdlib = "external-stdlib"
-let reason = "reason"
-let react_jsx = "react-jsx"
-let jsx = "jsx"
-let jsx_version = "version"
-let jsx_module = "module"
-let jsx_mode = "mode"
-let jsx_v3_dependencies = "v3-dependencies"
-let cut_generators = "cut-generators"
-let generators = "generators"
-let command = "command"
-let edge = "edge"
-let namespace = "namespace"
-let in_source = "in-source"
-let warnings = "warnings"
-let number = "number"
-let error = "error"
-let suffix = "suffix"
-let gentypeconfig = "gentypeconfig"
-let language = "language"
-let ignored_dirs = "ignored-dirs"
-
-let uncurried = "uncurried"
\ No newline at end of file
diff --git a/jscomp/bsb/bsb_build_util.ml b/jscomp/bsb/bsb_build_util.ml
deleted file mode 100644
index 9982b5b..0000000
--- a/jscomp/bsb/bsb_build_util.ml
+++ /dev/null
@@ -1,228 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let flag_concat flag xs =
-  String.concat Ext_string.single_space
-    (Ext_list.flat_map xs (fun x -> [ flag; x ]))
-
-let ( // ) = Ext_path.combine
-
-let ppx_flags (xs : Bsb_config_types.ppx list) =
-  flag_concat "-ppx"
-    (Ext_list.map xs (fun x ->
-         if x.args = [] then Ext_filename.maybe_quote x.name
-         else
-           let fmt : _ format =
-             if Ext_sys.is_windows_or_cygwin then "\"%s %s\"" else "'%s %s'"
-           in
-           Printf.sprintf fmt x.name (String.concat " " x.args)))
-
-let pp_flag (xs : string) = "-pp " ^ Ext_filename.maybe_quote xs
-
-let include_dirs dirs =
-  String.concat Ext_string.single_space
-    (Ext_list.flat_map dirs (fun x -> [ "-I"; Ext_filename.maybe_quote x ]))
-
-let include_dirs_by dirs fn =
-  String.concat Ext_string.single_space
-    (Ext_list.flat_map dirs (fun x -> [ "-I"; Ext_filename.maybe_quote (fn x) ]))
-
-(* we use lazy $src_root_dir *)
-
-(* It does several conversion:
-   First, it will convert unix path to windows backward on windows platform.
-   Then if it is absolute path, it will do thing
-   Else if it is relative path, it will be rebased on project's root directory *)
-
-let convert_and_resolve_path : string -> string -> string =
-  if Sys.unix then ( // )
-  else fun cwd path ->
-    if Ext_sys.is_windows_or_cygwin then
-      let p = Ext_string.replace_slash_backward path in
-      cwd // p
-    else failwith ("Unknown OS :" ^ Sys.os_type)
-(* we only need convert the path in the beginning *)
-
-type result = { path : string; checked : bool }
-
-(* Magic path resolution:
-   foo => foo
-   foo/ => /absolute/path/to/projectRoot/node_modules/foo
-   foo/bar => /absolute/path/to/projectRoot/node_modules/foo/bar
-   /foo/bar => /foo/bar
-   ./foo/bar => /absolute/path/to/projectRoot/./foo/bar
-   Input is node path, output is OS dependent (normalized) path
-*)
-let resolve_bsb_magic_file ~cwd ~desc p : result =
-  let no_slash = Ext_string.no_slash_idx p in
-  if no_slash < 0 then
-    (* Single file FIXME: better error message for "" input *)
-    { path = p; checked = false }
-  else
-    let first_char = String.unsafe_get p 0 in
-    if Filename.is_relative p && first_char <> '.' then
-      let package_name, rest = Bsb_pkg_types.extract_pkg_name_and_file p in
-      let relative_path =
-        if Ext_sys.is_windows_or_cygwin then
-          Ext_string.replace_slash_backward rest
-        else rest
-      in
-      (* let p = if Ext_sys.is_windows_or_cygwin then Ext_string.replace_slash_backward p else p in *)
-      let package_dir = Bsb_pkg.resolve_bs_package ~cwd package_name in
-      let path = package_dir // relative_path in
-      if Sys.file_exists path then { path; checked = true }
-      else (
-        Bsb_log.error "@{<error>Could not resolve @} %s in %s@." p cwd;
-        failwith (p ^ " not found when resolving " ^ desc))
-    else
-      (* relative path [./x/y]*)
-      { path = convert_and_resolve_path cwd p; checked = true }
-
-(** converting a file from Linux path format to Windows *)
-
-(**
-   {[
-     mkp "a/b/c/d";;
-     mkp "/a/b/c/d"
-   ]}
-*)
-let rec mkp dir =
-  if not (Sys.file_exists dir) then
-    let parent_dir = Filename.dirname dir in
-    if parent_dir = Filename.current_dir_name then Unix.mkdir dir 0o777
-      (* leaf node *)
-    else (
-      mkp parent_dir;
-      Unix.mkdir dir 0o777)
-  else if not @@ Sys.is_directory dir then
-    failwith (dir ^ " exists but it is not a directory, plz remove it first")
-  else ()
-
-let get_list_string_acc (s : Ext_json_types.t array) acc =
-  Ext_array.to_list_map_acc s acc (fun x ->
-      match x with Str x -> Some x.str | _ -> None)
-
-let get_list_string s = get_list_string_acc s []
-
-(* Key is the path *)
-let ( |? ) m (key, cb) = m |> Ext_json.test key cb
-
-type top = Expect_none | Expect_name of string
-
-type package_context = { proj_dir : string; top : top; is_pinned: bool }
-
-(**
-   TODO: check duplicate package name
-   ?use path as identity?
-
-   Basic requirements
-     1. cycle detection
-     2. avoid duplication
-     3. deterministic, since -make-world will also comes with -clean-world
-
-*)
-
-let pp_packages_rev ppf lst =
-  Ext_list.rev_iter lst (fun s -> Format.fprintf ppf "%s " s)
-
-let extract_pinned_dependencies (map : Ext_json_types.t Map_string.t) : Set_string.t =
-  match Map_string.find_opt map Bsb_build_schemas.pinned_dependencies with
-  | None -> Set_string.empty
-  | Some (Arr { content }) ->
-      Set_string.of_list (get_list_string content)
-  | Some config -> Bsb_exception.config_error config "expect an array of string"
-
-let rec walk_all_deps_aux (visited : string Hash_string.t) (paths : string list)
-    ~(top : top) (dir : string) (queue : _ Queue.t) ~pinned_dependencies =
-  match Bsb_config_load.load_json ~per_proj_dir:dir ~warn_legacy_config:false with
-  | _, Obj { map; loc } ->
-      let cur_package_name =
-        match Map_string.find_opt map Bsb_build_schemas.name with
-        | Some (Str { str; loc }) ->
-            (match top with
-            | Expect_none -> ()
-            | Expect_name s ->
-                if s <> str then
-                  Bsb_exception.errorf ~loc
-                    "package name is expected to be %s but got %s" s str);
-            str
-        | Some _ | None ->
-            Bsb_exception.errorf ~loc "package name missing in %s/bsconfig.json"
-              dir
-      in
-      if Ext_list.mem_string paths cur_package_name then (
-        Bsb_log.error "@{<error>Cyclic dependencies in package stack@}@.";
-        exit 2);
-      let package_stacks = cur_package_name :: paths in
-      Bsb_log.info "@{<info>Package stack:@} %a @." pp_packages_rev
-        package_stacks;
-      if Hash_string.mem visited cur_package_name then
-        Bsb_log.info "@{<info>Visited before@} %s@." cur_package_name
-      else
-        let explore_deps (deps : string) pinned_dependencies =
-          map
-          |? ( deps,
-               `Arr
-                 (fun (new_packages : Ext_json_types.t array) ->
-                   Ext_array.iter new_packages (fun js ->
-                       match js with
-                       | Str { str = new_package } ->
-                           let package_dir =
-                             Bsb_pkg.resolve_bs_package ~cwd:dir
-                               (Bsb_pkg_types.string_as_package new_package)
-                           in
-                           walk_all_deps_aux visited package_stacks
-                             ~top:(Expect_name new_package) package_dir queue
-                             ~pinned_dependencies
-                       | _ ->
-                           Bsb_exception.errorf ~loc "%s expect an array" deps))
-             )
-          |> ignore
-        in
-        let is_pinned = match top with
-        | Expect_name n when Set_string.mem pinned_dependencies n -> true
-        | _ -> false
-        in
-        let pinned_dependencies = match is_pinned with
-        | true ->
-          let transitive_pinned_dependencies = extract_pinned_dependencies map
-          in
-          Set_string.union transitive_pinned_dependencies pinned_dependencies
-        | false -> pinned_dependencies
-        in
-        explore_deps Bsb_build_schemas.bs_dependencies pinned_dependencies;
-        (match top with
-        | Expect_none -> explore_deps Bsb_build_schemas.bs_dev_dependencies pinned_dependencies
-        | Expect_name _ when is_pinned ->
-            explore_deps Bsb_build_schemas.bs_dev_dependencies pinned_dependencies
-        | Expect_name _ -> ());
-        Queue.add { top; proj_dir = dir; is_pinned } queue;
-        Hash_string.add visited cur_package_name dir
-  | _ -> ()
-
-let walk_all_deps dir ~pinned_dependencies : package_context Queue.t =
-  let visited = Hash_string.create 0 in
-  let cb = Queue.create () in
-  walk_all_deps_aux visited [] ~top:Expect_none dir cb ~pinned_dependencies;
-  cb
diff --git a/jscomp/bsb/bsb_build_util.mli b/jscomp/bsb/bsb_build_util.mli
deleted file mode 100644
index 84ba8a2..0000000
--- a/jscomp/bsb/bsb_build_util.mli
+++ /dev/null
@@ -1,90 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val flag_concat : string -> string list -> string
-(**
-   Use:
-   {[
-     flag_concat "-ppx" [ppxs]
-   ]}
-*)
-
-val ppx_flags : Bsb_config_types.ppx list -> string
-(**
-   Build quoted commandline arguments for bsc.exe for the given ppx flags
-
-   Use:
-   {[
-     ppx_flags [ppxs]
-   ]}
-*)
-
-val pp_flag : string -> string
-
-val include_dirs : string list -> string
-(**
-   Build unquoted command line arguments for bsc.exe for the given include dirs
-
-   Use:
-   {[
-     include_dirs [dirs]
-   ]}
-*)
-
-val include_dirs_by : 'a list -> ('a -> string) -> string
-
-val mkp : string -> unit
-
-(* The path of [bsc] and [bsdep] is normalized so that the invokation of [./jscomp/bin/bsb.exe]
-   and [bsb.exe] (combined with a dirty bsconfig.json) will not trigger unnecessary rebuild.
-
-   The location of [bsc] and [bsdep] is configured by the combination of [Sys.executable_name]
-   and [cwd].
-
-   In theory, we should also check the integrity of [bsb.exe], if it is changed, the rebuild
-   should be regen, but that is too much in practice, not only you need check the integrity of
-   path of [bsb.exe] but also the timestamp, to make it 100% correct, also the integrity of
-   [bsdep.exe] [bsc.exe] etc.
-*)
-
-val get_list_string_acc : Ext_json_types.t array -> string list -> string list
-
-val get_list_string : Ext_json_types.t array -> string list
-
-type top = Expect_none | Expect_name of string
-
-type result = { path : string; checked : bool }
-
-(* [resolve_bsb_magic_file]
-   returns a tuple (path,checked)
-   when checked is true, it means such file should exist without depending on env
-*)
-val resolve_bsb_magic_file : cwd:string -> desc:string -> string -> result
-
-type package_context = { proj_dir : string; top : top; is_pinned: bool }
-
-val extract_pinned_dependencies: Ext_json_types.t Map_string.t -> Set_string.t
-
-val walk_all_deps :
-  string -> pinned_dependencies:Set_string.t -> package_context Queue.t
diff --git a/jscomp/bsb/bsb_clean.ml b/jscomp/bsb/bsb_clean.ml
deleted file mode 100644
index ff8ed40..0000000
--- a/jscomp/bsb/bsb_clean.ml
+++ /dev/null
@@ -1,62 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ( // ) = Ext_path.combine
-
-let ninja_clean proj_dir =
-  try
-    let cmd = Bsb_global_paths.vendor_ninja in
-    let lib_artifacts_dir = Bsb_config.lib_bs in
-    let cwd = proj_dir // lib_artifacts_dir in
-    if Sys.file_exists cwd then
-      let eid =
-        Bsb_unix.run_command_execv { cmd; args = [| cmd; "-t"; "clean" |]; cwd }
-      in
-      if eid <> 0 then Bsb_log.warn "@{<warning>Failed@}@."
-  with e -> Bsb_log.warn "@{<warning>Failed@}: %s @." (Printexc.to_string e)
-
-let clean_bs_garbage proj_dir =
-  Bsb_log.info "@{<info>Cleaning:@} in %s@." proj_dir;
-  let try_remove x =
-    let x = proj_dir // x in
-    if Sys.file_exists x then Bsb_unix.remove_dir_recursive x
-  in
-  try
-    Bsb_parse_sources.clean_re_js proj_dir;
-    (* clean re.js files*)
-    ninja_clean proj_dir;
-    Ext_list.iter Bsb_config.all_lib_artifacts try_remove
-  with e ->
-    Bsb_log.warn "@{<warning>Failed@} to clean due to %s" (Printexc.to_string e)
-
-let clean_bs_deps proj_dir =
-  let _, _, _, pinned_dependencies = Bsb_config_parse.deps_from_bsconfig () in
-  let queue = Bsb_build_util.walk_all_deps proj_dir ~pinned_dependencies in
-  Queue.iter
-    (fun (pkg_cxt : Bsb_build_util.package_context) ->
-      (* whether top or not always do the cleaning *)
-      clean_bs_garbage pkg_cxt.proj_dir)
-    queue
-
-let clean_self proj_dir = clean_bs_garbage proj_dir
diff --git a/jscomp/bsb/bsb_clean.mli b/jscomp/bsb/bsb_clean.mli
deleted file mode 100644
index bedebe8..0000000
--- a/jscomp/bsb/bsb_clean.mli
+++ /dev/null
@@ -1,31 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** clean bsc generated artifacts.
-    TODO: clean stale in source js artifacts
-*)
-
-val clean_bs_deps : string -> unit
-
-val clean_self : string -> unit
diff --git a/jscomp/bsb/bsb_config.ml b/jscomp/bsb/bsb_config.ml
deleted file mode 100644
index 3c3d7d5..0000000
--- a/jscomp/bsb/bsb_config.ml
+++ /dev/null
@@ -1,68 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-let ( // ) = Ext_path.combine
-
-let lib_lit = "lib"
-
-let lib_js = lib_lit // "js"
-
-let lib_ocaml = lib_lit // "ocaml"
-
-let lib_bs = lib_lit // "bs"
-
-let lib_es6 = lib_lit // "es6"
-
-let lib_es6_global = lib_lit // "es6_global"
-
-let all_lib_artifacts = [ lib_js; lib_ocaml; lib_bs; lib_es6; lib_es6_global ]
-
-let rev_lib_bs = ".." // ".."
-
-(* access the js directory from "lib/bs",
-   it would be '../js'
-
-   TODO: should be renamed, js -> cjs, es6 -> mjs in v12
-*)
-let lib_bs_prefix_of_format (x : Ext_module_system.t) =
-  ".."
-  // match x with Commonjs -> "js" | Esmodule -> "es6" | Es6_global -> "es6_global"
-
-(* lib/js, lib/es6, lib/es6_global *)
-let top_prefix_of_format (x : Ext_module_system.t) =
-  match x with
-  | Commonjs -> lib_js
-  | Esmodule -> lib_es6
-  | Es6_global -> lib_es6_global
-
-let rev_lib_bs_prefix p = rev_lib_bs // p
-
-let ocaml_bin_install_prefix p = lib_ocaml // p
-
-let proj_rel path = rev_lib_bs // path
-
-(** it may not be a bad idea to hard code the binary path 
-    of bsb in configuration time
-*)
-
-(* let cmd_package_specs = ref None  *)
diff --git a/jscomp/bsb/bsb_config.mli b/jscomp/bsb/bsb_config.mli
deleted file mode 100644
index c5df914..0000000
--- a/jscomp/bsb/bsb_config.mli
+++ /dev/null
@@ -1,51 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val ocaml_bin_install_prefix : string -> string
-
-val proj_rel : string -> string
-
-val lib_lit : string
-
-val lib_js : string
-
-val lib_bs : string
-
-val lib_es6 : string
-[@@ocaml.deprecated "will be removed in v12"]
-
-val lib_es6_global : string
-[@@ocaml.deprecated "will be removed in v12"]
-
-val lib_ocaml : string
-
-val all_lib_artifacts : string list
-
-(* we need generate path relative to [lib/bs] directory in the opposite direction *)
-val rev_lib_bs_prefix : string -> string
-
-val lib_bs_prefix_of_format : Ext_module_system.t -> string
-
-val top_prefix_of_format : Ext_module_system.t -> string
-(** default not install, only when -make-world, its dependencies will be installed  *)
diff --git a/jscomp/bsb/bsb_config_load.ml b/jscomp/bsb/bsb_config_load.ml
deleted file mode 100644
index 0255663..0000000
--- a/jscomp/bsb/bsb_config_load.ml
+++ /dev/null
@@ -1,24 +0,0 @@
-let ( // ) = Ext_path.combine
-
-let load_json ~(per_proj_dir : string) ~(warn_legacy_config : bool)
-    : string * Ext_json_types.t =
-  let filename, abs, in_chan =
-    let filename = Literals.rescript_json in
-    let abs = (per_proj_dir // filename) in
-    match open_in abs
-    with
-    | in_chan -> (filename, abs, in_chan)
-    | exception e ->
-      let filename = Literals.bsconfig_json in
-      let abs = (per_proj_dir // filename) in
-      match open_in abs
-      with
-      | in_chan -> (filename, abs, in_chan)
-      | exception _ -> raise e (* forward error from rescript.json *)
-  in
-  if warn_legacy_config && filename = Literals.bsconfig_json then
-    print_endline "Warning: bsconfig.json is deprecated. Migrate it to rescript.json\n";
-  match Ext_json_parse.parse_json_from_chan abs in_chan
-  with
-  | v -> close_in in_chan ; (filename, v)
-  | exception e -> close_in in_chan ; raise e
diff --git a/jscomp/bsb/bsb_config_load.mli b/jscomp/bsb/bsb_config_load.mli
deleted file mode 100644
index 7e8cd97..0000000
--- a/jscomp/bsb/bsb_config_load.mli
+++ /dev/null
@@ -1,2 +0,0 @@
-val load_json :
-  per_proj_dir:string -> warn_legacy_config:bool -> string * Ext_json_types.t
diff --git a/jscomp/bsb/bsb_config_parse.ml b/jscomp/bsb/bsb_config_parse.ml
deleted file mode 100644
index 747a2b7..0000000
--- a/jscomp/bsb/bsb_config_parse.ml
+++ /dev/null
@@ -1,370 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* let get_list_string = Bsb_build_util.get_list_string *)
-let ( // ) = Ext_path.combine
-
-let resolve_package cwd package_name =
-  let x = Bsb_pkg.resolve_bs_package ~cwd package_name in
-  {
-    Bsb_config_types.package_name;
-    package_install_path = x // Bsb_config.lib_ocaml;
-  }
-
-type json_map = Ext_json_types.t Map_string.t
-
-(* Key is the path *)
-let ( |? ) m (key, cb) = m |> Ext_json.test key cb
-let ( .?() ) = Map_string.find_opt
-
-(*TODO: it is a little mess that [cwd] and [project dir] are shared*)
-
-let extract_package_name_and_namespace (map : json_map) : string * string option
-    =
-  let package_name =
-    match map.?(Bsb_build_schemas.name) with
-    | Some (Str { str = "_" } as config) ->
-        Bsb_exception.config_error config "_ is a reserved package name"
-    | Some (Str { str = name }) -> name
-    | Some config ->
-        Bsb_exception.config_error config "name expect a string field"
-    | None -> Bsb_exception.invalid_spec "field name is required"
-  in
-  let namespace =
-    match map.?(Bsb_build_schemas.namespace) with
-    | None | Some (False _) -> None
-    | Some (True _) ->
-        Some (Ext_namespace.namespace_of_package_name package_name)
-    | Some (Str { str }) ->
-        (*TODO : check the validity of namespace *)
-        Some (Ext_namespace.namespace_of_package_name str)
-    | Some x ->
-        Bsb_exception.config_error x "namespace field expects string or boolean"
-  in
-  (package_name, namespace)
-
-(**
-    There are two things to check:
-   - the running bsb and vendoring bsb is the same
-   - the running bsb need delete stale build artifacts
-      (kinda check npm upgrade)
-
-      Note if the setup is correct:
-      the running compiler and node_modules/rescript
-      should be the same version,
-      The exact check is that the running compiler should have a
-      compatible runtime version installed, the location of the
-      compiler is actually not relevant.
-      We disable the check temporarily
-      e.g,
-      ```
-      bsc -runtime runtime_dir@version
-      ```
-*)
-let check_stdlib (map : json_map) : bool =
-  (*built_in_package*)
-  match map.?(Bsb_build_schemas.use_stdlib) with
-  | Some (False _) -> false
-  | None | Some _ -> true
-
-let extract_gentype_config (map : json_map) : Bsb_config_types.gentype_config =
-  match map.?(Bsb_build_schemas.gentypeconfig) with
-  | None -> false
-  | Some (Obj _) -> true
-  | Some config ->
-      Bsb_exception.config_error config "gentypeconfig expect an object"
-
-let extract_uncurried (map : json_map) : bool =
-  match map.?(Bsb_build_schemas.uncurried) with
-  | None -> true
-  | Some (True _) -> true
-  | Some (False _) -> false
-  | Some config ->
-      Bsb_exception.config_error config "uncurried expects one of: true, false."
-
-let extract_string (map : json_map) (field : string) cb =
-  match map.?(field) with
-  | None -> None
-  | Some (Str { str }) -> cb str
-  | Some config -> Bsb_exception.config_error config (field ^ " expect a string")
-
-let extract_boolean (map : json_map) (field : string) (default : bool) : bool =
-  match map.?(field) with
-  | None -> default
-  | Some (True _) -> true
-  | Some (False _) -> false
-  | Some config ->
-      Bsb_exception.config_error config (field ^ " expect a boolean")
-
-let extract_reason_react_jsx (map : json_map) =
-  let default : Bsb_config_types.reason_react_jsx option ref = ref None in
-  map
-  |? ( Bsb_build_schemas.reason,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.react_jsx) with
-           | Some (Flo { loc; flo }) -> (
-               match flo with
-               | "3" -> default := Some Jsx_v3
-               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx version %s" flo
-               )
-           | Some x ->
-               Bsb_exception.config_error x
-                 "Unexpected input (expect a version number) for jsx, note \
-                  boolean is no longer allowed"
-           | None -> ()) )
-  |> ignore;
-  !default
-
-let extract_warning (map : json_map) =
-  match map.?(Bsb_build_schemas.warnings) with
-  | None -> Bsb_warning.use_default
-  | Some (Obj { map }) -> Bsb_warning.from_map map
-  | Some config -> Bsb_exception.config_error config "expect an object"
-
-let extract_ignored_dirs (map : json_map) : Set_string.t =
-  match map.?(Bsb_build_schemas.ignored_dirs) with
-  | None -> Set_string.empty
-  | Some (Arr { content }) ->
-      Set_string.of_list (Bsb_build_util.get_list_string content)
-  | Some config -> Bsb_exception.config_error config "expect an array of string"
-
-let extract_generators (map : json_map) =
-  let generators = ref Map_string.empty in
-  (match map.?(Bsb_build_schemas.generators) with
-  | None -> ()
-  | Some (Arr { content = s }) ->
-      generators :=
-        Ext_array.fold_left s Map_string.empty (fun acc json ->
-            match json with
-            | Obj { map = m; loc } -> (
-                match
-                  (m.?(Bsb_build_schemas.name), m.?(Bsb_build_schemas.command))
-                with
-                | Some (Str { str = name }), Some (Str { str = command }) ->
-                    Map_string.add acc name command
-                | _, _ ->
-                    Bsb_exception.errorf ~loc
-                      {| generators exepect format like { "name" : "cppo",  "command"  : "cppo $in -o $out"} |}
-                )
-            | _ -> acc)
-  | Some config ->
-      Bsb_exception.config_error config
-        (Bsb_build_schemas.generators ^ " expect an array field"));
-  !generators
-
-let extract_dependencies (map : json_map) cwd (field : string) :
-    Bsb_config_types.dependencies =
-  match map.?(field) with
-  | None -> []
-  | Some (Arr { content = s }) ->
-      Ext_list.map (Bsb_build_util.get_list_string s) (fun s ->
-          resolve_package cwd (Bsb_pkg_types.string_as_package s))
-  | Some config -> Bsb_exception.config_error config (field ^ " expect an array")
-
-(* return an empty array if not found *)
-let extract_string_list (map : json_map) (field : string) : string list =
-  match map.?(field) with
-  | None -> []
-  | Some (Arr { content = s }) -> Bsb_build_util.get_list_string s
-  | Some config -> Bsb_exception.config_error config (field ^ " expect an array")
-
-let extract_ppx (map : json_map) (field : string) ~(cwd : string) :
-    Bsb_config_types.ppx list =
-  match map.?(field) with
-  | None -> []
-  | Some (Arr { content }) ->
-      let resolve s =
-        if s = "" then
-          Bsb_exception.invalid_spec "invalid ppx, empty string found"
-        else
-          (Bsb_build_util.resolve_bsb_magic_file ~cwd
-             ~desc:Bsb_build_schemas.ppx_flags s)
-            .path
-      in
-      Ext_array.to_list_f content (fun x ->
-          match x with
-          | Str x -> { Bsb_config_types.name = resolve x.str; args = [] }
-          | Arr { content } -> (
-              let xs = Bsb_build_util.get_list_string content in
-              match xs with
-              | [] -> Bsb_exception.config_error x " empty array is not allowed"
-              | name :: args -> { Bsb_config_types.name = resolve name; args })
-          | config ->
-              Bsb_exception.config_error config
-                (field ^ "expect each item to be either string or array"))
-  | Some config -> Bsb_exception.config_error config (field ^ " expect an array")
-
-let extract_js_post_build (map : json_map) cwd : string option =
-  let js_post_build_cmd = ref None in
-  map
-  |? ( Bsb_build_schemas.js_post_build,
-       `Obj
-         (fun m ->
-           m
-           |? ( Bsb_build_schemas.cmd,
-                `Str
-                  (fun s ->
-                    js_post_build_cmd :=
-                      Some
-                        (Bsb_build_util.resolve_bsb_magic_file ~cwd
-                           ~desc:Bsb_build_schemas.js_post_build s)
-                          .path) )
-           |> ignore) )
-  |> ignore;
-  !js_post_build_cmd
-
-(** ATT: make sure such function is re-entrant.
-    With a given [cwd] it works anywhere*)
-let interpret_json
-  ~(filename : string)
-  ~(json : Ext_json_types.t)
-  ~(package_kind : Bsb_package_kind.t)
-  ~(per_proj_dir : string)
-    : Bsb_config_types.t =
-  (* we should not resolve it too early,
-      since it is external configuration, no {!Bsb_build_util.convert_and_resolve_path}
-  *)
-
-  (* When we plan to add more deps here,
-     Make sure check it is consistent that for nested deps, we have a
-     quck check by just re-parsing deps
-     Make sure it works with [-make-world] [-clean-world]
-  *)
-
-  (* Setting ninja is a bit complex
-     1. if [build.ninja] does use [ninja] we need set a variable
-     2. we need store it so that we can call ninja correctly
-  *)
-  match json
-  with
-  | Obj { map } -> (
-      let package_name, namespace = extract_package_name_and_namespace map in
-      let gentype_config = extract_gentype_config map in
-
-      (* This line has to be before any calls to Bsb_global_backend.backend, because it'll read the entries
-           array from the bsconfig and set the backend_ref to the first entry, if any. *)
-
-      (* The default situation is empty *)
-      let built_in_package : bool = check_stdlib map in
-
-      let pp_flags : string option =
-        extract_string map Bsb_build_schemas.pp_flags (fun p ->
-            if p = "" then
-              Bsb_exception.invalid_spec "invalid pp, empty string found"
-            else
-              Some
-                (Bsb_build_util.resolve_bsb_magic_file ~cwd:per_proj_dir
-                   ~desc:Bsb_build_schemas.pp_flags p)
-                  .path)
-      in
-      let reason_react_jsx = extract_reason_react_jsx map in
-      let bs_dependencies =
-        extract_dependencies map per_proj_dir Bsb_build_schemas.bs_dependencies
-      in
-      let bs_dev_dependencies =
-        match package_kind with
-        | Toplevel | Pinned_dependency _ ->
-            extract_dependencies map per_proj_dir
-              Bsb_build_schemas.bs_dev_dependencies
-        | Dependency _ -> []
-      in
-      let pinned_dependencies = Bsb_build_util.extract_pinned_dependencies map in
-      match map.?(Bsb_build_schemas.sources) with
-      | Some sources ->
-          let cut_generators =
-            extract_boolean map Bsb_build_schemas.cut_generators false
-          in
-          let groups =
-            Bsb_parse_sources.scan ~ignored_dirs:(extract_ignored_dirs map)
-              ~package_kind ~root:per_proj_dir ~cut_generators
-              (* ~namespace *)
-              sources
-          in
-          let bsc_flags = extract_string_list map Bsb_build_schemas.bsc_flags in
-          let jsx = Bsb_jsx.from_map map in
-          let jsx, bsc_flags =
-            match package_kind with
-            | Pinned_dependency x | Dependency x ->
-                if List.mem package_name x.jsx.v3_dependencies then
-                  ( { jsx with version = Some Jsx_v3 },
-                    "-open ReactV3" :: bsc_flags )
-                else (x.jsx, bsc_flags)
-            | _ -> (jsx, bsc_flags)
-          in
-          {
-            pinned_dependencies;
-            gentype_config;
-            package_name;
-            namespace;
-            warning = extract_warning map;
-            external_includes =
-              extract_string_list map Bsb_build_schemas.bs_external_includes;
-            bsc_flags;
-            ppx_files =
-              extract_ppx map ~cwd:per_proj_dir Bsb_build_schemas.ppx_flags;
-            pp_file = pp_flags;
-            bs_dependencies;
-            bs_dev_dependencies;
-            (*
-            reference for quoting
-             {[
-               let tmpfile = Filename.temp_file "ocamlpp" "" in
-               let comm = Printf.sprintf "%s %s > %s"
-                   pp (Filename.quote sourcefile) tmpfile
-               in
-             ]}
-          *)
-            js_post_build_cmd = extract_js_post_build map per_proj_dir;
-            package_specs =
-              (match package_kind with
-              | Toplevel -> Bsb_package_specs.from_map ~cwd:per_proj_dir map
-              | Pinned_dependency x | Dependency x -> x.package_specs);
-            file_groups = groups;
-            files_to_install = Queue.create ();
-            built_in_dependency = built_in_package;
-            reason_react_jsx;
-            jsx;
-            generators = extract_generators map;
-            cut_generators;
-            uncurried =
-            (match package_kind with
-            | Toplevel -> extract_uncurried map
-            | Pinned_dependency x | Dependency x -> x.uncurried);
-            filename;
-          }
-      | None ->
-          Bsb_exception.invalid_spec ("no sources specified in " ^ filename))
-  | _ -> Bsb_exception.invalid_spec (filename ^ " expect a json object {}")
-
-let deps_from_bsconfig () =
-  let cwd = Bsb_global_paths.cwd in
-  match Bsb_config_load.load_json ~per_proj_dir:cwd ~warn_legacy_config:false
-  with
-  | _, Obj { map } ->
-      ( Bsb_package_specs.from_map ~cwd map,
-        Bsb_jsx.from_map map,
-        extract_uncurried map,
-        Bsb_build_util.extract_pinned_dependencies map )
-  | _, _ -> assert false
diff --git a/jscomp/bsb/bsb_config_parse.mli b/jscomp/bsb/bsb_config_parse.mli
deleted file mode 100644
index 3aedf98..0000000
--- a/jscomp/bsb/bsb_config_parse.mli
+++ /dev/null
@@ -1,32 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val deps_from_bsconfig : unit -> Bsb_package_specs.t * Bsb_jsx.t * bool *  Set_string.t
-
-val interpret_json :
-  filename:string ->
-  json:Ext_json_types.t ->
-  package_kind:Bsb_package_kind.t ->
-  per_proj_dir:string ->
-  Bsb_config_types.t
diff --git a/jscomp/bsb/bsb_config_types.ml b/jscomp/bsb/bsb_config_types.ml
deleted file mode 100644
index db5c007..0000000
--- a/jscomp/bsb/bsb_config_types.ml
+++ /dev/null
@@ -1,70 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 dependency = {
-  package_name : Bsb_pkg_types.t;
-  package_install_path : string;
-}
-
-type dependencies = dependency list
-type reason_react_jsx = Jsx_v3
-(* string option  *)
-
-type gentype_config = bool
-type command = string
-type ppx = { name : string; args : string list }
-
-type t = {
-  package_name : string;
-  (* [captial-package] *)
-  namespace : string option;
-  (* CapitalPackage *)
-  external_includes : string list;
-  bsc_flags : string list;
-  ppx_files : ppx list;
-  pp_file : string option;
-  bs_dependencies : dependencies;
-  bs_dev_dependencies : dependencies;
-  pinned_dependencies : Set_string.t;
-  built_in_dependency : bool;
-  warning : Bsb_warning.t;
-  (*TODO: maybe we should always resolve rescript
-    so that we can calculate correct relative path in
-    [.merlin]
-  *)
-  js_post_build_cmd : string option;
-  package_specs : Bsb_package_specs.t;
-  file_groups : Bsb_file_groups.t;
-  files_to_install : Bsb_db.module_info Queue.t;
-  reason_react_jsx : reason_react_jsx option;
-  jsx: Bsb_jsx.t;
-  (* whether apply PPX transform or not*)
-  generators : command Map_string.t;
-  cut_generators : bool;
-  (* note when used as a dev mode, we will always ignore it *)
-  gentype_config : gentype_config;
-  uncurried: bool;
-
-  filename: string;
-}
diff --git a/jscomp/bsb/bsb_db_encode.ml b/jscomp/bsb/bsb_db_encode.ml
deleted file mode 100644
index 50d00e5..0000000
--- a/jscomp/bsb/bsb_db_encode.ml
+++ /dev/null
@@ -1,98 +0,0 @@
-(* Copyright (C) 2019 - Present Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let bsbuild_cache = Literals.bsbuild_cache
-
-let nl buf = Ext_buffer.add_char buf '\n'
-
-(* IDEAS:
-   Pros:
-   - could be even shortened to a single byte
-     Cons:
-   - decode would allocate
-   - code too verbose
-   - not readable
-*)
-
-let make_encoding length buf : Ext_buffer.t -> int -> unit =
-  let max_range = (length lsl 1) + 1 in
-  if max_range <= 0xff then (
-    Ext_buffer.add_char buf '1';
-    Ext_buffer.add_int_1)
-  else if max_range <= 0xff_ff then (
-    Ext_buffer.add_char buf '2';
-    Ext_buffer.add_int_2)
-  else if length <= 0x7f_ff_ff then (
-    Ext_buffer.add_char buf '3';
-    Ext_buffer.add_int_3)
-  else if length <= 0x7f_ff_ff_ff then (
-    Ext_buffer.add_char buf '4';
-    Ext_buffer.add_int_4)
-  else assert false
-
-(* Make sure [tmp_buf1] and [tmp_buf2] is cleared ,
-   they are only used to control the order.
-   Strictly speaking, [tmp_buf1] is not needed
-*)
-let encode_single (db : Bsb_db.map) (buf : Ext_buffer.t) =
-  (* module name section *)
-  let len = Map_string.cardinal db in
-  Ext_buffer.add_string_char buf (string_of_int len) '\n';
-  if len <> 0 then (
-    let mapping = Hash_string.create 50 in
-    Map_string.iter db (fun name { dir } ->
-        Ext_buffer.add_string_char buf name '\n';
-        if not (Hash_string.mem mapping dir) then
-          Hash_string.add mapping dir (Hash_string.length mapping));
-    let length = Hash_string.length mapping in
-    let rev_mapping = Array.make length "" in
-    Hash_string.iter mapping (fun k i -> Array.unsafe_set rev_mapping i k);
-    (* directory name section *)
-    Ext_array.iter rev_mapping (fun s -> Ext_buffer.add_string_char buf s '\t');
-    nl buf;
-    (* module name info section *)
-    let len_encoding = make_encoding length buf in
-    Map_string.iter db (fun _ module_info ->
-        len_encoding buf
-          ((Hash_string.find_exn mapping module_info.dir lsl 1)
-          + (Obj.magic (module_info.case : bool) : int)));
-    nl buf)
-
-let encode (dbs : Bsb_db.t) buf =
-  encode_single dbs.lib buf;
-  encode_single dbs.dev buf
-
-(* shall we avoid writing such file (checking the digest)?
-   It is expensive to start scanning the whole code base,
-   we should we avoid it in the first place, if we do start scanning,
-   this operation seems affordable
-*)
-let write_build_cache ~dir (bs_files : Bsb_db.t) : string =
-  let oc = open_out_bin (Filename.concat dir bsbuild_cache) in
-  let buf = Ext_buffer.create 100_000 in
-  encode bs_files buf;
-  Ext_buffer.output_buffer oc buf;
-  close_out oc;
-  let digest = Ext_buffer.digest buf in
-  Digest.to_hex digest
diff --git a/jscomp/bsb/bsb_db_encode.mli b/jscomp/bsb/bsb_db_encode.mli
deleted file mode 100644
index e769883..0000000
--- a/jscomp/bsb/bsb_db_encode.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2019 - Present Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val encode : Bsb_db.t -> Ext_buffer.t -> unit
-
-val write_build_cache : dir:string -> Bsb_db.t -> string
diff --git a/jscomp/bsb/bsb_db_util.ml b/jscomp/bsb/bsb_db_util.ml
deleted file mode 100644
index 8b2d0d9..0000000
--- a/jscomp/bsb/bsb_db_util.ml
+++ /dev/null
@@ -1,109 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 module_info = Bsb_db.module_info
-
-type t = Bsb_db.map
-
-let conflict_module_info modname (a : module_info) (b : module_info) =
-  Bsb_exception.conflict_module modname a.dir b.dir
-
-(* merge data info from two directories*)
-let merge (acc : t) (sources : t) : t =
-  Map_string.disjoint_merge_exn acc sources conflict_module_info
-
-let sanity_check (map : t) =
-  Map_string.iter map (fun m module_info ->
-      if module_info.info = Intf then Bsb_exception.no_implementation m)
-
-(* invariant check:
-   ml and mli should have the same case, same path
-*)
-let check (x : module_info) name_sans_extension case syntax_kind
-    (module_info : Bsb_db.info) =
-  let x_ml_info = x.info in
-  if
-    x.name_sans_extension <> name_sans_extension
-    || x.case <> case
-    || x.syntax_kind <> syntax_kind
-    || x_ml_info = module_info || x_ml_info = Impl_intf
-  then
-    Bsb_exception.invalid_spec
-      (Printf.sprintf
-         "implementation and interface have different path names or different \
-          cases %s vs %s"
-         x.name_sans_extension name_sans_extension);
-  x.info <- Impl_intf;
-  x
-
-let warning_unused_file : _ format =
-  "@{<warning>IGNORED@}: file %s under %s is ignored because it can't be \
-   turned into a valid module name. \n\
-   The build system transforms a file name into a module name by upper-casing \
-   the first letter@."
-(* TODO: add a link for more explanations *)
-
-let is_editor_temporary_files basename = Ext_string.starts_with basename ".#"
-
-(*
-   Example: .#hi.ml
-   Note for other files like <filename>~, <filename>.swp
-   it does not pass the suffix rules
-*)
-let add_basename ~(dir : string) (map : t) ?error_on_invalid_suffix basename : t
-    =
-  if is_editor_temporary_files basename then map
-  else
-    let info = ref Bsb_db.Impl in
-    let syntax_kind = ref Bsb_db.Ml in
-    let invalid_suffix = ref false in
-    let file_suffix = Ext_filename.get_extension_maybe basename in
-    (match () with
-    | _ when file_suffix = Literals.suffix_ml -> ()
-    | _ when file_suffix = Literals.suffix_res -> syntax_kind := Res
-    | _ when file_suffix = Literals.suffix_mli -> info := Intf
-    | _ when file_suffix = Literals.suffix_resi ->
-        info := Intf;
-        syntax_kind := Res
-    | _ -> invalid_suffix := true);
-    let info = !info in
-    let syntax_kind = !syntax_kind in
-    let invalid_suffix = !invalid_suffix in
-    if invalid_suffix then
-      match error_on_invalid_suffix with
-      | None -> map
-      | Some loc -> Bsb_exception.errorf ~loc "invalid suffix %s" basename
-    else
-      match Ext_filename.as_module ~basename:(Filename.basename basename) with
-      | None ->
-          Bsb_log.warn warning_unused_file basename dir;
-          map
-      | Some { module_name; case } ->
-          let name_sans_extension =
-            Filename.concat dir (Ext_filename.chop_extension_maybe basename)
-          in
-          let dir = Filename.dirname name_sans_extension in
-          Map_string.adjust map module_name (fun opt_module_info ->
-              match opt_module_info with
-              | None -> { dir; name_sans_extension; info; syntax_kind; case }
-              | Some x -> check x name_sans_extension case syntax_kind info)
diff --git a/jscomp/bsb/bsb_db_util.mli b/jscomp/bsb/bsb_db_util.mli
deleted file mode 100644
index d4ddf79..0000000
--- a/jscomp/bsb/bsb_db_util.mli
+++ /dev/null
@@ -1,42 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val conflict_module_info :
-  string -> Bsb_db.module_info -> Bsb_db.module_info -> exn
-
-val merge : Bsb_db.map -> Bsb_db.map -> Bsb_db.map
-
-val sanity_check : Bsb_db.map -> unit
-
-(** 
-   Currently it is okay to have duplicated module, 
-   In the future, we may emit a warning 
-*)
-
-val add_basename :
-  dir:string ->
-  Bsb_db.map ->
-  ?error_on_invalid_suffix:Ext_position.t ->
-  string ->
-  Bsb_db.map
diff --git a/jscomp/bsb/bsb_exception.ml b/jscomp/bsb/bsb_exception.ml
deleted file mode 100644
index 007221c..0000000
--- a/jscomp/bsb/bsb_exception.ml
+++ /dev/null
@@ -1,104 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 error =
-  | Package_not_found of Bsb_pkg_types.t * string option (* json file *)
-  | Json_config of Ext_position.t * string
-  | Invalid_json of string
-  | Invalid_spec of string
-  | Conflict_module of string * string * string
-  | No_implementation of string
-  | Not_consistent of string
-
-exception Error of error
-
-let error err = raise (Error err)
-
-let package_not_found ~pkg ~json = error (Package_not_found (pkg, json))
-
-let print (fmt : Format.formatter) (x : error) =
-  match x with
-  | Conflict_module (modname, dir1, dir2) ->
-      Format.fprintf fmt
-        "@{<error>Error:@} %s found in two directories: (%s, %s)\n\
-         File names must be unique per project" modname dir1 dir2
-  | Not_consistent modname ->
-      Format.fprintf fmt
-        "@{<error>Error:@} %s has implementation/interface in non-consistent \
-         syntax(reason/ocaml)"
-        modname
-  | No_implementation modname ->
-      Format.fprintf fmt
-        "@{<error>Error:@} %s does not have implementation file" modname
-  | Package_not_found (name, json_opt) ->
-      let in_json =
-        match json_opt with None -> Ext_string.empty | Some x -> " in " ^ x
-      in
-      let name = Bsb_pkg_types.to_string name in
-      if Ext_string.equal name !Bs_version.package_name then
-        Format.fprintf fmt
-          "File \"bsconfig.json\", line 1\n\
-           @{<error>Error:@} package @{<error>%s@} is not found %s\n\
-           It's the basic, required package. If you have it installed globally,\n\
-           Please run `npm link rescript` to make it available" name in_json
-      else
-        Format.fprintf fmt
-          "File \"bsconfig.json\", line 1\n\
-           @{<error>Error:@} package @{<error>%s@} not found or built %s\n\
-           - Did you install it?" name in_json
-  | Json_config (pos, s) ->
-      Format.fprintf fmt
-        "File %S, line %d:\n\
-         @{<error>Error:@} %s \n\
-         For more details, please check out the schema at \
-         https://rescript-lang.org/docs/manual/latest/build-configuration-schema"
-        pos.pos_fname pos.pos_lnum s
-  | Invalid_spec s ->
-      Format.fprintf fmt "@{<error>Error: Invalid bsconfig.json %s@}" s
-  | Invalid_json s ->
-      Format.fprintf fmt
-        "File %S, line 1\n@{<error>Error: Invalid json format@}" s
-
-let conflict_module modname dir1 dir2 =
-  Error (Conflict_module (modname, dir1, dir2))
-
-let no_implementation modname = error (No_implementation modname)
-
-let not_consistent modname = error (Not_consistent modname)
-
-let errorf ~loc fmt =
-  Format.ksprintf (fun s -> error (Json_config (loc, s))) fmt
-
-let config_error config fmt =
-  let loc = Ext_json.loc_of config in
-
-  error (Json_config (loc, fmt))
-
-let invalid_spec s = error (Invalid_spec s)
-
-let invalid_json s = error (Invalid_json s)
-
-let () =
-  Printexc.register_printer (fun x ->
-      match x with Error x -> Some (Format.asprintf "%a" print x) | _ -> None)
diff --git a/jscomp/bsb/bsb_exception.mli b/jscomp/bsb/bsb_exception.mli
deleted file mode 100644
index 9f40866..0000000
--- a/jscomp/bsb/bsb_exception.mli
+++ /dev/null
@@ -1,48 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 error
-(**
-    This module is used for fatal errros
-*)
-
-exception Error of error
-
-val print : Format.formatter -> error -> unit
-
-val package_not_found : pkg:Bsb_pkg_types.t -> json:string option -> 'a
-
-val conflict_module : string -> string -> string -> exn
-
-val errorf : loc:Ext_position.t -> ('a, unit, string, 'b) format4 -> 'a
-
-val config_error : Ext_json_types.t -> string -> 'a
-
-val invalid_spec : string -> 'a
-
-val invalid_json : string -> 'a
-
-val no_implementation : string -> 'a
-
-val not_consistent : string -> 'a
diff --git a/jscomp/bsb/bsb_file.ml b/jscomp/bsb/bsb_file.ml
deleted file mode 100644
index ebc696c..0000000
--- a/jscomp/bsb/bsb_file.ml
+++ /dev/null
@@ -1,73 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** it is not necessary to call [chown] since it is within the same user 
-    and {!Unix.chown} is not implemented under Windows
-*)
-let set_infos filename (infos : Unix.stats) =
-  Unix.utimes filename infos.st_atime infos.st_mtime;
-  Unix.chmod filename infos.st_perm
-
-(*
-  try
-    Unix.chown filename infos.st_uid infos.st_gid
-  with Unix_error(EPERM,_,_) -> ()
-*)
-
-let buffer_size = 8192
-
-let buffer = Bytes.create buffer_size
-
-let file_copy input_name output_name =
-  let fd_in = Unix.openfile input_name [ O_RDONLY ] 0 in
-  let fd_out = Unix.openfile output_name [ O_WRONLY; O_CREAT; O_TRUNC ] 0o666 in
-  let rec copy_loop () =
-    match Unix.read fd_in buffer 0 buffer_size with
-    | 0 -> ()
-    | r ->
-        ignore (Unix.write fd_out buffer 0 r);
-        copy_loop ()
-  in
-  copy_loop ();
-  Unix.close fd_in;
-  Unix.close fd_out
-
-let copy_with_permission input_name output_name =
-  file_copy input_name output_name;
-  set_infos output_name (Unix.lstat input_name)
-
-let install_if_exists ~destdir input_name =
-  if Sys.file_exists input_name then (
-    let output_name = Filename.concat destdir (Filename.basename input_name) in
-    match (Unix.stat output_name, Unix.stat input_name) with
-    | { st_mtime = output_stamp; _ }, { st_mtime = input_stamp; _ }
-      when input_stamp <= output_stamp ->
-        false
-    | _ ->
-        copy_with_permission input_name output_name;
-        true
-    | exception _ ->
-        copy_with_permission input_name output_name;
-        true)
-  else false
diff --git a/jscomp/bsb/bsb_file.mli b/jscomp/bsb/bsb_file.mli
deleted file mode 100644
index 3bd2113..0000000
--- a/jscomp/bsb/bsb_file.mli
+++ /dev/null
@@ -1,26 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val install_if_exists : destdir:string -> string -> bool
-(** return [true] if copied *)
diff --git a/jscomp/bsb/bsb_file_groups.ml b/jscomp/bsb/bsb_file_groups.ml
deleted file mode 100644
index dac20e0..0000000
--- a/jscomp/bsb/bsb_file_groups.ml
+++ /dev/null
@@ -1,73 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 public = Export_none | Export_all | Export_set of Set_string.t
-
-type build_generator = {
-  input : string list;
-  output : string list;
-  command : string;
-}
-
-type file_group = {
-  dir : string;
-  sources : Bsb_db.map;
-  resources : string list;
-  public : public;
-  is_dev : bool;
-  generators : build_generator list;
-      (* output of [generators] should be added to [sources],
-         if it is [.ml,.mli,.res,.resi]
-      *)
-}
-
-type file_groups = file_group list
-
-type t = { files : file_groups; globbed_dirs : string list }
-
-let empty : t = { files = []; globbed_dirs = [] }
-
-let merge (u : t) (v : t) =
-  if u == empty then v
-  else if v == empty then u
-  else
-    {
-      files = Ext_list.append u.files v.files;
-      globbed_dirs = Ext_list.append u.globbed_dirs v.globbed_dirs;
-    }
-
-let cons ~file_group ?globbed_dir (v : t) : t =
-  {
-    files = file_group :: v.files;
-    globbed_dirs =
-      (match globbed_dir with
-      | None -> v.globbed_dirs
-      | Some f -> f :: v.globbed_dirs);
-  }
-
-(** when [is_empty file_group]
-    we don't need issue [-I] [-S] in [.merlin] file
-*)
-let is_empty (x : file_group) =
-  Map_string.is_empty x.sources && x.resources = [] && x.generators = []
diff --git a/jscomp/bsb/bsb_file_groups.mli b/jscomp/bsb/bsb_file_groups.mli
deleted file mode 100644
index 6abc224..0000000
--- a/jscomp/bsb/bsb_file_groups.mli
+++ /dev/null
@@ -1,56 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 public = Export_none | Export_all | Export_set of Set_string.t
-
-type build_generator = {
-  input : string list;
-  output : string list;
-  command : string;
-}
-
-type file_group = {
-  dir : string;
-  sources : Bsb_db.map;
-  resources : string list;
-  public : public;
-  is_dev : bool;
-  (* false means not in dev mode *)
-  generators : build_generator list;
-      (* output of [generators] should be added to [sources],
-         if it is [.ml,.mli,.res,.resi]
-      *)
-}
-
-type file_groups = file_group list
-
-type t = private { files : file_groups; globbed_dirs : string list }
-
-val empty : t
-
-val merge : t -> t -> t
-
-val cons : file_group:file_group -> ?globbed_dir:string -> t -> t
-
-val is_empty : file_group -> bool
diff --git a/jscomp/bsb/bsb_global_paths.ml b/jscomp/bsb/bsb_global_paths.ml
deleted file mode 100644
index 97ccc5f..0000000
--- a/jscomp/bsb/bsb_global_paths.ml
+++ /dev/null
@@ -1,58 +0,0 @@
-(* Copyright (C) 2019 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let cwd = Sys.getcwd ()
-
-(**
-   If [Sys.executable_name] gives an absolute path, 
-   nothing needs to be done.
-
-   If [Sys.executable_name] is not an absolute path, for example
-   (rlwrap ./ocaml)
-   it is a relative path, 
-   it needs be adapted based on cwd
-
-   if [Sys.executable_name] gives an absolute path, 
-   nothing needs to be done
-   if it is a relative path 
-
-   there are two cases: 
-   - bsb.exe
-   - ./bsb.exe 
-     The first should also not be touched
-     Only the latter need be adapted based on project root  
-*)
-
-let bsc_dir =
-  Filename.dirname
-    (Ext_path.normalize_absolute_path
-       (Ext_path.combine cwd Sys.executable_name))
-
-let vendor_bsc = Filename.concat bsc_dir "bsc.exe"
-
-let vendor_ninja = Filename.concat bsc_dir "ninja.exe"
-
-let vendor_bsdep = Filename.concat bsc_dir "bsb_helper.exe";;
-
-assert (Sys.file_exists bsc_dir)
diff --git a/jscomp/bsb/bsb_global_paths.mli b/jscomp/bsb/bsb_global_paths.mli
deleted file mode 100644
index 85dda4d..0000000
--- a/jscomp/bsb/bsb_global_paths.mli
+++ /dev/null
@@ -1,33 +0,0 @@
-(* Copyright (C) 2019 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val cwd : string
-
-val bsc_dir : string
-
-val vendor_bsc : string
-
-val vendor_ninja : string
-
-val vendor_bsdep : string
diff --git a/jscomp/bsb/bsb_jsx.ml b/jscomp/bsb/bsb_jsx.ml
deleted file mode 100644
index b9fbd08..0000000
--- a/jscomp/bsb/bsb_jsx.ml
+++ /dev/null
@@ -1,95 +0,0 @@
-type version = Jsx_v3 | Jsx_v4
-type module_ = React | Generic of {moduleName: string}
-type mode = Classic | Automatic
-type dependencies = string list
-
-type t = {
-  version : version option;
-  module_ : module_ option;
-  mode : mode option;
-  v3_dependencies : dependencies;
-}
-
-let encode_no_nl jsx =
-  (match jsx.version with
-  | None -> ""
-  | Some Jsx_v3 -> "3"
-  | Some Jsx_v4 -> "4")
-  ^ (match jsx.module_ with None -> "" | Some React -> "React" | Some Generic {moduleName} -> moduleName)
-  ^
-  match jsx.mode with
-  | None -> ""
-  | Some Classic -> "Classic"
-  | Some Automatic -> "Automatic"
-
-let ( .?() ) = Map_string.find_opt
-let ( |? ) m (key, cb) = m |> Ext_json.test key cb
-
-let get_list_string_acc (s : Ext_json_types.t array) acc =
-  Ext_array.to_list_map_acc s acc (fun x ->
-      match x with Str x -> Some x.str | _ -> None)
-
-let get_list_string s = get_list_string_acc s []
-
-let from_map map =
-  let version : version option ref = ref None in
-  let module_ : module_ option ref = ref None in
-  let mode : mode option ref = ref None in
-  let v3_dependencies : dependencies ref = ref [] in
-  map
-  |? ( Bsb_build_schemas.jsx,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.jsx_version) with
-           | Some (Flo { loc; flo }) -> (
-               match flo with
-               | "3" -> version := Some Jsx_v3
-               | "4" -> version := Some Jsx_v4
-               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx version %s" flo
-               )
-           | Some x ->
-               Bsb_exception.config_error x
-                 "Unexpected input (expect a version number) for jsx version"
-           | None -> ()) )
-  |? ( Bsb_build_schemas.jsx,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.jsx_module) with
-           | Some (Str { str }) -> (
-               match str with
-               | "react" -> module_ := Some React
-               | moduleName -> module_ := Some (Generic {moduleName}))
-           | Some x ->
-               Bsb_exception.config_error x
-                 "Unexpected input (jsx module name) for jsx module"
-           | None -> ()) )
-  |? ( Bsb_build_schemas.jsx,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.jsx_mode) with
-           | Some (Str { loc; str }) -> (
-               match str with
-               | "classic" -> mode := Some Classic
-               | "automatic" -> mode := Some Automatic
-               | _ -> Bsb_exception.errorf ~loc "Unsupported jsx mode %s" str)
-           | Some x ->
-               Bsb_exception.config_error x
-                 "Unexpected input (expect classic or automatic) for jsx mode"
-           | None -> ()) )
-  |? ( Bsb_build_schemas.jsx,
-       `Obj
-         (fun m ->
-           match m.?(Bsb_build_schemas.jsx_v3_dependencies) with
-           | Some (Arr { content }) ->
-            v3_dependencies := get_list_string content
-           | Some x ->
-               Bsb_exception.config_error x
-                 "Unexpected input for jsx v3-dependencies"
-           | None -> ()) )
-  |> ignore;
-  {
-    version = !version;
-    module_ = !module_;
-    mode = !mode;
-    v3_dependencies = !v3_dependencies;
-  }
diff --git a/jscomp/bsb/bsb_log.ml b/jscomp/bsb/bsb_log.ml
deleted file mode 100644
index 06401aa..0000000
--- a/jscomp/bsb/bsb_log.ml
+++ /dev/null
@@ -1,94 +0,0 @@
-(* Copyright (C) 2017- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ninja_ansi_forced =
-  lazy (try Sys.getenv "NINJA_ANSI_FORCED" with Not_found -> "")
-
-let color_enabled = lazy (Unix.isatty Unix.stdout)
-
-(* same logic as [ninja.exe] *)
-let get_color_enabled () =
-  let colorful =
-    match ninja_ansi_forced with
-    | (lazy "1") -> true
-    | (lazy ("0" | "false")) -> false
-    | _ -> Lazy.force color_enabled
-  in
-  colorful
-
-let color_functions : Format.formatter_stag_functions =
-  {
-    mark_open_stag =
-      (fun s ->
-        if get_color_enabled () then Ext_color.ansi_of_tag s
-        else Ext_string.empty);
-    mark_close_stag =
-      (fun _ ->
-        if get_color_enabled () then Ext_color.reset_lit else Ext_string.empty);
-    print_open_stag = (fun _ -> ());
-    print_close_stag = (fun _ -> ());
-  }
-
-(* let set_color ppf =
-   Format.pp_set_formatter_tag_functions ppf color_functions *)
-
-let setup () =
-  Format.pp_set_mark_tags Format.std_formatter true;
-  Format.pp_set_mark_tags Format.err_formatter true;
-  Format.pp_set_formatter_stag_functions Format.std_formatter color_functions;
-  Format.pp_set_formatter_stag_functions Format.err_formatter color_functions
-
-type level = Debug | Info | Warn | Error
-
-let int_of_level (x : level) =
-  match x with Debug -> 0 | Info -> 1 | Warn -> 2 | Error -> 3
-
-let log_level = ref Warn
-
-let verbose () = log_level := Debug
-
-let dfprintf level fmt =
-  if int_of_level level >= int_of_level !log_level then Format.fprintf fmt
-  else Format.ifprintf fmt
-
-type 'a fmt = Format.formatter -> ('a, Format.formatter, unit) format -> 'a
-
-type 'a log = ('a, Format.formatter, unit) format -> 'a
-
-let debug fmt = dfprintf Debug Format.std_formatter fmt
-
-let info fmt = dfprintf Info Format.std_formatter fmt
-
-let warn fmt = dfprintf Warn Format.err_formatter fmt
-
-let error fmt = dfprintf Error Format.err_formatter fmt
-
-let info_args (args : string array) =
-  if int_of_level Info >= int_of_level !log_level then (
-    for i = 0 to Array.length args - 1 do
-      Format.pp_print_string Format.std_formatter (Array.unsafe_get args i);
-      Format.pp_print_string Format.std_formatter Ext_string.single_space
-    done;
-    Format.pp_print_newline Format.std_formatter ())
-  else ()
diff --git a/jscomp/bsb/bsb_log.mli b/jscomp/bsb/bsb_log.mli
deleted file mode 100644
index de1f1d6..0000000
--- a/jscomp/bsb/bsb_log.mli
+++ /dev/null
@@ -1,45 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val setup : unit -> unit
-
-type level = Debug | Info | Warn | Error
-
-val log_level : level ref
-
-type 'a fmt = Format.formatter -> ('a, Format.formatter, unit) format -> 'a
-
-type 'a log = ('a, Format.formatter, unit) format -> 'a
-
-val verbose : unit -> unit
-
-val debug : 'a log
-
-val info : 'a log
-
-val warn : 'a log
-
-val error : 'a log
-
-val info_args : string array -> unit
diff --git a/jscomp/bsb/bsb_namespace_map_gen.ml b/jscomp/bsb/bsb_namespace_map_gen.ml
deleted file mode 100644
index 5a9b5b4..0000000
--- a/jscomp/bsb/bsb_namespace_map_gen.ml
+++ /dev/null
@@ -1,57 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ( // ) = Ext_path.combine
-
-let write_file fname digest contents =
-  let oc = open_out_bin fname in
-  Digest.output oc digest;
-  output_char oc '\n';
-  Ext_buffer.output_buffer oc contents;
-  close_out oc
-
-(*
-   TODO:
-   sort filegroupts to ensure deterministic behavior
-
-   if [.bsbuild] is not changed
-   [.mlmap] does not need to be changed too
-
-*)
-let output ~dir (namespace : string) (file_groups : Bsb_file_groups.file_groups)
-    =
-  let fname = namespace ^ Literals.suffix_mlmap in
-  let buf = Ext_buffer.create 10000 in
-  Ext_list.iter file_groups (fun x ->
-      Map_string.iter x.sources (fun k _ ->
-          Ext_buffer.add_string_char buf k '\n'));
-  (* let contents = Buffer.contents buf in    *)
-  let digest = Ext_buffer.digest buf in
-  let fname = dir // fname in
-  if Sys.file_exists fname then (
-    let ic = open_in_bin fname in
-    let old_digest = really_input_string ic Ext_digest.length in
-    close_in ic;
-    if old_digest <> digest then write_file fname digest buf)
-  else write_file fname digest buf
diff --git a/jscomp/bsb/bsb_namespace_map_gen.mli b/jscomp/bsb/bsb_namespace_map_gen.mli
deleted file mode 100644
index 6090fd8..0000000
--- a/jscomp/bsb/bsb_namespace_map_gen.mli
+++ /dev/null
@@ -1,29 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val output : dir:string -> string -> Bsb_file_groups.file_groups -> unit
-(** [output dir namespace file_groups]
-    when [build.ninja] is generated, we output a module map [.mlmap] file 
-    such [.mlmap] file will be consumed by [bsc.exe] to generate [.cmi] file
-*)
diff --git a/jscomp/bsb/bsb_ninja_check.ml b/jscomp/bsb/bsb_ninja_check.ml
deleted file mode 100644
index b11bf66..0000000
--- a/jscomp/bsb/bsb_ninja_check.ml
+++ /dev/null
@@ -1,149 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-[@@@warning "+9"]
-
-(* float_of_string_opt *)
-external hexstring_of_float : float -> int -> char -> string
-  = "caml_hexstring_of_float"
-
-let hex_of_float f = hexstring_of_float f (-1) '-'
-
-(* This should not lose any preicision *)
-(* let id (f : float) =
-    float_of_string (hex_of_float f) = f
-*)
-
-type check_result =
-  | Good
-  | Bsb_file_corrupted
-  | Bsb_file_not_exist  (** We assume that it is a clean repo *)
-  | Bsb_source_directory_changed
-  | Bsb_bsc_version_mismatch
-  | Bsb_forced
-  | Bsb_package_kind_inconsistent
-  | Bsb_regenerate_required
-  | Other of string
-
-let pp_check_result fmt (check_resoult : check_result) =
-  Format.pp_print_string fmt
-    (match check_resoult with
-    | Good -> "OK"
-    | Bsb_file_corrupted -> "Stored data corrupted"
-    | Bsb_file_not_exist -> "Dependencies information missing"
-    | Bsb_source_directory_changed -> "Bsb source directory changed"
-    | Bsb_bsc_version_mismatch -> "Bsc or bsb version mismatch"
-    | Bsb_forced -> "Bsb forced rebuild"
-    | Bsb_package_kind_inconsistent -> "The package was built in different mode"
-    | Bsb_regenerate_required -> "Bsb need regenerate build.ninja"
-    | Other s -> s)
-
-let rec check_aux cwd (xs : string list) =
-  match xs with
-  | [] -> Good
-  | "===" :: rest -> check_global_atime rest
-  | item :: rest -> (
-      match Ext_string.split item '\t' with
-      | [ file; stamp ] ->
-          let stamp = float_of_string stamp in
-          let cur_file = Filename.concat cwd file in
-          let stat = Unix.stat cur_file in
-          if stat.st_mtime <= stamp then check_aux cwd rest else Other cur_file
-      | _ -> Bsb_file_corrupted)
-
-and check_global_atime rest =
-  match rest with
-  | [] -> Good
-  | item :: rest -> (
-      match Ext_string.split item '\t' with
-      | [ file; stamp ] ->
-          let stamp = float_of_string stamp in
-          let cur_file = file in
-          let stat = Unix.stat cur_file in
-          if stat.st_atime <= stamp then check_global_atime rest
-          else Other cur_file
-      | _ -> Bsb_file_corrupted)
-
-(* TODO: for such small data structure, maybe text format is better *)
-
-let record_global_atime buf name =
-  let stamp = (Unix.stat name).st_atime in
-  Ext_buffer.add_string_char buf name '\t';
-  Ext_buffer.add_string_char buf (hex_of_float stamp) '\n'
-
-let record ~(package_kind : Bsb_package_kind.t) ~per_proj_dir ~file
-    ~(config : Bsb_config_types.t) ~(warn_as_error: string option) (file_or_dirs : string list) : unit =
-  let buf = Ext_buffer.create 1_000 in
-  Ext_buffer.add_string_char buf Bs_version.version '\n';
-  Ext_buffer.add_string_char buf per_proj_dir '\n';
-  Ext_buffer.add_string_char buf
-    (Bsb_package_kind.encode_no_nl package_kind)
-    '\n';
-  Ext_buffer.add_string_char buf (match warn_as_error with | Some s -> s | None -> "0") '\n';
-  Ext_list.iter file_or_dirs (fun f ->
-      Ext_buffer.add_string_char buf f '\t';
-      Ext_buffer.add_string_char buf
-        (hex_of_float (Unix.stat (Filename.concat per_proj_dir f)).st_mtime)
-        '\n');
-  Ext_buffer.add_string buf "===\n";
-  record_global_atime buf Sys.executable_name;
-  Ext_list.iter config.ppx_files (fun { name; args = _ } ->
-      try record_global_atime buf name
-      with _ -> (* record the ppx files as a best effort *)
-                ());
-  let oc = open_out_bin file in
-  Ext_buffer.output_buffer oc buf;
-  close_out oc
-
-(** check time stamp for all files
-    TODO: those checks system call can be saved later
-    Return a reason
-    Even forced, we still need walk through a little
-    bit in case we found a different version of compiler
-*)
-let check ~(package_kind : Bsb_package_kind.t) ~(per_proj_dir : string) ~forced ~(warn_as_error: string option) ~file : check_result =
-  match open_in_bin file with
-  (* Windows binary mode*)
-  | exception _ -> Bsb_file_not_exist
-  | ic -> (
-      match List.rev (Ext_io.rev_lines_of_chann ic) with
-      | exception _ -> Bsb_file_corrupted
-      | version :: source_directory :: package_kind_str :: previous_warn_as_error :: dir_or_files -> (
-          let warn_as_error_changed = match warn_as_error with
-            | None -> previous_warn_as_error <> "0"
-            | Some current -> current <> previous_warn_as_error in
-
-          if version <> Bs_version.version then Bsb_bsc_version_mismatch
-          else if per_proj_dir <> source_directory then
-            Bsb_source_directory_changed
-          else if forced then Bsb_forced (* No need walk through *)
-          else if Bsb_package_kind.encode_no_nl package_kind <> package_kind_str
-          then Bsb_package_kind_inconsistent
-          else if warn_as_error_changed then Bsb_regenerate_required
-          else
-            try check_aux per_proj_dir dir_or_files
-            with e ->
-              Bsb_log.info "@{<info>Stat miss %s@}@." (Printexc.to_string e);
-              Bsb_file_not_exist)
-      | _ -> Bsb_file_corrupted)
diff --git a/jscomp/bsb/bsb_ninja_check.mli b/jscomp/bsb/bsb_ninja_check.mli
deleted file mode 100644
index adff881..0000000
--- a/jscomp/bsb/bsb_ninja_check.mli
+++ /dev/null
@@ -1,72 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(**
-   This module is used to check whether [build.ninja] needs
-   be regenerated. Everytime [bsb] run [regenerate_ninja], 
-   bsb will try to [check] if it is needed, 
-   if needed, bsb will regenerate ninja file and store the 
-   metadata again
-*)
-
-type check_result =
-  | Good
-  | Bsb_file_corrupted
-  | Bsb_file_not_exist  (** We assume that it is a clean repo *)
-  | Bsb_source_directory_changed
-  | Bsb_bsc_version_mismatch
-  | Bsb_forced
-  | Bsb_package_kind_inconsistent
-  | Bsb_regenerate_required
-  | Other of string
-
-val pp_check_result : Format.formatter -> check_result -> unit
-
-val record :
-  package_kind:Bsb_package_kind.t ->
-  per_proj_dir:string ->
-  file:string ->
-  config:Bsb_config_types.t ->
-  warn_as_error:string option ->
-  string list ->
-  unit
-(** [record cwd file relevant_file_or_dirs]
-    The data structure we decided to whether regenerate [build.ninja] 
-    or not. 
-    Note that if we don't record absolute path,  ninja will not notice  its build spec changed, 
-    it will not trigger  rebuild behavior, 
-    It may not be desired behavior, since there is some subtlies here (__FILE__ or __dirname)
-
-    We serialize such data structure and call {!check} to decide
-    [build.ninja] should be regenerated
-*)
-
-val check :
-  package_kind:Bsb_package_kind.t ->
-  per_proj_dir:string ->
-  forced:bool ->
-  warn_as_error: string option ->
-  file:string ->
-  check_result
-(** check if [build.ninja] should be regenerated *)
diff --git a/jscomp/bsb/bsb_ninja_file_groups.ml b/jscomp/bsb/bsb_ninja_file_groups.ml
deleted file mode 100644
index e490cdf..0000000
--- a/jscomp/bsb/bsb_ninja_file_groups.ml
+++ /dev/null
@@ -1,127 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ( // ) = Ext_path.combine
-
-let handle_generators oc (group : Bsb_file_groups.file_group) custom_rules =
-  let map_to_source_dir x = Bsb_config.proj_rel (group.dir // x) in
-  Ext_list.iter group.generators (fun { output; input; command } ->
-      (*TODO: add a loc for better error message *)
-      match Map_string.find_opt custom_rules command with
-      | None ->
-          Ext_fmt.failwithf ~loc:__LOC__ "custom rule %s used but  not defined"
-            command
-      | Some rule ->
-          Bsb_ninja_targets.output_build oc
-            ~outputs:(Ext_list.map output map_to_source_dir)
-            ~inputs:(Ext_list.map input map_to_source_dir)
-            ~rule)
-
-type suffixes = { impl : string; intf : string }
-
-let ml_suffixes = { impl = Literals.suffix_ml; intf = Literals.suffix_mli }
-
-let res_suffixes = { impl = Literals.suffix_res; intf = Literals.suffix_resi }
-
-let emit_module_build (rules : Bsb_ninja_rule.builtin)
-    (package_specs : Bsb_package_specs.t) (is_dev : bool) oc namespace
-    (module_info : Bsb_db.module_info) : unit =
-  let has_intf_file = module_info.info = Impl_intf in
-  let config, ast_rule =
-    match module_info.syntax_kind with
-    | Ml -> (ml_suffixes, rules.build_ast)
-    | Res -> (res_suffixes, rules.build_ast_from_re)
-    (* FIXME: better names *)
-  in
-  let filename_sans_extension = module_info.name_sans_extension in
-  let input_impl =
-    Bsb_config.proj_rel (filename_sans_extension ^ config.impl)
-  in
-  let input_intf =
-    Bsb_config.proj_rel (filename_sans_extension ^ config.intf)
-  in
-  let output_ast = filename_sans_extension ^ Literals.suffix_ast in
-  let output_iast = filename_sans_extension ^ Literals.suffix_iast in
-  let output_d = filename_sans_extension ^ Literals.suffix_d in
-  let output_filename_sans_extension =
-    Ext_namespace_encode.make ?ns:namespace filename_sans_extension
-  in
-  let output_cmi = output_filename_sans_extension ^ Literals.suffix_cmi in
-  let output_cmj = output_filename_sans_extension ^ Literals.suffix_cmj in
-  let output_js =
-    Bsb_package_specs.get_list_of_output_js package_specs
-      output_filename_sans_extension
-  in
-
-  Bsb_ninja_targets.output_build oc ~outputs:[ output_ast ]
-    ~inputs:[ input_impl ] ~rule:ast_rule;
-  Bsb_ninja_targets.output_build oc ~outputs:[ output_d ]
-    ~inputs:
-      (if has_intf_file then [ output_ast; output_iast ] else [ output_ast ])
-    ~rule:(if is_dev then rules.build_bin_deps_dev else rules.build_bin_deps);
-  if has_intf_file then (
-    Bsb_ninja_targets.output_build oc
-      ~outputs:
-        [ output_iast ]
-        (* TODO: we can get rid of absloute path if we fixed the location to be
-            [lib/bs], better for testing?
-        *)
-      ~inputs:[ input_intf ] ~rule:ast_rule;
-    Bsb_ninja_targets.output_build oc ~outputs:[ output_cmi ]
-      ~inputs:[ output_iast ]
-      ~rule:(if is_dev then rules.mi_dev else rules.mi));
-  let rule =
-    if has_intf_file then if is_dev then rules.mj_dev else rules.mj
-    else if is_dev then rules.mij_dev
-    else rules.mij
-  in
-  Bsb_ninja_targets.output_build oc
-    ~outputs:
-      (if has_intf_file then output_cmj :: output_js
-      else output_cmj :: output_cmi :: output_js)
-    ~inputs:
-      (if has_intf_file then [ output_ast; output_cmi ] else [ output_ast ])
-    ~rule
-
-let handle_files_per_dir oc ~(rules : Bsb_ninja_rule.builtin) ~package_specs
-    ~files_to_install ~(namespace : string option)
-    (group : Bsb_file_groups.file_group) : unit =
-  let is_dev = group.is_dev in
-  handle_generators oc group rules.customs;
-  let installable =
-    match group.public with
-    | Export_all -> fun _ -> true
-    | Export_none -> fun _ -> false
-    | Export_set set -> fun module_name -> Set_string.mem set module_name
-  in
-  Map_string.iter group.sources (fun module_name module_info ->
-      if installable module_name && not is_dev then
-        Queue.add module_info files_to_install;
-      emit_module_build rules package_specs is_dev oc namespace module_info)
-
-(* ;
-   Bsb_ninja_targets.phony
-   oc ~order_only_deps:[] ~inputs:[] ~output:group.dir *)
-
-(* pseuduo targets per directory *)
diff --git a/jscomp/bsb/bsb_ninja_file_groups.mli b/jscomp/bsb/bsb_ninja_file_groups.mli
deleted file mode 100644
index 60836ef..0000000
--- a/jscomp/bsb/bsb_ninja_file_groups.mli
+++ /dev/null
@@ -1,32 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val handle_files_per_dir :
-  out_channel ->
-  rules:Bsb_ninja_rule.builtin ->
-  package_specs:Bsb_package_specs.t ->
-  files_to_install:Bsb_db.module_info Queue.t ->
-  namespace:string option ->
-  Bsb_file_groups.file_group ->
-  unit
diff --git a/jscomp/bsb/bsb_ninja_gen.ml b/jscomp/bsb/bsb_ninja_gen.ml
deleted file mode 100644
index d10b938..0000000
--- a/jscomp/bsb/bsb_ninja_gen.ml
+++ /dev/null
@@ -1,240 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ( // ) = Ext_path.combine
-
-(* we need copy package.json into [_build] since it does affect build output
-   it is a bad idea to copy package.json which requires to copy js files
-*)
-
-(* let dash_i = "-I" *)
-
-let get_bsc_flags (bsc_flags : string list) : string =
-  String.concat Ext_string.single_space bsc_flags
-
-let emit_bsc_lib_includes (bs_dependencies : Bsb_config_types.dependencies)
-    (source_dirs : string list) external_includes (namespace : _ option) :
-    string =
-  (* TODO: bsc_flags contain stdlib path which is in the latter position currently *)
-  let all_includes source_dirs =
-    source_dirs
-    @ Ext_list.map bs_dependencies (fun x -> x.package_install_path)
-    @ (* for external includes, if it is absolute path, leave it as is
-         for relative path './xx', we need '../.././x' since we are in
-         [lib/bs], [build] is different from merlin though
-      *)
-    Ext_list.map external_includes (fun x ->
-        if Filename.is_relative x then Bsb_config.rev_lib_bs_prefix x else x)
-  in
-
-  Bsb_build_util.include_dirs
-    (all_includes
-       (if namespace = None then source_dirs
-       else Filename.current_dir_name :: source_dirs
-         (*working dir is [lib/bs] we include this path to have namespace mapping*)))
-
-let output_static_resources (static_resources : string list) copy_rule oc =
-  Ext_list.iter static_resources (fun output ->
-      Bsb_ninja_targets.output_build oc ~outputs:[ output ]
-        ~inputs:[ Bsb_config.proj_rel output ]
-        ~rule:copy_rule);
-  if static_resources <> [] then
-    Bsb_ninja_targets.phony oc ~order_only_deps:static_resources ~inputs:[]
-      ~output:Literals.build_ninja
-
-(*
-  FIXME: check if the trick still works
-  phony build.ninja : | resources 
-*)
-let mark_rescript oc = output_string oc "rescript = 1\n"
-
-let output_installation_file cwd_lib_bs namespace files_to_install =
-  let install_oc = open_out_bin (cwd_lib_bs // "install.ninja") in
-  mark_rescript install_oc;
-  let o s = output_string install_oc s in
-  let[@inline] oo suffix ~dest ~src =
-    o "o ";
-    o dest;
-    o suffix;
-    o " : cp ";
-    o src;
-    o suffix;
-    o "\n"
-  in
-  let bs = ".." // "bs" in
-  let sb = ".." // ".." in
-  o
-    (if Ext_sys.is_windows_or_cygwin then
-     "rule cp\n\
-     \  command = cmd.exe /C copy /Y $i $out >NUL\n\
-      rule touch\n\
-     \ command = cmd.exe /C type nul >>$out & copy $out+,, >NUL\n"
-    else "rule cp\n  command = cp $i $out\nrule touch\n command = touch $out\n");
-  let essentials = Ext_buffer.create 1_000 in
-  files_to_install
-  |> Queue.iter
-       (fun ({ name_sans_extension; syntax_kind; info } : Bsb_db.module_info) ->
-         let base = Filename.basename name_sans_extension in
-         let dest = Ext_namespace_encode.make ?ns:namespace base in
-         let ns_origin =
-           Ext_namespace_encode.make ?ns:namespace name_sans_extension
-         in
-         let src = bs // ns_origin in
-         oo Literals.suffix_cmi ~dest ~src;
-         oo Literals.suffix_cmj ~dest ~src;
-         oo Literals.suffix_cmt ~dest ~src;
-
-         Ext_buffer.add_string essentials dest;
-         Ext_buffer.add_string_char essentials Literals.suffix_cmi ' ';
-         Ext_buffer.add_string essentials dest;
-         Ext_buffer.add_string_char essentials Literals.suffix_cmj ' ';
-
-         let suffix =
-           match syntax_kind with
-           | Ml -> Literals.suffix_ml
-           | Res -> Literals.suffix_res
-         in
-         oo suffix ~dest:base ~src:(sb // name_sans_extension);
-         match info with
-         | Intf -> assert false
-         | Impl -> ()
-         | Impl_intf ->
-             let suffix_b =
-               match syntax_kind with
-               | Ml -> Literals.suffix_mli
-               | Res -> Literals.suffix_resi
-             in
-             oo suffix_b ~dest:base ~src:(sb // name_sans_extension);
-             oo Literals.suffix_cmti ~dest ~src);
-  (match namespace with
-  | None -> ()
-  | Some dest ->
-      let src = bs // dest in
-      oo Literals.suffix_cmi ~dest ~src;
-      oo Literals.suffix_cmj ~dest ~src;
-      oo Literals.suffix_cmt ~dest ~src;
-      Ext_buffer.add_string essentials dest;
-      Ext_buffer.add_string_char essentials Literals.suffix_cmi ' ';
-      Ext_buffer.add_string essentials dest;
-      Ext_buffer.add_string essentials Literals.suffix_cmj);
-  Ext_buffer.add_char essentials '\n';
-  o "build install.stamp : touch ";
-  Ext_buffer.output_buffer install_oc essentials;
-  close_out install_oc
-
-let output_ninja_and_namespace_map ~per_proj_dir ~package_kind
-    ({
-       package_name;
-       external_includes;
-       bsc_flags;
-       pp_file;
-       ppx_files;
-       bs_dependencies;
-       bs_dev_dependencies;
-       js_post_build_cmd;
-       package_specs;
-       file_groups = { files = bs_file_groups };
-       files_to_install;
-       built_in_dependency;
-       reason_react_jsx;
-       jsx;
-       uncurried;
-       generators;
-       namespace;
-       warning;
-       gentype_config;
-     } :
-      Bsb_config_types.t) : unit =
-  let lib_artifacts_dir = Bsb_config.lib_bs in
-  let cwd_lib_bs = per_proj_dir // lib_artifacts_dir in
-
-  let warnings = Bsb_warning.to_bsb_string ~package_kind warning in
-  let bsc_flags = get_bsc_flags bsc_flags in
-  let dpkg_incls =
-    Bsb_build_util.include_dirs_by bs_dev_dependencies (fun x ->
-        x.package_install_path)
-  in
-  let bs_groups : Bsb_db.t =
-    { lib = Map_string.empty; dev = Map_string.empty }
-  in
-  let source_dirs : string list Bsb_db.cat = { lib = []; dev = [] } in
-  let static_resources =
-    Ext_list.fold_left bs_file_groups []
-      (fun (acc_resources : string list) { sources; dir; resources; is_dev } ->
-        if is_dev then (
-          bs_groups.dev <- Bsb_db_util.merge bs_groups.dev sources;
-          source_dirs.dev <- dir :: source_dirs.dev)
-        else (
-          bs_groups.lib <- Bsb_db_util.merge bs_groups.lib sources;
-          source_dirs.lib <- dir :: source_dirs.lib);
-        Ext_list.map_append resources acc_resources (fun x -> dir // x))
-  in
-  let lib = bs_groups.lib in
-  let dev = bs_groups.dev in
-  Bsb_db_util.sanity_check lib;
-  Bsb_db_util.sanity_check dev;
-  Map_string.iter dev (fun k a ->
-      if Map_string.mem lib k then
-        raise (Bsb_db_util.conflict_module_info k a (Map_string.find_exn lib k)));
-  let dev_incls = Bsb_build_util.include_dirs source_dirs.dev in
-  let digest = Bsb_db_encode.write_build_cache ~dir:cwd_lib_bs bs_groups in
-  let lib_incls =
-    emit_bsc_lib_includes bs_dependencies source_dirs.lib external_includes
-      namespace
-  in
-  let rules : Bsb_ninja_rule.builtin =
-    Bsb_ninja_rule.make_custom_rules ~gentype_config
-      ~has_postbuild:js_post_build_cmd ~pp_file ~has_builtin:built_in_dependency
-      ~reason_react_jsx ~jsx ~uncurried ~package_specs ~namespace ~digest ~package_name
-      ~warnings ~ppx_files ~bsc_flags ~dpkg_incls (* dev dependencies *)
-      ~lib_incls (* its own libs *)
-      ~dev_incls (* its own devs *)
-      ~bs_dependencies ~bs_dev_dependencies generators
-  in
-
-  let oc = open_out_bin (cwd_lib_bs // Literals.build_ninja) in
-  mark_rescript oc;
-  let finger_file (x : Bsb_config_types.dependency) =
-    x.package_install_path // "install.stamp"
-  in
-  Ext_list.iter bs_dependencies (fun x ->
-      Bsb_ninja_targets.output_finger Bsb_ninja_global_vars.g_finger
-        (finger_file x) oc);
-  Ext_list.iter bs_dev_dependencies (fun x ->
-      Bsb_ninja_targets.output_finger Bsb_ninja_global_vars.g_finger
-        (finger_file x) oc);
-  output_static_resources static_resources rules.copy_resources oc;
-  (* Generate build statement for each file *)
-  Ext_list.iter bs_file_groups (fun files_per_dir ->
-      Bsb_ninja_file_groups.handle_files_per_dir oc ~rules ~package_specs
-        ~files_to_install ~namespace files_per_dir);
-  Ext_option.iter namespace (fun ns ->
-      let namespace_dir = per_proj_dir // lib_artifacts_dir in
-      Bsb_namespace_map_gen.output ~dir:namespace_dir ns bs_file_groups;
-      Bsb_ninja_targets.output_build oc
-        ~outputs:[ ns ^ Literals.suffix_cmi ]
-        ~inputs:[ ns ^ Literals.suffix_mlmap ]
-        ~rule:rules.build_package);
-  close_out oc;
-  output_installation_file cwd_lib_bs namespace files_to_install
diff --git a/jscomp/bsb/bsb_ninja_gen.mli b/jscomp/bsb/bsb_ninja_gen.mli
deleted file mode 100644
index 2c03a82..0000000
--- a/jscomp/bsb/bsb_ninja_gen.mli
+++ /dev/null
@@ -1,32 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val output_ninja_and_namespace_map :
-  per_proj_dir:string ->
-  package_kind:Bsb_package_kind.t ->
-  Bsb_config_types.t ->
-  unit
-(** 
-   generate ninja file based on [cwd] 
-*)
diff --git a/jscomp/bsb/bsb_ninja_global_vars.ml b/jscomp/bsb/bsb_ninja_global_vars.ml
deleted file mode 100644
index 998aeed..0000000
--- a/jscomp/bsb/bsb_ninja_global_vars.ml
+++ /dev/null
@@ -1,32 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Invariant: the two string literal has
-   to be "a" and "$a"
-*)
-
-(* let src_root_dir = "g_root"
-
-   let lazy_src_root_dir = "$g_root" *)
-let g_finger = "g_finger"
diff --git a/jscomp/bsb/bsb_ninja_regen.ml b/jscomp/bsb/bsb_ninja_regen.ml
deleted file mode 100644
index cabf8d8..0000000
--- a/jscomp/bsb/bsb_ninja_regen.ml
+++ /dev/null
@@ -1,101 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let bsdeps = ".bsdeps"
-
-let ( // ) = Ext_path.combine
-
-(** Regenerate ninja file by need based on [.bsdeps]
-    return None if we dont need regenerate
-    otherwise return Some info
-*)
-let regenerate_ninja ~(package_kind : Bsb_package_kind.t) ~forced ~per_proj_dir ~warn_legacy_config ~warn_as_error
-    : Bsb_config_types.t option =
-  let lib_artifacts_dir = Bsb_config.lib_bs in
-  let lib_bs_dir = per_proj_dir // lib_artifacts_dir in
-  let output_deps = lib_bs_dir // bsdeps in
-  let check_result =
-    Bsb_ninja_check.check ~package_kind ~per_proj_dir ~forced ~warn_as_error ~file:output_deps
-  in
-  let config_filename, config_json =
-    Bsb_config_load.load_json ~per_proj_dir ~warn_legacy_config
-  in
-  match check_result with
-  | Good -> None (* Fast path, no need regenerate ninja *)
-  | Bsb_forced | Bsb_bsc_version_mismatch | Bsb_package_kind_inconsistent
-  | Bsb_file_corrupted | Bsb_file_not_exist | Bsb_source_directory_changed
-  | Bsb_regenerate_required
-  | Other _ ->
-      Bsb_log.info "@{<info>BSB check@} build spec : %a @."
-        Bsb_ninja_check.pp_check_result check_result;
-      if check_result = Bsb_bsc_version_mismatch then (
-        Bsb_log.warn
-          "@{<info>Different compiler version@}: clean current repo@.";
-        Bsb_clean.clean_bs_deps per_proj_dir;
-        Bsb_clean.clean_self per_proj_dir);
-
-      let config : Bsb_config_types.t =
-        Bsb_config_parse.interpret_json
-          ~filename:config_filename ~json:config_json ~package_kind ~per_proj_dir
-      in
-
-      let warning = match config.warning with
-      | None -> (
-          match warn_as_error with
-          | Some e -> Some {Bsb_warning.number = Some e; error = Warn_error_number e}
-          | None -> None)
-      | Some {error} as t ->
-          match (warn_as_error, error) with
-          | (Some error_str, Warn_error_false) ->
-              Some {number = Some error_str; error = Warn_error_number error_str}
-          | (Some error_str, Warn_error_number prev) ->
-              let new_error = prev ^ error_str in
-              Some {number = Some new_error; error = Warn_error_number new_error}
-          | _ -> t
-      in
-
-      let config = {config with warning = warning} in
-      (* create directory, lib/bs, lib/js, lib/es6 etc *)
-      Bsb_build_util.mkp lib_bs_dir;
-      Bsb_package_specs.list_dirs_by config.package_specs (fun x ->
-          let dir = per_proj_dir // x in
-          (*Unix.EEXIST error*)
-          if not (Sys.file_exists dir) then Unix.mkdir dir 0o777);
-      (match package_kind with
-      | Toplevel ->
-          Bsb_watcher_gen.generate_sourcedirs_meta
-            ~name:(lib_bs_dir // Literals.sourcedirs_meta)
-            config.file_groups
-      | Pinned_dependency _ (* FIXME: seems need to be watched *) | Dependency _
-        ->
-          ());
-
-      Bsb_ninja_gen.output_ninja_and_namespace_map ~per_proj_dir ~package_kind
-        config;
-      (* PR2184: we still need record empty dir
-          since it may add files in the future *)
-      Bsb_ninja_check.record ~package_kind ~per_proj_dir ~config ~warn_as_error
-        ~file:output_deps
-        (config.filename :: config.file_groups.globbed_dirs);
-      Some config
diff --git a/jscomp/bsb/bsb_ninja_regen.mli b/jscomp/bsb/bsb_ninja_regen.mli
deleted file mode 100644
index 0af5766..0000000
--- a/jscomp/bsb/bsb_ninja_regen.mli
+++ /dev/null
@@ -1,35 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val regenerate_ninja :
-  package_kind:Bsb_package_kind.t ->
-  forced:bool ->
-  per_proj_dir:string ->
-  warn_legacy_config:bool ->
-  warn_as_error:string option ->
-  Bsb_config_types.t option
-(** Regenerate ninja file by need based on [.bsdeps]
-    return None if we dont need regenerate
-    otherwise return Some info
-*)
diff --git a/jscomp/bsb/bsb_ninja_rule.ml b/jscomp/bsb/bsb_ninja_rule.ml
deleted file mode 100644
index 1103a3a..0000000
--- a/jscomp/bsb/bsb_ninja_rule.ml
+++ /dev/null
@@ -1,247 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = {
-  mutable used : bool;
-  (* rule_name : string;  *)
-  name : out_channel -> string;
-}
-
-let get_name (x : t) oc = x.name oc
-
-let print_rule (oc : out_channel) ?description ?(restat : unit option)
-    ?(dyndep : unit option) ~command name =
-  output_string oc "rule ";
-  output_string oc name;
-  output_string oc "\n";
-  output_string oc "  command = ";
-  output_string oc command;
-  output_string oc "\n";
-  if dyndep <> None then output_string oc "  dyndep = 1\n";
-  if restat <> None then output_string oc "  restat = 1\n";
-  match description with
-  | None -> ()
-  | Some description ->
-      output_string oc "  description = ";
-      output_string oc description;
-      output_string oc "\n"
-
-(** allocate an unique name for such rule*)
-let define ~command ?dyndep ?restat rule_name : t =
-  let rec self =
-    {
-      used = false;
-      (* rule_name ; *)
-      name =
-        (fun oc ->
-          if not self.used then (
-            print_rule oc ?dyndep ?restat ~command rule_name;
-            self.used <- true);
-          rule_name);
-    }
-  in
-
-  self
-
-type command = string
-
-type builtin = {
-  build_ast : t;  (** TODO: Implement it on top of pp_flags *)
-  build_ast_from_re : t;
-  (* build_ast_from_rei : t ; *)
-  (* platform dependent, on Win32,
-      invoking cmd.exe
-  *)
-  copy_resources : t;
-  (* Rules below all need restat *)
-  build_bin_deps : t;
-  build_bin_deps_dev : t;
-  mj : t;
-  mj_dev : t;
-  mij : t;
-  mij_dev : t;
-  mi : t;
-  mi_dev : t;
-  build_package : t;
-  customs : t Map_string.t;
-}
-
-let make_custom_rules ~(gentype_config : Bsb_config_types.gentype_config)
-    ~(has_postbuild : string option) ~(pp_file : string option)
-    ~(has_builtin : bool)
-    ~(reason_react_jsx : Bsb_config_types.reason_react_jsx option)
-    ~(jsx : Bsb_jsx.t) ~(uncurried: bool)  ~(digest : string) ~(package_specs : Bsb_package_specs.t)
-    ~(namespace : string option) ~package_name ~warnings
-    ~(ppx_files : Bsb_config_types.ppx list) ~bsc_flags ~(dpkg_incls : string)
-    ~(lib_incls : string) ~(dev_incls : string) ~bs_dependencies
-    ~bs_dev_dependencies (custom_rules : command Map_string.t) : builtin =
-  let bs_dep = Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep in
-  let bsc = Ext_filename.maybe_quote Bsb_global_paths.vendor_bsc in
-  (* FIXME: We don't need set [-o ${out}] when building ast
-      since the default is already good -- it does not*)
-  let buf = Ext_buffer.create 100 in
-  let ns_flag = match namespace with None -> "" | Some n -> " -bs-ns " ^ n in
-  let add_uncurried_flag b =
-    if b then Ext_buffer.add_string buf " -uncurried" in
-  let mk_ml_cmj_cmd ~(read_cmi : [ `yes | `is_cmi | `no ]) ~is_dev ~postbuild :
-      string =
-    Ext_buffer.clear buf;
-    Ext_buffer.add_string buf bsc;
-    Ext_buffer.add_string buf ns_flag;
-    if read_cmi = `yes then Ext_buffer.add_string buf " -bs-read-cmi";
-    (* The include order matters below *)
-    if is_dev then Ext_buffer.add_char_string buf ' ' dev_incls;
-    Ext_buffer.add_char_string buf ' ' lib_incls;
-    if is_dev then Ext_buffer.add_char_string buf ' ' dpkg_incls;
-    if not has_builtin then Ext_buffer.add_string buf " -nostdlib";
-    Ext_buffer.add_char_string buf ' ' bsc_flags;
-    Ext_buffer.add_char_string buf ' ' warnings;
-    (* we need "-w a" in the end position to take effect
-       in non-toplevel mode
-    *)
-    (match gentype_config with
-    | false -> ()
-    | true -> Ext_buffer.add_string buf " -bs-gentype");
-    add_uncurried_flag uncurried;
-    if read_cmi <> `is_cmi then (
-      Ext_buffer.add_string buf " -bs-package-name ";
-      Ext_buffer.add_string buf (Ext_filename.maybe_quote package_name);
-      Ext_buffer.add_string buf
-        (Bsb_package_specs.package_flag_of_package_specs package_specs
-           ~dirname:"$in_d"));
-    (match (bs_dependencies, bs_dev_dependencies) with
-    | [], [] -> ()
-    | _, _ ->
-        Ext_buffer.add_string buf " -bs-v";
-        Ext_buffer.add_ninja_prefix_var buf Bsb_ninja_global_vars.g_finger);
-    Ext_buffer.add_string buf " $i";
-    (match postbuild with
-    | None -> ()
-    | Some cmd ->
-        Ext_buffer.add_string buf " && ";
-        Ext_buffer.add_string buf cmd;
-        Ext_buffer.add_string buf " $out_last");
-    Ext_buffer.contents buf
-  in
-  let mk_ast =
-    Ext_buffer.clear buf;
-    Ext_buffer.add_string buf bsc;
-    Ext_buffer.add_char_string buf ' ' warnings;
-    Ext_buffer.add_string buf " -bs-v ";
-    Ext_buffer.add_string buf Bs_version.version;
-    (match ppx_files with
-    | [] -> ()
-    | _ ->
-        Ext_list.iter ppx_files (fun x ->
-            match string_of_float (Unix.stat x.name).st_mtime with
-            | exception _ -> ()
-            | st -> Ext_buffer.add_char_string buf ',' st);
-        Ext_buffer.add_char_string buf ' ' (Bsb_build_util.ppx_flags ppx_files));
-    (match pp_file with
-    | None -> ()
-    | Some flag ->
-        Ext_buffer.add_char_string buf ' ' (Bsb_build_util.pp_flag flag));
-    (match (reason_react_jsx, jsx.version) with
-    | _, Some Jsx_v3 -> Ext_buffer.add_string buf " -bs-jsx 3"
-    | _, Some Jsx_v4 -> Ext_buffer.add_string buf " -bs-jsx 4"
-    | Some Jsx_v3, None -> Ext_buffer.add_string buf " -bs-jsx 3"
-    | None, None -> ());
-    (match jsx.module_ with
-    | None -> ()
-    | Some React -> Ext_buffer.add_string buf " -bs-jsx-module react"
-    | Some Generic {moduleName} -> Ext_buffer.add_string buf (" -bs-jsx-module " ^ moduleName));
-    (match jsx.mode with
-    | None -> ()
-    | Some Classic -> Ext_buffer.add_string buf " -bs-jsx-mode classic"
-    | Some Automatic -> Ext_buffer.add_string buf " -bs-jsx-mode automatic");
-    add_uncurried_flag uncurried;
-
-    Ext_buffer.add_char_string buf ' ' bsc_flags;
-    Ext_buffer.add_string buf " -absname -bs-ast -o $out $i";
-    Ext_buffer.contents buf
-  in
-  let build_ast = define ~command:mk_ast "ast" in
-  let build_ast_from_re = define ~command:mk_ast "astj" in
-
-  let copy_resources =
-    define
-      ~command:
-        (if Ext_sys.is_windows_or_cygwin then "cmd.exe /C copy /Y $i $out >NUL"
-        else "cp $i $out")
-      "copy_resource"
-  in
-
-  let build_bin_deps =
-    define ~restat:()
-      ~command:(bs_dep ^ " -hash " ^ digest ^ ns_flag ^ " $in")
-      "deps"
-    (*
-       it seems we already have restat = 1
-       now it is an implicit dependency, we need avoid write duplicated files
-    *)
-  in
-  let build_bin_deps_dev =
-    define ~restat:()
-      ~command:(bs_dep ^ " -g -hash " ^ digest ^ ns_flag ^ " $in")
-      "deps_dev"
-  in
-  let aux ~name ~read_cmi ~postbuild =
-    ( define
-        ~command:(mk_ml_cmj_cmd ~read_cmi ~is_dev:false ~postbuild)
-        ~dyndep:() ~restat:() (* Always restat when having mli *) name,
-      define
-        ~command:(mk_ml_cmj_cmd ~read_cmi ~is_dev:true ~postbuild)
-        ~dyndep:() ~restat:()
-        (* Always restat when having mli *) (name ^ "_dev") )
-  in
-
-  let mj, mj_dev = aux ~name:"mj" ~read_cmi:`yes ~postbuild:has_postbuild in
-  let mij, mij_dev = aux ~read_cmi:`no ~name:"mij" ~postbuild:has_postbuild in
-  let mi, mi_dev = aux ~read_cmi:`is_cmi ~postbuild:None ~name:"mi" in
-  let build_package =
-    define
-      ~command:(bsc ^ " -w -49 -color always -no-alias-deps  $i")
-      ~restat:() "build_package"
-  in
-  {
-    build_ast;
-    build_ast_from_re;
-    (* platform dependent, on Win32,
-        invoking cmd.exe
-    *)
-    copy_resources;
-    (* Rules below all need restat *)
-    build_bin_deps;
-    build_bin_deps_dev;
-    mj;
-    mj_dev;
-    mij;
-    mi;
-    mij_dev;
-    mi_dev;
-    build_package;
-    customs =
-      Map_string.mapi custom_rules (fun name command ->
-          define ~command ("custom_" ^ name));
-  }
diff --git a/jscomp/bsb/bsb_ninja_rule.mli b/jscomp/bsb/bsb_ninja_rule.mli
deleted file mode 100644
index 5760ed8..0000000
--- a/jscomp/bsb/bsb_ninja_rule.mli
+++ /dev/null
@@ -1,89 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t
-(** The complexity comes from the fact that we allow custom rules which could
-    conflict with our custom built-in rules
-*)
-
-val get_name : t -> out_channel -> string
-
-(***********************************************************)
-
-type builtin = {
-  build_ast : t;
-  build_ast_from_re : t;
-  (* platform dependent, on Win32,
-      invoking cmd.exe
-  *)
-  copy_resources : t;
-  (* Rules below all need restat *)
-  build_bin_deps : t;
-  build_bin_deps_dev : t;
-  mj : t;
-  mj_dev : t;
-  mij : t;
-  mij_dev : t;
-  mi : t;
-  mi_dev : t;
-  build_package : t;
-  customs : t Map_string.t;
-}
-(** A list of existing rules *)
-
-(***********************************************************)
-
-(** rules are generally composed of built-in rules and customized rules, there are two design choices:
-    1. respect custom rules with the same name, then we need adjust our built-in 
-    rules dynamically in case the conflict.
-    2. respect our built-in rules, then we only need re-load custom rules for each bsconfig.json
-*)
-
-type command = string
-
-(* Since now we generate ninja files per bsconfig.json in a single process,
-    we must make sure it is re-entrant
-*)
-val make_custom_rules :
-  gentype_config:Bsb_config_types.gentype_config ->
-  has_postbuild:string option ->
-  pp_file:string option ->
-  has_builtin:bool ->
-  reason_react_jsx:Bsb_config_types.reason_react_jsx option ->
-  jsx:Bsb_jsx.t ->
-  uncurried:bool ->
-  digest:string ->
-  package_specs:Bsb_package_specs.t ->
-  namespace:string option ->
-  package_name:string ->
-  warnings:string ->
-  ppx_files:Bsb_config_types.ppx list ->
-  bsc_flags:string ->
-  dpkg_incls:string ->
-  lib_incls:string ->
-  dev_incls:string ->
-  bs_dependencies:Bsb_config_types.dependencies ->
-  bs_dev_dependencies:Bsb_config_types.dependencies ->
-  command Map_string.t ->
-  builtin
diff --git a/jscomp/bsb/bsb_ninja_targets.ml b/jscomp/bsb/bsb_ninja_targets.ml
deleted file mode 100644
index 61167b8..0000000
--- a/jscomp/bsb/bsb_ninja_targets.ml
+++ /dev/null
@@ -1,55 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let oc_list xs oc =
-  Ext_list.iter xs (fun s ->
-      output_string oc Ext_string.single_space;
-      output_string oc s)
-
-let output_build ~outputs ~inputs ~rule oc =
-  let rule = Bsb_ninja_rule.get_name rule oc in
-  (* Trigger building if not used *)
-  output_string oc "o";
-  oc_list outputs oc;
-  output_string oc " : ";
-  output_string oc rule;
-  oc_list inputs oc;
-  output_string oc "\n"
-
-let phony ?(order_only_deps = []) ~inputs ~output oc =
-  output_string oc "o ";
-  output_string oc output;
-  output_string oc " : ";
-  output_string oc "phony";
-  oc_list inputs oc;
-  if order_only_deps <> [] then (
-    output_string oc " ||";
-    oc_list order_only_deps oc);
-  output_string oc "\n"
-
-let output_finger key value oc =
-  output_string oc key;
-  output_string oc " := ";
-  output_string oc value;
-  output_string oc "\n"
diff --git a/jscomp/bsb/bsb_ninja_targets.mli b/jscomp/bsb/bsb_ninja_targets.mli
deleted file mode 100644
index 0a62957..0000000
--- a/jscomp/bsb/bsb_ninja_targets.mli
+++ /dev/null
@@ -1,43 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val output_build :
-  outputs:string list ->
-  inputs:string list ->
-  rule:Bsb_ninja_rule.t ->
-  out_channel ->
-  unit
-(** output should always be marked explicitly,
-    otherwise the build system can not figure out clearly
-    however, for the command we don't need pass `-o`
-*)
-
-val phony :
-  ?order_only_deps:string list ->
-  inputs:string list ->
-  output:string ->
-  out_channel ->
-  unit
-
-val output_finger : string -> string -> out_channel -> unit
diff --git a/jscomp/bsb/bsb_package_kind.ml b/jscomp/bsb/bsb_package_kind.ml
deleted file mode 100644
index 22c1962..0000000
--- a/jscomp/bsb/bsb_package_kind.ml
+++ /dev/null
@@ -1,47 +0,0 @@
-(* Copyright (C) 2020 - Hongbo Zhang, Authors of ReScript 
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
- *
- * 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 dep_payload = { package_specs : Bsb_package_specs.t; jsx : Bsb_jsx.t; uncurried : bool }
-
-type t =
-  | Toplevel
-  | Dependency of dep_payload
-  | Pinned_dependency of dep_payload
-(* This package specs comes from the toplevel to
-   override the current settings
-*)
-
-let encode_no_nl (x : t) =
-  match x with
-  | Toplevel -> "0"
-  | Dependency x ->
-      "1"
-      ^ Bsb_package_specs.package_flag_of_package_specs x.package_specs
-          ~dirname:"."
-      ^ Bsb_jsx.encode_no_nl x.jsx
-  | Pinned_dependency x ->
-      "2"
-      ^ Bsb_package_specs.package_flag_of_package_specs x.package_specs
-          ~dirname:"."
-      ^ Bsb_jsx.encode_no_nl x.jsx
diff --git a/jscomp/bsb/bsb_package_specs.ml b/jscomp/bsb/bsb_package_specs.ml
deleted file mode 100644
index bcb88c9..0000000
--- a/jscomp/bsb/bsb_package_specs.ml
+++ /dev/null
@@ -1,225 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ( // ) = Ext_path.combine
-
-(*FIXME: use assoc list instead *)
-module Spec_set = Bsb_spec_set
-
-type t = {
-  modules : Spec_set.t;
-  runtime : string option;
-      (* This has to be resolved as early as possible, since
-         the path will be inherited in sub projects
-      *)
-}
-
-let ( .?() ) = Map_string.find_opt
-
-let bad_module_format_message_exn ~loc format =
-  Bsb_exception.errorf ~loc
-    "package-specs: `%s` isn't a valid output module format. It has to be one \
-     of:  %s or %s"
-    format Literals.esmodule Literals.commonjs
-
-let supported_format (x : string) loc : Ext_module_system.t =
-  let _ =
-    if x = Literals.es6 || x = Literals.es6_global then
-      let loc_end =
-        {loc with Lexing.pos_cnum = loc.Lexing.pos_cnum + String.length x}
-      in
-      let loc = {Warnings.loc_start = loc; loc_end; loc_ghost = false} in
-      Location.deprecated loc
-        (Printf.sprintf "Option \"%s\" is deprecated. Use \"%s\" instead." x
-           Literals.esmodule)
-  in
-  if x = Literals.es6 || x = Literals.esmodule then Esmodule
-  else if x = Literals.commonjs then Commonjs
-  else if x = Literals.es6_global then Es6_global
-  else bad_module_format_message_exn ~loc x
-
-let string_of_format (x : Ext_module_system.t) =
-  match x with
-  | Commonjs -> Literals.commonjs
-  | Esmodule -> Literals.esmodule
-  | Es6_global -> Literals.es6_global
-
-let js_suffix_regexp = Str.regexp "[A-Za-z0-9-_.]*\\.[cm]?js"
-
-let validate_js_suffix suffix = Str.string_match js_suffix_regexp suffix 0
-
-let rec from_array suffix (arr : Ext_json_types.t array) : Spec_set.t =
-  let spec = ref Spec_set.empty in
-  let has_in_source = ref false in
-  Ext_array.iter arr (fun x ->
-      let result = from_json_single suffix x in
-      if result.in_source then
-        if not !has_in_source then has_in_source := true
-        else
-          Bsb_exception.errorf ~loc:(Ext_json.loc_of x)
-            "package-specs: detected two module formats that are both \
-             configured to be in-source.";
-      spec := Spec_set.add result !spec);
-  !spec
-
-(* TODO: FIXME: better API without mutating *)
-and from_json_single suffix (x : Ext_json_types.t) : Bsb_spec_set.spec =
-  match x with
-  | Str { str = format; loc } ->
-      { format = supported_format format loc; in_source = false; suffix }
-  | Obj { map; loc } -> (
-      match map.?("module") with
-      | Some (Str { str = format }) ->
-          let in_source =
-            match map.?(Bsb_build_schemas.in_source) with
-            | Some (True _) -> true
-            | Some _ | None -> false
-          in
-          let suffix =
-            match map.?(Bsb_build_schemas.suffix) with
-            | Some (Str { str = suffix; _ }) when validate_js_suffix suffix -> suffix
-            | Some (Str {str; loc}) ->
-              Bsb_exception.errorf ~loc
-                ("invalid suffix \"%s\". The suffix and may contain letters, digits, \"-\", \"_\" and \".\" and must end with .js, .mjs or .cjs.") str
-            | Some _ ->
-              Bsb_exception.errorf ~loc:(Ext_json.loc_of x)
-                "expected a string extension like \".js\""
-            | None -> suffix
-          in
-          { format = supported_format format loc; in_source; suffix }
-      | Some _ ->
-          Bsb_exception.errorf ~loc
-            "package-specs: when the configuration is an object, `module` \
-             field should be a string, not an array. If you want to pass \
-             multiple module specs, try turning package-specs into an array of \
-             objects (or strings) instead."
-      | None ->
-          Bsb_exception.errorf ~loc
-            "package-specs: when the configuration is an object, the `module` \
-             field is mandatory.")
-  | _ ->
-      Bsb_exception.errorf ~loc:(Ext_json.loc_of x)
-        "package-specs: expected either a string or an object."
-
-let from_json suffix (x : Ext_json_types.t) : Spec_set.t =
-  match x with
-  | Arr { content; _ } -> from_array suffix content
-  | _ -> Spec_set.singleton (from_json_single suffix x)
-
-let bs_package_output = "-bs-package-output"
-
-[@@@warning "+9"]
-
-(* Assume input is valid
-    coordinate with command line flag
-    {[ -bs-package-output commonjs:lib/js/jscomp/test:.js ]}
-*)
-let package_flag ({ format; in_source; suffix } : Bsb_spec_set.spec) dir =
-  Ext_string.inter2 bs_package_output
-    (Ext_string.concat5 (string_of_format format) Ext_string.single_colon
-       (if in_source then dir
-       else Bsb_config.top_prefix_of_format format // dir)
-       Ext_string.single_colon
-      suffix)
-
-(* FIXME: we should adapt it *)
-let package_flag_of_package_specs (package_specs : t) ~(dirname : string) :
-    string =
-  let res =
-    match (package_specs.modules :> Bsb_spec_set.spec list) with
-    | [] -> Ext_string.empty
-    | [ format ] ->
-        Ext_string.inter2 Ext_string.empty (package_flag format dirname)
-    | [ a; b ] ->
-        Ext_string.inter3 Ext_string.empty (package_flag a dirname)
-          (package_flag b dirname)
-    | [ a; b; c ] ->
-        Ext_string.inter4 Ext_string.empty (package_flag a dirname)
-          (package_flag b dirname) (package_flag c dirname)
-    | _ ->
-        Spec_set.fold
-          (fun format acc ->
-            Ext_string.inter2 acc (package_flag format dirname))
-          package_specs.modules Ext_string.empty
-  in
-  match package_specs.runtime with
-  | None -> res
-  | Some x -> Ext_string.inter3 res "-runtime" x
-
-let default_package_specs suffix =
-  (* TODO: swap default to Esmodule in v12 *)
-  Spec_set.singleton { format = Commonjs; in_source = false; suffix }
-
-(**
-    [get_list_of_output_js specs "src/hi/hello"]
-
-*)
-let get_list_of_output_js (package_specs : t)
-    (output_file_sans_extension : string) =
-  Spec_set.fold
-    (fun (spec : Bsb_spec_set.spec) acc ->
-      let basename =
-        Ext_namespace.change_ext_ns_suffix output_file_sans_extension spec.suffix
-      in
-      (if spec.in_source then Bsb_config.rev_lib_bs_prefix basename
-      else Bsb_config.lib_bs_prefix_of_format spec.format // basename)
-      :: acc)
-    package_specs.modules []
-
-let list_dirs_by (package_specs : t) (f : string -> unit) =
-  Spec_set.iter
-    (fun (spec : Bsb_spec_set.spec) ->
-      if not spec.in_source then f (Bsb_config.top_prefix_of_format spec.format))
-    package_specs.modules
-
-type json_map = Ext_json_types.t Map_string.t
-
-let extract_js_suffix_exn (map : json_map) : string =
-  match map.?(Bsb_build_schemas.suffix) with
-  | None -> Literals.suffix_js
-  | Some (Str { str = suffix; _ }) when validate_js_suffix suffix -> suffix
-  | Some ((Str {str; _}) as config)  -> 
-    Bsb_exception.config_error config
-      ("invalid suffix \"" ^ str ^ "\". The suffix and may contain letters, digits, \"-\", \"_\" and \".\" and must end with .js, .mjs or .cjs.")
-  | Some config ->
-    Bsb_exception.config_error config
-      "expected a string extension like \".js\""
-
-let from_map ~(cwd : string) map =
-  let suffix = extract_js_suffix_exn map in
-  let modules =
-    match map.?(Bsb_build_schemas.package_specs) with
-    | Some x -> from_json suffix x
-    | None -> default_package_specs suffix
-  in
-  let runtime =
-    match map.?(Bsb_build_schemas.external_stdlib) with
-    | None -> None
-    | Some (Str { str; _ }) ->
-        Some
-          (Bsb_pkg.resolve_bs_package ~cwd
-             (Bsb_pkg_types.string_as_package str))
-    | _ -> assert false
-  in
-  { runtime; modules }
diff --git a/jscomp/bsb/bsb_package_specs.mli b/jscomp/bsb/bsb_package_specs.mli
deleted file mode 100644
index a5c575e..0000000
--- a/jscomp/bsb/bsb_package_specs.mli
+++ /dev/null
@@ -1,37 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t
-
-val from_map : cwd:string -> Ext_json_types.t Map_string.t -> t
-
-val get_list_of_output_js : t -> string -> string list
-
-val package_flag_of_package_specs : t -> dirname:string -> string
-(**
-   Sample output: {[ -bs-package-output commonjs:lib/js/jscomp/test]}
-*)
-
-(* used to ensure each dir does exist *)
-val list_dirs_by : t -> (string -> unit) -> unit
diff --git a/jscomp/bsb/bsb_parse_sources.ml b/jscomp/bsb/bsb_parse_sources.ml
deleted file mode 100644
index e9969e9..0000000
--- a/jscomp/bsb/bsb_parse_sources.ml
+++ /dev/null
@@ -1,445 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 build_generator = Bsb_file_groups.build_generator
-
-let ( .?() ) = Map_string.find_opt
-
-(* type file_group = Bsb_file_groups.file_group *)
-
-type t = Bsb_file_groups.t
-
-let is_input_or_output (xs : build_generator list) (x : string) =
-  Ext_list.exists xs (fun { input; output } ->
-      let it_is y = y = x in
-      Ext_list.exists input it_is || Ext_list.exists output it_is)
-
-let errorf x fmt = Bsb_exception.errorf ~loc:(Ext_json.loc_of x) fmt
-
-type cxt = {
-  package_kind : Bsb_package_kind.t;
-  is_dev : bool;
-  cwd : string;
-  root : string;
-  cut_generators : bool;
-  traverse : bool;
-  (* namespace : string option; *)
-  ignored_dirs : Set_string.t;
-}
-
-(** [public] has a list of modules, we do a sanity check to see if all the listed 
-    modules are indeed valid module components
-*)
-let collect_pub_modules (xs : Ext_json_types.t array) (cache : Bsb_db.map) :
-    Set_string.t =
-  let set = ref Set_string.empty in
-  for i = 0 to Array.length xs - 1 do
-    let v = Array.unsafe_get xs i in
-    match v with
-    | Str { str; loc } ->
-        if Map_string.mem cache str then set := Set_string.add !set str
-        else
-          Bsb_exception.errorf ~loc "%S in public is not an existing module" str
-    | _ ->
-        Bsb_exception.errorf ~loc:(Ext_json.loc_of v)
-          "public expects a list of strings"
-  done;
-  !set
-
-let extract_pub (input : Ext_json_types.t Map_string.t)
-    (cur_sources : Bsb_db.map) : Bsb_file_groups.public =
-  match input.?(Bsb_build_schemas.public) with
-  | Some (Str { str = s } as x) ->
-      if s = Bsb_build_schemas.export_all then Export_all
-      else if s = Bsb_build_schemas.export_none then Export_none
-      else errorf x "invalid str for %s " s
-  | Some (Arr { content }) ->
-      Export_set (collect_pub_modules content cur_sources)
-  | Some config -> Bsb_exception.config_error config "expect array or string"
-  | None -> Export_all
-
-let extract_resources (input : Ext_json_types.t Map_string.t) : string list =
-  match input.?(Bsb_build_schemas.resources) with
-  | Some (Arr x) -> Bsb_build_util.get_list_string x.content
-  | Some config -> Bsb_exception.config_error config "expect array "
-  | None -> []
-
-let extract_input_output (edge : Ext_json_types.t) : string list * string list =
-  let error () =
-    errorf edge {| invalid edge format, expect  ["output" , ":", "input" ]|}
-  in
-  match edge with
-  | Arr { content } -> (
-      match
-        Ext_array.find_and_split content
-          (fun x () -> match x with Str { str = ":" } -> true | _ -> false)
-          ()
-      with
-      | No_split -> error ()
-      | Split (output, input) ->
-          ( Ext_array.to_list_map output (fun x ->
-                match x with
-                | Str { str = ":" } -> error ()
-                | Str { str } -> Some str
-                | _ -> None),
-            Ext_array.to_list_map input (fun x ->
-                match x with
-                | Str { str = ":" } -> error ()
-                | Str { str } ->
-                    Some str
-                    (* More rigirous error checking: It would trigger a ninja syntax error *)
-                | _ -> None) ))
-  | _ -> error ()
-
-type json_map = Ext_json_types.t Map_string.t
-
-let extract_generators (input : json_map) : build_generator list =
-  match input.?(Bsb_build_schemas.generators) with
-  | Some (Arr { content; loc_start = _ }) ->
-      (* Need check is dev build or not *)
-      Ext_array.fold_left content [] (fun acc x ->
-          match x with
-          | Obj { map } -> (
-              match
-                (map.?(Bsb_build_schemas.name), map.?(Bsb_build_schemas.edge))
-              with
-              | Some (Str command), Some edge ->
-                  let output, input = extract_input_output edge in
-                  { Bsb_file_groups.input; output; command = command.str }
-                  :: acc
-              | _ -> errorf x "Invalid generator format")
-          | _ -> errorf x "Invalid generator format")
-  | Some x -> errorf x "Invalid generator format"
-  | None -> []
-
-let extract_predicate (m : json_map) : string -> bool =
-  let excludes =
-    match m.?(Bsb_build_schemas.excludes) with
-    | None -> []
-    | Some (Arr { content = arr }) -> Bsb_build_util.get_list_string arr
-    | Some x -> Bsb_exception.config_error x "excludes expect array "
-  in
-  let slow_re = m.?(Bsb_build_schemas.slow_re) in
-  match (slow_re, excludes) with
-  | Some (Str { str = s }), [] ->
-      let re = Str.regexp s in
-      fun name -> Str.string_match re name 0
-  | Some (Str { str = s }), _ :: _ ->
-      let re = Str.regexp s in
-      fun name ->
-        Str.string_match re name 0 && not (Ext_list.mem_string excludes name)
-  | Some config, _ ->
-      Bsb_exception.config_error config
-        (Bsb_build_schemas.slow_re ^ " expect a string literal")
-  | None, _ -> fun name -> not (Ext_list.mem_string excludes name)
-
-(** [parsing_source_dir_map cxt input]
-    Major work done in this function, 
-    assume [not toplevel && not (Bsb_dir_index.is_lib_dir dir_index)]      
-    is already checked, so we don't need check it again    
-*)
-
-(** This is the only place where we do some removal during scanning,
-    configurabl
-*)
-
-(********************************************************************)
-(* starts parsing *)
-let rec parsing_source_dir_map ({ cwd = dir } as cxt)
-    (input : Ext_json_types.t Map_string.t) : Bsb_file_groups.t =
-  if Set_string.mem cxt.ignored_dirs dir then Bsb_file_groups.empty
-  else
-    let cur_globbed_dirs = ref false in
-    let has_generators =
-      match cxt with
-      | {
-       cut_generators = false;
-       package_kind = Toplevel | Pinned_dependency _;
-      } ->
-          true
-      | { cut_generators = false; package_kind = Dependency _ }
-      | { cut_generators = true; _ } ->
-          false
-    in
-    let scanned_generators = extract_generators input in
-    let sub_dirs_field = input.?(Bsb_build_schemas.subdirs) in
-    let base_name_array =
-      lazy
-        (cur_globbed_dirs := true;
-         Sys.readdir (Filename.concat cxt.root dir))
-    in
-    let output_sources =
-      Ext_list.fold_left
-        (Ext_list.flat_map scanned_generators (fun x -> x.output))
-        Map_string.empty
-        (fun acc o -> Bsb_db_util.add_basename ~dir acc o)
-    in
-    let sources =
-      match input.?(Bsb_build_schemas.files) with
-      | None ->
-          (* We should avoid temporary files *)
-          Ext_array.fold_left (Lazy.force base_name_array) output_sources
-            (fun acc basename ->
-              if is_input_or_output scanned_generators basename then acc
-              else Bsb_db_util.add_basename ~dir acc basename)
-      | Some (Arr basenames) ->
-          Ext_array.fold_left basenames.content output_sources
-            (fun acc basename ->
-              match basename with
-              | Str { str = basename; loc } ->
-                  Bsb_db_util.add_basename ~dir acc basename
-                    ~error_on_invalid_suffix:loc
-              | _ -> acc)
-      | Some (Obj { map; loc = _ }) ->
-          (* { excludes : [], slow_re : "" }*)
-          let predicate = extract_predicate map in
-          Ext_array.fold_left (Lazy.force base_name_array) output_sources
-            (fun acc basename ->
-              if
-                is_input_or_output scanned_generators basename
-                || not (predicate basename)
-              then acc
-              else Bsb_db_util.add_basename ~dir acc basename)
-      | Some x ->
-          Bsb_exception.config_error x "files field expect array or object "
-    in
-    let resources = extract_resources input in
-    let public = extract_pub input sources in
-    (* Doing recursive stuff *)
-    let children =
-      match (sub_dirs_field, cxt.traverse) with
-      | None, true | Some (True _), _ ->
-          let root = cxt.root in
-          let parent = Filename.concat root dir in
-          Ext_array.fold_left (Lazy.force base_name_array) Bsb_file_groups.empty
-            (fun origin x ->
-              if
-                (not (Set_string.mem cxt.ignored_dirs x))
-                && Ext_sys.is_directory_no_exn (Filename.concat parent x)
-              then
-                Bsb_file_groups.merge
-                  (parsing_source_dir_map
-                     {
-                       cxt with
-                       cwd =
-                         Ext_path.concat cxt.cwd
-                           (Ext_path.simple_convert_node_path_to_os_path x);
-                       traverse = true;
-                     }
-                     Map_string.empty)
-                  origin
-              else origin)
-      (* readdir parent avoiding scanning twice *)
-      | None, false | Some (False _), _ -> Bsb_file_groups.empty
-      | Some s, _ -> parse_sources cxt s
-    in
-    (* Do some clean up *)
-    (* prune_staled_bs_js_files cxt sources ; *)
-    Bsb_file_groups.cons
-      ~file_group:
-        {
-          dir;
-          sources;
-          resources;
-          public;
-          is_dev = cxt.is_dev;
-          generators = (if has_generators then scanned_generators else []);
-        }
-      ?globbed_dir:(if !cur_globbed_dirs then Some dir else None)
-      children
-
-and parsing_single_source ({ package_kind; is_dev; cwd } as cxt)
-    (x : Ext_json_types.t) : t =
-  match x with
-  | Str { str = dir } -> (
-      match (package_kind, is_dev) with
-      | Dependency _, true -> Bsb_file_groups.empty
-      | Dependency _, false | (Toplevel | Pinned_dependency _), _ ->
-          parsing_source_dir_map
-            {
-              cxt with
-              cwd =
-                Ext_path.concat cwd
-                  (Ext_path.simple_convert_node_path_to_os_path dir);
-            }
-            Map_string.empty)
-  | Obj { map } -> (
-      let current_dir_index =
-        match map.?(Bsb_build_schemas.type_) with
-        | Some (Str { str = "dev" }) -> true
-        | Some _ ->
-            Bsb_exception.config_error x {|type field expect "dev" literal |}
-        | None -> is_dev
-      in
-      match (package_kind, current_dir_index) with
-      | Dependency _, true -> Bsb_file_groups.empty
-      | Dependency _, false | (Toplevel | Pinned_dependency _), _ ->
-          let dir =
-            match map.?(Bsb_build_schemas.dir) with
-            | Some (Str { str }) ->
-                if str = Literals.library_file then
-                    Bsb_exception.config_error x (Printf.sprintf "dir field should be different from `%s`" Literals.library_file)
-                else
-                Ext_path.simple_convert_node_path_to_os_path str
-            | Some x ->
-                Bsb_exception.config_error x "dir expected to be a string"
-            | None ->
-                Bsb_exception.config_error x
-                  ("required field :" ^ Bsb_build_schemas.dir ^ " missing")
-          in
-
-          parsing_source_dir_map
-            {
-              cxt with
-              is_dev = current_dir_index;
-              cwd = Ext_path.concat cwd dir;
-            }
-            map)
-  | _ -> Bsb_file_groups.empty
-
-and parsing_arr_sources cxt (file_groups : Ext_json_types.t array) =
-  Ext_array.fold_left file_groups Bsb_file_groups.empty (fun origin x ->
-      Bsb_file_groups.merge (parsing_single_source cxt x) origin)
-
-and parse_sources (cxt : cxt) (sources : Ext_json_types.t) =
-  match sources with
-  | Arr file_groups -> parsing_arr_sources cxt file_groups.content
-  | _ -> parsing_single_source cxt sources
-
-let scan ~package_kind ~root ~cut_generators ~(* ~namespace  *)
-                                             ignored_dirs x : t =
-  parse_sources
-    {
-      ignored_dirs;
-      package_kind;
-      is_dev = false;
-      cwd = Filename.current_dir_name;
-      root;
-      cut_generators;
-      (* namespace; *)
-      traverse = false;
-    }
-    x
-
-(* Walk through to do some work *)
-type walk_cxt = {
-  cwd : string;
-  root : string;
-  traverse : bool;
-  ignored_dirs : Set_string.t;
-  gentype_language : string;
-}
-
-let rec walk_sources (cxt : walk_cxt) (sources : Ext_json_types.t) =
-  match sources with
-  | Arr { content } ->
-      Ext_array.iter content (fun x -> walk_single_source cxt x)
-  | x -> walk_single_source cxt x
-
-and walk_single_source cxt (x : Ext_json_types.t) =
-  match x with
-  | Str { str = dir } ->
-      let dir = Ext_path.simple_convert_node_path_to_os_path dir in
-      walk_source_dir_map { cxt with cwd = Ext_path.concat cxt.cwd dir } None
-  | Obj { map } -> (
-      match map.?(Bsb_build_schemas.dir) with
-      | Some (Str { str }) ->
-          let dir = Ext_path.simple_convert_node_path_to_os_path str in
-          walk_source_dir_map
-            { cxt with cwd = Ext_path.concat cxt.cwd dir }
-            map.?(Bsb_build_schemas.subdirs)
-      | _ -> ())
-  | _ -> ()
-
-and walk_source_dir_map (cxt : walk_cxt) sub_dirs_field =
-  let working_dir = Filename.concat cxt.root cxt.cwd in
-  if not (Set_string.mem cxt.ignored_dirs cxt.cwd) then (
-    let file_array = Sys.readdir working_dir in
-    (* Remove .gen.js/.gen.tsx during clean up *)
-    Ext_array.iter file_array (fun file ->
-        let is_typescript = cxt.gentype_language = "typescript" in
-        if
-          (not is_typescript)
-          && Ext_string.ends_with file Literals.suffix_gen_js
-          || (is_typescript && Ext_string.ends_with file Literals.suffix_gen_tsx)
-        then Sys.remove (Filename.concat working_dir file));
-    let cxt_traverse = cxt.traverse in
-    match (sub_dirs_field, cxt_traverse) with
-    | None, true | Some (True _), _ ->
-        Ext_array.iter file_array (fun f ->
-            if
-              (not (Set_string.mem cxt.ignored_dirs f))
-              && Ext_sys.is_directory_no_exn (Filename.concat working_dir f)
-            then
-              walk_source_dir_map
-                {
-                  cxt with
-                  cwd =
-                    Ext_path.concat cxt.cwd
-                      (Ext_path.simple_convert_node_path_to_os_path f);
-                  traverse = true;
-                }
-                None)
-    | None, _ | Some (False _), _ -> ()
-    | Some s, _ -> walk_sources cxt s)
-
-(* It makes use of the side effect when [walk_sources], removing suffix_re_js,
-   TODO: make it configurable
-*)
-let clean_re_js root =
-  match
-    Ext_json_parse.parse_json_from_file
-      (Filename.concat root Literals.bsconfig_json)
-  with
-  | Obj { map } ->
-      let ignored_dirs =
-        match map.?(Bsb_build_schemas.ignored_dirs) with
-        | Some (Arr { content = x }) ->
-            Set_string.of_list (Bsb_build_util.get_list_string x)
-        | Some _ | None -> Set_string.empty
-      in
-      let gentype_language =
-        match map.?(Bsb_build_schemas.gentypeconfig) with
-        | None -> ""
-        | Some (Obj { map }) -> (
-            match map.?(Bsb_build_schemas.language) with
-            | None -> ""
-            | Some (Str { str }) -> str
-            | Some _ -> "")
-        | Some _ -> ""
-      in
-      Ext_option.iter map.?(Bsb_build_schemas.sources) (fun config ->
-          try
-            walk_sources
-              {
-                root;
-                traverse = true;
-                cwd = Filename.current_dir_name;
-                ignored_dirs;
-                gentype_language;
-              }
-              config
-          with _ -> ())
-  | _ -> ()
-  | exception _ -> ()
diff --git a/jscomp/bsb/bsb_parse_sources.mli b/jscomp/bsb/bsb_parse_sources.mli
deleted file mode 100644
index 8e48631..0000000
--- a/jscomp/bsb/bsb_parse_sources.mli
+++ /dev/null
@@ -1,44 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val scan :
-  package_kind:Bsb_package_kind.t ->
-  root:string ->
-  cut_generators:bool ->
-  (* namespace : string option ->  *)
-  ignored_dirs:Set_string.t ->
-  Ext_json_types.t ->
-  Bsb_file_groups.t
-(** [scan .. cxt json]
-    entry is to the [sources] in the schema    
-    given a root, return an object which is
-    all relative paths, this function will do the IO
-*)
-
-val clean_re_js : string -> unit
-(** This function has some duplication 
-    from [scan],
-    the parsing assuming the format is 
-    already valid
-*)
diff --git a/jscomp/bsb/bsb_pkg.ml b/jscomp/bsb/bsb_pkg.ml
deleted file mode 100644
index f2c1d27..0000000
--- a/jscomp/bsb/bsb_pkg.ml
+++ /dev/null
@@ -1,129 +0,0 @@
-(* Copyright (C) 2017- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ( // ) = Filename.concat
-
-type t = Bsb_pkg_types.t
-
-(* TODO: be more restrict
-   [bsconfig.json] does not always make sense,
-   when resolving [ppx-flags]
-*)
-let make_sub_path (x : t) : string =
-  Literals.node_modules // Bsb_pkg_types.to_string x
-
-let node_paths : string list Lazy.t =
-  lazy
-    (try
-       Ext_string.split (Sys.getenv "NODE_PATH")
-         (if Sys.win32 then ';' else ':')
-     with _ -> [])
-
-(** It makes sense to have this function raise, when [bsb] could not resolve a package, it used to mean
-    a failure
-*)
-let check_dir dir =
-  match Sys.file_exists dir with true -> Some dir | false -> None
-
-let resolve_bs_package_aux ~cwd (pkg : t) =
-  (* First try to resolve recursively from the current working directory  *)
-  let sub_path = make_sub_path pkg in
-  let rec aux cwd =
-    let abs_marker = cwd // sub_path in
-    if Sys.file_exists abs_marker then abs_marker
-    else
-      let another_cwd = Filename.dirname cwd in
-      (* TODO: may non-terminating when see symlinks *)
-      if String.length another_cwd < String.length cwd then aux another_cwd
-      else
-        (* To the end try other possiblilities [NODE_PATH]*)
-        match
-          Ext_list.find_opt (Lazy.force node_paths) (fun dir ->
-              check_dir (dir // Bsb_pkg_types.to_string pkg))
-        with
-        | Some resolved_dir -> resolved_dir
-        | None -> Bsb_exception.package_not_found ~pkg ~json:None
-  in
-  aux cwd
-
-module Coll = Hash.Make (struct
-  type nonrec t = t
-
-  let equal = Bsb_pkg_types.equal
-
-  let hash (x : t) = Hashtbl.hash x
-end)
-
-let cache : string Coll.t = Coll.create 0
-
-let to_list cb = Coll.to_list cache cb
-
-(** TODO: collect all warnings and print later *)
-let resolve_bs_package ~cwd (package : t) =
-  match Coll.find_opt cache package with
-  | None ->
-      let result = resolve_bs_package_aux ~cwd package in
-      Bsb_log.info "@{<info>Package@} %a -> %s@." Bsb_pkg_types.print package
-        result;
-      Coll.add cache package result;
-      result
-  | Some x ->
-      let result = resolve_bs_package_aux ~cwd package in
-      if not (Bsb_real_path.is_same_paths_via_io result x) then
-        Bsb_log.warn
-          "@{<warning>Duplicated package:@} %a %s (chosen) vs %s in %s @."
-          Bsb_pkg_types.print package x result cwd;
-      x
-
-(** The package does not need to be a bspackage
-    example:
-    {[
-      resolve_npm_package_file ~cwd "reason/refmt";;
-      resolve_npm_package_file ~cwd "reason/refmt/xx/yy"
-    ]}
-    It also returns the path name
-    Note the input [sub_path] is already converted to physical meaning path according to OS
-*)
-(* let resolve_npm_package_file ~cwd sub_path = *)
-(*   let rec aux  cwd  =  *)
-(*     let abs_marker =  cwd // Literals.node_modules // sub_path in  *)
-(*     if Sys.file_exists abs_marker then Some abs_marker *)
-(*     else  *)
-(*       let cwd' = Filename.dirname cwd in  *)
-(*       if String.length cwd' < String.length cwd then   *)
-(*         aux cwd'  *)
-(*       else  *)
-(*         try  *)
-(*           let abs_marker =  *)
-(*             Sys.getenv "npm_config_prefix"  *)
-(*             // "lib" // Literals.node_modules // sub_path in *)
-(*           if Sys.file_exists abs_marker *)
-(*           then Some  abs_marker *)
-(*           else None *)
-(*             (\* Bs_exception.error (Bs_package_not_found name) *\) *)
-(*         with  *)
-(*           Not_found -> None *)
-(*           (\* Bs_exception.error (Bs_package_not_found name)           *\) *)
-(*   in *)
-(*   aux cwd *)
diff --git a/jscomp/bsb/bsb_pkg.mli b/jscomp/bsb/bsb_pkg.mli
deleted file mode 100644
index 2359b41..0000000
--- a/jscomp/bsb/bsb_pkg.mli
+++ /dev/null
@@ -1,38 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** [resolve cwd module_name], 
-    [cwd] is current working directory, absolute path
-    Trying to find paths to load [module_name]
-    it is sepcialized for option [-bs-package-include] which requires
-    [npm_package_name/lib/ocaml]
-
-    it relies on [npm_config_prefix] env variable for global npm modules
-*)
-
-val resolve_bs_package : cwd:string -> Bsb_pkg_types.t -> string
-(** @raise  when not found *)
-
-val to_list : (Bsb_pkg_types.t -> string -> 'a) -> 'a list
-(** used by watcher *)
diff --git a/jscomp/bsb/bsb_pkg_types.ml b/jscomp/bsb/bsb_pkg_types.ml
deleted file mode 100644
index 8a7aa44..0000000
--- a/jscomp/bsb/bsb_pkg_types.ml
+++ /dev/null
@@ -1,89 +0,0 @@
-(* Copyright (C) 2018- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ( // ) = Filename.concat
-
-type t = Global of string | Scope of string * scope
-
-and scope = string
-
-let to_string (x : t) =
-  match x with Global s -> s | Scope (s, scope) -> scope // s
-
-let print fmt (x : t) =
-  match x with
-  | Global s -> Format.pp_print_string fmt s
-  | Scope (name, scope) -> Format.fprintf fmt "%s/%s" scope name
-
-let equal (x : t) y =
-  match (x, y) with
-  | Scope (a0, a1), Scope (b0, b1) -> a0 = b0 && a1 = b1
-  | Global a0, Global b0 -> a0 = b0
-  | Scope _, Global _ | Global _, Scope _ -> false
-
-(**
-   input: {[
-     @hello/yy/xx
-        hello/yy
-   ]}
-   FIXME: fix invalid input
-   {[
-     hello//xh//helo
-   ]}
-*)
-let extract_pkg_name_and_file (s : string) =
-  let len = String.length s in
-  assert (len > 0);
-  let v = String.unsafe_get s 0 in
-  if v = '@' then (
-    let scope_id = Ext_string.no_slash_idx s in
-    assert (scope_id > 0);
-    let pkg_id = Ext_string.no_slash_idx_from s (scope_id + 1) in
-    let scope = String.sub s 0 scope_id in
-
-    if pkg_id < 0 then
-      (Scope (String.sub s (scope_id + 1) (len - scope_id - 1), scope), "")
-    else
-      ( Scope (String.sub s (scope_id + 1) (pkg_id - scope_id - 1), scope),
-        String.sub s (pkg_id + 1) (len - pkg_id - 1) ))
-  else
-    let pkg_id = Ext_string.no_slash_idx s in
-    if pkg_id < 0 then (Global s, "")
-    else
-      ( Global (String.sub s 0 pkg_id),
-        String.sub s (pkg_id + 1) (len - pkg_id - 1) )
-
-let string_as_package (s : string) : t =
-  let len = String.length s in
-  assert (len > 0);
-  let v = String.unsafe_get s 0 in
-  if v = '@' then (
-    let scope_id = Ext_string.no_slash_idx s in
-    assert (scope_id > 0);
-    (* better-eror message for invalid scope package:
-       @rescript/std
-    *)
-    Scope
-      (String.sub s (scope_id + 1) (len - scope_id - 1), String.sub s 0 scope_id))
-  else Global s
diff --git a/jscomp/bsb/bsb_pkg_types.mli b/jscomp/bsb/bsb_pkg_types.mli
deleted file mode 100644
index ebb1662..0000000
--- a/jscomp/bsb/bsb_pkg_types.mli
+++ /dev/null
@@ -1,39 +0,0 @@
-(* Copyright (C) 2019- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Global of string | Scope of string * scope
-
-and scope = string
-
-val to_string : t -> string
-
-val print : Format.formatter -> t -> unit
-
-val equal : t -> t -> bool
-
-(* The second element could be empty or dropped 
-*)
-val extract_pkg_name_and_file : string -> t * string
-
-val string_as_package : string -> t
diff --git a/jscomp/bsb/bsb_real_path.ml b/jscomp/bsb/bsb_real_path.ml
deleted file mode 100644
index d4c33d5..0000000
--- a/jscomp/bsb/bsb_real_path.ml
+++ /dev/null
@@ -1,50 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ( // ) = Filename.concat
-
-let normalize_exn (s : string) : string =
-  let old_cwd = Sys.getcwd () in
-  Unix.chdir s;
-  let normalized = Sys.getcwd () in
-  Unix.chdir old_cwd;
-  normalized
-
-let real_path p =
-  match Sys.is_directory p with
-  | exception _ ->
-      let rec resolve dir =
-        if Sys.file_exists dir then normalize_exn dir
-        else
-          let parent = Filename.dirname dir in
-          if dir = parent then dir else resolve parent // Filename.basename dir
-      in
-      let p = if Filename.is_relative p then Sys.getcwd () // p else p in
-      resolve p
-  | true -> normalize_exn p
-  | false -> (
-      let dir = normalize_exn (Filename.dirname p) in
-      match Filename.basename p with "." -> dir | base -> dir // base)
-
-let is_same_paths_via_io a b = if a = b then true else real_path a = real_path b
diff --git a/jscomp/bsb/bsb_real_path.mli b/jscomp/bsb/bsb_real_path.mli
deleted file mode 100644
index 65a93ef..0000000
--- a/jscomp/bsb/bsb_real_path.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val is_same_paths_via_io : string -> string -> bool
diff --git a/jscomp/bsb/bsb_regex.ml b/jscomp/bsb/bsb_regex.ml
deleted file mode 100644
index 98437c3..0000000
--- a/jscomp/bsb/bsb_regex.ml
+++ /dev/null
@@ -1,59 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let string_after s n = String.sub s n (String.length s - n)
-
-(* There seems to be a bug in {!Str.global_substitute}
-   {[
-     Str.global_substitute (Str.regexp "\\${rescript:\\([-a-zA-Z0-9]+\\)}") (fun x -> (x^":found")) {|   ${rescript:hello-world}  ${rescript:x} ${x}|}  ;;
-     - : bytes =
-     "      ${rescript:hello-world}  ${rescript:x} ${x}:found     ${rescript:hello-world}  ${rescript:x} ${x}:found ${x}"
-   ]}
-*)
-let global_substitute text ~reg:expr repl_fun =
-  let text_len = String.length text in
-  let expr = Str.regexp expr in
-  let rec replace accu start last_was_empty =
-    let startpos = if last_was_empty then start + 1 else start in
-    if startpos > text_len then string_after text start :: accu
-    else
-      match Str.search_forward expr text startpos with
-      | exception Not_found -> string_after text start :: accu
-      | pos ->
-          let end_pos = Str.match_end () in
-          let matched = Str.matched_string text in
-          let groups =
-            let rec aux n acc =
-              match Str.matched_group n text with
-              | exception (Not_found | Invalid_argument _) -> acc
-              | v -> aux (succ n) (v :: acc)
-            in
-            aux 1 []
-          in
-          let repl_text = repl_fun matched groups in
-          replace
-            (repl_text :: String.sub text start (pos - start) :: accu)
-            end_pos (end_pos = pos)
-  in
-  String.concat "" (List.rev (replace [] 0 false))
diff --git a/jscomp/bsb/bsb_regex.mli b/jscomp/bsb/bsb_regex.mli
deleted file mode 100644
index 747b9fd..0000000
--- a/jscomp/bsb/bsb_regex.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val global_substitute :
-  string -> reg:string -> (string -> string list -> string) -> string
-(** Used in `bsb -init` command *)
diff --git a/jscomp/bsb/bsb_spec_set.ml b/jscomp/bsb/bsb_spec_set.ml
deleted file mode 100644
index a53862f..0000000
--- a/jscomp/bsb/bsb_spec_set.ml
+++ /dev/null
@@ -1,80 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-[@@@warning "+9"]
-
-(* TODO: sync up with {!Js_packages_info.module_system}  *)
-type format = Ext_module_system.t
-
-type spec = { format : format; in_source : bool; suffix : string }
-
-type t = spec list
-
-let cmp (s1 : spec) ({ format; in_source; suffix } : spec) =
-  let v = compare s1.format format in
-  if v <> 0 then v
-  else
-    let v = compare s1.in_source in_source in
-    if v <> 0 then v else compare s1.suffix suffix
-
-let empty = []
-
-let rec insert lst piviot =
-  match lst with
-  | [] -> [ piviot ]
-  | x :: xs ->
-      let v = cmp piviot x in
-      if v = 0 then lst
-      else if v < 0 then piviot :: lst
-      else x :: insert xs piviot
-
-let add spec specs =
-  match specs with
-  | [] -> [ spec ]
-  | [ a ] ->
-      let v = cmp spec a in
-      if v < 0 then spec :: specs else if v = 0 then specs else [ a; spec ]
-  | [ a; b ] ->
-      let v = cmp spec a in
-      if v < 0 then spec :: specs
-      else if v = 0 then specs
-      else
-        let v1 = cmp spec b in
-        if v < 0 then [ a; spec; b ]
-        else if v1 = 0 then specs
-        else [ a; b; spec ]
-  | _ :: _ :: _ :: _ ->
-      (* unlikely to happen *)
-      insert specs spec
-
-let singleton x = [ x ]
-
-let rec fold f t acc = match t with [] -> acc | x :: xs -> fold f xs (f x acc)
-
-let rec iter f t =
-  match t with
-  | [] -> ()
-  | x :: xs ->
-      f x;
-      iter f xs
diff --git a/jscomp/bsb/bsb_spec_set.mli b/jscomp/bsb/bsb_spec_set.mli
deleted file mode 100644
index 996475c..0000000
--- a/jscomp/bsb/bsb_spec_set.mli
+++ /dev/null
@@ -1,38 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 format = Ext_module_system.t
-
-type spec = { format : format; in_source : bool; suffix : string }
-
-type t = private spec list
-
-val empty : t
-
-val add : spec -> t -> t
-
-val singleton : spec -> t
-
-val fold : (spec -> 'a -> 'a) -> t -> 'a -> 'a
-
-val iter : (spec -> unit) -> t -> unit
diff --git a/jscomp/bsb/bsb_unix.ml b/jscomp/bsb/bsb_unix.ml
deleted file mode 100644
index e1c43c2..0000000
--- a/jscomp/bsb/bsb_unix.ml
+++ /dev/null
@@ -1,84 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 command = { cmd : string; cwd : string; args : string array }
-
-let log cmd =
-  Bsb_log.info "@{<info>Entering@} %s @." cmd.cwd;
-  Bsb_log.info "@{<info>Cmd:@} ";
-  Bsb_log.info_args cmd.args
-
-let command_fatal_error cmd eid =
-  Bsb_log.error "@{<error>Failure:@} %s \nLocation: %s@." cmd.cmd cmd.cwd;
-  exit eid
-
-let run_command_execv_unix cmd : int =
-  match Unix.fork () with
-  | 0 ->
-      log cmd;
-      Unix.chdir cmd.cwd;
-      Unix.execv cmd.cmd cmd.args
-  | pid -> (
-      match Unix.waitpid [] pid with
-      | _, process_status -> (
-          match process_status with
-          | Unix.WEXITED eid -> eid
-          | Unix.WSIGNALED _ | Unix.WSTOPPED _ ->
-              Bsb_log.error "@{<error>Interrupted:@} %s@." cmd.cmd;
-              2))
-
-(** TODO: the args are not quoted, here 
-    we are calling a very limited set of `bsb` commands, so that 
-    we are safe
-*)
-let run_command_execv_win (cmd : command) =
-  let old_cwd = Unix.getcwd () in
-  log cmd;
-  Unix.chdir cmd.cwd;
-  let eid =
-    Sys.command
-      (String.concat Ext_string.single_space
-         (Filename.quote cmd.cmd :: (List.tl @@ Array.to_list cmd.args)))
-  in
-  Bsb_log.info "@{<info>Leaving@} %s => %s  @." cmd.cwd old_cwd;
-  Unix.chdir old_cwd;
-  eid
-
-(** it assume you have permissions, so always catch it to fail 
-    gracefully
-*)
-let run_command_execv =
-  if Ext_sys.is_windows_or_cygwin then run_command_execv_win
-  else run_command_execv_unix
-
-let rec remove_dir_recursive dir =
-  match Sys.is_directory dir with
-  | true ->
-      let files = Sys.readdir dir in
-      for i = 0 to Array.length files - 1 do
-        remove_dir_recursive (Filename.concat dir (Array.unsafe_get files i))
-      done;
-      Unix.rmdir dir
-  | false -> Sys.remove dir
-  | exception _ -> ()
diff --git a/jscomp/bsb/bsb_unix.mli b/jscomp/bsb/bsb_unix.mli
deleted file mode 100644
index 1df6758..0000000
--- a/jscomp/bsb/bsb_unix.mli
+++ /dev/null
@@ -1,31 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 command = { cmd : string; cwd : string; args : string array }
-
-val command_fatal_error : command -> int -> unit
-
-val run_command_execv : command -> int
-
-val remove_dir_recursive : string -> unit
diff --git a/jscomp/bsb/bsb_warning.ml b/jscomp/bsb/bsb_warning.ml
deleted file mode 100644
index 179b77a..0000000
--- a/jscomp/bsb/bsb_warning.ml
+++ /dev/null
@@ -1,98 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 warning_error =
-  | Warn_error_false
-  (* default [false] to make our changes non-intrusive *)
-  | Warn_error_true
-  | Warn_error_number of string
-
-type t0 = { number : string option; error : warning_error }
-
-type nonrec t = t0 option
-
-let use_default = None
-
-let prepare_warning_concat ~(beg : bool) s =
-  let s = Ext_string.trim s in
-  if s = "" then s
-  else
-    match s.[0] with
-    | '0' .. '9' -> if beg then "-w +" ^ s else "+" ^ s
-    | 'a' .. 'z' -> if beg then "-w " ^ s else "-" ^ s
-    | 'A' .. 'Z' -> if beg then "-w " ^ s else "+" ^ s
-    | _ -> if beg then "-w " ^ s else s
-
-let to_merlin_string x =
-  "-w " ^ Bsc_warnings.defaults_w
-  ^
-  let customize =
-    match x with
-    | Some { number = None } | None -> Ext_string.empty
-    | Some { number = Some x } -> prepare_warning_concat ~beg:false x
-  in
-  if customize = "" then customize else customize ^ "-40-42-61"
-(* see #4406 to avoid user pass A
-   Sync up with {!Warnings.report}
-*)
-
-let from_map (m : Ext_json_types.t Map_string.t) =
-  let number_opt = Map_string.find_opt m Bsb_build_schemas.number in
-  let error_opt = Map_string.find_opt m Bsb_build_schemas.error in
-  match (number_opt, error_opt) with
-  | None, None -> None
-  | _, _ ->
-      let error =
-        match error_opt with
-        | Some (True _) -> Warn_error_true
-        | Some (False _) -> Warn_error_false
-        | Some (Str { str }) -> Warn_error_number str
-        | Some x -> Bsb_exception.config_error x "expect true/false or string"
-        | None -> Warn_error_false
-        (* To make it less intrusive : warning error has to be enabled*)
-      in
-      let number =
-        match number_opt with
-        | Some (Str { str = number }) -> Some number
-        | None -> None
-        | Some x -> Bsb_exception.config_error x "expect a string"
-      in
-      Some { number; error }
-
-let to_bsb_string ~(package_kind : Bsb_package_kind.t) warning =
-  match package_kind with
-  | Toplevel | Pinned_dependency _ -> (
-      match warning with
-      | None -> Ext_string.empty
-      | Some warning -> (
-          (match warning.number with
-          | None -> Ext_string.empty
-          | Some x -> prepare_warning_concat ~beg:true x)
-          ^
-          match warning.error with
-          | Warn_error_true -> " -warn-error A"
-          | Warn_error_number y -> " -warn-error " ^ y
-          | Warn_error_false -> Ext_string.empty))
-  | Dependency _ -> " -w a"
-(* TODO: this is the current default behavior *)
diff --git a/jscomp/bsb/bsb_warning.mli b/jscomp/bsb/bsb_warning.mli
deleted file mode 100644
index b04fb6f..0000000
--- a/jscomp/bsb/bsb_warning.mli
+++ /dev/null
@@ -1,45 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 warning_error =
-  | Warn_error_false
-  (* default [false] to make our changes non-intrusive *)
-  | Warn_error_true
-  | Warn_error_number of string
-
-type t0 = { number : string option; error : warning_error }
-
-type nonrec t = t0 option
-
-
-val to_merlin_string : t -> string
-(** Extra work is need to make merlin happy *)
-
-val from_map : Ext_json_types.t Map_string.t -> t
-
-val to_bsb_string : package_kind:Bsb_package_kind.t -> t -> string
-(** [to_bsb_string not_dev warning]
-*)
-
-val use_default : t
diff --git a/jscomp/bsb/bsb_watcher_gen.ml b/jscomp/bsb/bsb_watcher_gen.ml
deleted file mode 100644
index f72c183..0000000
--- a/jscomp/bsb/bsb_watcher_gen.ml
+++ /dev/null
@@ -1,49 +0,0 @@
-(* Copyright (C) 2017- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let kvs = Ext_json_noloc.kvs
-
-let arr = Ext_json_noloc.arr
-
-let str = Ext_json_noloc.str
-
-let generate_sourcedirs_meta ~name (res : Bsb_file_groups.t) =
-  let v =
-    kvs
-      [
-        ("dirs", arr (Ext_array.of_list_map res.files (fun x -> str x.dir)));
-        ( "generated",
-          arr
-            (Array.of_list
-            @@ Ext_list.fold_left res.files [] (fun acc x ->
-                   Ext_list.flat_map_append x.generators acc (fun x ->
-                       Ext_list.map x.output str))) );
-        ( "pkgs",
-          arr
-            (Array.of_list
-               (Bsb_pkg.to_list (fun pkg path ->
-                    arr [| str (Bsb_pkg_types.to_string pkg); str path |]))) );
-      ]
-  in
-  Ext_json_noloc.to_file name v
diff --git a/jscomp/bsb/bsb_watcher_gen.mli b/jscomp/bsb/bsb_watcher_gen.mli
deleted file mode 100644
index 6e2b989..0000000
--- a/jscomp/bsb/bsb_watcher_gen.mli
+++ /dev/null
@@ -1,33 +0,0 @@
-(* Copyright (C) 2017- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val generate_sourcedirs_meta : name:string -> Bsb_file_groups.t -> unit
-(** This module try to generate some meta data so that
-    everytime [bsconfig.json] is reload, we can re-read
-    such meta data changes in the watcher.
-
-    Another way of doing it is processing [bsconfig.json] 
-    directly in [watcher] but that would 
-    mean the duplication of logic in [bsb] and [bsb_watcher]
-*)
diff --git a/jscomp/bsb/bsb_world.ml b/jscomp/bsb/bsb_world.ml
deleted file mode 100644
index 30b776c..0000000
--- a/jscomp/bsb/bsb_world.ml
+++ /dev/null
@@ -1,100 +0,0 @@
-(* Copyright (C) 2017- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ( // ) = Ext_path.combine
-let vendor_ninja = Bsb_global_paths.vendor_ninja
-
-let make_world_deps cwd (config : Bsb_config_types.t option)
-    (ninja_args : string array) warn_as_error =
-  let package_specs, jsx, uncurried, pinned_dependencies =
-    match config with
-    | None ->
-        (* When this running bsb does not read rescript.json,
-           we will read such json file to know which [package-specs]
-           it wants
-        *)
-        Bsb_config_parse.deps_from_bsconfig ()
-    | Some config ->
-        (config.package_specs, config.jsx, config.uncurried, config.pinned_dependencies)
-  in
-  let args =
-    if Ext_array.is_empty ninja_args then [| vendor_ninja |]
-    else Array.append [| vendor_ninja |] ninja_args
-  in
-  let lib_artifacts_dir = Bsb_config.lib_bs in
-  let queue = Bsb_build_util.walk_all_deps cwd ~pinned_dependencies in
-  (* let oc = open_out_bin ".deps.log" in
-     queue |> Queue.iter (fun ({top; proj_dir} : Bsb_build_util.package_context) ->
-     match top with
-     | Expect_none -> ()
-     | Expect_name s ->
-      output_string oc s ;
-      output_string oc " : ";
-      output_string oc proj_dir;
-      output_string oc "\n"
-     );
-     close_out oc ; *)
-  queue
-  |> Queue.iter (fun ({ top; proj_dir; is_pinned } : Bsb_build_util.package_context) ->
-         match top with
-         | Expect_none -> ()
-         | Expect_name s ->
-             if is_pinned then print_endline ("Dependency pinned on " ^ s)
-             else print_endline ("Dependency on " ^ s);
-             let lib_bs_dir = proj_dir // lib_artifacts_dir in
-             Bsb_build_util.mkp lib_bs_dir;
-             let _config : _ option =
-               Bsb_ninja_regen.regenerate_ninja
-                 ~package_kind:
-                   (if is_pinned then Pinned_dependency { package_specs; jsx; uncurried }
-                   else Dependency { package_specs; jsx; uncurried })
-                 ~per_proj_dir:proj_dir ~forced:false
-                 ~warn_legacy_config:false
-                 ~warn_as_error:(if is_pinned then warn_as_error else None)
-             in
-             let command =
-               { Bsb_unix.cmd = vendor_ninja; cwd = lib_bs_dir; args }
-             in
-             let eid = Bsb_unix.run_command_execv command in
-             if eid <> 0 then Bsb_unix.command_fatal_error command eid;
-             (* When ninja is not regenerated, ninja will still do the build,
-                still need reinstall check
-                Note that we can check if ninja print "no work to do",
-                then don't need reinstall more
-             *)
-             Bsb_log.info "@{<info>Installation started@}@.";
-             let install_dir = proj_dir // "lib" // "ocaml" in
-             Bsb_build_util.mkp install_dir;
-             let install_command =
-               {
-                 Bsb_unix.cmd = vendor_ninja;
-                 cwd = install_dir;
-                 args =
-                   [| vendor_ninja; "-f"; ".." // "bs" // "install.ninja" |];
-               }
-             in
-             let eid = Bsb_unix.run_command_execv install_command in
-             if eid <> 0 then Bsb_unix.command_fatal_error install_command eid;
-             Bsb_log.info "@{<info>Installation finished@}@.");
-  print_endline "Dependency Finished"
diff --git a/jscomp/bsb/bsb_world.mli b/jscomp/bsb/bsb_world.mli
deleted file mode 100644
index 123f63e..0000000
--- a/jscomp/bsb/bsb_world.mli
+++ /dev/null
@@ -1,26 +0,0 @@
-(* Copyright (C) 2017- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val make_world_deps :
-  string -> Bsb_config_types.t option -> string array -> string option -> unit
diff --git a/jscomp/bsb/data_format.md b/jscomp/bsb/data_format.md
deleted file mode 100644
index a47acf0..0000000
--- a/jscomp/bsb/data_format.md
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-# format about lib/bs/.bsbuild
-
-This file (in binary) contains all file info needed in build.
-
-It is encoded in bsb_db_encode.ml and bsb_db_decode.ml, the format is optimized for performance in decoding where it is used most.
-
-
-- The first 16 chars is digest of the following content
-
-The rest is encoding for each group (source code and test), in most cases, you have one group or two groups (one for lib one for test).
-
-Begining with a new line, the number of total groups (encoded in text format) are encoded.
-
-
-For each group, it starts with a newline and the
-number of modules (text format).
-
-The following are list of modules in sorted order (Ext_string.compare) separated by newline.
-
-The following are list of directories separated by tab character.
-
-The next is a fixed length for module description, its encoding is hard coded in Bsb_db_encode.make_encoding
\ No newline at end of file
diff --git a/jscomp/bsb/dune b/jscomp/bsb/dune
deleted file mode 100644
index c4366af..0000000
--- a/jscomp/bsb/dune
+++ /dev/null
@@ -1,6 +0,0 @@
-(library
- (name bsb)
- (wrapped false)
- (flags
-  (:standard -w -A))
- (libraries common ext str unix))
diff --git a/jscomp/bsb_exe/.ocamlformat b/jscomp/bsb_exe/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/bsb_exe/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/bsb_exe/dune b/jscomp/bsb_exe/dune
deleted file mode 100644
index 491fbc0..0000000
--- a/jscomp/bsb_exe/dune
+++ /dev/null
@@ -1,13 +0,0 @@
-(env
- (static
-  (flags
-   (:standard -ccopt -static))))
-
-(executable
- (name rescript_main)
- (public_name rescript)
- (enabled_if
-  (<> %{profile} browser))
- (flags
-  (:standard -w +a-4-9-40-41-42-70))
- (libraries bsb common ext str unix))
diff --git a/jscomp/bsb_exe/rescript_main.ml b/jscomp/bsb_exe/rescript_main.ml
deleted file mode 100644
index 3e29b33..0000000
--- a/jscomp/bsb_exe/rescript_main.ml
+++ /dev/null
@@ -1,252 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let () = Bsb_log.setup ()
-
-let separator = "--"
-
-let no_deps_mode = ref false
-
-let do_install = ref false
-
-let warning_as_error = ref None
-
-let force_regenerate = ref false
-
-type spec = Bsb_arg.spec
-
-let call_spec f : spec = Unit (Unit_call f)
-
-let unit_set_spec b : spec = Unit (Unit_set b)
-
-let string_set_spec s : spec = String (String_set s)
-
-let string_call f: spec = String (String_call f)
-
-let failed_annon ~rev_args =
-  match rev_args with
-  | x :: _ -> Bsb_arg.bad_arg ("Don't know what to do with " ^ x)
-  | _ -> ()
-
-(*Note that [keepdepfile] only makes sense when combined with [deps] for optimization*)
-
-(**  Invariant: it has to be the last command of [bsb] *)
-let exec_command_then_exit (type t) (command : string) : t =
-  Bsb_log.info "@{<info>CMD:@} %s@." command;
-  exit (Sys.command command)
-
-(* Execute the underlying ninja build call, then exit (as opposed to keep watching) *)
-let ninja_command_exit (type t) (ninja_args : string array) : t =
-  let ninja_args_len = Array.length ninja_args in
-  let lib_artifacts_dir = Bsb_config.lib_bs in
-  if Ext_sys.is_windows_or_cygwin then
-    let path_ninja = Filename.quote Bsb_global_paths.vendor_ninja in
-    exec_command_then_exit
-      (if ninja_args_len = 0 then
-       Ext_string.inter3 path_ninja "-C" lib_artifacts_dir
-      else
-        let args =
-          Array.append [| path_ninja; "-C"; lib_artifacts_dir |] ninja_args
-        in
-        Ext_string.concat_array Ext_string.single_space args)
-  else
-    let ninja_common_args = [| "ninja.exe"; "-C"; lib_artifacts_dir |] in
-    let args =
-      if ninja_args_len = 0 then ninja_common_args
-      else Array.append ninja_common_args ninja_args
-    in
-    Bsb_log.info_args args;
-    Unix.execvp Bsb_global_paths.vendor_ninja args
-
-(**
-   Cache files generated:
-   - .bsdircache in project root dir
-   - .bsdeps in builddir
-
-   What will happen, some flags are really not good
-   ninja -C _build
-*)
-let clean_usage =
-  "Usage: rescript clean <options>\n\n\
-   `rescript clean` cleans build artifacts\n"
-
-let build_usage =
-  "Usage: rescript build <options> -- <ninja_options>\n\n\
-   `rescript build` builds the project with dependencies\n\n\
-   `rescript build -- -h` for Ninja options (internal usage only; unstable)\n"
-
-let install_target () =
-  let ( // ) = Filename.concat in
-  let vendor_ninja = Bsb_global_paths.vendor_ninja in
-  let install_dir = "lib" // "ocaml" in
-  Bsb_build_util.mkp install_dir;
-  let install_command =
-    {
-      Bsb_unix.cmd = vendor_ninja;
-      cwd = install_dir;
-      args = [| vendor_ninja; "-f"; ".." // "bs" // "install.ninja" |];
-    }
-  in
-  let eid = Bsb_unix.run_command_execv install_command in
-  if eid <> 0 then Bsb_unix.command_fatal_error install_command eid
-
-let build_subcommand ~start argv argv_len =
-  let i = Ext_array.rfind_with_index argv Ext_string.equal separator in
-
-  Bsb_arg.parse_exn ~usage:build_usage ~start
-    ?finish:(if i < 0 then None else Some i)
-    ~argv
-    [|
-      ("-w", unit_set_spec (ref false), "Watch mode");
-      ( "-ws",
-        string_set_spec (ref ""),
-        "[host]:port set up host & port for WebSocket build notifications" );
-      ("-verbose", call_spec Bsb_log.verbose, "Set the output to be verbose");
-      ("-with-deps", unit_set_spec (ref true), "*deprecated* This is the default behavior now. This option will be removed in a future release");
-      ( "-install",
-        unit_set_spec do_install,
-        "*internal* Install public interface files for dependencies" );
-      (* This should be put in a subcommand
-         previously it works with the implication `bsb && bsb -install`
-      *)
-      ( "-regen",
-        unit_set_spec force_regenerate,
-        "*internal* \n\
-         Always regenerate build.ninja no matter bsconfig.json is changed or \
-         not" );
-      ("-no-deps", unit_set_spec no_deps_mode, "*internal* Needed for watcher to build without dependencies on file change");
-      ("-warn-error", string_call (fun s -> warning_as_error := Some s), "Warning numbers and whether to turn them into errors, e.g., \"+8+32-102\"")
-    |]
-    failed_annon;
-
-  let ninja_args =
-    if i < 0 then [||] else Array.sub argv (i + 1) (argv_len - i - 1)
-  in
-  match ninja_args with
-  | [| "-h" |] -> ninja_command_exit ninja_args
-  | _ ->
-      let warn_as_error = match !warning_as_error with
-      | Some s ->
-        let () = try Warnings.parse_options true s with Arg.Bad msg -> Bsb_arg.bad_arg (msg ^ "\n") in
-        Some s
-      | None -> None in
-      let config_opt =
-        Bsb_ninja_regen.regenerate_ninja
-          ~package_kind:Toplevel
-          ~per_proj_dir:Bsb_global_paths.cwd
-          ~forced:!force_regenerate
-          ~warn_legacy_config:true
-          ~warn_as_error
-        in
-      if not !no_deps_mode then Bsb_world.make_world_deps Bsb_global_paths.cwd config_opt ninja_args warn_as_error;
-      if !do_install then install_target ();
-      ninja_command_exit ninja_args
-
-let clean_subcommand ~start argv =
-  Bsb_arg.parse_exn ~usage:clean_usage ~start ~argv
-    [|
-      ("-verbose", call_spec Bsb_log.verbose, "Set the output to be verbose");
-      ( "-with-deps",
-        unit_set_spec (ref true),
-        "*deprecated* This is the default behavior now. This option will be removed in a future release" );
-    |]
-    failed_annon;
-  Bsb_clean.clean_bs_deps Bsb_global_paths.cwd;
-  Bsb_clean.clean_self Bsb_global_paths.cwd
-
-let list_files = ref false
-
-let info_subcommand ~start argv =
-  Bsb_arg.parse_exn ~usage:"query the project" ~start ~argv
-    [| ("-list-files", unit_set_spec list_files, "list source files") |]
-    (fun ~rev_args ->
-      (match rev_args with
-      | x :: _ -> raise (Bsb_arg.Bad ("Don't know what to do with " ^ x))
-      | [] -> ());
-      if !list_files then
-        match
-          Bsb_ninja_regen.regenerate_ninja
-            ~package_kind:Toplevel
-            ~per_proj_dir:Bsb_global_paths.cwd
-            ~forced:true
-            ~warn_legacy_config:true
-            ~warn_as_error:None
-        with
-        | None -> assert false
-        | Some { file_groups = { files } } ->
-            Ext_list.iter files (fun { sources } ->
-                Map_string.iter sources
-                  (fun _ { info; syntax_kind; name_sans_extension } ->
-                    let extensions =
-                      match (syntax_kind, info) with
-                      | _, Intf -> assert false
-                      | Ml, Impl -> [ ".ml" ]
-                      | Ml, Impl_intf -> [ ".ml"; ".mli" ]
-                      | Res, Impl -> [ ".res" ]
-                      | Res, Impl_intf -> [ ".res"; ".resi" ]
-                    in
-                    Ext_list.iter extensions (fun x ->
-                        print_endline (name_sans_extension ^ x)))))
-
-(* see discussion #929, if we catch the exception, we don't have stacktrace... *)
-let () =
-  let argv = Sys.argv in
-  let argv_len = Array.length argv in
-  try
-    if argv_len = 1 then (
-      (* specialize this path which is used in watcher *)
-      let config_opt =
-        Bsb_ninja_regen.regenerate_ninja
-          ~package_kind:Toplevel
-          ~per_proj_dir:Bsb_global_paths.cwd
-          ~forced:false
-          ~warn_legacy_config:true
-          ~warn_as_error:None
-      in
-      Bsb_world.make_world_deps Bsb_global_paths.cwd config_opt [||] None;
-      ninja_command_exit [||])
-    else
-      match argv.(1) with
-      | "build" -> build_subcommand ~start:2 argv argv_len
-      | "clean" -> clean_subcommand ~start:2 argv
-      | "info" ->
-          (* internal *)
-          info_subcommand ~start:2 argv
-      | first_arg ->
-          prerr_endline @@ "Unknown subcommand or flags: " ^ first_arg;
-          exit 1
-  with
-  | Bsb_exception.Error e ->
-      Bsb_exception.print Format.err_formatter e;
-      Format.pp_print_newline Format.err_formatter ();
-      exit 2
-  | Ext_json_parse.Error (start, _, e) ->
-      Format.fprintf Format.err_formatter
-        "File %S, line %d\n@{<error>Error:@} %a@." start.pos_fname
-        start.pos_lnum Ext_json_parse.report_error e;
-      exit 2
-  | Bsb_arg.Bad s | Sys_error s ->
-      Format.fprintf Format.err_formatter "@{<error>Error:@} %s" s;
-      exit 2
-  | e -> Ext_pervasives.reraise e
diff --git a/jscomp/bsb_exe/rescript_main.mli b/jscomp/bsb_exe/rescript_main.mli
deleted file mode 100644
index aa4fd33..0000000
--- a/jscomp/bsb_exe/rescript_main.mli
+++ /dev/null
@@ -1,23 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
diff --git a/jscomp/bsb_helper/.ocamlformat b/jscomp/bsb_helper/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/bsb_helper/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/bsb_helper/bsb_db_decode.ml b/jscomp/bsb_helper/bsb_db_decode.ml
deleted file mode 100644
index f3f1d6c..0000000
--- a/jscomp/bsb_helper/bsb_db_decode.ml
+++ /dev/null
@@ -1,121 +0,0 @@
-(* Copyright (C) 2019 - Present Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let bsbuild_cache = Literals.bsbuild_cache
-
-type group =
-  | Dummy
-  | Group of {
-      modules : string array;
-      dir_length : int;
-      dir_info_offset : int;
-      module_info_offset : int;
-    }
-
-type t = {
-  lib : group;
-  dev : group;
-  content : string; (* string is whole content*)
-}
-
-type cursor = int ref
-
-(*TODO: special case when module_count is zero *)
-let rec decode (x : string) : t =
-  let (offset : cursor) = ref 0 in
-  let lib = decode_single x offset in
-  let dev = decode_single x offset in
-  { lib; dev; content = x }
-
-and decode_single (x : string) (offset : cursor) : group =
-  let module_number = Ext_pervasives.parse_nat_of_string x offset in
-  incr offset;
-  if module_number <> 0 then (
-    let modules = decode_modules x offset module_number in
-    let dir_info_offset = !offset in
-    let module_info_offset = String.index_from x dir_info_offset '\n' + 1 in
-    let dir_length = Char.code x.[module_info_offset] - 48 (* Char.code '0'*) in
-    offset := module_info_offset + 1 + (dir_length * module_number) + 1;
-    Group { modules; dir_info_offset; module_info_offset; dir_length })
-  else Dummy
-
-and decode_modules (x : string) (offset : cursor) module_number : string array =
-  let result = Array.make module_number "" in
-  let last = ref !offset in
-  let cur = ref !offset in
-  let tasks = ref 0 in
-  while !tasks <> module_number do
-    if String.unsafe_get x !cur = '\n' then (
-      let offs = !last in
-      let len = !cur - !last in
-      Array.unsafe_set result !tasks (Ext_string.unsafe_sub x offs len);
-      incr tasks;
-      last := !cur + 1);
-    incr cur
-  done;
-  offset := !cur;
-  result
-
-(* TODO: shall we check the consistency of digest *)
-let read_build_cache ~dir : t =
-  let all_content = Ext_io.load_file (Filename.concat dir bsbuild_cache) in
-  decode all_content
-
-type module_info = { case : bool; (* which is Bsb_db.case*) dir_name : string }
-
-let find_opt ({ content = whole } as db : t) lib (key : string) :
-    module_info option =
-  match if lib then db.lib else db.dev with
-  | Dummy -> None
-  | Group ({ modules } as group) -> (
-      let i = Ext_string_array.find_sorted modules key in
-      match i with
-      | None -> None
-      | Some count ->
-          let encode_len = group.dir_length in
-          let index =
-            Ext_string.get_1_2_3_4 whole
-              ~off:(group.module_info_offset + 1 + (count * encode_len))
-              encode_len
-          in
-          let case = not (index mod 2 = 0) in
-          let ith = index lsr 1 in
-          let dir_name_start =
-            if ith = 0 then group.dir_info_offset
-            else Ext_string.index_count whole group.dir_info_offset '\t' ith + 1
-          in
-          let dir_name_finish = String.index_from whole dir_name_start '\t' in
-          Some
-            {
-              case;
-              dir_name =
-                String.sub whole dir_name_start
-                  (dir_name_finish - dir_name_start);
-            })
-
-let find db dependent_module is_not_lib_dir =
-  let opt = find_opt db true dependent_module in
-  match opt with
-  | Some _ -> opt
-  | None -> if is_not_lib_dir then find_opt db false dependent_module else None
diff --git a/jscomp/bsb_helper/bsb_db_decode.mli b/jscomp/bsb_helper/bsb_db_decode.mli
deleted file mode 100644
index b6e2ccf..0000000
--- a/jscomp/bsb_helper/bsb_db_decode.mli
+++ /dev/null
@@ -1,53 +0,0 @@
-(* Copyright (C) 2019 - Present Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 group = private
-  | Dummy
-  | Group of {
-      modules : string array;
-      dir_length : int;
-      dir_info_offset : int;
-      module_info_offset : int;
-    }
-
-type t = {
-  lib : group;
-  dev : group;
-  content : string; (* string is whole content*)
-}
-
-val read_build_cache : dir:string -> t
-
-type module_info = { case : bool; (* Bsb_db.case*) dir_name : string }
-
-val find :
-  t ->
-  (* contains global info *)
-  string ->
-  (* module name *)
-  bool ->
-  (* more likely to be zero *)
-  module_info option
-
-val decode : string -> t
diff --git a/jscomp/bsb_helper/bsb_helper_depfile_gen.ml b/jscomp/bsb_helper/bsb_helper_depfile_gen.ml
deleted file mode 100644
index f91854e..0000000
--- a/jscomp/bsb_helper/bsb_helper_depfile_gen.ml
+++ /dev/null
@@ -1,172 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let dep_lit = " :"
-
-let write_buf name buf =
-  let oc = open_out_bin name in
-  Ext_buffer.output_buffer oc buf;
-  close_out oc
-
-(* should be good for small file *)
-let load_file name (buf : Ext_buffer.t) : unit =
-  let len = Ext_buffer.length buf in
-  let ic = open_in_bin name in
-  let n = in_channel_length ic in
-  if n <> len then (
-    close_in ic;
-    write_buf name buf)
-  else
-    let holder = really_input_string ic n in
-    close_in ic;
-    if Ext_buffer.not_equal buf holder then write_buf name buf
-
-let write_file name (buf : Ext_buffer.t) =
-  if Sys.file_exists name then load_file name buf else write_buf name buf
-
-(* return an non-decoded string *)
-let extract_dep_raw_string (fn : string) : string =
-  let ic = open_in_bin fn in
-  let size = input_binary_int ic in
-  let s = really_input_string ic size in
-  close_in ic;
-  s
-
-(* Make sure it is the same as {!Binary_ast.magic_sep_char}*)
-let magic_sep_char = '\n'
-
-let deps_of_channel (ic : in_channel) : string list =
-  let size = input_binary_int ic in
-  let s = really_input_string ic size in
-  let rec aux (s : string) acc (offset : int) size : string list =
-    if offset < size then
-      let next_tab = String.index_from s offset magic_sep_char in
-      aux s (String.sub s offset (next_tab - offset) :: acc) (next_tab + 1) size
-    else acc
-  in
-  aux s [] 1 size
-
-(** Please refer to {!Binary_ast} for encoding format, we move it here 
-    mostly for cutting the dependency so that [bsb_helper.exe] does
-    not depend on compler-libs
-*)
-(* let read_deps (fn : string) : string list =
-   let ic = open_in_bin fn in
-   let v = deps_of_channel ic in
-   close_in ic;
-   v
-*)
-
-let output_file (buf : Ext_buffer.t) source namespace =
-  Ext_buffer.add_string buf (Ext_namespace_encode.make ?ns:namespace source)
-
-(** for rescript artifacts 
-    [lhs_suffix] is [.cmj]
-    [rhs_suffix] 
-    is [.cmj] if it has [ml] (in this case does not care about mli or not)
-    is [.cmi] if it has [mli]
-*)
-let oc_cmi buf namespace source =
-  Ext_buffer.add_char buf ' ';
-  output_file buf source namespace;
-  Ext_buffer.add_string buf Literals.suffix_cmi
-
-(* For cases with self cycle
-     e.g, in b.ml
-    {[
-      include B
-    ]}
-     When ns is not turned on, it makes sense that b may come from third party package.
-     Hoever, this case is wont supported.
-     It complicates when it has interface file or not.
-    - if it has interface file, the current interface will have priority, failed to build?
-    - if it does not have interface file, the build will not open this module at all(-bs-read-cmi)
-
-     When ns is turned on, `B` is interprted as `Ns-B` which is a cyclic dependency,
-     it can be errored out earlier
-
-   #5368: It turns out there are many false positives on detecting self-cycles (see: `jscomp/build_tests/zerocycle`)
-          To properly solve this, we would need to `jscomp/ml/depend.ml` because
-            cmi and cmj is broken in the first place (same problem as in ocaml/ocaml#4618).
-          So we will just ignore the self-cycles. Even if there is indeed a self-cycle, it should fail to compile anyway.
-*)
-let oc_deps (ast_file : string) (is_dev : bool) (db : Bsb_db_decode.t)
-    (namespace : string option) (buf : Ext_buffer.t) (kind : [ `impl | `intf ])
-    : unit =
-  (* TODO: move namespace upper, it is better to resolve ealier *)
-  let cur_module_name = Ext_filename.module_name ast_file in
-  let at_most_once : unit lazy_t =
-    lazy
-      (output_file buf (Ext_filename.chop_extension_maybe ast_file) namespace;
-       Ext_buffer.add_string buf
-         (if kind = `impl then Literals.suffix_cmj else Literals.suffix_cmi);
-       (* print the source *)
-       Ext_buffer.add_string buf dep_lit)
-  in
-  (match namespace with
-  | None -> ()
-  | Some ns ->
-      Lazy.force at_most_once;
-      Ext_buffer.add_char buf ' ';
-      Ext_buffer.add_string buf ns;
-      Ext_buffer.add_string buf Literals.suffix_cmi (* always cmi *));
-  (* TODO: moved into static files*)
-  let s = extract_dep_raw_string ast_file in
-  let offset = ref 1 in
-  let size = String.length s in
-  while !offset < size do
-    let next_tab = String.index_from s !offset magic_sep_char in
-    let dependent_module = String.sub s !offset (next_tab - !offset) in
-    (if dependent_module = cur_module_name then
-     (*prerr_endline ("FAILED: " ^ cur_module_name ^ " has a self cycle");
-       exit 2*)
-     (* #5368 ignore self dependencies *) ()
-    else
-      match Bsb_db_decode.find db dependent_module is_dev with
-      | None -> ()
-      | Some { dir_name; case } ->
-          Lazy.force at_most_once;
-          let source =
-            Filename.concat dir_name
-              (if case then dependent_module
-              else Ext_string.uncapitalize_ascii dependent_module)
-          in
-          Ext_buffer.add_char buf ' ';
-          if kind = `impl then (
-            output_file buf source namespace;
-            Ext_buffer.add_string buf Literals.suffix_cmj);
-          (* #3260 cmj changes does not imply cmi change anymore *)
-          oc_cmi buf namespace source);
-    offset := next_tab + 1
-  done;
-  if Lazy.is_val at_most_once then Ext_buffer.add_char buf '\n'
-
-let emit_d (is_dev : bool) (namespace : string option) (mlast : string)
-    (mliast : string) =
-  let data = Bsb_db_decode.read_build_cache ~dir:Filename.current_dir_name in
-  let buf = Ext_buffer.create 2048 in
-  let filename = Ext_filename.new_extension mlast Literals.suffix_d in
-  oc_deps mlast is_dev data namespace buf `impl;
-  if mliast <> "" then oc_deps mliast is_dev data namespace buf `intf;
-  write_file filename buf
diff --git a/jscomp/bsb_helper/bsb_helper_depfile_gen.mli b/jscomp/bsb_helper/bsb_helper_depfile_gen.mli
deleted file mode 100644
index 840ccb7..0000000
--- a/jscomp/bsb_helper/bsb_helper_depfile_gen.mli
+++ /dev/null
@@ -1,36 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val deps_of_channel : in_channel -> string list
-(** [deps_of_channel ic]
-    given an input_channel dumps all modules it depend on, only used for debugging 
-*)
-
-val emit_d :
-  bool ->
-  string option ->
-  string ->
-  string ->
-  (* empty string means no mliast *)
-  unit
diff --git a/jscomp/bsb_helper/bsb_helper_extract.ml b/jscomp/bsb_helper/bsb_helper_extract.ml
deleted file mode 100644
index 91882e0..0000000
--- a/jscomp/bsb_helper/bsb_helper_extract.ml
+++ /dev/null
@@ -1,36 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let read_dependency_graph_from_mlast_file fn =
-  let ic = open_in_bin fn in
-  try
-    let dep_size = input_binary_int ic in
-    let dep_data = really_input_string ic dep_size in
-    let splitted_data = Ext_string.split dep_data '\n' in
-    let set = Set_string.of_list splitted_data in
-    close_in ic;
-    set
-  with exn ->
-    close_in ic;
-    raise exn
diff --git a/jscomp/bsb_helper/bsb_helper_extract.mli b/jscomp/bsb_helper/bsb_helper_extract.mli
deleted file mode 100644
index 5538fa0..0000000
--- a/jscomp/bsb_helper/bsb_helper_extract.mli
+++ /dev/null
@@ -1,26 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* This reads the header part of the mlast file, which simply encodes a set that indicates all of the deps of the current library. *)
-val read_dependency_graph_from_mlast_file : string -> Set_string.t
diff --git a/jscomp/bsb_helper/dune b/jscomp/bsb_helper/dune
deleted file mode 100644
index ba6da72..0000000
--- a/jscomp/bsb_helper/dune
+++ /dev/null
@@ -1,6 +0,0 @@
-(library
- (name bsb_helper)
- (wrapped false)
- (flags
-  (:standard -w -A))
- (libraries ext))
diff --git a/jscomp/bsb_helper_exe/.ocamlformat b/jscomp/bsb_helper_exe/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/bsb_helper_exe/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/bsb_helper_exe/bsb_helper_main.ml b/jscomp/bsb_helper_exe/bsb_helper_main.ml
deleted file mode 100644
index adbbba6..0000000
--- a/jscomp/bsb_helper_exe/bsb_helper_main.ml
+++ /dev/null
@@ -1,53 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let () =
-  let namespace = ref None in
-  let dev_group = ref false in
-  let argv = Sys.argv in
-  let l = Array.length argv in
-  let current = ref 1 in
-  let rev_list = ref [] in
-  while !current < l do
-    let s = argv.(!current) in
-    incr current;
-    if s <> "" && s.[0] = '-' then (
-      match s with
-      | "-hash" -> incr current
-      | "-bs-ns" ->
-          let ns = argv.(!current) in
-          namespace := Some ns;
-          incr current
-      | "-g" -> dev_group := true
-      | s ->
-          prerr_endline ("unknown options: " ^ s);
-          prerr_endline "available options: -hash [hash]; -bs-ns [ns]; -g";
-          exit 2)
-    else rev_list := s :: !rev_list
-  done;
-  match !rev_list with
-  | [ x ] -> Bsb_helper_depfile_gen.emit_d !dev_group !namespace x ""
-  | [ y; x ] (* reverse order *) ->
-      Bsb_helper_depfile_gen.emit_d !dev_group !namespace x y
-  | _ -> ()
diff --git a/jscomp/bsb_helper_exe/bsb_helper_main.mli b/jscomp/bsb_helper_exe/bsb_helper_main.mli
deleted file mode 100644
index f30aaad..0000000
--- a/jscomp/bsb_helper_exe/bsb_helper_main.mli
+++ /dev/null
@@ -1,34 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Used to generate .d file, for example 
-    {[
-      bsb_helper.exe -g 0 -MD  src/hi/hello.ml
-    ]}
-    It will read the cache file and generate the corresponding
-    [.d] file. This [.d] file will be used as attribute [depfile]
-    whether we use namespace or not, the filename of [.mlast], [.d] 
-    should be kept the same, we only need change the name of [.cm*]
-    and the contents of filename in [.d]
-*)
diff --git a/jscomp/bsb_helper_exe/dune b/jscomp/bsb_helper_exe/dune
deleted file mode 100644
index 30e1846..0000000
--- a/jscomp/bsb_helper_exe/dune
+++ /dev/null
@@ -1,13 +0,0 @@
-(env
- (static
-  (flags
-   (:standard -ccopt -static))))
-
-(executable
- (name bsb_helper_main)
- (public_name bsb_helper)
- (enabled_if
-  (<> %{profile} browser))
- (flags
-  (:standard -w -A))
- (libraries bsb_helper))
diff --git a/jscomp/bsc/.ocamlformat b/jscomp/bsc/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/bsc/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/bsc/dune b/jscomp/bsc/dune
deleted file mode 100644
index a1ff7f8..0000000
--- a/jscomp/bsc/dune
+++ /dev/null
@@ -1,11 +0,0 @@
-(env
- (static
-  (flags
-   (:standard -ccopt -static))))
-
-(executable
- (name rescript_compiler_main)
- (public_name bsc)
- (flags
-  (:standard -w -A))
- (libraries common core depends gentype js_parser syntax))
diff --git a/jscomp/bsc/rescript_compiler_main.ml b/jscomp/bsc/rescript_compiler_main.ml
deleted file mode 100644
index 40b85d7..0000000
--- a/jscomp/bsc/rescript_compiler_main.ml
+++ /dev/null
@@ -1,545 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the Q Public License version 1.0.               *)
-(*                                                                     *)
-(***********************************************************************)
-
-
-let set_abs_input_name sourcefile =     
-  let sourcefile =   
-    if !Location.absname && Filename.is_relative  sourcefile then 
-      Ext_path.absolute_cwd_path sourcefile
-    else sourcefile in 
-  Location.set_input_name sourcefile;
-  sourcefile  
-
-type syntax_kind = [`ml | `rescript]
-let setup_compiler_printer (syntax_kind : [ syntax_kind | `default])= 
-  (match syntax_kind with 
-   | `default -> ()  
-   | #syntax_kind as k -> Config.syntax_kind := k);   
-  let syntax_kind = !Config.syntax_kind in
-  if syntax_kind = `rescript then begin
-    Lazy.force Res_outcome_printer.setup  
-  end  
-
-
-
-let setup_runtime_path path = 
-  let u0 = Filename.dirname path in 
-  let std = Filename.basename path in 
-  let _path = Filename.dirname u0 in 
-  let rescript = Filename.basename u0 in 
-  (match rescript.[0] with 
-   | '@' -> (* scoped package *)
-     Bs_version.package_name := rescript ^ "/" ^ std;
-   | _ -> Bs_version.package_name := std
-   | exception _ -> 
-     Bs_version.package_name := std);
-  Js_config.customize_runtime := Some path
-
-
-let process_file sourcefile ?(kind ) ppf = 
-  (* This is a better default then "", it will be changed later 
-     The {!Location.input_name} relies on that we write the binary ast 
-     properly
-  *)
-  let uncurried = !Config.uncurried in
-  let kind =
-    match kind with 
-    | None -> Ext_file_extensions.classify_input (Ext_filename.get_extension_maybe sourcefile)  
-    | Some kind -> kind in 
-  let res = match kind with 
-  | Ml ->
-    let sourcefile = set_abs_input_name  sourcefile in     
-    setup_compiler_printer `ml;
-    Js_implementation.implementation 
-      ~parser:Pparse_driver.parse_implementation
-      ppf sourcefile 
-  | Mli  ->   
-    let sourcefile = set_abs_input_name  sourcefile in   
-    setup_compiler_printer `ml;
-    Js_implementation.interface 
-      ~parser:Pparse_driver.parse_interface
-      ppf sourcefile 
-  | Res -> 
-    let sourcefile = set_abs_input_name  sourcefile in     
-    setup_compiler_printer `rescript;
-    Js_implementation.implementation 
-      ~parser:(Res_driver.parse_implementation ~ignoreParseErrors:!Clflags.ignore_parse_errors)
-      ppf sourcefile 
-  | Resi ->   
-    let sourcefile = set_abs_input_name  sourcefile in 
-    setup_compiler_printer `rescript;
-    Js_implementation.interface 
-      ~parser:(Res_driver.parse_interface ~ignoreParseErrors:!Clflags.ignore_parse_errors)
-      ppf sourcefile      
-  | Intf_ast 
-    ->     
-    Js_implementation.interface_mliast ppf sourcefile
-      setup_compiler_printer 
-  (* The printer setup is done in the runtime depends on
-     the content of ast
-  *)  
-  | Impl_ast 
-    -> 
-    Js_implementation.implementation_mlast ppf sourcefile 
-      setup_compiler_printer
-  | Mlmap 
-    -> 
-    Location.set_input_name  sourcefile;    
-    Js_implementation.implementation_map ppf sourcefile 
-  | Cmi
-    ->
-    setup_compiler_printer `default;
-    let cmi_sign = (Cmi_format.read_cmi sourcefile).cmi_sign in 
-    Printtyp.signature Format.std_formatter cmi_sign ; 
-    Format.pp_print_newline Format.std_formatter ()      
-  | Unknown -> 
-    Bsc_args.bad_arg ("don't know what to do with " ^ sourcefile)
-  in
-  Config.uncurried := uncurried;
-  res
-
-let reprint_source_file sourcefile = 
-  let uncurried = !Config.uncurried in
-  let kind = Ext_file_extensions.classify_input (Ext_filename.get_extension_maybe sourcefile) in
-  let sourcefile = set_abs_input_name sourcefile in
-  let res = match kind with 
-  | Res -> 
-    let parseResult =
-      Res_driver.parsingEngine.parseImplementation ~forPrinter:true ~filename:sourcefile
-    in
-    if parseResult.invalid then (
-      Res_diagnostics.printReport parseResult.diagnostics parseResult.source;
-      exit 1
-    );
-    Res_compmisc.init_path ();
-    parseResult.parsetree 
-    |> Cmd_ppx_apply.apply_rewriters ~restore:false ~tool_name:Js_config.tool_name Ml
-    |> Ppx_entry.rewrite_implementation
-    |> Res_printer.printImplementation ~width:100 ~comments:parseResult.comments 
-    |> print_endline
-  | Resi ->   
-    let parseResult =
-      Res_driver.parsingEngine.parseInterface ~forPrinter:true ~filename:sourcefile
-    in
-    if parseResult.invalid then (
-      Res_diagnostics.printReport parseResult.diagnostics parseResult.source;
-      exit 1
-    );
-    Res_compmisc.init_path ();
-    parseResult.parsetree 
-    |> Cmd_ppx_apply.apply_rewriters ~restore:false ~tool_name:Js_config.tool_name Mli
-    |> Ppx_entry.rewrite_signature
-    |> Res_printer.printInterface ~width:100 ~comments:parseResult.comments 
-    |> print_endline
-  | _ 
-    ->     
-    print_endline ("Invalid input for reprinting ReScript source. Must be a ReScript file: " ^ sourcefile);
-    exit 2
-  in
-  Config.uncurried := uncurried;
-  res
-
-let usage = "Usage: bsc <options> <files>\nOptions are:"
-
-let ppf = Format.err_formatter
-
-(* Error messages to standard error formatter *)
-
-let anonymous ~(rev_args : string list) =
-  if !Js_config.as_ppx then 
-    match rev_args with 
-    | [output; input] ->
-      Ppx_apply.apply_lazy
-        ~source:input
-        ~target:output
-        Ppx_entry.rewrite_implementation
-        Ppx_entry.rewrite_signature
-    | _ -> Bsc_args.bad_arg "Wrong format when use -as-ppx"
-  else 
-    begin 
-      match rev_args with 
-      | [filename] ->   
-        process_file filename ppf
-      | [] -> ()  
-      | _ -> 
-        if !Js_config.syntax_only then 
-          Ext_list.rev_iter rev_args (fun filename -> 
-              begin 
-                Clflags.reset_dump_state ();
-                Warnings.reset (); 
-                process_file filename ppf
-              end )
-        else 
-          Bsc_args.bad_arg "can not handle multiple files"
-    end
-
-(** used by -impl -intf *)
-let impl filename =
-  Js_config.js_stdout := false;  
-  process_file filename ~kind:Ml ppf ;;
-let intf filename =
-  Js_config.js_stdout := false ;  
-  process_file filename ~kind:Mli ppf;;
-
-
-let format_file input =  
-  let ext = Ext_file_extensions.classify_input (Ext_filename.get_extension_maybe input) in 
-  let syntax = 
-    match ext with 
-    | Ml | Mli -> `ml
-    | Res | Resi -> `res 
-    | _ -> Bsc_args.bad_arg ("don't know what to do with " ^ input) in   
-  let formatted = Res_multi_printer.print ~ignoreParseErrors:!Clflags.ignore_parse_errors syntax ~input in 
-  match !Clflags.output_name with 
-  | None ->
-    output_string stdout formatted
-  | Some fname -> 
-    Ext_io.write_file fname formatted
-
-let set_color_option option = 
-  match Clflags.parse_color_setting option with
-  | None -> ()
-  | Some setting -> Clflags.color := Some setting
-
-let eval (s : string) ~suffix =
-  let tmpfile = Filename.temp_file "eval" suffix in 
-  Ext_io.write_file tmpfile s;   
-  anonymous  ~rev_args:[tmpfile];
-  if not !Clflags.verbose then try Sys.remove tmpfile with _ -> ()
-
-
-(* let (//) = Filename.concat *)
-
-
-
-
-module Pp = Rescript_cpp
-let define_variable s =
-  match Ext_string.split ~keep_empty:true s '=' with
-  | [key; v] -> 
-    if not (Pp.define_key_value key v)  then 
-      Bsc_args.bad_arg ("illegal definition: " ^ s)
-  | _ -> Bsc_args.bad_arg ("illegal definition: " ^ s)
-
-let print_standard_library () = 
-  let (//) = Filename.concat in   
-  let standard_library = 
-    Filename.dirname Sys.executable_name
-    // Filename.parent_dir_name // "lib"// "ocaml"  in 
-  print_string standard_library; print_newline(); 
-  exit 0  
-
-let bs_version_string = 
-  "ReScript " ^ Bs_version.version
-
-let print_version_string () = 
-  print_endline bs_version_string;
-  exit 0 
-
-let [@inline] set s : Bsc_args.spec = Unit (Unit_set s)
-let [@inline] clear s : Bsc_args.spec = Unit (Unit_clear s)
-let [@inline] string_call s : Bsc_args.spec = 
-  String (String_call s)
-let [@inline] string_optional_set s : Bsc_args.spec = 
-  String (String_optional_set s)
-
-let [@inline] unit_call s : Bsc_args.spec =   
-  Unit (Unit_call s)   
-let [@inline] string_list_add s : Bsc_args.spec = 
-  String (String_list_add s)
-
-(* mostly common used to list in the beginning to make search fast
-*)
-let buckle_script_flags : (string * Bsc_args.spec * string) array =
-  [|
-    "-I", string_list_add  Clflags.include_dirs ,
-    "*internal* <dir>  Add <dir> to the list of include directories" ;
-
-    "-w", string_call (Warnings.parse_options false),
-    "<list>  Enable or disable warnings according to <list>:\n\
-     +<spec>   enable warnings in <spec>\n\
-     -<spec>   disable warnings in <spec>\n\
-     @<spec>   enable warnings in <spec> and treat them as errors\n\
-     <spec> can be:\n\
-     <num>             a single warning number\n\
-     <num1>..<num2>    a range of consecutive warning numbers\n\
-     default setting is " ^ Bsc_warnings.defaults_w;  
-
-
-    "-o", string_optional_set Clflags.output_name, 
-    "*internal* <file>  set output file name to <file>";
-
-    "-bs-read-cmi",  unit_call (fun _ -> Clflags.assume_no_mli := Mli_exists), 
-    "*internal* Assume mli always exist ";
-
-    "-ppx", string_list_add Clflags.all_ppx,
-    "*internal* <command>  Pipe abstract syntax trees through preprocessor <command>";
-
-    "-open", string_list_add Clflags.open_modules,
-    "*internal* <module>  Opens the module <module> before typing";
-
-    "-bs-jsx", string_call (fun i -> 
-      (if i <> "3" && i <> "4" then Bsc_args.bad_arg (" Not supported jsx version : " ^  i));
-      Js_config.jsx_version := Js_config.jsx_version_of_int @@ int_of_string i),
-    "*internal* Set jsx version";
-
-    "-bs-jsx-module", string_call (fun i ->
-      let isGeneric = match i |> String.lowercase_ascii with
-      | "react" -> false
-      | _ -> true in
-      Js_config.jsx_module := Js_config.jsx_module_of_string i;
-      if isGeneric then (
-        Js_config.jsx_mode := Automatic;
-        Js_config.jsx_version := Some Jsx_v4
-      )),
-    "*internal* Set jsx module";
-
-    "-bs-jsx-mode", string_call (fun i ->
-      (if i <> "classic" && i <> "automatic" then Bsc_args.bad_arg (" Not supported jsx-mode : " ^ i));
-      Js_config.jsx_mode := Js_config.jsx_mode_of_string i),
-    "*internal* Set jsx mode";
-
-    "-bs-package-output", string_call Js_packages_state.update_npm_package_path, 
-    "*internal* Set npm-output-path: [opt_module]:path, for example: 'lib/cjs', 'amdjs:lib/amdjs', 'es6:lib/es6' ";
-
-    "-bs-ast", unit_call(fun _ ->  Js_config.binary_ast := true; Js_config.syntax_only := true),
-    "*internal* Generate binary .mli_ast and ml_ast and stop";
-
-    "-bs-syntax-only", set Js_config.syntax_only,
-    "*internal* Only check syntax";
-
-    "-bs-g", unit_call (fun _ -> Js_config.debug := true; Pp.replace_directive_bool "DEBUG" true),
-    "Debug mode";
-
-    "-bs-v", string_call ignore, 
-    "*internal* version check to force a rebuild";
-    "-bs-package-name", string_call Js_packages_state.set_package_name, 
-    "*internal* Set package name, useful when you want to produce npm packages";
-
-    "-bs-ns", string_call Js_packages_state.set_package_map, 
-    "*internal* Set package map, not only set package name but also use it as a namespace" ;
-
-    "-as-ppx", set Js_config.as_ppx, 
-    "*internal*As ppx for editor integration";
-    "-as-pp", unit_call(fun _ ->  Js_config.as_pp := true ; Js_config.syntax_only := true),
-    "*internal*As pp to interact with native tools";
-    "-no-alias-deps", set Clflags.transparent_modules, 
-    "*internal*Do not record dependencies for module aliases";
-
-    "-bs-gentype", set Clflags.bs_gentype,
-    "*internal* Pass gentype command";
-
-    (******************************************************************************)
-
-    "-bs-super-errors", unit_call (fun _ -> ()),
-    "*deprecated* Better error message combined with other tools ";
-
-    "-unboxed-types", set Clflags.unboxed_types,
-    "*internal* Unannotated unboxable types will be unboxed";
-
-    "-bs-ml-out", unit_call (fun _ -> Config.syntax_kind := `ml),
-    "*internal* Print compiler output in ML syntax";
-
-    "-bs-D",  string_call define_variable,
-    "Define conditional variable e.g, -D DEBUG=true";
-
-    "-bs-unsafe-empty-array",  set Config.unsafe_empty_array,
-    "*internal* Allow [||] to be polymorphic";
-
-    "-nostdlib",  set Js_config.no_stdlib,
-    "*internal* Don't use stdlib";
-
-    "-color", string_call set_color_option,
-    "*internal* Enable or disable colors in compiler messages\n\
-     The following settings are supported:\n\
-     auto    use heuristics to enable colors only if supported\n\
-     always  enable colors\n\
-     never   disable colors\n\
-     The default setting is 'always'\n\
-     The current heuristic for 'auto'\n\
-     checks that the TERM environment variable exists and is\n\
-     not empty or \"dumb\", and that isatty(stderr) holds.";    
-
-    "-bs-list-conditionals", unit_call (fun () -> Pp.list_variables Format.err_formatter),
-    "*internal* List existing conditional variables";  
-
-    "-bs-eval", string_call (fun  s -> eval s ~suffix:Literals.suffix_ml), 
-    "*internal* (experimental) set the string to be evaluated in OCaml syntax";
-
-    "-e",  string_call (fun  s -> eval s ~suffix:Literals.suffix_res), 
-    "(experimental) set the string to be evaluated in ReScript syntax";  
-
-    "-bs-cmi-only", set Js_config.cmi_only, 
-    "*internal* Stop after generating cmi file";  
-
-    "-bs-cmi", set Js_config.force_cmi, 
-    "*internal*  Not using cached cmi, always generate cmi";
-
-    "-bs-cmj", set Js_config.force_cmj, 
-    "*internal*  Not using cached cmj, always generate cmj";    
-
-    "-bs-no-version-header", set Js_config.no_version_header,
-    "*internal*Don't print version header";
-
-    "-bs-no-builtin-ppx", set Js_config.no_builtin_ppx,
-    "*internal* Disable built-in ppx";  
-
-    "-bs-cross-module-opt", set Js_config.cross_module_inline, 
-    "*internal* Enable cross module inlining(experimental), default(false)";
-
-    "-bs-no-cross-module-opt", clear Js_config.cross_module_inline, 
-    "*internal* Disable cross module inlining(experimental)";
-
-    "-bs-diagnose", set Js_config.diagnose, 
-    "*internal* More verbose output";
-
-    "-bs-no-check-div-by-zero", clear Js_config.check_div_by_zero, 
-    "*internal* unsafe mode, don't check div by zero and mod by zero";
-
-    "-bs-noassertfalse", set Clflags.no_assert_false,
-    "*internal*  no code for assert false";
-
-    "-noassert", set Clflags.noassert, 
-    "*internal* Do not compile assertion checks";
-
-    "-bs-loc", set Clflags.dump_location, 
-    "*internal*  dont display location with -dtypedtree, -dparsetree";
-
-    "-impl",  string_call impl,
-    "*internal* <file>  Compile <file> as a .ml file";
-
-    "-intf", string_call intf,
-    "*internal* <file>  Compile <file> as a .mli file";
-
-    "-dtypedtree", set Clflags.dump_typedtree, 
-    "*internal* debug typedtree";
-
-    "-dparsetree", set Clflags.dump_parsetree,
-    "*internal* debug parsetree";
-
-    "-drawlambda", set Clflags.dump_rawlambda,
-    "*internal* debug raw lambda";
-
-    "-dsource", set Clflags.dump_source, 
-    "*internal* print source";
-
-    "-reprint-source", string_call reprint_source_file, 
-    "*internal* transform the target ReScript file using PPXes provided, and print the transformed ReScript code to stdout";
-
-    "-format", string_call format_file,
-    "*internal* Format as Res syntax";
-
-    "-only-parse", set Clflags.only_parse, 
-    "*internal* stop after parsing";
-
-    "-ignore-parse-errors", set Clflags.ignore_parse_errors, 
-    "*internal* continue after parse errors";
-
-    "-where", unit_call print_standard_library, 
-    "*internal* Print location of standard library and exit";
-
-    "-verbose", set Clflags.verbose, 
-    "*internal* Print calls to external commands";
-
-    "-keep-locs", set Clflags.keep_locs, 
-    "*internal* Keep locations in .cmi files";
-
-    "-no-keep-locs", clear Clflags.keep_locs, 
-    "*internal* Do not keep locations in .cmi files";
-
-    "-nopervasives", set Clflags.nopervasives, 
-    "*internal*";
-    "-uncurried", unit_call (fun () -> Config.uncurried := Uncurried),
-    "*internal* Set jsx module";
-    "-v", unit_call print_version_string,
-    "Print compiler version and location of standard library and exit";  
-
-    "-version", unit_call print_version_string, 
-    "Print version and exit";
-
-    "-pp", string_optional_set Clflags.preprocessor,
-    "*internal* <command>  Pipe sources through preprocessor <command>";
-
-    "-absname", set Location.absname, 
-    "*internal* Show absolute filenames in error messages";  
-    (* Not used, the build system did the expansion *)
-
-    "-bs-no-bin-annot",  clear Clflags.binary_annotations, 
-    "*internal* Disable binary annotations (by default on)";
-
-    "-modules", set Js_config.modules, 
-    "*internal* serve similar to ocamldep";
-
-    "-short-paths", clear Clflags.real_paths, 
-    "*internal* Shorten paths in types";
-
-    "-unsafe", set Clflags.fast, 
-    "*internal* Do not compile bounds checking on array and string access";
-
-    "-warn-help", unit_call Warnings.help_warnings, 
-    "Show description of warning numbers";
-    "-warn-error", string_call (Warnings.parse_options true),
-    "<list>  Enable or disable error status for warnings according\n\
-     to <list>.  See option -w for the syntax of <list>.\n\
-     Default setting is " ^ Bsc_warnings.defaults_warn_error;    
-    "-runtime",string_call setup_runtime_path,     
-    "*internal* Set the runtime directory";
-    "-make-runtime", unit_call Js_packages_state.make_runtime,
-    "*internal* make runtime library";  
-    "-make-runtime-test", unit_call Js_packages_state.make_runtime_test,
-    "*internal* make runtime test library";  
-
-  |]
-
-
-
-(** parse flags in bs.config *)
-let file_level_flags_handler (e : Parsetree.expression option) = 
-  match e with 
-  | None -> ()
-  | Some {pexp_desc = Pexp_array args ; pexp_loc} -> 
-    let args = Array.of_list 
-        ( Ext_list.map  args (fun e -> 
-              match e.pexp_desc with 
-              | Pexp_constant (Pconst_string(name,_)) -> name 
-              | _ -> Location.raise_errorf ~loc:e.pexp_loc "string literal expected" )) in               
-    (try Bsc_args.parse_exn ~start:0
-           ~argv:args buckle_script_flags (fun ~rev_args:_ -> ()) ~usage
-     with _ -> Location.prerr_warning pexp_loc (Preprocessor "invalid flags for bsc"))  
-  | Some e -> 
-    Location.raise_errorf ~loc:e.pexp_loc "string array expected"
-
-let _ : unit =   
-  Bs_conditional_initial.setup_env ();
-  Clflags.color := Some Always;
-    
-  let flags = "flags" in 
-  Ast_config.add_structure 
-    flags file_level_flags_handler;    
-  Ast_config.add_signature 
-    flags file_level_flags_handler;    
-  try
-    Bsc_args.parse_exn 
-      ~argv:Sys.argv 
-      buckle_script_flags anonymous ~usage;
-  with 
-  | Bsc_args.Bad msg ->   
-    Format.eprintf "%s@." msg ;
-    exit 2
-  | x -> 
-    begin
-(*
-        Ext_obj.bt ();
-*)
-      Location.report_exception ppf x;
-      exit 2
-    end
diff --git a/jscomp/bsc/rescript_compiler_main.mli b/jscomp/bsc/rescript_compiler_main.mli
deleted file mode 100644
index 3999ce7..0000000
--- a/jscomp/bsc/rescript_compiler_main.mli
+++ /dev/null
@@ -1,23 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
diff --git a/jscomp/build_tests/build_warn_as_error/input.js b/jscomp/build_tests/build_warn_as_error/input.js
deleted file mode 100644
index a7a3f79..0000000
--- a/jscomp/build_tests/build_warn_as_error/input.js
+++ /dev/null
@@ -1,53 +0,0 @@
-var p = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-var o1 = p.spawnSync(rescript_exe, ["build"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-
-var first_message = o1.stdout
-  .split("\n")
-  .map(s => s.trim())
-  .find(s => s == "Warning number 110");
-
-if (!first_message) {
-  assert.fail(o1.stdout);
-}
-
-// Second build using -warn-error +110
-var o2 = p.spawnSync(rescript_exe, ["build", "-warn-error", "+110"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-
-var second_message = o2.stdout
-  .split("\n")
-  .map(s => s.trim())
-  .find(s => s == "Warning number 110 (configured as error)");
-
-if (!second_message) {
-  assert.fail(o2.stdout);
-}
-
-// Third build, without -warn-error +110
-// The result should not be a warning as error
-var o3 = p.spawnSync(rescript_exe, ["build"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-
-var third_message = o3.stdout
-  .split("\n")
-  .map(s => s.trim())
-  .find(s => s == "Dependency Finished");
-
-if (!third_message) {
-  assert.fail(o3.stdout);
-}
-
-var cleanup = p.spawnSync(rescript_exe, ["clean"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
diff --git a/jscomp/build_tests/build_warn_as_error/rescript.json b/jscomp/build_tests/build_warn_as_error/rescript.json
deleted file mode 100644
index 0932ebe..0000000
--- a/jscomp/build_tests/build_warn_as_error/rescript.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "build_warn_as_error",
-  "version": "0.1.0",
-  "sources": ["src"]
-}
diff --git a/jscomp/build_tests/build_warn_as_error/src/Demo.res b/jscomp/build_tests/build_warn_as_error/src/Demo.res
deleted file mode 100644
index 1dabe73..0000000
--- a/jscomp/build_tests/build_warn_as_error/src/Demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let todo = _ => %todo
diff --git a/jscomp/build_tests/case/input.js b/jscomp/build_tests/case/input.js
deleted file mode 100644
index 0c1f9b6..0000000
--- a/jscomp/build_tests/case/input.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var p = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
-
-if (
-  ![
-    `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/demo vs src/Demo\n`,
-    // On linux files are parsed in different order
-    `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/Demo vs src/demo\n`,
-  ].includes(o.stderr)
-) {
-  assert.fail(o.stderr);
-}
diff --git a/jscomp/build_tests/case/rescript.json b/jscomp/build_tests/case/rescript.json
deleted file mode 100644
index 0f5b875..0000000
--- a/jscomp/build_tests/case/rescript.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "case",
-  "version": "0.1.0",
-  "sources": ["src"],
-  "bs-dependencies": [
-    // add your bs-dependencies here
-  ]
-}
diff --git a/jscomp/build_tests/case/src/Demo.resi b/jscomp/build_tests/case/src/Demo.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case/src/Demo.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case/src/demo.res b/jscomp/build_tests/case/src/demo.res
deleted file mode 100644
index 8d0b191..0000000
--- a/jscomp/build_tests/case/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log("Hello, ReScript")
diff --git a/jscomp/build_tests/case2/input.js b/jscomp/build_tests/case2/input.js
deleted file mode 100644
index 998c2d8..0000000
--- a/jscomp/build_tests/case2/input.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var p = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
-
-if (
-  ![
-    `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/X vs src/x\n`,
-    // On linux files are parsed in different order
-    `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/x vs src/X\n`,
-  ].includes(o.stderr)
-) {
-  assert.fail(o.stderr);
-}
diff --git a/jscomp/build_tests/case2/rescript.json b/jscomp/build_tests/case2/rescript.json
deleted file mode 100644
index db6b5e7..0000000
--- a/jscomp/build_tests/case2/rescript.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "case2",
-  "version": "0.1.0",
-  "sources": ["src"],
-  "bs-dependencies": [
-    // add your bs-dependencies here
-  ]
-}
diff --git a/jscomp/build_tests/case2/src/X.res b/jscomp/build_tests/case2/src/X.res
deleted file mode 100644
index 8d0b191..0000000
--- a/jscomp/build_tests/case2/src/X.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log("Hello, ReScript")
diff --git a/jscomp/build_tests/case2/src/x.resi b/jscomp/build_tests/case2/src/x.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case2/src/x.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/input.js b/jscomp/build_tests/case3/input.js
deleted file mode 100644
index a6672a3..0000000
--- a/jscomp/build_tests/case3/input.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//@ts-check
-
-var p = require("child_process");
-var fs = require("fs");
-var path = require("path");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-p.spawnSync(`${rescript_exe} clean && ${rescript_exe} build`, {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-
-var o = fs.readFileSync(path.join(__dirname, "src", "hello.bs.js"), "ascii");
-assert.ok(/HelloGen\.f/.test(o));
diff --git a/jscomp/build_tests/case3/rescript.json b/jscomp/build_tests/case3/rescript.json
deleted file mode 100644
index 267c827..0000000
--- a/jscomp/build_tests/case3/rescript.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "case3",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [],
-  "warnings": { "error": "+101" }
-}
diff --git a/jscomp/build_tests/case3/src/B01.bs.js b/jscomp/build_tests/case3/src/B01.bs.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/build_tests/case3/src/B01.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/build_tests/case3/src/B01.res b/jscomp/build_tests/case3/src/B01.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/B01.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/B01.resi b/jscomp/build_tests/case3/src/B01.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/B01.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/B02.bs.js b/jscomp/build_tests/case3/src/B02.bs.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/build_tests/case3/src/B02.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/build_tests/case3/src/B02.res b/jscomp/build_tests/case3/src/B02.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/B02.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/B03.bs.js b/jscomp/build_tests/case3/src/B03.bs.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/build_tests/case3/src/B03.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/build_tests/case3/src/B03.res b/jscomp/build_tests/case3/src/B03.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/B03.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/B04.bs.js b/jscomp/build_tests/case3/src/B04.bs.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/build_tests/case3/src/B04.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/build_tests/case3/src/B04.res b/jscomp/build_tests/case3/src/B04.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/B04.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/B04.resi b/jscomp/build_tests/case3/src/B04.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/B04.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/B05.bs.js b/jscomp/build_tests/case3/src/B05.bs.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/build_tests/case3/src/B05.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/build_tests/case3/src/B05.res b/jscomp/build_tests/case3/src/B05.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/B05.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/B05.resi b/jscomp/build_tests/case3/src/B05.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/B05.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/a01.bs.js b/jscomp/build_tests/case3/src/a01.bs.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/build_tests/case3/src/a01.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/build_tests/case3/src/a01.res b/jscomp/build_tests/case3/src/a01.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/a01.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/a01.resi b/jscomp/build_tests/case3/src/a01.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/a01.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/a02.bs.js b/jscomp/build_tests/case3/src/a02.bs.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/build_tests/case3/src/a02.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/build_tests/case3/src/a02.res b/jscomp/build_tests/case3/src/a02.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/a02.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/a03.bs.js b/jscomp/build_tests/case3/src/a03.bs.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/build_tests/case3/src/a03.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/build_tests/case3/src/a03.res b/jscomp/build_tests/case3/src/a03.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/a03.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/a04.bs.js b/jscomp/build_tests/case3/src/a04.bs.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/build_tests/case3/src/a04.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/build_tests/case3/src/a04.res b/jscomp/build_tests/case3/src/a04.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/a04.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/a04.resi b/jscomp/build_tests/case3/src/a04.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/a04.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/a05.bs.js b/jscomp/build_tests/case3/src/a05.bs.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/build_tests/case3/src/a05.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/build_tests/case3/src/a05.res b/jscomp/build_tests/case3/src/a05.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/a05.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/a05.resi b/jscomp/build_tests/case3/src/a05.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/case3/src/a05.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/case3/src/hello.bs.js b/jscomp/build_tests/case3/src/hello.bs.js
deleted file mode 100644
index 08c02c6..0000000
--- a/jscomp/build_tests/case3/src/hello.bs.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var HelloGen = require("./hello.gen");
-
-function f(prim) {
-  return HelloGen.f(prim);
-}
-
-exports.f = f;
-/* ./hello.gen Not a pure module */
diff --git a/jscomp/build_tests/case3/src/hello.res b/jscomp/build_tests/case3/src/hello.res
deleted file mode 100644
index 94cd6cd..0000000
--- a/jscomp/build_tests/case3/src/hello.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType.import("hh")
-external f: int => int = "f"
diff --git a/jscomp/build_tests/cli_compile_status/input.js b/jscomp/build_tests/cli_compile_status/input.js
deleted file mode 100755
index be04df4..0000000
--- a/jscomp/build_tests/cli_compile_status/input.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// @ts-check
-
-const assert = require("assert");
-const child_process = require("child_process");
-
-// Shows compile time for `rescript build` command
-let out = child_process.spawnSync(`../../../rescript`, ["build"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.match(
-  out.stdout,
-  new RegExp(`>>>> Start compiling
-Dependency Finished
->>>> Finish compiling \\d+ mseconds`)
-);
-
-// Shows compile time for `rescript` command
-out = child_process.spawnSync(`../../../rescript`, {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.match(
-  out.stdout,
-  new RegExp(`>>>> Start compiling
-Dependency Finished
->>>> Finish compiling \\d+ mseconds`)
-);
-
-// Doesn't show compile time for `rescript build -verbose` command
-// Because we can't be sure that -verbose is a valid argument
-// And bsb won't fail with a usage message.
-// It works this way not only for -verbose, but any other arg, including -h/--help/-help
-out = child_process.spawnSync(`../../../rescript`, ["build", "-verbose"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.match(
-  out.stdout,
-  new RegExp(
-    `Package stack: test  \nDependency Finished\nninja.exe -C lib/bs \n`
-  )
-);
diff --git a/jscomp/build_tests/cli_compile_status/rescript.json b/jscomp/build_tests/cli_compile_status/rescript.json
deleted file mode 100644
index c7c9717..0000000
--- a/jscomp/build_tests/cli_compile_status/rescript.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "test",
-  "version": "0.1.0",
-  "sources": []
-}
diff --git a/jscomp/build_tests/cli_help/input.js b/jscomp/build_tests/cli_help/input.js
deleted file mode 100755
index 18c4fc7..0000000
--- a/jscomp/build_tests/cli_help/input.js
+++ /dev/null
@@ -1,266 +0,0 @@
-// @ts-check
-
-const assert = require("assert");
-const child_process = require("child_process");
-
-const cliHelp =
-  "Usage: rescript <options> <subcommand>\n" +
-  "\n" +
-  "`rescript` is equivalent to `rescript build`\n" +
-  "\n" +
-  "Options:\n" +
-  "  -v, -version  display version number\n" +
-  "  -h, -help     display help\n" +
-  "\n" +
-  "Subcommands:\n" +
-  "  build\n" +
-  "  clean\n" +
-  "  format\n" +
-  "  convert\n" +
-  "  dump\n" +
-  "  help\n" +
-  "\n" +
-  "Run `rescript <subcommand> -h` for subcommand help. Examples:\n" +
-  "  rescript build -h\n" +
-  "  rescript format -h\n";
-
-const buildHelp =
-  "Usage: rescript build <options> -- <ninja_options>\n" +
-  "\n" +
-  "`rescript build` builds the project with dependencies\n" +
-  "\n" +
-  "`rescript build -- -h` for Ninja options (internal usage only; unstable)\n" +
-  "\n" +
-  "Options:\n" +
-  "  -w           Watch mode\n" +
-  "  -ws          [host]:port set up host & port for WebSocket build notifications\n" +
-  "  -verbose     Set the output to be verbose\n" +
-  "  -with-deps   *deprecated* This is the default behavior now. This option will be removed in a future release\n" +
-  '  -warn-error  Warning numbers and whether to turn them into errors, e.g., "+8+32-102"\n';
-
-const cleanHelp =
-  "Usage: rescript clean <options>\n" +
-  "\n" +
-  "`rescript clean` cleans build artifacts\n" +
-  "\n" +
-  "Options:\n" +
-  "  -verbose    Set the output to be verbose\n" +
-  "  -with-deps  *deprecated* This is the default behavior now. This option will be removed in a future release\n";
-
-const formatHelp =
-  "Usage: rescript format <options> [files]\n" +
-  "\n" +
-  "`rescript format` formats the current directory\n" +
-  "\n" +
-  "Options:\n" +
-  "  -stdin  [.res|.resi|.ml|.mli] Read the code from stdin and print\n" +
-  "          the formatted code to stdout in ReScript syntax\n" +
-  "  -all    Format the whole project \n" +
-  "  -check  Check formatting for file or the whole project. Use `-all` to check the whole project\n";
-
-const convertHelp =
-  "Usage: rescript convert <options> [files]\n" +
-  "\n" +
-  "`rescript convert` converts the current directory\n" +
-  "\n" +
-  "**This command removes old OCaml files and creates new ReScript \n" +
-  "files. Make sure your work is saved first!**\n" +
-  "\n" +
-  "Options:\n" +
-  "  -all  Convert the whole project\n";
-
-const dumpHelp =
-  "Usage: rescript dump <options> [target]\n" +
-  "`rescript dump` dumps the information for the target\n";
-
-// Shows build help with --help arg
-let out = child_process.spawnSync(`../../../rescript`, ["build", "--help"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, buildHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// FIXME: Help works incorrectly in watch mode
-out = child_process.spawnSync(`../../../rescript`, ["build", "-w", "--help"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-// FIXME: Shouldn't have "Start compiling" for help
-assert.equal(out.stdout, ">>>> Start compiling\n" + buildHelp);
-// FIXME: Don't run the watcher when showing help
-assert.match(
-  out.stderr,
-  new RegExp(
-    "Uncaught Exception Error: ENOENT: no such file or directory, watch 'bsconfig.json'\n"
-  )
-);
-// FIXME: Should be 0
-assert.equal(out.status, 1);
-
-// FIXME: Has the same problem with `rescript -w`
-out = child_process.spawnSync(`../../../rescript`, ["-w", "--help"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, ">>>> Start compiling\n" + buildHelp);
-assert.match(
-  out.stderr,
-  new RegExp(
-    "Uncaught Exception Error: ENOENT: no such file or directory, watch 'bsconfig.json'\n"
-  )
-);
-
-// Shows cli help with --help arg even if there are invalid arguments after it
-out = child_process.spawnSync(`../../../rescript`, ["--help", "-w"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, cliHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Shows build help with -h arg
-out = child_process.spawnSync(`../../../rescript`, ["build", "-h"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, buildHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Exits with build help with unknown arg
-out = child_process.spawnSync(`../../../rescript`, ["build", "-foo"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, "");
-assert.equal(out.stderr, 'Error: Unknown option "-foo".\n' + buildHelp);
-assert.equal(out.status, 2);
-
-// Shows cli help with --help arg
-out = child_process.spawnSync(`../../../rescript`, ["--help"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, cliHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Shows cli help with -h arg
-out = child_process.spawnSync(`../../../rescript`, ["-h"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, cliHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Shows cli help with help command
-out = child_process.spawnSync(`../../../rescript`, ["help"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, cliHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Exits with cli help with unknown command
-out = child_process.spawnSync(`../../../rescript`, ["built"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, "");
-assert.equal(out.stderr, `Error: Unknown command "built".\n` + cliHelp);
-assert.equal(out.status, 2);
-
-// Exits with build help with unknown args
-out = child_process.spawnSync(`../../../rescript`, ["-foo"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, "");
-assert.equal(out.stderr, 'Error: Unknown option "-foo".\n' + buildHelp);
-assert.equal(out.status, 2);
-
-// Shows clean help with --help arg
-out = child_process.spawnSync(`../../../rescript`, ["clean", "--help"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, cleanHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Shows clean help with -h arg
-out = child_process.spawnSync(`../../../rescript`, ["clean", "-h"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, cleanHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Exits with clean help with unknown arg
-out = child_process.spawnSync(`../../../rescript`, ["clean", "-foo"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, "");
-assert.equal(out.stderr, 'Error: Unknown option "-foo".\n' + cleanHelp);
-assert.equal(out.status, 2);
-
-// Shows format help with --help arg
-out = child_process.spawnSync(`../../../rescript`, ["format", "--help"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, formatHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Shows format help with -h arg
-out = child_process.spawnSync(`../../../rescript`, ["format", "-h"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, formatHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Shows convert help with --help arg
-out = child_process.spawnSync(`../../../rescript`, ["convert", "--help"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, convertHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Shows convert help with -h arg
-out = child_process.spawnSync(`../../../rescript`, ["convert", "-h"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, convertHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Shows dump help with --help arg
-out = child_process.spawnSync(`../../../rescript`, ["dump", "--help"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, dumpHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
-
-// Shows dump help with -h arg
-out = child_process.spawnSync(`../../../rescript`, ["dump", "-h"], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-assert.equal(out.stdout, dumpHelp);
-assert.equal(out.stderr, "");
-assert.equal(out.status, 0);
diff --git a/jscomp/build_tests/cmd/input.js b/jscomp/build_tests/cmd/input.js
deleted file mode 100644
index e477ef3..0000000
--- a/jscomp/build_tests/cmd/input.js
+++ /dev/null
@@ -1,60 +0,0 @@
-var p = require("child_process");
-
-var assert = require("assert");
-
-var bsc_exe_path = require("../../../scripts/bin_path").bsc_exe;
-
-var react = `
-type u 
-
-external a : u = "react" [@@bs.module]
-
-external b : unit -> int = "bool" [@@bs.module "react"]
-
-let v = a
-let h = b ()
-`;
-
-var foo_react = `
-type bla
-
-
-external foo : bla = "foo.react" [@@bs.module]
-
-external bar : unit -> bla  = "bar" [@@bs.val] [@@bs.module "foo.react"]
-
-let c = foo 
-
-let d = bar ()
-`;
-
-function evalCode(code) {
-  var bsc_exe = p.spawnSync(
-    `${bsc_exe_path} -bs-no-version-header -bs-cross-module-opt -w -40 -bs-eval '${code}'`,
-    {
-      encoding: "utf8",
-      shell: true,
-      cwd: __dirname,
-    }
-  );
-
-  return bsc_exe;
-}
-
-function test(react) {
-  var x = evalCode(react);
-  console.log(x);
-  assert.ok(x.stdout.match(/require/g).length === 1, "react one");
-}
-
-test(react);
-
-assert.ok(
-  evalCode(react + foo_react).stdout.match(/require/g).length === 2,
-  "foo react twice "
-);
-
-assert.ok(
-  evalCode(foo_react).stdout.match(/require/g).length === 1,
-  "foo react one"
-);
diff --git a/jscomp/build_tests/custom_namespace/input.js b/jscomp/build_tests/custom_namespace/input.js
deleted file mode 100644
index 9c00338..0000000
--- a/jscomp/build_tests/custom_namespace/input.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var child_process = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-child_process.execSync(`${rescript_exe} clean && ${rescript_exe} build`, {
-  cwd: __dirname,
-});
-
-var x = require("./src/demo.bs.js");
-assert.equal(x.v, 42);
diff --git a/jscomp/build_tests/custom_namespace/rescript.json b/jscomp/build_tests/custom_namespace/rescript.json
deleted file mode 100644
index 9677227..0000000
--- a/jscomp/build_tests/custom_namespace/rescript.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "namespace",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  },
-  "namespace": "Foo_bar",
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "bsc-flags": ["-bs-no-version-header"],
-  "bs-dependencies": [],
-  "warnings": {
-    "number": "-40+6+7",
-    "error": true
-  },
-  "suffix": ".bs.js"
-}
diff --git a/jscomp/build_tests/custom_namespace/src/demo.bs.js b/jscomp/build_tests/custom_namespace/src/demo.bs.js
deleted file mode 100644
index 5bcd6ef..0000000
--- a/jscomp/build_tests/custom_namespace/src/demo.bs.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-
-var v = 42;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/build_tests/custom_namespace/src/demo.res b/jscomp/build_tests/custom_namespace/src/demo.res
deleted file mode 100644
index a65bbc1..0000000
--- a/jscomp/build_tests/custom_namespace/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 42
diff --git a/jscomp/build_tests/cycle/input.js b/jscomp/build_tests/cycle/input.js
deleted file mode 100644
index 956da90..0000000
--- a/jscomp/build_tests/cycle/input.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//@ts-check
-const cp = require("child_process");
-const assert = require("assert");
-const fs = require("fs");
-const path = require("path");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-var output = cp.spawnSync(rescript_exe, { encoding: "utf8", shell: true });
-
-assert(/dependency cycle/.test(output.stdout));
-
-var compilerLogFile = path.join(__dirname, "lib", "bs", ".compiler.log");
-var compilerLog = fs.readFileSync(compilerLogFile, "utf8");
-assert(/dependency cycle/.test(compilerLog));
diff --git a/jscomp/build_tests/cycle/rescript.json b/jscomp/build_tests/cycle/rescript.json
deleted file mode 100644
index f43ea2c..0000000
--- a/jscomp/build_tests/cycle/rescript.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "cycle",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [],
-  "warnings": { "error": "+101" }
-}
diff --git a/jscomp/build_tests/cycle/src/a.res b/jscomp/build_tests/cycle/src/a.res
deleted file mode 100644
index 3d03da1..0000000
--- a/jscomp/build_tests/cycle/src/a.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = B.v
diff --git a/jscomp/build_tests/cycle/src/b.res b/jscomp/build_tests/cycle/src/b.res
deleted file mode 100644
index b9fdeba..0000000
--- a/jscomp/build_tests/cycle/src/b.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = A.v
diff --git a/jscomp/build_tests/cycle1/input.js b/jscomp/build_tests/cycle1/input.js
deleted file mode 100644
index 3c5519e..0000000
--- a/jscomp/build_tests/cycle1/input.js
+++ /dev/null
@@ -1,16 +0,0 @@
-//@ts-check
-const cp = require("child_process");
-const assert = require("assert");
-const fs = require("fs");
-const path = require("path");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-cp.execSync(`${rescript_exe} clean`, { cwd: __dirname });
-
-var output = cp.spawnSync(rescript_exe, { encoding: "utf8", shell: true });
-
-assert(/is dangling/.test(output.stdout));
-
-var compilerLogFile = path.join(__dirname, "lib", "bs", ".compiler.log");
-var compilerLog = fs.readFileSync(compilerLogFile, "utf8");
-assert(/is dangling/.test(compilerLog));
diff --git a/jscomp/build_tests/cycle1/rescript.json b/jscomp/build_tests/cycle1/rescript.json
deleted file mode 100644
index fdbf975..0000000
--- a/jscomp/build_tests/cycle1/rescript.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "cycle1",
-  "namespace": true,
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  },
-  "package-specs": {
-    "module": "esmodule",
-    "in-source": true
-  },
-  "suffix": ".bs.js"
-}
diff --git a/jscomp/build_tests/cycle1/src/A.res b/jscomp/build_tests/cycle1/src/A.res
deleted file mode 100644
index 237f168..0000000
--- a/jscomp/build_tests/cycle1/src/A.res
+++ /dev/null
@@ -1,3 +0,0 @@
-include A
-
-let x = 42
\ No newline at end of file
diff --git a/jscomp/build_tests/cycle1/src/A.resi b/jscomp/build_tests/cycle1/src/A.resi
deleted file mode 100644
index 86982fe..0000000
--- a/jscomp/build_tests/cycle1/src/A.resi
+++ /dev/null
@@ -1 +0,0 @@
-let x : int
\ No newline at end of file
diff --git a/jscomp/build_tests/deprecated-package-specs/input.js b/jscomp/build_tests/deprecated-package-specs/input.js
deleted file mode 100644
index ed66ae0..0000000
--- a/jscomp/build_tests/deprecated-package-specs/input.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const child_process = require("child_process");
-const assert = require("assert");
-const rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-const out = child_process.spawnSync(rescript_exe, { encoding: "utf8" });
-assert.match(
-  out.stderr,
-  /deprecated: Option "es6-global" is deprecated\. Use "esmodule" instead\./
-);
diff --git a/jscomp/build_tests/deprecated-package-specs/rescript.json b/jscomp/build_tests/deprecated-package-specs/rescript.json
deleted file mode 100644
index ada61da..0000000
--- a/jscomp/build_tests/deprecated-package-specs/rescript.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "deprecated-package-specs",
-  "version": "0.1.0",
-  "sources": "src",
-  "package-specs": {
-    "module": "es6-global"
-  }
-}
diff --git a/jscomp/build_tests/deprecated-package-specs/src/Index.res b/jscomp/build_tests/deprecated-package-specs/src/Index.res
deleted file mode 100644
index 8d0b191..0000000
--- a/jscomp/build_tests/deprecated-package-specs/src/Index.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log("Hello, ReScript")
diff --git a/jscomp/build_tests/devonly/input.js b/jscomp/build_tests/devonly/input.js
deleted file mode 100644
index c3a0d57..0000000
--- a/jscomp/build_tests/devonly/input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//@ts-check
-var cp = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-cp.execSync(rescript_exe, { cwd: __dirname, encoding: "utf8" });
diff --git a/jscomp/build_tests/devonly/rescript.json b/jscomp/build_tests/devonly/rescript.json
deleted file mode 100644
index e68f677..0000000
--- a/jscomp/build_tests/devonly/rescript.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "devonly",
-  "version": "0.1.0",
-  "sources": [
-    {
-      "dir": "src",
-      "subdirs": true,
-      "type": "dev"
-    },
-    {
-      "dir": "src2",
-      "type": "dev"
-    }
-  ],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [],
-  "warnings": { "error": "+101" }
-}
diff --git a/jscomp/build_tests/devonly/src/demo.bs.js b/jscomp/build_tests/devonly/src/demo.bs.js
deleted file mode 100644
index 83cfc1a..0000000
--- a/jscomp/build_tests/devonly/src/demo.bs.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Depdemo = require("./depdemo.bs.js");
-
-console.log(Depdemo.a);
-
-/*  Not a pure module */
diff --git a/jscomp/build_tests/devonly/src/demo.res b/jscomp/build_tests/devonly/src/demo.res
deleted file mode 100644
index dda4ba3..0000000
--- a/jscomp/build_tests/devonly/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log(Depdemo.a)
diff --git a/jscomp/build_tests/devonly/src/depdemo.bs.js b/jscomp/build_tests/devonly/src/depdemo.bs.js
deleted file mode 100644
index bd93031..0000000
--- a/jscomp/build_tests/devonly/src/depdemo.bs.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a = 3;
-
-exports.a = a;
-/* No side effect */
diff --git a/jscomp/build_tests/devonly/src/depdemo.res b/jscomp/build_tests/devonly/src/depdemo.res
deleted file mode 100644
index 1bf62c4..0000000
--- a/jscomp/build_tests/devonly/src/depdemo.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = 3
diff --git a/jscomp/build_tests/devonly/src2/hello.bs.js b/jscomp/build_tests/devonly/src2/hello.bs.js
deleted file mode 100644
index fca2123..0000000
--- a/jscomp/build_tests/devonly/src2/hello.bs.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v = 3;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/build_tests/devonly/src2/hello.res b/jscomp/build_tests/devonly/src2/hello.res
deleted file mode 100644
index 55f1eb2..0000000
--- a/jscomp/build_tests/devonly/src2/hello.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 3
diff --git a/jscomp/build_tests/devonly/src2/hellodep.bs.js b/jscomp/build_tests/devonly/src2/hellodep.bs.js
deleted file mode 100644
index 7d140c5..0000000
--- a/jscomp/build_tests/devonly/src2/hellodep.bs.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Hello = require("./hello.bs.js");
-
-console.log(Hello.v);
-
-/*  Not a pure module */
diff --git a/jscomp/build_tests/devonly/src2/hellodep.res b/jscomp/build_tests/devonly/src2/hellodep.res
deleted file mode 100644
index 382ad1a..0000000
--- a/jscomp/build_tests/devonly/src2/hellodep.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.log(Hello.v)
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/.gitignore b/jscomp/build_tests/duplicated_symlinked_packages/.gitignore
deleted file mode 100644
index 5abc616..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.merlin
-**/lib
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/README.md b/jscomp/build_tests/duplicated_symlinked_packages/README.md
deleted file mode 100644
index 100d897..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Special tests for duplicated symlink warnings
-
-
-```
-.
-├── a
-│   ├── node_modules
-│   │   ├── c -> ../../c
-│   │   └── z
-│   │       ├── lib
-│   │       │   ├── bs
-│   │       │   └── ocaml
-│   │       └── src
-│   └── src
-├── b
-│   ├── node_modules
-│   │   └── c -> ../../c
-│   └── src
-├── c
-│   └── src
-├── node_modules
-│   ├── a -> ../a
-│   ├── b -> ../b
-│   └── z
-│       └── src
-└── out.expected
-└── src
-
-```
-
-`c` is symlinked everywhere, while `z` is actually conflicting package. 
-
-`out.expected` has exactly 1 warning for `z` conflict
-
-Run `node ./jscomp/build_tests/duplicated_symlinked_packages/input.js` to check the tests against previous snapshots.
-Run `node ./jscomp/build_tests/duplicated_symlinked_packages/input.js update` to update the snapshots (assuming you've made some changes to duplicated)
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/a/bsconfig.json b/jscomp/build_tests/duplicated_symlinked_packages/a/bsconfig.json
deleted file mode 100644
index 93ee22b..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/a/bsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "a",
-  "version": "0.1.0",
-  "sources": {
-    "dir" : "src",
-    "subdirs" : true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [
-    "c",
-    "z"
-  ],
-  "warnings": {"error" : "+101"},
-  "namespace": true
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/c b/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/c
deleted file mode 120000
index 2fcc511..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/c
+++ /dev/null
@@ -1 +0,0 @@
-../../c
\ No newline at end of file
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/z/bsconfig.json b/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/z/bsconfig.json
deleted file mode 100644
index c99d72b..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/z/bsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "z",
-  "version": "0.1.0",
-  "sources": {
-    "dir" : "src",
-    "subdirs" : true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [
-
-  ],
-  "warnings": {
-    "error" : "+101"
-  },
-  "namespace": true,
-  "refmt": 3
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/z/package.json b/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/z/package.json
deleted file mode 100644
index 92b37ba..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/z/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "z",
-  "version": "0.1.0",
-  "scripts": {
-    "build": "bsb -make-world",
-    "start": "bsb -make-world -w",
-    "clean": "bsb -clean-world"
-  },
-  "keywords": [
-    "BuckleScript"
-  ],
-  "author": "",
-  "license": "MIT",
-  "devDependencies": {
-    "bs-platform": "^7.0.1",
-    "gentype": "^3.7.1"
-  }
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/z/src/.git_keep b/jscomp/build_tests/duplicated_symlinked_packages/a/node_modules/z/src/.git_keep
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/a/package.json b/jscomp/build_tests/duplicated_symlinked_packages/a/package.json
deleted file mode 100644
index f0cb45e..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/a/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "a",
-  "version": "0.1.0",
-  "scripts": {
-    "build": "rescript build",
-    "start": "rescript build -w",
-    "clean": "rescript clean"
-  },
-  "keywords": [
-    "ReScript"
-  ],
-  "author": "",
-  "license": "MIT",
-  "devDependencies": {}
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/a/src/.git_keep b/jscomp/build_tests/duplicated_symlinked_packages/a/src/.git_keep
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/b/bsconfig.json b/jscomp/build_tests/duplicated_symlinked_packages/b/bsconfig.json
deleted file mode 100644
index 77361fe..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/b/bsconfig.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "b",
-  "version": "0.1.0",
-  "sources": {
-    "dir" : "src",
-    "subdirs" : true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [
-    "c"
-  ],
-  "warnings": {"error" : "+101"},
-  "namespace": true
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/b/node_modules/c b/jscomp/build_tests/duplicated_symlinked_packages/b/node_modules/c
deleted file mode 120000
index 2fcc511..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/b/node_modules/c
+++ /dev/null
@@ -1 +0,0 @@
-../../c
\ No newline at end of file
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/b/package.json b/jscomp/build_tests/duplicated_symlinked_packages/b/package.json
deleted file mode 100644
index 6cba4e4..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/b/package.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "b",
-  "version": "0.1.0",
-  "scripts": {
-    "build": "rescript build",
-    "start": "rescript build -w",
-    "clean": "rescript clean"
-  },
-  "keywords": [
-    "ReScript"
-  ],
-  "author": "",
-  "license": "MIT",
-  "devDependencies": {}
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/b/src/.git_keep b/jscomp/build_tests/duplicated_symlinked_packages/b/src/.git_keep
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/c/bsconfig.json b/jscomp/build_tests/duplicated_symlinked_packages/c/bsconfig.json
deleted file mode 100644
index e95c884..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/c/bsconfig.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "c",
-  "version": "0.1.0",
-  "sources": {
-    "dir" : "src",
-    "subdirs" : true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [
-
-  ],
-  "warnings": {"error" : "+101"},
-  "namespace": true
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/c/package.json b/jscomp/build_tests/duplicated_symlinked_packages/c/package.json
deleted file mode 100644
index 907967c..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/c/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "z",
-  "version": "0.1.0",
-  "scripts": {
-    "build": "rescript build",
-    "start": "rescript build -w",
-    "clean": "rescript clean"
-  },
-  "keywords": [
-    "ReScript"
-  ],
-  "author": "",
-  "license": "MIT",
-  "devDependencies": {
-    "bs-platform": "^7.0.1",
-    "gentype": "^3.7.1"
-  }
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/c/src/.git_keep b/jscomp/build_tests/duplicated_symlinked_packages/c/src/.git_keep
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/input.js b/jscomp/build_tests/duplicated_symlinked_packages/input.js
deleted file mode 100644
index bb2c7e8..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/input.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-const child_process = require("child_process");
-const rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-const expectedFilePath = path.join(__dirname, "out.expected");
-
-const updateTests = process.argv[2] === "update";
-
-function postProcessErrorOutput(output) {
-  output = output.trimRight();
-  output = output.replace(new RegExp(__dirname, "gi"), ".");
-  return output;
-}
-child_process.execSync(`${rescript_exe} clean`, { cwd: __dirname });
-child_process.exec(rescript_exe, { cwd: __dirname }, (err, stdout, stderr) => {
-  const actualErrorOutput = postProcessErrorOutput(stderr.toString());
-  if (updateTests) {
-    fs.writeFileSync(expectedFilePath, actualErrorOutput);
-  } else {
-    const expectedErrorOutput = postProcessErrorOutput(
-      fs.readFileSync(expectedFilePath, { encoding: "utf-8" })
-    );
-    if (expectedErrorOutput !== actualErrorOutput) {
-      console.error(`The old and new error output aren't the same`);
-      console.error("\n=== Old:");
-      console.error(expectedErrorOutput);
-      console.error("\n=== New:");
-      console.error(actualErrorOutput);
-      process.exit(1);
-    }
-  }
-});
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/node_modules/a b/jscomp/build_tests/duplicated_symlinked_packages/node_modules/a
deleted file mode 120000
index 82f488f..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/node_modules/a
+++ /dev/null
@@ -1 +0,0 @@
-../a
\ No newline at end of file
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/node_modules/b b/jscomp/build_tests/duplicated_symlinked_packages/node_modules/b
deleted file mode 120000
index 42532fe..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/node_modules/b
+++ /dev/null
@@ -1 +0,0 @@
-../b
\ No newline at end of file
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/node_modules/z/bsconfig.json b/jscomp/build_tests/duplicated_symlinked_packages/node_modules/z/bsconfig.json
deleted file mode 100644
index c99d72b..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/node_modules/z/bsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "z",
-  "version": "0.1.0",
-  "sources": {
-    "dir" : "src",
-    "subdirs" : true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [
-
-  ],
-  "warnings": {
-    "error" : "+101"
-  },
-  "namespace": true,
-  "refmt": 3
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/node_modules/z/package.json b/jscomp/build_tests/duplicated_symlinked_packages/node_modules/z/package.json
deleted file mode 100644
index 92b37ba..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/node_modules/z/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "z",
-  "version": "0.1.0",
-  "scripts": {
-    "build": "bsb -make-world",
-    "start": "bsb -make-world -w",
-    "clean": "bsb -clean-world"
-  },
-  "keywords": [
-    "BuckleScript"
-  ],
-  "author": "",
-  "license": "MIT",
-  "devDependencies": {
-    "bs-platform": "^7.0.1",
-    "gentype": "^3.7.1"
-  }
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/node_modules/z/src/.git_keep b/jscomp/build_tests/duplicated_symlinked_packages/node_modules/z/src/.git_keep
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/out.expected b/jscomp/build_tests/duplicated_symlinked_packages/out.expected
deleted file mode 100644
index 57e0a50..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/out.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-Duplicated package: z ./node_modules/z (chosen) vs ./node_modules/a/node_modules/z in ./node_modules/a 
-Duplicated package: z ./node_modules/z (chosen) vs ./node_modules/a/node_modules/z in ./node_modules/a
\ No newline at end of file
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/rescript.json b/jscomp/build_tests/duplicated_symlinked_packages/rescript.json
deleted file mode 100644
index f789256..0000000
--- a/jscomp/build_tests/duplicated_symlinked_packages/rescript.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "duplicated-symlinked-packages",
-  "version": "0.1.0",
-  "sources": ["src"],
-  "bs-dependencies": ["a", "b", "z"]
-}
diff --git a/jscomp/build_tests/duplicated_symlinked_packages/src/.git_keep b/jscomp/build_tests/duplicated_symlinked_packages/src/.git_keep
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/build_tests/exports/input.js b/jscomp/build_tests/exports/input.js
deleted file mode 100644
index 73d0165..0000000
--- a/jscomp/build_tests/exports/input.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var child_process = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-child_process.execSync(rescript_exe, {
-  cwd: __dirname,
-  encoding: "utf8",
-});
diff --git a/jscomp/build_tests/exports/rescript.json b/jscomp/build_tests/exports/rescript.json
deleted file mode 100644
index 2414b95..0000000
--- a/jscomp/build_tests/exports/rescript.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "exports",
-  "version": "0.1.0",
-  "sources": ["src"],
-  "bs-dependencies": [
-    // add your bs-dependencies here
-  ]
-}
diff --git a/jscomp/build_tests/exports/src/demo.res b/jscomp/build_tests/exports/src/demo.res
deleted file mode 100644
index 2237670..0000000
--- a/jscomp/build_tests/exports/src/demo.res
+++ /dev/null
@@ -1,12 +0,0 @@
-exception Stack_overflow
-exception Sys_error(string)
-let _ = (Js.Int.toString, Js.Float.isNaN)
-
-/* make sure exception runtime is there */
-let f = x =>
-  switch x {
-  | Not_found => 0
-  | Invalid_argument(_)
-  | Stack_overflow => 1
-  | Sys_error(_) => 2
-  }
diff --git a/jscomp/build_tests/hyphen2/input.js b/jscomp/build_tests/hyphen2/input.js
deleted file mode 100644
index f48b5a8..0000000
--- a/jscomp/build_tests/hyphen2/input.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var p = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-p.execSync(rescript_exe, { cwd: __dirname });
diff --git a/jscomp/build_tests/hyphen2/rescript.json b/jscomp/build_tests/hyphen2/rescript.json
deleted file mode 100644
index 253e05b..0000000
--- a/jscomp/build_tests/hyphen2/rescript.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "hyphen2",
-  "version": "0.1.0",
-  "sources": ["y-src"],
-  "namespace": true
-}
diff --git a/jscomp/build_tests/hyphen2/y-src/demo.res b/jscomp/build_tests/hyphen2/y-src/demo.res
deleted file mode 100644
index 8d0b191..0000000
--- a/jscomp/build_tests/hyphen2/y-src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log("Hello, ReScript")
diff --git a/jscomp/build_tests/in_source/input.js b/jscomp/build_tests/in_source/input.js
deleted file mode 100644
index f3bbb0a..0000000
--- a/jscomp/build_tests/in_source/input.js
+++ /dev/null
@@ -1,24 +0,0 @@
-var child_process = require("child_process");
-
-var assert = require("assert");
-
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-assert.throws(
-  () => {
-    var output = child_process.execSync(`${rescript_exe} build -regen`, {
-      cwd: __dirname,
-      encoding: "utf8",
-    });
-  },
-  function (err) {
-    if (err.message.match(/detected two module formats/)) {
-      return true;
-    }
-    return false;
-  }
-);
-
-// assert.throws(()=>{
-//     throw new Error('Wrong value')
-// }, /x/)
diff --git a/jscomp/build_tests/in_source/input.sh b/jscomp/build_tests/in_source/input.sh
deleted file mode 100644
index a8e88ce..0000000
--- a/jscomp/build_tests/in_source/input.sh
+++ /dev/null
@@ -1 +0,0 @@
-rescript build -regen
\ No newline at end of file
diff --git a/jscomp/build_tests/in_source/rescript.json b/jscomp/build_tests/in_source/rescript.json
deleted file mode 100644
index fc69fdc..0000000
--- a/jscomp/build_tests/in_source/rescript.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "x",
-  "sources": ".",
-  "package-specs": [
-    {
-      "module": "commonjs",
-      "in-source": true
-    },
-    {
-      "module": "esmodule",
-      "in-source": true
-    }
-  ]
-}
diff --git a/jscomp/build_tests/install/input.js b/jscomp/build_tests/install/input.js
deleted file mode 100644
index 91dda30..0000000
--- a/jscomp/build_tests/install/input.js
+++ /dev/null
@@ -1,29 +0,0 @@
-var p = require("child_process");
-var fs = require("fs");
-var path = require("path");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-p.spawnSync(rescript_exe, [`clean`], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-p.spawnSync(rescript_exe, [`build`, `-install`], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-
-var fooExists = fs.existsSync(path.join(__dirname, "lib", "ocaml", "Foo.cmi"));
-assert.ok(fooExists == false);
-
-p.spawnSync(rescript_exe, {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-p.spawnSync(rescript_exe, [`build`, `-install`], {
-  encoding: "utf8",
-  cwd: __dirname,
-});
-
-fooExists = fs.existsSync(path.join(__dirname, "lib", "ocaml", "Foo.cmi"));
-assert.ok(fooExists);
diff --git a/jscomp/build_tests/install/rescript.json b/jscomp/build_tests/install/rescript.json
deleted file mode 100644
index c5e0d91..0000000
--- a/jscomp/build_tests/install/rescript.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "install",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [],
-  "warnings": { "error": "+101" }
-}
diff --git a/jscomp/build_tests/install/src/Foo.bs.js b/jscomp/build_tests/install/src/Foo.bs.js
deleted file mode 100644
index cf2ea83..0000000
--- a/jscomp/build_tests/install/src/Foo.bs.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function main() {
-  console.log("hello");
-}
-
-exports.main = main;
-/* No side effect */
diff --git a/jscomp/build_tests/install/src/Foo.res b/jscomp/build_tests/install/src/Foo.res
deleted file mode 100644
index 95d72e3..0000000
--- a/jscomp/build_tests/install/src/Foo.res
+++ /dev/null
@@ -1 +0,0 @@
-let main = () => Js.log("hello")
diff --git a/jscomp/build_tests/nested/.gitignore b/jscomp/build_tests/nested/.gitignore
deleted file mode 100644
index 6724ce3..0000000
--- a/jscomp/build_tests/nested/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src/**/*.js
\ No newline at end of file
diff --git a/jscomp/build_tests/nested/input.js b/jscomp/build_tests/nested/input.js
deleted file mode 100644
index b5c4be9..0000000
--- a/jscomp/build_tests/nested/input.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var p = require("child_process");
-var assert = require("assert");
-var fs = require("fs");
-var path = require("path");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-p.execSync(rescript_exe, { cwd: __dirname });
-
-var content = fs.readFileSync(path.join(__dirname, "src", "demo.js"), "utf8");
-
-assert.ok(content.match(/A00_a1_main/g).length === 3);
-assert.ok(content.match(/B00_b1_main/g).length === 3);
-assert.ok(content.match(/A0_main/g).length === 2);
-assert.ok(content.match(/a0_main/g).length === 1);
-assert.ok(content.match(/B0_main/g).length === 2);
-assert.ok(content.match(/b0_main/g).length === 1);
-
-assert.ok(require("./src/demo.js").v === 4, "nested");
diff --git a/jscomp/build_tests/nested/rescript.json b/jscomp/build_tests/nested/rescript.json
deleted file mode 100644
index 745772f..0000000
--- a/jscomp/build_tests/nested/rescript.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "nested",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "warnings": { "error": true }
-}
diff --git a/jscomp/build_tests/nested/src/a0/a0_main.res b/jscomp/build_tests/nested/src/a0/a0_main.res
deleted file mode 100644
index ab49c63..0000000
--- a/jscomp/build_tests/nested/src/a0/a0_main.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 1
diff --git a/jscomp/build_tests/nested/src/a0/a1/A00_a1_main.res b/jscomp/build_tests/nested/src/a0/a1/A00_a1_main.res
deleted file mode 100644
index ab49c63..0000000
--- a/jscomp/build_tests/nested/src/a0/a1/A00_a1_main.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 1
diff --git a/jscomp/build_tests/nested/src/b0/b0_main.res b/jscomp/build_tests/nested/src/b0/b0_main.res
deleted file mode 100644
index ab49c63..0000000
--- a/jscomp/build_tests/nested/src/b0/b0_main.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 1
diff --git a/jscomp/build_tests/nested/src/b0/b1/B00_b1_main.res b/jscomp/build_tests/nested/src/b0/b1/B00_b1_main.res
deleted file mode 100644
index ab49c63..0000000
--- a/jscomp/build_tests/nested/src/b0/b1/B00_b1_main.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 1
diff --git a/jscomp/build_tests/nested/src/demo.res b/jscomp/build_tests/nested/src/demo.res
deleted file mode 100644
index 9854cb5..0000000
--- a/jscomp/build_tests/nested/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = A00_a1_main.v + A0_main.v + B0_main.v + B00_b1_main.v
diff --git a/jscomp/build_tests/nested/src/demo.resi b/jscomp/build_tests/nested/src/demo.resi
deleted file mode 100644
index 19b83dc..0000000
--- a/jscomp/build_tests/nested/src/demo.resi
+++ /dev/null
@@ -1 +0,0 @@
-let v: int
diff --git a/jscomp/build_tests/nnest/.gitignore b/jscomp/build_tests/nnest/.gitignore
deleted file mode 100644
index 6724ce3..0000000
--- a/jscomp/build_tests/nnest/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src/**/*.js
\ No newline at end of file
diff --git a/jscomp/build_tests/nnest/input.js b/jscomp/build_tests/nnest/input.js
deleted file mode 100644
index b14c3a9..0000000
--- a/jscomp/build_tests/nnest/input.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// @ts-check
-
-var p = require("child_process");
-var assert = require("assert");
-var fs = require("fs");
-var path = require("path");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-p.execSync(rescript_exe, { cwd: __dirname });
-
-var content = fs.readFileSync(path.join(__dirname, "src", "demo.js"), "utf8");
-
-assert.ok(content.match(/A0_a1_main/g).length === 3);
-assert.ok(content.match(/B0_b1_main/g).length === 3);
-assert.ok(content.match(/A0_main/g).length === 2);
-assert.ok(content.match(/a0_main/g).length === 1);
-assert.ok(content.match(/B0_main/g).length === 2);
-assert.ok(content.match(/b0_main/g).length === 1);
-
-assert.ok(require("./src/demo.js").v === 4, "nested");
-
-// var testWarnError = /warnings\s*=\s*[^\r\n]*-warn-error/;
-
-// function hasWarnError(file) {
-//   var content = fs.readFileSync(file, "utf8");
-//   return testWarnError.test(content);
-// }
-
-// assert.ok(hasWarnError(path.join(__dirname,'lib','bs','build.ninja')))
diff --git a/jscomp/build_tests/nnest/rescript.json b/jscomp/build_tests/nnest/rescript.json
deleted file mode 100644
index e1e67b2..0000000
--- a/jscomp/build_tests/nnest/rescript.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "nested",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  },
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "namespace": true,
-  "warnings": { "error": true }
-}
diff --git a/jscomp/build_tests/nnest/src/a0/a0_main.res b/jscomp/build_tests/nnest/src/a0/a0_main.res
deleted file mode 100644
index ab49c63..0000000
--- a/jscomp/build_tests/nnest/src/a0/a0_main.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 1
diff --git a/jscomp/build_tests/nnest/src/a0/a1/A0_a1_main.res b/jscomp/build_tests/nnest/src/a0/a1/A0_a1_main.res
deleted file mode 100644
index ab49c63..0000000
--- a/jscomp/build_tests/nnest/src/a0/a1/A0_a1_main.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 1
diff --git a/jscomp/build_tests/nnest/src/b0/b0_main.res b/jscomp/build_tests/nnest/src/b0/b0_main.res
deleted file mode 100644
index ab49c63..0000000
--- a/jscomp/build_tests/nnest/src/b0/b0_main.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 1
diff --git a/jscomp/build_tests/nnest/src/b0/b1/B0_b1_main.res b/jscomp/build_tests/nnest/src/b0/b1/B0_b1_main.res
deleted file mode 100644
index ab49c63..0000000
--- a/jscomp/build_tests/nnest/src/b0/b1/B0_b1_main.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 1
diff --git a/jscomp/build_tests/nnest/src/demo.res b/jscomp/build_tests/nnest/src/demo.res
deleted file mode 100644
index fc7ba35..0000000
--- a/jscomp/build_tests/nnest/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = A0_a1_main.v + A0_main.v + B0_main.v + B0_b1_main.v
diff --git a/jscomp/build_tests/ns/input.js b/jscomp/build_tests/ns/input.js
deleted file mode 100755
index 2cb4c61..0000000
--- a/jscomp/build_tests/ns/input.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var child_process = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-child_process.execSync(rescript_exe, { cwd: __dirname });
diff --git a/jscomp/build_tests/ns/rescript.json b/jscomp/build_tests/ns/rescript.json
deleted file mode 100644
index 058894d..0000000
--- a/jscomp/build_tests/ns/rescript.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "ns",
-  "version": "0.1.0",
-  "sources": ["src"],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "namespace": true
-}
diff --git a/jscomp/build_tests/ns/src/demo.js b/jscomp/build_tests/ns/src/demo.js
deleted file mode 100644
index 18b4316..0000000
--- a/jscomp/build_tests/ns/src/demo.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Hello$Ns = require("./hello.js");
-
-console.log(Hello$Ns.a + Hello$Ns.b | 0);
-
-/*  Not a pure module */
diff --git a/jscomp/build_tests/ns/src/demo.res b/jscomp/build_tests/ns/src/demo.res
deleted file mode 100644
index b4490c8..0000000
--- a/jscomp/build_tests/ns/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log(Hello.a + Hello.b)
diff --git a/jscomp/build_tests/ns/src/hello.js b/jscomp/build_tests/ns/src/hello.js
deleted file mode 100644
index 928177b..0000000
--- a/jscomp/build_tests/ns/src/hello.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a = 4;
-
-var b = 2;
-
-exports.a = a;
-exports.b = b;
-/* No side effect */
diff --git a/jscomp/build_tests/ns/src/hello.res b/jscomp/build_tests/ns/src/hello.res
deleted file mode 100644
index 36b7020..0000000
--- a/jscomp/build_tests/ns/src/hello.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let a = 3 + 1
-
-let b = 2
diff --git a/jscomp/build_tests/post-build/input.js b/jscomp/build_tests/post-build/input.js
deleted file mode 100644
index a9bee83..0000000
--- a/jscomp/build_tests/post-build/input.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var child_process = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-var out = child_process.spawnSync(rescript_exe, { encoding: "utf8" });
-
-if (out.status !== 0) {
-  assert.fail(out.stdout + out.stderr);
-}
diff --git a/jscomp/build_tests/post-build/rescript.json b/jscomp/build_tests/post-build/rescript.json
deleted file mode 100644
index 8e11d4d..0000000
--- a/jscomp/build_tests/post-build/rescript.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "post-build",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  },
-  "js-post-build": { "cmd": "cat" },
-  "warnings": {
-    "error": "+101"
-  }
-}
diff --git a/jscomp/build_tests/post-build/src/demo.res b/jscomp/build_tests/post-build/src/demo.res
deleted file mode 100644
index 8d0b191..0000000
--- a/jscomp/build_tests/post-build/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log("Hello, ReScript")
diff --git a/jscomp/build_tests/post-build/src/hello.res b/jscomp/build_tests/post-build/src/hello.res
deleted file mode 100644
index 1bf62c4..0000000
--- a/jscomp/build_tests/post-build/src/hello.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = 3
diff --git a/jscomp/build_tests/react_ppx/input.js b/jscomp/build_tests/react_ppx/input.js
deleted file mode 100644
index 060dd91..0000000
--- a/jscomp/build_tests/react_ppx/input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//@ts-check
-var cp = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-cp.execSync(rescript_exe, { cwd: __dirname });
diff --git a/jscomp/build_tests/react_ppx/rescript.json b/jscomp/build_tests/react_ppx/rescript.json
deleted file mode 100644
index 1b1e7ab..0000000
--- a/jscomp/build_tests/react_ppx/rescript.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "react-ppx-tests",
-  "reason": {
-    "react-jsx": 3
-  },
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  },
-  "package-specs": [
-    {
-      "module": "commonjs",
-      "in-source": true
-    }
-  ],
-  "suffix": ".bs.js",
-  "namespace": true
-}
diff --git a/jscomp/build_tests/react_ppx/src/React.bs.js b/jscomp/build_tests/react_ppx/src/React.bs.js
deleted file mode 100644
index 3f1bab6..0000000
--- a/jscomp/build_tests/react_ppx/src/React.bs.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var Ref = {};
-
-var Children = {};
-
-var Context = {};
-
-var Fragment = {};
-
-var Suspense = {};
-
-exports.Ref = Ref;
-exports.Children = Children;
-exports.Context = Context;
-exports.Fragment = Fragment;
-exports.Suspense = Suspense;
-/* No side effect */
diff --git a/jscomp/build_tests/react_ppx/src/React.res b/jscomp/build_tests/react_ppx/src/React.res
deleted file mode 100644
index f1aa892..0000000
--- a/jscomp/build_tests/react_ppx/src/React.res
+++ /dev/null
@@ -1,295 +0,0 @@
-type element
-
-@val external null: element = "null"
-
-external string: string => element = "%identity"
-
-external array: array<element> => element = "%identity"
-
-type componentLike<'props, 'return> = 'props => 'return
-
-type component<'props> = componentLike<'props, element>
-
-@module("react")
-external createElement: (component<'props>, 'props) => element = "createElement"
-
-@module("react")
-external cloneElement: (component<'props>, 'props) => element = "cloneElement"
-
-@variadic @module("react")
-external createElementVariadic: (component<'props>, 'props, array<element>) => element =
-  "createElement"
-
-module Ref = {
-  type t<'value>
-
-  @get external current: t<'value> => 'value = "current"
-  @set external setCurrent: (t<'value>, 'value) => unit = "current"
-}
-
-@module("react")
-external createRef: unit => Ref.t<Js.nullable<'a>> = "createRef"
-
-module Children = {
-  @module("react") @scope("Children") @val
-  external map: (element, element => element) => element = "map"
-  @module("react") @scope("Children") @val
-  external forEach: (element, element => unit) => unit = "forEach"
-  @module("react") @scope("Children") @val
-  external count: element => int = "count"
-  @module("react") @scope("Children") @val
-  external only: element => element = "only"
-  @module("react") @scope("Children") @val
-  external toArray: element => array<element> = "toArray"
-}
-
-module Context = {
-  type t<'props>
-
-  @get
-  external provider: t<'props> => component<{"value": 'props, "children": element}> = "Provider"
-}
-
-@module("react")
-external createContext: 'a => Context.t<'a> = "createContext"
-
-@module("react")
-external forwardRef: (@uncurry ('props, Js.Nullable.t<Ref.t<'a>>) => element) => component<'props> =
-  "forwardRef"
-
-@module("react")
-external memo: component<'props> => component<'props> = "memo"
-
-@module("react")
-external memoCustomCompareProps: (
-  component<'props>,
-  @uncurry ('props, 'props) => bool,
-) => component<'props> = "memo"
-
-module Fragment = {
-  @obj
-  external makeProps: (~children: element, ~key: 'key=?, unit) => {"children": element} = ""
-  @module("react")
-  external make: component<{
-    "children": element,
-  }> = "Fragment"
-}
-
-module Suspense = {
-  @obj
-  external makeProps: (
-    ~children: element=?,
-    ~fallback: element=?,
-    ~maxDuration: int=?,
-    ~key: 'key=?,
-    unit,
-  ) => {"children": option<element>, "fallback": option<element>, "maxDuration": option<int>} = ""
-  @module("react")
-  external make: component<{
-    "children": option<element>,
-    "fallback": option<element>,
-    "maxDuration": option<int>,
-  }> = "Suspense"
-}
-
-/* HOOKS */
-
-/*
- * Yeah, we know this api isn't great. tl;dr: useReducer instead.
- * It's because useState can take functions or non-function values and treats
- * them differently. Lazy initializer + callback which returns state is the
- * only way to safely have any type of state and be able to update it correctly.
- */
-@module("react")
-external useState: (@uncurry (unit => 'state)) => ('state, ('state => 'state) => unit) = "useState"
-
-@module("react")
-external useReducer: (@uncurry ('state, 'action) => 'state, 'state) => ('state, 'action => unit) =
-  "useReducer"
-
-@module("react")
-external useReducerWithMapState: (
-  @uncurry ('state, 'action) => 'state,
-  'initialState,
-  'initialState => 'state,
-) => ('state, 'action => unit) = "useReducer"
-
-@module("react")
-external useEffect: (@uncurry (unit => option<unit => unit>)) => unit = "useEffect"
-@module("react")
-external useEffect0: (@uncurry (unit => option<unit => unit>), @as(json`[]`) _) => unit =
-  "useEffect"
-@module("react")
-external useEffect1: (@uncurry (unit => option<unit => unit>), array<'a>) => unit = "useEffect"
-@module("react")
-external useEffect2: (@uncurry (unit => option<unit => unit>), ('a, 'b)) => unit = "useEffect"
-@module("react")
-external useEffect3: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c)) => unit = "useEffect"
-@module("react")
-external useEffect4: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd)) => unit =
-  "useEffect"
-@module("react")
-external useEffect5: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd, 'e)) => unit =
-  "useEffect"
-@module("react")
-external useEffect6: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd, 'e, 'f)) => unit =
-  "useEffect"
-@module("react")
-external useEffect7: (
-  @uncurry (unit => option<unit => unit>),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => unit = "useEffect"
-
-@module("react")
-external useLayoutEffect: (@uncurry (unit => option<unit => unit>)) => unit = "useLayoutEffect"
-@module("react")
-external useLayoutEffect0: (@uncurry (unit => option<unit => unit>), @as(json`[]`) _) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect1: (@uncurry (unit => option<unit => unit>), array<'a>) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect2: (@uncurry (unit => option<unit => unit>), ('a, 'b)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect3: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect4: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect5: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd, 'e)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect6: (
-  @uncurry (unit => option<unit => unit>),
-  ('a, 'b, 'c, 'd, 'e, 'f),
-) => unit = "useLayoutEffect"
-@module("react")
-external useLayoutEffect7: (
-  @uncurry (unit => option<unit => unit>),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => unit = "useLayoutEffect"
-
-@module("react")
-external useMemo: (@uncurry (unit => 'any)) => 'any = "useMemo"
-@module("react")
-external useMemo0: (@uncurry (unit => 'any), @as(json`[]`) _) => 'any = "useMemo"
-@module("react")
-external useMemo1: (@uncurry (unit => 'any), array<'a>) => 'any = "useMemo"
-@module("react")
-external useMemo2: (@uncurry (unit => 'any), ('a, 'b)) => 'any = "useMemo"
-@module("react")
-external useMemo3: (@uncurry (unit => 'any), ('a, 'b, 'c)) => 'any = "useMemo"
-@module("react")
-external useMemo4: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd)) => 'any = "useMemo"
-@module("react")
-external useMemo5: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd, 'e)) => 'any = "useMemo"
-@module("react")
-external useMemo6: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd, 'e, 'f)) => 'any = "useMemo"
-@module("react")
-external useMemo7: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd, 'e, 'f, 'g)) => 'any = "useMemo"
-
-/* This is used as return values */
-type callback<'input, 'output> = 'input => 'output
-
-@module("react")
-external useCallback: (@uncurry ('input => 'output)) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback0: (
-  @uncurry ('input => 'output),
-  @as(json`[]`) _,
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback1: (@uncurry ('input => 'output), array<'a>) => callback<'input, 'output> =
-  "useCallback"
-@module("react")
-external useCallback2: (@uncurry ('input => 'output), ('a, 'b)) => callback<'input, 'output> =
-  "useCallback"
-@module("react")
-external useCallback3: (@uncurry ('input => 'output), ('a, 'b, 'c)) => callback<'input, 'output> =
-  "useCallback"
-@module("react")
-external useCallback4: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd),
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback5: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd, 'e),
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback6: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd, 'e, 'f),
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback7: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => callback<'input, 'output> = "useCallback"
-
-@module("react")
-external useContext: Context.t<'any> => 'any = "useContext"
-
-@module("react") external useRef: 'value => Ref.t<'value> = "useRef"
-
-@module("react")
-external useImperativeHandle0: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  @as(json`[]`) _,
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle1: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  array<'a>,
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle2: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle3: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle4: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle5: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd, 'e),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle6: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd, 'e, 'f),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle7: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => unit = "useImperativeHandle"
-
-@set
-external setDisplayName: (component<'props>, string) => unit = "displayName"
diff --git a/jscomp/build_tests/react_ppx/src/gpr_3695_test.bs.js b/jscomp/build_tests/react_ppx/src/gpr_3695_test.bs.js
deleted file mode 100644
index 7641805..0000000
--- a/jscomp/build_tests/react_ppx/src/gpr_3695_test.bs.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Foo = require("Foo");
-var Curry = require("rescript/lib/js/curry.js");
-
-var React = {};
-
-var Test = {};
-
-function test(className) {
-  return Curry._1(Foo, {
-              className: className
-            });
-}
-
-exports.React = React;
-exports.Test = Test;
-exports.test = test;
-/* Foo Not a pure module */
diff --git a/jscomp/build_tests/react_ppx/src/gpr_3695_test.res b/jscomp/build_tests/react_ppx/src/gpr_3695_test.res
deleted file mode 100644
index 8549013..0000000
--- a/jscomp/build_tests/react_ppx/src/gpr_3695_test.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module React = {
-  type element
-  type componentLike<'props, 'return> = 'props => 'return
-}
-
-module Test = {
-  @module @react.component
-  external make: (~className: string=?) => React.element = "Foo"
-}
-
-let test = (~className) => Test.make(Test.makeProps(~className, ()))
diff --git a/jscomp/build_tests/react_ppx/src/gpr_3987_test.bs.js b/jscomp/build_tests/react_ppx/src/gpr_3987_test.bs.js
deleted file mode 100644
index aee858b..0000000
--- a/jscomp/build_tests/react_ppx/src/gpr_3987_test.bs.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var React = require("react");
-
-function makeContainer(text) {
-  var container = document.createElement("div");
-  container.className = "container";
-  var title = document.createElement("div");
-  title.className = "containerTitle";
-  title.innerText = text;
-  var content = document.createElement("div");
-  content.className = "containerContent";
-  container.appendChild(title);
-  container.appendChild(content);
-  document.body.appendChild(container);
-  return content;
-}
-
-function makeProps(value, onChange, param) {
-  return {
-          value: value,
-          onChange: onChange
-        };
-}
-
-function make(_props) {
-  return null;
-}
-
-var Gpr3987ReproOk = {
-  makeProps: makeProps,
-  make: make
-};
-
-React.createElement(make, makeProps("test", (function (param, param$1) {
-            
-          }), undefined));
-
-function Gpr_3987_test$Gpr3987ReproOk2(Props) {
-  return null;
-}
-
-var Gpr3987ReproOk2 = {
-  make: Gpr_3987_test$Gpr3987ReproOk2
-};
-
-React.createElement(Gpr_3987_test$Gpr3987ReproOk2, {
-      value: "test",
-      onChange: (function (param, param$1) {
-          
-        })
-    });
-
-function Gpr_3987_test$Gpr3987ReproError(Props) {
-  return null;
-}
-
-var Gpr3987ReproError = {
-  make: Gpr_3987_test$Gpr3987ReproError
-};
-
-React.createElement(Gpr_3987_test$Gpr3987ReproError, {
-      value: "test",
-      onChange: (function (param, param$1) {
-          
-        })
-    });
-
-exports.makeContainer = makeContainer;
-exports.Gpr3987ReproOk = Gpr3987ReproOk;
-exports.Gpr3987ReproOk2 = Gpr3987ReproOk2;
-exports.Gpr3987ReproError = Gpr3987ReproError;
-/*  Not a pure module */
diff --git a/jscomp/build_tests/react_ppx/src/gpr_3987_test.res b/jscomp/build_tests/react_ppx/src/gpr_3987_test.res
deleted file mode 100644
index de195e3..0000000
--- a/jscomp/build_tests/react_ppx/src/gpr_3987_test.res
+++ /dev/null
@@ -1,51 +0,0 @@
-// Entry point
-@val external document: {..} = "document"
-
-// We're using raw DOM manipulations here, to avoid making you read
-// ReasonReact when you might precisely be trying to learn it for the first
-// time through the examples later.
-let makeContainer = text => {
-  let container = document["createElement"]("div")
-  container["className"] = "container"
-
-  let title = document["createElement"]("div")
-  title["className"] = "containerTitle"
-  title["innerText"] = text
-
-  let content = document["createElement"]("div")
-  content["className"] = "containerContent"
-
-  let () = container["appendChild"](title)
-  let () = container["appendChild"](content)
-  let () = document["body"]["appendChild"](container)
-
-  content
-}
-
-/* This uncurried prop definition compiles */
-module Gpr3987ReproOk = {
-  let makeProps = (~value: string, ~onChange: (. string, int) => unit, ()) =>
-    {"value": value, "onChange": onChange}
-
-  let make = (_props: {"value": string, "onChange": (. string, int) => unit}) => React.null
-}
-
-let _ = <Gpr3987ReproOk value="test" onChange={(. _, _) => ()} />
-
-/* Extracted type for the uncurried prop compiles as well */
-module Gpr3987ReproOk2 = {
-  type onChange = (. string, int) => unit
-
-  @react.component
-  let make = (~value as _, ~onChange as _: onChange) => React.null
-}
-
-let _ = <Gpr3987ReproOk2 value="test" onChange={(. _, _) => ()} />
-
-/* Inline uncurried prop type causes an error */
-module Gpr3987ReproError = {
-  @react.component
-  let make = (~value as _: string, ~onChange as _: (. string, int) => unit) => React.null
-}
-
-let _ = <Gpr3987ReproError value="test" onChange={(. _, _) => ()} />
diff --git a/jscomp/build_tests/react_ppx/src/recursive_component_test.bs.js b/jscomp/build_tests/react_ppx/src/recursive_component_test.bs.js
deleted file mode 100644
index 860ce62..0000000
--- a/jscomp/build_tests/react_ppx/src/recursive_component_test.bs.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var React = require("react");
-
-function make(Props) {
-  var foo = Props.foo;
-  return React.createElement(make, {
-              foo: foo
-            });
-}
-
-function mm(x) {
-  return make$1({
-              b: !x.b
-            });
-}
-
-function make$1(props) {
-  return mm({
-              b: props.b
-            });
-}
-
-var Rec = {
-  make: make$1,
-  mm: mm
-};
-
-exports.make = make;
-exports.Rec = Rec;
-/* react Not a pure module */
diff --git a/jscomp/build_tests/react_ppx/src/recursive_component_test.res b/jscomp/build_tests/react_ppx/src/recursive_component_test.res
deleted file mode 100644
index cdd39eb..0000000
--- a/jscomp/build_tests/react_ppx/src/recursive_component_test.res
+++ /dev/null
@@ -1,19 +0,0 @@
-@@warning("-39")
-// https://github.com/rescript-lang/rescript-compiler/issues/4511
-/*
-[@bs.config {
-  flags : [|"-dsource"|]
-}];
-*/
-@react.component
-let rec make = (~foo, ()) => React.createElement(make, makeProps(~foo, ()))
-
-@@jsxConfig({version:4})
-
-module Rec = {
-  @react.component
-  let rec make = (~b) => {
-    mm({b:b})
-  }
-  and mm = (x) => make({b: ! x.b})
-}
diff --git a/jscomp/build_tests/rerror/input.js b/jscomp/build_tests/rerror/input.js
deleted file mode 100644
index 54c50c0..0000000
--- a/jscomp/build_tests/rerror/input.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var child_process = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-child_process.spawnSync(`${rescript_exe} clean`, {
-  cwd: __dirname,
-  encoding: "utf8",
-});
-var o = child_process.spawnSync(rescript_exe, {
-  cwd: __dirname,
-  encoding: "utf8",
-  shell: true,
-});
-
-// verify the output is in reason syntax
-var u = o.stdout.match(/=>/g);
-
-var lines = o.stdout
-  .split("\n")
-  .map(x => x.trim())
-  .filter(Boolean);
-// console.log(`lines: \n${lines}`)
-// console.log(lines[4])
-var test = false;
-for (var i = 0; i < lines.length; ++i) {
-  if (lines[i] === "We've found a bug for you!") {
-    console.log(`line ${i} found`);
-    assert.ok(/src\/demo.res:1:21-23/.test(lines[i + 1]));
-    test = true;
-  }
-}
-assert.ok(test);
-assert.ok(u.length === 2);
diff --git a/jscomp/build_tests/rerror/rescript.json b/jscomp/build_tests/rerror/rescript.json
deleted file mode 100644
index cfbe852..0000000
--- a/jscomp/build_tests/rerror/rescript.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "rerror",
-  "version": "0.1.0",
-  "sources": ["src"],
-  "bs-dependencies": []
-}
diff --git a/jscomp/build_tests/rerror/src/demo.res b/jscomp/build_tests/rerror/src/demo.res
deleted file mode 100644
index f0498cc..0000000
--- a/jscomp/build_tests/rerror/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let x: int => int = "x"
diff --git a/jscomp/build_tests/rerror/tasks.json b/jscomp/build_tests/rerror/tasks.json
deleted file mode 100644
index 2936762..0000000
--- a/jscomp/build_tests/rerror/tasks.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "version": "0.1.0",
-  "command": "npm",
-  "options": {
-    "cwd": "${workspaceRoot}"
-  },
-  "isShellCommand": true,
-  "args": ["run", "watch"],
-  "showOutput": "always",
-  "isBackground": true,
-  "problemMatcher": {
-    "fileLocation": "absolute",
-    "owner": "ocaml",
-    "watching": {
-      "activeOnStart": false,
-      "beginsPattern": ">>>> Start compiling",
-      "endsPattern": ">>>> Finish compiling"
-    },
-    "pattern": [
-      {
-        "regexp": "^File \"(.*)\", line (\\d+)(?:, characters (\\d+)-(\\d+))?:$",
-        "file": 1,
-        "line": 2,
-        "column": 3,
-        "endColumn": 4
-      },
-      {
-        "regexp": "^(?:(?:Parse\\s+)?(Warning|[Ee]rror)(?:\\s+\\d+)?:)?\\s+(.*)$",
-        "severity": 1,
-        "message": 2,
-        "loop": true
-      }
-    ]
-  }
-}
diff --git a/jscomp/build_tests/scoped_ppx/.gitignore b/jscomp/build_tests/scoped_ppx/.gitignore
deleted file mode 100644
index c476e05..0000000
--- a/jscomp/build_tests/scoped_ppx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.merlin
\ No newline at end of file
diff --git a/jscomp/build_tests/scoped_ppx/input.js b/jscomp/build_tests/scoped_ppx/input.js
deleted file mode 100644
index 310fbfb..0000000
--- a/jscomp/build_tests/scoped_ppx/input.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var cp = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-cp.execSync(rescript_exe, { cwd: __dirname, encoding: "utf8" });
-
-var output = cp.execSync(`${rescript_exe} build -- -t commands src/hello.ast`, {
-  cwd: __dirname,
-  encoding: "utf8",
-});
-assert(
-  /-ppx '.*\/test\.js -hello' -ppx '.*\/test\.js -heyy' -ppx .*test\.js/.test(
-    output
-  )
-);
diff --git a/jscomp/build_tests/scoped_ppx/node_modules/@hongbo/ppx1/test.js b/jscomp/build_tests/scoped_ppx/node_modules/@hongbo/ppx1/test.js
deleted file mode 100755
index 34ea829..0000000
--- a/jscomp/build_tests/scoped_ppx/node_modules/@hongbo/ppx1/test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env node
-//@ts-check
-var fs = require('fs')
-
-// let [_node, _js,  file_in, file_out] = process.argv
-var file_in = process.argv[process.argv.length - 2]
-var file_out = process.argv[process.argv.length - 1]
-// console.log(process.argv)
-// debugger;
-fs.createReadStream(file_in)
-    .pipe(fs.createWriteStream(file_out))
-
diff --git a/jscomp/build_tests/scoped_ppx/rescript.json b/jscomp/build_tests/scoped_ppx/rescript.json
deleted file mode 100644
index 42483ad..0000000
--- a/jscomp/build_tests/scoped_ppx/rescript.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ppx-flags": [
-    ["@hongbo/ppx1/test.js", "-hello"],
-    ["@hongbo/ppx1/test.js", "-heyy"],
-    "@hongbo/ppx1/test.js"
-  ],
-  "sources": {
-    "dir": "src"
-  },
-  "name": "hello"
-}
diff --git a/jscomp/build_tests/scoped_ppx/src/hello.res b/jscomp/build_tests/scoped_ppx/src/hello.res
deleted file mode 100644
index ab49c63..0000000
--- a/jscomp/build_tests/scoped_ppx/src/hello.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 1
diff --git a/jscomp/build_tests/super_errors/.gitignore b/jscomp/build_tests/super_errors/.gitignore
deleted file mode 100644
index e0473fd..0000000
--- a/jscomp/build_tests/super_errors/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-fixtures/*.js
diff --git a/jscomp/build_tests/super_errors/README.md b/jscomp/build_tests/super_errors/README.md
deleted file mode 100644
index b0c6191..0000000
--- a/jscomp/build_tests/super_errors/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Special tests for super errors (the pretty error display).
-
-Follow CONTRIBUTING.md and build the project, then run `node ./jscomp/build_tests/super_errors/input.js` at the root of the project to check the tests against previous snapshots.
-
-Run `node ./jscomp/build_tests/super_errors/input.js update` to update the snapshots (assuming you've made some changes to super errors' display and/or messages).
diff --git a/jscomp/build_tests/super_errors/expected/DerivingAccessorsRecordParam.res.expected b/jscomp/build_tests/super_errors/expected/DerivingAccessorsRecordParam.res.expected
deleted file mode 100644
index 2ac313b..0000000
--- a/jscomp/build_tests/super_errors/expected/DerivingAccessorsRecordParam.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/DerivingAccessorsRecordParam.res:2:10-25
-
-  1 │ @deriving(accessors)
-  2 │ type t = Struct({a: int})
-  3 │ 
-
-  @deriving(accessors) from a variant record argument is unsupported. Either define the record type separately from the variant type or use a positional argument.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/RecordInclusion.res.expected b/jscomp/build_tests/super_errors/expected/RecordInclusion.res.expected
deleted file mode 100644
index 7f3f6db..0000000
--- a/jscomp/build_tests/super_errors/expected/RecordInclusion.res.expected
+++ /dev/null
@@ -1,22 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/RecordInclusion.res:3:5-5:1
-
-  1 │ module M : {
-  2 │   type t<'a, 'b, 'c> = {x:int, y:list<('a, 'b)>, z:int}
-  3 │ } = {
-  4 │   type t<'a, 'b, 'c> = {x:int, y:list<('a, 'c)>, z:int}
-  5 │ }
-  6 │ 
-
-  Signature mismatch:
-  ...
-  Type declarations do not match:
-    type t<'a, 'b, 'c> = {x: int, y: list<('a, 'c)>, z: int}
-  is not included in
-    type t<'a, 'b, 'c> = {x: int, y: list<('a, 'b)>, z: int}
-  /.../fixtures/RecordInclusion.res:2:3-55:
-    Expected declaration
-  /.../fixtures/RecordInclusion.res:4:3-55:
-    Actual declaration
-  The types for field y are not equal.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/UncurriedArgsNotApplied.res.expected b/jscomp/build_tests/super_errors/expected/UncurriedArgsNotApplied.res.expected
deleted file mode 100644
index ed86996..0000000
--- a/jscomp/build_tests/super_errors/expected/UncurriedArgsNotApplied.res.expected
+++ /dev/null
@@ -1,15 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/UncurriedArgsNotApplied.res:3:15-21
-
-  1 │ let apply = (fn: (. unit) => option<int>) => fn(. ())
-  2 │ 
-  3 │ let _ = apply(Some(1))
-  4 │ 
-
-  This value might need to be wrapped in a function that takes an extra
-  parameter of type unit
-  
-  Here's the original error message
-  This has type: option<'a>
-  But it's expected to have type: (. unit) => option<int>
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/UntaggedImplIntf.res.expected b/jscomp/build_tests/super_errors/expected/UntaggedImplIntf.res.expected
deleted file mode 100644
index ffdcb97..0000000
--- a/jscomp/build_tests/super_errors/expected/UntaggedImplIntf.res.expected
+++ /dev/null
@@ -1,29 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/UntaggedImplIntf.res:3:5-5:1
-
-  1 │ module M: {
-  2 │   @unboxed type t = | @as(null) A
-  3 │ } = {
-  4 │   type t = | @as(null) A
-  5 │ }
-
-  Signature mismatch:
-  Modules do not match:
-    {
-  type t = @as(null) A
-}
-  is not included in
-    {
-  @unboxed type t = @as(null) A
-}
-  Type declarations do not match:
-    type t = @as(null) A
-  is not included in
-    @unboxed type t = @as(null) A
-  /.../fixtures/UntaggedImplIntf.res:2:12-33:
-    Expected declaration
-  /.../fixtures/UntaggedImplIntf.res:4:3-24:
-    Actual declaration
-  Their internal representations differ:
-  the second declaration uses unboxed representation.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/UntaggedNonUnary1.res.expected b/jscomp/build_tests/super_errors/expected/UntaggedNonUnary1.res.expected
deleted file mode 100644
index fd11bbf..0000000
--- a/jscomp/build_tests/super_errors/expected/UntaggedNonUnary1.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/UntaggedNonUnary1.res:2:1-27
-
-  1 │ @unboxed
-  2 │ type t = Tuple(int, string)
-  3 │ 
-
-  This untagged variant definition is invalid: Constructor Tuple has more than one argument.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/UntaggedNonUnary2.res.expected b/jscomp/build_tests/super_errors/expected/UntaggedNonUnary2.res.expected
deleted file mode 100644
index 220c6f6..0000000
--- a/jscomp/build_tests/super_errors/expected/UntaggedNonUnary2.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/UntaggedNonUnary2.res:2:1-42
-
-  1 │ @unboxed
-  2 │ type t = Tuple(int, string) | Float(float)
-  3 │ 
-
-  This untagged variant definition is invalid: Constructor Tuple has more than one argument.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/UntaggedTupleAndArray.res.expected b/jscomp/build_tests/super_errors/expected/UntaggedTupleAndArray.res.expected
deleted file mode 100644
index f472163..0000000
--- a/jscomp/build_tests/super_errors/expected/UntaggedTupleAndArray.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/UntaggedTupleAndArray.res:4:3-21
-
-  2 │ type t =
-  3 │   | Array(array<int>)
-  4 │   | Tuple((int, int))
-  5 │ 
-
-  This untagged variant definition is invalid: At most one case can be an array or tuple type.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/UntaggedUnknown.res.expected b/jscomp/build_tests/super_errors/expected/UntaggedUnknown.res.expected
deleted file mode 100644
index 77ebe41..0000000
--- a/jscomp/build_tests/super_errors/expected/UntaggedUnknown.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/UntaggedUnknown.res:2:10-26
-
-  1 │ @unboxed
-  2 │ type t = List(list<float>) | Float(float)
-  3 │ 
-
-  This untagged variant definition is invalid: Case List has a payload that is not of one of the recognized shapes (object, array, etc). Then it must be the only case with payloads.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/arity_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/arity_mismatch.res.expected
deleted file mode 100644
index 66063e7..0000000
--- a/jscomp/build_tests/super_errors/expected/arity_mismatch.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/arity_mismatch.res:2:21-27
-
-  1 │ let makeVar = (. ~f, ()) => 34
-  2 │ let makeVariables = makeVar(.~f=f => f)
-  3 │ 
-
-  This uncurried function has type (. ~f: 'a => 'a, unit) => int
-  It is applied with 1 arguments but it requires 2.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/arity_mismatch2.res.expected b/jscomp/build_tests/super_errors/expected/arity_mismatch2.res.expected
deleted file mode 100644
index 0bd3bd9..0000000
--- a/jscomp/build_tests/super_errors/expected/arity_mismatch2.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/arity_mismatch2.res:2:21-27
-
-  1 │ let makeVar = (. f, ()) => 34
-  2 │ let makeVariables = makeVar(. 1, 2, 3)
-  3 │ 
-
-  This uncurried function has type (. 'a, unit) => int
-  It is applied with 3 arguments but it requires 2.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/arity_mismatch3.res.expected b/jscomp/build_tests/super_errors/expected/arity_mismatch3.res.expected
deleted file mode 100644
index 1a54441..0000000
--- a/jscomp/build_tests/super_errors/expected/arity_mismatch3.res.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/arity_mismatch3.res:1:21-33
-
-  1 │ Belt.Array.mapU([], (. a, b) => 1)
-  2 │ 
-
-  This function expected 1 argument, but got 2
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/array_item_type_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/array_item_type_mismatch.res.expected
deleted file mode 100644
index 54c99ad..0000000
--- a/jscomp/build_tests/super_errors/expected/array_item_type_mismatch.res.expected
+++ /dev/null
@@ -1,17 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/array_item_type_mismatch.res:1:16-22
-
-  1 │ let x = [1, 2, "hello"]
-  2 │ 
-
-  This array item has type: string
-  But this array is expected to have items of type: int
-
-  Arrays can only contain items of the same type.
-
-  Possible solutions:
-  - Convert all values in the array to the same type.
-  - Use a tuple, if your array is of fixed length. Tuples can mix types freely, and compiles to a JavaScript array. Example of a tuple: `let myTuple = (10, "hello", 15.5, true)
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/await.res.expected b/jscomp/build_tests/super_errors/expected/await.res.expected
deleted file mode 100644
index bbea40f..0000000
--- a/jscomp/build_tests/super_errors/expected/await.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/await.res:4:9-17
-
-  2 │ let foo = async () => {
-  3 │   let _ = ()
-  4 │   () => await a()
-  5 │ }
-  6 │ 
-
-  Await on expression not in an async context
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/bigint_match_literal.res.expected b/jscomp/build_tests/super_errors/expected/bigint_match_literal.res.expected
deleted file mode 100644
index 2093c55..0000000
--- a/jscomp/build_tests/super_errors/expected/bigint_match_literal.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Warning number 11
-  /.../fixtures/bigint_match_literal.res:3:3-4
-
-  1 │ let m1 = switch 1n {
-  2 │ | 0001n => 1
-  3 │ | 1n => 1
-  4 │ | -0001n => -1
-  5 │ | _ => 0
-
-  this match case is unused.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/c_for_u_in_c_mode.res.expected b/jscomp/build_tests/super_errors/expected/c_for_u_in_c_mode.res.expected
deleted file mode 100644
index a76943f..0000000
--- a/jscomp/build_tests/super_errors/expected/c_for_u_in_c_mode.res.expected
+++ /dev/null
@@ -1,28 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/c_for_u_in_c_mode.res:3:5-5:1
-
-  1 │ module Foo: {
-  2 │   let add: (. int, int) => int
-  3 │ } = {
-  4 │   let add = (a, b) => a + b
-  5 │ }
-  6 │ 
-
-  Signature mismatch:
-  Modules do not match:
-    {
-  let add: (int, int) => int
-}
-  is not included in
-    {
-  let add: (. int, int) => int
-}
-  Values do not match:
-    let add: (int, int) => int (curried)
-  is not included in
-    let add: (. int, int) => int (uncurried)
-  /.../fixtures/c_for_u_in_c_mode.res:2:3-30:
-    Expected declaration
-  /.../fixtures/c_for_u_in_c_mode.res:4:7-9:
-    Actual declaration
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/c_for_u_in_u_mode.res.expected b/jscomp/build_tests/super_errors/expected/c_for_u_in_u_mode.res.expected
deleted file mode 100644
index 3b3462a..0000000
--- a/jscomp/build_tests/super_errors/expected/c_for_u_in_u_mode.res.expected
+++ /dev/null
@@ -1,29 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/c_for_u_in_u_mode.res:5:5-8:1
-
-  3 │ module Foo: {
-  4 │   let add: (int, int) => int
-  5 │ } = {
-  6 │   @@uncurried.swap
-  7 │   let add = (. a, b) => a + b
-  8 │ }
-  9 │ 
-
-  Signature mismatch:
-  Modules do not match:
-    {
-  let add: (int, int) => int
-}
-  is not included in
-    {
-  let add: (int, int) => int
-}
-  Values do not match:
-    let add: (int, int) => int (curried)
-  is not included in
-    let add: (int, int) => int (uncurried)
-  /.../fixtures/c_for_u_in_u_mode.res:4:3-28:
-    Expected declaration
-  /.../fixtures/c_for_u_in_u_mode.res:7:7-9:
-    Actual declaration
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/collections.res.expected b/jscomp/build_tests/super_errors/expected/collections.res.expected
deleted file mode 100644
index 41b190b..0000000
--- a/jscomp/build_tests/super_errors/expected/collections.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/collections.res:2:12-18
-
-  1 │ /* wrong type in a list */
-  2 │ list{1, 2, "Hello"}->ignore
-  3 │ 
-
-  This has type: string
-  But it's expected to have type: int
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/comparison_operator.res.expected b/jscomp/build_tests/super_errors/expected/comparison_operator.res.expected
deleted file mode 100644
index b2988d3..0000000
--- a/jscomp/build_tests/super_errors/expected/comparison_operator.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/comparison_operator.res:3:17
-
-  1 │ let f = Some(0)
-  2 │ 
-  3 │ let x = 100 === f
-  4 │ 
-
-  This has type: option<int>
-  But it's being compared to something of type: int
-
-  You can only compare things of the same type.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/component_missing_prop.res.expected b/jscomp/build_tests/super_errors/expected/component_missing_prop.res.expected
deleted file mode 100644
index 3df4b8f..0000000
--- a/jscomp/build_tests/super_errors/expected/component_missing_prop.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/component_missing_prop.res:5:34-35
-
-  3 │   type props<'name> = {name: 'name}
-  4 │ 
-  5 │   let make = (): props<'name> => {}
-  6 │ }
-  7 │ 
-
-  Some required record fields are missing:
-  name. If this is a component, add the missing props.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/component_missing_prop_test.res.expected b/jscomp/build_tests/super_errors/expected/component_missing_prop_test.res.expected
deleted file mode 100644
index 2e6e0c8..0000000
--- a/jscomp/build_tests/super_errors/expected/component_missing_prop_test.res.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/component_missing_prop_test.res:5:35-39
-
-  3 │   type props<'name> = {name: 'name}
-  4 │ 
-  5 │   let make = (): props<'name> => {nname: "hello"}
-  6 │ }
-  7 │ 
-
-  The field nname does not belong to type props
-  
-  This record expression is expected to have type props<'name>
-Hint: Did you mean name?
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/curried_expected.res.expected b/jscomp/build_tests/super_errors/expected/curried_expected.res.expected
deleted file mode 100644
index 5b789c5..0000000
--- a/jscomp/build_tests/super_errors/expected/curried_expected.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/curried_expected.res:3:24-38
-
-  1 │ let expectCurried = f => f(1) + 2
-  2 │ 
-  3 │ let z1 = expectCurried((. x, y) => x+y)
-  4 │ 
-
-  This function is an uncurried function where a curried function is expected
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/curry_in_uncurry.res.expected b/jscomp/build_tests/super_errors/expected/curry_in_uncurry.res.expected
deleted file mode 100644
index dfd086b..0000000
--- a/jscomp/build_tests/super_errors/expected/curry_in_uncurry.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/curry_in_uncurry.res:3:1
-
-  1 │ let f = (a, b) => a + b
-  2 │ 
-  3 │ f(. 2, 2)->Js.log
-  4 │ 
-
-  This function is a curried function where an uncurried function is expected
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/dict_inference.res.expected b/jscomp/build_tests/super_errors/expected/dict_inference.res.expected
deleted file mode 100644
index 42f32b8..0000000
--- a/jscomp/build_tests/super_errors/expected/dict_inference.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/dict_inference.res:4:31-33
-
-  2 │ dict->Js.Dict.set("someKey1", 1)
-  3 │ dict->Js.Dict.set("someKey2", 2)
-  4 │ dict->Js.Dict.set("someKey2", "2")
-  5 │ 
-
-  This has type: string
-  But this function argument is expecting: int
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/directive_attr.res.expected b/jscomp/build_tests/super_errors/expected/directive_attr.res.expected
deleted file mode 100644
index ee4b5d8..0000000
--- a/jscomp/build_tests/super_errors/expected/directive_attr.res.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/directive_attr.res:1:1-11
-
-  1 │ @@directive
-  2 │ 
-
-  expect string literal
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/duplicate_labels_error.res.expected b/jscomp/build_tests/super_errors/expected/duplicate_labels_error.res.expected
deleted file mode 100644
index 6a63b49..0000000
--- a/jscomp/build_tests/super_errors/expected/duplicate_labels_error.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/duplicate_labels_error.res:3:3-6
-
-  1 │ type rcrd = {
-  2 │   name: string,
-  3 │   name: int,
-  4 │ }
-  5 │ 
-
-  The field name is defined several times in the record rcrd. Fields can only be added once to a record.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/fieldNotOptional.res.expected b/jscomp/build_tests/super_errors/expected/fieldNotOptional.res.expected
deleted file mode 100644
index c4069fb..0000000
--- a/jscomp/build_tests/super_errors/expected/fieldNotOptional.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/fieldNotOptional.res:3:19
-
-  1 │ type r = {nonopt: int, opt?: string}
-  2 │ 
-  3 │ let v = {nonopt: ?3, opt: ?None}
-  4 │ 
-  5 │ let f = r =>
-
-  Field nonopt is not optional in type r. Use without ?
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/function_argument_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/function_argument_mismatch.res.expected
deleted file mode 100644
index 3905f12..0000000
--- a/jscomp/build_tests/super_errors/expected/function_argument_mismatch.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/function_argument_mismatch.res:3:28-30
-
-  1 │ let makeName = (s, i) => s ++ i
-  2 │ 
-  3 │ let name = makeName("123", 123)
-  4 │ 
-
-  This has type: int
-  But this function argument is expecting: string
-  
-  You can convert int to string with Belt.Int.toString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/function_call_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/function_call_mismatch.res.expected
deleted file mode 100644
index d3cee63..0000000
--- a/jscomp/build_tests/super_errors/expected/function_call_mismatch.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/function_call_mismatch.res:6:3-10
-
-  4 │ 
-  5 │ let cloneInTemp = (temp: string): string => {
-  6 │   cd(temp)
-  7 │   exec("git clone git@github.com:myorg/myrepo.git")
-  8 │ }
-
-  This function call returns: string
-  But it's expected to return: unit
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/function_return_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/function_return_mismatch.res.expected
deleted file mode 100644
index dc0dcc3..0000000
--- a/jscomp/build_tests/super_errors/expected/function_return_mismatch.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/function_return_mismatch.res:9:3-5
-
-   7 │ 
-   8 │ let x = fnExpectingCleanup(() => {
-   9 │   123
-  10 │ })
-  11 │ 
-
-  This has type: int
-  But it's expected to have type: cleanup (defined as unit => unit)
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/highlighting1.res.expected b/jscomp/build_tests/super_errors/expected/highlighting1.res.expected
deleted file mode 100644
index 3e79ccf..0000000
--- a/jscomp/build_tests/super_errors/expected/highlighting1.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/highlighting1.res:1:14-3:3
-
-  1 │ let a: int = "hel
-  2 │ 
-  3 │ lo"
-  4 │ 
-
-  This has type: string
-  But it's expected to have type: int
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/highlighting2.res.expected b/jscomp/build_tests/super_errors/expected/highlighting2.res.expected
deleted file mode 100644
index ddce993..0000000
--- a/jscomp/build_tests/super_errors/expected/highlighting2.res.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/highlighting2.res:2:36-4:25
-
-  1 ┆ 
-  2 ┆ let a: int = "hel
-  3 ┆ 
-  4 ┆ lo"
-  5 ┆ 
-
-  This has type: string
-  But it's expected to have type: int
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/highlighting3.res.expected b/jscomp/build_tests/super_errors/expected/highlighting3.res.expected
deleted file mode 100644
index ad49ca1..0000000
--- a/jscomp/build_tests/super_errors/expected/highlighting3.res.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/highlighting3.res:2:14-4:16
-
-  1 │ 
-  2 │ let a: int = "helllllll
-  3 │ 
-  4 │ loooooooooooooo"
-  5 │ 
-
-  This has type: string
-  But it's expected to have type: int
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/highlighting4.res.expected b/jscomp/build_tests/super_errors/expected/highlighting4.res.expected
deleted file mode 100644
index 0b3ce13..0000000
--- a/jscomp/build_tests/super_errors/expected/highlighting4.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  Warning number 3 (configured as error) 
-  /.../fixtures/highlighting4.res:5:10
-
-  3 │ @deprecated
-  4 │ type a = int
-  5 │ type b = a
-  6 │ 
-
-  deprecated: a
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/highlighting5.res.expected b/jscomp/build_tests/super_errors/expected/highlighting5.res.expected
deleted file mode 100644
index 6e6ab03..0000000
--- a/jscomp/build_tests/super_errors/expected/highlighting5.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/highlighting5.res:2:14-100
-
-  1 │ /* overflows in the terminal */
-  2 │ let a: int = "hellllllllllllllllllllllllllllllllllllllllllllllllllllllll
-    │ lllllllllllllllllllllllllll"
-  3 │ 
-
-  This has type: string
-  But it's expected to have type: int
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/highlighting6.res.expected b/jscomp/build_tests/super_errors/expected/highlighting6.res.expected
deleted file mode 100644
index d57cd61..0000000
--- a/jscomp/build_tests/super_errors/expected/highlighting6.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/highlighting6.res:2:9-13
-
-  1 │ let aaaaa = 10
-  2 │ let b = aaaab
-  3 │ 
-
-  The value aaaab can't be found
-  
-  Hint: Did you mean aaaaa?
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/if_branch_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/if_branch_mismatch.res.expected
deleted file mode 100644
index 714a6f0..0000000
--- a/jscomp/build_tests/super_errors/expected/if_branch_mismatch.res.expected
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/if_branch_mismatch.res:4:3-5
-
-  2 │   "123"
-  3 │ } else {
-  4 │   123
-  5 │ }
-  6 │ 
-
-  This has type: int
-  But this if statement is expected to return: string
-
-  if expressions must return the same type in all branches (if, else if, else).
-  
-  You can convert int to string with Belt.Int.toString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/if_condition_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/if_condition_mismatch.res.expected
deleted file mode 100644
index f81ffca..0000000
--- a/jscomp/build_tests/super_errors/expected/if_condition_mismatch.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/if_condition_mismatch.res:1:12-18
-
-  1 │ let x = if "horse" {
-  2 │   ()
-  3 │ }
-
-  This has type: string
-  But if conditions must always be of type: bool
-
-  To fix this, change the highlighted code so it evaluates to a bool.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/intoverflow.res.expected b/jscomp/build_tests/super_errors/expected/intoverflow.res.expected
deleted file mode 100644
index abf0e9f..0000000
--- a/jscomp/build_tests/super_errors/expected/intoverflow.res.expected
+++ /dev/null
@@ -1,57 +0,0 @@
-
-  Warning number 107
-  /.../fixtures/intoverflow.res:2:15-27
-
-  1 │ let v1: int = 2_147_483_647 // max int
-  2 │ let v2: int = 2_147_483_648 // overflow
-  3 │ let v3: int = 2_147_483_649 // overflow
-  4 │ let v4: int = -2_147_483_647
-
-  Integer literal exceeds the range of representable integers of type int
-
-
-  Warning number 107
-  /.../fixtures/intoverflow.res:3:15-27
-
-  1 │ let v1: int = 2_147_483_647 // max int
-  2 │ let v2: int = 2_147_483_648 // overflow
-  3 │ let v3: int = 2_147_483_649 // overflow
-  4 │ let v4: int = -2_147_483_647
-  5 │ let v5: int = -2_147_483_648 // min int
-
-  Integer literal exceeds the range of representable integers of type int
-
-
-  Warning number 107
-  /.../fixtures/intoverflow.res:6:16-28
-
-  4 │ let v4: int = -2_147_483_647
-  5 │ let v5: int = -2_147_483_648 // min int
-  6 │ let v6: int = -2_147_483_649 // underflow
-  7 │ 
-  8 │ // hex
-
-  Integer literal exceeds the range of representable integers of type int
-
-
-  Warning number 107
-  /.../fixtures/intoverflow.res:11:14-26
-
-   9 │ let v7: int = 0xFFFF_FFFF // -1
-  10 │ let v8: int = -0xFFFF_FFFF // 1
-  11 │ let v9:int = 0x1_0000_0000 // overflow
-  12 │ let v10:int = -0x1_0000_0000 // underflow
-  13 │ 
-
-  Integer literal exceeds the range of representable integers of type int
-
-
-  Warning number 107
-  /.../fixtures/intoverflow.res:12:16-28
-
-  10 │ let v8: int = -0xFFFF_FFFF // 1
-  11 │ let v9:int = 0x1_0000_0000 // overflow
-  12 │ let v10:int = -0x1_0000_0000 // underflow
-  13 │ 
-
-  Integer literal exceeds the range of representable integers of type int
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/jinterp.res.expected b/jscomp/build_tests/super_errors/expected/jinterp.res.expected
deleted file mode 100644
index 7eb7ad3..0000000
--- a/jscomp/build_tests/super_errors/expected/jinterp.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/jinterp.res:3:10-21
-
-  1 │ 
-  2 │ let a = 11
-  3 │ let b = j`number $(a)`
-
-  The unsafe j`$(a)$(b)` interpolation was removed, use string template `${a}${b}` instead.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/math_operator_constant.res.expected b/jscomp/build_tests/super_errors/expected/math_operator_constant.res.expected
deleted file mode 100644
index f2251ee..0000000
--- a/jscomp/build_tests/super_errors/expected/math_operator_constant.res.expected
+++ /dev/null
@@ -1,20 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/math_operator_constant.res:3:15-17
-
-  1 │ let num = 0
-  2 │ 
-  3 │ let x = num + 12.
-  4 │ 
-
-  This value has type: float
-  But it's being used with the + operator, which works on: int
-
-  Floats and ints have their own mathematical operators. This means you cannot add a float and an int without converting between the two.
-
-  Possible solutions:
-  - Ensure all values in this calculation has the type int. You can convert between floats and ints via Belt.Float.toInt and Belt.Int.fromFloat.
-  - Make 12. an int by removing the dot or explicitly converting to int
-  
-  You can convert float to int with Belt.Float.toInt.
-  If this is a literal, try a number without a trailing dot (e.g. 20).
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/math_operator_float.res.expected b/jscomp/build_tests/super_errors/expected/math_operator_float.res.expected
deleted file mode 100644
index cd0fffa..0000000
--- a/jscomp/build_tests/super_errors/expected/math_operator_float.res.expected
+++ /dev/null
@@ -1,20 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/math_operator_float.res:3:9-11
-
-  1 │ let num = 0
-  2 │ 
-  3 │ let x = num +. 12.
-  4 │ 
-
-  This has type: int
-  But it's being used with the +. operator, which works on: float
-
-  Floats and ints have their own mathematical operators. This means you cannot add a float and an int without converting between the two.
-
-  Possible solutions:
-  - Ensure all values in this calculation has the type float. You can convert between floats and ints via Belt.Float.toInt and Belt.Int.fromFloat.
-  - Change the operator to +, which works on int
-  
-  You can convert int to float with Belt.Int.toFloat.
-  If this is a literal, try a number with a trailing dot (e.g. 20.).
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/math_operator_int.res.expected b/jscomp/build_tests/super_errors/expected/math_operator_int.res.expected
deleted file mode 100644
index ebccfbe..0000000
--- a/jscomp/build_tests/super_errors/expected/math_operator_int.res.expected
+++ /dev/null
@@ -1,20 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/math_operator_int.res:3:9-11
-
-  1 │ let num = 0.
-  2 │ 
-  3 │ let x = num + 12.
-  4 │ 
-
-  This has type: float
-  But it's being used with the + operator, which works on: int
-
-  Floats and ints have their own mathematical operators. This means you cannot add a float and an int without converting between the two.
-
-  Possible solutions:
-  - Ensure all values in this calculation has the type int. You can convert between floats and ints via Belt.Float.toInt and Belt.Int.fromFloat.
-  - Change the operator to +., which works on float
-  
-  You can convert float to int with Belt.Float.toInt.
-  If this is a literal, try a number without a trailing dot (e.g. 20).
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/math_operator_string.res.expected b/jscomp/build_tests/super_errors/expected/math_operator_string.res.expected
deleted file mode 100644
index cb03dfa..0000000
--- a/jscomp/build_tests/super_errors/expected/math_operator_string.res.expected
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/math_operator_string.res:1:9-15
-
-  1 │ let x = "hello" + "what"
-  2 │ 
-
-  This has type: string
-  But it's being used with the + operator, which works on: int
-
-  Are you looking to concatenate strings? Use the operator ++, which concatenates strings.
-
-  Possible solutions:
-  - Change the + operator to ++ to concatenate strings instead.
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/method_arity_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/method_arity_mismatch.res.expected
deleted file mode 100644
index e57bb53..0000000
--- a/jscomp/build_tests/super_errors/expected/method_arity_mismatch.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/method_arity_mismatch.res:3:3-11
-
-  1 │ let f = obj => {
-  2 │   obj["hi"](.1, 2)
-  3 │   obj["hi"](.1)
-  4 │ }
-  5 │ 
-
-  This uncurried function has type (. int, int) => unit
-  It is applied with 1 arguments but it requires 2.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/missing_label.res.expected b/jscomp/build_tests/super_errors/expected/missing_label.res.expected
deleted file mode 100644
index cc693a3..0000000
--- a/jscomp/build_tests/super_errors/expected/missing_label.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/missing_label.res:3:9
-
-  1 │ let f = (~a) => a ++ ""
-  2 │ 
-  3 │ let _ = f("")
-  4 │ 
-
-  Label ~a was omitted in the application of this labeled function.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/missing_labels.res.expected b/jscomp/build_tests/super_errors/expected/missing_labels.res.expected
deleted file mode 100644
index 3783b11..0000000
--- a/jscomp/build_tests/super_errors/expected/missing_labels.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/missing_labels.res:3:9
-
-  1 │ let f = (~a, ~b) => a ++ b
-  2 │ 
-  3 │ let _ = f("", "")
-  4 │ 
-
-  Labels ~a, ~b were omitted in the application of this labeled function.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/modules1.res.expected b/jscomp/build_tests/super_errors/expected/modules1.res.expected
deleted file mode 100644
index 309f16a..0000000
--- a/jscomp/build_tests/super_errors/expected/modules1.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/modules1.res:1:9-13
-
-  1 │ let b = Foo.b
-  2 │ 
-
-  The module or file Foo can't be found.
-  - If it's a third-party dependency:
-    - Did you add it to the "bs-dependencies" or "bs-dev-dependencies" in bsconfig.json?
-  - Did you include the file's directory to the "sources" in bsconfig.json?
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/modules2.res.expected b/jscomp/build_tests/super_errors/expected/modules2.res.expected
deleted file mode 100644
index b1b5ad1..0000000
--- a/jscomp/build_tests/super_errors/expected/modules2.res.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/modules2.res:1:9-14
-
-  1 │ let b = List.b
-  2 │ 
-
-  The value b can't be found in List
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/modules3.res.expected b/jscomp/build_tests/super_errors/expected/modules3.res.expected
deleted file mode 100644
index 3e6b3a1..0000000
--- a/jscomp/build_tests/super_errors/expected/modules3.res.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/modules3.res:11:11-21
-
-   9 │ }
-  10 │ 
-  11 │ let asd = A.B.C.D.aaa
-  12 │ 
-  13 │ /* there's another, unrelated test, that we're just gonna paste here. W
-     │ e won't
-
-  The value aaa can't be found in A.B.C.D
-  
-  Hint: Did you mean aaaa?
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/moreArguments1.res.expected b/jscomp/build_tests/super_errors/expected/moreArguments1.res.expected
deleted file mode 100644
index 3eb4dd6..0000000
--- a/jscomp/build_tests/super_errors/expected/moreArguments1.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/moreArguments1.res:2:9-15
-
-  1 │ let x = (~a, ~b) => a + b
-  2 │ let y = x(~a=2) + 2
-  3 │ 
-
-  This call is missing an argument of type (~b: int)
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/moreArguments2.res.expected b/jscomp/build_tests/super_errors/expected/moreArguments2.res.expected
deleted file mode 100644
index 8c433b0..0000000
--- a/jscomp/build_tests/super_errors/expected/moreArguments2.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/moreArguments2.res:2:9-12
-
-  1 │ let x = (a, b) => a + b
-  2 │ let y = x(2) + 2
-  3 │ 
-
-  This call is missing an argument of type int
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/moreArguments3.res.expected b/jscomp/build_tests/super_errors/expected/moreArguments3.res.expected
deleted file mode 100644
index cb3d0e4..0000000
--- a/jscomp/build_tests/super_errors/expected/moreArguments3.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/moreArguments3.res:2:9-12
-
-  1 │ let x = (a, b, c, d) => a + b
-  2 │ let y = x(2) + 2
-  3 │ 
-
-  This call is missing arguments of type: int, 'a, 'b
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/moreArguments4.res.expected b/jscomp/build_tests/super_errors/expected/moreArguments4.res.expected
deleted file mode 100644
index 3d0e7f5..0000000
--- a/jscomp/build_tests/super_errors/expected/moreArguments4.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/moreArguments4.res:2:9-12
-
-  1 │ let x = (a, ~b, ~c, ~d) => a + b
-  2 │ let y = x(2) + 2
-  3 │ 
-
-  This call is missing arguments of type: (~b: int), (~c: 'a), (~d: 'b)
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/moreArguments5.res.expected b/jscomp/build_tests/super_errors/expected/moreArguments5.res.expected
deleted file mode 100644
index b5be57a..0000000
--- a/jscomp/build_tests/super_errors/expected/moreArguments5.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/moreArguments5.res:5:9-12
-
-  3 │ }
-  4 │ let x = (a, b, c, d) => {Sub.a: 2}
-  5 │ let y = x(2).Sub.a
-  6 │ 
-
-  This call is missing arguments of type: 'a, 'b, 'c
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/non_function_uncurried_apply.res.expected b/jscomp/build_tests/super_errors/expected/non_function_uncurried_apply.res.expected
deleted file mode 100644
index b44fdb3..0000000
--- a/jscomp/build_tests/super_errors/expected/non_function_uncurried_apply.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/non_function_uncurried_apply.res:2:9-14
-
-  1 │ let nonfun = 2
-  2 │ let _ = nonfun(. 3)
-  3 │ 
-
-  This expression has type int
-  It is not a function.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/partial_app.res.expected b/jscomp/build_tests/super_errors/expected/partial_app.res.expected
deleted file mode 100644
index b2ece41..0000000
--- a/jscomp/build_tests/super_errors/expected/partial_app.res.expected
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Warning number 109 (configured as error) 
-  /.../fixtures/partial_app.res:5:1-7
-
-  3 │ }
-  4 │ 
-  5 │ f(1, 2)
-  6 │ 
-
-  This function call is at the top level and is expected to return `unit`. But it's returning `int => int`.
-
-  In ReScript, anything at the top level must evaluate to `unit`. You can fix this by assigning the expression to a value, or piping it into the `ignore` function.
-
-  Possible solutions:
-  - Assigning to a value that is then ignored: `let _ = yourFunctionCall()`
-  - Piping into the built-in ignore function to ignore the result: `yourFunctionCall()->ignore`
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/polyvariant_name_formatting.res.expected b/jscomp/build_tests/super_errors/expected/polyvariant_name_formatting.res.expected
deleted file mode 100644
index 6cd099e..0000000
--- a/jscomp/build_tests/super_errors/expected/polyvariant_name_formatting.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/polyvariant_name_formatting.res:6:3-10
-
-  4 │ 
-  5 │ switch f {
-  6 │ | #Invalid => ()
-  7 │ }
-  8 │ 
-
-  This pattern matches values of type [? #Invalid]
-  but a pattern was expected which matches values of type polyvariant
-  The second variant type does not allow tag(s) #Invalid
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives1.res.expected b/jscomp/build_tests/super_errors/expected/primitives1.res.expected
deleted file mode 100644
index b1a303e..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives1.res.expected
+++ /dev/null
@@ -1,19 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives1.res:2:1-2
-
-  1 │ /* got float, wanted int */
-  2 │ 2. + 2
-  3 │ 
-
-  This value has type: float
-  But it's being used with the + operator, which works on: int
-
-  Floats and ints have their own mathematical operators. This means you cannot add a float and an int without converting between the two.
-
-  Possible solutions:
-  - Ensure all values in this calculation has the type int. You can convert between floats and ints via Belt.Float.toInt and Belt.Int.fromFloat.
-  - Make 2. an int by removing the dot or explicitly converting to int
-  
-  You can convert float to int with Belt.Float.toInt.
-  If this is a literal, try a number without a trailing dot (e.g. 20).
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives10.res.expected b/jscomp/build_tests/super_errors/expected/primitives10.res.expected
deleted file mode 100644
index 4a2dd3b..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives10.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives10.res:2:9-13
-
-  1 │ let aaaaa = 10
-  2 │ let b = aaaab
-  3 │ 
-
-  The value aaaab can't be found
-  
-  Hint: Did you mean aaaaa?
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives11.res.expected b/jscomp/build_tests/super_errors/expected/primitives11.res.expected
deleted file mode 100644
index 6123d58..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives11.res.expected
+++ /dev/null
@@ -1,19 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives11.res:5:13-28
-
-  3 │ type a = option<aa>
-  4 │ type b = option<bb>
-  5 │ let a: a = (Some(Some(5)): b)
-  6 │ 
-
-  This has type: b (defined as option<bb>)
-  But it's expected to have type: a (defined as option<aa>)
-  
-  The incompatible parts:
-    bb (defined as option<int>) vs aa (defined as option<string>)
-    
-    Further expanded:
-      int vs string
-  
-  You can convert int to string with Belt.Int.toString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives2.res.expected b/jscomp/build_tests/super_errors/expected/primitives2.res.expected
deleted file mode 100644
index 8677b18..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives2.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives2.res:2:1
-
-  1 │ /* got int, wanted string */
-  2 │ 2 ++ " things"
-  3 │ 
-
-  This has type: int
-  But this function argument is expecting: string
-  
-  You can convert int to string with Belt.Int.toString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives3.res.expected b/jscomp/build_tests/super_errors/expected/primitives3.res.expected
deleted file mode 100644
index b028b40..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives3.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives3.res:3:1
-
-  1 │ /* Too many arguments */
-  2 │ let x = a => a + 2
-  3 │ x(2, 4)
-  4 │ 
-
-  This function has type int => int
-  It only accepts 1 argument; here, it's called with more.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives4.res.expected b/jscomp/build_tests/super_errors/expected/primitives4.res.expected
deleted file mode 100644
index 09773d5..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives4.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives4.res:3:1
-
-  1 │ /* Not a function */
-  2 │ let x = 10
-  3 │ x(10)
-  4 │ 
-
-  This expression has type int
-  It is not a function.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives5.res.expected b/jscomp/build_tests/super_errors/expected/primitives5.res.expected
deleted file mode 100644
index 31847d4..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives5.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives5.res:3:1-5
-
-  1 │ /* Not enough arguments */
-  2 │ type x = X(int, float)
-  3 │ X(10)->ignore
-  4 │ 
-
-  This variant constructor, X, expects 2 arguments; here, we've only found 1.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives6.res.expected b/jscomp/build_tests/super_errors/expected/primitives6.res.expected
deleted file mode 100644
index 6e46bb5..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives6.res.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives6.res:3:7-8
-
-  1 │ /* Wrong constructor argument */
-  2 │ type x = X(int, float)
-  3 │ X(10, 10)->ignore
-  4 │ 
-
-  This has type: int
-  But it's expected to have type: float
-  
-  You can convert int to float with Belt.Int.toFloat.
-  If this is a literal, try a number with a trailing dot (e.g. 20.).
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives7.res.expected b/jscomp/build_tests/super_errors/expected/primitives7.res.expected
deleted file mode 100644
index 0f7375f..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives7.res.expected
+++ /dev/null
@@ -1,17 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives7.res:3:24
-
-  1 │ /* Wanted list(float), found list(int) */
-  2 │ let a = list{1, 2, 3}
-  3 │ List.map(n => n +. 2., a)
-  4 │ 
-
-  This has type: list<int>
-  But this function argument is expecting: list<float>
-  
-  The incompatible parts:
-    int vs float
-  
-  You can convert int to float with Belt.Int.toFloat.
-  If this is a literal, try a number with a trailing dot (e.g. 20.).
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives8.res.expected b/jscomp/build_tests/super_errors/expected/primitives8.res.expected
deleted file mode 100644
index 0d4bd63..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives8.res.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives8.res:1:11-13
-
-  1 │ let asd = aaa
-  2 │ 
-
-  The value aaa can't be found
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/primitives9.res.expected b/jscomp/build_tests/super_errors/expected/primitives9.res.expected
deleted file mode 100644
index b97f1b0..0000000
--- a/jscomp/build_tests/super_errors/expected/primitives9.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/primitives9.res:1:14-20
-
-  1 │ let a: int = "hello"
-  2 │ 
-
-  This has type: string
-  But it's expected to have type: int
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/private_without_body.res.expected b/jscomp/build_tests/super_errors/expected/private_without_body.res.expected
deleted file mode 100644
index e044450..0000000
--- a/jscomp/build_tests/super_errors/expected/private_without_body.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/private_without_body.res:1:1-9
-
-  1 │ %%private
-  2 │ let a = 2
-  3 │ 
-
-  %%private extension expects a definition as its argument. Example: %%private(let a = "Hello")
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/record_type_spreads.res.expected b/jscomp/build_tests/super_errors/expected/record_type_spreads.res.expected
deleted file mode 100644
index 0f33de5..0000000
--- a/jscomp/build_tests/super_errors/expected/record_type_spreads.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/record_type_spreads.res:5:1-23
-
-  3 │ type t2 = {x: string, y: float}
-  4 │ 
-  5 │ type t3 = {...t, ...t2}
-  6 │ 
-
-  The field x is defined several times in the record t3. Fields can only be added once to a record.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/record_type_spreads_deep_sub.res.expected b/jscomp/build_tests/super_errors/expected/record_type_spreads_deep_sub.res.expected
deleted file mode 100644
index cdbe928..0000000
--- a/jscomp/build_tests/super_errors/expected/record_type_spreads_deep_sub.res.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/record_type_spreads_deep_sub.res:8:9-21
-
-   6 │ 
-   7 │ let d: d = {
-   8 │   x: Ok("this errors"),
-   9 │ }
-  10 │ 
-
-  This has type: string
-  But it's expected to have type: int
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/recursive_type.res.expected b/jscomp/build_tests/super_errors/expected/recursive_type.res.expected
deleted file mode 100644
index 3abe6f0..0000000
--- a/jscomp/build_tests/super_errors/expected/recursive_type.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/recursive_type.res:35:11-14
-
-  33 │ /* parse atom */
-  34 │ and atom = (k, t) => {
-  35 │   let _ = atom(k)
-  36 │   assert(false)
-  37 │ }
-
-  This uncurried function has type
-    ((option<'a>, ([> #List(list<'b>)] as 'b)) => 'c, 'd) => 'c
-  It is applied with 1 arguments but it requires 2.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/repeated_def_extension_constr.res.expected b/jscomp/build_tests/super_errors/expected/repeated_def_extension_constr.res.expected
deleted file mode 100644
index c62825d..0000000
--- a/jscomp/build_tests/super_errors/expected/repeated_def_extension_constr.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/repeated_def_extension_constr.res:3:6
-
-  1 │ type a = ..
-  2 │ 
-  3 │ type a
-  4 │ 
-
-  Multiple definition of the type name a 
-  at /.../fixtures/repeated_def_extension_constr.res:1:6
-   Names must be unique in a given structure or signature.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/repeated_def_module_types.res.expected b/jscomp/build_tests/super_errors/expected/repeated_def_module_types.res.expected
deleted file mode 100644
index 4fe5ea9..0000000
--- a/jscomp/build_tests/super_errors/expected/repeated_def_module_types.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/repeated_def_module_types.res:3:13
-
-  1 │ module type M = {}
-  2 │ 
-  3 │ module type M = {}
-  4 │ 
-
-  Multiple definition of the module type name M 
-  at /.../fixtures/repeated_def_module_types.res:1:13
-   Names must be unique in a given structure or signature.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/repeated_def_modules.res.expected b/jscomp/build_tests/super_errors/expected/repeated_def_modules.res.expected
deleted file mode 100644
index a381a9b..0000000
--- a/jscomp/build_tests/super_errors/expected/repeated_def_modules.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/repeated_def_modules.res:3:8
-
-  1 │ module M = {}
-  2 │ 
-  3 │ module M = {}
-  4 │ 
-
-  Multiple definition of the module name M 
-  at /.../fixtures/repeated_def_modules.res:1:8
-   Names must be unique in a given structure or signature.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/repeated_def_types.res.expected b/jscomp/build_tests/super_errors/expected/repeated_def_types.res.expected
deleted file mode 100644
index 5c06f37..0000000
--- a/jscomp/build_tests/super_errors/expected/repeated_def_types.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/repeated_def_types.res:3:6
-
-  1 │ type a
-  2 │ 
-  3 │ type a
-  4 │ 
-
-  Multiple definition of the type name a 
-  at /.../fixtures/repeated_def_types.res:1:6
-   Names must be unique in a given structure or signature.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/set_record_field_type_match.res.expected b/jscomp/build_tests/super_errors/expected/set_record_field_type_match.res.expected
deleted file mode 100644
index d45880d..0000000
--- a/jscomp/build_tests/super_errors/expected/set_record_field_type_match.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/set_record_field_type_match.res:11:13-14
-
-   9 │ }
-  10 │ 
-  11 │ user.name = 12
-  12 │ 
-
-  You're assigning something to this field that has type: int
-  But this record field is of type: string
-  
-  You can convert int to string with Belt.Int.toString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/switch_different_types.res.expected b/jscomp/build_tests/super_errors/expected/switch_different_types.res.expected
deleted file mode 100644
index 14e96e8..0000000
--- a/jscomp/build_tests/super_errors/expected/switch_different_types.res.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/switch_different_types.res:7:10-23
-
-  5 │   switch foo {
-  6 │   | "world" => ()
-  7 │   | _ => someFunction()
-  8 │   }
-  9 │ }
-
-  This has type: string
-  But this switch is expected to return: unit
-
-  All branches in a switch must return the same type. To fix this, change your branch to return the expected type.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/switch_guard.res.expected b/jscomp/build_tests/super_errors/expected/switch_guard.res.expected
deleted file mode 100644
index f04ff7d..0000000
--- a/jscomp/build_tests/super_errors/expected/switch_guard.res.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/switch_guard.res:6:16-22
-
-  4 │ let bar = () => {
-  5 │   switch foo {
-  6 │   | "world" if "horse" => ()
-  7 │   | _ => someFunction()
-  8 │   }
-
-  This has type: string
-  But if conditions must always be of type: bool
-
-  To fix this, change the highlighted code so it evaluates to a bool.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/syntaxErrors1.res.expected b/jscomp/build_tests/super_errors/expected/syntaxErrors1.res.expected
deleted file mode 100644
index 9ea853e..0000000
--- a/jscomp/build_tests/super_errors/expected/syntaxErrors1.res.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  Syntax error!
-  /.../fixtures/syntaxErrors1.res:1:12
-
-  1 │ let b = fo;;;;;;;;;;;;;;;;
-  2 │ 
-
-  I'm not sure what to parse here when looking at ";".
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/syntaxErrors2.res.expected b/jscomp/build_tests/super_errors/expected/syntaxErrors2.res.expected
deleted file mode 100644
index 8427692..0000000
--- a/jscomp/build_tests/super_errors/expected/syntaxErrors2.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  Syntax error!
-  /.../fixtures/syntaxErrors2.res:2:6-10
-
-  1 │ let () =
-  2 │   I'm glad you're looking at this file =)
-  3 │ 
-
-  consecutive statements on a line must be separated by ';' or a newline
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/syntaxErrors3.res.expected b/jscomp/build_tests/super_errors/expected/syntaxErrors3.res.expected
deleted file mode 100644
index ba5e6e6..0000000
--- a/jscomp/build_tests/super_errors/expected/syntaxErrors3.res.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  Syntax error!
-  /.../fixtures/syntaxErrors3.res:1:20
-
-  1 │ let a = print_char('a)
-  2 │ 
-
-  I'm not sure what to parse here when looking at "'".
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/syntaxErrors4.res.expected b/jscomp/build_tests/super_errors/expected/syntaxErrors4.res.expected
deleted file mode 100644
index 5cf63f8..0000000
--- a/jscomp/build_tests/super_errors/expected/syntaxErrors4.res.expected
+++ /dev/null
@@ -1,18 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/syntaxErrors4.res:5:13-21:3
-
-   3 │ /* */
-   4 │ /* */
-   5 │ let a:int = "asdaaaaaaaaaaaaaaaaaaaaa
-   6 │ aa
-   . │ ...
-  20 │ aa
-  21 │ aa"
-  22 │ /* */
-  23 │ /* */
-
-  This has type: string
-  But it's expected to have type: int
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/syntaxErrors5.res.expected b/jscomp/build_tests/super_errors/expected/syntaxErrors5.res.expected
deleted file mode 100644
index c9d68c9..0000000
--- a/jscomp/build_tests/super_errors/expected/syntaxErrors5.res.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  Syntax error!
-  /.../fixtures/syntaxErrors5.res:1:14-2:0
-
-  1 │ let a = (1, 2
-  2 │ 
-
-  Did you forget a `)` here?
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/todo_with_no_payload.res.expected b/jscomp/build_tests/super_errors/expected/todo_with_no_payload.res.expected
deleted file mode 100644
index 3037b88..0000000
--- a/jscomp/build_tests/super_errors/expected/todo_with_no_payload.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Warning number 110
-  /.../fixtures/todo_with_no_payload.res:1:38-42
-
-  1 │ let implementMeLater = (): string => %todo
-  2 │ 
-  3 │ let x = implementMeLater()
-
-  Todo found.
-
-  This code is not implemented yet and will crash at runtime. Make sure you implement this before running the code.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/todo_with_payload.res.expected b/jscomp/build_tests/super_errors/expected/todo_with_payload.res.expected
deleted file mode 100644
index 37335ae..0000000
--- a/jscomp/build_tests/super_errors/expected/todo_with_payload.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  Warning number 110
-  /.../fixtures/todo_with_payload.res:1:38-85
-
-  1 │ let implementMeLater = (): string => %todo("This should return a string 
-    │ eventually.")
-  2 │ 
-  3 │ let x = implementMeLater()
-
-  Todo found: This should return a string eventually.
-
-  This code is not implemented yet and will crash at runtime. Make sure you implement this before running the code.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/top_level_fn_call_not_unit.res.expected b/jscomp/build_tests/super_errors/expected/top_level_fn_call_not_unit.res.expected
deleted file mode 100644
index d2bf229..0000000
--- a/jscomp/build_tests/super_errors/expected/top_level_fn_call_not_unit.res.expected
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Warning number 109 (configured as error) 
-  /.../fixtures/top_level_fn_call_not_unit.res:3:1-18
-
-  1 │ let returnsSomething = () => 123
-  2 │ 
-  3 │ returnsSomething()
-  4 │ 
-
-  This function call is at the top level and is expected to return `unit`. But it's returning `int`.
-
-  In ReScript, anything at the top level must evaluate to `unit`. You can fix this by assigning the expression to a value, or piping it into the `ignore` function.
-
-  Possible solutions:
-  - Assigning to a value that is then ignored: `let _ = yourFunctionCall()`
-  - Piping into the built-in ignore function to ignore the result: `yourFunctionCall()->ignore`
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/top_level_value_not_unit.res.expected b/jscomp/build_tests/super_errors/expected/top_level_value_not_unit.res.expected
deleted file mode 100644
index 95afeb7..0000000
--- a/jscomp/build_tests/super_errors/expected/top_level_value_not_unit.res.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  Warning number 109 (configured as error) 
-  /.../fixtures/top_level_value_not_unit.res:1:1-4
-
-  1 │ 1234
-  2 │ 
-
-  This is at the top level and is expected to return `unit`. But it's returning `int`.
-
-  In ReScript, anything at the top level must evaluate to `unit`. You can fix this by assigning the expression to a value, or piping it into the `ignore` function.
-
-  Possible solutions:
-  - Assigning to a value that is then ignored: `let _ = yourExpression`
-  - Piping into the built-in ignore function to ignore the result: `yourExpression->ignore`
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/type1.res.expected b/jscomp/build_tests/super_errors/expected/type1.res.expected
deleted file mode 100644
index 036daa2..0000000
--- a/jscomp/build_tests/super_errors/expected/type1.res.expected
+++ /dev/null
@@ -1,18 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/type1.res:1:9-10
-
-  1 │ let x = 2. + 2
-  2 │ 
-
-  This value has type: float
-  But it's being used with the + operator, which works on: int
-
-  Floats and ints have their own mathematical operators. This means you cannot add a float and an int without converting between the two.
-
-  Possible solutions:
-  - Ensure all values in this calculation has the type int. You can convert between floats and ints via Belt.Float.toInt and Belt.Int.fromFloat.
-  - Make 2. an int by removing the dot or explicitly converting to int
-  
-  You can convert float to int with Belt.Float.toInt.
-  If this is a literal, try a number without a trailing dot (e.g. 20).
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/type2.res.expected b/jscomp/build_tests/super_errors/expected/type2.res.expected
deleted file mode 100644
index 1b189ab..0000000
--- a/jscomp/build_tests/super_errors/expected/type2.res.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/type2.res:6:11-13
-
-  4 │ let () = {
-  5 │   push(a, 3)->ignore
-  6 │   push(a, "3")->ignore
-  7 │ }
-  8 │ 
-
-  This has type: string
-  But this function argument is expecting: int
-  
-  You can convert string to int with Belt.Int.fromString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/type3.res.expected b/jscomp/build_tests/super_errors/expected/type3.res.expected
deleted file mode 100644
index 57215c9..0000000
--- a/jscomp/build_tests/super_errors/expected/type3.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/type3.res:1:5
-
-  1 │ let u = []
-  2 │ 
-
-  This expression's type contains type variables that cannot be generalized:
-  array<'_weak1>
-  
-  This happens when the type system senses there's a mutation/side-effect,
-  in combination with a polymorphic value.
-  Using or annotating that value usually solves it.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/u_for_c_in_c_mode.res.expected b/jscomp/build_tests/super_errors/expected/u_for_c_in_c_mode.res.expected
deleted file mode 100644
index 64ccef5..0000000
--- a/jscomp/build_tests/super_errors/expected/u_for_c_in_c_mode.res.expected
+++ /dev/null
@@ -1,28 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/u_for_c_in_c_mode.res:3:5-5:1
-
-  1 │ module Foo: {
-  2 │   let add: (int, int) => int
-  3 │ } = {
-  4 │   let add = (. a, b) => a + b
-  5 │ }
-  6 │ 
-
-  Signature mismatch:
-  Modules do not match:
-    {
-  let add: (. int, int) => int
-}
-  is not included in
-    {
-  let add: (int, int) => int
-}
-  Values do not match:
-    let add: (. int, int) => int (uncurried)
-  is not included in
-    let add: (int, int) => int (curried)
-  /.../fixtures/u_for_c_in_c_mode.res:2:3-28:
-    Expected declaration
-  /.../fixtures/u_for_c_in_c_mode.res:4:7-9:
-    Actual declaration
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/u_for_c_in_u_mode.res.expected b/jscomp/build_tests/super_errors/expected/u_for_c_in_u_mode.res.expected
deleted file mode 100644
index 823724e..0000000
--- a/jscomp/build_tests/super_errors/expected/u_for_c_in_u_mode.res.expected
+++ /dev/null
@@ -1,28 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/u_for_c_in_u_mode.res:6:5-8:1
-
-  4 │   @@uncurried.swap
-  5 │   let add: (. int, int) => int
-  6 │ } = {
-  7 │   let add = (a, b) => a + b
-  8 │ }
-  9 │ 
-
-  Signature mismatch:
-  Modules do not match:
-    {
-  let add: (int, int) => int
-}
-  is not included in
-    {
-  let add: (int, int) => int
-}
-  Values do not match:
-    let add: (int, int) => int (uncurried)
-  is not included in
-    let add: (int, int) => int (curried)
-  /.../fixtures/u_for_c_in_u_mode.res:5:3-30:
-    Expected declaration
-  /.../fixtures/u_for_c_in_u_mode.res:7:7-9:
-    Actual declaration
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/uncurried_expected.res.expected b/jscomp/build_tests/super_errors/expected/uncurried_expected.res.expected
deleted file mode 100644
index cb4afd4..0000000
--- a/jscomp/build_tests/super_errors/expected/uncurried_expected.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/uncurried_expected.res:2:15-22
-
-  1 │ let apply = (f) => f(. 1)
-  2 │ let z = apply(x => x+1)
-  3 │ 
-
-  This expression is expected to have an uncurried function
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/uncurried_wrong_label.res.expected b/jscomp/build_tests/super_errors/expected/uncurried_wrong_label.res.expected
deleted file mode 100644
index 955e973..0000000
--- a/jscomp/build_tests/super_errors/expected/uncurried_wrong_label.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/uncurried_wrong_label.res:3:18
-
-  1 │ let foo = (. ~x) => { let _ = (); (~y) => x+y }
-  2 │ // This looks too far into the return type
-  3 │ let d = foo(. ~y=3)
-  4 │ 
-
-  The function applied to this argument has type (. ~x: int, ~y: int) => int
-This argument cannot be applied with label ~y
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/unicode_location.res.expected b/jscomp/build_tests/super_errors/expected/unicode_location.res.expected
deleted file mode 100644
index a8e39cf..0000000
--- a/jscomp/build_tests/super_errors/expected/unicode_location.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/unicode_location.res:1:43
-
-  1 │ let q = "💩💩💩💩💩💩💩💩����💩" ++ ("a" ++ 3 ++ "b")
-  2 │ //                                         ^ character position 33 + 10 
-    │ (unicode symbols of length 2)
-
-  This has type: int
-  But this function argument is expecting: string
-  
-  You can convert int to string with Belt.Int.toString.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/unknown_tagged_template_function.res.expected b/jscomp/build_tests/super_errors/expected/unknown_tagged_template_function.res.expected
deleted file mode 100644
index 5b5c2f8..0000000
--- a/jscomp/build_tests/super_errors/expected/unknown_tagged_template_function.res.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/unknown_tagged_template_function.res:1:11-14
-
-  1 │ let res = tagg`| 5 × 10 = ${5} |`
-
-  The value tagg can't be found
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/unused_warnings.res.expected b/jscomp/build_tests/super_errors/expected/unused_warnings.res.expected
deleted file mode 100644
index 7068419..0000000
--- a/jscomp/build_tests/super_errors/expected/unused_warnings.res.expected
+++ /dev/null
@@ -1,20 +0,0 @@
-
-  Warning number 32
-  /.../fixtures/unused_warnings.res:1:5
-
-  1 │ let a = 3
-  2 │ let a = 33 + 3
-  3 │ let a = 33 + 3 + 3
-
-  unused value a.
-
-
-  Warning number 32
-  /.../fixtures/unused_warnings.res:2:5
-
-  1 │ let a = 3
-  2 │ let a = 33 + 3
-  3 │ let a = 33 + 3 + 3
-  4 │ 
-
-  unused value a.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_coercion_bigint.res.expected b/jscomp/build_tests/super_errors/expected/variant_coercion_bigint.res.expected
deleted file mode 100644
index c179d49..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_coercion_bigint.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_coercion_bigint.res:5:10-20
-
-  3 │ let x = One(true)
-  4 │ 
-  5 │ let y = (x :> bigint)
-  6 │ 
-
-  Type x is not a subtype of bigint
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_coercion_bigint_as.res.expected b/jscomp/build_tests/super_errors/expected/variant_coercion_bigint_as.res.expected
deleted file mode 100644
index a055080..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_coercion_bigint_as.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_coercion_bigint_as.res:5:10-20
-
-  3 │ let x = One
-  4 │ 
-  5 │ let y = (x :> bigint)
-  6 │ 
-
-  Type x is not a subtype of bigint
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_coercion_float.res.expected b/jscomp/build_tests/super_errors/expected/variant_coercion_float.res.expected
deleted file mode 100644
index b78b995..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_coercion_float.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_coercion_float.res:5:10-19
-
-  3 │ let x = One(true)
-  4 │ 
-  5 │ let y = (x :> float)
-  6 │ 
-
-  Type x is not a subtype of float
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_coercion_float_as.res.expected b/jscomp/build_tests/super_errors/expected/variant_coercion_float_as.res.expected
deleted file mode 100644
index a837b2e..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_coercion_float_as.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_coercion_float_as.res:5:10-19
-
-  3 │ let x = One
-  4 │ 
-  5 │ let y = (x :> float)
-  6 │ 
-
-  Type x is not a subtype of float
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_coercion_int.res.expected b/jscomp/build_tests/super_errors/expected/variant_coercion_int.res.expected
deleted file mode 100644
index c4344ee..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_coercion_int.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_coercion_int.res:5:10-17
-
-  3 │ let x = One(true)
-  4 │ 
-  5 │ let y = (x :> int)
-  6 │ 
-
-  Type x is not a subtype of int
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_coercion_int_as.res.expected b/jscomp/build_tests/super_errors/expected/variant_coercion_int_as.res.expected
deleted file mode 100644
index 5a6f40e..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_coercion_int_as.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_coercion_int_as.res:5:10-17
-
-  3 │ let x = One
-  4 │ 
-  5 │ let y = (x :> int)
-  6 │ 
-
-  Type x is not a subtype of int
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_coercion_string.res.expected b/jscomp/build_tests/super_errors/expected/variant_coercion_string.res.expected
deleted file mode 100644
index 73caae5..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_coercion_string.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_coercion_string.res:5:10-20
-
-  3 │ let x = One(true)
-  4 │ 
-  5 │ let y = (x :> string)
-  6 │ 
-
-  Type x is not a subtype of string
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_coercion_string_as.res.expected b/jscomp/build_tests/super_errors/expected/variant_coercion_string_as.res.expected
deleted file mode 100644
index be12a2c..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_coercion_string_as.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_coercion_string_as.res:5:10-20
-
-  3 │ let x = One
-  4 │ 
-  5 │ let y = (x :> string)
-  6 │ 
-
-  Type x is not a subtype of string
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_coercion_string_to_variant_no_payload.res.expected b/jscomp/build_tests/super_errors/expected/variant_coercion_string_to_variant_no_payload.res.expected
deleted file mode 100644
index 1b60c86..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_coercion_string_to_variant_no_payload.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_coercion_string_to_variant_no_payload.res:6:10-15
-
-  4 │ let x = "one"
-  5 │ 
-  6 │ let y = (x :> x)
-  7 │ 
-
-  Type string is not a subtype of x
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_coercion_string_unboxed.res.expected b/jscomp/build_tests/super_errors/expected/variant_coercion_string_unboxed.res.expected
deleted file mode 100644
index a152598..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_coercion_string_unboxed.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_coercion_string_unboxed.res:6:10-20
-
-  4 │ let x = One
-  5 │ 
-  6 │ let y = (x :> string)
-  7 │ 
-
-  Type x is not a subtype of string
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_spread_abstract_type.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_abstract_type.res.expected
deleted file mode 100644
index 016fd1e..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_spread_abstract_type.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_spread_abstract_type.res:2:15
-
-  1 │ type a
-  2 │ type b = | ...a | Other
-  3 │ 
-
-  This type is not a valid type to spread. It's only possible to spread other variants.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_spread_duplicate_constructors.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_duplicate_constructors.res.expected
deleted file mode 100644
index 0f19025..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_spread_duplicate_constructors.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_spread_duplicate_constructors.res:3:22
-
-  1 │ type a = One | Two
-  2 │ type b = Two | Three
-  3 │ type c = | ...a | ...b | Four
-  4 │ 
-
-  Variant b has a constructor named Two, but a constructor named Two already exists in the variant it's spread into.
-  You cannot spread variants with overlapping constructors.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_spread_extensible_variant.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_extensible_variant.res.expected
deleted file mode 100644
index 100f881..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_spread_extensible_variant.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_spread_extensible_variant.res:2:15
-
-  1 │ type a = ..
-  2 │ type b = | ...a | Other
-  3 │ 
-
-  This type is not a valid type to spread. It's only possible to spread other variants.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_spread_inline_records.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_inline_records.res.expected
deleted file mode 100644
index f34a0fa..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_spread_inline_records.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_spread_inline_records.res:4:16-30
-
-  2 │ type b = | ...a | Three
-  3 │ 
-  4 │ let b: b = One({name: "hello"})
-
-  Some required record fields are missing: age.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_spread_recursive.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_recursive.res.expected
deleted file mode 100644
index 8c817c9..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_spread_recursive.res.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_spread_recursive.res:1:65
-
-  1 │ type rec a = One | Two | Three and b = Four | Five and c = | ...a | ...b
-  2 │ 
-
-  This type could not be found. It's only possible to spread variants that are known as the spread happens. This means for example that you can't spread variants in recursive definitions.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_spread_tag_missing.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_tag_missing.res.expected
deleted file mode 100644
index 74d2abe..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_spread_tag_missing.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_spread_tag_missing.res:2:15
-
-  1 │ @tag("kind") type a = One(int) | Two(string)
-  2 │ type b = | ...a | Three(bool)
-  3 │ 
-
-  The @tag attribute does not match for this variant and the variant where this is spread. Both variants must have the same @tag attribute configuration, or no @tag attribute at all.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch.res.expected
deleted file mode 100644
index 151b0b0..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_spread_tag_value_mismatch.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_spread_tag_value_mismatch.res:2:28
-
-  1 │ @tag("kind") type a = One(int) | Two(string)
-  2 │ @tag("name") type b = | ...a | Three(bool)
-  3 │ 
-
-  The @tag attribute does not match for this variant and the variant where this is spread. Both variants must have the same @tag attribute configuration, or no @tag attribute at all.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_spread_type_parameters.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_type_parameters.res.expected
deleted file mode 100644
index 99738ba..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_spread_type_parameters.res.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_spread_type_parameters.res:2:15
-
-  1 │ type a<'a> = One | Two('a)
-  2 │ type b = | ...a<int> | Three
-
-  Type parameters are not supported in variant type spreads.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_spread_unboxed_mismatch.res.expected b/jscomp/build_tests/super_errors/expected/variant_spread_unboxed_mismatch.res.expected
deleted file mode 100644
index aecd49d..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_spread_unboxed_mismatch.res.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_spread_unboxed_mismatch.res:2:15
-
-  1 │ @unboxed type a = One(int) | Two(string)
-  2 │ type b = | ...a | Three(bool)
-  3 │ 
-
-  This variant is unboxed, but the variant where this is spread is not. Both variants unboxed configuration must match.
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion.res.expected b/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion.res.expected
deleted file mode 100644
index 75a0fc3..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_to_variant_coercion.res:6:10-15
-
-  4 │ let x: x = One(true)
-  5 │ 
-  6 │ let y = (x :> y)
-  7 │ 
-
-  Type x is not a subtype of y
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion_as.res.expected b/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion_as.res.expected
deleted file mode 100644
index 04a3f55..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion_as.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_to_variant_coercion_as.res:6:10-15
-
-  4 │ let x: x = One(true)
-  5 │ 
-  6 │ let y = (x :> y)
-  7 │ 
-
-  Type x is not a subtype of y
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion_tag.res.expected b/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion_tag.res.expected
deleted file mode 100644
index 33b2122..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion_tag.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_to_variant_coercion_tag.res:6:10-15
-
-  4 │ let x: x = One(true)
-  5 │ 
-  6 │ let y = (x :> y)
-  7 │ 
-
-  Type x is not a subtype of y
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion_unboxed.res.expected b/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion_unboxed.res.expected
deleted file mode 100644
index 6e4844a..0000000
--- a/jscomp/build_tests/super_errors/expected/variant_to_variant_coercion_unboxed.res.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/variant_to_variant_coercion_unboxed.res:6:10-15
-
-  4 │ let x: x = One(true)
-  5 │ 
-  6 │ let y = (x :> y)
-  7 │ 
-
-  Type x is not a subtype of y
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/warnings1.res.expected b/jscomp/build_tests/super_errors/expected/warnings1.res.expected
deleted file mode 100644
index 4d91138..0000000
--- a/jscomp/build_tests/super_errors/expected/warnings1.res.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/warnings1.res:3:3-7
-
-  1 │ let x = (a, b) => a + b
-  2 │ let z = () => {
-  3 │   x(10)
-  4 │   10
-  5 │ }
-
-  This function call returns: int => int
-  But it's expected to return: unit
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/warnings2.res.expected b/jscomp/build_tests/super_errors/expected/warnings2.res.expected
deleted file mode 100644
index 324f794..0000000
--- a/jscomp/build_tests/super_errors/expected/warnings2.res.expected
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/warnings2.res:2:3-4
-
-  1 │ let z = () => {
-  2 │   10
-  3 │   10
-  4 │ }
-
-  This has type: int
-  But it's expected to have type: unit
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/warnings3.res.expected b/jscomp/build_tests/super_errors/expected/warnings3.res.expected
deleted file mode 100644
index 11f5a87..0000000
--- a/jscomp/build_tests/super_errors/expected/warnings3.res.expected
+++ /dev/null
@@ -1,34 +0,0 @@
-
-  Warning number 3
-  /.../fixtures/warnings3.res:1:9-23
-
-  1 │ let _ = string_of_float(34.)
-  2 │ let _ = string_of_float(34.)
-  3 │ let _ = string_of_float(34.)
-
-  deprecated: Pervasives.string_of_float
-  Please use Js.Float.toString instead, string_of_float generates unparseable floats
-
-
-  Warning number 3
-  /.../fixtures/warnings3.res:2:9-23
-
-  1 │ let _ = string_of_float(34.)
-  2 │ let _ = string_of_float(34.)
-  3 │ let _ = string_of_float(34.)
-  4 │ 
-
-  deprecated: Pervasives.string_of_float
-  Please use Js.Float.toString instead, string_of_float generates unparseable floats
-
-
-  Warning number 3
-  /.../fixtures/warnings3.res:3:9-23
-
-  1 │ let _ = string_of_float(34.)
-  2 │ let _ = string_of_float(34.)
-  3 │ let _ = string_of_float(34.)
-  4 │ 
-
-  deprecated: Pervasives.string_of_float
-  Please use Js.Float.toString instead, string_of_float generates unparseable floats
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/warnings4.res.expected b/jscomp/build_tests/super_errors/expected/warnings4.res.expected
deleted file mode 100644
index f294e44..0000000
--- a/jscomp/build_tests/super_errors/expected/warnings4.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  Warning number 8
-  /.../fixtures/warnings4.res:11:1-13:1
-
-   9 │ @val external x: myType = "myVariable"
-  10 │ 
-  11 │ switch x {
-  12 │   | #first => Js.log("first")
-  13 │ }
-  14 │ 
-
-  You forgot to handle a possible case here, for example: 
-  | #second(_) | #fourth | #third
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/warnings5.res.expected b/jscomp/build_tests/super_errors/expected/warnings5.res.expected
deleted file mode 100644
index 204f9f1..0000000
--- a/jscomp/build_tests/super_errors/expected/warnings5.res.expected
+++ /dev/null
@@ -1,190 +0,0 @@
-
-  Warning number 9
-  /.../fixtures/warnings5.res:12:3-21
-
-  10 │ 
-  11 │ switch y {
-  12 │ | {otherValue: false} => Js.log("first")
-  13 │ }
-  14 │ 
-
-  the following labels are not bound in this record pattern: someValue, typ
-Either bind these labels explicitly or add ', _' to the pattern.
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:11:1-13:1
-
-   9 │ @val external y: someRecord = "otherVariable"
-  10 │ 
-  11 │ switch y {
-  12 │ | {otherValue: false} => Js.log("first")
-  13 │ }
-  14 │ 
-  15 │ switch y {
-
-  You forgot to handle a possible case here, for example: 
-  | {otherValue: true, _}
-
-
-  Warning number 9
-  /.../fixtures/warnings5.res:16:3-26
-
-  14 │ 
-  15 │ switch y {
-  16 │ | {typ: WithPayload(true)} => Js.log("first")
-  17 │ }
-  18 │ 
-
-  the following labels are not bound in this record pattern: someValue, otherValue
-Either bind these labels explicitly or add ', _' to the pattern.
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:15:1-17:1
-
-  13 │ }
-  14 │ 
-  15 │ switch y {
-  16 │ | {typ: WithPayload(true)} => Js.log("first")
-  17 │ }
-  18 │ 
-  19 │ let arr = [1]
-
-  You forgot to handle a possible case here, for example: 
-  | {typ: WithPayload(false), _}
-| {typ: Variant | One | Two | Three | Four | Five | Six | Seven(_), _}
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:21:1-23:1
-
-  19 │ let arr = [1]
-  20 │ 
-  21 │ switch arr {
-  22 │ | [] => Js.log("")
-  23 │ }
-  24 │ 
-  25 │ switch arr {
-
-  You forgot to handle a possible case here, for example: 
-  | [_]
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:25:1-27:1
-
-  23 │ }
-  24 │ 
-  25 │ switch arr {
-  26 │ | [one] => Js.log(one)
-  27 │ }
-  28 │ 
-  29 │ switch arr {
-
-  You forgot to handle a possible case here, for example: 
-  | []
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:29:1-31:1
-
-  27 │ }
-  28 │ 
-  29 │ switch arr {
-  30 │ | [1, 2] => ()
-  31 │ }
-  32 │ 
-  33 │ let lst = list{}
-
-  You forgot to handle a possible case here, for example: 
-  | [1, 0] | [0, _] | []
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:35:1-37:1
-
-  33 │ let lst = list{}
-  34 │ 
-  35 │ switch lst {
-  36 │ | list{} => ()
-  37 │ }
-  38 │ 
-  39 │ switch lst {
-
-  You forgot to handle a possible case here, for example: 
-  | list{_, ..._}
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:39:1-41:1
-
-  37 │ }
-  38 │ 
-  39 │ switch lst {
-  40 │ | list{1, 2} => ()
-  41 │ }
-  42 │ 
-  43 │ switch lst {
-
-  You forgot to handle a possible case here, for example: 
-  | list{1, 2, _, ..._} | list{1, 0, ..._} | list{1} | list{0, ..._} | list{}
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:43:1-45:1
-
-  41 │ }
-  42 │ 
-  43 │ switch lst {
-  44 │ | list{1} => ()
-  45 │ }
-  46 │ 
-  47 │ switch "abc" {
-
-  You forgot to handle a possible case here, for example: 
-  | list{1, _, ..._} | list{0, ..._} | list{}
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:47:1-49:1
-
-  45 │ }
-  46 │ 
-  47 │ switch "abc" {
-  48 │ | "" => ()
-  49 │ }
-  50 │ 
-  51 │ switch 0 {
-
-  You forgot to handle a possible case here, for example: 
-  | "*"
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:51:1-53:1
-
-  49 │ }
-  50 │ 
-  51 │ switch 0 {
-  52 │ | 1 => ()
-  53 │ }
-  54 │ 
-  55 │ let tuple = (1, true)
-
-  You forgot to handle a possible case here, for example: 
-  | 0
-
-
-  Warning number 8
-  /.../fixtures/warnings5.res:57:1-59:1
-
-  55 │ let tuple = (1, true)
-  56 │ 
-  57 │ switch tuple {
-  58 │ | (_, false) => ()
-  59 │ }
-  60 │ 
-
-  You forgot to handle a possible case here, for example: 
-  | (_, true)
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/wrong_name_component_prop.res.expected b/jscomp/build_tests/super_errors/expected/wrong_name_component_prop.res.expected
deleted file mode 100644
index af78b82..0000000
--- a/jscomp/build_tests/super_errors/expected/wrong_name_component_prop.res.expected
+++ /dev/null
@@ -1,23 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/wrong_name_component_prop.res:32:28-38
-
-  30 │ }
-  31 │ 
-  32 │ let dddd = Component.make({nonExistant: "hello"})
-  33 │ 
-
-  The field nonExistant does not belong to type Component.props
-  
-  This record expression is expected to have type
-    Component.props<
-  string,
-  string,
-  string,
-  string,
-  string,
-  string,
-  string,
-  string,
-  string,
->
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/expected/wrong_name_record_field.res.expected b/jscomp/build_tests/super_errors/expected/wrong_name_record_field.res.expected
deleted file mode 100644
index ab11b80..0000000
--- a/jscomp/build_tests/super_errors/expected/wrong_name_record_field.res.expected
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  We've found a bug for you!
-  /.../fixtures/wrong_name_record_field.res:4:3-4
-
-  2 │ 
-  3 │ let ff: d = {
-  4 │   zz: 123,
-  5 │ }
-  6 │ 
-
-  The field zz does not belong to type d
-  
-  This record expression is expected to have type d
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/fixtures/DerivingAccessorsRecordParam.res b/jscomp/build_tests/super_errors/fixtures/DerivingAccessorsRecordParam.res
deleted file mode 100644
index c86aa30..0000000
--- a/jscomp/build_tests/super_errors/fixtures/DerivingAccessorsRecordParam.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@deriving(accessors)
-type t = Struct({a: int})
diff --git a/jscomp/build_tests/super_errors/fixtures/RecordInclusion.res b/jscomp/build_tests/super_errors/fixtures/RecordInclusion.res
deleted file mode 100644
index c8d366c..0000000
--- a/jscomp/build_tests/super_errors/fixtures/RecordInclusion.res
+++ /dev/null
@@ -1,5 +0,0 @@
-module M : {
-  type t<'a, 'b, 'c> = {x:int, y:list<('a, 'b)>, z:int}
-} = {
-  type t<'a, 'b, 'c> = {x:int, y:list<('a, 'c)>, z:int}
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/UncurriedArgsNotApplied.res b/jscomp/build_tests/super_errors/fixtures/UncurriedArgsNotApplied.res
deleted file mode 100644
index 0d8be72..0000000
--- a/jscomp/build_tests/super_errors/fixtures/UncurriedArgsNotApplied.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let apply = (fn: (. unit) => option<int>) => fn(. ())
-
-let _ = apply(Some(1))
diff --git a/jscomp/build_tests/super_errors/fixtures/UntaggedImplIntf.res b/jscomp/build_tests/super_errors/fixtures/UntaggedImplIntf.res
deleted file mode 100644
index 6d269fe..0000000
--- a/jscomp/build_tests/super_errors/fixtures/UntaggedImplIntf.res
+++ /dev/null
@@ -1,5 +0,0 @@
-module M: {
-  @unboxed type t = | @as(null) A
-} = {
-  type t = | @as(null) A
-}
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/fixtures/UntaggedNonUnary1.res b/jscomp/build_tests/super_errors/fixtures/UntaggedNonUnary1.res
deleted file mode 100644
index 5143c46..0000000
--- a/jscomp/build_tests/super_errors/fixtures/UntaggedNonUnary1.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@unboxed
-type t = Tuple(int, string)
diff --git a/jscomp/build_tests/super_errors/fixtures/UntaggedNonUnary2.res b/jscomp/build_tests/super_errors/fixtures/UntaggedNonUnary2.res
deleted file mode 100644
index fde4ae2..0000000
--- a/jscomp/build_tests/super_errors/fixtures/UntaggedNonUnary2.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@unboxed
-type t = Tuple(int, string) | Float(float)
diff --git a/jscomp/build_tests/super_errors/fixtures/UntaggedTupleAndArray.res b/jscomp/build_tests/super_errors/fixtures/UntaggedTupleAndArray.res
deleted file mode 100644
index 266f62a..0000000
--- a/jscomp/build_tests/super_errors/fixtures/UntaggedTupleAndArray.res
+++ /dev/null
@@ -1,4 +0,0 @@
-@unboxed
-type t =
-  | Array(array<int>)
-  | Tuple((int, int))
diff --git a/jscomp/build_tests/super_errors/fixtures/UntaggedUnknown.res b/jscomp/build_tests/super_errors/fixtures/UntaggedUnknown.res
deleted file mode 100644
index de0ae74..0000000
--- a/jscomp/build_tests/super_errors/fixtures/UntaggedUnknown.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@unboxed
-type t = List(list<float>) | Float(float)
diff --git a/jscomp/build_tests/super_errors/fixtures/arity_mismatch.res b/jscomp/build_tests/super_errors/fixtures/arity_mismatch.res
deleted file mode 100644
index 7ca22b2..0000000
--- a/jscomp/build_tests/super_errors/fixtures/arity_mismatch.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let makeVar = (. ~f, ()) => 34
-let makeVariables = makeVar(.~f=f => f)
diff --git a/jscomp/build_tests/super_errors/fixtures/arity_mismatch2.res b/jscomp/build_tests/super_errors/fixtures/arity_mismatch2.res
deleted file mode 100644
index 7f22a21..0000000
--- a/jscomp/build_tests/super_errors/fixtures/arity_mismatch2.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let makeVar = (. f, ()) => 34
-let makeVariables = makeVar(. 1, 2, 3)
diff --git a/jscomp/build_tests/super_errors/fixtures/arity_mismatch3.res b/jscomp/build_tests/super_errors/fixtures/arity_mismatch3.res
deleted file mode 100644
index 58d94f8..0000000
--- a/jscomp/build_tests/super_errors/fixtures/arity_mismatch3.res
+++ /dev/null
@@ -1 +0,0 @@
-Belt.Array.mapU([], (. a, b) => 1)
diff --git a/jscomp/build_tests/super_errors/fixtures/array_item_type_mismatch.res b/jscomp/build_tests/super_errors/fixtures/array_item_type_mismatch.res
deleted file mode 100644
index 541be0e..0000000
--- a/jscomp/build_tests/super_errors/fixtures/array_item_type_mismatch.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = [1, 2, "hello"]
diff --git a/jscomp/build_tests/super_errors/fixtures/await.res b/jscomp/build_tests/super_errors/fixtures/await.res
deleted file mode 100644
index 63e982c..0000000
--- a/jscomp/build_tests/super_errors/fixtures/await.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let a = async () => 3
-let foo = async () => {
-  let _ = ()
-  () => await a()
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/bigint_match_literal.res b/jscomp/build_tests/super_errors/fixtures/bigint_match_literal.res
deleted file mode 100644
index ee0e07f..0000000
--- a/jscomp/build_tests/super_errors/fixtures/bigint_match_literal.res
+++ /dev/null
@@ -1,6 +0,0 @@
-let m1 = switch 1n {
-| 0001n => 1
-| 1n => 1
-| -0001n => -1
-| _ => 0
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/c_for_u_in_c_mode.res b/jscomp/build_tests/super_errors/fixtures/c_for_u_in_c_mode.res
deleted file mode 100644
index ed0ff15..0000000
--- a/jscomp/build_tests/super_errors/fixtures/c_for_u_in_c_mode.res
+++ /dev/null
@@ -1,5 +0,0 @@
-module Foo: {
-  let add: (. int, int) => int
-} = {
-  let add = (a, b) => a + b
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/c_for_u_in_u_mode.res b/jscomp/build_tests/super_errors/fixtures/c_for_u_in_u_mode.res
deleted file mode 100644
index 8444002..0000000
--- a/jscomp/build_tests/super_errors/fixtures/c_for_u_in_u_mode.res
+++ /dev/null
@@ -1,8 +0,0 @@
-@@uncurried
-
-module Foo: {
-  let add: (int, int) => int
-} = {
-  @@uncurried.swap
-  let add = (. a, b) => a + b
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/collections.res b/jscomp/build_tests/super_errors/fixtures/collections.res
deleted file mode 100644
index d4e9e91..0000000
--- a/jscomp/build_tests/super_errors/fixtures/collections.res
+++ /dev/null
@@ -1,2 +0,0 @@
-/* wrong type in a list */
-list{1, 2, "Hello"}->ignore
diff --git a/jscomp/build_tests/super_errors/fixtures/comparison_operator.res b/jscomp/build_tests/super_errors/fixtures/comparison_operator.res
deleted file mode 100644
index c9c4270..0000000
--- a/jscomp/build_tests/super_errors/fixtures/comparison_operator.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let f = Some(0)
-
-let x = 100 === f
diff --git a/jscomp/build_tests/super_errors/fixtures/component_missing_prop.res b/jscomp/build_tests/super_errors/fixtures/component_missing_prop.res
deleted file mode 100644
index 6dbe26b..0000000
--- a/jscomp/build_tests/super_errors/fixtures/component_missing_prop.res
+++ /dev/null
@@ -1,6 +0,0 @@
-// Since the React transform isn't active in the tests, mimic what the transform outputs.
-module Component = {
-  type props<'name> = {name: 'name}
-
-  let make = (): props<'name> => {}
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/component_missing_prop_test.res b/jscomp/build_tests/super_errors/fixtures/component_missing_prop_test.res
deleted file mode 100644
index 2f75f61..0000000
--- a/jscomp/build_tests/super_errors/fixtures/component_missing_prop_test.res
+++ /dev/null
@@ -1,6 +0,0 @@
-// Since the React transform isn't active in the tests, mimic what the transform outputs.
-module Component = {
-  type props<'name> = {name: 'name}
-
-  let make = (): props<'name> => {nname: "hello"}
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/curried_expected.res b/jscomp/build_tests/super_errors/fixtures/curried_expected.res
deleted file mode 100644
index 224d432..0000000
--- a/jscomp/build_tests/super_errors/fixtures/curried_expected.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let expectCurried = f => f(1) + 2
-
-let z1 = expectCurried((. x, y) => x+y)
diff --git a/jscomp/build_tests/super_errors/fixtures/curry_in_uncurry.res b/jscomp/build_tests/super_errors/fixtures/curry_in_uncurry.res
deleted file mode 100644
index 3a858b9..0000000
--- a/jscomp/build_tests/super_errors/fixtures/curry_in_uncurry.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let f = (a, b) => a + b
-
-f(. 2, 2)->Js.log
diff --git a/jscomp/build_tests/super_errors/fixtures/dict_inference.res b/jscomp/build_tests/super_errors/fixtures/dict_inference.res
deleted file mode 100644
index 703f0c6..0000000
--- a/jscomp/build_tests/super_errors/fixtures/dict_inference.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let dict = Js.Dict.empty()
-dict->Js.Dict.set("someKey1", 1)
-dict->Js.Dict.set("someKey2", 2)
-dict->Js.Dict.set("someKey2", "2")
diff --git a/jscomp/build_tests/super_errors/fixtures/directive_attr.res b/jscomp/build_tests/super_errors/fixtures/directive_attr.res
deleted file mode 100644
index ec80ff9..0000000
--- a/jscomp/build_tests/super_errors/fixtures/directive_attr.res
+++ /dev/null
@@ -1 +0,0 @@
-@@directive
diff --git a/jscomp/build_tests/super_errors/fixtures/duplicate_labels_error.res b/jscomp/build_tests/super_errors/fixtures/duplicate_labels_error.res
deleted file mode 100644
index a8aa3fb..0000000
--- a/jscomp/build_tests/super_errors/fixtures/duplicate_labels_error.res
+++ /dev/null
@@ -1,4 +0,0 @@
-type rcrd = {
-  name: string,
-  name: int,
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/fieldNotOptional.res b/jscomp/build_tests/super_errors/fixtures/fieldNotOptional.res
deleted file mode 100644
index e653cbd..0000000
--- a/jscomp/build_tests/super_errors/fixtures/fieldNotOptional.res
+++ /dev/null
@@ -1,17 +0,0 @@
-type r = {nonopt: int, opt?: string}
-
-let v = {nonopt: ?3, opt: ?None}
-
-let f = r =>
-  switch r {
-  | {nonopt: ?_, opt: ?_} => true
-  }
-
-type inline = A({nonopt: int, opt?: string})
-
-let vi = A({nonopt: ?3, opt: ?None})
-
-let fi = a =>
-  switch a {
-  | A ({nonopt: ?_, opt: ?_}) => true
-  }
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/fixtures/function_argument_mismatch.res b/jscomp/build_tests/super_errors/fixtures/function_argument_mismatch.res
deleted file mode 100644
index 895aa91..0000000
--- a/jscomp/build_tests/super_errors/fixtures/function_argument_mismatch.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let makeName = (s, i) => s ++ i
-
-let name = makeName("123", 123)
diff --git a/jscomp/build_tests/super_errors/fixtures/function_call_mismatch.res b/jscomp/build_tests/super_errors/fixtures/function_call_mismatch.res
deleted file mode 100644
index 1d3bafc..0000000
--- a/jscomp/build_tests/super_errors/fixtures/function_call_mismatch.res
+++ /dev/null
@@ -1,8 +0,0 @@
-@module("shelljs")
-external cd: string => string = "cd"
-external exec: string => string = "exec"
-
-let cloneInTemp = (temp: string): string => {
-  cd(temp)
-  exec("git clone git@github.com:myorg/myrepo.git")
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/function_return_mismatch.res b/jscomp/build_tests/super_errors/fixtures/function_return_mismatch.res
deleted file mode 100644
index 7907de2..0000000
--- a/jscomp/build_tests/super_errors/fixtures/function_return_mismatch.res
+++ /dev/null
@@ -1,10 +0,0 @@
-type cleanup = unit => unit
-
-let fnExpectingCleanup = (cb: unit => cleanup) => {
-  let cleanup = cb()
-  cleanup()
-}
-
-let x = fnExpectingCleanup(() => {
-  123
-})
diff --git a/jscomp/build_tests/super_errors/fixtures/highlighting1.res b/jscomp/build_tests/super_errors/fixtures/highlighting1.res
deleted file mode 100644
index 9974a5f..0000000
--- a/jscomp/build_tests/super_errors/fixtures/highlighting1.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let a: int = "hel
-
-lo"
diff --git a/jscomp/build_tests/super_errors/fixtures/highlighting2.res b/jscomp/build_tests/super_errors/fixtures/highlighting2.res
deleted file mode 100644
index 52dacee..0000000
--- a/jscomp/build_tests/super_errors/fixtures/highlighting2.res
+++ /dev/null
@@ -1,4 +0,0 @@
-
-                      let a: int = "hel
-
-                      lo"
diff --git a/jscomp/build_tests/super_errors/fixtures/highlighting3.res b/jscomp/build_tests/super_errors/fixtures/highlighting3.res
deleted file mode 100644
index b781381..0000000
--- a/jscomp/build_tests/super_errors/fixtures/highlighting3.res
+++ /dev/null
@@ -1,4 +0,0 @@
-
-let a: int = "helllllll
-
-loooooooooooooo"
diff --git a/jscomp/build_tests/super_errors/fixtures/highlighting4.res b/jscomp/build_tests/super_errors/fixtures/highlighting4.res
deleted file mode 100644
index e6d29d5..0000000
--- a/jscomp/build_tests/super_errors/fixtures/highlighting4.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@@warnerror("A")
-/* single char highlighted */
-@deprecated
-type a = int
-type b = a
diff --git a/jscomp/build_tests/super_errors/fixtures/highlighting5.res b/jscomp/build_tests/super_errors/fixtures/highlighting5.res
deleted file mode 100644
index 945a6be..0000000
--- a/jscomp/build_tests/super_errors/fixtures/highlighting5.res
+++ /dev/null
@@ -1,2 +0,0 @@
-/* overflows in the terminal */
-let a: int = "helllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll"
diff --git a/jscomp/build_tests/super_errors/fixtures/highlighting6.res b/jscomp/build_tests/super_errors/fixtures/highlighting6.res
deleted file mode 100644
index dc60510..0000000
--- a/jscomp/build_tests/super_errors/fixtures/highlighting6.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let aaaaa = 10
-let b = aaaab
diff --git a/jscomp/build_tests/super_errors/fixtures/if_branch_mismatch.res b/jscomp/build_tests/super_errors/fixtures/if_branch_mismatch.res
deleted file mode 100644
index 19112ea..0000000
--- a/jscomp/build_tests/super_errors/fixtures/if_branch_mismatch.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let x = if true {
-  "123"
-} else {
-  123
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/if_condition_mismatch.res b/jscomp/build_tests/super_errors/fixtures/if_condition_mismatch.res
deleted file mode 100644
index 221d18b..0000000
--- a/jscomp/build_tests/super_errors/fixtures/if_condition_mismatch.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let x = if "horse" {
-  ()
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/intoverflow.res b/jscomp/build_tests/super_errors/fixtures/intoverflow.res
deleted file mode 100644
index b1b3981..0000000
--- a/jscomp/build_tests/super_errors/fixtures/intoverflow.res
+++ /dev/null
@@ -1,12 +0,0 @@
-let v1: int = 2_147_483_647 // max int
-let v2: int = 2_147_483_648 // overflow
-let v3: int = 2_147_483_649 // overflow
-let v4: int = -2_147_483_647
-let v5: int = -2_147_483_648 // min int
-let v6: int = -2_147_483_649 // underflow
-
-// hex
-let v7: int = 0xFFFF_FFFF // -1
-let v8: int = -0xFFFF_FFFF // 1
-let v9:int = 0x1_0000_0000 // overflow
-let v10:int = -0x1_0000_0000 // underflow
diff --git a/jscomp/build_tests/super_errors/fixtures/jinterp.res b/jscomp/build_tests/super_errors/fixtures/jinterp.res
deleted file mode 100644
index cd6608f..0000000
--- a/jscomp/build_tests/super_errors/fixtures/jinterp.res
+++ /dev/null
@@ -1,3 +0,0 @@
-
-let a = 11
-let b = j`number $(a)`
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/fixtures/math_operator_constant.res b/jscomp/build_tests/super_errors/fixtures/math_operator_constant.res
deleted file mode 100644
index 3934ae0..0000000
--- a/jscomp/build_tests/super_errors/fixtures/math_operator_constant.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let num = 0
-
-let x = num + 12.
diff --git a/jscomp/build_tests/super_errors/fixtures/math_operator_float.res b/jscomp/build_tests/super_errors/fixtures/math_operator_float.res
deleted file mode 100644
index 4e791f2..0000000
--- a/jscomp/build_tests/super_errors/fixtures/math_operator_float.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let num = 0
-
-let x = num +. 12.
diff --git a/jscomp/build_tests/super_errors/fixtures/math_operator_int.res b/jscomp/build_tests/super_errors/fixtures/math_operator_int.res
deleted file mode 100644
index cc57609..0000000
--- a/jscomp/build_tests/super_errors/fixtures/math_operator_int.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let num = 0.
-
-let x = num + 12.
diff --git a/jscomp/build_tests/super_errors/fixtures/math_operator_string.res b/jscomp/build_tests/super_errors/fixtures/math_operator_string.res
deleted file mode 100644
index 9005135..0000000
--- a/jscomp/build_tests/super_errors/fixtures/math_operator_string.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = "hello" + "what"
diff --git a/jscomp/build_tests/super_errors/fixtures/method_arity_mismatch.res b/jscomp/build_tests/super_errors/fixtures/method_arity_mismatch.res
deleted file mode 100644
index d50b393..0000000
--- a/jscomp/build_tests/super_errors/fixtures/method_arity_mismatch.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let f = obj => {
-  obj["hi"](.1, 2)
-  obj["hi"](.1)
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/missing_label.res b/jscomp/build_tests/super_errors/fixtures/missing_label.res
deleted file mode 100644
index f67eb46..0000000
--- a/jscomp/build_tests/super_errors/fixtures/missing_label.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let f = (~a) => a ++ ""
-
-let _ = f("")
diff --git a/jscomp/build_tests/super_errors/fixtures/missing_labels.res b/jscomp/build_tests/super_errors/fixtures/missing_labels.res
deleted file mode 100644
index 9953d57..0000000
--- a/jscomp/build_tests/super_errors/fixtures/missing_labels.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let f = (~a, ~b) => a ++ b
-
-let _ = f("", "")
diff --git a/jscomp/build_tests/super_errors/fixtures/modules1.res b/jscomp/build_tests/super_errors/fixtures/modules1.res
deleted file mode 100644
index 766e39d..0000000
--- a/jscomp/build_tests/super_errors/fixtures/modules1.res
+++ /dev/null
@@ -1 +0,0 @@
-let b = Foo.b
diff --git a/jscomp/build_tests/super_errors/fixtures/modules2.res b/jscomp/build_tests/super_errors/fixtures/modules2.res
deleted file mode 100644
index 9f17e8b..0000000
--- a/jscomp/build_tests/super_errors/fixtures/modules2.res
+++ /dev/null
@@ -1 +0,0 @@
-let b = List.b
diff --git a/jscomp/build_tests/super_errors/fixtures/modules3.res b/jscomp/build_tests/super_errors/fixtures/modules3.res
deleted file mode 100644
index 50ce549..0000000
--- a/jscomp/build_tests/super_errors/fixtures/modules3.res
+++ /dev/null
@@ -1,17 +0,0 @@
-module A = {
-  module B = {
-    module C = {
-      module D = {
-        let aaaa = 1
-      }
-    }
-  }
-}
-
-let asd = A.B.C.D.aaa
-
-/* there's another, unrelated test, that we're just gonna paste here. We won't
-run this, because CI and macOS give different results because of the way path
-sensitivity is handled */
-
-/* let asd = JS.toOption */
diff --git a/jscomp/build_tests/super_errors/fixtures/moreArguments1.res b/jscomp/build_tests/super_errors/fixtures/moreArguments1.res
deleted file mode 100644
index f3f5c80..0000000
--- a/jscomp/build_tests/super_errors/fixtures/moreArguments1.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = (~a, ~b) => a + b
-let y = x(~a=2) + 2
diff --git a/jscomp/build_tests/super_errors/fixtures/moreArguments2.res b/jscomp/build_tests/super_errors/fixtures/moreArguments2.res
deleted file mode 100644
index f9de2b7..0000000
--- a/jscomp/build_tests/super_errors/fixtures/moreArguments2.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = (a, b) => a + b
-let y = x(2) + 2
diff --git a/jscomp/build_tests/super_errors/fixtures/moreArguments3.res b/jscomp/build_tests/super_errors/fixtures/moreArguments3.res
deleted file mode 100644
index d27f568..0000000
--- a/jscomp/build_tests/super_errors/fixtures/moreArguments3.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = (a, b, c, d) => a + b
-let y = x(2) + 2
diff --git a/jscomp/build_tests/super_errors/fixtures/moreArguments4.res b/jscomp/build_tests/super_errors/fixtures/moreArguments4.res
deleted file mode 100644
index 4c652b3..0000000
--- a/jscomp/build_tests/super_errors/fixtures/moreArguments4.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = (a, ~b, ~c, ~d) => a + b
-let y = x(2) + 2
diff --git a/jscomp/build_tests/super_errors/fixtures/moreArguments5.res b/jscomp/build_tests/super_errors/fixtures/moreArguments5.res
deleted file mode 100644
index 1bd2414..0000000
--- a/jscomp/build_tests/super_errors/fixtures/moreArguments5.res
+++ /dev/null
@@ -1,5 +0,0 @@
-module Sub = {
-  type a = {a: int}
-}
-let x = (a, b, c, d) => {Sub.a: 2}
-let y = x(2).Sub.a
diff --git a/jscomp/build_tests/super_errors/fixtures/non_function_uncurried_apply.res b/jscomp/build_tests/super_errors/fixtures/non_function_uncurried_apply.res
deleted file mode 100644
index da97632..0000000
--- a/jscomp/build_tests/super_errors/fixtures/non_function_uncurried_apply.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let nonfun = 2
-let _ = nonfun(. 3)
diff --git a/jscomp/build_tests/super_errors/fixtures/partial_app.res b/jscomp/build_tests/super_errors/fixtures/partial_app.res
deleted file mode 100644
index 19b3d75..0000000
--- a/jscomp/build_tests/super_errors/fixtures/partial_app.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let f = (a, b, c) => {
-  a + b + c
-}
-
-f(1, 2)
diff --git a/jscomp/build_tests/super_errors/fixtures/polyvariant_name_formatting.res b/jscomp/build_tests/super_errors/fixtures/polyvariant_name_formatting.res
deleted file mode 100644
index f28f200..0000000
--- a/jscomp/build_tests/super_errors/fixtures/polyvariant_name_formatting.res
+++ /dev/null
@@ -1,7 +0,0 @@
-type polyvariant = [#Error(string) | #Valid]
-
-let f: polyvariant = #Valid
-
-switch f {
-| #Invalid => ()
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives1.res b/jscomp/build_tests/super_errors/fixtures/primitives1.res
deleted file mode 100644
index 431b534..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives1.res
+++ /dev/null
@@ -1,2 +0,0 @@
-/* got float, wanted int */
-2. + 2
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives10.res b/jscomp/build_tests/super_errors/fixtures/primitives10.res
deleted file mode 100644
index dc60510..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives10.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let aaaaa = 10
-let b = aaaab
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives11.res b/jscomp/build_tests/super_errors/fixtures/primitives11.res
deleted file mode 100644
index 086d926..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives11.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type aa = option<string>
-type bb = option<int>
-type a = option<aa>
-type b = option<bb>
-let a: a = (Some(Some(5)): b)
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives2.res b/jscomp/build_tests/super_errors/fixtures/primitives2.res
deleted file mode 100644
index d5d5467..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives2.res
+++ /dev/null
@@ -1,2 +0,0 @@
-/* got int, wanted string */
-2 ++ " things"
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives3.res b/jscomp/build_tests/super_errors/fixtures/primitives3.res
deleted file mode 100644
index 824693e..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives3.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Too many arguments */
-let x = a => a + 2
-x(2, 4)
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives4.res b/jscomp/build_tests/super_errors/fixtures/primitives4.res
deleted file mode 100644
index 94b0c1e..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives4.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Not a function */
-let x = 10
-x(10)
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives5.res b/jscomp/build_tests/super_errors/fixtures/primitives5.res
deleted file mode 100644
index de2ab50..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives5.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Not enough arguments */
-type x = X(int, float)
-X(10)->ignore
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives6.res b/jscomp/build_tests/super_errors/fixtures/primitives6.res
deleted file mode 100644
index 7f192c9..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives6.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Wrong constructor argument */
-type x = X(int, float)
-X(10, 10)->ignore
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives7.res b/jscomp/build_tests/super_errors/fixtures/primitives7.res
deleted file mode 100644
index d456521..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives7.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Wanted list(float), found list(int) */
-let a = list{1, 2, 3}
-List.map(n => n +. 2., a)
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives8.res b/jscomp/build_tests/super_errors/fixtures/primitives8.res
deleted file mode 100644
index 8cf2256..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives8.res
+++ /dev/null
@@ -1 +0,0 @@
-let asd = aaa
diff --git a/jscomp/build_tests/super_errors/fixtures/primitives9.res b/jscomp/build_tests/super_errors/fixtures/primitives9.res
deleted file mode 100644
index f6637bd..0000000
--- a/jscomp/build_tests/super_errors/fixtures/primitives9.res
+++ /dev/null
@@ -1 +0,0 @@
-let a: int = "hello"
diff --git a/jscomp/build_tests/super_errors/fixtures/private_without_body.res b/jscomp/build_tests/super_errors/fixtures/private_without_body.res
deleted file mode 100644
index cadfcfd..0000000
--- a/jscomp/build_tests/super_errors/fixtures/private_without_body.res
+++ /dev/null
@@ -1,2 +0,0 @@
-%%private
-let a = 2
diff --git a/jscomp/build_tests/super_errors/fixtures/record_type_spreads.res b/jscomp/build_tests/super_errors/fixtures/record_type_spreads.res
deleted file mode 100644
index 7f0a675..0000000
--- a/jscomp/build_tests/super_errors/fixtures/record_type_spreads.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type t = {x: int, y: string}
-
-type t2 = {x: string, y: float}
-
-type t3 = {...t, ...t2}
diff --git a/jscomp/build_tests/super_errors/fixtures/record_type_spreads_deep_sub.res b/jscomp/build_tests/super_errors/fixtures/record_type_spreads_deep_sub.res
deleted file mode 100644
index 8268109..0000000
--- a/jscomp/build_tests/super_errors/fixtures/record_type_spreads_deep_sub.res
+++ /dev/null
@@ -1,9 +0,0 @@
-// Checks that deep subsitution works as intended
-type t<'a, 'b> = {x: result<'a, 'b>}
-type d = {
-  ...t<int, int>,
-}
-
-let d: d = {
-  x: Ok("this errors"),
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/recursive_type.res b/jscomp/build_tests/super_errors/fixtures/recursive_type.res
deleted file mode 100644
index b21eb02..0000000
--- a/jscomp/build_tests/super_errors/fixtures/recursive_type.res
+++ /dev/null
@@ -1,37 +0,0 @@
-@@uncurried
-
-// test.res
-type rec tt = [
-  | #List(list<tt>)
-]
-type sexp = tt
-
-/* {2 Serialization (encoding)} */
-
-
-let rec expr_starting_with = (c, k, t) =>
-  switch c {
-  | '(' => expr_list(list{}, k, t)
-  | c => atom(k, t)
-  }
-
-/* parse list */
-and expr_list = (acc, k, t) => {
-  switch assert(false) {
-  | ')' => k(None, #List(acc))
-  | c =>
-    expr_starting_with(
-      c,
-      (last, e) =>
-        switch last {
-        | _ => expr_list(list{e, ...acc}, k, t)
-        },
-      t,
-    )
-  }
-}
-/* parse atom */
-and atom = (k, t) => {
-  let _ = atom(k)
-  assert(false)
-}
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/fixtures/repeated_def_extension_constr.res b/jscomp/build_tests/super_errors/fixtures/repeated_def_extension_constr.res
deleted file mode 100644
index 80f0641..0000000
--- a/jscomp/build_tests/super_errors/fixtures/repeated_def_extension_constr.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type a = ..
-
-type a
diff --git a/jscomp/build_tests/super_errors/fixtures/repeated_def_module_types.res b/jscomp/build_tests/super_errors/fixtures/repeated_def_module_types.res
deleted file mode 100644
index e6a5796..0000000
--- a/jscomp/build_tests/super_errors/fixtures/repeated_def_module_types.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module type M = {}
-
-module type M = {}
diff --git a/jscomp/build_tests/super_errors/fixtures/repeated_def_modules.res b/jscomp/build_tests/super_errors/fixtures/repeated_def_modules.res
deleted file mode 100644
index 9d9253c..0000000
--- a/jscomp/build_tests/super_errors/fixtures/repeated_def_modules.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module M = {}
-
-module M = {}
diff --git a/jscomp/build_tests/super_errors/fixtures/repeated_def_types.res b/jscomp/build_tests/super_errors/fixtures/repeated_def_types.res
deleted file mode 100644
index 995e818..0000000
--- a/jscomp/build_tests/super_errors/fixtures/repeated_def_types.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type a
-
-type a
diff --git a/jscomp/build_tests/super_errors/fixtures/set_record_field_type_match.res b/jscomp/build_tests/super_errors/fixtures/set_record_field_type_match.res
deleted file mode 100644
index f280f42..0000000
--- a/jscomp/build_tests/super_errors/fixtures/set_record_field_type_match.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type record = {
-  mutable name: string,
-  age: int,
-}
-
-let user = {
-  name: "Test",
-  age: 99,
-}
-
-user.name = 12
diff --git a/jscomp/build_tests/super_errors/fixtures/switch_different_types.res b/jscomp/build_tests/super_errors/fixtures/switch_different_types.res
deleted file mode 100644
index de9a693..0000000
--- a/jscomp/build_tests/super_errors/fixtures/switch_different_types.res
+++ /dev/null
@@ -1,9 +0,0 @@
-@val external foo: string = "foo"
-external someFunction: unit => string = "someFunction"
-
-let bar = () => {
-  switch foo {
-  | "world" => ()
-  | _ => someFunction()
-  }
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/switch_guard.res b/jscomp/build_tests/super_errors/fixtures/switch_guard.res
deleted file mode 100644
index 7c3786b..0000000
--- a/jscomp/build_tests/super_errors/fixtures/switch_guard.res
+++ /dev/null
@@ -1,9 +0,0 @@
-@val external foo: string = "foo"
-external someFunction: unit => string = "someFunction"
-
-let bar = () => {
-  switch foo {
-  | "world" if "horse" => ()
-  | _ => someFunction()
-  }
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/syntaxErrors1.res b/jscomp/build_tests/super_errors/fixtures/syntaxErrors1.res
deleted file mode 100644
index 6b74450..0000000
--- a/jscomp/build_tests/super_errors/fixtures/syntaxErrors1.res
+++ /dev/null
@@ -1 +0,0 @@
-let b = fo;;;;;;;;;;;;;;;;
diff --git a/jscomp/build_tests/super_errors/fixtures/syntaxErrors2.res b/jscomp/build_tests/super_errors/fixtures/syntaxErrors2.res
deleted file mode 100644
index 17cf272..0000000
--- a/jscomp/build_tests/super_errors/fixtures/syntaxErrors2.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let () =
-  I'm glad you're looking at this file =)
diff --git a/jscomp/build_tests/super_errors/fixtures/syntaxErrors3.res b/jscomp/build_tests/super_errors/fixtures/syntaxErrors3.res
deleted file mode 100644
index ab3926e..0000000
--- a/jscomp/build_tests/super_errors/fixtures/syntaxErrors3.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = print_char('a)
diff --git a/jscomp/build_tests/super_errors/fixtures/syntaxErrors4.res b/jscomp/build_tests/super_errors/fixtures/syntaxErrors4.res
deleted file mode 100644
index c411ea1..0000000
--- a/jscomp/build_tests/super_errors/fixtures/syntaxErrors4.res
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/* */
-/* */
-/* */
-let a:int = "asdaaaaaaaaaaaaaaaaaaaaa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa"
-/* */
-/* */
-/* */
-/* */
diff --git a/jscomp/build_tests/super_errors/fixtures/syntaxErrors5.res b/jscomp/build_tests/super_errors/fixtures/syntaxErrors5.res
deleted file mode 100644
index 9d9c5c3..0000000
--- a/jscomp/build_tests/super_errors/fixtures/syntaxErrors5.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = (1, 2
diff --git a/jscomp/build_tests/super_errors/fixtures/todo_with_no_payload.res b/jscomp/build_tests/super_errors/fixtures/todo_with_no_payload.res
deleted file mode 100644
index d7aa606..0000000
--- a/jscomp/build_tests/super_errors/fixtures/todo_with_no_payload.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let implementMeLater = (): string => %todo
-
-let x = implementMeLater()
-
-Js.log(x->Js.String2.includes("x"))
diff --git a/jscomp/build_tests/super_errors/fixtures/todo_with_payload.res b/jscomp/build_tests/super_errors/fixtures/todo_with_payload.res
deleted file mode 100644
index a52d80d..0000000
--- a/jscomp/build_tests/super_errors/fixtures/todo_with_payload.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let implementMeLater = (): string => %todo("This should return a string eventually.")
-
-let x = implementMeLater()
-
-Js.log(x->Js.String2.includes("x"))
diff --git a/jscomp/build_tests/super_errors/fixtures/top_level_fn_call_not_unit.res b/jscomp/build_tests/super_errors/fixtures/top_level_fn_call_not_unit.res
deleted file mode 100644
index 25fae76..0000000
--- a/jscomp/build_tests/super_errors/fixtures/top_level_fn_call_not_unit.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let returnsSomething = () => 123
-
-returnsSomething()
diff --git a/jscomp/build_tests/super_errors/fixtures/top_level_value_not_unit.res b/jscomp/build_tests/super_errors/fixtures/top_level_value_not_unit.res
deleted file mode 100644
index 81c545e..0000000
--- a/jscomp/build_tests/super_errors/fixtures/top_level_value_not_unit.res
+++ /dev/null
@@ -1 +0,0 @@
-1234
diff --git a/jscomp/build_tests/super_errors/fixtures/type1.res b/jscomp/build_tests/super_errors/fixtures/type1.res
deleted file mode 100644
index f2b6996..0000000
--- a/jscomp/build_tests/super_errors/fixtures/type1.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = 2. + 2
diff --git a/jscomp/build_tests/super_errors/fixtures/type2.res b/jscomp/build_tests/super_errors/fixtures/type2.res
deleted file mode 100644
index 12f507a..0000000
--- a/jscomp/build_tests/super_errors/fixtures/type2.res
+++ /dev/null
@@ -1,7 +0,0 @@
-@send external push: (array<'a>, 'a) => unit = "push"
-
-let a = []
-let () = {
-  push(a, 3)->ignore
-  push(a, "3")->ignore
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/type3.res b/jscomp/build_tests/super_errors/fixtures/type3.res
deleted file mode 100644
index 8a672bd..0000000
--- a/jscomp/build_tests/super_errors/fixtures/type3.res
+++ /dev/null
@@ -1 +0,0 @@
-let u = []
diff --git a/jscomp/build_tests/super_errors/fixtures/u_for_c_in_c_mode.res b/jscomp/build_tests/super_errors/fixtures/u_for_c_in_c_mode.res
deleted file mode 100644
index f1da111..0000000
--- a/jscomp/build_tests/super_errors/fixtures/u_for_c_in_c_mode.res
+++ /dev/null
@@ -1,5 +0,0 @@
-module Foo: {
-  let add: (int, int) => int
-} = {
-  let add = (. a, b) => a + b
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/u_for_c_in_u_mode.res b/jscomp/build_tests/super_errors/fixtures/u_for_c_in_u_mode.res
deleted file mode 100644
index 85e59db..0000000
--- a/jscomp/build_tests/super_errors/fixtures/u_for_c_in_u_mode.res
+++ /dev/null
@@ -1,8 +0,0 @@
-@@uncurried
-
-module Foo: {
-  @@uncurried.swap
-  let add: (. int, int) => int
-} = {
-  let add = (a, b) => a + b
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/uncurried_expected.res b/jscomp/build_tests/super_errors/fixtures/uncurried_expected.res
deleted file mode 100644
index 6fad3ef..0000000
--- a/jscomp/build_tests/super_errors/fixtures/uncurried_expected.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let apply = (f) => f(. 1)
-let z = apply(x => x+1)
diff --git a/jscomp/build_tests/super_errors/fixtures/uncurried_wrong_label.res b/jscomp/build_tests/super_errors/fixtures/uncurried_wrong_label.res
deleted file mode 100644
index aaa3746..0000000
--- a/jscomp/build_tests/super_errors/fixtures/uncurried_wrong_label.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let foo = (. ~x) => { let _ = (); (~y) => x+y }
-// This looks too far into the return type
-let d = foo(. ~y=3)
diff --git a/jscomp/build_tests/super_errors/fixtures/unicode_location.res b/jscomp/build_tests/super_errors/fixtures/unicode_location.res
deleted file mode 100644
index e64643c..0000000
--- a/jscomp/build_tests/super_errors/fixtures/unicode_location.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let q = "💩💩💩💩💩💩💩💩💩💩" ++ ("a" ++ 3 ++ "b")
-//                                         ^ character position 33 + 10 (unicode symbols of length 2)
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/fixtures/unknown_tagged_template_function.res b/jscomp/build_tests/super_errors/fixtures/unknown_tagged_template_function.res
deleted file mode 100644
index 40a9532..0000000
--- a/jscomp/build_tests/super_errors/fixtures/unknown_tagged_template_function.res
+++ /dev/null
@@ -1 +0,0 @@
-let res = tagg`| 5 × 10 = ${5} |`
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/fixtures/unused_warnings.res b/jscomp/build_tests/super_errors/fixtures/unused_warnings.res
deleted file mode 100644
index 5fe4358..0000000
--- a/jscomp/build_tests/super_errors/fixtures/unused_warnings.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let a = 3
-let a = 33 + 3
-let a = 33 + 3 + 3
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_coercion_bigint.res b/jscomp/build_tests/super_errors/fixtures/variant_coercion_bigint.res
deleted file mode 100644
index 4f23f40..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_coercion_bigint.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type x = | @as(1n) One(bool) | @as(2n) Two
-
-let x = One(true)
-
-let y = (x :> bigint)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_coercion_bigint_as.res b/jscomp/build_tests/super_errors/fixtures/variant_coercion_bigint_as.res
deleted file mode 100644
index d3a3cc1..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_coercion_bigint_as.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type x = | @as(1n) One | Two
-
-let x = One
-
-let y = (x :> bigint)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_coercion_float.res b/jscomp/build_tests/super_errors/fixtures/variant_coercion_float.res
deleted file mode 100644
index 72958ef..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_coercion_float.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type x = | @as(1.1) One(bool) | @as(2.2) Two
-
-let x = One(true)
-
-let y = (x :> float)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_coercion_float_as.res b/jscomp/build_tests/super_errors/fixtures/variant_coercion_float_as.res
deleted file mode 100644
index 8d4ed7e..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_coercion_float_as.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type x = | @as(1.1) One | Two
-
-let x = One
-
-let y = (x :> float)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_coercion_int.res b/jscomp/build_tests/super_errors/fixtures/variant_coercion_int.res
deleted file mode 100644
index 6a4fcf8..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_coercion_int.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type x = | @as(1) One(bool) | @as(2) Two
-
-let x = One(true)
-
-let y = (x :> int)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_coercion_int_as.res b/jscomp/build_tests/super_errors/fixtures/variant_coercion_int_as.res
deleted file mode 100644
index db4adc0..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_coercion_int_as.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type x = | @as(1) One | Two
-
-let x = One
-
-let y = (x :> int)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_coercion_string.res b/jscomp/build_tests/super_errors/fixtures/variant_coercion_string.res
deleted file mode 100644
index 48e928a..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_coercion_string.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type x = One(bool) | Two
-
-let x = One(true)
-
-let y = (x :> string)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_coercion_string_as.res b/jscomp/build_tests/super_errors/fixtures/variant_coercion_string_as.res
deleted file mode 100644
index 74af95f..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_coercion_string_as.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type x = One | @as(2) Two
-
-let x = One
-
-let y = (x :> string)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_coercion_string_to_variant_no_payload.res b/jscomp/build_tests/super_errors/fixtures/variant_coercion_string_to_variant_no_payload.res
deleted file mode 100644
index fd92df2..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_coercion_string_to_variant_no_payload.res
+++ /dev/null
@@ -1,6 +0,0 @@
-@unboxed
-type x = One | Two
-
-let x = "one"
-
-let y = (x :> x)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_coercion_string_unboxed.res b/jscomp/build_tests/super_errors/fixtures/variant_coercion_string_unboxed.res
deleted file mode 100644
index bce8ba5..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_coercion_string_unboxed.res
+++ /dev/null
@@ -1,6 +0,0 @@
-@unboxed
-type x = One | Two | Other(float)
-
-let x = One
-
-let y = (x :> string)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_spread_abstract_type.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_abstract_type.res
deleted file mode 100644
index ae52ca5..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_spread_abstract_type.res
+++ /dev/null
@@ -1,2 +0,0 @@
-type a
-type b = | ...a | Other
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_spread_duplicate_constructors.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_duplicate_constructors.res
deleted file mode 100644
index fdb83f0..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_spread_duplicate_constructors.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type a = One | Two
-type b = Two | Three
-type c = | ...a | ...b | Four
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_spread_extensible_variant.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_extensible_variant.res
deleted file mode 100644
index 344b0f6..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_spread_extensible_variant.res
+++ /dev/null
@@ -1,2 +0,0 @@
-type a = ..
-type b = | ...a | Other
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_spread_inline_records.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_inline_records.res
deleted file mode 100644
index 1d05797..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_spread_inline_records.res
+++ /dev/null
@@ -1,4 +0,0 @@
-type a = One({name: string, age: int}) | Two
-type b = | ...a | Three
-
-let b: b = One({name: "hello"})
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_spread_recursive.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_recursive.res
deleted file mode 100644
index 2ae0cfe..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_spread_recursive.res
+++ /dev/null
@@ -1 +0,0 @@
-type rec a = One | Two | Three and b = Four | Five and c = | ...a | ...b
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_spread_tag_missing.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_tag_missing.res
deleted file mode 100644
index a1958f2..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_spread_tag_missing.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@tag("kind") type a = One(int) | Two(string)
-type b = | ...a | Three(bool)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch.res
deleted file mode 100644
index 1adcd09..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_spread_tag_value_mismatch.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@tag("kind") type a = One(int) | Two(string)
-@tag("name") type b = | ...a | Three(bool)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_spread_type_parameters.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_type_parameters.res
deleted file mode 100644
index 118789f..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_spread_type_parameters.res
+++ /dev/null
@@ -1,2 +0,0 @@
-type a<'a> = One | Two('a)
-type b = | ...a<int> | Three
\ No newline at end of file
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_spread_unboxed_mismatch.res b/jscomp/build_tests/super_errors/fixtures/variant_spread_unboxed_mismatch.res
deleted file mode 100644
index 425c4bb..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_spread_unboxed_mismatch.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@unboxed type a = One(int) | Two(string)
-type b = | ...a | Three(bool)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion.res b/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion.res
deleted file mode 100644
index 6198fb6..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion.res
+++ /dev/null
@@ -1,6 +0,0 @@
-type x = One(bool) | Two
-type y = One(string) | Two
-
-let x: x = One(true)
-
-let y = (x :> y)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion_as.res b/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion_as.res
deleted file mode 100644
index 9a9394d..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion_as.res
+++ /dev/null
@@ -1,6 +0,0 @@
-type x = | @as("one") One(bool) | Two(string)
-type y = One(bool) | Two(string)
-
-let x: x = One(true)
-
-let y = (x :> y)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion_tag.res b/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion_tag.res
deleted file mode 100644
index 7fb7808..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion_tag.res
+++ /dev/null
@@ -1,6 +0,0 @@
-@tag("kind") type x = One(bool) | Two(string)
-type y = One(bool) | Two(string)
-
-let x: x = One(true)
-
-let y = (x :> y)
diff --git a/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion_unboxed.res b/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion_unboxed.res
deleted file mode 100644
index d0896f0..0000000
--- a/jscomp/build_tests/super_errors/fixtures/variant_to_variant_coercion_unboxed.res
+++ /dev/null
@@ -1,6 +0,0 @@
-@unboxed type x = One(bool) | Two
-type y = One(bool) | Two
-
-let x: x = One(true)
-
-let y = (x :> y)
diff --git a/jscomp/build_tests/super_errors/fixtures/warnings1.res b/jscomp/build_tests/super_errors/fixtures/warnings1.res
deleted file mode 100644
index 7ba4a79..0000000
--- a/jscomp/build_tests/super_errors/fixtures/warnings1.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let x = (a, b) => a + b
-let z = () => {
-  x(10)
-  10
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/warnings2.res b/jscomp/build_tests/super_errors/fixtures/warnings2.res
deleted file mode 100644
index 16b2cff..0000000
--- a/jscomp/build_tests/super_errors/fixtures/warnings2.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let z = () => {
-  10
-  10
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/warnings3.res b/jscomp/build_tests/super_errors/fixtures/warnings3.res
deleted file mode 100644
index 92498ef..0000000
--- a/jscomp/build_tests/super_errors/fixtures/warnings3.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let _ = string_of_float(34.)
-let _ = string_of_float(34.)
-let _ = string_of_float(34.)
diff --git a/jscomp/build_tests/super_errors/fixtures/warnings4.res b/jscomp/build_tests/super_errors/fixtures/warnings4.res
deleted file mode 100644
index 326f2a1..0000000
--- a/jscomp/build_tests/super_errors/fixtures/warnings4.res
+++ /dev/null
@@ -1,13 +0,0 @@
-type myType = [
-  | #first
-  | #second(string)
-  | #third
-  | #fourth
-]
-
-// just a quick way to make the switch compile
-@val external x: myType = "myVariable"
-
-switch x {
-  | #first => Js.log("first")
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/warnings5.res b/jscomp/build_tests/super_errors/fixtures/warnings5.res
deleted file mode 100644
index 9e69c50..0000000
--- a/jscomp/build_tests/super_errors/fixtures/warnings5.res
+++ /dev/null
@@ -1,59 +0,0 @@
-type someTyp = Variant | WithPayload(bool) | One | Two | Three | Four | Five | Six | Seven(int)
-
-type someRecord = {
-  someValue: string,
-  otherValue: bool,
-  typ: someTyp,
-}
-
-@val external y: someRecord = "otherVariable"
-
-switch y {
-| {otherValue: false} => Js.log("first")
-}
-
-switch y {
-| {typ: WithPayload(true)} => Js.log("first")
-}
-
-let arr = [1]
-
-switch arr {
-| [] => Js.log("")
-}
-
-switch arr {
-| [one] => Js.log(one)
-}
-
-switch arr {
-| [1, 2] => ()
-}
-
-let lst = list{}
-
-switch lst {
-| list{} => ()
-}
-
-switch lst {
-| list{1, 2} => ()
-}
-
-switch lst {
-| list{1} => ()
-}
-
-switch "abc" {
-| "" => ()
-}
-
-switch 0 {
-| 1 => ()
-}
-
-let tuple = (1, true)
-
-switch tuple {
-| (_, false) => ()
-}
diff --git a/jscomp/build_tests/super_errors/fixtures/wrong_name_component_prop.res b/jscomp/build_tests/super_errors/fixtures/wrong_name_component_prop.res
deleted file mode 100644
index 2028c2e..0000000
--- a/jscomp/build_tests/super_errors/fixtures/wrong_name_component_prop.res
+++ /dev/null
@@ -1,32 +0,0 @@
-module SomeComplicatedModuleStructure = {
-  module NestedModuleHere = {
-    type t = string
-  }
-}
-
-module Component = {
-  type props<'name, 'second, 'third, 'fourth, 'fifth, 'sixth, 'seventh, 'eight, 'ninth> = {
-    name: 'name,
-    second: 'second,
-    third: 'third,
-    fourth: 'fourth,
-    fifth: 'fifth,
-    sixth: 'sixth,
-    seventh: 'seventh,
-    eight: 'eight,
-    ninth: 'ninth,
-  }
-  let make = props => {
-    props.name ++
-    props.second ++
-    props.third ++
-    props.fourth ++
-    props.fifth ++
-    props.sixth ++
-    props.seventh ++
-    props.eight ++
-    props.ninth
-  }
-}
-
-let dddd = Component.make({nonExistant: "hello"})
diff --git a/jscomp/build_tests/super_errors/fixtures/wrong_name_record_field.res b/jscomp/build_tests/super_errors/fixtures/wrong_name_record_field.res
deleted file mode 100644
index 7ebbbe2..0000000
--- a/jscomp/build_tests/super_errors/fixtures/wrong_name_record_field.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type d = {z: int}
-
-let ff: d = {
-  zz: 123,
-}
diff --git a/jscomp/build_tests/super_errors/input.js b/jscomp/build_tests/super_errors/input.js
deleted file mode 100644
index 7af2824..0000000
--- a/jscomp/build_tests/super_errors/input.js
+++ /dev/null
@@ -1,64 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-const child_process = require("child_process");
-
-var bsc = require("../../../scripts/bin_path").bsc_exe;
-
-const expectedDir = path.join(__dirname, "expected");
-
-const fixtures = fs
-  .readdirSync(path.join(__dirname, "fixtures"))
-  .filter(fileName => path.extname(fileName) === ".res");
-
-// const runtime = path.join(__dirname, '..', '..', 'runtime')
-const prefix = `${bsc} -w +A`;
-
-const updateTests = process.argv[2] === "update";
-
-function postProcessErrorOutput(output) {
-  output = output.trimRight();
-  output = output.replace(
-    /\/[^ ]+?jscomp\/build_tests\/super_errors\//g,
-    "/.../"
-  );
-  return output;
-}
-
-let doneTasksCount = 0;
-let atLeastOneTaskFailed = false;
-
-fixtures.forEach(fileName => {
-  const fullFilePath = path.join(__dirname, "fixtures", fileName);
-  const command = `${prefix} -color always ${fullFilePath}`;
-  console.log(`running ${command}`);
-  child_process.exec(command, (err, stdout, stderr) => {
-    doneTasksCount++;
-    // careful of:
-    // - warning test that actually succeeded in compiling (warning's still in stderr, so the code path is shared here)
-    // - accidentally succeeding tests (not likely in this context),
-    // actual, correctly erroring test case
-    const actualErrorOutput = postProcessErrorOutput(stderr.toString());
-    const expectedFilePath = path.join(expectedDir, fileName + ".expected");
-    if (updateTests) {
-      fs.writeFileSync(expectedFilePath, actualErrorOutput);
-    } else {
-      const expectedErrorOutput = postProcessErrorOutput(
-        fs.readFileSync(expectedFilePath, { encoding: "utf-8" })
-      );
-      if (expectedErrorOutput !== actualErrorOutput) {
-        console.error(
-          `The old and new error output for the test ${fullFilePath} aren't the same`
-        );
-        console.error("\n=== Old:");
-        console.error(expectedErrorOutput);
-        console.error("\n=== New:");
-        console.error(actualErrorOutput);
-        atLeastOneTaskFailed = true;
-      }
-
-      if (doneTasksCount === fixtures.length && atLeastOneTaskFailed) {
-        process.exit(1);
-      }
-    }
-  });
-});
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/.gitignore b/jscomp/build_tests/transitive_pinned_dependency1/.gitignore
deleted file mode 100644
index 7951405..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-lib
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/a/package.json b/jscomp/build_tests/transitive_pinned_dependency1/a/package.json
deleted file mode 100644
index 9113c25..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/a/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "a",
-  "version": "1.0.0"
-}
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/a/rescript.json b/jscomp/build_tests/transitive_pinned_dependency1/a/rescript.json
deleted file mode 100644
index 5a45106..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/a/rescript.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "a",
-    "namespace": true,
-    "sources": [
-        {
-            "dir": "src"
-        },
-        {
-            "dir": "tests",
-            "type": "dev"
-        }
-    ],
-    "package-specs": {
-        "module": "commonjs",
-        "in-source": false
-    },
-    "warnings": {
-        "error": true
-    },
-    "suffix": ".mjs",
-    "bs-dependencies": [
-        "b"
-    ],
-    "pinned-dependencies": [
-        "b"
-    ]
-}
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/a/src/src.res b/jscomp/build_tests/transitive_pinned_dependency1/a/src/src.res
deleted file mode 100644
index 487a974..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/a/src/src.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("src")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/a/tests/test.res b/jscomp/build_tests/transitive_pinned_dependency1/a/tests/test.res
deleted file mode 100644
index fd01e9e..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/a/tests/test.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("test")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/input.js b/jscomp/build_tests/transitive_pinned_dependency1/input.js
deleted file mode 100644
index 080b222..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/input.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//@ts-check
-var child_process = require("child_process");
-var assert = require("assert");
-var fs = require("fs");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-console.log(
-  child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" })
-);
-
-assert(
-  fs.existsSync("./node_modules/c/lib/js/tests/test.mjs"),
-  "dev files of module 'c' were not built by 'a' even though 'c' is a transitive pinned dependency of 'a' through 'b'"
-);
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/bsconfig.json b/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/bsconfig.json
deleted file mode 100644
index 1bbb63d..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/bsconfig.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "b",
-    "namespace": true,
-    "sources": [
-        {
-            "dir": "src"
-        },
-        {
-            "dir": "tests",
-            "type": "dev"
-        }
-    ],
-    "package-specs": {
-        "module": "commonjs",
-        "in-source": false
-    },
-    "warnings": {
-        "error": true
-    },
-    "suffix": ".mjs",
-    "bs-dependencies": [
-        "c"
-    ],
-    "pinned-dependencies": [
-        "c"
-    ]
-}
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/package.json b/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/package.json
deleted file mode 100644
index c2d84cc..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "b",
-  "version": "1.0.0"
-}
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/src/src.res b/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/src/src.res
deleted file mode 100644
index 487a974..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/src/src.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("src")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/tests/test.res b/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/tests/test.res
deleted file mode 100644
index fd01e9e..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/b/tests/test.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("test")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/bsconfig.json b/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/bsconfig.json
deleted file mode 100644
index c481bde..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/bsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "c",
-    "namespace": true,
-    "sources": [
-        {
-            "dir": "src"
-        },
-        {
-            "dir": "tests",
-            "type": "dev"
-        }
-    ],
-    "package-specs": {
-        "module": "commonjs",
-        "in-source": false
-    },
-    "warnings": {
-        "error": true
-    },
-    "suffix": ".mjs"
-}
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/package.json b/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/package.json
deleted file mode 100644
index abd3384..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "c",
-  "version": "1.0.0"
-}
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/src/src.res b/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/src/src.res
deleted file mode 100644
index 487a974..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/src/src.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("src")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/tests/test.res b/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/tests/test.res
deleted file mode 100644
index fd01e9e..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/node_modules/c/tests/test.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("test")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency1/package.json b/jscomp/build_tests/transitive_pinned_dependency1/package.json
deleted file mode 100644
index cc49c26..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency1/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "top",
-  "workspaces": [
-    "a",
-    "b",
-    "c"
-  ]
-}
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/.gitignore b/jscomp/build_tests/transitive_pinned_dependency2/.gitignore
deleted file mode 100644
index 7951405..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-lib
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/a/package.json b/jscomp/build_tests/transitive_pinned_dependency2/a/package.json
deleted file mode 100644
index 9113c25..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/a/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "a",
-  "version": "1.0.0"
-}
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/a/rescript.json b/jscomp/build_tests/transitive_pinned_dependency2/a/rescript.json
deleted file mode 100644
index ee6dff6..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/a/rescript.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "name": "a",
-    "namespace": true,
-    "sources": [
-        {
-            "dir": "src"
-        },
-        {
-            "dir": "tests",
-            "type": "dev"
-        }
-    ],
-    "package-specs": {
-        "module": "commonjs",
-        "in-source": false
-    },
-    "warnings": {
-        "error": true
-    },
-    "suffix": ".mjs",
-    "bs-dependencies": [
-        "b"
-    ]
-}
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/a/src/src.res b/jscomp/build_tests/transitive_pinned_dependency2/a/src/src.res
deleted file mode 100644
index 487a974..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/a/src/src.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("src")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/a/tests/test.res b/jscomp/build_tests/transitive_pinned_dependency2/a/tests/test.res
deleted file mode 100644
index fd01e9e..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/a/tests/test.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("test")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/input.js b/jscomp/build_tests/transitive_pinned_dependency2/input.js
deleted file mode 100644
index 2ec048a..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/input.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//@ts-check
-var child_process = require("child_process");
-var assert = require("assert");
-var fs = require("fs");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-console.log(
-  child_process.execSync(rescript_exe, { encoding: "utf8", cwd: "./a" })
-);
-
-assert(
-  !fs.existsSync("./node_modules/c/lib/js/tests/test.mjs"),
-  "dev files of module 'c' were built by 'a' even though 'c' is not a pinned dependency of 'a'"
-);
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/bsconfig.json b/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/bsconfig.json
deleted file mode 100644
index 1bbb63d..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/bsconfig.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "b",
-    "namespace": true,
-    "sources": [
-        {
-            "dir": "src"
-        },
-        {
-            "dir": "tests",
-            "type": "dev"
-        }
-    ],
-    "package-specs": {
-        "module": "commonjs",
-        "in-source": false
-    },
-    "warnings": {
-        "error": true
-    },
-    "suffix": ".mjs",
-    "bs-dependencies": [
-        "c"
-    ],
-    "pinned-dependencies": [
-        "c"
-    ]
-}
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/package.json b/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/package.json
deleted file mode 100644
index c2d84cc..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "b",
-  "version": "1.0.0"
-}
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/src/src.res b/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/src/src.res
deleted file mode 100644
index 487a974..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/src/src.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("src")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/tests/test.res b/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/tests/test.res
deleted file mode 100644
index fd01e9e..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/b/tests/test.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("test")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/bsconfig.json b/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/bsconfig.json
deleted file mode 100644
index c481bde..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/bsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "c",
-    "namespace": true,
-    "sources": [
-        {
-            "dir": "src"
-        },
-        {
-            "dir": "tests",
-            "type": "dev"
-        }
-    ],
-    "package-specs": {
-        "module": "commonjs",
-        "in-source": false
-    },
-    "warnings": {
-        "error": true
-    },
-    "suffix": ".mjs"
-}
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/package.json b/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/package.json
deleted file mode 100644
index abd3384..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "c",
-  "version": "1.0.0"
-}
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/src/src.res b/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/src/src.res
deleted file mode 100644
index 487a974..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/src/src.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("src")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/tests/test.res b/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/tests/test.res
deleted file mode 100644
index fd01e9e..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/node_modules/c/tests/test.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.Console.log("test")
\ No newline at end of file
diff --git a/jscomp/build_tests/transitive_pinned_dependency2/package.json b/jscomp/build_tests/transitive_pinned_dependency2/package.json
deleted file mode 100644
index cc49c26..0000000
--- a/jscomp/build_tests/transitive_pinned_dependency2/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "top",
-  "workspaces": [
-    "a",
-    "b",
-    "c"
-  ]
-}
diff --git a/jscomp/build_tests/unboxed_bool_with_const/bsconfig.json b/jscomp/build_tests/unboxed_bool_with_const/bsconfig.json
deleted file mode 100644
index 1cbcace..0000000
--- a/jscomp/build_tests/unboxed_bool_with_const/bsconfig.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "name": "unboxed_bool_with_const",
-  "version": "0.1.0",
-  "sources": [
-    {
-      "dir": "src",
-      "subdirs": true
-    }
-  ],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js"
-}
diff --git a/jscomp/build_tests/unboxed_bool_with_const/input.js b/jscomp/build_tests/unboxed_bool_with_const/input.js
deleted file mode 100644
index 4591fda..0000000
--- a/jscomp/build_tests/unboxed_bool_with_const/input.js
+++ /dev/null
@@ -1,26 +0,0 @@
-//@ts-check
-
-var cp = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-var out = cp.spawnSync(rescript_exe, {
-  cwd: __dirname,
-  encoding: "utf8",
-});
-
-assert.equal(
-  out.stdout.slice(out.stdout.indexOf("Main.res:3:3-14")),
-  `Main.res:3:3-14
-
-  1 │ @unboxed
-  2 │ type t<'a> =
-  3 │   | Bool(bool)
-  4 │   | @as(false) False
-  5 │   | @as(true) True
-
-  This untagged variant definition is invalid: At most one case can be a boolean type.
-
-FAILED: cannot make progress due to previous errors.
-`
-);
diff --git a/jscomp/build_tests/unboxed_bool_with_const/src/Main.res b/jscomp/build_tests/unboxed_bool_with_const/src/Main.res
deleted file mode 100644
index 6ed5758..0000000
--- a/jscomp/build_tests/unboxed_bool_with_const/src/Main.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@unboxed
-type t<'a> =
-  | Bool(bool)
-  | @as(false) False
-  | @as(true) True
diff --git a/jscomp/build_tests/uncurried-always/input.js b/jscomp/build_tests/uncurried-always/input.js
deleted file mode 100644
index 012c1f0..0000000
--- a/jscomp/build_tests/uncurried-always/input.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//@ts-check
-const cp = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-cp.execSync(`${rescript_exe} clean`, { cwd: __dirname });
-cp.execSync(`${rescript_exe}`, { cwd: __dirname });
diff --git a/jscomp/build_tests/uncurried-always/rescript.json b/jscomp/build_tests/uncurried-always/rescript.json
deleted file mode 100644
index d3f1470..0000000
--- a/jscomp/build_tests/uncurried-always/rescript.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "uncurried",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  },
-  "uncurried": true
-}
diff --git a/jscomp/build_tests/uncurried-always/src/UncurriedAlways.res b/jscomp/build_tests/uncurried-always/src/UncurriedAlways.res
deleted file mode 100644
index b6555b4..0000000
--- a/jscomp/build_tests/uncurried-always/src/UncurriedAlways.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let foo = (x, y) => x + y
-
-let z = foo(. 3, 4)
-
-let bar = (. x, y) => x + y
-
-let b = bar(3, 4)
-
-let w = 3->foo(4)
-
-let a = 3->foo(. 4)
-
-Js.log(a) // Test automatic uncurried application
-
-let _ = Js.Array2.map([1], (. x) => x+1)
diff --git a/jscomp/build_tests/uncurried_printer/input.js b/jscomp/build_tests/uncurried_printer/input.js
deleted file mode 100755
index e5b78de..0000000
--- a/jscomp/build_tests/uncurried_printer/input.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const assert = require("assert");
-const child_process = require("child_process");
-const fs = require("fs");
-const path = require("path");
-
-const expectedContent = `let a = (. b) => b\n`;
-const filePath = path.join(__dirname, "src", "a.res");
-
-fs.writeFileSync(filePath, expectedContent, "utf-8");
-
-child_process.execSync(`../../../rescript format -all`, { cwd: __dirname });
-
-const content = fs.readFileSync(filePath, "utf-8");
-
-assert.equal(content, expectedContent);
diff --git a/jscomp/build_tests/uncurried_printer/rescript.json b/jscomp/build_tests/uncurried_printer/rescript.json
deleted file mode 100644
index ded06e8..0000000
--- a/jscomp/build_tests/uncurried_printer/rescript.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "uncurried_printer",
-  "version": "0.1.0",
-  "sources": ["src"],
-  "uncurried": false
-}
diff --git a/jscomp/build_tests/uncurried_printer/src/a.res b/jscomp/build_tests/uncurried_printer/src/a.res
deleted file mode 100644
index 568bcab..0000000
--- a/jscomp/build_tests/uncurried_printer/src/a.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = (. b) => b
diff --git a/jscomp/build_tests/unicode/input.js b/jscomp/build_tests/unicode/input.js
deleted file mode 100644
index 9a6b83a..0000000
--- a/jscomp/build_tests/unicode/input.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//@ts-check
-var child_process = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-console.log(child_process.execSync(rescript_exe, { encoding: "utf8" }));
-
-var fs = require("fs");
-var path = require("path");
-var content =
-  "" + fs.readFileSync(path.join(__dirname, "lib", "bs", ".sourcedirs.json"));
-
-var assert = require("assert");
-
-assert(JSON.parse(content).dirs.some(x => x.includes("📕annotation")));
diff --git a/jscomp/build_tests/unicode/rescript.json b/jscomp/build_tests/unicode/rescript.json
deleted file mode 100644
index a8065db..0000000
--- a/jscomp/build_tests/unicode/rescript.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "unicode",
-  "sources": {
-    "dir": ".",
-    "subdirs": true
-  }
-}
diff --git "a/jscomp/build_tests/unicode/\360\237\223\225annotation/a.res" "b/jscomp/build_tests/unicode/\360\237\223\225annotation/a.res"
deleted file mode 100644
index 8b13789..0000000
--- "a/jscomp/build_tests/unicode/\360\237\223\225annotation/a.res"
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git "a/jscomp/build_tests/unicode/\360\237\223\227block/b.res" "b/jscomp/build_tests/unicode/\360\237\223\227block/b.res"
deleted file mode 100644
index 8b13789..0000000
--- "a/jscomp/build_tests/unicode/\360\237\223\227block/b.res"
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git "a/jscomp/build_tests/unicode/\360\237\223\231inline/c.res" "b/jscomp/build_tests/unicode/\360\237\223\231inline/c.res"
deleted file mode 100644
index 8b13789..0000000
--- "a/jscomp/build_tests/unicode/\360\237\223\231inline/c.res"
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/warn_legacy_config/bsconfig.json b/jscomp/build_tests/warn_legacy_config/bsconfig.json
deleted file mode 100644
index ff8aa6b..0000000
--- a/jscomp/build_tests/warn_legacy_config/bsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "warn_legacy_config",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  }
-}
diff --git a/jscomp/build_tests/warn_legacy_config/input.js b/jscomp/build_tests/warn_legacy_config/input.js
deleted file mode 100644
index ad81e9e..0000000
--- a/jscomp/build_tests/warn_legacy_config/input.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const { spawnSync } = require("child_process");
-const assert = require("assert");
-const rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-const output = spawnSync(rescript_exe, { encoding: "utf8" });
-assert(
-  /^Warning: bsconfig.json is deprecated. Migrate it to rescript.json/.test(
-    output.stdout
-  )
-);
diff --git a/jscomp/build_tests/warn_legacy_config/src/demo.res b/jscomp/build_tests/warn_legacy_config/src/demo.res
deleted file mode 100644
index 8d0b191..0000000
--- a/jscomp/build_tests/warn_legacy_config/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log("Hello, ReScript")
diff --git a/jscomp/build_tests/weird_deps/input.js b/jscomp/build_tests/weird_deps/input.js
deleted file mode 100644
index 6e2a156..0000000
--- a/jscomp/build_tests/weird_deps/input.js
+++ /dev/null
@@ -1,24 +0,0 @@
-//@ts-check
-
-var cp = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-var out = cp.spawnSync(rescript_exe, {
-  cwd: __dirname,
-  encoding: "utf8",
-});
-
-if (out.stdout !== "") {
-  assert.fail(out.stdout);
-} else {
-  assert.equal(
-    out.stderr,
-    [
-      'File "bsconfig.json", line 1',
-      "Error: package weird not found or built ",
-      "- Did you install it?",
-      "",
-    ].join("\n")
-  );
-}
diff --git a/jscomp/build_tests/weird_deps/rescript.json b/jscomp/build_tests/weird_deps/rescript.json
deleted file mode 100644
index 4dc59a5..0000000
--- a/jscomp/build_tests/weird_deps/rescript.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "weird_devdeps",
-  "version": "0.1.0",
-  "sources": [
-    {
-      "dir": "src",
-      "subdirs": true
-    },
-    {
-      "dir": "test",
-      "type": "dev"
-    }
-  ],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": ["weird"],
-  "warnings": { "error": "+101" }
-}
diff --git a/jscomp/build_tests/weird_deps/src/demo.res b/jscomp/build_tests/weird_deps/src/demo.res
deleted file mode 100644
index 8d0b191..0000000
--- a/jscomp/build_tests/weird_deps/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log("Hello, ReScript")
diff --git a/jscomp/build_tests/weird_deps/test/test.res b/jscomp/build_tests/weird_deps/test/test.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/weird_deps/test/test.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/weird_devdeps/input.js b/jscomp/build_tests/weird_devdeps/input.js
deleted file mode 100644
index 6e2a156..0000000
--- a/jscomp/build_tests/weird_devdeps/input.js
+++ /dev/null
@@ -1,24 +0,0 @@
-//@ts-check
-
-var cp = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-var out = cp.spawnSync(rescript_exe, {
-  cwd: __dirname,
-  encoding: "utf8",
-});
-
-if (out.stdout !== "") {
-  assert.fail(out.stdout);
-} else {
-  assert.equal(
-    out.stderr,
-    [
-      'File "bsconfig.json", line 1',
-      "Error: package weird not found or built ",
-      "- Did you install it?",
-      "",
-    ].join("\n")
-  );
-}
diff --git a/jscomp/build_tests/weird_devdeps/rescript.json b/jscomp/build_tests/weird_devdeps/rescript.json
deleted file mode 100644
index 91696bc..0000000
--- a/jscomp/build_tests/weird_devdeps/rescript.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "weird_devdeps",
-  "version": "0.1.0",
-  "sources": [
-    {
-      "dir": "src",
-      "subdirs": true
-    },
-    {
-      "dir": "test",
-      "type": "dev"
-    }
-  ],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [],
-  "bs-dev-dependencies": ["weird"],
-  "warnings": { "error": "+101" }
-}
diff --git a/jscomp/build_tests/weird_devdeps/src/demo.res b/jscomp/build_tests/weird_devdeps/src/demo.res
deleted file mode 100644
index 8d0b191..0000000
--- a/jscomp/build_tests/weird_devdeps/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log("Hello, ReScript")
diff --git a/jscomp/build_tests/weird_devdeps/test/test.res b/jscomp/build_tests/weird_devdeps/test/test.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/build_tests/weird_devdeps/test/test.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/build_tests/weird_names/input.js b/jscomp/build_tests/weird_names/input.js
deleted file mode 100644
index f9643f7..0000000
--- a/jscomp/build_tests/weird_names/input.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var cp = require("child_process");
-var assert = require("assert");
-var path = require("path");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-var out = cp.spawnSync(rescript_exe, { encoding: "utf8" });
-
-if (out.stderr !== "") {
-  assert.fail(out.stderr);
-}
-
-let files = [
-  "_app.res",
-  "[...params_max_3].res",
-  "[...params].res",
-  "[[...params]].res",
-  "[slug_or_ID].res",
-  "404.res",
-  "utils.test.res",
-];
-
-for (let f of files) {
-  let { name } = path.parse(f);
-  let m = `./lib/js/src/${name}.js`;
-  assert.deepEqual(require(m).a, 1);
-}
diff --git a/jscomp/build_tests/weird_names/rescript.json b/jscomp/build_tests/weird_names/rescript.json
deleted file mode 100644
index 305524e..0000000
--- a/jscomp/build_tests/weird_names/rescript.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "weird_names",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  }
-}
diff --git a/jscomp/build_tests/weird_names/src/404.res b/jscomp/build_tests/weird_names/src/404.res
deleted file mode 100644
index c311b2e..0000000
--- a/jscomp/build_tests/weird_names/src/404.res
+++ /dev/null
@@ -1,2 +0,0 @@
-module A = Demo
-let a = 1
\ No newline at end of file
diff --git a/jscomp/build_tests/weird_names/src/[...params].res b/jscomp/build_tests/weird_names/src/[...params].res
deleted file mode 100644
index c311b2e..0000000
--- a/jscomp/build_tests/weird_names/src/[...params].res
+++ /dev/null
@@ -1,2 +0,0 @@
-module A = Demo
-let a = 1
\ No newline at end of file
diff --git a/jscomp/build_tests/weird_names/src/[...params_max_3].res b/jscomp/build_tests/weird_names/src/[...params_max_3].res
deleted file mode 100644
index c311b2e..0000000
--- a/jscomp/build_tests/weird_names/src/[...params_max_3].res
+++ /dev/null
@@ -1,2 +0,0 @@
-module A = Demo
-let a = 1
\ No newline at end of file
diff --git a/jscomp/build_tests/weird_names/src/[[...params]].res b/jscomp/build_tests/weird_names/src/[[...params]].res
deleted file mode 100644
index c311b2e..0000000
--- a/jscomp/build_tests/weird_names/src/[[...params]].res
+++ /dev/null
@@ -1,2 +0,0 @@
-module A = Demo
-let a = 1
\ No newline at end of file
diff --git a/jscomp/build_tests/weird_names/src/[slug_or_ID].res b/jscomp/build_tests/weird_names/src/[slug_or_ID].res
deleted file mode 100644
index c311b2e..0000000
--- a/jscomp/build_tests/weird_names/src/[slug_or_ID].res
+++ /dev/null
@@ -1,2 +0,0 @@
-module A = Demo
-let a = 1
\ No newline at end of file
diff --git a/jscomp/build_tests/weird_names/src/_app.res b/jscomp/build_tests/weird_names/src/_app.res
deleted file mode 100644
index c311b2e..0000000
--- a/jscomp/build_tests/weird_names/src/_app.res
+++ /dev/null
@@ -1,2 +0,0 @@
-module A = Demo
-let a = 1
\ No newline at end of file
diff --git a/jscomp/build_tests/weird_names/src/demo.res b/jscomp/build_tests/weird_names/src/demo.res
deleted file mode 100644
index 67bbe3b..0000000
--- a/jscomp/build_tests/weird_names/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = 1
diff --git a/jscomp/build_tests/weird_names/src/utils.test.res b/jscomp/build_tests/weird_names/src/utils.test.res
deleted file mode 100644
index c311b2e..0000000
--- a/jscomp/build_tests/weird_names/src/utils.test.res
+++ /dev/null
@@ -1,2 +0,0 @@
-module A = Demo
-let a = 1
\ No newline at end of file
diff --git a/jscomp/build_tests/weird_names_not_found_bug/input.js b/jscomp/build_tests/weird_names_not_found_bug/input.js
deleted file mode 100644
index 1442695..0000000
--- a/jscomp/build_tests/weird_names_not_found_bug/input.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var cp = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-var out = cp.spawnSync(rescript_exe, { encoding: "utf8" });
-if (out.stderr !== "") {
-  assert.fail(out.stderr);
-}
-
-if (!out.stdout.includes(`The module or file Demo can't be found.`)) {
-  assert.fail(out.stdout);
-}
diff --git a/jscomp/build_tests/weird_names_not_found_bug/rescript.json b/jscomp/build_tests/weird_names_not_found_bug/rescript.json
deleted file mode 100644
index 305524e..0000000
--- a/jscomp/build_tests/weird_names_not_found_bug/rescript.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "weird_names",
-  "version": "0.1.0",
-  "sources": {
-    "dir": "src",
-    "subdirs": true
-  }
-}
diff --git a/jscomp/build_tests/weird_names_not_found_bug/src/demo.res b/jscomp/build_tests/weird_names_not_found_bug/src/demo.res
deleted file mode 100644
index 67bbe3b..0000000
--- a/jscomp/build_tests/weird_names_not_found_bug/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = 1
diff --git a/jscomp/build_tests/weird_names_not_found_bug/src/demo.test.res b/jscomp/build_tests/weird_names_not_found_bug/src/demo.test.res
deleted file mode 100644
index c311b2e..0000000
--- a/jscomp/build_tests/weird_names_not_found_bug/src/demo.test.res
+++ /dev/null
@@ -1,2 +0,0 @@
-module A = Demo
-let a = 1
\ No newline at end of file
diff --git a/jscomp/build_tests/x-y/input.js b/jscomp/build_tests/x-y/input.js
deleted file mode 100644
index bb3fa84..0000000
--- a/jscomp/build_tests/x-y/input.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var p = require("child_process");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-
-p.execSync(rescript_exe);
diff --git a/jscomp/build_tests/x-y/rescript.json b/jscomp/build_tests/x-y/rescript.json
deleted file mode 100644
index 104c36f..0000000
--- a/jscomp/build_tests/x-y/rescript.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "x-y",
-  "version": "0.1.0",
-  "sources": ["x-src"]
-}
diff --git a/jscomp/build_tests/x-y/x-src/demo.res b/jscomp/build_tests/x-y/x-src/demo.res
deleted file mode 100644
index 8d0b191..0000000
--- a/jscomp/build_tests/x-y/x-src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = Js.log("Hello, ReScript")
diff --git a/jscomp/build_tests/xpkg/input.js b/jscomp/build_tests/xpkg/input.js
deleted file mode 100644
index 208a76a..0000000
--- a/jscomp/build_tests/xpkg/input.js
+++ /dev/null
@@ -1,12 +0,0 @@
-var p = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-try {
-  var output = p.spawnSync(`${rescript_exe} build -regen`, {
-    shell: true,
-    encoding: "utf8",
-  });
-
-  assert.ok(output.stderr.match(/reserved package name/));
-} finally {
-}
diff --git a/jscomp/build_tests/xpkg/rescript.json b/jscomp/build_tests/xpkg/rescript.json
deleted file mode 100644
index 50b8ac6..0000000
--- a/jscomp/build_tests/xpkg/rescript.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "_",
-  "sources": "."
-}
diff --git a/jscomp/build_tests/zerocycle/.gitignore b/jscomp/build_tests/zerocycle/.gitignore
deleted file mode 100644
index 11ba296..0000000
--- a/jscomp/build_tests/zerocycle/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.bs.js
\ No newline at end of file
diff --git a/jscomp/build_tests/zerocycle/input.js b/jscomp/build_tests/zerocycle/input.js
deleted file mode 100644
index cf8c0a2..0000000
--- a/jscomp/build_tests/zerocycle/input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var p = require("child_process");
-var assert = require("assert");
-var rescript_exe = require("../../../scripts/bin_path").rescript_exe;
-var out = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname });
-assert(out.status == 0);
diff --git a/jscomp/build_tests/zerocycle/rescript.json b/jscomp/build_tests/zerocycle/rescript.json
deleted file mode 100644
index 3cd7e90..0000000
--- a/jscomp/build_tests/zerocycle/rescript.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "zerocycle",
-  "version": "0.1.0",
-  "sources": ["src"],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "suffix": ".bs.js",
-  "bs-dependencies": [
-    // add your bs-dependencies here
-  ]
-}
diff --git a/jscomp/build_tests/zerocycle/src/bar.res b/jscomp/build_tests/zerocycle/src/bar.res
deleted file mode 100644
index 1a8c37c..0000000
--- a/jscomp/build_tests/zerocycle/src/bar.res
+++ /dev/null
@@ -1,14 +0,0 @@
-// one-file false positive: https://github.com/rescript-lang/rescript-compiler/issues/5368
-
-module Nested = {
-  module Bar = {
-    type t = private int
-  }
-}
-
-open Nested
-
-module Bar = {
-  open Bar
-  let t : t = Obj.magic(42)
-}
\ No newline at end of file
diff --git a/jscomp/build_tests/zerocycle/src/demo.res b/jscomp/build_tests/zerocycle/src/demo.res
deleted file mode 100644
index 70d42c0..0000000
--- a/jscomp/build_tests/zerocycle/src/demo.res
+++ /dev/null
@@ -1 +0,0 @@
-module Foo = {}
diff --git a/jscomp/build_tests/zerocycle/src/demo2.res b/jscomp/build_tests/zerocycle/src/demo2.res
deleted file mode 100644
index dc74456..0000000
--- a/jscomp/build_tests/zerocycle/src/demo2.res
+++ /dev/null
@@ -1 +0,0 @@
-module Foo2 = {}
\ No newline at end of file
diff --git a/jscomp/build_tests/zerocycle/src/foo.res b/jscomp/build_tests/zerocycle/src/foo.res
deleted file mode 100644
index 5449ab9..0000000
--- a/jscomp/build_tests/zerocycle/src/foo.res
+++ /dev/null
@@ -1,2 +0,0 @@
-open! Demo
-include Foo
diff --git a/jscomp/build_tests/zerocycle/src/foo2.res b/jscomp/build_tests/zerocycle/src/foo2.res
deleted file mode 100644
index 24c75a3..0000000
--- a/jscomp/build_tests/zerocycle/src/foo2.res
+++ /dev/null
@@ -1,2 +0,0 @@
-open Demo2
-include Foo2
\ No newline at end of file
diff --git a/jscomp/cmij/.ocamlformat b/jscomp/cmij/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/cmij/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/cmij/cmjdump_main.ml b/jscomp/cmij/cmjdump_main.ml
deleted file mode 100644
index 49d7316..0000000
--- a/jscomp/cmij/cmjdump_main.ml
+++ /dev/null
@@ -1,71 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* start dumping *)
-
-let f fmt = Printf.fprintf stdout fmt
-
-let pp_cmj_case (case : Ext_js_file_kind.case) : unit =
-  f "%s\n" ("case : " ^ match case with Little -> "little" | Upper -> "upper")
-
-let pp_cmj
-    ({ values; pure; package_spec = npm_package_path; case } : Js_cmj_format.t)
-    =
-  f "package info: %s\n"
-    (Format.asprintf "%a" Js_packages_info.dump_packages_info npm_package_path);
-  pp_cmj_case case;
-
-  f "effect: %s\n" (if pure then "pure" else "not pure");
-  Ext_array.iter values (fun { name; arity; persistent_closed_lambda } ->
-      (match arity with
-      | Single arity -> (
-          f "%s: %s\n" name (Format.asprintf "%a" Lam_arity.print arity);
-          match persistent_closed_lambda with
-          | None -> f "%s: not saved\n" name
-          | Some lam ->
-              f "%s: ======[start]\n" name;
-              f "%s\n" (Lam_print.lambda_to_string lam);
-              f "%s: ======[finish]\n" name)
-      | Submodule xs ->
-          (match persistent_closed_lambda with
-          | None -> f "%s: not saved\n" name
-          | Some lam ->
-              f "%s: ======[start]\n" name;
-              f "%s" (Lam_print.lambda_to_string lam);
-              f "%s: ======[finish]\n" name);
-          Array.iteri
-            (fun i arity ->
-              f "%s[%i] : %s \n" name i
-                (Format.asprintf "%a" Lam_arity.print arity))
-            xs);
-      f "\n")
-
-let () =
-  match Sys.argv with
-  | [| _; file |] ->
-      let cmj, digest = Js_cmj_format.from_file_with_digest file in
-      Format.fprintf Format.std_formatter "@[Digest: %s@]@."
-        (Digest.to_hex digest);
-      pp_cmj cmj
-  | _ -> failwith "expect one argument"
diff --git a/jscomp/cmij/cmjdump_main.mli b/jscomp/cmij/cmjdump_main.mli
deleted file mode 100644
index 3999ce7..0000000
--- a/jscomp/cmij/cmjdump_main.mli
+++ /dev/null
@@ -1,23 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
diff --git a/jscomp/cmij/dune b/jscomp/cmij/dune
deleted file mode 100644
index cb46d37..0000000
--- a/jscomp/cmij/dune
+++ /dev/null
@@ -1,11 +0,0 @@
-(env
- (static
-  (flags
-   (:standard -ccopt -static))))
-
-(executables
- (names cmjdump_main)
- (public_names cmjdump)
- (flags
-  (:standard -w -A))
- (libraries core))
diff --git a/jscomp/common/.ocamlformat b/jscomp/common/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/common/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/common/dune b/jscomp/common/dune
deleted file mode 100644
index af510bf..0000000
--- a/jscomp/common/dune
+++ /dev/null
@@ -1,9 +0,0 @@
-(library
- (name common)
- (wrapped false)
- (preprocess
-  (action
-   (run %{bin:cppo} %{env:CPPO_FLAGS=} %{input-file})))
- (flags
-  (:standard -w -A))
- (libraries syntax))
diff --git a/jscomp/common/ml_binary.ml b/jscomp/common/ml_binary.ml
deleted file mode 100644
index 0d4d5cc..0000000
--- a/jscomp/common/ml_binary.ml
+++ /dev/null
@@ -1,53 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 _ kind = Ml : Parsetree.structure kind | Mli : Parsetree.signature kind
-
-(** [read_ast kind ic] assume [ic] channel is 
-    in the right position *)
-let read_ast (type t) (kind : t kind) ic : t =
-  let magic =
-    match kind with
-    | Ml -> Config.ast_impl_magic_number
-    | Mli -> Config.ast_intf_magic_number
-  in
-  let buffer = really_input_string ic (String.length magic) in
-  assert (buffer = magic);
-  (* already checked by apply_rewriter *)
-  Location.set_input_name (input_value ic);
-  input_value ic
-
-let write_ast (type t) (kind : t kind) (fname : string) (pt : t) oc =
-  let magic =
-    match kind with
-    | Ml -> Config.ast_impl_magic_number
-    | Mli -> Config.ast_intf_magic_number
-  in
-  output_string oc magic;
-  output_value oc fname;
-  output_value oc pt
-
-let magic_of_kind : type a. a kind -> string = function
-  | Ml -> Config.ast_impl_magic_number
-  | Mli -> Config.ast_intf_magic_number
diff --git a/jscomp/common/pattern_printer.ml b/jscomp/common/pattern_printer.ml
deleted file mode 100644
index 8648f23..0000000
--- a/jscomp/common/pattern_printer.ml
+++ /dev/null
@@ -1,48 +0,0 @@
-open Types
-open Typedtree
-open Parsetree
-
-let mkpat desc = Ast_helper.Pat.mk desc
-
-let untype typed =
-  let rec loop pat =
-    match pat.pat_desc with
-    | Tpat_or (p1, { pat_desc = Tpat_or (p2, p3, rI) }, rO) ->
-      (* Turn A | (B | C) into (A | B) | C for pretty printing without parens *)
-        let newInner = { pat with pat_desc = Tpat_or (p1, p2, rI) } in
-        let newOuter = { pat with pat_desc = Tpat_or (newInner, p3, rO) } in
-        loop newOuter
-    | Tpat_or (pa, pb, _) -> mkpat (Ppat_or (loop pa, loop pb))
-    | Tpat_any | Tpat_var _ -> mkpat Ppat_any
-    | Tpat_constant c -> mkpat (Ppat_constant (Untypeast.constant c))
-    | Tpat_alias (p, _, _) -> loop p
-    | Tpat_tuple lst -> mkpat (Ppat_tuple (List.map loop lst))
-    | Tpat_construct (cstr_lid, cstr, lst) ->
-        let lid = { cstr_lid with txt = Longident.Lident cstr.cstr_name } in
-        let arg =
-          match List.map loop lst with
-          | [] -> None
-          | [ p ] -> Some p
-          | lst -> Some (mkpat (Ppat_tuple lst))
-        in
-        mkpat (Ppat_construct (lid, arg))
-    | Tpat_variant (label, p_opt, _row_desc) ->
-        let arg = Option.map loop p_opt in
-        mkpat (Ppat_variant (label, arg))
-    | Tpat_record (subpatterns, closed_flag) ->
-        let fields =
-          List.map
-            (fun (_, lbl, p) ->
-              (mknoloc (Longident.Lident lbl.lbl_name), loop p))
-            subpatterns
-        in
-        mkpat (Ppat_record (fields, closed_flag))
-    | Tpat_array lst -> mkpat (Ppat_array (List.map loop lst))
-    | Tpat_lazy p -> mkpat (Ppat_lazy (loop p))
-  in
-  loop typed
-
-let print_pattern typed =
-  let pat = untype typed in
-  let doc = Res_printer.printPattern pat Res_comments_table.empty in
-  Res_doc.toString ~width:80 doc
diff --git a/jscomp/core/.ocamlformat b/jscomp/core/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/core/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/core/FIXME.adoc b/jscomp/core/FIXME.adoc
deleted file mode 100644
index ce60151..0000000
--- a/jscomp/core/FIXME.adoc
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-# alias table is not reliable
-
-mario_game.03flattern.lam
-
-[source]
------------------
-               with (304 t1/1824 s1/1825 o1/1826 t2/1827 o2/1829)
-                (let (match/2332 =a t1/1824 match/2333 =a t2/1827)
-                  (catch
-                    (catch
-                      (catch
-                        (catch (if (>= match/2332 3) (exit 291) (exit 290))
-                         with (291)
-                          (if (isint match/2333)
-                            (if (!=[int] match/2333 1) (exit 290) (exit 288))
-                            (let (typ/2330 =a (field 0 match/2333))
-                              (exit 289 typ/2330))))
-                       with (290)
-                        (seq
-                          (apply (field 17 Object/1601) o1/1826 t1/1824
-                            s1/1825)
-                          [0: 0a 0a]))
-                     with (288)
-                      (seq (apply (field 16 Object/1601) o2/1829)
-                        (apply (field 18 Object/1601) o1/1826) [0: 0a 0a]))
-                   with (289 typ/1867)
-                    (let
-                      (updated_block/1869 =
-                         (apply (field 15 Object/1601) o2/1829 context/1786)
-                        spawned_item/1870 =
-                          (apply (field 20 Object/1601) (field 6 o1/1826)
-                            o2/1829 typ/1867 context/1786))
-                      (seq
-                        (apply (field 17 Object/1601) o1/1826 t1/1824
-                          s1/1825)
-                        (makeblock 0 (makeblock 0 updated_block/1869)
-                          (makeblock 0 spawned_item/1870)))))))
------------------
-
-Here [match/2332] is aliased  [t/1824]
-
-mario_game.04.simplify_exits.lam
-
-[source]
-------------------
-                          (if (>= match/2379 2)
-                            (let
-                              (t1/2571 =a t1/1817
-                                s1/2572 =a s1/1818
-                                o1/2573 =a o1/1819
-                                t2/2574 =a t2/2349
-                                o2/2575 =a o2/2350
-                                match/2332 =a t1/2571
-                                match/2333 =a t2/2574)
-                              (catch
-                                (if (>= match/2332 3)
-                                  (if (isint match/2333)
-                                    (if (!=[int] match/2333 1) (exit 290)
-                                      (seq
-                                        (apply (field 16 Object/1601)
-                                          o2/2575)
-                                        (apply (field 18 Object/1601)
-                                          o1/2573)
-                                        [0: 0a 0a]))
-                                    (let
-
-------------------
-
-Here [match/2332] is aliased  [t/1824]
-
-Here the exit code is inlined, [t/1824] is renamed into [t1/2571]
-(function inlining and renaming), [match/2332] now should be aliased
-to [t1/2571], but since the alias table is not updated, it still point
-to the old one which result in wrong optimizations.
-
-The reaon is that when we do the inlining we refresh the parameters,
-but forgot update the alias table, so the aliases are stale
diff --git a/jscomp/core/bs_cmi_load.ml b/jscomp/core/bs_cmi_load.ml
deleted file mode 100644
index 72a5f28..0000000
--- a/jscomp/core/bs_cmi_load.ml
+++ /dev/null
@@ -1,28 +0,0 @@
-(* Copyright (C) Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let load_cmi ~unit_name : Env.Persistent_signature.t option =
-  match Config_util.find_opt (unit_name ^".cmi") with 
-  | Some filename -> Some {filename; cmi = Cmi_format.read_cmi filename}
-  | None -> None 
\ No newline at end of file
diff --git a/jscomp/core/bs_conditional_initial.ml b/jscomp/core/bs_conditional_initial.ml
deleted file mode 100644
index 52010a4..0000000
--- a/jscomp/core/bs_conditional_initial.ml
+++ /dev/null
@@ -1,58 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Clflags.keep_docs := false; *)
-(* default to false -check later*)
-(* Clflags.keep_locs := false; *)
-let setup_env () =
-  Env.Persistent_signature.load := Bs_cmi_load.load_cmi;    
-  Matching.make_test_sequence_variant_constant := Polyvar_pattern_match.make_test_sequence_variant_constant;
-  Matching.call_switcher_variant_constant := Polyvar_pattern_match.call_switcher_variant_constant;
-  Matching.call_switcher_variant_constr := Polyvar_pattern_match.call_switcher_variant_constr;
-  Ctype.variant_is_subtype := Matching_polyfill.variant_is_subtype;
-  Clflags.dump_location := false;  
-  Config.syntax_kind := `rescript;
-  Parmatch.print_res_pat := Pattern_printer.print_pattern;
-  (* default true
-     otherwise [bsc -I sc src/hello.ml ] will include current directory to search path
-  *)
-  Clflags.debug := true;
-  Clflags.binary_annotations := true;
-  (* Turn on [-no-alias-deps] by default -- double check *)
-  Oprint.out_ident := Outcome_printer_ns.out_ident;
-  Builtin_attributes.check_bs_attributes_inclusion := Record_attributes_check.check_bs_attributes_inclusion;
-  Builtin_attributes.check_duplicated_labels :=
-    Record_attributes_check.check_duplicated_labels;
-  Matching.names_from_construct_pattern := 
-    Matching_polyfill.names_from_construct_pattern;
-  
-    Rescript_cpp.replace_directive_bool "BS" true;
-  Rescript_cpp.replace_directive_bool "JS" true;
-  Printtyp.print_res_poly_identifier := Res_printer.polyVarIdentToString;
-  Rescript_cpp.replace_directive_string "BS_VERSION"  Bs_version.version
-  (*; Switch.cut := 100*) (* tweakable but not very useful *)
-  
-
-let () = 
-  at_exit (fun _ -> Format.pp_print_flush Format.err_formatter ())
diff --git a/jscomp/core/bs_conditional_initial.mli b/jscomp/core/bs_conditional_initial.mli
deleted file mode 100644
index c0f8400..0000000
--- a/jscomp/core/bs_conditional_initial.mli
+++ /dev/null
@@ -1,35 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** This function set up built in compile time variables used in 
-    conditional compilation so that 
-    {[
-      #if  BS 
-      #elif ..
-      #end
-    ]}
-    Is understood, also make sure the playground do the same initialization. 
-*)
-val setup_env : unit -> unit
-
diff --git a/jscomp/core/cmd_ast_exception.ml b/jscomp/core/cmd_ast_exception.ml
deleted file mode 100644
index 28b63d0..0000000
--- a/jscomp/core/cmd_ast_exception.ml
+++ /dev/null
@@ -1,45 +0,0 @@
-(* Copyright (C) 2015 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 error = CannotRun of string | WrongMagic of string
-
-exception Error of error
-
-let report_error ppf = function
-  | CannotRun cmd ->
-      Format.fprintf ppf
-        "Error while running external preprocessor@.Command line: %s@." cmd
-  | WrongMagic cmd ->
-      Format.fprintf ppf
-        "External preprocessor does not produce a valid file@.Command line: \
-         %s@."
-        cmd
-
-let () =
-  Location.register_error_of_exn (function
-    | Error err -> Some (Location.error_of_printer_file report_error err)
-    | _ -> None)
-
-let cannot_run comm = raise (Error (CannotRun comm))
-
-let wrong_magic magic = raise (Error (WrongMagic magic))
diff --git a/jscomp/core/cmd_ppx_apply.ml b/jscomp/core/cmd_ppx_apply.ml
deleted file mode 100644
index 3729a4d..0000000
--- a/jscomp/core/cmd_ppx_apply.ml
+++ /dev/null
@@ -1,112 +0,0 @@
-(* Copyright (C) 2015 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Note: some of the functions here should go to Ast_mapper instead,
-   which would encapsulate the "binary AST" protocol. *)
-
-let write_ast (type a) (kind : a Ml_binary.kind) fn (ast : a) =
-  let oc = open_out_bin fn in
-  output_string oc (Ml_binary.magic_of_kind kind);
-  output_value oc (!Location.input_name : string);
-  output_value oc (ast : a);
-  close_out oc
-
-let temp_ppx_file () =
-  Filename.temp_file "ppx" (Filename.basename !Location.input_name)
-
-let apply_rewriter kind fn_in ppx =
-  let magic = Ml_binary.magic_of_kind kind in
-  let fn_out = temp_ppx_file () in
-  let comm =
-    Printf.sprintf "%s %s %s" ppx (Filename.quote fn_in) (Filename.quote fn_out)
-  in
-  let ok = Ccomp.command comm = 0 in
-  if not ok then Cmd_ast_exception.cannot_run comm;
-  if not (Sys.file_exists fn_out) then Cmd_ast_exception.cannot_run comm;
-  (* check magic before passing to the next ppx *)
-  let ic = open_in_bin fn_out in
-  let buffer =
-    try really_input_string ic (String.length magic) with End_of_file -> ""
-  in
-  close_in ic;
-  if buffer <> magic then Cmd_ast_exception.wrong_magic buffer;
-  fn_out
-
-(* This is a fatal error, no need to protect it *)
-let read_ast (type a) (kind : a Ml_binary.kind) fn : a =
-  let ic = open_in_bin fn in
-  let magic = Ml_binary.magic_of_kind kind in
-  let buffer = really_input_string ic (String.length magic) in
-  assert (buffer = magic);
-  (* already checked by apply_rewriter *)
-  Location.set_input_name @@ (input_value ic : string);
-  let ast = (input_value ic : a) in
-  close_in ic;
-
-  ast
-
-(** [ppxs] are a stack, 
-    [-ppx1 -ppx2  -ppx3]
-    are stored as [-ppx3; -ppx2; -ppx1]
-    [fold_right] happens to process the first one *)
-let rewrite kind ppxs ast =
-  let fn_in = temp_ppx_file () in
-  write_ast kind fn_in ast;
-  let temp_files =
-    List.fold_right
-      (fun ppx fns ->
-        match fns with
-        | [] -> assert false
-        | fn_in :: _ -> apply_rewriter kind fn_in ppx :: fns)
-      ppxs [ fn_in ]
-  in
-  match temp_files with
-  | last_fn :: _ ->
-      let out = read_ast kind last_fn in
-      Ext_list.iter temp_files Misc.remove_file;
-      out
-  | _ -> assert false
-
-let apply_rewriters_str ?(restore = true) ~tool_name ast =
-  match !Clflags.all_ppx with
-  | [] -> ast
-  | ppxs ->
-      ast
-      |> Ast_mapper.add_ppx_context_str ~tool_name
-      |> rewrite Ml ppxs
-      |> Ast_mapper.drop_ppx_context_str ~restore
-
-let apply_rewriters_sig ?(restore = true) ~tool_name ast =
-  match !Clflags.all_ppx with
-  | [] -> ast
-  | ppxs ->
-      ast
-      |> Ast_mapper.add_ppx_context_sig ~tool_name
-      |> rewrite Mli ppxs
-      |> Ast_mapper.drop_ppx_context_sig ~restore
-
-let apply_rewriters ?restore ~tool_name (type a) (kind : a Ml_binary.kind)
-    (ast : a) : a =
-  match kind with
-  | Ml_binary.Ml -> apply_rewriters_str ?restore ~tool_name ast
-  | Ml_binary.Mli -> apply_rewriters_sig ?restore ~tool_name ast
diff --git a/jscomp/core/config_util.ml b/jscomp/core/config_util.ml
deleted file mode 100644
index f65dee5..0000000
--- a/jscomp/core/config_util.ml
+++ /dev/null
@@ -1,47 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let find_in_path_uncap path name =
-  let uname = Ext_string.uncapitalize_ascii name in
-  let rec try_dir = function
-    | [] -> None
-    | dir :: rem ->
-        let ufullname = Filename.concat dir uname in
-        if Sys.file_exists ufullname then Some ufullname
-        else
-          let fullname = Filename.concat dir name in
-          if Sys.file_exists fullname then Some fullname else try_dir rem
-  in
-  try_dir path
-
-(* ATTENTION: lazy to wait [Config.load_path] populated *)
-let find_opt file = find_in_path_uncap !Config.load_path file
-
-let output_prefix name =
-  match !Clflags.output_name with
-  | None ->
-      Ext_namespace_encode.make
-        (Filename.remove_extension name)
-        ?ns:!Clflags.dont_record_crc_unit
-  | Some oname -> Filename.remove_extension oname
diff --git a/jscomp/core/config_util.mli b/jscomp/core/config_util.mli
deleted file mode 100644
index f5623ae..0000000
--- a/jscomp/core/config_util.mli
+++ /dev/null
@@ -1,41 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** A simple wrapper around [Config] module in compiler-libs, so that the search path
-    is the same
-*)
-
-val find_opt : string -> string option
-(** [find filename] Input is a file name, output is absolute path *)
-
-val output_prefix : string -> string
-(** given the input, calculate the output prefix 
-
-    in: src/hello.ast
-    out: src/hello
-
-    with namespace:
-    in: src/hello.ast
-    out: src/hello-Ns
-*)
diff --git a/jscomp/core/design.md b/jscomp/core/design.md
deleted file mode 100644
index 0edd6a3..0000000
--- a/jscomp/core/design.md
+++ /dev/null
@@ -1,477 +0,0 @@
-
-# Ideas aobut boolean support
-## The cases when boolean representation is not transparent 
-
-- printing
-
-```ocaml
-Js.log true
-```
-
-- pattern match
-
-```ocaml
-let f x y = 
-  match x,y with
-  | true, false -> 0
-```
-
-- comparison
-
-```ocaml
-if v = true then 
-```
-
-## Where JS boolean could be introduced 
-
-JS operatons which could generate JS booleans
-- `not`
-- Equality comparison
-
-# `and`, `or` is fine
-In JS, `and`, `or` is untyped, but it is a superset of OCaml semantics:
-
-
-```js
-x && y 
-/* equivalent to  */ 
-x ? x : y
-```
-
-
-
-There is no coersion so `1&&0`, `1&&1`, `0&&1`, `0&&0` are all the same as JS version.
-Same for `or`
-
-but `not` is not the same as `!`, `!` will do the conversion to enforce its result is JS boolean  
-
-**ATT** if you want to support JS boolean better, think twice, it is
-really hard to give two booleans first class support, and such bugs
-are very hard to find (since in most cases they behave the same), so
-what we can do is produce OCaml bool exclusively, only pass JS boolean
-to JS ffi which requires it exclusively (very rare)
-**NOTE** since OCaml boolean is everywhere, while JS boolean only happens in the FFI, we should by default produce OCaml boolean in the IR, and mark JS boolean explicitly instead.
-
-## It does not affect `if_then_else` compilation
-
-since JS if is more capable, there is no need do any coercion  
-
-
-# Arity handling
-
-The runtime support is in `Curry` module, we have several functions 
-
-## `Curry.app`
-
-```ocaml
-Curry.app f args 
-(** [f] is an curried function, [args] are supplied arguments
-   if matches then like normal function apply.
-   if over-supply, take the first [arity] arguments,
-    fully apply and continue [app f' rest]
-   if under-supply, 
-     create a closure, wait until all arguments ready.
-     [Note, we don't necessary 
-     need a closure here, we can have some 
-     data structures like bytecode]   
- *)
-```
-
-```ocaml
-
-Curry.curry_N o a1 a2 .. arity 
-(** used by [Curry._N]  *)
-
-Curry._N o a1 a2 .. aN 
-(** 
-  A fast version of [app f [|a1; a2; ..; aN |]].
-  Check the arity of [o]if it hits, just do the application
-*)
-
-Curry.__N o 
-(**
-   Make sure the output of [o] is arity [N]. 
-   This is used to convert a curried function [o] into
-   uncurried. for example 
-   {[ 
-     fun [@bs] x y -> f x y 
-    ]}
-    Another use case:
-    {[ 
-      external f : ('a -> 'b [@bs.uncurry]) -> unit 
-
-      f g (* The compiler will do such converison internally*)
-    ]}
-   Guess the arity of [o], if it hit, then return [o]
-
-   Note when we want to target arity 0, in the first case
-   {[
-     fun [@bs] () -> f ()
-   ]} will be compiled as 
-   {{
-     fun () -> f (0)
-   }}
-   SO [Curry.__0] will not be triggered
-   
-   We also have 
-   some special logic to when converted to arity 0 
-   in external settings
-*)
-
-```
-
-# Toplevel module exports
-
-Global exports identifiers are extracted from `Translmod.get_export_identifiers`
-instead of inferred from lambda expression or cmi file.
-
-- We need be careful about externals.
-- Reading from fresh generated cmi is expensive.
-
-# Variable usage
-
-Lalias-bound variables are never assigned, so it can only 
-appear in `Lvar`, then it is easy to eliminate it 
-
-
-# interaction between `bs.splice` and `|>`
-
-Note in general, it is fine whether we do beta reduction or not, it is just optimization. 
-
-However, since we introduced `bs.splice` which does require the `spliced argument` to be captured
-
-```ocaml
-spliced_external a0 a1 [|b0;b1|]
-```
-
-There are two cases where get things complicated, people don't think `|>` is a function
-
-```ocaml
-x |> spliced_external a0 a1 [|b0;b1|]
-```
-Even though `|>` is a function, and `spliced_external` is escaped here, but people would 
-expect it is equivalent to 
-
-```ocaml
-spliced_external a0 a1 [|b0;b1|] x 
-```
-
-So our optimizer needs to handle this case to make sure `spliced_external` not escaped, 
-also becaues the interaction of `[@bs.splice]` and `[@bs.send]`, the spliced argument
-is no longer  in tail position, so that people can write such code
-
-```ocaml
-spliced_external a0 a1 [|b0;b1|]
-```
-Internally in lambda layer it would be 
-
-```ocaml
-(fun c0 c1 c2 c3-> spliced_external c0 c1 c2 c3) a0 a1 [|b0;b1|]
-```
-
-We can simply do inlining, it may have side efffect in `b0`, `b1`, our optimizer also need handle such case.
-
-Maybe in the future, we should lift the restriction about `bs.splice` (delegate to `slow` mode when we can not resolve it statically, my personal expereince is that people will complain about why it fails to compile more than why it is slow in some corner cases)
-
-Note this also interacts with `[@bs.uncurry]`
-
-for example
-
-```ocaml
-external filter : 'a array -> ('a -> bool [@bs.uncurry]) -> 'a array = "filter"
-[@@bs.send]
-
-let f xs =
-    xs |. filter (fun x -> x > 2)
-```
-
-Here whether the callback gets inlined to the call of `filter` will have an effect on how `Pjs_fn_make` gets cancelled.
-
-Note when we pattern match over the original lamba,`Levent` needs to be removed as early as possible. Due to the existence of `Levent`, we can not pattern match over nested original raw lambda.
-
-We turned off event generation temporarily
-
-# safe way to test undefined
-
-Note such logic is already wrong:
-
-```js
-var x = undefined_value // thrown here 
-if (typeof x === "undefined"){
-    ...
-}
-```
-
-
-# `#` primitive handling
-
-1. Some primitives introduced are for performance reasons, for example:
-
-`#String.fromCharCode` which is essentialy the same as 
-
-```ocaml
-external of_char : char -> string = "String.fromCharCode"
-[@@bs.val]
-```
-
-We introduced `#` so that we can do some optimizations.
-
-2. Some of them are not expressible in OCaml FFI, for example
-'#is_instance_array',
-'#gt'
-
-3. Some of them require a runtime polyfill support
-
-
-# runtime
-
-## anything to string
-http://www.2ality.com/2012/03/converting-to-string.html
-Note that `""+ Symbol()` does not work any more, we should favor `String` instead
-
-
-# Name mangling
-
-## let bound identifier mangling
-
-### keyword
-Note there are two issues, if it is keyword, the output may not be parsable if we don't do name mangling
-
-
-```js
-> var case = 3
-< SyntaxError: Cannot use the keyword 'case' as a variable name.
-```
-### global variable 
-If it is global variable, it is parsable, it may trigger even subtle errors:
-
-```js
-(function(){ 'use strict'; var document = 3; console.log(document)})()
-VM1146:1 3
-3
-```  
-This could be _problematic_ for bindings
-```ocaml
-let process = 3
-Process.env##OCAML
-```
-In general global variables would be problematic for bindings
-
-## property name mangling
-
-Nowadays, JS engine support keywords as property name very well
-
-```js
-var f = { true : true, false : false }
-```
-
-But it has problems when it is too simple for parsing
-```js
-var f = { true, false} // parsign rules ambiguity
-```
-
-If we don't do ES6, we should not go with name mangling, however, it is mostly due to we can 
-not express these keywords, such as `_open` as property in OCaml, so we did the name mangling
-
-# Curry/Tuple: two kinds of function 
-
-OCaml indeed support two kind calling convention.
-
-```ocaml
-(Lfunction (Tupled(a0,a1,a2))) [a0,a1,a2]
-```
-
-and 
-
-```ocaml
-(Lfunction Curried (a0,a1,a2)) a0 a1 a2 
-```
-
-
-They also affect how beta reduction works, 
-
-```ocaml
-| Lapply(Lfunction(Curried, params, body), args, _)
-    when optimize && List.length params = List.length args ->
-      count bv (beta_reduce params body args)
-| Lapply(Lfunction(Tupled, params, body), [Lprim(Pmakeblock _, args,_)], _)
-    when optimize && List.length params = List.length args ->
-      count bv (beta_reduce params body args)
-```
-
-It is generated by the backend via an argument 
-`untuplify_fn` in `transl_function`.
-Note if we want to take advantage of it in the future we need 
-translate ` f x`  into (when `f` is `fun (a0,a1) -> a0 + a1 `
-
-```ocaml
-f (x[0],x[1])
-```
-
-currently it is turned on only in native mode
-
-```ocaml
-and transl_function loc untuplify_fn ..
-```
-
-two call sites
-
-```ocaml
-transl_function exp.exp_loc false ...
-transl_function e.exp_loc !Clflags.native_code ...
-```
-
-# JS exception wrap and unwrap
-
-### Pack and Unpack OCaml exceptions
-
-http://eli.thegreenplace.net/2013/10/22/classical-inheritance-in-javascript-es5
-
-http://stackoverflow.com/questions/1382107/whats-a-good-way-to-extend-error-in-javascript
-
-
-https://caml.inria.fr/mantis/print_bug_page.php?bug_id=7375
-
-http://stackoverflow.com/questions/3734236/how-can-i-rethrow-an-exception-in-javascript-but-preserve-the-stack
-```js
-class OCamlError extends Error{
-  constructor(payload){
-    super("OCamlError")
-    this.payload = payload
-  }
-}
-```
-
-We can see the output from typescript to get a sense of what it will be transpiled into.
-
-This works reasonably well (tested on Safari and Chrome)
-
-```js
-function OCamlError(camlExnData){
-  var self = Error.call(this, "OCamlError")
-  self.camlExnData = camlExnData
-  return self
-}
-```
-
-```js
-function unpackError(exn){
-  if(exn.camlExnData !== undefined){
-    return exn.camlExnData
-  } else {
-    return exn
-  }
-}
-```
-```js
-function packError(exn){
-  if (Obj.tag(exn) === 248){
-    return new OCamlError(exn)
-  } else {
-    return exn
-  }
-}
-```
-So whenever we raise an OCaml exception, we always wrapped it as a JS error.
-Now we unpack it, it could be OCaml exception or JS exception, so we  did 
-a runtime dispatch.
-
-Some potential optimization
-
-```ocaml
-try f x with 
-Not_found -> ..
-JsError e
-```
-
-currently it would be transalted as 
-
-```js
-try {
-  f(x)
-  }
-catch(e){
-  var e = unpackError(e)
-  if (e === "Not_found"){
-    ...
-  } else {
-    throw packError(e) // re-raise
-  }
-} 
-```
-
-need check `Praise of raise_kind`
-
-*Conclusion*: it is very hard to get it right when changig ocaml exception representation and js exception representation at the same time in the combination of *re-raiase*
-
-
-# Several module components can have the same name #978
-
-Note: ReScript compiler complains if exports have the same component name, this keeps its soundness.
-
-A funny thing is that open variants does not have record disambiguion so that for:
-
-```ocaml
-type a = ..
-type b = ..
-type a += A 
-type b += A
-```
-
-The compiler will only expose the last `A`, which means, ReScript will not complain, the limitation 
-of the compiler preserves its soundness
-
-# Print import module names
-
-for `create_js_module`, we first create a mapping to make it a proper
-module name, (also cached in a hashtbl). Note it is not a Js id, which
-fails `Ext_ident.is_js`
-
-# compilation
-
-# static catches
-
-# Comparison semantics
-
-Cases when commparison are specialized (Note we need make sure the specialized version
-is consistent with the generalized version):
-
-- caml_int_max/min
-- caml_bool_max/min
-- caml_float_max/min
-- caml_string_max/min
-- caml_nativeint_max/min
-- caml_int32_max/min
-- caml_int64_max/min
-
-- int_equal[null/undefined/nullable] [not]
-- bool_equal[null/undefined/nullable] [not]
-- float_equal[null/undefined/nullable] [not]
-- string_equal[null/undefined/nullable] [not]
-- nativeintequal[_null/unefined/nullable] [not]
-- int32_equal[_null/undefined/nullable] [not]
-- int64_equal[_null/undefined/nullable] [not]
-
-- int_lessthan[greaterthan] [lessequal] [greaterequal]
-- bool_lessthan[greaterthan] [lessequal] [greaterequal]
-- float_lessthan[greaterthan] [lessequal] [greaterequal]
-- string_lessthan[greaterthan] [lessequal] [greaterequal]
-- nativeint_lessthan[greaterthan] [lessequal] [greaterequal]
-- int32_lessthan[greaterthan] [lessequal] [greaterequal]
-- int64_lessthan[greaterthan] [lessequal] [greaterequal]
-
-- int_compare
-- bool_compare
-- float_compare
-- string_compare
-- nativeint_compare
-- int32_comapre
-- int64_compare
-
-So far we haven't specialized option comparison, but we need be careful when 
-we do the optimizer, e.g, `Js_exp_make.int_comp`, we need make sure the peepwhole is consistent
-
-
-
-
-
diff --git a/jscomp/core/destruct_exn.md b/jscomp/core/destruct_exn.md
deleted file mode 100644
index 81e6667..0000000
--- a/jscomp/core/destruct_exn.md
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-Its essential is 
-
-```ocaml
-external destruct : 'b -> (exn -> 'a) 
-```
-
-However it does not prevent things like 
-
-```ocaml
-destruct v begin fun exn -> 
-   Js.log exn ; 
-   match exn with 
-   | .. 
-   | .. 
-```
-
-Here it forces us to answer whether `v` is exception or not, 
-
-while such syntax below does not need us answer `v` is exception 
-or not,  it just asks us to answer it matches a branch of exception or not which can be done in a sound way.
-
-```ocaml
-match%exn v with 
-| .. 
-| .. 
-```
-
-However, we need make sure such cases not happen
-
-```ocaml
-match%exn v with 
-| e -> ...
-
-```
-Or any vagous pattern which needs us to answer if 
-it is an exception or not
-
-
-Another proposal is 
-```ocaml
-match%exn computation with 
-| A ..
-| B .. 
-| Js.NonCamlOpenVariant .. 
-| v ->  ..
-```
-
-Here we pack the data `v` 
-
-==>
-```
-
-match (Js_enx.internalTOOCamlException compuation) with
-| A .. 
-| B 
-| exception .. )
-```
-
-The same problem is
-
-```
-match (Js_enx.internalTOOCamlException compuation) with
-| _ -> ..
-```
-
-What will happen if JS side `raises` an OCaml extensible variant, 
-we view it as OCaml exception..
-It is slightly differnt in OCaml, since it always start from `catch(id)..` 
-where `id` is defined by the compiler
-
-Another very similar proposal would be 
-
-```ocaml
-fun[@bs:exn] e -> 
-  match e with 
-  | Js.Exn.Error ..
-  | .. 
-```
\ No newline at end of file
diff --git a/jscomp/core/dune b/jscomp/core/dune
deleted file mode 100644
index 49d0d77..0000000
--- a/jscomp/core/dune
+++ /dev/null
@@ -1,9 +0,0 @@
-(library
- (name core)
- (wrapped false)
- (preprocess
-  (action
-   (run %{bin:cppo} %{env:CPPO_FLAGS=} %{input-file})))
- (flags
-  (:standard -w -A))
- (libraries depends ext frontend gentype js_parser))
diff --git a/jscomp/core/j.ml b/jscomp/core/j.ml
deleted file mode 100644
index acbdc06..0000000
--- a/jscomp/core/j.ml
+++ /dev/null
@@ -1,334 +0,0 @@
-(* Copyright (C) 2015- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Javascript IR
-
-    It's a subset of Javascript AST specialized for OCaml lambda backend
-
-    Note it's not exactly the same as Javascript, the AST itself follows lexical
-    convention and [Block] is just a sequence of statements, which means it does
-    not introduce new scope
-*)
-
-type mutable_flag = Js_op.mutable_flag
-type binop = Js_op.binop
-type int_op = Js_op.int_op
-type kind = Js_op.kind
-type property = Js_op.property
-type number = Js_op.number
-type ident_info = Js_op.ident_info
-type exports = Js_op.exports
-type tag_info = Js_op.tag_info
-type property_name = Js_op.property_name
-
-type label = string
-and ident = Ident.t
-(* we override `method ident` *)
-
-(** object literal, if key is ident, in this case, it might be renamed by 
-    Google Closure  optimizer,
-    currently we always use quote
-*)
-
-and module_id = { id : ident; kind : Js_op.kind ; dynamic_import : bool }
-
-and required_modules = module_id list
-and vident = Id of ident | Qualified of module_id * string option
-(* Since camldot is only available for toplevel module accessors,
-   we don't need print  `A.length$2`
-   just print `A.length` - it's guarateed to be unique
-
-   when the third one is None, it means the whole module
-
-   TODO:
-   invariant, when [kind] is [Runtime], then we can ignore [ident],
-   since all [runtime] functions are unique, when do the
-   pattern match we can ignore the first one for simplicity
-   for example
-   {[
-     Qualified (_, Runtime, Some "caml_int_compare")
-   ]}
-*)
-
-and exception_ident = ident
-and for_ident = ident
-and for_direction = Js_op.direction_flag
-and property_map = (property_name * expression) list
-and length_object = Js_op.length_object
-and delim = External_arg_spec.delim = | DNone | DStarJ | DNoQuotes
-
-and expression_desc =
-  | Length of expression * length_object
-  | Is_null_or_undefined of expression  (** where we use a trick [== null ] *)
-  | String_append of expression * expression
-  | Bool of bool (* js true/false*)
-  (* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_Precedence
-     [typeof] is an operator
-  *)
-  | Typeof of expression
-  | Js_not of expression (* !v *)
-  (* TODO: Add some primitives so that [js inliner] can do a better job *)
-  | Seq of expression * expression
-  | Cond of expression * expression * expression
-  | Bin of binop * expression * expression
-  (* [int_op] will guarantee return [int32] bits
-     https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Operators/Bitwise_Operators *)
-  (* | Int32_bin of int_op * expression * expression *)
-  | FlatCall of expression * expression
-  (* f.apply(null,args) -- Fully applied guaranteed
-     TODO: once we know args's shape --
-     if it's know at compile time, we can turn it into
-     f(args[0], args[1], ... )
-  *)
-  | Call of expression * expression list * Js_call_info.t
-  (* Analysze over J expression is hard since,
-      some primitive  call is translated
-      into a plain call, it's better to keep them
-  *)
-  | String_index of expression * expression
-  (* str.[i])*)
-  | Array_index of expression * expression
-  (* arr.(i)
-     Invariant:
-     The second argument has to be type of [int],
-     This can be constructed either in a static way [E.array_index_by_int] or a dynamic way
-     [E.array_index]
-  *)
-  | Tagged_template of expression * expression list * expression list
-  | Static_index of expression * string * int32 option
-  (* The third argument bool indicates whether we should
-     print it as
-     a["idd"] -- false
-     or
-     a.idd  -- true
-     There are several kinds of properties
-     1. OCaml module dot (need to be escaped or not)
-        All exported declarations have to be OCaml identifiers
-     2. Javascript dot (need to be preserved/or using quote)
-  *)
-  | New of expression * expression list option (* TODO: option remove *)
-  | Var of vident
-  | Fun of {
-      is_method : bool;
-      params : ident list;
-      body : block;
-      env : Js_fun_env.t;
-      return_unit : bool;
-      async : bool;
-    }
-  | Str of { delim : delim; txt : string }
-  (* A string is UTF-8 encoded, and may contain
-     escape sequences.
-  *)
-  | Raw_js_code of Js_raw_info.t
-  (* literally raw JS code 
-  *)
-  | Array of expression list * mutable_flag
-  | Optional_block of expression * bool
-  (* [true] means [identity] *)
-  | Caml_block of expression list * mutable_flag * expression * tag_info
-  (* The third argument is [tag] , forth is [tag_info] *)
-  (* | Caml_uninitialized_obj of expression * expression *)
-  (* [tag] and [size] tailed  for [Obj.new_block] *)
-
-  | Caml_block_tag of expression * string (* e.tag *)
-  (* | Caml_block_set_length of expression * expression *)
-  (* It will just fetch tag, to make it safe, when creating it,
-     we need apply "|0", we don't do it in the
-     last step since "|0" can potentially be optimized
-  *)
-  | Number of number
-  | Object of property_map
-  | Undefined of {isUnit: bool}
-  | Null
-  | Await of expression
-
-and for_ident_expression = expression
-(* pure*)
-
-and finish_ident_expression = expression
-
-(* pure *)
-(* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/block
-   block can be nested, specified in ES3
-*)
-
-(* Delay some units like [primitive] into JS layer ,
-   benefit: better cross module inlining, and smaller IR size?
-*)
-
-(*
-   [closure] captured loop mutable values in the outer loop
-
-   check if it contains loop mutable values, happens in nested loop
-   when closured, it's no longer loop mutable value.
-   which means the outer loop mutable value can not peek into the inner loop
-    {[
-      var i = f ();
-      for(var finish = 32; i < finish; ++i){
-        }
-    ]}
-    when [for_ident_expression] is [None], [var i] has to
-    be initialized outside, so
-
-    {[
-      var i = f ()
-        (function (xxx){
-             for(var finish = 32; i < finish; ++i)
-           }(..i))
-    ]}
-    This happens rare it's okay
-
-    this is because [i] has to be initialized outside, if [j]
-    contains a block side effect
-    TODO: create such example
-*)
-
-(* Since in OCaml,
-
-   [for i = 0 to k end do done ]
-   k is only evaluated once , to encode this invariant in JS IR,
-   make sure [ident] is defined in the first b
-
-   TODO: currently we guarantee that [bound] was only
-   excecuted once, should encode this in AST level
-*)
-
-(* Can be simplified to keep the semantics of OCaml
-   For (var i, e, ...){
-     let  j = ...
-   }
-
-   if [i] or [j] is captured inside closure
-
-   for (var i , e, ...){
-     (function (){
-     })(i)
-   }
-*)
-
-(* Single return is good for ininling..
-   However, when you do tail-call optmization
-   you loose the expression oriented semantics
-   Block is useful for implementing goto
-   {[
-     xx:{
-       break xx;
-     }
-   ]}
-*)
-and case_clause = {
-  switch_body : block;
-  should_break : bool;
-  (* true means break *)
-  comment : string option;
-}
-
-and string_clause = Ast_untagged_variants.tag_type * case_clause
-and int_clause = int * case_clause
-
-and statement_desc =
-  | Block of block
-  | Variable of variable_declaration
-  (* Function declaration and Variable declaration  *)
-  | Exp of expression
-  | If of expression * block * block
-  | While of label option * expression * block * Js_closure.t
-    (* check if it contains loop mutable values, happens in nested loop *)
-  | ForRange of
-      for_ident_expression option
-      * finish_ident_expression
-      * for_ident
-      * for_direction
-      * block
-      * Js_closure.t
-  | Continue of label
-  | Break (* only used when inline a fucntion *)
-  | Return of expression
-  (* Here we need track back a bit ?, move Return to Function ...
-     Then we can only have one Return, which is not good *)
-  (* since in ocaml, it's expression oriented langauge, [return] in
-     general has no jumps, it only happens when we do
-     tailcall conversion, in that case there is a jump.
-     However, currently  a single [break] is good to cover
-     our compilation strategy
-     Attention: we should not insert [break] arbitrarily, otherwise
-     it would break the semantics
-     A more robust signature would be
-     {[ goto : label option ; ]}
-  *)
-  | Int_switch of expression * int_clause list * block option
-  | String_switch of expression * string_clause list * block option
-  | Throw of expression
-  | Try of block * (exception_ident * block) option * block option
-  | Debugger
-
-and expression = { expression_desc : expression_desc; comment : string option }
-and statement = { statement_desc : statement_desc; comment : string option }
-
-and variable_declaration = {
-  ident : ident;
-  value : expression option;
-  property : property;
-  ident_info : ident_info;
-}
-
-(* TODO: For efficency: block should not be a list, it should be able to
-   be concatenated in both ways
-*)
-and block = statement list
-and program = { block : block; exports : exports; export_set : Set_ident.t }
-
-and deps_program = {
-  program : program;
-  modules : required_modules;
-  side_effect : string option; (* None: no, Some reason  *)
-}
-[@@deriving
-  {
-    excludes =
-      [|
-        deps_program;
-        int_clause;
-        string_clause;
-        for_direction;
-        (* exception_ident; *)
-        for_direction;
-        expression_desc;
-        statement_desc;
-        for_ident_expression;
-        label;
-        finish_ident_expression;
-        property_map;
-        length_object;
-        (* for_ident; *)
-        required_modules;
-        case_clause;
-      |];
-  }]
-(*
-FIXME: customize for each code generator 
-for each code generator, we can provide a white-list
-so that we can achieve the optimal
-*)
diff --git a/jscomp/core/js_analyzer.ml b/jscomp/core/js_analyzer.ml
deleted file mode 100644
index 2ca6443..0000000
--- a/jscomp/core/js_analyzer.ml
+++ /dev/null
@@ -1,278 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 idents_stats = {
-  mutable used_idents : Set_ident.t;
-  mutable defined_idents : Set_ident.t;
-}
-
-let add_defined_idents (x : idents_stats) ident =
-  x.defined_idents <- Set_ident.add x.defined_idents ident
-
-(* Assume that functions already calculated closure correctly
-   Maybe in the future, we should add a dirty flag, to mark the calcuated
-   closure is correct or not
-
-   Note such shaking is done in the toplevel, so that it requires us to
-   flatten the statement first
-*)
-let super = Js_record_iter.super
-
-let free_variables (stats : idents_stats) =
-  {
-    super with
-    variable_declaration =
-      (fun self st ->
-        add_defined_idents stats st.ident;
-        match st.value with None -> () | Some v -> self.expression self v);
-    ident =
-      (fun _ id ->
-        if not (Set_ident.mem stats.defined_idents id) then
-          stats.used_idents <- Set_ident.add stats.used_idents id);
-    expression =
-      (fun self exp ->
-        match exp.expression_desc with
-        | Fun {env}
-        (* a optimization to avoid walking into function again
-            if it's already comuted
-        *) ->
-            stats.used_idents <-
-              Set_ident.union (Js_fun_env.get_unbounded env) stats.used_idents
-        | _ -> super.expression self exp);
-  }
-
-let init = { used_idents = Set_ident.empty; defined_idents = Set_ident.empty }
-
-let obj = free_variables init
-
-let clean_up init =
-  init.used_idents <- Set_ident.empty;
-  init.defined_idents <- Set_ident.empty
-
-let free_variables_of_statement st =
-  clean_up init;
-  obj.statement obj st;
-  Set_ident.diff init.used_idents init.defined_idents
-
-let free_variables_of_expression st =
-  clean_up init;
-  obj.expression obj st;
-  Set_ident.diff init.used_idents init.defined_idents
-
-let rec no_side_effect_expression_desc (x : J.expression_desc) =
-  match x with
-  | Undefined _ | Null | Bool _ | Var _ -> true
-  | Fun _ -> true
-  | Number _ -> true (* Can be refined later *)
-  | Static_index (obj, (_name : string), (_pos : int32 option)) ->
-      no_side_effect obj
-  | String_index (a, b) | Array_index (a, b) ->
-      no_side_effect a && no_side_effect b
-  | Is_null_or_undefined b -> no_side_effect b
-  | Str _ -> true
-  | Array (xs, _mutable_flag) | Caml_block (xs, _mutable_flag, _, _) ->
-      (* create [immutable] block,
-          does not really mean that this opreation itself is [pure].
-
-          the block is mutable does not mean this operation is non-pure
-      *)
-      Ext_list.for_all xs no_side_effect
-  | Optional_block (x, _) -> no_side_effect x
-  | Object kvs -> Ext_list.for_all_snd kvs no_side_effect
-  | String_append (a, b) | Seq (a, b) -> no_side_effect a && no_side_effect b
-  | Length (e, _) | Caml_block_tag (e, _) | Typeof e -> no_side_effect e
-  | Bin (op, a, b) -> op <> Eq && no_side_effect a && no_side_effect b
-  | Tagged_template (call_expr, strings, values) -> no_side_effect call_expr &&
-      Ext_list.for_all strings no_side_effect && Ext_list.for_all values no_side_effect
-  | Js_not _ | Cond _ | FlatCall _ | Call _ | New _ | Raw_js_code _
-  (* actually true? *) ->
-      false
-  | Await _ -> false
-
-and no_side_effect (x : J.expression) =
-  no_side_effect_expression_desc x.expression_desc
-
-let no_side_effect_expression (x : J.expression) = no_side_effect x
-
-let super = Js_record_iter.super
-
-let no_side_effect_obj =
-  {
-    super with
-    statement =
-      (fun self s ->
-        match s.statement_desc with
-        | Throw _ | Debugger | Break | Variable _ | Continue _ ->
-            raise_notrace Not_found
-        | Exp e -> self.expression self e
-        | Int_switch _ | String_switch _ | ForRange _ | If _ | While _ | Block _
-        | Return _ | Try _ ->
-            super.statement self s);
-    expression =
-      (fun _ s ->
-        if not (no_side_effect_expression s) then raise_notrace Not_found);
-  }
-
-let no_side_effect_statement st =
-  try
-    no_side_effect_obj.statement no_side_effect_obj st;
-    true
-  with _ -> false
-
-(* TODO: generate [fold2]
-   This make sense, for example:
-   {[
-     let string_of_formatting_gen : type a b c d e f .
-       (a, b, c, d, e, f) formatting_gen -> string =
-       fun formatting_gen -> match formatting_gen with
-         | Open_tag (Format (_, str)) -> str
-         | Open_box (Format (_, str)) -> str
-
-   ]}
-*)
-let rec eq_expression ({ expression_desc = x0 } : J.expression)
-    ({ expression_desc = y0 } : J.expression) =
-  match x0 with
-  | Null -> y0 = Null
-  | Undefined x -> y0 = Undefined x
-  | Number (Int { i }) -> (
-      match y0 with Number (Int { i = j }) -> i = j | _ -> false)
-  | Number (BigInt {positive = p0; value = v0}) -> (
-    match y0 with Number (BigInt {positive = p1; value = v1}) -> p0 = p1 && v0 = v1 | _ -> false)
-  | Number (Float _) -> false
-  (* begin match y0 with
-     | Number (Float j) ->
-      false (* conservative *)
-     | _ -> false
-     end *)
-  | String_index (a0, a1) -> (
-      match y0 with
-      | String_index (b0, b1) -> eq_expression a0 b0 && eq_expression a1 b1
-      | _ -> false)
-  | Array_index (a0, a1) -> (
-      match y0 with
-      | Array_index (b0, b1) -> eq_expression a0 b0 && eq_expression a1 b1
-      | _ -> false)
-  | Call (a0, args00, _) -> (
-      match y0 with
-      | Call (b0, args10, _) ->
-          eq_expression a0 b0 && eq_expression_list args00 args10
-      | _ -> false)
-  | Var x -> ( match y0 with Var y -> Js_op_util.same_vident x y | _ -> false)
-  | Bin (op0, a0, b0) -> (
-      match y0 with
-      | Bin (op1, a1, b1) ->
-          op0 = op1 && eq_expression a0 a1 && eq_expression b0 b1
-      | _ -> false)
-  | Str {delim=a0; txt=b0} -> (
-      match y0 with Str {delim=a1; txt=b1} -> a0 = a1 && b0 = b1 | _ -> false)
-  | Static_index (e0, p0, off0) -> (
-      match y0 with
-      | Static_index (e1, p1, off1) ->
-          p0 = p1 && eq_expression e0 e1 && off0 = off1 (* could be relaxed *)
-      | _ -> false)
-  | Seq (a0, b0) -> (
-      match y0 with
-      | Seq (a1, b1) -> eq_expression a0 a1 && eq_expression b0 b1
-      | _ -> false)
-  | Bool a0 -> ( match y0 with Bool b0 -> a0 = b0 | _ -> false)
-  | Optional_block (a0, b0) -> (
-      match y0 with
-      | Optional_block (a1, b1) -> b0 = b1 && eq_expression a0 a1
-      | _ -> false)
-  | Caml_block (ls0, flag0, tag0, _) -> (
-      match y0 with
-      | Caml_block (ls1, flag1, tag1, _) ->
-          eq_expression_list ls0 ls1 && flag0 = flag1 && eq_expression tag0 tag1
-      | _ -> false)
-  | Length _ | Is_null_or_undefined _ | String_append _ | Typeof _ | Js_not _
-  | Cond _ | FlatCall _ | New _ | Fun _ | Raw_js_code _ | Array _
-  | Caml_block_tag _ | Object _ | Tagged_template _
-  | Number (Uint _) ->
-      false
-  | Await _ -> false
-
-and eq_expression_list xs ys = Ext_list.for_all2_no_exn xs ys eq_expression
-
-and eq_block (xs : J.block) (ys : J.block) =
-  Ext_list.for_all2_no_exn xs ys eq_statement
-
-and eq_statement ({ statement_desc = x0 } : J.statement)
-    ({ statement_desc = y0 } : J.statement) =
-  match x0 with
-  | Exp a -> ( match y0 with Exp b -> eq_expression a b | _ -> false)
-  | Return a -> ( match y0 with Return b -> eq_expression a b | _ -> false)
-  | Debugger -> y0 = Debugger
-  | Break -> y0 = Break
-  | Block xs0 -> ( match y0 with Block ys0 -> eq_block xs0 ys0 | _ -> false)
-  | Variable _ | If _ | While _ | ForRange _ | Continue _ | Int_switch _
-  | String_switch _ | Throw _ | Try _ ->
-      false
-
-let rev_flatten_seq (x : J.expression) =
-  let rec aux acc (x : J.expression) : J.block =
-    match x.expression_desc with
-    | Seq (a, b) -> aux (aux acc a) b
-    | _ -> { statement_desc = Exp x; comment = None } :: acc
-  in
-  aux [] x
-
-(* TODO: optimization,
-    counter the number to know if needed do a loop gain instead of doing a diff
-*)
-
-let rev_toplevel_flatten block =
-  let rec aux acc (xs : J.block) : J.block =
-    match xs with
-    | [] -> acc
-    | {
-        statement_desc =
-          Variable
-            ( { ident_info = { used_stats = Dead_pure }; _ }
-            | { ident_info = { used_stats = Dead_non_pure }; value = None } );
-      }
-      :: xs ->
-        aux acc xs
-    | { statement_desc = Block b; _ } :: xs -> aux (aux acc b) xs
-    | x :: xs -> aux (x :: acc) xs
-  in
-  aux [] block
-
-(* let rec is_constant (x : J.expression)  =
-   match x.expression_desc with
-   | Array_index (a,b) -> is_constant a && is_constant b
-   | Str (b,_) -> b
-   | Number _ -> true (* Can be refined later *)
-   | Array (xs,_mutable_flag)  -> Ext_list.for_all xs  is_constant
-   | Caml_block(xs, Immutable, tag, _)
-    -> Ext_list.for_all xs is_constant && is_constant tag
-   | Bin (_op, a, b) ->
-    is_constant a && is_constant b
-   | _ -> false *)
-
-let rec is_okay_to_duplicate (e : J.expression) =
-  match e.expression_desc with
-  | Var _ | Bool _ | Str _ | Number _ -> true
-  | Static_index (e, _s, _off) -> is_okay_to_duplicate e
-  | _ -> false
diff --git a/jscomp/core/js_analyzer.mli b/jscomp/core/js_analyzer.mli
deleted file mode 100644
index 7a1f281..0000000
--- a/jscomp/core/js_analyzer.mli
+++ /dev/null
@@ -1,73 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Analyzing utilities for [J] module *)
-
-(** for example, whether it has side effect or not.
-*)
-
-val free_variables_of_statement : J.statement -> Set_ident.t
-
-val free_variables_of_expression : J.finish_ident_expression -> Set_ident.t
-
-(* val no_side_effect_expression_desc :
-   J.expression_desc -> bool *)
-
-val no_side_effect_expression : J.expression -> bool
-(** [no_side_effect] means this expression has no side effect, 
-    but it might *depend on value store*, so you can not just move it around,
-
-    for example,
-    when you want to do a deep copy, the expression passed to you is pure
-    but you still have to call the function to make a copy, 
-    since it maybe changed later
-*)
-
-val no_side_effect_statement : J.statement -> bool
-(** 
-    here we say 
-   {[ var x = no_side_effect_expression ]}
-    is [no side effect], but it is actually side effect, 
-    since  we are defining a variable, however, if it is not exported or used, 
-    then it's fine, so we delay this check later
-*)
-
-val eq_expression : J.expression -> J.expression -> bool
-
-val eq_statement : J.statement -> J.statement -> bool
-
-val eq_block : J.block -> J.block -> bool
-
-val rev_flatten_seq : J.expression -> J.block
-
-val rev_toplevel_flatten : J.block -> J.block
-(** return the block in reverse order *)
-
-(* val is_constant : J.expression -> bool *)
-
-(** Simple expression, 
-    no computation involved so that  it is okay to be duplicated
-*)
-
-val is_okay_to_duplicate : J.expression -> bool
diff --git a/jscomp/core/js_arr.ml b/jscomp/core/js_arr.ml
deleted file mode 100644
index 0c83e24..0000000
--- a/jscomp/core/js_arr.ml
+++ /dev/null
@@ -1,29 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-
-let set_array e e0 e1 = E.assign (E.array_index e e0) e1
-
-let ref_array e e0 = E.array_index e e0
diff --git a/jscomp/core/js_arr.mli b/jscomp/core/js_arr.mli
deleted file mode 100644
index 9c9dda8..0000000
--- a/jscomp/core/js_arr.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val set_array : J.expression -> J.expression -> J.expression -> J.expression
-
-val ref_array : J.expression -> J.expression -> J.expression
diff --git a/jscomp/core/js_ast_util.ml b/jscomp/core/js_ast_util.ml
deleted file mode 100644
index c761a06..0000000
--- a/jscomp/core/js_ast_util.ml
+++ /dev/null
@@ -1,34 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* module E = Js_exp_make  *)
-
-module S = Js_stmt_make
-
-let named_expression (e : J.expression) : (J.statement * Ident.t) option =
-  if Js_analyzer.is_okay_to_duplicate e then None
-  else
-    let obj = Ext_ident.create_tmp () in
-    let obj_code = S.define_variable ~kind:Strict obj e in
-    Some (obj_code, obj)
diff --git a/jscomp/core/js_ast_util.mli b/jscomp/core/js_ast_util.mli
deleted file mode 100644
index 3977f0e..0000000
--- a/jscomp/core/js_ast_util.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val named_expression : J.expression -> (J.statement * Ident.t) option
diff --git a/jscomp/core/js_block_runtime.ml b/jscomp/core/js_block_runtime.ml
deleted file mode 100644
index 8d80405..0000000
--- a/jscomp/core/js_block_runtime.ml
+++ /dev/null
@@ -1,33 +0,0 @@
-(* Copyright (C) 2019- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let option_id = Ident.create_persistent Js_runtime_modules.option
-
-let curry_id = Ident.create_persistent Js_runtime_modules.curry
-
-let check_additional_id (x : J.expression) : Ident.t option =
-  match x.expression_desc with
-  | Optional_block (_, false) -> Some option_id
-  | Call (_, _, { arity = NA }) -> Some curry_id
-  | _ -> None
diff --git a/jscomp/core/js_block_runtime.mli b/jscomp/core/js_block_runtime.mli
deleted file mode 100644
index 0c46a8e..0000000
--- a/jscomp/core/js_block_runtime.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2019- Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val check_additional_id : J.expression -> Ident.t option
diff --git a/jscomp/core/js_call_info.ml b/jscomp/core/js_call_info.ml
deleted file mode 100644
index e3f8cfa..0000000
--- a/jscomp/core/js_call_info.ml
+++ /dev/null
@@ -1,42 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 arity = Full | NA
-
-type call_info =
-  | Call_ml (* called by plain ocaml expression *)
-  | Call_builtin_runtime (* built-in externals *)
-  | Call_na
-(* either from [@@val] or not available,
-   such calls does not follow such rules
-   {[ fun x y -> (f x y) === f ]} when [f] is an atom
-*)
-
-type t = { call_info : call_info; arity : arity }
-
-let dummy = { arity = NA; call_info = Call_na }
-
-let builtin_runtime_call = { arity = Full; call_info = Call_builtin_runtime }
-
-let ml_full_call = { arity = Full; call_info = Call_ml }
diff --git a/jscomp/core/js_call_info.mli b/jscomp/core/js_call_info.mli
deleted file mode 100644
index 9e8a5f3..0000000
--- a/jscomp/core/js_call_info.mli
+++ /dev/null
@@ -1,44 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 for collecting call site information, used in JS IR *)
-
-type arity = Full | NA
-
-type call_info =
-  | Call_ml (* called by plain ocaml expression *)
-  | Call_builtin_runtime (* built-in externals *)
-  | Call_na
-(* either from [@@val] or not available,
-   such calls does not follow such rules
-   {[ fun x y -> f x y === f ]} when [f] is an atom
-*)
-
-type t = { call_info : call_info; arity : arity }
-
-val dummy : t
-
-val builtin_runtime_call : t
-
-val ml_full_call : t
diff --git a/jscomp/core/js_closure.ml b/jscomp/core/js_closure.ml
deleted file mode 100644
index dc068bd..0000000
--- a/jscomp/core/js_closure.ml
+++ /dev/null
@@ -1,31 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = { mutable outer_loop_mutable_values : Set_ident.t }
-
-let empty () = { outer_loop_mutable_values = Set_ident.empty }
-
-let set_lexical_scope t v = t.outer_loop_mutable_values <- v
-
-let get_lexical_scope t = t.outer_loop_mutable_values
diff --git a/jscomp/core/js_closure.mli b/jscomp/core/js_closure.mli
deleted file mode 100644
index 8ff3903..0000000
--- a/jscomp/core/js_closure.mli
+++ /dev/null
@@ -1,35 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Define a type used in JS IR to help convert lexical scope to JS [var] 
-    based scope convention
-*)
-
-type t = { mutable outer_loop_mutable_values : Set_ident.t }
-
-val empty : unit -> t
-
-val get_lexical_scope : t -> Set_ident.t
-
-val set_lexical_scope : t -> Set_ident.t -> unit
diff --git a/jscomp/core/js_cmj_format.ml b/jscomp/core/js_cmj_format.ml
deleted file mode 100644
index 9f33ebc..0000000
--- a/jscomp/core/js_cmj_format.ml
+++ /dev/null
@@ -1,169 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-[@@@warning "+9"]
-
-type arity = Single of Lam_arity.t | Submodule of Lam_arity.t array
-
-(* TODO: add a magic number *)
-type cmj_value = {
-  arity : arity;
-  persistent_closed_lambda : Lam.t option;
-      (** Either constant or closed functor *)
-}
-
-type effect = string option
-
-let single_na = Single Lam_arity.na
-
-type keyed_cmj_value = {
-  name : string;
-  arity : arity;
-  persistent_closed_lambda : Lam.t option;
-}
-
-type keyed_cmj_values = keyed_cmj_value array
-
-type t = {
-  values : keyed_cmj_values;
-  pure : bool;
-  package_spec : Js_packages_info.t;
-  case : Ext_js_file_kind.case;
-}
-
-let make ~(values : cmj_value Map_string.t) ~effect ~package_spec ~case : t =
-  {
-    values =
-      Map_string.to_sorted_array_with_f values (fun k v ->
-          {
-            name = k;
-            arity = v.arity;
-            persistent_closed_lambda = v.persistent_closed_lambda;
-          });
-    pure = effect = None;
-    package_spec;
-    case;
-  }
-
-(* Serialization .. *)
-let from_file name : t =
-  let ic = open_in_bin name in
-  let _digest = Digest.input ic in
-  let v : t = input_value ic in
-  close_in ic;
-  v
-
-let from_file_with_digest name : t * Digest.t =
-  let ic = open_in_bin name in
-  let digest = Digest.input ic in
-  let v : t = input_value ic in
-  close_in ic;
-  (v, digest)
-
-let from_string s : t = Marshal.from_string s Ext_digest.length
-
-let for_sure_not_changed (name : string) (header : string) =
-  if Sys.file_exists name then (
-    let ic = open_in_bin name in
-    let holder = really_input_string ic Ext_digest.length in
-    close_in ic;
-    holder = header)
-  else false
-
-(* This may cause some build system always rebuild
-   maybe should not be turned on by default
-*)
-let to_file name ~check_exists (v : t) =
-  let s = Marshal.to_string v [] in
-  let cur_digest = Digest.string s in
-  let header = cur_digest in
-  if not (check_exists && for_sure_not_changed name header) then (
-    let oc = open_out_bin name in
-    output_string oc header;
-    output_string oc s;
-    close_out oc)
-
-let keyComp (a : string) b = Map_string.compare_key a b.name
-
-let not_found key =
-  { name = key; arity = single_na; persistent_closed_lambda = None }
-
-let get_result midVal =
-  match midVal.persistent_closed_lambda with
-  | Some
-      (Lconst
-        (Const_js_null | Const_js_undefined _ | Const_js_true | Const_js_false))
-  | None ->
-      midVal
-  | Some _ ->
-      if !Js_config.cross_module_inline then midVal
-      else { midVal with persistent_closed_lambda = None }
-
-let rec binarySearchAux arr lo hi (key : string) =
-  let mid = (lo + hi) / 2 in
-  let midVal = Array.unsafe_get arr mid in
-  let c = keyComp key midVal in
-  if c = 0 then get_result midVal
-  else if c < 0 then
-    (*  a[lo] =< key < a[mid] <= a[hi] *)
-    if hi = mid then
-      let loVal = Array.unsafe_get arr lo in
-      if loVal.name = key then get_result loVal else not_found key
-    else binarySearchAux arr lo mid key
-  else if (*  a[lo] =< a[mid] < key <= a[hi] *)
-          lo = mid then
-    let hiVal = Array.unsafe_get arr hi in
-    if hiVal.name = key then get_result hiVal else not_found key
-  else binarySearchAux arr mid hi key
-
-let binarySearch (sorted : keyed_cmj_values) (key : string) : keyed_cmj_value =
-  let len = Array.length sorted in
-  if len = 0 then not_found key
-  else
-    let lo = Array.unsafe_get sorted 0 in
-    let c = keyComp key lo in
-    if c < 0 then not_found key
-    else
-      let hi = Array.unsafe_get sorted (len - 1) in
-      let c2 = keyComp key hi in
-      if c2 > 0 then not_found key else binarySearchAux sorted 0 (len - 1) key
-
-(* FIXME: better error message when ocamldep
-   get self-cycle
-*)
-let query_by_name (cmj_table : t) name : keyed_cmj_value =
-  let values = cmj_table.values in
-  binarySearch values name
-
-type path = string
-
-type cmj_load_info = {
-  cmj_table : t;
-  package_path : path;
-      (*
-    Note it is the package path we want 
-    for ES6_global module spec
-    Maybe we can employ package map in the future
-  *)
-}
diff --git a/jscomp/core/js_cmj_format.mli b/jscomp/core/js_cmj_format.mli
deleted file mode 100644
index 902ca04..0000000
--- a/jscomp/core/js_cmj_format.mli
+++ /dev/null
@@ -1,95 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Define intemediate format to be serialized for cross module optimization
-*)
-
-(** In this module, 
-    currently only arity information is  exported, 
-
-    Short term: constant literals are also exported 
-
-    Long term:
-    Benefit? since Google Closure Compiler already did such huge amount of work
-    TODO: simple expression, literal small function  can be stored, 
-    but what would happen if small function captures other environment
-    for example 
-
-    {[
-      let f  = fun x -> g x 
-    ]}
-
-    {[
-      let f = g 
-    ]}
-*)
-
-type arity = Single of Lam_arity.t | Submodule of Lam_arity.t array
-
-type cmj_value = {
-  arity : arity;
-  persistent_closed_lambda : Lam.t option;
-      (* Either constant or closed functor *)
-}
-
-type effect = string option
-
-type keyed_cmj_value = {
-  name : string;
-  arity : arity;
-  persistent_closed_lambda : Lam.t option;
-}
-
-type t = {
-  values : keyed_cmj_value array;
-  pure : bool;
-  package_spec : Js_packages_info.t;
-  case : Ext_js_file_kind.case;
-}
-
-val make :
-  values:cmj_value Map_string.t ->
-  effect:effect ->
-  package_spec:Js_packages_info.t ->
-  case:Ext_js_file_kind.case ->
-  t
-
-val query_by_name : t -> string -> keyed_cmj_value
-
-val single_na : arity
-
-val from_file : string -> t
-
-val from_file_with_digest : string -> t * Digest.t
-
-val from_string : string -> t
-
-(*
-   Note writing the file if its content is not changed
-*)
-val to_file : string -> check_exists:bool -> t -> unit
-
-type path = string
-
-type cmj_load_info = { cmj_table : t; package_path : path }
diff --git a/jscomp/core/js_cmj_load.ml b/jscomp/core/js_cmj_load.ml
deleted file mode 100644
index ac94a1a..0000000
--- a/jscomp/core/js_cmj_load.ml
+++ /dev/null
@@ -1,61 +0,0 @@
-(* Copyright (C) Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* strategy:
-   If not installed, use the distributed [cmj] files, 
-   make sure that the distributed files are platform independent
-*)
-
-
-
-
-(* 
-let load_unit_no_file unit_name : Js_cmj_format.cmj_load_info = 
-  let file = unit_name ^ Literals.suffix_cmj in   
-  match Config_util.find_opt file with
-  | Some f
-    -> 
-    {package_path = 
-       (** hacking relying on the convention of pkg/lib/ocaml/xx.cmj*)
-       Filename.dirname (Filename.dirname (Filename.dirname f)); 
-     cmj_table =  Js_cmj_format.from_file f}
-  | None -> 
-    Bs_exception.error (Cmj_not_found unit_name) *)
-
-let load_unit_with_file unit_name : Js_cmj_format.cmj_load_info = 
-  let file = unit_name ^ Literals.suffix_cmj in   
-  match Config_util.find_opt file with
-  | Some f
-    -> 
-    {package_path = 
-       (* hacking relying on the convention of pkg/lib/ocaml/xx.cmj*)
-       Filename.dirname (Filename.dirname (Filename.dirname f)); 
-     cmj_table =  Js_cmj_format.from_file f}
-  | None -> Bs_exception.error (Cmj_not_found unit_name)
-
-(* we can disable loading from file for troubleshooting
-   Note in dev mode we still allow loading from file is to 
-   make the dev build still function correct 
-*)
-let load_unit = ref load_unit_with_file
\ No newline at end of file
diff --git a/jscomp/core/js_cmj_load.mli b/jscomp/core/js_cmj_load.mli
deleted file mode 100644
index 08da39f..0000000
--- a/jscomp/core/js_cmj_load.mli
+++ /dev/null
@@ -1,29 +0,0 @@
-(* Copyright (C) Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** This module is platform dependent, on browser environment, 
-    it depends on {!Js_cmj_datasets}, for non-browser environment, it fails
-*)
-
-val load_unit : (string -> Js_cmj_format.cmj_load_info) ref
diff --git a/jscomp/core/js_dump.ml b/jscomp/core/js_dump.ml
deleted file mode 100644
index 454f46d..0000000
--- a/jscomp/core/js_dump.ml
+++ /dev/null
@@ -1,1339 +0,0 @@
-(* ReScript compiler
- * Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * http://www.ocsigen.org/js_of_ocaml/
- * Copyright (C) 2010 Jérôme Vouillon
- * Laboratoire PPS - CNRS Université Paris Diderot
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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, with linking exception;
- * either version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * 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.
- *)
-(* Authors: Jérôme Vouillon, Hongbo Zhang  *)
-
-(*
-  http://stackoverflow.com/questions/2846283/what-are-the-rules-for-javascripts-automatic-semicolon-insertion-asi
-  ASI catch up
-   {[
-     a=b
-       ++c
-       ---
-       a=b ++c
-     ====================
-     a ++
-     ---
-     a
-     ++
-     ====================
-     a --
-     ---
-     a
-     --
-     ====================
-     (continue/break/return/throw) a
-     ---
-     (continue/break/return/throw)
-       a
-     ====================
-   ]}
-
-*)
-
-let name_symbol = Js_op.Symbol_name
-
-module P = Ext_pp
-module E = Js_exp_make
-module S = Js_stmt_make
-module L = Js_dump_lit
-
-(* There modules are dynamically inserted in the last stage
-   {Caml_curry}
-   {Caml_option}
-
-   They can appear anywhere so even if you have a module
-   {
-    let module Caml_block = ...
-
-    (* Later would insert the use of Caml_block here which should
-      point tto the runtime module
-    *)
-   }
-   There are no sane way to easy detect it ahead of time, we should be
-   conservative here.
-   (our call Js_fun_env.get_unbounded env) is not precise
-*)
-
-module Curry_gen = struct
-  let pp_curry_dot f =
-    P.string f Js_runtime_modules.curry;
-    P.string f L.dot
-
-  let pp_optimize_curry (f : P.t) (len : int) =
-    pp_curry_dot f;
-    P.string f "__";
-    P.string f (Printf.sprintf "%d" len)
-
-  let pp_app_any (f : P.t) =
-    pp_curry_dot f;
-    P.string f "app"
-
-  let pp_app (f : P.t) (len : int) =
-    pp_curry_dot f;
-    P.string f "_";
-    P.string f (Printf.sprintf "%d" len)
-end
-
-let return_indent = String.length L.return / Ext_pp.indent_length
-let throw_indent = String.length L.throw / Ext_pp.indent_length
-
-type cxt = Ext_pp_scope.t
-
-let semi f = P.string f L.semi
-let comma f = P.string f L.comma
-
-let exn_block_as_obj ~(stack : bool) (el : J.expression list) (ext : J.tag_info)
-    : J.expression_desc =
-  let field_name =
-    match ext with
-    | Blk_extension -> (
-        fun i ->
-          match i with 0 -> Literals.exception_id | i -> "_" ^ string_of_int i)
-    | Blk_record_ext { fields = ss } -> (
-        fun i -> match i with 0 -> Literals.exception_id | i -> ss.(i - 1))
-    | _ -> assert false
-  in
-  Object
-    (if stack then
-     Ext_list.mapi_append el
-       (fun i e -> (Js_op.Lit (field_name i), e))
-       [ (Js_op.Lit "Error", E.new_ (E.js_global "Error") []) ]
-    else Ext_list.mapi el (fun i e -> (Js_op.Lit (field_name i), e)))
-
-let rec iter_lst cxt (f : P.t) ls element inter =
-  match ls with
-  | [] -> cxt
-  | [ e ] -> element cxt f e
-  | e :: r ->
-      let acxt = element cxt f e in
-      inter f;
-      iter_lst acxt f r element inter
-
-let raw_snippet_exp_simple_enough (s : string) =
-  Ext_string.for_all s (fun c ->
-      match c with 'a' .. 'z' | 'A' .. 'Z' | '_' | '.' -> true | _ -> false)
-(* Parentheses are required when the expression
-   starts syntactically with "{" or "function"
-   TODO:  be more conservative, since Google Closure will handle
-   the precedence correctly, we also need people read the code..
-   Here we force parens for some alien operators
-
-   If we move assign into a statement, will be less?
-   TODO: construct a test case that do need parenthesisze for expression
-   IIE does not apply (will be inlined?)
-*)
-
-(* e = function(x){...}(x);  is good
-*)
-let exp_need_paren (e : J.expression) =
-  match e.expression_desc with
-  (* | Caml_uninitialized_obj _  *)
-  | Call ({ expression_desc = Fun _ | Raw_js_code _ }, _, _) -> true
-  | Raw_js_code { code_info = Exp _ }
-  | Fun _
-  | Caml_block
-      ( _,
-        _,
-        _,
-        ( Blk_record _ | Blk_module _ | Blk_poly_var _ | Blk_extension
-        | Blk_record_ext _ | Blk_record_inlined _ | Blk_constructor _ ) )
-  | Object _ ->
-      true
-  | Raw_js_code { code_info = Stmt _ }
-  | Length _ | Call _ | Caml_block_tag _ | Seq _ | Static_index _ | Cond _
-  | Bin _ | Is_null_or_undefined _ | String_index _ | Array_index _
-  | String_append _ | Var _ | Undefined _ | Null | Str _ | Array _
-  | Optional_block _ | Caml_block _ | FlatCall _ | Typeof _ | Number _
-  | Js_not _ | Bool _ | New _ ->
-      false
-  | Await _ -> false
-  | Tagged_template _ -> false
-
-let comma_idents (cxt : cxt) f ls = iter_lst cxt f ls Ext_pp_scope.ident comma
-
-let pp_paren_params (inner_cxt : cxt) (f : Ext_pp.t) (lexical : Ident.t list) :
-    unit =
-  P.string f L.lparen;
-  let (_ : cxt) = comma_idents inner_cxt f lexical in
-  P.string f L.rparen
-
-(** Print as underscore for unused vars, may not be 
-    needed in the future *)
-(* let ipp_ident cxt f id (un_used : bool) =
-   Ext_pp_scope.ident cxt f (
-    if un_used then
-      Ext_ident.make_unused ()
-    else
-      id) *)
-
-let pp_var_assign cxt f id =
-  P.string f L.var;
-  P.space f;
-  let acxt = Ext_pp_scope.ident cxt f id in
-  P.space f;
-  P.string f L.eq;
-  P.space f;
-  acxt
-
-let pp_var_assign_this cxt f id =
-  let cxt = pp_var_assign cxt f id in
-  P.string f L.this;
-  P.space f;
-  semi f;
-  P.newline f;
-  cxt
-
-let pp_var_declare cxt f id =
-  P.string f L.var;
-  P.space f;
-  let acxt = Ext_pp_scope.ident cxt f id in
-  semi f;
-  acxt
-
-let pp_direction f (direction : J.for_direction) =
-  match direction with
-  | Up | Upto -> P.string f L.plus_plus
-  | Downto -> P.string f L.minus_minus
-
-let return_sp f =
-  P.string f L.return;
-  P.space f
-
-let bool f b = P.string f (if b then L.true_ else L.false_)
-
-let comma_sp f =
-  comma f;
-  P.space f
-
-let comma_nl f =
-  comma f;
-  P.newline f
-
-(* let drop_comment (x : J.expression) =
-   if x.comment = None then x
-   else {x with comment = None} *)
-
-let debugger_nl f =
-  P.newline f;
-  P.string f L.debugger;
-  semi f;
-  P.newline f
-
-let break_nl f =
-  P.string f L.break;
-  P.space f;
-  semi f;
-  P.newline f
-
-let continue f s =
-  P.string f L.continue;
-  P.space f;
-  P.string f s;
-  semi f
-
-let formal_parameter_list cxt f l = iter_lst cxt f l Ext_pp_scope.ident comma_sp
-
-(* IdentMap *)
-(*
-f/122 -->
-  f/122 is in the map
-  if in, use the old mapping
-  else
-    check  f,
-     if in last bumped id
-     else
-        use "f", register it
-
-  check "f"
-         if not , use "f", register stamp -> 0
-         else
-           check stamp
-             if in  use it
-             else check last bumped id, increase it and register
-*)
-
-(**
-   Turn [function f (x,y) { return a (x,y)} ] into [Curry.__2(a)],
-   The idea is that [Curry.__2] will guess the arity of [a], if it does
-   hit, then there is no cost when passed
-*)
-
-let is_var (b : J.expression) a =
-  match b.expression_desc with Var (Id i) -> Ident.same i a | _ -> false
-
-type fn_exp_state =
-  | Is_return (* for sure no name *)
-  | Name_top of Ident.t
-  | Name_non_top of Ident.t
-  | No_name of { single_arg : bool }
-(* true means for sure, false -- not sure *)
-
-let default_fn_exp_state = No_name { single_arg = false }
-
-(* TODO: refactoring
-   Note that {!pp_function} could print both statement and expression when [No_name] is given
-*)
-let rec try_optimize_curry cxt f len function_id =
-  Curry_gen.pp_optimize_curry f len;
-  P.paren_group f 1 (fun _ -> expression ~level:1 cxt f function_id)
-
-and pp_function ~return_unit ~async ~is_method cxt (f : P.t) ~fn_state
-    (l : Ident.t list) (b : J.block) (env : Js_fun_env.t) : cxt =
-  match b with
-  | [
-   {
-     statement_desc =
-       Return
-         {
-           expression_desc =
-             Call
-               ( ({ expression_desc = Var v; _ } as function_id),
-                 ls,
-                 {
-                   arity = (Full | NA) as arity (* see #234*);
-                   (* TODO: need a case to justify it*)
-                   call_info = Call_builtin_runtime | Call_ml;
-                 } );
-         };
-   };
-  ]
-    when (* match such case:
-            {[ function(x,y){ return u(x,y) } ]}
-            it can be optimized in to either [u] or [Curry.__n(u)]
-         *)
-         (not is_method)
-         && Ext_list.for_all2_no_exn ls l is_var
-         &&
-         match v with
-         (* This check is needed to avoid some edge cases
-            {[function(x){return x(x)}]}
-            here the function is also called `x`
-         *)
-         | Id id -> not (Ext_list.exists l (fun x -> Ident.same x id))
-         | Qualified _ -> true -> (
-      let optimize len ~p cxt f v =
-        if p then try_optimize_curry cxt f len function_id else vident cxt f v
-      in
-      let len = List.length l in
-      (* length *)
-      match fn_state with
-      | Name_top i | Name_non_top i ->
-          let cxt = pp_var_assign cxt f i in
-          let cxt = optimize len ~p:(arity = NA && len <= 8) cxt f v in
-          semi f;
-          cxt
-      | Is_return | No_name _ ->
-          if fn_state = Is_return then return_sp f;
-          optimize len ~p:(arity = NA && len <= 8) cxt f v)
-  | _ ->
-      let set_env : Set_ident.t =
-        (* identifiers will be printed following*)
-        match fn_state with
-        | Is_return | No_name _ -> Js_fun_env.get_unbounded env
-        | Name_top id | Name_non_top id ->
-            Set_ident.add (Js_fun_env.get_unbounded env) id
-      in
-      (* the context will be continued after this function *)
-      let outer_cxt = Ext_pp_scope.merge cxt set_env in
-
-      (* the context used to be printed inside this function
-
-         when printing a function,
-         only the enclosed variables and function name matters,
-         if the function does not capture any variable, then the context is empty
-      *)
-      let inner_cxt = Ext_pp_scope.sub_scope outer_cxt set_env in
-      let param_body () : unit =
-        if is_method then (
-          match l with
-          | [] -> assert false
-          | this :: arguments ->
-              let cxt =
-                P.paren_group f 1 (fun _ ->
-                    formal_parameter_list inner_cxt f arguments)
-              in
-              P.space f;
-              P.brace_vgroup f 1 (fun _ ->
-                  let cxt =
-                    if Js_fun_env.get_unused env 0 then cxt
-                    else pp_var_assign_this cxt f this
-                  in
-                  function_body ~return_unit cxt f b))
-        else
-          let cxt =
-            P.paren_group f 1 (fun _ -> formal_parameter_list inner_cxt f l)
-          in
-          P.space f;
-          P.brace_vgroup f 1 (fun _ -> function_body ~return_unit cxt f b)
-      in
-      let lexical : Set_ident.t = Js_fun_env.get_lexical_scope env in
-      let enclose lexical =
-        let handle lexical =
-          if Set_ident.is_empty lexical then (
-            match fn_state with
-            | Is_return ->
-                return_sp f;
-                P.string f (L.function_async ~async);
-                P.space f;
-                param_body ()
-            | No_name { single_arg } ->
-                (* see # 1692, add a paren for annoymous function for safety  *)
-                P.cond_paren_group f (not single_arg) 1 (fun _ ->
-                    P.string f (L.function_async ~async);
-                    P.space f;
-                    param_body ())
-            | Name_non_top x ->
-                ignore (pp_var_assign inner_cxt f x : cxt);
-                P.string f (L.function_async ~async);
-                P.space f;
-                param_body ();
-                semi f
-            | Name_top x ->
-                P.string f (L.function_async ~async);
-                P.space f;
-                ignore (Ext_pp_scope.ident inner_cxt f x : cxt);
-                param_body ())
-          else
-            (* print our closure as
-               {[(function(x,y){ return function(..){...}} (x,y))]}
-               Maybe changed to `let` in the future
-            *)
-            let lexical = Set_ident.elements lexical in
-            (match fn_state with
-            | Is_return -> return_sp f
-            | No_name _ -> ()
-            | Name_non_top name | Name_top name ->
-                ignore (pp_var_assign inner_cxt f name : cxt));
-            if async then P.string f L.await;
-            P.string f L.lparen;
-            P.string f (L.function_async ~async);
-            pp_paren_params inner_cxt f lexical;
-            P.brace_vgroup f 0 (fun _ ->
-                return_sp f;
-                P.string f (L.function_async ~async);
-                P.space f;
-                (match fn_state with
-                | Is_return | No_name _ -> ()
-                | Name_non_top x | Name_top x ->
-                    ignore (Ext_pp_scope.ident inner_cxt f x));
-                param_body ());
-            pp_paren_params inner_cxt f lexical;
-            P.string f L.rparen;
-            match fn_state with
-            | Is_return | No_name _ -> () (* expression *)
-            | _ -> semi f
-          (* has binding, a statement *)
-        in
-        handle
-          (match fn_state with
-          | (Name_top name | Name_non_top name) when Set_ident.mem lexical name
-            ->
-              (*TODO: when calculating lexical we should not include itself *)
-              Set_ident.remove lexical name
-          | _ -> lexical)
-      in
-      enclose lexical;
-      outer_cxt
-
-(* Assume the cond would not change the context,
-    since it can be either [int] or [string]
-*)
-and pp_one_case_clause :
-      'a. _ -> P.t -> (P.t -> 'a -> unit) -> 'a * J.case_clause -> _ =
- fun cxt f pp_cond
-     (switch_case, ({ switch_body; should_break; comment } : J.case_clause)) ->
-  let cxt =
-    P.group f 1 (fun _ ->
-        P.group f 1 (fun _ ->
-            P.string f L.case;
-            P.space f;
-            pp_comment_option f comment;
-            pp_cond f switch_case;
-            (* could be integer or string *)
-            P.space f;
-            P.string f L.colon);
-        P.group f 1 (fun _ ->
-            let cxt =
-              match switch_body with
-              | [] -> cxt
-              | _ ->
-                  P.newline f;
-                  statements false cxt f switch_body
-            in
-            if should_break then (
-              P.newline f;
-              P.string f L.break;
-              semi f);
-            cxt))
-  in
-  P.newline f;
-  cxt
-
-and loop_case_clauses :
-      'a. cxt -> P.t -> (P.t -> 'a -> unit) -> ('a * J.case_clause) list -> cxt
-    =
- fun cxt f pp_cond cases ->
-  Ext_list.fold_left cases cxt (fun acc x -> pp_one_case_clause acc f pp_cond x)
-
-and vident cxt f (v : J.vident) =
-  match v with
-  | Id v
-  | Qualified ({ id = v }, None)
-  | Qualified ({ id = v; kind = External { default = true } }, _) ->
-      Ext_pp_scope.ident cxt f v
-  | Qualified ({ id; kind = Ml | Runtime }, Some name) ->
-      let cxt = Ext_pp_scope.ident cxt f id in
-      P.string f L.dot;
-      P.string f
-        (if name = Js_dump_import_export.default_export then name
-        else Ext_ident.convert name);
-      cxt
-  | Qualified ({ id; kind = External _ }, Some name) ->
-      let cxt = Ext_pp_scope.ident cxt f id in
-      Js_dump_property.property_access f name;
-      cxt
-
-(* The higher the level, the more likely that inner has to add parens *)
-and expression ~level:l cxt f (exp : J.expression) : cxt =
-  pp_comment_option f exp.comment;
-  expression_desc cxt ~level:l f exp.expression_desc
-
-and expression_desc cxt ~(level : int) f x : cxt =
-  match x with
-  | Null ->
-      P.string f L.null;
-      cxt
-  | Undefined _ ->
-      P.string f L.undefined;
-      cxt
-  | Var v -> vident cxt f v
-  | Bool b ->
-      bool f b;
-      cxt
-  | Seq (e1, e2) ->
-      P.cond_paren_group f (level > 0) 1 (fun () ->
-          let cxt = expression ~level:0 cxt f e1 in
-          comma_sp f;
-          expression ~level:0 cxt f e2)
-  | Fun { is_method; params; body; env; return_unit; async } ->
-      (* TODO: dump for comments *)
-      pp_function ~is_method cxt f ~fn_state:default_fn_exp_state params body
-        env ~return_unit ~async
-      (* TODO:
-         when [e] is [Js_raw_code] with arity
-         print it in a more precise way
-         It seems the optimizer already did work to make sure
-         {[
-           Call (Raw_js_code (s, Exp i), el, {Full})
-           when Ext_list.length_equal el i
-         ]}
-      *)
-  | Call (e, el, info) ->
-      P.cond_paren_group f (level > 15) 1 (fun _ ->
-          P.group f 1 (fun _ ->
-              match (info, el) with
-              | { arity = Full }, _ | _, [] ->
-                  let cxt = expression ~level:15 cxt f e in
-                  P.paren_group f 1 (fun _ ->
-                      match el with
-                      | [
-                       {
-                         expression_desc =
-                           Fun
-                             {
-                               is_method;
-                               params;
-                               body;
-                               env;
-                               return_unit;
-                               async;
-                             };
-                       };
-                      ] ->
-                          pp_function ~is_method ~return_unit ~async cxt f
-                            ~fn_state:(No_name { single_arg = true })
-                            params body env
-                      | _ ->
-                        let el = match el with
-                        | [e] when e.expression_desc = Undefined {isUnit = true} ->
-                          (* omit passing undefined when the call is f() *)
-                          []
-                        | _ ->
-                          el in
-                         arguments cxt f el)
-              | _, _ ->
-                  let len = List.length el in
-                  if 1 <= len && len <= 8 then (
-                    Curry_gen.pp_app f len;
-                    P.paren_group f 1 (fun _ -> arguments cxt f (e :: el)))
-                  else (
-                    Curry_gen.pp_app_any f;
-                    P.paren_group f 1 (fun _ ->
-                        arguments cxt f [ e; E.array Mutable el ]))))
-  | FlatCall (e, el) ->
-      P.group f 1 (fun _ ->
-          let cxt = expression ~level:15 cxt f e in
-          P.string f L.dot;
-          P.string f L.apply;
-          P.paren_group f 1 (fun _ ->
-              P.string f L.null;
-              comma_sp f;
-              expression ~level:1 cxt f el))
-  | Tagged_template (callExpr, stringArgs, valueArgs) ->
-    let cxt = expression cxt ~level f callExpr in
-    P.string f "`";
-    let rec aux cxt xs ys = match xs, ys with
-    | [], [] -> ()
-    | [{J.expression_desc = Str { txt; _ }}], [] ->  
-        P.string f txt
-    | {J.expression_desc = Str { txt; _ }} :: x_rest, y :: y_rest ->
-        P.string f txt;
-        P.string f "${";
-        let cxt = expression cxt ~level f y in
-        P.string f "}";
-        aux cxt x_rest y_rest
-    | _ -> assert false
-    in
-    aux cxt stringArgs valueArgs;
-    P.string f "`";
-    cxt
-  | String_index (a, b) ->
-      P.group f 1 (fun _ ->
-          let cxt = expression ~level:15 cxt f a in
-          P.string f L.dot;
-          P.string f L.codePointAt;
-          (* FIXME: use code_point_at *)
-          P.paren_group f 1 (fun _ -> expression ~level:0 cxt f b))
-  | Str { delim; txt } ->
-      (*TODO --
-         when utf8-> it will not escape '\\' which is definitely not we want
-      *)
-      let () =
-        match delim with
-        | DStarJ -> P.string f ("\"" ^ txt ^ "\"")
-        | DNoQuotes -> P.string f txt
-        | DNone -> Js_dump_string.pp_string f txt
-      in
-      cxt
-  | Raw_js_code { code = s; code_info = info } -> (
-      match info with
-      | Exp exp_info ->
-          let raw_paren =
-            not
-              (match exp_info with
-              | Js_literal _ -> true
-              | Js_function _ | Js_exp_unknown ->
-                  false || raw_snippet_exp_simple_enough s)
-          in
-          if raw_paren then P.string f L.lparen;
-          P.string f s;
-          if raw_paren then P.string f L.rparen;
-          cxt
-      | Stmt stmt_info ->
-          if stmt_info = Js_stmt_comment then P.string f s
-          else (
-            P.newline f;
-            P.string f s;
-            P.newline f);
-          cxt)
-  | Number v ->
-      let s =
-        match v with
-        | Float { f } -> Js_number.caml_float_literal_to_js_string f
-        (* attach string here for float constant folding?*)
-        | Int { i; c = Some c } -> Format.asprintf "/* %s */%ld" (Ext_util.string_of_int_as_char c) i
-        | Int { i; c = None } ->
-            Int32.to_string i
-            (* check , js convention with ocaml lexical convention *)
-        | Uint i -> Format.asprintf "%lu" i
-        | BigInt {positive; value} -> Format.asprintf "%sn" (Bigint_utils.to_string positive value)
-      in
-      let need_paren =
-        if s.[0] = '-' then level > 13
-          (* Negative numbers may need to be parenthesized. *)
-        else
-          level = 15 (* Parenthesize as well when followed by a dot. *)
-          && s.[0] <> 'I' (* Infinity *)
-          && s.[0] <> 'N'
-        (* NaN *)
-      in
-      let action _ = P.string f s in
-      if need_paren then P.paren f action else action ();
-      cxt
-  | Is_null_or_undefined e ->
-      P.cond_paren_group f (level > 0) 1 (fun _ ->
-          let cxt = expression ~level:1 cxt f e in
-          P.space f;
-          P.string f "==";
-          P.space f;
-          P.string f L.null;
-          cxt)
-  | Js_not e ->
-      P.cond_paren_group f (level > 13) 1 (fun _ ->
-          P.string f "!";
-          expression ~level:13 cxt f e)
-  | Typeof e ->
-      P.string f "typeof";
-      P.space f;
-      expression ~level:13 cxt f e
-  | Bin
-      ( Minus,
-        {
-          expression_desc =
-            Number ((Int { i = 0l; _ } | Float { f = "0." }) as desc);
-        },
-        e )
-  (* TODO:
-     Handle multiple cases like
-     {[ 0. - x ]}
-     {[ 0.00 - x ]}
-     {[ 0.000 - x ]}
-  *) ->
-      P.cond_paren_group f (level > 13) 1 (fun _ ->
-          P.string f (match desc with Float _ -> "- " | _ -> "-");
-          expression ~level:13 cxt f e)
-  | Bin (op, e1, e2) ->
-      let out, lft, rght = Js_op_util.op_prec op in
-      let need_paren =
-        level > out || match op with Lsl | Lsr | Asr -> true | _ -> false
-      in
-      (* We are more conservative here, to make the generated code more readable
-            to the user *)
-      P.cond_paren_group f need_paren 1 (fun _ ->
-          let cxt = expression ~level:lft cxt f e1 in
-          P.space f;
-          P.string f (Js_op_util.op_str op);
-          P.space f;
-          expression ~level:rght cxt f e2)
-  | String_append (e1, e2) ->
-      let op : Js_op.binop = Plus in
-      let out, lft, rght = Js_op_util.op_prec op in
-      let need_paren =
-        level > out || match op with Lsl | Lsr | Asr -> true | _ -> false
-      in
-      P.cond_paren_group f need_paren 1 (fun _ ->
-          let cxt = expression ~level:lft cxt f e1 in
-          P.space f;
-          P.string f "+";
-          P.space f;
-          expression ~level:rght cxt f e2)
-  | Array (el, _) -> (
-      (* TODO: simplify for singleton list *)
-      match el with
-      | [] | [ _ ] -> P.bracket_group f 1 (fun _ -> array_element_list cxt f el)
-      | _ -> P.bracket_vgroup f 1 (fun _ -> array_element_list cxt f el))
-  | Optional_block (e, identity) ->
-      expression ~level cxt f
-        (if identity then e
-        else E.runtime_call Js_runtime_modules.option "some" [ e ])
-  | Caml_block (el, _, _, Blk_module fields) ->
-      expression_desc cxt ~level f
-        (Object
-           (Ext_list.map_combine fields el (fun x ->
-                Js_op.Lit (Ext_ident.convert x))))
-  (*name convention of Record is slight different from modules*)
-  | Caml_block (el, mutable_flag, _, Blk_record { fields; record_repr }) -> (
-      if
-        Array.length fields <> 0
-        && Ext_array.for_alli fields (fun i v -> string_of_int i = v)
-      then expression_desc cxt ~level f (Array (el, mutable_flag))
-      else
-        match record_repr with
-        | Record_regular ->
-            expression_desc cxt ~level f
-              (Object (Ext_list.combine_array fields el (fun i -> Js_op.Lit i)))
-        | Record_optional ->
-            let fields =
-              Ext_list.array_list_filter_map fields el (fun f x ->
-                  match x.expression_desc with
-                  | Undefined _ -> None
-                  | _ -> Some (Js_op.Lit f, x))
-            in
-            expression_desc cxt ~level f (Object fields))
-  | Caml_block (el, _, _, Blk_poly_var _) -> (
-      match el with
-      | [ tag; value ] ->
-          expression_desc cxt ~level f
-            (Object
-               [
-                 (Js_op.Lit Literals.polyvar_hash, tag);
-                 (Lit Literals.polyvar_value, value);
-               ])
-      | _ -> assert false)
-  | Caml_block (el, _, _, ((Blk_extension | Blk_record_ext _) as ext)) ->
-      expression_desc cxt ~level f (exn_block_as_obj ~stack:false el ext)
-  | Caml_block (el, _, tag, Blk_record_inlined p) ->
-      let untagged = Ast_untagged_variants.process_untagged p.attrs in
-      let objs =
-        let tails =
-          Ext_list.combine_array_append p.fields el
-            (if !Js_config.debug then [ (name_symbol, E.str p.name) ] else [])
-            (fun i -> Js_op.Lit i)
-        in
-        let is_optional (pname: Js_op.property_name)  =
-          match pname with
-          | Lit n -> Ext_list.mem_string p.optional_labels n
-          | Symbol_name -> false
-        in
-        let tag_name = match Ast_untagged_variants.process_tag_name p.attrs with
-        | None -> L.tag
-        | Some s -> s in
-        let tails =
-          match p.optional_labels with
-          | [] -> tails
-          | _ ->
-            Ext_list.filter_map tails (fun (f, x) ->
-              match x.expression_desc with
-              | Undefined _ when is_optional f -> None
-              | _ -> Some (f, x))
-          in
-        if untagged then
-          tails
-        else
-          (Js_op.Lit tag_name, (* TAG:xx for inline records *)
-            match Ast_untagged_variants.process_tag_type p.attrs with
-            | None -> E.str p.name
-            | Some t -> E.tag_type t )
-          :: tails
-      in
-      expression_desc cxt ~level f (Object objs)
-  | Caml_block (el, _, tag, Blk_constructor p) ->
-      let not_is_cons = p.name <> Literals.cons in
-      let tag_type = Ast_untagged_variants.process_tag_type p.attrs in
-      let untagged = Ast_untagged_variants.process_untagged p.attrs in
-      let tag_name = match Ast_untagged_variants.process_tag_name p.attrs with
-        | None -> L.tag
-        | Some s -> s in
-      let objs =
-        let tails =
-          Ext_list.mapi_append el
-            (fun i e ->
-              ( (match (not_is_cons, i) with
-                | false, 0 -> Js_op.Lit Literals.hd
-                | false, 1 -> Js_op.Lit Literals.tl
-                | _ -> Js_op.Lit ("_" ^ string_of_int i)),
-                e ))
-            (if !Js_config.debug && not_is_cons then
-             [ (name_symbol, E.str p.name) ]
-            else [])
-        in
-        if untagged || (not_is_cons = false) && p.num_nonconst = 1 then tails
-        else
-          ( Js_op.Lit tag_name, (* TAG:xx *) 
-            match tag_type with
-            | None -> E.str p.name
-            | Some t -> E.tag_type t )
-          :: tails
-      in
-      let exp = match objs with
-        | [(_, e)] when untagged -> e.expression_desc
-        | _ when untagged -> assert false (* should not happen *)
-        (* TODO: put restriction on the variant definitions allowed, to make sure this never happens. *)
-        | _ -> J.Object objs in
-      expression_desc cxt ~level f exp
-  | Caml_block
-      ( _,
-        _,
-        _,
-        (Blk_module_export _ | Blk_some | Blk_some_not_nested | Blk_lazy_general)
-      ) ->
-      assert false
-  | Caml_block (el, mutable_flag, _tag, Blk_tuple) ->
-      expression_desc cxt ~level f (Array (el, mutable_flag))
-  | Caml_block_tag (e, tag) ->
-      P.group f 1 (fun _ ->
-          let cxt = expression ~level:15 cxt f e in
-          P.string f L.dot;
-          P.string f tag;
-          cxt)
-  | Array_index (e, p) ->
-      P.cond_paren_group f (level > 15) 1 (fun _ ->
-          P.group f 1 (fun _ ->
-              let cxt = expression ~level:15 cxt f e in
-              P.bracket_group f 1 (fun _ -> expression ~level:0 cxt f p)))
-  | Static_index (e, s, _) ->
-      P.cond_paren_group f (level > 15) 1 (fun _ ->
-          let cxt = expression ~level:15 cxt f e in
-          Js_dump_property.property_access f s;
-          (* See [ .obj_of_exports]
-             maybe in the ast level we should have
-             refer and export
-          *)
-          cxt)
-  | Length (e, _) ->
-      (*Todo: check parens *)
-      P.cond_paren_group f (level > 15) 1 (fun _ ->
-          let cxt = expression ~level:15 cxt f e in
-          P.string f L.dot;
-          P.string f L.length;
-          cxt)
-  | New (e, el) ->
-      P.cond_paren_group f (level > 15) 1 (fun _ ->
-          P.group f 1 (fun _ ->
-              P.string f L.new_;
-              P.space f;
-              let cxt = expression ~level:16 cxt f e in
-              P.paren_group f 1 (fun _ ->
-                  match el with Some el -> arguments cxt f el | None -> cxt)))
-  | Cond (e, e1, e2) ->
-      let action () =
-        let cxt = expression ~level:3 cxt f e in
-        P.space f;
-        P.string f L.question;
-        P.space f;
-        (*
-            [level 1] is correct, however
-            to make nice indentation , force nested conditional to be parenthesized
-          *)
-        let cxt = P.group f 1 (fun _ -> expression ~level:3 cxt f e1) in
-
-        P.space f;
-        P.string f L.colon_space;
-        (* idem *)
-        P.group f 1 (fun _ -> expression ~level:3 cxt f e2)
-      in
-      if level > 2 then P.paren_vgroup f 1 action else action ()
-  | Object lst ->
-      (* #1946 object literal is easy to be
-         interpreted as block statement
-         here we avoid parens in such case
-         {[
-           var f = { x : 2 , y : 2}
-         ]}
-      *)
-      P.cond_paren_group f (level > 1) 1 (fun _ ->
-          if lst = [] then (
-            P.string f "{}";
-            cxt)
-          else
-            P.brace_vgroup f 1 (fun _ -> property_name_and_value_list cxt f lst))
-  | Await e ->
-      P.cond_paren_group f (level > 13) 1 (fun _ ->
-          P.string f "await ";
-          expression ~level:13 cxt f e)
-
-and property_name_and_value_list cxt f (l : J.property_map) =
-  iter_lst cxt f l
-    (fun cxt f (pn, e) ->
-      match e.expression_desc with
-      | Var (Id v | Qualified ({ id = v; _ }, None)) ->
-          let key = Js_dump_property.property_key pn in
-          let str, cxt = Ext_pp_scope.str_of_ident cxt v in
-          let content =
-            (* if key = str then key
-               else *)
-            key ^ L.colon_space ^ str
-          in
-          P.string f content;
-          cxt
-      | _ ->
-          let key = Js_dump_property.property_key pn in
-          P.string f key;
-          P.string f L.colon_space;
-          expression ~level:1 cxt f e)
-    comma_nl
-
-and array_element_list cxt f (el : E.t list) : cxt =
-  iter_lst cxt f el (expression ~level:1) comma_nl
-
-and arguments cxt f (l : E.t list) : cxt =
-  iter_lst cxt f l (expression ~level:1) comma_sp
-
-and variable_declaration top cxt f (variable : J.variable_declaration) : cxt =
-  (* TODO: print [const/var] for different backends  *)
-  match variable with
-  | { ident = i; value = None; ident_info; _ } ->
-      if ident_info.used_stats = Dead_pure then cxt else pp_var_declare cxt f i
-  | { ident = name; value = Some e; ident_info = { used_stats; _ } } -> (
-      match used_stats with
-      | Dead_pure -> cxt
-      | Dead_non_pure ->
-          (* Make sure parens are added correctly *)
-          statement_desc top cxt f (J.Exp e)
-      | _ -> (
-          match e.expression_desc with
-          | Fun { is_method; params; body; env; return_unit; async } ->
-              pp_function ~is_method cxt f ~return_unit ~async
-                ~fn_state:(if top then Name_top name else Name_non_top name)
-                params body env
-          | _ ->
-              let cxt = pp_var_assign cxt f name in
-              let cxt = expression ~level:1 cxt f e in
-              semi f;
-              cxt))
-
-and ipp_comment : 'a. P.t -> 'a -> unit = fun _f _comment -> ()
-
-(** don't print a new line -- ASI
-    FIXME: this still does not work in some cases...
-    {[
-      return /* ... */
-      [... ]
-    ]}
-*)
-
-and pp_comment f comment =
-  if String.length comment > 0 then (
-    P.string f "/* ";
-    P.string f comment;
-    P.string f " */")
-
-and pp_comment_option f comment =
-  match comment with None -> () | Some x -> pp_comment f x
-
-and statement top cxt f ({ statement_desc = s; comment; _ } : J.statement) : cxt
-    =
-  pp_comment_option f comment;
-  statement_desc top cxt f s
-
-and statement_desc top cxt f (s : J.statement_desc) : cxt =
-  match s with
-  | Block [] ->
-      ipp_comment f L.empty_block;
-      (* debugging*)
-      cxt
-  | Exp { expression_desc = Var _ } ->
-      (* Does it make sense to optimize here? *)
-      (* semi f; *)
-      cxt
-  | Exp e -> (
-      match e.expression_desc with
-      | Raw_js_code { code; code_info = Stmt Js_stmt_comment } ->
-          P.string f code;
-          cxt
-      | Raw_js_code { code_info = Exp (Js_literal { comment }) } ->
-          (match comment with
-          (* The %raw is just a comment *)
-          | Some s -> P.string f s
-          | None -> ());
-          cxt
-      | Str _ -> cxt
-      | _ ->
-          let cxt =
-            (if exp_need_paren e then P.paren_group f 1 else P.group f 0)
-              (fun _ -> expression ~level:0 cxt f e)
-          in
-          semi f;
-          cxt)
-  | Block b ->
-      (* No braces needed here *)
-      ipp_comment f L.start_block;
-      let cxt = statements top cxt f b in
-      ipp_comment f L.end_block;
-      cxt
-  | Variable l -> variable_declaration top cxt f l
-  | If (e, s1, s2) -> (
-      (* TODO: always brace those statements *)
-      P.string f L.if_;
-      P.space f;
-      let cxt = P.paren_group f 1 (fun _ -> expression ~level:0 cxt f e) in
-      P.space f;
-      let cxt = brace_block cxt f s1 in
-      match s2 with
-      | [] | [ { statement_desc = Block [] | Exp { expression_desc = Var _ } } ]
-        ->
-          P.newline f;
-          cxt
-      | [ ({ statement_desc = If _ } as nest) ]
-      | [
-          {
-            statement_desc = Block [ ({ statement_desc = If _; _ } as nest) ];
-            _;
-          };
-        ] ->
-          P.space f;
-          P.string f L.else_;
-          P.space f;
-          statement false cxt f nest
-      | _ :: _ as s2 ->
-          P.space f;
-          P.string f L.else_;
-          P.space f;
-          brace_block cxt f s2)
-  | While (label, e, s, _env) ->
-      (*  FIXME: print scope as well *)
-      (match label with
-      | Some i ->
-          P.string f i;
-          P.string f L.colon;
-          P.newline f
-      | None -> ());
-      let cxt =
-        match e.expression_desc with
-        | Number (Int { i = 1l }) ->
-            P.string f L.while_;
-            P.string f L.lparen;
-            P.string f L.true_;
-            P.string f L.rparen;
-            P.space f;
-            cxt
-        | _ ->
-            P.string f L.while_;
-            let cxt =
-              P.paren_group f 1 (fun _ -> expression ~level:0 cxt f e)
-            in
-            P.space f;
-            cxt
-      in
-      let cxt = brace_block cxt f s in
-      semi f;
-      cxt
-  | ForRange (for_ident_expression, finish, id, direction, s, env) ->
-      let action cxt =
-        P.vgroup f 0 (fun _ ->
-            let cxt =
-              P.group f 0 (fun _ ->
-                  (* The only place that [semi] may have semantics here *)
-                  P.string f L.for_;
-                  P.paren_group f 1 (fun _ ->
-                      let cxt, new_id =
-                        match
-                          (for_ident_expression, finish.expression_desc)
-                        with
-                        | Some ident_expression, (Number _ | Var _) ->
-                            let cxt = pp_var_assign cxt f id in
-                            (expression ~level:0 cxt f ident_expression, None)
-                        | Some ident_expression, _ ->
-                            let cxt = pp_var_assign cxt f id in
-                            let cxt =
-                              expression ~level:1 cxt f ident_expression
-                            in
-                            P.space f;
-                            comma f;
-                            let id =
-                              Ext_ident.create (Ident.name id ^ "_finish")
-                            in
-                            let cxt = Ext_pp_scope.ident cxt f id in
-                            P.space f;
-                            P.string f L.eq;
-                            P.space f;
-                            (expression ~level:1 cxt f finish, Some id)
-                        | None, (Number _ | Var _) -> (cxt, None)
-                        | None, _ ->
-                            let id =
-                              Ext_ident.create (Ident.name id ^ "_finish")
-                            in
-                            let cxt = pp_var_assign cxt f id in
-                            (expression ~level:15 cxt f finish, Some id)
-                      in
-                      semi f;
-                      P.space f;
-                      let cxt = Ext_pp_scope.ident cxt f id in
-                      P.space f;
-                      let right_prec =
-                        match direction with
-                        | Upto ->
-                            let _, _, right = Js_op_util.op_prec Le in
-                            P.string f L.le;
-                            right
-                        | Up ->
-                            let _, _, right = Js_op_util.op_prec Lt in
-                            P.string f L.lt;
-                            right
-                        | Downto ->
-                            let _, _, right = Js_op_util.op_prec Ge in
-                            P.string f L.ge;
-                            right
-                      in
-                      P.space f;
-                      let cxt =
-                        expression ~level:right_prec cxt f
-                          (match new_id with
-                          | Some i -> E.var i
-                          | None -> finish)
-                      in
-                      semi f;
-                      P.space f;
-                      pp_direction f direction;
-                      Ext_pp_scope.ident cxt f id))
-            in
-            brace_block cxt f s)
-      in
-      let lexical = Js_closure.get_lexical_scope env in
-      if Set_ident.is_empty lexical then action cxt
-      else
-        (* unlike function,
-           [print for loop] has side effect,
-           we should take it out
-        *)
-        let inner_cxt = Ext_pp_scope.merge cxt lexical in
-        let lexical = Set_ident.elements lexical in
-        P.vgroup f 0 (fun _ ->
-            P.string f L.lparen;
-            P.string f L.function_;
-            pp_paren_params inner_cxt f lexical;
-            let cxt = P.brace_vgroup f 0 (fun _ -> action inner_cxt) in
-            pp_paren_params inner_cxt f lexical;
-            P.string f L.rparen;
-            semi f;
-            cxt)
-  | Continue s ->
-      continue f s;
-      cxt
-  (* P.newline f;  #2642 *)
-  | Debugger ->
-      debugger_nl f;
-      cxt
-  | Break ->
-      break_nl f;
-      cxt
-  | Return e -> (
-      match e.expression_desc with
-      | Fun { is_method; params; body; env; return_unit; async } ->
-          let cxt =
-            pp_function ~return_unit ~is_method ~async cxt f ~fn_state:Is_return
-              params body env
-          in
-          semi f;
-          cxt
-      | Undefined _ ->
-          return_sp f;
-          semi f;
-          cxt
-      | _ ->
-          return_sp f;
-          (* P.string f "return ";(\* ASI -- when there is a comment*\) *)
-          P.group f return_indent (fun _ ->
-              let cxt = expression ~level:0 cxt f e in
-              semi f;
-              cxt)
-          (* There MUST be a space between the return and its
-             argument. A line return will not work *))
-  | Int_switch (e, cc, def) ->
-      P.string f L.switch;
-      P.space f;
-      let cxt = P.paren_group f 1 (fun _ -> expression ~level:0 cxt f e) in
-      P.space f;
-      P.brace_vgroup f 1 (fun _ ->
-          let cxt =
-            loop_case_clauses cxt f (fun f i -> P.string f (string_of_int i)) cc
-          in
-          match def with
-          | None -> cxt
-          | Some def ->
-              P.group f 1 (fun _ ->
-                  P.string f L.default;
-                  P.string f L.colon;
-                  P.newline f;
-                  statements false cxt f def))
-  | String_switch (e, cc, def) ->
-      P.string f L.switch;
-      P.space f;
-      let cxt = P.paren_group f 1 (fun _ -> expression ~level:0 cxt f e) in
-      P.space f;
-      P.brace_vgroup f 1 (fun _ ->
-          let pp_as_value f (tag_type: Ast_untagged_variants.tag_type) =
-            let e = E.tag_type tag_type in
-            ignore @@ expression_desc cxt ~level:0 f e.expression_desc in
-          let cxt = loop_case_clauses cxt f pp_as_value cc in
-          match def with
-          | None -> cxt
-          | Some def ->
-              P.group f 1 (fun _ ->
-                  P.string f L.default;
-                  P.string f L.colon;
-                  P.newline f;
-                  statements false cxt f def))
-  | Throw e ->
-      let e =
-        match e.expression_desc with
-        | Caml_block (el, _, _, ((Blk_extension | Blk_record_ext _) as ext)) ->
-            { e with expression_desc = exn_block_as_obj ~stack:true el ext }
-        | _ -> e
-      in
-      P.string f L.throw;
-      P.space f;
-      P.group f throw_indent (fun _ ->
-          let cxt = expression ~level:0 cxt f e in
-          semi f;
-          cxt)
-  (* There must be a space between the return and its
-     argument. A line return would not work *)
-  | Try (b, ctch, fin) ->
-      P.vgroup f 0 (fun _ ->
-          P.string f L.try_;
-          P.space f;
-          let cxt = brace_block cxt f b in
-          let cxt =
-            match ctch with
-            | None -> cxt
-            | Some (i, b) ->
-                P.newline f;
-                P.string f "catch (";
-                let cxt = Ext_pp_scope.ident cxt f i in
-                P.string f ")";
-                brace_block cxt f b
-          in
-          match fin with
-          | None -> cxt
-          | Some b ->
-              P.group f 1 (fun _ ->
-                  P.string f L.finally;
-                  P.space f;
-                  brace_block cxt f b))
-
-and function_body (cxt : cxt) f ~return_unit (b : J.block) : unit =
-  match b with
-  | [] -> ()
-  | [ s ] -> (
-      match s.statement_desc with
-      | If
-          ( bool,
-            then_,
-            [ { statement_desc = Return { expression_desc = Undefined _ } } ] ) ->
-          ignore
-            (statement false cxt f
-               { s with statement_desc = If (bool, then_, []) }
-              : cxt)
-      | Return { expression_desc = Undefined _ } -> ()
-      | Return exp when return_unit ->
-          ignore (statement false cxt f (S.exp exp) : cxt)
-      | _ -> ignore (statement false cxt f s : cxt))
-  | [ s; { statement_desc = Return { expression_desc = Undefined _ } } ] ->
-      ignore (statement false cxt f s : cxt)
-  | s :: r ->
-      let cxt = statement false cxt f s in
-      P.newline f;
-      function_body cxt f r ~return_unit
-
-and brace_block cxt f b =
-  (* This one is for '{' *)
-  P.brace_vgroup f 1 (fun _ -> statements false cxt f b)
-
-(* main entry point *)
-and statements top cxt f b =
-  iter_lst cxt f b
-    (fun cxt f s -> statement top cxt f s)
-    (if top then P.at_least_two_lines else P.newline)
-
-let string_of_block (block : J.block) =
-  let buffer = Buffer.create 50 in
-  let f = P.from_buffer buffer in
-  let (_ : cxt) = statements true Ext_pp_scope.empty f block in
-  P.flush f ();
-  Buffer.contents buffer
-
-let string_of_expression (e : J.expression) =
-  let buffer = Buffer.create 50 in
-  let f = P.from_buffer buffer in
-  let (_ : cxt) = expression ~level:0 Ext_pp_scope.empty f e in
-  P.flush f ();
-  Buffer.contents buffer
diff --git a/jscomp/core/js_dump.mli b/jscomp/core/js_dump.mli
deleted file mode 100644
index 469a79f..0000000
--- a/jscomp/core/js_dump.mli
+++ /dev/null
@@ -1,31 +0,0 @@
-(* ReScript compiler
- * Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * http://www.ocsigen.org/js_of_ocaml/
- * Copyright (C) 2010 Jérôme Vouillon
- * Laboratoire PPS - CNRS Université Paris Diderot
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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, with linking exception;
- * either version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * 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.
- *)
-(* Authors: Jérôme Vouillon, Hongbo Zhang  *)
-
-val statements : bool -> Ext_pp_scope.t -> Ext_pp.t -> J.block -> Ext_pp_scope.t
-(** Print JS IR to vanilla Javascript code 
-    Called by module {!Js_dump_program}
-*)
-
-val string_of_block : J.block -> string
-(** 2 functions Only used for debugging *)
-
-val string_of_expression : J.expression -> string
diff --git a/jscomp/core/js_dump_import_export.ml b/jscomp/core/js_dump_import_export.ml
deleted file mode 100644
index dcf23ef..0000000
--- a/jscomp/core/js_dump_import_export.ml
+++ /dev/null
@@ -1,180 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module P = Ext_pp
-module L = Js_dump_lit
-
-let default_export = "default"
-
-let esModule = ("__esModule", "true")
-(* Exports printer *)
-
-let rev_iter_inter lst f inter =
-  match lst with
-  | [] -> ()
-  | [ a ] -> f a
-  | a :: rest ->
-      Ext_list.rev_iter rest (fun x ->
-          f x;
-          inter ());
-      f a
-
-(* Print exports in Google module format, CommonJS format *)
-let exports cxt f (idents : Ident.t list) =
-  let outer_cxt, reversed_list =
-    Ext_list.fold_left idents (cxt, []) (fun (cxt, acc) id ->
-        let id_name = id.name in
-        let s = Ext_ident.convert id_name in
-        let str, cxt = Ext_pp_scope.str_of_ident cxt id in
-        ( cxt,
-          if id_name = default_export then
-            (* TODO check how it will affect AMDJS*)
-            esModule :: (default_export, str) :: acc
-          else (s, str) :: acc ))
-  in
-  P.at_least_two_lines f;
-  rev_iter_inter reversed_list
-    (fun (s, export) ->
-      P.group f 0 (fun _ ->
-          P.string f L.exports;
-          P.string f L.dot;
-          P.string f s;
-          P.space f;
-          P.string f L.eq;
-          P.space f;
-          P.string f export;
-          P.string f L.semi))
-    (fun _ -> P.newline f);
-  outer_cxt
-
-(** Print module in ES6 format, it is ES6, trailing comma is valid ES6 code *)
-let es6_export cxt f (idents : Ident.t list) =
-  let outer_cxt, reversed_list =
-    Ext_list.fold_left idents (cxt, []) (fun (cxt, acc) id ->
-        let id_name = id.name in
-        let s = Ext_ident.convert id_name in
-        let str, cxt = Ext_pp_scope.str_of_ident cxt id in
-        ( cxt,
-          if id_name = default_export then
-            (default_export, str) :: acc
-          else (s, str) :: acc ))
-  in
-  P.at_least_two_lines f;
-  P.string f L.export;
-  P.space f;
-  P.brace_vgroup f 1 (fun _ ->
-      rev_iter_inter reversed_list
-        (fun (s, export) ->
-          P.group f 0 (fun _ ->
-              P.string f export;
-              P.space f;
-              if not @@ Ext_string.equal export s then (
-                P.string f L.as_;
-                P.space f;
-                P.string f s);
-              P.string f L.comma))
-        (fun _ -> P.newline f));
-  outer_cxt
-
-(** Node or Google module style imports *)
-let requires require_lit cxt f (modules : (Ident.t * string * bool) list) =
-  (* the context used to print the following program *)
-  let outer_cxt, reversed_list =
-    Ext_list.fold_left modules (cxt, []) (fun (cxt, acc) (id, s, b) ->
-        let str, cxt = Ext_pp_scope.str_of_ident cxt id in
-        (cxt, (str, s, b) :: acc))
-  in
-  P.at_least_two_lines f;
-  Ext_list.rev_iter reversed_list (fun (s, file, default) ->
-      P.string f L.var;
-      P.space f;
-      P.string f s;
-      P.space f;
-      P.string f L.eq;
-      P.space f;
-      P.string f require_lit;
-      P.paren_group f 0 (fun _ -> Js_dump_string.pp_string f file);
-      if default then P.string f ".default";
-      P.string f L.semi;
-      P.newline f);
-  outer_cxt
-
-let dumpImportAttributes f (importAttributes : External_ffi_types.import_attributes option) = 
-  match importAttributes with 
-  | None -> () 
-  | Some importAttributes -> 
-    P.space f;
-    P.string f "with";
-    P.space f;
-    let total = Hashtbl.length importAttributes in
-    let idx = ref 1 in
-    P.brace_group f 0 (
-      fun _ -> 
-        importAttributes |> Hashtbl.iter(fun key value ->
-          Js_dump_string.pp_string f key;
-          P.string f L.colon_space;
-          Js_dump_string.pp_string f value;
-          let shouldAddComma = !idx < total in
-          if shouldAddComma then (
-            P.string f L.comma;
-            P.space f
-          );
-          idx := !idx + 1;
-        )
-    )
-
-(** ES6 module style imports *)
-let imports cxt f (modules : (Ident.t * string * bool * External_ffi_types.import_attributes option) list) =
-  (* the context used to print the following program *)
-  let outer_cxt, reversed_list =
-    Ext_list.fold_left modules (cxt, []) (fun (cxt, acc) (id, s, b, i) ->
-        let str, cxt = Ext_pp_scope.str_of_ident cxt id in
-        (cxt, (str, s, b, i) :: acc))
-  in
-  P.at_least_two_lines f;
-  Ext_list.rev_iter reversed_list (fun (s, file, default, import_attributes) ->
-      P.string f L.import;
-      P.space f;
-      if default then (
-        P.string f s;
-        P.space f;
-        P.string f L.from;
-        P.space f;
-        Js_dump_string.pp_string f file;
-        dumpImportAttributes f import_attributes)
-      else (
-        P.string f L.star;
-        P.space f;
-        (* import * as xx from 'xx'*)
-        P.string f L.as_;
-        P.space f;
-        P.string f s;
-        P.space f;
-        P.string f L.from;
-        P.space f;
-        Js_dump_string.pp_string f file;
-        dumpImportAttributes f import_attributes);
-      P.string f L.semi;
-      P.newline f);
-  outer_cxt
diff --git a/jscomp/core/js_dump_import_export.mli b/jscomp/core/js_dump_import_export.mli
deleted file mode 100644
index 4d03a46..0000000
--- a/jscomp/core/js_dump_import_export.mli
+++ /dev/null
@@ -1,39 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val default_export : string
-
-val exports : Ext_pp_scope.t -> Ext_pp.t -> Ident.t list -> Ext_pp_scope.t
-
-val es6_export : Ext_pp_scope.t -> Ext_pp.t -> Ident.t list -> Ext_pp_scope.t
-
-val requires :
-  string ->
-  Ext_pp_scope.t ->
-  Ext_pp.t ->
-  (Ident.t * string * bool) list ->
-  Ext_pp_scope.t
-
-val imports :
-  Ext_pp_scope.t -> Ext_pp.t -> (Ident.t * string * bool * External_ffi_types.import_attributes option) list -> Ext_pp_scope.t
diff --git a/jscomp/core/js_dump_lit.ml b/jscomp/core/js_dump_lit.ml
deleted file mode 100644
index fbbe643..0000000
--- a/jscomp/core/js_dump_lit.ml
+++ /dev/null
@@ -1,166 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-
-let await = "await"
-
-let function_ = "function"
-
-let function_async ~async = if async then "async function" else "function"
-
-let var = "var" (* should be able to switch to [let] easily*)
-
-let return = "return"
-
-(* let eq = "=" *)
-let require = "require"
-
-let import = "import"
-
-let from = "from"
-
-let as_ = "as"
-
-let export = "export"
-
-let star = "*"
-
-let lparen = "("
-
-let rparen = ")"
-
-let exports = "exports"
-
-let dot = "."
-
-let comma = ","
-
-let colon = Ext_string.single_colon
-
-let colon_space = ": "
-
-let throw = "throw"
-
-let default = "default"
-
-let length = "length"
-
-let codePointAt = "codePointAt"
-
-let new_ = "new"
-
-let array = "Array"
-
-let question = "?"
-
-let plusplus = "++"
-
-let minusminus = "--"
-
-let semi = ";"
-
-let else_ = "else"
-
-let if_ = "if"
-
-let for_ = "for"
-
-let try_ = "try"
-
-let finally = "finally"
-
-let this = "this"
-
-let while_ = "while"
-
-let empty_block = "empty_block"
-
-let start_block = "start_block"
-
-let end_block = "end_block"
-
-let json = "JSON"
-
-let stringify = "stringify"
-
-let console = "console"
-
-let define = "define"
-
-let break = "break"
-
-let continue = "continue"
-
-let switch = "switch"
-
-let strict_directive = "'use strict';"
-
-let true_ = "true"
-
-let false_ = "false"
-
-let debugger = "debugger"
-
-let tag = "TAG"
-
-let bind = "bind"
-
-let math = "Math"
-
-let apply = "apply"
-
-let null = "null"
-
-let undefined = "undefined"
-
-let string_cap = "String"
-
-let fromCharcode = "fromCharCode"
-
-let eq = "="
-
-let le = "<="
-
-let lt = "<"
-
-let ge = ">="
-
-let gt = ">"
-
-let plus_plus = "++"
-
-(*  FIXME: use (i = i + 1 | 0) instead  *)
-let minus_minus = "--"
-
-let caml_block_create = "__"
-
-(** debug symbols *)
-
-let block_poly_var = "polyVar"
-
-let block_variant = "variant"
-
-let block_simple_variant = "simpleVariant"
-
-let case = "case"
diff --git a/jscomp/core/js_dump_program.ml b/jscomp/core/js_dump_program.ml
deleted file mode 100644
index ce80e21..0000000
--- a/jscomp/core/js_dump_program.ml
+++ /dev/null
@@ -1,143 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module P = Ext_pp
-module L = Js_dump_lit
-
-let empty_explanation =
-  "/* This output is empty. Its source's type definitions, externals and/or \
-   unused code got optimized away. */\n"
-
-let program_is_empty (x : J.program) =
-  match x with
-  | { block = []; exports = []; export_set = _ } -> true
-  | _ -> false
-
-let deps_program_is_empty (x : J.deps_program) =
-  match x with
-  | { modules = []; program; side_effect = None } -> program_is_empty program
-  | _ -> false
-
-let rec extract_block_comments acc (x : J.block) =
-  match x with
-  | {
-      statement_desc =
-        Exp
-          {
-            expression_desc =
-              Raw_js_code { code; code_info = Stmt Js_stmt_comment };
-          };
-    }
-    :: rest ->
-      extract_block_comments (code :: acc) rest
-  | _ -> (acc, x)
-
-let extract_file_comments (x : J.deps_program) =
-  let comments, new_block = extract_block_comments [] x.program.block in
-  (comments, { x with program = { x.program with block = new_block } })
-
-let program f cxt (x : J.program) =
-  P.at_least_two_lines f;
-  let cxt = Js_dump.statements true cxt f x.block in
-  Js_dump_import_export.exports cxt f x.exports
-
-let dump_program (x : J.program) oc =
-  ignore (program (P.from_channel oc) Ext_pp_scope.empty x)
-
-let[@inline] is_default (x : Js_op.kind) =
-  match x with External { default } -> default | _ -> false
-
-let node_program ~output_dir f (x : J.deps_program) =
-  P.string f L.strict_directive;
-  P.newline f;
-  let cxt =
-    Js_dump_import_export.requires L.require Ext_pp_scope.empty f
-      (* Not be emitted in require statements *)
-      (Ext_list.filter_map x.modules (fun x ->
-        match x.dynamic_import with
-        | true -> None
-        | false -> 
-           Some ( x.id,
-             Js_name_of_module_id.string_of_module_id x ~output_dir Commonjs,
-             is_default x.kind )))
-  in
-  program f cxt x.program
-
-let es6_program ~output_dir fmt f (x : J.deps_program) =
-  let cxt =
-    Js_dump_import_export.imports Ext_pp_scope.empty f
-      (* Not be emitted in import statements *)
-      (Ext_list.filter_map x.modules (fun x ->
-        match x.dynamic_import with
-        | true -> None
-        | false -> 
-           Some ( x.id,
-             Js_name_of_module_id.string_of_module_id x ~output_dir fmt,
-             is_default x.kind,
-             (match x.kind with | External {import_attributes} -> import_attributes | _ -> None) )))
-  in
-  let () = P.at_least_two_lines f in
-  let cxt = Js_dump.statements true cxt f x.program.block in
-  Js_dump_import_export.es6_export cxt f x.program.exports
-
-(** Make sure github linguist happy
-    {[
-      require('Linguist')
-        Linguist::FileBlob.new('jscomp/test/test_u.js').generated?
-    ]}
-*)
-
-let pp_deps_program ~(output_prefix : string)
-    (kind : Js_packages_info.module_system) (program : J.deps_program)
-    (f : Ext_pp.t) =
-
-  !Js_config.directives |> List.iter (fun prim ->
-    P.string f prim;
-    P.newline f);
-  if not !Js_config.no_version_header then (
-    P.string f Bs_version.header;
-    P.newline f);
-
-  if deps_program_is_empty program then P.string f empty_explanation
-    (* This is empty module, it won't be referred anywhere *)
-  else
-    let comments, program = extract_file_comments program in
-    Ext_list.rev_iter comments (fun comment ->
-        P.string f comment;
-        P.newline f);
-    let output_dir = Filename.dirname output_prefix in
-    ignore
-      (match kind with
-      | Esmodule | Es6_global -> es6_program ~output_dir kind f program
-      | Commonjs -> node_program ~output_dir f program);
-    P.newline f;
-    P.string f
-      (match program.side_effect with
-      | None -> "/* No side effect */"
-      | Some v -> Printf.sprintf "/* %s Not a pure module */" v);
-    P.newline f;
-    P.flush f ()
-
-let dump_deps_program ~output_prefix kind x (oc : out_channel) =
-  pp_deps_program ~output_prefix kind x (P.from_channel oc)
diff --git a/jscomp/core/js_dump_program.mli b/jscomp/core/js_dump_program.mli
deleted file mode 100644
index c1723f0..0000000
--- a/jscomp/core/js_dump_program.mli
+++ /dev/null
@@ -1,40 +0,0 @@
-(* Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val dump_program : J.program -> out_channel -> unit
-(** only used for debugging purpose *)
-
-val pp_deps_program :
-  output_prefix:string ->
-  Js_packages_info.module_system ->
-  J.deps_program ->
-  Ext_pp.t ->
-  unit
-
-val dump_deps_program :
-  output_prefix:string ->
-  Js_packages_info.module_system ->
-  J.deps_program ->
-  out_channel ->
-  unit
diff --git a/jscomp/core/js_dump_property.ml b/jscomp/core/js_dump_property.ml
deleted file mode 100644
index ea1d4bf..0000000
--- a/jscomp/core/js_dump_property.ml
+++ /dev/null
@@ -1,89 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module P = Ext_pp
-module L = Js_dump_lit
-
-(**
-   https://stackoverflow.com/questions/9367572/rules-for-unquoted-javascript-object-literal-keys
-   https://mathiasbynens.be/notes/javascript-properties
-   https://mathiasbynens.be/notes/javascript-identifiers
-
-   Let's not do smart things
-   {[
-     { 003 : 1} 
-   ]}
-   becomes 
-   {[
-     { 3 : 1}
-   ]}
-*)
-
-(** used in printing keys 
-    {[
-      {"x" : x};;
-      {x : x }
-        {"50x" : 2 } GPR #1943
-]}
-    Note we can not treat it in the same way when printing
-    [x.id] vs [{id : xx}]
-    for example, id can be number in object literal
-*)
-let obj_property_no_need_quot s =
-  let len = String.length s in
-  if len > 0 then
-    match String.unsafe_get s 0 with
-    | '$' | '_' | 'a' .. 'z' | 'A' .. 'Z' ->
-        Ext_string.for_all_from s 1 (function
-          | 'a' .. 'z' | 'A' .. 'Z' | '$' | '_' | '0' .. '9' -> true
-          | _ -> false)
-    | _ -> false
-  else false
-
-(** used in property access 
-    {[
-      f.x ;;
-      f["x"];;
-    ]}
-*)
-let property_access f s =
-  if obj_property_no_need_quot s then (
-    P.string f L.dot;
-    P.string f s)
-  else
-    P.bracket_group f 1 (fun _ ->
-        (* avoid cases like
-           "0123", "123_456"
-        *)
-        match string_of_int (int_of_string s) with
-        | s0 when s0 = s -> P.string f s
-        | _ -> Js_dump_string.pp_string f s
-        | exception _ -> Js_dump_string.pp_string f s)
-
-let property_key (s : J.property_name) : string =
-  match s with
-  | Lit s ->
-      if obj_property_no_need_quot s then s
-      else Js_dump_string.escape_to_string s
-  | Symbol_name -> {|[Symbol.for("name")]|}
diff --git a/jscomp/core/js_dump_property.mli b/jscomp/core/js_dump_property.mli
deleted file mode 100644
index 2e675b1..0000000
--- a/jscomp/core/js_dump_property.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val property_access : Ext_pp.t -> string -> unit
-
-val property_key : J.property_name -> string
diff --git a/jscomp/core/js_dump_string.ml b/jscomp/core/js_dump_string.ml
deleted file mode 100644
index 11b8d25..0000000
--- a/jscomp/core/js_dump_string.ml
+++ /dev/null
@@ -1,116 +0,0 @@
-(* Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module P = Ext_pp
-
-(** Avoid to allocate single char string too many times*)
-let array_str1 = Array.init 256 (fun i -> String.make 1 (Char.chr i))
-
-(** For conveting 
-
-*)
-let array_conv =
-  [|
-    "0";
-    "1";
-    "2";
-    "3";
-    "4";
-    "5";
-    "6";
-    "7";
-    "8";
-    "9";
-    "a";
-    "b";
-    "c";
-    "d";
-    "e";
-    "f";
-  |]
-
-(* https://mathiasbynens.be/notes/javascript-escapes *)
-let ( +> ) = Ext_buffer.add_string
-
-let escape_to_buffer f (* ?(utf=false)*) s =
-  let pp_raw_string f (* ?(utf=false)*) s =
-    let l = String.length s in
-    for i = 0 to l - 1 do
-      let c = String.unsafe_get s i in
-      match c with
-      | '\b' -> f +> "\\b"
-      | '\012' -> f +> "\\f"
-      | '\n' -> f +> "\\n"
-      | '\r' -> f +> "\\r"
-      | '\t' -> f +> "\\t"
-      (* This escape sequence is not supported by IE < 9
-               | '\011' -> "\\v"
-         IE < 9 treats '\v' as 'v' instead of a vertical tab ('\x0B').
-         If cross-browser compatibility is a concern, use \x0B instead of \v.
-
-         Another thing to note is that the \v and \0 escapes are not allowed in JSON strings.
-      *)
-      | '\000'
-        when i = l - 1
-             ||
-             let next = String.unsafe_get s (i + 1) in
-             next < '0' || next > '9' ->
-          f +> "\\0"
-      | '\\' (* when not utf*) -> f +> "\\\\"
-      | '\000' .. '\031' | '\127' ->
-          let c = Char.code c in
-          f +> "\\x";
-          f +> Array.unsafe_get array_conv (c lsr 4);
-          f +> Array.unsafe_get array_conv (c land 0xf)
-      | '\128' .. '\255' (* when not utf*) ->
-          let c = Char.code c in
-          f +> "\\x";
-          f +> Array.unsafe_get array_conv (c lsr 4);
-          f +> Array.unsafe_get array_conv (c land 0xf)
-      | '\"' -> f +> "\\\"" (* quote*)
-      | _ -> f +> Array.unsafe_get array_str1 (Char.code c)
-    done
-  in
-  f +> "\"";
-  pp_raw_string f (*~utf*) s;
-  f +> "\""
-
-let escape_to_string s =
-  let buf = Ext_buffer.create (String.length s * 2) in
-  escape_to_buffer buf s;
-  Ext_buffer.contents buf
-
-let pp_string f s = P.string f (escape_to_string s)
-(* let _best_string_quote s =
-   let simple = ref 0 in
-   let double = ref 0 in
-   for i = 0 to String.length s - 1 do
-    match s.[i] with
-    | '\'' -> incr simple
-    | '"' -> incr double
-    | _ -> ()
-   done;
-   if !simple < !double
-   then '\''
-   else '"' *)
diff --git a/jscomp/core/js_dump_string.mli b/jscomp/core/js_dump_string.mli
deleted file mode 100644
index ee85147..0000000
--- a/jscomp/core/js_dump_string.mli
+++ /dev/null
@@ -1,30 +0,0 @@
-(* Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Make sure the escaped string conforms to
-   JS lexing convention
-*)
-val escape_to_string : string -> string
-
-val pp_string : Ext_pp.t -> string -> unit
diff --git a/jscomp/core/js_exp_make.ml b/jscomp/core/js_exp_make.ml
deleted file mode 100644
index e462d6b..0000000
--- a/jscomp/core/js_exp_make.ml
+++ /dev/null
@@ -1,1354 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let no_side_effect = Js_analyzer.no_side_effect_expression
-
-type t = J.expression
-
-(*
-  [remove_pure_sub_exp x]
-  Remove pure part of the expression (minor optimization)
-  and keep the non-pure part while preserve the semantics 
-  (modulo return value)
-  It will return None if  [x] is pure
- *)
-let rec remove_pure_sub_exp (x : t) : t option =
-  match x.expression_desc with
-  | Var _ | Str _ | Number _ -> None (* Can be refined later *)
-  | Array_index (a, b) ->
-      if is_pure_sub_exp a && is_pure_sub_exp b then None else Some x
-  | Array (xs, _mutable_flag) ->
-      if Ext_list.for_all xs is_pure_sub_exp then None else Some x
-  | Seq (a, b) -> (
-      match (remove_pure_sub_exp a, remove_pure_sub_exp b) with
-      | None, None -> None
-      | Some u, Some v -> Some { x with expression_desc = Seq (u, v) }
-      (* may still have some simplification*)
-      | None, (Some _ as v) -> v
-      | (Some _ as u), None -> u)
-  | _ -> Some x
-
-and is_pure_sub_exp (x : t) = remove_pure_sub_exp x = None
-
-(* let mk ?comment exp : t =
-   {expression_desc = exp ; comment  } *)
-
-let var ?comment id : t = { expression_desc = Var (Id id); comment }
-
-(* only used in property access,
-    Invariant: it should not call an external module .. *)
-
-let js_global ?comment (v : string) = var ?comment (Ext_ident.create_js v)
-let undefined : t = { expression_desc = Undefined {isUnit = false}; comment = None }
-let nil : t = { expression_desc = Null; comment = None }
-
-let call ?comment ~info e0 args : t =
-  { expression_desc = Call (e0, args, info); comment }
-
-(* TODO: optimization when es is known at compile time
-    to be an array
-*)
-let flat_call ?comment e0 es : t =
-  { expression_desc = FlatCall (e0, es); comment }
-
-let tagged_template ?comment callExpr stringArgs valueArgs : t =
-  { expression_desc = Tagged_template (callExpr, stringArgs, valueArgs); comment }
-
-let runtime_var_dot ?comment (x : string) (e1 : string) : J.expression =
-  {
-    expression_desc =
-      Var
-        (Qualified ({ id = Ident.create_persistent x; kind = Runtime; dynamic_import = false }, Some e1));
-    comment;
-  }
-
-let ml_var_dot ?comment ?(dynamic_import = false) (id : Ident.t) e : J.expression =
-  { expression_desc = Var (Qualified ({ id; kind = Ml; dynamic_import }, Some e)); comment }
-
-(** 
-   module as a value 
-   {[
-     var http = require("http")
-   ]}
-*)
-let external_var_field ?import_attributes ?comment ~external_name:name (id : Ident.t) ~field
-    ~default : t =
-  {
-    expression_desc =
-      Var (Qualified ({ id; kind = External { name; default; import_attributes }; dynamic_import = false }, Some field));
-    comment;
-  }
-
-let external_var ?import_attributes ?comment ~external_name (id : Ident.t) : t =
-  {
-    expression_desc =
-      Var
-        (Qualified
-           ( { id; kind = External { name = external_name; default = false; import_attributes }; dynamic_import = false },
-             None ));
-    comment;
-  }
-
-let ml_module_as_var ?comment ?(dynamic_import = false) (id : Ident.t) : t =
-  { expression_desc = Var (Qualified ({ id; kind = Ml; dynamic_import }, None)); comment }
-
-(* Static_index .....................**)
-let runtime_call module_name fn_name args =
-  call ~info:Js_call_info.builtin_runtime_call
-    (runtime_var_dot module_name fn_name)
-    args
-
-let pure_runtime_call module_name fn_name args =
-  call ~comment:Literals.pure ~info:Js_call_info.builtin_runtime_call
-    (runtime_var_dot module_name fn_name)
-    args
-
-let runtime_ref module_name fn_name = runtime_var_dot module_name fn_name
-
-let str ?(delim = J.DNone) ?comment txt : t =
-  { expression_desc = Str { txt; delim }; comment }
-
-let raw_js_code ?comment info s : t =
-  {
-    expression_desc = Raw_js_code { code = String.trim s; code_info = info };
-    comment;
-  }
-
-let array ?comment mt es : t = { expression_desc = Array (es, mt); comment }
-let some_comment = None
-
-let optional_block e : J.expression =
-  { expression_desc = Optional_block (e, false); comment = some_comment }
-
-let optional_not_nest_block e : J.expression =
-  { expression_desc = Optional_block (e, true); comment = None }
-
-(** used in normal property
-    like [e.length], no dependency introduced
-*)
-let dot ?comment (e0 : t) (e1 : string) : t =
-  { expression_desc = Static_index (e0, e1, None); comment }
-
-let module_access (e : t) (name : string) (pos : int32) =
-  let name = Ext_ident.convert name in
-  match e.expression_desc with
-  | Caml_block (l, _, _, _) when no_side_effect e -> (
-      match Ext_list.nth_opt l (Int32.to_int pos) with
-      | Some x -> x
-      | None ->
-          { expression_desc = Static_index (e, name, Some pos); comment = None }
-      )
-  | _ -> { expression_desc = Static_index (e, name, Some pos); comment = None }
-
-let make_block ?comment (tag : t) (tag_info : J.tag_info) (es : t list)
-    (mutable_flag : J.mutable_flag) : t =
-  { expression_desc = Caml_block (es, mutable_flag, tag, tag_info); comment }
-
-module L = Literals
-
-(* ATTENTION: this is relevant to how we encode string, boolean *)
-let typeof ?comment (e : t) : t =
-  match e.expression_desc with
-  | Number _ | Length _ -> str ?comment L.js_type_number
-  | Str _ -> str ?comment L.js_type_string
-  | Array _ -> str ?comment L.js_type_object
-  | Bool _ -> str ?comment L.js_type_boolean
-  | _ -> { expression_desc = Typeof e; comment }
-
-let instanceof ?comment (e0 : t) (e1: t) : t =
-  { expression_desc = Bin (InstanceOf, e0, e1); comment }
-
-let is_array  (e0 : t) : t =
-  let f = str "Array.isArray" ~delim:DNoQuotes in
-  { expression_desc = Call (f, [e0], Js_call_info.ml_full_call); comment=None }
-  
-let new_ ?comment e0 args : t =
-  { expression_desc = New (e0, Some args); comment }
-
-let unit : t = { expression_desc = Undefined {isUnit = true}; comment = None }
-
-(* let math ?comment v args  : t =
-   {comment ; expression_desc = Math(v,args)} *)
-
-(* we can do constant folding here, but need to make sure the result is consistent
-   {[
-     let f x = string_of_int x
-     ;; f 3
-   ]}
-   {[
-     string_of_int 3
-   ]}
-   Used in [string_of_int] and format "%d"
-   TODO: optimize
-*)
-
-(* Attention: Shared *mutable state* is evil,
-   [Js_fun_env.empty] is a mutable state ..
-*)
-
-let ocaml_fun ?comment ?immutable_mask ~return_unit ~async ~oneUnitArg params body : t =
-  let params = if oneUnitArg then [] else params in
-  let len = List.length params in
-  {
-    expression_desc =
-      Fun
-        {
-          is_method = false;
-          params;
-          body;
-          env = Js_fun_env.make ?immutable_mask len;
-          return_unit;
-          async;
-        };
-    comment;
-  }
-
-let method_ ?comment ?immutable_mask ~return_unit params body : t =
-  let len = List.length params in
-  {
-    expression_desc =
-      Fun
-        {
-          is_method = true;
-          params;
-          body;
-          env = Js_fun_env.make ?immutable_mask len;
-          return_unit;
-          async = false;
-        };
-    comment;
-  }
-
-(** ATTENTION: This is coupuled with {!Caml_obj.caml_update_dummy} *)
-let dummy_obj ?comment (info : Lam_tag_info.t) : t =
-  (* TODO:
-     for record it is [{}]
-     for other it is [[]]
-  *)
-  match info with
-  | Blk_record _ | Blk_module _ | Blk_constructor _ | Blk_record_inlined _
-  | Blk_poly_var _ | Blk_extension | Blk_record_ext _ ->
-      { comment; expression_desc = Object [] }
-  | Blk_tuple | Blk_module_export _ ->
-      { comment; expression_desc = Array ([], Mutable) }
-  | Blk_some | Blk_some_not_nested | Blk_lazy_general -> assert false
-
-(* TODO: complete
-    pure ...
-*)
-let rec seq ?comment (e0 : t) (e1 : t) : t =
-  match (e0.expression_desc, e1.expression_desc) with
-  | ( ( Seq (a, { expression_desc = Number _ | Undefined _ })
-      | Seq ({ expression_desc = Number _ | Undefined _ }, a) ),
-      _ ) ->
-      seq ?comment a e1
-  | _, Seq ({ expression_desc = Number _ | Undefined _ }, a) ->
-      (* Return value could not be changed*)
-      seq ?comment e0 a
-  | _, Seq (a, ({ expression_desc = Number _ | Undefined _ } as v)) ->
-      (* Return value could not be changed*)
-      seq ?comment (seq e0 a) v
-  | (Number _ | Var _ | Undefined _), _ -> e1
-  | _ -> { expression_desc = Seq (e0, e1); comment }
-
-let fuse_to_seq x xs = if xs = [] then x else Ext_list.fold_left xs x seq
-
-(* let empty_string_literal : t =
-   {expression_desc = Str (true,""); comment = None} *)
-
-let zero_int_literal : t =
-  { expression_desc = Number (Int { i = 0l; c = None }); comment = None }
-
-let one_int_literal : t =
-  { expression_desc = Number (Int { i = 1l; c = None }); comment = None }
-
-let two_int_literal : t =
-  { expression_desc = Number (Int { i = 2l; c = None }); comment = None }
-
-let three_int_literal : t =
-  { expression_desc = Number (Int { i = 3l; c = None }); comment = None }
-
-let four_int_literal : t =
-  { expression_desc = Number (Int { i = 4l; c = None }); comment = None }
-
-let five_int_literal : t =
-  { expression_desc = Number (Int { i = 5l; c = None }); comment = None }
-
-let six_int_literal : t =
-  { expression_desc = Number (Int { i = 6l; c = None }); comment = None }
-
-let seven_int_literal : t =
-  { expression_desc = Number (Int { i = 7l; c = None }); comment = None }
-
-let eight_int_literal : t =
-  { expression_desc = Number (Int { i = 8l; c = None }); comment = None }
-
-let nine_int_literal : t =
-  { expression_desc = Number (Int { i = 9l; c = None }); comment = None }
-
-let obj_int_tag_literal : t =
-  { expression_desc = Number (Int { i = 248l; c = None }); comment = None }
-
-let int ?comment ?c i : t = { expression_desc = Number (Int { i; c }); comment }
-
-let bigint ?comment sign i : t = { expression_desc = Number (BigInt {positive=sign; value=i}); comment}
-
-let zero_bigint_literal : t = {expression_desc = Number (BigInt {positive=true; value="0"}); comment = None}
-
-let small_int i : t =
-  match i with
-  | 0 -> zero_int_literal
-  | 1 -> one_int_literal
-  | 2 -> two_int_literal
-  | 3 -> three_int_literal
-  | 4 -> four_int_literal
-  | 5 -> five_int_literal
-  | 6 -> six_int_literal
-  | 7 -> seven_int_literal
-  | 8 -> eight_int_literal
-  | 9 -> nine_int_literal
-  | 248 -> obj_int_tag_literal
-  | i -> int (Int32.of_int i)
-
-let true_ : t = { comment = None; expression_desc = Bool true }
-let false_ : t = { comment = None; expression_desc = Bool false }
-let bool v = if v then true_ else false_
-
-let float ?comment f : t = { expression_desc = Number (Float { f }); comment }
-
-let zero_float_lit : t =
-  { expression_desc = Number (Float { f = "0." }); comment = None }
-
-let float_mod ?comment e1 e2 : J.expression =
-  { comment; expression_desc = Bin (Mod, e1, e2) }
-
-let array_index ?comment (e0 : t) (e1 : t) : t =
-  match (e0.expression_desc, e1.expression_desc) with
-  | Array (l, _), Number (Int { i; _ })
-  (* Float i -- should not appear here *)
-    when no_side_effect e0 -> (
-      match Ext_list.nth_opt l (Int32.to_int i) with
-      | None -> { expression_desc = Array_index (e0, e1); comment }
-      | Some x -> x (* FIX #3084*))
-  | _ -> { expression_desc = Array_index (e0, e1); comment }
-
-let array_index_by_int ?comment (e : t) (pos : int32) : t =
-  match e.expression_desc with
-  | Array (l, _) (* Float i -- should not appear here *)
-  | Caml_block (l, _, _, _)
-    when no_side_effect e -> (
-      match Ext_list.nth_opt l (Int32.to_int pos) with
-      | Some x -> x
-      | None ->
-          {
-            expression_desc = Array_index (e, int ?comment pos);
-            comment = None;
-          })
-  | _ -> { expression_desc = Array_index (e, int ?comment pos); comment = None }
-
-let record_access (e : t) (name : string) (pos : int32) =
-  (* let name = Ext_ident.convert name in  *)
-  match e.expression_desc with
-  | Array (l, _) (* Float i -- should not appear here *)
-  | Caml_block (l, _, _, _)
-    when no_side_effect e -> (
-      match Ext_list.nth_opt l (Int32.to_int pos) with
-      | Some x -> x
-      | None ->
-          { expression_desc = Static_index (e, name, Some pos); comment = None }
-      )
-  | _ -> { expression_desc = Static_index (e, name, Some pos); comment = None }
-
-(* The same as {!record_access} except tag*)
-let inline_record_access = record_access
-
-let variant_access (e : t) (pos : int32) =
-  inline_record_access e ("_" ^ Int32.to_string pos) pos
-
-let cons_access (e : t) (pos : int32) =
-  inline_record_access e
-    (match pos with
-    | 0l -> Literals.hd
-    | 1l -> Literals.tl
-    | _ -> "_" ^ Int32.to_string pos)
-    pos
-
-let poly_var_tag_access (e : t) =
-  match e.expression_desc with
-  | Caml_block (l, _, _, _) when no_side_effect e -> (
-      match l with x :: _ -> x | [] -> assert false)
-  | _ ->
-      {
-        expression_desc = Static_index (e, Literals.polyvar_hash, Some 0l);
-        comment = None;
-      }
-
-let poly_var_value_access (e : t) =
-  match e.expression_desc with
-  | Caml_block (l, _, _, _) when no_side_effect e -> (
-      match l with _ :: v :: _ -> v | _ -> assert false)
-  | _ ->
-      {
-        expression_desc = Static_index (e, Literals.polyvar_value, Some 1l);
-        comment = None;
-      }
-
-let extension_access (e : t) name (pos : int32) : t =
-  match e.expression_desc with
-  | Array (l, _) (* Float i -- should not appear here *)
-  | Caml_block (l, _, _, _)
-    when no_side_effect e -> (
-      match Ext_list.nth_opt l (Int32.to_int pos) with
-      | Some x -> x
-      | None ->
-          let name =
-            match name with Some n -> n | None -> "_" ^ Int32.to_string pos
-          in
-          { expression_desc = Static_index (e, name, Some pos); comment = None }
-      )
-  | _ ->
-      let name =
-        match name with Some n -> n | None -> "_" ^ Int32.to_string pos
-      in
-      { expression_desc = Static_index (e, name, Some pos); comment = None }
-
-let string_index ?comment (e0 : t) (e1 : t) : t =
-  match (e0.expression_desc, e1.expression_desc) with
-  | Str { txt }, Number (Int { i; _ }) ->
-      (* Don't optimize {j||j} *)
-      let i = Int32.to_int i in
-      if i >= 0 && i < String.length txt then
-        (* TODO: check exception when i is out of range..
-           RangeError?
-        *)
-        str (String.make 1 txt.[i])
-      else { expression_desc = String_index (e0, e1); comment }
-  | _ -> { expression_desc = String_index (e0, e1); comment }
-
-let assign ?comment e0 e1 : t = { expression_desc = Bin (Eq, e0, e1); comment }
-
-let assign_by_exp (e : t) index value : t =
-  match e.expression_desc with
-  | Array _
-  (*
-     Temporary block -- address not held
-     Optimize cases like this which is really 
-     rare {[
-                  (ref x) :=  3
-                ]}
-             *)
-  | Caml_block _
-    when no_side_effect e && no_side_effect index ->
-      value
-  | _ ->
-      assign { expression_desc = Array_index (e, index); comment = None } value
-
-let assign_by_int ?comment e0 (index : int32) value =
-  assign_by_exp e0 (int ?comment index) value
-
-let record_assign (e : t) (pos : int32) (name : string) (value : t) =
-  match e.expression_desc with
-  | Array _
-  (*
-     Temporary block -- address not held
-     Optimize cases like this which is really 
-     rare {[
-                  (ref x) :=  3
-                ]}
-             *)
-  | Caml_block _
-    when no_side_effect e ->
-      value
-  | _ ->
-      assign
-        { expression_desc = Static_index (e, name, Some pos); comment = None }
-        value
-
-let extension_assign (e : t) (pos : int32) name (value : t) =
-  match e.expression_desc with
-  | Array _
-  (*
-           Temporary block -- address not held
-           Optimize cases like this which is really 
-           rare {[
-                  (ref x) :=  3
-                ]}
-             *)
-  | Caml_block _
-    when no_side_effect e ->
-      value
-  | _ ->
-      assign
-        { expression_desc = Static_index (e, name, Some pos); comment = None }
-        value
-
-(* This is a property access not external module *)
-
-let array_length ?comment (e : t) : t =
-  match e.expression_desc with
-  (* TODO: use array instead? *)
-  | (Array (l, _) | Caml_block (l, _, _, _)) when no_side_effect e ->
-      int ?comment (Int32.of_int (List.length l))
-  | _ -> { expression_desc = Length (e, Array); comment }
-
-let string_length ?comment (e : t) : t =
-  match e.expression_desc with
-  | Str { txt; delim = DNone } -> int ?comment (Int32.of_int (String.length txt))
-  (* No optimization for {j||j}*)
-  | _ -> { expression_desc = Length (e, String); comment }
-
-(* TODO: use [Buffer] instead? *)
-let bytes_length ?comment (e : t) : t =
-  match e.expression_desc with
-  | Array (l, _) -> int ?comment (Int32.of_int (List.length l))
-  | _ -> { expression_desc = Length (e, Bytes); comment }
-
-let function_length ?comment (e : t) : t =
-  match e.expression_desc with
-  | Fun { is_method; params } ->
-      let params_length = List.length params in
-      int ?comment
-        (Int32.of_int (if is_method then params_length - 1 else params_length))
-  | _ -> { expression_desc = Length (e, Function); comment }
-
-(** no dependency introduced *)
-(* let js_global_dot ?comment (x : string)  (e1 : string) : t =
-   { expression_desc = Static_index (js_global x,  e1,None); comment}
-*)
-
-let rec string_append ?comment (e : t) (el : t) : t =
-  let concat a b ~delim =
-    { e with expression_desc = Str { txt = a ^ b; delim } }
-  in
-  match (e.expression_desc, el.expression_desc) with
-  | Str { txt = ""}, _ -> el
-  | _, Str { txt = ""} -> e
-  | ( Str { txt = a; delim },
-      String_append ({ expression_desc = Str { txt = b; delim = delim_ } }, c) )
-    when delim = delim_ ->
-      string_append ?comment (concat a b ~delim) c
-  | ( String_append (c, { expression_desc = Str { txt = b; delim } }),
-      Str { txt = a; delim = delim_ } )
-    when delim = delim_ ->
-      string_append ?comment c (concat b a ~delim)
-  | ( String_append (a, { expression_desc = Str { txt = b; delim } }),
-      String_append ({ expression_desc = Str { txt = c; delim = delim_ } }, d) )
-    when delim = delim_ ->
-      string_append ?comment (string_append a (concat b c ~delim)) d
-  | Str { txt = a; delim }, Str { txt = b; delim = delim_ } when delim = delim_
-    ->
-      { (concat a b ~delim) with comment }
-  | _, _ -> { comment; expression_desc = String_append (e, el) }
-
-let obj ?comment properties : t =
-  { expression_desc = Object properties; comment }
-
-let str_equal (txt0:string) (delim0:External_arg_spec.delim) txt1 delim1 =
-  if delim0 = delim1 then
-    if Ext_string.equal txt0 txt1 then Some true
-    else if Ast_utf8_string.simple_comparison txt0 && Ast_utf8_string.simple_comparison txt1
-    then Some false
-    else None
-  else None
-
-let rec triple_equal ?comment (e0 : t) (e1 : t) : t =
-  match (e0.expression_desc, e1.expression_desc) with
-  | ( (Null | Undefined _),
-      (Bool _ | Number _ | Typeof _ | Fun _ | Array _ | Caml_block _) )
-    when no_side_effect e1 ->
-      false_
-  | ( (Bool _ | Number _ | Typeof _ | Fun _ | Array _ | Caml_block _),
-      (Null | Undefined _) )
-    when no_side_effect e0 ->
-      false_
-  | Number (Int { i = i0; _ }), Number (Int { i = i1; _ }) -> bool (i0 = i1)
-  | Optional_block (a, _), Optional_block (b, _) -> triple_equal ?comment a b
-  | Undefined _, Optional_block _
-  | Optional_block _, Undefined _
-  | Null, Undefined _
-  | Undefined _, Null ->
-      false_
-  | Null, Null | Undefined _, Undefined _ -> true_
-  | _ -> { expression_desc = Bin (EqEqEq, e0, e1); comment }
-
-let bin ?comment (op : J.binop) (e0 : t) (e1 : t) : t =
-  match (op, e0.expression_desc, e1.expression_desc) with
-  | EqEqEq, _, _ -> triple_equal ?comment e0 e1
-  | Ge, Length (e, _), Number (Int { i = 0l }) when no_side_effect e ->
-      true_ (* x.length >=0 | [x] is pure  -> true*)
-  | Gt, Length (_, _), Number (Int { i = 0l }) ->
-      (* [e] is kept so no side effect check needed *)
-      { expression_desc = Bin (NotEqEq, e0, e1); comment }
-  | _ -> { expression_desc = Bin (op, e0, e1); comment }
-
-(* TODO: Constant folding, Google Closure will do that?,
-   Even if Google Clsoure can do that, we will see how it interact with other
-   optimizations
-   We wrap all boolean functions here, since OCaml boolean is a
-   bit different from Javascript, so that we can change it in the future
-
-   {[ a && (b && c) === (a && b ) && c ]}
-     is not used: benefit is not clear
-     | Int_of_boolean e10, Bin(And, {expression_desc = Int_of_boolean e20 }, e3)
-      ->
-      and_ ?comment
-        { e1 with expression_desc
-                  =
-                    J.Int_of_boolean { expression_desc = Bin (And, e10,e20); comment = None}
-        }
-        e3
-   Note that
-   {[ "" && 3 ]}
-     return  "" instead of false, so [e1] is indeed useful
-   optimization if [e1 = e2], then and_ e1 e2 -> e2
-     be careful for side effect
-*)
-
-let rec filter_bool (e: t) ~j ~b = match e.expression_desc with
-  | Bin (And, e1, e2) ->
-    (match (filter_bool e1 ~j ~b, filter_bool e2 ~j ~b) with
-    | None, None -> None
-    | Some e, None
-    | None, Some e -> Some e
-    | Some e1, Some e2 ->
-      Some {e with expression_desc = Bin (And, e1, e2)} )
-  | Bin (Or, e1, e2) ->
-    (match (filter_bool e1 ~j ~b, filter_bool e2 ~j ~b) with
-    | None, _ | _, None ->
-      None
-    | Some e1, Some e2 ->
-      Some {e with expression_desc = Bin (Or, e1, e2)} )
-  | Bin
-    ( NotEqEq,
-      {expression_desc = Typeof {expression_desc = Var i}},
-      {expression_desc = Str {txt}}) when Js_op_util.same_vident i j ->
-    if txt <> "bool"
-    then None
-    else assert false
-  | Js_not {expression_desc =
-    Call ({expression_desc = Str {txt = "Array.isArray"}},
-      [{expression_desc = Var i}], _)} when Js_op_util.same_vident i j ->
-    None
-  | _ -> Some e
-
-let and_ ?comment (e1 : t) (e2 : t) : t =
-  match (e1.expression_desc, e2.expression_desc) with
-  | Var i, Var j when Js_op_util.same_vident i j -> e1
-  | Var i, Bin (And, { expression_desc = Var j; _ }, _)
-    when Js_op_util.same_vident i j ->
-      e2
-  | Var i, Bin (And, l, ({ expression_desc = Var j; _ } as r))
-    when Js_op_util.same_vident i j ->
-      { e2 with expression_desc = Bin (And, r, l) }
-  | ( Bin (NotEqEq, { expression_desc = Var i }, { expression_desc = Undefined _ }),
-      Bin
-        ( EqEqEq,
-          { expression_desc = Var j },
-          { expression_desc = Str _ | Number _ } ) )
-    when Js_op_util.same_vident i j ->
-      e2
-  | ( _,
-      Bin
-      ( EqEqEq,
-        { expression_desc = Var j },
-        { expression_desc = Bool b } )
-        ) ->
-    (match filter_bool e1 ~j ~b with
-     | None -> e2
-     | Some e1 -> { expression_desc = Bin (And, e1, e2); comment })
-  | _, _ -> { expression_desc = Bin (And, e1, e2); comment }
-
-let or_ ?comment (e1 : t) (e2 : t) =
-  match (e1.expression_desc, e2.expression_desc) with
-  | Var i, Var j when Js_op_util.same_vident i j -> e1
-  | Var i, Bin (Or, { expression_desc = Var j; _ }, _)
-    when Js_op_util.same_vident i j ->
-      e2
-  | Var i, Bin (Or, l, ({ expression_desc = Var j; _ } as r))
-    when Js_op_util.same_vident i j ->
-      { e2 with expression_desc = Bin (Or, r, l) }
-  | _, _ -> { expression_desc = Bin (Or, e1, e2); comment }
-
-(* return a value of type boolean *)
-(* TODO:
-     when comparison with Int
-     it is right that !(x > 3 ) -> x <= 3 *)
-let not (e : t) : t =
-  match e.expression_desc with
-  | Number (Int { i; _ }) -> bool (i = 0l)
-  | Js_not e -> e
-  | Bool b -> if b then false_ else true_
-  | Bin (EqEqEq, e0, e1) -> { e with expression_desc = Bin (NotEqEq, e0, e1) }
-  | Bin (NotEqEq, e0, e1) -> { e with expression_desc = Bin (EqEqEq, e0, e1) }
-  | Bin (Lt, a, b) -> { e with expression_desc = Bin (Ge, a, b) }
-  | Bin (Ge, a, b) -> { e with expression_desc = Bin (Lt, a, b) }
-  | Bin (Le, a, b) -> { e with expression_desc = Bin (Gt, a, b) }
-  | Bin (Gt, a, b) -> { e with expression_desc = Bin (Le, a, b) }
-  | _ -> { expression_desc = Js_not e; comment = None }
-
-let not_empty_branch (x : t) =
-  match x.expression_desc with
-  | Number (Int { i = 0l }) | Undefined _ -> false
-  | _ -> true
-
-let rec econd ?comment (pred : t) (ifso : t) (ifnot : t) : t =
-  match (pred.expression_desc, ifso.expression_desc, ifnot.expression_desc) with
-  | Bool false, _, _ -> ifnot
-  | Number (Int { i = 0l; _ }), _, _ -> ifnot
-  | (Number _ | Array _ | Caml_block _), _, _ when no_side_effect pred ->
-      ifso (* a block can not be false in OCAML, CF - relies on flow inference*)
-  | Bool true, _, _ -> ifso
-  | _, Cond (pred1, ifso1, ifnot1), _
-    when Js_analyzer.eq_expression ifnot1 ifnot ->
-      (* {[
-           if b then (if p1 then branch_code0 else branch_code1)
-           else branch_code1
-         ]}
-         is equivalent to
-         {[
-           if b && p1 then branch_code0 else branch_code1
-         ]}
-      *)
-      econd (and_ pred pred1) ifso1 ifnot
-  | _, Cond (pred1, ifso1, ifnot1), _ when Js_analyzer.eq_expression ifso1 ifnot
-    ->
-      econd (and_ pred (not pred1)) ifnot1 ifnot
-  | _, _, Cond (pred1, ifso1, ifnot1) when Js_analyzer.eq_expression ifso ifso1
-    ->
-      econd (or_ pred pred1) ifso ifnot1
-  | _, _, Cond (pred1, ifso1, ifnot1) when Js_analyzer.eq_expression ifso ifnot1
-    ->
-      econd (or_ pred (not pred1)) ifso ifso1
-  | Js_not e, _, _ when not_empty_branch ifnot -> econd ?comment e ifnot ifso
-  | ( _,
-      Seq (a, { expression_desc = Undefined _ }),
-      Seq (b, { expression_desc = Undefined _ }) ) ->
-      seq (econd ?comment pred a b) undefined
-  | _ ->
-      if Js_analyzer.eq_expression ifso ifnot then
-        if no_side_effect pred then ifso else seq ?comment pred ifso
-      else { expression_desc = Cond (pred, ifso, ifnot); comment }
-
-let rec float_equal ?comment (e0 : t) (e1 : t) : t =
-  match (e0.expression_desc, e1.expression_desc) with
-  | Number (Int { i = i0; _ }), Number (Int { i = i1 }) -> bool (i0 = i1)
-  | Undefined _, Undefined _ -> true_
-  (* | (Bin(Bor,
-         {expression_desc = Number(Int {i = 0l; _})},
-         ({expression_desc = Caml_block_tag _; _} as a ))
-     |
-      Bin(Bor,
-          ({expression_desc = Caml_block_tag _; _} as a),
-          {expression_desc = Number (Int {i = 0l; _})})),
-     Number (Int {i = 0l;}) when e1.comment = None
-     ->  (** (x.tag | 0) === 0  *)
-     not  a *)
-  | ( ( Bin
-          ( Bor,
-            { expression_desc = Number (Int { i = 0l; _ }) },
-            ({ expression_desc = Caml_block_tag _; _ } as a) )
-      | Bin
-          ( Bor,
-            ({ expression_desc = Caml_block_tag _; _ } as a),
-            { expression_desc = Number (Int { i = 0l; _ }) } ) ),
-      Number _ ) ->
-      (* for sure [i <> 0 ]*)
-      (* since a is integer, if we guarantee there is no overflow
-         of a
-         then [a | 0] is a nop unless a is undefined
-         (which is applicable when applied to tag),
-         obviously tag can not be overflowed.
-         if a is undefined, then [ a|0===0 ] is true
-         while [a === 0 ] is not true
-         [a|0 === non_zero] is false and [a===non_zero] is false
-         so we can not eliminate when the tag is zero
-      *)
-      float_equal ?comment a e1
-  | Number (Float { f = f0; _ }), Number (Float { f = f1 }) when f0 = f1 ->
-      true_
-  | _ -> { expression_desc = Bin (EqEqEq, e0, e1); comment }
-
-let int_equal = float_equal
-
-let string_equal ?comment (e0 : t) (e1 : t) : t =
-  let default () : t = { expression_desc = Bin (EqEqEq, e0, e1); comment } in
-  match (e0.expression_desc, e1.expression_desc) with
-  | Str { txt = a0; delim = d0 }, Str { txt = a1; delim = d1 } when d0 = d1 ->
-    (match str_equal a0 d0 a1 d1 with
-    | Some b -> bool b
-    | None -> default ())
-  | _, _ -> default ()
-
-let is_type_number ?comment (e : t) : t =
-  string_equal ?comment (typeof e) (str "number")
-
-let tag_type = function
-  | Ast_untagged_variants.String s -> str s ~delim:DStarJ
-  | Int i -> small_int i
-  | Float f -> float f
-  | BigInt i -> 
-    let sign, i = Bigint_utils.parse_bigint i in
-    bigint sign i
-  | Bool b -> bool b
-  | Null -> nil
-  | Undefined -> undefined
-  | Untagged IntType -> str "number"
-  | Untagged FloatType -> str "number"
-  | Untagged BigintType -> str "bigint"
-  | Untagged BooleanType -> str "boolean"
-  | Untagged FunctionType -> str "function"
-  | Untagged StringType -> str "string"
-  | Untagged (InstanceType i) -> str (Ast_untagged_variants.Instance.to_string i) ~delim:DNoQuotes
-  | Untagged ObjectType -> str "object"
-  | Untagged UnknownType ->
-    (* TODO: this should not happen *)
-    assert false
-
-let rec emit_check (check : t Ast_untagged_variants.DynamicChecks.t) = match check with
-  | TagType t -> tag_type t
-  | BinOp(op, x, y) ->
-    let op = match op with
-      | EqEqEq -> Js_op.EqEqEq
-      | NotEqEq -> NotEqEq
-      | And -> And
-      | Or -> Or
-    in
-    bin op (emit_check x) (emit_check y)
-  | TypeOf x -> typeof (emit_check x)
-  | IsInstanceOf (Array, x) -> is_array (emit_check x)
-  | IsInstanceOf (instance, x) ->
-    let instance_name = Ast_untagged_variants.Instance.to_string instance in
-    instanceof (emit_check x) (str instance_name ~delim:DNoQuotes) 
-  | Not x -> not (emit_check x)
-  | Expr x -> x
-
-let is_a_literal_case ~literal_cases ~block_cases (e:t) =
-  let check = Ast_untagged_variants.DynamicChecks.is_a_literal_case ~literal_cases ~block_cases (Expr e) in
-  emit_check check
-
-let is_int_tag ?has_null_undefined_other e =
-    let check = Ast_untagged_variants.DynamicChecks.is_int_tag ?has_null_undefined_other (Expr e) in
-    emit_check check
-
-let is_type_string ?comment (e : t) : t =
-  string_equal ?comment (typeof e) (str "string")
-
-let is_type_object (e : t) : t = string_equal (typeof e) (str "object")
-
-(* we are calling [Caml_primitive.primitive_name], since it's under our
-   control, we should make it follow the javascript name convention, and
-   call plain [dot]
-*)
-
-let tag ?comment ?(name=Js_dump_lit.tag) e : t =
-  { expression_desc = Caml_block_tag (e, name); comment }
-
-(* according to the compiler, [Btype.hash_variant],
-   it's reduced to 31 bits for hash
-*)
-
-(* TODO: handle arbitrary length of args ..
-   we can reduce part of the overhead by using
-   `__js` -- a easy ppx {{ x ##.hh }}
-   the downside is that no way to swap ocaml/js implementation
-   for object part, also need encode arity..
-   how about x#|getElementById|2|
-*)
-
-(* Note that [lsr] or [bor] are js semantics *)
-let rec int32_bor ?comment (e1 : J.expression) (e2 : J.expression) :
-    J.expression =
-  match (e1.expression_desc, e2.expression_desc) with
-  | Number (Int { i = i1 } | Uint i1), Number (Int { i = i2 }) ->
-      int ?comment (Int32.logor i1 i2)
-  | _, Bin (Lsr, e2, { expression_desc = Number (Int { i = 0l } | Uint 0l); _ })
-    ->
-      int32_bor e1 e2
-  | Bin (Lsr, e1, { expression_desc = Number (Int { i = 0l } | Uint 0l); _ }), _
-    ->
-      int32_bor e1 e2
-  | ( Bin (Lsr, _, { expression_desc = Number (Int { i } | Uint i); _ }),
-      Number (Int { i = 0l } | Uint 0l) )
-    when i > 0l ->
-      (* a >>> 3 | 0 -> a >>> 3 *)
-      e1
-  | ( Bin (Bor, e1, { expression_desc = Number (Int { i = 0l } | Uint 0l); _ }),
-      Number (Int { i = 0l } | Uint 0l) ) ->
-      int32_bor e1 e2
-  | _ -> { comment; expression_desc = Bin (Bor, e1, e2) }
-
-(* Arithmatic operations
-   TODO: distinguish between int and float
-   TODO: Note that we have to use Int64 to avoid integer overflow, this is fine
-   since Js only have .
-
-   like code below
-   {[
-     MAX_INT_VALUE - (MAX_INT_VALUE - 100) + 20
-   ]}
-
-   {[
-     MAX_INT_VALUE - x + 30
-   ]}
-
-   check: Re-association: avoid integer overflow
-*)
-let to_int32 ?comment (e : J.expression) : J.expression =
-  int32_bor ?comment e zero_int_literal
-(* TODO: if we already know the input is int32, [x|0] can be reduced into [x] *)
-
-let uint32 ?comment n : J.expression =
-  { expression_desc = Number (Uint n); comment }
-
-let string_comp (cmp : J.binop) ?comment (e0 : t) (e1 : t) =
-  match (e0.expression_desc, e1.expression_desc) with
-  | Str { txt = a0; delim = d0 }, Str { txt = a1; delim = d1 } -> (
-    match cmp, str_equal a0 d0 a1 d1 with
-      | EqEqEq, Some b -> bool b
-      | NotEqEq, Some b -> bool (b = false)
-      | _ ->
-        bin ?comment cmp e0 e1)
-  | _ -> bin ?comment cmp e0 e1
-
-let obj_length ?comment e : t =
-  to_int32 { expression_desc = Length (e, Caml_block); comment }
-
-let compare_int_aux (cmp : Lam_compat.comparison) (l : int) r =
-  match cmp with
-  | Ceq -> l = r
-  | Cneq -> l <> r
-  | Clt -> l < r
-  | Cgt -> l > r
-  | Cle -> l <= r
-  | Cge -> l >= r
-
-let rec int_comp (cmp : Lam_compat.comparison) ?comment (e0 : t) (e1 : t) =
-  match (cmp, e0.expression_desc, e1.expression_desc) with
-  | _, Number ((Int _ | Uint _) as l), Number ((Int _ | Uint _) as r) ->
-      let l =
-        match l with
-        | Uint l -> Ext_int.int32_unsigned_to_int l
-        | Int { i = l } -> Int32.to_int l
-        | _ -> assert false
-      in
-      let r =
-        match r with
-        | Uint l -> Ext_int.int32_unsigned_to_int l
-        | Int { i = l } -> Int32.to_int l
-        | _ -> assert false
-      in
-      bool (compare_int_aux cmp l r)
-  | ( _,
-      Call
-        ( {
-            expression_desc =
-              Var (Qualified ({ kind = Runtime }, Some "int_compare"));
-            _;
-          },
-          [ l; r ],
-          _ ),
-      Number (Int { i = 0l }) ) ->
-      int_comp cmp l r (* = 0 > 0 < 0 *)
-  | ( Ceq,
-      Call
-        ( ({
-             expression_desc =
-               Var
-                 (Qualified
-                   (({ id = _; kind = Runtime } as iid), Some "compare"));
-             _;
-           } as fn),
-          ([ _; _ ] as args),
-          call_info ),
-      Number (Int { i = 0l }) ) ->
-      (* This is now generalized for runtime modules
-         `RuntimeModule.compare x y = 0 ` -->
-         `RuntimeModule.equal x y`
-      *)
-      {
-        e0 with
-        expression_desc =
-          Call
-            ( { fn with expression_desc = Var (Qualified (iid, Some "equal")) },
-              args,
-              call_info );
-      }
-  | Ceq, Optional_block _, Undefined _ | Ceq, Undefined _, Optional_block _ ->
-      false_
-  | Ceq, _, _ -> int_equal e0 e1
-  | Cneq, Optional_block _, Undefined _
-  | Cneq, Undefined _, Optional_block _
-  | Cneq, Caml_block _, Number _
-  | Cneq, Number _, Caml_block _ ->
-      true_
-  | _ -> bin ?comment (Lam_compile_util.jsop_of_comp cmp) e0 e1
-
-let bool_comp (cmp : Lam_compat.comparison) ?comment (e0 : t) (e1 : t) =
-  match (e0, e1) with
-  | { expression_desc = Bool l }, { expression_desc = Bool r } ->
-      bool
-        (match cmp with
-        | Ceq -> l = r
-        | Cneq -> l <> r
-        | Clt -> l < r
-        | Cgt -> l > r
-        | Cle -> l <= r
-        | Cge -> l >= r)
-  | { expression_desc = Bool true }, rest
-  | rest, { expression_desc = Bool false } -> (
-      match cmp with
-      | Clt -> seq rest false_
-      | Cge -> seq rest true_
-      | Cle | Cgt | Ceq | Cneq ->
-          bin ?comment (Lam_compile_util.jsop_of_comp cmp) e0 e1)
-  | rest, { expression_desc = Bool true }
-  | { expression_desc = Bool false }, rest -> (
-      match cmp with
-      | Cle -> seq rest true_
-      | Cgt -> seq rest false_
-      | Clt | Cge | Ceq | Cneq ->
-          bin ?comment (Lam_compile_util.jsop_of_comp cmp) e0 e1)
-  | _, _ -> bin ?comment (Lam_compile_util.jsop_of_comp cmp) e0 e1
-
-let float_comp cmp ?comment e0 e1 =
-  bin ?comment (Lam_compile_util.jsop_of_comp cmp) e0 e1
-
-let js_comp cmp ?comment e0 e1 =
-  bin ?comment (Lam_compile_util.jsop_of_comp cmp) e0 e1
-
-let rec int32_lsr ?comment (e1 : J.expression) (e2 : J.expression) :
-    J.expression =
-  let aux i1 i = uint32 (Int32.shift_right_logical i1 i) in
-  match (e1.expression_desc, e2.expression_desc) with
-  | Number (Int { i = i1 } | Uint i1), Number (Int { i = i2 } | Uint i2) ->
-      aux i1 (Int32.to_int i2)
-  | Bin (Lsr, _, _), Number (Int { i = 0l } | Uint 0l) ->
-      e1 (* TODO: more opportunities here *)
-  | ( Bin
-        (Bor, e1, { expression_desc = Number (Int { i = 0l; _ } | Uint 0l); _ }),
-      Number (Int { i = 0l } | Uint 0l) ) ->
-      int32_lsr ?comment e1 e2
-  | _, _ -> { comment; expression_desc = Bin (Lsr, e1, e2) (* uint32 *) }
-
-let to_uint32 ?comment (e : J.expression) : J.expression =
-  int32_lsr ?comment e zero_int_literal
-
-(* TODO:
-   we can apply a more general optimization here,
-   do some algebraic rewerite rules to rewrite [triple_equal]
-*)
-let rec is_out ?comment (e : t) (range : t) : t =
-  match (range.expression_desc, e.expression_desc) with
-  | Number (Int { i = 1l }), Var _ ->
-      not
-        (or_ (triple_equal e zero_int_literal) (triple_equal e one_int_literal))
-  | ( Number (Int { i = 1l }),
-      ( Bin
-          ( Plus,
-            { expression_desc = Number (Int { i; _ }) },
-            ({ expression_desc = Var _; _ } as x) )
-      | Bin
-          ( Plus,
-            ({ expression_desc = Var _; _ } as x),
-            { expression_desc = Number (Int { i; _ }) } ) ) ) ->
-      not
-        (or_
-           (triple_equal x (int (Int32.neg i)))
-           (triple_equal x (int (Int32.sub Int32.one i))))
-  | ( Number (Int { i = 1l }),
-      Bin
-        ( Minus,
-          ({ expression_desc = Var _; _ } as x),
-          { expression_desc = Number (Int { i; _ }) } ) ) ->
-      not (or_ (triple_equal x (int (Int32.add i 1l))) (triple_equal x (int i)))
-  (* (x - i >>> 0 ) > k *)
-  | ( Number (Int { i = k }),
-      Bin
-        ( Minus,
-          ({ expression_desc = Var _; _ } as x),
-          { expression_desc = Number (Int { i; _ }) } ) ) ->
-      or_ (int_comp Cgt x (int (Int32.add i k))) (int_comp Clt x (int i))
-  | Number (Int { i = k }), Var _ ->
-      (* Note that js support [ 1 < x < 3],
-         we can optimize it into [ not ( 0<= x <=  k)]
-      *)
-      or_ (int_comp Cgt e (int k)) (int_comp Clt e zero_int_literal)
-  | ( _,
-      Bin
-        ( Bor,
-          ({
-             expression_desc =
-               ( Bin
-                   ( (Plus | Minus),
-                     { expression_desc = Number (Int { i = _; _ }) },
-                     { expression_desc = Var _; _ } )
-               | Bin
-                   ( (Plus | Minus),
-                     { expression_desc = Var _; _ },
-                     { expression_desc = Number (Int { i = _; _ }) } ) );
-           } as e),
-          { expression_desc = Number (Int { i = 0l } | Uint 0l); _ } ) ) ->
-      (* TODO: check correctness *)
-      is_out ?comment e range
-  | _, _ -> int_comp ?comment Cgt (to_uint32 e) range
-
-let rec float_add ?comment (e1 : t) (e2 : t) =
-  match (e1.expression_desc, e2.expression_desc) with
-  | Number (Int { i; _ }), Number (Int { i = j; _ }) ->
-      int ?comment (Int32.add i j)
-  | _, Number (Int { i = j; c }) when j < 0l ->
-      float_minus ?comment e1
-        { e2 with expression_desc = Number (Int { i = Int32.neg j; c }) }
-  | ( Bin (Plus, a1, { expression_desc = Number (Int { i = k; _ }) }),
-      Number (Int { i = j; _ }) ) ->
-      { comment; expression_desc = Bin (Plus, a1, int (Int32.add k j)) }
-  (* bin ?comment Plus a1 (int (k + j)) *)
-  (* TODO remove commented code  ?? *)
-  (* | Bin(Plus, a0 , ({expression_desc = Number (Int a1)}  )), *)
-  (*     Bin(Plus, b0 , ({expression_desc = Number (Int b1)}  )) *)
-  (*   ->  *)
-  (*   bin ?comment Plus a1 (int (a1 + b1)) *)
-
-  (* | _, Bin(Plus,  b0, ({expression_desc = Number _}  as v)) *)
-  (*   -> *)
-  (*     bin ?comment Plus (bin ?comment Plus e1 b0) v *)
-  (* | Bin(Plus, a1 , ({expression_desc = Number _}  as v)), _ *)
-  (* | Bin(Plus, ({expression_desc = Number _}  as v),a1), _ *)
-  (*   ->  *)
-  (*     bin ?comment Plus (bin ?comment Plus a1 e2 ) v  *)
-  (* | Number _, _ *)
-  (*   ->  *)
-  (*     bin ?comment Plus  e2 e1 *)
-  | _ -> { comment; expression_desc = Bin (Plus, e1, e2) }
-
-(* bin ?comment Plus e1 e2 *)
-(* associative is error prone due to overflow *)
-and float_minus ?comment (e1 : t) (e2 : t) : t =
-  match (e1.expression_desc, e2.expression_desc) with
-  | Number (Int { i; _ }), Number (Int { i = j; _ }) ->
-      int ?comment (Int32.sub i j)
-  | _ -> { comment; expression_desc = Bin (Minus, e1, e2) }
-(* bin ?comment Minus e1 e2 *)
-
-let unchecked_int32_add ?comment e1 e2 = float_add ?comment e1 e2
-let int32_add ?comment e1 e2 = to_int32 (float_add ?comment e1 e2)
-
-let offset e1 (offset : int) =
-  if offset = 0 then e1 else int32_add e1 (small_int offset)
-
-let int32_minus ?comment e1 e2 : J.expression =
-  to_int32 (float_minus ?comment e1 e2)
-
-let unchecked_int32_minus ?comment e1 e2 : J.expression =
-  float_minus ?comment e1 e2
-
-let float_div ?comment e1 e2 = bin ?comment Div e1 e2
-let float_notequal ?comment e1 e2 = bin ?comment NotEqEq e1 e2
-
-let int32_asr ?comment e1 e2 : J.expression =
-  { comment; expression_desc = Bin (Asr, e1, e2) }
-
-(** Division by zero is undefined behavior*)
-let int32_div ~checked ?comment (e1 : t) (e2 : t) : t =
-  match (e1.expression_desc, e2.expression_desc) with
-  | Length _, Number (Int { i = 2l } | Uint 2l) -> int32_asr e1 one_int_literal
-  | e1_desc, Number (Int { i = i1 }) when i1 <> 0l -> (
-      match e1_desc with
-      | Number (Int { i = i0 }) -> int (Int32.div i0 i1)
-      | _ -> to_int32 (float_div ?comment e1 e2))
-  | _, _ ->
-      if checked then runtime_call Js_runtime_modules.int32 "div" [ e1; e2 ]
-      else to_int32 (float_div ?comment e1 e2)
-
-let int32_mod ~checked ?comment e1 (e2 : t) : J.expression =
-  match e2.expression_desc with
-  | Number (Int { i }) when i <> 0l ->
-      { comment; expression_desc = Bin (Mod, e1, e2) }
-  | _ ->
-      if checked then runtime_call Js_runtime_modules.int32 "mod_" [ e1; e2 ]
-      else { comment; expression_desc = Bin (Mod, e1, e2) }
-
-let float_mul ?comment e1 e2 = bin ?comment Mul e1 e2
-
-let int32_lsl ?comment (e1 : J.expression) (e2 : J.expression) : J.expression =
-  match (e1, e2) with
-  | ( { expression_desc = Number (Int { i = i0 } | Uint i0) },
-      { expression_desc = Number (Int { i = i1 } | Uint i1) } ) ->
-      int ?comment (Int32.shift_left i0 (Int32.to_int i1))
-  | _ -> { comment; expression_desc = Bin (Lsl, e1, e2) }
-
-let is_pos_pow n =
-  let exception E in
-  let rec aux c (n : Int32.t) =
-    if n <= 0l then -2
-    else if n = 1l then c
-    else if Int32.logand n 1l = 0l then aux (c + 1) (Int32.shift_right n 1)
-    else raise_notrace E
-  in
-  try aux 0 n with E -> -1
-
-let int32_mul ?comment (e1 : J.expression) (e2 : J.expression) : J.expression =
-  match (e1, e2) with
-  | { expression_desc = Number (Int { i = 0l } | Uint 0l); _ }, x
-    when Js_analyzer.no_side_effect_expression x ->
-      zero_int_literal
-  | x, { expression_desc = Number (Int { i = 0l } | Uint 0l); _ }
-    when Js_analyzer.no_side_effect_expression x ->
-      zero_int_literal
-  | ( { expression_desc = Number (Int { i = i0 }); _ },
-      { expression_desc = Number (Int { i = i1 }); _ } ) ->
-      int (Int32.mul i0 i1)
-  | e, { expression_desc = Number (Int { i = i0 } | Uint i0); _ }
-  | { expression_desc = Number (Int { i = i0 } | Uint i0); _ }, e ->
-      let i = is_pos_pow i0 in
-      if i >= 0 then int32_lsl e (small_int i)
-      else
-        call ?comment ~info:Js_call_info.builtin_runtime_call
-          (dot (js_global "Math") Literals.imul)
-          [ e1; e2 ]
-  | _ ->
-      call ?comment ~info:Js_call_info.builtin_runtime_call
-        (dot (js_global "Math") Literals.imul)
-        [ e1; e2 ]
-
-let unchecked_int32_mul ?comment e1 e2 : J.expression =
-  { comment; expression_desc = Bin (Mul, e1, e2) }
-
-let rec int32_bxor ?comment (e1 : t) (e2 : t) : J.expression =
-  match (e1.expression_desc, e2.expression_desc) with
-  | Number (Int { i = i1 }), Number (Int { i = i2 }) ->
-      int ?comment (Int32.logxor i1 i2)
-  | _, Bin (Lsr, e2, { expression_desc = Number (Int { i = 0l } | Uint 0l); _ })
-    ->
-      int32_bxor e1 e2
-  | Bin (Lsr, e1, { expression_desc = Number (Int { i = 0l } | Uint 0l); _ }), _
-    ->
-      int32_bxor e1 e2
-  | _ -> { comment; expression_desc = Bin (Bxor, e1, e2) }
-
-let rec int32_band ?comment (e1 : J.expression) (e2 : J.expression) :
-    J.expression =
-  match e1.expression_desc with
-  | Bin (Bor, a, { expression_desc = Number (Int { i = 0l }) }) ->
-      (* Note that in JS
-         {[ -1 >>> 0 & 0xffffffff = -1]} is the same as
-         {[ (-1 >>> 0 | 0 ) & 0xffffff ]}
-      *)
-      int32_band a e2
-  | _ -> { comment; expression_desc = Bin (Band, e1, e2) }
-
-(* let int32_bin ?comment op e1 e2 : J.expression =  *)
-(*   {expression_desc = Int32_bin(op,e1, e2); comment} *)
-
-let bigint_op ?comment op (e1: t) (e2: t) = bin ?comment op e1 e2
-
-let bigint_comp (cmp : Lam_compat.comparison) ?comment (e0: t) (e1: t) =
-  bin ?comment (Lam_compile_util.jsop_of_comp cmp) e0 e1
-
-let bigint_div ~checked ?comment (e0: t) (e1: t) =
-  if checked then
-    runtime_call Js_runtime_modules.bigint "div" [e0; e1]
-  else
-    bigint_op ?comment Div e0 e1
-    
-let bigint_mod ~checked ?comment (e0: t) (e1: t) =
-  if checked then
-    runtime_call Js_runtime_modules.bigint "mod_" [e0; e1]
-  else
-    bigint_op ?comment Mod e0 e1
-
-(* TODO -- alpha conversion
-    remember to add parens..
-*)
-let of_block ?comment ?e block : t =
-  let return_unit = false in
-  (* This case is not hit that much*)
-  call ~info:Js_call_info.ml_full_call
-    {
-      comment;
-      expression_desc =
-        Fun
-          {
-            is_method = false;
-            params = [];
-            body =
-              (match e with
-              | None -> block
-              | Some e ->
-                  Ext_list.append block
-                    [ { J.statement_desc = Return e; comment } ]);
-            env = Js_fun_env.make 0;
-            return_unit;
-            async = false;
-          };
-    }
-    []
-
-let is_null ?comment (x : t) = triple_equal ?comment x nil
-let is_undef ?comment x = triple_equal ?comment x undefined
-
-let for_sure_js_null_undefined (x : t) =
-  match x.expression_desc with Null | Undefined _ -> true | _ -> false
-
-let is_null_undefined ?comment (x : t) : t =
-  match x.expression_desc with
-  | Null | Undefined _ -> true_
-  | Number _ | Array _ | Caml_block _ -> false_
-  | _ -> { comment; expression_desc = Is_null_or_undefined x }
-
-let eq_null_undefined_boolean ?comment (a : t) (b : t) =
-  match (a.expression_desc, b.expression_desc) with
-  | ( (Null | Undefined _),
-      (Bool _ | Number _ | Typeof _ | Fun _ | Array _ | Caml_block _) ) ->
-      false_
-  | ( (Bool _ | Number _ | Typeof _ | Fun _ | Array _ | Caml_block _),
-      (Null | Undefined _) ) ->
-      false_
-  | Null, Undefined _ | Undefined _, Null -> false_
-  | Null, Null | Undefined _, Undefined _ -> true_
-  | _ -> { expression_desc = Bin (EqEqEq, a, b); comment }
-
-let neq_null_undefined_boolean ?comment (a : t) (b : t) =
-  match (a.expression_desc, b.expression_desc) with
-  | ( (Null | Undefined _),
-      (Bool _ | Number _ | Typeof _ | Fun _ | Array _ | Caml_block _) ) ->
-      true_
-  | ( (Bool _ | Number _ | Typeof _ | Fun _ | Array _ | Caml_block _),
-      (Null | Undefined _) ) ->
-      true_
-  | Null, Null | Undefined _, Undefined _ -> false_
-  | Null, Undefined _ | Undefined _, Null -> true_
-  | _ -> { expression_desc = Bin (NotEqEq, a, b); comment }
-
-(** TODO: in the future add a flag
-    to set globalThis
-*)
-let resolve_and_apply (s : string) (args : t list) : t =
-  call ~info:Js_call_info.builtin_runtime_call
-    (runtime_call Js_runtime_modules.external_polyfill "resolve"
-       [ str (if s.[0] = '?' then String.sub s 1 (String.length s - 1) else s) ])
-    args
-
-let make_exception (s : string) =
-  pure_runtime_call Js_runtime_modules.exceptions Literals.create [ str s ]
diff --git a/jscomp/core/js_exp_make.mli b/jscomp/core/js_exp_make.mli
deleted file mode 100644
index a1034bf..0000000
--- a/jscomp/core/js_exp_make.mli
+++ /dev/null
@@ -1,367 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Creator utilities for the [J] module *)
-
-type t = J.expression
-(** check if a javascript ast is constant 
-
-    The better signature might be 
-    {[
-      J.expresssion -> Js_output.t
-    ]}
-    for exmaple
-    {[
-      e ?print_int(3) :  0
-                         --->
-                         if(e){print_int(3)}
-    ]}
-*)
-
-val remove_pure_sub_exp : t -> t option
-
-val var : ?comment:string -> J.ident -> t
-
-val js_global : ?comment:string -> string -> t
-
-val runtime_var_dot : ?comment:string -> string -> string -> t
-
-(* val runtime_var_vid : string -> string -> J.vident *)
-
-val ml_var_dot : ?comment:string -> ?dynamic_import:bool -> Ident.t -> string -> t
-(** [ml_var_dot ocaml_module name]
-*)
-
-val external_var_field :
-  ?import_attributes:External_ffi_types.import_attributes ->
-  ?comment:string ->
-  external_name:string ->
-  Ident.t ->
-  field:string ->
-  default:bool ->
-  t
-(** [external_var_field ~external_name ~dot id]
-    Used in FFI
-*)
-
-val external_var : ?import_attributes:External_ffi_types.import_attributes -> ?comment:string -> external_name:string -> Ident.t -> t
-
-val ml_module_as_var : ?comment:string -> ?dynamic_import:bool -> Ident.t -> t
-
-val runtime_call :
-  string -> (* module_name *)
-            string -> (* fn_name *)
-                      t list -> (* args *)
-                                t
-
-val pure_runtime_call :
-  string -> (* module_name *)
-            string -> (* fn_name *)
-                      t list -> (* args *)
-                                t
-
-val runtime_ref : string -> string -> t
-
-val str : ?delim: J.delim -> ?comment: string -> string -> t
-
-val ocaml_fun :
-  ?comment:string ->
-  ?immutable_mask:bool array ->
-  return_unit:bool ->
-  async:bool ->
-  oneUnitArg:bool ->
-  J.ident list ->
-  J.block ->
-  t
-
-val method_ :
-  ?comment:string ->
-  ?immutable_mask:bool array ->
-  return_unit:bool ->
-  J.ident list ->
-  J.block ->
-  t
-
-val econd : ?comment:string -> t -> t -> t -> t
-
-val int : ?comment:string -> ?c:int -> int32 -> t
-
-val uint32 : ?comment:string -> int32 -> t
-
-val small_int : int -> t
-
-val bigint : ?comment:string -> bool -> string -> t
-
-val float : ?comment:string -> string -> t
-
-(* val empty_string_literal : t  *)
-(* TODO: we can do hash consing for small integers *)
-val zero_int_literal : t
-
-(* val one_int_literal : t *)
-val zero_float_lit : t
-(* val obj_int_tag_literal : t *)
-
-val zero_bigint_literal : t
-
-val is_out : ?comment:string -> t -> t -> t
-(** [is_out e range] is equivalent to [e > range or e <0]
-
-*)
-
-val dot : ?comment:string -> t -> string -> t
-
-val module_access : t -> string -> int32 -> t
-
-val array_length : ?comment:string -> t -> t
-
-val string_length : ?comment:string -> t -> t
-
-val bytes_length : ?comment:string -> t -> t
-
-val function_length : ?comment:string -> t -> t
-
-val string_append : ?comment:string -> t -> t -> t
-(**
-   When in ES6 mode, we can use Symbol to guarantee its uniquess,
-   we can not tag [js] object, since it can be frozen 
-*)
-
-(* val var_dot : ?comment:string -> Ident.t -> string -> t *)
-
-(* val bind_var_call : ?comment:string -> Ident.t -> string -> t list -> t  *)
-
-(* val bind_call : ?comment:string -> J.expression -> string -> J.expression list -> t *)
-(* val js_global_dot : ?comment:string -> string -> string -> t *)
-
-val string_index : ?comment:string -> t -> t -> t
-
-val array_index : ?comment:string -> t -> t -> t
-
-val array_index_by_int : ?comment:string -> t -> Int32.t -> t
-
-val record_access : t -> string -> Int32.t -> t
-
-val inline_record_access : t -> string -> Int32.t -> t
-
-val variant_access : t -> int32 -> t
-
-val cons_access : t -> int32 -> t
-
-val extension_access : t -> string option -> Int32.t -> t
-
-val record_assign : t -> int32 -> string -> t -> t
-
-val poly_var_tag_access : t -> t
-
-val poly_var_value_access : t -> t
-
-val extension_assign : t -> int32 -> string -> t -> t
-
-val assign_by_int : ?comment:string -> t -> int32 -> t -> t
-(** 
-    [assign_by_int  e i v]
-    if the expression [e] is a temporay block 
-    which has no side effect,
-    write to it does not really make sense, 
-    optimize it away *)
-
-val assign_by_exp : t -> t -> t -> t
-
-val assign : ?comment:string -> t -> t -> t
-
-val tag_type : Ast_untagged_variants.tag_type -> t
-
-val emit_check : t Ast_untagged_variants.DynamicChecks.t -> t
-
-val triple_equal : ?comment:string -> t -> t -> t
-(* TODO: reduce [triple_equal] use *)
-
-val float_equal : ?comment:string -> t -> t -> t
-
-val int_equal : ?comment:string -> t -> t -> t
-
-val string_equal : ?comment:string -> t -> t -> t
-
-val eq_null_undefined_boolean : ?comment:string -> t -> t -> t
-
-val neq_null_undefined_boolean : ?comment:string -> t -> t -> t
-
-val is_type_number : ?comment:string -> t -> t
-
-val is_int_tag : ?has_null_undefined_other:(bool * bool * bool) -> t -> t
-
-val is_a_literal_case : literal_cases:Ast_untagged_variants.tag_type list -> block_cases:Ast_untagged_variants.block_type list -> t -> t
-
-val is_type_string : ?comment:string -> t -> t
-
-val is_type_object : t -> t
-
-val typeof : ?comment:string -> t -> t
-val instanceof : ?comment:string -> t -> t -> t
-val is_array : t -> t
-
-val to_int32 : ?comment:string -> t -> t
-
-val to_uint32 : ?comment:string -> t -> t
-
-val unchecked_int32_add : ?comment:string -> t -> t -> t
-
-val int32_add : ?comment:string -> t -> t -> t
-
-val offset : t -> int -> t
-
-val unchecked_int32_minus : ?comment:string -> t -> t -> t
-
-val int32_minus : ?comment:string -> t -> t -> t
-
-val int32_mul : ?comment:string -> t -> t -> t
-
-val unchecked_int32_mul : ?comment:string -> t -> t -> t
-
-val int32_div : checked:bool -> ?comment:string -> t -> t -> t
-
-val int32_mod : checked:bool -> ?comment:string -> t -> t -> t
-
-val int32_lsl : ?comment:string -> t -> t -> t
-
-val int32_lsr : ?comment:string -> t -> t -> t
-
-val int32_asr : ?comment:string -> t -> t -> t
-
-val int32_bxor : ?comment:string -> t -> t -> t
-
-val int32_band : ?comment:string -> t -> t -> t
-
-val int32_bor : ?comment:string -> t -> t -> t
-
-val float_add : ?comment:string -> t -> t -> t
-
-val float_minus : ?comment:string -> t -> t -> t
-
-val float_mul : ?comment:string -> t -> t -> t
-
-val float_div : ?comment:string -> t -> t -> t
-
-val float_notequal : ?comment:string -> t -> t -> t
-
-val float_mod : ?comment:string -> t -> t -> t
-
-val int_comp : Lam_compat.comparison -> ?comment:string -> t -> t -> t
-
-val bool_comp : Lam_compat.comparison -> ?comment:string -> t -> t -> t
-
-val string_comp : Js_op.binop -> ?comment:string -> t -> t -> t
-
-val float_comp : Lam_compat.comparison -> ?comment:string -> t -> t -> t
-
-val bigint_op : ?comment: string -> Js_op.binop -> t -> t -> t
-
-val bigint_comp : Lam_compat.comparison -> ?comment:string -> t -> t -> t
-
-val bigint_div : checked:bool -> ?comment:string -> t -> t -> t
-
-val bigint_mod : checked:bool -> ?comment:string -> t -> t -> t
-
-val js_comp : Lam_compat.comparison -> ?comment:string -> t -> t -> t
-
-val not : t -> t
-
-val call : ?comment:string -> info:Js_call_info.t -> t -> t list -> t
-
-val flat_call : ?comment:string -> t -> t -> t
-
-val tagged_template : ?comment:string -> t -> t list -> t list -> t
-
-val new_ : ?comment:string -> J.expression -> J.expression list -> t
-
-val array : ?comment:string -> J.mutable_flag -> J.expression list -> t
-
-val optional_block : J.expression -> J.expression
-
-val optional_not_nest_block : J.expression -> J.expression
-
-val make_block :
-  ?comment:string ->
-  J.expression ->
-  (* tag *)
-  J.tag_info ->
-  (* tag_info *)
-  J.expression list ->
-  J.mutable_flag ->
-  t
-
-val seq : ?comment:string -> t -> t -> t
-
-val fuse_to_seq : t -> t list -> t
-
-val obj : ?comment:string -> J.property_map -> t
-
-val true_ : t
-
-val false_ : t
-
-val bool : bool -> t
-
-val unit : t
-(** [unit] in ocaml will be compiled into [0]  in js *)
-
-val undefined : t
-
-val tag : ?comment:string -> ?name:string -> J.expression -> t
-
-(** Note that this is coupled with how we encode block, if we use the 
-    `Object.defineProperty(..)` since the array already hold the length,
-    this should be a nop 
-*)
-
-val obj_length : ?comment:string -> J.expression -> t
-
-val and_ : ?comment:string -> t -> t -> t
-
-val or_ : ?comment:string -> t -> t -> t
-
-(** we don't expose a general interface, since a general interface is generally not safe *)
-
-val dummy_obj : ?comment:string -> Lam_tag_info.t -> t
-(** used combined with [caml_update_dummy]*)
-
-val of_block : ?comment:string -> ?e:J.expression -> J.statement list -> t
-(** convert a block to expresion by using IIFE *)
-
-val raw_js_code : ?comment:string -> Js_raw_info.code_info -> string -> t
-
-val nil : t
-
-val is_null : ?comment:string -> t -> t
-
-val is_undef : ?comment:string -> t -> t
-
-val for_sure_js_null_undefined : J.expression -> bool
-
-val is_null_undefined : ?comment:string -> t -> t
-
-val resolve_and_apply : string -> t list -> t
-
-val make_exception : string -> t
diff --git a/jscomp/core/js_fold.ml b/jscomp/core/js_fold.ml
deleted file mode 100644
index 506b6d5..0000000
--- a/jscomp/core/js_fold.ml
+++ /dev/null
@@ -1,298 +0,0 @@
-(* Copyright (C) 2015- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open J
-
-let[@inline] unknown _self _ = _self
-
-let[@inline] option sub self v =
-  match v with None -> self | Some x -> sub self x
-
-let rec list (sub : 'self_type -> 'a -> 'self_type) self v =
-  match v with
-  | [] -> self
-  | x :: xs ->
-      let self = sub self x in
-      list sub self xs
-
-class fold =
-  object (_self : 'self_type)
-    method list : 'a. ('self_type -> 'a -> 'self_type) -> 'a list -> 'self_type
-        =
-      fun _f_a -> function
-        | [] -> _self
-        | _x :: _x_i1 ->
-            let _self = _f_a _self _x in
-            let _self = _self#list _f_a _x_i1 in
-            _self
-
-    method label : label -> 'self_type = unknown _self
-
-    method ident : ident -> 'self_type = unknown _self
-
-    method module_id : module_id -> 'self_type =
-      fun { id = _x0; kind = _x1 } ->
-        let _self = _self#ident _x0 in
-        _self
-
-    method required_modules : required_modules -> 'self_type =
-      list (fun _self -> _self#module_id) _self
-
-    method vident : vident -> 'self_type =
-      function
-      | Id _x0 ->
-          let _self = _self#ident _x0 in
-          _self
-      | Qualified (_x0, _x1) ->
-          let _self = _self#module_id _x0 in
-          _self
-
-    method exception_ident : exception_ident -> 'self_type = _self#ident
-
-    method for_ident : for_ident -> 'self_type = _self#ident
-
-    method for_direction : for_direction -> 'self_type = unknown _self
-
-    method property_map : property_map -> 'self_type =
-      list
-        (fun _self (_x0, _x1) ->
-          let _self = _self#expression _x1 in
-          _self)
-        _self
-
-    method length_object : length_object -> 'self_type = unknown _self
-
-    method expression_desc : expression_desc -> 'self_type =
-      function
-      | Length (_x0, _x1) ->
-          let _self = _self#expression _x0 in
-          let _self = _self#length_object _x1 in
-          _self
-      | Is_null_or_undefined _x0 ->
-          let _self = _self#expression _x0 in
-          _self
-      | String_append (_x0, _x1) ->
-          let _self = _self#expression _x0 in
-          let _self = _self#expression _x1 in
-          _self
-      | Bool _ -> _self
-      | Typeof _x0 ->
-          let _self = _self#expression _x0 in
-          _self
-      | Js_not _x0 ->
-          let _self = _self#expression _x0 in
-          _self
-      | Seq (_x0, _x1) ->
-          let _self = _self#expression _x0 in
-          let _self = _self#expression _x1 in
-          _self
-      | Cond (_x0, _x1, _x2) ->
-          let _self = _self#expression _x0 in
-          let _self = _self#expression _x1 in
-          let _self = _self#expression _x2 in
-          _self
-      | Bin (_x0, _x1, _x2) ->
-          let _self = _self#expression _x1 in
-          let _self = _self#expression _x2 in
-          _self
-      | FlatCall (_x0, _x1) ->
-          let _self = _self#expression _x0 in
-          let _self = _self#expression _x1 in
-          _self
-      | Call (_x0, _x1, _x2) ->
-          let _self = _self#expression _x0 in
-          let _self = list (fun _self -> _self#expression) _self _x1 in
-          _self
-      | Tagged_template (_x0, _x1, _x2) ->
-          let _self = _self#expression _x0 in
-          let _self = list (fun _self -> _self#expression) _self _x1 in
-          let _self = list (fun _self -> _self#expression) _self _x2 in
-          _self
-      | String_index (_x0, _x1) ->
-          let _self = _self#expression _x0 in
-          let _self = _self#expression _x1 in
-          _self
-      | Array_index (_x0, _x1) ->
-          let _self = _self#expression _x0 in
-          let _self = _self#expression _x1 in
-          _self
-      | Static_index (_x0, _x1, _x2) ->
-          let _self = _self#expression _x0 in
-          _self
-      | New (_x0, _x1) ->
-          let _self = _self#expression _x0 in
-          let _self =
-            option
-              (fun _self -> list (fun _self -> _self#expression) _self)
-              _self _x1
-          in
-          _self
-      | Var _x0 ->
-          let _self = _self#vident _x0 in
-          _self
-      | Fun {params=x1; body=x2} ->
-          let _self = list (fun _self -> _self#ident) _self x1 in
-          let _self = _self#block x2 in
-          _self
-      | Str _ -> _self
-      | Raw_js_code _ -> _self
-      | Array (_x0, _x1) ->
-          let _self = list (fun _self -> _self#expression) _self _x0 in
-          _self
-      | Optional_block (_x0, _x1) ->
-          let _self = _self#expression _x0 in
-          _self
-      | Caml_block (_x0, _x1, _x2, _x3) ->
-          let _self = list (fun _self -> _self#expression) _self _x0 in
-          let _self = _self#expression _x2 in
-          _self
-      | Caml_block_tag (_x0, _tag) ->
-          let _self = _self#expression _x0 in
-          _self
-      | Number _ -> _self
-      | Object _x0 ->
-          let _self = _self#property_map _x0 in
-          _self
-      | Undefined _ -> _self
-      | Null -> _self
-      | Await _x0 ->
-        let _self = _self#expression _x0 in
-        _self
-
-    method for_ident_expression : for_ident_expression -> 'self_type =
-      _self#expression
-
-    method finish_ident_expression : finish_ident_expression -> 'self_type =
-      _self#expression
-
-    method case_clause : case_clause -> 'self_type =
-      fun { switch_body = _x0; should_break = _x1; comment = _x2 } ->
-        let _self = _self#block _x0 in
-        _self
-
-    method string_clause : string_clause -> 'self_type =
-      fun (_x0, _x1) ->
-        let _self = _self#case_clause _x1 in
-        _self
-
-    method int_clause : int_clause -> 'self_type =
-      fun (_x0, _x1) ->
-        let _self = _self#case_clause _x1 in
-        _self
-
-    method statement_desc : statement_desc -> 'self_type =
-      function
-      | Block _x0 ->
-          let _self = _self#block _x0 in
-          _self
-      | Variable _x0 ->
-          let _self = _self#variable_declaration _x0 in
-          _self
-      | Exp _x0 ->
-          let _self = _self#expression _x0 in
-          _self
-      | If (_x0, _x1, _x2) ->
-          let _self = _self#expression _x0 in
-          let _self = _self#block _x1 in
-          let _self = _self#block _x2 in
-          _self
-      | While (_x0, _x1, _x2, _x3) ->
-          let _self = option (fun _self -> _self#label) _self _x0 in
-          let _self = _self#expression _x1 in
-          let _self = _self#block _x2 in
-          _self
-      | ForRange (_x0, _x1, _x2, _x3, _x4, _x5) ->
-          let _self =
-            option (fun _self -> _self#for_ident_expression) _self _x0
-          in
-          let _self = _self#finish_ident_expression _x1 in
-          let _self = _self#for_ident _x2 in
-          let _self = _self#for_direction _x3 in
-          let _self = _self#block _x4 in
-          _self
-      | Continue _x0 ->
-          let _self = _self#label _x0 in
-          _self
-      | Break -> _self
-      | Return _x0 ->
-          let _self = _self#expression _x0 in
-          _self
-      | Int_switch (_x0, _x1, _x2) ->
-          let _self = _self#expression _x0 in
-          let _self = list (fun _self -> _self#int_clause) _self _x1 in
-          let _self = option (fun _self -> _self#block) _self _x2 in
-          _self
-      | String_switch (_x0, _x1, _x2) ->
-          let _self = _self#expression _x0 in
-          let _self = list (fun _self -> _self#string_clause) _self _x1 in
-          let _self = option (fun _self -> _self#block) _self _x2 in
-          _self
-      | Throw _x0 ->
-          let _self = _self#expression _x0 in
-          _self
-      | Try (_x0, _x1, _x2) ->
-          let _self = _self#block _x0 in
-          let _self =
-            option
-              (fun _self (_x0, _x1) ->
-                let _self = _self#exception_ident _x0 in
-                let _self = _self#block _x1 in
-                _self)
-              _self _x1
-          in
-          let _self = option (fun _self -> _self#block) _self _x2 in
-          _self
-      | Debugger -> _self
-
-    method expression : expression -> 'self_type =
-      fun { expression_desc = _x0; comment = _x1 } ->
-        let _self = _self#expression_desc _x0 in
-        _self
-
-    method statement : statement -> 'self_type =
-      fun { statement_desc = _x0; comment = _x1 } ->
-        let _self = _self#statement_desc _x0 in
-        _self
-
-    method variable_declaration : variable_declaration -> 'self_type =
-      fun { ident = _x0; value = _x1; property = _x2; ident_info = _x3 } ->
-        let _self = _self#ident _x0 in
-        let _self = option (fun _self -> _self#expression) _self _x1 in
-        _self
-
-    method block : block -> 'self_type =
-      list (fun _self -> _self#statement) _self
-
-    method program : program -> 'self_type =
-      fun { block = _x0; exports = _x1; export_set = _x2 } ->
-        let _self = _self#block _x0 in
-        _self
-
-    method deps_program : deps_program -> 'self_type =
-      fun { program = _x0; modules = _x1; side_effect = _x2 } ->
-        let _self = _self#program _x0 in
-        let _self = _self#required_modules _x1 in
-        _self
-  end
- 
\ No newline at end of file
diff --git a/jscomp/core/js_fold_basic.ml b/jscomp/core/js_fold_basic.ml
deleted file mode 100644
index e86029b..0000000
--- a/jscomp/core/js_fold_basic.ml
+++ /dev/null
@@ -1,66 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let add_lam_module_ident = Lam_module_ident.Hash_set.add
-
-let create = Lam_module_ident.Hash_set.create
-
-let super = Js_record_iter.super
-
-let count_hard_dependencies hard_dependencies =
-  {
-    super with
-    module_id = (fun _ vid -> add_lam_module_ident hard_dependencies vid);
-    expression =
-      (fun self x ->
-        (match Js_block_runtime.check_additional_id x with
-        | Some id ->
-            add_lam_module_ident hard_dependencies
-              (Lam_module_ident.of_runtime id)
-        | _ -> ());
-        super.expression self x);
-  }
-
-let calculate_hard_dependencies block =
-  let hard_dependencies = create 17 in
-  let obj = count_hard_dependencies hard_dependencies in
-  obj.block obj block;
-  hard_dependencies
-
-(*
-   Given a set of [variables], count which variables  [lam] will depend on
-   Invariant:
-   [variables] are parameters which means immutable so that [Call] 
-   will not depend [variables]
-
-*)
-(* let depends_j (lam : J.expression) (variables : Set_ident.t) =
-   let v = ref Set_ident.empty in
-   let add id =
-    if Set_ident.mem variables id then
-      v := Set_ident.add !v id
-   in
-   ignore @@ (new count_deps add ) # expression lam ;
-   !v
-*)
diff --git a/jscomp/core/js_fold_basic.mli b/jscomp/core/js_fold_basic.mli
deleted file mode 100644
index 826fd32..0000000
--- a/jscomp/core/js_fold_basic.mli
+++ /dev/null
@@ -1,30 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** A module to calculate hard dependency based on JS IR in module [J] *)
-
-(* val depends_j : J.expression -> Set_ident.t -> Set_ident.t *)
-
-val calculate_hard_dependencies : J.block -> Lam_module_ident.Hash_set.t
-(** TODO: {!Ordered_hash_set} for better ordering *)
diff --git a/jscomp/core/js_fun_env.ml b/jscomp/core/js_fun_env.ml
deleted file mode 100644
index 6ed8101..0000000
--- a/jscomp/core/js_fun_env.ml
+++ /dev/null
@@ -1,104 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Make it mutable so that we can do
-   in-place change without constructing a new one
-   -- however, it's a design choice -- to be reviewed later
-*)
-
-type immutable_mask =
-  | All_immutable_and_no_tail_call
-      (** iff not tailcalled 
-      if tailcalled, in theory, it does not need change params, 
-      for example
-      {[
-        let rec f  (n : int ref) = 
-          if !n > 0 then decr n; print_endline "hi"
-      else  f n
-      ]}
-      in this case, we still create [Immutable_mask], 
-      since the inline behavior is slightly different
-  *)
-  | Immutable_mask of bool array
-
-type t = {
-  mutable unbounded : Set_ident.t;
-  mutable bound_loop_mutable_values : Set_ident.t;
-  used_mask : bool array;
-  immutable_mask : immutable_mask;
-}
-(** Invariant: unused param has to be immutable *)
-
-let make ?immutable_mask n =
-  {
-    unbounded = Set_ident.empty;
-    used_mask = Array.make n false;
-    immutable_mask =
-      (match immutable_mask with
-      | Some x -> Immutable_mask x
-      | None -> All_immutable_and_no_tail_call);
-    bound_loop_mutable_values = Set_ident.empty;
-  }
-
-let no_tailcall x =
-  match x.immutable_mask with
-  | All_immutable_and_no_tail_call -> []
-  | Immutable_mask arr -> Array.to_list arr
-
-let mark_unused t i = t.used_mask.(i) <- true
-
-let get_unused t i = t.used_mask.(i)
-
-(* let get_length t = Array.length t.used_mask *)
-
-(* let to_string env =
-   String.concat ","
-    (Ext_list.map (Set_ident.elements  env.unbounded )
-      (fun id  -> Printf.sprintf "%s/%d" id.name id.stamp)
-       ) *)
-
-let get_mutable_params (params : Ident.t list) (x : t) =
-  match x.immutable_mask with
-  | All_immutable_and_no_tail_call -> []
-  | Immutable_mask xs ->
-      Ext_list.filter_mapi params (fun p i ->
-          if not xs.(i) then Some p else None)
-
-let get_unbounded t = t.unbounded
-
-let set_unbounded env v =
-  (* Ext_log.err "%s -- set @." (to_string env); *)
-  (* if Set_ident.is_empty env.bound then *)
-  env.unbounded <- v
-(* else assert false *)
-
-let set_lexical_scope env bound_loop_mutable_values =
-  env.bound_loop_mutable_values <- bound_loop_mutable_values
-
-let get_lexical_scope env = env.bound_loop_mutable_values
-
-(* TODO:  can be refined if it
-    only enclose toplevel variables
-*)
-(* let is_empty t = Set_ident.is_empty t.unbounded *)
diff --git a/jscomp/core/js_fun_env.mli b/jscomp/core/js_fun_env.mli
deleted file mode 100644
index 5cfa7f6..0000000
--- a/jscomp/core/js_fun_env.mli
+++ /dev/null
@@ -1,53 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Define type t used in JS IR to collect some meta data 
-    for a function,like its closures, etc 
-*)
-
-type t
-
-val make : ?immutable_mask:bool array -> int -> t
-
-val no_tailcall : t -> bool list
-
-(* val is_empty : t -> bool  *)
-
-val set_unbounded : t -> Set_ident.t -> unit
-
-val set_lexical_scope : t -> Set_ident.t -> unit
-
-val get_lexical_scope : t -> Set_ident.t
-
-(* val to_string : t -> string *)
-
-val mark_unused : t -> int -> unit
-
-val get_unused : t -> int -> bool
-
-val get_mutable_params : Ident.t list -> t -> Ident.t list
-
-val get_unbounded : t -> Set_ident.t
-
-(* val get_length : t -> int *)
diff --git a/jscomp/core/js_implementation.ml b/jscomp/core/js_implementation.ml
deleted file mode 100644
index 01b1229..0000000
--- a/jscomp/core/js_implementation.ml
+++ /dev/null
@@ -1,223 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 2002 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the Q Public License version 1.0.               *)
-(*                                                                     *)
-(***********************************************************************)
-
-(* adapted by rescript from [driver/compile.ml] for convenience    *)
-
-let module_of_filename outputprefix =
-  let basename = Filename.basename outputprefix in
-  let name =
-    try
-      let pos = String.index basename '.' in
-      String.sub basename 0 pos
-    with Not_found -> basename
-  in
-  String.capitalize_ascii name
-
-let fprintf = Format.fprintf
-
-let print_if_pipe ppf flag printer arg =
-  if !flag then fprintf ppf "%a@." printer arg;
-  arg
-
-let print_if ppf flag printer arg = if !flag then fprintf ppf "%a@." printer arg
-
-let output_deps_set name set =
-  output_string stdout name;
-  output_string stdout ": ";
-  Depend.StringSet.iter
-    (fun s ->
-      if s <> "" && s.[0] <> '*' then (
-        output_string stdout s;
-        output_string stdout " "))
-    set;
-  output_string stdout "\n"
-
-let process_with_gentype cmt_file =
-  if !Clflags.bs_gentype then GenTypeMain.processCmtFile cmt_file
-
-let after_parsing_sig ppf outputprefix ast =
-  if !Clflags.only_parse = false then (
-    Ast_config.process_sig ast;
-    if !Js_config.modules then
-      output_deps_set !Location.input_name
-        (Ast_extract.read_parse_and_extract Mli ast);
-    (if !Js_config.binary_ast then
-     let sourcefile = !Location.input_name in
-     Binary_ast.write_ast Mli ~sourcefile
-       ~output:(outputprefix ^ Literals.suffix_iast)
-       (* to support relocate to another directory *)
-       ast);
-    if !Js_config.as_pp then (
-      output_string stdout Config.ast_intf_magic_number;
-      output_value stdout (!Location.input_name : string);
-      output_value stdout ast);
-    if !Js_config.syntax_only then Warnings.check_fatal ()
-    else
-      let modulename = module_of_filename outputprefix in
-      Lam_compile_env.reset ();
-      let initial_env = Res_compmisc.initial_env ~modulename () in
-      Env.set_unit_name modulename;
-      let tsg = Typemod.transl_signature initial_env ast in
-      if !Clflags.dump_typedtree then
-        fprintf ppf "%a@." Printtyped.interface tsg;
-      let sg = tsg.sig_type in
-      ignore (Includemod.signatures initial_env sg sg);
-      Delayed_checks.force_delayed_checks ();
-      Warnings.check_fatal ();
-      let deprecated = Builtin_attributes.deprecated_of_sig ast in
-      let sg =
-        Env.save_signature ~deprecated sg modulename (outputprefix ^ ".cmi")
-      in
-      Typemod.save_signature modulename tsg outputprefix !Location.input_name
-        initial_env sg;
-      process_with_gentype (outputprefix ^ ".cmti"))
-
-let interface ~parser ppf ?outputprefix fname =
-  let outputprefix =
-    match outputprefix with
-    | None -> Config_util.output_prefix fname
-    | Some x -> x
-  in
-  Res_compmisc.init_path ();
-  parser fname
-  |> Cmd_ppx_apply.apply_rewriters ~restore:false ~tool_name:Js_config.tool_name
-       Mli
-  |> Ppx_entry.rewrite_signature
-  |> print_if_pipe ppf Clflags.dump_parsetree Printast.interface
-  |> print_if_pipe ppf Clflags.dump_source Pprintast.signature
-  |> after_parsing_sig ppf outputprefix
-
-let interface_mliast ppf fname setup =
-  Res_compmisc.init_path ();
-  Binary_ast.read_ast_exn ~fname Mli setup
-  |> print_if_pipe ppf Clflags.dump_parsetree Printast.interface
-  |> print_if_pipe ppf Clflags.dump_source Pprintast.signature
-  |> after_parsing_sig ppf (Config_util.output_prefix fname)
-
-let all_module_alias (ast : Parsetree.structure) =
-  Ext_list.for_all ast (fun { pstr_desc } ->
-      match pstr_desc with
-      | Pstr_module { pmb_expr = { pmod_desc = Pmod_ident _ } } -> true
-      | Pstr_attribute _ -> true
-      | Pstr_eval _ | Pstr_value _ | Pstr_primitive _ | Pstr_type _
-      | Pstr_typext _ | Pstr_exception _ | Pstr_module _ | Pstr_recmodule _
-      | Pstr_modtype _ | Pstr_open _ | Pstr_class _ | Pstr_class_type _
-      | Pstr_include _ | Pstr_extension _ ->
-          false)
-
-let no_export (rest : Parsetree.structure) : Parsetree.structure =
-  match rest with
-  | head :: _ ->
-      let loc = head.pstr_loc in
-      Ast_helper.
-        [
-          Str.include_ ~loc
-            (Incl.mk ~loc
-               (Mod.constraint_ ~loc (Mod.structure ~loc rest)
-                  (Mty.signature ~loc [])));
-        ]
-  | _ -> rest
-
-let after_parsing_impl ppf outputprefix (ast : Parsetree.structure) =
-  if !Clflags.only_parse = false then (
-    Js_config.all_module_aliases :=
-      !Clflags.assume_no_mli = Mli_non_exists && all_module_alias ast;
-    Ast_config.process_str ast;
-    let ast = if !Js_config.no_export then no_export ast else ast in
-    if !Js_config.modules then
-      output_deps_set !Location.input_name
-        (Ast_extract.read_parse_and_extract Ml ast);
-    (if !Js_config.binary_ast then
-     let sourcefile = !Location.input_name in
-     Binary_ast.write_ast ~sourcefile Ml
-       ~output:(outputprefix ^ Literals.suffix_ast)
-       ast);
-    if !Js_config.as_pp then (
-      output_string stdout Config.ast_impl_magic_number;
-      output_value stdout (!Location.input_name : string);
-      output_value stdout ast);
-    if !Js_config.syntax_only then Warnings.check_fatal ()
-    else
-      let modulename = Ext_filename.module_name outputprefix in
-      Lam_compile_env.reset ();
-      let env = Res_compmisc.initial_env ~modulename () in
-      Env.set_unit_name modulename;
-      let typedtree, coercion, _, _ =
-        Typemod.type_implementation_more
-          ?check_exists:(if !Js_config.force_cmi then None else Some ())
-          !Location.input_name outputprefix modulename env ast
-      in
-      let typedtree_coercion = (typedtree, coercion) in
-      print_if ppf Clflags.dump_typedtree
-        Printtyped.implementation_with_coercion typedtree_coercion;
-      (if !Js_config.cmi_only then Warnings.check_fatal ()
-      else
-        let lambda, exports =
-          Translmod.transl_implementation modulename typedtree_coercion
-        in
-        let js_program =
-          print_if_pipe ppf Clflags.dump_rawlambda Printlambda.lambda lambda
-          |> Lam_compile_main.compile outputprefix exports
-        in
-        if not !Js_config.cmj_only then
-          Lam_compile_main.lambda_as_module js_program outputprefix);
-      process_with_gentype (outputprefix ^ ".cmt"))
-
-let implementation ~parser ppf ?outputprefix fname =
-  let outputprefix =
-    match outputprefix with
-    | None -> Config_util.output_prefix fname
-    | Some x -> x
-  in
-  Res_compmisc.init_path ();
-  parser fname
-  |> Cmd_ppx_apply.apply_rewriters ~restore:false ~tool_name:Js_config.tool_name
-       Ml
-  |> Ppx_entry.rewrite_implementation
-  |> print_if_pipe ppf Clflags.dump_parsetree Printast.implementation
-  |> print_if_pipe ppf Clflags.dump_source Pprintast.structure
-  |> after_parsing_impl ppf outputprefix
-
-let implementation_mlast ppf fname setup =
-  Res_compmisc.init_path ();
-  Binary_ast.read_ast_exn ~fname Ml setup
-  |> print_if_pipe ppf Clflags.dump_parsetree Printast.implementation
-  |> print_if_pipe ppf Clflags.dump_source Pprintast.structure
-  |> after_parsing_impl ppf (Config_util.output_prefix fname)
-
-let make_structure_item ~ns cunit : Parsetree.structure_item =
-  let open Ast_helper in
-  let loc = Location.none in
-  Str.module_
-    (Mb.mk { txt = cunit; loc }
-       (Mod.ident { txt = Lident (Ext_namespace_encode.make ~ns cunit); loc }))
-
-(** decoding [.mlmap]
-    keep in sync {!Bsb_namespace_map_gen.output}
-*)
-let implementation_map ppf sourcefile =
-  let () = Js_config.cmj_only := true in
-  let ichan = open_in_bin sourcefile in
-  seek_in ichan (Ext_digest.length + 1);
-  let list_of_modules = Ext_io.rev_lines_of_chann ichan in
-  close_in ichan;
-  let ns = Ext_filename.module_name sourcefile in
-  let ml_ast =
-    Ext_list.fold_left list_of_modules [] (fun acc line ->
-        if Ext_string.is_empty line then acc
-        else make_structure_item ~ns line :: acc)
-  in
-  Res_compmisc.init_path ();
-  ml_ast
-  |> print_if_pipe ppf Clflags.dump_parsetree Printast.implementation
-  |> print_if_pipe ppf Clflags.dump_source Pprintast.structure
-  |> after_parsing_impl ppf (Config_util.output_prefix sourcefile)
diff --git a/jscomp/core/js_implementation.mli b/jscomp/core/js_implementation.mli
deleted file mode 100644
index 7a6f3a9..0000000
--- a/jscomp/core/js_implementation.mli
+++ /dev/null
@@ -1,62 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript  
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** High level compilation module *)
-
-val interface :
-  parser:(string -> Parsetree.signature) ->
-  Format.formatter ->
-  ?outputprefix:string ->
-  string ->
-  unit
-(** This module defines a function to compile the program directly into [js]
-    given [filename] and [outputprefix], 
-    it will be useful if we don't care about bytecode output(generating js only).
-*)
-
-val interface_mliast :
-  Format.formatter -> string -> ([ `ml | `rescript | `default ] -> unit) -> unit
-
-(* val after_parsing_impl :
-   Format.formatter ->
-   string ->
-   Parsetree.structure ->
-   unit *)
-(** [after_parsing_impl ppf sourcefile outputprefix ast ]
-    Make sure you need run {!Res_compmisc.init_path} for set up
-    Used in eval
-*)
-
-val implementation :
-  parser:(string -> Parsetree.structure) ->
-  Format.formatter ->
-  ?outputprefix:string ->
-  string ->
-  unit
-(** [implementation ppf sourcefile outprefix] compiles to JS directly *)
-
-val implementation_mlast :
-  Format.formatter -> string -> ([ `ml | `rescript | `default ] -> unit) -> unit
-
-val implementation_map : Format.formatter -> string -> unit
diff --git a/jscomp/core/js_long.ml b/jscomp/core/js_long.ml
deleted file mode 100644
index 9e4e347..0000000
--- a/jscomp/core/js_long.ml
+++ /dev/null
@@ -1,160 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-
-type int64_call = J.expression list -> J.expression
-
-let int64_call (fn : string) args =
-  E.runtime_call Js_runtime_modules.int64 fn args
-
-(* below should  not depend on layout *)
-
-let of_const (v : Int64.t) =
-  match v with
-  | 0L -> E.runtime_var_dot Js_runtime_modules.int64 "zero"
-  | 1L -> E.runtime_var_dot Js_runtime_modules.int64 "one"
-  | -1L -> E.runtime_var_dot Js_runtime_modules.int64 "neg_one"
-  | 9223372036854775807L -> E.runtime_var_dot Js_runtime_modules.int64 "max_int"
-  | -9223372036854775808L ->
-      E.runtime_var_dot Js_runtime_modules.int64 "min_int"
-  | _ ->
-      let unsigned_lo = E.uint32 (Int64.to_int32 v) in
-      let hi = E.int (Int64.to_int32 (Int64.shift_right v 32)) in
-      E.array Immutable [ hi; unsigned_lo ]
-(* Assume the encoding of Int64 *)
-
-let to_int32 args = int64_call "to_int32" args
-
-(* let get_lo x = E.array_index_by_int x 1l   *)
-(* E.to_int32 @@ get_lo (Ext_list.singleton_exn args) *)
-
-let of_int32 (args : J.expression list) =
-  match args with
-  | [ { expression_desc = Number (Int { i }); _ } ] ->
-      of_const (Int64.of_int32 i)
-  | _ -> int64_call "of_int32" args
-
-let comp (cmp : Lam_compat.comparison) args =
-  E.runtime_call Js_runtime_modules.caml_primitive
-    (match cmp with
-    | Ceq -> "i64_eq"
-    | Cneq -> "i64_neq"
-    | Clt -> "i64_lt"
-    | Cgt -> "i64_gt"
-    | Cle -> "i64_le"
-    | Cge -> "i64_ge")
-    args
-
-let min args = E.runtime_call Js_runtime_modules.caml_primitive "i64_min" args
-
-let max args = E.runtime_call Js_runtime_modules.caml_primitive "i64_max" args
-
-let neg args = int64_call "neg" args
-
-let add args = int64_call "add" args
-
-let sub args = int64_call "sub" args
-
-let mul args = int64_call "mul" args
-
-let div args = int64_call "div" args
-
-(** Note if operands are not pure, we need hold shared value, 
-    which is  a statement [var x = ... ; x ], it does not fit 
-    current pipe-line fall back to a function call
-*)
-let bit_op (* op : E.t -> E.t -> E.t*) runtime_call args =
-  int64_call runtime_call args
-
-(*disable optimizations relying on int64 representations
-  this maybe outdated when we switch to bigint
-*)
-(* match args  with
-   | [l;r] ->
-   (* Int64 is a block in ocaml, a little more conservative in inlining *)
-   if Js_analyzer.is_okay_to_duplicate l  &&
-     Js_analyzer.is_okay_to_duplicate r then
-    make ~lo:(op (get_lo l) (get_lo r))
-      ~hi:(op (get_hi l) (get_hi r))
-   else
-   | _ -> assert false *)
-
-let xor = bit_op "xor"
-
-let or_ = bit_op "or_"
-
-let and_ = bit_op "and_"
-
-let lsl_ args = int64_call "lsl_" args
-
-let lsr_ args = int64_call "lsr_" args
-
-let asr_ args = int64_call "asr_" args
-
-let mod_ args = int64_call "mod_" args
-
-let swap args = int64_call "swap" args
-
-(* Safe constant propgation
-   {[
-     Number.MAX_SAFE_INTEGER:
-       Math.pow(2,53) - 1
-   ]}
-   {[
-     Number.MIN_SAFE_INTEGER:
-       - (Math.pow(2,53) -1)
-   ]}
-   Note that [Number._SAFE_INTEGER] is in ES6,
-   we can hard code this number without bringing browser issue.
-*)
-let of_float (args : J.expression list) = int64_call "of_float" args
-
-let compare (args : J.expression list) = int64_call "compare" args
-
-(* let of_string (args : J.expression list) =
-   int64_call "of_string" args *)
-(* let get64 = int64_call "get64" *)
-let float_of_bits = int64_call "float_of_bits"
-
-let bits_of_float = int64_call "bits_of_float"
-
-let equal_null args = int64_call "equal_null" args
-
-let equal_undefined args = int64_call "equal_undefined" args
-
-let equal_nullable args = int64_call "equal_nullable" args
-
-let to_float (args : J.expression list) =
-  match args with
-  (* | [ {expression_desc  *)
-  (*      = Caml_block (  *)
-  (*          [lo =  *)
-  (*           {expression_desc = Number (Int {i = lo; _}) }; *)
-  (*           hi =  *)
-  (*           {expression_desc = Number (Int {i = hi; _}) }; *)
-  (*          ], _, _, _); _ }]  *)
-  (*   ->  *)
-  | [ _ ] -> int64_call "to_float" args
-  | _ -> assert false
diff --git a/jscomp/core/js_long.mli b/jscomp/core/js_long.mli
deleted file mode 100644
index 8b091a9..0000000
--- a/jscomp/core/js_long.mli
+++ /dev/null
@@ -1,83 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2016 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 int64_call = J.expression list -> J.expression
-
-(* val make_const : lo:Int32.t -> hi:Int32.t -> J.expression *)
-
-val of_const : int64 -> J.expression
-
-val to_int32 : int64_call
-
-val of_int32 : int64_call
-
-val comp : Lam_compat.comparison -> int64_call
-
-val neg : int64_call
-
-val add : int64_call
-
-val sub : int64_call
-
-val mul : int64_call
-
-val div : int64_call
-
-val xor : int64_call
-
-val mod_ : int64_call
-
-val lsl_ : int64_call
-
-val lsr_ : int64_call
-
-val asr_ : int64_call
-
-val and_ : int64_call
-
-val or_ : int64_call
-
-val swap : int64_call
-
-val min : int64_call
-
-val max : int64_call
-
-val equal_null : int64_call
-
-val equal_undefined : int64_call
-
-val equal_nullable : int64_call
-
-val to_float : int64_call
-
-val of_float : int64_call
-
-val compare : int64_call
-
-(* val of_string : int64_call *)
-val float_of_bits : int64_call
-
-val bits_of_float : int64_call
-(* val get64 : int64_call *)
diff --git a/jscomp/core/js_name_of_module_id.ml b/jscomp/core/js_name_of_module_id.ml
deleted file mode 100644
index 4cb6433..0000000
--- a/jscomp/core/js_name_of_module_id.ml
+++ /dev/null
@@ -1,203 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-(*
-let (=)  (x : int) (y:float) = assert false 
-*)
-
-#ifdef BROWSER
-
-let string_of_module_id_in_browser (x : Lam_module_ident.t) =  
-  match x.kind with
-  | External {name} -> name
-  | Runtime | Ml -> 
-    "./stdlib/" ^  Ext_string.uncapitalize_ascii x.id.name ^ ".js"
-
-let string_of_module_id 
-    (id : Lam_module_ident.t)
-    ~output_dir:(_:string)
-    (_module_system : Js_packages_info.module_system)
-  = string_of_module_id_in_browser id
-
-#else
-  
-let (//) = Filename.concat 
-
-
-let fix_path_for_windows : string -> string = 
-  if Ext_sys.is_windows_or_cygwin then Ext_string.replace_backward_slash
-  else fun s -> s 
-
-
-(* dependency is runtime module *)  
-let get_runtime_module_path 
-    (dep_module_id : Lam_module_ident.t) 
-    (current_package_info : Js_packages_info.t)
-    (module_system : Js_packages_info.module_system) = 
-  let current_info_query = 
-    Js_packages_info.query_package_infos current_package_info
-      module_system  in
-  let js_file =  
-    Ext_namespace.js_name_of_modulename dep_module_id.id.name 
-      Little Literals.suffix_js in 
-  match current_info_query with        
-  | Package_not_found -> assert false
-  | Package_script -> 
-    Js_packages_info.runtime_package_path module_system js_file          
-  | Package_found pkg -> 
-    let  dep_path  = 
-      "lib" // Js_packages_info.runtime_dir_of_module_system module_system in 
-    if  Js_packages_info.is_runtime_package current_package_info then 
-      Ext_path.node_rebase_file
-        ~from:pkg.rel_path
-        ~to_:dep_path 
-        js_file
-        (* TODO: we assume that both [x] and [path] could only be relative path
-            which is guaranteed by [-bs-package-output]
-        *)
-    else  
-      match module_system with 
-      | Commonjs | Esmodule -> 
-        Js_packages_info.runtime_package_path module_system js_file              
-      (* Note we did a post-processing when working on Windows *)
-      | Es6_global 
-        -> 
-        (* lib/ocaml/xx.cmj --               
-            HACKING: FIXME
-            maybe we can caching relative package path calculation or employ package map *)
-        (* assert false  *)
-        Ext_path.rel_normalized_absolute_path              
-          ~from:(
-            Js_packages_info.get_output_dir 
-              current_package_info
-              ~package_dir:(Lazy.force Ext_path.package_dir)
-              module_system )
-          (*Invariant: the package path to rescript, it is used to 
-            calculate relative js path
-          *)
-          (match !Js_config.customize_runtime with 
-           | None ->
-             ((Filename.dirname (Filename.dirname Sys.executable_name)) // dep_path // js_file)
-           | Some path -> 
-             path //dep_path // js_file 
-          )  
-
-(* [output_dir] is decided by the command line argument *)
-let string_of_module_id 
-    (dep_module_id : Lam_module_ident.t) 
-    ~(output_dir : string )
-    (module_system : Js_packages_info.module_system)        
-  : string =
-  let current_package_info = Js_packages_state.get_packages_info ()  in 
-  fix_path_for_windows (    
-    match dep_module_id.kind  with 
-    | External {name} -> name (* the literal string for external package *)
-    (* This may not be enough, 
-        1. For cross packages, we may need settle 
-        down a single js package
-        2. We may need es6 path for dead code elimination
-         But frankly, very few JS packages have no dependency, 
-         so having plugin may sound not that bad   
-    *)
-    | Runtime  -> 
-      get_runtime_module_path dep_module_id current_package_info module_system
-    | Ml  -> 
-      let current_info_query = 
-        Js_packages_info.query_package_infos 
-          current_package_info
-          module_system  
-      in
-      match Lam_compile_env.get_package_path_from_cmj dep_module_id with 
-      | (package_path, dep_package_info, case) -> 
-
-
-        let dep_info_query =  
-          Js_packages_info.query_package_infos dep_package_info module_system 
-        in 
-        match dep_info_query, current_info_query with
-        | Package_not_found , _  -> 
-          Bs_exception.error (Missing_ml_dependency dep_module_id.id.name)
-        | Package_script , Package_found _  -> 
-          Bs_exception.error (Dependency_script_module_dependent_not dep_module_id.id.name)
-        | (Package_script  | Package_found _ ), Package_not_found -> assert false
-
-        | Package_found ({suffix} as pkg), Package_script 
-          ->    
-          let js_file =  
-            Ext_namespace.js_name_of_modulename dep_module_id.id.name case suffix in 
-          pkg.pkg_rel_path // js_file
-        | Package_found ({suffix } as dep_pkg),
-          Package_found cur_pkg -> 
-          let js_file =  
-            Ext_namespace.js_name_of_modulename dep_module_id.id.name case suffix in 
-
-          if  Js_packages_info.same_package_by_name current_package_info  dep_package_info then 
-            Ext_path.node_rebase_file
-              ~from:cur_pkg.rel_path
-              ~to_:dep_pkg.rel_path 
-              js_file
-              (* TODO: we assume that both [x] and [path] could only be relative path
-                  which is guaranteed by [-bs-package-output]
-              *)
-          else  
-          if Js_packages_info.is_runtime_package dep_package_info then 
-            get_runtime_module_path dep_module_id current_package_info module_system
-          else 
-            begin match module_system with 
-              | Commonjs | Esmodule -> 
-                dep_pkg.pkg_rel_path // js_file
-              (* Note we did a post-processing when working on Windows *)
-              | Es6_global 
-                ->             
-                begin 
-                  Ext_path.rel_normalized_absolute_path              
-                    ~from:(
-                      Js_packages_info.get_output_dir 
-                        current_package_info
-                        ~package_dir:(Lazy.force Ext_path.package_dir)
-                        module_system 
-                    )
-                    (package_path // dep_pkg.rel_path // js_file)              
-                end
-            end
-        | Package_script, Package_script 
-          -> 
-          let js_file =  
-            Ext_namespace.js_name_of_modulename dep_module_id.id.name case Literals.suffix_js in 
-          match Config_util.find_opt js_file with 
-          | Some file -> 
-            let basename = Filename.basename file in 
-            let dirname = Filename.dirname file in 
-            Ext_path.node_rebase_file
-              ~from:(
-                Ext_path.absolute_cwd_path 
-                  output_dir)
-              ~to_:(
-                Ext_path.absolute_cwd_path 
-
-                  dirname)
-              basename  
-          | None -> 
-            Bs_exception.error (Js_not_found js_file))
-
-#endif
diff --git a/jscomp/core/js_name_of_module_id.mli b/jscomp/core/js_name_of_module_id.mli
deleted file mode 100644
index 2243b94..0000000
--- a/jscomp/core/js_name_of_module_id.mli
+++ /dev/null
@@ -1,37 +0,0 @@
-(* Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(**
-   generate the mdoule path so that it can be spliced here:
-   {[
-     var Xx = require("package/path/to/xx.js")
-   ]}
-   Note that it has to be consistent to how it is generated
-*)
-
-val string_of_module_id :
-  Lam_module_ident.t ->
-  output_dir:string ->
-  Js_packages_info.module_system ->
-  string
diff --git a/jscomp/core/js_number.ml b/jscomp/core/js_number.ml
deleted file mode 100644
index 55612c6..0000000
--- a/jscomp/core/js_number.ml
+++ /dev/null
@@ -1,97 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = float
-
-(* http://www.ecma-international.org/ecma-262/5.1/#sec-7.8.3
-   http://caml.inria.fr/pub/docs/manual-ocaml/lex.html
-   {[
-     float-literal ::= [-](0...9){0...9|_}[.{0...9|_}][(e|E)][(e|E)[+|-](0...9){0...9|_}]
-   ]}
-   In ocaml, the interpretation of floating-point literals that
-   fall outside the range of representable floating-point values is undefined.
-   Also, (_) are accepted
-
-   see https://github.com/ocaml/ocaml/pull/268 that ocaml will have HEXADECIMAL notation
-   support in 4.3
-
-   The Hex part is quite different
-*)
-
-let to_string (v : float) =
-  if v = infinity then "Infinity"
-  else if v = neg_infinity then "-Infinity"
-  else if v <> v then "NaN"
-  else
-    let vint =
-      int_of_float v
-      (* TODO: check if 32-bits will loose some precision *)
-    in
-    if float_of_int vint = v then string_of_int vint
-    else
-      let s1 = Printf.sprintf "%.12g" v in
-      if v = float_of_string s1 then s1
-      else
-        let s2 = Printf.sprintf "%.15g" v in
-        if v = float_of_string s2 then s2 else Printf.sprintf "%.18g" v
-
-let rec is_hex_format_aux (v : string) cur =
-  if v.[cur] = '-' || v.[cur] = '+' then is_hex_format_ox v (cur + 1)
-  else is_hex_format_ox v cur
-
-and is_hex_format_ox v cur =
-  v.[cur] = '0' && (v.[cur + 1] = 'x' || v.[cur + 1] = 'X')
-
-let is_hex_format (v : string) = try is_hex_format_aux v 0 with _ -> false
-
-(*
-  call [to_string (float_of_string v)] 
-  directly would loose some precision and lost some information
-  like '3.0' -> '3'
-
-*)
-let rec aux (v : string) (buf : Buffer.t) i len =
-  if i >= len then ()
-  else
-    let x = v.[i] in
-    if x = '_' then aux v buf (i + 1) len
-    else if x = '.' && i = len - 1 then ()
-    else (
-      Buffer.add_char buf x;
-      aux v buf (i + 1) len)
-
-let transform v len =
-  let buf = Buffer.create len in
-  let i = ref 0 in
-  while !i + 1 < len && v.[!i] = '0' && v.[!i + 1] <> '.' do
-    incr i
-  done;
-  aux v buf !i len;
-  Buffer.contents buf
-
-let caml_float_literal_to_js_string (float_str : string) : string =
-  let len = String.length float_str in
-  if len >= 2 && is_hex_format float_str then
-    to_string (float_of_string float_str)
-  else transform float_str len
diff --git a/jscomp/core/js_number.mli b/jscomp/core/js_number.mli
deleted file mode 100644
index 5c3873a..0000000
--- a/jscomp/core/js_number.mli
+++ /dev/null
@@ -1,29 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = float
-
-(* val to_string : t -> string *)
-
-val caml_float_literal_to_js_string : string -> string
diff --git a/jscomp/core/js_of_lam_array.ml b/jscomp/core/js_of_lam_array.ml
deleted file mode 100644
index c63d702..0000000
--- a/jscomp/core/js_of_lam_array.ml
+++ /dev/null
@@ -1,54 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript  
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(*
-   construct array,
-   set array,
-   ref array,
-
-   Also make sure, don't call any primitive array method, i.e [E.array_index_by_int] 
-
-   We also need check primitive [caml_make_vect], i.e, 
-   [Caml_primitive['caml_make_vect']] see if it's correct 
-
-   [caml_make_vect]
-   [caml_array_sub]
-   [caml_array_append]
-   [caml_array_concat]
-   [caml_make_float_vect]
-   [caml_array_blit]
-
-   research: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Typed_arrays
-
-
- *)
-
-module E = Js_exp_make
-
-(* Parrayref(u|s) *)
-let make_array mt args = E.array mt args
-
-let set_array e e0 e1 = E.assign (E.array_index e e0) e1
-
-let ref_array e e0 = E.array_index e e0
diff --git a/jscomp/core/js_of_lam_array.mli b/jscomp/core/js_of_lam_array.mli
deleted file mode 100644
index 14aaba7..0000000
--- a/jscomp/core/js_of_lam_array.mli
+++ /dev/null
@@ -1,35 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript  
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Utilities for creating Array of JS IR *)
-
-val make_array : J.mutable_flag -> J.expression list -> J.expression
-(** create an array *)
-
-val set_array : J.expression -> J.expression -> J.expression -> J.expression
-(** Here we don't care about [array_kind],  
-    In the future, we might used TypedArray for FloatArray
-*)
-
-val ref_array : J.expression -> J.expression -> J.expression
diff --git a/jscomp/core/js_of_lam_block.ml b/jscomp/core/js_of_lam_block.ml
deleted file mode 100644
index b665462..0000000
--- a/jscomp/core/js_of_lam_block.ml
+++ /dev/null
@@ -1,58 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript  
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-
-(* TODO: it would be even better, if the [tag_info] contains more information
-   about immutablility
-*)
-let make_block mutable_flag (tag_info : Lam_tag_info.t) tag args =
-  match tag_info with _ -> E.make_block tag tag_info args mutable_flag
-
-let field (field_info : Lam_compat.field_dbg_info) e (i : int32) =
-  match field_info with
-  | Fld_tuple | Fld_array ->
-      E.array_index_by_int
-        ?comment:(Lam_compat.str_of_field_info field_info)
-        e i
-  | Fld_poly_var_content -> E.poly_var_value_access e
-  | Fld_poly_var_tag -> E.poly_var_tag_access e
-  | Fld_record_extension { name } -> E.extension_access e (Some name) i
-  | Fld_extension -> E.extension_access e None i
-  | Fld_variant -> E.variant_access e i
-  | Fld_cons -> E.cons_access e i
-  | Fld_record_inline { name } -> E.inline_record_access e name i
-  | Fld_record { name } -> E.record_access e name i
-  | Fld_module { name } -> E.module_access e name i
-
-let field_by_exp e i = E.array_index e i
-
-let set_field (field_info : Lam_compat.set_field_dbg_info) e i e0 =
-  match field_info with
-  | Fld_record_extension_set name -> E.extension_assign e i name e0
-  | Fld_record_inline_set name | Fld_record_set name ->
-      E.record_assign e i name e0
-
-(* This dynamism commes from oo compilaton, it should not happen in record *)
-let set_field_by_exp self index value = E.assign_by_exp self index value
diff --git a/jscomp/core/js_of_lam_block.mli b/jscomp/core/js_of_lam_block.mli
deleted file mode 100644
index 903baa7..0000000
--- a/jscomp/core/js_of_lam_block.mli
+++ /dev/null
@@ -1,46 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Utilities for creating block of lambda expression in JS IR *)
-
-val make_block :
-  Js_op.mutable_flag ->
-  Lam_tag_info.t ->
-  J.expression ->
-  J.expression list ->
-  J.expression
-
-val field : Lam_compat.field_dbg_info -> J.expression -> int32 -> J.expression
-
-val field_by_exp : J.expression -> J.expression -> J.expression
-
-val set_field :
-  Lam_compat.set_field_dbg_info ->
-  J.expression ->
-  int32 ->
-  J.expression ->
-  J.expression
-
-val set_field_by_exp :
-  J.expression -> J.expression -> J.expression -> J.expression
diff --git a/jscomp/core/js_of_lam_module.ml b/jscomp/core/js_of_lam_module.ml
deleted file mode 100644
index ba59509..0000000
--- a/jscomp/core/js_of_lam_module.ml
+++ /dev/null
@@ -1,28 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-
-let make ?comment names (args : J.expression list) =
-  E.make_block ?comment E.zero_int_literal (Blk_module names) args Immutable
diff --git a/jscomp/core/js_of_lam_module.mli b/jscomp/core/js_of_lam_module.mli
deleted file mode 100644
index 9fabfad..0000000
--- a/jscomp/core/js_of_lam_module.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript  
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val make : ?comment:string -> string list -> J.expression list -> J.expression
diff --git a/jscomp/core/js_of_lam_option.ml b/jscomp/core/js_of_lam_option.ml
deleted file mode 100644
index 7c2edf1..0000000
--- a/jscomp/core/js_of_lam_option.ml
+++ /dev/null
@@ -1,107 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-
-type option_unwrap_time = Static_unwrapped | Runtime_maybe_unwrapped
-
-(** Another way: 
-    {[
-      | Var _  ->
-        can only bd detected at runtime thing
-          (E.triple_equal (E.typeof arg)
-             (E.str "number"))
-    ]}
-*)
-let none : J.expression = E.undefined
-
-let is_none_static (arg : J.expression_desc) = match arg with
-  | Undefined _ -> true
-  | _ -> false
-
-let is_not_none (e : J.expression) : J.expression =
-  let desc = e.expression_desc in
-  if is_none_static desc then E.false_
-  else
-    match desc with
-    | Optional_block _ -> E.true_
-    | _ -> E.not (E.triple_equal e none)
-
-(**
-   Invrariant: 
-   - optional encoding
-   -  None encoding
-
-   when no argumet is supplied, [undefined] 
-   if we detect that all rest arguments are [null], 
-   we can remove them
-
-
-   - avoid duplicate evlauation of [arg] when it
-     is not a variable
-     {!Js_ast_util.named_expression} does not help 
-     since we need an expression here, it might be a statement
-*)
-let val_from_option (arg : J.expression) =
-  match arg.expression_desc with
-  | Optional_block (x, _) -> x
-  | _ -> E.runtime_call Js_runtime_modules.option "valFromOption" [ arg ]
-
-let get_default_undefined_from_optional (arg : J.expression) : J.expression =
-  let desc = arg.expression_desc in
-  if is_none_static desc then E.undefined
-  else
-    match desc with
-    | Optional_block (x, _) -> x (* invariant: option encoding *)
-    | _ ->
-        if Js_analyzer.is_okay_to_duplicate arg then
-          (* FIXME: no need do such inlining*)
-          E.econd (is_not_none arg) (val_from_option arg) E.undefined
-        else E.runtime_call Js_runtime_modules.option "option_get" [ arg ]
-
-let option_unwrap (arg : J.expression) : J.expression =
-  let desc = arg.expression_desc in
-  if is_none_static desc then E.undefined
-  else
-    match desc with
-    | Optional_block (x, _) -> E.poly_var_value_access x
-    (* invariant: option encoding *)
-    | _ -> E.runtime_call Js_runtime_modules.option "option_unwrap" [ arg ]
-
-let destruct_optional ~for_sure_none ~for_sure_some ~not_sure
-    (arg : J.expression) =
-  let desc = arg.expression_desc in
-  if is_none_static desc then for_sure_none
-  else
-    match desc with
-    | Optional_block (x, _) -> for_sure_some x
-    | _ -> not_sure ()
-
-let some = E.optional_block
-
-let null_to_opt e = E.econd (E.is_null e) none (some e)
-
-let undef_to_opt e = E.econd (E.is_undef e) none (some e)
-
-let null_undef_to_opt e = E.econd (E.is_null_undefined e) none (some e)
diff --git a/jscomp/core/js_of_lam_option.mli b/jscomp/core/js_of_lam_option.mli
deleted file mode 100644
index c09d0f5..0000000
--- a/jscomp/core/js_of_lam_option.mli
+++ /dev/null
@@ -1,52 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript  
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 option_unwrap_time = Static_unwrapped | Runtime_maybe_unwrapped
-
-val val_from_option : J.expression -> J.expression
-(** Given [Some a ], return [a] *)
-
-val get_default_undefined_from_optional : J.expression -> J.expression
-(** Given [Some x] or [None], return [x]*)
-
-val option_unwrap : J.expression -> J.expression
-(** Given [Some (`a x)] or [None], 
-    return [x] *)
-
-val destruct_optional :
-  for_sure_none:'a ->
-  for_sure_some:(J.expression -> 'a) ->
-  not_sure:(unit -> 'a) ->
-  J.expression ->
-  'a
-
-val some : J.expression -> J.expression
-
-val is_not_none : J.expression -> J.expression
-
-val null_to_opt : J.expression -> J.expression
-
-val undef_to_opt : J.expression -> J.expression
-
-val null_undef_to_opt : J.expression -> J.expression
diff --git a/jscomp/core/js_of_lam_string.ml b/jscomp/core/js_of_lam_string.ml
deleted file mode 100644
index 1ec3f77..0000000
--- a/jscomp/core/js_of_lam_string.ml
+++ /dev/null
@@ -1,63 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript  
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-
-(* We use module B for string compilation, once the upstream can make changes to the
-    patten match of range patterns, we can use module [A] which means [char] is [string] in js,
-    currently, it follows the same patten of ocaml, [char] is [int]
-*)
-
-let const_char (i : int) = E.int ~c:i (Int32.of_int @@ i)
-
-(* string [s[i]] expects to return a [ocaml_char] *)
-let ref_string e e1 = E.string_index e e1
-
-(* [s[i]] excepts to return a [ocaml_char]
-   We use normal array for [bytes]
-   TODO: we can use [Buffer] in the future
-*)
-let ref_byte e e0 = E.array_index e e0
-
-(* {Bytes.set : bytes -> int -> char -> unit }*)
-let set_byte e e0 e1 = E.assign (E.array_index e e0) e1
-
-(**
-   Note that [String.fromCharCode] also works, but it only 
-   work for small arrays, however, for {bytes_to_string} it is likely the bytes 
-   will become big
-   {[
-     String.fromCharCode.apply(null,[87,97])
-       "Wa"
-       String.fromCharCode(87,97)
-       "Wa" 
-   ]}
-   This does not work for large arrays
-   {[
-     String.fromCharCode.apply(null, prim = Array[1048576]) 
-       Maxiume call stack size exceeded
-   ]}
-*)
-let bytes_to_string e =
-  E.runtime_call Js_runtime_modules.bytes_ "to_string" [ e ]
diff --git a/jscomp/core/js_of_lam_string.mli b/jscomp/core/js_of_lam_string.mli
deleted file mode 100644
index eb6ca70..0000000
--- a/jscomp/core/js_of_lam_string.mli
+++ /dev/null
@@ -1,39 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript  
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Utilities to wrap [string] and [bytes] compilation, 
-
-    this is isolated, so that we can swap different representation in the future.
-    [string] is Immutable, so there is not [set_string] method
-*)
-
-val ref_string : J.expression -> J.expression -> J.expression
-
-val ref_byte : J.expression -> J.expression -> J.expression
-
-val set_byte : J.expression -> J.expression -> J.expression -> J.expression
-
-val const_char : int -> J.expression
-
-val bytes_to_string : J.expression -> J.expression
diff --git a/jscomp/core/js_of_lam_tuple.ml b/jscomp/core/js_of_lam_tuple.ml
deleted file mode 100644
index fe56bcf..0000000
--- a/jscomp/core/js_of_lam_tuple.ml
+++ /dev/null
@@ -1,28 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-
-let make (args : J.expression list) =
-  E.make_block E.zero_int_literal Blk_tuple args Immutable
diff --git a/jscomp/core/js_of_lam_tuple.mli b/jscomp/core/js_of_lam_tuple.mli
deleted file mode 100644
index e567a4e..0000000
--- a/jscomp/core/js_of_lam_tuple.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript  
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Utilities for compiling lambda tuple into JS IR *)
-
-val make : J.expression list -> J.expression
diff --git a/jscomp/core/js_of_lam_variant.ml b/jscomp/core/js_of_lam_variant.ml
deleted file mode 100644
index 89922b9..0000000
--- a/jscomp/core/js_of_lam_variant.ml
+++ /dev/null
@@ -1,125 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-module S = Js_stmt_make
-
-type arg_expression = Splice0 | Splice1 of E.t | Splice2 of E.t * E.t
-
-(* we need destruct [undefined] when input is optional *)
-let eval (arg : J.expression) (dispatches : (string * string) list) : E.t =
-  if arg == E.undefined then E.undefined
-  else
-    match arg.expression_desc with
-    | Str {txt} ->
-        let s = Ext_list.assoc_by_string dispatches txt None in
-        E.str s
-    | _ ->
-        E.of_block
-          [
-            S.string_switch arg
-              (Ext_list.map dispatches (fun (s, r) ->
-                   ( Ast_untagged_variants.String s,
-                     J.
-                       {
-                         switch_body = [ S.return_stmt (E.str r) ];
-                         should_break = false;
-                         (* FIXME: if true, still print break*)
-                         comment = None;
-                       } )));
-          ]
-
-(* invariant: optional is not allowed in this case *)
-(* arg is a polyvar *)
-
-(** FIXME:
-    1. duplicated evaluation of expressions arg
-     Solution: calcuate the arg once in the beginning
-    2. avoid block for branches <  3
-    or always?
-    a === 444? "a" : a==222? "b"
-*)
-let eval_as_event (arg : J.expression)
-    (dispatches : (string * string) list option) =
-  match arg.expression_desc with
-  | Caml_block ([ { expression_desc = Str {txt} }; cb ], _, _, Blk_poly_var _)
-    when Js_analyzer.no_side_effect_expression cb ->
-      let v =
-        match dispatches with
-        | Some dispatches -> Ext_list.assoc_by_string dispatches txt None
-        | None -> txt
-      in
-      Splice2 (E.str v, cb)
-  | _ ->
-      Splice2
-        ( (match dispatches with
-          | Some dispatches ->
-              E.of_block
-                [
-                  S.string_switch
-                    (E.poly_var_tag_access arg)
-                    (Ext_list.map dispatches (fun (s, r) ->
-                         ( Ast_untagged_variants.String s,
-                           J.
-                             {
-                               switch_body = [ S.return_stmt (E.str r) ];
-                               should_break = false;
-                               (* FIXME: if true, still print break*)
-                               comment = None;
-                             } )));
-                ]
-          | None -> E.poly_var_tag_access arg),
-          (* TODO: improve, one dispatch later,
-             the problem is that we can not create bindings
-             due to the
-          *)
-          E.poly_var_value_access arg )
-
-(* we need destruct [undefined] when input is optional *)
-let eval_as_int (arg : J.expression) (dispatches : (string * int) list) : E.t =
-  if arg == E.undefined then E.undefined
-  else
-    match arg.expression_desc with
-    | Str {txt} ->
-        E.int (Int32.of_int (Ext_list.assoc_by_string dispatches txt None))
-    | _ ->
-        E.of_block
-          [
-            S.string_switch arg
-              (Ext_list.map dispatches (fun (s, r) ->
-                   ( Ast_untagged_variants.String s,
-                     J.
-                       {
-                         switch_body =
-                           [ S.return_stmt (E.int (Int32.of_int r)) ];
-                         should_break = false;
-                         (* FIXME: if true, still print break*)
-                         comment = None;
-                       } )));
-          ]
-
-let eval_as_unwrap (arg : J.expression) : E.t =
-  match arg.expression_desc with
-  | Caml_block ([ { expression_desc = Number _ }; cb ], _, _, _) -> cb
-  | _ -> E.poly_var_value_access arg
diff --git a/jscomp/core/js_of_lam_variant.mli b/jscomp/core/js_of_lam_variant.mli
deleted file mode 100644
index 61b122c..0000000
--- a/jscomp/core/js_of_lam_variant.mli
+++ /dev/null
@@ -1,39 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* module E = Js_exp_make *)
-
-type arg_expression =
-  | Splice0
-  | Splice1 of J.expression
-  | Splice2 of J.expression * J.expression
-
-val eval : J.expression -> (string * string) list -> J.expression
-
-val eval_as_event :
-  J.expression -> (string * string) list option -> arg_expression
-
-val eval_as_int : J.expression -> (string * int) list -> J.expression
-
-val eval_as_unwrap : J.expression -> J.expression
diff --git a/jscomp/core/js_op.ml b/jscomp/core/js_op.ml
deleted file mode 100644
index 9315f73..0000000
--- a/jscomp/core/js_op.ml
+++ /dev/null
@@ -1,192 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Define some basic types used in JS IR *)
-
-type binop =
-  | Eq (* acutally assignment ..
-          TODO: move it into statement, so that all expressions
-          are side efffect free (except function calls)
-       *)
-  | Or
-  | And
-  | EqEqEq
-  | NotEqEq (* | InstanceOf *)
-  | Lt
-  | Le
-  | Gt
-  | Ge
-  | Bor
-  | Bxor
-  | Band
-  | Lsl
-  | Lsr
-  | Asr
-  | Plus
-  | Minus
-  | Mul
-  | Div
-  | Mod
-  | Pow
-  | InstanceOf
-
-(**
-   note that we don't need raise [Div_by_zero] in ReScript
-
-   {[
-     let add x y = x + y  (* | 0 *)
-     let minus x y = x - y (* | 0 *)
-     let mul x y = x * y   (* caml_mul | Math.imul *)
-     let div x y = x / y (* caml_div (x/y|0)*)
-     let imod x y = x mod y  (* caml_mod (x%y) (zero_divide)*)
-
-     let bor x y = x lor y   (* x  | y *)
-     let bxor x y = x lxor y (* x ^ y *)
-     let band x y = x land y (* x & y *)
-     let ilnot  y  = lnot y (* let lnot x = x lxor (-1) *)
-     let ilsl x y = x lsl y (* x << y*)
-     let ilsr x y = x lsr y  (* x >>> y | 0 *)
-     let iasr  x y = x asr y (* x >> y *)
-   ]}
-
-
-   Note that js treat unsigned shift 0 bits in a special way
-   Unsigned shifts convert their left-hand side to Uint32, 
-   signed shifts convert it to Int32.
-   Shifting by 0 digits returns the converted value.
-   {[
-     function ToUint32(x) {
-         return x >>> 0;
-       }
-         function ToInt32(x) {
-             return x >> 0;
-           }
-   ]}
-   So in Js, [-1 >>>0] will be the largest Uint32, while [-1>>0] will remain [-1]
-   and [-1 >>> 0 >> 0 ] will be [-1]
-*)
-type int_op =
-  | Bor
-  | Bxor
-  | Band
-  | Lsl
-  | Lsr
-  | Asr
-  | Plus
-  (* for [+], given two numbers
-     x + y | 0
-  *)
-  | Minus
-  (* x - y | 0 *)
-  | Mul
-  (* *)
-  | Div
-  (* x / y | 0 *)
-  | Mod
-(* x  % y *)
-
-(* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Expressions_and_Operators#Bitwise_operators
-   {[
-     ~
-   ]}
-    ~0xff -> -256
-    design; make sure each operation type is consistent
-*)
-type level = Log | Info | Warn | Error
-
-type kind = Ml | Runtime | External of { name : string; default : bool; import_attributes : External_ffi_types.import_attributes option }
-
-type property = Lam_compat.let_kind = Strict | Alias | StrictOpt | Variable
-
-type property_name = Lit of string | Symbol_name
-
-type 'a access = Getter | Setter
-
-(* literal char *)
-type float_lit = { f : string } [@@unboxed]
-
-type bigint_lit = { positive: bool; value: string }
-
-type number =
-  | Float of float_lit
-  | Int of { i : int32; c : int option }
-  | Uint of int32
-  | BigInt of bigint_lit
-
-(* becareful when constant folding +/-,
-   since we treat it as js nativeint, bitwise operators:
-   https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Bitwise_Operators
-   The operands of all bitwise operators are converted to signed 32-bit integers in two's complement format.'
-*)
-
-type mutable_flag = Mutable | Immutable | NA
-
-type direction_flag = Upto | Downto | Up
-
-(*
-    {[
-      let rec x = 1 :: y
-      and y = 1 :: x
-    ]}
-*)
-type recursive_info = SingleRecursive | NonRecursie | NA
-
-type used_stats =
-  | Dead_pure
-  (* only [Dead] should be taken serious,
-      other status can be converted during
-      inlining
-      -- all exported symbols can not be dead
-      -- once a symbole is called Dead_pure,
-      it can not be alive anymore, we should avoid iterating it
-  *)
-  | Dead_non_pure
-  (* we still need iterating it,
-     just its bindings does not make sense any more *)
-  | Exported (* Once it's exported, shall we change its status anymore? *)
-  (* In general, we should count in one pass, and eliminate code in another
-     pass, you can not do it in a single pass, however, some simple
-     dead code can be detected in a single pass
-  *)
-  | Once_pure (* used only once so that, if we do the inlining, it will be [Dead] *)
-  | Used (**)
-  | Scanning_pure
-  | Scanning_non_pure
-  | NA
-
-type ident_info = {
-  (* mutable recursive_info : recursive_info; *)
-  mutable used_stats : used_stats;
-}
-
-type exports = Ident.t list
-
-type tag_info = Lam_tag_info.t
-
-type length_object = Array | String | Bytes | Function | Caml_block
-
-(** TODO: define constant - for better constant folding  *)
-(* type constant =  *)
-(*   | Const_int of int *)
-(*   | Const_ *)
diff --git a/jscomp/core/js_op_util.ml b/jscomp/core/js_op_util.ml
deleted file mode 100644
index 87997f6..0000000
--- a/jscomp/core/js_op_util.ml
+++ /dev/null
@@ -1,132 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-[@@@warning "+9"]
-
-(* Refer https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_Precedence
-   for precedence
-*)
-
-let op_prec (op : Js_op.binop) =
-  match op with
-  | Eq -> (1, 13, 1)
-  | Or -> (3, 3, 3)
-  | And -> (4, 4, 4)
-  | EqEqEq | NotEqEq -> (8, 8, 9)
-  | Gt | Ge | Lt | Le | InstanceOf -> (9, 9, 10)
-  | Bor -> (5, 5, 5)
-  | Bxor -> (6, 6, 6)
-  | Band -> (7, 7, 7)
-  | Lsl | Lsr | Asr -> (10, 10, 11)
-  | Plus | Minus -> (11, 11, 12)
-  | Mul | Div | Mod | Pow -> (12, 12, 13)
-
-let op_int_prec (op : Js_op.int_op) =
-  match op with
-  | Bor -> (5, 5, 5)
-  | Bxor -> (6, 6, 6)
-  | Band -> (7, 7, 7)
-  | Lsl | Lsr | Asr -> (10, 10, 11)
-  | Plus | Minus -> (11, 11, 12)
-  | Mul | Div | Mod -> (12, 12, 13)
-
-let op_str (op : Js_op.binop) =
-  match op with
-  | Bor -> "|"
-  | Bxor -> "^"
-  | Band -> "&"
-  | Lsl -> "<<"
-  | Lsr -> ">>>"
-  | Asr -> ">>"
-  | Plus -> "+"
-  | Minus -> "-"
-  | Mul -> "*"
-  | Div -> "/"
-  | Mod -> "%"
-  | Pow -> "**"
-  | Eq -> "="
-  | Or -> "||"
-  | And -> "&&"
-  | EqEqEq -> "==="
-  | NotEqEq -> "!=="
-  | Lt -> "<"
-  | Le -> "<="
-  | Gt -> ">"
-  | Ge -> ">="
-  | InstanceOf -> "instanceof"
-
-let op_int_str (op : Js_op.int_op) =
-  match op with
-  | Bor -> "|"
-  | Bxor -> "^"
-  | Band -> "&"
-  | Lsl -> "<<"
-  | Lsr -> ">>>"
-  | Asr -> ">>"
-  | Plus -> "+"
-  | Minus -> "-"
-  | Mul -> "*"
-  | Div -> "/"
-  | Mod -> "%"
-
-let str_of_used_stats x =
-  match (x : Js_op.used_stats) with
-  | Js_op.Dead_pure -> "Dead_pure"
-  | Dead_non_pure -> "Dead_non_pure"
-  | Exported -> "Exported"
-  | Once_pure -> "Once_pure"
-  | Used -> "Used"
-  | Scanning_pure -> "Scanning_pure"
-  | Scanning_non_pure -> "Scanning_non_pure"
-  | NA -> "NA"
-
-let update_used_stats (ident_info : J.ident_info) used_stats =
-  match ident_info.used_stats with
-  | Dead_pure | Dead_non_pure | Exported -> ()
-  | Scanning_pure | Scanning_non_pure | Used | Once_pure | NA ->
-      ident_info.used_stats <- used_stats
-
-let same_str_opt (x : string option) (y : string option) =
-  match (x, y) with
-  | None, None -> true
-  | Some x0, Some y0 -> x0 = y0
-  | None, Some _ | Some _, None -> false
-
-let same_vident (x : J.vident) (y : J.vident) =
-  match (x, y) with
-  | Id x0, Id y0 -> Ident.same x0 y0
-  | Qualified (x, str_opt0), Qualified (y, str_opt1) ->
-      let same_kind (x : Js_op.kind) (y : Js_op.kind) =
-        match (x, y) with
-        | Ml, Ml | Runtime, Runtime -> true
-        | External { name = u; _ }, External { name = v; _ } ->
-            u = v (* not comparing Default since we will do it later *)
-        | _, _ -> false
-      in
-      Ident.same x.id y.id && same_kind x.kind y.kind
-      && same_str_opt str_opt0 str_opt1
-  | Id _, Qualified _ | Qualified _, Id _ -> false
-
-let of_lam_mutable_flag (x : Asttypes.mutable_flag) : Js_op.mutable_flag =
-  match x with Immutable -> Immutable | Mutable -> Mutable
diff --git a/jscomp/core/js_op_util.mli b/jscomp/core/js_op_util.mli
deleted file mode 100644
index db11b3e..0000000
--- a/jscomp/core/js_op_util.mli
+++ /dev/null
@@ -1,41 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Some basic utilties around {!Js_op} module *)
-
-val op_prec : Js_op.binop -> int * int * int
-
-val op_str : Js_op.binop -> string
-
-val op_int_prec : Js_op.int_op -> int * int * int
-
-val op_int_str : Js_op.int_op -> string
-
-val str_of_used_stats : Js_op.used_stats -> string
-
-val update_used_stats : J.ident_info -> Js_op.used_stats -> unit
-
-val same_vident : J.vident -> J.vident -> bool
-
-val of_lam_mutable_flag : Asttypes.mutable_flag -> Js_op.mutable_flag
diff --git a/jscomp/core/js_output.ml b/jscomp/core/js_output.ml
deleted file mode 100644
index b69f426..0000000
--- a/jscomp/core/js_output.ml
+++ /dev/null
@@ -1,145 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-module S = Js_stmt_make
-
-type finished = True | False | Dummy
-(* Have no idea, so that when [++] is applied, always use the other *)
-
-type t = {
-  block : J.block;
-  value : J.expression option;
-  output_finished : finished;
-}
-
-type continuation = Lam_compile_context.continuation
-
-let make ?value ?(output_finished = False) block =
-  { block; value; output_finished }
-
-let dummy = { value = None; block = []; output_finished = Dummy }
-
-(** This can be merged with 
-    {!output_of_block_and_expression} *)
-let output_of_expression (continuation : continuation) (exp : J.expression)
-    ~(no_effects : bool Lazy.t) =
-  match continuation with
-  | EffectCall Not_tail ->
-      if Lazy.force no_effects then dummy
-      else { block = []; value = Some exp; output_finished = False }
-  | Declare (kind, n) -> make [ S.define_variable ~kind n exp ]
-  | Assign n -> make [ S.assign n exp ]
-  | EffectCall (Maybe_tail_is_return _) ->
-      make [ S.return_stmt exp ] ~output_finished:True
-  | NeedValue _ -> { block = []; value = Some exp; output_finished = False }
-
-let output_of_block_and_expression (continuation : continuation)
-    (block : J.block) exp : t =
-  match continuation with
-  | EffectCall Not_tail -> make block ~value:exp
-  | EffectCall (Maybe_tail_is_return _) ->
-      make (Ext_list.append_one block (S.return_stmt exp)) ~output_finished:True
-  | Declare (kind, n) ->
-      make (Ext_list.append_one block (S.define_variable ~kind n exp))
-  | Assign n -> make (Ext_list.append_one block (S.assign n exp))
-  | NeedValue _ -> make block ~value:exp
-
-let block_with_opt_expr block (x : J.expression option) : J.block =
-  match x with
-  | None -> block
-  | Some x when Js_analyzer.no_side_effect_expression x -> block
-  | Some x -> block @ [ S.exp x ]
-
-let opt_expr_with_block (x : J.expression option) block : J.block =
-  match x with
-  | None -> block
-  | Some x when Js_analyzer.no_side_effect_expression x -> block
-  | Some x -> S.exp x :: block
-
-let rec unnest_block (block : J.block) : J.block =
-  match block with
-  | [ { statement_desc = Block block } ] -> unnest_block block
-  | _ -> block
-
-let output_as_block (x : t) : J.block =
-  match x with
-  | { block; value = opt; output_finished } ->
-      let block = unnest_block block in
-      if output_finished = True then block else block_with_opt_expr block opt
-
-let to_break_block (x : t) : J.block * bool =
-  let block = unnest_block x.block in
-  match x with
-  | { output_finished = True; _ } -> (block, false)
-  (* value does not matter when [finished] is true
-      TODO: check if it has side efects
-  *)
-  | { value = None; output_finished } -> (
-      (block, match output_finished with True -> false | False | Dummy -> true))
-  | { value = Some _ as opt; _ } -> (block_with_opt_expr block opt, true)
-
-(** TODO: make everything expression make inlining hard, and code not readable?
-           1. readability dpends on how we print the expression
-           2. inlining needs generate symbols, which are statements, type mismatch
-              we need capture [Exp e]
-
-           can we call them all [statement]? statement has no value
-*)
-
-(* | {block = [{statement_desc = Exp e }]; value = None ; _}, _ *)
-(*   -> *)
-(*     append { x with block = []; value = Some e} y *)
-(* |  _ , {block = [{statement_desc = Exp e }]; value = None ; _} *)
-(*   -> *)
-(*     append x { y with block = []; value = Some e} *)
-
-let append_output (x : t) (y : t) : t =
-  match (x, y) with
-  (* ATTTENTION: should not optimize [opt_e2], it has to conform to [NeedValue]*)
-  | { output_finished = True; _ }, _ -> x
-  | _, { block = []; value = None; output_finished = Dummy } -> x
-  (* finished = true --> value = E.undefined otherwise would throw*)
-  | { block = []; value = None; _ }, y -> y
-  | { block = []; value = Some _; _ }, { block = []; value = None; _ } -> x
-  | ( { block = []; value = Some e1; _ },
-      ({ block = []; value = Some e2; output_finished } as z) ) ->
-      if Js_analyzer.no_side_effect_expression e1 then z
-        (* It would optimize cases like [module aliases]
-            Bigarray, List
-        *)
-      else { block = []; value = Some (E.seq e1 e2); output_finished }
-        (* {block = [S.exp e1]; value =  Some e2(\* (E.seq e1 e2) *\); finished} *)
-  | ( { block = block1; value = opt_e1; _ },
-      { block = block2; value = opt_e2; output_finished } ) ->
-      let block1 = unnest_block block1 in
-      make
-        (block1 @ opt_expr_with_block opt_e1 @@ unnest_block block2)
-        ?value:opt_e2 ~output_finished
-
-(* Fold right is more efficient *)
-let concat (xs : t list) : t =
-  Ext_list.fold_right xs dummy (fun x acc -> append_output x acc)
-
-let to_string x = Js_dump.string_of_block (output_as_block x)
diff --git a/jscomp/core/js_output.mli b/jscomp/core/js_output.mli
deleted file mode 100644
index 28e7641..0000000
--- a/jscomp/core/js_output.mli
+++ /dev/null
@@ -1,83 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** The intemediate output when compiling lambda into JS IR *)
-
-(* Hongbo Should we rename this module js_of_lambda since it looks like it's
-   containing that step
-*)
-
-type finished = True | False | Dummy
-(* Have no idea, so that when [++] is applied, always use the other *)
-
-type t = {
-  block : J.block;
-  value : J.expression option;
-  output_finished : finished;
-}
-
-(** When [finished] is true the block is already terminated,
-    value does not make sense
-    [finished]  default to false, which is conservative
-*)
-
-val make : ?value:J.expression -> ?output_finished:finished -> J.block -> t
-
-val output_as_block : t -> J.block
-
-val to_break_block : t -> J.block * bool
-(* the second argument is
-   [true] means [break] needed
-
-   When we know the output is gonna finished true
-   we can reduce
-   {[
-     return xx ;
-     break
-   ]}
-   into
-   {[
-     return ;
-   ]}
-*)
-
-val append_output : t -> t -> t
-
-val dummy : t
-
-val output_of_expression :
-  Lam_compile_context.continuation ->
-  J.expression ->
-  (* compiled expression *)
-  no_effects:bool Lazy.t ->
-  t
-
-val output_of_block_and_expression :
-  Lam_compile_context.continuation -> J.block -> J.expression -> t
-(** - needed for instrument [return] statement properly
-*)
-
-val concat : t list -> t
-
-val to_string : t -> string
diff --git a/jscomp/core/js_packages_info.ml b/jscomp/core/js_packages_info.ml
deleted file mode 100644
index 64a01e8..0000000
--- a/jscomp/core/js_packages_info.ml
+++ /dev/null
@@ -1,231 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-[@@@warning "+9"]
-
-type module_system = Ext_module_system.t
-(* ignore node_modules, just calcluating relative path *)
-
-(* ocamlopt could not optimize such simple case..*)
-let compatible (dep : module_system) (query : module_system) =
-  match query with
-  | Commonjs -> dep = Commonjs
-  | Esmodule -> dep = Esmodule
-  | Es6_global -> dep = Es6_global || dep = Esmodule
-(* As a dependency Leaf Node, it is the same either [global] or [not] *)
-
-type package_info = {
-  module_system : module_system;
-  path : string;
-  suffix : string;
-}
-
-type package_name = Pkg_empty | Pkg_runtime | Pkg_normal of string
-
-let ( // ) = Filename.concat
-
-(* in runtime lib, [es6] and [es6] are treated the same wway *)
-let runtime_dir_of_module_system (ms : module_system) =
-  match ms with Commonjs -> "js" | Esmodule | Es6_global -> "es6"
-
-let runtime_package_path (ms : module_system) js_file =
-  !Bs_version.package_name // "lib"
-  // runtime_dir_of_module_system ms
-  // js_file
-
-type t = { name : package_name; module_systems : package_info list }
-
-let runtime_package_specs : t =
-  {
-    name = Pkg_runtime;
-    module_systems =
-      [
-        { module_system = Esmodule; path = "lib/es6"; suffix = Literals.suffix_js };
-        { module_system = Commonjs; path = "lib/js"; suffix = Literals.suffix_js };
-      ];
-  }
-
-(**
-   populated by the command line
-*)
-let runtime_test_package_specs : t = { name = Pkg_runtime; module_systems = [] }
-
-let same_package_by_name (x : t) (y : t) =
-  match x.name with
-  | Pkg_empty -> y.name = Pkg_empty
-  | Pkg_runtime -> y.name = Pkg_runtime
-  | Pkg_normal s -> (
-      match y.name with
-      | Pkg_normal y -> s = y
-      | Pkg_empty | Pkg_runtime -> false)
-
-let is_runtime_package (x : t) = x.name = Pkg_runtime
-
-let iter (x : t) cb = Ext_list.iter x.module_systems cb
-
-let map (x : t) cb = Ext_list.map x.module_systems cb
-
-(* let equal (x : t) ({name; module_systems}) =
-    x.name = name &&
-    Ext_list.for_all2_no_exn
-      x.module_systems module_systems
-      (fun (a0,a1) (b0,b1) -> a0 = b0 && a1 = b1) *)
-
-(* we don't want force people to use package *)
-
-(** 
-   TODO: not allowing user to provide such specific package name 
-   For empty package, [-bs-package-output] does not make sense
-   it is only allowed to generate commonjs file in the same directory
-*)
-let empty : t = { name = Pkg_empty; module_systems = [] }
-
-let from_name (name : string) : t =
-  { name = Pkg_normal name; module_systems = [] }
-
-let is_empty (x : t) = x.name = Pkg_empty
-
-let string_of_module_system (ms : module_system) =
-  match ms with Commonjs -> "CommonJS" | Esmodule -> "ESModule" | Es6_global -> "Es6_global"
-
-let module_system_of_string package_name : module_system option =
-  match package_name with
-  | "commonjs" -> Some Commonjs
-  | "esmodule" | "es6" -> Some Esmodule
-  | "es6-global" -> Some Es6_global
-  | _ -> None
-
-let dump_package_info (fmt : Format.formatter)
-    ({ module_system = ms; path = name; suffix } : package_info) =
-  Format.fprintf fmt "@[%s@ %s@ %s@]"
-    (string_of_module_system ms)
-    name
-    suffix
-
-let dump_package_name fmt (x : package_name) =
-  match x with
-  | Pkg_empty -> Format.fprintf fmt "@empty_pkg@"
-  | Pkg_normal s -> Format.pp_print_string fmt s
-  | Pkg_runtime -> Format.pp_print_string fmt "@runtime"
-
-let dump_packages_info (fmt : Format.formatter)
-    ({ name; module_systems = ls } : t) =
-  Format.fprintf fmt "@[%a;@ @[%a@]@]" dump_package_name name
-    (Format.pp_print_list
-       ~pp_sep:(fun fmt () -> Format.pp_print_space fmt ())
-       dump_package_info)
-    ls
-
-type package_found_info = {
-  rel_path : string;
-  pkg_rel_path : string;
-  suffix : string;
-}
-
-type info_query =
-  | Package_script
-  | Package_not_found
-  | Package_found of package_found_info
-
-(* Note that package-name has to be exactly the same as
-   npm package name, otherwise the path resolution will be wrong *)
-let query_package_infos ({ name; module_systems } : t)
-    (module_system : module_system) : info_query =
-  match name with
-  | Pkg_empty -> Package_script
-  | Pkg_normal name -> (
-      match
-        Ext_list.find_first module_systems (fun k ->
-            compatible k.module_system module_system)
-      with
-      | Some k ->
-          let rel_path = k.path in
-          let pkg_rel_path = name // rel_path in
-          Package_found { rel_path; pkg_rel_path; suffix = k.suffix }
-      | None -> Package_not_found)
-  | Pkg_runtime -> (
-      (*FIXME: [compatible] seems not correct *)
-      match
-        Ext_list.find_first module_systems (fun k ->
-            compatible k.module_system module_system)
-      with
-      | Some k ->
-          let rel_path = k.path in
-          let pkg_rel_path = !Bs_version.package_name // rel_path in
-          Package_found { rel_path; pkg_rel_path; suffix = k.suffix }
-      | None -> Package_not_found)
-
-let get_js_path (x : t) (module_system : module_system) : string =
-  match
-    Ext_list.find_first x.module_systems (fun k ->
-        compatible k.module_system module_system)
-  with
-  | Some k -> k.path
-  | None -> assert false
-
-(* for a single pass compilation, [output_dir]
-   can be cached
-*)
-let get_output_dir (info : t) ~package_dir module_system =
-  Filename.concat package_dir (get_js_path info module_system)
-
-let add_npm_package_path (packages_info : t) (s : string) : t =
-  if is_empty packages_info then
-    Bsc_args.bad_arg "please set package name first using -bs-package-name "
-  else
-    let handle_module_system module_system =
-      match module_system_of_string module_system with
-      | Some x -> x
-      | None -> Bsc_args.bad_arg ("invalid module system " ^ module_system)
-    in
-    let m =
-      match Ext_string.split ~keep_empty:true s ':' with
-      | [ path ] -> { module_system = Esmodule; path; suffix = Literals.suffix_js }
-      | [ module_system; path ] ->
-          {
-            module_system = handle_module_system module_system;
-            path;
-            suffix = Literals.suffix_js;
-          }
-      | [ module_system; path; suffix ] ->
-          {
-            module_system = handle_module_system module_system;
-            path;
-            suffix;
-          }
-      | _ -> Bsc_args.bad_arg ("invalid npm package path: " ^ s)
-    in
-    { packages_info with module_systems = m :: packages_info.module_systems }
-
-(* support es6 modules instead
-   TODO: enrich ast to support import export
-   http://www.ecma-international.org/ecma-262/6.0/#sec-imports
-   For every module, we need [Ident.t] for accessing and [filename] for import,
-   they are not necessarily the same.
-
-   Es6 modules is not the same with commonjs, we use commonjs currently
-   (play better with node)
-
-   FIXME: the module order matters?
-*)
diff --git a/jscomp/core/js_packages_info.mli b/jscomp/core/js_packages_info.mli
deleted file mode 100644
index 93beccd..0000000
--- a/jscomp/core/js_packages_info.mli
+++ /dev/null
@@ -1,80 +0,0 @@
-(* Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 module_system = Ext_module_system.t
-
-val runtime_dir_of_module_system : module_system -> string
-
-val runtime_package_path : module_system -> string -> string
-
-type package_info = {
-  module_system : module_system;
-  path : string;
-  suffix : string;
-}
-
-type t
-
-val runtime_package_specs : t
-
-val runtime_test_package_specs : t
-
-val is_runtime_package : t -> bool
-
-val same_package_by_name : t -> t -> bool
-
-val iter : t -> (package_info -> unit) -> unit
-
-val map : t -> (package_info -> 'a) -> 'a list
-
-val empty : t
-
-val from_name : string -> t
-
-val is_empty : t -> bool
-
-val dump_packages_info : Format.formatter -> t -> unit
-
-val add_npm_package_path : t -> string -> t
-(** used by command line option 
-    e.g [-bs-package-output commonjs:xx/path]
-*)
-
-type package_found_info = {
-  rel_path : string;
-  pkg_rel_path : string;
-  suffix : string;
-}
-
-type info_query =
-  | Package_script
-  | Package_not_found
-  | Package_found of package_found_info
-
-val get_output_dir : t -> package_dir:string -> module_system -> string
-
-val query_package_infos : t -> module_system -> info_query
-(** Note here we compare the package info by order
-    in theory, we can compare it by set semantics
-*)
diff --git a/jscomp/core/js_packages_state.ml b/jscomp/core/js_packages_state.ml
deleted file mode 100644
index 67e8231..0000000
--- a/jscomp/core/js_packages_state.ml
+++ /dev/null
@@ -1,47 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let packages_info = ref Js_packages_info.empty
-
-let set_package_name name =
-  if Js_packages_info.is_empty !packages_info then
-    packages_info := Js_packages_info.from_name name
-  else Bsc_args.bad_arg "duplicated flag for -bs-package-name"
-
-let make_runtime () : unit =
-  packages_info := Js_packages_info.runtime_package_specs
-
-let make_runtime_test () : unit =
-  packages_info := Js_packages_info.runtime_test_package_specs
-
-let set_package_map module_name =
-  (* set_package_name name ;
-     let module_name = Ext_namespace.namespace_of_package_name name  in *)
-  Clflags.dont_record_crc_unit := Some module_name;
-  Clflags.open_modules := module_name :: !Clflags.open_modules
-
-let update_npm_package_path s =
-  packages_info := Js_packages_info.add_npm_package_path !packages_info s
-
-let get_packages_info () = !packages_info
diff --git a/jscomp/core/js_packages_state.mli b/jscomp/core/js_packages_state.mli
deleted file mode 100644
index 8062c7c..0000000
--- a/jscomp/core/js_packages_state.mli
+++ /dev/null
@@ -1,35 +0,0 @@
-(* Copyright (C) Hongbo Zhang, 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val set_package_name : string -> unit
-
-val make_runtime : unit -> unit
-
-val make_runtime_test : unit -> unit
-
-val set_package_map : string -> unit
-
-val get_packages_info : unit -> Js_packages_info.t
-
-val update_npm_package_path : string -> unit
diff --git a/jscomp/core/js_pass_debug.ml b/jscomp/core/js_pass_debug.ml
deleted file mode 100644
index 3970aa3..0000000
--- a/jscomp/core/js_pass_debug.ml
+++ /dev/null
@@ -1,51 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-
-
-
-
-#if (defined BROWSER || defined RELEASE)
-let dump _ (prog : J.program) = 
-  prog
-#else
-let log_counter = ref 0 
-
-let dump name (prog : J.program) =
-  begin
-    let () = 
-      if !Js_config.diagnose
-      then 
-        begin
-          incr log_counter ; 
-          Ext_log.dwarn ~__POS__ "\n@[[TIME:]%s: %f@]@." name (Sys.time () *. 1000.);          
-          Ext_pervasives.with_file_as_chan       
-            (Ext_filename.new_extension !Location.input_name
-               (Printf.sprintf ".%02d.%s.jsx"  !log_counter name)
-            ) (fun chan -> Js_dump_program.dump_program prog chan )
-        end in
-    prog    
-  end
-#endif
-
diff --git a/jscomp/core/js_pass_debug.mli b/jscomp/core/js_pass_debug.mli
deleted file mode 100644
index 1052769..0000000
--- a/jscomp/core/js_pass_debug.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val dump : string -> J.program -> J.program
diff --git a/jscomp/core/js_pass_flatten.ml b/jscomp/core/js_pass_flatten.ml
deleted file mode 100644
index 397d2dc..0000000
--- a/jscomp/core/js_pass_flatten.ml
+++ /dev/null
@@ -1,114 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* open recursion is hard
-   Take cond for example:
-   CHECK? Trick semantics difference
-   super#statement (S.if_ a ([ (\* self#statement *\) (S.exp b) ])
-     ~else_:([self#statement (S.exp c)])
-                 )
-*)
-module E = Js_exp_make
-module S = Js_stmt_make
-
-let super = Js_record_map.super
-
-let flatten_map =
-  {
-    super with
-    statement =
-      (fun self x ->
-        match x.statement_desc with
-        | Exp ({ expression_desc = Seq _; _ } as v) ->
-            S.block
-              (List.rev_map
-                 (fun x -> self.statement self x)
-                 (Js_analyzer.rev_flatten_seq v))
-        | Exp
-            {
-              expression_desc = Caml_block (args, _mutable_flag, _tag, _tag_info);
-            } ->
-            S.block
-              (Ext_list.map args (fun arg -> self.statement self (S.exp arg)))
-        | Exp { expression_desc = Cond (a, b, c); comment } ->
-            {
-              statement_desc =
-                If
-                  ( a,
-                    [ self.statement self (S.exp b) ],
-                    [ self.statement self (S.exp c) ] );
-              comment;
-            }
-        | Exp
-            {
-              expression_desc =
-                Bin (Eq, a, ({ expression_desc = Seq _; _ } as v));
-              _;
-            } -> (
-            let block = Js_analyzer.rev_flatten_seq v in
-            match block with
-            | { statement_desc = Exp last_one; _ } :: rest_rev ->
-                S.block
-                  (Ext_list.rev_map_append rest_rev
-                     [ self.statement self (S.exp (E.assign a last_one)) ]
-                     (fun x -> self.statement self x))
-            (* TODO: here we introduce a block, should avoid it *)
-            (* super#statement *)
-            (*   (S.block (List.rev_append rest_rev [S.exp (E.assign a  last_one)])) *)
-            | _ -> assert false)
-        | Return { expression_desc = Cond (a, b, c); comment } ->
-            {
-              statement_desc =
-                If
-                  ( a,
-                    [ self.statement self (S.return_stmt b) ],
-                    [ self.statement self (S.return_stmt c) ] );
-              comment;
-            }
-        | Return ({ expression_desc = Seq _; _ } as v) -> (
-            let block = Js_analyzer.rev_flatten_seq v in
-            match block with
-            | { statement_desc = Exp last_one; _ } :: rest_rev ->
-                super.statement self
-                  (S.block
-                     (Ext_list.rev_map_append rest_rev
-                        [ S.return_stmt last_one ] (fun x ->
-                          self.statement self x)))
-            | _ -> assert false)
-        | Block [ x ] -> self.statement self x
-        | _ -> super.statement self x);
-    block =
-      (fun self b ->
-        match b with
-        | { statement_desc = Block bs } :: rest -> self.block self (bs @ rest)
-        | x :: rest -> (
-            let st = self.statement self x in
-            let block = self.block self rest in
-            match st.statement_desc with
-            | Block bs -> bs @ block
-            | _ -> st :: block)
-        | [] -> []);
-  }
-
-let program (x : J.program) = flatten_map.program flatten_map x
diff --git a/jscomp/core/js_pass_flatten.mli b/jscomp/core/js_pass_flatten.mli
deleted file mode 100644
index e88edf6..0000000
--- a/jscomp/core/js_pass_flatten.mli
+++ /dev/null
@@ -1,36 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** A pass converting nested js statement into a flatten visual appearance 
-
-    Note this module is used to convert some nested expressions to flat statements, 
-    in general, it's more human readable, and since it generate flat statements, we can spot
-    some inline opportunities for the produced statemetns, 
-    (inline) expressions inside a nested expression would generate ugly code.
-
-    Since we are aiming to flatten expressions, we should avoid some smart constructors in {!Js_helper}, 
-    it  tries to spit out expression istead of statements if it can
-*)
-
-val program : J.program -> J.program
diff --git a/jscomp/core/js_pass_flatten_and_mark_dead.ml b/jscomp/core/js_pass_flatten_and_mark_dead.ml
deleted file mode 100644
index 6ff6066..0000000
--- a/jscomp/core/js_pass_flatten_and_mark_dead.ml
+++ /dev/null
@@ -1,281 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-module S = Js_stmt_make
-
-type meta_info = Info of J.ident_info | Recursive
-
-let super = Js_record_iter.super
-
-let mark_dead_code (js : J.program) : J.program =
-  let ident_use_stats : meta_info Hash_ident.t = Hash_ident.create 17 in
-  let mark_dead =
-    {
-      super with
-      ident =
-        (fun _ ident ->
-          match Hash_ident.find_opt ident_use_stats ident with
-          | None ->
-              (* First time *)
-              Hash_ident.add ident_use_stats ident Recursive
-          (* recursive identifiers *)
-          | Some Recursive -> ()
-          | Some (Info x) -> Js_op_util.update_used_stats x Used);
-      variable_declaration =
-        (fun self vd ->
-          match vd.ident_info.used_stats with
-          | Dead_pure -> ()
-          | Dead_non_pure -> (
-              match vd.value with
-              | None -> ()
-              | Some x -> self.expression self x)
-          | _ -> (
-              let ({ ident; ident_info; value; _ } : J.variable_declaration) =
-                vd
-              in
-              let pure =
-                match value with
-                | None -> true
-                | Some x ->
-                    self.expression self x;
-                    Js_analyzer.no_side_effect_expression x
-              in
-              let () =
-                if Set_ident.mem js.export_set ident then
-                  Js_op_util.update_used_stats ident_info Exported
-              in
-              match Hash_ident.find_opt ident_use_stats ident with
-              | Some Recursive ->
-                  Js_op_util.update_used_stats ident_info Used;
-                  Hash_ident.replace ident_use_stats ident (Info ident_info)
-              | Some (Info _) ->
-                  (* check [camlinternlFormat,box_type] inlined twice
-                      FIXME: seems we have redeclared identifiers
-                  *)
-                  ()
-              (* assert false *)
-              | None ->
-                  (* First time *)
-                  Hash_ident.add ident_use_stats ident (Info ident_info);
-                  Js_op_util.update_used_stats ident_info
-                    (if pure then Scanning_pure else Scanning_non_pure)));
-    }
-  in
-  mark_dead.program mark_dead js;
-  Hash_ident.iter ident_use_stats (fun _id (info : meta_info) ->
-      match info with
-      | Info ({ used_stats = Scanning_pure } as info) ->
-          Js_op_util.update_used_stats info Dead_pure
-      | Info ({ used_stats = Scanning_non_pure } as info) ->
-          Js_op_util.update_used_stats info Dead_non_pure
-      | _ -> ());
-  js
-
-(*
-   when we do optmizations, we might need track it will break invariant 
-   of other optimizations, especially for [mutable] meta data, 
-   for example, this pass will break [closure] information, 
-   it should be done before closure pass (even it does not use closure information)
-
-   Take away, it is really hard to change the code while collecting some information..
-   we should always collect info in a single pass
-
-   Note that, we should avoid reuse object, i.e,
-   {[
-     let v = 
-       object 
-       end      
-   ]}   
-   Since user may use `bsc.exe -c xx.ml xy.ml xz.ml` and we need clean up state
-*)
-
-(** we can do here, however, we should 
-    be careful that it can only be done 
-    when it's accessed once and the array is not escaped,
-    otherwise, we redo the computation,
-    or even better, we re-order
-
-    {[
-      var match = [/* tuple */0,Pervasives.string_of_int(f(1,2,3)),f3(2),arr];
-
-          var a = match[1];
-
-            var b = match[2];
-
-    ]}
-
-    --->
-
-    {[
-      var match$1 = Pervasives.string_of_int(f(1,2,3));
-          var match$2 = f3(2);
-              var match = [/* tuple */0,match$1,match$2,arr];
-                  var a = match$1;
-                    var b = match$2;
-                      var arr = arr; 
-    ]}
-
-    --> 
-    since match$1 (after match is eliminated) is only called once 
-    {[
-      var a = Pervasives.string_of_int(f(1,2,3));
-      var b = f3(2);
-      var arr = arr; 
-    ]}
-
-*)
-
-let super = Js_record_map.super
-
-let add_substitue substitution (ident : Ident.t) (e : J.expression) =
-  Hash_ident.replace substitution ident e
-
-let subst_map (substitution : J.expression Hash_ident.t) =
-  {
-    super with
-    statement =
-      (fun self v ->
-        match v.statement_desc with
-        | Variable { ident = _; ident_info = { used_stats = Dead_pure }; _ } ->
-            { v with statement_desc = Block [] }
-        | Variable
-            {
-              ident = _;
-              ident_info = { used_stats = Dead_non_pure };
-              value = None;
-            } ->
-            { v with statement_desc = Block [] }
-        | Variable
-            {
-              ident = _;
-              ident_info = { used_stats = Dead_non_pure };
-              value = Some x;
-            } ->
-            { v with statement_desc = Exp x }
-        | Variable
-            ({
-               ident;
-               property = Strict | StrictOpt | Alias;
-               value =
-                 Some
-                   ({
-                      expression_desc =
-                        Caml_block
-                          ((_ :: _ :: _ as ls), Immutable, tag, tag_info);
-                    } as block);
-             } as variable) -> (
-            (* If we do this, we should prevent incorrect inlning to inline it into an array :)
-                do it only when block size is larger than one
-            *)
-            let _, e, bindings =
-              Ext_list.fold_left ls (0, [], []) (fun (i, e, acc) x ->
-                  match x.expression_desc with
-                  | Var _ | Number _ | Str _ | J.Bool _ | Undefined _ ->
-                      (* TODO: check the optimization *)
-                      (i + 1, x :: e, acc)
-                  | _ ->
-                      (* tradeoff,
-                          when the block is small, it does not make
-                          sense too much --
-                          bottomline, when the block size is one, no need to do
-                          this
-                      *)
-                      let v' = self.expression self x in
-                      let match_id =
-                        Ext_ident.create
-                          (ident.name ^ "_"
-                          ^
-                          match tag_info with
-                          | Blk_module fields -> (
-                              match Ext_list.nth_opt fields i with
-                              | None -> Printf.sprintf "%d" i
-                              | Some x -> x)
-                          | Blk_record { fields } ->
-                              Ext_array.get_or fields i (fun _ ->
-                                  Printf.sprintf "%d" i)
-                          | _ -> Printf.sprintf "%d" i)
-                      in
-                      (i + 1, E.var match_id :: e, (match_id, v') :: acc))
-            in
-            let e =
-              {
-                block with
-                expression_desc =
-                  Caml_block (List.rev e, Immutable, tag, tag_info);
-              }
-            in
-            let () = add_substitue substitution ident e in
-            (* let bindings =  !bindings in *)
-            let original_statement =
-              {
-                v with
-                statement_desc = Variable { variable with value = Some e };
-              }
-            in
-            match bindings with
-            | [] -> original_statement
-            | _ ->
-                (* self#add_substitue ident e ; *)
-                S.block
-                @@ Ext_list.rev_map_append bindings [ original_statement ]
-                     (fun (id, v) -> S.define_variable ~kind:Strict id v))
-        | _ -> super.statement self v);
-    expression =
-      (fun self x ->
-        match x.expression_desc with
-        | Array_index
-            ( { expression_desc = Var (Id id) },
-              { expression_desc = Number (Int { i; _ }) } )
-        | Static_index ({ expression_desc = Var (Id id) }, _, Some i) -> (
-            match Hash_ident.find_opt substitution id with
-            | Some { expression_desc = Caml_block (ls, Immutable, _, _) } -> (
-                (* user program can be wrong, we should not
-                   turn a runtime crash into compile time crash : )
-                *)
-                match Ext_list.nth_opt ls (Int32.to_int i) with
-                | Some
-                    ({
-                       expression_desc = J.Var _ | Number _ | Str _ | Undefined _;
-                     } as x) ->
-                    x
-                | None | Some _ -> super.expression self x)
-            | Some _ | None -> super.expression self x)
-        | _ -> super.expression self x);
-  }
-
-(* Top down or bottom up ?*)
-(* A pass to support nullary argument in JS
-    Nullary information can be done in one pass,
-    there is no need to add another pass
-*)
-
-let program (js : J.program) =
-  let obj = subst_map (Hash_ident.create 32) in
-  let js = obj.program obj js in
-  mark_dead_code js
-(* |> mark_dead_code *)
-(* mark dead code twice does have effect in some cases, however, we disabled it
-   since the benefit is not obvious
-*)
diff --git a/jscomp/core/js_pass_flatten_and_mark_dead.mli b/jscomp/core/js_pass_flatten_and_mark_dead.mli
deleted file mode 100644
index b05a732..0000000
--- a/jscomp/core/js_pass_flatten_and_mark_dead.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** A pass to mark some declarations in JS IR as dead code *)
-
-val program : J.program -> J.program
diff --git a/jscomp/core/js_pass_get_used.ml b/jscomp/core/js_pass_get_used.ml
deleted file mode 100644
index adb21dc..0000000
--- a/jscomp/core/js_pass_get_used.ml
+++ /dev/null
@@ -1,75 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let add_use stats id = Hash_ident.add_or_update stats id 1 ~update:succ
-
-let post_process_stats my_export_set
-    (defined_idents : J.variable_declaration Hash_ident.t) stats =
-  Hash_ident.iter defined_idents (fun ident v ->
-      if Set_ident.mem my_export_set ident then
-        Js_op_util.update_used_stats v.ident_info Exported
-      else
-        let pure =
-          match v.value with
-          | None -> false (* can not happen *)
-          | Some x -> Js_analyzer.no_side_effect_expression x
-        in
-        match Hash_ident.find_opt stats ident with
-        | None ->
-            Js_op_util.update_used_stats v.ident_info
-              (if pure then Dead_pure else Dead_non_pure)
-        | Some num ->
-            if num = 1 then
-              Js_op_util.update_used_stats v.ident_info
-                (if pure then Once_pure else Used));
-  defined_idents
-
-(* Update ident info use cases, it is a non pure function,
-    it will annotate [program] with some meta data
-    TODO: Ident Hash could be improved,
-    since in this case it can not be global?
-*)
-let super = Js_record_iter.super
-
-let count_collects (* collect used status*) (stats : int Hash_ident.t)
-    (* collect all def sites *)
-      (defined_idents : J.variable_declaration Hash_ident.t) =
-  {
-    super with
-    variable_declaration =
-      (fun self ({ ident; value; property = _; ident_info = _ } as v) ->
-        Hash_ident.add defined_idents ident v;
-        match value with None -> () | Some x -> self.expression self x);
-    ident = (fun _ id -> add_use stats id);
-  }
-
-let get_stats (program : J.program) : J.variable_declaration Hash_ident.t =
-  let stats : int Hash_ident.t = Hash_ident.create 83 in
-  let defined_idents : J.variable_declaration Hash_ident.t =
-    Hash_ident.create 83
-  in
-  let my_export_set = program.export_set in
-  let obj = count_collects stats defined_idents in
-  obj.program obj program;
-  post_process_stats my_export_set defined_idents stats
diff --git a/jscomp/core/js_pass_get_used.mli b/jscomp/core/js_pass_get_used.mli
deleted file mode 100644
index d58aa8f..0000000
--- a/jscomp/core/js_pass_get_used.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2020 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val get_stats : J.program -> J.variable_declaration Hash_ident.t
diff --git a/jscomp/core/js_pass_scope.ml b/jscomp/core/js_pass_scope.ml
deleted file mode 100644
index ebeb22c..0000000
--- a/jscomp/core/js_pass_scope.ml
+++ /dev/null
@@ -1,333 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(*
-
-     Base line
-    {[
-      for i = 1 to n do (function (i){...}(i))
-      done
-      (* This is okay, since all ocaml follow the lexical scope,
-         for generrated code too (* TODO: check *)
-      *)
-    ]}
-
-    For nested loops
-    {[
-      for i = 0 to n do
-        for j = 0 to n do
-          arrr.(j)<- ()=>{ i}
-        done
-      done
-    ]}
-     Three kind of variables  (defined in the loop scope)
-     1. loop mutable variables
-        As long as variables change per iteration, defined in a loop (in the same loop)
-         and captured by a closure
-        the loop, iff  be lexically scoped
-        Tailcall parameters are considered defined inside the loop
-    - unless it's defined
-        outside all the loops - note that for nested loops, if it's defined
-        in the outerloop and captured by the inner loop,
-        it still has to be lexically scoped.
-
-        How do we detect whether it is loop invariant or not
-    - depend on loop variant
-    - depend on mutuable valuse
-    - non pure (function call)
-
-        so we need collect mutable variables
-        1. from lambda + loop (for/i) + tailcall params
-        2. defined in the loop and can not determine it is invariant
-           in such cases we can determine it's immutable
-           1. const
-           2. only depend on immutable values and no function call?
-
-     ## The following would take advantage of nested loops
-     2. loop invariant observable varaibles
-    {[
-      var x = (console.log(3), 32)
-    ]}
-     3. loop invariant non-observable variables
-
-     Invariant:
-     loop invariant (observable or not) variables can not depend on
-     loop mutable values so that once we detect loop Invariant variables
-     all its dependency are loop invariant as well, so we can do loop
-     Invariant code motion.
-
-     TODO:
-     loop invariant can be layered, it will be loop invariant
-     in the inner layer while loop variant in the outer layer.
-    {[
-      for i = 0 to 10 do
-        for j  = 10 do
-          let  k0 = param * 100 in (* loop invariant *)
-          let  k1 = i * i in (* inner loop invariant, loop variant *)
-          let  k2 = j * i in (* variant *)
-          ..
-        done
-      done
-    ]}
-*)
-type state = {
-  defined_idents : Set_ident.t;
-  used_idents : Set_ident.t;
-  loop_mutable_values : Set_ident.t;
-  mutable_values : Set_ident.t;
-  closured_idents : Set_ident.t;
-  in_loop : bool;
-}
-
-let init_state =
-  {
-    defined_idents = Set_ident.empty;
-    used_idents = Set_ident.empty;
-    loop_mutable_values = Set_ident.empty;
-    mutable_values = Set_ident.empty;
-    closured_idents = Set_ident.empty;
-    in_loop = false;
-  }
-
-let with_in_loop (st : state) b =
-  if b = st.in_loop then st else { st with in_loop = b }
-
-let add_loop_mutable_variable (st : state) id =
-  {
-    st with
-    loop_mutable_values = Set_ident.add st.loop_mutable_values id;
-    mutable_values = Set_ident.add st.mutable_values id;
-  }
-
-let add_mutable_variable (st : state) id =
-  { st with mutable_values = Set_ident.add st.mutable_values id }
-
-let add_defined_ident (st : state) id =
-  { st with defined_idents = Set_ident.add st.defined_idents id }
-
-let add_used_ident (st : state) id =
-  { st with used_idents = Set_ident.add st.used_idents id }
-
-let super = Js_record_fold.super
-
-let record_scope_pass =
-  {
-    super with
-    expression =
-      (fun self state x ->
-        match x.expression_desc with
-        | Fun {params; body; env} ->
-            (* Function is the only place to introduce a new scope in
-                ES5
-                TODO: check
-               {[ try .. catch(exn) {.. }]}
-                what's the scope of exn
-            *)
-            (* Note that [used_idents] is not complete
-                it ignores some locally defined idents *)
-            let param_set = Set_ident.of_list params in
-            let { defined_idents = defined_idents'; used_idents = used_idents' }
-                =
-              self.block self
-                {
-                  init_state with
-                  mutable_values =
-                    Set_ident.of_list (Js_fun_env.get_mutable_params params env);
-                }
-                body
-            in
-            (* let defined_idents', used_idents' =
-               obj#get_defined_idents, obj#get_used_idents  in *)
-            (* mark which param is used *)
-            params
-            |> List.iteri (fun i v ->
-                   if not (Set_ident.mem used_idents' v) then
-                     Js_fun_env.mark_unused env i);
-            let closured_idents' =
-              (* pass param_set down *)
-              Set_ident.(diff used_idents' (union defined_idents' param_set))
-            in
-
-            (* Noe that we don't know which variables are exactly mutable yet ..
-               due to the recursive thing
-            *)
-            Js_fun_env.set_unbounded env closured_idents';
-            let lexical_scopes =
-              Set_ident.(inter closured_idents' state.loop_mutable_values)
-            in
-            Js_fun_env.set_lexical_scope env lexical_scopes;
-            (* tailcall , note that these varibles are used in another pass *)
-            {
-              state with
-              used_idents = Set_ident.union state.used_idents closured_idents';
-              (* There is a bug in ocaml -dsource*)
-              closured_idents =
-                Set_ident.union state.closured_idents closured_idents';
-            }
-        | _ -> (
-            let obj = super.expression self state x in
-            match Js_block_runtime.check_additional_id x with
-            | None -> obj
-            | Some id -> add_used_ident obj id));
-    variable_declaration =
-      (fun self state x ->
-        match x with
-        | { ident; value; property } -> (
-            let obj =
-              add_defined_ident
-                (match (state.in_loop, property) with
-                | true, Variable -> add_loop_mutable_variable state ident
-                | true, (Strict | StrictOpt | Alias)
-                (* Not real true immutable in javascript
-                    since it's in the loop
-
-                    TODO: we should also
-                *) -> (
-                    match value with
-                    | None ->
-                        add_loop_mutable_variable state ident
-                        (* TODO: Check why assertion failure *)
-                        (* self#add_loop_mutable_variable ident *)
-                        (* assert false *)
-                    | Some x -> (
-                        (*
-                      when x is an immediate immutable value, 
-                      (like integer .. )
-                      not a reference, it should be Immutable
-                      or string, 
-                      type system might help here
-                      TODO:
-                  *)
-                        match x.expression_desc with
-                        | Fun _ | Number _ | Str _ -> state
-                        | _ ->
-                            (* if Set_ident.(is_empty @@ *)
-                            (*   inter self#get_mutable_values  *)
-                            (*     ( ({<  *)
-                            (*         defined_idents = Set_ident.empty;  *)
-                            (*         used_idents = Set_ident.empty; *)
-                            (*         >} # expression x) # get_used_idents)) then *)
-                            (*   (\* FIXME: still need to check expression is pure or not*\) *)
-                            (*   self *)
-                            (* else  *)
-                            add_loop_mutable_variable state ident))
-                | false, Variable -> add_mutable_variable state ident
-                | false, (Strict | StrictOpt | Alias) -> state)
-                ident
-            in
-            match value with
-            | None -> obj
-            | Some x -> self.expression self obj x));
-    statement =
-      (fun self state x ->
-        match x.statement_desc with
-        | ForRange (_, _, loop_id, _, _, a_env) ->
-            (* TODO: simplify definition of For *)
-            let {
-              defined_idents = defined_idents';
-              used_idents = used_idents';
-              closured_idents = closured_idents';
-            } =
-              super.statement self
-                {
-                  in_loop = true;
-                  loop_mutable_values = Set_ident.singleton loop_id;
-                  used_idents = Set_ident.empty;
-                  (* TODO: if unused, can we generate better code? *)
-                  defined_idents = Set_ident.singleton loop_id;
-                  closured_idents = Set_ident.empty;
-                  (* Think about nested for blocks *)
-                  (* Invariant: Finish id is never used *)
-                  mutable_values = state.mutable_values;
-                }
-                x
-            in
-
-            (* CHECK*)
-
-            (* let defined_idents', used_idents', closured_idents' =
-               obj#get_defined_idents, obj#get_used_idents, obj#get_closured_idents in *)
-            let lexical_scope =
-              Set_ident.(
-                inter
-                  (diff closured_idents' defined_idents')
-                  state.loop_mutable_values)
-            in
-            let () = Js_closure.set_lexical_scope a_env lexical_scope in
-            (* set scope *)
-            {
-              state with
-              used_idents = Set_ident.union state.used_idents used_idents';
-              (* walk around ocaml -dsource bug
-                 {[
-                   Set_ident.(union used_idents used_idents)
-                 ]}
-              *)
-              defined_idents =
-                Set_ident.union state.defined_idents defined_idents';
-              (* TODO: if we our generated code also follow lexical scope,
-                 this is not necessary ;
-                 [varaibles] are mutable or not is known at definition
-              *)
-              closured_idents =
-                Set_ident.union state.closured_idents lexical_scope;
-            }
-        | While (_label, pred, body, _env) ->
-            with_in_loop
-              (self.block self
-                 (with_in_loop (self.expression self state pred) true)
-                 body)
-              state.in_loop
-        | _ -> super.statement self state x);
-    exception_ident =
-      (fun _ state x ->
-        (* we can not simply skip it, since it can be used
-            TODO: check loop exception
-            (loop {
-            excption(i){
-            () => {i}
-            }
-            })
-        *)
-        {
-          state with
-          used_idents = Set_ident.add state.used_idents x;
-          defined_idents = Set_ident.add state.defined_idents x;
-        });
-    for_ident =
-      (fun _ state x ->
-        {
-          state with
-          loop_mutable_values = Set_ident.add state.loop_mutable_values x;
-        });
-    ident =
-      (fun _ state x ->
-        if Set_ident.mem state.defined_idents x then state
-        else { state with used_idents = Set_ident.add state.used_idents x });
-  }
-
-let program js =
-  (record_scope_pass.program record_scope_pass init_state js)
-    .loop_mutable_values
-(* (scope_pass # program js ) # get_loop_mutable_values *)
diff --git a/jscomp/core/js_pass_scope.mli b/jscomp/core/js_pass_scope.mli
deleted file mode 100644
index b4c1aca..0000000
--- a/jscomp/core/js_pass_scope.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** A module to do scope analysis over JS IR *)
-
-val program : J.program -> Set_ident.t
diff --git a/jscomp/core/js_pass_tailcall_inline.ml b/jscomp/core/js_pass_tailcall_inline.ml
deleted file mode 100644
index d3e003c..0000000
--- a/jscomp/core/js_pass_tailcall_inline.ml
+++ /dev/null
@@ -1,225 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* When we inline a function call, if we don't do a beta-reduction immediately, there is
-   a chance that it is ignored, (we can not assume that each pass is robust enough)
-
-   After we do inlining, it makes sense to do another constant folding and propogation
-*)
-
-(* Check: shall we inline functions with while loop? if it is used only once,
-   it makes sense to inline it
-*)
-
-module S = Js_stmt_make
-(* module E = Js_exp_make *)
-
-let super = Js_record_map.super
-
-let substitue_variables (map : Ident.t Map_ident.t) =
-  { super with ident = (fun _ id -> Map_ident.find_default map id id) }
-
-(* 1. recursive value ? let rec x = 1 :: x
-    non-terminating
-    2. duplicative identifiers ..
-    remove it at the same time is a bit unsafe,
-    since we have to guarantee that the one use
-    case is substituted
-    we already have this? in [defined_idents]
-
-    At this time, when tailcall happened, the parameter can be assigned
-      for example {[
-     function (_x,y){
-         _x = u
-       }
-   ]}
-      if it is substitued, the assignment will align the value which is incorrect
-*)
-
-let inline_call (immutable_list : bool list) params (args : J.expression list)
-    processed_blocks =
-  let map, block =
-    if immutable_list = [] then
-      Ext_list.fold_right2 params args (Map_ident.empty, processed_blocks)
-        (fun param arg (map, acc) ->
-          match arg.expression_desc with
-          | Var (Id id) -> (Map_ident.add map param id, acc)
-          | _ -> (map, S.define_variable ~kind:Variable param arg :: acc))
-    else
-      Ext_list.fold_right3 params args immutable_list
-        (Map_ident.empty, processed_blocks) (fun param arg mask (map, acc) ->
-          match (mask, arg.expression_desc) with
-          | true, Var (Id id) -> (Map_ident.add map param id, acc)
-          | _ -> (map, S.define_variable ~kind:Variable param arg :: acc))
-  in
-  if Map_ident.is_empty map then block
-  else
-    let obj = substitue_variables map in
-    obj.block obj block
-
-(** There is a side effect when traversing dead code, since 
-    we assume that substitue a node would mark a node as dead node,
-
-    so if we traverse a dead node, this would get a wrong result.
-    it does happen in such scenario
-    {[
-      let generic_basename is_dir_sep current_dir_name name =
-        let rec find_end n =
-          if n < 0 then String.sub name 0 1
-          else if is_dir_sep name n then find_end (n - 1)
-          else find_beg n (n + 1)
-        and find_beg n p =
-          if n < 0 then String.sub name 0 p
-          else if is_dir_sep name n then String.sub name (n + 1) (p - n - 1)
-          else find_beg (n - 1) p
-        in
-        if name = ""
-        then current_dir_name
-        else find_end (String.length name - 1)
-    ]}
-    [find_beg] can potentially be expanded in [find_end] and in [find_end]'s expansion, 
-    if the order is not correct, or even worse, only the wrong one [find_beg] in [find_end] get expanded 
-    (when we forget to recursive apply), then some code non-dead [find_beg] will be marked as dead, 
-    while it is still called 
-*)
-let super = Js_record_map.super
-
-let subst (export_set : Set_ident.t) stats =
-  {
-    super with
-    statement =
-      (fun self st ->
-        match st.statement_desc with
-        | Variable { value = _; ident_info = { used_stats = Dead_pure } } ->
-            S.block []
-        | Variable
-            { ident_info = { used_stats = Dead_non_pure }; value = Some v; _ }
-          ->
-            S.exp v
-        | _ -> super.statement self st);
-    variable_declaration =
-      (fun self ({ ident; value = _; property = _; ident_info = _ } as v) ->
-        (* TODO: replacement is a bit shaky, the problem is the lambda we stored is
-           not consistent after we did some subsititution, and the dead code removal
-           does rely on this (otherwise, when you do beta-reduction you have to regenerate names)
-        *)
-        let v = super.variable_declaration self v in
-        Hash_ident.add stats ident v;
-        (* see #278 before changes *)
-        v);
-    block =
-      (fun self bs ->
-        match bs with
-        | ({
-             statement_desc =
-               Variable
-                 ({ value = Some ({ expression_desc = Fun _; _ } as v) } as vd);
-             comment = _;
-           } as st)
-          :: rest -> (
-            let is_export = Set_ident.mem export_set vd.ident in
-            if is_export then self.statement self st :: self.block self rest
-            else
-              match Hash_ident.find_opt stats vd.ident with
-              (* TODO: could be improved as [mem] *)
-              | None ->
-                  if Js_analyzer.no_side_effect_expression v then
-                    S.exp v :: self.block self rest
-                  else self.block self rest
-              | Some _ -> self.statement self st :: self.block self rest)
-        | [
-         ({
-            statement_desc =
-              Return
-                {
-                  expression_desc =
-                    Call ({ expression_desc = Var (Id id) }, args, _info);
-                };
-          } as st);
-        ] -> (
-            match Hash_ident.find_opt stats id with
-            | Some
-                ({
-                   value =
-                     Some
-                       {
-                         expression_desc =
-                           Fun {is_method=false; params; body; env; async=false};
-                         comment = _;
-                       };
-                   (*TODO: don't inline method tail call yet,
-                     [this] semantics are weird
-                   *)
-                   property = Alias | StrictOpt | Strict;
-                   ident_info = { used_stats = Once_pure };
-                   ident = _;
-                 } as v)
-              when Ext_list.same_length params args ->
-                Js_op_util.update_used_stats v.ident_info Dead_pure;
-                let no_tailcall = Js_fun_env.no_tailcall env in
-                let processed_blocks =
-                  self.block self body
-                  (* see #278 before changes*)
-                in
-                inline_call no_tailcall params args processed_blocks
-            (* Ext_list.fold_right2
-               params args  processed_blocks
-               (fun param arg acc ->
-                 S.define_variable ~kind:Variable param arg :: acc) *)
-            (* Mark a function as dead means it will never be scanned,
-               here we inline the function
-            *)
-            | None | Some _ -> [ self.statement self st ])
-        | [
-         {
-           statement_desc =
-             Return
-               {
-                 expression_desc =
-                   Call
-                     ( {
-                         expression_desc =
-                           Fun {is_method=false; params; body; env; async=false};
-                       },
-                       args,
-                       _info );
-               };
-         };
-        ]
-          when Ext_list.same_length params args ->
-            let no_tailcall = Js_fun_env.no_tailcall env in
-            let processed_blocks =
-              self.block self body
-              (* see #278 before changes*)
-            in
-            inline_call no_tailcall params args processed_blocks
-        | x :: xs -> self.statement self x :: self.block self xs
-        | [] -> []);
-  }
-
-let tailcall_inline (program : J.program) =
-  let stats = Js_pass_get_used.get_stats program in
-  let export_set = program.export_set in
-  let obj = subst export_set stats in
-  obj.program obj program
diff --git a/jscomp/core/js_pass_tailcall_inline.mli b/jscomp/core/js_pass_tailcall_inline.mli
deleted file mode 100644
index 207a90e..0000000
--- a/jscomp/core/js_pass_tailcall_inline.mli
+++ /dev/null
@@ -1,38 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** This pass detect functions used once and if it is used in used
-    in the tail position, it will get inlined, this will help 
-    remove some common use cases like This
-    {[
-      let length x = 
-        let rec aux n x = 
-          match x with 
-          | [] -> n 
-          | _ :: rest -> aux (n + 1) rest in
-        aux 0 x         
-    ]} 
-*)
-
-val tailcall_inline : J.program -> J.program
diff --git a/jscomp/core/js_record_fold.ml b/jscomp/core/js_record_fold.ml
deleted file mode 100644
index b92ca55..0000000
--- a/jscomp/core/js_record_fold.ml
+++ /dev/null
@@ -1,315 +0,0 @@
-(* Copyright (C) 2015- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open J
-
-let[@inline] unknown _ st _ = st
-
-let[@inline] option sub self st v =
-  match v with None -> st | Some v -> sub self st v
-
-let rec list sub self st x =
-  match x with
-  | [] -> st
-  | x :: xs ->
-      let st = sub self st x in
-      list sub self st xs
-
-type 'state iter = {
-  ident : ('state, ident) fn;
-  module_id : ('state, module_id) fn;
-  vident : ('state, vident) fn;
-  exception_ident : ('state, exception_ident) fn;
-  for_ident : ('state, for_ident) fn;
-  expression : ('state, expression) fn;
-  statement : ('state, statement) fn;
-  variable_declaration : ('state, variable_declaration) fn;
-  block : ('state, block) fn;
-  program : ('state, program) fn;
-}
-
-and ('state, 'a) fn = 'state iter -> 'state -> 'a -> 'state
-
-let label : 'a. ('a, label) fn = unknown
-
-let ident : 'a. ('a, ident) fn = unknown
-
-let module_id : 'a. ('a, module_id) fn =
- fun _self st { id = _x0; kind = _x1 } ->
-  let st = _self.ident _self st _x0 in
-  st
-
-let required_modules : 'a. ('a, required_modules) fn =
- fun _self st arg -> list _self.module_id _self st arg
-
-let vident : 'a. ('a, vident) fn =
- fun _self st -> function
-  | Id _x0 ->
-      let st = _self.ident _self st _x0 in
-      st
-  | Qualified (_x0, _x1) ->
-      let st = _self.module_id _self st _x0 in
-      st
-
-let exception_ident : 'a. ('a, exception_ident) fn =
- fun _self arg -> _self.ident _self arg
-
-let for_ident : 'a. ('a, for_ident) fn = fun _self arg -> _self.ident _self arg
-
-let for_direction : 'a. ('a, for_direction) fn = unknown
-
-let property_map : 'a. ('a, property_map) fn =
- fun _self st arg ->
-  list
-    (fun _self st (_x0, _x1) ->
-      let st = _self.expression _self st _x1 in
-      st)
-    _self st arg
-
-let length_object : 'a. ('a, length_object) fn = unknown
-
-let expression_desc : 'a. ('a, expression_desc) fn =
- fun _self st -> function
-  | Length (_x0, _x1) ->
-      let st = _self.expression _self st _x0 in
-      let st = length_object _self st _x1 in
-      st
-  | Is_null_or_undefined _x0 ->
-      let st = _self.expression _self st _x0 in
-      st
-  | String_append (_x0, _x1) ->
-      let st = _self.expression _self st _x0 in
-      let st = _self.expression _self st _x1 in
-      st
-  | Bool _ -> st
-  | Typeof _x0 ->
-      let st = _self.expression _self st _x0 in
-      st
-  | Js_not _x0 ->
-      let st = _self.expression _self st _x0 in
-      st
-  | Seq (_x0, _x1) ->
-      let st = _self.expression _self st _x0 in
-      let st = _self.expression _self st _x1 in
-      st
-  | Cond (_x0, _x1, _x2) ->
-      let st = _self.expression _self st _x0 in
-      let st = _self.expression _self st _x1 in
-      let st = _self.expression _self st _x2 in
-      st
-  | Bin (_x0, _x1, _x2) ->
-      let st = _self.expression _self st _x1 in
-      let st = _self.expression _self st _x2 in
-      st
-  | FlatCall (_x0, _x1) ->
-      let st = _self.expression _self st _x0 in
-      let st = _self.expression _self st _x1 in
-      st
-  | Call (_x0, _x1, _x2) ->
-      let st = _self.expression _self st _x0 in
-      let st = list _self.expression _self st _x1 in
-      st
-  | Tagged_template (_xo, _x1, _x2) -> 
-    let st = _self.expression _self st _xo in 
-    let st = list _self.expression _self st _x1 in 
-    let st = list _self.expression _self st _x2 in
-    st
-  | String_index (_x0, _x1) ->
-      let st = _self.expression _self st _x0 in
-      let st = _self.expression _self st _x1 in
-      st
-  | Array_index (_x0, _x1) ->
-      let st = _self.expression _self st _x0 in
-      let st = _self.expression _self st _x1 in
-      st
-  | Static_index (_x0, _x1, _x2) ->
-      let st = _self.expression _self st _x0 in
-      st
-  | New (_x0, _x1) ->
-      let st = _self.expression _self st _x0 in
-      let st =
-        option
-          (fun _self st arg -> list _self.expression _self st arg)
-          _self st _x1
-      in
-      st
-  | Var _x0 ->
-      let st = _self.vident _self st _x0 in
-      st
-  | Fun {params; body} ->
-      let st = list _self.ident _self st params in
-      let st = _self.block _self st body in
-      st
-  | Str _ -> st
-  | Raw_js_code _ -> st
-  | Array (_x0, _x1) ->
-      let st = list _self.expression _self st _x0 in
-      st
-  | Optional_block (_x0, _x1) ->
-      let st = _self.expression _self st _x0 in
-      st
-  | Caml_block (_x0, _x1, _x2, _x3) ->
-      let st = list _self.expression _self st _x0 in
-      let st = _self.expression _self st _x2 in
-      st
-  | Caml_block_tag (_x0, _tag) ->
-      let st = _self.expression _self st _x0 in
-      st
-  | Number _ -> st
-  | Object _x0 ->
-      let st = property_map _self st _x0 in
-      st
-  | Undefined _ -> st
-  | Null -> st
-  | Await _x0 ->
-    let st = _self.expression _self st _x0 in
-    st
-
-let for_ident_expression : 'a. ('a, for_ident_expression) fn =
- fun _self arg -> _self.expression _self arg
-
-let finish_ident_expression : 'a. ('a, finish_ident_expression) fn =
- fun _self arg -> _self.expression _self arg
-
-let case_clause : 'a. ('a, case_clause) fn =
- fun _self st { switch_body = _x0; should_break = _x1; comment = _x2 } ->
-  let st = _self.block _self st _x0 in
-  st
-
-let string_clause : 'a. ('a, string_clause) fn =
- fun _self st (_x0, _x1) ->
-  let st = case_clause _self st _x1 in
-  st
-
-let int_clause : 'a. ('a, int_clause) fn =
- fun _self st (_x0, _x1) ->
-  let st = case_clause _self st _x1 in
-  st
-
-let statement_desc : 'a. ('a, statement_desc) fn =
- fun _self st -> function
-  | Block _x0 ->
-      let st = _self.block _self st _x0 in
-      st
-  | Variable _x0 ->
-      let st = _self.variable_declaration _self st _x0 in
-      st
-  | Exp _x0 ->
-      let st = _self.expression _self st _x0 in
-      st
-  | If (_x0, _x1, _x2) ->
-      let st = _self.expression _self st _x0 in
-      let st = _self.block _self st _x1 in
-      let st = _self.block _self st _x2 in
-      st
-  | While (_x0, _x1, _x2, _x3) ->
-      let st = option label _self st _x0 in
-      let st = _self.expression _self st _x1 in
-      let st = _self.block _self st _x2 in
-      st
-  | ForRange (_x0, _x1, _x2, _x3, _x4, _x5) ->
-      let st = option for_ident_expression _self st _x0 in
-      let st = finish_ident_expression _self st _x1 in
-      let st = _self.for_ident _self st _x2 in
-      let st = for_direction _self st _x3 in
-      let st = _self.block _self st _x4 in
-      st
-  | Continue _x0 ->
-      let st = label _self st _x0 in
-      st
-  | Break -> st
-  | Return _x0 ->
-      let st = _self.expression _self st _x0 in
-      st
-  | Int_switch (_x0, _x1, _x2) ->
-      let st = _self.expression _self st _x0 in
-      let st = list int_clause _self st _x1 in
-      let st = option _self.block _self st _x2 in
-      st
-  | String_switch (_x0, _x1, _x2) ->
-      let st = _self.expression _self st _x0 in
-      let st = list string_clause _self st _x1 in
-      let st = option _self.block _self st _x2 in
-      st
-  | Throw _x0 ->
-      let st = _self.expression _self st _x0 in
-      st
-  | Try (_x0, _x1, _x2) ->
-      let st = _self.block _self st _x0 in
-      let st =
-        option
-          (fun _self st (_x0, _x1) ->
-            let st = _self.exception_ident _self st _x0 in
-            let st = _self.block _self st _x1 in
-            st)
-          _self st _x1
-      in
-      let st = option _self.block _self st _x2 in
-      st
-  | Debugger -> st
-
-let expression : 'a. ('a, expression) fn =
- fun _self st { expression_desc = _x0; comment = _x1 } ->
-  let st = expression_desc _self st _x0 in
-  st
-
-let statement : 'a. ('a, statement) fn =
- fun _self st { statement_desc = _x0; comment = _x1 } ->
-  let st = statement_desc _self st _x0 in
-  st
-
-let variable_declaration : 'a. ('a, variable_declaration) fn =
- fun _self st { ident = _x0; value = _x1; property = _x2; ident_info = _x3 } ->
-  let st = _self.ident _self st _x0 in
-  let st = option _self.expression _self st _x1 in
-  st
-
-let block : 'a. ('a, block) fn =
- fun _self st arg -> list _self.statement _self st arg
-
-let program : 'a. ('a, program) fn =
- fun _self st { block = _x0; exports = _x1; export_set = _x2 } ->
-  let st = _self.block _self st _x0 in
-  st
-
-let deps_program : 'a. ('a, deps_program) fn =
- fun _self st { program = _x0; modules = _x1; side_effect = _x2 } ->
-  let st = _self.program _self st _x0 in
-  let st = required_modules _self st _x1 in
-  st
-
-let super : 'state iter =
-  {
-    ident;
-    module_id;
-    vident;
-    exception_ident;
-    for_ident;
-    expression;
-    statement;
-    variable_declaration;
-    block;
-    program;
-  }
- 
\ No newline at end of file
diff --git a/jscomp/core/js_record_iter.ml b/jscomp/core/js_record_iter.ml
deleted file mode 100644
index cbbc9f4..0000000
--- a/jscomp/core/js_record_iter.ml
+++ /dev/null
@@ -1,233 +0,0 @@
-(* Copyright (C) 2015- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open J
-
-let unknown _ _ = ()
-
-let[@inline] option sub self v =
-  match v with None -> () | Some v -> sub self v
-
-let rec list sub self x =
-  match x with
-  | [] -> ()
-  | x :: xs ->
-      sub self x;
-      list sub self xs
-
-type iter = {
-  ident : ident fn;
-  module_id : module_id fn;
-  vident : vident fn;
-  exception_ident : exception_ident fn;
-  for_ident : for_ident fn;
-  expression : expression fn;
-  statement : statement fn;
-  variable_declaration : variable_declaration fn;
-  block : block fn;
-  program : program fn;
-}
-
-and 'a fn = iter -> 'a -> unit
-
-let label : label fn = unknown
-
-let ident : ident fn = unknown
-
-let module_id : module_id fn =
- fun _self { id = _x0; kind = _x1 } -> _self.ident _self _x0
-
-let required_modules : required_modules fn =
- fun _self arg -> list _self.module_id _self arg
-
-let vident : vident fn =
- fun _self -> function
-  | Id _x0 -> _self.ident _self _x0
-  | Qualified (_x0, _x1) -> _self.module_id _self _x0
-
-let exception_ident : exception_ident fn =
- fun _self arg -> _self.ident _self arg
-
-let for_ident : for_ident fn = fun _self arg -> _self.ident _self arg
-
-let for_direction : for_direction fn = unknown
-
-let property_map : property_map fn =
- fun _self arg ->
-  list (fun _self (_x0, _x1) -> _self.expression _self _x1) _self arg
-
-let length_object : length_object fn = unknown
-
-let expression_desc : expression_desc fn =
- fun _self -> function
-  | Length (_x0, _x1) ->
-      _self.expression _self _x0;
-      length_object _self _x1
-  | Is_null_or_undefined _x0 -> _self.expression _self _x0
-  | String_append (_x0, _x1) ->
-      _self.expression _self _x0;
-      _self.expression _self _x1
-  | Bool _ -> ()
-  | Typeof _x0 -> _self.expression _self _x0
-  | Js_not _x0 -> _self.expression _self _x0
-  | Seq (_x0, _x1) ->
-      _self.expression _self _x0;
-      _self.expression _self _x1
-  | Cond (_x0, _x1, _x2) ->
-      _self.expression _self _x0;
-      _self.expression _self _x1;
-      _self.expression _self _x2
-  | Bin (_x0, _x1, _x2) ->
-      _self.expression _self _x1;
-      _self.expression _self _x2
-  | FlatCall (_x0, _x1) ->
-      _self.expression _self _x0;
-      _self.expression _self _x1
-  | Call (_x0, _x1, _x2) ->
-      _self.expression _self _x0;
-      list _self.expression _self _x1
-  | Tagged_template (_x0, _x1, _x2) ->
-    _self.expression _self _x0;
-    list _self.expression _self _x1;
-    list _self.expression _self _x2
-  | String_index (_x0, _x1) ->
-      _self.expression _self _x0;
-      _self.expression _self _x1
-  | Array_index (_x0, _x1) ->
-      _self.expression _self _x0;
-      _self.expression _self _x1
-  | Static_index (_x0, _x1, _x2) -> _self.expression _self _x0
-  | New (_x0, _x1) ->
-      _self.expression _self _x0;
-      option (fun _self arg -> list _self.expression _self arg) _self _x1
-  | Var _x0 -> _self.vident _self _x0
-  | Fun {params; body} ->
-      list _self.ident _self params;
-      _self.block _self body
-  | Str _ -> ()
-  | Raw_js_code _ -> ()
-  | Array (_x0, _x1) -> list _self.expression _self _x0
-  | Optional_block (_x0, _x1) -> _self.expression _self _x0
-  | Caml_block (_x0, _x1, _x2, _x3) ->
-      list _self.expression _self _x0;
-      _self.expression _self _x2
-  | Caml_block_tag (_x0, _tag) -> _self.expression _self _x0
-  | Number _ -> ()
-  | Object _x0 -> property_map _self _x0
-  | Undefined _ -> ()
-  | Null -> ()
-  | Await _x0 -> _self.expression _self _x0
-
-let for_ident_expression : for_ident_expression fn =
- fun _self arg -> _self.expression _self arg
-
-let finish_ident_expression : finish_ident_expression fn =
- fun _self arg -> _self.expression _self arg
-
-let case_clause : case_clause fn =
- fun _self { switch_body = _x0; should_break = _x1; comment = _x2 } ->
-  _self.block _self _x0
-
-let string_clause : string_clause fn =
- fun _self (_x0, _x1) -> case_clause _self _x1
-
-let int_clause : int_clause fn = fun _self (_x0, _x1) -> case_clause _self _x1
-
-let statement_desc : statement_desc fn =
- fun _self -> function
-  | Block _x0 -> _self.block _self _x0
-  | Variable _x0 -> _self.variable_declaration _self _x0
-  | Exp _x0 -> _self.expression _self _x0
-  | If (_x0, _x1, _x2) ->
-      _self.expression _self _x0;
-      _self.block _self _x1;
-      _self.block _self _x2
-  | While (_x0, _x1, _x2, _x3) ->
-      option label _self _x0;
-      _self.expression _self _x1;
-      _self.block _self _x2
-  | ForRange (_x0, _x1, _x2, _x3, _x4, _x5) ->
-      option for_ident_expression _self _x0;
-      finish_ident_expression _self _x1;
-      _self.for_ident _self _x2;
-      for_direction _self _x3;
-      _self.block _self _x4
-  | Continue _x0 -> label _self _x0
-  | Break -> ()
-  | Return _x0 -> _self.expression _self _x0
-  | Int_switch (_x0, _x1, _x2) ->
-      _self.expression _self _x0;
-      list int_clause _self _x1;
-      option _self.block _self _x2
-  | String_switch (_x0, _x1, _x2) ->
-      _self.expression _self _x0;
-      list string_clause _self _x1;
-      option _self.block _self _x2
-  | Throw _x0 -> _self.expression _self _x0
-  | Try (_x0, _x1, _x2) ->
-      _self.block _self _x0;
-      option
-        (fun _self (_x0, _x1) ->
-          _self.exception_ident _self _x0;
-          _self.block _self _x1)
-        _self _x1;
-      option _self.block _self _x2
-  | Debugger -> ()
-
-let expression : expression fn =
- fun _self { expression_desc = _x0; comment = _x1 } -> expression_desc _self _x0
-
-let statement : statement fn =
- fun _self { statement_desc = _x0; comment = _x1 } -> statement_desc _self _x0
-
-let variable_declaration : variable_declaration fn =
- fun _self { ident = _x0; value = _x1; property = _x2; ident_info = _x3 } ->
-  _self.ident _self _x0;
-  option _self.expression _self _x1
-
-let block : block fn = fun _self arg -> list _self.statement _self arg
-
-let program : program fn =
- fun _self { block = _x0; exports = _x1; export_set = _x2 } ->
-  _self.block _self _x0
-
-let deps_program : deps_program fn =
- fun _self { program = _x0; modules = _x1; side_effect = _x2 } ->
-  _self.program _self _x0;
-  required_modules _self _x1
-
-let super : iter =
-  {
-    ident;
-    module_id;
-    vident;
-    exception_ident;
-    for_ident;
-    expression;
-    statement;
-    variable_declaration;
-    block;
-    program;
-  }
- 
\ No newline at end of file
diff --git a/jscomp/core/js_record_map.ml b/jscomp/core/js_record_map.ml
deleted file mode 100644
index c7d0cdf..0000000
--- a/jscomp/core/js_record_map.ml
+++ /dev/null
@@ -1,312 +0,0 @@
-(* Copyright (C) 2015- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open J
-
-let[@inline] unknown _ x = x
-
-let[@inline] option sub self v =
-  match v with None -> None | Some v -> Some (sub self v)
-
-let rec list sub self x =
-  match x with
-  | [] -> []
-  | x :: xs ->
-      let v = sub self x in
-      v :: list sub self xs
-
-type iter = {
-  ident : ident fn;
-  module_id : module_id fn;
-  vident : vident fn;
-  exception_ident : exception_ident fn;
-  for_ident : for_ident fn;
-  expression : expression fn;
-  statement : statement fn;
-  variable_declaration : variable_declaration fn;
-  block : block fn;
-  program : program fn;
-}
-
-and 'a fn = iter -> 'a -> 'a
-
-let label : label fn = unknown
-
-let ident : ident fn = unknown
-
-let module_id : module_id fn =
- fun _self { id = _x0; kind = _x1; dynamic_import = _x2 } ->
-  let _x0 = _self.ident _self _x0 in
-  { id = _x0; kind = _x1; dynamic_import = _x2 }
-
-let required_modules : required_modules fn =
- fun _self arg -> list _self.module_id _self arg
-
-let vident : vident fn =
- fun _self -> function
-  | Id _x0 ->
-      let _x0 = _self.ident _self _x0 in
-      Id _x0
-  | Qualified (_x0, _x1) ->
-      let _x0 = _self.module_id _self _x0 in
-      Qualified (_x0, _x1)
-
-let exception_ident : exception_ident fn =
- fun _self arg -> _self.ident _self arg
-
-let for_ident : for_ident fn = fun _self arg -> _self.ident _self arg
-
-let for_direction : for_direction fn = unknown
-
-let property_map : property_map fn =
- fun _self arg ->
-  list
-    (fun _self (_x0, _x1) ->
-      let _x1 = _self.expression _self _x1 in
-      (_x0, _x1))
-    _self arg
-
-let length_object : length_object fn = unknown
-
-let expression_desc : expression_desc fn =
- fun _self -> function
-  | Length (_x0, _x1) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = length_object _self _x1 in
-      Length (_x0, _x1)
-  | Is_null_or_undefined _x0 ->
-      let _x0 = _self.expression _self _x0 in
-      Is_null_or_undefined _x0
-  | String_append (_x0, _x1) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = _self.expression _self _x1 in
-      String_append (_x0, _x1)
-  | Bool _ as v -> v
-  | Typeof _x0 ->
-      let _x0 = _self.expression _self _x0 in
-      Typeof _x0
-  | Js_not _x0 ->
-      let _x0 = _self.expression _self _x0 in
-      Js_not _x0
-  | Seq (_x0, _x1) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = _self.expression _self _x1 in
-      Seq (_x0, _x1)
-  | Cond (_x0, _x1, _x2) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = _self.expression _self _x1 in
-      let _x2 = _self.expression _self _x2 in
-      Cond (_x0, _x1, _x2)
-  | Bin (_x0, _x1, _x2) ->
-      let _x1 = _self.expression _self _x1 in
-      let _x2 = _self.expression _self _x2 in
-      Bin (_x0, _x1, _x2)
-  | FlatCall (_x0, _x1) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = _self.expression _self _x1 in
-      FlatCall (_x0, _x1)
-  | Call (_x0, _x1, _x2) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = list _self.expression _self _x1 in
-      Call (_x0, _x1, _x2)
-  | Tagged_template (_x0, _x1, _x2) -> 
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = list _self.expression _self _x1 in
-      let _x2 = list _self.expression _self _x2 in
-      Tagged_template (_x0, _x1, _x2)
-  | String_index (_x0, _x1) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = _self.expression _self _x1 in
-      String_index (_x0, _x1)
-  | Array_index (_x0, _x1) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = _self.expression _self _x1 in
-      Array_index (_x0, _x1)
-  | Static_index (_x0, _x1, _x2) ->
-      let _x0 = _self.expression _self _x0 in
-      Static_index (_x0, _x1, _x2)
-  | New (_x0, _x1) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 =
-        option (fun _self arg -> list _self.expression _self arg) _self _x1
-      in
-      New (_x0, _x1)
-  | Var _x0 ->
-      let _x0 = _self.vident _self _x0 in
-      Var _x0
-  | Fun ({params; body} as fun_) ->
-      let params = list _self.ident _self params in
-      let body = _self.block _self body in
-      Fun {fun_ with params; body}
-  | Str _ as v -> v
-  | Raw_js_code _ as v -> v
-  | Array (_x0, _x1) ->
-      let _x0 = list _self.expression _self _x0 in
-      Array (_x0, _x1)
-  | Optional_block (_x0, _x1) ->
-      let _x0 = _self.expression _self _x0 in
-      Optional_block (_x0, _x1)
-  | Caml_block (_x0, _x1, _x2, _x3) ->
-      let _x0 = list _self.expression _self _x0 in
-      let _x2 = _self.expression _self _x2 in
-      Caml_block (_x0, _x1, _x2, _x3)
-  | Caml_block_tag (_x0, tag) ->
-      let _x0 = _self.expression _self _x0 in
-      Caml_block_tag (_x0, tag)
-  | Number _ as v -> v
-  | Object _x0 ->
-      let _x0 = property_map _self _x0 in
-      Object _x0
-  | Undefined _ as v -> v
-  | Null as v -> v
-  | Await _x0 ->
-    let _x0 = _self.expression _self _x0 in
-    Await _x0
-
-let for_ident_expression : for_ident_expression fn =
- fun _self arg -> _self.expression _self arg
-
-let finish_ident_expression : finish_ident_expression fn =
- fun _self arg -> _self.expression _self arg
-
-let case_clause : case_clause fn =
- fun _self { switch_body = _x0; should_break = _x1; comment = _x2 } ->
-  let _x0 = _self.block _self _x0 in
-  { switch_body = _x0; should_break = _x1; comment = _x2 }
-
-let string_clause : string_clause fn =
- fun _self (_x0, _x1) ->
-  let _x1 = case_clause _self _x1 in
-  (_x0, _x1)
-
-let int_clause : int_clause fn =
- fun _self (_x0, _x1) ->
-  let _x1 = case_clause _self _x1 in
-  (_x0, _x1)
-
-let statement_desc : statement_desc fn =
- fun _self -> function
-  | Block _x0 ->
-      let _x0 = _self.block _self _x0 in
-      Block _x0
-  | Variable _x0 ->
-      let _x0 = _self.variable_declaration _self _x0 in
-      Variable _x0
-  | Exp _x0 ->
-      let _x0 = _self.expression _self _x0 in
-      Exp _x0
-  | If (_x0, _x1, _x2) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = _self.block _self _x1 in
-      let _x2 = _self.block _self _x2 in
-      If (_x0, _x1, _x2)
-  | While (_x0, _x1, _x2, _x3) ->
-      let _x0 = option label _self _x0 in
-      let _x1 = _self.expression _self _x1 in
-      let _x2 = _self.block _self _x2 in
-      While (_x0, _x1, _x2, _x3)
-  | ForRange (_x0, _x1, _x2, _x3, _x4, _x5) ->
-      let _x0 = option for_ident_expression _self _x0 in
-      let _x1 = finish_ident_expression _self _x1 in
-      let _x2 = _self.for_ident _self _x2 in
-      let _x3 = for_direction _self _x3 in
-      let _x4 = _self.block _self _x4 in
-      ForRange (_x0, _x1, _x2, _x3, _x4, _x5)
-  | Continue _x0 ->
-      let _x0 = label _self _x0 in
-      Continue _x0
-  | Break as v -> v
-  | Return _x0 ->
-      let _x0 = _self.expression _self _x0 in
-      Return _x0
-  | Int_switch (_x0, _x1, _x2) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = list int_clause _self _x1 in
-      let _x2 = option _self.block _self _x2 in
-      Int_switch (_x0, _x1, _x2)
-  | String_switch (_x0, _x1, _x2) ->
-      let _x0 = _self.expression _self _x0 in
-      let _x1 = list string_clause _self _x1 in
-      let _x2 = option _self.block _self _x2 in
-      String_switch (_x0, _x1, _x2)
-  | Throw _x0 ->
-      let _x0 = _self.expression _self _x0 in
-      Throw _x0
-  | Try (_x0, _x1, _x2) ->
-      let _x0 = _self.block _self _x0 in
-      let _x1 =
-        option
-          (fun _self (_x0, _x1) ->
-            let _x0 = _self.exception_ident _self _x0 in
-            let _x1 = _self.block _self _x1 in
-            (_x0, _x1))
-          _self _x1
-      in
-      let _x2 = option _self.block _self _x2 in
-      Try (_x0, _x1, _x2)
-  | Debugger as v -> v
-
-let expression : expression fn =
- fun _self { expression_desc = _x0; comment = _x1 } ->
-  let _x0 = expression_desc _self _x0 in
-  { expression_desc = _x0; comment = _x1 }
-
-let statement : statement fn =
- fun _self { statement_desc = _x0; comment = _x1 } ->
-  let _x0 = statement_desc _self _x0 in
-  { statement_desc = _x0; comment = _x1 }
-
-let variable_declaration : variable_declaration fn =
- fun _self { ident = _x0; value = _x1; property = _x2; ident_info = _x3 } ->
-  let _x0 = _self.ident _self _x0 in
-  let _x1 = option _self.expression _self _x1 in
-  { ident = _x0; value = _x1; property = _x2; ident_info = _x3 }
-
-let block : block fn = fun _self arg -> list _self.statement _self arg
-
-let program : program fn =
- fun _self { block = _x0; exports = _x1; export_set = _x2 } ->
-  let _x0 = _self.block _self _x0 in
-  { block = _x0; exports = _x1; export_set = _x2 }
-
-let deps_program : deps_program fn =
- fun _self { program = _x0; modules = _x1; side_effect = _x2 } ->
-  let _x0 = _self.program _self _x0 in
-  let _x1 = required_modules _self _x1 in
-  { program = _x0; modules = _x1; side_effect = _x2 }
-
-let super : iter =
-  {
-    ident;
-    module_id;
-    vident;
-    exception_ident;
-    for_ident;
-    expression;
-    statement;
-    variable_declaration;
-    block;
-    program;
-  }
- 
\ No newline at end of file
diff --git a/jscomp/core/js_shake.ml b/jscomp/core/js_shake.ml
deleted file mode 100644
index ab8819c..0000000
--- a/jscomp/core/js_shake.ml
+++ /dev/null
@@ -1,108 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** we also need make it complete 
-*)
-let get_initial_exports count_non_variable_declaration_statement
-    (export_set : Set_ident.t) (block : J.block) =
-  let result =
-    Ext_list.fold_left block export_set (fun acc st ->
-        match st.statement_desc with
-        | Variable { ident; value; _ } -> (
-            if Set_ident.mem acc ident then
-              match value with
-              | None -> acc
-              | Some x ->
-                  (* If not a function, we have to calcuate again and again
-                      TODO: add hashtbl for a cache
-                  *)
-                  Set_ident.(
-                    union (Js_analyzer.free_variables_of_expression x) acc)
-            else
-              match value with
-              | None -> acc
-              | Some x ->
-                  if Js_analyzer.no_side_effect_expression x then acc
-                  else
-                    Set_ident.(
-                      union
-                        (Js_analyzer.free_variables_of_expression x)
-                        (add acc ident)))
-        | _ ->
-            (* recalcuate again and again ... *)
-            if
-              Js_analyzer.no_side_effect_statement st
-              || not count_non_variable_declaration_statement
-            then acc
-            else
-              Set_ident.(union (Js_analyzer.free_variables_of_statement st) acc))
-  in
-  (result, Set_ident.(diff result export_set))
-
-let shake_program (program : J.program) =
-  let shake_block block export_set =
-    let block = List.rev @@ Js_analyzer.rev_toplevel_flatten block in
-    let loop block export_set : Set_ident.t =
-      let rec aux acc block =
-        let result, diff = get_initial_exports false acc block in
-        (* let _d ()  =  *)
-        (*   if Ext_string.ends_with program.name  debug_file then  *)
-        (*     begin *)
-        (*       Ext_log.err "@[%a@]@." Set_ident.print result  ; *)
-        (*     end *)
-        (* in *)
-        if Set_ident.is_empty diff then result else aux result block
-      in
-      let first_iteration, delta = get_initial_exports true export_set block in
-
-      (* let _d ()  =  *)
-      (*   if Ext_string.ends_with program.name  debug_file then  *)
-      (*   begin   *)
-      (*     Ext_log.err "@[<v>%a@ %a@]@." *)
-      (*       Set_ident.print first_iteration   *)
-      (*       Set_ident.print delta (\* TODO: optimization, don't add persistent variables *\) *)
-      (*       ; *)
-      (*     Ext_log.err "init ---- @." *)
-      (*   end *)
-      (* in *)
-      if not @@ Set_ident.is_empty delta then aux first_iteration block
-      else first_iteration
-    in
-
-    let really_set = loop block export_set in
-    Ext_list.fold_right block [] (fun (st : J.statement) acc ->
-        match st.statement_desc with
-        | Variable { ident; value; _ } -> (
-            if Set_ident.mem really_set ident then st :: acc
-            else
-              match value with
-              | None -> acc
-              | Some x ->
-                  if Js_analyzer.no_side_effect_expression x then acc
-                  else st :: acc)
-        | _ ->
-            if Js_analyzer.no_side_effect_statement st then acc else st :: acc)
-  in
-
-  { program with block = shake_block program.block program.export_set }
diff --git a/jscomp/core/js_shake.mli b/jscomp/core/js_shake.mli
deleted file mode 100644
index bcbc76f..0000000
--- a/jscomp/core/js_shake.mli
+++ /dev/null
@@ -1,30 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** A module to shake JS IR
-
-    Tree shaking is not going to change the closure 
-*)
-
-val shake_program : J.program -> J.program
diff --git a/jscomp/core/js_stmt_make.ml b/jscomp/core/js_stmt_make.ml
deleted file mode 100644
index b2550bf..0000000
--- a/jscomp/core/js_stmt_make.ml
+++ /dev/null
@@ -1,349 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-
-type t = J.statement
-
-let return_stmt ?comment e : t = { statement_desc = Return e; comment }
-
-let empty_stmt : t = { statement_desc = Block []; comment = None }
-
-(* let empty_block : J.block = [] *)
-let throw_stmt ?comment v : t = { statement_desc = Throw v; comment }
-
-(* avoid nested block *)
-let rec block ?comment (b : J.block) : t =
-  match b with
-  | [ { statement_desc = Block bs } ] -> block bs
-  | [ b ] -> b
-  | [] -> empty_stmt
-  | _ -> { statement_desc = Block b; comment }
-
-(* It's a statement, we can discard some values *)
-let rec exp ?comment (e : E.t) : t =
-  match e.expression_desc with
-  | Seq ({ expression_desc = Number _ | Undefined _ }, b)
-  | Seq (b, { expression_desc = Number _ | Undefined _ }) ->
-      exp ?comment b
-  | Number _ | Undefined _ -> block []
-  (* TODO: we can do more *)
-  (* | _ when is_pure e ->  block [] *)
-  | _ -> { statement_desc = Exp e; comment }
-
-let declare_variable ?comment ?ident_info ~kind (ident : Ident.t) : t =
-  let property : J.property = kind in
-  let ident_info : J.ident_info =
-    match ident_info with None -> { used_stats = NA } | Some x -> x
-  in
-  {
-    statement_desc = Variable { ident; value = None; property; ident_info };
-    comment;
-  }
-
-let define_variable ?comment ?ident_info ~kind (v : Ident.t)
-    (exp : J.expression) : t = match exp.expression_desc with
-  | Undefined _ ->
-    declare_variable ?comment ?ident_info ~kind v
-  | _ ->
-    let property : J.property = kind in
-    let ident_info : J.ident_info =
-      match ident_info with None -> { used_stats = NA } | Some x -> x
-    in
-    {
-      statement_desc =
-        Variable { ident = v; value = Some exp; property; ident_info };
-      comment;
-    }
-
-(* let alias_variable ?comment  ~exp (v:Ident.t)  : t=
-   {statement_desc =
-     Variable {
-       ident = v; value = Some exp; property = Alias;
-       ident_info = {used_stats = NA }   };
-   comment} *)
-
-let int_switch ?(comment : string option)
-    ?(declaration : (J.property * Ident.t) option) ?(default : J.block option)
-    (e : J.expression) (clauses : (int * J.case_clause) list) : t =
-  match e.expression_desc with
-  | Number (Int { i; _ }) -> (
-      let continuation =
-        match
-          Ext_list.find_opt clauses (fun (switch_case, x) ->
-              if switch_case = Int32.to_int i then Some x.switch_body else None)
-        with
-        | Some case -> case
-        | None -> ( match default with Some x -> x | None -> assert false)
-      in
-      match (declaration, continuation) with
-      | ( Some (kind, did),
-          [
-            {
-              statement_desc =
-                Exp
-                  {
-                    expression_desc =
-                      Bin (Eq, { expression_desc = Var (Id id); _ }, e0);
-                    _;
-                  };
-              _;
-            };
-          ] )
-        when Ident.same did id ->
-          define_variable ?comment ~kind id e0
-      | Some (kind, did), _ ->
-          block (declare_variable ?comment ~kind did :: continuation)
-      | None, _ -> block continuation)
-  | _ -> (
-      match declaration with
-      | Some (kind, did) ->
-          block
-            [
-              declare_variable ?comment ~kind did;
-              { statement_desc = J.Int_switch (e, clauses, default); comment };
-            ]
-      | None -> { statement_desc = J.Int_switch (e, clauses, default); comment }
-      )
-
-let string_switch ?(comment : string option)
-    ?(declaration : (J.property * Ident.t) option) ?(default : J.block option)
-    (e : J.expression) (clauses : (Ast_untagged_variants.tag_type * J.case_clause) list) : t =
-  match e.expression_desc with
-  | Str {txt} -> (
-      let continuation =
-        match
-          Ext_list.find_opt clauses (fun (switch_case, x) ->
-            match switch_case with
-            | String s ->
-              if s = txt then Some x.switch_body else None
-            | Int _  | Float _ | BigInt _ | Bool _ | Null | Undefined | Untagged _ ->
-              None)
-        with
-        | Some case -> case
-        | None -> ( match default with Some x -> x | None -> assert false)
-      in
-      match (declaration, continuation) with
-      | ( Some (kind, did),
-          [
-            {
-              statement_desc =
-                Exp
-                  {
-                    expression_desc =
-                      Bin (Eq, { expression_desc = Var (Id id); _ }, e0);
-                    _;
-                  };
-              _;
-            };
-          ] )
-        when Ident.same did id ->
-          define_variable ?comment ~kind id e0
-      | Some (kind, did), _ ->
-          block @@ (declare_variable ?comment ~kind did :: continuation)
-      | None, _ -> block continuation)
-  | _ -> (
-      match declaration with
-      | Some (kind, did) ->
-          block
-            [
-              declare_variable ?comment ~kind did;
-              { statement_desc = String_switch (e, clauses, default); comment };
-            ]
-      | None ->
-          { statement_desc = String_switch (e, clauses, default); comment })
-
-let rec block_last_is_return_throw_or_continue (x : J.block) =
-  match x with
-  | [] -> false
-  | [ x ] -> (
-      match x.statement_desc with
-      | Return _ | Throw _ | Continue _ -> true
-      | _ -> false)
-  | _ :: rest -> block_last_is_return_throw_or_continue rest
-
-(* TODO: it also make sense  to extract some common statements
-    between those two branches, it does happen since in OCaml you
-    have to write some duplicated code due to the types system restriction
-    example:
-   {[
-     | Format_subst (pad_opt, fmtty, rest) ->
-       buffer_add_char buf '%'; bprint_ignored_flag buf ign_flag;
-       bprint_pad_opt buf pad_opt; buffer_add_char buf '(';
-       bprint_fmtty buf fmtty; buffer_add_char buf '%'; buffer_add_char buf ')';
-       fmtiter rest false;
-
-       | Scan_char_set (width_opt, char_set, rest) ->
-       buffer_add_char buf '%'; bprint_ignored_flag buf ign_flag;
-       bprint_pad_opt buf width_opt; bprint_char_set buf char_set;
-       fmtiter rest false;
-   ]}
-
-   To hit this branch, we also need [declaration] passed down
-           TODO: check how we compile [Lifthenelse]
-    The declaration argument is introduced to merge assignment in both branches
-
-   Note we can transfer code as below:
-   {[
-     if (x){
-         return /throw e;
-       } else {
-     blabla
-   }
-   ]}
-   into
-   {[
-     if (x){
-         return /throw e;
-       }
-         blabla
-   ]}
-   Not clear the benefit
-*)
-let if_ ?comment ?declaration ?else_ (e : J.expression) (then_ : J.block) : t =
-  let declared = ref false in
-  let common_prefix_blocks = ref [] in
-  let add_prefix b = common_prefix_blocks := b :: !common_prefix_blocks in
-  let rec aux ?comment (e : J.expression) (ifso : J.block) (ifnot : J.block) : t
-      =
-    match (e.expression_desc, ifnot) with
-    | Bool boolean, _ -> block (if boolean then ifso else ifnot)
-    | Js_not pred_not, _ :: _ -> aux ?comment pred_not ifnot ifso
-    | _ -> (
-        match (ifso, ifnot) with
-        | [], [] -> exp e
-        | [], _ ->
-            aux ?comment (E.not e) ifnot [] (*Make sure no infinite loop*)
-        | ( [ { statement_desc = Return ret_ifso; _ } ],
-            [ { statement_desc = Return ret_ifnot; _ } ] ) ->
-            return_stmt (E.econd e ret_ifso ret_ifnot)
-        | _, [ { statement_desc = Return _ } ] ->
-            block ({ statement_desc = If (E.not e, ifnot, []); comment } :: ifso)
-        | _, _ when block_last_is_return_throw_or_continue ifso ->
-            block ({ statement_desc = If (e, ifso, []); comment } :: ifnot)
-        | ( [
-              {
-                statement_desc =
-                  Exp
-                    {
-                      expression_desc =
-                        Bin
-                          ( Eq,
-                            ({ expression_desc = Var (Id var_ifso); _ } as
-                            lhs_ifso),
-                            rhs_ifso );
-                      _;
-                    };
-                _;
-              };
-            ],
-            [
-              {
-                statement_desc =
-                  Exp
-                    {
-                      expression_desc =
-                        Bin
-                          ( Eq,
-                            { expression_desc = Var (Id var_ifnot); _ },
-                            lhs_ifnot );
-                      _;
-                    };
-                _;
-              };
-            ] )
-          when Ident.same var_ifso var_ifnot -> (
-            match declaration with
-            | Some (kind, id) when Ident.same id var_ifso ->
-                declared := true;
-                define_variable ~kind var_ifso (E.econd e rhs_ifso lhs_ifnot)
-            | _ -> exp (E.assign lhs_ifso (E.econd e rhs_ifso lhs_ifnot)))
-        | ( [ { statement_desc = Exp exp_ifso; _ } ],
-            [ { statement_desc = Exp exp_ifnot; _ } ] ) ->
-            exp (E.econd e exp_ifso exp_ifnot)
-        | [ { statement_desc = If (pred1, ifso1, ifnot1) } ], _
-          when Js_analyzer.eq_block ifnot1 ifnot ->
-            aux ?comment (E.and_ e pred1) ifso1 ifnot1
-        | [ { statement_desc = If (pred1, ifso1, ifnot1) } ], _
-          when Js_analyzer.eq_block ifso1 ifnot ->
-            aux ?comment (E.and_ e (E.not pred1)) ifnot1 ifso1
-        | _, [ { statement_desc = If (pred1, ifso1, else_) } ]
-          when Js_analyzer.eq_block ifso ifso1 ->
-            aux ?comment (E.or_ e pred1) ifso else_
-        | _, [ { statement_desc = If (pred1, ifso1, ifnot1) } ]
-          when Js_analyzer.eq_block ifso ifnot1 ->
-            aux ?comment (E.or_ e (E.not pred1)) ifso ifso1
-        | ifso1 :: ifso_rest, ifnot1 :: ifnot_rest
-          when Js_analyzer.eq_statement ifnot1 ifso1
-               && Js_analyzer.no_side_effect_expression e ->
-            (* here we do agressive optimization, because it can help optimization later,
-                move code outside of branch is generally helpful later
-            *)
-            add_prefix ifso1;
-            aux ?comment e ifso_rest ifnot_rest
-        | _ -> { statement_desc = If (e, ifso, ifnot); comment })
-  in
-  let if_block =
-    aux ?comment e then_ (match else_ with None -> [] | Some v -> v)
-  in
-  let prefix = !common_prefix_blocks in
-  match (!declared, declaration) with
-  | true, _ | _, None ->
-      if prefix = [] then if_block
-      else block (List.rev_append prefix [ if_block ])
-  | false, Some (kind, id) ->
-      block (declare_variable ~kind id :: List.rev_append prefix [ if_block ])
-
-let assign ?comment id e : t =
-  { statement_desc = J.Exp (E.assign (E.var id) e); comment }
-
-let while_ ?comment ?label ?env (e : E.t) (st : J.block) : t =
-  let env = match env with None -> Js_closure.empty () | Some x -> x in
-  { statement_desc = While (label, e, st, env); comment }
-
-let for_ ?comment ?env for_ident_expression finish_ident_expression id direction
-    (b : J.block) : t =
-  let env = match env with None -> Js_closure.empty () | Some x -> x in
-  {
-    statement_desc =
-      ForRange
-        (for_ident_expression, finish_ident_expression, id, direction, b, env);
-    comment;
-  }
-
-let try_ ?comment ?with_ ?finally body : t =
-  { statement_desc = Try (body, with_, finally); comment }
-
-(* TODO:
-    actually, only loops can be labelled
-*)
-(* let continue_stmt  ?comment   ?(label="") ()  : t =
-   {
-    statement_desc = J.Continue  label;
-    comment;
-   } *)
-
-let continue_ : t = { statement_desc = Continue ""; comment = None }
-
-let debugger_block : t list = [ { statement_desc = Debugger; comment = None } ]
diff --git a/jscomp/core/js_stmt_make.mli b/jscomp/core/js_stmt_make.mli
deleted file mode 100644
index 2aca68a..0000000
--- a/jscomp/core/js_stmt_make.mli
+++ /dev/null
@@ -1,175 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Creator utilities for the [J] module *)
-
-type t = J.statement
-
-(** empty statement, block of length 0 *)
-(* val empty_stmt :
-   t *)
-
-val throw_stmt : ?comment:string -> J.expression -> t
-
-val if_ :
-  ?comment:string ->
-  ?declaration:Lam_compat.let_kind * Ident.t ->
-  (* when it's not None, we also need make a variable declaration in the
-     begininnig, however, we can optmize such case
-  *)
-  ?else_:J.block ->
-  J.expression ->
-  J.block ->
-  t
-
-val block : ?comment:string -> J.block -> t
-(**   
-   turn a block into  a single statement,
-   avoid nested block
-*)
-
-val int_switch :
-  ?comment:string ->
-  ?declaration:Lam_compat.let_kind * Ident.t ->
-  ?default:J.block ->
-  J.expression ->
-  (int * J.case_clause) list ->
-  t
-(** [int_switch ~declaration e clauses]
-
-    The [declaration] is attached to peepwhole 
-    such pattern 
-
-    {[
-      var x ;
-      x = yy
-    ]}
-
-    into
-    {[
-      var x = yy;
-    ]}
-*)
-
-val string_switch :
-  ?comment:string ->
-  ?declaration:Lam_compat.let_kind * Ident.t ->
-  ?default:J.block ->
-  J.expression ->
-  (Ast_untagged_variants.tag_type * J.case_clause) list ->
-  t
-
-val declare_variable :
-  ?comment:string ->
-  ?ident_info:J.ident_info ->
-  kind:Lam_compat.let_kind ->
-  Ident.t ->
-  t
-(** Just declaration without initialization *)
-
-(*** Declaration with initialization *)
-val define_variable :
-  ?comment:string ->
-  ?ident_info:J.ident_info ->
-  kind:Lam_compat.let_kind ->
-  Ident.t ->
-  J.expression ->
-  t
-
-(** created an alias expression *)
-(* val alias_variable :
-   ?comment:string ->
-   exp:J.expression ->
-   Ident.t ->
-   t *)
-
-val assign : ?comment:string -> J.ident -> J.expression -> t
-
-(** Used in cases like 
-    {[
-      let x = while true do 
-          ...
-        done in ..
-    ]}
-*)
-(* val assign_unit :
-   ?comment:string  ->
-   J.ident ->
-   t *)
-
-(** used in cases like 
-    {[
-      let x = while true do 
-          ...
-        done in ..
-    ]}
-*)
-(* val declare_unit :
-   ?comment:string  ->
-   J.ident ->
-   t *)
-
-val while_ :
-  ?comment:string ->
-  ?label:J.label ->
-  ?env:Js_closure.t ->
-  J.expression ->
-  J.block ->
-  t
-
-val for_ :
-  ?comment:string ->
-  ?env:Js_closure.t ->
-  J.for_ident_expression option ->
-  J.finish_ident_expression ->
-  J.for_ident ->
-  J.for_direction ->
-  J.block ->
-  t
-
-val try_ :
-  ?comment:string ->
-  ?with_:J.ident * J.block ->
-  ?finally:J.block ->
-  J.block ->
-  t
-
-val exp : ?comment:string -> J.expression -> t
-
-val return_stmt : ?comment:string -> J.expression -> t
-
-(* val return_unit : t list *)
-(** for ocaml function which returns unit 
-    it will be compiled into [return 0] in js *)
-
-(** if [label] is not set, it will default to empty *)
-(* val continue_stmt :
-   ?comment:string  ->
-   ?label:J.label ->
-   unit  ->
-   t *)
-
-val continue_ : t
-
-val debugger_block : t list
diff --git a/jscomp/core/lam.ml b/jscomp/core/lam.ml
deleted file mode 100644
index 3838171..0000000
--- a/jscomp/core/lam.ml
+++ /dev/null
@@ -1,801 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 ident = Ident.t
-type apply_status = App_na | App_infer_full | App_uncurry
-
-type ap_info = {
-  ap_loc : Location.t;
-  ap_inlined : Lambda.inline_attribute;
-  ap_status : apply_status;
-}
-
-module Types = struct
-  type lambda_switch = {
-    sw_consts_full : bool;
-    (* TODO: refine its representation *)
-    sw_consts : (int * t) list;
-    sw_blocks_full : bool;
-    sw_blocks : (int * t) list;
-    sw_failaction : t option;
-    sw_names : Ast_untagged_variants.switch_names option;
-  }
-
-  and lfunction = {
-    arity : int;
-    params : ident list;
-    body : t;
-    attr : Lambda.function_attribute;
-  }
-
-  (*
-     Invariant:
-     length (sw_consts) <= sw_consts_full
-     when length (sw_consts) >= sw_consts_full -> true
-     Note that failaction would appear in both
-      {[
-        match x with
-        | ..
-          | ..
-            | _ -> 2
-      ]}
-      since compiler would first test [x] is a const pointer
-      or not then the [default] applies to each branch.
-
-      In most cases: {[
-        let sw =
-          {sw_consts_full = cstr.cstr_consts; sw_consts = consts;
-           sw_blocks_full = cstr.cstr_nonconsts; sw_blocks = nonconsts;
-           sw_failaction = None} in
-      ]}
-
-      but there are some edge cases (see https://caml.inria.fr/mantis/view.php?id=6033)
-      one predicate used is
-      {[
-        (sw.sw_consts_full - List.length sw.sw_consts) +
-        (sw.sw_blocks_full - List.length sw.sw_blocks) > 1
-      ]}
-      if [= 1] with [some fail] -- called once
-      if [= 0] could not have [some fail]
-  *)
-  and prim_info = {
-    primitive : Lam_primitive.t;
-    args : t list;
-    loc : Location.t;
-  }
-
-  and apply = { ap_func : t; ap_args : t list; ap_info : ap_info }
-
-  and t =
-    | Lvar of ident
-    | Lglobal_module of ident * bool
-    | Lconst of Lam_constant.t
-    | Lapply of apply
-    | Lfunction of lfunction
-    | Llet of Lam_compat.let_kind * ident * t * t
-    | Lletrec of (ident * t) list * t
-    | Lprim of prim_info
-    | Lswitch of t * lambda_switch
-    | Lstringswitch of t * (string * t) list * t option
-    | Lstaticraise of int * t list
-    | Lstaticcatch of t * (int * ident list) * t
-    | Ltrywith of t * ident * t
-    | Lifthenelse of t * t * t
-    | Lsequence of t * t
-    | Lwhile of t * t
-    | Lfor of ident * t * t * Asttypes.direction_flag * t
-    | Lassign of ident * t
-  (* | Lsend of Lam_compat.meth_kind * t * t * t list * Location.t *)
-end
-
-module X = struct
-  type lambda_switch = Types.lambda_switch = {
-    sw_consts_full : bool;
-    sw_consts : (int * t) list;
-    sw_blocks_full : bool;
-    sw_blocks : (int * t) list;
-    sw_failaction : t option;
-    sw_names : Ast_untagged_variants.switch_names option;
-  }
-
-  and prim_info = Types.prim_info = {
-    primitive : Lam_primitive.t;
-    args : t list;
-    loc : Location.t;
-  }
-
-  and apply = Types.apply = { ap_func : t; ap_args : t list; ap_info : ap_info }
-
-  and lfunction = Types.lfunction = {
-    arity : int;
-    params : ident list;
-    body : t;
-    attr : Lambda.function_attribute;
-  }
-
-  and t = Types.t =
-    | Lvar of ident
-    | Lglobal_module of ident * bool
-    | Lconst of Lam_constant.t
-    | Lapply of apply
-    | Lfunction of lfunction
-    | Llet of Lam_compat.let_kind * ident * t * t
-    | Lletrec of (ident * t) list * t
-    | Lprim of prim_info
-    | Lswitch of t * lambda_switch
-    | Lstringswitch of t * (string * t) list * t option
-    | Lstaticraise of int * t list
-    | Lstaticcatch of t * (int * ident list) * t
-    | Ltrywith of t * ident * t
-    | Lifthenelse of t * t * t
-    | Lsequence of t * t
-    | Lwhile of t * t
-    | Lfor of ident * t * t * Asttypes.direction_flag * t
-    | Lassign of ident * t
-  (* | Lsend of Lam_compat.meth_kind * t * t * t list * Location.t *)
-end
-
-include Types
-
-(** apply [f] to direct successor which has type [Lam.t] *)
-
-let inner_map (l : t) (f : t -> X.t) : X.t =
-  match l with
-  | Lvar (_ : ident) | Lconst (_ : Lam_constant.t) -> ((* Obj.magic *) l : X.t)
-  | Lapply { ap_func; ap_args; ap_info } ->
-      let ap_func = f ap_func in
-      let ap_args = Ext_list.map ap_args f in
-      Lapply { ap_func; ap_args; ap_info }
-  | Lfunction { body; arity; params; attr } ->
-      let body = f body in
-      Lfunction { body; arity; params; attr }
-  | Llet (str, id, arg, body) ->
-      let arg = f arg in
-      let body = f body in
-      Llet (str, id, arg, body)
-  | Lletrec (decl, body) ->
-      let body = f body in
-      let decl = Ext_list.map_snd decl f in
-      Lletrec (decl, body)
-  | Lglobal_module _ -> (l : X.t)
-  | Lprim { args; primitive; loc } ->
-      let args = Ext_list.map args f in
-      Lprim { args; primitive; loc }
-  | Lswitch
-      ( arg,
-        {
-          sw_consts;
-          sw_consts_full;
-          sw_blocks;
-          sw_blocks_full;
-          sw_failaction;
-          sw_names;
-        } ) ->
-      let arg = f arg in
-      let sw_consts = Ext_list.map_snd sw_consts f in
-      let sw_blocks = Ext_list.map_snd sw_blocks f in
-      let sw_failaction = Ext_option.map sw_failaction f in
-      Lswitch
-        ( arg,
-          {
-            sw_consts;
-            sw_blocks;
-            sw_failaction;
-            sw_blocks_full;
-            sw_consts_full;
-            sw_names;
-          } )
-  | Lstringswitch (arg, cases, default) ->
-      let arg = f arg in
-      let cases = Ext_list.map_snd cases f in
-      let default = Ext_option.map default f in
-      Lstringswitch (arg, cases, default)
-  | Lstaticraise (id, args) ->
-      let args = Ext_list.map args f in
-      Lstaticraise (id, args)
-  | Lstaticcatch (e1, vars, e2) ->
-      let e1 = f e1 in
-      let e2 = f e2 in
-      Lstaticcatch (e1, vars, e2)
-  | Ltrywith (e1, exn, e2) ->
-      let e1 = f e1 in
-      let e2 = f e2 in
-      Ltrywith (e1, exn, e2)
-  | Lifthenelse (e1, e2, e3) ->
-      let e1 = f e1 in
-      let e2 = f e2 in
-      let e3 = f e3 in
-      Lifthenelse (e1, e2, e3)
-  | Lsequence (e1, e2) ->
-      let e1 = f e1 in
-      let e2 = f e2 in
-      Lsequence (e1, e2)
-  | Lwhile (e1, e2) ->
-      let e1 = f e1 in
-      let e2 = f e2 in
-      Lwhile (e1, e2)
-  | Lfor (v, e1, e2, dir, e3) ->
-      let e1 = f e1 in
-      let e2 = f e2 in
-      let e3 = f e3 in
-      Lfor (v, e1, e2, dir, e3)
-  | Lassign (id, e) ->
-      let e = f e in
-      Lassign (id, e)
-(* | Lsend (k, met, obj, args, loc) ->
-   let met = f met in
-   let obj = f obj in
-   let args = Ext_list.map args f in
-   Lsend(k,met,obj,args,loc) *)
-
-exception Not_simple_form
-
-(**
-
-
-   [is_eta_conversion_exn params inner_args outer_args]
-   case 1:
-   {{
-    (fun params -> wrap (primitive (inner_args)) args
-   }}
-   when [inner_args] are the same as [params], it can be simplified as
-   [wrap (primitive args)]
-
-    where [wrap] used to be simple instructions
-    Note that [external] functions are forced to do eta-conversion
-    when combined with [|>] operator, we need to make sure beta-reduction
-    is applied though since `[@variadic]` needs such guarantee.
-    Since `[@variadic] is the tail position
-*)
-let rec is_eta_conversion_exn params inner_args outer_args : t list =
-  match (params, inner_args, outer_args) with
-  | x :: xs, Lvar y :: ys, r :: rest when Ident.same x y ->
-      r :: is_eta_conversion_exn xs ys rest
-  | ( x :: xs,
-      Lprim ({ primitive = Pjs_fn_make _ | Pjs_fn_make_unit; args = [ Lvar y ] } as p) :: ys,
-      r :: rest )
-    when Ident.same x y ->
-      Lprim { p with args = [ r ] } :: is_eta_conversion_exn xs ys rest
-  | [], [], [] -> []
-  | _, _, _ -> raise_notrace Not_simple_form
-
-(** FIXME: more robust inlining check later, we should inline it before we add stub code*)
-let rec apply fn args (ap_info : ap_info) : t =
-  match fn with
-  | Lfunction
-      {
-        params;
-        body =
-          Lprim
-            {
-              primitive =
-                ( Pundefined_to_opt | Pnull_to_opt | Pnull_undefined_to_opt
-                | Pis_null | Pis_null_undefined | Pjs_typeof ) as wrap;
-              args =
-                [
-                  Lprim ({ primitive = _; args = inner_args } as primitive_call);
-                ];
-            };
-      } -> (
-      match is_eta_conversion_exn params inner_args args with
-      | args ->
-          let loc = ap_info.ap_loc in
-          Lprim
-            {
-              primitive = wrap;
-              args = [ Lprim { primitive_call with args; loc } ];
-              loc;
-            }
-      | exception Not_simple_form ->
-          Lapply { ap_func = fn; ap_args = args; ap_info })
-  | Lfunction
-      {
-        params;
-        body = Lprim ({ primitive = _; args = inner_args } as primitive_call);
-      } -> (
-      match is_eta_conversion_exn params inner_args args with
-      | args -> Lprim { primitive_call with args; loc = ap_info.ap_loc }
-      | exception _ -> Lapply { ap_func = fn; ap_args = args; ap_info })
-  | Lfunction
-      {
-        params;
-        body =
-          Lsequence
-            ( Lprim ({ primitive = _; args = inner_args } as primitive_call),
-              (Lconst _ as const) );
-      } -> (
-      match is_eta_conversion_exn params inner_args args with
-      | args ->
-          Lsequence
-            (Lprim { primitive_call with args; loc = ap_info.ap_loc }, const)
-      | exception _ ->
-          Lapply { ap_func = fn; ap_args = args; ap_info }
-          (* | Lfunction {params;body} when Ext_list.same_length params args ->
-              Ext_list.fold_right2 (fun p arg acc ->
-                Llet(Strict,p,arg,acc)
-              ) params args body *)
-          (* TODO: more rigirous analysis on [let_kind] *))
-  | Llet (kind, id, e, (Lfunction _ as fn)) ->
-      Llet (kind, id, e, apply fn args ap_info)
-  (* | Llet (kind0, id0, e0, Llet (kind,id, e, (Lfunction _ as fn))) ->
-     Llet(kind0,id0,e0,Llet (kind, id, e, apply fn args loc status)) *)
-  | _ -> Lapply { ap_func = fn; ap_args = args; ap_info }
-
-let rec eq_approx (l1 : t) (l2 : t) =
-  match l1 with
-  | Lglobal_module (i1, b1) -> (
-      match l2 with Lglobal_module (i2, b2) -> Ident.same i1 i2 && b1 = b2 | _ -> false)
-  | Lvar i1 -> ( match l2 with Lvar i2 -> Ident.same i1 i2 | _ -> false)
-  | Lconst c1 -> (
-      match l2 with Lconst c2 -> Lam_constant.eq_approx c1 c2 | _ -> false)
-  | Lapply app1 -> (
-      match l2 with
-      | Lapply app2 ->
-          eq_approx app1.ap_func app2.ap_func
-          && eq_approx_list app1.ap_args app2.ap_args
-      | _ -> false)
-  | Lifthenelse (a, b, c) -> (
-      match l2 with
-      | Lifthenelse (a0, b0, c0) ->
-          eq_approx a a0 && eq_approx b b0 && eq_approx c c0
-      | _ -> false)
-  | Lsequence (a, b) -> (
-      match l2 with
-      | Lsequence (a0, b0) -> eq_approx a a0 && eq_approx b b0
-      | _ -> false)
-  | Lwhile (p, b) -> (
-      match l2 with
-      | Lwhile (p0, b0) -> eq_approx p p0 && eq_approx b b0
-      | _ -> false)
-  | Lassign (v0, l0) -> (
-      match l2 with
-      | Lassign (v1, l1) -> Ident.same v0 v1 && eq_approx l0 l1
-      | _ -> false)
-  | Lstaticraise (id, ls) -> (
-      match l2 with
-      | Lstaticraise (id1, ls1) -> id = id1 && eq_approx_list ls ls1
-      | _ -> false)
-  | Lprim info1 -> (
-      match l2 with
-      | Lprim info2 ->
-          Lam_primitive.eq_primitive_approx info1.primitive info2.primitive
-          && eq_approx_list info1.args info2.args
-      | _ -> false)
-  | Lstringswitch (arg, patterns, default) -> (
-      match l2 with
-      | Lstringswitch (arg2, patterns2, default2) ->
-          eq_approx arg arg2 && eq_option default default2
-          && Ext_list.for_all2_no_exn patterns patterns2
-               (fun ((k : string), v) (k2, v2) -> k = k2 && eq_approx v v2)
-      | _ -> false)
-  | Lfunction _
-  | Llet (_, _, _, _)
-  | Lletrec _ | Lswitch _ | Lstaticcatch _ | Ltrywith _
-  | Lfor (_, _, _, _, _) ->
-      false
-
-and eq_option l1 l2 =
-  match l1 with
-  | None -> l2 = None
-  | Some l1 -> ( match l2 with Some l2 -> eq_approx l1 l2 | None -> false)
-
-and eq_approx_list ls ls1 = Ext_list.for_all2_no_exn ls ls1 eq_approx
-
-let switch lam (lam_switch : lambda_switch) : t =
-  match lam with
-  | Lconst (Const_int { i }) ->
-      (* Because of inlining and dead code, we might be looking at a value of unexpected type 
-         e.g. an integer, so the const case might not be found *)
-      (try
-        Ext_list.assoc_by_int lam_switch.sw_consts (Int32.to_int i) lam_switch.sw_failaction
-      with _ -> Lswitch(lam, lam_switch))
-  | Lconst (Const_block (i, _, _)) ->
-      (try Ext_list.assoc_by_int lam_switch.sw_blocks i lam_switch.sw_failaction
-      with _ -> Lswitch(lam, lam_switch))
-  | _ -> Lswitch (lam, lam_switch)
-
-let stringswitch (lam : t) cases default : t =
-  match lam with
-  | Lconst (Const_string { s; unicode = false }) ->
-      Ext_list.assoc_by_string cases s default
-  | _ -> Lstringswitch (lam, cases, default)
-
-let true_ : t = Lconst Const_js_true
-let false_ : t = Lconst Const_js_false
-let unit : t = Lconst (Const_js_undefined {isUnit = true})
-
-let rec seq (a : t) b : t =
-  match a with
-  | Lprim { primitive = Pmakeblock _; args = x :: xs } ->
-      seq (Ext_list.fold_left xs x seq) b
-  | Lprim
-      {
-        primitive = Pnull_to_opt | Pundefined_to_opt | Pnull_undefined_to_opt;
-        args = [ a ];
-      } ->
-      seq a b
-  | _ -> Lsequence (a, b)
-
-let var id : t = Lvar id
-let global_module ?(dynamic_import = false) id = Lglobal_module (id, dynamic_import)
-let const ct : t = Lconst ct
-
-let function_ ~attr ~arity ~params ~body : t =
-  Lfunction { arity; params; body; attr }
-
-let let_ kind id e body : t = Llet (kind, id, e, body)
-let letrec bindings body : t = Lletrec (bindings, body)
-let while_ a b : t = Lwhile (a, b)
-let try_ body id handler : t = Ltrywith (body, id, handler)
-let for_ v e1 e2 dir e3 : t = Lfor (v, e1, e2, dir, e3)
-let assign v l : t = Lassign (v, l)
-let staticcatch a b c : t = Lstaticcatch (a, b, c)
-let staticraise a b : t = Lstaticraise (a, b)
-
-module Lift = struct
-  let int i : t = Lconst (Const_int { i; comment = None })
-
-  (* let int32 i : t =
-     Lconst ((Const_int32 i)) *)
-
-  let bool b = if b then true_ else false_
-
-  (* ATTENTION: [float, nativeint] constant propogaton is not done
-     yet , due to cross platform problem
-  *)
-  (* let float b  : t =
-     Lconst ((Const_float b)) *)
-
-  (* let nativeint b : t =
-     Lconst ((Const_nativeint b)) *)
-
-  let int64 b : t = Lconst (Const_int64 b)
-  let string s : t = Lconst (Const_string { s; unicode = false })
-  let char b : t = Lconst (Const_char b)
-end
-
-let prim ~primitive:(prim : Lam_primitive.t) ~args loc : t =
-  let default () : t = Lprim { primitive = prim; args; loc } in
-  match args with
-  | [ Lconst a ] -> (
-      match (prim, a) with
-      | Pnegint, Const_int { i } -> Lift.int (Int32.neg i)
-      (* | Pfloatofint, ( (Const_int a)) *)
-      (*   -> Lift.float (float_of_int a) *)
-      | Pintoffloat, Const_float a ->
-          Lift.int (Int32.of_float (float_of_string a))
-      (* | Pnegfloat -> Lift.float (-. a) *)
-      (* | Pabsfloat -> Lift.float (abs_float a) *)
-      | Pstringlength, Const_string { s; unicode = false } ->
-          Lift.int (Int32.of_int (String.length s))
-      (* | Pnegbint Pnativeint, ( (Const_nativeint i)) *)
-      (*   ->   *)
-      (*   Lift.nativeint (Nativeint.neg i) *)
-      | Pnegint64, Const_int64 a -> Lift.int64 (Int64.neg a)
-      | Pnot, Const_js_true -> false_
-      | Pnot, Const_js_false -> true_
-      | _ -> default ())
-  | [ Lconst a; Lconst b ] -> (
-      match (prim, a, b) with
-      | Pint64comp cmp, Const_int64 a, Const_int64 b ->
-          Lift.bool (Lam_compat.cmp_int64 cmp a b)
-      | Pintcomp cmp, Const_int a, Const_int b ->
-          Lift.bool (Lam_compat.cmp_int32 cmp a.i b.i)
-      | Pfloatcomp cmp, Const_float a, Const_float b ->
-          (* FIXME: could raise? *)
-          Lift.bool
-            (Lam_compat.cmp_float cmp (float_of_string a) (float_of_string b))
-      | Pbigintcomp cmp, Const_bigint _, Const_bigint _ -> default ()
-      | Pintcomp ((Ceq | Cneq) as op), Const_pointer a, Const_pointer b ->
-          Lift.bool
-            (match op with
-            | Ceq -> a = (b : string)
-            | Cneq -> a <> b
-            | _ -> assert false)
-      | ( ( Paddint | Psubint | Pmulint | Pdivint | Pmodint | Pandint | Porint
-          | Pxorint | Plslint | Plsrint | Pasrint ),
-          Const_int { i = aa },
-          Const_int { i = bb } ) -> (
-          (* WE SHOULD keep it as [int], to preserve types *)
-          let int_ = Lift.int in
-          match prim with
-          | Paddint -> int_ (Int32.add aa bb)
-          | Psubint -> int_ (Int32.sub aa bb)
-          | Pmulint -> int_ (Int32.mul aa bb)
-          | Pdivint -> if bb = 0l then default () else int_ (Int32.div aa bb)
-          | Pmodint -> if bb = 0l then default () else int_ (Int32.rem aa bb)
-          | Pandint -> int_ (Int32.logand aa bb)
-          | Porint -> int_ (Int32.logor aa bb)
-          | Pxorint -> int_ (Int32.logxor aa bb)
-          | Plslint -> int_ (Int32.shift_left aa (Int32.to_int bb))
-          | Plsrint -> int_ (Int32.shift_right_logical aa (Int32.to_int bb))
-          | Pasrint -> int_ (Int32.shift_right aa (Int32.to_int bb))
-          | _ -> default ())
-      | ( ( Paddint64 | Psubint64 | Pmulint64 | Pdivint64 | Pmodint64
-          | Pandint64 | Porint64 | Pxorint64 ),
-          Const_int64 aa,
-          Const_int64 bb ) -> (
-          match prim with
-          | Paddint64 -> Lift.int64 (Int64.add aa bb)
-          | Psubint64 -> Lift.int64 (Int64.sub aa bb)
-          | Pmulint64 -> Lift.int64 (Int64.mul aa bb)
-          | Pdivint64 -> (
-              try Lift.int64 (Int64.div aa bb) with _ -> default ())
-          | Pmodint64 -> (
-              try Lift.int64 (Int64.rem aa bb) with _ -> default ())
-          | Pandint64 -> Lift.int64 (Int64.logand aa bb)
-          | Porint64 -> Lift.int64 (Int64.logor aa bb)
-          | Pxorint64 -> Lift.int64 (Int64.logxor aa bb)
-          | _ -> default ())
-      | Plslint64, Const_int64 aa, Const_int { i = b } ->
-          Lift.int64 (Int64.shift_left aa (Int32.to_int b))
-      | Plsrint64, Const_int64 aa, Const_int { i = b } ->
-          Lift.int64 (Int64.shift_right_logical aa (Int32.to_int b))
-      | Pasrint64, Const_int64 aa, Const_int { i = b } ->
-          Lift.int64 (Int64.shift_right aa (Int32.to_int b))
-      | Psequand, Const_js_false, (Const_js_true | Const_js_false) -> false_
-      | Psequand, Const_js_true, Const_js_true -> true_
-      | Psequand, Const_js_true, Const_js_false -> false_
-      | Psequor, Const_js_true, (Const_js_true | Const_js_false) -> true_
-      | Psequor, Const_js_false, Const_js_true -> true_
-      | Psequor, Const_js_false, Const_js_false -> false_
-      | ( Pstringadd,
-          Const_string { s = a; unicode = false },
-          Const_string { s = b; unicode = false } ) ->
-          Lift.string (a ^ b)
-      | ( (Pstringrefs | Pstringrefu),
-          Const_string { s = a; unicode = false },
-          Const_int { i = b } ) -> (
-          try Lift.char (Char.code (String.get a (Int32.to_int b))) with _ -> default ())
-      | _ -> default ())
-  | _ -> (
-      match prim with
-      | Pmakeblock (_size, Blk_module fields, _) -> (
-          let rec aux fields args (var : Ident.t) i =
-            match (fields, args) with
-            | [], [] -> true
-            | ( f :: fields,
-                Lprim
-                  {
-                    primitive = Pfield (pos, Fld_module { name = f1 });
-                    args = [ (Lglobal_module (v1, _) | Lvar v1) ];
-                  }
-                :: args ) ->
-                pos = i && f = f1 && Ident.same var v1
-                && aux fields args var (i + 1)
-            | _, _ -> false
-          in
-          match (fields, args) with
-          | ( field1 :: rest,
-              Lprim
-                {
-                  primitive = Pfield (pos, Fld_module { name = f1 });
-                  args = [ ((Lglobal_module (v1, _) | Lvar v1) as lam) ];
-                }
-              :: args1 ) ->
-              if pos = 0 && field1 = f1 && aux rest args1 v1 1 then lam
-              else default ()
-          | _ -> default ())
-      (* In this level, include is already expanded, so that
-         {[
-           { x0 : y0 ; x1 : y1 }
-         ]}
-         such module x can indeed be replaced by module y
-      *)
-      | _ -> default ())
-
-let not_ loc x : t =
-  match x with
-  | Lprim ({ primitive = Pintcomp Cneq } as prim) ->
-      Lprim { prim with primitive = Pintcomp Ceq }
-  | _ -> prim ~primitive:Pnot ~args:[ x ] loc
-
-let has_boolean_type (x : t) =
-  match x with
-  | Lprim
-      {
-        primitive =
-          ( Pnot | Psequand | Psequor | Pisout _ | Pintcomp _ | Pis_not_none
-          | Pfloatcomp _
-          | Pccall { prim_name = "caml_string_equal" | "caml_string_notequal" }
-            );
-        loc;
-      } ->
-      Some loc
-  | _ -> None
-
-(** [complete_range sw_consts 0 7]
-    is complete with [0,1,.. 7]
-*)
-let rec complete_range (sw_consts : (int * _) list) ~(start : int) ~finish =
-  match sw_consts with
-  | [] -> finish < start
-  | (i, _) :: rest ->
-      start <= finish && i = start
-      && complete_range rest ~start:(start + 1) ~finish
-
-let rec eval_const_as_bool (v : Lam_constant.t) : bool =
-  match v with
-  | Const_int { i = x } -> x <> 0l
-  | Const_char x -> x <> 0
-  | Const_int64 x -> x <> 0L
-  | Const_js_false | Const_js_null | Const_module_alias | Const_js_undefined _ ->
-      false
-  | Const_js_true | Const_string _ | Const_pointer _ | Const_float _ | Const_bigint _
-  | Const_block _ | Const_float_array _ ->
-      true
-  | Const_some b -> eval_const_as_bool b
-
-let if_ (a : t) (b : t) (c : t) : t =
-  match a with
-  | Lconst v -> if eval_const_as_bool v then b else c
-  | _ -> (
-      match (b, c) with
-      | _, Lconst (Const_int { comment = Pt_assertfalse }) ->
-          seq a b (* TODO: we could customize more cases *)
-      | Lconst (Const_int { comment = Pt_assertfalse }), _ -> seq a c
-      | Lconst Const_js_true, Lconst Const_js_false ->
-          if has_boolean_type a != None then a else Lifthenelse (a, b, c)
-      | Lconst Const_js_false, Lconst Const_js_true -> (
-          match has_boolean_type a with
-          | Some loc -> not_ loc a
-          | None -> Lifthenelse (a, b, c))
-      | Lprim { primitive = Praise }, _ -> (
-          match c with
-          | Lconst _ -> Lifthenelse (a, b, c)
-          | _ -> seq (Lifthenelse (a, b, unit)) c)
-      | _ -> (
-          match a with
-          | Lprim
-              {
-                primitive = Pisout off;
-                args = [ Lconst (Const_int { i = range }); Lvar xx ];
-              } -> (
-              let range = Int32.to_int range in
-              match c with
-              | Lswitch
-                  ( (Lvar yy as switch_arg),
-                    ({
-                       sw_blocks = [];
-                       sw_blocks_full = true;
-                       sw_consts;
-                       sw_consts_full = _;
-                       sw_failaction = None;
-                     } as body) )
-                when Ident.same xx yy
-                     && complete_range sw_consts ~start:(-off)
-                          ~finish:(range - off) ->
-                  Lswitch
-                    ( switch_arg,
-                      {
-                        body with
-                        sw_failaction = Some b;
-                        sw_consts_full = false;
-                      } )
-              | _ -> Lifthenelse (a, b, c))
-          | Lprim { primitive = Pisint; args = [ Lvar i ]; _ } -> (
-              match b with
-              | Lifthenelse
-                  ( Lprim
-                      { primitive = Pintcomp Ceq; args = [ Lvar j; Lconst _ ] },
-                    _,
-                    b_f )
-                when Ident.same i j && eq_approx b_f c ->
-                  b
-              | Lprim { primitive = Pintcomp Ceq; args = [ Lvar j; Lconst _ ] }
-                when Ident.same i j && eq_approx false_ c ->
-                  b
-              | Lifthenelse
-                  ( Lprim
-                      ({
-                         primitive = Pintcomp Cneq;
-                         args = [ Lvar j; Lconst _ ];
-                       } as b_pred),
-                    b_t,
-                    b_f )
-                when Ident.same i j && eq_approx b_t c ->
-                  Lifthenelse
-                    (Lprim { b_pred with primitive = Pintcomp Ceq }, b_f, b_t)
-              | Lprim
-                  {
-                    primitive = Pintcomp Cneq;
-                    args = [ Lvar j; Lconst _ ] as args;
-                    loc;
-                  }
-              | Lprim
-                  {
-                    primitive = Pnot;
-                    args =
-                      [
-                        Lprim
-                          {
-                            primitive = Pintcomp Ceq;
-                            args = [ Lvar j; Lconst _ ] as args;
-                            loc;
-                          };
-                      ];
-                  }
-                when Ident.same i j && eq_approx true_ c ->
-                  Lprim { primitive = Pintcomp Cneq; args; loc }
-              | _ -> Lifthenelse (a, b, c))
-          | _ -> Lifthenelse (a, b, c)))
-
-(* TODO: the smart constructor is not exploited yet*)
-(* [l || r ] *)
-let sequor l r = if_ l true_ r
-
-(** [l && r ] *)
-let sequand l r = if_ l r false_
-
-(******************************************************************)
-(* only [handle_bs_non_obj_ffi] will be used outside *)
-(*
-   [no_auto_uncurried_arg_types xs]
-   check if the FFI have @uncurry attribute.
-   if it does not we wrap it in a nomral way otherwise
-*)
-let rec no_auto_uncurried_arg_types (xs : External_arg_spec.params) =
-  match xs with
-  | [] -> true
-  | { arg_type = Fn_uncurry_arity _ } :: _ -> false
-  | _ :: xs -> no_auto_uncurried_arg_types xs
-
-let result_wrap loc (result_type : External_ffi_types.return_wrapper) result =
-  match result_type with
-  | Return_replaced_with_unit -> seq result unit
-  | Return_null_to_opt -> prim ~primitive:Pnull_to_opt ~args:[ result ] loc
-  | Return_null_undefined_to_opt ->
-      prim ~primitive:Pnull_undefined_to_opt ~args:[ result ] loc
-  | Return_undefined_to_opt ->
-      prim ~primitive:Pundefined_to_opt ~args:[ result ] loc
-  | Return_unset | Return_identity -> result
-
-let rec transform_uncurried_arg_type loc (arg_types : External_arg_spec.params)
-    (args : t list) =
-  match (arg_types, args) with
-  | { arg_type = Fn_uncurry_arity n; arg_label } :: xs, y :: ys ->
-      let o_arg_types, o_args = transform_uncurried_arg_type loc xs ys in
-      ( { External_arg_spec.arg_type = Nothing; arg_label } :: o_arg_types,
-        prim ~primitive:(Pjs_fn_make n) ~args:[ y ] loc :: o_args )
-  | x :: xs, y :: ys -> (
-      match x with
-      | { arg_type = Arg_cst _ } ->
-          let o_arg_types, o_args = transform_uncurried_arg_type loc xs args in
-          (x :: o_arg_types, o_args)
-      | _ ->
-          let o_arg_types, o_args = transform_uncurried_arg_type loc xs ys in
-          (x :: o_arg_types, y :: o_args))
-  | ([], [] | _ :: _, [] | [], _ :: _) as ok -> ok
-
-let handle_bs_non_obj_ffi (arg_types : External_arg_spec.params)
-    (result_type : External_ffi_types.return_wrapper) ffi args loc prim_name ~dynamic_import =
-  if no_auto_uncurried_arg_types arg_types then
-    result_wrap loc result_type
-      (prim ~primitive:(Pjs_call { prim_name; arg_types; ffi; dynamic_import }) ~args loc)
-  else
-    let n_arg_types, n_args = transform_uncurried_arg_type loc arg_types args in
-    result_wrap loc result_type
-      (prim
-         ~primitive:(Pjs_call { prim_name; arg_types = n_arg_types; ffi; dynamic_import })
-         ~args:n_args loc)
diff --git a/jscomp/core/lam.mli b/jscomp/core/lam.mli
deleted file mode 100644
index cc76e5b..0000000
--- a/jscomp/core/lam.mli
+++ /dev/null
@@ -1,163 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 apply_status = App_na | App_infer_full | App_uncurry
-
-type ap_info = {
-  ap_loc : Location.t;
-  ap_inlined : Lambda.inline_attribute;
-  ap_status : apply_status;
-}
-
-type ident = Ident.t
-
-type lambda_switch = {
-  sw_consts_full : bool;
-  sw_consts : (int * t) list;
-  sw_blocks_full : bool;
-  sw_blocks : (int * t) list;
-  sw_failaction : t option;
-  sw_names : Ast_untagged_variants.switch_names option;
-}
-
-and apply = private { ap_func : t; ap_args : t list; ap_info : ap_info }
-
-and lfunction = {
-  arity : int;
-  params : ident list;
-  body : t;
-  attr : Lambda.function_attribute;
-}
-
-and prim_info = private {
-  primitive : Lam_primitive.t;
-  args : t list;
-  loc : Location.t;
-}
-
-and t = private
-  | Lvar of ident
-  | Lglobal_module of ident * bool
-  | Lconst of Lam_constant.t
-  | Lapply of apply
-  | Lfunction of lfunction
-  | Llet of Lam_compat.let_kind * ident * t * t
-  | Lletrec of (ident * t) list * t
-  | Lprim of prim_info
-  | Lswitch of t * lambda_switch
-  | Lstringswitch of t * (string * t) list * t option
-  | Lstaticraise of int * t list
-  | Lstaticcatch of t * (int * ident list) * t
-  | Ltrywith of t * ident * t
-  | Lifthenelse of t * t * t
-  | Lsequence of t * t
-  | Lwhile of t * t
-  | Lfor of ident * t * t * Asttypes.direction_flag * t
-  | Lassign of ident * t
-
-(* | Lsend of Lambda.meth_kind * t * t * t list * Location.t *)
-(* | Levent of t * Lambda.lambda_event
-   [Levent] in the branch hurt pattern match,
-   we should use record for trivial debugger info
-*)
-
-val inner_map : t -> (t -> t) -> t
-
-val handle_bs_non_obj_ffi :
-  External_arg_spec.params ->
-  External_ffi_types.return_wrapper ->
-  External_ffi_types.external_spec ->
-  t list ->
-  Location.t ->
-  string ->
-  dynamic_import: bool ->
-  t
-
-(**************************************************************)
-
-val var : ident -> t
-(** Smart constructors *)
-
-val global_module : ?dynamic_import:bool -> ident -> t
-
-val const : Lam_constant.t -> t
-
-val apply : t -> t list -> ap_info -> t
-
-val function_ :
-  attr:Lambda.function_attribute ->
-  arity:int ->
-  params:ident list ->
-  body:t ->
-  t
-
-val let_ : Lam_compat.let_kind -> ident -> t -> t -> t
-
-val letrec : (ident * t) list -> t -> t
-
-val if_ : t -> t -> t -> t
-(**  constant folding *)
-
-val switch : t -> lambda_switch -> t
-(** constant folding*)
-
-val stringswitch : t -> (string * t) list -> t option -> t
-(** constant folding*)
-
-(* val true_ : t  *)
-val false_ : t
-
-val unit : t
-
-val sequor : t -> t -> t
-(** convert [l || r] to [if l then true else r]*)
-
-val sequand : t -> t -> t
-(** convert [l && r] to [if l then r else false *)
-
-val not_ : Location.t -> t -> t
-(** constant folding *)
-
-val seq : t -> t -> t
-(** drop unused block *)
-
-val while_ : t -> t -> t
-
-(* val event : t -> Lambda.lambda_event -> t   *)
-val try_ : t -> ident -> t -> t
-
-val assign : ident -> t -> t
-
-val prim : primitive:Lam_primitive.t -> args:t list -> Location.t -> t
-(** constant folding *)
-
-val staticcatch : t -> int * ident list -> t -> t
-
-val staticraise : int -> t list -> t
-
-val for_ : ident -> t -> t -> Asttypes.direction_flag -> t -> t
-
-(**************************************************************)
-
-val eq_approx : t -> t -> bool
diff --git a/jscomp/core/lam_analysis.ml b/jscomp/core/lam_analysis.ml
deleted file mode 100644
index 329352a..0000000
--- a/jscomp/core/lam_analysis.ml
+++ /dev/null
@@ -1,279 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(**used in effect analysis, it is sound but not-complete *)
-let not_zero_constant (x : Lam_constant.t) =
-  match x with
-  | Const_int { i } -> i <> 0l
-  | Const_int64 i -> i <> 0L
-  | Const_bigint (_, i) -> i <> "0"
-  | _ -> false
-
-let rec no_side_effects (lam : Lam.t) : bool =
-  match lam with
-  | Lvar _ | Lconst _ | Lfunction _ -> true
-  | Lglobal_module _ -> true
-  (* we record side effect in the global level,
-     this expression itself is side effect free
-  *)
-  | Lprim { primitive; args; _ } -> (
-      Ext_list.for_all args no_side_effects
-      &&
-      match primitive with
-      | Pccall { prim_name } -> (
-          match (prim_name, args) with
-          | ( (* register to c runtime does not make sense  in ocaml *)
-              ( "?int64_float_of_bits"
-              (* more safe to check if arguments are constant *)
-              (* non-observable side effect *)
-              | "?sys_get_argv" (* should be fine *)
-              | "?string_repeat" | "?make_vect" | "?create_bytes" | "?obj_dup"
-              | "caml_array_dup" | "?nativeint_add" | "?nativeint_div"
-              | "?nativeint_mod" | "?nativeint_lsr" | "?nativeint_mul" ),
-              _ ) ->
-              true
-          | _, _ -> false)
-      | Pmodint | Pdivint | Pdivint64 | Pmodint64 | Pdivbigint | Pmodbigint -> (
-          match args with
-          | [ _; Lconst cst ] -> not_zero_constant cst
-          | _ -> false)
-      | Pcreate_extension _ | Pjs_typeof | Pis_null | Pis_not_none | Psome
-      | Psome_not_nest | Pis_undefined | Pis_null_undefined | Pnull_to_opt
-      | Pundefined_to_opt | Pnull_undefined_to_opt | Pjs_fn_make _ | Pjs_fn_make_unit
-      | Pjs_object_create _ | Pimport
-      (* TODO: check *)
-      | Pbytes_to_string | Pmakeblock _
-      (* whether it's mutable or not *)
-      | Pfield _ | Pval_from_option | Pval_from_option_not_nest
-      (* NOP The compiler already [t option] is the same as t *)
-      | Pduprecord
-      (* Boolean operations *)
-      | Psequand | Psequor | Pnot
-      (* Integer operations *)
-      | Pnegint | Paddint | Psubint | Pmulint | Pandint | Porint | Pxorint
-      | Plslint | Plsrint | Pasrint | Pintcomp _
-      (* Float operations *)
-      | Pintoffloat | Pfloatofint | Pnegfloat
-      (* | Pabsfloat *)
-      | Paddfloat | Psubfloat | Pmulfloat | Pdivfloat | Pfloatcomp _ | Pjscomp _
-      | Pnegbigint | Paddbigint | Psubbigint | Pmulbigint | Ppowbigint
-      | Pandbigint | Porbigint | Pxorbigint | Plslbigint | Pasrbigint
-      | Pbigintcomp _
-      (* String operations *)
-      | Pstringlength | Pstringrefu | Pstringrefs | Pbyteslength | Pbytesrefu
-      | Pbytesrefs | Pmakearray | Parraylength | Parrayrefu | Parrayrefs
-      (* Test if the argument is a block or an immediate integer *)
-      | Pisint | Pis_poly_var_block
-      (* Test if the (integer) argument is outside an interval *)
-      | Pisout _ | Pint64ofint | Pintofint64 | Pnegint64 | Paddint64 | Psubint64
-      | Pmulint64 | Pandint64 | Porint64 | Pxorint64 | Plslint64 | Plsrint64
-      | Pasrint64 | Pint64comp _
-      (* Operations on big arrays: (unsafe, #dimensions, kind, layout) *)
-      (* Compile time constants *)
-      | Pctconst _ (* Integer to external pointer *)
-      | Poffsetint _ | Pstringadd | Pjs_function_length | Pcaml_obj_length
-      | Pwrap_exn
-      | Praw_js_code
-          {
-            code_info =
-              Exp (Js_function _ | Js_literal _) | Stmt Js_stmt_comment;
-          } ->
-          true
-      | Pjs_apply | Pjs_runtime_apply | Pjs_call _ | Pinit_mod | Pupdate_mod
-      | Pjs_unsafe_downgrade _ | Pdebugger | Pvoid_run | Pfull_apply
-      | Pjs_fn_method
-      (* TODO *)
-      | Praw_js_code _ | Pbytessetu | Pbytessets
-      (* Operations on boxed integers (Nativeint.t, Int32.t, Int64.t) *)
-      | Parraysets
-      (* byte swap *)
-      | Parraysetu | Poffsetref _ | Praise | Plazyforce | Psetfield _ ->
-          false)
-  | Llet (_, _, arg, body) -> no_side_effects arg && no_side_effects body
-  | Lswitch (_, _) -> false
-  | Lstringswitch (_, _, _) -> false
-  | Lstaticraise _ -> false
-  | Lstaticcatch _ -> false
-  (* It would be nice that we can also analysis some small functions
-      for example [String.contains],
-      [Format.make_queue_elem]
-  *)
-  | Ltrywith (body, _exn, handler) ->
-      no_side_effects body && no_side_effects handler
-  | Lifthenelse (a, b, c) ->
-      no_side_effects a && no_side_effects b && no_side_effects c
-  | Lsequence (a, b) -> no_side_effects a && no_side_effects b
-  | Lletrec (bindings, body) ->
-      Ext_list.for_all_snd bindings no_side_effects && no_side_effects body
-  | Lwhile _ ->
-      false (* conservative here, non-terminating loop does have side effect *)
-  | Lfor _ -> false
-  | Lassign _ -> false (* actually it depends ... *)
-  (* | Lsend _ -> false  *)
-  | Lapply
-      {
-        ap_func =
-          Lprim { primitive = Pfield (_, Fld_module { name = "from_fun" }) };
-        ap_args = [ arg ];
-      } ->
-      no_side_effects arg
-  | Lapply _ -> false
-(* we need purity analysis .. *)
-
-(*
-     Estimate the size of lambda for better inlining
-     threshold is 1000 - so that we
-*)
-exception Too_big_to_inline
-
-let really_big () = raise_notrace Too_big_to_inline
-
-(* let big_lambda = 1000 *)
-
-let rec size (lam : Lam.t) =
-  try
-    match lam with
-    | Lvar _ -> 1
-    | Lconst c -> size_constant c
-    | Llet (_, _, l1, l2) -> 1 + size l1 + size l2
-    | Lletrec _ -> really_big ()
-    | Lprim
-        {
-          primitive = Pfield (_, Fld_module _);
-          args = [ (Lglobal_module _ | Lvar _) ];
-          _;
-        } ->
-        1
-    | Lprim { primitive = Praise | Pis_not_none; args = [ l ]; _ } -> size l
-    | Lglobal_module _ -> 1
-    | Lprim { primitive = Praw_js_code _ } -> really_big ()
-    | Lprim { args = ll; _ } -> size_lams 1 ll
-    (* complicated
-           1. inline this function
-           2. ...
-           exports.Make=
-           function(funarg)
-       {var $$let=Make(funarg);
-         return [0, $$let[5],... $$let[16]]}
-    *)
-    | Lapply { ap_func; ap_args; _ } -> size_lams (size ap_func) ap_args
-    (* | Lfunction(_, params, l) -> really_big () *)
-    | Lfunction { body } -> size body
-    | Lswitch _ -> really_big ()
-    | Lstringswitch (_, _, _) -> really_big ()
-    | Lstaticraise (_i, ls) ->
-        Ext_list.fold_left ls 1 (fun acc x -> size x + acc)
-    | Lstaticcatch _ -> really_big ()
-    | Ltrywith _ -> really_big ()
-    | Lifthenelse (l1, l2, l3) -> 1 + size l1 + size l2 + size l3
-    | Lsequence (l1, l2) -> size l1 + size l2
-    | Lwhile _ -> really_big ()
-    | Lfor _ -> really_big ()
-    | Lassign (_, v) -> 1 + size v
-    (* This is side effectful,  be careful *)
-    (* | Lsend _  ->  really_big () *)
-  with Too_big_to_inline -> 1000
-
-and size_constant x =
-  match x with
-  | Const_int _ | Const_char _ | Const_float _ | Const_int64 _ | Const_bigint _ | Const_pointer _
-  | Const_js_null | Const_js_undefined _ | Const_module_alias | Const_js_true
-  | Const_js_false ->
-      1
-  | Const_string _ ->
-      1
-  | Const_some s -> size_constant s
-  | Const_block (_, _, str) ->
-      Ext_list.fold_left str 0 (fun acc x -> acc + size_constant x)
-  | Const_float_array xs -> List.length xs
-
-and size_lams acc (lams : Lam.t list) =
-  Ext_list.fold_left lams acc (fun acc l -> acc + size l)
-
-let args_all_const (args : Lam.t list) =
-  Ext_list.for_all args (fun x -> match x with Lconst _ -> true | _ -> false)
-
-let exit_inline_size = 7
-
-let small_inline_size = 5
-
-(** destruct pattern will work better 
-    if it is closed lambda, otherwise
-    you can not do full evaluation
-
-    We still should avoid inline too big code, 
-
-    ideally we should also evaluate its size after inlining, 
-    since after partial evaluation, it might still be *very big*
-*)
-let destruct_pattern (body : Lam.t) params args =
-  let rec aux v params args =
-    match (params, args) with
-    | x :: xs, b :: bs -> if Ident.same x v then Some b else aux v xs bs
-    | [], _ -> None
-    | _ :: _, [] -> assert false
-  in
-  match body with
-  | Lswitch (Lvar v, switch) -> (
-      match aux v params args with
-      | Some (Lam.Lconst _ as lam) ->
-          size (Lam.switch lam switch) < small_inline_size
-      | Some _ | None -> false)
-  | Lifthenelse (Lvar v, then_, else_) -> (
-      (* -FIXME *)
-      match aux v params args with
-      | Some (Lconst _ as lam) ->
-          size (Lam.if_ lam then_ else_) < small_inline_size
-      | Some _ | None -> false)
-  | _ -> false
-
-(* Async functions cannot be beta reduced *)
-let lfunction_can_be_beta_reduced (lfunction : Lam.lfunction) =
-  not lfunction.attr.async
-
-(** Hints to inlining *)
-let ok_to_inline_fun_when_app (m : Lam.lfunction) (args : Lam.t list) =
-  match m.attr.inline with
-  | Always_inline -> true
-  | Never_inline -> false
-  | Default_inline -> (
-      match m with
-      | { body; params } ->
-          let s = size body in
-          s < small_inline_size
-          || destruct_pattern body params args
-          || (args_all_const args && s < 10 && no_side_effects body))
-
-(* TODO:  We can relax this a bit later,
-    but decide whether to inline it later in the call site
-*)
-let safe_to_inline (lam : Lam.t) =
-  match lam with
-  | Lfunction _ -> true
-  | Lconst
-      ( Const_pointer _
-      | Const_int { comment = Pt_constructor _ }
-      | Const_js_true | Const_js_false | Const_js_undefined _ ) ->
-      true
-  | _ -> false
diff --git a/jscomp/core/lam_analysis.mli b/jscomp/core/lam_analysis.mli
deleted file mode 100644
index a6105b8..0000000
--- a/jscomp/core/lam_analysis.mli
+++ /dev/null
@@ -1,40 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** A module which provides some basic analysis over lambda expression *)
-
-val no_side_effects : Lam.t -> bool
-(** No side effect, but it might depend on data store *)
-
-val size : Lam.t -> int
-
-val lfunction_can_be_beta_reduced : Lam.lfunction -> bool
-
-val ok_to_inline_fun_when_app : Lam.lfunction -> Lam.t list -> bool
-
-val small_inline_size : int
-
-val exit_inline_size : int
-
-val safe_to_inline : Lam.t -> bool
diff --git a/jscomp/core/lam_arity.ml b/jscomp/core/lam_arity.ml
deleted file mode 100644
index 147e063..0000000
--- a/jscomp/core/lam_arity.ml
+++ /dev/null
@@ -1,100 +0,0 @@
-(* Copyright (C) Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t =
-  | Arity_info of int list * bool
-      (**
-     the last one means it can take any params later, 
-     for an exception: it is (Determin (true,[], true))
-     1. approximation sound but not complete 
-
-  *)
-  | Arity_na
-
-let equal (x : t) y =
-  match x with
-  | Arity_na -> y = Arity_na
-  | Arity_info (xs, a) -> (
-      match y with
-      | Arity_info (ys, b) ->
-          a = b && Ext_list.for_all2_no_exn xs ys (fun x y -> x = y)
-      | Arity_na -> false)
-
-let pp = Format.fprintf
-
-let print (fmt : Format.formatter) (x : t) =
-  match x with
-  | Arity_na -> pp fmt "?"
-  | Arity_info (ls, tail) ->
-      pp fmt "@[";
-      pp fmt "[";
-      Format.pp_print_list
-        ~pp_sep:(fun fmt () -> pp fmt ",")
-        (fun fmt x -> Format.pp_print_int fmt x)
-        fmt ls;
-      if tail then pp fmt "@ *";
-      pp fmt "]@]"
-
-let print_arities_tbl (fmt : Format.formatter)
-    (arities_tbl : (Ident.t, t ref) Hashtbl.t) =
-  Hashtbl.fold
-    (fun (i : Ident.t) (v : t ref) _ -> pp fmt "@[%s -> %a@]@." i.name print !v)
-    arities_tbl ()
-
-let merge (n : int) (x : t) : t =
-  match x with
-  | Arity_na -> Arity_info ([ n ], false)
-  | Arity_info (xs, tail) -> Arity_info (n :: xs, tail)
-
-let non_function_arity_info = Arity_info ([], false)
-
-let raise_arity_info = Arity_info ([], true)
-
-let na = Arity_na
-
-let info args b1 = Arity_info (args, b1)
-
-let first_arity_na (x : t) =
-  match x with Arity_na | Arity_info ([], _) -> true | _ -> false
-
-let get_first_arity (x : t) =
-  match x with
-  | Arity_na | Arity_info ([], _) -> None
-  | Arity_info (x :: _, _) -> Some x
-
-let extract_arity (x : t) =
-  match x with Arity_na -> [] | Arity_info (xs, _) -> xs
-
-(* let update_arity (x : t) xs =    *)
-
-let rec merge_arities_aux (acc : int list) (xs : int list) (ys : int list)
-    (tail : bool) (tail2 : bool) =
-  match (xs, ys) with
-  | [], [] -> info (List.rev acc) (tail && tail2)
-  | [], y :: ys when tail -> merge_arities_aux (y :: acc) [] ys tail tail2
-  | x :: xs, [] when tail2 -> merge_arities_aux (x :: acc) [] xs tail tail2
-  | x :: xs, y :: ys when x = y -> merge_arities_aux (y :: acc) xs ys tail tail2
-  | _, _ -> info (List.rev acc) false
-
-let merge_arities xs ys t t2 = merge_arities_aux [] xs ys t t2
diff --git a/jscomp/core/lam_arity.mli b/jscomp/core/lam_arity.mli
deleted file mode 100644
index 29772c0..0000000
--- a/jscomp/core/lam_arity.mli
+++ /dev/null
@@ -1,58 +0,0 @@
-(* Copyright (C) Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = private
-  | Arity_info of int list * bool
-      (**
-     when the first argument is true, it is for sure 
-     the last one means it can take any params later, 
-     for an exception: it is (Arity_info([], true))
-     approximation sound but not complete       
-  *)
-  | Arity_na
-
-val equal : t -> t -> bool
-
-val print : Format.formatter -> t -> unit
-
-val print_arities_tbl : Format.formatter -> (Ident.t, t ref) Hashtbl.t -> unit
-
-val merge : int -> t -> t
-
-val non_function_arity_info : t
-
-val raise_arity_info : t
-
-val na : t
-
-val info : int list -> bool -> t
-
-val first_arity_na : t -> bool
-
-val get_first_arity : t -> int option
-
-val extract_arity : t -> int list
-(** when [NA] return  empty list*)
-
-val merge_arities : int list -> int list -> bool -> bool -> t
diff --git a/jscomp/core/lam_arity_analysis.ml b/jscomp/core/lam_arity_analysis.ml
deleted file mode 100644
index d77477d..0000000
--- a/jscomp/core/lam_arity_analysis.ml
+++ /dev/null
@@ -1,150 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let arity_of_var (meta : Lam_stats.t) (v : Ident.t) =
-  (* for functional parameter, if it is a high order function,
-      if it's not from function parameter, we should warn
-  *)
-  match Hash_ident.find_opt meta.ident_tbl v with
-  | Some (FunctionId { arity; _ }) -> arity
-  | Some _ | None -> Lam_arity.na
-
-(* we need record all aliases -- since not all aliases are eliminated,
-   mostly are toplevel bindings
-   We will keep iterating such environment
-   If not found, we will return [NA]
-*)
-let rec get_arity (meta : Lam_stats.t) (lam : Lam.t) : Lam_arity.t =
-  match lam with
-  | Lvar v -> arity_of_var meta v
-  | Lconst _ -> Lam_arity.non_function_arity_info
-  | Llet (_, _, _, l) -> get_arity meta l
-  | Lprim
-      {
-        primitive = Pfield (_, Fld_module { name });
-        args = [ Lglobal_module (id, dynamic_import) ];
-        _;
-      } -> (
-      match (Lam_compile_env.query_external_id_info ~dynamic_import id name).arity with
-      | Single x -> x
-      | Submodule _ -> Lam_arity.na)
-  | Lprim
-      {
-        primitive = Pfield (m, _);
-        args =
-          [
-            Lprim
-              {
-                primitive = Pfield (_, Fld_module { name });
-                args = [ Lglobal_module (id, dynamic_import) ];
-              };
-          ];
-        _;
-      } -> (
-      match (Lam_compile_env.query_external_id_info ~dynamic_import id name).arity with
-      | Submodule subs -> subs.(m) (* TODO: shall we store it as array?*)
-      | Single _ -> Lam_arity.na)
-  (* TODO: all information except Pccall is complete, we could
-     get more arity information
-  *)
-  | Lprim
-      { primitive = Praw_js_code { code_info = Exp (Js_function { arity }) } }
-    ->
-      Lam_arity.info [ arity ] false
-  | Lprim { primitive = Praise; _ } -> Lam_arity.raise_arity_info
-  | Lglobal_module _ (* TODO: fix me never going to happen *) | Lprim _ ->
-      Lam_arity.na (* CHECK*)
-  (* shall we handle primitive in a direct way,
-      since we know all the information
-      Invariant: all primitive application is fully applied,
-      since this information  is already available
-
-      -- Check external c functions ?
-      -- it's not true for primitives
-      like caml_set_oo_id  or  Lprim (Pmakeblock , [])
-
-      it seems true that primitive is always fully applied, however,
-      it can return a function
-  *)
-  | Lletrec (_, body) -> get_arity meta body
-  | Lapply { ap_func = app; ap_args = args; _ } -> (
-      (* detect functor application *)
-      let fn = get_arity meta app in
-      match fn with
-      | Arity_na -> Lam_arity.na
-      | Arity_info (xs, tail) ->
-          let rec take (arities : _ list) arg_length =
-            match arities with
-            | x :: yys ->
-                if arg_length = x then Lam_arity.info yys tail
-                else if arg_length > x then take yys (arg_length - x)
-                else Lam_arity.info ((x - arg_length) :: yys) tail
-            | [] -> if tail then Lam_arity.raise_arity_info else Lam_arity.na
-            (* Actually, you can not have truly deministic arities
-               for example [fun x -> x ]
-            *)
-          in
-          take xs (List.length args))
-  | Lfunction { arity; body } -> Lam_arity.merge arity (get_arity meta body)
-  | Lswitch
-      ( _,
-        {
-          sw_failaction;
-          sw_consts;
-          sw_blocks;
-          sw_blocks_full = _;
-          sw_consts_full = _;
-        } ) ->
-      all_lambdas meta
-        (let rest =
-           Ext_list.map_append sw_consts (Ext_list.map sw_blocks snd) snd
-         in
-         match sw_failaction with None -> rest | Some x -> x :: rest)
-  | Lstringswitch (_, sw, d) -> (
-      match d with
-      | None -> all_lambdas meta (Ext_list.map sw snd)
-      | Some v -> all_lambdas meta (v :: Ext_list.map sw snd))
-  | Lstaticcatch (_, _, handler) -> get_arity meta handler
-  | Ltrywith (l1, _, l2) -> all_lambdas meta [ l1; l2 ]
-  | Lifthenelse (_, l2, l3) -> all_lambdas meta [ l2; l3 ]
-  | Lsequence (_, l2) -> get_arity meta l2
-  | Lstaticraise _ (* since it will not be in tail position *) -> Lam_arity.na
-  | Lwhile _ | Lfor _ | Lassign _ -> Lam_arity.non_function_arity_info
-
-and all_lambdas meta (xs : Lam.t list) =
-  match xs with
-  | y :: ys ->
-      let arity = get_arity meta y in
-      let rec aux (acc : Lam_arity.t) xs =
-        match (acc, xs) with
-        | Arity_na, _ -> acc
-        | _, [] -> acc
-        | Arity_info (xxxs, tail), y :: ys -> (
-            match get_arity meta y with
-            | Arity_na -> Lam_arity.na
-            | Arity_info (yyys, tail2) ->
-                aux (Lam_arity.merge_arities xxxs yyys tail tail2) ys)
-      in
-      aux arity ys
-  | [] -> Lam_arity.na
diff --git a/jscomp/core/lam_arity_analysis.mli b/jscomp/core/lam_arity_analysis.mli
deleted file mode 100644
index ee14897..0000000
--- a/jscomp/core/lam_arity_analysis.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Utilities for lambda analysis *)
-
-val get_arity : Lam_stats.t -> Lam.t -> Lam_arity.t
diff --git a/jscomp/core/lam_beta_reduce.ml b/jscomp/core/lam_beta_reduce.ml
deleted file mode 100644
index 30d3977..0000000
--- a/jscomp/core/lam_beta_reduce.ml
+++ /dev/null
@@ -1,123 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(*
-     A naive beta reduce would break the invariants of the optmization.
-
-
-     The sane but slowest  way:
-       when we do a beta reduction, we need rename all variables inlcuding
-       let-bound ones
-
-     A conservative one:
-       - for internal one
-         rename params and let bound variables
-       - for external one (seriaized)
-         if it's enclosed environment should be good enough
-         so far, we only inline enclosed lambdas
-     TODO: rename
-
-    Optimizations:
-    {[
-      (fun x y -> ...     ) 100 3
-    ]}
-    we can bound [x] to [100] in a single step
-*)
-let propagate_beta_reduce (meta : Lam_stats.t) (params : Ident.t list)
-    (body : Lam.t) (args : Lam.t list) =
-  match Lam_beta_reduce_util.simple_beta_reduce params body args with
-  | Some x -> x
-  | None ->
-      let rest_bindings, rev_new_params =
-        Ext_list.fold_left2 params args ([], [])
-          (fun old_param arg (rest_bindings, acc) ->
-            match arg with
-            | Lconst _ | Lvar _ -> (rest_bindings, arg :: acc)
-            | _ ->
-                let p = Ident.rename old_param in
-                ((p, arg) :: rest_bindings, Lam.var p :: acc))
-      in
-      let new_body =
-        Lam_bounded_vars.rewrite
-          (Hash_ident.of_list2 (List.rev params) rev_new_params)
-          body
-      in
-      Ext_list.fold_right rest_bindings new_body (fun (param, arg) l ->
-          (match arg with
-          | Lprim { primitive = Pmakeblock (_, _, Immutable); args; _ } ->
-              Hash_ident.replace meta.ident_tbl param
-                (Lam_util.kind_of_lambda_block args)
-          | Lprim { primitive = Psome | Psome_not_nest; args = [ v ]; _ } ->
-              Hash_ident.replace meta.ident_tbl param (Normal_optional v)
-          | _ -> ());
-          Lam_util.refine_let ~kind:Strict param arg l)
-
-let propagate_beta_reduce_with_map (meta : Lam_stats.t)
-    (map : Lam_var_stats.stats Map_ident.t) params body args =
-  match Lam_beta_reduce_util.simple_beta_reduce params body args with
-  | Some x -> x
-  | None ->
-      let rest_bindings, rev_new_params =
-        Ext_list.fold_left2 params args ([], [])
-          (fun old_param arg (rest_bindings, acc) ->
-            match arg with
-            | Lconst _ | Lvar _ -> (rest_bindings, arg :: acc)
-            | Lglobal_module _ ->
-                let p = Ident.rename old_param in
-                ((p, arg) :: rest_bindings, Lam.var p :: acc)
-            | _ ->
-                if Lam_analysis.no_side_effects arg then
-                  match Map_ident.find_exn map old_param with
-                  | stat ->
-                      if Lam_var_stats.top_and_used_zero_or_one stat then
-                        (rest_bindings, arg :: acc)
-                      else
-                        let p = Ident.rename old_param in
-                        ((p, arg) :: rest_bindings, Lam.var p :: acc)
-                else
-                  let p = Ident.rename old_param in
-                  ((p, arg) :: rest_bindings, Lam.var p :: acc))
-      in
-      let new_body =
-        Lam_bounded_vars.rewrite
-          (Hash_ident.of_list2 (List.rev params) rev_new_params)
-          body
-      in
-      Ext_list.fold_right rest_bindings new_body
-        (fun (param, (arg : Lam.t)) l ->
-          (match arg with
-          | Lprim { primitive = Pmakeblock (_, _, Immutable); args } ->
-              Hash_ident.replace meta.ident_tbl param
-                (Lam_util.kind_of_lambda_block args)
-          | Lprim { primitive = Psome | Psome_not_nest; args = [ v ] } ->
-              Hash_ident.replace meta.ident_tbl param (Normal_optional v)
-          | _ -> ());
-          Lam_util.refine_let ~kind:Strict param arg l)
-
-let no_names_beta_reduce params body args =
-  match Lam_beta_reduce_util.simple_beta_reduce params body args with
-  | Some x -> x
-  | None ->
-      Ext_list.fold_left2 params args body (fun param arg l ->
-          Lam_util.refine_let ~kind:Strict param arg l)
diff --git a/jscomp/core/lam_beta_reduce.mli b/jscomp/core/lam_beta_reduce.mli
deleted file mode 100644
index 8be5e2d..0000000
--- a/jscomp/core/lam_beta_reduce.mli
+++ /dev/null
@@ -1,74 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Beta reduction of lambda IR *)
-
-val no_names_beta_reduce : Ident.t list -> Lam.t -> Lam.t list -> Lam.t
-(* Compile-time beta-reduction of functions immediately applied:
-      Lapply(Lfunction(Curried, params, body), args, loc) ->
-        let paramN = argN in ... let param1 = arg1 in body
-      Lapply(Lfunction(Tupled, params, body), [Lprim(Pmakeblock(args))], loc) ->
-        let paramN = argN in ... let param1 = arg1 in body
-   Assumes |args| = |params|.
-
-   This function is used while counting used vars, no new names
-   are generated to make this more complex
-*)
-
-(*
-   Refresh all the identifiers, 
-   otherwise the identifier property can not be preserved, 
-   the obvious example is parameter
- *)
-
-val propagate_beta_reduce :
-  Lam_stats.t -> Ident.t list -> Lam.t -> Lam.t list -> Lam.t
-
-val propagate_beta_reduce_with_map :
-  Lam_stats.t ->
-  Lam_var_stats.stats Map_ident.t ->
-  Ident.t list ->
-  Lam.t ->
-  Lam.t list ->
-  Lam.t
-(** 
-   {[ Lam_beta_reduce.propogate_beta_reduce_with_map 
-       meta param_map
-       params body args]}
-
-   [param_map] collect the usage of parameters, it's readonly
-   it can be  produced by 
-
-   {[!Lam_analysis.free_variables meta.export_idents 
-       (Lam_analysis.param_map_of_list params) body]}
-
-   TODO:
-   replace [propogate_beta_reduce] with such implementation 
-   {[
-     let propogate_beta_reduce meta params body args = 
-       let (_, param_map) = 
-         Lam_analysis.is_closed_with_map Set_ident.empty params body in 
-       propogate_beta_reduce_with_map meta param_map params body args  
-   ]}
-*)
diff --git a/jscomp/core/lam_beta_reduce_util.ml b/jscomp/core/lam_beta_reduce_util.ml
deleted file mode 100644
index eadbed9..0000000
--- a/jscomp/core/lam_beta_reduce_util.ml
+++ /dev/null
@@ -1,124 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(*
-    Principle: since in ocaml, the apply order is not specified
-    rules:
-    1. each argument it is only used once, (avoid eval duplication)
-    2. it's actually used, if not (Lsequence)
-    3. no nested  compuation,
-       other wise the evaluation order is tricky (make sure eval order is correct)
-*)
-
-type value = { mutable used : bool; lambda : Lam.t }
-
-let param_hash : _ Hash_ident.t = Hash_ident.create 20
-
-(* optimize cases like
-   (fun f (a,b){ g (a,b,1)} (e0, e1))
-   cases like
-   (fun f (a,b){ g (a,b,a)} (e0, e1)) needs avoids double eval
-
-    Note in a very special case we can avoid any allocation
-   {[
-     when Ext_list.for_all2_no_exn
-         (fun p a ->
-            match (a : Lam.t) with
-            | Lvar a -> Ident.same p a
-            | _ -> false ) params args'
-   ]}
-*)
-let simple_beta_reduce params body args =
-  let exception Not_simple_apply in
-  let find_param_exn v opt =
-    match Hash_ident.find_opt param_hash v with
-    | Some exp ->
-        if exp.used then raise_notrace Not_simple_apply else exp.used <- true;
-        exp.lambda
-    | None -> opt
-  in
-  let rec aux_exn acc (us : Lam.t list) =
-    match us with
-    | [] -> List.rev acc
-    | (Lvar x as a) :: rest -> aux_exn (find_param_exn x a :: acc) rest
-    | (Lconst _ as u) :: rest -> aux_exn (u :: acc) rest
-    | _ :: _ -> raise_notrace Not_simple_apply
-  in
-  match (body : Lam.t) with
-  | Lprim { primitive; args = ap_args; loc = ap_loc }
-  (* There is no lambda in primitive *) -> (
-      (* catch a special case of primitives *)
-      let () =
-        List.iter2
-          (fun p a -> Hash_ident.add param_hash p { lambda = a; used = false })
-          params args
-      in
-      try
-        let new_args = aux_exn [] ap_args in
-        let result =
-          Hash_ident.fold param_hash (Lam.prim ~primitive ~args:new_args ap_loc)
-            (fun _param stats acc ->
-              let { lambda; used } = stats in
-              if not used then Lam.seq lambda acc else acc)
-        in
-        Hash_ident.clear param_hash;
-        Some result
-      with Not_simple_apply ->
-        Hash_ident.clear param_hash;
-        None)
-  | Lapply
-      {
-        ap_func =
-          (Lvar _ | Lprim { primitive = Pfield _; args = [ Lglobal_module _ ] })
-          as f;
-        ap_args;
-        ap_info;
-      } -> (
-      let () =
-        List.iter2
-          (fun p a -> Hash_ident.add param_hash p { lambda = a; used = false })
-          params args
-      in
-      (*since we adde each param only once,
-        iff it is removed once, no exception,
-        if it is removed twice there will be exception.
-        if it is never removed, we have it as rest keys
-      *)
-      try
-        let new_args = aux_exn [] ap_args in
-        let f =
-          match f with Lvar fn_name -> find_param_exn fn_name f | _ -> f
-        in
-        let result =
-          Hash_ident.fold param_hash (Lam.apply f new_args ap_info)
-            (fun _param stat acc ->
-              let { lambda; used } = stat in
-              if not used then Lam.seq lambda acc else acc)
-        in
-        Hash_ident.clear param_hash;
-        Some result
-      with Not_simple_apply ->
-        Hash_ident.clear param_hash;
-        None)
-  | _ -> None
diff --git a/jscomp/core/lam_beta_reduce_util.mli b/jscomp/core/lam_beta_reduce_util.mli
deleted file mode 100644
index 585611b..0000000
--- a/jscomp/core/lam_beta_reduce_util.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val simple_beta_reduce : Ident.t list -> Lam.t -> Lam.t list -> Lam.t option
diff --git a/jscomp/core/lam_bounded_vars.ml b/jscomp/core/lam_bounded_vars.ml
deleted file mode 100644
index 59dfab8..0000000
--- a/jscomp/core/lam_bounded_vars.ml
+++ /dev/null
@@ -1,158 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(*
-   Given an [map], rewrite all let bound variables into new variables, 
-   note that the [map] is changed
-   example    
-   {[
-     let a/112 = 3 in a/112      
-   ]}
-   would be converted into 
-   {[
-     let a/113 = 3 in a/113     
-   ]}   
-
-   ATTENTION: [let] bound idents have to be renamed, 
-   Note we rely on an invariant that parameter could not be rebound 
-*)
-
-(*
-   Small function inline heuristics:
-   Even if a function is small, it does not mean it is good for inlining,
-   for example, in list.ml
-    {[
-      let rec length_aux len = function
-          [] -> len
-        | a::l -> length_aux (len + 1) l
-
-      let length l = length_aux 0 l
-    ]}
-    if we inline [length], it will expose [length_aux] to the user, first, it make
-    the code not very friendly, also since [length_aux] is used everywhere now, it
-    may affect that we will not do the inlining of [length_aux] in [length]
-
-    Criteior for sure to inline
-    1. small size, does not introduce extra symbols, non-exported and non-recursive
-       non-recursive is required if we re-apply the strategy
-
-    Other Factors:
-    2. number of invoked times
-    3. arguments are const or not
-*)
-let rewrite (map : _ Hash_ident.t) (lam : Lam.t) : Lam.t =
-  let rebind i =
-    let i' = Ident.rename i in
-    Hash_ident.add map i (Lam.var i');
-    i'
-  in
-  (* order matters, especially for let bindings *)
-  let rec option_map op = match op with None -> None | Some x -> Some (aux x)
-  and aux (lam : Lam.t) : Lam.t =
-    match lam with
-    | Lvar v -> Hash_ident.find_default map v lam
-    | Llet (str, v, l1, l2) ->
-        let v = rebind v in
-        let l1 = aux l1 in
-        let l2 = aux l2 in
-        Lam.let_ str v l1 l2
-    | Lletrec (bindings, body) ->
-        (*order matters see GPR #405*)
-        let vars = Ext_list.map bindings (fun (k, _) -> rebind k) in
-        let bindings =
-          Ext_list.map2 vars bindings (fun var (_, l) -> (var, aux l))
-        in
-        let body = aux body in
-        Lam.letrec bindings body
-    | Lfunction { arity; params; body; attr } ->
-        let params = Ext_list.map params rebind in
-        let body = aux body in
-        Lam.function_ ~arity ~params ~body ~attr
-    | Lstaticcatch (l1, (i, xs), l2) ->
-        let l1 = aux l1 in
-        let xs = Ext_list.map xs rebind in
-        let l2 = aux l2 in
-        Lam.staticcatch l1 (i, xs) l2
-    | Lfor (ident, l1, l2, dir, l3) ->
-        let ident = rebind ident in
-        let l1 = aux l1 in
-        let l2 = aux l2 in
-        let l3 = aux l3 in
-        Lam.for_ ident (aux l1) l2 dir l3
-    | Lconst _ -> lam
-    | Lprim { primitive; args; loc } ->
-        (* here it makes sure that global vars are not rebound *)
-        Lam.prim ~primitive ~args:(Ext_list.map args aux) loc
-    | Lglobal_module _ -> lam
-    | Lapply { ap_func; ap_args; ap_info } ->
-        let fn = aux ap_func in
-        let args = Ext_list.map ap_args aux in
-        Lam.apply fn args ap_info
-    | Lswitch
-        ( l,
-          {
-            sw_failaction;
-            sw_consts;
-            sw_blocks;
-            sw_blocks_full;
-            sw_consts_full;
-            sw_names;
-          } ) ->
-        let l = aux l in
-        Lam.switch l
-          {
-            sw_consts = Ext_list.map_snd sw_consts aux;
-            sw_blocks = Ext_list.map_snd sw_blocks aux;
-            sw_consts_full;
-            sw_blocks_full;
-            sw_failaction = option_map sw_failaction;
-            sw_names;
-          }
-    | Lstringswitch (l, sw, d) ->
-        let l = aux l in
-        Lam.stringswitch l (Ext_list.map_snd sw aux) (option_map d)
-    | Lstaticraise (i, ls) -> Lam.staticraise i (Ext_list.map ls aux)
-    | Ltrywith (l1, v, l2) ->
-        let l1 = aux l1 in
-        let v = rebind v in
-        let l2 = aux l2 in
-        Lam.try_ l1 v l2
-    | Lifthenelse (l1, l2, l3) ->
-        let l1 = aux l1 in
-        let l2 = aux l2 in
-        let l3 = aux l3 in
-        Lam.if_ l1 l2 l3
-    | Lsequence (l1, l2) ->
-        let l1 = aux l1 in
-        let l2 = aux l2 in
-        Lam.seq l1 l2
-    | Lwhile (l1, l2) ->
-        let l1 = aux l1 in
-        let l2 = aux l2 in
-        Lam.while_ l1 l2
-    | Lassign (v, l) -> Lam.assign v (aux l)
-  in
-  aux lam
-
-(* let refresh lam = rewrite (Hash_ident.create 17 : Lam.t Hash_ident.t ) lam *)
diff --git a/jscomp/core/lam_bounded_vars.mli b/jscomp/core/lam_bounded_vars.mli
deleted file mode 100644
index 7969aaf..0000000
--- a/jscomp/core/lam_bounded_vars.mli
+++ /dev/null
@@ -1,33 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val rewrite : Lam.t Hash_ident.t -> Lam.t -> Lam.t
-(** [rewrite tbl lam] 
-    Given a [tbl] to rewrite all bounded variables in [lam] 
-*)
-
-(** refresh lambda to replace all bounded vars for new ones *)
-(* val refresh :
-   Lam.t ->
-   Lam.t *)
diff --git a/jscomp/core/lam_check.ml b/jscomp/core/lam_check.ml
deleted file mode 100644
index 1da197c..0000000
--- a/jscomp/core/lam_check.ml
+++ /dev/null
@@ -1,157 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(**
-   checks
-   1. variables are not bound twice
-   2. all variables are of right scope
-*)
-let check file lam =
-  let defined_variables = Hash_set_ident.create 1000 in
-  let success = ref true in
-  let use (id : Ident.t) =
-    if not @@ Hash_set_ident.mem defined_variables id then (
-      Format.fprintf Format.err_formatter
-        "\n[SANITY]:%s/%d used before defined in %s@." id.name id.stamp file;
-      success := false)
-  in
-  let def (id : Ident.t) =
-    if Hash_set_ident.mem defined_variables id then (
-      Format.fprintf Format.err_formatter "\n[SANITY]:%s/%d bound twice in %s@."
-        id.name id.stamp file;
-      success := false)
-    else Hash_set_ident.add defined_variables id
-  in
-  (* TODO: replaced by a slow version of {!Lam_iter.inner_iter} *)
-  let rec check_list xs (cxt : Set_int.t) =
-    Ext_list.iter xs (fun x -> check_staticfails x cxt)
-  and check_list_snd : 'a. ('a * Lam.t) list -> _ -> unit =
-   fun xs cxt -> Ext_list.iter_snd xs (fun x -> check_staticfails x cxt)
-  and check_staticfails (l : Lam.t) (cxt : Set_int.t) =
-    match l with
-    | Lvar _ | Lconst _ | Lglobal_module _ -> ()
-    | Lprim { args; _ } -> check_list args cxt
-    | Lapply { ap_func; ap_args; _ } -> check_list (ap_func :: ap_args) cxt
-    (* check invariant that staticfaill does not cross function/while/for loop*)
-    | Lfunction { body; params = _ } -> check_staticfails body Set_int.empty
-    | Lwhile (e1, e2) ->
-        check_staticfails e1 cxt;
-        check_staticfails e2 Set_int.empty
-    | Lfor (_v, e1, e2, _dir, e3) ->
-        check_staticfails e1 cxt;
-        check_staticfails e2 cxt;
-        check_staticfails e3 Set_int.empty
-    | Llet (_str, _id, arg, body) -> check_list [ arg; body ] cxt
-    | Lletrec (decl, body) ->
-        check_list_snd decl cxt;
-        check_staticfails body cxt
-    | Lswitch (arg, sw) ->
-        check_staticfails arg cxt;
-        check_list_snd sw.sw_consts cxt;
-        check_list_snd sw.sw_blocks cxt;
-        Ext_option.iter sw.sw_failaction (fun x -> check_staticfails x cxt)
-    | Lstringswitch (arg, cases, default) ->
-        check_staticfails arg cxt;
-        check_list_snd cases cxt;
-        Ext_option.iter default (fun x -> check_staticfails x cxt)
-    | Lstaticraise (i, args) ->
-        if Set_int.mem cxt i then check_list args cxt
-        else failwith ("exit " ^ string_of_int i ^ " unbound")
-    | Lstaticcatch (e1, (j, _vars), e2) ->
-        check_staticfails e1 (Set_int.add cxt j);
-        check_staticfails e2 cxt
-    | Ltrywith (e1, _exn, e2) ->
-        check_staticfails e1 cxt;
-        check_staticfails e2 cxt
-    | Lifthenelse (e1, e2, e3) -> check_list [ e1; e2; e3 ] cxt
-    | Lsequence (e1, e2) -> check_list [ e1; e2 ] cxt
-    | Lassign (_id, e) -> check_staticfails e cxt
-  in
-  let rec iter_list xs = Ext_list.iter xs iter
-  and iter_list_snd : 'a. ('a * Lam.t) list -> unit =
-   fun xs -> Ext_list.iter_snd xs iter
-  and iter (l : Lam.t) =
-    match l with
-    | Lvar id -> use id
-    | Lglobal_module _ -> ()
-    | Lprim { args; _ } -> iter_list args
-    | Lconst _ -> ()
-    | Lapply { ap_func; ap_args; _ } ->
-        iter ap_func;
-        iter_list ap_args
-    | Lfunction { body; params } ->
-        List.iter def params;
-        iter body
-    | Llet (_str, id, arg, body) ->
-        iter arg;
-        def id;
-        iter body
-    | Lletrec (decl, body) ->
-        Ext_list.iter_fst decl def;
-        iter_list_snd decl;
-        iter body
-    | Lswitch (arg, sw) ->
-        iter arg;
-        iter_list_snd sw.sw_consts;
-        iter_list_snd sw.sw_blocks;
-        Ext_option.iter sw.sw_failaction iter;
-        assert (
-          not
-            (sw.sw_failaction <> None && sw.sw_consts_full && sw.sw_blocks_full))
-    | Lstringswitch (arg, cases, default) ->
-        iter arg;
-        iter_list_snd cases;
-        Ext_option.iter default iter
-    | Lstaticraise (_i, args) -> iter_list args
-    | Lstaticcatch (e1, (_, vars), e2) ->
-        iter e1;
-        List.iter def vars;
-        iter e2
-    | Ltrywith (e1, exn, e2) ->
-        iter e1;
-        def exn;
-        iter e2
-    | Lifthenelse (e1, e2, e3) ->
-        iter e1;
-        iter e2;
-        iter e3
-    | Lsequence (e1, e2) ->
-        iter e1;
-        iter e2
-    | Lwhile (e1, e2) ->
-        iter e1;
-        iter e2
-    | Lfor (v, e1, e2, _dir, e3) ->
-        iter e1;
-        iter e2;
-        def v;
-        iter e3
-    | Lassign (id, e) ->
-        use id;
-        iter e
-  in
-  check_staticfails lam Set_int.empty;
-  iter lam;
-  assert !success;
-  lam
diff --git a/jscomp/core/lam_check.mli b/jscomp/core/lam_check.mli
deleted file mode 100644
index 5522308..0000000
--- a/jscomp/core/lam_check.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val check : string -> Lam.t -> Lam.t
diff --git a/jscomp/core/lam_closure.ml b/jscomp/core/lam_closure.ml
deleted file mode 100644
index 8b72bfa..0000000
--- a/jscomp/core/lam_closure.ml
+++ /dev/null
@@ -1,158 +0,0 @@
-(* Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 position = Lam_var_stats.position
-
-type stats = Lam_var_stats.stats
-
-let adjust (fv : stats Map_ident.t) (pos : position) (v : Ident.t) :
-    stats Map_ident.t =
-  Map_ident.adjust fv v (fun v ->
-      let stat =
-        match v with None -> Lam_var_stats.fresh_stats | Some v -> v
-      in
-      Lam_var_stats.update stat pos)
-
-let param_map_of_list lst : stats Map_ident.t =
-  Ext_list.fold_left lst Map_ident.empty (fun acc l ->
-      Map_ident.add acc l Lam_var_stats.fresh_stats)
-
-(** Sanity check, remove all varaibles in [local_set] in the last pass *)
-let sink_pos = Lam_var_stats.sink
-
-(**
-   [param_stats = free_variables exports param_stats lam] 
-   This function tries to do more than detect free variable of [lam],  
-   given [param_stats] it tries to return a new stats with updated usage of 
-   recorded params and unbound parameters
-
-   An enriched version of [free_varaibles] in {!Lam_free_variables}
-*)
-let free_variables (export_idents : Set_ident.t) (params : stats Map_ident.t)
-    (lam : Lam.t) : stats Map_ident.t =
-  let fv = ref params in
-  let local_set = ref export_idents in
-  let local_add k = local_set := Set_ident.add !local_set k in
-  let local_add_list ks =
-    local_set := Ext_list.fold_left ks !local_set Set_ident.add
-  in
-  (* base don the envrionmet, recoring the use cases of arguments
-     relies on [identifier] uniquely bound *)
-  let used (cur_pos : position) (v : Ident.t) =
-    if not (Set_ident.mem !local_set v) then fv := adjust !fv cur_pos v
-  in
-
-  let rec iter (top : position) (lam : Lam.t) =
-    match lam with
-    | Lvar v -> used top v
-    | Lconst _ -> ()
-    | Lapply { ap_func; ap_args; _ } ->
-        iter top ap_func;
-        let top = Lam_var_stats.new_position_after_lam ap_func top in
-        Ext_list.iter ap_args (fun lam -> iter top lam)
-    | Lprim { args; _ } ->
-        (* Check: can top be propoaged for all primitives *)
-        Ext_list.iter args (iter top)
-    | Lglobal_module _ -> ()
-    | Lfunction { params; body } ->
-        local_add_list params;
-        iter sink_pos body (* Do we need continue *)
-    | Llet (_, id, arg, body) ->
-        iter top arg;
-        local_add id;
-        iter sink_pos body
-    | Lletrec (decl, body) ->
-        local_set :=
-          Ext_list.fold_left decl !local_set (fun acc (id, _) ->
-              Set_ident.add acc id);
-        Ext_list.iter decl (fun (_, exp) -> iter sink_pos exp);
-        iter sink_pos body
-    | Lswitch
-        ( arg,
-          {
-            sw_consts;
-            sw_blocks;
-            sw_failaction;
-            sw_consts_full;
-            sw_blocks_full;
-          } ) -> (
-        iter top arg;
-        let top = Lam_var_stats.new_position_after_lam arg top in
-        List.iter (fun (_, case) -> iter top case) sw_consts;
-        List.iter (fun (_, case) -> iter top case) sw_blocks;
-        match sw_failaction with
-        | None -> ()
-        | Some x ->
-            if sw_consts_full || sw_blocks_full then iter top x
-            else iter sink_pos x)
-    | Lstringswitch (arg, cases, default) -> (
-        iter top arg;
-        let top = Lam_var_stats.new_position_after_lam arg top in
-        List.iter (fun (_, act) -> iter top act) cases;
-        match default with None -> () | Some x -> iter top x)
-    | Lstaticraise (_, args) -> List.iter (iter sink_pos) args
-    | Lstaticcatch (e1, (_, vars), e2) ->
-        iter sink_pos e1;
-        local_add_list vars;
-        iter sink_pos e2
-    | Ltrywith (e1, _exn, e2) ->
-        iter top e1;
-        iter sink_pos e2
-    | Lifthenelse (e1, e2, e3) ->
-        iter top e1;
-        let top = Lam_var_stats.new_position_after_lam e1 top in
-        iter top e2;
-        iter top e3
-    | Lsequence (e1, e2) ->
-        iter top e1;
-        iter sink_pos e2
-    | Lwhile (e1, e2) ->
-        iter sink_pos e1;
-        iter sink_pos e2 (* in the loop, no substitution any way *)
-    | Lfor (v, e1, e2, _dir, e3) ->
-        local_add v;
-        iter sink_pos e1;
-        iter sink_pos e2;
-        iter sink_pos e3
-    | Lassign (id, e) ->
-        used top id;
-        iter top e
-  in
-  iter Lam_var_stats.fresh_env lam;
-  !fv
-
-(* let is_closed_by (set : Set_ident.t) (lam : Lam.t) : bool =
-   Map_ident.is_empty (free_variables set (Map_ident.empty ) lam   ) *)
-
-(** A bit consverative , it should be empty *)
-let is_closed lam =
-  Map_ident.for_all (free_variables Set_ident.empty Map_ident.empty lam)
-    (fun k _ -> Ident.global k)
-
-let is_closed_with_map (exports : Set_ident.t) (params : Ident.t list)
-    (body : Lam.t) : bool * stats Map_ident.t =
-  let param_map = free_variables exports (param_map_of_list params) body in
-  let old_count = List.length params in
-  let new_count = Map_ident.cardinal param_map in
-  (old_count = new_count, param_map)
diff --git a/jscomp/core/lam_closure.mli b/jscomp/core/lam_closure.mli
deleted file mode 100644
index 392cb5c..0000000
--- a/jscomp/core/lam_closure.mli
+++ /dev/null
@@ -1,40 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** [is_closed_by map lam]
-    return [true] if all unbound variables
-    belongs to the given [map] *)
-(* val is_closed_by : Set_ident.t -> Lam.t -> bool *)
-
-val is_closed : Lam.t -> bool
-
-val is_closed_with_map :
-  Set_ident.t -> Ident.t list -> Lam.t -> bool * Lam_var_stats.stats Map_ident.t
-(** The output is mostly used in betat reduction *)
-
-val free_variables :
-  Set_ident.t ->
-  Lam_var_stats.stats Map_ident.t ->
-  Lam.t ->
-  Lam_var_stats.stats Map_ident.t
diff --git a/jscomp/core/lam_coercion.ml b/jscomp/core/lam_coercion.ml
deleted file mode 100644
index 84d7f7a..0000000
--- a/jscomp/core/lam_coercion.ml
+++ /dev/null
@@ -1,221 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(*
-  Invariant: The last one is always [exports]
-  Compile definitions
-  Compile exports
-  Assume Pmakeblock(_,_),
-  lambda_exports are pure
-  compile each binding with a return value
-
-  Such invariant  might be wrong in toplevel (since it is all bindings)
-
-  We should add this check as early as possible
-*)
-
-(*
-- {[ Ident.same id eid]} is more  correct,
-        however, it will introduce a coercion, which is not necessary,
-        as long as its name is the same, we want to avoid
-        another coercion
-        In most common cases, it will be
-   {[
-     let export/100 =a fun ..
-         export/100
-   ]}
-        This comes from we have lambda as below
-   {[
-     (* let export/100 =a export/99  *)
-     (* above is probably the cause but does not have to be  *)
-     (export/99)
-   ]}
-        [export/100] was not eliminated due to that it is export id,
-        if we rename export/99 to be export id, then we don't need
-        the  coercion any more, and export/100 will be dced later
-   - avoid rebound
-     check [map.ml] here coercion, we introduced
-                    rebound which is not corrrect
-   {[
-     let Make/identifier = function (funarg){
-         var $$let = Make/identifier(funarg);
-                 return [0, ..... ]
-       }
-   ]}
-                    Possible fix ?
-                    change export identifier, we should do this in the very
-                    beginning since lots of optimizations depend on this
-                    however
-*)
-
-type t = {
-  export_list : Ident.t list;
-  export_set : Set_ident.t;
-  export_map : Lam.t Map_ident.t;
-      (** not used in code generation, mostly used
-      for store some information in cmj files *)
-  groups : Lam_group.t list;
-      (* all code to be compiled later = original code + rebound coercions *)
-}
-
-let handle_exports (meta : Lam_stats.t) (lambda_exports : Lam.t list)
-    (reverse_input : Lam_group.t list) =
-  let (original_exports : Ident.t list) = meta.exports in
-  let (original_export_set : Set_ident.t) = meta.export_idents in
-  let len = List.length original_exports in
-  let tbl = Hash_set_string.create len in
-  let ({ export_list; export_set } as result) =
-    Ext_list.fold_right2 original_exports lambda_exports
-      {
-        export_list = [];
-        export_set = original_export_set;
-        export_map = Map_ident.empty;
-        groups = [];
-      } (fun (original_export_id : Ident.t) (lam : Lam.t) (acc : t) ->
-        let original_name = original_export_id.name in
-        if not @@ Hash_set_string.check_add tbl original_name then
-          Bs_exception.error (Bs_duplicate_exports original_name);
-        match lam with
-        | Lvar id ->
-            if Ident.name id = original_name then
-              {
-                acc with
-                export_list = id :: acc.export_list;
-                export_set =
-                  (if id.stamp = original_export_id.stamp then acc.export_set
-                  else
-                    Set_ident.add
-                      (Set_ident.remove acc.export_set original_export_id)
-                      id);
-              }
-            else
-              let newid = Ident.rename original_export_id in
-              let kind : Lam_compat.let_kind = Alias in
-              Lam_util.alias_ident_or_global meta newid id NA;
-              {
-                acc with
-                export_list = newid :: acc.export_list;
-                export_map = Map_ident.add acc.export_map newid lam;
-                groups = Single (kind, newid, lam) :: acc.groups;
-              }
-        | _ ->
-            (*
-              Example:
-               {[
-                 let N = [a0,a1,a2,a3]
-                 in [[ N[0], N[2]]]
-
-               ]}
-               After optimization
-               {[
-                 [ [ a0, a2] ]
-               ]}
-               Here [N] is elminated while N is still exported identifier
-               Invariant: [eid] can not be bound before
-               FIX: this invariant is not guaranteed.
-               Bug manifested: when querying arity info about N, it returns an array
-               of size 4 instead of 2
-            *)
-            let newid = Ident.rename original_export_id in
-            (let arity = Lam_arity_analysis.get_arity meta lam in
-             if not (Lam_arity.first_arity_na arity) then
-               Hash_ident.add meta.ident_tbl newid
-                 (FunctionId
-                    {
-                      arity;
-                      lambda =
-                        (match lam with
-                        | Lfunction _ -> Some (lam, Lam_non_rec)
-                        | _ -> None);
-                    }));
-            {
-              acc with
-              export_list = newid :: acc.export_list;
-              export_map = Map_ident.add acc.export_map newid lam;
-              groups = Single (Strict, newid, lam) :: acc.groups;
-            })
-  in
-
-  let export_map, coerced_input =
-    Ext_list.fold_left reverse_input (result.export_map, result.groups)
-      (fun (export_map, acc) x ->
-        ( (match x with
-          | Single (_, id, lam) when Set_ident.mem export_set id ->
-              Map_ident.add export_map id lam
-          (* relies on the Invariant that [eoid] can not be bound before
-              FIX: such invariant may not hold
-          *)
-          | _ -> export_map),
-          x :: acc ))
-  in
-  { result with export_map; groups = Lam_dce.remove export_list coerced_input }
-
-(* TODO: more flattening,
-    - also for function compilation, flattening should be done first
-    - [compile_group] and [compile] become mutually recursive function
-*)
-
-let rec flatten (acc : Lam_group.t list) (lam : Lam.t) :
-    Lam.t * Lam_group.t list =
-  match lam with
-  | Llet (str, id, arg, body) ->
-      let res, l = flatten acc arg in
-      flatten (Single (str, id, res) :: l) body
-  | Lletrec (bind_args, body) -> flatten (Recursive bind_args :: acc) body
-  | Lsequence (l, r) ->
-      let res, l = flatten acc l in
-      flatten (Lam_group.nop_cons res l) r
-  | x -> (x, acc)
-
-(** Invarinat to hold:
-    [export_map] is sound, for every rebinded export id, its key is indeed in
-    [export_map] since we know its old bindings are no longer valid, i.e
-    Lam_stats.t is not valid
-*)
-let coerce_and_group_big_lambda (meta : Lam_stats.t) lam : t * Lam_stats.t =
-  match flatten [] lam with
-  | Lprim { primitive = Pmakeblock _; args = lambda_exports }, reverse_input ->
-      let coerced_input = handle_exports meta lambda_exports reverse_input in
-      ( coerced_input,
-        {
-          meta with
-          export_idents = coerced_input.export_set;
-          exports = coerced_input.export_list;
-        } )
-  | _ ->
-      (* This could happen see #2474*)
-      (* #3595
-         TODO: FIXME later
-      *)
-      assert false
-(* {
-   export_list = meta.exports;
-   export_set = meta.export_idents;
-   export_map = Map_ident.empty ;
-   (** not used in code generation, mostly used
-      for store some information in cmj files *)
-   groups = [Nop lam] ;
-   (* all code to be compiled later = original code + rebound coercions *)
-   }
-   , meta *)
diff --git a/jscomp/core/lam_coercion.mli b/jscomp/core/lam_coercion.mli
deleted file mode 100644
index 0acb9ba..0000000
--- a/jscomp/core/lam_coercion.mli
+++ /dev/null
@@ -1,32 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = {
-  export_list : Ident.t list;
-  export_set : Set_ident.t;
-  export_map : Lam.t Map_ident.t;
-  groups : Lam_group.t list;
-}
-
-val coerce_and_group_big_lambda : Lam_stats.t -> Lam.t -> t * Lam_stats.t
diff --git a/jscomp/core/lam_compat.ml b/jscomp/core/lam_compat.ml
deleted file mode 100644
index 3fb76f4..0000000
--- a/jscomp/core/lam_compat.ml
+++ /dev/null
@@ -1,121 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 boxed_integer = Lambda.boxed_integer = Pbigint | Pint32 | Pint64
-
-let eq_boxed_integer (p : boxed_integer) (p1 : boxed_integer) =
-  match p with
-  | Pbigint -> p1 = Pbigint
-  | Pint32 -> p1 = Pint32
-  | Pint64 -> p1 = Pint64
-
-type comparison = Lambda.comparison = Ceq | Cneq | Clt | Cgt | Cle | Cge
-
-let eq_comparison (p : comparison) (p1 : comparison) =
-  match p with
-  | Cge -> p1 = Cge
-  | Cgt -> p1 = Cgt
-  | Cle -> p1 = Cle
-  | Clt -> p1 = Clt
-  | Ceq -> p1 = Ceq
-  | Cneq -> p1 = Cneq
-
-let cmp_int32 (cmp : comparison) (a : int32) b : bool =
-  match cmp with
-  | Ceq -> a = b
-  | Cneq -> a <> b
-  | Cgt -> a > b
-  | Cle -> a <= b
-  | Clt -> a < b
-  | Cge -> a >= b
-
-let cmp_int64 (cmp : comparison) (a : int64) b : bool =
-  match cmp with
-  | Ceq -> a = b
-  | Cneq -> a <> b
-  | Cgt -> a > b
-  | Cle -> a <= b
-  | Clt -> a < b
-  | Cge -> a >= b
-
-let cmp_float (cmp : comparison) (a : float) b : bool =
-  match cmp with
-  | Ceq -> a = b
-  | Cneq -> a <> b
-  | Cgt -> a > b
-  | Cle -> a <= b
-  | Clt -> a < b
-  | Cge -> a >= b
-  
-let cmp_int (cmp : comparison) (a : int) b : bool =
-  match cmp with
-  | Ceq -> a = b
-  | Cneq -> a <> b
-  | Cgt -> a > b
-  | Cle -> a <= b
-  | Clt -> a < b
-  | Cge -> a >= b
-
-type compile_time_constant =
-  | Big_endian
-  | Ostype_unix
-  | Ostype_win32
-  | Ostype
-  | Backend_type
-
-(** relies on the fact that [compile_time_constant] is enum type *)
-let eq_compile_time_constant (p : compile_time_constant)
-    (p1 : compile_time_constant) =
-  p = p1
-
-type let_kind = Lambda.let_kind = Strict | Alias | StrictOpt | Variable
-
-type field_dbg_info = Lambda.field_dbg_info =
-  | Fld_record of { name : string; mutable_flag : Asttypes.mutable_flag }
-  | Fld_module of { name : string }
-  | Fld_record_inline of { name : string }
-  | Fld_record_extension of { name : string }
-  | Fld_tuple
-  | Fld_poly_var_tag
-  | Fld_poly_var_content
-  | Fld_extension
-  | Fld_variant
-  | Fld_cons
-  | Fld_array
-
-let str_of_field_info (x : field_dbg_info) : string option =
-  match x with
-  | Fld_array | Fld_extension | Fld_variant | Fld_cons | Fld_poly_var_tag
-  | Fld_poly_var_content | Fld_tuple ->
-      None
-  | Fld_record { name; _ }
-  | Fld_module { name; _ }
-  | Fld_record_inline { name }
-  | Fld_record_extension { name } ->
-      Some name
-
-type set_field_dbg_info = Lambda.set_field_dbg_info =
-  | Fld_record_set of string
-  | Fld_record_inline_set of string
-  | Fld_record_extension_set of string
diff --git a/jscomp/core/lam_compat.mli b/jscomp/core/lam_compat.mli
deleted file mode 100644
index de02254..0000000
--- a/jscomp/core/lam_compat.mli
+++ /dev/null
@@ -1,71 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 boxed_integer = Lambda.boxed_integer = Pbigint | Pint32 | Pint64
-
-type comparison = Lambda.comparison = Ceq | Cneq | Clt | Cgt | Cle | Cge
-
-type compile_time_constant =
-  | Big_endian
-  | Ostype_unix
-  | Ostype_win32
-  | Ostype
-  | Backend_type
-
-type let_kind = Lambda.let_kind = Strict | Alias | StrictOpt | Variable
-
-type field_dbg_info = Lambda.field_dbg_info =
-  | Fld_record of { name : string; mutable_flag : Asttypes.mutable_flag }
-  | Fld_module of { name : string }
-  | Fld_record_inline of { name : string }
-  | Fld_record_extension of { name : string }
-  | Fld_tuple
-  | Fld_poly_var_tag
-  | Fld_poly_var_content
-  | Fld_extension
-  | Fld_variant
-  | Fld_cons
-  | Fld_array
-
-val str_of_field_info : field_dbg_info -> string option
-
-type set_field_dbg_info = Lambda.set_field_dbg_info =
-  | Fld_record_set of string
-  | Fld_record_inline_set of string
-  | Fld_record_extension_set of string
-
-val cmp_int32 : comparison -> int32 -> int32 -> bool
-
-val cmp_int64 : comparison -> int64 -> int64 -> bool
-
-val cmp_float : comparison -> float -> float -> bool
-
-val cmp_int : comparison -> int -> int -> bool
-
-val eq_comparison : comparison -> comparison -> bool
-
-val eq_boxed_integer : boxed_integer -> boxed_integer -> bool
-
-val eq_compile_time_constant :
-  compile_time_constant -> compile_time_constant -> bool
diff --git a/jscomp/core/lam_compile.ml b/jscomp/core/lam_compile.ml
deleted file mode 100644
index 9f7ced7..0000000
--- a/jscomp/core/lam_compile.ml
+++ /dev/null
@@ -1,1775 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-module S = Js_stmt_make
-
-let args_either_function_or_const (args : Lam.t list) =
-  Ext_list.for_all args (fun x ->
-      match x with Lfunction _ | Lconst _ -> true | _ -> false)
-
-let call_info_of_ap_status (ap_status : Lam.apply_status) : Js_call_info.t =
-  (* XXX *)
-  match ap_status with
-  | App_infer_full -> { arity = Full; call_info = Call_ml }
-  | App_uncurry -> { arity = Full; call_info = Call_na }
-  | App_na -> { arity = NA; call_info = Call_ml }
-
-let rec apply_with_arity_aux (fn : J.expression) (arity : int list)
-    (args : E.t list) (len : int) : E.t =
-  if len = 0 then fn (* All arguments consumed so far *)
-  else
-    match arity with
-    | x :: rest ->
-        let x = if x = 0 then 1 else x in
-        (* Relax when x = 0 *)
-        if len >= x then
-          let first_part, continue = Ext_list.split_at args x in
-          apply_with_arity_aux
-            (E.call ~info:{ arity = Full; call_info = Call_ml } fn first_part)
-            rest continue (len - x)
-        else if
-          (* GPR #1423 *)
-          Ext_list.for_all args Js_analyzer.is_okay_to_duplicate
-        then
-          let params =
-            Ext_list.init (x - len) (fun _ -> Ext_ident.create "param")
-          in
-          E.ocaml_fun params ~return_unit:false (* unknown info *) ~async:false ~oneUnitArg:false
-            [
-              S.return_stmt
-                (E.call
-                   ~info:{ arity = Full; call_info = Call_ml }
-                   fn
-                   (Ext_list.append args @@ Ext_list.map params E.var));
-            ]
-        else E.call ~info:Js_call_info.dummy fn args
-    (* alpha conversion now? --
-       Since we did an alpha conversion before so it is not here
-    *)
-    | [] ->
-        (* can not happen, unless it's an exception ? *)
-        E.call ~info:Js_call_info.dummy fn args
-
-let apply_with_arity ~arity fn args =
-  apply_with_arity_aux fn arity args (List.length args)
-
-let change_tail_type_in_try (x : Lam_compile_context.tail_type) :
-    Lam_compile_context.tail_type =
-  match x with
-  | Maybe_tail_is_return (Tail_with_name _) -> Maybe_tail_is_return Tail_in_try
-  | Not_tail | Maybe_tail_is_return Tail_in_try -> x
-
-let in_staticcatch (x : Lam_compile_context.tail_type) :
-    Lam_compile_context.tail_type =
-  match x with
-  | Maybe_tail_is_return (Tail_with_name ({ in_staticcatch = false } as x)) ->
-      Maybe_tail_is_return (Tail_with_name { x with in_staticcatch = true })
-  | _ -> x
-
-(* let change_tail_type_in_static
-   (x : Lam_compile_context.tail_type)
-   : Lam_compile_context.tail_type =
-   match x with
-   | Maybe_tail_is_return (Tail_with_name ({in_staticcatch=false} as z) ) ->
-    Maybe_tail_is_return (Tail_with_name {z with in_staticcatch=true})
-   | Maybe_tail_is_return (Tail_with_name {in_staticcatch=true} )
-   | Not_tail | Maybe_tail_is_return Tail_in_try
-    -> x *)
-
-(* assume outer is [Lstaticcatch] *)
-let rec flat_catches (acc : Lam_compile_context.handler list) (x : Lam.t) :
-    Lam_compile_context.handler list * Lam.t =
-  match x with
-  | Lstaticcatch (l, (label, bindings), handler)
-    when acc = []
-         || not
-              (Lam_exit_code.has_exit_code handler (fun exit ->
-                   Ext_list.exists acc (fun x -> x.label = exit))) ->
-      (* #1698 should not crush exit code here without checking *)
-      flat_catches ({ label; handler; bindings } :: acc) l
-  | _ -> (acc, x)
-
-let flatten_nested_caches (x : Lam.t) : Lam_compile_context.handler list * Lam.t
-    =
-  flat_catches [] x
-
-let morph_declare_to_assign (cxt : Lam_compile_context.t) k =
-  match cxt.continuation with
-  | Declare (kind, did) ->
-      k { cxt with continuation = Assign did } (Some (kind, did))
-  | _ -> k cxt None
-
-let group_apply ~merge_cases cases callback =
-  Ext_list.flat_map
-    (Ext_list.stable_group cases (fun (tag1, lam) (tag2, lam1) ->
-         merge_cases tag1 tag2 && Lam.eq_approx lam lam1))
-    (fun group -> Ext_list.map_last group callback)
-(* TODO:
-    for expression generation,
-    name, should_return  is not needed,
-    only jmp_table and env needed
-*)
-
-type default_case = Default of Lam.t | Complete | NonComplete
-
-let default_action ~saturated failaction =
-  match failaction with
-  | None -> Complete
-  | Some x -> if saturated then Complete else Default x
-
-let get_const_tag i (sw_names : Ast_untagged_variants.switch_names option) =
-  match sw_names with None -> None | Some { consts } -> Some consts.(i)
-
-let get_block i (sw_names : Ast_untagged_variants.switch_names option) =
-  match sw_names with None -> None | Some { blocks } -> Some blocks.(i)
-
-let get_tag_name (sw_names : Ast_untagged_variants.switch_names option) =
-  match sw_names with
-  | None -> Js_dump_lit.tag
-  | Some { blocks } ->
-    (match Array.find_opt (fun {Ast_untagged_variants.tag_name} -> tag_name <> None) blocks with
-    | Some {tag_name = Some s} -> s
-    | _ -> Js_dump_lit.tag
-    )
-
-let get_block_cases (sw_names : Ast_untagged_variants.switch_names option) =
-  let res = ref [] in
-  (match sw_names with
-  | None -> res := []
-  | Some { blocks } ->
-    Ext_array.iter blocks (function
-    | {block_type = Some block_type} -> res := block_type :: !res
-    | {block_type = None} -> ()
-    ) 
-  );
-  !res
-
-let get_literal_cases (sw_names : Ast_untagged_variants.switch_names option) =
-  let res = ref [] in
-  (match sw_names with
-  | None -> res := []
-  | Some { consts  } ->
-    Ext_array.iter consts (function
-    | {tag_type = Some t} -> res := t :: !res
-    | {name; tag_type = None} -> res := String name :: !res
-    )
-  );
-  !res
-
-
-let has_null_undefined_other (sw_names : Ast_untagged_variants.switch_names option) =
-  let (null, undefined, other) = (ref false, ref false, ref false) in
-  (match sw_names with
-  | None -> ()
-  | Some { consts; blocks } ->
-    Ext_array.iter consts (fun x -> match x.tag_type with
-      | Some Undefined -> undefined := true
-      | Some Null -> null := true
-      | _ -> other := true);
-  );
-  (!null, !undefined, !other)
-
-let no_effects_const = lazy true
-(* let has_effects_const = lazy false *)
-
-(* We drop the ability of cross-compiling
-        the compiler has to be the same running
-*)
-
-type initialization = J.block
-
-(* since it's only for alias, there is no arguments,
-   we should not inline function definition here, even though
-   it is very small
-   TODO: add comment here, we should try to add comment for
-   cross module inlining
-
-   if we do too agressive inlining here:
-
-   if we inline {!List.length} which will call {!A_list.length},
-   then we if we try inline {!A_list.length}, this means if {!A_list}
-   is rebuilt, this module should also be rebuilt,
-
-   But if the build system is content-based, suppose {!A_list}
-   is changed, cmj files in {!List} is unchnaged, however,
-   {!List.length} call {!A_list.length} which is changed, since
-   [ocamldep] only detect that we depend on {!List}, it will not
-   get re-built, then we are screwed.
-
-   This is okay for stamp based build system.
-
-   Another solution is that we add dependencies in the compiler
-
-   -: we should not do functor application inlining in a
-      non-toplevel, it will explode code very quickly
-*)
-
-let compile output_prefix = 
-
-let rec compile_external_field (* Like [List.empty]*)
-    ?(dynamic_import = false) (lamba_cxt : Lam_compile_context.t) (id : Ident.t) name : Js_output.t =
-  match Lam_compile_env.query_external_id_info ~dynamic_import id name with
-  | { persistent_closed_lambda = Some lam } when Lam_util.not_function lam ->
-      compile_lambda lamba_cxt lam
-  | _ ->
-      Js_output.output_of_expression lamba_cxt.continuation
-        ~no_effects:no_effects_const (E.ml_var_dot ~dynamic_import id name)
-(* TODO: how nested module call would behave,
-   In the future, we should keep in track  of if
-   it is fully applied from [Lapply]
-   Seems that the module dependency is tricky..
-   should we depend on [Pervasives] or not?
-
-   we can not do this correctly for the return value,
-   however we can inline the definition in Pervasives
-   TODO:
-   [Pervasives.print_endline]
-   [Pervasives.prerr_endline]
-   @param id external module id
-   @param number the index of the external function
-   @param env typing environment
-   @param args arguments
-*)
-
-(* This can not happen since this id should be already consulted by type checker
-          Worst case
-    {[
-      E.array_index_by_int m pos
-    ]}
-*)
-
-(* when module is passed as an argument - unpack to an array
-    for the function, generative module or functor can be a function,
-    however it can not be global -- global can only module
-*)
-and compile_external_field_apply ?(dynamic_import = false) (appinfo : Lam.apply) (module_id : Ident.t)
-    (field_name : string) (lambda_cxt : Lam_compile_context.t) : Js_output.t =
-  let ident_info =
-    Lam_compile_env.query_external_id_info ~dynamic_import module_id field_name
-  in
-  let ap_args = appinfo.ap_args in
-  match ident_info.persistent_closed_lambda with
-  | Some (Lfunction ({ params; body; _ } as lfunction))
-    when Ext_list.same_length params ap_args && Lam_analysis.lfunction_can_be_beta_reduced lfunction ->
-      (* TODO: serialize it when exporting to save compile time *)
-      let _, param_map =
-        Lam_closure.is_closed_with_map Set_ident.empty params body
-      in
-      compile_lambda lambda_cxt
-        (Lam_beta_reduce.propagate_beta_reduce_with_map lambda_cxt.meta
-           param_map params body ap_args)
-  | _ ->
-      let args_code, args =
-        let dummy = ([], []) in
-        if ap_args = [] then dummy
-        else
-          let arg_cxt = { lambda_cxt with continuation = NeedValue Not_tail } in
-          Ext_list.fold_right ap_args dummy (fun arg_lambda (args_code, args) ->
-              match compile_lambda arg_cxt arg_lambda with
-              | { block; value = Some b } ->
-                  (Ext_list.append block args_code, b :: args)
-              | _ -> assert false)
-      in
-
-      let fn = E.ml_var_dot ~dynamic_import module_id ident_info.name in
-      let expression =
-        match appinfo.ap_info.ap_status with
-        | (App_infer_full | App_uncurry) as ap_status ->
-            E.call ~info:(call_info_of_ap_status ap_status) fn args
-        | App_na -> (
-            match ident_info.arity with
-            | Submodule _ | Single Arity_na ->
-                E.call ~info:Js_call_info.dummy fn args
-            | Single x ->
-                apply_with_arity fn ~arity:(Lam_arity.extract_arity x) args)
-      in
-      Js_output.output_of_block_and_expression lambda_cxt.continuation args_code
-        expression
-
-(*
-    The second return values are values which need to be wrapped using
-   [update_dummy]
-
-   Invariant:  jmp_table can not across function boundary,
-       here we share env
-
-*)
-and compile_recursive_let ~all_bindings (cxt : Lam_compile_context.t)
-    (id : Ident.t) (arg : Lam.t) : Js_output.t * initialization =
-  match arg with
-  | Lfunction { params; body; attr = { return_unit; async; oneUnitArg } } ->
-      let continue_label = Lam_util.generate_label ~name:id.name () in
-      (* TODO: Think about recursive value
-         {[
-           let rec v = ref (fun _ ...
-                           )
-         ]}
-          [Alias] may not be exact
-      *)
-      let params = if oneUnitArg then [] else params in
-      let ret : Lam_compile_context.return_label =
-        {
-          id;
-          label = continue_label;
-          params;
-          immutable_mask = Array.make (List.length params) true;
-          new_params = Map_ident.empty;
-          triggered = false;
-        }
-      in
-      let output =
-        compile_lambda
-          {
-            cxt with
-            continuation =
-              EffectCall
-                (Maybe_tail_is_return
-                   (Tail_with_name { label = Some ret; in_staticcatch = false }));
-            jmp_table = Lam_compile_context.empty_handler_map;
-          }
-          body
-      in
-      let result =
-        if ret.triggered then
-          let body_block = Js_output.output_as_block output in
-          E.ocaml_fun
-          (* TODO:  save computation of length several times
-             Here we always create [ocaml_fun],
-             it will be renamed into [method]
-             when it is detected by a primitive
-          *)
-            ~return_unit ~async ~oneUnitArg ~immutable_mask:ret.immutable_mask
-            (Ext_list.map params (fun x ->
-                 Map_ident.find_default ret.new_params x x))
-            [
-              S.while_ (* ~label:continue_label *) E.true_
-                (Map_ident.fold ret.new_params body_block
-                   (fun old new_param acc ->
-                     S.define_variable ~kind:Alias old (E.var new_param) :: acc));
-            ]
-        else
-          (* TODO:  save computation of length several times *)
-          E.ocaml_fun params (Js_output.output_as_block output) ~return_unit ~async ~oneUnitArg
-      in
-      ( Js_output.output_of_expression
-          (Declare (Alias, id))
-          result
-          ~no_effects:(lazy (Lam_analysis.no_side_effects arg)),
-        [] )
-  | Lprim { primitive = Pmakeblock (_, _, _); args }
-    when args_either_function_or_const args ->
-      (compile_lambda { cxt with continuation = Declare (Alias, id) } arg, [])
-  (* case of lazy blocks, treat it as usual *)
-  | Lprim
-      {
-        primitive =
-          Pmakeblock
-            ( _,
-              (( Blk_record _
-               | Blk_constructor { num_nonconst = 1 }
-               | Blk_record_inlined { num_nonconst = 1 } ) as tag_info),
-              _ );
-        args = ls;
-      }
-    when Ext_list.for_all ls (fun x ->
-             match x with
-             | Lvar pid ->
-                 Ident.same pid id
-                 || not
-                    @@ Ext_list.exists all_bindings (fun (other, _) ->
-                           Ident.same other pid)
-             | Lconst _ -> true
-             | _ -> false) ->
-      (* capture cases like for {!Queue}
-         {[let rec cell = { content = x; next = cell} ]}
-         #1716: be careful not to optimize such cases:
-         {[ let rec a = { b} and b = { a} ]} they are indeed captured
-         and need to be declared first
-         TODO: this should be inlined based on tag info
-      *)
-      ( Js_output.make
-          (S.define_variable ~kind:Variable id (E.dummy_obj tag_info)
-          :: Ext_list.mapi ls (fun i x ->
-                 S.exp
-                   (Js_of_lam_block.set_field
-                      (match tag_info with
-                      | Blk_record { fields = xs } -> Fld_record_set xs.(i)
-                      | Blk_record_inlined xs ->
-                          Fld_record_inline_set xs.fields.(i)
-                      | Blk_constructor p -> (
-                          let is_cons = p.name = Literals.cons in
-                          match (is_cons, i) with
-                          | true, 0 -> Fld_record_inline_set Literals.hd
-                          | true, 1 -> Fld_record_inline_set Literals.tl
-                          | _, _ -> Fld_record_inline_set ("_" ^ string_of_int i)
-                          )
-                      | _ -> assert false)
-                      (E.var id) (Int32.of_int i)
-                      (match x with
-                      | Lvar lid -> E.var lid
-                      | Lconst x -> Lam_compile_const.translate x
-                      | _ -> assert false)))),
-        [] )
-  | Lprim { primitive = Pmakeblock (_, tag_info, _) } -> (
-      (* Lconst should not appear here if we do [scc]
-         optimization, since it's faked recursive value,
-         however it would affect scope issues, we have to declare it first
-      *)
-      match
-        compile_lambda { cxt with continuation = NeedValue Not_tail } arg
-      with
-      | { block = b; value = Some v } ->
-          (* TODO: check recursive value ..
-              could be improved for simple cases
-          *)
-          ( Js_output.make
-              (Ext_list.append b
-                 [
-                   S.exp
-                     (E.runtime_call Js_runtime_modules.obj_runtime
-                        "update_dummy" [ E.var id; v ]);
-                 ]),
-            [ S.define_variable ~kind:Variable id (E.dummy_obj tag_info) ] )
-      | _ -> assert false)
-  | _ ->
-      (* pathological case:
-          fail to capture taill call?
-         {[ let rec a =
-              if  g > 30 then .. fun () -> a ()
-         ]}
-
-          Neither  below is not allowed in ocaml:
-         {[
-           let rec v =
-             if sum 0 10 > 20 then
-               1::v
-             else 2:: v
-         ]}
-         {[
-           let rec v =
-             if sum 0 10 > 20 then
-               fun _ -> print_endline "hi"; v ()
-             else
-               fun _-> print_endline "hey"; v ()
-         ]}
-      *)
-      (compile_lambda { cxt with continuation = Declare (Alias, id) } arg, [])
-
-and compile_recursive_lets_aux cxt (id_args : Lam_scc.bindings) : Js_output.t =
-  (* #1716 *)
-  let output_code, ids =
-    Ext_list.fold_right id_args (Js_output.dummy, [])
-      (fun (ident, arg) (acc, ids) ->
-        let code, declare_ids =
-          compile_recursive_let ~all_bindings:id_args cxt ident arg
-        in
-        (Js_output.append_output code acc, Ext_list.append declare_ids ids))
-  in
-  match ids with
-  | [] -> output_code
-  | _ -> Js_output.append_output (Js_output.make ids) output_code
-
-and compile_recursive_lets cxt id_args : Js_output.t =
-  match id_args with
-  | [] -> Js_output.dummy
-  | _ -> (
-      let id_args_group = Lam_scc.scc_bindings id_args in
-      match id_args_group with
-      | [] -> assert false
-      | first :: rest ->
-          let acc = compile_recursive_lets_aux cxt first in
-          Ext_list.fold_left rest acc (fun acc x ->
-              Js_output.append_output acc (compile_recursive_lets_aux cxt x)))
-
-and compile_general_cases :
-      'a .
-      make_exp: ('a -> J.expression) ->
-      eq_exp: ('a option -> J.expression -> 'a option -> J.expression -> J.expression) ->
-      cxt: Lam_compile_context.t ->
-      switch: (?default:J.block -> ?declaration:Lam_compat.let_kind * Ident.t ->
-        _ -> ('a * J.case_clause) list -> J.statement) ->
-      switch_exp: J.expression ->
-      default: default_case ->
-      ?merge_cases: ('a -> 'a -> bool) ->
-      ('a * Lam.t) list ->
-      J.block =
-  fun (type a)
-    ~(make_exp : a -> J.expression)
-    ~(eq_exp : a option -> J.expression -> a option -> J.expression -> J.expression)
-    ~(cxt : Lam_compile_context.t)
-    ~(switch :
-      ?default:J.block ->
-      ?declaration:Lam_compat.let_kind * Ident.t ->
-      _ -> (a * J.case_clause) list -> J.statement
-    )
-    ~(switch_exp : J.expression)
-    ~(default : default_case)
-    ?(merge_cases = fun _ _ -> true)
-    (cases : (a * Lam.t) list) ->
-  match (cases, default) with
-  | [], Default lam -> Js_output.output_as_block (compile_lambda cxt lam)
-  | [], (Complete | NonComplete) -> []
-  | [ (_, lam) ], Complete ->
-      (* To take advantage of such optimizations,
-          when we generate code using switch,
-          we should always have a default,
-          otherwise the compiler engine would think that
-          it's also complete
-      *)
-      Js_output.output_as_block (compile_lambda cxt lam)
-  | [ (id, lam) ], NonComplete ->
-      morph_declare_to_assign cxt (fun cxt define ->
-          [
-            S.if_ ?declaration:define
-
-              (eq_exp None switch_exp (Some id) (make_exp id))
-              (Js_output.output_as_block (compile_lambda cxt lam));
-          ])
-  | [ (id, lam) ], Default x | [ (id, lam); (_, x) ], Complete ->
-      morph_declare_to_assign cxt (fun cxt define ->
-          let else_block = Js_output.output_as_block (compile_lambda cxt x) in
-          let then_block = Js_output.output_as_block (compile_lambda cxt lam) in
-          [
-            S.if_ ?declaration:define
-              (eq_exp None switch_exp (Some id) (make_exp id))
-              then_block ~else_:else_block;
-          ])
-  | _, _ ->
-      (* TODO: this is not relevant to switch case
-          however, in a subset of switch-case if we can analysis
-          its branch are the same, we can propogate which
-          might encourage better inlining strategey
-          ---
-          TODO: grouping can be delayed untile JS IR
-
-          see #2413
-          In general, we know it is last call,
-          there is no need to print [break];
-          But we need make sure the last call lambda does not
-          have `(exit ..)` due to we pass should_return from Lstaticcath downwards
-          Since this is a rough approximation, some `(exit ..)` does not destroy
-          last call property, we use exiting should_break to improve preciseness
-          (and it indeed help catch
-         - tailcall or not does not matter, if it is the tailcall
-            break still should not be printed (it will be continuned)
-           TOOD: disabled temporarily since it's not perfect yet *)
-      morph_declare_to_assign cxt (fun cxt declaration ->
-          (* Exclude cases that are the same as the default if the default is defined *)
-          let cases = match default with
-            | Default lam -> List.filter (fun (_, lam1) -> not (Lam.eq_approx lam lam1)) cases
-            | _ -> cases
-          in
-          let default =
-            match default with
-            | Complete -> None
-            | NonComplete -> None
-            | Default lam ->
-                Some (Js_output.output_as_block (compile_lambda cxt lam))
-          in
-          let body =
-            group_apply ~merge_cases cases (fun last (switch_case, lam) ->
-                if last then
-                  (* merge and shared *)
-                  let switch_body, should_break =
-                    Js_output.to_break_block (compile_lambda cxt lam)
-                  in
-                  let should_break =
-                    if
-                      not
-                      @@ Lam_compile_context.continuation_is_return
-                           cxt.continuation
-                    then should_break
-                    else should_break && Lam_exit_code.has_exit lam
-                  in
-                  ( switch_case,
-                    J.
-                      {
-                        switch_body;
-                        should_break;
-                        comment = None;
-                      } )
-                else
-                  ( switch_case,
-                    {
-                      switch_body = [];
-                      should_break = false;
-                      comment = None;
-                    } ))
-            (* TODO: we should also group default *)
-            (* The last clause does not need [break]
-                common break through, *)
-          in
-
-          [ switch ?default ?declaration switch_exp body ])
-
-and use_compile_literal_cases table ~(get_tag : _ -> Ast_untagged_variants.tag option) =
-  List.fold_right (fun (i, lam) acc ->
-    match get_tag i, acc with
-    | Some {Ast_untagged_variants.tag_type = Some t}, Some string_table ->
-       Some ((t, lam) :: string_table)
-    | Some {name; tag_type = None}, Some string_table -> Some ((String name, lam) :: string_table)
-    | _, _ -> None
-  ) table (Some [])
-and compile_cases
-  ?(untagged=false) ~cxt ~(switch_exp : E.t) ?(default = NonComplete)
-  ?(get_tag = fun _ -> None) ?(block_cases=[]) cases : initialization =
-    match use_compile_literal_cases cases ~get_tag with
-    | Some string_cases ->
-      if untagged
-      then compile_untagged_cases ~cxt ~switch_exp ~block_cases ~default string_cases
-      else compile_string_cases ~cxt ~switch_exp ~default string_cases
-    | None ->
-      cases |> compile_general_cases
-        ~make_exp:(fun i -> match get_tag i with
-          | None -> E.small_int i
-          | Some {tag_type = Some(String s)} -> E.str s
-          | Some {name} -> E.str name)
-        ~eq_exp: (fun _ x _ y -> E.int_equal x y)
-        ~cxt
-        ~switch: (fun ?default ?declaration e clauses ->
-          S.int_switch ?default ?declaration e clauses)
-        ~switch_exp
-        ~default
-  
-and compile_switch (switch_arg : Lam.t) (sw : Lam.lambda_switch)
-    (lambda_cxt : Lam_compile_context.t) =
-  (* TODO: if default is None, we can do some optimizations
-      Use switch vs if/then/else
-
-      TODO: switch based optimiztion - hash, group, or using array,
-            also if last statement is throw -- should we drop remaining
-            statement?
-  *)
-  let ({
-         sw_consts_full;
-         sw_consts;
-         sw_blocks_full;
-         sw_blocks;
-         sw_failaction;
-         sw_names;
-       }
-        : Lam.lambda_switch) =
-    sw
-  in
-  let sw_num_default = default_action ~saturated:sw_consts_full sw_failaction in
-  let sw_blocks_default =
-    default_action ~saturated:sw_blocks_full sw_failaction
-  in
-  let get_const_tag i = get_const_tag i sw_names in
-  let get_block i = get_block i sw_names in
-  let block_cases = get_block_cases sw_names in
-  let get_block_tag i : Ast_untagged_variants.tag option = match get_block i with
-    | None -> None
-    | Some ({tag = {name}; block_type = Some block_type}) ->
-      Some {name; tag_type = Some (Untagged block_type)} (* untagged block *)
-    | Some ({block_type = None; tag}) -> (* tagged block *)
-      Some tag in
-  let tag_name = get_tag_name sw_names in
-  let untagged = block_cases <> [] in
-  let compile_whole (cxt : Lam_compile_context.t) =
-    match
-      compile_lambda { cxt with continuation = NeedValue Not_tail } switch_arg
-    with
-    | { value = None; _ } -> assert false
-    | { block; value = Some e } -> (
-        block
-        @
-        if sw_consts_full && sw_consts = [] then
-          compile_cases ~block_cases
-            ~untagged ~cxt
-            ~switch_exp:(if untagged then e else E.tag ~name:tag_name e)
-            ~default:sw_blocks_default
-            ~get_tag:get_block_tag sw_blocks
-        else if sw_blocks_full && sw_blocks = [] then
-          compile_cases ~cxt ~switch_exp:e ~block_cases ~default:sw_num_default ~get_tag:get_const_tag sw_consts
-        else
-          (* [e] will be used twice  *)
-          let dispatch e =
-
-            let is_a_literal_case =
-              if block_cases <> []
-              then
-                E.is_a_literal_case ~literal_cases:(get_literal_cases sw_names) ~block_cases e
-              else
-               E.is_int_tag ~has_null_undefined_other:(has_null_undefined_other sw_names) e in
-            S.if_ is_a_literal_case
-              (compile_cases ~cxt ~switch_exp:e ~block_cases ~default:sw_num_default ~get_tag:get_const_tag sw_consts)
-            ~else_:
-              (compile_cases 
-                ~untagged ~cxt
-                ~switch_exp:(if untagged then e else E.tag ~name:tag_name e)
-                ~block_cases
-                ~default:sw_blocks_default
-                ~get_tag:get_block_tag sw_blocks)
-          in
-          match e.expression_desc with
-          | J.Var _ -> [ dispatch e ]
-          | _ ->
-              let v = Ext_ident.create_tmp () in
-              (* Necessary avoid duplicated computation*)
-              [ S.define_variable ~kind:Variable v e; dispatch (E.var v) ])
-  in
-  match lambda_cxt.continuation with
-  (* Needs declare first *)
-  | NeedValue _ ->
-      (* Necessary since switch is a statement, we need they return
-         the same value for different branches -- can be optmized
-         when branches are minimial (less than 2)
-      *)
-      let v = Ext_ident.create_tmp () in
-      Js_output.make
-        (S.declare_variable ~kind:Variable v
-        :: compile_whole { lambda_cxt with continuation = Assign v })
-        ~value:(E.var v)
-  | Declare (kind, id) ->
-      Js_output.make
-        (S.declare_variable ~kind id
-        :: compile_whole { lambda_cxt with continuation = Assign id })
-  | EffectCall _ | Assign _ -> Js_output.make (compile_whole lambda_cxt)
-
-
-and compile_string_cases ~cxt ~switch_exp ~default cases: initialization  =
-  cases |> compile_general_cases
-    ~make_exp:E.tag_type
-    ~eq_exp: (fun _ x _ y -> E.string_equal x y)
-    ~cxt
-    ~switch: (fun ?default ?declaration e clauses ->
-      S.string_switch ?default ?declaration e clauses)
-    ~switch_exp
-    ~default
-and compile_untagged_cases ~cxt ~switch_exp ~default ~block_cases cases =
-  let mk_eq (i : Ast_untagged_variants.tag_type option) x j y =
-    let check =  match i, j with
-    | Some tag_type, _ ->
-      Ast_untagged_variants.DynamicChecks.add_runtime_type_check ~tag_type ~block_cases (Expr x) (Expr y)
-    | _, Some tag_type ->
-      Ast_untagged_variants.DynamicChecks.add_runtime_type_check ~tag_type ~block_cases (Expr y) (Expr x)
-    | _ ->
-      Ast_untagged_variants.DynamicChecks.(==) (Expr x) (Expr y)
-    in
-    E.emit_check check
-  in
-  let tag_is_not_typeof = function
-    | Ast_untagged_variants.Untagged (InstanceType _) -> true
-    | _ -> false in
-  let clause_is_not_typeof (tag, _) = tag_is_not_typeof tag in
-  let switch ?default ?declaration e clauses =
-    let (not_typeof_clauses, typeof_clauses) = List.partition clause_is_not_typeof clauses in
-    let rec build_if_chain remaining_clauses = (match remaining_clauses with 
-    | (Ast_untagged_variants.Untagged (InstanceType instanceType), {J.switch_body}) :: rest -> 
-      S.if_ (E.emit_check (IsInstanceOf (instanceType, Expr e)))
-        (switch_body)
-        ~else_:([build_if_chain rest])
-    | _ -> S.string_switch ?default ?declaration (E.typeof e) typeof_clauses) in
-    build_if_chain not_typeof_clauses in
-  let merge_cases tag1 tag2 = (* only merge typeof cases, as instanceof cases are pulled out into if-then-else *)
-    not (tag_is_not_typeof tag1 || tag_is_not_typeof tag2) in
-  cases |> compile_general_cases
-    ~make_exp: E.tag_type
-    ~eq_exp: mk_eq
-    ~cxt
-    ~switch
-    ~switch_exp
-    ~default
-    ~merge_cases
-
-and compile_stringswitch l cases default (lambda_cxt : Lam_compile_context.t) =
-  (* TODO might better optimization according to the number of cases
-      Be careful: we should avoid multiple evaluation of l,
-      The [gen] can be elimiated when number of [cases] is less than 3
-  *)
-  let cases = cases |> List.map (fun (s,l) -> Ast_untagged_variants.String s, l) in
-  match
-    compile_lambda { lambda_cxt with continuation = NeedValue Not_tail } l
-  with
-  | { value = None } -> assert false
-  | { block; value = Some e } -> (
-      (* when should_return is true -- it's passed down
-         otherwise it's ok *)
-      let default =
-        match default with Some x -> Default x | None -> Complete
-      in
-      match lambda_cxt.continuation with
-      (* TODO: can be avoided when cases are less than 3 *)
-      | NeedValue _ ->
-          let v = Ext_ident.create_tmp () in
-          Js_output.make
-            (Ext_list.append block
-               (compile_string_cases
-                  ~cxt: { lambda_cxt with continuation = Declare (Variable, v) }
-                  ~switch_exp:e ~default cases))
-            ~value:(E.var v)
-      | _ ->
-          Js_output.make
-            (Ext_list.append block
-               (compile_string_cases ~cxt:lambda_cxt ~switch_exp:e ~default cases )))
-
-(*
-         This should be optimized in lambda layer
-         (let (match/1038 = (apply g/1027 x/1028))
-         (catch
-         (stringswitch match/1038
-         case "aabb": 0
-         case "bbc": 1
-         default: (exit 1))
-         with (1) 2))
-      *)
-and compile_staticraise i (largs : Lam.t list)
-    (lambda_cxt : Lam_compile_context.t) =
-  (* [i] is the jump table, [largs] is the arguments passed to [Lstaticcatch]*)
-  match Lam_compile_context.find_exn lambda_cxt i with
-  | { exit_id; bindings; order_id } ->
-      Ext_list.fold_right2 largs bindings
-        (Js_output.make
-           (if order_id >= 0 then [ S.assign exit_id (E.small_int order_id) ]
-           else []))
-        (fun larg bind acc ->
-          let new_output =
-            match larg with
-            | Lvar id -> Js_output.make [ S.assign bind (E.var id) ]
-            | _ ->
-                (* TODO: should be Assign -- Assign is an optimization *)
-                compile_lambda
-                  { lambda_cxt with continuation = Assign bind }
-                  larg
-          in
-          Js_output.append_output new_output acc)
-
-(* Invariant: exit_code can not be reused
-    (catch l with (32)
-    (handler))
-    32 should not be used in another catch
-    Invariant:
-    This is true in current ocaml compiler
-    currently exit only appears in should_return position relative to staticcatch
-    if not we should use ``javascript break`` or ``continue``
-   if exit_code_id == code
-     handler -- ids are not useful, since
-     when compiling `largs` we will do the binding there
-   - when exit_code is undefined internally,
-       it should PRESERVE  ``tail`` property
-   - if it uses `staticraise` only once
-       or handler is minimal, we can inline
-   - always inline also seems to be ok, but it might bloat the code
-   - another common scenario is that we have nested catch
-       (catch (catch (catch ..))
-     checkout example {!Digest.file}, you can not inline handler there,
-     we can spot such patten and use finally there?
-   {[
-     let file filename =
-       let ic = open_in_bin filename in
-       match channel ic (-1) with
-       | d -> close_in ic; d
-       | exception e -> close_in ic; raise e
-
-   ]}
-*)
-and compile_staticcatch (lam : Lam.t) (lambda_cxt : Lam_compile_context.t) =
-  let code_table, body = flatten_nested_caches lam in
-  let exit_id = Ext_ident.create_tmp ~name:"exit" () in
-  match (lambda_cxt.continuation, code_table) with
-  | ( EffectCall
-        (Maybe_tail_is_return (Tail_with_name { in_staticcatch = false }) as
-        tail_type),
-      [ code_table ] )
-  (* tail position and only one exit code *)
-    when Lam_compile_context.no_static_raise_in_handler code_table ->
-      let jmp_table, handler =
-        Lam_compile_context.add_pseudo_jmp lambda_cxt.jmp_table exit_id
-          code_table
-      in
-      let new_cxt =
-        {
-          lambda_cxt with
-          jmp_table;
-          continuation = EffectCall (in_staticcatch tail_type);
-        }
-      in
-
-      let lbody = compile_lambda new_cxt body in
-      let declares =
-        Ext_list.map code_table.bindings (fun x ->
-            S.declare_variable ~kind:Variable x)
-      in
-      Js_output.append_output (Js_output.make declares)
-        (Js_output.append_output lbody (compile_lambda lambda_cxt handler))
-  | _ -> (
-      let exit_expr = E.var exit_id in
-      let jmp_table, handlers =
-        Lam_compile_context.add_jmps lambda_cxt.jmp_table exit_id code_table
-      in
-
-      (* Declaration First, body and handler have the same value *)
-      let declares =
-        S.define_variable ~kind:Variable exit_id E.zero_int_literal
-        :: (* we should always make it zero here, since [zero] is reserved in our mapping*)
-           Ext_list.flat_map code_table (fun { bindings } ->
-               Ext_list.map bindings (fun x ->
-                   S.declare_variable ~kind:Variable x))
-      in
-      match lambda_cxt.continuation with
-      (* could be optimized when cases are less than 3 *)
-      | NeedValue _ ->
-          let v = Ext_ident.create_tmp () in
-          let new_cxt =
-            { lambda_cxt with jmp_table; continuation = Assign v }
-          in
-          let lbody = compile_lambda new_cxt body in
-          Js_output.append_output
-            (Js_output.make (S.declare_variable ~kind:Variable v :: declares))
-            (Js_output.append_output lbody
-               (Js_output.make
-                  (compile_cases ~cxt:new_cxt ~switch_exp:exit_expr handlers)
-                  ~value:(E.var v)))
-      | Declare (kind, id) (* declare first this we will do branching*) ->
-          let declares = S.declare_variable ~kind id :: declares in
-          let new_cxt =
-            { lambda_cxt with jmp_table; continuation = Assign id }
-          in
-          let lbody = compile_lambda new_cxt body in
-          Js_output.append_output (Js_output.make declares)
-            (Js_output.append_output lbody
-               (Js_output.make
-                  (compile_cases ~cxt:new_cxt ~switch_exp:exit_expr handlers)))
-      (* place holder -- tell the compiler that
-         we don't know if it's complete
-      *)
-      | EffectCall tail_type as cont ->
-          let continuation =
-            let new_tail_type = in_staticcatch tail_type in
-            if new_tail_type == tail_type then cont
-            else EffectCall new_tail_type
-          in
-          let new_cxt = { lambda_cxt with jmp_table; continuation } in
-          let lbody = compile_lambda new_cxt body in
-          Js_output.append_output (Js_output.make declares)
-            (Js_output.append_output lbody
-               (Js_output.make
-                  (compile_cases ~cxt:new_cxt ~switch_exp:exit_expr handlers)))
-      | Assign _ ->
-          let new_cxt = { lambda_cxt with jmp_table } in
-          let lbody = compile_lambda new_cxt body in
-          Js_output.append_output (Js_output.make declares)
-            (Js_output.append_output lbody
-               (Js_output.make
-                  (compile_cases ~cxt:new_cxt ~switch_exp:exit_expr handlers))))
-
-and compile_sequand (l : Lam.t) (r : Lam.t) (lambda_cxt : Lam_compile_context.t)
-    =
-  if Lam_compile_context.continuation_is_return lambda_cxt.continuation then
-    compile_lambda lambda_cxt (Lam.sequand l r)
-  else
-    let new_cxt = { lambda_cxt with continuation = NeedValue Not_tail } in
-    match compile_lambda new_cxt l with
-    | { value = None } -> assert false
-    | { block = l_block; value = Some l_expr } -> (
-        match compile_lambda new_cxt r with
-        | { value = None } -> assert false
-        | { block = []; value = Some r_expr } ->
-            Js_output.output_of_block_and_expression lambda_cxt.continuation
-              l_block (E.and_ l_expr r_expr)
-        | { block = r_block; value = Some r_expr } -> (
-            match lambda_cxt.continuation with
-            | Assign v ->
-                (* Refernece Js_output.output_of_block_and_expression *)
-                Js_output.make
-                  (l_block
-                  @ [
-                      S.if_ l_expr
-                        (r_block @ [ S.assign v r_expr ])
-                        ~else_:[ S.assign v E.false_ ];
-                    ])
-            | Declare (_kind, v) ->
-                (* Refernece Js_output.output_of_block_and_expression *)
-                Js_output.make
-                  (l_block
-                  @ [
-                      S.define_variable ~kind:Variable v E.false_;
-                      S.if_ l_expr (r_block @ [ S.assign v r_expr ]);
-                    ])
-            | EffectCall _ | NeedValue _ ->
-                let v = Ext_ident.create_tmp () in
-                Js_output.make
-                  ((S.define_variable ~kind:Variable v E.false_ :: l_block)
-                  @ [ S.if_ l_expr (r_block @ [ S.assign v r_expr ]) ])
-                  ~value:(E.var v)))
-
-and compile_sequor (l : Lam.t) (r : Lam.t) (lambda_cxt : Lam_compile_context.t)
-    =
-  if Lam_compile_context.continuation_is_return lambda_cxt.continuation then
-    compile_lambda lambda_cxt (Lam.sequor l r)
-  else
-    let new_cxt = { lambda_cxt with continuation = NeedValue Not_tail } in
-    match compile_lambda new_cxt l with
-    | { value = None } -> assert false
-    | { block = l_block; value = Some l_expr } -> (
-        match compile_lambda new_cxt r with
-        | { value = None } -> assert false
-        | { block = []; value = Some r_expr } ->
-            let exp = E.or_ l_expr r_expr in
-            Js_output.output_of_block_and_expression lambda_cxt.continuation
-              l_block exp
-        | { block = r_block; value = Some r_expr } -> (
-            match lambda_cxt.continuation with
-            | Assign v ->
-                (* Reference Js_output.output_of_block_and_expression *)
-                Js_output.make
-                  (l_block
-                  @ [
-                      S.if_ (E.not l_expr)
-                        (r_block @ [ S.assign v r_expr ])
-                        ~else_:[ S.assign v E.true_ ];
-                    ])
-            | Declare (_kind, v) ->
-                Js_output.make
-                  (l_block
-                  @ [
-                      S.define_variable ~kind:Variable v E.true_;
-                      S.if_ (E.not l_expr) (r_block @ [ S.assign v r_expr ]);
-                    ])
-            | EffectCall _ | NeedValue _ ->
-                let v = Ext_ident.create_tmp () in
-                Js_output.make
-                  (l_block
-                  @ [
-                      S.define_variable ~kind:Variable v E.true_;
-                      S.if_ (E.not l_expr) (r_block @ [ S.assign v r_expr ]);
-                    ])
-                  ~value:(E.var v)))
-
-(* Note that ``J.While(expression * statement )``
-            idealy if ocaml expression does not need fresh variables, we can generate
-            while expression, here we generate for statement, leave optimization later.
-            (Sine OCaml expression can be really complex..)
-*)
-and compile_while (predicate : Lam.t) (body : Lam.t)
-    (lambda_cxt : Lam_compile_context.t) =
-  match
-    compile_lambda
-      { lambda_cxt with continuation = NeedValue Not_tail }
-      predicate
-  with
-  | { value = None } -> assert false
-  | { block; value = Some e } ->
-      (* st = NeedValue -- this should be optimized and never happen *)
-      let e = match block with [] -> e | _ -> E.of_block block ~e in
-      let block =
-        [
-          S.while_ e
-            (Js_output.output_as_block
-            @@ compile_lambda
-                 { lambda_cxt with continuation = EffectCall Not_tail }
-                 body);
-        ]
-      in
-      Js_output.output_of_block_and_expression lambda_cxt.continuation block
-        E.unit
-
-(* all non-tail 
-    TODO: check semantics should start, finish be executed each time in both
-     ocaml and js?, also check evaluation order..
-     in ocaml id is not in the scope of finish, so it should be safe here
-
-     for i  = 0 to (print_int 3; 10) do print_int i done;;
-     3012345678910- : unit = ()
-
-    for(var i =  0 ; i < (console.log(i),10); ++i){console.log('hi')}
-    print i each time, so they are different semantics...
-*)
-
-and compile_for (id : J.for_ident) (start : Lam.t) (finish : Lam.t)
-    (direction : Js_op.direction_flag) (body : Lam.t)
-    (lambda_cxt : Lam_compile_context.t) =
-  let new_cxt = { lambda_cxt with continuation = NeedValue Not_tail } in
-  let block =
-    match (compile_lambda new_cxt start, compile_lambda new_cxt finish) with
-    | { value = None }, _ | _, { value = None } -> assert false
-    | { block = b1; value = Some e1 }, { block = b2; value = Some e2 } -> (
-        (* order b1 -- (e1 -- b2 -- e2)
-            in most cases we can shift it into such scenarios
-            b1, b2, [e1, e2]
-           - b2 is Empty
-           - e1 is pure
-             we can guarantee e1 is pure, if it literally contains a side effect call,
-             put it in the beginning
-        *)
-        let block_body =
-          Js_output.output_as_block
-            (compile_lambda
-               { lambda_cxt with continuation = EffectCall Not_tail }
-               body)
-        in
-        match (b1, b2) with
-        | _, [] ->
-            Ext_list.append_one b1 (S.for_ (Some e1) e2 id direction block_body)
-        | _, _
-          when Js_analyzer.no_side_effect_expression e1
-               (*
-                     e1 > b2 > e2
-                     re-order
-                     b2 > e1 > e2
-                   *)
-          ->
-            Ext_list.append b1
-              (Ext_list.append_one b2
-                 (S.for_ (Some e1) e2 id direction block_body))
-        | _, _ ->
-            Ext_list.append b1
-              (S.define_variable ~kind:Variable id e1
-              :: Ext_list.append_one b2 (S.for_ None e2 id direction block_body)
-              ))
-  in
-  Js_output.output_of_block_and_expression lambda_cxt.continuation block E.unit
-
-and compile_assign id (lambda : Lam.t) (lambda_cxt : Lam_compile_context.t) =
-  let block =
-    match lambda with
-    | Lprim { primitive = Poffsetint v; args = [ Lvar bid ] }
-      when Ident.same id bid ->
-        [ S.exp (E.assign (E.var id) (E.int32_add (E.var id) (E.small_int v))) ]
-    | _ -> (
-        match
-          compile_lambda
-            { lambda_cxt with continuation = NeedValue Not_tail }
-            lambda
-        with
-        | { value = None } -> assert false
-        | { block; value = Some v } -> Ext_list.append_one block (S.assign id v)
-        )
-  in
-  Js_output.output_of_block_and_expression lambda_cxt.continuation block E.unit
-
-(*
-         tail --> should be renamed to `shouldReturn`
-          in most cases ``shouldReturn`` == ``tail``, however, here is not,
-          should return, but it is not a tail call in js
-          (* could be optimized using javascript style exceptions *)
-   {[
-     {try
-        {var $js=g(x);}
-          catch(exn){if(exn=Not_found){var $js=0;}else{throw exn;}}
-     return h($js);
-   }
-   ]}
-*)
-and compile_trywith lam id catch (lambda_cxt : Lam_compile_context.t) =
-  let aux (with_context : Lam_compile_context.t)
-      (body_context : Lam_compile_context.t) =
-    (* should_return is passed down
-       #1701, try should prevent tailcall *)
-    [
-      S.try_
-        (Js_output.output_as_block (compile_lambda body_context lam))
-        ~with_:
-          (id, Js_output.output_as_block (compile_lambda with_context catch));
-    ]
-  in
-  match lambda_cxt.continuation with
-  | Declare (kind, id) ->
-      let context = { lambda_cxt with continuation = Assign id } in
-      Js_output.make (S.declare_variable ~kind id :: aux context context)
-  | Assign _ -> Js_output.make (aux lambda_cxt lambda_cxt)
-  | NeedValue _ ->
-      let v = Ext_ident.create_tmp () in
-      let context = { lambda_cxt with continuation = Assign v } in
-      Js_output.make
-        (S.declare_variable ~kind:Variable v :: aux context context)
-        ~value:(E.var v)
-  | EffectCall return_type ->
-      let new_return_type = change_tail_type_in_try return_type in
-      if new_return_type == return_type then
-        Js_output.make (aux lambda_cxt lambda_cxt)
-      else
-        Js_output.make
-          (aux lambda_cxt
-             { lambda_cxt with continuation = EffectCall new_return_type })
-
-(* Note that in [Texp_apply] for [%sendcache] the cache might not be used
-   see {!CamlinternalOO.send_meth} and {!Translcore.transl_exp0} the branch
-   [Texp_apply] when [public_send ], args are simply dropped
-
-   reference
-   [js_of_ocaml]
-   1. GETPUBMET
-   2. GETDYNMET
-   3. GETMETHOD
-   [ocaml]
-   Lsend (bytegen.ml)
-   For the object layout refer to [camlinternalOO/create_object]
-   {[
-     let create_object table =
-       (* XXX Appel de [obj_block] *)
-       let obj = mark_ocaml_object @@ Obj.new_block Obj.object_tag table.size in
-       (* XXX Appel de [caml_modify] *)
-       Obj.set_field obj 0 (Obj.repr table.methods);
-       Obj.obj (set_id obj)
-
-     let create_object_opt obj_0 table =
-       if (Obj.magic obj_0 : bool) then obj_0 else begin
-         (* XXX Appel de [obj_block] *)
-         let obj = mark_ocaml_object @@ Obj.new_block Obj.object_tag table.size in
-         (* XXX Appel de [caml_modify] *)
-         Obj.set_field obj 0 (Obj.repr table.methods);
-         Obj.obj (set_id obj)
-       end
-   ]}
-   it's a block with tag [248], the first field is [table.methods] which is an array
-   {[
-     type table =
-       { mutable size: int;
-         mutable methods: closure array;
-         mutable methods_by_name: meths;
-         mutable methods_by_label: labs;
-         mutable previous_states:
-           (meths * labs * (label * item) list * vars *
-            label list * string list) list;
-         mutable hidden_meths: (label * item) list;
-         mutable vars: vars;
-         mutable initializers: (obj -> unit) list }
-   ]}
-*)
-and compile_ifthenelse (predicate : Lam.t) (t_branch : Lam.t) (f_branch : Lam.t)
-    (lambda_cxt : Lam_compile_context.t) =
-  match
-    compile_lambda
-      { lambda_cxt with continuation = NeedValue Not_tail }
-      predicate
-  with
-  | { value = None } -> assert false
-  | { block = b; value = Some e } -> (
-      match lambda_cxt.continuation with
-      | NeedValue _ -> (
-          match
-            ( compile_lambda lambda_cxt t_branch,
-              compile_lambda lambda_cxt f_branch )
-          with
-          | { block = []; value = Some out1 }, { block = []; value = Some out2 }
-            ->
-              (* speical optimization *)
-              Js_output.make b ~value:(E.econd e out1 out2)
-          | _, _ -> (
-              (* we can not reuse -- here we need they have the same name,
-                     TODO: could be optimized by inspecting assigment statement *)
-              let id = Ext_ident.create_tmp () in
-              let assign_cxt = { lambda_cxt with continuation = Assign id } in
-              match
-                ( compile_lambda assign_cxt t_branch,
-                  compile_lambda assign_cxt f_branch )
-              with
-              | out1, out2 ->
-                  Js_output.make
-                    (Ext_list.append
-                       (S.declare_variable ~kind:Variable id :: b)
-                       [
-                         S.if_ e
-                           (Js_output.output_as_block out1)
-                           ~else_:(Js_output.output_as_block out2);
-                       ])
-                    ~value:(E.var id)))
-      | Declare (kind, id) -> (
-          let declare_cxt =
-            { lambda_cxt with continuation = NeedValue Not_tail }
-          in
-          match
-            ( compile_lambda declare_cxt t_branch,
-              compile_lambda declare_cxt f_branch )
-          with
-          | { block = []; value = Some out1 }, { block = []; value = Some out2 }
-            ->
-              (* Invariant: should_return is false*)
-              Js_output.make
-                (Ext_list.append_one b
-                   (S.define_variable ~kind id (E.econd e out1 out2)))
-          | _, _ ->
-              Js_output.make
-                (Ext_list.append_one b
-                   (S.if_ ~declaration:(kind, id) e
-                      (Js_output.output_as_block
-                      @@ compile_lambda
-                           { lambda_cxt with continuation = Assign id }
-                           t_branch)
-                      ~else_:
-                        (Js_output.output_as_block
-                        @@ compile_lambda
-                             { lambda_cxt with continuation = Assign id }
-                             f_branch))))
-      | Assign _ ->
-          let then_output =
-            Js_output.output_as_block (compile_lambda lambda_cxt t_branch)
-          in
-          let else_output =
-            Js_output.output_as_block (compile_lambda lambda_cxt f_branch)
-          in
-          Js_output.make
-            (Ext_list.append_one b (S.if_ e then_output ~else_:else_output))
-      | EffectCall should_return -> (
-          let context1 =
-            { lambda_cxt with continuation = NeedValue should_return }
-          in
-          match
-            ( should_return,
-              compile_lambda context1 t_branch,
-              compile_lambda context1 f_branch )
-          with
-          (* see PR#83 *)
-          | ( Not_tail,
-              { block = []; value = Some out1 },
-              { block = []; value = Some out2 } ) -> (
-              match
-                ( Js_exp_make.remove_pure_sub_exp out1,
-                  Js_exp_make.remove_pure_sub_exp out2 )
-              with
-              | None, None -> Js_output.make (Ext_list.append_one b (S.exp e))
-              (* FIX #1762 *)
-              | Some out1, Some out2 ->
-                  Js_output.make b ~value:(E.econd e out1 out2)
-              | Some out1, None ->
-                  Js_output.make
-                    (Ext_list.append_one b (S.if_ e [ S.exp out1 ]))
-              | None, Some out2 ->
-                  Js_output.make
-                    (Ext_list.append_one b (S.if_ (E.not e) [ S.exp out2 ])))
-          | Not_tail, { block = []; value = Some out1 }, _ ->
-              (* assert branch
-                  TODO: here we re-compile two branches since
-                  its context is different -- could be improved
-              *)
-              if Js_analyzer.no_side_effect_expression out1 then
-                Js_output.make
-                  (Ext_list.append b
-                     [
-                       S.if_ (E.not e)
-                         (Js_output.output_as_block
-                         @@ compile_lambda lambda_cxt f_branch);
-                     ])
-              else
-                Js_output.make
-                  (Ext_list.append b
-                     [
-                       S.if_ e
-                         (Js_output.output_as_block
-                         @@ compile_lambda lambda_cxt t_branch)
-                         ~else_:
-                           (Js_output.output_as_block
-                           @@ compile_lambda lambda_cxt f_branch);
-                     ])
-          | Not_tail, _, { block = []; value = Some out2 } ->
-              let else_ =
-                if Js_analyzer.no_side_effect_expression out2 then None
-                else
-                  Some
-                    (Js_output.output_as_block
-                       (compile_lambda lambda_cxt f_branch))
-              in
-              Js_output.make
-                (Ext_list.append_one b
-                   (S.if_ e
-                      (Js_output.output_as_block
-                         (compile_lambda lambda_cxt t_branch))
-                      ?else_))
-          | ( Maybe_tail_is_return _,
-              { block = []; value = Some out1 },
-              { block = []; value = Some out2 } ) ->
-              Js_output.make
-                (Ext_list.append_one b (S.return_stmt (E.econd e out1 out2)))
-                ~output_finished:True
-          | _, _, _ ->
-              let then_output =
-                Js_output.output_as_block (compile_lambda lambda_cxt t_branch)
-              in
-              let else_output =
-                Js_output.output_as_block (compile_lambda lambda_cxt f_branch)
-              in
-              Js_output.make
-                (Ext_list.append_one b (S.if_ e then_output ~else_:else_output))
-          ))
-
-and compile_apply (appinfo : Lam.apply) (lambda_cxt : Lam_compile_context.t) =
-  match appinfo with
-  | {
-   ap_func =
-     Lapply { ap_func; ap_args; ap_info = { ap_status = App_na; ap_inlined } };
-   ap_info = { ap_status = App_na } as outer_ap_info;
-  } ->
-      (* After inlining, we can generate such code, see {!Ari_regress_test}*)
-      let ap_info =
-        if outer_ap_info.ap_inlined = ap_inlined then outer_ap_info
-        else { outer_ap_info with ap_inlined }
-      in
-      compile_lambda lambda_cxt
-        (Lam.apply ap_func (Ext_list.append ap_args appinfo.ap_args) ap_info)
-  (* External function call: it can not be tailcall in this case*)
-  | {
-   ap_func =
-     Lprim { primitive = Pfield (_, fld_info); args = [ Lglobal_module (id, dynamic_import) ]; _ };
-  } -> (
-      match fld_info with
-      | Fld_module { name } ->
-          compile_external_field_apply ~dynamic_import appinfo id name lambda_cxt
-      | _ -> assert false)
-  | _ -> (
-      (* TODO: ---
-         1. check arity, can be simplified for pure expression
-         2. no need create names
-      *)
-      let ap_func = appinfo.ap_func in
-      let new_cxt = { lambda_cxt with continuation = NeedValue Not_tail } in
-      let[@warning "-8" (* non-exhaustive pattern*)] args_code, fn_code :: args
-          =
-        Ext_list.fold_right (ap_func :: appinfo.ap_args) ([], [])
-          (fun x (args_code, fn_code) ->
-            match compile_lambda new_cxt x with
-            | { block; value = Some b } ->
-                (Ext_list.append block args_code, b :: fn_code)
-            | { value = None } -> assert false)
-      in
-      match (ap_func, lambda_cxt.continuation) with
-      | ( Lvar fn_id,
-          ( EffectCall
-              (Maybe_tail_is_return (Tail_with_name { label = Some ret }))
-          | NeedValue
-              (Maybe_tail_is_return (Tail_with_name { label = Some ret })) ) )
-        when Ident.same ret.id fn_id ->
-          ret.triggered <- true;
-          (* Here we mark [finished] true, since the continuation
-              does not make sense any more (due to that we have [continue])
-              TODO: [finished] is not a meaningful name, we should use [truncate]
-              to mean the following statement should be truncated
-          *)
-          (*
-                actually, there is no easy way to determin
-                if the argument depends on an expresion, since
-                it can be a function, then it may depend on anything
-                http://caml.inria.fr/pub/ml-archives/caml-list/2005/02/5727b4ecaaef6a7a350c9d98f5f68432.en.html
-                http://caml.inria.fr/pub/ml-archives/caml-list/2005/02/fe9bc4e23e6dc8c932c8ab34240ff195.en.html
-
-            *)
-          (* TODO: use [fold]*)
-          let _, assigned_params, new_params =
-            let args = if ret.params = [] then [] else args in
-            Ext_list.fold_left2 ret.params args (0, [], Map_ident.empty)
-              (fun param arg (i, assigns, new_params) ->
-                match arg with
-                | { expression_desc = Var (Id x); _ } when Ident.same x param ->
-                    (i + 1, assigns, new_params)
-                | _ ->
-                    let new_param, m =
-                      match Map_ident.find_opt ret.new_params param with
-                      | None ->
-                          ret.immutable_mask.(i) <- false;
-                          let v = Ext_ident.create ("_" ^ param.name) in
-                          (v, Map_ident.add new_params param v)
-                      | Some v -> (v, new_params)
-                    in
-                    (i + 1, (new_param, arg) :: assigns, m))
-          in
-          ret.new_params <-
-            Map_ident.disjoint_merge_exn new_params ret.new_params (fun _ _ _ ->
-                assert false);
-          let block =
-            Ext_list.map_append assigned_params [ S.continue_ ]
-              (fun (param, arg) -> S.assign param arg)
-          in
-          (* Note true and continue needed to be handled together*)
-          Js_output.make ~output_finished:True (Ext_list.append args_code block)
-      | _ ->
-          Js_output.output_of_block_and_expression lambda_cxt.continuation
-            args_code
-            (E.call
-               ~info:(call_info_of_ap_status appinfo.ap_info.ap_status)
-               fn_code args))
-
-and compile_prim (prim_info : Lam.prim_info)
-    (lambda_cxt : Lam_compile_context.t) =
-  match prim_info with
-  | { primitive = Pfield (_, fld_info); args = [ Lglobal_module (id, dynamic_import) ]; _ } -> (
-      (* should be before Lglobal_global *)
-      match fld_info with
-      | Fld_module { name = field } ->
-          compile_external_field ~dynamic_import lambda_cxt id field
-      | _ -> assert false)
-  | { primitive = Praise; args = [ e ]; _ } -> (
-      match
-        compile_lambda { lambda_cxt with continuation = NeedValue Not_tail } e
-      with
-      | { block; value = Some v } ->
-          Js_output.make
-            (Ext_list.append_one block (S.throw_stmt v))
-            ~value:E.undefined ~output_finished:True
-      (* FIXME -- breaks invariant when NeedValue, reason is that js [throw] is statement
-         while ocaml it's an expression, we should remove such things in lambda optimizations
-      *)
-      | { value = None } -> assert false)
-  | { primitive = Psequand; args = [ l; r ]; _ } ->
-      compile_sequand l r lambda_cxt
-  | { primitive = Psequor; args = [ l; r ] } -> compile_sequor l r lambda_cxt
-  | { primitive = Pdebugger; _ } ->
-      (* [%bs.debugger] guarantees that the expression does not matter
-         TODO: make it even safer *)
-      Js_output.output_of_block_and_expression lambda_cxt.continuation
-        S.debugger_block E.unit
-      (* TODO:
-         check the arity of fn before wrapping it
-         we need mark something that such eta-conversion can not be simplified in some cases
-      *)
-  | {
-   primitive = Pjs_unsafe_downgrade { name = property; setter };
-   args = [ obj ];
-  } -> (
-      (*
-       either a getter {[ x #. height ]} or {[ x ## method_call ]}
-    *)
-      assert (not setter);
-
-      match
-        compile_lambda { lambda_cxt with continuation = NeedValue Not_tail } obj
-      with
-      | { value = None } -> assert false
-      | { block; value = Some b } ->
-          let blocks, ret =
-            if block = [] then ([], E.dot b property)
-            else
-              match Js_ast_util.named_expression b with
-              | None -> (block, E.dot b property)
-              | Some (x, b) ->
-                  (Ext_list.append_one block x, E.dot (E.var b) property)
-          in
-          Js_output.output_of_block_and_expression lambda_cxt.continuation
-            blocks ret)
-  | {
-   primitive = Pfull_apply;
-   args =
-     [
-       Lprim
-         {
-           primitive = Pjs_unsafe_downgrade { name = property; setter = true };
-           args = [ obj ];
-         };
-       setter_val;
-     ];
-  } -> (
-      let need_value_no_return_cxt =
-        { lambda_cxt with continuation = NeedValue Not_tail }
-      in
-      let obj_output = compile_lambda need_value_no_return_cxt obj in
-      let arg_output = compile_lambda need_value_no_return_cxt setter_val in
-      let cont obj_block arg_block obj_code =
-        Js_output.output_of_block_and_expression lambda_cxt.continuation
-          (match obj_code with
-          | None -> Ext_list.append obj_block arg_block
-          | Some obj_code -> Ext_list.append obj_block (obj_code :: arg_block))
-      in
-      match (obj_output, arg_output) with
-      | { value = None }, _ | _, { value = None } -> assert false
-      | ( { block = obj_block; value = Some obj },
-          { block = arg_block; value = Some value } ) -> (
-          match Js_ast_util.named_expression obj with
-          | None ->
-              cont obj_block arg_block None
-                (E.seq (E.assign (E.dot obj property) value) E.unit)
-          | Some (obj_code, obj) ->
-              cont obj_block arg_block (Some obj_code)
-                (E.seq (E.assign (E.dot (E.var obj) property) value) E.unit)))
-  | {
-   primitive = Pfull_apply;
-   args = Lprim { primitive = Pjs_unsafe_downgrade { setter = true } } :: _;
-  } ->
-      assert false
-  | { primitive = Pfull_apply | Pvoid_run; args; loc } -> (
-      (* 1. uncurried call should not do eta-conversion
-            since `fn.length` will broken
-         2. invariant: `external` declaration will guarantee
-         the function application is saturated
-         3. we need a location for Pccall in the call site
-      *)
-      match args with
-      | fn :: rest ->
-          compile_lambda lambda_cxt
-            (Lam.apply fn rest
-               {
-                 ap_loc = loc;
-                 ap_inlined = Default_inline;
-                 ap_status = App_uncurry;
-               })
-      (*FIXME: should pass info down: `f a [@bs][@inlined]`*)
-      | [] -> assert false)
-  | { primitive = Pjs_fn_method; args = args_lambda } -> (
-      match args_lambda with
-      | [ Lfunction { params; body; attr = { return_unit } } ] ->
-          Js_output.output_of_block_and_expression lambda_cxt.continuation []
-            (E.method_ params ~return_unit
-               (* Invariant:  jmp_table can not across function boundary,
-                  here we share env
-               *)
-               (Js_output.output_as_block
-                  (compile_lambda
-                     {
-                       lambda_cxt with
-                       continuation =
-                         EffectCall
-                           (Maybe_tail_is_return
-                              (Tail_with_name
-                                 { label = None; in_staticcatch = false }));
-                       jmp_table = Lam_compile_context.empty_handler_map;
-                     }
-                     body)))
-      | _ -> assert false)
-  | { primitive = Pjs_fn_make arity; args = [ fn ]; loc } ->
-      compile_lambda lambda_cxt
-        (Lam_eta_conversion.unsafe_adjust_to_arity loc ~to_:arity ?from:None fn)
-  | { primitive = Pjs_fn_make_unit; args = [ fn ]; loc } ->
-    compile_lambda lambda_cxt fn
-  | { primitive = Pjs_fn_make _; args = [] | _ :: _ :: _ } -> assert false
-  | { primitive = Pjs_object_create labels; args } ->
-      let args_block, args_expr =
-        if args = [] then ([], [])
-        else
-          let new_cxt = { lambda_cxt with continuation = NeedValue Not_tail } in
-          Ext_list.split_map args (fun x ->
-              match compile_lambda new_cxt x with
-              | { block; value = Some b } -> (block, b)
-              | { value = None } -> assert false)
-      in
-      let block, exp =
-        Lam_compile_external_obj.assemble_obj_args labels args_expr
-      in
-      Js_output.output_of_block_and_expression lambda_cxt.continuation
-        (Ext_list.concat_append args_block block)
-        exp
-  | { primitive; args; loc } ->
-      let args_block, args_expr =
-        if args = [] then ([], [])
-        else
-          let new_cxt = { lambda_cxt with continuation = NeedValue Not_tail } in
-          Ext_list.split_map args (fun x ->
-              match compile_lambda new_cxt x with
-              | { block; value = Some b } -> (block, b)
-              | { value = None } -> assert false)
-      in
-      let args_code : J.block = List.concat args_block in
-      let exp =
-        (* TODO: all can be done in [compile_primitive] *)
-        Lam_compile_primitive.translate output_prefix loc lambda_cxt primitive args_expr
-      in
-      Js_output.output_of_block_and_expression lambda_cxt.continuation args_code
-        exp
-
-and compile_lambda (lambda_cxt : Lam_compile_context.t) (cur_lam : Lam.t) :
-    Js_output.t =
-  match cur_lam with
-  | Lfunction { params; body; attr = { return_unit; async; oneUnitArg } } ->
-      Js_output.output_of_expression lambda_cxt.continuation
-        ~no_effects:no_effects_const
-        (E.ocaml_fun params ~return_unit ~async ~oneUnitArg
-           (* Invariant:  jmp_table can not across function boundary,
-              here we share env
-           *)
-           (Js_output.output_as_block
-              (compile_lambda
-                 {
-                   lambda_cxt with
-                   continuation =
-                     EffectCall
-                       (Maybe_tail_is_return
-                          (Tail_with_name
-                             { label = None; in_staticcatch = false }));
-                   jmp_table = Lam_compile_context.empty_handler_map;
-                 }
-                 body)))
-  | Lapply appinfo -> compile_apply appinfo lambda_cxt
-  | Llet (let_kind, id, arg, body) ->
-      (* Order matters..  see comment below in [Lletrec] *)
-      let args_code =
-        compile_lambda
-          { lambda_cxt with continuation = Declare (let_kind, id) }
-          arg
-      in
-      Js_output.append_output args_code (compile_lambda lambda_cxt body)
-  | Lletrec (id_args, body) ->
-      (* There is a bug in our current design,
-         it requires compile args first (register that some objects are jsidentifiers)
-         and compile body wiht such effect.
-         So here we should compile [id_args] first, then [body] later.
-         Note it has some side effect over cache number as well, mostly the value of
-         [Caml_primitive["caml_get_public_method"](x,hash_tab, number)]
-
-         To fix this,
-         1. scan the lambda layer first, register js identifier before proceeding
-         2. delay the method call into javascript ast
-      *)
-      let v = compile_recursive_lets lambda_cxt id_args in
-      Js_output.append_output v (compile_lambda lambda_cxt body)
-  | Lvar id ->
-      Js_output.output_of_expression lambda_cxt.continuation
-        ~no_effects:no_effects_const (E.var id)
-  | Lconst c ->
-      Js_output.output_of_expression lambda_cxt.continuation
-        ~no_effects:no_effects_const
-        (Lam_compile_const.translate c)
-  | Lglobal_module (i, dynamic_import) ->
-      (* introduced by
-         1. {[ include Array --> let include  = Array  ]}
-         2. inline functor application
-      *)
-      Js_output.output_of_block_and_expression lambda_cxt.continuation []
-        (E.ml_module_as_var ~dynamic_import i)
-  | Lprim prim_info -> compile_prim prim_info lambda_cxt
-  | Lsequence (l1, l2) ->
-      let output_l1 =
-        compile_lambda { lambda_cxt with continuation = EffectCall Not_tail } l1
-      in
-      let output_l2 = compile_lambda lambda_cxt l2 in
-      Js_output.append_output output_l1 output_l2
-  | Lifthenelse (predicate, t_branch, f_branch) ->
-      compile_ifthenelse predicate t_branch f_branch lambda_cxt
-  | Lstringswitch (l, cases, default) ->
-      compile_stringswitch l cases default lambda_cxt
-  | Lswitch (switch_arg, sw) -> compile_switch switch_arg sw lambda_cxt
-  | Lstaticraise (i, largs) -> compile_staticraise i largs lambda_cxt
-  | Lstaticcatch _ -> compile_staticcatch cur_lam lambda_cxt
-  | Lwhile (p, body) -> compile_while p body lambda_cxt
-  | Lfor (id, start, finish, direction, body) -> (
-      match (direction, finish) with
-      | ( Upto,
-          ( Lprim
-              {
-                primitive = Psubint;
-                args = [ new_finish; Lconst (Const_int { i = 1l }) ];
-              }
-          | Lprim { primitive = Poffsetint -1; args = [ new_finish ] } ) ) ->
-          compile_for id start new_finish Up body lambda_cxt
-      | _ ->
-          compile_for id start finish
-            (if direction = Upto then Upto else Downto)
-            body lambda_cxt)
-  | Lassign (id, lambda) -> compile_assign id lambda lambda_cxt
-  | Ltrywith (lam, id, catch) ->
-      (* generate documentation *)
-      compile_trywith lam id catch lambda_cxt
-
-in compile_recursive_lets, compile_lambda
-
-let compile_recursive_lets ~output_prefix = fst (compile output_prefix)
-let compile_lambda ~output_prefix = snd (compile output_prefix)
diff --git a/jscomp/core/lam_compile.mli b/jscomp/core/lam_compile.mli
deleted file mode 100644
index f3d00c6..0000000
--- a/jscomp/core/lam_compile.mli
+++ /dev/null
@@ -1,30 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Compile single lambda IR to JS IR  *)
-
-val compile_recursive_lets :
-  output_prefix:string -> Lam_compile_context.t -> (Ident.t * Lam.t) list -> Js_output.t
-
-val compile_lambda : output_prefix:string -> Lam_compile_context.t -> Lam.t -> Js_output.t
diff --git a/jscomp/core/lam_compile_const.ml b/jscomp/core/lam_compile_const.ml
deleted file mode 100644
index 7c56808..0000000
--- a/jscomp/core/lam_compile_const.ml
+++ /dev/null
@@ -1,110 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-
-(** return [val < 0] if not nested [Some (Some (Some None))]*)
-let rec is_some_none_aux (x : Lam_constant.t) acc =
-  match x with
-  | Const_some v -> is_some_none_aux v (acc + 1)
-  | Const_module_alias | Const_js_undefined _ -> acc
-  | _ -> -1
-
-let rec nested_some_none n none =
-  if n = 0 then none else nested_some_none (n - 1) (E.optional_block none)
-
-let rec translate_some (x : Lam_constant.t) : J.expression =
-  let depth = is_some_none_aux x 0 in
-  if depth < 0 then E.optional_not_nest_block (translate x)
-  else nested_some_none depth (E.optional_block (translate (Const_js_undefined {isUnit = false})))
-
-and translate (x : Lam_constant.t) : J.expression =
-  match x with
-  | Const_module_alias -> E.undefined (*  TODO *)
-  | Const_some s -> translate_some s
-  | Const_js_true -> E.bool true
-  | Const_js_false -> E.bool false
-  | Const_js_null -> E.nil
-  | Const_js_undefined {isUnit = true} -> E.unit
-  | Const_js_undefined {isUnit = false} -> E.undefined
-  | Const_int { i; comment = Pt_constructor {cstr_name={name; tag_type=None}}} when name <> "[]" ->
-      E.str name
-  | Const_int { i; comment = Pt_constructor {cstr_name={tag_type = Some t}}}  ->
-      E.tag_type t
-  | Const_int { i; comment } ->
-      E.int i ?comment:(Lam_constant.string_of_pointer_info comment)
-  | Const_char i -> Js_of_lam_string.const_char i
-  (* E.float (Int32.to_string i) *)
-  | Const_int64 i ->
-      (*
-            TODO:
-       {[
-         Int64.to_string 0x7FFFFFFFFFFFFFFFL;;
-         - : string = "9223372036854775807"
-       ]}
-       {[
-         Int64.(to_float max_int);;
-         - : float = 9.22337203685477581e+18
-       ]}
-       Note we should compile it to Int64 as JS's 
-       speical representation -- 
-       it is not representatble in JS number
-    *)
-      (* E.float (Int64.to_string i) *)
-      Js_long.of_const i
-      (* https://github.com/google/closure-library/blob/master/closure%2Fgoog%2Fmath%2Flong.js *)
-  | Const_bigint (sign, i) -> E.bigint sign i
-  | Const_float f -> E.float f (* TODO: preserve float *)
-  | Const_string { s; unicode = false } -> E.str s
-  | Const_string { s; unicode = true } -> E.str ~delim:DStarJ s
-  | Const_pointer name -> E.str name
-  | Const_block (tag, tag_info, xs) ->
-      Js_of_lam_block.make_block NA tag_info (E.small_int tag)
-        (Ext_list.map xs translate)
-  | Const_float_array ars ->
-      (* according to the compiler
-          const_float_array is immutable
-         {[ Lprim(Pccall prim_obj_dup, [master]) ]},
-          however, we can not translate
-         {[ prim_obj_dup(x) =>  x' ]}
-          since x' is now mutable, prim_obj_dup does a copy,
-
-          the compiler does this  is mainly to extract common data into data section,
-          we  deoptimized this in js backend? so it is actually mutable
-      *)
-      (* TODO-- *)
-      Js_of_lam_array.make_array Mutable (Ext_list.map ars E.float)
-
-(* E.arr Mutable ~comment:"float array" *)
-(*   (Ext_list.map (fun x ->  E.float  x ) ars) *)
-
-(* and translate_optional s =
-   let  b =
-   match s with
-   | Const_js_undefined -> E.optional_block (translate s) *)
-
-let translate_arg_cst (cst : External_arg_spec.cst) =
-  match cst with
-  | Arg_int_lit i -> E.int (Int32.of_int i)
-  | Arg_string_lit (s, delim) -> E.str s ~delim
diff --git a/jscomp/core/lam_compile_const.mli b/jscomp/core/lam_compile_const.mli
deleted file mode 100644
index 2a97874..0000000
--- a/jscomp/core/lam_compile_const.mli
+++ /dev/null
@@ -1,29 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Compile lambda constant to JS *)
-
-val translate : Lam_constant.t -> J.expression
-
-val translate_arg_cst : External_arg_spec.cst -> J.expression
diff --git a/jscomp/core/lam_compile_context.ml b/jscomp/core/lam_compile_context.ml
deleted file mode 100644
index 0ed48d6..0000000
--- a/jscomp/core/lam_compile_context.ml
+++ /dev/null
@@ -1,112 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 jbl_label = int
-
-module HandlerMap = Map_int
-
-type value = { exit_id : Ident.t; bindings : Ident.t list; order_id : int }
-
-(* delegate to the callee to generate expression
-      Invariant: [output] should return a trailing expression
-*)
-type return_label = {
-  id : Ident.t;
-  label : J.label;
-  params : Ident.t list;
-  immutable_mask : bool array;
-  mutable new_params : Ident.t Map_ident.t;
-  mutable triggered : bool;
-}
-
-type tail = { label : return_label option; in_staticcatch : bool }
-
-type maybe_tail = Tail_in_try | Tail_with_name of tail
-
-type tail_type = Not_tail | Maybe_tail_is_return of maybe_tail
-
-(* Note [return] does indicate it is a tail position in most cases
-   however, in an exception handler, return may not be in tail position
-   to fix #1701 we play a trick that (Maybe_tail_is_return None)
-   would never trigger tailcall, however, it preserves [return]
-   semantics
-*)
-(* have a mutable field to notifiy it's actually triggered *)
-(* anonoymous function does not have identifier *)
-
-type let_kind = Lam_compat.let_kind
-
-type continuation =
-  | EffectCall of tail_type
-  | NeedValue of tail_type
-  | Declare of let_kind * J.ident (* bound value *)
-  | Assign of J.ident
-(* when use [Assign], var is not needed, since it's already declared  *)
-
-type jmp_table = value HandlerMap.t
-
-let continuation_is_return (x : continuation) =
-  match x with
-  | EffectCall (Maybe_tail_is_return _) | NeedValue (Maybe_tail_is_return _) ->
-      true
-  | EffectCall Not_tail | NeedValue Not_tail | Declare _ | Assign _ -> false
-
-type t = {
-  continuation : continuation;
-  jmp_table : jmp_table;
-  meta : Lam_stats.t;
-}
-
-let empty_handler_map = HandlerMap.empty
-
-type handler = { label : jbl_label; handler : Lam.t; bindings : Ident.t list }
-
-let no_static_raise_in_handler (x : handler) : bool =
-  not (Lam_exit_code.has_exit_code x.handler (fun _code -> true))
-
-(* always keep key id positive, specifically no [0] generated
-   return a tuple
-   [tbl, handlers]
-   [tbl] is used for compiling [staticraise]
-   [handlers] is used for compiling [staticcatch]
-*)
-let add_jmps (m : jmp_table) (exit_id : Ident.t) (code_table : handler list) :
-    jmp_table * (int * Lam.t) list =
-  let map, handlers =
-    Ext_list.fold_left_with_offset code_table (m, [])
-      (HandlerMap.cardinal m + 1)
-      (fun { label; handler; bindings } (acc, handlers) order_id ->
-        ( HandlerMap.add acc label { exit_id; bindings; order_id },
-          (order_id, handler) :: handlers ))
-  in
-  (map, List.rev handlers)
-
-let add_pseudo_jmp (m : jmp_table)
-    (exit_id : Ident.t) (* TODO not needed, remove it later *)
-    (code_table : handler) : jmp_table * Lam.t =
-  ( HandlerMap.add m code_table.label
-      { exit_id; bindings = code_table.bindings; order_id = -1 },
-    code_table.handler )
-
-let find_exn cxt i = Map_int.find_exn cxt.jmp_table i
diff --git a/jscomp/core/lam_compile_context.mli b/jscomp/core/lam_compile_context.mli
deleted file mode 100644
index da6ca41..0000000
--- a/jscomp/core/lam_compile_context.mli
+++ /dev/null
@@ -1,88 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 definition to keep track of compilation state 
-*)
-
-(** Some types are defined in this module to help avoiding generating unnecessary symbols 
-    (generating too many symbols will make the output code unreadable)
-*)
-
-type jbl_label = int
-
-type return_label = {
-  id : Ident.t;
-  label : J.label;
-  params : Ident.t list;
-  immutable_mask : bool array;
-  mutable new_params : Ident.t Map_ident.t;
-  mutable triggered : bool;
-}
-
-type value = { exit_id : Ident.t; bindings : Ident.t list; order_id : int }
-
-type let_kind = Lam_compat.let_kind
-
-type tail = { label : return_label option; in_staticcatch : bool }
-
-type maybe_tail = Tail_in_try | Tail_with_name of tail
-
-type tail_type = Not_tail | Maybe_tail_is_return of maybe_tail
-(* anonoymous function does not have identifier *)
-
-(* delegate to the callee to generate expression
-      Invariant: [output] should return a trailing expression
-*)
-
-type continuation =
-  | EffectCall of tail_type
-  | NeedValue of tail_type
-  | Declare of let_kind * J.ident (* bound value *)
-  | Assign of J.ident
-      (** when use [Assign], var is not needed, since it's already declared 
-      make sure all [Assign] are declared first, otherwise you are creating global variables
-  *)
-
-type jmp_table = value Map_int.t
-
-val continuation_is_return : continuation -> bool
-
-type t = {
-  continuation : continuation;
-  jmp_table : jmp_table;
-  meta : Lam_stats.t;
-}
-
-val empty_handler_map : jmp_table
-
-type handler = { label : jbl_label; handler : Lam.t; bindings : Ident.t list }
-
-val no_static_raise_in_handler : handler -> bool
-
-val add_jmps :
-  jmp_table -> Ident.t -> handler list -> jmp_table * (jbl_label * Lam.t) list
-
-val add_pseudo_jmp : jmp_table -> Ident.t -> handler -> jmp_table * Lam.t
-
-val find_exn : t -> jbl_label -> value
diff --git a/jscomp/core/lam_compile_env.ml b/jscomp/core/lam_compile_env.ml
deleted file mode 100644
index ff1dadb..0000000
--- a/jscomp/core/lam_compile_env.ml
+++ /dev/null
@@ -1,141 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 env_value =
-  | Ml of Js_cmj_format.cmj_load_info
-  | External
-      (** Also a js file, but this belong to third party 
-      we never load runtime/*.cmj
-  *)
-
-type ident_info = Js_cmj_format.keyed_cmj_value = {
-  name : string;
-  arity : Js_cmj_format.arity;
-  persistent_closed_lambda : Lam.t option;
-}
-
-(*
-   refer: [Env.find_pers_struct]
-   [ find_in_path_uncap !load_path (name ^ ".cmi")]
-*)
-
-(** It stores module => env_value mapping 
-*)
-let cached_tbl : env_value Lam_module_ident.Hash.t =
-  Lam_module_ident.Hash.create 31
-
-let ( +> ) = Lam_module_ident.Hash.add cached_tbl
-
-(* For each compilation we need reset to make it re-entrant *)
-let reset () =
-  Js_config.no_export := false;
-  (* This is needed in the playground since one no_export can make it true
-     In the payground, it seems we need reset more states
-  *)
-  Lam_module_ident.Hash.clear cached_tbl
-
-(** We should not provide "#moduleid" as output
-    since when we print it in the end, it will 
-    be escaped quite ugly
-*)
-let add_js_module ?import_attributes (hint_name : External_ffi_types.module_bind_name)
-    (module_name : string) default ~dynamic_import : Ident.t =
-  let id =
-    Ident.create
-      (match hint_name with
-      | Phint_name hint_name -> Ext_string.capitalize_ascii hint_name
-      (* make sure the module name is capitalized
-         TODO: maybe a warning if the user hint is not good
-      *)
-      | Phint_nothing -> Ext_modulename.js_id_name_of_hint_name module_name)
-  in
-  let lam_module_ident : J.module_id =
-    { id; kind = External { name = module_name; default; import_attributes }; dynamic_import }
-  in
-  match Lam_module_ident.Hash.find_key_opt cached_tbl lam_module_ident with
-  | None ->
-      lam_module_ident +> External;
-      id
-  | Some old_key -> old_key.id
-
-let query_external_id_info ?(dynamic_import = false) (module_id : Ident.t) (name : string) : ident_info =
-  let oid = Lam_module_ident.of_ml ~dynamic_import module_id in
-  let cmj_table =
-    match Lam_module_ident.Hash.find_opt cached_tbl oid with
-    | None ->
-        let cmj_load_info = !Js_cmj_load.load_unit module_id.name in
-        oid +> Ml cmj_load_info;
-        cmj_load_info.cmj_table
-    | Some (Ml { cmj_table }) -> cmj_table
-    | Some External -> assert false
-  in
-  Js_cmj_format.query_by_name cmj_table name
-
-let get_package_path_from_cmj (id : Lam_module_ident.t) :
-    string * Js_packages_info.t * Ext_js_file_kind.case =
-  let cmj_load_info =
-    match Lam_module_ident.Hash.find_opt cached_tbl id with
-    | Some (Ml cmj_load_info) -> cmj_load_info
-    | Some External -> assert false
-    (* called by {!Js_name_of_module_id.string_of_module_id}
-       can not be External
-    *)
-    | None -> (
-        match id.kind with
-        | Runtime | External _ -> assert false
-        | Ml ->
-            let cmj_load_info =
-              !Js_cmj_load.load_unit (Lam_module_ident.name id)
-            in
-            id +> Ml cmj_load_info;
-            cmj_load_info)
-  in
-  let cmj_table = cmj_load_info.cmj_table in
-  (cmj_load_info.package_path, cmj_table.package_spec, cmj_table.case)
-
-let add = Lam_module_ident.Hash_set.add
-
-(* Conservative interface *)
-let is_pure_module (oid : Lam_module_ident.t) =
-  match oid.kind with
-  | Runtime -> true
-  | External _ -> false
-  | Ml -> (
-      match Lam_module_ident.Hash.find_opt cached_tbl oid with
-      | None -> (
-          match !Js_cmj_load.load_unit (Lam_module_ident.name oid) with
-          | cmj_load_info ->
-              oid +> Ml cmj_load_info;
-              cmj_load_info.cmj_table.pure
-          | exception _ -> false)
-      | Some (Ml { cmj_table }) -> cmj_table.pure
-      | Some External -> false)
-
-let populate_required_modules extras
-    (hard_dependencies : Lam_module_ident.Hash_set.t) =
-  Lam_module_ident.Hash.iter cached_tbl (fun id _ ->
-      if not (is_pure_module id) then add hard_dependencies id);
-  Lam_module_ident.Hash_set.iter extras (fun id : unit ->
-      if not (is_pure_module id) then add hard_dependencies id)
-(* Lam_module_ident.Hash_set.elements hard_dependencies *)
diff --git a/jscomp/core/lam_compile_env.mli b/jscomp/core/lam_compile_env.mli
deleted file mode 100644
index c9cfd37..0000000
--- a/jscomp/core/lam_compile_env.mli
+++ /dev/null
@@ -1,79 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Helper for global Ocaml module index into meaningful names  *)
-
-val reset : unit -> unit
-
-val add_js_module :
-  ?import_attributes:External_ffi_types.import_attributes -> External_ffi_types.module_bind_name -> string -> bool -> dynamic_import:bool -> Ident.t
-(** 
-   [add_js_module hint_name module_name]
-   Given a js module name and hint name, assign an id to it
-   we also bookkeep it as [External] dependency.
-
-   Note the complexity lies in that we should consolidate all 
-   same external dependencies into a single dependency.
-
-   The strategy is that we first create a [Lam_module_ident.t] 
-   and  query it if already exists in [cache_tbl], if it already
-   exists, we discard the freshly made one, and use the cached one,
-   otherwise, use the freshly made one instead
-
-   Invariant: 
-    any [id] as long as put in the [cached_tbl] should be always valid,
-*)
-
-(* The other dependencies are captured by querying
-   either when [access] or when expansion,
-   however such dependency can be removed after inlining etc.
-
-   When we register such compile time dependency we classified
-   it as
-   Visit (ml), Builtin(built in js), External()
-
-   For external, we never remove, we only consider
-   remove dependency for Runtime and Visit, so
-   when compile OCaml to Javascript, we only need
-   pay attention to for those modules are actually used or not
-*)
-
-val query_external_id_info : ?dynamic_import:bool -> Ident.t -> string -> Js_cmj_format.keyed_cmj_value
-(**
-   [query_external_id_info id pos env found]
-   will raise if not found
-*)
-
-val is_pure_module : Lam_module_ident.t -> bool
-
-val get_package_path_from_cmj :
-  Lam_module_ident.t -> string * Js_packages_info.t * Ext_js_file_kind.case
-
-(* The second argument is mostly from [runtime] modules
-    will change the input [hard_dependencies]
-    [populate_required_modules extra hard_dependencies]
-    [extra] maybe removed if it is pure and not in [hard_dependencies]
-*)
-val populate_required_modules :
-  Lam_module_ident.Hash_set.t -> Lam_module_ident.Hash_set.t -> unit
diff --git a/jscomp/core/lam_compile_external_call.ml b/jscomp/core/lam_compile_external_call.ml
deleted file mode 100644
index 77a982c..0000000
--- a/jscomp/core/lam_compile_external_call.ml
+++ /dev/null
@@ -1,414 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-[@@@warning "+9"]
-
-module E = Js_exp_make
-
-let splice_apply fn args =
-  E.runtime_call Js_runtime_modules.caml_splice_call "spliceApply"
-    [ fn; E.array Immutable args ]
-
-let splice_new_apply fn args =
-  E.runtime_call Js_runtime_modules.caml_splice_call "spliceNewApply"
-    [ fn; E.array Immutable args ]
-
-let splice_obj_apply obj name args =
-  E.runtime_call Js_runtime_modules.caml_splice_call "spliceObjApply"
-    [ obj; E.str name; E.array Immutable args ]
-
-(** 
-   [bind_name] is a hint to the compiler to generate 
-   better names for external module 
-*)
-(* let handle_external
-    ({bundle ; module_bind_name} : External_ffi_types.external_module_name)
-   : Ident.t * string
-   =
-   Lam_compile_env.add_js_module module_bind_name bundle ,
-   bundle *)
-
-let external_var
-   ({ bundle; module_bind_name; import_attributes } : External_ffi_types.external_module_name) ~dynamic_import =
-  let id = Lam_compile_env.add_js_module ?import_attributes module_bind_name bundle false ~dynamic_import in
-  E.external_var ?import_attributes ~external_name:bundle id
-
-(* let handle_external_opt
-    (module_name : External_ffi_types.external_module_name option)
-   : (Ident.t * string) option =
-   match module_name with
-   | Some module_name -> Some (handle_external module_name)
-   | None -> None
-*)
-
-type arg_expression = Js_of_lam_variant.arg_expression =
-  | Splice0
-  | Splice1 of E.t
-  | Splice2 of E.t * E.t
-
-let append_list x xs =
-  match x with
-  | Splice0 -> xs
-  | Splice1 a -> a :: xs
-  | Splice2 (a, b) -> a :: b :: xs
-
-(* The first return value is value, the second argument is side effect expressions
-    Only the [unit] with no label will be ignored
-    When  we are passing a boxed value to external(optional), we need
-    unbox it in the first place.
-
-    Note when optional value is not passed, the unboxed value would be
-    [undefined], with the combination of `[@int]` it would be still be
-    [undefined], this by default is still correct..
-   {[
-     (function () {
-          switch (undefined) {
-            case 97 :
-              return "a";
-            case 98 :
-              return "b";
-
-          }
-        }()) === undefined
-   ]}
-
-     This would not work with [NonNullString]
-*)
-let ocaml_to_js_eff ~(arg_label : External_arg_spec.label_noname)
-    ~(arg_type : External_arg_spec.attr) (raw_arg : E.t) :
-    arg_expression * E.t list =
-  let arg =
-    match arg_label with
-    | Arg_optional ->
-        Js_of_lam_option.get_default_undefined_from_optional raw_arg
-    | Arg_label | Arg_empty -> raw_arg
-  in
-  match arg_type with
-  | Arg_cst _ -> assert false
-  | Fn_uncurry_arity _ -> assert false
-  (* has to be preprocessed by {!Lam} module first *)
-  | Extern_unit ->
-      ( (if arg_label = Arg_empty then Splice0 else Splice1 E.unit),
-        if Js_analyzer.no_side_effect_expression arg then [] else [ arg ] )
-      (* leave up later to decide *)
-  | Ignore ->
-      ( Splice0,
-        if Js_analyzer.no_side_effect_expression arg then [] else [ arg ] )
-  | Poly_var_string { descr } -> (Splice1 (Js_of_lam_variant.eval arg descr), [])
-  | Poly_var { descr } -> (Js_of_lam_variant.eval_as_event arg descr, [])
-  (* FIXME: encode invariant below in the signature*)
-  (* length of 2
-     - the poly var tag
-     - the value
-  *)
-  | Int dispatches ->
-      (Splice1 (Js_of_lam_variant.eval_as_int arg dispatches), [])
-  | Unwrap ->
-      let single_arg =
-        match arg_label with
-        | Arg_optional ->
-            (*
-           If this is an optional arg (like `?arg`), we have to potentially do
-           2 levels of unwrapping:
-           - if ocaml arg is `None`, let js arg be `undefined` (no unwrapping)
-           - if ocaml arg is `Some x`, unwrap the arg to get the `x`, then
-             unwrap the `x` itself
-           - Here `Some x` is `x` due to the current encoding
-             Lets inline here since it depends on the runtime encoding
-        *)
-            Js_of_lam_option.option_unwrap raw_arg
-        | _ -> Js_of_lam_variant.eval_as_unwrap raw_arg
-      in
-      (Splice1 single_arg, [])
-  | Nothing -> (Splice1 arg, [])
-
-let empty_pair = ([], [])
-
-let add_eff eff e = match eff with None -> e | Some v -> E.seq v e
-
-type specs = External_arg_spec.params
-
-type exprs = E.t list
-
-let keep_non_undefined_args (arg_types : specs) (args : exprs) =
-  let rec has_undefined_trailing_args arg_types args =
-    match (arg_types, args) with
-    | ( [{External_arg_spec.arg_label = Arg_optional; _}],
-        [{J.expression_desc = Undefined {isUnit = false}; _}] ) ->
-      true
-    | ( _ :: arg_types_rest, _ :: args_rest ) ->
-      has_undefined_trailing_args arg_types_rest args_rest
-    | _ -> false
-  in
-  let rec aux arg_types args =
-    match (arg_types, args) with
-    | ( {External_arg_spec.arg_label = Arg_optional; _} :: arg_types_rest,
-        {J.expression_desc = Undefined {isUnit = false}; _} :: args_rest ) ->
-          aux arg_types_rest args_rest
-    | _ -> args
-  in
-  if (has_undefined_trailing_args arg_types args) then 
-    aux (List.rev arg_types) (List.rev args) |> List.rev
-  else args 
-
-(* TODO: fix splice,
-   we need a static guarantee that it is static array construct
-   otherwise, we should provide a good error message here,
-   no compiler failure here
-   Invariant : Array encoding
-   @return arguments and effect
-*)
-let assemble_args_no_splice (arg_types : specs) (args : exprs) :
-    exprs * E.t option =
-  let rec aux (labels : specs) (args : exprs) : exprs * exprs =
-    match (labels, args) with
-    | [], _ ->
-        assert (args = []);
-        empty_pair
-    | { arg_type = Arg_cst cst; _ } :: labels, args ->
-        (* can not be Optional *)
-        let accs, eff = aux labels args in
-        (Lam_compile_const.translate_arg_cst cst :: accs, eff)
-    | { arg_label; arg_type } :: labels, arg :: args ->
-        let accs, eff = aux labels args in
-        let acc, new_eff = ocaml_to_js_eff ~arg_label ~arg_type arg in
-        (append_list acc accs, Ext_list.append new_eff eff)
-    | _ :: _, [] -> assert false
-  in
-  let args, eff = aux arg_types args in
-  ( keep_non_undefined_args arg_types args,
-    match eff with
-    | [] -> None
-    | x :: xs ->
-        (* FIXME: the order of effects? *)
-        Some (E.fuse_to_seq x xs) )
-
-let assemble_args_has_splice (arg_types : specs) (args : exprs) :
-    exprs * E.t option * bool =
-  let dynamic = ref false in
-  let rec aux (labels : specs) (args : exprs) =
-    match (labels, args) with
-    | [], _ ->
-        assert (args = []);
-        empty_pair
-    | { arg_type = Arg_cst cst; _ } :: labels, args ->
-        let accs, eff = aux labels args in
-        (Lam_compile_const.translate_arg_cst cst :: accs, eff)
-    | { arg_label; arg_type } :: labels, arg :: args -> (
-        let accs, eff = aux labels args in
-        match (args, (arg : E.t)) with
-        | [], { expression_desc = Array (ls, _mutable_flag); _ } ->
-            (Ext_list.append ls accs, eff)
-        | _ ->
-            if args = [] then dynamic := true;
-            let acc, new_eff = ocaml_to_js_eff ~arg_type ~arg_label arg in
-            (append_list acc accs, Ext_list.append new_eff eff))
-    | _ :: _, [] -> assert false
-  in
-  let args, eff = aux arg_types args in
-  ( args,
-    (match eff with
-    | [] -> None
-    | x :: xs ->
-        (* FIXME: the order of effects? *)
-        Some (E.fuse_to_seq x xs)),
-    !dynamic )
-
-let translate_scoped_module_val
-    (module_name : External_ffi_types.external_module_name option) (fn : string)
-    (scopes : string list)
-    ~dynamic_import =
-  match module_name with
-  | Some { bundle; module_bind_name; import_attributes } -> (
-      match scopes with
-      | [] ->
-          let default = fn = "default" in
-          let id =
-            Lam_compile_env.add_js_module ?import_attributes module_bind_name bundle default ~dynamic_import
-          in
-          E.external_var_field ?import_attributes ~external_name:bundle ~field:fn ~default id
-      | x :: rest ->
-          (* TODO: what happens when scope contains "default" ?*)
-          let default = false in
-          let id =
-            Lam_compile_env.add_js_module ?import_attributes module_bind_name bundle default ~dynamic_import
-          in
-          let start =
-            E.external_var_field ?import_attributes ~external_name:bundle ~field:x ~default id
-          in
-          Ext_list.fold_left (Ext_list.append rest [ fn ]) start E.dot)
-  | None -> (
-      (*  no [@@module], assume it's global *)
-      match scopes with
-      | [] -> E.js_global fn
-      | x :: rest ->
-          let start = E.js_global x in
-          Ext_list.fold_left (Ext_list.append_one rest fn) start E.dot)
-
-let translate_scoped_access scopes obj =
-  match scopes with
-  | [] -> obj
-  | x :: xs -> Ext_list.fold_left xs (E.dot obj x) E.dot
-
-let translate_ffi (cxt : Lam_compile_context.t) arg_types
-    (ffi : External_ffi_types.external_spec) (args : J.expression list) ~dynamic_import =
-  match ffi with
-  | Js_call { external_module_name; name; splice: _; scopes; tagged_template = true } -> 
-      let fn = translate_scoped_module_val external_module_name name scopes ~dynamic_import in 
-      (match args with
-      | [ {expression_desc = Array (strings, _); _}; {expression_desc = Array (values, _); _} ] -> 
-        E.tagged_template fn strings values
-      | _ -> let args, eff, dynamic = assemble_args_has_splice arg_types args in
-        add_eff eff
-          (if dynamic then splice_apply fn args
-          else E.call ~info:{ arity = Full; call_info = Call_na } fn args))
-  | Js_call { external_module_name = module_name; name = fn; splice; scopes; tagged_template = false } ->
-      let fn = translate_scoped_module_val module_name fn scopes ~dynamic_import in
-      if splice then
-        let args, eff, dynamic = assemble_args_has_splice arg_types args in
-        add_eff eff
-          (if dynamic then splice_apply fn args
-          else E.call ~info:{ arity = Full; call_info = Call_na } fn args)
-      else
-        let args, eff = assemble_args_no_splice arg_types args in
-        add_eff eff
-        @@ E.call ~info:{ arity = Full; call_info = Call_na } fn args
-  | Js_module_as_fn { external_module_name; splice } ->
-      let fn = external_var external_module_name ~dynamic_import in
-      if splice then
-        let args, eff, dynamic = assemble_args_has_splice arg_types args in
-        (* TODO: fix in rest calling convention *)
-        add_eff eff
-          (if dynamic then splice_apply fn args
-          else E.call ~info:{ arity = Full; call_info = Call_na } fn args)
-      else
-        let args, eff = assemble_args_no_splice arg_types args in
-        (* TODO: fix in rest calling convention *)
-        add_eff eff (E.call ~info:{ arity = Full; call_info = Call_na } fn args)
-  | Js_new { external_module_name = module_name; name = fn; splice; scopes } ->
-      (* handle [@@new]*)
-      (* This has some side effect, it will
-         mark its identifier (If it has) as an object,
-         ATTENTION:
-         order also matters here, since we mark its jsobject property,
-         it  will affect the code gen later
-         TODO: we should propagate this property
-         as much as we can(in alias table)
-      *)
-      let mark () =
-        match cxt.continuation with
-         | Declare (_, id) | Assign id ->
-             (* Format.fprintf Format.err_formatter "%a@."Ident.print  id; *)
-             Ext_ident.make_js_object id
-        | EffectCall _ | NeedValue _ -> ()
-      in
-      if splice then
-        let args, eff, dynamic = assemble_args_has_splice arg_types args in
-        let fn = translate_scoped_module_val module_name fn scopes ~dynamic_import in
-        add_eff eff
-          (mark ();
-          if dynamic then splice_new_apply fn args
-          else E.new_ fn args)
-      else
-        let args, eff = assemble_args_no_splice arg_types args in
-        let fn = translate_scoped_module_val module_name fn scopes ~dynamic_import in
-        add_eff eff
-          (mark (); E.new_ fn args)
-  | Js_send { splice; name; js_send_scopes } -> (
-      match args with
-      | self :: args ->
-          (* PR2162 [self_type] more checks in syntax:
-             - should not be [@as] *)
-          let[@warning "-8"] (_self_type :: arg_types) = arg_types in
-          if splice then
-            let args, eff, dynamic = assemble_args_has_splice arg_types args in
-            add_eff eff
-              (let self = translate_scoped_access js_send_scopes self in
-               if dynamic then splice_obj_apply self name args
-               else
-                 E.call
-                   ~info:{ arity = Full; call_info = Call_na }
-                   (E.dot self name) args)
-          else
-            let args, eff = assemble_args_no_splice arg_types args in
-            add_eff eff
-              (let self = translate_scoped_access js_send_scopes self in
-               E.call
-                 ~info:{ arity = Full; call_info = Call_na }
-                 (E.dot self name) args)
-      | _ -> assert false)
-  | Js_module_as_var module_name -> external_var module_name ~dynamic_import
-  | Js_var { name; external_module_name; scopes } ->
-      (* TODO #11
-         1. check args -- error checking
-         2. support [@@scope "window"]
-         we need know whether we should call [add_js_module] or not
-      *)
-      translate_scoped_module_val external_module_name name scopes ~dynamic_import
-  | Js_module_as_class module_name ->
-      let fn = external_var module_name ~dynamic_import in
-      let args, eff = assemble_args_no_splice arg_types args in
-      (* TODO: fix in rest calling convention *)
-      add_eff eff
-        ((match cxt.continuation with
-         | Declare (_, id) | Assign id ->
-             (* Format.fprintf Format.err_formatter "%a@."Ident.print  id; *)
-             Ext_ident.make_js_object id
-         | EffectCall _ | NeedValue _ -> ());
-         E.new_ fn args)
-  | Js_get { js_get_name = name; js_get_scopes = scopes } -> (
-      let args, cur_eff = assemble_args_no_splice arg_types args in
-      add_eff cur_eff
-      @@
-      match args with
-      | [ obj ] ->
-          let obj = translate_scoped_access scopes obj in
-          E.dot obj name
-      | _ -> assert false
-      (* Note these assertion happens in call site *))
-  | Js_set { js_set_name = name; js_set_scopes = scopes } -> (
-      (* assert (js_splice = false) ;  *)
-      let args, cur_eff = assemble_args_no_splice arg_types args in
-      add_eff cur_eff
-      @@
-      match (args, arg_types) with
-      | [ obj; v ], _ ->
-          let obj = translate_scoped_access scopes obj in
-          E.assign (E.dot obj name) v
-      | _ -> assert false)
-  | Js_get_index { js_get_index_scopes = scopes } -> (
-      let args, cur_eff = assemble_args_no_splice arg_types args in
-      add_eff cur_eff
-      @@
-      match args with
-      | [ obj; v ] -> Js_arr.ref_array (translate_scoped_access scopes obj) v
-      | _ -> assert false)
-  | Js_set_index { js_set_index_scopes = scopes } -> (
-      let args, cur_eff = assemble_args_no_splice arg_types args in
-      add_eff cur_eff
-      @@
-      match args with
-      | [ obj; v; value ] ->
-          Js_arr.set_array (translate_scoped_access scopes obj) v value
-      | _ -> assert false)
diff --git a/jscomp/core/lam_compile_external_call.mli b/jscomp/core/lam_compile_external_call.mli
deleted file mode 100644
index e8c974f..0000000
--- a/jscomp/core/lam_compile_external_call.mli
+++ /dev/null
@@ -1,43 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val ocaml_to_js_eff :
-  arg_label:External_arg_spec.label_noname ->
-  arg_type:External_arg_spec.attr ->
-  J.expression ->
-  Js_of_lam_variant.arg_expression * J.expression list
-(** Compile ocaml external function call to JS IR. *)
-
-val translate_ffi :
-  Lam_compile_context.t ->
-  External_arg_spec.params ->
-  External_ffi_types.external_spec ->
-  J.expression list ->
-  dynamic_import:bool ->
-  J.expression
-
-(** TODO: document supported attributes
-    Attributes starting with `js` are reserved
-    examples: "variadic"
-*)
diff --git a/jscomp/core/lam_compile_external_obj.ml b/jscomp/core/lam_compile_external_obj.ml
deleted file mode 100644
index 8638e08..0000000
--- a/jscomp/core/lam_compile_external_obj.ml
+++ /dev/null
@@ -1,168 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-module S = Js_stmt_make
-
-(* Note: can potentially be inconsistent, sometimes
-   {[
-     { x : 3 , y : undefined}
-   ]}
-   and
-   {[
-     {x : 3 }
-   ]}
-   But the default to be undefined  seems reasonable
-*)
-
-(* TODO: check stackoverflow *)
-let assemble_obj_args (labels : External_arg_spec.obj_params)
-    (args : J.expression list) : J.block * J.expression =
-  let rec aux (labels : External_arg_spec.obj_params) args :
-      (Js_op.property_name * E.t) list * J.expression list * _ =
-    match (labels, args) with
-    | [], [] -> ([], [], [])
-    | ( {
-          obj_arg_label = Obj_label { name = label };
-          obj_arg_type = Arg_cst cst;
-        }
-        :: labels,
-        args ) ->
-        let accs, eff, assign = aux labels args in
-        ( (Js_op.Lit label, Lam_compile_const.translate_arg_cst cst) :: accs,
-          eff,
-          assign )
-    (* | {obj_arg_label = EmptyCst _ } :: rest  , args -> assert false  *)
-    | { obj_arg_label = Obj_empty } :: labels, arg :: args ->
-        (* unit type*)
-        let ((accs, eff, assign) as r) = aux labels args in
-        if Js_analyzer.no_side_effect_expression arg then r
-        else (accs, arg :: eff, assign)
-    | ( ({ obj_arg_label = Obj_label { name = label } } as arg_kind) :: labels,
-        arg :: args ) -> (
-        let accs, eff, assign = aux labels args in
-        let acc, new_eff =
-          Lam_compile_external_call.ocaml_to_js_eff ~arg_label:Arg_label
-            ~arg_type:arg_kind.obj_arg_type arg
-        in
-        match acc with
-        | Splice2 _ | Splice0 -> assert false
-        | Splice1 x ->
-            ((Js_op.Lit label, x) :: accs, Ext_list.append new_eff eff, assign)
-        (* evaluation order is undefined *))
-    | ( ({ obj_arg_label = Obj_optional { name = label }; obj_arg_type } as
-        arg_kind)
-        :: labels,
-        arg :: args ) ->
-        let ((accs, eff, assign) as r) = aux labels args in
-        Js_of_lam_option.destruct_optional arg ~for_sure_none:r
-          ~for_sure_some:(fun x ->
-            let acc, new_eff =
-              Lam_compile_external_call.ocaml_to_js_eff ~arg_label:Arg_label
-                ~arg_type:obj_arg_type x
-            in
-            match acc with
-            | Splice2 _ | Splice0 -> assert false
-            | Splice1 x ->
-                ( (Js_op.Lit label, x) :: accs,
-                  Ext_list.append new_eff eff,
-                  assign ))
-          ~not_sure:(fun _ -> (accs, eff, (arg_kind, arg) :: assign))
-    | { obj_arg_label = Obj_empty | Obj_label _ | Obj_optional _ } :: _, [] ->
-        assert false
-    | [], _ :: _ -> assert false
-  in
-  let map, eff, assignment = aux labels args in
-  match assignment with
-  | [] -> (
-      ( [],
-        match eff with
-        | [] -> E.obj map
-        | x :: xs -> E.seq (E.fuse_to_seq x xs) (E.obj map) ))
-  | _ ->
-      let v = Ext_ident.create_tmp () in
-      let var_v = E.var v in
-      ( S.define_variable ~kind:Variable v
-          (match eff with
-          | [] -> E.obj map
-          | x :: xs -> E.seq (E.fuse_to_seq x xs) (E.obj map))
-        :: Ext_list.flat_map assignment
-             (fun ((xlabel : External_arg_spec.obj_param), (arg : J.expression))
-             ->
-               match xlabel with
-               | {
-                obj_arg_label =
-                  Obj_optional { name = label; for_sure_no_nested_option };
-               } -> (
-                   (* Need make sure whether assignment is effectful or not
-                      to avoid code duplication
-                   *)
-                   match Js_ast_util.named_expression arg with
-                   | None -> (
-                       let acc, new_eff =
-                         Lam_compile_external_call.ocaml_to_js_eff
-                           ~arg_label:Arg_empty ~arg_type:xlabel.obj_arg_type
-                           (if for_sure_no_nested_option then arg
-                           else Js_of_lam_option.val_from_option arg)
-                       in
-                       match acc with
-                       | Splice1 v ->
-                           [
-                             S.if_
-                               (Js_of_lam_option.is_not_none arg)
-                               [
-                                 S.exp
-                                   (E.assign (E.dot var_v label)
-                                      (match new_eff with
-                                      | [] -> v
-                                      | x :: xs -> E.seq (E.fuse_to_seq x xs) v));
-                               ];
-                           ]
-                       | Splice0 | Splice2 _ -> assert false)
-                   | Some (st, id) -> (
-                       (* FIXME: see #2503 *)
-                       let arg = E.var id in
-                       let acc, new_eff =
-                         Lam_compile_external_call.ocaml_to_js_eff
-                           ~arg_label:Arg_empty ~arg_type:xlabel.obj_arg_type
-                           (if for_sure_no_nested_option then arg
-                           else Js_of_lam_option.val_from_option arg)
-                       in
-                       match acc with
-                       | Splice1 v ->
-                           [
-                             st;
-                             S.if_
-                               (Js_of_lam_option.is_not_none arg)
-                               [
-                                 S.exp
-                                   (E.assign (E.dot var_v label)
-                                      (match new_eff with
-                                      | [] -> v
-                                      | x :: xs -> E.seq (E.fuse_to_seq x xs) v));
-                               ];
-                           ]
-                       | Splice0 | Splice2 _ -> assert false))
-               | _ -> assert false),
-        var_v )
diff --git a/jscomp/core/lam_compile_external_obj.mli b/jscomp/core/lam_compile_external_obj.mli
deleted file mode 100644
index 2c91410..0000000
--- a/jscomp/core/lam_compile_external_obj.mli
+++ /dev/null
@@ -1,37 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Compile ocaml external function call to JS IR. *)
-
-(** 
-    This module define how the FFI (via `external`) works with attributes. 
-    Note it will route to {!Lam_compile_global} 
-    for compiling normal functions without attributes.
-*)
-
-val assemble_obj_args :
-  External_arg_spec.obj_params -> J.expression list -> J.block * J.expression
-(* It returns a block in cases we need set the property dynamically: we need
-   create a place holder assignment first and then set it accordingly
-*)
diff --git a/jscomp/core/lam_compile_main.ml b/jscomp/core/lam_compile_main.ml
deleted file mode 100644
index 2cc59ca..0000000
--- a/jscomp/core/lam_compile_main.ml
+++ /dev/null
@@ -1,338 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-
-
-
-
-
-
-
-(* module E = Js_exp_make  *)
-(* module S = Js_stmt_make   *)
-
-
-let compile_group output_prefix (meta : Lam_stats.t) 
-    (x : Lam_group.t) : Js_output.t  = 
-  match x with 
-  (* 
-        We need
-
-        2. [E.builtin_dot] for javascript builtin
-        3. [E.mldot]
-     *)
-  (* ATTENTION: check {!Lam_compile_global} for consistency  *)      
-  (* Special handling for values in [Pervasives] *)  
-  (* 
-         we delegate [stdout, stderr, and stdin] into [caml_io] module, 
-         the motivation is to help dead code eliminatiion, it's helpful 
-         to make those parts pure (not a function call), then it can be removed 
-         if unused 
-      *)                     
-
-  (* QUICK hack to make hello world example nicer,
-     Note the arity of [print_endline] is already analyzed before, 
-     so it should be safe
-  *)
-
-  | Single (kind, id, lam) -> 
-    (* let lam = Optimizer.simplify_lets [] lam in  *)
-    (* can not apply again, it's wrong USE it with care*)
-    (* ([Js_stmt_make.comment (Gen_of_env.query_type id  env )], None)  ++ *)
-    Lam_compile.compile_lambda ~output_prefix { continuation = Declare (kind, id);
-                                 jmp_table = Lam_compile_context.empty_handler_map;
-                                 meta
-                               } lam
-
-  | Recursive id_lams   -> 
-    Lam_compile.compile_recursive_lets ~output_prefix
-      { continuation = EffectCall Not_tail; 
-        jmp_table = Lam_compile_context.empty_handler_map;
-        meta
-      } 
-      id_lams
-  | Nop lam -> (* TODO: Side effect callls, log and see statistics *)
-    Lam_compile.compile_lambda ~output_prefix {continuation = EffectCall Not_tail;
-                                jmp_table = Lam_compile_context.empty_handler_map;
-                                meta
-                               } lam
-
-;;
-
-(** Also need analyze its depenency is pure or not *)
-let no_side_effects (rest : Lam_group.t list) : string option = 
-  Ext_list.find_opt rest (fun x -> 
-      match x with 
-      | Single(kind,id,body) -> 
-        begin 
-          match kind with 
-          | Strict | Variable -> 
-            if not @@ Lam_analysis.no_side_effects body 
-            then Some  (Printf.sprintf "%s" id.name)
-            else None
-          | _ -> None
-        end
-      | Recursive bindings -> 
-        Ext_list.find_opt  bindings (fun (id,lam) -> 
-            if not @@ Lam_analysis.no_side_effects lam 
-            then Some (Printf.sprintf "%s" id.Ident.name )
-            else None
-          )
-      | Nop lam -> 
-        if not @@ Lam_analysis.no_side_effects lam 
-        then 
-          (*  (Lam_util.string_of_lambda lam) *)
-          Some ""
-        else None (* TODO :*))
-
-
-let _d  = fun  s lam -> 
-#ifndef RELEASE
-    Lam_util.dump  s lam ;
-  Ext_log.dwarn ~__POS__ "START CHECKING PASS %s@." s;
-  ignore @@ Lam_check.check !Location.input_name lam;
-  Ext_log.dwarn ~__POS__ "FINISH CHECKING PASS %s@." s;
-#endif
-  lam
-
-let _j = Js_pass_debug.dump 
-
-(** Actually simplify_lets is kind of global optimization since it requires you to know whether 
-    it's used or not 
-*)
-let compile  
-    (output_prefix : string)
-    export_idents
-    (lam : Lambda.lambda)  = 
-  let export_ident_sets = Set_ident.of_list export_idents in 
-  (* To make toplevel happy - reentrant for js-demo *)
-  let () = 
-#ifndef RELEASE
-      Ext_list.iter export_idents 
-      (fun id -> Ext_log.dwarn ~__POS__ "export idents: %s/%d"  id.name id.stamp) ;
-#endif      
-    Lam_compile_env.reset () ;
-  in 
-  let lam, may_required_modules = Lam_convert.convert export_ident_sets lam in 
-
-
-  let lam = _d "initial"  lam in
-  let lam  = Lam_pass_deep_flatten.deep_flatten lam in
-  let lam = _d  "flatten0" lam in
-  let meta  : Lam_stats.t = 
-    Lam_stats.make 
-      ~export_idents
-      ~export_ident_sets in 
-  let () = Lam_pass_collect.collect_info meta lam in 
-  let lam = 
-    let lam =  
-      lam
-      |> _d "flattern1"
-      |>  Lam_pass_exits.simplify_exits
-      |> _d "simplyf_exits"
-      |> (fun lam -> Lam_pass_collect.collect_info meta lam; 
-#ifndef RELEASE      
-      let () = 
-        Ext_log.dwarn ~__POS__ "Before simplify_alias: %a@." Lam_stats.print meta in       
-#endif      
-      lam)
-      |>  Lam_pass_remove_alias.simplify_alias  meta
-      |> _d "simplify_alias"
-      |> Lam_pass_deep_flatten.deep_flatten
-      |> _d  "flatten2"
-    in  (* Inling happens*)
-
-    let ()  = Lam_pass_collect.collect_info meta lam in
-    let lam = Lam_pass_remove_alias.simplify_alias meta lam  in
-    let lam = Lam_pass_deep_flatten.deep_flatten lam in
-    let ()  = Lam_pass_collect.collect_info meta lam in
-    let lam = 
-      lam
-      |> _d "alpha_before"
-      |> Lam_pass_alpha_conversion.alpha_conversion meta
-      |> _d "alpha_after"
-      |> Lam_pass_exits.simplify_exits in    
-    let () = Lam_pass_collect.collect_info meta lam in
-
-
-    lam
-    |> _d "simplify_alias_before"
-    |>  Lam_pass_remove_alias.simplify_alias meta 
-    |> _d "alpha_conversion"
-    |>  Lam_pass_alpha_conversion.alpha_conversion meta
-    |> _d  "before-simplify_lets"
-    (* we should investigate a better way to put different passes : )*)
-    |> Lam_pass_lets_dce.simplify_lets 
-
-    |> _d "before-simplify-exits"
-    (* |> (fun lam -> Lam_pass_collect.collect_info meta lam 
-       ; Lam_pass_remove_alias.simplify_alias meta lam) *)
-    (* |> Lam_group_pass.scc_pass
-       |> _d "scc" *)
-    |> Lam_pass_exits.simplify_exits
-    |> _d "simplify_lets"
-#ifndef RELEASE
-    |> (fun lam -> 
-        let () = 
-          Ext_log.dwarn ~__POS__ "Before coercion: %a@." Lam_stats.print meta in 
-        Lam_check.check !Location.input_name lam
-      ) 
-#endif    
-  in
-
-  let ({Lam_coercion.groups = groups } as coerced_input , meta) = 
-    Lam_coercion.coerce_and_group_big_lambda  meta lam
-  in 
-
-#ifndef RELEASE
-let () =
-  Ext_log.dwarn ~__POS__ "After coercion: %a@." Lam_stats.print meta ;
-  if !Js_config.diagnose then
-    let f =
-      Ext_filename.new_extension !Location.input_name  ".lambda" in
-    Ext_fmt.with_file_as_pp f begin fun fmt ->
-      Format.pp_print_list ~pp_sep:Format.pp_print_newline
-        Lam_group.pp_group  fmt (coerced_input.groups) 
-    end;
-in
-#endif  
-let maybe_pure = no_side_effects groups in
-#ifndef RELEASE
-let () = Ext_log.dwarn ~__POS__ "\n@[[TIME:]Pre-compile: %f@]@."  (Sys.time () *. 1000.) in      
-#endif  
-let body  =     
-  Ext_list.map groups (fun group -> compile_group output_prefix meta group)
-  |> Js_output.concat
-  |> Js_output.output_as_block
-in
-#ifndef RELEASE
-let () = Ext_log.dwarn ~__POS__ "\n@[[TIME:]Post-compile: %f@]@."  (Sys.time () *. 1000.) in      
-#endif    
-(* The file is not big at all compared with [cmo] *)
-(* Ext_marshal.to_file (Ext_path.chop_extension filename ^ ".mj")  js; *)
-let meta_exports = meta.exports in 
-let export_set = Set_ident.of_list meta_exports in 
-let js : J.program = 
-  { 
-    exports = meta_exports ; 
-    export_set; 
-    block = body}
-in
-js 
-|> _j "initial"
-|> Js_pass_flatten.program
-|> _j "flattern"
-|> Js_pass_tailcall_inline.tailcall_inline
-|> _j "inline_and_shake"
-|> Js_pass_flatten_and_mark_dead.program
-|> _j "flatten_and_mark_dead"
-(* |> Js_inline_and_eliminate.inline_and_shake *)
-(* |> _j "inline_and_shake" *)
-|> (fun js -> ignore @@ Js_pass_scope.program  js ; js )
-|> Js_shake.shake_program
-|> _j "shake"
-|> ( fun (program:  J.program) -> 
-    let external_module_ids : Lam_module_ident.t list = 
-      if !Js_config.all_module_aliases then []
-      else
-        let hard_deps = 
-          Js_fold_basic.calculate_hard_dependencies program.block in  
-        Lam_compile_env.populate_required_modules  
-          may_required_modules hard_deps ;        
-        Ext_list.sort_via_array (Lam_module_ident.Hash_set.to_list hard_deps)
-          (fun id1 id2 ->
-             Ext_string.compare (Lam_module_ident.name id1) (Lam_module_ident.name id2)
-          ) 
-    in
-    Warnings.check_fatal();
-    let effect = 
-      Lam_stats_export.get_dependent_module_effect
-        maybe_pure external_module_ids in 
-    let v : Js_cmj_format.t = 
-      Lam_stats_export.export_to_cmj 
-        meta  
-        effect 
-        coerced_input.export_map          
-        (if Ext_char.is_lower_case (Filename.basename output_prefix).[0] then Little else Upper)
-    in
-    (if not !Clflags.dont_write_files then
-       Js_cmj_format.to_file 
-         ~check_exists:(not !Js_config.force_cmj)
-         (output_prefix ^ Literals.suffix_cmj) v);
-    {J.program = program ; side_effect = effect ; modules = external_module_ids }      
-  )
-;;
-
-let (//) = Filename.concat  
-
-let lambda_as_module 
-    (lambda_output : J.deps_program)
-    (output_prefix : string)
-  : unit = 
-  let package_info = Js_packages_state.get_packages_info () in 
-  if Js_packages_info.is_empty package_info && !Js_config.js_stdout then begin    
-    Js_dump_program.dump_deps_program ~output_prefix Commonjs (lambda_output) stdout
-  end else
-    Js_packages_info.iter package_info (fun {module_system; path; suffix} -> 
-        let output_chan chan  = 
-          Js_dump_program.dump_deps_program ~output_prefix
-            module_system 
-            (lambda_output)
-            chan in
-        let basename =  
-          Ext_namespace.change_ext_ns_suffix (Filename.basename output_prefix) suffix
-        in
-        let target_file = 
-          (Lazy.force Ext_path.package_dir //
-           path //
-           basename
-           (* #913 only generate little-case js file *)
-          ) in     
-        (if not !Clflags.dont_write_files then 
-           Ext_pervasives.with_file_as_chan
-             target_file output_chan );
-        if !Warnings.has_warnings  then begin 
-          Warnings.has_warnings := false ;
-#ifndef BROWSER
-          (* 5206: When there were warnings found during the compilation, we want the file
-             to be rebuilt on the next "rescript build" so that the warnings keep being shown.
-             Set the timestamp of the ast file to 1970-01-01 to make this rebuild happen.
-             (Do *not* set the timestamp of the JS output file instead
-             as that does not play well with every bundler.) *)
-          let ast_file = output_prefix ^ Literals.suffix_ast in
-          if Sys.file_exists ast_file then begin 
-            Bs_hash_stubs.set_as_old_file ast_file
-          end          
-#endif          
-        end             
-      )
-
-
-
-(* We can use {!Env.current_unit = "Pervasives"} to tell if it is some specific module, 
-    We need handle some definitions in standard libraries in a special way, most are io specific, 
-    includes {!Pervasives.stdin, Pervasives.stdout, Pervasives.stderr}
-
-    However, use filename instead of {!Env.current_unit} is more honest, since node-js module system is coupled with the file name 
-*)
diff --git a/jscomp/core/lam_compile_main.mli b/jscomp/core/lam_compile_main.mli
deleted file mode 100644
index fcd298c..0000000
--- a/jscomp/core/lam_compile_main.mli
+++ /dev/null
@@ -1,35 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** ReScript entry point in the OCaml compiler *)
-
-(** Compile and register the hook of function to compile  a lambda to JS IR 
-*)
-
-val compile : string -> Ident.t list -> Lambda.lambda -> J.deps_program
-(** For toplevel, [filename] is [""] which is the same as
-    {!Env.get_unit_name ()}
-*)
-
-val lambda_as_module : J.deps_program -> string -> unit
diff --git a/jscomp/core/lam_compile_primitive.ml b/jscomp/core/lam_compile_primitive.ml
deleted file mode 100644
index f78c5de..0000000
--- a/jscomp/core/lam_compile_primitive.ml
+++ /dev/null
@@ -1,406 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-
-(* If it is the return value, since it is a side-effect call,
-   we return unit, otherwise just return it
-*)
-let ensure_value_unit (st : Lam_compile_context.continuation) e : E.t =
-  match st with
-  | EffectCall (Maybe_tail_is_return _)
-  | NeedValue (Maybe_tail_is_return _)
-  | Assign _ | Declare _ | NeedValue _ ->
-      E.seq e E.unit
-  | EffectCall Not_tail -> e
-(* NeedValue should return a meaningful expression*)
-
-let module_of_expression = function
-  | J.Var (J.Qualified (module_id, value)) -> [ (module_id, value) ]
-  | _ -> []
-
-let get_module_system () =
-    let package_info = Js_packages_state.get_packages_info () in
-    let module_system =
-        if Js_packages_info.is_empty package_info && !Js_config.js_stdout then
-            [Ext_module_system.Commonjs]
-        else Js_packages_info.map package_info (fun {module_system} -> module_system)
-    in
-    match module_system with
-    | [module_system] -> module_system
-    | _ -> Commonjs
-
-let import_of_path path =
-  E.call
-    ~info:{ arity = Full; call_info = Call_na }
-    (E.js_global "import")
-    [ E.str path ]
-
-let wrap_then import value =
-  let arg = Ident.create "m" in
-  E.call
-    ~info:{ arity = Full; call_info = Call_na }
-    (E.dot import "then")
-    [
-      E.ocaml_fun ~return_unit:false ~async:false ~oneUnitArg:false  [ arg ]
-        [
-          {
-            statement_desc = J.Return (E.dot (E.var arg) value);
-            comment = None;
-          };
-        ];
-    ]
-
-let translate output_prefix loc (cxt : Lam_compile_context.t)
-    (prim : Lam_primitive.t) (args : J.expression list) : J.expression =
-  match prim with
-  | Pis_not_none -> Js_of_lam_option.is_not_none (Ext_list.singleton_exn args)
-  | Pcreate_extension s -> E.make_exception s
-  | Pwrap_exn ->
-      E.runtime_call Js_runtime_modules.caml_js_exceptions
-        "internalToOCamlException" args
-  | Praw_js_code { code; code_info } -> E.raw_js_code code_info code
-  (* FIXME: save one allocation
-     trim can not be done before syntax checking
-     otherwise location is incorrect
-  *)
-  | Pjs_runtime_apply -> (
-      match args with [ f; args ] -> E.flat_call f args | _ -> assert false)
-  | Pjs_apply -> (
-      match args with
-      | fn :: rest -> E.call ~info:{ arity = Full; call_info = Call_na } fn rest
-      | _ -> assert false)
-  | Pnull_to_opt -> (
-      match args with
-      | [ e ] -> (
-          match e.expression_desc with
-          | Var _ | Undefined _ | Null -> Js_of_lam_option.null_to_opt e
-          | _ -> E.runtime_call Js_runtime_modules.option "null_to_opt" args)
-      | _ -> assert false)
-  | Pundefined_to_opt -> (
-      match args with
-      | [ e ] -> (
-          match e.expression_desc with
-          | Var _ | Undefined _ | Null -> Js_of_lam_option.undef_to_opt e
-          | _ ->
-              E.runtime_call Js_runtime_modules.option "undefined_to_opt" args)
-      | _ -> assert false)
-  | Pnull_undefined_to_opt -> (
-      match args with
-      | [ e ] -> (
-          match e.expression_desc with
-          | Var _ | Undefined _ | Null -> Js_of_lam_option.null_undef_to_opt e
-          | _ -> E.runtime_call Js_runtime_modules.option "nullable_to_opt" args
-          )
-      | _ -> assert false)
-  (* Compile #import: The module argument for dynamic import is represented as a path,
-     and the module value is expressed through wrapping it with promise.then *)
-  | Pimport -> (
-      match args with
-      | [ e ] -> (
-          let output_dir = Filename.dirname output_prefix in
-
-          let module_id, module_value =
-            match module_of_expression e.expression_desc with
-            | [ module_ ] -> module_
-            | _ -> Location.raise_errorf ~loc
-                "Invalid argument: Dynamic import requires a module or module value that is a file as argument. Passing a value or local module is not allowed."
-          in
-
-          let path =
-            let module_system = get_module_system () in
-            Js_name_of_module_id.string_of_module_id {module_id with dynamic_import = true} ~output_dir module_system
-          in
-
-          match module_value with
-          | Some value -> wrap_then (import_of_path path) value
-          | None -> import_of_path path)
-      | [] | _ ->
-          Location.raise_errorf ~loc
-            "Invalid argument: Dynamic import must take a single module or module value as its argument.")
-  | Pjs_function_length -> E.function_length (Ext_list.singleton_exn args)
-  | Pcaml_obj_length -> E.obj_length (Ext_list.singleton_exn args)
-  | Pis_null -> E.is_null (Ext_list.singleton_exn args)
-  | Pis_undefined -> E.is_undef (Ext_list.singleton_exn args)
-  | Pis_null_undefined -> E.is_null_undefined (Ext_list.singleton_exn args)
-  | Pjs_typeof -> E.typeof (Ext_list.singleton_exn args)
-  | Pjs_unsafe_downgrade _ | Pdebugger | Pvoid_run | Pfull_apply | Pjs_fn_make _ | Pjs_fn_make_unit
-    ->
-      assert false (* already handled by {!Lam_compile} *)
-  | Pjs_fn_method -> assert false
-  | Pstringadd -> (
-      match args with [ a; b ] -> E.string_append a b | _ -> assert false)
-  | Pinit_mod -> E.runtime_call Js_runtime_modules.module_ "init_mod" args
-  | Pupdate_mod -> E.runtime_call Js_runtime_modules.module_ "update_mod" args
-  | Psome -> (
-      let arg = Ext_list.singleton_exn args in
-      match arg.expression_desc with
-      | Null | Object _ | Number _ | Caml_block _ | Array _ | Str _ ->
-          (* This makes sense when type info
-             is not available at the definition
-             site, and inline recovered it
-          *)
-          E.optional_not_nest_block arg
-      | _ -> E.optional_block arg)
-  | Psome_not_nest -> E.optional_not_nest_block (Ext_list.singleton_exn args)
-  | Pmakeblock (tag, tag_info, mutable_flag) ->
-      (* RUNTIME *)
-      Js_of_lam_block.make_block
-        (Js_op_util.of_lam_mutable_flag mutable_flag)
-        tag_info (E.small_int tag) args
-  | Pval_from_option ->
-      Js_of_lam_option.val_from_option (Ext_list.singleton_exn args)
-  | Pval_from_option_not_nest -> Ext_list.singleton_exn args
-  | Pfield (i, fld_info) ->
-      Js_of_lam_block.field fld_info
-        (Ext_list.singleton_exn args)
-        (Int32.of_int i)
-  (* Invariant depends on runtime *)
-  (* Negate boxed int *)
-  | Pnegint ->
-      (* #977 *)
-      E.int32_minus E.zero_int_literal (Ext_list.singleton_exn args)
-  | Pnegint64 -> Js_long.neg args
-  | Pnegfloat -> E.float_minus E.zero_float_lit (Ext_list.singleton_exn args)
-  | Pnegbigint -> E.bigint_op Minus E.zero_bigint_literal (Ext_list.singleton_exn args)
-  (* Negate boxed int end*)
-  (* Int addition and subtraction *)
-  | Paddint -> (
-      match args with [ e1; e2 ] -> E.int32_add e1 e2 | _ -> assert false)
-  | Paddint64 -> Js_long.add args
-  | Paddfloat -> (
-      match args with [ e1; e2 ] -> E.float_add e1 e2 | _ -> assert false)
-  | Paddbigint -> (
-    match args with [ e1; e2 ] -> E.bigint_op Plus e1 e2 | _ -> assert false)
-  | Psubint -> (
-      match args with [ e1; e2 ] -> E.int32_minus e1 e2 | _ -> assert false)
-  | Psubint64 -> Js_long.sub args
-  | Psubfloat -> (
-      match args with [ e1; e2 ] -> E.float_minus e1 e2 | _ -> assert false)
-  | Psubbigint -> (
-      match args with [ e1; e2 ] -> E.bigint_op Minus e1 e2 | _ -> assert false)
-  | Pmulint -> (
-      match args with [ e1; e2 ] -> E.int32_mul e1 e2 | _ -> assert false)
-  | Pmulint64 -> Js_long.mul args
-  | Pmulfloat -> (
-      match args with [ e1; e2 ] -> E.float_mul e1 e2 | _ -> assert false)
-  | Pmulbigint -> (
-      match args with [ e1; e2 ] -> E.bigint_op Mul e1 e2 | _ -> assert false)
-  | Pdivfloat -> (
-      match args with [ e1; e2 ] -> E.float_div e1 e2 | _ -> assert false)
-  | Pdivint -> (
-      match args with
-      | [ e1; e2 ] -> E.int32_div ~checked:!Js_config.check_div_by_zero e1 e2
-      | _ -> assert false)
-  | Pdivint64 -> Js_long.div args
-  | Pdivbigint -> (
-      match args with
-      | [ e1; e2 ] -> E.bigint_div ~checked:!Js_config.check_div_by_zero e1 e2
-      | _ -> assert false)
-  | Pmodint -> (
-      match args with
-      | [ e1; e2 ] -> E.int32_mod ~checked:!Js_config.check_div_by_zero e1 e2
-      | _ -> assert false)
-  | Pmodint64 -> Js_long.mod_ args
-  | Pmodbigint -> (
-      match args with
-      | [ e1; e2 ] -> E.bigint_mod ~checked:!Js_config.check_div_by_zero e1 e2
-      | _ -> assert false)
-  | Ppowbigint -> (match args with [ e1; e2 ] -> E.bigint_op Pow e1 e2 | _ -> assert false)
-  | Plslint -> (
-      match args with [ e1; e2 ] -> E.int32_lsl e1 e2 | _ -> assert false)
-  | Plslint64 -> Js_long.lsl_ args
-  | Plslbigint -> (
-      match args with [ e1; e2 ] -> E.bigint_op Lsl e1 e2 | _ -> assert false)
-  | Plsrint -> (
-      match args with
-      | [ e1; { J.expression_desc = Number (Int { i = 0l; _ } | Uint 0l); _ } ]
-        ->
-          e1
-      | [ e1; e2 ] -> E.to_int32 @@ E.int32_lsr e1 e2
-      | _ -> assert false)
-  | Plsrint64 -> Js_long.lsr_ args
-  | Pasrint -> (
-      match args with [ e1; e2 ] -> E.int32_asr e1 e2 | _ -> assert false)
-  | Pasrint64 -> Js_long.asr_ args
-  | Pasrbigint -> (
-      match args with [ e1; e2 ] -> E.bigint_op Asr e1 e2 | _ -> assert false)
-  | Pandint -> (
-      match args with [ e1; e2 ] -> E.int32_band e1 e2 | _ -> assert false)
-  | Pandint64 -> Js_long.and_ args
-  | Pandbigint -> (
-      match args with [ e1; e2 ] -> E.bigint_op Band e1 e2 | _ -> assert false)
-  | Porint -> (
-      match args with [ e1; e2 ] -> E.int32_bor e1 e2 | _ -> assert false)
-  | Porint64 -> Js_long.or_ args
-  | Porbigint -> (
-      match args with [ e1; e2 ] -> E.bigint_op Bor e1 e2 | _ -> assert false)
-  | Pxorint -> (
-      match args with [ e1; e2 ] -> E.int32_bxor e1 e2 | _ -> assert false)
-  | Pxorint64 -> Js_long.xor args
-  | Pxorbigint -> (
-      match args with [ e1; e2 ] -> E.bigint_op Bxor e1 e2 | _ -> assert false)
-  | Pjscomp cmp -> (
-      match args with [ l; r ] -> E.js_comp cmp l r | _ -> assert false)
-  | Pfloatcomp cmp | Pintcomp cmp -> (
-      (* Global Builtin Exception is an int, like
-         [Not_found] or [Invalid_argument] ?
-      *)
-      match args with [ e1; e2 ] -> E.int_comp cmp e1 e2 | _ -> assert false)
-  | Pbigintcomp cmp -> (
-      match args with [ e1; e2 ] -> E.bigint_comp cmp e1 e2 | _ -> assert false)
-  (* List --> stamp = 0
-     Assert_false --> stamp = 26
-  *)
-  | Pint64comp cmp -> Js_long.comp cmp args
-  | Pintoffloat -> (
-      match args with [ e ] -> E.to_int32 e | _ -> assert false)
-  | Pint64ofint -> Js_long.of_int32 args
-  | Pfloatofint -> Ext_list.singleton_exn args
-  | Pintofint64 -> Js_long.to_int32 args
-  | Pnot -> E.not (Ext_list.singleton_exn args)
-  | Poffsetint n -> E.offset (Ext_list.singleton_exn args) n
-  | Poffsetref n ->
-      let v =
-        Js_of_lam_block.field Lambda.ref_field_info
-          (Ext_list.singleton_exn args)
-          0l
-      in
-      E.seq (E.assign v (E.offset v n)) E.unit
-  | Psequand -> (
-      (* TODO: rhs is possibly a tail call *)
-      match args with [ e1; e2 ] -> E.and_ e1 e2 | _ -> assert false)
-  | Psequor -> (
-      (* TODO: rhs is possibly a tail call *)
-      match args with [ e1; e2 ] -> E.or_ e1 e2 | _ -> assert false)
-  | Pisout off -> (
-      match args with
-      (* predicate: [x > range  or x < 0 ]
-         can be simplified if x is positive , x > range
-         if x is negative, fine, its uint is for sure larger than range,
-         the output is not readable, we might change it back.
-
-         Note that if range is small like [1], then the negative of
-         it can be more precise (given integer)
-         a normal case of the compiler is  that it will do a shift
-         in the first step [ (x - 1) > 1 or ( x - 1 ) < 0 ]
-      *)
-      | [ range; e ] -> E.is_out (E.offset e off) range
-      | _ -> assert false)
-  | Pbytes_to_string ->
-      Js_of_lam_string.bytes_to_string (Ext_list.singleton_exn args)
-  | Pstringlength -> E.string_length (Ext_list.singleton_exn args)
-  | Pbyteslength -> E.bytes_length (Ext_list.singleton_exn args)
-  (* This should only be Pbyteset(u|s), which in js, is an int array
-     Bytes is an int array in javascript
-  *)
-  | Pbytessetu -> (
-      match args with
-      | [ e; e0; e1 ] ->
-          ensure_value_unit cxt.continuation (Js_of_lam_string.set_byte e e0 e1)
-      | _ -> assert false)
-  | Pbytessets -> E.runtime_call Js_runtime_modules.bytes "set" args
-  | Pbytesrefu -> (
-      match args with
-      | [ e; e1 ] -> Js_of_lam_string.ref_byte e e1
-      | _ -> assert false)
-  | Pbytesrefs -> E.runtime_call Js_runtime_modules.bytes "get" args
-  | Pstringrefs -> E.runtime_call Js_runtime_modules.string "get" args
-  (* For bytes and string, they both return [int] in ocaml
-      we need tell Pbyteref from Pstringref
-      1. Pbyteref -> a[i]
-      2. Pstringref -> a.charCodeAt (a[i] is wrong)
-  *)
-  | Pstringrefu -> (
-      match args with
-      | [ e; e1 ] -> Js_of_lam_string.ref_string e e1
-      | _ -> assert false)
-  (* only when Lapply -> expand = true*)
-  | Praise -> assert false (* handled before here *)
-  (* Runtime encoding relevant *)
-  | Parraylength -> E.array_length (Ext_list.singleton_exn args)
-  | Psetfield (i, field_info) -> (
-      match args with
-      | [ e0; e1 ] ->
-          (* RUNTIME *)
-          ensure_value_unit cxt.continuation
-            (Js_of_lam_block.set_field field_info e0 (Int32.of_int i) e1)
-      (*TODO: get rid of [E.unit ()]*)
-      | _ -> assert false)
-  | Parrayrefu -> (
-      match args with
-      | [ e; e1 ] -> Js_of_lam_array.ref_array e e1 (* Todo: Constant Folding *)
-      | _ -> assert false)
-  | Parrayrefs -> E.runtime_call Js_runtime_modules.array "get" args
-  | Parraysets -> E.runtime_call Js_runtime_modules.array "set" args
-  | Pmakearray -> Js_of_lam_array.make_array Mutable args
-  | Parraysetu -> (
-      match args with
-      (* wrong*)
-      | [ e; e0; e1 ] ->
-          ensure_value_unit cxt.continuation (Js_of_lam_array.set_array e e0 e1)
-      | _ -> assert false)
-  | Pccall prim -> Lam_dispatch_primitive.translate loc prim.prim_name args
-  (* Lam_compile_external_call.translate loc cxt prim args *)
-  (* Test if the argument is a block or an immediate integer *)
-  | Pjs_object_create _ -> assert false
-  | Pjs_call { arg_types; ffi; dynamic_import } ->
-      Lam_compile_external_call.translate_ffi cxt arg_types ffi args ~dynamic_import
-  (* FIXME, this can be removed later *)
-  | Pisint -> E.is_type_number (Ext_list.singleton_exn args)
-  | Pis_poly_var_block -> E.is_type_object (Ext_list.singleton_exn args)
-  | Pctconst ct -> (
-      match ct with
-      | Big_endian -> E.bool Sys.big_endian
-      | Ostype -> E.runtime_call Js_runtime_modules.sys "os_type" args
-      | Ostype_unix ->
-          E.string_equal
-            (E.runtime_call Js_runtime_modules.sys "os_type" args)
-            (E.str "Unix")
-      | Ostype_win32 ->
-          E.string_equal
-            (E.runtime_call Js_runtime_modules.sys "os_type" args)
-            (E.str "Win32")
-      (* | Max_wosize ->
-         (* max_array_length*)
-         E.int 2147483647l (* 2 ^ 31 - 1 *) *)
-      (* 4_294_967_295l  not representable*)
-      (* 2 ^ 32 - 1*)
-      | Backend_type ->
-          E.make_block E.zero_int_literal
-            (Blk_constructor { name = "Other"; num_nonconst = 1; tag = 0; attrs = [] })
-            [ E.str "BS" ] Immutable)
-  | Pduprecord -> Lam_dispatch_primitive.translate loc "?obj_dup" args
-  | Plazyforce
-  (* FIXME: we don't inline lazy force or at least
-     let buckle handle it
-  *)
-  (* let parm = Ident.create "prim" in
-     Lfunction(Curried, [parm],
-               Matching.inline_lazy_force (Lvar parm) Location.none)
-     It is inlined, this should not appear here *) ->
-      (*we dont use [throw] here, since [throw] is an statement  *)
-      let s = Lam_print.primitive_to_string prim in
-      Bs_warnings.warn_missing_primitive loc s;
-      E.resolve_and_apply s args
diff --git a/jscomp/core/lam_compile_primitive.mli b/jscomp/core/lam_compile_primitive.mli
deleted file mode 100644
index b507f63..0000000
--- a/jscomp/core/lam_compile_primitive.mli
+++ /dev/null
@@ -1,37 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Primitive compilation  *)
-
-(* The entry point of compile primitives
-   Note it will call {!Lam_compile_external_call.translate} for c stubs compilation
-*)
-
-val translate :
-  string ->
-  Location.t ->
-  Lam_compile_context.t ->
-  Lam_primitive.t ->
-  J.expression list ->
-  J.expression
diff --git a/jscomp/core/lam_compile_util.ml b/jscomp/core/lam_compile_util.ml
deleted file mode 100644
index e86e3f5..0000000
--- a/jscomp/core/lam_compile_util.ml
+++ /dev/null
@@ -1,32 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let jsop_of_comp (cmp : Lam_compat.comparison) : Js_op.binop =
-  match cmp with
-  | Ceq -> EqEqEq (* comparison*)
-  | Cneq -> NotEqEq
-  | Clt -> Lt
-  | Cgt -> Gt
-  | Cle -> Le
-  | Cge -> Ge
diff --git a/jscomp/core/lam_compile_util.mli b/jscomp/core/lam_compile_util.mli
deleted file mode 100644
index 2d1f091..0000000
--- a/jscomp/core/lam_compile_util.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Some utilities for lambda compilation*)
-
-val jsop_of_comp : Lam_compat.comparison -> Js_op.binop
diff --git a/jscomp/core/lam_constant_convert.ml b/jscomp/core/lam_constant_convert.ml
deleted file mode 100644
index 360eb55..0000000
--- a/jscomp/core/lam_constant_convert.ml
+++ /dev/null
@@ -1,86 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let rec convert_constant (const : Lambda.structured_constant) : Lam_constant.t =
-  match const with
-  | Const_base (Const_int i) -> Const_int { i = Int32.of_int i; comment = None }
-  | Const_base (Const_char i) -> Const_char i
-  | Const_base (Const_string (s, opt)) ->
-      let unicode =
-        match opt with
-        | Some opt -> Ast_utf8_string_interp.is_unicode_string opt
-        | _ -> false
-      in
-      Const_string { s; unicode }
-  | Const_base (Const_float i) -> Const_float i
-  | Const_base (Const_int32 i) -> Const_int { i; comment = None }
-  | Const_base (Const_int64 i) -> Const_int64 i
-  | Const_base (Const_bigint (sign, i)) -> Const_bigint (sign, i)
-  | Const_pointer (0, Pt_constructor { name = "()"; const = 1; non_const = 0 })
-    ->
-      Const_js_undefined {isUnit = true}
-  | Const_false -> Const_js_false
-  | Const_true -> Const_js_true
-  | Const_pointer (i, p) -> (
-      match p with
-      | Pt_module_alias -> Const_module_alias
-      | Pt_shape_none -> Lam_constant.lam_none
-      | Pt_assertfalse ->
-          Const_int { i = Int32.of_int i; comment = Pt_assertfalse }
-      | Pt_constructor { name; const; non_const; attrs } ->
-          let tag_type = Ast_untagged_variants.process_tag_type attrs in
-          Const_int
-            {
-              i = Int32.of_int i;
-              comment = Pt_constructor { cstr_name={name; tag_type}; const; non_const };
-            }
-      | Pt_variant { name } ->
-          if Ext_string.is_valid_hash_number name then
-            Const_int
-              { i = Ext_string.hash_number_as_i32_exn name; comment = None }
-          else Const_pointer name)
-  | Const_float_array s -> Const_float_array s
-  | Const_immstring s -> Const_string { s; unicode = false }
-  | Const_block (t, xs) -> (
-      let tag = Lambda.tag_of_tag_info t in
-      match t with
-      | Blk_some_not_nested ->
-          Const_some (convert_constant (Ext_list.singleton_exn xs))
-      | Blk_some -> Const_some (convert_constant (Ext_list.singleton_exn xs))
-      | Blk_constructor _ | Blk_tuple | Blk_record _ | Blk_module _
-      | Blk_module_export _ | Blk_extension | Blk_record_inlined _
-      | Blk_record_ext _ ->
-          Const_block (tag, t, Ext_list.map xs convert_constant)
-      | Blk_poly_var s -> (
-          match xs with
-          | [ _; value ] ->
-              let tag_val : Lam_constant.t =
-                if Ext_string.is_valid_hash_number s then
-                  Const_int
-                    { i = Ext_string.hash_number_as_i32_exn s; comment = None }
-                else Const_string { s; unicode = false }
-              in
-              Const_block (tag, t, [ tag_val; convert_constant value ])
-          | _ -> assert false)
-      | Blk_lazy_general -> assert false)
diff --git a/jscomp/core/lam_constant_convert.mli b/jscomp/core/lam_constant_convert.mli
deleted file mode 100644
index d0bf020..0000000
--- a/jscomp/core/lam_constant_convert.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val convert_constant : Lambda.structured_constant -> Lam_constant.t
diff --git a/jscomp/core/lam_convert.ml b/jscomp/core/lam_convert.ml
deleted file mode 100644
index 8264a60..0000000
--- a/jscomp/core/lam_convert.ml
+++ /dev/null
@@ -1,836 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let caml_id_field_info : Lambda.field_dbg_info =
-  Fld_record { name = Literals.exception_id; mutable_flag = Immutable }
-
-let lam_caml_id : Lam_primitive.t = Pfield (0, caml_id_field_info)
-let prim = Lam.prim
-
-let lam_extension_id loc (head : Lam.t) =
-  prim ~primitive:lam_caml_id ~args:[ head ] loc
-
-let lazy_block_info : Lam_tag_info.t =
-  Blk_record
-    {
-      fields = [| Literals.lazy_done; Literals.lazy_val |];
-      mutable_flag = Mutable;
-      record_repr = Record_regular;
-    }
-
-(** A conservative approach to avoid packing exceptions
-    for lambda expression like {[
-      try { ... }catch(id){body}
-    ]}
-    we approximate that if [id] is destructed or not.
-    If it is destructed, we need pack it in case it is JS exception.
-    The packing is called Js.Exn.internalTOOCamlException, which is a nop for OCaml exception, 
-    but will wrap as (Error e) when it is an JS exception. 
-
-    {[
-      try .. with 
-      | A (x,y) -> 
-      | Js.Error ..
-    ]}
-
-    Without such wrapping, the code above would raise
-
-    Note it is not guaranteed that exception raised(or re-raised) is a structured
-    ocaml exception but it is guaranteed that if such exception is processed it would
-    still be an ocaml exception.
-    for example {[
-      match x with
-      | exception e -> raise e
-    ]}
-    it will re-raise an exception as it is (we are not packing it anywhere)
-
-    It is hard to judge an exception is destructed or escaped, any potential
-    alias(or if it is passed as an argument) would cause it to be leaked
-*)
-let exception_id_destructed (l : Lam.t) (fv : Ident.t) : bool =
-  let rec hit_opt (x : _ option) =
-    match x with None -> false | Some a -> hit a
-  and hit_list_snd : 'a. ('a * _) list -> bool =
-   fun x -> Ext_list.exists_snd x hit
-  and hit_list xs = Ext_list.exists xs hit
-  and hit (l : Lam.t) =
-    match l with
-    (* | Lprim {primitive = Pintcomp _ ;
-             args = ([x;y ])  } ->
-       begin match x,y with
-        | Lvar _, Lvar _ -> false
-        | Lvar _, _ -> hit y
-        | _, Lvar _ -> hit x
-        | _, _  -> hit x || hit y
-       end *)
-    (* FIXME: this can be uncovered after we do the unboxing *)
-    | Lprim { primitive = Praise; args = [ Lvar _ ] } -> false
-    | Lprim { primitive = _; args; _ } -> hit_list args
-    | Lvar id -> Ident.same id fv
-    | Lassign (id, e) -> Ident.same id fv || hit e
-    | Lstaticcatch (e1, (_, _vars), e2) -> hit e1 || hit e2
-    | Ltrywith (e1, _exn, e2) -> hit e1 || hit e2
-    | Lfunction { body; params = _ } -> hit body
-    | Llet (_str, _id, arg, body) -> hit arg || hit body
-    | Lletrec (decl, body) -> hit body || hit_list_snd decl
-    | Lfor (_v, e1, e2, _dir, e3) -> hit e1 || hit e2 || hit e3
-    | Lconst _ -> false
-    | Lapply { ap_func; ap_args; _ } -> hit ap_func || hit_list ap_args
-    | Lglobal_module _ (* global persistent module, play safe *) -> false
-    | Lswitch (arg, sw) ->
-        hit arg || hit_list_snd sw.sw_consts || hit_list_snd sw.sw_blocks
-        || hit_opt sw.sw_failaction
-    | Lstringswitch (arg, cases, default) ->
-        hit arg || hit_list_snd cases || hit_opt default
-    | Lstaticraise (_, args) -> hit_list args
-    | Lifthenelse (e1, e2, e3) -> hit e1 || hit e2 || hit e3
-    | Lsequence (e1, e2) -> hit e1 || hit e2
-    | Lwhile (e1, e2) -> hit e1 || hit e2
-  in
-  hit l
-
-let abs_int x = if x < 0 then -x else x
-let no_over_flow x = abs_int x < 0x1fff_ffff
-
-let lam_is_var (x : Lam.t) (y : Ident.t) =
-  match x with Lvar y2 -> Ident.same y2 y | _ -> false
-
-(** Make sure no int range overflow happens
-    also we only check [int]
-*)
-let happens_to_be_diff (sw_consts : (int * Lambda.lambda) list) sw_names : int option =
-  match sw_consts with
-  | ( a,
-      Lconst (Const_base (Const_int a0))
-    )
-    :: ( b,
-         Lconst
-           (Const_base (Const_int b0)) )
-    :: rest
-    when sw_names = None && no_over_flow a && no_over_flow a0 && no_over_flow b && no_over_flow b0
-    ->
-      let diff = a0 - a in
-      if b0 - b = diff then
-        if
-          Ext_list.for_all rest (fun (x, lam) ->
-              match lam with
-              | Lconst
-                  ( Const_base (Const_int x0) )
-                when no_over_flow x0 && no_over_flow x ->
-                  x0 - x = diff
-              | _ -> false)
-        then Some diff
-        else None
-      else None
-  | _ -> None
-
-(* type required_modules = Lam_module_ident.Hash_set.t *)
-
-(** drop Lseq (List! ) etc 
-    see #3852, we drop all these required global modules
-    but added it back based on our own module analysis
-*)
-let seq = Lam.seq
-
-let unit = Lam.unit
-
-let lam_prim ~primitive:(p : Lambda.primitive) ~args loc : Lam.t =
-  match p with
-  | Pidentity -> Ext_list.singleton_exn args
-  | Puncurried_apply | Pccall _ -> assert false
-  | Prevapply -> assert false
-  | Pdirapply -> assert false
-  | Ploc _ -> assert false (* already compiled away here*)
-  | Pbytes_to_string (* handled very early *) ->
-      prim ~primitive:Pbytes_to_string ~args loc
-  | Pcreate_extension s -> prim ~primitive:(Pcreate_extension s) ~args loc
-  | Pignore ->
-      (* Pignore means return unit, it is not an nop *)
-      seq (Ext_list.singleton_exn args) unit
-  | Pgetglobal _ -> assert false
-  | Pmakeblock info -> (
-      let tag = Lambda.tag_of_tag_info info in
-      let mutable_flag = Lambda.mutable_flag_of_tag_info info in
-      match info with
-      | Blk_some_not_nested -> prim ~primitive:Psome_not_nest ~args loc
-      | Blk_some -> prim ~primitive:Psome ~args loc
-      | Blk_constructor _ | Blk_tuple | Blk_record _ | Blk_record_inlined _
-      | Blk_module _ | Blk_module_export _ | Blk_extension | Blk_record_ext _ ->
-          prim ~primitive:(Pmakeblock (tag, info, mutable_flag)) ~args loc
-      | Blk_poly_var s -> (
-          match args with
-          | [ _; value ] ->
-              let tag_val : Lam_constant.t =
-                if Ext_string.is_valid_hash_number s then
-                  Const_int
-                    { i = Ext_string.hash_number_as_i32_exn s; comment = None }
-                else Const_string { s; unicode = false }
-              in
-              prim
-                ~primitive:(Pmakeblock (tag, info, mutable_flag))
-                ~args:[ Lam.const tag_val; value ]
-                loc
-          | _ -> assert false)
-      | Blk_lazy_general -> (
-          match args with
-          | [ ((Lvar _ | Lconst _ | Lfunction _) as result) ] ->
-              let args = [ Lam.const Const_js_true; result ] in
-              prim
-                ~primitive:(Pmakeblock (tag, lazy_block_info, Mutable))
-                ~args loc
-          | [ computation ] ->
-              let args =
-                [
-                  Lam.const Const_js_false;
-                  (* FIXME: arity 0 does not get proper supported*)
-                  Lam.function_ ~arity:0 ~params:[] ~body:computation
-                    ~attr:Lambda.default_function_attribute;
-                ]
-              in
-              prim
-                ~primitive:(Pmakeblock (tag, lazy_block_info, Mutable))
-                ~args loc
-          | _ -> assert false))
-  | Pfield (id, info) -> prim ~primitive:(Pfield (id, info)) ~args loc
-  | Psetfield (id, info) -> prim ~primitive:(Psetfield (id, info)) ~args loc
-  | Pduprecord -> prim ~primitive:Pduprecord ~args loc
-  | Plazyforce -> prim ~primitive:Plazyforce ~args loc
-  | Praise _ -> prim ~primitive:Praise ~args loc
-  | Psequand -> prim ~primitive:Psequand ~args loc
-  | Psequor -> prim ~primitive:Psequor ~args loc
-  | Pnot -> prim ~primitive:Pnot ~args loc
-  | Pnegint -> prim ~primitive:Pnegint ~args loc
-  | Paddint -> prim ~primitive:Paddint ~args loc
-  | Psubint -> prim ~primitive:Psubint ~args loc
-  | Pmulint -> prim ~primitive:Pmulint ~args loc
-  | Pdivint _is_safe (*FIXME*) -> prim ~primitive:Pdivint ~args loc
-  | Pmodint _is_safe (*FIXME*) -> prim ~primitive:Pmodint ~args loc
-  | Pandint -> prim ~primitive:Pandint ~args loc
-  | Porint -> prim ~primitive:Porint ~args loc
-  | Pxorint -> prim ~primitive:Pxorint ~args loc
-  | Plslint -> prim ~primitive:Plslint ~args loc
-  | Plsrint -> prim ~primitive:Plsrint ~args loc
-  | Pasrint -> prim ~primitive:Pasrint ~args loc
-  | Pstringlength -> prim ~primitive:Pstringlength ~args loc
-  | Pstringrefu -> prim ~primitive:Pstringrefu ~args loc
-  | Pabsfloat -> assert false
-  | Pstringrefs -> prim ~primitive:Pstringrefs ~args loc
-  | Pbyteslength -> prim ~primitive:Pbyteslength ~args loc
-  | Pbytesrefu -> prim ~primitive:Pbytesrefu ~args loc
-  | Pbytessetu -> prim ~primitive:Pbytessetu ~args loc
-  | Pbytesrefs -> prim ~primitive:Pbytesrefs ~args loc
-  | Pbytessets -> prim ~primitive:Pbytessets ~args loc
-  | Pisint -> prim ~primitive:Pisint ~args loc
-  | Pisout -> (
-      match args with
-      | [ range; Lprim { primitive = Poffsetint i; args = [ x ] } ] ->
-          prim ~primitive:(Pisout i) ~args:[ range; x ] loc
-      | _ -> prim ~primitive:(Pisout 0) ~args loc)
-  | Pintoffloat -> prim ~primitive:Pintoffloat ~args loc
-  | Pfloatofint -> prim ~primitive:Pfloatofint ~args loc
-  | Pnegfloat -> prim ~primitive:Pnegfloat ~args loc
-  | Paddfloat -> prim ~primitive:Paddfloat ~args loc
-  | Psubfloat -> prim ~primitive:Psubfloat ~args loc
-  | Pmulfloat -> prim ~primitive:Pmulfloat ~args loc
-  | Pdivfloat -> prim ~primitive:Pdivfloat ~args loc
-  | Pnegbigint -> prim ~primitive:Pnegbigint ~args loc
-  | Paddbigint -> prim ~primitive:Paddbigint ~args loc
-  | Psubbigint -> prim ~primitive:Psubbigint ~args loc
-  | Pmulbigint -> prim ~primitive:Pmulbigint ~args loc
-  | Pdivbigint -> prim ~primitive:Pdivbigint ~args loc
-  | Pmodbigint -> prim ~primitive:Pmodbigint ~args loc
-  | Ppowbigint -> prim ~primitive:Ppowbigint ~args loc
-  | Pandbigint -> prim ~primitive:Pandbigint ~args loc
-  | Porbigint -> prim ~primitive:Porbigint ~args loc
-  | Pxorbigint -> prim ~primitive:Pxorbigint ~args loc
-  | Plslbigint -> prim ~primitive:Plslbigint ~args loc
-  | Pasrbigint -> prim ~primitive:Pasrbigint ~args loc
-  | Pbigintcomp x -> prim ~primitive:(Pbigintcomp x) ~args loc
-  | Pintcomp x -> prim ~primitive:(Pintcomp x) ~args loc
-  | Poffsetint x -> prim ~primitive:(Poffsetint x) ~args loc
-  | Poffsetref x -> prim ~primitive:(Poffsetref x) ~args loc
-  | Pfloatcomp x -> prim ~primitive:(Pfloatcomp x) ~args loc
-  | Pmakearray _mutable_flag (*FIXME*) -> prim ~primitive:Pmakearray ~args loc
-  | Parraylength -> prim ~primitive:Parraylength ~args loc
-  | Parrayrefu -> prim ~primitive:Parrayrefu ~args loc
-  | Parraysetu -> prim ~primitive:Parraysetu ~args loc
-  | Parrayrefs -> prim ~primitive:Parrayrefs ~args loc
-  | Parraysets -> prim ~primitive:Parraysets ~args loc
-  | Pbintofint x -> (
-      match x with
-      | Pint32 | Pbigint -> Ext_list.singleton_exn args
-      | Pint64 -> prim ~primitive:Pint64ofint ~args loc)
-  | Pintofbint x -> (
-      match x with
-      | Pint32 | Pbigint -> Ext_list.singleton_exn args
-      | Pint64 -> prim ~primitive:Pintofint64 ~args loc)
-  | Pnegbint x -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Pnegint ~args loc
-      | Pint64 -> prim ~primitive:Pnegint64 ~args loc)
-  | Paddbint x -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Paddint ~args loc
-      | Pint64 -> prim ~primitive:Paddint64 ~args loc)
-  | Psubbint x -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Psubint ~args loc
-      | Pint64 -> prim ~primitive:Psubint64 ~args loc)
-  | Pmulbint x -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Pmulint ~args loc
-      | Pint64 -> prim ~primitive:Pmulint64 ~args loc)
-  | Pdivbint { size = x; is_safe = _ } (*FIXME*) -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Pdivint ~args loc
-      | Pint64 -> prim ~primitive:Pdivint64 ~args loc)
-  | Pmodbint { size = x; is_safe = _ } (*FIXME*) -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Pmodint ~args loc
-      | Pint64 -> prim ~primitive:Pmodint64 ~args loc)
-  | Pandbint x -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Pandint ~args loc
-      | Pint64 -> prim ~primitive:Pandint64 ~args loc)
-  | Porbint x -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Porint ~args loc
-      | Pint64 -> prim ~primitive:Porint64 ~args loc)
-  | Pxorbint x -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Pxorint ~args loc
-      | Pint64 -> prim ~primitive:Pxorint64 ~args loc)
-  | Plslbint x -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Plslint ~args loc
-      | Pint64 -> prim ~primitive:Plslint64 ~args loc)
-  | Plsrbint x -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Plsrint ~args loc
-      | Pint64 -> prim ~primitive:Plsrint64 ~args loc)
-  | Pasrbint x -> (
-      match x with
-      | Pbigint | Pint32 -> prim ~primitive:Pasrint ~args loc
-      | Pint64 -> prim ~primitive:Pasrint64 ~args loc)
-  | Pctconst x -> (
-      match x with
-      | Word_size | Int_size ->
-          Lam.const (Const_int { i = 32l; comment = None })
-      | Max_wosize ->
-          Lam.const (Const_int { i = 2147483647l; comment = Some "Max_wosize" })
-      | Big_endian -> prim ~primitive:(Pctconst Big_endian) ~args loc
-      | Ostype_unix -> prim ~primitive:(Pctconst Ostype_unix) ~args loc
-      | Ostype_win32 -> prim ~primitive:(Pctconst Ostype_win32) ~args loc
-      | Ostype_cygwin -> Lam.false_
-      | Backend_type -> prim ~primitive:(Pctconst Backend_type) ~args loc)
-  | Pcvtbint (a, b) -> (
-      match (a, b) with
-      | (Pbigint | Pint32), (Pbigint | Pint32) | Pint64, Pint64 ->
-          Ext_list.singleton_exn args
-      | Pint64, (Pbigint | Pint32) -> prim ~primitive:Pintofint64 ~args loc
-      | (Pbigint | Pint32), Pint64 -> prim ~primitive:Pint64ofint ~args loc)
-  | Pbintcomp (a, b) -> (
-      match a with
-      | Pbigint | Pint32 -> prim ~primitive:(Pintcomp b) ~args loc
-      | Pint64 -> prim ~primitive:(Pint64comp b) ~args loc)
-  | Popaque -> Ext_list.singleton_exn args
-
-(* Does not exist since we compile array in js backend unlike native backend *)
-
-let may_depend = Lam_module_ident.Hash_set.add
-
-let rec rename_optional_parameters map params (body : Lambda.lambda) =
-  match body with
-  | Llet
-      ( k,
-        value_kind,
-        id,
-        Lifthenelse
-          ( Lprim (p, [ Lvar ({ name = "*opt*" } as opt) ], p_loc),
-            Lprim (p1, [ Lvar ({ name = "*opt*" } as opt2) ], x_loc),
-            f ),
-        rest )
-    when Ident.same opt opt2 && List.mem opt params ->
-      let map, rest = rename_optional_parameters map params rest in
-      let new_id = Ident.create (id.name ^ "Opt") in
-      ( Map_ident.add map opt new_id,
-        Lambda.Llet
-          ( k,
-            value_kind,
-            id,
-            Lifthenelse
-              ( Lprim (p, [ Lvar new_id ], p_loc),
-                Lprim (p1, [ Lvar new_id ], x_loc),
-                f ),
-            rest ) )
-  | _ -> (map, body)
-
-let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
-    Lam.t * Lam_module_ident.Hash_set.t =
-  let alias_tbl = Hash_ident.create 64 in
-  let exit_map = Hash_int.create 0 in
-  let may_depends = Lam_module_ident.Hash_set.create 0 in
-
-  let rec convert_ccall (a_prim : Primitive.description)
-      (args : Lambda.lambda list) loc ~dynamic_import : Lam.t =
-    let prim_name = a_prim.prim_name in
-    let prim_name_len = String.length prim_name in
-    match External_ffi_types.from_string a_prim.prim_native_name with
-    | Ffi_normal ->
-        if prim_name_len > 0 && String.unsafe_get prim_name 0 = '#' then
-          convert_js_primitive a_prim args loc
-        else
-          let args = Ext_list.map args convert_aux in
-          prim ~primitive:(Pccall { prim_name }) ~args loc
-    | Ffi_obj_create labels ->
-        let args = Ext_list.map args convert_aux in
-        prim ~primitive:(Pjs_object_create labels) ~args loc
-    | Ffi_bs (arg_types, result_type, ffi) ->
-        let arg_types =
-          match arg_types with
-          | Params ls -> ls
-          | Param_number i -> Ext_list.init i (fun _ -> External_arg_spec.dummy)
-        in
-        let args = Ext_list.map args convert_aux in
-        Lam.handle_bs_non_obj_ffi arg_types result_type ffi args loc prim_name ~dynamic_import
-    | Ffi_inline_const i -> Lam.const i
-  and convert_js_primitive (p : Primitive.description)
-      (args : Lambda.lambda list) loc : Lam.t =
-    let s = p.prim_name in
-    match () with
-    | _ when s = "#is_not_none" ->
-        prim ~primitive:Pis_not_none ~args:(Ext_list.map args convert_aux) loc
-    | _ when s = "#val_from_unnest_option" ->
-        let v = convert_aux (Ext_list.singleton_exn args) in
-        prim ~primitive:Pval_from_option_not_nest ~args:[ v ] loc
-    | _ when s = "#val_from_option" ->
-        prim ~primitive:Pval_from_option
-          ~args:(Ext_list.map args convert_aux)
-          loc
-    | _ when s = "#is_poly_var_block" ->
-        prim ~primitive:Pis_poly_var_block
-          ~args:(Ext_list.map args convert_aux)
-          loc
-    | _ when s = "#raw_expr" -> (
-        match args with
-        | [ Lconst (Const_base (Const_string (code, _))) ] ->
-            (* js parsing here *)
-            let kind = Classify_function.classify code in
-            prim
-              ~primitive:(Praw_js_code { code; code_info = Exp kind })
-              ~args:[] loc
-        | _ -> assert false)
-    | _ when s = "#raw_stmt" -> (
-        match args with
-        | [ Lconst (Const_base (Const_string (code, _))) ] ->
-            let kind = Classify_function.classify_stmt code in
-            prim
-              ~primitive:(Praw_js_code { code; code_info = Stmt kind })
-              ~args:[] loc
-        | _ -> assert false)
-    | _ when s = "#debugger" ->
-        (* ATT: Currently, the arity is one due to PPX *)
-        prim ~primitive:Pdebugger ~args:[] loc
-    | _ when s = "#null" -> Lam.const Const_js_null
-    | _ when s = "#os_type" ->
-        prim ~primitive:(Pctconst Ostype) ~args:[ unit ] loc
-    | _ when s = "#undefined" -> Lam.const (Const_js_undefined {isUnit = false})
-    | _ when s = "#init_mod" -> (
-        let args = Ext_list.map args convert_aux in
-        match args with
-        | [ _loc; Lconst (Const_block (0, _, [ Const_block (0, _, []) ])) ] ->
-            Lam.unit
-        | _ -> prim ~primitive:Pinit_mod ~args loc)
-    | _ when s = "#update_mod" -> (
-        let args = Ext_list.map args convert_aux in
-        match args with
-        | [ Lconst (Const_block (0, _, [ Const_block (0, _, []) ])); _; _ ] ->
-            Lam.unit
-        | _ -> prim ~primitive:Pupdate_mod ~args loc)
-    | _ when s = "#extension_slot_eq" -> (
-        match Ext_list.map args convert_aux with
-        | [ lhs; rhs ] ->
-            prim
-              ~primitive:(Pccall { prim_name = "caml_string_equal" })
-              ~args:[ lam_extension_id loc lhs; rhs ]
-              loc
-        | _ -> assert false)
-    | _ ->
-        let primitive : Lam_primitive.t =
-          match s with
-          | "#apply" -> Pjs_runtime_apply
-          | "#apply1" | "#apply2" | "#apply3" | "#apply4" | "#apply5"
-          | "#apply6" | "#apply7" | "#apply8" ->
-              Pjs_apply
-          | "#makemutablelist" ->
-              Pmakeblock
-                ( 0,
-                  Blk_constructor { name = "::"; num_nonconst = 1; tag = 0; attrs = [] },
-                  Mutable )
-          | "#undefined_to_opt" -> Pundefined_to_opt
-          | "#nullable_to_opt" -> Pnull_undefined_to_opt
-          | "#null_to_opt" -> Pnull_to_opt
-          | "#is_nullable" -> Pis_null_undefined
-          | "#import" ->Pimport
-          | "#string_append" -> Pstringadd
-          | "#wrap_exn" -> Pwrap_exn
-          | "#obj_length" -> Pcaml_obj_length
-          | "#function_length" -> Pjs_function_length
-          | "#unsafe_lt" -> Pjscomp Clt
-          | "#unsafe_gt" -> Pjscomp Cgt
-          | "#unsafe_le" -> Pjscomp Cle
-          | "#unsafe_ge" -> Pjscomp Cge
-          | "#unsafe_eq" -> Pjscomp Ceq
-          | "#unsafe_neq" -> Pjscomp Cneq
-          | "#typeof" -> Pjs_typeof
-          | "#run" -> Pvoid_run
-          | "#fn_mk" ->
-              Pjs_fn_make (Ext_pervasives.nat_of_string_exn p.prim_native_name)
-          | "#fn_mk_unit" ->
-              Pjs_fn_make_unit
-          | "#fn_method" -> Pjs_fn_method
-          | "#unsafe_downgrade" ->
-              Pjs_unsafe_downgrade { name = Ext_string.empty; setter = false }
-          | _ ->
-              Location.raise_errorf ~loc
-                "@{<error>Error:@} internal error, using unrecognized \
-                 primitive %s"
-                s
-        in
-        let dynamic_import = primitive = Pimport in
-        let args = Ext_list.map args (convert_aux ~dynamic_import) in
-        prim ~primitive ~args loc
-  and convert_aux ?(dynamic_import = false) (lam : Lambda.lambda) : Lam.t =
-    match lam with
-    | Lvar x -> Lam.var (Hash_ident.find_default alias_tbl x x)
-    | Lconst x -> Lam.const (Lam_constant_convert.convert_constant x)
-    | Lapply { ap_func = fn; ap_args = args; ap_loc = loc; ap_inlined } ->
-        (* we need do this eargly in case [aux fn] add some wrapper *)
-        Lam.apply (convert_aux fn)
-          (Ext_list.map args convert_aux)
-          { ap_loc = loc; ap_inlined; ap_status = App_na }
-    | Lfunction { params; body; attr } ->
-        let new_map, body =
-          rename_optional_parameters Map_ident.empty params body
-        in
-        if Map_ident.is_empty new_map then
-          Lam.function_ ~attr ~arity:(List.length params) ~params
-            ~body:(convert_aux body)
-        else
-          let params =
-            Ext_list.map params (fun x -> Map_ident.find_default new_map x x)
-          in
-          Lam.function_ ~attr ~arity:(List.length params) ~params
-            ~body:(convert_aux body)
-    | Llet (kind, Pgenval, id, e, body) (*FIXME*) -> convert_let kind id e body
-    | Lletrec (bindings, body) ->
-        let bindings = Ext_list.map_snd bindings convert_aux in
-        let body = convert_aux body in
-        let lam = Lam.letrec bindings body in
-        Lam_scc.scc bindings lam body
-    (* inlining will affect how mututal recursive behave *)
-    | Lprim (Prevapply, [ x; f ], outer_loc)
-    | Lprim (Pdirapply, [ f; x ], outer_loc) ->
-        convert_pipe f x outer_loc
-    | Lprim (Prevapply, _, _) -> assert false
-    | Lprim (Pdirapply, _, _) -> assert false
-    | Lprim (Pccall a, args, loc) -> convert_ccall a args loc ~dynamic_import
-    | Lprim (Pgetglobal id, args, _) ->
-        let args = Ext_list.map args convert_aux in
-        if Ident.is_predef_exn id then
-          Lam.const (Const_string { s = id.name; unicode = false })
-        else (
-          may_depend may_depends (Lam_module_ident.of_ml ~dynamic_import id);
-          assert (args = []);
-          Lam.global_module ~dynamic_import id)
-    | Lprim
-        ( Puncurried_apply,
-          [ Lapply { ap_func = Lprim (Popaque, [ ap_func ], _); ap_args } ],
-          loc ) ->
-        let ap_func = convert_aux ap_func in
-        let ap_args = Ext_list.map ap_args convert_aux in
-        prim ~primitive:Pfull_apply ~args:(ap_func :: ap_args) loc
-        (* There may be some optimization opportunities here
-           for cases like `(fun [@bs] a b -> a + b ) 1 2 [@bs]` *)
-    | Lprim (Puncurried_apply, _, _) -> assert false
-    | Lprim (primitive, args, loc) ->
-        let args = Ext_list.map args (convert_aux ~dynamic_import) in
-        lam_prim ~primitive ~args loc
-    | Lswitch (e, s, _loc) -> convert_switch e s
-    | Lstringswitch (e, cases, default, _) ->
-        Lam.stringswitch (convert_aux e)
-          (Ext_list.map_snd cases convert_aux)
-          (Ext_option.map default convert_aux)
-    | Lstaticraise (id, []) ->
-        Lam.staticraise (Hash_int.find_default exit_map id id) []
-    | Lstaticraise (id, args) ->
-        Lam.staticraise id (Ext_list.map args convert_aux)
-    | Lstaticcatch (b, (i, []), Lstaticraise (j, [])) ->
-        (* peep-hole [i] aliased to [j] *)
-        Hash_int.add exit_map i (Hash_int.find_default exit_map j j);
-        convert_aux b
-    | Lstaticcatch (b, (i, ids), handler) ->
-        Lam.staticcatch (convert_aux b) (i, ids) (convert_aux handler)
-    | Ltrywith (b, id, handler) ->
-        let body = convert_aux b in
-        let handler = convert_aux handler in
-        if exception_id_destructed handler id then
-          let newId = Ident.create ("raw_" ^ id.name) in
-          Lam.try_ body newId
-            (Lam.let_ StrictOpt id
-               (prim ~primitive:Pwrap_exn ~args:[ Lam.var newId ] Location.none)
-               handler)
-        else Lam.try_ body id handler
-    | Lifthenelse (b, then_, else_) ->
-        Lam.if_ (convert_aux b) (convert_aux then_) (convert_aux else_)
-    | Lsequence (a, b) -> Lam.seq (convert_aux a) (convert_aux b)
-    | Lwhile (b, body) -> Lam.while_ (convert_aux b) (convert_aux body)
-    | Lfor (id, from_, to_, dir, loop) ->
-        Lam.for_ id (convert_aux from_) (convert_aux to_) dir (convert_aux loop)
-    | Lassign (id, body) -> Lam.assign id (convert_aux body)
-    | Lsend (name, obj, loc) ->
-        let obj = convert_aux obj in
-        let args = [ obj ] in
-        let setter = Ext_string.ends_with name Literals.setter_suffix in
-        let property =
-          if setter then
-            (String.sub name 0
-                (String.length name - Literals.setter_suffix_len))
-          else name
-        in
-        prim
-          ~primitive:(Pjs_unsafe_downgrade { name = property; setter })
-          ~args loc
-  and convert_let (kind : Lam_compat.let_kind) id (e : Lambda.lambda) body :
-      Lam.t =
-    match (kind, e) with
-    | Alias, Lvar u ->
-        let new_u = Hash_ident.find_default alias_tbl u u in
-        Hash_ident.add alias_tbl id new_u;
-        if Set_ident.mem exports id then
-          Lam.let_ kind id (Lam.var new_u) (convert_aux body)
-        else convert_aux body
-    | _, _ -> (
-        let new_e = convert_aux e in
-        let new_body = convert_aux body in
-        (*
-            reverse engineering cases as {[           
-           (let (switcher/1013 =a (-1+ match/1012))
-               (if (isout 2 switcher/1013) (exit 1)
-                   (switch* switcher/1013
-                      case int 0: 'a'
-                        case int 1: 'b'
-                        case int 2: 'c')))            
-         ]}
-         To elemininate the id [switcher], we need ensure it appears only 
-         in two places.
-
-         To advance this case, when [sw_failaction] is None
-      *)
-        match (kind, new_e, new_body) with
-        | ( Alias,
-            Lprim
-              { primitive = Poffsetint offset; args = [ (Lvar _ as matcher) ] },
-            Lswitch
-              ( Lvar switcher3,
-                ({
-                   sw_consts_full = false;
-                   sw_consts;
-                   sw_blocks = [];
-                   sw_blocks_full = true;
-                   sw_failaction = Some ifso;
-                 } as px) ) )
-          when Ident.same switcher3 id
-               && (not (Lam_hit.hit_variable id ifso))
-               && not (Ext_list.exists_snd sw_consts (Lam_hit.hit_variable id))
-          ->
-            Lam.switch matcher
-              {
-                px with
-                sw_consts =
-                  Ext_list.map sw_consts (fun (i, act) -> (i - offset, act));
-              }
-        | _ -> Lam.let_ kind id new_e new_body)
-  and convert_pipe (f : Lambda.lambda) (x : Lambda.lambda) outer_loc =
-    let x = convert_aux x in
-    let f = convert_aux f in
-    match f with
-    | Lfunction
-        {
-          params = [ param ];
-          body = Lprim { primitive; args = [ Lvar inner_arg ] };
-        }
-      when Ident.same param inner_arg ->
-        Lam.prim ~primitive ~args:[ x ] outer_loc
-    | Lapply
-        {
-          ap_func =
-            Lfunction { params; body = Lprim { primitive; args = inner_args } };
-          ap_args = args;
-        }
-      when Ext_list.for_all2_no_exn inner_args params lam_is_var
-           && Ext_list.length_larger_than_n inner_args args 1 ->
-        Lam.prim ~primitive ~args:(Ext_list.append_one args x) outer_loc
-    | Lapply { ap_func; ap_args; ap_info } ->
-        Lam.apply ap_func
-          (Ext_list.append_one ap_args x)
-          {
-            ap_loc = outer_loc;
-            ap_inlined = ap_info.ap_inlined;
-            ap_status = App_na;
-          }
-    | _ ->
-        Lam.apply f [ x ]
-          {
-            ap_loc = outer_loc;
-            ap_inlined = Default_inline;
-            ap_status = App_na;
-          }
-  and convert_switch (e : Lambda.lambda) (s : Lambda.lambda_switch) =
-    let e = convert_aux e in
-    match s with
-    | {
-     sw_failaction = None;
-     sw_blocks = [];
-     sw_numblocks = 0;
-     sw_consts;
-     sw_numconsts;
-     sw_names;
-    } -> (
-        match happens_to_be_diff sw_consts sw_names with
-        | Some 0 -> e
-        | Some i ->
-            prim ~primitive:Paddint
-              ~args:
-                [
-                  e;
-                  Lam.const (Const_int { i = Int32.of_int i; comment = None });
-                ]
-              Location.none
-        | _ ->
-            Lam.switch e
-              {
-                sw_failaction = None;
-                sw_blocks = [];
-                sw_blocks_full = true;
-                sw_consts = Ext_list.map_snd sw_consts convert_aux;
-                sw_consts_full = Ext_list.length_ge sw_consts sw_numconsts;
-                sw_names = s.sw_names;
-              })
-    | _ ->
-        Lam.switch e
-          {
-            sw_consts_full = Ext_list.length_ge s.sw_consts s.sw_numconsts;
-            sw_consts = Ext_list.map_snd s.sw_consts convert_aux;
-            sw_blocks_full = Ext_list.length_ge s.sw_blocks s.sw_numblocks;
-            sw_blocks = Ext_list.map_snd s.sw_blocks convert_aux;
-            sw_failaction = Ext_option.map s.sw_failaction convert_aux;
-            sw_names = s.sw_names;
-          }
-  in
-  (convert_aux lam, may_depends)
-
-(** FIXME: more precise analysis of [id], if it is not 
-    used, we can remove it
-        only two places emit [Lifused],
-    {[
-      lsequence (Lifused(id, set_inst_var obj id expr)) rem
-        Lifused (env2, Lprim(Parrayset Paddrarray, [Lvar self; Lvar env2; Lvar env1']))
-    ]}
-
-        Note the variable, [id], or [env2] is already defined, it can be removed if it is not
-        used. This optimization seems useful, but doesnt really matter since it only hit translclass
-
-        more details, see [translclass] and [if_used_test]
-        seems to be an optimization trick for [translclass]
-
-        | Lifused(v, l) ->
-          if count_var v > 0 then simplif l else lambda_unit
-*)
-
-(*
-        | Lfunction(kind,params,Lprim(prim,inner_args,inner_loc))
-          when List.for_all2_no_exn (fun x y ->
-          match y with
-          | Lambda.Lvar y when Ident.same x y -> true
-          | _ -> false
-           ) params inner_args
-          ->
-          let rec aux outer_args params =
-            match outer_args, params with
-            | x::xs , _::ys ->
-              x :: aux xs ys
-            | [], [] -> []
-            | x::xs, [] ->
-            | [], y::ys
-          if Ext_list.same_length inner_args args then
-            aux (Lprim(prim,args,inner_loc))
-          else
-
-   {[
-     (fun x y -> f x y) (computation;e) -->
-     (fun y -> f (computation;e) y)
-   ]}
-   is wrong
-
-   or
-   {[
-     (fun x y -> f x y ) ([|1;2;3|]) -->
-     (fun y -> f [|1;2;3|] y)
-   ]}
-   is also wrong.
-
-   It seems, we need handle [@variadic] earlier
-
-   or
-   {[
-     (fun x y -> f x y) ([|1;2;3|]) -->
-     let x0, x1, x2 =1,2,3 in
-     (fun y -> f [|x0;x1;x2|] y)
-   ]}
-   But this still need us to know [@variadic] in advance
-
-
-   we should not remove it immediately, since we have to be careful
-   where it is used, it can be [exported], [Lvar] or [Lassign] etc
-   The other common mistake is that
-   {[
-     let x = y (* elimiated x/y*)
-     let u = x  (* eliminated u/x *)
-   ]}
-
-   however, [x] is already eliminated
-   To improve the algorithm
-   {[
-     let x = y (* x/y *)
-     let u = x (* u/y *)
-   ]}
-   This looks more correct, but lets be conservative here
-
-   global module inclusion {[ include List ]}
-   will cause code like {[ let include =a Lglobal_module (list)]}
-
-   when [u] is global, it can not be bound again,
-   it should always be the leaf
-*)
diff --git a/jscomp/core/lam_convert.mli b/jscomp/core/lam_convert.mli
deleted file mode 100644
index 2ff227f..0000000
--- a/jscomp/core/lam_convert.mli
+++ /dev/null
@@ -1,50 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* val happens_to_be_diff:
-   (int * Lambda.lambda) list -> int option *)
-
-val convert :
-  Set_ident.t -> Lambda.lambda -> Lam.t * Lam_module_ident.Hash_set.t
-(** 
-   [convert exports lam]
-   it also collect [exit_map] and a collection of potential depended modules [may_depends]
-   In this pass we also synchronized aliases so that 
-   {[
-     let a1 = a0 in 
-     let a2 = a1 in 
-     let a3 = a2 in 
-     let a4 = a3 in 
-   ]}
-    converted to 
-   {[
-     let a1 = a0 in 
-     let a2 = a0 in 
-     let a3 = a0 in 
-     let a4 = a0 in 
-   ]}
-    we dont eliminate unused let bindings to leave it for {!Lam_pass_lets_dce}
-    we should remove all those let aliases, otherwise, it will be
-    pushed into alias table again
-*)
diff --git a/jscomp/core/lam_dce.ml b/jscomp/core/lam_dce.ml
deleted file mode 100644
index a51cabb..0000000
--- a/jscomp/core/lam_dce.ml
+++ /dev/null
@@ -1,78 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let transitive_closure (initial_idents : Ident.t list)
-    (ident_freevars : Set_ident.t Hash_ident.t) =
-  let visited = Hash_set_ident.create 31 in
-  let rec dfs (id : Ident.t) : unit =
-    if not (Hash_set_ident.mem visited id || Ext_ident.is_js_or_global id) then (
-      Hash_set_ident.add visited id;
-      match Hash_ident.find_opt ident_freevars id with
-      | None ->
-          Ext_fmt.failwithf ~loc:__LOC__ "%s/%d not found" (Ident.name id)
-            id.stamp
-      | Some e -> Set_ident.iter e dfs)
-  in
-  Ext_list.iter initial_idents dfs;
-  visited
-
-let remove export_idents (rest : Lam_group.t list) : Lam_group.t list =
-  let ident_free_vars : _ Hash_ident.t = Hash_ident.create 17 in
-  (* calculate initial required idents,
-     at the same time, populate dependency set [ident_free_vars]
-  *)
-  let initial_idents =
-    Ext_list.fold_left rest export_idents (fun acc x ->
-        match x with
-        | Single (kind, id, lam) -> (
-            Hash_ident.add ident_free_vars id
-              (Lam_free_variables.pass_free_variables lam);
-            match kind with
-            | Alias | StrictOpt -> acc
-            | Strict | Variable -> id :: acc)
-        | Recursive bindings ->
-            Ext_list.fold_left bindings acc (fun acc (id, lam) ->
-                Hash_ident.add ident_free_vars id
-                  (Lam_free_variables.pass_free_variables lam);
-                match lam with Lfunction _ -> acc | _ -> id :: acc)
-        | Nop lam ->
-            if Lam_analysis.no_side_effects lam then acc
-            else
-              (* its free varaibles here will be defined above *)
-              Set_ident.fold (Lam_free_variables.pass_free_variables lam) acc
-                (fun x acc -> x :: acc))
-  in
-  let visited = transitive_closure initial_idents ident_free_vars in
-  Ext_list.fold_left rest [] (fun acc x ->
-      match x with
-      | Single (_, id, _) ->
-          if Hash_set_ident.mem visited id then x :: acc else acc
-      | Nop _ -> x :: acc
-      | Recursive bindings -> (
-          let b =
-            Ext_list.fold_right bindings [] (fun ((id, _) as v) acc ->
-                if Hash_set_ident.mem visited id then v :: acc else acc)
-          in
-          match b with [] -> acc | _ -> Recursive b :: acc))
-  |> List.rev
diff --git a/jscomp/core/lam_dce.mli b/jscomp/core/lam_dce.mli
deleted file mode 100644
index 864a3d8..0000000
--- a/jscomp/core/lam_dce.mli
+++ /dev/null
@@ -1,28 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Dead code eliminatiion on the lambda layer 
-*)
-
-val remove : Ident.t list -> Lam_group.t list -> Lam_group.t list
diff --git a/jscomp/core/lam_dispatch_primitive.ml b/jscomp/core/lam_dispatch_primitive.ml
deleted file mode 100644
index 8f78237..0000000
--- a/jscomp/core/lam_dispatch_primitive.ml
+++ /dev/null
@@ -1,275 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module E = Js_exp_make
-(* module S = Js_stmt_make *)
-
-(** 
-   There are two things we need consider:
-   1.  For some primitives we can replace caml-primitive with js primitives directly
-   2.  For some standard library functions, we prefer to replace with javascript primitives
-    For example [Pervasives["^"] -> ^]
-    We can collect all mli files in OCaml and replace it with an efficient javascript runtime
-
-   TODO: return type to be expression is ugly, 
-   we should allow return block    
-*)
-let translate loc (prim_name : string) (args : J.expression list) : J.expression
-    =
-  let[@inline] call ?name m =
-    let name =
-      match name with
-      | None ->
-          if prim_name.[0] = '?' then
-            String.sub prim_name 1 (String.length prim_name - 1)
-          else if Ext_string.starts_with prim_name "caml_" then
-            String.sub prim_name 5 (String.length prim_name - 5)
-          else assert false (* prim_name *)
-      | Some x -> x
-    in
-    E.runtime_call m name args
-  in
-  match prim_name with
-  | "caml_notequal" -> (
-      match args with
-      | [ a1; b1 ]
-        when E.for_sure_js_null_undefined a1 || E.for_sure_js_null_undefined b1
-        ->
-          E.neq_null_undefined_boolean a1 b1
-      (* FIXME address_equal *)
-      | _ ->
-          Location.prerr_warning loc Warnings.Bs_polymorphic_comparison;
-          call Js_runtime_modules.obj_runtime)
-  | "caml_equal" -> (
-      match args with
-      | [ a1; b1 ]
-        when E.for_sure_js_null_undefined a1 || E.for_sure_js_null_undefined b1
-        ->
-          E.eq_null_undefined_boolean a1 b1
-      (* FIXME address_equal *)
-      | _ ->
-          Location.prerr_warning loc Warnings.Bs_polymorphic_comparison;
-          call Js_runtime_modules.obj_runtime)
-  | "caml_min" | "caml_max" | "caml_compare" | "caml_greaterequal"
-  | "caml_greaterthan" | "caml_lessequal" | "caml_lessthan" | "caml_equal_null"
-  | "caml_equal_undefined" | "caml_equal_nullable" ->
-      Location.prerr_warning loc Warnings.Bs_polymorphic_comparison;
-      call Js_runtime_modules.obj_runtime
-  (* generated by the compiler, not user facing *)
-  | "caml_bytes_greaterthan" | "caml_bytes_greaterequal" | "caml_bytes_lessthan"
-  | "caml_bytes_lessequal" | "caml_bytes_compare" | "caml_bytes_equal" ->
-      call Js_runtime_modules.bytes
-  | "caml_string_equal" -> (
-      match args with [ e0; e1 ] -> E.string_equal e0 e1 | _ -> assert false)
-  | "caml_string_notequal" -> (
-      match args with
-      | [ e0; e1 ] -> E.string_comp NotEqEq e0 e1
-      (* TODO: convert to ocaml ones*)
-      | _ -> assert false)
-  | "caml_string_lessequal" -> (
-      match args with [ e0; e1 ] -> E.string_comp Le e0 e1 | _ -> assert false)
-  | "caml_string_lessthan" -> (
-      match args with [ e0; e1 ] -> E.string_comp Lt e0 e1 | _ -> assert false)
-  | "caml_string_greaterequal" -> (
-      match args with [ e0; e1 ] -> E.string_comp Ge e0 e1 | _ -> assert false)
-  | "caml_int64_equal_null" -> Js_long.equal_null args
-  | "caml_int64_equal_undefined" -> Js_long.equal_undefined args
-  | "caml_int64_equal_nullable" -> Js_long.equal_nullable args
-  | "caml_int64_min" -> Js_long.min args
-  | "caml_int64_max" -> Js_long.max args
-  | "caml_int64_compare" -> Js_long.compare args
-  | "caml_string_greaterthan" -> (
-      match args with [ e0; e1 ] -> E.string_comp Gt e0 e1 | _ -> assert false)
-  | "caml_bool_notequal" -> (
-      match args with
-      | [ e0; e1 ] -> E.bool_comp Cneq e0 e1
-      (* TODO: specialized in OCaml ones*)
-      | _ -> assert false)
-  | "caml_bool_lessequal" -> (
-      match args with [ e0; e1 ] -> E.bool_comp Cle e0 e1 | _ -> assert false)
-  | "caml_bool_lessthan" -> (
-      match args with [ e0; e1 ] -> E.bool_comp Clt e0 e1 | _ -> assert false)
-  | "caml_bool_greaterequal" -> (
-      match args with [ e0; e1 ] -> E.bool_comp Cge e0 e1 | _ -> assert false)
-  | "caml_bool_greaterthan" -> (
-      match args with [ e0; e1 ] -> E.bool_comp Cgt e0 e1 | _ -> assert false)
-  | "caml_bool_equal" | "caml_bool_equal_null" | "caml_bool_equal_nullable"
-  | "caml_bool_equal_undefined" -> (
-      match args with [ e0; e1 ] -> E.bool_comp Ceq e0 e1 | _ -> assert false)
-  | "caml_int_equal_null" | "caml_int_equal_nullable"
-  | "caml_int_equal_undefined" -> (
-      match args with [ e0; e1 ] -> E.int_comp Ceq e0 e1 | _ -> assert false)
-  | "caml_float_equal_null" | "caml_float_equal_nullable"
-  | "caml_float_equal_undefined" -> (
-      match args with [ e0; e1 ] -> E.float_comp Ceq e0 e1 | _ -> assert false)
-  | "caml_bigint_equal_null" | "caml_bigint_equal_nullable"
-  | "caml_bigint_equal_undefined" -> (
-      match args with [ e0; e1 ] -> E.bigint_comp Ceq e0 e1 | _ -> assert false)
-  | "caml_string_equal_null" | "caml_string_equal_nullable"
-  | "caml_string_equal_undefined" -> (
-      match args with
-      | [ e0; e1 ] -> E.string_comp EqEqEq e0 e1
-      | _ -> assert false)
-  | "caml_bool_compare" -> (
-      match args with
-      | [ { expression_desc = Bool a }; { expression_desc = Bool b } ] ->
-          let c = compare (a : bool) b in
-          E.int (if c = 0 then 0l else if c > 0 then 1l else -1l)
-      | _ -> call Js_runtime_modules.caml_primitive)
-  | "caml_int_compare" ->
-      E.runtime_call Js_runtime_modules.caml_primitive "int_compare" args
-  | "caml_float_compare" -> call Js_runtime_modules.caml_primitive
-  | "caml_bigint_compare" -> call Js_runtime_modules.caml_primitive
-  | "caml_string_compare" -> call Js_runtime_modules.caml_primitive
-  | "caml_bool_min" | "caml_int_min" | "caml_float_min" | "caml_bigint_min" | "caml_string_min" -> (
-      match args with
-      | [ a; b ] ->
-          if
-            Js_analyzer.is_okay_to_duplicate a
-            && Js_analyzer.is_okay_to_duplicate b
-          then E.econd (E.js_comp Clt a b) a b
-          else call Js_runtime_modules.caml_primitive
-      | _ -> assert false)
-  | "caml_bool_max" | "caml_int_max" | "caml_float_max" | "caml_bigint_max" | "caml_string_max" -> (
-      match args with
-      | [ a; b ] ->
-          if
-            Js_analyzer.is_okay_to_duplicate a
-            && Js_analyzer.is_okay_to_duplicate b
-          then E.econd (E.js_comp Cgt a b) a b
-          else call Js_runtime_modules.caml_primitive
-      | _ -> assert false)
-  (******************************************************************************)
-  (************************* customized primitives ******************************)
-  (******************************************************************************)
-  | "?int_of_float" -> (
-      match args with [ e ] -> E.to_int32 e | _ -> assert false)
-  | "?int64_succ" -> E.runtime_call Js_runtime_modules.int64 "succ" args
-  | "?int64_to_string" ->
-      E.runtime_call Js_runtime_modules.int64 "to_string" args
-  | "?int64_to_float" -> Js_long.to_float args
-  | "?int64_of_float" -> Js_long.of_float args
-  | "?int64_bits_of_float" -> Js_long.bits_of_float args
-  | "?int64_float_of_bits" -> Js_long.float_of_bits args
-  | "?int_float_of_bits" | "?int_bits_of_float" | "?modf_float" | "?ldexp_float"
-  | "?frexp_float" | "?copysign_float" | "?expm1_float" | "?hypot_float" ->
-      call Js_runtime_modules.float
-  | "?fmod_float" (* float module like js number module *) -> (
-      match args with [ e0; e1 ] -> E.float_mod e0 e1 | _ -> assert false)
-  | "?string_repeat" -> (
-      match args with
-      | [ n; { expression_desc = Number (Int { i }) } ] -> (
-          let str = String.make 1 (Char.chr (Int32.to_int i)) in
-          match n.expression_desc with
-          | Number (Int { i = 1l }) -> E.str str
-          | _ ->
-              E.call
-                (E.dot (E.str str) "repeat")
-                [ n ] ~info:Js_call_info.builtin_runtime_call)
-      | _ -> E.runtime_call Js_runtime_modules.string "make" args)
-  | "?create_bytes" -> (
-      (* Bytes.create *)
-      (* Note that for invalid range, JS raise an Exception RangeError,
-         here in OCaml it's [Invalid_argument], we have to preserve this semantics.
-          Also, it's creating a [bytes] which is a js array actually.
-      *)
-      match args with
-      | [ { expression_desc = Number (Int { i; _ }); _ } ] when i < 8l ->
-          (*Invariants: assuming bytes are [int array]*)
-          E.array NA
-            (if i = 0l then []
-            else Ext_list.init (Int32.to_int i) (fun _ -> E.zero_int_literal))
-      | _ -> E.runtime_call Js_runtime_modules.bytes "create" args)
-  (* Note we captured [exception/extension] creation in the early pass, this primitive is
-      like normal one to set the identifier *)
-  | "?exn_slot_name" | "?is_extension" -> call Js_runtime_modules.exceptions
-  | "?as_js_exn" -> call Js_runtime_modules.caml_js_exceptions
-  | "?sys_get_argv" | "?sys_file_exists" | "?sys_time" | "?sys_getenv"
-  | "?sys_getcwd" (* check browser or nodejs *)
-  | "?sys_is_directory" | "?sys_exit" ->
-      call Js_runtime_modules.sys
-  | "?lex_engine" | "?new_lex_engine" -> call Js_runtime_modules.lexer
-  | "?parse_engine" | "?set_parser_trace" -> call Js_runtime_modules.parser
-  | "?make_float_vect"
-  | "?floatarray_create" (* TODO: compile float array into TypedArray*) ->
-      E.runtime_call Js_runtime_modules.array "make_float" args
-  | "?array_sub" -> E.runtime_call Js_runtime_modules.array "sub" args
-  | "?array_concat" -> E.runtime_call Js_runtime_modules.array "concat" args
-  (*external concat: 'a array list -> 'a array
-     Not good for inline *)
-  | "?array_blit" -> E.runtime_call Js_runtime_modules.array "blit" args
-  | "?make_vect" -> E.runtime_call Js_runtime_modules.array "make" args
-  | "?format_float" | "?hexstring_of_float" | "?float_of_string"
-  | "?int_of_string" (* what is the semantics?*)
-  | "?int64_format" | "?int64_of_string" | "?format_int" ->
-      call Js_runtime_modules.format
-  | "?obj_dup" -> call Js_runtime_modules.obj_runtime
-  | "?obj_tag" -> (
-      (* Note that in ocaml, [int] has tag [1000] and [string] has tag [252]
-         also now we need do nullary check
-      *)
-      match args with [ e ] -> E.tag e | _ -> assert false)
-  | "?md5_string" -> call Js_runtime_modules.md5
-  | "?hash_mix_string" | "?hash_mix_int" | "?hash_final_mix" ->
-      call Js_runtime_modules.hash_primitive
-  | "?hash" -> call Js_runtime_modules.hash
-  | "?nativeint_add" -> (
-      match args with
-      | [ e1; e2 ] -> E.unchecked_int32_add e1 e2
-      | _ -> assert false)
-  | "?nativeint_div" -> (
-      match args with
-      | [ e1; e2 ] -> E.int32_div e1 e2 ~checked:false
-      | _ -> assert false)
-  | "?nativeint_mod" -> (
-      match args with
-      | [ e1; e2 ] -> E.int32_mod e1 e2 ~checked:false
-      | _ -> assert false)
-  | "?nativeint_lsr" -> (
-      match args with [ e1; e2 ] -> E.int32_lsr e1 e2 | _ -> assert false)
-  | "?nativeint_mul" -> (
-      match args with
-      | [ e1; e2 ] -> E.unchecked_int32_mul e1 e2
-      | _ -> assert false)
-  | "?bigint_div" -> (
-      match args with
-      | [ e1; e2 ] -> E.bigint_div e1 e2 ~checked:false
-      | _ -> assert false)
-  | "?bigint_mod" -> (
-      match args with
-      | [ e1; e2 ] -> E.bigint_mod e1 e2 ~checked:false
-      | _ -> assert false)
-  | "?await" -> (
-      match args with
-      | [e] -> {e with expression_desc = Await e}
-      | _ -> assert false
-  )
-  | _ ->
-      Bs_warnings.warn_missing_primitive loc prim_name;
-      E.resolve_and_apply prim_name args
-(*we dont use [throw] here, since [throw] is an statement
-  so we wrap in IIFE
-  TODO: we might provoide a hook for user to provide polyfill.
-  For example `Bs_global.xxx`
-*)
diff --git a/jscomp/core/lam_dispatch_primitive.mli b/jscomp/core/lam_dispatch_primitive.mli
deleted file mode 100644
index 0908494..0000000
--- a/jscomp/core/lam_dispatch_primitive.mli
+++ /dev/null
@@ -1,30 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Compile lambda primitives (note this is different external c calls) *)
-
-val translate : Location.t -> string -> J.expression list -> J.expression
-(** 
-    @return None when the primitives are not handled in  pre-processing
-*)
diff --git a/jscomp/core/lam_eta_conversion.ml b/jscomp/core/lam_eta_conversion.ml
deleted file mode 100644
index 8f977b3..0000000
--- a/jscomp/core/lam_eta_conversion.ml
+++ /dev/null
@@ -1,304 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(*
-  let f x y =  x + y 
-  Invariant: there is no currying 
-  here since f's arity is 2, no side effect 
-  f 3 --> function(y) -> f 3 y 
-*)
-
-(** 
-   [transform n loc status fn args]
-   n is the number of missing arguments required for [fn].
-   Return a function of airty [n]
-*)
-let transform_under_supply n ap_info fn args =
-  let extra_args = Ext_list.init n (fun _ -> Ident.create Literals.param) in
-  let extra_lambdas = Ext_list.map extra_args Lam.var in
-  match
-    Ext_list.fold_right (fn :: args) ([], []) (fun (lam : Lam.t) (acc, bind) ->
-        match lam with
-        | Lvar _
-        | Lconst
-            ( Const_int _ | Const_char _ | Const_string _ | Const_float _ | Const_bigint _
-            | Const_int64 _ | Const_pointer _ | Const_js_true | Const_js_false
-            | Const_js_undefined _ )
-        | Lprim { primitive = Pfield (_, Fld_module _); _ }
-        | Lfunction _ ->
-            (lam :: acc, bind)
-        | _ ->
-            let v = Ident.create Literals.partial_arg in
-            (Lam.var v :: acc, (v, lam) :: bind))
-  with
-  | fn :: args, [] ->
-      (* More than no side effect in the [args],
-         we try to avoid computation, so even if
-         [x + y] is side effect free, we need eval it only once
-      *)
-      (* TODO: Note we could adjust [fn] if [fn] is already a function
-         But it is dangerous to change the arity
-         of an existing function which may cause inconsistency
-      *)
-      Lam.function_ ~arity:n ~params:extra_args
-        ~attr:Lambda.default_function_attribute
-        ~body:(Lam.apply fn (Ext_list.append args extra_lambdas) ap_info)
-  | fn :: args, bindings ->
-      let rest : Lam.t =
-        Lam.function_ ~arity:n ~params:extra_args
-          ~attr:Lambda.default_function_attribute
-          ~body:(Lam.apply fn (Ext_list.append args extra_lambdas) ap_info)
-      in
-      Ext_list.fold_left bindings rest (fun lam (id, x) ->
-          Lam.let_ Strict id x lam)
-  | _, _ -> assert false
-
-(* Invariant: mk0 : (unit -> 'a0) -> 'a0 t
-                TODO: this case should be optimized,
-                we need check where we handle [arity=0]
-                as a special case --
-                if we do an optimization before compiling
-                into lambda
-
-   {[Fn.mk0]} is not intended for use by normal users
-
-   so we assume [Fn.mk0] is only used in such cases
-   {[
-     Fn.mk0 (fun _ -> .. )
-   ]}
-   when it is passed as a function directly
-*)
-(*TODO: can be optimized ?
-  {[\ x y -> (\u -> body x) x y]}
-  {[\u x -> body x]}
-    rewrite rules
-  {[
-    \x -> body
-          --
-          \y (\x -> body ) y
-  ]}
-  {[\ x y -> (\a b c -> g a b c) x y]}
-  {[ \a b -> \c -> g a b c ]}
-*)
-
-(** Unsafe function, we are changing arity here, it should be applied 
-    cautiously, since 
-    [let u = f] and we are chaning the arity of [f] it will affect 
-    the collection of [u]
-    A typical use case is to pass an OCaml function to JS side as a callback (i.e, [@uncurry])
-*)
-let unsafe_adjust_to_arity loc ~(to_ : int) ?(from : int option) (fn : Lam.t) :
-    Lam.t =
-  let ap_info : Lam.ap_info =
-    { ap_loc = loc; ap_inlined = Default_inline; ap_status = App_na }
-  in
-  let is_async_fn = match fn with
-    | Lfunction { attr = {async}} -> async 
-    | _ -> false in
-  match (from, fn) with
-  | Some from, _ | None, Lfunction { arity = from } -> (
-      if from = to_ || is_async_fn then fn
-      else if to_ = 0 then
-        match fn with
-        | Lfunction { params = [ param ]; body } ->
-            Lam.function_ ~arity:0 ~attr:Lambda.default_function_attribute
-              ~params:[]
-              ~body:(Lam.let_ Alias param Lam.unit body)
-            (* could be only introduced by
-               {[ Pjs_fn_make 0 ]} <-
-               {[ fun [@bs] () -> .. ]}
-            *)
-        | _ -> (
-            let wrapper, new_fn =
-              match fn with
-              | Lvar _
-              | Lprim
-                  {
-                    primitive = Pfield (_, Fld_module _);
-                    args = [ (Lglobal_module _ | Lvar _) ];
-                    _;
-                  } ->
-                  (None, fn)
-              | _ ->
-                  let partial_arg = Ext_ident.create Literals.partial_arg in
-                  (Some partial_arg, Lam.var partial_arg)
-            in
-
-            let cont =
-              Lam.function_ ~attr:Lambda.default_function_attribute ~arity:0
-                ~params:[]
-                ~body:(Lam.apply new_fn [ Lam.unit ] ap_info)
-            in
-
-            match wrapper with
-            | None -> cont
-            | Some partial_arg -> Lam.let_ Strict partial_arg fn cont)
-      else if to_ > from then
-        match fn with
-        | Lfunction { params; body } ->
-            (* {[fun x -> f]} ->
-               {[ fun x y -> f y ]}
-            *)
-            let extra_args =
-              Ext_list.init (to_ - from) (fun _ -> Ident.create Literals.param)
-            in
-            let rec mk_apply body vars = match vars with
-              | [] -> body
-              | var :: vars ->
-                mk_apply (Lam.apply body [var] ap_info) vars in
-            Lam.function_ ~attr:Lambda.default_function_attribute ~arity:to_
-              ~params:(Ext_list.append params extra_args)
-              ~body:(mk_apply body (Ext_list.map extra_args Lam.var))
-        | _ -> (
-            let arity = to_ in
-            let extra_args =
-              Ext_list.init to_ (fun _ -> Ident.create Literals.param)
-            in
-            let wrapper, new_fn =
-              match fn with
-              | Lvar _
-              | Lprim
-                  {
-                    primitive = Pfield (_, Fld_module _);
-                    args = [ (Lglobal_module _ | Lvar _) ];
-                    _;
-                  } ->
-                  (None, fn)
-              | _ ->
-                  let partial_arg = Ext_ident.create Literals.partial_arg in
-                  (Some partial_arg, Lam.var partial_arg)
-            in
-            let cont =
-              Lam.function_ ~arity ~attr:Lambda.default_function_attribute
-                ~params:extra_args
-                ~body:
-                  (let first_args, rest_args =
-                     Ext_list.split_at extra_args from
-                   in
-                   Lam.apply
-                     (Lam.apply new_fn
-                        (Ext_list.map first_args Lam.var)
-                        { ap_info with ap_status = App_infer_full })
-                     (Ext_list.map rest_args Lam.var)
-                     ap_info)
-            in
-            match wrapper with
-            | None -> cont
-            | Some partial_arg -> Lam.let_ Strict partial_arg fn cont)
-      else
-        (* add3  --adjust to arity 1 ->
-           fun x -> (fun y z -> add3 x y z )
-
-           [fun x y z -> f x y z ]
-           [fun x -> [fun y z -> f x y z ]]
-           This is okay if the function is not held by other..
-        *)
-        match fn with
-        | Lfunction { params; body }
-        (* TODO check arity = List.length params in debug mode *) ->
-            let arity = to_ in
-            let extra_outer_args, extra_inner_args =
-              Ext_list.split_at params arity
-            in
-            Lam.function_ ~arity ~attr:Lambda.default_function_attribute
-              ~params:extra_outer_args
-              ~body:
-                (Lam.function_ ~arity:(from - to_)
-                   ~attr:Lambda.default_function_attribute
-                   ~params:extra_inner_args ~body)
-        | _ -> (
-            let extra_outer_args =
-              Ext_list.init to_ (fun _ -> Ident.create Literals.param)
-            in
-            let wrapper, new_fn =
-              match fn with
-              | Lvar _
-              | Lprim
-                  {
-                    primitive = Pfield (_, Fld_module _);
-                    args = [ (Lglobal_module _ | Lvar _) ];
-                    _;
-                  } ->
-                  (None, fn)
-              | _ ->
-                  let partial_arg = Ext_ident.create Literals.partial_arg in
-                  (Some partial_arg, Lam.var partial_arg)
-            in
-            let cont =
-              Lam.function_ ~arity:to_ ~params:extra_outer_args
-                ~attr:Lambda.default_function_attribute
-                ~body:
-                  (let arity = from - to_ in
-                   let extra_inner_args =
-                     Ext_list.init arity (fun _ -> Ident.create Literals.param)
-                   in
-                   Lam.function_ ~arity ~params:extra_inner_args
-                     ~attr:Lambda.default_function_attribute
-                     ~body:
-                       (Lam.apply new_fn
-                          (Ext_list.map_append extra_outer_args
-                             (Ext_list.map extra_inner_args Lam.var)
-                             Lam.var)
-                          { ap_info with ap_status = App_infer_full }))
-            in
-            match wrapper with
-            | None -> cont
-            | Some partial_arg -> Lam.let_ Strict partial_arg fn cont))
-  | None, _ ->
-      (* In this case [fn] is not [Lfunction], otherwise we would get [arity] *)
-      if to_ = 0 then
-        let wrapper, new_fn =
-          match fn with
-          | Lvar _
-          | Lprim
-              {
-                primitive = Pfield (_, Fld_module _);
-                args = [ (Lglobal_module _ | Lvar _) ];
-                _;
-              } ->
-              (None, fn)
-          | _ ->
-              let partial_arg = Ext_ident.create Literals.partial_arg in
-              (Some partial_arg, Lam.var partial_arg)
-        in
-
-        let cont =
-          Lam.function_ ~attr:Lambda.default_function_attribute ~arity:0
-            ~params:[]
-            ~body:(Lam.apply new_fn [ Lam.unit ] ap_info)
-        in
-
-        match wrapper with
-        | None -> cont
-        | Some partial_arg -> Lam.let_ Strict partial_arg fn cont
-      else transform_under_supply to_ ap_info fn []
-
-(* | _ ->
-   let partial_arg = Ext_ident.create Literals.partial_arg in
-   Lam.let_ Strict partial_arg fn
-    (let arity = to_ in
-     let extra_args = Ext_list.init arity (fun _ -> Ident.create Literals.param) in
-     Lam.function_ ~arity ~kind:Curried ~params:extra_args
-       ~body:(Lam.apply fn (Ext_list.map Lam.var extra_args ) loc Lam.App_na )
-    ) *)
diff --git a/jscomp/core/lam_eta_conversion.mli b/jscomp/core/lam_eta_conversion.mli
deleted file mode 100644
index 2b8da1e..0000000
--- a/jscomp/core/lam_eta_conversion.mli
+++ /dev/null
@@ -1,34 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** 
-   [transform n loc status fn args]
-   n is the number of missing arguments required for [fn].
-   Return a function of airty [n]
-*)
-
-val transform_under_supply : int -> Lam.ap_info -> Lam.t -> Lam.t list -> Lam.t
-
-val unsafe_adjust_to_arity :
-  Location.t -> to_:int -> ?from:int -> Lam.t -> Lam.t
diff --git a/jscomp/core/lam_exit_code.ml b/jscomp/core/lam_exit_code.ml
deleted file mode 100644
index 3f42e34..0000000
--- a/jscomp/core/lam_exit_code.ml
+++ /dev/null
@@ -1,39 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let has_exit_code lam exits =
-  let rec aux (lam : Lam.t) =
-    match lam with
-    | Lfunction _ -> false
-    (* static exit can not cross function boundary *)
-    | Lstaticraise (p, _) when exits p -> true
-    | _ -> Lam_iter.inner_exists lam aux
-  in
-  aux lam
-
-let rec has_exit (lam : Lam.t) =
-  match lam with
-  | Lfunction _ -> false
-  | Lstaticraise (_, _) -> true
-  | _ -> Lam_iter.inner_exists lam has_exit
diff --git a/jscomp/core/lam_exit_code.mli b/jscomp/core/lam_exit_code.mli
deleted file mode 100644
index bd89d41..0000000
--- a/jscomp/core/lam_exit_code.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val has_exit_code : Lam.t -> (int -> bool) -> bool
-
-val has_exit : Lam.t -> bool
diff --git a/jscomp/core/lam_exit_count.ml b/jscomp/core/lam_exit_count.ml
deleted file mode 100644
index 10bee18..0000000
--- a/jscomp/core/lam_exit_count.ml
+++ /dev/null
@@ -1,110 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 collection = int Hash_int.t
-
-(* Count occurrences of (exit n ...) statements *)
-let count_exit (exits : collection) i = Hash_int.find_default exits i 0
-
-let incr_exit (exits : collection) i =
-  Hash_int.add_or_update exits i 1 ~update:succ
-
-(** 
-   This funcition counts how each [exit] is used, it will affect how the following optimizations performed.
-
-   Some smart cases (this requires the following optimizations follow it): 
-
-   {[
-     Lstaticcatch(l1, (i,_), l2) 
-   ]}
-   If [l1] does not contain [(exit i)],
-   [l2] will be removed, so don't count it.
-
-   About Switch default branch handling, it maybe backend-specific
-   See https://github.com/ocaml/ocaml/commit/fcf3571123e2c914768e34f1bd17e4cbaaa7d212#diff-704f66c0fa0fc9339230b39ce7d90919 
-   For Lstringswitch ^
-
-   For Lswitch, if it is not exhuastive pattern match, default will be counted twice.
-   Since for pattern match,  we will  test whether it is  an integer or block, both have default cases predicate: [sw_consts_full] vs nconsts
-*)
-let count_helper (lam : Lam.t) : collection =
-  let exits : collection = Hash_int.create 17 in
-  let rec count (lam : Lam.t) =
-    match lam with
-    | Lstaticraise (i, ls) ->
-        incr_exit exits i;
-        Ext_list.iter ls count
-    | Lstaticcatch (l1, (i, _), l2) ->
-        count l1;
-        if count_exit exits i > 0 then count l2
-    | Lstringswitch (l, sw, d) ->
-        count l;
-        Ext_list.iter_snd sw count;
-        Ext_option.iter d count
-    | Lglobal_module _ | Lvar _ | Lconst _ -> ()
-    | Lapply { ap_func; ap_args; _ } ->
-        count ap_func;
-        Ext_list.iter ap_args count
-    | Lfunction { body } -> count body
-    | Llet (_, _, l1, l2) ->
-        count l2;
-        count l1
-    | Lletrec (bindings, body) ->
-        Ext_list.iter_snd bindings count;
-        count body
-    | Lprim { args; _ } -> List.iter count args
-    | Lswitch (l, sw) ->
-        count_default sw;
-        count l;
-        Ext_list.iter_snd sw.sw_consts count;
-        Ext_list.iter_snd sw.sw_blocks count
-    | Ltrywith (l1, _v, l2) ->
-        count l1;
-        count l2
-    | Lifthenelse (l1, l2, l3) ->
-        count l1;
-        count l2;
-        count l3
-    | Lsequence (l1, l2) ->
-        count l1;
-        count l2
-    | Lwhile (l1, l2) ->
-        count l1;
-        count l2
-    | Lfor (_, l1, l2, _dir, l3) ->
-        count l1;
-        count l2;
-        count l3
-    | Lassign (_, l) -> count l
-  and count_default sw =
-    match sw.sw_failaction with
-    | None -> ()
-    | Some al ->
-        if (not sw.sw_consts_full) && not sw.sw_blocks_full then (
-          count al;
-          count al)
-        else count al
-  in
-  count lam;
-  exits
diff --git a/jscomp/core/lam_exit_count.mli b/jscomp/core/lam_exit_count.mli
deleted file mode 100644
index 9a621cf..0000000
--- a/jscomp/core/lam_exit_count.mli
+++ /dev/null
@@ -1,29 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 collection
-
-val count_helper : Lam.t -> collection
-
-val count_exit : collection -> int -> int
diff --git a/jscomp/core/lam_free_variables.ml b/jscomp/core/lam_free_variables.ml
deleted file mode 100644
index f832848..0000000
--- a/jscomp/core/lam_free_variables.ml
+++ /dev/null
@@ -1,102 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let pass_free_variables (l : Lam.t) : Set_ident.t =
-  let fv = ref Set_ident.empty in
-  let rec free_list xs = List.iter free xs
-  and free_list_snd : 'a. ('a * Lam.t) list -> unit =
-   fun xs -> Ext_list.iter_snd xs free
-  and free (l : Lam.t) =
-    match l with
-    | Lvar id -> fv := Set_ident.add !fv id
-    | Lassign (id, e) ->
-        free e;
-        fv := Set_ident.add !fv id
-    | Lstaticcatch (e1, (_, vars), e2) ->
-        free e1;
-        free e2;
-        Ext_list.iter vars (fun id -> fv := Set_ident.remove !fv id)
-    | Ltrywith (e1, exn, e2) ->
-        free e1;
-        free e2;
-        fv := Set_ident.remove !fv exn
-    | Lfunction { body; params } ->
-        free body;
-        Ext_list.iter params (fun param -> fv := Set_ident.remove !fv param)
-    | Llet (_str, id, arg, body) ->
-        free arg;
-        free body;
-        fv := Set_ident.remove !fv id
-    | Lletrec (decl, body) ->
-        free body;
-        free_list_snd decl;
-        Ext_list.iter decl (fun (id, _exp) -> fv := Set_ident.remove !fv id)
-    | Lfor (v, e1, e2, _dir, e3) ->
-        free e1;
-        free e2;
-        free e3;
-        fv := Set_ident.remove !fv v
-    | Lconst _ -> ()
-    | Lapply { ap_func; ap_args; _ } ->
-        free ap_func;
-        free_list ap_args
-    | Lglobal_module _ -> ()
-    (* according to the existing semantics:
-       [primitive] is not counted
-    *)
-    | Lprim { args; _ } -> free_list args
-    | Lswitch (arg, sw) ->
-        free arg;
-        free_list_snd sw.sw_consts;
-        free_list_snd sw.sw_blocks;
-        Ext_option.iter sw.sw_failaction free
-    | Lstringswitch (arg, cases, default) ->
-        free arg;
-        free_list_snd cases;
-        Ext_option.iter default free
-    | Lstaticraise (_, args) -> free_list args
-    | Lifthenelse (e1, e2, e3) ->
-        free e1;
-        free e2;
-        free e3
-    | Lsequence (e1, e2) ->
-        free e1;
-        free e2
-    | Lwhile (e1, e2) ->
-        free e1;
-        free e2
-  in
-  free l;
-  !fv
-
-(**
-        [hit_any_variables fv l]
-        check the lambda expression [l] if has some free
-        variables captured by [fv].
-        Note it does not do any checking like below
-        [Llet(str,id,arg,body)]
-        it only check [arg] or [body] is hit or not, there
-        is a case that [id] is hit in [arg] but also exists
-        in [fv], this is ignored.
-*)
diff --git a/jscomp/core/lam_free_variables.mli b/jscomp/core/lam_free_variables.mli
deleted file mode 100644
index 4126b4b..0000000
--- a/jscomp/core/lam_free_variables.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val pass_free_variables : Lam.t -> Set_ident.t
diff --git a/jscomp/core/lam_group.ml b/jscomp/core/lam_group.ml
deleted file mode 100644
index 58b24f9..0000000
--- a/jscomp/core/lam_group.ml
+++ /dev/null
@@ -1,59 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** This is not a recursive type definition *)
-type t =
-  | Single of Lam_compat.let_kind * Ident.t * Lam.t
-  | Recursive of (Ident.t * Lam.t) list
-  | Nop of Lam.t
-
-let single (kind : Lam_compat.let_kind) id (body : Lam.t) =
-  match (kind, body) with
-  | (Strict | StrictOpt), (Lvar _ | Lconst _) -> Single (Alias, id, body)
-  | _ -> Single (kind, id, body)
-
-let nop_cons (x : Lam.t) acc =
-  match x with Lvar _ | Lconst _ | Lfunction _ -> acc | _ -> Nop x :: acc
-
-(* let pp = Format.fprintf *)
-
-let str_of_kind (kind : Lam_compat.let_kind) =
-  match kind with
-  | Alias -> "a"
-  | Strict -> ""
-  | StrictOpt -> "o"
-  | Variable -> "v"
-
-let pp_group fmt (x : t) =
-  match x with
-  | Single (kind, id, lam) ->
-      Format.fprintf fmt "@[let@ %a@ =%s@ @[<hv>%a@]@ @]" Ident.print id
-        (str_of_kind kind) Lam_print.lambda lam
-  | Recursive lst ->
-      List.iter
-        (fun (id, lam) ->
-          Format.fprintf fmt "@[let %a@ =r@ %a@ @]" Ident.print id
-            Lam_print.lambda lam)
-        lst
-  | Nop lam -> Lam_print.lambda fmt lam
diff --git a/jscomp/core/lam_group.mli b/jscomp/core/lam_group.mli
deleted file mode 100644
index c6325ac..0000000
--- a/jscomp/core/lam_group.mli
+++ /dev/null
@@ -1,36 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t =
-  | Single of Lam_compat.let_kind * Ident.t * Lam.t
-  | Recursive of (Ident.t * Lam.t) list
-  | Nop of Lam.t
-
-(** Tricky to be complete *)
-
-val pp_group : Format.formatter -> t -> unit
-
-val single : Lam_compat.let_kind -> Ident.t -> Lam.t -> t
-
-val nop_cons : Lam.t -> t list -> t list
diff --git a/jscomp/core/lam_group_pass.ml b/jscomp/core/lam_group_pass.ml
deleted file mode 100644
index e4fbf62..0000000
--- a/jscomp/core/lam_group_pass.ml
+++ /dev/null
@@ -1,59 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 bindings = (Ident.t * Lam.t) list
-  let scc  (groups :  bindings)
-    (lam : Lam.t)
-    (body : Lam.t)
-    (cont : bindings -> Lam.t-> Lam.t) =
-  let domain = Ordered_hash_map.create 3 in
-  List.iter (fun (x,lam) -> Ordered_hash_map.add domain x lam) groups ;
-  let int_mapping = Ordered_hash_map.to_sorted_array domain in
-  let node_vec = Array.make (Array.length int_mapping) (Vec_int.empty ()) in
-  Ordered_hash_map.iter ( fun id lam key_index ->
-      let base_key =  node_vec.(key_index) in
-      let free_vars = Lam_util.free_variables lam in
-      Set_ident.iter (fun x ->
-          let key = Ordered_hash_map.find domain x in
-          if key >= 0 then
-            Vec_int.push key base_key
-        ) free_vars
-    ) domain;
-  let clusters = Ext_scc.graph node_vec in
-  if Int_vec_vec.length clusters <= 1 then lam
-  else
-    Int_vec_vec.fold_right (fun  (v : Vec_int.t) acc ->
-        cont (Vec_int.map_into_list (fun i ->
-            let id = int_mapping.(i) in
-            let lam  = Ordered_hash_map.find_value domain  id in
-            (id,lam)
-        ) v )  acc
-      )  clusters body
-*)
-
-let rec scc_pass (lam : Lam.t) =
-  let lam = Lam.inner_map lam scc_pass in
-  match lam with
-  | Lletrec (bindings, body) -> Lam_scc.scc bindings lam body
-  | _ -> lam
diff --git a/jscomp/core/lam_hit.ml b/jscomp/core/lam_hit.ml
deleted file mode 100644
index 032fb32..0000000
--- a/jscomp/core/lam_hit.ml
+++ /dev/null
@@ -1,91 +0,0 @@
-(* Copyright (C) 2015 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Lam.t
-
-let hit_variables (fv : Set_ident.t) (l : t) : bool =
-  let rec hit_opt (x : t option) =
-    match x with None -> false | Some a -> hit a
-  and hit_var (id : Ident.t) = Set_ident.mem fv id
-  and hit_list_snd : 'a. ('a * t) list -> bool =
-   fun x -> Ext_list.exists_snd x hit
-  and hit_list xs = Ext_list.exists xs hit
-  and hit (l : t) =
-    match (l : t) with
-    | Lvar id -> hit_var id
-    | Lassign (id, e) -> hit_var id || hit e
-    | Lstaticcatch (e1, (_, _vars), e2) -> hit e1 || hit e2
-    | Ltrywith (e1, _exn, e2) -> hit e1 || hit e2
-    | Lfunction { body; params = _ } -> hit body
-    | Llet (_str, _id, arg, body) -> hit arg || hit body
-    | Lletrec (decl, body) -> hit body || hit_list_snd decl
-    | Lfor (_v, e1, e2, _dir, e3) -> hit e1 || hit e2 || hit e3
-    | Lconst _ -> false
-    | Lapply { ap_func; ap_args; _ } -> hit ap_func || hit_list ap_args
-    | Lglobal_module _ (* global persistent module, play safe *) -> false
-    | Lprim { args; _ } -> hit_list args
-    | Lswitch (arg, sw) ->
-        hit arg || hit_list_snd sw.sw_consts || hit_list_snd sw.sw_blocks
-        || hit_opt sw.sw_failaction
-    | Lstringswitch (arg, cases, default) ->
-        hit arg || hit_list_snd cases || hit_opt default
-    | Lstaticraise (_, args) -> hit_list args
-    | Lifthenelse (e1, e2, e3) -> hit e1 || hit e2 || hit e3
-    | Lsequence (e1, e2) -> hit e1 || hit e2
-    | Lwhile (e1, e2) -> hit e1 || hit e2
-  in
-  hit l
-
-let hit_variable (fv : Ident.t) (l : t) : bool =
-  let rec hit_opt (x : t option) =
-    match x with None -> false | Some a -> hit a
-  and hit_var (id : Ident.t) = Ident.same id fv
-  and hit_list_snd : 'a. ('a * t) list -> bool =
-   fun x -> Ext_list.exists_snd x hit
-  and hit_list xs = Ext_list.exists xs hit
-  and hit (l : t) =
-    match (l : t) with
-    | Lvar id -> hit_var id
-    | Lassign (id, e) -> hit_var id || hit e
-    | Lstaticcatch (e1, (_, _vars), e2) -> hit e1 || hit e2
-    | Ltrywith (e1, _exn, e2) -> hit e1 || hit e2
-    | Lfunction { body; params = _ } -> hit body
-    | Llet (_str, _id, arg, body) -> hit arg || hit body
-    | Lletrec (decl, body) -> hit body || hit_list_snd decl
-    | Lfor (_v, e1, e2, _dir, e3) -> hit e1 || hit e2 || hit e3
-    | Lconst _ -> false
-    | Lapply { ap_func; ap_args; _ } -> hit ap_func || hit_list ap_args
-    | Lglobal_module _ (* global persistent module, play safe *) -> false
-    | Lprim { args; _ } -> hit_list args
-    | Lswitch (arg, sw) ->
-        hit arg || hit_list_snd sw.sw_consts || hit_list_snd sw.sw_blocks
-        || hit_opt sw.sw_failaction
-    | Lstringswitch (arg, cases, default) ->
-        hit arg || hit_list_snd cases || hit_opt default
-    | Lstaticraise (_, args) -> hit_list args
-    | Lifthenelse (e1, e2, e3) -> hit e1 || hit e2 || hit e3
-    | Lsequence (e1, e2) -> hit e1 || hit e2
-    | Lwhile (e1, e2) -> hit e1 || hit e2
-  in
-  hit l
diff --git a/jscomp/core/lam_hit.mli b/jscomp/core/lam_hit.mli
deleted file mode 100644
index be3199e..0000000
--- a/jscomp/core/lam_hit.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val hit_variables : Set_ident.t -> Lam.t -> bool
-
-val hit_variable : Ident.t -> Lam.t -> bool
diff --git a/jscomp/core/lam_id_kind.ml b/jscomp/core/lam_id_kind.ml
deleted file mode 100644
index 4a74ffb..0000000
--- a/jscomp/core/lam_id_kind.ml
+++ /dev/null
@@ -1,76 +0,0 @@
-(* Copyright (C) Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Keep track of which identifiers are aliased
-*)
-
-type rec_flag = Lam_rec | Lam_non_rec | Lam_self_rec
-(* only a
-   single mutual
-   recursive function
-*)
-
-type element = NA | SimpleForm of Lam.t
-
-type boxed_nullable = Undefined | Null | Null_undefined
-
-type t =
-  | Normal_optional of Lam.t (* Some [x] *)
-  | OptionalBlock of Lam.t * boxed_nullable
-  | ImmutableBlock of element array
-  | MutableBlock of element array
-  | Constant of Lam_constant.t
-  | Module of Ident.t  (** TODO: static module vs first class module *)
-  | FunctionId of {
-      mutable arity : Lam_arity.t;
-      (* TODO: This may contain some closure environment,
-         check how it will interact with dead code elimination
-      *)
-      lambda : (Lam.t * rec_flag) option;
-    }
-  | Exception
-  | Parameter
-      (** For this case, it can help us determine whether it should be inlined or not *)
-  | NA
-      (** Not such information is associated with an identifier, it is immutable, 
-           if you only associate a property to an identifier 
-           we should consider [Lassign]
-       *)
-
-let pp = Format.fprintf
-
-let print fmt (kind : t) =
-  match kind with
-  | ImmutableBlock arr -> pp fmt "Imm(%d)" (Array.length arr)
-  | Normal_optional _ -> pp fmt "Some"
-  | OptionalBlock (_, Null) -> pp fmt "?Null"
-  | OptionalBlock (_, Undefined) -> pp fmt "?Undefined"
-  | OptionalBlock (_, Null_undefined) -> pp fmt "?Nullable"
-  | MutableBlock arr -> pp fmt "Mutable(%d)" (Array.length arr)
-  | Constant _ -> pp fmt "Constant"
-  | Module id -> pp fmt "%s/%d" id.name id.stamp
-  | FunctionId _ -> pp fmt "FunctionID"
-  | Exception -> pp fmt "Exception"
-  | Parameter -> pp fmt "Parameter"
-  | NA -> pp fmt "NA"
diff --git a/jscomp/core/lam_id_kind.mli b/jscomp/core/lam_id_kind.mli
deleted file mode 100644
index 0709a53..0000000
--- a/jscomp/core/lam_id_kind.mli
+++ /dev/null
@@ -1,70 +0,0 @@
-(* Copyright (C) Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 rec_flag =
-  | Lam_rec
-  | Lam_non_rec
-  (* TODO: This may contain some closure environment,
-       check how it will interact with dead code elimination
-  *)
-  | Lam_self_rec
-(* not inlining in this case *)
-
-type element = NA | SimpleForm of Lam.t
-
-type boxed_nullable = Undefined | Null | Null_undefined
-
-(** 
-   {[ let v/2 =  Pnull_to_opt u]} 
-
-   {[ let v/2 = Pnull_to_opt exp]}
-       can be translated into 
-   {[
-     let v/1 = exp in 
-     let v/2 =a Pnull_to_opt exp 
-   ]}
-       so that [Pfield v/2 0] will be replaced by [v/1], 
-       [Lif(v/1)] will be translated into [Lif (v/2 === undefined )]
-*)
-type t =
-  | Normal_optional of Lam.t
-  | OptionalBlock of Lam.t * boxed_nullable
-  | ImmutableBlock of element array
-  | MutableBlock of element array
-  | Constant of Lam_constant.t
-  | Module of Ident.t  (** TODO: static module vs first class module *)
-  | FunctionId of {
-      mutable arity : Lam_arity.t;
-      lambda : (Lam.t * rec_flag) option;
-    }
-  | Exception
-  | Parameter
-      (** For this case, it can help us determine whether it should be inlined or not *)
-  | NA
-      (** Not such information is associated with an identifier, it is immutable, 
-           if you only associate a property to an identifier 
-           we should consider [Lassign]
-       *)
-
-val print : Format.formatter -> t -> unit
diff --git a/jscomp/core/lam_iter.ml b/jscomp/core/lam_iter.ml
deleted file mode 100644
index 56632a1..0000000
--- a/jscomp/core/lam_iter.ml
+++ /dev/null
@@ -1,115 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Lam.t
-
-type ident = Ident.t
-
-let inner_iter (l : t) (f : t -> unit) : unit =
-  match l with
-  | Lvar (_ : ident) | Lconst (_ : Lam_constant.t) -> ()
-  | Lapply { ap_func; ap_args; ap_info = _ } ->
-      f ap_func;
-      List.iter f ap_args
-  | Lfunction { body; arity = _; params = _ } -> f body
-  | Llet (_str, _id, arg, body) ->
-      f arg;
-      f body
-  | Lletrec (decl, body) ->
-      f body;
-      Ext_list.iter_snd decl f
-  | Lswitch
-      ( arg,
-        {
-          sw_consts;
-          sw_consts_full = _;
-          sw_blocks;
-          sw_blocks_full = _;
-          sw_failaction;
-        } ) ->
-      f arg;
-      Ext_list.iter_snd sw_consts f;
-      Ext_list.iter_snd sw_blocks f;
-      Ext_option.iter sw_failaction f
-  | Lstringswitch (arg, cases, default) ->
-      f arg;
-      Ext_list.iter_snd cases f;
-      Ext_option.iter default f
-  | Lglobal_module _ -> ()
-  | Lprim { args; primitive = _; loc = _ } -> List.iter f args
-  | Lstaticraise (_id, args) -> List.iter f args
-  | Lstaticcatch (e1, _vars, e2) ->
-      f e1;
-      f e2
-  | Ltrywith (e1, _exn, e2) ->
-      f e1;
-      f e2
-  | Lifthenelse (e1, e2, e3) ->
-      f e1;
-      f e2;
-      f e3
-  | Lsequence (e1, e2) ->
-      f e1;
-      f e2
-  | Lwhile (e1, e2) ->
-      f e1;
-      f e2
-  | Lfor (_v, e1, e2, _dir, e3) ->
-      f e1;
-      f e2;
-      f e3
-  | Lassign (_id, e) -> f e
-
-let inner_exists (l : t) (f : t -> bool) : bool =
-  match l with
-  | Lvar (_ : ident) | Lglobal_module _ | Lconst (_ : Lam_constant.t) -> false
-  | Lapply { ap_func; ap_args; ap_info = _ } ->
-      f ap_func || Ext_list.exists ap_args f
-  | Lfunction { body; arity = _; params = _ } -> f body
-  | Llet (_str, _id, arg, body) -> f arg || f body
-  | Lletrec (decl, body) -> f body || Ext_list.exists_snd decl f
-  | Lswitch
-      ( arg,
-        {
-          sw_consts;
-          sw_consts_full = _;
-          sw_blocks;
-          sw_blocks_full = _;
-          sw_failaction;
-        } ) ->
-      f arg
-      || Ext_list.exists_snd sw_consts f
-      || Ext_list.exists_snd sw_blocks f
-      || Ext_option.exists sw_failaction f
-  | Lstringswitch (arg, cases, default) ->
-      f arg || Ext_list.exists_snd cases f || Ext_option.exists default f
-  | Lprim { args; primitive = _; loc = _ } -> Ext_list.exists args f
-  | Lstaticraise (_id, args) -> Ext_list.exists args f
-  | Lstaticcatch (e1, _vars, e2) -> f e1 || f e2
-  | Ltrywith (e1, _exn, e2) -> f e1 || f e2
-  | Lifthenelse (e1, e2, e3) -> f e1 || f e2 || f e3
-  | Lsequence (e1, e2) -> f e1 || f e2
-  | Lwhile (e1, e2) -> f e1 || f e2
-  | Lfor (_v, e1, e2, _dir, e3) -> f e1 || f e2 || f e3
-  | Lassign (_id, e) -> f e
diff --git a/jscomp/core/lam_iter.mli b/jscomp/core/lam_iter.mli
deleted file mode 100644
index fd52fcf..0000000
--- a/jscomp/core/lam_iter.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val inner_iter : Lam.t -> (Lam.t -> unit) -> unit
-
-val inner_exists : Lam.t -> (Lam.t -> bool) -> bool
diff --git a/jscomp/core/lam_module_ident.ml b/jscomp/core/lam_module_ident.ml
deleted file mode 100644
index 797258d..0000000
--- a/jscomp/core/lam_module_ident.ml
+++ /dev/null
@@ -1,91 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = J.module_id = 
-  { id : Ident.t ; kind : Js_op.kind ; dynamic_import : bool }
-
-
-
-let id x = x.id 
-
-let of_ml ?(dynamic_import = false) id = { id ; kind =  Ml ; dynamic_import }
-
-
-let of_runtime id = { id ; kind = Runtime ; dynamic_import = false }
-
-let name  (x : t) : string  = 
-  match x.kind  with 
-  | Ml  | Runtime ->  x.id.name
-  | External {name = v} -> v  
-
-module Cmp = struct 
-  [@@@warning "+9"]  
-  type nonrec t = t
-  let equal (x : t) y = 
-    match x.kind with 
-    | External {name = x_kind; default = x_default; _} -> 
-      begin match y.kind with 
-        | External {name = y_kind; default = y_default; _} -> 
-          x_kind = (y_kind : string) && x_default = y_default
-        | _ -> false 
-      end
-    | Ml 
-    | Runtime -> Ext_ident.equal x.id y.id 
-  (* #1556
-     Note the main difference between [Ml] and [Runtime] is 
-     that we have more assumptions about [Runtime] module, 
-     like its purity etc, and its name uniqueues, in the pattern match 
-     {[
-       {Runtime, "caml_int_compare"}
-     ]}
-     and we could do more optimziations.
-     However, here if it is [hit] 
-     (an Ml module = an Runtime module), which means both exists, 
-     so adding either does not matter
-     if it is not hit, fine
-  *)
-  let hash (x : t) = 
-    match x.kind with 
-    | External {name = x_kind ; _} ->   
-      (* The hash collision is rare? *)
-      Bs_hash_stubs.hash_string x_kind 
-    | Ml 
-    | Runtime -> 
-      let x_id = x.id in 
-      Bs_hash_stubs.hash_stamp_and_name x_id.stamp x_id.name 
-end
-
-module Hash = Hash.Make (Cmp)
-
-module Hash_set = Hash_set.Make (Cmp)
-
-
diff --git a/jscomp/core/lam_module_ident.mli b/jscomp/core/lam_module_ident.mli
deleted file mode 100644
index 24e117e..0000000
--- a/jscomp/core/lam_module_ident.mli
+++ /dev/null
@@ -1,60 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-
-
-
-
-
-
-
-
-
-
-(** A type for qualified identifiers in Lambda IR 
-*)
-
-
-type t = J.module_id = 
-  (*private*) {
-  id : Ident.t ; 
-  kind : Js_op.kind ;
-  dynamic_import : bool ;
-}
-
-
-val id : t -> Ident.t 
-
-val name : t -> string
-
-
-
-val of_ml : ?dynamic_import:bool -> Ident.t -> t
-
-
-
-val of_runtime : Ident.t -> t 
-
-module Hash : Hash_gen.S with type key = t
-module Hash_set : Hash_set_gen.S with type key = t
diff --git a/jscomp/core/lam_pass_alpha_conversion.ml b/jscomp/core/lam_pass_alpha_conversion.ml
deleted file mode 100644
index aa1fd1b..0000000
--- a/jscomp/core/lam_pass_alpha_conversion.ml
+++ /dev/null
@@ -1,120 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let alpha_conversion (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
-  let rec populateApplyInfo (args_arity : int list) (len : int) (fn : Lam.t)
-      (args : Lam.t list) ap_info : Lam.t =
-    match args_arity with
-    | 0 :: _ | [] -> Lam.apply (simpl fn) (Ext_list.map args simpl) ap_info
-    | x :: _ ->
-        if x = len then
-          Lam.apply (simpl fn) (Ext_list.map args simpl)
-            { ap_info with ap_status = App_infer_full }
-        else if x > len then
-          let fn = simpl fn in
-          let args = Ext_list.map args simpl in
-          Lam_eta_conversion.transform_under_supply (x - len)
-            { ap_info with ap_status = App_infer_full }
-            fn args
-        else
-          let first, rest = Ext_list.split_at args x in
-          Lam.apply
-            (Lam.apply (simpl fn) (Ext_list.map first simpl)
-               { ap_info with ap_status = App_infer_full })
-            (Ext_list.map rest simpl) ap_info
-  (* TODO refien *)
-  and simpl (lam : Lam.t) =
-    match lam with
-    | Lconst _ -> lam
-    | Lvar _ -> lam
-    | Lapply { ap_func; ap_args; ap_info } ->
-        (* detect functor application *)
-        let args_arity =
-          Lam_arity.extract_arity (Lam_arity_analysis.get_arity meta ap_func)
-        in
-        let len = List.length ap_args in
-        populateApplyInfo args_arity len ap_func ap_args ap_info
-    | Llet (str, v, l1, l2) -> Lam.let_ str v (simpl l1) (simpl l2)
-    | Lletrec (bindings, body) ->
-        let bindings = Ext_list.map_snd bindings simpl in
-        Lam.letrec bindings (simpl body)
-    | Lglobal_module _ -> lam
-    | Lprim { primitive = Pjs_fn_make len as primitive; args = [ arg ]; loc }
-      -> (
-        match
-          Lam_arity.get_first_arity (Lam_arity_analysis.get_arity meta arg)
-        with
-        | Some x ->
-            let arg = simpl arg in
-            Lam_eta_conversion.unsafe_adjust_to_arity loc ~to_:len ~from:x arg
-        | None -> Lam.prim ~primitive ~args:[ simpl arg ] loc)
-    | Lprim { primitive = Pjs_fn_make_unit; args = [ arg ]; loc } ->
-      let arg = match arg with
-      | Lfunction ({arity=1; params=[x]; attr; body}) when Ident.name x = "param" (* "()" *) ->
-        Lam.function_ ~params:[x] ~attr:{attr with oneUnitArg=true} ~body ~arity:1
-      | _ -> arg in
-      simpl arg
-    | Lprim { primitive; args; loc } ->
-        Lam.prim ~primitive ~args:(Ext_list.map args simpl) loc
-    | Lfunction { arity; params; body; attr } ->
-        (* Lam_mk.lfunction kind params (simpl l) *)
-        Lam.function_ ~arity ~params ~body:(simpl body) ~attr
-    | Lswitch
-        ( l,
-          {
-            sw_failaction;
-            sw_consts;
-            sw_blocks;
-            sw_blocks_full;
-            sw_consts_full;
-            sw_names;
-          } ) ->
-        Lam.switch (simpl l)
-          {
-            sw_consts = Ext_list.map_snd sw_consts simpl;
-            sw_blocks = Ext_list.map_snd sw_blocks simpl;
-            sw_consts_full;
-            sw_blocks_full;
-            sw_failaction = Ext_option.map sw_failaction simpl;
-            sw_names;
-          }
-    | Lstringswitch (l, sw, d) ->
-        Lam.stringswitch (simpl l)
-          (Ext_list.map_snd sw simpl)
-          (Ext_option.map d simpl)
-    | Lstaticraise (i, ls) -> Lam.staticraise i (Ext_list.map ls simpl)
-    | Lstaticcatch (l1, ids, l2) -> Lam.staticcatch (simpl l1) ids (simpl l2)
-    | Ltrywith (l1, v, l2) -> Lam.try_ (simpl l1) v (simpl l2)
-    | Lifthenelse (l1, l2, l3) -> Lam.if_ (simpl l1) (simpl l2) (simpl l3)
-    | Lsequence (l1, l2) -> Lam.seq (simpl l1) (simpl l2)
-    | Lwhile (l1, l2) -> Lam.while_ (simpl l1) (simpl l2)
-    | Lfor (flag, l1, l2, dir, l3) ->
-        Lam.for_ flag (simpl l1) (simpl l2) dir (simpl l3)
-    | Lassign (v, l) ->
-        (* Lalias-bound variables are never assigned, so don't increase
-           v's refsimpl *)
-        Lam.assign v (simpl l)
-  in
-
-  simpl lam
diff --git a/jscomp/core/lam_pass_alpha_conversion.mli b/jscomp/core/lam_pass_alpha_conversion.mli
deleted file mode 100644
index d32e343..0000000
--- a/jscomp/core/lam_pass_alpha_conversion.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** alpha conversion based on arity *)
-
-val alpha_conversion : Lam_stats.t -> Lam.t -> Lam.t
diff --git a/jscomp/core/lam_pass_collect.ml b/jscomp/core/lam_pass_collect.ml
deleted file mode 100644
index b65825e..0000000
--- a/jscomp/core/lam_pass_collect.ml
+++ /dev/null
@@ -1,162 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Check, it is shared across ident_tbl,
-    Only [Lassign] will break such invariant,
-    how about guarantee that [Lassign] only check the local ref
-    and we track which ids are [Lassign]ed
-*)
-(**
-   might not be the same due to refinement
-   assert (old.arity = v) 
-*)
-let annotate (meta : Lam_stats.t) rec_flag (k : Ident.t) (arity : Lam_arity.t)
-    lambda =
-  Hash_ident.add meta.ident_tbl k
-    (FunctionId { arity; lambda = Some (lambda, rec_flag) })
-(* see #3609
-   we have to update since bounded function lambda
-   may contain stale unbounded varaibles
-*)
-(* match Hash_ident.find_opt  meta.ident_tbl k  with
-   | None -> (** FIXME: need do a sanity check of arity is NA or Determin(_,[],_) *)
-
-   |  Some (FunctionId old)  ->
-   Hash_ident.add meta.ident_tbl k
-    (FunctionId {arity; lambda = Some (lambda, rec_flag) })
-   (* old.arity <- arity   *)
-   (* due to we keep refining arity analysis after each round*)
-   | _ -> assert false *)
-(* TODO -- avoid exception *)
-
-(** it only make senses recording arities for 
-    function definition,
-    alias propgation - and toplevel identifiers, this needs to be exported
-*)
-let collect_info (meta : Lam_stats.t) (lam : Lam.t) =
-  let rec collect_bind rec_flag (ident : Ident.t) (lam : Lam.t) =
-    match lam with
-    | Lconst v -> Hash_ident.replace meta.ident_tbl ident (Constant v)
-    | Lprim { primitive = Pmakeblock (_, _, Immutable); args = ls } ->
-        Hash_ident.replace meta.ident_tbl ident
-          (Lam_util.kind_of_lambda_block ls);
-        List.iter collect ls
-    | Lprim { primitive = Psome | Psome_not_nest; args = [ v ] } ->
-        Hash_ident.replace meta.ident_tbl ident (Normal_optional v);
-        collect v
-    | Lprim
-        {
-          primitive = Praw_js_code { code_info = Exp (Js_function { arity }) };
-          args = _;
-        } ->
-        Hash_ident.replace meta.ident_tbl ident
-          (FunctionId { arity = Lam_arity.info [ arity ] false; lambda = None })
-    | Lprim { primitive = Pnull_to_opt; args = [ (Lvar _ as l) ]; _ } ->
-        Hash_ident.replace meta.ident_tbl ident (OptionalBlock (l, Null))
-    | Lprim { primitive = Pundefined_to_opt; args = [ (Lvar _ as l) ]; _ } ->
-        Hash_ident.replace meta.ident_tbl ident (OptionalBlock (l, Undefined))
-    | Lprim { primitive = Pnull_undefined_to_opt; args = [ (Lvar _ as l) ] } ->
-        Hash_ident.replace meta.ident_tbl ident
-          (OptionalBlock (l, Null_undefined))
-    | Lglobal_module (v, _) -> Lam_util.alias_ident_or_global meta ident v (Module v)
-    | Lvar v ->
-        (* if Ident.global v then  *)
-        Lam_util.alias_ident_or_global meta ident v NA
-        (* enven for not subsitution, it still propogate some properties *)
-        (* else () *)
-    | Lfunction { params; body }
-    (* TODO record parameters ident ?, but it will be broken after inlining *)
-      ->
-        (* TODO could be optimized in one pass?
-            -- since collect would iter everywhere,
-            so -- it would still iterate internally
-        *)
-        Ext_list.iter params (fun p ->
-            Hash_ident.add meta.ident_tbl p Parameter);
-        let arity = Lam_arity_analysis.get_arity meta lam in
-        annotate meta rec_flag ident arity lam;
-        collect body
-    | x ->
-        collect x;
-        if Set_ident.mem meta.export_idents ident then
-          annotate meta rec_flag ident (Lam_arity_analysis.get_arity meta x) lam
-  and collect (lam : Lam.t) =
-    match lam with
-    | Lconst _ -> ()
-    | Lvar _ -> ()
-    | Lapply { ap_func = l1; ap_args = ll; _ } ->
-        collect l1;
-        List.iter collect ll
-    | Lfunction { params; body = l } ->
-        (* functor ? *)
-        List.iter (fun p -> Hash_ident.add meta.ident_tbl p Parameter) params;
-        collect l
-    | Llet (_kind, ident, arg, body) ->
-        collect_bind Lam_non_rec ident arg;
-        collect body
-    | Lletrec (bindings, body) ->
-        (match bindings with
-        | [ (ident, arg) ] -> collect_bind Lam_self_rec ident arg
-        | _ ->
-            Ext_list.iter bindings (fun (ident, arg) ->
-                collect_bind Lam_rec ident arg));
-        collect body
-    | Lglobal_module _ -> ()
-    | Lprim { args; _ } -> List.iter collect args
-    | Lswitch (l, { sw_failaction; sw_consts; sw_blocks }) ->
-        collect l;
-        Ext_list.iter_snd sw_consts collect;
-        Ext_list.iter_snd sw_blocks collect;
-        Ext_option.iter sw_failaction collect
-    | Lstringswitch (l, sw, d) ->
-        collect l;
-        Ext_list.iter_snd sw collect;
-        Ext_option.iter d collect
-    | Lstaticraise (_code, ls) -> List.iter collect ls
-    | Lstaticcatch (l1, (_, _), l2) ->
-        collect l1;
-        collect l2
-    | Ltrywith (l1, _, l2) ->
-        collect l1;
-        collect l2
-    | Lifthenelse (l1, l2, l3) ->
-        collect l1;
-        collect l2;
-        collect l3
-    | Lsequence (l1, l2) ->
-        collect l1;
-        collect l2
-    | Lwhile (l1, l2) ->
-        collect l1;
-        collect l2
-    | Lfor (_, l1, l2, _dir, l3) ->
-        collect l1;
-        collect l2;
-        collect l3
-    | Lassign (_v, l) ->
-        (* Lalias-bound variables are never assigned, so don't increase
-           v's refcollect *)
-        collect l
-  in
-  collect lam
diff --git a/jscomp/core/lam_pass_collect.mli b/jscomp/core/lam_pass_collect.mli
deleted file mode 100644
index 4f7c45c..0000000
--- a/jscomp/core/lam_pass_collect.mli
+++ /dev/null
@@ -1,72 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** This pass is used to collect meta data information.
-
-    It includes:
-    alias table, arity for identifiers and might more information,
-
-    ATTENTION:
-    For later pass to keep its information complete and up to date,
-    we  need update its table accordingly
-
-    - Alias inference is not for substitution, it is for analyze which module is 
-      actually a global module or an exception, so it can be relaxed a bit
-      (without relying on strict analysis)
-
-    - Js object (local) analysis 
-
-    Design choice:
-
-    Side effectful operations:
-    - Lassign 
-    - Psetfield
-
-    1. What information should be collected:
-
-    2. What's the key
-       If it's identifier, 
-
-    Information that is always sound, not subject to change 
-
-    - shall we collect that if an identifier is passed as a parameter, (useful for escape analysis), 
-      however, since it's going to change after inlning (for local function)
-
-    - function arity, subject to change when you make it a mutable ref and change it later
-
-    - Immutable blocks of identifiers
-
-      if identifier itself is function/non block then the access can be inlined 
-      if identifier itself is immutable block can be inlined
-      if identifier is mutable block can be inlined (without Lassign) since
-
-    - When collect some information, shall we propogate this information to 
-      all alias table immeidately
-
-    - annotation identifiers (at first time)
-      -
-*)
-
-val collect_info : Lam_stats.t -> Lam.t -> unit
-(** Modify existing [meta] *)
diff --git a/jscomp/core/lam_pass_count.ml b/jscomp/core/lam_pass_count.ml
deleted file mode 100644
index b7ee7a8..0000000
--- a/jscomp/core/lam_pass_count.ml
+++ /dev/null
@@ -1,199 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the Q Public License version 1.0.               *)
-(*                                                                     *)
-(***********************************************************************)
-(* Adapted for Javascript backend : Hongbo Zhang,  *)
-
-(*A naive dead code elimination *)
-type used_info = {
-  mutable times : int;
-  mutable captured : bool;
-      (* captured in functon or loop,
-         inline in such cases should be careful
-         1. can not inline mutable values
-         2. avoid re-computation
-      *)
-}
-
-type occ_tbl = used_info Hash_ident.t
-(* First pass: count the occurrences of all let-bound identifiers *)
-
-type local_tbl = used_info Map_ident.t
-
-let dummy_info () = { times = 0; captured = false }
-(* y is untouched *)
-
-let absorb_info (x : used_info) (y : used_info) =
-  match (x, y) with
-  | { times = x0 }, { times = y0; captured } ->
-      x.times <- x0 + y0;
-      if captured then x.captured <- true
-
-let pp_info fmt (x : used_info) =
-  Format.fprintf fmt "(<captured:%b>:%d)" x.captured x.times
-
-let pp_occ_tbl fmt tbl =
-  Hash_ident.iter tbl (fun k v ->
-      Format.fprintf fmt "@[%a@ %a@]@." Ident.print k pp_info v)
-
-(* The global table [occ] associates to each let-bound identifier
-   the number of its uses (as a reference):
-   - 0 if never used
-   - 1 if used exactly once in and not under a lambda or within a loop
-   - when under a lambda,
-   - it's probably a closure
-   - within a loop
-   - update reference,
-       niether is good for inlining
-   - > 1 if used several times or under a lambda or within a loop.
-     The local table [bv] associates to each locally-let-bound variable
-     its reference count, as above.  [bv] is enriched at let bindings
-     but emptied when crossing lambdas and loops. *)
-let collect_occurs lam : occ_tbl =
-  let occ : occ_tbl = Hash_ident.create 83 in
-
-  (* Current use count of a variable. *)
-  let used v =
-    match Hash_ident.find_opt occ v with
-    | None -> false
-    | Some { times; _ } -> times > 0
-  in
-
-  (* Entering a [let].  Returns updated [bv]. *)
-  let bind_var bv ident =
-    let r = dummy_info () in
-    Hash_ident.add occ ident r;
-    Map_ident.add bv ident r
-  in
-
-  (* Record a use of a variable *)
-  let add_one_use bv ident =
-    match Map_ident.find_opt bv ident with
-    | Some r -> r.times <- r.times + 1
-    | None -> (
-        (* ident is not locally bound, therefore this is a use under a lambda
-           or within a loop.  Increase use count by 2 -- enough so
-           that single-use optimizations will not apply. *)
-        match Hash_ident.find_opt occ ident with
-        | Some r -> absorb_info r { times = 1; captured = true }
-        | None ->
-            (* Not a let-bound variable, ignore *)
-            ())
-  in
-
-  let inherit_use bv ident bid =
-    let n =
-      match Hash_ident.find_opt occ bid with
-      | None -> dummy_info ()
-      | Some v -> v
-    in
-    match Map_ident.find_opt bv ident with
-    | Some r -> absorb_info r n
-    | None -> (
-        (* ident is not locally bound, therefore this is a use under a lambda
-           or within a loop.  Increase use count by 2 -- enough so
-           that single-use optimizations will not apply. *)
-        match Hash_ident.find_opt occ ident with
-        | Some r -> absorb_info r { n with captured = true }
-        | None ->
-            (* Not a let-bound variable, ignore *)
-            ())
-  in
-
-  let rec count (bv : local_tbl) (lam : Lam.t) =
-    match lam with
-    | Lfunction { body = l } -> count Map_ident.empty l
-    (* when entering a function local [bv]
-        is cleaned up, so that all closure variables will not be
-        carried over, since the parameters are never rebound,
-        so it is fine to kep it empty
-    *)
-    | Lfor (_, l1, l2, _dir, l3) ->
-        count bv l1;
-        count bv l2;
-        count Map_ident.empty l3
-    | Lwhile (l1, l2) ->
-        count Map_ident.empty l1;
-        count Map_ident.empty l2
-    | Lvar v -> add_one_use bv v
-    | Llet (_, v, Lvar w, l2) ->
-        (* v will be replaced by w in l2, so each occurrence of v in l2
-           increases w's refcount *)
-        count (bind_var bv v) l2;
-        inherit_use bv w v
-    | Llet (kind, v, l1, l2) ->
-        count (bind_var bv v) l2;
-        (* count [l2] first,
-           If v is unused, l1 will be removed, so don't count its variables *)
-        if kind = Strict || used v then count bv l1
-    | Lassign (_, l) ->
-        (* Lalias-bound variables are never assigned, so don't increase
-           this ident's refcount *)
-        count bv l
-    | Lglobal_module _ -> ()
-    | Lprim { args; _ } -> List.iter (count bv) args
-    | Lletrec (bindings, body) ->
-        List.iter (fun (_v, l) -> count bv l) bindings;
-        count bv body
-    (* Note there is a difference here when do beta reduction for *)
-    | Lapply { ap_func = Lfunction ({ params; body } as lfunction); ap_args = args; _ }
-      when Ext_list.same_length params args && Lam_analysis.lfunction_can_be_beta_reduced lfunction ->
-        count bv (Lam_beta_reduce.no_names_beta_reduce params body args)
-    (* | Lapply{fn = Lfunction{function_kind = Tupled; params; body}; *)
-    (*          args = [Lprim {primitive = Pmakeblock _;  args; _}]; _} *)
-    (*   when  Ext_list.same_length params  args -> *)
-    (*   count bv (Lam_beta_reduce.beta_reduce   params body args) *)
-    | Lapply { ap_func = l1; ap_args = ll; _ } ->
-        count bv l1;
-        List.iter (count bv) ll
-    | Lconst _cst -> ()
-    | Lswitch (l, sw) ->
-        count_default bv sw;
-        count bv l;
-        List.iter (fun (_, l) -> count bv l) sw.sw_consts;
-        List.iter (fun (_, l) -> count bv l) sw.sw_blocks
-    | Lstringswitch (l, sw, d) -> (
-        count bv l;
-        List.iter (fun (_, l) -> count bv l) sw;
-        match d with Some d -> count bv d | None -> ())
-    (* x2 for native backend *)
-    (* begin match sw with *)
-    (* | []|[_] -> count bv d *)
-    (* | _ -> count bv d ; count bv d *)
-    (* end *)
-    | Lstaticraise (_i, ls) -> List.iter (count bv) ls
-    | Lstaticcatch (l1, (_i, _), l2) ->
-        count bv l1;
-        count bv l2
-    | Ltrywith (l1, _v, l2) ->
-        count bv l1;
-        count bv l2
-    | Lifthenelse (l1, l2, l3) ->
-        count bv l1;
-        count bv l2;
-        count bv l3
-    | Lsequence (l1, l2) ->
-        count bv l1;
-        count bv l2
-  and count_default bv sw =
-    match sw.sw_failaction with
-    | None -> ()
-    | Some al ->
-        if (not sw.sw_consts_full) && not sw.sw_blocks_full then (
-          (* default action will occur twice in native code *)
-          count bv al;
-          count bv al)
-        else (
-          (* default action will occur once *)
-          assert ((not sw.sw_consts_full) || not sw.sw_blocks_full);
-          count bv al)
-  in
-  count Map_ident.empty lam;
-  occ
diff --git a/jscomp/core/lam_pass_count.mli b/jscomp/core/lam_pass_count.mli
deleted file mode 100644
index c8cc1f8..0000000
--- a/jscomp/core/lam_pass_count.mli
+++ /dev/null
@@ -1,30 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the Q Public License version 1.0.               *)
-(*                                                                     *)
-(***********************************************************************)
-(* Adapted for Javascript backend : Hongbo Zhang,  *)
-
-type used_info = {
-  mutable times : int;
-  mutable captured : bool;
-      (* captured in functon or loop,
-         inline in such cases should be careful
-         1. can not inline mutable values
-         2. avoid re-computation
-      *)
-}
-
-type occ_tbl = used_info Hash_ident.t
-
-val dummy_info : unit -> used_info
-
-val collect_occurs : Lam.t -> occ_tbl
-
-val pp_occ_tbl : Format.formatter -> occ_tbl -> unit
diff --git a/jscomp/core/lam_pass_deep_flatten.ml b/jscomp/core/lam_pass_deep_flatten.ml
deleted file mode 100644
index 73d8814..0000000
--- a/jscomp/core/lam_pass_deep_flatten.ml
+++ /dev/null
@@ -1,272 +0,0 @@
-(* Copyright (C) 2015- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 eliminate =
-   |  Not_eliminatable
-   | *)
-
-let rec eliminate_tuple (id : Ident.t) (lam : Lam.t) acc =
-  match lam with
-  | Llet
-      (Alias, v, Lprim { primitive = Pfield (i, _); args = [ Lvar tuple ] }, e2)
-    when Ident.same tuple id ->
-      eliminate_tuple id e2 (Map_int.add acc i v)
-  (* it is okay to have duplicates*)
-  | _ -> if Lam_hit.hit_variable id lam then None else Some (acc, lam)
-(* [groups] are in reverse order *)
-
-(* be careful to flatten letrec
-    like below :
-    {[
-      let rec even =
-        let odd n =  if n ==1 then true else even (n - 1) in
-        fun n -> if n ==0  then true else odd (n - 1)
-    ]}
-    odd and even are recursive values, since all definitions inside
-    e.g, [odd] can see [even] now, however, it should be fine
-    in our case? since ocaml's recursive value does not allow immediate
-    access its value direclty?, seems no
-    {[
-      let rec even2 =
-        let odd = even2 in
-        fun n -> if n ==0  then true else odd (n - 1)
-    ]}
-*)
-(* FIXME:
-    here we try to move inner definitions of [recurisve value] upwards
-    for example:
-   {[
-     let rec x =
-       let y = 32 in
-       y :: x
-     and z = ..
-       ---
-       le ty = 32 in
-     let rec x = y::x
-     and z = ..
-   ]}
-    however, the inner definitions can see [z] and [x], so we
-    can not blindly move it in the beginning, however, for
-    recursive value, ocaml does not allow immediate access to
-    recursive value, so what's the best strategy?
-    ---
-    the motivation is to capture real tail call
-*)
-(* | Single ((Alias | Strict | StrictOpt), id, ( Lfunction _ )) ->
-   (** FIXME:
-   It should be alias and alias will be optimized away
-   in later optmizations, however,
-   this means if we don't optimize
-   {[ let u/a = v in ..]}
-                          the output would be wrong, we should *optimize
-                          this away right now* instead of delaying it to the
-                          later passes
-                        *)
-                          (acc, set, g :: wrap, stop)
-*)
-(* could also be from nested [let rec]
-          like
-   {[
-     let rec x =
-       let rec y = 1 :: y in
-       2:: List.hd y:: x
-   ]}
-          TODO: seems like we should update depenency graph,
-*)
-
-(* Printlambda.lambda Format.err_formatter lam ; assert false  *)
-
-(** TODO: more flattening,
-                    - also for function compilation, flattening should be done first
-                    - [compile_group] and [compile] become mutually recursive function
-                *)
-let lambda_of_groups ~(rev_bindings : Lam_group.t list) (result : Lam.t) : Lam.t
-    =
-  Ext_list.fold_left rev_bindings result (fun acc x ->
-      match x with
-      | Nop l -> Lam.seq l acc
-      | Single (kind, ident, lam) -> Lam_util.refine_let ~kind ident lam acc
-      | Recursive bindings -> Lam.letrec bindings acc)
-
-(* TODO:
-    refine effectful [ket_kind] to be pure or not
-    Be careful of how [Lifused(v,l)] work
-    since its semantics depend on whether v is used or not
-    return value are in reverse order, but handled by [lambda_of_groups]
-*)
-let deep_flatten (lam : Lam.t) : Lam.t =
-  let rec flatten (acc : Lam_group.t list) (lam : Lam.t) :
-      Lam.t * Lam_group.t list =
-    match lam with
-    | Llet
-        ( str,
-          id,
-          (Lprim
-             {
-               primitive =
-                 Pnull_to_opt | Pundefined_to_opt | Pnull_undefined_to_opt;
-               args = [ Lvar _ ];
-             } as arg),
-          body ) ->
-        flatten (Single (str, id, aux arg) :: acc) body
-    | Llet
-        ( str,
-          id,
-          Lprim
-            {
-              primitive =
-                (Pnull_to_opt | Pundefined_to_opt | Pnull_undefined_to_opt) as
-                primitive;
-              args = [ arg ];
-            },
-          body ) ->
-        let newId = Ident.rename id in
-        flatten acc
-          (Lam.let_ str newId arg
-             (Lam.let_ Alias id
-                (Lam.prim ~primitive ~args:[ Lam.var newId ]
-                   Location.none (* FIXME*))
-                body))
-    | Llet (str, id, arg, body) -> (
-        (*
-                         {[ let match = (a,b,c)
-                           let d = (match/1)
-                           let e = (match/2)
-                                   ..
-                         ]}
-                      *)
-        let res, accux = flatten acc arg in
-        match (id.name, str, res) with
-        | ( ("match" | "include" | "param"),
-            (Alias | Strict | StrictOpt),
-            Lprim { primitive = Pmakeblock (_, _, Immutable); args } ) -> (
-            match eliminate_tuple id body Map_int.empty with
-            | Some (tuple_mapping, body) ->
-                flatten
-                  (Ext_list.fold_left_with_offset args accux 0 (fun arg acc i ->
-                       match Map_int.find_opt tuple_mapping i with
-                       | None -> Lam_group.nop_cons arg acc
-                       | Some key -> Lam_group.single str key arg :: acc))
-                  body
-            | None -> flatten (Single (str, id, res) :: accux) body)
-        | _ -> flatten (Single (str, id, res) :: accux) body)
-    | Lletrec (bind_args, body) ->
-        flatten (Recursive (Ext_list.map_snd bind_args aux) :: acc) body
-    | Lsequence (l, r) ->
-        let res, l = flatten acc l in
-        flatten (Lam_group.nop_cons res l) r
-    | x -> (aux x, acc)
-  and aux (lam : Lam.t) : Lam.t =
-    match lam with
-    | Llet _ ->
-        let res, groups = flatten [] lam in
-        lambda_of_groups res ~rev_bindings:groups
-    | Lletrec (bind_args, body) ->
-        (* Attention: don't mess up with internal {let rec} *)
-        let rec iter bind_args groups set =
-          match bind_args with
-          | [] -> (List.rev groups, set)
-          | (id, arg) :: rest ->
-              iter rest ((id, aux arg) :: groups) (Set_ident.add set id)
-        in
-        let groups, collections = iter bind_args [] Set_ident.empty in
-        (* Try to extract some value definitions from recursive values as [wrap],
-           it will stop whenever it find it could not move forward
-           {[
-             let rec x =
-               let y = 1 in
-               let z = 2 in
-               ...
-           ]}
-        *)
-        let rev_bindings, rev_wrap, _ =
-          Ext_list.fold_left groups ([], [], false)
-            (fun (inner_recursive_bindings, wrap, stop) (id, lam) ->
-              if stop || Lam_hit.hit_variables collections lam then
-                ((id, lam) :: inner_recursive_bindings, wrap, true)
-              else
-                ( inner_recursive_bindings,
-                  Lam_group.Single (Strict, id, lam) :: wrap,
-                  false ))
-        in
-        lambda_of_groups
-          ~rev_bindings:
-            rev_wrap (* These bindings are extracted from [letrec] *)
-          (Lam.letrec (List.rev rev_bindings) (aux body))
-    | Lsequence (l, r) -> Lam.seq (aux l) (aux r)
-    | Lconst _ -> lam
-    | Lvar _ -> lam
-    (* | Lapply(Lfunction(Curried, params, body), args, _) *)
-    (*   when  List.length params = List.length args -> *)
-    (*     aux (beta_reduce  params body args) *)
-    (* | Lapply(Lfunction(Tupled, params, body), [Lprim(Pmakeblock _, args)], _) *)
-    (*     (\** TODO: keep track of this parameter in ocaml trunk, *)
-    (*           can we switch to the tupled backend? *\) *)
-    (*   when  List.length params = List.length args -> *)
-    (*       aux (beta_reduce params body args) *)
-    | Lapply { ap_func = l1; ap_args = ll; ap_info } ->
-        Lam.apply (aux l1) (Ext_list.map ll aux) ap_info
-    (* This kind of simple optimizations should be done each time
-       and as early as possible *)
-    | Lglobal_module _ -> lam
-    | Lprim { primitive; args; loc } ->
-        let args = Ext_list.map args aux in
-        Lam.prim ~primitive ~args loc
-    | Lfunction { arity; params; body; attr } ->
-        Lam.function_ ~arity ~params ~body:(aux body) ~attr
-    | Lswitch
-        ( l,
-          {
-            sw_failaction;
-            sw_consts;
-            sw_blocks;
-            sw_blocks_full;
-            sw_consts_full;
-            sw_names;
-          } ) ->
-        Lam.switch (aux l)
-          {
-            sw_consts = Ext_list.map_snd sw_consts aux;
-            sw_blocks = Ext_list.map_snd sw_blocks aux;
-            sw_consts_full;
-            sw_blocks_full;
-            sw_failaction = Ext_option.map sw_failaction aux;
-            sw_names;
-          }
-    | Lstringswitch (l, sw, d) ->
-        Lam.stringswitch (aux l) (Ext_list.map_snd sw aux)
-          (Ext_option.map d aux)
-    | Lstaticraise (i, ls) -> Lam.staticraise i (Ext_list.map ls aux)
-    | Lstaticcatch (l1, ids, l2) -> Lam.staticcatch (aux l1) ids (aux l2)
-    | Ltrywith (l1, v, l2) -> Lam.try_ (aux l1) v (aux l2)
-    | Lifthenelse (l1, l2, l3) -> Lam.if_ (aux l1) (aux l2) (aux l3)
-    | Lwhile (l1, l2) -> Lam.while_ (aux l1) (aux l2)
-    | Lfor (flag, l1, l2, dir, l3) ->
-        Lam.for_ flag (aux l1) (aux l2) dir (aux l3)
-    | Lassign (v, l) ->
-        (* Lalias-bound variables are never assigned, so don't increase
-           v's refaux *)
-        Lam.assign v (aux l)
-  in
-  aux lam
diff --git a/jscomp/core/lam_pass_deep_flatten.mli b/jscomp/core/lam_pass_deep_flatten.mli
deleted file mode 100644
index 74e195f..0000000
--- a/jscomp/core/lam_pass_deep_flatten.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val deep_flatten : Lam.t -> Lam.t
diff --git a/jscomp/core/lam_pass_eliminate_ref.ml b/jscomp/core/lam_pass_eliminate_ref.ml
deleted file mode 100644
index c5325c1..0000000
--- a/jscomp/core/lam_pass_eliminate_ref.ml
+++ /dev/null
@@ -1,103 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the Q Public License version 1.0.               *)
-(*                                                                     *)
-(***********************************************************************)
-(* Adapted for Javascript backend : Hongbo Zhang,  *)
-
-exception Real_reference
-
-let rec eliminate_ref id (lam : Lam.t) =
-  match lam with
-  (* we can do better escape analysis in Javascript backend *)
-  | Lvar v -> if Ident.same v id then raise_notrace Real_reference else lam
-  | Lprim { primitive = Pfield (0, _); args = [ Lvar v ] } when Ident.same v id
-    ->
-      Lam.var id
-  | Lfunction _ ->
-      if Lam_hit.hit_variable id lam then raise_notrace Real_reference else lam
-  (* In Javascript backend, its okay, we can reify it later
-     a failed case
-     {[
-       for i = ..
-           let v = ref 0
-               for j = ..
-                   incr v
-                     a[j] = ()=>{!v}
-
-     ]}
-     here v is captured by a block, and it's a loop mutable value,
-     we have to generate
-     {[
-       for i = ..
-           let v = ref 0
-               (function (v){for j = ..
-                                   a[j] = ()=>{!v}}(v)
-
-     ]}
-     now, v is a real reference
-     TODO: we can refine analysis in later
-  *)
-  (* Lfunction(kind, params, eliminate_ref id body) *)
-  | Lprim { primitive = Psetfield (0, _); args = [ Lvar v; e ] }
-    when Ident.same v id ->
-      Lam.assign id (eliminate_ref id e)
-  | Lprim { primitive = Poffsetref delta; args = [ Lvar v ]; loc }
-    when Ident.same v id ->
-      Lam.assign id
-        (Lam.prim ~primitive:(Poffsetint delta) ~args:[ Lam.var id ] loc)
-  | Lconst _ -> lam
-  | Lapply { ap_func = e1; ap_args = el; ap_info } ->
-      Lam.apply (eliminate_ref id e1)
-        (Ext_list.map el (eliminate_ref id))
-        ap_info
-  | Llet (str, v, e1, e2) ->
-      Lam.let_ str v (eliminate_ref id e1) (eliminate_ref id e2)
-  | Lletrec (idel, e2) ->
-      Lam.letrec
-        (Ext_list.map idel (fun (v, e) -> (v, eliminate_ref id e)))
-        (eliminate_ref id e2)
-  | Lglobal_module _ -> lam
-  | Lprim { primitive; args; loc } ->
-      Lam.prim ~primitive ~args:(Ext_list.map args (eliminate_ref id)) loc
-  | Lswitch (e, sw) ->
-      Lam.switch (eliminate_ref id e)
-        {
-          sw_consts_full = sw.sw_consts_full;
-          sw_consts =
-            Ext_list.map sw.sw_consts (fun (n, e) -> (n, eliminate_ref id e));
-          sw_blocks_full = sw.sw_blocks_full;
-          sw_blocks =
-            Ext_list.map sw.sw_blocks (fun (n, e) -> (n, eliminate_ref id e));
-          sw_failaction =
-            (match sw.sw_failaction with
-            | None -> None
-            | Some x -> Some (eliminate_ref id x));
-          sw_names = sw.sw_names;
-        }
-  | Lstringswitch (e, sw, default) ->
-      Lam.stringswitch (eliminate_ref id e)
-        (Ext_list.map sw (fun (s, e) -> (s, eliminate_ref id e)))
-        (match default with
-        | None -> None
-        | Some x -> Some (eliminate_ref id x))
-  | Lstaticraise (i, args) ->
-      Lam.staticraise i (Ext_list.map args (eliminate_ref id))
-  | Lstaticcatch (e1, i, e2) ->
-      Lam.staticcatch (eliminate_ref id e1) i (eliminate_ref id e2)
-  | Ltrywith (e1, v, e2) ->
-      Lam.try_ (eliminate_ref id e1) v (eliminate_ref id e2)
-  | Lifthenelse (e1, e2, e3) ->
-      Lam.if_ (eliminate_ref id e1) (eliminate_ref id e2) (eliminate_ref id e3)
-  | Lsequence (e1, e2) -> Lam.seq (eliminate_ref id e1) (eliminate_ref id e2)
-  | Lwhile (e1, e2) -> Lam.while_ (eliminate_ref id e1) (eliminate_ref id e2)
-  | Lfor (v, e1, e2, dir, e3) ->
-      Lam.for_ v (eliminate_ref id e1) (eliminate_ref id e2) dir
-        (eliminate_ref id e3)
-  | Lassign (v, e) -> Lam.assign v (eliminate_ref id e)
diff --git a/jscomp/core/lam_pass_eliminate_ref.mli b/jscomp/core/lam_pass_eliminate_ref.mli
deleted file mode 100644
index e63428a..0000000
--- a/jscomp/core/lam_pass_eliminate_ref.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-exception Real_reference
-
-val eliminate_ref : Ident.t -> Lam.t -> Lam.t
diff --git a/jscomp/core/lam_pass_exits.ml b/jscomp/core/lam_pass_exits.ml
deleted file mode 100644
index e890327..0000000
--- a/jscomp/core/lam_pass_exits.ml
+++ /dev/null
@@ -1,244 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the Q Public License version 1.0.               *)
-(*                                                                     *)
-(***********************************************************************)
-(* Adapted for Javascript backend: Hongbo Zhang                        *)
-
-(**
-        [no_bounded_varaibles lambda]
-        checks if [lambda] contains bounded variable, for
-        example [Llet (str,id,arg,body) ] will fail such check.
-        This is used to indicate such lambda expression if it is okay
-        to inline directly since if it contains bounded variables it
-        must be rebounded before inlining
-*)
-let rec no_list args = Ext_list.for_all args no_bounded_variables
-
-and no_list_snd : 'a. ('a * Lam.t) list -> bool =
- fun args -> Ext_list.for_all_snd args no_bounded_variables
-
-and no_opt x = match x with None -> true | Some a -> no_bounded_variables a
-
-and no_bounded_variables (l : Lam.t) =
-  match l with
-  | Lvar _ -> true
-  | Lconst _ -> true
-  | Lassign (_id, e) -> no_bounded_variables e
-  | Lapply { ap_func; ap_args; _ } ->
-      no_bounded_variables ap_func && no_list ap_args
-  | Lglobal_module _ -> true
-  | Lprim { args; primitive = _ } -> no_list args
-  | Lswitch (arg, sw) ->
-      no_bounded_variables arg && no_list_snd sw.sw_consts
-      && no_list_snd sw.sw_blocks && no_opt sw.sw_failaction
-  | Lstringswitch (arg, cases, default) ->
-      no_bounded_variables arg && no_list_snd cases && no_opt default
-  | Lstaticraise (_, args) -> no_list args
-  | Lifthenelse (e1, e2, e3) ->
-      no_bounded_variables e1 && no_bounded_variables e2
-      && no_bounded_variables e3
-  | Lsequence (e1, e2) -> no_bounded_variables e1 && no_bounded_variables e2
-  | Lwhile (e1, e2) -> no_bounded_variables e1 && no_bounded_variables e2
-  | Lstaticcatch (e1, (_, vars), e2) ->
-      vars = [] && no_bounded_variables e1 && no_bounded_variables e2
-  | Lfunction { body; params } -> params = [] && no_bounded_variables body
-  | Lfor _ -> false
-  | Ltrywith _ -> false
-  | Llet _ -> false
-  | Lletrec (decl, body) -> decl = [] && no_bounded_variables body
-
-(*
-   TODO: 
-   we should have a pass called, always inlinable
-   as long as its length is smaller than [exit=exit_id], for example
-
-   {[
-     switch(box_name)
-       {case "":exit=178;break;
-        case "b":exit=178;break;
-        case "h":box_type=/* Pp_hbox */0;break;
-        case "hov":box_type=/* Pp_hovbox */3;break;
-        case "hv":box_type=/* Pp_hvbox */2;break;
-        case "v":box_type=/* Pp_vbox */1;break;
-        default:box_type=invalid_box(/* () */0);}
-
-       switch(exit){case 178:box_type=/* Pp_box */4;break}
-   ]}
-*)
-
-(** The third argument is its occurrence,
-    when do the substitution, if its occurence is > 1,
-    we should refresh
-*)
-type lam_subst = Id of Lam.t [@@unboxed]
-(* | Refresh of Lam.t *)
-
-type subst_tbl = (Ident.t list * lam_subst) Hash_int.t
-
-let to_lam x = match x with Id x -> x
-(* | Refresh x -> Lam_bounded_vars.refresh x  *)
-
-(**
-   Simplify  ``catch body with (i ...) handler''
-   - if (exit i ...) does not occur in body, suppress catch
-   - if (exit i ...) occurs exactly once in body,
-        substitute it with handler
-   - If handler is a single variable, replace (exit i ..) with it
-
-
-   Note:
-    In ``catch body with (i x1 .. xn) handler''
-     Substituted expression is
-      let y1 = x1 and ... yn = xn in
-      handler[x1 <- y1 ; ... ; xn <- yn]
-     For the sake of preserving the uniqueness  of bound variables.
-   ASKS: This documentation seems outdated
-     (No alpha conversion of ``handler'' is presently needed, since
-     substitution of several ``(exit i ...)''
-     occurs only when ``handler'' is a variable.)
-   Note that 
-           for [query] result = 2, 
-           the non-inline cost is 
-   {[
-     var exit ;
-
-     exit = 11;
-     exit = 11;
-
-     switch(exit){
-       case exit = 11 : body ; break
-     }
-
-   ]}
-           the inline cost is 
-
-   {[
-     body;
-     body;
-   ]}
-
-           when [i] is negative, we can not inline in general, 
-           since the outer is a traditional [try .. catch] body, 
-           if it is guaranteed to be non throw, then we can inline
-*)
-
-(** TODO: better heuristics, also if we can group same exit code [j] 
-       in a very early stage -- maybe we can define our enhanced [Lambda] 
-       representation and counter can be more precise, for example [apply] 
-       does not need patch from the compiler
-
-       FIXME:   when inlining, need refresh local bound identifiers
-       #1438 when the action containes bounded variable 
-         to keep the invariant, everytime, we do an inlining,
-         we need refresh, just refreshing once is not enough
-    We need to decide whether inline or not based on post-simplification
-       code, since when we do the substitution 
-       we use the post-simplified expression, it is more consistent
-       TODO: when we do the case merging on the js side, 
-       the j is not very indicative                
-*)
-
-let subst_helper (subst : subst_tbl) (query : int -> int) (lam : Lam.t) : Lam.t
-    =
-  let rec simplif (lam : Lam.t) =
-    match lam with
-    | Lstaticcatch (l1, (i, xs), l2) -> (
-        let i_occur = query i in
-        match (i_occur, l2) with
-        | 0, _ -> simplif l1
-        | _, Lvar _ | _, Lconst _ (* when i >= 0  # 2316 *) ->
-            Hash_int.add subst i (xs, Id (simplif l2));
-            simplif l1 (* l1 will inline *)
-        | 1, _ when i >= 0 ->
-            (* Ask: Note that we have predicate i >=0 *)
-            Hash_int.add subst i (xs, Id (simplif l2));
-            simplif l1 (* l1 will inline *)
-        | _ ->
-            let l2 = simplif l2 in
-            (* we only inline when [l2] does not contain bound variables
-               no need to refresh
-            *)
-            let ok_to_inline =
-              i >= 0 && no_bounded_variables l2
-              &&
-              let lam_size = Lam_analysis.size l2 in
-              (i_occur <= 2 && lam_size < Lam_analysis.exit_inline_size)
-              || lam_size < 5
-            in
-            if ok_to_inline then (
-              Hash_int.add subst i (xs, Id l2);
-              simplif l1)
-            else Lam.staticcatch (simplif l1) (i, xs) l2)
-    | Lstaticraise (i, []) -> (
-        match Hash_int.find_opt subst i with
-        | Some (_, handler) -> to_lam handler
-        | None -> lam)
-    | Lstaticraise (i, ls) -> (
-        let ls = Ext_list.map ls simplif in
-        match Hash_int.find_opt subst i with
-        | Some (xs, handler) ->
-            let handler = to_lam handler in
-            let ys = Ext_list.map xs Ident.rename in
-            let env =
-              Ext_list.fold_right2 xs ys Map_ident.empty (fun x y t ->
-                  Map_ident.add t x (Lam.var y))
-            in
-            Ext_list.fold_right2 ys ls (Lam_subst.subst env handler)
-              (fun y l r -> Lam.let_ Strict y l r)
-        | None -> Lam.staticraise i ls)
-    | Lvar _ | Lconst _ -> lam
-    | Lapply { ap_func; ap_args; ap_info } ->
-        Lam.apply (simplif ap_func) (Ext_list.map ap_args simplif) ap_info
-    | Lfunction { arity; params; body; attr } ->
-        Lam.function_ ~arity ~params ~body:(simplif body) ~attr
-    | Llet (kind, v, l1, l2) -> Lam.let_ kind v (simplif l1) (simplif l2)
-    | Lletrec (bindings, body) ->
-        Lam.letrec (Ext_list.map_snd bindings simplif) (simplif body)
-    | Lglobal_module _ -> lam
-    | Lprim { primitive; args; loc } ->
-        let args = Ext_list.map args simplif in
-        Lam.prim ~primitive ~args loc
-    | Lswitch (l, sw) ->
-        let new_l = simplif l in
-        let new_consts = Ext_list.map_snd sw.sw_consts simplif in
-        let new_blocks = Ext_list.map_snd sw.sw_blocks simplif in
-        let new_fail = Ext_option.map sw.sw_failaction simplif in
-        Lam.switch new_l
-          {
-            sw with
-            sw_consts = new_consts;
-            sw_blocks = new_blocks;
-            sw_failaction = new_fail;
-          }
-    | Lstringswitch (l, sw, d) ->
-        Lam.stringswitch (simplif l)
-          (Ext_list.map_snd sw simplif)
-          (Ext_option.map d simplif)
-    | Ltrywith (l1, v, l2) -> Lam.try_ (simplif l1) v (simplif l2)
-    | Lifthenelse (l1, l2, l3) -> Lam.if_ (simplif l1) (simplif l2) (simplif l3)
-    | Lsequence (l1, l2) -> Lam.seq (simplif l1) (simplif l2)
-    | Lwhile (l1, l2) -> Lam.while_ (simplif l1) (simplif l2)
-    | Lfor (v, l1, l2, dir, l3) ->
-        Lam.for_ v (simplif l1) (simplif l2) dir (simplif l3)
-    | Lassign (v, l) -> Lam.assign v (simplif l)
-  in
-  simplif lam
-
-let simplify_exits (lam : Lam.t) =
-  let exits = Lam_exit_count.count_helper lam in
-  subst_helper (Hash_int.create 17) (Lam_exit_count.count_exit exits) lam
-
-(* Compile-time beta-reduction of functions immediately applied:
-      Lapply(Lfunction(Curried, params, body), args, loc) ->
-        let paramN = argN in ... let param1 = arg1 in body
-      Lapply(Lfunction(Tupled, params, body), [Lprim(Pmakeblock(args))], loc) ->
-        let paramN = argN in ... let param1 = arg1 in body
-   Assumes |args| = |params|.
-*)
diff --git a/jscomp/core/lam_pass_exits.mli b/jscomp/core/lam_pass_exits.mli
deleted file mode 100644
index a48c54d..0000000
--- a/jscomp/core/lam_pass_exits.mli
+++ /dev/null
@@ -1,18 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the Q Public License version 1.0.               *)
-(*                                                                     *)
-(***********************************************************************)
-(* Adapted for Javascript backend: Hongbo Zhang,                       *)
-
-(** A pass used to optimize the exit code compilation, adaped from the compiler's
-    [simplif] module
-*)
-
-val simplify_exits : Lam.t -> Lam.t
diff --git a/jscomp/core/lam_pass_lets_dce.ml b/jscomp/core/lam_pass_lets_dce.ml
deleted file mode 100644
index dad1786..0000000
--- a/jscomp/core/lam_pass_lets_dce.ml
+++ /dev/null
@@ -1,263 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the Q Public License version 1.0.               *)
-(*                                                                     *)
-(***********************************************************************)
-(* Adapted for Javascript backend : Hongbo Zhang,  *)
-
-
-let lets_helper (count_var : Ident.t -> Lam_pass_count.used_info) lam : Lam.t = 
-  let subst : Lam.t Hash_ident.t = Hash_ident.create 32 in
-  let string_table : string Hash_ident.t = Hash_ident.create 32 in  
-  let used v = (count_var v ).times > 0 in
-  let rec simplif (lam : Lam.t) = 
-    match lam with 
-    | Lvar v  -> Hash_ident.find_default subst v lam 
-    | Llet( (Strict | Alias | StrictOpt) , v, Lvar w, l2) 
-      ->
-      Hash_ident.add subst v (simplif (Lam.var w));
-      simplif l2
-    | Llet(Strict as kind,
-           v, (Lprim {primitive = (Pmakeblock(0, _, Mutable) 
-                                   as primitive); 
-                      args = [linit] ; loc}), lbody)
-      ->
-      let slinit = simplif linit in
-      let slbody = simplif lbody in
-      begin 
-        try (* TODO: record all references variables *)
-          Lam_util.refine_let
-            ~kind:Variable v slinit
-            (Lam_pass_eliminate_ref.eliminate_ref v slbody)
-        with Lam_pass_eliminate_ref.Real_reference ->
-          Lam_util.refine_let 
-            ~kind v (Lam.prim ~primitive ~args:[slinit] loc)
-            slbody
-      end
-    | Llet(Alias, v, l1, l2) ->
-      (* For alias, [l1] is pure, we can always inline,
-          when captured, we should avoid recomputation
-      *)
-      begin 
-        match count_var v, l1  with
-        | {times = 0; _}, _  -> simplif l2 
-        | {times = 1; captured = false }, _ 
-        | {times = 1; captured = true }, (Lconst _ | Lvar _)
-        |  _, (Lconst 
-                 ((
-                   Const_int _ | Const_char _ | Const_float _ | Const_bigint _
-                 )
-                 | Const_pointer _ |Const_js_true | Const_js_false | Const_js_undefined _) (* could be poly-variant [`A] -> [65a]*)
-              | Lprim {primitive = Pfield (_);
-                       args = [ 
-                         Lglobal_module _
-                       ]}
-              ) 
-          (* Const_int64 is no longer primitive
-             Note for some constant which is not 
-             inlined, we can still record it and
-             do constant folding independently              
-          *)
-          ->
-          Hash_ident.add subst v (simplif l1); simplif l2
-        | _, Lconst (Const_string {s; unicode = false} ) -> 
-          (* only "" added for later inlining *)
-          Hash_ident.add string_table v s;
-          Lam.let_ Alias v l1 (simplif l2)
-        (* we need move [simplif l2] later, since adding Hash does have side effect *)
-        | _ -> Lam.let_ Alias v (simplif l1) (simplif l2)
-        (* for Alias, in most cases [l1] is already simplified *)
-      end
-    | Llet(StrictOpt as kind, v, l1, lbody) ->
-      (* can not be inlined since [l1] depend on the store
-         {[
-           let v = [|1;2;3|]
-         ]}
-          get [StrictOpt] here,  we can not inline v, 
-          since the value of [v] can be changed
-
-          GPR #1476 
-          Note to pass the sanitizer, we do need remove dead code (not just best effort)
-          This logic is tied to {!Lam_pass_count.count}
-         {[
-           if kind = Strict || used v then count bv l1
-         ]}
-          If the code which should be removed is not removed, it will hold references 
-          to other variables which is already removed.
-      *)
-      if not (used v) 
-      then simplif lbody (* GPR #1476 *)
-      else
-        begin match l1 with 
-          | (Lprim {primitive = (Pmakeblock(0, _, Mutable) 
-                                 as primitive); 
-                    args = [linit] ; loc})
-            -> 
-            let slinit = simplif linit in
-            let slbody = simplif lbody in
-            begin 
-              try (* TODO: record all references variables *)
-                Lam_util.refine_let
-                  ~kind:Variable v slinit
-                  (Lam_pass_eliminate_ref.eliminate_ref v slbody)
-              with Lam_pass_eliminate_ref.Real_reference ->
-                Lam_util.refine_let 
-                  ~kind v (Lam.prim ~primitive ~args:[slinit] loc)
-                  slbody
-            end
-
-          | _ -> 
-            let l1 = simplif l1 in         
-            begin match l1 with 
-              | Lconst(Const_string { s; unicode = false }) -> 
-                Hash_ident.add string_table v s; 
-                (* we need move [simplif lbody] later, since adding Hash does have side effect *)
-                Lam.let_ Alias v l1 (simplif lbody)
-              | _ -> 
-                Lam_util.refine_let ~kind v l1 (simplif lbody)
-            end  
-        end
-    (* TODO: check if it is correct rollback to [StrictOpt]? *)
-
-    | Llet((Strict | Variable as kind), v, l1, l2) -> 
-      if not (used v)
-      then
-        let l1 = simplif l1 in
-        let l2 = simplif l2 in
-        if Lam_analysis.no_side_effects l1 
-        then l2 
-        else Lam.seq l1 l2
-      else 
-        let l1 = (simplif l1) in 
-
-        begin match kind, l1 with 
-          | Strict, Lconst((Const_string { s; unicode = false }))
-            -> 
-            Hash_ident.add string_table v s;
-            Lam.let_ Alias v l1 (simplif l2)
-          | _ -> 
-            Lam_util.refine_let ~kind v l1 (simplif l2)
-        end
-    | Lsequence(l1, l2) -> Lam.seq (simplif l1) (simplif l2)
-
-    | Lapply{ap_func = Lfunction ({params; body} as lfunction);  ap_args = args; _}
-      when  Ext_list.same_length params args && Lam_analysis.lfunction_can_be_beta_reduced lfunction ->
-      simplif (Lam_beta_reduce.no_names_beta_reduce  params body args)
-    (* | Lapply{ fn = Lfunction{function_kind = Tupled; params; body}; *)
-    (*           args = [Lprim {primitive = Pmakeblock _;  args; _}]; _} *)
-    (*   (\** TODO: keep track of this parameter in ocaml trunk, *)
-    (*       can we switch to the tupled backend? *)
-    (*   *\) *)
-    (*   when  Ext_list.same_length params  args -> *)
-    (*   simplif (Lam_beta_reduce.beta_reduce params body args) *)
-
-    | Lapply{ap_func = l1; ap_args =  ll; ap_info} -> 
-      Lam.apply (simplif l1) (Ext_list.map  ll simplif) ap_info
-    | Lfunction{arity; params; body; attr} ->
-      Lam.function_ ~arity ~params ~body:(simplif body) ~attr
-    | Lconst _ -> lam
-    | Lletrec(bindings, body) ->
-      Lam.letrec 
-        (Ext_list.map_snd  bindings simplif) 
-        (simplif body)
-    | Lprim {primitive=Pstringadd; args = [l;r]; loc } -> 
-      begin
-        let l' = simplif l in 
-        let r' = simplif r in
-        let opt_l = 
-          match l' with 
-          | Lconst(Const_string { s = ls; unicode = false }) -> Some ls 
-          | Lvar i -> Hash_ident.find_opt string_table i 
-          | _ -> None in 
-        match opt_l with   
-        | None -> Lam.prim ~primitive:Pstringadd ~args:[l';r'] loc 
-        | Some l_s -> 
-          let opt_r = 
-            match r' with 
-            | Lconst (Const_string {s = rs; unicode = false}) -> Some rs 
-            | Lvar i -> Hash_ident.find_opt string_table i 
-            | _ -> None in 
-          begin match opt_r with 
-            | None -> Lam.prim ~primitive:Pstringadd ~args:[l';r'] loc 
-            | Some r_s -> 
-              Lam.const (Const_string { s = l_s^r_s; unicode = false })
-          end
-      end
-
-    | Lprim {primitive = (Pstringrefu|Pstringrefs) as primitive ; 
-             args = [l;r] ; loc 
-            } ->  (* TODO: introudce new constant *)
-      let l' = simplif l in 
-      let r' = simplif r in 
-      let opt_l =
-        match l' with 
-        | Lconst (Const_string { s = ls; unicode = false }) -> 
-          Some ls 
-        | Lvar i -> Hash_ident.find_opt string_table i 
-        | _ -> None in 
-      begin match opt_l with 
-        | None -> Lam.prim ~primitive ~args:[l';r'] loc 
-        | Some l_s -> 
-          match r with 
-          |Lconst((Const_int {i})) -> 
-            let i = Int32.to_int i in
-            if i < String.length l_s && i >= 0  then
-              Lam.const ((Const_char (Char.code l_s.[i])))
-            else 
-              Lam.prim ~primitive ~args:[l';r'] loc 
-          | _ -> 
-            Lam.prim ~primitive ~args:[l';r'] loc 
-      end    
-    | Lglobal_module _ -> lam    
-    | Lprim {primitive; args; loc} 
-      -> Lam.prim ~primitive ~args:(Ext_list.map args simplif) loc
-    | Lswitch(l, sw) ->
-      let new_l = simplif l
-      and new_consts =  Ext_list.map_snd sw.sw_consts simplif
-      and new_blocks =  Ext_list.map_snd sw.sw_blocks simplif
-      and new_fail = Ext_option.map sw.sw_failaction simplif
-      in
-      Lam.switch
-        new_l
-        {sw with sw_consts = new_consts ; sw_blocks = new_blocks;
-                 sw_failaction = new_fail}
-    | Lstringswitch (l,sw,d) ->
-      Lam.stringswitch
-        (simplif l) (Ext_list.map_snd  sw simplif)
-        (Ext_option.map d simplif)
-    | Lstaticraise (i,ls) ->
-      Lam.staticraise i (Ext_list.map ls simplif)
-    | Lstaticcatch(l1, (i,args), l2) ->
-      Lam.staticcatch (simplif l1) (i,args) (simplif l2)
-    | Ltrywith(l1, v, l2) -> Lam.try_ (simplif l1) v (simplif l2)
-    | Lifthenelse(l1, l2, l3) -> 
-      Lam.if_ (simplif l1) (simplif l2) (simplif l3)
-    | Lwhile(l1, l2) 
-      -> 
-      Lam.while_ (simplif l1) (simplif l2)
-    | Lfor(v, l1, l2, dir, l3) ->
-      Lam.for_ v (simplif l1) (simplif l2) dir (simplif l3)
-    | Lassign(v, l) -> Lam.assign v (simplif l)
-  in simplif lam 
-
-
-(* To transform let-bound references into variables *)
-let apply_lets  occ lambda = 
-  let count_var v =
-    match
-      Hash_ident.find_opt occ v 
-    with
-    | None -> Lam_pass_count.dummy_info ()
-    | Some  v -> v in
-  lets_helper count_var lambda      
-
-let simplify_lets  (lam : Lam.t) : Lam.t = 
-  let occ =  Lam_pass_count.collect_occurs  lam in 
-  (* Ext_log.dwarn ~__POS__ "@[%a@]@." Lam_pass_count.pp_occ_tbl occ ; *)
-  apply_lets  occ   lam
diff --git a/jscomp/core/lam_pass_lets_dce.mli b/jscomp/core/lam_pass_lets_dce.mli
deleted file mode 100644
index bad2bf9..0000000
--- a/jscomp/core/lam_pass_lets_dce.mli
+++ /dev/null
@@ -1,35 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the Q Public License version 1.0.               *)
-(*                                                                     *)
-(***********************************************************************)
-(* Adapted for Javascript backend: Hongbo Zhang                        *)
-
-val simplify_lets : Lam.t -> Lam.t
-(**
-   This pass would do beta reduction, and dead code elimination (adapted from compiler's built-in [Simplif] module )
-
-   1. beta reduction -> Llet (Strict )
-
-   2. The global table [occ] associates to each let-bound identifier
-   the number of its uses (as a reference):
-   - 0 if never used
-   - 1 if used exactly once in and *not under a lambda or within a loop
-   - > 1 if used several times or under a lambda or within a loop.
-
-   The local table [bv] associates to each locally-let-bound variable
-   its reference count, as above.  [bv] is enriched at let bindings
-   but emptied when crossing lambdas and loops. 
-
-   For this pass, when it' used under a lambda or within a loop, we don't do anything,
-   in theory, we can still do something if it's pure but we are conservative here.
-
-   [bv] is used to help caculate [occ] it is not useful outside
-
-*)
diff --git a/jscomp/core/lam_pass_remove_alias.ml b/jscomp/core/lam_pass_remove_alias.ml
deleted file mode 100644
index 4889d1c..0000000
--- a/jscomp/core/lam_pass_remove_alias.ml
+++ /dev/null
@@ -1,323 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 outcome = Eval_false | Eval_true | Eval_unknown
-
-let id_is_for_sure_true_in_boolean (tbl : Lam_stats.ident_tbl) id =
-  match Hash_ident.find_opt tbl id with
-  | Some (ImmutableBlock _)
-  | Some (Normal_optional _)
-  | Some (MutableBlock _)
-  | Some (Constant (Const_block _ | Const_js_true)) ->
-      Eval_true
-  | Some (Constant (Const_int { i })) ->
-      if i = 0l then Eval_false else Eval_true
-  | Some (Constant (Const_js_false | Const_js_null | Const_js_undefined _)) ->
-      Eval_false
-  | Some
-      ( Constant _ | Module _ | FunctionId _ | Exception | Parameter | NA
-      | OptionalBlock (_, (Undefined | Null | Null_undefined)) )
-  | None ->
-      Eval_unknown
-
-let simplify_alias (meta : Lam_stats.t) (lam : Lam.t) : Lam.t =
-  let rec simpl (lam : Lam.t) : Lam.t =
-    match lam with
-    | Lvar _ -> lam
-    | Lprim { primitive = Pfield (i, info) as primitive; args = [ arg ]; loc }
-      -> (
-        (* ATTENTION:
-           Main use case, we should detect inline all immutable block .. *)
-        match simpl arg with
-        | Lvar v as l ->
-            Lam_util.field_flatten_get
-              (fun _ -> Lam.prim ~primitive ~args:[ l ] loc)
-              v i info meta.ident_tbl
-        | l -> Lam.prim ~primitive ~args:[ l ] loc)
-    | Lprim
-        {
-          primitive = (Pval_from_option | Pval_from_option_not_nest) as p;
-          args = [ (Lvar v as lvar) ];
-        } as x -> (
-        match Hash_ident.find_opt meta.ident_tbl v with
-        | Some (OptionalBlock (l, _)) -> l
-        | _ -> if p = Pval_from_option_not_nest then lvar else x)
-    | Lglobal_module _ -> lam
-    | Lprim { primitive = Pfull_apply; args = Lvar v :: ap_args as args; loc }
-      -> (
-        (* Inline uncurried application when safe *)
-        let normal () =
-          Lam.prim ~primitive:Pfull_apply ~args:(Ext_list.map args simpl) loc
-        in
-        let ap_args = Ext_list.map ap_args simpl in
-        match Hash_ident.find_opt meta.ident_tbl v with
-        | Some
-            (FunctionId
-              {
-                lambda =
-                  Some
-                    ( Lfunction
-                        ({ params; body; attr = { is_a_functor = false } } as m),
-                      rec_flag );
-              })
-          when Ext_list.same_length ap_args params
-               && Lam_analysis.lfunction_can_be_beta_reduced m
-               && Lam_analysis.ok_to_inline_fun_when_app m ap_args -> (
-            let param_map =
-              Lam_closure.is_closed_with_map meta.export_idents params body
-            in
-            let is_export_id = Set_ident.mem meta.export_idents v in
-            match (is_export_id, param_map) with
-            | false, (_, param_map) | true, (true, param_map) -> (
-                match rec_flag with
-                | Lam_rec ->
-                    Lam_beta_reduce.propagate_beta_reduce_with_map meta
-                      param_map params body ap_args
-                | Lam_self_rec -> normal ()
-                | Lam_non_rec ->
-                    if
-                      Ext_list.exists ap_args (fun lam ->
-                          Lam_hit.hit_variable v lam)
-                      (*avoid nontermination, e.g, `g(g)`*)
-                    then normal ()
-                    else
-                      simpl
-                        (Lam_beta_reduce.propagate_beta_reduce_with_map meta
-                           param_map params body ap_args))
-            | _ -> normal ())
-        | _ -> normal ())
-    | Lprim { primitive; args; loc } ->
-        Lam.prim ~primitive ~args:(Ext_list.map args simpl) loc
-    | Lifthenelse
-        ((Lprim { primitive = Pis_not_none; args = [ Lvar id ] } as l1), l2, l3)
-      -> (
-        match Hash_ident.find_opt meta.ident_tbl id with
-        | Some (ImmutableBlock _ | MutableBlock _ | Normal_optional _) ->
-            simpl l2
-        | Some (OptionalBlock (l, Null)) ->
-            Lam.if_
-              (Lam.not_ Location.none
-                 (Lam.prim ~primitive:Pis_null ~args:[ l ] Location.none))
-              (simpl l2) (simpl l3)
-        | Some (OptionalBlock (l, Undefined)) ->
-            Lam.if_
-              (Lam.not_ Location.none
-                 (Lam.prim ~primitive:Pis_undefined ~args:[ l ] Location.none))
-              (simpl l2) (simpl l3)
-        | Some (OptionalBlock (l, Null_undefined)) ->
-            Lam.if_
-              (Lam.not_ Location.none
-                 (Lam.prim ~primitive:Pis_null_undefined ~args:[ l ]
-                    Location.none))
-              (simpl l2) (simpl l3)
-        | Some _ | None -> Lam.if_ l1 (simpl l2) (simpl l3))
-    (* could be the code path
-       {[ match x with
-         | h::hs ->
-       ]}
-    *)
-    | Lifthenelse (l1, l2, l3) -> (
-        match l1 with
-        | Lvar id -> (
-            match id_is_for_sure_true_in_boolean meta.ident_tbl id with
-            | Eval_true -> simpl l2
-            | Eval_false -> simpl l3
-            | Eval_unknown -> Lam.if_ (simpl l1) (simpl l2) (simpl l3))
-        | _ -> Lam.if_ (simpl l1) (simpl l2) (simpl l3))
-    | Lconst _ -> lam
-    | Llet (str, v, l1, l2) -> Lam.let_ str v (simpl l1) (simpl l2)
-    | Lletrec (bindings, body) ->
-        let bindings = Ext_list.map_snd bindings simpl in
-        Lam.letrec bindings (simpl body)
-    (* complicated
-           1. inline this function
-           2. ...
-           exports.Make=
-           function(funarg)
-       {var $$let=Make(funarg);
-         return [0, $$let[5],... $$let[16]]}
-    *)
-    | Lapply
-        {
-          ap_func =
-            Lprim
-              {
-                primitive = Pfield (_, Fld_module { name = fld_name });
-                args = [ Lglobal_module (ident, dynamic_import) ];
-                _;
-              } as l1;
-          ap_args = args;
-          ap_info;
-        } -> (
-        match Lam_compile_env.query_external_id_info ~dynamic_import ident fld_name with
-        | {
-         persistent_closed_lambda =
-           Some (Lfunction ({ params; body } as lfunction));
-        }
-        (* be more cautious when do cross module inlining *)
-          when Ext_list.same_length params args
-               && Ext_list.for_all args (fun arg ->
-                      match arg with
-                      | Lvar p -> (
-                          match Hash_ident.find_opt meta.ident_tbl p with
-                          | Some v -> v <> Parameter
-                          | None -> true)
-                      | _ -> true)
-               && Lam_analysis.lfunction_can_be_beta_reduced lfunction ->
-            simpl (Lam_beta_reduce.propagate_beta_reduce meta params body args)
-        | _ -> Lam.apply (simpl l1) (Ext_list.map args simpl) ap_info)
-    (* Function inlining interact with other optimizations...
-
-       - parameter attributes
-       - scope issues
-       - code bloat
-    *)
-    | Lapply { ap_func = Lvar v as fn; ap_args; ap_info } -> (
-        (* Check info for always inlining *)
-
-        (* Ext_log.dwarn __LOC__ "%s/%d" v.name v.stamp;     *)
-        let ap_args = Ext_list.map ap_args simpl in
-        let[@local] normal () = Lam.apply (simpl fn) ap_args ap_info in
-        match Hash_ident.find_opt meta.ident_tbl v with
-        | Some
-            (FunctionId
-              {
-                lambda =
-                  Some
-                    ( Lfunction ({ params; body; attr = { is_a_functor } } as m),
-                      rec_flag );
-              })
-          when Lam_analysis.lfunction_can_be_beta_reduced m ->
-            if Ext_list.same_length ap_args params then
-              if
-                is_a_functor
-                (* && (Set_ident.mem v meta.export_idents) && false *)
-              then
-                (* TODO: check l1 if it is exported,
-                   if so, maybe not since in that case,
-                   we are going to have two copy?
-                *)
-
-                (* Check: recursive applying may result in non-termination *)
-                (* Ext_log.dwarn __LOC__ "beta .. %s/%d" v.name v.stamp ; *)
-                simpl
-                  (Lam_beta_reduce.propagate_beta_reduce meta params body
-                     ap_args)
-              else if
-                (* Lam_analysis.size body < Lam_analysis.small_inline_size *)
-                (* ap_inlined = Always_inline || *)
-                Lam_analysis.ok_to_inline_fun_when_app m ap_args
-              then
-                (* let param_map =  *)
-                (*   Lam_analysis.free_variables meta.export_idents  *)
-                (*     (Lam_analysis.param_map_of_list params) body in *)
-                (* let old_count = List.length params in *)
-                (* let new_count = Map_ident.cardinal param_map in *)
-                let param_map =
-                  Lam_closure.is_closed_with_map meta.export_idents params body
-                in
-                let is_export_id = Set_ident.mem meta.export_idents v in
-                match (is_export_id, param_map) with
-                | false, (_, param_map) | true, (true, param_map) -> (
-                    match rec_flag with
-                    | Lam_rec ->
-                        Lam_beta_reduce.propagate_beta_reduce_with_map meta
-                          param_map params body ap_args
-                    | Lam_self_rec -> normal ()
-                    | Lam_non_rec ->
-                        if
-                          Ext_list.exists ap_args (fun lam ->
-                              Lam_hit.hit_variable v lam)
-                          (*avoid nontermination, e.g, `g(g)`*)
-                        then normal ()
-                        else
-                          simpl
-                            (Lam_beta_reduce.propagate_beta_reduce_with_map meta
-                               param_map params body ap_args))
-                | _ -> normal ()
-              else normal ()
-            else normal ()
-        | Some _ | None -> normal ())
-    | Lapply
-        {
-          ap_func = Lfunction ({ params; body } as lfunction);
-          ap_args = args;
-          _;
-        }
-      when Ext_list.same_length params args
-           && Lam_analysis.lfunction_can_be_beta_reduced lfunction ->
-        simpl (Lam_beta_reduce.propagate_beta_reduce meta params body args)
-    (* | Lapply{ fn = Lfunction{function_kind =  Tupled;  params; body};  *)
-    (*          args = [Lprim {primitive = Pmakeblock _; args; _}]; _} *)
-    (*   (\** TODO: keep track of this parameter in ocaml trunk, *)
-    (*       can we switch to the tupled backend? *)
-    (*   *\) *)
-    (*   when  Ext_list.same_length params args -> *)
-    (*   simpl (Lam_beta_reduce.propogate_beta_reduce meta params body args) *)
-    | Lapply { ap_func = l1; ap_args = ll; ap_info } ->
-        Lam.apply (simpl l1) (Ext_list.map ll simpl) ap_info
-    | Lfunction { arity; params; body; attr } ->
-        Lam.function_ ~arity ~params ~body:(simpl body) ~attr
-    | Lswitch
-        ( l,
-          {
-            sw_failaction;
-            sw_consts;
-            sw_blocks;
-            sw_blocks_full;
-            sw_consts_full;
-            sw_names;
-          } ) ->
-        Lam.switch (simpl l)
-          {
-            sw_consts = Ext_list.map_snd sw_consts simpl;
-            sw_blocks = Ext_list.map_snd sw_blocks simpl;
-            sw_consts_full;
-            sw_blocks_full;
-            sw_failaction = Ext_option.map sw_failaction simpl;
-            sw_names;
-          }
-    | Lstringswitch (l, sw, d) ->
-        let l =
-          match l with
-          | Lvar s -> (
-              match Hash_ident.find_opt meta.ident_tbl s with
-              | Some (Constant s) -> Lam.const s
-              | Some _ | None -> simpl l)
-          | _ -> simpl l
-        in
-        Lam.stringswitch l (Ext_list.map_snd sw simpl) (Ext_option.map d simpl)
-    | Lstaticraise (i, ls) -> Lam.staticraise i (Ext_list.map ls simpl)
-    | Lstaticcatch (l1, ids, l2) -> Lam.staticcatch (simpl l1) ids (simpl l2)
-    | Ltrywith (l1, v, l2) -> Lam.try_ (simpl l1) v (simpl l2)
-    | Lsequence (l1, l2) -> Lam.seq (simpl l1) (simpl l2)
-    | Lwhile (l1, l2) -> Lam.while_ (simpl l1) (simpl l2)
-    | Lfor (flag, l1, l2, dir, l3) ->
-        Lam.for_ flag (simpl l1) (simpl l2) dir (simpl l3)
-    | Lassign (v, l) ->
-        (* Lalias-bound variables are never assigned, so don't increase
-           v's refsimpl *)
-        Lam.assign v (simpl l)
-  in
-  simpl lam
diff --git a/jscomp/core/lam_pass_remove_alias.mli b/jscomp/core/lam_pass_remove_alias.mli
deleted file mode 100644
index 3d6b915..0000000
--- a/jscomp/core/lam_pass_remove_alias.mli
+++ /dev/null
@@ -1,38 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Keep track of the global module Aliases *)
-
-(**
-    One way:  guarantee that all global aliases *would be removed* ,
-    it will not be aliased 
-
-    So the only remaining place for globals is either 
-    just  Pgetglobal in functor application or 
-    `Lprim (Pfield( i ), [Pgetglobal])`
-
-    This pass does not change meta  data
-*)
-
-val simplify_alias : Lam_stats.t -> Lam.t -> Lam.t
diff --git a/jscomp/core/lam_primitive.ml b/jscomp/core/lam_primitive.ml
deleted file mode 100644
index 3280a09..0000000
--- a/jscomp/core/lam_primitive.ml
+++ /dev/null
@@ -1,350 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-[@@@warning "+9"]
-
-type ident = Ident.t
-
-type record_representation =
-  | Record_regular
-  | Record_inlined of { tag : int; name : string; num_nonconsts : int } (* Inlined record *)
-  | Record_extension
-(* Inlined record under extension *)
-
-type t =
-  | Pbytes_to_string
-  (* Operations on heap blocks *)
-  | Pmakeblock of int * Lam_tag_info.t * Asttypes.mutable_flag
-  | Pfield of int * Lam_compat.field_dbg_info
-  | Psetfield of int * Lam_compat.set_field_dbg_info
-  (* could have field info at least for record *)
-  | Pduprecord
-  (* Force lazy values *)
-  | Plazyforce
-  (* External call *)
-  | Pccall of { prim_name : string }
-  | Pjs_call of {
-      prim_name : string;
-      arg_types : External_arg_spec.params;
-      ffi : External_ffi_types.external_spec;
-      dynamic_import: bool;
-    }
-  | Pjs_object_create of External_arg_spec.obj_params
-  (* Exceptions *)
-  | Praise
-  (* Boolean operations *)
-  | Psequand
-  | Psequor
-  | Pnot
-  (* Integer operations *)
-  | Pnegint
-  | Paddint
-  | Psubint
-  | Pmulint
-  | Pdivint
-  | Pmodint
-  | Pandint
-  | Porint
-  | Pxorint
-  | Plslint
-  | Plsrint
-  | Pasrint
-  | Poffsetint of int
-  | Poffsetref of int
-  (* Float operations *)
-  | Pintoffloat
-  | Pfloatofint
-  | Pnegfloat
-  | Paddfloat
-  | Psubfloat
-  | Pmulfloat
-  | Pdivfloat
-  (* BigInt operations *)
-  | Pnegbigint
-  | Paddbigint
-  | Psubbigint
-  | Pmulbigint
-  | Pdivbigint
-  | Pmodbigint
-  | Ppowbigint
-  | Pandbigint
-  | Porbigint
-  | Pxorbigint
-  | Plslbigint
-  | Pasrbigint
-  | Pintcomp of Lam_compat.comparison
-  | Pfloatcomp of Lam_compat.comparison
-  | Pjscomp of Lam_compat.comparison
-  | Pint64comp of Lam_compat.comparison
-  | Pbigintcomp of Lam_compat.comparison
-  | Pjs_apply (*[f;arg0;arg1; arg2; ... argN]*)
-  | Pjs_runtime_apply (* [f; [...]] *)
-  (* String operations *)
-  | Pstringlength
-  | Pstringrefu
-  | Pstringrefs
-  | Pstringadd
-  | Pbyteslength
-  | Pbytesrefu
-  | Pbytessetu
-  | Pbytesrefs
-  | Pbytessets
-  (* Array operations *)
-  | Pmakearray
-  | Parraylength
-  | Parrayrefu
-  | Parraysetu
-  | Parrayrefs
-  | Parraysets
-  (* Test if the argument is a block or an immediate integer *)
-  | Pisint
-  | Pis_poly_var_block
-  (* Test if the (integer) argument is outside an interval *)
-  | Pisout of int
-  | Pint64ofint
-  | Pintofint64
-  | Pnegint64
-  | Paddint64
-  | Psubint64
-  | Pmulint64
-  | Pdivint64
-  | Pmodint64
-  | Pandint64
-  | Porint64
-  | Pxorint64
-  | Plslint64
-  | Plsrint64
-  | Pasrint64
-  (* Compile time constants *)
-  | Pctconst of Lam_compat.compile_time_constant (* Integer to external pointer *)
-  | Pdebugger
-  | Pjs_unsafe_downgrade of { name : string; setter : bool }
-  | Pinit_mod
-  | Pupdate_mod
-  | Praw_js_code of Js_raw_info.t
-  | Pjs_fn_make of int
-  | Pjs_fn_make_unit
-  | Pvoid_run
-  | Pfull_apply
-  (* we wrap it when do the conversion to prevent
-     accendential optimization
-     play safe first
-  *)
-  | Pjs_fn_method
-  | Pundefined_to_opt
-  | Pnull_to_opt
-  | Pnull_undefined_to_opt
-  | Pis_null
-  | Pis_undefined
-  | Pis_null_undefined
-  | Pimport
-  | Pjs_typeof
-  | Pjs_function_length
-  | Pcaml_obj_length
-  | Pwrap_exn (* convert either JS exception or OCaml exception into OCaml format *)
-  | Pcreate_extension of string
-  | Pis_not_none (* no info about its type *)
-  | Pval_from_option
-  | Pval_from_option_not_nest
-  | Psome
-  | Psome_not_nest
-
-let eq_field_dbg_info (x : Lam_compat.field_dbg_info)
-    (y : Lam_compat.field_dbg_info) =
-  x = y
-(* save it to avoid conditional compilation, fix it later *)
-
-let eq_set_field_dbg_info (x : Lam_compat.set_field_dbg_info)
-    (y : Lam_compat.set_field_dbg_info) =
-  x = y
-(* save it to avoid conditional compilation, fix it later *)
-
-let eq_tag_info (x : Lam_tag_info.t) y = x = y
-
-let eq_primitive_approx (lhs : t) (rhs : t) =
-  match lhs with
-  | Pcreate_extension a -> (
-      match rhs with Pcreate_extension b -> a = (b : string) | _ -> false)
-  | Pwrap_exn -> rhs = Pwrap_exn
-  | Pbytes_to_string -> rhs = Pbytes_to_string
-  | Praise -> rhs = Praise
-  | Psequand -> rhs = Psequand
-  | Psequor -> rhs = Psequor
-  | Pnot -> rhs = Pnot
-  | Pnegint -> rhs = Pnegint
-  | Paddint -> rhs = Paddint
-  | Psubint -> rhs = Psubint
-  | Pmulint -> rhs = Pmulint
-  | Pdivint -> rhs = Pdivint
-  | Pmodint -> rhs = Pmodint
-  | Pandint -> rhs = Pandint
-  | Porint -> rhs = Porint
-  | Pxorint -> rhs = Pxorint
-  | Plslint -> rhs = Plslint
-  | Plsrint -> rhs = Plsrint
-  | Pasrint -> rhs = Pasrint
-  | Pval_from_option -> rhs = Pval_from_option
-  | Pval_from_option_not_nest -> rhs = Pval_from_option_not_nest
-  | Plazyforce -> rhs = Plazyforce
-  | Pintoffloat -> rhs = Pintoffloat
-  | Pfloatofint -> rhs = Pfloatofint
-  | Pnegfloat -> rhs = Pnegfloat
-  (* | Pabsfloat -> rhs = Pabsfloat *)
-  | Paddfloat -> rhs = Paddfloat
-  | Psubfloat -> rhs = Psubfloat
-  | Pmulfloat -> rhs = Pmulfloat
-  | Pdivfloat -> rhs = Pdivfloat
-  | Pnegbigint -> rhs = Pnegbigint
-  | Paddbigint -> rhs = Paddbigint
-  | Psubbigint -> rhs = Psubbigint
-  | Pmulbigint -> rhs = Pmulbigint
-  | Pdivbigint -> rhs = Pdivbigint
-  | Pmodbigint -> rhs = Pmodbigint
-  | Ppowbigint -> rhs = Ppowbigint
-  | Pandbigint -> rhs = Pandbigint
-  | Porbigint -> rhs = Porbigint
-  | Pxorbigint -> rhs = Pxorbigint
-  | Plslbigint -> rhs = Plslbigint
-  | Pasrbigint -> rhs = Pasrbigint
-  | Pjs_apply -> rhs = Pjs_apply
-  | Pjs_runtime_apply -> rhs = Pjs_runtime_apply
-  | Pstringlength -> rhs = Pstringlength
-  | Pstringrefu -> rhs = Pstringrefu
-  | Pstringrefs -> rhs = Pstringrefs
-  | Pstringadd -> rhs = Pstringadd
-  | Pbyteslength -> rhs = Pbyteslength
-  | Pbytesrefu -> rhs = Pbytesrefu
-  | Pbytessetu -> rhs = Pbytessetu
-  | Pbytesrefs -> rhs = Pbytesrefs
-  | Pbytessets -> rhs = Pbytessets
-  | Pundefined_to_opt -> rhs = Pundefined_to_opt
-  | Pnull_to_opt -> rhs = Pnull_to_opt
-  | Pnull_undefined_to_opt -> rhs = Pnull_undefined_to_opt
-  | Pis_null -> rhs = Pis_null
-  | Pis_not_none -> rhs = Pis_not_none
-  | Psome -> rhs = Psome
-  | Psome_not_nest -> rhs = Psome_not_nest
-  | Pis_undefined -> rhs = Pis_undefined
-  | Pis_null_undefined -> rhs = Pis_null_undefined
-  | Pimport -> rhs = Pimport
-  | Pjs_typeof -> rhs = Pjs_typeof
-  | Pisint -> rhs = Pisint
-  | Pis_poly_var_block -> rhs = Pis_poly_var_block
-  | Pisout l -> ( match rhs with Pisout r -> l = r | _ -> false)
-  | Pdebugger -> rhs = Pdebugger
-  | Pinit_mod -> rhs = Pinit_mod
-  | Pupdate_mod -> rhs = Pupdate_mod
-  | Pjs_function_length -> rhs = Pjs_function_length
-  (* | Pjs_string_of_small_array -> rhs = Pjs_string_of_small_array *)
-  (* | Pjs_is_instance_array -> rhs = Pjs_is_instance_array *)
-  | Pcaml_obj_length -> rhs = Pcaml_obj_length
-  (* | Pcaml_obj_set_length -> rhs = Pcaml_obj_set_length *)
-  | Pccall { prim_name = n0 } -> (
-      match rhs with Pccall { prim_name = n1 } -> n0 = n1 | _ -> false)
-  | Pfield (n0, info0) -> (
-      match rhs with
-      | Pfield (n1, info1) -> n0 = n1 && eq_field_dbg_info info0 info1
-      | _ -> false)
-  | Psetfield (i0, info0) -> (
-      match rhs with
-      | Psetfield (i1, info1) -> i0 = i1 && eq_set_field_dbg_info info0 info1
-      | _ -> false)
-  | Pmakeblock (i0, info0, flag0) -> (
-      match rhs with
-      | Pmakeblock (i1, info1, flag1) ->
-          i0 = i1 && flag0 = flag1 && eq_tag_info info0 info1
-      | _ -> false)
-  | Pduprecord -> rhs = Pduprecord
-  | Pjs_call { prim_name; arg_types; ffi; dynamic_import } -> (
-      match rhs with
-      | Pjs_call rhs ->
-          prim_name = rhs.prim_name && arg_types = rhs.arg_types
-          && ffi = rhs.ffi && dynamic_import = rhs.dynamic_import
-      | _ -> false)
-  | Pjs_object_create obj_create -> (
-      match rhs with
-      | Pjs_object_create obj_create1 -> obj_create = obj_create1
-      | _ -> false)
-  | Pintcomp comparison -> (
-      match rhs with
-      | Pintcomp comparison1 -> Lam_compat.eq_comparison comparison comparison1
-      | _ -> false)
-  | Pfloatcomp comparison -> (
-      match rhs with
-      | Pfloatcomp comparison1 ->
-          Lam_compat.eq_comparison comparison comparison1
-      | _ -> false)
-  | Pbigintcomp comparison -> (
-      match rhs with
-      | Pbigintcomp comparison1 ->
-          Lam_compat.eq_comparison comparison comparison1
-      | _ -> false)
-  | Pjscomp comparison -> (
-      match rhs with
-      | Pjscomp comparison1 -> Lam_compat.eq_comparison comparison comparison1
-      | _ -> false)
-  | Poffsetint i0 -> ( match rhs with Poffsetint i1 -> i0 = i1 | _ -> false)
-  | Poffsetref i0 -> ( match rhs with Poffsetref i1 -> i0 = i1 | _ -> false)
-  | Pmakearray -> rhs = Pmakearray
-  | Parraylength -> rhs = Parraylength
-  | Parrayrefu -> rhs = Parrayrefu
-  | Parraysetu -> rhs = Parraysetu
-  | Parrayrefs -> rhs = Parrayrefs
-  | Parraysets -> rhs = Parraysets
-  | Pint64ofint -> rhs = Pint64ofint
-  | Pintofint64 -> rhs = Pintofint64
-  | Pnegint64 -> rhs = Pnegint64
-  | Paddint64 -> rhs = Paddint64
-  | Psubint64 -> rhs = Psubint64
-  | Pmulint64 -> rhs = Pmulint64
-  | Pdivint64 -> rhs = Pdivint64
-  | Pmodint64 -> rhs = Pmodint64
-  | Pandint64 -> rhs = Pandint64
-  | Porint64 -> rhs = Porint64
-  | Pxorint64 -> rhs = Pxorint64
-  | Plslint64 -> rhs = Plslint64
-  | Plsrint64 -> rhs = Plsrint64
-  | Pasrint64 -> rhs = Pasrint64
-  | Pint64comp comparison -> (
-      match rhs with
-      | Pint64comp comparison1 ->
-          Lam_compat.eq_comparison comparison comparison1
-      | _ -> false)
-  | Pctconst compile_time_constant -> (
-      match rhs with
-      | Pctconst compile_time_constant1 ->
-          Lam_compat.eq_compile_time_constant compile_time_constant
-            compile_time_constant1
-      | _ -> false)
-  | Pjs_unsafe_downgrade { name; setter } -> (
-      match rhs with
-      | Pjs_unsafe_downgrade rhs -> name = rhs.name && setter = rhs.setter
-      | _ -> false)
-  | Pjs_fn_make i -> ( match rhs with Pjs_fn_make i1 -> i = i1 | _ -> false)
-  | Pjs_fn_make_unit -> rhs = Pjs_fn_make_unit
-  | Pvoid_run -> rhs = Pvoid_run
-  | Pfull_apply -> rhs = Pfull_apply
-  | Pjs_fn_method -> rhs = Pjs_fn_method
-  | Praw_js_code _ -> false
-(* TOO lazy, here comparison is only approximation*)
diff --git a/jscomp/core/lam_primitive.mli b/jscomp/core/lam_primitive.mli
deleted file mode 100644
index 31ba475..0000000
--- a/jscomp/core/lam_primitive.mli
+++ /dev/null
@@ -1,160 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 ident = Ident.t
-
-type record_representation =
-  | Record_regular
-  | Record_inlined of { tag : int; name : string; num_nonconsts : int } (* Inlined record *)
-  | Record_extension
-(* Inlined record under extension *)
-
-type t =
-  | Pbytes_to_string
-  | Pmakeblock of int * Lam_tag_info.t * Asttypes.mutable_flag
-  | Pfield of int * Lambda.field_dbg_info
-  | Psetfield of int * Lambda.set_field_dbg_info
-  | Pduprecord
-  | Plazyforce
-  | Pccall of { prim_name : string }
-  | Pjs_call of {
-      (* Location.t *  [loc] is passed down *)
-      prim_name : string;
-      arg_types : External_arg_spec.params;
-      ffi : External_ffi_types.external_spec;
-      dynamic_import: bool;
-    }
-  | Pjs_object_create of External_arg_spec.obj_params
-  | Praise
-  | Psequand
-  | Psequor
-  | Pnot
-  | Pnegint
-  | Paddint
-  | Psubint
-  | Pmulint
-  | Pdivint
-  | Pmodint
-  | Pandint
-  | Porint
-  | Pxorint
-  | Plslint
-  | Plsrint
-  | Pasrint
-  | Poffsetint of int
-  | Poffsetref of int
-  | Pintoffloat
-  | Pfloatofint
-  | Pnegfloat
-  | Paddfloat
-  | Psubfloat
-  | Pmulfloat
-  | Pdivfloat
-  | Pnegbigint
-  | Paddbigint
-  | Psubbigint
-  | Pmulbigint
-  | Pdivbigint
-  | Pmodbigint
-  | Ppowbigint
-  | Pandbigint
-  | Porbigint
-  | Pxorbigint
-  | Plslbigint
-  | Pasrbigint
-  | Pintcomp of Lam_compat.comparison
-  | Pfloatcomp of Lam_compat.comparison
-  | Pjscomp of Lam_compat.comparison
-  | Pint64comp of Lam_compat.comparison
-  | Pbigintcomp of Lam_compat.comparison
-  | Pjs_apply (*[f;arg0;arg1; arg2; ... argN]*)
-  | Pjs_runtime_apply (* [f; [...]] *)
-  | Pstringlength
-  | Pstringrefu
-  | Pstringrefs
-  | Pstringadd
-  | Pbyteslength
-  | Pbytesrefu
-  | Pbytessetu
-  | Pbytesrefs
-  | Pbytessets
-  (* Array operations *)
-  | Pmakearray
-  | Parraylength
-  | Parrayrefu
-  | Parraysetu
-  | Parrayrefs
-  | Parraysets
-  (* Test if the argument is a block or an immediate integer *)
-  | Pisint
-  | Pis_poly_var_block
-  (* Test if the (integer) argument is outside an interval *)
-  | Pisout of int
-  (* Operations on boxed integers (Nativeint.t, Int32.t, Int64.t) *)
-  | Pint64ofint
-  | Pintofint64
-  | Pnegint64
-  | Paddint64
-  | Psubint64
-  | Pmulint64
-  | Pdivint64
-  | Pmodint64
-  | Pandint64
-  | Porint64
-  | Pxorint64
-  | Plslint64
-  | Plsrint64
-  | Pasrint64
-  (* Compile time constants *)
-  | Pctconst of Lam_compat.compile_time_constant
-  (* Integer to external pointer *)
-  | Pdebugger
-  | Pjs_unsafe_downgrade of { name : string; setter : bool }
-  | Pinit_mod
-  | Pupdate_mod
-  | Praw_js_code of Js_raw_info.t
-  | Pjs_fn_make of int
-  | Pjs_fn_make_unit
-  | Pvoid_run
-  | Pfull_apply
-  | Pjs_fn_method
-  | Pundefined_to_opt
-  | Pnull_to_opt
-  | Pnull_undefined_to_opt
-  | Pis_null
-  | Pis_undefined
-  | Pis_null_undefined
-  | Pimport
-  | Pjs_typeof
-  | Pjs_function_length
-  | Pcaml_obj_length
-  | Pwrap_exn (* convert either JS exception or OCaml exception into OCaml format *)
-  | Pcreate_extension of string
-  | Pis_not_none
-  | Pval_from_option
-  | Pval_from_option_not_nest
-  | Psome
-  | Psome_not_nest
-
-val eq_primitive_approx : t -> t -> bool
diff --git a/jscomp/core/lam_print.ml b/jscomp/core/lam_print.ml
deleted file mode 100644
index 47496d0..0000000
--- a/jscomp/core/lam_print.ml
+++ /dev/null
@@ -1,471 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the Q Public License version 1.0.               *)
-(*                                                                     *)
-(***********************************************************************)
-
-open Format
-open Asttypes
-
-let rec struct_const ppf (cst : Lam_constant.t) =
-  match cst with
-  | Const_js_true -> fprintf ppf "#true"
-  | Const_js_false -> fprintf ppf "#false"
-  | Const_js_null -> fprintf ppf "#null"
-  | Const_module_alias -> fprintf ppf "#alias"
-  | Const_js_undefined _ -> fprintf ppf "#undefined"
-  | Const_int { i } -> fprintf ppf "%ld" i
-  | Const_char i -> fprintf ppf "%s" (Ext_util.string_of_int_as_char i)
-  | Const_string { s } -> fprintf ppf "%S" s
-  | Const_float f -> fprintf ppf "%s" f
-  | Const_int64 n -> fprintf ppf "%LiL" n
-  | Const_bigint (sign, i) -> fprintf ppf "%sn" (Bigint_utils.to_string sign i)
-  | Const_pointer name -> fprintf ppf "`%s" name
-  | Const_some n -> fprintf ppf "[some-c]%a" struct_const n
-  | Const_block (tag, _, []) -> fprintf ppf "[%i]" tag
-  | Const_block (tag, _, sc1 :: scl) ->
-      let sconsts ppf scl =
-        List.iter (fun sc -> fprintf ppf "@ %a" struct_const sc) scl
-      in
-      fprintf ppf "@[<1>[%i:@ @[%a%a@]]@]" tag struct_const sc1 sconsts scl
-  | Const_float_array [] -> fprintf ppf "[| |]"
-  | Const_float_array (f1 :: fl) ->
-      let floats ppf fl = List.iter (fun f -> fprintf ppf "@ %s" f) fl in
-      fprintf ppf "@[<1>[|@[%s%a@]|]@]" f1 floats fl
-
-(* let string_of_loc_kind (loc : Lambda.loc_kind) =
-   match loc with
-   | Loc_FILE -> "loc_FILE"
-   | Loc_LINE -> "loc_LINE"
-   | Loc_MODULE -> "loc_MODULE"
-   | Loc_POS -> "loc_POS"
-   | Loc_LOC -> "loc_LOC" *)
-
-let primitive ppf (prim : Lam_primitive.t) =
-  match prim with
-  (* | Pcreate_exception s -> fprintf ppf "[exn-create]%S" s  *)
-  | Pcreate_extension s -> fprintf ppf "[ext-create]%S" s
-  | Pwrap_exn -> fprintf ppf "#exn"
-  | Pcaml_obj_length -> fprintf ppf "#obj_length"
-  | Pinit_mod -> fprintf ppf "init_mod!"
-  | Pupdate_mod -> fprintf ppf "update_mod!"
-  | Pbytes_to_string -> fprintf ppf "bytes_to_string"
-  | Pjs_apply -> fprintf ppf "#apply"
-  | Pjs_runtime_apply -> fprintf ppf "#runtime_apply"
-  | Pjs_unsafe_downgrade { name; setter } ->
-      if setter then fprintf ppf "##%s#=" name else fprintf ppf "##%s" name
-  | Pjs_function_length -> fprintf ppf "#function_length"
-  | Pvoid_run -> fprintf ppf "#run"
-  | Pfull_apply -> fprintf ppf "#full_apply"
-  | Pjs_fn_make i -> fprintf ppf "js_fn_make_%i" i
-  | Pjs_fn_make_unit -> fprintf ppf "js_fn_make_unit"
-  | Pjs_fn_method -> fprintf ppf "js_fn_method"
-  | Pdebugger -> fprintf ppf "debugger"
-  | Praw_js_code _ -> fprintf ppf "[raw]"
-  | Pjs_typeof -> fprintf ppf "[typeof]"
-  | Pnull_to_opt -> fprintf ppf "[null->opt]"
-  | Pundefined_to_opt -> fprintf ppf "[undefined->opt]"
-  | Pnull_undefined_to_opt -> fprintf ppf "[null/undefined->opt]"
-  | Pis_null -> fprintf ppf "[?null]"
-  | Pis_not_none -> fprintf ppf "[?is-not-none]"
-  | Psome -> fprintf ppf "[some]"
-  | Psome_not_nest -> fprintf ppf "[some-not-nest]"
-  | Pval_from_option -> fprintf ppf "[?unbox]"
-  | Pval_from_option_not_nest -> fprintf ppf "[?unbox-not-nest]"
-  | Pis_undefined -> fprintf ppf "[?undefined]"
-  | Pis_null_undefined -> fprintf ppf "[?null?undefined]"
-  | Pimport -> fprintf ppf "[import]"
-  | Pmakeblock (tag, _, Immutable) -> fprintf ppf "makeblock %i" tag
-  | Pmakeblock (tag, _, Mutable) -> fprintf ppf "makemutable %i" tag
-  | Pfield (n, field_info) -> (
-      match Lam_compat.str_of_field_info field_info with
-      | None -> fprintf ppf "field %i" n
-      | Some s -> fprintf ppf "field %s/%i" s n)
-  | Psetfield (n, _) ->
-      let instr = "setfield " in
-      fprintf ppf "%s%i" instr n
-  | Pduprecord -> fprintf ppf "duprecord"
-  | Plazyforce -> fprintf ppf "force"
-  | Pccall p -> fprintf ppf "%s" p.prim_name
-  | Pjs_call { prim_name } -> fprintf ppf "%s[js]" prim_name
-  | Pjs_object_create _ -> fprintf ppf "[js.obj]"
-  | Praise -> fprintf ppf "raise"
-  | Psequand -> fprintf ppf "&&"
-  | Psequor -> fprintf ppf "||"
-  | Pnot -> fprintf ppf "not"
-  | Pnegint -> fprintf ppf "~"
-  | Paddint -> fprintf ppf "+"
-  | Pstringadd -> fprintf ppf "+*"
-  | Psubint -> fprintf ppf "-"
-  | Pmulint -> fprintf ppf "*"
-  | Pdivint -> fprintf ppf "/"
-  | Pmodint -> fprintf ppf "mod"
-  | Pandint -> fprintf ppf "and"
-  | Porint -> fprintf ppf "or"
-  | Pxorint -> fprintf ppf "xor"
-  | Plslint -> fprintf ppf "lsl"
-  | Plsrint -> fprintf ppf "lsr"
-  | Pasrint -> fprintf ppf "asr"
-  | Pintcomp Ceq -> fprintf ppf "==[int]"
-  | Pintcomp Cneq -> fprintf ppf "!=[int]"
-  | Pintcomp Clt -> fprintf ppf "<"
-  | Pintcomp Cle -> fprintf ppf "<="
-  | Pintcomp Cgt -> fprintf ppf ">"
-  | Pintcomp Cge -> fprintf ppf ">="
-  | Poffsetint n -> fprintf ppf "%i+" n
-  | Poffsetref n -> fprintf ppf "+:=%i" n
-  | Pintoffloat -> fprintf ppf "int_of_float"
-  | Pfloatofint -> fprintf ppf "float_of_int"
-  | Pnegfloat -> fprintf ppf "~."
-  (* | Pabsfloat -> fprintf ppf "abs." *)
-  | Paddfloat -> fprintf ppf "+."
-  | Psubfloat -> fprintf ppf "-."
-  | Pmulfloat -> fprintf ppf "*."
-  | Pdivfloat -> fprintf ppf "/."
-  | Pfloatcomp Ceq -> fprintf ppf "==."
-  | Pfloatcomp Cneq -> fprintf ppf "!=."
-  | Pfloatcomp Clt -> fprintf ppf "<."
-  | Pfloatcomp Cle -> fprintf ppf "<=."
-  | Pfloatcomp Cgt -> fprintf ppf ">."
-  | Pfloatcomp Cge -> fprintf ppf ">=."
-  | Pnegbigint -> fprintf ppf "~"
-  | Paddbigint -> fprintf ppf "+"
-  | Psubbigint -> fprintf ppf "-"
-  | Pmulbigint -> fprintf ppf "*"
-  | Pdivbigint -> fprintf ppf "/"
-  | Pmodbigint -> fprintf ppf "mod"
-  | Ppowbigint -> fprintf ppf "**"
-  | Pandbigint -> fprintf ppf "and"
-  | Porbigint -> fprintf ppf "or"
-  | Pxorbigint -> fprintf ppf "xor"
-  | Plslbigint -> fprintf ppf "lsl"
-  | Pasrbigint -> fprintf ppf "asr"
-  | Pbigintcomp Ceq -> fprintf ppf "=="
-  | Pbigintcomp Cneq -> fprintf ppf "!="
-  | Pbigintcomp Clt -> fprintf ppf "<"
-  | Pbigintcomp Cle -> fprintf ppf "<="
-  | Pbigintcomp Cgt -> fprintf ppf ">"
-  | Pbigintcomp Cge -> fprintf ppf ">="
-  | Pjscomp Ceq -> fprintf ppf "#=="
-  | Pjscomp Cneq -> fprintf ppf "#!="
-  | Pjscomp Clt -> fprintf ppf "#<"
-  | Pjscomp Cle -> fprintf ppf "#<="
-  | Pjscomp Cgt -> fprintf ppf "#>"
-  | Pjscomp Cge -> fprintf ppf "#>="
-  | Pstringlength -> fprintf ppf "string.length"
-  | Pstringrefu -> fprintf ppf "string.unsafe_get"
-  | Pstringrefs -> fprintf ppf "string.get"
-  | Pbyteslength -> fprintf ppf "bytes.length"
-  | Pbytesrefu -> fprintf ppf "bytes.unsafe_get"
-  | Pbytessetu -> fprintf ppf "bytes.unsafe_set"
-  | Pbytesrefs -> fprintf ppf "bytes.get"
-  | Pbytessets -> fprintf ppf "bytes.set"
-  | Parraylength -> fprintf ppf "array.length"
-  | Pmakearray -> fprintf ppf "makearray"
-  | Parrayrefu -> fprintf ppf "array.unsafe_get"
-  | Parraysetu -> fprintf ppf "array.unsafe_set"
-  | Parrayrefs -> fprintf ppf "array.get"
-  | Parraysets -> fprintf ppf "array.set"
-  | Pctconst c ->
-      let const_name =
-        match c with
-        | Big_endian -> "big_endian"
-        | Ostype_unix -> "ostype_unix"
-        | Ostype_win32 -> "ostype_win32"
-        | Ostype -> "ostype"
-        | Backend_type -> "backend_type"
-      in
-      fprintf ppf "sys.constant_%s" const_name
-  | Pisint -> fprintf ppf "isint"
-  | Pis_poly_var_block -> fprintf ppf "#is_poly_var_block"
-  | Pisout i -> fprintf ppf "isout %d" i
-  | Pint64ofint -> fprintf ppf "of_int"
-  | Pintofint64 -> fprintf ppf "to_int"
-  | Pnegint64 -> fprintf ppf "neg64"
-  | Paddint64 -> fprintf ppf "add64"
-  | Psubint64 -> fprintf ppf "sub64"
-  | Pmulint64 -> fprintf ppf "mul64"
-  | Pdivint64 -> fprintf ppf "div64"
-  | Pmodint64 -> fprintf ppf "mod64"
-  | Pandint64 -> fprintf ppf "and64"
-  | Porint64 -> fprintf ppf "or64"
-  | Pxorint64 -> fprintf ppf "xor64"
-  | Plslint64 -> fprintf ppf "lsl64"
-  | Plsrint64 -> fprintf ppf "lsr64"
-  | Pasrint64 -> fprintf ppf "asr64"
-  | Pint64comp Ceq -> fprintf ppf "=="
-  | Pint64comp Cneq -> fprintf ppf "!="
-  | Pint64comp Clt -> fprintf ppf "<"
-  | Pint64comp Cgt -> fprintf ppf ">"
-  | Pint64comp Cle -> fprintf ppf "<="
-  | Pint64comp Cge -> fprintf ppf ">="
-
-type print_kind = Alias | Strict | StrictOpt | Variable | Recursive
-
-let kind = function
-  | Alias -> "a"
-  | Strict -> ""
-  | StrictOpt -> "o"
-  | Variable -> "v"
-  | Recursive -> "r"
-
-let to_print_kind (k : Lam_compat.let_kind) : print_kind =
-  match k with
-  | Alias -> Alias
-  | Strict -> Strict
-  | StrictOpt -> StrictOpt
-  | Variable -> Variable
-
-let rec aux (acc : (print_kind * Ident.t * Lam.t) list) (lam : Lam.t) =
-  match lam with
-  | Llet (str3, id3, arg3, body3) ->
-      aux ((to_print_kind str3, id3, arg3) :: acc) body3
-  | Lletrec (bind_args, body) ->
-      aux
-        (Ext_list.map_append bind_args acc (fun (id, l) -> (Recursive, id, l)))
-        body
-  | e -> (acc, e)
-
-(* type left_var =
-   {
-    kind : print_kind ;
-    id : Ident.t
-   } *)
-
-(* type left =
-   | Id of left_var *)
-(* | Nop *)
-
-let flatten (lam : Lam.t) : (print_kind * Ident.t * Lam.t) list * Lam.t =
-  match lam with
-  | Llet (str, id, arg, body) -> aux [ (to_print_kind str, id, arg) ] body
-  | Lletrec (bind_args, body) ->
-      aux (Ext_list.map bind_args (fun (id, l) -> (Recursive, id, l))) body
-  | _ -> assert false
-
-(* let get_string ((id : Ident.t), (pos : int)) (env : Env.t) : string =
-   match  Env.find_module (Pident id) env with
-   | {md_type = Mty_signature signature  ; _ } ->
-    (* Env.prefix_idents, could be cached  *)
-    let serializable_sigs =
-      Ext_list.filter (fun x ->
-          match x with
-          | Sig_typext _
-          | Sig_module _
-          | Sig_class _ -> true
-          | Sig_value(_, {val_kind = Val_prim _}) -> false
-                           | Sig_value _ -> true
-                           | _ -> false
-                           ) signature  in
-                           (begin match Ext_list.nth_opt  serializable_sigs  pos  with
-                           | Some (Sig_value (i,_)
-                           | Sig_module (i,_,_)
-                           | Sig_typext (i,_,_)
-                           | Sig_modtype(i,_)
-                           | Sig_class (i,_,_)
-                           | Sig_class_type(i,_,_)
-                           | Sig_type(i,_,_)) -> i
-                           | None -> assert false
-                           end).name
-                           | _ -> assert false
-*)
-
-let lambda ppf v =
-  let rec lam ppf (l : Lam.t) =
-    match l with
-    | Lvar id -> Ident.print ppf id
-    | Lglobal_module (id, dynamic_import) -> fprintf ppf (if dynamic_import then "dynamic global %a" else "global %a") Ident.print id
-    | Lconst cst -> struct_const ppf cst
-    | Lapply { ap_func; ap_args; ap_info = { ap_inlined } } ->
-        let lams ppf args =
-          List.iter (fun l -> fprintf ppf "@ %a" lam l) args
-        in
-        fprintf ppf "@[<2>(apply%s@ %a%a)@]"
-          (match ap_inlined with Always_inline -> "%inlned" | _ -> "")
-          lam ap_func lams ap_args
-    | Lfunction { params; body; _ } ->
-        let pr_params ppf params =
-          List.iter (fun param -> fprintf ppf "@ %a" Ident.print param) params
-          (* | Tupled -> *)
-          (*     fprintf ppf " ("; *)
-          (*     let first = ref true in *)
-          (*     List.iter *)
-          (*       (fun param -> *)
-          (*         if !first then first := false else fprintf ppf ",@ "; *)
-          (*         Ident.print ppf param) *)
-          (*       params; *)
-          (*     fprintf ppf ")"  *)
-        in
-        fprintf ppf "@[<2>(function%a@ %a)@]" pr_params params lam body
-    | (Llet _ | Lletrec _) as x ->
-        let args, body = flatten x in
-        let bindings ppf id_arg_list =
-          let spc = ref false in
-          List.iter
-            (fun (k, id, l) ->
-              if !spc then fprintf ppf "@ " else spc := true;
-              fprintf ppf "@[<2>%a =%s@ %a@]" Ident.print id (kind k) lam l)
-            id_arg_list
-        in
-        fprintf ppf "@[<2>(let@ (@[<hv 1>%a@]" bindings (List.rev args);
-        fprintf ppf ")@ %a)@]" lam body
-    | Lprim
-        {
-          primitive = Pfield (n, Fld_module { name = s });
-          args = [ Lglobal_module (id, dynamic_import) ];
-          _;
-        } ->
-        fprintf ppf (if dynamic_import then "dynamic %s.%s/%d" else "%s.%s/%d") id.name s n
-    | Lprim { primitive = prim; args = largs; _ } ->
-        let lams ppf largs =
-          List.iter (fun l -> fprintf ppf "@ %a" lam l) largs
-        in
-        fprintf ppf "@[<2>(%a%a)@]" primitive prim lams largs
-    | Lswitch (larg, sw) ->
-        let switch ppf (sw : Lam.lambda_switch) =
-          let spc = ref false in
-          List.iter
-            (fun (n, l) ->
-              if !spc then fprintf ppf "@ " else spc := true;
-              fprintf ppf "@[<hv 1>case int %i %S:@ %a@]" n
-                (match sw.sw_names with None -> "" | Some x -> x.consts.(n).name)
-                lam l)
-            sw.sw_consts;
-          List.iter
-            (fun (n, l) ->
-              if !spc then fprintf ppf "@ " else spc := true;
-              fprintf ppf "@[<hv 1>case tag %i %S:@ %a@]" n
-                (match sw.sw_names with None -> "" | Some x -> x.blocks.(n).tag.name)
-                lam l)
-            sw.sw_blocks;
-          match sw.sw_failaction with
-          | None -> ()
-          | Some l ->
-              if !spc then fprintf ppf "@ " else spc := true;
-              fprintf ppf "@[<hv 1>default:@ %a@]" lam l
-        in
-        fprintf ppf "@[<1>(%s %a@ @[<v 0>%a@])@]"
-          (match sw.sw_failaction with None -> "switch*" | _ -> "switch")
-          lam larg switch sw
-    | Lstringswitch (arg, cases, default) ->
-        let switch ppf cases =
-          let spc = ref false in
-          List.iter
-            (fun (s, l) ->
-              if !spc then fprintf ppf "@ " else spc := true;
-              fprintf ppf "@[<hv 1>case \"%s\":@ %a@]" (String.escaped s) lam l)
-            cases;
-          match default with
-          | Some default ->
-              if !spc then fprintf ppf "@ " else spc := true;
-              fprintf ppf "@[<hv 1>default:@ %a@]" lam default
-          | None -> ()
-        in
-        fprintf ppf "@[<1>(stringswitch %a@ @[<v 0>%a@])@]" lam arg switch cases
-    | Lstaticraise (i, ls) ->
-        let lams ppf largs =
-          List.iter (fun l -> fprintf ppf "@ %a" lam l) largs
-        in
-        fprintf ppf "@[<2>(exit@ %d%a)@]" i lams ls
-    | Lstaticcatch (lbody, (i, vars), lhandler) ->
-        fprintf ppf "@[<2>(catch@ %a@;<1 -1>with (%d%a)@ %a)@]" lam lbody i
-          (fun ppf vars ->
-            match vars with
-            | [] -> ()
-            | _ -> List.iter (fun x -> fprintf ppf " %a" Ident.print x) vars)
-          vars lam lhandler
-    | Ltrywith (lbody, param, lhandler) ->
-        fprintf ppf "@[<2>(try@ %a@;<1 -1>with %a@ %a)@]" lam lbody Ident.print
-          param lam lhandler
-    | Lifthenelse (lcond, lif, lelse) ->
-        fprintf ppf "@[<2>(if@ %a@ %a@ %a)@]" lam lcond lam lif lam lelse
-    | Lsequence (l1, l2) ->
-        fprintf ppf "@[<2>(seq@ %a@ %a)@]" lam l1 sequence l2
-    | Lwhile (lcond, lbody) ->
-        fprintf ppf "@[<2>(while@ %a@ %a)@]" lam lcond lam lbody
-    | Lfor (param, lo, hi, dir, body) ->
-        fprintf ppf "@[<2>(for %a@ %a@ %s@ %a@ %a)@]" Ident.print param lam lo
-          (match dir with Upto -> "to" | Downto -> "downto")
-          lam hi lam body
-    | Lassign (id, expr) ->
-        fprintf ppf "@[<2>(assign@ %a@ %a)@]" Ident.print id lam expr
-  and sequence ppf = function
-    | Lsequence (l1, l2) -> fprintf ppf "%a@ %a" sequence l1 sequence l2
-    | l -> lam ppf l
-  in
-  lam ppf v
-
-(* let structured_constant = struct_const *)
-
-(* let rec flatten_seq acc (lam : Lam.t) =
-   match lam with
-   | Lsequence(l1,l2) ->
-    flatten_seq (flatten_seq acc l1) l2
-   | x -> x :: acc *)
-
-(* exception Not_a_module *)
-
-(* let rec flat (acc : (left * Lam.t) list ) (lam : Lam.t) =
-   match lam with
-   | Llet (str,id,arg,body) ->
-    flat ( (Id {kind = to_print_kind str;  id}, arg) :: acc) body
-   | Lletrec (bind_args, body) ->
-    flat
-      (Ext_list.map_append bind_args acc
-        (fun (id, arg ) -> (Id {kind = Recursive;  id}, arg)) )
-      body
-   | Lsequence (l,r) ->
-    flat (flat acc l) r
-   | x -> (Nop, x) :: acc *)
-
-(* let lambda_as_module env  ppf (lam : Lam.t) =
-   try
-    (* match lam with *)
-    (* | Lprim {primitive = Psetglobal id ; args =  [biglambda]; _} *)
-    (* might be wrong in toplevel *)
-    (* -> *)
-
-    begin match flat [] lam  with
-      | (Nop, Lprim {primitive = Pmakeblock (_, _, _); args =  toplevels; _})
-        :: rest ->
-        (* let spc = ref false in *)
-        List.iter
-          (fun (left, l) ->
-             match left with
-             | Id { kind = k; id } ->
-               fprintf ppf "@[<2>%a =%s@ %a@]@." Ident.print id (kind k) lambda l
-             | Nop ->
-
-               fprintf ppf "@[<2>%a@]@."  lambda l
-          )
-
-        @@ List.rev rest
-
-
-      | _ -> raise Not_a_module
-    end
-   (* | _ -> raise Not_a_module *)
-   with _ ->
-    lambda ppf lam;
-    fprintf ppf "; lambda-failure" *)
-
-let serialize (filename : string) (lam : Lam.t) : unit =
-  let ou = open_out filename in
-  let old = Format.get_margin () in
-  let () = Format.set_margin 10000 in
-  let fmt = Format.formatter_of_out_channel ou in
-  (* lambda_as_module env fmt lambda; *)
-  lambda fmt lam;
-  Format.pp_print_flush fmt ();
-  close_out ou;
-  Format.set_margin old
-
-let lambda_to_string = Format.asprintf "%a" lambda
-
-let primitive_to_string = Format.asprintf "%a" primitive
diff --git a/jscomp/core/lam_print.mli b/jscomp/core/lam_print.mli
deleted file mode 100644
index 3830133..0000000
--- a/jscomp/core/lam_print.mli
+++ /dev/null
@@ -1,33 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val lambda : Format.formatter -> Lam.t -> unit
-
-val primitive : Format.formatter -> Lam_primitive.t -> unit
-
-val serialize : string -> Lam.t -> unit
-
-val lambda_to_string : Lam.t -> string
-
-val primitive_to_string : Lam_primitive.t -> string
diff --git a/jscomp/core/lam_scc.ml b/jscomp/core/lam_scc.ml
deleted file mode 100644
index f1efa4d..0000000
--- a/jscomp/core/lam_scc.ml
+++ /dev/null
@@ -1,154 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(**
-    [hit_mask mask lambda] iters through the lambda
-    set the bit of corresponding [id] if [id] is hit.
-    As an optimization step if [mask_and_check_all_hit],
-    there is no need to iter such lambda any more
-*)
-let hit_mask (mask : Hash_set_ident_mask.t) (l : Lam.t) : bool =
-  let rec hit_opt (x : Lam.t option) =
-    match x with None -> false | Some a -> hit a
-  and hit_var (id : Ident.t) =
-    Hash_set_ident_mask.mask_and_check_all_hit mask id
-  and hit_list_snd : 'a. ('a * Lam.t) list -> bool =
-   fun x -> Ext_list.exists_snd x hit
-  and hit_list xs = Ext_list.exists xs hit
-  and hit (l : Lam.t) =
-    match l with
-    | Lvar id -> hit_var id
-    | Lassign (id, e) -> hit_var id || hit e
-    | Lstaticcatch (e1, (_, _), e2) -> hit e1 || hit e2
-    | Ltrywith (e1, _exn, e2) -> hit e1 || hit e2
-    | Lfunction { body; params = _ } -> hit body
-    | Llet (_str, _id, arg, body) -> hit arg || hit body
-    | Lletrec (decl, body) -> hit body || hit_list_snd decl
-    | Lfor (_v, e1, e2, _dir, e3) -> hit e1 || hit e2 || hit e3
-    | Lconst _ -> false
-    | Lapply { ap_func; ap_args; _ } -> hit ap_func || hit_list ap_args
-    | Lglobal_module _ (* playsafe *) -> false
-    | Lprim { args; _ } -> hit_list args
-    | Lswitch (arg, sw) ->
-        hit arg || hit_list_snd sw.sw_consts || hit_list_snd sw.sw_blocks
-        || hit_opt sw.sw_failaction
-    | Lstringswitch (arg, cases, default) ->
-        hit arg || hit_list_snd cases || hit_opt default
-    | Lstaticraise (_, args) -> hit_list args
-    | Lifthenelse (e1, e2, e3) -> hit e1 || hit e2 || hit e3
-    | Lsequence (e1, e2) -> hit e1 || hit e2
-    | Lwhile (e1, e2) -> hit e1 || hit e2
-  in
-  hit l
-
-type bindings = (Ident.t * Lam.t) list
-
-let preprocess_deps (groups : bindings) : _ * Ident.t array * Vec_int.t array =
-  let len = List.length groups in
-  let domain : _ Ordered_hash_map_local_ident.t =
-    Ordered_hash_map_local_ident.create len
-  in
-  let mask = Hash_set_ident_mask.create len in
-  Ext_list.iter groups (fun (x, lam) ->
-      Ordered_hash_map_local_ident.add domain x lam;
-      Hash_set_ident_mask.add_unmask mask x);
-  let int_mapping = Ordered_hash_map_local_ident.to_sorted_array domain in
-  let node_vec = Array.make (Array.length int_mapping) (Vec_int.empty ()) in
-  Ordered_hash_map_local_ident.iter domain (fun _id lam key_index ->
-      let base_key = node_vec.(key_index) in
-      ignore (hit_mask mask lam);
-      Hash_set_ident_mask.iter_and_unmask mask (fun ident hit ->
-          if hit then
-            let key = Ordered_hash_map_local_ident.rank domain ident in
-            Vec_int.push base_key key));
-  (domain, int_mapping, node_vec)
-
-let is_function_bind (_, (x : Lam.t)) =
-  match x with Lfunction _ -> true | _ -> false
-
-let sort_single_binding_group (group : bindings) =
-  if Ext_list.for_all group is_function_bind then group
-  else
-    List.sort
-      (fun (_, lama) (_, lamb) ->
-        match ((lama : Lam.t), (lamb : Lam.t)) with
-        | Lfunction _, Lfunction _ -> 0
-        | Lfunction _, _ -> -1
-        | _, Lfunction _ -> 1
-        | _, _ -> 0)
-      group
-
-(** TODO: even for a singleton recursive function, tell whehter it is recursive or not ? *)
-let scc_bindings (groups : bindings) : bindings list =
-  match groups with
-  | [ _ ] -> [ sort_single_binding_group groups ]
-  | _ ->
-      let domain, int_mapping, node_vec = preprocess_deps groups in
-      let clusters : Int_vec_vec.t = Ext_scc.graph node_vec in
-      if Int_vec_vec.length clusters <= 1 then
-        [ sort_single_binding_group groups ]
-      else
-        Int_vec_vec.fold_right
-          (fun (v : Vec_int.t) acc ->
-            let bindings =
-              Vec_int.map_into_list
-                (fun i ->
-                  let id = int_mapping.(i) in
-                  let lam = Ordered_hash_map_local_ident.find_value domain id in
-                  (id, lam))
-                v
-            in
-            sort_single_binding_group bindings :: acc)
-          clusters []
-
-(* single binding, it does not make sense to do scc,
-   we can eliminate {[ let rec f x = x + x  ]}, but it happens rarely in real world
-*)
-let scc (groups : bindings) (lam : Lam.t) (body : Lam.t) =
-  match groups with
-  | [ (id, bind) ] ->
-      if Lam_hit.hit_variable id bind then lam else Lam.let_ Strict id bind body
-  | _ ->
-      let domain, int_mapping, node_vec = preprocess_deps groups in
-      let clusters = Ext_scc.graph node_vec in
-      if Int_vec_vec.length clusters <= 1 then lam
-      else
-        Int_vec_vec.fold_right
-          (fun (v : Vec_int.t) acc ->
-            let bindings =
-              Vec_int.map_into_list
-                (fun i ->
-                  let id = int_mapping.(i) in
-                  let lam = Ordered_hash_map_local_ident.find_value domain id in
-                  (id, lam))
-                v
-            in
-            match bindings with
-            | [ (id, lam) ] ->
-                let base_key = Ordered_hash_map_local_ident.rank domain id in
-                if Int_vec_util.mem base_key node_vec.(base_key) then
-                  Lam.letrec bindings acc
-                else Lam.let_ Strict id lam acc
-            | _ -> Lam.letrec bindings acc)
-          clusters body
diff --git a/jscomp/core/lam_scc.mli b/jscomp/core/lam_scc.mli
deleted file mode 100644
index 46cf481..0000000
--- a/jscomp/core/lam_scc.mli
+++ /dev/null
@@ -1,29 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 bindings = (Ident.t * Lam.t) list
-
-val scc_bindings : bindings -> bindings list
-
-val scc : bindings -> Lam.t -> Lam.t -> Lam.t
diff --git a/jscomp/core/lam_stats.ml b/jscomp/core/lam_stats.ml
deleted file mode 100644
index 8ca1b05..0000000
--- a/jscomp/core/lam_stats.ml
+++ /dev/null
@@ -1,73 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* It can be useful for common sub expression elimination ?
-    if two lambdas are not equal, it should return false, other wise,
-    it might return true , this is only used as a way of optimizaton
-
-    Use case :
-    1. switch case -- common fall through
-*)
-
-(* lambda pass for alpha conversion
-    and alias
-    we need think about the order of the pass, might be the alias pass can be done
-    in the  beginning, when we do alpha conversion, we can instrument the table
-*)
-
-(* type alias_tbl =  Ident.t Hash_ident.t *)
-
-type ident_tbl = Lam_id_kind.t Hash_ident.t
-
-type t = {
-  export_idents : Set_ident.t;
-  exports : Ident.t list;
-  (*It is kept since order matters? *)
-  ident_tbl : ident_tbl;
-      (** we don't need count arities for all identifiers, for identifiers
-      for sure it's not a function, there is no need to count them
-  *)
-}
-
-let pp = Format.fprintf
-
-(* let pp_alias_tbl fmt (tbl : alias_tbl) =
-   Hash_ident.iter  tbl (fun k v -> pp fmt "@[%a -> %a@]@." Ident.print k Ident.print v) *)
-
-let pp_ident_tbl fmt (ident_tbl : ident_tbl) =
-  Hash_ident.iter ident_tbl (fun k v ->
-      pp fmt "@[%a -> %a@]@." Ident.print k Lam_id_kind.print v)
-
-let print fmt (v : t) =
-  pp fmt "@[Ident table:@ @[%a@]@]" pp_ident_tbl v.ident_tbl;
-  pp fmt "@[exports:@ @[%a@]@]"
-    (Format.pp_print_list ~pp_sep:(fun fmt () -> pp fmt "@ ;") Ident.print)
-    v.exports
-
-let make ~export_idents ~export_ident_sets : t =
-  {
-    ident_tbl = Hash_ident.create 31;
-    exports = export_idents;
-    export_idents = export_ident_sets;
-  }
diff --git a/jscomp/core/lam_stats.mli b/jscomp/core/lam_stats.mli
deleted file mode 100644
index d8a3d34..0000000
--- a/jscomp/core/lam_stats.mli
+++ /dev/null
@@ -1,43 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Types defined for lambda analysis *)
-
-(** Keep track of which identifiers are aliased
-*)
-
-type ident_tbl = Lam_id_kind.t Hash_ident.t
-
-type t = {
-  export_idents : Set_ident.t;
-  exports : Ident.t list;
-  ident_tbl : ident_tbl;
-      (** we don't need count arities for all identifiers, for identifiers
-      for sure it's not a function, there is no need to count them
-  *)
-}
-
-val print : Format.formatter -> t -> unit
-
-val make : export_idents:Ident.t list -> export_ident_sets:Set_ident.t -> t
diff --git a/jscomp/core/lam_stats_export.ml b/jscomp/core/lam_stats_export.ml
deleted file mode 100644
index c4b98bb..0000000
--- a/jscomp/core/lam_stats_export.ml
+++ /dev/null
@@ -1,140 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* let pp = Format.fprintf  *)
-(* we should exclude meaninglist names and do the convert as well *)
-
-(* let meaningless_names  = ["*opt*"; "param";] *)
-
-let single_na = Js_cmj_format.single_na
-
-let values_of_export (meta : Lam_stats.t) (export_map : Lam.t Map_ident.t) :
-    Js_cmj_format.cmj_value Map_string.t =
-  Ext_list.fold_left meta.exports Map_string.empty (fun acc x ->
-      let arity : Js_cmj_format.arity =
-        match Hash_ident.find_opt meta.ident_tbl x with
-        | Some (FunctionId { arity; _ }) -> Single arity
-        | Some (ImmutableBlock elems) ->
-            (* FIXME: field name for dumping*)
-            Submodule
-              (Ext_array.map elems (fun x ->
-                   match x with
-                   | NA -> Lam_arity.na
-                   | SimpleForm lam -> Lam_arity_analysis.get_arity meta lam))
-        | Some _ | None -> (
-            match Map_ident.find_opt export_map x with
-            | Some (Lprim { primitive = Pmakeblock (_, _, Immutable); args }) ->
-                Submodule
-                  (Ext_array.of_list_map args (fun lam ->
-                       Lam_arity_analysis.get_arity meta lam))
-            | Some _ | None -> single_na)
-      in
-      let persistent_closed_lambda =
-        let optlam = Map_ident.find_opt export_map x in
-        match optlam with
-        | Some
-            (Lconst
-              ( Const_js_null | Const_js_undefined _ | Const_js_true
-              | Const_js_false ))
-        | None ->
-            optlam
-        | Some lambda ->
-            if not !Js_config.cross_module_inline then None
-            else if
-              Lam_analysis.safe_to_inline lambda
-              (* when inlning a non function, we have to be very careful,
-                 only truly immutable values can be inlined
-              *)
-            then
-              match lambda with
-              | Lfunction { attr = { inline = Always_inline } }
-              (* FIXME: is_closed lambda is too restrictive
-                 It precludes ues cases
-                 - inline forEach but not forEachU
-              *)
-              | Lfunction { attr = { is_a_functor = true } } ->
-                  if Lam_closure.is_closed lambda (* TODO: seriealize more*)
-                  then optlam
-                  else None
-              | _ ->
-                  let lam_size = Lam_analysis.size lambda in
-                  (* TODO:
-                     1. global need re-assocate when do the beta reduction
-                     2. [lambda_exports] is not precise
-                  *)
-                  let free_variables =
-                    Lam_closure.free_variables Set_ident.empty Map_ident.empty
-                      lambda
-                  in
-                  if
-                    lam_size < Lam_analysis.small_inline_size
-                    && Map_ident.is_empty free_variables
-                  then (
-                    Ext_log.dwarn ~__POS__ "%s recorded for inlining @." x.name;
-                    optlam)
-                  else None
-            else None
-      in
-      match (arity, persistent_closed_lambda) with
-      | Single Arity_na, (None | Some (Lconst Const_module_alias)) -> acc
-      | Submodule [||], None -> acc
-      | _ ->
-          let cmj_value : Js_cmj_format.cmj_value =
-            { arity; persistent_closed_lambda }
-          in
-          Map_string.add acc x.name cmj_value)
-
-(* ATTENTION: all runtime modules, if it is not hard required,
-   it should be okay to not reference it
-*)
-let get_dependent_module_effect (maybe_pure : string option)
-    (external_ids : Lam_module_ident.t list) =
-  if maybe_pure = None then
-    let non_pure_module =
-      Ext_list.find_first_not external_ids Lam_compile_env.is_pure_module
-    in
-    Ext_option.map non_pure_module (fun x -> Lam_module_ident.name x)
-  else maybe_pure
-
-(* Note that
-   [lambda_exports] is
-   lambda expression to be exported
-   for the js backend, we compile to js
-   for the inliner, we try to serialize it --
-   relies on other optimizations to make this happen
-   {[
-     exports.Make = function () {.....}
-   ]}
-   TODO: check that we don't do this in browser environment
-*)
-let export_to_cmj (meta : Lam_stats.t) effect export_map case : Js_cmj_format.t
-    =
-  let values = values_of_export meta export_map in
-
-  Js_cmj_format.make ~values ~effect
-    ~package_spec:(Js_packages_state.get_packages_info ())
-    ~case
-(* FIXME: make sure [-o] would not change its case
-   add test for ns/non-ns
-*)
diff --git a/jscomp/core/lam_stats_export.mli b/jscomp/core/lam_stats_export.mli
deleted file mode 100644
index 717fbd5..0000000
--- a/jscomp/core/lam_stats_export.mli
+++ /dev/null
@@ -1,33 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript  
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val get_dependent_module_effect :
-  string option -> Lam_module_ident.t list -> string option
-
-val export_to_cmj :
-  Lam_stats.t ->
-  Js_cmj_format.effect ->
-  Lam.t Map_ident.t ->
-  Ext_js_file_kind.case ->
-  Js_cmj_format.t
diff --git a/jscomp/core/lam_subst.ml b/jscomp/core/lam_subst.ml
deleted file mode 100644
index 0d189ed..0000000
--- a/jscomp/core/lam_subst.ml
+++ /dev/null
@@ -1,74 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Apply a substitution to a lambda-term.
-   Assumes that the bound variables of the lambda-term do not
-   belong to the domain of the substitution.
-   Assumes that the image of the substitution is out of reach
-   of the bound variables of the lambda-term (no capture). *)
-
-let subst (s : Lam.t Map_ident.t) lam =
-  let rec subst_aux (x : Lam.t) : Lam.t =
-    match x with
-    | Lvar id -> Map_ident.find_default s id x
-    | Lconst _ -> x
-    | Lapply { ap_func; ap_args; ap_info } ->
-        Lam.apply (subst_aux ap_func) (Ext_list.map ap_args subst_aux) ap_info
-    | Lfunction { arity; params; body; attr } ->
-        Lam.function_ ~arity ~params ~body:(subst_aux body) ~attr
-    | Llet (str, id, arg, body) ->
-        Lam.let_ str id (subst_aux arg) (subst_aux body)
-    | Lletrec (decl, body) ->
-        Lam.letrec (Ext_list.map decl subst_decl) (subst_aux body)
-    | Lprim { primitive; args; loc } ->
-        Lam.prim ~primitive ~args:(Ext_list.map args subst_aux) loc
-    | Lglobal_module _ -> x
-    | Lswitch (arg, sw) ->
-        Lam.switch (subst_aux arg)
-          {
-            sw with
-            sw_consts = Ext_list.map sw.sw_consts subst_case;
-            sw_blocks = Ext_list.map sw.sw_blocks subst_case;
-            sw_failaction = subst_opt sw.sw_failaction;
-          }
-    | Lstringswitch (arg, cases, default) ->
-        Lam.stringswitch (subst_aux arg)
-          (Ext_list.map cases subst_strcase)
-          (subst_opt default)
-    | Lstaticraise (i, args) -> Lam.staticraise i (Ext_list.map args subst_aux)
-    | Lstaticcatch (e1, io, e2) ->
-        Lam.staticcatch (subst_aux e1) io (subst_aux e2)
-    | Ltrywith (e1, exn, e2) -> Lam.try_ (subst_aux e1) exn (subst_aux e2)
-    | Lifthenelse (e1, e2, e3) ->
-        Lam.if_ (subst_aux e1) (subst_aux e2) (subst_aux e3)
-    | Lsequence (e1, e2) -> Lam.seq (subst_aux e1) (subst_aux e2)
-    | Lwhile (e1, e2) -> Lam.while_ (subst_aux e1) (subst_aux e2)
-    | Lfor (v, e1, e2, dir, e3) ->
-        Lam.for_ v (subst_aux e1) (subst_aux e2) dir (subst_aux e3)
-    | Lassign (id, e) -> Lam.assign id (subst_aux e)
-  and subst_decl (id, exp) = (id, subst_aux exp)
-  and subst_case (key, case) = (key, subst_aux case)
-  and subst_strcase (key, case) = (key, subst_aux case)
-  and subst_opt = function None -> None | Some e -> Some (subst_aux e) in
-  subst_aux lam
diff --git a/jscomp/core/lam_subst.mli b/jscomp/core/lam_subst.mli
deleted file mode 100644
index 00836dc..0000000
--- a/jscomp/core/lam_subst.mli
+++ /dev/null
@@ -1,31 +0,0 @@
-(* Copyright (C) 2017 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Apply a substitution to a lambda-term.
-   Assumes that the bound variables of the lambda-term do not
-   belong to the domain of the substitution.
-   Assumes that the image of the substitution is out of reach
-   of the bound variables of the lambda-term (no capture). *)
-
-val subst : Lam.t Map_ident.t -> Lam.t -> Lam.t
diff --git a/jscomp/core/lam_tag_info.ml b/jscomp/core/lam_tag_info.ml
deleted file mode 100644
index dddd3d9..0000000
--- a/jscomp/core/lam_tag_info.ml
+++ /dev/null
@@ -1,30 +0,0 @@
-(* Copyright (C) 2018-Present Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Similiar to {!Lambda.tag_info}
-   In particular,
-   it reduces some branches e.g,
-   [Blk_some], [Blk_some_not_nested]
-*)
-type t = Lambda.tag_info
diff --git a/jscomp/core/lam_util.ml b/jscomp/core/lam_util.ml
deleted file mode 100644
index 36fc31b..0000000
--- a/jscomp/core/lam_util.ml
+++ /dev/null
@@ -1,279 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-
-
-
-
-
-
-
-
-
-(*
-let add_required_modules ( x : Ident.t list) (meta : Lam_stats.t) = 
-  let meta_require_modules = meta.required_modules in
-  List.iter (fun x -> add meta_require_modules (Lam_module_ident.of_ml x)) x 
-*)
-
-
-(* 
-    It's impossible to have a case like below:
-   {[
-     (let export_f = ... in export_f)
-   ]}
-    Even so, it's still correct
-*)
-let refine_let
-    ~kind param
-    (arg : Lam.t) (l : Lam.t)  : Lam.t =
-
-  match (kind : Lam_compat.let_kind ), arg, l  with 
-  | _, _, Lvar w when Ident.same w param 
-    (* let k = xx in k
-       there is no [rec] so [k] would not appear in [xx]
-    *)
-    -> arg (* TODO: optimize here -- it's safe to do substitution here *)
-  | _, _, Lprim {primitive ; args =  [Lvar w]; loc ; _} when Ident.same w param 
-                                                          &&  (function | Lam_primitive.Pmakeblock _ -> false | _ ->  true) primitive
-    (* don't inline inside a block *)
-    ->  Lam.prim ~primitive ~args:[arg]  loc 
-  (* we can not do this substitution when capttured *)
-  (* | _, Lvar _, _ -> (\** let u = h in xxx*\) *)
-  (*     (\* assert false *\) *)
-  (*     Ext_log.err "@[substitution >> @]@."; *)
-  (*     let v= subst_lambda (Map_ident.singleton param arg ) l in *)
-  (*     Ext_log.err "@[substitution << @]@."; *)
-  (* v *)
-  | _, _, Lapply {ap_func=fn; ap_args = [Lvar w]; ap_info} when
-      Ident.same w param &&
-      (not (Lam_hit.hit_variable param fn ))
-    -> 
-    (* does not work for multiple args since 
-        evaluation order unspecified, does not apply 
-        for [js] in general, since the scope of js ir is loosen
-
-        here we remove the definition of [param]
-       {[ let k = v in (body) k 
-       ]}
-        #1667 make sure body does not hit k 
-    *)
-    Lam.apply fn [arg] ap_info
-  | (Strict | StrictOpt ),
-    ( Lvar _    | Lconst  _ | 
-      Lprim {primitive = Pfield (_ , Fld_module _) ;  
-             args = [ Lglobal_module _ | Lvar _ ]; _}) , _ ->
-    (* (match arg with  *)
-    (* | Lconst _ ->  *)
-    (*     Ext_log.err "@[%a %s@]@."  *)
-    (*       Ident.print param (string_of_lambda arg) *)
-    (* | _ -> ()); *)
-    (* No side effect and does not depend on store,
-        since function evaluation is always delayed
-    *)
-    Lam.let_ Alias param arg l
-  | ( (Strict | StrictOpt ) ), (Lfunction _ ), _ ->
-    (*It can be promoted to [Alias], however, 
-        we don't want to do this, since we don't want the 
-        function to be inlined to a block, for example
-      {[
-        let f = fun _ -> 1 in
-        [0, f]
-      ]}
-        TODO: punish inliner to inline functions 
-        into a block 
-    *)
-    Lam.let_ StrictOpt  param arg l
-  (* Not the case, the block itself can have side effects 
-      we can apply [no_side_effects] pass 
-      | Some Strict, Lprim(Pmakeblock (_,_,Immutable),_) ->  
-        Llet(StrictOpt, param, arg, l) 
-  *)      
-  | Strict, _ ,_  when Lam_analysis.no_side_effects arg ->
-    Lam.let_ StrictOpt param arg l
-  | Variable, _, _ -> 
-    Lam.let_ Variable  param arg l
-  | kind, _, _ -> 
-    Lam.let_ kind  param arg l
-(* | None , _, _ -> 
-   Lam.let_ Strict param arg  l *)
-
-let alias_ident_or_global (meta : Lam_stats.t) (k:Ident.t) (v:Ident.t) 
-    (v_kind : Lam_id_kind.t)  =
-  (* treat rec as Strict, k is assigned to v 
-     {[ let k = v ]}
-  *)
-  match v_kind with 
-  | NA ->
-    begin 
-      match Hash_ident.find_opt meta.ident_tbl v  with 
-      | None -> ()
-      | Some ident_info -> Hash_ident.add meta.ident_tbl k ident_info
-    end
-  | ident_info -> Hash_ident.add meta.ident_tbl k ident_info
-
-(* share -- it is safe to share most properties,
-    for arity, we might be careful, only [Alias] can share,
-    since two values have same type, can have different arities
-    TODO: check with reference pass, it might break 
-    since it will create new identifier, we can avoid such issue??
-
-    actually arity is a dynamic property, for a reference, it can 
-    be changed across 
-    we should treat
-    reference specially. or maybe we should track any 
-    mutable reference
-*)
-
-
-
-
-
-(* How we destruct the immutable block 
-   depend on the block name itself, 
-   good hints to do aggressive destructing
-   1. the variable is not exported
-      like [matched] -- these are blocks constructed temporary
-   2. how the variable is used 
-      if it is guarateed to be 
-   - non export 
-   - and non escaped (there is no place it is used as a whole)
-      then we can always destruct it 
-      if some fields are used in multiple places, we can create 
-      a temporary field 
-
-   3. It would be nice that when the block is mutable, its 
-       mutable fields are explicit, since wen can not inline an mutable block access
-*)
-
-let element_of_lambda (lam : Lam.t) : Lam_id_kind.element = 
-  match lam with 
-  | Lvar _ 
-  | Lconst _ 
-  | Lprim {primitive = Pfield (_, Fld_module _) ; 
-           args =  [ Lglobal_module _  | Lvar _ ];
-           _} -> SimpleForm lam
-  (* | Lfunction _  *)
-  | _ -> NA 
-
-let kind_of_lambda_block (xs : Lam.t list) : Lam_id_kind.t = 
-  ImmutableBlock( Ext_array.of_list_map xs (fun x -> 
-      element_of_lambda x ))
-
-let field_flatten_get
-    lam v i info (tbl : Lam_id_kind.t Hash_ident.t) : Lam.t =
-  match Hash_ident.find_opt tbl v  with 
-  | Some (Module g) -> 
-    Lam.prim ~primitive:(Pfield (i, info)) 
-      ~args:[ Lam.global_module g ] Location.none
-  | Some (ImmutableBlock (arr)) -> 
-    begin match arr.(i) with 
-      | NA -> lam ()
-      | SimpleForm l -> l
-      | exception _ -> lam ()
-    end
-  | Some (Constant (Const_block (_, Blk_record {fields}, ls))) ->
-    (match info with
-      | Fld_record {name} ->
-        let found = ref None in
-        for i = 0 to Array.length fields - 1 do
-          if fields.(i) = name then found := Ext_list.nth_opt ls i done;
-        (match !found with
-        | Some c -> Lam.const c
-        | None  -> lam())
-      | _ -> lam ()
-    )
-  | Some (Constant (Const_block (_,_,ls))) ->
-    begin match Ext_list.nth_opt ls i with 
-      | None -> lam  ()
-      | Some x -> Lam.const x
-    end
-  | Some _
-  | None -> lam ()
-
-
-(* TODO: check that if label belongs to a different 
-    namesape
-*)
-let count = ref 0 
-
-let generate_label ?(name="") ()  = 
-  incr count; 
-  Printf.sprintf "%s_tailcall_%04d" name !count
-
-#if (defined BROWSER || defined RELEASE)
-let dump ext  lam = 
-  ()
-#else
-let log_counter = ref 0
-let dump ext  lam = 
-  if !Js_config.diagnose
-  then 
-    (* ATTENTION: easy to introduce a bug during refactoring when forgeting `begin` `end`*)
-    begin 
-      incr log_counter;
-      Ext_log.dwarn ~__POS__ "\n@[[TIME:]%s: %f@]@." ext (Sys.time () *. 1000.);
-      Lam_print.serialize  
-        (Ext_filename.new_extension
-           !Location.input_name
-           (Printf.sprintf ".%02d%s.lam" !log_counter ext)
-        ) lam;
-    end
-#endif      
-
-
-
-
-
-let is_function (lam : Lam.t) = 
-  match lam with 
-  | Lfunction _ -> true | _ -> false
-
-let not_function (lam : Lam.t) = 
-  match lam with 
-  | Lfunction _ -> false | _ -> true 
-(* 
-let is_var (lam : Lam.t) id =   
-  match lam with 
-  | Lvar id0 -> Ident.same id0 id 
-  | _ -> false *)
-
-
-(* TODO: we need create 
-   1. a smart [let] combinator, reusable beta-reduction 
-   2. [lapply fn args info] 
-   here [fn] should get the last tail
-   for example 
-   {[
-     lapply (let a = 3 in let b = 4 in fun x y -> x + y) 2 3 
-   ]}   
-*)
-
-
-
-
-
-
-
-
diff --git a/jscomp/core/lam_util.mli b/jscomp/core/lam_util.mli
deleted file mode 100644
index fc0b642..0000000
--- a/jscomp/core/lam_util.mli
+++ /dev/null
@@ -1,64 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val kind_of_lambda_block : Lam.t list -> Lam_id_kind.t
-
-val field_flatten_get :
-  (unit -> Lam.t) ->
-  Ident.t ->
-  int ->
-  Lambda.field_dbg_info ->
-  Lam_stats.ident_tbl ->
-  Lam.t
-(** [field_flattern_get cb v i tbl]
-    try to remove the indirection of [v.(i)] by inlining when [v]
-    is a known block, 
-    if not, it will call [cb ()].
-
-    Note due to different control flow, a constant block
-    may result in out-of bound access, in that case, we should
-    just ignore it. This does not mean our
-    optimization is wrong, it means we hit an unreachable branch.
-    for example
-    {{
-      let myShape = A 10 in 
-      match myShape with 
-      | A x -> x  (* only access field [0]*)
-      | B (x,y) -> x + y (* Here it will try to access field [1] *)
-    }}
-*)
-
-val alias_ident_or_global :
-  Lam_stats.t -> Ident.t -> Ident.t -> Lam_id_kind.t -> unit
-
-val refine_let : kind:Lam_compat.let_kind -> Ident.t -> Lam.t -> Lam.t -> Lam.t
-
-val generate_label : ?name:string -> unit -> J.label
-
-val dump : string -> Lam.t -> unit
-(** [dump] when {!Js_config.is_same_file}*)
-
-val not_function : Lam.t -> bool
-
-val is_function : Lam.t -> bool
diff --git a/jscomp/core/lam_var_stats.ml b/jscomp/core/lam_var_stats.ml
deleted file mode 100644
index db39605..0000000
--- a/jscomp/core/lam_var_stats.ml
+++ /dev/null
@@ -1,69 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Used in loop, huge punishment *)
-let loop_use = 100
-
-type stats = {
-  top : bool;
-  (* all appearances are in the top,  substitution is fine
-     whether it is pure or not
-     {[
-       (fun x y
-         ->  x + y + (f x )) (32) (console.log('hi'), 33)
-     ]}
-     since in ocaml, the application order is intentionally undefined,
-     note if [times] is not one, this field does not make sense
-  *)
-  times : int;
-}
-
-let fresh_stats : stats = { top = true; times = 0 }
-
-let sink_stats : stats = { top = false; times = loop_use }
-
-(* let stats top times = {top; times} *)
-let top_and_used_zero_or_one x =
-  match x with { top = true; times = 0 | 1 } -> true | _ -> false
-
-type position =
-  | Begin (* top = true ; loop = false *)
-  | Not_begin (* top = false; loop = false *)
-  | Sink
-(* loop = true *)
-
-let update (v : stats) (pos : position) : stats =
-  match pos with
-  | Begin -> { v with times = v.times + 1 }
-  | Not_begin -> { top = false; times = v.times + 1 }
-  | Sink -> sink_stats
-
-let sink : position = Sink
-
-let fresh_env : position = Begin
-
-(* no side effect, if argument has no side effect and used only once we can simply do the replacement *)
-let new_position_after_lam lam (env : position) : position =
-  if (not (env = Begin)) || Lam_analysis.no_side_effects lam then env
-  else Not_begin
diff --git a/jscomp/core/lam_var_stats.mli b/jscomp/core/lam_var_stats.mli
deleted file mode 100644
index f4c5b80..0000000
--- a/jscomp/core/lam_var_stats.mli
+++ /dev/null
@@ -1,41 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 stats
-
-val fresh_stats : stats
-
-val top_and_used_zero_or_one : stats -> bool
-
-type position
-
-val sink : position
-
-val fresh_env : position
-
-val new_position_after_lam : Lam.t -> position -> position
-
-val update : stats -> position -> stats
-(** The variable used stats update depend 
-    on the position of the variable*)
diff --git a/jscomp/core/matching_polyfill.ml b/jscomp/core/matching_polyfill.ml
deleted file mode 100644
index 8955813..0000000
--- a/jscomp/core/matching_polyfill.ml
+++ /dev/null
@@ -1,69 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let () = Ast_untagged_variants.extract_concrete_typedecl := Ctype.extract_concrete_typedecl
-let () = Ast_untagged_variants.expand_head := Ctype.expand_head
-
-let names_from_construct_pattern (pat : Typedtree.pattern) =
-  let rec resolve_path n (path : Path.t) =
-    match Env.find_type path pat.pat_env with
-    | { type_kind = Type_variant cstrs; _ } -> Ast_untagged_variants.names_from_type_variant ~env:pat.pat_env cstrs
-    | { type_kind = Type_abstract; type_manifest = Some t; _ } -> (
-        match (Ctype.unalias t).desc with
-        | Tconstr (pathn, _, _) ->
-            resolve_path (n + 1) pathn
-        | _ -> None)
-    | { type_kind = Type_abstract; type_manifest = None; _ } -> None
-    | { type_kind = Type_record _ | Type_open (* Exceptions *); _ } -> None
-  in
-
-  match (Btype.repr pat.pat_type).desc with
-  | Tconstr (path, _, _) -> resolve_path 0 path
-  | _ -> assert false
-
-(**
-    Note it is a bit tricky when there is unbound var, 
-    its type will be Tvar which is too complicated to support subtyping
-*)
-let variant_is_subtype (env : Env.t) (row_desc : Types.row_desc)
-    (ty : Types.type_expr) : bool =
-  match row_desc with
-  | {
-   row_closed = true;
-   row_fixed = _;
-   row_fields = (name, (Rabsent | Rpresent None)) :: rest;
-  } ->
-      if Ext_string.is_valid_hash_number name then
-        Ext_list.for_all rest (function
-          | name, (Rabsent | Rpresent None) ->
-              Ext_string.is_valid_hash_number name
-          | _ -> false)
-        && Typeopt.is_base_type env ty Predef.path_int
-      else
-        Ext_list.for_all rest (function
-          | name, (Rabsent | Rpresent None) ->
-              not (Ext_string.is_valid_hash_number name)
-          | _ -> false)
-        && Typeopt.is_base_type env ty Predef.path_string
-  | _ -> false
diff --git a/jscomp/core/matching_polyfill.mli b/jscomp/core/matching_polyfill.mli
deleted file mode 100644
index 5764981..0000000
--- a/jscomp/core/matching_polyfill.mli
+++ /dev/null
@@ -1,28 +0,0 @@
-(* Copyright (C) 2020 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val names_from_construct_pattern :
-  Typedtree.pattern -> Ast_untagged_variants.switch_names option
-
-val variant_is_subtype : Env.t -> Types.row_desc -> Types.type_expr -> bool
diff --git a/jscomp/core/outcome_printer_ns.ml b/jscomp/core/outcome_printer_ns.ml
deleted file mode 100644
index 2e0c1c5..0000000
--- a/jscomp/core/outcome_printer_ns.ml
+++ /dev/null
@@ -1,85 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let ps = Format.pp_print_string
-
-let out_ident ppf s =
-  ps ppf
-    (match s with
-    | "Js_null" -> "Js.Null"
-    | "Js_undefined" -> "Js.Undefined"
-    | "Js_null_undefined" -> "Js.Nullable"
-    | "Js_exn" -> "Js.Exn"
-    | "Js_array" -> "Js.Array"
-    | "Js_string" -> "Js.String"
-    | "Js_re" -> "Js.Re"
-    | "Js_promise" -> "Js.Promise"
-    | "Js_date" -> "Js.Date"
-    | "Js_dict" -> "Js.Dict"
-    | "Js_global" -> "Js.Global"
-    | "Js_json" -> "Js.Json"
-    | "Js_math" -> "Js.Math"
-    | "Js_obj" -> "Js.Obj"
-    | "Js_typed_array" -> "Js.Typed_array"
-    | "Js_types" -> "Js.Types"
-    | "Js_float" -> "Js.Float"
-    | "Js_int" -> "Js.Int"
-    | "Js_option" -> "Js.Option"
-    | "Js_result" -> "Js.Result"
-    | "Js_list" -> "Js.List"
-    | "Js_vector" -> "Js.Vector"
-    (* Belt_libs  *)
-    | "Belt_Id" -> "Belt.Id"
-    | "Belt_Array" -> "Belt.Array"
-    | "Belt_SortArray" -> "Belt.SortArray"
-    | "Belt_SortArrayInt" -> "Belt.SortArray.Int"
-    | "Belt_SortArrayString" -> "Belt.SortArray.String"
-    | "Belt_MutableQueue" -> "Belt.MutableQueue"
-    | "Belt_MutableStack" -> "Belt.MutableStack"
-    | "Belt_List" -> "Belt.List"
-    | "Belt_Range" -> "Belt.Range"
-    | "Belt_Set" -> "Belt.Set"
-    | "Belt_SetInt" -> "Belt.Set.Int"
-    | "Belt_SetString" -> "Belt.Set.String"
-    | "Belt_Map" -> "Belt.Map"
-    | "Belt_MapInt" -> "Belt.Map.Int"
-    | "Belt_MapString" -> "Belt.Map.String"
-    | "Belt_Option" -> "Belt.Option"
-    | "Belt_MutableSet" -> "Belt.MutableSet"
-    | "Belt_MutableSetInt" -> "Belt.MutableSet.Int"
-    | "Belt_MutableSetString" -> "Belt.MutableSet.String"
-    | "Belt_MutableMap" -> "Belt.MutableMap"
-    | "Belt_MutableMapInt" -> "Belt.MutableMap.Int"
-    | "Belt_MutableMapString" -> "Belt.MutableMap.String"
-    | "Belt_HashSet" -> "Belt.HashSet"
-    | "Belt_HashSetInt" -> "Belt.HashSet.Int"
-    | "Belt_HashSetString" -> "Belt.HashSet.String"
-    | "Belt_HashMap" -> "Belt.HashMap"
-    | "Belt_HashMapString" -> "Belt.HashMap.String"
-    | "Belt_HashMapInt" -> "Belt.HashMap.Int"
-    | "Belt_Debug" -> "Belt.Debug"
-    | s -> (
-        match Ext_namespace.try_split_module_name s with
-        | None -> s
-        | Some (ns, m) -> ns ^ "." ^ m))
diff --git a/jscomp/core/outcome_printer_ns.mli b/jscomp/core/outcome_printer_ns.mli
deleted file mode 100644
index 5d2a04b..0000000
--- a/jscomp/core/outcome_printer_ns.mli
+++ /dev/null
@@ -1,29 +0,0 @@
-(* Copyright (C) 2017 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val out_ident : Format.formatter -> string -> unit
-(** This function is used to 
-    reverse namespace printing to 
-    avoid namespace leaking
-*)
diff --git a/jscomp/core/polyvar_pattern_match.ml b/jscomp/core/polyvar_pattern_match.ml
deleted file mode 100644
index ff785d8..0000000
--- a/jscomp/core/polyvar_pattern_match.ml
+++ /dev/null
@@ -1,115 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript 
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 lam = Lambda.lambda
-
-type hash_names = (int * string) list
-
-type input = (int * (string * lam)) list
-
-type output = (hash_names * lam) list
-
-module Coll = Hash.Make (struct
-  type t = lam
-
-  let equal = Stdlib.( = )
-
-  let hash = Hashtbl.hash
-end)
-
-type value = { stamp : int; hash_names_act : hash_names * lam }
-
-let convert (xs : input) : output =
-  let coll = Coll.create 63 in
-  let os : value list ref = ref [] in
-  xs
-  |> List.iteri (fun i (hash, (name, act)) ->
-         match Lambda.make_key act with
-         | None ->
-             os :=
-               { stamp = i; hash_names_act = ([ (hash, name) ], act) } :: !os
-         | Some key ->
-             Coll.add_or_update coll key
-               ~update:(fun ({ hash_names_act = hash_names, act } as acc) ->
-                 { acc with hash_names_act = ((hash, name) :: hash_names, act) })
-               { hash_names_act = ([ (hash, name) ], act); stamp = i });
-  let result = Coll.to_list coll (fun _ value -> value) @ !os in
-  Ext_list.sort_via_arrayf result
-    (fun x y -> compare x.stamp y.stamp)
-    (fun x -> x.hash_names_act)
-
-let or_list (arg : lam) (hash_names : (int * string) list) =
-  match hash_names with
-  | (hash, name) :: rest ->
-      let init : lam =
-        Lprim
-          ( Pintcomp Ceq,
-            [ arg; Lconst (Const_pointer (hash, Pt_variant { name })) ],
-            Location.none )
-      in
-      Ext_list.fold_left rest init (fun acc (hash, name) ->
-          Lambda.Lprim
-            ( Psequor,
-              [
-                acc;
-                Lprim
-                  ( Pintcomp Ceq,
-                    [ arg; Lconst (Const_pointer (hash, Pt_variant { name })) ],
-                    Location.none );
-              ],
-              Location.none ))
-  | _ -> assert false
-
-let make_test_sequence_variant_constant (fail : lam option) (arg : lam)
-    (int_lambda_list : (int * (string * lam)) list) : lam =
-  let int_lambda_list : ((int * string) list * lam) list =
-    convert int_lambda_list
-  in
-  match (int_lambda_list, fail) with
-  | (_, act) :: rest, None | rest, Some act ->
-      Ext_list.fold_right rest act (fun (hash_names, act1) acc ->
-          let predicate : lam = or_list arg hash_names in
-          Lifthenelse (predicate, act1, acc))
-  | [], None -> assert false
-
-let call_switcher_variant_constant (_loc : Location.t) (fail : lam option)
-    (arg : lam) (int_lambda_list : (int * (string * lam)) list)
-    (_names : Ast_untagged_variants.switch_names option) =
-  let int_lambda_list = convert int_lambda_list in
-  match (int_lambda_list, fail) with
-  | (_, act) :: rest, None | rest, Some act ->
-      Ext_list.fold_right rest act (fun (hash_names, act1) acc ->
-          let predicate = or_list arg hash_names in
-          Lifthenelse (predicate, act1, acc))
-  | [], None -> assert false
-
-let call_switcher_variant_constr (loc : Location.t) (fail : lam option)
-    (arg : lam) int_lambda_list (names : Ast_untagged_variants.switch_names option) : lam =
-  let v = Ident.create "variant" in
-  Llet
-    ( Alias,
-      Pgenval,
-      v,
-      Lprim (Pfield (0, Fld_poly_var_tag), [ arg ], loc),
-      call_switcher_variant_constant loc fail (Lvar v) int_lambda_list names )
diff --git a/jscomp/core/pparse_driver.ml b/jscomp/core/pparse_driver.ml
deleted file mode 100644
index 601a4fe..0000000
--- a/jscomp/core/pparse_driver.ml
+++ /dev/null
@@ -1,72 +0,0 @@
-(* Optionally preprocess a source file *)
-
-let call_external_preprocessor sourcefile pp =
-  let tmpfile = Filename.temp_file "ocamlpp" "" in
-  let comm =
-    Printf.sprintf "%s %s > %s" pp (Filename.quote sourcefile) tmpfile
-  in
-  if Ccomp.command comm <> 0 then (
-    Misc.remove_file tmpfile;
-    Cmd_ast_exception.cannot_run comm);
-  tmpfile
-
-let preprocess sourcefile =
-  match !Clflags.preprocessor with
-  | None -> sourcefile
-  | Some pp -> call_external_preprocessor sourcefile pp
-
-let remove_preprocessed inputfile =
-  if !Clflags.preprocessor <> None then Misc.remove_file inputfile
-
-(* Parse a file or get a dumped syntax tree from it *)
-
-let parse (type a) (kind : a Ml_binary.kind) : _ -> a =
-  match kind with
-  | Ml_binary.Ml -> Parse.implementation
-  | Ml_binary.Mli -> Parse.interface
-
-let file_aux inputfile (type a) (parse_fun : _ -> a) (kind : a Ml_binary.kind) :
-    a =
-  let ast_magic = Ml_binary.magic_of_kind kind in
-  let ic = open_in_bin inputfile in
-  let is_ast_file =
-    match really_input_string ic (String.length ast_magic) with
-    | exception _ -> false
-    | buffer ->
-        if buffer = ast_magic then true
-        else if Ext_string.starts_with buffer "Caml1999" then
-          Cmd_ast_exception.wrong_magic buffer
-        else false
-  in
-  let ast =
-    try
-      if is_ast_file then (
-        Location.set_input_name (input_value ic : string);
-        (input_value ic : a))
-      else (
-        seek_in ic 0;
-        let lexbuf = Lexing.from_channel ic in
-        Location.init lexbuf inputfile;
-        parse_fun lexbuf)
-    with x ->
-      close_in ic;
-      raise x
-  in
-  close_in ic;
-  ast
-
-let parse_file (type a) (kind : a Ml_binary.kind) (sourcefile : string) : a =
-  Location.set_input_name sourcefile;
-  let inputfile = preprocess sourcefile in
-  let ast =
-    try file_aux inputfile (parse kind) kind
-    with exn ->
-      remove_preprocessed inputfile;
-      raise exn
-  in
-  remove_preprocessed inputfile;
-  ast
-
-let parse_implementation sourcefile = parse_file Ml sourcefile
-
-let parse_interface sourcefile = parse_file Mli sourcefile
diff --git a/jscomp/core/pparse_driver.mli b/jscomp/core/pparse_driver.mli
deleted file mode 100644
index b87dcd0..0000000
--- a/jscomp/core/pparse_driver.mli
+++ /dev/null
@@ -1,3 +0,0 @@
-val parse_implementation : string -> Parsetree.structure
-
-val parse_interface : string -> Parsetree.signature
diff --git a/jscomp/core/record_attributes_check.ml b/jscomp/core/record_attributes_check.ml
deleted file mode 100644
index c4bf854..0000000
--- a/jscomp/core/record_attributes_check.ml
+++ /dev/null
@@ -1,70 +0,0 @@
-(* Copyright (C) 2019- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 label = Types.label_description
-
-let find_name = Lambda.find_name
-
-let find_name_with_loc (attr : Parsetree.attribute) : string Asttypes.loc option
-    =
-  match attr with
-  | ( { txt = "bs.as" | "as"; loc },
-      PStr
-        [
-          {
-            pstr_desc =
-              Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (s, _)) }, _);
-          };
-        ] ) ->
-      Some { txt = s; loc }
-  | _ -> None
-
-let check_bs_attributes_inclusion (attrs1 : Parsetree.attributes)
-    (attrs2 : Parsetree.attributes) lbl_name =
-  let a = Ext_list.find_def attrs1 find_name lbl_name in
-  let b = Ext_list.find_def attrs2 find_name lbl_name in
-  if a = b then None else Some (a, b)
-
-let rec check_duplicated_labels_aux (lbls : Parsetree.label_declaration list)
-    (coll : Set_string.t) =
-  match lbls with
-  | [] -> None
-  | { pld_name = { txt } as pld_name; pld_attributes } :: rest -> (
-      if Set_string.mem coll txt && txt <> "..." then Some pld_name
-      else
-        let coll_with_lbl = Set_string.add coll txt in
-        match Ext_list.find_opt pld_attributes find_name_with_loc with
-        | None -> check_duplicated_labels_aux rest coll_with_lbl
-        | Some ({ txt = s } as l) ->
-            if
-              Set_string.mem coll s
-              (*use coll to make check a bit looser
-                allow cases like [ x : int [@as "x"]]
-              *)
-            then Some l
-            else
-              check_duplicated_labels_aux rest (Set_string.add coll_with_lbl s))
-
-let check_duplicated_labels lbls =
-  check_duplicated_labels_aux lbls Set_string.empty
diff --git a/jscomp/core/res_compmisc.ml b/jscomp/core/res_compmisc.ml
deleted file mode 100644
index 6213e2e..0000000
--- a/jscomp/core/res_compmisc.ml
+++ /dev/null
@@ -1,61 +0,0 @@
-(* Copyright (C) 2015- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let init_path () =
-  let dirs = !Clflags.include_dirs in
-  let exp_dirs =
-    List.map (Misc.expand_directory Config.standard_library) dirs
-  in
-  Config.load_path :=
-    if !Js_config.no_stdlib then exp_dirs
-    else (List.rev_append exp_dirs [Config.standard_library]);
-  Env.reset_cache ()
-
-(* Return the initial environment in which compilation proceeds. *)
-
-(* Note: do not do init_path() in initial_env, this breaks
-   toplevel initialization (PR#1775) *)
-
-let open_implicit_module m env =
-  let lid =
-    { Asttypes.loc = Location.in_file "command line"; txt = Longident.parse m }
-  in
-  snd (Typemod.type_open_ Override env lid.loc lid)
-
-let initial_env ?(modulename) () =
-  Ident.reinit ();
-  let open_modules = (match modulename with 
-  | None -> !Clflags.open_modules 
-  | Some modulename -> 
-    !Clflags.open_modules |> List.filter(fun m -> m <> modulename)
-  ) in
-  let initial = Env.initial_safe_string in
-  let env =
-    if !Clflags.nopervasives then initial
-    else open_implicit_module (if !Config.uncurried = Uncurried then "PervasivesU" else "Pervasives") initial
-  in
-  List.fold_left
-    (fun env m -> open_implicit_module m env)
-    env
-    (List.rev open_modules)
diff --git a/jscomp/core/res_compmisc.mli b/jscomp/core/res_compmisc.mli
deleted file mode 100644
index 0f17e43..0000000
--- a/jscomp/core/res_compmisc.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* Copyright (C) 2015- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val init_path : unit -> unit
-
-val initial_env : ?modulename : string -> unit -> Env.t
diff --git a/jscomp/depends/.ocamlformat b/jscomp/depends/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/depends/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/depends/ast_extract.ml b/jscomp/depends/ast_extract.ml
deleted file mode 100644
index 0516fb1..0000000
--- a/jscomp/depends/ast_extract.ml
+++ /dev/null
@@ -1,46 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 module_name = private string *)
-
-module Set_string = Depend.StringSet
-
-(* FIXME: [Clflags.open_modules] seems not to be properly used *)
-module SMap = Depend.StringMap
-
-let bound_vars = SMap.empty
-
-type 'a kind = 'a Ml_binary.kind
-
-let read_parse_and_extract (type t) (k : t kind) (ast : t) : Set_string.t =
-  Depend.free_structure_names := Set_string.empty;
-  Ext_ref.protect Clflags.transparent_modules false (fun _ ->
-      List.iter (* check *)
-        (fun modname ->
-          ignore @@ Depend.open_module bound_vars (Longident.Lident modname))
-        !Clflags.open_modules;
-      (match k with
-      | Ml_binary.Ml -> Depend.add_implementation bound_vars ast
-      | Ml_binary.Mli -> Depend.add_signature bound_vars ast);
-      !Depend.free_structure_names)
diff --git a/jscomp/depends/ast_extract.mli b/jscomp/depends/ast_extract.mli
deleted file mode 100644
index 9e53b4c..0000000
--- a/jscomp/depends/ast_extract.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module Set_string = Depend.StringSet
-
-val read_parse_and_extract : 'a Ml_binary.kind -> 'a -> Set_string.t
diff --git a/jscomp/depends/astdump_main.md b/jscomp/depends/astdump_main.md
deleted file mode 100644
index f2f7c1e..0000000
--- a/jscomp/depends/astdump_main.md
+++ /dev/null
@@ -1,13 +0,0 @@
-current Ast format (10/10/2020)
-
--- input_binary_int ic (size)
-module,
-module,
-...
---- seek_in ic (pos_in ic + size)
-fname 
-marshalled ast
-
-
-
-
diff --git a/jscomp/depends/binary_ast.ml b/jscomp/depends/binary_ast.ml
deleted file mode 100644
index 645b639..0000000
--- a/jscomp/depends/binary_ast.ml
+++ /dev/null
@@ -1,72 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-module Set_string = Ast_extract.Set_string
-(** Synced up with module {!Bsb_helper_depfile_gen} *)
-
-type 'a kind = 'a Ml_binary.kind =
-  | Ml : Parsetree.structure kind
-  | Mli : Parsetree.signature kind
-
-let read_ast_exn (type t) ~fname (_ : t kind) setup : t =
-  let ic = open_in_bin fname in
-  let dep_size = input_binary_int ic in
-  seek_in ic (pos_in ic + dep_size);
-  let sourcefile = input_line ic in
-  Location.set_input_name sourcefile;
-  let ast = input_value ic in
-  close_in ic;
-  (match
-     Ext_file_extensions.classify_input
-       (Ext_filename.get_extension_maybe sourcefile)
-   with
-  | Res | Resi -> setup `rescript
-  | _ -> ());
-  ast
-
-let magic_sep_char = '\n'
-
-(*
-   Reasons that we don't [output_value] the set:
-   1. for performance , easy skipping and calcuate the length 
-   2. cut dependency, otherwise its type is {!Ast_extract.Set_string.t}
-*)
-let write_ast (type t) ~(sourcefile : string) ~output (kind : t kind) (pt : t) :
-    unit =
-  let output_set = Ast_extract.read_parse_and_extract kind pt in
-  let buf = Ext_buffer.create 1000 in
-  Ext_buffer.add_char buf magic_sep_char;
-  Set_string.iter
-    (fun s ->
-      if s <> "" && s.[0] <> '*' then
-        (* filter *predef* *)
-        Ext_buffer.add_string_char buf s magic_sep_char)
-    output_set;
-  let oc = open_out_bin output in
-  output_binary_int oc (Ext_buffer.length buf);
-  Ext_buffer.output_buffer oc buf;
-  output_string oc sourcefile;
-  output_char oc '\n';
-  output_value oc pt;
-  close_out oc
diff --git a/jscomp/depends/binary_ast.mli b/jscomp/depends/binary_ast.mli
deleted file mode 100644
index 48c58fc..0000000
--- a/jscomp/depends/binary_ast.mli
+++ /dev/null
@@ -1,47 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 _ kind = Ml : Parsetree.structure kind | Mli : Parsetree.signature kind
-
-val read_ast_exn :
-  fname:string -> 'a kind -> ([ `ml | `rescript | `default ] -> unit) -> 'a
-
-val magic_sep_char : char
-
-val write_ast : sourcefile:string -> output:string -> 'a kind -> 'a -> unit
-(**
-   Check out {!Bsb_depfile_gen} for set decoding
-   The [.ml] file can be recognized as an ast directly, the format
-   is
-   {
-   magic number;
-   filename;
-   ast
-   }
-   when [fname] is "-" it means the file is from an standard input or pipe.
-   An empty name would marshallized.
-
-   Use case cat - | fan -printer -impl -
-   redirect the standard input to fan
-*)
diff --git a/jscomp/depends/bs_exception.ml b/jscomp/depends/bs_exception.ml
deleted file mode 100644
index 43deedf..0000000
--- a/jscomp/depends/bs_exception.ml
+++ /dev/null
@@ -1,77 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 error =
-  | Cmj_not_found of string
-  | Js_not_found of string
-  | Bs_cyclic_depends of string list
-  | Bs_duplicated_module of string * string
-  | Bs_duplicate_exports of string (* gpr_974 *)
-  | Bs_package_not_found of string
-  | Bs_main_not_exist of string
-  | Bs_invalid_path of string
-  | Missing_ml_dependency of string
-  | Dependency_script_module_dependent_not of string
-      (** TODO: we need add location handling *)
-
-exception Error of error
-
-let error err = raise (Error err)
-
-let report_error ppf = function
-  | Dependency_script_module_dependent_not s ->
-      Format.fprintf ppf
-        "%s is compiled in script mode while its dependent is not" s
-  | Missing_ml_dependency s ->
-      Format.fprintf ppf "Missing dependency %s in search path" s
-  | Cmj_not_found s ->
-      Format.fprintf ppf
-        "%s not found, it means either the module does not exist or it is a \
-         namespace"
-        s
-  | Js_not_found s ->
-      Format.fprintf ppf "%s not found, needed in script mode " s
-  | Bs_cyclic_depends str ->
-      Format.fprintf ppf "Cyclic depends : @[%a@]"
-        (Format.pp_print_list ~pp_sep:Format.pp_print_space
-           Format.pp_print_string)
-        str
-  | Bs_duplicate_exports str ->
-      Format.fprintf ppf "%s are exported as twice" str
-  | Bs_duplicated_module (a, b) ->
-      Format.fprintf ppf
-        "The build system does not support two files with same names yet %s, %s"
-        a b
-  | Bs_main_not_exist main -> Format.fprintf ppf "File %s not found " main
-  | Bs_package_not_found package ->
-      Format.fprintf ppf
-        "Package %s not found or %s/lib/ocaml does not exist or please set \
-         npm_config_prefix correctly"
-        package package
-  | Bs_invalid_path path -> Format.pp_print_string ppf ("Invalid path: " ^ path)
-
-let () =
-  Location.register_error_of_exn (function
-    | Error err -> Some (Location.error_of_printer_file report_error err)
-    | _ -> None)
diff --git a/jscomp/depends/bs_exception.mli b/jscomp/depends/bs_exception.mli
deleted file mode 100644
index 53efde0..0000000
--- a/jscomp/depends/bs_exception.mli
+++ /dev/null
@@ -1,45 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 error =
-  | Cmj_not_found of string
-  | Js_not_found of string
-  | Bs_cyclic_depends of string list
-  | Bs_duplicated_module of string * string
-  | Bs_duplicate_exports of string (* gpr_974 *)
-  | Bs_package_not_found of string
-  | Bs_main_not_exist of string
-  | Bs_invalid_path of string
-  | Missing_ml_dependency of string
-  | Dependency_script_module_dependent_not of string
-(*
-TODO: In the futrue, we should refine dependency [bsb] 
-should not rely on such exception, it should have its own exception handling
-*)
-
-(* exception Error of error *)
-
-(* val report_error : Format.formatter -> error -> unit *)
-
-val error : error -> 'a
diff --git a/jscomp/depends/dune b/jscomp/depends/dune
deleted file mode 100644
index 7dad054..0000000
--- a/jscomp/depends/dune
+++ /dev/null
@@ -1,6 +0,0 @@
-(library
- (name depends)
- (wrapped false)
- (flags
-  (:standard -w -A))
- (libraries common))
diff --git a/jscomp/dune b/jscomp/dune
deleted file mode 100644
index f330e25..0000000
--- a/jscomp/dune
+++ /dev/null
@@ -1,45 +0,0 @@
-(dirs
- bsb
- bsb_exe
- bsb_helper
- bsb_helper_exe
- bsc
- cmij
- common
- core
- depends
- ext
- frontend
- gentype
- jsoo
- js_parser
- ml
- napkin
- ounit_tests
- syntax)
-
-(library
- (name rescript_compiler)
- (flags
-  (:standard -w -A))
- (libraries unix ext ml syntax))
-
-(env
- (dev
-  (env-vars
-   (CPPO_FLAGS -U=RELEASE)))
- (release
-  (env-vars
-   (CPPO_FLAGS -D=RELEASE))
-  (ocamlopt_flags
-   (:standard -O3 -unbox-closures)))
- (static
-  (env-vars
-   (CPPO_FLAGS -D=RELEASE))
-  (ocamlopt_flags
-   (:standard -O3 -unbox-closures)))
- (browser
-  (env-vars
-   (CPPO_FLAGS -D=BROWSER))
-  (ocamlopt_flags
-   (:standard -O3 -unbox-closures))))
diff --git a/jscomp/ext/.ocamlformat b/jscomp/ext/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/ext/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/ext/bsc_args.ml b/jscomp/ext/bsc_args.ml
deleted file mode 100644
index 5f1fd2e..0000000
--- a/jscomp/ext/bsc_args.ml
+++ /dev/null
@@ -1,131 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 anon_fun = rev_args:string list -> unit
-
-type string_action =
-  | String_call of (string -> unit)
-  | String_set of string ref
-  | String_optional_set of string option ref
-  | String_list_add of string list ref
-
-type unit_action =
-  | Unit_call of (unit -> unit)
-  | Unit_lazy of unit lazy_t
-  | Unit_set of bool ref
-  | Unit_clear of bool ref
-
-type spec = Unit_dummy | Unit of unit_action | String of string_action
-
-exception Bad = Arg.Bad
-
-let bad_arg s = raise_notrace (Bad s)
-
-type error = Unknown of string | Missing of string
-
-type t = spec Ext_spec.t
-
-let ( +> ) = Ext_buffer.add_string
-
-let usage_b (buf : Ext_buffer.t) ~usage (speclist : t) =
-  buf +> usage;
-  buf +> "\nOptions:\n";
-  let max_col = ref 0 in
-  Ext_array.iter speclist (fun (key, _, _) ->
-      if String.length key > !max_col then max_col := String.length key);
-  Ext_array.iter speclist (fun (key, _, doc) ->
-      if not (Ext_string.starts_with doc "*internal*") then (
-        buf +> "  ";
-        buf +> key;
-        buf +> String.make (!max_col - String.length key + 2) ' ';
-        let cur = ref 0 in
-        let doc_length = String.length doc in
-        while !cur < doc_length do
-          match String.index_from_opt doc !cur '\n' with
-          | None ->
-              if !cur <> 0 then (
-                buf +> "\n";
-                buf +> String.make (!max_col + 4) ' ');
-              buf +> String.sub doc !cur (String.length doc - !cur);
-              cur := doc_length
-          | Some new_line_pos ->
-              if !cur <> 0 then (
-                buf +> "\n";
-                buf +> String.make (!max_col + 4) ' ');
-              buf +> String.sub doc !cur (new_line_pos - !cur);
-              cur := new_line_pos + 1
-        done;
-        buf +> "\n"))
-
-let stop_raise ~usage ~(error : error) (speclist : t) =
-  let b = Ext_buffer.create 200 in
-  (match error with
-  | Unknown ("-help" | "--help" | "-h") ->
-      usage_b b ~usage speclist;
-      Ext_buffer.output_buffer stdout b;
-      exit 0
-  | Unknown s ->
-      b +> "Unknown option \"";
-      b +> s;
-      b +> "\".\n"
-  | Missing s ->
-      b +> "Option \"";
-      b +> s;
-      b +> "\" needs an argument.\n");
-  usage_b b ~usage speclist;
-  bad_arg (Ext_buffer.contents b)
-
-let parse_exn ~usage ~argv ?(start = 1) ?(finish = Array.length argv)
-    (speclist : t) (anonfun : rev_args:string list -> unit) =
-  let current = ref start in
-  let rev_list = ref [] in
-  while !current < finish do
-    let s = argv.(!current) in
-    incr current;
-    if s <> "" && s.[0] = '-' then
-      match Ext_spec.assoc3 speclist s with
-      | Some action -> (
-          match action with
-          | Unit_dummy -> ()
-          | Unit r -> (
-              match r with
-              | Unit_set r -> r := true
-              | Unit_clear r -> r := false
-              | Unit_call f -> f ()
-              | Unit_lazy f -> Lazy.force f)
-          | String f -> (
-              if !current >= finish then
-                stop_raise ~usage ~error:(Missing s) speclist
-              else
-                let arg = argv.(!current) in
-                incr current;
-                match f with
-                | String_call f -> f arg
-                | String_set u -> u := arg
-                | String_optional_set s -> s := Some arg
-                | String_list_add s -> s := arg :: !s))
-      | None -> stop_raise ~usage ~error:(Unknown s) speclist
-    else rev_list := s :: !rev_list
-  done;
-  anonfun ~rev_args:!rev_list
diff --git a/jscomp/ext/bsc_warnings.ml b/jscomp/ext/bsc_warnings.ml
deleted file mode 100644
index 9769142..0000000
--- a/jscomp/ext/bsc_warnings.ml
+++ /dev/null
@@ -1,76 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript 
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-
- *
- * 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. *)
-
-(**
-   See the meanings of the warning codes here: https://caml.inria.fr/pub/docs/manual-ocaml/comp.html#sec281
-
-   - 30 Two labels or constructors of the same name are defined in two mutually recursive types.
-   - 40 Constructor or label name used out of scope.
-
-   - 6 Label omitted in function application.
-   - 7 Method overridden.
-   - 9 Missing fields in a record pattern. (*Not always desired, in some cases need [@@@warning "+9"] *)
-   - 27 Innocuous unused variable: unused variable that is not bound with let nor as, and doesn’t start with an underscore (_) character.
-   - 29 Unescaped end-of-line in a string constant (non-portable code).
-   - 32 .. 39 Unused blabla
-   - 44 Open statement shadows an already defined identifier.
-   - 45 Open statement shadows an already defined label or constructor.
-   - 48 Implicit elimination of optional arguments. https://caml.inria.fr/mantis/view.php?id=6352
-   - 101 (bsb-specific) unsafe polymorphic comparison.
-*)
-
-(*
-  The purpose of default warning set is to make it strict while
-  not annoy user too much
-
-  -4 Fragile pattern matching: matching that will remain complete even if additional con- structors are added to one of the variant types matched.
-  We turn it off since common pattern
-   {[
-     match x with | A -> .. |  _ -> false
-   ]}
-
-   -9 Missing fields in a record pattern.
-   only in some special cases that we need all fields being listed
-
-   We encourage people to write code based on type based disambigution
-   40,41,42 are enabled for compatiblity reasons  
-   -40 Constructor or label name used out of scope
-   This is intentional, we should never warn it
-   - 41 Ambiguous constructor or label name.
-     It is turned off since it prevents such cases below:
-   {[
-     type a = A |B 
-     type b = A | B | C
-   ]}
-   - 42 Disambiguated constructor or label name (compatibility warning).
-
-   - 50 Unexpected documentation comment.
-
-   - 102 Bs_polymorphic_comparison
-*)
-(* If you change this, don't forget to adapt docs/docson/build-schema.json as well. *)
-let defaults_w = "+a-4-9-20-40-41-42-50-61-102"
-
-let defaults_warn_error = "-a+5+6+101+109"
-(*TODO: add +10*)
diff --git a/jscomp/ext/config.ml b/jscomp/ext/config.ml
deleted file mode 100644
index 35040ea..0000000
--- a/jscomp/ext/config.ml
+++ /dev/null
@@ -1,46 +0,0 @@
-let version = "4.06.1+BS"
-
-let standard_library =
-  let ( // ) = Filename.concat in
-  Filename.dirname Sys.executable_name
-  // Filename.parent_dir_name // "lib" // "ocaml"
-
-let standard_library_default = standard_library
-
-let syntax_kind = ref `ml
-
-let bs_only = ref true
-
-let unsafe_empty_array = ref false
-
-type uncurried = Legacy | Uncurried | Swap
-let uncurried = ref Legacy
-
-and cmi_magic_number = "Caml1999I022"
-
-and ast_impl_magic_number = "Caml1999M022"
-
-and ast_intf_magic_number = "Caml1999N022"
-
-and cmt_magic_number = "Caml1999T022"
-
-let load_path = ref ([] : string list)
-
-let interface_suffix = ref ".mli"
-
-(* This is normally the same as in obj.ml, but we have to define it
-   separately because it can differ when we're in the middle of a
-   bootstrapping phase. *)
-
-let print_config oc =
-  let p name valu = Printf.fprintf oc "%s: %s\n" name valu in
-  p "version" version;
-  p "standard_library_default" standard_library_default;
-  p "standard_library" standard_library;
-
-  (* print the magic number *)
-  p "cmi_magic_number" cmi_magic_number;
-  p "ast_impl_magic_number" ast_impl_magic_number;
-  p "ast_intf_magic_number" ast_intf_magic_number;
-  p "cmt_magic_number" cmt_magic_number;
-  flush oc
diff --git a/jscomp/ext/dune b/jscomp/ext/dune
deleted file mode 100644
index 7302d38..0000000
--- a/jscomp/ext/dune
+++ /dev/null
@@ -1,121 +0,0 @@
-(library
- (name ext)
- (wrapped false)
- (preprocess
-  (action
-   (run %{bin:cppo} %{env:CPPO_FLAGS=} %{input-file})))
- (flags
-  (:standard -w -A))
- (foreign_stubs
-  (language c)
-  (names ext_basic_hash_stubs)))
-
-(ocamllex ext_json_parse)
-
-(rule
- (targets hash_set_string.ml)
- (deps hash_set.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_STRING %{deps} -o %{targets})))
-
-(rule
- (targets hash_set_int.ml)
- (deps hash_set.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_INT %{deps} -o %{targets})))
-
-(rule
- (targets hash_set_ident.ml)
- (deps hash_set.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_IDENT %{deps} -o %{targets})))
-
-(rule
- (targets hash_set.ml)
- (deps hash_set.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_FUNCTOR %{deps} -o %{targets})))
-
-(rule
- (targets hash_set_poly.ml)
- (deps hash_set.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_POLY %{deps} -o %{targets})))
-
-(rule
- (targets vec_int.ml)
- (deps vec.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_INT %{deps} -o %{targets})))
-
-(rule
- (targets vec.ml)
- (deps vec.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_FUNCTOR %{deps} -o %{targets})))
-
-(rule
- (targets set_string.ml)
- (deps set.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_STRING %{deps} -o %{targets})))
-
-(rule
- (targets set_int.ml)
- (deps set.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_INT %{deps} -o %{targets})))
-
-(rule
- (targets set_ident.ml)
- (deps set.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_IDENT %{deps} -o %{targets})))
-
-(rule
- (targets map_string.ml)
- (deps map.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_STRING %{deps} -o %{targets})))
-
-(rule
- (targets map_int.ml)
- (deps map.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_INT %{deps} -o %{targets})))
-
-(rule
- (targets map_ident.ml)
- (deps map.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_IDENT %{deps} -o %{targets})))
-
-(rule
- (targets ordered_hash_map_local_ident.ml)
- (deps ordered_hash_map.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_LOCAL_IDENT %{deps} -o %{targets})))
-
-(rule
- (targets hash_string.ml)
- (deps hash.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_STRING %{deps} -o %{targets})))
-
-(rule
- (targets hash_int.ml)
- (deps hash.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_INT %{deps} -o %{targets})))
-
-(rule
- (targets hash_ident.ml)
- (deps hash.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_IDENT %{deps} -o %{targets})))
-
-(rule
- (targets hash.ml)
- (deps hash.cppo.ml)
- (action
-  (run %{bin:cppo} -D TYPE_FUNCTOR %{deps} -o %{targets})))
diff --git a/jscomp/ext/ext_cmp.ml b/jscomp/ext/ext_cmp.ml
deleted file mode 100644
index e14746c..0000000
--- a/jscomp/ext/ext_cmp.ml
+++ /dev/null
@@ -1,37 +0,0 @@
-type 'a compare = 'a -> 'a -> int
-
-type ('a, 'id) cmp = 'a compare
-
-external getCmp : ('a, 'id) cmp -> 'a compare = "%identity"
-
-module type S = sig
-  type id
-
-  type t
-
-  val cmp : (t, id) cmp
-end
-
-type ('key, 'id) t = (module S with type t = 'key and type id = 'id)
-
-module Make (M : sig
-  type t
-
-  val cmp : (t -> t -> int[@bs])
-end) =
-struct
-  type id
-
-  type t = M.t
-
-  let cmp = M.cmp
-end
-
-let make (type key) (cmp : (key -> key -> int[@bs])) =
-  let module M = struct
-    type t = key
-
-    let cmp = cmp
-  end in
-  let module N = Make (M) in
-  (module N : S with type t = key)
diff --git a/jscomp/ext/ext_cmp.mli b/jscomp/ext/ext_cmp.mli
deleted file mode 100644
index 8588d12..0000000
--- a/jscomp/ext/ext_cmp.mli
+++ /dev/null
@@ -1,24 +0,0 @@
-type 'a compare = 'a -> 'a -> int
-
-type ('a, 'id) cmp
-
-external getCmp : ('a, 'id) cmp -> 'a compare = "%identity"
-(** only used for data structures, not exported for client usage *)
-
-module type S = sig
-  type id
-
-  type t
-
-  val cmp : (t, id) cmp
-end
-
-type ('key, 'id) t = (module S with type t = 'key and type id = 'id)
-
-module Make (M : sig
-  type t
-
-  val cmp : t compare
-end) : S with type t = M.t
-
-val make : ('a -> 'a -> int) -> (module S with type t = 'a)
diff --git a/jscomp/ext/ext_file_extensions.ml b/jscomp/ext/ext_file_extensions.ml
deleted file mode 100644
index 5449c41..0000000
--- a/jscomp/ext/ext_file_extensions.ml
+++ /dev/null
@@ -1,27 +0,0 @@
-type valid_input =
-  | Ml
-  | Mli
-  | Res
-  | Resi
-  | Intf_ast
-  | Impl_ast
-  | Mlmap
-  | Cmi
-  | Unknown
-
-(** This is per-file based, 
-    when [ocamlc] [-c -o another_dir/xx.cmi] 
-    it will return (another_dir/xx)
-*)
-
-let classify_input ext =
-  match () with
-  | _ when ext = Literals.suffix_ml -> Ml
-  | _ when ext = !Config.interface_suffix -> Mli
-  | _ when ext = Literals.suffix_ast -> Impl_ast
-  | _ when ext = Literals.suffix_iast -> Intf_ast
-  | _ when ext = Literals.suffix_mlmap -> Mlmap
-  | _ when ext = Literals.suffix_cmi -> Cmi
-  | _ when ext = Literals.suffix_res -> Res
-  | _ when ext = Literals.suffix_resi -> Resi
-  | _ -> Unknown
diff --git a/jscomp/ext/ext_format.ml b/jscomp/ext/ext_format.ml
deleted file mode 100644
index c6924a2..0000000
--- a/jscomp/ext/ext_format.ml
+++ /dev/null
@@ -1,103 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open Format
-
-type t = formatter
-
-(* let string = pp_print_string *)
-
-(* let break = fun fmt -> pp_print_break fmt 0 0
-
-   let break1 =
-   fun fmt -> pp_print_break fmt 0 1
-
-   let space  fmt  =
-   pp_print_break fmt 1 0
-*)
-(* let vgroup fmt indent u =
-   pp_open_vbox fmt indent;
-   let v = u () in
-   pp_close_box fmt ();
-   v
-
-   let group fmt indent u =
-   pp_open_hovbox fmt indent;
-   let v = u () in
-   pp_close_box fmt ();
-   v
-
-   let paren fmt u =
-   string fmt "(";
-   let v = u () in
-   string fmt ")";
-   v
-
-   let brace fmt u =
-   string fmt "{";
-   (* break1 fmt ; *)
-   let v = u () in
-   string fmt "}";
-   v
-
-   let bracket fmt u =
-   string fmt "[";
-   let v = u () in
-   string fmt "]";
-   v *)
-
-(* let paren_group st n action =
-   group st n (fun _ -> paren st action)
-
-   let brace_group st n action =
-   group st n (fun _ -> brace st action )
-
-   let brace_vgroup st n action =
-   vgroup st n (fun _ ->
-    string st "{";
-    pp_print_break st 0 2;
-    let v = vgroup st 0 action in
-    pp_print_break st 0 0;
-    string st "}";
-    v
-              )
-   let bracket_group st n action =
-   group st n (fun _ -> bracket st action)
-
-   let newline fmt = pp_print_newline fmt ()
-
-   let to_out_channel = formatter_of_out_channel
-
-   (* let non_breaking_space  fmt = string fmt " " *)
-   (* let set_needed_space_function _ _ = () *)
-   let flush = pp_print_flush
-*)
-(* let list = pp_print_list *)
-
-let pp_print_queue ?(pp_sep = pp_print_cut) pp_v ppf q =
-  Queue.iter
-    (fun q ->
-      pp_v ppf q;
-      pp_sep ppf ())
-    q
diff --git a/jscomp/ext/ext_format.mli b/jscomp/ext/ext_format.mli
deleted file mode 100644
index f921110..0000000
--- a/jscomp/ext/ext_format.mli
+++ /dev/null
@@ -1,66 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Simplified wrapper module for the standard library [Format] module. 
-*)
-
-type t = private Format.formatter
-
-(* val string : t -> string -> unit
-
-   val break : t -> unit
-
-   val break1 : t -> unit
-
-   val space :  t -> unit
-
-   val group : t -> int -> (unit -> 'a) -> 'a
-   (** [group] will record current indentation 
-    and indent futher
- *)
-
-   val vgroup : t -> int -> (unit -> 'a) -> 'a
-
-   val paren : t -> (unit -> 'a) -> 'a
-
-   val paren_group : t -> int -> (unit -> 'a) -> 'a
-
-   val brace_group : t -> int -> (unit -> 'a) -> 'a
-
-   val brace_vgroup : t -> int -> (unit -> 'a) -> 'a
-
-   val bracket_group : t -> int -> (unit -> 'a) -> 'a
-
-   val newline : t -> unit
-
-   val to_out_channel : out_channel -> t
-
-   val flush : t -> unit -> unit *)
-
-val pp_print_queue :
-  ?pp_sep:(Format.formatter -> unit -> unit) ->
-  (Format.formatter -> 'a -> unit) ->
-  Format.formatter ->
-  'a Queue.t ->
-  unit
diff --git a/jscomp/ext/ext_ident.ml b/jscomp/ext/ext_ident.ml
deleted file mode 100644
index f04e018..0000000
--- a/jscomp/ext/ext_ident.ml
+++ /dev/null
@@ -1,195 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-
-
-
-
-
-
-
-let js_flag = 0b1_000 (* check with ocaml compiler *)
-
-(* let js_module_flag = 0b10_000 (\* javascript external modules *\) *)
-(* TODO:
-    check name conflicts with javascript conventions
-   {[
-     Ext_ident.convert "^";;
-     - : string = "$caret"
-   ]}
-*)
-let js_object_flag = 0b100_000 (* javascript object flags *)
-
-let is_js (i : Ident.t) =
-  i.flags land js_flag <> 0
-
-let is_js_or_global (i : Ident.t) =
-  i.flags land (8 lor 1) <> 0
-
-
-let is_js_object (i : Ident.t) =
-  i.flags land js_object_flag <> 0
-
-let make_js_object (i : Ident.t) =
-  i.flags <- i.flags lor js_object_flag
-
-(* It's a js function hard coded by js api, so when printing,
-   it should preserve the name
-*)
-let create_js (name : string) : Ident.t  =
-  { name = name; flags = js_flag ; stamp = 0}
-
-let create = Ident.create
-
-(* FIXME: no need for `$' operator *)
-let create_tmp ?(name=Literals.tmp) () = create name
-
-
-let js_module_table : Ident.t Hash_string.t = Hash_string.create 31
-
-(* This is for a js exeternal module, we can change it when printing
-   for example
-   {[
-     var React$1 = require('react');
-     React$1.render(..)
-   ]}
-
-   Given a name, if duplicated, they should  have the same id
-*)
-(* let create_js_module (name : string) : Ident.t =
-   let name =
-    String.concat "" @@ Ext_list.map
-    (Ext_string.split name '-')  Ext_string.capitalize_ascii in
-   (* TODO: if we do such transformation, we should avoid       collision for example:
-      react-dom
-      react--dom
-      check collision later
-  *)
-   match Hash_string.find_exn js_module_table name  with
-   | exception Not_found ->
-    let ans = Ident.create name in
-    (* let ans = { v with flags = js_module_flag} in  *)
-    Hash_string.add js_module_table name ans;
-    ans
-   | v -> (* v *) Ident.rename v
-
-
-*)
-
-let [@inline] convert ?(op=false) (c : char) : string =
-  (match c with
-   | '*' ->   "$star"
-   | '\'' ->   "$p"
-   | '!' ->   "$bang"
-   | '>' ->   "$great"
-   | '<' ->   "$less"
-   | '=' ->   "$eq"
-   | '+' ->   "$plus"
-   | '-' ->   if op then "$neg" else "$"
-   | '@' ->   "$at"
-   | '^' ->   "$caret"
-   | '/' ->   "$slash"
-   | '|' ->   "$pipe"
-   | '.' ->   "$dot"
-   | '%' ->   "$percent"
-   | '~' ->   "$tilde"
-   | '#' ->   "$hash"
-   | ':' ->   "$colon"
-   | '?' ->   "$question"
-   | '&' ->   "$amp"
-   | '(' ->   "$lpar"
-   | ')' ->   "$rpar"
-   | '{' ->   "$lbrace"
-   | '}' ->   "$lbrace"
-   | '[' ->   "$lbrack"
-   | ']' ->   "$rbrack"
-
-   | _ ->   "$unknown")  
-let [@inline] no_escape (c : char) =  
-  match c with   
-  | 'a' .. 'z' | 'A' .. 'Z'
-  | '0' .. '9' | '_' | '$' -> true 
-  | _ -> false
-
-exception Not_normal_letter of int
-let name_mangle name =
-  let len = String.length name  in
-  try
-    for i  = 0 to len - 1 do
-      if not (no_escape (String.unsafe_get name i)) then
-        raise_notrace (Not_normal_letter i)
-    done;
-    name (* Normal letter *)
-  with
-  | Not_normal_letter i ->
-    let buffer = Ext_buffer.create len in
-    for j = 0 to  len - 1 do
-      let c = String.unsafe_get name j in
-      if no_escape c then Ext_buffer.add_char buffer c 
-      else 
-        Ext_buffer.add_string buffer (convert ~op:(i=0) c)        
-    done; Ext_buffer.contents buffer
-
-(* TODO:
-    check name conflicts with javascript conventions
-   {[
-     Ext_ident.convert "^";;
-     - : string = "$caret"
-   ]}
-   [convert name] if [name] is a js keyword,add "$$"
-   otherwise do the name mangling to make sure ocaml identifier it is
-   a valid js identifier
-*)
-let convert (name : string) =
-  if  Js_reserved_map.is_reserved name  then
-    "$$" ^ name
-  else name_mangle name
-
-(** keyword could be used in property *)
-
-(* It is currently made a persistent ident to avoid fresh ids
-    which would result in different signature files
-   - other solution: use lazy values
-*)
-let make_unused () = create "_"
-
-
-
-let reset () =
-  Hash_string.clear js_module_table
-
-
-(* Has to be total order, [x < y]
-   and [x > y] should be consistent
-   flags are not relevant here
-*)
-let compare (x : Ident.t ) ( y : Ident.t) =
-  let u = x.stamp - y.stamp in
-  if u = 0 then
-    Ext_string.compare x.name y.name
-  else u
-
-let equal ( x : Ident.t) ( y : Ident.t) =
-  if x.stamp <> 0 then x.stamp = y.stamp
-  else y.stamp = 0 && x.name = y.name
diff --git a/jscomp/ext/ext_js_regex.ml b/jscomp/ext/ext_js_regex.ml
deleted file mode 100644
index 83a881f..0000000
--- a/jscomp/ext/ext_js_regex.ml
+++ /dev/null
@@ -1,47 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let check_from_end al =
-  let rec aux l seen =
-    match l with
-    | [] -> false
-    | e :: r ->
-        if e < 0 || e > 255 then false
-        else
-          let c = Char.chr e in
-          if c = '/' then true
-          else if Ext_list.exists seen (fun x -> x = c) then false
-            (* flag should not be repeated *)
-          else if c = 'i' || c = 'g' || c = 'm' || c = 'y' || c = 'u' then
-            aux r (c :: seen)
-          else false
-  in
-  aux al []
-
-let js_regex_checker s =
-  match Ext_utf8.decode_utf8_string s with
-  | [] -> false
-  | 47 (* [Char.code '/' = 47 ]*) :: tail -> check_from_end (List.rev tail)
-  | _ :: _ -> false
-  | exception Ext_utf8.Invalid_utf8 _ -> false
diff --git a/jscomp/ext/ext_js_regex.mli b/jscomp/ext/ext_js_regex.mli
deleted file mode 100644
index a627d7b..0000000
--- a/jscomp/ext/ext_js_regex.mli
+++ /dev/null
@@ -1,27 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* This is a module that checks if js regex is valid or not *)
-
-val js_regex_checker : string -> bool
diff --git a/jscomp/ext/ext_json_noloc.ml b/jscomp/ext/ext_json_noloc.ml
deleted file mode 100644
index 9ce2733..0000000
--- a/jscomp/ext/ext_json_noloc.ml
+++ /dev/null
@@ -1,148 +0,0 @@
-(* Copyright (C) 2017- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* This file is only used in bsb watcher searlization *)
-type t =
-  | True
-  | False
-  | Null
-  | Flo of string
-  | Str of string
-  | Arr of t array
-  | Obj of t Map_string.t
-
-(** poor man's serialization *)
-let naive_escaped (unmodified_input : string) : string =
-  let n = ref 0 in
-  let len = String.length unmodified_input in
-  for i = 0 to len - 1 do
-    n :=
-      !n
-      +
-      match String.unsafe_get unmodified_input i with
-      | '\"' | '\\' | '\n' | '\t' | '\r' | '\b' -> 2
-      | _ -> 1
-  done;
-  if !n = len then unmodified_input
-  else
-    let result = Bytes.create !n in
-    n := 0;
-    for i = 0 to len - 1 do
-      let open Bytes in
-      (match String.unsafe_get unmodified_input i with
-      | ('\"' | '\\') as c ->
-          unsafe_set result !n '\\';
-          incr n;
-          unsafe_set result !n c
-      | '\n' ->
-          unsafe_set result !n '\\';
-          incr n;
-          unsafe_set result !n 'n'
-      | '\t' ->
-          unsafe_set result !n '\\';
-          incr n;
-          unsafe_set result !n 't'
-      | '\r' ->
-          unsafe_set result !n '\\';
-          incr n;
-          unsafe_set result !n 'r'
-      | '\b' ->
-          unsafe_set result !n '\\';
-          incr n;
-          unsafe_set result !n 'b'
-      | c -> unsafe_set result !n c);
-      incr n
-    done;
-    Bytes.unsafe_to_string result
-
-let quot x = "\"" ^ naive_escaped x ^ "\""
-
-let true_ = True
-
-let false_ = False
-
-let null = Null
-
-let str s = Str s
-
-let flo s = Flo s
-
-let arr s = Arr s
-
-let obj s = Obj s
-
-let kvs s = Obj (Map_string.of_list s)
-
-let rec encode_buf (x : t) (buf : Buffer.t) : unit =
-  let a str = Buffer.add_string buf str in
-  match x with
-  | Null -> a "null"
-  | Str s -> a (quot s)
-  | Flo s ->
-      a s
-      (*
-         since our parsing keep the original float representation, we just dump it as is, there is no cases like [nan] *)
-  | Arr content -> (
-      match content with
-      | [||] -> a "[]"
-      | _ ->
-          a "[ ";
-          encode_buf (Array.unsafe_get content 0) buf;
-          for i = 1 to Array.length content - 1 do
-            a " , ";
-            encode_buf (Array.unsafe_get content i) buf
-          done;
-          a " ]")
-  | True -> a "true"
-  | False -> a "false"
-  | Obj map ->
-      if Map_string.is_empty map then a "{}"
-      else (
-        (*prerr_endline "WEIRD";
-          prerr_endline (string_of_int @@ Map_string.cardinal map ); *)
-        a "{ ";
-        let (_ : int) =
-          Map_string.fold map 0 (fun k v i ->
-              if i <> 0 then a " , ";
-              a (quot k);
-              a " : ";
-              encode_buf v buf;
-              i + 1)
-        in
-        a " }")
-
-let to_string x =
-  let buf = Buffer.create 1024 in
-  encode_buf x buf;
-  Buffer.contents buf
-
-let to_channel (oc : out_channel) x =
-  let buf = Buffer.create 1024 in
-  encode_buf x buf;
-  Buffer.output_buffer oc buf
-
-let to_file name v =
-  let ochan = open_out_bin name in
-  to_channel ochan v;
-  close_out ochan
diff --git a/jscomp/ext/ext_json_write.ml b/jscomp/ext/ext_json_write.ml
deleted file mode 100644
index 965fe98..0000000
--- a/jscomp/ext/ext_json_write.ml
+++ /dev/null
@@ -1,86 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** poor man's serialization *)
-(*
-   let quot x =
-       "\"" ^ String.escaped x ^ "\"" *)
-
-(* let rec encode_aux (x : Ext_json_types.t )
-    (buf : Buffer.t) : unit =
-   let a str = Buffer.add_string buf str in
-   match x with
-   | Null _ -> a "null"
-   | Str {str = s }  -> a (quot s)
-   | Flo {flo = s} ->
-    a s (*
-    since our parsing keep the original float representation, we just dump it as is, there is no cases like [nan] *)
-   | Arr  {content} ->
-    begin match content with
-      | [||] -> a "[]"
-      | _ ->
-        a "[ ";
-        encode_aux
-          (Array.unsafe_get content 0)
-          buf ;
-        for i = 1 to Array.length content - 1 do
-          a " , ";
-          encode_aux
-            (Array.unsafe_get content i)
-            buf
-        done;
-        a " ]"
-    end
-   | True _ -> a "true"
-   | False _ -> a "false"
-   | Obj {map} ->
-    if Map_string.is_empty map then
-      a "{}"
-    else
-      begin
-        (*prerr_endline "WEIRD";
-        prerr_endline (string_of_int @@ Map_string.cardinal map );   *)
-        a "{ ";
-        let _ : int =  Map_string.fold map 0  (fun  k v i ->
-            if i <> 0 then begin
-              a " , "
-            end;
-            a (quot k);
-            a " : ";
-            encode_aux v buf ;
-            i + 1
-          ) in
-          a " }"
-      end
-*)
-
-(* let to_string (x : Ext_json_types.t) =
-    let buf = Buffer.create 1024 in
-    encode_aux x buf ;
-    Buffer.contents buf
-
-   let to_channel (oc : out_channel) x  =
-    let buf = Buffer.create 1024 in
-    encode_aux x buf ;
-    Buffer.output_buffer oc buf *)
diff --git a/jscomp/ext/ext_json_write.mli b/jscomp/ext/ext_json_write.mli
deleted file mode 100644
index 5ccfab7..0000000
--- a/jscomp/ext/ext_json_write.mli
+++ /dev/null
@@ -1,28 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(*val to_string : Ext_json_types.t -> string
-
-
-  val to_channel : out_channel -> Ext_json_types.t -> unit*)
diff --git a/jscomp/ext/ext_list.ml b/jscomp/ext/ext_list.ml
deleted file mode 100644
index be7f30b..0000000
--- a/jscomp/ext/ext_list.ml
+++ /dev/null
@@ -1,724 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-external ( .!() ) : 'a array -> int -> 'a = "%array_unsafe_get"
-
-let rec map l f =
-  match l with
-  | [] -> []
-  | [ x1 ] ->
-      let y1 = f x1 in
-      [ y1 ]
-  | [ x1; x2 ] ->
-      let y1 = f x1 in
-      let y2 = f x2 in
-      [ y1; y2 ]
-  | [ x1; x2; x3 ] ->
-      let y1 = f x1 in
-      let y2 = f x2 in
-      let y3 = f x3 in
-      [ y1; y2; y3 ]
-  | [ x1; x2; x3; x4 ] ->
-      let y1 = f x1 in
-      let y2 = f x2 in
-      let y3 = f x3 in
-      let y4 = f x4 in
-      [ y1; y2; y3; y4 ]
-  | x1 :: x2 :: x3 :: x4 :: x5 :: tail ->
-      let y1 = f x1 in
-      let y2 = f x2 in
-      let y3 = f x3 in
-      let y4 = f x4 in
-      let y5 = f x5 in
-      y1 :: y2 :: y3 :: y4 :: y5 :: map tail f
-
-let rec has_string l f =
-  match l with
-  | [] -> false
-  | [ x1 ] -> x1 = f
-  | [ x1; x2 ] -> x1 = f || x2 = f
-  | [ x1; x2; x3 ] -> x1 = f || x2 = f || x3 = f
-  | x1 :: x2 :: x3 :: x4 -> x1 = f || x2 = f || x3 = f || has_string x4 f
-
-let rec map_combine l1 l2 f =
-  match (l1, l2) with
-  | [], [] -> []
-  | a1 :: l1, a2 :: l2 -> (f a1, a2) :: map_combine l1 l2 f
-  | _, _ -> invalid_arg "Ext_list.map_combine"
-
-let rec arr_list_combine_unsafe arr l i j acc f =
-  if i = j then acc
-  else
-    match l with
-    | [] -> invalid_arg "Ext_list.combine"
-    | h :: tl ->
-        (f arr.!(i), h) :: arr_list_combine_unsafe arr tl (i + 1) j acc f
-
-let combine_array_append arr l acc f =
-  let len = Array.length arr in
-  arr_list_combine_unsafe arr l 0 len acc f
-
-let combine_array arr l f =
-  let len = Array.length arr in
-  arr_list_combine_unsafe arr l 0 len [] f
-
-let rec arr_list_filter_map_unasfe arr l i j acc f =
-  if i = j then acc
-  else
-    match l with
-    | [] -> invalid_arg "Ext_list.arr_list_filter_map_unsafe"
-    | h :: tl -> (
-        match f arr.!(i) h with
-        | None -> arr_list_filter_map_unasfe arr tl (i + 1) j acc f
-        | Some v -> v :: arr_list_filter_map_unasfe arr tl (i + 1) j acc f)
-
-let array_list_filter_map arr l f =
-  let len = Array.length arr in
-  arr_list_filter_map_unasfe arr l 0 len [] f
-
-let rec map_split_opt (xs : 'a list) (f : 'a -> 'b option * 'c option) :
-    'b list * 'c list =
-  match xs with
-  | [] -> ([], [])
-  | x :: xs -> (
-      let c, d = f x in
-      let cs, ds = map_split_opt xs f in
-      ( (match c with Some c -> c :: cs | None -> cs),
-        match d with Some d -> d :: ds | None -> ds ))
-
-let rec map_snd l f =
-  match l with
-  | [] -> []
-  | [ (v1, x1) ] ->
-      let y1 = f x1 in
-      [ (v1, y1) ]
-  | [ (v1, x1); (v2, x2) ] ->
-      let y1 = f x1 in
-      let y2 = f x2 in
-      [ (v1, y1); (v2, y2) ]
-  | [ (v1, x1); (v2, x2); (v3, x3) ] ->
-      let y1 = f x1 in
-      let y2 = f x2 in
-      let y3 = f x3 in
-      [ (v1, y1); (v2, y2); (v3, y3) ]
-  | [ (v1, x1); (v2, x2); (v3, x3); (v4, x4) ] ->
-      let y1 = f x1 in
-      let y2 = f x2 in
-      let y3 = f x3 in
-      let y4 = f x4 in
-      [ (v1, y1); (v2, y2); (v3, y3); (v4, y4) ]
-  | (v1, x1) :: (v2, x2) :: (v3, x3) :: (v4, x4) :: (v5, x5) :: tail ->
-      let y1 = f x1 in
-      let y2 = f x2 in
-      let y3 = f x3 in
-      let y4 = f x4 in
-      let y5 = f x5 in
-      (v1, y1) :: (v2, y2) :: (v3, y3) :: (v4, y4) :: (v5, y5) :: map_snd tail f
-
-let rec map_last l f =
-  match l with
-  | [] -> []
-  | [ x1 ] ->
-      let y1 = f true x1 in
-      [ y1 ]
-  | [ x1; x2 ] ->
-      let y1 = f false x1 in
-      let y2 = f true x2 in
-      [ y1; y2 ]
-  | [ x1; x2; x3 ] ->
-      let y1 = f false x1 in
-      let y2 = f false x2 in
-      let y3 = f true x3 in
-      [ y1; y2; y3 ]
-  | [ x1; x2; x3; x4 ] ->
-      let y1 = f false x1 in
-      let y2 = f false x2 in
-      let y3 = f false x3 in
-      let y4 = f true x4 in
-      [ y1; y2; y3; y4 ]
-  | x1 :: x2 :: x3 :: x4 :: tail ->
-      (* make sure that tail is not empty *)
-      let y1 = f false x1 in
-      let y2 = f false x2 in
-      let y3 = f false x3 in
-      let y4 = f false x4 in
-      y1 :: y2 :: y3 :: y4 :: map_last tail f
-
-let rec mapi_aux lst i f tail =
-  match lst with
-  | [] -> tail
-  | a :: l ->
-      let r = f i a in
-      r :: mapi_aux l (i + 1) f tail
-
-let mapi lst f = mapi_aux lst 0 f []
-
-let mapi_append lst f tail = mapi_aux lst 0 f tail
-
-let rec last xs =
-  match xs with
-  | [ x ] -> x
-  | _ :: tl -> last tl
-  | [] -> invalid_arg "Ext_list.last"
-
-let rec append_aux l1 l2 =
-  match l1 with
-  | [] -> l2
-  | [ a0 ] -> a0 :: l2
-  | [ a0; a1 ] -> a0 :: a1 :: l2
-  | [ a0; a1; a2 ] -> a0 :: a1 :: a2 :: l2
-  | [ a0; a1; a2; a3 ] -> a0 :: a1 :: a2 :: a3 :: l2
-  | [ a0; a1; a2; a3; a4 ] -> a0 :: a1 :: a2 :: a3 :: a4 :: l2
-  | a0 :: a1 :: a2 :: a3 :: a4 :: rest ->
-      a0 :: a1 :: a2 :: a3 :: a4 :: append_aux rest l2
-
-let append l1 l2 = match l2 with [] -> l1 | _ -> append_aux l1 l2
-
-let append_one l1 x = append_aux l1 [ x ]
-
-let rec map_append l1 l2 f =
-  match l1 with
-  | [] -> l2
-  | [ a0 ] -> f a0 :: l2
-  | [ a0; a1 ] ->
-      let b0 = f a0 in
-      let b1 = f a1 in
-      b0 :: b1 :: l2
-  | [ a0; a1; a2 ] ->
-      let b0 = f a0 in
-      let b1 = f a1 in
-      let b2 = f a2 in
-      b0 :: b1 :: b2 :: l2
-  | [ a0; a1; a2; a3 ] ->
-      let b0 = f a0 in
-      let b1 = f a1 in
-      let b2 = f a2 in
-      let b3 = f a3 in
-      b0 :: b1 :: b2 :: b3 :: l2
-  | [ a0; a1; a2; a3; a4 ] ->
-      let b0 = f a0 in
-      let b1 = f a1 in
-      let b2 = f a2 in
-      let b3 = f a3 in
-      let b4 = f a4 in
-      b0 :: b1 :: b2 :: b3 :: b4 :: l2
-  | a0 :: a1 :: a2 :: a3 :: a4 :: rest ->
-      let b0 = f a0 in
-      let b1 = f a1 in
-      let b2 = f a2 in
-      let b3 = f a3 in
-      let b4 = f a4 in
-      b0 :: b1 :: b2 :: b3 :: b4 :: map_append rest l2 f
-
-let rec fold_right l acc f =
-  match l with
-  | [] -> acc
-  | [ a0 ] -> f a0 acc
-  | [ a0; a1 ] -> f a0 (f a1 acc)
-  | [ a0; a1; a2 ] -> f a0 (f a1 (f a2 acc))
-  | [ a0; a1; a2; a3 ] -> f a0 (f a1 (f a2 (f a3 acc)))
-  | [ a0; a1; a2; a3; a4 ] -> f a0 (f a1 (f a2 (f a3 (f a4 acc))))
-  | a0 :: a1 :: a2 :: a3 :: a4 :: rest ->
-      f a0 (f a1 (f a2 (f a3 (f a4 (fold_right rest acc f)))))
-
-let rec fold_right2 l r acc f =
-  match (l, r) with
-  | [], [] -> acc
-  | [ a0 ], [ b0 ] -> f a0 b0 acc
-  | [ a0; a1 ], [ b0; b1 ] -> f a0 b0 (f a1 b1 acc)
-  | [ a0; a1; a2 ], [ b0; b1; b2 ] -> f a0 b0 (f a1 b1 (f a2 b2 acc))
-  | [ a0; a1; a2; a3 ], [ b0; b1; b2; b3 ] ->
-      f a0 b0 (f a1 b1 (f a2 b2 (f a3 b3 acc)))
-  | [ a0; a1; a2; a3; a4 ], [ b0; b1; b2; b3; b4 ] ->
-      f a0 b0 (f a1 b1 (f a2 b2 (f a3 b3 (f a4 b4 acc))))
-  | a0 :: a1 :: a2 :: a3 :: a4 :: arest, b0 :: b1 :: b2 :: b3 :: b4 :: brest ->
-      f a0 b0
-        (f a1 b1 (f a2 b2 (f a3 b3 (f a4 b4 (fold_right2 arest brest acc f)))))
-  | _, _ -> invalid_arg "Ext_list.fold_right2"
-
-let rec fold_right3 l r last acc f =
-  match (l, r, last) with
-  | [], [], [] -> acc
-  | [ a0 ], [ b0 ], [ c0 ] -> f a0 b0 c0 acc
-  | [ a0; a1 ], [ b0; b1 ], [ c0; c1 ] -> f a0 b0 c0 (f a1 b1 c1 acc)
-  | [ a0; a1; a2 ], [ b0; b1; b2 ], [ c0; c1; c2 ] ->
-      f a0 b0 c0 (f a1 b1 c1 (f a2 b2 c2 acc))
-  | [ a0; a1; a2; a3 ], [ b0; b1; b2; b3 ], [ c0; c1; c2; c3 ] ->
-      f a0 b0 c0 (f a1 b1 c1 (f a2 b2 c2 (f a3 b3 c3 acc)))
-  | [ a0; a1; a2; a3; a4 ], [ b0; b1; b2; b3; b4 ], [ c0; c1; c2; c3; c4 ] ->
-      f a0 b0 c0 (f a1 b1 c1 (f a2 b2 c2 (f a3 b3 c3 (f a4 b4 c4 acc))))
-  | ( a0 :: a1 :: a2 :: a3 :: a4 :: arest,
-      b0 :: b1 :: b2 :: b3 :: b4 :: brest,
-      c0 :: c1 :: c2 :: c3 :: c4 :: crest ) ->
-      f a0 b0 c0
-        (f a1 b1 c1
-           (f a2 b2 c2
-              (f a3 b3 c3 (f a4 b4 c4 (fold_right3 arest brest crest acc f)))))
-  | _, _, _ -> invalid_arg "Ext_list.fold_right2"
-
-let rec map2i l r f =
-  match (l, r) with
-  | [], [] -> []
-  | [ a0 ], [ b0 ] -> [ f 0 a0 b0 ]
-  | [ a0; a1 ], [ b0; b1 ] ->
-      let c0 = f 0 a0 b0 in
-      let c1 = f 1 a1 b1 in
-      [ c0; c1 ]
-  | [ a0; a1; a2 ], [ b0; b1; b2 ] ->
-      let c0 = f 0 a0 b0 in
-      let c1 = f 1 a1 b1 in
-      let c2 = f 2 a2 b2 in
-      [ c0; c1; c2 ]
-  | [ a0; a1; a2; a3 ], [ b0; b1; b2; b3 ] ->
-      let c0 = f 0 a0 b0 in
-      let c1 = f 1 a1 b1 in
-      let c2 = f 2 a2 b2 in
-      let c3 = f 3 a3 b3 in
-      [ c0; c1; c2; c3 ]
-  | [ a0; a1; a2; a3; a4 ], [ b0; b1; b2; b3; b4 ] ->
-      let c0 = f 0 a0 b0 in
-      let c1 = f 1 a1 b1 in
-      let c2 = f 2 a2 b2 in
-      let c3 = f 3 a3 b3 in
-      let c4 = f 4 a4 b4 in
-      [ c0; c1; c2; c3; c4 ]
-  | a0 :: a1 :: a2 :: a3 :: a4 :: arest, b0 :: b1 :: b2 :: b3 :: b4 :: brest ->
-      let c0 = f 0 a0 b0 in
-      let c1 = f 1 a1 b1 in
-      let c2 = f 2 a2 b2 in
-      let c3 = f 3 a3 b3 in
-      let c4 = f 4 a4 b4 in
-      c0 :: c1 :: c2 :: c3 :: c4 :: map2i arest brest f
-  | _, _ -> invalid_arg "Ext_list.map2"
-
-let rec map2 l r f =
-  match (l, r) with
-  | [], [] -> []
-  | [ a0 ], [ b0 ] -> [ f a0 b0 ]
-  | [ a0; a1 ], [ b0; b1 ] ->
-      let c0 = f a0 b0 in
-      let c1 = f a1 b1 in
-      [ c0; c1 ]
-  | [ a0; a1; a2 ], [ b0; b1; b2 ] ->
-      let c0 = f a0 b0 in
-      let c1 = f a1 b1 in
-      let c2 = f a2 b2 in
-      [ c0; c1; c2 ]
-  | [ a0; a1; a2; a3 ], [ b0; b1; b2; b3 ] ->
-      let c0 = f a0 b0 in
-      let c1 = f a1 b1 in
-      let c2 = f a2 b2 in
-      let c3 = f a3 b3 in
-      [ c0; c1; c2; c3 ]
-  | [ a0; a1; a2; a3; a4 ], [ b0; b1; b2; b3; b4 ] ->
-      let c0 = f a0 b0 in
-      let c1 = f a1 b1 in
-      let c2 = f a2 b2 in
-      let c3 = f a3 b3 in
-      let c4 = f a4 b4 in
-      [ c0; c1; c2; c3; c4 ]
-  | a0 :: a1 :: a2 :: a3 :: a4 :: arest, b0 :: b1 :: b2 :: b3 :: b4 :: brest ->
-      let c0 = f a0 b0 in
-      let c1 = f a1 b1 in
-      let c2 = f a2 b2 in
-      let c3 = f a3 b3 in
-      let c4 = f a4 b4 in
-      c0 :: c1 :: c2 :: c3 :: c4 :: map2 arest brest f
-  | _, _ -> invalid_arg "Ext_list.map2"
-
-let rec fold_left_with_offset l accu i f =
-  match l with
-  | [] -> accu
-  | a :: l -> fold_left_with_offset l (f a accu i) (i + 1) f
-
-let rec filter_map xs (f : 'a -> 'b option) =
-  match xs with
-  | [] -> []
-  | y :: ys -> (
-      match f y with None -> filter_map ys f | Some z -> z :: filter_map ys f)
-
-let rec exclude (xs : 'a list) (p : 'a -> bool) : 'a list =
-  match xs with
-  | [] -> []
-  | x :: xs -> if p x then exclude xs p else x :: exclude xs p
-
-let rec exclude_with_val l p =
-  match l with
-  | [] -> None
-  | a0 :: xs -> (
-      if p a0 then Some (exclude xs p)
-      else
-        match xs with
-        | [] -> None
-        | a1 :: rest -> (
-            if p a1 then Some (a0 :: exclude rest p)
-            else
-              match exclude_with_val rest p with
-              | None -> None
-              | Some rest -> Some (a0 :: a1 :: rest)))
-
-let rec same_length xs ys =
-  match (xs, ys) with
-  | [], [] -> true
-  | _ :: xs, _ :: ys -> same_length xs ys
-  | _, _ -> false
-
-let init n f =
-  match n with
-  | 0 -> []
-  | 1 ->
-      let a0 = f 0 in
-      [ a0 ]
-  | 2 ->
-      let a0 = f 0 in
-      let a1 = f 1 in
-      [ a0; a1 ]
-  | 3 ->
-      let a0 = f 0 in
-      let a1 = f 1 in
-      let a2 = f 2 in
-      [ a0; a1; a2 ]
-  | 4 ->
-      let a0 = f 0 in
-      let a1 = f 1 in
-      let a2 = f 2 in
-      let a3 = f 3 in
-      [ a0; a1; a2; a3 ]
-  | 5 ->
-      let a0 = f 0 in
-      let a1 = f 1 in
-      let a2 = f 2 in
-      let a3 = f 3 in
-      let a4 = f 4 in
-      [ a0; a1; a2; a3; a4 ]
-  | _ -> Array.to_list (Array.init n f)
-
-let rec rev_append l1 l2 =
-  match l1 with
-  | [] -> l2
-  | [ a0 ] -> a0 :: l2 (* single element is common *)
-  | [ a0; a1 ] -> a1 :: a0 :: l2
-  | a0 :: a1 :: a2 :: rest -> rev_append rest (a2 :: a1 :: a0 :: l2)
-
-let rev l = rev_append l []
-
-let rec small_split_at n acc l =
-  if n <= 0 then (rev acc, l)
-  else
-    match l with
-    | x :: xs -> small_split_at (n - 1) (x :: acc) xs
-    | _ -> invalid_arg "Ext_list.split_at"
-
-let split_at l n = small_split_at n [] l
-
-let rec split_at_last_aux acc x =
-  match x with
-  | [] -> invalid_arg "Ext_list.split_at_last"
-  | [ x ] -> (rev acc, x)
-  | y0 :: ys -> split_at_last_aux (y0 :: acc) ys
-
-let split_at_last (x : 'a list) =
-  match x with
-  | [] -> invalid_arg "Ext_list.split_at_last"
-  | [ a0 ] -> ([], a0)
-  | [ a0; a1 ] -> ([ a0 ], a1)
-  | [ a0; a1; a2 ] -> ([ a0; a1 ], a2)
-  | [ a0; a1; a2; a3 ] -> ([ a0; a1; a2 ], a3)
-  | [ a0; a1; a2; a3; a4 ] -> ([ a0; a1; a2; a3 ], a4)
-  | a0 :: a1 :: a2 :: a3 :: a4 :: rest ->
-      let rev, last = split_at_last_aux [] rest in
-      (a0 :: a1 :: a2 :: a3 :: a4 :: rev, last)
-
-(**
-   can not do loop unroll due to state combination
-*)
-let filter_mapi xs f =
-  let rec aux i xs =
-    match xs with
-    | [] -> []
-    | y :: ys -> (
-        match f y i with
-        | None -> aux (i + 1) ys
-        | Some z -> z :: aux (i + 1) ys)
-  in
-  aux 0 xs
-
-let rec filter_map2 xs ys (f : 'a -> 'b -> 'c option) =
-  match (xs, ys) with
-  | [], [] -> []
-  | u :: us, v :: vs -> (
-      match f u v with
-      | None -> filter_map2 us vs f (* idea: rec f us vs instead? *)
-      | Some z -> z :: filter_map2 us vs f)
-  | _ -> invalid_arg "Ext_list.filter_map2"
-
-let rec rev_map_append l1 l2 f =
-  match l1 with [] -> l2 | a :: l -> rev_map_append l (f a :: l2) f
-
-(** It is not worth loop unrolling, 
-    it is already tail-call, and we need to be careful 
-    about evaluation order when unroll
-*)
-let rec flat_map_aux f acc append lx =
-  match lx with
-  | [] -> rev_append acc append
-  | a0 :: rest ->
-      let new_acc =
-        match f a0 with
-        | [] -> acc
-        | [ a0 ] -> a0 :: acc
-        | [ a0; a1 ] -> a1 :: a0 :: acc
-        | a0 :: a1 :: a2 :: rest -> rev_append rest (a2 :: a1 :: a0 :: acc)
-      in
-      flat_map_aux f new_acc append rest
-
-let flat_map lx f = flat_map_aux f [] [] lx
-
-let flat_map_append lx append f = flat_map_aux f [] append lx
-
-let rec length_compare l n =
-  if n < 0 then `Gt
-  else
-    match l with
-    | _ :: xs -> length_compare xs (n - 1)
-    | [] -> if n = 0 then `Eq else `Lt
-
-let rec length_ge l n =
-  if n > 0 then match l with _ :: tl -> length_ge tl (n - 1) | [] -> false
-  else true
-
-(**
-   {[length xs = length ys + n ]}
-*)
-let rec length_larger_than_n xs ys n =
-  match (xs, ys) with
-  | _, [] -> length_compare xs n = `Eq
-  | _ :: xs, _ :: ys -> length_larger_than_n xs ys n
-  | [], _ -> false
-
-let rec group (eq : 'a -> 'a -> bool) lst =
-  match lst with [] -> [] | x :: xs -> aux eq x (group eq xs)
-
-and aux eq (x : 'a) (xss : 'a list list) : 'a list list =
-  match xss with
-  | [] -> [ [ x ] ]
-  | (y0 :: _ as y) :: ys ->
-      (* cannot be empty *)
-      if eq x y0 then (x :: y) :: ys else y :: aux eq x ys
-  | _ :: _ -> assert false
-
-let stable_group lst eq = group eq lst |> rev
-
-let rec drop h n =
-  if n < 0 then invalid_arg "Ext_list.drop"
-  else if n = 0 then h
-  else
-    match h with [] -> invalid_arg "Ext_list.drop" | _ :: tl -> drop tl (n - 1)
-
-let rec find_first x p =
-  match x with [] -> None | x :: l -> if p x then Some x else find_first l p
-
-let rec find_first_not xs p =
-  match xs with
-  | [] -> None
-  | a :: l -> if p a then find_first_not l p else Some a
-
-let rec rev_iter l f =
-  match l with
-  | [] -> ()
-  | [ x1 ] -> f x1
-  | [ x1; x2 ] ->
-      f x2;
-      f x1
-  | [ x1; x2; x3 ] ->
-      f x3;
-      f x2;
-      f x1
-  | [ x1; x2; x3; x4 ] ->
-      f x4;
-      f x3;
-      f x2;
-      f x1
-  | x1 :: x2 :: x3 :: x4 :: x5 :: tail ->
-      rev_iter tail f;
-      f x5;
-      f x4;
-      f x3;
-      f x2;
-      f x1
-
-let rec iter l f =
-  match l with
-  | [] -> ()
-  | [ x1 ] -> f x1
-  | [ x1; x2 ] ->
-      f x1;
-      f x2
-  | [ x1; x2; x3 ] ->
-      f x1;
-      f x2;
-      f x3
-  | [ x1; x2; x3; x4 ] ->
-      f x1;
-      f x2;
-      f x3;
-      f x4
-  | x1 :: x2 :: x3 :: x4 :: x5 :: tail ->
-      f x1;
-      f x2;
-      f x3;
-      f x4;
-      f x5;
-      iter tail f
-
-let rec for_all lst p =
-  match lst with [] -> true | a :: l -> p a && for_all l p
-
-let rec for_all_snd lst p =
-  match lst with [] -> true | (_, a) :: l -> p a && for_all_snd l p
-
-let rec for_all2_no_exn l1 l2 p =
-  match (l1, l2) with
-  | [], [] -> true
-  | a1 :: l1, a2 :: l2 -> p a1 a2 && for_all2_no_exn l1 l2 p
-  | _, _ -> false
-
-let rec find_opt xs p =
-  match xs with
-  | [] -> None
-  | x :: l -> ( match p x with Some _ as v -> v | None -> find_opt l p)
-
-let rec find_def xs p def =
-  match xs with
-  | [] -> def
-  | x :: l -> ( match p x with Some v -> v | None -> find_def l p def)
-
-let rec split_map l f =
-  match l with
-  | [] -> ([], [])
-  | [ x1 ] ->
-      let a0, b0 = f x1 in
-      ([ a0 ], [ b0 ])
-  | [ x1; x2 ] ->
-      let a1, b1 = f x1 in
-      let a2, b2 = f x2 in
-      ([ a1; a2 ], [ b1; b2 ])
-  | [ x1; x2; x3 ] ->
-      let a1, b1 = f x1 in
-      let a2, b2 = f x2 in
-      let a3, b3 = f x3 in
-      ([ a1; a2; a3 ], [ b1; b2; b3 ])
-  | [ x1; x2; x3; x4 ] ->
-      let a1, b1 = f x1 in
-      let a2, b2 = f x2 in
-      let a3, b3 = f x3 in
-      let a4, b4 = f x4 in
-      ([ a1; a2; a3; a4 ], [ b1; b2; b3; b4 ])
-  | x1 :: x2 :: x3 :: x4 :: x5 :: tail ->
-      let a1, b1 = f x1 in
-      let a2, b2 = f x2 in
-      let a3, b3 = f x3 in
-      let a4, b4 = f x4 in
-      let a5, b5 = f x5 in
-      let ass, bss = split_map tail f in
-      (a1 :: a2 :: a3 :: a4 :: a5 :: ass, b1 :: b2 :: b3 :: b4 :: b5 :: bss)
-
-let sort_via_array lst cmp =
-  let arr = Array.of_list lst in
-  Array.sort cmp arr;
-  Array.to_list arr
-
-let sort_via_arrayf lst cmp f =
-  let arr = Array.of_list lst in
-  Array.sort cmp arr;
-  Ext_array.to_list_f arr f
-
-let rec assoc_by_string lst (k : string) def =
-  match lst with
-  | [] -> ( match def with None -> assert false | Some x -> x)
-  | (k1, v1) :: rest -> if k1 = k then v1 else assoc_by_string rest k def
-
-let rec assoc_by_int lst (k : int) def =
-  match lst with
-  | [] -> ( match def with None -> assert false | Some x -> x)
-  | (k1, v1) :: rest -> if k1 = k then v1 else assoc_by_int rest k def
-
-let rec nth_aux l n =
-  match l with
-  | [] -> None
-  | a :: l -> if n = 0 then Some a else nth_aux l (n - 1)
-
-let nth_opt l n = if n < 0 then None else nth_aux l n
-
-let rec iter_snd lst f =
-  match lst with
-  | [] -> ()
-  | (_, x) :: xs ->
-      f x;
-      iter_snd xs f
-
-let rec iter_fst lst f =
-  match lst with
-  | [] -> ()
-  | (x, _) :: xs ->
-      f x;
-      iter_fst xs f
-
-let rec exists l p = match l with [] -> false | x :: xs -> p x || exists xs p
-
-let rec exists_fst l p =
-  match l with [] -> false | (a, _) :: l -> p a || exists_fst l p
-
-let rec exists_snd l p =
-  match l with [] -> false | (_, a) :: l -> p a || exists_snd l p
-
-let rec concat_append (xss : 'a list list) (xs : 'a list) : 'a list =
-  match xss with [] -> xs | l :: r -> append l (concat_append r xs)
-
-let rec fold_left l accu f =
-  match l with [] -> accu | a :: l -> fold_left l (f accu a) f
-
-let reduce_from_left lst fn =
-  match lst with
-  | first :: rest -> fold_left rest first fn
-  | _ -> invalid_arg "Ext_list.reduce_from_left"
-
-let rec fold_left2 l1 l2 accu f =
-  match (l1, l2) with
-  | [], [] -> accu
-  | a1 :: l1, a2 :: l2 -> fold_left2 l1 l2 (f a1 a2 accu) f
-  | _, _ -> invalid_arg "Ext_list.fold_left2"
-
-let singleton_exn xs = match xs with [ x ] -> x | _ -> assert false
-
-let rec mem_string (xs : string list) (x : string) =
-  match xs with [] -> false | a :: l -> a = x || mem_string l x
-
-let filter lst p =
-  let rec find ~p accu lst =
-    match lst with
-    | [] -> rev accu
-    | x :: l -> if p x then find (x :: accu) l ~p else find accu l ~p
-  in
-  find [] lst ~p
diff --git a/jscomp/ext/ext_module_system.ml b/jscomp/ext/ext_module_system.ml
deleted file mode 100644
index 9b06848..0000000
--- a/jscomp/ext/ext_module_system.ml
+++ /dev/null
@@ -1 +0,0 @@
-type t =  Commonjs | Esmodule | Es6_global
diff --git a/jscomp/ext/ext_obj.ml b/jscomp/ext/ext_obj.ml
deleted file mode 100644
index f57d9f6..0000000
--- a/jscomp/ext/ext_obj.ml
+++ /dev/null
@@ -1,124 +0,0 @@
-(* Copyright (C) 2019-Present Hongbo Zhang, Authors of ReScript 
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let rec dump r =
-  if Obj.is_int r then string_of_int (Obj.magic r : int)
-  else
-    (* Block. *)
-    let rec get_fields acc = function
-      | 0 -> acc
-      | n ->
-          let n = n - 1 in
-          get_fields (Obj.field r n :: acc) n
-    in
-    let rec is_list r =
-      if Obj.is_int r then r = Obj.repr 0 (* [] *)
-      else
-        let s = Obj.size r and t = Obj.tag r in
-        t = 0 && s = 2 && is_list (Obj.field r 1)
-      (* h :: t *)
-    in
-    let rec get_list r =
-      if Obj.is_int r then []
-      else
-        let h = Obj.field r 0 and t = get_list (Obj.field r 1) in
-        h :: t
-    in
-    let opaque name =
-      (* XXX In future, print the address of value 'r'.  Not possible
-       * in pure OCaml at the moment. *)
-      "<" ^ name ^ ">"
-    in
-    let s = Obj.size r and t = Obj.tag r in
-    (* From the tag, determine the type of block. *)
-    match t with
-    | _ when is_list r ->
-        let fields = get_list r in
-        "[" ^ String.concat "; " (Ext_list.map fields dump) ^ "]"
-    | 0 ->
-        let fields = get_fields [] s in
-        "(" ^ String.concat ", " (Ext_list.map fields dump) ^ ")"
-    | x when x = Obj.lazy_tag ->
-        (* Note that [lazy_tag .. forward_tag] are < no_scan_tag.  Not
-           * clear if very large constructed values could have the same
-           * tag. XXX *)
-        opaque "lazy"
-    | x when x = Obj.closure_tag -> opaque "closure"
-    | x when x = Obj.object_tag ->
-        let fields = get_fields [] s in
-        let _clasz, id, slots =
-          match fields with h :: h' :: t -> (h, h', t) | _ -> assert false
-        in
-        (* No information on decoding the class (first field).  So just print
-           * out the ID and the slots. *)
-        "Object #" ^ dump id ^ " ("
-        ^ String.concat ", " (Ext_list.map slots dump)
-        ^ ")"
-    | x when x = Obj.infix_tag -> opaque "infix"
-    | x when x = Obj.forward_tag -> opaque "forward"
-    | x when x < Obj.no_scan_tag ->
-        let fields = get_fields [] s in
-        "Tag" ^ string_of_int t ^ " ("
-        ^ String.concat ", " (Ext_list.map fields dump)
-        ^ ")"
-    | x when x = Obj.string_tag ->
-        "\"" ^ String.escaped (Obj.magic r : string) ^ "\""
-    | x when x = Obj.double_tag -> string_of_float (Obj.magic r : float)
-    | x when x = Obj.abstract_tag -> opaque "abstract"
-    | x when x = Obj.custom_tag -> opaque "custom"
-    | x when x = Obj.custom_tag -> opaque "final"
-    | x when x = Obj.double_array_tag ->
-        "[|"
-        ^ String.concat ";"
-            (Array.to_list
-               (Array.map string_of_float (Obj.magic r : float array)))
-        ^ "|]"
-    | _ -> opaque (Printf.sprintf "unknown: tag %d size %d" t s)
-
-let dump v = dump (Obj.repr v)
-
-let dump_endline ?(__LOC__ = "") v =
-  print_endline __LOC__;
-  print_endline (dump v)
-
-let pp_any fmt v = Format.fprintf fmt "@[%s@]" (dump v)
-
-let bt () =
-  let raw_bt = Printexc.backtrace_slots (Printexc.get_raw_backtrace ()) in
-  match raw_bt with
-  | None -> ()
-  | Some raw_bt ->
-      let acc = ref [] in
-      for i = Array.length raw_bt - 1 downto 0 do
-        let slot = raw_bt.(i) in
-        match Printexc.Slot.location slot with
-        | None -> ()
-        | Some bt -> (
-            match !acc with
-            | [] -> acc := [ bt ]
-            | hd :: _ -> if hd <> bt then acc := bt :: !acc)
-      done;
-      Ext_list.iter !acc (fun bt ->
-          Printf.eprintf "File \"%s\", line %d, characters %d-%d\n" bt.filename
-            bt.line_number bt.start_char bt.end_char)
diff --git a/jscomp/ext/ext_stack.ml b/jscomp/ext/ext_stack.ml
deleted file mode 100644
index 0ecebca..0000000
--- a/jscomp/ext/ext_stack.ml
+++ /dev/null
@@ -1,41 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 list ref
-
-let create_ref_empty () = ref []
-
-let ref_top x =
-  match !x with y :: _ -> y | _ -> invalid_arg "Ext_list.ref_top"
-
-let ref_empty x = match !x with [] -> true | _ -> false
-
-let ref_push x refs = refs := x :: !refs
-
-let ref_pop refs =
-  match !refs with
-  | [] -> invalid_arg "Ext_list.ref_pop"
-  | x :: rest ->
-      refs := rest;
-      x
diff --git a/jscomp/ext/ext_stack.mli b/jscomp/ext/ext_stack.mli
deleted file mode 100644
index 2d85a31..0000000
--- a/jscomp/ext/ext_stack.mli
+++ /dev/null
@@ -1,35 +0,0 @@
-(* Copyright (C) 2017 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 list ref
-
-val create_ref_empty : unit -> 'a t
-
-val ref_top : 'a t -> 'a
-
-val ref_empty : 'a t -> bool
-
-val ref_push : 'a -> 'a t -> unit
-
-val ref_pop : 'a t -> 'a
diff --git a/jscomp/ext/ext_string_array.ml b/jscomp/ext/ext_string_array.ml
deleted file mode 100644
index 27b8c18..0000000
--- a/jscomp/ext/ext_string_array.ml
+++ /dev/null
@@ -1,87 +0,0 @@
-(* Copyright (C) 2020 - Present Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Invariant: the same as encoding Map_string.compare_key  *)
-let cmp = Ext_string.compare
-
-let rec binarySearchAux (arr : string array) (lo : int) (hi : int)
-    (key : string) : _ option =
-  let mid = (lo + hi) / 2 in
-  let midVal = Array.unsafe_get arr mid in
-  let c = cmp key midVal in
-  if c = 0 then Some mid
-  else if c < 0 then
-    (*  a[lo] =< key < a[mid] <= a[hi] *)
-    if hi = mid then
-      let loVal = Array.unsafe_get arr lo in
-      if loVal = key then Some lo else None
-    else binarySearchAux arr lo mid key
-  else if (*  a[lo] =< a[mid] < key <= a[hi] *)
-          lo = mid then
-    let hiVal = Array.unsafe_get arr hi in
-    if hiVal = key then Some hi else None
-  else binarySearchAux arr mid hi key
-
-let find_sorted sorted key : int option =
-  let len = Array.length sorted in
-  if len = 0 then None
-  else
-    let lo = Array.unsafe_get sorted 0 in
-    let c = cmp key lo in
-    if c < 0 then None
-    else
-      let hi = Array.unsafe_get sorted (len - 1) in
-      let c2 = cmp key hi in
-      if c2 > 0 then None else binarySearchAux sorted 0 (len - 1) key
-
-let rec binarySearchAssoc (arr : (string * _) array) (lo : int) (hi : int)
-    (key : string) : _ option =
-  let mid = (lo + hi) / 2 in
-  let midVal = Array.unsafe_get arr mid in
-  let c = cmp key (fst midVal) in
-  if c = 0 then Some (snd midVal)
-  else if c < 0 then
-    (*  a[lo] =< key < a[mid] <= a[hi] *)
-    if hi = mid then
-      let loVal = Array.unsafe_get arr lo in
-      if fst loVal = key then Some (snd loVal) else None
-    else binarySearchAssoc arr lo mid key
-  else if (*  a[lo] =< a[mid] < key <= a[hi] *)
-          lo = mid then
-    let hiVal = Array.unsafe_get arr hi in
-    if fst hiVal = key then Some (snd hiVal) else None
-  else binarySearchAssoc arr mid hi key
-
-let find_sorted_assoc (type a) (sorted : (string * a) array) (key : string) :
-    a option =
-  let len = Array.length sorted in
-  if len = 0 then None
-  else
-    let lo = Array.unsafe_get sorted 0 in
-    let c = cmp key (fst lo) in
-    if c < 0 then None
-    else
-      let hi = Array.unsafe_get sorted (len - 1) in
-      let c2 = cmp key (fst hi) in
-      if c2 > 0 then None else binarySearchAssoc sorted 0 (len - 1) key
diff --git a/jscomp/ext/ext_topsort.ml b/jscomp/ext/ext_topsort.ml
deleted file mode 100644
index fc44e71..0000000
--- a/jscomp/ext/ext_topsort.ml
+++ /dev/null
@@ -1,61 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 edges = { id : int; deps : Vec_int.t }
-
-module Edge_vec = Vec.Make (struct
-  type t = edges
-
-  let null = { id = 0; deps = Vec_int.empty () }
-end)
-
-type t = Edge_vec.t
-
-(** 
-    This graph is different the graph used in [scc] graph, since 
-    we need dynamic shrink the graph, so for each vector the first node is it self ,
-    it will also change the input.
-
-    TODO: error handling (cycle handling) and defensive bad input (missing edges etc)
-*)
-
-let layered_dfs (g : t) =
-  let queue = Queue.create () in
-  let rec aux g =
-    let new_entries =
-      Edge_vec.inplace_filter_with
-        (fun (x : edges) -> not (Vec_int.is_empty x.deps))
-        ~cb_no:(fun x acc -> Set_int.add acc x.id)
-        Set_int.empty g
-    in
-    if not (Set_int.is_empty new_entries) then (
-      Queue.push new_entries queue;
-      Edge_vec.iter g (fun edges ->
-          Vec_int.inplace_filter
-            (fun x -> not (Set_int.mem new_entries x))
-            edges.deps);
-      aux g)
-  in
-  aux g;
-  queue
diff --git a/jscomp/ext/ext_topsort.mli b/jscomp/ext/ext_topsort.mli
deleted file mode 100644
index 673f8d1..0000000
--- a/jscomp/ext/ext_topsort.mli
+++ /dev/null
@@ -1,33 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 edges = { id : int; deps : Vec_int.t }
-
-module Edge_vec : Vec_gen.S with type elt = edges
-
-type t = Edge_vec.t
-
-val layered_dfs : t -> Set_int.t Queue.t
-(** the input will be modified ,
-*)
diff --git a/jscomp/ext/hash_gen.ml b/jscomp/ext/hash_gen.ml
deleted file mode 100644
index 01b6498..0000000
--- a/jscomp/ext/hash_gen.ml
+++ /dev/null
@@ -1,241 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the GNU Library General Public License, with    *)
-(*  the special exception on linking described in file ../LICENSE.     *)
-(*                                                                     *)
-(***********************************************************************)
-
-(* Hash tables *)
-
-(* We do dynamic hashing, and resize the table and rehash the elements
-   when buckets become too long. *)
-
-type ('a, 'b) bucket =
-  | Empty
-  | Cons of {
-      mutable key : 'a;
-      mutable data : 'b;
-      mutable next : ('a, 'b) bucket;
-    }
-
-type ('a, 'b) t = {
-  mutable size : int;
-  (* number of entries *)
-  mutable data : ('a, 'b) bucket array;
-  (* the buckets *)
-  initial_size : int; (* initial array size *)
-}
-
-let create initial_size =
-  let s = Ext_util.power_2_above 16 initial_size in
-  { initial_size = s; size = 0; data = Array.make s Empty }
-
-let clear h =
-  h.size <- 0;
-  let len = Array.length h.data in
-  for i = 0 to len - 1 do
-    Array.unsafe_set h.data i Empty
-  done
-
-let reset h =
-  h.size <- 0;
-  h.data <- Array.make h.initial_size Empty
-
-let length h = h.size
-
-let resize indexfun h =
-  let odata = h.data in
-  let osize = Array.length odata in
-  let nsize = osize * 2 in
-  if nsize < Sys.max_array_length then (
-    let ndata = Array.make nsize Empty in
-    let ndata_tail = Array.make nsize Empty in
-    h.data <- ndata;
-    (* so that indexfun sees the new bucket count *)
-    let rec insert_bucket = function
-      | Empty -> ()
-      | Cons { key; next } as cell ->
-          let nidx = indexfun h key in
-          (match Array.unsafe_get ndata_tail nidx with
-          | Empty -> Array.unsafe_set ndata nidx cell
-          | Cons tail -> tail.next <- cell);
-          Array.unsafe_set ndata_tail nidx cell;
-          insert_bucket next
-    in
-    for i = 0 to osize - 1 do
-      insert_bucket (Array.unsafe_get odata i)
-    done;
-    for i = 0 to nsize - 1 do
-      match Array.unsafe_get ndata_tail i with
-      | Empty -> ()
-      | Cons tail -> tail.next <- Empty
-    done)
-
-let iter h f =
-  let rec do_bucket = function
-    | Empty -> ()
-    | Cons l ->
-        f l.key l.data;
-        do_bucket l.next
-  in
-  let d = h.data in
-  for i = 0 to Array.length d - 1 do
-    do_bucket (Array.unsafe_get d i)
-  done
-
-let fold h init f =
-  let rec do_bucket b accu =
-    match b with
-    | Empty -> accu
-    | Cons l -> do_bucket l.next (f l.key l.data accu)
-  in
-  let d = h.data in
-  let accu = ref init in
-  for i = 0 to Array.length d - 1 do
-    accu := do_bucket (Array.unsafe_get d i) !accu
-  done;
-  !accu
-
-let to_list h f = fold h [] (fun k data acc -> f k data :: acc)
-
-let rec small_bucket_mem (lst : _ bucket) eq key =
-  match lst with
-  | Empty -> false
-  | Cons lst -> (
-      eq key lst.key
-      ||
-      match lst.next with
-      | Empty -> false
-      | Cons lst -> (
-          eq key lst.key
-          ||
-          match lst.next with
-          | Empty -> false
-          | Cons lst -> eq key lst.key || small_bucket_mem lst.next eq key))
-
-let rec small_bucket_opt eq key (lst : _ bucket) : _ option =
-  match lst with
-  | Empty -> None
-  | Cons lst -> (
-      if eq key lst.key then Some lst.data
-      else
-        match lst.next with
-        | Empty -> None
-        | Cons lst -> (
-            if eq key lst.key then Some lst.data
-            else
-              match lst.next with
-              | Empty -> None
-              | Cons lst ->
-                  if eq key lst.key then Some lst.data
-                  else small_bucket_opt eq key lst.next))
-
-let rec small_bucket_key_opt eq key (lst : _ bucket) : _ option =
-  match lst with
-  | Empty -> None
-  | Cons { key = k; next } -> (
-      if eq key k then Some k
-      else
-        match next with
-        | Empty -> None
-        | Cons { key = k; next } -> (
-            if eq key k then Some k
-            else
-              match next with
-              | Empty -> None
-              | Cons { key = k; next } ->
-                  if eq key k then Some k else small_bucket_key_opt eq key next)
-      )
-
-let rec small_bucket_default eq key default (lst : _ bucket) =
-  match lst with
-  | Empty -> default
-  | Cons lst -> (
-      if eq key lst.key then lst.data
-      else
-        match lst.next with
-        | Empty -> default
-        | Cons lst -> (
-            if eq key lst.key then lst.data
-            else
-              match lst.next with
-              | Empty -> default
-              | Cons lst ->
-                  if eq key lst.key then lst.data
-                  else small_bucket_default eq key default lst.next))
-
-let rec remove_bucket h (i : int) key ~(prec : _ bucket) (buck : _ bucket)
-    eq_key =
-  match buck with
-  | Empty -> ()
-  | Cons { key = k; next } ->
-      if eq_key k key then (
-        h.size <- h.size - 1;
-        match prec with
-        | Empty -> Array.unsafe_set h.data i next
-        | Cons c -> c.next <- next)
-      else remove_bucket h i key ~prec:buck next eq_key
-
-let rec replace_bucket key data (buck : _ bucket) eq_key =
-  match buck with
-  | Empty -> true
-  | Cons slot ->
-      if eq_key slot.key key then (
-        slot.key <- key;
-        slot.data <- data;
-        false)
-      else replace_bucket key data slot.next eq_key
-
-module type S = sig
-  type key
-
-  type 'a t
-
-  val create : int -> 'a t
-
-  val clear : 'a t -> unit
-
-  val reset : 'a t -> unit
-
-  val add : 'a t -> key -> 'a -> unit
-
-  val add_or_update : 'a t -> key -> update:('a -> 'a) -> 'a -> unit
-
-  val remove : 'a t -> key -> unit
-
-  val find_exn : 'a t -> key -> 'a
-
-  val find_all : 'a t -> key -> 'a list
-
-  val find_opt : 'a t -> key -> 'a option
-
-  val find_key_opt : 'a t -> key -> key option
-  (** return the key found in the hashtbl.
-      Use case: when you find the key existed in hashtbl, 
-      you want to use the one stored in the hashtbl. 
-      (they are semantically equivlanent, but may have other information different) 
-  *)
-
-  val find_default : 'a t -> key -> 'a -> 'a
-
-  val replace : 'a t -> key -> 'a -> unit
-
-  val mem : 'a t -> key -> bool
-
-  val iter : 'a t -> (key -> 'a -> unit) -> unit
-
-  val fold : 'a t -> 'b -> (key -> 'a -> 'b -> 'b) -> 'b
-
-  val length : 'a t -> int
-
-  (* val stats: 'a t -> Hashtbl.statistics *)
-  val to_list : 'a t -> (key -> 'a -> 'c) -> 'c list
-
-  val of_list2 : key list -> 'a list -> 'a t
-end
diff --git a/jscomp/ext/hash_ident.mli b/jscomp/ext/hash_ident.mli
deleted file mode 100644
index 0a299ad..0000000
--- a/jscomp/ext/hash_ident.mli
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-include Hash_gen.S with type key = Ident.t 
-
-
diff --git a/jscomp/ext/hash_set_ident_mask.ml b/jscomp/ext/hash_set_ident_mask.ml
deleted file mode 100644
index 8cdc76b..0000000
--- a/jscomp/ext/hash_set_ident_mask.ml
+++ /dev/null
@@ -1,163 +0,0 @@
-
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** A speicalized datastructure for scc algorithm *)
-
-type ident = Ident.t
-
-type bucket =
-  | Empty 
-  | Cons of {
-      ident : ident; 
-      mutable mask : bool;
-      rest : bucket
-    }
-
-type t = {
-  mutable size : int ; 
-  mutable data : bucket array;
-  mutable mask_size : int (* mark how many idents are marked *)
-}
-
-
-
-let key_index_by_ident (h : t) (key : Ident.t) =    
-  (Bs_hash_stubs.hash_string_int  key.name key.stamp) land (Array.length h.data - 1)
-
-
-
-
-let create  initial_size =
-  let s = Ext_util.power_2_above 8 initial_size in
-  { size = 0; data = Array.make s Empty ; mask_size = 0}
-
-let iter_and_unmask h f =
-  let rec iter_bucket buckets = 
-    match buckets with 
-    | Empty ->
-      ()
-    | Cons k ->    
-      let k_mask = k.mask in 
-      f k.ident k_mask ;
-      if k_mask then 
-        begin 
-          k.mask <- false ;
-          (* we can set [h.mask_size] to zero,
-             however, it would result inconsistent state
-             once [f] throw
-          *)
-          h.mask_size <- h.mask_size - 1
-        end; 
-      iter_bucket k.rest 
-  in
-  let d = h.data in
-  for i = 0 to Array.length d - 1 do
-    iter_bucket (Array.unsafe_get d i)
-  done
-
-
-let rec small_bucket_mem key lst =
-  match lst with 
-  | Empty -> false 
-  | Cons rst -> 
-    Ext_ident.equal key   rst.ident ||
-    match rst.rest with 
-    | Empty -> false 
-    | Cons rst -> 
-      Ext_ident.equal key   rst.ident ||
-      match rst.rest with 
-      | Empty -> false 
-      | Cons rst -> 
-        Ext_ident.equal key   rst.ident ||
-        small_bucket_mem key rst.rest 
-
-let resize indexfun h =
-  let odata = h.data in
-  let osize = Array.length odata in
-  let nsize = osize * 2 in
-  if nsize < Sys.max_array_length then begin
-    let ndata = Array.make nsize Empty in
-    h.data <- ndata;          (* so that indexfun sees the new bucket count *)
-    let rec insert_bucket = function
-        Empty -> ()
-      | Cons {ident = key;  mask; rest} ->
-        let nidx = indexfun h key in
-        Array.unsafe_set 
-          ndata (nidx)  
-          (Cons {ident = key; mask; rest = Array.unsafe_get ndata (nidx)});
-        insert_bucket rest
-    in
-    for i = 0 to osize - 1 do
-      insert_bucket (Array.unsafe_get odata i)
-    done
-  end
-
-let add_unmask (h : t) (key : Ident.t) =
-  let i = key_index_by_ident h key  in 
-  let h_data = h.data in 
-  let old_bucket = Array.unsafe_get h_data i in
-  if not (small_bucket_mem key old_bucket) then 
-    begin 
-      Array.unsafe_set h_data i 
-        (Cons {ident = key; mask = false; rest =  old_bucket});
-      h.size <- h.size + 1 ;
-      if h.size > Array.length h_data lsl 1 then resize key_index_by_ident h
-    end
-
-
-
-
-let rec small_bucket_mask  key lst =
-  match lst with 
-  | Empty -> false 
-  | Cons rst -> 
-    if Ext_ident.equal key   rst.ident  then 
-      if rst.mask then false else (rst.mask <- true ; true) 
-    else 
-      match rst.rest with 
-      | Empty -> false
-      | Cons rst -> 
-        if Ext_ident.equal key rst.ident  then 
-          if rst.mask then false else (rst.mask <- true ; true)
-        else 
-          match rst.rest with 
-          | Empty -> false
-          | Cons rst -> 
-            if Ext_ident.equal key rst.ident then 
-              if rst.mask then false else (rst.mask <- true ; true)
-            else 
-              small_bucket_mask  key rst.rest 
-
-let mask_and_check_all_hit (h : t) (key : Ident.t) =     
-  if 
-    small_bucket_mask key 
-      (Array.unsafe_get h.data (key_index_by_ident h key )) then 
-    begin 
-      h.mask_size <- h.mask_size + 1 
-    end;
-  h.size = h.mask_size 
-
-
-
diff --git a/jscomp/ext/hash_set_ident_mask.mli b/jscomp/ext/hash_set_ident_mask.mli
deleted file mode 100644
index 19c60a0..0000000
--- a/jscomp/ext/hash_set_ident_mask.mli
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-(** Based on [hash_set] specialized for mask operations  *)
-type ident = Ident.t  
-
-
-type t
-
-val create: int ->  t
-
-
-(* add one ident 
-   ident is unmaksed by default
-*)
-val add_unmask :  t -> ident -> unit
-
-
-(** [check_mask h key] if [key] exists mask it otherwise nothing
-    return true if all keys are masked otherwise false
-*)
-val mask_and_check_all_hit : 
-  t -> 
-  ident ->  
-  bool
-
-(** [iter_and_unmask f h] iterating the collection and mask all idents,
-    dont consul the collection in function [f]
-    TODO: what happens if an exception raised in the callback,
-    would the hashtbl still be in consistent state?
-*)
-val iter_and_unmask: 
-  t -> 
-  (ident -> bool ->  unit) -> 
-  unit
-
-
-
-
diff --git a/jscomp/ext/ident.ml b/jscomp/ext/ident.ml
deleted file mode 100644
index ca46973..0000000
--- a/jscomp/ext/ident.ml
+++ /dev/null
@@ -1,249 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Format
-
-type t = { stamp: int; name: string; mutable flags: int }
-
-let [@inlnie] max (x:int) y = if x >= y then x else y 
-let global_flag = 1
-let predef_exn_flag = 2
-
-(* A stamp of 0 denotes a persistent identifier *)
-
-let currentstamp = ref 0
-
-let create s =
-  incr currentstamp;
-  { name = s; stamp = !currentstamp; flags = 0 }
-
-let create_predef_exn s =
-  incr currentstamp;
-  { name = s; stamp = !currentstamp; flags = predef_exn_flag }
-
-let create_persistent s =
-  { name = s; stamp = 0; flags = global_flag }
-
-let rename i =
-  incr currentstamp;
-  { i with stamp = !currentstamp }
-
-let name i = i.name
-
-let unique_name i = i.name ^ "_" ^ string_of_int i.stamp
-
-let unique_toplevel_name i = i.name ^ "/" ^ string_of_int i.stamp
-
-let persistent i = (i.stamp = 0)
-
-let equal i1 i2 = i1.name = i2.name
-
-let same ({stamp; name } : t) i2 =   
-  if stamp <> 0
-  then stamp = i2.stamp
-  else i2.stamp = 0 && name = i2.name 
-
-
-
-let binding_time i = i.stamp
-
-let current_time() = !currentstamp
-let set_current_time t = currentstamp := max !currentstamp t
-
-let reinit_level = ref (-1)
-
-let reinit () =
-  if !reinit_level < 0
-  then reinit_level := !currentstamp
-  else currentstamp := !reinit_level
-
-let hide i =
-  { i with stamp = -1 }
-
-let make_global i =
-  i.flags <- i.flags lor global_flag
-
-let global i =
-  (i.flags land global_flag) <> 0
-
-let is_predef_exn i =
-  (i.flags land predef_exn_flag) <> 0
-
-let print ppf i =
-  match i.stamp with
-  | 0 -> fprintf ppf "%s!" i.name
-  | -1 -> fprintf ppf "%s#" i.name
-  | n -> fprintf ppf "%s/%i%s" i.name n (if global i then "g" else "")
-
-type 'a tbl =
-    Empty
-  | Node of 'a tbl * 'a data * 'a tbl * int
-
-and 'a data =
-  { ident: t;
-    data: 'a;
-    previous: 'a data option }
-
-let empty = Empty
-
-(* Inline expansion of height for better speed
- * let height = function
- *     Empty -> 0
- *   | Node(_,_,_,h) -> h
- *)
-
-let mknode l d r =
-  let hl = match l with Empty -> 0 | Node(_,_,_,h) -> h
-  and hr = match r with Empty -> 0 | Node(_,_,_,h) -> h in
-  Node(l, d, r, (if hl >= hr then hl + 1 else hr + 1))
-
-let balance l d r =
-  let hl = match l with Empty -> 0 | Node(_,_,_,h) -> h
-  and hr = match r with Empty -> 0 | Node(_,_,_,h) -> h in
-  if hl > hr + 1 then
-    match l with
-    | Node (ll, ld, lr, _)
-      when (match ll with Empty -> 0 | Node(_,_,_,h) -> h) >=
-           (match lr with Empty -> 0 | Node(_,_,_,h) -> h) ->
-        mknode ll ld (mknode lr d r)
-    | Node (ll, ld, Node(lrl, lrd, lrr, _), _) ->
-        mknode (mknode ll ld lrl) lrd (mknode lrr d r)
-    | _ -> assert false
-  else if hr > hl + 1 then
-    match r with
-    | Node (rl, rd, rr, _)
-      when (match rr with Empty -> 0 | Node(_,_,_,h) -> h) >=
-           (match rl with Empty -> 0 | Node(_,_,_,h) -> h) ->
-        mknode (mknode l d rl) rd rr
-    | Node (Node (rll, rld, rlr, _), rd, rr, _) ->
-        mknode (mknode l d rll) rld (mknode rlr rd rr)
-    | _ -> assert false
-  else
-    mknode l d r
-
-let rec add id data = function
-    Empty ->
-      Node(Empty, {ident = id; data = data; previous = None}, Empty, 1)
-  | Node(l, k, r, h) ->
-      let c = compare id.name k.ident.name in
-      if c = 0 then
-        Node(l, {ident = id; data = data; previous = Some k}, r, h)
-      else if c < 0 then
-        balance (add id data l) k r
-      else
-        balance l k (add id data r)
-
-let rec find_stamp s = function
-    None ->
-      raise Not_found
-  | Some k ->
-      if k.ident.stamp = s then k.data else find_stamp s k.previous
-
-let rec find_same id = function
-    Empty ->
-      raise Not_found
-  | Node(l, k, r, _) ->
-      let c = compare id.name k.ident.name in
-      if c = 0 then
-        if id.stamp = k.ident.stamp
-        then k.data
-        else find_stamp id.stamp k.previous
-      else
-        find_same id (if c < 0 then l else r)
-
-let rec find_name name = function
-    Empty ->
-      raise Not_found
-  | Node(l, k, r, _) ->
-      let c = compare name k.ident.name in
-      if c = 0 then
-        k.ident, k.data
-      else
-        find_name name (if c < 0 then l else r)
-
-let rec get_all = function
-  | None -> []
-  | Some k -> (k.ident, k.data) :: get_all k.previous
-
-let rec find_all name = function
-    Empty ->
-      []
-  | Node(l, k, r, _) ->
-      let c = compare name k.ident.name in
-      if c = 0 then
-        (k.ident, k.data) :: get_all k.previous
-      else
-        find_all name (if c < 0 then l else r)
-
-let rec fold_aux f stack accu = function
-    Empty ->
-      begin match stack with
-        [] -> accu
-      | a :: l -> fold_aux f l accu a
-      end
-  | Node(l, k, r, _) ->
-      fold_aux f (l :: stack) (f k accu) r
-
-let fold_name f tbl accu = fold_aux (fun k -> f k.ident k.data) [] accu tbl
-
-let rec fold_data f d accu =
-  match d with
-    None -> accu
-  | Some k -> f k.ident k.data (fold_data f k.previous accu)
-
-let fold_all f tbl accu =
-  fold_aux (fun k -> fold_data f (Some k)) [] accu tbl
-
-(* let keys tbl = fold_name (fun k _ accu -> k::accu) tbl [] *)
-
-let rec iter f = function
-    Empty -> ()
-  | Node(l, k, r, _) ->
-      iter f l; f k.ident k.data; iter f r
-
-(* Idents for sharing keys *)
-
-(* They should be 'totally fresh' -> neg numbers *)
-let key_name = ""
-
-let make_key_generator () =
-  let c = ref 1 in
-  fun id ->
-    let stamp = !c in
-    decr c ;
-    { id with name = key_name; stamp = stamp; }
-
-let compare x y =
-  let c = x.stamp - y.stamp in
-  if c <> 0 then c
-  else
-    let c = compare x.name y.name in
-    if c <> 0 then c
-    else
-      compare x.flags y.flags
-
-let output oc id = output_string oc (unique_name id)
-let hash i = (Char.code i.name.[0]) lxor i.stamp
-
-let original_equal = equal
-include Identifiable.Make (struct
-  type nonrec t = t
-  let compare = compare
-  let output = output
-  let print = print
-  let hash = hash
-  let equal = same
-end)
-let equal = original_equal
diff --git a/jscomp/ext/ident.mli b/jscomp/ext/ident.mli
deleted file mode 100644
index c2983ed..0000000
--- a/jscomp/ext/ident.mli
+++ /dev/null
@@ -1,73 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Identifiers (unique names) *)
-
-type t = { stamp: int; name: string; mutable flags: int }
-
-include Identifiable.S with type t := t
-(* Notes:
-   - [equal] compares identifiers by name
-   - [compare x y] is 0 if [same x y] is true.
-   - [compare] compares identifiers by binding location
-*)
-
-
-val create: string -> t
-val create_persistent: string -> t
-val create_predef_exn: string -> t
-val rename: t -> t
-val name: t -> string
-val unique_name: t -> string
-val unique_toplevel_name: t -> string
-val persistent: t -> bool
-val same: t -> t -> bool
-        (* Compare identifiers by binding location.
-           Two identifiers are the same either if they are both
-           non-persistent and have been created by the same call to
-           [new], or if they are both persistent and have the same
-           name. *)
-val compare: t -> t -> int
-val hide: t -> t
-        (* Return an identifier with same name as the given identifier,
-           but stamp different from any stamp returned by new.
-           When put in a 'a tbl, this identifier can only be looked
-           up by name. *)
-
-val make_global: t -> unit
-val global: t -> bool
-val is_predef_exn: t -> bool
-
-val binding_time: t -> int
-val current_time: unit -> int
-val set_current_time: int -> unit
-val reinit: unit -> unit
-
-type 'a tbl
-        (* Association tables from identifiers to type 'a. *)
-
-val empty: 'a tbl
-val add: t -> 'a -> 'a tbl -> 'a tbl
-val find_same: t -> 'a tbl -> 'a
-val find_name: string -> 'a tbl -> t * 'a
-val find_all: string -> 'a tbl -> (t * 'a) list
-val fold_name: (t -> 'a -> 'b -> 'b) -> 'a tbl -> 'b -> 'b
-val fold_all: (t -> 'a -> 'b -> 'b) -> 'a tbl -> 'b -> 'b
-val iter: (t -> 'a -> unit) -> 'a tbl -> unit
-
-
-(* Idents for sharing keys *)
-
-val make_key_generator : unit -> (t -> t)
diff --git a/jscomp/ext/js_reserved_map.ml b/jscomp/ext/js_reserved_map.ml
deleted file mode 100644
index c60bea0..0000000
--- a/jscomp/ext/js_reserved_map.ml
+++ /dev/null
@@ -1,820 +0,0 @@
-
-(* Copyright (C) 2019-Present Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let sorted_keywords = [|
-  "AbortController";
-  "AbortSignal";
-  "AbstractRange";
-  "ActiveXObject";
-  "AggregateError";
-  "AnalyserNode";
-  "Animation";
-  "AnimationEffect";
-  "AnimationEvent";
-  "AnimationPlaybackEvent";
-  "AnimationTimeline";
-  "Array";
-  "ArrayBuffer";
-  "Atomics";
-  "Attr";
-  "Audio";
-  "AudioBuffer";
-  "AudioBufferSourceNode";
-  "AudioContext";
-  "AudioData";
-  "AudioDestinationNode";
-  "AudioListener";
-  "AudioNode";
-  "AudioParam";
-  "AudioParamMap";
-  "AudioProcessingEvent";
-  "AudioScheduledSourceNode";
-  "AudioSinkInfo";
-  "AudioWorkletNode";
-  "BackgroundFetchManager";
-  "BackgroundFetchRecord";
-  "BackgroundFetchRegistration";
-  "BarProp";
-  "BaseAudioContext";
-  "BeforeInstallPromptEvent";
-  "BeforeUnloadEvent";
-  "BigInt";
-  "BigInt64Array";
-  "BigUint64Array";
-  "BiquadFilterNode";
-  "Blob";
-  "BlobEvent";
-  "BluetoothUUID";
-  "Boolean";
-  "BroadcastChannel";
-  "BrowserCaptureMediaStreamTrack";
-  "Buffer";
-  "Bun";
-  "ByteLengthQueuingStrategy";
-  "CDATASection";
-  "CSS";
-  "CSSAnimation";
-  "CSSConditionRule";
-  "CSSContainerRule";
-  "CSSCounterStyleRule";
-  "CSSFontFaceRule";
-  "CSSFontPaletteValuesRule";
-  "CSSGroupingRule";
-  "CSSImageValue";
-  "CSSImportRule";
-  "CSSKeyframeRule";
-  "CSSKeyframesRule";
-  "CSSKeywordValue";
-  "CSSLayerBlockRule";
-  "CSSLayerStatementRule";
-  "CSSMathClamp";
-  "CSSMathInvert";
-  "CSSMathMax";
-  "CSSMathMin";
-  "CSSMathNegate";
-  "CSSMathProduct";
-  "CSSMathSum";
-  "CSSMathValue";
-  "CSSMatrixComponent";
-  "CSSMediaRule";
-  "CSSNamespaceRule";
-  "CSSNumericArray";
-  "CSSNumericValue";
-  "CSSPageRule";
-  "CSSPerspective";
-  "CSSPositionValue";
-  "CSSPropertyRule";
-  "CSSRotate";
-  "CSSRule";
-  "CSSRuleList";
-  "CSSScale";
-  "CSSSkew";
-  "CSSSkewX";
-  "CSSSkewY";
-  "CSSStyleDeclaration";
-  "CSSStyleRule";
-  "CSSStyleSheet";
-  "CSSStyleValue";
-  "CSSSupportsRule";
-  "CSSTransformComponent";
-  "CSSTransformValue";
-  "CSSTransition";
-  "CSSTranslate";
-  "CSSUnitValue";
-  "CSSUnparsedValue";
-  "CSSVariableReferenceValue";
-  "CanvasCaptureMediaStreamTrack";
-  "CanvasGradient";
-  "CanvasPattern";
-  "CanvasRenderingContext2D";
-  "ChannelMergerNode";
-  "ChannelSplitterNode";
-  "CharacterData";
-  "ClipboardEvent";
-  "CloseEvent";
-  "Comment";
-  "CompositionEvent";
-  "CompressionStream";
-  "ConstantSourceNode";
-  "ContentVisibilityAutoStateChangeEvent";
-  "ConvolverNode";
-  "CountQueuingStrategy";
-  "CropTarget";
-  "Crypto";
-  "CustomElementRegistry";
-  "CustomEvent";
-  "CustomStateSet";
-  "DOMError";
-  "DOMException";
-  "DOMImplementation";
-  "DOMMatrix";
-  "DOMMatrixReadOnly";
-  "DOMParser";
-  "DOMPoint";
-  "DOMPointReadOnly";
-  "DOMQuad";
-  "DOMRect";
-  "DOMRectList";
-  "DOMRectReadOnly";
-  "DOMStringList";
-  "DOMStringMap";
-  "DOMTokenList";
-  "DataTransfer";
-  "DataTransferItem";
-  "DataTransferItemList";
-  "DataView";
-  "Date";
-  "DecompressionStream";
-  "DelayNode";
-  "DelegatedInkTrailPresenter";
-  "Deno";
-  "Document";
-  "DocumentFragment";
-  "DocumentPictureInPictureEvent";
-  "DocumentTimeline";
-  "DocumentType";
-  "DragEvent";
-  "DynamicsCompressorNode";
-  "Element";
-  "ElementInternals";
-  "EncodedAudioChunk";
-  "EncodedVideoChunk";
-  "Error";
-  "ErrorEvent";
-  "EvalError";
-  "Event";
-  "EventCounts";
-  "EventSource";
-  "EventTarget";
-  "External";
-  "FeaturePolicy";
-  "File";
-  "FileList";
-  "FileReader";
-  "FinalizationRegistry";
-  "Float32Array";
-  "Float64Array";
-  "FocusEvent";
-  "FontFace";
-  "FontFaceSetLoadEvent";
-  "FormData";
-  "FormDataEvent";
-  "FragmentDirective";
-  "Function";
-  "GainNode";
-  "Gamepad";
-  "GamepadButton";
-  "GamepadEvent";
-  "GamepadHapticActuator";
-  "Geolocation";
-  "GeolocationCoordinates";
-  "GeolocationPosition";
-  "GeolocationPositionError";
-  "HTMLAllCollection";
-  "HTMLAnchorElement";
-  "HTMLAreaElement";
-  "HTMLAudioElement";
-  "HTMLBRElement";
-  "HTMLBaseElement";
-  "HTMLBodyElement";
-  "HTMLButtonElement";
-  "HTMLCanvasElement";
-  "HTMLCollection";
-  "HTMLDListElement";
-  "HTMLDataElement";
-  "HTMLDataListElement";
-  "HTMLDetailsElement";
-  "HTMLDialogElement";
-  "HTMLDirectoryElement";
-  "HTMLDivElement";
-  "HTMLDocument";
-  "HTMLElement";
-  "HTMLEmbedElement";
-  "HTMLFieldSetElement";
-  "HTMLFontElement";
-  "HTMLFormControlsCollection";
-  "HTMLFormElement";
-  "HTMLFrameElement";
-  "HTMLFrameSetElement";
-  "HTMLHRElement";
-  "HTMLHeadElement";
-  "HTMLHeadingElement";
-  "HTMLHtmlElement";
-  "HTMLIFrameElement";
-  "HTMLImageElement";
-  "HTMLInputElement";
-  "HTMLLIElement";
-  "HTMLLabelElement";
-  "HTMLLegendElement";
-  "HTMLLinkElement";
-  "HTMLMapElement";
-  "HTMLMarqueeElement";
-  "HTMLMediaElement";
-  "HTMLMenuElement";
-  "HTMLMetaElement";
-  "HTMLMeterElement";
-  "HTMLModElement";
-  "HTMLOListElement";
-  "HTMLObjectElement";
-  "HTMLOptGroupElement";
-  "HTMLOptionElement";
-  "HTMLOptionsCollection";
-  "HTMLOutputElement";
-  "HTMLParagraphElement";
-  "HTMLParamElement";
-  "HTMLPictureElement";
-  "HTMLPreElement";
-  "HTMLProgressElement";
-  "HTMLQuoteElement";
-  "HTMLScriptElement";
-  "HTMLSelectElement";
-  "HTMLSlotElement";
-  "HTMLSourceElement";
-  "HTMLSpanElement";
-  "HTMLStyleElement";
-  "HTMLTableCaptionElement";
-  "HTMLTableCellElement";
-  "HTMLTableColElement";
-  "HTMLTableElement";
-  "HTMLTableRowElement";
-  "HTMLTableSectionElement";
-  "HTMLTemplateElement";
-  "HTMLTextAreaElement";
-  "HTMLTimeElement";
-  "HTMLTitleElement";
-  "HTMLTrackElement";
-  "HTMLUListElement";
-  "HTMLUnknownElement";
-  "HTMLVideoElement";
-  "HashChangeEvent";
-  "Headers";
-  "Highlight";
-  "HighlightRegistry";
-  "History";
-  "IDBCursor";
-  "IDBCursorWithValue";
-  "IDBDatabase";
-  "IDBFactory";
-  "IDBIndex";
-  "IDBKeyRange";
-  "IDBObjectStore";
-  "IDBOpenDBRequest";
-  "IDBRequest";
-  "IDBTransaction";
-  "IDBVersionChangeEvent";
-  "IIRFilterNode";
-  "IdleDeadline";
-  "Image";
-  "ImageBitmap";
-  "ImageBitmapRenderingContext";
-  "ImageCapture";
-  "ImageData";
-  "ImageTrack";
-  "ImageTrackList";
-  "Infinity";
-  "Ink";
-  "InputDeviceCapabilities";
-  "InputDeviceInfo";
-  "InputEvent";
-  "Int16Array";
-  "Int32Array";
-  "Int8Array";
-  "IntersectionObserver";
-  "IntersectionObserverEntry";
-  "Intl";
-  "JSON";
-  "KeyboardEvent";
-  "KeyframeEffect";
-  "LargestContentfulPaint";
-  "LaunchParams";
-  "LaunchQueue";
-  "LayoutShift";
-  "LayoutShiftAttribution";
-  "Location";
-  "Map";
-  "Math";
-  "MathMLElement";
-  "MediaCapabilities";
-  "MediaElementAudioSourceNode";
-  "MediaEncryptedEvent";
-  "MediaError";
-  "MediaList";
-  "MediaMetadata";
-  "MediaQueryList";
-  "MediaQueryListEvent";
-  "MediaRecorder";
-  "MediaSession";
-  "MediaSource";
-  "MediaSourceHandle";
-  "MediaStream";
-  "MediaStreamAudioDestinationNode";
-  "MediaStreamAudioSourceNode";
-  "MediaStreamEvent";
-  "MediaStreamTrack";
-  "MediaStreamTrackEvent";
-  "MediaStreamTrackGenerator";
-  "MediaStreamTrackProcessor";
-  "MessageChannel";
-  "MessageEvent";
-  "MessagePort";
-  "MimeType";
-  "MimeTypeArray";
-  "MouseEvent";
-  "MutationEvent";
-  "MutationObserver";
-  "MutationRecord";
-  "NaN";
-  "NamedNodeMap";
-  "NavigateEvent";
-  "Navigation";
-  "NavigationCurrentEntryChangeEvent";
-  "NavigationDestination";
-  "NavigationHistoryEntry";
-  "NavigationTransition";
-  "Navigator";
-  "NavigatorUAData";
-  "NetworkInformation";
-  "Node";
-  "NodeFilter";
-  "NodeIterator";
-  "NodeList";
-  "Notification";
-  "Number";
-  "Object";
-  "OfflineAudioCompletionEvent";
-  "OfflineAudioContext";
-  "OffscreenCanvas";
-  "OffscreenCanvasRenderingContext2D";
-  "Option";
-  "OscillatorNode";
-  "OverconstrainedError";
-  "PageTransitionEvent";
-  "PannerNode";
-  "Path2D";
-  "PaymentManager";
-  "PaymentRequestUpdateEvent";
-  "Performance";
-  "PerformanceElementTiming";
-  "PerformanceEntry";
-  "PerformanceEventTiming";
-  "PerformanceLongTaskTiming";
-  "PerformanceMark";
-  "PerformanceMeasure";
-  "PerformanceNavigation";
-  "PerformanceNavigationTiming";
-  "PerformanceObserver";
-  "PerformanceObserverEntryList";
-  "PerformancePaintTiming";
-  "PerformanceResourceTiming";
-  "PerformanceServerTiming";
-  "PerformanceTiming";
-  "PeriodicSyncManager";
-  "PeriodicWave";
-  "PermissionStatus";
-  "Permissions";
-  "PictureInPictureEvent";
-  "PictureInPictureWindow";
-  "Plugin";
-  "PluginArray";
-  "PointerEvent";
-  "PopStateEvent";
-  "ProcessingInstruction";
-  "Profiler";
-  "ProgressEvent";
-  "Promise";
-  "PromiseRejectionEvent";
-  "Proxy";
-  "PushManager";
-  "PushSubscription";
-  "PushSubscriptionOptions";
-  "RTCCertificate";
-  "RTCDTMFSender";
-  "RTCDTMFToneChangeEvent";
-  "RTCDataChannel";
-  "RTCDataChannelEvent";
-  "RTCDtlsTransport";
-  "RTCEncodedAudioFrame";
-  "RTCEncodedVideoFrame";
-  "RTCError";
-  "RTCErrorEvent";
-  "RTCIceCandidate";
-  "RTCIceTransport";
-  "RTCPeerConnection";
-  "RTCPeerConnectionIceErrorEvent";
-  "RTCPeerConnectionIceEvent";
-  "RTCRtpReceiver";
-  "RTCRtpSender";
-  "RTCRtpTransceiver";
-  "RTCSctpTransport";
-  "RTCSessionDescription";
-  "RTCStatsReport";
-  "RTCTrackEvent";
-  "RadioNodeList";
-  "Range";
-  "RangeError";
-  "ReadableByteStreamController";
-  "ReadableStream";
-  "ReadableStreamBYOBReader";
-  "ReadableStreamBYOBRequest";
-  "ReadableStreamDefaultController";
-  "ReadableStreamDefaultReader";
-  "ReferenceError";
-  "Reflect";
-  "RegExp";
-  "RemotePlayback";
-  "ReportingObserver";
-  "Request";
-  "ResizeObserver";
-  "ResizeObserverEntry";
-  "ResizeObserverSize";
-  "Response";
-  "SVGAElement";
-  "SVGAngle";
-  "SVGAnimateElement";
-  "SVGAnimateMotionElement";
-  "SVGAnimateTransformElement";
-  "SVGAnimatedAngle";
-  "SVGAnimatedBoolean";
-  "SVGAnimatedEnumeration";
-  "SVGAnimatedInteger";
-  "SVGAnimatedLength";
-  "SVGAnimatedLengthList";
-  "SVGAnimatedNumber";
-  "SVGAnimatedNumberList";
-  "SVGAnimatedPreserveAspectRatio";
-  "SVGAnimatedRect";
-  "SVGAnimatedString";
-  "SVGAnimatedTransformList";
-  "SVGAnimationElement";
-  "SVGCircleElement";
-  "SVGClipPathElement";
-  "SVGComponentTransferFunctionElement";
-  "SVGDefsElement";
-  "SVGDescElement";
-  "SVGElement";
-  "SVGEllipseElement";
-  "SVGFEBlendElement";
-  "SVGFEColorMatrixElement";
-  "SVGFEComponentTransferElement";
-  "SVGFECompositeElement";
-  "SVGFEConvolveMatrixElement";
-  "SVGFEDiffuseLightingElement";
-  "SVGFEDisplacementMapElement";
-  "SVGFEDistantLightElement";
-  "SVGFEDropShadowElement";
-  "SVGFEFloodElement";
-  "SVGFEFuncAElement";
-  "SVGFEFuncBElement";
-  "SVGFEFuncGElement";
-  "SVGFEFuncRElement";
-  "SVGFEGaussianBlurElement";
-  "SVGFEImageElement";
-  "SVGFEMergeElement";
-  "SVGFEMergeNodeElement";
-  "SVGFEMorphologyElement";
-  "SVGFEOffsetElement";
-  "SVGFEPointLightElement";
-  "SVGFESpecularLightingElement";
-  "SVGFESpotLightElement";
-  "SVGFETileElement";
-  "SVGFETurbulenceElement";
-  "SVGFilterElement";
-  "SVGForeignObjectElement";
-  "SVGGElement";
-  "SVGGeometryElement";
-  "SVGGradientElement";
-  "SVGGraphicsElement";
-  "SVGImageElement";
-  "SVGLength";
-  "SVGLengthList";
-  "SVGLineElement";
-  "SVGLinearGradientElement";
-  "SVGMPathElement";
-  "SVGMarkerElement";
-  "SVGMaskElement";
-  "SVGMatrix";
-  "SVGMetadataElement";
-  "SVGNumber";
-  "SVGNumberList";
-  "SVGPathElement";
-  "SVGPatternElement";
-  "SVGPoint";
-  "SVGPointList";
-  "SVGPolygonElement";
-  "SVGPolylineElement";
-  "SVGPreserveAspectRatio";
-  "SVGRadialGradientElement";
-  "SVGRect";
-  "SVGRectElement";
-  "SVGSVGElement";
-  "SVGScriptElement";
-  "SVGSetElement";
-  "SVGStopElement";
-  "SVGStringList";
-  "SVGStyleElement";
-  "SVGSwitchElement";
-  "SVGSymbolElement";
-  "SVGTSpanElement";
-  "SVGTextContentElement";
-  "SVGTextElement";
-  "SVGTextPathElement";
-  "SVGTextPositioningElement";
-  "SVGTitleElement";
-  "SVGTransform";
-  "SVGTransformList";
-  "SVGUnitTypes";
-  "SVGUseElement";
-  "SVGViewElement";
-  "Scheduler";
-  "Scheduling";
-  "Screen";
-  "ScreenOrientation";
-  "ScriptProcessorNode";
-  "ScrollTimeline";
-  "SecurityPolicyViolationEvent";
-  "Selection";
-  "Set";
-  "ShadowRoot";
-  "SharedWorker";
-  "SourceBuffer";
-  "SourceBufferList";
-  "SpeechSynthesisErrorEvent";
-  "SpeechSynthesisEvent";
-  "SpeechSynthesisUtterance";
-  "StaticRange";
-  "StereoPannerNode";
-  "Storage";
-  "StorageEvent";
-  "String";
-  "StylePropertyMap";
-  "StylePropertyMapReadOnly";
-  "StyleSheet";
-  "StyleSheetList";
-  "SubmitEvent";
-  "Symbol";
-  "SyncManager";
-  "SyntaxError";
-  "TaskAttributionTiming";
-  "TaskController";
-  "TaskPriorityChangeEvent";
-  "TaskSignal";
-  "Text";
-  "TextDecoder";
-  "TextDecoderStream";
-  "TextEncoder";
-  "TextEncoderStream";
-  "TextEvent";
-  "TextMetrics";
-  "TextTrack";
-  "TextTrackCue";
-  "TextTrackCueList";
-  "TextTrackList";
-  "TimeRanges";
-  "ToggleEvent";
-  "Touch";
-  "TouchEvent";
-  "TouchList";
-  "TrackEvent";
-  "TransformStream";
-  "TransformStreamDefaultController";
-  "TransitionEvent";
-  "TreeWalker";
-  "TrustedHTML";
-  "TrustedScript";
-  "TrustedScriptURL";
-  "TrustedTypePolicy";
-  "TrustedTypePolicyFactory";
-  "TypeError";
-  "UIEvent";
-  "URIError";
-  "URL";
-  "URLPattern";
-  "URLSearchParams";
-  "Uint16Array";
-  "Uint32Array";
-  "Uint8Array";
-  "Uint8ClampedArray";
-  "UserActivation";
-  "VTTCue";
-  "ValidityState";
-  "VideoColorSpace";
-  "VideoFrame";
-  "VideoPlaybackQuality";
-  "ViewTimeline";
-  "ViewTransition";
-  "VirtualKeyboardGeometryChangeEvent";
-  "VisibilityStateEntry";
-  "VisualViewport";
-  "WaveShaperNode";
-  "WeakMap";
-  "WeakRef";
-  "WeakSet";
-  "WebAssembly";
-  "WebGL2RenderingContext";
-  "WebGLActiveInfo";
-  "WebGLBuffer";
-  "WebGLContextEvent";
-  "WebGLFramebuffer";
-  "WebGLProgram";
-  "WebGLQuery";
-  "WebGLRenderbuffer";
-  "WebGLRenderingContext";
-  "WebGLSampler";
-  "WebGLShader";
-  "WebGLShaderPrecisionFormat";
-  "WebGLSync";
-  "WebGLTexture";
-  "WebGLTransformFeedback";
-  "WebGLUniformLocation";
-  "WebGLVertexArrayObject";
-  "WebKitCSSMatrix";
-  "WebKitMutationObserver";
-  "WebSocket";
-  "WheelEvent";
-  "Window";
-  "WindowControlsOverlay";
-  "WindowControlsOverlayGeometryChangeEvent";
-  "Worker";
-  "WritableStream";
-  "WritableStreamDefaultController";
-  "WritableStreamDefaultWriter";
-  "XDomainRequest";
-  "XMLDocument";
-  "XMLHttpRequest";
-  "XMLHttpRequestEventTarget";
-  "XMLHttpRequestUpload";
-  "XMLSerializer";
-  "XPathEvaluator";
-  "XPathExpression";
-  "XPathResult";
-  "XSLTProcessor";
-  "__dirname";
-  "__esModule";
-  "__filename";
-  "abstract";
-  "arguments";
-  "await";
-  "boolean";
-  "break";
-  "byte";
-  "case";
-  "catch";
-  "char";
-  "class";
-  "clearImmediate";
-  "clearInterval";
-  "clearTimeout";
-  "console";
-  "const";
-  "continue";
-  "debugger";
-  "decodeURI";
-  "decodeURIComponent";
-  "default";
-  "delete";
-  "do";
-  "document";
-  "double";
-  "else";
-  "encodeURI";
-  "encodeURIComponent";
-  "enum";
-  "escape";
-  "eval";
-  "event";
-  "export";
-  "exports";
-  "extends";
-  "false";
-  "fetch";
-  "final";
-  "finally";
-  "float";
-  "for";
-  "function";
-  "global";
-  "goto";
-  "if";
-  "implements";
-  "import";
-  "in";
-  "instanceof";
-  "int";
-  "interface";
-  "isFinite";
-  "isNaN";
-  "let";
-  "location";
-  "long";
-  "module";
-  "native";
-  "navigator";
-  "new";
-  "null";
-  "package";
-  "parseFloat";
-  "parseInt";
-  "private";
-  "process";
-  "protected";
-  "public";
-  "require";
-  "return";
-  "setImmediate";
-  "setInterval";
-  "setTimeout";
-  "short";
-  "static";
-  "super";
-  "switch";
-  "synchronized";
-  "this";
-  "throw";
-  "transient";
-  "true";
-  "try";
-  "typeof";
-  "undefined";
-  "unescape";
-  "var";
-  "void";
-  "volatile";
-  "while";
-  "window";
-  "with";
-  "yield";
-  |]
-
-
-type element = string 
-
-let rec binarySearchAux (arr : element array) (lo : int) (hi : int) key : bool =   
-    let mid = (lo + hi)/2 in 
-    let midVal = Array.unsafe_get arr mid in 
-    (* let c = cmp key midVal [@bs] in  *)
-    if key = midVal then true 
-    else if key < midVal then  (*  a[lo] =< key < a[mid] <= a[hi] *)
-      if hi = mid then  
-        (Array.unsafe_get arr lo) = key 
-      else binarySearchAux arr lo mid key 
-    else  (*  a[lo] =< a[mid] < key <= a[hi] *)
-      if lo = mid then 
-        (Array.unsafe_get arr hi) = key 
-      else binarySearchAux arr mid hi key 
-
-let binarySearch (sorted : element array) (key : element)  : bool =  
-  let len = Array.length sorted in 
-  if len = 0 then false
-  else 
-    let lo = Array.unsafe_get sorted 0 in 
-    (* let c = cmp key lo [@bs] in  *)
-    if key < lo then false
-    else
-    let hi = Array.unsafe_get sorted (len - 1) in 
-    (* let c2 = cmp key hi [@bs]in  *)
-    if key > hi then false
-    else binarySearchAux sorted 0 (len - 1) key 
-
-let is_reserved s = binarySearch sorted_keywords s     
diff --git a/jscomp/ext/js_runtime_modules.ml b/jscomp/ext/js_runtime_modules.ml
deleted file mode 100644
index 9c2b3b9..0000000
--- a/jscomp/ext/js_runtime_modules.ml
+++ /dev/null
@@ -1,72 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let exceptions = "Caml_exceptions"
-
-let io = "Caml_io"
-
-let sys = "Caml_sys"
-
-let lexer = "Caml_lexer"
-
-let parser = "Caml_parser"
-
-let obj_runtime = "Caml_obj"
-
-let array = "Caml_array"
-
-let format = "Caml_format"
-
-let string = "Caml_string"
-
-let bytes = "Caml_bytes"
-let bytes_ = "Bytes"
-
-let float = "Caml_float"
-
-let hash_primitive = "Caml_hash_primitive"
-
-let hash = "Caml_hash"
-
-let curry = "Curry"
-
-let caml_primitive = "Caml"
-
-let int64 = "Caml_int64"
-
-let md5 = "Caml_md5"
-
-let int32 = "Caml_int32"
-
-let bigint = "Caml_bigint"
-
-let option = "Caml_option"
-
-let module_ = "Caml_module"
-
-let external_polyfill = "Caml_external_polyfill"
-
-let caml_js_exceptions = "Caml_js_exceptions"
-
-let caml_splice_call = "Caml_splice_call"
diff --git a/jscomp/ext/map_gen.ml b/jscomp/ext/map_gen.ml
deleted file mode 100644
index ecd0aa3..0000000
--- a/jscomp/ext/map_gen.ml
+++ /dev/null
@@ -1,403 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the GNU Library General Public License, with    *)
-(*  the special exception on linking described in file ../LICENSE.     *)
-(*                                                                     *)
-(***********************************************************************)
-
-[@@@warnerror "+55"]
-(* adapted from stdlib *)
-
-type ('key, 'a) t0 =
-  | Empty
-  | Leaf of { k : 'key; v : 'a }
-  | Node of { l : ('key, 'a) t0; k : 'key; v : 'a; r : ('key, 'a) t0; h : int }
-
-type ('key, 'a) parital_node = {
-  l : ('key, 'a) t0;
-  k : 'key;
-  v : 'a;
-  r : ('key, 'a) t0;
-  h : int;
-}
-
-external ( ~! ) : ('key, 'a) t0 -> ('key, 'a) parital_node = "%identity"
-
-let empty = Empty
-
-let rec map x f =
-  match x with
-  | Empty -> Empty
-  | Leaf { k; v } -> Leaf { k; v = f v }
-  | Node ({ l; v; r } as x) ->
-      let l' = map l f in
-      let d' = f v in
-      let r' = map r f in
-      Node { x with l = l'; v = d'; r = r' }
-
-let rec mapi x f =
-  match x with
-  | Empty -> Empty
-  | Leaf { k; v } -> Leaf { k; v = f k v }
-  | Node ({ l; k; v; r } as x) ->
-      let l' = mapi l f in
-      let v' = f k v in
-      let r' = mapi r f in
-      Node { x with l = l'; v = v'; r = r' }
-
-let[@inline] calc_height a b = (if a >= b then a else b) + 1
-
-let[@inline] singleton k v = Leaf { k; v }
-
-let[@inline] height = function Empty -> 0 | Leaf _ -> 1 | Node { h } -> h
-
-let[@inline] unsafe_node k v l r h = Node { l; k; v; r; h }
-
-let[@inline] unsafe_two_elements k1 v1 k2 v2 =
-  unsafe_node k2 v2 (singleton k1 v1) empty 2
-
-let[@inline] unsafe_node_maybe_leaf k v l r h =
-  if h = 1 then Leaf { k; v } else Node { l; k; v; r; h }
-
-type ('key, +'a) t = ('key, 'a) t0 = private
-  | Empty
-  | Leaf of { k : 'key; v : 'a }
-  | Node of { l : ('key, 'a) t; k : 'key; v : 'a; r : ('key, 'a) t; h : int }
-
-let rec cardinal_aux acc = function
-  | Empty -> acc
-  | Leaf _ -> acc + 1
-  | Node { l; r } -> cardinal_aux (cardinal_aux (acc + 1) r) l
-
-let cardinal s = cardinal_aux 0 s
-
-let rec bindings_aux accu = function
-  | Empty -> accu
-  | Leaf { k; v } -> (k, v) :: accu
-  | Node { l; k; v; r } -> bindings_aux ((k, v) :: bindings_aux accu r) l
-
-let bindings s = bindings_aux [] s
-
-let rec fill_array_with_f (s : _ t) i arr f : int =
-  match s with
-  | Empty -> i
-  | Leaf { k; v } ->
-      Array.unsafe_set arr i (f k v);
-      i + 1
-  | Node { l; k; v; r } ->
-      let inext = fill_array_with_f l i arr f in
-      Array.unsafe_set arr inext (f k v);
-      fill_array_with_f r (inext + 1) arr f
-
-let rec fill_array_aux (s : _ t) i arr : int =
-  match s with
-  | Empty -> i
-  | Leaf { k; v } ->
-      Array.unsafe_set arr i (k, v);
-      i + 1
-  | Node { l; k; v; r } ->
-      let inext = fill_array_aux l i arr in
-      Array.unsafe_set arr inext (k, v);
-      fill_array_aux r (inext + 1) arr
-
-let to_sorted_array (s : ('key, 'a) t) : ('key * 'a) array =
-  match s with
-  | Empty -> [||]
-  | Leaf { k; v } -> [| (k, v) |]
-  | Node { l; k; v; r } ->
-      let len = cardinal_aux (cardinal_aux 1 r) l in
-      let arr = Array.make len (k, v) in
-      ignore (fill_array_aux s 0 arr : int);
-      arr
-
-let to_sorted_array_with_f (type key a b) (s : (key, a) t) (f : key -> a -> b) :
-    b array =
-  match s with
-  | Empty -> [||]
-  | Leaf { k; v } -> [| f k v |]
-  | Node { l; k; v; r } ->
-      let len = cardinal_aux (cardinal_aux 1 r) l in
-      let arr = Array.make len (f k v) in
-      ignore (fill_array_with_f s 0 arr f : int);
-      arr
-
-let rec keys_aux accu = function
-  | Empty -> accu
-  | Leaf { k } -> k :: accu
-  | Node { l; k; r } -> keys_aux (k :: keys_aux accu r) l
-
-let keys s = keys_aux [] s
-
-let bal l x d r =
-  let hl = height l in
-  let hr = height r in
-  if hl > hr + 2 then
-    let { l = ll; r = lr; v = lv; k = lk; h = _ } = ~!l in
-    let hll = height ll in
-    let hlr = height lr in
-    if hll >= hlr then
-      let hnode = calc_height hlr hr in
-      unsafe_node lk lv ll
-        (unsafe_node_maybe_leaf x d lr r hnode)
-        (calc_height hll hnode)
-    else
-      let { l = lrl; r = lrr; k = lrk; v = lrv } = ~!lr in
-      let hlrl = height lrl in
-      let hlrr = height lrr in
-      let hlnode = calc_height hll hlrl in
-      let hrnode = calc_height hlrr hr in
-      unsafe_node lrk lrv
-        (unsafe_node_maybe_leaf lk lv ll lrl hlnode)
-        (unsafe_node_maybe_leaf x d lrr r hrnode)
-        (calc_height hlnode hrnode)
-  else if hr > hl + 2 then
-    let { l = rl; r = rr; k = rk; v = rv } = ~!r in
-    let hrr = height rr in
-    let hrl = height rl in
-    if hrr >= hrl then
-      let hnode = calc_height hl hrl in
-      unsafe_node rk rv
-        (unsafe_node_maybe_leaf x d l rl hnode)
-        rr (calc_height hnode hrr)
-    else
-      let { l = rll; r = rlr; k = rlk; v = rlv } = ~!rl in
-      let hrll = height rll in
-      let hrlr = height rlr in
-      let hlnode = calc_height hl hrll in
-      let hrnode = calc_height hrlr hrr in
-      unsafe_node rlk rlv
-        (unsafe_node_maybe_leaf x d l rll hlnode)
-        (unsafe_node_maybe_leaf rk rv rlr rr hrnode)
-        (calc_height hlnode hrnode)
-  else unsafe_node_maybe_leaf x d l r (calc_height hl hr)
-
-let[@inline] is_empty = function Empty -> true | _ -> false
-
-let rec min_binding_exn = function
-  | Empty -> raise Not_found
-  | Leaf { k; v } -> (k, v)
-  | Node { l; k; v } -> (
-      match l with Empty -> (k, v) | Leaf _ | Node _ -> min_binding_exn l)
-
-let rec remove_min_binding = function
-  | Empty -> invalid_arg "Map.remove_min_elt"
-  | Leaf _ -> empty
-  | Node { l = Empty; r } -> r
-  | Node { l; k; v; r } -> bal (remove_min_binding l) k v r
-
-let merge t1 t2 =
-  match (t1, t2) with
-  | Empty, t -> t
-  | t, Empty -> t
-  | _, _ ->
-      let x, d = min_binding_exn t2 in
-      bal t1 x d (remove_min_binding t2)
-
-let rec iter x f =
-  match x with
-  | Empty -> ()
-  | Leaf { k; v } -> (f k v : unit)
-  | Node { l; k; v; r } ->
-      iter l f;
-      f k v;
-      iter r f
-
-let rec fold m accu f =
-  match m with
-  | Empty -> accu
-  | Leaf { k; v } -> f k v accu
-  | Node { l; k; v; r } -> fold r (f k v (fold l accu f)) f
-
-let rec for_all x p =
-  match x with
-  | Empty -> true
-  | Leaf { k; v } -> p k v
-  | Node { l; k; v; r } -> p k v && for_all l p && for_all r p
-
-let rec exists x p =
-  match x with
-  | Empty -> false
-  | Leaf { k; v } -> p k v
-  | Node { l; k; v; r } -> p k v || exists l p || exists r p
-
-(* Beware: those two functions assume that the added k is *strictly*
-   smaller (or bigger) than all the present keys in the tree; it
-   does not test for equality with the current min (or max) key.
-
-   Indeed, they are only used during the "join" operation which
-   respects this precondition.
-*)
-
-let rec add_min k v = function
-  | Empty -> singleton k v
-  | Leaf l -> unsafe_two_elements k v l.k l.v
-  | Node tree -> bal (add_min k v tree.l) tree.k tree.v tree.r
-
-let rec add_max k v = function
-  | Empty -> singleton k v
-  | Leaf l -> unsafe_two_elements l.k l.v k v
-  | Node tree -> bal tree.l tree.k tree.v (add_max k v tree.r)
-
-(* Same as create and bal, but no assumptions are made on the
-   relative heights of l and r. *)
-
-let rec join l v d r =
-  match l with
-  | Empty -> add_min v d r
-  | Leaf leaf -> add_min leaf.k leaf.v (add_min v d r)
-  | Node xl -> (
-      match r with
-      | Empty -> add_max v d l
-      | Leaf leaf -> add_max leaf.k leaf.v (add_max v d l)
-      | Node xr ->
-          let lh = xl.h in
-          let rh = xr.h in
-          if lh > rh + 2 then bal xl.l xl.k xl.v (join xl.r v d r)
-          else if rh > lh + 2 then bal (join l v d xr.l) xr.k xr.v xr.r
-          else unsafe_node v d l r (calc_height lh rh))
-
-(* Merge two trees l and r into one.
-   All elements of l must precede the elements of r.
-   No assumption on the heights of l and r. *)
-
-let concat t1 t2 =
-  match (t1, t2) with
-  | Empty, t -> t
-  | t, Empty -> t
-  | _, _ ->
-      let x, d = min_binding_exn t2 in
-      join t1 x d (remove_min_binding t2)
-
-let concat_or_join t1 v d t2 =
-  match d with Some d -> join t1 v d t2 | None -> concat t1 t2
-
-module type S = sig
-  type key
-
-  type +'a t
-
-  val empty : 'a t
-
-  val compare_key : key -> key -> int
-
-  val is_empty : 'a t -> bool
-
-  val mem : 'a t -> key -> bool
-
-  val to_sorted_array : 'a t -> (key * 'a) array
-
-  val to_sorted_array_with_f : 'a t -> (key -> 'a -> 'b) -> 'b array
-
-  val add : 'a t -> key -> 'a -> 'a t
-  (** [add x y m] 
-      If [x] was already bound in [m], its previous binding disappears. *)
-
-  val adjust : 'a t -> key -> ('a option -> 'a) -> 'a t
-  (** [adjust acc k replace ] if not exist [add (replace None ], otherwise 
-      [add k v (replace (Some old))]
-  *)
-
-  val singleton : key -> 'a -> 'a t
-
-  val remove : 'a t -> key -> 'a t
-  (** [remove x m] returns a map containing the same bindings as
-      [m], except for [x] which is unbound in the returned map. *)
-
-  (* val merge:
-       'a t -> 'b t ->
-       (key -> 'a option -> 'b option -> 'c option) ->  'c t *)
-  (** [merge f m1 m2] computes a map whose keys is a subset of keys of [m1]
-      and of [m2]. The presence of each such binding, and the corresponding
-      value, is determined with the function [f].
-      @since 3.12.0
-  *)
-
-  val disjoint_merge_exn : 'a t -> 'a t -> (key -> 'a -> 'a -> exn) -> 'a t
-  (* merge two maps, will raise if they have the same key *)
-
-  val iter : 'a t -> (key -> 'a -> unit) -> unit
-  (** [iter f m] applies [f] to all bindings in map [m].
-      The bindings are passed to [f] in increasing order. *)
-
-  val fold : 'a t -> 'b -> (key -> 'a -> 'b -> 'b) -> 'b
-  (** [fold f m a] computes [(f kN dN ... (f k1 d1 a)...)],
-      where [k1 ... kN] are the keys of all bindings in [m]
-      (in increasing order) *)
-
-  val for_all : 'a t -> (key -> 'a -> bool) -> bool
-  (** [for_all p m] checks if all the bindings of the map.
-      order unspecified
-  *)
-
-  val exists : 'a t -> (key -> 'a -> bool) -> bool
-  (** [exists p m] checks if at least one binding of the map
-      satisfy the predicate [p]. 
-      order unspecified
-  *)
-
-  (* val filter: 'a t -> (key -> 'a -> bool) -> 'a t *)
-  (** [filter p m] returns the map with all the bindings in [m]
-      that satisfy predicate [p].
-      order unspecified
-  *)
-
-  (* val partition: 'a t -> (key -> 'a -> bool) ->  'a t * 'a t *)
-  (** [partition p m] returns a pair of maps [(m1, m2)], where
-      [m1] contains all the bindings of [s] that satisfy the
-      predicate [p], and [m2] is the map with all the bindings of
-      [s] that do not satisfy [p].
-  *)
-
-  val cardinal : 'a t -> int
-  (** Return the number of bindings of a map. *)
-
-  val bindings : 'a t -> (key * 'a) list
-  (** Return the list of all bindings of the given map.
-      The returned list is sorted in increasing order with respect
-      to the ordering *)
-
-  val keys : 'a t -> key list
-  (* Increasing order *)
-
-  (* val split: 'a t -> key -> 'a t * 'a option * 'a t *)
-  (** [split x m] returns a triple [(l, data, r)], where
-        [l] is the map with all the bindings of [m] whose key
-      is strictly less than [x];
-        [r] is the map with all the bindings of [m] whose key
-      is strictly greater than [x];
-        [data] is [None] if [m] contains no binding for [x],
-        or [Some v] if [m] binds [v] to [x].
-      @since 3.12.0
-  *)
-
-  val find_exn : 'a t -> key -> 'a
-  (** [find x m] returns the current binding of [x] in [m],
-      or raises [Not_found] if no such binding exists. *)
-
-  val find_opt : 'a t -> key -> 'a option
-
-  val find_default : 'a t -> key -> 'a -> 'a
-
-  val map : 'a t -> ('a -> 'b) -> 'b t
-  (** [map f m] returns a map with same domain as [m], where the
-      associated value [a] of all bindings of [m] has been
-      replaced by the result of the application of [f] to [a].
-      The bindings are passed to [f] in increasing order
-      with respect to the ordering over the type of the keys. *)
-
-  val mapi : 'a t -> (key -> 'a -> 'b) -> 'b t
-  (** Same as {!Map.S.map}, but the function receives as arguments both the
-      key and the associated value for each binding of the map. *)
-
-  val of_list : (key * 'a) list -> 'a t
-
-  val of_array : (key * 'a) array -> 'a t
-
-  val add_list : (key * 'b) list -> 'b t -> 'b t
-end
diff --git a/jscomp/ext/misc.ml b/jscomp/ext/misc.ml
deleted file mode 100644
index 33ca3ee..0000000
--- a/jscomp/ext/misc.ml
+++ /dev/null
@@ -1,746 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Errors *)
-
-exception Fatal_error
-
-
-
-let fatal_error msg =
-  prerr_string ">> Fatal error: "; prerr_endline msg; raise Fatal_error
-
-let fatal_errorf fmt = Format.kasprintf fatal_error fmt
-
-(* Exceptions *)
-
-let try_finally work cleanup =
-  let result = (try work () with e -> cleanup (); raise e) in
-  cleanup ();
-  result
-;;
-
-type ref_and_value = R : 'a ref * 'a -> ref_and_value
-
-let protect_refs =
-  let set_refs l = List.iter (fun (R (r, v)) -> r := v) l in
-  fun refs f ->
-    let backup = List.map (fun (R (r, _)) -> R (r, !r)) refs in
-    set_refs refs;
-    match f () with
-    | x           -> set_refs backup; x
-    | exception e -> set_refs backup; raise e
-
-(* List functions *)
-
-let rec map_end f l1 l2 =
-  match l1 with
-    [] -> l2
-  | hd::tl -> f hd :: map_end f tl l2
-
-let rec map_left_right f = function
-    [] -> []
-  | hd::tl -> let res = f hd in res :: map_left_right f tl
-
-let rec for_all2 pred l1 l2 =
-  match (l1, l2) with
-    ([], []) -> true
-  | (hd1::tl1, hd2::tl2) -> pred hd1 hd2 && for_all2 pred tl1 tl2
-  | (_, _) -> false
-
-let rec replicate_list elem n =
-  if n <= 0 then [] else elem :: replicate_list elem (n-1)
-
-let rec list_remove x = function
-    [] -> []
-  | hd :: tl ->
-      if hd = x then tl else hd :: list_remove x tl
-
-let rec split_last = function
-    [] -> assert false
-  | [x] -> ([], x)
-  | hd :: tl ->
-      let (lst, last) = split_last tl in
-      (hd :: lst, last)
-
-module Stdlib = struct
-  module List = struct
-    type 'a t = 'a list
-
-    let rec compare cmp l1 l2 =
-      match l1, l2 with
-      | [], [] -> 0
-      | [], _::_ -> -1
-      | _::_, [] -> 1
-      | h1::t1, h2::t2 ->
-        let c = cmp h1 h2 in
-        if c <> 0 then c
-        else compare cmp t1 t2
-
-    let rec equal eq l1 l2 =
-      match l1, l2 with
-      | ([], []) -> true
-      | (hd1 :: tl1, hd2 :: tl2) -> eq hd1 hd2 && equal eq tl1 tl2
-      | (_, _) -> false
-
-    let filter_map f l =
-      let rec aux acc l =
-        match l with
-        | [] -> List.rev acc
-        | h :: t ->
-          match f h with
-          | None -> aux acc t
-          | Some v -> aux (v :: acc) t
-      in
-      aux [] l
-
-    let map2_prefix f l1 l2 =
-      let rec aux acc l1 l2 =
-        match l1, l2 with
-        | [], _ -> (List.rev acc, l2)
-        | _ :: _, [] -> raise (Invalid_argument "map2_prefix")
-        | h1::t1, h2::t2 ->
-          let h = f h1 h2 in
-          aux (h :: acc) t1 t2
-      in
-      aux [] l1 l2
-
-    let some_if_all_elements_are_some l =
-      let rec aux acc l =
-        match l with
-        | [] -> Some (List.rev acc)
-        | None :: _ -> None
-        | Some h :: t -> aux (h :: acc) t
-      in
-      aux [] l
-
-    let split_at n l =
-      let rec aux n acc l =
-        if n = 0
-        then List.rev acc, l
-        else
-          match l with
-          | [] -> raise (Invalid_argument "split_at")
-          | t::q -> aux (n-1) (t::acc) q
-      in
-      aux n [] l
-  end
-
-  module Option = struct
-    type 'a t = 'a option
-
-    let equal eq o1 o2 =
-      match o1, o2 with
-      | None, None -> true
-      | Some e1, Some e2 -> eq e1 e2
-      | _, _ -> false
-
-    let iter f = function
-      | Some x -> f x
-      | None -> ()
-
-    let map f = function
-      | Some x -> Some (f x)
-      | None -> None
-
-    let fold f a b =
-      match a with
-      | None -> b
-      | Some a -> f a b
-
-    let value_default f ~default a =
-      match a with
-      | None -> default
-      | Some a -> f a
-  end
-
-  module Array = struct
-    let exists2 p a1 a2 =
-      let n = Array.length a1 in
-      if Array.length a2 <> n then invalid_arg "Misc.Stdlib.Array.exists2";
-      let rec loop i =
-        if i = n then false
-        else if p (Array.unsafe_get a1 i) (Array.unsafe_get a2 i) then true
-        else loop (succ i) in
-      loop 0
-  end
-end
-
-let may = Stdlib.Option.iter
-let may_map = Stdlib.Option.map
-
-(* File functions *)
-
-let find_in_path path name =
-  if not (Filename.is_implicit name) then
-    if Sys.file_exists name then name else raise Not_found
-  else begin
-    let rec try_dir = function
-      [] -> raise Not_found
-    | dir::rem ->
-        let fullname = Filename.concat dir name in
-        if Sys.file_exists fullname then fullname else try_dir rem
-    in try_dir path
-  end
-
-let find_in_path_rel path name =
-  let rec simplify s =
-    let open Filename in
-    let base = basename s in
-    let dir = dirname s in
-    if dir = s then dir
-    else if base = current_dir_name then simplify dir
-    else concat (simplify dir) base
-  in
-  let rec try_dir = function
-    [] -> raise Not_found
-  | dir::rem ->
-      let fullname = simplify (Filename.concat dir name) in
-      if Sys.file_exists fullname then fullname else try_dir rem
-  in try_dir path
-
-let find_in_path_uncap path name =
-  let uname = String.uncapitalize_ascii name in
-  let rec try_dir = function
-    [] -> raise Not_found
-  | dir::rem ->
-      let fullname = Filename.concat dir name
-      and ufullname = Filename.concat dir uname in
-      if Sys.file_exists ufullname then ufullname
-      else if Sys.file_exists fullname then fullname
-      else try_dir rem
-  in try_dir path
-
-let remove_file filename =
-  try
-    if Sys.file_exists filename
-    then Sys.remove filename
-  with Sys_error _msg ->
-    ()
-
-(* Expand a -I option: if it starts with +, make it relative to the standard
-   library directory *)
-
-let expand_directory alt s =
-  if String.length s > 0 && s.[0] = '+'
-  then Filename.concat alt
-                       (String.sub s 1 (String.length s - 1))
-  else s
-
-(* Hashtable functions *)
-
-let create_hashtable size init =
-  let tbl = Hashtbl.create size in
-  List.iter (fun (key, data) -> Hashtbl.add tbl key data) init;
-  tbl
-
-(* File copy *)
-
-let copy_file ic oc =
-  let buff = Bytes.create 0x1000 in
-  let rec copy () =
-    let n = input ic buff 0 0x1000 in
-    if n = 0 then () else (output oc buff 0 n; copy())
-  in copy()
-
-let copy_file_chunk ic oc len =
-  let buff = Bytes.create 0x1000 in
-  let rec copy n =
-    if n <= 0 then () else begin
-      let r = input ic buff 0 (min n 0x1000) in
-      if r = 0 then raise End_of_file else (output oc buff 0 r; copy(n-r))
-    end
-  in copy len
-
-let string_of_file ic =
-  let b = Buffer.create 0x10000 in
-  let buff = Bytes.create 0x1000 in
-  let rec copy () =
-    let n = input ic buff 0 0x1000 in
-    if n = 0 then Buffer.contents b else
-      (Buffer.add_subbytes b buff 0 n; copy())
-  in copy()
-
-let output_to_bin_file_directly filename fn =  
-  let oc = open_out_bin filename in 
-  match fn filename oc with 
-  | v -> close_out oc ; v 
-  | exception e -> close_out oc ; raise e
-
-let output_to_file_via_temporary ?(mode = [Open_text]) filename fn =
-  let (temp_filename, oc) =
-    Filename.open_temp_file
-       ~mode ~perms:0o666 ~temp_dir:(Filename.dirname filename)
-       (Filename.basename filename) ".tmp" in
-    (* The 0o666 permissions will be modified by the umask.  It's just
-       like what [open_out] and [open_out_bin] do.
-       With temp_dir = dirname filename, we ensure that the returned
-       temp file is in the same directory as filename itself, making
-       it safe to rename temp_filename to filename later.
-       With prefix = basename filename, we are almost certain that
-       the first generated name will be unique.  A fixed prefix
-       would work too but might generate more collisions if many
-       files are being produced simultaneously in the same directory. *)
-  match fn temp_filename oc with
-  | res ->
-      close_out oc;
-      begin try
-        Sys.rename temp_filename filename; res
-      with exn ->
-        remove_file temp_filename; raise exn
-      end
-  | exception exn ->
-      close_out oc; remove_file temp_filename; raise exn
-
-(* Integer operations *)
-
-let rec log2 n =
-  if n <= 1 then 0 else 1 + log2(n asr 1)
-
-let align n a =
-  if n >= 0 then (n + a - 1) land (-a) else n land (-a)
-
-let no_overflow_add a b = (a lxor b) lor (a lxor (lnot (a+b))) < 0
-
-let no_overflow_sub a b = (a lxor (lnot b)) lor (b lxor (a-b)) < 0
-
-let no_overflow_mul a b = b <> 0 && (a * b) / b = a
-
-let no_overflow_lsl a k =
-  0 <= k && k < Sys.word_size && min_int asr k <= a && a <= max_int asr k
-
-module Int_literal_converter = struct
-  (* To convert integer literals, allowing max_int + 1 (PR#4210) *)
-  let cvt_int_aux str neg of_string =
-    if String.length str = 0 || str.[0]= '-'
-    then of_string str
-    else neg (of_string ("-" ^ str))
-  let int s = cvt_int_aux s (~-) int_of_string
-  let int32 s = cvt_int_aux s Int32.neg Int32.of_string
-  let int64 s = cvt_int_aux s Int64.neg Int64.of_string
-end
-
-(* String operations *)
-
-let chop_extensions file =
-  let dirname = Filename.dirname file and basename = Filename.basename file in
-  try
-    let pos = String.index basename '.' in
-    let basename = String.sub basename 0 pos in
-    if Filename.is_implicit file && dirname = Filename.current_dir_name then
-      basename
-    else
-      Filename.concat dirname basename
-  with Not_found -> file
-
-let search_substring pat str start =
-  let rec search i j =
-    if j >= String.length pat then i
-    else if i + j >= String.length str then raise Not_found
-    else if str.[i + j] = pat.[j] then search i (j+1)
-    else search (i+1) 0
-  in search start 0
-
-let replace_substring ~before ~after str =
-  let rec search acc curr =
-    match search_substring before str curr with
-      | next ->
-         let prefix = String.sub str curr (next - curr) in
-         search (prefix :: acc) (next + String.length before)
-      | exception Not_found ->
-        let suffix = String.sub str curr (String.length str - curr) in
-        List.rev (suffix :: acc)
-  in String.concat after (search [] 0)
-
-let rev_split_words s =
-  let rec split1 res i =
-    if i >= String.length s then res else begin
-      match s.[i] with
-        ' ' | '\t' | '\r' | '\n' -> split1 res (i+1)
-      | _ -> split2 res i (i+1)
-    end
-  and split2 res i j =
-    if j >= String.length s then String.sub s i (j-i) :: res else begin
-      match s.[j] with
-        ' ' | '\t' | '\r' | '\n' -> split1 (String.sub s i (j-i) :: res) (j+1)
-      | _ -> split2 res i (j+1)
-    end
-  in split1 [] 0
-
-let get_ref r =
-  let v = !r in
-  r := []; v
-
-let fst3 (x, _, _) = x
-let snd3 (_,x,_) = x
-let thd3 (_,_,x) = x
-
-let fst4 (x, _, _, _) = x
-let snd4 (_,x,_, _) = x
-let thd4 (_,_,x,_) = x
-let for4 (_,_,_,x) = x
-
-
-module LongString = struct
-  type t = bytes array
-
-  let create str_size =
-    let tbl_size = str_size / Sys.max_string_length + 1 in
-    let tbl = Array.make tbl_size Bytes.empty in
-    for i = 0 to tbl_size - 2 do
-      tbl.(i) <- Bytes.create Sys.max_string_length;
-    done;
-    tbl.(tbl_size - 1) <- Bytes.create (str_size mod Sys.max_string_length);
-    tbl
-
-  let length tbl =
-    let tbl_size = Array.length tbl in
-    Sys.max_string_length * (tbl_size - 1) + Bytes.length tbl.(tbl_size - 1)
-
-  let get tbl ind =
-    Bytes.get tbl.(ind / Sys.max_string_length) (ind mod Sys.max_string_length)
-
-  let set tbl ind c =
-    Bytes.set tbl.(ind / Sys.max_string_length) (ind mod Sys.max_string_length)
-              c
-
-  let blit src srcoff dst dstoff len =
-    for i = 0 to len - 1 do
-      set dst (dstoff + i) (get src (srcoff + i))
-    done
-
-  let output oc tbl pos len =
-    for i = pos to pos + len - 1 do
-      output_char oc (get tbl i)
-    done
-
-  let unsafe_blit_to_bytes src srcoff dst dstoff len =
-    for i = 0 to len - 1 do
-      Bytes.unsafe_set dst (dstoff + i) (get src (srcoff + i))
-    done
-
-  let input_bytes ic len =
-    let tbl = create len in
-    Array.iter (fun str -> really_input ic str 0 (Bytes.length str)) tbl;
-    tbl
-end
-
-
-let edit_distance a b cutoff =
-  let la, lb = String.length a, String.length b in
-  let cutoff =
-    (* using max_int for cutoff would cause overflows in (i + cutoff + 1);
-       we bring it back to the (max la lb) worstcase *)
-    min (max la lb) cutoff in
-  if abs (la - lb) > cutoff then None
-  else begin
-    (* initialize with 'cutoff + 1' so that not-yet-written-to cases have
-       the worst possible cost; this is useful when computing the cost of
-       a case just at the boundary of the cutoff diagonal. *)
-    let m = Array.make_matrix (la + 1) (lb + 1) (cutoff + 1) in
-    m.(0).(0) <- 0;
-    for i = 1 to la do
-      m.(i).(0) <- i;
-    done;
-    for j = 1 to lb do
-      m.(0).(j) <- j;
-    done;
-    for i = 1 to la do
-      for j = max 1 (i - cutoff - 1) to min lb (i + cutoff + 1) do
-        let cost = if a.[i-1] = b.[j-1] then 0 else 1 in
-        let best =
-          (* insert, delete or substitute *)
-          min (1 + min m.(i-1).(j) m.(i).(j-1)) (m.(i-1).(j-1) + cost)
-        in
-        let best =
-          (* swap two adjacent letters; we use "cost" again in case of
-             a swap between two identical letters; this is slightly
-             redundant as this is a double-substitution case, but it
-             was done this way in most online implementations and
-             imitation has its virtues *)
-          if not (i > 1 && j > 1 && a.[i-1] = b.[j-2] && a.[i-2] = b.[j-1])
-          then best
-          else min best (m.(i-2).(j-2) + cost)
-        in
-        m.(i).(j) <- best
-      done;
-    done;
-    let result = m.(la).(lb) in
-    if result > cutoff
-    then None
-    else Some result
-  end
-
-let spellcheck env name =
-  let cutoff =
-    match String.length name with
-      | 1 | 2 -> 0
-      | 3 | 4 -> 1
-      | 5 | 6 -> 2
-      | _ -> 3
-  in
-  let compare target acc head =
-    match edit_distance target head cutoff with
-      | None -> acc
-      | Some dist ->
-         let (best_choice, best_dist) = acc in
-         if dist < best_dist then ([head], dist)
-         else if dist = best_dist then (head :: best_choice, dist)
-         else acc
-  in
-  fst (List.fold_left (compare name) ([], max_int) env)
-
-let did_you_mean ppf get_choices =
-  (* flush now to get the error report early, in the (unheard of) case
-     where the search in the get_choices function would take a bit of
-     time; in the worst case, the user has seen the error, she can
-     interrupt the process before the spell-checking terminates. *)
-  Format.fprintf ppf "@?";
-  match get_choices () with
-  | [] -> ()
-  | choices ->
-     let rest, last = split_last choices in
-     Format.fprintf ppf "@\nHint: Did you mean %s%s%s?@?"
-       (String.concat ", " rest)
-       (if rest = [] then "" else " or ")
-       last
-
-let cut_at s c =
-  let pos = String.index s c in
-  String.sub s 0 pos, String.sub s (pos+1) (String.length s - pos - 1)
-
-
-module StringSet = Set.Make(struct type t = string let compare = compare end)
-module StringMap = Map.Make(struct type t = string let compare = compare end)
-
-(* Color handling *)
-module Color = struct
-  (* use ANSI color codes, see https://en.wikipedia.org/wiki/ANSI_escape_code *)
-  type color =
-    | Black
-    | Red
-    | Green
-    | Yellow
-    | Blue
-    | Magenta
-    | Cyan
-    | White
-  ;;
-
-  type style =
-    | FG of color (* foreground *)
-    | BG of color (* background *)
-    | Bold
-    | Reset
-    | Dim
-
-
-  let ansi_of_color = function
-    | Black -> "0"
-    | Red -> "1"
-    | Green -> "2"
-    | Yellow -> "3"
-    | Blue -> "4"
-    | Magenta -> "5"
-    | Cyan -> "6"
-    | White -> "7"
-
-  let code_of_style = function
-    | FG c -> "3" ^ ansi_of_color c
-    | BG c -> "4" ^ ansi_of_color c
-    | Bold -> "1"
-    | Reset -> "0"
-    | Dim -> "2"
-
-
-  let ansi_of_style_l l =
-    let s = match l with
-      | [] -> code_of_style Reset
-      | [s] -> code_of_style s
-      | _ -> String.concat ";" (List.map code_of_style l)
-    in
-    "\x1b[" ^ s ^ "m"
-
-  type styles = {
-    error: style list;
-    warning: style list;
-    loc: style list;
-  }
-
-  let default_styles = {
-    warning = [Bold; FG Magenta];
-    error = [Bold; FG Red];
-    loc = [Bold];
-  }
-
-  let cur_styles = ref default_styles
-  let get_styles () = !cur_styles
-  let set_styles s = cur_styles := s
-
-  (* map a tag to a style, if the tag is known.
-     @raise Not_found otherwise *)
-  let style_of_tag s = match s with
-    | Format.String_tag "error" -> (!cur_styles).error
-    | Format.String_tag "warning" -> (!cur_styles).warning
-    | Format.String_tag "loc" -> (!cur_styles).loc
-    | Format.String_tag "info" -> [Bold; FG Yellow]
-    | Format.String_tag "dim" -> [Dim]
-    | Format.String_tag "filename" -> [FG Cyan]
-    | _ -> raise Not_found
-
-  let color_enabled = ref true
-
-  (* either prints the tag of [s] or delegates to [or_else] *)
-  let mark_open_tag ~or_else s =
-    try
-      let style = style_of_tag s in
-      if !color_enabled then ansi_of_style_l style else ""
-    with Not_found -> or_else s
-
-  let mark_close_tag ~or_else s =
-    try
-      let _ = style_of_tag s in
-      if !color_enabled then ansi_of_style_l [Reset] else ""
-    with Not_found -> or_else s
-
-  (* add color handling to formatter [ppf] *)
-  let set_color_tag_handling ppf =
-    let open Format in
-    let functions = pp_get_formatter_stag_functions ppf () in
-    let functions' = {functions with
-      mark_open_stag=(mark_open_tag ~or_else:functions.mark_open_stag);
-      mark_close_stag=(mark_close_tag ~or_else:functions.mark_close_stag);
-    } in
-    pp_set_mark_tags ppf true; (* enable tags *)
-    pp_set_formatter_stag_functions ppf functions';
-    (* also setup margins *)
-    pp_set_margin ppf (pp_get_margin std_formatter());
-    ()
-
-  external isatty : out_channel -> bool = "caml_sys_isatty"
-
-  (* reasonable heuristic on whether colors should be enabled *)
-  let should_enable_color () =
-    let term = try Sys.getenv "TERM" with Not_found -> "" in
-    term <> "dumb"
-    && term <> ""
-    && isatty stderr
-
-  type setting = Auto | Always | Never
-
-  let setup =
-    let first = ref true in (* initialize only once *)
-    let formatter_l =
-      [Format.std_formatter; Format.err_formatter; Format.str_formatter]
-    in
-    fun o ->
-      if !first then (
-        first := false;
-        Format.set_mark_tags true;
-        List.iter set_color_tag_handling formatter_l;
-        color_enabled := (match o with
-            | Some Always -> true
-            | Some Auto -> should_enable_color ()
-            | Some Never -> false
-            | None -> should_enable_color ())
-      );
-      ()
-end
-
-let normalise_eol s =
-  let b = Buffer.create 80 in
-    for i = 0 to String.length s - 1 do
-      if s.[i] <> '\r' then Buffer.add_char b s.[i]
-    done;
-    Buffer.contents b
-
-let delete_eol_spaces src =
-  let len_src = String.length src in
-  let dst = Bytes.create len_src in
-  let rec loop i_src i_dst =
-    if i_src = len_src then
-      i_dst
-    else
-      match src.[i_src] with
-      | ' ' | '\t' ->
-        loop_spaces 1 (i_src + 1) i_dst
-      | c ->
-        Bytes.set dst i_dst c;
-        loop (i_src + 1) (i_dst + 1)
-  and loop_spaces spaces i_src i_dst =
-    if i_src = len_src then
-      i_dst
-    else
-      match src.[i_src] with
-      | ' ' | '\t' ->
-        loop_spaces (spaces + 1) (i_src + 1) i_dst
-      | '\n' ->
-        Bytes.set dst i_dst '\n';
-        loop (i_src + 1) (i_dst + 1)
-      | _ ->
-        for n = 0 to spaces do
-          Bytes.set dst (i_dst + n) src.[i_src - spaces + n]
-        done;
-        loop (i_src + 1) (i_dst + spaces + 1)
-  in
-  let stop = loop 0 0 in
-  Bytes.sub_string dst 0 stop
-
-type hook_info = {
-  sourcefile : string;
-}
-
-exception HookExnWrapper of
-    {
-      error: exn;
-      hook_name: string;
-      hook_info: hook_info;
-    }
-
-exception HookExn of exn
-
-let raise_direct_hook_exn e = raise (HookExn e)
-
-let fold_hooks list hook_info ast =
-  List.fold_left (fun ast (hook_name,f) ->
-    try
-      f hook_info ast
-    with
-    | HookExn e -> raise e
-    | error -> raise (HookExnWrapper {error; hook_name; hook_info})
-       (* when explicit reraise with backtrace will be available,
-          it should be used here *)
-
-  ) ast (List.sort compare list)
-
-module type HookSig = sig
-  type t
-
-  val add_hook : string -> (hook_info -> t -> t) -> unit
-  val apply_hooks : hook_info -> t -> t
-end
-
-module MakeHooks(M: sig
-    type t
-  end) : HookSig with type t = M.t
-= struct
-
-  type t = M.t
-
-  let hooks = ref []
-  let add_hook name f = hooks := (name, f) :: !hooks
-  let apply_hooks sourcefile intf =
-    fold_hooks !hooks sourcefile intf
-end
diff --git a/jscomp/ext/misc.mli b/jscomp/ext/misc.mli
deleted file mode 100644
index 33878bb..0000000
--- a/jscomp/ext/misc.mli
+++ /dev/null
@@ -1,354 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Miscellaneous useful types and functions *)
-
-
-val fatal_error: string -> 'a
-val fatal_errorf: ('a, Format.formatter, unit, 'b) format4 -> 'a
-exception Fatal_error
-
-val try_finally : (unit -> 'a) -> (unit -> unit) -> 'a;;
-
-val map_end: ('a -> 'b) -> 'a list -> 'b list -> 'b list
-        (* [map_end f l t] is [map f l @ t], just more efficient. *)
-val map_left_right: ('a -> 'b) -> 'a list -> 'b list
-        (* Like [List.map], with guaranteed left-to-right evaluation order *)
-val for_all2: ('a -> 'b -> bool) -> 'a list -> 'b list -> bool
-        (* Same as [List.for_all] but for a binary predicate.
-           In addition, this [for_all2] never fails: given two lists
-           with different lengths, it returns false. *)
-val replicate_list: 'a -> int -> 'a list
-        (* [replicate_list elem n] is the list with [n] elements
-           all identical to [elem]. *)
-val list_remove: 'a -> 'a list -> 'a list
-        (* [list_remove x l] returns a copy of [l] with the first
-           element equal to [x] removed. *)
-val split_last: 'a list -> 'a list * 'a
-        (* Return the last element and the other elements of the given list. *)
-val may: ('a -> unit) -> 'a option -> unit
-val may_map: ('a -> 'b) -> 'a option -> 'b option
-
-type ref_and_value = R : 'a ref * 'a -> ref_and_value
-
-val protect_refs : ref_and_value list -> (unit -> 'a) -> 'a
-(** [protect_refs l f] temporarily sets [r] to [v] for each [R (r, v)] in [l]
-    while executing [f]. The previous contents of the references is restored
-    even if [f] raises an exception. *)
-
-module Stdlib : sig
-  module List : sig
-    type 'a t = 'a list
-
-    val compare : ('a -> 'a -> int) -> 'a t -> 'a t -> int
-    (** The lexicographic order supported by the provided order.
-        There is no constraint on the relative lengths of the lists. *)
-
-    val equal : ('a -> 'a -> bool) -> 'a t -> 'a t -> bool
-    (** Returns [true] iff the given lists have the same length and content
-        with respect to the given equality function. *)
-
-    val filter_map : ('a -> 'b option) -> 'a t -> 'b t
-    (** [filter_map f l] applies [f] to every element of [l], filters
-        out the [None] elements and returns the list of the arguments of
-        the [Some] elements. *)
-
-    val some_if_all_elements_are_some : 'a option t -> 'a t option
-    (** If all elements of the given list are [Some _] then [Some xs]
-        is returned with the [xs] being the contents of those [Some]s, with
-        order preserved.  Otherwise return [None]. *)
-
-    val map2_prefix : ('a -> 'b -> 'c) -> 'a t -> 'b t -> ('c t * 'b t)
-    (** [let r1, r2 = map2_prefix f l1 l2]
-        If [l1] is of length n and [l2 = h2 @ t2] with h2 of length n,
-        r1 is [List.map2 f l1 h1] and r2 is t2. *)
-
-    val split_at : int -> 'a t -> 'a t * 'a t
-    (** [split_at n l] returns the pair [before, after] where [before] is
-        the [n] first elements of [l] and [after] the remaining ones.
-        If [l] has less than [n] elements, raises Invalid_argument. *)
-  end
-
-  module Option : sig
-    type 'a t = 'a option
-
-    val equal : ('a -> 'a -> bool) -> 'a t -> 'a t -> bool
-
-    val iter : ('a -> unit) -> 'a t -> unit
-    val map : ('a -> 'b) -> 'a t -> 'b t
-    val fold : ('a -> 'b -> 'b) -> 'a t -> 'b -> 'b
-    val value_default : ('a -> 'b) -> default:'b -> 'a t -> 'b
-  end
-
-  module Array : sig
-    val exists2 : ('a -> 'b -> bool) -> 'a array -> 'b array -> bool
-    (* Same as [Array.exists], but for a two-argument predicate. Raise
-       Invalid_argument if the two arrays are determined to have
-       different lengths. *)
-  end
-end
-
-val find_in_path: string list -> string -> string
-        (* Search a file in a list of directories. *)
-val find_in_path_rel: string list -> string -> string
-        (* Search a relative file in a list of directories. *)
-val find_in_path_uncap: string list -> string -> string
-        (* Same, but search also for uncapitalized name, i.e.
-           if name is Foo.ml, allow /path/Foo.ml and /path/foo.ml
-           to match. *)
-val remove_file: string -> unit
-        (* Delete the given file if it exists. Never raise an error. *)
-val expand_directory: string -> string -> string
-        (* [expand_directory alt file] eventually expands a [+] at the
-           beginning of file into [alt] (an alternate root directory) *)
-
-val create_hashtable: int -> ('a * 'b) list -> ('a, 'b) Hashtbl.t
-        (* Create a hashtable of the given size and fills it with the
-           given bindings. *)
-
-val copy_file: in_channel -> out_channel -> unit
-        (* [copy_file ic oc] reads the contents of file [ic] and copies
-           them to [oc]. It stops when encountering EOF on [ic]. *)
-val copy_file_chunk: in_channel -> out_channel -> int -> unit
-        (* [copy_file_chunk ic oc n] reads [n] bytes from [ic] and copies
-           them to [oc]. It raises [End_of_file] when encountering
-           EOF on [ic]. *)
-val string_of_file: in_channel -> string
-        (* [string_of_file ic] reads the contents of file [ic] and copies
-           them to a string. It stops when encountering EOF on [ic]. *)
-           
-val output_to_bin_file_directly: string -> (string -> out_channel -> 'a) -> 'a
-
-val output_to_file_via_temporary:
-      ?mode:open_flag list -> string -> (string -> out_channel -> 'a) -> 'a
-        (* Produce output in temporary file, then rename it
-           (as atomically as possible) to the desired output file name.
-           [output_to_file_via_temporary filename fn] opens a temporary file
-           which is passed to [fn] (name + output channel).  When [fn] returns,
-           the channel is closed and the temporary file is renamed to
-           [filename]. *)
-
-val log2: int -> int
-        (* [log2 n] returns [s] such that [n = 1 lsl s]
-           if [n] is a power of 2*)
-val align: int -> int -> int
-        (* [align n a] rounds [n] upwards to a multiple of [a]
-           (a power of 2). *)
-val no_overflow_add: int -> int -> bool
-        (* [no_overflow_add n1 n2] returns [true] if the computation of
-           [n1 + n2] does not overflow. *)
-val no_overflow_sub: int -> int -> bool
-        (* [no_overflow_sub n1 n2] returns [true] if the computation of
-           [n1 - n2] does not overflow. *)
-val no_overflow_mul: int -> int -> bool
-        (* [no_overflow_mul n1 n2] returns [true] if the computation of
-           [n1 * n2] does not overflow. *)
-val no_overflow_lsl: int -> int -> bool
-        (* [no_overflow_lsl n k] returns [true] if the computation of
-           [n lsl k] does not overflow. *)
-
-module Int_literal_converter : sig
-  val int : string -> int
-  val int32 : string -> int32
-  val int64 : string -> int64
-end
-
-val chop_extensions: string -> string
-        (* Return the given file name without its extensions. The extensions
-           is the longest suffix starting with a period and not including
-           a directory separator, [.xyz.uvw] for instance.
-
-           Return the given name if it does not contain an extension. *)
-
-val search_substring: string -> string -> int -> int
-        (* [search_substring pat str start] returns the position of the first
-           occurrence of string [pat] in string [str].  Search starts
-           at offset [start] in [str].  Raise [Not_found] if [pat]
-           does not occur. *)
-
-val replace_substring: before:string -> after:string -> string -> string
-        (* [replace_substring ~before ~after str] replaces all
-           occurrences of [before] with [after] in [str] and returns
-           the resulting string. *)
-
-val rev_split_words: string -> string list
-        (* [rev_split_words s] splits [s] in blank-separated words, and returns
-           the list of words in reverse order. *)
-
-val get_ref: 'a list ref -> 'a list
-        (* [get_ref lr] returns the content of the list reference [lr] and reset
-           its content to the empty list. *)
-
-
-val fst3: 'a * 'b * 'c -> 'a
-val snd3: 'a * 'b * 'c -> 'b
-val thd3: 'a * 'b * 'c -> 'c
-
-val fst4: 'a * 'b * 'c * 'd -> 'a
-val snd4: 'a * 'b * 'c * 'd -> 'b
-val thd4: 'a * 'b * 'c * 'd -> 'c
-val for4: 'a * 'b * 'c * 'd -> 'd
-
-module LongString :
-  sig
-    type t = bytes array
-    val create : int -> t
-    val length : t -> int
-    val get : t -> int -> char
-    val set : t -> int -> char -> unit
-    val blit : t -> int -> t -> int -> int -> unit
-    val output : out_channel -> t -> int -> int -> unit
-    val unsafe_blit_to_bytes : t -> int -> bytes -> int -> int -> unit
-    val input_bytes : in_channel -> int -> t
-  end
-
-val edit_distance : string -> string -> int -> int option
-(** [edit_distance a b cutoff] computes the edit distance between
-    strings [a] and [b]. To help efficiency, it uses a cutoff: if the
-    distance [d] is smaller than [cutoff], it returns [Some d], else
-    [None].
-
-    The distance algorithm currently used is Damerau-Levenshtein: it
-    computes the number of insertion, deletion, substitution of
-    letters, or swapping of adjacent letters to go from one word to the
-    other. The particular algorithm may change in the future.
-*)
-
-val spellcheck : string list -> string -> string list
-(** [spellcheck env name] takes a list of names [env] that exist in
-    the current environment and an erroneous [name], and returns a
-    list of suggestions taken from [env], that are close enough to
-    [name] that it may be a typo for one of them. *)
-
-val did_you_mean : Format.formatter -> (unit -> string list) -> unit
-(** [did_you_mean ppf get_choices] hints that the user may have meant
-    one of the option returned by calling [get_choices]. It does nothing
-    if the returned list is empty.
-
-    The [unit -> ...] thunking is meant to delay any potentially-slow
-    computation (typically computing edit-distance with many things
-    from the current environment) to when the hint message is to be
-    printed. You should print an understandable error message before
-    calling [did_you_mean], so that users get a clear notification of
-    the failure even if producing the hint is slow.
-*)
-
-val cut_at : string -> char -> string * string
-(** [String.cut_at s c] returns a pair containing the sub-string before
-   the first occurrence of [c] in [s], and the sub-string after the
-   first occurrence of [c] in [s].
-   [let (before, after) = String.cut_at s c in
-    before ^ String.make 1 c ^ after] is the identity if [s] contains [c].
-
-   Raise [Not_found] if the character does not appear in the string
-   @since 4.01
-*)
-
-
-module StringSet: Set.S with type elt = string
-module StringMap: Map.S with type key = string
-(* TODO: replace all custom instantiations of StringSet/StringMap in various
-   compiler modules with this one. *)
-
-(* Color handling *)
-module Color : sig
-  type color =
-    | Black
-    | Red
-    | Green
-    | Yellow
-    | Blue
-    | Magenta
-    | Cyan
-    | White
-  ;;
-
-  type style =
-    | FG of color (* foreground *)
-    | BG of color (* background *)
-    | Bold
-    | Reset
-    | Dim
-
-
-  val ansi_of_style_l : style list -> string
-  (* ANSI escape sequence for the given style *)
-
-  type styles = {
-    error: style list;
-    warning: style list;
-    loc: style list;
-  }
-
-  val default_styles: styles
-  val get_styles: unit -> styles
-  val set_styles: styles -> unit
-
-  type setting = Auto | Always | Never
-
-  val setup : setting option -> unit
-  (* [setup opt] will enable or disable color handling on standard formatters
-     according to the value of color setting [opt].
-     Only the first call to this function has an effect. *)
-
-  val set_color_tag_handling : Format.formatter -> unit
-  (* adds functions to support color tags to the given formatter. *)
-end
-
-val normalise_eol : string -> string
-(** [normalise_eol s] returns a fresh copy of [s] with any '\r' characters
-   removed. Intended for pre-processing text which will subsequently be printed
-   on a channel which performs EOL transformations (i.e. Windows) *)
-
-val delete_eol_spaces : string -> string
-(** [delete_eol_spaces s] returns a fresh copy of [s] with any end of
-   line spaces removed. Intended to normalize the output of the
-   toplevel for tests. *)
-
-
-
-(** {1 Hook machinery}
-
-    Hooks machinery:
-   [add_hook name f] will register a function that will be called on the
-    argument of a later call to [apply_hooks]. Hooks are applied in the
-    lexicographical order of their names.
-*)
-
-type hook_info = {
-  sourcefile : string;
-}
-
-exception HookExnWrapper of
-    {
-      error: exn;
-      hook_name: string;
-      hook_info: hook_info;
-    }
-    (** An exception raised by a hook will be wrapped into a
-        [HookExnWrapper] constructor by the hook machinery.  *)
-
-
-val raise_direct_hook_exn: exn -> 'a
-  (** A hook can use [raise_unwrapped_hook_exn] to raise an exception that will
-      not be wrapped into a {!HookExnWrapper}. *)
-
-module type HookSig = sig
-  type t
-  val add_hook : string -> (hook_info -> t -> t) -> unit
-  val apply_hooks : hook_info -> t -> t
-end
-
-module MakeHooks : functor (M : sig type t end) -> HookSig with type t = M.t
diff --git a/jscomp/ext/set_gen.ml b/jscomp/ext/set_gen.ml
deleted file mode 100644
index 34eb1e0..0000000
--- a/jscomp/ext/set_gen.ml
+++ /dev/null
@@ -1,357 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                                OCaml                                *)
-(*                                                                     *)
-(*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         *)
-(*                                                                     *)
-(*  Copyright 1996 Institut National de Recherche en Informatique et   *)
-(*  en Automatique.  All rights reserved.  This file is distributed    *)
-(*  under the terms of the GNU Library General Public License, with    *)
-(*  the special exception on linking described in file ../LICENSE.     *)
-(*                                                                     *)
-(***********************************************************************)
-[@@@warnerror "+55"]
-
-(* balanced tree based on stdlib distribution *)
-
-type 'a t0 =
-  | Empty
-  | Leaf of 'a
-  | Node of { l : 'a t0; v : 'a; r : 'a t0; h : int }
-
-type 'a partial_node = { l : 'a t0; v : 'a; r : 'a t0; h : int }
-
-external ( ~! ) : 'a t0 -> 'a partial_node = "%identity"
-
-let empty = Empty
-
-let[@inline] height = function Empty -> 0 | Leaf _ -> 1 | Node { h } -> h
-
-let[@inline] calc_height a b = (if a >= b then a else b) + 1
-
-(*
-     Invariants:
-     1. {[ l < v < r]}
-     2. l and r balanced
-     3. [height l] - [height r] <= 2
-*)
-let[@inline] unsafe_node v l r h = Node { l; v; r; h }
-
-let[@inline] unsafe_node_maybe_leaf v l r h =
-  if h = 1 then Leaf v else Node { l; v; r; h }
-
-let[@inline] singleton x = Leaf x
-
-let[@inline] unsafe_two_elements x v = unsafe_node v (singleton x) empty 2
-
-type 'a t = 'a t0 = private
-  | Empty
-  | Leaf of 'a
-  | Node of { l : 'a t0; v : 'a; r : 'a t0; h : int }
-
-(* Smallest and greatest element of a set *)
-
-let rec min_exn = function
-  | Empty -> raise Not_found
-  | Leaf v -> v
-  | Node { l; v } -> ( match l with Empty -> v | Leaf _ | Node _ -> min_exn l)
-
-let[@inline] is_empty = function Empty -> true | _ -> false
-
-let rec cardinal_aux acc = function
-  | Empty -> acc
-  | Leaf _ -> acc + 1
-  | Node { l; r } -> cardinal_aux (cardinal_aux (acc + 1) r) l
-
-let cardinal s = cardinal_aux 0 s
-
-let rec elements_aux accu = function
-  | Empty -> accu
-  | Leaf v -> v :: accu
-  | Node { l; v; r } -> elements_aux (v :: elements_aux accu r) l
-
-let elements s = elements_aux [] s
-
-let choose = min_exn
-
-let rec iter x f =
-  match x with
-  | Empty -> ()
-  | Leaf v -> f v
-  | Node { l; v; r } ->
-      iter l f;
-      f v;
-      iter r f
-
-let rec fold s accu f =
-  match s with
-  | Empty -> accu
-  | Leaf v -> f v accu
-  | Node { l; v; r } -> fold r (f v (fold l accu f)) f
-
-let rec for_all x p =
-  match x with
-  | Empty -> true
-  | Leaf v -> p v
-  | Node { l; v; r } -> p v && for_all l p && for_all r p
-
-let rec exists x p =
-  match x with
-  | Empty -> false
-  | Leaf v -> p v
-  | Node { l; v; r } -> p v || exists l p || exists r p
-
-exception Height_invariant_broken
-
-exception Height_diff_borken
-
-let rec check_height_and_diff = function
-  | Empty -> 0
-  | Leaf _ -> 1
-  | Node { l; r; h } ->
-      let hl = check_height_and_diff l in
-      let hr = check_height_and_diff r in
-      if h <> calc_height hl hr then raise Height_invariant_broken
-      else
-        let diff = abs (hl - hr) in
-        if diff > 2 then raise Height_diff_borken else h
-
-let check tree = ignore (check_height_and_diff tree)
-
-(* Same as create, but performs one step of rebalancing if necessary.
-    Invariants:
-    1. {[ l < v < r ]}
-    2. l and r balanced
-    3. | height l - height r | <= 3.
-
-    Proof by indunction
-
-    Lemma: the height of  [bal l v r] will bounded by [max l r] + 1
-*)
-let bal l v r : _ t =
-  let hl = height l in
-  let hr = height r in
-  if hl > hr + 2 then
-    let { l = ll; r = lr; v = lv; h = _ } = ~!l in
-    let hll = height ll in
-    let hlr = height lr in
-    if hll >= hlr then
-      let hnode = calc_height hlr hr in
-      unsafe_node lv ll
-        (unsafe_node_maybe_leaf v lr r hnode)
-        (calc_height hll hnode)
-    else
-      let { l = lrl; r = lrr; v = lrv } = ~!lr in
-      let hlrl = height lrl in
-      let hlrr = height lrr in
-      let hlnode = calc_height hll hlrl in
-      let hrnode = calc_height hlrr hr in
-      unsafe_node lrv
-        (unsafe_node_maybe_leaf lv ll lrl hlnode)
-        (unsafe_node_maybe_leaf v lrr r hrnode)
-        (calc_height hlnode hrnode)
-  else if hr > hl + 2 then
-    let { l = rl; r = rr; v = rv } = ~!r in
-    let hrr = height rr in
-    let hrl = height rl in
-    if hrr >= hrl then
-      let hnode = calc_height hl hrl in
-      unsafe_node rv
-        (unsafe_node_maybe_leaf v l rl hnode)
-        rr (calc_height hnode hrr)
-    else
-      let { l = rll; r = rlr; v = rlv } = ~!rl in
-      let hrll = height rll in
-      let hrlr = height rlr in
-      let hlnode = calc_height hl hrll in
-      let hrnode = calc_height hrlr hrr in
-      unsafe_node rlv
-        (unsafe_node_maybe_leaf v l rll hlnode)
-        (unsafe_node_maybe_leaf rv rlr rr hrnode)
-        (calc_height hlnode hrnode)
-  else unsafe_node_maybe_leaf v l r (calc_height hl hr)
-
-let rec remove_min_elt = function
-  | Empty -> invalid_arg "Set.remove_min_elt"
-  | Leaf _ -> empty
-  | Node { l = Empty; r } -> r
-  | Node { l; v; r } -> bal (remove_min_elt l) v r
-
-(*
-    All elements of l must precede the elements of r.
-        Assume | height l - height r | <= 2.
-    weak form of [concat]
-*)
-
-let internal_merge l r =
-  match (l, r) with
-  | Empty, t -> t
-  | t, Empty -> t
-  | _, _ -> bal l (min_exn r) (remove_min_elt r)
-
-(* Beware: those two functions assume that the added v is *strictly*
-    smaller (or bigger) than all the present elements in the tree; it
-    does not test for equality with the current min (or max) element.
-    Indeed, they are only used during the "join" operation which
-    respects this precondition.
-*)
-
-let rec add_min v = function
-  | Empty -> singleton v
-  | Leaf x -> unsafe_two_elements v x
-  | Node n -> bal (add_min v n.l) n.v n.r
-
-let rec add_max v = function
-  | Empty -> singleton v
-  | Leaf x -> unsafe_two_elements x v
-  | Node n -> bal n.l n.v (add_max v n.r)
-
-(** 
-    Invariants:
-    1. l < v < r 
-    2. l and r are balanced 
-
-    Proof by induction
-    The height of output will be ~~ (max (height l) (height r) + 2)
-    Also use the lemma from [bal]
-*)
-let rec internal_join l v r =
-  match (l, r) with
-  | Empty, _ -> add_min v r
-  | _, Empty -> add_max v l
-  | Leaf lv, Node { h = rh } ->
-      if rh > 3 then add_min lv (add_min v r) (* FIXME: could inlined *)
-      else unsafe_node v l r (rh + 1)
-  | Leaf _, Leaf _ -> unsafe_node v l r 2
-  | Node { h = lh }, Leaf rv ->
-      if lh > 3 then add_max rv (add_max v l) else unsafe_node v l r (lh + 1)
-  | ( Node { l = ll; v = lv; r = lr; h = lh },
-      Node { l = rl; v = rv; r = rr; h = rh } ) ->
-      if lh > rh + 2 then
-        (* proof by induction:
-           now [height of ll] is [lh - 1]
-        *)
-        bal ll lv (internal_join lr v r)
-      else if rh > lh + 2 then bal (internal_join l v rl) rv rr
-      else unsafe_node v l r (calc_height lh rh)
-
-(*
-    Required Invariants: 
-    [t1] < [t2]  
-*)
-let internal_concat t1 t2 =
-  match (t1, t2) with
-  | Empty, t -> t
-  | t, Empty -> t
-  | _, _ -> internal_join t1 (min_exn t2) (remove_min_elt t2)
-
-let rec partition x p =
-  match x with
-  | Empty -> (empty, empty)
-  | Leaf v ->
-      let pv = p v in
-      if pv then (x, empty) else (empty, x)
-  | Node { l; v; r } ->
-      (* call [p] in the expected left-to-right order *)
-      let lt, lf = partition l p in
-      let pv = p v in
-      let rt, rf = partition r p in
-      if pv then (internal_join lt v rt, internal_concat lf rf)
-      else (internal_concat lt rt, internal_join lf v rf)
-
-let of_sorted_array l =
-  let rec sub start n l =
-    if n = 0 then empty
-    else if n = 1 then
-      let x0 = Array.unsafe_get l start in
-      singleton x0
-    else if n = 2 then
-      let x0 = Array.unsafe_get l start in
-      let x1 = Array.unsafe_get l (start + 1) in
-      unsafe_node x1 (singleton x0) empty 2
-    else if n = 3 then
-      let x0 = Array.unsafe_get l start in
-      let x1 = Array.unsafe_get l (start + 1) in
-      let x2 = Array.unsafe_get l (start + 2) in
-      unsafe_node x1 (singleton x0) (singleton x2) 2
-    else
-      let nl = n / 2 in
-      let left = sub start nl l in
-      let mid = start + nl in
-      let v = Array.unsafe_get l mid in
-      let right = sub (mid + 1) (n - nl - 1) l in
-      unsafe_node v left right (calc_height (height left) (height right))
-  in
-  sub 0 (Array.length l) l
-
-let is_ordered ~cmp tree =
-  let rec is_ordered_min_max tree =
-    match tree with
-    | Empty -> `Empty
-    | Leaf v -> `V (v, v)
-    | Node { l; v; r } -> (
-        match is_ordered_min_max l with
-        | `No -> `No
-        | `Empty -> (
-            match is_ordered_min_max r with
-            | `No -> `No
-            | `Empty -> `V (v, v)
-            | `V (l, r) -> if cmp v l < 0 then `V (v, r) else `No)
-        | `V (min_v, max_v) -> (
-            match is_ordered_min_max r with
-            | `No -> `No
-            | `Empty -> if cmp max_v v < 0 then `V (min_v, v) else `No
-            | `V (min_v_r, max_v_r) ->
-                if cmp max_v min_v_r < 0 then `V (min_v, max_v_r) else `No))
-  in
-  is_ordered_min_max tree <> `No
-
-let invariant ~cmp t =
-  check t;
-  is_ordered ~cmp t
-
-module type S = sig
-  type elt
-
-  type t
-
-  val empty : t
-
-  val is_empty : t -> bool
-
-  val iter : t -> (elt -> unit) -> unit
-
-  val fold : t -> 'a -> (elt -> 'a -> 'a) -> 'a
-
-  val for_all : t -> (elt -> bool) -> bool
-
-  val exists : t -> (elt -> bool) -> bool
-
-  val singleton : elt -> t
-
-  val cardinal : t -> int
-
-  val elements : t -> elt list
-
-  val choose : t -> elt
-
-  val mem : t -> elt -> bool
-
-  val add : t -> elt -> t
-
-  val remove : t -> elt -> t
-
-  val union : t -> t -> t
-
-  val inter : t -> t -> t
-
-  val diff : t -> t -> t
-
-  val of_list : elt list -> t
-
-  val of_sorted_array : elt array -> t
-
-  val invariant : t -> bool
-
-  val print : Format.formatter -> t -> unit
-end
diff --git a/jscomp/ext/string_vec.ml b/jscomp/ext/string_vec.ml
deleted file mode 100644
index 833ee8e..0000000
--- a/jscomp/ext/string_vec.ml
+++ /dev/null
@@ -1,29 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-include Vec.Make (struct
-  type t = string
-
-  let null = ""
-end)
diff --git a/jscomp/ext/string_vec.mli b/jscomp/ext/string_vec.mli
deleted file mode 100644
index c1b9411..0000000
--- a/jscomp/ext/string_vec.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-include Vec_gen.S with type elt = string
diff --git a/jscomp/ext/union_find.ml b/jscomp/ext/union_find.ml
deleted file mode 100644
index a06b49c..0000000
--- a/jscomp/ext/union_find.ml
+++ /dev/null
@@ -1,64 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = { id : int array; sz : int array; mutable components : int }
-
-let init n =
-  let id = Array.make n 0 in
-  for i = 0 to n - 1 do
-    Array.unsafe_set id i i
-  done;
-  { id; sz = Array.make n 1; components = n }
-
-let rec find_aux id_store p =
-  let parent = Array.unsafe_get id_store p in
-  if p <> parent then find_aux id_store parent else p
-
-let find store p = find_aux store.id p
-
-let union store p q =
-  let id_store = store.id in
-  let p_root = find_aux id_store p in
-  let q_root = find_aux id_store q in
-  if p_root <> q_root then
-    let () = store.components <- store.components - 1 in
-    let sz_store = store.sz in
-    let sz_p_root = Array.unsafe_get sz_store p_root in
-    let sz_q_root = Array.unsafe_get sz_store q_root in
-    let bigger = sz_p_root + sz_q_root in
-    (* Smaller root point to larger to make
-       it more balanced
-       it will introduce a cost for small root find,
-       but major will not be impacted
-    *)
-    if sz_p_root < sz_q_root then (
-      Array.unsafe_set id_store p q_root;
-      Array.unsafe_set id_store p_root q_root;
-      Array.unsafe_set sz_store q_root bigger (* little optimization *))
-    else (
-      Array.unsafe_set id_store q p_root;
-      Array.unsafe_set id_store q_root p_root;
-      Array.unsafe_set sz_store p_root bigger (* little optimization *))
-
-let count store = store.components
diff --git a/jscomp/ext/union_find.mli b/jscomp/ext/union_find.mli
deleted file mode 100644
index 5638b49..0000000
--- a/jscomp/ext/union_find.mli
+++ /dev/null
@@ -1,33 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t
-
-val init : int -> t
-
-val find : t -> int -> int
-
-val union : t -> int -> int -> unit
-
-val count : t -> int
diff --git a/jscomp/ext/warnings.ml b/jscomp/ext/warnings.ml
deleted file mode 100644
index b1a74bf..0000000
--- a/jscomp/ext/warnings.ml
+++ /dev/null
@@ -1,666 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Pierre Weis && Damien Doligez, INRIA Rocquencourt          *)
-(*                                                                        *)
-(*   Copyright 1998 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* When you change this, you need to update the documentation:
-   - man/ocamlc.m
-   - man/ocamlopt.m
-   - manual/manual/cmds/comp.etex
-   - manual/manual/cmds/native.etex
-*)
-
-type loc = {
-  loc_start : Lexing.position;
-  loc_end : Lexing.position;
-  loc_ghost : bool;
-}
-
-type topLevelUnitHelp = FunctionCall | Other
-
-type t =
-  | Comment_start (*  1 *)
-  | Comment_not_end (*  2 *)
-  | Deprecated of string * loc * loc (*  3 *)
-  | Fragile_match of string (*  4 *)
-  | Partial_application (*  5 *)
-  | Method_override of string list (*  7 *)
-  | Partial_match of string (*  8 *)
-  | Non_closed_record_pattern of string (*  9 *)
-  | Statement_type (* 10 *)
-  | Unused_match (* 11 *)
-  | Unused_pat (* 12 *)
-  | Instance_variable_override of string list (* 13 *)
-  | Illegal_backslash (* 14 *)
-  | Implicit_public_methods of string list (* 15 *)
-  | Unerasable_optional_argument (* 16 *)
-  | Unused_argument (* 20 *)
-  | Nonreturning_statement (* 21 *)
-  | Preprocessor of string (* 22 *)
-  | Useless_record_with (* 23 *)
-  | Bad_module_name of string (* 24 *)
-  | All_clauses_guarded (* 8, used to be 25 *)
-  | Unused_var of string (* 26 *)
-  | Unused_var_strict of string (* 27 *)
-  | Wildcard_arg_to_constant_constr (* 28 *)
-  | Eol_in_string (* 29 *)
-  | Duplicate_definitions of string * string * string * string (*30 *)
-  | Unused_value_declaration of string (* 32 *)
-  | Unused_open of string (* 33 *)
-  | Unused_type_declaration of string (* 34 *)
-  | Unused_for_index of string (* 35 *)
-  | Unused_constructor of string * bool * bool (* 37 *)
-  | Unused_extension of string * bool * bool * bool (* 38 *)
-  | Unused_rec_flag (* 39 *)
-  | Ambiguous_name of string list * string list * bool (* 41 *)
-  | Nonoptional_label of string (* 43 *)
-  | Open_shadow_identifier of string * string (* 44 *)
-  | Open_shadow_label_constructor of string * string (* 45 *)
-  | Attribute_payload of string * string (* 47 *)
-  | Eliminated_optional_arguments of string list (* 48 *)
-  | No_cmi_file of string * string option (* 49 *)
-  | Bad_docstring of bool (* 50 *)
-  | Fragile_literal_pattern (* 52 *)
-  | Misplaced_attribute of string (* 53 *)
-  | Duplicated_attribute of string (* 54 *)
-  | Unreachable_case (* 56 *)
-  | Ambiguous_pattern of string list (* 57 *)
-  | Unused_module of string (* 60 *)
-  | Constraint_on_gadt (* 62 *)
-  | Bs_unused_attribute of string (* 101 *)
-  | Bs_polymorphic_comparison (* 102 *)
-  | Bs_ffi_warning of string (* 103 *)
-  | Bs_derive_warning of string (* 104 *)
-  | Bs_fragile_external of string (* 105 *)
-  | Bs_unimplemented_primitive of string (* 106 *)
-  | Bs_integer_literal_overflow (* 107 *)
-  | Bs_uninterpreted_delimiters of string (* 108 *)
-  | Bs_toplevel_expression_unit of (string * topLevelUnitHelp) option (* 109 *)
-  | Bs_todo of string option (* 110 *)
-
-(* If you remove a warning, leave a hole in the numbering.  NEVER change
-   the numbers of existing warnings.
-   If you add a new warning, add it at the end with a new number;
-   do NOT reuse one of the holes.
-*)
-
-let number = function
-  | Comment_start -> 1
-  | Comment_not_end -> 2
-  | Deprecated _ -> 3
-  | Fragile_match _ -> 4
-  | Partial_application -> 5
-  | Method_override _ -> 7
-  | Partial_match _ -> 8
-  | Non_closed_record_pattern _ -> 9
-  | Statement_type -> 10
-  | Unused_match -> 11
-  | Unused_pat -> 12
-  | Instance_variable_override _ -> 13
-  | Illegal_backslash -> 14
-  | Implicit_public_methods _ -> 15
-  | Unerasable_optional_argument -> 16
-  | Unused_argument -> 20
-  | Nonreturning_statement -> 21
-  | Preprocessor _ -> 22
-  | Useless_record_with -> 23
-  | Bad_module_name _ -> 24
-  | All_clauses_guarded -> 8 (* used to be 25 *)
-  | Unused_var _ -> 26
-  | Unused_var_strict _ -> 27
-  | Wildcard_arg_to_constant_constr -> 28
-  | Eol_in_string -> 29
-  | Duplicate_definitions _ -> 30
-  | Unused_value_declaration _ -> 32
-  | Unused_open _ -> 33
-  | Unused_type_declaration _ -> 34
-  | Unused_for_index _ -> 35
-  | Unused_constructor _ -> 37
-  | Unused_extension _ -> 38
-  | Unused_rec_flag -> 39
-  | Ambiguous_name _ -> 41
-  | Nonoptional_label _ -> 43
-  | Open_shadow_identifier _ -> 44
-  | Open_shadow_label_constructor _ -> 45
-  | Attribute_payload _ -> 47
-  | Eliminated_optional_arguments _ -> 48
-  | No_cmi_file _ -> 49
-  | Bad_docstring _ -> 50
-  | Fragile_literal_pattern -> 52
-  | Misplaced_attribute _ -> 53
-  | Duplicated_attribute _ -> 54
-  | Unreachable_case -> 56
-  | Ambiguous_pattern _ -> 57
-  | Unused_module _ -> 60
-  | Constraint_on_gadt -> 62
-  | Bs_unused_attribute _ -> 101
-  | Bs_polymorphic_comparison -> 102
-  | Bs_ffi_warning _ -> 103
-  | Bs_derive_warning _ -> 104
-  | Bs_fragile_external _ -> 105
-  | Bs_unimplemented_primitive _ -> 106
-  | Bs_integer_literal_overflow -> 107
-  | Bs_uninterpreted_delimiters _ -> 108
-  | Bs_toplevel_expression_unit _ -> 109
-  | Bs_todo _ -> 110
-
-let last_warning_number = 110
-
-let letter_all =
-  let rec loop i = if i = 0 then [] else i :: loop (i - 1) in
-  loop last_warning_number
-
-(* Must be the max number returned by the [number] function. *)
-
-let letter = function
-  | 'a' -> letter_all
-  | 'b' -> []
-  | 'c' -> [ 1; 2 ]
-  | 'd' -> [ 3 ]
-  | 'e' -> [ 4 ]
-  | 'f' -> [ 5 ]
-  | 'g' -> []
-  | 'h' -> []
-  | 'i' -> []
-  | 'j' -> []
-  | 'k' -> [ 32; 33; 34; 35; 36; 37; 38; 39 ]
-  | 'l' -> [ 6 ]
-  | 'm' -> [ 7 ]
-  | 'n' -> []
-  | 'o' -> []
-  | 'p' -> [ 8 ]
-  | 'q' -> []
-  | 'r' -> [ 9 ]
-  | 's' -> [ 10 ]
-  | 't' -> []
-  | 'u' -> [ 11; 12 ]
-  | 'v' -> [ 13 ]
-  | 'w' -> []
-  | 'x' -> [ 14; 15; 16; 17; 18; 19; 20; 21; 22; 23; 24; 30 ]
-  | 'y' -> [ 26 ]
-  | 'z' -> [ 27 ]
-  | _ -> assert false
-
-type state = { active : bool array; error : bool array }
-
-let current =
-  ref
-    {
-      active = Array.make (last_warning_number + 1) true;
-      error = Array.make (last_warning_number + 1) false;
-    }
-
-let disabled = ref false
-
-let without_warnings f = Misc.protect_refs [ Misc.R (disabled, true) ] f
-
-let backup () = !current
-
-let restore x = current := x
-
-let is_active x = (not !disabled) && !current.active.(number x)
-
-let is_error x = (not !disabled) && !current.error.(number x)
-
-let mk_lazy f =
-  let state = backup () in
-  lazy
-    (let prev = backup () in
-     restore state;
-     try
-       let r = f () in
-       restore prev;
-       r
-     with exn ->
-       restore prev;
-       raise exn)
-
-let parse_opt error active flags s =
-  let set i = flags.(i) <- true in
-  let clear i = flags.(i) <- false in
-  let set_all i =
-    active.(i) <- true;
-    error.(i) <- true
-  in
-  let error () = raise (Arg.Bad "Ill-formed list of warnings") in
-  let rec get_num n i =
-    if i >= String.length s then (i, n)
-    else
-      match s.[i] with
-      | '0' .. '9' ->
-          get_num ((10 * n) + Char.code s.[i] - Char.code '0') (i + 1)
-      | _ -> (i, n)
-  in
-  let get_range i =
-    let i, n1 = get_num 0 i in
-    if i + 2 < String.length s && s.[i] = '.' && s.[i + 1] = '.' then (
-      let i, n2 = get_num 0 (i + 2) in
-      if n2 < n1 then error ();
-      (i, n1, n2))
-    else (i, n1, n1)
-  in
-  let rec loop i =
-    if i >= String.length s then ()
-    else
-      match s.[i] with
-      | 'A' .. 'Z' ->
-          List.iter set (letter (Char.lowercase_ascii s.[i]));
-          loop (i + 1)
-      | 'a' .. 'z' ->
-          List.iter clear (letter s.[i]);
-          loop (i + 1)
-      | '+' -> loop_letter_num set (i + 1)
-      | '-' -> loop_letter_num clear (i + 1)
-      | '@' -> loop_letter_num set_all (i + 1)
-      | _ -> error ()
-  and loop_letter_num myset i =
-    if i >= String.length s then error ()
-    else
-      match s.[i] with
-      | '0' .. '9' ->
-          let i, n1, n2 = get_range i in
-          for n = n1 to Ext_pervasives.min_int n2 last_warning_number do
-            myset n
-          done;
-          loop i
-      | 'A' .. 'Z' ->
-          List.iter myset (letter (Char.lowercase_ascii s.[i]));
-          loop (i + 1)
-      | 'a' .. 'z' ->
-          List.iter myset (letter s.[i]);
-          loop (i + 1)
-      | _ -> error ()
-  in
-  loop 0
-
-let parse_options errflag s =
-  let error = Array.copy !current.error in
-  let active = Array.copy !current.active in
-  parse_opt error active (if errflag then error else active) s;
-  current := { error; active }
-
-let reset () =
-  parse_options false Bsc_warnings.defaults_w;
-  parse_options true Bsc_warnings.defaults_warn_error
-
-let () = reset ()
-
-let message = function
-  | Comment_start -> "this is the start of a comment."
-  | Comment_not_end -> "this is not the end of a comment."
-  | Deprecated (s, _, _) ->
-      (* Reduce \r\n to \n:
-           - Prevents any \r characters being printed on Unix when processing
-             Windows sources
-           - Prevents \r\r\n being generated on Windows, which affects the
-             testsuite
-      *)
-      "deprecated: " ^ Misc.normalise_eol s
-  | Fragile_match "" -> "this pattern-matching is fragile."
-  | Fragile_match s ->
-      "this pattern-matching is fragile.\n\
-       It will remain exhaustive when constructors are added to type " ^ s ^ "."
-  | Partial_application ->
-      "this function application is partial,\nmaybe some arguments are missing."
-  | Method_override [ lab ] -> "the method " ^ lab ^ " is overridden."
-  | Method_override (cname :: slist) ->
-      String.concat " "
-        ("the following methods are overridden by the class" :: cname :: ":\n "
-       :: slist)
-  | Method_override [] -> assert false
-  | Partial_match "" ->
-      "You forgot to handle a possible case here, though we don't have more \
-       information on the value."
-  | Partial_match s ->
-      "You forgot to handle a possible case here, for example: \n  " ^ s
-  | Non_closed_record_pattern s ->
-      "the following labels are not bound in this record pattern: " ^ s
-      ^ "\nEither bind these labels explicitly or add ', _' to the pattern."
-  | Statement_type ->
-      "This expression returns a value, but you're not doing anything with it. \
-       If this is on purpose, wrap it with `ignore`."
-  | Unused_match -> "this match case is unused."
-  | Unused_pat -> "this sub-pattern is unused."
-  | Instance_variable_override [ lab ] ->
-      "the instance variable " ^ lab ^ " is overridden.\n"
-      ^ "The behaviour changed in ocaml 3.10 (previous behaviour was hiding.)"
-  | Instance_variable_override (cname :: slist) ->
-      String.concat " "
-        ("the following instance variables are overridden by the class" :: cname
-       :: ":\n " :: slist)
-      ^ "\nThe behaviour changed in ocaml 3.10 (previous behaviour was hiding.)"
-  | Instance_variable_override [] -> assert false
-  | Illegal_backslash -> "illegal backslash escape in string."
-  | Implicit_public_methods l ->
-      "the following private methods were made public implicitly:\n "
-      ^ String.concat " " l ^ "."
-  | Unerasable_optional_argument ->
-      String.concat ""
-        [
-          "This optional parameter in final position will, in practice, not be \
-           optional.\n";
-          "  Reorder the parameters so that at least one non-optional one is \
-           in final position or, if all parameters are optional, insert a \
-           final ().\n\n";
-          "  Explanation: If the final parameter is optional, it'd be unclear \
-           whether a function application that omits it should be considered \
-           fully applied, or partially applied. Imagine writing `let title = \
-           display(\"hello!\")`, only to realize `title` isn't your desired \
-           result, but a curried call that takes a final optional argument, \
-           e.g. `~showDate`.\n\n";
-          "  Formal rule: an optional argument is considered intentionally \
-           omitted when the 1st positional (i.e. neither labeled nor optional) \
-           argument defined after it is passed in.";
-        ]
-  | Unused_argument -> "this argument will not be used by the function."
-  | Nonreturning_statement ->
-      "this statement never returns (or has an unsound type.)"
-  | Preprocessor s -> s
-  | Useless_record_with -> (
-      match !Config.syntax_kind with
-      | `ml ->
-          "all the fields are explicitly listed in this record:\n\
-           the 'with' clause is useless."
-      | `rescript ->
-          "All the fields are already explicitly listed in this record. You \
-           can remove the `...` spread.")
-  | Bad_module_name modname ->
-      "This file's name is potentially invalid. The build systems \
-       conventionally turn a file name into a module name by upper-casing the \
-       first letter. " ^ modname ^ " isn't a valid module name.\n"
-      ^ "Note: some build systems might e.g. turn kebab-case into CamelCase \
-         module, which is why this isn't a hard error."
-  | All_clauses_guarded ->
-      "this pattern-matching is not exhaustive.\n\
-       All clauses in this pattern-matching are guarded."
-  | Unused_var v | Unused_var_strict v -> "unused variable " ^ v ^ "."
-  | Wildcard_arg_to_constant_constr ->
-      "wildcard pattern given as argument to a constant constructor"
-  | Eol_in_string ->
-      "unescaped end-of-line in a string constant (non-portable code)"
-  | Duplicate_definitions (kind, cname, tc1, tc2) ->
-      Printf.sprintf "the %s %s is defined in both types %s and %s." kind cname
-        tc1 tc2
-  | Unused_value_declaration v -> "unused value " ^ v ^ "."
-  | Unused_open s -> "unused open " ^ s ^ "."
-  | Unused_type_declaration s -> "unused type " ^ s ^ "."
-  | Unused_for_index s -> "unused for-loop index " ^ s ^ "."
-  | Unused_constructor (s, false, false) -> "unused constructor " ^ s ^ "."
-  | Unused_constructor (s, true, _) ->
-      "constructor " ^ s
-      ^ " is never used to build values.\n\
-         (However, this constructor appears in patterns.)"
-  | Unused_constructor (s, false, true) ->
-      "constructor " ^ s
-      ^ " is never used to build values.\n\
-         Its type is exported as a private type."
-  | Unused_extension (s, is_exception, cu_pattern, cu_privatize) -> (
-      let kind =
-        if is_exception then "exception" else "extension constructor"
-      in
-      let name = kind ^ " " ^ s in
-      match (cu_pattern, cu_privatize) with
-      | false, false -> "unused " ^ name
-      | true, _ ->
-          name
-          ^ " is never used to build values.\n\
-             (However, this constructor appears in patterns.)"
-      | false, true ->
-          name
-          ^ " is never used to build values.\n\
-             It is exported or rebound as a private extension.")
-  | Unused_rec_flag -> "unused rec flag."
-  | Ambiguous_name ([ s ], tl, false) ->
-      s ^ " belongs to several types: " ^ String.concat " " tl
-      ^ "\nThe first one was selected. Please disambiguate if this is wrong."
-  | Ambiguous_name (_, _, false) -> assert false
-  | Ambiguous_name (_slist, tl, true) ->
-      "these field labels belong to several types: " ^ String.concat " " tl
-      ^ "\nThe first one was selected. Please disambiguate if this is wrong."
-  | Nonoptional_label s -> "the label " ^ s ^ " is not optional."
-  | Open_shadow_identifier (kind, s) ->
-      Printf.sprintf
-        "this open statement shadows the %s identifier %s (which is later used)"
-        kind s
-  | Open_shadow_label_constructor (kind, s) ->
-      Printf.sprintf
-        "this open statement shadows the %s %s (which is later used)" kind s
-  | Attribute_payload (a, s) ->
-      Printf.sprintf "illegal payload for attribute '%s'.\n%s" a s
-  | Eliminated_optional_arguments sl ->
-      Printf.sprintf "implicit elimination of optional argument%s %s"
-        (if List.length sl = 1 then "" else "s")
-        (String.concat ", " sl)
-  | No_cmi_file (name, None) ->
-      "no cmi file was found in path for module " ^ name
-  | No_cmi_file (name, Some msg) ->
-      Printf.sprintf "no valid cmi file was found in path for module %s. %s"
-        name msg
-  | Bad_docstring unattached ->
-      if unattached then "unattached documentation comment (ignored)"
-      else "ambiguous documentation comment"
-  | Fragile_literal_pattern ->
-      Printf.sprintf
-        "Code should not depend on the actual values of\n\
-         this constructor's arguments. They are only for information\n\
-         and may change in future versions. (See manual section 8.5)"
-  | Unreachable_case ->
-      "this match case is unreachable.\n\
-       Consider replacing it with a refutation case '<pat> -> .'"
-  | Misplaced_attribute attr_name ->
-      Printf.sprintf "the %S attribute cannot appear in this context" attr_name
-  | Duplicated_attribute attr_name ->
-      Printf.sprintf
-        "the %S attribute is used more than once on this expression" attr_name
-  | Ambiguous_pattern vars ->
-      let msg =
-        let vars = List.sort String.compare vars in
-        match vars with
-        | [] -> assert false
-        | [ x ] -> "variable " ^ x
-        | _ :: _ -> "variables " ^ String.concat "," vars
-      in
-      Printf.sprintf
-        "Ambiguous or-pattern variables under guard;\n\
-         %s may match different arguments. (See manual section 8.5)" msg
-  | Unused_module s -> "unused module " ^ s ^ "."
-  | Constraint_on_gadt ->
-      "Type constraints do not apply to GADT cases of variant types."
-  | Bs_unused_attribute s ->
-      "Unused attribute: " ^ s
-      ^ "\n\
-         This means such annotation is not annotated properly. \n\
-         for example, some annotations is only meaningful in externals \n"
-  | Bs_polymorphic_comparison ->
-      "Polymorphic comparison introduced (maybe unsafe)"
-  | Bs_ffi_warning s -> "FFI warning: " ^ s
-  | Bs_derive_warning s -> "@deriving warning: " ^ s
-  | Bs_fragile_external s ->
-      s
-      ^ " : using an empty string as a shorthand to infer the external's name \
-         from the value's name is dangerous when refactoring, and therefore \
-         deprecated"
-  | Bs_unimplemented_primitive s -> "Unimplemented primitive used:" ^ s
-  | Bs_integer_literal_overflow ->
-      "Integer literal exceeds the range of representable integers of type int"
-  | Bs_uninterpreted_delimiters s -> "Uninterpreted delimiters " ^ s
-  | Bs_toplevel_expression_unit help ->
-      Printf.sprintf "This%sis at the top level and is expected to return `unit`. But it's returning %s.\n\n  In ReScript, anything at the top level must evaluate to `unit`. You can fix this by assigning the expression to a value, or piping it into the `ignore` function.%s" 
-        (match help with 
-        | Some (_, FunctionCall) -> " function call " 
-        | _ -> " ") 
-
-        (match help with 
-        | Some (returnType, _) -> Printf.sprintf "`%s`" returnType 
-        | None -> "something that is not `unit`")
-
-        (match help with 
-        | Some (_, helpTyp) ->
-          let helpText = (match helpTyp with 
-          | FunctionCall -> "yourFunctionCall()" 
-          | Other -> "yourExpression") in
-          Printf.sprintf "\n\n  Possible solutions:\n  - Assigning to a value that is then ignored: `let _ = %s`\n  - Piping into the built-in ignore function to ignore the result: `%s->ignore`" helpText helpText
-        | _ -> "") 
-    | Bs_todo maybe_text -> (
-      match maybe_text with 
-      | None -> "Todo found." 
-      | Some todo -> "Todo found: " ^ todo
-    ) ^ "\n\n  This code is not implemented yet and will crash at runtime. Make sure you implement this before running the code."
-
-let sub_locs = function
-  | Deprecated (_, def, use) ->
-      [ (def, "Definition"); (use, "Expected signature") ]
-  | _ -> []
-
-let has_warnings = ref false
-
-let nerrors = ref 0
-
-type reporting_information = {
-  number : int;
-  message : string;
-  is_error : bool;
-  sub_locs : (loc * string) list;
-}
-
-let report w =
-  match is_active w with
-  | false -> `Inactive
-  | true ->
-      has_warnings := true;
-      if is_error w then incr nerrors;
-      `Active
-        {
-          number = number w;
-          message = message w;
-          is_error = is_error w;
-          sub_locs = sub_locs w;
-        }
-
-exception Errors
-
-let reset_fatal () = nerrors := 0
-
-let check_fatal () =
-  if !nerrors > 0 then (
-    nerrors := 0;
-    raise Errors)
-
-let descriptions =
-  [
-    (1, "Suspicious-looking start-of-comment mark.");
-    (2, "Suspicious-looking end-of-comment mark.");
-    (3, "Deprecated feature.");
-    ( 4,
-      "Fragile pattern matching: matching that will remain complete even\n\
-      \    if additional constructors are added to one of the variant types\n\
-      \    matched." );
-    ( 5,
-      "Partially applied function: expression whose result has function\n\
-      \    type and is ignored." );
-    (6, "Label omitted in function application.");
-    (7, "Method overridden.");
-    (8, "Partial match: missing cases in pattern-matching.");
-    (9, "Missing fields in a record pattern.");
-    ( 10,
-      "Expression on the left-hand side of a sequence that doesn't have type\n\
-      \    \"unit\" (and that is not a function, see warning number 5)." );
-    (11, "Redundant case in a pattern matching (unused match case).");
-    (12, "Redundant sub-pattern in a pattern-matching.");
-    (13, "Instance variable overridden.");
-    (14, "Illegal backslash escape in a string constant.");
-    (15, "Private method made public implicitly.");
-    (16, "Unerasable optional argument.");
-    (17, "Undeclared virtual method.");
-    (18, "Non-principal type.");
-    (19, "Type without principality.");
-    (20, "Unused function argument.");
-    (21, "Non-returning statement.");
-    (22, "Preprocessor warning.");
-    (23, "Useless record \"with\" clause.");
-    ( 24,
-      "Bad module name: the source file name is not a valid OCaml module name."
-    );
-    (25, "Deprecated: now part of warning 8.");
-    ( 26,
-      "Suspicious unused variable: unused variable that is bound\n\
-      \    with \"let\" or \"as\", and doesn't start with an underscore (\"_\")\n\
-      \    character." );
-    ( 27,
-      "Innocuous unused variable: unused variable that is not bound with\n\
-      \    \"let\" nor \"as\", and doesn't start with an underscore (\"_\")\n\
-      \    character." );
-    (28, "Wildcard pattern given as argument to a constant constructor.");
-    (29, "Unescaped end-of-line in a string constant (non-portable code).");
-    ( 30,
-      "Two labels or constructors of the same name are defined in two\n\
-      \    mutually recursive types." );
-    (31, "A module is linked twice in the same executable.");
-    (32, "Unused value declaration.");
-    (33, "Unused open statement.");
-    (34, "Unused type declaration.");
-    (35, "Unused for-loop index.");
-    (36, "Unused ancestor variable.");
-    (37, "Unused constructor.");
-    (38, "Unused extension constructor.");
-    (39, "Unused rec flag.");
-    (41, "Ambiguous constructor or label name.");
-    (43, "Nonoptional label applied as optional.");
-    (44, "Open statement shadows an already defined identifier.");
-    (45, "Open statement shadows an already defined label or constructor.");
-    (46, "Error in environment variable.");
-    (47, "Illegal attribute payload.");
-    (48, "Implicit elimination of optional arguments.");
-    (49, "Absent cmi file when looking up module alias.");
-    (50, "Unexpected documentation comment.");
-    (51, "Warning on non-tail calls if @tailcall present.");
-    (52, "Fragile constant pattern.");
-    (53, "Attribute cannot appear in this context");
-    (54, "Attribute used more than once on an expression");
-    (55, "Inlining impossible");
-    (56, "Unreachable case in a pattern-matching (based on type information).");
-    (57, "Ambiguous or-pattern variables under guard");
-    (59, "Assignment to non-mutable value");
-    (60, "Unused module declaration");
-    (61, "Unboxable type in primitive declaration");
-    (62, "Type constraint on GADT type declaration");
-    (101, "Unused bs attributes");
-    (102, "Polymorphic comparison introduced (maybe unsafe)");
-    (103, "Fragile FFI definitions");
-    (104, "bs.deriving warning with customized message ");
-    ( 105,
-      "External name is inferred from val name is unsafe from refactoring when \
-       changing value name" );
-    (106, "Unimplemented primitive used:");
-    ( 107,
-      "Integer literal exceeds the range of representable integers of type int"
-    );
-    (108, "Uninterpreted delimiters (for unicode)");
-    (109, "Toplevel expression has unit type");
-    (110, "Todo found");
-  ]
-
-let help_warnings () =
-  List.iter (fun (i, s) -> Printf.printf "%3i %s\n" i s) descriptions;
-  print_endline "  A all warnings";
-  for i = Char.code 'b' to Char.code 'z' do
-    let c = Char.chr i in
-    match letter c with
-    | [] -> ()
-    | [ n ] ->
-        Printf.printf "  %c Alias for warning %i.\n" (Char.uppercase_ascii c) n
-    | l ->
-        Printf.printf "  %c warnings %s.\n" (Char.uppercase_ascii c)
-          (String.concat ", " (List.map string_of_int l))
-  done;
-  exit 0
diff --git a/jscomp/frontend/ast_attributes.ml b/jscomp/frontend/ast_attributes.ml
deleted file mode 100644
index 8e10958..0000000
--- a/jscomp/frontend/ast_attributes.ml
+++ /dev/null
@@ -1,384 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 attr = Parsetree.attribute
-type t = attr list
-type ('a, 'b) st = {get: 'a option; set: 'b option}
-
-let process_method_attributes_rev (attrs : t) =
-  Ext_list.fold_left attrs
-    ({get = None; set = None}, [])
-    (fun (st, acc) (({txt; loc}, payload) as attr) ->
-      match txt with
-      | "bs.get" | "get" (* @bs.get{null; undefined}*) ->
-        let result =
-          Ext_list.fold_left (Ast_payload.ident_or_record_as_config loc payload)
-            (false, false) (fun (null, undefined) ({txt; loc}, opt_expr) ->
-              match txt with
-              | "null" ->
-                ( (match opt_expr with
-                  | None -> true
-                  | Some e -> Ast_payload.assert_bool_lit e),
-                  undefined )
-              | "undefined" ->
-                ( null,
-                  match opt_expr with
-                  | None -> true
-                  | Some e -> Ast_payload.assert_bool_lit e )
-              | "nullable" -> (
-                match opt_expr with
-                | None -> (true, true)
-                | Some e ->
-                  let v = Ast_payload.assert_bool_lit e in
-                  (v, v))
-              | _ -> Bs_syntaxerr.err loc Unsupported_predicates)
-        in
-
-        ({st with get = Some result}, acc)
-      | "bs.set" | "set" ->
-        let result =
-          Ext_list.fold_left (Ast_payload.ident_or_record_as_config loc payload)
-            `Get (fun _st ({txt; loc}, opt_expr) ->
-              (*FIXME*)
-              if txt = "no_get" then
-                match opt_expr with
-                | None -> `No_get
-                | Some e ->
-                  if Ast_payload.assert_bool_lit e then `No_get else `Get
-              else Bs_syntaxerr.err loc Unsupported_predicates)
-        in
-        (* properties -- void
-              [@@set{only}]
-        *)
-        ({st with set = Some result}, acc)
-      | _ -> (st, attr :: acc))
-
-type attr_kind =
-  | Nothing
-  | Meth_callback of attr
-  | Uncurry of attr
-  | Method of attr
-
-let process_attributes_rev (attrs : t) : attr_kind * t =
-  Ext_list.fold_left attrs (Nothing, [])
-    (fun (st, acc) (({txt; loc}, _) as attr) ->
-      match (txt, st) with
-      | "bs", (Nothing | Uncurry _) ->
-        (Uncurry attr, acc) (* TODO: warn unused/duplicated attribute *)
-      | ("bs.this" | "this"), (Nothing | Meth_callback _) ->
-        (Meth_callback attr, acc)
-      | ("bs.meth" | "meth"), (Nothing | Method _) -> (Method attr, acc)
-      | ("bs" | "bs.this" | "this"), _ ->
-        Bs_syntaxerr.err loc Conflict_bs_bs_this_bs_meth
-      | _, _ -> (st, attr :: acc))
-
-let process_pexp_fun_attributes_rev (attrs : t) =
-  Ext_list.fold_left attrs (false, [])
-    (fun (st, acc) (({txt; loc = _}, _) as attr) ->
-      match txt with
-      | "bs.open" -> (true, acc)
-      | _ -> (st, attr :: acc))
-
-let process_bs (attrs : t) =
-  Ext_list.fold_left attrs (false, [])
-    (fun (st, acc) (({txt; loc = _}, _) as attr) ->
-      match (txt, st) with
-      | "bs", _ -> (true, acc)
-      | _, _ -> (st, attr :: acc))
-
-let external_attrs =
-  [|
-    "get";
-    "set";
-    "get_index";
-    "return";
-    "obj";
-    "val";
-    "module";
-    "scope";
-    "variadic";
-    "send";
-    "new";
-    "set_index";
-    Literals.gentype_import1;
-    Literals.gentype_import2;
-  |]
-
-let first_char_special (x : string) =
-  match String.unsafe_get x 0 with
-  | '#' | '?' | '%' -> true
-  | _ -> false
-
-let prims_to_be_encoded (attrs : string list) =
-  match attrs with
-  | [] -> assert false (* normal val declaration *)
-  | x :: _ when first_char_special x -> false
-  | _ :: x :: _ when Ext_string.first_marshal_char x -> false
-  | _ -> true
-
-(**
-
-   [@@inline]
-   let a = 3
-
-   [@@inline]
-   let a : 3 
-
-   They are not considered externals, they are part of the language
-*)
-
-let rs_externals (attrs : t) pval_prim =
-  match (attrs, pval_prim) with
-  | _, [] -> false
-  (* This is  val *)
-  | [], _ ->
-    (* Not any attribute found *)
-    prims_to_be_encoded pval_prim
-  | _, _ ->
-    Ext_list.exists_fst attrs (fun ({txt} : string Asttypes.loc) ->
-        Ext_string.starts_with txt "bs."
-        || Ext_array.exists external_attrs (fun (x : string) -> txt = x))
-    || prims_to_be_encoded pval_prim
-
-let is_inline : attr -> bool =
- fun ({txt}, _) -> txt = "bs.inline" || txt = "inline"
-
-let has_inline_payload (attrs : t) = Ext_list.find_first attrs is_inline
-
-let has_await_payload (attrs : t) = Ext_list.find_first attrs Ast_await.is_await
-let has_async_payload (attrs : t) = Ext_list.find_first attrs Ast_async.is_async
-
-type derive_attr = {bs_deriving: Ast_payload.action list option} [@@unboxed]
-
-let process_derive_type (attrs : t) : derive_attr * t =
-  Ext_list.fold_left attrs
-    ({bs_deriving = None}, [])
-    (fun (st, acc) (({txt; loc}, payload) as attr) ->
-      match txt with
-      | "bs.deriving" | "deriving" -> (
-        match st.bs_deriving with
-        | None ->
-          ( {
-              bs_deriving =
-                Some (Ast_payload.ident_or_record_as_config loc payload);
-            },
-            acc )
-        | Some _ -> Bs_syntaxerr.err loc Duplicated_bs_deriving)
-      | _ -> (st, attr :: acc))
-
-let process_send_pipe (attrs : t) : (Parsetree.core_type * t) option =
-  match attrs with
-  | [] -> None
-  | _ -> (
-    if not (Ext_list.exists_fst attrs (fun {txt} -> txt = "bs.send.pipe")) then
-      (* fast path *)
-      None
-    else
-      let ty = ref None in
-      let attrs =
-        Ext_list.fold_left attrs [] (fun acc (({txt; loc}, payload) as attr) ->
-            match txt with
-            | "bs.send.pipe" -> (
-              match !ty with
-              | None ->
-                Location.prerr_warning loc
-                  (Warnings.Bs_ffi_warning
-                     "This attribute is deprecated, use @send instead.");
-
-                ty := Some (Ast_payload.as_core_type loc payload);
-                ({Asttypes.txt = "bs.send"; loc}, Parsetree.PStr []) :: acc
-              | Some _ -> Location.raise_errorf ~loc "Duplicated bs.send.pipe")
-            | _ -> attr :: acc)
-      in
-      match !ty with
-      | None -> assert false
-      | Some ty -> Some (ty, attrs))
-
-(* duplicated @uncurry @string not allowed,
-   it is worse in @uncurry since it will introduce
-   inconsistency in arity
-*)
-let iter_process_bs_string_int_unwrap_uncurry (attrs : t) =
-  let st = ref `Nothing in
-  let assign v (({loc; _}, _) as attr : attr) =
-    if !st = `Nothing then (
-      Bs_ast_invariant.mark_used_bs_attribute attr;
-      st := v)
-    else Bs_syntaxerr.err loc Conflict_attributes
-  in
-  Ext_list.iter attrs (fun (({txt; loc = _}, (payload : _)) as attr) ->
-      match txt with
-      | "bs.string" | "string" -> assign `String attr
-      | "bs.int" | "int" -> assign `Int attr
-      | "bs.ignore" | "ignore" -> assign `Ignore attr
-      | "bs.unwrap" | "unwrap" -> assign `Unwrap attr
-      | "bs.uncurry" | "uncurry" ->
-        if !Config.uncurried = Uncurried then
-          Bs_ast_invariant.mark_used_bs_attribute attr
-        else assign (`Uncurry (Ast_payload.is_single_int payload)) attr
-      | _ -> ());
-  !st
-
-let iter_process_bs_string_as (attrs : t) : string option =
-  let st = ref None in
-  Ext_list.iter attrs (fun (({txt; loc}, payload) as attr) ->
-      match txt with
-      | "bs.as" | "as" ->
-        if !st = None then (
-          match Ast_payload.is_single_string payload with
-          | None -> Bs_syntaxerr.err loc Expect_string_literal
-          | Some (v, _dec) ->
-            Bs_ast_invariant.mark_used_bs_attribute attr;
-            st := Some v)
-        else raise (Ast_untagged_variants.Error (loc, Duplicated_bs_as))
-      | _ -> ());
-  !st
-let has_bs_optional (attrs : t) : bool =
-  Ext_list.exists attrs (fun (({txt}, _) as attr) ->
-      match txt with
-      | "bs.optional" | "optional" ->
-        Bs_ast_invariant.mark_used_bs_attribute attr;
-        true
-      | _ -> false)
-
-let iter_process_bs_int_as (attrs : t) =
-  let st = ref None in
-  Ext_list.iter attrs (fun (({txt; loc}, payload) as attr) ->
-      match txt with
-      | "bs.as" | "as" ->
-        if !st = None then (
-          match Ast_payload.is_single_int payload with
-          | None -> Bs_syntaxerr.err loc Expect_int_literal
-          | Some _ as v ->
-            Bs_ast_invariant.mark_used_bs_attribute attr;
-            st := v)
-        else raise (Ast_untagged_variants.Error (loc, Duplicated_bs_as))
-      | _ -> ());
-  !st
-
-type as_const_payload = Int of int | Str of string * External_arg_spec.delim
-
-let iter_process_bs_string_or_int_as (attrs : Parsetree.attributes) =
-  let st = ref None in
-  Ext_list.iter attrs (fun (({txt; loc}, payload) as attr) ->
-      match txt with
-      | "bs.as" | "as" ->
-        if !st = None then (
-          Bs_ast_invariant.mark_used_bs_attribute attr;
-          match Ast_payload.is_single_int payload with
-          | None -> (
-            match payload with
-            | PStr
-                [
-                  {
-                    pstr_desc =
-                      Pstr_eval
-                        ( {
-                            pexp_desc = Pexp_constant (Pconst_string (s, delim_));
-                            pexp_loc;
-                            _;
-                          },
-                          _ );
-                    _;
-                  };
-                ]
-              when Ast_utf8_string_interp.parse_processed_delim delim_ <> None
-              -> (
-              let delim =
-                match Ast_utf8_string_interp.parse_processed_delim delim_ with
-                | None -> assert false
-                | Some delim -> delim
-              in
-              st := Some (Str (s, delim));
-              if delim = DNoQuotes then
-                (* check that it is a valid object literal *)
-                match
-                  Classify_function.classify
-                    ~check:(pexp_loc, Bs_flow_ast_utils.flow_deli_offset delim_)
-                    s
-                with
-                | Js_literal _ -> ()
-                | _ ->
-                  Location.raise_errorf ~loc:pexp_loc
-                    "an object literal expected")
-            | _ -> Bs_syntaxerr.err loc Expect_int_or_string_or_json_literal)
-          | Some v -> st := Some (Int v))
-        else raise (Ast_untagged_variants.Error (loc, Duplicated_bs_as))
-      | _ -> ());
-  !st
-
-let locg = Location.none
-(* let bs : attr
-   =  {txt = "bs" ; loc = locg}, Ast_payload.empty *)
-
-let is_bs (attr : attr) =
-  match attr with
-  | {Location.txt = "bs"; _}, _ -> true
-  | _ -> false
-
-let res_uapp : attr = ({txt = "res.uapp"; loc = locg}, Ast_payload.empty)
-
-let bs_get : attr = ({txt = "bs.get"; loc = locg}, Ast_payload.empty)
-
-let bs_get_index : attr = ({txt = "bs.get_index"; loc = locg}, Ast_payload.empty)
-
-let bs_get_arity : attr =
-  ( {txt = "internal.arity"; loc = locg},
-    PStr
-      [
-        {
-          pstr_desc = Pstr_eval (Ast_compatible.const_exp_int ~loc:locg 1, []);
-          pstr_loc = locg;
-        };
-      ] )
-
-let bs_set : attr = ({txt = "bs.set"; loc = locg}, Ast_payload.empty)
-
-let internal_expansive : attr =
-  ({txt = "internal.expansive"; loc = locg}, Ast_payload.empty)
-
-let bs_return_undefined : attr =
-  ( {txt = "bs.return"; loc = locg},
-    PStr
-      [
-        {
-          pstr_desc =
-            Pstr_eval
-              ( {
-                  pexp_desc =
-                    Pexp_ident {txt = Lident "undefined_to_opt"; loc = locg};
-                  pexp_loc = locg;
-                  pexp_attributes = [];
-                },
-                [] );
-          pstr_loc = locg;
-        };
-      ] )
-
-let is_gentype (attr : attr) =
-  match attr with
-  | {Location.txt = "genType" | "gentype"; _}, _ -> true
-  | _ -> false
-
-let gentype : attr = ({txt = "genType"; loc = locg}, Ast_payload.empty)
diff --git a/jscomp/frontend/ast_attributes.mli b/jscomp/frontend/ast_attributes.mli
deleted file mode 100644
index ec31ccb..0000000
--- a/jscomp/frontend/ast_attributes.mli
+++ /dev/null
@@ -1,96 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 attr = Parsetree.attribute
-
-type t = attr list
-
-type ('a, 'b) st = {get: 'a option; set: 'b option}
-
-val process_method_attributes_rev : t -> (bool * bool, [`Get | `No_get]) st * t
-
-type attr_kind =
-  | Nothing
-  | Meth_callback of attr
-  | Uncurry of attr
-  | Method of attr
-
-val process_attributes_rev : t -> attr_kind * t
-
-val process_pexp_fun_attributes_rev : t -> bool * t
-
-val process_bs : t -> bool * t
-
-val has_inline_payload : t -> attr option
-
-val has_await_payload : t -> attr option
-val has_async_payload : t -> attr option
-
-type derive_attr = {bs_deriving: Ast_payload.action list option} [@@unboxed]
-
-val iter_process_bs_string_int_unwrap_uncurry :
-  t -> [`Nothing | `String | `Int | `Ignore | `Unwrap | `Uncurry of int option]
-
-val iter_process_bs_string_as : t -> string option
-
-val has_bs_optional : t -> bool
-
-val iter_process_bs_int_as : t -> int option
-
-type as_const_payload = Int of int | Str of string * External_arg_spec.delim
-val iter_process_bs_string_or_int_as : t -> as_const_payload option
-
-val process_derive_type : t -> derive_attr * t
-
-(* val iter_process_derive_type :
-   t -> derive_attr
-
-
-   val bs : attr *)
-val is_bs : attr -> bool
-(* val is_optional : attr -> bool
-   val is_bs_as : attr -> bool *)
-
-(* Attribute for uncurried application coming from the ReScript parser *)
-val res_uapp : attr
-
-val bs_get : attr
-
-val bs_get_index : attr
-
-val bs_get_arity : attr
-
-val bs_set : attr
-
-val bs_return_undefined : attr
-
-val internal_expansive : attr
-(* val deprecated : string -> attr *)
-
-val rs_externals : t -> string list -> bool
-
-val process_send_pipe : t -> (Parsetree.core_type * t) option
-
-val is_gentype : attr -> bool
-
-val gentype : attr
diff --git a/jscomp/frontend/ast_bs_open.ml b/jscomp/frontend/ast_bs_open.ml
deleted file mode 100644
index b398970..0000000
--- a/jscomp/frontend/ast_bs_open.ml
+++ /dev/null
@@ -1,75 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let isCamlExceptionOrOpenVariant : Longident.t =
-  Ldot (Ldot (Lident "Js", "Exn"), "isCamlExceptionOrOpenVariant")
-
-let obj_magic : Longident.t = Lident "__unsafe_cast"
-
-let rec checkCases (cases : Parsetree.case list) = List.iter check_case cases
-
-and check_case case = check_pat case.pc_lhs
-
-and check_pat (pat : Parsetree.pattern) =
-  match pat.ppat_desc with
-  | Ppat_construct _ -> ()
-  | Ppat_or (l, r) ->
-    check_pat l;
-    check_pat r
-  | _ ->
-    Location.raise_errorf ~loc:pat.ppat_loc "Unsupported pattern in `bs.open`"
-
-let convertBsErrorFunction loc (self : Bs_ast_mapper.mapper) attrs
-    (cases : Parsetree.case list) =
-  let open Ast_helper in
-  let txt = "match" in
-  let txt_expr = Exp.ident ~loc {txt = Lident txt; loc} in
-  let none = Exp.construct ~loc {txt = Ast_literal.predef_none; loc} None in
-  let () = checkCases cases in
-  let cases = self.cases self cases in
-  Ast_compatible.fun_ ~attrs ~loc
-    (Pat.var ~loc {txt; loc})
-    (Exp.ifthenelse ~loc
-       (Ast_compatible.app1 ~loc
-          (Exp.ident ~loc {txt = isCamlExceptionOrOpenVariant; loc})
-          txt_expr)
-       (Exp.match_ ~loc
-          (Exp.constraint_ ~loc
-             (Ast_compatible.app1 ~loc
-                (Exp.ident ~loc {txt = obj_magic; loc})
-                txt_expr)
-             (Ast_literal.type_exn ~loc ()))
-          (Ext_list.map_append cases
-             [Exp.case (Pat.any ~loc ()) none]
-             (fun x ->
-               let pc_rhs = x.pc_rhs in
-               let loc = pc_rhs.pexp_loc in
-               {
-                 x with
-                 pc_rhs =
-                   Exp.construct ~loc
-                     {txt = Ast_literal.predef_some; loc}
-                     (Some pc_rhs);
-               })))
-       (Some none))
diff --git a/jscomp/frontend/ast_bs_open.mli b/jscomp/frontend/ast_bs_open.mli
deleted file mode 100644
index ce1cf04..0000000
--- a/jscomp/frontend/ast_bs_open.mli
+++ /dev/null
@@ -1,30 +0,0 @@
-(* Copyright (C) 2019- Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val convertBsErrorFunction :
-  Location.t ->
-  Bs_ast_mapper.mapper ->
-  Ast_helper.attrs ->
-  Parsetree.case list ->
-  Parsetree.expression
diff --git a/jscomp/frontend/ast_comb.ml b/jscomp/frontend/ast_comb.ml
deleted file mode 100644
index 0462a79..0000000
--- a/jscomp/frontend/ast_comb.ml
+++ /dev/null
@@ -1,68 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open Ast_helper
-
-(* let fun_no_label ?loc ?attrs  pat body =
-   Ast_compatible.fun_ ?loc ?attrs  pat body *)
-
-(* let discard_exp_as_unit loc e =
-   Ast_compatible.apply_simple ~loc
-    (Exp.ident ~loc {txt = Ast_literal.Lid.ignore_id; loc})
-    [Exp.constraint_ ~loc e
-       (Ast_literal.type_unit ~loc ())] *)
-
-let tuple_type_pair ?loc kind arity =
-  let prefix = "a" in
-  if arity = 0 then
-    let ty = Typ.var ?loc (prefix ^ "0") in
-    match kind with
-    | `Run -> (ty, [], ty)
-    | `Make ->
-      (Ast_compatible.arrow ?loc (Ast_literal.type_unit ?loc ()) ty, [], ty)
-  else
-    let number = arity + 1 in
-    let tys =
-      Ext_list.init number (fun i ->
-          Typ.var ?loc (prefix ^ string_of_int (number - i - 1)))
-    in
-    match tys with
-    | result :: rest ->
-      ( Ext_list.reduce_from_left tys (fun r arg ->
-            Ast_compatible.arrow ?loc arg r),
-        List.rev rest,
-        result )
-    | [] -> assert false
-
-let re_id = Ast_literal.Lid.js_re_id
-
-let to_js_re_type loc = Typ.constr ~loc {txt = re_id; loc} []
-
-let to_undefined_type loc x =
-  Typ.constr ~loc {txt = Ast_literal.Lid.js_undefined; loc} [x]
-
-let single_non_rec_value ?(attrs = []) name exp =
-  Str.value Nonrecursive [Vb.mk ~attrs (Pat.var name) exp]
-
-let single_non_rec_val ?(attrs = []) name ty = Sig.value (Val.mk ~attrs name ty)
diff --git a/jscomp/frontend/ast_comb.mli b/jscomp/frontend/ast_comb.mli
deleted file mode 100644
index 21dbfa9..0000000
--- a/jscomp/frontend/ast_comb.mli
+++ /dev/null
@@ -1,54 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* note we first declare its type is [unit],
-   then [ignore] it, [ignore] is necessary since
-   the js value  maybe not be of type [unit] and
-   we can use [unit] value (though very little chance)
-   sometimes
-*)
-(* val discard_exp_as_unit :
-   Location.t -> Parsetree.expression -> Parsetree.expression *)
-
-val tuple_type_pair :
-  ?loc:Ast_helper.loc ->
-  [< `Make | `Run] ->
-  int ->
-  Parsetree.core_type * Parsetree.core_type list * Parsetree.core_type
-
-val to_undefined_type : Location.t -> Parsetree.core_type -> Parsetree.core_type
-
-val to_js_re_type : Location.t -> Parsetree.core_type
-
-val single_non_rec_value :
-  ?attrs:Parsetree.attributes ->
-  Ast_helper.str ->
-  Parsetree.expression ->
-  Parsetree.structure_item
-
-val single_non_rec_val :
-  ?attrs:Parsetree.attributes ->
-  Ast_helper.str ->
-  Parsetree.core_type ->
-  Parsetree.signature_item
diff --git a/jscomp/frontend/ast_compatible.ml b/jscomp/frontend/ast_compatible.ml
deleted file mode 100644
index 338a66a..0000000
--- a/jscomp/frontend/ast_compatible.ml
+++ /dev/null
@@ -1,137 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 loc = Location.t
-
-type attrs = Parsetree.attribute list
-
-open Parsetree
-
-let default_loc = Location.none
-
-let arrow ?loc ?attrs a b = Ast_helper.Typ.arrow ?loc ?attrs Nolabel a b
-
-let apply_simple ?(loc = default_loc) ?(attrs = []) (fn : expression)
-    (args : expression list) : expression =
-  {
-    pexp_loc = loc;
-    pexp_attributes = attrs;
-    pexp_desc =
-      Pexp_apply (fn, Ext_list.map args (fun x -> (Asttypes.Nolabel, x)));
-  }
-
-let app1 ?(loc = default_loc) ?(attrs = []) fn arg1 : expression =
-  {
-    pexp_loc = loc;
-    pexp_attributes = attrs;
-    pexp_desc = Pexp_apply (fn, [(Nolabel, arg1)]);
-  }
-
-let app2 ?(loc = default_loc) ?(attrs = []) fn arg1 arg2 : expression =
-  {
-    pexp_loc = loc;
-    pexp_attributes = attrs;
-    pexp_desc = Pexp_apply (fn, [(Nolabel, arg1); (Nolabel, arg2)]);
-  }
-
-let app3 ?(loc = default_loc) ?(attrs = []) fn arg1 arg2 arg3 : expression =
-  {
-    pexp_loc = loc;
-    pexp_attributes = attrs;
-    pexp_desc =
-      Pexp_apply (fn, [(Nolabel, arg1); (Nolabel, arg2); (Nolabel, arg3)]);
-  }
-
-let fun_ ?(loc = default_loc) ?(attrs = []) pat exp =
-  {
-    pexp_loc = loc;
-    pexp_attributes = attrs;
-    pexp_desc = Pexp_fun (Nolabel, None, pat, exp);
-  }
-
-let const_exp_string ?(loc = default_loc) ?(attrs = []) ?delimiter (s : string)
-    : expression =
-  {
-    pexp_loc = loc;
-    pexp_attributes = attrs;
-    pexp_desc = Pexp_constant (Pconst_string (s, delimiter));
-  }
-
-let const_exp_int ?(loc = default_loc) ?(attrs = []) (s : int) : expression =
-  {
-    pexp_loc = loc;
-    pexp_attributes = attrs;
-    pexp_desc = Pexp_constant (Pconst_integer (string_of_int s, None));
-  }
-
-let apply_labels ?(loc = default_loc) ?(attrs = []) fn
-    (args : (string * expression) list) : expression =
-  {
-    pexp_loc = loc;
-    pexp_attributes = attrs;
-    pexp_desc =
-      Pexp_apply (fn, Ext_list.map args (fun (l, a) -> (Asttypes.Labelled l, a)));
-  }
-
-let label_arrow ?(loc = default_loc) ?(attrs = []) s a b : core_type =
-  {
-    ptyp_desc = Ptyp_arrow (Asttypes.Labelled s, a, b);
-    ptyp_loc = loc;
-    ptyp_attributes = attrs;
-  }
-
-let opt_arrow ?(loc = default_loc) ?(attrs = []) s a b : core_type =
-  {
-    ptyp_desc = Ptyp_arrow (Asttypes.Optional s, a, b);
-    ptyp_loc = loc;
-    ptyp_attributes = attrs;
-  }
-
-let rec_type_str ?(loc = default_loc) rf tds : structure_item =
-  {pstr_loc = loc; pstr_desc = Pstr_type (rf, tds)}
-
-let rec_type_sig ?(loc = default_loc) rf tds : signature_item =
-  {psig_loc = loc; psig_desc = Psig_type (rf, tds)}
-
-(* FIXME: need address migration of `[@nonrec]` attributes in older ocaml *)
-(* let nonrec_type_sig ?(loc=default_loc)  tds : signature_item =
-   {
-    psig_loc = loc;
-    psig_desc = Psig_type (
-      Nonrecursive,
-      tds)
-   } *)
-
-let const_exp_int_list_as_array xs =
-  Ast_helper.Exp.array (Ext_list.map xs (fun x -> const_exp_int x))
-
-(* let const_exp_string_list_as_array xs =
-   Ast_helper.Exp.array
-   (Ext_list.map xs (fun x -> const_exp_string x ) ) *)
-
-type object_field = Parsetree.object_field
-
-let object_field l attrs ty = Parsetree.Otag (l, attrs, ty)
-
-type args = (Asttypes.arg_label * Parsetree.expression) list
diff --git a/jscomp/frontend/ast_compatible.mli b/jscomp/frontend/ast_compatible.mli
deleted file mode 100644
index 8bda0e0..0000000
--- a/jscomp/frontend/ast_compatible.mli
+++ /dev/null
@@ -1,127 +0,0 @@
-(* Copyright (C) 2018 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 loc = Location.t
-
-type attrs = Parsetree.attribute list
-
-open Parsetree
-
-val const_exp_string :
-  ?loc:Location.t -> ?attrs:attrs -> ?delimiter:string -> string -> expression
-
-val const_exp_int : ?loc:Location.t -> ?attrs:attrs -> int -> expression
-
-val const_exp_int_list_as_array : int list -> expression
-
-val apply_simple :
-  ?loc:Location.t -> ?attrs:attrs -> expression -> expression list -> expression
-
-val app1 :
-  ?loc:Location.t -> ?attrs:attrs -> expression -> expression -> expression
-
-val app2 :
-  ?loc:Location.t ->
-  ?attrs:attrs ->
-  expression ->
-  expression ->
-  expression ->
-  expression
-
-val app3 :
-  ?loc:Location.t ->
-  ?attrs:attrs ->
-  expression ->
-  expression ->
-  expression ->
-  expression ->
-  expression
-
-val apply_labels :
-  ?loc:Location.t ->
-  ?attrs:attrs ->
-  expression ->
-  (string * expression) list ->
-  (* [(label,e)] [label] is strictly interpreted as label *)
-  expression
-(** Note this function would slightly 
-    change its semantics depending on compiler versions
-    for newer version: it means always label
-    for older version: it could be optional (which we should avoid)
-*)
-
-val fun_ :
-  ?loc:Location.t -> ?attrs:attrs -> pattern -> expression -> expression
-
-(* val opt_label : string -> Asttypes.arg_label *)
-
-(* val label_fun :
-   ?loc:Location.t ->
-   ?attrs:attrs ->
-   label:Asttypes.arg_label ->
-   pattern ->
-   expression ->
-   expression *)
-
-val arrow :
-  ?loc:Location.t -> ?attrs:attrs -> core_type -> core_type -> core_type
-
-val label_arrow :
-  ?loc:Location.t ->
-  ?attrs:attrs ->
-  string ->
-  core_type ->
-  core_type ->
-  core_type
-
-val opt_arrow :
-  ?loc:Location.t ->
-  ?attrs:attrs ->
-  string ->
-  core_type ->
-  core_type ->
-  core_type
-
-(* val nonrec_type_str:
-   ?loc:loc ->
-   type_declaration list ->
-   structure_item *)
-
-val rec_type_str :
-  ?loc:loc -> Asttypes.rec_flag -> type_declaration list -> structure_item
-
-(* val nonrec_type_sig:
-   ?loc:loc ->
-   type_declaration list ->
-   signature_item *)
-
-val rec_type_sig :
-  ?loc:loc -> Asttypes.rec_flag -> type_declaration list -> signature_item
-
-type object_field = Parsetree.object_field
-
-val object_field :
-  Asttypes.label Asttypes.loc -> attributes -> core_type -> object_field
-
-type args = (Asttypes.arg_label * Parsetree.expression) list
diff --git a/jscomp/frontend/ast_config.ml b/jscomp/frontend/ast_config.ml
deleted file mode 100644
index 9f7eb7e..0000000
--- a/jscomp/frontend/ast_config.ml
+++ /dev/null
@@ -1,91 +0,0 @@
-(* Copyright (C) 2020 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 action_table = (Parsetree.expression option -> unit) Map_string.t
-
-let structural_config_table : action_table ref =
-  ref
-    (Map_string.singleton "no_export" (fun x ->
-         Js_config.no_export :=
-           match x with
-           | Some e -> Ast_payload.assert_bool_lit e
-           | None -> true))
-
-let add_structure k v =
-  structural_config_table := Map_string.add !structural_config_table k v
-
-let signature_config_table : action_table ref = ref Map_string.empty
-
-let add_signature k v =
-  signature_config_table := Map_string.add !signature_config_table k v
-
-let process_directives str =
-  Js_config.directives := [];
-  (* Reset: multiple calls possible e.g. with bsc from the command-line *)
-  str
-  |> List.iter (fun (item : Parsetree.structure_item) ->
-         match item.pstr_desc with
-         | Pstr_attribute ({txt = "directive"}, payload) -> (
-           match Ast_payload.is_single_string payload with
-           | Some (d, _) -> Js_config.directives := !Js_config.directives @ [d]
-           | None -> Bs_syntaxerr.err item.pstr_loc Expect_string_literal)
-         | Pstr_attribute ({txt = "uncurried"}, _) ->
-           Config.uncurried := Uncurried
-         | _ -> ())
-
-let rec iter_on_bs_config_str (x : Parsetree.structure) =
-  match x with
-  | [] -> ()
-  | {
-      pstr_desc =
-        Pstr_attribute (({txt = "bs.config" | "config"; loc}, payload) as attr);
-    }
-    :: _ ->
-    Bs_ast_invariant.mark_used_bs_attribute attr;
-    Ext_list.iter
-      (Ast_payload.ident_or_record_as_config loc payload)
-      (Ast_payload.table_dispatch !structural_config_table)
-  | {pstr_desc = Pstr_attribute _} :: rest -> iter_on_bs_config_str rest
-  | _ :: _ -> ()
-
-let process_str str =
-  iter_on_bs_config_str str;
-  process_directives str
-
-let rec iter_on_bs_config_sig (x : Parsetree.signature) =
-  match x with
-  | [] -> ()
-  | {
-      psig_desc =
-        Psig_attribute (({txt = "bs.config" | "config"; loc}, payload) as attr);
-    }
-    :: _ ->
-    Bs_ast_invariant.mark_used_bs_attribute attr;
-    Ext_list.iter
-      (Ast_payload.ident_or_record_as_config loc payload)
-      (Ast_payload.table_dispatch !signature_config_table)
-  | {psig_desc = Psig_attribute _} :: rest -> iter_on_bs_config_sig rest
-  | _ :: _ -> ()
-
-let process_sig s = iter_on_bs_config_sig s
diff --git a/jscomp/frontend/ast_config.mli b/jscomp/frontend/ast_config.mli
deleted file mode 100644
index ab0e533..0000000
--- a/jscomp/frontend/ast_config.mli
+++ /dev/null
@@ -1,31 +0,0 @@
-(* Copyright (C) 2020 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val add_structure : string -> (Parsetree.expression option -> unit) -> unit
-
-val add_signature : string -> (Parsetree.expression option -> unit) -> unit
-
-val process_str : Parsetree.structure -> unit
-
-val process_sig : Parsetree.signature -> unit
diff --git a/jscomp/frontend/ast_core_type.ml b/jscomp/frontend/ast_core_type.ml
deleted file mode 100644
index e7b57b9..0000000
--- a/jscomp/frontend/ast_core_type.ml
+++ /dev/null
@@ -1,176 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Parsetree.core_type
-
-let lift_option_type ({ptyp_loc} as ty : t) : t =
-  {
-    ptyp_desc =
-      Ptyp_constr ({txt = Ast_literal.predef_option; loc = ptyp_loc}, [ty]);
-    ptyp_loc;
-    ptyp_attributes = [];
-  }
-
-open Ast_helper
-
-(* let replace_result (ty : t) (result : t) : t =
-   let rec aux (ty : Parsetree.core_type) =
-    match ty with
-    | { ptyp_desc =
-          Ptyp_arrow (label,t1,t2)
-      } -> { ty with ptyp_desc = Ptyp_arrow(label,t1, aux t2)}
-    | {ptyp_desc = Ptyp_poly(fs,ty)}
-      ->  {ty with ptyp_desc = Ptyp_poly(fs, aux ty)}
-    | _ -> result in
-   aux ty *)
-
-let is_builtin_rank0_type txt =
-  match txt with
-  | "int" | "char" | "bytes" | "float" | "bool" | "unit" | "exn" | "int64"
-  | "string" ->
-    true
-  | _ -> false
-
-let is_unit (ty : t) =
-  match ty.ptyp_desc with
-  | Ptyp_constr ({txt = Lident "unit"}, []) -> true
-  | _ -> false
-
-(* let is_array (ty : t) =
-   match ty.ptyp_desc with
-   | Ptyp_constr({txt =Lident "array"}, [_]) -> true
-   | _ -> false *)
-
-let is_user_option (ty : t) =
-  match ty.ptyp_desc with
-  | Ptyp_constr
-      ({txt = Lident "option" | Ldot (Lident "*predef*", "option")}, [_]) ->
-    true
-  | _ -> false
-
-(* let is_user_bool (ty : t) =
-   match ty.ptyp_desc with
-   | Ptyp_constr({txt = Lident "bool"},[]) -> true
-   | _ -> false *)
-
-(* let is_user_int (ty : t) =
-   match ty.ptyp_desc with
-   | Ptyp_constr({txt = Lident "int"},[]) -> true
-   | _ -> false *)
-
-(* Note that OCaml type checker will not allow arbitrary
-   name as type variables, for example:
-   {[
-     '_x'_
-   ]}
-   will be recognized as a invalid program
-*)
-let from_labels ~loc arity labels : t =
-  let tyvars =
-    Ext_list.init arity (fun i -> Typ.var ~loc ("a" ^ string_of_int i))
-  in
-  let result_type =
-    Typ.object_ ~loc
-      (Ext_list.map2 labels tyvars (fun x y -> Parsetree.Otag (x, [], y)))
-      Closed
-  in
-  Ext_list.fold_right2 labels tyvars result_type
-    (fun label (* {loc ; txt = label }*) tyvar acc ->
-      Ast_compatible.label_arrow ~loc:label.loc label.txt tyvar acc)
-
-let make_obj ~loc xs = Typ.object_ ~loc xs Closed
-
-(**
-
-   {[ 'a . 'a -> 'b ]}
-   OCaml does not support such syntax yet
-   {[ 'a -> ('a. 'a -> 'b) ]}
-
-*)
-let rec get_uncurry_arity_aux (ty : t) acc =
-  match ty.ptyp_desc with
-  | Ptyp_arrow (_, _, new_ty) -> get_uncurry_arity_aux new_ty (succ acc)
-  | Ptyp_poly (_, ty) -> get_uncurry_arity_aux ty acc
-  | _ -> acc
-
-(**
-   {[ unit -> 'b ]} return arity 1
-   {[ unit -> 'a1 -> a2']} arity 2
-   {[ 'a1 -> 'a2 -> ... 'aN -> 'b ]} return arity N
-*)
-let get_uncurry_arity (ty : t) =
-  match ty.ptyp_desc with
-  | Ptyp_arrow (_, _, rest) -> Some (get_uncurry_arity_aux rest 1)
-  | _ -> None
-
-let get_curry_arity (ty : t) =
-  if Ast_uncurried.coreTypeIsUncurriedFun ty then
-    let arity, _ = Ast_uncurried.coreTypeExtractUncurriedFun ty in
-    arity
-  else get_uncurry_arity_aux ty 0
-
-(* add hoc for bs.send.pipe *)
-let rec get_curry_labels (ty : t) acc =
-  match ty.ptyp_desc with
-  | Ptyp_arrow (label, _, rest) -> get_curry_labels rest (label :: acc)
-  | _ -> acc
-
-let get_curry_labels ty = List.rev (get_curry_labels ty [])
-let is_arity_one ty = get_curry_arity ty = 1
-
-type param_type = {
-  label: Asttypes.arg_label;
-  ty: Parsetree.core_type;
-  attr: Parsetree.attributes;
-  loc: loc;
-}
-
-let mk_fn_type (new_arg_types_ty : param_type list) (result : t) : t =
-  Ext_list.fold_right new_arg_types_ty result (fun {label; ty; attr; loc} acc ->
-      {
-        ptyp_desc = Ptyp_arrow (label, ty, acc);
-        ptyp_loc = loc;
-        ptyp_attributes = attr;
-      })
-
-let list_of_arrow (ty : t) : t * param_type list =
-  let rec aux (ty : t) acc =
-    match ty.ptyp_desc with
-    | Ptyp_arrow (label, t1, t2) ->
-      aux t2
-        (({label; ty = t1; attr = ty.ptyp_attributes; loc = ty.ptyp_loc}
-           : param_type)
-        :: acc)
-    | Ptyp_poly (_, ty) ->
-      (* should not happen? *)
-      Bs_syntaxerr.err ty.ptyp_loc Unhandled_poly_type
-    | _ -> (ty, List.rev acc)
-  in
-  aux ty []
-
-let add_last_obj (ty : t) (obj : t) =
-  let result, params = list_of_arrow ty in
-  mk_fn_type
-    (params @ [{label = Nolabel; ty = obj; attr = []; loc = obj.ptyp_loc}])
-    result
diff --git a/jscomp/frontend/ast_core_type.mli b/jscomp/frontend/ast_core_type.mli
deleted file mode 100644
index 5cdbecb..0000000
--- a/jscomp/frontend/ast_core_type.mli
+++ /dev/null
@@ -1,66 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Parsetree.core_type
-
-val lift_option_type : t -> t
-
-val is_unit : t -> bool
-
-val is_builtin_rank0_type : string -> bool
-
-val from_labels : loc:Location.t -> int -> string Asttypes.loc list -> t
-(** return a function type
-    [from_labels ~loc tyvars labels]
-    example output:
-    {[x:'a0 -> y:'a1 -> < x :'a0 ;y :'a1  > Js.t]}
-*)
-
-val make_obj : loc:Location.t -> Parsetree.object_field list -> t
-
-val is_user_option : t -> bool
-
-val get_uncurry_arity : t -> int option
-(**
-   returns 0 when it can not tell arity from the syntax
-   None -- means not a function
-*)
-
-val get_curry_labels : t -> Asttypes.arg_label list
-
-type param_type = {
-  label: Asttypes.arg_label;
-  ty: t;
-  attr: Parsetree.attributes;
-  loc: Location.t;
-}
-
-val mk_fn_type : param_type list -> t -> t
-
-val list_of_arrow : t -> t * param_type list
-(** fails when Ptyp_poly *)
-
-val add_last_obj : t -> t -> t
-
-val is_arity_one : t -> bool
diff --git a/jscomp/frontend/ast_core_type_class_type.ml b/jscomp/frontend/ast_core_type_class_type.ml
deleted file mode 100644
index 40e8784..0000000
--- a/jscomp/frontend/ast_core_type_class_type.ml
+++ /dev/null
@@ -1,137 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-open Ast_helper
-
-let process_getter_setter ~not_getter_setter
-    ~(get : Parsetree.core_type -> _ -> Parsetree.attributes -> _) ~set loc name
-    (attrs : Ast_attributes.t) (ty : Parsetree.core_type) (acc : _ list) =
-  match Ast_attributes.process_method_attributes_rev attrs with
-  | {get = None; set = None}, _ -> not_getter_setter ty :: acc
-  | st, pctf_attributes ->
-    let get_acc =
-      match st.set with
-      | Some `No_get -> acc
-      | None | Some `Get ->
-        let lift txt = Typ.constr ~loc {txt; loc} [ty] in
-        let null, undefined =
-          match st with
-          | {get = Some (null, undefined)} -> (null, undefined)
-          | {get = None} -> (false, false)
-        in
-        let ty =
-          match (null, undefined) with
-          | false, false -> ty
-          | true, false -> lift Ast_literal.Lid.js_null
-          | false, true -> lift Ast_literal.Lid.js_undefined
-          | true, true -> lift Ast_literal.Lid.js_null_undefined
-        in
-        get ty name pctf_attributes :: acc
-    in
-    if st.set = None then get_acc
-    else
-      set ty
-        ({name with txt = name.Asttypes.txt ^ Literals.setter_suffix}
-          : _ Asttypes.loc)
-        pctf_attributes
-      :: get_acc
-
-let default_typ_mapper = Bs_ast_mapper.default_mapper.typ
-(*
-  Attributes are very hard to attribute
-  (since ptyp_attributes could happen in so many places), 
-  and write ppx extensions correctly, 
-  we can only use it locally
-*)
-
-let typ_mapper (self : Bs_ast_mapper.mapper) (ty : Parsetree.core_type) =
-  match ty with
-  | {
-   ptyp_attributes;
-   ptyp_desc =
-     ( Ptyp_arrow (label, args, body)
-     | Ptyp_constr
-         (* function$<...> is re-wrapped around only in case Nothing below *)
-         ( {txt = Lident "function$"},
-           [{ptyp_desc = Ptyp_arrow (label, args, body)}; _] ) );
-   (* let it go without regard label names,
-      it will report error later when the label is not empty
-   *)
-   ptyp_loc = loc;
-  } -> (
-    match fst (Ast_attributes.process_attributes_rev ptyp_attributes) with
-    | Uncurry _ -> Ast_typ_uncurry.to_uncurry_type loc self label args body
-    | Meth_callback _ ->
-      Ast_typ_uncurry.to_method_callback_type loc self label args body
-    | Method _ ->
-      (* Treat @meth as making the type uncurried, for backwards compatibility *)
-      Ast_typ_uncurry.to_uncurry_type loc self label args body
-    | Nothing -> Bs_ast_mapper.default_mapper.typ self ty)
-  | {ptyp_desc = Ptyp_object (methods, closed_flag); ptyp_loc = loc} ->
-    let ( +> ) attr (typ : Parsetree.core_type) =
-      {typ with ptyp_attributes = attr :: typ.ptyp_attributes}
-    in
-    let new_methods =
-      Ext_list.fold_right methods [] (fun meth_ acc ->
-          match meth_ with
-          | Parsetree.Oinherit _ -> meth_ :: acc
-          | Parsetree.Otag (label, ptyp_attrs, core_type) ->
-            let get ty name attrs =
-              let attrs, core_type =
-                match Ast_attributes.process_attributes_rev attrs with
-                | Nothing, attrs -> (attrs, ty) (* #1678 *)
-                | Uncurry attr, attrs -> (attrs, attr +> ty)
-                | Method _, _ ->
-                  Location.raise_errorf ~loc "%@get/set conflicts with %@meth"
-                | Meth_callback attr, attrs -> (attrs, attr +> ty)
-              in
-              Ast_compatible.object_field name attrs (self.typ self core_type)
-            in
-            let set ty name attrs =
-              let attrs, core_type =
-                match Ast_attributes.process_attributes_rev attrs with
-                | Nothing, attrs -> (attrs, ty)
-                | Uncurry attr, attrs -> (attrs, attr +> ty)
-                | Method _, _ ->
-                  Location.raise_errorf ~loc "%@get/set conflicts with %@meth"
-                | Meth_callback attr, attrs -> (attrs, attr +> ty)
-              in
-              Ast_compatible.object_field name attrs
-                (Ast_typ_uncurry.to_uncurry_type loc self Nolabel core_type
-                   (Ast_literal.type_unit ~loc ()))
-            in
-            let not_getter_setter ty =
-              let attrs, core_type =
-                match Ast_attributes.process_attributes_rev ptyp_attrs with
-                | Nothing, attrs -> (attrs, ty)
-                | Uncurry attr, attrs -> (attrs, attr +> ty)
-                | Method attr, attrs -> (attrs, attr +> ty)
-                | Meth_callback attr, attrs -> (attrs, attr +> ty)
-              in
-              Ast_compatible.object_field label attrs (self.typ self core_type)
-            in
-            process_getter_setter ~not_getter_setter ~get ~set loc label
-              ptyp_attrs core_type acc)
-    in
-    {ty with ptyp_desc = Ptyp_object (new_methods, closed_flag)}
-  | _ -> default_typ_mapper self ty
diff --git a/jscomp/frontend/ast_core_type_class_type.mli b/jscomp/frontend/ast_core_type_class_type.mli
deleted file mode 100644
index 088d300..0000000
--- a/jscomp/frontend/ast_core_type_class_type.mli
+++ /dev/null
@@ -1,26 +0,0 @@
-(* Copyright (C) 2018 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val typ_mapper :
-  Bs_ast_mapper.mapper -> Parsetree.core_type -> Parsetree.core_type
diff --git a/jscomp/frontend/ast_derive.ml b/jscomp/frontend/ast_derive.ml
deleted file mode 100644
index e6b3c14..0000000
--- a/jscomp/frontend/ast_derive.ml
+++ /dev/null
@@ -1,71 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 tdcls = Parsetree.type_declaration list
-
-type gen = {
-  structure_gen: tdcls -> Asttypes.rec_flag -> Ast_structure.t;
-  signature_gen: tdcls -> Asttypes.rec_flag -> Ast_signature.t;
-  expression_gen: (Parsetree.core_type -> Parsetree.expression) option;
-}
-
-(* the first argument is [config] payload
-   {[
-     { x = {uu} }
-   ]}
-*)
-type derive_table = (Parsetree.expression option -> gen) Map_string.t
-
-let derive_table : derive_table ref = ref Map_string.empty
-
-let register key value = derive_table := Map_string.add !derive_table key value
-
-(* let gen_structure
-    (tdcls : tdcls)
-    (actions :  Ast_payload.action list )
-    (explict_nonrec : bool )
-   : Ast_structure.t =
-   Ext_list.flat_map
-    (fun action ->
-       (Ast_payload.table_dispatch !derive_table action).structure_gen
-         tdcls explict_nonrec) actions *)
-
-let gen_signature tdcls (actions : Ast_payload.action list)
-    (explict_nonrec : Asttypes.rec_flag) : Ast_signature.t =
-  Ext_list.flat_map actions (fun action ->
-      (Ast_payload.table_dispatch !derive_table action).signature_gen tdcls
-        explict_nonrec)
-
-open Ast_helper
-
-let gen_structure_signature loc (tdcls : tdcls) (action : Ast_payload.action)
-    (explicit_nonrec : Asttypes.rec_flag) =
-  let derive_table = !derive_table in
-  let u = Ast_payload.table_dispatch derive_table action in
-
-  let a = u.structure_gen tdcls explicit_nonrec in
-  let b = u.signature_gen tdcls explicit_nonrec in
-  Str.include_ ~loc
-    (Incl.mk ~loc
-       (Mod.constraint_ ~loc (Mod.structure ~loc a) (Mty.signature ~loc b)))
diff --git a/jscomp/frontend/ast_derive.mli b/jscomp/frontend/ast_derive.mli
deleted file mode 100644
index 4355525..0000000
--- a/jscomp/frontend/ast_derive.mli
+++ /dev/null
@@ -1,53 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 tdcls = Parsetree.type_declaration list
-
-type gen = {
-  structure_gen: tdcls -> Asttypes.rec_flag -> Ast_structure.t;
-  signature_gen: tdcls -> Asttypes.rec_flag -> Ast_signature.t;
-  expression_gen: (Parsetree.core_type -> Parsetree.expression) option;
-}
-
-val register : string -> (Parsetree.expression option -> gen) -> unit
-(**
-   [register name cb]
-   example: [register "accessors" cb]
-*)
-
-(* val gen_structure:
-   tdcls  ->
-   Ast_payload.action list ->
-   bool ->
-   Ast_structure.t *)
-
-val gen_signature :
-  tdcls -> Ast_payload.action list -> Asttypes.rec_flag -> Ast_signature.t
-
-val gen_structure_signature :
-  Location.t ->
-  Parsetree.type_declaration list ->
-  Ast_payload.action ->
-  Asttypes.rec_flag ->
-  Parsetree.structure_item
diff --git a/jscomp/frontend/ast_derive_abstract.ml b/jscomp/frontend/ast_derive_abstract.ml
deleted file mode 100644
index 7963307..0000000
--- a/jscomp/frontend/ast_derive_abstract.ml
+++ /dev/null
@@ -1,182 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* let derivingName = "abstract" *)
-module U = Ast_derive_util
-open Ast_helper
-(* type tdcls = Parsetree.type_declaration list *)
-
-type abstractKind = Not_abstract | Light_abstract | Complex_abstract
-
-let isAbstract (xs : Ast_payload.action list) =
-  match xs with
-  | [({txt = "abstract"}, None)] -> Complex_abstract
-  | [({txt = "abstract"}, Some {pexp_desc = Pexp_ident {txt = Lident "light"}})]
-    ->
-    Light_abstract
-  | [({loc; txt = "abstract"}, Some _)] ->
-    Location.raise_errorf ~loc "invalid config for abstract"
-  | xs ->
-    Ext_list.iter xs (function {loc; txt}, _ ->
-        (match txt with
-        | "abstract" ->
-          Location.raise_errorf ~loc
-            "deriving abstract does not work with any other deriving"
-        | _ -> ()));
-    Not_abstract
-(* let handle_config (config : Parsetree.expression option) =
-   match config with
-   | Some config ->
-    U.invalid_config config
-   | None -> () *)
-
-(** For this attributes, its type was wrapped as an option,
-    so we can still reuse existing frame work
-*)
-let get_optional_attrs =
-  [Ast_attributes.bs_get; Ast_attributes.bs_return_undefined]
-
-let get_attrs = [Ast_attributes.bs_get_arity]
-
-let set_attrs = [Ast_attributes.bs_set]
-
-let handleTdcl light (tdcl : Parsetree.type_declaration) :
-    Parsetree.type_declaration * Parsetree.value_description list =
-  let core_type = U.core_type_of_type_declaration tdcl in
-  let loc = tdcl.ptype_loc in
-  let type_name = tdcl.ptype_name.txt in
-  let newTdcl =
-    {
-      tdcl with
-      ptype_kind = Ptype_abstract;
-      ptype_attributes = [] (* avoid non-terminating*);
-    }
-  in
-  match tdcl.ptype_kind with
-  | Ptype_record label_declarations ->
-    let is_private = tdcl.ptype_private = Private in
-    let has_optional_field =
-      Ext_list.exists label_declarations (fun x ->
-          Ast_attributes.has_bs_optional x.pld_attributes)
-    in
-    let setter_accessor, makeType, labels =
-      Ext_list.fold_right label_declarations
-        ( [],
-          (if has_optional_field then
-             Ast_compatible.arrow ~loc (Ast_literal.type_unit ()) core_type
-           else core_type),
-          [] )
-        (fun ({
-                pld_name = {txt = label_name; loc = label_loc} as pld_name;
-                pld_type;
-                pld_mutable;
-                pld_attributes;
-                pld_loc;
-              } :
-               Parsetree.label_declaration) (acc, maker, labels) ->
-          let prim_as_name, newLabel =
-            match Ast_attributes.iter_process_bs_string_as pld_attributes with
-            | None -> (label_name, pld_name)
-            | Some new_name -> (new_name, {pld_name with txt = new_name})
-          in
-          let prim = [prim_as_name] in
-          let is_optional = Ast_attributes.has_bs_optional pld_attributes in
-
-          let maker, acc =
-            if is_optional then
-              let optional_type = Ast_core_type.lift_option_type pld_type in
-              ( Ast_compatible.opt_arrow ~loc:pld_loc label_name pld_type maker,
-                Val.mk ~loc:pld_loc
-                  (if light then pld_name
-                   else {pld_name with txt = pld_name.txt ^ "Get"})
-                  ~attrs:get_optional_attrs ~prim
-                  (Ast_compatible.arrow ~loc core_type optional_type)
-                :: acc )
-            else
-              ( Ast_compatible.label_arrow ~loc:pld_loc label_name pld_type maker,
-                Val.mk ~loc:pld_loc
-                  (if light then pld_name
-                   else {pld_name with txt = pld_name.txt ^ "Get"})
-                  ~attrs:get_attrs
-                  ~prim:
-                    ((* Not needed actually*)
-                     External_ffi_types.ffi_bs_as_prims
-                       [External_arg_spec.dummy] Return_identity
-                       (Js_get {js_get_name = prim_as_name; js_get_scopes = []}))
-                  (Ast_compatible.arrow ~loc core_type pld_type)
-                :: acc )
-          in
-          let is_current_field_mutable = pld_mutable = Mutable in
-          let acc =
-            if is_current_field_mutable then
-              let setter_type =
-                Ast_compatible.arrow core_type
-                  (Ast_compatible.arrow pld_type (* setter *)
-                     (Ast_literal.type_unit ()))
-              in
-              Val.mk ~loc:pld_loc
-                {loc = label_loc; txt = label_name ^ "Set"} (* setter *)
-                ~attrs:set_attrs ~prim setter_type
-              :: acc
-            else acc
-          in
-          (acc, maker, (is_optional, newLabel) :: labels))
-    in
-    ( newTdcl,
-      if is_private then setter_accessor
-      else
-        let myPrims =
-          Ast_external_process.pval_prim_of_option_labels labels
-            has_optional_field
-        in
-        let myMaker =
-          Val.mk ~loc {loc; txt = type_name} ~prim:myPrims makeType
-        in
-        myMaker :: setter_accessor )
-  | Ptype_abstract | Ptype_variant _ | Ptype_open ->
-    (* Looks obvious that it does not make sense to warn *)
-    (* U.notApplicable tdcl.ptype_loc derivingName;  *)
-    (tdcl, [])
-
-let handleTdclsInStr ~light rf tdcls =
-  let tdcls, code =
-    Ext_list.fold_right tdcls ([], []) (fun tdcl (tdcls, sts) ->
-        match handleTdcl light tdcl with
-        | ntdcl, value_descriptions ->
-          ( ntdcl :: tdcls,
-            Ext_list.map_append value_descriptions sts (fun x ->
-                Str.primitive x) ))
-  in
-  Ast_compatible.rec_type_str rf tdcls :: code
-(* still need perform transformation for non-abstract type*)
-
-let handleTdclsInSig ~light rf tdcls =
-  let tdcls, code =
-    Ext_list.fold_right tdcls ([], []) (fun tdcl (tdcls, sts) ->
-        match handleTdcl light tdcl with
-        | ntdcl, value_descriptions ->
-          ( ntdcl :: tdcls,
-            Ext_list.map_append value_descriptions sts (fun x -> Sig.value x) ))
-  in
-  Ast_compatible.rec_type_sig rf tdcls :: code
diff --git a/jscomp/frontend/ast_derive_abstract.mli b/jscomp/frontend/ast_derive_abstract.mli
deleted file mode 100644
index 5e23f9d..0000000
--- a/jscomp/frontend/ast_derive_abstract.mli
+++ /dev/null
@@ -1,43 +0,0 @@
-(* Copyright (C) 2017 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 abstractKind = Not_abstract | Light_abstract | Complex_abstract
-
-val isAbstract : Ast_payload.action list -> abstractKind
-(** if only [abstract] happens  [true]
-    if [abstract] does not appear [false]
-    if [abstract] happens with other, raise exception
-*)
-
-val handleTdclsInStr :
-  light:bool ->
-  Asttypes.rec_flag ->
-  Parsetree.type_declaration list ->
-  Parsetree.structure
-
-val handleTdclsInSig :
-  light:bool ->
-  Asttypes.rec_flag ->
-  Parsetree.type_declaration list ->
-  Parsetree.signature
diff --git a/jscomp/frontend/ast_derive_js_mapper.ml b/jscomp/frontend/ast_derive_js_mapper.ml
deleted file mode 100644
index 496a7fa..0000000
--- a/jscomp/frontend/ast_derive_js_mapper.ml
+++ /dev/null
@@ -1,338 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open Ast_helper
-module U = Ast_derive_util
-
-type tdcls = Parsetree.type_declaration list
-
-let js_field (o : Parsetree.expression) m =
-  Ast_compatible.app2
-    (Exp.ident {txt = Lident "##"; loc = o.pexp_loc})
-    o (Exp.ident m)
-
-let handle_config (config : Parsetree.expression option) =
-  match config with
-  | Some config -> (
-    match config.pexp_desc with
-    | Pexp_record
-        ( [
-            ( {txt = Lident "newType"},
-              {
-                pexp_desc =
-                  ( Pexp_construct
-                      ({txt = Lident (("true" | "false") as x)}, None)
-                  | Pexp_ident {txt = Lident ("newType" as x)} );
-              } );
-          ],
-          None ) ->
-      not (x = "false")
-    | Pexp_ident {txt = Lident "newType"} -> true
-    | _ -> U.invalid_config config)
-  | None -> false
-
-let noloc = Location.none
-
-(* [eraseType] will be instrumented, be careful about the name conflict*)
-let eraseTypeLit = "_eraseType"
-
-let eraseTypeExp = Exp.ident {loc = noloc; txt = Lident eraseTypeLit}
-
-let eraseType x = Ast_compatible.app1 eraseTypeExp x
-
-let eraseTypeStr =
-  let any = Typ.any () in
-  Str.primitive
-    (Val.mk ~prim:["%identity"]
-       {loc = noloc; txt = eraseTypeLit}
-       (Ast_compatible.arrow any any))
-
-let unsafeIndex = "_index"
-
-let unsafeIndexGet =
-  let any = Typ.any () in
-  Str.primitive
-    (Val.mk ~prim:[""]
-       {loc = noloc; txt = unsafeIndex}
-       ~attrs:[Ast_attributes.bs_get_index]
-       (Ast_compatible.arrow any (Ast_compatible.arrow any any)))
-
-let unsafeIndexGetExp = Exp.ident {loc = noloc; txt = Lident unsafeIndex}
-
-(* JavaScript has allowed trailing commas in array literals since the beginning,
-   and later added them to object literals (ECMAScript 5) and most recently (ECMAScript 2017)
-   to function parameters. *)
-let add_key_value buf key value last =
-  Ext_buffer.add_char_string buf '"' key;
-  Ext_buffer.add_string buf "\":\"";
-  Ext_buffer.add_string buf value;
-  if last then Ext_buffer.add_string buf "\""
-  else Ext_buffer.add_string buf "\","
-
-let buildMap (row_fields : Parsetree.row_field list) =
-  let has_bs_as = ref false in
-  let data, revData =
-    let buf = Ext_buffer.create 50 in
-    let revBuf = Ext_buffer.create 50 in
-    Ext_buffer.add_string buf "{";
-    Ext_buffer.add_string revBuf "{";
-    let rec aux (row_fields : Parsetree.row_field list) =
-      match row_fields with
-      | [] -> ()
-      | tag :: rest ->
-        (match tag with
-        | Rtag ({txt}, attrs, _, []) ->
-          let name : string =
-            match Ast_attributes.iter_process_bs_string_as attrs with
-            | Some name ->
-              has_bs_as := true;
-              name
-            | None -> txt
-          in
-          let last = rest = [] in
-          add_key_value buf txt name last;
-          add_key_value revBuf name txt last
-        | _ -> assert false (* checked by [is_enum_polyvar] *));
-        aux rest
-    in
-    aux row_fields;
-    Ext_buffer.add_string buf "}";
-    Ext_buffer.add_string revBuf "}";
-    (Ext_buffer.contents buf, Ext_buffer.contents revBuf)
-  in
-  (data, revData, !has_bs_as)
-
-let app1 = Ast_compatible.app1
-
-let app2 = Ast_compatible.app2
-
-let ( ->~ ) a b = Ast_compatible.arrow a b
-
-let jsMapperRt = Longident.Ldot (Lident "Js", "MapperRt")
-
-let raiseWhenNotFound x =
-  app1
-    (Exp.ident
-       {loc = noloc; txt = Longident.Ldot (jsMapperRt, "raiseWhenNotFound")})
-    x
-let derivingName = "jsConverter"
-
-let init () =
-  Ast_derive.register derivingName (fun (x : Parsetree.expression option) ->
-      let createType = handle_config x in
-
-      {
-        structure_gen =
-          (fun (tdcls : tdcls) _ ->
-            let handle_tdcl (tdcl : Parsetree.type_declaration) =
-              let core_type = U.core_type_of_type_declaration tdcl in
-              let name = tdcl.ptype_name.txt in
-              let toJs = name ^ "ToJs" in
-              let fromJs = name ^ "FromJs" in
-              let loc = tdcl.ptype_loc in
-              let patToJs = {Asttypes.loc; txt = toJs} in
-              let patFromJs = {Asttypes.loc; txt = fromJs} in
-              let param = "param" in
-
-              let ident_param = {Asttypes.txt = Longident.Lident param; loc} in
-              let pat_param = {Asttypes.loc; txt = param} in
-              let exp_param = Exp.ident ident_param in
-              let newType, newTdcl =
-                U.new_type_of_type_declaration tdcl ("abs_" ^ name)
-              in
-              let newTypeStr =
-                (* Abstract type *)
-                Ast_compatible.rec_type_str Nonrecursive [newTdcl]
-              in
-              let toJsBody body =
-                Ast_comb.single_non_rec_value patToJs
-                  (Ast_compatible.fun_
-                     (Pat.constraint_ (Pat.var pat_param) core_type)
-                     body)
-              in
-              let ( +> ) a ty = Exp.constraint_ (eraseType a) ty in
-              let ( +: ) a ty = eraseType (Exp.constraint_ a ty) in
-              let coerceResultToNewType e =
-                if createType then e +> newType else e
-              in
-              match tdcl.ptype_kind with
-              | Ptype_record label_declarations ->
-                let exp =
-                  coerceResultToNewType
-                    (Exp.extension
-                       ( {Asttypes.loc; txt = "bs.obj"},
-                         PStr
-                           [
-                             Str.eval
-                               (Exp.record
-                                  (Ext_list.map label_declarations
-                                     (fun {pld_name = {loc; txt}} ->
-                                       let label =
-                                         {
-                                           Asttypes.loc;
-                                           txt = Longident.Lident txt;
-                                         }
-                                       in
-                                       (label, Exp.field exp_param label)))
-                                  None);
-                           ] ))
-                in
-                let toJs = toJsBody exp in
-                let obj_exp =
-                  Exp.record
-                    (Ext_list.map label_declarations
-                       (fun {pld_name = {loc; txt}} ->
-                         let label =
-                           {Asttypes.loc; txt = Longident.Lident txt}
-                         in
-                         (label, js_field exp_param label)))
-                    None
-                in
-                let fromJs =
-                  Ast_comb.single_non_rec_value patFromJs
-                    (Ast_compatible.fun_ (Pat.var pat_param)
-                       (if createType then
-                          Exp.let_ Nonrecursive
-                            [Vb.mk (Pat.var pat_param) (exp_param +: newType)]
-                            (Exp.constraint_ obj_exp core_type)
-                        else Exp.constraint_ obj_exp core_type))
-                in
-                let rest = [toJs; fromJs] in
-                if createType then eraseTypeStr :: newTypeStr :: rest else rest
-              | Ptype_abstract -> (
-                match Ast_polyvar.is_enum_polyvar tdcl with
-                | Some row_fields ->
-                  let map, revMap = ("_map", "_revMap") in
-                  let expMap = Exp.ident {loc; txt = Lident map} in
-                  let revExpMap = Exp.ident {loc; txt = Lident revMap} in
-                  let data, revData, has_bs_as = buildMap row_fields in
-
-                  let v =
-                    [
-                      eraseTypeStr;
-                      unsafeIndexGet;
-                      Ast_comb.single_non_rec_value {loc; txt = map}
-                        (Exp.extension
-                           ( {txt = "raw"; loc},
-                             PStr [Str.eval (Exp.constant (Const.string data))]
-                           ));
-                      Ast_comb.single_non_rec_value {loc; txt = revMap}
-                        (if has_bs_as then
-                           Exp.extension
-                             ( {txt = "raw"; loc},
-                               PStr
-                                 [
-                                   Str.eval (Exp.constant (Const.string revData));
-                                 ] )
-                         else expMap);
-                      toJsBody
-                        (if has_bs_as then
-                           app2 unsafeIndexGetExp expMap exp_param
-                         else app1 eraseTypeExp exp_param);
-                      Ast_comb.single_non_rec_value patFromJs
-                        (Ast_compatible.fun_ (Pat.var pat_param)
-                           (let result =
-                              app2 unsafeIndexGetExp revExpMap exp_param
-                            in
-                            if createType then raiseWhenNotFound result
-                            else result));
-                    ]
-                  in
-                  if createType then newTypeStr :: v else v
-                | None ->
-                  U.notApplicable tdcl.Parsetree.ptype_loc derivingName;
-                  [])
-              | Ptype_variant _ ->
-                U.notApplicable tdcl.Parsetree.ptype_loc derivingName;
-                []
-              | Ptype_open ->
-                U.notApplicable tdcl.Parsetree.ptype_loc derivingName;
-                []
-            in
-            Ext_list.flat_map tdcls handle_tdcl);
-        signature_gen =
-          (fun (tdcls : tdcls) _ ->
-            let handle_tdcl tdcl =
-              let core_type = U.core_type_of_type_declaration tdcl in
-              let name = tdcl.ptype_name.txt in
-              let toJs = name ^ "ToJs" in
-              let fromJs = name ^ "FromJs" in
-              let loc = tdcl.ptype_loc in
-              let patToJs = {Asttypes.loc; txt = toJs} in
-              let patFromJs = {Asttypes.loc; txt = fromJs} in
-              let toJsType result =
-                Ast_comb.single_non_rec_val patToJs
-                  (Ast_compatible.arrow core_type result)
-              in
-              let newType, newTdcl =
-                U.new_type_of_type_declaration tdcl ("abs_" ^ name)
-              in
-              let newTypeStr =
-                Ast_compatible.rec_type_sig Nonrecursive [newTdcl]
-              in
-              let ( +? ) v rest = if createType then v :: rest else rest in
-              match tdcl.ptype_kind with
-              | Ptype_record label_declarations ->
-                let objType flag =
-                  Typ.object_
-                    (Ext_list.map label_declarations
-                       (fun {pld_name; pld_type} ->
-                         Parsetree.Otag (pld_name, [], pld_type)))
-                    flag
-                in
-                newTypeStr
-                +? [
-                     toJsType (if createType then newType else objType Closed);
-                     Ast_comb.single_non_rec_val patFromJs
-                       ((if createType then newType else objType Open)
-                       ->~ core_type);
-                   ]
-              | Ptype_abstract -> (
-                match Ast_polyvar.is_enum_polyvar tdcl with
-                | Some _ ->
-                  let ty1 =
-                    if createType then newType else Ast_literal.type_string ()
-                  in
-                  let ty2 =
-                    if createType then core_type
-                    else Ast_core_type.lift_option_type core_type
-                  in
-                  newTypeStr
-                  +? [
-                       toJsType ty1;
-                       Ast_comb.single_non_rec_val patFromJs (ty1 ->~ ty2);
-                     ]
-                | None ->
-                  U.notApplicable tdcl.Parsetree.ptype_loc derivingName;
-                  [])
-              | Ptype_variant _ ->
-                U.notApplicable tdcl.Parsetree.ptype_loc derivingName;
-                []
-              | Ptype_open ->
-                U.notApplicable tdcl.Parsetree.ptype_loc derivingName;
-                []
-            in
-            Ext_list.flat_map tdcls handle_tdcl);
-        expression_gen = None;
-      })
diff --git a/jscomp/frontend/ast_derive_js_mapper.mli b/jscomp/frontend/ast_derive_js_mapper.mli
deleted file mode 100644
index cb5a914..0000000
--- a/jscomp/frontend/ast_derive_js_mapper.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2017 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val init : unit -> unit
diff --git a/jscomp/frontend/ast_derive_projector.ml b/jscomp/frontend/ast_derive_projector.ml
deleted file mode 100644
index 48ff7d6..0000000
--- a/jscomp/frontend/ast_derive_projector.ml
+++ /dev/null
@@ -1,183 +0,0 @@
-open Ast_helper
-
-let invalid_config (config : Parsetree.expression) =
-  Location.raise_errorf ~loc:config.pexp_loc
-    "such configuration is not supported"
-
-let raise_unsupported_vaiant_record_arg loc =
-  Location.raise_errorf ~loc
-    "@deriving(accessors) from a variant record argument is unsupported. \
-     Either define the record type separately from the variant type or use a \
-     positional argument."
-
-type tdcls = Parsetree.type_declaration list
-
-let derivingName = "accessors"
-
-let init () =
-  Ast_derive.register derivingName (fun (x : Parsetree.expression option) ->
-      Ext_option.iter x invalid_config;
-      {
-        structure_gen =
-          (fun (tdcls : tdcls) _explict_nonrec ->
-            let handle_uncurried_accessor_tranform ~loc ~arity accessor =
-              (* Accessors with no params (arity of 0) are simply values and not functions *)
-              match Config.uncurried.contents with
-              | Uncurried when arity > 0 ->
-                Ast_uncurried.uncurriedFun ~loc ~arity accessor
-              | _ -> accessor
-            in
-            let handle_tdcl tdcl =
-              let core_type =
-                Ast_derive_util.core_type_of_type_declaration tdcl
-              in
-              let gentype_attrs =
-                match
-                  Ext_list.exists core_type.ptyp_attributes
-                    Ast_attributes.is_gentype
-                with
-                | true -> Some [Ast_attributes.gentype]
-                | false -> None
-              in
-              match tdcl.ptype_kind with
-              | Ptype_record label_declarations ->
-                Ext_list.map label_declarations
-                  (fun
-                    ({pld_name = {loc; txt = pld_label} as pld_name} :
-                      Parsetree.label_declaration)
-                  ->
-                    let txt = "param" in
-                    Ast_comb.single_non_rec_value ?attrs:gentype_attrs pld_name
-                      (Ast_compatible.fun_
-                         (Pat.constraint_ (Pat.var {txt; loc}) core_type)
-                         (Exp.field
-                            (Exp.ident {txt = Lident txt; loc})
-                            {txt = Longident.Lident pld_label; loc})
-                      (*arity will alwys be 1 since these are single param functions*)
-                      |> handle_uncurried_accessor_tranform ~arity:1 ~loc))
-              | Ptype_variant constructor_declarations ->
-                Ext_list.map constructor_declarations
-                  (fun
-                    {
-                      pcd_name = {loc; txt = con_name};
-                      pcd_args;
-                      pcd_loc;
-                      pcd_res;
-                    }
-                  ->
-                    (* TODO: add type annotations *)
-                    let pcd_args =
-                      match pcd_args with
-                      | Pcstr_tuple pcd_args -> pcd_args
-                      | Pcstr_record _ ->
-                        raise_unsupported_vaiant_record_arg pcd_loc
-                    in
-                    let little_con_name =
-                      Ext_string.uncapitalize_ascii con_name
-                    in
-                    let arity = List.length pcd_args in
-                    let annotate_type =
-                      match pcd_res with
-                      | None -> core_type
-                      | Some x -> x
-                    in
-                    Ast_comb.single_non_rec_value ?attrs:gentype_attrs
-                      {loc; txt = little_con_name}
-                      (if arity = 0 then
-                         (*TODO: add a prefix, better inter-op with FFI *)
-                         Exp.constraint_
-                           (Exp.construct
-                              {loc; txt = Longident.Lident con_name}
-                              None)
-                           annotate_type
-                       else
-                         let vars =
-                           Ext_list.init arity (fun x ->
-                               "param_" ^ string_of_int x)
-                         in
-                         let exp =
-                           Exp.constraint_
-                             (Exp.construct
-                                {loc; txt = Longident.Lident con_name}
-                             @@ Some
-                                  (if arity = 1 then
-                                     Exp.ident
-                                       {loc; txt = Lident (List.hd vars)}
-                                   else
-                                     Exp.tuple
-                                       (Ext_list.map vars (fun x ->
-                                            Exp.ident {loc; txt = Lident x}))))
-                             annotate_type
-                         in
-                         Ext_list.fold_right vars exp (fun var b ->
-                             Ast_compatible.fun_ (Pat.var {loc; txt = var}) b)
-                         |> handle_uncurried_accessor_tranform ~loc ~arity))
-              | Ptype_abstract | Ptype_open ->
-                Ast_derive_util.notApplicable tdcl.ptype_loc derivingName;
-                []
-              (* Location.raise_errorf "projector only works with record" *)
-            in
-            Ext_list.flat_map tdcls handle_tdcl);
-        signature_gen =
-          (fun (tdcls : Parsetree.type_declaration list) _explict_nonrec ->
-            let handle_uncurried_type_tranform ~loc ~arity t =
-              match Config.uncurried.contents with
-              (* Accessors with no params (arity of 0) are simply values and not functions *)
-              | Uncurried when arity > 0 ->
-                Ast_uncurried.uncurriedType ~loc ~arity t
-              | _ -> t
-            in
-            let handle_tdcl tdcl =
-              let core_type =
-                Ast_derive_util.core_type_of_type_declaration tdcl
-              in
-              let gentype_attrs =
-                match
-                  Ext_list.exists core_type.ptyp_attributes
-                    Ast_attributes.is_gentype
-                with
-                | true -> Some [Ast_attributes.gentype]
-                | false -> None
-              in
-              match tdcl.ptype_kind with
-              | Ptype_record label_declarations ->
-                Ext_list.map label_declarations (fun {pld_name; pld_type} ->
-                    Ast_comb.single_non_rec_val ?attrs:gentype_attrs pld_name
-                      (Ast_compatible.arrow core_type pld_type
-                      (*arity will alwys be 1 since these are single param functions*)
-                      |> handle_uncurried_type_tranform ~arity:1
-                           ~loc:pld_name.loc))
-              | Ptype_variant constructor_declarations ->
-                Ext_list.map constructor_declarations
-                  (fun
-                    {
-                      pcd_name = {loc; txt = con_name};
-                      pcd_args;
-                      pcd_loc;
-                      pcd_res;
-                    }
-                  ->
-                    let pcd_args =
-                      match pcd_args with
-                      | Pcstr_tuple pcd_args -> pcd_args
-                      | Pcstr_record _ ->
-                        raise_unsupported_vaiant_record_arg pcd_loc
-                    in
-                    let arity = pcd_args |> List.length in
-                    let annotate_type =
-                      match pcd_res with
-                      | Some x -> x
-                      | None -> core_type
-                    in
-                    Ast_comb.single_non_rec_val ?attrs:gentype_attrs
-                      {loc; txt = Ext_string.uncapitalize_ascii con_name}
-                      (Ext_list.fold_right pcd_args annotate_type (fun x acc ->
-                           Ast_compatible.arrow x acc)
-                      |> handle_uncurried_type_tranform ~arity ~loc))
-              | Ptype_open | Ptype_abstract ->
-                Ast_derive_util.notApplicable tdcl.ptype_loc derivingName;
-                []
-            in
-            Ext_list.flat_map tdcls handle_tdcl);
-        expression_gen = None;
-      })
diff --git a/jscomp/frontend/ast_derive_projector.mli b/jscomp/frontend/ast_derive_projector.mli
deleted file mode 100644
index cb5a914..0000000
--- a/jscomp/frontend/ast_derive_projector.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* Copyright (C) 2017 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val init : unit -> unit
diff --git a/jscomp/frontend/ast_derive_util.ml b/jscomp/frontend/ast_derive_util.ml
deleted file mode 100644
index 782c055..0000000
--- a/jscomp/frontend/ast_derive_util.ml
+++ /dev/null
@@ -1,52 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open Ast_helper
-
-let core_type_of_type_declaration (tdcl : Parsetree.type_declaration) =
-  match tdcl with
-  | {ptype_name = {txt; loc}; ptype_params; ptype_attributes = attrs} ->
-    Typ.constr ~attrs {txt = Lident txt; loc} (Ext_list.map ptype_params fst)
-
-let new_type_of_type_declaration (tdcl : Parsetree.type_declaration) newName =
-  match tdcl with
-  | {ptype_name = {loc}; ptype_params} ->
-    ( Typ.constr {txt = Lident newName; loc} (Ext_list.map ptype_params fst),
-      {
-        Parsetree.ptype_params = tdcl.ptype_params;
-        ptype_name = {txt = newName; loc};
-        ptype_kind = Ptype_abstract;
-        ptype_attributes = [];
-        ptype_loc = tdcl.ptype_loc;
-        ptype_cstrs = [];
-        ptype_private = Public;
-        ptype_manifest = None;
-      } )
-let notApplicable loc derivingName =
-  Location.prerr_warning loc
-    (Warnings.Bs_derive_warning (derivingName ^ " not applicable to this type"))
-
-let invalid_config (config : Parsetree.expression) =
-  Location.raise_errorf ~loc:config.pexp_loc
-    "such configuration is not supported"
diff --git a/jscomp/frontend/ast_derive_util.mli b/jscomp/frontend/ast_derive_util.mli
deleted file mode 100644
index 1cc656e..0000000
--- a/jscomp/frontend/ast_derive_util.mli
+++ /dev/null
@@ -1,48 +0,0 @@
-(* Copyright (C) 2017 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val core_type_of_type_declaration :
-  Parsetree.type_declaration -> Parsetree.core_type
-(** Given a type declaration, extaract the type expression, mostly 
-    used in code gen later
-*)
-
-val new_type_of_type_declaration :
-  Parsetree.type_declaration ->
-  string ->
-  Parsetree.core_type * Parsetree.type_declaration
-
-(* val mk_fun :
-   loc:Location.t ->
-   Parsetree.core_type ->
-   string -> Parsetree.expression -> Parsetree.expression
-   val destruct_label_declarations :
-   loc:Location.t ->
-   string ->
-   Parsetree.label_declaration list ->
-   (Parsetree.core_type * Parsetree.expression) list * string list *)
-
-val notApplicable : Location.t -> string -> unit
-
-val invalid_config : Parsetree.expression -> 'a
diff --git a/jscomp/frontend/ast_exp.ml b/jscomp/frontend/ast_exp.ml
deleted file mode 100644
index e51ab5d..0000000
--- a/jscomp/frontend/ast_exp.ml
+++ /dev/null
@@ -1,25 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Parsetree.expression
diff --git a/jscomp/frontend/ast_exp.mli b/jscomp/frontend/ast_exp.mli
deleted file mode 100644
index e51ab5d..0000000
--- a/jscomp/frontend/ast_exp.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Parsetree.expression
diff --git a/jscomp/frontend/ast_exp_apply.ml b/jscomp/frontend/ast_exp_apply.ml
deleted file mode 100644
index 4c0ad3a..0000000
--- a/jscomp/frontend/ast_exp_apply.ml
+++ /dev/null
@@ -1,222 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open Ast_helper
-
-type exp = Parsetree.expression
-
-let rec no_need_bound (exp : exp) =
-  match exp.pexp_desc with
-  | Pexp_ident {txt = Lident _} -> true
-  | Pexp_constraint (e, _) -> no_need_bound e
-  | _ -> false
-
-let ocaml_obj_id = "__ocaml_internal_obj"
-
-let bound (e : exp) (cb : exp -> _) =
-  if no_need_bound e then cb e
-  else
-    let loc = e.pexp_loc in
-    Exp.let_ ~loc Nonrecursive
-      [Vb.mk ~loc (Pat.var ~loc {txt = ocaml_obj_id; loc}) e]
-      (cb (Exp.ident ~loc {txt = Lident ocaml_obj_id; loc}))
-
-let default_expr_mapper = Bs_ast_mapper.default_mapper.expr
-
-let check_and_discard (args : Ast_compatible.args) =
-  Ext_list.map args (fun (label, x) ->
-      Bs_syntaxerr.err_if_label x.pexp_loc label;
-      x)
-
-type app_pattern = {
-  op: string;
-  loc: Location.t;
-  (* locatoin is the location of whole expression #4451 *)
-  args: Parsetree.expression list;
-}
-
-let sane_property_name_check loc s =
-  if String.contains s '#' then
-    Location.raise_errorf ~loc
-      "property name (%s) can not contain speical character #" s
-
-(* match fn as *)
-let view_as_app (fn : exp) (s : string list) : app_pattern option =
-  match fn.pexp_desc with
-  | Pexp_apply ({pexp_desc = Pexp_ident {txt = Lident op; _}}, args)
-    when Ext_list.has_string s op ->
-    Some {op; loc = fn.pexp_loc; args = check_and_discard args}
-  | _ -> None
-
-let infix_ops = ["|."; "|.u"; "#="; "##"]
-
-let app_exp_mapper (e : exp) (self : Bs_ast_mapper.mapper) (fn : exp)
-    (args : Ast_compatible.args) : exp =
-  match view_as_app e infix_ops with
-  | Some {op = ("|." | "|.u") as op; args = [a_; f_]; loc} -> (
-    (*
-        a |. f
-        a |. f b c [@bs]  --> f a b c [@bs]
-        a |. (g |. b)
-        a |. `Variant
-        a |. (b |. f c [@bs])
-      *)
-    let a = self.expr self a_ in
-    let f = self.expr self f_ in
-    match f.pexp_desc with
-    | Pexp_variant (label, None) ->
-      {f with pexp_desc = Pexp_variant (label, Some a); pexp_loc = e.pexp_loc}
-    | Pexp_construct (ctor, None) ->
-      {f with pexp_desc = Pexp_construct (ctor, Some a); pexp_loc = e.pexp_loc}
-    | Pexp_apply (fn1, args) ->
-      Bs_ast_invariant.warn_discarded_unused_attributes fn1.pexp_attributes;
-      {
-        pexp_desc = Pexp_apply (fn1, (Nolabel, a) :: args);
-        pexp_loc = e.pexp_loc;
-        pexp_attributes = e.pexp_attributes @ f.pexp_attributes;
-      }
-    | Pexp_tuple xs ->
-      bound a (fun bounded_obj_arg ->
-          {
-            pexp_desc =
-              Pexp_tuple
-                (Ext_list.map xs (fun fn ->
-                     match fn.pexp_desc with
-                     | Pexp_construct (ctor, None) ->
-                       {
-                         fn with
-                         pexp_desc = Pexp_construct (ctor, Some bounded_obj_arg);
-                       }
-                     | Pexp_apply (fn, args) ->
-                       Bs_ast_invariant.warn_discarded_unused_attributes
-                         fn.pexp_attributes;
-                       {
-                         Parsetree.pexp_desc =
-                           Pexp_apply (fn, (Nolabel, bounded_obj_arg) :: args);
-                         pexp_attributes = [];
-                         pexp_loc = fn.pexp_loc;
-                       }
-                     | _ ->
-                       Ast_compatible.app1 ~loc:fn.pexp_loc fn bounded_obj_arg));
-            pexp_attributes = f.pexp_attributes;
-            pexp_loc = f.pexp_loc;
-          })
-    | _ ->
-      if op = "|.u" then
-        (* a |.u f
-           Uncurried unary application *)
-        Ast_compatible.app1 ~loc
-          ~attrs:(Ast_attributes.res_uapp :: e.pexp_attributes)
-          f a
-      else Ast_compatible.app1 ~loc ~attrs:e.pexp_attributes f a)
-  | Some {op = "##"; loc; args = [obj; rest]} -> (
-    (* - obj##property
-       - obj#(method a b )
-         we should warn when we discard attributes
-         gpr#1063 foo##(bar##baz) we should rewrite (bar##baz)
-           first  before pattern match.
-           currently the pattern match is written in a top down style.
-           Another corner case: f##(g a b [@bs])
-    *)
-    match rest with
-    | {
-     pexp_desc =
-       ( Pexp_ident {txt = Lident name; _}
-       | Pexp_constant (Pconst_string (name, None)) );
-     pexp_loc;
-    }
-    (* f##paint
-       TODO: this is not relevant: remove it later
-    *) ->
-      sane_property_name_check pexp_loc name;
-      {e with pexp_desc = Ast_util.js_property loc (self.expr self obj) name}
-    | _ -> Location.raise_errorf ~loc "invalid ## syntax")
-  (* we can not use [:=] for precedece cases
-     like {[i @@ x##length := 3 ]}
-     is parsed as {[ (i @@ x##length) := 3]}
-     since we allow user to create Js objects in OCaml, it can be of
-     ref type
-     {[
-       let u = object (self)
-         val x = ref 3
-         method setX x = self##x := 32
-         method getX () = !self##x
-       end
-     ]}
-  *)
-  | Some {op = "#="; loc; args = [obj; arg]} -> (
-    let gen_assignment obj name name_loc =
-      sane_property_name_check name_loc name;
-      let obj = self.expr self obj in
-      let arg = self.expr self arg in
-      let fn = Exp.send ~loc obj {txt = name ^ Literals.setter_suffix; loc} in
-      Exp.constraint_ ~loc
-        (Exp.apply ~loc ~attrs:[Ast_attributes.res_uapp] fn [(Nolabel, arg)])
-        (Ast_literal.type_unit ~loc ())
-    in
-    match obj.pexp_desc with
-    | Pexp_send (obj, {txt = name; loc = name_loc}) ->
-      gen_assignment obj name name_loc
-    | _ -> (
-      match view_as_app obj ["##"] with
-      | Some
-          {
-            args =
-              [
-                obj;
-                {
-                  pexp_desc =
-                    ( Pexp_ident {txt = Lident name}
-                    | Pexp_constant (Pconst_string (name, None)) );
-                  pexp_loc = name_loc;
-                };
-              ];
-          } ->
-        gen_assignment obj name name_loc
-      | _ -> Location.raise_errorf ~loc "invalid #= assignment"))
-  | Some {op = "|."; loc} ->
-    Location.raise_errorf ~loc
-      "invalid |. syntax, it can only be used as binary operator"
-  | Some {op = "##"; loc} ->
-    Location.raise_errorf ~loc
-      "Js object ## expect syntax like obj##(paint (a,b)) "
-  | Some {op} -> Location.raise_errorf "invalid %s syntax" op
-  | None -> (
-    match Ext_list.exclude_with_val e.pexp_attributes Ast_attributes.is_bs with
-    | Some pexp_attributes -> (
-      (* syntax: {[f arg0 arg1 [@bs]]} only for legacy .ml files *)
-      let fn = self.expr self fn in
-      let args = Ext_list.map args (fun (lbl, e) -> (lbl, self.expr self e)) in
-      let jsInternal = Ast_literal.Lid.js_internal in
-      let loc = e.pexp_loc in
-      match args with
-      | [(Nolabel, {pexp_desc = Pexp_construct ({txt = Lident "()"}, None)})] ->
-        Exp.apply ~loc ~attrs:pexp_attributes
-          (Exp.ident {txt = Ldot (jsInternal, "run"); loc})
-          [(Nolabel, fn)]
-      | _ ->
-        Exp.apply ~loc
-          ~attrs:(Ast_attributes.res_uapp :: pexp_attributes)
-          fn args)
-    | None -> default_expr_mapper self e)
diff --git a/jscomp/frontend/ast_exp_apply.mli b/jscomp/frontend/ast_exp_apply.mli
deleted file mode 100644
index 12cc881..0000000
--- a/jscomp/frontend/ast_exp_apply.mli
+++ /dev/null
@@ -1,30 +0,0 @@
-(* Copyright (C) 2018 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val app_exp_mapper :
-  Parsetree.expression ->
-  Bs_ast_mapper.mapper ->
-  Parsetree.expression ->
-  Ast_compatible.args ->
-  Parsetree.expression
diff --git a/jscomp/frontend/ast_exp_extension.ml b/jscomp/frontend/ast_exp_extension.ml
deleted file mode 100644
index 2d9054a..0000000
--- a/jscomp/frontend/ast_exp_extension.ml
+++ /dev/null
@@ -1,121 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-open Ast_helper
-
-let handle_extension e (self : Bs_ast_mapper.mapper)
-    (({txt; loc}, payload) : Parsetree.extension) =
-  match txt with
-  | "todo" ->
-    let todo_message =
-      match Ast_payload.is_single_string payload with
-      | Some (s, _) -> Some s
-      | None -> None
-    in
-    Location.prerr_warning e.Parsetree.pexp_loc (Bs_todo todo_message);
-    let pretext =
-      loc.loc_start.pos_fname ^ ":"
-      ^ string_of_int loc.loc_start.pos_lnum
-      ^ ":"
-      ^ string_of_int loc.loc_start.pos_cnum
-      ^ "-"
-      ^ string_of_int loc.loc_end.pos_cnum
-    in
-
-    Exp.apply ~loc
-      (Exp.ident ~loc {txt = Longident.parse "Js.Exn.raiseError"; loc})
-      [
-        ( Nolabel,
-          Exp.constant ~loc
-            (Pconst_string
-               ( (pretext
-                 ^
-                 match todo_message with
-                 | None -> " - Todo"
-                 | Some msg -> " - Todo: " ^ msg),
-                 None )) );
-      ]
-  | "ffi" -> Ast_exp_handle_external.handle_ffi ~loc ~payload
-  | "bs.raw" | "raw" ->
-    Ast_exp_handle_external.handle_raw ~kind:Raw_exp loc payload
-  | "bs.re" | "re" ->
-    Exp.constraint_ ~loc
-      (Ast_exp_handle_external.handle_raw ~kind:Raw_re loc payload)
-      (Ast_comb.to_js_re_type loc)
-  | "bs.external" | "external" -> (
-    match Ast_payload.as_ident payload with
-    | Some {txt = Lident x} ->
-      Ast_exp_handle_external.handle_external loc x
-      (* do we need support [%external gg.xx ]
-
-         {[ Js.Undefined.to_opt (if Js.typeof x == "undefined" then x else Js.Undefined.empty ) ]}
-      *)
-    | None | Some _ ->
-      Location.raise_errorf ~loc "external expects a single identifier")
-  | "bs.time" | "time" -> (
-    match payload with
-    | PStr [{pstr_desc = Pstr_eval (e, _)}] ->
-      let locString =
-        if loc.loc_ghost then "GHOST LOC"
-        else
-          let loc_start = loc.loc_start in
-          let file, lnum, __ = Location.get_pos_info loc_start in
-          Printf.sprintf "%s %d" (Filename.basename file) lnum
-      in
-      let e = self.expr self e in
-      Exp.sequence ~loc
-        (Ast_compatible.app1 ~loc
-           (Exp.ident ~loc
-              {loc; txt = Ldot (Ldot (Lident "Js", "Console"), "timeStart")})
-           (Ast_compatible.const_exp_string ~loc locString))
-        (Exp.let_ ~loc Nonrecursive
-           [Vb.mk ~loc (Pat.var ~loc {loc; txt = "timed"}) e]
-           (Exp.sequence ~loc
-              (Ast_compatible.app1 ~loc
-                 (Exp.ident ~loc
-                    {loc; txt = Ldot (Ldot (Lident "Js", "Console"), "timeEnd")})
-                 (Ast_compatible.const_exp_string ~loc locString))
-              (Exp.ident ~loc {loc; txt = Lident "timed"})))
-    | _ ->
-      Location.raise_errorf ~loc "expect a boolean expression in the payload")
-  | "bs.debugger" | "debugger" ->
-    {e with pexp_desc = Ast_exp_handle_external.handle_debugger loc payload}
-  | "bs.obj" | "obj" -> (
-    match payload with
-    | PStr
-        [
-          {
-            pstr_desc =
-              Pstr_eval (({pexp_desc = Pexp_record (label_exprs, None)} as e), _);
-          };
-        ] ->
-      {
-        e with
-        pexp_desc = Ast_util.record_as_js_object e.pexp_loc self label_exprs;
-      }
-    | _ -> Location.raise_errorf ~loc "Expect a record expression here")
-  | _ -> e
-(* For an unknown extension, we don't really need to process further*)
-(* Exp.extension ~loc ~attrs:e.pexp_attributes (
-    self.extension self extension) *)
-(* Bs_ast_mapper.default_mapper.expr self e   *)
diff --git a/jscomp/frontend/ast_exp_extension.mli b/jscomp/frontend/ast_exp_extension.mli
deleted file mode 100644
index fbb449d..0000000
--- a/jscomp/frontend/ast_exp_extension.mli
+++ /dev/null
@@ -1,29 +0,0 @@
-(* Copyright (C) 2018 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val handle_extension :
-  Parsetree.expression ->
-  Bs_ast_mapper.mapper ->
-  Parsetree.extension ->
-  Parsetree.expression
diff --git a/jscomp/frontend/ast_exp_handle_external.ml b/jscomp/frontend/ast_exp_handle_external.ml
deleted file mode 100644
index 63cddf0..0000000
--- a/jscomp/frontend/ast_exp_handle_external.ml
+++ /dev/null
@@ -1,160 +0,0 @@
-(* Copyright (C) 2020 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open Ast_helper
-
-(*
-   {[
-     Js.undefinedToOption 
-       (if Js.typeof x = "undefined" then undefined 
-        else x  )
-
-   ]}
-*)
-let handle_external loc (x : string) : Parsetree.expression =
-  let raw_exp : Ast_exp.t =
-    let str_exp =
-      Ast_compatible.const_exp_string ~loc x ~delimiter:Ext_string.empty
-    in
-    {
-      str_exp with
-      pexp_desc =
-        Ast_external_mk.local_external_apply loc ~pval_prim:["#raw_expr"]
-          ~pval_type:(Typ.arrow Nolabel (Typ.any ()) (Typ.any ()))
-          [str_exp];
-    }
-  in
-  let empty =
-    (* FIXME: the empty delimiter does not make sense*)
-    Exp.ident ~loc {txt = Ldot (Ldot (Lident "Js", "Undefined"), "empty"); loc}
-  in
-  let undefined_typeof =
-    Exp.ident {loc; txt = Ldot (Lident "Js", "undefinedToOption")}
-  in
-  let typeof = Exp.ident {loc; txt = Ldot (Lident "Js", "typeof")} in
-
-  Ast_compatible.app1 ~loc undefined_typeof
-    (Exp.ifthenelse ~loc
-       (Ast_compatible.app2 ~loc
-          (Exp.ident ~loc {loc; txt = Ldot (Lident "Pervasives", "=")})
-          (Ast_compatible.app1 ~loc typeof raw_exp)
-          (Ast_compatible.const_exp_string ~loc "undefined"))
-       empty (Some raw_exp))
-
-let handle_debugger loc (payload : Ast_payload.t) =
-  match payload with
-  | PStr [] ->
-    Ast_external_mk.local_external_apply loc ~pval_prim:["#debugger"]
-      ~pval_type:(Typ.arrow Nolabel (Typ.any ()) (Ast_literal.type_unit ()))
-      [Ast_literal.val_unit ~loc ()]
-  | _ ->
-    Location.raise_errorf ~loc "%%debugger extension doesn't accept arguments"
-
-let handle_raw ~kind loc payload =
-  let is_function = ref None in
-  match Ast_payload.raw_as_string_exp_exn ~kind ~is_function payload with
-  | None -> (
-    match kind with
-    | Raw_re ->
-      Location.raise_errorf ~loc
-        "%%re extension can only be applied to a string"
-    | Raw_exp ->
-      Location.raise_errorf ~loc
-        "%%raw extension can only be applied to a string"
-    | Raw_program ->
-      Location.raise_errorf ~loc
-        "%%%%raw extension can only be applied to a string")
-  | Some exp ->
-    {
-      exp with
-      pexp_desc =
-        Ast_external_mk.local_external_apply loc ~pval_prim:["#raw_expr"]
-          ~pval_type:(Typ.arrow Nolabel (Typ.any ()) (Typ.any ()))
-          [exp];
-      pexp_attributes =
-        (match !is_function with
-        | None -> exp.pexp_attributes
-        | Some _ -> Ast_attributes.internal_expansive :: exp.pexp_attributes);
-    }
-
-let handle_ffi ~loc ~payload =
-  let is_function = ref None in
-  let err () =
-    Location.raise_errorf ~loc
-      "%%ffi extension can only be applied to a string containing a JavaScript \
-       function such as \"(x) => ...\""
-  in
-  match
-    Ast_payload.raw_as_string_exp_exn ~kind:Raw_exp ~is_function payload
-  with
-  | None -> err ()
-  | Some exp ->
-    (* Wrap a type constraint based on arity.
-       E.g. for arity 2 constrain to type (_, _) => _ *)
-    let wrapTypeConstraint (e : Parsetree.expression) =
-      let loc = e.pexp_loc in
-      let any = Ast_helper.Typ.any ~loc:e.pexp_loc () in
-      let unit = Ast_literal.type_unit ~loc () in
-      let rec arrow ~arity =
-        if arity = 0 then Ast_helper.Typ.arrow ~loc Nolabel unit any
-        else if arity = 1 then Ast_helper.Typ.arrow ~loc Nolabel any any
-        else Ast_helper.Typ.arrow ~loc Nolabel any (arrow ~arity:(arity - 1))
-      in
-      match !is_function with
-      | Some arity ->
-        let type_ =
-          Ast_uncurried.uncurriedType ~loc
-            ~arity:(if arity = 0 then 1 else arity)
-            (arrow ~arity)
-        in
-        Ast_helper.Exp.constraint_ ~loc e type_
-      | _ -> err ()
-    in
-    wrapTypeConstraint
-      {
-        exp with
-        pexp_desc =
-          Ast_external_mk.local_external_apply loc ~pval_prim:["#raw_expr"]
-            ~pval_type:(Typ.arrow Nolabel (Typ.any ()) (Typ.any ()))
-            [exp];
-        pexp_attributes =
-          (match !is_function with
-          | None -> exp.pexp_attributes
-          | Some _ -> Ast_attributes.internal_expansive :: exp.pexp_attributes);
-      }
-
-let handle_raw_structure loc payload =
-  match Ast_payload.raw_as_string_exp_exn ~kind:Raw_program payload with
-  | Some exp ->
-    Ast_helper.Str.eval
-      {
-        exp with
-        pexp_desc =
-          Ast_external_mk.local_external_apply loc ~pval_prim:["#raw_stmt"]
-            ~pval_type:(Typ.arrow Nolabel (Typ.any ()) (Typ.any ()))
-            [exp];
-      }
-  | None ->
-    Location.raise_errorf ~loc
-      "%%%%raw extension can only be applied to a string"
diff --git a/jscomp/frontend/ast_exp_handle_external.mli b/jscomp/frontend/ast_exp_handle_external.mli
deleted file mode 100644
index c3ff047..0000000
--- a/jscomp/frontend/ast_exp_handle_external.mli
+++ /dev/null
@@ -1,38 +0,0 @@
-(* Copyright (C) 2020 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val handle_external : Location.t -> string -> Parsetree.expression
-
-val handle_debugger : Location.t -> Ast_payload.t -> Parsetree.expression_desc
-
-val handle_ffi : loc:Location.t -> payload:Ast_payload.t -> Parsetree.expression
-
-val handle_raw :
-  kind:Js_raw_info.raw_kind ->
-  Location.t ->
-  Ast_payload.t ->
-  Parsetree.expression
-
-val handle_raw_structure :
-  Location.t -> Ast_payload.t -> Parsetree.structure_item
diff --git a/jscomp/frontend/ast_external.ml b/jscomp/frontend/ast_external.ml
deleted file mode 100644
index c028305..0000000
--- a/jscomp/frontend/ast_external.ml
+++ /dev/null
@@ -1,183 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let handleExternalInSig (self : Bs_ast_mapper.mapper)
-    (prim : Parsetree.value_description) (sigi : Parsetree.signature_item) :
-    Parsetree.signature_item =
-  let loc = prim.pval_loc in
-  let pval_type = self.typ self prim.pval_type in
-  let pval_attributes = self.attributes self prim.pval_attributes in
-  match Ast_attributes.process_send_pipe pval_attributes with
-  | Some (obj, _) ->
-    (*has bs.send.pipe: best effort *)
-    {
-      sigi with
-      psig_desc =
-        Psig_value
-          {
-            prim with
-            pval_type = Ast_core_type.add_last_obj pval_type obj;
-            pval_prim = [];
-            pval_attributes = [];
-          };
-    }
-  | None -> (
-    match prim.pval_prim with
-    | [] -> Location.raise_errorf ~loc "empty primitive string"
-    | a :: b :: _ ->
-      Location.raise_errorf ~loc
-        "only a single string is allowed in bs external %S %S" a b
-    | [v] -> (
-      match
-        Ast_external_process.encode_attributes_as_string loc pval_type
-          pval_attributes v
-      with
-      | {pval_type; pval_prim; pval_attributes; no_inline_cross_module} ->
-        {
-          sigi with
-          psig_desc =
-            Psig_value
-              {
-                prim with
-                pval_type;
-                pval_prim = (if no_inline_cross_module then [] else pval_prim);
-                pval_attributes;
-              };
-        }))
-
-let handleExternalInStru (self : Bs_ast_mapper.mapper)
-    (prim : Parsetree.value_description) (str : Parsetree.structure_item) :
-    Parsetree.structure_item =
-  let loc = prim.pval_loc in
-  let pval_type = self.typ self prim.pval_type in
-  let pval_attributes = self.attributes self prim.pval_attributes in
-  let send_pipe = ref false in
-  let pval_type, pval_attributes =
-    match Ast_attributes.process_send_pipe pval_attributes with
-    | Some (obj, attrs) ->
-      send_pipe := true;
-      (Ast_helper.Typ.arrow ~loc Nolabel obj pval_type, attrs)
-    | None -> (pval_type, pval_attributes)
-  in
-  match prim.pval_prim with
-  | [] -> Location.raise_errorf ~loc "empty primitive string"
-  | a :: b :: _ ->
-    Location.raise_errorf ~loc
-      "only a single string is allowed in bs external %S : %S" a b
-  | [v] -> (
-    match
-      Ast_external_process.encode_attributes_as_string loc pval_type
-        pval_attributes v
-    with
-    | {pval_type; pval_prim; pval_attributes; no_inline_cross_module} ->
-      let external_result =
-        {
-          str with
-          pstr_desc =
-            Pstr_primitive {prim with pval_type; pval_prim; pval_attributes};
-        }
-      in
-      let normal () =
-        if not no_inline_cross_module then external_result
-        else
-          let open Ast_helper in
-          Str.include_ ~loc
-            (Incl.mk ~loc
-               (Mod.constraint_ ~loc
-                  (Mod.structure ~loc [external_result])
-                  (Mty.signature ~loc
-                     [
-                       {
-                         psig_desc =
-                           Psig_value
-                             {
-                               prim with
-                               pval_type;
-                               pval_prim = [];
-                               pval_attributes;
-                             };
-                         psig_loc = loc;
-                       };
-                     ])))
-      in
-      if !send_pipe then
-        let[@warning "-8"] (_ :: params as args) =
-          Ast_core_type.get_curry_labels pval_type
-        in
-        let arity = List.length args in
-        if arity = 1 then normal ()
-        else
-          let open Ast_helper in
-          Str.include_ ~loc
-            (Incl.mk ~loc
-               (Mod.structure ~loc
-                  [
-                    external_result;
-                    Str.value ~loc Nonrecursive
-                      [
-                        Vb.mk ~loc
-                          (Pat.var ~loc prim.pval_name)
-                          (let body =
-                             Exp.apply ~loc
-                               (Exp.ident ~loc
-                                  {txt = Lident prim.pval_name.txt; loc})
-                               (( Asttypes.Nolabel,
-                                  Exp.ident ~loc {txt = Lident "obj"; loc} )
-                               :: Ext_list.mapi params (fun i x ->
-                                      ( x,
-                                        match x with
-                                        | Asttypes.Nolabel ->
-                                          Exp.ident
-                                            {
-                                              txt =
-                                                Lident
-                                                  ("arg" ^ string_of_int (i + 1));
-                                              loc;
-                                            }
-                                        | Labelled s | Optional s ->
-                                          Exp.ident {txt = Lident s; loc} )))
-                           in
-                           snd
-                           @@ Ext_list.fold_right params
-                                ( 0,
-                                  Exp.fun_ Nolabel None
-                                    (Pat.var ~loc {txt = "obj"; loc})
-                                    body )
-                                (fun arg (i, obj) ->
-                                  ( i + 1,
-                                    Exp.fun_ arg None
-                                      (Pat.var ~loc
-                                         {
-                                           txt =
-                                             (match arg with
-                                             | Labelled s | Optional s -> s
-                                             | Nolabel ->
-                                               "arg"
-                                               ^ string_of_int (arity - i - 1));
-                                           loc;
-                                         })
-                                      obj )));
-                      ];
-                  ]))
-      else normal ())
diff --git a/jscomp/frontend/ast_external.mli b/jscomp/frontend/ast_external.mli
deleted file mode 100644
index 21f832f..0000000
--- a/jscomp/frontend/ast_external.mli
+++ /dev/null
@@ -1,35 +0,0 @@
-(* Copyright (C) 2018 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val handleExternalInSig :
-  Bs_ast_mapper.mapper ->
-  Parsetree.value_description ->
-  Parsetree.signature_item ->
-  Parsetree.signature_item
-
-val handleExternalInStru :
-  Bs_ast_mapper.mapper ->
-  Parsetree.value_description ->
-  Parsetree.structure_item ->
-  Parsetree.structure_item
diff --git a/jscomp/frontend/ast_external_mk.ml b/jscomp/frontend/ast_external_mk.ml
deleted file mode 100644
index 3ec65e1..0000000
--- a/jscomp/frontend/ast_external_mk.ml
+++ /dev/null
@@ -1,130 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 -  Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let local_external_apply loc ?(pval_attributes = []) ~(pval_prim : string list)
-    ~(pval_type : Parsetree.core_type) ?(local_module_name = "J")
-    ?(local_fun_name = "unsafe_expr") (args : Parsetree.expression list) :
-    Parsetree.expression_desc =
-  Pexp_letmodule
-    ( {txt = local_module_name; loc},
-      {
-        pmod_desc =
-          Pmod_structure
-            [
-              {
-                pstr_desc =
-                  Pstr_primitive
-                    {
-                      pval_name = {txt = local_fun_name; loc};
-                      pval_type;
-                      pval_loc = loc;
-                      pval_prim;
-                      pval_attributes;
-                    };
-                pstr_loc = loc;
-              };
-            ];
-        pmod_loc = loc;
-        pmod_attributes = [];
-      },
-      Ast_compatible.apply_simple
-        ({
-           pexp_desc =
-             Pexp_ident
-               {txt = Ldot (Lident local_module_name, local_fun_name); loc};
-           pexp_attributes = [];
-           pexp_loc = loc;
-         }
-          : Parsetree.expression)
-        args ~loc )
-
-let local_external_obj loc ?(pval_attributes = []) ~pval_prim ~pval_type
-    ?(local_module_name = "J") ?(local_fun_name = "unsafe_expr") args :
-    Parsetree.expression_desc =
-  Pexp_letmodule
-    ( {txt = local_module_name; loc},
-      {
-        pmod_desc =
-          Pmod_structure
-            [
-              {
-                pstr_desc =
-                  Pstr_primitive
-                    {
-                      pval_name = {txt = local_fun_name; loc};
-                      pval_type;
-                      pval_loc = loc;
-                      pval_prim;
-                      pval_attributes;
-                    };
-                pstr_loc = loc;
-              };
-            ];
-        pmod_loc = loc;
-        pmod_attributes = [];
-      },
-      Ast_compatible.apply_labels
-        ({
-           pexp_desc =
-             Pexp_ident
-               {txt = Ldot (Lident local_module_name, local_fun_name); loc};
-           pexp_attributes = [];
-           pexp_loc = loc;
-         }
-          : Parsetree.expression)
-        args ~loc )
-
-let local_extern_cont_to_obj loc ?(pval_attributes = []) ~pval_prim ~pval_type
-    ?(local_module_name = "J") ?(local_fun_name = "unsafe_expr")
-    (cb : Parsetree.expression -> 'a) : Parsetree.expression_desc =
-  Pexp_letmodule
-    ( {txt = local_module_name; loc},
-      {
-        pmod_desc =
-          Pmod_structure
-            [
-              {
-                pstr_desc =
-                  Pstr_primitive
-                    {
-                      pval_name = {txt = local_fun_name; loc};
-                      pval_type;
-                      pval_loc = loc;
-                      pval_prim;
-                      pval_attributes;
-                    };
-                pstr_loc = loc;
-              };
-            ];
-        pmod_loc = loc;
-        pmod_attributes = [];
-      },
-      cb
-        {
-          pexp_desc =
-            Pexp_ident
-              {txt = Ldot (Lident local_module_name, local_fun_name); loc};
-          pexp_attributes = [];
-          pexp_loc = loc;
-        } )
diff --git a/jscomp/frontend/ast_external_mk.mli b/jscomp/frontend/ast_external_mk.mli
deleted file mode 100644
index 550bb3a..0000000
--- a/jscomp/frontend/ast_external_mk.mli
+++ /dev/null
@@ -1,64 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 -  Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val local_external_apply :
-  Location.t ->
-  ?pval_attributes:Parsetree.attributes ->
-  pval_prim:string list ->
-  pval_type:Parsetree.core_type ->
-  ?local_module_name:string ->
-  ?local_fun_name:string ->
-  Parsetree.expression list ->
-  Parsetree.expression_desc
-(**
-   [local_module loc ~pval_prim ~pval_type args]
-   generate such code 
-   {[
-     let module J = struct 
-       external unsafe_expr : pval_type = pval_prim 
-     end in 
-     J.unssafe_expr args
-   ]}
-*)
-
-val local_external_obj :
-  Location.t ->
-  ?pval_attributes:Parsetree.attributes ->
-  pval_prim:string list ->
-  pval_type:Parsetree.core_type ->
-  ?local_module_name:string ->
-  ?local_fun_name:string ->
-  (string * Parsetree.expression) list ->
-  (* [ (label, exp )]*)
-  Parsetree.expression_desc
-
-val local_extern_cont_to_obj :
-  Location.t ->
-  ?pval_attributes:Parsetree.attributes ->
-  pval_prim:string list ->
-  pval_type:Parsetree.core_type ->
-  ?local_module_name:string ->
-  ?local_fun_name:string ->
-  (Parsetree.expression -> Parsetree.expression) ->
-  Parsetree.expression_desc
diff --git a/jscomp/frontend/ast_external_process.ml b/jscomp/frontend/ast_external_process.ml
deleted file mode 100644
index c00596b..0000000
--- a/jscomp/frontend/ast_external_process.ml
+++ /dev/null
@@ -1,1107 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-[@@@warning "+9"]
-(* record pattern match complete checker*)
-
-let rec variant_can_unwrap_aux (row_fields : Parsetree.row_field list) : bool =
-  match row_fields with
-  | [] -> true
-  | Rtag (_, _, false, [_]) :: rest -> variant_can_unwrap_aux rest
-  | _ :: _ -> false
-
-let variant_unwrap (row_fields : Parsetree.row_field list) : bool =
-  match row_fields with
-  | [] -> false (* impossible syntax *)
-  | xs -> variant_can_unwrap_aux xs
-
-(*
-  TODO: [nolabel] is only used once turn Nothing into Unit, refactor later
-*)
-let spec_of_ptyp (nolabel : bool) (ptyp : Parsetree.core_type) :
-    External_arg_spec.attr =
-  let ptyp_desc = ptyp.ptyp_desc in
-  match
-    Ast_attributes.iter_process_bs_string_int_unwrap_uncurry
-      ptyp.ptyp_attributes
-  with
-  | `String -> (
-    match ptyp_desc with
-    | Ptyp_variant (row_fields, Closed, None) ->
-      Ast_polyvar.map_row_fields_into_strings ptyp.ptyp_loc row_fields
-    | _ -> Bs_syntaxerr.err ptyp.ptyp_loc Invalid_bs_string_type)
-  | `Ignore -> Ignore
-  | `Int -> (
-    match ptyp_desc with
-    | Ptyp_variant (row_fields, Closed, None) ->
-      let int_lists =
-        Ast_polyvar.map_row_fields_into_ints ptyp.ptyp_loc row_fields
-      in
-      Int int_lists
-    | _ -> Bs_syntaxerr.err ptyp.ptyp_loc Invalid_bs_int_type)
-  | `Unwrap -> (
-    match ptyp_desc with
-    | Ptyp_variant (row_fields, Closed, _) when variant_unwrap row_fields ->
-      Unwrap
-    (* Unwrap attribute can only be attached to things like `[a of a0 | b of b0]` *)
-    | _ -> Bs_syntaxerr.err ptyp.ptyp_loc Invalid_bs_unwrap_type)
-  | `Uncurry opt_arity -> (
-    let real_arity =
-      if Ast_uncurried.coreTypeIsUncurriedFun ptyp then
-        let arity, _ = Ast_uncurried.coreTypeExtractUncurriedFun ptyp in
-        Some arity
-      else Ast_core_type.get_uncurry_arity ptyp
-    in
-    match (opt_arity, real_arity) with
-    | Some arity, None -> Fn_uncurry_arity arity
-    | None, None -> Bs_syntaxerr.err ptyp.ptyp_loc Canot_infer_arity_by_syntax
-    | None, Some arity -> Fn_uncurry_arity arity
-    | Some arity, Some n ->
-      if n <> arity then
-        Bs_syntaxerr.err ptyp.ptyp_loc (Inconsistent_arity (arity, n))
-      else Fn_uncurry_arity arity)
-  | `Nothing -> (
-    match ptyp_desc with
-    | Ptyp_constr ({txt = Lident "unit"; _}, []) ->
-      if nolabel then Extern_unit else Nothing
-    | _ -> Nothing)
-
-(* is_optional = false 
-*)
-let refine_arg_type ~(nolabel : bool) (ptyp : Ast_core_type.t) :
-    External_arg_spec.attr =
-  if ptyp.ptyp_desc = Ptyp_any then
-    let ptyp_attrs = ptyp.ptyp_attributes in
-    let payload = Ast_attributes.iter_process_bs_string_or_int_as ptyp_attrs in
-    match payload with
-    | None -> spec_of_ptyp nolabel ptyp
-    | Some cst -> (
-      (* (_[@as ])*)
-      (* when ppx start dropping attributes
-         we should warn, there is a trade off whether
-         we should warn dropped non bs attribute or not
-      *)
-      Bs_ast_invariant.warn_discarded_unused_attributes ptyp_attrs;
-      match cst with
-      | Int i ->
-        (* This type is used in obj only to construct obj type*)
-        Arg_cst (External_arg_spec.cst_int i)
-      | Str (i, delim) -> Arg_cst (External_arg_spec.cst_string i delim))
-  else (* ([`a|`b] [@string]) *)
-    spec_of_ptyp nolabel ptyp
-
-let refine_obj_arg_type ~(nolabel : bool) (ptyp : Ast_core_type.t) :
-    External_arg_spec.attr =
-  if ptyp.ptyp_desc = Ptyp_any then (
-    let ptyp_attrs = ptyp.ptyp_attributes in
-    let payload = Ast_attributes.iter_process_bs_string_or_int_as ptyp_attrs in
-    (* when ppx start dropping attributes
-       we should warn, there is a trade off whether
-       we should warn dropped non bs attribute or not
-    *)
-    Bs_ast_invariant.warn_discarded_unused_attributes ptyp_attrs;
-    match payload with
-    | None -> Bs_syntaxerr.err ptyp.ptyp_loc Invalid_underscore_type_in_external
-    | Some (Int i) ->
-      (* @as(24) *)
-      (* This type is used in obj only to construct obj type *)
-      Arg_cst (External_arg_spec.cst_int i)
-    | Some (Str (s, delim)) ->
-      (* @as("foo") *)
-      Arg_cst (External_arg_spec.cst_string s delim))
-  else (* ([`a|`b] [@string]) *)
-    spec_of_ptyp nolabel ptyp
-
-(** Given the type of argument, process its [bs.] attribute and new type,
-    The new type is currently used to reconstruct the external type
-    and result type in [@@obj]
-    They are not the same though, for example
-    {[
-      external f : hi:([ `hi | `lo ] [@string]) -> unit -> _ = "" [@@obj]
-    ]}
-    The result type would be [ hi:string ]
-*)
-let get_opt_arg_type ~(nolabel : bool) (ptyp : Ast_core_type.t) :
-    External_arg_spec.attr =
-  if ptyp.ptyp_desc = Ptyp_any then
-    (* (_[@as ])*)
-    (* extenral f : ?x:_ -> y:int -> _ = "" [@@obj] is not allowed *)
-    Bs_syntaxerr.err ptyp.ptyp_loc Invalid_underscore_type_in_external;
-  (* ([`a|`b] [@@string]) *)
-  spec_of_ptyp nolabel ptyp
-
-(**
-   [@@module "react"]
-   [@@module "react"]
-   ---
-   [@@module "@" "react"]
-   [@@module "@" "react"]
-
-   They should have the same module name
-
-   TODO: we should emit an warning if we bind
-   two external files to the same module name
-*)
-type source = Payload | External
-
-type bundle_source = {name: string; source: source}
-
-type external_desc = {
-  val_name: bundle_source option;
-  external_module_name: External_ffi_types.external_module_name option;
-  module_as_val: External_ffi_types.external_module_name option;
-  val_send: bundle_source option;
-  splice: bool;
-  (* mutable *)
-  scopes: string list;
-  set_index: bool;
-  (* mutable *)
-  get_index: bool;
-  new_name: bundle_source option;
-  call_name: bundle_source option;
-  set_name: bundle_source option;
-  get_name: bundle_source option;
-  mk_obj: bool;
-  return_wrapper: External_ffi_types.return_wrapper;
-  tagged_template: bool;
-}
-
-let init_st =
-  {
-    val_name = None;
-    external_module_name = None;
-    module_as_val = None;
-    val_send = None;
-    splice = false;
-    scopes = [];
-    set_index = false;
-    get_index = false;
-    new_name = None;
-    call_name = None;
-    set_name = None;
-    get_name = None;
-    mk_obj = false;
-    return_wrapper = Return_unset;
-    tagged_template = false;
-  }
-
-let return_wrapper loc (txt : string) : External_ffi_types.return_wrapper =
-  match txt with
-  | "undefined_to_opt" -> Return_undefined_to_opt
-  | "null_to_opt" -> Return_null_to_opt
-  | "nullable" | "null_undefined_to_opt" -> Return_null_undefined_to_opt
-  | "identity" -> Return_identity
-  | _ -> Bs_syntaxerr.err loc Not_supported_directive_in_bs_return
-
-exception Not_handled_external_attribute
-
-(* The processed attributes will be dropped *)
-let parse_external_attributes (no_arguments : bool) (prim_name_check : string)
-    (prim_name_or_pval_prim : bundle_source)
-    (prim_attributes : Ast_attributes.t) : Ast_attributes.t * external_desc =
-  (* shared by `[@@val]`, `[@@send]`,
-     `[@@set]`, `[@@get]` , `[@@new]`
-     `[@@bs.send.pipe]` does not use it
-  *)
-  let name_from_payload_or_prim ~loc (payload : Parsetree.payload) :
-      bundle_source =
-    match payload with
-    | PStr [] -> prim_name_or_pval_prim
-    (* It is okay to have [@@val] without payload *)
-    | _ -> (
-      match Ast_payload.is_single_string payload with
-      | Some (val_name, _) -> {name = val_name; source = Payload}
-      | None -> Location.raise_errorf ~loc "Invalid payload")
-  in
-
-  Ext_list.fold_left prim_attributes ([], init_st)
-    (fun (attrs, st) (({txt; loc}, payload) as attr) ->
-      if txt = Literals.gentype_import1 || txt = Literals.gentype_import2 then
-        let bundle =
-          "./"
-          ^ Ext_filename.new_extension
-              (Filename.basename !Location.input_name)
-              ".gen"
-        in
-        ( attr :: attrs,
-          {
-            st with
-            external_module_name =
-              Some
-                {
-                  bundle;
-                  module_bind_name = Phint_nothing;
-                  import_attributes = None;
-                };
-          } )
-      else
-        let action () =
-          match txt with
-          | "bs.val" | "val" ->
-            if no_arguments then
-              {st with val_name = Some (name_from_payload_or_prim ~loc payload)}
-            else
-              {
-                st with
-                call_name = Some (name_from_payload_or_prim ~loc payload);
-              }
-          | "bs.module" | "module" -> (
-            match payload with
-            | PStr
-                [
-                  {
-                    pstr_desc =
-                      Pstr_eval
-                        ({pexp_loc; pexp_desc = Pexp_record (fields, _); _}, _);
-                    _;
-                  };
-                ] -> (
-              let fromName = ref None in
-              let with_ = ref None in
-              fields
-              |> List.iter
-                   (fun
-                     ((l, exp) :
-                       Longident.t Location.loc * Parsetree.expression)
-                   ->
-                     match (l, exp.pexp_desc) with
-                     | ( {txt = Lident "from"; _},
-                         Pexp_constant (Pconst_string (s, _)) ) ->
-                       fromName := Some s
-                     | {txt = Lident "with"; _}, Pexp_record (fields, _) ->
-                       with_ := Some fields
-                     | _ -> ());
-              match (!fromName, !with_) with
-              | None, _ ->
-                Location.raise_errorf ~loc:pexp_loc
-                  "@module annotations with import attributes must have a \
-                   \"from\" field. This \"from\" field should point to the JS \
-                   module to import, just like the string payload to @module \
-                   normally does."
-              | Some _, None ->
-                Location.raise_errorf ~loc:pexp_loc
-                  "@module annotations with import attributes must have a \
-                   \"with\" field. This \"with\" field should hold a record of \
-                   the import attributes you want applied to the import."
-              | Some fromName, Some withFields ->
-                let importAttributesFromRecord =
-                  withFields
-                  |> List.filter_map
-                       (fun
-                         ((l, exp) :
-                           Longident.t Location.loc * Parsetree.expression)
-                       ->
-                         match exp.pexp_desc with
-                         | Pexp_constant (Pconst_string (s, _)) -> (
-                           match l.txt with
-                           | Longident.Lident "type_" -> Some ("type", s)
-                           | Longident.Lident txt -> Some (txt, s)
-                           | _ ->
-                             Location.raise_errorf ~loc:exp.pexp_loc
-                               "Field must be a regular key.")
-                         | _ ->
-                           Location.raise_errorf ~loc:exp.pexp_loc
-                             "Only string values are allowed here.")
-                in
-                let import_attributes =
-                  Hashtbl.create (List.length importAttributesFromRecord)
-                in
-                importAttributesFromRecord
-                |> List.iter (fun (key, value) ->
-                       Hashtbl.replace import_attributes key value);
-                {
-                  st with
-                  external_module_name =
-                    Some
-                      {
-                        bundle = fromName;
-                        module_bind_name = Phint_nothing;
-                        import_attributes = Some import_attributes;
-                      };
-                })
-            | _ -> (
-              match Ast_payload.assert_strings loc payload with
-              | [bundle] ->
-                {
-                  st with
-                  external_module_name =
-                    Some
-                      {
-                        bundle;
-                        module_bind_name = Phint_nothing;
-                        import_attributes = None;
-                      };
-                }
-              | [bundle; bind_name] ->
-                {
-                  st with
-                  external_module_name =
-                    Some
-                      {
-                        bundle;
-                        module_bind_name = Phint_name bind_name;
-                        import_attributes = None;
-                      };
-                }
-              | [] ->
-                {
-                  st with
-                  module_as_val =
-                    Some
-                      {
-                        bundle = prim_name_or_pval_prim.name;
-                        module_bind_name = Phint_nothing;
-                        import_attributes = None;
-                      };
-                }
-              | _ -> Bs_syntaxerr.err loc Illegal_attribute))
-          | "bs.scope" | "scope" -> (
-            match Ast_payload.assert_strings loc payload with
-            | [] -> Bs_syntaxerr.err loc Illegal_attribute
-            (* We need err on empty scope, so we can tell the difference
-               between unset/set
-            *)
-            | scopes -> {st with scopes})
-          | "taggedTemplate" -> {st with splice = true; tagged_template = true}
-          | "bs.splice" | "bs.variadic" | "variadic" -> {st with splice = true}
-          | "bs.send" | "send" ->
-            {st with val_send = Some (name_from_payload_or_prim ~loc payload)}
-          | "bs.set" | "set" ->
-            {st with set_name = Some (name_from_payload_or_prim ~loc payload)}
-          | "bs.get" | "get" ->
-            {st with get_name = Some (name_from_payload_or_prim ~loc payload)}
-          | "bs.new" | "new" ->
-            {st with new_name = Some (name_from_payload_or_prim ~loc payload)}
-          | "bs.set_index" | "set_index" ->
-            if String.length prim_name_check <> 0 then
-              Location.raise_errorf ~loc
-                "%@set_index this particular external's name needs to be a \
-                 placeholder empty string";
-            {st with set_index = true}
-          | "bs.get_index" | "get_index" ->
-            if String.length prim_name_check <> 0 then
-              Location.raise_errorf ~loc
-                "%@get_index this particular external's name needs to be a \
-                 placeholder empty string";
-            {st with get_index = true}
-          | "bs.obj" | "obj" -> {st with mk_obj = true}
-          | "bs.return" | "return" -> (
-            let actions = Ast_payload.ident_or_record_as_config loc payload in
-            match actions with
-            | [({txt; _}, None)] ->
-              {st with return_wrapper = return_wrapper loc txt}
-            | _ -> Bs_syntaxerr.err loc Not_supported_directive_in_bs_return)
-          | _ -> raise_notrace Not_handled_external_attribute
-        in
-        try (attrs, action ())
-        with Not_handled_external_attribute -> (attr :: attrs, st))
-
-let has_bs_uncurry (attrs : Ast_attributes.t) =
-  Ext_list.exists_fst attrs (fun {txt; loc = _} ->
-      txt = "bs.uncurry" || txt = "uncurry")
-
-let check_return_wrapper loc (wrapper : External_ffi_types.return_wrapper)
-    result_type =
-  match wrapper with
-  | Return_identity -> wrapper
-  | Return_unset ->
-    if Ast_core_type.is_unit result_type then Return_replaced_with_unit
-    else wrapper
-  | Return_undefined_to_opt | Return_null_to_opt | Return_null_undefined_to_opt
-    ->
-    if Ast_core_type.is_user_option result_type then wrapper
-    else Bs_syntaxerr.err loc Expect_opt_in_bs_return_to_opt
-  | Return_replaced_with_unit -> assert false
-(* Not going to happen from user input*)
-
-type response = {
-  pval_type: Parsetree.core_type;
-  pval_prim: string list;
-  pval_attributes: Parsetree.attributes;
-  no_inline_cross_module: bool;
-}
-
-let process_obj (loc : Location.t) (st : external_desc) (prim_name : string)
-    (arg_types_ty : Ast_core_type.param_type list)
-    (result_type : Ast_core_type.t) : Parsetree.core_type * External_ffi_types.t
-    =
-  match st with
-  | {
-   val_name = None;
-   external_module_name = None;
-   module_as_val = None;
-   val_send = None;
-   splice = false;
-   new_name = None;
-   call_name = None;
-   set_name = None;
-   get_name = None;
-   get_index = false;
-   return_wrapper = Return_unset;
-   tagged_template = _;
-   set_index = false;
-   mk_obj = _;
-   scopes =
-     []
-     (* wrapper does not work with @obj
-        TODO: better error message *);
-  } ->
-    if String.length prim_name <> 0 then
-      Location.raise_errorf ~loc
-        "%@obj expect external names to be empty string";
-    let ( arg_kinds,
-          new_arg_types_ty,
-          (result_types : Parsetree.object_field list) ) =
-      Ext_list.fold_right arg_types_ty ([], [], [])
-        (fun
-          param_type
-          (arg_labels, (arg_types : Ast_core_type.param_type list), result_types)
-        ->
-          let arg_label = param_type.label in
-          let loc = param_type.loc in
-          let ty = param_type.ty in
-          let new_arg_label, new_arg_types, output_tys =
-            match arg_label with
-            | Nolabel -> (
-              match ty.ptyp_desc with
-              | Ptyp_constr ({txt = Lident "unit"; _}, []) ->
-                ( External_arg_spec.empty_kind Extern_unit,
-                  param_type :: arg_types,
-                  result_types )
-              | _ ->
-                Location.raise_errorf ~loc
-                  "expect label, optional, or unit here")
-            | Labelled label -> (
-              let fieldName =
-                match
-                  Ast_attributes.iter_process_bs_string_as param_type.attr
-                with
-                | Some alias -> alias
-                | None -> label
-              in
-              let obj_arg_type = refine_obj_arg_type ~nolabel:false ty in
-              match obj_arg_type with
-              | Ignore ->
-                ( External_arg_spec.empty_kind obj_arg_type,
-                  param_type :: arg_types,
-                  result_types )
-              | Arg_cst _ ->
-                ( {
-                    obj_arg_label = External_arg_spec.obj_label fieldName;
-                    obj_arg_type;
-                  },
-                  arg_types,
-                  (* ignored in [arg_types], reserved in [result_types] *)
-                  result_types )
-              | Nothing ->
-                ( {
-                    obj_arg_label = External_arg_spec.obj_label fieldName;
-                    obj_arg_type;
-                  },
-                  param_type :: arg_types,
-                  Parsetree.Otag ({Asttypes.txt = fieldName; loc}, [], ty)
-                  :: result_types )
-              | Int _ ->
-                ( {
-                    obj_arg_label = External_arg_spec.obj_label fieldName;
-                    obj_arg_type;
-                  },
-                  param_type :: arg_types,
-                  Otag
-                    ( {Asttypes.txt = fieldName; loc},
-                      [],
-                      Ast_literal.type_int ~loc () )
-                  :: result_types )
-              | Poly_var_string _ ->
-                ( {
-                    obj_arg_label = External_arg_spec.obj_label fieldName;
-                    obj_arg_type;
-                  },
-                  param_type :: arg_types,
-                  Otag
-                    ( {Asttypes.txt = fieldName; loc},
-                      [],
-                      Ast_literal.type_string ~loc () )
-                  :: result_types )
-              | Fn_uncurry_arity _ ->
-                Location.raise_errorf ~loc
-                  "The combination of %@obj, %@uncurry is not supported yet"
-              | Extern_unit -> assert false
-              | Poly_var _ ->
-                Location.raise_errorf ~loc
-                  "%@obj label %s does not support such arg type" label
-              | Unwrap ->
-                Location.raise_errorf ~loc
-                  "%@obj label %s does not support %@unwrap arguments" label)
-            | Optional label -> (
-              let fieldName =
-                match
-                  Ast_attributes.iter_process_bs_string_as param_type.attr
-                with
-                | Some alias -> alias
-                | None -> label
-              in
-              let obj_arg_type = get_opt_arg_type ~nolabel:false ty in
-              match obj_arg_type with
-              | Ignore ->
-                ( External_arg_spec.empty_kind obj_arg_type,
-                  param_type :: arg_types,
-                  result_types )
-              | Nothing ->
-                let for_sure_not_nested =
-                  match ty.ptyp_desc with
-                  | Ptyp_constr ({txt = Lident txt; _}, []) ->
-                    Ast_core_type.is_builtin_rank0_type txt
-                  | _ -> false
-                in
-                ( {
-                    obj_arg_label =
-                      External_arg_spec.optional for_sure_not_nested fieldName;
-                    obj_arg_type;
-                  },
-                  param_type :: arg_types,
-                  Parsetree.Otag
-                    ( {Asttypes.txt = fieldName; loc},
-                      [],
-                      Ast_comb.to_undefined_type loc ty )
-                  :: result_types )
-              | Int _ ->
-                ( {
-                    obj_arg_label = External_arg_spec.optional true fieldName;
-                    obj_arg_type;
-                  },
-                  param_type :: arg_types,
-                  Otag
-                    ( {Asttypes.txt = fieldName; loc},
-                      [],
-                      Ast_comb.to_undefined_type loc
-                      @@ Ast_literal.type_int ~loc () )
-                  :: result_types )
-              | Poly_var_string _ ->
-                ( {
-                    obj_arg_label = External_arg_spec.optional true fieldName;
-                    obj_arg_type;
-                  },
-                  param_type :: arg_types,
-                  Otag
-                    ( {Asttypes.txt = fieldName; loc},
-                      [],
-                      Ast_comb.to_undefined_type loc
-                      @@ Ast_literal.type_string ~loc () )
-                  :: result_types )
-              | Arg_cst _ ->
-                Location.raise_errorf ~loc
-                  "%@as is not supported with optional yet"
-              | Fn_uncurry_arity _ ->
-                Location.raise_errorf ~loc
-                  "The combination of %@obj, %@uncurry is not supported yet"
-              | Extern_unit -> assert false
-              | Poly_var _ ->
-                Location.raise_errorf ~loc
-                  "%@obj label %s does not support such arg type" label
-              | Unwrap ->
-                Location.raise_errorf ~loc
-                  "%@obj label %s does not support %@unwrap arguments" label)
-          in
-          (new_arg_label :: arg_labels, new_arg_types, output_tys))
-    in
-
-    let result =
-      if result_type.ptyp_desc = Ptyp_any then
-        Ast_core_type.make_obj ~loc result_types
-      else result_type
-      (* TODO: do we need do some error checking here *)
-      (* result type can not be labeled *)
-    in
-    ( Ast_core_type.mk_fn_type new_arg_types_ty result,
-      External_ffi_types.ffi_obj_create arg_kinds )
-  | _ -> Location.raise_errorf ~loc "Attribute found that conflicts with %@obj"
-
-let external_desc_of_non_obj (loc : Location.t) (st : external_desc)
-    (prim_name_or_pval_prim : bundle_source) (arg_type_specs_length : int)
-    arg_types_ty (arg_type_specs : External_arg_spec.params) :
-    External_ffi_types.external_spec =
-  match st with
-  | {
-   set_index = true;
-   val_name = None;
-   external_module_name = None;
-   module_as_val = None;
-   val_send = None;
-   splice = false;
-   scopes;
-   get_index = false;
-   new_name = None;
-   call_name = None;
-   set_name = None;
-   get_name = None;
-   return_wrapper = _;
-   mk_obj = _;
-   tagged_template = _;
-  } ->
-    if arg_type_specs_length = 3 then
-      Js_set_index {js_set_index_scopes = scopes}
-    else
-      Location.raise_errorf ~loc
-        "Ill defined attribute %@set_index (arity of 3)"
-  | {set_index = true; _} ->
-    Bs_syntaxerr.err loc
-      (Conflict_ffi_attribute "Attribute found that conflicts with %@set_index")
-  | {
-   get_index = true;
-   val_name = None;
-   external_module_name = None;
-   module_as_val = None;
-   val_send = None;
-   splice = false;
-   scopes;
-   new_name = None;
-   call_name = None;
-   set_name = None;
-   get_name = None;
-   set_index = false;
-   mk_obj = _;
-   return_wrapper = _;
-   tagged_template = _;
-  } ->
-    if arg_type_specs_length = 2 then
-      Js_get_index {js_get_index_scopes = scopes}
-    else
-      Location.raise_errorf ~loc
-        "Ill defined attribute %@get_index (arity expected 2 : while %d)"
-        arg_type_specs_length
-  | {get_index = true; _} ->
-    Bs_syntaxerr.err loc
-      (Conflict_ffi_attribute "Attribute found that conflicts with %@get_index")
-  | {
-   module_as_val = Some external_module_name;
-   get_index = false;
-   val_name;
-   new_name;
-   external_module_name = None;
-   val_send = None;
-   scopes = [];
-   (* module as var does not need scopes *)
-   splice;
-   call_name = None;
-   set_name = None;
-   get_name = None;
-   set_index = false;
-   return_wrapper = _;
-   mk_obj = _;
-   tagged_template = _;
-  } -> (
-    match (arg_types_ty, new_name, val_name) with
-    | [], None, _ -> Js_module_as_var external_module_name
-    | _, None, _ -> Js_module_as_fn {splice; external_module_name}
-    | _, Some _, Some _ ->
-      Bs_syntaxerr.err loc
-        (Conflict_ffi_attribute "Attribute found that conflicts with @module.")
-    | _, Some {source = External; name = _}, None ->
-      Js_module_as_class external_module_name
-    | _, Some {source = Payload; name = _}, None ->
-      Location.raise_errorf ~loc
-        "Incorrect FFI attribute found: (%@new should not carry a payload here)"
-    )
-  | {module_as_val = Some _; get_index; val_send; _} ->
-    let reason =
-      match (get_index, val_send) with
-      | true, _ ->
-        "@module is for imports from a module, @get_index does not need import \
-         a module "
-      | _, Some _ ->
-        "@module is for imports from a module, @send does not need import a \
-         module "
-      | _ -> "Attribute found that conflicts with @module."
-    in
-    Bs_syntaxerr.err loc (Conflict_ffi_attribute reason)
-  | {
-   get_name = None;
-   val_name = None;
-   call_name = None;
-   module_as_val = None;
-   set_index = false;
-   get_index = false;
-   val_send = None;
-   new_name = None;
-   set_name = None;
-   external_module_name = None;
-   splice;
-   scopes;
-   mk_obj = _;
-   (* mk_obj is always false *)
-   return_wrapper = _;
-   tagged_template;
-  } ->
-    let name = prim_name_or_pval_prim.name in
-    if arg_type_specs_length = 0 then
-      (*
-         {[
-           external ff : int -> int [@bs] = "" [@@module "xx"]
-         ]}
-         FIXME: splice is not supported here 
-      *)
-      Js_var {name; external_module_name = None; scopes}
-    else
-      Js_call
-        {splice; name; external_module_name = None; scopes; tagged_template}
-  | {
-   call_name = Some {name; source = _};
-   splice;
-   scopes;
-   external_module_name;
-   val_name = None;
-   module_as_val = None;
-   val_send = None;
-   set_index = false;
-   get_index = false;
-   new_name = None;
-   set_name = None;
-   get_name = None;
-   mk_obj = _;
-   return_wrapper = _;
-   tagged_template;
-  } ->
-    if arg_type_specs_length = 0 then
-      (*
-           {[
-             external ff : int -> int = "" [@@module "xx"]
-           ]}
-        *)
-      Js_var {name; external_module_name; scopes}
-      (*FIXME: splice is not supported here *)
-    else Js_call {splice; name; external_module_name; scopes; tagged_template}
-  | {call_name = Some _; _} ->
-    Bs_syntaxerr.err loc
-      (Conflict_ffi_attribute "Attribute found that conflicts with %@val")
-  | {
-   val_name = Some {name; source = _};
-   external_module_name;
-   call_name = None;
-   module_as_val = None;
-   val_send = None;
-   set_index = false;
-   get_index = false;
-   new_name = None;
-   set_name = None;
-   get_name = None;
-   mk_obj = _;
-   return_wrapper = _;
-   splice = false;
-   scopes;
-   tagged_template = _;
-  } ->
-    (*
-         if no_arguments -->
-               {[
-                 external ff : int = "" [@@val]
-               ]}
-      *)
-    Js_var {name; external_module_name; scopes}
-  | {val_name = Some _; _} ->
-    Bs_syntaxerr.err loc
-      (Conflict_ffi_attribute "Attribute found that conflicts with %@val")
-  | {
-   splice;
-   scopes;
-   external_module_name = Some _ as external_module_name;
-   val_name = None;
-   call_name = None;
-   module_as_val = None;
-   val_send = None;
-   set_index = false;
-   get_index = false;
-   new_name = None;
-   set_name = None;
-   get_name = None;
-   mk_obj = _;
-   return_wrapper = _;
-   tagged_template;
-  } ->
-    let name = prim_name_or_pval_prim.name in
-    if arg_type_specs_length = 0 then
-      (*
-         {[
-           external ff : int = "" [@@module "xx"]
-         ]}
-      *)
-      Js_var {name; external_module_name; scopes}
-    else Js_call {splice; name; external_module_name; scopes; tagged_template}
-  | {
-   val_send = Some {name; source = _};
-   splice;
-   scopes;
-   val_name = None;
-   call_name = None;
-   module_as_val = None;
-   set_index = false;
-   get_index = false;
-   new_name = None;
-   set_name = None;
-   get_name = None;
-   external_module_name = None;
-   mk_obj = _;
-   return_wrapper = _;
-   tagged_template = _;
-  } -> (
-    (* PR #2162 - since when we assemble arguments the first argument in
-       [@@send] is ignored
-    *)
-    match arg_type_specs with
-    | [] ->
-      Location.raise_errorf ~loc
-        "Ill defined attribute %@send(the external needs to be a regular \
-         function call with at least one argument)"
-    | {arg_type = Arg_cst _; arg_label = _} :: _ ->
-      Location.raise_errorf ~loc
-        "Ill defined attribute %@send(first argument can't be const)"
-    | _ :: _ -> Js_send {splice; name; js_send_scopes = scopes})
-  | {val_send = Some _; _} ->
-    Location.raise_errorf ~loc
-      "You used a FFI attribute that can't be used with %@send"
-  | {
-   new_name = Some {name; source = _};
-   external_module_name;
-   val_name = None;
-   call_name = None;
-   module_as_val = None;
-   set_index = false;
-   get_index = false;
-   val_send = None;
-   set_name = None;
-   get_name = None;
-   splice;
-   scopes;
-   mk_obj = _;
-   return_wrapper = _;
-   tagged_template = _;
-  } ->
-    Js_new {name; external_module_name; splice; scopes}
-  | {new_name = Some _; _} ->
-    Bs_syntaxerr.err loc
-      (Conflict_ffi_attribute "Attribute found that conflicts with %@new")
-  | {
-   set_name = Some {name; source = _};
-   val_name = None;
-   call_name = None;
-   module_as_val = None;
-   set_index = false;
-   get_index = false;
-   val_send = None;
-   new_name = None;
-   get_name = None;
-   external_module_name = None;
-   splice = false;
-   mk_obj = _;
-   return_wrapper = _;
-   scopes;
-   tagged_template = _;
-  } ->
-    if arg_type_specs_length = 2 then
-      Js_set {js_set_scopes = scopes; js_set_name = name}
-    else
-      Location.raise_errorf ~loc
-        "Ill defined attribute %@set (two args required)"
-  | {set_name = Some _; _} ->
-    Location.raise_errorf ~loc "conflict attributes found with %@set"
-  | {
-   get_name = Some {name; source = _};
-   val_name = None;
-   call_name = None;
-   module_as_val = None;
-   set_index = false;
-   get_index = false;
-   val_send = None;
-   new_name = None;
-   set_name = None;
-   external_module_name = None;
-   splice = false;
-   mk_obj = _;
-   return_wrapper = _;
-   scopes;
-   tagged_template = _;
-  } ->
-    if arg_type_specs_length = 1 then
-      Js_get {js_get_name = name; js_get_scopes = scopes}
-    else
-      Location.raise_errorf ~loc
-        "Ill defined attribute %@bs.get (only one argument)"
-  | {get_name = Some _; _} ->
-    Location.raise_errorf ~loc "Attribute found that conflicts with %@bs.get"
-
-(** Note that the passed [type_annotation] is already processed by visitor pattern before*)
-let handle_attributes (loc : Bs_loc.t) (type_annotation : Parsetree.core_type)
-    (prim_attributes : Ast_attributes.t) (prim_name : string) :
-    Parsetree.core_type * External_ffi_types.t * Parsetree.attributes * bool =
-  (* sanity check here
-      {[ int -> int -> (int -> int -> int [@uncurry])]}
-      It does not make sense
-  *)
-  if has_bs_uncurry type_annotation.ptyp_attributes then
-    Location.raise_errorf ~loc
-      "%@uncurry can not be applied to the whole definition";
-  let prim_name_with_source = {name = prim_name; source = External} in
-  let type_annotation, build_uncurried_type =
-    match type_annotation.ptyp_desc with
-    | Ptyp_constr (({txt = Lident "function$"; _} as lid), [t; arity_]) ->
-      ( t,
-        fun ~arity x ->
-          let tArity =
-            match arity with
-            | Some arity -> Ast_uncurried.arityType ~loc arity
-            | None -> arity_
-          in
-          {x with Parsetree.ptyp_desc = Ptyp_constr (lid, [x; tArity])} )
-    | _ -> (type_annotation, fun ~arity:_ x -> x)
-  in
-  let result_type, arg_types_ty =
-    (* Note this assumes external type is syntatic (no abstraction)*)
-    Ast_core_type.list_of_arrow type_annotation
-  in
-  if has_bs_uncurry result_type.ptyp_attributes then
-    Location.raise_errorf ~loc:result_type.ptyp_loc
-      "%@uncurry can not be applied to tailed position";
-  let no_arguments = arg_types_ty = [] in
-  let unused_attrs, external_desc =
-    parse_external_attributes no_arguments prim_name prim_name_with_source
-      prim_attributes
-  in
-  if external_desc.mk_obj then
-    (* warn unused attributes here ? *)
-    let new_type, spec =
-      process_obj loc external_desc prim_name arg_types_ty result_type
-    in
-    (build_uncurried_type ~arity:None new_type, spec, unused_attrs, false)
-  else
-    let splice = external_desc.splice in
-    let arg_type_specs, new_arg_types_ty, arg_type_specs_length =
-      Ext_list.fold_right arg_types_ty
-        (([], [], 0)
-          : External_arg_spec.params * Ast_core_type.param_type list * int)
-        (fun param_type (arg_type_specs, arg_types, i) ->
-          let arg_label = param_type.label in
-          let ty = param_type.ty in
-          (if i = 0 && splice then
-             match arg_label with
-             | Optional _ ->
-               Location.raise_errorf ~loc
-                 "%@variadic expect the last type to be a non optional"
-             | Labelled _ | Nolabel -> (
-               if ty.ptyp_desc = Ptyp_any then
-                 Location.raise_errorf ~loc
-                   "%@variadic expect the last type to be an array";
-               if spec_of_ptyp true ty <> Nothing then
-                 Location.raise_errorf ~loc
-                   "%@variadic expect the last type to be an array";
-               match ty.ptyp_desc with
-               | Ptyp_constr ({txt = Lident "array"; _}, [_]) -> ()
-               | _ ->
-                 Location.raise_errorf ~loc
-                   "%@variadic expect the last type to be an array"));
-          let ( (arg_label : External_arg_spec.label_noname),
-                arg_type,
-                new_arg_types ) =
-            match arg_label with
-            | Optional s -> (
-              let arg_type = get_opt_arg_type ~nolabel:false ty in
-              match arg_type with
-              | Poly_var _ ->
-                (* ?x:([`x of int ] [@string]) does not make sense *)
-                Location.raise_errorf ~loc
-                  "%@string does not work with optional when it has arities in \
-                   label %s"
-                  s
-              | _ -> (Arg_optional, arg_type, param_type :: arg_types))
-            | Labelled _ -> (
-              let arg_type = refine_arg_type ~nolabel:false ty in
-              ( Arg_label,
-                arg_type,
-                match arg_type with
-                | Arg_cst _ -> arg_types
-                | _ -> param_type :: arg_types ))
-            | Nolabel -> (
-              let arg_type = refine_arg_type ~nolabel:true ty in
-              ( Arg_empty,
-                arg_type,
-                match arg_type with
-                | Arg_cst _ -> arg_types
-                | _ -> param_type :: arg_types ))
-          in
-          ( {arg_label; arg_type} :: arg_type_specs,
-            new_arg_types,
-            if arg_type = Ignore then i else i + 1 ))
-    in
-    let ffi : External_ffi_types.external_spec =
-      external_desc_of_non_obj loc external_desc prim_name_with_source
-        arg_type_specs_length arg_types_ty arg_type_specs
-    in
-    let relative = External_ffi_types.check_ffi ~loc ffi in
-    (* result type can not be labeled *)
-    (* currently we don't process attributes of
-       return type, in the future we may *)
-    let return_wrapper =
-      check_return_wrapper loc external_desc.return_wrapper result_type
-    in
-    let fn_type = Ast_core_type.mk_fn_type new_arg_types_ty result_type in
-    ( build_uncurried_type ~arity:(Some (List.length new_arg_types_ty)) fn_type,
-      External_ffi_types.ffi_bs arg_type_specs return_wrapper ffi,
-      unused_attrs,
-      relative )
-
-let encode_attributes_as_string (pval_loc : Location.t) (typ : Ast_core_type.t)
-    (attrs : Ast_attributes.t) (prim_name : string) : response =
-  let pval_type, ffi, pval_attributes, no_inline_cross_module =
-    handle_attributes pval_loc typ attrs prim_name
-  in
-  {
-    pval_type;
-    pval_prim = [prim_name; External_ffi_types.to_string ffi];
-    pval_attributes;
-    no_inline_cross_module;
-  }
-
-let pval_prim_of_labels (labels : string Asttypes.loc list) =
-  let arg_kinds =
-    Ext_list.fold_right labels
-      ([] : External_arg_spec.obj_params)
-      (fun p arg_kinds ->
-        let obj_arg_label = External_arg_spec.obj_label p.txt in
-        {obj_arg_type = Nothing; obj_arg_label} :: arg_kinds)
-  in
-  External_ffi_types.ffi_obj_as_prims arg_kinds
-
-let pval_prim_of_option_labels (labels : (bool * string Asttypes.loc) list)
-    (ends_with_unit : bool) =
-  let arg_kinds =
-    Ext_list.fold_right labels
-      (if ends_with_unit then [External_arg_spec.empty_kind Extern_unit] else [])
-      (fun (is_option, p) arg_kinds ->
-        let label_name = p.txt in
-        let obj_arg_label =
-          if is_option then External_arg_spec.optional false label_name
-          else External_arg_spec.obj_label label_name
-        in
-        {obj_arg_type = Nothing; obj_arg_label} :: arg_kinds)
-  in
-  External_ffi_types.ffi_obj_as_prims arg_kinds
diff --git a/jscomp/frontend/ast_external_process.mli b/jscomp/frontend/ast_external_process.mli
deleted file mode 100644
index 33c85f8..0000000
--- a/jscomp/frontend/ast_external_process.mli
+++ /dev/null
@@ -1,51 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 response = {
-  pval_type: Parsetree.core_type;
-  pval_prim: string list;
-  pval_attributes: Parsetree.attributes;
-  no_inline_cross_module: bool;
-}
-
-val encode_attributes_as_string :
-  Bs_loc.t -> Ast_core_type.t -> Ast_attributes.t -> string -> response
-(**
-   [encode_attributes_as_string
-   loc pval_name.txt pval_type pval_attributes pval_prim]
-   [pval_name.txt] is the name of identifier
-   [pval_prim] is the name of string literal
-
-   return value is of [pval_type, pval_prims, new_attrs]
-*)
-
-val pval_prim_of_labels : string Asttypes.loc list -> string list
-(** [pval_prim_of_labels labels]
-    return [pval_prims] for FFI, it is specialized for
-    external object which is used in
-    {[ [%obj { x = 2; y = 1} ] ]}
-*)
-
-val pval_prim_of_option_labels :
-  (bool * string Asttypes.loc) list -> bool -> string list
diff --git a/jscomp/frontend/ast_literal.ml b/jscomp/frontend/ast_literal.ml
deleted file mode 100644
index 41a641e..0000000
--- a/jscomp/frontend/ast_literal.ml
+++ /dev/null
@@ -1,169 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open Ast_helper
-
-let predef_prefix_ident : Longident.t = Lident "*predef*"
-
-let predef_option : Longident.t = Ldot (predef_prefix_ident, "option")
-
-let predef_some : Longident.t = Ldot (predef_prefix_ident, "Some")
-
-let predef_none : Longident.t = Ldot (predef_prefix_ident, "None")
-
-module Lid = struct
-  type t = Longident.t
-
-  let val_unit : t = Lident "()"
-
-  let type_unit : t = Lident "unit"
-
-  let type_string : t = Lident "string"
-
-  let type_int : t = Lident "int" (* use *predef* *)
-
-  let type_bigint : t = Lident "bigint" (* use *predef* *)
-
-  let type_exn : t = Lident "exn" (* use *predef* *)
-
-  let type_bool : t = Lident "bool" (* use *predef* *)
-
-  (* TODO should be renamed in to {!Js.fn} *)
-  (* TODO should be moved into {!Js.t} Later *)
-  let js_internal : t = Ldot (Lident "Js", "Internal")
-
-  let js_internal_full_apply : t = Ldot (js_internal, "opaqueFullApply")
-
-  let opaque : t = Ldot (js_internal, "opaque")
-
-  let js_oo : t = Lident "Js_OO"
-
-  let js_meth_callback : t = Ldot (js_oo, "Callback")
-
-  let ignore_id : t = Ldot (Lident "Pervasives", "ignore")
-
-  let hidden_field n : t = Lident ("I" ^ n)
-
-  let js_null : t = Ldot (Lident "Js", "null")
-
-  let js_undefined : t = Ldot (Lident "Js", "undefined")
-
-  let js_null_undefined : t = Ldot (Lident "Js", "null_undefined")
-
-  let js_re_id : t = Ldot (Ldot (Lident "Js", "Re"), "t")
-end
-
-module No_loc = struct
-  let loc = Location.none
-
-  let val_unit = Ast_helper.Exp.construct {txt = Lid.val_unit; loc} None
-
-  let type_unit =
-    Ast_helper.Typ.mk (Ptyp_constr ({txt = Lid.type_unit; loc}, []))
-
-  let type_exn =
-    Ast_helper.Typ.mk (Ptyp_constr ({txt = Lid.type_unit; loc}, []))
-
-  let type_int = Ast_helper.Typ.mk (Ptyp_constr ({txt = Lid.type_int; loc}, []))
-
-  let type_bigint =
-    Ast_helper.Typ.mk (Ptyp_constr ({txt = Lid.type_bigint; loc}, []))
-
-  let type_string =
-    Ast_helper.Typ.mk (Ptyp_constr ({txt = Lid.type_string; loc}, []))
-
-  let type_bool =
-    Ast_helper.Typ.mk (Ptyp_constr ({txt = Lid.type_bool; loc}, []))
-
-  let type_any = Ast_helper.Typ.any ()
-
-  let pat_unit = Pat.construct {txt = Lid.val_unit; loc} None
-end
-
-type 'a lit = ?loc:Location.t -> unit -> 'a
-
-type expression_lit = Parsetree.expression lit
-
-type core_type_lit = Parsetree.core_type lit
-
-type pattern_lit = Parsetree.pattern lit
-
-let val_unit ?loc () =
-  match loc with
-  | None -> No_loc.val_unit
-  | Some loc -> Ast_helper.Exp.construct {txt = Lid.val_unit; loc} None
-
-let type_unit ?loc () =
-  match loc with
-  | None -> No_loc.type_unit
-  | Some loc ->
-    Ast_helper.Typ.mk ~loc (Ptyp_constr ({txt = Lid.type_unit; loc}, []))
-
-let type_exn ?loc () =
-  match loc with
-  | None -> No_loc.type_exn
-  | Some loc ->
-    Ast_helper.Typ.mk ~loc (Ptyp_constr ({txt = Lid.type_exn; loc}, []))
-
-let type_string ?loc () =
-  match loc with
-  | None -> No_loc.type_string
-  | Some loc ->
-    Ast_helper.Typ.mk ~loc (Ptyp_constr ({txt = Lid.type_string; loc}, []))
-
-let type_bool ?loc () =
-  match loc with
-  | None -> No_loc.type_bool
-  | Some loc ->
-    Ast_helper.Typ.mk ~loc (Ptyp_constr ({txt = Lid.type_bool; loc}, []))
-
-let type_int ?loc () =
-  match loc with
-  | None -> No_loc.type_int
-  | Some loc ->
-    Ast_helper.Typ.mk ~loc (Ptyp_constr ({txt = Lid.type_int; loc}, []))
-
-let type_int64 =
-  Ast_helper.Typ.mk
-    (Ptyp_constr ({txt = Lident "int64"; loc = Location.none}, []))
-
-let type_float =
-  Ast_helper.Typ.mk
-    (Ptyp_constr ({txt = Lident "float"; loc = Location.none}, []))
-
-let type_bigint ?loc () =
-  match loc with
-  | None -> No_loc.type_bigint
-  | Some loc ->
-    Ast_helper.Typ.mk ~loc (Ptyp_constr ({txt = Lid.type_bigint; loc}, []))
-
-let type_any ?loc () =
-  match loc with
-  | None -> No_loc.type_any
-  | Some loc -> Ast_helper.Typ.any ~loc ()
-
-let pat_unit ?loc () =
-  match loc with
-  | None -> No_loc.pat_unit
-  | Some loc -> Pat.construct ~loc {txt = Lid.val_unit; loc} None
diff --git a/jscomp/frontend/ast_literal.mli b/jscomp/frontend/ast_literal.mli
deleted file mode 100644
index e77b025..0000000
--- a/jscomp/frontend/ast_literal.mli
+++ /dev/null
@@ -1,93 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 lit = ?loc:Location.t -> unit -> 'a
-
-val predef_option : Longident.t
-
-val predef_some : Longident.t
-
-val predef_none : Longident.t
-
-module Lid : sig
-  type t = Longident.t
-
-  val val_unit : t
-
-  val type_unit : t
-
-  val type_int : t
-
-  val type_bigint : t
-
-  val js_internal_full_apply : t
-
-  val opaque : t
-
-  val js_oo : t
-
-  val js_meth_callback : t
-
-  val hidden_field : string -> t
-
-  val ignore_id : t
-
-  val js_null : t
-
-  val js_undefined : t
-
-  val js_null_undefined : t
-
-  val js_re_id : t
-
-  val js_internal : t
-end
-
-type expression_lit = Parsetree.expression lit
-
-type core_type_lit = Parsetree.core_type lit
-
-type pattern_lit = Parsetree.pattern lit
-
-val val_unit : expression_lit
-
-val type_unit : core_type_lit
-
-val type_exn : core_type_lit
-
-val type_string : core_type_lit
-
-val type_bool : core_type_lit
-
-val type_int : core_type_lit
-
-val type_int64 : Parsetree.core_type
-
-val type_float : Parsetree.core_type
-
-val type_bigint : core_type_lit
-
-val type_any : core_type_lit
-
-val pat_unit : pattern_lit
diff --git a/jscomp/frontend/ast_open_cxt.ml b/jscomp/frontend/ast_open_cxt.ml
deleted file mode 100644
index e9ebd77..0000000
--- a/jscomp/frontend/ast_open_cxt.ml
+++ /dev/null
@@ -1,61 +0,0 @@
-(* Copyright (C) 2019 - Present Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 loc = Location.t
-
-type whole =
-  | Let_open of
-      (Asttypes.override_flag
-      * Longident.t Asttypes.loc
-      * loc
-      * Parsetree.attributes)
-
-type t = whole list
-type exp = Parsetree.expression
-type destruct_output = exp list
-
-(**
-   destruct such pattern
-   {[ A.B.let open C in (a,b)]}
-*)
-let rec destruct_open_tuple (e : Parsetree.expression) (acc : t) :
-    (t * destruct_output * _) option =
-  match e.pexp_desc with
-  | Pexp_open (flag, lid, cont) ->
-    destruct_open_tuple cont
-      (Let_open (flag, lid, e.pexp_loc, e.pexp_attributes) :: acc)
-  | Pexp_tuple es -> Some (acc, es, e.pexp_attributes)
-  | _ -> None
-
-let restore_exp (xs : Parsetree.expression) (qualifiers : t) :
-    Parsetree.expression =
-  Ext_list.fold_left qualifiers xs (fun x hole ->
-      match hole with
-      | Let_open (flag, lid, loc, attrs) ->
-        ({
-           pexp_desc = Pexp_open (flag, lid, x);
-           pexp_attributes = attrs;
-           pexp_loc = loc;
-         }
-          : Parsetree.expression))
diff --git a/jscomp/frontend/ast_open_cxt.mli b/jscomp/frontend/ast_open_cxt.mli
deleted file mode 100644
index a50ceda..0000000
--- a/jscomp/frontend/ast_open_cxt.mli
+++ /dev/null
@@ -1,36 +0,0 @@
-(* Copyright (C) 2019 - Present Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 loc = Location.t
-
-type whole
-
-type t = whole list
-
-val restore_exp : Parsetree.expression -> t -> Parsetree.expression
-
-val destruct_open_tuple :
-  Parsetree.expression ->
-  t ->
-  (t * Parsetree.expression list * Parsetree.attributes) option
diff --git a/jscomp/frontend/ast_pat.ml b/jscomp/frontend/ast_pat.ml
deleted file mode 100644
index b3789d8..0000000
--- a/jscomp/frontend/ast_pat.ml
+++ /dev/null
@@ -1,61 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Parsetree.pattern
-
-let is_unit_cont ~yes ~no (p : t) =
-  match p with
-  | {ppat_desc = Ppat_construct ({txt = Lident "()"}, None)} -> yes
-  | _ -> no
-
-(** [arity_of_fun pat e] tells the arity of 
-    expression [fun pat -> e]
-*)
-let arity_of_fun (pat : Parsetree.pattern) (e : Parsetree.expression) =
-  let rec aux (e : Parsetree.expression) =
-    match e.pexp_desc with
-    | Pexp_fun (_, _, _, e) -> 1 + aux e (*FIXME error on optional*)
-    (* | Pexp_fun _
-       -> Location.raise_errorf
-           ~loc:e.pexp_loc "Label is not allowed in JS object" *)
-    | _ -> 0
-  in
-  is_unit_cont ~yes:0 ~no:1 pat + aux e
-
-let rec labels_of_fun (e : Parsetree.expression) =
-  match e.pexp_desc with
-  | Pexp_fun (l, _, _, e) -> l :: labels_of_fun e
-  | _ -> []
-
-let rec is_single_variable_pattern_conservative (p : t) =
-  match p.ppat_desc with
-  | Parsetree.Ppat_any -> Some ""
-  | Parsetree.Ppat_var s -> Some s.txt
-  | Parsetree.Ppat_alias (p, s) ->
-    (* Check more complex patterns is needed or not*)
-    if is_single_variable_pattern_conservative p <> None then Some s.txt
-    else None
-  | Parsetree.Ppat_constraint (p, _) ->
-    is_single_variable_pattern_conservative p
-  | _ -> None
diff --git a/jscomp/frontend/ast_pat.mli b/jscomp/frontend/ast_pat.mli
deleted file mode 100644
index 3689c09..0000000
--- a/jscomp/frontend/ast_pat.mli
+++ /dev/null
@@ -1,35 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Parsetree.pattern
-
-val is_unit_cont : yes:'a -> no:'a -> t -> 'a
-
-val arity_of_fun : t -> Parsetree.expression -> int
-(** [arity_of_fun pat e] tells the arity of 
-    expression [fun pat -> e]*)
-
-val labels_of_fun : Parsetree.expression -> Asttypes.arg_label list
-
-val is_single_variable_pattern_conservative : t -> string option
diff --git a/jscomp/frontend/ast_polyvar.ml b/jscomp/frontend/ast_polyvar.ml
deleted file mode 100644
index 5d04a5b..0000000
--- a/jscomp/frontend/ast_polyvar.ml
+++ /dev/null
@@ -1,116 +0,0 @@
-(* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let map_row_fields_into_ints ptyp_loc (row_fields : Parsetree.row_field list) =
-  let _, acc =
-    Ext_list.fold_left row_fields (0, []) (fun (i, acc) rtag ->
-        match rtag with
-        | Rtag ({txt}, attrs, true, []) ->
-          let i =
-            match Ast_attributes.iter_process_bs_int_as attrs with
-            | Some i -> i
-            | None -> i
-          in
-          (i + 1, (txt, i) :: acc)
-        | _ -> Bs_syntaxerr.err ptyp_loc Invalid_bs_int_type)
-  in
-  List.rev acc
-
-(** Note this is okay with enums, for variants,
-    the underlying representation may change due to       
-    unbox
-*)
-let map_constructor_declarations_into_ints
-    (row_fields : Parsetree.constructor_declaration list) =
-  let mark = ref `nothing in
-  let _, acc =
-    Ext_list.fold_left row_fields (0, []) (fun (i, acc) rtag ->
-        let attrs = rtag.pcd_attributes in
-        match Ast_attributes.iter_process_bs_int_as attrs with
-        | Some j ->
-          if j <> i then if i = 0 then mark := `offset j else mark := `complex;
-          (j + 1, j :: acc)
-        | None -> (i + 1, i :: acc))
-  in
-  match !mark with
-  | `nothing -> `Offset 0
-  | `offset j -> `Offset j
-  | `complex -> `New (List.rev acc)
-
-(** It also check in-consistency of cases like 
-    {[ [`a  | `c of int ] ]}       
-*)
-let map_row_fields_into_strings ptyp_loc (row_fields : Parsetree.row_field list)
-    : External_arg_spec.attr =
-  let has_bs_as = ref false in
-  let case, result =
-    Ext_list.fold_right row_fields (`Nothing, []) (fun tag (nullary, acc) ->
-        match (nullary, tag) with
-        | (`Nothing | `Null), Rtag ({txt}, attrs, true, []) ->
-          let name =
-            match Ast_attributes.iter_process_bs_string_as attrs with
-            | Some name ->
-              has_bs_as := true;
-              name
-            | None -> txt
-          in
-          (`Null, (txt, name) :: acc)
-        | (`Nothing | `NonNull), Rtag ({txt}, attrs, false, [_]) ->
-          let name =
-            match Ast_attributes.iter_process_bs_string_as attrs with
-            | Some name ->
-              has_bs_as := true;
-              name
-            | None -> txt
-          in
-          (`NonNull, (txt, name) :: acc)
-        | _ -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type)
-  in
-  match case with
-  | `Nothing -> Bs_syntaxerr.err ptyp_loc Invalid_bs_string_type
-  | `Null | `NonNull -> (
-    let has_payload = case = `NonNull in
-    let descr = if !has_bs_as then Some result else None in
-    match (has_payload, descr) with
-    | false, None ->
-      Location.prerr_warning ptyp_loc
-        (Bs_ffi_warning "@string is redundant here, you can safely remove it");
-      Nothing
-    | false, Some descr -> External_arg_spec.Poly_var_string {descr}
-    | true, _ -> External_arg_spec.Poly_var {descr})
-
-let is_enum row_fields =
-  List.for_all
-    (fun (x : Parsetree.row_field) ->
-      match x with
-      | Rtag (_label, _attrs, true, []) -> true
-      | _ -> false)
-    row_fields
-
-let is_enum_polyvar (ty : Parsetree.type_declaration) =
-  match ty.ptype_manifest with
-  | Some {ptyp_desc = Ptyp_variant (row_fields, Closed, None)}
-    when is_enum row_fields ->
-    Some row_fields
-  | _ -> None
diff --git a/jscomp/frontend/ast_polyvar.mli b/jscomp/frontend/ast_polyvar.mli
deleted file mode 100644
index 4c83bcb..0000000
--- a/jscomp/frontend/ast_polyvar.mli
+++ /dev/null
@@ -1,40 +0,0 @@
-(* Copyright (C) 2017 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val map_row_fields_into_ints :
-  Location.t -> Parsetree.row_field list -> (string * int) list
-(** side effect: it will mark used attributes `bs.as`  *)
-
-val map_constructor_declarations_into_ints :
-  Parsetree.constructor_declaration list -> [`Offset of int | `New of int list]
-
-val map_row_fields_into_strings :
-  Location.t -> Parsetree.row_field list -> External_arg_spec.attr
-
-(* val is_enum :
-   Parsetree.row_field list ->
-   bool *)
-
-val is_enum_polyvar :
-  Parsetree.type_declaration -> Parsetree.row_field list option
diff --git a/jscomp/frontend/ast_signature.ml b/jscomp/frontend/ast_signature.ml
deleted file mode 100644
index b733780..0000000
--- a/jscomp/frontend/ast_signature.ml
+++ /dev/null
@@ -1,32 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 item = Parsetree.signature_item
-
-type t = item list
-
-open Ast_helper
-
-let fuseAll ?(loc = Location.none) (t : t) : item =
-  Sig.include_ ~loc (Incl.mk ~loc (Mty.signature ~loc t))
diff --git a/jscomp/frontend/ast_signature.mli b/jscomp/frontend/ast_signature.mli
deleted file mode 100644
index b382420..0000000
--- a/jscomp/frontend/ast_signature.mli
+++ /dev/null
@@ -1,29 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 item = Parsetree.signature_item
-
-type t = item list
-
-val fuseAll : ?loc:Ast_helper.loc -> t -> item
diff --git a/jscomp/frontend/ast_structure.ml b/jscomp/frontend/ast_structure.ml
deleted file mode 100644
index 2143f09..0000000
--- a/jscomp/frontend/ast_structure.ml
+++ /dev/null
@@ -1,53 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 item = Parsetree.structure_item
-
-type t = item list
-
-open Ast_helper
-
-let fuseAll ?(loc = Location.none) (t : t) : item =
-  Str.include_ ~loc (Incl.mk ~loc (Mod.structure ~loc t))
-
-(* let fuse_with_constraint
-    ?(loc=Location.none)
-    (item : Parsetree.type_declaration list ) (t : t) (coercion) =
-   Str.include_ ~loc
-    (Incl.mk ~loc
-       (Mod.constraint_
-         (Mod.structure ~loc
-         ({pstr_loc = loc; pstr_desc = Pstr_type item} :: t) )
-         (
-           Mty.signature ~loc
-           ({psig_loc = loc; psig_desc = Psig_type item} :: coercion)
-         )
-         )
-    ) *)
-let constraint_ ?(loc = Location.none) (stru : t) (sign : Ast_signature.t) =
-  Str.include_ ~loc
-    (Incl.mk ~loc
-       (Mod.constraint_ ~loc (Mod.structure ~loc stru) (Mty.signature ~loc sign)))
-
-let dummy_item loc : item = Str.eval ~loc (Ast_literal.val_unit ~loc ())
diff --git a/jscomp/frontend/ast_structure.mli b/jscomp/frontend/ast_structure.mli
deleted file mode 100644
index 77608b4..0000000
--- a/jscomp/frontend/ast_structure.mli
+++ /dev/null
@@ -1,40 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 item = Parsetree.structure_item
-
-type t = item list
-
-val fuseAll : ?loc:Ast_helper.loc -> t -> item
-
-(* val fuse_with_constraint:
-   ?loc:Ast_helper.loc ->
-   Parsetree.type_declaration list ->
-   t   ->
-   Ast_signature.t ->
-   item *)
-
-val constraint_ : ?loc:Ast_helper.loc -> t -> Ast_signature.t -> item
-
-val dummy_item : Location.t -> item
diff --git a/jscomp/frontend/ast_tdcls.ml b/jscomp/frontend/ast_tdcls.ml
deleted file mode 100644
index 09c3487..0000000
--- a/jscomp/frontend/ast_tdcls.ml
+++ /dev/null
@@ -1,107 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open Ast_helper
-
-(**
-   [newTdcls tdcls newAttrs]
-   functional update attributes of last declaration *)
-let newTdcls (tdcls : Parsetree.type_declaration list)
-    (newAttrs : Parsetree.attributes) : Parsetree.type_declaration list =
-  match tdcls with
-  | [x] -> [{x with Parsetree.ptype_attributes = newAttrs}]
-  | _ ->
-    Ext_list.map_last tdcls (fun last x ->
-        if last then {x with Parsetree.ptype_attributes = newAttrs} else x)
-
-let handleTdclsInSigi (self : Bs_ast_mapper.mapper)
-    (sigi : Parsetree.signature_item) rf
-    (tdcls : Parsetree.type_declaration list) : Ast_signature.item =
-  match
-    Ast_attributes.process_derive_type (Ext_list.last tdcls).ptype_attributes
-  with
-  | {bs_deriving = Some actions}, newAttrs ->
-    let loc = sigi.psig_loc in
-    let originalTdclsNewAttrs = newTdcls tdcls newAttrs in
-    (* remove the processed attr*)
-    let newTdclsNewAttrs =
-      self.type_declaration_list self originalTdclsNewAttrs
-    in
-    let kind = Ast_derive_abstract.isAbstract actions in
-    if kind <> Not_abstract then
-      let codes =
-        Ast_derive_abstract.handleTdclsInSig ~light:(kind = Light_abstract) rf
-          originalTdclsNewAttrs
-      in
-      Ast_signature.fuseAll ~loc
-        (Sig.include_ ~loc
-           (Incl.mk ~loc
-              (Mty.typeof_ ~loc
-                 (Mod.constraint_ ~loc
-                    (Mod.structure ~loc
-                       [Ast_compatible.rec_type_str ~loc rf newTdclsNewAttrs])
-                    (Mty.signature ~loc []))))
-        :: (* include module type of struct [processed_code for checking like invariance ]end *)
-           self.signature self codes)
-    else
-      Ast_signature.fuseAll ~loc
-        (Ast_compatible.rec_type_sig ~loc rf newTdclsNewAttrs
-        :: self.signature self (Ast_derive.gen_signature tdcls actions rf))
-  | {bs_deriving = None}, _ ->
-    Bs_ast_mapper.default_mapper.signature_item self sigi
-
-let handleTdclsInStru (self : Bs_ast_mapper.mapper)
-    (str : Parsetree.structure_item) rf
-    (tdcls : Parsetree.type_declaration list) : Ast_structure.item =
-  match
-    Ast_attributes.process_derive_type (Ext_list.last tdcls).ptype_attributes
-  with
-  | {bs_deriving = Some actions}, newAttrs ->
-    let loc = str.pstr_loc in
-    let originalTdclsNewAttrs = newTdcls tdcls newAttrs in
-    let newStr : Parsetree.structure_item =
-      Ast_compatible.rec_type_str ~loc rf
-        (self.type_declaration_list self originalTdclsNewAttrs)
-    in
-    let kind = Ast_derive_abstract.isAbstract actions in
-    if kind <> Not_abstract then
-      let codes =
-        Ast_derive_abstract.handleTdclsInStr ~light:(kind = Light_abstract) rf
-          originalTdclsNewAttrs
-      in
-      (* use [tdcls2] avoid nonterminating *)
-      Ast_structure.fuseAll ~loc
-        (Ast_structure.constraint_ ~loc [newStr] []
-        :: (* [include struct end : sig end] for error checking *)
-           self.structure self codes)
-    else
-      Ast_structure.fuseAll ~loc
-        (newStr
-        :: self.structure self
-             (List.map
-                (fun action ->
-                  Ast_derive.gen_structure_signature loc tdcls action rf)
-                actions))
-  | {bs_deriving = None}, _ ->
-    Bs_ast_mapper.default_mapper.structure_item self str
diff --git a/jscomp/frontend/ast_tdcls.mli b/jscomp/frontend/ast_tdcls.mli
deleted file mode 100644
index 1f8e62a..0000000
--- a/jscomp/frontend/ast_tdcls.mli
+++ /dev/null
@@ -1,37 +0,0 @@
-(* Copyright (C) 2018 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val handleTdclsInSigi :
-  Bs_ast_mapper.mapper ->
-  Parsetree.signature_item ->
-  Asttypes.rec_flag ->
-  Parsetree.type_declaration list ->
-  Ast_signature.item
-
-val handleTdclsInStru :
-  Bs_ast_mapper.mapper ->
-  Parsetree.structure_item ->
-  Asttypes.rec_flag ->
-  Parsetree.type_declaration list ->
-  Ast_structure.item
diff --git a/jscomp/frontend/ast_tuple_pattern_flatten.ml b/jscomp/frontend/ast_tuple_pattern_flatten.ml
deleted file mode 100644
index 8958e3e..0000000
--- a/jscomp/frontend/ast_tuple_pattern_flatten.ml
+++ /dev/null
@@ -1,88 +0,0 @@
-(* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 loc = Location.t
-
-   type exp = Parsetree.expression
-
-   type pat = Parsetree.pattern *)
-
-let rec is_simple_pattern (p : Parsetree.pattern) =
-  match p.ppat_desc with
-  | Ppat_any -> true
-  | Ppat_var _ -> true
-  | Ppat_constraint (p, _) -> is_simple_pattern p
-  | _ -> false
-
-(*
-  [let (a,b) = M.N.(c,d) ]
-  =>
-  [ let a = M.N.c
-    and b = M.N.d ]
-*)
-let flattern_tuple_pattern_vb (self : Bs_ast_mapper.mapper)
-    (vb : Parsetree.value_binding) (acc : Parsetree.value_binding list) :
-    Parsetree.value_binding list =
-  let pvb_pat = self.pat self vb.pvb_pat in
-  let pvb_expr = self.expr self vb.pvb_expr in
-  let pvb_attributes = self.attributes self vb.pvb_attributes in
-  match (pvb_pat.ppat_desc, pvb_expr.pexp_desc) with
-  | Ppat_tuple xs, _ when List.for_all is_simple_pattern xs -> (
-    match Ast_open_cxt.destruct_open_tuple pvb_expr [] with
-    | Some (wholes, es, tuple_attributes)
-      when Ext_list.for_all xs is_simple_pattern && Ext_list.same_length es xs
-      ->
-      Bs_ast_invariant.warn_discarded_unused_attributes tuple_attributes;
-      (* will be dropped*)
-      Ext_list.fold_right2 xs es acc (fun pat exp acc ->
-          {
-            pvb_pat = pat;
-            pvb_expr = Ast_open_cxt.restore_exp exp wholes;
-            pvb_attributes;
-            pvb_loc = vb.pvb_loc;
-          }
-          :: acc)
-    | _ -> {pvb_pat; pvb_expr; pvb_loc = vb.pvb_loc; pvb_attributes} :: acc)
-  | Ppat_record (lid_pats, _), Pexp_pack {pmod_desc = Pmod_ident id} ->
-    Ext_list.map_append lid_pats acc (fun (lid, pat) ->
-        match lid.txt with
-        | Lident s ->
-          {
-            pvb_pat = pat;
-            pvb_expr =
-              Ast_helper.Exp.ident ~loc:lid.loc
-                {lid with txt = Ldot (id.txt, s)};
-            pvb_attributes = [];
-            pvb_loc = pat.ppat_loc;
-          }
-        | _ ->
-          Location.raise_errorf ~loc:lid.loc
-            "Not supported pattern match on modules")
-  | _ -> {pvb_pat; pvb_expr; pvb_loc = vb.pvb_loc; pvb_attributes} :: acc
-
-let value_bindings_mapper (self : Bs_ast_mapper.mapper)
-    (vbs : Parsetree.value_binding list) =
-  (* Bs_ast_mapper.default_mapper.value_bindings self  vbs   *)
-  Ext_list.fold_right vbs [] (fun vb acc ->
-      flattern_tuple_pattern_vb self vb acc)
diff --git a/jscomp/frontend/ast_tuple_pattern_flatten.mli b/jscomp/frontend/ast_tuple_pattern_flatten.mli
deleted file mode 100644
index 3718b5d..0000000
--- a/jscomp/frontend/ast_tuple_pattern_flatten.mli
+++ /dev/null
@@ -1,28 +0,0 @@
-(* Copyright (C) 2018 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val value_bindings_mapper :
-  Bs_ast_mapper.mapper ->
-  Parsetree.value_binding list ->
-  Parsetree.value_binding list
diff --git a/jscomp/frontend/ast_typ_uncurry.ml b/jscomp/frontend/ast_typ_uncurry.ml
deleted file mode 100644
index 36861ea..0000000
--- a/jscomp/frontend/ast_typ_uncurry.ml
+++ /dev/null
@@ -1,64 +0,0 @@
-(* Copyright (C) 2020 Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 typ = Parsetree.core_type
-type 'a cxt = Ast_helper.loc -> Bs_ast_mapper.mapper -> 'a
-type uncurry_type_gen = (Asttypes.arg_label -> typ -> typ -> typ) cxt
-
-module Typ = Ast_helper.Typ
-
-let to_method_callback_type loc (mapper : Bs_ast_mapper.mapper)
-    (label : Asttypes.arg_label) (first_arg : Parsetree.core_type)
-    (typ : Parsetree.core_type) =
-  let first_arg = mapper.typ mapper first_arg in
-  let typ = mapper.typ mapper typ in
-  let meth_type = Typ.arrow ~loc label first_arg typ in
-  let arity = Ast_core_type.get_uncurry_arity meth_type in
-  match arity with
-  | Some n ->
-    Typ.constr
-      {
-        txt = Ldot (Ast_literal.Lid.js_meth_callback, "arity" ^ string_of_int n);
-        loc;
-      }
-      [meth_type]
-  | None -> assert false
-
-let to_uncurry_type loc (mapper : Bs_ast_mapper.mapper)
-    (label : Asttypes.arg_label) (first_arg : Parsetree.core_type)
-    (typ : Parsetree.core_type) =
-  (* no need to error for optional here,
-     since we can not make it
-     TODO: still error out for external?
-     Maybe no need to error on optional at all
-     it just does not make sense
-  *)
-  let first_arg = mapper.typ mapper first_arg in
-  let typ = mapper.typ mapper typ in
-
-  let fn_type = Typ.arrow ~loc label first_arg typ in
-  let arity = Ast_core_type.get_uncurry_arity fn_type in
-  match arity with
-  | Some arity -> Ast_uncurried.uncurriedType ~loc ~arity fn_type
-  | None -> assert false
diff --git a/jscomp/frontend/ast_typ_uncurry.mli b/jscomp/frontend/ast_typ_uncurry.mli
deleted file mode 100644
index afb1bc5..0000000
--- a/jscomp/frontend/ast_typ_uncurry.mli
+++ /dev/null
@@ -1,60 +0,0 @@
-(* Copyright (C) 2020 Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* Note that currently there is no way to consume [Js.meth_callback]
-    so it is fine to encode it with a freedom,
-    but we need make it better for error message.
-   - all are encoded as
-   {[
-     type fn =  (`Args_n of _ , 'result ) Js.fn
-     type method = (`Args_n of _, 'result) Js.method
-     type method_callback = (`Args_n of _, 'result) Js.method_callback
-   ]}
-    For [method_callback], the arity is never zero, so both [method]
-    and  [fn] requires (unit -> 'a) to encode arity zero
-*)
-
-type typ = Parsetree.core_type
-
-type 'a cxt = Ast_helper.loc -> Bs_ast_mapper.mapper -> 'a
-
-type uncurry_type_gen =
-  (Asttypes.arg_label ->
-  (* label for error checking *)
-  typ ->
-  (* First arg *)
-  typ ->
-  (* Tail *)
-  typ)
-  cxt
-
-val to_uncurry_type : uncurry_type_gen
-(** syntax : 
-    {[ int -> int -> int [@bs]]}
-*)
-
-val to_method_callback_type : uncurry_type_gen
-(** syntax:
-    {[ 'obj -> int -> int [@bs.this] ]}
-*)
diff --git a/jscomp/frontend/ast_uncurry_gen.ml b/jscomp/frontend/ast_uncurry_gen.ml
deleted file mode 100644
index ec69cda..0000000
--- a/jscomp/frontend/ast_uncurry_gen.ml
+++ /dev/null
@@ -1,101 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-open Ast_helper
-
-(* Handling `fun [@this]` used in `object [@bs] end` *)
-let to_method_callback loc (self : Bs_ast_mapper.mapper) label
-    (self_pat : Parsetree.pattern) body : Parsetree.expression_desc =
-  let self_pat = self.pat self self_pat in
-  (match Ast_pat.is_single_variable_pattern_conservative self_pat with
-  | None -> Bs_syntaxerr.err self_pat.ppat_loc Bs_this_simple_pattern
-  | Some self -> Stack.push self Js_config.self_stack);
-  Bs_syntaxerr.optional_err loc label;
-  let rec aux acc (body : Parsetree.expression) =
-    match Ast_attributes.process_attributes_rev body.pexp_attributes with
-    | Nothing, attrs -> (
-      match body.pexp_desc with
-      | Pexp_fun (arg_label, _, arg, body) ->
-        Bs_syntaxerr.optional_err loc arg_label;
-        aux ((arg_label, self.pat self arg, attrs) :: acc) body
-      | _ -> (self.expr self body, acc))
-    | _, _ -> (self.expr self body, acc)
-  in
-  let result, rev_extra_args = aux [(label, self_pat, [])] body in
-  let body =
-    Ext_list.fold_left rev_extra_args result (fun e (label, p, attrs) ->
-        Ast_helper.Exp.fun_ ~loc ~attrs label None p e)
-  in
-  let arity = List.length rev_extra_args in
-  let arity_s = string_of_int arity in
-  Stack.pop Js_config.self_stack |> ignore;
-  Parsetree.Pexp_apply
-    ( Exp.ident ~loc
-        {loc; txt = Ldot (Ast_literal.Lid.js_oo, "unsafe_to_method")},
-      [
-        ( Nolabel,
-          Exp.constraint_ ~loc
-            (Exp.record ~loc
-               [({loc; txt = Ast_literal.Lid.hidden_field arity_s}, body)]
-               None)
-            (Typ.constr ~loc
-               {
-                 loc;
-                 txt = Ldot (Ast_literal.Lid.js_meth_callback, "arity" ^ arity_s);
-               }
-               [Typ.any ~loc ()]) );
-      ] )
-
-let to_uncurry_fn (e : Parsetree.expression) (self : Bs_ast_mapper.mapper)
-    (label : Asttypes.arg_label) pat body async : Parsetree.expression =
-  let loc = e.pexp_loc in
-  Bs_syntaxerr.optional_err loc label;
-  let rec aux acc (body : Parsetree.expression) =
-    match Ast_attributes.process_attributes_rev body.pexp_attributes with
-    | Nothing, _ -> (
-      match body.pexp_desc with
-      | Pexp_fun (arg_label, _, arg, body) ->
-        Bs_syntaxerr.optional_err loc arg_label;
-        aux ((arg_label, self.pat self arg) :: acc) body
-      | _ -> (self.expr self body, acc))
-    | _, _ -> (self.expr self body, acc)
-  in
-  let first_arg = self.pat self pat in
-
-  let result, rev_extra_args = aux [(label, first_arg)] body in
-  let result = Ast_async.add_promise_type ~async result in
-  let body =
-    Ext_list.fold_left rev_extra_args result (fun e (label, p) ->
-        Ast_helper.Exp.fun_ ~loc label None p e)
-  in
-  let body = Ast_async.add_async_attribute ~async body in
-
-  let arity = List.length rev_extra_args in
-  Bs_syntaxerr.err_large_arity loc arity;
-  let fun_exp = Ast_uncurried.uncurriedFun ~loc ~arity body in
-  {
-    e with
-    pexp_desc = fun_exp.pexp_desc;
-    pexp_attributes = fun_exp.pexp_attributes @ e.pexp_attributes;
-  }
diff --git a/jscomp/frontend/ast_uncurry_gen.mli b/jscomp/frontend/ast_uncurry_gen.mli
deleted file mode 100644
index 047c2b1..0000000
--- a/jscomp/frontend/ast_uncurry_gen.mli
+++ /dev/null
@@ -1,51 +0,0 @@
-(* Copyright (C) 2020- Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val to_uncurry_fn :
-  Parsetree.expression ->
-  Bs_ast_mapper.mapper ->
-  Asttypes.arg_label ->
-  Parsetree.pattern ->
-  Parsetree.expression ->
-  bool ->
-  (* async *)
-  Parsetree.expression
-(** 
-    [function] can only take one argument, that is the reason we did not adopt it
-    syntax:
-   {[ fun [@bs] pat pat1-> body ]}
-    [to_uncurry_fn (fun pat -> (fun pat1 -> ...  body))]
-
-*)
-
-val to_method_callback :
-  Location.t ->
-  Bs_ast_mapper.mapper ->
-  Asttypes.arg_label ->
-  Parsetree.pattern ->
-  Parsetree.expression ->
-  Parsetree.expression_desc
-(** syntax: 
-    {[fun [@bs.this] obj pat pat1 -> body]}    
-*)
diff --git a/jscomp/frontend/ast_utf8_string.ml b/jscomp/frontend/ast_utf8_string.ml
deleted file mode 100644
index 75b1702..0000000
--- a/jscomp/frontend/ast_utf8_string.ml
+++ /dev/null
@@ -1,209 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 error =
-  | Invalid_code_point
-  | Unterminated_backslash
-  | Invalid_hex_escape
-  | Invalid_unicode_escape
-  | Invalid_unicode_codepoint_escape
-
-let pp_error fmt err =
-  Format.pp_print_string fmt
-  @@
-  match err with
-  | Invalid_code_point -> "Invalid code point"
-  | Unterminated_backslash -> "\\ ended unexpectedly"
-  | Invalid_hex_escape -> "Invalid \\x escape"
-  | Invalid_unicode_escape -> "Invalid \\u escape"
-  | Invalid_unicode_codepoint_escape ->
-    "Invalid \\u{…} codepoint escape sequence"
-
-type exn += Error of int (* offset *) * error
-
-let error ~loc error = raise (Error (loc, error))
-
-(** Note the [loc] really should be the utf8-offset, it has nothing to do with our 
-    escaping mechanism
-*)
-(* we can not just print new line in ES5
-   seems we don't need
-   escape "\b" "\f"
-   we need escape "\n" "\r" since
-   ocaml multiple-line allows [\n]
-   visual input while es5 string
-   does not*)
-
-let rec check_and_transform (loc : int) (buf : Buffer.t) (s : string)
-    (byte_offset : int) (s_len : int) =
-  if byte_offset = s_len then ()
-  else
-    let current_char = s.[byte_offset] in
-    match Ext_utf8.classify current_char with
-    | Single 92 (* '\\' *) ->
-      escape_code (loc + 1) buf s (byte_offset + 1) s_len
-    | Single 34 ->
-      Buffer.add_string buf "\\\"";
-      check_and_transform (loc + 1) buf s (byte_offset + 1) s_len
-    | Single 10 ->
-      Buffer.add_string buf "\\n";
-      check_and_transform (loc + 1) buf s (byte_offset + 1) s_len
-    | Single 13 ->
-      Buffer.add_string buf "\\r";
-      check_and_transform (loc + 1) buf s (byte_offset + 1) s_len
-    | Single _ ->
-      Buffer.add_char buf current_char;
-      check_and_transform (loc + 1) buf s (byte_offset + 1) s_len
-    | Invalid | Cont _ -> error ~loc Invalid_code_point
-    | Leading (n, _) ->
-      let i' = Ext_utf8.next s ~remaining:n byte_offset in
-      if i' < 0 then error ~loc Invalid_code_point
-      else (
-        for k = byte_offset to i' do
-          Buffer.add_char buf s.[k]
-        done;
-        check_and_transform (loc + 1) buf s (i' + 1) s_len)
-
-(* we share the same escape sequence with js *)
-and escape_code loc buf s offset s_len =
-  if offset >= s_len then error ~loc Unterminated_backslash
-  else Buffer.add_char buf '\\';
-  let cur_char = s.[offset] in
-  match cur_char with
-  | '\\' | 'b' | 't' | 'n' | 'v' | 'f' | 'r' | '0' | '$' ->
-    Buffer.add_char buf cur_char;
-    check_and_transform (loc + 1) buf s (offset + 1) s_len
-  | 'u' ->
-    if offset + 1 >= s_len then error ~loc Invalid_unicode_escape
-    else (
-      Buffer.add_char buf cur_char;
-      let next_char = s.[offset + 1] in
-      match next_char with
-      | '{' ->
-        Buffer.add_char buf next_char;
-        unicode_codepoint_escape (loc + 2) buf s (offset + 2) s_len
-      | _ -> unicode (loc + 1) buf s (offset + 1) s_len)
-  | 'x' ->
-    Buffer.add_char buf cur_char;
-    two_hex (loc + 1) buf s (offset + 1) s_len
-  | _ ->
-    (* Regular characters, like `a` in `\a`,
-     * are valid escape sequences *)
-    Buffer.add_char buf cur_char;
-    check_and_transform (loc + 1) buf s (offset + 1) s_len
-
-and two_hex loc buf s offset s_len =
-  if offset + 1 >= s_len then error ~loc Invalid_hex_escape;
-  (*Location.raise_errorf ~loc "\\x need at least two chars";*)
-  let a, b = (s.[offset], s.[offset + 1]) in
-  if Ext_char.valid_hex a && Ext_char.valid_hex b then (
-    Buffer.add_char buf a;
-    Buffer.add_char buf b;
-    check_and_transform (loc + 2) buf s (offset + 2) s_len)
-  else error ~loc Invalid_hex_escape
-(*Location.raise_errorf ~loc "%c%c is not a valid hex code" a b*)
-
-and unicode loc buf s offset s_len =
-  if offset + 3 >= s_len then error ~loc Invalid_unicode_escape
-    (*Location.raise_errorf ~loc "\\u need at least four chars"*);
-  let a0, a1, a2, a3 =
-    (s.[offset], s.[offset + 1], s.[offset + 2], s.[offset + 3])
-  in
-  if
-    Ext_char.valid_hex a0 && Ext_char.valid_hex a1 && Ext_char.valid_hex a2
-    && Ext_char.valid_hex a3
-  then (
-    Buffer.add_char buf a0;
-    Buffer.add_char buf a1;
-    Buffer.add_char buf a2;
-    Buffer.add_char buf a3;
-    check_and_transform (loc + 4) buf s (offset + 4) s_len)
-  else error ~loc Invalid_unicode_escape
-
-(*Location.raise_errorf ~loc "%c%c%c%c is not a valid unicode point"
-  a0 a1 a2 a3 *)
-(* http://www.2ality.com/2015/01/es6-strings.html
-   console.log('\uD83D\uDE80'); (* ES6*)
-   console.log('\u{1F680}');
-*)
-
-(* ES6 unicode codepoint escape sequences: \u{…}
-   https://262.ecma-international.org/6.0/#sec-literals-string-literals *)
-and unicode_codepoint_escape loc buf s offset s_len =
-  if offset >= s_len then error ~loc Invalid_unicode_codepoint_escape
-  else
-    let cur_char = s.[offset] in
-    match cur_char with
-    | '}' ->
-      Buffer.add_char buf cur_char;
-      let x = ref 0 in
-      for ix = loc to offset - 1 do
-        let c = s.[ix] in
-        let value =
-          match c with
-          | '0' .. '9' -> Char.code c - 48
-          | 'a' .. 'f' -> Char.code c - Char.code 'a' + 10
-          | 'A' .. 'F' -> Char.code c + 32 - Char.code 'a' + 10
-          | _ -> 16
-          (* larger than any legal value, unicode_codepoint_escape only makes progress if we have valid hex symbols *)
-        in
-        (* too long escape sequence will result in an overflow, perform an upperbound check *)
-        if !x > 0x10FFFF then error ~loc Invalid_unicode_codepoint_escape
-        else x := (!x * 16) + value
-      done;
-      if Uchar.is_valid !x then
-        check_and_transform (offset + 1) buf s (offset + 1) s_len
-      else error ~loc Invalid_unicode_codepoint_escape
-    | _ ->
-      if Ext_char.valid_hex cur_char then (
-        Buffer.add_char buf cur_char;
-        unicode_codepoint_escape loc buf s (offset + 1) s_len)
-      else error ~loc Invalid_unicode_codepoint_escape
-
-let transform_test s =
-  let s_len = String.length s in
-  let buf = Buffer.create (s_len * 2) in
-  check_and_transform 0 buf s 0 s_len;
-  Buffer.contents buf
-
-let transform loc s =
-  let s_len = String.length s in
-  let buf = Buffer.create (s_len * 2) in
-  try
-    check_and_transform 0 buf s 0 s_len;
-    Buffer.contents buf
-  with Error (offset, error) ->
-    Location.raise_errorf ~loc "Offset: %d, %a" offset pp_error error
-
-let rec check_no_escapes_or_unicode (s : string) (byte_offset : int)
-    (s_len : int) =
-  if byte_offset = s_len then true
-  else
-    let current_char = s.[byte_offset] in
-    match Ext_utf8.classify current_char with
-    | Single 92 (* '\\' *) -> false
-    | Single _ -> check_no_escapes_or_unicode s (byte_offset + 1) s_len
-    | Invalid | Cont _ | Leading _ -> false
-
-let simple_comparison s = check_no_escapes_or_unicode s 0 (String.length s)
diff --git a/jscomp/frontend/ast_utf8_string.mli b/jscomp/frontend/ast_utf8_string.mli
deleted file mode 100644
index 588125f..0000000
--- a/jscomp/frontend/ast_utf8_string.mli
+++ /dev/null
@@ -1,40 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 error
-
-type exn += Error of int (* offset *) * error
-
-val pp_error : Format.formatter -> error -> unit
-
-(* module Interp : sig *)
-(*   val check_and_transform : int -> string -> int -> cxt -> unit *)
-(*   val transform_test : string -> segments *)
-(* end *)
-val transform_test : string -> string
-
-val transform : Location.t -> string -> string
-
-(* Check if the string is only == to itself (no unicode or escape tricks) *)
-val simple_comparison : string -> bool
diff --git a/jscomp/frontend/ast_utf8_string_interp.ml b/jscomp/frontend/ast_utf8_string_interp.ml
deleted file mode 100644
index a66d7ee..0000000
--- a/jscomp/frontend/ast_utf8_string_interp.ml
+++ /dev/null
@@ -1,314 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 error =
-  | Invalid_code_point
-  | Unterminated_backslash
-  | Invalid_escape_code of char
-  | Invalid_hex_escape
-  | Invalid_unicode_escape
-  | Unterminated_variable
-  | Unmatched_paren
-  | Invalid_syntax_of_var of string
-
-type kind = String | Var of int * int
-(* [Var (loffset, roffset)]
-   For parens it used to be (2,-1)
-   for non-parens it used to be (1,0)
-*)
-
-type pos = {
-  lnum: int;
-  offset: int;
-  byte_bol: int;
-      (* Note it actually needs to be in sync with OCaml's lexing semantics *)
-}
-(** Note the position is about code point *)
-
-type segment = {start: pos; finish: pos; kind: kind; content: string}
-type segments = segment list
-
-type cxt = {
-  mutable segment_start: pos;
-  buf: Buffer.t;
-  s_len: int;
-  mutable segments: segments;
-  mutable pos_bol: int;
-  (* record the abs position of current beginning line *)
-  mutable byte_bol: int;
-  mutable pos_lnum: int; (* record the line number *)
-}
-
-type exn += Error of pos * pos * error
-
-let valid_lead_identifier_char x =
-  match x with
-  | 'a' .. 'z' | '_' -> true
-  | _ -> false
-
-(** Invariant: [valid_lead_identifier] has to be [valid_identifier] *)
-let valid_identifier_char x =
-  match x with
-  | 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '\'' -> true
-  | _ -> false
-
-let valid_identifier s =
-  let s_len = String.length s in
-  if s_len = 0 then false
-  else
-    valid_lead_identifier_char s.[0]
-    && Ext_string.for_all_from s 1 valid_identifier_char
-
-(* let is_space x =
-   match x with
-   | ' ' | '\n' | '\t' -> true
-   | _ -> false *)
-
-(** Note [Var] kind can not be mpty  *)
-let empty_segment {content} = Ext_string.is_empty content
-
-let update_newline ~byte_bol loc cxt =
-  cxt.pos_lnum <- cxt.pos_lnum + 1;
-  cxt.pos_bol <- loc;
-  cxt.byte_bol <- byte_bol
-
-let pos_error cxt ~loc error =
-  raise
-    (Error
-       ( cxt.segment_start,
-         {
-           lnum = cxt.pos_lnum;
-           offset = loc - cxt.pos_bol;
-           byte_bol = cxt.byte_bol;
-         },
-         error ))
-
-let add_var_segment cxt loc loffset roffset =
-  let content = Buffer.contents cxt.buf in
-  Buffer.clear cxt.buf;
-  let next_loc =
-    {lnum = cxt.pos_lnum; offset = loc - cxt.pos_bol; byte_bol = cxt.byte_bol}
-  in
-  if valid_identifier content then (
-    cxt.segments <-
-      {
-        start = cxt.segment_start;
-        finish = next_loc;
-        kind = Var (loffset, roffset);
-        content;
-      }
-      :: cxt.segments;
-    cxt.segment_start <- next_loc)
-  else pos_error cxt ~loc (Invalid_syntax_of_var content)
-
-let add_str_segment cxt loc =
-  let content = Buffer.contents cxt.buf in
-  Buffer.clear cxt.buf;
-  let next_loc =
-    {lnum = cxt.pos_lnum; offset = loc - cxt.pos_bol; byte_bol = cxt.byte_bol}
-  in
-  cxt.segments <-
-    {start = cxt.segment_start; finish = next_loc; kind = String; content}
-    :: cxt.segments;
-  cxt.segment_start <- next_loc
-
-let rec check_and_transform (loc : int) s byte_offset
-    ({s_len; buf} as cxt : cxt) =
-  if byte_offset = s_len then add_str_segment cxt loc
-  else
-    let current_char = s.[byte_offset] in
-    match Ext_utf8.classify current_char with
-    | Single 92 (* '\\' *) -> escape_code (loc + 1) s (byte_offset + 1) cxt
-    | Single 34 ->
-      Buffer.add_string buf "\\\"";
-      check_and_transform (loc + 1) s (byte_offset + 1) cxt
-    | Single 10 ->
-      Buffer.add_string buf "\\n";
-      let loc = loc + 1 in
-      let byte_offset = byte_offset + 1 in
-      update_newline ~byte_bol:byte_offset loc cxt;
-      (* Note variable could not have new-line *)
-      check_and_transform loc s byte_offset cxt
-    | Single 13 ->
-      Buffer.add_string buf "\\r";
-      check_and_transform (loc + 1) s (byte_offset + 1) cxt
-    | Single 36 ->
-      (* $ *)
-      add_str_segment cxt loc;
-      let offset = byte_offset + 1 in
-      if offset >= s_len then pos_error ~loc cxt Unterminated_variable
-      else
-        let cur_char = s.[offset] in
-        if cur_char = '(' then expect_var_paren (loc + 2) s (offset + 1) cxt
-        else expect_simple_var (loc + 1) s offset cxt
-    | Single _ ->
-      Buffer.add_char buf current_char;
-      check_and_transform (loc + 1) s (byte_offset + 1) cxt
-    | Invalid | Cont _ -> pos_error ~loc cxt Invalid_code_point
-    | Leading (n, _) ->
-      let i' = Ext_utf8.next s ~remaining:n byte_offset in
-      if i' < 0 then pos_error cxt ~loc Invalid_code_point
-      else (
-        for k = byte_offset to i' do
-          Buffer.add_char buf s.[k]
-        done;
-        check_and_transform (loc + 1) s (i' + 1) cxt)
-
-(* Lets keep identifier simple, so that we could generating a function easier in the future
-   for example
-   let f = [%fn{| $x + $y = $x_add_y |}]
-*)
-and expect_simple_var loc s offset ({buf; s_len} as cxt) =
-  let v = ref offset in
-  (* prerr_endline @@ Ext_pervasives.dump (s, has_paren, (is_space s.[!v]), !v); *)
-  if not (offset < s_len && valid_lead_identifier_char s.[offset]) then
-    pos_error cxt ~loc (Invalid_syntax_of_var Ext_string.empty)
-  else (
-    while !v < s_len && valid_identifier_char s.[!v] do
-      (* TODO*)
-      let cur_char = s.[!v] in
-      Buffer.add_char buf cur_char;
-      incr v
-    done;
-    let added_length = !v - offset in
-    let loc = added_length + loc in
-    add_var_segment cxt loc 1 0;
-    check_and_transform loc s (added_length + offset) cxt)
-
-and expect_var_paren loc s offset ({buf; s_len} as cxt) =
-  let v = ref offset in
-  (* prerr_endline @@ Ext_pervasives.dump (s, has_paren, (is_space s.[!v]), !v); *)
-  while !v < s_len && s.[!v] <> ')' do
-    let cur_char = s.[!v] in
-    Buffer.add_char buf cur_char;
-    incr v
-  done;
-  let added_length = !v - offset in
-  let loc = added_length + 1 + loc in
-  if !v < s_len && s.[!v] = ')' then (
-    add_var_segment cxt loc 2 (-1);
-    check_and_transform loc s (added_length + 1 + offset) cxt)
-  else pos_error cxt ~loc Unmatched_paren
-
-(* we share the same escape sequence with js *)
-and escape_code loc s offset ({buf; s_len} as cxt) =
-  if offset >= s_len then pos_error cxt ~loc Unterminated_backslash
-  else Buffer.add_char buf '\\';
-  let cur_char = s.[offset] in
-  match cur_char with
-  | '\\' | 'b' | 't' | 'n' | 'v' | 'f' | 'r' | '0' | '$' ->
-    Buffer.add_char buf cur_char;
-    check_and_transform (loc + 1) s (offset + 1) cxt
-  | 'u' ->
-    Buffer.add_char buf cur_char;
-    unicode (loc + 1) s (offset + 1) cxt
-  | 'x' ->
-    Buffer.add_char buf cur_char;
-    two_hex (loc + 1) s (offset + 1) cxt
-  | _ -> pos_error cxt ~loc (Invalid_escape_code cur_char)
-
-and two_hex loc s offset ({buf; s_len} as cxt) =
-  if offset + 1 >= s_len then pos_error cxt ~loc Invalid_hex_escape;
-  let a, b = (s.[offset], s.[offset + 1]) in
-  if Ext_char.valid_hex a && Ext_char.valid_hex b then (
-    Buffer.add_char buf a;
-    Buffer.add_char buf b;
-    check_and_transform (loc + 2) s (offset + 2) cxt)
-  else pos_error cxt ~loc Invalid_hex_escape
-
-and unicode loc s offset ({buf; s_len} as cxt) =
-  if offset + 3 >= s_len then pos_error cxt ~loc Invalid_unicode_escape;
-  let a0, a1, a2, a3 =
-    (s.[offset], s.[offset + 1], s.[offset + 2], s.[offset + 3])
-  in
-  if
-    Ext_char.valid_hex a0 && Ext_char.valid_hex a1 && Ext_char.valid_hex a2
-    && Ext_char.valid_hex a3
-  then (
-    Buffer.add_char buf a0;
-    Buffer.add_char buf a1;
-    Buffer.add_char buf a2;
-    Buffer.add_char buf a3;
-    check_and_transform (loc + 4) s (offset + 4) cxt)
-  else pos_error cxt ~loc Invalid_unicode_escape
-
-let transform_test s =
-  let s_len = String.length s in
-  let buf = Buffer.create (s_len * 2) in
-  let cxt =
-    {
-      segment_start = {lnum = 0; offset = 0; byte_bol = 0};
-      buf;
-      s_len;
-      segments = [];
-      pos_lnum = 0;
-      byte_bol = 0;
-      pos_bol = 0;
-    }
-  in
-  check_and_transform 0 s 0 cxt;
-  List.rev cxt.segments
-
-module Delim = struct
-  let parse_processed = function
-    | None -> Some External_arg_spec.DNone
-    | Some "json" -> Some DNoQuotes
-    | Some "*j" -> Some DStarJ
-    | _ -> None
-
-  type interpolation =
-    | Js (* string interpolation *)
-    | Unrecognized (* no interpolation: delimiter not recognized *)
-  let parse_unprocessed loc = function
-    | "js" -> Js
-    | "j" ->
-      Location.raise_errorf ~loc
-        "The unsafe j`$(a)$(b)` interpolation was removed, use string template \
-         `${a}${b}` instead."
-    | _ -> Unrecognized
-
-  let escaped_j_delimiter = "*j" (* not user level syntax allowed *)
-  let unescaped_js_delimiter = "js"
-  let escaped = Some escaped_j_delimiter
-end
-
-let transform_exp (e : Parsetree.expression) s delim : Parsetree.expression =
-  match Delim.parse_unprocessed e.pexp_loc delim with
-  | Js ->
-    let js_str = Ast_utf8_string.transform e.pexp_loc s in
-    {e with pexp_desc = Pexp_constant (Pconst_string (js_str, Delim.escaped))}
-  | Unrecognized -> e
-
-let transform_pat (p : Parsetree.pattern) s delim : Parsetree.pattern =
-  match Delim.parse_unprocessed p.ppat_loc delim with
-  | Js ->
-    let js_str = Ast_utf8_string.transform p.ppat_loc s in
-    {p with ppat_desc = Ppat_constant (Pconst_string (js_str, Delim.escaped))}
-  | Unrecognized -> p
-
-let is_unicode_string opt = Ext_string.equal opt Delim.escaped_j_delimiter
-
-let is_unescaped s = Ext_string.equal s Delim.unescaped_js_delimiter
-
-let parse_processed_delim = Delim.parse_processed
diff --git a/jscomp/frontend/ast_utf8_string_interp.mli b/jscomp/frontend/ast_utf8_string_interp.mli
deleted file mode 100644
index 5e8ec9c..0000000
--- a/jscomp/frontend/ast_utf8_string_interp.mli
+++ /dev/null
@@ -1,63 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 kind = String | Var of int * int (* int records its border length *)
-
-type error = private
-  | Invalid_code_point
-  | Unterminated_backslash
-  | Invalid_escape_code of char
-  | Invalid_hex_escape
-  | Invalid_unicode_escape
-  | Unterminated_variable
-  | Unmatched_paren
-  | Invalid_syntax_of_var of string
-
-type pos = {lnum: int; offset: int; byte_bol: int}
-(** Note the position is about code point *)
-
-type segment = {start: pos; finish: pos; kind: kind; content: string}
-type segments = segment list
-
-type cxt = {
-  mutable segment_start: pos;
-  buf: Buffer.t;
-  s_len: int;
-  mutable segments: segments;
-  mutable pos_bol: int;
-  (* record the abs position of current beginning line *)
-  mutable byte_bol: int;
-  mutable pos_lnum: int; (* record the line number *)
-}
-
-type exn += Error of pos * pos * error
-
-val empty_segment : segment -> bool
-val transform_test : string -> segment list
-val transform_exp :
-  Parsetree.expression -> string -> string -> Parsetree.expression
-val transform_pat : Parsetree.pattern -> string -> string -> Parsetree.pattern
-val is_unicode_string : string -> bool
-val is_unescaped : string -> bool
-val parse_processed_delim : string option -> External_arg_spec.delim option
diff --git a/jscomp/frontend/ast_util.ml b/jscomp/frontend/ast_util.ml
deleted file mode 100644
index 8053c71..0000000
--- a/jscomp/frontend/ast_util.ml
+++ /dev/null
@@ -1,45 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 label_exprs = (Longident.t Asttypes.loc * Parsetree.expression) list
-
-let js_property loc obj (name : string) =
-  Parsetree.Pexp_send (obj, {loc; txt = name})
-
-let record_as_js_object loc (self : Bs_ast_mapper.mapper)
-    (label_exprs : label_exprs) : Parsetree.expression_desc =
-  let labels, args, arity =
-    Ext_list.fold_right label_exprs ([], [], 0)
-      (fun ({txt; loc}, e) (labels, args, i) ->
-        match txt with
-        | Lident x ->
-          ( {Asttypes.loc; txt = x} :: labels,
-            (x, self.expr self e) :: args,
-            i + 1 )
-        | Ldot _ | Lapply _ -> Location.raise_errorf ~loc "invalid js label ")
-  in
-  Ast_external_mk.local_external_obj loc
-    ~pval_prim:(Ast_external_process.pval_prim_of_labels labels)
-    ~pval_type:(Ast_core_type.from_labels ~loc arity labels)
-    args
diff --git a/jscomp/frontend/ast_util.mli b/jscomp/frontend/ast_util.mli
deleted file mode 100644
index 93c29f9..0000000
--- a/jscomp/frontend/ast_util.mli
+++ /dev/null
@@ -1,37 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** In general three kinds of ast generation.
-    - convert a curried to type to uncurried 
-    - convert a curried fun to uncurried fun
-    - convert a uncuried application to normal 
-*)
-
-type label_exprs = (Longident.t Asttypes.loc * Parsetree.expression) list
-
-val record_as_js_object :
-  Location.t -> Bs_ast_mapper.mapper -> label_exprs -> Parsetree.expression_desc
-
-val js_property :
-  Location.t -> Parsetree.expression -> string -> Parsetree.expression_desc
diff --git a/jscomp/frontend/bs_ast_invariant.ml b/jscomp/frontend/bs_ast_invariant.ml
deleted file mode 100644
index b7abb88..0000000
--- a/jscomp/frontend/bs_ast_invariant.ml
+++ /dev/null
@@ -1,194 +0,0 @@
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * Copyright (C) 2017- Hongbo Zhang, Authors of ReScript 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(** Warning unused bs attributes
-    Note if we warn `deriving` too, 
-    it may fail third party ppxes
-*)
-let is_bs_attribute txt =
-  let len = String.length txt in
-  len >= 2
-  (*TODO: check the stringing padding rule, this preciate may not be needed *)
-  && String.unsafe_get txt 0 = 'b'
-  && String.unsafe_get txt 1 = 's'
-  && (len = 2 || String.unsafe_get txt 2 = '.')
-
-let used_attributes : string Asttypes.loc Hash_set_poly.t =
-  Hash_set_poly.create 16
-
-(*
-  let dump_attribute fmt = (fun ( (sloc : string Asttypes.loc),payload) -> 
-      Format.fprintf fmt "@[%s %a@]" sloc.txt (Printast.payload 0 ) payload
-    )
-
-let dump_used_attributes fmt = 
-  Format.fprintf fmt "Used attributes Listing Start:@.";
-  Hash_set_poly.iter  used_attributes (fun attr -> dump_attribute fmt attr) ;
-  Format.fprintf fmt "Used attributes Listing End:@."
- *)
-
-(* only mark non-ghost used bs attribute *)
-let mark_used_bs_attribute ((x, _) : Parsetree.attribute) =
-  if not x.loc.loc_ghost then Hash_set_poly.add used_attributes x
-
-let warn_unused_attribute ((({txt; loc} as sloc), _) : Parsetree.attribute) =
-  if
-    is_bs_attribute txt && (not loc.loc_ghost)
-    && not (Hash_set_poly.mem used_attributes sloc)
-  then
-    (*
-         dump_used_attributes Format.err_formatter;
-       dump_attribute Format.err_formatter attr ;
-    *)
-    Location.prerr_warning loc (Bs_unused_attribute txt)
-
-let warn_discarded_unused_attributes (attrs : Parsetree.attributes) =
-  if attrs <> [] then Ext_list.iter attrs warn_unused_attribute
-
-type iterator = Ast_iterator.iterator
-
-let super = Ast_iterator.default_iterator
-
-let check_constant loc (const : Parsetree.constant) =
-  match const with
-  | Pconst_string (_, Some s) ->
-    if Ast_utf8_string_interp.is_unescaped s then
-      Bs_warnings.error_unescaped_delimiter loc s
-  | Pconst_integer (s, None) -> (
-    (* range check using int32
-       It is better to give a warning instead of error to avoid make people unhappy.
-       It also has restrictions in which platform bsc is running on since it will
-       affect int ranges
-    *)
-    try ignore @@ Int32.of_string s
-    with _ -> Bs_warnings.warn_literal_overflow loc)
-  | _ -> ()
-
-(* Note we only used Bs_ast_iterator here, we can reuse compiler-libs instead of
-   rolling our own*)
-let emit_external_warnings : iterator =
-  {
-    super with
-    type_declaration =
-      (fun self ptyp ->
-        let txt = ptyp.ptype_name.txt in
-        if Ast_core_type.is_builtin_rank0_type txt then
-          Location.raise_errorf ~loc:ptyp.ptype_loc
-            "built-in type `%s` can not be redefined " txt;
-        super.type_declaration self ptyp);
-    attribute = (fun _ attr -> warn_unused_attribute attr);
-    structure_item =
-      (fun self str_item ->
-        match str_item.pstr_desc with
-        | Pstr_type
-            ( Nonrecursive,
-              [{ptype_kind = Ptype_variant ({pcd_res = Some _} :: _)}] )
-          when !Config.syntax_kind = `rescript ->
-          Location.raise_errorf ~loc:str_item.pstr_loc
-            "GADT has to be recursive types, please try `type rec'"
-        | Pstr_class _ ->
-          Location.raise_errorf ~loc:str_item.pstr_loc
-            "OCaml style classes are not supported"
-        | _ -> super.structure_item self str_item);
-    expr =
-      (fun self ({pexp_loc = loc} as a) ->
-        match a.pexp_desc with
-        | Pexp_constant const -> check_constant loc const
-        | Pexp_object _ | Pexp_new _ ->
-          Location.raise_errorf ~loc "OCaml style objects are not supported"
-        | Pexp_variant (s, None) when Ext_string.is_valid_hash_number s -> (
-          try ignore (Ext_string.hash_number_as_i32_exn s : int32)
-          with _ ->
-            Location.raise_errorf ~loc
-              "This number is too large to cause int overlow")
-        | _ -> super.expr self a);
-    label_declaration =
-      (fun self lbl ->
-        Ext_list.iter lbl.pld_attributes (fun attr ->
-            match attr with
-            | {txt = "bs.as" | "as"}, _ -> mark_used_bs_attribute attr
-            | _ -> ());
-        super.label_declaration self lbl);
-    constructor_declaration =
-      (fun self ({pcd_name = {txt; loc}} as ctr) ->
-        (match txt with
-        | "false" | "true" | "()" ->
-          Location.raise_errorf ~loc "%s can not be redefined " txt
-        | _ -> ());
-        super.constructor_declaration self ctr);
-    value_description =
-      (fun self v ->
-        match v with
-        | ({pval_loc; pval_prim = [byte_name]; pval_type} :
-            Parsetree.value_description) -> (
-          match byte_name with
-          | "%identity" when not (Ast_core_type.is_arity_one pval_type) ->
-            Location.raise_errorf ~loc:pval_loc
-              "%%identity expects a function type of the form 'a => 'b (arity \
-               1)"
-          | _ ->
-            if byte_name <> "" then
-              let c = String.unsafe_get byte_name 0 in
-              if not (c = '%' || c = '#' || c = '?') then
-                Location.prerr_warning pval_loc
-                  (Warnings.Bs_ffi_warning
-                     (byte_name ^ " such externals are unsafe"))
-              else super.value_description self v
-            else
-              Location.prerr_warning pval_loc
-                (Warnings.Bs_ffi_warning
-                   (byte_name ^ " such externals are unsafe")))
-        | _ -> super.value_description self v);
-    pat =
-      (fun self (pat : Parsetree.pattern) ->
-        match pat.ppat_desc with
-        | Ppat_constant constant -> check_constant pat.ppat_loc constant
-        | _ -> super.pat self pat);
-  }
-
-let rec iter_warnings_on_stru (stru : Parsetree.structure) =
-  match stru with
-  | [] -> ()
-  | head :: rest -> (
-    match head.pstr_desc with
-    | Pstr_attribute attr ->
-      Builtin_attributes.warning_attribute attr;
-      iter_warnings_on_stru rest
-    | _ -> ())
-
-let rec iter_warnings_on_sigi (stru : Parsetree.signature) =
-  match stru with
-  | [] -> ()
-  | head :: rest -> (
-    match head.psig_desc with
-    | Psig_attribute attr ->
-      Builtin_attributes.warning_attribute attr;
-      iter_warnings_on_sigi rest
-    | _ -> ())
-
-let emit_external_warnings_on_structure (stru : Parsetree.structure) =
-  emit_external_warnings.structure emit_external_warnings stru
-
-let emit_external_warnings_on_signature (sigi : Parsetree.signature) =
-  emit_external_warnings.signature emit_external_warnings sigi
diff --git a/jscomp/frontend/bs_ast_invariant.mli b/jscomp/frontend/bs_ast_invariant.mli
deleted file mode 100644
index dcff1c3..0000000
--- a/jscomp/frontend/bs_ast_invariant.mli
+++ /dev/null
@@ -1,41 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 iterator = Ast_iterator.iterator
-
-val mark_used_bs_attribute : Parsetree.attribute -> unit
-
-(** [warn_discarded_unused_attributes discarded]
-    warn if [discarded] has unused bs attribute
-*)
-val warn_discarded_unused_attributes : Parsetree.attributes -> unit
-(** Ast invariant checking for detecting errors *)
-
-val iter_warnings_on_stru : Parsetree.structure -> unit
-
-val iter_warnings_on_sigi : Parsetree.signature -> unit
-
-val emit_external_warnings_on_structure : Parsetree.structure -> unit
-
-val emit_external_warnings_on_signature : Parsetree.signature -> unit
diff --git a/jscomp/frontend/bs_ast_mapper.ml b/jscomp/frontend/bs_ast_mapper.ml
deleted file mode 100644
index 265d194..0000000
--- a/jscomp/frontend/bs_ast_mapper.ml
+++ /dev/null
@@ -1,655 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                         Alain Frisch, LexiFi                           *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* A generic Parsetree mapping class *)
-
-(*
-[@@@warning "+9"]
-  (* Ensure that record patterns don't miss any field. *)
-*)
-
-open! Parsetree
-open Ast_helper
-open Location
-
-type mapper = {
-  attribute: mapper -> attribute -> attribute;
-  attributes: mapper -> attribute list -> attribute list;
-  case: mapper -> case -> case;
-  cases: mapper -> case list -> case list;
-  class_expr: mapper -> class_expr -> class_expr;
-  class_field: mapper -> class_field -> class_field;
-  class_signature: mapper -> class_signature -> class_signature;
-  class_structure: mapper -> class_structure -> class_structure;
-  class_type: mapper -> class_type -> class_type;
-  class_type_declaration:
-    mapper -> class_type_declaration -> class_type_declaration;
-  class_type_field: mapper -> class_type_field -> class_type_field;
-  constructor_declaration:
-    mapper -> constructor_declaration -> constructor_declaration;
-  expr: mapper -> expression -> expression;
-  extension: mapper -> extension -> extension;
-  extension_constructor:
-    mapper -> extension_constructor -> extension_constructor;
-  include_declaration: mapper -> include_declaration -> include_declaration;
-  include_description: mapper -> include_description -> include_description;
-  label_declaration: mapper -> label_declaration -> label_declaration;
-  location: mapper -> Location.t -> Location.t;
-  module_binding: mapper -> module_binding -> module_binding;
-  module_declaration: mapper -> module_declaration -> module_declaration;
-  module_expr: mapper -> module_expr -> module_expr;
-  module_type: mapper -> module_type -> module_type;
-  module_type_declaration:
-    mapper -> module_type_declaration -> module_type_declaration;
-  open_description: mapper -> open_description -> open_description;
-  pat: mapper -> pattern -> pattern;
-  payload: mapper -> payload -> payload;
-  signature: mapper -> signature -> signature;
-  signature_item: mapper -> signature_item -> signature_item;
-  structure: mapper -> structure -> structure;
-  structure_item: mapper -> structure_item -> structure_item;
-  typ: mapper -> core_type -> core_type;
-  type_declaration: mapper -> type_declaration -> type_declaration;
-  (* #if true then    *)
-  type_declaration_list:
-    mapper -> type_declaration list -> type_declaration list;
-  (* #end *)
-  type_extension: mapper -> type_extension -> type_extension;
-  type_kind: mapper -> type_kind -> type_kind;
-  value_binding: mapper -> value_binding -> value_binding;
-  (* #if true then    *)
-  value_bindings_rec: mapper -> value_binding list -> value_binding list;
-  value_bindings: mapper -> value_binding list -> value_binding list;
-  (* #end *)
-  value_description: mapper -> value_description -> value_description;
-  with_constraint: mapper -> with_constraint -> with_constraint;
-}
-
-let map_fst f (x, y) = (f x, y)
-let map_snd f (x, y) = (x, f y)
-let map_tuple f1 f2 (x, y) = (f1 x, f2 y)
-let map_tuple3 f1 f2 f3 (x, y, z) = (f1 x, f2 y, f3 z)
-let map_opt f = function
-  | None -> None
-  | Some x -> Some (f x)
-
-let map_loc sub {loc; txt} = {loc = sub.location sub loc; txt}
-
-module T = struct
-  (* Type expressions for the core language *)
-
-  let row_field sub = function
-    | Rtag (l, attrs, b, tl) ->
-      Rtag
-        (map_loc sub l, sub.attributes sub attrs, b, List.map (sub.typ sub) tl)
-    | Rinherit t -> Rinherit (sub.typ sub t)
-
-  let object_field sub = function
-    | Otag (l, attrs, t) ->
-      Otag (map_loc sub l, sub.attributes sub attrs, sub.typ sub t)
-    | Oinherit t -> Oinherit (sub.typ sub t)
-
-  let map sub {ptyp_desc = desc; ptyp_loc = loc; ptyp_attributes = attrs} =
-    let open Typ in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Ptyp_any -> any ~loc ~attrs ()
-    | Ptyp_var s -> var ~loc ~attrs s
-    | Ptyp_arrow (lab, t1, t2) ->
-      arrow ~loc ~attrs lab (sub.typ sub t1) (sub.typ sub t2)
-    | Ptyp_tuple tyl -> tuple ~loc ~attrs (List.map (sub.typ sub) tyl)
-    | Ptyp_constr (lid, tl) ->
-      constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tl)
-    | Ptyp_object (l, o) ->
-      object_ ~loc ~attrs (List.map (object_field sub) l) o
-    | Ptyp_class (lid, tl) ->
-      class_ ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tl)
-    | Ptyp_alias (t, s) -> alias ~loc ~attrs (sub.typ sub t) s
-    | Ptyp_variant (rl, b, ll) ->
-      variant ~loc ~attrs (List.map (row_field sub) rl) b ll
-    | Ptyp_poly (sl, t) ->
-      poly ~loc ~attrs (List.map (map_loc sub) sl) (sub.typ sub t)
-    | Ptyp_package (lid, l) ->
-      package ~loc ~attrs (map_loc sub lid)
-        (List.map (map_tuple (map_loc sub) (sub.typ sub)) l)
-    | Ptyp_extension x -> extension ~loc ~attrs (sub.extension sub x)
-
-  let map_type_declaration sub
-      {
-        ptype_name;
-        ptype_params;
-        ptype_cstrs;
-        ptype_kind;
-        ptype_private;
-        ptype_manifest;
-        ptype_attributes;
-        ptype_loc;
-      } =
-    Type.mk (map_loc sub ptype_name)
-      ~params:(List.map (map_fst (sub.typ sub)) ptype_params)
-      ~priv:ptype_private
-      ~cstrs:
-        (List.map
-           (map_tuple3 (sub.typ sub) (sub.typ sub) (sub.location sub))
-           ptype_cstrs)
-      ~kind:(sub.type_kind sub ptype_kind)
-      ?manifest:(map_opt (sub.typ sub) ptype_manifest)
-      ~loc:(sub.location sub ptype_loc)
-      ~attrs:(sub.attributes sub ptype_attributes)
-
-  (* #if true then *)
-  let map_type_declaration_list sub l = List.map (sub.type_declaration sub) l
-
-  (* #end *)
-  let map_type_kind sub = function
-    | Ptype_abstract -> Ptype_abstract
-    | Ptype_variant l ->
-      Ptype_variant (List.map (sub.constructor_declaration sub) l)
-    | Ptype_record l -> Ptype_record (List.map (sub.label_declaration sub) l)
-    | Ptype_open -> Ptype_open
-
-  let map_constructor_arguments sub = function
-    | Pcstr_tuple l -> Pcstr_tuple (List.map (sub.typ sub) l)
-    | Pcstr_record l -> Pcstr_record (List.map (sub.label_declaration sub) l)
-
-  let map_type_extension sub
-      {
-        ptyext_path;
-        ptyext_params;
-        ptyext_constructors;
-        ptyext_private;
-        ptyext_attributes;
-      } =
-    Te.mk (map_loc sub ptyext_path)
-      (List.map (sub.extension_constructor sub) ptyext_constructors)
-      ~params:(List.map (map_fst (sub.typ sub)) ptyext_params)
-      ~priv:ptyext_private
-      ~attrs:(sub.attributes sub ptyext_attributes)
-
-  let map_extension_constructor_kind sub = function
-    | Pext_decl (ctl, cto) ->
-      Pext_decl (map_constructor_arguments sub ctl, map_opt (sub.typ sub) cto)
-    | Pext_rebind li -> Pext_rebind (map_loc sub li)
-
-  let map_extension_constructor sub
-      {pext_name; pext_kind; pext_loc; pext_attributes} =
-    Te.constructor (map_loc sub pext_name)
-      (map_extension_constructor_kind sub pext_kind)
-      ~loc:(sub.location sub pext_loc)
-      ~attrs:(sub.attributes sub pext_attributes)
-end
-
-module CT = struct
-  (* Type expressions for the class language *)
-
-  let map sub {pcty_loc = loc; pcty_desc = desc; pcty_attributes = attrs} =
-    let open Cty in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pcty_constr (lid, tys) ->
-      constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tys)
-    | Pcty_signature x -> signature ~loc ~attrs (sub.class_signature sub x)
-    | Pcty_arrow (lab, t, ct) ->
-      arrow ~loc ~attrs lab (sub.typ sub t) (sub.class_type sub ct)
-    | Pcty_extension x -> extension ~loc ~attrs (sub.extension sub x)
-    | Pcty_open (ovf, lid, ct) ->
-      open_ ~loc ~attrs ovf (map_loc sub lid) (sub.class_type sub ct)
-
-  let map_field sub {pctf_desc = desc; pctf_loc = loc; pctf_attributes = attrs}
-      =
-    let open Ctf in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pctf_inherit ct -> inherit_ ~loc ~attrs (sub.class_type sub ct)
-    | Pctf_val (s, m, v, t) ->
-      val_ ~loc ~attrs (map_loc sub s) m v (sub.typ sub t)
-    | Pctf_method (s, p, v, t) ->
-      method_ ~loc ~attrs (map_loc sub s) p v (sub.typ sub t)
-    | Pctf_constraint (t1, t2) ->
-      constraint_ ~loc ~attrs (sub.typ sub t1) (sub.typ sub t2)
-    | Pctf_attribute x -> attribute ~loc (sub.attribute sub x)
-    | Pctf_extension x -> extension ~loc ~attrs (sub.extension sub x)
-
-  let map_signature sub {pcsig_self; pcsig_fields} =
-    Csig.mk (sub.typ sub pcsig_self)
-      (List.map (sub.class_type_field sub) pcsig_fields)
-end
-
-module MT = struct
-  (* Type expressions for the module language *)
-
-  let map sub {pmty_desc = desc; pmty_loc = loc; pmty_attributes = attrs} =
-    let open Mty in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pmty_ident s -> ident ~loc ~attrs (map_loc sub s)
-    | Pmty_alias s -> alias ~loc ~attrs (map_loc sub s)
-    | Pmty_signature sg -> signature ~loc ~attrs (sub.signature sub sg)
-    | Pmty_functor (s, mt1, mt2) ->
-      functor_ ~loc ~attrs (map_loc sub s)
-        (Misc.may_map (sub.module_type sub) mt1)
-        (sub.module_type sub mt2)
-    | Pmty_with (mt, l) ->
-      with_ ~loc ~attrs (sub.module_type sub mt)
-        (List.map (sub.with_constraint sub) l)
-    | Pmty_typeof me -> typeof_ ~loc ~attrs (sub.module_expr sub me)
-    | Pmty_extension x -> extension ~loc ~attrs (sub.extension sub x)
-
-  let map_with_constraint sub = function
-    | Pwith_type (lid, d) ->
-      Pwith_type (map_loc sub lid, sub.type_declaration sub d)
-    | Pwith_module (lid, lid2) ->
-      Pwith_module (map_loc sub lid, map_loc sub lid2)
-    | Pwith_typesubst (lid, d) ->
-      Pwith_typesubst (map_loc sub lid, sub.type_declaration sub d)
-    | Pwith_modsubst (s, lid) -> Pwith_modsubst (map_loc sub s, map_loc sub lid)
-
-  let map_signature_item sub {psig_desc = desc; psig_loc = loc} =
-    let open Sig in
-    let loc = sub.location sub loc in
-    match desc with
-    | Psig_value vd -> value ~loc (sub.value_description sub vd)
-    | Psig_type (rf, l) ->
-      (* #if false then
-            type_ ~loc rf (List.map (sub.type_declaration sub) l)
-         #else *)
-      type_ ~loc rf (sub.type_declaration_list sub l)
-    (* #end *)
-    | Psig_typext te -> type_extension ~loc (sub.type_extension sub te)
-    | Psig_exception ed -> exception_ ~loc (sub.extension_constructor sub ed)
-    | Psig_module x -> module_ ~loc (sub.module_declaration sub x)
-    | Psig_recmodule l ->
-      rec_module ~loc (List.map (sub.module_declaration sub) l)
-    | Psig_modtype x -> modtype ~loc (sub.module_type_declaration sub x)
-    | Psig_open x -> open_ ~loc (sub.open_description sub x)
-    | Psig_include x -> include_ ~loc (sub.include_description sub x)
-    | Psig_class () -> assert false
-    | Psig_class_type l ->
-      class_type ~loc (List.map (sub.class_type_declaration sub) l)
-    | Psig_extension (x, attrs) ->
-      extension ~loc (sub.extension sub x) ~attrs:(sub.attributes sub attrs)
-    | Psig_attribute x -> attribute ~loc (sub.attribute sub x)
-end
-
-module M = struct
-  (* Value expressions for the module language *)
-
-  let map sub {pmod_loc = loc; pmod_desc = desc; pmod_attributes = attrs} =
-    let open Mod in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pmod_ident x -> ident ~loc ~attrs (map_loc sub x)
-    | Pmod_structure str -> structure ~loc ~attrs (sub.structure sub str)
-    | Pmod_functor (arg, arg_ty, body) ->
-      functor_ ~loc ~attrs (map_loc sub arg)
-        (Misc.may_map (sub.module_type sub) arg_ty)
-        (sub.module_expr sub body)
-    | Pmod_apply (m1, m2) ->
-      apply ~loc ~attrs (sub.module_expr sub m1) (sub.module_expr sub m2)
-    | Pmod_constraint (m, mty) ->
-      constraint_ ~loc ~attrs (sub.module_expr sub m) (sub.module_type sub mty)
-    | Pmod_unpack e -> unpack ~loc ~attrs (sub.expr sub e)
-    | Pmod_extension x -> extension ~loc ~attrs (sub.extension sub x)
-
-  let map_structure_item sub {pstr_loc = loc; pstr_desc = desc} =
-    let open Str in
-    let loc = sub.location sub loc in
-    match desc with
-    | Pstr_eval (x, attrs) ->
-      eval ~loc ~attrs:(sub.attributes sub attrs) (sub.expr sub x)
-    | Pstr_value (r, vbs) ->
-      (* #if false then
-          value ~loc r (List.map (sub.value_binding sub) vbs)
-         #else *)
-      value ~loc r
-        ((if r = Recursive then sub.value_bindings_rec else sub.value_bindings)
-           sub vbs)
-    (* #end *)
-    | Pstr_primitive vd -> primitive ~loc (sub.value_description sub vd)
-    | Pstr_type (rf, l) ->
-      (* #if false then
-          type_ ~loc rf (List.map (sub.type_declaration sub) l)
-         #else *)
-      type_ ~loc rf (sub.type_declaration_list sub l)
-    (* #end *)
-    | Pstr_typext te -> type_extension ~loc (sub.type_extension sub te)
-    | Pstr_exception ed -> exception_ ~loc (sub.extension_constructor sub ed)
-    | Pstr_module x -> module_ ~loc (sub.module_binding sub x)
-    | Pstr_recmodule l -> rec_module ~loc (List.map (sub.module_binding sub) l)
-    | Pstr_modtype x -> modtype ~loc (sub.module_type_declaration sub x)
-    | Pstr_open x -> open_ ~loc (sub.open_description sub x)
-    | Pstr_class () -> {pstr_loc = loc; pstr_desc = Pstr_class ()}
-    | Pstr_class_type l ->
-      class_type ~loc (List.map (sub.class_type_declaration sub) l)
-    | Pstr_include x -> include_ ~loc (sub.include_declaration sub x)
-    | Pstr_extension (x, attrs) ->
-      extension ~loc (sub.extension sub x) ~attrs:(sub.attributes sub attrs)
-    | Pstr_attribute x -> attribute ~loc (sub.attribute sub x)
-end
-
-module E = struct
-  (* Value expressions for the core language *)
-
-  let map sub {pexp_loc = loc; pexp_desc = desc; pexp_attributes = attrs} =
-    let open Exp in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pexp_ident x -> ident ~loc ~attrs (map_loc sub x)
-    | Pexp_constant x -> constant ~loc ~attrs x
-    | Pexp_let (r, vbs, e) ->
-      (* #if false then
-              let_ ~loc ~attrs r (List.map (sub.value_binding sub) vbs)
-                (sub.expr sub e)
-         #else *)
-      let_ ~loc ~attrs r
-        ((if r = Recursive then sub.value_bindings_rec else sub.value_bindings)
-           sub vbs)
-        (sub.expr sub e)
-    (* #end *)
-    | Pexp_fun (lab, def, p, e) ->
-      fun_ ~loc ~attrs lab
-        (map_opt (sub.expr sub) def)
-        (sub.pat sub p) (sub.expr sub e)
-    | Pexp_function pel -> function_ ~loc ~attrs (sub.cases sub pel)
-    | Pexp_apply (e, l) ->
-      apply ~loc ~attrs (sub.expr sub e) (List.map (map_snd (sub.expr sub)) l)
-    | Pexp_match (e, pel) ->
-      match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
-    | Pexp_try (e, pel) -> try_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
-    | Pexp_tuple el -> tuple ~loc ~attrs (List.map (sub.expr sub) el)
-    | Pexp_construct (lid, arg) ->
-      construct ~loc ~attrs (map_loc sub lid) (map_opt (sub.expr sub) arg)
-    | Pexp_variant (lab, eo) ->
-      variant ~loc ~attrs lab (map_opt (sub.expr sub) eo)
-    | Pexp_record (l, eo) ->
-      record ~loc ~attrs
-        (List.map (map_tuple (map_loc sub) (sub.expr sub)) l)
-        (map_opt (sub.expr sub) eo)
-    | Pexp_field (e, lid) ->
-      field ~loc ~attrs (sub.expr sub e) (map_loc sub lid)
-    | Pexp_setfield (e1, lid, e2) ->
-      setfield ~loc ~attrs (sub.expr sub e1) (map_loc sub lid) (sub.expr sub e2)
-    | Pexp_array el -> array ~loc ~attrs (List.map (sub.expr sub) el)
-    | Pexp_ifthenelse (e1, e2, e3) ->
-      ifthenelse ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
-        (map_opt (sub.expr sub) e3)
-    | Pexp_sequence (e1, e2) ->
-      sequence ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
-    | Pexp_while (e1, e2) ->
-      while_ ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
-    | Pexp_for (p, e1, e2, d, e3) ->
-      for_ ~loc ~attrs (sub.pat sub p) (sub.expr sub e1) (sub.expr sub e2) d
-        (sub.expr sub e3)
-    | Pexp_coerce (e, t1, t2) ->
-      coerce ~loc ~attrs (sub.expr sub e)
-        (map_opt (sub.typ sub) t1)
-        (sub.typ sub t2)
-    | Pexp_constraint (e, t) ->
-      constraint_ ~loc ~attrs (sub.expr sub e) (sub.typ sub t)
-    | Pexp_send (e, s) -> send ~loc ~attrs (sub.expr sub e) (map_loc sub s)
-    | Pexp_new lid -> new_ ~loc ~attrs (map_loc sub lid)
-    | Pexp_setinstvar (s, e) ->
-      setinstvar ~loc ~attrs (map_loc sub s) (sub.expr sub e)
-    | Pexp_override sel ->
-      override ~loc ~attrs
-        (List.map (map_tuple (map_loc sub) (sub.expr sub)) sel)
-    | Pexp_letmodule (s, me, e) ->
-      letmodule ~loc ~attrs (map_loc sub s) (sub.module_expr sub me)
-        (sub.expr sub e)
-    | Pexp_letexception (cd, e) ->
-      letexception ~loc ~attrs
-        (sub.extension_constructor sub cd)
-        (sub.expr sub e)
-    | Pexp_assert e -> assert_ ~loc ~attrs (sub.expr sub e)
-    | Pexp_lazy e -> lazy_ ~loc ~attrs (sub.expr sub e)
-    | Pexp_poly (e, t) ->
-      poly ~loc ~attrs (sub.expr sub e) (map_opt (sub.typ sub) t)
-    | Pexp_object cls -> object_ ~loc ~attrs (sub.class_structure sub cls)
-    | Pexp_newtype (s, e) ->
-      newtype ~loc ~attrs (map_loc sub s) (sub.expr sub e)
-    | Pexp_pack me -> pack ~loc ~attrs (sub.module_expr sub me)
-    | Pexp_open (ovf, lid, e) ->
-      open_ ~loc ~attrs ovf (map_loc sub lid) (sub.expr sub e)
-    | Pexp_extension x -> extension ~loc ~attrs (sub.extension sub x)
-    | Pexp_unreachable -> unreachable ~loc ~attrs ()
-end
-
-module P = struct
-  (* Patterns *)
-
-  let map sub {ppat_desc = desc; ppat_loc = loc; ppat_attributes = attrs} =
-    let open Pat in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Ppat_any -> any ~loc ~attrs ()
-    | Ppat_var s -> var ~loc ~attrs (map_loc sub s)
-    | Ppat_alias (p, s) -> alias ~loc ~attrs (sub.pat sub p) (map_loc sub s)
-    | Ppat_constant c -> constant ~loc ~attrs c
-    | Ppat_interval (c1, c2) -> interval ~loc ~attrs c1 c2
-    | Ppat_tuple pl -> tuple ~loc ~attrs (List.map (sub.pat sub) pl)
-    | Ppat_construct (l, p) ->
-      construct ~loc ~attrs (map_loc sub l) (map_opt (sub.pat sub) p)
-    | Ppat_variant (l, p) -> variant ~loc ~attrs l (map_opt (sub.pat sub) p)
-    | Ppat_record (lpl, cf) ->
-      record ~loc ~attrs
-        (List.map (map_tuple (map_loc sub) (sub.pat sub)) lpl)
-        cf
-    | Ppat_array pl -> array ~loc ~attrs (List.map (sub.pat sub) pl)
-    | Ppat_or (p1, p2) -> or_ ~loc ~attrs (sub.pat sub p1) (sub.pat sub p2)
-    | Ppat_constraint (p, t) ->
-      constraint_ ~loc ~attrs (sub.pat sub p) (sub.typ sub t)
-    | Ppat_type s -> type_ ~loc ~attrs (map_loc sub s)
-    | Ppat_lazy p -> lazy_ ~loc ~attrs (sub.pat sub p)
-    | Ppat_unpack s -> unpack ~loc ~attrs (map_loc sub s)
-    | Ppat_open (lid, p) -> open_ ~loc ~attrs (map_loc sub lid) (sub.pat sub p)
-    | Ppat_exception p -> exception_ ~loc ~attrs (sub.pat sub p)
-    | Ppat_extension x -> extension ~loc ~attrs (sub.extension sub x)
-end
-
-module CE = struct
-  (* Value expressions for the class language *)
-
-  let map sub {pcl_loc = loc; pcl_desc = desc; pcl_attributes = attrs} =
-    let open Cl in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pcl_constr (lid, tys) ->
-      constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tys)
-    | Pcl_structure s -> structure ~loc ~attrs (sub.class_structure sub s)
-    | Pcl_fun (lab, e, p, ce) ->
-      fun_ ~loc ~attrs lab
-        (map_opt (sub.expr sub) e)
-        (sub.pat sub p) (sub.class_expr sub ce)
-    | Pcl_apply (ce, l) ->
-      apply ~loc ~attrs (sub.class_expr sub ce)
-        (List.map (map_snd (sub.expr sub)) l)
-    | Pcl_let (r, vbs, ce) ->
-      (* #if false then
-              let_ ~loc ~attrs r (List.map (sub.value_binding sub) vbs)
-                (sub.class_expr sub ce)
-         #else *)
-      let_ ~loc ~attrs r
-        ((if r = Recursive then sub.value_bindings_rec else sub.value_bindings)
-           sub vbs)
-        (sub.class_expr sub ce)
-    (* #end           *)
-    | Pcl_constraint (ce, ct) ->
-      constraint_ ~loc ~attrs (sub.class_expr sub ce) (sub.class_type sub ct)
-    | Pcl_extension x -> extension ~loc ~attrs (sub.extension sub x)
-    | Pcl_open (ovf, lid, ce) ->
-      open_ ~loc ~attrs ovf (map_loc sub lid) (sub.class_expr sub ce)
-
-  let map_kind sub = function
-    | Cfk_concrete (o, e) -> Cfk_concrete (o, sub.expr sub e)
-    | Cfk_virtual t -> Cfk_virtual (sub.typ sub t)
-
-  let map_field sub {pcf_desc = desc; pcf_loc = loc; pcf_attributes = attrs} =
-    let open Cf in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pcf_inherit () -> {pcf_loc = loc; pcf_attributes = attrs; pcf_desc = desc}
-    | Pcf_val (s, m, k) -> val_ ~loc ~attrs (map_loc sub s) m (map_kind sub k)
-    | Pcf_method (s, p, k) ->
-      method_ ~loc ~attrs (map_loc sub s) p (map_kind sub k)
-    | Pcf_constraint (t1, t2) ->
-      constraint_ ~loc ~attrs (sub.typ sub t1) (sub.typ sub t2)
-    | Pcf_initializer e -> initializer_ ~loc ~attrs (sub.expr sub e)
-    | Pcf_attribute x -> attribute ~loc (sub.attribute sub x)
-    | Pcf_extension x -> extension ~loc ~attrs (sub.extension sub x)
-
-  let map_structure sub {pcstr_self; pcstr_fields} =
-    {
-      pcstr_self = sub.pat sub pcstr_self;
-      pcstr_fields = List.map (sub.class_field sub) pcstr_fields;
-    }
-
-  let class_infos sub f
-      {pci_virt; pci_params = pl; pci_name; pci_expr; pci_loc; pci_attributes} =
-    Ci.mk ~virt:pci_virt
-      ~params:(List.map (map_fst (sub.typ sub)) pl)
-      (map_loc sub pci_name) (f pci_expr) ~loc:(sub.location sub pci_loc)
-      ~attrs:(sub.attributes sub pci_attributes)
-end
-
-(* Now, a generic AST mapper, to be extended to cover all kinds and
-   cases of the OCaml grammar.  The default behavior of the mapper is
-   the identity. *)
-
-let default_mapper =
-  {
-    structure = (fun this l -> List.map (this.structure_item this) l);
-    structure_item = M.map_structure_item;
-    module_expr = M.map;
-    signature = (fun this l -> List.map (this.signature_item this) l);
-    signature_item = MT.map_signature_item;
-    module_type = MT.map;
-    with_constraint = MT.map_with_constraint;
-    class_expr = CE.map;
-    class_field = CE.map_field;
-    class_structure = CE.map_structure;
-    class_type = CT.map;
-    class_type_field = CT.map_field;
-    class_signature = CT.map_signature;
-    class_type_declaration =
-      (fun this -> CE.class_infos this (this.class_type this));
-    type_declaration = T.map_type_declaration;
-    (* #if true then      *)
-    type_declaration_list = T.map_type_declaration_list;
-    (* #end *)
-    type_kind = T.map_type_kind;
-    typ = T.map;
-    type_extension = T.map_type_extension;
-    extension_constructor = T.map_extension_constructor;
-    value_description =
-      (fun this {pval_name; pval_type; pval_prim; pval_loc; pval_attributes} ->
-        Val.mk (map_loc this pval_name) (this.typ this pval_type)
-          ~attrs:(this.attributes this pval_attributes)
-          ~loc:(this.location this pval_loc)
-          ~prim:pval_prim);
-    pat = P.map;
-    expr = E.map;
-    module_declaration =
-      (fun this {pmd_name; pmd_type; pmd_attributes; pmd_loc} ->
-        Md.mk (map_loc this pmd_name)
-          (this.module_type this pmd_type)
-          ~attrs:(this.attributes this pmd_attributes)
-          ~loc:(this.location this pmd_loc));
-    module_type_declaration =
-      (fun this {pmtd_name; pmtd_type; pmtd_attributes; pmtd_loc} ->
-        Mtd.mk (map_loc this pmtd_name)
-          ?typ:(map_opt (this.module_type this) pmtd_type)
-          ~attrs:(this.attributes this pmtd_attributes)
-          ~loc:(this.location this pmtd_loc));
-    module_binding =
-      (fun this {pmb_name; pmb_expr; pmb_attributes; pmb_loc} ->
-        Mb.mk (map_loc this pmb_name)
-          (this.module_expr this pmb_expr)
-          ~attrs:(this.attributes this pmb_attributes)
-          ~loc:(this.location this pmb_loc));
-    open_description =
-      (fun this {popen_lid; popen_override; popen_attributes; popen_loc} ->
-        Opn.mk (map_loc this popen_lid) ~override:popen_override
-          ~loc:(this.location this popen_loc)
-          ~attrs:(this.attributes this popen_attributes));
-    include_description =
-      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
-        Incl.mk
-          (this.module_type this pincl_mod)
-          ~loc:(this.location this pincl_loc)
-          ~attrs:(this.attributes this pincl_attributes));
-    include_declaration =
-      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
-        Incl.mk
-          (this.module_expr this pincl_mod)
-          ~loc:(this.location this pincl_loc)
-          ~attrs:(this.attributes this pincl_attributes));
-    value_binding =
-      (fun this {pvb_pat; pvb_expr; pvb_attributes; pvb_loc} ->
-        Vb.mk (this.pat this pvb_pat) (this.expr this pvb_expr)
-          ~loc:(this.location this pvb_loc)
-          ~attrs:(this.attributes this pvb_attributes));
-    (* #if true then  *)
-    value_bindings =
-      (fun this vbs ->
-        match vbs with
-        | [vb] -> [this.value_binding this vb]
-        | _ -> List.map (this.value_binding this) vbs);
-    value_bindings_rec =
-      (fun this vbs ->
-        match vbs with
-        | [vb] -> [this.value_binding this vb]
-        | _ -> List.map (this.value_binding this) vbs);
-    (* #end *)
-    constructor_declaration =
-      (fun this {pcd_name; pcd_args; pcd_res; pcd_loc; pcd_attributes} ->
-        Type.constructor (map_loc this pcd_name)
-          ~args:(T.map_constructor_arguments this pcd_args)
-          ?res:(map_opt (this.typ this) pcd_res)
-          ~loc:(this.location this pcd_loc)
-          ~attrs:(this.attributes this pcd_attributes));
-    label_declaration =
-      (fun this {pld_name; pld_type; pld_loc; pld_mutable; pld_attributes} ->
-        Type.field (map_loc this pld_name) (this.typ this pld_type)
-          ~mut:pld_mutable
-          ~loc:(this.location this pld_loc)
-          ~attrs:(this.attributes this pld_attributes));
-    cases = (fun this l -> List.map (this.case this) l);
-    case =
-      (fun this {pc_lhs; pc_guard; pc_rhs} ->
-        {
-          pc_lhs = this.pat this pc_lhs;
-          pc_guard = map_opt (this.expr this) pc_guard;
-          pc_rhs = this.expr this pc_rhs;
-        });
-    location = (fun _this l -> l);
-    extension = (fun this (s, e) -> (map_loc this s, this.payload this e));
-    attribute = (fun this (s, e) -> (map_loc this s, this.payload this e));
-    attributes = (fun this l -> List.map (this.attribute this) l);
-    payload =
-      (fun this -> function
-        | PStr x -> PStr (this.structure this x)
-        | PSig x -> PSig (this.signature this x)
-        | PTyp x -> PTyp (this.typ this x)
-        | PPat (x, g) -> PPat (this.pat this x, map_opt (this.expr this) g));
-  }
diff --git a/jscomp/frontend/bs_ast_mapper.mli b/jscomp/frontend/bs_ast_mapper.mli
deleted file mode 100644
index 869a20f..0000000
--- a/jscomp/frontend/bs_ast_mapper.mli
+++ /dev/null
@@ -1,109 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                         Alain Frisch, LexiFi                           *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** The interface of a -ppx rewriter
-
-    A -ppx rewriter is a program that accepts a serialized abstract syntax
-    tree and outputs another, possibly modified, abstract syntax tree.
-    This module encapsulates the interface between the compiler and
-    the -ppx rewriters, handling such details as the serialization format,
-    forwarding of command-line flags, and storing state.
-
-    {!mapper} allows to implement AST rewriting using open recursion.
-    A typical mapper would be based on {!default_mapper}, a deep
-    identity mapper, and will fall back on it for handling the syntax it
-    does not modify. For example:
-
-    {[
-      open Asttypes
-      open Parsetree
-      open Ast_mapper
-
-      let test_mapper argv =
-        { default_mapper with
-          expr = fun mapper expr ->
-            match expr with
-            | { pexp_desc = Pexp_extension ({ txt = "test" }, PStr [])} ->
-              Ast_helper.Exp.constant (Const_int 42)
-            | other -> default_mapper.expr mapper other; }
-
-      let () =
-        register "ppx_test" test_mapper]}
-
-    This -ppx rewriter, which replaces [[%test]] in expressions with
-    the constant [42], can be compiled using
-    [ocamlc -o ppx_test -I +compiler-libs ocamlcommon.cma ppx_test.ml].
-
-*)
-
-open! Parsetree
-
-(** {1 A generic Parsetree mapper} *)
-
-type mapper = {
-  attribute: mapper -> attribute -> attribute;
-  attributes: mapper -> attribute list -> attribute list;
-  case: mapper -> case -> case;
-  cases: mapper -> case list -> case list;
-  class_expr: mapper -> class_expr -> class_expr;
-  class_field: mapper -> class_field -> class_field;
-  class_signature: mapper -> class_signature -> class_signature;
-  class_structure: mapper -> class_structure -> class_structure;
-  class_type: mapper -> class_type -> class_type;
-  class_type_declaration:
-    mapper -> class_type_declaration -> class_type_declaration;
-  class_type_field: mapper -> class_type_field -> class_type_field;
-  constructor_declaration:
-    mapper -> constructor_declaration -> constructor_declaration;
-  expr: mapper -> expression -> expression;
-  extension: mapper -> extension -> extension;
-  extension_constructor:
-    mapper -> extension_constructor -> extension_constructor;
-  include_declaration: mapper -> include_declaration -> include_declaration;
-  include_description: mapper -> include_description -> include_description;
-  label_declaration: mapper -> label_declaration -> label_declaration;
-  location: mapper -> Location.t -> Location.t;
-  module_binding: mapper -> module_binding -> module_binding;
-  module_declaration: mapper -> module_declaration -> module_declaration;
-  module_expr: mapper -> module_expr -> module_expr;
-  module_type: mapper -> module_type -> module_type;
-  module_type_declaration:
-    mapper -> module_type_declaration -> module_type_declaration;
-  open_description: mapper -> open_description -> open_description;
-  pat: mapper -> pattern -> pattern;
-  payload: mapper -> payload -> payload;
-  signature: mapper -> signature -> signature;
-  signature_item: mapper -> signature_item -> signature_item;
-  structure: mapper -> structure -> structure;
-  structure_item: mapper -> structure_item -> structure_item;
-  typ: mapper -> core_type -> core_type;
-  type_declaration: mapper -> type_declaration -> type_declaration;
-  type_declaration_list:
-    mapper -> type_declaration list -> type_declaration list;
-  type_extension: mapper -> type_extension -> type_extension;
-  type_kind: mapper -> type_kind -> type_kind;
-  value_binding: mapper -> value_binding -> value_binding;
-  value_bindings_rec: mapper -> value_binding list -> value_binding list;
-  value_bindings: mapper -> value_binding list -> value_binding list;
-  value_description: mapper -> value_description -> value_description;
-  with_constraint: mapper -> with_constraint -> with_constraint;
-}
-(** A mapper record implements one "method" per syntactic category,
-    using an open recursion style: each method takes as its first
-    argument the mapper to be applied to children in the syntax
-    tree. *)
-
-val default_mapper : mapper
-(** A default mapper, which implements a "deep identity" mapping. *)
diff --git a/jscomp/frontend/bs_builtin_ppx.ml b/jscomp/frontend/bs_builtin_ppx.ml
deleted file mode 100644
index bc0afb0..0000000
--- a/jscomp/frontend/bs_builtin_ppx.ml
+++ /dev/null
@@ -1,679 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(* When we design a ppx, we should keep it simple, and also think about
-   how it would work with other tools like merlin and ocamldep *)
-
-(**
-   1. extension point
-   {[
-     [%bs.raw{| blabla |}]
-   ]}
-   will be desugared into
-   {[
-     let module Js =
-     struct unsafe_js : string -> 'a end
-     in Js.unsafe_js {| blabla |}
-   ]}
-   The major benefit is to better error reporting (with locations).
-   Otherwise
-
-   {[
-
-     let f u = Js.unsafe_js u
-     let _ = f (1 + 2)
-   ]}
-   And if it is inlined some where
-*)
-
-let () =
-  Ast_derive_projector.init ();
-  Ast_derive_js_mapper.init ()
-
-let succeed attr attrs =
-  match attrs with
-  | [_] -> ()
-  | _ ->
-    Bs_ast_invariant.mark_used_bs_attribute attr;
-    Bs_ast_invariant.warn_discarded_unused_attributes attrs
-
-type mapper = Bs_ast_mapper.mapper
-
-let default_mapper = Bs_ast_mapper.default_mapper
-let default_expr_mapper = Bs_ast_mapper.default_mapper.expr
-let default_pat_mapper = Bs_ast_mapper.default_mapper.pat
-
-let pat_mapper (self : mapper) (p : Parsetree.pattern) =
-  match p.ppat_desc with
-  | Ppat_constant (Pconst_integer (s, Some 'l')) ->
-    {p with ppat_desc = Ppat_constant (Pconst_integer (s, None))}
-  | Ppat_constant (Pconst_string (s, Some delim)) ->
-    Ast_utf8_string_interp.transform_pat p s delim
-  | _ -> default_pat_mapper self p
-
-(* Unpack requires core_type package for type inference:
-   Generate a module type name eg. __Belt_List__*)
-let local_module_type_name txt =
-  "_"
-  ^ (Longident.flatten txt |> List.fold_left (fun ll l -> ll ^ "_" ^ l) "")
-  ^ "__"
-
-let expr_mapper ~async_context ~in_function_def (self : mapper)
-    (e : Parsetree.expression) =
-  let old_in_function_def = !in_function_def in
-  in_function_def := false;
-  match e.pexp_desc with
-  (* Its output should not be rewritten anymore *)
-  | Pexp_extension extension ->
-    Ast_exp_extension.handle_extension e self extension
-  | Pexp_setinstvar ({txt; loc}, expr) ->
-    if Stack.is_empty Js_config.self_stack then
-      Location.raise_errorf ~loc:e.pexp_loc
-        "This assignment can only happen in object context";
-    let name = Stack.top Js_config.self_stack in
-    if name = "" then
-      Location.raise_errorf ~loc:e.pexp_loc
-        "The current object does not assign a name";
-    let open Ast_helper in
-    self.expr self
-      (Exp.apply ~loc:e.pexp_loc
-         (Exp.ident ~loc {loc; txt = Lident "#="})
-         [
-           ( Nolabel,
-             Exp.send ~loc (Exp.ident ~loc {loc; txt = Lident name}) {loc; txt}
-           );
-           (Nolabel, expr);
-         ])
-  | Pexp_constant (Pconst_string (s, Some delim)) ->
-    Ast_utf8_string_interp.transform_exp e s delim
-  | Pexp_constant (Pconst_integer (s, Some 'l')) ->
-    {e with pexp_desc = Pexp_constant (Pconst_integer (s, None))}
-  (* End rewriting *)
-  | Pexp_function cases -> (
-    (* {[ function [@bs.exn]
-         | Not_found -> 0
-         | Invalid_argument -> 1
-       ]}*)
-    async_context := false;
-    match Ast_attributes.process_pexp_fun_attributes_rev e.pexp_attributes with
-    | false, _ -> default_expr_mapper self e
-    | true, pexp_attributes ->
-      Ast_bs_open.convertBsErrorFunction e.pexp_loc self pexp_attributes cases)
-  | _
-    when Ast_uncurried.exprIsUncurriedFun e
-         &&
-         match
-           Ast_attributes.process_attributes_rev
-             (Ast_uncurried.exprExtractUncurriedFun e).pexp_attributes
-         with
-         | Meth_callback _, _ -> true
-         | _ -> false ->
-    (* Treat @this (. x, y, z) => ... just like @this (x, y, z) => ... *)
-    let fun_expr = Ast_uncurried.exprExtractUncurriedFun e in
-    self.expr self fun_expr
-  | Pexp_newtype (s, body) ->
-    let async = Ast_attributes.has_async_payload e.pexp_attributes <> None in
-    let body = Ast_async.add_async_attribute ~async body in
-    let res = self.expr self body in
-    {e with pexp_desc = Pexp_newtype (s, res)}
-  | Pexp_fun (label, _, pat, body) -> (
-    let async = Ast_attributes.has_async_payload e.pexp_attributes <> None in
-    match Ast_attributes.process_attributes_rev e.pexp_attributes with
-    | Nothing, _ ->
-      (* Handle @async x => y => ... is in async context *)
-      async_context := (old_in_function_def && !async_context) || async;
-      in_function_def := true;
-      Ast_async.make_function_async ~async (default_expr_mapper self e)
-    | Uncurry _, pexp_attributes ->
-      async_context := async;
-      Ast_uncurry_gen.to_uncurry_fn {e with pexp_attributes} self label pat body
-        async
-    | Method _, _ ->
-      Location.raise_errorf ~loc:e.pexp_loc
-        "%@meth is not supported in function expression"
-    | Meth_callback _, pexp_attributes ->
-      (* FIXME: does it make sense to have a label for [this] ? *)
-      async_context := false;
-      {
-        e with
-        pexp_desc =
-          Ast_uncurry_gen.to_method_callback e.pexp_loc self label pat body;
-        pexp_attributes;
-      })
-  | Pexp_apply (fn, args) -> Ast_exp_apply.app_exp_mapper e self fn args
-  | Pexp_match
-      ( b,
-        [
-          {
-            pc_lhs = {ppat_desc = Ppat_construct ({txt = Lident "true"}, None)};
-            pc_guard = None;
-            pc_rhs = t_exp;
-          };
-          {
-            pc_lhs = {ppat_desc = Ppat_construct ({txt = Lident "false"}, None)};
-            pc_guard = None;
-            pc_rhs = f_exp;
-          };
-        ] )
-  | Pexp_match
-      ( b,
-        [
-          {
-            pc_lhs = {ppat_desc = Ppat_construct ({txt = Lident "false"}, None)};
-            pc_guard = None;
-            pc_rhs = f_exp;
-          };
-          {
-            pc_lhs = {ppat_desc = Ppat_construct ({txt = Lident "true"}, None)};
-            pc_guard = None;
-            pc_rhs = t_exp;
-          };
-        ] ) ->
-    default_expr_mapper self
-      {e with pexp_desc = Pexp_ifthenelse (b, t_exp, Some f_exp)}
-  | Pexp_let
-      ( Nonrecursive,
-        [
-          {
-            pvb_pat =
-              ( {ppat_desc = Ppat_record _}
-              | {ppat_desc = Ppat_alias ({ppat_desc = Ppat_record _}, _)} ) as p;
-            pvb_expr;
-            pvb_attributes;
-            pvb_loc = _;
-          };
-        ],
-        body ) -> (
-    match pvb_expr.pexp_desc with
-    | Pexp_pack _ -> default_expr_mapper self e
-    | _ ->
-      default_expr_mapper self
-        {
-          e with
-          pexp_desc =
-            Pexp_match (pvb_expr, [{pc_lhs = p; pc_guard = None; pc_rhs = body}]);
-          pexp_attributes = e.pexp_attributes @ pvb_attributes;
-        })
-  (* let [@warning "a"] {a;b} = c in body
-     The attribute is attached to value binding,
-     after the transformation value binding does not exist so we attach
-     the attribute to the whole expression, in general, when shuffuling the ast
-     it is very hard to place attributes correctly
-  *)
-  (* module M = await Belt.List *)
-  | Pexp_letmodule
-      (lid, ({pmod_desc = Pmod_ident {txt}; pmod_attributes} as me), expr)
-    when Res_parsetree_viewer.hasAwaitAttribute pmod_attributes ->
-    let safe_module_type_lid : Ast_helper.lid =
-      {txt = Lident (local_module_type_name txt); loc = me.pmod_loc}
-    in
-    {
-      e with
-      pexp_desc =
-        Pexp_letmodule
-          ( lid,
-            Ast_await.create_await_module_expression
-              ~module_type_lid:safe_module_type_lid me,
-            self.expr self expr );
-    }
-  (* module M = await (Belt.List: BeltList) *)
-  | Pexp_letmodule
-      ( lid,
-        ({
-           pmod_desc =
-             Pmod_constraint
-               ({pmod_desc = Pmod_ident _}, {pmty_desc = Pmty_ident mtyp_lid});
-           pmod_attributes;
-         } as me),
-        expr )
-    when Res_parsetree_viewer.hasAwaitAttribute pmod_attributes ->
-    {
-      e with
-      pexp_desc =
-        Pexp_letmodule
-          ( lid,
-            Ast_await.create_await_module_expression ~module_type_lid:mtyp_lid
-              me,
-            self.expr self expr );
-    }
-  | _ -> default_expr_mapper self e
-
-let expr_mapper ~async_context ~in_function_def (self : mapper)
-    (e : Parsetree.expression) =
-  let async_saved = !async_context in
-  let result = expr_mapper ~async_context ~in_function_def self e in
-  async_context := async_saved;
-  let is_module, has_await =
-    match e.pexp_desc with
-    | Pexp_letmodule (_, {pmod_desc = Pmod_ident _; pmod_attributes}, _)
-    | Pexp_letmodule
-        ( _,
-          {
-            pmod_desc =
-              Pmod_constraint
-                ({pmod_desc = Pmod_ident _}, {pmty_desc = Pmty_ident _});
-            pmod_attributes;
-          },
-          _ ) ->
-      (true, Ast_attributes.has_await_payload pmod_attributes)
-    | _ -> (false, Ast_attributes.has_await_payload e.pexp_attributes)
-  in
-  match has_await with
-  | None -> result
-  | Some _ ->
-    if !async_context = false then
-      Location.raise_errorf ~loc:e.pexp_loc
-        "Await on expression not in an async context";
-    if is_module = false then Ast_await.create_await_expression result
-    else result
-
-let typ_mapper (self : mapper) (typ : Parsetree.core_type) =
-  Ast_core_type_class_type.typ_mapper self typ
-
-let signature_item_mapper (self : mapper) (sigi : Parsetree.signature_item) :
-    Parsetree.signature_item =
-  match sigi.psig_desc with
-  | Psig_type (rf, tdcls) -> Ast_tdcls.handleTdclsInSigi self sigi rf tdcls
-  | Psig_value ({pval_attributes; pval_prim} as value_desc) -> (
-    let pval_attributes = self.attributes self pval_attributes in
-    if Ast_attributes.rs_externals pval_attributes pval_prim then
-      Ast_external.handleExternalInSig self value_desc sigi
-    else
-      match Ast_attributes.has_inline_payload pval_attributes with
-      | Some ((_, PStr [{pstr_desc = Pstr_eval ({pexp_desc}, _)}]) as attr) -> (
-        match pexp_desc with
-        | Pexp_constant (Pconst_string (s, dec)) ->
-          succeed attr pval_attributes;
-          {
-            sigi with
-            psig_desc =
-              Psig_value
-                {
-                  value_desc with
-                  pval_prim = External_ffi_types.inline_string_primitive s dec;
-                  pval_attributes = [];
-                };
-          }
-        | Pexp_constant (Pconst_integer (s, None)) ->
-          succeed attr pval_attributes;
-          let s = Int32.of_string s in
-          {
-            sigi with
-            psig_desc =
-              Psig_value
-                {
-                  value_desc with
-                  pval_prim = External_ffi_types.inline_int_primitive s;
-                  pval_attributes = [];
-                };
-          }
-        | Pexp_constant (Pconst_integer (s, Some 'L')) ->
-          let s = Int64.of_string s in
-          succeed attr pval_attributes;
-          {
-            sigi with
-            psig_desc =
-              Psig_value
-                {
-                  value_desc with
-                  pval_prim = External_ffi_types.inline_int64_primitive s;
-                  pval_attributes = [];
-                };
-          }
-        | Pexp_constant (Pconst_integer (s, Some 'n')) ->
-          succeed attr pval_attributes;
-          {
-            sigi with
-            psig_desc =
-              Psig_value
-                {
-                  value_desc with
-                  pval_prim = External_ffi_types.inline_bigint_primitive s;
-                  pval_attributes = [];
-                };
-          }
-        | Pexp_constant (Pconst_float (s, None)) ->
-          succeed attr pval_attributes;
-          {
-            sigi with
-            psig_desc =
-              Psig_value
-                {
-                  value_desc with
-                  pval_prim = External_ffi_types.inline_float_primitive s;
-                  pval_attributes = [];
-                };
-          }
-        | Pexp_construct ({txt = Lident (("true" | "false") as txt)}, None) ->
-          succeed attr pval_attributes;
-          {
-            sigi with
-            psig_desc =
-              Psig_value
-                {
-                  value_desc with
-                  pval_prim =
-                    External_ffi_types.inline_bool_primitive (txt = "true");
-                  pval_attributes = [];
-                };
-          }
-        | _ -> default_mapper.signature_item self sigi)
-      | Some _ | None -> default_mapper.signature_item self sigi)
-  | _ -> default_mapper.signature_item self sigi
-
-let structure_item_mapper (self : mapper) (str : Parsetree.structure_item) :
-    Parsetree.structure_item =
-  match str.pstr_desc with
-  | Pstr_type (rf, tdcls) (* [ {ptype_attributes} as tdcl ] *) ->
-    Ast_tdcls.handleTdclsInStru self str rf tdcls
-  | Pstr_primitive prim
-    when Ast_attributes.rs_externals prim.pval_attributes prim.pval_prim ->
-    Ast_external.handleExternalInStru self prim str
-  | Pstr_value
-      ( Nonrecursive,
-        [
-          {
-            pvb_pat = {ppat_desc = Ppat_var pval_name} as pvb_pat;
-            pvb_expr;
-            pvb_attributes;
-            pvb_loc;
-          };
-        ] ) -> (
-    let pvb_expr = self.expr self pvb_expr in
-    let pvb_attributes = self.attributes self pvb_attributes in
-    let has_inline_property =
-      Ast_attributes.has_inline_payload pvb_attributes
-    in
-    match (has_inline_property, pvb_expr.pexp_desc) with
-    | Some attr, Pexp_constant (Pconst_string (s, dec)) ->
-      succeed attr pvb_attributes;
-      {
-        str with
-        pstr_desc =
-          Pstr_primitive
-            {
-              pval_name;
-              pval_type = Ast_literal.type_string ();
-              pval_loc = pvb_loc;
-              pval_attributes = [];
-              pval_prim = External_ffi_types.inline_string_primitive s dec;
-            };
-      }
-    | Some attr, Pexp_constant (Pconst_integer (s, None)) ->
-      let s = Int32.of_string s in
-      succeed attr pvb_attributes;
-      {
-        str with
-        pstr_desc =
-          Pstr_primitive
-            {
-              pval_name;
-              pval_type = Ast_literal.type_int ();
-              pval_loc = pvb_loc;
-              pval_attributes = [];
-              pval_prim = External_ffi_types.inline_int_primitive s;
-            };
-      }
-    | Some attr, Pexp_constant (Pconst_integer (s, Some 'L')) ->
-      let s = Int64.of_string s in
-      succeed attr pvb_attributes;
-      {
-        str with
-        pstr_desc =
-          Pstr_primitive
-            {
-              pval_name;
-              pval_type = Ast_literal.type_int64;
-              pval_loc = pvb_loc;
-              pval_attributes = [];
-              pval_prim = External_ffi_types.inline_int64_primitive s;
-            };
-      }
-    | Some attr, Pexp_constant (Pconst_float (s, None)) ->
-      succeed attr pvb_attributes;
-      {
-        str with
-        pstr_desc =
-          Pstr_primitive
-            {
-              pval_name;
-              pval_type = Ast_literal.type_float;
-              pval_loc = pvb_loc;
-              pval_attributes = [];
-              pval_prim = External_ffi_types.inline_float_primitive s;
-            };
-      }
-    | ( Some attr,
-        Pexp_construct ({txt = Lident (("true" | "false") as txt)}, None) ) ->
-      succeed attr pvb_attributes;
-      {
-        str with
-        pstr_desc =
-          Pstr_primitive
-            {
-              pval_name;
-              pval_type = Ast_literal.type_bool ();
-              pval_loc = pvb_loc;
-              pval_attributes = [];
-              pval_prim = External_ffi_types.inline_bool_primitive (txt = "true");
-            };
-      }
-    | _ ->
-      {
-        str with
-        pstr_desc =
-          Pstr_value
-            (Nonrecursive, [{pvb_pat; pvb_expr; pvb_attributes; pvb_loc}]);
-      })
-  | Pstr_attribute ({txt = "bs.config" | "config"}, _) -> str
-  | _ -> default_mapper.structure_item self str
-
-let local_module_name =
-  let v = ref 0 in
-  fun () ->
-    incr v;
-    "local_" ^ string_of_int !v
-
-let expand_reverse (stru : Ast_structure.t) (acc : Ast_structure.t) :
-    Ast_structure.t =
-  if stru = [] then acc
-  else (
-    Typemod_hide.check stru;
-    let local_module_name = local_module_name () in
-    let last_loc = (List.hd stru).pstr_loc in
-    let stru = List.rev stru in
-    let first_loc = (List.hd stru).pstr_loc in
-    let loc = {first_loc with loc_end = last_loc.loc_end} in
-    let open Ast_helper in
-    Str.module_ ~loc
-      {
-        pmb_name = {txt = local_module_name; loc};
-        pmb_expr =
-          {
-            pmod_desc = Pmod_structure stru;
-            pmod_loc = loc;
-            pmod_attributes = [];
-          };
-        pmb_attributes = Typemod_hide.attrs;
-        pmb_loc = loc;
-      }
-    :: Str.open_ ~loc
-         {
-           popen_lid = {txt = Lident local_module_name; loc};
-           popen_override = Override;
-           popen_loc = loc;
-           popen_attributes = [];
-         }
-    :: acc)
-
-let rec structure_mapper ~await_context (self : mapper) (stru : Ast_structure.t)
-    =
-  match stru with
-  | [] -> []
-  | item :: rest -> (
-    match item.pstr_desc with
-    | Pstr_extension (({txt = "bs.raw" | "raw"; loc}, payload), _attrs) ->
-      Ast_exp_handle_external.handle_raw_structure loc payload
-      :: structure_mapper ~await_context self rest
-    (* | Pstr_extension (({txt = "i"}, _),_)
-       ->
-       structure_mapper self rest *)
-    | Pstr_extension (({txt = "private"}, _), _) ->
-      let rec aux acc (rest : Ast_structure.t) =
-        match rest with
-        | {pstr_desc = Pstr_extension (({txt = "private"; loc}, payload), _)}
-          :: next -> (
-          match payload with
-          | PStr work ->
-            if List.length work = 0 then
-              Location.raise_errorf ~loc
-                {|%%%%private extension expects a definition as its argument. Example: %%%%private(let a = "Hello")|};
-            aux
-              (Ext_list.rev_map_append work acc (fun x ->
-                   self.structure_item self x))
-              next
-          | PSig _ | PTyp _ | PPat _ ->
-            Location.raise_errorf ~loc "private extension is not support")
-        | _ -> expand_reverse acc (structure_mapper ~await_context self rest)
-      in
-      aux [] stru
-    (* Dynamic import of module transformation: module M = @res.await Belt.List *)
-    | Pstr_module
-        ({pmb_expr = {pmod_desc = Pmod_ident {txt; loc}; pmod_attributes} as me}
-         as mb)
-      when Res_parsetree_viewer.hasAwaitAttribute pmod_attributes ->
-      let item = self.structure_item self item in
-      let safe_module_type_name = local_module_type_name txt in
-      let has_local_module_name =
-        Hashtbl.find_opt !await_context safe_module_type_name
-      in
-      (* module __Belt_List__ = module type of Belt.List *)
-      let module_type_decl =
-        match has_local_module_name with
-        | Some _ -> []
-        | None ->
-          Hashtbl.add !await_context safe_module_type_name safe_module_type_name;
-          [
-            Ast_helper.(
-              Str.modtype ~loc
-                (Mtd.mk ~loc
-                   {txt = safe_module_type_name; loc}
-                   ~typ:(Mty.typeof_ ~loc me)));
-          ]
-      in
-      let safe_module_type_lid : Ast_helper.lid =
-        {txt = Lident safe_module_type_name; loc = mb.pmb_expr.pmod_loc}
-      in
-      module_type_decl
-      @ (* module M = @res.await Belt.List *)
-      {
-        item with
-        pstr_desc =
-          Pstr_module
-            {
-              mb with
-              pmb_expr =
-                Ast_await.create_await_module_expression
-                  ~module_type_lid:safe_module_type_lid mb.pmb_expr;
-            };
-      }
-      :: structure_mapper ~await_context self rest
-    | Pstr_value (_, vbs) ->
-      let item = self.structure_item self item in
-      (* [ module __Belt_List__ = module type of Belt.List ] *)
-      let rec spelunk_vbs acc vbs =
-        match vbs with
-        | [] -> acc
-        | ({pvb_expr} : Parsetree.value_binding) :: tl ->
-          let rec aux (expr : Parsetree.expression) =
-            match expr.pexp_desc with
-            | Pexp_letmodule
-                ( _,
-                  ({pmod_desc = Pmod_ident {txt; loc}; pmod_attributes} as me),
-                  expr )
-              when Res_parsetree_viewer.hasAwaitAttribute pmod_attributes -> (
-              let safe_module_type_name = local_module_type_name txt in
-              let has_local_module_name =
-                Hashtbl.find_opt !await_context safe_module_type_name
-              in
-
-              match has_local_module_name with
-              | Some _ -> aux expr
-              | None ->
-                Hashtbl.add !await_context safe_module_type_name
-                  safe_module_type_name;
-                Ast_helper.(
-                  Str.modtype ~loc
-                    (Mtd.mk ~loc
-                       {txt = safe_module_type_name; loc}
-                       ~typ:(Mty.typeof_ ~loc me)))
-                :: aux expr)
-            | Pexp_let (_, vbs, expr) -> aux expr @ spelunk_vbs acc vbs
-            | Pexp_ifthenelse (_, then_expr, Some else_expr) ->
-              aux then_expr @ aux else_expr
-            | Pexp_construct (_, Some expr) -> aux expr
-            | Pexp_fun (_, _, _, expr) | Pexp_newtype (_, expr) -> aux expr
-            | _ -> acc
-          in
-          aux pvb_expr @ spelunk_vbs acc tl
-      in
-      let module_type_decls = spelunk_vbs [] vbs in
-
-      module_type_decls @ (item :: structure_mapper ~await_context self rest)
-    | _ ->
-      self.structure_item self item :: structure_mapper ~await_context self rest
-    )
-
-let structure_mapper ~await_context (self : mapper) (stru : Ast_structure.t) =
-  let await_saved = !await_context in
-  let result =
-    structure_mapper ~await_context:(ref (Hashtbl.create 10)) self stru
-  in
-  await_context := await_saved;
-  result
-
-let mapper : mapper =
-  {
-    default_mapper with
-    expr = expr_mapper ~async_context:(ref true) ~in_function_def:(ref false);
-    pat = pat_mapper;
-    typ = typ_mapper;
-    signature_item = signature_item_mapper;
-    value_bindings = Ast_tuple_pattern_flatten.value_bindings_mapper;
-    structure_item = structure_item_mapper;
-    structure = structure_mapper ~await_context:(ref (Hashtbl.create 10));
-    (* Ad-hoc way to internalize stuff *)
-    label_declaration =
-      (fun self lbl ->
-        let lbl = default_mapper.label_declaration self lbl in
-        match lbl.pld_attributes with
-        | [({txt = "internal"}, _)] ->
-          {
-            lbl with
-            pld_name =
-              {lbl.pld_name with txt = String.capitalize_ascii lbl.pld_name.txt};
-            pld_attributes = [];
-          }
-        | _ -> lbl);
-  }
diff --git a/jscomp/frontend/bs_builtin_ppx.mli b/jscomp/frontend/bs_builtin_ppx.mli
deleted file mode 100644
index 0508221..0000000
--- a/jscomp/frontend/bs_builtin_ppx.mli
+++ /dev/null
@@ -1,57 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val mapper : Bs_ast_mapper.mapper
-
-(* object 
-    for setter : we can push more into [Lsend] and enclose it with a unit type
-
-    for getter :
-
-    (* Invariant: we expect the typechecker & lambda emitter  
-       will not do agressive inlining
-       Worst things could happen
-   {[
-     let x = y## case 3  in 
-     x 2
-   ]}
-       in normal case, it should be compiled into Lambda
-   {[
-     let x = Lsend(y,case, [3]) in 
-     Lapp(x,2)
-   ]}
-
-       worst:
-   {[ Lsend(y, case, [3,2])
-   ]}               
-       for setter(include case setter), this could 
-       be prevented by type system, for getter.
-
-       solution: we can prevent this by rewrite into 
-   {[
-     Fn.run1  (!x# case) v 
-]}
- *)
-
- *)
diff --git a/jscomp/frontend/bs_syntaxerr.ml b/jscomp/frontend/bs_syntaxerr.ml
deleted file mode 100644
index c143ea6..0000000
--- a/jscomp/frontend/bs_syntaxerr.ml
+++ /dev/null
@@ -1,119 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 untaggedVariant = OnlyOneUnknown | AtMostOneObject | AtMostOneArray
-
-type error =
-  | Unsupported_predicates
-  | Conflict_bs_bs_this_bs_meth
-  | Duplicated_bs_deriving
-  | Conflict_attributes
-  | Expect_int_literal
-  | Expect_string_literal
-  | Expect_int_or_string_or_json_literal
-  | Unhandled_poly_type
-  | Unregistered of string
-  | Invalid_underscore_type_in_external
-  | Invalid_bs_string_type
-  | Invalid_bs_int_type
-  | Invalid_bs_unwrap_type
-  | Conflict_ffi_attribute of string
-  | Not_supported_in_bs_deriving
-  | Canot_infer_arity_by_syntax
-  | Illegal_attribute
-  | Inconsistent_arity of int * int
-  (* we still rqeuire users to have explicit annotation to avoid
-     {[ (((int -> int) -> int) -> int )]}
-  *)
-  | Not_supported_directive_in_bs_return
-  | Expect_opt_in_bs_return_to_opt
-  | Misplaced_label_syntax
-  | Optional_in_uncurried_bs_attribute
-  | Bs_this_simple_pattern
-  | Bs_uncurried_arity_too_large
-
-let pp_error fmt err =
-  Format.pp_print_string fmt
-    (match err with
-    | Bs_uncurried_arity_too_large ->
-      "Uncurried function supports only up to arity 22"
-    | Misplaced_label_syntax -> "Label syntax is not support in this position"
-    (*
-    let fn x = ((##) x ~hi)  ~lo:1 ~hi:2 
-    *)
-    | Optional_in_uncurried_bs_attribute ->
-      "Uncurried function doesn't support optional arguments yet"
-    | Expect_opt_in_bs_return_to_opt ->
-      "%@return directive *_to_opt expect return type to be \n\
-       syntax wise `_ option` for safety"
-    | Not_supported_directive_in_bs_return -> "Not supported return directive"
-    | Illegal_attribute -> "Illegal attributes"
-    | Canot_infer_arity_by_syntax ->
-      "Cannot infer the arity through the syntax, either [%@uncurry n] or \n\
-       write it in arrow syntax "
-    | Inconsistent_arity (arity, n) ->
-      Printf.sprintf "Inconsistent arity %d vs %d" arity n
-    | Not_supported_in_bs_deriving -> "not supported in deriving"
-    | Unsupported_predicates -> "unsupported predicates"
-    | Conflict_bs_bs_this_bs_meth ->
-      "%@this, %@bs, %@meth can not be applied at the same time"
-    | Duplicated_bs_deriving -> "duplicate bs.deriving attribute"
-    | Conflict_attributes -> "conflicting attributes "
-    | Expect_string_literal -> "expect string literal "
-    | Expect_int_literal -> "expect int literal "
-    | Expect_int_or_string_or_json_literal ->
-      "expect int, string literal or json literal {json|text here|json} "
-    | Unhandled_poly_type -> "Unhandled poly type"
-    | Unregistered str -> "Unregistered " ^ str
-    | Invalid_underscore_type_in_external ->
-      "_ is not allowed in combination with external optional type"
-    | Invalid_bs_string_type -> "Not a valid type for %@string"
-    | Invalid_bs_int_type -> "Not a valid type for %@int"
-    | Invalid_bs_unwrap_type ->
-      "Not a valid type for %@unwrap. Type must be an inline variant (closed), \
-       and\n\
-       each constructor must have an argument."
-    | Conflict_ffi_attribute str -> "Conflicting attributes: " ^ str
-    | Bs_this_simple_pattern ->
-      "%@this expect its pattern variable to be simple form")
-
-type exn += Error of Location.t * error
-
-let () =
-  Location.register_error_of_exn (function
-    | Error (loc, err) -> Some (Location.error_of_printer loc pp_error err)
-    | _ -> None)
-
-let err loc error = raise (Error (loc, error))
-
-let optional_err loc (lbl : Asttypes.arg_label) =
-  match lbl with
-  | Optional _ -> raise (Error (loc, Optional_in_uncurried_bs_attribute))
-  | _ -> ()
-
-let err_if_label loc (lbl : Asttypes.arg_label) =
-  if lbl <> Nolabel then raise (Error (loc, Misplaced_label_syntax))
-
-let err_large_arity loc arity =
-  if arity > 22 then raise (Error (loc, Bs_uncurried_arity_too_large))
diff --git a/jscomp/frontend/bs_syntaxerr.mli b/jscomp/frontend/bs_syntaxerr.mli
deleted file mode 100644
index bf19891..0000000
--- a/jscomp/frontend/bs_syntaxerr.mli
+++ /dev/null
@@ -1,62 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 untaggedVariant = OnlyOneUnknown | AtMostOneObject | AtMostOneArray
-
-type error =
-  | Unsupported_predicates
-  | Conflict_bs_bs_this_bs_meth
-  | Duplicated_bs_deriving
-  | Conflict_attributes
-  | Expect_int_literal
-  | Expect_string_literal
-  | Expect_int_or_string_or_json_literal
-  | Unhandled_poly_type
-  | Unregistered of string
-  | Invalid_underscore_type_in_external
-  | Invalid_bs_string_type
-  | Invalid_bs_int_type
-  | Invalid_bs_unwrap_type
-  | Conflict_ffi_attribute of string
-  | Not_supported_in_bs_deriving
-  | Canot_infer_arity_by_syntax
-  | Illegal_attribute
-  | Inconsistent_arity of int * int
-  (* we still rqeuire users to have explicit annotation to avoid
-     {[ (((int -> int) -> int) -> int )]}
-  *)
-  | Not_supported_directive_in_bs_return
-  | Expect_opt_in_bs_return_to_opt
-  | Misplaced_label_syntax
-  | Optional_in_uncurried_bs_attribute
-  | Bs_this_simple_pattern
-  | Bs_uncurried_arity_too_large
-
-val err : Location.t -> error -> 'a
-
-val optional_err : Location.t -> Asttypes.arg_label -> unit
-
-val err_if_label : Location.t -> Asttypes.arg_label -> unit
-
-val err_large_arity : Location.t -> int -> unit
diff --git a/jscomp/frontend/dune b/jscomp/frontend/dune
deleted file mode 100644
index 3b5b5b1..0000000
--- a/jscomp/frontend/dune
+++ /dev/null
@@ -1,6 +0,0 @@
-(library
- (name frontend)
- (wrapped false)
- (flags
-  (:standard -w -A))
- (libraries common ml))
diff --git a/jscomp/frontend/external_arg_spec.ml b/jscomp/frontend/external_arg_spec.ml
deleted file mode 100644
index 4f3051a..0000000
--- a/jscomp/frontend/external_arg_spec.ml
+++ /dev/null
@@ -1,85 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 definitions for arguments to a function declared external *)
-
-type delim = DNone | DStarJ | DNoQuotes
-
-type cst = Arg_int_lit of int | Arg_string_lit of string * delim
-
-type label_noname = Arg_label | Arg_empty | Arg_optional
-
-type label =
-  | Obj_empty
-  | Obj_label of {name: string}
-  | Obj_optional of {name: string; for_sure_no_nested_option: bool}
-
-(* it will be ignored , side effect will be recorded *)
-
-(* This type is used to give some meta info on each argument *)
-type attr =
-  | Poly_var_string of {
-      descr: (string * string) list;
-          (* introduced by attributes @string
-             and @as
-          *)
-    }
-  | Poly_var of {
-      descr: (string * string) list option;
-          (* introduced by attributes @string
-             and @as
-          *)
-    }
-  (* `a does not have any value*)
-  | Int of (string * int) list (* ([`a | `b ] [@int])*)
-  | Arg_cst of cst
-  | Fn_uncurry_arity of int (* annotated with [@uncurry ] or [@uncurry 2]*)
-  (* maybe we can improve it as a combination of {!Asttypes.constant} and tuple *)
-  | Extern_unit
-  | Nothing
-  | Ignore
-  | Unwrap
-
-type param = {arg_type: attr; arg_label: label_noname}
-
-type obj_param = {obj_arg_type: attr; obj_arg_label: label}
-
-type obj_params = obj_param list
-
-type params = param list
-
-let cst_int i = Arg_int_lit i
-
-let cst_string s delim = Arg_string_lit (s, delim)
-
-let empty_label = Obj_empty
-
-let obj_label name = Obj_label {name}
-
-let optional for_sure_no_nested_option name =
-  Obj_optional {name; for_sure_no_nested_option}
-
-let empty_kind obj_arg_type = {obj_arg_label = empty_label; obj_arg_type}
-
-let dummy = {arg_type = Nothing; arg_label = Arg_empty}
diff --git a/jscomp/frontend/external_arg_spec.mli b/jscomp/frontend/external_arg_spec.mli
deleted file mode 100644
index 85ba36e..0000000
--- a/jscomp/frontend/external_arg_spec.mli
+++ /dev/null
@@ -1,71 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 delim = DNone | DStarJ | DNoQuotes
-
-type cst = private Arg_int_lit of int | Arg_string_lit of string * delim
-
-type attr =
-  | Poly_var_string of {descr: (string * string) list}
-  | Poly_var of {descr: (string * string) list option}
-  | Int of (string * int) list (* ([`a | `b ] [@bs.int])*)
-  | Arg_cst of cst
-  | Fn_uncurry_arity of
-      int (* annotated with [@bs.uncurry ] or [@bs.uncurry 2]*)
-  (* maybe we can improve it as a combination of {!Asttypes.constant} and tuple *)
-  | Extern_unit
-  | Nothing
-  | Ignore
-  | Unwrap
-
-type label_noname = Arg_label | Arg_empty | Arg_optional
-
-type label = private
-  | Obj_empty
-  | Obj_label of {name: string}
-  | Obj_optional of {name: string; for_sure_no_nested_option: bool}
-(* it will be ignored , side effect will be recorded *)
-
-type obj_param = {obj_arg_type: attr; obj_arg_label: label}
-
-type param = {arg_type: attr; arg_label: label_noname}
-
-type obj_params = obj_param list
-
-type params = param list
-
-val cst_int : int -> cst
-
-val cst_string : string -> delim -> cst
-
-val empty_label : label
-
-(* val empty_lit : cst -> label  *)
-val obj_label : string -> label
-
-val optional : bool -> string -> label
-
-val empty_kind : attr -> obj_param
-
-val dummy : param
diff --git a/jscomp/frontend/external_ffi_types.ml b/jscomp/frontend/external_ffi_types.ml
deleted file mode 100644
index 1acc82d..0000000
--- a/jscomp/frontend/external_ffi_types.ml
+++ /dev/null
@@ -1,328 +0,0 @@
-(* Copyright (C) 2015 - 2016 Bloomberg Finance L.P.
- * Copyright (C) 2017 - Hongbo Zhang, Authors of ReScript
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-[@@@warning "+9"]
-type module_bind_name =
-  | Phint_name of string
-  (* explicit hint name *)
-  | Phint_nothing
-
-type import_attributes = (string, string) Hashtbl.t
-
-type external_module_name = {
-  bundle: string;
-  module_bind_name: module_bind_name;
-  import_attributes: import_attributes option;
-}
-
-type arg_type = External_arg_spec.attr
-(** TODO: information between [arg_type] and [arg_label] are duplicated,
-    design a more compact representation so that it is also easy to seralize by hand
-*)
-
-type arg_label = External_arg_spec.label
-
-type external_spec =
-  | Js_var of {
-      name: string;
-      external_module_name: external_module_name option;
-      scopes: string list;
-    }
-  | Js_module_as_var of external_module_name
-  | Js_module_as_fn of {
-      external_module_name: external_module_name;
-      splice: bool;
-    }
-  | Js_module_as_class of external_module_name
-  | Js_call of {
-      name: string;
-      external_module_name: external_module_name option;
-      splice: bool;
-      scopes: string list;
-      tagged_template: bool;
-    }
-  | Js_send of {name: string; splice: bool; js_send_scopes: string list}
-    (* we know it is a js send, but what will happen if you pass an ocaml objct *)
-  | Js_new of {
-      name: string;
-      external_module_name: external_module_name option;
-      splice: bool;
-      scopes: string list;
-    }
-  | Js_set of {js_set_name: string; js_set_scopes: string list}
-  | Js_get of {js_get_name: string; js_get_scopes: string list}
-  | Js_get_index of {js_get_index_scopes: string list}
-  | Js_set_index of {js_set_index_scopes: string list}
-
-(* let not_inlineable (x : external_spec) =     *)
-
-(* let name_of_ffi ffi =
-   match ffi with
-   | Js_get_index _scope -> "@get_index .."
-   | Js_set_index _scope -> "@set_index .."
-   | Js_get { js_get_name = s} -> Printf.sprintf "[@@get %S]" s
-   | Js_set { js_set_name = s} -> Printf.sprintf "[@@set %S]" s
-   | Js_call v  -> Printf.sprintf "[@@val %S]" v.name
-   | Js_send v  -> Printf.sprintf "[@@send %S]" v.name
-   | Js_module_as_fn v  -> Printf.sprintf "[@@val %S]" v.external_module_name.bundle
-   | Js_new v  -> Printf.sprintf "[@@new %S]" v.name
-   | Js_module_as_class v
-    -> Printf.sprintf "[@@module] %S " v.bundle
-   | Js_module_as_var v
-    ->
-    Printf.sprintf "[@@module] %S " v.bundle
-   | Js_var v (* FIXME: could be [@@module "xx"] as well *)
-    ->
-    Printf.sprintf "[@@val] %S " v.name *)
-
-type return_wrapper =
-  | Return_unset
-  | Return_identity
-  | Return_undefined_to_opt
-  | Return_null_to_opt
-  | Return_null_undefined_to_opt
-  | Return_replaced_with_unit
-
-type params = Params of External_arg_spec.params | Param_number of int
-
-type t =
-  | Ffi_bs of params * return_wrapper * external_spec
-      (**  [Ffi_bs(args,return,attr) ]
-       [return] means return value is unit or not,
-        [true] means is [unit]
-  *)
-  | Ffi_obj_create of External_arg_spec.obj_params
-  | Ffi_inline_const of Lam_constant.t
-  | Ffi_normal
-(* When it's normal, it is handled as normal c functional ffi call *)
-
-let valid_js_char =
-  let a =
-    Array.init 256 (fun i ->
-        let c = Char.chr i in
-        (c >= 'a' && c <= 'z')
-        || (c >= 'A' && c <= 'Z')
-        || (c >= '0' && c <= '9')
-        || c = '_' || c = '$')
-  in
-  fun c -> Array.unsafe_get a (Char.code c)
-
-let valid_first_js_char =
-  let a =
-    Array.init 256 (fun i ->
-        let c = Char.chr i in
-        (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c = '_' || c = '$')
-  in
-  fun c -> Array.unsafe_get a (Char.code c)
-
-(** Approximation could be improved *)
-let valid_ident (s : string) =
-  let len = String.length s in
-  len > 0
-  && valid_js_char s.[0]
-  && valid_first_js_char s.[0]
-  &&
-  let exception E in
-  try
-    for i = 1 to len - 1 do
-      if not (valid_js_char (String.unsafe_get s i)) then raise_notrace E
-    done;
-    true
-  with E -> false
-
-let is_package_relative_path (x : string) =
-  Ext_string.starts_with x "./" || Ext_string.starts_with x "../"
-
-let valid_global_name ?loc txt =
-  if not (valid_ident txt) then
-    let v = Ext_string.split_by ~keep_empty:true (fun x -> x = '.') txt in
-    Ext_list.iter v (fun s ->
-        if not (valid_ident s) then
-          Location.raise_errorf ?loc "Not a valid global name %s" txt)
-
-(*
-  We loose such check (see #2583),
-  it also helps with the implementation deriving abstract [@as]
-*)
-
-let valid_method_name ?loc:_ _txt = ()
-(* if not (valid_ident txt) then
-   Location.raise_errorf ?loc "Not a valid method name %s"  txt *)
-
-let check_external_module_name ?loc x =
-  match x with
-  | {bundle = ""; _} | {module_bind_name = Phint_name ""; bundle = _; _} ->
-    Location.raise_errorf ?loc "empty name encountered"
-  | _ -> ()
-
-let check_ffi ?loc ffi : bool =
-  let xrelative = ref false in
-  let upgrade bool = if not !xrelative then xrelative := bool in
-  (match ffi with
-  | Js_var {name; external_module_name; scopes = _} ->
-    upgrade (is_package_relative_path name);
-    Ext_option.iter external_module_name (fun name ->
-        upgrade (is_package_relative_path name.bundle));
-    valid_global_name ?loc name
-  | Js_send {name; splice = _; js_send_scopes = _}
-  | Js_set {js_set_name = name; js_set_scopes = _}
-  | Js_get {js_get_name = name; js_get_scopes = _} ->
-    valid_method_name ?loc name
-  | Js_get_index _ (* TODO: check scopes *) | Js_set_index _ -> ()
-  | Js_module_as_var external_module_name
-  | Js_module_as_fn {external_module_name; splice = _}
-  | Js_module_as_class external_module_name ->
-    upgrade (is_package_relative_path external_module_name.bundle);
-    check_external_module_name external_module_name
-  | Js_new {external_module_name; name; splice = _; scopes = _}
-  | Js_call
-      {external_module_name; name; splice = _; scopes = _; tagged_template = _}
-    ->
-    Ext_option.iter external_module_name (fun external_module_name ->
-        upgrade (is_package_relative_path external_module_name.bundle));
-    Ext_option.iter external_module_name (fun name ->
-        check_external_module_name ?loc name);
-
-    valid_global_name ?loc name);
-  !xrelative
-
-(* let bs_prefix = "BS:"
-   let bs_prefix_length = String.length bs_prefix
-*)
-
-(** TODO: Make sure each version is not prefix of each other
-    Solution:
-    1. fixed length
-    2. non-prefix approach
-*)
-(* let bs_external = bs_prefix  *)
-
-(* let bs_external_length = String.length bs_external *)
-
-let to_string (t : t) = Marshal.to_string t []
-
-(* \132\149\166\190
-   0x84 95 A6 BE Intext_magic_small intext.h
-   https://github.com/ocaml/merlin/commit/b094c937c3a360eb61054f7652081b88e4f3612f
-*)
-let is_bs_primitive s =
-  String.length s >= 20
-  (* Marshal.header_size*) && String.unsafe_get s 0 = '\132'
-  && String.unsafe_get s 1 = '\149'
-
-let () =
-  Oprint.map_primitive_name :=
-    fun s -> if is_bs_primitive s then "BS:external" else s
-
-(* TODO:  better error message when version mismatch *)
-let from_string s : t =
-  if is_bs_primitive s then Ext_marshal.from_string s else Ffi_normal
-
-let () =
-  Primitive.coerce :=
-    fun ({
-           prim_name;
-           prim_arity;
-           prim_native_name;
-           prim_alloc = _;
-           prim_native_repr_args = _;
-           prim_native_repr_res = _;
-         } :
-          Primitive.description) (p2 : Primitive.description) ->
-      let p2_native = p2.prim_native_name in
-      prim_name = p2.prim_name && prim_arity = p2.prim_arity
-      && prim_native_name = p2_native
-      ||
-      match (from_string prim_native_name, from_string p2_native) with
-      | Ffi_obj_create obj_parms, Ffi_obj_create obj_parms2 ->
-        Ext_list.for_all2_no_exn obj_parms obj_parms2
-          (fun {obj_arg_type; obj_arg_label} b ->
-            let b_obj_arg_label = b.obj_arg_label in
-            obj_arg_type = b.obj_arg_type
-            && (obj_arg_label = b_obj_arg_label
-               ||
-               match (obj_arg_label, b_obj_arg_label) with
-               | Obj_optional {name; for_sure_no_nested_option}, Obj_optional p
-                 ->
-                 name = p.name
-                 && (Obj.magic for_sure_no_nested_option : int)
-                    <= Obj.magic p.for_sure_no_nested_option
-               | _ -> false))
-      | Ffi_bs _, Ffi_bs _ -> false
-      | _ -> false
-let inline_string_primitive (s : string) (op : string option) : string list =
-  let lam : Lam_constant.t =
-    let unicode =
-      match op with
-      | Some op -> Ast_utf8_string_interp.is_unicode_string op
-      | None -> false
-    in
-    Const_string {s; unicode}
-  in
-  [""; to_string (Ffi_inline_const lam)]
-
-(* Let's only do it for string ATM
-    for boolean, and ints, a good optimizer should
-    do it by default?
-    But it may not work after layers of indirection
-    e.g, submodule
-*)
-let inline_bool_primitive b : string list =
-  let lam : Lam_constant.t =
-    if b then Lam_constant.Const_js_true else Lam_constant.Const_js_false
-  in
-  [""; to_string (Ffi_inline_const lam)]
-
-(* FIXME: check overflow ?*)
-let inline_int_primitive (i : int32) : string list =
-  [""; to_string (Ffi_inline_const (Const_int {i; comment = None}))]
-
-let inline_int64_primitive (i : int64) : string list =
-  [""; to_string (Ffi_inline_const (Const_int64 i))]
-
-let inline_bigint_primitive (i : string) : string list =
-  let sign, i = Bigint_utils.parse_bigint i in
-  [""; to_string (Ffi_inline_const (Const_bigint (sign, i)))]
-
-let inline_float_primitive (i : string) : string list =
-  [""; to_string (Ffi_inline_const (Const_float i))]
-let rec ffi_bs_aux acc (params : External_arg_spec.params) =
-  match params with
-  | {arg_type = Nothing; arg_label = Arg_empty}
-      (* same as External_arg_spec.dummy*)
-    :: rest ->
-    ffi_bs_aux (acc + 1) rest
-  | _ :: _ -> -1
-  | [] -> acc
-
-let ffi_bs (params : External_arg_spec.params) return attr =
-  let n = ffi_bs_aux 0 params in
-  if n < 0 then Ffi_bs (Params params, return, attr)
-  else Ffi_bs (Param_number n, return, attr)
-
-let ffi_bs_as_prims params return attr =
-  [""; to_string (ffi_bs params return attr)]
-
-let ffi_obj_create obj_params = Ffi_obj_create obj_params
-
-let ffi_obj_as_prims obj_params = [""; to_string (Ffi_obj_create obj_params)]
diff --git a/jscomp/frontend/external_ffi_types.mli b/jscomp/frontend/external_ffi_types.mli
deleted file mode 100644
index a96c06c..0000000
--- a/jscomp/frontend/external_ffi_types.mli
+++ /dev/null
@@ -1,119 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 module_bind_name =
-  | Phint_name of string
-  (* explicit hint name *)
-  | Phint_nothing
-
-type import_attributes = (string, string) Hashtbl.t
-
-type external_module_name = {
-  bundle: string;
-  module_bind_name: module_bind_name;
-  import_attributes: import_attributes option;
-}
-
-type arg_type = External_arg_spec.attr
-
-type arg_label = External_arg_spec.label
-
-type external_spec =
-  | Js_var of {
-      name: string;
-      external_module_name: external_module_name option;
-      scopes: string list;
-    }
-  | Js_module_as_var of external_module_name
-  | Js_module_as_fn of {
-      external_module_name: external_module_name;
-      splice: bool;
-    }
-  | Js_module_as_class of external_module_name
-  | Js_call of {
-      name: string;
-      external_module_name: external_module_name option;
-      splice: bool;
-      scopes: string list;
-      tagged_template: bool;
-    }
-  | Js_send of {name: string; splice: bool; js_send_scopes: string list}
-    (* we know it is a js send, but what will happen if you pass an ocaml objct *)
-  | Js_new of {
-      name: string;
-      external_module_name: external_module_name option;
-      splice: bool;
-      scopes: string list;
-    }
-  | Js_set of {js_set_name: string; js_set_scopes: string list}
-  | Js_get of {js_get_name: string; js_get_scopes: string list}
-  | Js_get_index of {js_get_index_scopes: string list}
-  | Js_set_index of {js_set_index_scopes: string list}
-
-type return_wrapper =
-  | Return_unset
-  | Return_identity
-  | Return_undefined_to_opt
-  | Return_null_to_opt
-  | Return_null_undefined_to_opt
-  | Return_replaced_with_unit
-
-type params = Params of External_arg_spec.params | Param_number of int
-
-type t = private
-  | Ffi_bs of params * return_wrapper * external_spec
-  | Ffi_obj_create of External_arg_spec.obj_params
-  | Ffi_inline_const of Lam_constant.t
-  | Ffi_normal
-(* When it's normal, it is handled as normal c functional ffi call *)
-
-(* val name_of_ffi : external_spec -> string *)
-
-val check_ffi : ?loc:Location.t -> external_spec -> bool
-
-val to_string : t -> string
-
-val from_string : string -> t
-(** Note *)
-
-val inline_string_primitive : string -> string option -> string list
-
-val inline_bool_primitive : bool -> string list
-
-val inline_int_primitive : int32 -> string list
-
-val inline_int64_primitive : int64 -> string list
-
-val inline_float_primitive : string -> string list
-
-val inline_bigint_primitive : string -> string list
-
-val ffi_bs : External_arg_spec.params -> return_wrapper -> external_spec -> t
-
-val ffi_bs_as_prims :
-  External_arg_spec.params -> return_wrapper -> external_spec -> string list
-
-val ffi_obj_create : External_arg_spec.obj_params -> t
-
-val ffi_obj_as_prims : External_arg_spec.obj_params -> string list
diff --git a/jscomp/frontend/lam_constant.ml b/jscomp/frontend/lam_constant.ml
deleted file mode 100644
index 7985af2..0000000
--- a/jscomp/frontend/lam_constant.ml
+++ /dev/null
@@ -1,112 +0,0 @@
-(* Copyright (C) 2018- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 constructor_tag = {
-  cstr_name: Ast_untagged_variants.tag;
-  const: int;
-  non_const: int;
-}
-
-type pointer_info =
-  | None
-  | Pt_constructor of constructor_tag
-  | Pt_assertfalse
-  | Some of string
-
-let string_of_pointer_info (x : pointer_info) : string option =
-  match x with
-  | Some name | Pt_constructor {cstr_name = {name}; _} -> Some name
-  | Pt_assertfalse -> Some "assert_false"
-  | None -> None
-
-type t =
-  | Const_js_null
-  | Const_js_undefined of {isUnit: bool}
-  | Const_js_true
-  | Const_js_false
-  | Const_int of {i: int32; comment: pointer_info}
-  | Const_char of int
-  | Const_string of {s: string; unicode: bool}
-  | Const_float of string
-  | Const_int64 of int64
-  | Const_bigint of bool * string
-  | Const_pointer of string
-  | Const_block of int * Lambda.tag_info * t list
-  | Const_float_array of string list
-  | Const_some of t
-  | Const_module_alias
-(* eventually we can remove it, since we know
-   [constant] is [undefined] or not
-*)
-
-let rec eq_approx (x : t) (y : t) =
-  match x with
-  | Const_module_alias -> y = Const_module_alias
-  | Const_js_null -> y = Const_js_null
-  | Const_js_undefined b -> y = Const_js_undefined b
-  | Const_js_true -> y = Const_js_true
-  | Const_js_false -> y = Const_js_false
-  | Const_int ix -> (
-    match y with
-    | Const_int iy -> ix.i = iy.i
-    | _ -> false)
-  | Const_char ix -> (
-    match y with
-    | Const_char iy -> ix = iy
-    | _ -> false)
-  | Const_string {s = sx; unicode = ux} -> (
-    match y with
-    | Const_string {s = sy; unicode = uy} -> sx = sy && ux = uy
-    | _ -> false)
-  | Const_float ix -> (
-    match y with
-    | Const_float iy -> ix = iy
-    | _ -> false)
-  | Const_int64 ix -> (
-    match y with
-    | Const_int64 iy -> ix = iy
-    | _ -> false)
-  | Const_bigint (sx, ix) -> (
-    match y with
-    | Const_bigint (sy, iy) -> sx = sy && ix = iy
-    | _ -> false)
-  | Const_pointer ix -> (
-    match y with
-    | Const_pointer iy -> ix = iy
-    | _ -> false)
-  | Const_block (ix, _, ixs) -> (
-    match y with
-    | Const_block (iy, _, iys) ->
-      ix = iy && Ext_list.for_all2_no_exn ixs iys eq_approx
-    | _ -> false)
-  | Const_float_array ixs -> (
-    match y with
-    | Const_float_array iys -> Ext_list.for_all2_no_exn ixs iys Ext_string.equal
-    | _ -> false)
-  | Const_some ix -> (
-    match y with
-    | Const_some iy -> eq_approx ix iy
-    | _ -> false)
-
-let lam_none : t = Const_js_undefined {isUnit = false}
diff --git a/jscomp/frontend/lam_constant.mli b/jscomp/frontend/lam_constant.mli
deleted file mode 100644
index 2514b1d..0000000
--- a/jscomp/frontend/lam_constant.mli
+++ /dev/null
@@ -1,61 +0,0 @@
-(* Copyright (C) 2018 - Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 constructor_tag = {
-  cstr_name: Ast_untagged_variants.tag;
-  const: int;
-  non_const: int;
-}
-
-type pointer_info =
-  | None
-  | Pt_constructor of constructor_tag
-  | Pt_assertfalse
-  | Some of string
-
-val string_of_pointer_info : pointer_info -> string option
-
-type t =
-  | Const_js_null
-  | Const_js_undefined of {isUnit: bool}
-  | Const_js_true
-  | Const_js_false
-  | Const_int of {i: int32; comment: pointer_info}
-  | Const_char of int
-  | Const_string of {s: string; unicode: bool}
-  | Const_float of string
-  | Const_int64 of int64
-  | Const_bigint of bool * string
-  | Const_pointer of string
-  | Const_block of int * Lambda.tag_info * t list
-  | Const_float_array of string list
-  | Const_some of t
-  (* eventually we can remove it, since we know
-     [constant] is [undefined] or not
-  *)
-  | Const_module_alias
-
-val eq_approx : t -> t -> bool
-
-val lam_none : t
diff --git a/jscomp/frontend/ppx_apply.ml b/jscomp/frontend/ppx_apply.ml
deleted file mode 100644
index 4a3570f..0000000
--- a/jscomp/frontend/ppx_apply.ml
+++ /dev/null
@@ -1,49 +0,0 @@
-(* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let apply_lazy ~source ~target
-    (impl : Parsetree.structure -> Parsetree.structure)
-    (iface : Parsetree.signature -> Parsetree.signature) =
-  let ic = open_in_bin source in
-  let magic =
-    really_input_string ic (String.length Config.ast_impl_magic_number)
-  in
-  if
-    magic <> Config.ast_impl_magic_number
-    && magic <> Config.ast_intf_magic_number
-  then failwith "Bs_ast_mapper: OCaml version mismatch or malformed input";
-  Location.set_input_name @@ input_value ic;
-  let ast = input_value ic in
-  close_in ic;
-
-  let ast =
-    if magic = Config.ast_impl_magic_number then
-      Obj.magic (impl (Obj.magic ast))
-    else Obj.magic (iface (Obj.magic ast))
-  in
-  let oc = open_out_bin target in
-  output_string oc magic;
-  output_value oc !Location.input_name;
-  output_value oc ast;
-  close_out oc
diff --git a/jscomp/frontend/ppx_driver.ml b/jscomp/frontend/ppx_driver.ml
deleted file mode 100644
index cb47900..0000000
--- a/jscomp/frontend/ppx_driver.ml
+++ /dev/null
@@ -1,56 +0,0 @@
-(* Copyright (C) 2019- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let usage = "Usage: [prog] [extra_args] <infile> <outfile>\n%!"
-
-let main impl intf =
-  try
-    let a = Sys.argv in
-    let n = Array.length a in
-    if n > 2 then (
-      Arg.parse_argv
-        (Array.sub Sys.argv 0 (n - 2))
-        [
-          ( "-bs-jsx",
-            Arg.Int
-              (fun i -> Js_config.jsx_version := Js_config.jsx_version_of_int i),
-            " Set jsx version" );
-          ( "-bs-jsx-module",
-            Arg.String
-              (fun i ->
-                Js_config.jsx_module := Js_config.jsx_module_of_string i),
-            " Set jsx module" );
-          ( "-bs-jsx-mode",
-            Arg.String
-              (fun i -> Js_config.jsx_mode := Js_config.jsx_mode_of_string i),
-            " Set jsx mode" );
-        ]
-        ignore usage;
-      Ppx_apply.apply_lazy ~source:a.(n - 2) ~target:a.(n - 1) impl intf)
-    else (
-      Printf.eprintf "%s" usage;
-      exit 2)
-  with exn ->
-    Location.report_exception Format.err_formatter exn;
-    exit 2
diff --git a/jscomp/frontend/ppx_driver.mli b/jscomp/frontend/ppx_driver.mli
deleted file mode 100644
index 03930a4..0000000
--- a/jscomp/frontend/ppx_driver.mli
+++ /dev/null
@@ -1,28 +0,0 @@
-(* Copyright (C) 2019- Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val main :
-  (Parsetree.structure -> Parsetree.structure) ->
-  (Parsetree.signature -> Parsetree.signature) ->
-  unit
diff --git a/jscomp/frontend/ppx_entry.ml b/jscomp/frontend/ppx_entry.ml
deleted file mode 100644
index 67d50bb..0000000
--- a/jscomp/frontend/ppx_entry.ml
+++ /dev/null
@@ -1,65 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let unsafe_mapper = Bs_builtin_ppx.mapper
-
-let rewrite_signature (ast : Parsetree.signature) : Parsetree.signature =
-  Bs_ast_invariant.iter_warnings_on_sigi ast;
-  Ast_config.process_sig ast;
-  let ast =
-    match !Js_config.jsx_version with
-    | None -> ast
-    | Some jsxVersion ->
-      let open Js_config in
-      let jsxVersion = int_of_jsx_version jsxVersion in
-      let jsxModule = string_of_jsx_module !jsx_module in
-      let jsxMode = string_of_jsx_mode !jsx_mode in
-      Jsx_ppx.rewrite_signature ~jsxVersion ~jsxModule ~jsxMode ast
-  in
-  if !Js_config.no_builtin_ppx then ast
-  else
-    let result = unsafe_mapper.signature unsafe_mapper ast in
-    (* Keep this check, since the check is not inexpensive*)
-    Bs_ast_invariant.emit_external_warnings_on_signature result;
-    result
-
-let rewrite_implementation (ast : Parsetree.structure) : Parsetree.structure =
-  Bs_ast_invariant.iter_warnings_on_stru ast;
-  Ast_config.process_str ast;
-  let ast =
-    match !Js_config.jsx_version with
-    | None -> ast
-    | Some jsxVersion ->
-      let open Js_config in
-      let jsxVersion = int_of_jsx_version jsxVersion in
-      let jsxModule = string_of_jsx_module !jsx_module in
-      let jsxMode = string_of_jsx_mode !jsx_mode in
-      Jsx_ppx.rewrite_implementation ~jsxVersion ~jsxModule ~jsxMode ast
-  in
-  if !Js_config.no_builtin_ppx then ast
-  else
-    let result = unsafe_mapper.structure unsafe_mapper ast in
-    (* Keep this check since it is not inexpensive*)
-    Bs_ast_invariant.emit_external_warnings_on_structure result;
-    result
diff --git a/jscomp/frontend/typemod_hide.ml b/jscomp/frontend/typemod_hide.ml
deleted file mode 100644
index 0dccdaa..0000000
--- a/jscomp/frontend/typemod_hide.ml
+++ /dev/null
@@ -1,58 +0,0 @@
-(* Copyright (C) 2020 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-let attrs : Parsetree.attributes =
-  [({txt = "internal.local"; loc = Location.none}, PStr [])]
-
-let no_type_defined (x : Parsetree.structure_item) =
-  match x.pstr_desc with
-  | Pstr_eval _ | Pstr_value _ | Pstr_primitive _ | Pstr_typext _
-  | Pstr_exception _
-  (* | Pstr_module {pmb_expr = {pmod_desc = Pmod_ident _} }  *) ->
-    true
-  | Pstr_include
-      {
-        pincl_mod =
-          {
-            pmod_desc =
-              Pmod_constraint
-                ( {pmod_desc = Pmod_structure [{pstr_desc = Pstr_primitive _}]},
-                  _ );
-          };
-      } ->
-    true
-  (* FIX #4881
-     generated code from:
-     {[
-       external %private x : int -> int =  "x"
-       [@@bs.module "./x"]
-     ]}
-  *)
-  | _ -> false
-
-let check (x : Parsetree.structure) =
-  Ext_list.iter x (fun x ->
-      if not (no_type_defined x) then
-        Location.raise_errorf ~loc:x.pstr_loc
-          "the structure is not supported in local extension")
diff --git a/jscomp/gentype/Annotation.ml b/jscomp/gentype/Annotation.ml
deleted file mode 100644
index 0bcb24e..0000000
--- a/jscomp/gentype/Annotation.ml
+++ /dev/null
@@ -1,298 +0,0 @@
-type import = {importPath: ImportPath.t}
-
-type attributePayload =
-  | BoolPayload of bool
-  | FloatPayload of string
-  | IdentPayload of Longident.t
-  | IntPayload of string
-  | StringPayload of string
-  | TuplePayload of attributePayload list
-  | UnrecognizedPayload
-
-type t = GenType | GenTypeOpaque | NoGenType
-
-let toString annotation =
-  match annotation with
-  | GenType -> "GenType"
-  | GenTypeOpaque -> "GenTypeOpaque"
-  | NoGenType -> "NoGenType"
-
-let tagIsGenType s = s = "genType" || s = "gentype"
-let tagIsGenTypeAs s = s = "genType.as" || s = "gentype.as"
-let tagIsAs s = s = "bs.as" || s = "as"
-let tagIsInt s = s = "bs.int" || s = "int"
-let tagIsString s = s = "bs.string" || s = "string"
-
-let tagIsTag s = s = "tag"
-
-let tagIsUnboxed s = s = "unboxed" || s = "ocaml.unboxed"
-let tagIsGenTypeImport s = s = "genType.import" || s = "gentype.import"
-let tagIsGenTypeOpaque s = s = "genType.opaque" || s = "gentype.opaque"
-
-let tagIsOneOfTheGenTypeAnnotations s =
-  tagIsGenType s || tagIsGenTypeAs s || tagIsGenTypeImport s
-  || tagIsGenTypeOpaque s
-
-let tagIsGenTypeIgnoreInterface s =
-  s = "genType.ignoreInterface" || s = "gentype.ignoreInterface"
-
-let tagIsDoc s =
-  match s with
-  | "ocaml.doc" | "res.doc" -> true
-  | _ -> false
-let tagIsInternLocal s = s = "internal.local"
-
-let rec getAttributePayload checkText (attributes : Typedtree.attributes) =
-  let rec fromExpr (expr : Parsetree.expression) =
-    match expr with
-    | {pexp_desc = Pexp_constant (Pconst_string (s, _))} ->
-      Some (StringPayload s)
-    | {pexp_desc = Pexp_constant (Pconst_integer (n, _))} -> Some (IntPayload n)
-    | {pexp_desc = Pexp_constant (Pconst_float (s, _))} -> Some (FloatPayload s)
-    | {
-     pexp_desc = Pexp_construct ({txt = Lident (("true" | "false") as s)}, _);
-     _;
-    } ->
-      Some (BoolPayload (s = "true"))
-    | {pexp_desc = Pexp_tuple exprs} ->
-      let payloads =
-        exprs |> List.rev
-        |> List.fold_left
-             (fun payloads expr ->
-               match expr |> fromExpr with
-               | Some payload -> payload :: payloads
-               | None -> payloads)
-             []
-      in
-      Some (TuplePayload payloads)
-    | {pexp_desc = Pexp_ident {txt}} -> Some (IdentPayload txt)
-    | _ -> None
-  in
-  match attributes with
-  | [] -> None
-  | ({txt; loc}, payload) :: _tl when checkText txt -> (
-    let payload =
-      match payload with
-      | PStr [] -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_eval (expr, _)} :: _) -> expr |> fromExpr
-      | PStr ({pstr_desc = Pstr_extension _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_value _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_primitive _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_type _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_typext _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_exception _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_module _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_recmodule _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_modtype _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_open _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_class _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_class_type _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_include _} :: _) -> Some UnrecognizedPayload
-      | PStr ({pstr_desc = Pstr_attribute _} :: _) -> Some UnrecognizedPayload
-      | PPat _ -> Some UnrecognizedPayload
-      | PSig _ -> Some UnrecognizedPayload
-      | PTyp _ -> Some UnrecognizedPayload
-    in
-    match payload with
-    | None -> None
-    | Some payload -> Some (loc, payload))
-  | _hd :: tl -> getAttributePayload checkText tl
-
-let getGenTypeAsRenaming attributes =
-  match attributes |> getAttributePayload tagIsGenTypeAs with
-  | Some (_, StringPayload s) -> Some s
-  | None -> (
-    match attributes |> getAttributePayload tagIsGenType with
-    | Some (_, StringPayload s) -> Some s
-    | _ -> None)
-  | _ -> None
-
-(* This is not supported anymore: only use to give a warning *)
-let checkUnsupportedGenTypeAsRenaming attributes =
-  let error ~loc =
-    Log_.Color.setup ();
-    Log_.info ~loc ~name:"Warning genType" (fun ppf () ->
-        Format.fprintf ppf
-          "@\n\
-           @genType.as is not supported anymore in type definitions. Use @as \
-           from the language.")
-  in
-  match attributes |> getAttributePayload tagIsGenTypeAs with
-  | Some (loc, _) -> error ~loc
-  | None -> (
-    match attributes |> getAttributePayload tagIsGenType with
-    | Some (loc, _) -> error ~loc
-    | None -> ())
-
-let getAsString attributes =
-  match attributes |> getAttributePayload tagIsAs with
-  | Some (_, StringPayload s) -> Some s
-  | _ -> None
-
-let getAsInt attributes =
-  match attributes |> getAttributePayload tagIsAs with
-  | Some (_, IntPayload s) -> (
-    try Some (int_of_string s) with Failure _ -> None)
-  | _ -> None
-
-let getAttributeImportRenaming attributes =
-  let attributeImport = attributes |> getAttributePayload tagIsGenTypeImport in
-  let genTypeAsRenaming = attributes |> getGenTypeAsRenaming in
-  match (attributeImport, genTypeAsRenaming) with
-  | Some (_, StringPayload importString), _ ->
-    (Some importString, genTypeAsRenaming)
-  | ( Some
-        ( _,
-          TuplePayload [StringPayload importString; StringPayload renameString]
-        ),
-      _ ) ->
-    (Some importString, Some renameString)
-  | _ -> (None, genTypeAsRenaming)
-
-let getTag attributes =
-  match attributes |> getAttributePayload tagIsTag with
-  | Some (_, StringPayload s) -> Some s
-  | _ -> None
-
-let getDocPayload attributes =
-  let docPayload = attributes |> getAttributePayload tagIsDoc in
-  match docPayload with
-  | Some (_, StringPayload docString) when docString <> "" -> Some docString
-  | _ -> None
-
-let docStringFromAttrs attributes = attributes |> getDocPayload
-
-let hasAttribute checkText (attributes : Typedtree.attributes) =
-  getAttributePayload checkText attributes <> None
-
-let fromAttributes ~(config : GenTypeConfig.t) ~loc
-    (attributes : Typedtree.attributes) =
-  let default = if config.everything then GenType else NoGenType in
-  if hasAttribute tagIsGenTypeOpaque attributes then GenTypeOpaque
-  else if hasAttribute (fun s -> tagIsGenType s || tagIsGenTypeAs s) attributes
-  then (
-    (match attributes |> getAttributePayload tagIsGenType with
-    | Some (_, UnrecognizedPayload) -> ()
-    | Some _ ->
-      Log_.Color.setup ();
-      Log_.info ~loc ~name:"Warning genType" (fun ppf () ->
-          Format.fprintf ppf "Annotation payload is ignored")
-    | _ -> ());
-    GenType)
-  else default
-
-let rec moduleTypeCheckAnnotation ~checkAnnotation
-    ({mty_desc} : Typedtree.module_type) =
-  match mty_desc with
-  | Tmty_signature signature ->
-    signature |> signatureCheckAnnotation ~checkAnnotation
-  | Tmty_ident _ | Tmty_functor _ | Tmty_with _ | Tmty_typeof _ | Tmty_alias _
-    ->
-    false
-
-and moduleTypeDeclarationCheckAnnotation ~checkAnnotation
-    ({mtd_type; mtd_attributes; mtd_loc = loc} :
-      Typedtree.module_type_declaration) =
-  mtd_attributes |> checkAnnotation ~loc
-  ||
-  match mtd_type with
-  | None -> false
-  | Some module_type ->
-    module_type |> moduleTypeCheckAnnotation ~checkAnnotation
-
-and moduleDeclarationCheckAnnotation ~checkAnnotation
-    ({md_attributes; md_type; md_loc = loc} : Typedtree.module_declaration) =
-  md_attributes |> checkAnnotation ~loc
-  || md_type |> moduleTypeCheckAnnotation ~checkAnnotation
-
-and signatureItemCheckAnnotation ~checkAnnotation
-    (signatureItem : Typedtree.signature_item) =
-  match signatureItem.sig_desc with
-  | Tsig_type (_, typeDeclarations) ->
-    typeDeclarations
-    |> List.exists
-         (fun ({typ_attributes; typ_loc = loc} : Typedtree.type_declaration) ->
-           typ_attributes |> checkAnnotation ~loc)
-  | Tsig_value {val_attributes; val_loc = loc} ->
-    val_attributes |> checkAnnotation ~loc
-  | Tsig_module moduleDeclaration ->
-    moduleDeclaration |> moduleDeclarationCheckAnnotation ~checkAnnotation
-  | Tsig_attribute attribute ->
-    [attribute] |> checkAnnotation ~loc:signatureItem.sig_loc
-  | Tsig_modtype moduleTypeDeclaration ->
-    moduleTypeDeclaration
-    |> moduleTypeDeclarationCheckAnnotation ~checkAnnotation
-  | Tsig_typext _ | Tsig_exception _ | Tsig_recmodule _ | Tsig_open _
-  | Tsig_include _ | Tsig_class _ | Tsig_class_type _ ->
-    false
-
-and signatureCheckAnnotation ~checkAnnotation (signature : Typedtree.signature)
-    =
-  signature.sig_items
-  |> List.exists (signatureItemCheckAnnotation ~checkAnnotation)
-
-let rec structureItemCheckAnnotation ~checkAnnotation
-    (structureItem : Typedtree.structure_item) =
-  match structureItem.str_desc with
-  | Tstr_type (_, typeDeclarations) ->
-    typeDeclarations
-    |> List.exists
-         (fun ({typ_attributes; typ_loc = loc} : Typedtree.type_declaration) ->
-           typ_attributes |> checkAnnotation ~loc)
-  | Tstr_value (_loc, valueBindings) ->
-    valueBindings
-    |> List.exists
-         (fun ({vb_attributes; vb_loc = loc} : Typedtree.value_binding) ->
-           vb_attributes |> checkAnnotation ~loc)
-  | Tstr_primitive {val_attributes; val_loc = loc} ->
-    val_attributes |> checkAnnotation ~loc
-  | Tstr_module moduleBinding ->
-    moduleBinding |> moduleBindingCheckAnnotation ~checkAnnotation
-  | Tstr_recmodule moduleBindings ->
-    moduleBindings
-    |> List.exists (moduleBindingCheckAnnotation ~checkAnnotation)
-  | Tstr_include {incl_attributes; incl_mod; incl_loc = loc} ->
-    incl_attributes |> checkAnnotation ~loc
-    || incl_mod |> moduleExprCheckAnnotation ~checkAnnotation
-  | Tstr_modtype moduleTypeDeclaration ->
-    moduleTypeDeclaration
-    |> moduleTypeDeclarationCheckAnnotation ~checkAnnotation
-  | Tstr_attribute attribute ->
-    [attribute] |> checkAnnotation ~loc:structureItem.str_loc
-  | Tstr_eval _ | Tstr_typext _ | Tstr_exception _ | Tstr_open _ | Tstr_class _
-  | Tstr_class_type _ ->
-    false
-
-and moduleExprCheckAnnotation ~checkAnnotation
-    (moduleExpr : Typedtree.module_expr) =
-  match moduleExpr.mod_desc with
-  | Tmod_structure structure ->
-    structure |> structureCheckAnnotation ~checkAnnotation
-  | Tmod_constraint
-      (moduleExpr, _moduleType, moduleTypeConstraint, _moduleCoercion) -> (
-    moduleExpr |> moduleExprCheckAnnotation ~checkAnnotation
-    ||
-    match moduleTypeConstraint with
-    | Tmodtype_explicit moduleType ->
-      moduleType |> moduleTypeCheckAnnotation ~checkAnnotation
-    | Tmodtype_implicit -> false)
-  | Tmod_ident _ | Tmod_functor _ | Tmod_apply _ | Tmod_unpack _ -> false
-
-and moduleBindingCheckAnnotation ~checkAnnotation
-    ({mb_expr; mb_attributes; mb_loc = loc} : Typedtree.module_binding) =
-  mb_attributes |> checkAnnotation ~loc
-  || mb_expr |> moduleExprCheckAnnotation ~checkAnnotation
-
-and structureCheckAnnotation ~checkAnnotation (structure : Typedtree.structure)
-    =
-  structure.str_items
-  |> List.exists (structureItemCheckAnnotation ~checkAnnotation)
-
-let importFromString importString : import =
-  let importPath = ImportPath.fromStringUnsafe importString in
-  {importPath}
-
-let updateConfigForModule ~(config : GenTypeConfig.t) attributes =
-  if attributes |> hasAttribute tagIsGenType then
-    {config with everything = true}
-  else config
diff --git a/jscomp/gentype/CodeItem.ml b/jscomp/gentype/CodeItem.ml
deleted file mode 100644
index 176fa03..0000000
--- a/jscomp/gentype/CodeItem.ml
+++ /dev/null
@@ -1,58 +0,0 @@
-open GenTypeCommon
-
-type exportType = {
-  loc: Location.t;
-  nameAs: string option;
-  opaque: bool option;
-  type_: type_;
-  typeVars: string list;
-  resolvedTypeName: ResolvedName.t;
-  docString: DocString.t;
-}
-
-type importValue = {
-  asPath: string;
-  importAnnotation: Annotation.import;
-  type_: type_;
-  valueName: string;
-}
-
-type exportValue = {
-  docString: DocString.t;
-  moduleAccessPath: Runtime.moduleAccessPath;
-  originalName: string;
-  resolvedName: ResolvedName.t;
-  type_: type_;
-}
-
-type exportFromTypeDeclaration = {
-  exportType: exportType;
-  annotation: Annotation.t;
-}
-
-type importType = {
-  typeName: string;
-  asTypeName: string option;
-  importPath: ImportPath.t;
-}
-
-type exportTypeItem = {
-  typeVars: string list;
-  type_: type_;
-  annotation: Annotation.t;
-}
-
-type exportTypeMap = exportTypeItem StringMap.t
-
-type typeDeclaration = {
-  exportFromTypeDeclaration: exportFromTypeDeclaration;
-  importTypes: importType list;
-}
-
-type t = ExportValue of exportValue | ImportValue of importValue
-
-type translation = {
-  importTypes: importType list;
-  codeItems: t list;
-  typeDeclarations: typeDeclaration list;
-}
diff --git a/jscomp/gentype/Converter.ml b/jscomp/gentype/Converter.ml
deleted file mode 100644
index 297da01..0000000
--- a/jscomp/gentype/Converter.ml
+++ /dev/null
@@ -1,84 +0,0 @@
-open GenTypeCommon
-
-let typeGetInlined ~config ~lookupId ~typeNameIsInterface type0 =
-  let circular = ref "" in
-  let rec visit ~(visited : StringSet.t) type_ =
-    let normalized_ = type_ in
-    match type_ with
-    | Array (t, mutable_) ->
-      let tNormalized = t |> visit ~visited in
-      Array (tNormalized, mutable_)
-    | Dict _ -> normalized_
-    | Function ({argTypes; retType} as function_) ->
-      let argConverted = argTypes |> List.map (argTypeToGroupedArg ~visited) in
-      let retNormalized = retType |> visit ~visited in
-      Function {function_ with argTypes = argConverted; retType = retNormalized}
-    | Ident {builtin = true} -> normalized_
-    | Ident {builtin = false; name; typeArgs} -> (
-      if visited |> StringSet.mem name then (
-        circular := name;
-        normalized_)
-      else
-        let visited = visited |> StringSet.add name in
-        match name |> lookupId with
-        | {CodeItem.annotation = GenTypeOpaque} -> normalized_
-        | {annotation = NoGenType} -> normalized_
-        | {typeVars; type_} ->
-          let pairs =
-            try List.combine typeVars typeArgs with Invalid_argument _ -> []
-          in
-          let f typeVar =
-            match
-              pairs |> List.find (fun (typeVar1, _) -> typeVar = typeVar1)
-            with
-            | _, typeArgument -> Some typeArgument
-            | exception Not_found -> None
-          in
-          let inlined = type_ |> TypeVars.substitute ~f |> visit ~visited in
-          inlined
-        | exception Not_found ->
-          let typeArgs = typeArgs |> List.map (fun t -> t |> visit ~visited) in
-          Ident {builtin = false; name; typeArgs})
-    | Null t ->
-      let tNormalized = t |> visit ~visited in
-      Null tNormalized
-    | Nullable t ->
-      let tNormalized = t |> visit ~visited in
-      Nullable tNormalized
-    | Object _ -> normalized_
-    | Option t ->
-      let tNormalized = t |> visit ~visited in
-      Option tNormalized
-    | Promise t ->
-      let tNormalized = t |> visit ~visited in
-      Promise tNormalized
-    | Tuple innerTypes ->
-      let normalizedList = innerTypes |> List.map (visit ~visited) in
-      Tuple normalizedList
-    | TypeVar _ -> normalized_
-    | Variant variant ->
-      let ordinaryVariant = not variant.polymorphic in
-      let withPayloadConverted =
-        variant.payloads
-        |> List.map (fun (payload : payload) ->
-               {payload with t = payload.t |> visit ~visited})
-      in
-      let normalized =
-        match withPayloadConverted with
-        | [] when ordinaryVariant -> normalized_
-        | [payload] when ordinaryVariant ->
-          let normalized = Variant {variant with payloads = [payload]} in
-          normalized
-        | withPayloadConverted ->
-          Variant {variant with payloads = withPayloadConverted}
-      in
-      normalized
-  and argTypeToGroupedArg ~visited {aName; aType} =
-    let tNormalized = aType |> visit ~visited in
-    {aName; aType = tNormalized}
-  in
-  let normalized = type0 |> visit ~visited:StringSet.empty in
-  if !Debug.converter then
-    Log_.item "type0:%s \n"
-      (type0 |> EmitType.typeToString ~config ~typeNameIsInterface);
-  normalized
diff --git a/jscomp/gentype/Debug.ml b/jscomp/gentype/Debug.ml
deleted file mode 100644
index b29c257..0000000
--- a/jscomp/gentype/Debug.ml
+++ /dev/null
@@ -1,42 +0,0 @@
-let basic = ref false
-let codeItems = ref false
-let config = ref false
-let converter = ref false
-let dependencies = ref false
-let moduleResolution = ref false
-let notImplemented = ref false
-let translation = ref false
-let typeEnv = ref false
-let typeResolution = ref false
-
-let setAll () =
-  basic := true;
-  codeItems := true;
-  config := true;
-  converter := true;
-  dependencies := true;
-  moduleResolution := true;
-  notImplemented := true;
-  translation := true;
-  typeEnv := true;
-  typeResolution := true
-
-let setItem debugItem debugValue =
-  let isOn =
-    match debugValue with
-    | Ext_json_types.True _ -> true
-    | _ -> false
-  in
-  match debugItem with
-  | "all" when isOn -> setAll ()
-  | "basic" -> basic := isOn
-  | "codeItems" -> codeItems := isOn
-  | "config" -> config := isOn
-  | "converter" -> converter := isOn
-  | "dependencies" -> dependencies := isOn
-  | "moduleResolution" -> moduleResolution := isOn
-  | "notImplemented" -> notImplemented := isOn
-  | "translation" -> translation := isOn
-  | "typeEnv" -> typeEnv := isOn
-  | "typeResolution" -> typeResolution := isOn
-  | _ -> ()
diff --git a/jscomp/gentype/Dependencies.ml b/jscomp/gentype/Dependencies.ml
deleted file mode 100644
index 889d0f4..0000000
--- a/jscomp/gentype/Dependencies.ml
+++ /dev/null
@@ -1,69 +0,0 @@
-open GenTypeCommon
-
-let rec handleNamespace ~name dep =
-  match dep with
-  | External _ | Internal _ -> dep
-  | Dot (External s, moduleName) when s = name -> External moduleName
-  | Dot (dep1, s) -> Dot (dep1 |> handleNamespace ~name, s)
-
-let rec fromPath1 ~config ~typeEnv (path : Path.t) =
-  match path with
-  | Pident id -> (
-    let name = id |> Ident.name in
-    match typeEnv |> TypeEnv.lookup ~name with
-    | None -> (typeEnv, External name)
-    | Some typeEnv1 -> (
-      let typeEnv2 =
-        match typeEnv |> TypeEnv.getModule ~name with
-        | Some typeEnv2 -> typeEnv2
-        | None -> typeEnv1
-      in
-      match typeEnv1 |> TypeEnv.expandAliasToExternalModule ~name with
-      | Some dep -> (typeEnv2, dep)
-      | None ->
-        let resolvedName = name |> TypeEnv.addModulePath ~typeEnv:typeEnv1 in
-        (typeEnv2, Internal resolvedName)))
-  | Pdot (Pident id, s, _pos) when id |> ScopedPackage.isGeneratedModule ~config
-    ->
-    ( typeEnv,
-      External (s |> ScopedPackage.addGeneratedModule ~generatedModule:id) )
-  | Pdot (p, s, _pos) -> (
-    let typeEnvFromP, dep = p |> fromPath1 ~config ~typeEnv in
-    match typeEnvFromP |> TypeEnv.expandAliasToExternalModule ~name:s with
-    | Some dep -> (typeEnvFromP, dep)
-    | None -> (typeEnvFromP, Dot (dep, s)))
-  | Papply _ ->
-    ( typeEnv,
-      Internal ("__Papply_unsupported_genType__" |> ResolvedName.fromString) )
-
-let rec isInternal dep =
-  match dep with
-  | External _ -> false
-  | Internal _ -> true
-  | Dot (d, _) -> d |> isInternal
-
-let fromPath ~config ~typeEnv path =
-  let _, dep = path |> fromPath1 ~config ~typeEnv in
-  if !Debug.typeResolution then
-    Log_.item "fromPath path:%s typeEnv:%s %s resolved:%s\n" (path |> Path.name)
-      (typeEnv |> TypeEnv.toString)
-      (match dep |> isInternal with
-      | true -> "Internal"
-      | false -> "External")
-      (dep |> depToString);
-  match config.namespace with
-  | None -> dep
-  | Some name -> dep |> handleNamespace ~name
-
-let rec getOuterModuleName dep =
-  match dep with
-  | External name -> name |> ModuleName.fromStringUnsafe
-  | Internal resolvedName ->
-    resolvedName |> ResolvedName.toString |> ModuleName.fromStringUnsafe
-  | Dot (dep1, _) -> dep1 |> getOuterModuleName
-
-let rec removeExternalOuterModule dep =
-  match dep with
-  | External _ | Internal _ -> dep
-  | Dot (External _, s) -> External s
-  | Dot (dep1, s) -> Dot (dep1 |> removeExternalOuterModule, s)
diff --git a/jscomp/gentype/EmitJs.ml b/jscomp/gentype/EmitJs.ml
deleted file mode 100644
index ec289ba..0000000
--- a/jscomp/gentype/EmitJs.ml
+++ /dev/null
@@ -1,680 +0,0 @@
-open GenTypeCommon
-
-type env = {
-  requiresEarly: ImportPath.t Config.ModuleNameMap.t;
-  requires: ImportPath.t Config.ModuleNameMap.t;
-      (**  For each .cmt we import types from, keep the map of exported types *)
-  cmtToExportTypeMap: CodeItem.exportTypeMap StringMap.t;
-      (**  Map of types imported from other files *)
-  exportTypeMapFromOtherFiles: CodeItem.exportTypeMap;
-  importedValueOrComponent: bool;
-}
-
-let requireModule ~import ~env ~importPath moduleName =
-  let requires =
-    match import with
-    | true -> env.requiresEarly
-    | false -> env.requires
-  in
-  let requiresNew =
-    requires |> Config.ModuleNameMap.add moduleName importPath
-  in
-  match import with
-  | true -> {env with requiresEarly = requiresNew}
-  | false -> {env with requires = requiresNew}
-
-let createExportTypeMap ~config ~file ~fromCmtReadRecursively
-    (typeDeclarations : CodeItem.typeDeclaration list) : CodeItem.exportTypeMap
-    =
-  if !Debug.codeItems then Log_.item "Create Type Map for %s\n" file;
-  let updateExportTypeMap (exportTypeMap : CodeItem.exportTypeMap)
-      (typeDeclaration : CodeItem.typeDeclaration) : CodeItem.exportTypeMap =
-    let addExportType ~annotation
-        ({resolvedTypeName; type_; typeVars} : CodeItem.exportType) =
-      let annotation =
-        match annotation with
-        | Annotation.NoGenType when fromCmtReadRecursively -> Annotation.GenType
-        | _ -> annotation
-      in
-      if !Debug.codeItems then
-        Log_.item "Type Map: %s%s%s\n"
-          (resolvedTypeName |> ResolvedName.toString)
-          (match typeVars = [] with
-          | true -> ""
-          | false -> "(" ^ (typeVars |> String.concat ",") ^ ")")
-          (" "
-          ^ (annotation |> Annotation.toString |> EmitText.comment)
-          ^ " = "
-          ^ (type_
-            |> EmitType.typeToString ~config ~typeNameIsInterface:(fun _ ->
-                   false)));
-      exportTypeMap
-      |> StringMap.add
-           (resolvedTypeName |> ResolvedName.toString)
-           {CodeItem.typeVars; type_; annotation}
-    in
-    match typeDeclaration.exportFromTypeDeclaration with
-    | {exportType; annotation} -> exportType |> addExportType ~annotation
-  in
-  typeDeclarations |> List.fold_left updateExportTypeMap StringMap.empty
-
-let codeItemToString ~config ~typeNameIsInterface (codeItem : CodeItem.t) =
-  match codeItem with
-  | ExportValue {resolvedName; type_} ->
-    "ExportValue" ^ " resolvedName:"
-    ^ ResolvedName.toString resolvedName
-    ^ " type:"
-    ^ EmitType.typeToString ~config ~typeNameIsInterface type_
-  | ImportValue {importAnnotation} ->
-    "ImportValue " ^ (importAnnotation.importPath |> ImportPath.dump)
-
-let emitExportType ~emitters ~config ~typeNameIsInterface
-    {CodeItem.loc; nameAs; opaque; type_; typeVars; resolvedTypeName; docString}
-    =
-  let freeTypeVars = TypeVars.free type_ in
-  let isGADT =
-    freeTypeVars |> List.exists (fun s -> not (List.mem s typeVars))
-  in
-  let opaque =
-    match opaque with
-    | Some true -> opaque
-    | _ when isGADT ->
-      Log_.Color.setup ();
-      Log_.info ~loc ~name:"Warning genType" (fun ppf () ->
-          Format.fprintf ppf
-            "GADT types are not supported: exporting %s as opaque type"
-            (resolvedTypeName |> ResolvedName.toString));
-      Some true
-    | _ -> opaque
-  in
-  let opaque =
-    match opaque with
-    | Some opaque -> opaque
-    | None -> false
-  in
-  resolvedTypeName |> ResolvedName.toString
-  |> EmitType.emitExportType ~config ~emitters ~nameAs ~opaque ~type_
-       ~typeNameIsInterface ~typeVars ~docString
-
-let typeNameIsInterface ~(exportTypeMap : CodeItem.exportTypeMap)
-    ~(exportTypeMapFromOtherFiles : CodeItem.exportTypeMap) typeName =
-  let typeIsInterface type_ =
-    match type_ with
-    | Object _ -> true
-    | _ -> false
-  in
-  match exportTypeMap |> StringMap.find typeName with
-  | {type_} -> type_ |> typeIsInterface
-  | exception Not_found -> (
-    match exportTypeMapFromOtherFiles |> StringMap.find typeName with
-    | {type_} -> type_ |> typeIsInterface
-    | exception Not_found -> false)
-
-let emitExportFromTypeDeclaration ~config ~emitters ~env ~typeNameIsInterface
-    (exportFromTypeDeclaration : CodeItem.exportFromTypeDeclaration) =
-  ( env,
-    exportFromTypeDeclaration.exportType
-    |> emitExportType ~emitters ~config ~typeNameIsInterface )
-
-let emitExportFromTypeDeclarations ~config ~emitters ~env ~typeNameIsInterface
-    exportFromTypeDeclarations =
-  exportFromTypeDeclarations
-  |> List.fold_left
-       (fun (env, emitters) ->
-         emitExportFromTypeDeclaration ~config ~emitters ~env
-           ~typeNameIsInterface)
-       (env, emitters)
-
-let emitCodeItem ~config ~emitters ~moduleItemsEmitter ~env ~fileName
-    ~outputFileRelative ~resolver ~inlineOneLevel ~typeNameIsInterface codeItem
-    =
-  if !Debug.codeItems then
-    Log_.item "Code Item: %s\n"
-      (codeItem |> codeItemToString ~config ~typeNameIsInterface);
-  match codeItem with
-  | ImportValue {asPath; importAnnotation; type_; valueName} ->
-    let importPath = importAnnotation.importPath in
-    let firstNameInPath, restOfPath =
-      match valueName = asPath with
-      | true -> (valueName, "")
-      | false -> (
-        match asPath |> String.split_on_char '.' with
-        | x :: y -> (x, "" :: y |> String.concat ".")
-        | _ -> (asPath, ""))
-    in
-    let emitters, importedAsName, env =
-      (* emit an import {... as ...} immediately *)
-      let valueNameNotChecked = valueName ^ "NotChecked" in
-      let emitters =
-        importPath
-        |> EmitType.emitImportValueAsEarly ~emitters ~name:firstNameInPath
-             ~nameAs:(Some valueNameNotChecked)
-      in
-      (emitters, valueNameNotChecked, env)
-    in
-    let type_ =
-      match type_ with
-      | Function
-          ({argTypes = [{aType = Object (closedFlag, fields); aName}]; retType}
-           as function_)
-        when retType |> EmitType.isTypeFunctionComponent ~fields ->
-        (* JSX V3 *)
-        let fields =
-          fields
-          |> List.map (fun (field : field) ->
-                 match
-                   field.nameJS = "children"
-                   && field.type_ |> EmitType.isTypeReactElement
-                 with
-                 | true -> {field with type_ = EmitType.typeReactChild}
-                 | false -> field)
-        in
-        let function_ =
-          {
-            function_ with
-            argTypes = [{aType = Object (closedFlag, fields); aName}];
-          }
-        in
-        Function function_
-      | Function
-          ({argTypes = [{aType = Ident {name} as propsType; aName}]; retType} as
-           function_)
-        when Filename.check_suffix name "props"
-             && retType |> EmitType.isTypeFunctionComponent ~fields:[] -> (
-        match inlineOneLevel propsType with
-        | Object (closedFlags, fields) ->
-          (* JSX V3 *)
-          let fields =
-            Ext_list.filter_map fields (fun (field : field) ->
-                match field.nameJS with
-                | "children" when field.type_ |> EmitType.isTypeReactElement ->
-                  Some {field with type_ = EmitType.typeReactChild}
-                | "key" ->
-                  (* Filter out key, which is added to the props type definition in V4 *)
-                  None
-                | _ -> Some field)
-          in
-          let function_ =
-            {
-              function_ with
-              argTypes = [{aType = Object (closedFlags, fields); aName}];
-            }
-          in
-          Function function_
-        | _ -> type_)
-      | _ -> type_
-    in
-    let valueNameTypeChecked = valueName ^ "TypeChecked" in
-    let emitters =
-      importedAsName ^ restOfPath
-      |> EmitType.emitExportConst ~config
-           ~comment:
-             ("In case of type error, check the type of '" ^ valueName
-            ^ "' in '"
-             ^ (fileName |> ModuleName.toString)
-             ^ ".res'" ^ " and '"
-             ^ (importPath |> ImportPath.emit)
-             ^ "'.")
-           ~early:true ~emitters ~name:valueNameTypeChecked ~type_
-           ~typeNameIsInterface
-    in
-    let valueNameNotDefault =
-      match valueName = "default" with
-      | true -> Runtime.default
-      | false -> valueName
-    in
-    let emitters =
-      valueNameTypeChecked
-      |> EmitType.emitTypeCast ~config ~type_ ~typeNameIsInterface
-      |> EmitType.emitExportConst
-           ~comment:
-             ("Export '" ^ valueNameNotDefault
-            ^ "' early to allow circular import from the '.bs.js' file.")
-           ~config ~early:true ~emitters ~name:valueNameNotDefault
-           ~type_:unknown ~typeNameIsInterface
-    in
-    let emitters =
-      match valueName = "default" with
-      | true -> EmitType.emitExportDefault ~emitters valueNameNotDefault
-      | false -> emitters
-    in
-    ({env with importedValueOrComponent = true}, emitters)
-  | ExportValue {docString; moduleAccessPath; originalName; resolvedName; type_}
-    ->
-    let resolvedNameStr = ResolvedName.toString resolvedName in
-    let importPath =
-      fileName
-      |> ModuleResolver.resolveModule ~config ~importExtension:config.suffix
-           ~outputFileRelative ~resolver ~useBsDependencies:false
-    in
-    let fileNameJs = fileName |> ModuleName.forJsFile in
-    let envWithRequires =
-      fileNameJs |> requireModule ~import:false ~env ~importPath
-    in
-    let default = "default" in
-    let make = "make" in
-    let name =
-      match originalName = default with
-      | true -> Runtime.default
-      | false -> resolvedNameStr
-    in
-    let module HookType = struct
-      type t = {
-        propsType: type_;
-        resolvedTypeName: ResolvedName.t;
-        typeVars: string list;
-      }
-    end in
-    let type_, hookType =
-      match type_ with
-      | Function
-          ({
-             argTypes = [{aType = Object (closedFlags, fields)}];
-             retType;
-             typeVars;
-           } as function_)
-        when retType |> EmitType.isTypeFunctionComponent ~fields ->
-        (* JSX V3 *)
-        let propsType =
-          let fields =
-            fields
-            |> List.map (fun (field : field) ->
-                   match
-                     field.nameJS = "children"
-                     && field.type_ |> EmitType.isTypeReactElement
-                   with
-                   | true -> {field with type_ = EmitType.typeReactChild}
-                   | false -> field)
-          in
-          Object (closedFlags, fields)
-        in
-        let function_ =
-          {function_ with argTypes = [{aName = ""; aType = propsType}]}
-        in
-        let resolvedTypeName =
-          if
-            (not config.emitTypePropDone)
-            && (originalName = default || originalName = make)
-          then (
-            config.emitTypePropDone <- true;
-            ResolvedName.fromString "Props")
-          else ResolvedName.fromString name |> ResolvedName.dot "Props"
-        in
-        ( Function function_,
-          Some {HookType.propsType; resolvedTypeName; typeVars} )
-      | Function
-          ({argTypes = [{aType = Ident {name} as propsType}]; retType} as
-           function_)
-        when Filename.check_suffix name "props"
-             && retType |> EmitType.isTypeFunctionComponent ~fields:[] ->
-        let compType =
-          match inlineOneLevel propsType with
-          | Object (closedFlags, fields) ->
-            (* JSX V4 *)
-            let propsType =
-              let fields =
-                Ext_list.filter_map fields (fun (field : field) ->
-                    match field.nameJS with
-                    | "children" when field.type_ |> EmitType.isTypeReactElement
-                      ->
-                      Some {field with type_ = EmitType.typeReactChild}
-                    | "key" ->
-                      (* Filter out key, which is added to the props type definition in V4 *)
-                      None
-                    | _ -> Some field)
-              in
-              Object (closedFlags, fields)
-            in
-            let function_ =
-              {function_ with argTypes = [{aName = ""; aType = propsType}]}
-            in
-            Function function_
-          | _ -> type_
-        in
-        (compType, None)
-      | _ -> (type_, None)
-    in
-
-    resolvedName
-    |> ExportModule.extendExportModules ~docString ~moduleItemsEmitter ~type_;
-    let emitters =
-      match hookType with
-      | Some {propsType; resolvedTypeName; typeVars} ->
-        let exportType =
-          ({
-             loc = Location.none;
-             nameAs = None;
-             opaque = Some false;
-             type_ = propsType;
-             typeVars;
-             resolvedTypeName;
-             docString;
-           }
-            : CodeItem.exportType)
-        in
-        (* For doc gen (https://github.com/cristianoc/genType/issues/342) *)
-        config.emitImportReact <- true;
-        emitExportType ~emitters ~config ~typeNameIsInterface exportType
-      | _ -> emitters
-    in
-    let emitters =
-      (fileNameJs |> ModuleName.toString)
-      ^ "."
-      ^ (moduleAccessPath |> Runtime.emitModuleAccessPath ~config)
-      |> EmitType.emitExportConst ~config ~docString ~early:false ~emitters
-           ~name ~type_ ~typeNameIsInterface
-    in
-    let emitters =
-      match originalName = default with
-      | true -> EmitType.emitExportDefault ~emitters Runtime.default
-      | false -> emitters
-    in
-    (envWithRequires, emitters)
-
-let emitCodeItems ~config ~outputFileRelative ~emitters ~moduleItemsEmitter ~env
-    ~fileName ~resolver ~typeNameIsInterface ~inlineOneLevel codeItems =
-  codeItems
-  |> List.fold_left
-       (fun (env, emitters) ->
-         emitCodeItem ~config ~emitters ~moduleItemsEmitter ~env ~fileName
-           ~outputFileRelative ~resolver ~inlineOneLevel ~typeNameIsInterface)
-       (env, emitters)
-
-let emitRequires ~importedValueOrComponent ~early ~config ~requires emitters =
-  Config.ModuleNameMap.fold
-    (fun moduleName importPath emitters ->
-      importPath
-      |> EmitType.emitRequire ~importedValueOrComponent ~early ~emitters ~config
-           ~moduleName)
-    requires emitters
-
-let typeGetInlined ~config ~exportTypeMap type_ =
-  type_
-  |> Converter.typeGetInlined ~config
-       ~lookupId:(fun s -> exportTypeMap |> StringMap.find s)
-       ~typeNameIsInterface:(fun _ -> false)
-
-(** Read the cmt file referenced in an import type,
-   and recursively for the import types obtained from reading the cmt file. *)
-let rec readCmtFilesRecursively ~config ~env ~inputCmtTranslateTypeDeclarations
-    ~outputFileRelative ~resolver {CodeItem.typeName; asTypeName; importPath} =
-  let updateTypeMapFromOtherFiles ~asType ~exportTypeMapFromCmt env =
-    match exportTypeMapFromCmt |> StringMap.find typeName with
-    | (exportTypeItem : CodeItem.exportTypeItem) ->
-      let type_ =
-        exportTypeItem.type_
-        |> typeGetInlined ~config ~exportTypeMap:exportTypeMapFromCmt
-      in
-      {
-        env with
-        exportTypeMapFromOtherFiles =
-          env.exportTypeMapFromOtherFiles
-          |> StringMap.add asType {exportTypeItem with type_};
-      }
-    | exception Not_found -> env
-  in
-  let cmtFile =
-    importPath
-    |> ImportPath.toCmt ~config ~outputFileRelative
-    |> Paths.getCmtFile
-  in
-  match asTypeName with
-  | Some asType when cmtFile <> "" -> (
-    match env.cmtToExportTypeMap |> StringMap.find cmtFile with
-    | exportTypeMapFromCmt ->
-      env |> updateTypeMapFromOtherFiles ~asType ~exportTypeMapFromCmt
-    | exception Not_found ->
-      (* cmt file not read before: this ensures termination  *)
-      let typeDeclarations =
-        Cmt_format.read_cmt cmtFile
-        |> inputCmtTranslateTypeDeclarations ~config ~outputFileRelative
-             ~resolver
-        |> fun (x : CodeItem.translation) -> x.typeDeclarations
-      in
-      let exportTypeMapFromCmt =
-        typeDeclarations
-        |> createExportTypeMap ~config ~fromCmtReadRecursively:true
-             ~file:
-               (cmtFile |> Filename.basename
-              |> (Filename.chop_extension [@doesNotRaise]))
-      in
-      let cmtToExportTypeMap =
-        env.cmtToExportTypeMap |> StringMap.add cmtFile exportTypeMapFromCmt
-      in
-      let env =
-        {env with cmtToExportTypeMap}
-        |> updateTypeMapFromOtherFiles ~asType ~exportTypeMapFromCmt
-      in
-      let newImportTypes =
-        typeDeclarations
-        |> List.map (fun (typeDeclaration : CodeItem.typeDeclaration) ->
-               typeDeclaration.importTypes)
-        |> List.concat
-      in
-      newImportTypes
-      |> List.fold_left
-           (fun env newImportType ->
-             newImportType
-             |> readCmtFilesRecursively ~config ~env
-                  ~inputCmtTranslateTypeDeclarations ~outputFileRelative
-                  ~resolver)
-           env)
-  | _ -> env
-
-let emitImportType ~config ~emitters ~env ~inputCmtTranslateTypeDeclarations
-    ~outputFileRelative ~resolver ~typeNameIsInterface
-    ({CodeItem.typeName; asTypeName; importPath} as importType) =
-  let env =
-    importType
-    |> readCmtFilesRecursively ~config ~env ~inputCmtTranslateTypeDeclarations
-         ~outputFileRelative ~resolver
-  in
-  let emitters =
-    EmitType.emitImportTypeAs ~emitters ~config ~typeName ~asTypeName
-      ~typeNameIsInterface:(typeNameIsInterface ~env) ~importPath
-  in
-  (env, emitters)
-
-let emitImportTypes ~config ~emitters ~env ~inputCmtTranslateTypeDeclarations
-    ~outputFileRelative ~resolver ~typeNameIsInterface importTypes =
-  importTypes
-  |> List.fold_left
-       (fun (env, emitters) ->
-         emitImportType ~config ~emitters ~env
-           ~inputCmtTranslateTypeDeclarations ~outputFileRelative ~resolver
-           ~typeNameIsInterface)
-       (env, emitters)
-
-let getAnnotatedTypedDeclarations ~annotatedSet typeDeclarations =
-  typeDeclarations
-  |> List.map (fun typeDeclaration ->
-         let nameInAnnotatedSet =
-           annotatedSet
-           |> StringSet.mem
-                (typeDeclaration.CodeItem.exportFromTypeDeclaration.exportType
-                   .resolvedTypeName |> ResolvedName.toString)
-         in
-         if nameInAnnotatedSet then
-           {
-             typeDeclaration with
-             exportFromTypeDeclaration =
-               {
-                 typeDeclaration.exportFromTypeDeclaration with
-                 annotation = GenType;
-               };
-           }
-         else typeDeclaration)
-  |> List.filter
-       (fun
-         ({exportFromTypeDeclaration = {annotation}} : CodeItem.typeDeclaration)
-       -> annotation <> NoGenType)
-
-let propagateAnnotationToSubTypes ~codeItems (typeMap : CodeItem.exportTypeMap)
-    =
-  let annotatedSet = ref StringSet.empty in
-  let initialAnnotatedTypes =
-    typeMap |> StringMap.bindings
-    |> List.filter (fun (_, {CodeItem.annotation}) ->
-           annotation = Annotation.GenType)
-    |> List.map (fun (_, {CodeItem.type_}) -> type_)
-  in
-  let typesOfExportedValue (codeItem : CodeItem.t) =
-    match codeItem with
-    | ExportValue {type_} | ImportValue {type_} -> [type_]
-  in
-  let typesOfExportedValues =
-    codeItems |> List.map typesOfExportedValue |> List.concat
-  in
-  let visitTypAndUpdateMarked type0 =
-    let visited = ref StringSet.empty in
-    let rec visit type_ =
-      match type_ with
-      | Ident {name = typeName; typeArgs} ->
-        if !visited |> StringSet.mem typeName then ()
-        else (
-          visited := !visited |> StringSet.add typeName;
-          typeArgs |> List.iter visit;
-          match typeMap |> StringMap.find typeName with
-          | {annotation = GenType | GenTypeOpaque} -> ()
-          | {type_ = type1; annotation = NoGenType} ->
-            if !Debug.translation then
-              Log_.item "Marking Type As Annotated %s\n" typeName;
-            annotatedSet := !annotatedSet |> StringSet.add typeName;
-            type1 |> visit
-          | exception Not_found ->
-            annotatedSet := !annotatedSet |> StringSet.add typeName)
-      | Array (t, _) | Dict t -> t |> visit
-      | Function {argTypes; retType} ->
-        argTypes |> List.iter (fun {aType} -> visit aType);
-        retType |> visit
-      | Object (_, fields) ->
-        fields |> List.iter (fun {type_} -> type_ |> visit)
-      | Option t | Null t | Nullable t | Promise t -> t |> visit
-      | Tuple innerTypes -> innerTypes |> List.iter visit
-      | TypeVar _ -> ()
-      | Variant {inherits; payloads} ->
-        inherits |> List.iter visit;
-        payloads |> List.iter (fun {t} -> t |> visit)
-    in
-    type0 |> visit
-  in
-  initialAnnotatedTypes @ typesOfExportedValues
-  |> List.iter visitTypAndUpdateMarked;
-  let newTypeMap =
-    typeMap
-    |> StringMap.mapi
-         (fun typeName (exportTypeItem : CodeItem.exportTypeItem) ->
-           {
-             exportTypeItem with
-             annotation =
-               (match !annotatedSet |> StringSet.mem typeName with
-               | true -> Annotation.GenType
-               | false -> exportTypeItem.annotation);
-           })
-  in
-  (newTypeMap, !annotatedSet)
-
-let emitTranslationAsString ~config ~fileName ~inputCmtTranslateTypeDeclarations
-    ~outputFileRelative ~resolver (translation : Translation.t) =
-  let initialEnv =
-    {
-      requires = Config.ModuleNameMap.empty;
-      requiresEarly = Config.ModuleNameMap.empty;
-      cmtToExportTypeMap = StringMap.empty;
-      exportTypeMapFromOtherFiles = StringMap.empty;
-      importedValueOrComponent = false;
-    }
-  in
-  let exportTypeMap, annotatedSet =
-    translation.typeDeclarations
-    |> createExportTypeMap ~config
-         ~file:(fileName |> ModuleName.toString)
-         ~fromCmtReadRecursively:false
-    |> propagateAnnotationToSubTypes ~codeItems:translation.codeItems
-  in
-  let annotatedTypeDeclarations =
-    translation.typeDeclarations |> getAnnotatedTypedDeclarations ~annotatedSet
-  in
-  let importTypesFromTypeDeclarations =
-    annotatedTypeDeclarations
-    |> List.map (fun (typeDeclaration : CodeItem.typeDeclaration) ->
-           typeDeclaration.importTypes)
-    |> List.concat
-  in
-  let exportFromTypeDeclarations =
-    annotatedTypeDeclarations
-    |> List.map (fun (typeDeclaration : CodeItem.typeDeclaration) ->
-           typeDeclaration.exportFromTypeDeclaration)
-  in
-  let typeNameIsInterface ~env =
-    typeNameIsInterface ~exportTypeMap
-      ~exportTypeMapFromOtherFiles:env.exportTypeMapFromOtherFiles
-  in
-  let lookupId_ ~env s =
-    try exportTypeMap |> StringMap.find s
-    with Not_found -> env.exportTypeMapFromOtherFiles |> StringMap.find s
-  in
-  let emitters = Emitters.initial
-  and moduleItemsEmitter = ExportModule.createModuleItemsEmitter ()
-  and env = initialEnv in
-  let env, emitters =
-    (* imports from type declarations go first to build up type tables *)
-    importTypesFromTypeDeclarations @ translation.importTypes
-    |> List.sort_uniq Translation.importTypeCompare
-    |> emitImportTypes ~config ~emitters ~env ~inputCmtTranslateTypeDeclarations
-         ~outputFileRelative ~resolver ~typeNameIsInterface
-  in
-  let env, emitters =
-    exportFromTypeDeclarations
-    |> emitExportFromTypeDeclarations ~config ~emitters ~env
-         ~typeNameIsInterface:(typeNameIsInterface ~env)
-  in
-  let inlineOneLevel type_ =
-    match type_ with
-    | Ident {builtin = false; name; typeArgs} -> (
-      match name |> lookupId_ ~env with
-      | {type_; typeVars} ->
-        let pairs =
-          try List.combine typeVars typeArgs with Invalid_argument _ -> []
-        in
-        let f typeVar =
-          match
-            pairs |> List.find (fun (typeVar1, _) -> typeVar = typeVar1)
-          with
-          | _, typeArgument -> Some typeArgument
-          | exception Not_found -> None
-        in
-        type_ |> TypeVars.substitute ~f
-      | exception Not_found -> type_)
-    | _ -> type_
-  in
-  let env, emitters =
-    translation.codeItems
-    |> emitCodeItems ~config ~emitters ~moduleItemsEmitter ~env ~fileName
-         ~outputFileRelative ~resolver ~inlineOneLevel
-         ~typeNameIsInterface:(typeNameIsInterface ~env)
-  in
-  let emitters =
-    match config.emitImportReact with
-    | true -> EmitType.emitImportReact ~emitters
-    | false -> emitters
-  in
-  let env =
-    match config.emitImportCurry with
-    | true ->
-      ModuleName.curry
-      |> requireModule ~import:true ~env
-           ~importPath:(ImportPath.bsCurryPath ~config)
-    | false -> env
-  in
-  let finalEnv = env in
-  let emitters =
-    moduleItemsEmitter
-    |> ExportModule.emitAllModuleItems ~config ~emitters ~fileName
-  in
-  emitters
-  |> emitRequires ~importedValueOrComponent:false ~early:true ~config
-       ~requires:finalEnv.requiresEarly
-  |> emitRequires ~importedValueOrComponent:finalEnv.importedValueOrComponent
-       ~early:false ~config ~requires:finalEnv.requires
-  |> Emitters.toString ~separator:"\n\n"
diff --git a/jscomp/gentype/EmitText.ml b/jscomp/gentype/EmitText.ml
deleted file mode 100644
index 9ec5c1e..0000000
--- a/jscomp/gentype/EmitText.ml
+++ /dev/null
@@ -1,13 +0,0 @@
-type nameGen = (string, int) Hashtbl.t
-
-let parens xs = "(" ^ (xs |> String.concat ", ") ^ ")"
-let comment x = "/* " ^ x ^ " */"
-
-let genericsString ~typeVars =
-  match typeVars == [] with
-  | true -> ""
-  | false -> "<" ^ String.concat "," typeVars ^ ">"
-
-let quotes x = "\"" ^ x ^ "\""
-
-let fieldAccess ~label value = value ^ "." ^ label
diff --git a/jscomp/gentype/EmitType.ml b/jscomp/gentype/EmitType.ml
deleted file mode 100644
index 9a55a77..0000000
--- a/jscomp/gentype/EmitType.ml
+++ /dev/null
@@ -1,432 +0,0 @@
-open GenTypeCommon
-
-let fileHeader ~sourceFile =
-  let makeHeader ~lines =
-    match lines with
-    | [line] -> "/* " ^ line ^ " */\n\n"
-    | _ ->
-      "/** \n"
-      ^ (lines |> List.map (fun line -> " * " ^ line) |> String.concat "\n")
-      ^ "\n */\n\n"
-  in
-  makeHeader
-    ~lines:["TypeScript file generated from " ^ sourceFile ^ " by genType."]
-  ^ "/* eslint-disable */\n" ^ "/* tslint:disable */\n"
-
-let interfaceName ~(config : Config.t) name =
-  match config.exportInterfaces with
-  | true -> "I" ^ name
-  | false -> name
-
-let typeAny = ident ~builtin:true "any"
-
-let typeReactComponent ~propsType =
-  "React.ComponentType" |> ident ~builtin:true ~typeArgs:[propsType]
-
-let typeReactContext ~type_ =
-  "React.Context" |> ident ~builtin:true ~typeArgs:[type_]
-
-let typeReactElementTypeScript = ident ~builtin:true "JSX.Element"
-let typeReactChildTypeScript = ident ~builtin:true "React.ReactNode"
-let typeReactElement = typeReactElementTypeScript
-let typeReactChild = typeReactChildTypeScript
-let isTypeReactElement type_ = type_ == typeReactElement
-
-let typeReactDOMReDomRef =
-  "React.Ref" |> ident ~builtin:true ~typeArgs:[unknown]
-
-let typeReactEventMouseT = "MouseEvent" |> ident ~builtin:true
-let reactRefCurrent = "current"
-
-let typeReactRef ~type_ =
-  Object
-    ( Open,
-      [
-        {
-          mutable_ = Mutable;
-          nameJS = reactRefCurrent;
-          optional = Mandatory;
-          type_ = Null type_;
-          docString = DocString.empty;
-        };
-      ] )
-
-let isTypeReactRef ~fields =
-  match fields with
-  | [{mutable_ = Mutable; nameJS; optional = Mandatory}] ->
-    nameJS == reactRefCurrent
-  | _ -> false
-
-let isTypeFunctionComponent ~fields type_ =
-  type_ |> isTypeReactElement && not (isTypeReactRef ~fields)
-
-let rec renderType ~(config : Config.t) ?(indent = None) ~typeNameIsInterface
-    ~inFunType type0 =
-  match type0 with
-  | Array (t, arrayKind) ->
-    let typeIsSimple =
-      match t with
-      | Ident _ | TypeVar _ -> true
-      | _ -> false
-    in
-    if typeIsSimple && arrayKind = Mutable then
-      (t |> renderType ~config ~indent ~typeNameIsInterface ~inFunType) ^ "[]"
-    else
-      let arrayName =
-        match arrayKind = Mutable with
-        | true -> "Array"
-        | false -> "ReadonlyArray"
-      in
-      arrayName ^ "<"
-      ^ (t |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-      ^ ">"
-  | Dict type_ ->
-    "{[id: string]: "
-    ^ (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-    ^ "}"
-  | Function
-      {argTypes = [{aType = Object (closedFlag, fields)}]; retType; typeVars}
-    when retType |> isTypeFunctionComponent ~fields ->
-    let fields =
-      fields
-      |> List.map (fun field ->
-             {
-               field with
-               type_ =
-                 field.type_
-                 |> TypeVars.substitute ~f:(fun s ->
-                        if typeVars |> List.mem s then Some typeAny else None);
-             })
-    in
-    let componentType =
-      typeReactComponent ~propsType:(Object (closedFlag, fields))
-    in
-    componentType |> renderType ~config ~indent ~typeNameIsInterface ~inFunType
-  | Function {argTypes; retType; typeVars} ->
-    renderFunType ~config ~indent ~inFunType ~typeNameIsInterface ~typeVars
-      argTypes retType
-  | Object (_, fields) ->
-    let indent1 = fields |> Indent.heuristicFields ~indent in
-    fields
-    |> renderFields ~config ~indent:indent1 ~inFunType ~typeNameIsInterface
-  | Ident {builtin; name; typeArgs} ->
-    let name = name |> sanitizeTypeName in
-    (match
-       (not builtin) && config.exportInterfaces && name |> typeNameIsInterface
-     with
-    | true -> name |> interfaceName ~config
-    | false -> name)
-    ^ EmitText.genericsString
-        ~typeVars:
-          (typeArgs
-          |> List.map
-               (renderType ~config ~indent ~typeNameIsInterface ~inFunType))
-  | Null type_ ->
-    "(null | "
-    ^ (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-    ^ ")"
-  | Nullable type_ ->
-    let useParens x =
-      match type_ with
-      | Function _ | Variant _ -> EmitText.parens [x]
-      | _ -> x
-    in
-    "(null | undefined | "
-    ^ useParens
-        (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-    ^ ")"
-  | Option type_ ->
-    let useParens x =
-      match type_ with
-      | Function _ | Variant _ -> EmitText.parens [x]
-      | _ -> x
-    in
-    "(undefined | "
-    ^ useParens
-        (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-    ^ ")"
-  | Promise type_ ->
-    "Promise" ^ "<"
-    ^ (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-    ^ ">"
-  | Tuple innerTypes ->
-    "["
-    ^ (innerTypes
-      |> List.map (renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-      |> String.concat ", ")
-    ^ "]"
-  | TypeVar s -> s
-  | Variant {inherits; noPayloads; payloads; polymorphic; tag; unboxed} ->
-    let inheritsRendered =
-      inherits
-      |> List.map (fun type_ ->
-             type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-    in
-    let noPayloadsRendered = noPayloads |> List.map labelJSToString in
-    let field ~name value =
-      {
-        mutable_ = Mutable;
-        nameJS = name;
-        optional = Mandatory;
-        type_ = TypeVar value;
-        docString = DocString.empty;
-      }
-    in
-    let fields fields =
-      fields |> renderFields ~config ~indent ~inFunType ~typeNameIsInterface
-    in
-    let payloadsRendered =
-      payloads
-      |> List.map (fun {case; t = type_} ->
-             let render t =
-               t |> renderType ~config ~indent ~typeNameIsInterface ~inFunType
-             in
-             let tagField =
-               case |> labelJSToString
-               |> field ~name:(Runtime.jsVariantTag ~polymorphic:false ~tag)
-             in
-             match (unboxed, type_) with
-             | true, type_ ->
-               let needParens =
-                 match type_ with
-                 | Function _ -> true
-                 | _ -> false
-               in
-               let t = type_ |> render in
-               if needParens then EmitText.parens [t] else t
-             | false, type_ when polymorphic ->
-               (* poly variant *)
-               [
-                 case |> labelJSToString
-                 |> field ~name:(Runtime.jsVariantTag ~polymorphic ~tag);
-                 type_ |> render
-                 |> field ~name:(Runtime.jsVariantValue ~polymorphic);
-               ]
-               |> fields
-             | false, Object (Inline, flds) ->
-               (* inlined record *)
-               tagField :: flds |> fields
-             | false, type_ ->
-               (* ordinary variant *)
-               let payloads =
-                 match type_ with
-                 | Tuple ts -> ts
-                 | _ -> [type_]
-               in
-               let flds =
-                 tagField
-                 :: Ext_list.mapi payloads (fun n t ->
-                        t |> render
-                        |> field ~name:(Runtime.jsVariantPayloadTag ~n))
-               in
-               flds |> fields)
-    in
-    let rendered = inheritsRendered @ noPayloadsRendered @ payloadsRendered in
-    let indent1 = rendered |> Indent.heuristicVariants ~indent in
-    (match indent1 = None with
-    | true -> ""
-    | false -> Indent.break ~indent:indent1 ^ "  ")
-    ^ (rendered
-      |> String.concat
-           ((match indent1 = None with
-            | true -> " "
-            | false -> Indent.break ~indent:indent1)
-           ^ "| "))
-
-and renderField ~config ~indent ~typeNameIsInterface ~inFunType
-    {mutable_; nameJS = lbl; optional; type_; docString} =
-  let optMarker =
-    match optional == Optional with
-    | true -> "?"
-    | false -> ""
-  in
-  let mutMarker =
-    match mutable_ = Immutable with
-    | true -> "readonly "
-    | false -> ""
-  in
-  let lbl =
-    match isJSSafePropertyName lbl with
-    | true -> lbl
-    | false -> EmitText.quotes lbl
-  in
-
-  let defStr =
-    mutMarker ^ lbl ^ optMarker ^ ": "
-    ^ (type_ |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-  in
-  if DocString.hasContent docString then
-    (* Always print comments on newline before definition. *)
-    let indentStr = indent |> Option.value ~default:"" in
-    "\n" ^ indentStr ^ DocString.render docString ^ indentStr ^ defStr
-  else Indent.break ~indent ^ defStr
-
-and renderFields ~config ~indent ~inFunType ~typeNameIsInterface fields =
-  let indent1 = indent |> Indent.more in
-  let space =
-    match indent = None && fields <> [] with
-    | true -> " "
-    | false -> ""
-  in
-  let renderedFields =
-    fields
-    |> List.map
-         (renderField ~config ~indent:indent1 ~typeNameIsInterface ~inFunType)
-  in
-  ("{" ^ space)
-  ^ String.concat "; " renderedFields
-  ^ Indent.break ~indent ^ space ^ "}"
-
-and renderFunType ~config ~indent ~inFunType ~typeNameIsInterface ~typeVars
-    argTypes retType =
-  (match inFunType with
-  | true -> "("
-  | false -> "")
-  ^ EmitText.genericsString ~typeVars
-  ^ "("
-  ^ String.concat ", "
-      (List.mapi
-         (fun i {aName; aType} ->
-           let parameterName =
-             (match aName = "" with
-             | true -> "_" ^ string_of_int (i + 1)
-             | false -> aName)
-             ^ ":"
-           in
-           parameterName
-           ^ (aType
-             |> renderType ~config ~indent ~typeNameIsInterface ~inFunType:true
-             ))
-         argTypes)
-  ^ ") => "
-  ^ (retType |> renderType ~config ~indent ~typeNameIsInterface ~inFunType)
-  ^
-  match inFunType with
-  | true -> ")"
-  | false -> ""
-
-let typeToString ~config ~typeNameIsInterface type_ =
-  type_ |> renderType ~config ~typeNameIsInterface ~inFunType:false
-
-let emitExportConst ~early ?(comment = "") ~config
-    ?(docString = DocString.empty) ~emitters ~name ~type_ ~typeNameIsInterface
-    line =
-  let typeString = type_ |> typeToString ~config ~typeNameIsInterface in
-  (match comment = "" with
-  | true -> comment
-  | false -> "// " ^ comment ^ "\n")
-  ^ DocString.render docString ^ "export const " ^ name ^ ": " ^ typeString
-  ^ " = " ^ line ^ " as any;"
-  |> (match early with
-     | true -> Emitters.exportEarly
-     | false -> Emitters.export)
-       ~emitters
-
-let emitExportDefault ~emitters name =
-  "export default " ^ name ^ ";" |> Emitters.export ~emitters
-
-let emitExportType ~(config : Config.t) ~emitters ~nameAs ~opaque ~type_
-    ~typeNameIsInterface ~typeVars ~docString resolvedTypeName =
-  let docString = DocString.render docString in
-  let typeParamsString = EmitText.genericsString ~typeVars in
-  let isInterface = resolvedTypeName |> typeNameIsInterface in
-  let resolvedTypeName =
-    match config.exportInterfaces && isInterface with
-    | true -> resolvedTypeName |> interfaceName ~config
-    | false -> resolvedTypeName
-  in
-  let exportNameAs =
-    match nameAs with
-    | None -> ""
-    | Some s ->
-      "\nexport type " ^ s ^ typeParamsString ^ " = " ^ resolvedTypeName
-      ^ typeParamsString ^ ";"
-  in
-  if opaque then
-    (* Represent an opaque type as an absract class with a field called 'opaque'.
-       Any type parameters must occur in the type of opaque, so that different
-       instantiations are considered different types. *)
-    let typeOfOpaqueField =
-      match typeVars = [] with
-      | true -> "any"
-      | false -> typeVars |> String.concat " | "
-    in
-    docString ^ "export abstract class " ^ resolvedTypeName ^ typeParamsString
-    ^ " { protected opaque!: " ^ typeOfOpaqueField
-    ^ " }; /* simulate opaque types */" ^ exportNameAs
-    |> Emitters.export ~emitters
-  else
-    (if isInterface && config.exportInterfaces then
-       docString ^ "export interface " ^ resolvedTypeName ^ typeParamsString
-       ^ " "
-     else
-       docString ^ "export type " ^ resolvedTypeName ^ typeParamsString ^ " = ")
-    ^ (match type_ with
-      | _ -> type_ |> typeToString ~config ~typeNameIsInterface)
-    ^ ";" ^ exportNameAs
-    |> Emitters.export ~emitters
-
-let emitImportValueAsEarly ~emitters ~name ~nameAs importPath =
-  "import "
-  ^ (match nameAs with
-    | Some nameAs -> "{" ^ name ^ " as " ^ nameAs ^ "}"
-    | None -> name)
-  ^ " from " ^ "'"
-  ^ (importPath |> ImportPath.emit)
-  ^ "';"
-  |> Emitters.requireEarly ~emitters
-
-let emitRequire ~importedValueOrComponent ~early ~emitters ~(config : Config.t)
-    ~moduleName importPath =
-  let moduleNameString = ModuleName.toString moduleName in
-  let importPathString = ImportPath.emit importPath in
-  let output =
-    match config.module_ with
-    | ESModule when not importedValueOrComponent ->
-      "import * as " ^ moduleNameString ^ " from '" ^ importPathString ^ "';"
-    | _ ->
-      "const " ^ moduleNameString ^ " = require('" ^ importPathString ^ "');"
-  in
-  output
-  |> (match early with
-     | true -> Emitters.requireEarly
-     | false -> Emitters.require)
-       ~emitters
-
-let require ~early =
-  match early with
-  | true -> Emitters.requireEarly
-  | false -> Emitters.require
-
-let emitImportReact ~emitters =
-  "import * as React from 'react';" |> require ~early:true ~emitters
-
-let emitImportTypeAs ~emitters ~config ~typeName ~asTypeName
-    ~typeNameIsInterface ~importPath =
-  let typeName = sanitizeTypeName typeName in
-  let asTypeName =
-    match asTypeName with
-    | None -> asTypeName
-    | Some s -> Some (sanitizeTypeName s)
-  in
-  let typeName, asTypeName =
-    match asTypeName with
-    | Some asName -> (
-      match asName |> typeNameIsInterface with
-      | true ->
-        ( typeName |> interfaceName ~config,
-          Some (asName |> interfaceName ~config) )
-      | false -> (typeName, asTypeName))
-    | None -> (typeName, asTypeName)
-  in
-  let importPathString = importPath |> ImportPath.emit in
-  let importPrefix = "import type" in
-  importPrefix ^ " " ^ "{" ^ typeName
-  ^ (match asTypeName with
-    | Some asT -> " as " ^ asT
-    | None -> "")
-  ^ "} from '" ^ importPathString ^ "';"
-  |> Emitters.import ~emitters
-
-let emitTypeCast ~config ~type_ ~typeNameIsInterface s =
-  s ^ " as " ^ (type_ |> typeToString ~config ~typeNameIsInterface)
diff --git a/jscomp/gentype/Emitters.ml b/jscomp/gentype/Emitters.ml
deleted file mode 100644
index c40317e..0000000
--- a/jscomp/gentype/Emitters.ml
+++ /dev/null
@@ -1,49 +0,0 @@
-type t = {
-  requireEmitterEarly: string list;
-  exportEmitterEarly: string list;
-  requireEmitter: string list;
-  importEmitter: string list;
-  exportEmitter: string list;
-}
-
-let initial =
-  {
-    requireEmitterEarly = [];
-    exportEmitterEarly = [];
-    requireEmitter = [];
-    importEmitter = [];
-    exportEmitter = [];
-  }
-
-let string ~emitter s = s :: emitter
-
-let requireEarly ~emitters s =
-  {
-    emitters with
-    requireEmitterEarly = s |> string ~emitter:emitters.requireEmitterEarly;
-  }
-
-let exportEarly ~emitters s =
-  {
-    emitters with
-    exportEmitterEarly = s |> string ~emitter:emitters.exportEmitterEarly;
-  }
-
-let require ~emitters s =
-  {emitters with requireEmitter = s |> string ~emitter:emitters.requireEmitter}
-
-let import ~emitters s =
-  {emitters with importEmitter = s |> string ~emitter:emitters.importEmitter}
-
-let export ~emitters s =
-  {emitters with exportEmitter = s |> string ~emitter:emitters.exportEmitter}
-
-let toString ~separator emitters =
-  [
-    emitters.requireEmitterEarly |> List.rev;
-    emitters.exportEmitterEarly |> List.rev;
-    emitters.requireEmitter |> List.rev;
-    emitters.importEmitter |> List.rev;
-    emitters.exportEmitter |> List.rev;
-  ]
-  |> List.concat |> String.concat separator
diff --git a/jscomp/gentype/Emitters.mli b/jscomp/gentype/Emitters.mli
deleted file mode 100644
index 7d661f6..0000000
--- a/jscomp/gentype/Emitters.mli
+++ /dev/null
@@ -1,9 +0,0 @@
-type t
-
-val initial : t
-val exportEarly : emitters:t -> string -> t
-val requireEarly : emitters:t -> string -> t
-val export : emitters:t -> string -> t
-val import : emitters:t -> string -> t
-val require : emitters:t -> string -> t
-val toString : separator:string -> t -> string
diff --git a/jscomp/gentype/ExportModule.ml b/jscomp/gentype/ExportModule.ml
deleted file mode 100644
index b4798f5..0000000
--- a/jscomp/gentype/ExportModule.ml
+++ /dev/null
@@ -1,124 +0,0 @@
-open GenTypeCommon
-
-type exportModuleItem = (string, exportModuleValue) Hashtbl.t
-
-and exportModuleValue =
-  | S of {name: string; type_: type_; docString: DocString.t}
-  | M of {exportModuleItem: exportModuleItem}
-
-type exportModuleItems = (string, exportModuleItem) Hashtbl.t
-
-type types = {typeForValue: type_; typeForType: type_; docString: DocString.t}
-
-type fieldInfo = {fieldForValue: field; fieldForType: field}
-
-let rec exportModuleValueToType ~config exportModuleValue =
-  match exportModuleValue with
-  | S {name; type_; docString} ->
-    {typeForValue = ident name; typeForType = type_; docString}
-  | M {exportModuleItem} ->
-    let fieldsInfo = exportModuleItem |> exportModuleItemToFields ~config in
-    let fieldsForValue =
-      fieldsInfo |> List.map (fun {fieldForValue} -> fieldForValue)
-    in
-    let fieldsForType =
-      fieldsInfo |> List.map (fun {fieldForType} -> fieldForType)
-    in
-    {
-      typeForValue = Object (Open, fieldsForValue);
-      typeForType = Object (Open, fieldsForType);
-      docString = DocString.empty;
-    }
-
-and exportModuleItemToFields =
-  (fun ~config exportModuleItem ->
-     Hashtbl.fold
-       (fun fieldName exportModuleValue fields ->
-         let {typeForValue; typeForType; docString} =
-           exportModuleValue |> exportModuleValueToType ~config
-         in
-         let fieldForType =
-           {
-             mutable_ = Mutable;
-             nameJS = fieldName;
-             optional = Mandatory;
-             type_ = typeForType;
-             docString;
-           }
-         in
-         let fieldForValue = {fieldForType with type_ = typeForValue} in
-         {fieldForValue; fieldForType} :: fields)
-       exportModuleItem []
-    : config:Config.t -> exportModuleItem -> fieldInfo list)
-
-let rec extendExportModuleItem ~docString x
-    ~(exportModuleItem : exportModuleItem) ~type_ ~valueName =
-  match x with
-  | [] -> ()
-  | [fieldName] ->
-    Hashtbl.replace exportModuleItem fieldName
-      (S {name = valueName; type_; docString})
-  | fieldName :: rest ->
-    let innerExportModuleItem =
-      match Hashtbl.find exportModuleItem fieldName with
-      | M {exportModuleItem = innerExportModuleItem} -> innerExportModuleItem
-      | S _ -> assert false
-      | exception Not_found ->
-        let innerExportModuleItem = Hashtbl.create 1 in
-        Hashtbl.replace exportModuleItem fieldName
-          (M {exportModuleItem = innerExportModuleItem});
-        innerExportModuleItem
-    in
-    rest
-    |> extendExportModuleItem ~docString ~exportModuleItem:innerExportModuleItem
-         ~valueName ~type_
-
-let extendExportModuleItems x ~docString
-    ~(exportModuleItems : exportModuleItems) ~type_ ~valueName =
-  match x with
-  | [] -> assert false
-  | [_valueName] -> ()
-  | moduleName :: rest ->
-    let exportModuleItem =
-      match Hashtbl.find exportModuleItems moduleName with
-      | exportModuleItem -> exportModuleItem
-      | exception Not_found ->
-        let exportModuleItem = Hashtbl.create 1 in
-        Hashtbl.replace exportModuleItems moduleName exportModuleItem;
-        exportModuleItem
-    in
-    rest
-    |> extendExportModuleItem ~docString ~exportModuleItem ~type_ ~valueName
-
-let createModuleItemsEmitter =
-  (fun () -> Hashtbl.create 1 : unit -> exportModuleItems)
-
-let rev_fold f tbl base =
-  let list = Hashtbl.fold (fun k v l -> (k, v) :: l) tbl [] in
-  List.fold_left (fun x (k, v) -> f k v x) base list
-
-let emitAllModuleItems ~config ~emitters ~fileName
-    (exportModuleItems : exportModuleItems) =
-  emitters
-  |> rev_fold
-       (fun moduleName exportModuleItem emitters ->
-         let {typeForType; docString} =
-           M {exportModuleItem} |> exportModuleValueToType ~config
-         in
-         if !Debug.codeItems then Log_.item "EmitModule %s @." moduleName;
-         let emittedModuleItem =
-           ModuleName.forInnerModule ~fileName ~innerModuleName:moduleName
-           |> ModuleName.toString
-         in
-         emittedModuleItem
-         |> EmitType.emitExportConst ~docString ~early:false ~config ~emitters
-              ~name:moduleName ~type_:typeForType ~typeNameIsInterface:(fun _ ->
-                false))
-       exportModuleItems
-
-let extendExportModules ~(moduleItemsEmitter : exportModuleItems) ~docString
-    ~type_ resolvedName =
-  resolvedName |> ResolvedName.toList
-  |> extendExportModuleItems ~exportModuleItems:moduleItemsEmitter ~type_
-       ~docString
-       ~valueName:(resolvedName |> ResolvedName.toString)
diff --git a/jscomp/gentype/FindSourceFile.ml b/jscomp/gentype/FindSourceFile.ml
deleted file mode 100644
index b935a5e..0000000
--- a/jscomp/gentype/FindSourceFile.ml
+++ /dev/null
@@ -1,21 +0,0 @@
-let rec interface items =
-  match items with
-  | {Typedtree.sig_loc} :: rest -> (
-    match not (Sys.file_exists sig_loc.loc_start.pos_fname) with
-    | true -> interface rest
-    | false -> Some sig_loc.loc_start.pos_fname)
-  | [] -> None
-
-let rec implementation items =
-  match items with
-  | {Typedtree.str_loc} :: rest -> (
-    match not (Sys.file_exists str_loc.loc_start.pos_fname) with
-    | true -> implementation rest
-    | false -> Some str_loc.loc_start.pos_fname)
-  | [] -> None
-
-let cmt cmt_annots =
-  match cmt_annots with
-  | Cmt_format.Interface signature -> interface signature.sig_items
-  | Implementation structure -> implementation structure.str_items
-  | _ -> None
diff --git a/jscomp/gentype/GenIdent.ml b/jscomp/gentype/GenIdent.ml
deleted file mode 100644
index fcf9b7f..0000000
--- a/jscomp/gentype/GenIdent.ml
+++ /dev/null
@@ -1,21 +0,0 @@
-module IntMap = Map.Make (struct
-  type t = int
-
-  let compare (x : int) (y : int) = compare x y
-end)
-
-type typeVarsGen = {
-  (* Generate fresh identifiers *)
-  mutable typeNameMap: string IntMap.t;
-  mutable typeNameCounter: int;
-}
-
-let createTypeVarsGen () = {typeNameMap = IntMap.empty; typeNameCounter = 0}
-
-let jsTypeNameForAnonymousTypeID ~typeVarsGen id =
-  try typeVarsGen.typeNameMap |> IntMap.find id
-  with Not_found ->
-    typeVarsGen.typeNameCounter <- typeVarsGen.typeNameCounter + 1;
-    let name = "T" ^ string_of_int typeVarsGen.typeNameCounter in
-    typeVarsGen.typeNameMap <- typeVarsGen.typeNameMap |> IntMap.add id name;
-    name
diff --git a/jscomp/gentype/GenTypeCommon.ml b/jscomp/gentype/GenTypeCommon.ml
deleted file mode 100644
index 4581323..0000000
--- a/jscomp/gentype/GenTypeCommon.ml
+++ /dev/null
@@ -1,232 +0,0 @@
-module StringMap = Map.Make (String)
-module StringSet = Set.Make (String)
-module Config = GenTypeConfig
-
-module DocString = struct
-  type t = string option
-  let render t =
-    match t with
-    | None | Some "" -> ""
-    | Some docString -> "/** " ^ String.trim docString ^ " */\n"
-  let empty = None
-  let hasContent docString = Option.is_some docString
-end
-
-let logNotImplemented x =
-  if !Debug.notImplemented then Log_.item "Not Implemented: %s\n" x
-
-type optional = Mandatory | Optional
-type mutable_ = Immutable | Mutable
-
-type labelJS =
-  | NullLabel
-  | UndefinedLabel
-  | BoolLabel of bool
-  | FloatLabel of string
-  | IntLabel of string
-  | StringLabel of string
-
-type case = {labelJS: labelJS}
-
-let isJSSafePropertyName name =
-  name = ""
-  || (match name.[0] [@doesNotRaise] with
-     | 'A' .. 'z' -> true
-     | _ -> false)
-     && name
-        |> String.for_all (function
-             | 'A' .. 'z' | '0' .. '9' -> true
-             | _ -> false)
-
-let isNumber s =
-  let len = String.length s in
-  len > 0
-  && (match len > 1 with
-     | true -> (s.[0] [@doesNotRaise]) > '0'
-     | false -> true)
-  &&
-  let res = ref true in
-  for i = 0 to len - 1 do
-    match s.[i] [@doesNotRaise] with
-    | '0' .. '9' -> ()
-    | _ -> res := false
-  done;
-  res.contents
-
-let labelJSToString case =
-  match case.labelJS with
-  | NullLabel -> "null"
-  | UndefinedLabel -> "undefined"
-  | BoolLabel b -> b |> string_of_bool
-  | FloatLabel s -> s
-  | IntLabel i -> i
-  | StringLabel s -> s |> EmitText.quotes
-
-type closedFlag = Open | Closed | Inline
-
-type type_ =
-  | Array of type_ * mutable_
-  | Dict of type_
-  | Function of function_
-  | Ident of ident
-  | Null of type_
-  | Nullable of type_
-  | Object of closedFlag * fields
-  | Option of type_
-  | Promise of type_
-  | Tuple of type_ list
-  | TypeVar of string
-  | Variant of variant (* ordinary and polymorphic variants *)
-
-and fields = field list
-and argType = {aName: string; aType: type_}
-
-and field = {
-  mutable_: mutable_;
-  nameJS: string;
-  optional: optional;
-  type_: type_;
-  docString: DocString.t;
-}
-
-and function_ = {argTypes: argType list; retType: type_; typeVars: string list}
-
-and ident = {builtin: bool; name: string; typeArgs: type_ list}
-
-and variant = {
-  inherits: type_ list;
-  noPayloads: case list;
-  payloads: payload list;
-  polymorphic: bool; (* If true, this is a polymorphic variant *)
-  tag: string option; (* The name of the tag field at runtime *)
-  unboxed: bool;
-}
-
-and payload = {case: case; t: type_}
-
-type label = Nolabel | Label of string | OptLabel of string
-
-type dep =
-  | External of string
-  | Internal of ResolvedName.t
-  | Dot of dep * string
-
-module ScopedPackage = (* Taken from ext_namespace.ml in bukclescript *)
-struct
-  let namespace_of_package_name (s : string) : string =
-    let len = String.length s in
-    let buf = Buffer.create len in
-    let add capital ch =
-      Buffer.add_char buf (if capital then Char.uppercase_ascii ch else ch)
-    in
-    let rec aux capital off len =
-      if off >= len then ()
-      else
-        let ch = String.unsafe_get s off in
-        match ch with
-        | 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' ->
-          add capital ch;
-          aux false (off + 1) len
-        | '/' | '-' -> aux true (off + 1) len
-        | _ -> aux capital (off + 1) len
-    in
-    aux true 0 len;
-    Buffer.contents buf
-
-  (** @demo/some-library -> DemoSomelibrary *)
-  let packageNameToGeneratedModuleName packageName =
-    if String.contains packageName '/' then
-      Some (packageName |> namespace_of_package_name)
-    else None
-
-  let isGeneratedModule id ~(config : Config.t) =
-    config.bsDependencies
-    |> List.exists (fun packageName ->
-           packageName |> packageNameToGeneratedModuleName
-           = Some (id |> Ident.name))
-
-  (** (Common, DemoSomelibrary) -> Common-DemoSomelibrary *)
-  let addGeneratedModule s ~generatedModule =
-    s ^ "-" ^ Ident.name generatedModule
-
-  (** Common-DemoSomelibrary -> Common *)
-  let removeGeneratedModule s =
-    match s |> String.split_on_char '-' with
-    | [name; _scope] -> name
-    | _ -> s
-end
-
-let rec depToString dep =
-  match dep with
-  | External name -> name |> ScopedPackage.removeGeneratedModule
-  | Internal resolvedName -> resolvedName |> ResolvedName.toString
-  | Dot (d, s) -> depToString d ^ "_" ^ s
-
-let rec depToResolvedName (dep : dep) =
-  match dep with
-  | External name -> name |> ResolvedName.fromString
-  | Internal resolvedName -> resolvedName
-  | Dot (p, s) -> ResolvedName.dot s (p |> depToResolvedName)
-
-let createVariant ~inherits ~noPayloads ~payloads ~polymorphic ~tag ~unboxed =
-  Variant {inherits; noPayloads; payloads; polymorphic; tag; unboxed}
-
-let ident ?(builtin = true) ?(typeArgs = []) name =
-  Ident {builtin; name; typeArgs}
-
-let sanitizeTypeName name =
-  name
-  |> String.map (function
-       | '\'' -> '_'
-       | c -> c)
-let unknown = ident "unknown"
-let bigintT = ident "BigInt"
-let booleanT = ident "boolean"
-let dateT = ident "Date"
-let mapT (x, y) = ident ~typeArgs:[x; y] "Map"
-let numberT = ident "number"
-let regexpT = ident "RegExp"
-let setT x = ident ~typeArgs:[x] "Set"
-let stringT = ident "string"
-let unitT = ident "void"
-let weakmapT (x, y) = ident ~typeArgs:[x; y] "WeakMap"
-let weaksetT x = ident ~typeArgs:[x] "WeakSet"
-let int64T = Tuple [numberT; numberT]
-
-module NodeFilename = struct
-  include Filename
-
-  (* Force "/" separator. *)
-  let dirSep = "/"
-
-  module Path : sig
-    type t
-
-    val normalize : string -> t
-    val concat : t -> string -> t
-    val toString : t -> string
-  end = struct
-    type t = string
-
-    let normalize path : t =
-      match Sys.os_type with
-      | "Win32" -> path |> String.split_on_char '\\' |> String.concat dirSep
-      | _ -> path
-
-    let toString path = path
-    let length path = String.length path
-
-    let concat dirname filename =
-      let isDirSep s i =
-        let c = (s.[i] [@doesNotRaise]) in
-        c = '/' || c = '\\' || c = ':'
-      in
-      let l = length dirname in
-      if l = 0 || isDirSep dirname (l - 1) then dirname ^ filename
-      else dirname ^ dirSep ^ filename
-  end
-
-  let concat (dirname : string) filename =
-    let open Path in
-    Path.concat (normalize dirname) filename |> toString
-end
diff --git a/jscomp/gentype/GenTypeConfig.ml b/jscomp/gentype/GenTypeConfig.ml
deleted file mode 100644
index 9e5ec19..0000000
--- a/jscomp/gentype/GenTypeConfig.ml
+++ /dev/null
@@ -1,248 +0,0 @@
-module ModuleNameMap = Map.Make (ModuleName)
-
-type module_ = CommonJS | ESModule
-
-(** Compatibility for `compilerOptions.moduleResolution` in TypeScript projects. *)
-type moduleResolution =
-  | Node  (** should drop extension on import statements *)
-  | Node16
-      (** should use TS output's extension (e.g. `.gen.js`) on import statements *)
-  | Bundler
-      (** should use TS input's extension (e.g. `.gen.tsx`) on import statements *)
-
-type bsVersion = int * int * int
-
-type t = {
-  mutable bsbProjectRoot: string;
-  bsDependencies: string list;
-  mutable emitImportCurry: bool;
-  mutable emitImportReact: bool;
-  mutable emitTypePropDone: bool;
-  mutable everything: bool;
-  exportInterfaces: bool;
-  generatedFileExtension: string option;
-  module_: module_;
-  moduleResolution: moduleResolution;
-  namespace: string option;
-  platformLib: string;
-  mutable projectRoot: string;
-  shimsMap: ModuleName.t ModuleNameMap.t;
-  sources: Ext_json_types.t option;
-  suffix: string;
-}
-
-let default =
-  {
-    bsbProjectRoot = "";
-    bsDependencies = [];
-    emitImportCurry = false;
-    emitImportReact = false;
-    emitTypePropDone = false;
-    everything = false;
-    exportInterfaces = false;
-    generatedFileExtension = None;
-    module_ = ESModule;
-    moduleResolution = Node;
-    namespace = None;
-    platformLib = "";
-    projectRoot = "";
-    shimsMap = ModuleNameMap.empty;
-    sources = None;
-    suffix = ".bs.js";
-  }
-
-let bsPlatformLib ~config =
-  match config.module_ with
-  | ESModule -> config.platformLib ^ "/lib/es6"
-  | CommonJS -> config.platformLib ^ "/lib/js"
-
-let getBsCurryPath ~config = Filename.concat (bsPlatformLib ~config) "curry.js"
-
-type map = Ext_json_types.t Map_string.t
-
-let getOpt s (map : map) = Map_string.find_opt map s
-
-let getBool s map =
-  match map |> getOpt s with
-  | Some (True _) -> Some true
-  | Some (False _) -> Some false
-  | _ -> None
-
-let getStringOption s map =
-  match map |> getOpt s with
-  | Some (Str {str}) -> Some str
-  | _ -> None
-
-let getShims map =
-  let shims = ref [] in
-  (match map |> getOpt "shims" with
-  | Some (Obj {map = shimsMap}) ->
-    Map_string.iter shimsMap (fun fromModule toModule ->
-        match toModule with
-        | Ext_json_types.Str {str} -> shims := (fromModule, str) :: !shims
-        | _ -> ())
-  | Some (Arr {content}) ->
-    (* To be deprecated: array of strings *)
-    content
-    |> Array.iter (fun x ->
-           match x with
-           | Ext_json_types.Str {str} ->
-             let fromTo = str |> String.split_on_char '=' |> Array.of_list in
-             assert (Array.length fromTo == 2);
-             shims :=
-               ((fromTo.(0) [@doesNotRaise]), (fromTo.(1) [@doesNotRaise]))
-               :: !shims
-           | _ -> ())
-  | _ -> ());
-  !shims
-
-let setDebug ~gtconf =
-  match gtconf |> getOpt "debug" with
-  | Some (Obj {map}) -> Map_string.iter map Debug.setItem
-  | _ -> ()
-
-let compilerConfigFile = "rescript.json"
-let legacyCompilerConfigFile = "bsconfig.json"
-
-let rec findProjectRoot ~dir =
-  if
-    Sys.file_exists (Filename.concat dir compilerConfigFile)
-    || Sys.file_exists (Filename.concat dir legacyCompilerConfigFile)
-  then dir
-  else
-    let parent = dir |> Filename.dirname in
-    if parent = dir then (
-      prerr_endline
-        ("Error: cannot find project root containing " ^ compilerConfigFile
-       ^ ".");
-      assert false)
-    else findProjectRoot ~dir:parent
-
-let readConfig ~getConfigFile ~namespace =
-  let projectRoot = findProjectRoot ~dir:(Sys.getcwd ()) in
-  let bsbProjectRoot =
-    match Sys.getenv_opt "BSB_PROJECT_ROOT" with
-    | None -> projectRoot
-    | Some s -> s
-  in
-  let parseConfig ~bsconf ~gtconf =
-    let moduleString = gtconf |> getStringOption "module" in
-    let moduleResolutionString = gtconf |> getStringOption "moduleResolution" in
-    let exportInterfacesBool = gtconf |> getBool "exportInterfaces" in
-    let generatedFileExtensionStringOption =
-      gtconf |> getStringOption "generatedFileExtension"
-    in
-    let shimsMap =
-      gtconf |> getShims
-      |> List.fold_left
-           (fun map (fromModule, toModule) ->
-             let moduleName =
-               (fromModule |> ModuleName.fromStringUnsafe : ModuleName.t)
-             in
-             let shimModuleName = toModule |> ModuleName.fromStringUnsafe in
-             ModuleNameMap.add moduleName shimModuleName map)
-           ModuleNameMap.empty
-    in
-    setDebug ~gtconf;
-    let module_ =
-      let packageSpecsModuleString =
-        match bsconf |> getOpt "package-specs" with
-        | Some (Obj {map = packageSpecs}) ->
-          packageSpecs |> getStringOption "module"
-        | _ -> None
-      in
-      (* Give priority to gentypeconfig, followed by package-specs *)
-      match (moduleString, packageSpecsModuleString) with
-      | Some "commonjs", _ -> CommonJS
-      | Some ("esmodule" | "es6"), _ -> ESModule
-      | None, Some "commonjs" -> CommonJS
-      | None, Some ("esmodule" | "es6" | "es6-global") -> ESModule
-      | _ -> default.module_
-    in
-    let moduleResolution =
-      match moduleResolutionString with
-      | Some "node" -> Node
-      | Some "node16" -> Node16
-      | Some "bundler" -> Bundler
-      | _ -> default.moduleResolution
-    in
-    let exportInterfaces =
-      match exportInterfacesBool with
-      | None -> default.exportInterfaces
-      | Some b -> b
-    in
-    let generatedFileExtension = generatedFileExtensionStringOption in
-    let externalStdlib = bsconf |> getStringOption "external-stdlib" in
-    let platformLib =
-      match externalStdlib with
-      | None -> "rescript"
-      | Some externalStdlib -> externalStdlib
-    in
-    if !Debug.config then (
-      Log_.item "Project roLiterals.bsconfig_jsonot: %s\n" projectRoot;
-      if bsbProjectRoot <> projectRoot then
-        Log_.item "bsb project root: %s\n" bsbProjectRoot;
-      Log_.item "Config module:%s shims:%d entries \n"
-        (match moduleString with
-        | None -> ""
-        | Some s -> s)
-        (shimsMap |> ModuleNameMap.cardinal));
-    let namespace =
-      match bsconf |> getOpt "namespace" with
-      | Some (True _) -> namespace
-      | _ -> default.namespace
-    in
-    let suffix =
-      match bsconf |> getStringOption "suffix" with
-      | Some s -> s
-      | _ -> default.suffix
-    in
-    let bsDependencies =
-      match bsconf |> getOpt "bs-dependencies" with
-      | Some (Arr {content}) ->
-        let strings = ref [] in
-        content
-        |> Array.iter (fun x ->
-               match x with
-               | Ext_json_types.Str {str} -> strings := str :: !strings
-               | _ -> ());
-        !strings
-      | _ -> default.bsDependencies
-    in
-    let sources =
-      match bsconf |> getOpt "sources" with
-      | Some sourceItem -> Some sourceItem
-      | _ -> default.sources
-    in
-    let everything = false in
-    {
-      bsbProjectRoot;
-      bsDependencies;
-      suffix;
-      emitImportCurry = false;
-      emitImportReact = false;
-      emitTypePropDone = false;
-      everything;
-      exportInterfaces;
-      generatedFileExtension;
-      module_;
-      moduleResolution;
-      namespace;
-      platformLib;
-      projectRoot;
-      shimsMap;
-      sources;
-    }
-  in
-  match getConfigFile ~projectRoot with
-  | Some bsConfigFile -> (
-    try
-      let json = bsConfigFile |> Ext_json_parse.parse_json_from_file in
-      match json with
-      | Obj {map = bsconf} -> (
-        match bsconf |> getOpt "gentypeconfig" with
-        | Some (Obj {map = gtconf}) -> parseConfig ~bsconf ~gtconf
-        | _ -> default)
-      | _ -> default
-    with _ -> default)
-  | None -> default
diff --git a/jscomp/gentype/GenTypeMain.ml b/jscomp/gentype/GenTypeMain.ml
deleted file mode 100644
index 5b733f1..0000000
--- a/jscomp/gentype/GenTypeMain.ml
+++ /dev/null
@@ -1,170 +0,0 @@
-module StringSet = Set.Make (String)
-
-let cmtCheckAnnotations ~checkAnnotation inputCMT =
-  match inputCMT.Cmt_format.cmt_annots with
-  | Implementation structure ->
-    structure |> Annotation.structureCheckAnnotation ~checkAnnotation
-  | Interface signature ->
-    signature |> Annotation.signatureCheckAnnotation ~checkAnnotation
-  | _ -> false
-
-let cmtHasTypeErrors inputCMT =
-  match inputCMT.Cmt_format.cmt_annots with
-  | Partial_implementation _ | Partial_interface _ -> true
-  | _ -> false
-
-let structureItemIsDeclaration structItem =
-  match structItem.Typedtree.str_desc with
-  | Typedtree.Tstr_type _ | Tstr_modtype _ | Tstr_module _ -> true
-  | _ -> false
-
-let signatureItemIsDeclaration signatureItem =
-  match signatureItem.Typedtree.sig_desc with
-  | Typedtree.Tsig_type _ | Tsig_modtype _ -> true
-  | _ -> false
-
-let inputCmtTranslateTypeDeclarations ~config ~outputFileRelative ~resolver
-    inputCMT : CodeItem.translation =
-  let {Cmt_format.cmt_annots} = inputCMT in
-  let typeEnv = TypeEnv.root () in
-  let translations =
-    match cmt_annots with
-    | Implementation structure ->
-      {
-        structure with
-        str_items =
-          structure.str_items |> List.filter structureItemIsDeclaration;
-      }
-      |> TranslateStructure.translateStructure ~config ~outputFileRelative
-           ~resolver ~typeEnv
-    | Interface signature ->
-      {
-        signature with
-        sig_items =
-          signature.sig_items |> List.filter signatureItemIsDeclaration;
-      }
-      |> TranslateSignature.translateSignature ~config ~outputFileRelative
-           ~resolver ~typeEnv
-    | Packed _ | Partial_implementation _ | Partial_interface _ -> []
-  in
-  translations |> Translation.combine
-  |> Translation.addTypeDeclarationsFromModuleEquations ~typeEnv
-
-let translateCMT ~config ~outputFileRelative ~resolver inputCMT : Translation.t
-    =
-  let {Cmt_format.cmt_annots} = inputCMT in
-  let typeEnv = TypeEnv.root () in
-  let translations =
-    match cmt_annots with
-    | Implementation structure ->
-      structure
-      |> TranslateStructure.translateStructure ~config ~outputFileRelative
-           ~resolver ~typeEnv
-    | Interface signature ->
-      signature
-      |> TranslateSignature.translateSignature ~config ~outputFileRelative
-           ~resolver ~typeEnv
-    | _ -> []
-  in
-  translations |> Translation.combine
-  |> Translation.addTypeDeclarationsFromModuleEquations ~typeEnv
-
-let emitTranslation ~config ~fileName ~outputFile ~outputFileRelative ~resolver
-    ~sourceFile translation =
-  let codeText =
-    translation
-    |> EmitJs.emitTranslationAsString ~config ~fileName ~outputFileRelative
-         ~resolver ~inputCmtTranslateTypeDeclarations
-  in
-  let fileContents =
-    EmitType.fileHeader ~sourceFile:(Filename.basename sourceFile)
-    ^ "\n" ^ codeText ^ "\n"
-  in
-  GeneratedFiles.writeFileIfRequired ~outputFile ~fileContents
-
-let readCmt cmtFile =
-  try Cmt_format.read_cmt cmtFile
-  with Cmi_format.Error _ ->
-    Log_.item "Error loading %s\n\n" cmtFile;
-    Log_.item "It looks like you might have stale compilation artifacts.\n";
-    Log_.item "Try to clean and rebuild.\n\n";
-    assert false
-
-let processCmtFile cmt =
-  let config = Paths.readConfig ~namespace:(cmt |> Paths.findNameSpace) in
-  if !Debug.basic then Log_.item "Cmt %s\n" cmt;
-  let cmtFile = cmt |> Paths.getCmtFile in
-  if cmtFile <> "" then
-    let outputFile = cmt |> Paths.getOutputFile ~config in
-    let outputFileRelative = cmt |> Paths.getOutputFileRelative ~config in
-    let fileName = cmt |> Paths.getModuleName in
-    let isInterface = Filename.check_suffix cmtFile ".cmti" in
-    let resolver =
-      ModuleResolver.createLazyResolver ~config ~extensions:[".res"; ".shim.ts"]
-        ~excludeFile:(fun fname ->
-          fname = "React.res" || fname = "ReasonReact.res")
-    in
-    let inputCMT, hasGenTypeAnnotations =
-      let inputCMT = readCmt cmtFile in
-      let ignoreInterface = ref false in
-      let checkAnnotation ~loc:_ attributes =
-        if
-          attributes
-          |> Annotation.getAttributePayload
-               Annotation.tagIsGenTypeIgnoreInterface
-          <> None
-        then ignoreInterface := true;
-        attributes
-        |> Annotation.getAttributePayload
-             Annotation.tagIsOneOfTheGenTypeAnnotations
-        <> None
-      in
-      let hasGenTypeAnnotations =
-        inputCMT |> cmtCheckAnnotations ~checkAnnotation
-      in
-      if isInterface then
-        let cmtFileImpl =
-          (cmtFile |> (Filename.chop_extension [@doesNotRaise])) ^ ".cmt"
-        in
-        let inputCMTImpl = readCmt cmtFileImpl in
-        let hasGenTypeAnnotationsImpl =
-          inputCMTImpl
-          |> cmtCheckAnnotations ~checkAnnotation:(fun ~loc attributes ->
-                 if attributes |> checkAnnotation ~loc then (
-                   if not !ignoreInterface then (
-                     Log_.Color.setup ();
-                     Log_.info ~loc ~name:"Warning genType" (fun ppf () ->
-                         Format.fprintf ppf
-                           "Annotation is ignored as there's a .rei file"));
-                   true)
-                 else false)
-        in
-        ( (match !ignoreInterface with
-          | true -> inputCMTImpl
-          | false -> inputCMT),
-          match !ignoreInterface with
-          | true -> hasGenTypeAnnotationsImpl
-          | false -> hasGenTypeAnnotations )
-      else (inputCMT, hasGenTypeAnnotations)
-    in
-    if hasGenTypeAnnotations then
-      let sourceFile =
-        match inputCMT.cmt_annots |> FindSourceFile.cmt with
-        | Some sourceFile -> sourceFile
-        | None -> (
-          (fileName |> ModuleName.toString)
-          ^
-          match isInterface with
-          | true -> ".resi"
-          | false -> ".res")
-      in
-      inputCMT
-      |> translateCMT ~config ~outputFileRelative ~resolver
-      |> emitTranslation ~config ~fileName ~outputFile ~outputFileRelative
-           ~resolver ~sourceFile
-    else if inputCMT |> cmtHasTypeErrors then
-      outputFile |> GeneratedFiles.logFileAction TypeError
-    else (
-      outputFile |> GeneratedFiles.logFileAction NoMatch;
-      if Sys.file_exists outputFile then Sys.remove outputFile)
-[@@live]
diff --git a/jscomp/gentype/GeneratedFiles.ml b/jscomp/gentype/GeneratedFiles.ml
deleted file mode 100644
index 5b22a99..0000000
--- a/jscomp/gentype/GeneratedFiles.ml
+++ /dev/null
@@ -1,52 +0,0 @@
-type fileAction =
-  | NoMatch (* No @genType annotation found. *)
-  | Replace (* Replace existing file on disk with new contents. *)
-  | Identical (* File already on disk with identical contents. Skip. *)
-  | TypeError
-    (* The cmt file was produced after a type error -- don't delete generated files. *)
-  | Write (* File not present on disk. *)
-
-let logFileAction fileAction fileName =
-  if !Debug.basic then
-    Log_.item "%s  %s\n"
-      (match fileAction with
-      | NoMatch -> "NoMatch"
-      | Replace -> "Replace"
-      | Identical -> "Identical"
-      | TypeError -> "TypeError"
-      | Write -> "Write")
-      fileName
-
-let readLines (file : string) : string list =
-  let lines = ref [] in
-  let chan = open_in file in
-  let finished_lines =
-    try
-      while true do
-        lines := input_line chan :: !lines
-      done;
-      []
-    with End_of_file ->
-      close_in chan [@doesNotRaise];
-      !lines |> List.rev
-  in
-  finished_lines
-
-let readFile (file : string) : string = String.concat "\n" (readLines file)
-
-let writeFile (filePath : string) (contents : string) =
-  let outFile = open_out filePath in
-  output_string outFile contents;
-  close_out outFile [@doesNotRaise]
-
-let writeFileIfRequired ~outputFile ~fileContents =
-  if Sys.file_exists outputFile then
-    let oldContents = readFile outputFile in
-    let identical = oldContents = fileContents in
-    if identical then outputFile |> logFileAction Identical
-    else (
-      outputFile |> logFileAction Replace;
-      writeFile outputFile fileContents)
-  else (
-    outputFile |> logFileAction Write;
-    writeFile outputFile fileContents)
diff --git a/jscomp/gentype/ImportPath.ml b/jscomp/gentype/ImportPath.ml
deleted file mode 100644
index a1c1114..0000000
--- a/jscomp/gentype/ImportPath.ml
+++ /dev/null
@@ -1,29 +0,0 @@
-open GenTypeCommon
-
-type t = string * string
-
-let bsCurryPath ~config = ("", Config.getBsCurryPath ~config)
-
-let fromModule ~dir ~importExtension moduleName =
-  let withNoPath =
-    (moduleName |> ModuleName.toString |> ScopedPackage.removeGeneratedModule)
-    ^ importExtension
-  in
-  (dir, withNoPath)
-
-let fromStringUnsafe s = ("", s)
-
-let chopExtensionSafe (dir, s) =
-  try (dir, s |> Filename.chop_extension) with Invalid_argument _ -> (dir, s)
-
-let dump (dir, s) = NodeFilename.concat dir s
-
-let toCmt ~(config : Config.t) ~outputFileRelative (dir, s) =
-  let open Filename in
-  concat (outputFileRelative |> dirname) ((dir, s) |> chopExtensionSafe |> dump)
-  ^ (match config.namespace with
-    | None -> ""
-    | Some name -> "-" ^ name)
-  ^ ".cmt"
-
-let emit (dir, s) = (dir, s) |> dump
diff --git a/jscomp/gentype/ImportPath.mli b/jscomp/gentype/ImportPath.mli
deleted file mode 100644
index 740e629..0000000
--- a/jscomp/gentype/ImportPath.mli
+++ /dev/null
@@ -1,11 +0,0 @@
-open GenTypeCommon
-
-type t
-
-val bsCurryPath : config:Config.t -> t
-val chopExtensionSafe : t -> t [@@live]
-val dump : t -> string
-val emit : t -> string
-val fromModule : dir:string -> importExtension:string -> ModuleName.t -> t
-val fromStringUnsafe : string -> t
-val toCmt : config:Config.t -> outputFileRelative:string -> t -> string
diff --git a/jscomp/gentype/Indent.ml b/jscomp/gentype/Indent.ml
deleted file mode 100644
index f0282b3..0000000
--- a/jscomp/gentype/Indent.ml
+++ /dev/null
@@ -1,23 +0,0 @@
-type t = string option
-
-let break ~indent =
-  match indent with
-  | None -> ""
-  | Some s -> "\n" ^ s
-let more indent =
-  match indent with
-  | None -> None
-  | Some s -> Some ("  " ^ s)
-
-let heuristicFields ~indent fields =
-  let threshold = 2 in
-  match fields |> List.length > threshold && indent = None with
-  | true -> Some ""
-  | false -> indent
-
-let heuristicVariants ~indent rendered =
-  let threshold = 40 in
-  let break = rendered |> String.concat " " |> String.length > threshold in
-  match break && indent = None with
-  | true -> Some "  "
-  | false -> indent
diff --git a/jscomp/gentype/Log_.ml b/jscomp/gentype/Log_.ml
deleted file mode 100644
index 377821f..0000000
--- a/jscomp/gentype/Log_.ml
+++ /dev/null
@@ -1,101 +0,0 @@
-module Color = struct
-  type color = Red | Yellow | Magenta | Cyan
-  type style = FG of color | Bold | Dim
-
-  let code_of_style = function
-    | FG Red -> "31"
-    | FG Yellow -> "33"
-    | FG Magenta -> "35"
-    | FG Cyan -> "36"
-    | Bold -> "1"
-    | Dim -> "2"
-
-  let style_of_stag s =
-    match s with
-    | Format.String_tag "error" -> [Bold; FG Red]
-    | Format.String_tag "warning" -> [Bold; FG Magenta]
-    | Format.String_tag "info" -> [Bold; FG Yellow]
-    | Format.String_tag "dim" -> [Dim]
-    | Format.String_tag "filename" -> [FG Cyan]
-    | _ -> []
-
-  let ansi_of_stag s =
-    let l = style_of_stag s in
-    let s = String.concat ";" (List.map code_of_style l) in
-    "\027[" ^ s ^ "m"
-
-  let reset_lit = "\027[0m"
-
-  let color_functions =
-    (({
-        mark_open_stag = (fun s -> ansi_of_stag s);
-        mark_close_stag = (fun _ -> reset_lit);
-        print_open_stag = (fun _ -> ());
-        print_close_stag = (fun _ -> ());
-      }
-       : Format.formatter_stag_functions)
-      : Format.formatter_stag_functions)
-
-  let setup () =
-    Format.pp_set_mark_tags Format.std_formatter true;
-    Format.pp_set_formatter_stag_functions Format.std_formatter color_functions
-
-  let error ppf s = Format.fprintf ppf "@{<error>%s@}" s [@@dead "Color.error"]
-  let info ppf s = Format.fprintf ppf "@{<info>%s@}" s
-end
-
-module Loc = struct
-  let print_filename ppf file =
-    match file with
-    (* modified *)
-    | "_none_" | "" -> Format.fprintf ppf "(No file name)"
-    | real_file -> Format.fprintf ppf "%s" (Location.show_filename real_file)
-
-  let print_loc ~normalizedRange ppf (loc : Location.t) =
-    let file, _, _ = Location.get_pos_info loc.loc_start in
-    if file = "//toplevel//" then
-      Format.fprintf ppf "Characters %i-%i" loc.loc_start.pos_cnum
-        loc.loc_end.pos_cnum
-    else
-      let dim_loc ppf = function
-        | None -> ()
-        | Some
-            ((start_line, start_line_start_char), (end_line, end_line_end_char))
-          ->
-          if start_line = end_line then
-            if start_line_start_char = end_line_end_char then
-              Format.fprintf ppf ":@{<dim>%i:%i@}" start_line
-                start_line_start_char
-            else
-              Format.fprintf ppf ":@{<dim>%i:%i-%i@}" start_line
-                start_line_start_char end_line_end_char
-          else
-            Format.fprintf ppf ":@{<dim>%i:%i-%i:%i@}" start_line
-              start_line_start_char end_line end_line_end_char
-      in
-      Format.fprintf ppf "@{<filename>%a@}%a" print_filename file dim_loc
-        normalizedRange
-
-  let print ppf (loc : Location.t) =
-    let _file, start_line, start_char = Location.get_pos_info loc.loc_start in
-    let _, end_line, end_char = Location.get_pos_info loc.loc_end in
-    let normalizedRange =
-      if start_char == -1 || end_char == -1 then None
-      else if start_line = end_line && start_char >= end_char then
-        let same_char = start_char + 1 in
-        Some ((start_line, same_char), (end_line, same_char))
-      else Some ((start_line, start_char + 1), (end_line, end_char))
-    in
-
-    Format.fprintf ppf "@[%a@]" (print_loc ~normalizedRange) loc
-end
-
-let item x =
-  Format.fprintf Format.std_formatter "  ";
-  Format.fprintf Format.std_formatter x
-
-let logKind body ~color ~loc ~name =
-  Format.fprintf Format.std_formatter "@[<v 2>@,%a@,%a@,%a@]@." color name
-    Loc.print loc body ()
-
-let info body ~loc ~name = logKind body ~color:Color.info ~loc ~name
diff --git a/jscomp/gentype/ModuleExtension.ml b/jscomp/gentype/ModuleExtension.ml
deleted file mode 100644
index c983f4e..0000000
--- a/jscomp/gentype/ModuleExtension.ml
+++ /dev/null
@@ -1,28 +0,0 @@
-open GenTypeCommon
-
-let shimTsOutputFileExtension ~(config : Config.t) =
-  match config.moduleResolution with
-  | Node -> ".shim"
-  | Node16 -> ".shim.js"
-  | Bundler -> ".shim.ts"
-
-let generatedFilesExtension ~(config : Config.t) =
-  match config.generatedFileExtension with
-  | Some s ->
-    (* from .foo.bar to .foo *)
-    Filename.remove_extension s
-  | None -> ".gen"
-
-let tsInputFileSuffix ~(config : Config.t) =
-  match config.generatedFileExtension with
-  | Some s when Filename.extension s <> "" (* double extension  *) -> s
-  | _ -> generatedFilesExtension ~config ^ ".tsx"
-
-let tsOutputFileSuffix ~(config : Config.t) =
-  generatedFilesExtension ~config ^ ".js"
-
-let generatedModuleExtension ~(config : Config.t) =
-  match config.moduleResolution with
-  | Node -> generatedFilesExtension ~config
-  | Node16 -> tsOutputFileSuffix ~config
-  | Bundler -> tsInputFileSuffix ~config
diff --git a/jscomp/gentype/ModuleName.ml b/jscomp/gentype/ModuleName.ml
deleted file mode 100644
index 549942e..0000000
--- a/jscomp/gentype/ModuleName.ml
+++ /dev/null
@@ -1,28 +0,0 @@
-type t = string
-
-let curry = "Curry"
-let rescriptPervasives = "RescriptPervasives"
-
-let sanitizeId s =
-  let s =
-    if String.contains s '.' || String.contains s '[' || String.contains s ']'
-    then
-      s
-      |> String.map (function
-           | '.' | '[' | ']' -> '_'
-           | c -> c)
-    else s
-  in
-  if s <> "" && (s.[0] [@doesNotRaise]) >= 'A' && (s.[0] [@doesNotRaise]) <= 'z'
-  then s
-  else "_" ^ s
-
-let forJsFile s = sanitizeId s ^ "JS"
-
-let forInnerModule ~fileName ~innerModuleName =
-  (fileName |> forJsFile) ^ "." ^ innerModuleName
-
-let fromStringUnsafe s = s
-let toString s = s
-let compare (s1 : string) s2 = compare s1 s2
-let uncapitalize = String.uncapitalize_ascii
diff --git a/jscomp/gentype/ModuleName.mli b/jscomp/gentype/ModuleName.mli
deleted file mode 100644
index bf1fa3d..0000000
--- a/jscomp/gentype/ModuleName.mli
+++ /dev/null
@@ -1,13 +0,0 @@
-type t
-
-val compare : t -> t -> int
-val curry : t
-val forJsFile : t -> t
-val forInnerModule : fileName:t -> innerModuleName:string -> t
-
-val fromStringUnsafe : string -> t
-(** Used to turn strings read from external files into module names. *)
-
-val rescriptPervasives : t
-val toString : t -> string
-val uncapitalize : t -> t
diff --git a/jscomp/gentype/ModuleResolver.ml b/jscomp/gentype/ModuleResolver.ml
deleted file mode 100644
index 838ecca..0000000
--- a/jscomp/gentype/ModuleResolver.ml
+++ /dev/null
@@ -1,284 +0,0 @@
-open GenTypeCommon
-module ModuleNameMap = Map.Make (ModuleName)
-
-let ( +++ ) = Filename.concat
-
-(** Read all the dirs from a library in node_modules *)
-let readBsDependenciesDirs ~root =
-  let dirs = ref [] in
-  let rec findSubDirs dir =
-    let absDir =
-      match dir = "" with
-      | true -> root
-      | false -> root +++ dir
-    in
-    if Sys.file_exists absDir && Sys.is_directory absDir then (
-      dirs := dir :: !dirs;
-      absDir |> Sys.readdir |> Array.iter (fun d -> findSubDirs (dir +++ d)))
-  in
-  findSubDirs "";
-  !dirs
-
-type pkgs = {dirs: string list; pkgs: (string, string) Hashtbl.t}
-
-let readDirsFromConfig ~(config : Config.t) =
-  let dirs = ref [] in
-  let root = config.projectRoot in
-  let ( +++ ) = Filename.concat in
-  let rec processDir ~subdirs dir =
-    let absDir =
-      match dir = "" with
-      | true -> root
-      | false -> root +++ dir
-    in
-    if Sys.file_exists absDir && Sys.is_directory absDir then (
-      dirs := dir :: !dirs;
-      if subdirs then
-        absDir |> Sys.readdir
-        |> Array.iter (fun d -> processDir ~subdirs (dir +++ d)))
-  in
-  let rec processSourceItem (sourceItem : Ext_json_types.t) =
-    match sourceItem with
-    | Str {str} -> str |> processDir ~subdirs:false
-    | Obj {map} -> (
-      match Map_string.find_opt map "dir" with
-      | Some (Str {str}) ->
-        let subdirs =
-          match Map_string.find_opt map "subdirs" with
-          | Some (True _) -> true
-          | Some (False _) -> false
-          | _ -> false
-        in
-        str |> processDir ~subdirs
-      | _ -> ())
-    | Arr {content} -> Array.iter processSourceItem content
-    | _ -> ()
-  in
-  (match config.sources with
-  | Some sourceItem -> processSourceItem sourceItem
-  | None -> ());
-  !dirs
-
-let readSourceDirs ~(config : Config.t) =
-  let sourceDirs =
-    ["lib"; "bs"; ".sourcedirs.json"]
-    |> List.fold_left ( +++ ) config.bsbProjectRoot
-  in
-  let dirs = ref [] in
-  let pkgs = Hashtbl.create 1 in
-  let readDirs json =
-    match json with
-    | Ext_json_types.Obj {map} -> (
-      match Map_string.find_opt map "dirs" with
-      | Some (Arr {content}) ->
-        content
-        |> Array.iter (fun x ->
-               match x with
-               | Ext_json_types.Str {str} -> dirs := str :: !dirs
-               | _ -> ());
-        ()
-      | _ -> ())
-    | _ -> ()
-  in
-  let readPkgs json =
-    match json with
-    | Ext_json_types.Obj {map} -> (
-      match Map_string.find_opt map "pkgs" with
-      | Some (Arr {content}) ->
-        content
-        |> Array.iter (fun x ->
-               match x with
-               | Ext_json_types.Arr
-                   {content = [|Str {str = name}; Str {str = path}|]} ->
-                 Hashtbl.add pkgs name path
-               | _ -> ());
-        ()
-      | _ -> ())
-    | _ -> ()
-  in
-  if sourceDirs |> Sys.file_exists then
-    try
-      let json = sourceDirs |> Ext_json_parse.parse_json_from_file in
-      if config.bsbProjectRoot <> config.projectRoot then
-        dirs := readDirsFromConfig ~config
-      else readDirs json;
-      readPkgs json
-    with _ -> ()
-  else (
-    Log_.item "Warning: can't find source dirs: %s\n" sourceDirs;
-    Log_.item "Types for cross-references will not be found by genType.\n";
-    dirs := readDirsFromConfig ~config);
-  {dirs = !dirs; pkgs}
-
-(** Read the project's .sourcedirs.json file if it exists
-   and build a map of the files with the given extension
-   back to the directory where they belong. *)
-let sourcedirsJsonToMap ~config ~extensions ~excludeFile =
-  let rec chopExtensions fname =
-    match fname |> Filename.chop_extension with
-    | fnameChopped -> fnameChopped |> chopExtensions
-    | exception _ -> fname
-  in
-  let fileMap = ref ModuleNameMap.empty in
-  let bsDependenciesFileMap = ref ModuleNameMap.empty in
-  let filterGivenExtension fileName =
-    extensions |> List.exists (fun ext -> Filename.check_suffix fileName ext)
-    && not (excludeFile fileName)
-  in
-  let addDir ~dirOnDisk ~dirEmitted ~filter ~map =
-    dirOnDisk |> Sys.readdir
-    |> Array.iter (fun fname ->
-           if fname |> filter then
-             map :=
-               !map
-               |> ModuleNameMap.add
-                    (fname |> chopExtensions |> ModuleName.fromStringUnsafe)
-                    dirEmitted)
-  in
-  let {dirs; pkgs} = readSourceDirs ~config in
-  dirs
-  |> List.iter (fun dir ->
-         addDir ~dirEmitted:dir
-           ~dirOnDisk:(config.projectRoot +++ dir)
-           ~filter:filterGivenExtension ~map:fileMap);
-  config.bsDependencies
-  |> List.iter (fun packageName ->
-         match Hashtbl.find pkgs packageName with
-         | path ->
-           let root = ["lib"; "bs"] |> List.fold_left ( +++ ) path in
-           let filter fileName =
-             [".cmt"; ".cmti"]
-             |> List.exists (fun ext -> Filename.check_suffix fileName ext)
-           in
-           readBsDependenciesDirs ~root
-           |> List.iter (fun dir ->
-                  let dirOnDisk = root +++ dir in
-                  let dirEmitted = packageName +++ dir in
-                  addDir ~dirEmitted ~dirOnDisk ~filter
-                    ~map:bsDependenciesFileMap)
-         | exception Not_found -> ());
-  (!fileMap, !bsDependenciesFileMap)
-
-type case = Lowercase | Uppercase
-
-type resolver = {
-  lazyFind:
-    (useBsDependencies:bool -> ModuleName.t -> (string * case * bool) option)
-    Lazy.t;
-}
-
-let createLazyResolver ~config ~extensions ~excludeFile =
-  {
-    lazyFind =
-      lazy
-        (let moduleNameMap, bsDependenciesFileMap =
-           sourcedirsJsonToMap ~config ~extensions ~excludeFile
-         in
-         let find ~bsDependencies ~map moduleName =
-           match map |> ModuleNameMap.find moduleName with
-           | resolvedModuleDir ->
-             Some (resolvedModuleDir, Uppercase, bsDependencies)
-           | exception Not_found -> (
-             match
-               map |> ModuleNameMap.find (moduleName |> ModuleName.uncapitalize)
-             with
-             | resolvedModuleDir ->
-               Some (resolvedModuleDir, Lowercase, bsDependencies)
-             | exception Not_found -> None)
-         in
-         fun ~useBsDependencies moduleName ->
-           match
-             moduleName |> find ~bsDependencies:false ~map:moduleNameMap
-           with
-           | None when useBsDependencies ->
-             moduleName |> find ~bsDependencies:true ~map:bsDependenciesFileMap
-           | res -> res);
-  }
-
-let apply ~resolver ~useBsDependencies moduleName =
-  moduleName |> Lazy.force resolver.lazyFind ~useBsDependencies
-
-(** Resolve a reference to ModuleName, and produce a path suitable for require.
-   E.g. require "../foo/bar/ModuleName.ext" where ext is ".res" or ".js". *)
-let resolveModule ~(config : Config.t) ~importExtension ~outputFileRelative
-    ~resolver ~useBsDependencies moduleName =
-  let outputFileRelativeDir =
-    (* e.g. src if we're generating src/File.bs.js *)
-    Filename.dirname outputFileRelative
-  in
-  let outputFileAbsoluteDir = config.projectRoot +++ outputFileRelativeDir in
-  let moduleNameResFile =
-    (* Check if the module is in the same directory as the file being generated.
-       So if e.g. project_root/src/ModuleName.res exists. *)
-    outputFileAbsoluteDir +++ (ModuleName.toString moduleName ^ ".res")
-  in
-  let candidate =
-    (* e.g. import "./Modulename.ext" *)
-    moduleName
-    |> ImportPath.fromModule ~dir:Filename.current_dir_name ~importExtension
-  in
-  if Sys.file_exists moduleNameResFile then candidate
-  else
-    let rec pathToList path =
-      let isRoot = path |> Filename.basename = path in
-      match isRoot with
-      | true -> [path]
-      | false ->
-        (path |> Filename.basename) :: (path |> Filename.dirname |> pathToList)
-    in
-    match moduleName |> apply ~resolver ~useBsDependencies with
-    | None -> candidate
-    | Some (resolvedModuleDir, case, bsDependencies) ->
-      (* e.g. "dst" in case of dst/ModuleName.res *)
-      let walkUpOutputDir =
-        outputFileRelativeDir |> pathToList
-        |> List.map (fun _ -> Filename.parent_dir_name)
-        |> fun l ->
-        match l with
-        | [] -> ""
-        | _ :: rest -> rest |> List.fold_left ( +++ ) Filename.parent_dir_name
-      in
-      let fromOutputDirToModuleDir =
-        (* e.g. "../dst" *)
-        match bsDependencies with
-        | true -> resolvedModuleDir
-        | false -> walkUpOutputDir +++ resolvedModuleDir
-      in
-      (* e.g. import "../dst/ModuleName.ext" *)
-      (match case = Uppercase with
-      | true -> moduleName
-      | false -> moduleName |> ModuleName.uncapitalize)
-      |> ImportPath.fromModule ~dir:fromOutputDirToModuleDir ~importExtension
-
-let resolveGeneratedModule ~config ~outputFileRelative ~resolver moduleName =
-  if !Debug.moduleResolution then
-    Log_.item "Resolve Generated Module: %s\n"
-      (moduleName |> ModuleName.toString);
-  let importPath =
-    resolveModule ~config
-      ~importExtension:(ModuleExtension.generatedModuleExtension ~config)
-      ~outputFileRelative ~resolver ~useBsDependencies:true moduleName
-  in
-  if !Debug.moduleResolution then
-    Log_.item "Import Path: %s\n" (importPath |> ImportPath.dump);
-  importPath
-
-(** Returns the path to import a given Reason module name. *)
-let importPathForReasonModuleName ~(config : Config.t) ~outputFileRelative
-    ~resolver moduleName =
-  if !Debug.moduleResolution then
-    Log_.item "Resolve Reason Module: %s\n" (moduleName |> ModuleName.toString);
-  match config.shimsMap |> ModuleNameMap.find moduleName with
-  | shimModuleName ->
-    if !Debug.moduleResolution then
-      Log_.item "ShimModuleName: %s\n" (shimModuleName |> ModuleName.toString);
-    let importExtension = ModuleExtension.shimTsOutputFileExtension ~config in
-    let importPath =
-      resolveModule ~config ~importExtension ~outputFileRelative ~resolver
-        ~useBsDependencies:false shimModuleName
-    in
-    if !Debug.moduleResolution then
-      Log_.item "Import Path: %s\n" (importPath |> ImportPath.dump);
-    importPath
-  | exception Not_found ->
-    moduleName |> resolveGeneratedModule ~config ~outputFileRelative ~resolver
diff --git a/jscomp/gentype/NamedArgs.ml b/jscomp/gentype/NamedArgs.ml
deleted file mode 100644
index a5c0d06..0000000
--- a/jscomp/gentype/NamedArgs.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-open GenTypeCommon
-
-let group labeledTypes =
-  let types =
-    Ext_list.map labeledTypes (fun (lbl, aType) ->
-        match lbl with
-        | Nolabel -> {aName = ""; aType}
-        | Label lbl -> {aName = lbl; aType}
-        | OptLabel lbl -> {aName = lbl; aType = Option aType})
-  in
-  match types with
-  | [{aType}] when aType = unitT ->
-    [] (* treat a single argument of type unit as no argument *)
-  | _ -> types
diff --git a/jscomp/gentype/Paths.ml b/jscomp/gentype/Paths.ml
deleted file mode 100644
index ed95905..0000000
--- a/jscomp/gentype/Paths.ml
+++ /dev/null
@@ -1,74 +0,0 @@
-open GenTypeCommon
-
-let concat = Filename.concat
-
-let handleNamespace cmt =
-  let cutAfterDash s =
-    match String.index s '-' with
-    | n -> String.sub s 0 n [@doesNotRaise]
-    | exception Not_found -> s
-  in
-  let noDir = Filename.basename cmt = cmt in
-  if noDir then cmt |> (Filename.chop_extension [@doesNotRaise]) |> cutAfterDash
-  else
-    let dir = cmt |> Filename.dirname in
-    let base =
-      cmt |> Filename.basename |> (Filename.chop_extension [@doesNotRaise])
-      |> cutAfterDash
-    in
-    Filename.concat dir base
-
-let findNameSpace cmt =
-  let keepAfterDash s =
-    match String.index s '-' with
-    | n ->
-      Some ((String.sub s (n + 1) [@doesNotRaise]) (String.length s - n - 1))
-    | exception Not_found -> None
-  in
-  cmt |> Filename.basename |> (Filename.chop_extension [@doesNotRaise])
-  |> keepAfterDash
-
-let getOutputFileRelative ~config cmt =
-  (cmt |> handleNamespace) ^ ModuleExtension.tsInputFileSuffix ~config
-
-let getOutputFile ~(config : Config.t) cmt =
-  Filename.concat config.projectRoot (getOutputFileRelative ~config cmt)
-
-let getModuleName cmt =
-  cmt |> handleNamespace |> Filename.basename |> ModuleName.fromStringUnsafe
-
-let getCmtFile cmt =
-  let pathCmt = Filename.concat (Sys.getcwd ()) cmt in
-  let cmtFile =
-    if Filename.check_suffix pathCmt ".cmt" then
-      let pathCmtLowerCase =
-        let dirName = pathCmt |> Filename.dirname in
-        let baseName = pathCmt |> Filename.basename in
-        Filename.concat dirName (baseName |> String.uncapitalize_ascii)
-      in
-      let pathCmti =
-        (Filename.chop_extension pathCmt [@doesNotRaise]) ^ ".cmti"
-      in
-      let pathCmtiLowerCase =
-        (Filename.chop_extension pathCmtLowerCase [@doesNotRaise]) ^ ".cmti"
-      in
-      if Sys.file_exists pathCmtiLowerCase then pathCmtiLowerCase
-      else if Sys.file_exists pathCmti then pathCmti
-      else if Sys.file_exists pathCmtLowerCase then pathCmtLowerCase
-      else if Sys.file_exists pathCmt then pathCmt
-      else ""
-    else ""
-  in
-  cmtFile
-
-let getConfigFile ~projectRoot =
-  let config = concat projectRoot Config.compilerConfigFile in
-  match config |> Sys.file_exists with
-  | true -> Some config
-  | false -> (
-    let config = concat projectRoot Config.legacyCompilerConfigFile in
-    match config |> Sys.file_exists with
-    | true -> Some config
-    | false -> None)
-
-let readConfig ~namespace = Config.readConfig ~getConfigFile ~namespace
diff --git a/jscomp/gentype/ResolvedName.ml b/jscomp/gentype/ResolvedName.ml
deleted file mode 100644
index 0c41d23..0000000
--- a/jscomp/gentype/ResolvedName.ml
+++ /dev/null
@@ -1,58 +0,0 @@
-type t = string list
-
-let dot s x = x @ [s]
-let fromString x = [x]
-let toList x = x
-let toString x = x |> String.concat "_"
-
-type eq = t * t
-
-module NameSet = Set.Make (struct
-  type nonrec t = t
-
-  let rec compare (x : t) (y : t) =
-    match (x, y) with
-    | [], [] -> 0
-    | [], _ :: _ -> -1
-    | _ :: _, [] -> -1
-    | s1 :: rest1, s2 :: rest2 -> (
-      let n = String.compare s1 s2 in
-      match n <> 0 with
-      | true -> n
-      | false -> compare rest1 rest2)
-end)
-
-let rec applyEquation ~(el : t) (eq : eq) : t list =
-  match (eq, el) with
-  | ([], rhs), _ -> [rhs @ el]
-  | (s1 :: rest1, rhs), s2 :: rest2 -> (
-    match s1 = s2 with
-    | true -> (rest1, rhs) |> applyEquation ~el:rest2
-    | false -> [])
-  | (_ :: _, _), [] -> []
-
-let rec applyEquationsToElements ~(eqs : eq list) ~seen (elements : t list) :
-    eq list =
-  let applyEqs el =
-    let freshElements =
-      eqs
-      |> List.map (applyEquation ~el)
-      |> List.concat
-      |> List.filter (fun y -> not (NameSet.mem y seen))
-    in
-    freshElements |> List.map (fun elFresh -> (elFresh, el))
-  in
-  let newEquations = elements |> List.map applyEqs |> List.concat in
-  let newElements = newEquations |> List.map fst in
-  let newSeen = NameSet.union seen (newElements |> NameSet.of_list) in
-  match newEquations = [] with
-  | true -> newEquations
-  | false ->
-    newEquations @ (newElements |> applyEquationsToElements ~eqs ~seen:newSeen)
-
-(* Apply equations of the form e.g. X.Y = A from the alias: module A = X.Y.
-   Return a list of equations on types.
-   E.g. if the element is X.Y.t, return equation A.t = X.Y.t *)
-
-let applyEquations ~(eqs : eq list) (el : t) : eq list =
-  [el] |> applyEquationsToElements ~eqs ~seen:NameSet.empty
diff --git a/jscomp/gentype/ResolvedName.mli b/jscomp/gentype/ResolvedName.mli
deleted file mode 100644
index 00a7804..0000000
--- a/jscomp/gentype/ResolvedName.mli
+++ /dev/null
@@ -1,8 +0,0 @@
-type t
-type eq = t * t
-
-val applyEquations : eqs:eq list -> t -> eq list
-val dot : string -> t -> t
-val fromString : string -> t
-val toList : t -> string list
-val toString : t -> string
diff --git a/jscomp/gentype/Runtime.ml b/jscomp/gentype/Runtime.ml
deleted file mode 100644
index 2238fa7..0000000
--- a/jscomp/gentype/Runtime.ml
+++ /dev/null
@@ -1,36 +0,0 @@
-type moduleItem = string
-type moduleAccessPath = Root of string | Dot of moduleAccessPath * moduleItem
-
-let newModuleItem ~name = name
-
-let rec emitModuleAccessPath ~config moduleAccessPath =
-  match moduleAccessPath with
-  | Root s -> s
-  | Dot (p, moduleItem) ->
-    p |> emitModuleAccessPath ~config |> EmitText.fieldAccess ~label:moduleItem
-
-let jsVariantTag ~polymorphic ~tag =
-  match polymorphic with
-  | true -> "NAME"
-  | false -> (
-    match tag with
-    | Some tag -> tag
-    | None -> "TAG")
-
-let jsVariantPayloadTag ~n = "_" ^ string_of_int n
-
-let jsVariantValue ~polymorphic =
-  match polymorphic with
-  | true -> "VAL"
-  | false -> "value"
-
-let isMutableObjectField name =
-  String.length name >= 2
-  && (String.sub name (String.length name - 2) 2 [@doesNotRaise]) = "#="
-
-(** Mutable fields, i.e. fields annotated "[@bs.set]"
-   are represented as extra fields called "fieldName#="
-   preceding the normal field. *)
-let checkMutableObjectField ~previousName ~name = previousName = name ^ "#="
-
-let default = "$$default"
diff --git a/jscomp/gentype/Runtime.mli b/jscomp/gentype/Runtime.mli
deleted file mode 100644
index a7d16b4..0000000
--- a/jscomp/gentype/Runtime.mli
+++ /dev/null
@@ -1,14 +0,0 @@
-open GenTypeCommon
-
-type moduleItem
-type moduleAccessPath = Root of string | Dot of moduleAccessPath * moduleItem
-
-val checkMutableObjectField : previousName:string -> name:string -> bool
-val default : string
-val emitModuleAccessPath : config:Config.t -> moduleAccessPath -> string
-
-val isMutableObjectField : string -> bool
-val newModuleItem : name:string -> moduleItem
-val jsVariantTag : polymorphic:bool -> tag:string option -> string
-val jsVariantPayloadTag : n:int -> string
-val jsVariantValue : polymorphic:bool -> string
diff --git a/jscomp/gentype/TranslateCoreType.ml b/jscomp/gentype/TranslateCoreType.ml
deleted file mode 100644
index 0325f04..0000000
--- a/jscomp/gentype/TranslateCoreType.ml
+++ /dev/null
@@ -1,277 +0,0 @@
-open GenTypeCommon
-open! TranslateTypeExprFromTypes
-
-let removeOption ~(label : Asttypes.arg_label) (coreType : Typedtree.core_type)
-    =
-  match (coreType.ctyp_desc, label) with
-  | Ttyp_constr (Path.Pident id, _, [t]), Optional lbl
-    when Ident.name id = "option" ->
-    Some (lbl, t)
-  | Ttyp_constr (Pdot (Path.Pident nameSpace, id, _), _, [t]), Optional lbl
-    when (* This has a different representation in 4.03+  *)
-         Ident.name nameSpace = "FB" && id = "option" ->
-    Some (lbl, t)
-  | _ -> None
-
-type processVariant = {
-  noPayloads: (string * Typedtree.attributes) list;
-  payloads: (string * Typedtree.attributes * Typedtree.core_type) list;
-  inherits: Typedtree.core_type list;
-}
-
-let processVariant rowFields =
-  let rec loop ~noPayloads ~payloads ~inherits fields =
-    match fields with
-    | Typedtree.Ttag
-        ({txt = label}, attributes, _, (* only variants with no payload *) [])
-      :: otherFields ->
-      otherFields
-      |> loop
-           ~noPayloads:((label, attributes) :: noPayloads)
-           ~payloads ~inherits
-    | Ttag ({txt = label}, attributes, _, [payload]) :: otherFields ->
-      otherFields
-      |> loop ~noPayloads
-           ~payloads:((label, attributes, payload) :: payloads)
-           ~inherits
-    | Ttag (_, _, _, _ :: _ :: _) :: otherFields ->
-      (* Unknown: skipping *)
-      otherFields |> loop ~noPayloads ~payloads ~inherits
-    | Tinherit t :: otherFields ->
-      otherFields |> loop ~noPayloads ~payloads ~inherits:(t :: inherits)
-    | [] ->
-      {
-        noPayloads = noPayloads |> List.rev;
-        payloads = payloads |> List.rev;
-        inherits = inherits |> List.rev;
-      }
-  in
-  rowFields |> loop ~noPayloads:[] ~payloads:[] ~inherits:[]
-
-let rec translateArrowType ~config ~typeVarsGen ~noFunctionReturnDependencies
-    ~typeEnv ~revArgDeps ~revArgs (coreType : Typedtree.core_type) =
-  match coreType.ctyp_desc with
-  | Ttyp_arrow (Nolabel, coreType1, coreType2) ->
-    let {dependencies; type_} =
-      coreType1 |> fun __x ->
-      translateCoreType_ ~config ~typeVarsGen ~typeEnv __x
-    in
-    let nextRevDeps = List.rev_append dependencies revArgDeps in
-    coreType2
-    |> translateArrowType ~config ~typeVarsGen ~noFunctionReturnDependencies
-         ~typeEnv ~revArgDeps:nextRevDeps
-         ~revArgs:((Nolabel, type_) :: revArgs)
-  | Ttyp_arrow (((Labelled lbl | Optional lbl) as label), coreType1, coreType2)
-    -> (
-    let asLabel =
-      match coreType.ctyp_attributes |> Annotation.getGenTypeAsRenaming with
-      | Some s -> s
-      | None -> ""
-    in
-    match coreType1 |> removeOption ~label with
-    | None ->
-      let {dependencies; type_ = type1} =
-        coreType1 |> translateCoreType_ ~config ~typeVarsGen ~typeEnv
-      in
-      let nextRevDeps = List.rev_append dependencies revArgDeps in
-      coreType2
-      |> translateArrowType ~config ~typeVarsGen ~noFunctionReturnDependencies
-           ~typeEnv ~revArgDeps:nextRevDeps
-           ~revArgs:
-             (( Label
-                  (match asLabel = "" with
-                  | true -> lbl
-                  | false -> asLabel),
-                type1 )
-             :: revArgs)
-    | Some (lbl, t1) ->
-      let {dependencies; type_ = type1} =
-        t1 |> translateCoreType_ ~config ~typeVarsGen ~typeEnv
-      in
-      let nextRevDeps = List.rev_append dependencies revArgDeps in
-      coreType2
-      |> translateArrowType ~config ~typeVarsGen ~noFunctionReturnDependencies
-           ~typeEnv ~revArgDeps:nextRevDeps
-           ~revArgs:((OptLabel lbl, type1) :: revArgs))
-  | _ ->
-    let {dependencies; type_ = retType} =
-      coreType |> translateCoreType_ ~config ~typeVarsGen ~typeEnv
-    in
-    let allDeps =
-      List.rev_append revArgDeps
-        (match noFunctionReturnDependencies with
-        | true -> []
-        | false -> dependencies)
-    in
-    let labeledConvertableTypes = revArgs |> List.rev in
-    let argTypes = labeledConvertableTypes |> NamedArgs.group in
-    let functionType = Function {argTypes; retType; typeVars = []} in
-    {dependencies = allDeps; type_ = functionType}
-
-and translateCoreType_ ~config ~typeVarsGen
-    ?(noFunctionReturnDependencies = false) ~typeEnv
-    (coreType : Typedtree.core_type) =
-  match coreType.ctyp_desc with
-  | Ttyp_alias (ct, _) ->
-    ct
-    |> translateCoreType_ ~config ~typeVarsGen
-         ~noFunctionReturnDependencies:false ~typeEnv
-  | Ttyp_object (tObj, closedFlag) ->
-    let getFieldType objectField =
-      match objectField with
-      | Typedtree.OTtag ({txt = name}, _, t) ->
-        ( name,
-          match name |> Runtime.isMutableObjectField with
-          | true -> {dependencies = []; type_ = ident ""}
-          | false -> t |> translateCoreType_ ~config ~typeVarsGen ~typeEnv )
-      | OTinherit t ->
-        ("Inherit", t |> translateCoreType_ ~config ~typeVarsGen ~typeEnv)
-    in
-    let fieldsTranslations = tObj |> List.map getFieldType in
-    translateObjType
-      (match closedFlag = Closed with
-      | true -> Closed
-      | false -> Open)
-      fieldsTranslations
-  | Ttyp_constr (path, _, typeParams) ->
-    let paramsTranslation =
-      typeParams |> translateCoreTypes_ ~config ~typeVarsGen ~typeEnv
-    in
-    TranslateTypeExprFromTypes.translateConstr ~config ~paramsTranslation ~path
-      ~typeEnv
-  | Ttyp_poly (_, t) ->
-    t
-    |> translateCoreType_ ~config ~typeVarsGen ~noFunctionReturnDependencies
-         ~typeEnv
-  | Ttyp_arrow _ ->
-    coreType
-    |> translateArrowType ~config ~typeVarsGen ~noFunctionReturnDependencies
-         ~typeEnv ~revArgDeps:[] ~revArgs:[]
-  | Ttyp_tuple listExp ->
-    let innerTypesTranslation =
-      listExp |> translateCoreTypes_ ~config ~typeVarsGen ~typeEnv
-    in
-    let innerTypes = innerTypesTranslation |> List.map (fun {type_} -> type_) in
-    let innerTypesDeps =
-      innerTypesTranslation
-      |> List.map (fun {dependencies} -> dependencies)
-      |> List.concat
-    in
-    let tupleType = Tuple innerTypes in
-    {dependencies = innerTypesDeps; type_ = tupleType}
-  | Ttyp_var s -> {dependencies = []; type_ = TypeVar s}
-  | Ttyp_variant (rowFields, _, _) -> (
-    match rowFields |> processVariant with
-    | {noPayloads; payloads; inherits} ->
-      let asString =
-        coreType.ctyp_attributes
-        |> Annotation.hasAttribute Annotation.tagIsString
-      in
-      let asInt =
-        coreType.ctyp_attributes |> Annotation.hasAttribute Annotation.tagIsInt
-      in
-      let lastBsInt = ref (-1) in
-      let noPayloads =
-        noPayloads
-        |> List.map (fun (label, attributes) ->
-               let labelJS =
-                 if asString then
-                   match attributes |> Annotation.getAsString with
-                   | Some labelRenamed -> StringLabel labelRenamed
-                   | None ->
-                     if isNumber label then IntLabel label
-                     else StringLabel label
-                 else if asInt then (
-                   match attributes |> Annotation.getAsInt with
-                   | Some n ->
-                     lastBsInt := n;
-                     IntLabel (string_of_int n)
-                   | None ->
-                     lastBsInt := !lastBsInt + 1;
-                     IntLabel (string_of_int !lastBsInt))
-                 else if isNumber label then IntLabel label
-                 else StringLabel label
-               in
-               {labelJS})
-      in
-      let payloadsTranslations =
-        payloads
-        |> List.map (fun (label, attributes, payload) ->
-               ( label,
-                 attributes,
-                 payload |> translateCoreType_ ~config ~typeVarsGen ~typeEnv ))
-      in
-      let payloads =
-        payloadsTranslations
-        |> List.map (fun (label, _attributes, translation) ->
-               {
-                 case =
-                   {
-                     labelJS =
-                       (if isNumber label then IntLabel label
-                        else StringLabel label);
-                   };
-                 t = translation.type_;
-               })
-      in
-      let inheritsTranslations =
-        inherits |> translateCoreTypes_ ~config ~typeVarsGen ~typeEnv
-      in
-      let inherits = inheritsTranslations |> List.map (fun {type_} -> type_) in
-      let type_ =
-        createVariant ~noPayloads ~payloads ~inherits ~polymorphic:true
-          ~tag:None ~unboxed:false
-      in
-      let dependencies =
-        (inheritsTranslations
-        |> List.map (fun {dependencies} -> dependencies)
-        |> List.concat)
-        @ (payloadsTranslations
-          |> List.map (fun (_, _, {dependencies}) -> dependencies)
-          |> List.concat)
-      in
-      {dependencies; type_})
-  | Ttyp_package {pack_path; pack_fields} -> (
-    match typeEnv |> TypeEnv.lookupModuleTypeSignature ~path:pack_path with
-    | Some (signature, typeEnv) ->
-      let typeEquationsTranslation =
-        pack_fields
-        |> List.map (fun (x, t) ->
-               ( x.Asttypes.txt,
-                 t |> translateCoreType_ ~config ~typeVarsGen ~typeEnv ))
-      in
-      let typeEquations =
-        typeEquationsTranslation
-        |> List.map (fun (x, translation) -> (x, translation.type_))
-      in
-      let dependenciesFromTypeEquations =
-        typeEquationsTranslation
-        |> List.map (fun (_, translation) -> translation.dependencies)
-        |> List.flatten
-      in
-      let typeEnv1 = typeEnv |> TypeEnv.addTypeEquations ~typeEquations in
-      let dependenciesFromRecordType, type_ =
-        signature.sig_type
-        |> signatureToModuleRuntimeRepresentation ~config ~typeVarsGen
-             ~typeEnv:typeEnv1
-      in
-      {
-        dependencies = dependenciesFromTypeEquations @ dependenciesFromRecordType;
-        type_;
-      }
-    | None -> {dependencies = []; type_ = unknown})
-  | Ttyp_any | Ttyp_class _ -> {dependencies = []; type_ = unknown}
-
-and translateCoreTypes_ ~config ~typeVarsGen ~typeEnv typeExprs :
-    translation list =
-  typeExprs |> List.map (translateCoreType_ ~config ~typeVarsGen ~typeEnv)
-
-let translateCoreType ~config ~typeEnv coreType =
-  let typeVarsGen = GenIdent.createTypeVarsGen () in
-  let translation =
-    coreType |> translateCoreType_ ~config ~typeVarsGen ~typeEnv
-  in
-  if !Debug.dependencies then
-    translation.dependencies
-    |> List.iter (fun dep -> Log_.item "Dependency: %s\n" (dep |> depToString));
-  translation
diff --git a/jscomp/gentype/TranslateSignature.ml b/jscomp/gentype/TranslateSignature.ml
deleted file mode 100644
index a38890a..0000000
--- a/jscomp/gentype/TranslateSignature.ml
+++ /dev/null
@@ -1,171 +0,0 @@
-open GenTypeCommon
-
-let translateSignatureValue ~config ~outputFileRelative ~resolver ~typeEnv
-    (valueDescription : Typedtree.value_description) : Translation.t =
-  let {Typedtree.val_attributes; val_desc; val_id; val_loc} =
-    valueDescription
-  in
-  if !Debug.translation then
-    Log_.item "Translate Signature Value %s\n" (val_id |> Ident.name);
-  let typeExpr = val_desc.ctyp_type in
-  let addAnnotationsToFunction type_ = type_ in
-  match
-    (val_id, val_attributes |> Annotation.fromAttributes ~config ~loc:val_loc)
-  with
-  | id, GenType ->
-    id |> Ident.name
-    |> Translation.translateValue ~attributes:val_attributes ~config
-         ~docString:(Annotation.docStringFromAttrs val_attributes)
-         ~outputFileRelative ~resolver ~typeEnv ~typeExpr
-         ~addAnnotationsToFunction
-  | _ -> Translation.empty
-
-let rec translateModuleDeclaration ~config ~outputFileRelative ~resolver
-    ~typeEnv ({md_id; md_type} : Typedtree.module_declaration) =
-  let name = md_id |> Ident.name in
-  if !Debug.translation then Log_.item "Translate Module Declaration %s\n" name;
-  let typeEnv = typeEnv |> TypeEnv.newModule ~name in
-  match md_type.mty_desc with
-  | Tmty_signature signature ->
-    signature
-    |> translateSignature ~config ~outputFileRelative ~resolver ~typeEnv
-    |> Translation.combine
-  | Tmty_ident (path, _) -> (
-    match typeEnv |> TypeEnv.lookupModuleTypeSignature ~path with
-    | None -> Translation.empty
-    | Some (signature, _) ->
-      signature
-      |> translateSignature ~config ~outputFileRelative ~resolver ~typeEnv
-      |> Translation.combine)
-  | Tmty_functor _ ->
-    logNotImplemented ("Tmty_functor " ^ __LOC__);
-    Translation.empty
-  | Tmty_with _ ->
-    logNotImplemented ("Tmty_with " ^ __LOC__);
-    Translation.empty
-  | Tmty_typeof _ ->
-    logNotImplemented ("Tmty_typeof " ^ __LOC__);
-    Translation.empty
-  | Tmty_alias _ ->
-    logNotImplemented ("Tmty_alias " ^ __LOC__);
-    Translation.empty
-
-and translateModuleTypeDeclaration ~config ~outputFileRelative ~resolver
-    ~typeEnv (moduleTypeDeclaration : Typedtree.module_type_declaration) =
-  if !Debug.translation then
-    Log_.item "Translate Module Type Declaration %s\n"
-      (moduleTypeDeclaration.mtd_id |> Ident.name);
-  match moduleTypeDeclaration with
-  | {mtd_type = None} -> Translation.empty
-  | {mtd_id; mtd_type = Some mtd_type} -> (
-    match mtd_type.mty_desc with
-    | Tmty_signature signature ->
-      let name = mtd_id |> Ident.name in
-      (* Only translate types *)
-      let signature_without_values =
-        {
-          signature with
-          sig_items =
-            Ext_list.filter signature.sig_items (function
-              | {sig_desc = Tsig_value _} -> false
-              | _ -> true);
-        }
-      in
-      let translation =
-        signature_without_values
-        |> translateSignature ~config ~outputFileRelative ~resolver
-             ~typeEnv:(typeEnv |> TypeEnv.newModuleType ~name ~signature)
-        |> Translation.combine
-      in
-      translation
-    | Tmty_ident _ ->
-      logNotImplemented ("Tmty_ident " ^ __LOC__);
-      Translation.empty
-    | Tmty_functor _ ->
-      logNotImplemented ("Tmty_functor " ^ __LOC__);
-      Translation.empty
-    | Tmty_with _ ->
-      logNotImplemented ("Tmty_with " ^ __LOC__);
-      Translation.empty
-    | Tmty_typeof _ ->
-      logNotImplemented ("Tmty_typeof " ^ __LOC__);
-      Translation.empty
-    | Tmty_alias _ ->
-      logNotImplemented ("Tmty_alias " ^ __LOC__);
-      Translation.empty)
-
-and translateSignatureItem ~config ~outputFileRelative ~resolver ~typeEnv
-    signatureItem : Translation.t =
-  match signatureItem with
-  | {Typedtree.sig_desc = Typedtree.Tsig_type (recFlag, typeDeclarations)} ->
-    {
-      importTypes = [];
-      codeItems = [];
-      typeDeclarations =
-        typeDeclarations
-        |> TranslateTypeDeclarations.translateTypeDeclarations ~config
-             ~outputFileRelative ~recursive:(recFlag = Recursive) ~resolver
-             ~typeEnv;
-    }
-  | {Typedtree.sig_desc = Tsig_value valueDescription} ->
-    let isImport =
-      valueDescription.val_attributes
-      |> Annotation.hasAttribute Annotation.tagIsGenTypeImport
-    in
-    if valueDescription.val_prim <> [] || isImport then
-      valueDescription
-      |> Translation.translatePrimitive ~config ~outputFileRelative ~resolver
-           ~typeEnv
-    else
-      let moduleItem =
-        Runtime.newModuleItem ~name:(valueDescription.val_id |> Ident.name)
-      in
-      typeEnv |> TypeEnv.updateModuleItem ~moduleItem;
-      valueDescription
-      |> translateSignatureValue ~config ~outputFileRelative ~resolver ~typeEnv
-  | {Typedtree.sig_desc = Typedtree.Tsig_module moduleDeclaration} ->
-    moduleDeclaration
-    |> translateModuleDeclaration ~config ~outputFileRelative ~resolver ~typeEnv
-  | {Typedtree.sig_desc = Typedtree.Tsig_modtype moduleTypeDeclaration} ->
-    let moduleItem =
-      Runtime.newModuleItem ~name:(moduleTypeDeclaration.mtd_id |> Ident.name)
-    in
-    let config =
-      moduleTypeDeclaration.mtd_attributes
-      |> Annotation.updateConfigForModule ~config
-    in
-    typeEnv |> TypeEnv.updateModuleItem ~moduleItem;
-    moduleTypeDeclaration
-    |> translateModuleTypeDeclaration ~config ~outputFileRelative ~resolver
-         ~typeEnv
-  | {Typedtree.sig_desc = Typedtree.Tsig_typext _} ->
-    logNotImplemented ("Tsig_typext " ^ __LOC__);
-    Translation.empty
-  | {Typedtree.sig_desc = Typedtree.Tsig_exception _} ->
-    logNotImplemented ("Tsig_exception " ^ __LOC__);
-    Translation.empty
-  | {Typedtree.sig_desc = Typedtree.Tsig_recmodule _} ->
-    logNotImplemented ("Tsig_recmodule " ^ __LOC__);
-    Translation.empty
-  | {Typedtree.sig_desc = Typedtree.Tsig_open _} ->
-    logNotImplemented ("Tsig_open " ^ __LOC__);
-    Translation.empty
-  | {Typedtree.sig_desc = Typedtree.Tsig_include _} ->
-    logNotImplemented ("Tsig_include " ^ __LOC__);
-    Translation.empty
-  | {Typedtree.sig_desc = Typedtree.Tsig_class _} ->
-    logNotImplemented ("Tsig_class " ^ __LOC__);
-    Translation.empty
-  | {Typedtree.sig_desc = Typedtree.Tsig_class_type _} ->
-    logNotImplemented ("Tsig_class_type " ^ __LOC__);
-    Translation.empty
-  | {Typedtree.sig_desc = Typedtree.Tsig_attribute _} ->
-    logNotImplemented ("Tsig_attribute " ^ __LOC__);
-    Translation.empty
-
-and translateSignature ~config ~outputFileRelative ~resolver ~typeEnv signature
-    : Translation.t list =
-  if !Debug.translation then Log_.item "Translate Signature\n";
-  signature.Typedtree.sig_items
-  |> List.map
-       (translateSignatureItem ~config ~outputFileRelative ~resolver ~typeEnv)
diff --git a/jscomp/gentype/TranslateSignatureFromTypes.ml b/jscomp/gentype/TranslateSignatureFromTypes.ml
deleted file mode 100644
index 27c9d63..0000000
--- a/jscomp/gentype/TranslateSignatureFromTypes.ml
+++ /dev/null
@@ -1,109 +0,0 @@
-open GenTypeCommon
-
-(** Like translateTypeDeclaration but from Types not Typedtree  *)
-let translateTypeDeclarationFromTypes ~config ~outputFileRelative ~resolver
-    ~typeEnv ~id
-    ({type_attributes; type_kind; type_loc; type_manifest; type_params} :
-      Types.type_declaration) : CodeItem.typeDeclaration list =
-  typeEnv |> TypeEnv.newType ~name:(id |> Ident.name);
-  let typeName = Ident.name id in
-  let typeVars = type_params |> TypeVars.extractFromTypeExpr in
-  if !Debug.translation then
-    Log_.item "Translate Types.type_declaration %s\n" typeName;
-  let declarationKind =
-    match type_kind with
-    | Type_record (labelDeclarations, recordRepresentation) ->
-      TranslateTypeDeclarations.RecordDeclarationFromTypes
-        (labelDeclarations, recordRepresentation)
-    | Type_variant constructorDeclarations
-      when not
-             (TranslateTypeDeclarations.hasSomeGADTLeaf constructorDeclarations)
-      ->
-      VariantDeclarationFromTypes constructorDeclarations
-    | Type_abstract -> GeneralDeclarationFromTypes type_manifest
-    | _ -> NoDeclaration
-  in
-  declarationKind
-  |> TranslateTypeDeclarations.traslateDeclarationKind ~config ~loc:type_loc
-       ~outputFileRelative ~resolver ~typeAttributes:type_attributes ~typeEnv
-       ~typeName ~typeVars
-
-(** Like translateModuleDeclaration but from Types not Typedtree *)
-let rec translateModuleDeclarationFromTypes ~config ~outputFileRelative
-    ~resolver ~typeEnv ~id (moduleDeclaration : Types.module_declaration) :
-    Translation.t =
-  match moduleDeclaration.md_type with
-  | Mty_signature signature ->
-    let name = id |> Ident.name in
-    signature
-    |> translateSignatureFromTypes ~config ~outputFileRelative ~resolver
-         ~typeEnv:(typeEnv |> TypeEnv.newModule ~name)
-    |> Translation.combine
-  | Mty_ident _ ->
-    logNotImplemented ("Mty_ident " ^ __LOC__);
-    Translation.empty
-  | Mty_functor _ ->
-    logNotImplemented ("Mty_functor " ^ __LOC__);
-    Translation.empty
-  | Mty_alias _ ->
-    logNotImplemented ("Mty_alias " ^ __LOC__);
-    Translation.empty
-
-(** Like translateSignatureItem but from Types not Typedtree  *)
-and translateSignatureItemFromTypes ~config ~outputFileRelative ~resolver
-    ~typeEnv (signatureItem : Types.signature_item) : Translation.t =
-  match signatureItem with
-  | Types.Sig_type (id, typeDeclaration, _) ->
-    {
-      importTypes = [];
-      codeItems = [];
-      typeDeclarations =
-        typeDeclaration
-        |> translateTypeDeclarationFromTypes ~config ~outputFileRelative
-             ~resolver ~typeEnv ~id;
-    }
-  | Types.Sig_module (id, moduleDeclaration, _) ->
-    let moduleItem = Runtime.newModuleItem ~name:(id |> Ident.name) in
-    let config =
-      moduleDeclaration.md_attributes
-      |> Annotation.updateConfigForModule ~config
-    in
-    typeEnv |> TypeEnv.updateModuleItem ~moduleItem;
-    moduleDeclaration
-    |> translateModuleDeclarationFromTypes ~config ~outputFileRelative ~resolver
-         ~typeEnv ~id
-  | Types.Sig_value (id, {val_attributes; val_loc; val_type}) ->
-    let name = id |> Ident.name in
-    if !Debug.translation then Log_.item "Translate Sig Value %s\n" name;
-    let moduleItem = Runtime.newModuleItem ~name in
-    typeEnv |> TypeEnv.updateModuleItem ~moduleItem;
-    if
-      val_attributes |> Annotation.fromAttributes ~config ~loc:val_loc = GenType
-    then
-      name
-      |> Translation.translateValue ~attributes:val_attributes ~config
-           ~docString:(Annotation.docStringFromAttrs val_attributes)
-           ~outputFileRelative ~resolver ~typeEnv ~typeExpr:val_type
-           ~addAnnotationsToFunction:(fun t -> t)
-    else Translation.empty
-  | Types.Sig_typext _ ->
-    logNotImplemented ("Sig_typext " ^ __LOC__);
-    Translation.empty
-  | Types.Sig_modtype _ ->
-    logNotImplemented ("Sig_modtype " ^ __LOC__);
-    Translation.empty
-  | Types.Sig_class _ ->
-    logNotImplemented ("Sig_class " ^ __LOC__);
-    Translation.empty
-  | Types.Sig_class_type _ ->
-    logNotImplemented ("Sig_class_type " ^ __LOC__);
-    Translation.empty
-
-(** Like translateSignature but from Types not Typedtree *)
-and translateSignatureFromTypes ~config ~outputFileRelative ~resolver ~typeEnv
-    (signature : Types.signature_item list) : Translation.t list =
-  if !Debug.translation then Log_.item "Translate Types.signature\n";
-  signature
-  |> List.map
-       (translateSignatureItemFromTypes ~config ~outputFileRelative ~resolver
-          ~typeEnv)
diff --git a/jscomp/gentype/TranslateStructure.ml b/jscomp/gentype/TranslateStructure.ml
deleted file mode 100644
index 1fd23b0..0000000
--- a/jscomp/gentype/TranslateStructure.ml
+++ /dev/null
@@ -1,355 +0,0 @@
-open GenTypeCommon
-
-let rec addAnnotationsToTypes_ ~config ~(expr : Typedtree.expression)
-    (argTypes : argType list) =
-  match (expr.exp_desc, expr.exp_type.desc, argTypes) with
-  | Texp_function {arg_label; param; cases = [{c_rhs}]}, _, {aType} :: nextTypes
-    ->
-    let nextTypes1 = nextTypes |> addAnnotationsToTypes_ ~config ~expr:c_rhs in
-    let aName = Ident.name param in
-    let _ = Printtyped.implementation in
-    let aName =
-      if aName = "*opt*" then
-        match arg_label with
-        | Optional l -> l
-        | _ -> "" (* should not happen *)
-      else aName
-    in
-    {aName; aType} :: nextTypes1
-  | Texp_construct ({txt = Lident "Function$"}, _, [funExpr]), _, _ ->
-    (* let uncurried1: function$<_, _> = Function$(x => x |> string_of_int, [`Has_arity1]) *)
-    addAnnotationsToTypes_ ~config ~expr:funExpr argTypes
-  | Texp_apply ({exp_desc = Texp_ident (path, _, _)}, [(_, Some expr1)]), _, _
-    -> (
-    match path |> TranslateTypeExprFromTypes.pathToList |> List.rev with
-    | ["Js"; "Internal"; fn_mk]
-      when (* Uncurried function definition uses Js.Internal.fn_mkX(...) *)
-           String.length fn_mk >= 5
-           && (String.sub fn_mk 0 5 [@doesNotRaise]) = "fn_mk" ->
-      argTypes |> addAnnotationsToTypes_ ~config ~expr:expr1
-    | _ -> argTypes)
-  | _ -> argTypes
-
-and addAnnotationsToTypes ~config ~(expr : Typedtree.expression)
-    (argTypes : argType list) =
-  let argTypes = addAnnotationsToTypes_ ~config ~expr argTypes in
-  if argTypes |> List.filter (fun {aName} -> aName = "param") |> List.length > 1
-  then
-    (* Underscore "_" appears as "param", can occur more than once *)
-    argTypes
-    |> List.mapi (fun i {aName; aType} ->
-           {aName = aName ^ "_" ^ string_of_int i; aType})
-  else argTypes
-
-and addAnnotationsToFields ~config (expr : Typedtree.expression)
-    (fields : fields) (argTypes : argType list) =
-  match (expr.exp_desc, fields, argTypes) with
-  | _, [], _ -> ([], argTypes |> addAnnotationsToTypes ~config ~expr)
-  | Texp_function {cases = [{c_rhs}]}, field :: nextFields, _ ->
-    let nextFields1, types1 =
-      addAnnotationsToFields ~config c_rhs nextFields argTypes
-    in
-    let name =
-      TranslateTypeDeclarations.renameRecordField
-        ~attributes:expr.exp_attributes ~name:field.nameJS
-    in
-    ({field with nameJS = name} :: nextFields1, types1)
-  | _ -> (fields, argTypes)
-[@@live]
-
-(** Recover from expr the renaming annotations on named arguments. *)
-let addAnnotationsToFunctionType ~config (expr : Typedtree.expression)
-    (type_ : type_) =
-  match type_ with
-  | Function function_ ->
-    let argTypes = function_.argTypes |> addAnnotationsToTypes ~config ~expr in
-    Function {function_ with argTypes}
-  | _ -> type_
-
-let removeValueBindingDuplicates structureItems =
-  let rec processBindings (bindings : Typedtree.value_binding list) ~seen =
-    match bindings with
-    | ({vb_pat = {pat_desc = Tpat_var (id, _)}} as binding) :: otherBindings ->
-      let name = Ident.name id in
-      if !seen |> StringSet.mem name then otherBindings |> processBindings ~seen
-      else (
-        seen := !seen |> StringSet.add name;
-        binding :: (otherBindings |> processBindings ~seen))
-    | binding :: otherBindings ->
-      binding :: (otherBindings |> processBindings ~seen)
-    | [] -> []
-  in
-  let rec processItems (items : Typedtree.structure_item list) ~acc ~seen =
-    match items with
-    | ({Typedtree.str_desc = Tstr_value (loc, valueBindings)} as item)
-      :: otherItems ->
-      let bindings = valueBindings |> processBindings ~seen in
-      let item = {item with str_desc = Tstr_value (loc, bindings)} in
-      otherItems |> processItems ~acc:(item :: acc) ~seen
-    | item :: otherItems -> otherItems |> processItems ~acc:(item :: acc) ~seen
-    | [] -> acc
-  in
-  structureItems |> List.rev |> processItems ~acc:[] ~seen:(ref StringSet.empty)
-
-let translateValueBinding ~config ~outputFileRelative ~resolver ~typeEnv
-    {Typedtree.vb_attributes; vb_expr; vb_pat} : Translation.t =
-  match vb_pat.pat_desc with
-  | Tpat_var (id, _) | Tpat_alias ({pat_desc = Tpat_any}, id, _) ->
-    let name = id |> Ident.name in
-    if !Debug.translation then Log_.item "Translate Value Binding %s\n" name;
-    let moduleItem = Runtime.newModuleItem ~name in
-    typeEnv |> TypeEnv.updateModuleItem ~moduleItem;
-    if
-      vb_attributes
-      |> Annotation.fromAttributes ~config ~loc:vb_pat.pat_loc
-      = GenType
-    then
-      id |> Ident.name
-      |> Translation.translateValue ~attributes:vb_attributes ~config
-           ~docString:(Annotation.docStringFromAttrs vb_attributes)
-           ~outputFileRelative ~resolver ~typeEnv ~typeExpr:vb_pat.pat_type
-           ~addAnnotationsToFunction:
-             (addAnnotationsToFunctionType ~config vb_expr)
-    else Translation.empty
-  | _ -> Translation.empty
-
-let rec removeDuplicateValueBindings
-    (structureItems : Typedtree.structure_item list) =
-  match structureItems with
-  | ({Typedtree.str_desc = Tstr_value (loc, valueBindings)} as structureItem)
-    :: rest ->
-    let boundInRest, filteredRest = rest |> removeDuplicateValueBindings in
-    let valueBindingsFiltered =
-      valueBindings
-      |> List.filter (fun valueBinding ->
-             match valueBinding with
-             | {Typedtree.vb_pat = {pat_desc = Tpat_var (id, _)}} ->
-               not (boundInRest |> StringSet.mem (id |> Ident.name))
-             | _ -> true)
-    in
-    let bound =
-      valueBindings
-      |> List.fold_left
-           (fun bound (valueBinding : Typedtree.value_binding) ->
-             match valueBinding with
-             | {vb_pat = {pat_desc = Tpat_var (id, _)}} ->
-               bound |> StringSet.add (id |> Ident.name)
-             | _ -> bound)
-           boundInRest
-    in
-    ( bound,
-      {structureItem with str_desc = Tstr_value (loc, valueBindingsFiltered)}
-      :: filteredRest )
-  | structureItem :: rest ->
-    let boundInRest, filteredRest = rest |> removeDuplicateValueBindings in
-    (boundInRest, structureItem :: filteredRest)
-  | [] -> (StringSet.empty, [])
-
-let rec translateModuleBinding ~(config : GenTypeConfig.t) ~outputFileRelative
-    ~resolver ~typeEnv
-    ({mb_id; mb_expr; mb_attributes} : Typedtree.module_binding) : Translation.t
-    =
-  let name = mb_id |> Ident.name in
-  if !Debug.translation then Log_.item "Translate Module Binding %s\n" name;
-  let moduleItem = Runtime.newModuleItem ~name in
-  let config = mb_attributes |> Annotation.updateConfigForModule ~config in
-  typeEnv |> TypeEnv.updateModuleItem ~moduleItem;
-  let typeEnv = typeEnv |> TypeEnv.newModule ~name in
-  match mb_expr.mod_desc with
-  | Tmod_ident (path, _) -> (
-    let dep = path |> Dependencies.fromPath ~config ~typeEnv in
-    let internal = dep |> Dependencies.isInternal in
-    typeEnv |> TypeEnv.addModuleEquation ~dep ~internal;
-    match Env.scrape_alias mb_expr.mod_env mb_expr.mod_type with
-    | Mty_signature signature ->
-      (* Treat module M = N as include N *)
-      signature
-      |> TranslateSignatureFromTypes.translateSignatureFromTypes ~config
-           ~outputFileRelative ~resolver ~typeEnv
-      |> Translation.combine
-    | Mty_alias _ | Mty_ident _ | Mty_functor _ -> Translation.empty)
-  | Tmod_structure structure ->
-    let isLetPrivate =
-      mb_attributes |> Annotation.hasAttribute Annotation.tagIsInternLocal
-    in
-    if isLetPrivate then Translation.empty
-    else
-      structure
-      |> translateStructure ~config ~outputFileRelative ~resolver ~typeEnv
-      |> Translation.combine
-  | Tmod_apply _ -> (
-    (* Only look at the resulting type of the module *)
-    match mb_expr.mod_type with
-    | Mty_signature signature ->
-      signature
-      |> TranslateSignatureFromTypes.translateSignatureFromTypes ~config
-           ~outputFileRelative ~resolver ~typeEnv
-      |> Translation.combine
-    | Mty_ident _ ->
-      logNotImplemented ("Mty_ident " ^ __LOC__);
-      Translation.empty
-    | Mty_functor _ ->
-      logNotImplemented ("Mty_functor " ^ __LOC__);
-      Translation.empty
-    | Mty_alias _ ->
-      logNotImplemented ("Mty_alias " ^ __LOC__);
-      Translation.empty)
-  | Tmod_unpack (_, moduleType) -> (
-    match moduleType with
-    | Mty_signature signature ->
-      signature
-      |> TranslateSignatureFromTypes.translateSignatureFromTypes ~config
-           ~outputFileRelative ~resolver ~typeEnv
-      |> Translation.combine
-    | Mty_ident path -> (
-      match typeEnv |> TypeEnv.lookupModuleTypeSignature ~path with
-      | None -> Translation.empty
-      | Some (signature, _) ->
-        signature
-        |> TranslateSignature.translateSignature ~config ~outputFileRelative
-             ~resolver ~typeEnv
-        |> Translation.combine)
-    | Mty_functor _ ->
-      logNotImplemented ("Mty_functor " ^ __LOC__);
-      Translation.empty
-    | Mty_alias _ ->
-      logNotImplemented ("Mty_alias " ^ __LOC__);
-      Translation.empty)
-  | Tmod_functor _ ->
-    logNotImplemented ("Tmod_functor " ^ __LOC__);
-    Translation.empty
-  | Tmod_constraint (_, Mty_ident path, Tmodtype_explicit _, Tcoerce_none) -> (
-    match typeEnv |> TypeEnv.lookupModuleTypeSignature ~path with
-    | None -> Translation.empty
-    | Some (signature, _) ->
-      signature
-      |> TranslateSignature.translateSignature ~config ~outputFileRelative
-           ~resolver ~typeEnv
-      |> Translation.combine)
-  | Tmod_constraint
-      (_, Mty_signature signature, Tmodtype_explicit _, Tcoerce_none) ->
-    signature
-    |> TranslateSignatureFromTypes.translateSignatureFromTypes ~config
-         ~outputFileRelative ~resolver ~typeEnv
-    |> Translation.combine
-  | Tmod_constraint
-      ( {mod_desc = Tmod_structure structure},
-        _,
-        Tmodtype_implicit,
-        Tcoerce_structure _ ) ->
-    {
-      structure with
-      str_items = structure.str_items |> removeDuplicateValueBindings |> snd;
-    }
-    |> translateStructure ~config ~outputFileRelative ~resolver ~typeEnv
-    |> Translation.combine
-  | Tmod_constraint
-      ( _,
-        _,
-        Tmodtype_explicit {mty_desc = Tmty_signature {sig_type = signature}},
-        _ ) ->
-    signature
-    |> TranslateSignatureFromTypes.translateSignatureFromTypes ~config
-         ~outputFileRelative ~resolver ~typeEnv
-    |> Translation.combine
-  | Tmod_constraint _ ->
-    logNotImplemented ("Tmod_constraint " ^ __LOC__);
-    Translation.empty
-
-and translateStructureItem ~config ~outputFileRelative ~resolver ~typeEnv
-    (structItem : Typedtree.structure_item) : Translation.t =
-  match structItem with
-  | {str_desc = Tstr_type (recFlag, typeDeclarations)} ->
-    {
-      importTypes = [];
-      codeItems = [];
-      typeDeclarations =
-        typeDeclarations
-        |> TranslateTypeDeclarations.translateTypeDeclarations ~config
-             ~outputFileRelative ~recursive:(recFlag = Recursive) ~resolver
-             ~typeEnv;
-    }
-  | {str_desc = Tstr_value (_loc, valueBindings)} ->
-    valueBindings
-    |> List.map
-         (translateValueBinding ~config ~outputFileRelative ~resolver ~typeEnv)
-    |> Translation.combine
-  | {str_desc = Tstr_primitive valueDescription} ->
-    (* external declaration *)
-    valueDescription
-    |> Translation.translatePrimitive ~config ~outputFileRelative ~resolver
-         ~typeEnv
-  | {str_desc = Tstr_module moduleBinding} ->
-    moduleBinding
-    |> translateModuleBinding ~config ~outputFileRelative ~resolver ~typeEnv
-  | {str_desc = Tstr_modtype moduleTypeDeclaration} ->
-    moduleTypeDeclaration
-    |> TranslateSignature.translateModuleTypeDeclaration ~config
-         ~outputFileRelative ~resolver ~typeEnv
-  | {str_desc = Tstr_recmodule moduleBindings} ->
-    moduleBindings
-    |> List.map
-         (translateModuleBinding ~config ~outputFileRelative ~resolver ~typeEnv)
-    |> Translation.combine
-  | {
-   str_desc =
-     (* ReScript's encoding of bs.module: include with constraint. *)
-     Tstr_include
-       {
-         incl_mod =
-           {
-             mod_desc =
-               Tmod_constraint
-                 ( {
-                     mod_desc =
-                       Tmod_structure
-                         {
-                           str_items =
-                             [({str_desc = Tstr_primitive _} as structItem1)];
-                         };
-                   },
-                   _,
-                   _,
-                   _ );
-           };
-         _;
-       };
-   _;
-  } ->
-    structItem1
-    |> translateStructureItem ~config ~outputFileRelative ~resolver ~typeEnv
-  | {str_desc = Tstr_include {incl_type = signature}} ->
-    signature
-    |> TranslateSignatureFromTypes.translateSignatureFromTypes ~config
-         ~outputFileRelative ~resolver ~typeEnv
-    |> Translation.combine
-  | {str_desc = Tstr_eval _} ->
-    logNotImplemented ("Tstr_eval " ^ __LOC__);
-    Translation.empty
-  | {str_desc = Tstr_typext _} ->
-    logNotImplemented ("Tstr_typext " ^ __LOC__);
-    Translation.empty
-  | {str_desc = Tstr_exception _} ->
-    logNotImplemented ("Tstr_exception " ^ __LOC__);
-    Translation.empty
-  | {str_desc = Tstr_open _} ->
-    logNotImplemented ("Tstr_open " ^ __LOC__);
-    Translation.empty
-  | {str_desc = Tstr_class _} ->
-    logNotImplemented ("Tstr_class " ^ __LOC__);
-    Translation.empty
-  | {str_desc = Tstr_class_type _} ->
-    logNotImplemented ("Tstr_class_type " ^ __LOC__);
-    Translation.empty
-  | {str_desc = Tstr_attribute _} ->
-    logNotImplemented ("Tstr_attribute " ^ __LOC__);
-    Translation.empty
-
-and translateStructure ~config ~outputFileRelative ~resolver ~typeEnv structure
-    : Translation.t list =
-  if !Debug.translation then Log_.item "Translate Structure\n";
-  structure.Typedtree.str_items |> removeValueBindingDuplicates
-  |> List.map (fun structItem ->
-         structItem
-         |> translateStructureItem ~config ~outputFileRelative ~resolver
-              ~typeEnv)
diff --git a/jscomp/gentype/TranslateTypeDeclarations.ml b/jscomp/gentype/TranslateTypeDeclarations.ml
deleted file mode 100644
index 07905ea..0000000
--- a/jscomp/gentype/TranslateTypeDeclarations.ml
+++ /dev/null
@@ -1,361 +0,0 @@
-open GenTypeCommon
-
-type declarationKind =
-  | RecordDeclarationFromTypes of
-      Types.label_declaration list * Types.record_representation
-  | GeneralDeclaration of Typedtree.core_type option
-  | GeneralDeclarationFromTypes of Types.type_expr option
-      (** As the above, but from Types not Typedtree *)
-  | VariantDeclarationFromTypes of Types.constructor_declaration list
-  | NoDeclaration
-
-let createExportTypeFromTypeDeclaration ~annotation ~loc ~nameAs ~opaque ~type_
-    ~typeEnv ~docString typeName ~typeVars : CodeItem.exportFromTypeDeclaration
-    =
-  let resolvedTypeName =
-    typeName |> sanitizeTypeName |> TypeEnv.addModulePath ~typeEnv
-  in
-  {
-    exportType =
-      {loc; nameAs; opaque; type_; typeVars; resolvedTypeName; docString};
-    annotation;
-  }
-
-let createCase (label, attributes) ~poly =
-  {
-    labelJS =
-      (match
-         attributes |> Annotation.getAttributePayload Annotation.tagIsAs
-       with
-      | Some (_, IdentPayload (Lident "null")) -> NullLabel
-      | Some (_, IdentPayload (Lident "undefined")) -> UndefinedLabel
-      | Some (_, BoolPayload b) -> BoolLabel b
-      | Some (_, FloatPayload s) -> FloatLabel s
-      | Some (_, IntPayload i) -> IntLabel i
-      | Some (_, StringPayload asLabel) -> StringLabel asLabel
-      | _ ->
-        if poly && isNumber label then IntLabel label else StringLabel label);
-  }
-
-(**
- * Rename record fields.
- * If @genType.as is used, perform renaming conversion.
- * If @bs.as is used (with records-as-objects active), escape and quote if
- * the identifier contains characters which are invalid as JS property names.
-*)
-let renameRecordField ~attributes ~name =
-  attributes |> Annotation.checkUnsupportedGenTypeAsRenaming;
-  match attributes |> Annotation.getAsString with
-  | Some s -> s |> String.escaped
-  | None -> name
-
-let traslateDeclarationKind ~config ~loc ~outputFileRelative ~resolver
-    ~typeAttributes ~typeEnv ~typeName ~typeVars declarationKind :
-    CodeItem.typeDeclaration list =
-  let docString = typeAttributes |> Annotation.docStringFromAttrs in
-  let annotation = typeAttributes |> Annotation.fromAttributes ~config ~loc in
-  let opaque =
-    match annotation = Annotation.GenTypeOpaque with
-    | true -> Some true
-    | false -> None
-    (* one means don't know *)
-  in
-  let importStringOpt, nameAs =
-    typeAttributes |> Annotation.getAttributeImportRenaming
-  in
-  let unboxedAnnotation =
-    typeAttributes |> Annotation.hasAttribute Annotation.tagIsUnboxed
-  in
-  let tagAnnotation = typeAttributes |> Annotation.getTag in
-  let returnTypeDeclaration (typeDeclaration : CodeItem.typeDeclaration) =
-    match opaque = Some true with
-    | true -> [{typeDeclaration with importTypes = []}]
-    | false -> [typeDeclaration]
-  in
-  let handleGeneralDeclaration
-      (translation : TranslateTypeExprFromTypes.translation) =
-    let exportFromTypeDeclaration =
-      typeName
-      |> createExportTypeFromTypeDeclaration ~annotation ~loc ~nameAs ~opaque
-           ~type_:translation.type_ ~typeEnv ~docString ~typeVars
-    in
-    let importTypes =
-      translation.dependencies
-      |> Translation.translateDependencies ~config ~outputFileRelative ~resolver
-    in
-    {CodeItem.importTypes; exportFromTypeDeclaration}
-  in
-  let translateLabelDeclarations ?(inline = false) ~recordRepresentation
-      labelDeclarations =
-    let isOptional l =
-      match recordRepresentation with
-      | Types.Record_optional_labels lbls -> List.mem l lbls
-      | _ -> false
-    in
-    let fieldTranslations =
-      labelDeclarations
-      |> List.map (fun {Types.ld_id; ld_mutable; ld_type; ld_attributes} ->
-             let name =
-               renameRecordField ~attributes:ld_attributes
-                 ~name:(ld_id |> Ident.name)
-             in
-             let mutability =
-               match ld_mutable = Mutable with
-               | true -> Mutable
-               | false -> Immutable
-             in
-             ( name,
-               mutability,
-               ld_type
-               |> TranslateTypeExprFromTypes.translateTypeExprFromTypes ~config
-                    ~typeEnv,
-               Annotation.docStringFromAttrs ld_attributes ))
-    in
-    let dependencies =
-      fieldTranslations
-      |> List.map (fun (_, _, {TranslateTypeExprFromTypes.dependencies}, _) ->
-             dependencies)
-      |> List.concat
-    in
-    let fields =
-      fieldTranslations
-      |> List.map
-           (fun
-             (name, mutable_, {TranslateTypeExprFromTypes.type_}, docString) ->
-             let optional, type1 =
-               match type_ with
-               | Option type1 when isOptional name -> (Optional, type1)
-               | _ -> (Mandatory, type_)
-             in
-             {mutable_; nameJS = name; optional; type_ = type1; docString})
-    in
-    let type_ =
-      match fields with
-      | [field] when unboxedAnnotation -> field.type_
-      | _ -> Object ((if inline then Inline else Closed), fields)
-    in
-    {TranslateTypeExprFromTypes.dependencies; type_}
-  in
-  match (declarationKind, importStringOpt) with
-  | _, Some importString ->
-    (* import type *)
-    let typeName_ = typeName in
-    let nameWithModulePath =
-      typeName_ |> TypeEnv.addModulePath ~typeEnv |> ResolvedName.toString
-    in
-    let typeName, asTypeName =
-      match nameAs with
-      | Some asString -> (asString, "$$" ^ nameWithModulePath)
-      | None -> (nameWithModulePath, "$$" ^ nameWithModulePath)
-    in
-    let importTypes =
-      [
-        {
-          CodeItem.typeName;
-          asTypeName = Some asTypeName;
-          importPath = importString |> ImportPath.fromStringUnsafe;
-        };
-      ]
-    in
-    let exportFromTypeDeclaration =
-      (* Make the imported type usable from other modules by exporting it too. *)
-      typeName_
-      |> createExportTypeFromTypeDeclaration ~docString ~annotation:GenType ~loc
-           ~nameAs:None ~opaque:(Some false)
-           ~type_:
-             (asTypeName
-             |> ident ~typeArgs:(typeVars |> List.map (fun s -> TypeVar s)))
-           ~typeEnv ~typeVars
-    in
-    [{CodeItem.importTypes; exportFromTypeDeclaration}]
-  | (GeneralDeclarationFromTypes None | GeneralDeclaration None), None ->
-    {
-      CodeItem.importTypes = [];
-      exportFromTypeDeclaration =
-        typeName
-        |> createExportTypeFromTypeDeclaration ~docString ~annotation ~loc
-             ~nameAs ~opaque:(Some true) ~type_:unknown ~typeEnv ~typeVars;
-    }
-    |> returnTypeDeclaration
-  | GeneralDeclarationFromTypes (Some typeExpr), None ->
-    let translation =
-      typeExpr
-      |> TranslateTypeExprFromTypes.translateTypeExprFromTypes ~config ~typeEnv
-    in
-    translation |> handleGeneralDeclaration |> returnTypeDeclaration
-  | GeneralDeclaration (Some coreType), None ->
-    let translation =
-      coreType |> TranslateCoreType.translateCoreType ~config ~typeEnv
-    in
-    let type_ =
-      match (coreType, translation.type_) with
-      | {ctyp_desc = Ttyp_variant (rowFields, _, _)}, Variant variant ->
-        let rowFieldsVariants = rowFields |> TranslateCoreType.processVariant in
-        let noPayloads =
-          rowFieldsVariants.noPayloads |> List.map (createCase ~poly:true)
-        in
-        let payloads =
-          if
-            variant.payloads |> List.length
-            = (rowFieldsVariants.payloads |> List.length)
-          then
-            (List.combine variant.payloads rowFieldsVariants.payloads
-             [@doesNotRaise])
-            |> List.map (fun (payload, (label, attributes, _)) ->
-                   let case = (label, attributes) |> createCase ~poly:true in
-                   {payload with case})
-          else variant.payloads
-        in
-        createVariant ~inherits:variant.inherits ~noPayloads ~payloads
-          ~polymorphic:true ~tag:None ~unboxed:false
-      | _ -> translation.type_
-    in
-    {translation with type_} |> handleGeneralDeclaration
-    |> returnTypeDeclaration
-  | RecordDeclarationFromTypes (labelDeclarations, recordRepresentation), None
-    ->
-    let {TranslateTypeExprFromTypes.dependencies; type_} =
-      labelDeclarations |> translateLabelDeclarations ~recordRepresentation
-    in
-    let importTypes =
-      dependencies
-      |> Translation.translateDependencies ~config ~outputFileRelative ~resolver
-    in
-    {
-      CodeItem.importTypes;
-      exportFromTypeDeclaration =
-        typeName
-        |> createExportTypeFromTypeDeclaration ~docString ~annotation ~loc
-             ~nameAs ~opaque ~type_ ~typeEnv ~typeVars;
-    }
-    |> returnTypeDeclaration
-  | VariantDeclarationFromTypes constructorDeclarations, None ->
-    let variants =
-      constructorDeclarations
-      |> List.map (fun constructorDeclaration ->
-             let constructorArgs = constructorDeclaration.Types.cd_args in
-             let attributes = constructorDeclaration.cd_attributes in
-             let name = constructorDeclaration.cd_id |> Ident.name in
-             let argsTranslation =
-               match constructorArgs with
-               | Cstr_tuple typeExprs ->
-                 typeExprs
-                 |> TranslateTypeExprFromTypes.translateTypeExprsFromTypes
-                      ~config ~typeEnv
-               | Cstr_record labelDeclarations ->
-                 [
-                   labelDeclarations
-                   |> translateLabelDeclarations ~inline:true
-                        ~recordRepresentation:Types.Record_regular;
-                 ]
-             in
-             let argTypes =
-               argsTranslation
-               |> List.map (fun {TranslateTypeExprFromTypes.type_} -> type_)
-             in
-             let importTypes =
-               argsTranslation
-               |> List.map (fun {TranslateTypeExprFromTypes.dependencies} ->
-                      dependencies)
-               |> List.concat
-               |> Translation.translateDependencies ~config ~outputFileRelative
-                    ~resolver
-             in
-             (name, attributes, argTypes, importTypes))
-    in
-    let variantsNoPayload, variantsWithPayload =
-      variants |> List.partition (fun (_, _, argTypes, _) -> argTypes = [])
-    in
-    let noPayloads =
-      variantsNoPayload
-      |> List.map (fun (name, attributes, _argTypes, _importTypes) ->
-             (name, attributes) |> createCase ~poly:false)
-    in
-    let payloads =
-      variantsWithPayload
-      |> List.map (fun (name, attributes, argTypes, _importTypes) ->
-             let type_ =
-               match argTypes with
-               | [type_] -> type_
-               | _ -> Tuple argTypes
-             in
-             {case = (name, attributes) |> createCase ~poly:false; t = type_})
-    in
-    let variantTyp =
-      createVariant ~inherits:[] ~noPayloads ~payloads ~polymorphic:false
-        ~tag:tagAnnotation ~unboxed:unboxedAnnotation
-    in
-    let resolvedTypeName = typeName |> TypeEnv.addModulePath ~typeEnv in
-    let exportFromTypeDeclaration =
-      {
-        CodeItem.exportType =
-          {
-            loc;
-            nameAs;
-            opaque;
-            type_ = variantTyp;
-            typeVars;
-            resolvedTypeName;
-            docString;
-          };
-        annotation;
-      }
-    in
-    let importTypes =
-      variants
-      |> List.map (fun (_, _, _, importTypes) -> importTypes)
-      |> List.concat
-    in
-    {CodeItem.exportFromTypeDeclaration; importTypes} |> returnTypeDeclaration
-  | NoDeclaration, None -> []
-
-let hasSomeGADTLeaf constructorDeclarations =
-  List.exists
-    (fun declaration -> declaration.Types.cd_res != None)
-    constructorDeclarations
-
-let translateTypeDeclaration ~config ~outputFileRelative ~resolver ~typeEnv
-    ({typ_attributes; typ_id; typ_loc; typ_manifest; typ_params; typ_type} :
-      Typedtree.type_declaration) : CodeItem.typeDeclaration list =
-  if !Debug.translation then
-    Log_.item "Translate Type Declaration %s\n" (typ_id |> Ident.name);
-
-  let typeName = Ident.name typ_id in
-  let typeVars =
-    typ_params
-    |> List.map (fun (coreType, _) -> coreType)
-    |> TypeVars.extractFromCoreType
-  in
-  let declarationKind =
-    match typ_type.type_kind with
-    | Type_record (labelDeclarations, recordRepresentation) ->
-      RecordDeclarationFromTypes (labelDeclarations, recordRepresentation)
-    | Type_variant constructorDeclarations ->
-      VariantDeclarationFromTypes constructorDeclarations
-    | Type_abstract -> GeneralDeclaration typ_manifest
-    | _ -> NoDeclaration
-  in
-  declarationKind
-  |> traslateDeclarationKind ~config ~loc:typ_loc ~outputFileRelative ~resolver
-       ~typeAttributes:typ_attributes ~typeEnv ~typeName ~typeVars
-
-let addTypeDeclarationIdToTypeEnv ~typeEnv
-    ({typ_id} : Typedtree.type_declaration) =
-  typeEnv |> TypeEnv.newType ~name:(typ_id |> Ident.name)
-
-let translateTypeDeclarations ~config ~outputFileRelative ~recursive ~resolver
-    ~typeEnv (typeDeclarations : Typedtree.type_declaration list) :
-    CodeItem.typeDeclaration list =
-  if recursive then
-    typeDeclarations |> List.iter (addTypeDeclarationIdToTypeEnv ~typeEnv);
-  typeDeclarations
-  |> List.map (fun typeDeclaration ->
-         let res =
-           typeDeclaration
-           |> translateTypeDeclaration ~config ~outputFileRelative ~resolver
-                ~typeEnv
-         in
-         if not recursive then
-           typeDeclaration |> addTypeDeclarationIdToTypeEnv ~typeEnv;
-         res)
-  |> List.concat
diff --git a/jscomp/gentype/TranslateTypeExprFromTypes.ml b/jscomp/gentype/TranslateTypeExprFromTypes.ml
deleted file mode 100644
index 9c61bfe..0000000
--- a/jscomp/gentype/TranslateTypeExprFromTypes.ml
+++ /dev/null
@@ -1,542 +0,0 @@
-open GenTypeCommon
-
-type translation = {dependencies: dep list; type_: type_}
-
-let rec removeOption ~(label : Asttypes.arg_label) (typeExpr : Types.type_expr)
-    =
-  match (typeExpr.desc, label) with
-  | Tconstr (Path.Pident id, [t], _), Optional lbl when Ident.name id = "option"
-    ->
-    Some (lbl, t)
-  | Tconstr (Pdot (Path.Pident nameSpace, id, _), [t], _), Optional lbl
-    when Ident.name nameSpace = "FB" && id = "option" ->
-    Some (lbl, t)
-  | Tlink t, _ -> t |> removeOption ~label
-  | _ -> None
-
-let rec pathToList path =
-  match path with
-  | Path.Pident id -> [id |> Ident.name]
-  | Path.Pdot (p, s, _) -> s :: (p |> pathToList)
-  | Path.Papply _ -> []
-
-let translateObjType closedFlag fieldsTranslations =
-  let dependencies =
-    fieldsTranslations
-    |> List.map (fun (_, {dependencies}) -> dependencies)
-    |> List.concat
-  in
-  let rec checkMutableField ?(acc = []) fields =
-    match fields with
-    | (previousName, {type_ = _}) :: (name, {type_}) :: rest
-      when Runtime.checkMutableObjectField ~previousName ~name ->
-      (* The field was annotated "@bs.set" *)
-      rest |> checkMutableField ~acc:((name, type_, Mutable) :: acc)
-    | (name, {type_}) :: rest ->
-      rest |> checkMutableField ~acc:((name, type_, Immutable) :: acc)
-    | [] -> acc |> List.rev
-  in
-  let fields =
-    fieldsTranslations |> checkMutableField
-    |> List.map (fun (name, t, mutable_) ->
-           let optional, type_ =
-             match t with
-             | Option t -> (Optional, t)
-             | _ -> (Mandatory, t)
-           in
-           {
-             mutable_;
-             nameJS = name;
-             optional;
-             type_;
-             docString = DocString.empty;
-           })
-  in
-  let type_ = Object (closedFlag, fields) in
-  {dependencies; type_}
-
-let translateConstr ~config ~paramsTranslation ~(path : Path.t) ~typeEnv =
-  let defaultCase () =
-    let typeArgs =
-      paramsTranslation |> List.map (fun ({type_} : translation) -> type_)
-    in
-    let typeParamDeps =
-      paramsTranslation
-      |> List.map (fun {dependencies} -> dependencies)
-      |> List.concat
-    in
-    match typeEnv |> TypeEnv.applyTypeEquations ~config ~path with
-    | Some type_ -> {dependencies = typeParamDeps; type_}
-    | None ->
-      let dep = path |> Dependencies.fromPath ~config ~typeEnv in
-      {
-        dependencies = dep :: typeParamDeps;
-        type_ = Ident {builtin = false; name = dep |> depToString; typeArgs};
-      }
-  in
-  match (path |> pathToList |> List.rev, paramsTranslation) with
-  | (["FB"; "bool"] | ["bool"]), [] -> {dependencies = []; type_ = booleanT}
-  | (["FB"; "int"] | ["int"]), [] -> {dependencies = []; type_ = numberT}
-  | (["Int64"; "t"] | ["int64"]), [] -> {dependencies = []; type_ = int64T}
-  | (["FB"; "float"] | ["float"]), [] -> {dependencies = []; type_ = numberT}
-  | ( ( ["FB"; "string"]
-      | ["string"]
-      | ["String"; "t"]
-      | ["Js"; ("String" | "String2"); "t"] ),
-      [] ) ->
-    {dependencies = []; type_ = stringT}
-  | (["Js"; "Types"; "bigint_val"] | ["BigInt"; "t"]), [] ->
-    {dependencies = []; type_ = bigintT}
-  | (["Js"; "Date"; "t"] | ["Date"; "t"]), [] ->
-    {dependencies = []; type_ = dateT}
-  | ["Map"; "t"], [paramTranslation1; paramTranslation2] ->
-    {
-      dependencies =
-        paramTranslation1.dependencies @ paramTranslation2.dependencies;
-      type_ = mapT (paramTranslation1.type_, paramTranslation2.type_);
-    }
-  | ["WeakMap"; "t"], [paramTranslation1; paramTranslation2] ->
-    {
-      dependencies =
-        paramTranslation1.dependencies @ paramTranslation2.dependencies;
-      type_ = weakmapT (paramTranslation1.type_, paramTranslation2.type_);
-    }
-  | ["Set"; "t"], [paramTranslation] ->
-    {
-      dependencies = paramTranslation.dependencies;
-      type_ = setT paramTranslation.type_;
-    }
-  | ["WeakSet"; "t"], [paramTranslation] ->
-    {
-      dependencies = paramTranslation.dependencies;
-      type_ = weaksetT paramTranslation.type_;
-    }
-  | (["Js"; "Re"; "t"] | ["RegExp"; "t"]), [] ->
-    {dependencies = []; type_ = regexpT}
-  | (["FB"; "unit"] | ["unit"]), [] -> {dependencies = []; type_ = unitT}
-  | ( (["FB"; "array"] | ["array"] | ["Js"; ("Array" | "Array2"); "t"]),
-      [paramTranslation] ) ->
-    {paramTranslation with type_ = Array (paramTranslation.type_, Mutable)}
-  | ["ImmutableArray"; "t"], [paramTranslation] ->
-    {paramTranslation with type_ = Array (paramTranslation.type_, Immutable)}
-  | ["Pervasives"; "ref"], [paramTranslation] ->
-    {
-      dependencies = paramTranslation.dependencies;
-      type_ =
-        Object
-          ( Closed,
-            [
-              {
-                mutable_ = Mutable;
-                nameJS = "contents";
-                optional = Mandatory;
-                type_ = paramTranslation.type_;
-                docString = DocString.empty;
-              };
-            ] );
-    }
-  | ( (["Pervasives"; "result"] | ["Belt"; "Result"; "t"] | ["result"]),
-      [paramTranslation1; paramTranslation2] ) ->
-    let case name type_ = {case = {labelJS = StringLabel name}; t = type_} in
-    let variant =
-      createVariant ~inherits:[] ~noPayloads:[]
-        ~payloads:
-          [
-            case "Ok" paramTranslation1.type_;
-            case "Error" paramTranslation2.type_;
-          ]
-        ~polymorphic:false ~tag:None ~unboxed:false
-    in
-    {
-      dependencies =
-        paramTranslation1.dependencies @ paramTranslation2.dependencies;
-      type_ = variant;
-    }
-  | ( (["React"; "callback"] | ["ReactV3"; "React"; "callback"]),
-      [fromTranslation; toTranslation] ) ->
-    {
-      dependencies = fromTranslation.dependencies @ toTranslation.dependencies;
-      type_ =
-        Function
-          {
-            argTypes = [{aName = ""; aType = fromTranslation.type_}];
-            retType = toTranslation.type_;
-            typeVars = [];
-          };
-    }
-  | ( (["React"; "componentLike"] | ["ReactV3"; "React"; "componentLike"]),
-      [propsTranslation; retTranslation] ) ->
-    {
-      dependencies = propsTranslation.dependencies @ retTranslation.dependencies;
-      type_ =
-        Function
-          {
-            argTypes = [{aName = ""; aType = propsTranslation.type_}];
-            retType = retTranslation.type_;
-            typeVars = [];
-          };
-    }
-  | ( (["React"; "component"] | ["ReactV3"; "React"; "component"]),
-      [propsTranslation] ) ->
-    {
-      dependencies = propsTranslation.dependencies;
-      type_ =
-        Function
-          {
-            argTypes = [{aName = ""; aType = propsTranslation.type_}];
-            retType = EmitType.typeReactElement;
-            typeVars = [];
-          };
-    }
-  | ( (["React"; "Context"; "t"] | ["ReactV3"; "React"; "Context"; "t"]),
-      [paramTranslation] ) ->
-    {
-      dependencies = paramTranslation.dependencies;
-      type_ = EmitType.typeReactContext ~type_:paramTranslation.type_;
-    }
-  | ( ( ["React"; "Ref"; "t"]
-      | ["React"; "ref"]
-      | ["ReactV3"; "React"; "Ref"; "t"]
-      | ["ReactV3"; "React"; "ref"] ),
-      [paramTranslation] ) ->
-    {
-      dependencies = paramTranslation.dependencies;
-      type_ = EmitType.typeReactRef ~type_:paramTranslation.type_;
-    }
-  | (["ReactDOM"; "domRef"] | ["ReactDOM"; "Ref"; "t"]), [] ->
-    {dependencies = []; type_ = EmitType.typeReactDOMReDomRef}
-  | ["ReactDOM"; "Ref"; "currentDomRef"], [] ->
-    {dependencies = []; type_ = EmitType.typeAny}
-  | ["ReactDOMRe"; "domRef"], [] ->
-    {dependencies = []; type_ = EmitType.typeReactDOMReDomRef}
-  | ["ReactDOMRe"; "Ref"; "currentDomRef"], [] ->
-    {dependencies = []; type_ = EmitType.typeAny}
-  | ["ReactEvent"; "Mouse"; "t"], [] ->
-    {dependencies = []; type_ = EmitType.typeReactEventMouseT}
-  | ( ( ["React"; "element"]
-      | ["ReactV3"; "React"; "element"]
-      | ["ReasonReact"; "reactElement"]
-      | [("Pervasives" | "PervasivesU"); "Jsx"; "element"] ),
-      [] ) ->
-    {dependencies = []; type_ = EmitType.typeReactElement}
-  | (["FB"; "option"] | ["option"]), [paramTranslation] ->
-    {paramTranslation with type_ = Option paramTranslation.type_}
-  | ( (["Js"; "Undefined"; "t"] | ["Undefined"; "t"] | ["Js"; "undefined"]),
-      [paramTranslation] ) ->
-    {paramTranslation with type_ = Option paramTranslation.type_}
-  | (["Js"; "Null"; "t"] | ["Null"; "t"] | ["Js"; "null"]), [paramTranslation]
-    ->
-    {paramTranslation with type_ = Null paramTranslation.type_}
-  | ( ( ["Js"; "Nullable"; "t"]
-      | ["Nullable"; "t"]
-      | ["Js"; "nullable"]
-      | ["Js"; "Null_undefined"; "t"]
-      | ["Js"; "null_undefined"] ),
-      [paramTranslation] ) ->
-    {paramTranslation with type_ = Nullable paramTranslation.type_}
-  | ( (["Js"; "Promise"; "t"] | ["Promise"; "t"] | ["promise"]),
-      [paramTranslation] ) ->
-    {paramTranslation with type_ = Promise paramTranslation.type_}
-  | (["Js"; "Dict"; "t"] | ["Dict"; "t"] | ["dict"]), [paramTranslation] ->
-    {paramTranslation with type_ = Dict paramTranslation.type_}
-  | ["function$"], [arg; _arity] ->
-    {dependencies = arg.dependencies; type_ = arg.type_}
-  | _ -> defaultCase ()
-
-type processVariant = {
-  noPayloads: string list;
-  payloads: (string * Types.type_expr) list;
-  unknowns: string list;
-}
-
-let processVariant rowFields =
-  let rec loop ~noPayloads ~payloads ~unknowns fields =
-    match fields with
-    | ( label,
-        ( Types.Rpresent (* no payload *) None
-        | Reither ((* constant constructor *) true, _, _, _) ) )
-      :: otherFields ->
-      otherFields |> loop ~noPayloads:(label :: noPayloads) ~payloads ~unknowns
-    | (label, Rpresent (Some payload)) :: otherFields ->
-      otherFields
-      |> loop ~noPayloads ~payloads:((label, payload) :: payloads) ~unknowns
-    | (label, (Rabsent | Reither (false, _, _, _))) :: otherFields ->
-      otherFields |> loop ~noPayloads ~payloads ~unknowns:(label :: unknowns)
-    | [] ->
-      {
-        noPayloads = noPayloads |> List.rev;
-        payloads = payloads |> List.rev;
-        unknowns = unknowns |> List.rev;
-      }
-  in
-  rowFields |> loop ~noPayloads:[] ~payloads:[] ~unknowns:[]
-
-let rec translateArrowType ~config ~typeVarsGen ~typeEnv ~revArgDeps ~revArgs
-    (typeExpr : Types.type_expr) =
-  match typeExpr.desc with
-  | Tlink t ->
-    translateArrowType ~config ~typeVarsGen ~typeEnv ~revArgDeps ~revArgs t
-  | Tarrow (Nolabel, typeExpr1, typeExpr2, _) ->
-    let {dependencies; type_} =
-      typeExpr1 |> fun __x ->
-      translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv __x
-    in
-    let nextRevDeps = List.rev_append dependencies revArgDeps in
-    typeExpr2
-    |> translateArrowType ~config ~typeVarsGen ~typeEnv ~revArgDeps:nextRevDeps
-         ~revArgs:((Nolabel, type_) :: revArgs)
-  | Tarrow (((Labelled lbl | Optional lbl) as label), typeExpr1, typeExpr2, _)
-    -> (
-    match typeExpr1 |> removeOption ~label with
-    | None ->
-      let {dependencies; type_ = type1} =
-        typeExpr1 |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-      in
-      let nextRevDeps = List.rev_append dependencies revArgDeps in
-      typeExpr2
-      |> translateArrowType ~config ~typeVarsGen ~typeEnv
-           ~revArgDeps:nextRevDeps
-           ~revArgs:((Label lbl, type1) :: revArgs)
-    | Some (lbl, t1) ->
-      let {dependencies; type_ = type1} =
-        t1 |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-      in
-      let nextRevDeps = List.rev_append dependencies revArgDeps in
-      typeExpr2
-      |> translateArrowType ~config ~typeVarsGen ~typeEnv
-           ~revArgDeps:nextRevDeps
-           ~revArgs:((OptLabel lbl, type1) :: revArgs))
-  | _ ->
-    let {dependencies; type_ = retType} =
-      typeExpr |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-    in
-    let allDeps = List.rev_append revArgDeps dependencies in
-    let labeledConvertableTypes = revArgs |> List.rev in
-    let argTypes = labeledConvertableTypes |> NamedArgs.group in
-    let functionType = Function {argTypes; retType; typeVars = []} in
-    {dependencies = allDeps; type_ = functionType}
-
-and translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-    (typeExpr : Types.type_expr) =
-  match typeExpr.desc with
-  | Tvar None ->
-    let typeName =
-      GenIdent.jsTypeNameForAnonymousTypeID ~typeVarsGen typeExpr.id
-    in
-    {dependencies = []; type_ = TypeVar typeName}
-  | Tvar (Some s) -> {dependencies = []; type_ = TypeVar s}
-  | Tconstr
-      (Pdot (Pident {name = "Js"}, "t", _), [{desc = Tvar _ | Tconstr _}], _) ->
-    (* Preserve some existing uses of Js.t(Obj.t) and Js.t('a). *)
-    translateObjType Closed []
-  | Tconstr (Pdot (Pident {name = "Js"}, "t", _), [t], _) ->
-    t |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-  | Tobject (tObj, _) ->
-    let rec getFieldTypes (texp : Types.type_expr) =
-      match texp.desc with
-      | Tfield (name, _, t1, t2) ->
-        let closedFlafg, fields = t2 |> getFieldTypes in
-        ( closedFlafg,
-          ( name,
-            match name |> Runtime.isMutableObjectField with
-            | true -> {dependencies = []; type_ = ident ""}
-            | false ->
-              t1 |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv )
-          :: fields )
-      | Tlink te -> te |> getFieldTypes
-      | Tvar None -> (Open, [])
-      | _ -> (Closed, [])
-    in
-    let closedFlag, fieldsTranslations = tObj |> getFieldTypes in
-    translateObjType closedFlag fieldsTranslations
-  | Tconstr (path, [{desc = Tlink te}], r) ->
-    {typeExpr with desc = Types.Tconstr (path, [te], r)}
-    |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-  | Tconstr (path, typeParams, _) ->
-    let paramsTranslation =
-      typeParams |> translateTypeExprsFromTypes_ ~config ~typeVarsGen ~typeEnv
-    in
-    translateConstr ~config ~paramsTranslation ~path ~typeEnv
-  | Tpoly (t, []) ->
-    t |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-  | Tarrow _ ->
-    typeExpr
-    |> translateArrowType ~config ~typeVarsGen ~typeEnv ~revArgDeps:[]
-         ~revArgs:[]
-  | Ttuple listExp ->
-    let innerTypesTranslation =
-      listExp |> translateTypeExprsFromTypes_ ~config ~typeVarsGen ~typeEnv
-    in
-    let innerTypes = innerTypesTranslation |> List.map (fun {type_} -> type_) in
-    let innerTypesDeps =
-      innerTypesTranslation
-      |> List.map (fun {dependencies} -> dependencies)
-      |> List.concat
-    in
-    let tupleType = Tuple innerTypes in
-    {dependencies = innerTypesDeps; type_ = tupleType}
-  | Tlink t -> t |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-  | Tvariant rowDesc -> (
-    match rowDesc.row_fields |> processVariant with
-    | {noPayloads; payloads = []; unknowns = []} ->
-      let noPayloads =
-        noPayloads
-        |> List.map (fun label ->
-               {
-                 labelJS =
-                   (if isNumber label then IntLabel label else StringLabel label);
-               })
-      in
-      let type_ =
-        createVariant ~inherits:[] ~noPayloads ~payloads:[] ~polymorphic:true
-          ~tag:None ~unboxed:false
-      in
-      {dependencies = []; type_}
-    | {noPayloads = []; payloads = [(_label, t)]; unknowns = []} ->
-      (* Handle ReScript's "Arity_" encoding in first argument of Js.Internal.fn(_,_) for uncurried functions.
-         Return the argument tuple. *)
-      t |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-    | {noPayloads; payloads; unknowns = []} ->
-      let noPayloads =
-        noPayloads |> List.map (fun label -> {labelJS = StringLabel label})
-      in
-      let payloadTranslations =
-        payloads
-        |> List.map (fun (label, payload) ->
-               ( label,
-                 payload
-                 |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv ))
-      in
-      let payloads =
-        payloadTranslations
-        |> List.map (fun (label, translation) ->
-               {case = {labelJS = StringLabel label}; t = translation.type_})
-      in
-      let type_ =
-        createVariant ~inherits:[] ~noPayloads ~payloads ~polymorphic:true
-          ~tag:None ~unboxed:false
-      in
-      let dependencies =
-        payloadTranslations
-        |> List.map (fun (_, {dependencies}) -> dependencies)
-        |> List.concat
-      in
-      {dependencies; type_}
-    | {unknowns = _ :: _} -> {dependencies = []; type_ = unknown})
-  | Tpackage (path, ids, types) -> (
-    match typeEnv |> TypeEnv.lookupModuleTypeSignature ~path with
-    | Some (signature, typeEnv) ->
-      let typeEquationsTranslation =
-        (List.combine ids types [@doesNotRaise])
-        |> List.map (fun (x, t) ->
-               ( x,
-                 t |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-               ))
-      in
-      let typeEquations =
-        typeEquationsTranslation
-        |> List.map (fun (x, translation) -> (x, translation.type_))
-      in
-      let dependenciesFromTypeEquations =
-        typeEquationsTranslation
-        |> List.map (fun (_, translation) -> translation.dependencies)
-        |> List.flatten
-      in
-      let typeEnv1 = typeEnv |> TypeEnv.addTypeEquations ~typeEquations in
-      let dependenciesFromRecordType, type_ =
-        signature.sig_type
-        |> signatureToModuleRuntimeRepresentation ~config ~typeVarsGen
-             ~typeEnv:typeEnv1
-      in
-      {
-        dependencies = dependenciesFromTypeEquations @ dependenciesFromRecordType;
-        type_;
-      }
-    | None -> {dependencies = []; type_ = unknown})
-  | Tfield _ | Tnil | Tpoly _ | Tsubst _ | Tunivar _ ->
-    {dependencies = []; type_ = unknown}
-
-and translateTypeExprsFromTypes_ ~config ~typeVarsGen ~typeEnv typeExprs :
-    translation list =
-  typeExprs
-  |> List.map (translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv)
-
-and signatureToModuleRuntimeRepresentation ~config ~typeVarsGen ~typeEnv
-    signature =
-  let dependenciesAndFields =
-    signature
-    |> List.map (fun signatureItem ->
-           match signatureItem with
-           | Types.Sig_value (_id, {val_kind = Val_prim _}) -> ([], [])
-           | Types.Sig_value (id, {val_type = typeExpr; val_attributes}) ->
-             let {dependencies; type_} =
-               typeExpr
-               |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-             in
-             let field =
-               {
-                 mutable_ = Immutable;
-                 nameJS = id |> Ident.name;
-                 optional = Mandatory;
-                 type_;
-                 docString = Annotation.docStringFromAttrs val_attributes;
-               }
-             in
-             (dependencies, [field])
-           | Types.Sig_module (id, moduleDeclaration, _recStatus) ->
-             let typeEnv1 =
-               match typeEnv |> TypeEnv.getModule ~name:(id |> Ident.name) with
-               | Some typeEnv1 -> typeEnv1
-               | None -> typeEnv
-             in
-             let dependencies, type_ =
-               match moduleDeclaration.md_type with
-               | Mty_signature signature ->
-                 signature
-                 |> signatureToModuleRuntimeRepresentation ~config ~typeVarsGen
-                      ~typeEnv:typeEnv1
-               | Mty_ident _ | Mty_functor _ | Mty_alias _ -> ([], unknown)
-             in
-             let field =
-               {
-                 mutable_ = Immutable;
-                 nameJS = id |> Ident.name;
-                 optional = Mandatory;
-                 type_;
-                 docString =
-                   Annotation.docStringFromAttrs moduleDeclaration.md_attributes;
-               }
-             in
-             (dependencies, [field])
-           | Types.Sig_type _ | Types.Sig_typext _ | Types.Sig_modtype _
-           | Types.Sig_class _ | Types.Sig_class_type _ ->
-             ([], []))
-  in
-  let dependencies, fields =
-    let dl, fl = dependenciesAndFields |> List.split in
-    (dl |> List.concat, fl |> List.concat)
-  in
-  (dependencies, Object (Closed, fields))
-
-let translateTypeExprFromTypes ~config ~typeEnv typeExpr =
-  let typeVarsGen = GenIdent.createTypeVarsGen () in
-  let translation =
-    typeExpr |> translateTypeExprFromTypes_ ~config ~typeVarsGen ~typeEnv
-  in
-  if !Debug.dependencies then
-    translation.dependencies
-    |> List.iter (fun dep -> Log_.item "Dependency: %s\n" (dep |> depToString));
-  translation
-
-let translateTypeExprsFromTypes ~config ~typeEnv typeExprs =
-  let typeVarsGen = GenIdent.createTypeVarsGen () in
-  let translations =
-    typeExprs |> translateTypeExprsFromTypes_ ~config ~typeVarsGen ~typeEnv
-  in
-  if !Debug.dependencies then
-    translations
-    |> List.iter (fun translation ->
-           translation.dependencies
-           |> List.iter (fun dep ->
-                  Log_.item "Dependency: %s\n" (dep |> depToString)));
-  translations
diff --git a/jscomp/gentype/Translation.ml b/jscomp/gentype/Translation.ml
deleted file mode 100644
index bd787ea..0000000
--- a/jscomp/gentype/Translation.ml
+++ /dev/null
@@ -1,207 +0,0 @@
-open GenTypeCommon
-
-type t = CodeItem.translation
-
-let empty = ({importTypes = []; codeItems = []; typeDeclarations = []} : t)
-
-let getImportTypeUniqueName ({typeName; asTypeName} : CodeItem.importType) =
-  typeName
-  ^
-  match asTypeName with
-  | None -> ""
-  | Some s -> "_as_" ^ s
-
-let importTypeCompare i1 i2 =
-  compare (i1 |> getImportTypeUniqueName) (i2 |> getImportTypeUniqueName)
-
-let combine (translations : t list) : t =
-  ( translations
-  |> List.map (fun {CodeItem.importTypes; codeItems; typeDeclarations} ->
-         ((importTypes, codeItems), typeDeclarations))
-  |> List.split
-  |> fun (x, y) -> (x |> List.split, y) )
-  |> fun ((importTypes, codeItems), typeDeclarations) ->
-  {
-    CodeItem.importTypes = importTypes |> List.concat;
-    codeItems = codeItems |> List.concat;
-    typeDeclarations = typeDeclarations |> List.concat;
-  }
-
-(** Applies type parameters to types (for all) *)
-let abstractTheTypeParameters ~typeVars type_ =
-  match type_ with
-  | Function function_ -> Function {function_ with typeVars}
-  | _ -> type_
-
-let depToImportType ~config ~outputFileRelative ~resolver (dep : dep) =
-  match dep with
-  | _ when dep |> Dependencies.isInternal -> []
-  | External name when name = "list" ->
-    [
-      {
-        CodeItem.typeName = "list";
-        asTypeName = None;
-        importPath =
-          ModuleName.rescriptPervasives
-          |> ModuleResolver.importPathForReasonModuleName ~config
-               ~outputFileRelative ~resolver;
-      };
-    ]
-  | External _ -> []
-  | Internal _ -> []
-  | Dot _ ->
-    let moduleName = dep |> Dependencies.getOuterModuleName in
-    let typeName =
-      dep |> Dependencies.removeExternalOuterModule |> depToString
-    in
-    let asTypeName =
-      match dep |> Dependencies.isInternal with
-      | true -> None
-      | false -> Some (dep |> depToString)
-    in
-    let importPath =
-      moduleName
-      |> ModuleResolver.importPathForReasonModuleName ~config
-           ~outputFileRelative ~resolver
-    in
-    [{typeName; asTypeName; importPath}]
-
-let translateDependencies ~config ~outputFileRelative ~resolver dependencies :
-    CodeItem.importType list =
-  dependencies
-  |> List.map (depToImportType ~config ~outputFileRelative ~resolver)
-  |> List.concat
-
-let translateValue ~attributes ~config ~docString ~outputFileRelative ~resolver
-    ~typeEnv ~typeExpr ~(addAnnotationsToFunction : type_ -> type_) name : t =
-  let nameAs =
-    match Annotation.getGenTypeAsRenaming attributes with
-    | Some s -> s
-    | _ -> name
-  in
-  let typeExprTranslation =
-    typeExpr
-    |> TranslateTypeExprFromTypes.translateTypeExprFromTypes ~config ~typeEnv
-  in
-  let typeVars = typeExprTranslation.type_ |> TypeVars.free in
-  let type_ =
-    typeExprTranslation.type_
-    |> abstractTheTypeParameters ~typeVars
-    |> addAnnotationsToFunction
-  in
-  let resolvedNameOriginal =
-    name |> TypeEnv.addModulePath ~typeEnv |> ResolvedName.toString
-  in
-  let resolvedName = nameAs |> TypeEnv.addModulePath ~typeEnv in
-  let moduleAccessPath =
-    typeEnv |> TypeEnv.getModuleAccessPath ~name:resolvedNameOriginal
-  in
-  let codeItems =
-    [
-      CodeItem.ExportValue
-        {docString; moduleAccessPath; originalName = name; resolvedName; type_};
-    ]
-  in
-  {
-    importTypes =
-      typeExprTranslation.dependencies
-      |> translateDependencies ~config ~outputFileRelative ~resolver;
-    codeItems;
-    typeDeclarations = [];
-  }
-
-(**
- [@genType]
- [@bs.module] external myBanner : ReasonReact.reactClass = "./MyBanner";
-*)
-let translatePrimitive ~config ~outputFileRelative ~resolver ~typeEnv
-    (valueDescription : Typedtree.value_description) : t =
-  if !Debug.translation then Log_.item "Translate Primitive\n";
-  let valueName =
-    match valueDescription.val_prim with
-    | "" :: _ | [] -> valueDescription.val_id |> Ident.name
-    | nameOfExtern :: _ ->
-      (* extern foo : someType = "abc"
-         The first element of val_prim is "abc" *)
-      nameOfExtern
-  in
-  let typeExprTranslation =
-    valueDescription.val_desc
-    |> TranslateCoreType.translateCoreType ~config ~typeEnv
-  in
-  let attributeImport, attributeRenaming =
-    valueDescription.val_attributes |> Annotation.getAttributeImportRenaming
-  in
-  match (typeExprTranslation.type_, attributeImport) with
-  | _, Some importString ->
-    let asPath =
-      match attributeRenaming with
-      | Some asPath -> asPath
-      | None -> valueName
-    in
-    let typeVars = typeExprTranslation.type_ |> TypeVars.free in
-    let type_ =
-      typeExprTranslation.type_ |> abstractTheTypeParameters ~typeVars
-    in
-    {
-      importTypes =
-        typeExprTranslation.dependencies
-        |> translateDependencies ~config ~outputFileRelative ~resolver;
-      codeItems =
-        [
-          ImportValue
-            {
-              asPath;
-              importAnnotation = importString |> Annotation.importFromString;
-              type_;
-              valueName;
-            };
-        ];
-      typeDeclarations = [];
-    }
-  | _ -> {importTypes = []; codeItems = []; typeDeclarations = []}
-
-let addTypeDeclarationsFromModuleEquations ~typeEnv (translation : t) =
-  let eqs = typeEnv |> TypeEnv.getModuleEquations in
-  let newTypeDeclarations =
-    translation.typeDeclarations
-    |> List.map (fun (typeDeclaration : CodeItem.typeDeclaration) ->
-           let exportType =
-             typeDeclaration.exportFromTypeDeclaration.exportType
-           in
-           let equations =
-             exportType.resolvedTypeName |> ResolvedName.applyEquations ~eqs
-           in
-           equations
-           |> List.map (fun (x, y) ->
-                  let newExportType =
-                    {
-                      exportType with
-                      nameAs = None;
-                      type_ =
-                        y |> ResolvedName.toString
-                        |> ident ~builtin:false
-                             ~typeArgs:
-                               (exportType.typeVars
-                               |> List.map (fun s -> TypeVar s));
-                      resolvedTypeName = x;
-                    }
-                  in
-                  {
-                    CodeItem.exportFromTypeDeclaration =
-                      {
-                        CodeItem.exportType = newExportType;
-                        annotation =
-                          typeDeclaration.exportFromTypeDeclaration.annotation;
-                      };
-                    importTypes = [];
-                  }))
-    |> List.concat
-  in
-  match newTypeDeclarations = [] with
-  | true -> translation
-  | false ->
-    {
-      translation with
-      typeDeclarations = translation.typeDeclarations @ newTypeDeclarations;
-    }
diff --git a/jscomp/gentype/TypeEnv.ml b/jscomp/gentype/TypeEnv.ml
deleted file mode 100644
index 693d154..0000000
--- a/jscomp/gentype/TypeEnv.ml
+++ /dev/null
@@ -1,198 +0,0 @@
-open GenTypeCommon
-
-type moduleEquation = {internal: bool; dep: dep}
-
-type t = {
-  mutable map: entry StringMap.t;
-  mutable mapModuleTypes: (Typedtree.signature * t) StringMap.t;
-  mutable moduleEquation: moduleEquation option;
-  mutable moduleItem: Runtime.moduleItem;
-  name: string;
-  parent: t option;
-  typeEquations: type_ StringMap.t;
-}
-
-and entry = Module of t | Type of string
-
-let createTypeEnv ~name parent =
-  let moduleItem = Runtime.newModuleItem ~name in
-  {
-    map = StringMap.empty;
-    mapModuleTypes = StringMap.empty;
-    moduleEquation = None;
-    moduleItem;
-    name;
-    parent;
-    typeEquations = StringMap.empty;
-  }
-
-let root () = None |> createTypeEnv ~name:"__root__"
-let toString typeEnv = typeEnv.name
-
-let newModule ~name typeEnv =
-  if !Debug.typeEnv then
-    Log_.item "TypeEnv.newModule %s %s\n" (typeEnv |> toString) name;
-  let newTypeEnv = Some typeEnv |> createTypeEnv ~name in
-  typeEnv.map <- typeEnv.map |> StringMap.add name (Module newTypeEnv);
-  newTypeEnv
-
-let newModuleType ~name ~signature typeEnv =
-  if !Debug.typeEnv then
-    Log_.item "TypeEnv.newModuleType %s %s\n" (typeEnv |> toString) name;
-  let newTypeEnv = Some typeEnv |> createTypeEnv ~name in
-  typeEnv.mapModuleTypes <-
-    typeEnv.mapModuleTypes |> StringMap.add name (signature, newTypeEnv);
-  newTypeEnv
-
-let newType ~name typeEnv =
-  if !Debug.typeEnv then
-    Log_.item "TypeEnv.newType %s %s\n" (typeEnv |> toString) name;
-  typeEnv.map <- typeEnv.map |> StringMap.add name (Type name)
-
-let getModule ~name typeEnv =
-  match typeEnv.map |> StringMap.find name with
-  | Module typeEnv1 -> Some typeEnv1
-  | Type _ -> None
-  | exception Not_found -> None
-
-let expandAliasToExternalModule ~name typeEnv =
-  match typeEnv |> getModule ~name with
-  | Some {moduleEquation = Some {internal = false; dep}} ->
-    if !Debug.typeEnv then
-      Log_.item "TypeEnv.expandAliasToExternalModule %s %s aliased to %s\n"
-        (typeEnv |> toString) name (dep |> depToString);
-    Some dep
-  | _ -> None
-
-let addModuleEquation ~dep ~internal typeEnv =
-  if !Debug.typeEnv then
-    Log_.item "Typenv.addModuleEquation %s %s dep:%s\n" (typeEnv |> toString)
-      (match internal with
-      | true -> "Internal"
-      | false -> "External")
-      (dep |> depToString);
-  typeEnv.moduleEquation <- Some {internal; dep}
-
-let rec addTypeEquation ~flattened ~type_ typeEnv =
-  match flattened with
-  | [name] ->
-    {
-      typeEnv with
-      typeEquations = typeEnv.typeEquations |> StringMap.add name type_;
-    }
-  | moduleName :: rest -> (
-    match typeEnv |> getModule ~name:moduleName with
-    | Some typeEnv1 ->
-      {
-        typeEnv with
-        map =
-          typeEnv.map
-          |> StringMap.add moduleName
-               (Module (typeEnv1 |> addTypeEquation ~flattened:rest ~type_));
-      }
-    | None -> typeEnv)
-  | [] -> typeEnv
-
-let addTypeEquations ~typeEquations typeEnv =
-  typeEquations
-  |> List.fold_left
-       (fun te (longIdent, type_) ->
-         te
-         |> addTypeEquation ~flattened:(longIdent |> Longident.flatten) ~type_)
-       typeEnv
-
-let applyTypeEquations ~config ~path typeEnv =
-  match path with
-  | Path.Pident id -> (
-    match typeEnv.typeEquations |> StringMap.find (id |> Ident.name) with
-    | type_ ->
-      if !Debug.typeResolution then
-        Log_.item "Typenv.applyTypeEquations %s name:%s type_:%s\n"
-          (typeEnv |> toString) (id |> Ident.name)
-          (type_
-          |> EmitType.typeToString ~config ~typeNameIsInterface:(fun _ -> false)
-          );
-      Some type_
-    | exception Not_found -> None)
-  | _ -> None
-
-let rec lookup ~name typeEnv =
-  match typeEnv.map |> StringMap.find name with
-  | _ -> Some typeEnv
-  | exception Not_found -> (
-    match typeEnv.parent with
-    | None -> None
-    | Some parent -> parent |> lookup ~name)
-
-let rec lookupModuleType ~path typeEnv =
-  match path with
-  | [moduleTypeName] -> (
-    if !Debug.typeEnv then
-      Log_.item "Typenv.lookupModuleType %s moduleTypeName:%s\n"
-        (typeEnv |> toString) moduleTypeName;
-    match typeEnv.mapModuleTypes |> StringMap.find moduleTypeName with
-    | x -> Some x
-    | exception Not_found -> (
-      match typeEnv.parent with
-      | None -> None
-      | Some parent -> parent |> lookupModuleType ~path))
-  | moduleName :: path1 -> (
-    if !Debug.typeEnv then
-      Log_.item "Typenv.lookupModuleType %s moduleName:%s\n"
-        (typeEnv |> toString) moduleName;
-    match typeEnv.map |> StringMap.find moduleName with
-    | Module typeEnv1 -> typeEnv1 |> lookupModuleType ~path:path1
-    | Type _ -> None
-    | exception Not_found -> (
-      match typeEnv.parent with
-      | None -> None
-      | Some parent -> parent |> lookupModuleType ~path))
-  | [] -> None
-
-let rec pathToList path =
-  match path with
-  | Path.Pident id -> [id |> Ident.name]
-  | Path.Pdot (p, s, _) -> s :: (p |> pathToList)
-  | Path.Papply _ -> []
-
-let lookupModuleTypeSignature ~path typeEnv =
-  if !Debug.typeEnv then
-    Log_.item "TypeEnv.lookupModuleTypeSignature %s %s\n" (typeEnv |> toString)
-      (path |> Path.name);
-  typeEnv |> lookupModuleType ~path:(path |> pathToList |> List.rev)
-
-let updateModuleItem ~moduleItem typeEnv = typeEnv.moduleItem <- moduleItem
-
-let rec addModulePath ~typeEnv name =
-  match typeEnv.parent with
-  | None -> name |> ResolvedName.fromString
-  | Some parent ->
-    typeEnv.name |> addModulePath ~typeEnv:parent |> ResolvedName.dot name
-
-let rec getModuleEquations typeEnv : ResolvedName.eq list =
-  let subEquations =
-    typeEnv.map |> StringMap.bindings
-    |> List.map (fun (_, entry) ->
-           match entry with
-           | Module te -> te |> getModuleEquations
-           | Type _ -> [])
-    |> List.concat
-  in
-  match (typeEnv.moduleEquation, typeEnv.parent) with
-  | None, _ | _, None -> subEquations
-  | Some {dep}, Some parent ->
-    [(dep |> depToResolvedName, typeEnv.name |> addModulePath ~typeEnv:parent)]
-
-let getModuleAccessPath ~name typeEnv =
-  let rec accessPath typeEnv =
-    match typeEnv.parent with
-    | None -> Runtime.Root name (* not nested *)
-    | Some parent ->
-      Dot
-        ( (match parent.parent = None with
-          | true -> Root typeEnv.name
-          | false -> parent |> accessPath),
-          typeEnv.moduleItem )
-  in
-
-  typeEnv |> accessPath
diff --git a/jscomp/gentype/TypeEnv.mli b/jscomp/gentype/TypeEnv.mli
deleted file mode 100644
index c56558e..0000000
--- a/jscomp/gentype/TypeEnv.mli
+++ /dev/null
@@ -1,23 +0,0 @@
-open GenTypeCommon
-
-type t
-
-val addModuleEquation : dep:dep -> internal:bool -> t -> unit
-val addModulePath : typeEnv:t -> string -> ResolvedName.t
-val addTypeEquations : typeEquations:(Longident.t * type_) list -> t -> t
-val applyTypeEquations : config:Config.t -> path:Path.t -> t -> type_ option
-val expandAliasToExternalModule : name:string -> t -> dep option
-val getModuleEquations : t -> ResolvedName.eq list
-val getModuleAccessPath : name:string -> t -> Runtime.moduleAccessPath
-val getModule : name:string -> t -> t option
-val lookup : name:string -> t -> t option
-
-val lookupModuleTypeSignature :
-  path:Path.t -> t -> (Typedtree.signature * t) option
-
-val newModule : name:string -> t -> t
-val newModuleType : name:string -> signature:Typedtree.signature -> t -> t
-val newType : name:string -> t -> unit
-val root : unit -> t
-val toString : t -> string
-val updateModuleItem : moduleItem:Runtime.moduleItem -> t -> unit
diff --git a/jscomp/gentype/TypeVars.ml b/jscomp/gentype/TypeVars.ml
deleted file mode 100644
index 3957362..0000000
--- a/jscomp/gentype/TypeVars.ml
+++ /dev/null
@@ -1,108 +0,0 @@
-open GenTypeCommon
-
-let extractFromTypeExpr typeParams =
-  typeParams
-  |> List.fold_left
-       (fun soFar typeExpr ->
-         match typeExpr with
-         | {Types.desc = Tvar (Some s)} ->
-           let typeName = s in
-           typeName :: soFar
-         | {Types.desc = Tlink _} ->
-           (* see if we need to collect more type vars here: t as 'a *)
-           soFar
-         | _ -> assert false)
-       []
-  |> List.rev
-
-let extractFromCoreType typeParams =
-  typeParams
-  |> List.fold_left
-       (fun soFar typeExpr ->
-         match typeExpr.Typedtree.ctyp_desc with
-         | Ttyp_var s ->
-           let typeName = s in
-           typeName :: soFar
-         | _ -> soFar)
-       []
-  |> List.rev
-
-let rec substitute ~f type0 =
-  match type0 with
-  | Array (t, arrayKind) -> Array (t |> substitute ~f, arrayKind)
-  | Dict type_ -> Dict (type_ |> substitute ~f)
-  | Function function_ ->
-    Function
-      {
-        function_ with
-        argTypes =
-          function_.argTypes
-          |> List.map (fun {aName; aType = t} ->
-                 {aName; aType = t |> substitute ~f});
-      }
-  | Ident {typeArgs = []} -> type0
-  | Ident ({typeArgs} as ident) ->
-    Ident {ident with typeArgs = typeArgs |> List.map (substitute ~f)}
-  | Null type_ -> Null (type_ |> substitute ~f)
-  | Nullable type_ -> Nullable (type_ |> substitute ~f)
-  | Object (closedFlag, fields) ->
-    Object
-      ( closedFlag,
-        fields
-        |> List.map (fun field ->
-               {field with type_ = field.type_ |> substitute ~f}) )
-  | Option type_ -> Option (type_ |> substitute ~f)
-  | Promise type_ -> Promise (type_ |> substitute ~f)
-  | Tuple innerTypes -> Tuple (innerTypes |> List.map (substitute ~f))
-  | TypeVar s -> (
-    match f s with
-    | None -> type0
-    | Some type1 -> type1)
-  | Variant variant ->
-    Variant
-      {
-        variant with
-        payloads =
-          variant.payloads
-          |> List.map (fun payload ->
-                 {payload with t = payload.t |> substitute ~f});
-      }
-
-let rec free_ type0 : StringSet.t =
-  match type0 with
-  | Array (t, _) -> t |> free_
-  | Function {argTypes; retType; typeVars} ->
-    StringSet.diff
-      ((argTypes |> freeOfList_) +++ (retType |> free_))
-      (typeVars |> StringSet.of_list)
-  | Object (_, fields) ->
-    fields
-    |> List.fold_left
-         (fun s {type_} -> StringSet.union s (type_ |> free_))
-         StringSet.empty
-  | Ident {typeArgs} ->
-    typeArgs
-    |> List.fold_left
-         (fun s typeArg -> StringSet.union s (typeArg |> free_))
-         StringSet.empty
-  | Dict type_ | Null type_ | Nullable type_ -> type_ |> free_
-  | Option type_ | Promise type_ -> type_ |> free_
-  | Tuple innerTypes ->
-    innerTypes
-    |> List.fold_left
-         (fun s typeArg -> StringSet.union s (typeArg |> free_))
-         StringSet.empty
-  | TypeVar s -> s |> StringSet.singleton
-  | Variant {payloads} ->
-    payloads
-    |> List.fold_left
-         (fun s {t} -> StringSet.union s (t |> free_))
-         StringSet.empty
-
-and freeOfList_ types =
-  types
-  |> List.fold_left (fun s {aType} -> s +++ (aType |> free_)) StringSet.empty
-
-and ( +++ ) = StringSet.union
-
-let free type_ = type_ |> free_ |> StringSet.elements
diff --git a/jscomp/gentype/dune b/jscomp/gentype/dune
deleted file mode 100644
index bda6c4e..0000000
--- a/jscomp/gentype/dune
+++ /dev/null
@@ -1,6 +0,0 @@
-(library
- (name gentype)
- (wrapped false)
- (flags
-  (:standard -w -A))
- (libraries ml))
diff --git a/jscomp/gentype_tests/typescript-react-example/.eslintrc.json b/jscomp/gentype_tests/typescript-react-example/.eslintrc.json
deleted file mode 100644
index 0eba27d..0000000
--- a/jscomp/gentype_tests/typescript-react-example/.eslintrc.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint"],
-  "ignorePatterns": ["src/**/*.res.js"],
-  "root": true
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/.gitignore b/jscomp/gentype_tests/typescript-react-example/.gitignore
deleted file mode 100644
index 3099aa9..0000000
--- a/jscomp/gentype_tests/typescript-react-example/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-
-
-# misc
-/lib
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
diff --git a/jscomp/gentype_tests/typescript-react-example/.watchmanconfig b/jscomp/gentype_tests/typescript-react-example/.watchmanconfig
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/gentype_tests/typescript-react-example/Makefile b/jscomp/gentype_tests/typescript-react-example/Makefile
deleted file mode 100644
index e1f64bc..0000000
--- a/jscomp/gentype_tests/typescript-react-example/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-SHELL = /bin/bash
-
-test:
-	npm install
-	npm run build
-	npm run tsc
-	npm run lint
-
-clean:
-	rm -rf node_modules lib src/*.res.js src/*.gen.tsx
-
-.DEFAULT_GOAL := test
-
-.PHONY: clean test
diff --git a/jscomp/gentype_tests/typescript-react-example/README.md b/jscomp/gentype_tests/typescript-react-example/README.md
deleted file mode 100644
index dcc8f9e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# typescript-react-example
-
-This project was created with [Create React App](https://github.com/facebookincubator/create-react-app).
-
-For the setup, run `npm install`.
-Make sure to build gentype.native, as stated in the project root README.
-
-## Running the Project
-
-```sh
-# Start the Reason watcher.
-npm run start
-
-# In another tab: start the TypeScript watcher.
-npm run ts:watch
-```
-
-
diff --git a/jscomp/gentype_tests/typescript-react-example/package-lock.json b/jscomp/gentype_tests/typescript-react-example/package-lock.json
deleted file mode 100644
index 5fdd739..0000000
--- a/jscomp/gentype_tests/typescript-react-example/package-lock.json
+++ /dev/null
@@ -1,1687 +0,0 @@
-{
-  "name": "typescript-react-example",
-  "version": "0.1.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "typescript-react-example",
-      "version": "0.1.0",
-      "dependencies": {
-        "@rescript/react": "^0.12.0",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
-      },
-      "devDependencies": {
-        "@types/node": "^18.15.12",
-        "@types/react-dom": "^18.0.11",
-        "@typescript-eslint/eslint-plugin": "^6.8.0",
-        "@typescript-eslint/parser": "^6.8.0",
-        "eslint": "^8.51.0",
-        "rescript": "file:../../..",
-        "typescript": "^5.2.2"
-      }
-    },
-    "../../..": {
-      "name": "rescript",
-      "version": "11.1.0",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "SEE LICENSE IN LICENSE",
-      "bin": {
-        "bsc": "bsc",
-        "bstracing": "lib/bstracing",
-        "rescript": "rescript"
-      },
-      "devDependencies": {
-        "mocha": "10.1.0",
-        "nyc": "15.0.0",
-        "prettier": "2.7.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-      }
-    },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
-      "integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
-      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/js": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",
-      "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
-      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@rescript/react": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.12.0.tgz",
-      "integrity": "sha512-EBLsf5rD7sJOjgfLLGwuLw/hONszc3UtYnIVgv7OdTyUNR41/m4deVm62PI0agvr3kWakXz4KchKRSd+19/bRA==",
-      "peerDependencies": {
-        "react": ">=18.0.0",
-        "react-dom": ">=18.0.0"
-      }
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.14",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz",
-      "integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "18.18.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.6.tgz",
-      "integrity": "sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==",
-      "dev": true
-    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.9",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.9.tgz",
-      "integrity": "sha512-n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g==",
-      "dev": true
-    },
-    "node_modules/@types/react": {
-      "version": "18.2.29",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.29.tgz",
-      "integrity": "sha512-Z+ZrIRocWtdD70j45izShRwDuiB4JZqDegqMFW/I8aG5DxxLKOzVNoq62UIO82v9bdgi+DO1jvsb9sTEZUSm+Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@types/react-dom": {
-      "version": "18.2.14",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.14.tgz",
-      "integrity": "sha512-V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.5",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.5.tgz",
-      "integrity": "sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw==",
-      "dev": true
-    },
-    "node_modules/@types/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.8.0.tgz",
-      "integrity": "sha512-GosF4238Tkes2SHPQ1i8f6rMtG6zlKwMEB0abqSJ3Npvos+doIlc/ATG+vX1G9coDF3Ex78zM3heXHLyWEwLUw==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.8.0",
-        "@typescript-eslint/type-utils": "6.8.0",
-        "@typescript-eslint/utils": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0",
-        "debug": "^4.3.4",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.4",
-        "natural-compare": "^1.4.0",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
-        "eslint": "^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.8.0.tgz",
-      "integrity": "sha512-5tNs6Bw0j6BdWuP8Fx+VH4G9fEPDxnVI7yH1IAPkQH5RUtvKwRoqdecAPdQXv4rSOADAaz1LFBZvZG7VbXivSg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "6.8.0",
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/typescript-estree": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.8.0.tgz",
-      "integrity": "sha512-xe0HNBVwCph7rak+ZHcFD6A+q50SMsFwcmfdjs9Kz4qDh5hWhaPhFjRs/SODEhroBI5Ruyvyz9LfwUJ624O40g==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.8.0.tgz",
-      "integrity": "sha512-RYOJdlkTJIXW7GSldUIHqc/Hkto8E+fZN96dMIFhuTJcQwdRoGN2rEWA8U6oXbLo0qufH7NPElUb+MceHtz54g==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.8.0",
-        "@typescript-eslint/utils": "6.8.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.8.0.tgz",
-      "integrity": "sha512-p5qOxSum7W3k+llc7owEStXlGmSl8FcGvhYt8Vjy7FqEnmkCVlM3P57XQEGj58oqaBWDQXbJDZxwUWMS/EAPNQ==",
-      "dev": true,
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.8.0.tgz",
-      "integrity": "sha512-ISgV0lQ8XgW+mvv5My/+iTUdRmGspducmQcDw5JxznasXNnZn3SKNrTRuMsEXv+V/O+Lw9AGcQCfVaOPCAk/Zg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/visitor-keys": "6.8.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.8.0.tgz",
-      "integrity": "sha512-dKs1itdE2qFG4jr0dlYLQVppqTE+Itt7GmIf/vX6CSvsW+3ov8PbWauVKyyfNngokhIO9sKZeRGCUo1+N7U98Q==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.8.0",
-        "@typescript-eslint/types": "6.8.0",
-        "@typescript-eslint/typescript-estree": "6.8.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.8.0.tgz",
-      "integrity": "sha512-oqAnbA7c+pgOhW2OhGvxm0t1BULX5peQI/rLsNDpGM78EebV3C9IGbX5HNZabuZ6UQrYveCLjKo8Iy/lLlBkkg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "6.8.0",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/csstype": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==",
-      "dev": true
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.51.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",
-      "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.51.0",
-        "@humanwhocodes/config-array": "^0.11.11",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.1.tgz",
-      "integrity": "sha512-/qM2b3LUIaIgviBQovTLvijfyOQXPtSRnRK26ksj2J7rzPIecePUIpJsZ4T02Qg+xiAEKIs5K8dsHEd+VaKa/Q==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/globals": {
-      "version": "13.23.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz",
-      "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-      "dev": true,
-      "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
-      },
-      "peerDependencies": {
-        "react": "^18.2.0"
-      }
-    },
-    "node_modules/rescript": {
-      "resolved": "../../..",
-      "link": true
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/ts-api-utils": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
-      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
-      "dev": true,
-      "engines": {
-        "node": ">=16.13.0"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.2.0"
-      }
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
-      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  }
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/package.json b/jscomp/gentype_tests/typescript-react-example/package.json
deleted file mode 100644
index 172eb2a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/package.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "typescript-react-example",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "start": "rescript build -w",
-    "build": "rescript",
-    "clean": "rescript clean",
-    "tsc": "tsc -p tsconfig.json",
-    "lint": "eslint src"
-  },
-  "dependencies": {
-    "@rescript/react": "^0.12.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "devDependencies": {
-    "@types/node": "^18.15.12",
-    "@types/react-dom": "^18.0.11",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
-    "eslint": "^8.51.0",
-    "rescript": "file:../../..",
-    "typescript": "^5.2.2"
-  }
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/public/favicon.ico b/jscomp/gentype_tests/typescript-react-example/public/favicon.ico
deleted file mode 100644
index a11777c..0000000
Binary files a/jscomp/gentype_tests/typescript-react-example/public/favicon.ico and /dev/null differ
diff --git a/jscomp/gentype_tests/typescript-react-example/public/index.html b/jscomp/gentype_tests/typescript-react-example/public/index.html
deleted file mode 100644
index ed0ebaf..0000000
--- a/jscomp/gentype_tests/typescript-react-example/public/index.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="theme-color" content="#000000">
-    <!--
-      manifest.json provides metadata used when your web app is added to the
-      homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>
-      You need to enable JavaScript to run this app.
-    </noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>
diff --git a/jscomp/gentype_tests/typescript-react-example/public/manifest.json b/jscomp/gentype_tests/typescript-react-example/public/manifest.json
deleted file mode 100644
index ef19ec2..0000000
--- a/jscomp/gentype_tests/typescript-react-example/public/manifest.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    }
-  ],
-  "start_url": "./index.html",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/rescript.json b/jscomp/gentype_tests/typescript-react-example/rescript.json
deleted file mode 100644
index 1fbab8a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/rescript.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "gentypeconfig": {
-    "language": "typescript",
-    "module": "esmodule",
-    "importPath": "relative",
-    "shims": {
-      "Js": "Js",
-      "ReactEvent": "ReactEvent",
-      "RescriptPervasives": "RescriptPervasives",
-      "ReasonReact": "ReactShim"
-    },
-    "debug": {
-      "all": false
-    },
-    "exportInterfaces": false
-  },
-  "name": "sample-typescript-app",
-  "bsc-flags": [],
-  "jsx": { "version": 3 },
-  "bs-dependencies": ["@rescript/react"],
-  "sources": [
-    {
-      "dir": "src",
-      "subdirs": true
-    }
-  ],
-  "uncurried": false,
-  "package-specs": {
-    "module": "esmodule",
-    "in-source": true
-  },
-  "suffix": ".res.js"
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/App.css b/jscomp/gentype_tests/typescript-react-example/src/App.css
deleted file mode 100644
index c5c6e8a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/App.css
+++ /dev/null
@@ -1,28 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  animation: App-logo-spin infinite 20s linear;
-  height: 80px;
-}
-
-.App-header {
-  background-color: #222;
-  height: 150px;
-  padding: 20px;
-  color: white;
-}
-
-.App-title {
-  font-size: 1.5em;
-}
-
-.App-intro {
-  font-size: large;
-}
-
-@keyframes App-logo-spin {
-  from { transform: rotate(0deg); }
-  to { transform: rotate(360deg); }
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/App.tsx b/jscomp/gentype_tests/typescript-react-example/src/App.tsx
deleted file mode 100644
index 3169d1d..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/App.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import * as React from "react";
-import "./App.css";
-
-export interface Props {
-  name: string;
-  count?: number;
-}
-
-class App extends React.PureComponent<Props> {
-  public render() {
-    return (
-      <div className="App" />
-    );
-  }
-}
-
-export default App;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx
deleted file mode 100644
index 5566070..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/* TypeScript file generated from AutoAnnotate.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type variant = { TAG: "R"; _0: number };
-
-export type record = { readonly variant: variant };
-
-export type r2 = { readonly r2: number };
-
-export type r3 = { readonly r3: number };
-
-export type r4 = { readonly r4: number };
-
-export type annotatedVariant = 
-    { TAG: "R2"; _0: r2; _1: r3 }
-  | { TAG: "R4"; _0: r4 };
diff --git a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.res b/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.res
deleted file mode 100644
index aec794e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type variant = R(int)
-
-@genType type record = {variant: variant}
-
-type r2 = {r2: int}
-
-type r3 = {r3: int}
-
-type r4 = {r4: int}
-
-@genType
-type annotatedVariant =
-  | R2(r2, r3)
-  | R4(r4)
diff --git a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.res.js b/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/BigInt.res b/jscomp/gentype_tests/typescript-react-example/src/BigInt.res
deleted file mode 100644
index 2a3956d..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/BigInt.res
+++ /dev/null
@@ -1 +0,0 @@
-type t = Js.Types.bigint_val
\ No newline at end of file
diff --git a/jscomp/gentype_tests/typescript-react-example/src/BigInt.res.js b/jscomp/gentype_tests/typescript-react-example/src/BigInt.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/BigInt.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/BootloaderResource.res b/jscomp/gentype_tests/typescript-react-example/src/BootloaderResource.res
deleted file mode 100644
index ec07f53..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/BootloaderResource.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/* NOTE: This is a spooky interface that provides no type safety. It should be
- * improved. Use with caution. */
-@module("BootloaderResource") external read: JSResource.t<'a> => 'a = "read"
diff --git a/jscomp/gentype_tests/typescript-react-example/src/BootloaderResource.res.js b/jscomp/gentype_tests/typescript-react-example/src/BootloaderResource.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/BootloaderResource.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx
deleted file mode 100644
index 3a73449..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/* TypeScript file generated from BucklescriptAnnotations.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type someMutableFields = {
-  mutable0: string; 
-  readonly immutable: number; 
-  mutable1: string; 
-  mutable2: string
-};
-
-export type someMethods = {
-  readonly send: (_1:string) => void; 
-  readonly on: (_1:string, _2:((_1:number) => void)) => void; 
-  readonly threeargs: (_1:number, _2:string, _3:number) => string; 
-  readonly twoArgs: (_1:number, _2:string) => number
-};
diff --git a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res b/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res
deleted file mode 100644
index 053bca6..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res
+++ /dev/null
@@ -1,28 +0,0 @@
-@genType
-type someMutableFields = {
-  @set
-  "mutable0": string,
-  "immutable": int,
-  @set
-  "mutable1": string,
-  @set
-  "mutable2": string,
-}
-
-@genType
-type someMethods = {
-  @meth
-  "send": string => unit,
-  @meth
-  "on": (string, (. int) => unit) => unit,
-  @meth
-  "threeargs": (int, string, int) => string,
-  "twoArgs": (. int, string) => int,
-}
-
-// let foo = (x: someMethods) => x["threeargs"](3, "a", 4)
-
-let bar = (x: someMethods) => {
-  let f = x["twoArgs"]
-  f(. 3, "a")
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res.js b/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res.js
deleted file mode 100644
index 7f66df8..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function bar(x) {
-  var f = x.twoArgs;
-  return f(3, "a");
-}
-
-export {
-  bar ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx
deleted file mode 100644
index 584da01..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/* TypeScript file generated from Comments.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as CommentsJS from './Comments.res.js';
-
-export type DecideSubject_payload = { 
-/** A hint to use as a guide when thinking of your poem. */
-readonly hint: string };
-
-/** The input used to generate the prompt and system prompt. */
-export abstract class DecideSubject_input { protected opaque!: any }; /* simulate opaque types */
-
-/** The output from evaluating the llm prompt */
-export type DecideSubject_output = {
-  /** The text of the poem. */
-  readonly text: string; 
-  /** The prompt used to generate the poem. */
-  readonly prompt: string; 
-  /** The system prompt used to generate the poem. */
-  readonly systemPrompt: string
-};
-
-/** Decide on a subject matter for a poem. */
-export const DecideSubject__placeholder: (run:string, times:number) => void = CommentsJS.DecideSubject._placeholder as any;
-
-export const DecideSubject: { 
-/** Decide on a subject matter for a poem. */
-_placeholder: (run:string, times:number) => void } = CommentsJS.DecideSubject as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Comments.res b/jscomp/gentype_tests/typescript-react-example/src/Comments.res
deleted file mode 100644
index e70c756..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Comments.res
+++ /dev/null
@@ -1,24 +0,0 @@
-@genType /** A module for deciding on a subject matter for a poem.*/
-module DecideSubject = {
-  type payload = {
-    /** A hint to use as a guide when thinking of your poem.*/
-    hint: string,
-  }
-  /** The input used to generate the prompt and system prompt.*/
-  type input
-  /** The output from evaluating the llm prompt*/
-  type output = {
-    /** The text of the poem.*/
-    text: string,
-    /** The prompt used to generate the poem.*/
-    prompt: string,
-    /** The system prompt used to generate the poem.*/
-    systemPrompt: string,
-  }
-
-  @genType /** Decide on a subject matter for a poem.*/
-  let _placeholder = (
-    @ocaml.doc("The runner specification") run: string,
-    @ocaml.doc("The number of times to cycle through the runner") times: int,
-  ) => (run, times)->ignore
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Comments.res.js b/jscomp/gentype_tests/typescript-react-example/src/Comments.res.js
deleted file mode 100644
index 2575585..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Comments.res.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function _placeholder(run, times) {
-  
-}
-
-var DecideSubject = {
-  _placeholder: _placeholder
-};
-
-export {
-  DecideSubject ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx
deleted file mode 100644
index 08e7240..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-/* TypeScript file generated from Core.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import {someFunWithNullThenOptionalArgs as someFunWithNullThenOptionalArgsNotChecked} from './CoreTS';
-
-import {someFunWithNullUndefinedArg as someFunWithNullUndefinedArgNotChecked} from './CoreTS';
-
-// In case of type error, check the type of 'someFunWithNullThenOptionalArgs' in 'Core.res' and './CoreTS'.
-export const someFunWithNullThenOptionalArgsTypeChecked: (_1:(null | string), _2:(undefined | string)) => string = someFunWithNullThenOptionalArgsNotChecked as any;
-
-// Export 'someFunWithNullThenOptionalArgs' early to allow circular import from the '.bs.js' file.
-export const someFunWithNullThenOptionalArgs: unknown = someFunWithNullThenOptionalArgsTypeChecked as (_1:(null | string), _2:(undefined | string)) => string as any;
-
-// In case of type error, check the type of 'someFunWithNullUndefinedArg' in 'Core.res' and './CoreTS'.
-export const someFunWithNullUndefinedArgTypeChecked: (_1:(null | undefined | string), _2:number) => string = someFunWithNullUndefinedArgNotChecked as any;
-
-// Export 'someFunWithNullUndefinedArg' early to allow circular import from the '.bs.js' file.
-export const someFunWithNullUndefinedArg: unknown = someFunWithNullUndefinedArgTypeChecked as (_1:(null | undefined | string), _2:number) => string as any;
-
-const CoreJS = require('./Core.res.js');
-
-export type variant = "A" | { TAG: "B"; _0: string };
-
-export type t1 = { readonly x?: string };
-
-export type t2 = { readonly x: (undefined | string) };
-
-export const null0: (x:(null | number)) => (null | number) = CoreJS.null0 as any;
-
-export const null1: (x:(null | number)) => (null | number) = CoreJS.null1 as any;
-
-export const nullable0: (x:(null | undefined | number)) => (null | undefined | number) = CoreJS.nullable0 as any;
-
-export const nullable1: (x:(null | undefined | number)) => (null | undefined | number) = CoreJS.nullable1 as any;
-
-export const undefined0: (x:(undefined | number)) => (undefined | number) = CoreJS.undefined0 as any;
-
-export const undefined1: (x:(undefined | number)) => (undefined | number) = CoreJS.undefined1 as any;
-
-export const dict0: (x:{[id: string]: string}) => {[id: string]: string} = CoreJS.dict0 as any;
-
-export const dict1: (x:{[id: string]: string}) => {[id: string]: string} = CoreJS.dict1 as any;
-
-export const promise0: (x:Promise<string>) => Promise<string> = CoreJS.promise0 as any;
-
-export const promise1: (x:Promise<string>) => Promise<string> = CoreJS.promise1 as any;
-
-export const date0: (x:Date) => Date = CoreJS.date0 as any;
-
-export const date1: (x:Date) => Date = CoreJS.date1 as any;
-
-export const bigint0: (x:BigInt) => BigInt = CoreJS.bigint0 as any;
-
-export const bigint1: (x:BigInt) => BigInt = CoreJS.bigint1 as any;
-
-export const regexp0: (x:RegExp) => RegExp = CoreJS.regexp0 as any;
-
-export const regexp1: (x:RegExp) => RegExp = CoreJS.regexp1 as any;
-
-export const map1: (x:Map<string,number>) => Map<string,number> = CoreJS.map1 as any;
-
-export const weakmap1: (x:WeakMap<number[],number>) => WeakMap<number[],number> = CoreJS.weakmap1 as any;
-
-export const set1: (x:Set<string>) => Set<string> = CoreJS.set1 as any;
-
-export const weakset1: (x:WeakSet<number[]>) => WeakSet<number[]> = CoreJS.weakset1 as any;
-
-export const option0: (x:(undefined | string)) => (undefined | string) = CoreJS.option0 as any;
-
-export const option1: (x:(undefined | variant)) => (undefined | variant) = CoreJS.option1 as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Core.res b/jscomp/gentype_tests/typescript-react-example/src/Core.res
deleted file mode 100644
index 75fc44f..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Core.res
+++ /dev/null
@@ -1,88 +0,0 @@
-@genType
-let null0 = (x: Js.null<int>) => x
-
-@genType
-let null1 = (x: Null.t<int>) => x
-
-@genType
-let nullable0 = (x: Js.nullable<int>) => x
-
-@genType
-let nullable1 = (x: Nullable.t<int>) => x
-
-@genType
-let undefined0 = (x: Js.undefined<int>) => x
-
-@genType
-let undefined1 = (x: Undefined.t<int>) => x
-
-@genType
-let dict0 = (x: Js.Dict.t<string>) => x
-
-@genType
-let dict1 = (x: Dict.t<string>) => x
-
-@genType
-let promise0 = (x: promise<string>) => x
-
-@genType
-let promise1 = (x: Promise.t<string>) => x
-
-@genType
-let date0 = (x: Js.Date.t) => x
-
-@genType
-let date1 = (x: Date.t) => x
-
-@genType
-let bigint0 = (x: Js.Types.bigint_val) => x
-
-@genType
-let bigint1 = (x: BigInt.t) => x
-
-@genType
-let regexp0 = (x: Js.Re.t) => x
-
-@genType
-let regexp1 = (x: RegExp.t) => x
-
-module Map = Map_
-module Set = Set_
-
-@genType
-let map1 = (x: Map.t<string, int>) => x
-
-@genType
-let weakmap1 = (x: WeakMap.t<array<int>, int>) => x
-
-@genType
-let set1 = (x: Set.t<string>) => x
-
-@genType
-let weakset1 = (x: WeakSet.t<array<int>>) => x
-
-type variant = A | B(string)
-
-@genType
-let option0 = (x: option<string>) => x
-
-@genType
-let option1 = (x: option<variant>) => x
-
-@genType
-type t1 = {x?: string}
-
-@genType
-type t2 = {x: Js.undefined<string>}
-
-@genType.import("./CoreTS")
-external someFunWithNullThenOptionalArgs: (
-  Null.t<string> /* Cannot be Nullable.t or option */,
-  option<string> /* Cannot be Null.t or Nullable.t */,
-) => string = "someFunWithNullThenOptionalArgs"
-
-@genType.import("./CoreTS")
-external someFunWithNullUndefinedArg: (
-  Nullable.t<string> /* Can also be Null.t or option as they are subtypes */,
-  int,
-) => string = "someFunWithNullUndefinedArg"
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Core.res.js b/jscomp/gentype_tests/typescript-react-example/src/Core.res.js
deleted file mode 100644
index 0864298..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Core.res.js
+++ /dev/null
@@ -1,133 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as CoreGen from "./Core.gen";
-
-function null0(x) {
-  return x;
-}
-
-function null1(x) {
-  return x;
-}
-
-function nullable0(x) {
-  return x;
-}
-
-function nullable1(x) {
-  return x;
-}
-
-function undefined0(x) {
-  return x;
-}
-
-function undefined1(x) {
-  return x;
-}
-
-function dict0(x) {
-  return x;
-}
-
-function dict1(x) {
-  return x;
-}
-
-function promise0(x) {
-  return x;
-}
-
-function promise1(x) {
-  return x;
-}
-
-function date0(x) {
-  return x;
-}
-
-function date1(x) {
-  return x;
-}
-
-function bigint0(x) {
-  return x;
-}
-
-function bigint1(x) {
-  return x;
-}
-
-function regexp0(x) {
-  return x;
-}
-
-function regexp1(x) {
-  return x;
-}
-
-function map1(x) {
-  return x;
-}
-
-function weakmap1(x) {
-  return x;
-}
-
-function set1(x) {
-  return x;
-}
-
-function weakset1(x) {
-  return x;
-}
-
-function option0(x) {
-  return x;
-}
-
-function option1(x) {
-  return x;
-}
-
-function someFunWithNullThenOptionalArgs(prim0, prim1) {
-  return CoreGen.someFunWithNullThenOptionalArgs(prim0, prim1);
-}
-
-function someFunWithNullUndefinedArg(prim0, prim1) {
-  return CoreGen.someFunWithNullUndefinedArg(prim0, prim1);
-}
-
-var $$Map;
-
-var $$Set;
-
-export {
-  null0 ,
-  null1 ,
-  nullable0 ,
-  nullable1 ,
-  undefined0 ,
-  undefined1 ,
-  dict0 ,
-  dict1 ,
-  promise0 ,
-  promise1 ,
-  date0 ,
-  date1 ,
-  bigint0 ,
-  bigint1 ,
-  regexp0 ,
-  regexp1 ,
-  $$Map ,
-  $$Set ,
-  map1 ,
-  weakmap1 ,
-  set1 ,
-  weakset1 ,
-  option0 ,
-  option1 ,
-  someFunWithNullThenOptionalArgs ,
-  someFunWithNullUndefinedArg ,
-}
-/* ./Core.gen Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/CoreTS.ts b/jscomp/gentype_tests/typescript-react-example/src/CoreTS.ts
deleted file mode 100644
index ef25fa7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/CoreTS.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export declare function someFunWithNullThenOptionalArgs(
-  nullable: null | string,
-  app?: string
-): string;
-
-export declare function someFunWithNullUndefinedArg(
-  nullUndefined: null | undefined | string,
-  other: number
-): string;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res b/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res
deleted file mode 100644
index 94a4159..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res
+++ /dev/null
@@ -1,8 +0,0 @@
-module Error1 = {
-  type t = string
-  let notification = s => (s, s)
-}
-
-module MyErrorHandler = ErrorHandler.Make(Error1)
-
-MyErrorHandler.notify("abc")->ignore
diff --git a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js b/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js
deleted file mode 100644
index 8582791..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Curry from "rescript/lib/es6/curry.js";
-import * as ErrorHandler from "./ErrorHandler.res.js";
-
-function notification(s) {
-  return [
-          s,
-          s
-        ];
-}
-
-var Error1 = {
-  notification: notification
-};
-
-var MyErrorHandler = ErrorHandler.Make(Error1);
-
-Curry._1(MyErrorHandler.notify, "abc");
-
-export {
-  Error1 ,
-  MyErrorHandler ,
-}
-/* MyErrorHandler Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.res b/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.res
deleted file mode 100644
index 3949075..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.res
+++ /dev/null
@@ -1,6 +0,0 @@
-module Error2 = {
-  type t = int
-  let notification = n => (string_of_int(n), "")
-}
-
-module MyErrorHandler = ErrorHandler.Make(Error2) /* MyErrorHandler.notify(42) */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.res.js b/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.res.js
deleted file mode 100644
index ef8547f..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler2.res.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as ErrorHandler from "./ErrorHandler.res.js";
-
-function notification(n) {
-  return [
-          String(n),
-          ""
-        ];
-}
-
-var Error2 = {
-  notification: notification
-};
-
-var MyErrorHandler = ErrorHandler.Make(Error2);
-
-export {
-  Error2 ,
-  MyErrorHandler ,
-}
-/* MyErrorHandler Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Date.res b/jscomp/gentype_tests/typescript-react-example/src/Date.res
deleted file mode 100644
index 87cfe1b..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Date.res
+++ /dev/null
@@ -1 +0,0 @@
-type t = Js.Date.t
\ No newline at end of file
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Date.res.js b/jscomp/gentype_tests/typescript-react-example/src/Date.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Date.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Derivings.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Derivings.gen.tsx
deleted file mode 100644
index 5a23227..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Derivings.gen.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-/* TypeScript file generated from Derivings.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as DerivingsJS from './Derivings.res.js';
-
-export type action = 
-    "Click"
-  | "Cancel"
-  | { TAG: "Submit"; _0: string };
-
-export const click: action = DerivingsJS.click as any;
-
-export const submit: (_1:string) => action = DerivingsJS.submit as any;
-
-export const cancel: action = DerivingsJS.cancel as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Derivings.res b/jscomp/gentype_tests/typescript-react-example/src/Derivings.res
deleted file mode 100644
index d55c189..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Derivings.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@genType @deriving(accessors)
-type action =
-  | Click
-  | Submit(string)
-  | Cancel
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Derivings.res.js b/jscomp/gentype_tests/typescript-react-example/src/Derivings.res.js
deleted file mode 100644
index 5165501..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Derivings.res.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function submit(param_0) {
-  return {
-          TAG: "Submit",
-          _0: param_0
-        };
-}
-
-var click = "Click";
-
-var cancel = "Cancel";
-
-export {
-  click ,
-  submit ,
-  cancel ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Dict.res b/jscomp/gentype_tests/typescript-react-example/src/Dict.res
deleted file mode 100644
index 444e46d..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Dict.res
+++ /dev/null
@@ -1 +0,0 @@
-type t<'a> = Js.Dict.t<'a>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Dict.res.js b/jscomp/gentype_tests/typescript-react-example/src/Dict.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Dict.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx
deleted file mode 100644
index d6bbe20..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.gen.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* TypeScript file generated from Docstrings.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as DocstringsJS from './Docstrings.res.js';
-
-export type t = "A" | "B";
-
-/** hello */
-export const flat: number = DocstringsJS.flat as any;
-
-/** \n  * Sign a message with a key.\n  *\n  * @param message - A message to be signed\n  * @param key - The key with which to sign the message\n  * @returns A signed message\n */
-export const signMessage: (message:string, key:number) => string = DocstringsJS.signMessage as any;
-
-export const one: (a:number) => number = DocstringsJS.one as any;
-
-export const two: (a:number, b:number) => number = DocstringsJS.two as any;
-
-export const tree: (a:number, b:number, c:number) => number = DocstringsJS.tree as any;
-
-export const oneU: (a:number) => number = DocstringsJS.oneU as any;
-
-export const twoU: (a:number, b:number) => number = DocstringsJS.twoU as any;
-
-export const treeU: (a:number, b:number, c:number) => number = DocstringsJS.treeU as any;
-
-export const useParam: (param:number) => number = DocstringsJS.useParam as any;
-
-export const useParamU: (param:number) => number = DocstringsJS.useParamU as any;
-
-export const unnamed1: (param:number) => number = DocstringsJS.unnamed1 as any;
-
-export const unnamed1U: (param:number) => number = DocstringsJS.unnamed1U as any;
-
-export const unnamed2: (param_0:number, param_1:number) => number = DocstringsJS.unnamed2 as any;
-
-export const unnamed2U: (param_0:number, param_1:number) => number = DocstringsJS.unnamed2U as any;
-
-export const grouped: (x:number, y:number, a:number, b:number, c:number, z:number) => number = DocstringsJS.grouped as any;
-
-export const unitArgWithoutConversion: () => string = DocstringsJS.unitArgWithoutConversion as any;
-
-export const unitArgWithoutConversionU: () => string = DocstringsJS.unitArgWithoutConversionU as any;
-
-export const unitArgWithConversion: () => t = DocstringsJS.unitArgWithConversion as any;
-
-export const unitArgWithConversionU: () => t = DocstringsJS.unitArgWithConversionU as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.res b/jscomp/gentype_tests/typescript-react-example/src/Docstrings.res
deleted file mode 100644
index 962b406..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.res
+++ /dev/null
@@ -1,50 +0,0 @@
-@ocaml.doc(" hello ") @genType
-let flat = 34
-
-@ocaml.doc("
-  * Sign a message with a key.
-  *
-  * @param message - A message to be signed
-  * @param key - The key with which to sign the message
-  * @returns A signed message
- ")
-@genType
-let signMessage = (. message, key) => message ++ string_of_int(key)
-
-@genType let one = a => a + 0
-
-@genType let two = (a, b) => a + b + 0
-
-@genType let tree = (a, b, c) => a + b + c + 0
-
-@genType let oneU = (. a) => a + 0
-
-@genType let twoU = (. a, b) => a + b + 0
-
-@genType let treeU = (. a, b, c) => a + b + c + 0
-
-@genType let useParam = param => param + 34
-
-@genType let useParamU = (. param) => param + 34
-
-@genType let unnamed1 = (_: int) => 34
-
-@genType let unnamed1U = (. _: int) => 34
-
-@genType let unnamed2 = (_: int, _: int) => 34
-
-@genType let unnamed2U = (. _: int, _: int) => 34
-
-@genType let grouped = (~x, ~y, a, b, c, ~z) => x + y + a + b + c + z
-
-@genType let unitArgWithoutConversion = () => "abc"
-
-@genType let unitArgWithoutConversionU = (. ()) => "abc"
-
-type t =
-  | A
-  | B
-
-@genType let unitArgWithConversion = () => A
-
-@genType let unitArgWithConversionU = (. ()) => A
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.res.js b/jscomp/gentype_tests/typescript-react-example/src/Docstrings.res.js
deleted file mode 100644
index 2ab5a33..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Docstrings.res.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function signMessage(message, key) {
-  return message + String(key);
-}
-
-function one(a) {
-  return a + 0 | 0;
-}
-
-function two(a, b) {
-  return (a + b | 0) + 0 | 0;
-}
-
-function tree(a, b, c) {
-  return ((a + b | 0) + c | 0) + 0 | 0;
-}
-
-function oneU(a) {
-  return a + 0 | 0;
-}
-
-function twoU(a, b) {
-  return (a + b | 0) + 0 | 0;
-}
-
-function treeU(a, b, c) {
-  return ((a + b | 0) + c | 0) + 0 | 0;
-}
-
-function useParam(param) {
-  return param + 34 | 0;
-}
-
-function useParamU(param) {
-  return param + 34 | 0;
-}
-
-function unnamed1(param) {
-  return 34;
-}
-
-function unnamed1U(param) {
-  return 34;
-}
-
-function unnamed2(param, param$1) {
-  return 34;
-}
-
-function unnamed2U(param, param$1) {
-  return 34;
-}
-
-function grouped(x, y, a, b, c, z) {
-  return ((((x + y | 0) + a | 0) + b | 0) + c | 0) + z | 0;
-}
-
-function unitArgWithoutConversion(param) {
-  return "abc";
-}
-
-function unitArgWithoutConversionU() {
-  return "abc";
-}
-
-function unitArgWithConversion(param) {
-  return "A";
-}
-
-function unitArgWithConversionU() {
-  return "A";
-}
-
-var flat = 34;
-
-export {
-  flat ,
-  signMessage ,
-  one ,
-  two ,
-  tree ,
-  oneU ,
-  twoU ,
-  treeU ,
-  useParam ,
-  useParamU ,
-  unnamed1 ,
-  unnamed1U ,
-  unnamed2 ,
-  unnamed2U ,
-  grouped ,
-  unitArgWithoutConversion ,
-  unitArgWithoutConversionU ,
-  unitArgWithConversion ,
-  unitArgWithConversionU ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/DynamicallyLoadedComponent.res b/jscomp/gentype_tests/typescript-react-example/src/DynamicallyLoadedComponent.res
deleted file mode 100644
index b7b93b5..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/DynamicallyLoadedComponent.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@react.component
-let make = (~s) => React.string(s)
diff --git a/jscomp/gentype_tests/typescript-react-example/src/DynamicallyLoadedComponent.res.js b/jscomp/gentype_tests/typescript-react-example/src/DynamicallyLoadedComponent.res.js
deleted file mode 100644
index 9eb45ee..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/DynamicallyLoadedComponent.res.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function DynamicallyLoadedComponent(Props) {
-  return Props.s;
-}
-
-var make = DynamicallyLoadedComponent;
-
-export {
-  make ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx
deleted file mode 100644
index 0bfa420..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.gen.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/* TypeScript file generated from EmitModuleIfNoConversion.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as EmitModuleIfNoConversionJS from './EmitModuleIfNoConversion.res.js';
-
-export type t = "A" | { TAG: "B"; readonly name: string };
-
-export const X_foo: (t:t) => void = EmitModuleIfNoConversionJS.X.foo as any;
-
-export const X_x: number = EmitModuleIfNoConversionJS.X.x as any;
-
-export const Y_x: string = EmitModuleIfNoConversionJS.Y.x as any;
-
-export const Y: { x: string } = EmitModuleIfNoConversionJS.Y as any;
-
-export const X: { x: number; foo: (t:t) => void } = EmitModuleIfNoConversionJS.X as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.res b/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.res
deleted file mode 100644
index 7d74a6e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.res
+++ /dev/null
@@ -1,21 +0,0 @@
-@genType
-type t =
-  | A
-  | B({name: string})
-
-// foo requires converion: don't emit module X
-module X = {
-  @genType
-  let foo = (t: t) =>
-    switch t {
-    | A => Js.log("A")
-    | B({name}) => Js.log("B" ++ name)
-    }
-
-  @genType let x = 42
-}
-
-// No field requires converion: emit module Y
-module Y = {
-  @genType let x = ""
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.res.js b/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.res.js
deleted file mode 100644
index f73e0e7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/EmitModuleIfNoConversion.res.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function foo(t) {
-  if (typeof t !== "object") {
-    console.log("A");
-    return ;
-  }
-  console.log("B" + t.name);
-}
-
-var X = {
-  foo: foo,
-  x: 42
-};
-
-var Y = {
-  x: ""
-};
-
-export {
-  X ,
-  Y ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res b/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res
deleted file mode 100644
index de3b351..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module type Error = {
-  type t
-  let notification: t => (string, string)
-}
-
-module Make = (Error: Error) => {
-  let notify = x => Error.notification(x)
-}
-
-// This is ignored as there's an interface file
-@genType let x = 42
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res.js b/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res.js
deleted file mode 100644
index 27dcce4..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.res.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Curry from "rescript/lib/es6/curry.js";
-
-function Make($$Error) {
-  var notify = function (x) {
-    return Curry._1($$Error.notification, x);
-  };
-  return {
-          notify: notify
-        };
-}
-
-var x = 42;
-
-export {
-  Make ,
-  x ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.resi b/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.resi
deleted file mode 100644
index fac11f7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ErrorHandler.resi
+++ /dev/null
@@ -1,10 +0,0 @@
-module type Error = {
-  type t
-  let notification: t => (string, string)
-}
-module Make: (Error: Error) =>
-{
-  let notify: Error.t => (string, string)
-}
-
-let x: int
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx
deleted file mode 100644
index 78737da..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.gen.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* TypeScript file generated from ExportWithRename.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as React from 'react';
-
-import * as ExportWithRenameJS from './ExportWithRename.res.js';
-
-export type Props = { readonly s: string };
-
-export const Renamed: React.ComponentType<{ readonly s: string }> = ExportWithRenameJS.make as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.res b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.res
deleted file mode 100644
index fa6b2fa..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType.as("Renamed") @react.component
-let make = (~s) => React.string(s)
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.res.js b/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.res.js
deleted file mode 100644
index 41537fe..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ExportWithRename.res.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function ExportWithRename(Props) {
-  return Props.s;
-}
-
-var make = ExportWithRename;
-
-export {
-  make ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx
deleted file mode 100644
index 3b0d202..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.gen.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-/* TypeScript file generated from FirstClassModules.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as FirstClassModulesJS from './FirstClassModules.res.js';
-
-export type MT_t = number;
-
-export type MT_InnerModule3_inner = number;
-
-export type firstClassModule = {
-  readonly x: number; 
-  readonly EmptyInnerModule: {
-  }; 
-  readonly InnerModule2: {
-    readonly k: MT_t
-  }; 
-  readonly InnerModule3: {
-    readonly k3: (_1:MT_InnerModule3_inner) => MT_InnerModule3_inner
-  }; 
-  readonly Z: unknown; 
-  readonly y: string
-};
-
-export const firstClassModule: firstClassModule = FirstClassModulesJS.firstClassModule as any;
-
-export const testConvert: (m:{
-  readonly x: number; 
-  readonly EmptyInnerModule: {
-  }; 
-  readonly InnerModule2: {
-    readonly k: MT_t
-  }; 
-  readonly InnerModule3: {
-    readonly k3: ((_1:MT_InnerModule3_inner) => MT_InnerModule3_inner)
-  }; 
-  readonly Z: unknown; 
-  readonly y: string
-}) => {
-  readonly x: number; 
-  readonly EmptyInnerModule: {
-  }; 
-  readonly InnerModule2: {
-    readonly k: MT_t
-  }; 
-  readonly InnerModule3: {
-    readonly k3: (_1:MT_InnerModule3_inner) => MT_InnerModule3_inner
-  }; 
-  readonly Z: unknown; 
-  readonly y: string
-} = FirstClassModulesJS.testConvert as any;
-
-export const someFunctorAsFunction: (x:{
-  readonly x: number; 
-  readonly EmptyInnerModule: {
-  }; 
-  readonly InnerModule2: {
-    readonly k: MT_t
-  }; 
-  readonly InnerModule3: {
-    readonly k3: ((_1:MT_InnerModule3_inner) => MT_InnerModule3_inner)
-  }; 
-  readonly Z: unknown; 
-  readonly y: string
-}) => { readonly ww: string } = FirstClassModulesJS.someFunctorAsFunction as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.res b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.res
deleted file mode 100644
index 86ef6af..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.res
+++ /dev/null
@@ -1,65 +0,0 @@
-module type MT = {
-  let x: int
-  type t = int
-  @module("foo") external f: int => int = "f"
-  module type XXX = {
-    type tt = string
-  }
-  module EmptyInnerModule: {
-
-  }
-  module InnerModule2: {
-    let k: t
-  }
-  module InnerModule3: {
-    type inner = int
-    let k3: inner => inner
-  }
-  module type TT = {
-    let u: (int, int)
-  }
-  module Z: TT
-  let y: string
-}
-module M = {
-  let y = "abc"
-  module type XXX = {
-    type tt = string
-  }
-  module EmptyInnerModule = {
-
-  }
-  module InnerModule2 = {
-    let k = 4242
-  }
-  module InnerModule3 = {
-    type inner = int
-    let k3 = x => x + 1
-  }
-
-  module type TT = {
-    let u: (int, int)
-  }
-  module Z = {
-    let u = (0, 0)
-  }
-  type t = int
-  @module("foo") external f: int => int = "f"
-  let x = 42
-}
-
-@genType type firstClassModule = module(MT)
-
-@genType let firstClassModule: firstClassModule = module(M)
-
-@genType let testConvert = (m: module(MT)) => m
-
-module type ResT = {
-  let ww: string
-}
-
-module SomeFunctor = (X: MT): ResT => {
-  let ww = X.y
-}
-
-@genType let someFunctorAsFunction = (x: module(MT)): module(ResT) => module(SomeFunctor(unpack(x)))
diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.res.js b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.res.js
deleted file mode 100644
index f5e1e86..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModules.res.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var y = "abc";
-
-var EmptyInnerModule = {};
-
-var InnerModule2 = {
-  k: 4242
-};
-
-function k3(x) {
-  return x + 1 | 0;
-}
-
-var InnerModule3 = {
-  k3: k3
-};
-
-var Z = {
-  u: [
-    0,
-    0
-  ]
-};
-
-var M = {
-  y: y,
-  EmptyInnerModule: EmptyInnerModule,
-  InnerModule2: InnerModule2,
-  InnerModule3: InnerModule3,
-  Z: Z,
-  x: 42
-};
-
-var firstClassModule = {
-  x: 42,
-  EmptyInnerModule: EmptyInnerModule,
-  InnerModule2: InnerModule2,
-  InnerModule3: InnerModule3,
-  Z: Z,
-  y: y
-};
-
-function testConvert(m) {
-  return m;
-}
-
-function SomeFunctor(X) {
-  return {
-          ww: X.y
-        };
-}
-
-function someFunctorAsFunction(x) {
-  return {
-          ww: x.y
-        };
-}
-
-export {
-  M ,
-  firstClassModule ,
-  testConvert ,
-  SomeFunctor ,
-  someFunctorAsFunction ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx
deleted file mode 100644
index 6da111a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from FirstClassModulesInterface.resi by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type record = { readonly x: number; readonly y: string };
-
-export type firstClassModule = { readonly x: number };
diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.res b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.res
deleted file mode 100644
index 9dd75a9..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type record = {
-  x: int,
-  y: string,
-}
-
-let r = {x: 3, y: "hello"}
-
-module type MT = {
-  let x: int
-}
-
-type firstClassModule = module(MT)
diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.res.js b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.res.js
deleted file mode 100644
index 6d7febd..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.res.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var r = {
-  x: 3,
-  y: "hello"
-};
-
-export {
-  r ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.resi b/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.resi
deleted file mode 100644
index 8b5354a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/FirstClassModulesInterface.resi
+++ /dev/null
@@ -1,14 +0,0 @@
-@genType
-type record = {
-  x: int,
-  y: string,
-}
-
-let r: record
-
-@genType
-module type MT = {
-  let x: int
-}
-
-@genType type firstClassModule = module(MT)
diff --git a/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx
deleted file mode 100644
index b6e29a5..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/GADT.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from GADT.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export abstract class t { protected opaque!: any }; /* simulate opaque types */
-
-export abstract class tt { protected opaque!: any }; /* simulate opaque types */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/GADT.res b/jscomp/gentype_tests/typescript-react-example/src/GADT.res
deleted file mode 100644
index ab5d939..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/GADT.res
+++ /dev/null
@@ -1,7 +0,0 @@
-// Warning here: GADT exported as opaque
-@gentype
-type rec t = Any('a): t | Anytwo('b, 'c): t
-
-// No warning here
-@gentype.opaque
-type rec tt = Any('a): tt | Anytwo('b, 'c): tt
diff --git a/jscomp/gentype_tests/typescript-react-example/src/GADT.res.js b/jscomp/gentype_tests/typescript-react-example/src/GADT.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/GADT.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx
deleted file mode 100644
index 39f83f9..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Hooks.gen.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-/* TypeScript file generated from Hooks.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as React from 'react';
-
-import * as HooksJS from './Hooks.res.js';
-
-import type {TypedArray2_Uint8Array_t as Js_TypedArray2_Uint8Array_t} from '../src/shims/Js.shim';
-
-export type vehicle = { readonly name: string };
-
-export type cb = (_to:vehicle) => void;
-
-export type r = { readonly x: string };
-
-export type callback<input,output> = (_1:input) => output;
-
-export type testReactContext = React.Context<number>;
-
-export type testReactRef = { current: (null | number) };
-
-export type testDomRef = React.Ref<unknown>;
-
-export type testDomRef2 = React.Ref<unknown>;
-
-export type Props = { readonly vehicle: vehicle };
-
-export const $$default: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.default as any;
-
-export default $$default;
-
-export type Another_anotherComponent_Props = { readonly callback: () => void; readonly vehicle: vehicle };
-
-export const Another_anotherComponent: React.ComponentType<{ readonly callback: () => void; readonly vehicle: vehicle }> = HooksJS.Another.anotherComponent as any;
-
-export type Inner_make_Props = { readonly vehicle: vehicle };
-
-export const Inner_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.make as any;
-
-export type Inner_Another_anotherComponent_Props = { readonly vehicle: vehicle };
-
-export const Inner_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.Another.anotherComponent as any;
-
-export type Inner_Inner2_make_Props = { readonly vehicle: vehicle };
-
-export const Inner_Inner2_make: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.Inner2.make as any;
-
-export type Inner_Inner2_Another_anotherComponent_Props = { readonly vehicle: vehicle };
-
-export const Inner_Inner2_Another_anotherComponent: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.Inner.Inner2.Another.anotherComponent as any;
-
-export type NoProps_make_Props = {};
-
-export const NoProps_make: React.ComponentType<{}> = HooksJS.NoProps.make as any;
-
-export const functionWithRenamedArgs: (_to:vehicle, _Type:vehicle, cb:cb) => string = HooksJS.functionWithRenamedArgs as any;
-
-export type WithRename_componentWithRenamedArgs_Props = {
-  readonly _Type: vehicle; 
-  readonly _to: vehicle; 
-  readonly cb: cb
-};
-
-export const WithRename_componentWithRenamedArgs: React.ComponentType<{
-  readonly _Type: vehicle; 
-  readonly _to: vehicle; 
-  readonly cb: cb
-}> = HooksJS.WithRename.componentWithRenamedArgs as any;
-
-export const WithRef_makeWithRef: (_1:{ readonly vehicle: vehicle }, _2:(null | undefined | any)) => JSX.Element = HooksJS.WithRef.makeWithRef as any;
-
-export type testForwardRef_Props = { readonly vehicle: vehicle };
-
-export const testForwardRef: React.ComponentType<{ readonly vehicle: vehicle }> = HooksJS.testForwardRef as any;
-
-export type ForwardRef_input_Props = { readonly r: r };
-
-export const ForwardRef_input: React.ComponentType<{ readonly r: r }> = HooksJS.ForwardRef.input as any;
-
-export type Poly_polymorphicComponent_Props<T1> = { readonly p: [vehicle, T1] };
-
-export const Poly_polymorphicComponent: React.ComponentType<{ readonly p: [vehicle, any] }> = HooksJS.Poly.polymorphicComponent as any;
-
-export type Fun_functionReturningReactElement_Props = { readonly name: string };
-
-export const Fun_functionReturningReactElement: React.ComponentType<{ readonly name: string }> = HooksJS.Fun.functionReturningReactElement as any;
-
-export type RenderPropRequiresConversion_make_Props = { readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> };
-
-export const RenderPropRequiresConversion_make: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> = HooksJS.RenderPropRequiresConversion.make as any;
-
-export type WithChildren_aComponentWithChildren_Props = { readonly children: React.ReactNode; readonly vehicle: vehicle };
-
-export const WithChildren_aComponentWithChildren: React.ComponentType<{ readonly children: React.ReactNode; readonly vehicle: vehicle }> = HooksJS.WithChildren.aComponentWithChildren as any;
-
-export type DD_make_Props = { readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string };
-
-export const DD_make: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> = HooksJS.DD.make as any;
-
-export const NoProps: { make: React.ComponentType<{}> } = HooksJS.NoProps as any;
-
-export const Inner: {
-  Inner2: {
-    Another: {
-      anotherComponent: React.ComponentType<{
-        readonly vehicle: vehicle
-      }>
-    }; 
-    make: React.ComponentType<{
-      readonly vehicle: vehicle
-    }>
-  }; 
-  Another: {
-    anotherComponent: React.ComponentType<{
-      readonly vehicle: vehicle
-    }>
-  }; 
-  make: React.ComponentType<{
-    readonly vehicle: vehicle
-  }>
-} = HooksJS.Inner as any;
-
-export const RenderPropRequiresConversion: { make: React.ComponentType<{ readonly renderVehicle: React.ComponentType<{ readonly number: number; readonly vehicle: vehicle }> }> } = HooksJS.RenderPropRequiresConversion as any;
-
-export const WithRename: { componentWithRenamedArgs: React.ComponentType<{
-  readonly _Type: vehicle; 
-  readonly _to: vehicle; 
-  readonly cb: cb
-}> } = HooksJS.WithRename as any;
-
-export const ForwardRef: { input: React.ComponentType<{ readonly r: r }> } = HooksJS.ForwardRef as any;
-
-export const Fun: { functionReturningReactElement: React.ComponentType<{ readonly name: string }> } = HooksJS.Fun as any;
-
-export const WithRef: { makeWithRef: (_1:{ readonly vehicle: vehicle }, _2:(null | undefined | any)) => JSX.Element } = HooksJS.WithRef as any;
-
-export const WithChildren: { aComponentWithChildren: React.ComponentType<{ readonly children: React.ReactNode; readonly vehicle: vehicle }> } = HooksJS.WithChildren as any;
-
-export const DD: { make: React.ComponentType<{ readonly array: Js_TypedArray2_Uint8Array_t; readonly name: string }> } = HooksJS.DD as any;
-
-export const Another: { anotherComponent: React.ComponentType<{ readonly callback: () => void; readonly vehicle: vehicle }> } = HooksJS.Another as any;
-
-export const Poly: { polymorphicComponent: React.ComponentType<{ readonly p: [vehicle, any] }> } = HooksJS.Poly as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Hooks.res b/jscomp/gentype_tests/typescript-react-example/src/Hooks.res
deleted file mode 100644
index bce9f6c..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Hooks.res
+++ /dev/null
@@ -1,142 +0,0 @@
-@@warning("-3")
-
-type vehicle = {name: string}
-
-@react.component
-let make = (~vehicle) => {
-  let (count, setCount) = React.useState(() => 0)
-
-  <div>
-    <p>
-      {React.string(
-        "Hooks example " ++ (vehicle.name ++ (" clicked " ++ (string_of_int(count) ++ " times"))),
-      )}
-    </p>
-    <button onClick={_ => setCount(_ => count + 1)}> {React.string("Click me")} </button>
-    <ImportHooks person={name: "Mary", age: 71} renderMe={x => React.string(x["randomString"])}>
-      {React.string("child1")}
-      {React.string("child2")}
-    </ImportHooks>
-    <ImportHookDefault
-      person={name: "DefaultImport", age: 42} renderMe={x => React.string(x["randomString"])}>
-      {React.string("child1")}
-      {React.string("child2")}
-    </ImportHookDefault>
-  </div>
-}
-
-@genType
-let default = make
-
-module Another = {
-  @genType @react.component
-  let anotherComponent = (~vehicle, ~callback: unit => unit) => {
-    callback()
-    <div> {React.string("Another Hook " ++ vehicle.name)} </div>
-  }
-}
-
-module Inner = {
-  @genType @react.component
-  let make = (~vehicle) => <div> {React.string("Another Hook " ++ vehicle.name)} </div>
-  module Another = {
-    @genType @react.component
-    let anotherComponent = (~vehicle) =>
-      <div> {React.string("Another Hook " ++ vehicle.name)} </div>
-  }
-  module Inner2 = {
-    @genType @react.component
-    let make = (~vehicle) => <div> {React.string("Another Hook " ++ vehicle.name)} </div>
-    module Another = {
-      @genType @react.component
-      let anotherComponent = (~vehicle) =>
-        <div> {React.string("Another Hook " ++ vehicle.name)} </div>
-    }
-  }
-}
-
-module NoProps = {
-  @genType @react.component
-  let make = () => <div> React.null </div>
-}
-
-type cb = (~_to: vehicle) => unit
-
-@genType
-let functionWithRenamedArgs = (~_to, ~_Type, ~cb: cb) => {
-  cb(~_to)
-  _to.name ++ _Type.name
-}
-
-module WithRename = {
-  @genType @react.component
-  let componentWithRenamedArgs = (~_to, ~_Type, ~cb: cb) => {
-    cb(~_to)
-    React.string(_to.name ++ _Type.name)
-  }
-}
-
-module WithRef = {
-  @genType @react.component
-  let makeWithRef = (~vehicle) => {
-    let _ = 34
-    ref =>
-      switch ref->Js.Nullable.toOption {
-      | Some(ref) => <button ref={ReactDOM.Ref.domRef(ref)}> {React.string(vehicle.name)} </button>
-      | None => React.null
-      }
-  }
-}
-
-@genType let testForwardRef = React.forwardRef(WithRef.makeWithRef)
-
-type r = {x: string}
-
-module ForwardRef = {
-  @genType @react.component
-  let input = React.forwardRef((~r, (), ref) =>
-    <div ref={Obj.magic(ref)}> {React.string(r.x)} </div>
-  )
-}
-
-@genType type callback<'input, 'output> = 'input => 'output
-
-@genType type testReactContext = React.Context.t<int>
-
-@genType type testReactRef = React.Ref.t<int>
-
-@genType type testDomRef = ReactDOM.domRef
-
-@genType type testDomRef2 = ReactDOM.Ref.t
-
-module Poly = {
-  @genType @react.component
-  let polymorphicComponent = (~p as (x, _)) => React.string(x.name)
-}
-
-module Fun = {
-  @genType @react.component
-  let functionReturningReactElement = (~name) => React.string(name)
-}
-
-module RenderPropRequiresConversion = {
-  @genType @react.component
-  let make = (~renderVehicle: {"vehicle": vehicle, "number": int} => React.element) => {
-    let car = {name: "Car"}
-    renderVehicle({"vehicle": car, "number": 42})
-  }
-}
-
-module WithChildren = {
-  @genType @react.component
-  let aComponentWithChildren = (~vehicle, ~children) =>
-    <div>
-      {React.string("Another Hook " ++ vehicle.name)}
-      <div> children </div>
-    </div>
-}
-
-module DD = {
-  @genType @react.component
-  let make = (~array as _: Js.TypedArray2.Uint8Array.t, ~name: string) => React.string(name)
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Hooks.res.js b/jscomp/gentype_tests/typescript-react-example/src/Hooks.res.js
deleted file mode 100644
index cd15d84..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Hooks.res.js
+++ /dev/null
@@ -1,223 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Curry from "rescript/lib/es6/curry.js";
-import * as React from "react";
-import * as ImportHooks from "./ImportHooks.res.js";
-import * as ImportHookDefault from "./ImportHookDefault.res.js";
-
-function Hooks(Props) {
-  var vehicle = Props.vehicle;
-  var match = React.useState(function (param) {
-        return 0;
-      });
-  var setCount = match[1];
-  var count = match[0];
-  return React.createElement("div", undefined, React.createElement("p", undefined, "Hooks example " + (vehicle.name + (" clicked " + (String(count) + " times")))), React.createElement("button", {
-                  onClick: (function (param) {
-                      Curry._1(setCount, (function (param) {
-                              return count + 1 | 0;
-                            }));
-                    })
-                }, "Click me"), React.createElement(ImportHooks.make, {
-                  person: {
-                    name: "Mary",
-                    age: 71
-                  },
-                  children: null,
-                  renderMe: (function (x) {
-                      return x.randomString;
-                    })
-                }, "child1", "child2"), React.createElement(ImportHookDefault.make, {
-                  person: {
-                    name: "DefaultImport",
-                    age: 42
-                  },
-                  children: null,
-                  renderMe: (function (x) {
-                      return x.randomString;
-                    })
-                }, "child1", "child2"));
-}
-
-function Hooks$Another$anotherComponent(Props) {
-  var vehicle = Props.vehicle;
-  var callback = Props.callback;
-  Curry._1(callback, undefined);
-  return React.createElement("div", undefined, "Another Hook " + vehicle.name);
-}
-
-var Another = {
-  anotherComponent: Hooks$Another$anotherComponent
-};
-
-function Hooks$Inner(Props) {
-  var vehicle = Props.vehicle;
-  return React.createElement("div", undefined, "Another Hook " + vehicle.name);
-}
-
-function Hooks$Inner$Another$anotherComponent(Props) {
-  var vehicle = Props.vehicle;
-  return React.createElement("div", undefined, "Another Hook " + vehicle.name);
-}
-
-var Another$1 = {
-  anotherComponent: Hooks$Inner$Another$anotherComponent
-};
-
-function Hooks$Inner$Inner2(Props) {
-  var vehicle = Props.vehicle;
-  return React.createElement("div", undefined, "Another Hook " + vehicle.name);
-}
-
-function Hooks$Inner$Inner2$Another$anotherComponent(Props) {
-  var vehicle = Props.vehicle;
-  return React.createElement("div", undefined, "Another Hook " + vehicle.name);
-}
-
-var Another$2 = {
-  anotherComponent: Hooks$Inner$Inner2$Another$anotherComponent
-};
-
-var Inner2 = {
-  make: Hooks$Inner$Inner2,
-  Another: Another$2
-};
-
-var Inner = {
-  make: Hooks$Inner,
-  Another: Another$1,
-  Inner2: Inner2
-};
-
-function Hooks$NoProps(Props) {
-  return React.createElement("div", undefined, null);
-}
-
-var NoProps = {
-  make: Hooks$NoProps
-};
-
-function functionWithRenamedArgs(_to, _Type, cb) {
-  Curry._1(cb, _to);
-  return _to.name + _Type.name;
-}
-
-function Hooks$WithRename$componentWithRenamedArgs(Props) {
-  var _to = Props._to;
-  var _Type = Props._Type;
-  var cb = Props.cb;
-  Curry._1(cb, _to);
-  return _to.name + _Type.name;
-}
-
-var WithRename = {
-  componentWithRenamedArgs: Hooks$WithRename$componentWithRenamedArgs
-};
-
-function makeWithRef(vehicle) {
-  return function (ref) {
-    if (ref == null) {
-      return null;
-    } else {
-      return React.createElement("button", {
-                  ref: ref
-                }, vehicle.name);
-    }
-  };
-}
-
-function Hooks$WithRef$makeWithRef(Props) {
-  return makeWithRef(Props.vehicle);
-}
-
-var WithRef = {
-  makeWithRef: Hooks$WithRef$makeWithRef
-};
-
-var testForwardRef = React.forwardRef(function (param, param$1) {
-      return makeWithRef(param.vehicle)(param$1);
-    });
-
-var input = React.forwardRef(function (Props, param) {
-      var partial_arg = Props.r;
-      return React.createElement("div", {
-                  ref: param
-                }, partial_arg.x);
-    });
-
-var ForwardRef = {
-  input: input
-};
-
-function Hooks$Poly$polymorphicComponent(Props) {
-  var param = Props.p;
-  return param[0].name;
-}
-
-var Poly = {
-  polymorphicComponent: Hooks$Poly$polymorphicComponent
-};
-
-function Hooks$Fun$functionReturningReactElement(Props) {
-  return Props.name;
-}
-
-var Fun = {
-  functionReturningReactElement: Hooks$Fun$functionReturningReactElement
-};
-
-function Hooks$RenderPropRequiresConversion(Props) {
-  var renderVehicle = Props.renderVehicle;
-  return Curry._1(renderVehicle, {
-              vehicle: {
-                name: "Car"
-              },
-              number: 42
-            });
-}
-
-var RenderPropRequiresConversion = {
-  make: Hooks$RenderPropRequiresConversion
-};
-
-function Hooks$WithChildren$aComponentWithChildren(Props) {
-  var vehicle = Props.vehicle;
-  var children = Props.children;
-  return React.createElement("div", undefined, "Another Hook " + vehicle.name, React.createElement("div", undefined, children));
-}
-
-var WithChildren = {
-  aComponentWithChildren: Hooks$WithChildren$aComponentWithChildren
-};
-
-function Hooks$DD(Props) {
-  var name = Props.name;
-  return name;
-}
-
-var DD = {
-  make: Hooks$DD
-};
-
-var make = Hooks;
-
-var $$default = Hooks;
-
-export {
-  make ,
-  $$default as default,
-  Another ,
-  Inner ,
-  NoProps ,
-  functionWithRenamedArgs ,
-  WithRename ,
-  WithRef ,
-  testForwardRef ,
-  ForwardRef ,
-  Poly ,
-  Fun ,
-  RenderPropRequiresConversion ,
-  WithChildren ,
-  DD ,
-}
-/* testForwardRef Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx
deleted file mode 100644
index e1da44f..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.gen.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-/* TypeScript file generated from IgnoreInterface.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type t = number;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.res b/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.res
deleted file mode 100644
index d381c3d..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@gentype
-type t = int
diff --git a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.res.js b/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.resi b/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.resi
deleted file mode 100644
index 7a7cf64..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/IgnoreInterface.resi
+++ /dev/null
@@ -1,4 +0,0 @@
-// Use the annotations, and definitions, from the .res file
-@@genType.ignoreInterface
-
-@genType type t
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res b/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res
deleted file mode 100644
index a7f0432..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res
+++ /dev/null
@@ -1,118 +0,0 @@
-type t<+'a>
-module Array = {
-  open Belt
-  type array2<'a> = (array<'a>, array<'a>)
-  external fromT: t<'a> => array<'a> = "%identity"
-  external fromTp: t<('a, 'b)> => array<('a, 'b)> = "%identity"
-  external fromTT: t<t<'a>> => array<array<'a>> = "%identity"
-  external toT: array<'a> => t<'a> = "%identity"
-  external toTp: array<('a, 'b)> => t<('a, 'b)> = "%identity"
-  external toT2: array2<'a> => (t<'a>, t<'a>) = "%identity"
-
-  /* Conversions involve a copy */
-
-  let fromArray = a => Array.copy(a)->toT
-
-  let toArray = a => Array.copy(a->fromT)
-
-  /* Type-cast immutable functions from Belt.Array. */
-
-  let length = a => Array.length(a->fromT)
-
-  let size = a => Array.size(a->fromT)
-
-  let get = (a, x) => (a->fromT)[x]
-
-  let getExn = (a, x) => Array.getExn(a->fromT, x)
-
-  let getUnsafe = (a, x) => Array.getUnsafe(a->fromT, x)
-
-  let getUndefined = (a, x) => Array.getUndefined(a->fromT, x)
-
-  let shuffle = x => Array.shuffle(x->fromT)->toT
-
-  let reverse = x => Array.reverse(x->fromT)->toT
-
-  let makeUninitialized = x => Array.makeUninitialized(x)->toT
-
-  let makeUninitializedUnsafe = x => Array.makeUninitializedUnsafe(x)->toT
-
-  let make = (x, y) => Array.make(x, y)->toT
-
-  let range = (x, y) => Array.range(x, y)->toT
-
-  let rangeBy = (x, y, ~step) => Array.rangeBy(x, y, ~step)->toT
-
-  let makeByU = (c, f) => Array.makeByU(c, f)->toT
-  let makeBy = (c, f) => Array.makeBy(c, f)->toT
-
-  let makeByAndShuffleU = (c, f) => Array.makeByAndShuffleU(c, f)->toT
-  let makeByAndShuffle = (c, f) => Array.makeByAndShuffle(c, f)->toT
-
-  let zip = (a1, a2) => Array.zip(fromT(a1), fromT(a2))->toTp
-
-  let zipByU = (a1, a2, f) => Array.zipByU(fromT(a1), fromT(a2), f)->toT
-  let zipBy = (a1, a2, f) => Array.zipBy(fromT(a1), fromT(a2), f)->toT
-
-  let unzip = a => Array.unzip(a->fromTp)->toT2
-
-  let concat = (a1, a2) => Array.concat(a1->fromT, a2->fromT)->toT
-
-  let concatMany = (a: t<t<_>>) => Array.concatMany(a->fromTT)->toT
-
-  let slice = (a, ~offset, ~len) => Array.slice(a->fromT, ~offset, ~len)->toT
-
-  let sliceToEnd = (a, b) => Array.sliceToEnd(a->fromT, b)->toT
-
-  let copy = a => Array.copy(a->fromT)->toT
-
-  let forEachU = (a, f) => Array.forEachU(a->fromT, f)
-  let forEach = (a, f) => Array.forEach(a->fromT, f)
-
-  let mapU = (a, f) => Array.mapU(a->fromT, f)->toT
-  let map = (a, f) => Array.map(a->fromT, f)->toT
-
-  let keepWithIndexU = (a, f) => Array.keepWithIndexU(a->fromT, f)->toT
-  let keepWithIndex = (a, f) => Array.keepWithIndex(a->fromT, f)->toT
-
-  let keepMapU = (a, f) => Array.keepMapU(a->fromT, f)->toT
-  let keepMap = (a, f) => Array.keepMap(a->fromT, f)->toT
-
-  let forEachWithIndexU = (a, f) => Array.forEachWithIndexU(a->fromT, f)
-  let forEachWithIndex = (a, f) => Array.forEachWithIndex(a->fromT, f)
-
-  let mapWithIndexU = (a, f) => Array.mapWithIndexU(a->fromT, f)->toT
-  let mapWithIndex = (a, f) => Array.mapWithIndex(a->fromT, f)->toT
-
-  let partitionU = (a, f) => Array.partitionU(a->fromT, f)->toT2
-  let partition = (a, f) => Array.partition(a->fromT, f)->toT2
-
-  let reduceU = (a, b, f) => Array.reduceU(a->fromT, b, f)
-  let reduce = (a, b, f) => Array.reduce(a->fromT, b, f)
-
-  let reduceReverseU = (a, b, f) => Array.reduceReverseU(a->fromT, b, f)
-  let reduceReverse = (a, b, f) => Array.reduceReverse(a->fromT, b, f)
-
-  let reduceReverse2U = (a1, a2, c, f) => Array.reduceReverse2U(fromT(a1), fromT(a2), c, f)
-  let reduceReverse2 = (a1, a2, c, f) => Array.reduceReverse2(fromT(a1), fromT(a2), c, f)
-
-  let someU = (a, f) => Array.someU(a->fromT, f)
-  let some = (a, f) => Array.some(a->fromT, f)
-
-  let everyU = (a, f) => Array.everyU(a->fromT, f)
-  let every = (a, f) => Array.every(a->fromT, f)
-
-  let every2U = (a1, a2, f) => Array.every2U(fromT(a1), fromT(a2), f)
-  let every2 = (a1, a2, f) => Array.every2(fromT(a1), fromT(a2), f)
-
-  let some2U = (a1, a2, f) => Array.some2U(fromT(a1), fromT(a2), f)
-  let some2 = (a1, a2, f) => Array.some2(fromT(a1), fromT(a2), f)
-
-  let cmpU = (a1, a2, f) => Array.cmpU(fromT(a1), fromT(a2), f)
-  let cmp = (a1, a2, f) => Array.cmp(fromT(a1), fromT(a2), f)
-
-  let eqU = (a1, a2, f) => Array.eqU(fromT(a1), fromT(a2), f)
-  let eq = (a1, a2, f) => Array.eq(fromT(a1), fromT(a2), f)
-}
-
-include Array
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res.js b/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res.js
deleted file mode 100644
index e443f7f..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.res.js
+++ /dev/null
@@ -1,210 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
-
-function fromArray(a) {
-  return a.slice(0);
-}
-
-function toArray(a) {
-  return a.slice(0);
-}
-
-function length(a) {
-  return a.length;
-}
-
-function size(a) {
-  return a.length;
-}
-
-var get = Belt_Array.get;
-
-var getExn = Belt_Array.getExn;
-
-function getUnsafe(a, x) {
-  return a[x];
-}
-
-function getUndefined(a, x) {
-  return a[x];
-}
-
-var shuffle = Belt_Array.shuffle;
-
-var reverse = Belt_Array.reverse;
-
-function makeUninitialized(x) {
-  return new Array(x);
-}
-
-function makeUninitializedUnsafe(x) {
-  return new Array(x);
-}
-
-var make = Belt_Array.make;
-
-var range = Belt_Array.range;
-
-var rangeBy = Belt_Array.rangeBy;
-
-var makeByU = Belt_Array.makeByU;
-
-var makeBy = Belt_Array.makeBy;
-
-var makeByAndShuffleU = Belt_Array.makeByAndShuffleU;
-
-var makeByAndShuffle = Belt_Array.makeByAndShuffle;
-
-var zip = Belt_Array.zip;
-
-var zipByU = Belt_Array.zipByU;
-
-var zipBy = Belt_Array.zipBy;
-
-var unzip = Belt_Array.unzip;
-
-var concat = Belt_Array.concat;
-
-var concatMany = Belt_Array.concatMany;
-
-var slice = Belt_Array.slice;
-
-var sliceToEnd = Belt_Array.sliceToEnd;
-
-function copy(a) {
-  return a.slice(0);
-}
-
-var forEachU = Belt_Array.forEachU;
-
-var forEach = Belt_Array.forEach;
-
-var mapU = Belt_Array.mapU;
-
-var map = Belt_Array.map;
-
-var keepWithIndexU = Belt_Array.keepWithIndexU;
-
-var keepWithIndex = Belt_Array.keepWithIndex;
-
-var keepMapU = Belt_Array.keepMapU;
-
-var keepMap = Belt_Array.keepMap;
-
-var forEachWithIndexU = Belt_Array.forEachWithIndexU;
-
-var forEachWithIndex = Belt_Array.forEachWithIndex;
-
-var mapWithIndexU = Belt_Array.mapWithIndexU;
-
-var mapWithIndex = Belt_Array.mapWithIndex;
-
-var partitionU = Belt_Array.partitionU;
-
-var partition = Belt_Array.partition;
-
-var reduceU = Belt_Array.reduceU;
-
-var reduce = Belt_Array.reduce;
-
-var reduceReverseU = Belt_Array.reduceReverseU;
-
-var reduceReverse = Belt_Array.reduceReverse;
-
-var reduceReverse2U = Belt_Array.reduceReverse2U;
-
-var reduceReverse2 = Belt_Array.reduceReverse2;
-
-var someU = Belt_Array.someU;
-
-var some = Belt_Array.some;
-
-var everyU = Belt_Array.everyU;
-
-var every = Belt_Array.every;
-
-var every2U = Belt_Array.every2U;
-
-var every2 = Belt_Array.every2;
-
-var some2U = Belt_Array.some2U;
-
-var some2 = Belt_Array.some2;
-
-var cmpU = Belt_Array.cmpU;
-
-var cmp = Belt_Array.cmp;
-
-var eqU = Belt_Array.eqU;
-
-var eq = Belt_Array.eq;
-
-var $$Array$1 = {
-  get: get
-};
-
-export {
-  $$Array$1 as $$Array,
-  fromArray ,
-  toArray ,
-  length ,
-  size ,
-  get ,
-  getExn ,
-  getUnsafe ,
-  getUndefined ,
-  shuffle ,
-  reverse ,
-  makeUninitialized ,
-  makeUninitializedUnsafe ,
-  make ,
-  range ,
-  rangeBy ,
-  makeByU ,
-  makeBy ,
-  makeByAndShuffleU ,
-  makeByAndShuffle ,
-  zip ,
-  zipByU ,
-  zipBy ,
-  unzip ,
-  concat ,
-  concatMany ,
-  slice ,
-  sliceToEnd ,
-  copy ,
-  forEachU ,
-  forEach ,
-  mapU ,
-  map ,
-  keepWithIndexU ,
-  keepWithIndex ,
-  keepMapU ,
-  keepMap ,
-  forEachWithIndexU ,
-  forEachWithIndex ,
-  mapWithIndexU ,
-  mapWithIndex ,
-  partitionU ,
-  partition ,
-  reduceU ,
-  reduce ,
-  reduceReverseU ,
-  reduceReverse ,
-  reduceReverse2U ,
-  reduceReverse2 ,
-  someU ,
-  some ,
-  everyU ,
-  every ,
-  every2U ,
-  every2 ,
-  some2U ,
-  some2 ,
-  cmpU ,
-  cmp ,
-  eqU ,
-  eq ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.resi b/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.resi
deleted file mode 100644
index 89d599a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImmutableArray.resi
+++ /dev/null
@@ -1,110 +0,0 @@
-@ocaml.doc(" Immutable arrays are covariant. ")
-type t<+'a>
-
-@ocaml.doc(" Redefine the [_] syntax, and disable the assignment [_] = _. ")
-module Array: {
-  let get: (t<'a>, int) => option<'a>
-}
-
-@ocaml.doc(" Converting from/to normal arrays involves making a copy. ")
-let fromArray: array<'a> => t<'a>
-
-let toArray: t<'a> => array<'a>
-
-@ocaml.doc(" Subset of the Belt.Array oprerations that do not mutate the array. ")
-let length: t<'a> => int
-
-let size: t<'a> => int
-
-let get: (t<'a>, int) => option<'a>
-
-let getExn: (t<'a>, int) => 'a
-
-let getUnsafe: (t<'a>, int) => 'a
-
-let getUndefined: (t<'a>, int) => Js.undefined<'a>
-
-let shuffle: t<'a> => t<'a>
-
-let reverse: t<'a> => t<'a>
-
-let makeUninitialized: int => t<Js.undefined<'a>>
-
-let makeUninitializedUnsafe: int => t<'a>
-
-let make: (int, 'a) => t<'a>
-
-let range: (int, int) => t<int>
-
-let rangeBy: (int, int, ~step: int) => t<int>
-
-let makeByU: (int, (. int) => 'a) => t<'a>
-let makeBy: (int, int => 'a) => t<'a>
-
-let makeByAndShuffleU: (int, (. int) => 'a) => t<'a>
-let makeByAndShuffle: (int, int => 'a) => t<'a>
-
-let zip: (t<'a>, t<'b>) => t<('a, 'b)>
-
-let zipByU: (t<'a>, t<'b>, (. 'a, 'b) => 'c) => t<'c>
-let zipBy: (t<'a>, t<'b>, ('a, 'b) => 'c) => t<'c>
-
-let unzip: t<('a, 'a)> => (t<'a>, t<'a>)
-
-let concat: (t<'a>, t<'a>) => t<'a>
-
-let concatMany: t<t<'a>> => t<'a>
-
-let slice: (t<'a>, ~offset: int, ~len: int) => t<'a>
-
-let sliceToEnd: (t<'a>, int) => t<'a>
-
-let copy: t<'a> => t<'a>
-
-let forEachU: (t<'a>, (. 'a) => unit) => unit
-let forEach: (t<'a>, 'a => unit) => unit
-
-let mapU: (t<'a>, (. 'a) => 'b) => t<'b>
-let map: (t<'a>, 'a => 'b) => t<'b>
-
-let keepWithIndexU: (t<'a>, (. 'a, int) => bool) => t<'a>
-let keepWithIndex: (t<'a>, ('a, int) => bool) => t<'a>
-
-let keepMapU: (t<'a>, (. 'a) => option<'b>) => t<'b>
-let keepMap: (t<'a>, 'a => option<'b>) => t<'b>
-
-let forEachWithIndexU: (t<'a>, (. int, 'a) => unit) => unit
-let forEachWithIndex: (t<'a>, (int, 'a) => unit) => unit
-
-let mapWithIndexU: (t<'a>, (. int, 'a) => 'b) => t<'b>
-let mapWithIndex: (t<'a>, (int, 'a) => 'b) => t<'b>
-
-let partitionU: (t<'a>, (. 'a) => bool) => (t<'a>, t<'a>)
-let partition: (t<'a>, 'a => bool) => (t<'a>, t<'a>)
-
-let reduceU: (t<'a>, 'b, (. 'b, 'a) => 'b) => 'b
-let reduce: (t<'a>, 'b, ('b, 'a) => 'b) => 'b
-
-let reduceReverseU: (t<'a>, 'b, (. 'b, 'a) => 'b) => 'b
-let reduceReverse: (t<'a>, 'b, ('b, 'a) => 'b) => 'b
-
-let reduceReverse2U: (t<'a>, t<'b>, 'c, (. 'c, 'a, 'b) => 'c) => 'c
-let reduceReverse2: (t<'a>, t<'b>, 'c, ('c, 'a, 'b) => 'c) => 'c
-
-let someU: (t<'a>, (. 'a) => bool) => bool
-let some: (t<'a>, 'a => bool) => bool
-
-let everyU: (t<'a>, (. 'a) => bool) => bool
-let every: (t<'a>, 'a => bool) => bool
-
-let every2U: (t<'a>, t<'b>, (. 'a, 'b) => bool) => bool
-let every2: (t<'a>, t<'b>, ('a, 'b) => bool) => bool
-
-let some2U: (t<'a>, t<'b>, (. 'a, 'b) => bool) => bool
-let some2: (t<'a>, t<'b>, ('a, 'b) => bool) => bool
-
-let cmpU: (t<'a>, t<'a>, (. 'a, 'a) => int) => int
-let cmp: (t<'a>, t<'a>, ('a, 'a) => int) => int
-
-let eqU: (t<'a>, t<'a>, (. 'a, 'a) => bool) => bool
-let eq: (t<'a>, t<'a>, ('a, 'a) => bool) => bool
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx
deleted file mode 100644
index e478b2f..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.gen.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* TypeScript file generated from ImportHookDefault.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import {default as makeNotChecked} from './hookExample';
-
-import {default as defaultNotChecked} from './hookExample';
-
-// In case of type error, check the type of 'make' in 'ImportHookDefault.res' and './hookExample'.
-export const makeTypeChecked: React.ComponentType<{
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: ImportHooks_renderMe<string>
-}> = makeNotChecked as any;
-
-// Export 'make' early to allow circular import from the '.bs.js' file.
-export const make: unknown = makeTypeChecked as React.ComponentType<{
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: ImportHooks_renderMe<string>
-}> as any;
-
-// In case of type error, check the type of 'default' in 'ImportHookDefault.res' and './hookExample'.
-export const defaultTypeChecked: React.ComponentType<{
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: ImportHooks_renderMe<string>
-}> = defaultNotChecked as any;
-
-// Export '$$default' early to allow circular import from the '.bs.js' file.
-export const $$default: unknown = defaultTypeChecked as React.ComponentType<{
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: ImportHooks_renderMe<string>
-}> as any;
-
-import type {renderMe as ImportHooks_renderMe} from './ImportHooks.gen';
-
-export type person = { readonly name: string; readonly age: number };
-
-export default $$default;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.res b/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.res
deleted file mode 100644
index 2a345d8..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.res
+++ /dev/null
@@ -1,21 +0,0 @@
-type person = {
-  name: string,
-  age: int,
-}
-
-@genType.import(("./hookExample", "default")) @react.component
-external make: (
-  ~person: person,
-  ~children: React.element,
-  ~renderMe: ImportHooks.renderMe<string>,
-) => React.element = "make"
-
-module MM = {
-@genType.import("./hookExample") @react.component
-external make2: (
-  ~person: person,
-  ~children: React.element,
-  ~renderMe: ImportHooks.renderMe<string>,
-) => React.element = "default"
-}
-
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.res.js b/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.res.js
deleted file mode 100644
index 6356fbd..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportHookDefault.res.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import ImportHookDefaultGen from "./ImportHookDefault.gen";
-import * as ImportHookDefaultGen$1 from "./ImportHookDefault.gen";
-
-var make = ImportHookDefaultGen$1.make;
-
-var make2 = ImportHookDefaultGen;
-
-var MM = {
-  make2: make2
-};
-
-export {
-  make ,
-  MM ,
-}
-/* make Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx
deleted file mode 100644
index f05bfbb..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.gen.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* TypeScript file generated from ImportHooks.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import {makeRenamed as makeRenamedNotChecked} from './hookExample';
-
-import {foo as fooNotChecked} from './hookExample';
-
-// In case of type error, check the type of 'makeRenamed' in 'ImportHooks.res' and './hookExample'.
-export const makeRenamedTypeChecked: React.ComponentType<{
-  readonly actions?: JSX.Element; 
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: renderMe<any>
-}> = makeRenamedNotChecked as any;
-
-// Export 'makeRenamed' early to allow circular import from the '.bs.js' file.
-export const makeRenamed: unknown = makeRenamedTypeChecked as React.ComponentType<{
-  readonly actions?: JSX.Element; 
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: renderMe<any>
-}> as any;
-
-// In case of type error, check the type of 'foo' in 'ImportHooks.res' and './hookExample'.
-export const fooTypeChecked: (person:person) => string = fooNotChecked as any;
-
-// Export 'foo' early to allow circular import from the '.bs.js' file.
-export const foo: unknown = fooTypeChecked as (person:person) => string as any;
-
-export type person = { readonly name: string; readonly age: number };
-
-export type renderMe<a> = React.ComponentType<{ readonly randomString: string; readonly poly: a }>;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.res b/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.res
deleted file mode 100644
index 8fd29cf..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.res
+++ /dev/null
@@ -1,17 +0,0 @@
-@genType
-type person = {
-  name: string,
-  age: int,
-}
-
-@genType type renderMe<'a> = React.component<{"randomString": string, "poly": 'a}>
-
-@genType.import("./hookExample") @react.component
-external make: (
-  ~actions: React.element=?,
-  ~person: person,
-  ~children: React.element,
-  ~renderMe: renderMe<'a>,
-) => React.element = "makeRenamed"
-
-@genType.import("./hookExample") external foo: (~person: person) => string = "foo"
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.res.js b/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.res.js
deleted file mode 100644
index 0a3f6aa..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportHooks.res.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as ImportHooksGen from "./ImportHooks.gen";
-
-var make = ImportHooksGen.makeRenamed;
-
-function foo(prim) {
-  return ImportHooksGen.foo(prim);
-}
-
-export {
-  make ,
-  foo ,
-}
-/* make Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.gen.tsx
deleted file mode 100644
index d55ef23..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.gen.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-/* TypeScript file generated from ImportIndex.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import {default as defaultNotChecked} from './';
-
-// In case of type error, check the type of 'default' in 'ImportIndex.res' and './'.
-export const defaultTypeChecked: React.ComponentType<{ readonly method?: "push" | "replace" }> = defaultNotChecked as any;
-
-// Export '$$default' early to allow circular import from the '.bs.js' file.
-export const $$default: unknown = defaultTypeChecked as React.ComponentType<{ readonly method?: "push" | "replace" }> as any;
-
-export default $$default;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.res b/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.res
deleted file mode 100644
index eee22d3..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.res
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO: rename metodd back once remmt bug is fixed
-@genType.import("./") @react.component
-external make: (~method: [#push | #replace]=?) => React.element = "default"
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.res.js b/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.res.js
deleted file mode 100644
index f8da735..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportIndex.res.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import ImportIndexGen from "./ImportIndex.gen";
-
-var make = ImportIndexGen;
-
-export {
-  make ,
-}
-/* make Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx
deleted file mode 100644
index 96acb5a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.gen.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-/* TypeScript file generated from ImportJsValue.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import {round as roundNotChecked} from './MyMath';
-
-import {round2 as round2NotChecked} from './MyMath';
-
-import {area as areaNotChecked} from './MyMath';
-
-import {returnMixedArray as returnMixedArrayNotChecked} from './MyMath';
-
-import {useColor as useColorNotChecked} from './MyMath';
-
-import {higherOrder as higherOrderNotChecked} from './MyMath';
-
-import {convertVariant as convertVariantNotChecked} from './MyMath';
-
-import {polymorphic as polymorphicNotChecked} from './MyMath';
-
-import {default as defaultNotChecked} from './MyMath';
-
-// In case of type error, check the type of 'round' in 'ImportJsValue.res' and './MyMath'.
-export const roundTypeChecked: (_1:number) => number = roundNotChecked as any;
-
-// Export 'round' early to allow circular import from the '.bs.js' file.
-export const round: unknown = roundTypeChecked as (_1:number) => number as any;
-
-// In case of type error, check the type of 'round2' in 'ImportJsValue.res' and './MyMath'.
-export const round2TypeChecked: (_1:number) => number = round2NotChecked as any;
-
-// Export 'round2' early to allow circular import from the '.bs.js' file.
-export const round2: unknown = round2TypeChecked as (_1:number) => number as any;
-
-// In case of type error, check the type of 'area' in 'ImportJsValue.res' and './MyMath'.
-export const areaTypeChecked: (_1:point) => number = areaNotChecked as any;
-
-// Export 'area' early to allow circular import from the '.bs.js' file.
-export const area: unknown = areaTypeChecked as (_1:point) => number as any;
-
-// In case of type error, check the type of 'returnMixedArray' in 'ImportJsValue.res' and './MyMath'.
-export const returnMixedArrayTypeChecked: () => numberOrString[] = returnMixedArrayNotChecked as any;
-
-// Export 'returnMixedArray' early to allow circular import from the '.bs.js' file.
-export const returnMixedArray: unknown = returnMixedArrayTypeChecked as () => numberOrString[] as any;
-
-// In case of type error, check the type of 'useColor' in 'ImportJsValue.res' and './MyMath'.
-export const useColorTypeChecked: (_1:color) => number = useColorNotChecked as any;
-
-// Export 'useColor' early to allow circular import from the '.bs.js' file.
-export const useColor: unknown = useColorTypeChecked as (_1:color) => number as any;
-
-// In case of type error, check the type of 'higherOrder' in 'ImportJsValue.res' and './MyMath'.
-export const higherOrderTypeChecked: (_1:((_1:number, _2:number) => number)) => number = higherOrderNotChecked as any;
-
-// Export 'higherOrder' early to allow circular import from the '.bs.js' file.
-export const higherOrder: unknown = higherOrderTypeChecked as (_1:((_1:number, _2:number) => number)) => number as any;
-
-// In case of type error, check the type of 'convertVariant' in 'ImportJsValue.res' and './MyMath'.
-export const convertVariantTypeChecked: (_1:variant) => variant = convertVariantNotChecked as any;
-
-// Export 'convertVariant' early to allow circular import from the '.bs.js' file.
-export const convertVariant: unknown = convertVariantTypeChecked as (_1:variant) => variant as any;
-
-// In case of type error, check the type of 'polymorphic' in 'ImportJsValue.res' and './MyMath'.
-export const polymorphicTypeChecked: <a>(_1:a) => a = polymorphicNotChecked as any;
-
-// Export 'polymorphic' early to allow circular import from the '.bs.js' file.
-export const polymorphic: unknown = polymorphicTypeChecked as <a>(_1:a) => a as any;
-
-// In case of type error, check the type of 'default' in 'ImportJsValue.res' and './MyMath'.
-export const defaultTypeChecked: number = defaultNotChecked as any;
-
-// Export '$$default' early to allow circular import from the '.bs.js' file.
-export const $$default: unknown = defaultTypeChecked as number as any;
-
-const ImportJsValueJS = require('./ImportJsValue.res.js');
-
-import type {AbsoluteValue as $$AbsoluteValue_t} from './MyMath';
-
-import type {num as $$myNum} from './MyMath';
-
-import type {num as $$num} from './MyMath';
-
-import type {numberOrString as $$numberOrString} from './MyMath';
-
-import type {polyType as $$polyType} from './MyMath';
-
-import type {stringFunction as $$stringFunction} from './MyMath';
-
-export type point = { readonly x: number; readonly y: (undefined | number) };
-
-export type numberOrString = $$numberOrString;
-
-export type AbsoluteValue_t = $$AbsoluteValue_t;
-
-export type stringFunction = $$stringFunction;
-
-export type color = "tomato" | "gray";
-
-export type variant = 
-    { TAG: "I"; _0: number }
-  | { TAG: "S"; _0: string };
-
-export type num = $$num;
-
-export type myNum = $$myNum;
-
-export type polyType<a> = $$polyType<a>;
-
-export const roundedNumber: number = ImportJsValueJS.roundedNumber as any;
-
-export const areaValue: number = ImportJsValueJS.areaValue as any;
-
-export const useGetProp: (x:AbsoluteValue_t) => number = ImportJsValueJS.useGetProp as any;
-
-export const useGetAbs: (x:AbsoluteValue_t) => number = ImportJsValueJS.useGetAbs as any;
-
-export const returnedFromHigherOrder: number = ImportJsValueJS.returnedFromHigherOrder as any;
-
-export default $$default;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res
deleted file mode 100644
index 91dd176..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res
+++ /dev/null
@@ -1,81 +0,0 @@
-@ocaml.doc("
-  * Wrap JS values to be used from Reason
-  ")
-@genType.import("./MyMath")
-external /* This is the module to import from. */
-/* Name and type of the JS value to bind to. */
-round: float => float = "round"
-
-@gentype.import("./MyMath")
-external round2: float => float = "round2"
-
-let _ = round2
-
-@genType
-type point = {
-  x: int,
-  y: option<int>,
-}
-
-@genType.import("./MyMath")
-external /* This is the module to import from. */
-/* Name and type of the JS value to bind to. */
-area: point => int = "area"
-
-@genType.import("./MyMath")
-type numberOrString
-
-@genType.import("./MyMath")
-external returnMixedArray: unit => array<numberOrString> = "returnMixedArray"
-
-@genType let roundedNumber = round(1.8)
-
-@genType let areaValue = area({x: 3, y: None})
-
-module AbsoluteValue = {
-  @genType.import(("./MyMath", "AbsoluteValue"))
-  type t = {"getAbs": (. unit) => int}
-
-  /* This is untyped */
-  @send external getProp: t => int = "getProp"
-
-  /* This is also untyped, as we "trust" the type declaration in absoluteVaue */
-  let getAbs = (x: t) => {
-    let getAbs = x["getAbs"]
-    getAbs(.)
-  }
-}
-
-@genType let useGetProp = (x: AbsoluteValue.t) => x->AbsoluteValue.getProp + 1
-
-@genType let useGetAbs = (x: AbsoluteValue.t) => x->AbsoluteValue.getAbs + 1
-
-@genType.import("./MyMath")
-type stringFunction
-
-@genType type color = [#tomato | #gray]
-
-@genType.import("./MyMath") external useColor: color => int = "useColor"
-
-@genType.import("./MyMath") external higherOrder: ((int, int) => int) => int = "higherOrder"
-
-@genType let returnedFromHigherOrder = higherOrder(\"+")
-
-type variant =
-  | I(int)
-  | S(string)
-
-@genType.import("./MyMath") external convertVariant: variant => variant = "convertVariant"
-
-@genType.import("./MyMath") external polymorphic: 'a => 'a = "polymorphic"
-
-@genType.import("./MyMath") external default: int = "default"
-
-@genType.import(("./MyMath", "num"))
-type num
-
-@genType.import(("./MyMath", "num"))
-type myNum
-
-@genType.import("./MyMath")
-type polyType<'a>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res.js b/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res.js
deleted file mode 100644
index 69f8ca3..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ImportJsValue.res.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import ImportJsValueGen from "./ImportJsValue.gen";
-import * as ImportJsValueGen$1 from "./ImportJsValue.gen";
-
-function round(prim) {
-  return ImportJsValueGen$1.round(prim);
-}
-
-function round2(prim) {
-  return ImportJsValueGen$1.round2(prim);
-}
-
-function area(prim) {
-  return ImportJsValueGen$1.area(prim);
-}
-
-function returnMixedArray(prim) {
-  return ImportJsValueGen$1.returnMixedArray();
-}
-
-var roundedNumber = ImportJsValueGen$1.round(1.8);
-
-var areaValue = ImportJsValueGen$1.area({
-      x: 3,
-      y: undefined
-    });
-
-function getAbs(x) {
-  var getAbs$1 = x.getAbs;
-  return getAbs$1();
-}
-
-var AbsoluteValue = {
-  getAbs: getAbs
-};
-
-function useGetProp(x) {
-  return x.getProp() + 1 | 0;
-}
-
-function useGetAbs(x) {
-  return getAbs(x) + 1 | 0;
-}
-
-function useColor(prim) {
-  return ImportJsValueGen$1.useColor(prim);
-}
-
-function higherOrder(prim) {
-  return ImportJsValueGen$1.higherOrder(prim);
-}
-
-var returnedFromHigherOrder = ImportJsValueGen$1.higherOrder(function (prim0, prim1) {
-      return prim0 + prim1 | 0;
-    });
-
-function convertVariant(prim) {
-  return ImportJsValueGen$1.convertVariant(prim);
-}
-
-function polymorphic(prim) {
-  return ImportJsValueGen$1.polymorphic(prim);
-}
-
-var $$default = ImportJsValueGen;
-
-export {
-  round ,
-  round2 ,
-  area ,
-  returnMixedArray ,
-  roundedNumber ,
-  areaValue ,
-  AbsoluteValue ,
-  useGetProp ,
-  useGetAbs ,
-  useColor ,
-  higherOrder ,
-  returnedFromHigherOrder ,
-  convertVariant ,
-  polymorphic ,
-  $$default as default,
-}
-/* roundedNumber Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx
deleted file mode 100644
index 29faeb7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Inherits.gen.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/* TypeScript file generated from Inherits.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type red = "Ruby" | "Redwood" | "Rust";
-
-export type blue = "Sapphire" | "Neon" | "Navy";
-
-export type color = red | blue;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Inherits.res b/jscomp/gentype_tests/typescript-react-example/src/Inherits.res
deleted file mode 100644
index 6ad8fee..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Inherits.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type red = [#Ruby | #Redwood | #Rust]
-type blue = [#Sapphire | #Neon | #Navy]
-
-@genType
-type color = [red | blue]
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Inherits.res.js b/jscomp/gentype_tests/typescript-react-example/src/Inherits.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Inherits.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx
deleted file mode 100644
index f5e9015..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.gen.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* TypeScript file generated from InnerModuleSignature.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as InnerModuleSignatureJS from './InnerModuleSignature.res.js';
-
-export type InnerModule_t = string;
-
-export const InnerModule_make: (_1:InnerModule_t) => string = InnerModuleSignatureJS.InnerModule.make as any;
-
-export const InnerModule: { make: (_1:InnerModule_t) => string } = InnerModuleSignatureJS.InnerModule as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.res b/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.res
deleted file mode 100644
index fd77fe8..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.res
+++ /dev/null
@@ -1,9 +0,0 @@
-module InnerModule: {
-  type t = private string
-  @genType
-  let make: t => string
-} = {
-  type t = string
-  let make = t => t ++ "..."
-}
-
diff --git a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.res.js b/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.res.js
deleted file mode 100644
index db7df46..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/InnerModuleSignature.res.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function make(t) {
-  return t + "...";
-}
-
-var InnerModule = {
-  make: make
-};
-
-export {
-  InnerModule ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/JSResource.res b/jscomp/gentype_tests/typescript-react-example/src/JSResource.res
deleted file mode 100644
index 432c4a4..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/JSResource.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type t<'a>
-
-@module external jSResource: string => t<'a> = "JSResource"
diff --git a/jscomp/gentype_tests/typescript-react-example/src/JSResource.res.js b/jscomp/gentype_tests/typescript-react-example/src/JSResource.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/JSResource.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx
deleted file mode 100644
index 1d627f9..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.gen.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-/* TypeScript file generated from JSXV4.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import {make as makeNotChecked} from './hookExample';
-
-import * as React from 'react';
-
-// In case of type error, check the type of 'make' in 'JSXV4.res' and './hookExample'.
-export const makeTypeChecked: React.ComponentType<{
-  readonly actions?: JSX.Element; 
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: renderMe<any>
-}> = makeNotChecked as any;
-
-// Export 'make' early to allow circular import from the '.bs.js' file.
-export const make: unknown = makeTypeChecked as React.ComponentType<{
-  readonly actions?: JSX.Element; 
-  readonly person: person; 
-  readonly children: React.ReactNode; 
-  readonly renderMe: renderMe<any>
-}> as any;
-
-const JSXV4JS = require('./JSXV4.res.js');
-
-export type CompV4_props<x,y> = { readonly x: x; readonly y: y };
-
-export type person = { readonly name: string; readonly age: number };
-
-export type renderMe<a> = React.ComponentType<{ readonly randomString: string; readonly poly: a }>;
-
-export type props<actions,person,children,renderMe> = {
-  readonly actions?: actions; 
-  readonly person: person; 
-  readonly children: children; 
-  readonly renderMe: renderMe
-};
-
-export const CompV4_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4JS.CompV4.make as any;
-
-export type Props = { readonly x: string; readonly y: string };
-
-export const CompV3_make: React.ComponentType<{ readonly x: string; readonly y: string }> = JSXV4JS.CompV3.make as any;
-
-export const CompV3: { make: React.ComponentType<{ readonly x: string; readonly y: string }> } = JSXV4JS.CompV3 as any;
-
-export const CompV4: { make: React.ComponentType<{ readonly x: string; readonly y: string }> } = JSXV4JS.CompV4 as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.res b/jscomp/gentype_tests/typescript-react-example/src/JSXV4.res
deleted file mode 100644
index fc4ed11..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.res
+++ /dev/null
@@ -1,33 +0,0 @@
-@@jsxConfig({version: 4})
-
-@genType
-module CompV4 = {
-  @react.component
-  let make = (~x, ~y) => React.string(x ++ y)
-}
-
-@@jsxConfig({version: 3})
-
-@genType
-module CompV3 = {
-  @react.component
-  let make = (~x, ~y) => React.string(x ++ y)
-}
-
-@genType
-type person = {
-  name: string,
-  age: int,
-}
-
-@genType type renderMe<'a> = React.component<{"randomString": string, "poly": 'a}>
-
-@@jsxConfig({version: 4})
-
-@genType.import("./hookExample") @react.component
-external make: (
-  ~actions: React.element=?,
-  ~person: person,
-  ~children: React.element,
-  ~renderMe: renderMe<'a>,
-) => React.element = "make"
diff --git a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.res.js b/jscomp/gentype_tests/typescript-react-example/src/JSXV4.res.js
deleted file mode 100644
index 7fec159..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/JSXV4.res.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as JSXV4Gen from "./JSXV4.gen";
-
-function JSXV4$CompV4(props) {
-  return props.x + props.y;
-}
-
-var CompV4 = {
-  make: JSXV4$CompV4
-};
-
-function JSXV4$CompV3(Props) {
-  return Props.x + Props.y;
-}
-
-var CompV3 = {
-  make: JSXV4$CompV3
-};
-
-var make = JSXV4Gen.make;
-
-export {
-  CompV4 ,
-  CompV3 ,
-  make ,
-}
-/* make Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx
deleted file mode 100644
index dad8e55..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from LabeledFun.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as LabeledFunJS from './LabeledFun.res.js';
-
-export const labelled: (a:number, b:(undefined | number), c:number, _4:number, e:number, f:number) => number = LabeledFunJS.labelled as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.res b/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.res
deleted file mode 100644
index 42956e6..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-let labelled = (a, ~b=3, ~c, d, ~e, ~f) => a + b + c + d + e + f
diff --git a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.res.js b/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.res.js
deleted file mode 100644
index 2be82a1..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/LabeledFun.res.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function labelled(a, bOpt, c, d, e, f) {
-  var b = bOpt !== undefined ? bOpt : 3;
-  return ((((a + b | 0) + c | 0) + d | 0) + e | 0) + f | 0;
-}
-
-export {
-  labelled ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx
deleted file mode 100644
index 4e8a975..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from LetPrivate.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as LetPrivateJS from './LetPrivate.res.js';
-
-export const y: number = LetPrivateJS.y as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.res b/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.res
deleted file mode 100644
index b48e7d4..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.res
+++ /dev/null
@@ -1,3 +0,0 @@
-%%private(@genType let x = 34)
-
-@genType let y = x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.res.js b/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.res.js
deleted file mode 100644
index d872769..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/LetPrivate.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var y = 34;
-
-export {
-  y ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Lib.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Lib.gen.tsx
deleted file mode 100644
index 83b8e67..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Lib.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from Lib.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type action = 
-    { action: "A"; _0: string }
-  | { action: "B"; _0: string };
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Lib.res b/jscomp/gentype_tests/typescript-react-example/src/Lib.res
deleted file mode 100644
index 9676ebe..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Lib.res
+++ /dev/null
@@ -1,6 +0,0 @@
-@gentype
-@tag("action")
-type action = | A(string) | B(string)
-
-let a = A("a")
-let b = B("b")
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Lib.res.js b/jscomp/gentype_tests/typescript-react-example/src/Lib.res.js
deleted file mode 100644
index 744468f..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Lib.res.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var a = {
-  action: "A",
-  _0: "a"
-};
-
-var b = {
-  action: "B",
-  _0: "b"
-};
-
-export {
-  a ,
-  b ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx
deleted file mode 100644
index 9f96470..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Machine.gen.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/* TypeScript file generated from Machine.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as MachineJS from './Machine.res.js';
-
-export type aa = { TAG: "A"; _0: number };
-
-export const a: aa = MachineJS.a as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Machine.res b/jscomp/gentype_tests/typescript-react-example/src/Machine.res
deleted file mode 100644
index 57d0823..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Machine.res
+++ /dev/null
@@ -1,4 +0,0 @@
-type aa = A(int)
-
-@genType
-let a = A(3)
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Machine.res.js b/jscomp/gentype_tests/typescript-react-example/src/Machine.res.js
deleted file mode 100644
index 6ec8981..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Machine.res.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var a = {
-  TAG: "A",
-  _0: 3
-};
-
-export {
-  a ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Map_.res b/jscomp/gentype_tests/typescript-react-example/src/Map_.res
deleted file mode 100644
index 9f77470..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Map_.res
+++ /dev/null
@@ -1 +0,0 @@
-type t<'k, 'v>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Map_.res.js b/jscomp/gentype_tests/typescript-react-example/src/Map_.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Map_.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx
deleted file mode 100644
index 6f6a95e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.gen.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-/* TypeScript file generated from ModuleAliases.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as ModuleAliasesJS from './ModuleAliases.res.js';
-
-export type Outer_Inner_innerT = { readonly inner: string };
-
-export type Outer2_Inner2_InnerNested_t = { readonly nested: number };
-
-export type Outer2_OuterInnerAlias_innerT = Outer_Inner_innerT;
-
-export type Outer2_Inner2_OuterInnerAlias2_innerT = Outer2_OuterInnerAlias_innerT;
-
-export type Outer2Alias_OuterInnerAlias_innerT = Outer2_OuterInnerAlias_innerT;
-
-export type Outer2Alias_Inner2_OuterInnerAlias2_innerT = Outer2_Inner2_OuterInnerAlias2_innerT;
-
-export type InnerNestedAlias_t = Outer2_Inner2_InnerNested_t;
-
-export const testNested: (x:InnerNestedAlias_t) => InnerNestedAlias_t = ModuleAliasesJS.testNested as any;
-
-export const testInner: (x:Outer2Alias_OuterInnerAlias_innerT) => Outer2Alias_OuterInnerAlias_innerT = ModuleAliasesJS.testInner as any;
-
-export const testInner2: (x:Outer2Alias_Inner2_OuterInnerAlias2_innerT) => Outer2Alias_Inner2_OuterInnerAlias2_innerT = ModuleAliasesJS.testInner2 as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.res b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.res
deleted file mode 100644
index fb1a2ed..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.res
+++ /dev/null
@@ -1,25 +0,0 @@
-module Outer = {
-  module Inner = {
-    type innerT = {inner: string}
-  }
-}
-
-module Outer2 = {
-  module OuterInnerAlias = Outer.Inner
-  module Inner2 = {
-    module InnerNested = {
-      type t = {nested: int}
-    }
-    module OuterInnerAlias2 = OuterInnerAlias
-  }
-}
-
-module Outer2Alias = Outer2
-
-module InnerNestedAlias = Outer2.Inner2.InnerNested
-
-@genType let testNested = (x: InnerNestedAlias.t) => x
-
-@genType let testInner = (x: Outer2Alias.OuterInnerAlias.innerT) => x
-
-@genType let testInner2 = (x: Outer2Alias.Inner2.OuterInnerAlias2.innerT) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.res.js b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.res.js
deleted file mode 100644
index 0ff799c..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases.res.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var Inner = {};
-
-var Outer = {
-  Inner: Inner
-};
-
-var InnerNested = {};
-
-var Inner2 = {
-  InnerNested: InnerNested,
-  OuterInnerAlias2: undefined
-};
-
-var Outer2 = {
-  OuterInnerAlias: undefined,
-  Inner2: Inner2
-};
-
-function testNested(x) {
-  return x;
-}
-
-function testInner(x) {
-  return x;
-}
-
-function testInner2(x) {
-  return x;
-}
-
-var Outer2Alias;
-
-var InnerNestedAlias;
-
-export {
-  Outer ,
-  Outer2 ,
-  Outer2Alias ,
-  InnerNestedAlias ,
-  testNested ,
-  testInner ,
-  testInner2 ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx
deleted file mode 100644
index e5cf11b..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.gen.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-/* TypeScript file generated from ModuleAliases2.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type record = { readonly x: number; readonly y: string };
-
-export type Outer_outer = { readonly outer: string };
-
-export type Outer_Inner_inner = { readonly inner: string };
-
-export type OuterAlias_outer = Outer_outer;
-
-export type OuterAlias_Inner_inner = Outer_Inner_inner;
-
-export type InnerAlias_inner = OuterAlias_Inner_inner;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.res b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.res
deleted file mode 100644
index 53b28c6..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.res
+++ /dev/null
@@ -1,19 +0,0 @@
-@genType
-type record = {
-  x: int,
-  y: string,
-}
-
-module Outer = {
-  @genType type outer = {outer: string}
-
-  module Inner = {
-    @genType type inner = {inner: string}
-  }
-}
-
-module OuterAlias = Outer
-
-module InnerAlias = OuterAlias.Inner
-
-let q = 42
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.res.js b/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.res.js
deleted file mode 100644
index 4be3b83..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleAliases2.res.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var Inner = {};
-
-var Outer = {
-  Inner: Inner
-};
-
-var OuterAlias;
-
-var InnerAlias;
-
-var q = 42;
-
-export {
-  Outer ,
-  OuterAlias ,
-  InnerAlias ,
-  q ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.gen.tsx
deleted file mode 100644
index 3fe5123..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.gen.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-/* TypeScript file generated from ModuleResolution1.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type t1 = { readonly foo: string; readonly bar: number };
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res
deleted file mode 100644
index 8bfad4e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@genType
-type t1 = {
-  foo: string,
-  bar: int,
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res.js b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution1.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.gen.tsx
deleted file mode 100644
index d9e793e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from ModuleResolution2.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import type {t1 as ModuleResolution1_t1} from './ModuleResolution1.gen';
-
-export type t2 = { readonly dependency: ModuleResolution1_t1 };
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res
deleted file mode 100644
index 5b29992..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-type t2 = {dependency: ModuleResolution1.t1}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res.js b/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/ModuleResolution2.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx
deleted file mode 100644
index 9da0296..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.gen.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-/* TypeScript file generated from MoreVariants.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as MoreVariantsJS from './MoreVariants.res.js';
-
-export type withRenaming = "type_" | "b";
-
-export type withoutRenaming = "type_" | "b";
-
-export const testWithRenaming: (x:withRenaming) => withRenaming = MoreVariantsJS.testWithRenaming as any;
-
-export const testWithoutRenaming: (x:withoutRenaming) => withoutRenaming = MoreVariantsJS.testWithoutRenaming as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.res b/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.res
deleted file mode 100644
index 1862b7a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.res
+++ /dev/null
@@ -1,12 +0,0 @@
-@genType
-type withRenaming = [@genType.as("type") #type_ | #b]
-
-@genType
-let testWithRenaming = (x: withRenaming) => x
-
-@genType
-type withoutRenaming = [#type_ | #b]
-
-@genType
-let testWithoutRenaming = (x: withoutRenaming) => x
-
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.res.js b/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.res.js
deleted file mode 100644
index 833cc29..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MoreVariants.res.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function testWithRenaming(x) {
-  return x;
-}
-
-function testWithoutRenaming(x) {
-  return x;
-}
-
-export {
-  testWithRenaming ,
-  testWithoutRenaming ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx
deleted file mode 100644
index ad85bb4..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MyInput.gen.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/* TypeScript file generated from MyInput.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import {default as defaultNotChecked} from './MyInput';
-
-// In case of type error, check the type of 'default' in 'MyInput.res' and './MyInput'.
-export const defaultTypeChecked: React.ComponentType<{ readonly onFocus?: (_1:inputFocusEvent) => void }> = defaultNotChecked as any;
-
-// Export '$$default' early to allow circular import from the '.bs.js' file.
-export const $$default: unknown = defaultTypeChecked as React.ComponentType<{ readonly onFocus?: (_1:inputFocusEvent) => void }> as any;
-
-import type {inputFocusEvent as $$inputFocusEvent} from './shims/ReactEvent.shim';
-
-export type inputFocusEvent = $$inputFocusEvent;
-
-export default $$default;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyInput.res b/jscomp/gentype_tests/typescript-react-example/src/MyInput.res
deleted file mode 100644
index 6415dc1..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MyInput.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@genType.import("./shims/ReactEvent.shim")
-type inputFocusEvent = ReactEvent.Focus.t
-
-@genType.import("./MyInput") @react.component
-external make: (~onFocus: inputFocusEvent => unit=?) => React.element = "default"
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyInput.res.js b/jscomp/gentype_tests/typescript-react-example/src/MyInput.res.js
deleted file mode 100644
index 3aa6ca7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MyInput.res.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import MyInputGen from "./MyInput.gen";
-
-var make = MyInputGen;
-
-export {
-  make ,
-}
-/* make Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyInput.tsx b/jscomp/gentype_tests/typescript-react-example/src/MyInput.tsx
deleted file mode 100644
index 3f275ef..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MyInput.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import * as React from "react";
-
-type Props = React.InputHTMLAttributes<HTMLInputElement>;
-
-const MyInput: React.FC<Props> = (props) => <input {...props} />
-
-export default MyInput;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts b/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts
deleted file mode 100644
index 55ea301..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MyMath.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/* @flow strict */
-
-export const round: (_: number) => number = Math.round;
-
-export const round2 = round;
-
-export const area = function(point: { x: number; y?: number }): number {
-  return point.x * (point.y === undefined ? 1 : point.y);
-};
-
-export type numberOrString = number | string;
-
-export const returnMixedArray = function() : Array<number | string> {
-  return [1,2];
-};
-
-export class AbsoluteValue {
-  public prop!: number;
-  public getProp(): number {
-    return this.prop;
-  }
-  public getAbs(): number {
-    return this.prop < 0 ? -this.prop : this.prop;
-  }
-}
-
-export type stringFunction = (_: string) => string;
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const useColor = function(x: "tomato" | "gray"): number {
-  return 0;
-};
-
-export const higherOrder = (foo: (_1: number, _2: number) => number) =>
-  foo(3, 4);
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const convertVariant = (x: any) => x;
-
-export const polymorphic = <T>(x: T): T => x;
-
-export type num = number;
-
-export type polyType<T> = { x: T };
-
-export default 34;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx
deleted file mode 100644
index 37a3a3b..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MyModule.gen.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/* TypeScript file generated from MyModule.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as MyModuleJS from './MyModule.res.js';
-
-export type t = number;
-
-export const add: (a:t, b:t) => t = MyModuleJS.add as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyModule.res b/jscomp/gentype_tests/typescript-react-example/src/MyModule.res
deleted file mode 100644
index 07d4f77..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MyModule.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@genType
-type t = int
-
-@genType
-let add = (a: t, b: t): t => a + b
diff --git a/jscomp/gentype_tests/typescript-react-example/src/MyModule.res.js b/jscomp/gentype_tests/typescript-react-example/src/MyModule.res.js
deleted file mode 100644
index 3377033..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/MyModule.res.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function add(a, b) {
-  return a + b | 0;
-}
-
-export {
-  add ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx
deleted file mode 100644
index ad6d2fa..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.gen.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* TypeScript file generated from NestedModules.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as NestedModulesJS from './NestedModules.res.js';
-
-export type Universe_nestedType = string[];
-
-export type Universe_Nested2_nested2Type = Array<string[]>;
-
-export type Universe_Nested2_Nested3_nested3Type = Array<Array<string[]>>;
-
-export type Universe_variant = "A" | { TAG: "B"; _0: string };
-
-export const notNested: number = NestedModulesJS.notNested as any;
-
-export const Universe_theAnswer: number = NestedModulesJS.Universe.theAnswer as any;
-
-export const Universe_Nested2_nested2Value: number = NestedModulesJS.Universe.Nested2.nested2Value as any;
-
-export const Universe_Nested2_Nested3_nested3Value: string = NestedModulesJS.Universe.Nested2.Nested3.nested3Value as any;
-
-export const Universe_Nested2_Nested3_nested3Function: (x:Universe_Nested2_nested2Type) => Universe_Nested2_nested2Type = NestedModulesJS.Universe.Nested2.Nested3.nested3Function as any;
-
-export const Universe_Nested2_nested2Function: (x:Universe_Nested2_Nested3_nested3Type) => Universe_Nested2_Nested3_nested3Type = NestedModulesJS.Universe.Nested2.nested2Function as any;
-
-export const Universe_someString: string = NestedModulesJS.Universe.someString as any;
-
-export const Universe: {
-  theAnswer: number; 
-  Nested2: {
-    nested2Function: (x:Universe_Nested2_Nested3_nested3Type) => Universe_Nested2_Nested3_nested3Type; 
-    nested2Value: number; 
-    Nested3: {
-      nested3Value: string; 
-      nested3Function: (x:Universe_Nested2_nested2Type) => Universe_Nested2_nested2Type
-    }
-  }; 
-  someString: string
-} = NestedModulesJS.Universe as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.res b/jscomp/gentype_tests/typescript-react-example/src/NestedModules.res
deleted file mode 100644
index 7c66bc0..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.res
+++ /dev/null
@@ -1,41 +0,0 @@
-@genType let notNested = 1
-
-module Universe = {
-  @genType let theAnswer = 42
-
-  let notExported = 33
-
-  @genType type nestedType = array<string>
-
-  module Nested2 = {
-    let x = 0
-
-    @genType let nested2Value = 1
-
-    let y = 2
-
-    @genType type nested2Type = array<array<string>>
-
-    module Nested3 = {
-      let x = 0
-      let y = 1
-      let z = 2
-      let w = 3
-
-      @genType type nested3Type = array<array<array<string>>>
-
-      @genType let nested3Value = "nested3Value"
-
-      @genType let nested3Function = (x: nested2Type) => x
-    }
-
-    @genType let nested2Function = (x: Nested3.nested3Type) => x
-  }
-
-  @genType
-  type variant =
-    | A
-    | B(string)
-
-  @genType let someString = "some exported string"
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.res.js b/jscomp/gentype_tests/typescript-react-example/src/NestedModules.res.js
deleted file mode 100644
index 654fd2e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NestedModules.res.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function nested3Function(x) {
-  return x;
-}
-
-var Nested3 = {
-  x: 0,
-  y: 1,
-  z: 2,
-  w: 3,
-  nested3Value: "nested3Value",
-  nested3Function: nested3Function
-};
-
-function nested2Function(x) {
-  return x;
-}
-
-var Nested2 = {
-  x: 0,
-  nested2Value: 1,
-  y: 2,
-  Nested3: Nested3,
-  nested2Function: nested2Function
-};
-
-var Universe = {
-  theAnswer: 42,
-  notExported: 33,
-  Nested2: Nested2,
-  someString: "some exported string"
-};
-
-var notNested = 1;
-
-export {
-  notNested ,
-  Universe ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx
deleted file mode 100644
index 2e4577b..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.gen.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/* TypeScript file generated from NestedModulesInSignature.resi by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as NestedModulesInSignatureJS from './NestedModulesInSignature.res.js';
-
-export const Universe_theAnswer: number = NestedModulesInSignatureJS.Universe.theAnswer as any;
-
-export const Universe: { theAnswer: number } = NestedModulesInSignatureJS.Universe as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.res b/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.res
deleted file mode 100644
index 85f454d..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module Universe = {
-  let theAnswer = 42
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.res.js b/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.res.js
deleted file mode 100644
index 394291d..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.res.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var Universe = {
-  theAnswer: 42
-};
-
-export {
-  Universe ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.resi b/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.resi
deleted file mode 100644
index 68bf5db..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NestedModulesInSignature.resi
+++ /dev/null
@@ -1,3 +0,0 @@
-module Universe: {
-  @genType let theAnswer: int
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx
deleted file mode 100644
index 529c7e7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.gen.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* TypeScript file generated from NestedVariants.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as NestedVariantsJS from './NestedVariants.res.js';
-
-export type typeL = 
-    { TAG: "NonUnary"; _0: number; _1: number };
-
-export type typeC = 
-    { TAG: "C"; _0: string }
-  | { TAG: "D"; _0: string };
-
-export type typeB = { readonly c: typeC };
-
-export type typeD = { TAG: "Int"; _0: number };
-
-export type typeE = number;
-
-export type typeA<a> = 
-    { TAG: "A"; _0: a; _1: number }
-  | { TAG: "B"; _0: a; _1: number };
-
-export type typeF<a> = { TAG: "F"; _0: a } | { TAG: "G"; _0: a };
-
-export type typeH = 
-    { TAG: "H"; _0: typeD; _1: number }
-  | { TAG: "I"; _0: typeD; _1: number };
-
-export type typeJ = { TAG: "J"; _0: typeD; _1: typeD };
-
-export type typeK = { TAG: "K"; _0: typeD; _1: typeD };
-
-export type boxedBinary = 
-    { TAG: "BB"; _0: typeD; _1: number }
-  | { TAG: "Z"; _0: number };
-
-export type unboxedBinary = { TAG: "UB"; _0: typeD; _1: number };
-
-export type inline = 
-    { TAG: "I"; readonly i: number; readonly j: number }
-  | { TAG: "J"; readonly i: number; readonly j: number }
-  | { TAG: "K"; _0: number; _1: number }
-  | { TAG: "L"; _0: { readonly j: number; readonly i: number } };
-
-export const makeVariant: () => typeL = NestedVariantsJS.makeVariant as any;
-
-export const makeABC: () => typeA<typeB> = NestedVariantsJS.makeABC as any;
-
-export const makeBC: () => typeB = NestedVariantsJS.makeBC as any;
-
-export const makeAC: () => typeA<typeC> = NestedVariantsJS.makeAC as any;
-
-export const makeAD: () => typeA<typeD> = NestedVariantsJS.makeAD as any;
-
-export const makeAE: () => typeA<typeE> = NestedVariantsJS.makeAE as any;
-
-export const makeFD: () => typeF<typeD> = NestedVariantsJS.makeFD as any;
-
-export const makeHD: () => typeH = NestedVariantsJS.makeHD as any;
-
-export const makeJ: () => typeJ = NestedVariantsJS.makeJ as any;
-
-export const makeK: () => typeK = NestedVariantsJS.makeK as any;
-
-export const testBoxedBinary: (param:boxedBinary) => number = NestedVariantsJS.testBoxedBinary as any;
-
-export const testUnboxedBinary: (param:unboxedBinary) => number = NestedVariantsJS.testUnboxedBinary as any;
-
-export const testInline: (x:inline) => inline = NestedVariantsJS.testInline as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.res b/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.res
deleted file mode 100644
index cb32d31..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.res
+++ /dev/null
@@ -1,80 +0,0 @@
-@genType
-type typeL = NonUnary(int, int)
-
-@genType
-let makeVariant = () => NonUnary(5, 3)
-
-type typeC =
-  | C(string)
-  | D(string)
-type typeB = {c: typeC}
-type typeD = Int(int)
-type typeE = int
-type typeA<'a> =
-  | A('a, int)
-  | B('a, int)
-
-type typeF<'a> =
-  | F('a)
-  | G('a)
-type typeH =
-  | H(typeD, int)
-  | I(typeD, int)
-type typeJ = J(typeD, typeD)
-type typeK = K((typeD, typeD))
-
-@genType
-let makeABC = (): typeA<typeB> => A({c: C("a string")}, 5)
-
-@genType
-let makeBC = (): typeB => {c: C("a string")}
-
-@genType
-let makeAC = (): typeA<typeC> => A(C("a string"), 5)
-
-@genType
-let makeAD = (): typeA<typeD> => A(Int(3), 5)
-
-@genType
-let makeAE = (): typeA<typeE> => A(3, 5)
-
-@genType
-let makeFD = (): typeF<typeD> => F(Int(3))
-
-@genType
-let makeHD = (): typeH => H(Int(5), 5)
-
-@genType
-let makeJ = (): typeJ => J(Int(5), Int(3))
-
-@genType
-let makeK = (): typeK => K((Int(5), Int(3)))
-
-@genType
-type boxedBinary =
-  | BB(typeD, int)
-  | Z(int)
-@genType
-type unboxedBinary = UB(typeD, int)
-@genType
-type inline =
-  | I({i: int, j: int})
-  | J({i: int, j: int})
-  | K(int, int)
-  | L({"i": int, "j": int})
-
-@genType
-let testBoxedBinary = (_: boxedBinary) => 34
-
-@genType
-let testUnboxedBinary = (_: unboxedBinary) => 34
-
-@genType
-let testInline = x =>
-  switch x {
-  | I(q) => I({...q, i: q.i})
-  | J(q) => J(q)
-  | K(a, b) => K(b, a)
-  | L(q) => L(q)
-  }
-
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.res.js b/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.res.js
deleted file mode 100644
index 81711cb..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NestedVariants.res.js
+++ /dev/null
@@ -1,163 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function makeVariant(param) {
-  return {
-          TAG: "NonUnary",
-          _0: 5,
-          _1: 3
-        };
-}
-
-function makeABC(param) {
-  return {
-          TAG: "A",
-          _0: {
-            c: {
-              TAG: "C",
-              _0: "a string"
-            }
-          },
-          _1: 5
-        };
-}
-
-function makeBC(param) {
-  return {
-          c: {
-            TAG: "C",
-            _0: "a string"
-          }
-        };
-}
-
-function makeAC(param) {
-  return {
-          TAG: "A",
-          _0: {
-            TAG: "C",
-            _0: "a string"
-          },
-          _1: 5
-        };
-}
-
-function makeAD(param) {
-  return {
-          TAG: "A",
-          _0: {
-            TAG: "Int",
-            _0: 3
-          },
-          _1: 5
-        };
-}
-
-function makeAE(param) {
-  return {
-          TAG: "A",
-          _0: 3,
-          _1: 5
-        };
-}
-
-function makeFD(param) {
-  return {
-          TAG: "F",
-          _0: {
-            TAG: "Int",
-            _0: 3
-          }
-        };
-}
-
-function makeHD(param) {
-  return {
-          TAG: "H",
-          _0: {
-            TAG: "Int",
-            _0: 5
-          },
-          _1: 5
-        };
-}
-
-function makeJ(param) {
-  return {
-          TAG: "J",
-          _0: {
-            TAG: "Int",
-            _0: 5
-          },
-          _1: {
-            TAG: "Int",
-            _0: 3
-          }
-        };
-}
-
-function makeK(param) {
-  return {
-          TAG: "K",
-          _0: [
-            {
-              TAG: "Int",
-              _0: 5
-            },
-            {
-              TAG: "Int",
-              _0: 3
-            }
-          ]
-        };
-}
-
-function testBoxedBinary(param) {
-  return 34;
-}
-
-function testUnboxedBinary(param) {
-  return 34;
-}
-
-function testInline(x) {
-  switch (x.TAG) {
-    case "I" :
-        return {
-                TAG: "I",
-                i: x.i,
-                j: x.j
-              };
-    case "J" :
-        return x;
-    case "K" :
-        return {
-                TAG: "K",
-                _0: x._1,
-                _1: x._0
-              };
-    case "L" :
-        return {
-                TAG: "L",
-                _0: x._0
-              };
-    
-  }
-}
-
-export {
-  makeVariant ,
-  makeABC ,
-  makeBC ,
-  makeAC ,
-  makeAD ,
-  makeAE ,
-  makeFD ,
-  makeHD ,
-  makeJ ,
-  makeK ,
-  testBoxedBinary ,
-  testUnboxedBinary ,
-  testInline ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx
deleted file mode 100644
index 9842501..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.gen.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-/* TypeScript file generated from NonrecursiveTypes.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type notRecursive = number;
-
-export type M_notRecursive = notRecursive[];
-
-export type M_recursive = { readonly self: M_recursive };
-
-export type M_mutualRecursive = { readonly a: M_a };
-
-export type M_a = { readonly self: M_mutualRecursive };
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.res b/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.res
deleted file mode 100644
index 9c76dc2..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.res
+++ /dev/null
@@ -1,14 +0,0 @@
-@genType
-type notRecursive = int
-
-module M = {
-  @genType
-  type notRecursive = array<notRecursive>
-
-  @genType
-  type rec recursive = {self: recursive}
-
-  @genType
-  type rec mutualRecursive = {a: a}
-  and a = {self: mutualRecursive}
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.res.js b/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.res.js
deleted file mode 100644
index 44a5721..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NonrecursiveTypes.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var M = {};
-
-export {
-  M ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Null.res b/jscomp/gentype_tests/typescript-react-example/src/Null.res
deleted file mode 100644
index fff00a9..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Null.res
+++ /dev/null
@@ -1 +0,0 @@
-type t<'a> = Js.null<'a>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Null.res.js b/jscomp/gentype_tests/typescript-react-example/src/Null.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Null.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Nullable.res b/jscomp/gentype_tests/typescript-react-example/src/Nullable.res
deleted file mode 100644
index 56a1921..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Nullable.res
+++ /dev/null
@@ -1 +0,0 @@
-type t<'a> = Js.nullable<'a>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Nullable.res.js b/jscomp/gentype_tests/typescript-react-example/src/Nullable.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Nullable.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx
deleted file mode 100644
index aa422e0..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.gen.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-/* TypeScript file generated from NumericPolyVar.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type t = 12 | 0 | "b";
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.res b/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.res
deleted file mode 100644
index 0611a29..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-type t = [#12 | #0 | #b]
diff --git a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.res.js b/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/NumericPolyVar.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx
deleted file mode 100644
index c8e3a51..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Object.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from Object.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type someType = { readonly crop?: string; readonly "fp-z"?: string };
-
-export type someType2 = { readonly crop: (undefined | string); readonly "fp-z": (undefined | string) };
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Object.res b/jscomp/gentype_tests/typescript-react-example/src/Object.res
deleted file mode 100644
index e560af3..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Object.res
+++ /dev/null
@@ -1,13 +0,0 @@
-@genType
-type someType = {"crop": option<string>, "fp-z": option<string>}
-
-@genType
-type someType2 = {
-  crop: option<string>,
-  @as("fp-z")
-  fpz: option<string>,
-}
-
-let st: someType = {"crop": None, "fp-z": None}
-
-let st2: someType2 = {crop: None, fpz: None}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Object.res.js b/jscomp/gentype_tests/typescript-react-example/src/Object.res.js
deleted file mode 100644
index e4b301d..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Object.res.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var st = {
-  crop: undefined,
-  "fp-z": undefined
-};
-
-var st2 = {
-  crop: undefined,
-  "fp-z": undefined
-};
-
-export {
-  st ,
-  st2 ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx
deleted file mode 100644
index 16b6cf3..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.gen.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* TypeScript file generated from OnClick2.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as React from 'react';
-
-import * as OnClick2JS from './OnClick2.res.js';
-
-export type Props = { readonly onClick: (_1:MouseEvent) => void };
-
-export const make: React.ComponentType<{ readonly onClick: (_1:MouseEvent) => void }> = OnClick2JS.make as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.res b/jscomp/gentype_tests/typescript-react-example/src/OnClick2.res
deleted file mode 100644
index 7094f37..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType @react.component
-let make = (~onClick) => <div onClick />
diff --git a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.res.js b/jscomp/gentype_tests/typescript-react-example/src/OnClick2.res.js
deleted file mode 100644
index 61e88f2..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/OnClick2.res.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as React from "react";
-
-function OnClick2(Props) {
-  var onClick = Props.onClick;
-  return React.createElement("div", {
-              onClick: onClick
-            });
-}
-
-var make = OnClick2;
-
-export {
-  make ,
-}
-/* react Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx
deleted file mode 100644
index 5b30072..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Opaque.gen.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-/* TypeScript file generated from Opaque.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as OpaqueJS from './Opaque.res.js';
-
-import type {business as Records_business} from './Records.gen';
-
-export abstract class opaqueFromRecords { protected opaque!: any }; /* simulate opaque types */
-
-export type pair = [opaqueFromRecords, opaqueFromRecords];
-
-export const noConversion: (x:opaqueFromRecords) => opaqueFromRecords = OpaqueJS.noConversion as any;
-
-export const testConvertNestedRecordFromOtherFile: (x:Records_business) => Records_business = OpaqueJS.testConvertNestedRecordFromOtherFile as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Opaque.res b/jscomp/gentype_tests/typescript-react-example/src/Opaque.res
deleted file mode 100644
index bd41c97..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Opaque.res
+++ /dev/null
@@ -1,8 +0,0 @@
-@genType.opaque
-type opaqueFromRecords = A(Records.coord)
-
-@genType let noConversion = (x: opaqueFromRecords) => x
-
-@genType type pair = (opaqueFromRecords, opaqueFromRecords)
-
-@genType let testConvertNestedRecordFromOtherFile = (x: Records.business) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Opaque.res.js b/jscomp/gentype_tests/typescript-react-example/src/Opaque.res.js
deleted file mode 100644
index 7639ea3..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Opaque.res.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function noConversion(x) {
-  return x;
-}
-
-function testConvertNestedRecordFromOtherFile(x) {
-  return x;
-}
-
-export {
-  noConversion ,
-  testConvertNestedRecordFromOtherFile ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Promise.res b/jscomp/gentype_tests/typescript-react-example/src/Promise.res
deleted file mode 100644
index 4e149cf..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Promise.res
+++ /dev/null
@@ -1 +0,0 @@
-type t<'a> = promise<'a>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Promise.res.js b/jscomp/gentype_tests/typescript-react-example/src/Promise.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Promise.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx
deleted file mode 100644
index f605dc6..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Records.gen.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-/* TypeScript file generated from Records.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as RecordsJS from './Records.res.js';
-
-import type {list} from '../src/shims/RescriptPervasives.shim';
-
-export type coord = {
-  readonly x: number; 
-  readonly y: number; 
-  readonly z: (undefined | number)
-};
-
-export type person = {
-  readonly name: string; 
-  readonly age: number; 
-  readonly address: (undefined | string)
-};
-
-export type business = {
-  readonly name: string; 
-  readonly owner: (undefined | person); 
-  readonly address: (undefined | string)
-};
-
-export type payload<a> = { readonly num: number; readonly payload: a };
-
-export type record = { readonly v: number; readonly w: number };
-
-export type business2 = {
-  readonly name: string; 
-  readonly owner: (null | undefined | person); 
-  readonly address2: (null | undefined | string)
-};
-
-export type mix = {
-  readonly a: number; 
-  readonly b: number; 
-  readonly c?: {
-    readonly name: string; 
-    readonly surname: string
-  }
-};
-
-export type myRec = { readonly type: string };
-
-export type myObj = { readonly type_: string };
-
-export type myRecBsAs = {
-  readonly jsValid0: string; 
-  readonly type: string; 
-  readonly "the-key": string; 
-  readonly "with\\\"dquote": string; 
-  readonly "with'squote": string; 
-  readonly "1number": string
-};
-
-export const origin: coord = RecordsJS.origin as any;
-
-export const computeArea: (param:coord) => number = RecordsJS.computeArea as any;
-
-export const coord2d: (x:number, y:number) => coord = RecordsJS.coord2d as any;
-
-export const findAddress: (business:business) => list<string> = RecordsJS.findAddress as any;
-
-export const someBusiness: business = RecordsJS.someBusiness as any;
-
-export const findAllAddresses: (businesses:business[]) => string[] = RecordsJS.findAllAddresses as any;
-
-export const getPayload: <T1>(param:payload<T1>) => T1 = RecordsJS.getPayload as any;
-
-export const getPayloadRecord: (param:payload<record>) => record = RecordsJS.getPayloadRecord as any;
-
-export const recordValue: record = RecordsJS.recordValue as any;
-
-export const payloadValue: payload<record> = RecordsJS.payloadValue as any;
-
-export const getPayloadRecordPlusOne: (param:payload<record>) => record = RecordsJS.getPayloadRecordPlusOne as any;
-
-export const findAddress2: (business:business2) => list<string> = RecordsJS.findAddress2 as any;
-
-export const someBusiness2: business2 = RecordsJS.someBusiness2 as any;
-
-export const computeArea3: (o:{
-  readonly x: number; 
-  readonly y: number; 
-  readonly z: (null | undefined | number)
-}) => number = RecordsJS.computeArea3 as any;
-
-export const computeArea4: (o:{
-  readonly x: number; 
-  readonly y: number; 
-  readonly z?: number
-}) => number = RecordsJS.computeArea4 as any;
-
-export const testMyRec: (x:myRec) => string = RecordsJS.testMyRec as any;
-
-export const testMyRec2: (x:myRec) => myRec = RecordsJS.testMyRec2 as any;
-
-export const testMyObj: (x:myObj) => string = RecordsJS.testMyObj as any;
-
-export const testMyObj2: (x:myObj) => myObj = RecordsJS.testMyObj2 as any;
-
-export const testMyRecBsAs: (x:myRecBsAs) => string[] = RecordsJS.testMyRecBsAs as any;
-
-export const testMyRecBsAs2: (x:myRecBsAs) => myRecBsAs = RecordsJS.testMyRecBsAs2 as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Records.res b/jscomp/gentype_tests/typescript-react-example/src/Records.res
deleted file mode 100644
index c8485e0..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Records.res
+++ /dev/null
@@ -1,151 +0,0 @@
-open Belt
-
-@genType
-type coord = {
-  x: int,
-  y: int,
-  z: option<int>,
-}
-
-@genType let origin = {x: 0, y: 0, z: Some(0)}
-
-@genType
-let computeArea = ({x, y, z}) => {
-  open Option
-  x * y * z->mapWithDefault(1, n => n)
-}
-
-@genType let coord2d = (x, y) => {x, y, z: None}
-
-@genType
-type person = {
-  name: string,
-  age: int,
-  address: option<string>,
-}
-
-@genType
-type business = {
-  name: string,
-  owner: option<person>,
-  address: option<string>,
-}
-
-let getOpt = (opt, default, foo) => opt->Option.mapWithDefault(default, foo)
-
-@genType
-let findAddress = (business: business): list<string> =>
-  business.address->getOpt(list{}, a => list{a})
-
-@genType let someBusiness = {name: "SomeBusiness", owner: None, address: None}
-
-@genType
-let findAllAddresses = (businesses: array<business>): array<string> =>
-  businesses
-  ->Array.map(business =>
-    Belt.List.concat(
-      business.address->getOpt(list{}, a => list{a}),
-      business.owner->getOpt(list{}, p => p.address->getOpt(list{}, a => list{a})),
-    )
-  )
-  ->List.fromArray
-  ->List.flatten
-  ->List.toArray
-
-@genType
-type payload<'a> = {
-  num: int,
-  payload: 'a,
-}
-
-@genType let getPayload = ({payload}) => payload
-
-@genType
-type record = {
-  v: int,
-  w: int,
-}
-
-@genType let getPayloadRecord = ({payload}): record => payload
-
-@genType let recordValue = {v: 1, w: 1}
-
-@genType let payloadValue = {num: 1, payload: recordValue}
-
-@genType
-let getPayloadRecordPlusOne = ({payload}): record => {
-  ...payload,
-  v: payload.v + 1,
-}
-
-@genType
-type business2 = {
-  name: string,
-  owner: Js.Nullable.t<person>,
-  address2: Js.Nullable.t<string>,
-}
-
-@genType
-let findAddress2 = (business: business2): list<string> =>
-  business.address2->Js.Nullable.toOption->getOpt(list{}, a => list{a})
-
-@genType
-let someBusiness2 = {
-  name: "SomeBusiness",
-  owner: Js.Nullable.null,
-  address2: Js.Nullable.null,
-}
-
-@genType
-let computeArea3 = (o: {"x": int, "y": int, "z": Js.Nullable.t<int>}) =>
-  o["x"] * o["y"] * o["z"]->Js.Nullable.toOption->Option.mapWithDefault(1, n => n)
-
-@genType
-let computeArea4 = (o: {"x": int, "y": int, "z": option<int>}) =>
-  o["x"] * o["y"] * o["z"]->Option.mapWithDefault(1, n => n)
-
-@genType type mix = {"a": int, "b": int, "c": option<{"name": string, "surname": string}>}
-
-@genType
-type myRec = {
-  @as("type")
-  type_: string,
-}
-
-@genType type myObj = {"type_": string}
-
-@genType let testMyRec = (x: myRec) => x.type_
-
-@genType let testMyRec2 = (x: myRec) => x
-
-@genType let testMyObj = (x: myObj) => x["type_"]
-
-@genType let testMyObj2 = (x: myObj) => x
-
-@genType
-type myRecBsAs = {
-  @as("jsValid0")
-  valid: string,
-  @as("type")
-  type_: string,
-  @as("the-key")
-  theKey: string,
-  @as("with\"dquote")
-  withDQuote: string,
-  @as("with'squote")
-  withSQuote: string,
-  @as("1number")
-  number1: string,
-}
-
-@genType
-let testMyRecBsAs = (x: myRecBsAs) => [
-  x.valid,
-  x.type_,
-  x.theKey,
-  x.withDQuote,
-  x.withSQuote,
-  x.number1,
-]
-
-@genType let testMyRecBsAs2 = (x: myRecBsAs) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Records.res.js b/jscomp/gentype_tests/typescript-react-example/src/Records.res.js
deleted file mode 100644
index f727404..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Records.res.js
+++ /dev/null
@@ -1,175 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Belt_List from "rescript/lib/es6/belt_List.js";
-import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
-import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
-import * as Caml_option from "rescript/lib/es6/caml_option.js";
-
-function computeArea(param) {
-  return Math.imul(Math.imul(param.x, param.y), Belt_Option.mapWithDefault(param.z, 1, (function (n) {
-                    return n;
-                  })));
-}
-
-function coord2d(x, y) {
-  return {
-          x: x,
-          y: y,
-          z: undefined
-        };
-}
-
-var getOpt = Belt_Option.mapWithDefault;
-
-function findAddress(business) {
-  return Belt_Option.mapWithDefault(business.address, /* [] */0, (function (a) {
-                return {
-                        hd: a,
-                        tl: /* [] */0
-                      };
-              }));
-}
-
-function findAllAddresses(businesses) {
-  return Belt_List.toArray(Belt_List.flatten(Belt_List.fromArray(Belt_Array.map(businesses, (function (business) {
-                            return Belt_List.concat(Belt_Option.mapWithDefault(business.address, /* [] */0, (function (a) {
-                                              return {
-                                                      hd: a,
-                                                      tl: /* [] */0
-                                                    };
-                                            })), Belt_Option.mapWithDefault(business.owner, /* [] */0, (function (p) {
-                                              return Belt_Option.mapWithDefault(p.address, /* [] */0, (function (a) {
-                                                            return {
-                                                                    hd: a,
-                                                                    tl: /* [] */0
-                                                                  };
-                                                          }));
-                                            })));
-                          })))));
-}
-
-function getPayload(param) {
-  return param.payload;
-}
-
-function getPayloadRecord(param) {
-  return param.payload;
-}
-
-var recordValue = {
-  v: 1,
-  w: 1
-};
-
-var payloadValue = {
-  num: 1,
-  payload: recordValue
-};
-
-function getPayloadRecordPlusOne(param) {
-  var payload = param.payload;
-  return {
-          v: payload.v + 1 | 0,
-          w: payload.w
-        };
-}
-
-function findAddress2(business) {
-  return Belt_Option.mapWithDefault(Caml_option.nullable_to_opt(business.address2), /* [] */0, (function (a) {
-                return {
-                        hd: a,
-                        tl: /* [] */0
-                      };
-              }));
-}
-
-var someBusiness2_owner = null;
-
-var someBusiness2_address2 = null;
-
-var someBusiness2 = {
-  name: "SomeBusiness",
-  owner: someBusiness2_owner,
-  address2: someBusiness2_address2
-};
-
-function computeArea3(o) {
-  return Math.imul(Math.imul(o.x, o.y), Belt_Option.mapWithDefault(Caml_option.nullable_to_opt(o.z), 1, (function (n) {
-                    return n;
-                  })));
-}
-
-function computeArea4(o) {
-  return Math.imul(Math.imul(o.x, o.y), Belt_Option.mapWithDefault(o.z, 1, (function (n) {
-                    return n;
-                  })));
-}
-
-function testMyRec(x) {
-  return x.type;
-}
-
-function testMyRec2(x) {
-  return x;
-}
-
-function testMyObj(x) {
-  return x.type_;
-}
-
-function testMyObj2(x) {
-  return x;
-}
-
-function testMyRecBsAs(x) {
-  return [
-          x.jsValid0,
-          x.type,
-          x["the-key"],
-          x["with\\\"dquote"],
-          x["with'squote"],
-          x["1number"]
-        ];
-}
-
-function testMyRecBsAs2(x) {
-  return x;
-}
-
-var origin = {
-  x: 0,
-  y: 0,
-  z: 0
-};
-
-var someBusiness = {
-  name: "SomeBusiness",
-  owner: undefined,
-  address: undefined
-};
-
-export {
-  origin ,
-  computeArea ,
-  coord2d ,
-  getOpt ,
-  findAddress ,
-  someBusiness ,
-  findAllAddresses ,
-  getPayload ,
-  getPayloadRecord ,
-  recordValue ,
-  payloadValue ,
-  getPayloadRecordPlusOne ,
-  findAddress2 ,
-  someBusiness2 ,
-  computeArea3 ,
-  computeArea4 ,
-  testMyRec ,
-  testMyRec2 ,
-  testMyObj ,
-  testMyObj2 ,
-  testMyRecBsAs ,
-  testMyRecBsAs2 ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx
deleted file mode 100644
index ff722ab..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/References.gen.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-/* TypeScript file generated from References.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as ReferencesJS from './References.res.js';
-
-export abstract class R_t<a> { protected opaque!: a }; /* simulate opaque types */
-
-export type t<a> = R_t<a>;
-
-export type requiresConversion = { readonly x: number };
-
-export const create: (x:number) => { contents: number } = ReferencesJS.create as any;
-
-export const access: (r:{ contents: number }) => number = ReferencesJS.access as any;
-
-export const update: (r:{ contents: number }) => void = ReferencesJS.update as any;
-
-export const get: <T1>(_1:R_t<T1>) => T1 = ReferencesJS.get as any;
-
-export const make: <T1>(_1:T1) => R_t<T1> = ReferencesJS.make as any;
-
-export const set: <T1>(_1:R_t<T1>, _2:T1) => void = ReferencesJS.set as any;
-
-export const destroysRefIdentity: (x:{ contents: requiresConversion }) => { contents: requiresConversion } = ReferencesJS.destroysRefIdentity as any;
-
-export const preserveRefIdentity: (x:R_t<requiresConversion>) => R_t<requiresConversion> = ReferencesJS.preserveRefIdentity as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/References.res b/jscomp/gentype_tests/typescript-react-example/src/References.res
deleted file mode 100644
index b00c8da..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/References.res
+++ /dev/null
@@ -1,38 +0,0 @@
-// Test pervasive references
-
-@genType let create = (x: int) => ref(x)
-
-@genType let access = r => r.contents + 1
-
-@genType let update = r => r.contents = r.contents + 1
-
-// Abstract version of references: works when conversion is required.
-
-module R: {
-  @genType type t<'a>
-  let get: t<'a> => 'a
-  let make: 'a => t<'a>
-  let set: (t<'a>, 'a) => unit
-} = {
-  type t<'a> = ref<'a>
-  let get = r => r.contents
-  let make = ref
-  let set = (r, v) => r.contents = v
-}
-
-@genType type t<'a> = R.t<'a>
-
-@genType let get = R.get
-
-@gentype
-let make = R.make
-
-@genType let set = R.set
-
-type requiresConversion = {x: int}
-
-// Careful: conversion makes a copy and destroys the reference identity.
-@genType let destroysRefIdentity = (x: ref<requiresConversion>) => x
-
-// Using abstract references preserves the identity.
-@genType let preserveRefIdentity = (x: R.t<requiresConversion>) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/References.res.js b/jscomp/gentype_tests/typescript-react-example/src/References.res.js
deleted file mode 100644
index b0b4088..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/References.res.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function create(x) {
-  return {
-          contents: x
-        };
-}
-
-function access(r) {
-  return r.contents + 1 | 0;
-}
-
-function update(r) {
-  r.contents = r.contents + 1 | 0;
-}
-
-function get(r) {
-  return r.contents;
-}
-
-function make(prim) {
-  return {
-          contents: prim
-        };
-}
-
-function set(r, v) {
-  r.contents = v;
-}
-
-var R = {
-  get: get,
-  make: make,
-  set: set
-};
-
-function destroysRefIdentity(x) {
-  return x;
-}
-
-function preserveRefIdentity(x) {
-  return x;
-}
-
-export {
-  create ,
-  access ,
-  update ,
-  R ,
-  get ,
-  make ,
-  set ,
-  destroysRefIdentity ,
-  preserveRefIdentity ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/RegExp.res b/jscomp/gentype_tests/typescript-react-example/src/RegExp.res
deleted file mode 100644
index afd4e13..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/RegExp.res
+++ /dev/null
@@ -1 +0,0 @@
-type t = Js.Re.t
diff --git a/jscomp/gentype_tests/typescript-react-example/src/RegExp.res.js b/jscomp/gentype_tests/typescript-react-example/src/RegExp.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/RegExp.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/RequireCond.res b/jscomp/gentype_tests/typescript-react-example/src/RequireCond.res
deleted file mode 100644
index b7fdd67..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/RequireCond.res
+++ /dev/null
@@ -1,19 +0,0 @@
-@module
-@deprecated(
-  "Please use this syntax to guarantee safe usage: [%requireCond(`gk, \"gk_name\", ConditionalModule)]"
-)
-external make: (
-  @string [@as("qe.bool") #qeBool | @as("gk") #gk],
-  string,
-  string,
-) => Js.Nullable.t<'a> = "requireCond"
-
-@module
-@deprecated(
-  "Please use this syntax to guarantee safe usage: [%requireCond(`gk, \"gk_name\", {\"true\": ModuleA, \"false\": ModuleB})]"
-)
-external either: (
-  @string [@as("qe.bool") #qeBool | @as("gk") #gk],
-  string,
-  {"true": string, "false": string},
-) => 'b = "requireCond"
diff --git a/jscomp/gentype_tests/typescript-react-example/src/RequireCond.res.js b/jscomp/gentype_tests/typescript-react-example/src/RequireCond.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/RequireCond.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Set_.res b/jscomp/gentype_tests/typescript-react-example/src/Set_.res
deleted file mode 100644
index cfacdaa..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Set_.res
+++ /dev/null
@@ -1 +0,0 @@
-type t<'a>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Set_.res.js b/jscomp/gentype_tests/typescript-react-example/src/Set_.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Set_.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx
deleted file mode 100644
index 4684ffd..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Shadow.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from Shadow.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as ShadowJS from './Shadow.res.js';
-
-export const test: () => string = ShadowJS.test as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Shadow.res b/jscomp/gentype_tests/typescript-react-example/src/Shadow.res
deleted file mode 100644
index f1fb444..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Shadow.res
+++ /dev/null
@@ -1,11 +0,0 @@
-@@warning("-32")
-
-@genType let test = () => 3
-
-@genType let test = () => "a"
-
-module M = {
-  @genType let test = () => 3
-
-  let test = () => "a"
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Shadow.res.js b/jscomp/gentype_tests/typescript-react-example/src/Shadow.res.js
deleted file mode 100644
index 87be066..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Shadow.res.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function test(param) {
-  return "a";
-}
-
-function test$1(param) {
-  return "a";
-}
-
-var M = {
-  test: test$1
-};
-
-export {
-  test ,
-  M ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx
deleted file mode 100644
index c90395c..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.gen.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-/* TypeScript file generated from TestEmitInnerModules.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as TestEmitInnerModulesJS from './TestEmitInnerModules.res.js';
-
-export const Inner_x: number = TestEmitInnerModulesJS.Inner.x as any;
-
-export const Inner_y: string = TestEmitInnerModulesJS.Inner.y as any;
-
-export const Outer_Medium_Inner_y: number = TestEmitInnerModulesJS.Outer.Medium.Inner.y as any;
-
-export const Inner: { x: number; y: string } = TestEmitInnerModulesJS.Inner as any;
-
-export const Outer: { Medium: { Inner: { y: number } } } = TestEmitInnerModulesJS.Outer as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.res b/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.res
deleted file mode 100644
index b36176e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.res
+++ /dev/null
@@ -1,12 +0,0 @@
-module Inner = {
-  @genType let x = 34
-  @genType let y = "hello"
-}
-
-module Outer = {
-  module Medium = {
-    module Inner = {
-      @genType let y = 44
-    }
-  }
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.res.js b/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.res.js
deleted file mode 100644
index 995314b..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestEmitInnerModules.res.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var Inner = {
-  x: 34,
-  y: "hello"
-};
-
-var Inner$1 = {
-  y: 44
-};
-
-var Medium = {
-  Inner: Inner$1
-};
-
-var Outer = {
-  Medium: Medium
-};
-
-export {
-  Inner ,
-  Outer ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx
deleted file mode 100644
index ee7c318..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.gen.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-/* TypeScript file generated from TestFirstClassModules.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as TestFirstClassModulesJS from './TestFirstClassModules.res.js';
-
-import type {firstClassModule as FirstClassModulesInterface_firstClassModule} from './FirstClassModulesInterface.gen';
-
-import type {firstClassModule as FirstClassModules_firstClassModule} from './FirstClassModules.gen';
-
-import type {record as FirstClassModulesInterface_record} from './FirstClassModulesInterface.gen';
-
-export type firstClassModuleWithTypeEquations<i,o> = { readonly out: (_1:o) => o; readonly Inner: { readonly inn: (_1:i) => i } };
-
-export const convert: (x:FirstClassModules_firstClassModule) => FirstClassModules_firstClassModule = TestFirstClassModulesJS.convert as any;
-
-export const convertInterface: (x:FirstClassModulesInterface_firstClassModule) => FirstClassModulesInterface_firstClassModule = TestFirstClassModulesJS.convertInterface as any;
-
-export const convertRecord: (x:FirstClassModulesInterface_record) => FirstClassModulesInterface_record = TestFirstClassModulesJS.convertRecord as any;
-
-export const convertFirstClassModuleWithTypeEquations: <T1,T2>(x:{ readonly out: ((_1:T1) => T1); readonly Inner: { readonly inn: ((_1:T2) => T2) } }) => { readonly out: (_1:T1) => T1; readonly Inner: { readonly inn: (_1:T2) => T2 } } = TestFirstClassModulesJS.convertFirstClassModuleWithTypeEquations as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.res b/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.res
deleted file mode 100644
index 8246e5b..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.res
+++ /dev/null
@@ -1,27 +0,0 @@
-@genType let convert = (x: FirstClassModules.firstClassModule) => x
-
-@genType let convertInterface = (x: FirstClassModulesInterface.firstClassModule) => x
-
-@genType let convertRecord = (x: FirstClassModulesInterface.record) => x
-
-module type MT = {
-  type outer
-  let out: outer => outer
-
-  module Inner: {
-    type inner
-    let inn: inner => inner
-  }
-}
-
-@genType
-type firstClassModuleWithTypeEquations<'i, 'o> = module(MT with
-  type Inner.inner = 'i
-  and type outer = 'o
-)
-
-@genType
-let convertFirstClassModuleWithTypeEquations = (
-  type o i,
-  x: module(MT with type Inner.inner = i and type outer = o),
-) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.res.js b/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.res.js
deleted file mode 100644
index bef4b0e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestFirstClassModules.res.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function convert(x) {
-  return x;
-}
-
-function convertInterface(x) {
-  return x;
-}
-
-function convertRecord(x) {
-  return x;
-}
-
-function convertFirstClassModuleWithTypeEquations(x) {
-  return x;
-}
-
-export {
-  convert ,
-  convertInterface ,
-  convertRecord ,
-  convertFirstClassModuleWithTypeEquations ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx
deleted file mode 100644
index 9037ddb..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from TestImmutableArray.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as TestImmutableArrayJS from './TestImmutableArray.res.js';
-
-export const testImmutableArrayGet: <T1>(arr:ReadonlyArray<T1>) => (undefined | T1) = TestImmutableArrayJS.testImmutableArrayGet as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.res b/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.res
deleted file mode 100644
index d4b49b7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.res
+++ /dev/null
@@ -1,20 +0,0 @@
-@genType
-let testImmutableArrayGet = arr => {
-  open ImmutableArray
-  arr[3]
-}
-
-/*
-   type error
-   let testImmutableArraySet = arr => ImmutableArray.(arr[3] = 4);
- */
-
-let testBeltArrayGet = arr => {
-  open Belt
-  arr[3]
-}
-
-let testBeltArraySet = arr => {
-  open Belt
-  arr[3] = 4
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.res.js b/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.res.js
deleted file mode 100644
index 4cba8d8..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestImmutableArray.res.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
-import * as ImmutableArray from "./ImmutableArray.res.js";
-
-function testImmutableArrayGet(arr) {
-  return ImmutableArray.$$Array.get(arr, 3);
-}
-
-function testBeltArrayGet(arr) {
-  return Belt_Array.get(arr, 3);
-}
-
-function testBeltArraySet(arr) {
-  return Belt_Array.set(arr, 3, 4);
-}
-
-export {
-  testImmutableArrayGet ,
-  testBeltArrayGet ,
-  testBeltArraySet ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx
deleted file mode 100644
index fa6bcf0..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.gen.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* TypeScript file generated from TestModuleAliases.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as TestModuleAliasesJS from './TestModuleAliases.res.js';
-
-import type {InnerAlias_inner as ModuleAliases2_InnerAlias_inner} from './ModuleAliases2.gen';
-
-import type {Outer_Inner_inner as ModuleAliases2_Outer_Inner_inner} from './ModuleAliases2.gen';
-
-import type {Outer_outer as ModuleAliases2_Outer_outer} from './ModuleAliases2.gen';
-
-import type {record as ModuleAliases2_record} from './ModuleAliases2.gen';
-
-export type OtherFile_record = { readonly x: number; readonly y: string };
-
-export type record = ModuleAliases2_record;
-
-export type record2 = ModuleAliases2_record;
-
-export type outer = ModuleAliases2_Outer_outer;
-
-export type outer2 = ModuleAliases2_Outer_outer;
-
-export type my2 = ModuleAliases2_Outer_Inner_inner;
-
-export type inner1 = ModuleAliases2_InnerAlias_inner;
-
-export type inner2 = ModuleAliases2_Outer_Inner_inner;
-
-export const testInner1: (x:inner1) => inner1 = TestModuleAliasesJS.testInner1 as any;
-
-export const testInner1Expanded: (x:ModuleAliases2_InnerAlias_inner) => ModuleAliases2_InnerAlias_inner = TestModuleAliasesJS.testInner1Expanded as any;
-
-export const testInner2: (x:inner2) => inner2 = TestModuleAliasesJS.testInner2 as any;
-
-export const testInner2Expanded: (x:ModuleAliases2_Outer_Inner_inner) => ModuleAliases2_Outer_Inner_inner = TestModuleAliasesJS.testInner2Expanded as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.res b/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.res
deleted file mode 100644
index 849b5e4..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.res
+++ /dev/null
@@ -1,30 +0,0 @@
-module OtherFile = ModuleAliases2
-module OtherFileAlias = OtherFile
-
-@genType type record = OtherFile.record
-
-@genType type record2 = OtherFileAlias.record
-
-module OuterAlias = OtherFile.Outer
-
-@genType type outer = OtherFileAlias.Outer.outer
-
-@genType type outer2 = OuterAlias.outer
-
-module OtherFile1 = OtherFile
-module Outer2 = OtherFile1.Outer
-module Inner2 = Outer2.Inner
-
-@genType type my2 = Inner2.inner
-
-@genType type inner1 = OtherFile.InnerAlias.inner
-
-@genType type inner2 = OtherFile.Outer.Inner.inner
-
-@genType let testInner1 = (x: inner1) => x
-
-@genType let testInner1Expanded = (x: OtherFile.InnerAlias.inner) => x
-
-@genType let testInner2 = (x: inner2) => x
-
-@genType let testInner2Expanded = (x: OtherFile.Outer.Inner.inner) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.res.js b/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.res.js
deleted file mode 100644
index cde0007..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestModuleAliases.res.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function testInner1(x) {
-  return x;
-}
-
-function testInner1Expanded(x) {
-  return x;
-}
-
-function testInner2(x) {
-  return x;
-}
-
-function testInner2Expanded(x) {
-  return x;
-}
-
-var OtherFile;
-
-var OtherFileAlias;
-
-var OuterAlias;
-
-var OtherFile1;
-
-var Outer2;
-
-var Inner2;
-
-export {
-  OtherFile ,
-  OtherFileAlias ,
-  OuterAlias ,
-  OtherFile1 ,
-  Outer2 ,
-  Inner2 ,
-  testInner1 ,
-  testInner1Expanded ,
-  testInner2 ,
-  testInner2Expanded ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx
deleted file mode 100644
index 04f5f47..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.gen.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-/* TypeScript file generated from TestPromise.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as TestPromiseJS from './TestPromise.res.js';
-
-export type promise<a> = Promise<a>;
-
-export type fromPayload = { readonly x: number; readonly s: string };
-
-export type toPayload = { readonly result: string };
-
-export const convert: (_1:Promise<fromPayload>) => Promise<toPayload> = TestPromiseJS.convert as any;
-
-export const barx: (x:(undefined | Promise<(undefined | string)>), _2:void) => boolean = TestPromiseJS.barx as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.res b/jscomp/gentype_tests/typescript-react-example/src/TestPromise.res
deleted file mode 100644
index 6c05a60..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.res
+++ /dev/null
@@ -1,13 +0,0 @@
-@genType type promise<'a> = Js.Promise.t<'a>
-
-@genType
-type fromPayload = {
-  x: int,
-  s: string,
-}
-
-@genType type toPayload = {result: string}
-
-@genType let convert = Js.Promise.then_(({s}) => Js.Promise.resolve({result: s}))
-
-@genType let barx = (~x=Js.Promise.resolve(Some("a")), ()) => x == x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.res.js b/jscomp/gentype_tests/typescript-react-example/src/TestPromise.res.js
deleted file mode 100644
index 69f21a7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TestPromise.res.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Caml_obj from "rescript/lib/es6/caml_obj.js";
-import * as Js_promise from "rescript/lib/es6/js_promise.js";
-import * as Caml_option from "rescript/lib/es6/caml_option.js";
-
-function convert(param) {
-  return Js_promise.then_((function (param) {
-                return Promise.resolve({
-                            result: param.s
-                          });
-              }), param);
-}
-
-function barx(xOpt, param) {
-  var x = xOpt !== undefined ? Caml_option.valFromOption(xOpt) : Promise.resolve("a");
-  return Caml_obj.equal(x, x);
-}
-
-export {
-  convert ,
-  barx ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx
deleted file mode 100644
index 71698f9..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.gen.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-/* TypeScript file generated from TransitiveType1.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as TransitiveType1JS from './TransitiveType1.res.js';
-
-import type {t2Alias as TransitiveType2_t2Alias} from './TransitiveType2.gen';
-
-import type {t2 as TransitiveType2_t2} from './TransitiveType2.gen';
-
-export const convert: (x:TransitiveType2_t2) => TransitiveType2_t2 = TransitiveType1JS.convert as any;
-
-export const convertAlias: (x:TransitiveType2_t2Alias) => TransitiveType2_t2Alias = TransitiveType1JS.convertAlias as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.res b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.res
deleted file mode 100644
index 212ac86..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.res
+++ /dev/null
@@ -1,3 +0,0 @@
-@genType let convert = (x: TransitiveType2.t2) => x
-
-@genType let convertAlias = (x: TransitiveType2.t2Alias) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.res.js b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.res.js
deleted file mode 100644
index 5fda66b..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType1.res.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function convert(x) {
-  return x;
-}
-
-function convertAlias(x) {
-  return x;
-}
-
-export {
-  convert ,
-  convertAlias ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx
deleted file mode 100644
index 02c9548..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.gen.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/* TypeScript file generated from TransitiveType2.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import type {t3 as TransitiveType3_t3} from './TransitiveType3.gen';
-
-export type t2 = (undefined | TransitiveType3_t3);
-
-export type t2Alias = t2;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.res b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.res
deleted file mode 100644
index e7f002e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@genType type t2 = option<TransitiveType3.t3>
-
-@genType type t2Alias = t2
-
-let convertT2 = (x: t2) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.res.js b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.res.js
deleted file mode 100644
index cf62be6..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType2.res.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function convertT2(x) {
-  return x;
-}
-
-export {
-  convertT2 ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx
deleted file mode 100644
index 9fa08f9..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.gen.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/* TypeScript file generated from TransitiveType3.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as TransitiveType3JS from './TransitiveType3.res.js';
-
-export type t3 = { readonly i: number; readonly s: string };
-
-export const convertT3: (x:t3) => t3 = TransitiveType3JS.convertT3 as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.res b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.res
deleted file mode 100644
index 2fb7024..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.res
+++ /dev/null
@@ -1,7 +0,0 @@
-@genType
-type t3 = {
-  i: int,
-  s: string,
-}
-
-@genType let convertT3 = (x: t3) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.res.js b/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.res.js
deleted file mode 100644
index 77e8c2a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TransitiveType3.res.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function convertT3(x) {
-  return x;
-}
-
-export {
-  convertT3 ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx
deleted file mode 100644
index 1d8672b..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.gen.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/* TypeScript file generated from TypeNameSanitize.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type t_ = number;
-
-export type M_t__ = number;
-
-export type pair = [t_, M_t__];
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.res b/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.res
deleted file mode 100644
index 9286b60..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.res
+++ /dev/null
@@ -1,10 +0,0 @@
-@genType
-type t' = int
-
-module M = {
-  @genType
-  type t'' = int
-}
-
-@genType
-type pair = (t', M.t'')
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.res.js b/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.res.js
deleted file mode 100644
index 44a5721..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeNameSanitize.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var M = {};
-
-export {
-  M ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx
deleted file mode 100644
index 9ec2bad..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.gen.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-/* TypeScript file generated from TypeParams1.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type ocaml_array<a> = a[];
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.res b/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.res
deleted file mode 100644
index 2e51def..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.res
+++ /dev/null
@@ -1,4 +0,0 @@
-@gentype
-type ocaml_array<'a> = array<'a>
-
-let exportSomething = 10
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.res.js b/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.res.js
deleted file mode 100644
index 99313ed..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams1.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var exportSomething = 10;
-
-export {
-  exportSomething ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx
deleted file mode 100644
index bef46e0..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.gen.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* TypeScript file generated from TypeParams2.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import type {ocaml_array as TypeParams1_ocaml_array} from './TypeParams1.gen';
-
-export type item = { readonly id: number };
-
-export type items = TypeParams1_ocaml_array<item>;
-
-export type items2 = item[];
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.res b/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.res
deleted file mode 100644
index 62210b7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.res
+++ /dev/null
@@ -1,7 +0,0 @@
-@genType type item = {id: int}
-
-@genType type items = TypeParams1.ocaml_array<item>
-
-@genType type items2 = array<item>
-
-let exportSomething = 10
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.res.js b/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.res.js
deleted file mode 100644
index 99313ed..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams2.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var exportSomething = 10;
-
-export {
-  exportSomething ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx
deleted file mode 100644
index 25d8ac0..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.gen.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-/* TypeScript file generated from TypeParams3.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as TypeParams3JS from './TypeParams3.res.js';
-
-import type {items2 as TypeParams2_items2} from './TypeParams2.gen';
-
-import type {items as TypeParams2_items} from './TypeParams2.gen';
-
-export const test: (x:TypeParams2_items) => TypeParams2_items = TypeParams3JS.test as any;
-
-export const test2: (x:TypeParams2_items2) => TypeParams2_items2 = TypeParams3JS.test2 as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.res b/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.res
deleted file mode 100644
index 9d75162..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.res
+++ /dev/null
@@ -1,3 +0,0 @@
-@genType let test = (x: TypeParams2.items) => x
-
-@genType let test2 = (x: TypeParams2.items2) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.res.js b/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.res.js
deleted file mode 100644
index 26ba896..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/TypeParams3.res.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function test(x) {
-  return x;
-}
-
-function test2(x) {
-  return x;
-}
-
-export {
-  test ,
-  test2 ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx
deleted file mode 100644
index 43d5469..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.gen.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-/* TypeScript file generated from Unboxed.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as UnboxedJS from './Unboxed.res.js';
-
-export type v1 = number;
-
-export type v2 = number;
-
-export type r1 = number;
-
-export type r2 = string;
-
-export type t = number[] | number | ((_1:number) => number);
-
-export type tabIndex = "0" | "1" | 0;
-
-export const testV1: (x:v1) => v1 = UnboxedJS.testV1 as any;
-
-export const r2Test: (x:r2) => r2 = UnboxedJS.r2Test as any;
-
-export const a: tabIndex = UnboxedJS.a as any;
-
-export const b: tabIndex = UnboxedJS.b as any;
-
-export const zero: 0 = UnboxedJS.zero as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.res b/jscomp/gentype_tests/typescript-react-example/src/Unboxed.res
deleted file mode 100644
index ee98bc1..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.res
+++ /dev/null
@@ -1,30 +0,0 @@
-@genType @ocaml.unboxed
-type v1 = A(int)
-
-@genType @unboxed
-type v2 = A(int)
-
-@genType let testV1 = (x: v1) => x
-
-@genType @unboxed
-type r1 = {x: int}
-
-@genType @ocaml.unboxed
-type r2 = B({g: string})
-
-@genType let r2Test = (x: r2) => x
-
-@genType @unboxed
-type t = Array(array<int>) | Record({x: int}) | Function((. int) => int)
-
-@genType
-type tabIndex = | @as("0") Activity | @as("1") UserKeyword | @as(0) NumZero
-
-@genType
-let a = Activity
-
-@genType
-let b = UserKeyword
-
-@genType
-let zero = #0
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.res.js b/jscomp/gentype_tests/typescript-react-example/src/Unboxed.res.js
deleted file mode 100644
index 7c02bf0..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Unboxed.res.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function testV1(x) {
-  return x;
-}
-
-function r2Test(x) {
-  return x;
-}
-
-var a = "0";
-
-var b = "1";
-
-var zero = 0;
-
-export {
-  testV1 ,
-  r2Test ,
-  a ,
-  b ,
-  zero ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx
deleted file mode 100644
index c9df733..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.gen.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* TypeScript file generated from Uncurried.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as UncurriedJS from './Uncurried.res.js';
-
-export type u0 = () => string;
-
-export type u1 = (_1:number) => string;
-
-export type u2 = (_1:number, _2:string) => string;
-
-export type u3 = (_1:number, _2:string, _3:number) => string;
-
-export type auth = { readonly login: () => string };
-
-export type authU = { readonly loginU: () => string };
-
-export const uncurried0: () => string = UncurriedJS.uncurried0 as any;
-
-export const uncurried1: (x:number) => string = UncurriedJS.uncurried1 as any;
-
-export const uncurried2: (x:number, y:string) => string = UncurriedJS.uncurried2 as any;
-
-export const uncurried3: (x:number, y:string, z:number) => string = UncurriedJS.uncurried3 as any;
-
-export const curried3: (x:number, y:string, z:number) => string = UncurriedJS.curried3 as any;
-
-export const callback: (cb:(() => number)) => string = UncurriedJS.callback as any;
-
-export const callback2: (auth:auth) => string = UncurriedJS.callback2 as any;
-
-export const callback2U: (auth:authU) => string = UncurriedJS.callback2U as any;
-
-export const sumU: (n:number, m:number) => void = UncurriedJS.sumU as any;
-
-export const sumU2: (n:number) => (_1:number) => void = UncurriedJS.sumU2 as any;
-
-export const sumCurried: (n:number, _2:number) => void = UncurriedJS.sumCurried as any;
-
-export const sumLblCurried: (s:string, n:number, m:number) => void = UncurriedJS.sumLblCurried as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res
deleted file mode 100644
index 99b78fb..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res
+++ /dev/null
@@ -1,42 +0,0 @@
-@genType type u0 = (. unit) => string
-
-@genType type u1 = (. int) => string
-
-@genType type u2 = (. int, string) => string
-
-@genType type u3 = (. int, string, int) => string
-
-@genType let uncurried0 = (. ()) => ""
-
-@genType let uncurried1 = (. x) => x |> string_of_int
-
-@genType let uncurried2 = (. x, y) => (x |> string_of_int) ++ y
-
-@genType let uncurried3 = (. x, y, z) => (x |> string_of_int) ++ (y ++ (z |> string_of_int))
-
-@genType let curried3 = (x, y, z) => (x |> string_of_int) ++ (y ++ (z |> string_of_int))
-
-@genType let callback = cb => cb() |> string_of_int
-
-type auth = {login: unit => string}
-type authU = {loginU: (. unit) => string}
-
-@genType let callback2 = auth => auth.login()
-
-@genType let callback2U = auth => auth.loginU(.)
-
-@genType let sumU = (. n, m) => Js.log4("sumU 2nd arg", m, "result", n + m)
-
-@genType let sumU2 = (. n, . m) => Js.log4("sumU2 2nd arg", m, "result", n + m)
-
-@genType
-let sumCurried = n => {
-  Js.log2("sumCurried 1st arg", n)
-  m => Js.log4("sumCurried 2nd arg", m, "result", n + m)
-}
-
-@genType
-let sumLblCurried = (s: string, ~n) => {
-  Js.log3(s, "sumLblCurried 1st arg", n)
-  (~m) => Js.log4("sumLblCurried 2nd arg", m, "result", n + m)
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res.js b/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res.js
deleted file mode 100644
index 5878196..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Uncurried.res.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Curry from "rescript/lib/es6/curry.js";
-
-function uncurried0() {
-  return "";
-}
-
-function uncurried1(x) {
-  return String(x);
-}
-
-function uncurried2(x, y) {
-  return String(x) + y;
-}
-
-function uncurried3(x, y, z) {
-  return String(x) + (y + String(z));
-}
-
-function curried3(x, y, z) {
-  return String(x) + (y + String(z));
-}
-
-function callback(cb) {
-  return String(Curry._1(cb, undefined));
-}
-
-function callback2(auth) {
-  return Curry._1(auth.login, undefined);
-}
-
-function callback2U(auth) {
-  return auth.loginU();
-}
-
-function sumU(n, m) {
-  console.log("sumU 2nd arg", m, "result", n + m | 0);
-}
-
-function sumU2(n) {
-  return function (m) {
-    console.log("sumU2 2nd arg", m, "result", n + m | 0);
-  };
-}
-
-function sumCurried(n) {
-  console.log("sumCurried 1st arg", n);
-  return function (m) {
-    console.log("sumCurried 2nd arg", m, "result", n + m | 0);
-  };
-}
-
-function sumLblCurried(s, n) {
-  console.log(s, "sumLblCurried 1st arg", n);
-  return function (m) {
-    console.log("sumLblCurried 2nd arg", m, "result", n + m | 0);
-  };
-}
-
-export {
-  uncurried0 ,
-  uncurried1 ,
-  uncurried2 ,
-  uncurried3 ,
-  curried3 ,
-  callback ,
-  callback2 ,
-  callback2U ,
-  sumU ,
-  sumU2 ,
-  sumCurried ,
-  sumLblCurried ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Undefined.res b/jscomp/gentype_tests/typescript-react-example/src/Undefined.res
deleted file mode 100644
index 5c2e5dc..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Undefined.res
+++ /dev/null
@@ -1 +0,0 @@
-type t<'a> = Js.undefined<'a>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Undefined.res.js b/jscomp/gentype_tests/typescript-react-example/src/Undefined.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Undefined.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx
deleted file mode 100644
index 551e6df..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Usage.gen.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/* TypeScript file generated from Usage.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as UsageJS from './Usage.res.js';
-
-import type {MyModuleAlias_t as Wrapper_MyModuleAlias_t} from './Wrapper.gen';
-
-export const b: Wrapper_MyModuleAlias_t = UsageJS.b as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Usage.res b/jscomp/gentype_tests/typescript-react-example/src/Usage.res
deleted file mode 100644
index 12d383e..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Usage.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let a = 5
-@genType
-let b = Wrapper.MyModuleAlias.add(a, 3)
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Usage.res.js b/jscomp/gentype_tests/typescript-react-example/src/Usage.res.js
deleted file mode 100644
index 602ee55..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Usage.res.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as MyModule from "./MyModule.res.js";
-
-var b = MyModule.add(5, 3);
-
-var a = 5;
-
-export {
-  a ,
-  b ,
-}
-/* b Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx
deleted file mode 100644
index 0fad6f2..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.gen.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-/* TypeScript file generated from UseImportJsValue.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as UseImportJsValueJS from './UseImportJsValue.res.js';
-
-import type {AbsoluteValue_t as ImportJsValue_AbsoluteValue_t} from './ImportJsValue.gen';
-
-import type {stringFunction as ImportJsValue_stringFunction} from './ImportJsValue.gen';
-
-export const useGetProp: (x:ImportJsValue_AbsoluteValue_t) => number = UseImportJsValueJS.useGetProp as any;
-
-export const useTypeImportedInOtherModule: (x:ImportJsValue_stringFunction) => ImportJsValue_stringFunction = UseImportJsValueJS.useTypeImportedInOtherModule as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.res b/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.res
deleted file mode 100644
index 824ce97..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.res
+++ /dev/null
@@ -1,4 +0,0 @@
-@genType
-let useGetProp = (x: ImportJsValue.AbsoluteValue.t) => x->ImportJsValue.AbsoluteValue.getProp + 1
-
-@genType let useTypeImportedInOtherModule = (x: ImportJsValue.stringFunction) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.res.js b/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.res.js
deleted file mode 100644
index c954b15..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/UseImportJsValue.res.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function useGetProp(x) {
-  return x.getProp() + 1 | 0;
-}
-
-function useTypeImportedInOtherModule(x) {
-  return x;
-}
-
-export {
-  useGetProp ,
-  useTypeImportedInOtherModule ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx
deleted file mode 100644
index 2b55a93..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.gen.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-/* TypeScript file generated from V3Compatibility.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type cb = (_1:number) => string;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res b/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res
deleted file mode 100644
index c706483..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res
+++ /dev/null
@@ -1,4 +0,0 @@
-open ReactV3
-
-@genType
-type cb = int => string
diff --git a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res.js b/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx
deleted file mode 100644
index 3b2b65d..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Variants.gen.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-/* TypeScript file generated from Variants.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as VariantsJS from './Variants.res.js';
-
-import type {list} from '../src/shims/RescriptPervasives.shim';
-
-export type weekday = 
-    "monday"
-  | "tuesday"
-  | "wednesday"
-  | "thursday"
-  | "friday"
-  | "saturday"
-  | "sunday";
-
-export type testGenTypeAs = "type_" | "module_" | "fortytwo";
-
-export type testGenTypeAs2 = "type_" | "module" | 42;
-
-export type testGenTypeAs3 = "type_" | "module" | 42;
-
-export type x1 = "x" | "x1";
-
-export type x2 = "x" | "x2";
-
-export type type_ = "Type";
-export type type = type_;
-
-export type myList = "E" | { TAG: "C"; _0: number; _1: myList };
-
-export type builtinList = list<number>;
-
-export type result1<a,b> = 
-    { TAG: "Ok"; _0: a }
-  | { TAG: "Error"; _0: b };
-
-export type result2<a,b> = 
-    { TAG: "Ok"; _0: a }
-  | { TAG: "Error"; _0: b };
-
-export type result3<a,b> = 
-    { TAG: "Ok"; _0: a }
-  | { TAG: "Error"; _0: b };
-
-export const isWeekend: (x:weekday) => boolean = VariantsJS.isWeekend as any;
-
-export const monday: "monday" = VariantsJS.monday as any;
-
-export const saturday: "saturday" = VariantsJS.saturday as any;
-
-export const sunday: "sunday" = VariantsJS.sunday as any;
-
-export const onlySunday: (param:"sunday") => void = VariantsJS.onlySunday as any;
-
-export const swap: (x:"saturday" | "sunday") => "saturday" | "sunday" = VariantsJS.swap as any;
-
-export const testConvert: (x:testGenTypeAs) => testGenTypeAs = VariantsJS.testConvert as any;
-
-export const fortytwoOK: testGenTypeAs = VariantsJS.fortytwoOK as any;
-
-export const fortytwoBAD: "fortytwo" = VariantsJS.fortytwoBAD as any;
-
-export const testConvert2: (x:testGenTypeAs2) => testGenTypeAs2 = VariantsJS.testConvert2 as any;
-
-export const testConvert3: (x:testGenTypeAs3) => testGenTypeAs3 = VariantsJS.testConvert3 as any;
-
-export const testConvert2to3: (x:testGenTypeAs2) => testGenTypeAs3 = VariantsJS.testConvert2to3 as any;
-
-export const id1: (x:x1) => x1 = VariantsJS.id1 as any;
-
-export const id2: (x:x2) => x2 = VariantsJS.id2 as any;
-
-export const polyWithOpt: (foo:string) => (undefined | (
-    { NAME: "One"; VAL: string }
-  | { NAME: "Two"; VAL: number })) = VariantsJS.polyWithOpt as any;
-
-export const restResult1: (x:result1<number,string>) => result1<number,string> = VariantsJS.restResult1 as any;
-
-export const restResult2: (x:result2<number,string>) => result2<number,string> = VariantsJS.restResult2 as any;
-
-export const restResult3: (x:result3<number,string>) => result3<number,string> = VariantsJS.restResult3 as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Variants.res b/jscomp/gentype_tests/typescript-react-example/src/Variants.res
deleted file mode 100644
index 4dcde43..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Variants.res
+++ /dev/null
@@ -1,110 +0,0 @@
-@genType
-type weekday = [
-  | #monday
-  | #tuesday
-  | #wednesday
-  | #thursday
-  | #friday
-  | #saturday
-  | #sunday
-]
-
-@genType
-let isWeekend = (x: weekday) =>
-  switch x {
-  | #saturday | #sunday => true
-  | _ => false
-  }
-
-@genType let monday = #monday
-@genType let saturday = #saturday
-@genType let sunday = #sunday
-
-@genType let onlySunday = (_: [#sunday]) => ()
-
-@genType
-let swap = x =>
-  switch x {
-  | #sunday => #saturday
-  | #saturday => #sunday
-  }
-
-@genType
-type testGenTypeAs = [
-  | #type_
-  | #module_
-  | #fortytwo
-]
-
-@genType let testConvert = (x: testGenTypeAs) => x
-
-@genType let fortytwoOK: testGenTypeAs = #fortytwo
-
-/* Exporting this is BAD: type inference means it's not mapped to "42" */
-@genType let fortytwoBAD = #fortytwo
-
-@genType
-type testGenTypeAs2 = [
-  | #type_
-  | #\"module"
-  | #42
-]
-
-/* Since testGenTypeAs2 is the same type as testGenTypeAs1,
- share the conversion map. */
-@genType let testConvert2 = (x: testGenTypeAs2) => x
-
-@genType
-type testGenTypeAs3 = [
-  |  #type_
-  |  #\"module"
-  | #42
-]
-
-/* Since testGenTypeAs3 has a different representation:
- use a new conversion map. */
-@genType let testConvert3 = (x: testGenTypeAs3) => x
-
-/* This converts between testGenTypeAs2 and testGenTypeAs3 */
-@genType let testConvert2to3 = (x: testGenTypeAs2): testGenTypeAs3 => x
-
-@genType type x1 = [#x | @genType.as("same") #x1]
-
-@genType type x2 = [#x | @genType.as("same") #x2]
-
-@genType let id1 = (x: x1) => x
-
-@genType let id2 = (x: x2) => x
-
-@genType @genType.as("type")
-type type_ = | @genType.as("type") Type
-
-@genType
-type rec myList = E | C(int, myList)
-
-@genType
-type builtinList = list<int>
-
-@genType
-let polyWithOpt = foo =>
-  foo === "bar"
-    ? None
-    : switch foo !== "baz" {
-      | true => Some(#One(foo))
-      | false => Some(#Two(1))
-      }
-
-@genType
-type result1<'a, 'b> =
-  | Ok('a)
-  | Error('b)
-
-@genType type result2<'a, 'b> = result<'a, 'b>
-
-@genType type result3<'a, 'b> = Belt.Result.t<'a, 'b>
-
-@genType let restResult1 = (x: result1<int, string>) => x
-
-@genType let restResult2 = (x: result2<int, string>) => x
-
-@genType let restResult3 = (x: result3<int, string>) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Variants.res.js b/jscomp/gentype_tests/typescript-react-example/src/Variants.res.js
deleted file mode 100644
index 9f7f047..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Variants.res.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function isWeekend(x) {
-  if (x === "sunday") {
-    return true;
-  } else {
-    return x === "saturday";
-  }
-}
-
-function onlySunday(param) {
-  
-}
-
-function swap(x) {
-  if (x === "sunday") {
-    return "saturday";
-  } else {
-    return "sunday";
-  }
-}
-
-function testConvert(x) {
-  return x;
-}
-
-function testConvert2(x) {
-  return x;
-}
-
-function testConvert3(x) {
-  return x;
-}
-
-function testConvert2to3(x) {
-  return x;
-}
-
-function id1(x) {
-  return x;
-}
-
-function id2(x) {
-  return x;
-}
-
-function polyWithOpt(foo) {
-  if (foo === "bar") {
-    return ;
-  } else if (foo !== "baz") {
-    return {
-            NAME: "One",
-            VAL: foo
-          };
-  } else {
-    return {
-            NAME: "Two",
-            VAL: 1
-          };
-  }
-}
-
-function restResult1(x) {
-  return x;
-}
-
-function restResult2(x) {
-  return x;
-}
-
-function restResult3(x) {
-  return x;
-}
-
-var monday = "monday";
-
-var saturday = "saturday";
-
-var sunday = "sunday";
-
-var fortytwoOK = "fortytwo";
-
-var fortytwoBAD = "fortytwo";
-
-export {
-  isWeekend ,
-  monday ,
-  saturday ,
-  sunday ,
-  onlySunday ,
-  swap ,
-  testConvert ,
-  fortytwoOK ,
-  fortytwoBAD ,
-  testConvert2 ,
-  testConvert3 ,
-  testConvert2to3 ,
-  id1 ,
-  id2 ,
-  polyWithOpt ,
-  restResult1 ,
-  restResult2 ,
-  restResult3 ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx
deleted file mode 100644
index 4cb3a20..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.gen.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* TypeScript file generated from VariantsWithPayload.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as VariantsWithPayloadJS from './VariantsWithPayload.res.js';
-
-export type payload = { readonly x: number; readonly y?: string };
-
-export type withPayload = 
-    "a"
-  | "b"
-  | "True"
-  | "Twenty"
-  | "Half"
-  | { NAME: "c"; VAL: payload };
-
-export type manyPayloads = 
-    { NAME: "one"; VAL: number }
-  | { NAME: "two"; VAL: [string, string] }
-  | { NAME: "three"; VAL: payload };
-
-export type simpleVariant = "A" | "B" | "C";
-
-export type variantWithPayloads = 
-    "A"
-  | { TAG: "B"; _0: number }
-  | { TAG: "C"; _0: number; _1: number }
-  | { TAG: "D"; _0: number; _1: number }
-  | { TAG: "E"; _0: number; _1: string; _2: number };
-
-export type variant1Int = { TAG: "R"; _0: number };
-
-export type variant1Object = { TAG: "R"; _0: payload };
-
-export const testWithPayload: (x:withPayload) => withPayload = VariantsWithPayloadJS.testWithPayload as any;
-
-export const printVariantWithPayload: (x:withPayload) => void = VariantsWithPayloadJS.printVariantWithPayload as any;
-
-export const testManyPayloads: (x:manyPayloads) => manyPayloads = VariantsWithPayloadJS.testManyPayloads as any;
-
-export const printManyPayloads: (x:manyPayloads) => void = VariantsWithPayloadJS.printManyPayloads as any;
-
-export const testSimpleVariant: (x:simpleVariant) => simpleVariant = VariantsWithPayloadJS.testSimpleVariant as any;
-
-export const testVariantWithPayloads: (x:variantWithPayloads) => variantWithPayloads = VariantsWithPayloadJS.testVariantWithPayloads as any;
-
-export const printVariantWithPayloads: (x:variantWithPayloads) => void = VariantsWithPayloadJS.printVariantWithPayloads as any;
-
-export const testVariant1Int: (x:variant1Int) => variant1Int = VariantsWithPayloadJS.testVariant1Int as any;
-
-export const testVariant1Object: (x:variant1Object) => variant1Object = VariantsWithPayloadJS.testVariant1Object as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.res b/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.res
deleted file mode 100644
index 0fc87dc..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.res
+++ /dev/null
@@ -1,91 +0,0 @@
-type payload = {
-  x: int,
-  y?: string,
-}
-
-type withPayload = [
-  | #a
-  | #b
-  | #True
-  | #Twenty
-  | #Half
-  | #c(payload)
-]
-
-@genType let testWithPayload = (x: withPayload) => x
-
-@genType
-let printVariantWithPayload = (x: withPayload) =>
-  switch x {
-  | #a => Js.log("printVariantWithPayload: a")
-  | #b => Js.log("printVariantWithPayload: b")
-  | #True => Js.log("printVariantWithPayload: True")
-  | #Twenty => Js.log("printVariantWithPayload: Twenty")
-  | #Half => Js.log("printVariantWithPayload: Half")
-  | #c(payload) => Js.log4("printVariantWithPayload x:", payload.x, "y:", payload.y)
-  }
-
-@genType
-type manyPayloads = [
-  | #one(int)
-  | #two(string, string)
-  | #three(payload)
-]
-
-@genType let testManyPayloads = (x: manyPayloads) => x
-
-@genType
-let printManyPayloads = (x: manyPayloads) =>
-  switch x {
-  | #one(n) => Js.log2("printManyPayloads one:", n)
-  | #two(s1, s2) => Js.log3("printManyPayloads two:", s1, s2)
-  | #three(payload) => Js.log4("printManyPayloads x:", payload.x, "y:", payload.y)
-  }
-
-@genType
-type simpleVariant =
-  | A
-  | B
-  | C
-
-@genType let testSimpleVariant = (x: simpleVariant) => x
-
-@genType
-type variantWithPayloads =
-  |  A
-  | B(int)
-  | C(int, int)
-  | D((int, int))
-  | E(int, string, int)
-
-@genType let testVariantWithPayloads = (x: variantWithPayloads) => x
-
-@genType
-let printVariantWithPayloads = x =>
-  switch x {
-  | A => Js.log2("printVariantWithPayloads", "A")
-  | B(x) => Js.log2("printVariantWithPayloads", "B(" ++ (string_of_int(x) ++ ")"))
-  | C(x, y) =>
-    Js.log2(
-      "printVariantWithPayloads",
-      "C(" ++ (string_of_int(x) ++ (", " ++ (string_of_int(y) ++ ")"))),
-    )
-  | D((x, y)) =>
-    Js.log2(
-      "printVariantWithPayloads",
-      "D((" ++ (string_of_int(x) ++ (", " ++ (string_of_int(y) ++ "))"))),
-    )
-  | E(x, s, y) =>
-    Js.log2(
-      "printVariantWithPayloads",
-      "E(" ++ (string_of_int(x) ++ (", " ++ (s ++ (", " ++ (string_of_int(y) ++ ")"))))),
-    )
-  }
-
-@genType type variant1Int = R(int)
-
-@genType let testVariant1Int = (x: variant1Int) => x
-
-@genType type variant1Object = R(payload)
-
-@genType let testVariant1Object = (x: variant1Object) => x
diff --git a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.res.js b/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.res.js
deleted file mode 100644
index b1bd101..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/VariantsWithPayload.res.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-function testWithPayload(x) {
-  return x;
-}
-
-function printVariantWithPayload(x) {
-  if (typeof x !== "object") {
-    if (x === "a") {
-      console.log("printVariantWithPayload: a");
-    } else if (x === "b") {
-      console.log("printVariantWithPayload: b");
-    } else if (x === "Half") {
-      console.log("printVariantWithPayload: Half");
-    } else if (x === "True") {
-      console.log("printVariantWithPayload: True");
-    } else {
-      console.log("printVariantWithPayload: Twenty");
-    }
-    return ;
-  }
-  var payload = x.VAL;
-  console.log("printVariantWithPayload x:", payload.x, "y:", payload.y);
-}
-
-function testManyPayloads(x) {
-  return x;
-}
-
-function printManyPayloads(x) {
-  var variant = x.NAME;
-  if (variant === "two") {
-    var match = x.VAL;
-    console.log("printManyPayloads two:", match[0], match[1]);
-    return ;
-  }
-  if (variant === "three") {
-    var payload = x.VAL;
-    console.log("printManyPayloads x:", payload.x, "y:", payload.y);
-    return ;
-  }
-  console.log("printManyPayloads one:", x.VAL);
-}
-
-function testSimpleVariant(x) {
-  return x;
-}
-
-function testVariantWithPayloads(x) {
-  return x;
-}
-
-function printVariantWithPayloads(x) {
-  if (typeof x !== "object") {
-    console.log("printVariantWithPayloads", "A");
-    return ;
-  }
-  switch (x.TAG) {
-    case "B" :
-        console.log("printVariantWithPayloads", "B(" + (String(x._0) + ")"));
-        return ;
-    case "C" :
-        console.log("printVariantWithPayloads", "C(" + (String(x._0) + (", " + (String(x._1) + ")"))));
-        return ;
-    case "D" :
-        var match = x._0;
-        console.log("printVariantWithPayloads", "D((" + (String(match[0]) + (", " + (String(match[1]) + "))"))));
-        return ;
-    case "E" :
-        console.log("printVariantWithPayloads", "E(" + (String(x._0) + (", " + (x._1 + (", " + (String(x._2) + ")"))))));
-        return ;
-    
-  }
-}
-
-function testVariant1Int(x) {
-  return x;
-}
-
-function testVariant1Object(x) {
-  return x;
-}
-
-export {
-  testWithPayload ,
-  printVariantWithPayload ,
-  testManyPayloads ,
-  printManyPayloads ,
-  testSimpleVariant ,
-  testVariantWithPayloads ,
-  printVariantWithPayloads ,
-  testVariant1Int ,
-  testVariant1Object ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx
deleted file mode 100644
index 9fd5e1d..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Warnings.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from Warnings.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as WarningsJS from './Warnings.res.js';
-
-export const ddd: number = WarningsJS.x as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Warnings.res b/jscomp/gentype_tests/typescript-react-example/src/Warnings.res
deleted file mode 100644
index 920eee4..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Warnings.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType("ddd")
-let x = 42
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Warnings.res.js b/jscomp/gentype_tests/typescript-react-example/src/Warnings.res.js
deleted file mode 100644
index 85e08c2..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Warnings.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var x = 42;
-
-export {
-  x ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/WeakMap.res b/jscomp/gentype_tests/typescript-react-example/src/WeakMap.res
deleted file mode 100644
index 9f77470..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/WeakMap.res
+++ /dev/null
@@ -1 +0,0 @@
-type t<'k, 'v>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/WeakMap.res.js b/jscomp/gentype_tests/typescript-react-example/src/WeakMap.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/WeakMap.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/WeakSet.res b/jscomp/gentype_tests/typescript-react-example/src/WeakSet.res
deleted file mode 100644
index cfacdaa..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/WeakSet.res
+++ /dev/null
@@ -1 +0,0 @@
-type t<'a>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/WeakSet.res.js b/jscomp/gentype_tests/typescript-react-example/src/WeakSet.res.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/WeakSet.res.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx
deleted file mode 100644
index d2baeb4..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.gen.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* TypeScript file generated from Wrapper.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as WrapperJS from './Wrapper.res.js';
-
-export type MyModuleAlias_t = number;
-
-export const MyModuleAlias_add: (_1:MyModuleAlias_t, _2:MyModuleAlias_t) => MyModuleAlias_t = WrapperJS.MyModuleAlias.add as any;
-
-export const MyModuleAlias: { add: (_1:MyModuleAlias_t, _2:MyModuleAlias_t) => MyModuleAlias_t } = WrapperJS.MyModuleAlias as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res
deleted file mode 100644
index e874c46..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-module MyModuleAlias = MyModule
diff --git a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res.js b/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res.js
deleted file mode 100644
index 29f77ba..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/Wrapper.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var MyModuleAlias;
-
-export {
-  MyModuleAlias ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx
deleted file mode 100644
index 835e5cb..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/counter.gen.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-/* TypeScript file generated from counter.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as counterJS from './counter.res.js';
-
-import type {aa as Machine_aa} from './Machine.gen';
-
-export const b: Machine_aa = counterJS.b as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/counter.res b/jscomp/gentype_tests/typescript-react-example/src/counter.res
deleted file mode 100644
index 4307cc0..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/counter.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-let b = Machine.A(12)
diff --git a/jscomp/gentype_tests/typescript-react-example/src/counter.res.js b/jscomp/gentype_tests/typescript-react-example/src/counter.res.js
deleted file mode 100644
index 10458c1..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/counter.res.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var b = {
-  TAG: "A",
-  _0: 12
-};
-
-export {
-  b ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/exportNestedValues.js b/jscomp/gentype_tests/typescript-react-example/src/exportNestedValues.js
deleted file mode 100644
index 4c1f469..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/exportNestedValues.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* @flow strict */
-
-class InnerClass {
-  static InnerStuff = {
-    innerStuffContents: { x: 34 }
-  };
-}
-
-export class TopLevelClass {
-  static MiddleLevelElements = {
-    stuff: InnerClass
-  };
-}
-
-export const ValueStartingWithUpperCaseLetter = "ValueStartingWithUpperCaseLetter";
-
-export default 42;
\ No newline at end of file
diff --git a/jscomp/gentype_tests/typescript-react-example/src/hookExample.tsx b/jscomp/gentype_tests/typescript-react-example/src/hookExample.tsx
deleted file mode 100644
index ac51a9f..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/hookExample.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import * as React from "react";
-
-export const foo = (person: { readonly name: string; readonly age: number }) => person.name;
-
-type Props = {
-  readonly person: { readonly name: string; readonly age: number };
-  readonly children: React.ReactNode;
-  readonly renderMe: React.ComponentType<{
-    randomString: string;
-    readonly poly: string;
-  }>;
-};
-
-export const make: React.FC<Props> = (x: Props) => {
-  const RenderMe = x.renderMe;
-  return (
-    <div>
-      {" "}
-      {x.person.name} {x.children}{" "}
-      <RenderMe randomString="random-string" poly="" />
-    </div>
-  );
-};
-
-class AsClassComponent extends React.PureComponent<Props> {
-  public render() {
-    const RenderMe = this.props.renderMe;
-    return (
-      <div>
-        {" "}
-        {this.props.person.name} {this.props.children}{" "}
-        <RenderMe randomString="random-string" poly="" />
-      </div>
-    );
-  }
-}
-
-export const makeRenamed = AsClassComponent;
-
-export default make;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/index.css b/jscomp/gentype_tests/typescript-react-example/src/index.css
deleted file mode 100644
index b4cc725..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/index.css
+++ /dev/null
@@ -1,5 +0,0 @@
-body {
-  margin: 0;
-  padding: 0;
-  font-family: sans-serif;
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/src/index.tsx b/jscomp/gentype_tests/typescript-react-example/src/index.tsx
deleted file mode 100644
index c9c9a2b..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/index.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import * as React from "react";
-import * as ReactDOM from "react-dom";
-import App from "./App";
-import * as ImportJsValue from "./ImportJsValue.gen";
-import * as Uncurried from "./Uncurried.gen";
-import "./index.css";
-import * as MyMath from "./MyMath";
-import * as Types from "./nested/Types.gen";
-import { Universe_Nested2_Nested3_nested3Value } from "./NestedModules.gen";
-import * as Records from "./Records.gen";
-import * as Variants from "./Variants.gen";
-import Hooks from "./Hooks.gen";
-import * as DocStrings from "./Docstrings.gen";
-import {
-  printManyPayloads,
-  printVariantWithPayload,
-  printVariantWithPayloads,
-  testManyPayloads,
-  testVariantWithPayloads,
-  testWithPayload,
-} from "./VariantsWithPayload.gen";
-import * as TestPromise from "./TestPromise.gen";
-
-const consoleLog = console.log;
-
-const intList = Types.map((x) => x + 1, Types.someIntList);
-
-const businesses = [
-  {
-    address: "Poison road",
-    name: "AcmeLTD",
-    owner: { name: "John", age: 12, address: "garage" },
-  },
-];
-
-const addresses = Records.findAllAddresses(businesses);
-
-consoleLog("indList", intList);
-consoleLog("addresses", addresses);
-
-consoleLog("index.tsx roundedNumber:", ImportJsValue.roundedNumber);
-consoleLog("index.tsx areaValue:", ImportJsValue.areaValue);
-consoleLog(
-  "index.tsx returnedFromHigherOrder:",
-  ImportJsValue.returnedFromHigherOrder
-);
-
-consoleLog(
-  "index.tsx callback:",
-  Uncurried.callback(() => 3)
-);
-consoleLog(
-  "index.tsx callback2:",
-  Uncurried.callback2({ login: () => "hello" })
-);
-consoleLog(
-  "index.tsx callback2U:",
-  Uncurried.callback2U({ loginU: () => "hello" })
-);
-Uncurried.sumU(3, 4);
-Uncurried.sumU2(3)(4);
-Uncurried.sumCurried(3, 4);
-Uncurried.sumLblCurried("hello", 3, 4);
-
-ReactDOM.render(
-  <div>
-    <App name={"Hello"} />
-    <Hooks vehicle={{ name: "Car" }} />
-  </div>,
-  document.getElementById("root") as HTMLElement
-);
-
-const x1 = Records.getPayload(Records.payloadValue).v;
-const x2 = Records.getPayloadRecord(Records.payloadValue).v;
-const x3 = Records.payloadValue.payload.v;
-const x4 = Records.getPayloadRecordPlusOne(Records.payloadValue).v;
-consoleLog("x1,x2,x3,x4 are", x1, x2, x3, x4);
-
-consoleLog(
-  "Universe_Nested2_Nested3_nested3Value: ",
-  Universe_Nested2_Nested3_nested3Value
-);
-
-consoleLog("Enums: swap(sunday) =", Variants.swap("sunday"));
-consoleLog("Enums: fortytwoOK is", Variants.fortytwoOK);
-consoleLog("Enums: fortytwoBAD is", Variants.fortytwoBAD);
-consoleLog(
-  "Variants: testConvert3to2('module') =",
-  Variants.testConvert2to3('module')
-);
-consoleLog(
-  "Variants: testConvert3to2(42) =",
-  Variants.testConvert2to3(42)
-);
-
-const absoluteValueInstance = new MyMath.AbsoluteValue();
-absoluteValueInstance.prop = -3;
-consoleLog("absoluteValueInstance", absoluteValueInstance);
-
-const propValue = ImportJsValue.useGetProp(absoluteValueInstance);
-const absValue = ImportJsValue.useGetAbs(absoluteValueInstance);
-consoleLog("ImportJsValue: getProp() =", propValue);
-consoleLog("ImportJsValue: getAbs() =", absValue);
-
-printVariantWithPayload("a");
-printVariantWithPayload("b");
-printVariantWithPayload("True");
-printVariantWithPayload("Twenty");
-printVariantWithPayload("Half");
-printVariantWithPayload(testWithPayload({ NAME: "c", VAL: { x: 15 } }));
-
-printManyPayloads({ NAME: "one", VAL: 34 });
-printManyPayloads({ NAME: "two", VAL: ["hello", "world"] });
-printManyPayloads(testManyPayloads({ NAME: "three", VAL: { x: 15 } }));
-
-printVariantWithPayloads(testVariantWithPayloads("A"));
-printVariantWithPayloads(testVariantWithPayloads({ TAG: "B", _0: 4 }));
-printVariantWithPayloads(testVariantWithPayloads({ TAG: "C", _0:1, _1:2 }));
-printVariantWithPayloads(testVariantWithPayloads({ TAG: "D", _0:1, _1:2 }));
-printVariantWithPayloads(
-  testVariantWithPayloads({ TAG: "E", _0:1, _1:"hello", _2:2 })
-);
-
-TestPromise.convert(Promise.resolve({ x: 3, s: "hello" })).then((x) =>
-  consoleLog("TestPromise result:", x.result)
-);
-
-type Props = {
-  readonly method?: "push" | "replace";
-};
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const make: React.FC<Props> = (x: Props) => {
-  return <div></div>;
-};
-
-const signedMessage = DocStrings.signMessage("hello", 42);
-consoleLog("signedMessage:", signedMessage);
-
-export default make;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx
deleted file mode 100644
index d5a66cf..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/location/location.gen.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-/* TypeScript file generated from location.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type t = { readonly id: string; readonly name: string };
diff --git a/jscomp/gentype_tests/typescript-react-example/src/location/location.res b/jscomp/gentype_tests/typescript-react-example/src/location/location.res
deleted file mode 100644
index 403a2d2..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/location/location.res
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Test file starting with lower case letter. */
-
-@genType
-type t = {
-  id: string,
-  name: string,
-}
-
-let x = 42
diff --git a/jscomp/gentype_tests/typescript-react-example/src/location/location.res.js b/jscomp/gentype_tests/typescript-react-example/src/location/location.res.js
deleted file mode 100644
index 85e08c2..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/location/location.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var x = 42;
-
-export {
-  x ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/logo.svg b/jscomp/gentype_tests/typescript-react-example/src/logo.svg
deleted file mode 100644
index 6b60c10..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
-    <g fill="#61DAFB">
-        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
-        <circle cx="420.9" cy="296.5" r="45.7"/>
-        <path d="M520.5 78.1z"/>
-    </g>
-</svg>
diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx
deleted file mode 100644
index 186aa8a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.gen.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-/* TypeScript file generated from Tuples.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as TuplesJS from './Tuples.res.js';
-
-export type coord = [number, number, (undefined | number)];
-
-export type coord2 = [number, number, (null | undefined | number)];
-
-export type person = { readonly name: string; readonly age: number };
-
-export type couple = [person, person];
-
-export const testTuple: (param:[number, number]) => number = TuplesJS.testTuple as any;
-
-export const origin: [number, number, (undefined | number)] = TuplesJS.origin as any;
-
-export const computeArea: (param:[number, number, (undefined | number)]) => number = TuplesJS.computeArea as any;
-
-export const computeAreaWithIdent: (param:coord) => number = TuplesJS.computeAreaWithIdent as any;
-
-export const computeAreaNoConverters: (param:[number, number]) => number = TuplesJS.computeAreaNoConverters as any;
-
-export const coord2d: <T1,T2,T3>(x:T1, y:T2) => [T1, T2, (undefined | T3)] = TuplesJS.coord2d as any;
-
-export const getFirstName: (param:couple) => string = TuplesJS.getFirstName as any;
-
-export const marry: (first:person, second:person) => couple = TuplesJS.marry as any;
-
-export const changeSecondAge: (param:couple) => couple = TuplesJS.changeSecondAge as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.res b/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.res
deleted file mode 100644
index ed13440..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.res
+++ /dev/null
@@ -1,40 +0,0 @@
-open Belt
-
-@genType let testTuple = ((a, b)) => a + b
-
-@genType type coord = (int, int, option<int>)
-
-@genType let origin = (0, 0, Some(0))
-
-@genType
-let computeArea = ((x, y, z)) => {
-  open Option
-  x * y * z->mapWithDefault(1, n => n)
-}
-
-@genType
-let computeAreaWithIdent = ((x, y, z): coord) => {
-  open Option
-  x * y * z->mapWithDefault(1, n => n)
-}
-
-@genType let computeAreaNoConverters = ((x: int, y: int)) => x * y
-
-@genType let coord2d = (x, y) => (x, y, None)
-
-@genType type coord2 = (int, int, Js.Nullable.t<int>)
-
-@genType
-type person = {
-  name: string,
-  age: int,
-}
-
-@genType type couple = (person, person)
-
-@genType let getFirstName = ((first, _second): couple) => first.name
-
-@genType let marry = (first, second): couple => (first, second)
-
-@genType
-let changeSecondAge = ((first, second): couple): couple => (first, {...second, age: second.age + 1})
diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.res.js b/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.res.js
deleted file mode 100644
index 6aaff47..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/nested/Tuples.res.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
-
-function testTuple(param) {
-  return param[0] + param[1] | 0;
-}
-
-function computeArea(param) {
-  return Math.imul(Math.imul(param[0], param[1]), Belt_Option.mapWithDefault(param[2], 1, (function (n) {
-                    return n;
-                  })));
-}
-
-function computeAreaWithIdent(param) {
-  return Math.imul(Math.imul(param[0], param[1]), Belt_Option.mapWithDefault(param[2], 1, (function (n) {
-                    return n;
-                  })));
-}
-
-function computeAreaNoConverters(param) {
-  return Math.imul(param[0], param[1]);
-}
-
-function coord2d(x, y) {
-  return [
-          x,
-          y,
-          undefined
-        ];
-}
-
-function getFirstName(param) {
-  return param[0].name;
-}
-
-function marry(first, second) {
-  return [
-          first,
-          second
-        ];
-}
-
-function changeSecondAge(param) {
-  var second = param[1];
-  return [
-          param[0],
-          {
-            name: second.name,
-            age: second.age + 1 | 0
-          }
-        ];
-}
-
-var origin = [
-  0,
-  0,
-  0
-];
-
-export {
-  testTuple ,
-  origin ,
-  computeArea ,
-  computeAreaWithIdent ,
-  computeAreaNoConverters ,
-  coord2d ,
-  getFirstName ,
-  marry ,
-  changeSecondAge ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx
deleted file mode 100644
index f31439c..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.gen.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-/* TypeScript file generated from Types.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as TypesJS from './Types.res.js';
-
-import type {Json_t as Js_Json_t} from '../../src/shims/Js.shim';
-
-import type {M_t__ as TypeNameSanitize_M_t__} from '../../src/TypeNameSanitize.gen';
-
-import type {list} from '../../src/shims/RescriptPervasives.shim';
-
-import type {t_ as TypeNameSanitize_t_} from '../../src/TypeNameSanitize.gen';
-
-import type {t as Location_t} from '../../src/location/location.gen';
-
-export type t = number;
-
-export type typeWithVars<x,y,z> = 
-    { TAG: "A"; _0: x; _1: y }
-  | { TAG: "B"; _0: z };
-
-export type tree = {
-  readonly label: string; 
-  readonly left?: tree; 
-  readonly right?: tree
-};
-
-export type selfRecursive = { readonly self: selfRecursive };
-
-export type mutuallyRecursiveA = { readonly b: mutuallyRecursiveB };
-
-export type mutuallyRecursiveB = { readonly a: mutuallyRecursiveA };
-
-export abstract class opaqueVariant { protected opaque!: any }; /* simulate opaque types */
-
-export type twice<a> = [a, a];
-
-export type genTypeMispelled = number;
-
-export type dictString = {[id: string]: string};
-
-export type nullOrString = (null | string);
-
-export type nullOrString2 = (null | string);
-
-export type record = { readonly i: number; readonly s: string };
-
-export type decorator<a,b> = (_1:a) => b;
-
-export type marshalFields = {
-  readonly _rec: string; 
-  readonly _switch: string; 
-  readonly switch: string; 
-  readonly __: string; 
-  readonly ___: string; 
-  readonly foo__: string; 
-  readonly _foo__: string; 
-  readonly _Uppercase: string; 
-  readonly _Uppercase__: string
-};
-
-export type marshalMutableField = { _match: number };
-
-export type ocaml_array<a> = a[];
-
-export type someRecord = { readonly id: number };
-
-export type instantiateTypeParameter = ocaml_array<someRecord>;
-
-export type vector<a> = [a, a];
-export type Vector<a> = vector<a>;
-
-export type date = Date;
-
-export type i64A = [number, number];
-
-export type i64B = [number, number];
-
-export type ObjectId_t = number;
-
-export type tPrimed = [TypeNameSanitize_t_, TypeNameSanitize_M_t__];
-
-export const someIntList: list<number> = TypesJS.someIntList as any;
-
-export const map: <T1,T2>(_1:((_1:T1) => T2), _2:list<T1>) => list<T2> = TypesJS.map as any;
-
-export const swap: (tree:tree) => tree = TypesJS.swap as any;
-
-export const selfRecursiveConverter: (param:selfRecursive) => selfRecursive = TypesJS.selfRecursiveConverter as any;
-
-export const mutuallyRecursiveConverter: (param:mutuallyRecursiveA) => mutuallyRecursiveB = TypesJS.mutuallyRecursiveConverter as any;
-
-export const testFunctionOnOptionsAsArgument: <T1,a>(a:(undefined | a), foo:((_1:(undefined | a)) => T1)) => T1 = TypesJS.testFunctionOnOptionsAsArgument as any;
-
-export const stringT: string = TypesJS.stringT as any;
-
-export const jsStringT: string = TypesJS.jsStringT as any;
-
-export const jsString2T: string = TypesJS.jsString2T as any;
-
-export const jsonStringify: (_1:Js_Json_t) => string = TypesJS.jsonStringify as any;
-
-export const testConvertNull: (x:(null | record)) => (null | record) = TypesJS.testConvertNull as any;
-
-export const testConvertLocation: (x:Location_t) => Location_t = TypesJS.testConvertLocation as any;
-
-export const testMarshalFields: marshalFields = TypesJS.testMarshalFields as any;
-
-export const setMatch: (x:marshalMutableField) => void = TypesJS.setMatch as any;
-
-export const testInstantiateTypeParameter: (x:instantiateTypeParameter) => instantiateTypeParameter = TypesJS.testInstantiateTypeParameter as any;
-
-export const currentTime: Date = TypesJS.currentTime as any;
-
-export const i64Const: i64B = TypesJS.i64Const as any;
-
-export const optFunction: (undefined | (() => number)) = TypesJS.optFunction as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res b/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res
deleted file mode 100644
index 189f406..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res
+++ /dev/null
@@ -1,144 +0,0 @@
-@@warning("-32")
-
-@genType type t = int
-
-@genType let someIntList = list{1, 2, 3}
-
-@genType let map = List.map
-
-@genType
-type typeWithVars<'x, 'y, 'z> =
-  | A('x, 'y)
-  | B('z)
-
-@genType type rec tree = {"label": string, "left": option<tree>, "right": option<tree>}
-
-/*
- * A tree is a recursive type which does not require any conversion (JS object).
- * All is well.
- */
-@genType
-let rec swap = (tree: tree): tree =>
-  {
-    "label": tree["label"],
-    "left": tree["right"]->Belt.Option.map(swap),
-    "right": tree["left"]->Belt.Option.map(swap),
-  }
-
-@genType type rec selfRecursive = {self: selfRecursive}
-
-@genType type rec mutuallyRecursiveA = {b: mutuallyRecursiveB}
-and mutuallyRecursiveB = {a: mutuallyRecursiveA}
-
-/*
- * This is a recursive type which requires conversion (a record).
- * Only a shallow conversion of the top-level element is performed.
- */
-@genType let selfRecursiveConverter = ({self}) => self
-
-/*
- * This is a mutually recursive type which requires conversion (a record).
- * Only a shallow conversion of the two top-level elements is performed.
- */
-@genType let mutuallyRecursiveConverter = ({b}) => b
-
-@genType let testFunctionOnOptionsAsArgument = (a: option<'a>, foo) => foo(a)
-
-@genType.opaque
-type opaqueVariant =
-  | A
-  | B
-
-@genType let stringT: String.t = "a"
-
-@genType let jsStringT: Js.String.t = "a"
-
-@genType let jsString2T: Js.String2.t = "a"
-
-@genType type twice<'a> = ('a, 'a)
-
-@gentype
-type genTypeMispelled = int
-
-@genType type dictString = Js.Dict.t<string>
-
-@genType let jsonStringify = Js.Json.stringify
-
-@genType type nullOrString = Js.Null.t<string>
-
-@genType type nullOrString2 = Js.null<string>
-
-type record = {
-  i: int,
-  s: string,
-}
-
-@genType let testConvertNull = (x: Js.Null.t<record>) => x
-
-@genType type decorator<'a, 'b> = 'a => 'b constraint 'a = int constraint 'b = _ => _
-
-@genType let testConvertLocation = (x: Location.t) => x
-
-/* ReScript's marshaling rules. */
-@genType
-type marshalFields = {
-  "_rec": string,
-  "_switch": string,
-  "switch": string,
-  "__": string,
-  "___": string,
-  "foo__": string,
-  "_foo__": string,
-  "_Uppercase": string,
-  "_Uppercase__": string,
-}
-
-@genType
-let testMarshalFields: marshalFields = {
-  "_rec": "rec",
-  "_switch" /* reason keywords are not recognized */: "_switch",
-  "switch": "switch",
-  "__": "__",
-  "___": "_",
-  "foo__": "foo",
-  "_foo__": "_foo",
-  "_Uppercase": "Uppercase",
-  "_Uppercase__": "_Uppercase",
-}
-
-@genType type marshalMutableField = {@set "_match": int}
-
-@genType let setMatch = (x: marshalMutableField) => x["_match"] = 34
-
-type ocaml_array<'a> = array<'a>
-
-// This should be considered annotated automatically.
-type someRecord = {id: int}
-
-type instantiateTypeParameter = ocaml_array<someRecord>
-
-@genType let testInstantiateTypeParameter = (x: instantiateTypeParameter) => x
-
-@genType @genType.as("Vector")
-type vector<'a> = ('a, 'a)
-
-@genType type date = Js.Date.t
-
-@genType let currentTime = Js.Date.make()
-
-@genType type i64A = Int64.t
-
-@genType type i64B = int64
-
-@genType let i64Const: i64B = 34L
-
-@genType let optFunction = Some(() => 3)
-
-module ObjectId: {
-  @genType type t = int
-} = {
-  type t = int
-  let x = 1
-}
-
-@genType type tPrimed = (TypeNameSanitize.t', TypeNameSanitize.M.t'')
diff --git a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res.js b/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res.js
deleted file mode 100644
index ef7c09c..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/nested/Types.res.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as List from "rescript/lib/es6/list.js";
-import * as Curry from "rescript/lib/es6/curry.js";
-import * as Belt_Option from "rescript/lib/es6/belt_Option.js";
-
-function swap(tree) {
-  return {
-          label: tree.label,
-          left: Belt_Option.map(tree.right, swap),
-          right: Belt_Option.map(tree.left, swap)
-        };
-}
-
-function selfRecursiveConverter(param) {
-  return param.self;
-}
-
-function mutuallyRecursiveConverter(param) {
-  return param.b;
-}
-
-function testFunctionOnOptionsAsArgument(a, foo) {
-  return Curry._1(foo, a);
-}
-
-function jsonStringify(prim) {
-  return JSON.stringify(prim);
-}
-
-function testConvertNull(x) {
-  return x;
-}
-
-function testConvertLocation(x) {
-  return x;
-}
-
-var testMarshalFields = {
-  _rec: "rec",
-  _switch: "_switch",
-  switch: "switch",
-  __: "__",
-  ___: "_",
-  foo__: "foo",
-  _foo__: "_foo",
-  _Uppercase: "Uppercase",
-  _Uppercase__: "_Uppercase"
-};
-
-function setMatch(x) {
-  x._match = 34;
-}
-
-function testInstantiateTypeParameter(x) {
-  return x;
-}
-
-var currentTime = new Date();
-
-var optFunction = (function (param) {
-    return 3;
-  });
-
-var ObjectId = {};
-
-var someIntList = {
-  hd: 1,
-  tl: {
-    hd: 2,
-    tl: {
-      hd: 3,
-      tl: /* [] */0
-    }
-  }
-};
-
-var map = List.map;
-
-var stringT = "a";
-
-var jsStringT = "a";
-
-var jsString2T = "a";
-
-var i64Const = [
-  0,
-  34
-];
-
-export {
-  someIntList ,
-  map ,
-  swap ,
-  selfRecursiveConverter ,
-  mutuallyRecursiveConverter ,
-  testFunctionOnOptionsAsArgument ,
-  stringT ,
-  jsStringT ,
-  jsString2T ,
-  jsonStringify ,
-  testConvertNull ,
-  testConvertLocation ,
-  testMarshalFields ,
-  setMatch ,
-  testInstantiateTypeParameter ,
-  currentTime ,
-  i64Const ,
-  optFunction ,
-  ObjectId ,
-}
-/* currentTime Not a pure module */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/react-app-env.d.ts b/jscomp/gentype_tests/typescript-react-example/src/react-app-env.d.ts
deleted file mode 100644
index 6431bc5..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/react-app-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="react-scripts" />
diff --git a/jscomp/gentype_tests/typescript-react-example/src/shims/Js.shim.ts b/jscomp/gentype_tests/typescript-react-example/src/shims/Js.shim.ts
deleted file mode 100644
index 7c73511..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/shims/Js.shim.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type Json_t = unknown;
-
-export type t = unknown;
-
-export type TypedArray2_Uint8Array_t = Uint8Array;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/shims/ReactEvent.shim.ts b/jscomp/gentype_tests/typescript-react-example/src/shims/ReactEvent.shim.ts
deleted file mode 100644
index 4ad7494..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/shims/ReactEvent.shim.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-// eslint-disable-next-line max-classes-per-file
-export abstract class Animation_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Clipboard_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Composition_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Focus_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Form_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Keyboard_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Image_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Media_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Selection_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Synthetic_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Touch_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Transition_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class UI_t {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Wheel_t {
-  protected opaque: unknown;
-}
-
-export type inputFocusEvent = React.FocusEvent<HTMLInputElement>;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/shims/RescriptPervasives.shim.ts b/jscomp/gentype_tests/typescript-react-example/src/shims/RescriptPervasives.shim.ts
deleted file mode 100644
index d83f49c..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/shims/RescriptPervasives.shim.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const $$Array = require("bs-platform/lib/js/array");
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class EmptyList {
-  protected opaque: unknown;
-}
-
-// eslint-disable-next-line max-classes-per-file
-export abstract class Cons<T> {
-  protected opaque!: T;
-}
-
-export type list<T> = Cons<T> | EmptyList;
-
-export function cons<T>(itm: T, lst: list<T>) : list<T> {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return /* :: */ [itm, lst] as any;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const emptyList : EmptyList = /* [] */ 0 as any;
-
-export const fromArray = $$Array.to_list;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx
deleted file mode 100644
index 71445c1..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from 404.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as _404JS from './404.res.js';
-
-export const x: number = _404JS.x as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.res b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.res
deleted file mode 100644
index 981389a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-let x = 123
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.res.js b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.res.js
deleted file mode 100644
index b48a2a7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/404.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var x = 123;
-
-export {
-  x ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx
deleted file mode 100644
index 2da19d8..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from AppModal.web.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as AppModal_webJS from './AppModal.web.res.js';
-
-export const x: number = AppModal_webJS.x as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.res b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.res
deleted file mode 100644
index 981389a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-let x = 123
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.res.js b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.res.js
deleted file mode 100644
index b48a2a7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/AppModal.web.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var x = 123;
-
-export {
-  x ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx
deleted file mode 100644
index 334ed85..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from _under.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as _underJS from './_under.res.js';
-
-export const x: number = _underJS.x as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.res b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.res
deleted file mode 100644
index 981389a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-let x = 123
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.res.js b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.res.js
deleted file mode 100644
index b48a2a7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/_under.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var x = 123;
-
-export {
-  x ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx
deleted file mode 100644
index f56f140..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.gen.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-/* TypeScript file generated from with_underscore.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-import * as with_underscoreJS from './with_underscore.res.js';
-
-export const x: number = with_underscoreJS.x as any;
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.res b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.res
deleted file mode 100644
index 981389a..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-let x = 123
diff --git a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.res.js b/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.res.js
deleted file mode 100644
index b48a2a7..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/strange_file_names/with_underscore.res.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var x = 123;
-
-export {
-  x ,
-}
-/* No side effect */
diff --git a/jscomp/gentype_tests/typescript-react-example/src/testReferences.ts b/jscomp/gentype_tests/typescript-react-example/src/testReferences.ts
deleted file mode 100644
index 1d0efa3..0000000
--- a/jscomp/gentype_tests/typescript-react-example/src/testReferences.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* @flow strict */
-
-import * as References from "./References.gen";
-
-const r: { contents: number } = { contents: 34 };
-
-r.contents = 42;
-
-export const n: number = References.access(r);
-
-const ar: References.t<number> = References.make(34);
-
-References.set(ar, 42);
-
-export const an: number = References.get(ar);
diff --git a/jscomp/gentype_tests/typescript-react-example/tsconfig.json b/jscomp/gentype_tests/typescript-react-example/tsconfig.json
deleted file mode 100644
index 1992ba5..0000000
--- a/jscomp/gentype_tests/typescript-react-example/tsconfig.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "build/dist",
-    "module": "esnext",
-    "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "sourceMap": true,
-    "allowJs": true,
-    "jsx": "react",
-    "skipLibCheck": true,
-    "moduleResolution": "node",
-    "rootDir": ".",
-    "forceConsistentCasingInFileNames": true,
-    "noImplicitReturns": true,
-    "noImplicitThis": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "noUnusedLocals": true,
-    "strictPropertyInitialization": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "node_modules",
-    "build",
-    "scripts",
-    "acceptance-tests",
-    "webpack",
-    "jest",
-    "src/setupTests.ts",
-    "src/AutoAnnotate.bs.js"
-  ]
-}
diff --git a/jscomp/gentype_tests/typescript-react-example/tsconfig.prod.json b/jscomp/gentype_tests/typescript-react-example/tsconfig.prod.json
deleted file mode 100644
index 4144216..0000000
--- a/jscomp/gentype_tests/typescript-react-example/tsconfig.prod.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "./tsconfig.json"
-}
\ No newline at end of file
diff --git a/jscomp/gentype_tests/typescript-react-example/tsconfig.test.json b/jscomp/gentype_tests/typescript-react-example/tsconfig.test.json
deleted file mode 100644
index 65ffdd4..0000000
--- a/jscomp/gentype_tests/typescript-react-example/tsconfig.test.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "commonjs"
-  }
-}
\ No newline at end of file
diff --git a/jscomp/js_parser/.ocamlformat b/jscomp/js_parser/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/js_parser/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/js_parser/comment_attachment.ml b/jscomp/js_parser/comment_attachment.ml
deleted file mode 100644
index 4866a47..0000000
--- a/jscomp/js_parser/comment_attachment.ml
+++ /dev/null
@@ -1,779 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Ast = Flow_ast
-open Flow_ast
-open Parser_env
-
-let id = Flow_ast_mapper.id
-
-let map_loc = Flow_ast_mapper.map_loc
-
-let map_opt = Flow_ast_mapper.map_opt
-
-let id_list_last (map : 'a -> 'a) (lst : 'a list) : 'a list =
-  match List.rev lst with
-  | [] -> lst
-  | hd :: tl ->
-    let hd' = map hd in
-    if hd == hd' then
-      lst
-    else
-      List.rev (hd' :: tl)
-
-(* Mapper that removes all trailing comments that appear after a given position in an AST node *)
-class ['loc] trailing_comments_remover ~after_pos =
-  object (this)
-    inherit ['loc] Flow_ast_mapper.mapper
-
-    method! syntax comments =
-      let open Syntax in
-      let { trailing; _ } = comments in
-      let trailing' =
-        List.filter (fun (loc, _) -> Loc.(pos_cmp loc.start after_pos < 0)) trailing
-      in
-      if List.length trailing = List.length trailing' then
-        comments
-      else
-        { comments with trailing = trailing' }
-
-    method! array _loc expr =
-      let open Ast.Expression.Array in
-      let { comments; _ } = expr in
-      id this#syntax_opt comments expr (fun comments' -> { expr with comments = comments' })
-
-    method! array_type t =
-      let open Ast.Type.Array in
-      let { comments; _ } = t in
-      id this#syntax_opt comments t (fun comments' -> { t with comments = comments' })
-
-    method! assignment _loc expr =
-      let open Ast.Expression.Assignment in
-      let { right; comments; _ } = expr in
-      let right' = this#expression right in
-      let comments' = this#syntax_opt comments in
-      if right == right' && comments == comments' then
-        expr
-      else
-        { expr with right = right'; comments = comments' }
-
-    method! binary _loc expr =
-      let open Ast.Expression.Binary in
-      let { right; comments; _ } = expr in
-      let right' = this#expression right in
-      let comments' = this#syntax_opt comments in
-      if right == right' && comments == comments' then
-        expr
-      else
-        { expr with right = right'; comments = comments' }
-
-    method! block _loc stmt =
-      let open Ast.Statement.Block in
-      let { comments; _ } = stmt in
-      id this#syntax_opt comments stmt (fun comments' -> { stmt with comments = comments' })
-
-    method! call _annot expr =
-      let open Ast.Expression.Call in
-      let { arguments; comments; _ } = expr in
-      let arguments' = this#call_arguments arguments in
-      let comments' = this#syntax_opt comments in
-      if arguments == arguments' && comments == comments' then
-        expr
-      else
-        { expr with arguments = arguments'; comments = comments' }
-
-    method! call_arguments arg_list =
-      let open Ast.Expression.ArgList in
-      let (loc, { arguments; comments }) = arg_list in
-      id this#syntax_opt comments arg_list (fun comments' ->
-          (loc, { arguments; comments = comments' })
-      )
-
-    method! call_type_args targs =
-      let open Ast.Expression.CallTypeArgs in
-      let (loc, { arguments; comments }) = targs in
-      id this#syntax_opt comments targs (fun comments' -> (loc, { arguments; comments = comments' }))
-
-    method! class_ _loc cls =
-      let open Ast.Class in
-      let { body; comments; _ } = cls in
-      let body' = this#class_body body in
-      let comments' = this#syntax_opt comments in
-      if body == body' && comments == comments' then
-        cls
-      else
-        { cls with body = body'; comments = comments' }
-
-    method! class_body body =
-      let open Ast.Class.Body in
-      let (loc, { body = _body; comments }) = body in
-      id this#syntax_opt comments body (fun comments' ->
-          (loc, { body = _body; comments = comments' })
-      )
-
-    method! class_extends _loc extends =
-      let open Ast.Class.Extends in
-      let { expr; targs; _ } = extends in
-      if targs = None then
-        id this#expression expr extends (fun expr' -> { extends with expr = expr' })
-      else
-        id (map_opt this#type_args) targs extends (fun targs' -> { extends with targs = targs' })
-
-    method! class_implements implements =
-      let open Ast.Class.Implements in
-      let (loc, { interfaces; comments }) = implements in
-      id (id_list_last this#class_implements_interface) interfaces implements (fun interfaces' ->
-          (loc, { interfaces = interfaces'; comments })
-      )
-
-    method! class_implements_interface interface =
-      let open Ast.Class.Implements.Interface in
-      let (loc, { id = id_; targs }) = interface in
-      if targs = None then
-        id this#identifier id_ interface (fun id' -> (loc, { id = id'; targs }))
-      else
-        id (map_opt this#type_args) targs interface (fun targs' ->
-            (loc, { id = id_; targs = targs' })
-        )
-
-    method! computed_key key =
-      let open Ast.ComputedKey in
-      let (loc, { expression; comments }) = key in
-      id this#syntax_opt comments key (fun comments' -> (loc, { expression; comments = comments' }))
-
-    method! conditional _loc expr =
-      let open Ast.Expression.Conditional in
-      let { alternate; comments; _ } = expr in
-      let alternate' = this#expression alternate in
-      let comments' = this#syntax_opt comments in
-      if alternate == alternate' && comments == comments' then
-        expr
-      else
-        { expr with alternate = alternate'; comments = comments' }
-
-    method! function_ _loc func =
-      let open Ast.Function in
-      let { body; comments; _ } = func in
-      let body' = this#function_body_any body in
-      let comments' = this#syntax_opt comments in
-      if body == body' && comments == comments' then
-        func
-      else
-        { func with body = body'; comments = comments' }
-
-    method! function_params (loc, params) =
-      let open Ast.Function.Params in
-      let { comments; _ } = params in
-      id this#syntax_opt comments (loc, params) (fun comments' ->
-          (loc, { params with comments = comments' })
-      )
-
-    method! function_type _loc func =
-      let open Ast.Type.Function in
-      let { return; comments; _ } = func in
-      let return' = this#type_ return in
-      let comments' = this#syntax_opt comments in
-      if return == return' && comments == comments' then
-        func
-      else
-        { func with return = return'; comments = comments' }
-
-    method! generic_identifier_type git =
-      let open Ast.Type.Generic.Identifier in
-      match git with
-      | Unqualified i -> id this#identifier i git (fun i -> Unqualified i)
-      | Qualified (loc, ({ id; _ } as qualified)) ->
-        let id' = this#identifier id in
-        if id == id' then
-          git
-        else
-          Qualified (loc, { qualified with id = id' })
-
-    method! import _loc expr =
-      let open Ast.Expression.Import in
-      let { comments; _ } = expr in
-      id this#syntax_opt comments expr (fun comments' -> { expr with comments = comments' })
-
-    method! interface_type _loc t =
-      let open Ast.Type.Interface in
-      let { body; comments; _ } = t in
-      let body' = map_loc this#object_type body in
-      let comments' = this#syntax_opt comments in
-      if body == body' && comments == comments' then
-        t
-      else
-        { t with body = body'; comments = comments' }
-
-    method! intersection_type _loc t =
-      let { Ast.Type.Intersection.types = (t0, t1, ts); comments } = t in
-      let (t1', ts') =
-        match ts with
-        | [] -> (this#type_ t1, [])
-        | _ -> (t1, id_list_last this#type_ ts)
-      in
-      let comments' = this#syntax_opt comments in
-      if t1 == t1' && ts == ts' && comments == comments' then
-        t
-      else
-        { Ast.Type.Intersection.types = (t0, t1', ts'); comments = comments' }
-
-    method! jsx_element _loc elem =
-      let open Ast.JSX in
-      let { comments; _ } = elem in
-      id this#syntax_opt comments elem (fun comments' -> { elem with comments = comments' })
-
-    method! jsx_fragment _loc frag =
-      let open Ast.JSX in
-      let { frag_comments = comments; _ } = frag in
-      id this#syntax_opt comments frag (fun comments' -> { frag with frag_comments = comments' })
-
-    method! logical _loc expr =
-      let open Ast.Expression.Logical in
-      let { right; comments; _ } = expr in
-      let right' = this#expression right in
-      let comments' = this#syntax_opt comments in
-      if right == right' && comments == comments' then
-        expr
-      else
-        { expr with right = right'; comments = comments' }
-
-    method! new_ _loc expr =
-      let open Ast.Expression.New in
-      let { callee; targs; arguments; comments } = expr in
-      let comments' = this#syntax_opt comments in
-      match (targs, arguments) with
-      (* new Callee<T>() *)
-      | (_, Some _) ->
-        let arguments' = map_opt this#call_arguments arguments in
-        if arguments == arguments' && comments == comments' then
-          expr
-        else
-          { expr with arguments = arguments'; comments = comments' }
-      (* new Callee<T> *)
-      | (Some _, _) ->
-        let targs' = map_opt this#call_type_args targs in
-        if targs == targs' && comments == comments' then
-          expr
-        else
-          { expr with targs = targs'; comments = comments' }
-      (* new Callee *)
-      | (None, None) ->
-        let callee' = this#expression callee in
-        if callee == callee' && comments == comments' then
-          expr
-        else
-          { expr with callee = callee'; comments = comments' }
-
-    method! member _loc expr =
-      let open Ast.Expression.Member in
-      let { property; comments; _ } = expr in
-      let property' = this#member_property property in
-      let comments' = this#syntax_opt comments in
-      if property == property' && comments == comments' then
-        expr
-      else
-        { expr with property = property'; comments = comments' }
-
-    method! object_ _loc expr =
-      let open Ast.Expression.Object in
-      let { comments; _ } = expr in
-      id this#syntax_opt comments expr (fun comments' -> { expr with comments = comments' })
-
-    method! object_type _loc obj =
-      let open Ast.Type.Object in
-      let { comments; _ } = obj in
-      id this#syntax_opt comments obj (fun comments' -> { obj with comments = comments' })
-
-    method! predicate pred =
-      let open Ast.Type.Predicate in
-      let (loc, { kind; comments }) = pred in
-      id this#syntax_opt comments pred (fun comments' -> (loc, { kind; comments = comments' }))
-
-    method! sequence _loc expr =
-      let open Ast.Expression.Sequence in
-      let { expressions; comments } = expr in
-      let expressions' = id_list_last this#expression expressions in
-      let comments' = this#syntax_opt comments in
-      if expressions == expressions' && comments == comments' then
-        expr
-      else
-        { expressions = expressions'; comments = comments' }
-
-    method! template_literal _loc expr =
-      let open Ast.Expression.TemplateLiteral in
-      let { comments; _ } = expr in
-      id this#syntax_opt comments expr (fun comments' -> { expr with comments = comments' })
-
-    method! tuple_type t =
-      let open Ast.Type.Tuple in
-      let { comments; _ } = t in
-      id this#syntax_opt comments t (fun comments' -> { t with comments = comments' })
-
-    method! type_cast _loc expr =
-      let open Ast.Expression.TypeCast in
-      let { comments; _ } = expr in
-      id this#syntax_opt comments expr (fun comments' -> { expr with comments = comments' })
-
-    method! type_params tparams =
-      let open Ast.Type.TypeParams in
-      let (loc, { params; comments }) = tparams in
-      id this#syntax_opt comments tparams (fun comments' -> (loc, { params; comments = comments' }))
-
-    method! union_type _loc t =
-      let { Ast.Type.Union.types = (t0, t1, ts); comments } = t in
-      let (t1', ts') =
-        match ts with
-        | [] -> (this#type_ t1, [])
-        | _ -> (t1, id_list_last this#type_ ts)
-      in
-      let comments' = this#syntax_opt comments in
-      if t1 == t1' && ts == ts' && comments == comments' then
-        t
-      else
-        { Ast.Type.Union.types = (t0, t1', ts'); comments = comments' }
-
-    method! variable_declarator ~kind decl =
-      let open Ast.Statement.VariableDeclaration.Declarator in
-      let (loc, { id = ident; init }) = decl in
-      match init with
-      | None ->
-        id (this#variable_declarator_pattern ~kind) ident decl (fun ident' ->
-            (loc, { id = ident'; init })
-        )
-      | Some init ->
-        id this#expression init decl (fun init' -> (loc, { id = ident; init = Some init' }))
-  end
-
-type trailing_and_remover_result = {
-  trailing: Loc.t Comment.t list;
-  remove_trailing: 'a. 'a -> (Loc.t trailing_comments_remover -> 'a -> 'a) -> 'a;
-}
-
-(* Returns a remover function which removes comments beginning after the previous token.
-   No trailing comments are returned, since all comments since the last loc should be removed. *)
-let trailing_and_remover_after_last_loc : Parser_env.env -> trailing_and_remover_result =
- fun env ->
-  let open Loc in
-  let remover =
-    match Parser_env.last_loc env with
-    | None -> None
-    | Some _ when not (Peek.has_eaten_comments env) -> None
-    | Some last_loc ->
-      Parser_env.consume_comments_until env last_loc._end;
-      let remover = new trailing_comments_remover ~after_pos:last_loc._end in
-      Some remover
-  in
-  {
-    trailing = [];
-    remove_trailing =
-      (fun node f ->
-        match remover with
-        | None -> node
-        | Some remover -> f remover node);
-  }
-
-(* Consumes and returns comments on the same line as the previous token. Also returns a remover
-   function which can be used to remove comments beginning after the previous token's line. *)
-let trailing_and_remover_after_last_line : Parser_env.env -> trailing_and_remover_result =
- fun env ->
-  let open Loc in
-  let (trailing, remover) =
-    match Parser_env.last_loc env with
-    | None -> ([], None)
-    | Some _ when not (Peek.has_eaten_comments env) -> (Eat.comments_until_next_line env, None)
-    | Some last_loc ->
-      Parser_env.consume_comments_until env last_loc._end;
-      let trailing = Eat.comments_until_next_line env in
-      let next_line_start = { line = last_loc._end.line + 1; column = 0 } in
-      let remover = new trailing_comments_remover ~after_pos:next_line_start in
-      (trailing, Some remover)
-  in
-  {
-    trailing;
-    remove_trailing =
-      (fun node f ->
-        match remover with
-        | None -> node
-        | Some remover -> f remover node);
-  }
-
-let trailing_and_remover : Parser_env.env -> trailing_and_remover_result =
- fun env ->
-  if Peek.is_line_terminator env then
-    trailing_and_remover_after_last_line env
-  else
-    trailing_and_remover_after_last_loc env
-
-let id_remove_trailing env id =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing id (fun remover id -> remover#identifier id)
-
-let expression_remove_trailing env expr =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing expr (fun remover expr -> remover#expression expr)
-
-let block_remove_trailing env block =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing block (fun remover (loc, str) -> (loc, remover#block loc str))
-
-let type_params_remove_trailing env tparams =
-  match tparams with
-  | None -> None
-  | Some tparams ->
-    let { remove_trailing; _ } = trailing_and_remover env in
-    Some (remove_trailing tparams (fun remover tparams -> remover#type_params tparams))
-
-let type_remove_trailing env ty =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing ty (fun remover ty -> remover#type_ ty)
-
-let type_annotation_hint_remove_trailing env annot =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing annot (fun remover annot -> remover#type_annotation_hint annot)
-
-let function_params_remove_trailing env params =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing params (fun remover params -> remover#function_params params)
-
-let predicate_remove_trailing env pred =
-  match pred with
-  | None -> None
-  | Some pred ->
-    let { remove_trailing; _ } = trailing_and_remover env in
-    Some (remove_trailing pred (fun remover pred -> remover#predicate pred))
-
-let object_key_remove_trailing env key =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing key (fun remover key -> remover#object_key key)
-
-let generic_type_remove_trailing env ty =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing ty (fun remover ty -> map_loc remover#generic_type ty)
-
-let generic_type_list_remove_trailing env extends =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing extends (fun remover extends ->
-      id_list_last (map_loc remover#generic_type) extends
-  )
-
-let class_implements_remove_trailing env implements =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing implements (fun remover impl -> remover#class_implements impl)
-
-let string_literal_remove_trailing env str =
-  let { remove_trailing; _ } = trailing_and_remover env in
-  remove_trailing str (fun remover (loc, str) -> (loc, remover#string_literal_type loc str))
-
-let statement_add_comments
-    ((loc, stmt) : (Loc.t, Loc.t) Statement.t) (comments : (Loc.t, unit) Syntax.t option) :
-    (Loc.t, Loc.t) Statement.t =
-  let open Statement in
-  let merge_comments inner = Flow_ast_utils.merge_comments ~inner ~outer:comments in
-  let merge_comments_with_internal inner =
-    Flow_ast_utils.merge_comments_with_internal ~inner ~outer:comments
-  in
-  ( loc,
-    match stmt with
-    | Block ({ Block.comments; _ } as s) ->
-      Block { s with Block.comments = merge_comments_with_internal comments }
-    | Break ({ Break.comments; _ } as s) ->
-      Break { s with Break.comments = merge_comments comments }
-    | ClassDeclaration ({ Class.comments; _ } as s) ->
-      ClassDeclaration { s with Class.comments = merge_comments comments }
-    | Continue ({ Continue.comments; _ } as s) ->
-      Continue { s with Continue.comments = merge_comments comments }
-    | Debugger { Debugger.comments } -> Debugger { Debugger.comments = merge_comments comments }
-    | DeclareClass ({ DeclareClass.comments; _ } as s) ->
-      DeclareClass { s with DeclareClass.comments = merge_comments comments }
-    | DeclareExportDeclaration ({ DeclareExportDeclaration.comments; _ } as s) ->
-      DeclareExportDeclaration
-        { s with DeclareExportDeclaration.comments = merge_comments comments }
-    | DeclareFunction ({ DeclareFunction.comments; _ } as s) ->
-      DeclareFunction { s with DeclareFunction.comments = merge_comments comments }
-    | DeclareInterface ({ Interface.comments; _ } as s) ->
-      DeclareInterface { s with Interface.comments = merge_comments comments }
-    | DeclareModule ({ DeclareModule.comments; _ } as s) ->
-      DeclareModule { s with DeclareModule.comments = merge_comments comments }
-    | DeclareModuleExports ({ DeclareModuleExports.comments; _ } as s) ->
-      DeclareModuleExports { s with DeclareModuleExports.comments = merge_comments comments }
-    | DeclareTypeAlias ({ TypeAlias.comments; _ } as s) ->
-      DeclareTypeAlias { s with TypeAlias.comments = merge_comments comments }
-    | DeclareOpaqueType ({ OpaqueType.comments; _ } as s) ->
-      DeclareOpaqueType { s with OpaqueType.comments = merge_comments comments }
-    | DeclareVariable ({ DeclareVariable.comments; _ } as s) ->
-      DeclareVariable { s with DeclareVariable.comments = merge_comments comments }
-    | DoWhile ({ DoWhile.comments; _ } as s) ->
-      DoWhile { s with DoWhile.comments = merge_comments comments }
-    | Empty { Empty.comments } -> Empty { Empty.comments = merge_comments comments }
-    | EnumDeclaration ({ EnumDeclaration.comments; _ } as s) ->
-      EnumDeclaration { s with EnumDeclaration.comments = merge_comments comments }
-    | ExportDefaultDeclaration ({ ExportDefaultDeclaration.comments; _ } as s) ->
-      ExportDefaultDeclaration
-        { s with ExportDefaultDeclaration.comments = merge_comments comments }
-    | ExportNamedDeclaration ({ ExportNamedDeclaration.comments; _ } as s) ->
-      ExportNamedDeclaration { s with ExportNamedDeclaration.comments = merge_comments comments }
-    | Expression ({ Expression.comments; _ } as s) ->
-      Expression { s with Expression.comments = merge_comments comments }
-    | For ({ For.comments; _ } as s) -> For { s with For.comments = merge_comments comments }
-    | ForIn ({ ForIn.comments; _ } as s) ->
-      ForIn { s with ForIn.comments = merge_comments comments }
-    | ForOf ({ ForOf.comments; _ } as s) ->
-      ForOf { s with ForOf.comments = merge_comments comments }
-    | FunctionDeclaration ({ Function.comments; _ } as s) ->
-      FunctionDeclaration { s with Function.comments = merge_comments comments }
-    | If ({ If.comments; _ } as s) -> If { s with If.comments = merge_comments comments }
-    | ImportDeclaration ({ ImportDeclaration.comments; _ } as s) ->
-      ImportDeclaration { s with ImportDeclaration.comments = merge_comments comments }
-    | InterfaceDeclaration ({ Interface.comments; _ } as s) ->
-      InterfaceDeclaration { s with Interface.comments = merge_comments comments }
-    | Labeled ({ Labeled.comments; _ } as s) ->
-      Labeled { s with Labeled.comments = merge_comments comments }
-    | Return ({ Return.comments; _ } as s) ->
-      Return { s with Return.comments = merge_comments comments }
-    | Switch ({ Switch.comments; _ } as s) ->
-      Switch { s with Switch.comments = merge_comments comments }
-    | Throw ({ Throw.comments; _ } as s) ->
-      Throw { s with Throw.comments = merge_comments comments }
-    | Try ({ Try.comments; _ } as s) -> Try { s with Try.comments = merge_comments comments }
-    | TypeAlias ({ TypeAlias.comments; _ } as s) ->
-      TypeAlias { s with TypeAlias.comments = merge_comments comments }
-    | OpaqueType ({ OpaqueType.comments; _ } as s) ->
-      OpaqueType { s with OpaqueType.comments = merge_comments comments }
-    | VariableDeclaration ({ VariableDeclaration.comments; _ } as s) ->
-      VariableDeclaration { s with VariableDeclaration.comments = merge_comments comments }
-    | While ({ While.comments; _ } as s) ->
-      While { s with While.comments = merge_comments comments }
-    | With ({ With.comments; _ } as s) -> With { s with With.comments = merge_comments comments }
-  )
-
-(* Collects the first leading and last trailing comment on an AST node or its children.
-   The first leading comment is the first attached comment that begins before the given node's loc,
-   and the last trailing comment is the last attached comment that begins after the given node's loc. *)
-class ['loc] comment_bounds_collector ~loc =
-  object (this)
-    inherit ['loc] Flow_ast_mapper.mapper
-
-    val mutable first_leading = None
-
-    val mutable last_trailing = None
-
-    method comment_bounds = (first_leading, last_trailing)
-
-    method collect_comments : 'internal. ('loc, 'internal) Syntax.t -> unit =
-      function
-      | { Syntax.leading; trailing; _ } ->
-        List.iter this#visit_leading_comment leading;
-        List.iter this#visit_trailing_comment trailing
-
-    method collect_comments_opt =
-      function
-      | None -> ()
-      | Some comments -> this#collect_comments comments
-
-    method visit_leading_comment ((comment_loc, _) as comment) =
-      let open Loc in
-      match first_leading with
-      | None -> if pos_cmp comment_loc.start loc.start < 0 then first_leading <- Some comment
-      | Some (current_first_loc, _) ->
-        if pos_cmp comment_loc.start current_first_loc.start < 0 then first_leading <- Some comment
-
-    method visit_trailing_comment ((comment_loc, _) as comment) =
-      let open Loc in
-      match last_trailing with
-      | None -> if pos_cmp comment_loc.start loc._end >= 0 then last_trailing <- Some comment
-      | Some (current_last_loc, _) ->
-        if pos_cmp current_last_loc.start comment_loc.start < 0 then last_trailing <- Some comment
-
-    method! syntax comments =
-      this#collect_comments comments;
-      comments
-
-    method! block _loc block =
-      let { Statement.Block.comments; _ } = block in
-      this#collect_comments_opt comments;
-      block
-  end
-
-(* Given an AST node and a function to collect all its comments, return the first leading
-   and last trailing comment on the node. *)
-let comment_bounds loc node f =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (f collector node);
-  collector#comment_bounds
-
-(* Expand node's loc to include its attached comments *)
-let expand_loc_with_comment_bounds loc (first_leading, last_trailing) =
-  let open Loc in
-  let start =
-    match first_leading with
-    | None -> loc
-    | Some (first_leading_loc, _) -> first_leading_loc
-  in
-  let _end =
-    match last_trailing with
-    | None -> loc
-    | Some (last_trailing_loc, _) -> last_trailing_loc
-  in
-  btwn start _end
-
-(* Remove the trailing comment bound if it is a line comment *)
-let comment_bounds_without_trailing_line_comment (leading, trailing) =
-  match trailing with
-  | Some (_, { Ast.Comment.kind = Ast.Comment.Line; _ }) -> (leading, None)
-  | _ -> (leading, trailing)
-
-let collect_without_trailing_line_comment collector =
-  comment_bounds_without_trailing_line_comment collector#comment_bounds
-
-(* Return the first leading and last trailing comment of a statement *)
-let statement_comment_bounds ((loc, _) as stmt : (Loc.t, Loc.t) Statement.t) :
-    Loc.t Comment.t option * Loc.t Comment.t option =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#statement stmt);
-  collector#comment_bounds
-
-let expression_comment_bounds ((loc, _) as expr) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#expression expr);
-  collector#comment_bounds
-
-let type_comment_bounds ((loc, _) as ty) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#type_ ty);
-  collector#comment_bounds
-
-let block_comment_bounds (loc, block) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#block loc block);
-  collector#comment_bounds
-
-let object_property_comment_bounds property =
-  let open Ast.Expression.Object in
-  let collector =
-    match property with
-    | Property ((loc, _) as p) ->
-      let collector = new comment_bounds_collector ~loc in
-      ignore (collector#object_property p);
-      collector
-    | SpreadProperty ((loc, _) as p) ->
-      let collector = new comment_bounds_collector ~loc in
-      ignore (collector#spread_property p);
-      collector
-  in
-  collect_without_trailing_line_comment collector
-
-let object_type_property_comment_bounds property =
-  let open Ast.Type.Object in
-  let collector =
-    match property with
-    | Property ((loc, _) as p) ->
-      let collector = new comment_bounds_collector ~loc in
-      ignore (collector#object_property_type p);
-      collector
-    | SpreadProperty ((loc, _) as p) ->
-      let collector = new comment_bounds_collector ~loc in
-      ignore (collector#object_spread_property_type p);
-      collector
-    | Indexer ((loc, _) as p) ->
-      let collector = new comment_bounds_collector ~loc in
-      ignore (collector#object_indexer_property_type p);
-      collector
-    | InternalSlot ((loc, _) as p) ->
-      let collector = new comment_bounds_collector ~loc in
-      ignore (collector#object_internal_slot_property_type p);
-      collector
-    | CallProperty ((loc, _) as p) ->
-      let collector = new comment_bounds_collector ~loc in
-      ignore (collector#object_call_property_type p);
-      collector
-  in
-  collect_without_trailing_line_comment collector
-
-let object_pattern_property_comment_bounds loc property =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#pattern_object_p property);
-  collect_without_trailing_line_comment collector
-
-let switch_case_comment_bounds (loc, case) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#switch_case (loc, case));
-  collector#comment_bounds
-
-let function_param_comment_bounds (loc, param) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#function_param (loc, param));
-  collect_without_trailing_line_comment collector
-
-let function_rest_param_comment_bounds (loc, param) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#function_rest_param (loc, param));
-  collect_without_trailing_line_comment collector
-
-let function_this_param_comment_bounds (loc, param) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#function_this_param (loc, param));
-  collect_without_trailing_line_comment collector
-
-let function_type_param_comment_bounds (loc, param) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#function_param_type (loc, param));
-  collect_without_trailing_line_comment collector
-
-let function_type_rest_param_comment_bounds (loc, param) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#function_rest_param_type (loc, param));
-  collect_without_trailing_line_comment collector
-
-let function_type_this_param_comment_bounds (loc, param) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#function_this_param_type (loc, param));
-  collect_without_trailing_line_comment collector
-
-let array_element_comment_bounds loc element =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#array_element element);
-  collect_without_trailing_line_comment collector
-
-let array_pattern_element_comment_bounds loc element =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#pattern_array_e element);
-  collect_without_trailing_line_comment collector
-
-let expression_or_spread_comment_bounds loc expr_or_spread =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#expression_or_spread expr_or_spread);
-  collect_without_trailing_line_comment collector
-
-let call_type_arg_comment_bounds loc arg =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#call_type_arg arg);
-  collect_without_trailing_line_comment collector
-
-let type_param_comment_bounds (loc, param) =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#type_param (loc, param));
-  collect_without_trailing_line_comment collector
-
-let function_body_comment_bounds body =
-  let loc =
-    match body with
-    | Ast.Function.BodyBlock (loc, _) -> loc
-    | Ast.Function.BodyExpression (loc, _) -> loc
-  in
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#function_body_any body);
-  collector#comment_bounds
-
-let if_alternate_statement_comment_bounds loc alternate =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#if_alternate_statement loc alternate);
-  collector#comment_bounds
-
-let member_property_comment_bounds loc property =
-  let collector = new comment_bounds_collector ~loc in
-  ignore (collector#member_property property);
-  collector#comment_bounds
diff --git a/jscomp/js_parser/declaration_parser.ml b/jscomp/js_parser/declaration_parser.ml
deleted file mode 100644
index ef9f983..0000000
--- a/jscomp/js_parser/declaration_parser.ml
+++ /dev/null
@@ -1,432 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Ast = Flow_ast
-open Token
-open Parser_common
-open Parser_env
-open Flow_ast
-open Comment_attachment
-
-module type DECLARATION = sig
-  val async : env -> bool * Loc.t Comment.t list
-
-  val generator : env -> bool * Loc.t Comment.t list
-
-  val variance : env -> bool -> bool -> Loc.t Variance.t option
-
-  val function_params : await:bool -> yield:bool -> env -> (Loc.t, Loc.t) Ast.Function.Params.t
-
-  val function_body :
-    env ->
-    async:bool ->
-    generator:bool ->
-    expression:bool ->
-    simple_params:bool ->
-    (Loc.t, Loc.t) Function.body * bool
-
-  val strict_post_check :
-    env ->
-    contains_use_strict:bool ->
-    (Loc.t, Loc.t) Identifier.t option ->
-    (Loc.t, Loc.t) Ast.Function.Params.t ->
-    unit
-
-  val let_ :
-    env ->
-    (Loc.t, Loc.t) Statement.VariableDeclaration.Declarator.t list
-    * Loc.t Ast.Comment.t list
-    * (Loc.t * Parse_error.t) list
-
-  val const :
-    env ->
-    (Loc.t, Loc.t) Statement.VariableDeclaration.Declarator.t list
-    * Loc.t Ast.Comment.t list
-    * (Loc.t * Parse_error.t) list
-
-  val var :
-    env ->
-    (Loc.t, Loc.t) Statement.VariableDeclaration.Declarator.t list
-    * Loc.t Ast.Comment.t list
-    * (Loc.t * Parse_error.t) list
-
-  val _function : env -> (Loc.t, Loc.t) Statement.t
-
-  val enum_declaration : env -> (Loc.t, Loc.t) Statement.t
-end
-
-module Declaration (Parse : Parser_common.PARSER) (Type : Type_parser.TYPE) : DECLARATION = struct
-  module Enum = Enum_parser.Enum (Parse)
-
-  let check_param =
-    let rec pattern ((env, _) as check_env) (loc, p) =
-      Pattern.(
-        match p with
-        | Object o -> _object check_env o
-        | Array arr -> _array check_env arr
-        | Identifier id -> identifier_pattern check_env id
-        | Expression _ ->
-          error_at env (loc, Parse_error.ExpectedPatternFoundExpression);
-          check_env
-      )
-    and _object check_env o = List.fold_left object_property check_env o.Pattern.Object.properties
-    and object_property check_env =
-      let open Pattern.Object in
-      function
-      | Property (_, property) ->
-        Property.(
-          let check_env =
-            match property.key with
-            | Identifier id -> identifier_no_dupe_check check_env id
-            | _ -> check_env
-          in
-          pattern check_env property.pattern
-        )
-      | RestElement (_, { Pattern.RestElement.argument; comments = _ }) ->
-        pattern check_env argument
-    and _array check_env arr = List.fold_left array_element check_env arr.Pattern.Array.elements
-    and array_element check_env =
-      let open Pattern.Array in
-      function
-      | Hole _ -> check_env
-      | Element (_, { Element.argument; default = _ }) -> pattern check_env argument
-      | RestElement (_, { Pattern.RestElement.argument; comments = _ }) ->
-        pattern check_env argument
-    and identifier_pattern check_env { Pattern.Identifier.name = id; _ } = identifier check_env id
-    and identifier (env, param_names) ((loc, { Identifier.name; comments = _ }) as id) =
-      if SSet.mem name param_names then error_at env (loc, Parse_error.StrictParamDupe);
-      let (env, param_names) = identifier_no_dupe_check (env, param_names) id in
-      (env, SSet.add name param_names)
-    and identifier_no_dupe_check (env, param_names) (loc, { Identifier.name; comments = _ }) =
-      if is_restricted name then strict_error_at env (loc, Parse_error.StrictParamName);
-      if is_future_reserved name || is_strict_reserved name then
-        strict_error_at env (loc, Parse_error.StrictReservedWord);
-      (env, param_names)
-    in
-    pattern
-
-  let strict_post_check env ~contains_use_strict id params =
-    let strict_mode = Parser_env.in_strict_mode env in
-    let simple = is_simple_parameter_list params in
-    let (_, { Ast.Function.Params.params; rest; this_ = _; comments = _ }) = params in
-    (* If we were already in strict mode and therefore already threw strict
-       errors, we want to do these checks outside of strict mode. If we
-       were in non-strict mode but the function contains "use strict", then
-       we want to do these checks in strict mode *)
-    let env =
-      if strict_mode then
-        with_strict false env
-      else
-        with_strict contains_use_strict env
-    in
-    if contains_use_strict || strict_mode || not simple then (
-      (match id with
-      | Some (loc, { Identifier.name; comments = _ }) ->
-        if is_restricted name then strict_error_at env (loc, Parse_error.StrictFunctionName);
-        if is_future_reserved name || is_strict_reserved name then
-          strict_error_at env (loc, Parse_error.StrictReservedWord)
-      | None -> ());
-      let acc =
-        List.fold_left
-          (fun acc (_, { Function.Param.argument; default = _ }) -> check_param acc argument)
-          (env, SSet.empty)
-          params
-      in
-      match rest with
-      | Some (_, { Function.RestParam.argument; comments = _ }) -> ignore (check_param acc argument)
-      | None -> ()
-    )
-
-  let function_params =
-    let rec param =
-      with_loc (fun env ->
-          if Peek.token env = T_THIS then error env Parse_error.ThisParamMustBeFirst;
-          let argument = Parse.pattern env Parse_error.StrictParamName in
-          let default =
-            if Peek.token env = T_ASSIGN then (
-              Expect.token env T_ASSIGN;
-              Some (Parse.assignment env)
-            ) else
-              None
-          in
-          { Function.Param.argument; default }
-      )
-    and param_list env acc =
-      match Peek.token env with
-      | (T_EOF | T_RPAREN | T_ELLIPSIS) as t ->
-        let rest =
-          if t = T_ELLIPSIS then
-            let leading = Peek.comments env in
-            let (loc, id) =
-              with_loc
-                (fun env ->
-                  Expect.token env T_ELLIPSIS;
-                  Parse.pattern env Parse_error.StrictParamName)
-                env
-            in
-            Some
-              ( loc,
-                {
-                  Function.RestParam.argument = id;
-                  comments = Flow_ast_utils.mk_comments_opt ~leading ();
-                }
-              )
-          else
-            None
-        in
-        if Peek.token env <> T_RPAREN then error env Parse_error.ParameterAfterRestParameter;
-        (List.rev acc, rest)
-      | _ ->
-        let the_param = param env in
-        if Peek.token env <> T_RPAREN then Expect.token env T_COMMA;
-        param_list env (the_param :: acc)
-    in
-    let this_param_annotation env =
-      if should_parse_types env && Peek.token env = T_THIS then (
-        let leading = Peek.comments env in
-        let (this_loc, this_param) =
-          with_loc
-            (fun env ->
-              Expect.token env T_THIS;
-              if Peek.token env <> T_COLON then begin
-                error env Parse_error.ThisParamAnnotationRequired;
-                None
-              end else
-                Some (Type.annotation env))
-            env
-        in
-        match this_param with
-        | None -> None
-        | Some annot ->
-          if Peek.token env = T_COMMA then Eat.token env;
-          Some
-            ( this_loc,
-              {
-                Ast.Function.ThisParam.annot;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ();
-              }
-            )
-      ) else
-        None
-    in
-    fun ~await ~yield ->
-      with_loc (fun env ->
-          let env =
-            env
-            |> with_allow_await await
-            |> with_allow_yield yield
-            |> with_in_formal_parameters true
-          in
-          let leading = Peek.comments env in
-          Expect.token env T_LPAREN;
-          let this_ = this_param_annotation env in
-          let (params, rest) = param_list env [] in
-          let internal = Peek.comments env in
-          Expect.token env T_RPAREN;
-          let trailing = Eat.trailing_comments env in
-          {
-            Ast.Function.Params.params;
-            rest;
-            comments = Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-            this_;
-          }
-      )
-
-  let function_body env ~async ~generator ~expression ~simple_params =
-    let env = enter_function env ~async ~generator ~simple_params in
-    let (body_block, contains_use_strict) = Parse.function_block_body env ~expression in
-    (Function.BodyBlock body_block, contains_use_strict)
-
-  let variance env is_async is_generator =
-    let loc = Peek.loc env in
-    let variance =
-      match Peek.token env with
-      | T_PLUS ->
-        let leading = Peek.comments env in
-        Eat.token env;
-        Some
-          ( loc,
-            { Variance.kind = Variance.Plus; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-          )
-      | T_MINUS ->
-        let leading = Peek.comments env in
-        Eat.token env;
-        Some
-          ( loc,
-            {
-              Variance.kind = Variance.Minus;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            }
-          )
-      | _ -> None
-    in
-    match variance with
-    | Some (loc, _) when is_async || is_generator ->
-      error_at env (loc, Parse_error.UnexpectedVariance);
-      None
-    | _ -> variance
-
-  let generator env =
-    if Peek.token env = T_MULT then (
-      let leading = Peek.comments env in
-      Eat.token env;
-      (true, leading)
-    ) else
-      (false, [])
-
-  (* Returns true and consumes a token if the token is `async` and the token after it is on
-     the same line (see https://tc39.github.io/ecma262/#sec-async-function-definitions) *)
-  let async env =
-    if Peek.token env = T_ASYNC && not (Peek.ith_is_line_terminator ~i:1 env) then
-      let leading = Peek.comments env in
-      let () = Eat.token env in
-      (true, leading)
-    else
-      (false, [])
-
-  let _function =
-    with_loc (fun env ->
-        let (async, leading_async) = async env in
-        let (sig_loc, (generator, tparams, id, params, return, predicate, leading)) =
-          with_loc
-            (fun env ->
-              let leading_function = Peek.comments env in
-              Expect.token env T_FUNCTION;
-              let (generator, leading_generator) = generator env in
-              let leading = List.concat [leading_async; leading_function; leading_generator] in
-              let (tparams, id) =
-                match (in_export_default env, Peek.token env) with
-                | (true, T_LPAREN) -> (None, None)
-                | (true, T_LESS_THAN) ->
-                  let tparams = type_params_remove_trailing env (Type.type_params env) in
-                  let id =
-                    if Peek.token env = T_LPAREN then
-                      None
-                    else
-                      let id =
-                        id_remove_trailing
-                          env
-                          (Parse.identifier ~restricted_error:Parse_error.StrictFunctionName env)
-                      in
-                      Some id
-                  in
-                  (tparams, id)
-                | _ ->
-                  let id =
-                    if Peek.is_identifier env then
-                      id_remove_trailing
-                        env
-                        (Parse.identifier ~restricted_error:Parse_error.StrictFunctionName env)
-                    else (
-                      (* don't consume the identifier here like Parse.identifier does. *)
-                      error_nameless_declaration env "function";
-                      (Peek.loc env, { Identifier.name = ""; comments = None })
-                    )
-                  in
-                  let tparams = type_params_remove_trailing env (Type.type_params env) in
-                  (tparams, Some id)
-              in
-              let params =
-                let params = function_params ~await:async ~yield:generator env in
-                if Peek.token env = T_COLON then
-                  params
-                else
-                  function_params_remove_trailing env params
-              in
-              let (return, predicate) = Type.annotation_and_predicate_opt env in
-              let (return, predicate) =
-                match predicate with
-                | None -> (type_annotation_hint_remove_trailing env return, predicate)
-                | Some _ -> (return, predicate_remove_trailing env predicate)
-              in
-              (generator, tparams, id, params, return, predicate, leading))
-            env
-        in
-        let simple_params = is_simple_parameter_list params in
-        let (body, contains_use_strict) =
-          function_body env ~async ~generator ~expression:false ~simple_params
-        in
-        strict_post_check env ~contains_use_strict id params;
-        Statement.FunctionDeclaration
-          {
-            Function.id;
-            params;
-            body;
-            generator;
-            async;
-            predicate;
-            return;
-            tparams;
-            sig_loc;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ();
-          }
-    )
-
-  let variable_declaration_list =
-    let variable_declaration env =
-      let (loc, (decl, err)) =
-        with_loc
-          (fun env ->
-            let id = Parse.pattern env Parse_error.StrictVarName in
-            let (init, err) =
-              if Eat.maybe env T_ASSIGN then
-                (Some (Parse.assignment env), None)
-              else
-                match id with
-                | (_, Ast.Pattern.Identifier _) -> (None, None)
-                | (loc, _) -> (None, Some (loc, Parse_error.NoUninitializedDestructuring))
-            in
-            (Ast.Statement.VariableDeclaration.Declarator.{ id; init }, err))
-          env
-      in
-      ((loc, decl), err)
-    in
-    let rec helper env decls errs =
-      let (decl, err) = variable_declaration env in
-      let decls = decl :: decls in
-      let errs =
-        match err with
-        | Some x -> x :: errs
-        | None -> errs
-      in
-      if Eat.maybe env T_COMMA then
-        helper env decls errs
-      else
-        (List.rev decls, List.rev errs)
-    in
-    (fun env -> helper env [] [])
-
-  let declarations token env =
-    let leading = Peek.comments env in
-    Expect.token env token;
-    let (declarations, errs) = variable_declaration_list env in
-    (declarations, leading, errs)
-
-  let var = declarations T_VAR
-
-  let const env =
-    let env = env |> with_no_let true in
-    let (declarations, leading_comments, errs) = declarations T_CONST env in
-    (* Make sure all consts defined are initialized *)
-    let errs =
-      List.fold_left
-        (fun errs decl ->
-          match decl with
-          | (loc, { Statement.VariableDeclaration.Declarator.init = None; _ }) ->
-            (loc, Parse_error.NoUninitializedConst) :: errs
-          | _ -> errs)
-        errs
-        declarations
-    in
-    (declarations, leading_comments, List.rev errs)
-
-  let let_ env =
-    let env = env |> with_no_let true in
-    declarations T_LET env
-
-  let enum_declaration = Enum.declaration
-end
diff --git a/jscomp/js_parser/dune b/jscomp/js_parser/dune
deleted file mode 100644
index 6e59d21..0000000
--- a/jscomp/js_parser/dune
+++ /dev/null
@@ -1,5 +0,0 @@
-(library
- (name js_parser)
- (wrapped false)
- (flags
-  (:standard -w -A)))
diff --git a/jscomp/js_parser/enum_common.ml b/jscomp/js_parser/enum_common.ml
deleted file mode 100644
index 45b52ee..0000000
--- a/jscomp/js_parser/enum_common.ml
+++ /dev/null
@@ -1,24 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-open Primitive_deriving
-type explicit_type =
-  | Boolean
-  | Number
-  | String
-  | Symbol
-[@@deriving_inline compare]
-let _ = fun (_ : explicit_type) -> ()
-let compare_explicit_type =
-  (Ppx_compare_lib.polymorphic_compare : explicit_type ->
-                                           explicit_type -> int)
-let _ = compare_explicit_type
-[@@@end]
-let string_of_explicit_type = function
-  | Boolean -> "boolean"
-  | Number -> "number"
-  | String -> "string"
-  | Symbol -> "symbol"
diff --git a/jscomp/js_parser/enum_parser.ml b/jscomp/js_parser/enum_parser.ml
deleted file mode 100644
index e5eb027..0000000
--- a/jscomp/js_parser/enum_parser.ml
+++ /dev/null
@@ -1,435 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-open Flow_ast
-open Parser_common
-open Parser_env
-open Token
-
-module Enum (Parse : Parser_common.PARSER) : sig
-  val declaration : env -> (Loc.t, Loc.t) Statement.t
-end = struct
-  open Flow_ast.Statement.EnumDeclaration
-
-  type members = {
-    boolean_members: (Loc.t BooleanLiteral.t, Loc.t) InitializedMember.t list;
-    number_members: (Loc.t NumberLiteral.t, Loc.t) InitializedMember.t list;
-    string_members: (Loc.t StringLiteral.t, Loc.t) InitializedMember.t list;
-    defaulted_members: Loc.t DefaultedMember.t list;
-  }
-
-  type acc = {
-    members: members;
-    seen_names: SSet.t;
-    has_unknown_members: bool;
-    internal_comments: Loc.t Comment.t list;
-  }
-
-  type init =
-    | NoInit
-    | InvalidInit of Loc.t
-    | BooleanInit of Loc.t * Loc.t BooleanLiteral.t
-    | NumberInit of Loc.t * Loc.t NumberLiteral.t
-    | StringInit of Loc.t * Loc.t StringLiteral.t
-
-  let empty_members =
-    { boolean_members = []; number_members = []; string_members = []; defaulted_members = [] }
-
-  let empty_acc =
-    {
-      members = empty_members;
-      seen_names = SSet.empty;
-      has_unknown_members = false;
-      internal_comments = [];
-    }
-
-  let end_of_member_init env =
-    match Peek.token env with
-    | T_SEMICOLON
-    | T_COMMA
-    | T_RCURLY ->
-      true
-    | _ -> false
-
-  let member_init env =
-    let loc = Peek.loc env in
-    let leading = Peek.comments env in
-    match Peek.token env with
-    | T_NUMBER { kind; raw } ->
-      let value = Parse.number env kind raw in
-      let trailing = Eat.trailing_comments env in
-      if end_of_member_init env then
-        NumberInit
-          ( loc,
-            {
-              NumberLiteral.value;
-              raw;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            }
-          )
-      else
-        InvalidInit loc
-    | T_STRING (loc, value, raw, octal) ->
-      if octal then strict_error env Parse_error.StrictOctalLiteral;
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      if end_of_member_init env then
-        StringInit
-          ( loc,
-            {
-              StringLiteral.value;
-              raw;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            }
-          )
-      else
-        InvalidInit loc
-    | (T_TRUE | T_FALSE) as token ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      if end_of_member_init env then
-        BooleanInit
-          ( loc,
-            {
-              BooleanLiteral.value = token = T_TRUE;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            }
-          )
-      else
-        InvalidInit loc
-    | _ ->
-      Eat.token env;
-      InvalidInit loc
-
-  let member_raw =
-    with_loc (fun env ->
-        let id = identifier_name env in
-        let init =
-          match Peek.token env with
-          | T_ASSIGN ->
-            Expect.token env T_ASSIGN;
-            member_init env
-          | T_COLON ->
-            let (_, { Identifier.name = member_name; _ }) = id in
-            error env (Parse_error.EnumInvalidInitializerSeparator { member_name });
-            Expect.token env T_COLON;
-            member_init env
-          | _ -> NoInit
-        in
-        (id, init)
-    )
-
-  let check_explicit_type_mismatch env ~enum_name ~explicit_type ~member_name literal_type loc =
-    match explicit_type with
-    | Some enum_type when enum_type <> literal_type ->
-      error_at
-        env
-        (loc, Parse_error.EnumInvalidMemberInitializer { enum_name; explicit_type; member_name })
-    | _ -> ()
-
-  let is_a_to_z c = c >= 'a' && c <= 'z'
-
-  let enum_member ~enum_name ~explicit_type acc env =
-    let { members; seen_names; _ } = acc in
-    let (member_loc, (id, init)) = member_raw env in
-    let (id_loc, { Identifier.name = member_name; _ }) = id in
-    (* if we parsed an empty name, something has gone wrong and we should abort analysis *)
-    if member_name = "" then
-      acc
-    else (
-      if is_a_to_z @@ member_name.[0] then
-        error_at env (id_loc, Parse_error.EnumInvalidMemberName { enum_name; member_name });
-      if SSet.mem member_name seen_names then
-        error_at env (id_loc, Parse_error.EnumDuplicateMemberName { enum_name; member_name });
-      let acc = { acc with seen_names = SSet.add member_name seen_names } in
-      let check_explicit_type_mismatch =
-        check_explicit_type_mismatch env ~enum_name ~explicit_type ~member_name
-      in
-      match init with
-      | BooleanInit (loc, value) ->
-        check_explicit_type_mismatch Enum_common.Boolean loc;
-        let member = (member_loc, { InitializedMember.id; init = (loc, value) }) in
-        { acc with members = { members with boolean_members = member :: members.boolean_members } }
-      | NumberInit (loc, value) ->
-        check_explicit_type_mismatch Enum_common.Number loc;
-        let member = (member_loc, { InitializedMember.id; init = (loc, value) }) in
-        { acc with members = { members with number_members = member :: members.number_members } }
-      | StringInit (loc, value) ->
-        check_explicit_type_mismatch Enum_common.String loc;
-        let member = (member_loc, { InitializedMember.id; init = (loc, value) }) in
-        { acc with members = { members with string_members = member :: members.string_members } }
-      | InvalidInit loc ->
-        error_at
-          env
-          (loc, Parse_error.EnumInvalidMemberInitializer { enum_name; explicit_type; member_name });
-        acc
-      | NoInit ->
-        begin
-          match explicit_type with
-          | Some Enum_common.Boolean ->
-            error_at
-              env
-              (member_loc, Parse_error.EnumBooleanMemberNotInitialized { enum_name; member_name });
-            acc
-          | Some Enum_common.Number ->
-            error_at
-              env
-              (member_loc, Parse_error.EnumNumberMemberNotInitialized { enum_name; member_name });
-            acc
-          | Some Enum_common.String
-          | Some Enum_common.Symbol
-          | None ->
-            let member = (member_loc, { DefaultedMember.id }) in
-            {
-              acc with
-              members = { members with defaulted_members = member :: members.defaulted_members };
-            }
-        end
-    )
-
-  let rec enum_members ~enum_name ~explicit_type acc env =
-    match Peek.token env with
-    | T_RCURLY
-    | T_EOF ->
-      ( {
-          boolean_members = List.rev acc.members.boolean_members;
-          number_members = List.rev acc.members.number_members;
-          string_members = List.rev acc.members.string_members;
-          defaulted_members = List.rev acc.members.defaulted_members;
-        },
-        acc.has_unknown_members,
-        acc.internal_comments
-      )
-    | T_ELLIPSIS ->
-      let loc = Peek.loc env in
-      (* Internal comments may appear before the ellipsis *)
-      let internal_comments = Peek.comments env in
-      Eat.token env;
-      (match Peek.token env with
-      | T_RCURLY
-      | T_EOF ->
-        ()
-      | T_COMMA ->
-        Expect.token env T_COMMA;
-        let trailing_comma =
-          match Peek.token env with
-          | T_RCURLY
-          | T_EOF ->
-            true
-          | _ -> false
-        in
-        error_at env (loc, Parse_error.EnumInvalidEllipsis { trailing_comma })
-      | _ -> error_at env (loc, Parse_error.EnumInvalidEllipsis { trailing_comma = false }));
-      enum_members
-        ~enum_name
-        ~explicit_type
-        { acc with has_unknown_members = true; internal_comments }
-        env
-    | _ ->
-      let acc = enum_member ~enum_name ~explicit_type acc env in
-      (match Peek.token env with
-      | T_RCURLY
-      | T_EOF ->
-        ()
-      | T_SEMICOLON ->
-        error env Parse_error.EnumInvalidMemberSeparator;
-        Expect.token env T_SEMICOLON
-      | _ -> Expect.token env T_COMMA);
-      enum_members ~enum_name ~explicit_type acc env
-
-  let string_body
-      ~env ~enum_name ~is_explicit ~has_unknown_members string_members defaulted_members comments =
-    let initialized_len = List.length string_members in
-    let defaulted_len = List.length defaulted_members in
-    let defaulted_body () =
-      StringBody
-        {
-          StringBody.members = StringBody.Defaulted defaulted_members;
-          explicit_type = is_explicit;
-          has_unknown_members;
-          comments;
-        }
-    in
-    let initialized_body () =
-      StringBody
-        {
-          StringBody.members = StringBody.Initialized string_members;
-          explicit_type = is_explicit;
-          has_unknown_members;
-          comments;
-        }
-    in
-    match (initialized_len, defaulted_len) with
-    | (0, 0)
-    | (0, _) ->
-      defaulted_body ()
-    | (_, 0) -> initialized_body ()
-    | _ when defaulted_len > initialized_len ->
-      List.iter
-        (fun (loc, _) ->
-          error_at env (loc, Parse_error.EnumStringMemberInconsistentlyInitailized { enum_name }))
-        string_members;
-      defaulted_body ()
-    | _ ->
-      List.iter
-        (fun (loc, _) ->
-          error_at env (loc, Parse_error.EnumStringMemberInconsistentlyInitailized { enum_name }))
-        defaulted_members;
-      initialized_body ()
-
-  let parse_explicit_type ~enum_name env =
-    if Eat.maybe env T_OF then (
-      Eat.push_lex_mode env Lex_mode.TYPE;
-      let result =
-        match Peek.token env with
-        | T_BOOLEAN_TYPE BOOLEAN -> Some Enum_common.Boolean
-        | T_NUMBER_TYPE -> Some Enum_common.Number
-        | T_STRING_TYPE -> Some Enum_common.String
-        | T_SYMBOL_TYPE -> Some Enum_common.Symbol
-        | T_IDENTIFIER { value; _ } ->
-          let supplied_type = Some value in
-          error env (Parse_error.EnumInvalidExplicitType { enum_name; supplied_type });
-          None
-        | _ ->
-          error env (Parse_error.EnumInvalidExplicitType { enum_name; supplied_type = None });
-          None
-      in
-      Eat.token env;
-      Eat.pop_lex_mode env;
-      result
-    ) else
-      None
-
-  let enum_body ~enum_name ~name_loc =
-    with_loc (fun env ->
-        let explicit_type = parse_explicit_type ~enum_name env in
-        let leading =
-          if explicit_type <> None then
-            Peek.comments env
-          else
-            []
-        in
-        Expect.token env T_LCURLY;
-        let (members, has_unknown_members, internal) =
-          enum_members ~enum_name ~explicit_type empty_acc env
-        in
-        let internal = internal @ Peek.comments env in
-        Expect.token env T_RCURLY;
-        let trailing =
-          match Peek.token env with
-          | T_EOF
-          | T_RCURLY ->
-            Eat.trailing_comments env
-          | _ when Peek.is_line_terminator env -> Eat.comments_until_next_line env
-          | _ -> []
-        in
-        let comments =
-          Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ()
-        in
-        let body =
-          match explicit_type with
-          | Some Enum_common.Boolean ->
-            BooleanBody
-              {
-                BooleanBody.members = members.boolean_members;
-                explicit_type = true;
-                has_unknown_members;
-                comments;
-              }
-          | Some Enum_common.Number ->
-            NumberBody
-              {
-                NumberBody.members = members.number_members;
-                explicit_type = true;
-                has_unknown_members;
-                comments;
-              }
-          | Some Enum_common.String ->
-            string_body
-              ~env
-              ~enum_name
-              ~is_explicit:true
-              ~has_unknown_members
-              members.string_members
-              members.defaulted_members
-              comments
-          | Some Enum_common.Symbol ->
-            SymbolBody
-              { SymbolBody.members = members.defaulted_members; has_unknown_members; comments }
-          | None ->
-            let bools_len = List.length members.boolean_members in
-            let nums_len = List.length members.number_members in
-            let strs_len = List.length members.string_members in
-            let defaulted_len = List.length members.defaulted_members in
-            let empty () =
-              StringBody
-                {
-                  StringBody.members = StringBody.Defaulted [];
-                  explicit_type = false;
-                  has_unknown_members;
-                  comments;
-                }
-            in
-            begin
-              match (bools_len, nums_len, strs_len, defaulted_len) with
-              | (0, 0, 0, 0) -> empty ()
-              | (0, 0, _, _) ->
-                string_body
-                  ~env
-                  ~enum_name
-                  ~is_explicit:false
-                  ~has_unknown_members
-                  members.string_members
-                  members.defaulted_members
-                  comments
-              | (_, 0, 0, _) when bools_len >= defaulted_len ->
-                List.iter
-                  (fun (loc, { DefaultedMember.id = (_, { Identifier.name = member_name; _ }) }) ->
-                    error_at
-                      env
-                      (loc, Parse_error.EnumBooleanMemberNotInitialized { enum_name; member_name }))
-                  members.defaulted_members;
-                BooleanBody
-                  {
-                    BooleanBody.members = members.boolean_members;
-                    explicit_type = false;
-                    has_unknown_members;
-                    comments;
-                  }
-              | (0, _, 0, _) when nums_len >= defaulted_len ->
-                List.iter
-                  (fun (loc, { DefaultedMember.id = (_, { Identifier.name = member_name; _ }) }) ->
-                    error_at
-                      env
-                      (loc, Parse_error.EnumNumberMemberNotInitialized { enum_name; member_name }))
-                  members.defaulted_members;
-                NumberBody
-                  {
-                    NumberBody.members = members.number_members;
-                    explicit_type = false;
-                    has_unknown_members;
-                    comments;
-                  }
-              | _ ->
-                error_at env (name_loc, Parse_error.EnumInconsistentMemberValues { enum_name });
-                empty ()
-            end
-        in
-        body
-    )
-
-  let declaration =
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_ENUM;
-        let id = Parse.identifier env in
-        let (name_loc, { Identifier.name = enum_name; _ }) = id in
-        let body = enum_body ~enum_name ~name_loc env in
-        let comments = Flow_ast_utils.mk_comments_opt ~leading () in
-        Statement.EnumDeclaration { id; body; comments }
-    )
-end
diff --git a/jscomp/js_parser/expression_parser.ml b/jscomp/js_parser/expression_parser.ml
deleted file mode 100644
index f35eda7..0000000
--- a/jscomp/js_parser/expression_parser.ml
+++ /dev/null
@@ -1,1734 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Ast = Flow_ast
-open Token
-open Parser_env
-open Flow_ast
-open Parser_common
-open Comment_attachment
-
-module type EXPRESSION = sig
-  val assignment : env -> (Loc.t, Loc.t) Expression.t
-
-  val assignment_cover : env -> pattern_cover
-
-  val conditional : env -> (Loc.t, Loc.t) Expression.t
-
-  val is_assignable_lhs : (Loc.t, Loc.t) Expression.t -> bool
-
-  val left_hand_side : env -> (Loc.t, Loc.t) Expression.t
-
-  val number : env -> number_type -> string -> float
-
-  val sequence :
-    env -> start_loc:Loc.t -> (Loc.t, Loc.t) Expression.t list -> (Loc.t, Loc.t) Expression.t
-end
-
-module Expression
-    (Parse : PARSER)
-    (Type : Type_parser.TYPE)
-    (Declaration : Declaration_parser.DECLARATION)
-    (Pattern_cover : Pattern_cover.COVER) : EXPRESSION = struct
-  type op_precedence =
-    | Left_assoc of int
-    | Right_assoc of int
-
-  type group_cover =
-    | Group_expr of (Loc.t, Loc.t) Expression.t
-    | Group_typecast of (Loc.t, Loc.t) Expression.TypeCast.t
-
-  let is_tighter a b =
-    let a_prec =
-      match a with
-      | Left_assoc x -> x
-      | Right_assoc x -> x - 1
-    in
-    let b_prec =
-      match b with
-      | Left_assoc x -> x
-      | Right_assoc x -> x
-    in
-    a_prec >= b_prec
-
-  let is_assignable_lhs =
-    let open Expression in
-    function
-    | ( _,
-        MetaProperty
-          {
-            MetaProperty.meta = (_, { Identifier.name = "new"; comments = _ });
-            property = (_, { Identifier.name = "target"; comments = _ });
-            comments = _;
-          }
-      ) ->
-      false
-    | ( _,
-        MetaProperty
-          {
-            MetaProperty.meta = (_, { Identifier.name = "import"; comments = _ });
-            property = (_, { Identifier.name = "meta"; comments = _ });
-            comments = _;
-          }
-      ) ->
-      false
-    (* #sec-static-semantics-static-semantics-isvalidsimpleassignmenttarget *)
-    | (_, Array _)
-    | (_, Identifier _)
-    | (_, Member _)
-    | (_, MetaProperty _)
-    | (_, Object _) ->
-      true
-    | (_, ArrowFunction _)
-    | (_, Assignment _)
-    | (_, Binary _)
-    | (_, Call _)
-    | (_, Class _)
-    | (_, Comprehension _)
-    | (_, Conditional _)
-    | (_, Function _)
-    | (_, Generator _)
-    | (_, Import _)
-    | (_, JSXElement _)
-    | (_, JSXFragment _)
-    | (_, Literal _)
-    | (_, Logical _)
-    | (_, New _)
-    | (_, OptionalCall _)
-    | (_, OptionalMember _)
-    | (_, Sequence _)
-    | (_, Super _)
-    | (_, TaggedTemplate _)
-    | (_, TemplateLiteral _)
-    | (_, This _)
-    | (_, TypeCast _)
-    | (_, Unary _)
-    | (_, Update _)
-    | (_, Yield _) ->
-      false
-
-  let as_expression = Pattern_cover.as_expression
-
-  let as_pattern = Pattern_cover.as_pattern
-
-  (* AssignmentExpression :
-   *   [+Yield] YieldExpression
-   *   ConditionalExpression
-   *   LeftHandSideExpression = AssignmentExpression
-   *   LeftHandSideExpression AssignmentOperator AssignmentExpression
-   *   ArrowFunctionFunction
-   *
-   *   Originally we were parsing this without backtracking, but
-   *   ArrowFunctionExpression got too tricky. Oh well.
-   *)
-  let rec assignment_cover =
-    let assignment_but_not_arrow_function_cover env =
-      let start_loc = Peek.loc env in
-      let expr_or_pattern = conditional_cover env in
-      match assignment_op env with
-      | Some operator ->
-        let expr =
-          with_loc
-            ~start_loc
-            (fun env ->
-              let left = as_pattern env expr_or_pattern in
-              let right = assignment env in
-              Expression.(Assignment { Assignment.operator; left; right; comments = None }))
-            env
-        in
-        Cover_expr expr
-      | _ -> expr_or_pattern
-    in
-    let error_callback _ = function
-      (* Don't rollback on these errors. *)
-      | Parse_error.StrictReservedWord -> ()
-      (* Everything else causes a rollback *)
-      | _ -> raise Try.Rollback
-      (* So we may or may not be parsing the first part of an arrow function
-       * (the part before the =>). We might end up parsing that whole thing or
-       * we might end up parsing only part of it and thinking we're done. We
-       * need to look at the next token to figure out if we really parsed an
-       * assignment expression or if this is just the beginning of an arrow
-       * function *)
-    in
-    let try_assignment_but_not_arrow_function env =
-      let env = env |> with_error_callback error_callback in
-      let ret = assignment_but_not_arrow_function_cover env in
-      match Peek.token env with
-      | T_ARROW ->
-        (* x => 123 *)
-        raise Try.Rollback
-      | T_COLON
-        when match last_token env with
-             | Some T_RPAREN -> true
-             | _ -> false ->
-        (* (x): number => 123 *)
-        raise Try.Rollback
-      (* async x => 123 -- and we've already parsed async as an identifier
-       * expression *)
-      | _ when Peek.is_identifier env ->
-        begin
-          match ret with
-          | Cover_expr (_, Expression.Identifier (_, { Identifier.name = "async"; comments = _ }))
-            when not (Peek.is_line_terminator env) ->
-            raise Try.Rollback
-          | _ -> ret
-        end
-      | _ -> ret
-    in
-    fun env ->
-      match (Peek.token env, Peek.is_identifier env) with
-      | (T_YIELD, _) when allow_yield env -> Cover_expr (yield env)
-      | ((T_LPAREN as t), _)
-      | ((T_LESS_THAN as t), _)
-      | ((T_THIS as t), _)
-      | (t, true) ->
-        (* Ok, we don't know if this is going to be an arrow function or a
-         * regular assignment expression. Let's first try to parse it as an
-         * assignment expression. If that fails we'll try an arrow function.
-         * Unless it begins with `async <` in which case we first try parsing
-         * it as an arrow function, and then an assignment expression.
-         *)
-        let (initial, secondary) =
-          if t = T_ASYNC && should_parse_types env && Peek.ith_token ~i:1 env = T_LESS_THAN then
-            (try_arrow_function, try_assignment_but_not_arrow_function)
-          else
-            (try_assignment_but_not_arrow_function, try_arrow_function)
-        in
-        (match Try.to_parse env initial with
-        | Try.ParsedSuccessfully expr -> expr
-        | Try.FailedToParse ->
-          (match Try.to_parse env secondary with
-          | Try.ParsedSuccessfully expr -> expr
-          | Try.FailedToParse ->
-            (* Well shoot. It doesn't parse cleanly as a normal
-             * expression or as an arrow_function. Let's treat it as a
-             * normal assignment expression gone wrong *)
-            assignment_but_not_arrow_function_cover env))
-      | _ -> assignment_but_not_arrow_function_cover env
-
-  and assignment env = as_expression env (assignment_cover env)
-
-  and yield env =
-    with_loc
-      (fun env ->
-        if in_formal_parameters env then error env Parse_error.YieldInFormalParameters;
-        let leading = Peek.comments env in
-        let start_loc = Peek.loc env in
-        Expect.token env T_YIELD;
-        let end_loc = Peek.loc env in
-        let (argument, delegate) =
-          if Peek.is_implicit_semicolon env then
-            (None, false)
-          else
-            let delegate = Eat.maybe env T_MULT in
-            let has_argument =
-              match Peek.token env with
-              | T_SEMICOLON
-              | T_RBRACKET
-              | T_RCURLY
-              | T_RPAREN
-              | T_COLON
-              | T_COMMA ->
-                false
-              | _ -> true
-            in
-            let argument =
-              if delegate || has_argument then
-                Some (assignment env)
-              else
-                None
-            in
-            (argument, delegate)
-        in
-        let trailing =
-          match argument with
-          | None -> Eat.trailing_comments env
-          | Some _ -> []
-        in
-        let open Expression in
-        Yield
-          Yield.
-            {
-              argument;
-              delegate;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-              result_out = Loc.btwn start_loc end_loc;
-            }
-          )
-      env
-
-  and is_lhs =
-    let open Expression in
-    function
-    | ( _,
-        MetaProperty
-          {
-            MetaProperty.meta = (_, { Identifier.name = "new"; comments = _ });
-            property = (_, { Identifier.name = "target"; comments = _ });
-            comments = _;
-          }
-      ) ->
-      false
-    | ( _,
-        MetaProperty
-          {
-            MetaProperty.meta = (_, { Identifier.name = "import"; comments = _ });
-            property = (_, { Identifier.name = "meta"; comments = _ });
-            comments = _;
-          }
-      ) ->
-      false
-    (* #sec-static-semantics-static-semantics-isvalidsimpleassignmenttarget *)
-    | (_, Identifier _)
-    | (_, Member _)
-    | (_, MetaProperty _) ->
-      true
-    | (_, Array _)
-    | (_, ArrowFunction _)
-    | (_, Assignment _)
-    | (_, Binary _)
-    | (_, Call _)
-    | (_, Class _)
-    | (_, Comprehension _)
-    | (_, Conditional _)
-    | (_, Function _)
-    | (_, Generator _)
-    | (_, Import _)
-    | (_, JSXElement _)
-    | (_, JSXFragment _)
-    | (_, Literal _)
-    | (_, Logical _)
-    | (_, New _)
-    | (_, Object _)
-    | (_, OptionalCall _)
-    | (_, OptionalMember _)
-    | (_, Sequence _)
-    | (_, Super _)
-    | (_, TaggedTemplate _)
-    | (_, TemplateLiteral _)
-    | (_, This _)
-    | (_, TypeCast _)
-    | (_, Unary _)
-    | (_, Update _)
-    | (_, Yield _) ->
-      false
-
-  and assignment_op env =
-    let op =
-      let open Expression.Assignment in
-      match Peek.token env with
-      | T_RSHIFT3_ASSIGN -> Some (Some RShift3Assign)
-      | T_RSHIFT_ASSIGN -> Some (Some RShiftAssign)
-      | T_LSHIFT_ASSIGN -> Some (Some LShiftAssign)
-      | T_BIT_XOR_ASSIGN -> Some (Some BitXorAssign)
-      | T_BIT_OR_ASSIGN -> Some (Some BitOrAssign)
-      | T_BIT_AND_ASSIGN -> Some (Some BitAndAssign)
-      | T_MOD_ASSIGN -> Some (Some ModAssign)
-      | T_DIV_ASSIGN -> Some (Some DivAssign)
-      | T_MULT_ASSIGN -> Some (Some MultAssign)
-      | T_EXP_ASSIGN -> Some (Some ExpAssign)
-      | T_MINUS_ASSIGN -> Some (Some MinusAssign)
-      | T_PLUS_ASSIGN -> Some (Some PlusAssign)
-      | T_NULLISH_ASSIGN -> Some (Some NullishAssign)
-      | T_AND_ASSIGN -> Some (Some AndAssign)
-      | T_OR_ASSIGN -> Some (Some OrAssign)
-      | T_ASSIGN -> Some None
-      | _ -> None
-    in
-    if op <> None then Eat.token env;
-    op
-
-  (* ConditionalExpression :
-   *   LogicalExpression
-   *   LogicalExpression ? AssignmentExpression : AssignmentExpression
-   *)
-  and conditional_cover env =
-    let start_loc = Peek.loc env in
-    let expr = logical_cover env in
-    if Peek.token env = T_PLING then (
-      Eat.token env;
-
-      (* no_in is ignored for the consequent *)
-      let env' = env |> with_no_in false in
-      let consequent = assignment env' in
-      Expect.token env T_COLON;
-      let (loc, alternate) = with_loc ~start_loc assignment env in
-      Cover_expr
-        ( loc,
-          let open Expression in
-          Conditional
-            { Conditional.test = as_expression env expr; consequent; alternate; comments = None }
-        )
-    ) else
-      expr
-
-  and conditional env = as_expression env (conditional_cover env)
-
-  (*
-   * LogicalANDExpression :
-   *   BinaryExpression
-   *   LogicalANDExpression && BitwiseORExpression
-   *
-   * LogicalORExpression :
-   *   LogicalANDExpression
-   *   LogicalORExpression || LogicalANDExpression
-   *   LogicalORExpression ?? LogicalANDExpression
-   *
-   * LogicalExpression :
-   *   LogicalORExpression
-   *)
-  and logical_cover =
-    let open Expression in
-    let make_logical env left right operator loc =
-      let left = as_expression env left in
-      let right = as_expression env right in
-      Cover_expr (loc, Logical { Logical.operator; left; right; comments = None })
-    in
-    let rec logical_and env left lloc =
-      match Peek.token env with
-      | T_AND ->
-        Eat.token env;
-        let (rloc, right) = with_loc binary_cover env in
-        let loc = Loc.btwn lloc rloc in
-        let left = make_logical env left right Logical.And loc in
-        (* `a && b ?? c` is an error, but to recover, try to parse it like `(a && b) ?? c`. *)
-        let (loc, left) = coalesce ~allowed:false env left loc in
-        logical_and env left loc
-      | _ -> (lloc, left)
-    and logical_or env left lloc =
-      match Peek.token env with
-      | T_OR ->
-        Eat.token env;
-        let (rloc, right) = with_loc binary_cover env in
-        let (rloc, right) = logical_and env right rloc in
-        let loc = Loc.btwn lloc rloc in
-        let left = make_logical env left right Logical.Or loc in
-        (* `a || b ?? c` is an error, but to recover, try to parse it like `(a || b) ?? c`. *)
-        let (loc, left) = coalesce ~allowed:false env left loc in
-        logical_or env left loc
-      | _ -> (lloc, left)
-    and coalesce ~allowed env left lloc =
-      match Peek.token env with
-      | T_PLING_PLING ->
-        if not allowed then error env (Parse_error.NullishCoalescingUnexpectedLogical "??");
-
-        Expect.token env T_PLING_PLING;
-        let (rloc, right) = with_loc binary_cover env in
-        let (rloc, right) =
-          match Peek.token env with
-          | (T_AND | T_OR) as t ->
-            (* `a ?? b || c` is an error. To recover, treat it like `a ?? (b || c)`. *)
-            error env (Parse_error.NullishCoalescingUnexpectedLogical (Token.value_of_token t));
-            let (rloc, right) = logical_and env right rloc in
-            logical_or env right rloc
-          | _ -> (rloc, right)
-        in
-        let loc = Loc.btwn lloc rloc in
-        coalesce ~allowed:true env (make_logical env left right Logical.NullishCoalesce loc) loc
-      | _ -> (lloc, left)
-    in
-    fun env ->
-      let (loc, left) = with_loc binary_cover env in
-      let (_, left) =
-        match Peek.token env with
-        | T_PLING_PLING -> coalesce ~allowed:true env left loc
-        | _ ->
-          let (loc, left) = logical_and env left loc in
-          logical_or env left loc
-      in
-      left
-
-  and binary_cover =
-    let binary_op env =
-      let ret =
-        let open Expression.Binary in
-        match Peek.token env with
-        (* Most BinaryExpression operators are left associative *)
-        (* Lowest pri *)
-        | T_BIT_OR -> Some (BitOr, Left_assoc 2)
-        | T_BIT_XOR -> Some (Xor, Left_assoc 3)
-        | T_BIT_AND -> Some (BitAnd, Left_assoc 4)
-        | T_EQUAL -> Some (Equal, Left_assoc 5)
-        | T_STRICT_EQUAL -> Some (StrictEqual, Left_assoc 5)
-        | T_NOT_EQUAL -> Some (NotEqual, Left_assoc 5)
-        | T_STRICT_NOT_EQUAL -> Some (StrictNotEqual, Left_assoc 5)
-        | T_LESS_THAN -> Some (LessThan, Left_assoc 6)
-        | T_LESS_THAN_EQUAL -> Some (LessThanEqual, Left_assoc 6)
-        | T_GREATER_THAN -> Some (GreaterThan, Left_assoc 6)
-        | T_GREATER_THAN_EQUAL -> Some (GreaterThanEqual, Left_assoc 6)
-        | T_IN ->
-          if no_in env then
-            None
-          else
-            Some (In, Left_assoc 6)
-        | T_INSTANCEOF -> Some (Instanceof, Left_assoc 6)
-        | T_LSHIFT -> Some (LShift, Left_assoc 7)
-        | T_RSHIFT -> Some (RShift, Left_assoc 7)
-        | T_RSHIFT3 -> Some (RShift3, Left_assoc 7)
-        | T_PLUS -> Some (Plus, Left_assoc 8)
-        | T_MINUS -> Some (Minus, Left_assoc 8)
-        | T_MULT -> Some (Mult, Left_assoc 9)
-        | T_DIV -> Some (Div, Left_assoc 9)
-        | T_MOD -> Some (Mod, Left_assoc 9)
-        | T_EXP -> Some (Exp, Right_assoc 10)
-        (* Highest priority *)
-        | _ -> None
-      in
-      if ret <> None then Eat.token env;
-      ret
-    in
-    let make_binary left right operator loc =
-      (loc, Expression.(Binary Binary.{ operator; left; right; comments = None }))
-    in
-    let rec add_to_stack right (rop, rpri) rloc = function
-      | (left, (lop, lpri), lloc) :: rest when is_tighter lpri rpri ->
-        let loc = Loc.btwn lloc rloc in
-        let right = make_binary left right lop loc in
-        add_to_stack right (rop, rpri) loc rest
-      | stack -> (right, (rop, rpri), rloc) :: stack
-    in
-    let rec collapse_stack right rloc = function
-      | [] -> right
-      | (left, (lop, _), lloc) :: rest ->
-        let loc = Loc.btwn lloc rloc in
-        collapse_stack (make_binary left right lop loc) loc rest
-    in
-    let rec helper env stack =
-      let (right_loc, (is_unary, right)) =
-        with_loc
-          (fun env ->
-            let is_unary = peek_unary_op env <> None in
-            let right = unary_cover (env |> with_no_in false) in
-            (is_unary, right))
-          env
-      in
-      ( if Peek.token env = T_LESS_THAN then
-        match right with
-        | Cover_expr (_, Expression.JSXElement _) -> error env Parse_error.AdjacentJSXElements
-        | _ -> ()
-      );
-      match (stack, binary_op env) with
-      | ([], None) -> right
-      | (_, None) ->
-        let right = as_expression env right in
-        Cover_expr (collapse_stack right right_loc stack)
-      | (_, Some (rop, rpri)) ->
-        if is_unary && rop = Expression.Binary.Exp then
-          error_at env (right_loc, Parse_error.InvalidLHSInExponentiation);
-        let right = as_expression env right in
-        helper env (add_to_stack right (rop, rpri) right_loc stack)
-    in
-    (fun env -> helper env [])
-
-  and peek_unary_op env =
-    let open Expression.Unary in
-    match Peek.token env with
-    | T_NOT -> Some Not
-    | T_BIT_NOT -> Some BitNot
-    | T_PLUS -> Some Plus
-    | T_MINUS -> Some Minus
-    | T_TYPEOF -> Some Typeof
-    | T_VOID -> Some Void
-    | T_DELETE -> Some Delete
-    (* If we are in a unary expression context, and within an async function,
-     * assume that a use of "await" is intended as a keyword, not an ordinary
-     * identifier. This is a little bit inconsistent, since it can be used as
-     * an identifier in other contexts (such as a variable name), but it's how
-     * Babel does it. *)
-    | T_AWAIT when allow_await env -> Some Await
-    | _ -> None
-
-  and unary_cover env =
-    let start_loc = Peek.loc env in
-    let leading = Peek.comments env in
-    let op = peek_unary_op env in
-    match op with
-    | None ->
-      let op =
-        let open Expression.Update in
-        match Peek.token env with
-        | T_INCR -> Some Increment
-        | T_DECR -> Some Decrement
-        | _ -> None
-      in
-      (match op with
-      | None -> postfix_cover env
-      | Some operator ->
-        Eat.token env;
-        let (loc, argument) = with_loc ~start_loc unary env in
-        if not (is_lhs argument) then error_at env (fst argument, Parse_error.InvalidLHSInAssignment);
-        (match argument with
-        | (_, Expression.Identifier (_, { Identifier.name; comments = _ })) when is_restricted name
-          ->
-          strict_error env Parse_error.StrictLHSPrefix
-        | _ -> ());
-        Cover_expr
-          ( loc,
-            Expression.(
-              Update
-                {
-                  Update.operator;
-                  prefix = true;
-                  argument;
-                  comments = Flow_ast_utils.mk_comments_opt ~leading ();
-                }
-            )
-          ))
-    | Some operator ->
-      Eat.token env;
-      let (loc, argument) = with_loc ~start_loc unary env in
-      let open Expression in
-      (match (operator, argument) with
-      | (Unary.Delete, (_, Identifier _)) -> strict_error_at env (loc, Parse_error.StrictDelete)
-      | (Unary.Delete, (_, Member member)) ->
-        begin
-          match member.Ast.Expression.Member.property with
-          | Ast.Expression.Member.PropertyPrivateName _ ->
-            error_at env (loc, Parse_error.PrivateDelete)
-          | _ -> ()
-        end
-      | _ -> ());
-      Cover_expr
-        ( loc,
-          let open Expression in
-          Unary { Unary.operator; argument; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-        )
-
-  and unary env = as_expression env (unary_cover env)
-
-  and postfix_cover env =
-    let argument = left_hand_side_cover env in
-    (* No line terminator allowed before operator *)
-    if Peek.is_line_terminator env then
-      argument
-    else
-      let op =
-        let open Expression.Update in
-        match Peek.token env with
-        | T_INCR -> Some Increment
-        | T_DECR -> Some Decrement
-        | _ -> None
-      in
-      match op with
-      | None -> argument
-      | Some operator ->
-        let argument = as_expression env argument in
-        if not (is_lhs argument) then error_at env (fst argument, Parse_error.InvalidLHSInAssignment);
-        (match argument with
-        | (_, Expression.Identifier (_, { Identifier.name; comments = _ })) when is_restricted name
-          ->
-          strict_error env Parse_error.StrictLHSPostfix
-        | _ -> ());
-        let end_loc = Peek.loc env in
-        Eat.token env;
-        let trailing = Eat.trailing_comments env in
-        let loc = Loc.btwn (fst argument) end_loc in
-        Cover_expr
-          ( loc,
-            Expression.(
-              Update
-                {
-                  Update.operator;
-                  prefix = false;
-                  argument;
-                  comments = Flow_ast_utils.mk_comments_opt ~trailing ();
-                }
-            )
-          )
-
-  and left_hand_side_cover env =
-    let start_loc = Peek.loc env in
-    let allow_new = not (no_new env) in
-    let env = with_no_new false env in
-    let expr =
-      match Peek.token env with
-      | T_NEW when allow_new -> Cover_expr (new_expression env)
-      | T_IMPORT -> Cover_expr (import env)
-      | T_SUPER -> Cover_expr (super env)
-      | _ when Peek.is_function env -> Cover_expr (_function env)
-      | _ -> primary_cover env
-    in
-    call_cover env start_loc expr
-
-  and left_hand_side env = as_expression env (left_hand_side_cover env)
-
-  and super env =
-    let (allowed, call_allowed) =
-      match allow_super env with
-      | No_super -> (false, false)
-      | Super_prop -> (true, false)
-      | Super_prop_or_call -> (true, true)
-    in
-    let loc = Peek.loc env in
-    let leading = Peek.comments env in
-    Expect.token env T_SUPER;
-    let trailing = Eat.trailing_comments env in
-    let super =
-      ( loc,
-        Expression.Super
-          { Expression.Super.comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-      )
-    in
-    match Peek.token env with
-    | T_PERIOD
-    | T_LBRACKET ->
-      let super =
-        if not allowed then (
-          error_at env (loc, Parse_error.UnexpectedSuper);
-          (loc, Expression.Identifier (Flow_ast_utils.ident_of_source (loc, "super")))
-        ) else
-          super
-      in
-      call ~allow_optional_chain:false env loc super
-    | T_LPAREN ->
-      let super =
-        if not call_allowed then (
-          error_at env (loc, Parse_error.UnexpectedSuperCall);
-          (loc, Expression.Identifier (Flow_ast_utils.ident_of_source (loc, "super")))
-        ) else
-          super
-      in
-      call ~allow_optional_chain:false env loc super
-    | _ ->
-      if not allowed then
-        error_at env (loc, Parse_error.UnexpectedSuper)
-      else
-        error_unexpected ~expected:"either a call or access of `super`" env;
-      super
-
-  and import env =
-    with_loc
-      (fun env ->
-        let leading = Peek.comments env in
-        let start_loc = Peek.loc env in
-        Expect.token env T_IMPORT;
-        if Eat.maybe env T_PERIOD then (
-          (* import.meta *)
-          let import_ident = Flow_ast_utils.ident_of_source (start_loc, "import") in
-          let meta_loc = Peek.loc env in
-          Expect.identifier env "meta";
-          let meta_ident = Flow_ast_utils.ident_of_source (meta_loc, "meta") in
-          let trailing = Eat.trailing_comments env in
-          Expression.MetaProperty
-            {
-              Expression.MetaProperty.meta = import_ident;
-              property = meta_ident;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            }
-        ) else
-          let leading_arg = Peek.comments env in
-          Expect.token env T_LPAREN;
-          let argument = add_comments (assignment (with_no_in false env)) ~leading:leading_arg in
-          Expect.token env T_RPAREN;
-          let trailing = Eat.trailing_comments env in
-          Expression.Import
-            {
-              Expression.Import.argument;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            })
-      env
-
-  and call_cover ?(allow_optional_chain = true) ?(in_optional_chain = false) env start_loc left =
-    let left = member_cover ~allow_optional_chain ~in_optional_chain env start_loc left in
-    let optional =
-      match last_token env with
-      | Some T_PLING_PERIOD -> true
-      | _ -> false
-    in
-    let left_to_callee env =
-      let { remove_trailing; _ } = trailing_and_remover env in
-      remove_trailing (as_expression env left) (fun remover left -> remover#expression left)
-    in
-    let arguments ?targs env callee =
-      let (args_loc, arguments) = arguments env in
-      let loc = Loc.btwn start_loc args_loc in
-      let call =
-        { Expression.Call.callee; targs; arguments = (args_loc, arguments); comments = None }
-      in
-      let call =
-        if optional || in_optional_chain then
-          let open Expression in
-          OptionalCall { OptionalCall.call; optional; filtered_out = loc }
-        else
-          Expression.Call call
-      in
-      let in_optional_chain = in_optional_chain || optional in
-      call_cover ~allow_optional_chain ~in_optional_chain env start_loc (Cover_expr (loc, call))
-    in
-    if no_call env then
-      left
-    else
-      match Peek.token env with
-      | T_LPAREN -> arguments env (left_to_callee env)
-      | T_LSHIFT
-      | T_LESS_THAN
-        when should_parse_types env ->
-        (* If we are parsing types, then f<T>(e) is a function call with a
-           type application. If we aren't, it's a nested binary expression. *)
-        let error_callback _ _ = raise Try.Rollback in
-        let env = env |> with_error_callback error_callback in
-        (* Parameterized call syntax is ambiguous, so we fall back to
-           standard parsing if it fails. *)
-        Try.or_else env ~fallback:left (fun env ->
-            let callee = left_to_callee env in
-            let targs = call_type_args env in
-            arguments ?targs env callee
-        )
-      | _ -> left
-
-  and call ?(allow_optional_chain = true) env start_loc left =
-    as_expression env (call_cover ~allow_optional_chain env start_loc (Cover_expr left))
-
-  and new_expression env =
-    with_loc
-      (fun env ->
-        let start_loc = Peek.loc env in
-        let leading = Peek.comments env in
-        Expect.token env T_NEW;
-
-        if in_function env && Peek.token env = T_PERIOD then (
-          let trailing = Eat.trailing_comments env in
-          Eat.token env;
-          let meta =
-            Flow_ast_utils.ident_of_source
-              (start_loc, "new")
-              ?comments:(Flow_ast_utils.mk_comments_opt ~leading ~trailing ())
-          in
-          match Peek.token env with
-          | T_IDENTIFIER { raw = "target"; _ } ->
-            let property = Parse.identifier env in
-            Expression.(MetaProperty MetaProperty.{ meta; property; comments = None })
-          | _ ->
-            error_unexpected ~expected:"the identifier `target`" env;
-            Eat.token env;
-
-            (* skip unknown identifier *)
-            Expression.Identifier meta
-          (* return `new` identifier *)
-        ) else
-          let callee_loc = Peek.loc env in
-          let expr =
-            match Peek.token env with
-            | T_NEW -> new_expression env
-            | T_SUPER -> super (env |> with_no_call true)
-            | _ when Peek.is_function env -> _function env
-            | _ -> primary env
-          in
-          let callee =
-            member ~allow_optional_chain:false (env |> with_no_call true) callee_loc expr
-          in
-          (* You can do something like
-           *   new raw`42`
-           *)
-          let callee =
-            let callee =
-              match Peek.token env with
-              | T_TEMPLATE_PART part -> tagged_template env callee_loc callee part
-              | _ -> callee
-            in
-            (* Remove trailing comments if the callee is followed by args or type args *)
-            if Peek.token env = T_LPAREN || (should_parse_types env && Peek.token env = T_LESS_THAN)
-            then
-              let { remove_trailing; _ } = trailing_and_remover env in
-              remove_trailing callee (fun remover callee -> remover#expression callee)
-            else
-              callee
-          in
-          let targs =
-            (* If we are parsing types, then new C<T>(e) is a constructor with a
-               type application. If we aren't, it's a nested binary expression. *)
-            if should_parse_types env then
-              (* Parameterized call syntax is ambiguous, so we fall back to
-                 standard parsing if it fails. *)
-              let error_callback _ _ = raise Try.Rollback in
-              let env = env |> with_error_callback error_callback in
-              Try.or_else env ~fallback:None call_type_args
-            else
-              None
-          in
-          let arguments =
-            match Peek.token env with
-            | T_LPAREN -> Some (arguments env)
-            | _ -> None
-          in
-          let comments = Flow_ast_utils.mk_comments_opt ~leading () in
-          Expression.(New New.{ callee; targs; arguments; comments }))
-      env
-
-  and call_type_args =
-    let args =
-      let rec args_helper env acc =
-        match Peek.token env with
-        | T_EOF
-        | T_GREATER_THAN ->
-          List.rev acc
-        | _ ->
-          let t =
-            match Peek.token env with
-            | T_IDENTIFIER { value = "_"; _ } ->
-              let loc = Peek.loc env in
-              let leading = Peek.comments env in
-              Expect.identifier env "_";
-              let trailing = Eat.trailing_comments env in
-              Expression.CallTypeArg.Implicit
-                ( loc,
-                  {
-                    Expression.CallTypeArg.Implicit.comments =
-                      Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-                  }
-                )
-            | _ -> Expression.CallTypeArg.Explicit (Type._type env)
-          in
-          let acc = t :: acc in
-          if Peek.token env <> T_GREATER_THAN then Expect.token env T_COMMA;
-          args_helper env acc
-      in
-      fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_LESS_THAN;
-        let arguments = args_helper env [] in
-        let internal = Peek.comments env in
-        Expect.token env T_GREATER_THAN;
-        let trailing =
-          if Peek.token env = T_LPAREN then
-            let { trailing; _ } = trailing_and_remover env in
-            trailing
-          else
-            Eat.trailing_comments env
-        in
-        {
-          Expression.CallTypeArgs.arguments;
-          comments = Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-        }
-    in
-    fun env ->
-      Eat.push_lex_mode env Lex_mode.TYPE;
-      let node =
-        if Peek.token env = T_LESS_THAN then
-          Some (with_loc args env)
-        else
-          None
-      in
-      Eat.pop_lex_mode env;
-      node
-
-  and arguments =
-    let spread_element env =
-      let leading = Peek.comments env in
-      Expect.token env T_ELLIPSIS;
-      let argument = assignment env in
-      Expression.SpreadElement.{ argument; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-    in
-    let argument env =
-      match Peek.token env with
-      | T_ELLIPSIS -> Expression.Spread (with_loc spread_element env)
-      | _ -> Expression.Expression (assignment env)
-    in
-    let rec arguments' env acc =
-      match Peek.token env with
-      | T_EOF
-      | T_RPAREN ->
-        List.rev acc
-      | _ ->
-        let acc = argument env :: acc in
-        if Peek.token env <> T_RPAREN then Expect.token env T_COMMA;
-        arguments' env acc
-    in
-    fun env ->
-      with_loc
-        (fun env ->
-          let leading = Peek.comments env in
-          Expect.token env T_LPAREN;
-          let args = arguments' env [] in
-          let internal = Peek.comments env in
-          Expect.token env T_RPAREN;
-          let trailing = Eat.trailing_comments env in
-          {
-            Expression.ArgList.arguments = args;
-            comments = Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-          })
-        env
-
-  and member_cover =
-    let dynamic
-        ?(allow_optional_chain = true)
-        ?(in_optional_chain = false)
-        ?(optional = false)
-        env
-        start_loc
-        left =
-      let expr = Parse.expression (env |> with_no_call false) in
-      let last_loc = Peek.loc env in
-      Expect.token env T_RBRACKET;
-      let trailing = Eat.trailing_comments env in
-      let loc = Loc.btwn start_loc last_loc in
-      let member =
-        {
-          Expression.Member._object = as_expression env left;
-          property = Expression.Member.PropertyExpression expr;
-          comments = Flow_ast_utils.mk_comments_opt ~trailing ();
-        }
-      in
-
-      let member =
-        if in_optional_chain then
-          let open Expression in
-          OptionalMember { OptionalMember.member; optional; filtered_out = loc }
-        else
-          Expression.Member member
-      in
-      call_cover ~allow_optional_chain ~in_optional_chain env start_loc (Cover_expr (loc, member))
-    in
-    let static
-        ?(allow_optional_chain = true)
-        ?(in_optional_chain = false)
-        ?(optional = false)
-        env
-        start_loc
-        left =
-      let open Expression.Member in
-      let (id_loc, property) =
-        match Peek.token env with
-        | T_POUND ->
-          let ((id_loc, { Ast.PrivateName.name; _ }) as id) = private_identifier env in
-          add_used_private env name id_loc;
-          (id_loc, PropertyPrivateName id)
-        | _ ->
-          let ((id_loc, _) as id) = identifier_name env in
-          (id_loc, PropertyIdentifier id)
-      in
-      let loc = Loc.btwn start_loc id_loc in
-      (* super.PrivateName is a syntax error *)
-      begin
-        match (left, property) with
-        | (Cover_expr (_, Ast.Expression.Super _), PropertyPrivateName _) ->
-          error_at env (loc, Parse_error.SuperPrivate)
-        | _ -> ()
-      end;
-      let member =
-        Expression.Member.{ _object = as_expression env left; property; comments = None }
-      in
-      let member =
-        if in_optional_chain then
-          let open Expression in
-          OptionalMember { OptionalMember.member; optional; filtered_out = loc }
-        else
-          Expression.Member member
-      in
-      call_cover ~allow_optional_chain ~in_optional_chain env start_loc (Cover_expr (loc, member))
-    in
-    fun ?(allow_optional_chain = true) ?(in_optional_chain = false) env start_loc left ->
-      match Peek.token env with
-      | T_PLING_PERIOD ->
-        if not allow_optional_chain then error env Parse_error.OptionalChainNew;
-
-        Expect.token env T_PLING_PERIOD;
-        begin
-          match Peek.token env with
-          | T_TEMPLATE_PART _ ->
-            error env Parse_error.OptionalChainTemplate;
-            left
-          | T_LPAREN -> left
-          | T_LESS_THAN when should_parse_types env -> left
-          | T_LBRACKET ->
-            Eat.token env;
-            dynamic ~allow_optional_chain ~in_optional_chain:true ~optional:true env start_loc left
-          | _ ->
-            static ~allow_optional_chain ~in_optional_chain:true ~optional:true env start_loc left
-        end
-      | T_LBRACKET ->
-        Eat.token env;
-        dynamic ~allow_optional_chain ~in_optional_chain env start_loc left
-      | T_PERIOD ->
-        Eat.token env;
-        static ~allow_optional_chain ~in_optional_chain env start_loc left
-      | T_TEMPLATE_PART part ->
-        if in_optional_chain then error env Parse_error.OptionalChainTemplate;
-
-        let expr = tagged_template env start_loc (as_expression env left) part in
-        call_cover ~allow_optional_chain:false env start_loc (Cover_expr expr)
-      | _ -> left
-
-  and member ?(allow_optional_chain = true) env start_loc left =
-    as_expression env (member_cover ~allow_optional_chain env start_loc (Cover_expr left))
-
-  and _function env =
-    with_loc
-      (fun env ->
-        let (async, leading_async) = Declaration.async env in
-        let (sig_loc, (id, params, generator, predicate, return, tparams, leading)) =
-          with_loc
-            (fun env ->
-              let leading_function = Peek.comments env in
-              Expect.token env T_FUNCTION;
-              let (generator, leading_generator) = Declaration.generator env in
-              let leading = List.concat [leading_async; leading_function; leading_generator] in
-              (* `await` is a keyword in async functions:
-                 - proposal-async-iteration/#prod-AsyncGeneratorExpression
-                 - #prod-AsyncFunctionExpression *)
-              let await = async in
-              (* `yield` is a keyword in generator functions:
-                 - proposal-async-iteration/#prod-AsyncGeneratorExpression
-                 - #prod-GeneratorExpression *)
-              let yield = generator in
-              let (id, tparams) =
-                if Peek.token env = T_LPAREN then
-                  (None, None)
-                else
-                  let id =
-                    match Peek.token env with
-                    | T_LESS_THAN -> None
-                    | _ ->
-                      let env = env |> with_allow_await await |> with_allow_yield yield in
-                      let id =
-                        id_remove_trailing
-                          env
-                          (Parse.identifier ~restricted_error:Parse_error.StrictFunctionName env)
-                      in
-                      Some id
-                  in
-                  let tparams = type_params_remove_trailing env (Type.type_params env) in
-                  (id, tparams)
-              in
-              (* #sec-function-definitions-static-semantics-early-errors *)
-              let env = env |> with_allow_super No_super in
-              let params =
-                let params = Declaration.function_params ~await ~yield env in
-                if Peek.token env = T_COLON then
-                  params
-                else
-                  function_params_remove_trailing env params
-              in
-              let (return, predicate) = Type.annotation_and_predicate_opt env in
-              let (return, predicate) =
-                match predicate with
-                | None -> (type_annotation_hint_remove_trailing env return, predicate)
-                | Some _ -> (return, predicate_remove_trailing env predicate)
-              in
-              (id, params, generator, predicate, return, tparams, leading))
-            env
-        in
-        let simple_params = is_simple_parameter_list params in
-        let (body, contains_use_strict) =
-          Declaration.function_body env ~async ~generator ~expression:true ~simple_params
-        in
-        Declaration.strict_post_check env ~contains_use_strict id params;
-        Expression.Function
-          {
-            Function.id;
-            params;
-            body;
-            generator;
-            async;
-            predicate;
-            return;
-            tparams;
-            sig_loc;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ();
-          })
-      env
-
-  and number env kind raw =
-    let value =
-      match kind with
-      | LEGACY_OCTAL ->
-        strict_error env Parse_error.StrictOctalLiteral;
-        begin
-          try Int64.to_float (Int64.of_string ("0o" ^ raw)) with
-          | Failure _ -> failwith ("Invalid legacy octal " ^ raw)
-        end
-      | LEGACY_NON_OCTAL ->
-        strict_error env Parse_error.StrictNonOctalLiteral;
-        begin
-          try float_of_string raw with
-          | Failure _ -> failwith ("Invalid number " ^ raw)
-        end
-      | BINARY
-      | OCTAL ->
-        begin
-          try Int64.to_float (Int64.of_string raw) with
-          | Failure _ -> failwith ("Invalid binary/octal " ^ raw)
-        end
-      | NORMAL ->
-        begin
-          try float_of_string raw with
-          | Failure _ -> failwith ("Invalid number " ^ raw)
-        end
-    in
-    Expect.token env (T_NUMBER { kind; raw });
-    value
-
-  and bigint_strip_n raw =
-    let size = String.length raw in
-    let str =
-      if size != 0 && raw.[size - 1] == 'n' then
-        String.sub raw 0 (size - 1)
-      else
-        raw
-    in
-    str
-
-  and bigint env kind raw =
-    let postraw = bigint_strip_n raw in
-    let value = Int64.of_string_opt postraw in
-    Expect.token env (T_BIGINT { kind; raw });
-    value
-
-  and primary_cover env =
-    let loc = Peek.loc env in
-    let leading = Peek.comments env in
-    match Peek.token env with
-    | T_THIS ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Cover_expr
-        ( loc,
-          Expression.This
-            { Expression.This.comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-        )
-    | T_NUMBER { kind; raw } ->
-      let value = Literal.Number (number env kind raw) in
-      let trailing = Eat.trailing_comments env in
-      Cover_expr
-        ( loc,
-          let open Expression in
-          Literal
-            { Literal.value; raw; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-        )
-    | T_BIGINT { kind; raw } ->
-      let value = Literal.BigInt (bigint env kind raw) in
-      let trailing = Eat.trailing_comments env in
-      Cover_expr
-        ( loc,
-          let open Expression in
-          Literal
-            { Literal.value; raw; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-        )
-    | T_STRING (loc, value, raw, octal) ->
-      if octal then strict_error env Parse_error.StrictOctalLiteral;
-      Eat.token env;
-      let value = Literal.String value in
-      let trailing = Eat.trailing_comments env in
-      Cover_expr
-        ( loc,
-          Expression.Literal
-            { Literal.value; raw; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-        )
-    | (T_TRUE | T_FALSE) as token ->
-      Eat.token env;
-      let truthy = token = T_TRUE in
-      let raw =
-        if truthy then
-          "true"
-        else
-          "false"
-      in
-      let value = Literal.Boolean truthy in
-      let trailing = Eat.trailing_comments env in
-      Cover_expr
-        ( loc,
-          Expression.Literal
-            { Literal.value; raw; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-        )
-    | T_NULL ->
-      Eat.token env;
-      let raw = "null" in
-      let value = Literal.Null in
-      let trailing = Eat.trailing_comments env in
-      Cover_expr
-        ( loc,
-          Expression.Literal
-            { Literal.value; raw; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-        )
-    | T_LPAREN -> Cover_expr (group env)
-    | T_LCURLY ->
-      let (loc, obj, errs) = Parse.object_initializer env in
-      Cover_patt ((loc, Expression.Object obj), errs)
-    | T_LBRACKET ->
-      let (loc, (arr, errs)) = with_loc array_initializer env in
-      Cover_patt ((loc, Expression.Array arr), errs)
-    | T_DIV
-    | T_DIV_ASSIGN ->
-      Cover_expr (regexp env)
-    | T_LESS_THAN ->
-      let (loc, expression) =
-        match Parse.jsx_element_or_fragment env with
-        | (loc, `Element e) -> (loc, Expression.JSXElement e)
-        | (loc, `Fragment f) -> (loc, Expression.JSXFragment f)
-      in
-      Cover_expr (loc, expression)
-    | T_TEMPLATE_PART part ->
-      let (loc, template) = template_literal env part in
-      Cover_expr (loc, Expression.TemplateLiteral template)
-    | T_CLASS -> Cover_expr (Parse.class_expression env)
-    | _ when Peek.is_identifier env ->
-      let id = Parse.identifier env in
-      Cover_expr (fst id, Expression.Identifier id)
-    | t ->
-      error_unexpected env;
-
-      (* Let's get rid of the bad token *)
-      begin
-        match t with
-        | T_ERROR _ -> Eat.token env
-        | _ -> ()
-      end;
-
-      (* Really no idea how to recover from this. I suppose a null
-       * expression is as good as anything *)
-      let value = Literal.Null in
-      let raw = "null" in
-      let trailing = [] in
-      Cover_expr
-        ( loc,
-          let open Expression in
-          Literal
-            { Literal.value; raw; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-        )
-
-  and primary env = as_expression env (primary_cover env)
-
-  and template_literal =
-    let rec template_parts env quasis expressions =
-      let expr = Parse.expression env in
-      let expressions = expr :: expressions in
-      match Peek.token env with
-      | T_RCURLY ->
-        Eat.push_lex_mode env Lex_mode.TEMPLATE;
-        let (loc, part, is_tail) =
-          match Peek.token env with
-          | T_TEMPLATE_PART (loc, { cooked; raw; _ }, tail) ->
-            let open Ast.Expression.TemplateLiteral in
-            Eat.token env;
-            (loc, { Element.value = { Element.cooked; raw }; tail }, tail)
-          | _ -> assert false
-        in
-        Eat.pop_lex_mode env;
-        let quasis = (loc, part) :: quasis in
-        if is_tail then
-          (loc, List.rev quasis, List.rev expressions)
-        else
-          template_parts env quasis expressions
-      | _ ->
-        (* Malformed template *)
-        error_unexpected ~expected:"a template literal part" env;
-        let imaginary_quasi =
-          ( fst expr,
-            {
-              Expression.TemplateLiteral.Element.value =
-                { Expression.TemplateLiteral.Element.raw = ""; cooked = "" };
-              tail = true;
-            }
-          )
-        in
-        (fst expr, List.rev (imaginary_quasi :: quasis), List.rev expressions)
-    in
-    fun env ((start_loc, { cooked; raw; _ }, is_tail) as part) ->
-      let leading = Peek.comments env in
-      Expect.token env (T_TEMPLATE_PART part);
-      let (end_loc, quasis, expressions) =
-        let head =
-          ( start_loc,
-            {
-              Ast.Expression.TemplateLiteral.Element.value =
-                { Ast.Expression.TemplateLiteral.Element.cooked; raw };
-              tail = is_tail;
-            }
-          )
-        in
-
-        if is_tail then
-          (start_loc, [head], [])
-        else
-          template_parts env [head] []
-      in
-      let trailing = Eat.trailing_comments env in
-      let loc = Loc.btwn start_loc end_loc in
-      ( loc,
-        {
-          Expression.TemplateLiteral.quasis;
-          expressions;
-          comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-        }
-      )
-
-  and tagged_template env start_loc tag part =
-    let tag = expression_remove_trailing env tag in
-    let quasi = template_literal env part in
-    ( Loc.btwn start_loc (fst quasi),
-      Expression.(TaggedTemplate TaggedTemplate.{ tag; quasi; comments = None })
-    )
-
-  and group env =
-    let leading = Peek.comments env in
-    let (loc, cover) =
-      with_loc
-        (fun env ->
-          Expect.token env T_LPAREN;
-          let expr_start_loc = Peek.loc env in
-          let expression = assignment env in
-          let ret =
-            match Peek.token env with
-            | T_COLON ->
-              let annot = Type.annotation env in
-              Group_typecast Expression.TypeCast.{ expression; annot; comments = None }
-            | T_COMMA -> Group_expr (sequence env ~start_loc:expr_start_loc [expression])
-            | _ -> Group_expr expression
-          in
-          Expect.token env T_RPAREN;
-          ret)
-        env
-    in
-    let trailing = Eat.trailing_comments env in
-    let ret =
-      match cover with
-      | Group_expr expr -> expr
-      | Group_typecast cast -> (loc, Expression.TypeCast cast)
-    in
-    add_comments ret ~leading ~trailing
-
-  and add_comments ?(leading = []) ?(trailing = []) (loc, expression) =
-    let merge_comments inner =
-      Flow_ast_utils.merge_comments
-        ~inner
-        ~outer:(Flow_ast_utils.mk_comments_opt ~leading ~trailing ())
-    in
-    let merge_comments_with_internal inner =
-      Flow_ast_utils.merge_comments_with_internal
-        ~inner
-        ~outer:(Flow_ast_utils.mk_comments_opt ~leading ~trailing ())
-    in
-    let open Expression in
-    ( loc,
-      match expression with
-      | Array ({ Array.comments; _ } as e) ->
-        Array { e with Array.comments = merge_comments_with_internal comments }
-      | ArrowFunction ({ Function.comments; _ } as e) ->
-        ArrowFunction { e with Function.comments = merge_comments comments }
-      | Assignment ({ Assignment.comments; _ } as e) ->
-        Assignment { e with Assignment.comments = merge_comments comments }
-      | Binary ({ Binary.comments; _ } as e) ->
-        Binary { e with Binary.comments = merge_comments comments }
-      | Call ({ Call.comments; _ } as e) -> Call { e with Call.comments = merge_comments comments }
-      | Class ({ Class.comments; _ } as e) ->
-        Class { e with Class.comments = merge_comments comments }
-      | Conditional ({ Conditional.comments; _ } as e) ->
-        Conditional { e with Conditional.comments = merge_comments comments }
-      | Function ({ Function.comments; _ } as e) ->
-        Function { e with Function.comments = merge_comments comments }
-      | Identifier (loc, ({ Identifier.comments; _ } as e)) ->
-        Identifier (loc, { e with Identifier.comments = merge_comments comments })
-      | Import ({ Import.comments; _ } as e) ->
-        Import { e with Import.comments = merge_comments comments }
-      | JSXElement ({ JSX.comments; _ } as e) ->
-        JSXElement { e with JSX.comments = merge_comments comments }
-      | JSXFragment ({ JSX.frag_comments; _ } as e) ->
-        JSXFragment { e with JSX.frag_comments = merge_comments frag_comments }
-      | Literal ({ Literal.comments; _ } as e) ->
-        Literal { e with Literal.comments = merge_comments comments }
-      | Logical ({ Logical.comments; _ } as e) ->
-        Logical { e with Logical.comments = merge_comments comments }
-      | Member ({ Member.comments; _ } as e) ->
-        Member { e with Member.comments = merge_comments comments }
-      | MetaProperty ({ MetaProperty.comments; _ } as e) ->
-        MetaProperty { e with MetaProperty.comments = merge_comments comments }
-      | New ({ New.comments; _ } as e) -> New { e with New.comments = merge_comments comments }
-      | Object ({ Object.comments; _ } as e) ->
-        Object { e with Object.comments = merge_comments_with_internal comments }
-      | OptionalCall ({ OptionalCall.call = { Call.comments; _ } as call; _ } as optional_call) ->
-        OptionalCall
-          {
-            optional_call with
-            OptionalCall.call = { call with Call.comments = merge_comments comments };
-          }
-      | OptionalMember
-          ({ OptionalMember.member = { Member.comments; _ } as member; _ } as optional_member) ->
-        OptionalMember
-          {
-            optional_member with
-            OptionalMember.member = { member with Member.comments = merge_comments comments };
-          }
-      | Sequence ({ Sequence.comments; _ } as e) ->
-        Sequence { e with Sequence.comments = merge_comments comments }
-      | Super { Super.comments; _ } -> Super { Super.comments = merge_comments comments }
-      | TaggedTemplate ({ TaggedTemplate.comments; _ } as e) ->
-        TaggedTemplate { e with TaggedTemplate.comments = merge_comments comments }
-      | TemplateLiteral ({ TemplateLiteral.comments; _ } as e) ->
-        TemplateLiteral { e with TemplateLiteral.comments = merge_comments comments }
-      | This { This.comments; _ } -> This { This.comments = merge_comments comments }
-      | TypeCast ({ TypeCast.comments; _ } as e) ->
-        TypeCast { e with TypeCast.comments = merge_comments comments }
-      | Unary ({ Unary.comments; _ } as e) ->
-        Unary { e with Unary.comments = merge_comments comments }
-      | Update ({ Update.comments; _ } as e) ->
-        Update { e with Update.comments = merge_comments comments }
-      | Yield ({ Yield.comments; _ } as e) ->
-        Yield { e with Yield.comments = merge_comments comments }
-      (* TODO: Delete once all expressions support comment attachment *)
-      | _ -> expression
-    )
-
-  and array_initializer =
-    let rec elements env (acc, errs) =
-      match Peek.token env with
-      | T_EOF
-      | T_RBRACKET ->
-        (List.rev acc, Pattern_cover.rev_errors errs)
-      | T_COMMA ->
-        let loc = Peek.loc env in
-        Eat.token env;
-        elements env (Expression.Array.Hole loc :: acc, errs)
-      | T_ELLIPSIS ->
-        let leading = Peek.comments env in
-        let (loc, (argument, new_errs)) =
-          with_loc
-            (fun env ->
-              Eat.token env;
-              match assignment_cover env with
-              | Cover_expr argument -> (argument, Pattern_cover.empty_errors)
-              | Cover_patt (argument, new_errs) -> (argument, new_errs))
-            env
-        in
-        let elem =
-          Expression.(
-            Array.Spread
-              ( loc,
-                SpreadElement.{ argument; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-              )
-          )
-        in
-        let is_last = Peek.token env = T_RBRACKET in
-        (* if this array is interpreted as a pattern, the spread becomes an AssignmentRestElement
-           which must be the last element. We can easily error about additional elements since
-           they will be in the element list, but a trailing elision, like `[...x,]`, is not part
-           of the AST. so, keep track of the error so we can raise it if this is a pattern. *)
-        let new_errs =
-          if (not is_last) && Peek.ith_token ~i:1 env = T_RBRACKET then
-            let if_patt = (loc, Parse_error.ElementAfterRestElement) :: new_errs.if_patt in
-            { new_errs with if_patt }
-          else
-            new_errs
-        in
-        if not is_last then Expect.token env T_COMMA;
-        let acc = elem :: acc in
-        let errs = Pattern_cover.rev_append_errors new_errs errs in
-        elements env (acc, errs)
-      | _ ->
-        let (elem, new_errs) =
-          match assignment_cover env with
-          | Cover_expr elem -> (elem, Pattern_cover.empty_errors)
-          | Cover_patt (elem, new_errs) -> (elem, new_errs)
-        in
-        if Peek.token env <> T_RBRACKET then Expect.token env T_COMMA;
-        let acc = Expression.Array.Expression elem :: acc in
-        let errs = Pattern_cover.rev_append_errors new_errs errs in
-        elements env (acc, errs)
-    in
-    fun env ->
-      let leading = Peek.comments env in
-      Expect.token env T_LBRACKET;
-      let (elems, errs) = elements env ([], Pattern_cover.empty_errors) in
-      let internal = Peek.comments env in
-      Expect.token env T_RBRACKET;
-      let trailing = Eat.trailing_comments env in
-      ( {
-          Ast.Expression.Array.elements = elems;
-          comments = Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-        },
-        errs
-      )
-
-  and regexp env =
-    Eat.push_lex_mode env Lex_mode.REGEXP;
-    let loc = Peek.loc env in
-    let leading = Peek.comments env in
-    let tkn = Peek.token env in
-    let (raw, pattern, raw_flags, trailing) =
-      match tkn with
-      | T_REGEXP (_, pattern, flags) ->
-        Eat.token env;
-        let trailing = Eat.trailing_comments env in
-        let raw = "/" ^ pattern ^ "/" ^ flags in
-        (raw, pattern, flags, trailing)
-      | _ ->
-        error_unexpected ~expected:"a regular expression" env;
-        ("", "", "", [])
-    in
-    Eat.pop_lex_mode env;
-    let filtered_flags = Buffer.create (String.length raw_flags) in
-    String.iter
-      (function
-        | ('d' | 'g' | 'i' | 'm' | 's' | 'u' | 'y') as c -> Buffer.add_char filtered_flags c
-        | _ -> ())
-      raw_flags;
-    let flags = Buffer.contents filtered_flags in
-    if flags <> raw_flags then error env (Parse_error.InvalidRegExpFlags raw_flags);
-    let value = Literal.(RegExp { RegExp.pattern; flags }) in
-    ( loc,
-      let open Expression in
-      Literal
-        { Literal.value; raw; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-    )
-
-  and try_arrow_function =
-    (* Certain errors (almost all errors) cause a rollback *)
-    let error_callback _ =
-      Parse_error.(
-        function
-        (* Don't rollback on these errors. *)
-        | StrictParamName
-        | StrictReservedWord
-        | ParameterAfterRestParameter
-        | NewlineBeforeArrow
-        | YieldInFormalParameters
-        | ThisParamBannedInArrowFunctions ->
-          ()
-        (* Everything else causes a rollback *)
-        | _ -> raise Try.Rollback
-      )
-    in
-    let concise_function_body env =
-      match Peek.token env with
-      | T_LCURLY ->
-        let (body_block, contains_use_strict) = Parse.function_block_body env ~expression:true in
-        (Function.BodyBlock body_block, contains_use_strict)
-      | _ ->
-        let expr = Parse.assignment env in
-        (Function.BodyExpression expr, false)
-    in
-    fun env ->
-      let env = env |> with_error_callback error_callback in
-      let start_loc = Peek.loc env in
-      (* a T_ASYNC could either be a parameter name or it could be indicating
-       * that it's an async function *)
-      let (async, leading) =
-        if Peek.ith_token ~i:1 env <> T_ARROW then
-          Declaration.async env
-        else
-          (false, [])
-      in
-      let (sig_loc, (tparams, params, return, predicate)) =
-        with_loc
-          (fun env ->
-            let tparams = type_params_remove_trailing env (Type.type_params env) in
-            (* Disallow all fancy features for identifier => body *)
-            if Peek.is_identifier env && tparams = None then
-              let ((loc, _) as name) =
-                Parse.identifier ~restricted_error:Parse_error.StrictParamName env
-              in
-              let param =
-                ( loc,
-                  {
-                    Ast.Function.Param.argument =
-                      ( loc,
-                        Pattern.Identifier
-                          {
-                            Pattern.Identifier.name;
-                            annot = Ast.Type.Missing (Peek.loc_skip_lookahead env);
-                            optional = false;
-                          }
-                      );
-                    default = None;
-                  }
-                )
-              in
-              ( tparams,
-                ( loc,
-                  {
-                    Ast.Function.Params.params = [param];
-                    rest = None;
-                    comments = None;
-                    this_ = None;
-                  }
-                ),
-                Ast.Type.Missing Loc.{ loc with start = loc._end },
-                None
-              )
-            else
-              let params =
-                let yield = allow_yield env in
-                let await = allow_await env in
-                Declaration.function_params ~await ~yield env
-              in
-              (* There's an ambiguity if you use a function type as the return
-               * type for an arrow function. So we disallow anonymous function
-               * types in arrow function return types unless the function type is
-               * enclosed in parens *)
-              let (return, predicate) =
-                env |> with_no_anon_function_type true |> Type.annotation_and_predicate_opt
-              in
-              (tparams, params, return, predicate))
-          env
-      in
-      (* It's hard to tell if an invalid expression was intended to be an
-       * arrow function before we see the =>. If there are no params, that
-       * implies "()" which is only ever found in arrow params. Similarly,
-       * rest params indicate arrow functions. Therefore, if we see a rest
-       * param or an empty param list then we can disable the rollback and
-       * instead generate errors as if we were parsing an arrow function *)
-      let env =
-        match params with
-        | (_, { Ast.Function.Params.params = _; rest = Some _; this_ = None; comments = _ })
-        | (_, { Ast.Function.Params.params = []; rest = _; this_ = None; comments = _ }) ->
-          without_error_callback env
-        | _ -> env
-      in
-
-      (* Disallow this param annotations in arrow functions *)
-      let params =
-        match params with
-        | (loc, ({ Ast.Function.Params.this_ = Some (this_loc, _); _ } as params)) ->
-          error_at env (this_loc, Parse_error.ThisParamBannedInArrowFunctions);
-          (loc, { params with Ast.Function.Params.this_ = None })
-        | _ -> params
-      in
-      let simple_params = is_simple_parameter_list params in
-
-      if Peek.is_line_terminator env && Peek.token env = T_ARROW then
-        error env Parse_error.NewlineBeforeArrow;
-      Expect.token env T_ARROW;
-
-      (* Now we know for sure this is an arrow function *)
-      let env = without_error_callback env in
-      (* arrow functions can't be generators *)
-      let env = enter_function env ~async ~generator:false ~simple_params in
-      let (end_loc, (body, contains_use_strict)) = with_loc concise_function_body env in
-      Declaration.strict_post_check env ~contains_use_strict None params;
-      let loc = Loc.btwn start_loc end_loc in
-      Cover_expr
-        ( loc,
-          let open Expression in
-          ArrowFunction
-            {
-              Function.id = None;
-              params;
-              body;
-              async;
-              generator = false;
-              (* arrow functions cannot be generators *)
-              predicate;
-              return;
-              tparams;
-              sig_loc;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            }
-        )
-
-  and sequence =
-    let rec helper acc env =
-      match Peek.token env with
-      | T_COMMA ->
-        Eat.token env;
-        let expr = assignment env in
-        helper (expr :: acc) env
-      | _ ->
-        let expressions = List.rev acc in
-        Expression.(Sequence Sequence.{ expressions; comments = None })
-    in
-    (fun env ~start_loc acc -> with_loc ~start_loc (helper acc) env)
-end
diff --git a/jscomp/js_parser/file_key.ml b/jscomp/js_parser/file_key.ml
deleted file mode 100644
index 2ee9176..0000000
--- a/jscomp/js_parser/file_key.ml
+++ /dev/null
@@ -1,100 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-open Primitive_deriving
-
-type t =
-  | LibFile of string
-  | SourceFile of string
-  | JsonFile of string
-  (* A resource that might get required, like .css, .jpg, etc. We don't parse
-     these, just check that they exist *)
-  | ResourceFile of string
-[@@deriving_inline equal]
-let _ = fun (_ : t) -> ()
-let equal =
-  (fun a__001_ ->
-     fun b__002_ ->
-       if Ppx_compare_lib.phys_equal a__001_ b__002_
-       then true
-       else
-         (match (a__001_, b__002_) with
-          | (LibFile _a__003_, LibFile _b__004_) ->
-              equal_string _a__003_ _b__004_
-          | (LibFile _, _) -> false
-          | (_, LibFile _) -> false
-          | (SourceFile _a__005_, SourceFile _b__006_) ->
-              equal_string _a__005_ _b__006_
-          | (SourceFile _, _) -> false
-          | (_, SourceFile _) -> false
-          | (JsonFile _a__007_, JsonFile _b__008_) ->
-              equal_string _a__007_ _b__008_
-          | (JsonFile _, _) -> false
-          | (_, JsonFile _) -> false
-          | (ResourceFile _a__009_, ResourceFile _b__010_) ->
-              equal_string _a__009_ _b__010_) : t -> t -> bool)
-let _ = equal
-[@@@end]
-let to_string = function
-  | LibFile x
-  | SourceFile x
-  | JsonFile x
-  | ResourceFile x ->
-    x
-
-let to_path = function
-  | LibFile x
-  | SourceFile x
-  | JsonFile x
-  | ResourceFile x ->
-    Ok x
-
-let compare =
-  (* libs, then source and json files at the same priority since JSON files are
-   * basically source files. We don't actually read resource files so they come
-   * last *)
-  let order_of_filename = function
-    | LibFile _ -> 1
-    | SourceFile _ -> 2
-    | JsonFile _ -> 2
-    | ResourceFile _ -> 3
-  in
-  fun a b ->
-    let k = order_of_filename a - order_of_filename b in
-    if k <> 0 then
-      k
-    else
-      String.compare (to_string a) (to_string b)
-
-let compare_opt a b =
-  match (a, b) with
-  | (Some _, None) -> -1
-  | (None, Some _) -> 1
-  | (None, None) -> 0
-  | (Some a, Some b) -> compare a b
-
-let is_lib_file = function
-  | LibFile _ -> true
-  | SourceFile _ -> false
-  | JsonFile _ -> false
-  | ResourceFile _ -> false
-
-let map f = function
-  | LibFile filename -> LibFile (f filename)
-  | SourceFile filename -> SourceFile (f filename)
-  | JsonFile filename -> JsonFile (f filename)
-  | ResourceFile filename -> ResourceFile (f filename)
-
-let exists f = function
-  | LibFile filename
-  | SourceFile filename
-  | JsonFile filename
-  | ResourceFile filename ->
-    f filename
-
-let check_suffix filename suffix = exists (fun fn -> Filename.check_suffix fn suffix) filename
-let chop_suffix filename suffix = map (fun fn -> Filename.chop_suffix fn suffix) filename
-let with_suffix filename suffix = map (fun fn -> fn ^ suffix) filename
diff --git a/jscomp/js_parser/flow_LICENSE b/jscomp/js_parser/flow_LICENSE
deleted file mode 100644
index 188fb2b..0000000
--- a/jscomp/js_parser/flow_LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013-present, Facebook, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/jscomp/js_parser/flow_ast.ml b/jscomp/js_parser/flow_ast.ml
deleted file mode 100644
index 628b21c..0000000
--- a/jscomp/js_parser/flow_ast.ml
+++ /dev/null
@@ -1,1754 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module rec Syntax : sig
-  type ('M, 'internal) t = {
-    leading: 'M Comment.t list;
-    trailing: 'M Comment.t list;
-    internal: 'internal;
-  }
-end =
-  Syntax
-
-and Identifier : sig
-  type ('M, 'T) t = 'T * 'M t'
-
-  and 'M t' = {
-    name: string;
-    comments: ('M, unit) Syntax.t option;
-  }
-end =
-  Identifier
-
-and PrivateName : sig
-  type 'M t = 'M * 'M t'
-
-  and 'M t' = {
-    name: string;
-    comments: ('M, unit) Syntax.t option;
-  }
-end =
-  PrivateName
-
-and Literal : sig
-  module RegExp : sig
-    type t = {
-      pattern: string;
-      flags: string;
-    }
-  end
-
-  (* Literals also carry along their raw value *)
-  type 'M t = {
-    value: value;
-    raw: string;
-    comments: ('M, unit) Syntax.t option;
-  }
-
-  and value =
-    | String of string
-    | Boolean of bool
-    | Null
-    | Number of float
-    | BigInt of int64 option
-    | RegExp of RegExp.t
-end =
-  Literal
-
-and StringLiteral : sig
-  type 'M t = {
-    value: string;
-    raw: string;
-    comments: ('M, unit) Syntax.t option;
-  }
-end =
-  StringLiteral
-
-and NumberLiteral : sig
-  type 'M t = {
-    value: float;
-    raw: string;
-    comments: ('M, unit) Syntax.t option;
-  }
-end =
-  NumberLiteral
-
-and BigIntLiteral : sig
-  type 'M t = {
-    (* This will be None if we couldn't parse `raw`. That could be if the number is out of range or invalid (like a float) *)
-    value: int64 option;
-    raw: string;
-    comments: ('M, unit) Syntax.t option;
-  }
-end =
-  BigIntLiteral
-
-and BooleanLiteral : sig
-  type 'M t = {
-    value: bool;
-    comments: ('M, unit) Syntax.t option;
-  }
-end =
-  BooleanLiteral
-
-and Variance : sig
-  type 'M t = 'M * 'M t'
-
-  and kind =
-    | Plus
-    | Minus
-
-  and 'M t' = {
-    kind: kind;
-    comments: ('M, unit) Syntax.t option;
-  }
-end =
-  Variance
-
-and ComputedKey : sig
-  type ('M, 'T) t = 'M * ('M, 'T) ComputedKey.t'
-
-  and ('M, 'T) t' = {
-    expression: ('M, 'T) Expression.t;
-    comments: ('M, unit) Syntax.t option;
-  }
-end =
-  ComputedKey
-
-and Type : sig
-  module Function : sig
-    module Param : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        name: ('M, 'T) Identifier.t option;
-        annot: ('M, 'T) Type.t;
-        optional: bool;
-      }
-    end
-
-    module RestParam : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        argument: ('M, 'T) Param.t;
-        comments: ('M, unit) Syntax.t option;
-      }
-    end
-
-    module ThisParam : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        annot: ('M, 'T) Type.annotation;
-        comments: ('M, unit) Syntax.t option;
-      }
-    end
-
-    module Params : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        this_: ('M, 'T) ThisParam.t option;
-        params: ('M, 'T) Param.t list;
-        rest: ('M, 'T) RestParam.t option;
-        comments: ('M, 'M Comment.t list) Syntax.t option;
-      }
-    end
-
-    type ('M, 'T) t = {
-      tparams: ('M, 'T) Type.TypeParams.t option;
-      params: ('M, 'T) Params.t;
-      return: ('M, 'T) Type.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Generic : sig
-    module Identifier : sig
-      type ('M, 'T) t =
-        | Unqualified of ('M, 'T) Identifier.t
-        | Qualified of ('M, 'T) qualified
-
-      and ('M, 'T) qualified = 'M * ('M, 'T) qualified'
-
-      and ('M, 'T) qualified' = {
-        qualification: ('M, 'T) t;
-        id: ('M, 'T) Identifier.t;
-      }
-    end
-
-    type ('M, 'T) t = {
-      id: ('M, 'T) Identifier.t;
-      targs: ('M, 'T) Type.TypeArgs.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module IndexedAccess : sig
-    type ('M, 'T) t = {
-      _object: ('M, 'T) Type.t;
-      index: ('M, 'T) Type.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module OptionalIndexedAccess : sig
-    type ('M, 'T) t = {
-      indexed_access: ('M, 'T) IndexedAccess.t;
-      optional: bool;
-    }
-  end
-
-  module Object : sig
-    module Property : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        key: ('M, 'T) Expression.Object.Property.key;
-        value: ('M, 'T) value;
-        optional: bool;
-        static: bool;
-        proto: bool;
-        _method: bool;
-        variance: 'M Variance.t option;
-        comments: ('M, unit) Syntax.t option;
-      }
-
-      and ('M, 'T) value =
-        | Init of ('M, 'T) Type.t
-        | Get of ('M * ('M, 'T) Function.t)
-        | Set of ('M * ('M, 'T) Function.t)
-    end
-
-    module SpreadProperty : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        argument: ('M, 'T) Type.t;
-        comments: ('M, unit) Syntax.t option;
-      }
-    end
-
-    module Indexer : sig
-      type ('M, 'T) t' = {
-        id: ('M, 'M) Identifier.t option;
-        key: ('M, 'T) Type.t;
-        value: ('M, 'T) Type.t;
-        static: bool;
-        variance: 'M Variance.t option;
-        comments: ('M, unit) Syntax.t option;
-      }
-
-      and ('M, 'T) t = 'M * ('M, 'T) t'
-    end
-
-    module CallProperty : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        value: 'M * ('M, 'T) Function.t;
-        static: bool;
-        comments: ('M, unit) Syntax.t option;
-      }
-    end
-
-    module InternalSlot : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        id: ('M, 'M) Identifier.t;
-        value: ('M, 'T) Type.t;
-        optional: bool;
-        static: bool;
-        _method: bool;
-        comments: ('M, unit) Syntax.t option;
-      }
-    end
-
-    type ('M, 'T) t = {
-      exact: bool;
-      (* Inexact indicates the presence of ... in the object. It is more
-       * easily understood if exact is read as "explicitly exact" and "inexact"
-       * is read as "explicitly inexact".
-       *
-       * This confusion will go away when we get rid of the exact flag in favor
-       * of inexact as part of the work to make object types exact by default.
-       * *)
-      inexact: bool;
-      properties: ('M, 'T) property list;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-
-    and ('M, 'T) property =
-      | Property of ('M, 'T) Property.t
-      | SpreadProperty of ('M, 'T) SpreadProperty.t
-      | Indexer of ('M, 'T) Indexer.t
-      | CallProperty of ('M, 'T) CallProperty.t
-      | InternalSlot of ('M, 'T) InternalSlot.t
-  end
-
-  module Interface : sig
-    type ('M, 'T) t = {
-      body: 'M * ('M, 'T) Object.t;
-      extends: ('M * ('M, 'T) Generic.t) list;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Nullable : sig
-    type ('M, 'T) t = {
-      argument: ('M, 'T) Type.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Typeof : sig
-    module Target : sig
-      type ('M, 'T) t =
-        | Unqualified of ('M, 'T) Identifier.t
-        | Qualified of ('M, 'T) qualified
-
-      and ('M, 'T) qualified' = {
-        qualification: ('M, 'T) t;
-        id: ('M, 'T) Identifier.t;
-      }
-
-      and ('M, 'T) qualified = 'T * ('M, 'T) qualified'
-    end
-
-    type ('M, 'T) t = {
-      argument: ('M, 'T) Target.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Tuple : sig
-    type ('M, 'T) t = {
-      types: ('M, 'T) Type.t list;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Array : sig
-    type ('M, 'T) t = {
-      argument: ('M, 'T) Type.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Union : sig
-    type ('M, 'T) t = {
-      types: ('M, 'T) Type.t * ('M, 'T) Type.t * ('M, 'T) Type.t list;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Intersection : sig
-    type ('M, 'T) t = {
-      types: ('M, 'T) Type.t * ('M, 'T) Type.t * ('M, 'T) Type.t list;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  type ('M, 'T) t = 'T * ('M, 'T) t'
-
-  (* Yes, we could add a little complexity here to show that Any and Void
-   * should never be declared nullable, but that check can happen later *)
-  and ('M, 'T) t' =
-    | Any of ('M, unit) Syntax.t option
-    | Mixed of ('M, unit) Syntax.t option
-    | Empty of ('M, unit) Syntax.t option
-    | Void of ('M, unit) Syntax.t option
-    | Null of ('M, unit) Syntax.t option
-    | Number of ('M, unit) Syntax.t option
-    | BigInt of ('M, unit) Syntax.t option
-    | String of ('M, unit) Syntax.t option
-    | Boolean of ('M, unit) Syntax.t option
-    | Symbol of ('M, unit) Syntax.t option
-    | Exists of ('M, unit) Syntax.t option
-    | Nullable of ('M, 'T) Nullable.t
-    | Function of ('M, 'T) Function.t
-    | Object of ('M, 'T) Object.t
-    | Interface of ('M, 'T) Interface.t
-    | Array of ('M, 'T) Array.t
-    | Generic of ('M, 'T) Generic.t
-    | IndexedAccess of ('M, 'T) IndexedAccess.t
-    | OptionalIndexedAccess of ('M, 'T) OptionalIndexedAccess.t
-    | Union of ('M, 'T) Union.t
-    | Intersection of ('M, 'T) Intersection.t
-    | Typeof of ('M, 'T) Typeof.t
-    | Tuple of ('M, 'T) Tuple.t
-    | StringLiteral of 'M StringLiteral.t
-    | NumberLiteral of 'M NumberLiteral.t
-    | BigIntLiteral of 'M BigIntLiteral.t
-    | BooleanLiteral of 'M BooleanLiteral.t
-
-  (* Type.annotation is a concrete syntax node with a location that starts at
-   * the colon and ends after the type. For example, "var a: number", the
-   * identifier a would have a property annot which contains a
-   * Type.annotation with a location from column 6-14 *)
-  and ('M, 'T) annotation = 'M * ('M, 'T) t
-
-  and ('M, 'T) annotation_or_hint =
-    | Missing of 'T
-    | Available of ('M, 'T) Type.annotation
-
-  module TypeParam : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      name: ('M, 'M) Identifier.t;
-      bound: ('M, 'T) Type.annotation_or_hint;
-      variance: 'M Variance.t option;
-      default: ('M, 'T) Type.t option;
-    }
-  end
-
-  module TypeParams : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      params: ('M, 'T) TypeParam.t list;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-  end
-
-  module TypeArgs : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      arguments: ('M, 'T) Type.t list;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-  end
-
-  module Predicate : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      kind: ('M, 'T) kind;
-      comments: ('M, unit) Syntax.t option;
-    }
-
-    and ('M, 'T) kind =
-      | Declared of ('M, 'T) Expression.t
-      | Inferred
-  end
-end =
-  Type
-
-and Statement : sig
-  module Block : sig
-    type ('M, 'T) t = {
-      body: ('M, 'T) Statement.t list;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-  end
-
-  module If : sig
-    module Alternate : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        body: ('M, 'T) Statement.t;
-        comments: ('M, unit) Syntax.t option;
-      }
-    end
-
-    type ('M, 'T) t = {
-      test: ('M, 'T) Expression.t;
-      consequent: ('M, 'T) Statement.t;
-      alternate: ('M, 'T) Alternate.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Labeled : sig
-    type ('M, 'T) t = {
-      label: ('M, 'M) Identifier.t;
-      body: ('M, 'T) Statement.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Break : sig
-    type 'M t = {
-      label: ('M, 'M) Identifier.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Continue : sig
-    type 'M t = {
-      label: ('M, 'M) Identifier.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Debugger : sig
-    type 'M t = { comments: ('M, unit) Syntax.t option }
-  end
-
-  module With : sig
-    type ('M, 'T) t = {
-      _object: ('M, 'T) Expression.t;
-      body: ('M, 'T) Statement.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module TypeAlias : sig
-    type ('M, 'T) t = {
-      id: ('M, 'T) Identifier.t;
-      tparams: ('M, 'T) Type.TypeParams.t option;
-      right: ('M, 'T) Type.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module OpaqueType : sig
-    type ('M, 'T) t = {
-      id: ('M, 'T) Identifier.t;
-      tparams: ('M, 'T) Type.TypeParams.t option;
-      impltype: ('M, 'T) Type.t option;
-      supertype: ('M, 'T) Type.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Switch : sig
-    module Case : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        test: ('M, 'T) Expression.t option;
-        consequent: ('M, 'T) Statement.t list;
-        comments: ('M, unit) Syntax.t option;
-      }
-    end
-
-    type ('M, 'T) t = {
-      discriminant: ('M, 'T) Expression.t;
-      cases: ('M, 'T) Case.t list;
-      comments: ('M, unit) Syntax.t option;
-      exhaustive_out: 'T;
-    }
-  end
-
-  module Return : sig
-    type ('M, 'T) t = {
-      argument: ('M, 'T) Expression.t option;
-      comments: ('M, unit) Syntax.t option;
-      return_out: 'T;
-    }
-  end
-
-  module Throw : sig
-    type ('M, 'T) t = {
-      argument: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Try : sig
-    module CatchClause : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        param: ('M, 'T) Pattern.t option;
-        body: 'M * ('M, 'T) Block.t;
-        comments: ('M, unit) Syntax.t option;
-      }
-    end
-
-    type ('M, 'T) t = {
-      block: 'M * ('M, 'T) Block.t;
-      handler: ('M, 'T) CatchClause.t option;
-      finalizer: ('M * ('M, 'T) Block.t) option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module VariableDeclaration : sig
-    module Declarator : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        id: ('M, 'T) Pattern.t;
-        init: ('M, 'T) Expression.t option;
-      }
-    end
-
-    type ('M, 'T) t = {
-      declarations: ('M, 'T) Declarator.t list;
-      kind: kind;
-      comments: ('M, unit) Syntax.t option;
-    }
-
-    and kind =
-      | Var
-      | Let
-      | Const
-  end
-
-  module While : sig
-    type ('M, 'T) t = {
-      test: ('M, 'T) Expression.t;
-      body: ('M, 'T) Statement.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module DoWhile : sig
-    type ('M, 'T) t = {
-      body: ('M, 'T) Statement.t;
-      test: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module For : sig
-    type ('M, 'T) t = {
-      init: ('M, 'T) init option;
-      test: ('M, 'T) Expression.t option;
-      update: ('M, 'T) Expression.t option;
-      body: ('M, 'T) Statement.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-
-    and ('M, 'T) init =
-      | InitDeclaration of ('M * ('M, 'T) VariableDeclaration.t)
-      | InitExpression of ('M, 'T) Expression.t
-  end
-
-  module ForIn : sig
-    type ('M, 'T) t = {
-      left: ('M, 'T) left;
-      right: ('M, 'T) Expression.t;
-      body: ('M, 'T) Statement.t;
-      each: bool;
-      comments: ('M, unit) Syntax.t option;
-    }
-
-    and ('M, 'T) left =
-      | LeftDeclaration of ('M * ('M, 'T) VariableDeclaration.t)
-      | LeftPattern of ('M, 'T) Pattern.t
-  end
-
-  module ForOf : sig
-    type ('M, 'T) t = {
-      left: ('M, 'T) left;
-      right: ('M, 'T) Expression.t;
-      body: ('M, 'T) Statement.t;
-      await: bool;
-      comments: ('M, unit) Syntax.t option;
-    }
-
-    and ('M, 'T) left =
-      | LeftDeclaration of ('M * ('M, 'T) VariableDeclaration.t)
-      | LeftPattern of ('M, 'T) Pattern.t
-  end
-
-  module EnumDeclaration : sig
-    module DefaultedMember : sig
-      type 'M t = 'M * 'M t'
-      and 'M t' = { id: ('M, 'M) Identifier.t }
-    end
-
-    module InitializedMember : sig
-      type ('I, 'M) t = 'M * ('I, 'M) t'
-
-      and ('I, 'M) t' = {
-        id: ('M, 'M) Identifier.t;
-        init: 'M * 'I;
-      }
-    end
-
-    module BooleanBody : sig
-      type 'M t = {
-        members: ('M BooleanLiteral.t, 'M) InitializedMember.t list;
-        explicit_type: bool;
-        has_unknown_members: bool;
-        comments: ('M, 'M Comment.t list) Syntax.t option;
-      }
-    end
-
-    module NumberBody : sig
-      type 'M t = {
-        members: ('M NumberLiteral.t, 'M) InitializedMember.t list;
-        explicit_type: bool;
-        has_unknown_members: bool;
-        comments: ('M, 'M Comment.t list) Syntax.t option;
-      }
-    end
-
-    module StringBody : sig
-      type 'M t = {
-        members: ('M StringLiteral.t, 'M) members;
-        explicit_type: bool;
-        has_unknown_members: bool;
-        comments: ('M, 'M Comment.t list) Syntax.t option;
-      }
-
-      and ('I, 'M) members =
-        | Defaulted of 'M DefaultedMember.t list
-        | Initialized of ('I, 'M) InitializedMember.t list
-    end
-
-    module SymbolBody : sig
-      type 'M t = {
-        members: 'M DefaultedMember.t list;
-        has_unknown_members: bool;
-        comments: ('M, 'M Comment.t list) Syntax.t option;
-      }
-    end
-
-    type ('M, 'T) t = {
-      id: ('M, 'T) Identifier.t;
-      body: 'M body;
-      comments: ('M, unit) Syntax.t option;
-    }
-
-    and 'M body = 'M * 'M body'
-
-    and 'M body' =
-      | BooleanBody of 'M BooleanBody.t
-      | NumberBody of 'M NumberBody.t
-      | StringBody of 'M StringBody.t
-      | SymbolBody of 'M SymbolBody.t
-  end
-
-  module Interface : sig
-    type ('M, 'T) t = {
-      id: ('M, 'T) Identifier.t;
-      tparams: ('M, 'T) Type.TypeParams.t option;
-      extends: ('M * ('M, 'T) Type.Generic.t) list;
-      body: 'M * ('M, 'T) Type.Object.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module DeclareClass : sig
-    type ('M, 'T) t = {
-      id: ('M, 'T) Identifier.t;
-      tparams: ('M, 'T) Type.TypeParams.t option;
-      body: 'M * ('M, 'T) Type.Object.t;
-      extends: ('M * ('M, 'T) Type.Generic.t) option;
-      mixins: ('M * ('M, 'T) Type.Generic.t) list;
-      implements: ('M, 'T) Class.Implements.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module DeclareVariable : sig
-    type ('M, 'T) t = {
-      id: ('M, 'T) Identifier.t;
-      annot: ('M, 'T) Type.annotation;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module DeclareFunction : sig
-    type ('M, 'T) t = {
-      id: ('M, 'T) Identifier.t;
-      annot: ('M, 'T) Type.annotation;
-      predicate: ('M, 'T) Type.Predicate.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module DeclareModule : sig
-    type ('M, 'T) id =
-      | Identifier of ('M, 'T) Identifier.t
-      | Literal of ('T * 'M StringLiteral.t)
-
-    and module_kind =
-      | CommonJS
-      | ES
-
-    and ('M, 'T) t = {
-      id: ('M, 'T) id;
-      body: 'M * ('M, 'T) Block.t;
-      kind: module_kind;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module DeclareModuleExports : sig
-    type ('M, 'T) t = {
-      annot: ('M, 'T) Type.annotation;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module ExportNamedDeclaration : sig
-    module ExportSpecifier : sig
-      type 'M t = 'M * 'M t'
-
-      and 'M t' = {
-        local: ('M, 'M) Identifier.t;
-        exported: ('M, 'M) Identifier.t option;
-      }
-    end
-
-    module ExportBatchSpecifier : sig
-      type 'M t = 'M * ('M, 'M) Identifier.t option
-    end
-
-    type ('M, 'T) t = {
-      declaration: ('M, 'T) Statement.t option;
-      specifiers: 'M specifier option;
-      source: ('M * 'M StringLiteral.t) option;
-      export_kind: Statement.export_kind;
-      comments: ('M, unit) Syntax.t option;
-    }
-
-    and 'M specifier =
-      | ExportSpecifiers of 'M ExportSpecifier.t list
-      | ExportBatchSpecifier of 'M ExportBatchSpecifier.t
-  end
-
-  module ExportDefaultDeclaration : sig
-    type ('M, 'T) t = {
-      default: 'M;
-      declaration: ('M, 'T) declaration;
-      comments: ('M, unit) Syntax.t option;
-    }
-
-    and ('M, 'T) declaration =
-      | Declaration of ('M, 'T) Statement.t
-      | Expression of ('M, 'T) Expression.t
-  end
-
-  module DeclareExportDeclaration : sig
-    type ('M, 'T) declaration =
-      (* declare export var *)
-      | Variable of ('M * ('M, 'T) DeclareVariable.t)
-      (* declare export function *)
-      | Function of ('M * ('M, 'T) DeclareFunction.t)
-      (* declare export class *)
-      | Class of ('M * ('M, 'T) DeclareClass.t)
-      (* declare export default [type]
-       * this corresponds to things like
-       * export default 1+1; *)
-      | DefaultType of ('M, 'T) Type.t
-      (* declare export type *)
-      | NamedType of ('M * ('M, 'T) TypeAlias.t)
-      (* declare export opaque type *)
-      | NamedOpaqueType of ('M * ('M, 'T) OpaqueType.t)
-      (* declare export interface *)
-      | Interface of ('M * ('M, 'T) Interface.t)
-
-    and ('M, 'T) t = {
-      default: 'M option;
-      declaration: ('M, 'T) declaration option;
-      specifiers: 'M ExportNamedDeclaration.specifier option;
-      source: ('M * 'M StringLiteral.t) option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module ImportDeclaration : sig
-    type import_kind =
-      | ImportType
-      | ImportTypeof
-      | ImportValue
-
-    and ('M, 'T) specifier =
-      | ImportNamedSpecifiers of ('M, 'T) named_specifier list
-      | ImportNamespaceSpecifier of ('M * ('M, 'T) Identifier.t)
-
-    and ('M, 'T) named_specifier = {
-      kind: import_kind option;
-      local: ('M, 'T) Identifier.t option;
-      remote: ('M, 'T) Identifier.t;
-    }
-
-    and ('M, 'T) t = {
-      import_kind: import_kind;
-      source: 'T * 'M StringLiteral.t;
-      default: ('M, 'T) Identifier.t option;
-      specifiers: ('M, 'T) specifier option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Expression : sig
-    type ('M, 'T) t = {
-      expression: ('M, 'T) Expression.t;
-      directive: string option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Empty : sig
-    type 'M t = { comments: ('M, unit) Syntax.t option }
-  end
-
-  type export_kind =
-    | ExportType
-    | ExportValue
-
-  and ('M, 'T) t = 'M * ('M, 'T) t'
-
-  and ('M, 'T) t' =
-    | Block of ('M, 'T) Block.t
-    | Break of 'M Break.t
-    | ClassDeclaration of ('M, 'T) Class.t
-    | Continue of 'M Continue.t
-    | Debugger of 'M Debugger.t
-    | DeclareClass of ('M, 'T) DeclareClass.t
-    | DeclareExportDeclaration of ('M, 'T) DeclareExportDeclaration.t
-    | DeclareFunction of ('M, 'T) DeclareFunction.t
-    | DeclareInterface of ('M, 'T) Interface.t
-    | DeclareModule of ('M, 'T) DeclareModule.t
-    | DeclareModuleExports of ('M, 'T) DeclareModuleExports.t
-    | DeclareTypeAlias of ('M, 'T) TypeAlias.t
-    | DeclareOpaqueType of ('M, 'T) OpaqueType.t
-    | DeclareVariable of ('M, 'T) DeclareVariable.t
-    | DoWhile of ('M, 'T) DoWhile.t
-    | Empty of 'M Empty.t
-    | EnumDeclaration of ('M, 'T) EnumDeclaration.t
-    | ExportDefaultDeclaration of ('M, 'T) ExportDefaultDeclaration.t
-    | ExportNamedDeclaration of ('M, 'T) ExportNamedDeclaration.t
-    | Expression of ('M, 'T) Expression.t
-    | For of ('M, 'T) For.t
-    | ForIn of ('M, 'T) ForIn.t
-    | ForOf of ('M, 'T) ForOf.t
-    | FunctionDeclaration of ('M, 'T) Function.t
-    | If of ('M, 'T) If.t
-    | ImportDeclaration of ('M, 'T) ImportDeclaration.t
-    | InterfaceDeclaration of ('M, 'T) Interface.t
-    | Labeled of ('M, 'T) Labeled.t
-    | Return of ('M, 'T) Return.t
-    | Switch of ('M, 'T) Switch.t
-    | Throw of ('M, 'T) Throw.t
-    | Try of ('M, 'T) Try.t
-    | TypeAlias of ('M, 'T) TypeAlias.t
-    | OpaqueType of ('M, 'T) OpaqueType.t
-    | VariableDeclaration of ('M, 'T) VariableDeclaration.t
-    | While of ('M, 'T) While.t
-    | With of ('M, 'T) With.t
-end =
-  Statement
-
-and Expression : sig
-  module CallTypeArg : sig
-    module Implicit : sig
-      type ('M, 'T) t = 'T * 'M t'
-      and 'M t' = { comments: ('M, unit) Syntax.t option }
-    end
-
-    type ('M, 'T) t =
-      | Explicit of ('M, 'T) Type.t
-      | Implicit of ('M, 'T) Implicit.t
-  end
-
-  module CallTypeArgs : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      arguments: ('M, 'T) CallTypeArg.t list;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-  end
-
-  module SpreadElement : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      argument: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Array : sig
-    type ('M, 'T) element =
-      | Expression of ('M, 'T) Expression.t
-      | Spread of ('M, 'T) SpreadElement.t
-      | Hole of 'M
-
-    type ('M, 'T) t = {
-      elements: ('M, 'T) element list;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-  end
-
-  module TemplateLiteral : sig
-    module Element : sig
-      type value = {
-        raw: string;
-        cooked: string;
-      }
-
-      and 'M t = 'M * t'
-
-      and t' = {
-        value: value;
-        tail: bool;
-      }
-    end
-
-    type ('M, 'T) t = {
-      quasis: 'M Element.t list;
-      expressions: ('M, 'T) Expression.t list;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module TaggedTemplate : sig
-    type ('M, 'T) t = {
-      tag: ('M, 'T) Expression.t;
-      quasi: 'M * ('M, 'T) TemplateLiteral.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Object : sig
-    module Property : sig
-      type ('M, 'T) key =
-        | Literal of ('T * 'M Literal.t)
-        | Identifier of ('M, 'T) Identifier.t
-        | PrivateName of 'M PrivateName.t
-        | Computed of ('M, 'T) ComputedKey.t
-
-      and ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' =
-        | Init of {
-            key: ('M, 'T) key;
-            value: ('M, 'T) Expression.t;
-            shorthand: bool;
-          }
-        | Method of {
-            key: ('M, 'T) key;
-            value: 'M * ('M, 'T) Function.t;
-          }
-        | Get of {
-            key: ('M, 'T) key;
-            value: 'M * ('M, 'T) Function.t;
-            comments: ('M, unit) Syntax.t option;
-          }
-        | Set of {
-            key: ('M, 'T) key;
-            value: 'M * ('M, 'T) Function.t;
-            comments: ('M, unit) Syntax.t option;
-          }
-    end
-
-    module SpreadProperty : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        argument: ('M, 'T) Expression.t;
-        comments: ('M, unit) Syntax.t option;
-      }
-    end
-
-    type ('M, 'T) property =
-      | Property of ('M, 'T) Property.t
-      | SpreadProperty of ('M, 'T) SpreadProperty.t
-
-    and ('M, 'T) t = {
-      properties: ('M, 'T) property list;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-  end
-
-  module Sequence : sig
-    type ('M, 'T) t = {
-      expressions: ('M, 'T) Expression.t list;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Unary : sig
-    type operator =
-      | Minus
-      | Plus
-      | Not
-      | BitNot
-      | Typeof
-      | Void
-      | Delete
-      | Await
-
-    and ('M, 'T) t = {
-      operator: operator;
-      argument: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Binary : sig
-    type operator =
-      | Equal
-      | NotEqual
-      | StrictEqual
-      | StrictNotEqual
-      | LessThan
-      | LessThanEqual
-      | GreaterThan
-      | GreaterThanEqual
-      | LShift
-      | RShift
-      | RShift3
-      | Plus
-      | Minus
-      | Mult
-      | Exp
-      | Div
-      | Mod
-      | BitOr
-      | Xor
-      | BitAnd
-      | In
-      | Instanceof
-
-    and ('M, 'T) t = {
-      operator: operator;
-      left: ('M, 'T) Expression.t;
-      right: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Assignment : sig
-    type operator =
-      | PlusAssign
-      | MinusAssign
-      | MultAssign
-      | ExpAssign
-      | DivAssign
-      | ModAssign
-      | LShiftAssign
-      | RShiftAssign
-      | RShift3Assign
-      | BitOrAssign
-      | BitXorAssign
-      | BitAndAssign
-      | NullishAssign
-      | AndAssign
-      | OrAssign
-
-    and ('M, 'T) t = {
-      operator: operator option;
-      left: ('M, 'T) Pattern.t;
-      right: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Update : sig
-    type operator =
-      | Increment
-      | Decrement
-
-    and ('M, 'T) t = {
-      operator: operator;
-      argument: ('M, 'T) Expression.t;
-      prefix: bool;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Logical : sig
-    type operator =
-      | Or
-      | And
-      | NullishCoalesce
-
-    and ('M, 'T) t = {
-      operator: operator;
-      left: ('M, 'T) Expression.t;
-      right: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Conditional : sig
-    type ('M, 'T) t = {
-      test: ('M, 'T) Expression.t;
-      consequent: ('M, 'T) Expression.t;
-      alternate: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  type ('M, 'T) expression_or_spread =
-    | Expression of ('M, 'T) Expression.t
-    | Spread of ('M, 'T) SpreadElement.t
-
-  module ArgList : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      arguments: ('M, 'T) expression_or_spread list;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-  end
-
-  module New : sig
-    type ('M, 'T) t = {
-      callee: ('M, 'T) Expression.t;
-      targs: ('M, 'T) Expression.CallTypeArgs.t option;
-      arguments: ('M, 'T) ArgList.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Call : sig
-    type ('M, 'T) t = {
-      callee: ('M, 'T) Expression.t;
-      targs: ('M, 'T) Expression.CallTypeArgs.t option;
-      arguments: ('M, 'T) ArgList.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module OptionalCall : sig
-    type ('M, 'T) t = {
-      call: ('M, 'T) Call.t;
-      filtered_out: 'T;
-      optional: bool;
-    }
-  end
-
-  module Member : sig
-    type ('M, 'T) property =
-      | PropertyIdentifier of ('M, 'T) Identifier.t
-      | PropertyPrivateName of 'M PrivateName.t
-      | PropertyExpression of ('M, 'T) Expression.t
-
-    and ('M, 'T) t = {
-      _object: ('M, 'T) Expression.t;
-      property: ('M, 'T) property;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module OptionalMember : sig
-    type ('M, 'T) t = {
-      member: ('M, 'T) Member.t;
-      filtered_out: 'T;
-      optional: bool;
-    }
-  end
-
-  module Yield : sig
-    type ('M, 'T) t = {
-      argument: ('M, 'T) Expression.t option;
-      comments: ('M, unit) Syntax.t option;
-      delegate: bool;
-      result_out: 'T;
-    }
-  end
-
-  module Comprehension : sig
-    module Block : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        left: ('M, 'T) Pattern.t;
-        right: ('M, 'T) Expression.t;
-        each: bool;
-      }
-    end
-
-    type ('M, 'T) t = {
-      blocks: ('M, 'T) Block.t list;
-      filter: ('M, 'T) Expression.t option;
-    }
-  end
-
-  module Generator : sig
-    type ('M, 'T) t = {
-      blocks: ('M, 'T) Comprehension.Block.t list;
-      filter: ('M, 'T) Expression.t option;
-    }
-  end
-
-  module TypeCast : sig
-    type ('M, 'T) t = {
-      expression: ('M, 'T) Expression.t;
-      annot: ('M, 'T) Type.annotation;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module MetaProperty : sig
-    type 'M t = {
-      meta: ('M, 'M) Identifier.t;
-      property: ('M, 'M) Identifier.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module This : sig
-    type 'M t = { comments: ('M, unit) Syntax.t option }
-  end
-
-  module Super : sig
-    type 'M t = { comments: ('M, unit) Syntax.t option }
-  end
-
-  module Import : sig
-    type ('M, 'T) t = {
-      argument: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  type ('M, 'T) t = 'T * ('M, 'T) t'
-
-  and ('M, 'T) t' =
-    | Array of ('M, 'T) Array.t
-    | ArrowFunction of ('M, 'T) Function.t
-    | Assignment of ('M, 'T) Assignment.t
-    | Binary of ('M, 'T) Binary.t
-    | Call of ('M, 'T) Call.t
-    | Class of ('M, 'T) Class.t
-    | Comprehension of ('M, 'T) Comprehension.t
-    | Conditional of ('M, 'T) Conditional.t
-    | Function of ('M, 'T) Function.t
-    | Generator of ('M, 'T) Generator.t
-    | Identifier of ('M, 'T) Identifier.t
-    | Import of ('M, 'T) Import.t
-    | JSXElement of ('M, 'T) JSX.element
-    | JSXFragment of ('M, 'T) JSX.fragment
-    | Literal of 'M Literal.t
-    | Logical of ('M, 'T) Logical.t
-    | Member of ('M, 'T) Member.t
-    | MetaProperty of 'M MetaProperty.t
-    | New of ('M, 'T) New.t
-    | Object of ('M, 'T) Object.t
-    | OptionalCall of ('M, 'T) OptionalCall.t
-    | OptionalMember of ('M, 'T) OptionalMember.t
-    | Sequence of ('M, 'T) Sequence.t
-    | Super of 'M Super.t
-    | TaggedTemplate of ('M, 'T) TaggedTemplate.t
-    | TemplateLiteral of ('M, 'T) TemplateLiteral.t
-    | This of 'M This.t
-    | TypeCast of ('M, 'T) TypeCast.t
-    | Unary of ('M, 'T) Unary.t
-    | Update of ('M, 'T) Update.t
-    | Yield of ('M, 'T) Yield.t
-end =
-  Expression
-
-and JSX : sig
-  module Identifier : sig
-    type ('M, 'T) t = 'T * 'M t'
-
-    and 'M t' = {
-      name: string;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module NamespacedName : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      namespace: ('M, 'T) Identifier.t;
-      name: ('M, 'T) Identifier.t;
-    }
-  end
-
-  module ExpressionContainer : sig
-    type ('M, 'T) t = {
-      expression: ('M, 'T) expression;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-
-    and ('M, 'T) expression =
-      | Expression of ('M, 'T) Expression.t
-      | EmptyExpression
-  end
-
-  module Text : sig
-    type t = {
-      value: string;
-      raw: string;
-    }
-  end
-
-  module Attribute : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) name =
-      | Identifier of ('M, 'T) Identifier.t
-      | NamespacedName of ('M, 'T) NamespacedName.t
-
-    and ('M, 'T) value =
-      | Literal of 'T * 'M Literal.t
-      | ExpressionContainer of 'T * ('M, 'T) ExpressionContainer.t
-
-    and ('M, 'T) t' = {
-      name: ('M, 'T) name;
-      value: ('M, 'T) value option;
-    }
-  end
-
-  module SpreadAttribute : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      argument: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module MemberExpression : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) _object =
-      | Identifier of ('M, 'T) Identifier.t
-      | MemberExpression of ('M, 'T) t
-
-    and ('M, 'T) t' = {
-      _object: ('M, 'T) _object;
-      property: ('M, 'T) Identifier.t;
-    }
-  end
-
-  type ('M, 'T) name =
-    | Identifier of ('M, 'T) Identifier.t
-    | NamespacedName of ('M, 'T) NamespacedName.t
-    | MemberExpression of ('M, 'T) MemberExpression.t
-
-  module Opening : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) attribute =
-      | Attribute of ('M, 'T) Attribute.t
-      | SpreadAttribute of ('M, 'T) SpreadAttribute.t
-
-    and ('M, 'T) t' = {
-      name: ('M, 'T) name;
-      self_closing: bool;
-      attributes: ('M, 'T) attribute list;
-    }
-  end
-
-  module Closing : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-    and ('M, 'T) t' = { name: ('M, 'T) name }
-  end
-
-  module SpreadChild : sig
-    type ('M, 'T) t = {
-      expression: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  type ('M, 'T) child = 'M * ('M, 'T) child'
-
-  and ('M, 'T) child' =
-    | Element of ('M, 'T) element
-    | Fragment of ('M, 'T) fragment
-    | ExpressionContainer of ('M, 'T) ExpressionContainer.t
-    | SpreadChild of ('M, 'T) SpreadChild.t
-    | Text of Text.t
-
-  and ('M, 'T) element = {
-    opening_element: ('M, 'T) Opening.t;
-    closing_element: ('M, 'T) Closing.t option;
-    children: 'M * ('M, 'T) child list;
-    comments: ('M, unit) Syntax.t option;
-  }
-
-  and ('M, 'T) fragment = {
-    frag_opening_element: 'M;
-    frag_closing_element: 'M;
-    frag_children: 'M * ('M, 'T) child list;
-    frag_comments: ('M, unit) Syntax.t option;
-  }
-end =
-  JSX
-
-and Pattern : sig
-  module RestElement : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      argument: ('M, 'T) Pattern.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Object : sig
-    module Property : sig
-      type ('M, 'T) key =
-        | Literal of ('M * 'M Literal.t)
-        | Identifier of ('M, 'T) Identifier.t
-        | Computed of ('M, 'T) ComputedKey.t
-
-      and ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        key: ('M, 'T) key;
-        pattern: ('M, 'T) Pattern.t;
-        default: ('M, 'T) Expression.t option;
-        shorthand: bool;
-      }
-    end
-
-    type ('M, 'T) property =
-      | Property of ('M, 'T) Property.t
-      | RestElement of ('M, 'T) RestElement.t
-
-    and ('M, 'T) t = {
-      properties: ('M, 'T) property list;
-      annot: ('M, 'T) Type.annotation_or_hint;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-  end
-
-  module Array : sig
-    module Element : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        argument: ('M, 'T) Pattern.t;
-        default: ('M, 'T) Expression.t option;
-      }
-    end
-
-    type ('M, 'T) element =
-      | Element of ('M, 'T) Element.t
-      | RestElement of ('M, 'T) RestElement.t
-      | Hole of 'M
-
-    and ('M, 'T) t = {
-      elements: ('M, 'T) element list;
-      annot: ('M, 'T) Type.annotation_or_hint;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-  end
-
-  module Identifier : sig
-    type ('M, 'T) t = {
-      name: ('M, 'T) Identifier.t;
-      annot: ('M, 'T) Type.annotation_or_hint;
-      optional: bool;
-    }
-  end
-
-  type ('M, 'T) t = 'T * ('M, 'T) t'
-
-  and ('M, 'T) t' =
-    | Object of ('M, 'T) Object.t
-    | Array of ('M, 'T) Array.t
-    | Identifier of ('M, 'T) Identifier.t
-    | Expression of ('M, 'T) Expression.t
-end =
-  Pattern
-
-and Comment : sig
-  type 'M t = 'M * t'
-
-  and kind =
-    | Block
-    | Line
-
-  and t' = {
-    kind: kind;
-    text: string;
-    on_newline: bool;
-  }
-end =
-  Comment
-
-and Class : sig
-  module Method : sig
-    type ('M, 'T) t = 'T * ('M, 'T) t'
-
-    and kind =
-      | Constructor
-      | Method
-      | Get
-      | Set
-
-    and ('M, 'T) t' = {
-      kind: kind;
-      key: ('M, 'T) Expression.Object.Property.key;
-      value: 'M * ('M, 'T) Function.t;
-      static: bool;
-      decorators: ('M, 'T) Class.Decorator.t list;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Property : sig
-    type ('M, 'T) t = 'T * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      key: ('M, 'T) Expression.Object.Property.key;
-      value: ('M, 'T) value;
-      annot: ('M, 'T) Type.annotation_or_hint;
-      static: bool;
-      variance: 'M Variance.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-
-    and ('M, 'T) value =
-      | Declared
-      | Uninitialized
-      | Initialized of ('M, 'T) Expression.t
-  end
-
-  module PrivateField : sig
-    type ('M, 'T) t = 'T * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      key: 'M PrivateName.t;
-      value: ('M, 'T) Class.Property.value;
-      annot: ('M, 'T) Type.annotation_or_hint;
-      static: bool;
-      variance: 'M Variance.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Extends : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      expr: ('M, 'T) Expression.t;
-      targs: ('M, 'T) Type.TypeArgs.t option;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Implements : sig
-    module Interface : sig
-      type ('M, 'T) t = 'M * ('M, 'T) t'
-
-      and ('M, 'T) t' = {
-        id: ('M, 'T) Identifier.t;
-        targs: ('M, 'T) Type.TypeArgs.t option;
-      }
-    end
-
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      interfaces: ('M, 'T) Interface.t list;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Body : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      body: ('M, 'T) element list;
-      comments: ('M, unit) Syntax.t option;
-    }
-
-    and ('M, 'T) element =
-      | Method of ('M, 'T) Method.t
-      | Property of ('M, 'T) Property.t
-      | PrivateField of ('M, 'T) PrivateField.t
-  end
-
-  module Decorator : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      expression: ('M, 'T) Expression.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  type ('M, 'T) t = {
-    id: ('M, 'T) Identifier.t option;
-    body: ('M, 'T) Class.Body.t;
-    tparams: ('M, 'T) Type.TypeParams.t option;
-    extends: ('M, 'T) Extends.t option;
-    implements: ('M, 'T) Implements.t option;
-    class_decorators: ('M, 'T) Decorator.t list;
-    comments: ('M, unit) Syntax.t option;
-  }
-end =
-  Class
-
-and Function : sig
-  module RestParam : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      argument: ('M, 'T) Pattern.t;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Param : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      argument: ('M, 'T) Pattern.t;
-      default: ('M, 'T) Expression.t option;
-    }
-  end
-
-  module ThisParam : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      annot: ('M, 'T) Type.annotation;
-      comments: ('M, unit) Syntax.t option;
-    }
-  end
-
-  module Params : sig
-    type ('M, 'T) t = 'M * ('M, 'T) t'
-
-    and ('M, 'T) t' = {
-      this_: ('M, 'T) ThisParam.t option;
-      params: ('M, 'T) Param.t list;
-      rest: ('M, 'T) RestParam.t option;
-      comments: ('M, 'M Comment.t list) Syntax.t option;
-    }
-  end
-
-  type ('M, 'T) t = {
-    id: ('M, 'T) Identifier.t option;
-    params: ('M, 'T) Params.t;
-    body: ('M, 'T) body;
-    async: bool;
-    generator: bool;
-    predicate: ('M, 'T) Type.Predicate.t option;
-    return: ('M, 'T) Type.annotation_or_hint;
-    tparams: ('M, 'T) Type.TypeParams.t option;
-    comments: ('M, unit) Syntax.t option;
-    (* Location of the signature portion of a function, e.g.
-     * function foo(): void {}
-     * ^^^^^^^^^^^^^^^^^^^^
-     *)
-    sig_loc: 'M;
-  }
-
-  and ('M, 'T) body =
-    | BodyBlock of ('M * ('M, 'T) Statement.Block.t)
-    | BodyExpression of ('M, 'T) Expression.t
-end =
-  Function
-
-and Program : sig
-  type ('M, 'T) t = 'M * ('M, 'T) t'
-
-  and ('M, 'T) t' = {
-    statements: ('M, 'T) Statement.t list;
-    comments: ('M, unit) Syntax.t option;
-    all_comments: 'M Comment.t list;
-  }
-end =
-  Program
diff --git a/jscomp/js_parser/flow_ast_mapper.ml b/jscomp/js_parser/flow_ast_mapper.ml
deleted file mode 100644
index 60050c7..0000000
--- a/jscomp/js_parser/flow_ast_mapper.ml
+++ /dev/null
@@ -1,2681 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Ast = Flow_ast
-
-let map_opt : 'node. ('node -> 'node) -> 'node option -> 'node option =
- fun map opt ->
-  match opt with
-  | Some item ->
-    let item' = map item in
-    if item == item' then
-      opt
-    else
-      Some item'
-  | None -> opt
-
-let id_loc : 'node 'a. ('loc -> 'node -> 'node) -> 'loc -> 'node -> 'a -> ('node -> 'a) -> 'a =
- fun map loc item same diff ->
-  let item' = map loc item in
-  if item == item' then
-    same
-  else
-    diff item'
-
-let id : 'node 'a. ('node -> 'node) -> 'node -> 'a -> ('node -> 'a) -> 'a =
- fun map item same diff ->
-  let item' = map item in
-  if item == item' then
-    same
-  else
-    diff item'
-
-let map_loc : 'node. ('loc -> 'node -> 'node) -> 'loc * 'node -> 'loc * 'node =
- fun map same ->
-  let (loc, item) = same in
-  id_loc map loc item same (fun diff -> (loc, diff))
-
-let map_loc_opt : 'node. ('loc -> 'node -> 'node) -> ('loc * 'node) option -> ('loc * 'node) option
-    =
- fun map same ->
-  map_opt
-    (fun same ->
-      let (loc, item) = same in
-      id_loc map loc item same (fun diff -> (loc, diff)))
-    same
-
-let map_list map lst =
-  let (rev_lst, changed) =
-    List.fold_left
-      (fun (lst', changed) item ->
-        let item' = map item in
-        (item' :: lst', changed || item' != item))
-      ([], false)
-      lst
-  in
-  if changed then
-    List.rev rev_lst
-  else
-    lst
-
-let map_list_multiple map lst =
-  let (rev_lst, changed) =
-    List.fold_left
-      (fun (lst', changed) item ->
-        match map item with
-        | [] -> (lst', true)
-        | [item'] -> (item' :: lst', changed || item != item')
-        | items' -> (List.rev_append items' lst', true))
-      ([], false)
-      lst
-  in
-  if changed then
-    List.rev rev_lst
-  else
-    lst
-
-class ['loc] mapper =
-  object (this)
-    method program (program : ('loc, 'loc) Ast.Program.t) =
-      let open Ast.Program in
-      let (loc, { statements; comments; all_comments }) = program in
-      let statements' = this#toplevel_statement_list statements in
-      let comments' = this#syntax_opt comments in
-      let all_comments' = map_list this#comment all_comments in
-      if statements == statements' && comments == comments' && all_comments == all_comments' then
-        program
-      else
-        (loc, { statements = statements'; comments = comments'; all_comments = all_comments' })
-
-    method statement (stmt : ('loc, 'loc) Ast.Statement.t) =
-      let open Ast.Statement in
-      match stmt with
-      | (loc, Block block) -> id_loc this#block loc block stmt (fun block -> (loc, Block block))
-      | (loc, Break break) -> id_loc this#break loc break stmt (fun break -> (loc, Break break))
-      | (loc, ClassDeclaration cls) ->
-        id_loc this#class_declaration loc cls stmt (fun cls -> (loc, ClassDeclaration cls))
-      | (loc, Continue cont) -> id_loc this#continue loc cont stmt (fun cont -> (loc, Continue cont))
-      | (loc, Debugger dbg) -> id_loc this#debugger loc dbg stmt (fun dbg -> (loc, Debugger dbg))
-      | (loc, DeclareClass stuff) ->
-        id_loc this#declare_class loc stuff stmt (fun stuff -> (loc, DeclareClass stuff))
-      | (loc, DeclareExportDeclaration decl) ->
-        id_loc this#declare_export_declaration loc decl stmt (fun decl ->
-            (loc, DeclareExportDeclaration decl)
-        )
-      | (loc, DeclareFunction stuff) ->
-        id_loc this#declare_function loc stuff stmt (fun stuff -> (loc, DeclareFunction stuff))
-      | (loc, DeclareInterface stuff) ->
-        id_loc this#declare_interface loc stuff stmt (fun stuff -> (loc, DeclareInterface stuff))
-      | (loc, DeclareModule m) ->
-        id_loc this#declare_module loc m stmt (fun m -> (loc, DeclareModule m))
-      | (loc, DeclareTypeAlias stuff) ->
-        id_loc this#declare_type_alias loc stuff stmt (fun stuff -> (loc, DeclareTypeAlias stuff))
-      | (loc, DeclareVariable stuff) ->
-        id_loc this#declare_variable loc stuff stmt (fun stuff -> (loc, DeclareVariable stuff))
-      | (loc, DeclareModuleExports annot) ->
-        id_loc this#declare_module_exports loc annot stmt (fun annot ->
-            (loc, DeclareModuleExports annot)
-        )
-      | (loc, DoWhile stuff) ->
-        id_loc this#do_while loc stuff stmt (fun stuff -> (loc, DoWhile stuff))
-      | (loc, Empty empty) -> id_loc this#empty loc empty stmt (fun empty -> (loc, Empty empty))
-      | (loc, EnumDeclaration enum) ->
-        id_loc this#enum_declaration loc enum stmt (fun enum -> (loc, EnumDeclaration enum))
-      | (loc, ExportDefaultDeclaration decl) ->
-        id_loc this#export_default_declaration loc decl stmt (fun decl ->
-            (loc, ExportDefaultDeclaration decl)
-        )
-      | (loc, ExportNamedDeclaration decl) ->
-        id_loc this#export_named_declaration loc decl stmt (fun decl ->
-            (loc, ExportNamedDeclaration decl)
-        )
-      | (loc, Expression expr) ->
-        id_loc this#expression_statement loc expr stmt (fun expr -> (loc, Expression expr))
-      | (loc, For for_stmt) ->
-        id_loc this#for_statement loc for_stmt stmt (fun for_stmt -> (loc, For for_stmt))
-      | (loc, ForIn stuff) ->
-        id_loc this#for_in_statement loc stuff stmt (fun stuff -> (loc, ForIn stuff))
-      | (loc, ForOf stuff) ->
-        id_loc this#for_of_statement loc stuff stmt (fun stuff -> (loc, ForOf stuff))
-      | (loc, FunctionDeclaration func) ->
-        id_loc this#function_declaration loc func stmt (fun func -> (loc, FunctionDeclaration func))
-      | (loc, If if_stmt) ->
-        id_loc this#if_statement loc if_stmt stmt (fun if_stmt -> (loc, If if_stmt))
-      | (loc, ImportDeclaration decl) ->
-        id_loc this#import_declaration loc decl stmt (fun decl -> (loc, ImportDeclaration decl))
-      | (loc, InterfaceDeclaration stuff) ->
-        id_loc this#interface_declaration loc stuff stmt (fun stuff ->
-            (loc, InterfaceDeclaration stuff)
-        )
-      | (loc, Labeled label) ->
-        id_loc this#labeled_statement loc label stmt (fun label -> (loc, Labeled label))
-      | (loc, OpaqueType otype) ->
-        id_loc this#opaque_type loc otype stmt (fun otype -> (loc, OpaqueType otype))
-      | (loc, Return ret) -> id_loc this#return loc ret stmt (fun ret -> (loc, Return ret))
-      | (loc, Switch switch) ->
-        id_loc this#switch loc switch stmt (fun switch -> (loc, Switch switch))
-      | (loc, Throw throw) -> id_loc this#throw loc throw stmt (fun throw -> (loc, Throw throw))
-      | (loc, Try try_stmt) ->
-        id_loc this#try_catch loc try_stmt stmt (fun try_stmt -> (loc, Try try_stmt))
-      | (loc, VariableDeclaration decl) ->
-        id_loc this#variable_declaration loc decl stmt (fun decl -> (loc, VariableDeclaration decl))
-      | (loc, While stuff) -> id_loc this#while_ loc stuff stmt (fun stuff -> (loc, While stuff))
-      | (loc, With stuff) -> id_loc this#with_ loc stuff stmt (fun stuff -> (loc, With stuff))
-      | (loc, TypeAlias stuff) ->
-        id_loc this#type_alias loc stuff stmt (fun stuff -> (loc, TypeAlias stuff))
-      | (loc, DeclareOpaqueType otype) ->
-        id_loc this#opaque_type loc otype stmt (fun otype -> (loc, OpaqueType otype))
-
-    method comment (c : 'loc Ast.Comment.t) = c
-
-    method syntax_opt
-        : 'internal. ('loc, 'internal) Ast.Syntax.t option -> ('loc, 'internal) Ast.Syntax.t option
-        =
-      map_opt this#syntax
-
-    method syntax : 'internal. ('loc, 'internal) Ast.Syntax.t -> ('loc, 'internal) Ast.Syntax.t =
-      fun attached ->
-        let open Ast.Syntax in
-        let { leading; trailing; internal } = attached in
-        let leading' = map_list this#comment leading in
-        let trailing' = map_list this#comment trailing in
-        if leading == leading' && trailing == trailing' then
-          attached
-        else
-          { leading = leading'; trailing = trailing'; internal }
-
-    method expression (expr : ('loc, 'loc) Ast.Expression.t) =
-      let open Ast.Expression in
-      match expr with
-      | (loc, Array x) -> id_loc this#array loc x expr (fun x -> (loc, Array x))
-      | (loc, ArrowFunction x) ->
-        id_loc this#arrow_function loc x expr (fun x -> (loc, ArrowFunction x))
-      | (loc, Assignment x) -> id_loc this#assignment loc x expr (fun x -> (loc, Assignment x))
-      | (loc, Binary x) -> id_loc this#binary loc x expr (fun x -> (loc, Binary x))
-      | (loc, Call x) -> id_loc this#call loc x expr (fun x -> (loc, Call x))
-      | (loc, Class x) -> id_loc this#class_expression loc x expr (fun x -> (loc, Class x))
-      | (loc, Comprehension x) ->
-        id_loc this#comprehension loc x expr (fun x -> (loc, Comprehension x))
-      | (loc, Conditional x) -> id_loc this#conditional loc x expr (fun x -> (loc, Conditional x))
-      | (loc, Function x) -> id_loc this#function_expression loc x expr (fun x -> (loc, Function x))
-      | (loc, Generator x) -> id_loc this#generator loc x expr (fun x -> (loc, Generator x))
-      | (loc, Identifier x) -> id this#identifier x expr (fun x -> (loc, Identifier x))
-      | (loc, Import x) -> id (this#import loc) x expr (fun x -> (loc, Import x))
-      | (loc, JSXElement x) -> id_loc this#jsx_element loc x expr (fun x -> (loc, JSXElement x))
-      | (loc, JSXFragment x) -> id_loc this#jsx_fragment loc x expr (fun x -> (loc, JSXFragment x))
-      | (loc, Literal x) -> id_loc this#literal loc x expr (fun x -> (loc, Literal x))
-      | (loc, Logical x) -> id_loc this#logical loc x expr (fun x -> (loc, Logical x))
-      | (loc, Member x) -> id_loc this#member loc x expr (fun x -> (loc, Member x))
-      | (loc, MetaProperty x) ->
-        id_loc this#meta_property loc x expr (fun x -> (loc, MetaProperty x))
-      | (loc, New x) -> id_loc this#new_ loc x expr (fun x -> (loc, New x))
-      | (loc, Object x) -> id_loc this#object_ loc x expr (fun x -> (loc, Object x))
-      | (loc, OptionalCall x) -> id (this#optional_call loc) x expr (fun x -> (loc, OptionalCall x))
-      | (loc, OptionalMember x) ->
-        id_loc this#optional_member loc x expr (fun x -> (loc, OptionalMember x))
-      | (loc, Sequence x) -> id_loc this#sequence loc x expr (fun x -> (loc, Sequence x))
-      | (loc, Super x) -> id_loc this#super_expression loc x expr (fun x -> (loc, Super x))
-      | (loc, TaggedTemplate x) ->
-        id_loc this#tagged_template loc x expr (fun x -> (loc, TaggedTemplate x))
-      | (loc, TemplateLiteral x) ->
-        id_loc this#template_literal loc x expr (fun x -> (loc, TemplateLiteral x))
-      | (loc, This x) -> id_loc this#this_expression loc x expr (fun x -> (loc, This x))
-      | (loc, TypeCast x) -> id_loc this#type_cast loc x expr (fun x -> (loc, TypeCast x))
-      | (loc, Unary x) -> id_loc this#unary_expression loc x expr (fun x -> (loc, Unary x))
-      | (loc, Update x) -> id_loc this#update_expression loc x expr (fun x -> (loc, Update x))
-      | (loc, Yield x) -> id_loc this#yield loc x expr (fun x -> (loc, Yield x))
-
-    method array _loc (expr : ('loc, 'loc) Ast.Expression.Array.t) =
-      let open Ast.Expression in
-      let { Array.elements; comments } = expr in
-      let elements' = map_list this#array_element elements in
-      let comments' = this#syntax_opt comments in
-      if elements == elements' && comments == comments' then
-        expr
-      else
-        { Array.elements = elements'; comments = comments' }
-
-    method array_element element =
-      let open Ast.Expression.Array in
-      match element with
-      | Expression expr -> id this#expression expr element (fun expr -> Expression expr)
-      | Spread spread -> id this#spread_element spread element (fun spread -> Spread spread)
-      | Hole _ -> element
-
-    method arrow_function loc (expr : ('loc, 'loc) Ast.Function.t) = this#function_ loc expr
-
-    method assignment _loc (expr : ('loc, 'loc) Ast.Expression.Assignment.t) =
-      let open Ast.Expression.Assignment in
-      let { operator = _; left; right; comments } = expr in
-      let left' = this#assignment_pattern left in
-      let right' = this#expression right in
-      let comments' = this#syntax_opt comments in
-      if left == left' && right == right' && comments == comments' then
-        expr
-      else
-        { expr with left = left'; right = right'; comments = comments' }
-
-    method binary _loc (expr : ('loc, 'loc) Ast.Expression.Binary.t) =
-      let open Ast.Expression.Binary in
-      let { operator = _; left; right; comments } = expr in
-      let left' = this#expression left in
-      let right' = this#expression right in
-      let comments' = this#syntax_opt comments in
-      if left == left' && right == right' && comments == comments' then
-        expr
-      else
-        { expr with left = left'; right = right'; comments = comments' }
-
-    method block _loc (stmt : ('loc, 'loc) Ast.Statement.Block.t) =
-      let open Ast.Statement.Block in
-      let { body; comments } = stmt in
-      let body' = this#statement_list body in
-      let comments' = this#syntax_opt comments in
-      if body == body' && comments == comments' then
-        stmt
-      else
-        { body = body'; comments = comments' }
-
-    method break _loc (break : 'loc Ast.Statement.Break.t) =
-      let open Ast.Statement.Break in
-      let { label; comments } = break in
-      let label' = map_opt this#label_identifier label in
-      let comments' = this#syntax_opt comments in
-      if label == label' && comments == comments' then
-        break
-      else
-        { label = label'; comments = comments' }
-
-    method call _loc (expr : ('loc, 'loc) Ast.Expression.Call.t) =
-      let open Ast.Expression.Call in
-      let { callee; targs; arguments; comments } = expr in
-      let callee' = this#expression callee in
-      let targs' = map_opt this#call_type_args targs in
-      let arguments' = this#call_arguments arguments in
-      let comments' = this#syntax_opt comments in
-      if callee == callee' && targs == targs' && arguments == arguments' && comments == comments'
-      then
-        expr
-      else
-        { callee = callee'; targs = targs'; arguments = arguments'; comments = comments' }
-
-    method call_arguments (arg_list : ('loc, 'loc) Ast.Expression.ArgList.t) =
-      let open Ast.Expression.ArgList in
-      let (loc, { arguments; comments }) = arg_list in
-      let arguments' = map_list this#expression_or_spread arguments in
-      let comments' = this#syntax_opt comments in
-      if arguments == arguments' && comments == comments' then
-        arg_list
-      else
-        (loc, { arguments = arguments'; comments = comments' })
-
-    method optional_call loc (expr : ('loc, 'loc) Ast.Expression.OptionalCall.t) =
-      let open Ast.Expression.OptionalCall in
-      let { call; optional = _; filtered_out = _ } = expr in
-      let call' = this#call loc call in
-      if call == call' then
-        expr
-      else
-        { expr with call = call' }
-
-    method call_type_args (targs : ('loc, 'loc) Ast.Expression.CallTypeArgs.t) =
-      let open Ast.Expression.CallTypeArgs in
-      let (loc, { arguments; comments }) = targs in
-      let arguments' = map_list this#call_type_arg arguments in
-      let comments' = this#syntax_opt comments in
-      if arguments == arguments' && comments == comments' then
-        targs
-      else
-        (loc, { arguments = arguments'; comments = comments' })
-
-    method call_type_arg t =
-      let open Ast.Expression.CallTypeArg in
-      match t with
-      | Explicit x ->
-        let x' = this#type_ x in
-        if x' == x then
-          t
-        else
-          Explicit x'
-      | Implicit (loc, { Implicit.comments }) ->
-        let comments' = this#syntax_opt comments in
-        if comments == comments' then
-          t
-        else
-          Implicit (loc, { Implicit.comments = comments' })
-
-    method catch_body (body : 'loc * ('loc, 'loc) Ast.Statement.Block.t) = map_loc this#block body
-
-    method catch_clause _loc (clause : ('loc, 'loc) Ast.Statement.Try.CatchClause.t') =
-      let open Ast.Statement.Try.CatchClause in
-      let { param; body; comments } = clause in
-      let param' = map_opt this#catch_clause_pattern param in
-      let body' = this#catch_body body in
-      let comments' = this#syntax_opt comments in
-      if param == param' && body == body' && comments == comments' then
-        clause
-      else
-        { param = param'; body = body'; comments = comments' }
-
-    method class_declaration loc (cls : ('loc, 'loc) Ast.Class.t) = this#class_ loc cls
-
-    method class_expression loc (cls : ('loc, 'loc) Ast.Class.t) = this#class_ loc cls
-
-    method class_ _loc (cls : ('loc, 'loc) Ast.Class.t) =
-      let open Ast.Class in
-      let { id; body; tparams; extends; implements; class_decorators; comments } = cls in
-      let id' = map_opt this#class_identifier id in
-      let tparams' = map_opt this#type_params tparams in
-      let body' = this#class_body body in
-      let extends' = map_opt (map_loc this#class_extends) extends in
-      let implements' = map_opt this#class_implements implements in
-      let class_decorators' = map_list this#class_decorator class_decorators in
-      let comments' = this#syntax_opt comments in
-      if
-        id == id'
-        && body == body'
-        && extends == extends'
-        && implements == implements'
-        && class_decorators == class_decorators'
-        && comments == comments'
-        && tparams == tparams'
-      then
-        cls
-      else
-        {
-          id = id';
-          body = body';
-          extends = extends';
-          implements = implements';
-          class_decorators = class_decorators';
-          comments = comments';
-          tparams = tparams';
-        }
-
-    method class_extends _loc (extends : ('loc, 'loc) Ast.Class.Extends.t') =
-      let open Ast.Class.Extends in
-      let { expr; targs; comments } = extends in
-      let expr' = this#expression expr in
-      let targs' = map_opt this#type_args targs in
-      let comments' = this#syntax_opt comments in
-      if expr == expr' && targs == targs' && comments == comments' then
-        extends
-      else
-        { expr = expr'; targs = targs'; comments = comments' }
-
-    method class_identifier (ident : ('loc, 'loc) Ast.Identifier.t) =
-      this#pattern_identifier ~kind:Ast.Statement.VariableDeclaration.Let ident
-
-    method class_body (cls_body : ('loc, 'loc) Ast.Class.Body.t) =
-      let open Ast.Class.Body in
-      let (loc, { body; comments }) = cls_body in
-      let body' = map_list this#class_element body in
-      let comments' = this#syntax_opt comments in
-      if body == body' && comments == comments' then
-        cls_body
-      else
-        (loc, { body = body'; comments = comments' })
-
-    method class_decorator (dec : ('loc, 'loc) Ast.Class.Decorator.t) =
-      let open Ast.Class.Decorator in
-      let (loc, { expression; comments }) = dec in
-      let expression' = this#expression expression in
-      let comments' = this#syntax_opt comments in
-      if expression == expression' && comments == comments' then
-        dec
-      else
-        (loc, { expression = expression'; comments = comments' })
-
-    method class_element (elem : ('loc, 'loc) Ast.Class.Body.element) =
-      let open Ast.Class.Body in
-      match elem with
-      | Method (loc, meth) -> id_loc this#class_method loc meth elem (fun meth -> Method (loc, meth))
-      | Property (loc, prop) ->
-        id_loc this#class_property loc prop elem (fun prop -> Property (loc, prop))
-      | PrivateField (loc, field) ->
-        id_loc this#class_private_field loc field elem (fun field -> PrivateField (loc, field))
-
-    method class_implements (implements : ('loc, 'loc) Ast.Class.Implements.t) =
-      let open Ast.Class.Implements in
-      let (loc, { interfaces; comments }) = implements in
-      let interfaces' = map_list this#class_implements_interface interfaces in
-      let comments' = this#syntax_opt comments in
-      if interfaces == interfaces' && comments == comments' then
-        implements
-      else
-        (loc, { interfaces = interfaces'; comments = comments' })
-
-    method class_implements_interface (interface : ('loc, 'loc) Ast.Class.Implements.Interface.t) =
-      let open Ast.Class.Implements.Interface in
-      let (loc, { id; targs }) = interface in
-      let id' = this#type_identifier_reference id in
-      let targs' = map_opt this#type_args targs in
-      if id == id' && targs == targs' then
-        interface
-      else
-        (loc, { id = id'; targs = targs' })
-
-    method class_method _loc (meth : ('loc, 'loc) Ast.Class.Method.t') =
-      let open Ast.Class.Method in
-      let { kind = _; key; value; static = _; decorators; comments } = meth in
-      let key' = this#object_key key in
-      let value' = map_loc this#function_expression_or_method value in
-      let decorators' = map_list this#class_decorator decorators in
-      let comments' = this#syntax_opt comments in
-      if key == key' && value == value' && decorators == decorators' && comments == comments' then
-        meth
-      else
-        { meth with key = key'; value = value'; decorators = decorators'; comments = comments' }
-
-    method class_property _loc (prop : ('loc, 'loc) Ast.Class.Property.t') =
-      let open Ast.Class.Property in
-      let { key; value; annot; static = _; variance; comments } = prop in
-      let key' = this#object_key key in
-      let value' = this#class_property_value value in
-      let annot' = this#type_annotation_hint annot in
-      let variance' = this#variance_opt variance in
-      let comments' = this#syntax_opt comments in
-      if
-        key == key'
-        && value == value'
-        && annot' == annot
-        && variance' == variance
-        && comments' == comments
-      then
-        prop
-      else
-        {
-          prop with
-          key = key';
-          value = value';
-          annot = annot';
-          variance = variance';
-          comments = comments';
-        }
-
-    method class_property_value (value : ('loc, 'loc) Ast.Class.Property.value) =
-      let open Ast.Class.Property in
-      match value with
-      | Declared -> value
-      | Uninitialized -> value
-      | Initialized x ->
-        let x' = this#expression x in
-        if x == x' then
-          value
-        else
-          Initialized x'
-
-    method class_private_field _loc (prop : ('loc, 'loc) Ast.Class.PrivateField.t') =
-      let open Ast.Class.PrivateField in
-      let { key; value; annot; static = _; variance; comments } = prop in
-      let key' = this#private_name key in
-      let value' = this#class_property_value value in
-      let annot' = this#type_annotation_hint annot in
-      let variance' = this#variance_opt variance in
-      let comments' = this#syntax_opt comments in
-      if
-        key == key'
-        && value == value'
-        && annot' == annot
-        && variance' == variance
-        && comments' == comments
-      then
-        prop
-      else
-        {
-          prop with
-          key = key';
-          value = value';
-          annot = annot';
-          variance = variance';
-          comments = comments';
-        }
-
-    (* TODO *)
-    method comprehension _loc (expr : ('loc, 'loc) Ast.Expression.Comprehension.t) = expr
-
-    method conditional _loc (expr : ('loc, 'loc) Ast.Expression.Conditional.t) =
-      let open Ast.Expression.Conditional in
-      let { test; consequent; alternate; comments } = expr in
-      let test' = this#predicate_expression test in
-      let consequent' = this#expression consequent in
-      let alternate' = this#expression alternate in
-      let comments' = this#syntax_opt comments in
-      if
-        test == test'
-        && consequent == consequent'
-        && alternate == alternate'
-        && comments == comments'
-      then
-        expr
-      else
-        { test = test'; consequent = consequent'; alternate = alternate'; comments = comments' }
-
-    method continue _loc (cont : 'loc Ast.Statement.Continue.t) =
-      let open Ast.Statement.Continue in
-      let { label; comments } = cont in
-      let label' = map_opt this#label_identifier label in
-      let comments' = this#syntax_opt comments in
-      if label == label' && comments == comments' then
-        cont
-      else
-        { label = label'; comments = comments' }
-
-    method debugger _loc (dbg : 'loc Ast.Statement.Debugger.t) =
-      let open Ast.Statement.Debugger in
-      let { comments } = dbg in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        dbg
-      else
-        { comments = comments' }
-
-    method declare_class _loc (decl : ('loc, 'loc) Ast.Statement.DeclareClass.t) =
-      let open Ast.Statement.DeclareClass in
-      let { id = ident; tparams; body; extends; mixins; implements; comments } = decl in
-      let id' = this#class_identifier ident in
-      let tparams' = map_opt this#type_params tparams in
-      let body' = map_loc this#object_type body in
-      let extends' = map_opt (map_loc this#generic_type) extends in
-      let mixins' = map_list (map_loc this#generic_type) mixins in
-      let implements' = map_opt this#class_implements implements in
-      let comments' = this#syntax_opt comments in
-      if
-        id' == ident
-        && tparams' == tparams
-        && body' == body
-        && extends' == extends
-        && mixins' == mixins
-        && implements' == implements
-        && comments' == comments
-      then
-        decl
-      else
-        {
-          id = id';
-          tparams = tparams';
-          body = body';
-          extends = extends';
-          mixins = mixins';
-          implements = implements';
-          comments = comments';
-        }
-
-    method declare_export_declaration
-        _loc (decl : ('loc, 'loc) Ast.Statement.DeclareExportDeclaration.t) =
-      let open Ast.Statement.DeclareExportDeclaration in
-      let { default; source; specifiers; declaration; comments } = decl in
-      let source' = map_loc_opt this#export_source source in
-      let specifiers' = map_opt this#export_named_specifier specifiers in
-      let declaration' = map_opt this#declare_export_declaration_decl declaration in
-      let comments' = this#syntax_opt comments in
-      if
-        source == source'
-        && specifiers == specifiers'
-        && declaration == declaration'
-        && comments == comments'
-      then
-        decl
-      else
-        {
-          default;
-          source = source';
-          specifiers = specifiers';
-          declaration = declaration';
-          comments = comments';
-        }
-
-    method declare_export_declaration_decl
-        (decl : ('loc, 'loc) Ast.Statement.DeclareExportDeclaration.declaration) =
-      let open Ast.Statement.DeclareExportDeclaration in
-      match decl with
-      | Variable (loc, dv) ->
-        let dv' = this#declare_variable loc dv in
-        if dv' == dv then
-          decl
-        else
-          Variable (loc, dv')
-      | Function (loc, df) ->
-        let df' = this#declare_function loc df in
-        if df' == df then
-          decl
-        else
-          Function (loc, df')
-      | Class (loc, dc) ->
-        let dc' = this#declare_class loc dc in
-        if dc' == dc then
-          decl
-        else
-          Class (loc, dc')
-      | DefaultType t ->
-        let t' = this#type_ t in
-        if t' == t then
-          decl
-        else
-          DefaultType t'
-      | NamedType (loc, ta) ->
-        let ta' = this#type_alias loc ta in
-        if ta' == ta then
-          decl
-        else
-          NamedType (loc, ta')
-      | NamedOpaqueType (loc, ot) ->
-        let ot' = this#opaque_type loc ot in
-        if ot' == ot then
-          decl
-        else
-          NamedOpaqueType (loc, ot')
-      | Interface (loc, i) ->
-        let i' = this#interface loc i in
-        if i' == i then
-          decl
-        else
-          Interface (loc, i')
-
-    method declare_function _loc (decl : ('loc, 'loc) Ast.Statement.DeclareFunction.t) =
-      let open Ast.Statement.DeclareFunction in
-      let { id = ident; annot; predicate; comments } = decl in
-      let id' = this#function_identifier ident in
-      let annot' = this#type_annotation annot in
-      let predicate' = map_opt this#predicate predicate in
-      let comments' = this#syntax_opt comments in
-      if id' == ident && annot' == annot && predicate' == predicate && comments' == comments then
-        decl
-      else
-        { id = id'; annot = annot'; predicate = predicate'; comments = comments' }
-
-    method declare_interface loc (decl : ('loc, 'loc) Ast.Statement.Interface.t) =
-      this#interface loc decl
-
-    method declare_module _loc (m : ('loc, 'loc) Ast.Statement.DeclareModule.t) =
-      let open Ast.Statement.DeclareModule in
-      let { id; body; kind; comments } = m in
-      let body' = map_loc this#block body in
-      let comments' = this#syntax_opt comments in
-      if body' == body && comments == comments' then
-        m
-      else
-        { id; body = body'; kind; comments = comments' }
-
-    method declare_module_exports _loc (exports : ('loc, 'loc) Ast.Statement.DeclareModuleExports.t)
-        =
-      let open Ast.Statement.DeclareModuleExports in
-      let { annot; comments } = exports in
-      let annot' = this#type_annotation annot in
-      let comments' = this#syntax_opt comments in
-      if annot == annot' && comments == comments' then
-        exports
-      else
-        { annot = annot'; comments = comments' }
-
-    method declare_type_alias loc (decl : ('loc, 'loc) Ast.Statement.TypeAlias.t) =
-      this#type_alias loc decl
-
-    method declare_variable _loc (decl : ('loc, 'loc) Ast.Statement.DeclareVariable.t) =
-      let open Ast.Statement.DeclareVariable in
-      let { id = ident; annot; comments } = decl in
-      let id' = this#pattern_identifier ~kind:Ast.Statement.VariableDeclaration.Var ident in
-      let annot' = this#type_annotation annot in
-      let comments' = this#syntax_opt comments in
-      if id' == ident && annot' == annot && comments' == comments then
-        decl
-      else
-        { id = id'; annot = annot'; comments = comments' }
-
-    method do_while _loc (stuff : ('loc, 'loc) Ast.Statement.DoWhile.t) =
-      let open Ast.Statement.DoWhile in
-      let { body; test; comments } = stuff in
-      let body' = this#statement body in
-      let test' = this#predicate_expression test in
-      let comments' = this#syntax_opt comments in
-      if body == body' && test == test' && comments == comments' then
-        stuff
-      else
-        { body = body'; test = test'; comments = comments' }
-
-    method empty _loc empty =
-      let open Ast.Statement.Empty in
-      let { comments } = empty in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        empty
-      else
-        { comments = comments' }
-
-    method enum_declaration _loc (enum : ('loc, 'loc) Ast.Statement.EnumDeclaration.t) =
-      let open Ast.Statement.EnumDeclaration in
-      let { id = ident; body; comments } = enum in
-      let id' = this#pattern_identifier ~kind:Ast.Statement.VariableDeclaration.Const ident in
-      let body' = this#enum_body body in
-      let comments' = this#syntax_opt comments in
-      if ident == id' && body == body' && comments == comments' then
-        enum
-      else
-        { id = id'; body = body'; comments = comments' }
-
-    method enum_body (body : 'loc Ast.Statement.EnumDeclaration.body) =
-      let open Ast.Statement.EnumDeclaration in
-      match body with
-      | (loc, BooleanBody boolean_body) ->
-        id this#enum_boolean_body boolean_body body (fun body -> (loc, BooleanBody body))
-      | (loc, NumberBody number_body) ->
-        id this#enum_number_body number_body body (fun body -> (loc, NumberBody body))
-      | (loc, StringBody string_body) ->
-        id this#enum_string_body string_body body (fun body -> (loc, StringBody body))
-      | (loc, SymbolBody symbol_body) ->
-        id this#enum_symbol_body symbol_body body (fun body -> (loc, SymbolBody body))
-
-    method enum_boolean_body (body : 'loc Ast.Statement.EnumDeclaration.BooleanBody.t) =
-      let open Ast.Statement.EnumDeclaration.BooleanBody in
-      let { members; explicit_type = _; has_unknown_members = _; comments } = body in
-      let members' = map_list this#enum_boolean_member members in
-      let comments' = this#syntax_opt comments in
-      if members == members' && comments == comments' then
-        body
-      else
-        { body with members = members'; comments = comments' }
-
-    method enum_number_body (body : 'loc Ast.Statement.EnumDeclaration.NumberBody.t) =
-      let open Ast.Statement.EnumDeclaration.NumberBody in
-      let { members; explicit_type = _; has_unknown_members = _; comments } = body in
-      let members' = map_list this#enum_number_member members in
-      let comments' = this#syntax_opt comments in
-      if members == members' && comments == comments' then
-        body
-      else
-        { body with members = members'; comments = comments' }
-
-    method enum_string_body (body : 'loc Ast.Statement.EnumDeclaration.StringBody.t) =
-      let open Ast.Statement.EnumDeclaration.StringBody in
-      let { members; explicit_type = _; has_unknown_members = _; comments } = body in
-      let members' =
-        match members with
-        | Defaulted m -> id (map_list this#enum_defaulted_member) m members (fun m -> Defaulted m)
-        | Initialized m -> id (map_list this#enum_string_member) m members (fun m -> Initialized m)
-      in
-      let comments' = this#syntax_opt comments in
-      if members == members' && comments == comments' then
-        body
-      else
-        { body with members = members'; comments = comments' }
-
-    method enum_symbol_body (body : 'loc Ast.Statement.EnumDeclaration.SymbolBody.t) =
-      let open Ast.Statement.EnumDeclaration.SymbolBody in
-      let { members; has_unknown_members = _; comments } = body in
-      let members' = map_list this#enum_defaulted_member members in
-      let comments' = this#syntax_opt comments in
-      if members == members' && comments == comments' then
-        body
-      else
-        { body with members = members'; comments = comments' }
-
-    method enum_defaulted_member (member : 'loc Ast.Statement.EnumDeclaration.DefaultedMember.t) =
-      let open Ast.Statement.EnumDeclaration.DefaultedMember in
-      let (loc, { id = ident }) = member in
-      let id' = this#enum_member_identifier ident in
-      if ident == id' then
-        member
-      else
-        (loc, { id = id' })
-
-    method enum_boolean_member
-        (member :
-          ('loc Ast.BooleanLiteral.t, 'loc) Ast.Statement.EnumDeclaration.InitializedMember.t
-          ) =
-      let open Ast.Statement.EnumDeclaration.InitializedMember in
-      let (loc, { id = ident; init }) = member in
-      let id' = this#enum_member_identifier ident in
-      if ident == id' then
-        member
-      else
-        (loc, { id = id'; init })
-
-    method enum_number_member
-        (member : ('loc Ast.NumberLiteral.t, 'loc) Ast.Statement.EnumDeclaration.InitializedMember.t)
-        =
-      let open Ast.Statement.EnumDeclaration.InitializedMember in
-      let (loc, { id = ident; init }) = member in
-      let id' = this#enum_member_identifier ident in
-      if ident == id' then
-        member
-      else
-        (loc, { id = id'; init })
-
-    method enum_string_member
-        (member : ('loc Ast.StringLiteral.t, 'loc) Ast.Statement.EnumDeclaration.InitializedMember.t)
-        =
-      let open Ast.Statement.EnumDeclaration.InitializedMember in
-      let (loc, { id = ident; init }) = member in
-      let id' = this#enum_member_identifier ident in
-      if ident == id' then
-        member
-      else
-        (loc, { id = id'; init })
-
-    method enum_member_identifier (id : ('loc, 'loc) Ast.Identifier.t) = this#identifier id
-
-    method export_default_declaration
-        _loc (decl : ('loc, 'loc) Ast.Statement.ExportDefaultDeclaration.t) =
-      let open Ast.Statement.ExportDefaultDeclaration in
-      let { default; declaration; comments } = decl in
-      let declaration' = this#export_default_declaration_decl declaration in
-      let comments' = this#syntax_opt comments in
-      if declaration' == declaration && comments' == comments then
-        decl
-      else
-        { default; declaration = declaration'; comments = comments' }
-
-    method export_default_declaration_decl
-        (decl : ('loc, 'loc) Ast.Statement.ExportDefaultDeclaration.declaration) =
-      let open Ast.Statement.ExportDefaultDeclaration in
-      match decl with
-      | Declaration stmt -> id this#statement stmt decl (fun stmt -> Declaration stmt)
-      | Expression expr -> id this#expression expr decl (fun expr -> Expression expr)
-
-    method export_named_declaration _loc (decl : ('loc, 'loc) Ast.Statement.ExportNamedDeclaration.t)
-        =
-      let open Ast.Statement.ExportNamedDeclaration in
-      let { export_kind; source; specifiers; declaration; comments } = decl in
-      let source' = map_loc_opt this#export_source source in
-      let specifiers' = map_opt this#export_named_specifier specifiers in
-      let declaration' = map_opt this#statement declaration in
-      let comments' = this#syntax_opt comments in
-      if
-        source == source'
-        && specifiers == specifiers'
-        && declaration == declaration'
-        && comments == comments'
-      then
-        decl
-      else
-        {
-          export_kind;
-          source = source';
-          specifiers = specifiers';
-          declaration = declaration';
-          comments = comments';
-        }
-
-    method export_named_declaration_specifier
-        (spec : 'loc Ast.Statement.ExportNamedDeclaration.ExportSpecifier.t) =
-      let open Ast.Statement.ExportNamedDeclaration.ExportSpecifier in
-      let (loc, { local; exported }) = spec in
-      let local' = this#identifier local in
-      let exported' = map_opt this#identifier exported in
-      if local == local' && exported == exported' then
-        spec
-      else
-        (loc, { local = local'; exported = exported' })
-
-    method export_batch_specifier
-        (spec : 'loc Ast.Statement.ExportNamedDeclaration.ExportBatchSpecifier.t) =
-      let (loc, id_opt) = spec in
-      let id_opt' = map_opt this#identifier id_opt in
-      if id_opt == id_opt' then
-        spec
-      else
-        (loc, id_opt')
-
-    method export_named_specifier (spec : 'loc Ast.Statement.ExportNamedDeclaration.specifier) =
-      let open Ast.Statement.ExportNamedDeclaration in
-      match spec with
-      | ExportSpecifiers spec_list ->
-        let spec_list' = map_list this#export_named_declaration_specifier spec_list in
-        if spec_list == spec_list' then
-          spec
-        else
-          ExportSpecifiers spec_list'
-      | ExportBatchSpecifier batch ->
-        let batch' = this#export_batch_specifier batch in
-        if batch == batch' then
-          spec
-        else
-          ExportBatchSpecifier batch'
-
-    method export_source _loc (source : 'loc Ast.StringLiteral.t) =
-      let open Ast.StringLiteral in
-      let { value; raw; comments } = source in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        source
-      else
-        { value; raw; comments = comments' }
-
-    method expression_statement _loc (stmt : ('loc, 'loc) Ast.Statement.Expression.t) =
-      let open Ast.Statement.Expression in
-      let { expression = expr; directive; comments } = stmt in
-      let expr' = this#expression expr in
-      let comments' = this#syntax_opt comments in
-      if expr == expr' && comments == comments' then
-        stmt
-      else
-        { expression = expr'; directive; comments = comments' }
-
-    method expression_or_spread expr_or_spread =
-      let open Ast.Expression in
-      match expr_or_spread with
-      | Expression expr -> id this#expression expr expr_or_spread (fun expr -> Expression expr)
-      | Spread spread -> id this#spread_element spread expr_or_spread (fun spread -> Spread spread)
-
-    method for_in_statement _loc (stmt : ('loc, 'loc) Ast.Statement.ForIn.t) =
-      let open Ast.Statement.ForIn in
-      let { left; right; body; each; comments } = stmt in
-      let left' = this#for_in_statement_lhs left in
-      let right' = this#expression right in
-      let body' = this#statement body in
-      let comments' = this#syntax_opt comments in
-      if left == left' && right == right' && body == body' && comments == comments' then
-        stmt
-      else
-        { left = left'; right = right'; body = body'; each; comments = comments' }
-
-    method for_in_statement_lhs (left : ('loc, 'loc) Ast.Statement.ForIn.left) =
-      let open Ast.Statement.ForIn in
-      match left with
-      | LeftDeclaration decl ->
-        id this#for_in_left_declaration decl left (fun decl -> LeftDeclaration decl)
-      | LeftPattern patt ->
-        id this#for_in_assignment_pattern patt left (fun patt -> LeftPattern patt)
-
-    method for_in_left_declaration left =
-      let (loc, decl) = left in
-      id_loc this#variable_declaration loc decl left (fun decl -> (loc, decl))
-
-    method for_of_statement _loc (stuff : ('loc, 'loc) Ast.Statement.ForOf.t) =
-      let open Ast.Statement.ForOf in
-      let { left; right; body; await; comments } = stuff in
-      let left' = this#for_of_statement_lhs left in
-      let right' = this#expression right in
-      let body' = this#statement body in
-      let comments' = this#syntax_opt comments in
-      if left == left' && right == right' && body == body' && comments == comments' then
-        stuff
-      else
-        { left = left'; right = right'; body = body'; await; comments = comments' }
-
-    method for_of_statement_lhs (left : ('loc, 'loc) Ast.Statement.ForOf.left) =
-      let open Ast.Statement.ForOf in
-      match left with
-      | LeftDeclaration decl ->
-        id this#for_of_left_declaration decl left (fun decl -> LeftDeclaration decl)
-      | LeftPattern patt ->
-        id this#for_of_assignment_pattern patt left (fun patt -> LeftPattern patt)
-
-    method for_of_left_declaration left =
-      let (loc, decl) = left in
-      id_loc this#variable_declaration loc decl left (fun decl -> (loc, decl))
-
-    method for_statement _loc (stmt : ('loc, 'loc) Ast.Statement.For.t) =
-      let open Ast.Statement.For in
-      let { init; test; update; body; comments } = stmt in
-      let init' = map_opt this#for_statement_init init in
-      let test' = map_opt this#predicate_expression test in
-      let update' = map_opt this#expression update in
-      let body' = this#statement body in
-      let comments' = this#syntax_opt comments in
-      if
-        init == init'
-        && test == test'
-        && update == update'
-        && body == body'
-        && comments == comments'
-      then
-        stmt
-      else
-        { init = init'; test = test'; update = update'; body = body'; comments = comments' }
-
-    method for_statement_init (init : ('loc, 'loc) Ast.Statement.For.init) =
-      let open Ast.Statement.For in
-      match init with
-      | InitDeclaration decl ->
-        id this#for_init_declaration decl init (fun decl -> InitDeclaration decl)
-      | InitExpression expr -> id this#expression expr init (fun expr -> InitExpression expr)
-
-    method for_init_declaration init =
-      let (loc, decl) = init in
-      id_loc this#variable_declaration loc decl init (fun decl -> (loc, decl))
-
-    method function_param_type (fpt : ('loc, 'loc) Ast.Type.Function.Param.t) =
-      let open Ast.Type.Function.Param in
-      let (loc, { annot; name; optional }) = fpt in
-      let annot' = this#type_ annot in
-      let name' = map_opt this#identifier name in
-      if annot' == annot && name' == name then
-        fpt
-      else
-        (loc, { annot = annot'; name = name'; optional })
-
-    method function_rest_param_type (frpt : ('loc, 'loc) Ast.Type.Function.RestParam.t) =
-      let open Ast.Type.Function.RestParam in
-      let (loc, { argument; comments }) = frpt in
-      let argument' = this#function_param_type argument in
-      let comments' = this#syntax_opt comments in
-      if argument' == argument && comments' == comments then
-        frpt
-      else
-        (loc, { argument = argument'; comments = comments' })
-
-    method function_this_param_type (this_param : ('loc, 'loc) Ast.Type.Function.ThisParam.t) =
-      let open Ast.Type.Function.ThisParam in
-      let (loc, { annot; comments }) = this_param in
-      let annot' = this#type_annotation annot in
-      let comments' = this#syntax_opt comments in
-      if annot' == annot && comments' == comments then
-        this_param
-      else
-        (loc, { annot = annot'; comments = comments' })
-
-    method function_type _loc (ft : ('loc, 'loc) Ast.Type.Function.t) =
-      let open Ast.Type.Function in
-      let {
-        params = (params_loc, { Params.this_; params = ps; rest = rpo; comments = params_comments });
-        return;
-        tparams;
-        comments = func_comments;
-      } =
-        ft
-      in
-      let tparams' = map_opt this#type_params tparams in
-      let this_' = map_opt this#function_this_param_type this_ in
-      let ps' = map_list this#function_param_type ps in
-      let rpo' = map_opt this#function_rest_param_type rpo in
-      let return' = this#type_ return in
-      let func_comments' = this#syntax_opt func_comments in
-      let params_comments' = this#syntax_opt params_comments in
-      if
-        ps' == ps
-        && rpo' == rpo
-        && return' == return
-        && tparams' == tparams
-        && func_comments' == func_comments
-        && params_comments' == params_comments
-        && this_' == this_
-      then
-        ft
-      else
-        {
-          params =
-            ( params_loc,
-              { Params.this_ = this_'; params = ps'; rest = rpo'; comments = params_comments' }
-            );
-          return = return';
-          tparams = tparams';
-          comments = func_comments';
-        }
-
-    method label_identifier (ident : ('loc, 'loc) Ast.Identifier.t) = this#identifier ident
-
-    method object_property_value_type (opvt : ('loc, 'loc) Ast.Type.Object.Property.value) =
-      let open Ast.Type.Object.Property in
-      match opvt with
-      | Init t -> id this#type_ t opvt (fun t -> Init t)
-      | Get t -> id this#object_type_property_getter t opvt (fun t -> Get t)
-      | Set t -> id this#object_type_property_setter t opvt (fun t -> Set t)
-
-    method object_type_property_getter getter =
-      let (loc, ft) = getter in
-      id_loc this#function_type loc ft getter (fun ft -> (loc, ft))
-
-    method object_type_property_setter setter =
-      let (loc, ft) = setter in
-      id_loc this#function_type loc ft setter (fun ft -> (loc, ft))
-
-    method object_property_type (opt : ('loc, 'loc) Ast.Type.Object.Property.t) =
-      let open Ast.Type.Object.Property in
-      let (loc, { key; value; optional; static; proto; _method; variance; comments }) = opt in
-      let key' = this#object_key key in
-      let value' = this#object_property_value_type value in
-      let variance' = this#variance_opt variance in
-      let comments' = this#syntax_opt comments in
-      if key' == key && value' == value && variance' == variance && comments' == comments then
-        opt
-      else
-        ( loc,
-          {
-            key = key';
-            value = value';
-            optional;
-            static;
-            proto;
-            _method;
-            variance = variance';
-            comments = comments';
-          }
-        )
-
-    method object_spread_property_type (opt : ('loc, 'loc) Ast.Type.Object.SpreadProperty.t) =
-      let open Ast.Type.Object.SpreadProperty in
-      let (loc, { argument; comments }) = opt in
-      let argument' = this#type_ argument in
-      let comments' = this#syntax_opt comments in
-      if argument' == argument && comments == comments' then
-        opt
-      else
-        (loc, { argument = argument'; comments = comments' })
-
-    method object_indexer_property_type (opt : ('loc, 'loc) Ast.Type.Object.Indexer.t) =
-      let open Ast.Type.Object.Indexer in
-      let (loc, { id; key; value; static; variance; comments }) = opt in
-      let key' = this#type_ key in
-      let value' = this#type_ value in
-      let variance' = this#variance_opt variance in
-      let comments' = this#syntax_opt comments in
-      if key' == key && value' == value && variance' == variance && comments' == comments then
-        opt
-      else
-        (loc, { id; key = key'; value = value'; static; variance = variance'; comments = comments' })
-
-    method object_internal_slot_property_type (slot : ('loc, 'loc) Ast.Type.Object.InternalSlot.t) =
-      let open Ast.Type.Object.InternalSlot in
-      let (loc, { id; value; optional; static; _method; comments }) = slot in
-      let id' = this#identifier id in
-      let value' = this#type_ value in
-      let comments' = this#syntax_opt comments in
-      if id == id' && value == value' && comments == comments' then
-        slot
-      else
-        (loc, { id = id'; value = value'; optional; static; _method; comments = comments' })
-
-    method object_call_property_type (call : ('loc, 'loc) Ast.Type.Object.CallProperty.t) =
-      let open Ast.Type.Object.CallProperty in
-      let (loc, { value = (value_loc, value); static; comments }) = call in
-      let value' = this#function_type value_loc value in
-      let comments' = this#syntax_opt comments in
-      if value == value' && comments == comments' then
-        call
-      else
-        (loc, { value = (value_loc, value'); static; comments = comments' })
-
-    method object_type _loc (ot : ('loc, 'loc) Ast.Type.Object.t) =
-      let open Ast.Type.Object in
-      let { properties; exact; inexact; comments } = ot in
-      let properties' =
-        map_list
-          (fun p ->
-            match p with
-            | Property p' -> id this#object_property_type p' p (fun p' -> Property p')
-            | SpreadProperty p' ->
-              id this#object_spread_property_type p' p (fun p' -> SpreadProperty p')
-            | Indexer p' -> id this#object_indexer_property_type p' p (fun p' -> Indexer p')
-            | InternalSlot p' ->
-              id this#object_internal_slot_property_type p' p (fun p' -> InternalSlot p')
-            | CallProperty p' -> id this#object_call_property_type p' p (fun p' -> CallProperty p'))
-          properties
-      in
-      let comments' = this#syntax_opt comments in
-      if properties' == properties && comments == comments' then
-        ot
-      else
-        { properties = properties'; exact; inexact; comments = comments' }
-
-    method interface_type _loc (i : ('loc, 'loc) Ast.Type.Interface.t) =
-      let open Ast.Type.Interface in
-      let { extends; body; comments } = i in
-      let extends' = map_list (map_loc this#generic_type) extends in
-      let body' = map_loc this#object_type body in
-      let comments' = this#syntax_opt comments in
-      if extends' == extends && body' == body && comments == comments' then
-        i
-      else
-        { extends = extends'; body = body'; comments = comments' }
-
-    method generic_identifier_type (git : ('loc, 'loc) Ast.Type.Generic.Identifier.t) =
-      let open Ast.Type.Generic.Identifier in
-      match git with
-      | Unqualified i -> id this#type_identifier_reference i git (fun i -> Unqualified i)
-      | Qualified i -> id this#generic_qualified_identifier_type i git (fun i -> Qualified i)
-
-    method generic_qualified_identifier_type qual =
-      let open Ast.Type.Generic.Identifier in
-      let (loc, { qualification; id }) = qual in
-      let qualification' = this#generic_identifier_type qualification in
-      let id' = this#member_type_identifier id in
-      if qualification' == qualification && id' == id then
-        qual
-      else
-        (loc, { qualification = qualification'; id = id' })
-
-    method member_type_identifier id = this#identifier id
-
-    method variance (variance : 'loc Ast.Variance.t) =
-      let (loc, { Ast.Variance.kind; comments }) = variance in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        variance
-      else
-        (loc, { Ast.Variance.kind; comments = comments' })
-
-    method variance_opt (opt : 'loc Ast.Variance.t option) = map_opt this#variance opt
-
-    method type_args (targs : ('loc, 'loc) Ast.Type.TypeArgs.t) =
-      let open Ast.Type.TypeArgs in
-      let (loc, { arguments; comments }) = targs in
-      let arguments' = map_list this#type_ arguments in
-      let comments' = this#syntax_opt comments in
-      if arguments == arguments' && comments == comments' then
-        targs
-      else
-        (loc, { arguments = arguments'; comments = comments' })
-
-    method type_params (tparams : ('loc, 'loc) Ast.Type.TypeParams.t) =
-      let open Ast.Type.TypeParams in
-      let (loc, { params = tps; comments }) = tparams in
-      let tps' = map_list this#type_param tps in
-      let comments' = this#syntax_opt comments in
-      if tps' == tps && comments' == comments then
-        tparams
-      else
-        (loc, { params = tps'; comments = comments' })
-
-    method type_param (tparam : ('loc, 'loc) Ast.Type.TypeParam.t) =
-      let open Ast.Type.TypeParam in
-      let (loc, { name; bound; variance; default }) = tparam in
-      let bound' = this#type_annotation_hint bound in
-      let variance' = this#variance_opt variance in
-      let default' = map_opt this#type_ default in
-      let name' = this#binding_type_identifier name in
-      if name' == name && bound' == bound && variance' == variance && default' == default then
-        tparam
-      else
-        (loc, { name = name'; bound = bound'; variance = variance'; default = default' })
-
-    method generic_type _loc (gt : ('loc, 'loc) Ast.Type.Generic.t) =
-      let open Ast.Type.Generic in
-      let { id; targs; comments } = gt in
-      let id' = this#generic_identifier_type id in
-      let targs' = map_opt this#type_args targs in
-      let comments' = this#syntax_opt comments in
-      if id' == id && targs' == targs && comments' == comments then
-        gt
-      else
-        { id = id'; targs = targs'; comments = comments' }
-
-    method indexed_access _loc (ia : ('loc, 'loc) Ast.Type.IndexedAccess.t) =
-      let open Ast.Type.IndexedAccess in
-      let { _object; index; comments } = ia in
-      let _object' = this#type_ _object in
-      let index' = this#type_ index in
-      let comments' = this#syntax_opt comments in
-      if _object' == _object && index' == index && comments' == comments then
-        ia
-      else
-        { _object = _object'; index = index'; comments = comments' }
-
-    method optional_indexed_access loc (ia : ('loc, 'loc) Ast.Type.OptionalIndexedAccess.t) =
-      let open Ast.Type.OptionalIndexedAccess in
-      let { indexed_access; optional } = ia in
-      let indexed_access' = this#indexed_access loc indexed_access in
-      if indexed_access' == indexed_access then
-        ia
-      else
-        { indexed_access = indexed_access'; optional }
-
-    method string_literal_type _loc (lit : 'loc Ast.StringLiteral.t) =
-      let open Ast.StringLiteral in
-      let { value; raw; comments } = lit in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        lit
-      else
-        { value; raw; comments = comments' }
-
-    method number_literal_type _loc (lit : 'loc Ast.NumberLiteral.t) =
-      let open Ast.NumberLiteral in
-      let { value; raw; comments } = lit in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        lit
-      else
-        { value; raw; comments = comments' }
-
-    method bigint_literal_type _loc (lit : 'loc Ast.BigIntLiteral.t) =
-      let open Ast.BigIntLiteral in
-      let { value; raw; comments } = lit in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        lit
-      else
-        { value; raw; comments = comments' }
-
-    method boolean_literal_type _loc (lit : 'loc Ast.BooleanLiteral.t) =
-      let open Ast.BooleanLiteral in
-      let { value; comments } = lit in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        lit
-      else
-        { value; comments = comments' }
-
-    method nullable_type (t : ('loc, 'loc) Ast.Type.Nullable.t) =
-      let open Ast.Type.Nullable in
-      let { argument; comments } = t in
-      let argument' = this#type_ argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        t
-      else
-        { argument = argument'; comments = comments' }
-
-    method typeof_type (t : ('loc, 'loc) Ast.Type.Typeof.t) =
-      let open Ast.Type.Typeof in
-      let { argument; comments } = t in
-      let argument' = this#typeof_expression argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        t
-      else
-        { argument = argument'; comments = comments' }
-
-    method typeof_expression (git : ('loc, 'loc) Ast.Type.Typeof.Target.t) =
-      let open Ast.Type.Typeof.Target in
-      match git with
-      | Unqualified i -> id this#typeof_identifier i git (fun i -> Unqualified i)
-      | Qualified i -> id this#typeof_qualified_identifier i git (fun i -> Qualified i)
-
-    method typeof_identifier id = this#identifier id
-
-    method typeof_member_identifier id = this#identifier id
-
-    method typeof_qualified_identifier qual =
-      let open Ast.Type.Typeof.Target in
-      let (loc, { qualification; id }) = qual in
-      let qualification' = this#typeof_expression qualification in
-      let id' = this#typeof_member_identifier id in
-      if qualification' == qualification && id' == id then
-        qual
-      else
-        (loc, { qualification = qualification'; id = id' })
-
-    method tuple_type (t : ('loc, 'loc) Ast.Type.Tuple.t) =
-      let open Ast.Type.Tuple in
-      let { types; comments } = t in
-      let types' = map_list this#type_ types in
-      let comments' = this#syntax_opt comments in
-      if types == types' && comments == comments' then
-        t
-      else
-        { types = types'; comments = comments' }
-
-    method array_type (t : ('loc, 'loc) Ast.Type.Array.t) =
-      let open Ast.Type.Array in
-      let { argument; comments } = t in
-      let argument' = this#type_ argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        t
-      else
-        { argument = argument'; comments = comments' }
-
-    method union_type _loc (t : ('loc, 'loc) Ast.Type.Union.t) =
-      let open Ast.Type.Union in
-      let { types = (t0, t1, ts); comments } = t in
-      let t0' = this#type_ t0 in
-      let t1' = this#type_ t1 in
-      let ts' = map_list this#type_ ts in
-      let comments' = this#syntax_opt comments in
-      if t0' == t0 && t1' == t1 && ts' == ts && comments' == comments then
-        t
-      else
-        { types = (t0', t1', ts'); comments = comments' }
-
-    method intersection_type _loc (t : ('loc, 'loc) Ast.Type.Intersection.t) =
-      let open Ast.Type.Intersection in
-      let { types = (t0, t1, ts); comments } = t in
-      let t0' = this#type_ t0 in
-      let t1' = this#type_ t1 in
-      let ts' = map_list this#type_ ts in
-      let comments' = this#syntax_opt comments in
-      if t0' == t0 && t1' == t1 && ts' == ts && comments' == comments then
-        t
-      else
-        { types = (t0', t1', ts'); comments = comments' }
-
-    method type_ (t : ('loc, 'loc) Ast.Type.t) =
-      let open Ast.Type in
-      match t with
-      | (loc, Any comments) -> id this#syntax_opt comments t (fun comments -> (loc, Any comments))
-      | (loc, Mixed comments) ->
-        id this#syntax_opt comments t (fun comments -> (loc, Mixed comments))
-      | (loc, Empty comments) ->
-        id this#syntax_opt comments t (fun comments -> (loc, Empty comments))
-      | (loc, Void comments) -> id this#syntax_opt comments t (fun comments -> (loc, Void comments))
-      | (loc, Null comments) -> id this#syntax_opt comments t (fun comments -> (loc, Null comments))
-      | (loc, Symbol comments) ->
-        id this#syntax_opt comments t (fun comments -> (loc, Symbol comments))
-      | (loc, Number comments) ->
-        id this#syntax_opt comments t (fun comments -> (loc, Number comments))
-      | (loc, BigInt comments) ->
-        id this#syntax_opt comments t (fun comments -> (loc, BigInt comments))
-      | (loc, String comments) ->
-        id this#syntax_opt comments t (fun comments -> (loc, String comments))
-      | (loc, Boolean comments) ->
-        id this#syntax_opt comments t (fun comments -> (loc, Boolean comments))
-      | (loc, Exists comments) ->
-        id this#syntax_opt comments t (fun comments -> (loc, Exists comments))
-      | (loc, Nullable t') -> id this#nullable_type t' t (fun t' -> (loc, Nullable t'))
-      | (loc, Array t') -> id this#array_type t' t (fun t' -> (loc, Array t'))
-      | (loc, Typeof t') -> id this#typeof_type t' t (fun t' -> (loc, Typeof t'))
-      | (loc, Function ft) -> id_loc this#function_type loc ft t (fun ft -> (loc, Function ft))
-      | (loc, Object ot) -> id_loc this#object_type loc ot t (fun ot -> (loc, Object ot))
-      | (loc, Interface i) -> id_loc this#interface_type loc i t (fun i -> (loc, Interface i))
-      | (loc, Generic gt) -> id_loc this#generic_type loc gt t (fun gt -> (loc, Generic gt))
-      | (loc, IndexedAccess ia) ->
-        id_loc this#indexed_access loc ia t (fun ia -> (loc, IndexedAccess ia))
-      | (loc, OptionalIndexedAccess ia) ->
-        id_loc this#optional_indexed_access loc ia t (fun ia -> (loc, OptionalIndexedAccess ia))
-      | (loc, StringLiteral lit) ->
-        id_loc this#string_literal_type loc lit t (fun lit -> (loc, StringLiteral lit))
-      | (loc, NumberLiteral lit) ->
-        id_loc this#number_literal_type loc lit t (fun lit -> (loc, NumberLiteral lit))
-      | (loc, BigIntLiteral lit) ->
-        id_loc this#bigint_literal_type loc lit t (fun lit -> (loc, BigIntLiteral lit))
-      | (loc, BooleanLiteral lit) ->
-        id_loc this#boolean_literal_type loc lit t (fun lit -> (loc, BooleanLiteral lit))
-      | (loc, Union t') -> id_loc this#union_type loc t' t (fun t' -> (loc, Union t'))
-      | (loc, Intersection t') ->
-        id_loc this#intersection_type loc t' t (fun t' -> (loc, Intersection t'))
-      | (loc, Tuple t') -> id this#tuple_type t' t (fun t' -> (loc, Tuple t'))
-
-    method type_annotation (annot : ('loc, 'loc) Ast.Type.annotation) =
-      let (loc, a) = annot in
-      id this#type_ a annot (fun a -> (loc, a))
-
-    method type_annotation_hint (return : ('M, 'T) Ast.Type.annotation_or_hint) =
-      let open Ast.Type in
-      match return with
-      | Available annot ->
-        let annot' = this#type_annotation annot in
-        if annot' == annot then
-          return
-        else
-          Available annot'
-      | Missing _loc -> return
-
-    method function_declaration loc (stmt : ('loc, 'loc) Ast.Function.t) = this#function_ loc stmt
-
-    method function_expression loc (stmt : ('loc, 'loc) Ast.Function.t) =
-      this#function_expression_or_method loc stmt
-
-    (** previously, we conflated [function_expression] and [class_method]. callers should be
-        updated to override those individually. *)
-    method function_expression_or_method loc (stmt : ('loc, 'loc) Ast.Function.t) =
-      this#function_ loc stmt
-    [@@alert deprecated "Use either function_expression or class_method"]
-
-    (* Internal helper for function declarations, function expressions and arrow functions *)
-    method function_ _loc (expr : ('loc, 'loc) Ast.Function.t) =
-      let open Ast.Function in
-      let {
-        id = ident;
-        params;
-        body;
-        async;
-        generator;
-        predicate;
-        return;
-        tparams;
-        sig_loc;
-        comments;
-      } =
-        expr
-      in
-      let ident' = map_opt this#function_identifier ident in
-      let tparams' = map_opt this#type_params tparams in
-      let params' = this#function_params params in
-      let return' = this#type_annotation_hint return in
-      let body' = this#function_body_any body in
-      let predicate' = map_opt this#predicate predicate in
-      let comments' = this#syntax_opt comments in
-      if
-        ident == ident'
-        && params == params'
-        && body == body'
-        && predicate == predicate'
-        && return == return'
-        && tparams == tparams'
-        && comments == comments'
-      then
-        expr
-      else
-        {
-          id = ident';
-          params = params';
-          return = return';
-          body = body';
-          async;
-          generator;
-          predicate = predicate';
-          tparams = tparams';
-          sig_loc;
-          comments = comments';
-        }
-
-    method function_params (params : ('loc, 'loc) Ast.Function.Params.t) =
-      let open Ast.Function in
-      let (loc, { Params.params = params_list; rest; comments; this_ }) = params in
-      let params_list' = map_list this#function_param params_list in
-      let rest' = map_opt this#function_rest_param rest in
-      let this_' = map_opt this#function_this_param this_ in
-      let comments' = this#syntax_opt comments in
-      if params_list == params_list' && rest == rest' && comments == comments' && this_ == this_'
-      then
-        params
-      else
-        (loc, { Params.params = params_list'; rest = rest'; comments = comments'; this_ = this_' })
-
-    method function_this_param (this_param : ('loc, 'loc) Ast.Function.ThisParam.t) =
-      let open Ast.Function.ThisParam in
-      let (loc, { annot; comments }) = this_param in
-      let annot' = this#type_annotation annot in
-      let comments' = this#syntax_opt comments in
-      if annot' == annot && comments' == comments then
-        this_param
-      else
-        (loc, { annot = annot'; comments = comments' })
-
-    method function_param (param : ('loc, 'loc) Ast.Function.Param.t) =
-      let open Ast.Function.Param in
-      let (loc, { argument; default }) = param in
-      let argument' = this#function_param_pattern argument in
-      let default' = map_opt this#expression default in
-      if argument == argument' && default == default' then
-        param
-      else
-        (loc, { argument = argument'; default = default' })
-
-    method function_body_any (body : ('loc, 'loc) Ast.Function.body) =
-      match body with
-      | Ast.Function.BodyBlock block ->
-        id this#function_body block body (fun block -> Ast.Function.BodyBlock block)
-      | Ast.Function.BodyExpression expr ->
-        id this#expression expr body (fun expr -> Ast.Function.BodyExpression expr)
-
-    method function_body (body : 'loc * ('loc, 'loc) Ast.Statement.Block.t) =
-      let (loc, block) = body in
-      id_loc this#block loc block body (fun block -> (loc, block))
-
-    method function_identifier (ident : ('loc, 'loc) Ast.Identifier.t) =
-      this#pattern_identifier ~kind:Ast.Statement.VariableDeclaration.Var ident
-
-    (* TODO *)
-    method generator _loc (expr : ('loc, 'loc) Ast.Expression.Generator.t) = expr
-
-    method identifier (id : ('loc, 'loc) Ast.Identifier.t) =
-      let open Ast.Identifier in
-      let (loc, { name; comments }) = id in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        id
-      else
-        (loc, { name; comments = comments' })
-
-    method type_identifier (id : ('loc, 'loc) Ast.Identifier.t) = this#identifier id
-
-    method type_identifier_reference (id : ('loc, 'loc) Ast.Identifier.t) = this#type_identifier id
-
-    method binding_type_identifier (id : ('loc, 'loc) Ast.Identifier.t) = this#type_identifier id
-
-    method interface _loc (interface : ('loc, 'loc) Ast.Statement.Interface.t) =
-      let open Ast.Statement.Interface in
-      let { id = ident; tparams; extends; body; comments } = interface in
-      let id' = this#binding_type_identifier ident in
-      let tparams' = map_opt this#type_params tparams in
-      let extends' = map_list (map_loc this#generic_type) extends in
-      let body' = map_loc this#object_type body in
-      let comments' = this#syntax_opt comments in
-      if
-        id' == ident
-        && tparams' == tparams
-        && extends' == extends
-        && body' == body
-        && comments' == comments
-      then
-        interface
-      else
-        { id = id'; tparams = tparams'; extends = extends'; body = body'; comments = comments' }
-
-    method interface_declaration loc (decl : ('loc, 'loc) Ast.Statement.Interface.t) =
-      this#interface loc decl
-
-    method private_name (id : 'loc Ast.PrivateName.t) =
-      let open Ast.PrivateName in
-      let (loc, { name; comments }) = id in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        id
-      else
-        (loc, { name; comments = comments' })
-
-    method computed_key (key : ('loc, 'loc) Ast.ComputedKey.t) =
-      let open Ast.ComputedKey in
-      let (loc, { expression; comments }) = key in
-      let expression' = this#expression expression in
-      let comments' = this#syntax_opt comments in
-      if expression == expression' && comments == comments' then
-        key
-      else
-        (loc, { expression = expression'; comments = comments' })
-
-    method import _loc (expr : ('loc, 'loc) Ast.Expression.Import.t) =
-      let open Ast.Expression.Import in
-      let { argument; comments } = expr in
-      let argument' = this#expression argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        expr
-      else
-        { argument = argument'; comments = comments' }
-
-    method if_consequent_statement ~has_else (stmt : ('loc, 'loc) Ast.Statement.t) =
-      ignore has_else;
-      this#statement stmt
-
-    method if_alternate_statement _loc (altern : ('loc, 'loc) Ast.Statement.If.Alternate.t') =
-      let open Ast.Statement.If.Alternate in
-      let { body; comments } = altern in
-      let body' = this#statement body in
-      let comments' = this#syntax_opt comments in
-      if body == body' && comments == comments' then
-        altern
-      else
-        { body = body'; comments = comments' }
-
-    method if_statement _loc (stmt : ('loc, 'loc) Ast.Statement.If.t) =
-      let open Ast.Statement.If in
-      let { test; consequent; alternate; comments } = stmt in
-      let test' = this#predicate_expression test in
-      let consequent' = this#if_consequent_statement ~has_else:(alternate <> None) consequent in
-      let alternate' = map_opt (map_loc this#if_alternate_statement) alternate in
-      let comments' = this#syntax_opt comments in
-      if
-        test == test'
-        && consequent == consequent'
-        && alternate == alternate'
-        && comments == comments'
-      then
-        stmt
-      else
-        { test = test'; consequent = consequent'; alternate = alternate'; comments = comments' }
-
-    method import_declaration _loc (decl : ('loc, 'loc) Ast.Statement.ImportDeclaration.t) =
-      let open Ast.Statement.ImportDeclaration in
-      let { import_kind; source; specifiers; default; comments } = decl in
-      let source' = map_loc this#import_source source in
-      let specifiers' = map_opt (this#import_specifier ~import_kind) specifiers in
-      let default' = map_opt (this#import_default_specifier ~import_kind) default in
-      let comments' = this#syntax_opt comments in
-      if
-        source == source'
-        && specifiers == specifiers'
-        && default == default'
-        && comments == comments'
-      then
-        decl
-      else
-        {
-          import_kind;
-          source = source';
-          specifiers = specifiers';
-          default = default';
-          comments = comments';
-        }
-
-    method import_source _loc (source : 'loc Ast.StringLiteral.t) =
-      let open Ast.StringLiteral in
-      let { value; raw; comments } = source in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        source
-      else
-        { value; raw; comments = comments' }
-
-    method import_specifier
-        ~import_kind (specifier : ('loc, 'loc) Ast.Statement.ImportDeclaration.specifier) =
-      let open Ast.Statement.ImportDeclaration in
-      match specifier with
-      | ImportNamedSpecifiers named_specifiers ->
-        let named_specifiers' =
-          map_list (this#import_named_specifier ~import_kind) named_specifiers
-        in
-        if named_specifiers == named_specifiers' then
-          specifier
-        else
-          ImportNamedSpecifiers named_specifiers'
-      | ImportNamespaceSpecifier (loc, ident) ->
-        id_loc (this#import_namespace_specifier ~import_kind) loc ident specifier (fun ident ->
-            ImportNamespaceSpecifier (loc, ident)
-        )
-
-    method remote_identifier id = this#identifier id
-
-    method import_named_specifier
-        ~(import_kind : Ast.Statement.ImportDeclaration.import_kind)
-        (specifier : ('loc, 'loc) Ast.Statement.ImportDeclaration.named_specifier) =
-      let open Ast.Statement.ImportDeclaration in
-      let { kind; local; remote } = specifier in
-      let (is_type_remote, is_type_local) =
-        match (import_kind, kind) with
-        | (ImportType, _)
-        | (_, Some ImportType) ->
-          (true, true)
-        | (ImportTypeof, _)
-        | (_, Some ImportTypeof) ->
-          (false, true)
-        | _ -> (false, false)
-      in
-      let remote' =
-        match local with
-        | None ->
-          if is_type_remote then
-            this#binding_type_identifier remote
-          else
-            this#pattern_identifier ~kind:Ast.Statement.VariableDeclaration.Let remote
-        | Some _ -> this#remote_identifier remote
-      in
-      let local' =
-        match local with
-        | None -> None
-        | Some ident ->
-          let local_visitor =
-            if is_type_local then
-              this#binding_type_identifier
-            else
-              this#pattern_identifier ~kind:Ast.Statement.VariableDeclaration.Let
-          in
-          id local_visitor ident local (fun ident -> Some ident)
-      in
-      if local == local' && remote == remote' then
-        specifier
-      else
-        { kind; local = local'; remote = remote' }
-
-    method import_default_specifier ~import_kind (id : ('loc, 'loc) Ast.Identifier.t) =
-      let open Ast.Statement.ImportDeclaration in
-      let local_visitor =
-        match import_kind with
-        | ImportType
-        | ImportTypeof ->
-          this#binding_type_identifier
-        | _ -> this#pattern_identifier ~kind:Ast.Statement.VariableDeclaration.Let
-      in
-      local_visitor id
-
-    method import_namespace_specifier ~import_kind _loc (id : ('loc, 'loc) Ast.Identifier.t) =
-      let open Ast.Statement.ImportDeclaration in
-      let local_visitor =
-        match import_kind with
-        | ImportType
-        | ImportTypeof ->
-          this#binding_type_identifier
-        | _ -> this#pattern_identifier ~kind:Ast.Statement.VariableDeclaration.Let
-      in
-      local_visitor id
-
-    method jsx_element _loc (expr : ('loc, 'loc) Ast.JSX.element) =
-      let open Ast.JSX in
-      let { opening_element; closing_element; children; comments } = expr in
-      let opening_element' = this#jsx_opening_element opening_element in
-      let closing_element' = map_opt this#jsx_closing_element closing_element in
-      let children' = this#jsx_children children in
-      let comments' = this#syntax_opt comments in
-      if
-        opening_element == opening_element'
-        && closing_element == closing_element'
-        && children == children'
-        && comments == comments'
-      then
-        expr
-      else
-        {
-          opening_element = opening_element';
-          closing_element = closing_element';
-          children = children';
-          comments = comments';
-        }
-
-    method jsx_fragment _loc (expr : ('loc, 'loc) Ast.JSX.fragment) =
-      let open Ast.JSX in
-      let { frag_children; frag_comments; _ } = expr in
-      let children' = this#jsx_children frag_children in
-      let frag_comments' = this#syntax_opt frag_comments in
-      if frag_children == children' && frag_comments == frag_comments' then
-        expr
-      else
-        { expr with frag_children = children'; frag_comments = frag_comments' }
-
-    method jsx_opening_element (elem : ('loc, 'loc) Ast.JSX.Opening.t) =
-      let open Ast.JSX.Opening in
-      let (loc, { name; self_closing; attributes }) = elem in
-      let name' = this#jsx_element_name name in
-      let attributes' = map_list this#jsx_opening_attribute attributes in
-      if name == name' && attributes == attributes' then
-        elem
-      else
-        (loc, { name = name'; self_closing; attributes = attributes' })
-
-    method jsx_closing_element (elem : ('loc, 'loc) Ast.JSX.Closing.t) =
-      let open Ast.JSX.Closing in
-      let (loc, { name }) = elem in
-      let name' = this#jsx_element_name name in
-      if name == name' then
-        elem
-      else
-        (loc, { name = name' })
-
-    method jsx_opening_attribute (jsx_attr : ('loc, 'loc) Ast.JSX.Opening.attribute) =
-      let open Ast.JSX.Opening in
-      match jsx_attr with
-      | Attribute attr -> id this#jsx_attribute attr jsx_attr (fun attr -> Attribute attr)
-      | SpreadAttribute (loc, attr) ->
-        id_loc this#jsx_spread_attribute loc attr jsx_attr (fun attr -> SpreadAttribute (loc, attr))
-
-    method jsx_spread_attribute _loc (attr : ('loc, 'loc) Ast.JSX.SpreadAttribute.t') =
-      let open Ast.JSX.SpreadAttribute in
-      let { argument; comments } = attr in
-      let argument' = this#expression argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        attr
-      else
-        { argument = argument'; comments = comments' }
-
-    method jsx_attribute (attr : ('loc, 'loc) Ast.JSX.Attribute.t) =
-      let open Ast.JSX.Attribute in
-      let (loc, { name; value }) = attr in
-      let name' = this#jsx_attribute_name name in
-      let value' = map_opt this#jsx_attribute_value value in
-      if name == name' && value == value' then
-        attr
-      else
-        (loc, { name = name'; value = value' })
-
-    method jsx_attribute_name (name : ('loc, 'loc) Ast.JSX.Attribute.name) =
-      let open Ast.JSX.Attribute in
-      match name with
-      | Identifier ident ->
-        id this#jsx_attribute_name_identifier ident name (fun ident -> Identifier ident)
-      | NamespacedName ns ->
-        id this#jsx_attribute_name_namespaced ns name (fun ns -> NamespacedName ns)
-
-    method jsx_attribute_name_identifier ident = this#jsx_identifier ident
-
-    method jsx_attribute_name_namespaced ns = this#jsx_namespaced_name ns
-
-    method jsx_attribute_value (value : ('loc, 'loc) Ast.JSX.Attribute.value) =
-      let open Ast.JSX.Attribute in
-      match value with
-      | Literal (loc, lit) ->
-        id_loc this#jsx_attribute_value_literal loc lit value (fun lit -> Literal (loc, lit))
-      | ExpressionContainer (loc, expr) ->
-        id_loc this#jsx_attribute_value_expression loc expr value (fun expr ->
-            ExpressionContainer (loc, expr)
-        )
-
-    method jsx_attribute_value_expression loc (jsx_expr : ('loc, 'loc) Ast.JSX.ExpressionContainer.t)
-        =
-      this#jsx_expression loc jsx_expr
-
-    method jsx_attribute_value_literal loc (lit : 'loc Ast.Literal.t) = this#literal loc lit
-
-    method jsx_children ((loc, children) as orig : 'loc * ('loc, 'loc) Ast.JSX.child list) =
-      let children' = map_list this#jsx_child children in
-      if children == children' then
-        orig
-      else
-        (loc, children')
-
-    method jsx_child (child : ('loc, 'loc) Ast.JSX.child) =
-      let open Ast.JSX in
-      match child with
-      | (loc, Element elem) ->
-        id_loc this#jsx_element loc elem child (fun elem -> (loc, Element elem))
-      | (loc, Fragment frag) ->
-        id_loc this#jsx_fragment loc frag child (fun frag -> (loc, Fragment frag))
-      | (loc, ExpressionContainer expr) ->
-        id_loc this#jsx_expression loc expr child (fun expr -> (loc, ExpressionContainer expr))
-      | (loc, SpreadChild spread) ->
-        id this#jsx_spread_child spread child (fun spread -> (loc, SpreadChild spread))
-      | (_loc, Text _) -> child
-
-    method jsx_expression _loc (jsx_expr : ('loc, 'loc) Ast.JSX.ExpressionContainer.t) =
-      let open Ast.JSX.ExpressionContainer in
-      let { expression; comments } = jsx_expr in
-      let comments' = this#syntax_opt comments in
-      match expression with
-      | Expression expr ->
-        let expr' = this#expression expr in
-        if expr == expr' && comments == comments' then
-          jsx_expr
-        else
-          { expression = Expression expr'; comments = comments' }
-      | EmptyExpression ->
-        if comments == comments' then
-          jsx_expr
-        else
-          { expression = EmptyExpression; comments = comments' }
-
-    method jsx_spread_child (jsx_spread_child : ('loc, 'loc) Ast.JSX.SpreadChild.t) =
-      let open Ast.JSX.SpreadChild in
-      let { expression; comments } = jsx_spread_child in
-      let expression' = this#expression expression in
-      let comments' = this#syntax_opt comments in
-      if expression == expression' && comments == comments' then
-        jsx_spread_child
-      else
-        { expression = expression'; comments = comments' }
-
-    method jsx_element_name (name : ('loc, 'loc) Ast.JSX.name) =
-      let open Ast.JSX in
-      match name with
-      | Identifier ident ->
-        id this#jsx_element_name_identifier ident name (fun ident -> Identifier ident)
-      | NamespacedName ns ->
-        id this#jsx_element_name_namespaced ns name (fun ns -> NamespacedName ns)
-      | MemberExpression expr ->
-        id this#jsx_element_name_member_expression expr name (fun expr -> MemberExpression expr)
-
-    method jsx_element_name_identifier ident = this#jsx_identifier ident
-
-    method jsx_element_name_namespaced ns = this#jsx_namespaced_name ns
-
-    method jsx_element_name_member_expression expr = this#jsx_member_expression expr
-
-    method jsx_namespaced_name (namespaced_name : ('loc, 'loc) Ast.JSX.NamespacedName.t) =
-      let open Ast.JSX in
-      NamespacedName.(
-        let (loc, { namespace; name }) = namespaced_name in
-        let namespace' = this#jsx_identifier namespace in
-        let name' = this#jsx_identifier name in
-        if namespace == namespace' && name == name' then
-          namespaced_name
-        else
-          (loc, { namespace = namespace'; name = name' })
-      )
-
-    method jsx_member_expression (member_exp : ('loc, 'loc) Ast.JSX.MemberExpression.t) =
-      let open Ast.JSX in
-      let (loc, { MemberExpression._object; MemberExpression.property }) = member_exp in
-      let _object' = this#jsx_member_expression_object _object in
-      let property' = this#jsx_identifier property in
-      if _object == _object' && property == property' then
-        member_exp
-      else
-        (loc, MemberExpression.{ _object = _object'; property = property' })
-
-    method jsx_member_expression_object (_object : ('loc, 'loc) Ast.JSX.MemberExpression._object) =
-      let open Ast.JSX.MemberExpression in
-      match _object with
-      | Identifier ident ->
-        id this#jsx_member_expression_identifier ident _object (fun ident -> Identifier ident)
-      | MemberExpression nested_exp ->
-        id this#jsx_member_expression nested_exp _object (fun exp -> MemberExpression exp)
-
-    method jsx_member_expression_identifier ident = this#jsx_element_name_identifier ident
-
-    method jsx_identifier (id : ('loc, 'loc) Ast.JSX.Identifier.t) =
-      let open Ast.JSX.Identifier in
-      let (loc, { name; comments }) = id in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        id
-      else
-        (loc, { name; comments = comments' })
-
-    method labeled_statement _loc (stmt : ('loc, 'loc) Ast.Statement.Labeled.t) =
-      let open Ast.Statement.Labeled in
-      let { label; body; comments } = stmt in
-      let label' = this#label_identifier label in
-      let body' = this#statement body in
-      let comments' = this#syntax_opt comments in
-      if label == label' && body == body' && comments == comments' then
-        stmt
-      else
-        { label = label'; body = body'; comments = comments' }
-
-    method literal _loc (expr : 'loc Ast.Literal.t) =
-      let open Ast.Literal in
-      let { value; raw; comments } = expr in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        expr
-      else
-        { value; raw; comments = comments' }
-
-    method logical _loc (expr : ('loc, 'loc) Ast.Expression.Logical.t) =
-      let open Ast.Expression.Logical in
-      let { operator = _; left; right; comments } = expr in
-      let left' = this#expression left in
-      let right' = this#expression right in
-      let comments' = this#syntax_opt comments in
-      if left == left' && right == right' && comments == comments' then
-        expr
-      else
-        { expr with left = left'; right = right'; comments = comments' }
-
-    method member _loc (expr : ('loc, 'loc) Ast.Expression.Member.t) =
-      let open Ast.Expression.Member in
-      let { _object; property; comments } = expr in
-      let _object' = this#expression _object in
-      let property' = this#member_property property in
-      let comments' = this#syntax_opt comments in
-      if _object == _object' && property == property' && comments == comments' then
-        expr
-      else
-        { _object = _object'; property = property'; comments = comments' }
-
-    method optional_member loc (expr : ('loc, 'loc) Ast.Expression.OptionalMember.t) =
-      let open Ast.Expression.OptionalMember in
-      let { member; optional = _; filtered_out = _ } = expr in
-      let member' = this#member loc member in
-      if member == member' then
-        expr
-      else
-        { expr with member = member' }
-
-    method member_property (expr : ('loc, 'loc) Ast.Expression.Member.property) =
-      let open Ast.Expression.Member in
-      match expr with
-      | PropertyIdentifier ident ->
-        id this#member_property_identifier ident expr (fun ident -> PropertyIdentifier ident)
-      | PropertyPrivateName ident ->
-        id this#member_private_name ident expr (fun ident -> PropertyPrivateName ident)
-      | PropertyExpression e ->
-        id this#member_property_expression e expr (fun e -> PropertyExpression e)
-
-    method member_property_identifier (ident : ('loc, 'loc) Ast.Identifier.t) =
-      this#identifier ident
-
-    method member_private_name (name : 'loc Ast.PrivateName.t) = this#private_name name
-
-    method member_property_expression (expr : ('loc, 'loc) Ast.Expression.t) = this#expression expr
-
-    method meta_property _loc (expr : 'loc Ast.Expression.MetaProperty.t) =
-      let open Ast.Expression.MetaProperty in
-      let { meta; property; comments } = expr in
-      let meta' = this#identifier meta in
-      let property' = this#identifier property in
-      let comments' = this#syntax_opt comments in
-      if meta == meta' && property == property' && comments == comments' then
-        expr
-      else
-        { meta = meta'; property = property'; comments = comments' }
-
-    method new_ _loc (expr : ('loc, 'loc) Ast.Expression.New.t) =
-      let open Ast.Expression.New in
-      let { callee; targs; arguments; comments } = expr in
-      let callee' = this#expression callee in
-      let targs' = map_opt this#call_type_args targs in
-      let arguments' = map_opt this#call_arguments arguments in
-      let comments' = this#syntax_opt comments in
-      if callee == callee' && targs == targs' && arguments == arguments' && comments == comments'
-      then
-        expr
-      else
-        { callee = callee'; targs = targs'; arguments = arguments'; comments = comments' }
-
-    method object_ _loc (expr : ('loc, 'loc) Ast.Expression.Object.t) =
-      let open Ast.Expression.Object in
-      let { properties; comments } = expr in
-      let properties' =
-        map_list
-          (fun prop ->
-            match prop with
-            | Property p ->
-              let p' = this#object_property p in
-              if p == p' then
-                prop
-              else
-                Property p'
-            | SpreadProperty s ->
-              let s' = this#spread_property s in
-              if s == s' then
-                prop
-              else
-                SpreadProperty s')
-          properties
-      in
-      let comments' = this#syntax_opt comments in
-      if properties == properties' && comments == comments' then
-        expr
-      else
-        { properties = properties'; comments = comments' }
-
-    method object_property (prop : ('loc, 'loc) Ast.Expression.Object.Property.t) =
-      let open Ast.Expression.Object.Property in
-      match prop with
-      | (loc, Init { key; value; shorthand }) ->
-        let key' = this#object_key key in
-        let value' = this#expression value in
-        let shorthand' =
-          (* Try to figure out if shorthand should still be true--if
-             key and value change differently, it should become false *)
-          shorthand
-          &&
-          match (key', value') with
-          | ( Identifier (_, { Ast.Identifier.name = key_name; _ }),
-              (_, Ast.Expression.Identifier (_, { Ast.Identifier.name = value_name; _ }))
-            ) ->
-            String.equal key_name value_name
-          | _ -> key == key' && value == value'
-        in
-        if key == key' && value == value' && shorthand == shorthand' then
-          prop
-        else
-          (loc, Init { key = key'; value = value'; shorthand = shorthand' })
-      | (loc, Method { key; value = fn }) ->
-        let key' = this#object_key key in
-        let fn' = map_loc this#function_expression_or_method fn in
-        if key == key' && fn == fn' then
-          prop
-        else
-          (loc, Method { key = key'; value = fn' })
-      | (loc, Get { key; value = fn; comments }) ->
-        let key' = this#object_key key in
-        let fn' = map_loc this#function_expression_or_method fn in
-        let comments' = this#syntax_opt comments in
-        if key == key' && fn == fn' && comments == comments' then
-          prop
-        else
-          (loc, Get { key = key'; value = fn'; comments = comments' })
-      | (loc, Set { key; value = fn; comments }) ->
-        let key' = this#object_key key in
-        let fn' = map_loc this#function_expression_or_method fn in
-        let comments' = this#syntax_opt comments in
-        if key == key' && fn == fn' && comments == comments' then
-          prop
-        else
-          (loc, Set { key = key'; value = fn'; comments = comments' })
-
-    method object_key (key : ('loc, 'loc) Ast.Expression.Object.Property.key) =
-      let open Ast.Expression.Object.Property in
-      match key with
-      | Literal literal -> id this#object_key_literal literal key (fun lit -> Literal lit)
-      | Identifier ident -> id this#object_key_identifier ident key (fun ident -> Identifier ident)
-      | PrivateName ident -> id this#private_name ident key (fun ident -> PrivateName ident)
-      | Computed computed -> id this#object_key_computed computed key (fun expr -> Computed expr)
-
-    method object_key_literal (literal : 'loc * 'loc Ast.Literal.t) =
-      let (loc, lit) = literal in
-      id_loc this#literal loc lit literal (fun lit -> (loc, lit))
-
-    method object_key_identifier (ident : ('loc, 'loc) Ast.Identifier.t) = this#identifier ident
-
-    method object_key_computed (key : ('loc, 'loc) Ast.ComputedKey.t) = this#computed_key key
-
-    method opaque_type _loc (otype : ('loc, 'loc) Ast.Statement.OpaqueType.t) =
-      let open Ast.Statement.OpaqueType in
-      let { id; tparams; impltype; supertype; comments } = otype in
-      let id' = this#binding_type_identifier id in
-      let tparams' = map_opt this#type_params tparams in
-      let impltype' = map_opt this#type_ impltype in
-      let supertype' = map_opt this#type_ supertype in
-      let comments' = this#syntax_opt comments in
-      if
-        id == id'
-        && impltype == impltype'
-        && tparams == tparams'
-        && impltype == impltype'
-        && supertype == supertype'
-        && comments == comments'
-      then
-        otype
-      else
-        {
-          id = id';
-          tparams = tparams';
-          impltype = impltype';
-          supertype = supertype';
-          comments = comments';
-        }
-
-    method function_param_pattern (expr : ('loc, 'loc) Ast.Pattern.t) =
-      this#binding_pattern ~kind:Ast.Statement.VariableDeclaration.Let expr
-
-    method variable_declarator_pattern ~kind (expr : ('loc, 'loc) Ast.Pattern.t) =
-      this#binding_pattern ~kind expr
-
-    method catch_clause_pattern (expr : ('loc, 'loc) Ast.Pattern.t) =
-      this#binding_pattern ~kind:Ast.Statement.VariableDeclaration.Let expr
-
-    method for_in_assignment_pattern (expr : ('loc, 'loc) Ast.Pattern.t) =
-      this#assignment_pattern expr
-
-    method for_of_assignment_pattern (expr : ('loc, 'loc) Ast.Pattern.t) =
-      this#assignment_pattern expr
-
-    method binding_pattern
-        ?(kind = Ast.Statement.VariableDeclaration.Var) (expr : ('loc, 'loc) Ast.Pattern.t) =
-      this#pattern ~kind expr
-
-    method assignment_pattern (expr : ('loc, 'loc) Ast.Pattern.t) = this#pattern expr
-
-    (* NOTE: Patterns are highly overloaded. A pattern can be a binding pattern,
-       which has a kind (Var/Let/Const, with Var being the default for all pre-ES5
-       bindings), or an assignment pattern, which has no kind. Subterms that are
-       patterns inherit the kind (or lack thereof). *)
-    method pattern ?kind (expr : ('loc, 'loc) Ast.Pattern.t) =
-      let open Ast.Pattern in
-      let (loc, patt) = expr in
-      let patt' =
-        match patt with
-        | Object { Object.properties; annot; comments } ->
-          let properties' = map_list (this#pattern_object_p ?kind) properties in
-          let annot' = this#type_annotation_hint annot in
-          let comments' = this#syntax_opt comments in
-          if properties' == properties && annot' == annot && comments' == comments then
-            patt
-          else
-            Object { Object.properties = properties'; annot = annot'; comments = comments' }
-        | Array { Array.elements; annot; comments } ->
-          let elements' = map_list (this#pattern_array_e ?kind) elements in
-          let annot' = this#type_annotation_hint annot in
-          let comments' = this#syntax_opt comments in
-          if comments == comments' && elements' == elements && annot' == annot then
-            patt
-          else
-            Array { Array.elements = elements'; annot = annot'; comments = comments' }
-        | Identifier { Identifier.name; annot; optional } ->
-          let name' = this#pattern_identifier ?kind name in
-          let annot' = this#type_annotation_hint annot in
-          if name == name' && annot == annot' then
-            patt
-          else
-            Identifier { Identifier.name = name'; annot = annot'; optional }
-        | Expression e -> id this#pattern_expression e patt (fun e -> Expression e)
-      in
-      if patt == patt' then
-        expr
-      else
-        (loc, patt')
-
-    method pattern_identifier ?kind (ident : ('loc, 'loc) Ast.Identifier.t) =
-      ignore kind;
-      this#identifier ident
-
-    method pattern_literal ?kind loc (expr : 'loc Ast.Literal.t) =
-      ignore kind;
-      this#literal loc expr
-
-    method pattern_object_p ?kind (p : ('loc, 'loc) Ast.Pattern.Object.property) =
-      let open Ast.Pattern.Object in
-      match p with
-      | Property prop -> id (this#pattern_object_property ?kind) prop p (fun prop -> Property prop)
-      | RestElement prop ->
-        id (this#pattern_object_rest_property ?kind) prop p (fun prop -> RestElement prop)
-
-    method pattern_object_property ?kind (prop : ('loc, 'loc) Ast.Pattern.Object.Property.t) =
-      let open Ast.Pattern.Object.Property in
-      let (loc, { key; pattern; default; shorthand }) = prop in
-      let key' = this#pattern_object_property_key ?kind key in
-      let pattern' = this#pattern_object_property_pattern ?kind pattern in
-      let default' = map_opt this#expression default in
-      let shorthand' =
-        (* Try to figure out if shorthand should still be true--if
-            key and value change differently, it should become false *)
-        shorthand
-        &&
-        match (key', pattern') with
-        | ( Identifier (_, { Ast.Identifier.name = key_name; _ }),
-            ( _,
-              Ast.Pattern.Identifier
-                { Ast.Pattern.Identifier.name = (_, { Ast.Identifier.name = value_name; _ }); _ }
-            )
-          ) ->
-          String.equal key_name value_name
-        | _ -> key == key' && pattern == pattern'
-      in
-      if key' == key && pattern' == pattern && default' == default && shorthand == shorthand' then
-        prop
-      else
-        (loc, { key = key'; pattern = pattern'; default = default'; shorthand = shorthand' })
-
-    method pattern_object_property_key ?kind (key : ('loc, 'loc) Ast.Pattern.Object.Property.key) =
-      let open Ast.Pattern.Object.Property in
-      match key with
-      | Literal lit ->
-        id (this#pattern_object_property_literal_key ?kind) lit key (fun lit' -> Literal lit')
-      | Identifier identifier ->
-        id (this#pattern_object_property_identifier_key ?kind) identifier key (fun id' ->
-            Identifier id'
-        )
-      | Computed expr ->
-        id (this#pattern_object_property_computed_key ?kind) expr key (fun expr' -> Computed expr')
-
-    method pattern_object_property_literal_key ?kind (literal : 'loc * 'loc Ast.Literal.t) =
-      let (loc, key) = literal in
-      id_loc (this#pattern_literal ?kind) loc key literal (fun key' -> (loc, key'))
-
-    method pattern_object_property_identifier_key ?kind (key : ('loc, 'loc) Ast.Identifier.t) =
-      this#pattern_identifier ?kind key
-
-    method pattern_object_property_computed_key ?kind (key : ('loc, 'loc) Ast.ComputedKey.t) =
-      ignore kind;
-      this#computed_key key
-
-    method pattern_object_rest_property ?kind (prop : ('loc, 'loc) Ast.Pattern.RestElement.t) =
-      let open Ast.Pattern.RestElement in
-      let (loc, { argument; comments }) = prop in
-      let argument' = this#pattern_object_rest_property_pattern ?kind argument in
-      let comments' = this#syntax_opt comments in
-      if argument' == argument && comments == comments' then
-        prop
-      else
-        (loc, { argument = argument'; comments = comments' })
-
-    method pattern_object_property_pattern ?kind (expr : ('loc, 'loc) Ast.Pattern.t) =
-      this#pattern ?kind expr
-
-    method pattern_object_rest_property_pattern ?kind (expr : ('loc, 'loc) Ast.Pattern.t) =
-      this#pattern ?kind expr
-
-    method pattern_array_e ?kind (e : ('loc, 'loc) Ast.Pattern.Array.element) =
-      let open Ast.Pattern.Array in
-      match e with
-      | Hole _ -> e
-      | Element elem -> id (this#pattern_array_element ?kind) elem e (fun elem -> Element elem)
-      | RestElement elem ->
-        id (this#pattern_array_rest_element ?kind) elem e (fun elem -> RestElement elem)
-
-    method pattern_array_element ?kind (elem : ('loc, 'loc) Ast.Pattern.Array.Element.t) =
-      let open Ast.Pattern.Array.Element in
-      let (loc, { argument; default }) = elem in
-      let argument' = this#pattern_array_element_pattern ?kind argument in
-      let default' = map_opt this#expression default in
-      if argument == argument' && default == default' then
-        elem
-      else
-        (loc, { argument = argument'; default = default' })
-
-    method pattern_array_element_pattern ?kind (patt : ('loc, 'loc) Ast.Pattern.t) =
-      this#pattern ?kind patt
-
-    method pattern_array_rest_element ?kind (elem : ('loc, 'loc) Ast.Pattern.RestElement.t) =
-      let open Ast.Pattern.RestElement in
-      let (loc, { argument; comments }) = elem in
-      let argument' = this#pattern_array_rest_element_pattern ?kind argument in
-      let comments' = this#syntax_opt comments in
-      if argument' == argument && comments == comments' then
-        elem
-      else
-        (loc, { argument = argument'; comments = comments' })
-
-    method pattern_array_rest_element_pattern ?kind (expr : ('loc, 'loc) Ast.Pattern.t) =
-      this#pattern ?kind expr
-
-    method pattern_expression (expr : ('loc, 'loc) Ast.Expression.t) = this#expression expr
-
-    method predicate (pred : ('loc, 'loc) Ast.Type.Predicate.t) =
-      let open Ast.Type.Predicate in
-      let (loc, { kind; comments }) = pred in
-      let kind' =
-        match kind with
-        | Inferred -> kind
-        | Declared expr -> id this#expression expr kind (fun expr' -> Declared expr')
-      in
-      let comments' = this#syntax_opt comments in
-      if kind == kind' && comments == comments' then
-        pred
-      else
-        (loc, { kind = kind'; comments = comments' })
-
-    method predicate_expression (expr : ('loc, 'loc) Ast.Expression.t) = this#expression expr
-
-    method function_rest_param (expr : ('loc, 'loc) Ast.Function.RestParam.t) =
-      let open Ast.Function.RestParam in
-      let (loc, { argument; comments }) = expr in
-      let argument' = this#function_param_pattern argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        expr
-      else
-        (loc, { argument = argument'; comments = comments' })
-
-    method return _loc (stmt : ('loc, 'loc) Ast.Statement.Return.t) =
-      let open Ast.Statement.Return in
-      let { argument; comments; return_out } = stmt in
-      let argument' = map_opt this#expression argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        stmt
-      else
-        { argument = argument'; comments = comments'; return_out }
-
-    method sequence _loc (expr : ('loc, 'loc) Ast.Expression.Sequence.t) =
-      let open Ast.Expression.Sequence in
-      let { expressions; comments } = expr in
-      let expressions' = map_list this#expression expressions in
-      let comments' = this#syntax_opt comments in
-      if expressions == expressions' && comments == comments' then
-        expr
-      else
-        { expressions = expressions'; comments = comments' }
-
-    method toplevel_statement_list (stmts : ('loc, 'loc) Ast.Statement.t list) =
-      this#statement_list stmts
-
-    method statement_list (stmts : ('loc, 'loc) Ast.Statement.t list) =
-      map_list_multiple this#statement_fork_point stmts
-
-    method statement_fork_point (stmt : ('loc, 'loc) Ast.Statement.t) = [this#statement stmt]
-
-    method spread_element (expr : ('loc, 'loc) Ast.Expression.SpreadElement.t) =
-      let open Ast.Expression.SpreadElement in
-      let (loc, { argument; comments }) = expr in
-      let argument' = this#expression argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        expr
-      else
-        (loc, { argument = argument'; comments = comments' })
-
-    method spread_property (expr : ('loc, 'loc) Ast.Expression.Object.SpreadProperty.t) =
-      let open Ast.Expression.Object.SpreadProperty in
-      let (loc, { argument; comments }) = expr in
-      let argument' = this#expression argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        expr
-      else
-        (loc, { argument = argument'; comments = comments' })
-
-    method super_expression _loc (expr : 'loc Ast.Expression.Super.t) =
-      let open Ast.Expression.Super in
-      let { comments } = expr in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        expr
-      else
-        { comments = comments' }
-
-    method switch _loc (switch : ('loc, 'loc) Ast.Statement.Switch.t) =
-      let open Ast.Statement.Switch in
-      let { discriminant; cases; comments; exhaustive_out } = switch in
-      let discriminant' = this#expression discriminant in
-      let cases' = map_list this#switch_case cases in
-      let comments' = this#syntax_opt comments in
-      if discriminant == discriminant' && cases == cases' && comments == comments' then
-        switch
-      else
-        { discriminant = discriminant'; cases = cases'; comments = comments'; exhaustive_out }
-
-    method switch_case (case : ('loc, 'loc) Ast.Statement.Switch.Case.t) =
-      let open Ast.Statement.Switch.Case in
-      let (loc, { test; consequent; comments }) = case in
-      let test' = map_opt this#expression test in
-      let consequent' = this#statement_list consequent in
-      let comments' = this#syntax_opt comments in
-      if test == test' && consequent == consequent' && comments == comments' then
-        case
-      else
-        (loc, { test = test'; consequent = consequent'; comments = comments' })
-
-    method tagged_template _loc (expr : ('loc, 'loc) Ast.Expression.TaggedTemplate.t) =
-      let open Ast.Expression.TaggedTemplate in
-      let { tag; quasi; comments } = expr in
-      let tag' = this#expression tag in
-      let quasi' = map_loc this#template_literal quasi in
-      let comments' = this#syntax_opt comments in
-      if tag == tag' && quasi == quasi' && comments == comments' then
-        expr
-      else
-        { tag = tag'; quasi = quasi'; comments = comments' }
-
-    method template_literal _loc (expr : ('loc, 'loc) Ast.Expression.TemplateLiteral.t) =
-      let open Ast.Expression.TemplateLiteral in
-      let { quasis; expressions; comments } = expr in
-      let quasis' = map_list this#template_literal_element quasis in
-      let expressions' = map_list this#expression expressions in
-      let comments' = this#syntax_opt comments in
-      if quasis == quasis' && expressions == expressions' && comments == comments' then
-        expr
-      else
-        { quasis = quasis'; expressions = expressions'; comments = comments' }
-
-    (* TODO *)
-    method template_literal_element (elem : 'loc Ast.Expression.TemplateLiteral.Element.t) = elem
-
-    method this_expression _loc (expr : 'loc Ast.Expression.This.t) =
-      let open Ast.Expression.This in
-      let { comments } = expr in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' then
-        expr
-      else
-        { comments = comments' }
-
-    method throw _loc (stmt : ('loc, 'loc) Ast.Statement.Throw.t) =
-      let open Ast.Statement.Throw in
-      let { argument; comments } = stmt in
-      let argument' = this#expression argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        stmt
-      else
-        { argument = argument'; comments = comments' }
-
-    method try_catch _loc (stmt : ('loc, 'loc) Ast.Statement.Try.t) =
-      let open Ast.Statement.Try in
-      let { block; handler; finalizer; comments } = stmt in
-      let block' = map_loc this#block block in
-      let handler' =
-        match handler with
-        | Some (loc, clause) ->
-          id_loc this#catch_clause loc clause handler (fun clause -> Some (loc, clause))
-        | None -> handler
-      in
-      let finalizer' =
-        match finalizer with
-        | Some (finalizer_loc, block) ->
-          id_loc this#block finalizer_loc block finalizer (fun block -> Some (finalizer_loc, block))
-        | None -> finalizer
-      in
-      let comments' = this#syntax_opt comments in
-      if block == block' && handler == handler' && finalizer == finalizer' && comments == comments'
-      then
-        stmt
-      else
-        { block = block'; handler = handler'; finalizer = finalizer'; comments = comments' }
-
-    method type_cast _loc (expr : ('loc, 'loc) Ast.Expression.TypeCast.t) =
-      let open Ast.Expression.TypeCast in
-      let { expression; annot; comments } = expr in
-      let expression' = this#expression expression in
-      let annot' = this#type_annotation annot in
-      let comments' = this#syntax_opt comments in
-      if expression' == expression && annot' == annot && comments' == comments then
-        expr
-      else
-        { expression = expression'; annot = annot'; comments = comments' }
-
-    method unary_expression _loc (expr : ('loc, 'loc) Flow_ast.Expression.Unary.t) =
-      let open Flow_ast.Expression.Unary in
-      let { argument; operator = _; comments } = expr in
-      let argument' = this#expression argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        expr
-      else
-        { expr with argument = argument'; comments = comments' }
-
-    method update_expression _loc (expr : ('loc, 'loc) Ast.Expression.Update.t) =
-      let open Ast.Expression.Update in
-      let { argument; operator = _; prefix = _; comments } = expr in
-      let argument' = this#expression argument in
-      let comments' = this#syntax_opt comments in
-      if argument == argument' && comments == comments' then
-        expr
-      else
-        { expr with argument = argument'; comments = comments' }
-
-    method variable_declaration _loc (decl : ('loc, 'loc) Ast.Statement.VariableDeclaration.t) =
-      let open Ast.Statement.VariableDeclaration in
-      let { declarations; kind; comments } = decl in
-      let decls' = map_list (this#variable_declarator ~kind) declarations in
-      let comments' = this#syntax_opt comments in
-      if declarations == decls' && comments == comments' then
-        decl
-      else
-        { declarations = decls'; kind; comments = comments' }
-
-    method variable_declarator
-        ~kind (decl : ('loc, 'loc) Ast.Statement.VariableDeclaration.Declarator.t) =
-      let open Ast.Statement.VariableDeclaration.Declarator in
-      let (loc, { id; init }) = decl in
-      let id' = this#variable_declarator_pattern ~kind id in
-      let init' = map_opt this#expression init in
-      if id == id' && init == init' then
-        decl
-      else
-        (loc, { id = id'; init = init' })
-
-    method while_ _loc (stuff : ('loc, 'loc) Ast.Statement.While.t) =
-      let open Ast.Statement.While in
-      let { test; body; comments } = stuff in
-      let test' = this#predicate_expression test in
-      let body' = this#statement body in
-      let comments' = this#syntax_opt comments in
-      if test == test' && body == body' && comments == comments' then
-        stuff
-      else
-        { test = test'; body = body'; comments = comments' }
-
-    method with_ _loc (stuff : ('loc, 'loc) Ast.Statement.With.t) =
-      let open Ast.Statement.With in
-      let { _object; body; comments } = stuff in
-      let _object' = this#expression _object in
-      let body' = this#statement body in
-      let comments' = this#syntax_opt comments in
-      if _object == _object' && body == body' && comments == comments' then
-        stuff
-      else
-        { _object = _object'; body = body'; comments = comments' }
-
-    method type_alias _loc (stuff : ('loc, 'loc) Ast.Statement.TypeAlias.t) =
-      let open Ast.Statement.TypeAlias in
-      let { id; tparams; right; comments } = stuff in
-      let id' = this#binding_type_identifier id in
-      let tparams' = map_opt this#type_params tparams in
-      let right' = this#type_ right in
-      let comments' = this#syntax_opt comments in
-      if id == id' && right == right' && tparams == tparams' && comments == comments' then
-        stuff
-      else
-        { id = id'; tparams = tparams'; right = right'; comments = comments' }
-
-    method yield _loc (expr : ('loc, 'loc) Ast.Expression.Yield.t) =
-      let open Ast.Expression.Yield in
-      let { argument; delegate; comments; result_out } = expr in
-      let argument' = map_opt this#expression argument in
-      let comments' = this#syntax_opt comments in
-      if comments == comments' && argument == argument' then
-        expr
-      else
-        { argument = argument'; delegate; comments = comments'; result_out }
-  end
-
-let fold_program (mappers : 'a mapper list) ast =
-  List.fold_left (fun ast (m : 'a mapper) -> m#program ast) ast mappers
diff --git a/jscomp/js_parser/flow_ast_utils.ml b/jscomp/js_parser/flow_ast_utils.ml
deleted file mode 100644
index cdaee7b..0000000
--- a/jscomp/js_parser/flow_ast_utils.ml
+++ /dev/null
@@ -1,339 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-open Flow_ast
-
-type 'loc binding = 'loc * string
-type 'loc ident = 'loc * string
-type 'loc source = 'loc * string
-
-let rec fold_bindings_of_pattern =
-  Pattern.(
-    let property f acc =
-      Object.(
-        function
-        | Property (_, { Property.pattern = p; _ })
-        | RestElement (_, { RestElement.argument = p; comments = _ }) ->
-          fold_bindings_of_pattern f acc p
-      )
-    in
-    let element f acc =
-      Array.(
-        function
-        | Hole _ -> acc
-        | Element (_, { Element.argument = p; default = _ })
-        | RestElement (_, { RestElement.argument = p; comments = _ }) ->
-          fold_bindings_of_pattern f acc p
-      )
-    in
-    fun f acc -> function
-      | (_, Identifier { Identifier.name; _ }) -> f acc name
-      | (_, Object { Object.properties; _ }) -> List.fold_left (property f) acc properties
-      | (_, Array { Array.elements; _ }) -> List.fold_left (element f) acc elements
-      (* This is for assignment and default param destructuring `[a.b=1]=c`, ignore these for now. *)
-      | (_, Expression _) -> acc
-  )
-
-let fold_bindings_of_variable_declarations f acc declarations =
-  let open Flow_ast.Statement.VariableDeclaration in
-  List.fold_left
-    (fun acc -> function
-      | (_, { Declarator.id = pattern; _ }) ->
-        let has_anno =
-          (* Only the toplevel annotation in a pattern is meaningful *)
-          let open Flow_ast.Pattern in
-          match pattern with
-          | (_, Array { Array.annot = Flow_ast.Type.Available _; _ })
-          | (_, Object { Object.annot = Flow_ast.Type.Available _; _ })
-          | (_, Identifier { Identifier.annot = Flow_ast.Type.Available _; _ }) ->
-            true
-          | _ -> false
-        in
-        fold_bindings_of_pattern (f has_anno) acc pattern)
-    acc
-    declarations
-
-let partition_directives statements =
-  let open Flow_ast.Statement in
-  let rec helper directives = function
-    | ((_, Expression { Expression.directive = Some _; _ }) as directive) :: rest ->
-      helper (directive :: directives) rest
-    | rest -> (List.rev directives, rest)
-  in
-  helper [] statements
-
-let hoist_function_declarations stmts =
-  let open Flow_ast.Statement in
-  let (func_decs, other_stmts) =
-    List.partition
-      (function
-        (* function f() {} *)
-        | (_, FunctionDeclaration { Flow_ast.Function.id = Some _; _ })
-        (* export function f() {} *)
-        | ( _,
-            ExportNamedDeclaration
-              {
-                ExportNamedDeclaration.declaration =
-                  Some (_, FunctionDeclaration { Flow_ast.Function.id = Some _; _ });
-                _;
-              }
-          )
-        (* export default function f() {} *)
-        | ( _,
-            ExportDefaultDeclaration
-              {
-                ExportDefaultDeclaration.declaration =
-                  ExportDefaultDeclaration.Declaration
-                    (_, FunctionDeclaration { Flow_ast.Function.id = Some _; _ });
-                _;
-              }
-          )
-        (* declare function f(): void; *)
-        | (_, DeclareFunction _)
-        (* declare export function f(): void; *)
-        | ( _,
-            DeclareExportDeclaration DeclareExportDeclaration.{ declaration = Some (Function _); _ }
-          ) ->
-          true
-        | _ -> false)
-      stmts
-  in
-  func_decs @ other_stmts
-
-let negate_number_literal (value, raw) =
-  let raw_len = String.length raw in
-  let raw =
-    if raw_len > 0 && raw.[0] = '-' then
-      String.sub raw 1 (raw_len - 1)
-    else
-      "-" ^ raw
-  in
-  (~-.value, raw)
-
-let is_call_to_invariant callee =
-  match callee with
-  | (_, Expression.Identifier (_, { Identifier.name = "invariant"; _ })) -> true
-  | _ -> false
-
-let is_call_to_is_array callee =
-  match callee with
-  | ( _,
-      Flow_ast.Expression.Member
-        {
-          Flow_ast.Expression.Member._object =
-            ( _,
-              Flow_ast.Expression.Identifier
-                (_, { Flow_ast.Identifier.name = "Array"; comments = _ })
-            );
-          property =
-            Flow_ast.Expression.Member.PropertyIdentifier
-              (_, { Flow_ast.Identifier.name = "isArray"; comments = _ });
-          comments = _;
-        }
-    ) ->
-    true
-  | _ -> false
-
-let is_call_to_object_dot_freeze callee =
-  match callee with
-  | ( _,
-      Flow_ast.Expression.Member
-        {
-          Flow_ast.Expression.Member._object =
-            ( _,
-              Flow_ast.Expression.Identifier
-                (_, { Flow_ast.Identifier.name = "Object"; comments = _ })
-            );
-          property =
-            Flow_ast.Expression.Member.PropertyIdentifier
-              (_, { Flow_ast.Identifier.name = "freeze"; comments = _ });
-          comments = _;
-        }
-    ) ->
-    true
-  | _ -> false
-
-let is_call_to_object_static_method callee =
-  match callee with
-  | ( _,
-      Flow_ast.Expression.Member
-        {
-          Flow_ast.Expression.Member._object =
-            ( _,
-              Flow_ast.Expression.Identifier
-                (_, { Flow_ast.Identifier.name = "Object"; comments = _ })
-            );
-          property = Flow_ast.Expression.Member.PropertyIdentifier _;
-          comments = _;
-        }
-    ) ->
-    true
-  | _ -> false
-
-let loc_of_statement = fst
-let loc_of_expression = fst
-let loc_of_pattern = fst
-let loc_of_ident = fst
-let name_of_ident (_, { Identifier.name; comments = _ }) = name
-let source_of_ident (loc, { Identifier.name; comments = _ }) = (loc, name)
-let ident_of_source ?comments (loc, name) = (loc, { Identifier.name; comments })
-let mk_comments ?(leading = []) ?(trailing = []) a = { Syntax.leading; trailing; internal = a }
-
-let mk_comments_opt ?(leading = []) ?(trailing = []) () =
-  match (leading, trailing) with
-  | ([], []) -> None
-  | (_, _) -> Some (mk_comments ~leading ~trailing ())
-
-let mk_comments_with_internal_opt ?(leading = []) ?(trailing = []) ~internal () =
-  match (leading, trailing, internal) with
-  | ([], [], []) -> None
-  | _ -> Some (mk_comments ~leading ~trailing internal)
-
-let merge_comments ~inner ~outer =
-  let open Syntax in
-  match (inner, outer) with
-  | (None, c)
-  | (c, None) ->
-    c
-  | (Some inner, Some outer) ->
-    mk_comments_opt
-      ~leading:(outer.leading @ inner.leading)
-      ~trailing:(inner.trailing @ outer.trailing)
-      ()
-
-let merge_comments_with_internal ~inner ~outer =
-  match (inner, outer) with
-  | (inner, None) -> inner
-  | (None, Some { Syntax.leading; trailing; _ }) ->
-    mk_comments_with_internal_opt ~leading ~trailing ~internal:[] ()
-  | ( Some { Syntax.leading = inner_leading; trailing = inner_trailing; internal },
-      Some { Syntax.leading = outer_leading; trailing = outer_trailing; _ }
-    ) ->
-    mk_comments_with_internal_opt
-      ~leading:(outer_leading @ inner_leading)
-      ~trailing:(inner_trailing @ outer_trailing)
-      ~internal
-      ()
-
-let split_comments comments =
-  match comments with
-  | None -> (None, None)
-  | Some { Syntax.leading; trailing; _ } ->
-    (mk_comments_opt ~leading (), mk_comments_opt ~trailing ())
-
-let string_of_assignment_operator op =
-  let open Flow_ast.Expression.Assignment in
-  match op with
-  | PlusAssign -> "+="
-  | MinusAssign -> "-="
-  | MultAssign -> "*="
-  | ExpAssign -> "**="
-  | DivAssign -> "/="
-  | ModAssign -> "%="
-  | LShiftAssign -> "<<="
-  | RShiftAssign -> ">>="
-  | RShift3Assign -> ">>>="
-  | BitOrAssign -> "|="
-  | BitXorAssign -> "^="
-  | BitAndAssign -> "&="
-  | NullishAssign -> "??="
-  | AndAssign -> "&&="
-  | OrAssign -> "||="
-
-let string_of_binary_operator op =
-  let open Flow_ast.Expression.Binary in
-  match op with
-  | Equal -> "=="
-  | NotEqual -> "!="
-  | StrictEqual -> "==="
-  | StrictNotEqual -> "!=="
-  | LessThan -> "<"
-  | LessThanEqual -> "<="
-  | GreaterThan -> ">"
-  | GreaterThanEqual -> ">="
-  | LShift -> "<<"
-  | RShift -> ">>"
-  | RShift3 -> ">>>"
-  | Plus -> "+"
-  | Minus -> "-"
-  | Mult -> "*"
-  | Exp -> "**"
-  | Div -> "/"
-  | Mod -> "%"
-  | BitOr -> "|"
-  | Xor -> "^"
-  | BitAnd -> "&"
-  | In -> "in"
-  | Instanceof -> "instanceof"
-
-module ExpressionSort = struct
-  type t =
-    | Array
-    | ArrowFunction
-    | Assignment
-    | Binary
-    | Call
-    | Class
-    | Comprehension
-    | Conditional
-    | Function
-    | Generator
-    | Identifier
-    | Import
-    | JSXElement
-    | JSXFragment
-    | Literal
-    | Logical
-    | Member
-    | MetaProperty
-    | New
-    | Object
-    | OptionalCall
-    | OptionalMember
-    | Sequence
-    | Super
-    | TaggedTemplate
-    | TemplateLiteral
-    | This
-    | TypeCast
-    | Unary
-    | Update
-    | Yield
-
-  let to_string = function
-    | Array -> "array"
-    | ArrowFunction -> "arrow function"
-    | Assignment -> "assignment expression"
-    | Binary -> "binary expression"
-    | Call -> "call expression"
-    | Class -> "class"
-    | Comprehension -> "comprehension expression"
-    | Conditional -> "conditional expression"
-    | Function -> "function"
-    | Generator -> "generator"
-    | Identifier -> "identifier"
-    | Import -> "import expression"
-    | JSXElement -> "JSX element"
-    | JSXFragment -> "JSX fragment"
-    | Literal -> "literal"
-    | Logical -> "logical expression"
-    | Member -> "member expression"
-    | MetaProperty -> "metaproperty expression"
-    | New -> "new expression"
-    | Object -> "object"
-    | OptionalCall -> "optional call expression"
-    | OptionalMember -> "optional member expression"
-    | Sequence -> "sequence"
-    | Super -> "`super` reference"
-    | TaggedTemplate -> "tagged template expression"
-    | TemplateLiteral -> "template literal"
-    | This -> "`this` reference"
-    | TypeCast -> "type cast"
-    | Unary -> "unary expression"
-    | Update -> "update expression"
-    | Yield -> "yield expression"
-end
diff --git a/jscomp/js_parser/flow_ast_utils.mli b/jscomp/js_parser/flow_ast_utils.mli
deleted file mode 100644
index 2155346..0000000
--- a/jscomp/js_parser/flow_ast_utils.mli
+++ /dev/null
@@ -1,128 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-type 'loc binding = 'loc * string
-
-type 'loc ident = 'loc * string 
-
-type 'loc source = 'loc * string 
-
-val fold_bindings_of_pattern :
-  ('a -> ('m, 't) Flow_ast.Identifier.t -> 'a) -> 'a -> ('m, 't) Flow_ast.Pattern.t -> 'a
-
-val fold_bindings_of_variable_declarations :
-  (bool -> 'a -> ('m, 't) Flow_ast.Identifier.t -> 'a) ->
-  'a ->
-  ('m, 't) Flow_ast.Statement.VariableDeclaration.Declarator.t list ->
-  'a
-
-val partition_directives :
-  (Loc.t, Loc.t) Flow_ast.Statement.t list ->
-  (Loc.t, Loc.t) Flow_ast.Statement.t list * (Loc.t, Loc.t) Flow_ast.Statement.t list
-
-val hoist_function_declarations :
-  ('a, 'b) Flow_ast.Statement.t list -> ('a, 'b) Flow_ast.Statement.t list
-
-val is_call_to_invariant : ('a, 'b) Flow_ast.Expression.t -> bool
-
-val is_call_to_is_array : ('a, 'b) Flow_ast.Expression.t -> bool
-
-val is_call_to_object_dot_freeze : ('a, 'b) Flow_ast.Expression.t -> bool
-
-val is_call_to_object_static_method : ('a, 'b) Flow_ast.Expression.t -> bool
-
-val negate_number_literal : float * string -> float * string
-
-val loc_of_expression : ('a, 'a) Flow_ast.Expression.t -> 'a
-
-val loc_of_statement : ('a, 'a) Flow_ast.Statement.t -> 'a
-
-val loc_of_pattern : ('a, 'a) Flow_ast.Pattern.t -> 'a
-
-val loc_of_ident : ('a, 'a) Flow_ast.Identifier.t -> 'a
-
-val name_of_ident : ('loc, 'a) Flow_ast.Identifier.t -> string
-
-val source_of_ident : ('a, 'a) Flow_ast.Identifier.t -> 'a source
-
-val ident_of_source :
-  ?comments:('a, unit) Flow_ast.Syntax.t -> 'a source -> ('a, 'a) Flow_ast.Identifier.t
-
-val mk_comments :
-  ?leading:'loc Flow_ast.Comment.t list ->
-  ?trailing:'loc Flow_ast.Comment.t list ->
-  'a ->
-  ('loc, 'a) Flow_ast.Syntax.t
-
-val mk_comments_opt :
-  ?leading:'loc Flow_ast.Comment.t list ->
-  ?trailing:'loc Flow_ast.Comment.t list ->
-  unit ->
-  ('loc, unit) Flow_ast.Syntax.t option
-
-val mk_comments_with_internal_opt :
-  ?leading:'loc Flow_ast.Comment.t list ->
-  ?trailing:'loc Flow_ast.Comment.t list ->
-  internal:'loc Flow_ast.Comment.t list ->
-  unit ->
-  ('loc, 'loc Flow_ast.Comment.t list) Flow_ast.Syntax.t option
-
-val merge_comments :
-  inner:('M, unit) Flow_ast.Syntax.t option ->
-  outer:('M, unit) Flow_ast.Syntax.t option ->
-  ('M, unit) Flow_ast.Syntax.t option
-
-val merge_comments_with_internal :
-  inner:('M, 'loc Flow_ast.Comment.t list) Flow_ast.Syntax.t option ->
-  outer:('M, 'a) Flow_ast.Syntax.t option ->
-  ('M, 'loc Flow_ast.Comment.t list) Flow_ast.Syntax.t option
-
-val split_comments :
-  ('loc, unit) Flow_ast.Syntax.t option ->
-  ('loc, unit) Flow_ast.Syntax.t option * ('loc, unit) Flow_ast.Syntax.t option
-
-module ExpressionSort : sig
-  type t =
-    | Array
-    | ArrowFunction
-    | Assignment
-    | Binary
-    | Call
-    | Class
-    | Comprehension
-    | Conditional
-    | Function
-    | Generator
-    | Identifier
-    | Import
-    | JSXElement
-    | JSXFragment
-    | Literal
-    | Logical
-    | Member
-    | MetaProperty
-    | New
-    | Object
-    | OptionalCall
-    | OptionalMember
-    | Sequence
-    | Super
-    | TaggedTemplate
-    | TemplateLiteral
-    | This
-    | TypeCast
-    | Unary
-    | Update
-    | Yield
-  
-
-  val to_string : t -> string
-end
-
-val string_of_assignment_operator : Flow_ast.Expression.Assignment.operator -> string
-
-val string_of_binary_operator : Flow_ast.Expression.Binary.operator -> string
diff --git a/jscomp/js_parser/flow_lexer.ml b/jscomp/js_parser/flow_lexer.ml
deleted file mode 100644
index bf4c9f4..0000000
--- a/jscomp/js_parser/flow_lexer.ml
+++ /dev/null
@@ -1,13521 +0,0 @@
-
-let __sedlex_table_58 =
-  "\001\001\001\001\001\001\001\001\001\001\000\001\001"
-let __sedlex_table_2 =
-  "\001\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"
-let __sedlex_table_17 =
-  "\001\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"
-let __sedlex_table_28 =
-  "\001\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"
-let __sedlex_table_41 =
-  "\001\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\003\004\004\004\004\004\004\004\004\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"
-let __sedlex_table_52 =
-  "\001\000\000\002\003\003\003\003\003\003\003\003\003"
-let __sedlex_table_70 =
-  "\001\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\003\003\003\003\003\003\003\003\003\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"
-let __sedlex_table_47 =
-  "\001\001\001\001\001\001\001\001\001\001\002\001\001\003\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\004"
-let __sedlex_table_57 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_29 =
-  "\001\002\000\003\004\004\004\004\004\004\004\004\004"
-let __sedlex_table_30 =
-  "\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_42 =
-  "\001\000\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\000\000\000\000\000\003\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003"
-let __sedlex_table_5 = "\001\002"
-let __sedlex_table_3 =
-  "\001\001\001\001\001\001\001\001\001\001\000\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001"
-let __sedlex_table_21 =
-  "\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_60 =
-  "\001\001\001\001\001\001\001\001\001\001\000\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_83 =
-  "\001\002\002\002\002\002\002\002\002\002\002\003\002\002\004\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\005\002\002\002\006\005\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\005\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\005\002\007"
-let __sedlex_table_18 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_23 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_43 =
-  "\001\002\002\002\002\002\002\002\002\002\002\003\002\002\004\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\005\006\006\006\006\006\006\006\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\b\002\002\002\t\002\002\002\002\002\002\002\n\002\002\002\011\002\012\r\014\002\015"
-let __sedlex_table_76 =
-  "\001\001\001\001\001\001\001\001\001\002\003\002\002\004\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\002\001\001\001\001\001\001\001\001\001\001\001\001\001\001\005\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\006\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\002\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\002\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_82 =
-  "\001\000\001\000\000\002\003\003\003\003\003\003\003\003\003"
-let __sedlex_table_10 = "\001\001\001\001\001\001\001\001\001\001\000\002"
-let __sedlex_table_12 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"
-let __sedlex_table_33 =
-  "\001\001\001\001\001\001\001\001\001\001\000\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_45 =
-  "\001\001\001\001\001\001\001\001\001\001\002\001\001\003"
-let __sedlex_table_78 =
-  "\001\002\002\002\002\002\002\002\002\002\002\003\002\002\004\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\005\006"
-let __sedlex_table_88 =
-  "\001\000\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003"
-let __sedlex_table_11 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\000\002\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_14 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\000\002\002\002\002\002\002\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\002\002\002\002\002\002\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_16 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\003\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_22 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_27 =
-  "\001\000\000\000\000\000\000\000\000\000\002\000\003\003\003\003\003\003\003\003\003\003\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\004\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_32 =
-  "\001\000\000\000\000\000\000\000\000\000\002\000\003\003\003\003\003\003\003\003\003\003\000\000\000\000\000\000\000\001\001\001\001\004\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\005\000\001\001\001\001\004\001\001\001\001\001\001\001\001\006\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_38 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_46 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\000\001\001\001\001\003\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\001\001\001\001\003\001\001\001\001\001\001\001\001\004\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_49 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\000\001\001\001\001\003\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\004\000\001\001\001\001\003\001\001\001\001\001\001\001\001\005\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_55 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_59 =
-  "\001\000\000\000\000\000\000\000\000\000\002\000\003\003\003\003\003\003\003\003\004\004\000\000\000\000\000\000\000\001\005\001\001\006\001\001\001\001\001\001\001\001\001\007\001\001\001\001\001\001\001\001\b\001\001\000\000\000\000\000\000\001\005\001\001\006\001\001\001\001\001\001\001\001\t\007\001\001\001\001\001\001\001\001\b\001\001"
-let __sedlex_table_62 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_63 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\003\000\001\001\001\001\001\001\001\001\001\001\001\001\001\004\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_65 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\003\000\001\001\001\001\001\001\001\001\001\001\001\001\001\004\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_68 =
-  "\001\000\000\000\000\000\000\000\000\000\002\000\003\003\003\003\003\003\003\003\003\003\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\004\000\001\001\001\001\001\001\001\001\001\001\001\001\001\005\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_73 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\003\000\001\001\001\001\001\001\001\001\001\001\001\001\001\004\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_75 =
-  "\001\000\000\000\000\000\000\000\000\000\002\000\003\003\003\003\003\003\003\003\004\004\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\005\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_77 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\000\002\002\002\002\002\002\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\003\000\002\002\002\002\002\002\001\001\001\001\001\001\001\004\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_89 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_1 =
-  "\001\002\002\002\002\002\002\002\002\002\003\004\003\003\005\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\006\007\b\t\n\011\007\012\r\014\015\016\017\018\019\020\021\021\021\021\021\021\021\021\021\022\023\024\025\026\027\028\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\029\030\031 \t!\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\"#$%\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\t\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\002\002\002\002\002\002\002\t\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\002\t\t\002\002\t\t\t\t\002\t\002\002\002\002\002\002\t\002\t\t\t\002\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\t\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\002\002\002\002\002\002\002\t\t\002\002\002\002\002\002\002\002\002\002\t\t\t\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\t\t\002\002\002\002\t\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\t\002\002\002\002\002\002\002\002\002\t\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\t\t\t\t\t\t\t\t\002\002\t\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\002\t\002\002\002\t\t\t\t\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\002\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\t\t\t\t\t\t\002\002\002\002\t\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\002\t\t\002\t\t\002\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\002\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\002\t\t\002\t\t\t\t\t\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\002\002\t\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\002\t\t\002\t\t\t\t\t\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\002\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\t\t\t\t\t\t\002\002\002\t\t\t\002\t\t\t\t\002\002\002\t\t\002\t\002\t\t\002\002\002\t\t\002\002\002\t\t\t\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\002\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\002\002\t\002\002\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\t\t\t\t\t\t\t\t\002\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\002\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\002\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\t\t\t\002\002\002\002\002\002\002\002\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\002\t\002\002\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\002\t\002\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\002\t\t\t\t\t\t\t\t\t\t\002\t\t\002\002\002\002\002\002\002\002\002\t\002\002\t\t\t\t\t\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\002\002\002\002\t\t\t\t\002\002\002\t\002\002\002\t\t\002\002\002\002\002\002\002\t\t\t\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\002\002\002\002\002\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\002\002\t\t\t\t\t\t\t\002\t\002\t\t\t\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\002\002\t\t\t\t\t\t\t\002\t\002\t\t\t\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\t\t\t\t\t\t\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\003\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\002\t\t\t\t\t\t\002\t\t\002\002\002\t\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\t\t\t\t\t\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\t\t\t\t\t\t\002\002\t\t\t\t\t\t\t\t\002\t\002\t\002\t\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\002\t\t\t\t\t\t\t\002\t\002\002\002\t\t\t\002\t\t\t\t\t\t\t\002\002\002\t\t\t\t\002\002\t\t\t\t\t\t\002\002\002\002\t\t\t\t\t\t\t\t\t\t\t\t\t\002\002\002\002\002\t\t\t\002\t\t\t\t\t\t\t\002\002\002"
-let __sedlex_table_61 =
-  "\001\002\002\002\002\002\002\002\002\002\003\004\003\003\005\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\002\002\002\002\002\002\002\002\002\002\002\002\002\002\006\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002"
-let __sedlex_table_66 =
-  "\001\002\002\002\002\002\002\002\002\002\002\003\002\002\004"
-let __sedlex_table_72 = "\001\000\000\000\000\002"
-let __sedlex_table_74 =
-  "\001\002\002\002\002\002\002\002\002\002\003\004\003\003\005\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\002\006\002\007\b\t\006\n\011\012\r\014\015\016\017\018\019\019\019\019\019\019\019\019\019\020\021\022\023\024\025\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\026\027\028\002\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\029\030\031\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\002\002\002\002\002\002\002\007\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\002\007\007\002\002\007\007\007\007\002\007\002\002\002\002\002\002\007\002\007\007\007\002\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\002\002\002\007\007\007\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\007\002\002\002\002\002\002\002\002\002\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\007\007\007\007\007\007\007\007\002\002\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\002\007\002\002\002\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\007\007\007\007\007\007\002\002\002\002\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\002\007\007\002\007\007\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\002\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\002\007\007\002\007\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\002\002\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\002\007\007\002\007\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\007\007\007\007\007\007\002\002\002\007\007\007\002\007\007\007\007\002\002\002\007\007\002\007\002\007\007\002\002\002\007\007\002\002\002\007\007\007\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\002\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\002\002\007\002\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\007\007\007\007\007\007\007\007\002\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\002\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\007\007\007\002\002\002\002\002\002\002\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\002\007\002\002\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\007\002\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\002\007\007\007\007\007\007\007\007\007\007\002\007\007\002\002\002\002\002\002\002\002\002\007\002\002\007\007\007\007\007\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\002\002\002\002\007\007\007\007\002\002\002\007\002\002\002\007\007\002\002\002\002\002\002\002\007\007\007\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\002\002\002\002\002\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\002\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\002\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\003\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\002\007\007\007\007\007\007\002\007\007\002\002\002\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\002\002\007\007\007\007\007\007\007\007\002\007\002\007\002\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\002\007\002\002\002\007\007\007\002\007\007\007\007\007\007\007\002\002\002\007\007\007\007\002\002\007\007\007\007\007\007\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\007\007\007\002\007\007\007\007\007\007\007\002\002\002"
-let __sedlex_table_91 =
-  "\001\002\002\002\002\002\002\002\002\002\003\004\003\003\005\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\002\006\002\007\002\002\006\002\002\002\002\002\002\b\t\002\002\002\002\002\002\002\002\002\002\n\002\011\012\r\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\014\002\002\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\015\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\002\002\002\002\002\002\002\007\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\002\007\007\002\002\007\007\007\007\002\007\002\002\002\002\002\002\007\002\007\007\007\002\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\002\002\002\007\007\007\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\007\002\002\002\002\002\002\002\002\002\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\007\007\007\007\007\007\007\007\002\002\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\002\007\002\002\002\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\007\007\007\007\007\007\002\002\002\002\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\002\007\007\002\007\007\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\002\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\002\007\007\002\007\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\002\002\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\002\007\007\002\007\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\007\007\007\007\007\007\002\002\002\007\007\007\002\007\007\007\007\002\002\002\007\007\002\007\002\007\007\002\002\002\007\007\002\002\002\007\007\007\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\002\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\002\002\007\002\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\007\007\007\007\007\007\007\007\002\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\002\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\007\007\007\002\002\002\002\002\002\002\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\002\007\002\002\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\007\002\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\002\007\007\007\007\007\007\007\007\007\007\002\007\007\002\002\002\002\002\002\002\002\002\007\002\002\007\007\007\007\007\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\002\002\002\002\007\007\007\007\002\002\002\007\002\002\002\007\007\002\002\002\002\002\002\002\007\007\007\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\002\002\002\002\002\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\002\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\002\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\003\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\002\007\007\007\007\007\007\002\007\007\002\002\002\007\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\002\002\007\007\007\007\007\007\007\007\002\007\002\007\002\007\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\007\002\007\007\007\007\007\007\007\002\007\002\002\002\007\007\007\002\007\007\007\007\007\007\007\002\002\002\007\007\007\007\002\002\007\007\007\007\007\007\002\002\002\002\007\007\007\007\007\007\007\007\007\007\007\007\007\002\002\002\002\002\007\007\007\002\007\007\007\007\007\007\007\002\002\002"
-let __sedlex_table_51 = "\001\000\000\002"
-let __sedlex_table_8 =
-  "\001\002\002\002\002\002\002\002\002\002\002\003\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\004\002\002\002\002\004\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\005"
-let __sedlex_table_20 =
-  "\001\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003"
-let __sedlex_table_69 =
-  "\001\002\002\002\002\002\002\002\002\002\002\003\002\002\004\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\005\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\006\007"
-let __sedlex_table_15 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_48 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_81 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003\000\000\000\000\000\002"
-let __sedlex_table_9 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003"
-let __sedlex_table_26 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\001\001\001\001\001\001\000\000\000\000\000\000\000\003"
-let __sedlex_table_35 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_67 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_36 = "\001\000\000\000\000\000\000\000\002"
-let __sedlex_table_39 =
-  "\001\002\002\002\002\002\002\002\002\002\002\003\002\002\004\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\005\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\006\002\002\002\007"
-let __sedlex_table_50 =
-  "\001\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\003"
-let __sedlex_table_90 =
-  "\001\002\000\000\000\000\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\000\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\000\000\000\000\000\000\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002"
-let __sedlex_table_37 =
-  "\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003"
-let __sedlex_table_7 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001"
-let __sedlex_table_13 = "\001\000\002\003\003\003\003\003\003\003\003\003"
-let __sedlex_table_53 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\001\001\001\001\001\001"
-let __sedlex_table_87 =
-  "\001\001\001\001\001\001\001\001\001\001\000\002\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001"
-let __sedlex_table_34 =
-  "\001\001\001\001\001\001\001\001\001\001\000\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_54 = "\001\000\002\002\002\002\002\002\002\002\002\002"
-let __sedlex_table_71 =
-  "\001\000\000\000\000\000\000\002\000\002\000\000\003\004\004\004\004\004\004\004\004\004\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_80 = "\001\001\001\001\001\001\001\001\002\002"
-let __sedlex_table_4 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_79 =
-  "\001\002\002\002\002\002\002\002\002\002\002\003\002\002\004\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\005\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\006"
-let __sedlex_table_84 =
-  "\001\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\002\002\002\002\002\002\002\002\002\002\002\003\003\003\003\003\003\003\003\003\003\002\002\002\002\002\002\002\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\002\004\002\002\003\002\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"
-let __sedlex_table_85 =
-  "\001\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\002\003\002\002\002\002\002\002\002\002\003\002\002\003\003\003\003\003\003\003\003\003\003\002\002\002\002\002\002\002\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\002\004\002\002\003\002\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003\003"
-let __sedlex_table_64 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\002\000\000\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\001\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\000\000\000\000\000\000\000\001\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\000\001\001\000\000\001\001\001\001\000\001\000\000\000\000\000\000\001\000\001\001\001\000\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\001\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\000\000\000\000\000\000\000\001\001\000\000\000\000\000\000\000\000\000\000\001\001\001\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\001\001\000\000\000\000\001\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\001\000\000\000\000\000\000\000\000\000\001\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\001\001\001\001\001\001\001\001\000\000\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\000\001\000\000\000\001\001\001\001\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\000\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\000\001\001\000\001\001\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\000\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\000\001\001\000\001\001\001\001\001\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\000\000\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\000\001\001\000\001\001\001\001\001\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\000\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\001\001\001\001\001\001\000\000\000\001\001\001\000\001\001\001\001\000\000\000\001\001\000\001\000\001\001\000\000\000\001\001\000\000\000\001\001\001\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\000\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\000\000\001\000\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\001\001\001\001\001\001\001\001\000\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\000\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\001\001\001\000\000\000\000\000\000\000\000\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\000\001\000\000\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\000\001\000\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\000\001\001\001\001\001\001\001\001\001\001\000\001\001\000\000\000\000\000\000\000\000\000\001\000\000\001\001\001\001\001\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\001\001\001\001\000\000\000\001\000\000\000\001\001\000\000\000\000\000\000\000\001\001\001\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\000\000\000\000\000\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\000\000\001\001\001\001\001\001\001\000\001\000\001\001\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\000\000\001\001\001\001\001\001\001\000\001\000\001\001\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\001\001\001\001\001\001\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\000\001\001\001\001\001\001\000\001\001\000\000\000\001\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\001\001\001\001\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\001\001\001\001\001\001\000\000\001\001\001\001\001\001\001\001\000\001\000\001\000\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\000\001\000\000\000\001\001\001\000\001\001\001\001\001\001\001\000\000\000\001\001\001\001\000\000\001\001\001\001\001\001\000\000\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\001\001\001\000\001\001\001\001\001\001\001"
-let __sedlex_table_86 = "\001\000\002"
-let __sedlex_table_6 =
-  "\001\001\001\001\001\001\001\001\001\001\000\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-let __sedlex_table_24 =
-  "\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_31 = "\001\002\002\002\002\002\002\002\002\002"
-let __sedlex_table_25 =
-  "\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\003"
-let __sedlex_table_56 =
-  "\001\001\001\001\001\001\001\001\001\001\000\000\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\001\001\001\001\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_44 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_19 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_table_40 =
-  "\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"
-let __sedlex_partition_94 c =
-  if c <= 120 then (-1) else if c <= 121 then 0 else (-1)
-let __sedlex_partition_50 c =
-  if c <= 8191
-  then (Char.code (String.unsafe_get __sedlex_table_1 (c - (-1)))) - 1
-  else
-    if c <= 194559
-    then
-      (if c <= 69599
-       then
-         (if c <= 43711
-          then
-            (if c <= 12703
-             then
-               (if c <= 11519
-                then
-                  (if c <= 8489
-                   then
-                     (if c <= 8454
-                      then
-                        (if c <= 8304
-                         then
-                           (if c <= 8238
-                            then
-                              (if c <= 8231
-                               then (if c <= 8202 then 2 else 1)
-                               else if c <= 8233 then 3 else 1)
-                            else
-                              if c <= 8286
-                              then (if c <= 8239 then 2 else 1)
-                              else if c <= 8287 then 2 else 1)
-                         else
-                           if c <= 8335
-                           then
-                             (if c <= 8318
-                              then (if c <= 8305 then 8 else 1)
-                              else if c <= 8319 then 8 else 1)
-                           else
-                             if c <= 8449
-                             then (if c <= 8348 then 8 else 1)
-                             else if c <= 8450 then 8 else 1)
-                      else
-                        if c <= 8477
-                        then
-                          (if c <= 8468
-                           then
-                             (if c <= 8457
-                              then (if c <= 8455 then 8 else 1)
-                              else if c <= 8467 then 8 else 1)
-                           else
-                             if c <= 8471
-                             then (if c <= 8469 then 8 else 1)
-                             else 8)
-                        else
-                          if c <= 8485
-                          then
-                            (if c <= 8483
-                             then 1
-                             else if c <= 8484 then 8 else 1)
-                          else
-                            if c <= 8487
-                            then (if c <= 8486 then 8 else 1)
-                            else if c <= 8488 then 8 else 1)
-                   else
-                     if c <= 8543
-                     then
-                       (if c <= 8505
-                        then 8
-                        else
-                          if c <= 8516
-                          then
-                            (if c <= 8507
-                             then 1
-                             else if c <= 8511 then 8 else 1)
-                          else
-                            if c <= 8525
-                            then (if c <= 8521 then 8 else 1)
-                            else if c <= 8526 then 8 else 1)
-                     else
-                       if c <= 11389
-                       then
-                         (if c <= 8584
-                          then 8
-                          else if c <= 11263 then 1 else 8)
-                       else
-                         if c <= 11498
-                         then (if c <= 11492 then 8 else 1)
-                         else
-                           if c <= 11505
-                           then (if c <= 11502 then 8 else 1)
-                           else if c <= 11507 then 8 else 1)
-                else
-                  if c <= 12294
-                  then
-                    (if c <= 11695
-                     then
-                       (if c <= 11630
-                        then
-                          (if c <= 11564
-                           then
-                             (if c <= 11558
-                              then (if c <= 11557 then 8 else 1)
-                              else if c <= 11559 then 8 else 1)
-                           else
-                             if c <= 11567
-                             then (if c <= 11565 then 8 else 1)
-                             else if c <= 11623 then 8 else 1)
-                        else
-                          if c <= 11679
-                          then
-                            (if c <= 11647
-                             then (if c <= 11631 then 8 else 1)
-                             else if c <= 11670 then 8 else 1)
-                          else
-                            if c <= 11687
-                            then (if c <= 11686 then 8 else 1)
-                            else if c <= 11694 then 8 else 1)
-                     else
-                       if c <= 11727
-                       then
-                         (if c <= 11711
-                          then
-                            (if c <= 11703
-                             then (if c <= 11702 then 8 else 1)
-                             else if c <= 11710 then 8 else 1)
-                          else
-                            if c <= 11719
-                            then (if c <= 11718 then 8 else 1)
-                            else if c <= 11726 then 8 else 1)
-                       else
-                         if c <= 12287
-                         then
-                           (if c <= 11735
-                            then (if c <= 11734 then 8 else 1)
-                            else if c <= 11742 then 8 else 1)
-                         else
-                           if c <= 12292
-                           then (if c <= 12288 then 2 else 1)
-                           else 8)
-                  else
-                    if c <= 12442
-                    then
-                      (if c <= 12343
-                       then
-                         (if c <= 12320
-                          then (if c <= 12295 then 8 else 1)
-                          else
-                            if c <= 12336
-                            then (if c <= 12329 then 8 else 1)
-                            else if c <= 12341 then 8 else 1)
-                       else
-                         if c <= 12348
-                         then 8
-                         else
-                           if c <= 12352
-                           then 1
-                           else if c <= 12438 then 8 else 1)
-                    else
-                      if c <= 12539
-                      then
-                        (if c <= 12447
-                         then 8
-                         else
-                           if c <= 12448
-                           then 1
-                           else if c <= 12538 then 8 else 1)
-                      else
-                        if c <= 12548
-                        then (if c <= 12543 then 8 else 1)
-                        else
-                          if c <= 12592
-                          then (if c <= 12591 then 8 else 1)
-                          else if c <= 12686 then 8 else 1)
-             else
-               if c <= 42999
-               then
-                 (if c <= 42653
-                  then
-                    (if c <= 42239
-                     then
-                       (if c <= 40981
-                        then
-                          (if c <= 13311
-                           then
-                             (if c <= 12783
-                              then (if c <= 12735 then 8 else 1)
-                              else if c <= 12799 then 8 else 1)
-                           else
-                             if c <= 19967
-                             then (if c <= 19903 then 8 else 1)
-                             else 8)
-                        else
-                          if c <= 42191
-                          then (if c <= 42124 then 8 else 1)
-                          else if c <= 42237 then 8 else 1)
-                     else
-                       if c <= 42559
-                       then
-                         (if c <= 42511
-                          then (if c <= 42508 then 8 else 1)
-                          else
-                            if c <= 42537
-                            then (if c <= 42527 then 8 else 1)
-                            else if c <= 42539 then 8 else 1)
-                       else
-                         if c <= 42622
-                         then (if c <= 42606 then 8 else 1)
-                         else 8)
-                  else
-                    if c <= 42890
-                    then
-                      (if c <= 42785
-                       then
-                         (if c <= 42735
-                          then (if c <= 42655 then 1 else 8)
-                          else
-                            if c <= 42774
-                            then 1
-                            else if c <= 42783 then 8 else 1)
-                       else
-                         if c <= 42887
-                         then 8
-                         else if c <= 42888 then 8 else 1)
-                    else
-                      if c <= 42962
-                      then
-                        (if c <= 42954
-                         then 8
-                         else
-                           if c <= 42959
-                           then 1
-                           else if c <= 42961 then 8 else 1)
-                      else
-                        if c <= 42993
-                        then
-                          (if c <= 42964
-                           then (if c <= 42963 then 8 else 1)
-                           else if c <= 42969 then 8 else 1)
-                        else 8)
-               else
-                 if c <= 43470
-                 then
-                   (if c <= 43137
-                    then
-                      (if c <= 43010
-                       then
-                         (if c <= 43002
-                          then 8
-                          else if c <= 43009 then 8 else 1)
-                       else
-                         if c <= 43019
-                         then
-                           (if c <= 43014
-                            then (if c <= 43013 then 8 else 1)
-                            else if c <= 43018 then 8 else 1)
-                         else
-                           if c <= 43071
-                           then (if c <= 43042 then 8 else 1)
-                           else if c <= 43123 then 8 else 1)
-                    else
-                      if c <= 43273
-                      then
-                        (if c <= 43258
-                         then
-                           (if c <= 43249
-                            then (if c <= 43187 then 8 else 1)
-                            else if c <= 43255 then 8 else 1)
-                         else
-                           if c <= 43260
-                           then (if c <= 43259 then 8 else 1)
-                           else if c <= 43262 then 8 else 1)
-                      else
-                        if c <= 43359
-                        then
-                          (if c <= 43311
-                           then (if c <= 43301 then 8 else 1)
-                           else if c <= 43334 then 8 else 1)
-                        else
-                          if c <= 43395
-                          then (if c <= 43388 then 8 else 1)
-                          else if c <= 43442 then 8 else 1)
-                 else
-                   if c <= 43615
-                   then
-                     (if c <= 43513
-                      then
-                        (if c <= 43493
-                         then
-                           (if c <= 43487
-                            then (if c <= 43471 then 8 else 1)
-                            else if c <= 43492 then 8 else 1)
-                         else if c <= 43503 then 8 else 1)
-                      else
-                        if c <= 43583
-                        then
-                          (if c <= 43519
-                           then (if c <= 43518 then 8 else 1)
-                           else if c <= 43560 then 8 else 1)
-                        else
-                          if c <= 43587
-                          then (if c <= 43586 then 8 else 1)
-                          else if c <= 43595 then 8 else 1)
-                   else
-                     if c <= 43645
-                     then
-                       (if c <= 43638
-                        then 8
-                        else
-                          if c <= 43641
-                          then 1
-                          else if c <= 43642 then 8 else 1)
-                     else
-                       if c <= 43700
-                       then
-                         (if c <= 43696
-                          then (if c <= 43695 then 8 else 1)
-                          else if c <= 43697 then 8 else 1)
-                       else
-                         if c <= 43704
-                         then (if c <= 43702 then 8 else 1)
-                         else if c <= 43709 then 8 else 1)
-          else
-            if c <= 66377
-            then
-              (if c <= 64325
-               then
-                 (if c <= 43887
-                  then
-                    (if c <= 43784
-                     then
-                       (if c <= 43743
-                        then
-                          (if c <= 43738
-                           then
-                             (if c <= 43713
-                              then (if c <= 43712 then 8 else 1)
-                              else if c <= 43714 then 8 else 1)
-                           else if c <= 43741 then 8 else 1)
-                        else
-                          if c <= 43764
-                          then
-                            (if c <= 43761
-                             then (if c <= 43754 then 8 else 1)
-                             else 8)
-                          else
-                            if c <= 43776
-                            then 1
-                            else if c <= 43782 then 8 else 1)
-                     else
-                       if c <= 43823
-                       then
-                         (if c <= 43807
-                          then
-                            (if c <= 43792
-                             then (if c <= 43790 then 8 else 1)
-                             else if c <= 43798 then 8 else 1)
-                          else
-                            if c <= 43815
-                            then (if c <= 43814 then 8 else 1)
-                            else if c <= 43822 then 8 else 1)
-                       else
-                         if c <= 43880
-                         then
-                           (if c <= 43867
-                            then (if c <= 43866 then 8 else 1)
-                            else 8)
-                         else if c <= 43881 then 8 else 1)
-                  else
-                    if c <= 64274
-                    then
-                      (if c <= 55242
-                       then
-                         (if c <= 44031
-                          then (if c <= 44002 then 8 else 1)
-                          else
-                            if c <= 55215
-                            then (if c <= 55203 then 8 else 1)
-                            else if c <= 55238 then 8 else 1)
-                       else
-                         if c <= 64111
-                         then
-                           (if c <= 63743
-                            then (if c <= 55291 then 8 else 1)
-                            else if c <= 64109 then 8 else 1)
-                         else
-                           if c <= 64255
-                           then (if c <= 64217 then 8 else 1)
-                           else if c <= 64262 then 8 else 1)
-                    else
-                      if c <= 64311
-                      then
-                        (if c <= 64286
-                         then
-                           (if c <= 64284
-                            then (if c <= 64279 then 8 else 1)
-                            else if c <= 64285 then 8 else 1)
-                         else
-                           if c <= 64297
-                           then (if c <= 64296 then 8 else 1)
-                           else if c <= 64310 then 8 else 1)
-                      else
-                        if c <= 64319
-                        then
-                          (if c <= 64317
-                           then (if c <= 64316 then 8 else 1)
-                           else if c <= 64318 then 8 else 1)
-                        else
-                          if c <= 64322
-                          then (if c <= 64321 then 8 else 1)
-                          else if c <= 64324 then 8 else 1)
-               else
-                 if c <= 65481
-                 then
-                   (if c <= 65312
-                    then
-                      (if c <= 65007
-                       then
-                         (if c <= 64847
-                          then
-                            (if c <= 64466
-                             then (if c <= 64433 then 8 else 1)
-                             else if c <= 64829 then 8 else 1)
-                          else
-                            if c <= 64913
-                            then (if c <= 64911 then 8 else 1)
-                            else if c <= 64967 then 8 else 1)
-                       else
-                         if c <= 65141
-                         then
-                           (if c <= 65135
-                            then (if c <= 65019 then 8 else 1)
-                            else if c <= 65140 then 8 else 1)
-                         else
-                           if c <= 65278
-                           then (if c <= 65276 then 8 else 1)
-                           else if c <= 65279 then 2 else 1)
-                    else
-                      if c <= 65437
-                      then
-                        (if c <= 65381
-                         then
-                           (if c <= 65344
-                            then (if c <= 65338 then 8 else 1)
-                            else if c <= 65370 then 8 else 1)
-                         else 8)
-                      else
-                        if c <= 65470
-                        then 8
-                        else
-                          if c <= 65473
-                          then 1
-                          else if c <= 65479 then 8 else 1)
-                 else
-                   if c <= 65615
-                   then
-                     (if c <= 65548
-                      then
-                        (if c <= 65497
-                         then
-                           (if c <= 65489
-                            then (if c <= 65487 then 8 else 1)
-                            else if c <= 65495 then 8 else 1)
-                         else
-                           if c <= 65535
-                           then (if c <= 65500 then 8 else 1)
-                           else if c <= 65547 then 8 else 1)
-                      else
-                        if c <= 65595
-                        then
-                          (if c <= 65575
-                           then (if c <= 65574 then 8 else 1)
-                           else if c <= 65594 then 8 else 1)
-                        else
-                          if c <= 65598
-                          then (if c <= 65597 then 8 else 1)
-                          else if c <= 65613 then 8 else 1)
-                   else
-                     if c <= 66207
-                     then
-                       (if c <= 65855
-                        then
-                          (if c <= 65663
-                           then (if c <= 65629 then 8 else 1)
-                           else if c <= 65786 then 8 else 1)
-                        else
-                          if c <= 66175
-                          then (if c <= 65908 then 8 else 1)
-                          else if c <= 66204 then 8 else 1)
-                     else
-                       if c <= 66348
-                       then
-                         (if c <= 66303
-                          then (if c <= 66256 then 8 else 1)
-                          else if c <= 66335 then 8 else 1)
-                       else 8)
-            else
-              if c <= 67646
-              then
-                (if c <= 66963
-                 then
-                   (if c <= 66717
-                    then
-                      (if c <= 66463
-                       then
-                         (if c <= 66383
-                          then (if c <= 66378 then 8 else 1)
-                          else
-                            if c <= 66431
-                            then (if c <= 66421 then 8 else 1)
-                            else if c <= 66461 then 8 else 1)
-                       else
-                         if c <= 66512
-                         then
-                           (if c <= 66503
-                            then (if c <= 66499 then 8 else 1)
-                            else if c <= 66511 then 8 else 1)
-                         else
-                           if c <= 66559
-                           then (if c <= 66517 then 8 else 1)
-                           else 8)
-                    else
-                      if c <= 66863
-                      then
-                        (if c <= 66775
-                         then
-                           (if c <= 66735
-                            then 1
-                            else if c <= 66771 then 8 else 1)
-                         else
-                           if c <= 66815
-                           then (if c <= 66811 then 8 else 1)
-                           else if c <= 66855 then 8 else 1)
-                      else
-                        if c <= 66939
-                        then
-                          (if c <= 66927
-                           then (if c <= 66915 then 8 else 1)
-                           else if c <= 66938 then 8 else 1)
-                        else
-                          if c <= 66955
-                          then (if c <= 66954 then 8 else 1)
-                          else if c <= 66962 then 8 else 1)
-                 else
-                   if c <= 67455
-                   then
-                     (if c <= 67002
-                      then
-                        (if c <= 66978
-                         then
-                           (if c <= 66966
-                            then (if c <= 66965 then 8 else 1)
-                            else if c <= 66977 then 8 else 1)
-                         else
-                           if c <= 66994
-                           then (if c <= 66993 then 8 else 1)
-                           else if c <= 67001 then 8 else 1)
-                      else
-                        if c <= 67391
-                        then
-                          (if c <= 67071
-                           then (if c <= 67004 then 8 else 1)
-                           else if c <= 67382 then 8 else 1)
-                        else
-                          if c <= 67423
-                          then (if c <= 67413 then 8 else 1)
-                          else if c <= 67431 then 8 else 1)
-                   else
-                     if c <= 67591
-                     then
-                       (if c <= 67505
-                        then
-                          (if c <= 67462
-                           then (if c <= 67461 then 8 else 1)
-                           else if c <= 67504 then 8 else 1)
-                        else
-                          if c <= 67583
-                          then (if c <= 67514 then 8 else 1)
-                          else if c <= 67589 then 8 else 1)
-                     else
-                       if c <= 67638
-                       then
-                         (if c <= 67593
-                          then (if c <= 67592 then 8 else 1)
-                          else if c <= 67637 then 8 else 1)
-                       else
-                         if c <= 67643
-                         then (if c <= 67640 then 8 else 1)
-                         else if c <= 67644 then 8 else 1)
-              else
-                if c <= 68296
-                then
-                  (if c <= 68029
-                   then
-                     (if c <= 67827
-                      then
-                        (if c <= 67711
-                         then
-                           (if c <= 67679
-                            then (if c <= 67669 then 8 else 1)
-                            else if c <= 67702 then 8 else 1)
-                         else
-                           if c <= 67807
-                           then (if c <= 67742 then 8 else 1)
-                           else if c <= 67826 then 8 else 1)
-                      else
-                        if c <= 67871
-                        then
-                          (if c <= 67839
-                           then (if c <= 67829 then 8 else 1)
-                           else if c <= 67861 then 8 else 1)
-                        else
-                          if c <= 67967
-                          then (if c <= 67897 then 8 else 1)
-                          else if c <= 68023 then 8 else 1)
-                   else
-                     if c <= 68120
-                     then
-                       (if c <= 68111
-                        then
-                          (if c <= 68095
-                           then (if c <= 68031 then 8 else 1)
-                           else if c <= 68096 then 8 else 1)
-                        else
-                          if c <= 68116
-                          then (if c <= 68115 then 8 else 1)
-                          else if c <= 68119 then 8 else 1)
-                     else
-                       if c <= 68223
-                       then
-                         (if c <= 68191
-                          then (if c <= 68149 then 8 else 1)
-                          else if c <= 68220 then 8 else 1)
-                       else
-                         if c <= 68287
-                         then (if c <= 68252 then 8 else 1)
-                         else if c <= 68295 then 8 else 1)
-                else
-                  if c <= 68863
-                  then
-                    (if c <= 68479
-                     then
-                       (if c <= 68415
-                        then
-                          (if c <= 68351
-                           then (if c <= 68324 then 8 else 1)
-                           else if c <= 68405 then 8 else 1)
-                        else
-                          if c <= 68447
-                          then (if c <= 68437 then 8 else 1)
-                          else if c <= 68466 then 8 else 1)
-                     else
-                       if c <= 68735
-                       then
-                         (if c <= 68607
-                          then (if c <= 68497 then 8 else 1)
-                          else if c <= 68680 then 8 else 1)
-                       else
-                         if c <= 68799
-                         then (if c <= 68786 then 8 else 1)
-                         else if c <= 68850 then 8 else 1)
-                  else
-                    if c <= 69414
-                    then
-                      (if c <= 69295
-                       then
-                         (if c <= 69247
-                          then (if c <= 68899 then 8 else 1)
-                          else if c <= 69289 then 8 else 1)
-                       else
-                         if c <= 69375
-                         then (if c <= 69297 then 8 else 1)
-                         else if c <= 69404 then 8 else 1)
-                    else
-                      if c <= 69487
-                      then
-                        (if c <= 69423
-                         then (if c <= 69415 then 8 else 1)
-                         else if c <= 69445 then 8 else 1)
-                      else
-                        if c <= 69551
-                        then (if c <= 69505 then 8 else 1)
-                        else if c <= 69572 then 8 else 1)
-       else
-         if c <= 120122
-         then
-           (if c <= 72348
-            then
-              (if c <= 70655
-               then
-                 (if c <= 70162
-                  then
-                    (if c <= 69958
-                     then
-                       (if c <= 69762
-                        then
-                          (if c <= 69744
-                           then
-                             (if c <= 69634
-                              then (if c <= 69622 then 8 else 1)
-                              else if c <= 69687 then 8 else 1)
-                           else
-                             if c <= 69748
-                             then (if c <= 69746 then 8 else 1)
-                             else if c <= 69749 then 8 else 1)
-                        else
-                          if c <= 69890
-                          then
-                            (if c <= 69839
-                             then (if c <= 69807 then 8 else 1)
-                             else if c <= 69864 then 8 else 1)
-                          else
-                            if c <= 69955
-                            then (if c <= 69926 then 8 else 1)
-                            else if c <= 69956 then 8 else 1)
-                     else
-                       if c <= 70080
-                       then
-                         (if c <= 70005
-                          then
-                            (if c <= 69967
-                             then (if c <= 69959 then 8 else 1)
-                             else if c <= 70002 then 8 else 1)
-                          else
-                            if c <= 70018
-                            then (if c <= 70006 then 8 else 1)
-                            else if c <= 70066 then 8 else 1)
-                       else
-                         if c <= 70107
-                         then
-                           (if c <= 70105
-                            then (if c <= 70084 then 8 else 1)
-                            else if c <= 70106 then 8 else 1)
-                         else
-                           if c <= 70143
-                           then (if c <= 70108 then 8 else 1)
-                           else if c <= 70161 then 8 else 1)
-                  else
-                    if c <= 70414
-                    then
-                      (if c <= 70286
-                       then
-                         (if c <= 70279
-                          then
-                            (if c <= 70271
-                             then (if c <= 70187 then 8 else 1)
-                             else if c <= 70278 then 8 else 1)
-                          else
-                            if c <= 70281
-                            then (if c <= 70280 then 8 else 1)
-                            else if c <= 70285 then 8 else 1)
-                       else
-                         if c <= 70319
-                         then
-                           (if c <= 70302
-                            then (if c <= 70301 then 8 else 1)
-                            else if c <= 70312 then 8 else 1)
-                         else
-                           if c <= 70404
-                           then (if c <= 70366 then 8 else 1)
-                           else if c <= 70412 then 8 else 1)
-                    else
-                      if c <= 70452
-                      then
-                        (if c <= 70441
-                         then
-                           (if c <= 70418
-                            then (if c <= 70416 then 8 else 1)
-                            else if c <= 70440 then 8 else 1)
-                         else
-                           if c <= 70449
-                           then (if c <= 70448 then 8 else 1)
-                           else if c <= 70451 then 8 else 1)
-                      else
-                        if c <= 70479
-                        then
-                          (if c <= 70460
-                           then (if c <= 70457 then 8 else 1)
-                           else if c <= 70461 then 8 else 1)
-                        else
-                          if c <= 70492
-                          then (if c <= 70480 then 8 else 1)
-                          else if c <= 70497 then 8 else 1)
-               else
-                 if c <= 71934
-                 then
-                   (if c <= 71167
-                    then
-                      (if c <= 70851
-                       then
-                         (if c <= 70750
-                          then
-                            (if c <= 70726
-                             then (if c <= 70708 then 8 else 1)
-                             else if c <= 70730 then 8 else 1)
-                          else
-                            if c <= 70783
-                            then (if c <= 70753 then 8 else 1)
-                            else if c <= 70831 then 8 else 1)
-                       else
-                         if c <= 71039
-                         then
-                           (if c <= 70854
-                            then (if c <= 70853 then 8 else 1)
-                            else if c <= 70855 then 8 else 1)
-                         else
-                           if c <= 71127
-                           then (if c <= 71086 then 8 else 1)
-                           else if c <= 71131 then 8 else 1)
-                    else
-                      if c <= 71423
-                      then
-                        (if c <= 71295
-                         then
-                           (if c <= 71235
-                            then (if c <= 71215 then 8 else 1)
-                            else if c <= 71236 then 8 else 1)
-                         else
-                           if c <= 71351
-                           then (if c <= 71338 then 8 else 1)
-                           else if c <= 71352 then 8 else 1)
-                      else
-                        if c <= 71679
-                        then
-                          (if c <= 71487
-                           then (if c <= 71450 then 8 else 1)
-                           else if c <= 71494 then 8 else 1)
-                        else
-                          if c <= 71839
-                          then (if c <= 71723 then 8 else 1)
-                          else if c <= 71903 then 8 else 1)
-                 else
-                   if c <= 72105
-                   then
-                     (if c <= 71959
-                      then
-                        (if c <= 71947
-                         then
-                           (if c <= 71944
-                            then (if c <= 71942 then 8 else 1)
-                            else if c <= 71945 then 8 else 1)
-                         else
-                           if c <= 71956
-                           then (if c <= 71955 then 8 else 1)
-                           else if c <= 71958 then 8 else 1)
-                      else
-                        if c <= 72000
-                        then
-                          (if c <= 71998
-                           then (if c <= 71983 then 8 else 1)
-                           else if c <= 71999 then 8 else 1)
-                        else
-                          if c <= 72095
-                          then (if c <= 72001 then 8 else 1)
-                          else if c <= 72103 then 8 else 1)
-                   else
-                     if c <= 72202
-                     then
-                       (if c <= 72162
-                        then
-                          (if c <= 72160
-                           then (if c <= 72144 then 8 else 1)
-                           else if c <= 72161 then 8 else 1)
-                        else
-                          if c <= 72191
-                          then (if c <= 72163 then 8 else 1)
-                          else if c <= 72192 then 8 else 1)
-                     else
-                       if c <= 72271
-                       then
-                         (if c <= 72249
-                          then (if c <= 72242 then 8 else 1)
-                          else if c <= 72250 then 8 else 1)
-                       else
-                         if c <= 72283
-                         then (if c <= 72272 then 8 else 1)
-                         else if c <= 72329 then 8 else 1)
-            else
-              if c <= 94031
-              then
-                (if c <= 73727
-                 then
-                   (if c <= 72970
-                    then
-                      (if c <= 72767
-                       then
-                         (if c <= 72703
-                          then
-                            (if c <= 72367
-                             then (if c <= 72349 then 8 else 1)
-                             else if c <= 72440 then 8 else 1)
-                          else
-                            if c <= 72713
-                            then (if c <= 72712 then 8 else 1)
-                            else if c <= 72750 then 8 else 1)
-                       else
-                         if c <= 72959
-                         then
-                           (if c <= 72817
-                            then (if c <= 72768 then 8 else 1)
-                            else if c <= 72847 then 8 else 1)
-                         else
-                           if c <= 72967
-                           then (if c <= 72966 then 8 else 1)
-                           else if c <= 72969 then 8 else 1)
-                    else
-                      if c <= 73065
-                      then
-                        (if c <= 73055
-                         then
-                           (if c <= 73029
-                            then (if c <= 73008 then 8 else 1)
-                            else if c <= 73030 then 8 else 1)
-                         else
-                           if c <= 73062
-                           then (if c <= 73061 then 8 else 1)
-                           else if c <= 73064 then 8 else 1)
-                      else
-                        if c <= 73439
-                        then
-                          (if c <= 73111
-                           then (if c <= 73097 then 8 else 1)
-                           else if c <= 73112 then 8 else 1)
-                        else
-                          if c <= 73647
-                          then (if c <= 73458 then 8 else 1)
-                          else if c <= 73648 then 8 else 1)
-                 else
-                   if c <= 92783
-                   then
-                     (if c <= 77823
-                      then
-                        (if c <= 74879
-                         then
-                           (if c <= 74751
-                            then (if c <= 74649 then 8 else 1)
-                            else if c <= 74862 then 8 else 1)
-                         else
-                           if c <= 77711
-                           then (if c <= 75075 then 8 else 1)
-                           else if c <= 77808 then 8 else 1)
-                      else
-                        if c <= 92159
-                        then
-                          (if c <= 82943
-                           then (if c <= 78894 then 8 else 1)
-                           else if c <= 83526 then 8 else 1)
-                        else
-                          if c <= 92735
-                          then (if c <= 92728 then 8 else 1)
-                          else if c <= 92766 then 8 else 1)
-                   else
-                     if c <= 93026
-                     then
-                       (if c <= 92927
-                        then
-                          (if c <= 92879
-                           then (if c <= 92862 then 8 else 1)
-                           else if c <= 92909 then 8 else 1)
-                        else
-                          if c <= 92991
-                          then (if c <= 92975 then 8 else 1)
-                          else if c <= 92995 then 8 else 1)
-                     else
-                       if c <= 93759
-                       then
-                         (if c <= 93052
-                          then (if c <= 93047 then 8 else 1)
-                          else if c <= 93071 then 8 else 1)
-                       else
-                         if c <= 93951
-                         then (if c <= 93823 then 8 else 1)
-                         else if c <= 94026 then 8 else 1)
-              else
-                if c <= 113791
-                then
-                  (if c <= 110580
-                   then
-                     (if c <= 94207
-                      then
-                        (if c <= 94175
-                         then
-                           (if c <= 94098
-                            then (if c <= 94032 then 8 else 1)
-                            else if c <= 94111 then 8 else 1)
-                         else
-                           if c <= 94178
-                           then (if c <= 94177 then 8 else 1)
-                           else if c <= 94179 then 8 else 1)
-                      else
-                        if c <= 101631
-                        then
-                          (if c <= 100351
-                           then (if c <= 100343 then 8 else 1)
-                           else if c <= 101589 then 8 else 1)
-                        else
-                          if c <= 110575
-                          then (if c <= 101640 then 8 else 1)
-                          else if c <= 110579 then 8 else 1)
-                   else
-                     if c <= 110947
-                     then
-                       (if c <= 110591
-                        then
-                          (if c <= 110588
-                           then (if c <= 110587 then 8 else 1)
-                           else if c <= 110590 then 8 else 1)
-                        else
-                          if c <= 110927
-                          then (if c <= 110882 then 8 else 1)
-                          else if c <= 110930 then 8 else 1)
-                     else
-                       if c <= 113663
-                       then
-                         (if c <= 110959
-                          then (if c <= 110951 then 8 else 1)
-                          else if c <= 111355 then 8 else 1)
-                       else
-                         if c <= 113775
-                         then (if c <= 113770 then 8 else 1)
-                         else if c <= 113788 then 8 else 1)
-                else
-                  if c <= 119981
-                  then
-                    (if c <= 119965
-                     then
-                       (if c <= 119807
-                        then
-                          (if c <= 113807
-                           then (if c <= 113800 then 8 else 1)
-                           else if c <= 113817 then 8 else 1)
-                        else
-                          if c <= 119893
-                          then (if c <= 119892 then 8 else 1)
-                          else if c <= 119964 then 8 else 1)
-                     else
-                       if c <= 119972
-                       then
-                         (if c <= 119969
-                          then (if c <= 119967 then 8 else 1)
-                          else if c <= 119970 then 8 else 1)
-                       else
-                         if c <= 119976
-                         then (if c <= 119974 then 8 else 1)
-                         else if c <= 119980 then 8 else 1)
-                  else
-                    if c <= 120070
-                    then
-                      (if c <= 119996
-                       then
-                         (if c <= 119994
-                          then (if c <= 119993 then 8 else 1)
-                          else if c <= 119995 then 8 else 1)
-                       else
-                         if c <= 120004
-                         then (if c <= 120003 then 8 else 1)
-                         else if c <= 120069 then 8 else 1)
-                    else
-                      if c <= 120085
-                      then
-                        (if c <= 120076
-                         then (if c <= 120074 then 8 else 1)
-                         else if c <= 120084 then 8 else 1)
-                      else
-                        if c <= 120093
-                        then (if c <= 120092 then 8 else 1)
-                        else if c <= 120121 then 8 else 1)
-         else
-           if c <= 131071
-           then
-             (if c <= 126468
-              then
-                (if c <= 122623
-                 then
-                   (if c <= 120571
-                    then
-                      (if c <= 120145
-                       then
-                         (if c <= 120133
-                          then
-                            (if c <= 120127
-                             then (if c <= 120126 then 8 else 1)
-                             else if c <= 120132 then 8 else 1)
-                          else
-                            if c <= 120137
-                            then (if c <= 120134 then 8 else 1)
-                            else if c <= 120144 then 8 else 1)
-                       else
-                         if c <= 120513
-                         then
-                           (if c <= 120487
-                            then (if c <= 120485 then 8 else 1)
-                            else if c <= 120512 then 8 else 1)
-                         else
-                           if c <= 120539
-                           then (if c <= 120538 then 8 else 1)
-                           else if c <= 120570 then 8 else 1)
-                    else
-                      if c <= 120687
-                      then
-                        (if c <= 120629
-                         then
-                           (if c <= 120597
-                            then (if c <= 120596 then 8 else 1)
-                            else if c <= 120628 then 8 else 1)
-                         else
-                           if c <= 120655
-                           then (if c <= 120654 then 8 else 1)
-                           else if c <= 120686 then 8 else 1)
-                      else
-                        if c <= 120745
-                        then
-                          (if c <= 120713
-                           then (if c <= 120712 then 8 else 1)
-                           else if c <= 120744 then 8 else 1)
-                        else
-                          if c <= 120771
-                          then (if c <= 120770 then 8 else 1)
-                          else if c <= 120779 then 8 else 1)
-                 else
-                   if c <= 124895
-                   then
-                     (if c <= 123190
-                      then
-                        (if c <= 122654
-                         then 8
-                         else
-                           if c <= 123135
-                           then 1
-                           else if c <= 123180 then 8 else 1)
-                      else
-                        if c <= 123535
-                        then
-                          (if c <= 123213
-                           then (if c <= 123197 then 8 else 1)
-                           else if c <= 123214 then 8 else 1)
-                        else
-                          if c <= 123583
-                          then (if c <= 123565 then 8 else 1)
-                          else if c <= 123627 then 8 else 1)
-                   else
-                     if c <= 124927
-                     then
-                       (if c <= 124908
-                        then
-                          (if c <= 124903
-                           then (if c <= 124902 then 8 else 1)
-                           else if c <= 124907 then 8 else 1)
-                        else
-                          if c <= 124911
-                          then (if c <= 124910 then 8 else 1)
-                          else if c <= 124926 then 8 else 1)
-                     else
-                       if c <= 125258
-                       then
-                         (if c <= 125183
-                          then (if c <= 125124 then 8 else 1)
-                          else if c <= 125251 then 8 else 1)
-                       else
-                         if c <= 126463
-                         then (if c <= 125259 then 8 else 1)
-                         else if c <= 126467 then 8 else 1)
-              else
-                if c <= 126552
-                then
-                  (if c <= 126529
-                   then
-                     (if c <= 126504
-                      then
-                        (if c <= 126499
-                         then
-                           (if c <= 126496
-                            then (if c <= 126495 then 8 else 1)
-                            else if c <= 126498 then 8 else 1)
-                         else
-                           if c <= 126502
-                           then (if c <= 126500 then 8 else 1)
-                           else if c <= 126503 then 8 else 1)
-                      else
-                        if c <= 126520
-                        then
-                          (if c <= 126515
-                           then (if c <= 126514 then 8 else 1)
-                           else if c <= 126519 then 8 else 1)
-                        else
-                          if c <= 126522
-                          then (if c <= 126521 then 8 else 1)
-                          else if c <= 126523 then 8 else 1)
-                   else
-                     if c <= 126540
-                     then
-                       (if c <= 126536
-                        then
-                          (if c <= 126534
-                           then (if c <= 126530 then 8 else 1)
-                           else if c <= 126535 then 8 else 1)
-                        else
-                          if c <= 126538
-                          then (if c <= 126537 then 8 else 1)
-                          else if c <= 126539 then 8 else 1)
-                     else
-                       if c <= 126547
-                       then
-                         (if c <= 126544
-                          then (if c <= 126543 then 8 else 1)
-                          else if c <= 126546 then 8 else 1)
-                       else
-                         if c <= 126550
-                         then (if c <= 126548 then 8 else 1)
-                         else if c <= 126551 then 8 else 1)
-                else
-                  if c <= 126579
-                  then
-                    (if c <= 126560
-                     then
-                       (if c <= 126556
-                        then
-                          (if c <= 126554
-                           then (if c <= 126553 then 8 else 1)
-                           else if c <= 126555 then 8 else 1)
-                        else
-                          if c <= 126558
-                          then (if c <= 126557 then 8 else 1)
-                          else if c <= 126559 then 8 else 1)
-                     else
-                       if c <= 126566
-                       then
-                         (if c <= 126563
-                          then (if c <= 126562 then 8 else 1)
-                          else if c <= 126564 then 8 else 1)
-                       else
-                         if c <= 126571
-                         then (if c <= 126570 then 8 else 1)
-                         else if c <= 126578 then 8 else 1)
-                  else
-                    if c <= 126602
-                    then
-                      (if c <= 126589
-                       then
-                         (if c <= 126584
-                          then (if c <= 126583 then 8 else 1)
-                          else if c <= 126588 then 8 else 1)
-                       else
-                         if c <= 126591
-                         then (if c <= 126590 then 8 else 1)
-                         else if c <= 126601 then 8 else 1)
-                    else
-                      if c <= 126628
-                      then
-                        (if c <= 126624
-                         then (if c <= 126619 then 8 else 1)
-                         else if c <= 126627 then 8 else 1)
-                      else
-                        if c <= 126634
-                        then (if c <= 126633 then 8 else 1)
-                        else if c <= 126651 then 8 else 1)
-           else
-             if c <= 183983
-             then
-               (if c <= 177983
-                then
-                  (if c <= 173823
-                   then (if c <= 173791 then 8 else 1)
-                   else if c <= 177976 then 8 else 1)
-                else
-                  if c <= 178207
-                  then (if c <= 178205 then 8 else 1)
-                  else if c <= 183969 then 8 else 1)
-             else if c <= 191456 then 8 else 1)
-    else (-1)
-let __sedlex_partition_58 c =
-  if c <= 45 then (-1) else if c <= 46 then 0 else (-1)
-let __sedlex_partition_51 c =
-  if c <= 8
-  then (-1)
-  else
-    if c <= 5760
-    then (Char.code (String.unsafe_get __sedlex_table_2 (c - 9))) - 1
-    else
-      if c <= 8191
-      then (-1)
-      else
-        if c <= 65279
-        then
-          (if c <= 12288
-           then
-             (if c <= 8239
-              then (if c <= 8202 then 0 else if c <= 8238 then (-1) else 0)
-              else
-                if c <= 8286
-                then (-1)
-                else if c <= 8287 then 0 else if c <= 12287 then (-1) else 0)
-           else if c <= 65278 then (-1) else 0)
-        else (-1)
-let __sedlex_partition_21 c =
-  if c <= (-1)
-  then (-1)
-  else
-    if c <= 95
-    then (Char.code (String.unsafe_get __sedlex_table_3 c)) - 1
-    else if c <= 96 then (-1) else 0
-let __sedlex_partition_91 c =
-  if c <= 63 then (-1) else if c <= 64 then 0 else (-1)
-let __sedlex_partition_112 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 120
-    then (Char.code (String.unsafe_get __sedlex_table_4 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_33 c =
-  if c <= 47 then (-1) else if c <= 57 then 0 else (-1)
-let __sedlex_partition_102 c =
-  if c <= 91
-  then (-1)
-  else
-    if c <= 93
-    then (Char.code (String.unsafe_get __sedlex_table_5 (c - 92))) - 1
-    else (-1)
-let __sedlex_partition_104 c =
-  if c <= (-1)
-  then (-1)
-  else
-    if c <= 90
-    then (Char.code (String.unsafe_get __sedlex_table_6 c)) - 1
-    else
-      if c <= 92
-      then (-1)
-      else if c <= 8231 then 0 else if c <= 8233 then (-1) else 0
-let __sedlex_partition_4 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 102
-    then (Char.code (String.unsafe_get __sedlex_table_7 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_18 c =
-  if c <= 92
-  then (Char.code (String.unsafe_get __sedlex_table_8 (c - (-1)))) - 1
-  else 1
-let __sedlex_partition_42 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 110
-    then (Char.code (String.unsafe_get __sedlex_table_9 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_129 c =
-  if c <= 61 then (-1) else if c <= 62 then 0 else (-1)
-let __sedlex_partition_130 c =
-  if c <= 123 then (-1) else if c <= 124 then 0 else (-1)
-let __sedlex_partition_113 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 59
-    then (Char.code (String.unsafe_get __sedlex_table_10 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_115 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_11 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_34 c =
-  if c <= 87
-  then (-1)
-  else
-    if c <= 120
-    then (Char.code (String.unsafe_get __sedlex_table_12 (c - 88))) - 1
-    else (-1)
-let __sedlex_partition_37 c =
-  if c <= 45
-  then (-1)
-  else
-    if c <= 57
-    then (Char.code (String.unsafe_get __sedlex_table_13 (c - 46))) - 1
-    else (-1)
-let __sedlex_partition_84 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_14 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_5 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 125
-    then (Char.code (String.unsafe_get __sedlex_table_15 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_62 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_16 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_121 c =
-  if c <= 8
-  then (-1)
-  else
-    if c <= 5760
-    then (Char.code (String.unsafe_get __sedlex_table_17 (c - 9))) - 1
-    else
-      if c <= 8191
-      then (-1)
-      else
-        if c <= 65279
-        then
-          (if c <= 12288
-           then
-             (if c <= 8239
-              then (if c <= 8202 then 0 else if c <= 8238 then (-1) else 0)
-              else
-                if c <= 8286
-                then (-1)
-                else if c <= 8287 then 0 else if c <= 12287 then (-1) else 0)
-           else if c <= 65278 then (-1) else 0)
-        else (-1)
-let __sedlex_partition_131 c =
-  if c <= 124 then (-1) else if c <= 125 then 0 else (-1)
-let __sedlex_partition_43 c =
-  if c <= 45
-  then (-1)
-  else
-    if c <= 101
-    then (Char.code (String.unsafe_get __sedlex_table_18 (c - 46))) - 1
-    else (-1)
-let __sedlex_partition_56 c =
-  if c <= 42
-  then (-1)
-  else
-    if c <= 61
-    then (Char.code (String.unsafe_get __sedlex_table_19 (c - 43))) - 1
-    else (-1)
-let __sedlex_partition_7 c =
-  if c <= 92
-  then (Char.code (String.unsafe_get __sedlex_table_20 (c - (-1)))) - 1
-  else 1
-let __sedlex_partition_19 c =
-  if c <= (-1)
-  then (-1)
-  else
-    if c <= 91
-    then (Char.code (String.unsafe_get __sedlex_table_21 c)) - 1
-    else if c <= 92 then (-1) else 0
-let __sedlex_partition_105 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_22 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_57 c =
-  if c <= 44
-  then (-1)
-  else
-    if c <= 61
-    then (Char.code (String.unsafe_get __sedlex_table_23 (c - 45))) - 1
-    else (-1)
-let __sedlex_partition_127 c =
-  if c <= 103 then (-1) else if c <= 104 then 0 else (-1)
-let __sedlex_partition_28 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 95
-    then (Char.code (String.unsafe_get __sedlex_table_24 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_27 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 110
-    then (Char.code (String.unsafe_get __sedlex_table_25 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_35 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 110
-    then (Char.code (String.unsafe_get __sedlex_table_26 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_79 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_27 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_65 c =
-  if c <= 8
-  then (-1)
-  else
-    if c <= 5760
-    then (Char.code (String.unsafe_get __sedlex_table_28 (c - 9))) - 1
-    else
-      if c <= 8191
-      then (-1)
-      else
-        if c <= 65279
-        then
-          (if c <= 12288
-           then
-             (if c <= 8239
-              then (if c <= 8202 then 0 else if c <= 8238 then (-1) else 0)
-              else
-                if c <= 8286
-                then (-1)
-                else if c <= 8287 then 0 else if c <= 12287 then (-1) else 0)
-           else if c <= 65278 then (-1) else 0)
-        else (-1)
-let __sedlex_partition_122 c =
-  if c <= 44
-  then (-1)
-  else
-    if c <= 57
-    then (Char.code (String.unsafe_get __sedlex_table_29 (c - 45))) - 1
-    else (-1)
-let __sedlex_partition_26 c =
-  if c <= 47 then (-1) else if c <= 49 then 0 else (-1)
-let __sedlex_partition_31 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 95
-    then (Char.code (String.unsafe_get __sedlex_table_30 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_40 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 57
-    then (Char.code (String.unsafe_get __sedlex_table_31 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_86 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_32 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_93 c =
-  if c <= 114 then (-1) else if c <= 115 then 0 else (-1)
-let __sedlex_partition_52 c =
-  if c <= 60 then (-1) else if c <= 61 then 0 else (-1)
-let __sedlex_partition_110 c =
-  if c <= (-1)
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_33 c)) - 1
-    else
-      if c <= 123
-      then (-1)
-      else if c <= 8231 then 0 else if c <= 8233 then (-1) else 0
-let __sedlex_partition_10 c =
-  if c <= (-1)
-  then (-1)
-  else
-    if c <= 41
-    then (Char.code (String.unsafe_get __sedlex_table_34 c)) - 1
-    else
-      if c <= 42
-      then (-1)
-      else if c <= 8231 then 0 else if c <= 8233 then (-1) else 0
-let __sedlex_partition_88 c =
-  if c <= 59
-  then (-1)
-  else
-    if c <= 61
-    then (Char.code (String.unsafe_get __sedlex_table_5 (c - 60))) - 1
-    else (-1)
-let __sedlex_partition_41 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 110
-    then (Char.code (String.unsafe_get __sedlex_table_35 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_92 c =
-  if c <= 96
-  then (-1)
-  else
-    if c <= 105
-    then (Char.code (String.unsafe_get __sedlex_table_36 (c - 97))) - 1
-    else (-1)
-let __sedlex_partition_30 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 110
-    then (Char.code (String.unsafe_get __sedlex_table_37 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_89 c =
-  if c <= 60
-  then (-1)
-  else
-    if c <= 62
-    then (Char.code (String.unsafe_get __sedlex_table_5 (c - 61))) - 1
-    else (-1)
-let __sedlex_partition_22 c =
-  if c <= 122 then (-1) else if c <= 123 then 0 else (-1)
-let __sedlex_partition_25 c =
-  if c <= 65
-  then (-1)
-  else
-    if c <= 98
-    then (Char.code (String.unsafe_get __sedlex_table_12 (c - 66))) - 1
-    else (-1)
-let __sedlex_partition_63 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_38 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_20 c =
-  if c <= 96
-  then (Char.code (String.unsafe_get __sedlex_table_39 (c - (-1)))) - 1
-  else 1
-let __sedlex_partition_96 c =
-  if c <= 115 then (-1) else if c <= 116 then 0 else (-1)
-let __sedlex_partition_17 c =
-  if c <= 47 then (-1) else if c <= 55 then 0 else (-1)
-let __sedlex_partition_72 c =
-  if c <= 109 then (-1) else if c <= 110 then 0 else (-1)
-let __sedlex_partition_99 c =
-  if c <= 60
-  then (-1)
-  else
-    if c <= 124
-    then (Char.code (String.unsafe_get __sedlex_table_40 (c - 61))) - 1
-    else (-1)
-let __sedlex_partition_68 c =
-  if c <= 110 then (-1) else if c <= 111 then 0 else (-1)
-let __sedlex_partition_73 c =
-  if c <= 98 then (-1) else if c <= 99 then 0 else (-1)
-let __sedlex_partition_24 c =
-  if c <= 47 then (-1) else if c <= 48 then 0 else (-1)
-let __sedlex_partition_123 c =
-  if c <= 8
-  then (-1)
-  else
-    if c <= 5760
-    then (Char.code (String.unsafe_get __sedlex_table_41 (c - 9))) - 1
-    else
-      if c <= 8191
-      then (-1)
-      else
-        if c <= 65279
-        then
-          (if c <= 12288
-           then
-             (if c <= 8239
-              then (if c <= 8202 then 0 else if c <= 8238 then (-1) else 0)
-              else
-                if c <= 8286
-                then (-1)
-                else if c <= 8287 then 0 else if c <= 12287 then (-1) else 0)
-           else if c <= 65278 then (-1) else 0)
-        else (-1)
-let __sedlex_partition_45 c =
-  if c <= 45
-  then (-1)
-  else
-    if c <= 101
-    then (Char.code (String.unsafe_get __sedlex_table_42 (c - 46))) - 1
-    else (-1)
-let __sedlex_partition_29 c =
-  if c <= 78
-  then (-1)
-  else
-    if c <= 111
-    then (Char.code (String.unsafe_get __sedlex_table_12 (c - 79))) - 1
-    else (-1)
-let __sedlex_partition_23 c =
-  if c <= 41 then (-1) else if c <= 42 then 0 else (-1)
-let __sedlex_partition_16 c =
-  if c <= 120
-  then (Char.code (String.unsafe_get __sedlex_table_43 (c - (-1)))) - 1
-  else if c <= 8233 then (if c <= 8231 then 1 else 2) else 1
-let __sedlex_partition_53 c =
-  if c <= 32 then (-1) else if c <= 33 then 0 else (-1)
-let __sedlex_partition_54 c =
-  if c <= 37
-  then (-1)
-  else
-    if c <= 61
-    then (Char.code (String.unsafe_get __sedlex_table_44 (c - 38))) - 1
-    else (-1)
-let __sedlex_partition_106 c =
-  if c <= (-1)
-  then (-1)
-  else
-    if c <= 13
-    then (Char.code (String.unsafe_get __sedlex_table_45 c)) - 1
-    else if c <= 8233 then (if c <= 8231 then 0 else 1) else 0
-let __sedlex_partition_77 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_46 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_9 c =
-  if c <= (-1)
-  then (-1)
-  else
-    if c <= 42
-    then (Char.code (String.unsafe_get __sedlex_table_47 c)) - 1
-    else if c <= 8233 then (if c <= 8231 then 0 else 1) else 0
-let __sedlex_partition_44 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 101
-    then (Char.code (String.unsafe_get __sedlex_table_48 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_59 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_49 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_55 c =
-  if c <= 41
-  then (-1)
-  else
-    if c <= 61
-    then (Char.code (String.unsafe_get __sedlex_table_50 (c - 42))) - 1
-    else (-1)
-let __sedlex_partition_95 c =
-  if c <= 72 then (-1) else if c <= 73 then 0 else (-1)
-let __sedlex_partition_120 c =
-  if c <= 44
-  then (-1)
-  else
-    if c <= 48
-    then (Char.code (String.unsafe_get __sedlex_table_51 (c - 45))) - 1
-    else (-1)
-let __sedlex_partition_124 c =
-  if c <= 44
-  then (-1)
-  else
-    if c <= 57
-    then (Char.code (String.unsafe_get __sedlex_table_52 (c - 45))) - 1
-    else (-1)
-let __sedlex_partition_70 c =
-  if c <= 44 then (-1) else if c <= 45 then 0 else (-1)
-let __sedlex_partition_71 c =
-  if c <= 104 then (-1) else if c <= 105 then 0 else (-1)
-let __sedlex_partition_67 c =
-  if c <= 107 then (-1) else if c <= 108 then 0 else (-1)
-let __sedlex_partition_74 c =
-  if c <= 99 then (-1) else if c <= 100 then 0 else (-1)
-let __sedlex_partition_36 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 102
-    then (Char.code (String.unsafe_get __sedlex_table_53 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_97 c =
-  if c <= 113 then (-1) else if c <= 114 then 0 else (-1)
-let __sedlex_partition_47 c =
-  if c <= 45
-  then (-1)
-  else
-    if c <= 57
-    then (Char.code (String.unsafe_get __sedlex_table_54 (c - 46))) - 1
-    else (-1)
-let __sedlex_partition_80 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_55 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_3 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 123
-    then (Char.code (String.unsafe_get __sedlex_table_56 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_90 c =
-  if c <= 45
-  then (-1)
-  else
-    if c <= 63
-    then (Char.code (String.unsafe_get __sedlex_table_57 (c - 46))) - 1
-    else (-1)
-let __sedlex_partition_8 c =
-  if c <= (-1)
-  then (-1)
-  else if c <= 91 then 0 else if c <= 92 then (-1) else 0
-let __sedlex_partition_15 c =
-  if c <= (-1)
-  then (-1)
-  else
-    if c <= 12
-    then (Char.code (String.unsafe_get __sedlex_table_58 c)) - 1
-    else
-      if c <= 13
-      then (-1)
-      else if c <= 8231 then 0 else if c <= 8233 then (-1) else 0
-let __sedlex_partition_76 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_59 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_101 c =
-  if c <= (-1)
-  then (-1)
-  else
-    if c <= 91
-    then (Char.code (String.unsafe_get __sedlex_table_60 c)) - 1
-    else
-      if c <= 93
-      then (-1)
-      else if c <= 8231 then 0 else if c <= 8233 then (-1) else 0
-let __sedlex_partition_107 c =
-  if c <= 8191
-  then (Char.code (String.unsafe_get __sedlex_table_61 (c - (-1)))) - 1
-  else
-    if c <= 12287
-    then
-      (if c <= 8238
-       then
-         (if c <= 8231
-          then (if c <= 8202 then 2 else 1)
-          else if c <= 8233 then 3 else 1)
-       else
-         if c <= 8286
-         then (if c <= 8239 then 2 else 1)
-         else if c <= 8287 then 2 else 1)
-    else
-      if c <= 65278
-      then (if c <= 12288 then 2 else 1)
-      else if c <= 65279 then 2 else 1
-let __sedlex_partition_11 c =
-  if c <= 9 then (-1) else if c <= 10 then 0 else (-1)
-let __sedlex_partition_82 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_62 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_98 c =
-  if c <= 96 then (-1) else if c <= 97 then 0 else (-1)
-let __sedlex_partition_64 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_63 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_132 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 8188
-    then (Char.code (String.unsafe_get __sedlex_table_64 (c - 36))) - 1
-    else
-      if c <= 8304
-      then (-1)
-      else
-        if c <= 201546
-        then
-          (if c <= 69864
-           then
-             (if c <= 43754
-              then
-                (if c <= 40981
-                 then
-                   (if c <= 11623
-                    then
-                      (if c <= 8504
-                       then
-                         (if c <= 8472
-                          then
-                            (if c <= 8450
-                             then
-                               (if c <= 8319
-                                then
-                                  (if c <= 8305
-                                   then 0
-                                   else if c <= 8318 then (-1) else 0)
-                                else
-                                  if c <= 8335
-                                  then (-1)
-                                  else
-                                    if c <= 8348
-                                    then 0
-                                    else if c <= 8449 then (-1) else 0)
-                             else
-                               if c <= 8454
-                               then (-1)
-                               else
-                                 if c <= 8467
-                                 then
-                                   (if c <= 8455
-                                    then 0
-                                    else if c <= 8457 then (-1) else 0)
-                                 else
-                                   if c <= 8468
-                                   then (-1)
-                                   else
-                                     if c <= 8469
-                                     then 0
-                                     else if c <= 8471 then (-1) else 0)
-                          else
-                            if c <= 8488
-                            then
-                              (if c <= 8484
-                               then
-                                 (if c <= 8477
-                                  then 0
-                                  else if c <= 8483 then (-1) else 0)
-                               else
-                                 if c <= 8485
-                                 then (-1)
-                                 else
-                                   if c <= 8486
-                                   then 0
-                                   else if c <= 8487 then (-1) else 0)
-                            else if c <= 8489 then (-1) else 0)
-                       else
-                         if c <= 11387
-                         then
-                           (if c <= 8526
-                            then
-                              (if c <= 8511
-                               then
-                                 (if c <= 8505
-                                  then 0
-                                  else if c <= 8507 then (-1) else 0)
-                               else
-                                 if c <= 8516
-                                 then (-1)
-                                 else
-                                   if c <= 8521
-                                   then 0
-                                   else if c <= 8525 then (-1) else 0)
-                            else
-                              if c <= 8543
-                              then (-1)
-                              else
-                                if c <= 8580
-                                then 0
-                                else
-                                  if c <= 8584
-                                  then 0
-                                  else if c <= 11263 then (-1) else 0)
-                         else
-                           if c <= 11507
-                           then
-                             (if c <= 11492
-                              then 0
-                              else
-                                if c <= 11498
-                                then (-1)
-                                else
-                                  if c <= 11502
-                                  then 0
-                                  else if c <= 11505 then (-1) else 0)
-                           else
-                             if c <= 11519
-                             then (-1)
-                             else
-                               if c <= 11559
-                               then
-                                 (if c <= 11557
-                                  then 0
-                                  else if c <= 11558 then (-1) else 0)
-                               else
-                                 if c <= 11564
-                                 then (-1)
-                                 else
-                                   if c <= 11565
-                                   then 0
-                                   else if c <= 11567 then (-1) else 0)
-                    else
-                      if c <= 11630
-                      then (-1)
-                      else
-                        if c <= 12346
-                        then
-                          (if c <= 11726
-                           then
-                             (if c <= 11694
-                              then
-                                (if c <= 11670
-                                 then
-                                   (if c <= 11631
-                                    then 0
-                                    else if c <= 11647 then (-1) else 0)
-                                 else
-                                   if c <= 11679
-                                   then (-1)
-                                   else
-                                     if c <= 11686
-                                     then 0
-                                     else if c <= 11687 then (-1) else 0)
-                              else
-                                if c <= 11695
-                                then (-1)
-                                else
-                                  if c <= 11710
-                                  then
-                                    (if c <= 11702
-                                     then 0
-                                     else if c <= 11703 then (-1) else 0)
-                                  else
-                                    if c <= 11711
-                                    then (-1)
-                                    else
-                                      if c <= 11718
-                                      then 0
-                                      else if c <= 11719 then (-1) else 0)
-                           else
-                             if c <= 11727
-                             then (-1)
-                             else
-                               if c <= 12294
-                               then
-                                 (if c <= 11742
-                                  then
-                                    (if c <= 11734
-                                     then 0
-                                     else if c <= 11735 then (-1) else 0)
-                                  else if c <= 12292 then (-1) else 0)
-                               else
-                                 if c <= 12329
-                                 then
-                                   (if c <= 12295
-                                    then 0
-                                    else if c <= 12320 then (-1) else 0)
-                                 else
-                                   if c <= 12336
-                                   then (-1)
-                                   else
-                                     if c <= 12341
-                                     then 0
-                                     else if c <= 12343 then (-1) else 0)
-                        else
-                          if c <= 12542
-                          then
-                            (if c <= 12444
-                             then
-                               (if c <= 12348
-                                then 0
-                                else
-                                  if c <= 12352
-                                  then (-1)
-                                  else
-                                    if c <= 12438
-                                    then 0
-                                    else if c <= 12442 then (-1) else 0)
-                             else
-                               if c <= 12447
-                               then 0
-                               else
-                                 if c <= 12448
-                                 then (-1)
-                                 else
-                                   if c <= 12538
-                                   then 0
-                                   else if c <= 12539 then (-1) else 0)
-                          else
-                            if c <= 12735
-                            then
-                              (if c <= 12591
-                               then
-                                 (if c <= 12543
-                                  then 0
-                                  else if c <= 12548 then (-1) else 0)
-                               else
-                                 if c <= 12592
-                                 then (-1)
-                                 else
-                                   if c <= 12686
-                                   then 0
-                                   else if c <= 12703 then (-1) else 0)
-                            else
-                              if c <= 12783
-                              then (-1)
-                              else
-                                if c <= 19903
-                                then
-                                  (if c <= 12799
-                                   then 0
-                                   else if c <= 13311 then (-1) else 0)
-                                else if c <= 19967 then (-1) else 0)
-                 else
-                   if c <= 43013
-                   then
-                     (if c <= 42863
-                      then
-                        (if c <= 42605
-                         then
-                           (if c <= 42507
-                            then
-                              (if c <= 42231
-                               then
-                                 (if c <= 42124
-                                  then 0
-                                  else if c <= 42191 then (-1) else 0)
-                               else
-                                 if c <= 42237
-                                 then 0
-                                 else if c <= 42239 then (-1) else 0)
-                            else
-                              if c <= 42527
-                              then
-                                (if c <= 42508
-                                 then 0
-                                 else if c <= 42511 then (-1) else 0)
-                              else
-                                if c <= 42537
-                                then (-1)
-                                else
-                                  if c <= 42539
-                                  then 0
-                                  else if c <= 42559 then (-1) else 0)
-                         else
-                           if c <= 42653
-                           then
-                             (if c <= 42623
-                              then
-                                (if c <= 42606
-                                 then 0
-                                 else if c <= 42622 then (-1) else 0)
-                              else 0)
-                           else
-                             if c <= 42655
-                             then (-1)
-                             else
-                               if c <= 42735
-                               then 0
-                               else
-                                 if c <= 42774
-                                 then (-1)
-                                 else
-                                   if c <= 42783
-                                   then 0
-                                   else if c <= 42785 then (-1) else 0)
-                      else
-                        if c <= 42963
-                        then
-                          (if c <= 42894
-                           then
-                             (if c <= 42887
-                              then 0
-                              else
-                                if c <= 42888
-                                then 0
-                                else if c <= 42890 then (-1) else 0)
-                           else
-                             if c <= 42954
-                             then 0
-                             else
-                               if c <= 42959
-                               then (-1)
-                               else
-                                 if c <= 42961
-                                 then 0
-                                 else if c <= 42962 then (-1) else 0)
-                        else
-                          if c <= 42964
-                          then (-1)
-                          else
-                            if c <= 42999
-                            then
-                              (if c <= 42996
-                               then
-                                 (if c <= 42969
-                                  then 0
-                                  else if c <= 42993 then (-1) else 0)
-                               else 0)
-                            else
-                              if c <= 43002
-                              then 0
-                              else
-                                if c <= 43009
-                                then 0
-                                else if c <= 43010 then (-1) else 0)
-                   else
-                     if c <= 43014
-                     then (-1)
-                     else
-                       if c <= 43518
-                       then
-                         (if c <= 43301
-                          then
-                            (if c <= 43187
-                             then
-                               (if c <= 43042
-                                then
-                                  (if c <= 43018
-                                   then 0
-                                   else if c <= 43019 then (-1) else 0)
-                                else
-                                  if c <= 43071
-                                  then (-1)
-                                  else
-                                    if c <= 43123
-                                    then 0
-                                    else if c <= 43137 then (-1) else 0)
-                             else
-                               if c <= 43249
-                               then (-1)
-                               else
-                                 if c <= 43259
-                                 then
-                                   (if c <= 43255
-                                    then 0
-                                    else if c <= 43258 then (-1) else 0)
-                                 else
-                                   if c <= 43260
-                                   then (-1)
-                                   else
-                                     if c <= 43262
-                                     then 0
-                                     else if c <= 43273 then (-1) else 0)
-                          else
-                            if c <= 43311
-                            then (-1)
-                            else
-                              if c <= 43471
-                              then
-                                (if c <= 43388
-                                 then
-                                   (if c <= 43334
-                                    then 0
-                                    else if c <= 43359 then (-1) else 0)
-                                 else
-                                   if c <= 43395
-                                   then (-1)
-                                   else
-                                     if c <= 43442
-                                     then 0
-                                     else if c <= 43470 then (-1) else 0)
-                              else
-                                if c <= 43487
-                                then (-1)
-                                else
-                                  if c <= 43494
-                                  then
-                                    (if c <= 43492
-                                     then 0
-                                     else if c <= 43493 then (-1) else 0)
-                                  else
-                                    if c <= 43503
-                                    then 0
-                                    else if c <= 43513 then (-1) else 0)
-                       else
-                         if c <= 43519
-                         then (-1)
-                         else
-                           if c <= 43695
-                           then
-                             (if c <= 43631
-                              then
-                                (if c <= 43586
-                                 then
-                                   (if c <= 43560
-                                    then 0
-                                    else if c <= 43583 then (-1) else 0)
-                                 else
-                                   if c <= 43587
-                                   then (-1)
-                                   else
-                                     if c <= 43595
-                                     then 0
-                                     else if c <= 43615 then (-1) else 0)
-                              else
-                                if c <= 43638
-                                then 0
-                                else
-                                  if c <= 43641
-                                  then (-1)
-                                  else
-                                    if c <= 43642
-                                    then 0
-                                    else if c <= 43645 then (-1) else 0)
-                           else
-                             if c <= 43696
-                             then (-1)
-                             else
-                               if c <= 43712
-                               then
-                                 (if c <= 43702
-                                  then
-                                    (if c <= 43697
-                                     then 0
-                                     else if c <= 43700 then (-1) else 0)
-                                  else
-                                    if c <= 43704
-                                    then (-1)
-                                    else
-                                      if c <= 43709
-                                      then 0
-                                      else if c <= 43711 then (-1) else 0)
-                               else
-                                 if c <= 43713
-                                 then (-1)
-                                 else
-                                   if c <= 43740
-                                   then
-                                     (if c <= 43714
-                                      then 0
-                                      else if c <= 43738 then (-1) else 0)
-                                   else
-                                     if c <= 43741
-                                     then 0
-                                     else if c <= 43743 then (-1) else 0)
-              else
-                if c <= 43761
-                then (-1)
-                else
-                  if c <= 66511
-                  then
-                    (if c <= 65019
-                     then
-                       (if c <= 55291
-                        then
-                          (if c <= 43866
-                           then
-                             (if c <= 43790
-                              then
-                                (if c <= 43764
-                                 then 0
-                                 else
-                                   if c <= 43776
-                                   then (-1)
-                                   else
-                                     if c <= 43782
-                                     then 0
-                                     else if c <= 43784 then (-1) else 0)
-                              else
-                                if c <= 43792
-                                then (-1)
-                                else
-                                  if c <= 43814
-                                  then
-                                    (if c <= 43798
-                                     then 0
-                                     else if c <= 43807 then (-1) else 0)
-                                  else
-                                    if c <= 43815
-                                    then (-1)
-                                    else
-                                      if c <= 43822
-                                      then 0
-                                      else if c <= 43823 then (-1) else 0)
-                           else
-                             if c <= 43867
-                             then (-1)
-                             else
-                               if c <= 43967
-                               then
-                                 (if c <= 43880
-                                  then 0
-                                  else
-                                    if c <= 43881
-                                    then 0
-                                    else if c <= 43887 then (-1) else 0)
-                               else
-                                 if c <= 55203
-                                 then
-                                   (if c <= 44002
-                                    then 0
-                                    else if c <= 44031 then (-1) else 0)
-                                 else
-                                   if c <= 55215
-                                   then (-1)
-                                   else
-                                     if c <= 55238
-                                     then 0
-                                     else if c <= 55242 then (-1) else 0)
-                        else
-                          if c <= 63743
-                          then (-1)
-                          else
-                            if c <= 64316
-                            then
-                              (if c <= 64279
-                               then
-                                 (if c <= 64217
-                                  then
-                                    (if c <= 64109
-                                     then 0
-                                     else if c <= 64111 then (-1) else 0)
-                                  else
-                                    if c <= 64255
-                                    then (-1)
-                                    else
-                                      if c <= 64262
-                                      then 0
-                                      else if c <= 64274 then (-1) else 0)
-                               else
-                                 if c <= 64284
-                                 then (-1)
-                                 else
-                                   if c <= 64296
-                                   then
-                                     (if c <= 64285
-                                      then 0
-                                      else if c <= 64286 then (-1) else 0)
-                                   else
-                                     if c <= 64297
-                                     then (-1)
-                                     else
-                                       if c <= 64310
-                                       then 0
-                                       else if c <= 64311 then (-1) else 0)
-                            else
-                              if c <= 64317
-                              then (-1)
-                              else
-                                if c <= 64433
-                                then
-                                  (if c <= 64321
-                                   then
-                                     (if c <= 64318
-                                      then 0
-                                      else if c <= 64319 then (-1) else 0)
-                                   else
-                                     if c <= 64322
-                                     then (-1)
-                                     else
-                                       if c <= 64324
-                                       then 0
-                                       else if c <= 64325 then (-1) else 0)
-                                else
-                                  if c <= 64466
-                                  then (-1)
-                                  else
-                                    if c <= 64911
-                                    then
-                                      (if c <= 64829
-                                       then 0
-                                       else if c <= 64847 then (-1) else 0)
-                                    else
-                                      if c <= 64913
-                                      then (-1)
-                                      else
-                                        if c <= 64967
-                                        then 0
-                                        else if c <= 65007 then (-1) else 0)
-                     else
-                       if c <= 65135
-                       then (-1)
-                       else
-                         if c <= 65594
-                         then
-                           (if c <= 65439
-                            then
-                              (if c <= 65370
-                               then
-                                 (if c <= 65276
-                                  then
-                                    (if c <= 65140
-                                     then 0
-                                     else if c <= 65141 then (-1) else 0)
-                                  else
-                                    if c <= 65312
-                                    then (-1)
-                                    else
-                                      if c <= 65338
-                                      then 0
-                                      else if c <= 65344 then (-1) else 0)
-                               else if c <= 65381 then (-1) else 0)
-                            else
-                              if c <= 65495
-                              then
-                                (if c <= 65479
-                                 then
-                                   (if c <= 65470
-                                    then 0
-                                    else if c <= 65473 then (-1) else 0)
-                                 else
-                                   if c <= 65481
-                                   then (-1)
-                                   else
-                                     if c <= 65487
-                                     then 0
-                                     else if c <= 65489 then (-1) else 0)
-                              else
-                                if c <= 65497
-                                then (-1)
-                                else
-                                  if c <= 65547
-                                  then
-                                    (if c <= 65500
-                                     then 0
-                                     else if c <= 65535 then (-1) else 0)
-                                  else
-                                    if c <= 65548
-                                    then (-1)
-                                    else
-                                      if c <= 65574
-                                      then 0
-                                      else if c <= 65575 then (-1) else 0)
-                         else
-                           if c <= 65595
-                           then (-1)
-                           else
-                             if c <= 66335
-                             then
-                               (if c <= 65786
-                                then
-                                  (if c <= 65613
-                                   then
-                                     (if c <= 65597
-                                      then 0
-                                      else if c <= 65598 then (-1) else 0)
-                                   else
-                                     if c <= 65615
-                                     then (-1)
-                                     else
-                                       if c <= 65629
-                                       then 0
-                                       else if c <= 65663 then (-1) else 0)
-                                else
-                                  if c <= 65855
-                                  then (-1)
-                                  else
-                                    if c <= 66204
-                                    then
-                                      (if c <= 65908
-                                       then 0
-                                       else if c <= 66175 then (-1) else 0)
-                                    else
-                                      if c <= 66207
-                                      then (-1)
-                                      else
-                                        if c <= 66256
-                                        then 0
-                                        else if c <= 66303 then (-1) else 0)
-                             else
-                               if c <= 66348
-                               then (-1)
-                               else
-                                 if c <= 66378
-                                 then 0
-                                 else
-                                   if c <= 66383
-                                   then (-1)
-                                   else
-                                     if c <= 66461
-                                     then
-                                       (if c <= 66421
-                                        then 0
-                                        else if c <= 66431 then (-1) else 0)
-                                     else
-                                       if c <= 66463
-                                       then (-1)
-                                       else
-                                         if c <= 66499
-                                         then 0
-                                         else if c <= 66503 then (-1) else 0)
-                  else
-                    if c <= 66512
-                    then (-1)
-                    else
-                      if c <= 67861
-                      then
-                        (if c <= 67382
-                         then
-                           (if c <= 66938
-                            then
-                              (if c <= 66771
-                               then
-                                 (if c <= 66639
-                                  then
-                                    (if c <= 66517
-                                     then 0
-                                     else if c <= 66559 then (-1) else 0)
-                                  else
-                                    if c <= 66717
-                                    then 0
-                                    else if c <= 66735 then (-1) else 0)
-                               else
-                                 if c <= 66775
-                                 then (-1)
-                                 else
-                                   if c <= 66855
-                                   then
-                                     (if c <= 66811
-                                      then 0
-                                      else if c <= 66815 then (-1) else 0)
-                                   else
-                                     if c <= 66863
-                                     then (-1)
-                                     else
-                                       if c <= 66915
-                                       then 0
-                                       else if c <= 66927 then (-1) else 0)
-                            else
-                              if c <= 66939
-                              then (-1)
-                              else
-                                if c <= 66977
-                                then
-                                  (if c <= 66962
-                                   then
-                                     (if c <= 66954
-                                      then 0
-                                      else if c <= 66955 then (-1) else 0)
-                                   else
-                                     if c <= 66963
-                                     then (-1)
-                                     else
-                                       if c <= 66965
-                                       then 0
-                                       else if c <= 66966 then (-1) else 0)
-                                else
-                                  if c <= 66978
-                                  then (-1)
-                                  else
-                                    if c <= 67001
-                                    then
-                                      (if c <= 66993
-                                       then 0
-                                       else if c <= 66994 then (-1) else 0)
-                                    else
-                                      if c <= 67002
-                                      then (-1)
-                                      else
-                                        if c <= 67004
-                                        then 0
-                                        else if c <= 67071 then (-1) else 0)
-                         else
-                           if c <= 67391
-                           then (-1)
-                           else
-                             if c <= 67637
-                             then
-                               (if c <= 67504
-                                then
-                                  (if c <= 67431
-                                   then
-                                     (if c <= 67413
-                                      then 0
-                                      else if c <= 67423 then (-1) else 0)
-                                   else
-                                     if c <= 67455
-                                     then (-1)
-                                     else
-                                       if c <= 67461
-                                       then 0
-                                       else if c <= 67462 then (-1) else 0)
-                                else
-                                  if c <= 67505
-                                  then (-1)
-                                  else
-                                    if c <= 67589
-                                    then
-                                      (if c <= 67514
-                                       then 0
-                                       else if c <= 67583 then (-1) else 0)
-                                    else
-                                      if c <= 67591
-                                      then (-1)
-                                      else
-                                        if c <= 67592
-                                        then 0
-                                        else if c <= 67593 then (-1) else 0)
-                             else
-                               if c <= 67638
-                               then (-1)
-                               else
-                                 if c <= 67702
-                                 then
-                                   (if c <= 67644
-                                    then
-                                      (if c <= 67640
-                                       then 0
-                                       else if c <= 67643 then (-1) else 0)
-                                    else
-                                      if c <= 67646
-                                      then (-1)
-                                      else
-                                        if c <= 67669
-                                        then 0
-                                        else if c <= 67679 then (-1) else 0)
-                                 else
-                                   if c <= 67711
-                                   then (-1)
-                                   else
-                                     if c <= 67826
-                                     then
-                                       (if c <= 67742
-                                        then 0
-                                        else if c <= 67807 then (-1) else 0)
-                                     else
-                                       if c <= 67827
-                                       then (-1)
-                                       else
-                                         if c <= 67829
-                                         then 0
-                                         else if c <= 67839 then (-1) else 0)
-                      else
-                        if c <= 67871
-                        then (-1)
-                        else
-                          if c <= 68680
-                          then
-                            (if c <= 68220
-                             then
-                               (if c <= 68096
-                                then
-                                  (if c <= 68023
-                                   then
-                                     (if c <= 67897
-                                      then 0
-                                      else if c <= 67967 then (-1) else 0)
-                                   else
-                                     if c <= 68029
-                                     then (-1)
-                                     else
-                                       if c <= 68031
-                                       then 0
-                                       else if c <= 68095 then (-1) else 0)
-                                else
-                                  if c <= 68111
-                                  then (-1)
-                                  else
-                                    if c <= 68119
-                                    then
-                                      (if c <= 68115
-                                       then 0
-                                       else if c <= 68116 then (-1) else 0)
-                                    else
-                                      if c <= 68120
-                                      then (-1)
-                                      else
-                                        if c <= 68149
-                                        then 0
-                                        else if c <= 68191 then (-1) else 0)
-                             else
-                               if c <= 68223
-                               then (-1)
-                               else
-                                 if c <= 68405
-                                 then
-                                   (if c <= 68295
-                                    then
-                                      (if c <= 68252
-                                       then 0
-                                       else if c <= 68287 then (-1) else 0)
-                                    else
-                                      if c <= 68296
-                                      then (-1)
-                                      else
-                                        if c <= 68324
-                                        then 0
-                                        else if c <= 68351 then (-1) else 0)
-                                 else
-                                   if c <= 68415
-                                   then (-1)
-                                   else
-                                     if c <= 68466
-                                     then
-                                       (if c <= 68437
-                                        then 0
-                                        else if c <= 68447 then (-1) else 0)
-                                     else
-                                       if c <= 68479
-                                       then (-1)
-                                       else
-                                         if c <= 68497
-                                         then 0
-                                         else if c <= 68607 then (-1) else 0)
-                          else
-                            if c <= 68735
-                            then (-1)
-                            else
-                              if c <= 69445
-                              then
-                                (if c <= 69289
-                                 then
-                                   (if c <= 68850
-                                    then
-                                      (if c <= 68786
-                                       then 0
-                                       else if c <= 68799 then (-1) else 0)
-                                    else
-                                      if c <= 68863
-                                      then (-1)
-                                      else
-                                        if c <= 68899
-                                        then 0
-                                        else if c <= 69247 then (-1) else 0)
-                                 else
-                                   if c <= 69295
-                                   then (-1)
-                                   else
-                                     if c <= 69404
-                                     then
-                                       (if c <= 69297
-                                        then 0
-                                        else if c <= 69375 then (-1) else 0)
-                                     else
-                                       if c <= 69414
-                                       then (-1)
-                                       else
-                                         if c <= 69415
-                                         then 0
-                                         else if c <= 69423 then (-1) else 0)
-                              else
-                                if c <= 69487
-                                then (-1)
-                                else
-                                  if c <= 69687
-                                  then
-                                    (if c <= 69572
-                                     then
-                                       (if c <= 69505
-                                        then 0
-                                        else if c <= 69551 then (-1) else 0)
-                                     else
-                                       if c <= 69599
-                                       then (-1)
-                                       else
-                                         if c <= 69622
-                                         then 0
-                                         else if c <= 69634 then (-1) else 0)
-                                  else
-                                    if c <= 69744
-                                    then (-1)
-                                    else
-                                      if c <= 69749
-                                      then
-                                        (if c <= 69746
-                                         then 0
-                                         else if c <= 69748 then (-1) else 0)
-                                      else
-                                        if c <= 69762
-                                        then (-1)
-                                        else
-                                          if c <= 69807
-                                          then 0
-                                          else if c <= 69839 then (-1) else 0)
-           else
-             if c <= 69890
-             then (-1)
-             else
-               if c <= 120512
-               then
-                 (if c <= 72847
-                  then
-                    (if c <= 70855
-                     then
-                       (if c <= 70312
-                        then
-                          (if c <= 70106
-                           then
-                             (if c <= 70002
-                              then
-                                (if c <= 69956
-                                 then
-                                   (if c <= 69926
-                                    then 0
-                                    else if c <= 69955 then (-1) else 0)
-                                 else
-                                   if c <= 69958
-                                   then (-1)
-                                   else
-                                     if c <= 69959
-                                     then 0
-                                     else if c <= 69967 then (-1) else 0)
-                              else
-                                if c <= 70005
-                                then (-1)
-                                else
-                                  if c <= 70066
-                                  then
-                                    (if c <= 70006
-                                     then 0
-                                     else if c <= 70018 then (-1) else 0)
-                                  else
-                                    if c <= 70080
-                                    then (-1)
-                                    else
-                                      if c <= 70084
-                                      then 0
-                                      else if c <= 70105 then (-1) else 0)
-                           else
-                             if c <= 70107
-                             then (-1)
-                             else
-                               if c <= 70278
-                               then
-                                 (if c <= 70161
-                                  then
-                                    (if c <= 70108
-                                     then 0
-                                     else if c <= 70143 then (-1) else 0)
-                                  else
-                                    if c <= 70162
-                                    then (-1)
-                                    else
-                                      if c <= 70187
-                                      then 0
-                                      else if c <= 70271 then (-1) else 0)
-                               else
-                                 if c <= 70279
-                                 then (-1)
-                                 else
-                                   if c <= 70285
-                                   then
-                                     (if c <= 70280
-                                      then 0
-                                      else if c <= 70281 then (-1) else 0)
-                                   else
-                                     if c <= 70286
-                                     then (-1)
-                                     else
-                                       if c <= 70301
-                                       then 0
-                                       else if c <= 70302 then (-1) else 0)
-                        else
-                          if c <= 70319
-                          then (-1)
-                          else
-                            if c <= 70461
-                            then
-                              (if c <= 70440
-                               then
-                                 (if c <= 70412
-                                  then
-                                    (if c <= 70366
-                                     then 0
-                                     else if c <= 70404 then (-1) else 0)
-                                  else
-                                    if c <= 70414
-                                    then (-1)
-                                    else
-                                      if c <= 70416
-                                      then 0
-                                      else if c <= 70418 then (-1) else 0)
-                               else
-                                 if c <= 70441
-                                 then (-1)
-                                 else
-                                   if c <= 70451
-                                   then
-                                     (if c <= 70448
-                                      then 0
-                                      else if c <= 70449 then (-1) else 0)
-                                   else
-                                     if c <= 70452
-                                     then (-1)
-                                     else
-                                       if c <= 70457
-                                       then 0
-                                       else if c <= 70460 then (-1) else 0)
-                            else
-                              if c <= 70479
-                              then (-1)
-                              else
-                                if c <= 70730
-                                then
-                                  (if c <= 70497
-                                   then
-                                     (if c <= 70480
-                                      then 0
-                                      else if c <= 70492 then (-1) else 0)
-                                   else
-                                     if c <= 70655
-                                     then (-1)
-                                     else
-                                       if c <= 70708
-                                       then 0
-                                       else if c <= 70726 then (-1) else 0)
-                                else
-                                  if c <= 70750
-                                  then (-1)
-                                  else
-                                    if c <= 70831
-                                    then
-                                      (if c <= 70753
-                                       then 0
-                                       else if c <= 70783 then (-1) else 0)
-                                    else
-                                      if c <= 70851
-                                      then (-1)
-                                      else
-                                        if c <= 70853
-                                        then 0
-                                        else if c <= 70854 then (-1) else 0)
-                     else
-                       if c <= 71039
-                       then (-1)
-                       else
-                         if c <= 71999
-                         then
-                           (if c <= 71494
-                            then
-                              (if c <= 71236
-                               then
-                                 (if c <= 71131
-                                  then
-                                    (if c <= 71086
-                                     then 0
-                                     else if c <= 71127 then (-1) else 0)
-                                  else
-                                    if c <= 71167
-                                    then (-1)
-                                    else
-                                      if c <= 71215
-                                      then 0
-                                      else if c <= 71235 then (-1) else 0)
-                               else
-                                 if c <= 71295
-                                 then (-1)
-                                 else
-                                   if c <= 71352
-                                   then
-                                     (if c <= 71338
-                                      then 0
-                                      else if c <= 71351 then (-1) else 0)
-                                   else
-                                     if c <= 71423
-                                     then (-1)
-                                     else
-                                       if c <= 71450
-                                       then 0
-                                       else if c <= 71487 then (-1) else 0)
-                            else
-                              if c <= 71679
-                              then (-1)
-                              else
-                                if c <= 71945
-                                then
-                                  (if c <= 71903
-                                   then
-                                     (if c <= 71723
-                                      then 0
-                                      else if c <= 71839 then (-1) else 0)
-                                   else
-                                     if c <= 71934
-                                     then (-1)
-                                     else
-                                       if c <= 71942
-                                       then 0
-                                       else if c <= 71944 then (-1) else 0)
-                                else
-                                  if c <= 71947
-                                  then (-1)
-                                  else
-                                    if c <= 71958
-                                    then
-                                      (if c <= 71955
-                                       then 0
-                                       else if c <= 71956 then (-1) else 0)
-                                    else
-                                      if c <= 71959
-                                      then (-1)
-                                      else
-                                        if c <= 71983
-                                        then 0
-                                        else if c <= 71998 then (-1) else 0)
-                         else
-                           if c <= 72000
-                           then (-1)
-                           else
-                             if c <= 72250
-                             then
-                               (if c <= 72161
-                                then
-                                  (if c <= 72103
-                                   then
-                                     (if c <= 72001
-                                      then 0
-                                      else if c <= 72095 then (-1) else 0)
-                                   else
-                                     if c <= 72105
-                                     then (-1)
-                                     else
-                                       if c <= 72144
-                                       then 0
-                                       else if c <= 72160 then (-1) else 0)
-                                else
-                                  if c <= 72162
-                                  then (-1)
-                                  else
-                                    if c <= 72192
-                                    then
-                                      (if c <= 72163
-                                       then 0
-                                       else if c <= 72191 then (-1) else 0)
-                                    else
-                                      if c <= 72202
-                                      then (-1)
-                                      else
-                                        if c <= 72242
-                                        then 0
-                                        else if c <= 72249 then (-1) else 0)
-                             else
-                               if c <= 72271
-                               then (-1)
-                               else
-                                 if c <= 72440
-                                 then
-                                   (if c <= 72329
-                                    then
-                                      (if c <= 72272
-                                       then 0
-                                       else if c <= 72283 then (-1) else 0)
-                                    else
-                                      if c <= 72348
-                                      then (-1)
-                                      else
-                                        if c <= 72349
-                                        then 0
-                                        else if c <= 72367 then (-1) else 0)
-                                 else
-                                   if c <= 72703
-                                   then (-1)
-                                   else
-                                     if c <= 72750
-                                     then
-                                       (if c <= 72712
-                                        then 0
-                                        else if c <= 72713 then (-1) else 0)
-                                     else
-                                       if c <= 72767
-                                       then (-1)
-                                       else
-                                         if c <= 72768
-                                         then 0
-                                         else if c <= 72817 then (-1) else 0)
-                  else
-                    if c <= 72959
-                    then (-1)
-                    else
-                      if c <= 101589
-                      then
-                        (if c <= 83526
-                         then
-                           (if c <= 73112
-                            then
-                              (if c <= 73030
-                               then
-                                 (if c <= 72969
-                                  then
-                                    (if c <= 72966
-                                     then 0
-                                     else if c <= 72967 then (-1) else 0)
-                                  else
-                                    if c <= 72970
-                                    then (-1)
-                                    else
-                                      if c <= 73008
-                                      then 0
-                                      else if c <= 73029 then (-1) else 0)
-                               else
-                                 if c <= 73055
-                                 then (-1)
-                                 else
-                                   if c <= 73064
-                                   then
-                                     (if c <= 73061
-                                      then 0
-                                      else if c <= 73062 then (-1) else 0)
-                                   else
-                                     if c <= 73065
-                                     then (-1)
-                                     else
-                                       if c <= 73097
-                                       then 0
-                                       else if c <= 73111 then (-1) else 0)
-                            else
-                              if c <= 73439
-                              then (-1)
-                              else
-                                if c <= 74862
-                                then
-                                  (if c <= 73648
-                                   then
-                                     (if c <= 73458
-                                      then 0
-                                      else if c <= 73647 then (-1) else 0)
-                                   else
-                                     if c <= 73727
-                                     then (-1)
-                                     else
-                                       if c <= 74649
-                                       then 0
-                                       else if c <= 74751 then (-1) else 0)
-                                else
-                                  if c <= 74879
-                                  then (-1)
-                                  else
-                                    if c <= 77808
-                                    then
-                                      (if c <= 75075
-                                       then 0
-                                       else if c <= 77711 then (-1) else 0)
-                                    else
-                                      if c <= 77823
-                                      then (-1)
-                                      else
-                                        if c <= 78894
-                                        then 0
-                                        else if c <= 82943 then (-1) else 0)
-                         else
-                           if c <= 92159
-                           then (-1)
-                           else
-                             if c <= 93071
-                             then
-                               (if c <= 92909
-                                then
-                                  (if c <= 92766
-                                   then
-                                     (if c <= 92728
-                                      then 0
-                                      else if c <= 92735 then (-1) else 0)
-                                   else
-                                     if c <= 92783
-                                     then (-1)
-                                     else
-                                       if c <= 92862
-                                       then 0
-                                       else if c <= 92879 then (-1) else 0)
-                                else
-                                  if c <= 92927
-                                  then (-1)
-                                  else
-                                    if c <= 92995
-                                    then
-                                      (if c <= 92975
-                                       then 0
-                                       else if c <= 92991 then (-1) else 0)
-                                    else
-                                      if c <= 93026
-                                      then (-1)
-                                      else
-                                        if c <= 93047
-                                        then 0
-                                        else if c <= 93052 then (-1) else 0)
-                             else
-                               if c <= 93759
-                               then (-1)
-                               else
-                                 if c <= 94111
-                                 then
-                                   (if c <= 94026
-                                    then
-                                      (if c <= 93823
-                                       then 0
-                                       else if c <= 93951 then (-1) else 0)
-                                    else
-                                      if c <= 94031
-                                      then (-1)
-                                      else
-                                        if c <= 94032
-                                        then 0
-                                        else if c <= 94098 then (-1) else 0)
-                                 else
-                                   if c <= 94175
-                                   then (-1)
-                                   else
-                                     if c <= 94179
-                                     then
-                                       (if c <= 94177
-                                        then 0
-                                        else if c <= 94178 then (-1) else 0)
-                                     else
-                                       if c <= 94207
-                                       then (-1)
-                                       else
-                                         if c <= 100343
-                                         then 0
-                                         else if c <= 100351 then (-1) else 0)
-                      else
-                        if c <= 101631
-                        then (-1)
-                        else
-                          if c <= 119970
-                          then
-                            (if c <= 111355
-                             then
-                               (if c <= 110590
-                                then
-                                  (if c <= 110579
-                                   then
-                                     (if c <= 101640
-                                      then 0
-                                      else if c <= 110575 then (-1) else 0)
-                                   else
-                                     if c <= 110580
-                                     then (-1)
-                                     else
-                                       if c <= 110587
-                                       then 0
-                                       else if c <= 110588 then (-1) else 0)
-                                else
-                                  if c <= 110591
-                                  then (-1)
-                                  else
-                                    if c <= 110930
-                                    then
-                                      (if c <= 110882
-                                       then 0
-                                       else if c <= 110927 then (-1) else 0)
-                                    else
-                                      if c <= 110947
-                                      then (-1)
-                                      else
-                                        if c <= 110951
-                                        then 0
-                                        else if c <= 110959 then (-1) else 0)
-                             else
-                               if c <= 113663
-                               then (-1)
-                               else
-                                 if c <= 113817
-                                 then
-                                   (if c <= 113788
-                                    then
-                                      (if c <= 113770
-                                       then 0
-                                       else if c <= 113775 then (-1) else 0)
-                                    else
-                                      if c <= 113791
-                                      then (-1)
-                                      else
-                                        if c <= 113800
-                                        then 0
-                                        else if c <= 113807 then (-1) else 0)
-                                 else
-                                   if c <= 119807
-                                   then (-1)
-                                   else
-                                     if c <= 119964
-                                     then
-                                       (if c <= 119892
-                                        then 0
-                                        else if c <= 119893 then (-1) else 0)
-                                     else
-                                       if c <= 119965
-                                       then (-1)
-                                       else
-                                         if c <= 119967
-                                         then 0
-                                         else if c <= 119969 then (-1) else 0)
-                          else
-                            if c <= 119972
-                            then (-1)
-                            else
-                              if c <= 120084
-                              then
-                                (if c <= 119995
-                                 then
-                                   (if c <= 119980
-                                    then
-                                      (if c <= 119974
-                                       then 0
-                                       else if c <= 119976 then (-1) else 0)
-                                    else
-                                      if c <= 119981
-                                      then (-1)
-                                      else
-                                        if c <= 119993
-                                        then 0
-                                        else if c <= 119994 then (-1) else 0)
-                                 else
-                                   if c <= 119996
-                                   then (-1)
-                                   else
-                                     if c <= 120069
-                                     then
-                                       (if c <= 120003
-                                        then 0
-                                        else if c <= 120004 then (-1) else 0)
-                                     else
-                                       if c <= 120070
-                                       then (-1)
-                                       else
-                                         if c <= 120074
-                                         then 0
-                                         else if c <= 120076 then (-1) else 0)
-                              else
-                                if c <= 120085
-                                then (-1)
-                                else
-                                  if c <= 120132
-                                  then
-                                    (if c <= 120121
-                                     then
-                                       (if c <= 120092
-                                        then 0
-                                        else if c <= 120093 then (-1) else 0)
-                                     else
-                                       if c <= 120122
-                                       then (-1)
-                                       else
-                                         if c <= 120126
-                                         then 0
-                                         else if c <= 120127 then (-1) else 0)
-                                  else
-                                    if c <= 120133
-                                    then (-1)
-                                    else
-                                      if c <= 120144
-                                      then
-                                        (if c <= 120134
-                                         then 0
-                                         else if c <= 120137 then (-1) else 0)
-                                      else
-                                        if c <= 120145
-                                        then (-1)
-                                        else
-                                          if c <= 120485
-                                          then 0
-                                          else
-                                            if c <= 120487 then (-1) else 0)
-               else
-                 if c <= 120513
-                 then (-1)
-                 else
-                   if c <= 195101
-                   then
-                     (if c <= 126519
-                      then
-                        (if c <= 123214
-                         then
-                           (if c <= 120744
-                            then
-                              (if c <= 120628
-                               then
-                                 (if c <= 120570
-                                  then
-                                    (if c <= 120538
-                                     then 0
-                                     else if c <= 120539 then (-1) else 0)
-                                  else
-                                    if c <= 120571
-                                    then (-1)
-                                    else
-                                      if c <= 120596
-                                      then 0
-                                      else if c <= 120597 then (-1) else 0)
-                               else
-                                 if c <= 120629
-                                 then (-1)
-                                 else
-                                   if c <= 120686
-                                   then
-                                     (if c <= 120654
-                                      then 0
-                                      else if c <= 120655 then (-1) else 0)
-                                   else
-                                     if c <= 120687
-                                     then (-1)
-                                     else
-                                       if c <= 120712
-                                       then 0
-                                       else if c <= 120713 then (-1) else 0)
-                            else
-                              if c <= 120745
-                              then (-1)
-                              else
-                                if c <= 122634
-                                then
-                                  (if c <= 120779
-                                   then
-                                     (if c <= 120770
-                                      then 0
-                                      else if c <= 120771 then (-1) else 0)
-                                   else if c <= 122623 then (-1) else 0)
-                                else
-                                  if c <= 123180
-                                  then
-                                    (if c <= 122654
-                                     then 0
-                                     else if c <= 123135 then (-1) else 0)
-                                  else
-                                    if c <= 123190
-                                    then (-1)
-                                    else
-                                      if c <= 123197
-                                      then 0
-                                      else if c <= 123213 then (-1) else 0)
-                         else
-                           if c <= 123535
-                           then (-1)
-                           else
-                             if c <= 125251
-                             then
-                               (if c <= 124907
-                                then
-                                  (if c <= 123627
-                                   then
-                                     (if c <= 123565
-                                      then 0
-                                      else if c <= 123583 then (-1) else 0)
-                                   else
-                                     if c <= 124895
-                                     then (-1)
-                                     else
-                                       if c <= 124902
-                                       then 0
-                                       else if c <= 124903 then (-1) else 0)
-                                else
-                                  if c <= 124908
-                                  then (-1)
-                                  else
-                                    if c <= 124926
-                                    then
-                                      (if c <= 124910
-                                       then 0
-                                       else if c <= 124911 then (-1) else 0)
-                                    else
-                                      if c <= 124927
-                                      then (-1)
-                                      else
-                                        if c <= 125124
-                                        then 0
-                                        else if c <= 125183 then (-1) else 0)
-                             else
-                               if c <= 125258
-                               then (-1)
-                               else
-                                 if c <= 126498
-                                 then
-                                   (if c <= 126467
-                                    then
-                                      (if c <= 125259
-                                       then 0
-                                       else if c <= 126463 then (-1) else 0)
-                                    else
-                                      if c <= 126468
-                                      then (-1)
-                                      else
-                                        if c <= 126495
-                                        then 0
-                                        else if c <= 126496 then (-1) else 0)
-                                 else
-                                   if c <= 126499
-                                   then (-1)
-                                   else
-                                     if c <= 126503
-                                     then
-                                       (if c <= 126500
-                                        then 0
-                                        else if c <= 126502 then (-1) else 0)
-                                     else
-                                       if c <= 126504
-                                       then (-1)
-                                       else
-                                         if c <= 126514
-                                         then 0
-                                         else if c <= 126515 then (-1) else 0)
-                      else
-                        if c <= 126520
-                        then (-1)
-                        else
-                          if c <= 126564
-                          then
-                            (if c <= 126546
-                             then
-                               (if c <= 126535
-                                then
-                                  (if c <= 126523
-                                   then
-                                     (if c <= 126521
-                                      then 0
-                                      else if c <= 126522 then (-1) else 0)
-                                   else
-                                     if c <= 126529
-                                     then (-1)
-                                     else
-                                       if c <= 126530
-                                       then 0
-                                       else if c <= 126534 then (-1) else 0)
-                                else
-                                  if c <= 126536
-                                  then (-1)
-                                  else
-                                    if c <= 126539
-                                    then
-                                      (if c <= 126537
-                                       then 0
-                                       else if c <= 126538 then (-1) else 0)
-                                    else
-                                      if c <= 126540
-                                      then (-1)
-                                      else
-                                        if c <= 126543
-                                        then 0
-                                        else if c <= 126544 then (-1) else 0)
-                             else
-                               if c <= 126547
-                               then (-1)
-                               else
-                                 if c <= 126555
-                                 then
-                                   (if c <= 126551
-                                    then
-                                      (if c <= 126548
-                                       then 0
-                                       else if c <= 126550 then (-1) else 0)
-                                    else
-                                      if c <= 126552
-                                      then (-1)
-                                      else
-                                        if c <= 126553
-                                        then 0
-                                        else if c <= 126554 then (-1) else 0)
-                                 else
-                                   if c <= 126556
-                                   then (-1)
-                                   else
-                                     if c <= 126559
-                                     then
-                                       (if c <= 126557
-                                        then 0
-                                        else if c <= 126558 then (-1) else 0)
-                                     else
-                                       if c <= 126560
-                                       then (-1)
-                                       else
-                                         if c <= 126562
-                                         then 0
-                                         else if c <= 126563 then (-1) else 0)
-                          else
-                            if c <= 126566
-                            then (-1)
-                            else
-                              if c <= 126627
-                              then
-                                (if c <= 126588
-                                 then
-                                   (if c <= 126578
-                                    then
-                                      (if c <= 126570
-                                       then 0
-                                       else if c <= 126571 then (-1) else 0)
-                                    else
-                                      if c <= 126579
-                                      then (-1)
-                                      else
-                                        if c <= 126583
-                                        then 0
-                                        else if c <= 126584 then (-1) else 0)
-                                 else
-                                   if c <= 126589
-                                   then (-1)
-                                   else
-                                     if c <= 126601
-                                     then
-                                       (if c <= 126590
-                                        then 0
-                                        else if c <= 126591 then (-1) else 0)
-                                     else
-                                       if c <= 126602
-                                       then (-1)
-                                       else
-                                         if c <= 126619
-                                         then 0
-                                         else if c <= 126624 then (-1) else 0)
-                              else
-                                if c <= 126628
-                                then (-1)
-                                else
-                                  if c <= 177976
-                                  then
-                                    (if c <= 126651
-                                     then
-                                       (if c <= 126633
-                                        then 0
-                                        else if c <= 126634 then (-1) else 0)
-                                     else
-                                       if c <= 131071
-                                       then (-1)
-                                       else
-                                         if c <= 173791
-                                         then 0
-                                         else if c <= 173823 then (-1) else 0)
-                                  else
-                                    if c <= 177983
-                                    then (-1)
-                                    else
-                                      if c <= 183969
-                                      then
-                                        (if c <= 178205
-                                         then 0
-                                         else if c <= 178207 then (-1) else 0)
-                                      else
-                                        if c <= 183983
-                                        then (-1)
-                                        else
-                                          if c <= 191456
-                                          then 0
-                                          else
-                                            if c <= 194559 then (-1) else 0)
-                   else if c <= 196607 then (-1) else 0)
-        else (-1)
-let __sedlex_partition_83 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_65 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_128 c =
-  if c <= 106 then (-1) else if c <= 107 then 0 else (-1)
-let __sedlex_partition_14 c =
-  if c <= 13
-  then (Char.code (String.unsafe_get __sedlex_table_66 (c - (-1)))) - 1
-  else if c <= 8233 then (if c <= 8231 then 1 else 2) else 1
-let __sedlex_partition_46 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 95
-    then (Char.code (String.unsafe_get __sedlex_table_67 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_87 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_68 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_103 c =
-  if c <= 92
-  then (Char.code (String.unsafe_get __sedlex_table_69 (c - (-1)))) - 1
-  else if c <= 8233 then (if c <= 8231 then 1 else 2) else 1
-let __sedlex_partition_75 c =
-  if c <= 100 then (-1) else if c <= 101 then 0 else (-1)
-let __sedlex_partition_116 c =
-  if c <= 58 then (-1) else if c <= 59 then 0 else (-1)
-let __sedlex_partition_125 c =
-  if c <= 8
-  then (-1)
-  else
-    if c <= 5760
-    then (Char.code (String.unsafe_get __sedlex_table_70 (c - 9))) - 1
-    else
-      if c <= 8191
-      then (-1)
-      else
-        if c <= 65279
-        then
-          (if c <= 12288
-           then
-             (if c <= 8239
-              then (if c <= 8202 then 0 else if c <= 8238 then (-1) else 0)
-              else
-                if c <= 8286
-                then (-1)
-                else if c <= 8287 then 0 else if c <= 12287 then (-1) else 0)
-           else if c <= 65278 then (-1) else 0)
-        else (-1)
-let __sedlex_partition_61 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_71 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_108 c =
-  if c <= 41
-  then (-1)
-  else
-    if c <= 47
-    then (Char.code (String.unsafe_get __sedlex_table_72 (c - 42))) - 1
-    else (-1)
-let __sedlex_partition_81 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_73 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_126 c =
-  if c <= 8191
-  then (Char.code (String.unsafe_get __sedlex_table_74 (c - (-1)))) - 1
-  else
-    if c <= 194559
-    then
-      (if c <= 69599
-       then
-         (if c <= 43711
-          then
-            (if c <= 12703
-             then
-               (if c <= 11519
-                then
-                  (if c <= 8489
-                   then
-                     (if c <= 8454
-                      then
-                        (if c <= 8304
-                         then
-                           (if c <= 8238
-                            then
-                              (if c <= 8231
-                               then (if c <= 8202 then 2 else 1)
-                               else if c <= 8233 then 3 else 1)
-                            else
-                              if c <= 8286
-                              then (if c <= 8239 then 2 else 1)
-                              else if c <= 8287 then 2 else 1)
-                         else
-                           if c <= 8335
-                           then
-                             (if c <= 8318
-                              then (if c <= 8305 then 6 else 1)
-                              else if c <= 8319 then 6 else 1)
-                           else
-                             if c <= 8449
-                             then (if c <= 8348 then 6 else 1)
-                             else if c <= 8450 then 6 else 1)
-                      else
-                        if c <= 8477
-                        then
-                          (if c <= 8468
-                           then
-                             (if c <= 8457
-                              then (if c <= 8455 then 6 else 1)
-                              else if c <= 8467 then 6 else 1)
-                           else
-                             if c <= 8471
-                             then (if c <= 8469 then 6 else 1)
-                             else 6)
-                        else
-                          if c <= 8485
-                          then
-                            (if c <= 8483
-                             then 1
-                             else if c <= 8484 then 6 else 1)
-                          else
-                            if c <= 8487
-                            then (if c <= 8486 then 6 else 1)
-                            else if c <= 8488 then 6 else 1)
-                   else
-                     if c <= 8543
-                     then
-                       (if c <= 8505
-                        then 6
-                        else
-                          if c <= 8516
-                          then
-                            (if c <= 8507
-                             then 1
-                             else if c <= 8511 then 6 else 1)
-                          else
-                            if c <= 8525
-                            then (if c <= 8521 then 6 else 1)
-                            else if c <= 8526 then 6 else 1)
-                     else
-                       if c <= 11389
-                       then
-                         (if c <= 8584
-                          then 6
-                          else if c <= 11263 then 1 else 6)
-                       else
-                         if c <= 11498
-                         then (if c <= 11492 then 6 else 1)
-                         else
-                           if c <= 11505
-                           then (if c <= 11502 then 6 else 1)
-                           else if c <= 11507 then 6 else 1)
-                else
-                  if c <= 12294
-                  then
-                    (if c <= 11695
-                     then
-                       (if c <= 11630
-                        then
-                          (if c <= 11564
-                           then
-                             (if c <= 11558
-                              then (if c <= 11557 then 6 else 1)
-                              else if c <= 11559 then 6 else 1)
-                           else
-                             if c <= 11567
-                             then (if c <= 11565 then 6 else 1)
-                             else if c <= 11623 then 6 else 1)
-                        else
-                          if c <= 11679
-                          then
-                            (if c <= 11647
-                             then (if c <= 11631 then 6 else 1)
-                             else if c <= 11670 then 6 else 1)
-                          else
-                            if c <= 11687
-                            then (if c <= 11686 then 6 else 1)
-                            else if c <= 11694 then 6 else 1)
-                     else
-                       if c <= 11727
-                       then
-                         (if c <= 11711
-                          then
-                            (if c <= 11703
-                             then (if c <= 11702 then 6 else 1)
-                             else if c <= 11710 then 6 else 1)
-                          else
-                            if c <= 11719
-                            then (if c <= 11718 then 6 else 1)
-                            else if c <= 11726 then 6 else 1)
-                       else
-                         if c <= 12287
-                         then
-                           (if c <= 11735
-                            then (if c <= 11734 then 6 else 1)
-                            else if c <= 11742 then 6 else 1)
-                         else
-                           if c <= 12292
-                           then (if c <= 12288 then 2 else 1)
-                           else 6)
-                  else
-                    if c <= 12442
-                    then
-                      (if c <= 12343
-                       then
-                         (if c <= 12320
-                          then (if c <= 12295 then 6 else 1)
-                          else
-                            if c <= 12336
-                            then (if c <= 12329 then 6 else 1)
-                            else if c <= 12341 then 6 else 1)
-                       else
-                         if c <= 12348
-                         then 6
-                         else
-                           if c <= 12352
-                           then 1
-                           else if c <= 12438 then 6 else 1)
-                    else
-                      if c <= 12539
-                      then
-                        (if c <= 12447
-                         then 6
-                         else
-                           if c <= 12448
-                           then 1
-                           else if c <= 12538 then 6 else 1)
-                      else
-                        if c <= 12548
-                        then (if c <= 12543 then 6 else 1)
-                        else
-                          if c <= 12592
-                          then (if c <= 12591 then 6 else 1)
-                          else if c <= 12686 then 6 else 1)
-             else
-               if c <= 42999
-               then
-                 (if c <= 42653
-                  then
-                    (if c <= 42239
-                     then
-                       (if c <= 40981
-                        then
-                          (if c <= 13311
-                           then
-                             (if c <= 12783
-                              then (if c <= 12735 then 6 else 1)
-                              else if c <= 12799 then 6 else 1)
-                           else
-                             if c <= 19967
-                             then (if c <= 19903 then 6 else 1)
-                             else 6)
-                        else
-                          if c <= 42191
-                          then (if c <= 42124 then 6 else 1)
-                          else if c <= 42237 then 6 else 1)
-                     else
-                       if c <= 42559
-                       then
-                         (if c <= 42511
-                          then (if c <= 42508 then 6 else 1)
-                          else
-                            if c <= 42537
-                            then (if c <= 42527 then 6 else 1)
-                            else if c <= 42539 then 6 else 1)
-                       else
-                         if c <= 42622
-                         then (if c <= 42606 then 6 else 1)
-                         else 6)
-                  else
-                    if c <= 42890
-                    then
-                      (if c <= 42785
-                       then
-                         (if c <= 42735
-                          then (if c <= 42655 then 1 else 6)
-                          else
-                            if c <= 42774
-                            then 1
-                            else if c <= 42783 then 6 else 1)
-                       else
-                         if c <= 42887
-                         then 6
-                         else if c <= 42888 then 6 else 1)
-                    else
-                      if c <= 42962
-                      then
-                        (if c <= 42954
-                         then 6
-                         else
-                           if c <= 42959
-                           then 1
-                           else if c <= 42961 then 6 else 1)
-                      else
-                        if c <= 42993
-                        then
-                          (if c <= 42964
-                           then (if c <= 42963 then 6 else 1)
-                           else if c <= 42969 then 6 else 1)
-                        else 6)
-               else
-                 if c <= 43470
-                 then
-                   (if c <= 43137
-                    then
-                      (if c <= 43010
-                       then
-                         (if c <= 43002
-                          then 6
-                          else if c <= 43009 then 6 else 1)
-                       else
-                         if c <= 43019
-                         then
-                           (if c <= 43014
-                            then (if c <= 43013 then 6 else 1)
-                            else if c <= 43018 then 6 else 1)
-                         else
-                           if c <= 43071
-                           then (if c <= 43042 then 6 else 1)
-                           else if c <= 43123 then 6 else 1)
-                    else
-                      if c <= 43273
-                      then
-                        (if c <= 43258
-                         then
-                           (if c <= 43249
-                            then (if c <= 43187 then 6 else 1)
-                            else if c <= 43255 then 6 else 1)
-                         else
-                           if c <= 43260
-                           then (if c <= 43259 then 6 else 1)
-                           else if c <= 43262 then 6 else 1)
-                      else
-                        if c <= 43359
-                        then
-                          (if c <= 43311
-                           then (if c <= 43301 then 6 else 1)
-                           else if c <= 43334 then 6 else 1)
-                        else
-                          if c <= 43395
-                          then (if c <= 43388 then 6 else 1)
-                          else if c <= 43442 then 6 else 1)
-                 else
-                   if c <= 43615
-                   then
-                     (if c <= 43513
-                      then
-                        (if c <= 43493
-                         then
-                           (if c <= 43487
-                            then (if c <= 43471 then 6 else 1)
-                            else if c <= 43492 then 6 else 1)
-                         else if c <= 43503 then 6 else 1)
-                      else
-                        if c <= 43583
-                        then
-                          (if c <= 43519
-                           then (if c <= 43518 then 6 else 1)
-                           else if c <= 43560 then 6 else 1)
-                        else
-                          if c <= 43587
-                          then (if c <= 43586 then 6 else 1)
-                          else if c <= 43595 then 6 else 1)
-                   else
-                     if c <= 43645
-                     then
-                       (if c <= 43638
-                        then 6
-                        else
-                          if c <= 43641
-                          then 1
-                          else if c <= 43642 then 6 else 1)
-                     else
-                       if c <= 43700
-                       then
-                         (if c <= 43696
-                          then (if c <= 43695 then 6 else 1)
-                          else if c <= 43697 then 6 else 1)
-                       else
-                         if c <= 43704
-                         then (if c <= 43702 then 6 else 1)
-                         else if c <= 43709 then 6 else 1)
-          else
-            if c <= 66377
-            then
-              (if c <= 64325
-               then
-                 (if c <= 43887
-                  then
-                    (if c <= 43784
-                     then
-                       (if c <= 43743
-                        then
-                          (if c <= 43738
-                           then
-                             (if c <= 43713
-                              then (if c <= 43712 then 6 else 1)
-                              else if c <= 43714 then 6 else 1)
-                           else if c <= 43741 then 6 else 1)
-                        else
-                          if c <= 43764
-                          then
-                            (if c <= 43761
-                             then (if c <= 43754 then 6 else 1)
-                             else 6)
-                          else
-                            if c <= 43776
-                            then 1
-                            else if c <= 43782 then 6 else 1)
-                     else
-                       if c <= 43823
-                       then
-                         (if c <= 43807
-                          then
-                            (if c <= 43792
-                             then (if c <= 43790 then 6 else 1)
-                             else if c <= 43798 then 6 else 1)
-                          else
-                            if c <= 43815
-                            then (if c <= 43814 then 6 else 1)
-                            else if c <= 43822 then 6 else 1)
-                       else
-                         if c <= 43880
-                         then
-                           (if c <= 43867
-                            then (if c <= 43866 then 6 else 1)
-                            else 6)
-                         else if c <= 43881 then 6 else 1)
-                  else
-                    if c <= 64274
-                    then
-                      (if c <= 55242
-                       then
-                         (if c <= 44031
-                          then (if c <= 44002 then 6 else 1)
-                          else
-                            if c <= 55215
-                            then (if c <= 55203 then 6 else 1)
-                            else if c <= 55238 then 6 else 1)
-                       else
-                         if c <= 64111
-                         then
-                           (if c <= 63743
-                            then (if c <= 55291 then 6 else 1)
-                            else if c <= 64109 then 6 else 1)
-                         else
-                           if c <= 64255
-                           then (if c <= 64217 then 6 else 1)
-                           else if c <= 64262 then 6 else 1)
-                    else
-                      if c <= 64311
-                      then
-                        (if c <= 64286
-                         then
-                           (if c <= 64284
-                            then (if c <= 64279 then 6 else 1)
-                            else if c <= 64285 then 6 else 1)
-                         else
-                           if c <= 64297
-                           then (if c <= 64296 then 6 else 1)
-                           else if c <= 64310 then 6 else 1)
-                      else
-                        if c <= 64319
-                        then
-                          (if c <= 64317
-                           then (if c <= 64316 then 6 else 1)
-                           else if c <= 64318 then 6 else 1)
-                        else
-                          if c <= 64322
-                          then (if c <= 64321 then 6 else 1)
-                          else if c <= 64324 then 6 else 1)
-               else
-                 if c <= 65481
-                 then
-                   (if c <= 65312
-                    then
-                      (if c <= 65007
-                       then
-                         (if c <= 64847
-                          then
-                            (if c <= 64466
-                             then (if c <= 64433 then 6 else 1)
-                             else if c <= 64829 then 6 else 1)
-                          else
-                            if c <= 64913
-                            then (if c <= 64911 then 6 else 1)
-                            else if c <= 64967 then 6 else 1)
-                       else
-                         if c <= 65141
-                         then
-                           (if c <= 65135
-                            then (if c <= 65019 then 6 else 1)
-                            else if c <= 65140 then 6 else 1)
-                         else
-                           if c <= 65278
-                           then (if c <= 65276 then 6 else 1)
-                           else if c <= 65279 then 2 else 1)
-                    else
-                      if c <= 65437
-                      then
-                        (if c <= 65381
-                         then
-                           (if c <= 65344
-                            then (if c <= 65338 then 6 else 1)
-                            else if c <= 65370 then 6 else 1)
-                         else 6)
-                      else
-                        if c <= 65470
-                        then 6
-                        else
-                          if c <= 65473
-                          then 1
-                          else if c <= 65479 then 6 else 1)
-                 else
-                   if c <= 65615
-                   then
-                     (if c <= 65548
-                      then
-                        (if c <= 65497
-                         then
-                           (if c <= 65489
-                            then (if c <= 65487 then 6 else 1)
-                            else if c <= 65495 then 6 else 1)
-                         else
-                           if c <= 65535
-                           then (if c <= 65500 then 6 else 1)
-                           else if c <= 65547 then 6 else 1)
-                      else
-                        if c <= 65595
-                        then
-                          (if c <= 65575
-                           then (if c <= 65574 then 6 else 1)
-                           else if c <= 65594 then 6 else 1)
-                        else
-                          if c <= 65598
-                          then (if c <= 65597 then 6 else 1)
-                          else if c <= 65613 then 6 else 1)
-                   else
-                     if c <= 66207
-                     then
-                       (if c <= 65855
-                        then
-                          (if c <= 65663
-                           then (if c <= 65629 then 6 else 1)
-                           else if c <= 65786 then 6 else 1)
-                        else
-                          if c <= 66175
-                          then (if c <= 65908 then 6 else 1)
-                          else if c <= 66204 then 6 else 1)
-                     else
-                       if c <= 66348
-                       then
-                         (if c <= 66303
-                          then (if c <= 66256 then 6 else 1)
-                          else if c <= 66335 then 6 else 1)
-                       else 6)
-            else
-              if c <= 67646
-              then
-                (if c <= 66963
-                 then
-                   (if c <= 66717
-                    then
-                      (if c <= 66463
-                       then
-                         (if c <= 66383
-                          then (if c <= 66378 then 6 else 1)
-                          else
-                            if c <= 66431
-                            then (if c <= 66421 then 6 else 1)
-                            else if c <= 66461 then 6 else 1)
-                       else
-                         if c <= 66512
-                         then
-                           (if c <= 66503
-                            then (if c <= 66499 then 6 else 1)
-                            else if c <= 66511 then 6 else 1)
-                         else
-                           if c <= 66559
-                           then (if c <= 66517 then 6 else 1)
-                           else 6)
-                    else
-                      if c <= 66863
-                      then
-                        (if c <= 66775
-                         then
-                           (if c <= 66735
-                            then 1
-                            else if c <= 66771 then 6 else 1)
-                         else
-                           if c <= 66815
-                           then (if c <= 66811 then 6 else 1)
-                           else if c <= 66855 then 6 else 1)
-                      else
-                        if c <= 66939
-                        then
-                          (if c <= 66927
-                           then (if c <= 66915 then 6 else 1)
-                           else if c <= 66938 then 6 else 1)
-                        else
-                          if c <= 66955
-                          then (if c <= 66954 then 6 else 1)
-                          else if c <= 66962 then 6 else 1)
-                 else
-                   if c <= 67455
-                   then
-                     (if c <= 67002
-                      then
-                        (if c <= 66978
-                         then
-                           (if c <= 66966
-                            then (if c <= 66965 then 6 else 1)
-                            else if c <= 66977 then 6 else 1)
-                         else
-                           if c <= 66994
-                           then (if c <= 66993 then 6 else 1)
-                           else if c <= 67001 then 6 else 1)
-                      else
-                        if c <= 67391
-                        then
-                          (if c <= 67071
-                           then (if c <= 67004 then 6 else 1)
-                           else if c <= 67382 then 6 else 1)
-                        else
-                          if c <= 67423
-                          then (if c <= 67413 then 6 else 1)
-                          else if c <= 67431 then 6 else 1)
-                   else
-                     if c <= 67591
-                     then
-                       (if c <= 67505
-                        then
-                          (if c <= 67462
-                           then (if c <= 67461 then 6 else 1)
-                           else if c <= 67504 then 6 else 1)
-                        else
-                          if c <= 67583
-                          then (if c <= 67514 then 6 else 1)
-                          else if c <= 67589 then 6 else 1)
-                     else
-                       if c <= 67638
-                       then
-                         (if c <= 67593
-                          then (if c <= 67592 then 6 else 1)
-                          else if c <= 67637 then 6 else 1)
-                       else
-                         if c <= 67643
-                         then (if c <= 67640 then 6 else 1)
-                         else if c <= 67644 then 6 else 1)
-              else
-                if c <= 68296
-                then
-                  (if c <= 68029
-                   then
-                     (if c <= 67827
-                      then
-                        (if c <= 67711
-                         then
-                           (if c <= 67679
-                            then (if c <= 67669 then 6 else 1)
-                            else if c <= 67702 then 6 else 1)
-                         else
-                           if c <= 67807
-                           then (if c <= 67742 then 6 else 1)
-                           else if c <= 67826 then 6 else 1)
-                      else
-                        if c <= 67871
-                        then
-                          (if c <= 67839
-                           then (if c <= 67829 then 6 else 1)
-                           else if c <= 67861 then 6 else 1)
-                        else
-                          if c <= 67967
-                          then (if c <= 67897 then 6 else 1)
-                          else if c <= 68023 then 6 else 1)
-                   else
-                     if c <= 68120
-                     then
-                       (if c <= 68111
-                        then
-                          (if c <= 68095
-                           then (if c <= 68031 then 6 else 1)
-                           else if c <= 68096 then 6 else 1)
-                        else
-                          if c <= 68116
-                          then (if c <= 68115 then 6 else 1)
-                          else if c <= 68119 then 6 else 1)
-                     else
-                       if c <= 68223
-                       then
-                         (if c <= 68191
-                          then (if c <= 68149 then 6 else 1)
-                          else if c <= 68220 then 6 else 1)
-                       else
-                         if c <= 68287
-                         then (if c <= 68252 then 6 else 1)
-                         else if c <= 68295 then 6 else 1)
-                else
-                  if c <= 68863
-                  then
-                    (if c <= 68479
-                     then
-                       (if c <= 68415
-                        then
-                          (if c <= 68351
-                           then (if c <= 68324 then 6 else 1)
-                           else if c <= 68405 then 6 else 1)
-                        else
-                          if c <= 68447
-                          then (if c <= 68437 then 6 else 1)
-                          else if c <= 68466 then 6 else 1)
-                     else
-                       if c <= 68735
-                       then
-                         (if c <= 68607
-                          then (if c <= 68497 then 6 else 1)
-                          else if c <= 68680 then 6 else 1)
-                       else
-                         if c <= 68799
-                         then (if c <= 68786 then 6 else 1)
-                         else if c <= 68850 then 6 else 1)
-                  else
-                    if c <= 69414
-                    then
-                      (if c <= 69295
-                       then
-                         (if c <= 69247
-                          then (if c <= 68899 then 6 else 1)
-                          else if c <= 69289 then 6 else 1)
-                       else
-                         if c <= 69375
-                         then (if c <= 69297 then 6 else 1)
-                         else if c <= 69404 then 6 else 1)
-                    else
-                      if c <= 69487
-                      then
-                        (if c <= 69423
-                         then (if c <= 69415 then 6 else 1)
-                         else if c <= 69445 then 6 else 1)
-                      else
-                        if c <= 69551
-                        then (if c <= 69505 then 6 else 1)
-                        else if c <= 69572 then 6 else 1)
-       else
-         if c <= 120122
-         then
-           (if c <= 72348
-            then
-              (if c <= 70655
-               then
-                 (if c <= 70162
-                  then
-                    (if c <= 69958
-                     then
-                       (if c <= 69762
-                        then
-                          (if c <= 69744
-                           then
-                             (if c <= 69634
-                              then (if c <= 69622 then 6 else 1)
-                              else if c <= 69687 then 6 else 1)
-                           else
-                             if c <= 69748
-                             then (if c <= 69746 then 6 else 1)
-                             else if c <= 69749 then 6 else 1)
-                        else
-                          if c <= 69890
-                          then
-                            (if c <= 69839
-                             then (if c <= 69807 then 6 else 1)
-                             else if c <= 69864 then 6 else 1)
-                          else
-                            if c <= 69955
-                            then (if c <= 69926 then 6 else 1)
-                            else if c <= 69956 then 6 else 1)
-                     else
-                       if c <= 70080
-                       then
-                         (if c <= 70005
-                          then
-                            (if c <= 69967
-                             then (if c <= 69959 then 6 else 1)
-                             else if c <= 70002 then 6 else 1)
-                          else
-                            if c <= 70018
-                            then (if c <= 70006 then 6 else 1)
-                            else if c <= 70066 then 6 else 1)
-                       else
-                         if c <= 70107
-                         then
-                           (if c <= 70105
-                            then (if c <= 70084 then 6 else 1)
-                            else if c <= 70106 then 6 else 1)
-                         else
-                           if c <= 70143
-                           then (if c <= 70108 then 6 else 1)
-                           else if c <= 70161 then 6 else 1)
-                  else
-                    if c <= 70414
-                    then
-                      (if c <= 70286
-                       then
-                         (if c <= 70279
-                          then
-                            (if c <= 70271
-                             then (if c <= 70187 then 6 else 1)
-                             else if c <= 70278 then 6 else 1)
-                          else
-                            if c <= 70281
-                            then (if c <= 70280 then 6 else 1)
-                            else if c <= 70285 then 6 else 1)
-                       else
-                         if c <= 70319
-                         then
-                           (if c <= 70302
-                            then (if c <= 70301 then 6 else 1)
-                            else if c <= 70312 then 6 else 1)
-                         else
-                           if c <= 70404
-                           then (if c <= 70366 then 6 else 1)
-                           else if c <= 70412 then 6 else 1)
-                    else
-                      if c <= 70452
-                      then
-                        (if c <= 70441
-                         then
-                           (if c <= 70418
-                            then (if c <= 70416 then 6 else 1)
-                            else if c <= 70440 then 6 else 1)
-                         else
-                           if c <= 70449
-                           then (if c <= 70448 then 6 else 1)
-                           else if c <= 70451 then 6 else 1)
-                      else
-                        if c <= 70479
-                        then
-                          (if c <= 70460
-                           then (if c <= 70457 then 6 else 1)
-                           else if c <= 70461 then 6 else 1)
-                        else
-                          if c <= 70492
-                          then (if c <= 70480 then 6 else 1)
-                          else if c <= 70497 then 6 else 1)
-               else
-                 if c <= 71934
-                 then
-                   (if c <= 71167
-                    then
-                      (if c <= 70851
-                       then
-                         (if c <= 70750
-                          then
-                            (if c <= 70726
-                             then (if c <= 70708 then 6 else 1)
-                             else if c <= 70730 then 6 else 1)
-                          else
-                            if c <= 70783
-                            then (if c <= 70753 then 6 else 1)
-                            else if c <= 70831 then 6 else 1)
-                       else
-                         if c <= 71039
-                         then
-                           (if c <= 70854
-                            then (if c <= 70853 then 6 else 1)
-                            else if c <= 70855 then 6 else 1)
-                         else
-                           if c <= 71127
-                           then (if c <= 71086 then 6 else 1)
-                           else if c <= 71131 then 6 else 1)
-                    else
-                      if c <= 71423
-                      then
-                        (if c <= 71295
-                         then
-                           (if c <= 71235
-                            then (if c <= 71215 then 6 else 1)
-                            else if c <= 71236 then 6 else 1)
-                         else
-                           if c <= 71351
-                           then (if c <= 71338 then 6 else 1)
-                           else if c <= 71352 then 6 else 1)
-                      else
-                        if c <= 71679
-                        then
-                          (if c <= 71487
-                           then (if c <= 71450 then 6 else 1)
-                           else if c <= 71494 then 6 else 1)
-                        else
-                          if c <= 71839
-                          then (if c <= 71723 then 6 else 1)
-                          else if c <= 71903 then 6 else 1)
-                 else
-                   if c <= 72105
-                   then
-                     (if c <= 71959
-                      then
-                        (if c <= 71947
-                         then
-                           (if c <= 71944
-                            then (if c <= 71942 then 6 else 1)
-                            else if c <= 71945 then 6 else 1)
-                         else
-                           if c <= 71956
-                           then (if c <= 71955 then 6 else 1)
-                           else if c <= 71958 then 6 else 1)
-                      else
-                        if c <= 72000
-                        then
-                          (if c <= 71998
-                           then (if c <= 71983 then 6 else 1)
-                           else if c <= 71999 then 6 else 1)
-                        else
-                          if c <= 72095
-                          then (if c <= 72001 then 6 else 1)
-                          else if c <= 72103 then 6 else 1)
-                   else
-                     if c <= 72202
-                     then
-                       (if c <= 72162
-                        then
-                          (if c <= 72160
-                           then (if c <= 72144 then 6 else 1)
-                           else if c <= 72161 then 6 else 1)
-                        else
-                          if c <= 72191
-                          then (if c <= 72163 then 6 else 1)
-                          else if c <= 72192 then 6 else 1)
-                     else
-                       if c <= 72271
-                       then
-                         (if c <= 72249
-                          then (if c <= 72242 then 6 else 1)
-                          else if c <= 72250 then 6 else 1)
-                       else
-                         if c <= 72283
-                         then (if c <= 72272 then 6 else 1)
-                         else if c <= 72329 then 6 else 1)
-            else
-              if c <= 94031
-              then
-                (if c <= 73727
-                 then
-                   (if c <= 72970
-                    then
-                      (if c <= 72767
-                       then
-                         (if c <= 72703
-                          then
-                            (if c <= 72367
-                             then (if c <= 72349 then 6 else 1)
-                             else if c <= 72440 then 6 else 1)
-                          else
-                            if c <= 72713
-                            then (if c <= 72712 then 6 else 1)
-                            else if c <= 72750 then 6 else 1)
-                       else
-                         if c <= 72959
-                         then
-                           (if c <= 72817
-                            then (if c <= 72768 then 6 else 1)
-                            else if c <= 72847 then 6 else 1)
-                         else
-                           if c <= 72967
-                           then (if c <= 72966 then 6 else 1)
-                           else if c <= 72969 then 6 else 1)
-                    else
-                      if c <= 73065
-                      then
-                        (if c <= 73055
-                         then
-                           (if c <= 73029
-                            then (if c <= 73008 then 6 else 1)
-                            else if c <= 73030 then 6 else 1)
-                         else
-                           if c <= 73062
-                           then (if c <= 73061 then 6 else 1)
-                           else if c <= 73064 then 6 else 1)
-                      else
-                        if c <= 73439
-                        then
-                          (if c <= 73111
-                           then (if c <= 73097 then 6 else 1)
-                           else if c <= 73112 then 6 else 1)
-                        else
-                          if c <= 73647
-                          then (if c <= 73458 then 6 else 1)
-                          else if c <= 73648 then 6 else 1)
-                 else
-                   if c <= 92783
-                   then
-                     (if c <= 77823
-                      then
-                        (if c <= 74879
-                         then
-                           (if c <= 74751
-                            then (if c <= 74649 then 6 else 1)
-                            else if c <= 74862 then 6 else 1)
-                         else
-                           if c <= 77711
-                           then (if c <= 75075 then 6 else 1)
-                           else if c <= 77808 then 6 else 1)
-                      else
-                        if c <= 92159
-                        then
-                          (if c <= 82943
-                           then (if c <= 78894 then 6 else 1)
-                           else if c <= 83526 then 6 else 1)
-                        else
-                          if c <= 92735
-                          then (if c <= 92728 then 6 else 1)
-                          else if c <= 92766 then 6 else 1)
-                   else
-                     if c <= 93026
-                     then
-                       (if c <= 92927
-                        then
-                          (if c <= 92879
-                           then (if c <= 92862 then 6 else 1)
-                           else if c <= 92909 then 6 else 1)
-                        else
-                          if c <= 92991
-                          then (if c <= 92975 then 6 else 1)
-                          else if c <= 92995 then 6 else 1)
-                     else
-                       if c <= 93759
-                       then
-                         (if c <= 93052
-                          then (if c <= 93047 then 6 else 1)
-                          else if c <= 93071 then 6 else 1)
-                       else
-                         if c <= 93951
-                         then (if c <= 93823 then 6 else 1)
-                         else if c <= 94026 then 6 else 1)
-              else
-                if c <= 113791
-                then
-                  (if c <= 110580
-                   then
-                     (if c <= 94207
-                      then
-                        (if c <= 94175
-                         then
-                           (if c <= 94098
-                            then (if c <= 94032 then 6 else 1)
-                            else if c <= 94111 then 6 else 1)
-                         else
-                           if c <= 94178
-                           then (if c <= 94177 then 6 else 1)
-                           else if c <= 94179 then 6 else 1)
-                      else
-                        if c <= 101631
-                        then
-                          (if c <= 100351
-                           then (if c <= 100343 then 6 else 1)
-                           else if c <= 101589 then 6 else 1)
-                        else
-                          if c <= 110575
-                          then (if c <= 101640 then 6 else 1)
-                          else if c <= 110579 then 6 else 1)
-                   else
-                     if c <= 110947
-                     then
-                       (if c <= 110591
-                        then
-                          (if c <= 110588
-                           then (if c <= 110587 then 6 else 1)
-                           else if c <= 110590 then 6 else 1)
-                        else
-                          if c <= 110927
-                          then (if c <= 110882 then 6 else 1)
-                          else if c <= 110930 then 6 else 1)
-                     else
-                       if c <= 113663
-                       then
-                         (if c <= 110959
-                          then (if c <= 110951 then 6 else 1)
-                          else if c <= 111355 then 6 else 1)
-                       else
-                         if c <= 113775
-                         then (if c <= 113770 then 6 else 1)
-                         else if c <= 113788 then 6 else 1)
-                else
-                  if c <= 119981
-                  then
-                    (if c <= 119965
-                     then
-                       (if c <= 119807
-                        then
-                          (if c <= 113807
-                           then (if c <= 113800 then 6 else 1)
-                           else if c <= 113817 then 6 else 1)
-                        else
-                          if c <= 119893
-                          then (if c <= 119892 then 6 else 1)
-                          else if c <= 119964 then 6 else 1)
-                     else
-                       if c <= 119972
-                       then
-                         (if c <= 119969
-                          then (if c <= 119967 then 6 else 1)
-                          else if c <= 119970 then 6 else 1)
-                       else
-                         if c <= 119976
-                         then (if c <= 119974 then 6 else 1)
-                         else if c <= 119980 then 6 else 1)
-                  else
-                    if c <= 120070
-                    then
-                      (if c <= 119996
-                       then
-                         (if c <= 119994
-                          then (if c <= 119993 then 6 else 1)
-                          else if c <= 119995 then 6 else 1)
-                       else
-                         if c <= 120004
-                         then (if c <= 120003 then 6 else 1)
-                         else if c <= 120069 then 6 else 1)
-                    else
-                      if c <= 120085
-                      then
-                        (if c <= 120076
-                         then (if c <= 120074 then 6 else 1)
-                         else if c <= 120084 then 6 else 1)
-                      else
-                        if c <= 120093
-                        then (if c <= 120092 then 6 else 1)
-                        else if c <= 120121 then 6 else 1)
-         else
-           if c <= 131071
-           then
-             (if c <= 126468
-              then
-                (if c <= 122623
-                 then
-                   (if c <= 120571
-                    then
-                      (if c <= 120145
-                       then
-                         (if c <= 120133
-                          then
-                            (if c <= 120127
-                             then (if c <= 120126 then 6 else 1)
-                             else if c <= 120132 then 6 else 1)
-                          else
-                            if c <= 120137
-                            then (if c <= 120134 then 6 else 1)
-                            else if c <= 120144 then 6 else 1)
-                       else
-                         if c <= 120513
-                         then
-                           (if c <= 120487
-                            then (if c <= 120485 then 6 else 1)
-                            else if c <= 120512 then 6 else 1)
-                         else
-                           if c <= 120539
-                           then (if c <= 120538 then 6 else 1)
-                           else if c <= 120570 then 6 else 1)
-                    else
-                      if c <= 120687
-                      then
-                        (if c <= 120629
-                         then
-                           (if c <= 120597
-                            then (if c <= 120596 then 6 else 1)
-                            else if c <= 120628 then 6 else 1)
-                         else
-                           if c <= 120655
-                           then (if c <= 120654 then 6 else 1)
-                           else if c <= 120686 then 6 else 1)
-                      else
-                        if c <= 120745
-                        then
-                          (if c <= 120713
-                           then (if c <= 120712 then 6 else 1)
-                           else if c <= 120744 then 6 else 1)
-                        else
-                          if c <= 120771
-                          then (if c <= 120770 then 6 else 1)
-                          else if c <= 120779 then 6 else 1)
-                 else
-                   if c <= 124895
-                   then
-                     (if c <= 123190
-                      then
-                        (if c <= 122654
-                         then 6
-                         else
-                           if c <= 123135
-                           then 1
-                           else if c <= 123180 then 6 else 1)
-                      else
-                        if c <= 123535
-                        then
-                          (if c <= 123213
-                           then (if c <= 123197 then 6 else 1)
-                           else if c <= 123214 then 6 else 1)
-                        else
-                          if c <= 123583
-                          then (if c <= 123565 then 6 else 1)
-                          else if c <= 123627 then 6 else 1)
-                   else
-                     if c <= 124927
-                     then
-                       (if c <= 124908
-                        then
-                          (if c <= 124903
-                           then (if c <= 124902 then 6 else 1)
-                           else if c <= 124907 then 6 else 1)
-                        else
-                          if c <= 124911
-                          then (if c <= 124910 then 6 else 1)
-                          else if c <= 124926 then 6 else 1)
-                     else
-                       if c <= 125258
-                       then
-                         (if c <= 125183
-                          then (if c <= 125124 then 6 else 1)
-                          else if c <= 125251 then 6 else 1)
-                       else
-                         if c <= 126463
-                         then (if c <= 125259 then 6 else 1)
-                         else if c <= 126467 then 6 else 1)
-              else
-                if c <= 126552
-                then
-                  (if c <= 126529
-                   then
-                     (if c <= 126504
-                      then
-                        (if c <= 126499
-                         then
-                           (if c <= 126496
-                            then (if c <= 126495 then 6 else 1)
-                            else if c <= 126498 then 6 else 1)
-                         else
-                           if c <= 126502
-                           then (if c <= 126500 then 6 else 1)
-                           else if c <= 126503 then 6 else 1)
-                      else
-                        if c <= 126520
-                        then
-                          (if c <= 126515
-                           then (if c <= 126514 then 6 else 1)
-                           else if c <= 126519 then 6 else 1)
-                        else
-                          if c <= 126522
-                          then (if c <= 126521 then 6 else 1)
-                          else if c <= 126523 then 6 else 1)
-                   else
-                     if c <= 126540
-                     then
-                       (if c <= 126536
-                        then
-                          (if c <= 126534
-                           then (if c <= 126530 then 6 else 1)
-                           else if c <= 126535 then 6 else 1)
-                        else
-                          if c <= 126538
-                          then (if c <= 126537 then 6 else 1)
-                          else if c <= 126539 then 6 else 1)
-                     else
-                       if c <= 126547
-                       then
-                         (if c <= 126544
-                          then (if c <= 126543 then 6 else 1)
-                          else if c <= 126546 then 6 else 1)
-                       else
-                         if c <= 126550
-                         then (if c <= 126548 then 6 else 1)
-                         else if c <= 126551 then 6 else 1)
-                else
-                  if c <= 126579
-                  then
-                    (if c <= 126560
-                     then
-                       (if c <= 126556
-                        then
-                          (if c <= 126554
-                           then (if c <= 126553 then 6 else 1)
-                           else if c <= 126555 then 6 else 1)
-                        else
-                          if c <= 126558
-                          then (if c <= 126557 then 6 else 1)
-                          else if c <= 126559 then 6 else 1)
-                     else
-                       if c <= 126566
-                       then
-                         (if c <= 126563
-                          then (if c <= 126562 then 6 else 1)
-                          else if c <= 126564 then 6 else 1)
-                       else
-                         if c <= 126571
-                         then (if c <= 126570 then 6 else 1)
-                         else if c <= 126578 then 6 else 1)
-                  else
-                    if c <= 126602
-                    then
-                      (if c <= 126589
-                       then
-                         (if c <= 126584
-                          then (if c <= 126583 then 6 else 1)
-                          else if c <= 126588 then 6 else 1)
-                       else
-                         if c <= 126591
-                         then (if c <= 126590 then 6 else 1)
-                         else if c <= 126601 then 6 else 1)
-                    else
-                      if c <= 126628
-                      then
-                        (if c <= 126624
-                         then (if c <= 126619 then 6 else 1)
-                         else if c <= 126627 then 6 else 1)
-                      else
-                        if c <= 126634
-                        then (if c <= 126633 then 6 else 1)
-                        else if c <= 126651 then 6 else 1)
-           else
-             if c <= 183983
-             then
-               (if c <= 177983
-                then
-                  (if c <= 173823
-                   then (if c <= 173791 then 6 else 1)
-                   else if c <= 177976 then 6 else 1)
-                else
-                  if c <= 178207
-                  then (if c <= 178205 then 6 else 1)
-                  else if c <= 183969 then 6 else 1)
-             else if c <= 191456 then 6 else 1)
-    else (-1)
-let __sedlex_partition_78 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_75 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_119 c =
-  if c <= (-1)
-  then (-1)
-  else
-    if c <= 8191
-    then (Char.code (String.unsafe_get __sedlex_table_76 c)) - 1
-    else
-      if c <= 12287
-      then
-        (if c <= 8238
-         then
-           (if c <= 8231
-            then (if c <= 8202 then 1 else 0)
-            else if c <= 8233 then 2 else 0)
-         else
-           if c <= 8286
-           then (if c <= 8239 then 1 else 0)
-           else if c <= 8287 then 1 else 0)
-      else
-        if c <= 65278
-        then (if c <= 12288 then 1 else 0)
-        else if c <= 65279 then 1 else 0
-let __sedlex_partition_69 c =
-  if c <= 118 then (-1) else if c <= 119 then 0 else (-1)
-let __sedlex_partition_85 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_77 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_100 c =
-  if c <= 93
-  then (Char.code (String.unsafe_get __sedlex_table_78 (c - (-1)))) - 1
-  else if c <= 8233 then (if c <= 8231 then 1 else 2) else 1
-let __sedlex_partition_118 c =
-  if c <= 123
-  then (Char.code (String.unsafe_get __sedlex_table_79 (c - (-1)))) - 1
-  else if c <= 8233 then (if c <= 8231 then 1 else 2) else 1
-let __sedlex_partition_32 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 57
-    then (Char.code (String.unsafe_get __sedlex_table_80 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_38 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 101
-    then (Char.code (String.unsafe_get __sedlex_table_81 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_39 c =
-  if c <= 42
-  then (-1)
-  else
-    if c <= 57
-    then (Char.code (String.unsafe_get __sedlex_table_82 (c - 43))) - 1
-    else (-1)
-let __sedlex_partition_109 c =
-  if c <= 125
-  then (Char.code (String.unsafe_get __sedlex_table_83 (c - (-1)))) - 1
-  else if c <= 8233 then (if c <= 8231 then 1 else 2) else 1
-let __sedlex_partition_1 c =
-  if c <= 122
-  then (Char.code (String.unsafe_get __sedlex_table_84 (c - (-1)))) - 1
-  else 1
-let __sedlex_partition_6 c =
-  if c <= 122
-  then (Char.code (String.unsafe_get __sedlex_table_85 (c - (-1)))) - 1
-  else 1
-let __sedlex_partition_12 c =
-  if c <= 44
-  then (-1)
-  else
-    if c <= 47
-    then (Char.code (String.unsafe_get __sedlex_table_86 (c - 45))) - 1
-    else (-1)
-let __sedlex_partition_114 c =
-  if c <= 47
-  then (-1)
-  else
-    if c <= 102
-    then (Char.code (String.unsafe_get __sedlex_table_87 (c - 48))) - 1
-    else (-1)
-let __sedlex_partition_49 c =
-  if c <= 62 then (-1) else if c <= 63 then 0 else (-1)
-let __sedlex_partition_48 c =
-  if c <= 45
-  then (-1)
-  else
-    if c <= 95
-    then (Char.code (String.unsafe_get __sedlex_table_88 (c - 46))) - 1
-    else (-1)
-let __sedlex_partition_2 c =
-  if c <= 116 then (-1) else if c <= 117 then 0 else (-1)
-let __sedlex_partition_13 c =
-  if c <= 46 then (-1) else if c <= 47 then 0 else (-1)
-let __sedlex_partition_66 c =
-  if c <= 57 then (-1) else if c <= 58 then 0 else (-1)
-let __sedlex_partition_60 c =
-  if c <= 35
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_89 (c - 36))) - 1
-    else (-1)
-let __sedlex_partition_111 c =
-  if c <= 34
-  then (-1)
-  else
-    if c <= 122
-    then (Char.code (String.unsafe_get __sedlex_table_90 (c - 35))) - 1
-    else (-1)
-let __sedlex_partition_117 c =
-  if c <= 8191
-  then (Char.code (String.unsafe_get __sedlex_table_91 (c - (-1)))) - 1
-  else
-    if c <= 194559
-    then
-      (if c <= 69599
-       then
-         (if c <= 43711
-          then
-            (if c <= 12703
-             then
-               (if c <= 11519
-                then
-                  (if c <= 8489
-                   then
-                     (if c <= 8454
-                      then
-                        (if c <= 8304
-                         then
-                           (if c <= 8238
-                            then
-                              (if c <= 8231
-                               then (if c <= 8202 then 2 else 1)
-                               else if c <= 8233 then 3 else 1)
-                            else
-                              if c <= 8286
-                              then (if c <= 8239 then 2 else 1)
-                              else if c <= 8287 then 2 else 1)
-                         else
-                           if c <= 8335
-                           then
-                             (if c <= 8318
-                              then (if c <= 8305 then 6 else 1)
-                              else if c <= 8319 then 6 else 1)
-                           else
-                             if c <= 8449
-                             then (if c <= 8348 then 6 else 1)
-                             else if c <= 8450 then 6 else 1)
-                      else
-                        if c <= 8477
-                        then
-                          (if c <= 8468
-                           then
-                             (if c <= 8457
-                              then (if c <= 8455 then 6 else 1)
-                              else if c <= 8467 then 6 else 1)
-                           else
-                             if c <= 8471
-                             then (if c <= 8469 then 6 else 1)
-                             else 6)
-                        else
-                          if c <= 8485
-                          then
-                            (if c <= 8483
-                             then 1
-                             else if c <= 8484 then 6 else 1)
-                          else
-                            if c <= 8487
-                            then (if c <= 8486 then 6 else 1)
-                            else if c <= 8488 then 6 else 1)
-                   else
-                     if c <= 8543
-                     then
-                       (if c <= 8505
-                        then 6
-                        else
-                          if c <= 8516
-                          then
-                            (if c <= 8507
-                             then 1
-                             else if c <= 8511 then 6 else 1)
-                          else
-                            if c <= 8525
-                            then (if c <= 8521 then 6 else 1)
-                            else if c <= 8526 then 6 else 1)
-                     else
-                       if c <= 11389
-                       then
-                         (if c <= 8584
-                          then 6
-                          else if c <= 11263 then 1 else 6)
-                       else
-                         if c <= 11498
-                         then (if c <= 11492 then 6 else 1)
-                         else
-                           if c <= 11505
-                           then (if c <= 11502 then 6 else 1)
-                           else if c <= 11507 then 6 else 1)
-                else
-                  if c <= 12294
-                  then
-                    (if c <= 11695
-                     then
-                       (if c <= 11630
-                        then
-                          (if c <= 11564
-                           then
-                             (if c <= 11558
-                              then (if c <= 11557 then 6 else 1)
-                              else if c <= 11559 then 6 else 1)
-                           else
-                             if c <= 11567
-                             then (if c <= 11565 then 6 else 1)
-                             else if c <= 11623 then 6 else 1)
-                        else
-                          if c <= 11679
-                          then
-                            (if c <= 11647
-                             then (if c <= 11631 then 6 else 1)
-                             else if c <= 11670 then 6 else 1)
-                          else
-                            if c <= 11687
-                            then (if c <= 11686 then 6 else 1)
-                            else if c <= 11694 then 6 else 1)
-                     else
-                       if c <= 11727
-                       then
-                         (if c <= 11711
-                          then
-                            (if c <= 11703
-                             then (if c <= 11702 then 6 else 1)
-                             else if c <= 11710 then 6 else 1)
-                          else
-                            if c <= 11719
-                            then (if c <= 11718 then 6 else 1)
-                            else if c <= 11726 then 6 else 1)
-                       else
-                         if c <= 12287
-                         then
-                           (if c <= 11735
-                            then (if c <= 11734 then 6 else 1)
-                            else if c <= 11742 then 6 else 1)
-                         else
-                           if c <= 12292
-                           then (if c <= 12288 then 2 else 1)
-                           else 6)
-                  else
-                    if c <= 12442
-                    then
-                      (if c <= 12343
-                       then
-                         (if c <= 12320
-                          then (if c <= 12295 then 6 else 1)
-                          else
-                            if c <= 12336
-                            then (if c <= 12329 then 6 else 1)
-                            else if c <= 12341 then 6 else 1)
-                       else
-                         if c <= 12348
-                         then 6
-                         else
-                           if c <= 12352
-                           then 1
-                           else if c <= 12438 then 6 else 1)
-                    else
-                      if c <= 12539
-                      then
-                        (if c <= 12447
-                         then 6
-                         else
-                           if c <= 12448
-                           then 1
-                           else if c <= 12538 then 6 else 1)
-                      else
-                        if c <= 12548
-                        then (if c <= 12543 then 6 else 1)
-                        else
-                          if c <= 12592
-                          then (if c <= 12591 then 6 else 1)
-                          else if c <= 12686 then 6 else 1)
-             else
-               if c <= 42999
-               then
-                 (if c <= 42653
-                  then
-                    (if c <= 42239
-                     then
-                       (if c <= 40981
-                        then
-                          (if c <= 13311
-                           then
-                             (if c <= 12783
-                              then (if c <= 12735 then 6 else 1)
-                              else if c <= 12799 then 6 else 1)
-                           else
-                             if c <= 19967
-                             then (if c <= 19903 then 6 else 1)
-                             else 6)
-                        else
-                          if c <= 42191
-                          then (if c <= 42124 then 6 else 1)
-                          else if c <= 42237 then 6 else 1)
-                     else
-                       if c <= 42559
-                       then
-                         (if c <= 42511
-                          then (if c <= 42508 then 6 else 1)
-                          else
-                            if c <= 42537
-                            then (if c <= 42527 then 6 else 1)
-                            else if c <= 42539 then 6 else 1)
-                       else
-                         if c <= 42622
-                         then (if c <= 42606 then 6 else 1)
-                         else 6)
-                  else
-                    if c <= 42890
-                    then
-                      (if c <= 42785
-                       then
-                         (if c <= 42735
-                          then (if c <= 42655 then 1 else 6)
-                          else
-                            if c <= 42774
-                            then 1
-                            else if c <= 42783 then 6 else 1)
-                       else
-                         if c <= 42887
-                         then 6
-                         else if c <= 42888 then 6 else 1)
-                    else
-                      if c <= 42962
-                      then
-                        (if c <= 42954
-                         then 6
-                         else
-                           if c <= 42959
-                           then 1
-                           else if c <= 42961 then 6 else 1)
-                      else
-                        if c <= 42993
-                        then
-                          (if c <= 42964
-                           then (if c <= 42963 then 6 else 1)
-                           else if c <= 42969 then 6 else 1)
-                        else 6)
-               else
-                 if c <= 43470
-                 then
-                   (if c <= 43137
-                    then
-                      (if c <= 43010
-                       then
-                         (if c <= 43002
-                          then 6
-                          else if c <= 43009 then 6 else 1)
-                       else
-                         if c <= 43019
-                         then
-                           (if c <= 43014
-                            then (if c <= 43013 then 6 else 1)
-                            else if c <= 43018 then 6 else 1)
-                         else
-                           if c <= 43071
-                           then (if c <= 43042 then 6 else 1)
-                           else if c <= 43123 then 6 else 1)
-                    else
-                      if c <= 43273
-                      then
-                        (if c <= 43258
-                         then
-                           (if c <= 43249
-                            then (if c <= 43187 then 6 else 1)
-                            else if c <= 43255 then 6 else 1)
-                         else
-                           if c <= 43260
-                           then (if c <= 43259 then 6 else 1)
-                           else if c <= 43262 then 6 else 1)
-                      else
-                        if c <= 43359
-                        then
-                          (if c <= 43311
-                           then (if c <= 43301 then 6 else 1)
-                           else if c <= 43334 then 6 else 1)
-                        else
-                          if c <= 43395
-                          then (if c <= 43388 then 6 else 1)
-                          else if c <= 43442 then 6 else 1)
-                 else
-                   if c <= 43615
-                   then
-                     (if c <= 43513
-                      then
-                        (if c <= 43493
-                         then
-                           (if c <= 43487
-                            then (if c <= 43471 then 6 else 1)
-                            else if c <= 43492 then 6 else 1)
-                         else if c <= 43503 then 6 else 1)
-                      else
-                        if c <= 43583
-                        then
-                          (if c <= 43519
-                           then (if c <= 43518 then 6 else 1)
-                           else if c <= 43560 then 6 else 1)
-                        else
-                          if c <= 43587
-                          then (if c <= 43586 then 6 else 1)
-                          else if c <= 43595 then 6 else 1)
-                   else
-                     if c <= 43645
-                     then
-                       (if c <= 43638
-                        then 6
-                        else
-                          if c <= 43641
-                          then 1
-                          else if c <= 43642 then 6 else 1)
-                     else
-                       if c <= 43700
-                       then
-                         (if c <= 43696
-                          then (if c <= 43695 then 6 else 1)
-                          else if c <= 43697 then 6 else 1)
-                       else
-                         if c <= 43704
-                         then (if c <= 43702 then 6 else 1)
-                         else if c <= 43709 then 6 else 1)
-          else
-            if c <= 66377
-            then
-              (if c <= 64325
-               then
-                 (if c <= 43887
-                  then
-                    (if c <= 43784
-                     then
-                       (if c <= 43743
-                        then
-                          (if c <= 43738
-                           then
-                             (if c <= 43713
-                              then (if c <= 43712 then 6 else 1)
-                              else if c <= 43714 then 6 else 1)
-                           else if c <= 43741 then 6 else 1)
-                        else
-                          if c <= 43764
-                          then
-                            (if c <= 43761
-                             then (if c <= 43754 then 6 else 1)
-                             else 6)
-                          else
-                            if c <= 43776
-                            then 1
-                            else if c <= 43782 then 6 else 1)
-                     else
-                       if c <= 43823
-                       then
-                         (if c <= 43807
-                          then
-                            (if c <= 43792
-                             then (if c <= 43790 then 6 else 1)
-                             else if c <= 43798 then 6 else 1)
-                          else
-                            if c <= 43815
-                            then (if c <= 43814 then 6 else 1)
-                            else if c <= 43822 then 6 else 1)
-                       else
-                         if c <= 43880
-                         then
-                           (if c <= 43867
-                            then (if c <= 43866 then 6 else 1)
-                            else 6)
-                         else if c <= 43881 then 6 else 1)
-                  else
-                    if c <= 64274
-                    then
-                      (if c <= 55242
-                       then
-                         (if c <= 44031
-                          then (if c <= 44002 then 6 else 1)
-                          else
-                            if c <= 55215
-                            then (if c <= 55203 then 6 else 1)
-                            else if c <= 55238 then 6 else 1)
-                       else
-                         if c <= 64111
-                         then
-                           (if c <= 63743
-                            then (if c <= 55291 then 6 else 1)
-                            else if c <= 64109 then 6 else 1)
-                         else
-                           if c <= 64255
-                           then (if c <= 64217 then 6 else 1)
-                           else if c <= 64262 then 6 else 1)
-                    else
-                      if c <= 64311
-                      then
-                        (if c <= 64286
-                         then
-                           (if c <= 64284
-                            then (if c <= 64279 then 6 else 1)
-                            else if c <= 64285 then 6 else 1)
-                         else
-                           if c <= 64297
-                           then (if c <= 64296 then 6 else 1)
-                           else if c <= 64310 then 6 else 1)
-                      else
-                        if c <= 64319
-                        then
-                          (if c <= 64317
-                           then (if c <= 64316 then 6 else 1)
-                           else if c <= 64318 then 6 else 1)
-                        else
-                          if c <= 64322
-                          then (if c <= 64321 then 6 else 1)
-                          else if c <= 64324 then 6 else 1)
-               else
-                 if c <= 65481
-                 then
-                   (if c <= 65312
-                    then
-                      (if c <= 65007
-                       then
-                         (if c <= 64847
-                          then
-                            (if c <= 64466
-                             then (if c <= 64433 then 6 else 1)
-                             else if c <= 64829 then 6 else 1)
-                          else
-                            if c <= 64913
-                            then (if c <= 64911 then 6 else 1)
-                            else if c <= 64967 then 6 else 1)
-                       else
-                         if c <= 65141
-                         then
-                           (if c <= 65135
-                            then (if c <= 65019 then 6 else 1)
-                            else if c <= 65140 then 6 else 1)
-                         else
-                           if c <= 65278
-                           then (if c <= 65276 then 6 else 1)
-                           else if c <= 65279 then 2 else 1)
-                    else
-                      if c <= 65437
-                      then
-                        (if c <= 65381
-                         then
-                           (if c <= 65344
-                            then (if c <= 65338 then 6 else 1)
-                            else if c <= 65370 then 6 else 1)
-                         else 6)
-                      else
-                        if c <= 65470
-                        then 6
-                        else
-                          if c <= 65473
-                          then 1
-                          else if c <= 65479 then 6 else 1)
-                 else
-                   if c <= 65615
-                   then
-                     (if c <= 65548
-                      then
-                        (if c <= 65497
-                         then
-                           (if c <= 65489
-                            then (if c <= 65487 then 6 else 1)
-                            else if c <= 65495 then 6 else 1)
-                         else
-                           if c <= 65535
-                           then (if c <= 65500 then 6 else 1)
-                           else if c <= 65547 then 6 else 1)
-                      else
-                        if c <= 65595
-                        then
-                          (if c <= 65575
-                           then (if c <= 65574 then 6 else 1)
-                           else if c <= 65594 then 6 else 1)
-                        else
-                          if c <= 65598
-                          then (if c <= 65597 then 6 else 1)
-                          else if c <= 65613 then 6 else 1)
-                   else
-                     if c <= 66207
-                     then
-                       (if c <= 65855
-                        then
-                          (if c <= 65663
-                           then (if c <= 65629 then 6 else 1)
-                           else if c <= 65786 then 6 else 1)
-                        else
-                          if c <= 66175
-                          then (if c <= 65908 then 6 else 1)
-                          else if c <= 66204 then 6 else 1)
-                     else
-                       if c <= 66348
-                       then
-                         (if c <= 66303
-                          then (if c <= 66256 then 6 else 1)
-                          else if c <= 66335 then 6 else 1)
-                       else 6)
-            else
-              if c <= 67646
-              then
-                (if c <= 66963
-                 then
-                   (if c <= 66717
-                    then
-                      (if c <= 66463
-                       then
-                         (if c <= 66383
-                          then (if c <= 66378 then 6 else 1)
-                          else
-                            if c <= 66431
-                            then (if c <= 66421 then 6 else 1)
-                            else if c <= 66461 then 6 else 1)
-                       else
-                         if c <= 66512
-                         then
-                           (if c <= 66503
-                            then (if c <= 66499 then 6 else 1)
-                            else if c <= 66511 then 6 else 1)
-                         else
-                           if c <= 66559
-                           then (if c <= 66517 then 6 else 1)
-                           else 6)
-                    else
-                      if c <= 66863
-                      then
-                        (if c <= 66775
-                         then
-                           (if c <= 66735
-                            then 1
-                            else if c <= 66771 then 6 else 1)
-                         else
-                           if c <= 66815
-                           then (if c <= 66811 then 6 else 1)
-                           else if c <= 66855 then 6 else 1)
-                      else
-                        if c <= 66939
-                        then
-                          (if c <= 66927
-                           then (if c <= 66915 then 6 else 1)
-                           else if c <= 66938 then 6 else 1)
-                        else
-                          if c <= 66955
-                          then (if c <= 66954 then 6 else 1)
-                          else if c <= 66962 then 6 else 1)
-                 else
-                   if c <= 67455
-                   then
-                     (if c <= 67002
-                      then
-                        (if c <= 66978
-                         then
-                           (if c <= 66966
-                            then (if c <= 66965 then 6 else 1)
-                            else if c <= 66977 then 6 else 1)
-                         else
-                           if c <= 66994
-                           then (if c <= 66993 then 6 else 1)
-                           else if c <= 67001 then 6 else 1)
-                      else
-                        if c <= 67391
-                        then
-                          (if c <= 67071
-                           then (if c <= 67004 then 6 else 1)
-                           else if c <= 67382 then 6 else 1)
-                        else
-                          if c <= 67423
-                          then (if c <= 67413 then 6 else 1)
-                          else if c <= 67431 then 6 else 1)
-                   else
-                     if c <= 67591
-                     then
-                       (if c <= 67505
-                        then
-                          (if c <= 67462
-                           then (if c <= 67461 then 6 else 1)
-                           else if c <= 67504 then 6 else 1)
-                        else
-                          if c <= 67583
-                          then (if c <= 67514 then 6 else 1)
-                          else if c <= 67589 then 6 else 1)
-                     else
-                       if c <= 67638
-                       then
-                         (if c <= 67593
-                          then (if c <= 67592 then 6 else 1)
-                          else if c <= 67637 then 6 else 1)
-                       else
-                         if c <= 67643
-                         then (if c <= 67640 then 6 else 1)
-                         else if c <= 67644 then 6 else 1)
-              else
-                if c <= 68296
-                then
-                  (if c <= 68029
-                   then
-                     (if c <= 67827
-                      then
-                        (if c <= 67711
-                         then
-                           (if c <= 67679
-                            then (if c <= 67669 then 6 else 1)
-                            else if c <= 67702 then 6 else 1)
-                         else
-                           if c <= 67807
-                           then (if c <= 67742 then 6 else 1)
-                           else if c <= 67826 then 6 else 1)
-                      else
-                        if c <= 67871
-                        then
-                          (if c <= 67839
-                           then (if c <= 67829 then 6 else 1)
-                           else if c <= 67861 then 6 else 1)
-                        else
-                          if c <= 67967
-                          then (if c <= 67897 then 6 else 1)
-                          else if c <= 68023 then 6 else 1)
-                   else
-                     if c <= 68120
-                     then
-                       (if c <= 68111
-                        then
-                          (if c <= 68095
-                           then (if c <= 68031 then 6 else 1)
-                           else if c <= 68096 then 6 else 1)
-                        else
-                          if c <= 68116
-                          then (if c <= 68115 then 6 else 1)
-                          else if c <= 68119 then 6 else 1)
-                     else
-                       if c <= 68223
-                       then
-                         (if c <= 68191
-                          then (if c <= 68149 then 6 else 1)
-                          else if c <= 68220 then 6 else 1)
-                       else
-                         if c <= 68287
-                         then (if c <= 68252 then 6 else 1)
-                         else if c <= 68295 then 6 else 1)
-                else
-                  if c <= 68863
-                  then
-                    (if c <= 68479
-                     then
-                       (if c <= 68415
-                        then
-                          (if c <= 68351
-                           then (if c <= 68324 then 6 else 1)
-                           else if c <= 68405 then 6 else 1)
-                        else
-                          if c <= 68447
-                          then (if c <= 68437 then 6 else 1)
-                          else if c <= 68466 then 6 else 1)
-                     else
-                       if c <= 68735
-                       then
-                         (if c <= 68607
-                          then (if c <= 68497 then 6 else 1)
-                          else if c <= 68680 then 6 else 1)
-                       else
-                         if c <= 68799
-                         then (if c <= 68786 then 6 else 1)
-                         else if c <= 68850 then 6 else 1)
-                  else
-                    if c <= 69414
-                    then
-                      (if c <= 69295
-                       then
-                         (if c <= 69247
-                          then (if c <= 68899 then 6 else 1)
-                          else if c <= 69289 then 6 else 1)
-                       else
-                         if c <= 69375
-                         then (if c <= 69297 then 6 else 1)
-                         else if c <= 69404 then 6 else 1)
-                    else
-                      if c <= 69487
-                      then
-                        (if c <= 69423
-                         then (if c <= 69415 then 6 else 1)
-                         else if c <= 69445 then 6 else 1)
-                      else
-                        if c <= 69551
-                        then (if c <= 69505 then 6 else 1)
-                        else if c <= 69572 then 6 else 1)
-       else
-         if c <= 120122
-         then
-           (if c <= 72348
-            then
-              (if c <= 70655
-               then
-                 (if c <= 70162
-                  then
-                    (if c <= 69958
-                     then
-                       (if c <= 69762
-                        then
-                          (if c <= 69744
-                           then
-                             (if c <= 69634
-                              then (if c <= 69622 then 6 else 1)
-                              else if c <= 69687 then 6 else 1)
-                           else
-                             if c <= 69748
-                             then (if c <= 69746 then 6 else 1)
-                             else if c <= 69749 then 6 else 1)
-                        else
-                          if c <= 69890
-                          then
-                            (if c <= 69839
-                             then (if c <= 69807 then 6 else 1)
-                             else if c <= 69864 then 6 else 1)
-                          else
-                            if c <= 69955
-                            then (if c <= 69926 then 6 else 1)
-                            else if c <= 69956 then 6 else 1)
-                     else
-                       if c <= 70080
-                       then
-                         (if c <= 70005
-                          then
-                            (if c <= 69967
-                             then (if c <= 69959 then 6 else 1)
-                             else if c <= 70002 then 6 else 1)
-                          else
-                            if c <= 70018
-                            then (if c <= 70006 then 6 else 1)
-                            else if c <= 70066 then 6 else 1)
-                       else
-                         if c <= 70107
-                         then
-                           (if c <= 70105
-                            then (if c <= 70084 then 6 else 1)
-                            else if c <= 70106 then 6 else 1)
-                         else
-                           if c <= 70143
-                           then (if c <= 70108 then 6 else 1)
-                           else if c <= 70161 then 6 else 1)
-                  else
-                    if c <= 70414
-                    then
-                      (if c <= 70286
-                       then
-                         (if c <= 70279
-                          then
-                            (if c <= 70271
-                             then (if c <= 70187 then 6 else 1)
-                             else if c <= 70278 then 6 else 1)
-                          else
-                            if c <= 70281
-                            then (if c <= 70280 then 6 else 1)
-                            else if c <= 70285 then 6 else 1)
-                       else
-                         if c <= 70319
-                         then
-                           (if c <= 70302
-                            then (if c <= 70301 then 6 else 1)
-                            else if c <= 70312 then 6 else 1)
-                         else
-                           if c <= 70404
-                           then (if c <= 70366 then 6 else 1)
-                           else if c <= 70412 then 6 else 1)
-                    else
-                      if c <= 70452
-                      then
-                        (if c <= 70441
-                         then
-                           (if c <= 70418
-                            then (if c <= 70416 then 6 else 1)
-                            else if c <= 70440 then 6 else 1)
-                         else
-                           if c <= 70449
-                           then (if c <= 70448 then 6 else 1)
-                           else if c <= 70451 then 6 else 1)
-                      else
-                        if c <= 70479
-                        then
-                          (if c <= 70460
-                           then (if c <= 70457 then 6 else 1)
-                           else if c <= 70461 then 6 else 1)
-                        else
-                          if c <= 70492
-                          then (if c <= 70480 then 6 else 1)
-                          else if c <= 70497 then 6 else 1)
-               else
-                 if c <= 71934
-                 then
-                   (if c <= 71167
-                    then
-                      (if c <= 70851
-                       then
-                         (if c <= 70750
-                          then
-                            (if c <= 70726
-                             then (if c <= 70708 then 6 else 1)
-                             else if c <= 70730 then 6 else 1)
-                          else
-                            if c <= 70783
-                            then (if c <= 70753 then 6 else 1)
-                            else if c <= 70831 then 6 else 1)
-                       else
-                         if c <= 71039
-                         then
-                           (if c <= 70854
-                            then (if c <= 70853 then 6 else 1)
-                            else if c <= 70855 then 6 else 1)
-                         else
-                           if c <= 71127
-                           then (if c <= 71086 then 6 else 1)
-                           else if c <= 71131 then 6 else 1)
-                    else
-                      if c <= 71423
-                      then
-                        (if c <= 71295
-                         then
-                           (if c <= 71235
-                            then (if c <= 71215 then 6 else 1)
-                            else if c <= 71236 then 6 else 1)
-                         else
-                           if c <= 71351
-                           then (if c <= 71338 then 6 else 1)
-                           else if c <= 71352 then 6 else 1)
-                      else
-                        if c <= 71679
-                        then
-                          (if c <= 71487
-                           then (if c <= 71450 then 6 else 1)
-                           else if c <= 71494 then 6 else 1)
-                        else
-                          if c <= 71839
-                          then (if c <= 71723 then 6 else 1)
-                          else if c <= 71903 then 6 else 1)
-                 else
-                   if c <= 72105
-                   then
-                     (if c <= 71959
-                      then
-                        (if c <= 71947
-                         then
-                           (if c <= 71944
-                            then (if c <= 71942 then 6 else 1)
-                            else if c <= 71945 then 6 else 1)
-                         else
-                           if c <= 71956
-                           then (if c <= 71955 then 6 else 1)
-                           else if c <= 71958 then 6 else 1)
-                      else
-                        if c <= 72000
-                        then
-                          (if c <= 71998
-                           then (if c <= 71983 then 6 else 1)
-                           else if c <= 71999 then 6 else 1)
-                        else
-                          if c <= 72095
-                          then (if c <= 72001 then 6 else 1)
-                          else if c <= 72103 then 6 else 1)
-                   else
-                     if c <= 72202
-                     then
-                       (if c <= 72162
-                        then
-                          (if c <= 72160
-                           then (if c <= 72144 then 6 else 1)
-                           else if c <= 72161 then 6 else 1)
-                        else
-                          if c <= 72191
-                          then (if c <= 72163 then 6 else 1)
-                          else if c <= 72192 then 6 else 1)
-                     else
-                       if c <= 72271
-                       then
-                         (if c <= 72249
-                          then (if c <= 72242 then 6 else 1)
-                          else if c <= 72250 then 6 else 1)
-                       else
-                         if c <= 72283
-                         then (if c <= 72272 then 6 else 1)
-                         else if c <= 72329 then 6 else 1)
-            else
-              if c <= 94031
-              then
-                (if c <= 73727
-                 then
-                   (if c <= 72970
-                    then
-                      (if c <= 72767
-                       then
-                         (if c <= 72703
-                          then
-                            (if c <= 72367
-                             then (if c <= 72349 then 6 else 1)
-                             else if c <= 72440 then 6 else 1)
-                          else
-                            if c <= 72713
-                            then (if c <= 72712 then 6 else 1)
-                            else if c <= 72750 then 6 else 1)
-                       else
-                         if c <= 72959
-                         then
-                           (if c <= 72817
-                            then (if c <= 72768 then 6 else 1)
-                            else if c <= 72847 then 6 else 1)
-                         else
-                           if c <= 72967
-                           then (if c <= 72966 then 6 else 1)
-                           else if c <= 72969 then 6 else 1)
-                    else
-                      if c <= 73065
-                      then
-                        (if c <= 73055
-                         then
-                           (if c <= 73029
-                            then (if c <= 73008 then 6 else 1)
-                            else if c <= 73030 then 6 else 1)
-                         else
-                           if c <= 73062
-                           then (if c <= 73061 then 6 else 1)
-                           else if c <= 73064 then 6 else 1)
-                      else
-                        if c <= 73439
-                        then
-                          (if c <= 73111
-                           then (if c <= 73097 then 6 else 1)
-                           else if c <= 73112 then 6 else 1)
-                        else
-                          if c <= 73647
-                          then (if c <= 73458 then 6 else 1)
-                          else if c <= 73648 then 6 else 1)
-                 else
-                   if c <= 92783
-                   then
-                     (if c <= 77823
-                      then
-                        (if c <= 74879
-                         then
-                           (if c <= 74751
-                            then (if c <= 74649 then 6 else 1)
-                            else if c <= 74862 then 6 else 1)
-                         else
-                           if c <= 77711
-                           then (if c <= 75075 then 6 else 1)
-                           else if c <= 77808 then 6 else 1)
-                      else
-                        if c <= 92159
-                        then
-                          (if c <= 82943
-                           then (if c <= 78894 then 6 else 1)
-                           else if c <= 83526 then 6 else 1)
-                        else
-                          if c <= 92735
-                          then (if c <= 92728 then 6 else 1)
-                          else if c <= 92766 then 6 else 1)
-                   else
-                     if c <= 93026
-                     then
-                       (if c <= 92927
-                        then
-                          (if c <= 92879
-                           then (if c <= 92862 then 6 else 1)
-                           else if c <= 92909 then 6 else 1)
-                        else
-                          if c <= 92991
-                          then (if c <= 92975 then 6 else 1)
-                          else if c <= 92995 then 6 else 1)
-                     else
-                       if c <= 93759
-                       then
-                         (if c <= 93052
-                          then (if c <= 93047 then 6 else 1)
-                          else if c <= 93071 then 6 else 1)
-                       else
-                         if c <= 93951
-                         then (if c <= 93823 then 6 else 1)
-                         else if c <= 94026 then 6 else 1)
-              else
-                if c <= 113791
-                then
-                  (if c <= 110580
-                   then
-                     (if c <= 94207
-                      then
-                        (if c <= 94175
-                         then
-                           (if c <= 94098
-                            then (if c <= 94032 then 6 else 1)
-                            else if c <= 94111 then 6 else 1)
-                         else
-                           if c <= 94178
-                           then (if c <= 94177 then 6 else 1)
-                           else if c <= 94179 then 6 else 1)
-                      else
-                        if c <= 101631
-                        then
-                          (if c <= 100351
-                           then (if c <= 100343 then 6 else 1)
-                           else if c <= 101589 then 6 else 1)
-                        else
-                          if c <= 110575
-                          then (if c <= 101640 then 6 else 1)
-                          else if c <= 110579 then 6 else 1)
-                   else
-                     if c <= 110947
-                     then
-                       (if c <= 110591
-                        then
-                          (if c <= 110588
-                           then (if c <= 110587 then 6 else 1)
-                           else if c <= 110590 then 6 else 1)
-                        else
-                          if c <= 110927
-                          then (if c <= 110882 then 6 else 1)
-                          else if c <= 110930 then 6 else 1)
-                     else
-                       if c <= 113663
-                       then
-                         (if c <= 110959
-                          then (if c <= 110951 then 6 else 1)
-                          else if c <= 111355 then 6 else 1)
-                       else
-                         if c <= 113775
-                         then (if c <= 113770 then 6 else 1)
-                         else if c <= 113788 then 6 else 1)
-                else
-                  if c <= 119981
-                  then
-                    (if c <= 119965
-                     then
-                       (if c <= 119807
-                        then
-                          (if c <= 113807
-                           then (if c <= 113800 then 6 else 1)
-                           else if c <= 113817 then 6 else 1)
-                        else
-                          if c <= 119893
-                          then (if c <= 119892 then 6 else 1)
-                          else if c <= 119964 then 6 else 1)
-                     else
-                       if c <= 119972
-                       then
-                         (if c <= 119969
-                          then (if c <= 119967 then 6 else 1)
-                          else if c <= 119970 then 6 else 1)
-                       else
-                         if c <= 119976
-                         then (if c <= 119974 then 6 else 1)
-                         else if c <= 119980 then 6 else 1)
-                  else
-                    if c <= 120070
-                    then
-                      (if c <= 119996
-                       then
-                         (if c <= 119994
-                          then (if c <= 119993 then 6 else 1)
-                          else if c <= 119995 then 6 else 1)
-                       else
-                         if c <= 120004
-                         then (if c <= 120003 then 6 else 1)
-                         else if c <= 120069 then 6 else 1)
-                    else
-                      if c <= 120085
-                      then
-                        (if c <= 120076
-                         then (if c <= 120074 then 6 else 1)
-                         else if c <= 120084 then 6 else 1)
-                      else
-                        if c <= 120093
-                        then (if c <= 120092 then 6 else 1)
-                        else if c <= 120121 then 6 else 1)
-         else
-           if c <= 131071
-           then
-             (if c <= 126468
-              then
-                (if c <= 122623
-                 then
-                   (if c <= 120571
-                    then
-                      (if c <= 120145
-                       then
-                         (if c <= 120133
-                          then
-                            (if c <= 120127
-                             then (if c <= 120126 then 6 else 1)
-                             else if c <= 120132 then 6 else 1)
-                          else
-                            if c <= 120137
-                            then (if c <= 120134 then 6 else 1)
-                            else if c <= 120144 then 6 else 1)
-                       else
-                         if c <= 120513
-                         then
-                           (if c <= 120487
-                            then (if c <= 120485 then 6 else 1)
-                            else if c <= 120512 then 6 else 1)
-                         else
-                           if c <= 120539
-                           then (if c <= 120538 then 6 else 1)
-                           else if c <= 120570 then 6 else 1)
-                    else
-                      if c <= 120687
-                      then
-                        (if c <= 120629
-                         then
-                           (if c <= 120597
-                            then (if c <= 120596 then 6 else 1)
-                            else if c <= 120628 then 6 else 1)
-                         else
-                           if c <= 120655
-                           then (if c <= 120654 then 6 else 1)
-                           else if c <= 120686 then 6 else 1)
-                      else
-                        if c <= 120745
-                        then
-                          (if c <= 120713
-                           then (if c <= 120712 then 6 else 1)
-                           else if c <= 120744 then 6 else 1)
-                        else
-                          if c <= 120771
-                          then (if c <= 120770 then 6 else 1)
-                          else if c <= 120779 then 6 else 1)
-                 else
-                   if c <= 124895
-                   then
-                     (if c <= 123190
-                      then
-                        (if c <= 122654
-                         then 6
-                         else
-                           if c <= 123135
-                           then 1
-                           else if c <= 123180 then 6 else 1)
-                      else
-                        if c <= 123535
-                        then
-                          (if c <= 123213
-                           then (if c <= 123197 then 6 else 1)
-                           else if c <= 123214 then 6 else 1)
-                        else
-                          if c <= 123583
-                          then (if c <= 123565 then 6 else 1)
-                          else if c <= 123627 then 6 else 1)
-                   else
-                     if c <= 124927
-                     then
-                       (if c <= 124908
-                        then
-                          (if c <= 124903
-                           then (if c <= 124902 then 6 else 1)
-                           else if c <= 124907 then 6 else 1)
-                        else
-                          if c <= 124911
-                          then (if c <= 124910 then 6 else 1)
-                          else if c <= 124926 then 6 else 1)
-                     else
-                       if c <= 125258
-                       then
-                         (if c <= 125183
-                          then (if c <= 125124 then 6 else 1)
-                          else if c <= 125251 then 6 else 1)
-                       else
-                         if c <= 126463
-                         then (if c <= 125259 then 6 else 1)
-                         else if c <= 126467 then 6 else 1)
-              else
-                if c <= 126552
-                then
-                  (if c <= 126529
-                   then
-                     (if c <= 126504
-                      then
-                        (if c <= 126499
-                         then
-                           (if c <= 126496
-                            then (if c <= 126495 then 6 else 1)
-                            else if c <= 126498 then 6 else 1)
-                         else
-                           if c <= 126502
-                           then (if c <= 126500 then 6 else 1)
-                           else if c <= 126503 then 6 else 1)
-                      else
-                        if c <= 126520
-                        then
-                          (if c <= 126515
-                           then (if c <= 126514 then 6 else 1)
-                           else if c <= 126519 then 6 else 1)
-                        else
-                          if c <= 126522
-                          then (if c <= 126521 then 6 else 1)
-                          else if c <= 126523 then 6 else 1)
-                   else
-                     if c <= 126540
-                     then
-                       (if c <= 126536
-                        then
-                          (if c <= 126534
-                           then (if c <= 126530 then 6 else 1)
-                           else if c <= 126535 then 6 else 1)
-                        else
-                          if c <= 126538
-                          then (if c <= 126537 then 6 else 1)
-                          else if c <= 126539 then 6 else 1)
-                     else
-                       if c <= 126547
-                       then
-                         (if c <= 126544
-                          then (if c <= 126543 then 6 else 1)
-                          else if c <= 126546 then 6 else 1)
-                       else
-                         if c <= 126550
-                         then (if c <= 126548 then 6 else 1)
-                         else if c <= 126551 then 6 else 1)
-                else
-                  if c <= 126579
-                  then
-                    (if c <= 126560
-                     then
-                       (if c <= 126556
-                        then
-                          (if c <= 126554
-                           then (if c <= 126553 then 6 else 1)
-                           else if c <= 126555 then 6 else 1)
-                        else
-                          if c <= 126558
-                          then (if c <= 126557 then 6 else 1)
-                          else if c <= 126559 then 6 else 1)
-                     else
-                       if c <= 126566
-                       then
-                         (if c <= 126563
-                          then (if c <= 126562 then 6 else 1)
-                          else if c <= 126564 then 6 else 1)
-                       else
-                         if c <= 126571
-                         then (if c <= 126570 then 6 else 1)
-                         else if c <= 126578 then 6 else 1)
-                  else
-                    if c <= 126602
-                    then
-                      (if c <= 126589
-                       then
-                         (if c <= 126584
-                          then (if c <= 126583 then 6 else 1)
-                          else if c <= 126588 then 6 else 1)
-                       else
-                         if c <= 126591
-                         then (if c <= 126590 then 6 else 1)
-                         else if c <= 126601 then 6 else 1)
-                    else
-                      if c <= 126628
-                      then
-                        (if c <= 126624
-                         then (if c <= 126619 then 6 else 1)
-                         else if c <= 126627 then 6 else 1)
-                      else
-                        if c <= 126634
-                        then (if c <= 126633 then 6 else 1)
-                        else if c <= 126651 then 6 else 1)
-           else
-             if c <= 183983
-             then
-               (if c <= 177983
-                then
-                  (if c <= 173823
-                   then (if c <= 173791 then 6 else 1)
-                   else if c <= 177976 then 6 else 1)
-                else
-                  if c <= 178207
-                  then (if c <= 178205 then 6 else 1)
-                  else if c <= 183969 then 6 else 1)
-             else if c <= 191456 then 6 else 1)
-    else (-1)
-[@@@warning "-39"]
-open Token
-open Lex_env
-module Sedlexing = Flow_sedlexing
-let lexeme = Sedlexing.Utf8.lexeme
-let lexeme_to_buffer = Sedlexing.Utf8.lexeme_to_buffer
-let lexeme_to_buffer2 = Sedlexing.Utf8.lexeme_to_buffer2
-let sub_lexeme = Sedlexing.Utf8.sub_lexeme
-let is_whitespace =
-  function
-  | 0x0009 | 0x000B | 0x000C | 0x0020 | 0x00A0 | 0xfeff | 0x1680 | 0x2000
-    | 0x2001 | 0x2002 | 0x2003 | 0x2004 | 0x2005 | 0x2006 | 0x2007 | 0x2008
-    | 0x2009 | 0x200a | 0x202f | 0x205f | 0x3000 -> true
-  | _ -> false
-let rec loop_id_continues lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_1 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 1
-         | 1 -> 2
-         | 2 -> 0
-         | 3 -> __sedlex_state_4 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 2;
-         (match __sedlex_partition_2 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_5 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_5 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_3 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_6 lexbuf
-         | 1 -> __sedlex_state_10 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_6 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_7 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_7 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_8 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_8 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 0
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_10 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_11 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_11 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_5 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_11 lexbuf
-         | 1 -> 0
-         | _ -> Sedlexing.backtrack lexbuf) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 -> loop_id_continues lexbuf
-   | 1 -> true
-   | 2 ->
-       let s = Sedlexing.current_code_point lexbuf in
-       if Js_id.is_valid_unicode_id s
-       then loop_id_continues lexbuf
-       else (Sedlexing.backoff lexbuf 1; false)
-   | _ -> assert false)
-let rec loop_jsx_id_continues lexbuf =
-  (let rec __sedlex_state_0 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_6 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 1
-          | 1 -> 2
-          | 2 -> 0
-          | 3 -> __sedlex_state_4 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_4 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 2;
-          (match __sedlex_partition_2 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_5 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_5 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_3 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_6 lexbuf
-          | 1 -> __sedlex_state_10 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_6 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_7 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_7 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_8 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_8 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 0
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_10 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_11 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_11 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_5 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_11 lexbuf
-          | 1 -> 0
-          | _ -> Sedlexing.backtrack lexbuf) in
-   Sedlexing.start lexbuf;
-   (match __sedlex_state_0 lexbuf with
-    | 0 -> loop_jsx_id_continues lexbuf
-    | 1 -> ()
-    | 2 ->
-        let s = Sedlexing.current_code_point lexbuf in
-        if Js_id.is_valid_unicode_id s
-        then loop_jsx_id_continues lexbuf
-        else Sedlexing.backoff lexbuf 1
-    | _ -> assert false) : unit)
-let pos_at_offset env offset =
-  {
-    Loc.line = (Lex_env.line env);
-    column = (offset - (Lex_env.bol_offset env))
-  }
-let loc_of_offsets env start_offset end_offset =
-  {
-    Loc.source = (Lex_env.source env);
-    start = (pos_at_offset env start_offset);
-    _end = (pos_at_offset env end_offset)
-  }
-let start_pos_of_lexbuf env (lexbuf : Sedlexing.lexbuf) =
-  let start_offset = Sedlexing.lexeme_start lexbuf in
-  pos_at_offset env start_offset
-let end_pos_of_lexbuf env (lexbuf : Sedlexing.lexbuf) =
-  let end_offset = Sedlexing.lexeme_end lexbuf in
-  pos_at_offset env end_offset
-let loc_of_lexbuf env (lexbuf : Sedlexing.lexbuf) =
-  let start_offset = Sedlexing.lexeme_start lexbuf in
-  let end_offset = Sedlexing.lexeme_end lexbuf in
-  loc_of_offsets env start_offset end_offset
-let loc_of_token env lex_token =
-  match lex_token with
-  | T_IDENTIFIER { loc;_} | T_JSX_IDENTIFIER { loc;_} | T_STRING
-    (loc, _, _, _) -> loc
-  | T_JSX_TEXT (loc, _, _) -> loc
-  | T_TEMPLATE_PART (loc, _, _) -> loc
-  | T_REGEXP (loc, _, _) -> loc
-  | _ -> loc_of_lexbuf env env.lex_lb
-let lex_error (env : Lex_env.t) loc err =
-  (let lex_errors_acc = (loc, err) :: ((env.lex_state).lex_errors_acc) in
-   { env with lex_state = { lex_errors_acc } } : Lex_env.t)
-let unexpected_error (env : Lex_env.t) (loc : Loc.t) value =
-  lex_error env loc (Parse_error.Unexpected (quote_token_value value))
-let unexpected_error_w_suggest (env : Lex_env.t) (loc : Loc.t) value suggest
-  =
-  lex_error env loc
-    (Parse_error.UnexpectedTokenWithSuggestion (value, suggest))
-let illegal (env : Lex_env.t) (loc : Loc.t) =
-  lex_error env loc (Parse_error.Unexpected "token ILLEGAL")
-let new_line env lexbuf =
-  let offset = Sedlexing.lexeme_end lexbuf in
-  let lex_bol = { line = ((Lex_env.line env) + 1); offset } in
-  { env with Lex_env.lex_bol = lex_bol }
-let bigint_strip_n raw =
-  let size = String.length raw in
-  let str =
-    if (size != 0) && ((raw.[size - 1]) == 'n')
-    then String.sub raw 0 (size - 1)
-    else raw in
-  str
-let mk_comment (env : Lex_env.t) (start : Loc.position) (_end : Loc.position)
-  (buf : Buffer.t) (multiline : bool) =
-  (let open Flow_ast.Comment in
-     let loc = { Loc.source = (Lex_env.source env); start; _end } in
-     let text = Buffer.contents buf in
-     let kind = if multiline then Block else Line in
-     let on_newline =
-       let open Loc in
-         ((env.lex_last_loc)._end).Loc.line < (loc.start).Loc.line in
-     let c = { kind; text; on_newline } in (loc, c) : Loc.t
-                                                        Flow_ast.Comment.t)
-let split_number_type =
-  let rec strip_whitespace i len lexeme =
-    if is_whitespace (lexeme.(i))
-    then ((strip_whitespace)[@tailcall ]) (i + 1) len lexeme
-    else Sedlexing.string_of_utf8 (Array.sub lexeme i (len - i)) in
-  fun (lexeme : int array) ->
-    if (lexeme.(0)) = (Char.code '-')
-    then
-      let num = strip_whitespace 1 (Array.length lexeme) lexeme in
-      let raw = Sedlexing.string_of_utf8 lexeme in (true, num, raw)
-    else (let raw = Sedlexing.string_of_utf8 lexeme in (false, raw, raw))
-let mk_num_singleton number_type (lexeme : int array) =
-  let (neg, num, raw) = split_number_type lexeme in
-  let value =
-    match number_type with
-    | LEGACY_OCTAL ->
-        (try Int64.to_float (Int64.of_string ("0o" ^ num))
-         with | Failure _ -> failwith ("Invalid legacy octal " ^ num))
-    | BINARY | OCTAL ->
-        (try Int64.to_float (Int64.of_string num)
-         with | Failure _ -> failwith ("Invalid binary/octal " ^ num))
-    | LEGACY_NON_OCTAL | NORMAL ->
-        (try float_of_string num
-         with | Failure _ -> failwith ("Invalid number " ^ num)) in
-  let value = if neg then -. value else value in
-  T_NUMBER_SINGLETON_TYPE { kind = number_type; value; raw }
-let mk_bignum_singleton kind lexeme =
-  let (neg, num, raw) = split_number_type lexeme in
-  let postraw = bigint_strip_n num in
-  let value =
-    (Int64.of_string_opt postraw) |>
-      (Option.map (fun value -> if neg then Int64.neg value else value)) in
-  T_BIGINT_SINGLETON_TYPE { kind; value; raw }
-let assert_valid_unicode_in_identifier env loc code =
-  if Js_id.is_valid_unicode_id code
-  then env
-  else lex_error env loc Parse_error.IllegalUnicodeEscape
-let decode_identifier =
-  let loc_and_sub_lexeme env offset lexbuf trim_start trim_end =
-    let start_offset = offset + (Sedlexing.lexeme_start lexbuf) in
-    let end_offset = offset + (Sedlexing.lexeme_end lexbuf) in
-    let loc = loc_of_offsets env start_offset end_offset in
-    (loc,
-      (sub_lexeme lexbuf trim_start
-         (((Sedlexing.lexeme_length lexbuf) - trim_start) - trim_end))) in
-  let rec id_char env offset buf lexbuf =
-    let rec __sedlex_state_0 =
-      function
-      | lexbuf ->
-          (match __sedlex_partition_7 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 2
-           | 1 -> __sedlex_state_2 lexbuf
-           | 2 -> __sedlex_state_3 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf)
-    and __sedlex_state_2 =
-      function
-      | lexbuf ->
-          (Sedlexing.mark lexbuf 3;
-           (match __sedlex_partition_8 (Sedlexing.__private__next_int lexbuf)
-            with
-            | 0 -> __sedlex_state_2 lexbuf
-            | _ -> Sedlexing.backtrack lexbuf))
-    and __sedlex_state_3 =
-      function
-      | lexbuf ->
-          (Sedlexing.mark lexbuf 3;
-           (match __sedlex_partition_2 (Sedlexing.__private__next_int lexbuf)
-            with
-            | 0 -> __sedlex_state_4 lexbuf
-            | _ -> Sedlexing.backtrack lexbuf))
-    and __sedlex_state_4 =
-      function
-      | lexbuf ->
-          (match __sedlex_partition_3 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_5 lexbuf
-           | 1 -> __sedlex_state_9 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf)
-    and __sedlex_state_5 =
-      function
-      | lexbuf ->
-          (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_6 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf)
-    and __sedlex_state_6 =
-      function
-      | lexbuf ->
-          (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_7 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf)
-    and __sedlex_state_7 =
-      function
-      | lexbuf ->
-          (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 0
-           | _ -> Sedlexing.backtrack lexbuf)
-    and __sedlex_state_9 =
-      function
-      | lexbuf ->
-          (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_10 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf)
-    and __sedlex_state_10 =
-      function
-      | lexbuf ->
-          (match __sedlex_partition_5 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_10 lexbuf
-           | 1 -> 1
-           | _ -> Sedlexing.backtrack lexbuf) in
-    Sedlexing.start lexbuf;
-    (match __sedlex_state_0 lexbuf with
-     | 0 ->
-         let (loc, hex) = loc_and_sub_lexeme env offset lexbuf 2 0 in
-         let code = int_of_string ("0x" ^ hex) in
-         let env =
-           if not (Uchar.is_valid code)
-           then lex_error env loc Parse_error.IllegalUnicodeEscape
-           else assert_valid_unicode_in_identifier env loc code in
-         (Wtf8.add_wtf_8 buf code; id_char env offset buf lexbuf)
-     | 1 ->
-         let (loc, hex) = loc_and_sub_lexeme env offset lexbuf 3 1 in
-         let code = int_of_string ("0x" ^ hex) in
-         let env = assert_valid_unicode_in_identifier env loc code in
-         (Wtf8.add_wtf_8 buf code; id_char env offset buf lexbuf)
-     | 2 -> (env, (Buffer.contents buf))
-     | 3 -> (lexeme_to_buffer lexbuf buf; id_char env offset buf lexbuf)
-     | _ -> failwith "unreachable id_char") in
-  fun env ->
-    fun raw ->
-      let offset = Sedlexing.lexeme_start env.lex_lb in
-      let lexbuf = Sedlexing.from_int_array raw in
-      let buf = Buffer.create (Array.length raw) in
-      id_char env offset buf lexbuf
-let recover env lexbuf ~f  =
-  let env = illegal env (loc_of_lexbuf env lexbuf) in
-  Sedlexing.rollback lexbuf; f env lexbuf
-type jsx_text_mode =
-  | JSX_SINGLE_QUOTED_TEXT 
-  | JSX_DOUBLE_QUOTED_TEXT 
-  | JSX_CHILD_TEXT 
-type result =
-  | Token of Lex_env.t * Token.t 
-  | Comment of Lex_env.t * Loc.t Flow_ast.Comment.t 
-  | Continue of Lex_env.t 
-let rec comment env buf lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_9 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_1 lexbuf
-         | 1 -> 0
-         | 2 -> __sedlex_state_3 lexbuf
-         | 3 -> __sedlex_state_5 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_1 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 3;
-         (match __sedlex_partition_10 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_1 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_3 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 0;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 0
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_5 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 3;
-         (match __sedlex_partition_12 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_6 lexbuf
-          | 1 -> 1
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_6 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_13 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 2
-         | _ -> Sedlexing.backtrack lexbuf) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 ->
-       let env = new_line env lexbuf in
-       (lexeme_to_buffer lexbuf buf; comment env buf lexbuf)
-   | 1 ->
-       let env =
-         if is_in_comment_syntax env
-         then
-           let loc = loc_of_lexbuf env lexbuf in
-           unexpected_error_w_suggest env loc "*/" "*-/"
-         else env in
-       (env, (end_pos_of_lexbuf env lexbuf))
-   | 2 ->
-       if is_in_comment_syntax env
-       then (env, (end_pos_of_lexbuf env lexbuf))
-       else (Buffer.add_string buf "*-/"; comment env buf lexbuf)
-   | 3 -> (lexeme_to_buffer lexbuf buf; comment env buf lexbuf)
-   | _ ->
-       let env = illegal env (loc_of_lexbuf env lexbuf) in
-       (env, (end_pos_of_lexbuf env lexbuf)))
-let rec line_comment env buf lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_14 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 0
-         | 1 -> __sedlex_state_2 lexbuf
-         | 2 -> 1
-         | 3 -> __sedlex_state_4 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_2 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 2;
-         (match __sedlex_partition_15 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_2 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 1;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 1
-          | _ -> Sedlexing.backtrack lexbuf)) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 -> (env, (end_pos_of_lexbuf env lexbuf))
-   | 1 ->
-       let { Loc.line = line; column } = end_pos_of_lexbuf env lexbuf in
-       let env = new_line env lexbuf in
-       let len = Sedlexing.lexeme_length lexbuf in
-       let end_pos = { Loc.line = line; column = (column - len) } in
-       (env, end_pos)
-   | 2 -> (lexeme_to_buffer lexbuf buf; line_comment env buf lexbuf)
-   | _ -> failwith "unreachable line_comment")
-let string_escape env lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_16 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 0
-         | 1 -> 16
-         | 2 -> 15
-         | 3 -> __sedlex_state_4 lexbuf
-         | 4 -> __sedlex_state_6 lexbuf
-         | 5 -> __sedlex_state_9 lexbuf
-         | 6 -> 0
-         | 7 -> 5
-         | 8 -> 6
-         | 9 -> 7
-         | 10 -> 8
-         | 11 -> 9
-         | 12 -> __sedlex_state_16 lexbuf
-         | 13 -> 10
-         | 14 -> __sedlex_state_25 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 15;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 15
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_6 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 4;
-         (match __sedlex_partition_17 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_7 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_7 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 3;
-         (match __sedlex_partition_17 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 2
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_9 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 11;
-         (match __sedlex_partition_17 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_7 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_16 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 14;
-         (match __sedlex_partition_3 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_17 lexbuf
-          | 1 -> __sedlex_state_21 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_17 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_18 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_18 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_19 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_19 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 12
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_21 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_22 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_22 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_5 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_22 lexbuf
-         | 1 -> 13
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_25 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 14;
-         (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_26 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_26 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 1
-         | _ -> Sedlexing.backtrack lexbuf) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 ->
-       let str = lexeme lexbuf in
-       let codes = Sedlexing.lexeme lexbuf in (env, str, codes, false)
-   | 1 ->
-       let str = lexeme lexbuf in
-       let code = int_of_string ("0" ^ str) in (env, str, [|code|], false)
-   | 2 ->
-       let str = lexeme lexbuf in
-       let code = int_of_string ("0o" ^ str) in
-       if code < 256
-       then (env, str, [|code|], true)
-       else
-         (let remainder = code land 7 in
-          let code = code lsr 3 in
-          (env, str, [|code;((Char.code '0') + remainder)|], true))
-   | 3 ->
-       let str = lexeme lexbuf in
-       let code = int_of_string ("0o" ^ str) in (env, str, [|code|], true)
-   | 4 -> (env, "0", [|0x0|], false)
-   | 5 -> (env, "b", [|0x8|], false)
-   | 6 -> (env, "f", [|0xC|], false)
-   | 7 -> (env, "n", [|0xA|], false)
-   | 8 -> (env, "r", [|0xD|], false)
-   | 9 -> (env, "t", [|0x9|], false)
-   | 10 -> (env, "v", [|0xB|], false)
-   | 11 ->
-       let str = lexeme lexbuf in
-       let code = int_of_string ("0o" ^ str) in (env, str, [|code|], true)
-   | 12 ->
-       let str = lexeme lexbuf in
-       let hex = String.sub str 1 ((String.length str) - 1) in
-       let code = int_of_string ("0x" ^ hex) in (env, str, [|code|], false)
-   | 13 ->
-       let str = lexeme lexbuf in
-       let hex = String.sub str 2 ((String.length str) - 3) in
-       let code = int_of_string ("0x" ^ hex) in
-       let env =
-         if code > 0x10FFFF
-         then illegal env (loc_of_lexbuf env lexbuf)
-         else env in
-       (env, str, [|code|], false)
-   | 14 ->
-       let str = lexeme lexbuf in
-       let codes = Sedlexing.lexeme lexbuf in
-       let env = illegal env (loc_of_lexbuf env lexbuf) in
-       (env, str, codes, false)
-   | 15 ->
-       let str = lexeme lexbuf in
-       let env = new_line env lexbuf in (env, str, [||], false)
-   | 16 ->
-       let str = lexeme lexbuf in
-       let codes = Sedlexing.lexeme lexbuf in (env, str, codes, false)
-   | _ -> failwith "unreachable string_escape")
-let rec string_quote env q buf raw octal lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_18 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 3
-         | 1 -> __sedlex_state_2 lexbuf
-         | 2 -> 2
-         | 3 -> 0
-         | 4 -> 1
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_2 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 4;
-         (match __sedlex_partition_19 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_2 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 ->
-       let q' = lexeme lexbuf in
-       (Buffer.add_string raw q';
-        if q = q'
-        then (env, (end_pos_of_lexbuf env lexbuf), octal)
-        else
-          (Buffer.add_string buf q'; string_quote env q buf raw octal lexbuf))
-   | 1 ->
-       (Buffer.add_string raw "\\";
-        (let (env, str, codes, octal') = string_escape env lexbuf in
-         let octal = octal' || octal in
-         Buffer.add_string raw str;
-         Array.iter (Wtf8.add_wtf_8 buf) codes;
-         string_quote env q buf raw octal lexbuf))
-   | 2 ->
-       let x = lexeme lexbuf in
-       (Buffer.add_string raw x;
-        (let env = illegal env (loc_of_lexbuf env lexbuf) in
-         let env = new_line env lexbuf in
-         Buffer.add_string buf x;
-         (env, (end_pos_of_lexbuf env lexbuf), octal)))
-   | 3 ->
-       let x = lexeme lexbuf in
-       (Buffer.add_string raw x;
-        (let env = illegal env (loc_of_lexbuf env lexbuf) in
-         Buffer.add_string buf x;
-         (env, (end_pos_of_lexbuf env lexbuf), octal)))
-   | 4 ->
-       (lexeme_to_buffer2 lexbuf raw buf;
-        string_quote env q buf raw octal lexbuf)
-   | _ -> failwith "unreachable string_quote")
-let rec template_part env cooked raw literal lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_20 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 0
-         | 1 -> __sedlex_state_2 lexbuf
-         | 2 -> 5
-         | 3 -> __sedlex_state_4 lexbuf
-         | 4 -> __sedlex_state_6 lexbuf
-         | 5 -> 3
-         | 6 -> 1
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_2 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 6;
-         (match __sedlex_partition_21 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_2 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 5;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 4
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_6 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 6;
-         (match __sedlex_partition_22 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 2
-          | _ -> Sedlexing.backtrack lexbuf)) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 -> let env = illegal env (loc_of_lexbuf env lexbuf) in (env, true)
-   | 1 -> (Buffer.add_char literal '`'; (env, true))
-   | 2 -> (Buffer.add_string literal "${"; (env, false))
-   | 3 ->
-       (Buffer.add_char raw '\\';
-        Buffer.add_char literal '\\';
-        (let (env, str, codes, _) = string_escape env lexbuf in
-         Buffer.add_string raw str;
-         Buffer.add_string literal str;
-         Array.iter (Wtf8.add_wtf_8 cooked) codes;
-         template_part env cooked raw literal lexbuf))
-   | 4 ->
-       (Buffer.add_string raw "\r\n";
-        Buffer.add_string literal "\r\n";
-        Buffer.add_string cooked "\n";
-        (let env = new_line env lexbuf in
-         template_part env cooked raw literal lexbuf))
-   | 5 ->
-       let lf = lexeme lexbuf in
-       (Buffer.add_string raw lf;
-        Buffer.add_string literal lf;
-        Buffer.add_char cooked '\n';
-        (let env = new_line env lexbuf in
-         template_part env cooked raw literal lexbuf))
-   | 6 ->
-       let c = lexeme lexbuf in
-       (Buffer.add_string raw c;
-        Buffer.add_string literal c;
-        Buffer.add_string cooked c;
-        template_part env cooked raw literal lexbuf)
-   | _ -> failwith "unreachable template_part")
-let token (env : Lex_env.t) lexbuf =
-  (let rec __sedlex_state_0 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_50 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 98
-          | 1 -> 99
-          | 2 -> __sedlex_state_3 lexbuf
-          | 3 -> 0
-          | 4 -> __sedlex_state_6 lexbuf
-          | 5 -> __sedlex_state_8 lexbuf
-          | 6 -> 7
-          | 7 -> __sedlex_state_12 lexbuf
-          | 8 -> 97
-          | 9 -> __sedlex_state_15 lexbuf
-          | 10 -> __sedlex_state_17 lexbuf
-          | 11 -> 38
-          | 12 -> 39
-          | 13 -> __sedlex_state_23 lexbuf
-          | 14 -> __sedlex_state_28 lexbuf
-          | 15 -> 45
-          | 16 -> __sedlex_state_32 lexbuf
-          | 17 -> __sedlex_state_35 lexbuf
-          | 18 -> __sedlex_state_58 lexbuf
-          | 19 -> __sedlex_state_76 lexbuf
-          | 20 -> __sedlex_state_129 lexbuf
-          | 21 -> 46
-          | 22 -> 44
-          | 23 -> __sedlex_state_135 lexbuf
-          | 24 -> __sedlex_state_139 lexbuf
-          | 25 -> __sedlex_state_143 lexbuf
-          | 26 -> __sedlex_state_149 lexbuf
-          | 27 -> __sedlex_state_154 lexbuf
-          | 28 -> 40
-          | 29 -> __sedlex_state_177 lexbuf
-          | 30 -> 41
-          | 31 -> __sedlex_state_186 lexbuf
-          | 32 -> 8
-          | 33 -> 36
-          | 34 -> __sedlex_state_190 lexbuf
-          | 35 -> 37
-          | 36 -> 89
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_3 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 1;
-          (match __sedlex_partition_51 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_4 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_4 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 1;
-          (match __sedlex_partition_51 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_4 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_6 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 0;
-          (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 0
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_8 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 88;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_9 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_9 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 58;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 54
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_12 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 95;
-          (match __sedlex_partition_53 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 6
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_15 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 84;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 71
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_17 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 86;
-          (match __sedlex_partition_54 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_18 lexbuf
-           | 1 -> 72
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_18 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 51;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 76
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_23 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 82;
-          (match __sedlex_partition_55 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_24 lexbuf
-           | 1 -> 4
-           | 2 -> 69
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_24 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 83;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 70
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_28 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 80;
-          (match __sedlex_partition_56 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 59
-           | 1 -> 67
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_32 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 81;
-          (match __sedlex_partition_57 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 60
-           | 1 -> 68
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_35 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 43;
-          (match __sedlex_partition_47 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_36 lexbuf
-           | 1 -> __sedlex_state_38 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_36 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_58 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 42
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_38 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_59 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_38 lexbuf
-           | 2 -> __sedlex_state_40 lexbuf
-           | 3 -> __sedlex_state_54 lexbuf
-           | 4 -> __sedlex_state_56 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_39 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 33;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_40 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 33;
-          (match __sedlex_partition_61 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_41 lexbuf
-           | 2 -> __sedlex_state_49 lexbuf
-           | 3 -> __sedlex_state_53 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_41 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_40 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_42 lexbuf
-          | 1 -> __sedlex_state_46 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_42 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 28;
-          (match __sedlex_partition_62 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_43 lexbuf
-           | 1 -> __sedlex_state_42 lexbuf
-           | 2 -> __sedlex_state_44 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_43 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 27;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_43 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_44 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 26;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_45 lexbuf
-           | 1 -> __sedlex_state_43 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_45 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 25;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_45 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_46 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 28;
-          (match __sedlex_partition_64 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_43 lexbuf
-           | 1 -> __sedlex_state_46 lexbuf
-           | 2 -> __sedlex_state_47 lexbuf
-           | 3 -> __sedlex_state_44 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_47 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_48 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_48 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 28;
-          (match __sedlex_partition_64 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_43 lexbuf
-           | 1 -> __sedlex_state_48 lexbuf
-           | 2 -> __sedlex_state_47 lexbuf
-           | 3 -> __sedlex_state_44 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_49 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 28;
-          (match __sedlex_partition_62 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_50 lexbuf
-           | 1 -> __sedlex_state_49 lexbuf
-           | 2 -> __sedlex_state_51 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_50 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 27;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_50 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_51 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 26;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_52 lexbuf
-           | 1 -> __sedlex_state_50 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_52 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 25;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_52 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_53 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 28;
-          (match __sedlex_partition_64 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_50 lexbuf
-           | 1 -> __sedlex_state_53 lexbuf
-           | 2 -> __sedlex_state_47 lexbuf
-           | 3 -> __sedlex_state_51 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_54 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_55 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_55 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_59 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_55 lexbuf
-           | 2 -> __sedlex_state_40 lexbuf
-           | 3 -> __sedlex_state_54 lexbuf
-           | 4 -> __sedlex_state_56 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_56 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 31;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_57 lexbuf
-           | 1 -> __sedlex_state_39 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_57 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 29;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_57 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_58 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 93;
-          (match __sedlex_partition_55 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_59 lexbuf
-           | 1 -> 5
-           | 2 -> 92
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_59 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 2;
-          (match __sedlex_partition_65 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_60 lexbuf
-           | 1 -> __sedlex_state_61 lexbuf
-           | 2 -> __sedlex_state_63 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_60 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_65 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_60 lexbuf
-          | 1 -> __sedlex_state_61 lexbuf
-          | 2 -> __sedlex_state_63 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_61 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 3;
-          (match __sedlex_partition_66 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 3
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_63 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_67 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_64 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_64 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_68 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_65 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_65 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_69 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_66 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_66 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_70 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_67 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_67 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_71 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_68 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_68 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_72 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_69 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_69 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_73 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_70 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_70 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_67 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_71 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_71 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_2 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_72 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_72 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_74 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_73 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_73 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_75 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 3
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_76 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_76 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_77 lexbuf
-           | 2 -> __sedlex_state_81 lexbuf
-           | 3 -> __sedlex_state_93 lexbuf
-           | 4 -> __sedlex_state_97 lexbuf
-           | 5 -> __sedlex_state_40 lexbuf
-           | 6 -> __sedlex_state_107 lexbuf
-           | 7 -> __sedlex_state_117 lexbuf
-           | 8 -> __sedlex_state_127 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_77 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_77 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_78 lexbuf
-           | 2 -> __sedlex_state_40 lexbuf
-           | 3 -> __sedlex_state_56 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_78 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_59 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_78 lexbuf
-           | 2 -> __sedlex_state_40 lexbuf
-           | 3 -> __sedlex_state_79 lexbuf
-           | 4 -> __sedlex_state_56 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_79 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_80 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_80 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_59 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_80 lexbuf
-           | 2 -> __sedlex_state_40 lexbuf
-           | 3 -> __sedlex_state_79 lexbuf
-           | 4 -> __sedlex_state_56 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_81 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 20;
-          (match __sedlex_partition_78 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_82 lexbuf
-           | 1 -> __sedlex_state_83 lexbuf
-           | 2 -> __sedlex_state_81 lexbuf
-           | 3 -> __sedlex_state_87 lexbuf
-           | 4 -> __sedlex_state_91 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_82 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 19;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_82 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_83 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_62 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_84 lexbuf
-           | 2 -> __sedlex_state_56 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_84 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_64 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_84 lexbuf
-           | 2 -> __sedlex_state_85 lexbuf
-           | 3 -> __sedlex_state_56 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_85 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_86 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_86 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_64 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_86 lexbuf
-           | 2 -> __sedlex_state_85 lexbuf
-           | 3 -> __sedlex_state_56 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_87 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 18;
-          (match __sedlex_partition_79 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_88 lexbuf
-           | 1 -> __sedlex_state_83 lexbuf
-           | 2 -> __sedlex_state_87 lexbuf
-           | 3 -> __sedlex_state_89 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_88 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 17;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_88 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_89 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 17;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_90 lexbuf
-           | 1 -> __sedlex_state_88 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_90 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 17;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_90 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_91 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 19;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_92 lexbuf
-           | 1 -> __sedlex_state_82 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_92 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 19;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_92 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_93 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 18;
-          (match __sedlex_partition_79 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_94 lexbuf
-           | 1 -> __sedlex_state_83 lexbuf
-           | 2 -> __sedlex_state_93 lexbuf
-           | 3 -> __sedlex_state_95 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_94 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 17;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_94 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_95 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 17;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_96 lexbuf
-           | 1 -> __sedlex_state_94 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_96 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 17;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_96 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_97 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 33;
-          (match __sedlex_partition_80 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_98 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_98 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 12;
-          (match __sedlex_partition_81 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_99 lexbuf
-           | 1 -> __sedlex_state_98 lexbuf
-           | 2 -> __sedlex_state_100 lexbuf
-           | 3 -> __sedlex_state_105 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_99 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 11;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_99 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_100 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_26 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_101 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_101 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 12;
-          (match __sedlex_partition_81 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_102 lexbuf
-           | 1 -> __sedlex_state_101 lexbuf
-           | 2 -> __sedlex_state_100 lexbuf
-           | 3 -> __sedlex_state_103 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_102 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 11;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_102 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_103 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 10;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_104 lexbuf
-           | 1 -> __sedlex_state_102 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_104 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 9;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_104 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_105 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 10;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_106 lexbuf
-           | 1 -> __sedlex_state_99 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_106 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 9;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_106 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_107 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 33;
-          (match __sedlex_partition_82 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_108 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_108 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 16;
-          (match __sedlex_partition_83 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_109 lexbuf
-           | 1 -> __sedlex_state_108 lexbuf
-           | 2 -> __sedlex_state_110 lexbuf
-           | 3 -> __sedlex_state_115 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_109 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 15;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_109 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_110 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_17 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_111 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_111 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 16;
-          (match __sedlex_partition_83 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_112 lexbuf
-           | 1 -> __sedlex_state_111 lexbuf
-           | 2 -> __sedlex_state_110 lexbuf
-           | 3 -> __sedlex_state_113 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_112 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 15;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_112 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_113 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 14;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_114 lexbuf
-           | 1 -> __sedlex_state_112 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_114 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 13;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_114 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_115 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 14;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_116 lexbuf
-           | 1 -> __sedlex_state_109 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_116 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 13;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_116 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_117 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 33;
-          (match __sedlex_partition_84 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_118 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_118 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 24;
-          (match __sedlex_partition_85 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_119 lexbuf
-           | 1 -> __sedlex_state_118 lexbuf
-           | 2 -> __sedlex_state_120 lexbuf
-           | 3 -> __sedlex_state_125 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_119 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 23;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_119 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_120 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_121 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_121 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 24;
-          (match __sedlex_partition_85 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_122 lexbuf
-           | 1 -> __sedlex_state_121 lexbuf
-           | 2 -> __sedlex_state_120 lexbuf
-           | 3 -> __sedlex_state_123 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_122 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 23;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_122 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_123 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 22;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_124 lexbuf
-           | 1 -> __sedlex_state_122 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_124 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 21;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_124 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_125 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 22;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_126 lexbuf
-           | 1 -> __sedlex_state_119 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_126 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 21;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_126 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_127 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 32;
-          (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_128 lexbuf
-           | 1 -> __sedlex_state_39 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_128 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 30;
-          (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_128 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_129 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_86 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_77 lexbuf
-           | 2 -> __sedlex_state_130 lexbuf
-           | 3 -> __sedlex_state_40 lexbuf
-           | 4 -> __sedlex_state_131 lexbuf
-           | 5 -> __sedlex_state_127 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_130 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_86 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_77 lexbuf
-           | 2 -> __sedlex_state_130 lexbuf
-           | 3 -> __sedlex_state_40 lexbuf
-           | 4 -> __sedlex_state_131 lexbuf
-           | 5 -> __sedlex_state_127 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_131 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_132 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_132 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 34;
-          (match __sedlex_partition_87 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_39 lexbuf
-           | 1 -> __sedlex_state_83 lexbuf
-           | 2 -> __sedlex_state_132 lexbuf
-           | 3 -> __sedlex_state_131 lexbuf
-           | 4 -> __sedlex_state_127 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_135 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 78;
-          (match __sedlex_partition_88 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_136 lexbuf
-           | 1 -> 55
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_136 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 62;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 61
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_139 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 90;
-          (match __sedlex_partition_89 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_140 lexbuf
-           | 1 -> 91
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_140 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 57;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 53
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_143 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 79;
-          (match __sedlex_partition_89 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 56
-           | 1 -> __sedlex_state_145 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_145 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 66;
-          (match __sedlex_partition_89 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 63
-           | 1 -> __sedlex_state_147 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_147 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 65;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 64
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_149 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 50;
-          (match __sedlex_partition_90 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_150 lexbuf
-           | 1 -> __sedlex_state_152 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_150 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 48;
-          (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 47
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_152 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 49;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 75
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_154 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 94;
-          (match __sedlex_partition_91 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_155 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_155 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_92 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_156 lexbuf
-          | 1 -> __sedlex_state_169 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_156 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_93 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_157 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_157 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_94 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_158 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_158 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_72 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_159 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_159 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_73 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_160 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_160 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_95 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_161 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_161 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_96 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_162 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_162 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_75 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_163 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_163 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_97 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_164 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_164 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_98 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_165 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_165 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_96 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_166 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_166 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_68 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_167 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_167 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_97 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 35
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_169 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_96 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_170 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_170 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_75 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_171 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_171 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_97 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_172 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_172 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_98 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_173 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_173 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_96 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_174 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_174 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_68 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_175 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_175 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_97 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 35
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_177 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 96;
-          (match __sedlex_partition_2 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> __sedlex_state_178 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_178 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_3 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_179 lexbuf
-          | 1 -> __sedlex_state_183 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_179 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_180 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_180 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_181 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_181 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 97
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_183 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_184 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_184 =
-     function
-     | lexbuf ->
-         (match __sedlex_partition_5 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_184 lexbuf
-          | 1 -> 97
-          | _ -> Sedlexing.backtrack lexbuf)
-   and __sedlex_state_186 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 87;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 74
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_190 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 85;
-          (match __sedlex_partition_99 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 73
-           | 1 -> __sedlex_state_192 lexbuf
-           | _ -> Sedlexing.backtrack lexbuf))
-   and __sedlex_state_192 =
-     function
-     | lexbuf ->
-         (Sedlexing.mark lexbuf 52;
-          (match __sedlex_partition_52 (Sedlexing.__private__next_int lexbuf)
-           with
-           | 0 -> 77
-           | _ -> Sedlexing.backtrack lexbuf)) in
-   Sedlexing.start lexbuf;
-   (match __sedlex_state_0 lexbuf with
-    | 0 -> let env = new_line env lexbuf in Continue env
-    | 1 -> Continue env
-    | 2 ->
-        let start_pos = start_pos_of_lexbuf env lexbuf in
-        let buf = Buffer.create 127 in
-        let (env, end_pos) = comment env buf lexbuf in
-        Comment (env, (mk_comment env start_pos end_pos buf true))
-    | 3 ->
-        let pattern = lexeme lexbuf in
-        if not (is_comment_syntax_enabled env)
-        then
-          let start_pos = start_pos_of_lexbuf env lexbuf in
-          let buf = Buffer.create 127 in
-          (Buffer.add_string buf
-             (String.sub pattern 2 ((String.length pattern) - 2));
-           (let (env, end_pos) = comment env buf lexbuf in
-            Comment (env, (mk_comment env start_pos end_pos buf true))))
-        else
-          (let env =
-             if is_in_comment_syntax env
-             then
-               let loc = loc_of_lexbuf env lexbuf in
-               unexpected_error env loc pattern
-             else env in
-           let env = in_comment_syntax true env in
-           let len = Sedlexing.lexeme_length lexbuf in
-           if
-             ((Sedlexing.Utf8.sub_lexeme lexbuf (len - 1) 1) = ":") &&
-               ((Sedlexing.Utf8.sub_lexeme lexbuf (len - 2) 1) <> ":")
-           then Token (env, T_COLON)
-           else Continue env)
-    | 4 ->
-        if is_in_comment_syntax env
-        then let env = in_comment_syntax false env in Continue env
-        else
-          (Sedlexing.rollback lexbuf;
-           (let __sedlex_state_0 =
-              function
-              | lexbuf ->
-                  (match __sedlex_partition_23
-                           (Sedlexing.__private__next_int lexbuf)
-                   with
-                   | 0 -> 0
-                   | _ -> Sedlexing.backtrack lexbuf) in
-            Sedlexing.start lexbuf;
-            (match __sedlex_state_0 lexbuf with
-             | 0 -> Token (env, T_MULT)
-             | _ -> failwith "expected *")))
-    | 5 ->
-        let start_pos = start_pos_of_lexbuf env lexbuf in
-        let buf = Buffer.create 127 in
-        let (env, end_pos) = line_comment env buf lexbuf in
-        Comment (env, (mk_comment env start_pos end_pos buf false))
-    | 6 ->
-        if (Sedlexing.lexeme_start lexbuf) = 0
-        then
-          let (env, _) = line_comment env (Buffer.create 127) lexbuf in
-          Continue env
-        else Token (env, (T_ERROR "#!"))
-    | 7 ->
-        let quote = lexeme lexbuf in
-        let start = start_pos_of_lexbuf env lexbuf in
-        let buf = Buffer.create 127 in
-        let raw = Buffer.create 127 in
-        (Buffer.add_string raw quote;
-         (let octal = false in
-          let (env, _end, octal) =
-            string_quote env quote buf raw octal lexbuf in
-          let loc = { Loc.source = (Lex_env.source env); start; _end } in
-          Token
-            (env,
-              (T_STRING
-                 (loc, (Buffer.contents buf), (Buffer.contents raw), octal)))))
-    | 8 ->
-        let cooked = Buffer.create 127 in
-        let raw = Buffer.create 127 in
-        let literal = Buffer.create 127 in
-        (lexeme_to_buffer lexbuf literal;
-         (let start = start_pos_of_lexbuf env lexbuf in
-          let (env, is_tail) = template_part env cooked raw literal lexbuf in
-          let _end = end_pos_of_lexbuf env lexbuf in
-          let loc = { Loc.source = (Lex_env.source env); start; _end } in
-          Token
-            (env,
-              (T_TEMPLATE_PART
-                 (loc,
-                   {
-                     cooked = (Buffer.contents cooked);
-                     raw = (Buffer.contents raw);
-                     literal = (Buffer.contents literal)
-                   }, is_tail)))))
-    | 9 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_24
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_25
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_26
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_27
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | 1 -> __sedlex_state_4 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_26
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_5 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_27
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | 1 -> __sedlex_state_4 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_BIGINT
-                              { kind = BIG_BINARY; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token bigint"))
-    | 10 ->
-        Token (env, (T_BIGINT { kind = BIG_BINARY; raw = (lexeme lexbuf) }))
-    | 11 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_24
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_25
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_26
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_28
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_3 lexbuf
-                          | 1 -> __sedlex_state_4 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_26
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_5 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_28
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_5 lexbuf
-                          | 1 -> __sedlex_state_4 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf)) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_NUMBER { kind = BINARY; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token bignumber"))
-    | 12 -> Token (env, (T_NUMBER { kind = BINARY; raw = (lexeme lexbuf) }))
-    | 13 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_24
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_29
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_17
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_30
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | 1 -> __sedlex_state_4 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_17
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_5 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_30
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | 1 -> __sedlex_state_4 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_BIGINT
-                              { kind = BIG_OCTAL; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token octbigint"))
-    | 14 ->
-        Token (env, (T_BIGINT { kind = BIG_OCTAL; raw = (lexeme lexbuf) }))
-    | 15 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_24
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_29
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_17
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_31
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_3 lexbuf
-                          | 1 -> __sedlex_state_4 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_17
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_5 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_31
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_5 lexbuf
-                          | 1 -> __sedlex_state_4 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf)) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_NUMBER { kind = OCTAL; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token octnumber"))
-    | 16 -> Token (env, (T_NUMBER { kind = OCTAL; raw = (lexeme lexbuf) }))
-    | 17 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_24
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_32
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | 1 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_33
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_2 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf)) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_NUMBER
-                              {
-                                kind = LEGACY_NON_OCTAL;
-                                raw = (lexeme lexbuf)
-                              }))
-                   | _ -> failwith "unreachable token legacynonoctnumber"))
-    | 18 ->
-        Token
-          (env,
-            (T_NUMBER { kind = LEGACY_NON_OCTAL; raw = (lexeme lexbuf) }))
-    | 19 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_24
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_17
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_17
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_2 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf)) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_NUMBER
-                              { kind = LEGACY_OCTAL; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token legacyoctnumber"))
-    | 20 ->
-        Token
-          (env, (T_NUMBER { kind = LEGACY_OCTAL; raw = (lexeme lexbuf) }))
-    | 21 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_24
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_34
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_4
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_35
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | 1 -> __sedlex_state_4 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_4
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_5 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_35
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | 1 -> __sedlex_state_4 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_BIGINT
-                              { kind = BIG_NORMAL; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token hexbigint"))
-    | 22 ->
-        Token (env, (T_BIGINT { kind = BIG_NORMAL; raw = (lexeme lexbuf) }))
-    | 23 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_24
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_34
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_4
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_36
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_3 lexbuf
-                          | 1 -> __sedlex_state_4 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_4
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_5 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_36
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_5 lexbuf
-                          | 1 -> __sedlex_state_4 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf)) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_NUMBER { kind = NORMAL; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token hexnumber"))
-    | 24 -> Token (env, (T_NUMBER { kind = NORMAL; raw = (lexeme lexbuf) }))
-    | 25 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_37
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | 1 -> __sedlex_state_12 lexbuf
-                         | 2 -> __sedlex_state_17 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_38
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | 2 -> __sedlex_state_10 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_39
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_4 lexbuf
-                         | 1 -> __sedlex_state_5 lexbuf
-                         | 2 -> __sedlex_state_7 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_40
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | 1 -> __sedlex_state_7 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_5 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_41
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | 1 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_7 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_42
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_7 lexbuf
-                         | 1 -> __sedlex_state_8 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_8 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_9 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_9 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_42
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_9 lexbuf
-                         | 1 -> __sedlex_state_8 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_10 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_11 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_11 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_38
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_11 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | 2 -> __sedlex_state_10 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_12 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_43
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_13 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_13 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_44
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_14 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_14 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_38
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_14 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | 2 -> __sedlex_state_15 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_15 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_16 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_16 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_38
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_16 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | 2 -> __sedlex_state_15 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_17 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_45
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_13 lexbuf
-                         | 1 -> __sedlex_state_17 lexbuf
-                         | 2 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       let loc = loc_of_lexbuf env lexbuf in
-                       let env =
-                         lex_error env loc Parse_error.InvalidSciBigInt in
-                       Token
-                         (env,
-                           (T_BIGINT
-                              { kind = BIG_NORMAL; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token scibigint"))
-    | 26 ->
-        let loc = loc_of_lexbuf env lexbuf in
-        let env = lex_error env loc Parse_error.InvalidSciBigInt in
-        Token (env, (T_BIGINT { kind = BIG_NORMAL; raw = (lexeme lexbuf) }))
-    | 27 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_37
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | 1 -> __sedlex_state_11 lexbuf
-                         | 2 -> __sedlex_state_16 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_38
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | 2 -> __sedlex_state_9 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_39
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_4 lexbuf
-                         | 1 -> __sedlex_state_5 lexbuf
-                         | 2 -> __sedlex_state_6 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_40
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | 1 -> __sedlex_state_6 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_5 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_33
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_5 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_6 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_46
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_6 lexbuf
-                          | 1 -> __sedlex_state_7 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_7 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_8 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_8 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_46
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_8 lexbuf
-                          | 1 -> __sedlex_state_7 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_9 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_10 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_10 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_38
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_10 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | 2 -> __sedlex_state_9 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_11 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_43
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_12 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_12 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_44
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_13 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_13 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_38
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_13 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | 2 -> __sedlex_state_14 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_14 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_15 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_15 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_38
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_15 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | 2 -> __sedlex_state_14 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_16 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_45
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_12 lexbuf
-                         | 1 -> __sedlex_state_16 lexbuf
-                         | 2 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_NUMBER { kind = NORMAL; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token scinumber"))
-    | 28 -> Token (env, (T_NUMBER { kind = NORMAL; raw = (lexeme lexbuf) }))
-    | 29 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_37
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | 1 -> __sedlex_state_6 lexbuf
-                         | 2 -> __sedlex_state_8 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_42
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_4 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_42
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_4 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_6 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_47
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_7 lexbuf
-                         | 1 -> __sedlex_state_6 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_7 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_41
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | 1 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_8 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_48
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_7 lexbuf
-                         | 1 -> __sedlex_state_8 lexbuf
-                         | 2 -> __sedlex_state_9 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_9 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_10 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_10 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_48
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_7 lexbuf
-                         | 1 -> __sedlex_state_10 lexbuf
-                         | 2 -> __sedlex_state_9 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       let loc = loc_of_lexbuf env lexbuf in
-                       let env =
-                         lex_error env loc Parse_error.InvalidFloatBigInt in
-                       Token
-                         (env,
-                           (T_BIGINT
-                              { kind = BIG_NORMAL; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token floatbigint"))
-    | 30 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_40
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | 1 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_41
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | 1 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_42
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | 1 -> __sedlex_state_4 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_5 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_42
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_5 lexbuf
-                         | 1 -> __sedlex_state_4 lexbuf
-                         | 2 -> 0
-                         | _ -> Sedlexing.backtrack lexbuf) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_BIGINT
-                              { kind = BIG_NORMAL; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token wholebigint"))
-    | 31 ->
-        let loc = loc_of_lexbuf env lexbuf in
-        let env = lex_error env loc Parse_error.InvalidFloatBigInt in
-        Token (env, (T_BIGINT { kind = BIG_NORMAL; raw = (lexeme lexbuf) }))
-    | 32 ->
-        Token (env, (T_BIGINT { kind = BIG_NORMAL; raw = (lexeme lexbuf) }))
-    | 33 ->
-        recover env lexbuf
-          ~f:(fun env ->
-                fun lexbuf ->
-                  let rec __sedlex_state_0 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_37
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_1 lexbuf
-                         | 1 -> __sedlex_state_5 lexbuf
-                         | 2 -> __sedlex_state_7 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_1 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_2 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_46
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_2 lexbuf
-                          | 1 -> __sedlex_state_3 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_3 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_4 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_4 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_46
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_4 lexbuf
-                          | 1 -> __sedlex_state_3 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_5 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_47
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_6 lexbuf
-                          | 1 -> __sedlex_state_5 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_6 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_33
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_2 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_7 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_48
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_6 lexbuf
-                          | 1 -> __sedlex_state_7 lexbuf
-                          | 2 -> __sedlex_state_8 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf))
-                  and __sedlex_state_8 =
-                    function
-                    | lexbuf ->
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_9 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)
-                  and __sedlex_state_9 =
-                    function
-                    | lexbuf ->
-                        (Sedlexing.mark lexbuf 0;
-                         (match __sedlex_partition_48
-                                  (Sedlexing.__private__next_int lexbuf)
-                          with
-                          | 0 -> __sedlex_state_6 lexbuf
-                          | 1 -> __sedlex_state_9 lexbuf
-                          | 2 -> __sedlex_state_8 lexbuf
-                          | _ -> Sedlexing.backtrack lexbuf)) in
-                  Sedlexing.start lexbuf;
-                  (match __sedlex_state_0 lexbuf with
-                   | 0 ->
-                       Token
-                         (env,
-                           (T_NUMBER { kind = NORMAL; raw = (lexeme lexbuf) }))
-                   | _ -> failwith "unreachable token wholenumber"))
-    | 34 -> Token (env, (T_NUMBER { kind = NORMAL; raw = (lexeme lexbuf) }))
-    | 35 ->
-        let loc = loc_of_lexbuf env lexbuf in
-        let raw = lexeme lexbuf in
-        Token (env, (T_IDENTIFIER { loc; value = raw; raw }))
-    | 36 -> Token (env, T_LCURLY)
-    | 37 -> Token (env, T_RCURLY)
-    | 38 -> Token (env, T_LPAREN)
-    | 39 -> Token (env, T_RPAREN)
-    | 40 -> Token (env, T_LBRACKET)
-    | 41 -> Token (env, T_RBRACKET)
-    | 42 -> Token (env, T_ELLIPSIS)
-    | 43 -> Token (env, T_PERIOD)
-    | 44 -> Token (env, T_SEMICOLON)
-    | 45 -> Token (env, T_COMMA)
-    | 46 -> Token (env, T_COLON)
-    | 47 ->
-        (Sedlexing.rollback lexbuf;
-         (let __sedlex_state_0 =
-            function
-            | lexbuf ->
-                (match __sedlex_partition_49
-                         (Sedlexing.__private__next_int lexbuf)
-                 with
-                 | 0 -> 0
-                 | _ -> Sedlexing.backtrack lexbuf) in
-          Sedlexing.start lexbuf;
-          (match __sedlex_state_0 lexbuf with
-           | 0 -> Token (env, T_PLING)
-           | _ -> failwith "expected ?")))
-    | 48 -> Token (env, T_PLING_PERIOD)
-    | 49 -> Token (env, T_PLING_PLING)
-    | 50 -> Token (env, T_PLING)
-    | 51 -> Token (env, T_AND)
-    | 52 -> Token (env, T_OR)
-    | 53 -> Token (env, T_STRICT_EQUAL)
-    | 54 -> Token (env, T_STRICT_NOT_EQUAL)
-    | 55 -> Token (env, T_LESS_THAN_EQUAL)
-    | 56 -> Token (env, T_GREATER_THAN_EQUAL)
-    | 57 -> Token (env, T_EQUAL)
-    | 58 -> Token (env, T_NOT_EQUAL)
-    | 59 -> Token (env, T_INCR)
-    | 60 -> Token (env, T_DECR)
-    | 61 -> Token (env, T_LSHIFT_ASSIGN)
-    | 62 -> Token (env, T_LSHIFT)
-    | 63 -> Token (env, T_RSHIFT_ASSIGN)
-    | 64 -> Token (env, T_RSHIFT3_ASSIGN)
-    | 65 -> Token (env, T_RSHIFT3)
-    | 66 -> Token (env, T_RSHIFT)
-    | 67 -> Token (env, T_PLUS_ASSIGN)
-    | 68 -> Token (env, T_MINUS_ASSIGN)
-    | 69 -> Token (env, T_MULT_ASSIGN)
-    | 70 -> Token (env, T_EXP_ASSIGN)
-    | 71 -> Token (env, T_MOD_ASSIGN)
-    | 72 -> Token (env, T_BIT_AND_ASSIGN)
-    | 73 -> Token (env, T_BIT_OR_ASSIGN)
-    | 74 -> Token (env, T_BIT_XOR_ASSIGN)
-    | 75 -> Token (env, T_NULLISH_ASSIGN)
-    | 76 -> Token (env, T_AND_ASSIGN)
-    | 77 -> Token (env, T_OR_ASSIGN)
-    | 78 -> Token (env, T_LESS_THAN)
-    | 79 -> Token (env, T_GREATER_THAN)
-    | 80 -> Token (env, T_PLUS)
-    | 81 -> Token (env, T_MINUS)
-    | 82 -> Token (env, T_MULT)
-    | 83 -> Token (env, T_EXP)
-    | 84 -> Token (env, T_MOD)
-    | 85 -> Token (env, T_BIT_OR)
-    | 86 -> Token (env, T_BIT_AND)
-    | 87 -> Token (env, T_BIT_XOR)
-    | 88 -> Token (env, T_NOT)
-    | 89 -> Token (env, T_BIT_NOT)
-    | 90 -> Token (env, T_ASSIGN)
-    | 91 -> Token (env, T_ARROW)
-    | 92 -> Token (env, T_DIV_ASSIGN)
-    | 93 -> Token (env, T_DIV)
-    | 94 -> Token (env, T_AT)
-    | 95 -> Token (env, T_POUND)
-    | 96 -> let env = illegal env (loc_of_lexbuf env lexbuf) in Continue env
-    | 97 ->
-        let start_offset = Sedlexing.lexeme_start lexbuf in
-        ((loop_id_continues lexbuf) |> ignore;
-         (let end_offset = Sedlexing.lexeme_end lexbuf in
-          let loc = loc_of_offsets env start_offset end_offset in
-          Sedlexing.set_lexeme_start lexbuf start_offset;
-          (let raw = Sedlexing.lexeme lexbuf in
-           let (nenv, value) = decode_identifier env raw in
-           match value with
-           | "async" -> Token (env, T_ASYNC)
-           | "await" -> Token (env, T_AWAIT)
-           | "break" -> Token (env, T_BREAK)
-           | "case" -> Token (env, T_CASE)
-           | "catch" -> Token (env, T_CATCH)
-           | "class" -> Token (env, T_CLASS)
-           | "const" -> Token (env, T_CONST)
-           | "continue" -> Token (env, T_CONTINUE)
-           | "debugger" -> Token (env, T_DEBUGGER)
-           | "declare" -> Token (env, T_DECLARE)
-           | "default" -> Token (env, T_DEFAULT)
-           | "delete" -> Token (env, T_DELETE)
-           | "do" -> Token (env, T_DO)
-           | "else" -> Token (env, T_ELSE)
-           | "enum" -> Token (env, T_ENUM)
-           | "export" -> Token (env, T_EXPORT)
-           | "extends" -> Token (env, T_EXTENDS)
-           | "false" -> Token (env, T_FALSE)
-           | "finally" -> Token (env, T_FINALLY)
-           | "for" -> Token (env, T_FOR)
-           | "function" -> Token (env, T_FUNCTION)
-           | "if" -> Token (env, T_IF)
-           | "implements" -> Token (env, T_IMPLEMENTS)
-           | "import" -> Token (env, T_IMPORT)
-           | "in" -> Token (env, T_IN)
-           | "instanceof" -> Token (env, T_INSTANCEOF)
-           | "interface" -> Token (env, T_INTERFACE)
-           | "let" -> Token (env, T_LET)
-           | "new" -> Token (env, T_NEW)
-           | "null" -> Token (env, T_NULL)
-           | "of" -> Token (env, T_OF)
-           | "opaque" -> Token (env, T_OPAQUE)
-           | "package" -> Token (env, T_PACKAGE)
-           | "private" -> Token (env, T_PRIVATE)
-           | "protected" -> Token (env, T_PROTECTED)
-           | "public" -> Token (env, T_PUBLIC)
-           | "return" -> Token (env, T_RETURN)
-           | "static" -> Token (env, T_STATIC)
-           | "super" -> Token (env, T_SUPER)
-           | "switch" -> Token (env, T_SWITCH)
-           | "this" -> Token (env, T_THIS)
-           | "throw" -> Token (env, T_THROW)
-           | "true" -> Token (env, T_TRUE)
-           | "try" -> Token (env, T_TRY)
-           | "type" -> Token (env, T_TYPE)
-           | "typeof" -> Token (env, T_TYPEOF)
-           | "var" -> Token (env, T_VAR)
-           | "void" -> Token (env, T_VOID)
-           | "while" -> Token (env, T_WHILE)
-           | "with" -> Token (env, T_WITH)
-           | "yield" -> Token (env, T_YIELD)
-           | _ ->
-               Token
-                 (nenv,
-                   (T_IDENTIFIER
-                      { loc; value; raw = (Sedlexing.string_of_utf8 raw) })))))
-    | 98 ->
-        let env =
-          if is_in_comment_syntax env
-          then
-            let loc = loc_of_lexbuf env lexbuf in
-            lex_error env loc Parse_error.UnexpectedEOS
-          else env in
-        Token (env, T_EOF)
-    | 99 ->
-        let env = illegal env (loc_of_lexbuf env lexbuf) in
-        Token (env, (T_ERROR (lexeme lexbuf)))
-    | _ -> failwith "unreachable token") : result)
-let rec regexp_class env buf lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_100 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 0
-         | 1 -> __sedlex_state_2 lexbuf
-         | 2 -> 4
-         | 3 -> __sedlex_state_4 lexbuf
-         | 4 -> __sedlex_state_6 lexbuf
-         | 5 -> 3
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_2 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 5;
-         (match __sedlex_partition_101 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_2 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 4;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 4
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_6 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 5;
-         (match __sedlex_partition_102 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 1
-          | 1 -> 2
-          | _ -> Sedlexing.backtrack lexbuf)) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 -> env
-   | 1 -> (Buffer.add_string buf "\\\\"; regexp_class env buf lexbuf)
-   | 2 ->
-       (Buffer.add_char buf '\\';
-        Buffer.add_char buf ']';
-        regexp_class env buf lexbuf)
-   | 3 -> (Buffer.add_char buf ']'; env)
-   | 4 ->
-       let loc = loc_of_lexbuf env lexbuf in
-       let env = lex_error env loc Parse_error.UnterminatedRegExp in
-       let env = new_line env lexbuf in env
-   | 5 ->
-       let str = lexeme lexbuf in
-       (Buffer.add_string buf str; regexp_class env buf lexbuf)
-   | _ -> failwith "unreachable regexp_class")
-let rec regexp_body env buf lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_103 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 0
-         | 1 -> __sedlex_state_2 lexbuf
-         | 2 -> 6
-         | 3 -> __sedlex_state_4 lexbuf
-         | 4 -> __sedlex_state_6 lexbuf
-         | 5 -> 5
-         | 6 -> __sedlex_state_9 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_2 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 7;
-         (match __sedlex_partition_104 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_2 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 6;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 6
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_6 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 4;
-         (match __sedlex_partition_105 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_7 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_7 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 3;
-         (match __sedlex_partition_105 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_7 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_9 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 7;
-         (match __sedlex_partition_106 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 2
-          | 1 -> 1
-          | 2 -> __sedlex_state_12 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_12 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 1;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 1
-          | _ -> Sedlexing.backtrack lexbuf)) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 ->
-       let loc = loc_of_lexbuf env lexbuf in
-       let env = lex_error env loc Parse_error.UnterminatedRegExp in
-       (env, "")
-   | 1 ->
-       let loc = loc_of_lexbuf env lexbuf in
-       let env = lex_error env loc Parse_error.UnterminatedRegExp in
-       let env = new_line env lexbuf in (env, "")
-   | 2 ->
-       let s = lexeme lexbuf in
-       (Buffer.add_string buf s; regexp_body env buf lexbuf)
-   | 3 ->
-       let flags =
-         let str = lexeme lexbuf in
-         String.sub str 1 ((String.length str) - 1) in
-       (env, flags)
-   | 4 -> (env, "")
-   | 5 ->
-       (Buffer.add_char buf '[';
-        (let env = regexp_class env buf lexbuf in regexp_body env buf lexbuf))
-   | 6 ->
-       let loc = loc_of_lexbuf env lexbuf in
-       let env = lex_error env loc Parse_error.UnterminatedRegExp in
-       let env = new_line env lexbuf in (env, "")
-   | 7 ->
-       let str = lexeme lexbuf in
-       (Buffer.add_string buf str; regexp_body env buf lexbuf)
-   | _ -> failwith "unreachable regexp_body")
-let regexp env lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_107 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 0
-         | 1 -> 6
-         | 2 -> __sedlex_state_3 lexbuf
-         | 3 -> 1
-         | 4 -> __sedlex_state_6 lexbuf
-         | 5 -> __sedlex_state_8 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_3 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 2;
-         (match __sedlex_partition_51 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_4 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 2;
-         (match __sedlex_partition_51 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_4 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_6 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 1;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 1
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_8 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 5;
-         (match __sedlex_partition_108 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 4
-          | 1 -> 3
-          | _ -> Sedlexing.backtrack lexbuf)) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 -> Token (env, T_EOF)
-   | 1 -> let env = new_line env lexbuf in Continue env
-   | 2 -> Continue env
-   | 3 ->
-       let start_pos = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let (env, end_pos) = line_comment env buf lexbuf in
-       Comment (env, (mk_comment env start_pos end_pos buf false))
-   | 4 ->
-       let start_pos = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let (env, end_pos) = comment env buf lexbuf in
-       Comment (env, (mk_comment env start_pos end_pos buf true))
-   | 5 ->
-       let start = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let (env, flags) = regexp_body env buf lexbuf in
-       let _end = end_pos_of_lexbuf env lexbuf in
-       let loc = { Loc.source = (Lex_env.source env); start; _end } in
-       Token (env, (T_REGEXP (loc, (Buffer.contents buf), flags)))
-   | 6 ->
-       let env = illegal env (loc_of_lexbuf env lexbuf) in
-       Token (env, (T_ERROR (lexeme lexbuf)))
-   | _ -> failwith "unreachable regexp")
-let rec jsx_text env mode buf raw lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_109 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 1
-         | 1 -> __sedlex_state_2 lexbuf
-         | 2 -> 2
-         | 3 -> __sedlex_state_4 lexbuf
-         | 4 -> 0
-         | 5 -> __sedlex_state_7 lexbuf
-         | 6 -> __sedlex_state_23 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_2 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 6;
-         (match __sedlex_partition_110 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_2 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 2;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 2
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_7 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 6;
-         (match __sedlex_partition_111 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_8 lexbuf
-          | 1 -> __sedlex_state_14 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_8 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_112 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_9 lexbuf
-         | 1 -> __sedlex_state_11 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_9 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_113 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_9 lexbuf
-         | 1 -> 4
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_11 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_12 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_12 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_114 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_12 lexbuf
-         | 1 -> 3
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_14 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_15 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_15 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_115 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_16 lexbuf
-         | 1 -> 5
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_16 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_115 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_17 lexbuf
-         | 1 -> 5
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_17 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_115 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_18 lexbuf
-         | 1 -> 5
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_18 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_115 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_19 lexbuf
-         | 1 -> 5
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_19 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_115 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_20 lexbuf
-         | 1 -> 5
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_20 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_115 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_21 lexbuf
-         | 1 -> 5
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_21 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_116 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 5
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_23 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 0;
-         (match __sedlex_partition_110 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_2 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf)) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 ->
-       let c = lexeme lexbuf in
-       (match (mode, c) with
-        | (JSX_SINGLE_QUOTED_TEXT, "'") | (JSX_DOUBLE_QUOTED_TEXT, "\"") ->
-            env
-        | (JSX_CHILD_TEXT, ("<" | "{")) -> (Sedlexing.rollback lexbuf; env)
-        | (JSX_CHILD_TEXT, ">") ->
-            unexpected_error_w_suggest env (loc_of_lexbuf env lexbuf) ">"
-              "{'>'}"
-        | (JSX_CHILD_TEXT, "}") ->
-            unexpected_error_w_suggest env (loc_of_lexbuf env lexbuf) "}"
-              "{'}'}"
-        | _ ->
-            (Buffer.add_string raw c;
-             Buffer.add_string buf c;
-             jsx_text env mode buf raw lexbuf))
-   | 1 -> let env = illegal env (loc_of_lexbuf env lexbuf) in env
-   | 2 ->
-       let lt = lexeme lexbuf in
-       (Buffer.add_string raw lt;
-        Buffer.add_string buf lt;
-        (let env = new_line env lexbuf in jsx_text env mode buf raw lexbuf))
-   | 3 ->
-       let s = lexeme lexbuf in
-       let n = String.sub s 3 ((String.length s) - 4) in
-       (Buffer.add_string raw s;
-        (let code = int_of_string ("0x" ^ n) in
-         Wtf8.add_wtf_8 buf code; jsx_text env mode buf raw lexbuf))
-   | 4 ->
-       let s = lexeme lexbuf in
-       let n = String.sub s 2 ((String.length s) - 3) in
-       (Buffer.add_string raw s;
-        (let code = int_of_string n in
-         Wtf8.add_wtf_8 buf code; jsx_text env mode buf raw lexbuf))
-   | 5 ->
-       let s = lexeme lexbuf in
-       let entity = String.sub s 1 ((String.length s) - 2) in
-       (Buffer.add_string raw s;
-        (let code =
-           match entity with
-           | "quot" -> Some 0x0022
-           | "amp" -> Some 0x0026
-           | "apos" -> Some 0x0027
-           | "lt" -> Some 0x003C
-           | "gt" -> Some 0x003E
-           | "nbsp" -> Some 0x00A0
-           | "iexcl" -> Some 0x00A1
-           | "cent" -> Some 0x00A2
-           | "pound" -> Some 0x00A3
-           | "curren" -> Some 0x00A4
-           | "yen" -> Some 0x00A5
-           | "brvbar" -> Some 0x00A6
-           | "sect" -> Some 0x00A7
-           | "uml" -> Some 0x00A8
-           | "copy" -> Some 0x00A9
-           | "ordf" -> Some 0x00AA
-           | "laquo" -> Some 0x00AB
-           | "not" -> Some 0x00AC
-           | "shy" -> Some 0x00AD
-           | "reg" -> Some 0x00AE
-           | "macr" -> Some 0x00AF
-           | "deg" -> Some 0x00B0
-           | "plusmn" -> Some 0x00B1
-           | "sup2" -> Some 0x00B2
-           | "sup3" -> Some 0x00B3
-           | "acute" -> Some 0x00B4
-           | "micro" -> Some 0x00B5
-           | "para" -> Some 0x00B6
-           | "middot" -> Some 0x00B7
-           | "cedil" -> Some 0x00B8
-           | "sup1" -> Some 0x00B9
-           | "ordm" -> Some 0x00BA
-           | "raquo" -> Some 0x00BB
-           | "frac14" -> Some 0x00BC
-           | "frac12" -> Some 0x00BD
-           | "frac34" -> Some 0x00BE
-           | "iquest" -> Some 0x00BF
-           | "Agrave" -> Some 0x00C0
-           | "Aacute" -> Some 0x00C1
-           | "Acirc" -> Some 0x00C2
-           | "Atilde" -> Some 0x00C3
-           | "Auml" -> Some 0x00C4
-           | "Aring" -> Some 0x00C5
-           | "AElig" -> Some 0x00C6
-           | "Ccedil" -> Some 0x00C7
-           | "Egrave" -> Some 0x00C8
-           | "Eacute" -> Some 0x00C9
-           | "Ecirc" -> Some 0x00CA
-           | "Euml" -> Some 0x00CB
-           | "Igrave" -> Some 0x00CC
-           | "Iacute" -> Some 0x00CD
-           | "Icirc" -> Some 0x00CE
-           | "Iuml" -> Some 0x00CF
-           | "ETH" -> Some 0x00D0
-           | "Ntilde" -> Some 0x00D1
-           | "Ograve" -> Some 0x00D2
-           | "Oacute" -> Some 0x00D3
-           | "Ocirc" -> Some 0x00D4
-           | "Otilde" -> Some 0x00D5
-           | "Ouml" -> Some 0x00D6
-           | "times" -> Some 0x00D7
-           | "Oslash" -> Some 0x00D8
-           | "Ugrave" -> Some 0x00D9
-           | "Uacute" -> Some 0x00DA
-           | "Ucirc" -> Some 0x00DB
-           | "Uuml" -> Some 0x00DC
-           | "Yacute" -> Some 0x00DD
-           | "THORN" -> Some 0x00DE
-           | "szlig" -> Some 0x00DF
-           | "agrave" -> Some 0x00E0
-           | "aacute" -> Some 0x00E1
-           | "acirc" -> Some 0x00E2
-           | "atilde" -> Some 0x00E3
-           | "auml" -> Some 0x00E4
-           | "aring" -> Some 0x00E5
-           | "aelig" -> Some 0x00E6
-           | "ccedil" -> Some 0x00E7
-           | "egrave" -> Some 0x00E8
-           | "eacute" -> Some 0x00E9
-           | "ecirc" -> Some 0x00EA
-           | "euml" -> Some 0x00EB
-           | "igrave" -> Some 0x00EC
-           | "iacute" -> Some 0x00ED
-           | "icirc" -> Some 0x00EE
-           | "iuml" -> Some 0x00EF
-           | "eth" -> Some 0x00F0
-           | "ntilde" -> Some 0x00F1
-           | "ograve" -> Some 0x00F2
-           | "oacute" -> Some 0x00F3
-           | "ocirc" -> Some 0x00F4
-           | "otilde" -> Some 0x00F5
-           | "ouml" -> Some 0x00F6
-           | "divide" -> Some 0x00F7
-           | "oslash" -> Some 0x00F8
-           | "ugrave" -> Some 0x00F9
-           | "uacute" -> Some 0x00FA
-           | "ucirc" -> Some 0x00FB
-           | "uuml" -> Some 0x00FC
-           | "yacute" -> Some 0x00FD
-           | "thorn" -> Some 0x00FE
-           | "yuml" -> Some 0x00FF
-           | "OElig" -> Some 0x0152
-           | "oelig" -> Some 0x0153
-           | "Scaron" -> Some 0x0160
-           | "scaron" -> Some 0x0161
-           | "Yuml" -> Some 0x0178
-           | "fnof" -> Some 0x0192
-           | "circ" -> Some 0x02C6
-           | "tilde" -> Some 0x02DC
-           | "Alpha" -> Some 0x0391
-           | "Beta" -> Some 0x0392
-           | "Gamma" -> Some 0x0393
-           | "Delta" -> Some 0x0394
-           | "Epsilon" -> Some 0x0395
-           | "Zeta" -> Some 0x0396
-           | "Eta" -> Some 0x0397
-           | "Theta" -> Some 0x0398
-           | "Iota" -> Some 0x0399
-           | "Kappa" -> Some 0x039A
-           | "Lambda" -> Some 0x039B
-           | "Mu" -> Some 0x039C
-           | "Nu" -> Some 0x039D
-           | "Xi" -> Some 0x039E
-           | "Omicron" -> Some 0x039F
-           | "Pi" -> Some 0x03A0
-           | "Rho" -> Some 0x03A1
-           | "Sigma" -> Some 0x03A3
-           | "Tau" -> Some 0x03A4
-           | "Upsilon" -> Some 0x03A5
-           | "Phi" -> Some 0x03A6
-           | "Chi" -> Some 0x03A7
-           | "Psi" -> Some 0x03A8
-           | "Omega" -> Some 0x03A9
-           | "alpha" -> Some 0x03B1
-           | "beta" -> Some 0x03B2
-           | "gamma" -> Some 0x03B3
-           | "delta" -> Some 0x03B4
-           | "epsilon" -> Some 0x03B5
-           | "zeta" -> Some 0x03B6
-           | "eta" -> Some 0x03B7
-           | "theta" -> Some 0x03B8
-           | "iota" -> Some 0x03B9
-           | "kappa" -> Some 0x03BA
-           | "lambda" -> Some 0x03BB
-           | "mu" -> Some 0x03BC
-           | "nu" -> Some 0x03BD
-           | "xi" -> Some 0x03BE
-           | "omicron" -> Some 0x03BF
-           | "pi" -> Some 0x03C0
-           | "rho" -> Some 0x03C1
-           | "sigmaf" -> Some 0x03C2
-           | "sigma" -> Some 0x03C3
-           | "tau" -> Some 0x03C4
-           | "upsilon" -> Some 0x03C5
-           | "phi" -> Some 0x03C6
-           | "chi" -> Some 0x03C7
-           | "psi" -> Some 0x03C8
-           | "omega" -> Some 0x03C9
-           | "thetasym" -> Some 0x03D1
-           | "upsih" -> Some 0x03D2
-           | "piv" -> Some 0x03D6
-           | "ensp" -> Some 0x2002
-           | "emsp" -> Some 0x2003
-           | "thinsp" -> Some 0x2009
-           | "zwnj" -> Some 0x200C
-           | "zwj" -> Some 0x200D
-           | "lrm" -> Some 0x200E
-           | "rlm" -> Some 0x200F
-           | "ndash" -> Some 0x2013
-           | "mdash" -> Some 0x2014
-           | "lsquo" -> Some 0x2018
-           | "rsquo" -> Some 0x2019
-           | "sbquo" -> Some 0x201A
-           | "ldquo" -> Some 0x201C
-           | "rdquo" -> Some 0x201D
-           | "bdquo" -> Some 0x201E
-           | "dagger" -> Some 0x2020
-           | "Dagger" -> Some 0x2021
-           | "bull" -> Some 0x2022
-           | "hellip" -> Some 0x2026
-           | "permil" -> Some 0x2030
-           | "prime" -> Some 0x2032
-           | "Prime" -> Some 0x2033
-           | "lsaquo" -> Some 0x2039
-           | "rsaquo" -> Some 0x203A
-           | "oline" -> Some 0x203E
-           | "frasl" -> Some 0x2044
-           | "euro" -> Some 0x20AC
-           | "image" -> Some 0x2111
-           | "weierp" -> Some 0x2118
-           | "real" -> Some 0x211C
-           | "trade" -> Some 0x2122
-           | "alefsym" -> Some 0x2135
-           | "larr" -> Some 0x2190
-           | "uarr" -> Some 0x2191
-           | "rarr" -> Some 0x2192
-           | "darr" -> Some 0x2193
-           | "harr" -> Some 0x2194
-           | "crarr" -> Some 0x21B5
-           | "lArr" -> Some 0x21D0
-           | "uArr" -> Some 0x21D1
-           | "rArr" -> Some 0x21D2
-           | "dArr" -> Some 0x21D3
-           | "hArr" -> Some 0x21D4
-           | "forall" -> Some 0x2200
-           | "part" -> Some 0x2202
-           | "exist" -> Some 0x2203
-           | "empty" -> Some 0x2205
-           | "nabla" -> Some 0x2207
-           | "isin" -> Some 0x2208
-           | "notin" -> Some 0x2209
-           | "ni" -> Some 0x220B
-           | "prod" -> Some 0x220F
-           | "sum" -> Some 0x2211
-           | "minus" -> Some 0x2212
-           | "lowast" -> Some 0x2217
-           | "radic" -> Some 0x221A
-           | "prop" -> Some 0x221D
-           | "infin" -> Some 0x221E
-           | "ang" -> Some 0x2220
-           | "and" -> Some 0x2227
-           | "or" -> Some 0x2228
-           | "cap" -> Some 0x2229
-           | "cup" -> Some 0x222A
-           | "'int'" -> Some 0x222B
-           | "there4" -> Some 0x2234
-           | "sim" -> Some 0x223C
-           | "cong" -> Some 0x2245
-           | "asymp" -> Some 0x2248
-           | "ne" -> Some 0x2260
-           | "equiv" -> Some 0x2261
-           | "le" -> Some 0x2264
-           | "ge" -> Some 0x2265
-           | "sub" -> Some 0x2282
-           | "sup" -> Some 0x2283
-           | "nsub" -> Some 0x2284
-           | "sube" -> Some 0x2286
-           | "supe" -> Some 0x2287
-           | "oplus" -> Some 0x2295
-           | "otimes" -> Some 0x2297
-           | "perp" -> Some 0x22A5
-           | "sdot" -> Some 0x22C5
-           | "lceil" -> Some 0x2308
-           | "rceil" -> Some 0x2309
-           | "lfloor" -> Some 0x230A
-           | "rfloor" -> Some 0x230B
-           | "lang" -> Some 0x27E8
-           | "rang" -> Some 0x27E9
-           | "loz" -> Some 0x25CA
-           | "spades" -> Some 0x2660
-           | "clubs" -> Some 0x2663
-           | "hearts" -> Some 0x2665
-           | "diams" -> Some 0x2666
-           | _ -> None in
-         (match code with
-          | Some code -> Wtf8.add_wtf_8 buf code
-          | None -> Buffer.add_string buf ("&" ^ (entity ^ ";")));
-         jsx_text env mode buf raw lexbuf))
-   | 6 ->
-       let c = lexeme lexbuf in
-       (Buffer.add_string raw c;
-        Buffer.add_string buf c;
-        jsx_text env mode buf raw lexbuf)
-   | _ -> failwith "unreachable jsxtext")
-let jsx_tag env lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_117 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 0
-         | 1 -> 14
-         | 2 -> __sedlex_state_3 lexbuf
-         | 3 -> 1
-         | 4 -> __sedlex_state_6 lexbuf
-         | 5 -> 12
-         | 6 -> 13
-         | 7 -> 10
-         | 8 -> __sedlex_state_11 lexbuf
-         | 9 -> 9
-         | 10 -> 5
-         | 11 -> 11
-         | 12 -> 7
-         | 13 -> __sedlex_state_18 lexbuf
-         | 14 -> 8
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_3 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 2;
-         (match __sedlex_partition_51 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_4 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 2;
-         (match __sedlex_partition_51 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_4 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_6 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 1;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 1
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_11 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 6;
-         (match __sedlex_partition_108 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 4
-          | 1 -> 3
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_18 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 14;
-         (match __sedlex_partition_2 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_19 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_19 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_3 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_20 lexbuf
-         | 1 -> __sedlex_state_24 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_20 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_21 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_21 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_22 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_22 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 13
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_24 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_25 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_25 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_5 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_25 lexbuf
-         | 1 -> 13
-         | _ -> Sedlexing.backtrack lexbuf) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 -> Token (env, T_EOF)
-   | 1 -> let env = new_line env lexbuf in Continue env
-   | 2 -> Continue env
-   | 3 ->
-       let start_pos = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let (env, end_pos) = line_comment env buf lexbuf in
-       Comment (env, (mk_comment env start_pos end_pos buf false))
-   | 4 ->
-       let start_pos = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let (env, end_pos) = comment env buf lexbuf in
-       Comment (env, (mk_comment env start_pos end_pos buf true))
-   | 5 -> Token (env, T_LESS_THAN)
-   | 6 -> Token (env, T_DIV)
-   | 7 -> Token (env, T_GREATER_THAN)
-   | 8 -> Token (env, T_LCURLY)
-   | 9 -> Token (env, T_COLON)
-   | 10 -> Token (env, T_PERIOD)
-   | 11 -> Token (env, T_ASSIGN)
-   | 12 ->
-       let quote = lexeme lexbuf in
-       let start = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let raw = Buffer.create 127 in
-       (Buffer.add_string raw quote;
-        (let mode =
-           if quote = "'"
-           then JSX_SINGLE_QUOTED_TEXT
-           else JSX_DOUBLE_QUOTED_TEXT in
-         let env = jsx_text env mode buf raw lexbuf in
-         let _end = end_pos_of_lexbuf env lexbuf in
-         Buffer.add_string raw quote;
-         (let value = Buffer.contents buf in
-          let raw = Buffer.contents raw in
-          let loc = { Loc.source = (Lex_env.source env); start; _end } in
-          Token (env, (T_JSX_TEXT (loc, value, raw))))))
-   | 13 ->
-       let start_offset = Sedlexing.lexeme_start lexbuf in
-       (loop_jsx_id_continues lexbuf;
-        (let end_offset = Sedlexing.lexeme_end lexbuf in
-         Sedlexing.set_lexeme_start lexbuf start_offset;
-         (let raw = Sedlexing.lexeme lexbuf in
-          let loc = loc_of_offsets env start_offset end_offset in
-          Token
-            (env,
-              (T_JSX_IDENTIFIER { raw = (Sedlexing.string_of_utf8 raw); loc })))))
-   | 14 -> Token (env, (T_ERROR (lexeme lexbuf)))
-   | _ -> failwith "unreachable jsx_tag")
-let jsx_child env start buf raw lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_118 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 1
-         | 1 -> 4
-         | 2 -> 0
-         | 3 -> __sedlex_state_4 lexbuf
-         | 4 -> 2
-         | 5 -> 3
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 0;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 0
-          | _ -> Sedlexing.backtrack lexbuf)) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 ->
-       let lt = lexeme lexbuf in
-       (Buffer.add_string raw lt;
-        Buffer.add_string buf lt;
-        (let env = new_line env lexbuf in
-         let env = jsx_text env JSX_CHILD_TEXT buf raw lexbuf in
-         let _end = end_pos_of_lexbuf env lexbuf in
-         let value = Buffer.contents buf in
-         let raw = Buffer.contents raw in
-         let loc = { Loc.source = (Lex_env.source env); start; _end } in
-         (env, (T_JSX_TEXT (loc, value, raw)))))
-   | 1 -> (env, T_EOF)
-   | 2 -> (env, T_LESS_THAN)
-   | 3 -> (env, T_LCURLY)
-   | 4 ->
-       (Sedlexing.rollback lexbuf;
-        (let env = jsx_text env JSX_CHILD_TEXT buf raw lexbuf in
-         let _end = end_pos_of_lexbuf env lexbuf in
-         let value = Buffer.contents buf in
-         let raw = Buffer.contents raw in
-         let loc = { Loc.source = (Lex_env.source env); start; _end } in
-         (env, (T_JSX_TEXT (loc, value, raw)))))
-   | _ -> failwith "unreachable jsx_child")
-let template_tail env lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_119 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 5
-         | 1 -> __sedlex_state_2 lexbuf
-         | 2 -> 0
-         | 3 -> __sedlex_state_5 lexbuf
-         | 4 -> __sedlex_state_7 lexbuf
-         | 5 -> 4
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_2 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 1;
-         (match __sedlex_partition_51 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_3 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_3 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 1;
-         (match __sedlex_partition_51 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_3 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_5 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 0;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 0
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_7 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 5;
-         (match __sedlex_partition_108 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 3
-          | 1 -> 2
-          | _ -> Sedlexing.backtrack lexbuf)) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 -> let env = new_line env lexbuf in Continue env
-   | 1 -> Continue env
-   | 2 ->
-       let start_pos = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let (env, end_pos) = line_comment env buf lexbuf in
-       Comment (env, (mk_comment env start_pos end_pos buf false))
-   | 3 ->
-       let start_pos = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let (env, end_pos) = comment env buf lexbuf in
-       Comment (env, (mk_comment env start_pos end_pos buf true))
-   | 4 ->
-       let start = start_pos_of_lexbuf env lexbuf in
-       let cooked = Buffer.create 127 in
-       let raw = Buffer.create 127 in
-       let literal = Buffer.create 127 in
-       (Buffer.add_string literal "}";
-        (let (env, is_tail) = template_part env cooked raw literal lexbuf in
-         let _end = end_pos_of_lexbuf env lexbuf in
-         let loc = { Loc.source = (Lex_env.source env); start; _end } in
-         Token
-           (env,
-             (T_TEMPLATE_PART
-                (loc,
-                  {
-                    cooked = (Buffer.contents cooked);
-                    raw = (Buffer.contents raw);
-                    literal = (Buffer.contents literal)
-                  }, is_tail)))))
-   | 5 ->
-       let env = illegal env (loc_of_lexbuf env lexbuf) in
-       Token
-         (env,
-           (T_TEMPLATE_PART
-              ((loc_of_lexbuf env lexbuf),
-                { cooked = ""; raw = ""; literal = "" }, true)))
-   | _ -> failwith "unreachable template_tail")
-let type_token env lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_126 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 62
-         | 1 -> 63
-         | 2 -> __sedlex_state_3 lexbuf
-         | 3 -> 0
-         | 4 -> __sedlex_state_6 lexbuf
-         | 5 -> 6
-         | 6 -> 61
-         | 7 -> __sedlex_state_10 lexbuf
-         | 8 -> 56
-         | 9 -> 38
-         | 10 -> 39
-         | 11 -> __sedlex_state_20 lexbuf
-         | 12 -> 59
-         | 13 -> 43
-         | 14 -> __sedlex_state_24 lexbuf
-         | 15 -> __sedlex_state_97 lexbuf
-         | 16 -> __sedlex_state_100 lexbuf
-         | 17 -> __sedlex_state_117 lexbuf
-         | 18 -> __sedlex_state_118 lexbuf
-         | 19 -> 44
-         | 20 -> 42
-         | 21 -> 49
-         | 22 -> __sedlex_state_122 lexbuf
-         | 23 -> 50
-         | 24 -> __sedlex_state_125 lexbuf
-         | 25 -> 32
-         | 26 -> __sedlex_state_128 lexbuf
-         | 27 -> 33
-         | 28 -> __sedlex_state_137 lexbuf
-         | 29 -> __sedlex_state_139 lexbuf
-         | 30 -> 35
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_3 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 1;
-         (match __sedlex_partition_51 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_4 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 1;
-         (match __sedlex_partition_51 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_4 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_6 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 0;
-         (match __sedlex_partition_11 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 0
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_10 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 63;
-         (match __sedlex_partition_73 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_11 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_11 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_127 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_12 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_12 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_75 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_13 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_13 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_73 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_14 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_14 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_128 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_15 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_15 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_93 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 31
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_20 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 53;
-         (match __sedlex_partition_13 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 4
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_24 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 60;
-         (match __sedlex_partition_123 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_25 lexbuf
-          | 1 -> __sedlex_state_26 lexbuf
-          | 2 -> __sedlex_state_47 lexbuf
-          | 3 -> __sedlex_state_94 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_25 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_123 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_25 lexbuf
-         | 1 -> __sedlex_state_26 lexbuf
-         | 2 -> __sedlex_state_47 lexbuf
-         | 3 -> __sedlex_state_94 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_26 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_27 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_27 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_59 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_27 lexbuf
-          | 2 -> __sedlex_state_29 lexbuf
-          | 3 -> __sedlex_state_43 lexbuf
-          | 4 -> __sedlex_state_45 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_28 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 29;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_29 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 29;
-         (match __sedlex_partition_61 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_30 lexbuf
-          | 2 -> __sedlex_state_38 lexbuf
-          | 3 -> __sedlex_state_42 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_30 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_40 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_31 lexbuf
-         | 1 -> __sedlex_state_35 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_31 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 24;
-         (match __sedlex_partition_62 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_32 lexbuf
-          | 1 -> __sedlex_state_31 lexbuf
-          | 2 -> __sedlex_state_33 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_32 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 23;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_32 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_33 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 22;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_34 lexbuf
-          | 1 -> __sedlex_state_32 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_34 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 21;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_34 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_35 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 24;
-         (match __sedlex_partition_64 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_32 lexbuf
-          | 1 -> __sedlex_state_35 lexbuf
-          | 2 -> __sedlex_state_36 lexbuf
-          | 3 -> __sedlex_state_33 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_36 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_37 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_37 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 24;
-         (match __sedlex_partition_64 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_32 lexbuf
-          | 1 -> __sedlex_state_37 lexbuf
-          | 2 -> __sedlex_state_36 lexbuf
-          | 3 -> __sedlex_state_33 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_38 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 24;
-         (match __sedlex_partition_62 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_39 lexbuf
-          | 1 -> __sedlex_state_38 lexbuf
-          | 2 -> __sedlex_state_40 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_39 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 23;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_39 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_40 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 22;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_41 lexbuf
-          | 1 -> __sedlex_state_39 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_41 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 21;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_41 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_42 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 24;
-         (match __sedlex_partition_64 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_39 lexbuf
-          | 1 -> __sedlex_state_42 lexbuf
-          | 2 -> __sedlex_state_36 lexbuf
-          | 3 -> __sedlex_state_40 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_43 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_44 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_44 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_59 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_44 lexbuf
-          | 2 -> __sedlex_state_29 lexbuf
-          | 3 -> __sedlex_state_43 lexbuf
-          | 4 -> __sedlex_state_45 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_45 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 27;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_46 lexbuf
-          | 1 -> __sedlex_state_28 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_46 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 25;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_46 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_47 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_76 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_48 lexbuf
-          | 2 -> __sedlex_state_52 lexbuf
-          | 3 -> __sedlex_state_61 lexbuf
-          | 4 -> __sedlex_state_64 lexbuf
-          | 5 -> __sedlex_state_29 lexbuf
-          | 6 -> __sedlex_state_74 lexbuf
-          | 7 -> __sedlex_state_84 lexbuf
-          | 8 -> __sedlex_state_62 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_48 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_77 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_49 lexbuf
-          | 2 -> __sedlex_state_29 lexbuf
-          | 3 -> __sedlex_state_45 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_49 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_59 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_49 lexbuf
-          | 2 -> __sedlex_state_29 lexbuf
-          | 3 -> __sedlex_state_50 lexbuf
-          | 4 -> __sedlex_state_45 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_50 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_51 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_51 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_59 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_51 lexbuf
-          | 2 -> __sedlex_state_29 lexbuf
-          | 3 -> __sedlex_state_50 lexbuf
-          | 4 -> __sedlex_state_45 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_52 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 16;
-         (match __sedlex_partition_78 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_53 lexbuf
-          | 1 -> __sedlex_state_54 lexbuf
-          | 2 -> __sedlex_state_52 lexbuf
-          | 3 -> __sedlex_state_58 lexbuf
-          | 4 -> __sedlex_state_59 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_53 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 15;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_53 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_54 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_62 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_55 lexbuf
-          | 2 -> __sedlex_state_45 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_55 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_64 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_55 lexbuf
-          | 2 -> __sedlex_state_56 lexbuf
-          | 3 -> __sedlex_state_45 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_56 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_57 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_57 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_64 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_57 lexbuf
-          | 2 -> __sedlex_state_56 lexbuf
-          | 3 -> __sedlex_state_45 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_58 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 15;
-         (match __sedlex_partition_79 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_53 lexbuf
-          | 1 -> __sedlex_state_54 lexbuf
-          | 2 -> __sedlex_state_58 lexbuf
-          | 3 -> __sedlex_state_59 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_59 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 15;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_60 lexbuf
-          | 1 -> __sedlex_state_53 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_60 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 15;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_60 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_61 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_79 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_54 lexbuf
-          | 2 -> __sedlex_state_61 lexbuf
-          | 3 -> __sedlex_state_62 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_62 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 28;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_63 lexbuf
-          | 1 -> __sedlex_state_28 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_63 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 26;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_63 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_64 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 29;
-         (match __sedlex_partition_80 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_65 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_65 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 10;
-         (match __sedlex_partition_81 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_66 lexbuf
-          | 1 -> __sedlex_state_65 lexbuf
-          | 2 -> __sedlex_state_67 lexbuf
-          | 3 -> __sedlex_state_72 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_66 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 9;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_66 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_67 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_26 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_68 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_68 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 10;
-         (match __sedlex_partition_81 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_69 lexbuf
-          | 1 -> __sedlex_state_68 lexbuf
-          | 2 -> __sedlex_state_67 lexbuf
-          | 3 -> __sedlex_state_70 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_69 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 9;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_69 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_70 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 8;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_71 lexbuf
-          | 1 -> __sedlex_state_69 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_71 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 7;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_71 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_72 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 8;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_73 lexbuf
-          | 1 -> __sedlex_state_66 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_73 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 7;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_73 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_74 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 29;
-         (match __sedlex_partition_82 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_75 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_75 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 14;
-         (match __sedlex_partition_83 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_76 lexbuf
-          | 1 -> __sedlex_state_75 lexbuf
-          | 2 -> __sedlex_state_77 lexbuf
-          | 3 -> __sedlex_state_82 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_76 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 13;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_76 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_77 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_17 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_78 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_78 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 14;
-         (match __sedlex_partition_83 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_79 lexbuf
-          | 1 -> __sedlex_state_78 lexbuf
-          | 2 -> __sedlex_state_77 lexbuf
-          | 3 -> __sedlex_state_80 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_79 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 13;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_79 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_80 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 12;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_81 lexbuf
-          | 1 -> __sedlex_state_79 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_81 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 11;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_81 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_82 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 12;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_83 lexbuf
-          | 1 -> __sedlex_state_76 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_83 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 11;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_83 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_84 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 29;
-         (match __sedlex_partition_84 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_85 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_85 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 20;
-         (match __sedlex_partition_85 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_86 lexbuf
-          | 1 -> __sedlex_state_85 lexbuf
-          | 2 -> __sedlex_state_87 lexbuf
-          | 3 -> __sedlex_state_92 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_86 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 19;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_86 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_87 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_88 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_88 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 20;
-         (match __sedlex_partition_85 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_89 lexbuf
-          | 1 -> __sedlex_state_88 lexbuf
-          | 2 -> __sedlex_state_87 lexbuf
-          | 3 -> __sedlex_state_90 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_89 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 19;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_89 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_90 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 18;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_91 lexbuf
-          | 1 -> __sedlex_state_89 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_91 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 17;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_91 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_92 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 18;
-         (match __sedlex_partition_63 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_93 lexbuf
-          | 1 -> __sedlex_state_86 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_93 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 17;
-         (match __sedlex_partition_60 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_93 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_94 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_86 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_48 lexbuf
-          | 2 -> __sedlex_state_94 lexbuf
-          | 3 -> __sedlex_state_29 lexbuf
-          | 4 -> __sedlex_state_95 lexbuf
-          | 5 -> __sedlex_state_62 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_95 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_33 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_96 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_96 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_87 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_54 lexbuf
-          | 2 -> __sedlex_state_96 lexbuf
-          | 3 -> __sedlex_state_95 lexbuf
-          | 4 -> __sedlex_state_62 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_97 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 41;
-         (match __sedlex_partition_47 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_98 lexbuf
-          | 1 -> __sedlex_state_27 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_98 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_58 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 40
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_100 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 63;
-         (match __sedlex_partition_108 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_101 lexbuf
-          | 1 -> 5
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_101 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 2;
-         (match __sedlex_partition_65 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_102 lexbuf
-          | 1 -> __sedlex_state_103 lexbuf
-          | 2 -> __sedlex_state_105 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_102 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_65 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_102 lexbuf
-         | 1 -> __sedlex_state_103 lexbuf
-         | 2 -> __sedlex_state_105 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_103 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 3;
-         (match __sedlex_partition_66 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 3
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_105 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_67 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_106 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_106 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_68 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_107 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_107 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_69 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_108 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_108 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_70 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_109 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_109 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_71 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_110 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_110 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_72 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_111 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_111 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_73 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_112 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_112 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_67 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_113 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_113 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_2 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_114 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_114 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_74 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_115 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_115 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_75 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 3
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_117 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_76 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_48 lexbuf
-          | 2 -> __sedlex_state_52 lexbuf
-          | 3 -> __sedlex_state_61 lexbuf
-          | 4 -> __sedlex_state_64 lexbuf
-          | 5 -> __sedlex_state_29 lexbuf
-          | 6 -> __sedlex_state_74 lexbuf
-          | 7 -> __sedlex_state_84 lexbuf
-          | 8 -> __sedlex_state_62 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_118 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 30;
-         (match __sedlex_partition_86 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_28 lexbuf
-          | 1 -> __sedlex_state_48 lexbuf
-          | 2 -> __sedlex_state_94 lexbuf
-          | 3 -> __sedlex_state_29 lexbuf
-          | 4 -> __sedlex_state_95 lexbuf
-          | 5 -> __sedlex_state_62 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_122 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 51;
-         (match __sedlex_partition_129 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 57
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_125 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 46;
-         (match __sedlex_partition_58 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 45
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_128 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 63;
-         (match __sedlex_partition_2 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> __sedlex_state_129 lexbuf
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_129 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_3 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_130 lexbuf
-         | 1 -> __sedlex_state_134 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_130 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_131 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_131 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_132 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_132 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 61
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_134 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_135 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_135 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_5 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_135 lexbuf
-         | 1 -> 61
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_137 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 34;
-         (match __sedlex_partition_130 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 36
-          | _ -> Sedlexing.backtrack lexbuf))
-  and __sedlex_state_139 =
-    function
-    | lexbuf ->
-        (Sedlexing.mark lexbuf 55;
-         (match __sedlex_partition_131 (Sedlexing.__private__next_int lexbuf)
-          with
-          | 0 -> 37
-          | _ -> Sedlexing.backtrack lexbuf)) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 -> let env = new_line env lexbuf in Continue env
-   | 1 -> Continue env
-   | 2 ->
-       let start_pos = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let (env, end_pos) = comment env buf lexbuf in
-       Comment (env, (mk_comment env start_pos end_pos buf true))
-   | 3 ->
-       let pattern = lexeme lexbuf in
-       if not (is_comment_syntax_enabled env)
-       then
-         let start_pos = start_pos_of_lexbuf env lexbuf in
-         let buf = Buffer.create 127 in
-         (Buffer.add_string buf pattern;
-          (let (env, end_pos) = comment env buf lexbuf in
-           Comment (env, (mk_comment env start_pos end_pos buf true))))
-       else
-         (let env =
-            if is_in_comment_syntax env
-            then
-              let loc = loc_of_lexbuf env lexbuf in
-              unexpected_error env loc pattern
-            else env in
-          let env = in_comment_syntax true env in
-          let len = Sedlexing.lexeme_length lexbuf in
-          if
-            ((Sedlexing.Utf8.sub_lexeme lexbuf (len - 1) 1) = ":") &&
-              ((Sedlexing.Utf8.sub_lexeme lexbuf (len - 2) 1) <> ":")
-          then Token (env, T_COLON)
-          else Continue env)
-   | 4 ->
-       if is_in_comment_syntax env
-       then let env = in_comment_syntax false env in Continue env
-       else
-         (Sedlexing.rollback lexbuf;
-          (let __sedlex_state_0 =
-             function
-             | lexbuf ->
-                 (match __sedlex_partition_23
-                          (Sedlexing.__private__next_int lexbuf)
-                  with
-                  | 0 -> 0
-                  | _ -> Sedlexing.backtrack lexbuf) in
-           Sedlexing.start lexbuf;
-           (match __sedlex_state_0 lexbuf with
-            | 0 -> Token (env, T_MULT)
-            | _ -> failwith "expected *")))
-   | 5 ->
-       let start_pos = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let (env, end_pos) = line_comment env buf lexbuf in
-       Comment (env, (mk_comment env start_pos end_pos buf false))
-   | 6 ->
-       let quote = lexeme lexbuf in
-       let start = start_pos_of_lexbuf env lexbuf in
-       let buf = Buffer.create 127 in
-       let raw = Buffer.create 127 in
-       (Buffer.add_string raw quote;
-        (let octal = false in
-         let (env, _end, octal) = string_quote env quote buf raw octal lexbuf in
-         let loc = { Loc.source = (Lex_env.source env); start; _end } in
-         Token
-           (env,
-             (T_STRING
-                (loc, (Buffer.contents buf), (Buffer.contents raw), octal)))))
-   | 7 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_120
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_121
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_25
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_3 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_26
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_27
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_4 lexbuf
-                        | 1 -> __sedlex_state_5 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_26
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_6 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_27
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | 1 -> __sedlex_state_5 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      Token (env, (mk_bignum_singleton BIG_BINARY num))
-                  | _ -> failwith "unreachable type_token bigbigint"))
-   | 8 ->
-       let num = Sedlexing.lexeme lexbuf in
-       Token (env, (mk_bignum_singleton BIG_BINARY num))
-   | 9 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_120
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_121
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_25
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_3 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_26
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_28
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_4 lexbuf
-                         | 1 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_26
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_6 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_28
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_6 lexbuf
-                         | 1 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      Token (env, (mk_num_singleton BINARY num))
-                  | _ -> failwith "unreachable type_token binnumber"))
-   | 10 ->
-       let num = Sedlexing.lexeme lexbuf in
-       Token (env, (mk_num_singleton BINARY num))
-   | 11 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_120
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_121
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_29
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_3 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_17
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_30
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_4 lexbuf
-                        | 1 -> __sedlex_state_5 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_17
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_6 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_30
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | 1 -> __sedlex_state_5 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      Token (env, (mk_bignum_singleton BIG_OCTAL num))
-                  | _ -> failwith "unreachable type_token octbigint"))
-   | 12 ->
-       let num = Sedlexing.lexeme lexbuf in
-       Token (env, (mk_bignum_singleton BIG_OCTAL num))
-   | 13 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_120
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_121
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_29
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_3 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_17
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_31
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_4 lexbuf
-                         | 1 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_17
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_6 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_31
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_6 lexbuf
-                         | 1 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      Token (env, (mk_num_singleton OCTAL num))
-                  | _ -> failwith "unreachable type_token octnumber"))
-   | 14 ->
-       let num = Sedlexing.lexeme lexbuf in
-       Token (env, (mk_num_singleton OCTAL num))
-   | 15 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_120
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_121
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_17
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_3 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_17
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_3 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      Token (env, (mk_num_singleton LEGACY_OCTAL num))
-                  | _ -> failwith "unreachable type_token legacyoctnumber"))
-   | 16 ->
-       let num = Sedlexing.lexeme lexbuf in
-       Token (env, (mk_num_singleton LEGACY_OCTAL num))
-   | 17 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_120
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_121
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_34
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_3 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_4
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_35
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_4 lexbuf
-                        | 1 -> __sedlex_state_5 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_4
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_6 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_35
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | 1 -> __sedlex_state_5 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      Token (env, (mk_bignum_singleton BIG_NORMAL num))
-                  | _ -> failwith "unreachable type_token hexbigint"))
-   | 18 ->
-       let num = Sedlexing.lexeme lexbuf in
-       Token (env, (mk_bignum_singleton BIG_NORMAL num))
-   | 19 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_120
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_121
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_34
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_3 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_4
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_36
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_4 lexbuf
-                         | 1 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_4
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_6 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_36
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_6 lexbuf
-                         | 1 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      Token (env, (mk_num_singleton NORMAL num))
-                  | _ -> failwith "unreachable type_token hexnumber"))
-   | 20 ->
-       let num = Sedlexing.lexeme lexbuf in
-       Token (env, (mk_num_singleton NORMAL num))
-   | 21 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_122
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | 2 -> __sedlex_state_13 lexbuf
-                        | 3 -> __sedlex_state_18 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_123
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | 2 -> __sedlex_state_13 lexbuf
-                        | 3 -> __sedlex_state_18 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_3 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_38
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | 2 -> __sedlex_state_11 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_39
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_5 lexbuf
-                        | 1 -> __sedlex_state_6 lexbuf
-                        | 2 -> __sedlex_state_8 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_40
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | 1 -> __sedlex_state_8 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_6 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_41
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | 1 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_8 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_42
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_8 lexbuf
-                        | 1 -> __sedlex_state_9 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_9 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_10 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_10 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_42
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_10 lexbuf
-                        | 1 -> __sedlex_state_9 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_11 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_12 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_12 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_38
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_12 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | 2 -> __sedlex_state_11 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_13 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_43
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_14 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_14 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_44
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_15 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_15 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_38
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_15 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | 2 -> __sedlex_state_16 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_16 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_17 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_17 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_38
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_17 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | 2 -> __sedlex_state_16 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_18 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_45
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_14 lexbuf
-                        | 1 -> __sedlex_state_18 lexbuf
-                        | 2 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      let loc = loc_of_lexbuf env lexbuf in
-                      let env =
-                        lex_error env loc Parse_error.InvalidSciBigInt in
-                      Token (env, (mk_bignum_singleton BIG_NORMAL num))
-                  | _ -> failwith "unreachable type_token scibigint"))
-   | 22 ->
-       let num = Sedlexing.lexeme lexbuf in
-       let loc = loc_of_lexbuf env lexbuf in
-       let env = lex_error env loc Parse_error.InvalidSciBigInt in
-       Token (env, (mk_bignum_singleton BIG_NORMAL num))
-   | 23 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_122
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | 2 -> __sedlex_state_12 lexbuf
-                        | 3 -> __sedlex_state_17 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_123
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | 2 -> __sedlex_state_12 lexbuf
-                        | 3 -> __sedlex_state_17 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_3 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_38
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | 2 -> __sedlex_state_10 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_39
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_5 lexbuf
-                        | 1 -> __sedlex_state_6 lexbuf
-                        | 2 -> __sedlex_state_7 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_40
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | 1 -> __sedlex_state_7 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_6 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_6 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_7 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_46
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_7 lexbuf
-                         | 1 -> __sedlex_state_8 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_8 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_9 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_9 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_46
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_9 lexbuf
-                         | 1 -> __sedlex_state_8 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_10 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_11 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_11 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_38
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_11 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | 2 -> __sedlex_state_10 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_12 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_43
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_13 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_13 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_44
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_14 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_14 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_38
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_14 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | 2 -> __sedlex_state_15 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_15 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_16 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_16 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_38
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_16 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | 2 -> __sedlex_state_15 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_17 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_45
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_13 lexbuf
-                        | 1 -> __sedlex_state_17 lexbuf
-                        | 2 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      Token (env, (mk_num_singleton NORMAL num))
-                  | _ -> failwith "unreachable type_token scinumber"))
-   | 24 ->
-       let num = Sedlexing.lexeme lexbuf in
-       Token (env, (mk_num_singleton NORMAL num))
-   | 25 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_122
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | 2 -> __sedlex_state_7 lexbuf
-                        | 3 -> __sedlex_state_9 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_123
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | 2 -> __sedlex_state_7 lexbuf
-                        | 3 -> __sedlex_state_9 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_3 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_42
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_5 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_42
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_5 lexbuf
-                        | 1 -> __sedlex_state_4 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_7 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_47
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_8 lexbuf
-                        | 1 -> __sedlex_state_7 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_8 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_41
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_3 lexbuf
-                        | 1 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_9 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_48
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_8 lexbuf
-                        | 1 -> __sedlex_state_9 lexbuf
-                        | 2 -> __sedlex_state_10 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_10 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_11 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_11 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_48
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_8 lexbuf
-                        | 1 -> __sedlex_state_11 lexbuf
-                        | 2 -> __sedlex_state_10 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      let loc = loc_of_lexbuf env lexbuf in
-                      let env =
-                        lex_error env loc Parse_error.InvalidFloatBigInt in
-                      Token (env, (mk_bignum_singleton BIG_NORMAL num))
-                  | _ -> failwith "unreachable type_token floatbigint"))
-   | 26 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_124
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | 2 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_125
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | 2 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_41
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_2 lexbuf
-                        | 1 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_42
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_4 lexbuf
-                        | 1 -> __sedlex_state_5 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_6 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_42
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | 1 -> __sedlex_state_5 lexbuf
-                        | 2 -> 0
-                        | _ -> Sedlexing.backtrack lexbuf) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      Token (env, (mk_bignum_singleton BIG_NORMAL num))
-                  | _ -> failwith "unreachable type_token wholebigint"))
-   | 27 ->
-       let num = Sedlexing.lexeme lexbuf in
-       let loc = loc_of_lexbuf env lexbuf in
-       let env = lex_error env loc Parse_error.InvalidFloatBigInt in
-       Token (env, (mk_bignum_singleton BIG_NORMAL num))
-   | 28 ->
-       let num = Sedlexing.lexeme lexbuf in
-       Token (env, (mk_bignum_singleton BIG_NORMAL num))
-   | 29 ->
-       recover env lexbuf
-         ~f:(fun env ->
-               fun lexbuf ->
-                 let rec __sedlex_state_0 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_122
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_7 lexbuf
-                        | 2 -> __sedlex_state_11 lexbuf
-                        | 3 -> __sedlex_state_13 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_1 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_125
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_1 lexbuf
-                        | 1 -> __sedlex_state_2 lexbuf
-                        | 2 -> __sedlex_state_4 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_2 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_47
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> 0
-                         | 1 -> __sedlex_state_2 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_4 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_48
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> 0
-                         | 1 -> __sedlex_state_4 lexbuf
-                         | 2 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_5 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_6 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_6 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_48
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> 0
-                         | 1 -> __sedlex_state_6 lexbuf
-                         | 2 -> __sedlex_state_5 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_7 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_8 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_8 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_46
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_8 lexbuf
-                         | 1 -> __sedlex_state_9 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_9 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_10 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_10 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_46
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_10 lexbuf
-                         | 1 -> __sedlex_state_9 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_11 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_47
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_12 lexbuf
-                         | 1 -> __sedlex_state_11 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_12 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_33
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_8 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_13 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_48
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_12 lexbuf
-                         | 1 -> __sedlex_state_13 lexbuf
-                         | 2 -> __sedlex_state_14 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf))
-                 and __sedlex_state_14 =
-                   function
-                   | lexbuf ->
-                       (match __sedlex_partition_33
-                                (Sedlexing.__private__next_int lexbuf)
-                        with
-                        | 0 -> __sedlex_state_15 lexbuf
-                        | _ -> Sedlexing.backtrack lexbuf)
-                 and __sedlex_state_15 =
-                   function
-                   | lexbuf ->
-                       (Sedlexing.mark lexbuf 0;
-                        (match __sedlex_partition_48
-                                 (Sedlexing.__private__next_int lexbuf)
-                         with
-                         | 0 -> __sedlex_state_12 lexbuf
-                         | 1 -> __sedlex_state_15 lexbuf
-                         | 2 -> __sedlex_state_14 lexbuf
-                         | _ -> Sedlexing.backtrack lexbuf)) in
-                 Sedlexing.start lexbuf;
-                 (match __sedlex_state_0 lexbuf with
-                  | 0 ->
-                      let num = Sedlexing.lexeme lexbuf in
-                      Token (env, (mk_num_singleton NORMAL num))
-                  | _ -> failwith "unreachable type_token wholenumber"))
-   | 30 ->
-       let num = Sedlexing.lexeme lexbuf in
-       Token (env, (mk_num_singleton NORMAL num))
-   | 31 -> Token (env, T_CHECKS)
-   | 32 -> Token (env, T_LBRACKET)
-   | 33 -> Token (env, T_RBRACKET)
-   | 34 -> Token (env, T_LCURLY)
-   | 35 -> Token (env, T_RCURLY)
-   | 36 -> Token (env, T_LCURLYBAR)
-   | 37 -> Token (env, T_RCURLYBAR)
-   | 38 -> Token (env, T_LPAREN)
-   | 39 -> Token (env, T_RPAREN)
-   | 40 -> Token (env, T_ELLIPSIS)
-   | 41 -> Token (env, T_PERIOD)
-   | 42 -> Token (env, T_SEMICOLON)
-   | 43 -> Token (env, T_COMMA)
-   | 44 -> Token (env, T_COLON)
-   | 45 -> Token (env, T_PLING_PERIOD)
-   | 46 -> Token (env, T_PLING)
-   | 47 -> Token (env, T_LBRACKET)
-   | 48 -> Token (env, T_RBRACKET)
-   | 49 -> Token (env, T_LESS_THAN)
-   | 50 -> Token (env, T_GREATER_THAN)
-   | 51 -> Token (env, T_ASSIGN)
-   | 52 -> Token (env, T_PLING)
-   | 53 -> Token (env, T_MULT)
-   | 54 -> Token (env, T_COLON)
-   | 55 -> Token (env, T_BIT_OR)
-   | 56 -> Token (env, T_BIT_AND)
-   | 57 -> Token (env, T_ARROW)
-   | 58 -> Token (env, T_ASSIGN)
-   | 59 -> Token (env, T_PLUS)
-   | 60 -> Token (env, T_MINUS)
-   | 61 ->
-       let start_offset = Sedlexing.lexeme_start lexbuf in
-       ((loop_id_continues lexbuf) |> ignore;
-        (let end_offset = Sedlexing.lexeme_end lexbuf in
-         let loc = loc_of_offsets env start_offset end_offset in
-         Sedlexing.set_lexeme_start lexbuf start_offset;
-         (let raw = Sedlexing.lexeme lexbuf in
-          let (env, value) = decode_identifier env raw in
-          match value with
-          | "any" -> Token (env, T_ANY_TYPE)
-          | "bool" -> Token (env, (T_BOOLEAN_TYPE BOOL))
-          | "boolean" -> Token (env, (T_BOOLEAN_TYPE BOOLEAN))
-          | "empty" -> Token (env, T_EMPTY_TYPE)
-          | "extends" -> Token (env, T_EXTENDS)
-          | "false" -> Token (env, T_FALSE)
-          | "interface" -> Token (env, T_INTERFACE)
-          | "mixed" -> Token (env, T_MIXED_TYPE)
-          | "null" -> Token (env, T_NULL)
-          | "number" -> Token (env, T_NUMBER_TYPE)
-          | "bigint" -> Token (env, T_BIGINT_TYPE)
-          | "static" -> Token (env, T_STATIC)
-          | "string" -> Token (env, T_STRING_TYPE)
-          | "true" -> Token (env, T_TRUE)
-          | "typeof" -> Token (env, T_TYPEOF)
-          | "void" -> Token (env, T_VOID_TYPE)
-          | "symbol" -> Token (env, T_SYMBOL_TYPE)
-          | _ ->
-              Token
-                (env,
-                  (T_IDENTIFIER
-                     { loc; value; raw = (Sedlexing.string_of_utf8 raw) })))))
-   | 62 ->
-       let env =
-         if is_in_comment_syntax env
-         then
-           let loc = loc_of_lexbuf env lexbuf in
-           lex_error env loc Parse_error.UnexpectedEOS
-         else env in
-       Token (env, T_EOF)
-   | 63 -> Token (env, (T_ERROR (lexeme lexbuf)))
-   | _ -> failwith "unreachable type_token")
-let jsx_child env =
-  let start = end_pos_of_lexbuf env env.lex_lb in
-  let buf = Buffer.create 127 in
-  let raw = Buffer.create 127 in
-  let (env, child) = jsx_child env start buf raw env.lex_lb in
-  let loc = loc_of_token env child in
-  let lex_errors_acc = (env.lex_state).lex_errors_acc in
-  if lex_errors_acc = []
-  then
-    (env,
-      {
-        Lex_result.lex_token = child;
-        lex_loc = loc;
-        lex_comments = [];
-        lex_errors = []
-      })
-  else
-    ({ env with lex_state = { lex_errors_acc = [] } },
-      {
-        Lex_result.lex_token = child;
-        lex_loc = loc;
-        lex_comments = [];
-        lex_errors = (List.rev lex_errors_acc)
-      })
-let wrap f =
-  let rec helper comments env =
-    match f env env.lex_lb with
-    | Token (env, t) ->
-        let loc = loc_of_token env t in
-        let lex_comments = if comments = [] then [] else List.rev comments in
-        let lex_token = t in
-        let lex_errors_acc = (env.lex_state).lex_errors_acc in
-        if lex_errors_acc = []
-        then
-          ({ env with lex_last_loc = loc },
-            {
-              Lex_result.lex_token = lex_token;
-              lex_loc = loc;
-              lex_comments;
-              lex_errors = []
-            })
-        else
-          ({ env with lex_last_loc = loc; lex_state = Lex_env.empty_lex_state
-           },
-            {
-              Lex_result.lex_token = lex_token;
-              lex_loc = loc;
-              lex_comments;
-              lex_errors = (List.rev lex_errors_acc)
-            })
-    | Comment (env, ((loc, _) as comment)) ->
-        let env = { env with lex_last_loc = loc } in
-        helper (comment :: comments) env
-    | Continue env -> helper comments env in
-  fun env -> helper [] env
-let regexp = wrap regexp
-let jsx_tag = wrap jsx_tag
-let template_tail = wrap template_tail
-let type_token = wrap type_token
-let token = wrap token
-let is_valid_identifier_name lexbuf =
-  let rec __sedlex_state_0 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_132 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 0
-         | 1 -> __sedlex_state_2 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_2 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_2 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_3 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_3 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_3 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_4 lexbuf
-         | 1 -> __sedlex_state_7 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_4 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_5 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_5 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_6 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_6 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> 0
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_7 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_4 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_8 lexbuf
-         | _ -> Sedlexing.backtrack lexbuf)
-  and __sedlex_state_8 =
-    function
-    | lexbuf ->
-        (match __sedlex_partition_5 (Sedlexing.__private__next_int lexbuf)
-         with
-         | 0 -> __sedlex_state_8 lexbuf
-         | 1 -> 0
-         | _ -> Sedlexing.backtrack lexbuf) in
-  Sedlexing.start lexbuf;
-  (match __sedlex_state_0 lexbuf with
-   | 0 -> loop_id_continues lexbuf
-   | _ -> false)
\ No newline at end of file
diff --git a/jscomp/js_parser/flow_lexer.mli b/jscomp/js_parser/flow_lexer.mli
deleted file mode 100644
index 8609d22..0000000
--- a/jscomp/js_parser/flow_lexer.mli
+++ /dev/null
@@ -1,20 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-val jsx_child : Lex_env.t -> Lex_env.t * Lex_result.t
-
-val regexp : Lex_env.t -> Lex_env.t * Lex_result.t
-
-val jsx_tag : Lex_env.t -> Lex_env.t * Lex_result.t
-
-val template_tail : Lex_env.t -> Lex_env.t * Lex_result.t
-
-val type_token : Lex_env.t -> Lex_env.t * Lex_result.t
-
-val token : Lex_env.t -> Lex_env.t * Lex_result.t
-
-val is_valid_identifier_name : Flow_sedlexing.lexbuf -> bool
diff --git a/jscomp/js_parser/flow_sedlexing.ml b/jscomp/js_parser/flow_sedlexing.ml
deleted file mode 100644
index 1aec0e2..0000000
--- a/jscomp/js_parser/flow_sedlexing.ml
+++ /dev/null
@@ -1,287 +0,0 @@
-(* The package sedlex is released under the terms of an MIT-like license. *)
-(* See the attached LICENSE file.                                         *)
-(* Copyright 2005, 2013 by Alain Frisch and LexiFi.                       *)
-external ( .!()<- ) : int array -> int -> int -> unit = "%array_unsafe_set"
-external ( .!() ) : int array -> int -> int = "%array_unsafe_get"
-external ( .![] ) : string -> int -> char = "%string_unsafe_get"
-external ( .![]<- ) : bytes -> int -> char -> unit = "%bytes_unsafe_set"
-
-exception InvalidCodepoint of int
-
-exception MalFormed
-
-(* Absolute position from the beginning of the stream *)
-type apos = int
-
-(* critical states:
-  [pos] [curr_bol] [curr_line]
-  The state of [curr_bol] and [curr_line] only changes when we hit a newline
-  [marked_pos] [marked_bol] [marked_line]
-  [start_pos] [start_bol] [start_line]
-  get reset whenever we get a new token
-*)
-type lexbuf = {
-  buf: int array;
-  (* Number of meaningful char in buffer *)
-  len: int;
-  (* pos is the index in the buffer *)
-  mutable pos: int;
-  (* bol is the index in the input stream but not buffer *)
-  mutable curr_bol: int;
-  (* start from 1, if it is 0, we would not track postion info for you *)
-  mutable curr_line: int;
-  (* First char we need to keep visible *)
-  mutable start_pos: int;
-  mutable start_bol: int;
-  mutable start_line: int;
-  mutable marked_pos: int;
-  mutable marked_bol: int;
-  mutable marked_line: int;
-  mutable marked_val: int;
-}
-
-
-let lexbuf_clone (x : lexbuf) : lexbuf =
-  {
-    buf = x.buf;
-    len = x.len;
-    pos = x.pos;
-    curr_bol = x.curr_bol;
-    curr_line = x.curr_line;
-    start_pos = x.start_pos;
-    start_bol = x.start_bol;
-    start_line = x.start_line;
-    marked_pos = x.marked_pos;
-    marked_bol = x.marked_bol;
-    marked_line = x.marked_line;
-    marked_val = x.marked_val;
-  }
-
-let empty_lexbuf =
-  {
-    buf = [||];
-    len = 0;
-    pos = 0;
-    curr_bol = 0;
-    curr_line = 0;
-    start_pos = 0;
-    start_bol = 0;
-    start_line = 0;
-    marked_pos = 0;
-    marked_bol = 0;
-    marked_line = 0;
-    marked_val = 0;
-  }
-
-let from_int_array a =
-  let len = Array.length a in
-  { empty_lexbuf with buf = a; len }
-
-let from_int_sub_array a len =
-  { empty_lexbuf with buf = a; len }
-
-let new_line lexbuf =
-  if lexbuf.curr_line != 0 then lexbuf.curr_line <- lexbuf.curr_line + 1;
-  lexbuf.curr_bol <- lexbuf.pos
-
-let next lexbuf : Stdlib.Uchar.t option =
-  if lexbuf.pos = lexbuf.len then
-    None
-  else
-    let ret = lexbuf.buf.!(lexbuf.pos) in
-    lexbuf.pos <- lexbuf.pos + 1;
-    if ret = 10 then new_line lexbuf;
-    Some (Stdlib.Uchar.unsafe_of_int ret)
-
-let __private__next_int lexbuf : int =
-  if lexbuf.pos = lexbuf.len then
-    -1
-  else
-    let ret = lexbuf.buf.!(lexbuf.pos) in
-    lexbuf.pos <- lexbuf.pos + 1;
-    if ret = 10 then new_line lexbuf;
-    ret
-
-let mark lexbuf i =
-  lexbuf.marked_pos <- lexbuf.pos;
-  lexbuf.marked_bol <- lexbuf.curr_bol;
-  lexbuf.marked_line <- lexbuf.curr_line;
-  lexbuf.marked_val <- i
-
-let start lexbuf =
-  lexbuf.start_pos <- lexbuf.pos;
-  lexbuf.start_bol <- lexbuf.curr_bol;
-  lexbuf.start_line <- lexbuf.curr_line;
-  mark lexbuf (-1)
-
-let backtrack lexbuf =
-  lexbuf.pos <- lexbuf.marked_pos;
-  lexbuf.curr_bol <- lexbuf.marked_bol;
-  lexbuf.curr_line <- lexbuf.marked_line;
-  lexbuf.marked_val
-
-let rollback lexbuf =
-  lexbuf.pos <- lexbuf.start_pos;
-  lexbuf.curr_bol <- lexbuf.start_bol;
-  lexbuf.curr_line <- lexbuf.start_line
-
-let lexeme_start lexbuf = lexbuf.start_pos
-let set_lexeme_start lexbuf pos = lexbuf.start_pos <- pos
-let lexeme_end lexbuf = lexbuf.pos
-
-let loc lexbuf = (lexbuf.start_pos , lexbuf.pos )
-
-let lexeme_length lexbuf = lexbuf.pos - lexbuf.start_pos
-
-let sub_lexeme lexbuf pos len = Array.sub lexbuf.buf (lexbuf.start_pos + pos) len
-
-let lexeme lexbuf = Array.sub lexbuf.buf lexbuf.start_pos (lexbuf.pos - lexbuf.start_pos)
-
-let current_code_point lexbuf = lexbuf.buf.(lexbuf.start_pos)
-(* Decode UTF-8 encoded [s] into codepoints in [a], returning the length of the
- * decoded string.
- *
- * To call this function safely:
- * - ensure that [slen] is not greater than the length of [s]
- * - ensure that [a] has enough capacity to hold the decoded value
- *)
-let unsafe_utf8_of_string (s : string) slen (a : int array) : int =
-  let spos = ref 0 in
-  let apos = ref 0 in
-  while !spos < slen do
-    let spos_code = s.![!spos] in
-    (match spos_code with
-    | '\000' .. '\127' as c ->
-      (* U+0000 - U+007F: 0xxxxxxx *)
-      a.!(!apos) <- Char.code c;
-      incr spos
-    | '\192' .. '\223' as c ->
-      (* U+0080 - U+07FF: 110xxxxx 10xxxxxx *)
-      let n1 = Char.code c in
-      let n2 = Char.code s.![!spos + 1] in
-      if n2 lsr 6 != 0b10 then raise MalFormed;
-      a.!(!apos) <- ((n1 land 0x1f) lsl 6) lor (n2 land 0x3f);
-      spos := !spos + 2
-    | '\224' .. '\239' as c ->
-      (* U+0800 - U+FFFF: 1110xxxx 10xxxxxx 10xxxxxx
-         U+D800 - U+DFFF are reserved for surrogate halves (RFC 3629) *)
-      let n1 = Char.code c in
-      let n2 = Char.code s.![!spos + 1] in
-      let n3 = Char.code s.![!spos + 2] in
-      let p = ((n1 land 0x0f) lsl 12) lor ((n2 land 0x3f) lsl 6) lor (n3 land 0x3f) in
-      if (n2 lsr 6 != 0b10 || n3 lsr 6 != 0b10) || (p >= 0xd800 && p <= 0xdfff) then raise MalFormed;
-      a.!(!apos) <- p;
-      spos := !spos + 3
-    | '\240' .. '\247' as c ->
-      (* U+10000 - U+1FFFFF: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-         > U+10FFFF are invalid (RFC 3629) *)
-      let n1 = Char.code c in
-      let n2 = Char.code s.![!spos + 1] in
-      let n3 = Char.code s.![!spos + 2] in
-      let n4 = Char.code s.![!spos + 3] in
-      if n2 lsr 6 != 0b10 || n3 lsr 6 != 0b10 || n4 lsr 6 != 0b10 then raise MalFormed;
-      let p =
-        ((n1 land 0x07) lsl 18)
-        lor ((n2 land 0x3f) lsl 12)
-        lor ((n3 land 0x3f) lsl 6)
-        lor (n4 land 0x3f)
-      in
-      if p > 0x10ffff then raise MalFormed;
-      a.!(!apos) <- p;
-      spos := !spos + 4
-    | _ -> raise MalFormed);
-    incr apos
-  done;
-  !apos
-
-(* Encode the decoded codepoints in [a] as UTF-8 into [b], returning the length
- * of the encoded string.
- *
- * To call this function safely:
- * - ensure that [offset + len] is not greater than the length of [a]
- * - ensure that [b] has sufficient capacity to hold the encoded value
- *)
-let unsafe_string_of_utf8 (a : int array) ~(offset : int) ~(len : int) (b : bytes) : int =
-  let apos = ref offset in
-  let len = ref len in
-  let i = ref 0 in
-  while !len > 0 do
-    let u = a.!(!apos) in
-    if u < 0 then
-      raise MalFormed
-    else if u <= 0x007F then begin
-      b.![!i] <- Char.unsafe_chr u;
-      incr i
-    end else if u <= 0x07FF then (
-      b.![!i] <- Char.unsafe_chr (0xC0 lor (u lsr 6));
-      b.![!i + 1] <- Char.unsafe_chr (0x80 lor (u land 0x3F));
-      i := !i + 2
-    ) else if u <= 0xFFFF then (
-      b.![!i] <- Char.unsafe_chr (0xE0 lor (u lsr 12));
-      b.![!i + 1] <- Char.unsafe_chr (0x80 lor ((u lsr 6) land 0x3F));
-      b.![!i + 2] <- Char.unsafe_chr (0x80 lor (u land 0x3F));
-      i := !i + 3
-    ) else if u <= 0x10FFFF then (
-      b.![!i] <- Char.unsafe_chr (0xF0 lor (u lsr 18));
-      b.![!i + 1] <- Char.unsafe_chr (0x80 lor ((u lsr 12) land 0x3F));
-      b.![!i + 2] <- Char.unsafe_chr (0x80 lor ((u lsr 6) land 0x3F));
-      b.![!i + 3] <- Char.unsafe_chr (0x80 lor (u land 0x3F));
-      i := !i + 4
-    ) else
-      raise MalFormed;
-    incr apos;
-    decr len
-  done;
-  !i
-
-module Utf8 = struct
-  let from_string s =
-    let slen = String.length s in
-    let a = Array.make slen 0 in
-    let len = unsafe_utf8_of_string s slen a in
-    from_int_sub_array a len
-
-  let sub_lexeme lexbuf pos len : string =
-    let offset = lexbuf.start_pos + pos in
-    let b = Bytes.create (len * 4) in
-    let buf = lexbuf.buf in
-    (* Assertion needed, since we make use of unsafe API below *)
-    assert (offset + len <= Array.length buf);
-    let i = unsafe_string_of_utf8 buf ~offset ~len b in
-    Bytes.sub_string b 0 i
-
-  let lexeme lexbuf : string =
-    let offset = lexbuf.start_pos in
-    let len = lexbuf.pos - offset in
-    let b = Bytes.create (len * 4) in
-    let buf = lexbuf.buf in
-    let i = unsafe_string_of_utf8 buf ~offset ~len b in
-    Bytes.sub_string b 0 i
-
-  let lexeme_to_buffer lexbuf buffer : unit =
-    let offset = lexbuf.start_pos in
-    let len = lexbuf.pos - offset in
-    let b = Bytes.create (len * 4) in
-    let buf = lexbuf.buf in
-    let i = unsafe_string_of_utf8 buf ~offset ~len b in
-    Buffer.add_subbytes buffer b 0 i
-
-  let lexeme_to_buffer2 lexbuf buf1 buf2 : unit =
-    let offset = lexbuf.start_pos in
-    let len = lexbuf.pos - offset in
-    let b = Bytes.create (len * 4) in
-    let buf = lexbuf.buf in
-    let i = unsafe_string_of_utf8 buf ~offset ~len b in
-    Buffer.add_subbytes buf1 b 0 i;
-    Buffer.add_subbytes buf2 b 0 i
-end
-
-let string_of_utf8 (lexbuf : int array) : string =
-  let offset = 0 in
-  let len = Array.length lexbuf in
-  let b = Bytes.create (len * 4) in
-  let i = unsafe_string_of_utf8 lexbuf ~offset ~len b in
-  Bytes.sub_string b 0 i
-
-let backoff lexbuf npos =
-  lexbuf.pos <- lexbuf.pos - npos
diff --git a/jscomp/js_parser/flow_sedlexing.mli b/jscomp/js_parser/flow_sedlexing.mli
deleted file mode 100644
index c0d82db..0000000
--- a/jscomp/js_parser/flow_sedlexing.mli
+++ /dev/null
@@ -1,47 +0,0 @@
-
-(** This is a module provides the minimal Sedlexing suppport
-  It is mostly a subset of Sedlexing with two functions for performance reasons:
-  - Utf8.lexeme_to_buffer
-  - Utf8.lexeme_to_buffer2
-*)
-exception InvalidCodepoint of int
-exception MalFormed
-type apos = int
-type lexbuf
-val lexbuf_clone : lexbuf -> lexbuf
-
-val from_int_array : int array -> lexbuf
-val new_line : lexbuf -> unit
-val next : lexbuf -> Uchar.t option
-
-(**/**)
-val __private__next_int : lexbuf -> int
-(**/**)
-
-val mark : lexbuf -> int -> unit
-val start : lexbuf -> unit
-val backtrack : lexbuf -> int
-val rollback : lexbuf -> unit
-val lexeme_start : lexbuf -> int
-val lexeme_end : lexbuf -> int
-val loc : lexbuf -> int * int
-val lexeme_length : lexbuf -> int
-val sub_lexeme : lexbuf -> int -> int -> int array
-val lexeme : lexbuf -> int array
-module Utf8 : sig
-  val from_string : string -> lexbuf
-  val sub_lexeme : lexbuf -> int -> int -> string
-  val lexeme : lexbuf -> string
-  (** This API avoids another allocation *)
-  val lexeme_to_buffer : lexbuf -> Buffer.t -> unit
-  val lexeme_to_buffer2 : lexbuf -> Buffer.t -> Buffer.t -> unit
-end
-
-val string_of_utf8 : int array -> string
-
-(** Two APIs used when we want to do customize lexing
-    instead of using the regex based engine
-*)
-val current_code_point : lexbuf -> int
-val backoff : lexbuf -> int -> unit
-val set_lexeme_start : lexbuf -> int -> unit
diff --git a/jscomp/js_parser/js_id.ml b/jscomp/js_parser/js_id.ml
deleted file mode 100644
index c5da8d8..0000000
--- a/jscomp/js_parser/js_id.ml
+++ /dev/null
@@ -1,24 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-external ( .!() ) : (int * int) array -> int -> int * int = "%array_unsafe_get"
-
-let rec search (arr : _ array) (start : int) (finish : int) target =
-  if start > finish then
-    false
-  else
-    let mid = start + ((finish - start) / 2) in
-    let (a, b) = arr.!(mid) in
-    if target < a then
-      search arr start (mid - 1) target
-    else if target >= b then
-      search arr (mid + 1) finish target
-    else
-      true
-
-let is_valid_unicode_id (i : int) =
-  search Js_id_unicode.id_continue 0 (Array.length Js_id_unicode.id_continue - 1) i
diff --git a/jscomp/js_parser/js_id.mli b/jscomp/js_parser/js_id.mli
deleted file mode 100644
index 8bcea4e..0000000
--- a/jscomp/js_parser/js_id.mli
+++ /dev/null
@@ -1,9 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-(* This test is applied to non-start unicode points *)
-val is_valid_unicode_id : int -> bool
diff --git a/jscomp/js_parser/js_id_unicode.ml b/jscomp/js_parser/js_id_unicode.ml
deleted file mode 100644
index 0c99043..0000000
--- a/jscomp/js_parser/js_id_unicode.ml
+++ /dev/null
@@ -1,21 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-(* This lists two valid unicode point ranges in tuple format.
-   see more details in https://mathiasbynens.be/notes/javascript-identifiers-es6
-   TODO: store it in a flat array
-   add more docs
-*)
-[@@@ocamlformat "disable"]
-
-(* JS has stricter rules with start id *)
-let id_start = [|36,37;65,91;95,96;97,123;170,171;181,182;186,187;192,215;216,247;248,706;710,722;736,741;748,749;750,751;880,885;886,888;890,894;895,896;902,903;904,907;908,909;910,930;931,1014;1015,1154;1162,1328;1329,1367;1369,1370;1376,1417;1488,1515;1519,1523;1568,1611;1646,1648;1649,1748;1749,1750;1765,1767;1774,1776;1786,1789;1791,1792;1808,1809;1810,1840;1869,1958;1969,1970;1994,2027;2036,2038;2042,2043;2048,2070;2074,2075;2084,2085;2088,2089;2112,2137;2144,2155;2208,2229;2230,2238;2308,2362;2365,2366;2384,2385;2392,2402;2417,2433;2437,2445;2447,2449;2451,2473;2474,2481;2482,2483;2486,2490;2493,2494;2510,2511;2524,2526;2527,2530;2544,2546;2556,2557;2565,2571;2575,2577;2579,2601;2602,2609;2610,2612;2613,2615;2616,2618;2649,2653;2654,2655;2674,2677;2693,2702;2703,2706;2707,2729;2730,2737;2738,2740;2741,2746;2749,2750;2768,2769;2784,2786;2809,2810;2821,2829;2831,2833;2835,2857;2858,2865;2866,2868;2869,2874;2877,2878;2908,2910;2911,2914;2929,2930;2947,2948;2949,2955;2958,2961;2962,2966;2969,2971;2972,2973;2974,2976;2979,2981;2984,2987;2990,3002;3024,3025;3077,3085;3086,3089;3090,3113;3114,3130;3133,3134;3160,3163;3168,3170;3200,3201;3205,3213;3214,3217;3218,3241;3242,3252;3253,3258;3261,3262;3294,3295;3296,3298;3313,3315;3333,3341;3342,3345;3346,3387;3389,3390;3406,3407;3412,3415;3423,3426;3450,3456;3461,3479;3482,3506;3507,3516;3517,3518;3520,3527;3585,3633;3634,3636;3648,3655;3713,3715;3716,3717;3718,3723;3724,3748;3749,3750;3751,3761;3762,3764;3773,3774;3776,3781;3782,3783;3804,3808;3840,3841;3904,3912;3913,3949;3976,3981;4096,4139;4159,4160;4176,4182;4186,4190;4193,4194;4197,4199;4206,4209;4213,4226;4238,4239;4256,4294;4295,4296;4301,4302;4304,4347;4348,4681;4682,4686;4688,4695;4696,4697;4698,4702;4704,4745;4746,4750;4752,4785;4786,4790;4792,4799;4800,4801;4802,4806;4808,4823;4824,4881;4882,4886;4888,4955;4992,5008;5024,5110;5112,5118;5121,5741;5743,5760;5761,5787;5792,5867;5870,5881;5888,5901;5902,5906;5920,5938;5952,5970;5984,5997;5998,6001;6016,6068;6103,6104;6108,6109;6176,6265;6272,6313;6314,6315;6320,6390;6400,6431;6480,6510;6512,6517;6528,6572;6576,6602;6656,6679;6688,6741;6823,6824;6917,6964;6981,6988;7043,7073;7086,7088;7098,7142;7168,7204;7245,7248;7258,7294;7296,7305;7312,7355;7357,7360;7401,7405;7406,7412;7413,7415;7418,7419;7424,7616;7680,7958;7960,7966;7968,8006;8008,8014;8016,8024;8025,8026;8027,8028;8029,8030;8031,8062;8064,8117;8118,8125;8126,8127;8130,8133;8134,8141;8144,8148;8150,8156;8160,8173;8178,8181;8182,8189;8305,8306;8319,8320;8336,8349;8450,8451;8455,8456;8458,8468;8469,8470;8472,8478;8484,8485;8486,8487;8488,8489;8490,8506;8508,8512;8517,8522;8526,8527;8544,8585;11264,11311;11312,11359;11360,11493;11499,11503;11506,11508;11520,11558;11559,11560;11565,11566;11568,11624;11631,11632;11648,11671;11680,11687;11688,11695;11696,11703;11704,11711;11712,11719;11720,11727;11728,11735;11736,11743;12293,12296;12321,12330;12337,12342;12344,12349;12353,12439;12443,12448;12449,12539;12540,12544;12549,12592;12593,12687;12704,12731;12784,12800;13312,19894;19968,40944;40960,42125;42192,42238;42240,42509;42512,42528;42538,42540;42560,42607;42623,42654;42656,42736;42775,42784;42786,42889;42891,42944;42946,42951;42999,43010;43011,43014;43015,43019;43020,43043;43072,43124;43138,43188;43250,43256;43259,43260;43261,43263;43274,43302;43312,43335;43360,43389;43396,43443;43471,43472;43488,43493;43494,43504;43514,43519;43520,43561;43584,43587;43588,43596;43616,43639;43642,43643;43646,43696;43697,43698;43701,43703;43705,43710;43712,43713;43714,43715;43739,43742;43744,43755;43762,43765;43777,43783;43785,43791;43793,43799;43808,43815;43816,43823;43824,43867;43868,43880;43888,44003;44032,55204;55216,55239;55243,55292;63744,64110;64112,64218;64256,64263;64275,64280;64285,64286;64287,64297;64298,64311;64312,64317;64318,64319;64320,64322;64323,64325;64326,64434;64467,64830;64848,64912;64914,64968;65008,65020;65136,65141;65142,65277;65313,65339;65345,65371;65382,65471;65474,65480;65482,65488;65490,65496;65498,65501;65536,65548;65549,65575;65576,65595;65596,65598;65599,65614;65616,65630;65664,65787;65856,65909;66176,66205;66208,66257;66304,66336;66349,66379;66384,66422;66432,66462;66464,66500;66504,66512;66513,66518;66560,66718;66736,66772;66776,66812;66816,66856;66864,66916;67072,67383;67392,67414;67424,67432;67584,67590;67592,67593;67594,67638;67639,67641;67644,67645;67647,67670;67680,67703;67712,67743;67808,67827;67828,67830;67840,67862;67872,67898;67968,68024;68030,68032;68096,68097;68112,68116;68117,68120;68121,68150;68192,68221;68224,68253;68288,68296;68297,68325;68352,68406;68416,68438;68448,68467;68480,68498;68608,68681;68736,68787;68800,68851;68864,68900;69376,69405;69415,69416;69424,69446;69600,69623;69635,69688;69763,69808;69840,69865;69891,69927;69956,69957;69968,70003;70006,70007;70019,70067;70081,70085;70106,70107;70108,70109;70144,70162;70163,70188;70272,70279;70280,70281;70282,70286;70287,70302;70303,70313;70320,70367;70405,70413;70415,70417;70419,70441;70442,70449;70450,70452;70453,70458;70461,70462;70480,70481;70493,70498;70656,70709;70727,70731;70751,70752;70784,70832;70852,70854;70855,70856;71040,71087;71128,71132;71168,71216;71236,71237;71296,71339;71352,71353;71424,71451;71680,71724;71840,71904;71935,71936;72096,72104;72106,72145;72161,72162;72163,72164;72192,72193;72203,72243;72250,72251;72272,72273;72284,72330;72349,72350;72384,72441;72704,72713;72714,72751;72768,72769;72818,72848;72960,72967;72968,72970;72971,73009;73030,73031;73056,73062;73063,73065;73066,73098;73112,73113;73440,73459;73728,74650;74752,74863;74880,75076;77824,78895;82944,83527;92160,92729;92736,92767;92880,92910;92928,92976;92992,92996;93027,93048;93053,93072;93760,93824;93952,94027;94032,94033;94099,94112;94176,94178;94179,94180;94208,100344;100352,101107;110592,110879;110928,110931;110948,110952;110960,111356;113664,113771;113776,113789;113792,113801;113808,113818;119808,119893;119894,119965;119966,119968;119970,119971;119973,119975;119977,119981;119982,119994;119995,119996;119997,120004;120005,120070;120071,120075;120077,120085;120086,120093;120094,120122;120123,120127;120128,120133;120134,120135;120138,120145;120146,120486;120488,120513;120514,120539;120540,120571;120572,120597;120598,120629;120630,120655;120656,120687;120688,120713;120714,120745;120746,120771;120772,120780;123136,123181;123191,123198;123214,123215;123584,123628;124928,125125;125184,125252;125259,125260;126464,126468;126469,126496;126497,126499;126500,126501;126503,126504;126505,126515;126516,126520;126521,126522;126523,126524;126530,126531;126535,126536;126537,126538;126539,126540;126541,126544;126545,126547;126548,126549;126551,126552;126553,126554;126555,126556;126557,126558;126559,126560;126561,126563;126564,126565;126567,126571;126572,126579;126580,126584;126585,126589;126590,126591;126592,126602;126603,126620;126625,126628;126629,126634;126635,126652;131072,173783;173824,177973;177984,178206;178208,183970;183984,191457;194560,195102|]
-
-(* The followed ID restriction is relaxed, this one
-   is used in our customized unicode lexing.
- *)
-let id_continue = [|36,37;48,58;65,91;95,96;97,123;170,171;181,182;183,184;186,187;192,215;216,247;248,706;710,722;736,741;748,749;750,751;768,885;886,888;890,894;895,896;902,907;908,909;910,930;931,1014;1015,1154;1155,1160;1162,1328;1329,1367;1369,1370;1376,1417;1425,1470;1471,1472;1473,1475;1476,1478;1479,1480;1488,1515;1519,1523;1552,1563;1568,1642;1646,1748;1749,1757;1759,1769;1770,1789;1791,1792;1808,1867;1869,1970;1984,2038;2042,2043;2045,2046;2048,2094;2112,2140;2144,2155;2208,2229;2230,2238;2259,2274;2275,2404;2406,2416;2417,2436;2437,2445;2447,2449;2451,2473;2474,2481;2482,2483;2486,2490;2492,2501;2503,2505;2507,2511;2519,2520;2524,2526;2527,2532;2534,2546;2556,2557;2558,2559;2561,2564;2565,2571;2575,2577;2579,2601;2602,2609;2610,2612;2613,2615;2616,2618;2620,2621;2622,2627;2631,2633;2635,2638;2641,2642;2649,2653;2654,2655;2662,2678;2689,2692;2693,2702;2703,2706;2707,2729;2730,2737;2738,2740;2741,2746;2748,2758;2759,2762;2763,2766;2768,2769;2784,2788;2790,2800;2809,2816;2817,2820;2821,2829;2831,2833;2835,2857;2858,2865;2866,2868;2869,2874;2876,2885;2887,2889;2891,2894;2902,2904;2908,2910;2911,2916;2918,2928;2929,2930;2946,2948;2949,2955;2958,2961;2962,2966;2969,2971;2972,2973;2974,2976;2979,2981;2984,2987;2990,3002;3006,3011;3014,3017;3018,3022;3024,3025;3031,3032;3046,3056;3072,3085;3086,3089;3090,3113;3114,3130;3133,3141;3142,3145;3146,3150;3157,3159;3160,3163;3168,3172;3174,3184;3200,3204;3205,3213;3214,3217;3218,3241;3242,3252;3253,3258;3260,3269;3270,3273;3274,3278;3285,3287;3294,3295;3296,3300;3302,3312;3313,3315;3328,3332;3333,3341;3342,3345;3346,3397;3398,3401;3402,3407;3412,3416;3423,3428;3430,3440;3450,3456;3458,3460;3461,3479;3482,3506;3507,3516;3517,3518;3520,3527;3530,3531;3535,3541;3542,3543;3544,3552;3558,3568;3570,3572;3585,3643;3648,3663;3664,3674;3713,3715;3716,3717;3718,3723;3724,3748;3749,3750;3751,3774;3776,3781;3782,3783;3784,3790;3792,3802;3804,3808;3840,3841;3864,3866;3872,3882;3893,3894;3895,3896;3897,3898;3902,3912;3913,3949;3953,3973;3974,3992;3993,4029;4038,4039;4096,4170;4176,4254;4256,4294;4295,4296;4301,4302;4304,4347;4348,4681;4682,4686;4688,4695;4696,4697;4698,4702;4704,4745;4746,4750;4752,4785;4786,4790;4792,4799;4800,4801;4802,4806;4808,4823;4824,4881;4882,4886;4888,4955;4957,4960;4969,4978;4992,5008;5024,5110;5112,5118;5121,5741;5743,5760;5761,5787;5792,5867;5870,5881;5888,5901;5902,5909;5920,5941;5952,5972;5984,5997;5998,6001;6002,6004;6016,6100;6103,6104;6108,6110;6112,6122;6155,6158;6160,6170;6176,6265;6272,6315;6320,6390;6400,6431;6432,6444;6448,6460;6470,6510;6512,6517;6528,6572;6576,6602;6608,6619;6656,6684;6688,6751;6752,6781;6783,6794;6800,6810;6823,6824;6832,6846;6912,6988;6992,7002;7019,7028;7040,7156;7168,7224;7232,7242;7245,7294;7296,7305;7312,7355;7357,7360;7376,7379;7380,7419;7424,7674;7675,7958;7960,7966;7968,8006;8008,8014;8016,8024;8025,8026;8027,8028;8029,8030;8031,8062;8064,8117;8118,8125;8126,8127;8130,8133;8134,8141;8144,8148;8150,8156;8160,8173;8178,8181;8182,8189;8204,8206;8255,8257;8276,8277;8305,8306;8319,8320;8336,8349;8400,8413;8417,8418;8421,8433;8450,8451;8455,8456;8458,8468;8469,8470;8472,8478;8484,8485;8486,8487;8488,8489;8490,8506;8508,8512;8517,8522;8526,8527;8544,8585;11264,11311;11312,11359;11360,11493;11499,11508;11520,11558;11559,11560;11565,11566;11568,11624;11631,11632;11647,11671;11680,11687;11688,11695;11696,11703;11704,11711;11712,11719;11720,11727;11728,11735;11736,11743;11744,11776;12293,12296;12321,12336;12337,12342;12344,12349;12353,12439;12441,12448;12449,12539;12540,12544;12549,12592;12593,12687;12704,12731;12784,12800;13312,19894;19968,40944;40960,42125;42192,42238;42240,42509;42512,42540;42560,42608;42612,42622;42623,42738;42775,42784;42786,42889;42891,42944;42946,42951;42999,43048;43072,43124;43136,43206;43216,43226;43232,43256;43259,43260;43261,43310;43312,43348;43360,43389;43392,43457;43471,43482;43488,43519;43520,43575;43584,43598;43600,43610;43616,43639;43642,43715;43739,43742;43744,43760;43762,43767;43777,43783;43785,43791;43793,43799;43808,43815;43816,43823;43824,43867;43868,43880;43888,44011;44012,44014;44016,44026;44032,55204;55216,55239;55243,55292;63744,64110;64112,64218;64256,64263;64275,64280;64285,64297;64298,64311;64312,64317;64318,64319;64320,64322;64323,64325;64326,64434;64467,64830;64848,64912;64914,64968;65008,65020;65024,65040;65056,65072;65075,65077;65101,65104;65136,65141;65142,65277;65296,65306;65313,65339;65343,65344;65345,65371;65382,65471;65474,65480;65482,65488;65490,65496;65498,65501;65536,65548;65549,65575;65576,65595;65596,65598;65599,65614;65616,65630;65664,65787;65856,65909;66045,66046;66176,66205;66208,66257;66272,66273;66304,66336;66349,66379;66384,66427;66432,66462;66464,66500;66504,66512;66513,66518;66560,66718;66720,66730;66736,66772;66776,66812;66816,66856;66864,66916;67072,67383;67392,67414;67424,67432;67584,67590;67592,67593;67594,67638;67639,67641;67644,67645;67647,67670;67680,67703;67712,67743;67808,67827;67828,67830;67840,67862;67872,67898;67968,68024;68030,68032;68096,68100;68101,68103;68108,68116;68117,68120;68121,68150;68152,68155;68159,68160;68192,68221;68224,68253;68288,68296;68297,68327;68352,68406;68416,68438;68448,68467;68480,68498;68608,68681;68736,68787;68800,68851;68864,68904;68912,68922;69376,69405;69415,69416;69424,69457;69600,69623;69632,69703;69734,69744;69759,69819;69840,69865;69872,69882;69888,69941;69942,69952;69956,69959;69968,70004;70006,70007;70016,70085;70089,70093;70096,70107;70108,70109;70144,70162;70163,70200;70206,70207;70272,70279;70280,70281;70282,70286;70287,70302;70303,70313;70320,70379;70384,70394;70400,70404;70405,70413;70415,70417;70419,70441;70442,70449;70450,70452;70453,70458;70459,70469;70471,70473;70475,70478;70480,70481;70487,70488;70493,70500;70502,70509;70512,70517;70656,70731;70736,70746;70750,70752;70784,70854;70855,70856;70864,70874;71040,71094;71096,71105;71128,71134;71168,71233;71236,71237;71248,71258;71296,71353;71360,71370;71424,71451;71453,71468;71472,71482;71680,71739;71840,71914;71935,71936;72096,72104;72106,72152;72154,72162;72163,72165;72192,72255;72263,72264;72272,72346;72349,72350;72384,72441;72704,72713;72714,72759;72760,72769;72784,72794;72818,72848;72850,72872;72873,72887;72960,72967;72968,72970;72971,73015;73018,73019;73020,73022;73023,73032;73040,73050;73056,73062;73063,73065;73066,73103;73104,73106;73107,73113;73120,73130;73440,73463;73728,74650;74752,74863;74880,75076;77824,78895;82944,83527;92160,92729;92736,92767;92768,92778;92880,92910;92912,92917;92928,92983;92992,92996;93008,93018;93027,93048;93053,93072;93760,93824;93952,94027;94031,94088;94095,94112;94176,94178;94179,94180;94208,100344;100352,101107;110592,110879;110928,110931;110948,110952;110960,111356;113664,113771;113776,113789;113792,113801;113808,113818;113821,113823;119141,119146;119149,119155;119163,119171;119173,119180;119210,119214;119362,119365;119808,119893;119894,119965;119966,119968;119970,119971;119973,119975;119977,119981;119982,119994;119995,119996;119997,120004;120005,120070;120071,120075;120077,120085;120086,120093;120094,120122;120123,120127;120128,120133;120134,120135;120138,120145;120146,120486;120488,120513;120514,120539;120540,120571;120572,120597;120598,120629;120630,120655;120656,120687;120688,120713;120714,120745;120746,120771;120772,120780;120782,120832;121344,121399;121403,121453;121461,121462;121476,121477;121499,121504;121505,121520;122880,122887;122888,122905;122907,122914;122915,122917;122918,122923;123136,123181;123184,123198;123200,123210;123214,123215;123584,123642;124928,125125;125136,125143;125184,125260;125264,125274;126464,126468;126469,126496;126497,126499;126500,126501;126503,126504;126505,126515;126516,126520;126521,126522;126523,126524;126530,126531;126535,126536;126537,126538;126539,126540;126541,126544;126545,126547;126548,126549;126551,126552;126553,126554;126555,126556;126557,126558;126559,126560;126561,126563;126564,126565;126567,126571;126572,126579;126580,126584;126585,126589;126590,126591;126592,126602;126603,126620;126625,126628;126629,126634;126635,126652;131072,173783;173824,177973;177984,178206;178208,183970;183984,191457;194560,195102;917760,918000|]
diff --git a/jscomp/js_parser/jsx_parser.ml b/jscomp/js_parser/jsx_parser.ml
deleted file mode 100644
index f2e2fef..0000000
--- a/jscomp/js_parser/jsx_parser.ml
+++ /dev/null
@@ -1,457 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Ast = Flow_ast
-open Token
-open Parser_common
-open Parser_env
-open Flow_ast
-
-module JSX (Parse : Parser_common.PARSER) = struct
-  (* Consumes and returns the trailing comments after the end of a JSX tag name,
-     attribute, or spread attribute.
-
-     If the component is followed by the end of the JSX tag, then all trailing
-     comments are returned. If the component is instead followed by another tag
-     component on another line, only trailing comments on the same line are
-     returned. If the component is followed by another tag component on the same
-     line, all trailing comments will instead be leading the next component. *)
-  let tag_component_trailing_comments env =
-    match Peek.token env with
-    | T_EOF
-    | T_DIV
-    | T_GREATER_THAN ->
-      Eat.trailing_comments env
-    | _ when Peek.is_line_terminator env -> Eat.comments_until_next_line env
-    | _ -> []
-
-  let spread_attribute env =
-    let leading = Peek.comments env in
-    Eat.push_lex_mode env Lex_mode.NORMAL;
-    let (loc, argument) =
-      with_loc
-        (fun env ->
-          Expect.token env T_LCURLY;
-          Expect.token env T_ELLIPSIS;
-          let argument = Parse.assignment env in
-          Expect.token env T_RCURLY;
-          argument)
-        env
-    in
-    Eat.pop_lex_mode env;
-    let trailing = tag_component_trailing_comments env in
-    ( loc,
-      {
-        JSX.SpreadAttribute.argument;
-        comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-      }
-    )
-
-  let expression_container_contents env =
-    if Peek.token env = T_RCURLY then
-      JSX.ExpressionContainer.EmptyExpression
-    else
-      JSX.ExpressionContainer.Expression (Parse.expression env)
-
-  let expression_container env =
-    let leading = Peek.comments env in
-    Eat.push_lex_mode env Lex_mode.NORMAL;
-    let (loc, expression) =
-      with_loc
-        (fun env ->
-          Expect.token env T_LCURLY;
-          let expression = expression_container_contents env in
-          Expect.token env T_RCURLY;
-          expression)
-        env
-    in
-    Eat.pop_lex_mode env;
-    let trailing = tag_component_trailing_comments env in
-    ( loc,
-      {
-        JSX.ExpressionContainer.expression;
-        comments = Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal:[] ();
-      }
-    )
-
-  let expression_container_or_spread_child env =
-    Eat.push_lex_mode env Lex_mode.NORMAL;
-    let (loc, result) =
-      with_loc
-        (fun env ->
-          Expect.token env T_LCURLY;
-          let result =
-            match Peek.token env with
-            | T_ELLIPSIS ->
-              let leading = Peek.comments env in
-              Expect.token env T_ELLIPSIS;
-              let expression = Parse.assignment env in
-              JSX.SpreadChild
-                {
-                  JSX.SpreadChild.expression;
-                  comments = Flow_ast_utils.mk_comments_opt ~leading ();
-                }
-            | _ ->
-              let expression = expression_container_contents env in
-              let internal =
-                match expression with
-                | JSX.ExpressionContainer.EmptyExpression -> Peek.comments env
-                | _ -> []
-              in
-              JSX.ExpressionContainer
-                {
-                  JSX.ExpressionContainer.expression;
-                  comments = Flow_ast_utils.mk_comments_with_internal_opt ~internal ();
-                }
-          in
-          Expect.token env T_RCURLY;
-          result)
-        env
-    in
-    Eat.pop_lex_mode env;
-    (loc, result)
-
-  let identifier env =
-    let loc = Peek.loc env in
-    let name =
-      match Peek.token env with
-      | T_JSX_IDENTIFIER { raw; _ } -> raw
-      | _ ->
-        error_unexpected ~expected:"an identifier" env;
-        ""
-    in
-    let leading = Peek.comments env in
-    Eat.token env;
-    (* Unless this identifier is the first part of a namespaced name, member
-       expression, or attribute name, it is the end of a tag component. *)
-    let trailing =
-      match Peek.token env with
-      (* Namespaced name *)
-      | T_COLON
-      (* Member expression *)
-      | T_PERIOD
-      (* Attribute name *)
-      | T_ASSIGN ->
-        Eat.trailing_comments env
-      | _ -> tag_component_trailing_comments env
-    in
-    (loc, JSX.Identifier.{ name; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () })
-
-  let name =
-    let rec member_expression env member =
-      match Peek.token env with
-      | T_PERIOD ->
-        let (start_loc, _) = member in
-        let member =
-          with_loc
-            ~start_loc
-            (fun env ->
-              Expect.token env T_PERIOD;
-              let property = identifier env in
-              {
-                JSX.MemberExpression._object = JSX.MemberExpression.MemberExpression member;
-                property;
-              })
-            env
-        in
-        member_expression env member
-      | _ -> member
-    in
-    fun env ->
-      match Peek.ith_token ~i:1 env with
-      | T_COLON ->
-        let namespaced_name =
-          with_loc
-            (fun env ->
-              let namespace = identifier env in
-              Expect.token env T_COLON;
-              let name = identifier env in
-              { JSX.NamespacedName.namespace; name })
-            env
-        in
-        JSX.NamespacedName namespaced_name
-      | T_PERIOD ->
-        let member =
-          with_loc
-            (fun env ->
-              let _object = JSX.MemberExpression.Identifier (identifier env) in
-              Expect.token env T_PERIOD;
-              let property = identifier env in
-              { JSX.MemberExpression._object; property })
-            env
-        in
-        JSX.MemberExpression (member_expression env member)
-      | _ ->
-        let name = identifier env in
-        JSX.Identifier name
-
-  let attribute env =
-    with_loc
-      (fun env ->
-        let name =
-          match Peek.ith_token ~i:1 env with
-          | T_COLON ->
-            let namespaced_name =
-              with_loc
-                (fun env ->
-                  let namespace = identifier env in
-                  Expect.token env T_COLON;
-                  let name = identifier env in
-                  { JSX.NamespacedName.namespace; name })
-                env
-            in
-            JSX.Attribute.NamespacedName namespaced_name
-          | _ ->
-            let name = identifier env in
-            JSX.Attribute.Identifier name
-        in
-        let value =
-          match Peek.token env with
-          | T_ASSIGN ->
-            Expect.token env T_ASSIGN;
-            let leading = Peek.comments env in
-            let tkn = Peek.token env in
-            begin
-              match tkn with
-              | T_LCURLY ->
-                let (loc, expression_container) = expression_container env in
-                JSX.ExpressionContainer.(
-                  match expression_container.expression with
-                  | EmptyExpression ->
-                    error_at env (loc, Parse_error.JSXAttributeValueEmptyExpression)
-                  | _ -> ()
-                );
-                Some (JSX.Attribute.ExpressionContainer (loc, expression_container))
-              | T_JSX_TEXT (loc, value, raw) as token ->
-                Expect.token env token;
-                let value = Ast.Literal.String value in
-                let trailing = tag_component_trailing_comments env in
-                Some
-                  (JSX.Attribute.Literal
-                     ( loc,
-                       {
-                         Ast.Literal.value;
-                         raw;
-                         comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-                       }
-                     )
-                  )
-              | _ ->
-                error env Parse_error.InvalidJSXAttributeValue;
-                let loc = Peek.loc env in
-                let raw = "" in
-                let value = Ast.Literal.String "" in
-                Some (JSX.Attribute.Literal (loc, { Ast.Literal.value; raw; comments = None }))
-            end
-          | _ -> None
-        in
-        { JSX.Attribute.name; value })
-      env
-
-  let opening_element =
-    let rec attributes env acc =
-      match Peek.token env with
-      | T_JSX_IDENTIFIER _ ->
-        let attribute = JSX.Opening.Attribute (attribute env) in
-        attributes env (attribute :: acc)
-      | T_LCURLY ->
-        let attribute = JSX.Opening.SpreadAttribute (spread_attribute env) in
-        attributes env (attribute :: acc)
-      | _ -> List.rev acc
-    in
-    fun env ->
-      with_loc
-        (fun env ->
-          Expect.token env T_LESS_THAN;
-          match Peek.token env with
-          | T_GREATER_THAN ->
-            Eat.token env;
-            Ok `Fragment
-          | T_JSX_IDENTIFIER _ ->
-            let name = name env in
-            let attributes = attributes env [] in
-            let self_closing = Eat.maybe env T_DIV in
-            let element = `Element { JSX.Opening.name; self_closing; attributes } in
-            if Eat.maybe env T_GREATER_THAN then
-              Ok element
-            else (
-              Expect.error env T_GREATER_THAN;
-              Error element
-            )
-          | _ ->
-            (* TODO: also say that we could expect an identifier, or if we're in a JSX child
-               then suggest escaping the < as `{'<'}` *)
-            Expect.error env T_GREATER_THAN;
-            Error `Fragment)
-        env
-
-  let closing_element env =
-    with_loc
-      (fun env ->
-        Expect.token env T_LESS_THAN;
-        Expect.token env T_DIV;
-        match Peek.token env with
-        | T_GREATER_THAN ->
-          Eat.token env;
-          `Fragment
-        | T_JSX_IDENTIFIER _ ->
-          let name = name env in
-          Expect.token_opt env T_GREATER_THAN;
-          `Element { JSX.Closing.name }
-        | _ ->
-          Expect.error env T_GREATER_THAN;
-          `Fragment)
-      env
-
-  let rec child env =
-    match Peek.token env with
-    | T_LCURLY -> expression_container_or_spread_child env
-    | T_JSX_TEXT (loc, value, raw) as token ->
-      Expect.token env token;
-      (loc, JSX.Text { JSX.Text.value; raw })
-    | _ ->
-      (match element_or_fragment env with
-      | (loc, `Element element) -> (loc, JSX.Element element)
-      | (loc, `Fragment fragment) -> (loc, JSX.Fragment fragment))
-
-  and element =
-    let children_and_closing =
-      let rec children_and_closing env acc =
-        let previous_loc = last_loc env in
-        match Peek.token env with
-        | T_LESS_THAN ->
-          Eat.push_lex_mode env Lex_mode.JSX_TAG;
-          begin
-            match (Peek.token env, Peek.ith_token ~i:1 env) with
-            | (T_LESS_THAN, T_EOF)
-            | (T_LESS_THAN, T_DIV) ->
-              let closing =
-                match closing_element env with
-                | (loc, `Element ec) -> `Element (loc, ec)
-                | (loc, `Fragment) -> `Fragment loc
-              in
-              (* We double pop to avoid going back to childmode and re-lexing the
-               * lookahead *)
-              Eat.double_pop_lex_mode env;
-              (List.rev acc, previous_loc, closing)
-            | _ ->
-              let child =
-                match element env with
-                | (loc, `Element e) -> (loc, JSX.Element e)
-                | (loc, `Fragment f) -> (loc, JSX.Fragment f)
-              in
-              children_and_closing env (child :: acc)
-          end
-        | T_EOF ->
-          error_unexpected env;
-          (List.rev acc, previous_loc, `None)
-        | _ -> children_and_closing env (child env :: acc)
-      in
-      fun env ->
-        let start_loc = Peek.loc env in
-        let (children, last_child_loc, closing) = children_and_closing env [] in
-        let last_child_loc =
-          match last_child_loc with
-          | Some x -> x
-          | None -> start_loc
-        in
-        (* It's a little bit tricky to untangle the parsing of the child elements from the parsing
-         * of the closing element, so we can't easily use `with_loc` here. Instead, we'll use the
-         * same logic that `with_loc` uses, but manipulate the locations explicitly. *)
-        let children_loc = Loc.btwn start_loc last_child_loc in
-        ((children_loc, children), closing)
-    in
-    let rec normalize name =
-      JSX.(
-        match name with
-        | Identifier (_, { Identifier.name; comments = _ }) -> name
-        | NamespacedName (_, { NamespacedName.namespace; name }) ->
-          (snd namespace).Identifier.name ^ ":" ^ (snd name).Identifier.name
-        | MemberExpression (_, { MemberExpression._object; property }) ->
-          let _object =
-            match _object with
-            | MemberExpression.Identifier (_, { Identifier.name = id; _ }) -> id
-            | MemberExpression.MemberExpression e -> normalize (JSX.MemberExpression e)
-          in
-          _object ^ "." ^ (snd property).Identifier.name
-      )
-    in
-    let is_self_closing = function
-      | (_, Ok (`Element e)) -> e.JSX.Opening.self_closing
-      | (_, Ok `Fragment) -> false
-      | (_, Error _) -> true
-    in
-    fun env ->
-      let leading = Peek.comments env in
-      let opening_element = opening_element env in
-      Eat.pop_lex_mode env;
-      let (children, closing_element) =
-        if is_self_closing opening_element then
-          (with_loc (fun _ -> []) env, `None)
-        else (
-          Eat.push_lex_mode env Lex_mode.JSX_CHILD;
-          children_and_closing env
-        )
-      in
-      let trailing = Eat.trailing_comments env in
-      let end_loc =
-        match closing_element with
-        | `Element (loc, { JSX.Closing.name }) ->
-          (match snd opening_element with
-          | Ok (`Element { JSX.Opening.name = opening_name; _ }) ->
-            let opening_name = normalize opening_name in
-            if normalize name <> opening_name then
-              error env (Parse_error.ExpectedJSXClosingTag opening_name)
-          | Ok `Fragment -> error env (Parse_error.ExpectedJSXClosingTag "JSX fragment")
-          | Error _ -> ());
-          loc
-        | `Fragment loc ->
-          (match snd opening_element with
-          | Ok (`Element { JSX.Opening.name = opening_name; _ }) ->
-            error env (Parse_error.ExpectedJSXClosingTag (normalize opening_name))
-          | Ok `Fragment -> ()
-          | Error _ -> ());
-          loc
-        | _ -> fst opening_element
-      in
-      let result =
-        match opening_element with
-        | (start_loc, Ok (`Element e))
-        | (start_loc, Error (`Element e)) ->
-          `Element
-            JSX.
-              {
-                opening_element = (start_loc, e);
-                closing_element =
-                  (match closing_element with
-                  | `Element e -> Some e
-                  | _ -> None);
-                children;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-              }
-            | (start_loc, Ok `Fragment)
-            | (start_loc, Error `Fragment) ->
-              `Fragment
-                {
-                  JSX.frag_opening_element = start_loc;
-                  frag_closing_element =
-                    (match closing_element with
-                    | `Fragment loc -> loc
-                    (* the following are parse erros *)
-                    | `Element (loc, _) -> loc
-                    | _ -> end_loc);
-                  frag_children = children;
-                  frag_comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-                }
-      in
-
-      (Loc.btwn (fst opening_element) end_loc, result)
-
-  and element_or_fragment env =
-    Eat.push_lex_mode env Lex_mode.JSX_TAG;
-    element env
-end
diff --git a/jscomp/js_parser/lex_env.ml b/jscomp/js_parser/lex_env.ml
deleted file mode 100644
index 00c36c4..0000000
--- a/jscomp/js_parser/lex_env.ml
+++ /dev/null
@@ -1,87 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Sedlexing = Flow_sedlexing
-
-(* bol = Beginning Of Line *)
-type bol = {
-  line: int;
-  offset: int;
-}
-
-type lex_state = { lex_errors_acc: (Loc.t * Parse_error.t) list } [@@ocaml.unboxed]
-
-type t = {
-  lex_source: File_key.t option;
-  lex_lb: Sedlexing.lexbuf;
-  lex_bol: bol;
-  lex_in_comment_syntax: bool;
-  lex_enable_comment_syntax: bool;
-  lex_state: lex_state;
-  lex_last_loc: Loc.t;
-}
-
-let empty_lex_state = { lex_errors_acc = [] }
-
-(* The lex_last_loc should initially be set to the beginning of the first line, so that
-   comments on the first line are reported as not being on a new line. *)
-let initial_last_loc =
-  { Loc.source = None; start = { Loc.line = 1; column = 0 }; _end = { Loc.line = 1; column = 0 } }
-
-let new_lex_env lex_source lex_lb ~enable_types_in_comments =
-  {
-    lex_source;
-    lex_lb;
-    lex_bol = { line = 1; offset = 0 };
-    lex_in_comment_syntax = false;
-    lex_enable_comment_syntax = enable_types_in_comments;
-    lex_state = empty_lex_state;
-    lex_last_loc = initial_last_loc;
-  }
-
-(* copy all the mutable things so that we have a distinct lexing environment
-   that does not interfere with ordinary lexer operations *)
-let clone env =
-  let lex_lb = Sedlexing.lexbuf_clone env.lex_lb in
-  { env with lex_lb }
-
-let lexbuf env = env.lex_lb
-
-let source env = env.lex_source
-
-let state env = env.lex_state
-
-let line env = env.lex_bol.line
-
-let bol_offset env = env.lex_bol.offset
-
-let is_in_comment_syntax env = env.lex_in_comment_syntax
-
-let is_comment_syntax_enabled env = env.lex_enable_comment_syntax
-
-let in_comment_syntax is_in env =
-  if is_in <> env.lex_in_comment_syntax then
-    { env with lex_in_comment_syntax = is_in }
-  else
-    env
-
-(* TODO *)
-let debug_string_of_lexbuf _lb = ""
-
-let debug_string_of_lex_env (env : t) =
-  let source =
-    match source env with
-    | None -> "None"
-    | Some x -> Printf.sprintf "Some %S" (File_key.to_string x)
-  in
-  Printf.sprintf
-    "{\n  lex_source = %s\n  lex_lb = %s\n  lex_in_comment_syntax = %b\n  lex_enable_comment_syntax = %b\n  lex_state = {errors = (count = %d)}\n}"
-    source
-    (debug_string_of_lexbuf env.lex_lb)
-    (is_in_comment_syntax env)
-    (is_comment_syntax_enabled env)
-    (List.length (state env).lex_errors_acc)
diff --git a/jscomp/js_parser/lex_result.ml b/jscomp/js_parser/lex_result.ml
deleted file mode 100644
index 06ca899..0000000
--- a/jscomp/js_parser/lex_result.ml
+++ /dev/null
@@ -1,29 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-type t = {
-  lex_token: Token.t;
-  lex_loc: Loc.t;
-  lex_errors: (Loc.t * Parse_error.t) list;
-  lex_comments: Loc.t Flow_ast.Comment.t list;
-}
-
-let token result = result.lex_token
-
-let loc result = result.lex_loc
-
-let comments result = result.lex_comments
-
-let errors result = result.lex_errors
-
-let debug_string_of_lex_result lex_result =
-  Printf.sprintf
-    "{\n  lex_token = %s\n  lex_value = %S\n  lex_errors = (length = %d)\n  lex_comments = (length = %d)\n}"
-    (Token.token_to_string lex_result.lex_token)
-    (Token.value_of_token lex_result.lex_token)
-    (List.length lex_result.lex_errors)
-    (List.length lex_result.lex_comments)
diff --git a/jscomp/js_parser/loc.ml b/jscomp/js_parser/loc.ml
deleted file mode 100644
index 143f067..0000000
--- a/jscomp/js_parser/loc.ml
+++ /dev/null
@@ -1,187 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-open Primitive_deriving
-
-(* line numbers are 1-indexed; column numbers are 0-indexed *)
-type position = {
-  line: int;
-  column: int;
-}
-[@@deriving_inline equal]
-let _ = fun (_ : position) -> ()
-let equal_position =
-  (fun a__001_ ->
-     fun b__002_ ->
-       if Ppx_compare_lib.phys_equal a__001_ b__002_
-       then true
-       else
-         Ppx_compare_lib.(&&) (equal_int a__001_.line b__002_.line)
-           (equal_int a__001_.column b__002_.column) : position ->
-                                                         position -> bool)
-let _ = equal_position
-[@@@end]
-(* start is inclusive; end is exclusive *)
-(* If you are modifying this record, go look at ALoc.ml and make sure you understand the
- * representation there. *)
-type t = {
-  source: File_key.t option;
-  start: position;
-  _end: position;
-}
-
-let none = { source = None; start = { line = 0; column = 0 }; _end = { line = 0; column = 0 } }
-
-let is_none (x : t) =
-  x == none
-  ||
-  match x with
-  | { source = None; start = { line = 0; column = 0 }; _end = { line = 0; column = 0 } } -> true
-  | _ -> false
-
-let is_none_ignore_source (x : t) =
-  x == none
-  ||
-  match x with
-  | { source = _; start = { line = 0; column = 0 }; _end = { line = 0; column = 0 } } -> true
-  | _ -> false
-
-let btwn loc1 loc2 = { source = loc1.source; start = loc1.start; _end = loc2._end }
-
-(* Returns the position immediately before the start of the given loc. If the
-   given loc is at the beginning of a line, return the position of the first
-   char on the same line. *)
-let char_before loc =
-  let start =
-    let { line; column } = loc.start in
-    let column =
-      if column > 0 then
-        column - 1
-      else
-        column
-    in
-    { line; column }
-  in
-  let _end = loc.start in
-  { loc with start; _end }
-
-(* Returns the location of the first character in the given loc. Not accurate if the
- * first line is a newline character, but is still consistent with loc orderings. *)
-let first_char loc =
-  let start = loc.start in
-  let _end = { start with column = start.column + 1 } in
-  { loc with _end }
-
-let pos_cmp a b =
-  let k = a.line - b.line in
-  if k = 0 then
-    a.column - b.column
-  else
-    k
-
-(**
- * If `a` spans (completely contains) `b`, then returns 0.
- * If `b` starts before `a` (even if it ends inside), returns < 0.
- * If `b` ends after `a` (even if it starts inside), returns > 0.
- *)
-let span_compare a b =
-  let k = File_key.compare_opt a.source b.source in
-  if k = 0 then
-    let k = pos_cmp a.start b.start in
-    if k <= 0 then
-      let k = pos_cmp a._end b._end in
-      if k >= 0 then
-        0
-      else
-        -1
-    else
-      1
-  else
-    k
-
-(** [contains loc1 loc2] returns true if [loc1] entirely overlaps [loc2] *)
-let contains loc1 loc2 = span_compare loc1 loc2 = 0
-
-(** [intersects loc1 loc2] returns true if [loc1] intersects [loc2] at all *)
-let intersects loc1 loc2 =
-  File_key.compare_opt loc1.source loc2.source = 0
-  && not (pos_cmp loc1._end loc2.start < 0 || pos_cmp loc1.start loc2._end > 0)
-
-(** [lines_intersect loc1 loc2] returns true if [loc1] and [loc2] cover any part of
-    the same line, even if they don't actually intersect.
-
-    For example, if [loc1] ends and then [loc2] begins later on the same line,
-    [intersects loc1 loc2] is false, but [lines_intersect loc1 loc2] is true. *)
-let lines_intersect loc1 loc2 =
-  File_key.compare_opt loc1.source loc2.source = 0
-  && not (loc1._end.line < loc2.start.line || loc1.start.line > loc2._end.line)
-
-let compare_ignore_source loc1 loc2 =
-  match pos_cmp loc1.start loc2.start with
-  | 0 -> pos_cmp loc1._end loc2._end
-  | k -> k
-
-let compare loc1 loc2 =
-  let k = File_key.compare_opt loc1.source loc2.source in
-  if k = 0 then
-    compare_ignore_source loc1 loc2
-  else
-    k
-
-let equal loc1 loc2 = compare loc1 loc2 = 0
-
-(**
- * This is mostly useful for debugging purposes.
- * Please don't dead-code delete this!
- *)
-let debug_to_string ?(include_source = false) loc =
-  let source =
-    if include_source then
-      Printf.sprintf
-        "%S: "
-        (match loc.source with
-        | Some src -> File_key.to_string src
-        | None -> "<NONE>")
-    else
-      ""
-  in
-  let pos =
-    Printf.sprintf
-      "(%d, %d) to (%d, %d)"
-      loc.start.line
-      loc.start.column
-      loc._end.line
-      loc._end.column
-  in
-  source ^ pos
-
-let to_string_no_source loc =
-  let line = loc.start.line in
-  let start = loc.start.column + 1 in
-  let end_ = loc._end.column in
-  if line <= 0 then
-    "0:0"
-  else if line = loc._end.line && start = end_ then
-    Printf.sprintf "%d:%d" line start
-  else if line != loc._end.line then
-    Printf.sprintf "%d:%d,%d:%d" line start loc._end.line end_
-  else
-    Printf.sprintf "%d:%d-%d" line start end_
-
-let mk_loc ?source (start_line, start_column) (end_line, end_column) =
-  {
-    source;
-    start = { line = start_line; column = start_column };
-    _end = { line = end_line; column = end_column };
-  }
-
-let source loc = loc.source
-
-(** Produces a zero-width Loc.t, where start = end *)
-let cursor source line column = { source; start = { line; column }; _end = { line; column } }
-
-let start_loc loc = { loc with _end = loc.start }
-let end_loc loc = { loc with start = loc._end }
diff --git a/jscomp/js_parser/loc.mli b/jscomp/js_parser/loc.mli
deleted file mode 100644
index 4102338..0000000
--- a/jscomp/js_parser/loc.mli
+++ /dev/null
@@ -1,77 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-type position = {
-  line: int;
-  column: int;
-}
-[@@deriving_inline equal]
-include
-  sig
-    [@@@warning "-32"]
-    val equal_position : position -> position -> bool
-  end[@@ocaml.doc "@inline"]
-[@@@end]
-type t = {
-  source: File_key.t option;
-  start: position;
-  _end: position;
-}
-
-
-val none : t
-
-val is_none : t -> bool
-
-val is_none_ignore_source : t -> bool
-
-val btwn : t -> t -> t
-
-val char_before : t -> t
-
-val first_char : t -> t
-
-(** [contains loc1 loc2] returns true if [loc1] entirely overlaps [loc2] *)
-val contains : t -> t -> bool
-
-(** [intersects loc1 loc2] returns true if [loc1] intersects [loc2] at all *)
-val intersects : t -> t -> bool
-
-(** [lines_intersect loc1 loc2] returns true if [loc1] and [loc2] cover any part of
-    the same line, even if they don't actually intersect.
-
-    For example, if [loc1] ends and then [loc2] begins later on the same line,
-    [intersects loc1 loc2] is false, but [lines_intersect loc1 loc2] is true. *)
-val lines_intersect : t -> t -> bool
-
-val pos_cmp : position -> position -> int
-
-val span_compare : t -> t -> int
-
-val compare_ignore_source : t -> t -> int
-
-val compare : t -> t -> int
-
-val equal : t -> t -> bool
-
-val debug_to_string : ?include_source:bool -> t -> string
-
-(* Relatively compact; suitable for use as a unique string identifier *)
-val to_string_no_source : t -> string
-
-val mk_loc : ?source:File_key.t -> int * int -> int * int -> t
-
-val source : t -> File_key.t option
-
-(** Produces a zero-width Loc.t, where start = end *)
-val cursor : File_key.t option -> int -> int -> t
-
-(* Produces a location at the start of the input location *)
-val start_loc : t -> t
-
-(* Produces a location at the end of the input location *)
-val end_loc : t -> t
diff --git a/jscomp/js_parser/object_parser.ml b/jscomp/js_parser/object_parser.ml
deleted file mode 100644
index b5ece9e..0000000
--- a/jscomp/js_parser/object_parser.ml
+++ /dev/null
@@ -1,1087 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Ast = Flow_ast
-open Token
-open Parser_env
-open Flow_ast
-module SMap = Map.Make (String)
-open Parser_common
-open Comment_attachment
-
-(* A module for parsing various object related things, like object literals
- * and classes *)
-
-module type OBJECT = sig
-  val key : ?class_body:bool -> env -> Loc.t * (Loc.t, Loc.t) Ast.Expression.Object.Property.key
-  val _initializer : env -> Loc.t * (Loc.t, Loc.t) Ast.Expression.Object.t * pattern_errors
-
-  val class_declaration :
-    env -> (Loc.t, Loc.t) Ast.Class.Decorator.t list -> (Loc.t, Loc.t) Ast.Statement.t
-
-  val class_expression : env -> (Loc.t, Loc.t) Ast.Expression.t
-  val class_implements : env -> attach_leading:bool -> (Loc.t, Loc.t) Ast.Class.Implements.t
-  val decorator_list : env -> (Loc.t, Loc.t) Ast.Class.Decorator.t list
-end
-
-module Object
-    (Parse : Parser_common.PARSER)
-    (Type : Type_parser.TYPE)
-    (Declaration : Declaration_parser.DECLARATION)
-    (Expression : Expression_parser.EXPRESSION)
-    (Pattern_cover : Pattern_cover.COVER) : OBJECT = struct
-  let decorator_list =
-    let expression env =
-      let expression = Expression.left_hand_side env in
-      let { remove_trailing; _ } =
-        if Peek.is_line_terminator env then
-          trailing_and_remover_after_last_line env
-        else
-          trailing_and_remover_after_last_loc env
-      in
-      remove_trailing expression (fun remover expression -> remover#expression expression)
-    in
-    let decorator env =
-      let leading = Peek.comments env in
-      Eat.token env;
-      {
-        Ast.Class.Decorator.expression = expression env;
-        comments = Flow_ast_utils.mk_comments_opt ~leading ();
-      }
-    in
-    let rec decorator_list_helper env decorators =
-      match Peek.token env with
-      | T_AT -> decorator_list_helper env (with_loc decorator env :: decorators)
-      | _ -> decorators
-    in
-    fun env ->
-      if (parse_options env).esproposal_decorators then
-        List.rev (decorator_list_helper env [])
-      else
-        []
-
-  let key ?(class_body = false) env =
-    let open Ast.Expression.Object.Property in
-    let leading = Peek.comments env in
-    let tkn = Peek.token env in
-    match tkn with
-    | T_STRING (loc, value, raw, octal) ->
-      if octal then strict_error env Parse_error.StrictOctalLiteral;
-      Expect.token env (T_STRING (loc, value, raw, octal));
-      let value = Literal.String value in
-      let trailing = Eat.trailing_comments env in
-      ( loc,
-        Literal
-          ( loc,
-            { Literal.value; raw; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-          )
-      )
-    | T_NUMBER { kind; raw } ->
-      let loc = Peek.loc env in
-      let value = Expression.number env kind raw in
-      let value = Literal.Number value in
-      let trailing = Eat.trailing_comments env in
-      ( loc,
-        Literal
-          ( loc,
-            { Literal.value; raw; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-          )
-      )
-    | T_LBRACKET ->
-      let (loc, key) =
-        with_loc
-          (fun env ->
-            let leading = Peek.comments env in
-            Expect.token env T_LBRACKET;
-            let expr = Parse.assignment (env |> with_no_in false) in
-            Expect.token env T_RBRACKET;
-            let trailing = Eat.trailing_comments env in
-            {
-              ComputedKey.expression = expr;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            })
-          env
-      in
-      (loc, Ast.Expression.Object.Property.Computed (loc, key))
-    | T_POUND when class_body ->
-      let ((loc, { PrivateName.name; _ }) as id) = private_identifier env in
-      add_declared_private env name;
-      (loc, PrivateName id)
-    | T_POUND ->
-      let (loc, id) =
-        with_loc
-          (fun env ->
-            Eat.token env;
-            Identifier (identifier_name env))
-          env
-      in
-      error_at env (loc, Parse_error.PrivateNotInClass);
-      (loc, id)
-    | _ ->
-      let ((loc, _) as id) = identifier_name env in
-      (loc, Identifier id)
-
-  let getter_or_setter env ~in_class_body is_getter =
-    (* this is a getter or setter, it cannot be async *)
-    let async = false in
-    let (generator, leading) = Declaration.generator env in
-    let (key_loc, key) = key ~class_body:in_class_body env in
-    let key = object_key_remove_trailing env key in
-    let value =
-      with_loc
-        (fun env ->
-          (* #sec-function-definitions-static-semantics-early-errors *)
-          let env = env |> with_allow_super Super_prop in
-          let (sig_loc, (tparams, params, return)) =
-            with_loc
-              (fun env ->
-                (* It's not clear how type params on getters & setters would make sense
-                 * in Flow's type system. Since this is a Flow syntax extension, we might
-                 * as well disallow it until we need it *)
-                let tparams = None in
-                let params =
-                  let params = Declaration.function_params ~await:false ~yield:false env in
-                  if Peek.token env = T_COLON then
-                    params
-                  else
-                    function_params_remove_trailing env params
-                in
-                begin
-                  match (is_getter, params) with
-                  | (true, (_, { Ast.Function.Params.this_ = Some _; _ })) ->
-                    error_at env (key_loc, Parse_error.GetterMayNotHaveThisParam)
-                  | (false, (_, { Ast.Function.Params.this_ = Some _; _ })) ->
-                    error_at env (key_loc, Parse_error.SetterMayNotHaveThisParam)
-                  | ( true,
-                      ( _,
-                        { Ast.Function.Params.params = []; rest = None; this_ = None; comments = _ }
-                      )
-                    ) ->
-                    ()
-                  | (false, (_, { Ast.Function.Params.rest = Some _; _ })) ->
-                    (* rest params don't make sense on a setter *)
-                    error_at env (key_loc, Parse_error.SetterArity)
-                  | ( false,
-                      ( _,
-                        {
-                          Ast.Function.Params.params = [_];
-                          rest = None;
-                          this_ = None;
-                          comments = _;
-                        }
-                      )
-                    ) ->
-                    ()
-                  | (true, _) -> error_at env (key_loc, Parse_error.GetterArity)
-                  | (false, _) -> error_at env (key_loc, Parse_error.SetterArity)
-                end;
-                let return = type_annotation_hint_remove_trailing env (Type.annotation_opt env) in
-                (tparams, params, return))
-              env
-          in
-          let simple_params = is_simple_parameter_list params in
-          let (body, contains_use_strict) =
-            Declaration.function_body env ~async ~generator ~expression:false ~simple_params
-          in
-          Declaration.strict_post_check env ~contains_use_strict None params;
-          {
-            Function.id = None;
-            params;
-            body;
-            generator;
-            async;
-            predicate = None;
-            (* setters/getter are not predicates *)
-            return;
-            tparams;
-            sig_loc;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ();
-          })
-        env
-    in
-    (key, value)
-
-  let _initializer =
-    let parse_assignment_cover env =
-      match Expression.assignment_cover env with
-      | Cover_expr expr -> (expr, Pattern_cover.empty_errors)
-      | Cover_patt (expr, errs) -> (expr, errs)
-    in
-    let get env start_loc leading =
-      let (loc, (key, value)) =
-        with_loc ~start_loc (fun env -> getter_or_setter env ~in_class_body:false true) env
-      in
-      let open Ast.Expression.Object in
-      Property
-        (loc, Property.Get { key; value; comments = Flow_ast_utils.mk_comments_opt ~leading () })
-    in
-    let set env start_loc leading =
-      let (loc, (key, value)) =
-        with_loc ~start_loc (fun env -> getter_or_setter env ~in_class_body:false false) env
-      in
-      let open Ast.Expression.Object in
-      Property
-        (loc, Property.Set { key; value; comments = Flow_ast_utils.mk_comments_opt ~leading () })
-    in
-    (* #prod-PropertyDefinition *)
-    let init =
-      let open Ast.Expression.Object.Property in
-      (* #prod-IdentifierReference *)
-      let parse_shorthand env key =
-        match key with
-        | Literal (loc, lit) ->
-          error_at env (loc, Parse_error.LiteralShorthandProperty);
-          (loc, Ast.Expression.Literal lit)
-        | Identifier ((loc, { Identifier.name; comments = _ }) as id) ->
-          (* #sec-identifiers-static-semantics-early-errors *)
-          if is_reserved name && name <> "yield" && name <> "await" then
-            (* it is a syntax error if `name` is a reserved word other than await or yield *)
-            error_at env (loc, Parse_error.UnexpectedReserved)
-          else if is_strict_reserved name then
-            (* it is a syntax error if `name` is a strict reserved word, in strict mode *)
-            strict_error_at env (loc, Parse_error.StrictReservedWord);
-          (loc, Ast.Expression.Identifier id)
-        | PrivateName _ -> failwith "Internal Error: private name found in object props"
-        | Computed (_, { ComputedKey.expression = expr; comments = _ }) ->
-          error_at env (fst expr, Parse_error.ComputedShorthandProperty);
-          expr
-      in
-      (* #prod-MethodDefinition *)
-      let parse_method ~async ~generator ~leading =
-        with_loc (fun env ->
-            (* #sec-function-definitions-static-semantics-early-errors *)
-            let env = env |> with_allow_super Super_prop in
-            let (sig_loc, (tparams, params, return)) =
-              with_loc
-                (fun env ->
-                  let tparams = type_params_remove_trailing env (Type.type_params env) in
-                  let params =
-                    let (yield, await) =
-                      match (async, generator) with
-                      | (true, true) ->
-                        (true, true) (* proposal-async-iteration/#prod-AsyncGeneratorMethod *)
-                      | (true, false) -> (false, allow_await env) (* #prod-AsyncMethod *)
-                      | (false, true) -> (true, false) (* #prod-GeneratorMethod *)
-                      | (false, false) -> (false, false)
-                      (* #prod-MethodDefinition *)
-                    in
-                    let params = Declaration.function_params ~await ~yield env in
-                    if Peek.token env = T_COLON then
-                      params
-                    else
-                      function_params_remove_trailing env params
-                  in
-                  let return = type_annotation_hint_remove_trailing env (Type.annotation_opt env) in
-                  (tparams, params, return))
-                env
-            in
-            let simple_params = is_simple_parameter_list params in
-            let (body, contains_use_strict) =
-              Declaration.function_body env ~async ~generator ~expression:false ~simple_params
-            in
-            Declaration.strict_post_check env ~contains_use_strict None params;
-            {
-              Function.id = None;
-              params;
-              body;
-              generator;
-              async;
-              (* TODO: add support for object method predicates *)
-              predicate = None;
-              return;
-              tparams;
-              sig_loc;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            }
-        )
-      in
-      (* PropertyName `:` AssignmentExpression *)
-      let parse_value env =
-        Expect.token env T_COLON;
-        parse_assignment_cover env
-      in
-      (* #prod-CoverInitializedName *)
-      let parse_assignment_pattern ~key env =
-        let open Ast.Expression.Object in
-        match key with
-        | Property.Identifier id ->
-          let assignment_loc = Peek.loc env in
-          let ast =
-            with_loc
-              ~start_loc:(fst id)
-              (fun env ->
-                let leading = Peek.comments env in
-                Expect.token env T_ASSIGN;
-                let trailing = Eat.trailing_comments env in
-                let left = Parse.pattern_from_expr env (fst id, Ast.Expression.Identifier id) in
-                let right = Parse.assignment env in
-                let comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () in
-                Ast.Expression.Assignment
-                  { Ast.Expression.Assignment.operator = None; left; right; comments })
-              env
-          in
-          let errs =
-            {
-              if_expr = [(assignment_loc, Parse_error.Unexpected (Token.quote_token_value "="))];
-              if_patt = [];
-            }
-          in
-          (ast, errs)
-        | Property.Literal _
-        | Property.PrivateName _
-        | Property.Computed _ ->
-          parse_value env
-      in
-      let parse_init ~key ~async ~generator ~leading env =
-        if async || generator then
-          let key = object_key_remove_trailing env key in
-          (* the `async` and `*` modifiers are only valid on methods *)
-          let value = parse_method env ~async ~generator ~leading in
-          let prop = Method { key; value } in
-          (prop, Pattern_cover.empty_errors)
-        else
-          match Peek.token env with
-          | T_RCURLY
-          | T_COMMA ->
-            let value = parse_shorthand env key in
-            let prop = Init { key; value; shorthand = true } in
-            (prop, Pattern_cover.empty_errors)
-          | T_LESS_THAN
-          | T_LPAREN ->
-            let key = object_key_remove_trailing env key in
-            let value = parse_method env ~async ~generator ~leading in
-            let prop = Method { key; value } in
-            (prop, Pattern_cover.empty_errors)
-          | T_ASSIGN ->
-            let (value, errs) = parse_assignment_pattern ~key env in
-            let prop = Init { key; value; shorthand = true } in
-            (prop, errs)
-          | T_COLON ->
-            let (value, errs) = parse_value env in
-            let prop = Init { key; value; shorthand = false } in
-            (prop, errs)
-          | _ ->
-            (* error. we recover by treating it as a shorthand property so as to not
-               consume any more tokens and make the error worse. we don't error here
-               because we'll expect a comma before the next token. *)
-            let value = parse_shorthand env key in
-            let prop = Init { key; value; shorthand = true } in
-            (prop, Pattern_cover.empty_errors)
-      in
-      fun env start_loc key async generator leading ->
-        let (loc, (prop, errs)) =
-          with_loc ~start_loc (parse_init ~key ~async ~generator ~leading) env
-        in
-        (Ast.Expression.Object.Property (loc, prop), errs)
-    in
-    let property env =
-      let open Ast.Expression.Object in
-      if Peek.token env = T_ELLIPSIS then
-        (* Spread property *)
-        let leading = Peek.comments env in
-        let (loc, (argument, errs)) =
-          with_loc
-            (fun env ->
-              Expect.token env T_ELLIPSIS;
-              parse_assignment_cover env)
-            env
-        in
-        ( SpreadProperty
-            (loc, { SpreadProperty.argument; comments = Flow_ast_utils.mk_comments_opt ~leading () }),
-          errs
-        )
-      else
-        let start_loc = Peek.loc env in
-        let (async, leading_async) =
-          match Peek.ith_token ~i:1 env with
-          | T_ASSIGN
-          (* { async = true } (destructuring) *)
-          | T_COLON
-          (* { async: true } *)
-          | T_LESS_THAN
-          (* { async<T>() {} } *)
-          | T_LPAREN
-          (* { async() {} } *)
-          | T_COMMA
-          (* { async, other, shorthand } *)
-          | T_RCURLY (* { async } *) ->
-            (false, [])
-          | _ -> Declaration.async env
-        in
-        let (generator, leading_generator) = Declaration.generator env in
-        let leading = leading_async @ leading_generator in
-        match (async, generator, Peek.token env) with
-        | (false, false, T_IDENTIFIER { raw = "get"; _ }) ->
-          let leading = Peek.comments env in
-          let (_, key) = key env in
-          begin
-            match Peek.token env with
-            | T_ASSIGN
-            | T_COLON
-            | T_LESS_THAN
-            | T_LPAREN
-            | T_COMMA
-            | T_RCURLY ->
-              init env start_loc key false false []
-            | _ ->
-              ignore (Comment_attachment.object_key_remove_trailing env key);
-              (get env start_loc leading, Pattern_cover.empty_errors)
-          end
-        | (false, false, T_IDENTIFIER { raw = "set"; _ }) ->
-          let leading = Peek.comments env in
-          let (_, key) = key env in
-          begin
-            match Peek.token env with
-            | T_ASSIGN
-            | T_COLON
-            | T_LESS_THAN
-            | T_LPAREN
-            | T_COMMA
-            | T_RCURLY ->
-              init env start_loc key false false []
-            | _ ->
-              ignore (Comment_attachment.object_key_remove_trailing env key);
-              (set env start_loc leading, Pattern_cover.empty_errors)
-          end
-        | (async, generator, _) ->
-          let (_, key) = key env in
-          init env start_loc key async generator leading
-    in
-    let rec properties env ~rest_trailing_comma (props, errs) =
-      match Peek.token env with
-      | T_EOF
-      | T_RCURLY ->
-        let errs =
-          match rest_trailing_comma with
-          | Some loc ->
-            { errs with if_patt = (loc, Parse_error.TrailingCommaAfterRestElement) :: errs.if_patt }
-          | None -> errs
-        in
-        (List.rev props, Pattern_cover.rev_errors errs)
-      | _ ->
-        let (prop, new_errs) = property env in
-        let rest_trailing_comma =
-          match prop with
-          | Ast.Expression.Object.SpreadProperty _ when Peek.token env = T_COMMA ->
-            Some (Peek.loc env)
-          | _ -> None
-        in
-        let errs = Pattern_cover.rev_append_errors new_errs errs in
-        let errs =
-          match Peek.token env with
-          | T_RCURLY
-          | T_EOF ->
-            errs
-          | T_COMMA ->
-            Eat.token env;
-            errs
-          | _ ->
-            (* we could use [Expect.error env T_COMMA], but we're in a weird
-               cover grammar situation where we're storing errors in
-               [Pattern_cover]. if we used [Expect.error], the errors would
-               end up out of order. *)
-            let err = Expect.get_error env T_COMMA in
-            (* if the unexpected token is a semicolon, consume it to aid
-               recovery. using a semicolon instead of a comma is a common
-               mistake. *)
-            let _ = Eat.maybe env T_SEMICOLON in
-            Pattern_cover.cons_error err errs
-        in
-        properties env ~rest_trailing_comma (prop :: props, errs)
-    in
-    fun env ->
-      let (loc, (expr, errs)) =
-        with_loc
-          (fun env ->
-            let leading = Peek.comments env in
-            Expect.token env T_LCURLY;
-            let (props, errs) =
-              properties env ~rest_trailing_comma:None ([], Pattern_cover.empty_errors)
-            in
-            let internal = Peek.comments env in
-            Expect.token env T_RCURLY;
-            let trailing = Eat.trailing_comments env in
-            ( {
-                Ast.Expression.Object.properties = props;
-                comments =
-                  Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-              },
-              errs
-            ))
-          env
-      in
-      (loc, expr, errs)
-
-  let check_property_name env loc name static =
-    if String.equal name "constructor" || (String.equal name "prototype" && static) then
-      error_at
-        env
-        (loc, Parse_error.InvalidClassMemberName { name; static; method_ = false; private_ = false })
-
-  let check_private_names
-      env seen_names private_name (kind : [ `Method | `Field | `Getter | `Setter ]) =
-    let (loc, { PrivateName.name; comments = _ }) = private_name in
-    if String.equal name "constructor" then
-      let () =
-        error_at
-          env
-          ( loc,
-            Parse_error.InvalidClassMemberName
-              { name; static = false; method_ = kind = `Method; private_ = true }
-          )
-      in
-      seen_names
-    else
-      match SMap.find_opt name seen_names with
-      | Some seen ->
-        begin
-          match (kind, seen) with
-          | (`Getter, `Setter)
-          | (`Setter, `Getter) ->
-            (* one getter and one setter are allowed as long as it's not used as a field *)
-            ()
-          | _ -> error_at env (loc, Parse_error.DuplicatePrivateFields name)
-        end;
-        SMap.add name `Field seen_names
-      | None -> SMap.add name kind seen_names
-
-  let class_implements env ~attach_leading =
-    let rec interfaces env acc =
-      let interface =
-        with_loc
-          (fun env ->
-            let id =
-              let id = Type.type_identifier env in
-              if Peek.token env <> T_LESS_THAN then
-                id
-              else
-                let { remove_trailing; _ } = trailing_and_remover env in
-                remove_trailing id (fun remover id -> remover#identifier id)
-            in
-            let targs = Type.type_args env in
-            { Ast.Class.Implements.Interface.id; targs })
-          env
-      in
-      let acc = interface :: acc in
-      match Peek.token env with
-      | T_COMMA ->
-        Expect.token env T_COMMA;
-        interfaces env acc
-      | _ -> List.rev acc
-    in
-    with_loc
-      (fun env ->
-        let leading =
-          if attach_leading then
-            Peek.comments env
-          else
-            []
-        in
-        Expect.token env T_IMPLEMENTS;
-        let interfaces = interfaces env [] in
-        { Ast.Class.Implements.interfaces; comments = Flow_ast_utils.mk_comments_opt ~leading () })
-      env
-
-  let class_extends ~leading =
-    with_loc (fun env ->
-        let expr =
-          let expr = Expression.left_hand_side (env |> with_allow_yield false) in
-          if Peek.token env <> T_LESS_THAN then
-            expr
-          else
-            let { remove_trailing; _ } = trailing_and_remover env in
-            remove_trailing expr (fun remover expr -> remover#expression expr)
-        in
-        let targs = Type.type_args env in
-        { Class.Extends.expr; targs; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-    )
-
-  (* https://tc39.es/ecma262/#prod-ClassHeritage *)
-  let class_heritage env =
-    let extends =
-      let leading = Peek.comments env in
-      if Eat.maybe env T_EXTENDS then
-        let (loc, extends) = class_extends ~leading env in
-        let { remove_trailing; _ } = trailing_and_remover env in
-        Some
-          (loc, remove_trailing extends (fun remover extends -> remover#class_extends loc extends))
-      else
-        None
-    in
-    let implements =
-      if Peek.token env = T_IMPLEMENTS then (
-        if not (should_parse_types env) then error env Parse_error.UnexpectedTypeInterface;
-        Some (class_implements_remove_trailing env (class_implements env ~attach_leading:true))
-      ) else
-        None
-    in
-    (extends, implements)
-
-  (* In the ES6 draft, all elements are methods. No properties (though there
-   * are getter and setters allowed *)
-  let class_element =
-    let get env start_loc decorators static leading =
-      let (loc, (key, value)) =
-        with_loc ~start_loc (fun env -> getter_or_setter env ~in_class_body:true true) env
-      in
-      let open Ast.Class in
-      Body.Method
-        ( loc,
-          {
-            Method.key;
-            value;
-            kind = Method.Get;
-            static;
-            decorators;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ();
-          }
-        )
-    in
-    let set env start_loc decorators static leading =
-      let (loc, (key, value)) =
-        with_loc ~start_loc (fun env -> getter_or_setter env ~in_class_body:true false) env
-      in
-      let open Ast.Class in
-      Body.Method
-        ( loc,
-          {
-            Method.key;
-            value;
-            kind = Method.Set;
-            static;
-            decorators;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ();
-          }
-        )
-    in
-    let error_unsupported_variance env = function
-      | Some (loc, _) -> error_at env (loc, Parse_error.UnexpectedVariance)
-      | None -> ()
-      (* Class property with annotation *)
-    in
-    let error_unsupported_declare env = function
-      | Some loc -> error_at env (loc, Parse_error.DeclareClassElement)
-      | None -> ()
-    in
-    let property_end_and_semicolon env key annot value =
-      match Peek.token env with
-      | T_LBRACKET
-      | T_LPAREN ->
-        error_unexpected env;
-        (key, annot, value, [])
-      | T_SEMICOLON ->
-        Eat.token env;
-        let trailing =
-          match Peek.token env with
-          | T_EOF
-          | T_RCURLY ->
-            Eat.trailing_comments env
-          | _ when Peek.is_line_terminator env -> Eat.comments_until_next_line env
-          | _ -> []
-        in
-        (key, annot, value, trailing)
-      | _ ->
-        let remover =
-          match Peek.token env with
-          | T_EOF
-          | T_RCURLY ->
-            { trailing = []; remove_trailing = (fun x _ -> x) }
-          | _ when Peek.is_line_terminator env ->
-            Comment_attachment.trailing_and_remover_after_last_line env
-          | _ -> Comment_attachment.trailing_and_remover_after_last_loc env
-        in
-        (* Remove trailing comments from the last node in this property *)
-        let (key, annot, value) =
-          match (annot, value) with
-          (* prop = init *)
-          | (_, Class.Property.Initialized expr) ->
-            ( key,
-              annot,
-              Class.Property.Initialized
-                (remover.remove_trailing expr (fun remover expr -> remover#expression expr))
-            )
-          (* prop: annot *)
-          | (Ast.Type.Available annot, _) ->
-            ( key,
-              Ast.Type.Available
-                (remover.remove_trailing annot (fun remover annot -> remover#type_annotation annot)),
-              value
-            )
-          (* prop *)
-          | _ ->
-            (remover.remove_trailing key (fun remover key -> remover#object_key key), annot, value)
-        in
-        (key, annot, value, [])
-    in
-    let property env start_loc key static declare variance leading =
-      let (loc, (key, annot, value, comments)) =
-        with_loc
-          ~start_loc
-          (fun env ->
-            let annot = Type.annotation_opt env in
-            let value =
-              match (declare, Peek.token env) with
-              | (None, T_ASSIGN) ->
-                Eat.token env;
-                Ast.Class.Property.Initialized
-                  (Parse.expression (env |> with_allow_super Super_prop))
-              | (Some _, T_ASSIGN) ->
-                error env Parse_error.DeclareClassFieldInitializer;
-                Eat.token env;
-                Ast.Class.Property.Declared
-              | (None, _) -> Ast.Class.Property.Uninitialized
-              | (Some _, _) -> Ast.Class.Property.Declared
-            in
-            let (key, annot, value, trailing) = property_end_and_semicolon env key annot value in
-            (key, annot, value, Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-          env
-      in
-      match key with
-      | Ast.Expression.Object.Property.PrivateName private_name ->
-        let open Ast.Class in
-        Body.PrivateField
-          (loc, { PrivateField.key = private_name; value; annot; static; variance; comments })
-      | _ ->
-        Ast.Class.(Body.Property (loc, { Property.key; value; annot; static; variance; comments }))
-    in
-    let is_asi env =
-      match Peek.token env with
-      | T_LESS_THAN -> false
-      | T_LPAREN -> false
-      | _ when Peek.is_implicit_semicolon env -> true
-      | _ -> false
-    in
-    let rec init env start_loc decorators key ~async ~generator ~static ~declare variance leading =
-      match Peek.token env with
-      | T_COLON
-      | T_ASSIGN
-      | T_SEMICOLON
-      | T_RCURLY
-        when (not async) && not generator ->
-        property env start_loc key static declare variance leading
-      | T_PLING ->
-        (* TODO: add support for optional class properties *)
-        error_unexpected env;
-        Eat.token env;
-        init env start_loc decorators key ~async ~generator ~static ~declare variance leading
-      | _ when is_asi env ->
-        (* an uninitialized, unannotated property *)
-        property env start_loc key static declare variance leading
-      | _ ->
-        error_unsupported_declare env declare;
-        error_unsupported_variance env variance;
-        let (kind, env) =
-          match (static, key) with
-          | ( false,
-              Ast.Expression.Object.Property.Identifier
-                (_, { Identifier.name = "constructor"; comments = _ })
-            )
-          | ( false,
-              Ast.Expression.Object.Property.Literal
-                (_, { Literal.value = Literal.String "constructor"; _ })
-            ) ->
-            (Ast.Class.Method.Constructor, env |> with_allow_super Super_prop_or_call)
-          | _ -> (Ast.Class.Method.Method, env |> with_allow_super Super_prop)
-        in
-        let key = object_key_remove_trailing env key in
-        let value =
-          with_loc
-            (fun env ->
-              let (sig_loc, (tparams, params, return)) =
-                with_loc
-                  (fun env ->
-                    let tparams = type_params_remove_trailing env (Type.type_params env) in
-                    let params =
-                      let (yield, await) =
-                        match (async, generator) with
-                        | (true, true) ->
-                          (true, true) (* proposal-async-iteration/#prod-AsyncGeneratorMethod *)
-                        | (true, false) -> (false, allow_await env) (* #prod-AsyncMethod *)
-                        | (false, true) -> (true, false) (* #prod-GeneratorMethod *)
-                        | (false, false) -> (false, false)
-                        (* #prod-MethodDefinition *)
-                      in
-                      let params = Declaration.function_params ~await ~yield env in
-                      let params =
-                        if Peek.token env = T_COLON then
-                          params
-                        else
-                          function_params_remove_trailing env params
-                      in
-                      Ast.Function.Params.(
-                        match params with
-                        | (loc, ({ this_ = Some (this_loc, _); _ } as params))
-                          when kind = Ast.Class.Method.Constructor ->
-                          (* Disallow this param annotations for constructors *)
-                          error_at env (this_loc, Parse_error.ThisParamBannedInConstructor);
-                          (loc, { params with this_ = None })
-                        | params -> params
-                      )
-                    in
-                    let return =
-                      type_annotation_hint_remove_trailing env (Type.annotation_opt env)
-                    in
-                    (tparams, params, return))
-                  env
-              in
-              let simple_params = is_simple_parameter_list params in
-              let (body, contains_use_strict) =
-                Declaration.function_body env ~async ~generator ~expression:false ~simple_params
-              in
-              Declaration.strict_post_check env ~contains_use_strict None params;
-              {
-                Function.id = None;
-                params;
-                body;
-                generator;
-                async;
-                (* TODO: add support for method predicates *)
-                predicate = None;
-                return;
-                tparams;
-                sig_loc;
-                comments = None;
-              })
-            env
-        in
-        let open Ast.Class in
-        Body.Method
-          ( Loc.btwn start_loc (fst value),
-            {
-              Method.key;
-              value;
-              kind;
-              static;
-              decorators;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            }
-          )
-    in
-    let ith_implies_identifier ~i env =
-      match Peek.ith_token ~i env with
-      | T_LESS_THAN
-      | T_COLON
-      | T_ASSIGN
-      | T_SEMICOLON
-      | T_LPAREN
-      | T_RCURLY ->
-        true
-      | _ -> false
-    in
-    let implies_identifier = ith_implies_identifier ~i:0 in
-    fun env ->
-      let start_loc = Peek.loc env in
-      let decorators = decorator_list env in
-      let (declare, leading_declare) =
-        match Peek.token env with
-        | T_DECLARE when not (ith_implies_identifier ~i:1 env) ->
-          let ret = Some (Peek.loc env) in
-          let leading = Peek.comments env in
-          Eat.token env;
-          (ret, leading)
-        | _ -> (None, [])
-      in
-      let static =
-        Peek.ith_token ~i:1 env <> T_LPAREN
-        && Peek.ith_token ~i:1 env <> T_LESS_THAN
-        && Peek.token env = T_STATIC
-      in
-      let leading_static =
-        if static then (
-          let leading = Peek.comments env in
-          Eat.token env;
-          leading
-        ) else
-          []
-      in
-      let async =
-        Peek.token env = T_ASYNC
-        && (not (ith_implies_identifier ~i:1 env))
-        && not (Peek.ith_is_line_terminator ~i:1 env)
-      in
-      (* consume `async` *)
-      let leading_async =
-        if async then (
-          let leading = Peek.comments env in
-          Eat.token env;
-          leading
-        ) else
-          []
-      in
-      let (generator, leading_generator) = Declaration.generator env in
-      let variance = Declaration.variance env async generator in
-      let (generator, leading_generator) =
-        match (generator, variance) with
-        | (false, Some _) -> Declaration.generator env
-        | _ -> (generator, leading_generator)
-      in
-      let leading =
-        List.concat [leading_declare; leading_static; leading_async; leading_generator]
-      in
-      match (async, generator, Peek.token env) with
-      | (false, false, T_IDENTIFIER { raw = "get"; _ }) ->
-        let leading_get = Peek.comments env in
-        let (_, key) = key ~class_body:true env in
-        if implies_identifier env then
-          init env start_loc decorators key ~async ~generator ~static ~declare variance leading
-        else (
-          error_unsupported_declare env declare;
-          error_unsupported_variance env variance;
-          ignore (object_key_remove_trailing env key);
-          get env start_loc decorators static (leading @ leading_get)
-        )
-      | (false, false, T_IDENTIFIER { raw = "set"; _ }) ->
-        let leading_set = Peek.comments env in
-        let (_, key) = key ~class_body:true env in
-        if implies_identifier env then
-          init env start_loc decorators key ~async ~generator ~static ~declare variance leading
-        else (
-          error_unsupported_declare env declare;
-          error_unsupported_variance env variance;
-          ignore (object_key_remove_trailing env key);
-          set env start_loc decorators static (leading @ leading_set)
-        )
-      | (_, _, _) ->
-        let (_, key) = key ~class_body:true env in
-        init env start_loc decorators key ~async ~generator ~static ~declare variance leading
-
-  let class_body =
-    let rec elements env seen_constructor private_names acc =
-      match Peek.token env with
-      | T_EOF
-      | T_RCURLY ->
-        List.rev acc
-      | T_SEMICOLON ->
-        (* Skip empty elements *)
-        Expect.token env T_SEMICOLON;
-        elements env seen_constructor private_names acc
-      | _ ->
-        let element = class_element env in
-        let (seen_constructor', private_names') =
-          match element with
-          | Ast.Class.Body.Method (loc, m) ->
-            let open Ast.Class.Method in
-            (match m.kind with
-            | Constructor ->
-              if m.static then
-                (seen_constructor, private_names)
-              else (
-                if seen_constructor then error_at env (loc, Parse_error.DuplicateConstructor);
-                (true, private_names)
-              )
-            | Method ->
-              let private_names =
-                match m.key with
-                | Ast.Expression.Object.Property.PrivateName name ->
-                  check_private_names env private_names name `Method
-                | _ -> private_names
-              in
-              (seen_constructor, private_names)
-            | Get ->
-              let open Ast.Expression.Object.Property in
-              let private_names =
-                match m.key with
-                | PrivateName name -> check_private_names env private_names name `Getter
-                | _ -> private_names
-              in
-              (seen_constructor, private_names)
-            | Set ->
-              let open Ast.Expression.Object.Property in
-              let private_names =
-                match m.key with
-                | PrivateName name -> check_private_names env private_names name `Setter
-                | _ -> private_names
-              in
-              (seen_constructor, private_names))
-          | Ast.Class.Body.Property (_, { Ast.Class.Property.key; static; _ }) ->
-            let open Ast.Expression.Object.Property in
-            begin
-              match key with
-              | Identifier (loc, { Identifier.name; comments = _ })
-              | Literal (loc, { Literal.value = Literal.String name; _ }) ->
-                check_property_name env loc name static
-              | Literal _
-              | Computed _ ->
-                ()
-              | PrivateName _ ->
-                failwith "unexpected PrivateName in Property, expected a PrivateField"
-            end;
-            (seen_constructor, private_names)
-          | Ast.Class.Body.PrivateField (_, { Ast.Class.PrivateField.key; _ }) ->
-            let private_names = check_private_names env private_names key `Field in
-            (seen_constructor, private_names)
-        in
-        elements env seen_constructor' private_names' (element :: acc)
-    in
-    fun ~expression env ->
-      with_loc
-        (fun env ->
-          let leading = Peek.comments env in
-          if Eat.maybe env T_LCURLY then (
-            enter_class env;
-            let body = elements env false SMap.empty [] in
-            exit_class env;
-            Expect.token env T_RCURLY;
-            let trailing =
-              match (expression, Peek.token env) with
-              | (true, _)
-              | (_, (T_RCURLY | T_EOF)) ->
-                Eat.trailing_comments env
-              | _ when Peek.is_line_terminator env -> Eat.comments_until_next_line env
-              | _ -> []
-            in
-            { Ast.Class.Body.body; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-          ) else (
-            Expect.error env T_LCURLY;
-            { Ast.Class.Body.body = []; comments = None }
-          ))
-        env
-
-  let _class ?(decorators = []) env ~optional_id ~expression =
-    (* 10.2.1 says all parts of a class definition are strict *)
-    let env = env |> with_strict true in
-    let decorators = decorators @ decorator_list env in
-    let leading = Peek.comments env in
-    Expect.token env T_CLASS;
-    let id =
-      let tmp_env = env |> with_no_let true in
-      match (optional_id, Peek.token tmp_env) with
-      | (true, (T_EXTENDS | T_IMPLEMENTS | T_LESS_THAN | T_LCURLY)) -> None
-      | _ when Peek.is_identifier env ->
-        let id = Parse.identifier tmp_env in
-        let { remove_trailing; _ } = trailing_and_remover env in
-        let id = remove_trailing id (fun remover id -> remover#identifier id) in
-        Some id
-      | _ ->
-        (* error, but don't consume a token like Parse.identifier does. this helps
-           with recovery, and the parser won't get stuck because we consumed the
-           `class` token above. *)
-        error_nameless_declaration env "class";
-        Some (Peek.loc env, { Identifier.name = ""; comments = None })
-    in
-    let tparams =
-      match Type.type_params env with
-      | None -> None
-      | Some tparams ->
-        let { remove_trailing; _ } = trailing_and_remover env in
-        Some (remove_trailing tparams (fun remover tparams -> remover#type_params tparams))
-    in
-    let (extends, implements) = class_heritage env in
-    let body = class_body env ~expression in
-    let comments = Flow_ast_utils.mk_comments_opt ~leading () in
-    { Class.id; body; tparams; extends; implements; class_decorators = decorators; comments }
-
-  let class_declaration env decorators =
-    with_loc
-      (fun env ->
-        let optional_id = in_export_default env in
-        Ast.Statement.ClassDeclaration (_class env ~decorators ~optional_id ~expression:false))
-      env
-
-  let class_expression =
-    with_loc (fun env -> Ast.Expression.Class (_class env ~optional_id:true ~expression:true))
-end
diff --git a/jscomp/js_parser/parse_error.ml b/jscomp/js_parser/parse_error.ml
deleted file mode 100644
index 9338148..0000000
--- a/jscomp/js_parser/parse_error.ml
+++ /dev/null
@@ -1,941 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-open Primitive_deriving
-
-type t =
-  | EnumBooleanMemberNotInitialized of {
-      enum_name: string;
-      member_name: string;
-    }
-  | EnumDuplicateMemberName of {
-      enum_name: string;
-      member_name: string;
-    }
-  | EnumInconsistentMemberValues of { enum_name: string }
-  | EnumInvalidExplicitType of {
-      enum_name: string;
-      supplied_type: string option;
-    }
-  | EnumInvalidExport
-  | EnumInvalidInitializerSeparator of { member_name: string }
-  | EnumInvalidMemberInitializer of {
-      enum_name: string;
-      explicit_type: Enum_common.explicit_type option;
-      member_name: string;
-    }
-  | EnumInvalidMemberName of {
-      enum_name: string;
-      member_name: string;
-    }
-  | EnumInvalidMemberSeparator
-  | EnumInvalidEllipsis of { trailing_comma: bool }
-  | EnumNumberMemberNotInitialized of {
-      enum_name: string;
-      member_name: string;
-    }
-  | EnumStringMemberInconsistentlyInitailized of { enum_name: string }
-  | Unexpected of string
-  | UnexpectedWithExpected of string * string
-  | UnexpectedTokenWithSuggestion of string * string
-  | UnexpectedReserved
-  | UnexpectedReservedType
-  | UnexpectedSuper
-  | UnexpectedSuperCall
-  | UnexpectedEOS
-  | UnexpectedVariance
-  | UnexpectedStatic
-  | UnexpectedProto
-  | UnexpectedTypeAlias
-  | UnexpectedOpaqueTypeAlias
-  | UnexpectedTypeAnnotation
-  | UnexpectedTypeDeclaration
-  | UnexpectedTypeImport
-  | UnexpectedTypeExport
-  | UnexpectedTypeInterface
-  | UnexpectedSpreadType
-  | UnexpectedExplicitInexactInObject
-  | InexactInsideExact
-  | InexactInsideNonObject
-  | NewlineAfterThrow
-  | InvalidFloatBigInt
-  | InvalidSciBigInt
-  | InvalidRegExp
-  | InvalidRegExpFlags of string
-  | UnterminatedRegExp
-  | InvalidLHSInAssignment
-  | InvalidLHSInExponentiation
-  | InvalidLHSInForIn
-  | InvalidLHSInForOf
-  | InvalidIndexedAccess of { has_bracket: bool }
-  | InvalidOptionalIndexedAccess
-  | ExpectedPatternFoundExpression
-  | MultipleDefaultsInSwitch
-  | NoCatchOrFinally
-  | UnknownLabel of string
-  | Redeclaration of string * string
-  | IllegalContinue
-  | IllegalBreak
-  | IllegalReturn
-  | IllegalUnicodeEscape
-  | StrictModeWith
-  | StrictCatchVariable
-  | StrictVarName
-  | StrictParamName
-  | StrictParamDupe
-  | StrictParamNotSimple
-  | StrictFunctionName
-  | StrictOctalLiteral
-  | StrictNonOctalLiteral
-  | StrictDelete
-  | StrictDuplicateProperty
-  | AccessorDataProperty
-  | AccessorGetSet
-  | InvalidTypeof
-  | StrictLHSAssignment
-  | StrictLHSPostfix
-  | StrictLHSPrefix
-  | StrictReservedWord
-  | JSXAttributeValueEmptyExpression
-  | InvalidJSXAttributeValue
-  | ExpectedJSXClosingTag of string
-  | NoUninitializedConst
-  | NoUninitializedDestructuring
-  | NewlineBeforeArrow
-  | FunctionAsStatement of { in_strict_mode: bool }
-  | AsyncFunctionAsStatement
-  | GeneratorFunctionAsStatement
-  | AdjacentJSXElements
-  | ParameterAfterRestParameter
-  | ElementAfterRestElement
-  | PropertyAfterRestElement
-  | DeclareAsync
-  | DeclareClassElement
-  | DeclareClassFieldInitializer
-  | DeclareOpaqueTypeInitializer
-  | DeclareExportLet
-  | DeclareExportConst
-  | DeclareExportType
-  | DeclareExportInterface
-  | DuplicateExport of string
-  | UnsupportedDecorator
-  | MissingTypeParamDefault
-  | DuplicateDeclareModuleExports
-  | AmbiguousDeclareModuleKind
-  | GetterArity
-  | SetterArity
-  | InvalidNonTypeImportInDeclareModule
-  | ImportTypeShorthandOnlyInPureImport
-  | ImportSpecifierMissingComma
-  | ExportSpecifierMissingComma
-  | MalformedUnicode
-  | DuplicateConstructor
-  | DuplicatePrivateFields of string
-  | InvalidClassMemberName of {
-      name: string;
-      static: bool;
-      method_: bool;
-      private_: bool;
-    }
-  | PrivateDelete
-  | UnboundPrivate of string
-  | PrivateNotInClass
-  | SuperPrivate
-  | YieldInFormalParameters
-  | AwaitAsIdentifierReference
-  | YieldAsIdentifierReference
-  | AmbiguousLetBracket
-  | LiteralShorthandProperty
-  | ComputedShorthandProperty
-  | MethodInDestructuring
-  | TrailingCommaAfterRestElement
-  | OptionalChainNew
-  | OptionalChainTemplate
-  | NullishCoalescingUnexpectedLogical of string
-  | WhitespaceInPrivateName
-  | ThisParamAnnotationRequired
-  | ThisParamMustBeFirst
-  | ThisParamMayNotBeOptional
-  | GetterMayNotHaveThisParam
-  | SetterMayNotHaveThisParam
-  | ThisParamBannedInArrowFunctions
-  | ThisParamBannedInConstructor
-[@@deriving_inline compare]
-let _ = fun (_ : t) -> ()
-let compare =
-  (fun a__001_ ->
-     fun b__002_ ->
-       if Ppx_compare_lib.phys_equal a__001_ b__002_
-       then 0
-       else
-         (match (a__001_, b__002_) with
-          | (EnumBooleanMemberNotInitialized _a__003_,
-             EnumBooleanMemberNotInitialized _b__004_) ->
-              (match compare_string _a__003_.enum_name _b__004_.enum_name
-               with
-               | 0 ->
-                   compare_string _a__003_.member_name _b__004_.member_name
-               | n -> n)
-          | (EnumBooleanMemberNotInitialized _, _) -> (-1)
-          | (_, EnumBooleanMemberNotInitialized _) -> 1
-          | (EnumDuplicateMemberName _a__005_, EnumDuplicateMemberName
-             _b__006_) ->
-              (match compare_string _a__005_.enum_name _b__006_.enum_name
-               with
-               | 0 ->
-                   compare_string _a__005_.member_name _b__006_.member_name
-               | n -> n)
-          | (EnumDuplicateMemberName _, _) -> (-1)
-          | (_, EnumDuplicateMemberName _) -> 1
-          | (EnumInconsistentMemberValues _a__007_,
-             EnumInconsistentMemberValues _b__008_) ->
-              compare_string _a__007_.enum_name _b__008_.enum_name
-          | (EnumInconsistentMemberValues _, _) -> (-1)
-          | (_, EnumInconsistentMemberValues _) -> 1
-          | (EnumInvalidExplicitType _a__009_, EnumInvalidExplicitType
-             _b__010_) ->
-              (match compare_string _a__009_.enum_name _b__010_.enum_name
-               with
-               | 0 ->
-                   compare_option compare_string _a__009_.supplied_type
-                     _b__010_.supplied_type
-               | n -> n)
-          | (EnumInvalidExplicitType _, _) -> (-1)
-          | (_, EnumInvalidExplicitType _) -> 1
-          | (EnumInvalidExport, EnumInvalidExport) -> 0
-          | (EnumInvalidExport, _) -> (-1)
-          | (_, EnumInvalidExport) -> 1
-          | (EnumInvalidInitializerSeparator _a__013_,
-             EnumInvalidInitializerSeparator _b__014_) ->
-              compare_string _a__013_.member_name _b__014_.member_name
-          | (EnumInvalidInitializerSeparator _, _) -> (-1)
-          | (_, EnumInvalidInitializerSeparator _) -> 1
-          | (EnumInvalidMemberInitializer _a__015_,
-             EnumInvalidMemberInitializer _b__016_) ->
-              (match compare_string _a__015_.enum_name _b__016_.enum_name
-               with
-               | 0 ->
-                   (match compare_option Enum_common.compare_explicit_type
-                            _a__015_.explicit_type _b__016_.explicit_type
-                    with
-                    | 0 ->
-                        compare_string _a__015_.member_name
-                          _b__016_.member_name
-                    | n -> n)
-               | n -> n)
-          | (EnumInvalidMemberInitializer _, _) -> (-1)
-          | (_, EnumInvalidMemberInitializer _) -> 1
-          | (EnumInvalidMemberName _a__019_, EnumInvalidMemberName _b__020_)
-              ->
-              (match compare_string _a__019_.enum_name _b__020_.enum_name
-               with
-               | 0 ->
-                   compare_string _a__019_.member_name _b__020_.member_name
-               | n -> n)
-          | (EnumInvalidMemberName _, _) -> (-1)
-          | (_, EnumInvalidMemberName _) -> 1
-          | (EnumInvalidMemberSeparator, EnumInvalidMemberSeparator) -> 0
-          | (EnumInvalidMemberSeparator, _) -> (-1)
-          | (_, EnumInvalidMemberSeparator) -> 1
-          | (EnumInvalidEllipsis _a__021_, EnumInvalidEllipsis _b__022_) ->
-              compare_bool _a__021_.trailing_comma _b__022_.trailing_comma
-          | (EnumInvalidEllipsis _, _) -> (-1)
-          | (_, EnumInvalidEllipsis _) -> 1
-          | (EnumNumberMemberNotInitialized _a__023_,
-             EnumNumberMemberNotInitialized _b__024_) ->
-              (match compare_string _a__023_.enum_name _b__024_.enum_name
-               with
-               | 0 ->
-                   compare_string _a__023_.member_name _b__024_.member_name
-               | n -> n)
-          | (EnumNumberMemberNotInitialized _, _) -> (-1)
-          | (_, EnumNumberMemberNotInitialized _) -> 1
-          | (EnumStringMemberInconsistentlyInitailized _a__025_,
-             EnumStringMemberInconsistentlyInitailized _b__026_) ->
-              compare_string _a__025_.enum_name _b__026_.enum_name
-          | (EnumStringMemberInconsistentlyInitailized _, _) -> (-1)
-          | (_, EnumStringMemberInconsistentlyInitailized _) -> 1
-          | (Unexpected _a__027_, Unexpected _b__028_) ->
-              compare_string _a__027_ _b__028_
-          | (Unexpected _, _) -> (-1)
-          | (_, Unexpected _) -> 1
-          | (UnexpectedWithExpected (_a__029_, _a__031_),
-             UnexpectedWithExpected (_b__030_, _b__032_)) ->
-              (match compare_string _a__029_ _b__030_ with
-               | 0 -> compare_string _a__031_ _b__032_
-               | n -> n)
-          | (UnexpectedWithExpected _, _) -> (-1)
-          | (_, UnexpectedWithExpected _) -> 1
-          | (UnexpectedTokenWithSuggestion (_a__033_, _a__035_),
-             UnexpectedTokenWithSuggestion (_b__034_, _b__036_)) ->
-              (match compare_string _a__033_ _b__034_ with
-               | 0 -> compare_string _a__035_ _b__036_
-               | n -> n)
-          | (UnexpectedTokenWithSuggestion _, _) -> (-1)
-          | (_, UnexpectedTokenWithSuggestion _) -> 1
-          | (UnexpectedReserved, UnexpectedReserved) -> 0
-          | (UnexpectedReserved, _) -> (-1)
-          | (_, UnexpectedReserved) -> 1
-          | (UnexpectedReservedType, UnexpectedReservedType) -> 0
-          | (UnexpectedReservedType, _) -> (-1)
-          | (_, UnexpectedReservedType) -> 1
-          | (UnexpectedSuper, UnexpectedSuper) -> 0
-          | (UnexpectedSuper, _) -> (-1)
-          | (_, UnexpectedSuper) -> 1
-          | (UnexpectedSuperCall, UnexpectedSuperCall) -> 0
-          | (UnexpectedSuperCall, _) -> (-1)
-          | (_, UnexpectedSuperCall) -> 1
-          | (UnexpectedEOS, UnexpectedEOS) -> 0
-          | (UnexpectedEOS, _) -> (-1)
-          | (_, UnexpectedEOS) -> 1
-          | (UnexpectedVariance, UnexpectedVariance) -> 0
-          | (UnexpectedVariance, _) -> (-1)
-          | (_, UnexpectedVariance) -> 1
-          | (UnexpectedStatic, UnexpectedStatic) -> 0
-          | (UnexpectedStatic, _) -> (-1)
-          | (_, UnexpectedStatic) -> 1
-          | (UnexpectedProto, UnexpectedProto) -> 0
-          | (UnexpectedProto, _) -> (-1)
-          | (_, UnexpectedProto) -> 1
-          | (UnexpectedTypeAlias, UnexpectedTypeAlias) -> 0
-          | (UnexpectedTypeAlias, _) -> (-1)
-          | (_, UnexpectedTypeAlias) -> 1
-          | (UnexpectedOpaqueTypeAlias, UnexpectedOpaqueTypeAlias) -> 0
-          | (UnexpectedOpaqueTypeAlias, _) -> (-1)
-          | (_, UnexpectedOpaqueTypeAlias) -> 1
-          | (UnexpectedTypeAnnotation, UnexpectedTypeAnnotation) -> 0
-          | (UnexpectedTypeAnnotation, _) -> (-1)
-          | (_, UnexpectedTypeAnnotation) -> 1
-          | (UnexpectedTypeDeclaration, UnexpectedTypeDeclaration) -> 0
-          | (UnexpectedTypeDeclaration, _) -> (-1)
-          | (_, UnexpectedTypeDeclaration) -> 1
-          | (UnexpectedTypeImport, UnexpectedTypeImport) -> 0
-          | (UnexpectedTypeImport, _) -> (-1)
-          | (_, UnexpectedTypeImport) -> 1
-          | (UnexpectedTypeExport, UnexpectedTypeExport) -> 0
-          | (UnexpectedTypeExport, _) -> (-1)
-          | (_, UnexpectedTypeExport) -> 1
-          | (UnexpectedTypeInterface, UnexpectedTypeInterface) -> 0
-          | (UnexpectedTypeInterface, _) -> (-1)
-          | (_, UnexpectedTypeInterface) -> 1
-          | (UnexpectedSpreadType, UnexpectedSpreadType) -> 0
-          | (UnexpectedSpreadType, _) -> (-1)
-          | (_, UnexpectedSpreadType) -> 1
-          | (UnexpectedExplicitInexactInObject,
-             UnexpectedExplicitInexactInObject) -> 0
-          | (UnexpectedExplicitInexactInObject, _) -> (-1)
-          | (_, UnexpectedExplicitInexactInObject) -> 1
-          | (InexactInsideExact, InexactInsideExact) -> 0
-          | (InexactInsideExact, _) -> (-1)
-          | (_, InexactInsideExact) -> 1
-          | (InexactInsideNonObject, InexactInsideNonObject) -> 0
-          | (InexactInsideNonObject, _) -> (-1)
-          | (_, InexactInsideNonObject) -> 1
-          | (NewlineAfterThrow, NewlineAfterThrow) -> 0
-          | (NewlineAfterThrow, _) -> (-1)
-          | (_, NewlineAfterThrow) -> 1
-          | (InvalidFloatBigInt, InvalidFloatBigInt) -> 0
-          | (InvalidFloatBigInt, _) -> (-1)
-          | (_, InvalidFloatBigInt) -> 1
-          | (InvalidSciBigInt, InvalidSciBigInt) -> 0
-          | (InvalidSciBigInt, _) -> (-1)
-          | (_, InvalidSciBigInt) -> 1
-          | (InvalidRegExp, InvalidRegExp) -> 0
-          | (InvalidRegExp, _) -> (-1)
-          | (_, InvalidRegExp) -> 1
-          | (InvalidRegExpFlags _a__037_, InvalidRegExpFlags _b__038_) ->
-              compare_string _a__037_ _b__038_
-          | (InvalidRegExpFlags _, _) -> (-1)
-          | (_, InvalidRegExpFlags _) -> 1
-          | (UnterminatedRegExp, UnterminatedRegExp) -> 0
-          | (UnterminatedRegExp, _) -> (-1)
-          | (_, UnterminatedRegExp) -> 1
-          | (InvalidLHSInAssignment, InvalidLHSInAssignment) -> 0
-          | (InvalidLHSInAssignment, _) -> (-1)
-          | (_, InvalidLHSInAssignment) -> 1
-          | (InvalidLHSInExponentiation, InvalidLHSInExponentiation) -> 0
-          | (InvalidLHSInExponentiation, _) -> (-1)
-          | (_, InvalidLHSInExponentiation) -> 1
-          | (InvalidLHSInForIn, InvalidLHSInForIn) -> 0
-          | (InvalidLHSInForIn, _) -> (-1)
-          | (_, InvalidLHSInForIn) -> 1
-          | (InvalidLHSInForOf, InvalidLHSInForOf) -> 0
-          | (InvalidLHSInForOf, _) -> (-1)
-          | (_, InvalidLHSInForOf) -> 1
-          | (InvalidIndexedAccess _a__039_, InvalidIndexedAccess _b__040_) ->
-              compare_bool _a__039_.has_bracket _b__040_.has_bracket
-          | (InvalidIndexedAccess _, _) -> (-1)
-          | (_, InvalidIndexedAccess _) -> 1
-          | (InvalidOptionalIndexedAccess, InvalidOptionalIndexedAccess) -> 0
-          | (InvalidOptionalIndexedAccess, _) -> (-1)
-          | (_, InvalidOptionalIndexedAccess) -> 1
-          | (ExpectedPatternFoundExpression, ExpectedPatternFoundExpression)
-              -> 0
-          | (ExpectedPatternFoundExpression, _) -> (-1)
-          | (_, ExpectedPatternFoundExpression) -> 1
-          | (MultipleDefaultsInSwitch, MultipleDefaultsInSwitch) -> 0
-          | (MultipleDefaultsInSwitch, _) -> (-1)
-          | (_, MultipleDefaultsInSwitch) -> 1
-          | (NoCatchOrFinally, NoCatchOrFinally) -> 0
-          | (NoCatchOrFinally, _) -> (-1)
-          | (_, NoCatchOrFinally) -> 1
-          | (UnknownLabel _a__041_, UnknownLabel _b__042_) ->
-              compare_string _a__041_ _b__042_
-          | (UnknownLabel _, _) -> (-1)
-          | (_, UnknownLabel _) -> 1
-          | (Redeclaration (_a__043_, _a__045_), Redeclaration
-             (_b__044_, _b__046_)) ->
-              (match compare_string _a__043_ _b__044_ with
-               | 0 -> compare_string _a__045_ _b__046_
-               | n -> n)
-          | (Redeclaration _, _) -> (-1)
-          | (_, Redeclaration _) -> 1
-          | (IllegalContinue, IllegalContinue) -> 0
-          | (IllegalContinue, _) -> (-1)
-          | (_, IllegalContinue) -> 1
-          | (IllegalBreak, IllegalBreak) -> 0
-          | (IllegalBreak, _) -> (-1)
-          | (_, IllegalBreak) -> 1
-          | (IllegalReturn, IllegalReturn) -> 0
-          | (IllegalReturn, _) -> (-1)
-          | (_, IllegalReturn) -> 1
-          | (IllegalUnicodeEscape, IllegalUnicodeEscape) -> 0
-          | (IllegalUnicodeEscape, _) -> (-1)
-          | (_, IllegalUnicodeEscape) -> 1
-          | (StrictModeWith, StrictModeWith) -> 0
-          | (StrictModeWith, _) -> (-1)
-          | (_, StrictModeWith) -> 1
-          | (StrictCatchVariable, StrictCatchVariable) -> 0
-          | (StrictCatchVariable, _) -> (-1)
-          | (_, StrictCatchVariable) -> 1
-          | (StrictVarName, StrictVarName) -> 0
-          | (StrictVarName, _) -> (-1)
-          | (_, StrictVarName) -> 1
-          | (StrictParamName, StrictParamName) -> 0
-          | (StrictParamName, _) -> (-1)
-          | (_, StrictParamName) -> 1
-          | (StrictParamDupe, StrictParamDupe) -> 0
-          | (StrictParamDupe, _) -> (-1)
-          | (_, StrictParamDupe) -> 1
-          | (StrictParamNotSimple, StrictParamNotSimple) -> 0
-          | (StrictParamNotSimple, _) -> (-1)
-          | (_, StrictParamNotSimple) -> 1
-          | (StrictFunctionName, StrictFunctionName) -> 0
-          | (StrictFunctionName, _) -> (-1)
-          | (_, StrictFunctionName) -> 1
-          | (StrictOctalLiteral, StrictOctalLiteral) -> 0
-          | (StrictOctalLiteral, _) -> (-1)
-          | (_, StrictOctalLiteral) -> 1
-          | (StrictNonOctalLiteral, StrictNonOctalLiteral) -> 0
-          | (StrictNonOctalLiteral, _) -> (-1)
-          | (_, StrictNonOctalLiteral) -> 1
-          | (StrictDelete, StrictDelete) -> 0
-          | (StrictDelete, _) -> (-1)
-          | (_, StrictDelete) -> 1
-          | (StrictDuplicateProperty, StrictDuplicateProperty) -> 0
-          | (StrictDuplicateProperty, _) -> (-1)
-          | (_, StrictDuplicateProperty) -> 1
-          | (AccessorDataProperty, AccessorDataProperty) -> 0
-          | (AccessorDataProperty, _) -> (-1)
-          | (_, AccessorDataProperty) -> 1
-          | (AccessorGetSet, AccessorGetSet) -> 0
-          | (AccessorGetSet, _) -> (-1)
-          | (_, AccessorGetSet) -> 1
-          | (InvalidTypeof, InvalidTypeof) -> 0
-          | (InvalidTypeof, _) -> (-1)
-          | (_, InvalidTypeof) -> 1
-          | (StrictLHSAssignment, StrictLHSAssignment) -> 0
-          | (StrictLHSAssignment, _) -> (-1)
-          | (_, StrictLHSAssignment) -> 1
-          | (StrictLHSPostfix, StrictLHSPostfix) -> 0
-          | (StrictLHSPostfix, _) -> (-1)
-          | (_, StrictLHSPostfix) -> 1
-          | (StrictLHSPrefix, StrictLHSPrefix) -> 0
-          | (StrictLHSPrefix, _) -> (-1)
-          | (_, StrictLHSPrefix) -> 1
-          | (StrictReservedWord, StrictReservedWord) -> 0
-          | (StrictReservedWord, _) -> (-1)
-          | (_, StrictReservedWord) -> 1
-          | (JSXAttributeValueEmptyExpression,
-             JSXAttributeValueEmptyExpression) -> 0
-          | (JSXAttributeValueEmptyExpression, _) -> (-1)
-          | (_, JSXAttributeValueEmptyExpression) -> 1
-          | (InvalidJSXAttributeValue, InvalidJSXAttributeValue) -> 0
-          | (InvalidJSXAttributeValue, _) -> (-1)
-          | (_, InvalidJSXAttributeValue) -> 1
-          | (ExpectedJSXClosingTag _a__047_, ExpectedJSXClosingTag _b__048_)
-              -> compare_string _a__047_ _b__048_
-          | (ExpectedJSXClosingTag _, _) -> (-1)
-          | (_, ExpectedJSXClosingTag _) -> 1
-          | (NoUninitializedConst, NoUninitializedConst) -> 0
-          | (NoUninitializedConst, _) -> (-1)
-          | (_, NoUninitializedConst) -> 1
-          | (NoUninitializedDestructuring, NoUninitializedDestructuring) -> 0
-          | (NoUninitializedDestructuring, _) -> (-1)
-          | (_, NoUninitializedDestructuring) -> 1
-          | (NewlineBeforeArrow, NewlineBeforeArrow) -> 0
-          | (NewlineBeforeArrow, _) -> (-1)
-          | (_, NewlineBeforeArrow) -> 1
-          | (FunctionAsStatement _a__049_, FunctionAsStatement _b__050_) ->
-              compare_bool _a__049_.in_strict_mode _b__050_.in_strict_mode
-          | (FunctionAsStatement _, _) -> (-1)
-          | (_, FunctionAsStatement _) -> 1
-          | (AsyncFunctionAsStatement, AsyncFunctionAsStatement) -> 0
-          | (AsyncFunctionAsStatement, _) -> (-1)
-          | (_, AsyncFunctionAsStatement) -> 1
-          | (GeneratorFunctionAsStatement, GeneratorFunctionAsStatement) -> 0
-          | (GeneratorFunctionAsStatement, _) -> (-1)
-          | (_, GeneratorFunctionAsStatement) -> 1
-          | (AdjacentJSXElements, AdjacentJSXElements) -> 0
-          | (AdjacentJSXElements, _) -> (-1)
-          | (_, AdjacentJSXElements) -> 1
-          | (ParameterAfterRestParameter, ParameterAfterRestParameter) -> 0
-          | (ParameterAfterRestParameter, _) -> (-1)
-          | (_, ParameterAfterRestParameter) -> 1
-          | (ElementAfterRestElement, ElementAfterRestElement) -> 0
-          | (ElementAfterRestElement, _) -> (-1)
-          | (_, ElementAfterRestElement) -> 1
-          | (PropertyAfterRestElement, PropertyAfterRestElement) -> 0
-          | (PropertyAfterRestElement, _) -> (-1)
-          | (_, PropertyAfterRestElement) -> 1
-          | (DeclareAsync, DeclareAsync) -> 0
-          | (DeclareAsync, _) -> (-1)
-          | (_, DeclareAsync) -> 1
-          | (DeclareClassElement, DeclareClassElement) -> 0
-          | (DeclareClassElement, _) -> (-1)
-          | (_, DeclareClassElement) -> 1
-          | (DeclareClassFieldInitializer, DeclareClassFieldInitializer) -> 0
-          | (DeclareClassFieldInitializer, _) -> (-1)
-          | (_, DeclareClassFieldInitializer) -> 1
-          | (DeclareOpaqueTypeInitializer, DeclareOpaqueTypeInitializer) -> 0
-          | (DeclareOpaqueTypeInitializer, _) -> (-1)
-          | (_, DeclareOpaqueTypeInitializer) -> 1
-          | (DeclareExportLet, DeclareExportLet) -> 0
-          | (DeclareExportLet, _) -> (-1)
-          | (_, DeclareExportLet) -> 1
-          | (DeclareExportConst, DeclareExportConst) -> 0
-          | (DeclareExportConst, _) -> (-1)
-          | (_, DeclareExportConst) -> 1
-          | (DeclareExportType, DeclareExportType) -> 0
-          | (DeclareExportType, _) -> (-1)
-          | (_, DeclareExportType) -> 1
-          | (DeclareExportInterface, DeclareExportInterface) -> 0
-          | (DeclareExportInterface, _) -> (-1)
-          | (_, DeclareExportInterface) -> 1
-          | (DuplicateExport _a__051_, DuplicateExport _b__052_) ->
-              compare_string _a__051_ _b__052_
-          | (DuplicateExport _, _) -> (-1)
-          | (_, DuplicateExport _) -> 1
-          | (UnsupportedDecorator, UnsupportedDecorator) -> 0
-          | (UnsupportedDecorator, _) -> (-1)
-          | (_, UnsupportedDecorator) -> 1
-          | (MissingTypeParamDefault, MissingTypeParamDefault) -> 0
-          | (MissingTypeParamDefault, _) -> (-1)
-          | (_, MissingTypeParamDefault) -> 1
-          | (DuplicateDeclareModuleExports, DuplicateDeclareModuleExports) ->
-              0
-          | (DuplicateDeclareModuleExports, _) -> (-1)
-          | (_, DuplicateDeclareModuleExports) -> 1
-          | (AmbiguousDeclareModuleKind, AmbiguousDeclareModuleKind) -> 0
-          | (AmbiguousDeclareModuleKind, _) -> (-1)
-          | (_, AmbiguousDeclareModuleKind) -> 1
-          | (GetterArity, GetterArity) -> 0
-          | (GetterArity, _) -> (-1)
-          | (_, GetterArity) -> 1
-          | (SetterArity, SetterArity) -> 0
-          | (SetterArity, _) -> (-1)
-          | (_, SetterArity) -> 1
-          | (InvalidNonTypeImportInDeclareModule,
-             InvalidNonTypeImportInDeclareModule) -> 0
-          | (InvalidNonTypeImportInDeclareModule, _) -> (-1)
-          | (_, InvalidNonTypeImportInDeclareModule) -> 1
-          | (ImportTypeShorthandOnlyInPureImport,
-             ImportTypeShorthandOnlyInPureImport) -> 0
-          | (ImportTypeShorthandOnlyInPureImport, _) -> (-1)
-          | (_, ImportTypeShorthandOnlyInPureImport) -> 1
-          | (ImportSpecifierMissingComma, ImportSpecifierMissingComma) -> 0
-          | (ImportSpecifierMissingComma, _) -> (-1)
-          | (_, ImportSpecifierMissingComma) -> 1
-          | (ExportSpecifierMissingComma, ExportSpecifierMissingComma) -> 0
-          | (ExportSpecifierMissingComma, _) -> (-1)
-          | (_, ExportSpecifierMissingComma) -> 1
-          | (MalformedUnicode, MalformedUnicode) -> 0
-          | (MalformedUnicode, _) -> (-1)
-          | (_, MalformedUnicode) -> 1
-          | (DuplicateConstructor, DuplicateConstructor) -> 0
-          | (DuplicateConstructor, _) -> (-1)
-          | (_, DuplicateConstructor) -> 1
-          | (DuplicatePrivateFields _a__053_, DuplicatePrivateFields
-             _b__054_) -> compare_string _a__053_ _b__054_
-          | (DuplicatePrivateFields _, _) -> (-1)
-          | (_, DuplicatePrivateFields _) -> 1
-          | (InvalidClassMemberName _a__055_, InvalidClassMemberName
-             _b__056_) ->
-              (match compare_string _a__055_.name _b__056_.name with
-               | 0 ->
-                   (match compare_bool _a__055_.static _b__056_.static with
-                    | 0 ->
-                        (match compare_bool _a__055_.method_ _b__056_.method_
-                         with
-                         | 0 ->
-                             compare_bool _a__055_.private_ _b__056_.private_
-                         | n -> n)
-                    | n -> n)
-               | n -> n)
-          | (InvalidClassMemberName _, _) -> (-1)
-          | (_, InvalidClassMemberName _) -> 1
-          | (PrivateDelete, PrivateDelete) -> 0
-          | (PrivateDelete, _) -> (-1)
-          | (_, PrivateDelete) -> 1
-          | (UnboundPrivate _a__057_, UnboundPrivate _b__058_) ->
-              compare_string _a__057_ _b__058_
-          | (UnboundPrivate _, _) -> (-1)
-          | (_, UnboundPrivate _) -> 1
-          | (PrivateNotInClass, PrivateNotInClass) -> 0
-          | (PrivateNotInClass, _) -> (-1)
-          | (_, PrivateNotInClass) -> 1
-          | (SuperPrivate, SuperPrivate) -> 0
-          | (SuperPrivate, _) -> (-1)
-          | (_, SuperPrivate) -> 1
-          | (YieldInFormalParameters, YieldInFormalParameters) -> 0
-          | (YieldInFormalParameters, _) -> (-1)
-          | (_, YieldInFormalParameters) -> 1
-          | (AwaitAsIdentifierReference, AwaitAsIdentifierReference) -> 0
-          | (AwaitAsIdentifierReference, _) -> (-1)
-          | (_, AwaitAsIdentifierReference) -> 1
-          | (YieldAsIdentifierReference, YieldAsIdentifierReference) -> 0
-          | (YieldAsIdentifierReference, _) -> (-1)
-          | (_, YieldAsIdentifierReference) -> 1
-          | (AmbiguousLetBracket, AmbiguousLetBracket) -> 0
-          | (AmbiguousLetBracket, _) -> (-1)
-          | (_, AmbiguousLetBracket) -> 1
-          | (LiteralShorthandProperty, LiteralShorthandProperty) -> 0
-          | (LiteralShorthandProperty, _) -> (-1)
-          | (_, LiteralShorthandProperty) -> 1
-          | (ComputedShorthandProperty, ComputedShorthandProperty) -> 0
-          | (ComputedShorthandProperty, _) -> (-1)
-          | (_, ComputedShorthandProperty) -> 1
-          | (MethodInDestructuring, MethodInDestructuring) -> 0
-          | (MethodInDestructuring, _) -> (-1)
-          | (_, MethodInDestructuring) -> 1
-          | (TrailingCommaAfterRestElement, TrailingCommaAfterRestElement) ->
-              0
-          | (TrailingCommaAfterRestElement, _) -> (-1)
-          | (_, TrailingCommaAfterRestElement) -> 1
-          | (OptionalChainNew, OptionalChainNew) -> 0
-          | (OptionalChainNew, _) -> (-1)
-          | (_, OptionalChainNew) -> 1
-          | (OptionalChainTemplate, OptionalChainTemplate) -> 0
-          | (OptionalChainTemplate, _) -> (-1)
-          | (_, OptionalChainTemplate) -> 1
-          | (NullishCoalescingUnexpectedLogical _a__059_,
-             NullishCoalescingUnexpectedLogical _b__060_) ->
-              compare_string _a__059_ _b__060_
-          | (NullishCoalescingUnexpectedLogical _, _) -> (-1)
-          | (_, NullishCoalescingUnexpectedLogical _) -> 1
-          | (WhitespaceInPrivateName, WhitespaceInPrivateName) -> 0
-          | (WhitespaceInPrivateName, _) -> (-1)
-          | (_, WhitespaceInPrivateName) -> 1
-          | (ThisParamAnnotationRequired, ThisParamAnnotationRequired) -> 0
-          | (ThisParamAnnotationRequired, _) -> (-1)
-          | (_, ThisParamAnnotationRequired) -> 1
-          | (ThisParamMustBeFirst, ThisParamMustBeFirst) -> 0
-          | (ThisParamMustBeFirst, _) -> (-1)
-          | (_, ThisParamMustBeFirst) -> 1
-          | (ThisParamMayNotBeOptional, ThisParamMayNotBeOptional) -> 0
-          | (ThisParamMayNotBeOptional, _) -> (-1)
-          | (_, ThisParamMayNotBeOptional) -> 1
-          | (GetterMayNotHaveThisParam, GetterMayNotHaveThisParam) -> 0
-          | (GetterMayNotHaveThisParam, _) -> (-1)
-          | (_, GetterMayNotHaveThisParam) -> 1
-          | (SetterMayNotHaveThisParam, SetterMayNotHaveThisParam) -> 0
-          | (SetterMayNotHaveThisParam, _) -> (-1)
-          | (_, SetterMayNotHaveThisParam) -> 1
-          | (ThisParamBannedInArrowFunctions,
-             ThisParamBannedInArrowFunctions) -> 0
-          | (ThisParamBannedInArrowFunctions, _) -> (-1)
-          | (_, ThisParamBannedInArrowFunctions) -> 1
-          | (ThisParamBannedInConstructor, ThisParamBannedInConstructor) -> 0) :
-  t -> t -> int)
-let _ = compare
-[@@@end]
-exception Error of (Loc.t * t) * (Loc.t * t) list
-
-let error loc e = raise (Error ((loc, e), []))
-
-module PP = struct
-  let error = function
-    | EnumBooleanMemberNotInitialized { enum_name; member_name } ->
-      Printf.sprintf
-        "Boolean enum members need to be initialized. Use either `%s = true,` or `%s = false,` in enum `%s`."
-        member_name
-        member_name
-        enum_name
-    | EnumDuplicateMemberName { enum_name; member_name } ->
-      Printf.sprintf
-        "Enum member names need to be unique, but the name `%s` has already been used before in enum `%s`."
-        member_name
-        enum_name
-    | EnumInconsistentMemberValues { enum_name } ->
-      Printf.sprintf
-        "Enum `%s` has inconsistent member initializers. Either use no initializers, or consistently use literals (either booleans, numbers, or strings) for all member initializers."
-        enum_name
-    | EnumInvalidExplicitType { enum_name; supplied_type } ->
-      let suggestion =
-        Printf.sprintf
-          "Use one of `boolean`, `number`, `string`, or `symbol` in enum `%s`."
-          enum_name
-      in
-      begin
-        match supplied_type with
-        | Some supplied_type ->
-          Printf.sprintf "Enum type `%s` is not valid. %s" supplied_type suggestion
-        | None -> Printf.sprintf "Supplied enum type is not valid. %s" suggestion
-      end
-    | EnumInvalidExport ->
-      "Cannot export an enum with `export type`, try `export enum E {}` or `module.exports = E;` instead."
-    | EnumInvalidInitializerSeparator { member_name } ->
-      Printf.sprintf
-        "Enum member names and initializers are separated with `=`. Replace `%s:` with `%s =`."
-        member_name
-        member_name
-    | EnumInvalidMemberInitializer { enum_name; explicit_type; member_name } -> begin
-      match explicit_type with
-      | Some (Enum_common.Boolean as explicit_type)
-      | Some (Enum_common.Number as explicit_type)
-      | Some (Enum_common.String as explicit_type) ->
-        let explicit_type_str = Enum_common.string_of_explicit_type explicit_type in
-        Printf.sprintf
-          "Enum `%s` has type `%s`, so the initializer of `%s` needs to be a %s literal."
-          enum_name
-          explicit_type_str
-          member_name
-          explicit_type_str
-      | Some Enum_common.Symbol ->
-        Printf.sprintf
-          "Symbol enum members cannot be initialized. Use `%s,` in enum `%s`."
-          member_name
-          enum_name
-      | None ->
-        Printf.sprintf
-          "The enum member initializer for `%s` needs to be a literal (either a boolean, number, or string) in enum `%s`."
-          member_name
-          enum_name
-    end
-    | EnumInvalidMemberName { enum_name; member_name } ->
-      (* Based on the error condition, we will only receive member names starting with [a-z] *)
-      let suggestion = String.capitalize_ascii member_name in
-      Printf.sprintf
-        "Enum member names cannot start with lowercase 'a' through 'z'. Instead of using `%s`, consider using `%s`, in enum `%s`."
-        member_name
-        suggestion
-        enum_name
-    | EnumInvalidMemberSeparator -> "Enum members are separated with `,`. Replace `;` with `,`."
-    | EnumInvalidEllipsis { trailing_comma } ->
-      if trailing_comma then
-        "The `...` must come at the end of the enum body. Remove the trailing comma."
-      else
-        "The `...` must come after all enum members. Move it to the end of the enum body."
-    | EnumNumberMemberNotInitialized { enum_name; member_name } ->
-      Printf.sprintf
-        "Number enum members need to be initialized, e.g. `%s = 1,` in enum `%s`."
-        member_name
-        enum_name
-    | EnumStringMemberInconsistentlyInitailized { enum_name } ->
-      Printf.sprintf
-        "String enum members need to consistently either all use initializers, or use no initializers, in enum %s."
-        enum_name
-    | Unexpected unexpected -> Printf.sprintf "Unexpected %s" unexpected
-    | UnexpectedWithExpected (unexpected, expected) ->
-      Printf.sprintf "Unexpected %s, expected %s" unexpected expected
-    | UnexpectedTokenWithSuggestion (token, suggestion) ->
-      Printf.sprintf "Unexpected token `%s`. Did you mean `%s`?" token suggestion
-    | UnexpectedReserved -> "Unexpected reserved word"
-    | UnexpectedReservedType -> "Unexpected reserved type"
-    | UnexpectedSuper -> "Unexpected `super` outside of a class method"
-    | UnexpectedSuperCall -> "`super()` is only valid in a class constructor"
-    | UnexpectedEOS -> "Unexpected end of input"
-    | UnexpectedVariance -> "Unexpected variance sigil"
-    | UnexpectedStatic -> "Unexpected static modifier"
-    | UnexpectedProto -> "Unexpected proto modifier"
-    | UnexpectedTypeAlias -> "Type aliases are not allowed in untyped mode"
-    | UnexpectedOpaqueTypeAlias -> "Opaque type aliases are not allowed in untyped mode"
-    | UnexpectedTypeAnnotation -> "Type annotations are not allowed in untyped mode"
-    | UnexpectedTypeDeclaration -> "Type declarations are not allowed in untyped mode"
-    | UnexpectedTypeImport -> "Type imports are not allowed in untyped mode"
-    | UnexpectedTypeExport -> "Type exports are not allowed in untyped mode"
-    | UnexpectedTypeInterface -> "Interfaces are not allowed in untyped mode"
-    | UnexpectedSpreadType -> "Spreading a type is only allowed inside an object type"
-    | UnexpectedExplicitInexactInObject ->
-      "Explicit inexact syntax must come at the end of an object type"
-    | InexactInsideExact ->
-      "Explicit inexact syntax cannot appear inside an explicit exact object type"
-    | InexactInsideNonObject -> "Explicit inexact syntax can only appear inside an object type"
-    | NewlineAfterThrow -> "Illegal newline after throw"
-    | InvalidFloatBigInt -> "A bigint literal must be an integer"
-    | InvalidSciBigInt -> "A bigint literal cannot use exponential notation"
-    | InvalidRegExp -> "Invalid regular expression"
-    | InvalidRegExpFlags flags -> "Invalid flags supplied to RegExp constructor '" ^ flags ^ "'"
-    | UnterminatedRegExp -> "Invalid regular expression: missing /"
-    | InvalidLHSInAssignment -> "Invalid left-hand side in assignment"
-    | InvalidLHSInExponentiation -> "Invalid left-hand side in exponentiation expression"
-    | InvalidLHSInForIn -> "Invalid left-hand side in for-in"
-    | InvalidLHSInForOf -> "Invalid left-hand side in for-of"
-    | InvalidIndexedAccess { has_bracket } ->
-      let msg =
-        if has_bracket then
-          "Remove the period."
-        else
-          "Indexed access uses bracket notation."
-      in
-      Printf.sprintf "Invalid indexed access. %s Use the format `T[K]`." msg
-    | InvalidOptionalIndexedAccess ->
-      "Invalid optional indexed access. Indexed access uses bracket notation. Use the format `T?.[K]`."
-    | ExpectedPatternFoundExpression ->
-      "Expected an object pattern, array pattern, or an identifier but "
-      ^ "found an expression instead"
-    | MultipleDefaultsInSwitch -> "More than one default clause in switch statement"
-    | NoCatchOrFinally -> "Missing catch or finally after try"
-    | UnknownLabel label -> "Undefined label '" ^ label ^ "'"
-    | Redeclaration (what, name) -> what ^ " '" ^ name ^ "' has already been declared"
-    | IllegalContinue -> "Illegal continue statement"
-    | IllegalBreak -> "Illegal break statement"
-    | IllegalReturn -> "Illegal return statement"
-    | IllegalUnicodeEscape -> "Illegal Unicode escape"
-    | StrictModeWith -> "Strict mode code may not include a with statement"
-    | StrictCatchVariable -> "Catch variable may not be eval or arguments in strict mode"
-    | StrictVarName -> "Variable name may not be eval or arguments in strict mode"
-    | StrictParamName -> "Parameter name eval or arguments is not allowed in strict mode"
-    | StrictParamDupe -> "Strict mode function may not have duplicate parameter names"
-    | StrictParamNotSimple ->
-      "Illegal \"use strict\" directive in function with non-simple parameter list"
-    | StrictFunctionName -> "Function name may not be eval or arguments in strict mode"
-    | StrictOctalLiteral -> "Octal literals are not allowed in strict mode."
-    | StrictNonOctalLiteral -> "Number literals with leading zeros are not allowed in strict mode."
-    | StrictDelete -> "Delete of an unqualified identifier in strict mode."
-    | StrictDuplicateProperty ->
-      "Duplicate data property in object literal not allowed in strict mode"
-    | AccessorDataProperty ->
-      "Object literal may not have data and accessor property with the same name"
-    | AccessorGetSet -> "Object literal may not have multiple get/set accessors with the same name"
-    | StrictLHSAssignment -> "Assignment to eval or arguments is not allowed in strict mode"
-    | StrictLHSPostfix ->
-      "Postfix increment/decrement may not have eval or arguments operand in strict mode"
-    | StrictLHSPrefix ->
-      "Prefix increment/decrement may not have eval or arguments operand in strict mode"
-    | StrictReservedWord -> "Use of future reserved word in strict mode"
-    | JSXAttributeValueEmptyExpression ->
-      "JSX attributes must only be assigned a non-empty expression"
-    | InvalidJSXAttributeValue -> "JSX value should be either an expression or a quoted JSX text"
-    | ExpectedJSXClosingTag name -> "Expected corresponding JSX closing tag for " ^ name
-    | NoUninitializedConst -> "Const must be initialized"
-    | NoUninitializedDestructuring -> "Destructuring assignment must be initialized"
-    | NewlineBeforeArrow -> "Illegal newline before arrow"
-    | FunctionAsStatement { in_strict_mode } ->
-      if in_strict_mode then
-        "In strict mode code, functions can only be declared at top level or "
-        ^ "immediately within another function."
-      else
-        "In non-strict mode code, functions can only be declared at top level, "
-        ^ "inside a block, or as the body of an if statement."
-    | AsyncFunctionAsStatement ->
-      "Async functions can only be declared at top level or "
-      ^ "immediately within another function."
-    | GeneratorFunctionAsStatement ->
-      "Generators can only be declared at top level or " ^ "immediately within another function."
-    | AdjacentJSXElements ->
-      "Unexpected token <. Remember, adjacent JSX "
-      ^ "elements must be wrapped in an enclosing parent tag"
-    | ParameterAfterRestParameter -> "Rest parameter must be final parameter of an argument list"
-    | ElementAfterRestElement -> "Rest element must be final element of an array pattern"
-    | PropertyAfterRestElement -> "Rest property must be final property of an object pattern"
-    | DeclareAsync ->
-      "async is an implementation detail and isn't necessary for your declare function statement. It is sufficient for your declare function to just have a Promise return type."
-    | DeclareClassElement -> "`declare` modifier can only appear on class fields."
-    | DeclareClassFieldInitializer ->
-      "Unexpected token `=`. Initializers are not allowed in a `declare`."
-    | DeclareOpaqueTypeInitializer ->
-      "Unexpected token `=`. Initializers are not allowed in a `declare opaque type`."
-    | DeclareExportLet -> "`declare export let` is not supported. Use `declare export var` instead."
-    | DeclareExportConst ->
-      "`declare export const` is not supported. Use `declare export var` instead."
-    | DeclareExportType -> "`declare export type` is not supported. Use `export type` instead."
-    | DeclareExportInterface ->
-      "`declare export interface` is not supported. Use `export interface` instead."
-    | DuplicateExport export -> Printf.sprintf "Duplicate export for `%s`" export
-    | UnsupportedDecorator -> "Found a decorator in an unsupported position."
-    | MissingTypeParamDefault ->
-      "Type parameter declaration needs a default, since a preceding type parameter declaration has a default."
-    | DuplicateDeclareModuleExports -> "Duplicate `declare module.exports` statement!"
-    | AmbiguousDeclareModuleKind ->
-      "Found both `declare module.exports` and `declare export` in the same module. Modules can only have 1 since they are either an ES module xor they are a CommonJS module."
-    | GetterArity -> "Getter should have zero parameters"
-    | SetterArity -> "Setter should have exactly one parameter"
-    | InvalidNonTypeImportInDeclareModule ->
-      "Imports within a `declare module` body must always be " ^ "`import type` or `import typeof`!"
-    | ImportTypeShorthandOnlyInPureImport ->
-      "The `type` and `typeof` keywords on named imports can only be used on regular `import` statements. It cannot be used with `import type` or `import typeof` statements"
-    | ImportSpecifierMissingComma -> "Missing comma between import specifiers"
-    | ExportSpecifierMissingComma -> "Missing comma between export specifiers"
-    | MalformedUnicode -> "Malformed unicode"
-    | DuplicateConstructor -> "Classes may only have one constructor"
-    | DuplicatePrivateFields name ->
-      "Private fields may only be declared once. `#" ^ name ^ "` is declared more than once."
-    | InvalidClassMemberName { name; static; method_; private_ } ->
-      let static_modifier =
-        if static then
-          "static "
-        else
-          ""
-      in
-      let name =
-        if private_ then
-          "#" ^ name
-        else
-          name
-      in
-      let category =
-        if method_ then
-          "methods"
-        else
-          "fields"
-      in
-      "Classes may not have " ^ static_modifier ^ category ^ " named `" ^ name ^ "`."
-    | PrivateDelete -> "Private fields may not be deleted."
-    | UnboundPrivate name ->
-      "Private fields must be declared before they can be referenced. `#"
-      ^ name
-      ^ "` has not been declared."
-    | PrivateNotInClass -> "Private fields can only be referenced from within a class."
-    | SuperPrivate -> "You may not access a private field through the `super` keyword."
-    | YieldInFormalParameters -> "Yield expression not allowed in formal parameter"
-    | AwaitAsIdentifierReference -> "`await` is an invalid identifier in async functions"
-    | YieldAsIdentifierReference -> "`yield` is an invalid identifier in generators"
-    | AmbiguousLetBracket ->
-      "`let [` is ambiguous in this position because it is "
-      ^ "either a `let` binding pattern, or a member expression."
-    | LiteralShorthandProperty -> "Literals cannot be used as shorthand properties."
-    | ComputedShorthandProperty -> "Computed properties must have a value."
-    | MethodInDestructuring -> "Object pattern can't contain methods"
-    | TrailingCommaAfterRestElement -> "A trailing comma is not permitted after the rest element"
-    | OptionalChainNew -> "An optional chain may not be used in a `new` expression."
-    | OptionalChainTemplate -> "Template literals may not be used in an optional chain."
-    | NullishCoalescingUnexpectedLogical operator ->
-      Printf.sprintf
-        "Unexpected token `%s`. Parentheses are required to combine `??` with `&&` or `||` expressions."
-        operator
-    | WhitespaceInPrivateName -> "Unexpected whitespace between `#` and identifier"
-    | ThisParamAnnotationRequired -> "A type annotation is required for the `this` parameter."
-    | ThisParamMustBeFirst -> "The `this` parameter must be the first function parameter."
-    | ThisParamMayNotBeOptional -> "The `this` parameter cannot be optional."
-    | GetterMayNotHaveThisParam -> "A getter cannot have a `this` parameter."
-    | SetterMayNotHaveThisParam -> "A setter cannot have a `this` parameter."
-    | ThisParamBannedInArrowFunctions ->
-      "Arrow functions cannot have a `this` parameter; arrow functions automatically bind `this` when declared."
-    | ThisParamBannedInConstructor ->
-      "Constructors cannot have a `this` parameter; constructors don't bind `this` like other functions."
-    | InvalidTypeof -> "`typeof` can only be used to get the type of variables."
-end
diff --git a/jscomp/js_parser/parser_common.ml b/jscomp/js_parser/parser_common.ml
deleted file mode 100644
index 8da6dae..0000000
--- a/jscomp/js_parser/parser_common.ml
+++ /dev/null
@@ -1,232 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-open Parser_env
-open Flow_ast
-
-type pattern_errors = {
-  if_expr: (Loc.t * Parse_error.t) list;
-  if_patt: (Loc.t * Parse_error.t) list;
-}
-
-type pattern_cover =
-  | Cover_expr of (Loc.t, Loc.t) Expression.t
-  | Cover_patt of (Loc.t, Loc.t) Expression.t * pattern_errors
-
-module type PARSER = sig
-  val program : env -> (Loc.t, Loc.t) Program.t
-
-  val statement : env -> (Loc.t, Loc.t) Statement.t
-
-  val statement_list_item :
-    ?decorators:(Loc.t, Loc.t) Class.Decorator.t list -> env -> (Loc.t, Loc.t) Statement.t
-
-  val statement_list : term_fn:(Token.t -> bool) -> env -> (Loc.t, Loc.t) Statement.t list
-
-  val statement_list_with_directives :
-    term_fn:(Token.t -> bool) -> env -> (Loc.t, Loc.t) Statement.t list * bool
-
-  val module_body : term_fn:(Token.t -> bool) -> env -> (Loc.t, Loc.t) Statement.t list
-
-  val expression : env -> (Loc.t, Loc.t) Expression.t
-
-  val expression_or_pattern : env -> pattern_cover
-
-  val conditional : env -> (Loc.t, Loc.t) Expression.t
-
-  val assignment : env -> (Loc.t, Loc.t) Expression.t
-
-  val left_hand_side : env -> (Loc.t, Loc.t) Expression.t
-
-  val object_initializer : env -> Loc.t * (Loc.t, Loc.t) Expression.Object.t * pattern_errors
-
-  val identifier : ?restricted_error:Parse_error.t -> env -> (Loc.t, Loc.t) Identifier.t
-
-  val identifier_with_type :
-    env -> ?no_optional:bool -> Parse_error.t -> Loc.t * (Loc.t, Loc.t) Pattern.Identifier.t
-
-  val block_body : env -> Loc.t * (Loc.t, Loc.t) Statement.Block.t
-
-  val function_block_body :
-    expression:bool -> env -> (Loc.t * (Loc.t, Loc.t) Statement.Block.t) * bool
-
-  val jsx_element_or_fragment :
-    env ->
-    Loc.t * [ `Element of (Loc.t, Loc.t) JSX.element | `Fragment of (Loc.t, Loc.t) JSX.fragment ]
-
-  val pattern : env -> Parse_error.t -> (Loc.t, Loc.t) Pattern.t
-
-  val pattern_from_expr : env -> (Loc.t, Loc.t) Expression.t -> (Loc.t, Loc.t) Pattern.t
-
-  val object_key : ?class_body:bool -> env -> Loc.t * (Loc.t, Loc.t) Expression.Object.Property.key
-
-  val class_declaration : env -> (Loc.t, Loc.t) Class.Decorator.t list -> (Loc.t, Loc.t) Statement.t
-
-  val class_expression : env -> (Loc.t, Loc.t) Expression.t
-
-  val is_assignable_lhs : (Loc.t, Loc.t) Expression.t -> bool
-
-  val number : env -> Token.number_type -> string -> float
-
-  val annot : env -> (Loc.t, Loc.t) Type.annotation
-end
-
-let identifier_name_raw env =
-  let open Token in
-  let name =
-    match Peek.token env with
-    (* obviously, Identifier is a valid IdentifierName *)
-    | T_IDENTIFIER { value; _ } -> value
-    (* keywords are also IdentifierNames *)
-    | T_AWAIT -> "await"
-    | T_BREAK -> "break"
-    | T_CASE -> "case"
-    | T_CATCH -> "catch"
-    | T_CLASS -> "class"
-    | T_CONST -> "const"
-    | T_CONTINUE -> "continue"
-    | T_DEBUGGER -> "debugger"
-    | T_DEFAULT -> "default"
-    | T_DELETE -> "delete"
-    | T_DO -> "do"
-    | T_ELSE -> "else"
-    | T_EXPORT -> "export"
-    | T_EXTENDS -> "extends"
-    | T_FINALLY -> "finally"
-    | T_FOR -> "for"
-    | T_FUNCTION -> "function"
-    | T_IF -> "if"
-    | T_IMPORT -> "import"
-    | T_IN -> "in"
-    | T_INSTANCEOF -> "instanceof"
-    | T_NEW -> "new"
-    | T_RETURN -> "return"
-    | T_SUPER -> "super"
-    | T_SWITCH -> "switch"
-    | T_THIS -> "this"
-    | T_THROW -> "throw"
-    | T_TRY -> "try"
-    | T_TYPEOF -> "typeof"
-    | T_VAR -> "var"
-    | T_VOID -> "void"
-    | T_WHILE -> "while"
-    | T_WITH -> "with"
-    | T_YIELD -> "yield"
-    (* FutureReservedWord *)
-    | T_ENUM -> "enum"
-    | T_LET -> "let"
-    | T_STATIC -> "static"
-    | T_INTERFACE -> "interface"
-    | T_IMPLEMENTS -> "implements"
-    | T_PACKAGE -> "package"
-    | T_PRIVATE -> "private"
-    | T_PROTECTED -> "protected"
-    | T_PUBLIC -> "public"
-    (* NullLiteral *)
-    | T_NULL -> "null"
-    (* BooleanLiteral *)
-    | T_TRUE -> "true"
-    | T_FALSE -> "false"
-    (* Flow-specific stuff *)
-    | T_DECLARE -> "declare"
-    | T_TYPE -> "type"
-    | T_OPAQUE -> "opaque"
-    | T_ANY_TYPE -> "any"
-    | T_MIXED_TYPE -> "mixed"
-    | T_EMPTY_TYPE -> "empty"
-    | T_BOOLEAN_TYPE BOOL -> "bool"
-    | T_BOOLEAN_TYPE BOOLEAN -> "boolean"
-    | T_NUMBER_TYPE -> "number"
-    | T_BIGINT_TYPE -> "bigint"
-    | T_STRING_TYPE -> "string"
-    | T_VOID_TYPE -> "void"
-    | T_SYMBOL_TYPE -> "symbol"
-    (* Contextual stuff *)
-    | T_OF -> "of"
-    | T_ASYNC -> "async"
-    (* punctuators, types, literals, etc are not identifiers *)
-    | _ ->
-      error_unexpected ~expected:"an identifier" env;
-      ""
-  in
-  Eat.token env;
-  name
-
-(* IdentifierName - https://tc39.github.io/ecma262/#prod-IdentifierName *)
-let identifier_name env =
-  let loc = Peek.loc env in
-  let leading = Peek.comments env in
-  let name = identifier_name_raw env in
-  let trailing = Eat.trailing_comments env in
-  let comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () in
-  (loc, { Identifier.name; comments })
-
-(** PrivateIdentifier - https://tc39.es/ecma262/#prod-PrivateIdentifier
-
-    N.B.: whitespace, line terminators, and comments are not allowed
-    between the # and IdentifierName because PrivateIdentifier is a
-    CommonToken which is considered a single token. See also
-    https://tc39.es/ecma262/#prod-InputElementDiv *)
-let private_identifier env =
-  let start_loc = Peek.loc env in
-  let leading = Peek.comments env in
-  Expect.token env Token.T_POUND;
-  let name_loc = Peek.loc env in
-  let name = identifier_name_raw env in
-  let trailing = Eat.trailing_comments env in
-  let comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () in
-  let loc = Loc.btwn start_loc name_loc in
-  if not (Loc.equal_position start_loc.Loc._end name_loc.Loc.start) then
-    error_at env (loc, Parse_error.WhitespaceInPrivateName);
-  (loc, { PrivateName.name; comments })
-
-(** The operation IsSimpleParamterList
-    https://tc39.es/ecma262/#sec-static-semantics-issimpleparameterlist *)
-let is_simple_parameter_list =
-  let is_simple_param = function
-    | (_, { Flow_ast.Function.Param.argument = (_, Pattern.Identifier _); default = None }) -> true
-    | _ -> false
-  in
-  fun (_, { Flow_ast.Function.Params.params; rest; comments = _; this_ = _ }) ->
-    rest = None && List.for_all is_simple_param params
-
-(**
- * The abstract operation IsLabelledFunction
- *
- * https://tc39.github.io/ecma262/#sec-islabelledfunction
- *)
-let rec is_labelled_function = function
-  | (_, Flow_ast.Statement.Labeled { Flow_ast.Statement.Labeled.body; _ }) ->
-    begin
-      match body with
-      | (_, Flow_ast.Statement.FunctionDeclaration _) -> true
-      | _ -> is_labelled_function body
-    end
-  | _ -> false
-
-let with_loc ?start_loc fn env =
-  let start_loc =
-    match start_loc with
-    | Some x -> x
-    | None -> Peek.loc env
-  in
-  let result = fn env in
-  let loc =
-    match last_loc env with
-    | Some end_loc -> Loc.btwn start_loc end_loc
-    | None -> start_loc
-  in
-  (loc, result)
-
-let with_loc_opt ?start_loc fn env =
-  match with_loc ?start_loc fn env with
-  | (loc, Some x) -> Some (loc, x)
-  | (_, None) -> None
-
-let with_loc_extra ?start_loc fn env =
-  let (loc, (x, extra)) = with_loc ?start_loc fn env in
-  ((loc, x), extra)
diff --git a/jscomp/js_parser/parser_env.ml b/jscomp/js_parser/parser_env.ml
deleted file mode 100644
index 939761d..0000000
--- a/jscomp/js_parser/parser_env.ml
+++ /dev/null
@@ -1,1184 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Sedlexing = Flow_sedlexing
-open Flow_ast
-module SSet = Set.Make (String)
-
-module Lex_mode = struct
-  type t =
-    | NORMAL
-    | TYPE
-    | JSX_TAG
-    | JSX_CHILD
-    | TEMPLATE
-    | REGEXP
-
-  let debug_string_of_lex_mode (mode : t) =
-    match mode with
-    | NORMAL -> "NORMAL"
-    | TYPE -> "TYPE"
-    | JSX_TAG -> "JSX_TAG"
-    | JSX_CHILD -> "JSX_CHILD"
-    | TEMPLATE -> "TEMPLATE"
-    | REGEXP -> "REGEXP"
-end
-
-(* READ THIS BEFORE YOU MODIFY:
- *
- * The current implementation for lookahead beyond a single token is
- * inefficient. If you believe you need to increase this constant, do one of the
- * following:
- * - Find another way
- * - Benchmark your change and provide convincing evidence that it doesn't
- *   actually have a significant perf impact.
- * - Refactor this to memoize all requested lookahead, so we aren't lexing the
- *   same token multiple times.
- *)
-
-module Lookahead : sig
-  type t
-
-  val create : Lex_env.t -> Lex_mode.t -> t
-  val peek_0 : t -> Lex_result.t
-  val peek_1 : t -> Lex_result.t
-  val lex_env_0 : t -> Lex_env.t
-  val junk : t -> unit
-end = struct
-  type la_result = (Lex_env.t * Lex_result.t) option
-
-  type t = {
-    mutable la_results_0: la_result;
-    mutable la_results_1: la_result;
-    la_lex_mode: Lex_mode.t;
-    mutable la_lex_env: Lex_env.t;
-  }
-
-  let create lex_env mode =
-    let lex_env = Lex_env.clone lex_env in
-    { la_results_0 = None; la_results_1 = None; la_lex_mode = mode; la_lex_env = lex_env }
-
-  (* precondition: there is enough room in t.la_results for the result *)
-  let lex t =
-    let lex_env = t.la_lex_env in
-    let (lex_env, lex_result) =
-      match t.la_lex_mode with
-      | Lex_mode.NORMAL -> Flow_lexer.token lex_env
-      | Lex_mode.TYPE -> Flow_lexer.type_token lex_env
-      | Lex_mode.JSX_TAG -> Flow_lexer.jsx_tag lex_env
-      | Lex_mode.JSX_CHILD -> Flow_lexer.jsx_child lex_env
-      | Lex_mode.TEMPLATE -> Flow_lexer.template_tail lex_env
-      | Lex_mode.REGEXP -> Flow_lexer.regexp lex_env
-    in
-    let cloned_env = Lex_env.clone lex_env in
-    let result = (cloned_env, lex_result) in
-    t.la_lex_env <- lex_env;
-    begin
-      match t.la_results_0 with
-      | None -> t.la_results_0 <- Some result
-      | Some _ -> t.la_results_1 <- Some result
-    end;
-    result
-
-  let peek_0 t =
-    match t.la_results_0 with
-    | Some (_, result) -> result
-    | None -> snd (lex t)
-
-  let peek_1 t =
-    (match t.la_results_0 with
-    | None -> ignore (lex t)
-    | Some _ -> ());
-    match t.la_results_1 with
-    | None -> snd (lex t)
-    | Some (_, result) -> result
-
-  let lex_env_0 t =
-    match t.la_results_0 with
-    | Some (lex_env, _) -> lex_env
-    | None -> fst (lex t)
-
-  (* Throws away the first peeked-at token, shifting any subsequent tokens up *)
-  let junk t =
-    match t.la_results_1 with
-    | None ->
-      ignore (peek_0 t);
-      t.la_results_0 <- None
-    | Some _ ->
-      t.la_results_0 <- t.la_results_1;
-      t.la_results_1 <- None
-end
-
-type token_sink_result = {
-  token_loc: Loc.t;
-  token: Token.t;
-  token_context: Lex_mode.t;
-}
-
-type parse_options = {
-  enums: bool;  (** enable parsing of Flow enums *)
-  esproposal_decorators: bool;  (** enable parsing of decorators *)
-  types: bool;  (** enable parsing of Flow types *)
-  use_strict: bool;  (** treat the file as strict, without needing a "use strict" directive *)
-}
-
-let default_parse_options =
-  { enums = false; esproposal_decorators = false; types = true; use_strict = false }
-
-type allowed_super =
-  | No_super
-  | Super_prop
-  | Super_prop_or_call
-
-type env = {
-  errors: (Loc.t * Parse_error.t) list ref;
-  comments: Loc.t Comment.t list ref;
-  labels: SSet.t;
-  last_lex_result: Lex_result.t option ref;
-  in_strict_mode: bool;
-  in_export: bool;
-  in_export_default: bool;
-  in_loop: bool;
-  in_switch: bool;
-  in_formal_parameters: bool;
-  in_function: bool;
-  no_in: bool;
-  no_call: bool;
-  no_let: bool;
-  no_anon_function_type: bool;
-  no_new: bool;
-  allow_yield: bool;
-  allow_await: bool;
-  allow_directive: bool;
-  has_simple_parameters: bool;
-  allow_super: allowed_super;
-  error_callback: (env -> Parse_error.t -> unit) option;
-  lex_mode_stack: Lex_mode.t list ref;
-  (* lex_env is the lex_env after the single lookahead has been lexed *)
-  lex_env: Lex_env.t ref;
-  (* This needs to be cleared whenever we advance. *)
-  lookahead: Lookahead.t ref;
-  token_sink: (token_sink_result -> unit) option ref;
-  parse_options: parse_options;
-  source: File_key.t option;
-  (* It is a syntax error to reference private fields not in scope. In order to enforce this,
-   * we keep track of the privates we've seen declared and used. *)
-  privates: (SSet.t * (string * Loc.t) list) list ref;
-  (* The position up to which comments have been consumed, exclusive. *)
-  consumed_comments_pos: Loc.position ref;
-}
-
-(* constructor *)
-let init_env ?(token_sink = None) ?(parse_options = None) source content =
-  (* let lb = Sedlexing.Utf16.from_string
-     content (Some Sedlexing.Utf16.Little_endian) in *)
-  let (lb, errors) =
-    try (Sedlexing.Utf8.from_string content, []) with
-    | Sedlexing.MalFormed ->
-      (Sedlexing.Utf8.from_string "", [({ Loc.none with Loc.source }, Parse_error.MalformedUnicode)])
-  in
-  let parse_options =
-    match parse_options with
-    | Some opts -> opts
-    | None -> default_parse_options
-  in
-  let enable_types_in_comments = parse_options.types in
-  let lex_env = Lex_env.new_lex_env source lb ~enable_types_in_comments in
-  {
-    errors = ref errors;
-    comments = ref [];
-    labels = SSet.empty;
-    last_lex_result = ref None;
-    has_simple_parameters = true;
-    in_strict_mode = parse_options.use_strict;
-    in_export = false;
-    in_export_default = false;
-    in_loop = false;
-    in_switch = false;
-    in_formal_parameters = false;
-    in_function = false;
-    no_in = false;
-    no_call = false;
-    no_let = false;
-    no_anon_function_type = false;
-    no_new = false;
-    allow_yield = false;
-    allow_await = false;
-    allow_directive = false;
-    allow_super = No_super;
-    error_callback = None;
-    lex_mode_stack = ref [Lex_mode.NORMAL];
-    lex_env = ref lex_env;
-    lookahead = ref (Lookahead.create lex_env Lex_mode.NORMAL);
-    token_sink = ref token_sink;
-    parse_options;
-    source;
-    privates = ref [];
-    consumed_comments_pos = ref { Loc.line = 0; column = 0 };
-  }
-
-(* getters: *)
-let in_strict_mode env = env.in_strict_mode
-let lex_mode env = List.hd !(env.lex_mode_stack)
-let in_export env = env.in_export
-let in_export_default env = env.in_export_default
-let comments env = !(env.comments)
-let labels env = env.labels
-let in_loop env = env.in_loop
-let in_switch env = env.in_switch
-let in_formal_parameters env = env.in_formal_parameters
-let in_function env = env.in_function
-let allow_yield env = env.allow_yield
-let allow_await env = env.allow_await
-let allow_directive env = env.allow_directive
-let allow_super env = env.allow_super
-let has_simple_parameters env = env.has_simple_parameters
-let no_in env = env.no_in
-let no_call env = env.no_call
-let no_let env = env.no_let
-let no_anon_function_type env = env.no_anon_function_type
-let no_new env = env.no_new
-let errors env = !(env.errors)
-let parse_options env = env.parse_options
-let source env = env.source
-let should_parse_types env = env.parse_options.types
-
-(* mutators: *)
-let error_at env (loc, e) =
-  env.errors := (loc, e) :: !(env.errors);
-  match env.error_callback with
-  | None -> ()
-  | Some callback -> callback env e
-
-(* Since private fields out of scope are a parse error, we keep track of the declared and used
- * private fields.
- *
- * Whenever we enter a class, we push new empty lists of declared and used privates.
- * When we encounter a new declared private, we add it to the top of the declared_privates list
- * via add_declared_private. We do the same with used_privates via add_used_private.
- *
- * When we exit a class, we look for all the unbound private variables. Since class fields
- * are hoisted to the scope of the class, we may need to look further before we conclude that
- * a field is out of scope. To do that, we add all of the unbound private fields to the
- * next used_private list. Once we run out of declared private lists, any leftover used_privates
- * are unbound private variables. *)
-let enter_class env = env.privates := (SSet.empty, []) :: !(env.privates)
-
-let exit_class env =
-  let get_unbound_privates declared_privates used_privates =
-    List.filter (fun x -> not (SSet.mem (fst x) declared_privates)) used_privates
-  in
-  match !(env.privates) with
-  | [(declared_privates, used_privates)] ->
-    let unbound_privates = get_unbound_privates declared_privates used_privates in
-    List.iter
-      (fun (name, loc) -> error_at env (loc, Parse_error.UnboundPrivate name))
-      unbound_privates;
-    env.privates := []
-  | (loc_declared_privates, loc_used_privates) :: privates ->
-    let unbound_privates = get_unbound_privates loc_declared_privates loc_used_privates in
-    let (decl_head, used_head) = List.hd privates in
-    env.privates := (decl_head, used_head @ unbound_privates) :: List.tl privates
-  | _ -> failwith "Internal Error: `exit_class` called before a matching `enter_class`"
-
-let add_declared_private env name =
-  match !(env.privates) with
-  | [] -> failwith "Internal Error: Tried to add_declared_private with outside of class scope."
-  | (declared, used) :: xs -> env.privates := (SSet.add name declared, used) :: xs
-
-let add_used_private env name loc =
-  match !(env.privates) with
-  | [] -> error_at env (loc, Parse_error.PrivateNotInClass)
-  | (declared, used) :: xs -> env.privates := (declared, (name, loc) :: used) :: xs
-
-let consume_comments_until env pos = env.consumed_comments_pos := pos
-
-(* lookahead: *)
-let lookahead_0 env = Lookahead.peek_0 !(env.lookahead)
-let lookahead_1 env = Lookahead.peek_1 !(env.lookahead)
-
-let lookahead ~i env =
-  match i with
-  | 0 -> lookahead_0 env
-  | 1 -> lookahead_1 env
-  | _ -> assert false
-
-(* functional operations: *)
-let with_strict in_strict_mode env =
-  if in_strict_mode = env.in_strict_mode then
-    env
-  else
-    { env with in_strict_mode }
-
-let with_in_formal_parameters in_formal_parameters env =
-  if in_formal_parameters = env.in_formal_parameters then
-    env
-  else
-    { env with in_formal_parameters }
-
-let with_in_function in_function env =
-  if in_function = env.in_function then
-    env
-  else
-    { env with in_function }
-
-let with_allow_yield allow_yield env =
-  if allow_yield = env.allow_yield then
-    env
-  else
-    { env with allow_yield }
-
-let with_allow_await allow_await env =
-  if allow_await = env.allow_await then
-    env
-  else
-    { env with allow_await }
-
-let with_allow_directive allow_directive env =
-  if allow_directive = env.allow_directive then
-    env
-  else
-    { env with allow_directive }
-
-let with_allow_super allow_super env =
-  if allow_super = env.allow_super then
-    env
-  else
-    { env with allow_super }
-
-let with_no_let no_let env =
-  if no_let = env.no_let then
-    env
-  else
-    { env with no_let }
-
-let with_in_loop in_loop env =
-  if in_loop = env.in_loop then
-    env
-  else
-    { env with in_loop }
-
-let with_no_in no_in env =
-  if no_in = env.no_in then
-    env
-  else
-    { env with no_in }
-
-let with_no_anon_function_type no_anon_function_type env =
-  if no_anon_function_type = env.no_anon_function_type then
-    env
-  else
-    { env with no_anon_function_type }
-
-let with_no_new no_new env =
-  if no_new = env.no_new then
-    env
-  else
-    { env with no_new }
-
-let with_in_switch in_switch env =
-  if in_switch = env.in_switch then
-    env
-  else
-    { env with in_switch }
-
-let with_in_export in_export env =
-  if in_export = env.in_export then
-    env
-  else
-    { env with in_export }
-
-let with_in_export_default in_export_default env =
-  if in_export_default = env.in_export_default then
-    env
-  else
-    { env with in_export_default }
-
-let with_no_call no_call env =
-  if no_call = env.no_call then
-    env
-  else
-    { env with no_call }
-
-let with_error_callback error_callback env = { env with error_callback = Some error_callback }
-
-(* other helper functions: *)
-let error_list env = List.iter (error_at env)
-
-let last_loc env =
-  match !(env.last_lex_result) with
-  | Some lex_result -> Some (Lex_result.loc lex_result)
-  | None -> None
-
-let last_token env =
-  match !(env.last_lex_result) with
-  | Some lex_result -> Some (Lex_result.token lex_result)
-  | None -> None
-
-let without_error_callback env = { env with error_callback = None }
-let add_label env label = { env with labels = SSet.add label env.labels }
-
-let enter_function env ~async ~generator ~simple_params =
-  {
-    env with
-    in_formal_parameters = false;
-    has_simple_parameters = simple_params;
-    in_function = true;
-    in_loop = false;
-    in_switch = false;
-    in_export = false;
-    in_export_default = false;
-    labels = SSet.empty;
-    allow_await = async;
-    allow_yield = generator;
-  }
-
-(* #sec-keywords *)
-let is_keyword = function
-  | "await"
-  | "break"
-  | "case"
-  | "catch"
-  | "class"
-  | "const"
-  | "continue"
-  | "debugger"
-  | "default"
-  | "delete"
-  | "do"
-  | "else"
-  | "export"
-  | "extends"
-  | "finally"
-  | "for"
-  | "function"
-  | "if"
-  | "import"
-  | "in"
-  | "instanceof"
-  | "new"
-  | "return"
-  | "super"
-  | "switch"
-  | "this"
-  | "throw"
-  | "try"
-  | "typeof"
-  | "var"
-  | "void"
-  | "while"
-  | "with"
-  | "yield" ->
-    true
-  | _ -> false
-
-let token_is_keyword =
-  Token.(
-    function
-    | T_IDENTIFIER { raw; _ } when is_keyword raw -> true
-    | T_AWAIT
-    | T_BREAK
-    | T_CASE
-    | T_CATCH
-    | T_CLASS
-    | T_CONST
-    | T_CONTINUE
-    | T_DEBUGGER
-    | T_DEFAULT
-    | T_DELETE
-    | T_DO
-    | T_ELSE
-    | T_EXPORT
-    | T_EXTENDS
-    | T_FINALLY
-    | T_FOR
-    | T_FUNCTION
-    | T_IF
-    | T_IMPORT
-    | T_IN
-    | T_INSTANCEOF
-    | T_NEW
-    | T_RETURN
-    | T_SUPER
-    | T_SWITCH
-    | T_THIS
-    | T_THROW
-    | T_TRY
-    | T_TYPEOF
-    | T_VAR
-    | T_VOID
-    | T_WHILE
-    | T_WITH
-    | T_YIELD ->
-      true
-    | _ -> false
-  )
-
-(* #sec-future-reserved-words *)
-let is_future_reserved = function
-  | "enum" -> true
-  | _ -> false
-
-let token_is_future_reserved =
-  Token.(
-    function
-    | T_IDENTIFIER { raw; _ } when is_future_reserved raw -> true
-    | T_ENUM -> true
-    | _ -> false
-  )
-
-(* #sec-strict-mode-of-ecmascript *)
-let is_strict_reserved = function
-  | "interface"
-  | "implements"
-  | "package"
-  | "private"
-  | "protected"
-  | "public"
-  | "static"
-  | "yield" ->
-    true
-  | _ -> false
-
-let token_is_strict_reserved =
-  Token.(
-    function
-    | T_IDENTIFIER { raw; _ } when is_strict_reserved raw -> true
-    | T_INTERFACE
-    | T_IMPLEMENTS
-    | T_PACKAGE
-    | T_PRIVATE
-    | T_PROTECTED
-    | T_PUBLIC
-    | T_STATIC
-    | T_YIELD ->
-      true
-    | _ -> false
-  )
-
-(* #sec-strict-mode-of-ecmascript *)
-let is_restricted = function
-  | "eval"
-  | "arguments" ->
-    true
-  | _ -> false
-
-let token_is_restricted =
-  Token.(
-    function
-    | T_IDENTIFIER { raw; _ } when is_restricted raw -> true
-    | _ -> false
-  )
-
-(* #sec-reserved-words *)
-let is_reserved str_val =
-  is_keyword str_val
-  || is_future_reserved str_val
-  ||
-  match str_val with
-  | "null"
-  | "true"
-  | "false" ->
-    true
-  | _ -> false
-
-let token_is_reserved t =
-  token_is_keyword t
-  || token_is_future_reserved t
-  ||
-  match t with
-  | Token.T_IDENTIFIER { raw = "null" | "true" | "false"; _ }
-  | Token.T_NULL
-  | Token.T_TRUE
-  | Token.T_FALSE ->
-    true
-  | _ -> false
-
-let is_reserved_type str_val =
-  match str_val with
-  | "any"
-  | "bool"
-  | "boolean"
-  | "empty"
-  | "false"
-  | "mixed"
-  | "null"
-  | "number"
-  | "bigint"
-  | "static"
-  | "string"
-  | "true"
-  | "typeof"
-  | "void"
-  | "interface"
-  | "extends"
-  | "_" ->
-    true
-  | _ -> false
-
-(* Answer questions about what comes next *)
-module Peek = struct
-  open Loc
-  open Token
-
-  let ith_token ~i env = Lex_result.token (lookahead ~i env)
-  let ith_loc ~i env = Lex_result.loc (lookahead ~i env)
-  let ith_errors ~i env = Lex_result.errors (lookahead ~i env)
-
-  let ith_comments ~i env =
-    let comments = Lex_result.comments (lookahead ~i env) in
-    match comments with
-    | [] -> []
-    | _ ->
-      List.filter
-        (fun ({ Loc.start; _ }, _) -> Loc.pos_cmp !(env.consumed_comments_pos) start <= 0)
-        comments
-
-  let token env = ith_token ~i:0 env
-  let loc env = ith_loc ~i:0 env
-
-  (* loc_skip_lookahead is used to give a loc hint to optional tokens such as type annotations *)
-  let loc_skip_lookahead env =
-    let loc =
-      match last_loc env with
-      | Some loc -> loc
-      | None -> failwith "Peeking current location when not available"
-    in
-    Loc.{ loc with start = loc._end }
-
-  let errors env = ith_errors ~i:0 env
-  let comments env = ith_comments ~i:0 env
-
-  let has_eaten_comments env =
-    let comments = Lex_result.comments (lookahead ~i:0 env) in
-    List.exists
-      (fun ({ Loc.start; _ }, _) -> Loc.pos_cmp start !(env.consumed_comments_pos) < 0)
-      comments
-
-  let lex_env env = Lookahead.lex_env_0 !(env.lookahead)
-
-  (* True if there is a line terminator before the next token *)
-  let ith_is_line_terminator ~i env =
-    let loc =
-      if i > 0 then
-        Some (ith_loc ~i:(i - 1) env)
-      else
-        last_loc env
-    in
-    match loc with
-    | None -> false
-    | Some loc' -> (ith_loc ~i env).start.line > loc'.start.line
-
-  let is_line_terminator env = ith_is_line_terminator ~i:0 env
-
-  let ith_is_implicit_semicolon ~i env =
-    match ith_token ~i env with
-    | T_EOF
-    | T_RCURLY ->
-      true
-    | T_SEMICOLON -> false
-    | _ -> ith_is_line_terminator ~i env
-
-  let is_implicit_semicolon env = ith_is_implicit_semicolon ~i:0 env
-
-  let ith_is_identifier ~i env =
-    match ith_token ~i env with
-    | t when token_is_strict_reserved t -> true
-    | t when token_is_future_reserved t -> true
-    | t when token_is_restricted t -> true
-    | T_LET
-    | T_TYPE
-    | T_OPAQUE
-    | T_OF
-    | T_DECLARE
-    | T_ASYNC
-    | T_AWAIT
-    | T_POUND
-    | T_IDENTIFIER _ ->
-      true
-    | _ -> false
-
-  let ith_is_type_identifier ~i env =
-    match lex_mode env with
-    | Lex_mode.TYPE -> begin
-      match ith_token ~i env with
-      | T_IDENTIFIER _ -> true
-      | _ -> false
-    end
-    | Lex_mode.NORMAL -> begin
-      (* Sometimes we peek at type identifiers while in normal lex mode. For
-         example, when deciding whether a `type` token is an identifier or the
-         start of a type declaration, based on whether the following token
-         `is_type_identifier`. *)
-      match ith_token ~i env with
-      | T_IDENTIFIER { raw; _ } when is_reserved_type raw -> false
-      (* reserved type identifiers, but these don't appear in NORMAL mode *)
-      | T_ANY_TYPE
-      | T_MIXED_TYPE
-      | T_EMPTY_TYPE
-      | T_NUMBER_TYPE
-      | T_BIGINT_TYPE
-      | T_STRING_TYPE
-      | T_VOID_TYPE
-      | T_SYMBOL_TYPE
-      | T_BOOLEAN_TYPE _
-      | T_NUMBER_SINGLETON_TYPE _
-      | T_BIGINT_SINGLETON_TYPE _
-      (* identifier-ish *)
-      | T_ASYNC
-      | T_AWAIT
-      | T_BREAK
-      | T_CASE
-      | T_CATCH
-      | T_CLASS
-      | T_CONST
-      | T_CONTINUE
-      | T_DEBUGGER
-      | T_DECLARE
-      | T_DEFAULT
-      | T_DELETE
-      | T_DO
-      | T_ELSE
-      | T_ENUM
-      | T_EXPORT
-      | T_EXTENDS
-      | T_FALSE
-      | T_FINALLY
-      | T_FOR
-      | T_FUNCTION
-      | T_IDENTIFIER _
-      | T_IF
-      | T_IMPLEMENTS
-      | T_IMPORT
-      | T_IN
-      | T_INSTANCEOF
-      | T_INTERFACE
-      | T_LET
-      | T_NEW
-      | T_NULL
-      | T_OF
-      | T_OPAQUE
-      | T_PACKAGE
-      | T_PRIVATE
-      | T_PROTECTED
-      | T_PUBLIC
-      | T_RETURN
-      | T_SUPER
-      | T_SWITCH
-      | T_THIS
-      | T_THROW
-      | T_TRUE
-      | T_TRY
-      | T_TYPE
-      | T_VAR
-      | T_WHILE
-      | T_WITH
-      | T_YIELD ->
-        true
-      (* identifier-ish, but not valid types *)
-      | T_STATIC
-      | T_TYPEOF
-      | T_VOID ->
-        false
-      (* syntax *)
-      | T_LCURLY
-      | T_RCURLY
-      | T_LCURLYBAR
-      | T_RCURLYBAR
-      | T_LPAREN
-      | T_RPAREN
-      | T_LBRACKET
-      | T_RBRACKET
-      | T_SEMICOLON
-      | T_COMMA
-      | T_PERIOD
-      | T_ARROW
-      | T_ELLIPSIS
-      | T_AT
-      | T_POUND
-      | T_CHECKS
-      | T_RSHIFT3_ASSIGN
-      | T_RSHIFT_ASSIGN
-      | T_LSHIFT_ASSIGN
-      | T_BIT_XOR_ASSIGN
-      | T_BIT_OR_ASSIGN
-      | T_BIT_AND_ASSIGN
-      | T_MOD_ASSIGN
-      | T_DIV_ASSIGN
-      | T_MULT_ASSIGN
-      | T_EXP_ASSIGN
-      | T_MINUS_ASSIGN
-      | T_PLUS_ASSIGN
-      | T_NULLISH_ASSIGN
-      | T_AND_ASSIGN
-      | T_OR_ASSIGN
-      | T_ASSIGN
-      | T_PLING_PERIOD
-      | T_PLING_PLING
-      | T_PLING
-      | T_COLON
-      | T_OR
-      | T_AND
-      | T_BIT_OR
-      | T_BIT_XOR
-      | T_BIT_AND
-      | T_EQUAL
-      | T_NOT_EQUAL
-      | T_STRICT_EQUAL
-      | T_STRICT_NOT_EQUAL
-      | T_LESS_THAN_EQUAL
-      | T_GREATER_THAN_EQUAL
-      | T_LESS_THAN
-      | T_GREATER_THAN
-      | T_LSHIFT
-      | T_RSHIFT
-      | T_RSHIFT3
-      | T_PLUS
-      | T_MINUS
-      | T_DIV
-      | T_MULT
-      | T_EXP
-      | T_MOD
-      | T_NOT
-      | T_BIT_NOT
-      | T_INCR
-      | T_DECR
-      | T_EOF ->
-        false
-      (* literals *)
-      | T_NUMBER _
-      | T_BIGINT _
-      | T_STRING _
-      | T_TEMPLATE_PART _
-      | T_REGEXP _
-      (* misc that shouldn't appear in NORMAL mode *)
-      | T_JSX_IDENTIFIER _
-      | T_JSX_TEXT _
-      | T_ERROR _ ->
-        false
-    end
-    | Lex_mode.JSX_TAG
-    | Lex_mode.JSX_CHILD
-    | Lex_mode.TEMPLATE
-    | Lex_mode.REGEXP ->
-      false
-
-  let ith_is_identifier_name ~i env = ith_is_identifier ~i env || ith_is_type_identifier ~i env
-
-  (* This returns true if the next token is identifier-ish (even if it is an
-     error) *)
-  let is_identifier env = ith_is_identifier ~i:0 env
-  let is_identifier_name env = ith_is_identifier_name ~i:0 env
-  let is_type_identifier env = ith_is_type_identifier ~i:0 env
-
-  let is_function env =
-    token env = T_FUNCTION
-    || token env = T_ASYNC
-       && ith_token ~i:1 env = T_FUNCTION
-       && (loc env)._end.line = (ith_loc ~i:1 env).start.line
-
-  let is_class env =
-    match token env with
-    | T_CLASS
-    | T_AT ->
-      true
-    | _ -> false
-end
-
-(*****************************************************************************)
-(* Errors *)
-(*****************************************************************************)
-
-(* Complains about an error at the location of the lookahead *)
-let error env e =
-  let loc = Peek.loc env in
-  error_at env (loc, e)
-
-let get_unexpected_error ?expected token =
-  if token_is_future_reserved token then
-    Parse_error.UnexpectedReserved
-  else if token_is_strict_reserved token then
-    Parse_error.StrictReservedWord
-  else
-    let unexpected = Token.explanation_of_token token in
-    match expected with
-    | Some expected_msg -> Parse_error.UnexpectedWithExpected (unexpected, expected_msg)
-    | None -> Parse_error.Unexpected unexpected
-
-let error_unexpected ?expected env =
-  (* So normally we consume the lookahead lex result when Eat.token calls
-   * Parser_env.advance, which will add any lexing errors to our list of errors.
-   * However, raising an unexpected error for a lookahead is kind of like
-   * consuming that token, so we should process any lexing errors before
-   * complaining about the unexpected token *)
-  error_list env (Peek.errors env);
-  error env (get_unexpected_error ?expected (Peek.token env))
-
-let error_on_decorators env =
-  List.iter (fun decorator -> error_at env (fst decorator, Parse_error.UnsupportedDecorator))
-
-let error_nameless_declaration env kind =
-  let expected =
-    if in_export env then
-      Printf.sprintf
-        "an identifier. When exporting a %s as a named export, you must specify a %s name. Did you mean `export default %s ...`?"
-        kind
-        kind
-        kind
-    else
-      "an identifier"
-  in
-  error_unexpected ~expected env
-
-let strict_error env e = if in_strict_mode env then error env e
-let strict_error_at env (loc, e) = if in_strict_mode env then error_at env (loc, e)
-
-let function_as_statement_error_at env loc =
-  error_at env (loc, Parse_error.FunctionAsStatement { in_strict_mode = in_strict_mode env })
-
-(* Consume zero or more tokens *)
-module Eat = struct
-  (* Consume a single token *)
-  let token env =
-    (* If there's a token_sink, emit the lexed token before moving forward *)
-    (match !(env.token_sink) with
-    | None -> ()
-    | Some token_sink ->
-      token_sink
-        {
-          token_loc = Peek.loc env;
-          token = Peek.token env;
-          (*
-           * The lex mode is useful because it gives context to some
-           * context-sensitive tokens.
-           *
-           * Some examples of such tokens include:
-           *
-           * `=>` - Part of an arrow function? or part of a type annotation?
-           * `<`  - A less-than? Or an opening to a JSX element?
-           * ...etc...
-           *)
-          token_context = lex_mode env;
-        });
-
-    env.lex_env := Peek.lex_env env;
-
-    error_list env (Peek.errors env);
-    env.comments := List.rev_append (Lex_result.comments (lookahead ~i:0 env)) !(env.comments);
-    env.last_lex_result := Some (lookahead ~i:0 env);
-
-    Lookahead.junk !(env.lookahead)
-
-  (** [maybe env t] eats the next token and returns [true] if it is [t], else return [false] *)
-  let maybe env t =
-    let is_t = Token.equal (Peek.token env) t in
-    if is_t then token env;
-    is_t
-
-  let push_lex_mode env mode =
-    env.lex_mode_stack := mode :: !(env.lex_mode_stack);
-    env.lookahead := Lookahead.create !(env.lex_env) (lex_mode env)
-
-  let pop_lex_mode env =
-    let new_stack =
-      match !(env.lex_mode_stack) with
-      | _mode :: stack -> stack
-      | _ -> failwith "Popping lex mode from empty stack"
-    in
-    env.lex_mode_stack := new_stack;
-    env.lookahead := Lookahead.create !(env.lex_env) (lex_mode env)
-
-  let double_pop_lex_mode env =
-    let new_stack =
-      match !(env.lex_mode_stack) with
-      | _ :: _ :: stack -> stack
-      | _ -> failwith "Popping lex mode from empty stack"
-    in
-    env.lex_mode_stack := new_stack;
-    env.lookahead := Lookahead.create !(env.lex_env) (lex_mode env)
-
-  let trailing_comments env =
-    let open Loc in
-    let loc = Peek.loc env in
-    if Peek.token env = Token.T_COMMA && Peek.ith_is_line_terminator ~i:1 env then (
-      let trailing_before_comma = Peek.comments env in
-      let trailing_after_comma =
-        List.filter
-          (fun (comment_loc, _) -> comment_loc.start.line <= loc._end.line)
-          (Lex_result.comments (lookahead ~i:1 env))
-      in
-      let trailing = trailing_before_comma @ trailing_after_comma in
-      consume_comments_until env { Loc.line = loc._end.line + 1; column = 0 };
-      trailing
-    ) else
-      let trailing = Peek.comments env in
-      consume_comments_until env loc._end;
-      trailing
-
-  let comments_until_next_line env =
-    let open Loc in
-    match !(env.last_lex_result) with
-    | None -> []
-    | Some { Lex_result.lex_loc = last_loc; _ } ->
-      let comments = Peek.comments env in
-      let comments = List.filter (fun (loc, _) -> loc.start.line <= last_loc._end.line) comments in
-      consume_comments_until env { line = last_loc._end.line + 1; column = 0 };
-      comments
-
-  let program_comments env =
-    let open Flow_ast.Comment in
-    let comments = Peek.comments env in
-    let flow_directive = "@flow" in
-    let flow_directive_length = String.length flow_directive in
-    let contains_flow_directive { text; _ } =
-      let text_length = String.length text in
-      let rec contains_flow_directive_after_offset off =
-        if off + flow_directive_length > text_length then
-          false
-        else
-          String.sub text off flow_directive_length = flow_directive
-          || contains_flow_directive_after_offset (off + 1)
-      in
-      contains_flow_directive_after_offset 0
-    in
-    (* Comments up through the last comment with an @flow directive are considered program comments *)
-    let rec flow_directive_comments comments =
-      match comments with
-      | [] -> []
-      | (loc, comment) :: rest ->
-        if contains_flow_directive comment then (
-          (env.consumed_comments_pos := Loc.(loc._end));
-          List.rev ((loc, comment) :: rest)
-        ) else
-          flow_directive_comments rest
-    in
-    let program_comments = flow_directive_comments (List.rev comments) in
-    let program_comments =
-      if program_comments <> [] then
-        program_comments
-      else
-        (* If there is no @flow directive, consider the first block comment a program comment if
-           it starts with "/**" *)
-        match comments with
-        | ((loc, { kind = Block; text; _ }) as first_comment) :: _
-          when String.length text >= 1 && text.[0] = '*' ->
-          (env.consumed_comments_pos := Loc.(loc._end));
-          [first_comment]
-        | _ -> []
-    in
-    program_comments
-end
-
-module Expect = struct
-  let get_error env t =
-    let expected = Token.explanation_of_token ~use_article:true t in
-    (Peek.loc env, get_unexpected_error ~expected (Peek.token env))
-
-  let error env t =
-    let expected = Token.explanation_of_token ~use_article:true t in
-    error_unexpected ~expected env
-
-  let token env t =
-    if not (Token.equal (Peek.token env) t) then error env t;
-    Eat.token env
-
-  (** [token_maybe env T_FOO] eats a token if it is [T_FOO], and errors without consuming if
-      not. Returns whether it consumed a token, like [Eat.maybe]. *)
-  let token_maybe env t =
-    let ate = Eat.maybe env t in
-    if not ate then error env t;
-    ate
-
-  (** [token_opt env T_FOO] eats a token if it is [T_FOO], and errors without consuming if not.
-      This differs from [token], which always consumes. Only use [token_opt] when it's ok for
-      the parser to not advance, like if you are guaranteed that something else has eaten a
-      token. *)
-  let token_opt env t = ignore (token_maybe env t)
-
-  let identifier env name =
-    let t = Peek.token env in
-    begin
-      match t with
-      | Token.T_IDENTIFIER { raw; _ } when raw = name -> ()
-      | _ ->
-        let expected = Printf.sprintf "the identifier `%s`" name in
-        error_unexpected ~expected env
-    end;
-    Eat.token env
-end
-
-(* This module allows you to try parsing and rollback if you need. This is not
- * cheap and its usage is strongly discouraged *)
-module Try = struct
-  type 'a parse_result =
-    | ParsedSuccessfully of 'a
-    | FailedToParse
-
-  exception Rollback
-
-  type saved_state = {
-    saved_errors: (Loc.t * Parse_error.t) list;
-    saved_comments: Loc.t Flow_ast.Comment.t list;
-    saved_last_lex_result: Lex_result.t option;
-    saved_lex_mode_stack: Lex_mode.t list;
-    saved_lex_env: Lex_env.t;
-    saved_consumed_comments_pos: Loc.position;
-    token_buffer: ((token_sink_result -> unit) * token_sink_result Queue.t) option;
-  }
-
-  let save_state env =
-    let token_buffer =
-      match !(env.token_sink) with
-      | None -> None
-      | Some orig_token_sink ->
-        let buffer = Queue.create () in
-        env.token_sink := Some (fun token_data -> Queue.add token_data buffer);
-        Some (orig_token_sink, buffer)
-    in
-    {
-      saved_errors = !(env.errors);
-      saved_comments = !(env.comments);
-      saved_last_lex_result = !(env.last_lex_result);
-      saved_lex_mode_stack = !(env.lex_mode_stack);
-      saved_lex_env = !(env.lex_env);
-      saved_consumed_comments_pos = !(env.consumed_comments_pos);
-      token_buffer;
-    }
-
-  let reset_token_sink ~flush env token_buffer_info =
-    match token_buffer_info with
-    | None -> ()
-    | Some (orig_token_sink, token_buffer) ->
-      env.token_sink := Some orig_token_sink;
-      if flush then Queue.iter orig_token_sink token_buffer
-
-  let rollback_state env saved_state =
-    reset_token_sink ~flush:false env saved_state.token_buffer;
-    env.errors := saved_state.saved_errors;
-    env.comments := saved_state.saved_comments;
-    env.last_lex_result := saved_state.saved_last_lex_result;
-    env.lex_mode_stack := saved_state.saved_lex_mode_stack;
-    env.lex_env := saved_state.saved_lex_env;
-    env.consumed_comments_pos := saved_state.saved_consumed_comments_pos;
-    env.lookahead := Lookahead.create !(env.lex_env) (lex_mode env);
-
-    FailedToParse
-
-  let success env saved_state result =
-    reset_token_sink ~flush:true env saved_state.token_buffer;
-    ParsedSuccessfully result
-
-  let to_parse env parse =
-    let saved_state = save_state env in
-    try success env saved_state (parse env) with
-    | Rollback -> rollback_state env saved_state
-
-  let or_else env ~fallback parse =
-    match to_parse env parse with
-    | ParsedSuccessfully result -> result
-    | FailedToParse -> fallback
-end
diff --git a/jscomp/js_parser/parser_env.mli b/jscomp/js_parser/parser_env.mli
deleted file mode 100644
index 7cc424e..0000000
--- a/jscomp/js_parser/parser_env.mli
+++ /dev/null
@@ -1,283 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-(* This module provides a layer between the lexer and the parser which includes
- * some parser state and some lexer state *)
-
-module SSet : Set.S with type elt = string
-
-module Lex_mode : sig
-  type t =
-    | NORMAL
-    | TYPE
-    | JSX_TAG
-    | JSX_CHILD
-    | TEMPLATE
-    | REGEXP
-
-  val debug_string_of_lex_mode : t -> string
-end
-
-type token_sink_result = {
-  token_loc: Loc.t;
-  token: Token.t;
-  token_context: Lex_mode.t;
-}
-
-type parse_options = {
-  enums: bool;  (** enable parsing of Flow enums *)
-  esproposal_decorators: bool;  (** enable parsing of decorators *)
-  types: bool;  (** enable parsing of Flow types *)
-  use_strict: bool;  (** treat the file as strict, without needing a "use strict" directive *)
-}
-
-val default_parse_options : parse_options
-
-type env
-
-type allowed_super =
-  | No_super
-  | Super_prop
-  | Super_prop_or_call
-
-(* constructor: *)
-val init_env :
-  ?token_sink:(token_sink_result -> unit) option ->
-  ?parse_options:parse_options option ->
-  File_key.t option ->
-  string ->
-  env
-
-(* getters: *)
-val in_strict_mode : env -> bool
-
-val last_loc : env -> Loc.t option
-
-val last_token : env -> Token.t option
-
-val in_export : env -> bool
-
-val in_export_default : env -> bool
-
-val labels : env -> SSet.t
-
-val comments : env -> Loc.t Flow_ast.Comment.t list
-
-val in_loop : env -> bool
-
-val in_switch : env -> bool
-
-val in_formal_parameters : env -> bool
-
-val in_function : env -> bool
-
-val allow_yield : env -> bool
-
-val allow_await : env -> bool
-
-val allow_directive : env -> bool
-
-val allow_super : env -> allowed_super
-
-val has_simple_parameters : env -> bool
-
-val no_in : env -> bool
-
-val no_call : env -> bool
-
-val no_let : env -> bool
-
-val no_anon_function_type : env -> bool
-
-val no_new : env -> bool
-
-val errors : env -> (Loc.t * Parse_error.t) list
-
-val parse_options : env -> parse_options
-
-val source : env -> File_key.t option
-
-val should_parse_types : env -> bool
-
-val get_unexpected_error : ?expected:string -> Token.t -> Parse_error.t
-
-(* mutators: *)
-val error_at : env -> Loc.t * Parse_error.t -> unit
-
-val error : env -> Parse_error.t -> unit
-
-val error_unexpected : ?expected:string -> env -> unit
-
-val error_on_decorators : env -> (Loc.t * 'a) list -> unit
-
-val error_nameless_declaration : env -> string -> unit
-
-val strict_error : env -> Parse_error.t -> unit
-
-val strict_error_at : env -> Loc.t * Parse_error.t -> unit
-
-val function_as_statement_error_at : env -> Loc.t -> unit
-
-val error_list : env -> (Loc.t * Parse_error.t) list -> unit
-
-val enter_class : env -> unit
-
-val exit_class : env -> unit
-
-val add_declared_private : env -> string -> unit
-
-val add_used_private : env -> string -> Loc.t -> unit
-
-val consume_comments_until : env -> Loc.position -> unit
-
-(* functional operations -- these return shallow copies, so future mutations to
- * the returned env will also affect the original: *)
-val with_strict : bool -> env -> env
-
-val with_in_formal_parameters : bool -> env -> env
-
-val with_in_function : bool -> env -> env
-
-val with_allow_yield : bool -> env -> env
-
-val with_allow_await : bool -> env -> env
-
-val with_allow_directive : bool -> env -> env
-
-val with_allow_super : allowed_super -> env -> env
-
-val with_no_let : bool -> env -> env
-
-val with_in_loop : bool -> env -> env
-
-val with_no_in : bool -> env -> env
-
-val with_no_anon_function_type : bool -> env -> env
-
-val with_no_new : bool -> env -> env
-
-val with_in_switch : bool -> env -> env
-
-val with_in_export : bool -> env -> env
-
-val with_in_export_default : bool -> env -> env
-
-val with_no_call : bool -> env -> env
-
-val with_error_callback : (env -> Parse_error.t -> unit) -> env -> env
-
-val without_error_callback : env -> env
-
-val add_label : env -> string -> env
-
-val enter_function : env -> async:bool -> generator:bool -> simple_params:bool -> env
-
-val is_reserved : string -> bool
-
-val token_is_reserved : Token.t -> bool
-
-val is_future_reserved : string -> bool
-
-val is_strict_reserved : string -> bool
-
-val token_is_strict_reserved : Token.t -> bool
-
-val is_restricted : string -> bool
-
-val is_reserved_type : string -> bool
-
-val token_is_restricted : Token.t -> bool
-
-module Peek : sig
-  val token : env -> Token.t
-
-  val loc : env -> Loc.t
-
-  val loc_skip_lookahead : env -> Loc.t
-
-  val errors : env -> (Loc.t * Parse_error.t) list
-
-  val comments : env -> Loc.t Flow_ast.Comment.t list
-
-  val has_eaten_comments : env -> bool
-
-  val is_line_terminator : env -> bool
-
-  val is_implicit_semicolon : env -> bool
-
-  val is_identifier : env -> bool
-
-  val is_type_identifier : env -> bool
-
-  val is_identifier_name : env -> bool
-
-  val is_function : env -> bool
-
-  val is_class : env -> bool
-
-  val ith_token : i:int -> env -> Token.t
-
-  val ith_loc : i:int -> env -> Loc.t
-
-  val ith_errors : i:int -> env -> (Loc.t * Parse_error.t) list
-
-  val ith_comments : i:int -> env -> Loc.t Flow_ast.Comment.t list
-
-  val ith_is_line_terminator : i:int -> env -> bool
-
-  val ith_is_implicit_semicolon : i:int -> env -> bool
-
-  val ith_is_identifier : i:int -> env -> bool
-
-  val ith_is_identifier_name : i:int -> env -> bool
-
-  val ith_is_type_identifier : i:int -> env -> bool
-end
-
-module Eat : sig
-  val token : env -> unit
-
-  val maybe : env -> Token.t -> bool
-
-  val push_lex_mode : env -> Lex_mode.t -> unit
-
-  val pop_lex_mode : env -> unit
-
-  val double_pop_lex_mode : env -> unit
-
-  val trailing_comments : env -> Loc.t Flow_ast.Comment.t list
-
-  val comments_until_next_line : env -> Loc.t Flow_ast.Comment.t list
-
-  val program_comments : env -> Loc.t Flow_ast.Comment.t list
-end
-
-module Expect : sig
-  val get_error : env -> Token.t -> Loc.t * Parse_error.t
-
-  val error : env -> Token.t -> unit
-
-  val token : env -> Token.t -> unit
-
-  val token_opt : env -> Token.t -> unit
-
-  val token_maybe : env -> Token.t -> bool
-
-  val identifier : env -> string -> unit
-end
-
-module Try : sig
-  type 'a parse_result =
-    | ParsedSuccessfully of 'a
-    | FailedToParse
-
-  exception Rollback
-
-  val to_parse : env -> (env -> 'a) -> 'a parse_result
-
-  val or_else : env -> fallback:'a -> (env -> 'a) -> 'a
-end
diff --git a/jscomp/js_parser/parser_flow.ml b/jscomp/js_parser/parser_flow.ml
deleted file mode 100644
index f31f7c7..0000000
--- a/jscomp/js_parser/parser_flow.ml
+++ /dev/null
@@ -1,588 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Sedlexing = Flow_sedlexing
-module Ast = Flow_ast
-open Token
-open Parser_env
-open Parser_common
-
-(* Sometimes we add the same error for multiple different reasons. This is hard
-   to avoid, so instead we just filter the duplicates out. This function takes
-   a reversed list of errors and returns the list in forward order with dupes
-   removed. This differs from a set because the original order is preserved. *)
-let filter_duplicate_errors =
-  let module PrintableErrorSet = Set.Make (struct
-    type t = Loc.t * Parse_error.t
-
-    let compare (a_loc, a_error) (b_loc, b_error) =
-      let loc = Loc.compare a_loc b_loc in
-      if loc = 0 then
-        Parse_error.compare a_error b_error
-      else
-        loc
-  end) in
-  fun errs ->
-    let errs = List.rev errs in
-    let (_, deduped) =
-      List.fold_left
-        (fun (set, deduped) err ->
-          if PrintableErrorSet.mem err set then
-            (set, deduped)
-          else
-            (PrintableErrorSet.add err set, err :: deduped))
-        (PrintableErrorSet.empty, [])
-        errs
-    in
-    List.rev deduped
-
-let check_for_duplicate_exports =
-  let open Ast in
-  let record_export env seen (loc, { Identifier.name = export_name; comments = _ }) =
-    if export_name = "" then
-      (* empty identifiers signify an error, don't export it *)
-      seen
-    else if SSet.mem export_name seen then (
-      error_at env (loc, Parse_error.DuplicateExport export_name);
-      seen
-    ) else
-      SSet.add export_name seen
-  in
-  let extract_pattern_binding_names =
-    let rec fold acc =
-      let open Pattern in
-      function
-      | (_, Object { Object.properties; _ }) ->
-        List.fold_left
-          (fun acc prop ->
-            match prop with
-            | Object.Property (_, { Object.Property.pattern; _ })
-            | Object.RestElement (_, { RestElement.argument = pattern; comments = _ }) ->
-              fold acc pattern)
-          acc
-          properties
-      | (_, Array { Array.elements; _ }) ->
-        List.fold_left
-          (fun acc elem ->
-            match elem with
-            | Array.Element (_, { Array.Element.argument = pattern; default = _ })
-            | Array.RestElement (_, { RestElement.argument = pattern; comments = _ }) ->
-              fold acc pattern
-            | Array.Hole _ -> acc)
-          acc
-          elements
-      | (_, Identifier { Pattern.Identifier.name; _ }) -> name :: acc
-      | (_, Expression _) -> failwith "Parser error: No such thing as an expression pattern!"
-    in
-    List.fold_left fold
-  in
-  let record_export_of_statement env seen decl =
-    match decl with
-    | (_, Statement.ExportDefaultDeclaration { Statement.ExportDefaultDeclaration.default; _ }) ->
-      record_export env seen (Flow_ast_utils.ident_of_source (default, "default"))
-    | ( _,
-        Statement.ExportNamedDeclaration
-          { Statement.ExportNamedDeclaration.specifiers = Some specifiers; declaration = None; _ }
-      ) ->
-      let open Statement.ExportNamedDeclaration in
-      (match specifiers with
-      | ExportSpecifiers specifiers ->
-        List.fold_left
-          (fun seen (_, { Statement.ExportNamedDeclaration.ExportSpecifier.local; exported }) ->
-            match exported with
-            | Some exported -> record_export env seen exported
-            | None -> record_export env seen local)
-          seen
-          specifiers
-      | ExportBatchSpecifier _ ->
-        (* doesn't export specific names *)
-        seen)
-    | ( _,
-        Statement.ExportNamedDeclaration
-          { Statement.ExportNamedDeclaration.specifiers = None; declaration = Some declaration; _ }
-      ) ->
-      (match declaration with
-      | ( loc,
-          ( Statement.TypeAlias { Statement.TypeAlias.id; _ }
-          | Statement.OpaqueType { Statement.OpaqueType.id; _ }
-          | Statement.InterfaceDeclaration { Statement.Interface.id; _ }
-          | Statement.ClassDeclaration { Class.id = Some id; _ }
-          | Statement.FunctionDeclaration { Function.id = Some id; _ }
-          | Statement.EnumDeclaration { Statement.EnumDeclaration.id; _ } )
-        ) ->
-        record_export
-          env
-          seen
-          (Flow_ast_utils.ident_of_source (loc, Flow_ast_utils.name_of_ident id))
-      | (_, Statement.VariableDeclaration { Statement.VariableDeclaration.declarations; _ }) ->
-        declarations
-        |> List.fold_left
-             (fun names (_, { Statement.VariableDeclaration.Declarator.id; _ }) ->
-               extract_pattern_binding_names names [id])
-             []
-        |> List.fold_left (record_export env) seen
-      | ( _,
-          Statement.(
-            ( Block _ | Break _
-            | ClassDeclaration { Class.id = None; _ }
-            | Continue _ | Debugger _ | DeclareClass _ | DeclareExportDeclaration _
-            | DeclareFunction _ | DeclareInterface _ | DeclareModule _ | DeclareModuleExports _
-            | DeclareTypeAlias _ | DeclareOpaqueType _ | DeclareVariable _ | DoWhile _ | Empty _
-            | ExportDefaultDeclaration _ | ExportNamedDeclaration _ | Expression _ | For _ | ForIn _
-            | ForOf _
-            | FunctionDeclaration { Function.id = None; _ }
-            | If _ | ImportDeclaration _ | Labeled _ | Return _ | Switch _ | Throw _ | Try _
-            | While _ | With _ ))
-        ) ->
-        (* these don't export names -- some are invalid, but the AST allows them *)
-        seen)
-    | ( _,
-        Statement.ExportNamedDeclaration
-          { Statement.ExportNamedDeclaration.declaration = None; specifiers = None; _ }
-      )
-    | ( _,
-        Statement.ExportNamedDeclaration
-          { Statement.ExportNamedDeclaration.declaration = Some _; specifiers = Some _; _ }
-      ) ->
-      (* impossible *)
-      seen
-    | ( _,
-        Statement.(
-          ( Block _ | Break _ | ClassDeclaration _ | Continue _ | Debugger _ | DeclareClass _
-          | DeclareExportDeclaration _ | DeclareFunction _ | DeclareInterface _ | DeclareModule _
-          | DeclareModuleExports _ | DeclareTypeAlias _ | DeclareOpaqueType _ | DeclareVariable _
-          | DoWhile _ | Empty _ | EnumDeclaration _ | Expression _ | For _ | ForIn _ | ForOf _
-          | FunctionDeclaration _ | If _ | ImportDeclaration _ | InterfaceDeclaration _ | Labeled _
-          | Return _ | Switch _ | Throw _ | Try _ | TypeAlias _ | OpaqueType _
-          | VariableDeclaration _ | While _ | With _ ))
-      ) ->
-      seen
-  in
-  (fun env stmts -> ignore (List.fold_left (record_export_of_statement env) SSet.empty stmts))
-
-module rec Parse : PARSER = struct
-  module Type = Type_parser.Type (Parse)
-  module Declaration = Declaration_parser.Declaration (Parse) (Type)
-  module Pattern_cover = Pattern_cover.Cover (Parse)
-  module Expression = Expression_parser.Expression (Parse) (Type) (Declaration) (Pattern_cover)
-  module Object = Object_parser.Object (Parse) (Type) (Declaration) (Expression) (Pattern_cover)
-
-  module Statement =
-    Statement_parser.Statement (Parse) (Type) (Declaration) (Object) (Pattern_cover)
-
-  module Pattern = Pattern_parser.Pattern (Parse) (Type)
-  module JSX = Jsx_parser.JSX (Parse)
-
-  let annot = Type.annotation
-
-  let identifier ?restricted_error env =
-    (match Peek.token env with
-    (* "let" is disallowed as an identifier in a few situations. 11.6.2.1
-       lists them out. It is always disallowed in strict mode *)
-    | T_LET when in_strict_mode env -> error env Parse_error.StrictReservedWord
-    | T_LET when no_let env -> error_unexpected env
-    | T_LET -> ()
-    (* `allow_await` means that `await` is allowed to be a keyword,
-       which makes it illegal to use as an identifier.
-       https://tc39.github.io/ecma262/#sec-identifiers-static-semantics-early-errors *)
-    | T_AWAIT when allow_await env -> error env Parse_error.UnexpectedReserved
-    | T_AWAIT -> ()
-    (* `allow_yield` means that `yield` is allowed to be a keyword,
-       which makes it illegal to use as an identifier.
-       https://tc39.github.io/ecma262/#sec-identifiers-static-semantics-early-errors *)
-    | T_YIELD when allow_yield env -> error env Parse_error.UnexpectedReserved
-    | T_YIELD when in_strict_mode env -> error env Parse_error.StrictReservedWord
-    | T_YIELD -> ()
-    | t when token_is_strict_reserved t -> strict_error env Parse_error.StrictReservedWord
-    | t when token_is_reserved t -> error_unexpected env
-    | t ->
-      (match restricted_error with
-      | Some err when token_is_restricted t -> strict_error env err
-      | _ -> ()));
-    identifier_name env
-
-  let rec program env =
-    let leading = Eat.program_comments env in
-    let stmts = module_body_with_directives env (fun _ -> false) in
-    let end_loc = Peek.loc env in
-    Expect.token env T_EOF;
-    check_for_duplicate_exports env stmts;
-    let loc =
-      match stmts with
-      | [] -> end_loc
-      | _ -> Loc.btwn (fst (List.hd stmts)) (fst (List.hd (List.rev stmts)))
-    in
-    let all_comments = List.rev (comments env) in
-    ( loc,
-      {
-        Ast.Program.statements = stmts;
-        comments = Flow_ast_utils.mk_comments_opt ~leading ();
-        all_comments;
-      }
-    )
-
-  and directives =
-    let check env token =
-      match token with
-      | T_STRING (loc, _, _, octal) ->
-        if octal then strict_error_at env (loc, Parse_error.StrictOctalLiteral)
-      | _ -> failwith ("Nooo: " ^ token_to_string token ^ "\n")
-    in
-    let rec statement_list env term_fn item_fn (string_tokens, stmts, contains_use_strict) =
-      match Peek.token env with
-      | T_EOF -> (env, string_tokens, stmts, contains_use_strict)
-      | t when term_fn t -> (env, string_tokens, stmts, contains_use_strict)
-      | T_STRING _ as string_token ->
-        let possible_directive = item_fn env in
-        let stmts = possible_directive :: stmts in
-        (match possible_directive with
-        | (loc, Ast.Statement.Expression { Ast.Statement.Expression.directive = Some raw; _ }) ->
-          (* 14.1.1 says that it has to be "use strict" without any
-             escapes, so "use\x20strict" is disallowed. *)
-          let strict = raw = "use strict" in
-          if strict && not (has_simple_parameters env) then
-            error_at env (loc, Parse_error.StrictParamNotSimple);
-          let env =
-            if strict then
-              with_strict true env
-            else
-              env
-          in
-          let string_tokens = string_token :: string_tokens in
-          statement_list env term_fn item_fn (string_tokens, stmts, contains_use_strict || strict)
-        | _ -> (env, string_tokens, stmts, contains_use_strict))
-      | _ -> (env, string_tokens, stmts, contains_use_strict)
-    in
-    fun env term_fn item_fn ->
-      let env = with_allow_directive true env in
-      let (env, string_tokens, stmts, contains_use_strict) =
-        statement_list env term_fn item_fn ([], [], false)
-      in
-      let env = with_allow_directive false env in
-      List.iter (check env) (List.rev string_tokens);
-      (env, stmts, contains_use_strict)
-
-  (* 15.2 *)
-  and module_item env =
-    let decorators = Object.decorator_list env in
-    match Peek.token env with
-    | T_EXPORT -> Statement.export_declaration ~decorators env
-    | T_IMPORT ->
-      error_on_decorators env decorators;
-      let statement =
-        match Peek.ith_token ~i:1 env with
-        | T_LPAREN (* import(...) *)
-        | T_PERIOD (* import.meta *) ->
-          Statement.expression env
-        | _ -> Statement.import_declaration env
-      in
-      statement
-    | T_DECLARE when Peek.ith_token ~i:1 env = T_EXPORT ->
-      error_on_decorators env decorators;
-      Statement.declare_export_declaration env
-    | _ -> statement_list_item env ~decorators
-
-  and module_body_with_directives env term_fn =
-    let (env, directives, _contains_use_strict) = directives env term_fn module_item in
-    let stmts = module_body ~term_fn env in
-    (* Prepend the directives *)
-    List.fold_left (fun acc stmt -> stmt :: acc) stmts directives
-
-  and module_body =
-    let rec module_item_list env term_fn acc =
-      match Peek.token env with
-      | T_EOF -> List.rev acc
-      | t when term_fn t -> List.rev acc
-      | _ -> module_item_list env term_fn (module_item env :: acc)
-    in
-    (fun ~term_fn env -> module_item_list env term_fn [])
-
-  and statement_list_with_directives ~term_fn env =
-    let (env, directives, contains_use_strict) = directives env term_fn statement_list_item in
-    let stmts = statement_list ~term_fn env in
-    (* Prepend the directives *)
-    let stmts = List.fold_left (fun acc stmt -> stmt :: acc) stmts directives in
-    (stmts, contains_use_strict)
-
-  and statement_list =
-    let rec statements env term_fn acc =
-      match Peek.token env with
-      | T_EOF -> List.rev acc
-      | t when term_fn t -> List.rev acc
-      | _ -> statements env term_fn (statement_list_item env :: acc)
-    in
-    (fun ~term_fn env -> statements env term_fn [])
-
-  and statement_list_item ?(decorators = []) env =
-    if not (Peek.is_class env) then error_on_decorators env decorators;
-    let open Statement in
-    match Peek.token env with
-    (* Remember kids, these look like statements but they're not
-       * statements... (see section 13) *)
-    | T_LET -> let_ env
-    | T_CONST -> const env
-    | _ when Peek.is_function env -> Declaration._function env
-    | _ when Peek.is_class env -> class_declaration env decorators
-    | T_INTERFACE -> interface env
-    | T_DECLARE -> declare env
-    | T_TYPE -> type_alias env
-    | T_OPAQUE -> opaque_type env
-    | T_ENUM when (parse_options env).enums -> Declaration.enum_declaration env
-    | _ -> statement env
-
-  and statement env =
-    let open Statement in
-    match Peek.token env with
-    | T_EOF ->
-      error_unexpected ~expected:"the start of a statement" env;
-      (Peek.loc env, Ast.Statement.Empty { Ast.Statement.Empty.comments = None })
-    | T_SEMICOLON -> empty env
-    | T_LCURLY -> block env
-    | T_VAR -> var env
-    | T_BREAK -> break env
-    | T_CONTINUE -> continue env
-    | T_DEBUGGER -> debugger env
-    | T_DO -> do_while env
-    | T_FOR -> for_ env
-    | T_IF -> if_ env
-    | T_RETURN -> return env
-    | T_SWITCH -> switch env
-    | T_THROW -> throw env
-    | T_TRY -> try_ env
-    | T_WHILE -> while_ env
-    | T_WITH -> with_ env
-    (* If we see an else then it's definitely an error, but we can probably
-     * assume that this is a malformed if statement that is missing the if *)
-    | T_ELSE -> if_ env
-    (* There are a bunch of tokens that aren't the start of any valid
-     * statement. We list them here in order to skip over them, rather than
-     * getting stuck *)
-    | T_COLON
-    | T_RPAREN
-    | T_RCURLY
-    | T_RBRACKET
-    | T_COMMA
-    | T_PERIOD
-    | T_PLING_PERIOD
-    | T_ARROW
-    | T_IN
-    | T_INSTANCEOF
-    | T_CATCH
-    | T_FINALLY
-    | T_CASE
-    | T_DEFAULT
-    | T_EXTENDS
-    | T_STATIC
-    | T_EXPORT
-    (* TODO *)
-    | T_ELLIPSIS ->
-      error_unexpected ~expected:"the start of a statement" env;
-      Eat.token env;
-      statement env
-    (* The rest of these patterns handle ExpressionStatement and its negative
-       lookaheads, which prevent ambiguities.
-       See https://tc39.github.io/ecma262/#sec-expression-statement *)
-    | _ when Peek.is_function env ->
-      let func = Declaration._function env in
-      function_as_statement_error_at env (fst func);
-      func
-    | T_LET when Peek.ith_token ~i:1 env = T_LBRACKET ->
-      (* `let [foo]` is ambiguous: either a let binding pattern, or a
-         member expression, so it is banned. *)
-      let loc = Loc.btwn (Peek.loc env) (Peek.ith_loc ~i:1 env) in
-      error_at env (loc, Parse_error.AmbiguousLetBracket);
-      Statement.expression env
-    (* recover as a member expression *)
-    | _ when Peek.is_identifier env -> maybe_labeled env
-    | _ when Peek.is_class env ->
-      error_unexpected env;
-      Eat.token env;
-      Statement.expression env
-    | _ -> Statement.expression env
-
-  and expression env =
-    let start_loc = Peek.loc env in
-    let expr = Expression.assignment env in
-    match Peek.token env with
-    | T_COMMA -> Expression.sequence env ~start_loc [expr]
-    | _ -> expr
-
-  and expression_or_pattern env =
-    let start_loc = Peek.loc env in
-    let expr_or_pattern = Expression.assignment_cover env in
-    match Peek.token env with
-    | T_COMMA ->
-      let expr = Pattern_cover.as_expression env expr_or_pattern in
-      let seq = Expression.sequence env ~start_loc [expr] in
-      Cover_expr seq
-    | _ -> expr_or_pattern
-
-  and conditional = Expression.conditional
-  and assignment = Expression.assignment
-  and left_hand_side = Expression.left_hand_side
-  and object_initializer = Object._initializer
-  and object_key = Object.key
-  and class_declaration = Object.class_declaration
-  and class_expression = Object.class_expression
-  and is_assignable_lhs = Expression.is_assignable_lhs
-  and number = Expression.number
-
-  and identifier_with_type =
-    let with_loc_helper no_optional restricted_error env =
-      let name = identifier ~restricted_error env in
-      let optional = (not no_optional) && Peek.token env = T_PLING in
-      if optional then (
-        if not (should_parse_types env) then error env Parse_error.UnexpectedTypeAnnotation;
-        Expect.token env T_PLING
-      );
-      let annot = Type.annotation_opt env in
-      Ast.Pattern.Identifier.{ name; optional; annot }
-    in
-    fun env ?(no_optional = false) restricted_error ->
-      with_loc (with_loc_helper no_optional restricted_error) env
-
-  and block_body env =
-    let start_loc = Peek.loc env in
-    let leading = Peek.comments env in
-    Expect.token env T_LCURLY;
-    let term_fn t = t = T_RCURLY in
-    let body = statement_list ~term_fn env in
-    let end_loc = Peek.loc env in
-    let internal =
-      if body = [] then
-        Peek.comments env
-      else
-        []
-    in
-    Expect.token env T_RCURLY;
-    let trailing = Eat.trailing_comments env in
-    ( Loc.btwn start_loc end_loc,
-      {
-        Ast.Statement.Block.body;
-        comments = Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-      }
-    )
-
-  and function_block_body ~expression =
-    with_loc_extra (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_LCURLY;
-        let term_fn t = t = T_RCURLY in
-        let (body, contains_use_strict) = statement_list_with_directives ~term_fn env in
-        let internal =
-          if body = [] then
-            Peek.comments env
-          else
-            []
-        in
-        Expect.token env T_RCURLY;
-        let trailing =
-          match (expression, Peek.token env) with
-          | (true, _)
-          | (_, (T_RCURLY | T_EOF)) ->
-            Eat.trailing_comments env
-          | _ when Peek.is_line_terminator env -> Eat.comments_until_next_line env
-          | _ -> []
-        in
-        let comments =
-          Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ()
-        in
-        ({ Ast.Statement.Block.body; comments }, contains_use_strict)
-    )
-
-  and jsx_element_or_fragment = JSX.element_or_fragment
-  and pattern = Pattern.pattern
-  and pattern_from_expr = Pattern.from_expr
-end
-
-(*****************************************************************************)
-(* Entry points *)
-(*****************************************************************************)
-let do_parse env parser fail =
-  let ast = parser env in
-  let error_list = filter_duplicate_errors (errors env) in
-  match error_list with
-  | e :: es when fail -> raise (Parse_error.Error (e, es))
-  | _ -> (ast, error_list)
-
-(* Makes the input parser expect EOF at the end. Use this to error on trailing
- * junk when parsing non-Program nodes. *)
-let with_eof parser env =
-  let ast = parser env in
-  Expect.token env T_EOF;
-  ast
-
-let parse_statement env fail = do_parse env (with_eof Parse.statement_list_item) fail
-let parse_expression env fail = do_parse env (with_eof Parse.expression) fail
-
-let parse_program fail ?(token_sink = None) ?(parse_options = None) filename content =
-  let env = init_env ~token_sink ~parse_options filename content in
-  do_parse env Parse.program fail
-
-let program ?(fail = true) ?(token_sink = None) ?(parse_options = None) content =
-  parse_program fail ~token_sink ~parse_options None content
-
-let program_file ?(fail = true) ?(token_sink = None) ?(parse_options = None) content filename =
-  parse_program fail ~token_sink ~parse_options filename content
-
-let parse_annot ?(parse_options = None) filename content =
-  let env = init_env ~token_sink:None ~parse_options filename content in
-  do_parse env Parse.annot false
-
-let package_json_file =
-  let parser env =
-    let (loc, obj, { if_expr; _ }) = Parse.object_initializer env in
-    List.iter (error_at env) if_expr;
-    (loc, obj)
-  in
-  fun ?(fail = true) ?(token_sink = None) ?(parse_options = None) content filename ->
-    let env = init_env ~token_sink ~parse_options filename content in
-    do_parse env parser fail
-
-(* even if fail=false, still raises an error on a totally invalid token, since
-   there's no legitimate fallback. *)
-let json_file =
-  let null_fallback _env =
-    Ast.Expression.Literal { Ast.Literal.value = Ast.Literal.Null; raw = "null"; comments = None }
-  in
-  let parser env =
-    match Peek.token env with
-    | T_LBRACKET
-    | T_LCURLY
-    | T_STRING _
-    | T_NUMBER _
-    | T_TRUE
-    | T_FALSE
-    | T_NULL ->
-      Parse.expression env
-    | T_MINUS ->
-      (match Peek.ith_token ~i:1 env with
-      | T_NUMBER _ -> Parse.expression env
-      | _ ->
-        error_unexpected ~expected:"a number" env;
-        with_loc null_fallback env)
-    | _ ->
-      error_unexpected ~expected:"a valid JSON value" env;
-      with_loc null_fallback env
-  in
-  fun ?(fail = true) ?(token_sink = None) ?(parse_options = None) content filename ->
-    let env = init_env ~token_sink ~parse_options filename content in
-    do_parse env parser fail
-
-let jsx_pragma_expression =
-  let left_hand_side env =
-    let ast = Parse.left_hand_side (with_no_new true env) in
-    Expect.token env T_EOF;
-    ast
-  in
-  fun content filename ->
-    let env = init_env ~token_sink:None ~parse_options:None filename content in
-    do_parse env left_hand_side true
-
-let string_is_valid_identifier_name str =
-  let lexbuf = Sedlexing.Utf8.from_string str in
-  Flow_lexer.is_valid_identifier_name lexbuf
diff --git a/jscomp/js_parser/pattern_cover.ml b/jscomp/js_parser/pattern_cover.ml
deleted file mode 100644
index bf307e4..0000000
--- a/jscomp/js_parser/pattern_cover.ml
+++ /dev/null
@@ -1,59 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-open Flow_ast
-open Parser_common
-open Parser_env
-
-module type COVER = sig
-  val as_expression : env -> pattern_cover -> (Loc.t, Loc.t) Expression.t
-
-  val as_pattern : ?err:Parse_error.t -> env -> pattern_cover -> (Loc.t, Loc.t) Pattern.t
-
-  val empty_errors : pattern_errors
-
-  val cons_error : Loc.t * Parse_error.t -> pattern_errors -> pattern_errors
-
-  val rev_append_errors : pattern_errors -> pattern_errors -> pattern_errors
-
-  val rev_errors : pattern_errors -> pattern_errors
-end
-
-module Cover (Parse : PARSER) : COVER = struct
-  let as_expression env = function
-    | Cover_expr expr -> expr
-    | Cover_patt (expr, { if_expr; if_patt = _ }) ->
-      List.iter (error_at env) if_expr;
-      expr
-
-  let as_pattern ?(err = Parse_error.InvalidLHSInAssignment) env cover =
-    let expr =
-      match cover with
-      | Cover_expr expr -> expr
-      | Cover_patt (expr, { if_expr = _; if_patt }) ->
-        List.iter (error_at env) if_patt;
-        expr
-    in
-    if not (Parse.is_assignable_lhs expr) then error_at env (fst expr, err);
-
-    (match expr with
-    | (loc, Flow_ast.Expression.Identifier (_, { Flow_ast.Identifier.name; comments = _ }))
-      when is_restricted name ->
-      strict_error_at env (loc, Parse_error.StrictLHSAssignment)
-    | _ -> ());
-
-    Parse.pattern_from_expr env expr
-
-  let empty_errors = { if_patt = []; if_expr = [] }
-
-  let cons_error err { if_patt; if_expr } = { if_patt = err :: if_patt; if_expr = err :: if_expr }
-
-  let rev_append_errors a b =
-    { if_patt = List.rev_append a.if_patt b.if_patt; if_expr = List.rev_append a.if_expr b.if_expr }
-
-  let rev_errors a = { if_patt = List.rev a.if_patt; if_expr = List.rev a.if_expr }
-end
diff --git a/jscomp/js_parser/pattern_parser.ml b/jscomp/js_parser/pattern_parser.ml
deleted file mode 100644
index 74a4aba..0000000
--- a/jscomp/js_parser/pattern_parser.ml
+++ /dev/null
@@ -1,397 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Ast = Flow_ast
-open Token
-open Parser_common
-open Parser_env
-open Flow_ast
-
-let missing_annot env = Ast.Type.Missing (Peek.loc_skip_lookahead env)
-
-module Pattern (Parse : Parser_common.PARSER) (Type : Type_parser.TYPE) = struct
-  (* Reinterpret various expressions as patterns.
-   * This is not the correct thing to do and is only used for assignment
-   * expressions. This should be removed and replaced ASAP.
-   *)
-  let rec object_from_expr =
-    let rec properties env acc =
-      let open Ast.Expression.Object in
-      function
-      | [] -> List.rev acc
-      | Property (loc, prop) :: remaining ->
-        let acc =
-          match prop with
-          | Property.Init { key; value; shorthand } ->
-            let open Ast.Expression in
-            let key =
-              match key with
-              | Property.Literal lit -> Pattern.Object.Property.Literal lit
-              | Property.Identifier id -> Pattern.Object.Property.Identifier id
-              | Property.PrivateName _ -> failwith "Internal Error: Found object private prop"
-              | Property.Computed key -> Pattern.Object.Property.Computed key
-            in
-            let (pattern, default) =
-              match value with
-              | (_loc, Assignment { Assignment.operator = None; left; right; comments = _ }) ->
-                (left, Some right)
-              | _ -> (from_expr env value, None)
-            in
-            Pattern.Object.Property
-              (loc, { Pattern.Object.Property.key; pattern; default; shorthand })
-            :: acc
-          | Property.Method { key = _; value = (loc, _) } ->
-            error_at env (loc, Parse_error.MethodInDestructuring);
-            acc
-          | Property.Get { key = _; value = (loc, _); comments = _ }
-          | Property.Set { key = _; value = (loc, _); comments = _ } ->
-            (* these should never happen *)
-            error_at env (loc, Parse_error.Unexpected "identifier");
-            acc
-        in
-        properties env acc remaining
-      | [SpreadProperty (loc, { SpreadProperty.argument; comments })] ->
-        let acc =
-          Pattern.Object.RestElement
-            (loc, { Pattern.RestElement.argument = from_expr env argument; comments })
-          :: acc
-        in
-        properties env acc []
-      | SpreadProperty (loc, _) :: remaining ->
-        error_at env (loc, Parse_error.PropertyAfterRestElement);
-        properties env acc remaining
-    in
-    fun env (loc, { Ast.Expression.Object.properties = props; comments }) ->
-      ( loc,
-        Pattern.(
-          Object
-            { Object.properties = properties env [] props; annot = missing_annot env; comments }
-        )
-      )
-
-  and array_from_expr =
-    (* Convert an Expression to a Pattern if it is a valid
-       DestructuringAssignmentTarget, which must be an Object, Array or
-       IsValidSimpleAssignmentTarget.
-       #sec-destructuring-assignment-static-semantics-early-errors *)
-    let assignment_target env ((loc, _) as expr) =
-      if Parse.is_assignable_lhs expr then
-        Some (from_expr env expr)
-      else (
-        error_at env (loc, Parse_error.InvalidLHSInAssignment);
-        None
-      )
-    in
-    let rec elements env acc =
-      let open Ast.Expression in
-      function
-      | [] -> List.rev acc
-      | [Array.Spread (loc, { SpreadElement.argument; comments })] ->
-        (* AssignmentRestElement is a DestructuringAssignmentTarget, see
-           #prod-AssignmentRestElement *)
-        let acc =
-          match assignment_target env argument with
-          | Some argument ->
-            Pattern.Array.RestElement (loc, { Pattern.RestElement.argument; comments }) :: acc
-          | None -> acc
-        in
-        elements env acc []
-      | Array.Spread (loc, _) :: remaining ->
-        error_at env (loc, Parse_error.ElementAfterRestElement);
-        elements env acc remaining
-      | Array.Expression (loc, Assignment { Assignment.operator = None; left; right; comments = _ })
-        :: remaining ->
-        (* AssignmentElement is a `DestructuringAssignmentTarget Initializer`, see
-           #prod-AssignmentElement *)
-        let acc =
-          Pattern.Array.Element
-            (loc, { Pattern.Array.Element.argument = left; default = Some right })
-          :: acc
-        in
-        elements env acc remaining
-      | Array.Expression expr :: remaining ->
-        (* AssignmentElement is a DestructuringAssignmentTarget, see
-           #prod-AssignmentElement *)
-        let acc =
-          match assignment_target env expr with
-          | Some ((loc, _) as expr) ->
-            let element =
-              Pattern.Array.Element (loc, { Pattern.Array.Element.argument = expr; default = None })
-            in
-            element :: acc
-          | None -> acc
-        in
-        elements env acc remaining
-      | Array.Hole loc :: remaining -> elements env (Pattern.Array.Hole loc :: acc) remaining
-    in
-    fun env (loc, { Ast.Expression.Array.elements = elems; comments }) ->
-      ( loc,
-        Pattern.Array
-          { Pattern.Array.elements = elements env [] elems; annot = missing_annot env; comments }
-      )
-
-  and from_expr env (loc, expr) =
-    let open Ast.Expression in
-    match expr with
-    | Object obj -> object_from_expr env (loc, obj)
-    | Array arr -> array_from_expr env (loc, arr)
-    | Identifier ((id_loc, { Identifier.name = string_val; comments = _ }) as name) ->
-      (* per #sec-destructuring-assignment-static-semantics-early-errors,
-         it is a syntax error if IsValidSimpleAssignmentTarget of this
-         IdentifierReference is false. That happens when `string_val` is
-         "eval" or "arguments" in strict mode. *)
-      if in_strict_mode env && is_restricted string_val then
-        error_at env (id_loc, Parse_error.StrictLHSAssignment)
-      (* per #prod-IdentifierReference, yield is only a valid
-         IdentifierReference when [~Yield], and await is only valid
-         when [~Await]. but per #sec-identifiers-static-semantics-early-errors,
-         they are already invalid in strict mode, which we should have
-         already errored about when parsing the expression that we're now
-         converting into a pattern. *)
-      else if not (in_strict_mode env) then
-        if allow_yield env && string_val = "yield" then
-          error_at env (id_loc, Parse_error.YieldAsIdentifierReference)
-        else if allow_await env && string_val = "await" then
-          error_at env (id_loc, Parse_error.AwaitAsIdentifierReference);
-      ( loc,
-        Pattern.Identifier { Pattern.Identifier.name; annot = missing_annot env; optional = false }
-      )
-    | expr -> (loc, Pattern.Expression (loc, expr))
-
-  (* Parse object destructuring pattern *)
-  let rec object_ restricted_error =
-    let rest_property env =
-      let leading = Peek.comments env in
-      let (loc, argument) =
-        with_loc
-          (fun env ->
-            Expect.token env T_ELLIPSIS;
-            pattern env restricted_error)
-          env
-      in
-      Pattern.Object.RestElement
-        ( loc,
-          { Pattern.RestElement.argument; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-        )
-    in
-    let property_default env =
-      match Peek.token env with
-      | T_ASSIGN ->
-        Expect.token env T_ASSIGN;
-        Some (Parse.assignment env)
-      | _ -> None
-    in
-    let rec property env =
-      if Peek.token env = T_ELLIPSIS then
-        Some (rest_property env)
-      else
-        let start_loc = Peek.loc env in
-        let raw_key = Parse.object_key env in
-        match Peek.token env with
-        | T_COLON ->
-          Expect.token env T_COLON;
-          let (loc, (pattern, default)) =
-            with_loc
-              ~start_loc
-              (fun env ->
-                let pattern = pattern env restricted_error in
-                let default = property_default env in
-                (pattern, default))
-              env
-          in
-          let key =
-            let open Ast.Expression.Object.Property in
-            match raw_key with
-            | (_, Literal lit) -> Pattern.Object.Property.Literal lit
-            | (_, Identifier id) -> Pattern.Object.Property.Identifier id
-            | (_, PrivateName _) -> failwith "Internal Error: Found object private prop"
-            | (_, Computed key) -> Pattern.Object.Property.Computed key
-          in
-          Some
-            Pattern.Object.(Property (loc, Property.{ key; pattern; default; shorthand = false }))
-        | _ ->
-          (match raw_key with
-          | ( _,
-              Ast.Expression.Object.Property.Identifier
-                ((id_loc, { Identifier.name = string_val; comments = _ }) as name)
-            ) ->
-            (* #sec-identifiers-static-semantics-early-errors *)
-            if is_reserved string_val && string_val <> "yield" && string_val <> "await" then
-              (* it is a syntax error if `name` is a reserved word other than await or yield *)
-              error_at env (id_loc, Parse_error.UnexpectedReserved)
-            else if is_strict_reserved string_val then
-              (* it is a syntax error if `name` is a strict reserved word, in strict mode *)
-              strict_error_at env (id_loc, Parse_error.StrictReservedWord);
-            let (loc, (pattern, default)) =
-              with_loc
-                ~start_loc
-                (fun env ->
-                  let pattern =
-                    ( id_loc,
-                      Pattern.Identifier
-                        { Pattern.Identifier.name; annot = missing_annot env; optional = false }
-                    )
-                  in
-                  let default = property_default env in
-                  (pattern, default))
-                env
-            in
-            Some
-              Pattern.Object.(
-                Property
-                  ( loc,
-                    { Property.key = Property.Identifier name; pattern; default; shorthand = true }
-                  )
-              )
-          | _ ->
-            error_unexpected ~expected:"an identifier" env;
-
-            (* invalid shorthand destructuring *)
-            None)
-    (* seen_rest is true when we've seen a rest element. rest_trailing_comma is the location of
-     * the rest element's trailing command
-     * Trailing comma: `let { ...rest, } = obj`
-     * Still invalid, but not a trailing comma: `let { ...rest, x } = obj` *)
-    and properties env ~seen_rest ~rest_trailing_comma acc =
-      match Peek.token env with
-      | T_EOF
-      | T_RCURLY ->
-        begin
-          match rest_trailing_comma with
-          | Some loc -> error_at env (loc, Parse_error.TrailingCommaAfterRestElement)
-          | None -> ()
-        end;
-        List.rev acc
-      | _ ->
-        (match property env with
-        | Some ((Pattern.Object.Property (loc, _) | Pattern.Object.RestElement (loc, _)) as prop) ->
-          let rest_trailing_comma =
-            if seen_rest then (
-              error_at env (loc, Parse_error.PropertyAfterRestElement);
-              None
-            ) else
-              rest_trailing_comma
-          in
-          let (seen_rest, rest_trailing_comma) =
-            match prop with
-            | Pattern.Object.RestElement _ ->
-              ( true,
-                if Peek.token env = T_COMMA then
-                  Some (Peek.loc env)
-                else
-                  None
-              )
-            | _ -> (seen_rest, rest_trailing_comma)
-          in
-          if Peek.token env <> T_RCURLY then Expect.token env T_COMMA;
-          properties env ~seen_rest ~rest_trailing_comma (prop :: acc)
-        | None -> properties env ~seen_rest ~rest_trailing_comma acc)
-    in
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_LCURLY;
-        let properties = properties env ~seen_rest:false ~rest_trailing_comma:None [] in
-        let internal = Peek.comments env in
-        Expect.token env T_RCURLY;
-        let trailing = Eat.trailing_comments env in
-        let annot =
-          if Peek.token env = T_COLON then
-            Ast.Type.Available (Type.annotation env)
-          else
-            missing_annot env
-        in
-        Pattern.Object
-          {
-            Pattern.Object.properties;
-            annot;
-            comments = Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-          }
-    )
-
-  (* Parse array destructuring pattern *)
-  and array_ restricted_error =
-    let rec elements env acc =
-      match Peek.token env with
-      | T_EOF
-      | T_RBRACKET ->
-        List.rev acc
-      | T_COMMA ->
-        let loc = Peek.loc env in
-        Expect.token env T_COMMA;
-        elements env (Pattern.Array.Hole loc :: acc)
-      | T_ELLIPSIS ->
-        let leading = Peek.comments env in
-        let (loc, argument) =
-          with_loc
-            (fun env ->
-              Expect.token env T_ELLIPSIS;
-              pattern env restricted_error)
-            env
-        in
-        let element =
-          Pattern.Array.RestElement
-            ( loc,
-              {
-                Pattern.RestElement.argument;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ();
-              }
-            )
-        in
-        (* rest elements are always last, the closing ] should be next. but if not,
-           error and keep going so we recover gracefully by parsing the rest of the
-           elements. *)
-        if Peek.token env <> T_RBRACKET then (
-          error_at env (loc, Parse_error.ElementAfterRestElement);
-          if Peek.token env = T_COMMA then Eat.token env
-        );
-        elements env (element :: acc)
-      | _ ->
-        let (loc, (pattern, default)) =
-          with_loc
-            (fun env ->
-              let pattern = pattern env restricted_error in
-              let default =
-                match Peek.token env with
-                | T_ASSIGN ->
-                  Expect.token env T_ASSIGN;
-                  Some (Parse.assignment env)
-                | _ -> None
-              in
-              (pattern, default))
-            env
-        in
-        let element = Pattern.Array.(Element (loc, { Element.argument = pattern; default })) in
-        if Peek.token env <> T_RBRACKET then Expect.token env T_COMMA;
-        elements env (element :: acc)
-    in
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_LBRACKET;
-        let elements = elements env [] in
-        let internal = Peek.comments env in
-        Expect.token env T_RBRACKET;
-        let annot =
-          if Peek.token env = T_COLON then
-            Ast.Type.Available (Type.annotation env)
-          else
-            missing_annot env
-        in
-        let trailing = Eat.trailing_comments env in
-        let comments =
-          Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ()
-        in
-        Pattern.Array { Pattern.Array.elements; annot; comments }
-    )
-
-  and pattern env restricted_error =
-    match Peek.token env with
-    | T_LCURLY -> object_ restricted_error env
-    | T_LBRACKET -> array_ restricted_error env
-    | _ ->
-      let (loc, id) = Parse.identifier_with_type env restricted_error in
-      (loc, Pattern.Identifier id)
-end
diff --git a/jscomp/js_parser/primitive_deriving.ml b/jscomp/js_parser/primitive_deriving.ml
deleted file mode 100644
index db77258..0000000
--- a/jscomp/js_parser/primitive_deriving.ml
+++ /dev/null
@@ -1,39 +0,0 @@
-let equal_int (x : int) y = x = y
-let equal_string (x : string) y = x = y
-let equal_bool (x : bool) y = x = y
-let equal_float (x : float) y = x = y
-let equal_int64 (x : int64) y = x = y
-
-let equal_option f x y =
-  match x with
-  | None -> y = None
-  | Some x -> begin
-    match y with
-    | None -> false
-    | Some y -> f x y
-  end
-
-let compare_string (x : string) y = compare x y
-
-let compare_option cmp x y =
-  match x with
-  | None ->
-    (match y with
-    | None -> 0
-    | Some _ -> -1)
-  | Some x ->
-    (match y with
-    | None -> 1
-    | Some y -> cmp x y)
-
-let compare_bool (x : bool) (y : bool) = compare x y
-(* TODO : turn it into externals *)
-module Ppx_compare_lib = struct 
-  external polymorphic_compare : 'a -> 'a -> int = "%compare"
-  external phys_equal : 'a -> 'a -> bool = "%eq"
-  
-  external ( && ) : bool -> bool -> bool = "%sequand"
-
-  external   polymorphic_equal : 'a -> 'a -> bool = "%equal"
-end  
-
diff --git a/jscomp/js_parser/sedlex_LICENSE b/jscomp/js_parser/sedlex_LICENSE
deleted file mode 100644
index 630eb99..0000000
--- a/jscomp/js_parser/sedlex_LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright 2005, 2014 by Alain Frisch and LexiFi.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/jscomp/js_parser/statement_parser.ml b/jscomp/js_parser/statement_parser.ml
deleted file mode 100644
index d9d41be..0000000
--- a/jscomp/js_parser/statement_parser.ml
+++ /dev/null
@@ -1,2189 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Ast = Flow_ast
-open Token
-open Parser_env
-open Flow_ast
-open Parser_common
-open Comment_attachment
-
-module type STATEMENT = sig
-  val for_ : env -> (Loc.t, Loc.t) Statement.t
-
-  val if_ : env -> (Loc.t, Loc.t) Statement.t
-
-  val let_ : env -> (Loc.t, Loc.t) Statement.t
-
-  val try_ : env -> (Loc.t, Loc.t) Statement.t
-
-  val while_ : env -> (Loc.t, Loc.t) Statement.t
-
-  val with_ : env -> (Loc.t, Loc.t) Statement.t
-
-  val block : env -> (Loc.t, Loc.t) Statement.t
-
-  val break : env -> (Loc.t, Loc.t) Statement.t
-
-  val continue : env -> (Loc.t, Loc.t) Statement.t
-
-  val debugger : env -> (Loc.t, Loc.t) Statement.t
-
-  val declare : ?in_module:bool -> env -> (Loc.t, Loc.t) Statement.t
-
-  val declare_export_declaration : ?allow_export_type:bool -> env -> (Loc.t, Loc.t) Statement.t
-
-  val declare_opaque_type : env -> (Loc.t, Loc.t) Statement.t
-
-  val do_while : env -> (Loc.t, Loc.t) Statement.t
-
-  val empty : env -> (Loc.t, Loc.t) Statement.t
-
-  val export_declaration :
-    decorators:(Loc.t, Loc.t) Class.Decorator.t list -> env -> (Loc.t, Loc.t) Statement.t
-
-  val expression : env -> (Loc.t, Loc.t) Statement.t
-
-  val import_declaration : env -> (Loc.t, Loc.t) Statement.t
-
-  val interface : env -> (Loc.t, Loc.t) Statement.t
-
-  val maybe_labeled : env -> (Loc.t, Loc.t) Statement.t
-
-  val opaque_type : env -> (Loc.t, Loc.t) Statement.t
-
-  val return : env -> (Loc.t, Loc.t) Statement.t
-
-  val switch : env -> (Loc.t, Loc.t) Statement.t
-
-  val throw : env -> (Loc.t, Loc.t) Statement.t
-
-  val type_alias : env -> (Loc.t, Loc.t) Statement.t
-
-  val var : env -> (Loc.t, Loc.t) Statement.t
-
-  val const : env -> (Loc.t, Loc.t) Statement.t
-end
-
-module Statement
-    (Parse : PARSER)
-    (Type : Type_parser.TYPE)
-    (Declaration : Declaration_parser.DECLARATION)
-    (Object : Object_parser.OBJECT)
-    (Pattern_cover : Pattern_cover.COVER) : STATEMENT = struct
-  type for_lhs =
-    | For_expression of pattern_cover
-    | For_declaration of (Loc.t * (Loc.t, Loc.t) Ast.Statement.VariableDeclaration.t)
-
-  type semicolon_type =
-    | Explicit of Loc.t Comment.t list
-    | Implicit of Comment_attachment.trailing_and_remover_result
-
-  (* FunctionDeclaration is not a valid Statement, but Annex B sometimes allows it.
-     However, AsyncFunctionDeclaration and GeneratorFunctionDeclaration are never
-     allowed as statements. We still parse them as statements (and raise an error) to
-     recover gracefully. *)
-  let function_as_statement env =
-    let func = Declaration._function env in
-    ( if in_strict_mode env then
-      function_as_statement_error_at env (fst func)
-    else
-      let open Ast.Statement in
-      match func with
-      | (loc, FunctionDeclaration { Ast.Function.async = true; _ }) ->
-        error_at env (loc, Parse_error.AsyncFunctionAsStatement)
-      | (loc, FunctionDeclaration { Ast.Function.generator = true; _ }) ->
-        error_at env (loc, Parse_error.GeneratorFunctionAsStatement)
-      | _ -> ()
-    );
-    func
-
-  (* https://tc39.es/ecma262/#sec-exports-static-semantics-early-errors *)
-  let assert_identifier_name_is_identifier
-      ?restricted_error env (loc, { Ast.Identifier.name; comments = _ }) =
-    match name with
-    | "let" ->
-      (* "let" is disallowed as an identifier in a few situations. 11.6.2.1
-         lists them out. It is always disallowed in strict mode *)
-      if in_strict_mode env then
-        strict_error_at env (loc, Parse_error.StrictReservedWord)
-      else if no_let env then
-        error_at env (loc, Parse_error.Unexpected (Token.quote_token_value name))
-    | "await" ->
-      (* `allow_await` means that `await` is allowed to be a keyword,
-         which makes it illegal to use as an identifier.
-         https://tc39.github.io/ecma262/#sec-identifiers-static-semantics-early-errors *)
-      if allow_await env then error_at env (loc, Parse_error.UnexpectedReserved)
-    | "yield" ->
-      (* `allow_yield` means that `yield` is allowed to be a keyword,
-         which makes it illegal to use as an identifier.
-         https://tc39.github.io/ecma262/#sec-identifiers-static-semantics-early-errors *)
-      if allow_yield env then
-        error_at env (loc, Parse_error.UnexpectedReserved)
-      else
-        strict_error_at env (loc, Parse_error.StrictReservedWord)
-    | _ when is_strict_reserved name -> strict_error_at env (loc, Parse_error.StrictReservedWord)
-    | _ when is_reserved name ->
-      error_at env (loc, Parse_error.Unexpected (Token.quote_token_value name))
-    | _ ->
-      begin
-        match restricted_error with
-        | Some err when is_restricted name -> strict_error_at env (loc, err)
-        | _ -> ()
-      end
-
-  let string_literal env (loc, value, raw, octal) =
-    if octal then strict_error env Parse_error.StrictOctalLiteral;
-    let leading = Peek.comments env in
-    Expect.token env (T_STRING (loc, value, raw, octal));
-    let trailing = Eat.trailing_comments env in
-    ( loc,
-      { StringLiteral.value; raw; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-    )
-
-  (* Semicolon insertion is handled here :(. There seem to be 2 cases where
-   * semicolons are inserted. First, if we reach the EOF. Second, if the next
-   * token is } or is separated by a LineTerminator.
-   *)
-  let semicolon ?(expected = "the token `;`") ?(required = true) env =
-    match Peek.token env with
-    | T_EOF
-    | T_RCURLY ->
-      Implicit { trailing = Eat.trailing_comments env; remove_trailing = (fun x _ -> x) }
-    | T_SEMICOLON ->
-      Eat.token env;
-      (match Peek.token env with
-      | T_EOF
-      | T_RCURLY ->
-        Explicit (Eat.trailing_comments env)
-      | _ when Peek.is_line_terminator env -> Explicit (Eat.comments_until_next_line env)
-      | _ -> Explicit [])
-    | _ when Peek.is_line_terminator env ->
-      Implicit (Comment_attachment.trailing_and_remover_after_last_line env)
-    | _ ->
-      if required then error_unexpected ~expected env;
-      Explicit []
-
-  (* Consumes and returns the trailing comments after the end of a statement. Also returns
-     a remover that can remove all comments that are not trailing the previous token.
-
-     If a statement is the end of a block or file, all comments are trailing.
-     Otherwise, if a statement is followed by a new line, only comments on the current
-     line are trailing. If a statement is not followed by a new line, it does not have
-     trailing comments as they are instead leading comments for the next statement. *)
-  let statement_end_trailing_comments env =
-    match Peek.token env with
-    | T_EOF
-    | T_RCURLY ->
-      { trailing = Eat.trailing_comments env; remove_trailing = (fun x _ -> x) }
-    | _ when Peek.is_line_terminator env ->
-      Comment_attachment.trailing_and_remover_after_last_line env
-    | _ -> Comment_attachment.trailing_and_remover_after_last_loc env
-
-  let variable_declaration_end ~kind env declarations =
-    match semicolon env with
-    | Explicit comments -> (comments, declarations)
-    | Implicit { remove_trailing; _ } ->
-      (* Remove trailing comments from the last declarator *)
-      let declarations =
-        match List.rev declarations with
-        | [] -> []
-        | decl :: decls ->
-          let decl' =
-            remove_trailing decl (fun remover decl -> remover#variable_declarator ~kind decl)
-          in
-          List.rev (decl' :: decls)
-      in
-      ([], declarations)
-
-  let rec empty env =
-    let loc = Peek.loc env in
-    let leading = Peek.comments env in
-    Expect.token env T_SEMICOLON;
-    let { trailing; _ } = statement_end_trailing_comments env in
-    ( loc,
-      Statement.Empty
-        { Statement.Empty.comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-    )
-
-  and break env =
-    let leading = Peek.comments env in
-    let (loc, (label, trailing)) =
-      with_loc
-        (fun env ->
-          Expect.token env T_BREAK;
-          let label =
-            if Peek.token env = T_SEMICOLON || Peek.is_implicit_semicolon env then
-              None
-            else
-              let ((_, { Identifier.name; comments = _ }) as label) = Parse.identifier env in
-              if not (SSet.mem name (labels env)) then error env (Parse_error.UnknownLabel name);
-              Some label
-          in
-          let (trailing, label) =
-            match (semicolon env, label) with
-            | (Explicit trailing, _)
-            | (Implicit { trailing; _ }, None) ->
-              (trailing, label)
-            | (Implicit { remove_trailing; _ }, Some label) ->
-              ([], Some (remove_trailing label (fun remover label -> remover#identifier label)))
-          in
-          (label, trailing))
-        env
-    in
-    if label = None && not (in_loop env || in_switch env) then
-      error_at env (loc, Parse_error.IllegalBreak);
-    let comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () in
-    (loc, Statement.Break { Statement.Break.label; comments })
-
-  and continue env =
-    let leading = Peek.comments env in
-    let (loc, (label, trailing)) =
-      with_loc
-        (fun env ->
-          Expect.token env T_CONTINUE;
-          let label =
-            if Peek.token env = T_SEMICOLON || Peek.is_implicit_semicolon env then
-              None
-            else
-              let ((_, { Identifier.name; comments = _ }) as label) = Parse.identifier env in
-              if not (SSet.mem name (labels env)) then error env (Parse_error.UnknownLabel name);
-              Some label
-          in
-          let (trailing, label) =
-            match (semicolon env, label) with
-            | (Explicit trailing, _)
-            | (Implicit { trailing; _ }, None) ->
-              (trailing, label)
-            | (Implicit { remove_trailing; _ }, Some label) ->
-              ([], Some (remove_trailing label (fun remover label -> remover#identifier label)))
-          in
-          (label, trailing))
-        env
-    in
-    if not (in_loop env) then error_at env (loc, Parse_error.IllegalContinue);
-    ( loc,
-      Statement.Continue
-        {
-          Statement.Continue.label;
-          comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-        }
-    )
-
-  and debugger =
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_DEBUGGER;
-        let pre_semicolon_trailing =
-          if Peek.token env = T_SEMICOLON then
-            Eat.trailing_comments env
-          else
-            []
-        in
-        let trailing =
-          match semicolon env with
-          | Explicit trailing
-          | Implicit { trailing; _ } ->
-            pre_semicolon_trailing @ trailing
-        in
-        Statement.Debugger
-          { Statement.Debugger.comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-    )
-
-  and do_while =
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_DO;
-        let body = Parse.statement (env |> with_in_loop true) in
-        (* Annex B allows labelled FunctionDeclarations (see
-           sec-labelled-function-declarations), but not in IterationStatement
-           (see sec-semantics-static-semantics-early-errors). *)
-        if (not (in_strict_mode env)) && is_labelled_function body then
-          function_as_statement_error_at env (fst body);
-        let pre_keyword_trailing = Eat.trailing_comments env in
-        Expect.token env T_WHILE;
-        let pre_cond_trailing = Eat.trailing_comments env in
-        Expect.token env T_LPAREN;
-        let test = Parse.expression env in
-        Expect.token env T_RPAREN;
-        let past_cond_trailing =
-          if Peek.token env = T_SEMICOLON then
-            Eat.trailing_comments env
-          else
-            []
-        in
-        (* The rules of automatic semicolon insertion in ES5 don't mention this,
-         * but the semicolon after a do-while loop is optional. This is properly
-         * specified in ES6 *)
-        let past_cond_trailing =
-          match semicolon ~required:false env with
-          | Explicit trailing -> past_cond_trailing @ trailing
-          | Implicit { trailing; _ } -> trailing
-        in
-        let trailing = pre_keyword_trailing @ pre_cond_trailing @ past_cond_trailing in
-        Statement.DoWhile
-          {
-            Statement.DoWhile.body;
-            test;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-    )
-
-  and for_ =
-    let assert_can_be_forin_or_forof env err = function
-      | (loc, { Statement.VariableDeclaration.declarations; _ }) ->
-        (* Only a single declarator is allowed, without an init. So
-         * something like
-         *
-         * for (var x in y) {}
-         *
-         * is allowed, but we disallow
-         *
-         * for (var x, y in z) {}
-         * for (var x = 42 in y) {}
-         *)
-        (match declarations with
-        | [(_, { Statement.VariableDeclaration.Declarator.init = None; _ })] -> ()
-        | _ -> error_at env (loc, err))
-    in
-    (* Annex B allows labelled FunctionDeclarations (see
-       sec-labelled-function-declarations), but not in IterationStatement
-       (see sec-semantics-static-semantics-early-errors). *)
-    let assert_not_labelled_function env body =
-      if (not (in_strict_mode env)) && is_labelled_function body then
-        function_as_statement_error_at env (fst body)
-      else
-        ()
-    in
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_FOR;
-        let async = allow_await env && Eat.maybe env T_AWAIT in
-        let leading = leading @ Peek.comments env in
-        Expect.token env T_LPAREN;
-        let comments = Flow_ast_utils.mk_comments_opt ~leading () in
-        let (init, errs) =
-          let env = env |> with_no_in true in
-          match Peek.token env with
-          | T_SEMICOLON -> (None, [])
-          | T_LET ->
-            let (loc, (declarations, leading, errs)) = with_loc Declaration.let_ env in
-            ( Some
-                (For_declaration
-                   ( loc,
-                     {
-                       Statement.VariableDeclaration.kind = Statement.VariableDeclaration.Let;
-                       declarations;
-                       comments = Flow_ast_utils.mk_comments_opt ~leading ();
-                     }
-                   )
-                ),
-              errs
-            )
-          | T_CONST ->
-            let (loc, (declarations, leading, errs)) = with_loc Declaration.const env in
-            ( Some
-                (For_declaration
-                   ( loc,
-                     {
-                       Statement.VariableDeclaration.kind = Statement.VariableDeclaration.Const;
-                       declarations;
-                       comments = Flow_ast_utils.mk_comments_opt ~leading ();
-                     }
-                   )
-                ),
-              errs
-            )
-          | T_VAR ->
-            let (loc, (declarations, leading, errs)) = with_loc Declaration.var env in
-            ( Some
-                (For_declaration
-                   ( loc,
-                     {
-                       Statement.VariableDeclaration.kind = Statement.VariableDeclaration.Var;
-                       declarations;
-                       comments = Flow_ast_utils.mk_comments_opt ~leading ();
-                     }
-                   )
-                ),
-              errs
-            )
-          | _ ->
-            let expr = Parse.expression_or_pattern (env |> with_no_let true) in
-            (Some (For_expression expr), [])
-        in
-        match Peek.token env with
-        | T_OF ->
-          (* This is a for of loop *)
-          let left =
-            match init with
-            | Some (For_declaration decl) ->
-              assert_can_be_forin_or_forof env Parse_error.InvalidLHSInForOf decl;
-              Statement.ForOf.LeftDeclaration decl
-            | Some (For_expression expr) ->
-              (* #sec-for-in-and-for-of-statements-static-semantics-early-errors *)
-              let patt = Pattern_cover.as_pattern ~err:Parse_error.InvalidLHSInForOf env expr in
-              Statement.ForOf.LeftPattern patt
-            | None -> assert false
-          in
-          Expect.token env T_OF;
-          let right = Parse.assignment env in
-          Expect.token env T_RPAREN;
-          let body = Parse.statement (env |> with_in_loop true) in
-          assert_not_labelled_function env body;
-          Statement.ForOf { Statement.ForOf.left; right; body; await = async; comments }
-        | T_IN ->
-          (* This is a for in loop *)
-          let left =
-            match init with
-            | Some (For_declaration decl) ->
-              assert_can_be_forin_or_forof env Parse_error.InvalidLHSInForIn decl;
-              Statement.ForIn.LeftDeclaration decl
-            | Some (For_expression expr) ->
-              (* #sec-for-in-and-for-of-statements-static-semantics-early-errors *)
-              let patt = Pattern_cover.as_pattern ~err:Parse_error.InvalidLHSInForIn env expr in
-              Statement.ForIn.LeftPattern patt
-            | None -> assert false
-          in
-          if async then
-            (* If `async` is true, this should have been a for-await-of loop, but we
-               recover by trying to parse like a for-in loop. *)
-            Expect.token env T_OF
-          else
-            Expect.token env T_IN;
-          let right = Parse.expression env in
-          Expect.token env T_RPAREN;
-          let body = Parse.statement (env |> with_in_loop true) in
-          assert_not_labelled_function env body;
-          Statement.ForIn { Statement.ForIn.left; right; body; each = false; comments }
-        | _ ->
-          (* This is a for loop *)
-          errs |> List.iter (error_at env);
-          if async then
-            (* If `async` is true, this should have been a for-await-of loop, but we
-               recover by trying to parse like a normal loop. *)
-            Expect.token env T_OF
-          else
-            Expect.token env T_SEMICOLON;
-          let init =
-            match init with
-            | Some (For_declaration decl) -> Some (Statement.For.InitDeclaration decl)
-            | Some (For_expression expr) ->
-              Some (Statement.For.InitExpression (Pattern_cover.as_expression env expr))
-            | None -> None
-          in
-          let test =
-            match Peek.token env with
-            | T_SEMICOLON -> None
-            | _ -> Some (Parse.expression env)
-          in
-          Expect.token env T_SEMICOLON;
-          let update =
-            match Peek.token env with
-            | T_RPAREN -> None
-            | _ -> Some (Parse.expression env)
-          in
-          Expect.token env T_RPAREN;
-          let body = Parse.statement (env |> with_in_loop true) in
-          assert_not_labelled_function env body;
-          Statement.For { Statement.For.init; test; update; body; comments }
-    )
-
-  and if_ =
-    (*
-     * Either the consequent or alternate of an if statement
-     *)
-    let if_branch env =
-      (* Normally this would just be a Statement, but Annex B allows
-         FunctionDeclarations in non-strict mode. See
-         sec-functiondeclarations-in-ifstatement-statement-clauses *)
-      let stmt =
-        if Peek.is_function env then
-          function_as_statement env
-        else
-          Parse.statement env
-      in
-      (* Annex B allows labelled FunctionDeclarations in non-strict mode
-         (see sec-labelled-function-declarations), but not in IfStatement
-         (see sec-if-statement-static-semantics-early-errors). *)
-      if (not (in_strict_mode env)) && is_labelled_function stmt then
-        function_as_statement_error_at env (fst stmt);
-
-      stmt
-    in
-    let alternate env =
-      let leading = Peek.comments env in
-      Expect.token env T_ELSE;
-      let body = if_branch env in
-      { Statement.If.Alternate.body; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-    in
-    with_loc (fun env ->
-        let pre_if_leading = Peek.comments env in
-        Expect.token env T_IF;
-        let pre_cond_leading = Peek.comments env in
-        let leading = pre_if_leading @ pre_cond_leading in
-        Expect.token env T_LPAREN;
-        let test = Parse.expression env in
-        Expect.token env T_RPAREN;
-        let consequent = if_branch env in
-        let alternate =
-          if Peek.token env = T_ELSE then
-            Some (with_loc alternate env)
-          else
-            None
-        in
-        Statement.If
-          {
-            Statement.If.test;
-            consequent;
-            alternate;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ();
-          }
-    )
-
-  and return =
-    with_loc (fun env ->
-        if not (in_function env) then error env Parse_error.IllegalReturn;
-        let leading = Peek.comments env in
-        let start_loc = Peek.loc env in
-        Expect.token env T_RETURN;
-        let trailing =
-          if Peek.token env = T_SEMICOLON then
-            Eat.trailing_comments env
-          else
-            []
-        in
-        let argument =
-          if Peek.token env = T_SEMICOLON || Peek.is_implicit_semicolon env then
-            None
-          else
-            Some (Parse.expression env)
-        in
-        let return_out = Loc.btwn start_loc (Peek.loc env) in
-        let (trailing, argument) =
-          match (semicolon env, argument) with
-          | (Explicit comments, _)
-          | (Implicit { trailing = comments; _ }, None) ->
-            (trailing @ comments, argument)
-          | (Implicit { remove_trailing; _ }, Some arg) ->
-            (trailing, Some (remove_trailing arg (fun remover arg -> remover#expression arg)))
-        in
-        Statement.Return
-          {
-            Statement.Return.argument;
-            return_out;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-    )
-
-  and switch =
-    let case ~seen_default env =
-      let leading = Peek.comments env in
-      let (test, trailing) =
-        match Peek.token env with
-        | T_DEFAULT ->
-          if seen_default then error env Parse_error.MultipleDefaultsInSwitch;
-          Expect.token env T_DEFAULT;
-          (None, Eat.trailing_comments env)
-        | _ ->
-          Expect.token env T_CASE;
-          (Some (Parse.expression env), [])
-      in
-      let seen_default = seen_default || test = None in
-      Expect.token env T_COLON;
-      let { trailing = line_end_trailing; _ } = statement_end_trailing_comments env in
-      let trailing = trailing @ line_end_trailing in
-      let term_fn = function
-        | T_RCURLY
-        | T_DEFAULT
-        | T_CASE ->
-          true
-        | _ -> false
-      in
-      let consequent = Parse.statement_list ~term_fn (env |> with_in_switch true) in
-      let comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () in
-      let case = { Statement.Switch.Case.test; consequent; comments } in
-      (case, seen_default)
-    in
-    let rec case_list env (seen_default, acc) =
-      match Peek.token env with
-      | T_EOF
-      | T_RCURLY ->
-        List.rev acc
-      | _ ->
-        let (case_, seen_default) = with_loc_extra (case ~seen_default) env in
-        let acc = case_ :: acc in
-        case_list env (seen_default, acc)
-    in
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_SWITCH;
-        Expect.token env T_LPAREN;
-        let discriminant = Parse.expression env in
-        Expect.token env T_RPAREN;
-        Expect.token env T_LCURLY;
-        let cases = case_list env (false, []) in
-        Expect.token env T_RCURLY;
-        let { trailing; _ } = statement_end_trailing_comments env in
-        Statement.Switch
-          {
-            Statement.Switch.discriminant;
-            cases;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            exhaustive_out = fst discriminant;
-          }
-    )
-
-  and throw =
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        let start_loc = Peek.loc env in
-        Expect.token env T_THROW;
-        if Peek.is_line_terminator env then error_at env (start_loc, Parse_error.NewlineAfterThrow);
-        let argument = Parse.expression env in
-        let (trailing, argument) =
-          match semicolon env with
-          | Explicit trailing -> (trailing, argument)
-          | Implicit { remove_trailing; _ } ->
-            ([], remove_trailing argument (fun remover arg -> remover#expression arg))
-        in
-        let open Statement in
-        Throw { Throw.argument; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-    )
-
-  and try_ =
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_TRY;
-        let block =
-          let block = Parse.block_body env in
-          if Peek.token env = T_CATCH then
-            block_remove_trailing env block
-          else
-            block
-        in
-        let handler =
-          match Peek.token env with
-          | T_CATCH ->
-            let catch =
-              with_loc
-                (fun env ->
-                  let leading = Peek.comments env in
-                  Expect.token env T_CATCH;
-                  let trailing = Eat.trailing_comments env in
-                  let param =
-                    if Peek.token env = T_LPAREN then (
-                      Expect.token env T_LPAREN;
-                      let p = Some (Parse.pattern env Parse_error.StrictCatchVariable) in
-                      Expect.token env T_RPAREN;
-                      p
-                    ) else
-                      None
-                  in
-                  let body = Parse.block_body env in
-                  (* Fix trailing comment attachment if catch block is end of statement *)
-                  let body =
-                    if Peek.token env <> T_FINALLY then
-                      let { remove_trailing; _ } = statement_end_trailing_comments env in
-                      remove_trailing body (fun remover (loc, body) -> (loc, remover#block loc body))
-                    else
-                      body
-                  in
-                  {
-                    Ast.Statement.Try.CatchClause.param;
-                    body;
-                    comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-                  })
-                env
-            in
-            Some catch
-          | _ -> None
-        in
-        let finalizer =
-          match Peek.token env with
-          | T_FINALLY ->
-            Expect.token env T_FINALLY;
-            let (loc, body) = Parse.block_body env in
-            let { remove_trailing; _ } = statement_end_trailing_comments env in
-            let body = remove_trailing body (fun remover body -> remover#block loc body) in
-            Some (loc, body)
-          | _ -> None
-        in
-        (* No catch or finally? That's an error! *)
-        if handler = None && finalizer = None then
-          error_at env (fst block, Parse_error.NoCatchOrFinally);
-
-        Statement.Try
-          {
-            Statement.Try.block;
-            handler;
-            finalizer;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ();
-          }
-    )
-
-  and var =
-    with_loc (fun env ->
-        let kind = Statement.VariableDeclaration.Var in
-        let (declarations, leading, errs) = Declaration.var env in
-        let (trailing, declarations) = variable_declaration_end ~kind env declarations in
-        errs |> List.iter (error_at env);
-        Statement.VariableDeclaration
-          {
-            Statement.VariableDeclaration.kind;
-            declarations;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-    )
-
-  and const =
-    with_loc (fun env ->
-        let kind = Statement.VariableDeclaration.Const in
-        let (declarations, leading, errs) = Declaration.const env in
-        let (trailing, declarations) = variable_declaration_end ~kind env declarations in
-        errs |> List.iter (error_at env);
-        Statement.VariableDeclaration
-          {
-            Statement.VariableDeclaration.kind;
-            declarations;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-    )
-
-  and let_ =
-    with_loc (fun env ->
-        let kind = Statement.VariableDeclaration.Let in
-        let (declarations, leading, errs) = Declaration.let_ env in
-        let (trailing, declarations) = variable_declaration_end ~kind env declarations in
-        errs |> List.iter (error_at env);
-        Statement.VariableDeclaration
-          {
-            Statement.VariableDeclaration.kind;
-            declarations;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-    )
-
-  and while_ =
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_WHILE;
-        let leading = leading @ Peek.comments env in
-        Expect.token env T_LPAREN;
-        let test = Parse.expression env in
-        Expect.token env T_RPAREN;
-        let body = Parse.statement (env |> with_in_loop true) in
-        (* Annex B allows labelled FunctionDeclarations in non-strict mode
-           (see sec-labelled-function-declarations), but not in IterationStatement
-           (see sec-semantics-static-semantics-early-errors). *)
-        if (not (in_strict_mode env)) && is_labelled_function body then
-          function_as_statement_error_at env (fst body);
-        Statement.While
-          { Statement.While.test; body; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-    )
-
-  and with_ env =
-    let (loc, stmt) =
-      with_loc
-        (fun env ->
-          let leading = Peek.comments env in
-          Expect.token env T_WITH;
-          let leading = leading @ Peek.comments env in
-          Expect.token env T_LPAREN;
-          let _object = Parse.expression env in
-          Expect.token env T_RPAREN;
-          let body = Parse.statement env in
-          (* Annex B allows labelled FunctionDeclarations in non-strict mode
-             (see sec-labelled-function-declarations), but not in WithStatement
-             (see sec-with-statement-static-semantics-early-errors). *)
-          if (not (in_strict_mode env)) && is_labelled_function body then
-            function_as_statement_error_at env (fst body);
-          Statement.With
-            { Statement.With._object; body; comments = Flow_ast_utils.mk_comments_opt ~leading () })
-        env
-    in
-    strict_error_at env (loc, Parse_error.StrictModeWith);
-    (loc, stmt)
-
-  and block env =
-    let (loc, block) = Parse.block_body env in
-    let { remove_trailing; _ } = statement_end_trailing_comments env in
-    let block = remove_trailing block (fun remover block -> remover#block loc block) in
-    (loc, Statement.Block block)
-
-  and maybe_labeled =
-    with_loc (fun env ->
-        let leading = Peek.comments env in
-        match (Parse.expression env, Peek.token env) with
-        | ((loc, Ast.Expression.Identifier label), T_COLON) ->
-          let (_, { Identifier.name; comments = _ }) = label in
-          Expect.token env T_COLON;
-          if SSet.mem name (labels env) then
-            error_at env (loc, Parse_error.Redeclaration ("Label", name));
-          let env = add_label env name in
-          let body =
-            (* labelled FunctionDeclarations are allowed in non-strict mode
-               (see #sec-labelled-function-declarations) *)
-            if Peek.is_function env then
-              function_as_statement env
-            else
-              Parse.statement env
-          in
-          Statement.Labeled
-            { Statement.Labeled.label; body; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-        | (expression, _) ->
-          let (trailing, expression) =
-            match semicolon ~expected:"the end of an expression statement (`;`)" env with
-            | Explicit comments -> (comments, expression)
-            | Implicit { remove_trailing; _ } ->
-              ([], remove_trailing expression (fun remover expr -> remover#expression expr))
-          in
-          let open Statement in
-          Expression
-            {
-              Expression.expression;
-              directive = None;
-              comments = Flow_ast_utils.mk_comments_opt ~trailing ();
-            }
-    )
-
-  and expression =
-    with_loc (fun env ->
-        let expression = Parse.expression env in
-        let (trailing, expression) =
-          match semicolon ~expected:"the end of an expression statement (`;`)" env with
-          | Explicit comments -> (comments, expression)
-          | Implicit { remove_trailing; _ } ->
-            ([], remove_trailing expression (fun remover expr -> remover#expression expr))
-        in
-        let directive =
-          if allow_directive env then
-            match expression with
-            | (_, Ast.Expression.Literal { Ast.Literal.value = Ast.Literal.String _; raw; _ }) ->
-              (* the parser may recover from errors and generate unclosed strings, where
-                 the opening quote should be reliable but the closing one might not exist.
-                 be defensive. *)
-              if String.length raw > 1 && raw.[0] = raw.[String.length raw - 1] then
-                Some (String.sub raw 1 (String.length raw - 2))
-              else
-                None
-            | _ -> None
-          else
-            None
-        in
-        Statement.Expression
-          {
-            Statement.Expression.expression;
-            directive;
-            comments = Flow_ast_utils.mk_comments_opt ~trailing ();
-          }
-    )
-
-  and type_alias_helper ~leading env =
-    if not (should_parse_types env) then error env Parse_error.UnexpectedTypeAlias;
-    let leading = leading @ Peek.comments env in
-    Expect.token env T_TYPE;
-    Eat.push_lex_mode env Lex_mode.TYPE;
-    let id =
-      let id = Type.type_identifier env in
-      if Peek.token env = T_LESS_THAN then
-        id_remove_trailing env id
-      else
-        id
-    in
-    let tparams = Type.type_params env in
-    Expect.token env T_ASSIGN;
-    let right = Type._type env in
-    Eat.pop_lex_mode env;
-    let (trailing, right) =
-      match semicolon env with
-      | Explicit comments -> (comments, right)
-      | Implicit { remove_trailing; _ } ->
-        ([], remove_trailing right (fun remover right -> remover#type_ right))
-    in
-
-    {
-      Statement.TypeAlias.id;
-      tparams;
-      right;
-      comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-    }
-
-  and declare_type_alias env =
-    with_loc
-      (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_DECLARE;
-        let type_alias = type_alias_helper ~leading env in
-        Statement.DeclareTypeAlias type_alias)
-      env
-
-  (** Type aliases squeeze into an unambiguous unused portion of the grammar: `type` is not a
-      reserved word, so `type T` is otherwise two identifiers in a row and that's never valid JS.
-      However, if there's a line separator between the two, ASI makes it valid JS, so line
-      separators are disallowed. *)
-  and type_alias env =
-    if Peek.ith_is_identifier ~i:1 env && not (Peek.ith_is_implicit_semicolon ~i:1 env) then
-      let (loc, type_alias) = with_loc (type_alias_helper ~leading:[]) env in
-      (loc, Statement.TypeAlias type_alias)
-    else
-      Parse.statement env
-
-  and opaque_type_helper ?(declare = false) ~leading env =
-    if not (should_parse_types env) then error env Parse_error.UnexpectedOpaqueTypeAlias;
-    let leading_opaque = leading @ Peek.comments env in
-    Expect.token env T_OPAQUE;
-    let leading_type = Peek.comments env in
-    Expect.token env T_TYPE;
-    let leading = leading_opaque @ leading_type in
-    Eat.push_lex_mode env Lex_mode.TYPE;
-    let id =
-      let id = Type.type_identifier env in
-      if Peek.token env = T_LESS_THAN then
-        id_remove_trailing env id
-      else
-        id
-    in
-    let tparams = Type.type_params env in
-    let supertype =
-      match Peek.token env with
-      | T_COLON ->
-        Expect.token env T_COLON;
-        Some (Type._type env)
-      | _ -> None
-    in
-    let impltype =
-      if declare then
-        match Peek.token env with
-        | T_ASSIGN ->
-          error env Parse_error.DeclareOpaqueTypeInitializer;
-          Eat.token env;
-          if Peek.token env = T_SEMICOLON || Peek.is_implicit_semicolon env then
-            None
-          else
-            Some (Type._type env)
-        | _ -> None
-      else (
-        Expect.token env T_ASSIGN;
-        Some (Type._type env)
-      )
-    in
-    Eat.pop_lex_mode env;
-    let (trailing, id, tparams, supertype, impltype) =
-      match (semicolon env, tparams, supertype, impltype) with
-      (* opaque type Foo = Bar; *)
-      | (Explicit comments, _, _, _) -> (comments, id, tparams, supertype, impltype)
-      (* opaque type Foo = Bar *)
-      | (Implicit { remove_trailing; _ }, _, _, Some impl) ->
-        ( [],
-          id,
-          tparams,
-          supertype,
-          Some (remove_trailing impl (fun remover impl -> remover#type_ impl))
-        )
-      (* opaque type Foo: Super *)
-      | (Implicit { remove_trailing; _ }, _, Some super, None) ->
-        ( [],
-          id,
-          tparams,
-          Some (remove_trailing super (fun remover super -> remover#type_ super)),
-          None
-        )
-      (* opaque type Foo<T> *)
-      | (Implicit { remove_trailing; _ }, Some tparams, None, None) ->
-        ( [],
-          id,
-          Some (remove_trailing tparams (fun remover tparams -> remover#type_params tparams)),
-          None,
-          None
-        )
-      (* declare opaque type Foo *)
-      | (Implicit { remove_trailing; _ }, None, None, None) ->
-        ([], remove_trailing id (fun remover id -> remover#identifier id), None, None, None)
-    in
-
-    {
-      Statement.OpaqueType.id;
-      tparams;
-      impltype;
-      supertype;
-      comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-    }
-
-  and declare_opaque_type env =
-    with_loc
-      (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_DECLARE;
-        let opaque_t = opaque_type_helper ~declare:true ~leading env in
-        Statement.DeclareOpaqueType opaque_t)
-      env
-
-  and opaque_type env =
-    match Peek.ith_token ~i:1 env with
-    | T_TYPE ->
-      let (loc, opaque_t) = with_loc (opaque_type_helper ~declare:false ~leading:[]) env in
-      (loc, Statement.OpaqueType opaque_t)
-    | _ -> Parse.statement env
-
-  and interface_helper ~leading env =
-    if not (should_parse_types env) then error env Parse_error.UnexpectedTypeInterface;
-    let leading = leading @ Peek.comments env in
-    Expect.token env T_INTERFACE;
-    let id =
-      let id = Type.type_identifier env in
-      if Peek.token env = T_EXTENDS then
-        id
-      else
-        id_remove_trailing env id
-    in
-    let tparams =
-      let tparams = Type.type_params env in
-      if Peek.token env = T_EXTENDS then
-        tparams
-      else
-        type_params_remove_trailing env tparams
-    in
-    let (extends, body) = Type.interface_helper env in
-    let { remove_trailing; _ } = statement_end_trailing_comments env in
-    let body =
-      remove_trailing body (fun remover (loc, body) -> (loc, remover#object_type loc body))
-    in
-
-    {
-      Statement.Interface.id;
-      tparams;
-      body;
-      extends;
-      comments = Flow_ast_utils.mk_comments_opt ~leading ();
-    }
-
-  and declare_interface env =
-    with_loc
-      (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_DECLARE;
-        let iface = interface_helper ~leading env in
-        Statement.DeclareInterface iface)
-      env
-
-  and interface env =
-    (* disambiguate between a value named `interface`, like `var interface = 1; interface++`,
-       and an interface declaration like `interface Foo {}`.` *)
-    if Peek.ith_is_identifier_name ~i:1 env then
-      let (loc, iface) = with_loc (interface_helper ~leading:[]) env in
-      (loc, Statement.InterfaceDeclaration iface)
-    else
-      expression env
-
-  and declare_class =
-    let rec mixins env acc =
-      let super = Type.generic env in
-      let acc = super :: acc in
-      match Peek.token env with
-      | T_COMMA ->
-        Expect.token env T_COMMA;
-        mixins env acc
-      | _ -> List.rev acc
-      (* This is identical to `interface`, except that mixins are allowed *)
-    in
-    fun ~leading env ->
-      let env = env |> with_strict true in
-      let leading = leading @ Peek.comments env in
-      Expect.token env T_CLASS;
-      let id =
-        let id = Parse.identifier env in
-        match Peek.token env with
-        | T_LESS_THAN
-        | T_LCURLY ->
-          id_remove_trailing env id
-        | _ -> id
-      in
-      let tparams =
-        let tparams = Type.type_params env in
-        match Peek.token env with
-        | T_LCURLY -> type_params_remove_trailing env tparams
-        | _ -> tparams
-      in
-      let extends =
-        if Eat.maybe env T_EXTENDS then
-          let extends = Type.generic env in
-          match Peek.token env with
-          | T_LCURLY -> Some (generic_type_remove_trailing env extends)
-          | _ -> Some extends
-        else
-          None
-      in
-      let mixins =
-        match Peek.token env with
-        | T_IDENTIFIER { raw = "mixins"; _ } ->
-          Eat.token env;
-          let mixins = mixins env [] in
-          (match Peek.token env with
-          | T_LCURLY -> generic_type_list_remove_trailing env mixins
-          | _ -> mixins)
-        | _ -> []
-      in
-      let implements =
-        match Peek.token env with
-        | T_IMPLEMENTS ->
-          let implements = Object.class_implements env ~attach_leading:false in
-          (match Peek.token env with
-          | T_LCURLY -> Some (class_implements_remove_trailing env implements)
-          | _ -> Some implements)
-        | _ -> None
-      in
-      let body = Type._object ~is_class:true env in
-      let { remove_trailing; _ } = statement_end_trailing_comments env in
-      let body =
-        remove_trailing body (fun remover (loc, body) -> (loc, remover#object_type loc body))
-      in
-      let comments = Flow_ast_utils.mk_comments_opt ~leading () in
-      Statement.DeclareClass.{ id; tparams; body; extends; mixins; implements; comments }
-
-  and declare_class_statement env =
-    with_loc
-      (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_DECLARE;
-        let fn = declare_class ~leading env in
-        Statement.DeclareClass fn)
-      env
-
-  and declare_function ?(leading = []) env =
-    let leading = leading @ Peek.comments env in
-    Expect.token env T_FUNCTION;
-    let id = id_remove_trailing env (Parse.identifier env) in
-    let annot =
-      with_loc
-        (fun env ->
-          let tparams = type_params_remove_trailing env (Type.type_params env) in
-          let params = Type.function_param_list env in
-          Expect.token env T_COLON;
-          let return =
-            let return = Type._type env in
-            let has_predicate =
-              Eat.push_lex_mode env Lex_mode.TYPE;
-              let type_token = Peek.token env in
-              Eat.pop_lex_mode env;
-              type_token = T_CHECKS
-            in
-            if has_predicate then
-              type_remove_trailing env return
-            else
-              return
-          in
-          Ast.Type.(Function { Function.params; return; tparams; comments = None }))
-        env
-    in
-    let predicate = Type.predicate_opt env in
-    let (trailing, annot, predicate) =
-      match (semicolon env, predicate) with
-      | (Explicit comments, _) -> (comments, annot, predicate)
-      | (Implicit { remove_trailing; _ }, None) ->
-        ([], remove_trailing annot (fun remover annot -> remover#type_ annot), None)
-      | (Implicit { remove_trailing; _ }, Some pred) ->
-        ([], annot, Some (remove_trailing pred (fun remover pred -> remover#predicate pred)))
-    in
-    let annot = (fst annot, annot) in
-
-    {
-      Statement.DeclareFunction.id;
-      annot;
-      predicate;
-      comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-    }
-
-  and declare_function_statement env =
-    with_loc
-      (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_DECLARE;
-        begin
-          match Peek.token env with
-          | T_ASYNC ->
-            error env Parse_error.DeclareAsync;
-            Expect.token env T_ASYNC
-          | _ -> ()
-        end;
-        let fn = declare_function ~leading env in
-        Statement.DeclareFunction fn)
-      env
-
-  and declare_var env leading =
-    let leading = leading @ Peek.comments env in
-    Expect.token env T_VAR;
-    let name = Parse.identifier ~restricted_error:Parse_error.StrictVarName env in
-    let annot = Type.annotation env in
-    let (trailing, name, annot) =
-      match semicolon env with
-      (* declare var x; *)
-      | Explicit trailing -> (trailing, name, annot)
-      (* declare var x *)
-      | Implicit { remove_trailing; _ } ->
-        ([], name, remove_trailing annot (fun remover annot -> remover#type_annotation annot))
-    in
-
-    {
-      Statement.DeclareVariable.id = name;
-      annot;
-      comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-    }
-
-  and declare_var_statement env =
-    with_loc
-      (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_DECLARE;
-        let var = declare_var env leading in
-        Statement.DeclareVariable var)
-      env
-
-  and declare_module =
-    let rec module_items env ~module_kind acc =
-      match Peek.token env with
-      | T_EOF
-      | T_RCURLY ->
-        (module_kind, List.rev acc)
-      | _ ->
-        let stmt = declare ~in_module:true env in
-        (* TODO: This is a semantic analysis and shouldn't be in the parser *)
-        let module_kind =
-          let open Statement in
-          let (_loc, stmt) = stmt in
-          match (module_kind, stmt) with
-          (*
-           * The first time we see either a `declare export` or a
-           * `declare module.exports`, we lock in the kind of the module.
-           *
-           * `declare export type` and `declare export interface` are the two
-           * exceptions to this rule because they are valid in both CommonJS
-           * and ES modules (and thus do not indicate an intent for either).
-           *)
-          | (None, DeclareModuleExports _) -> Some DeclareModule.CommonJS
-          | (None, DeclareExportDeclaration { DeclareExportDeclaration.declaration; _ }) ->
-            (match declaration with
-            | Some (DeclareExportDeclaration.NamedType _)
-            | Some (DeclareExportDeclaration.Interface _) ->
-              module_kind
-            | _ -> Some DeclareModule.ES)
-          (*
-           * There should never be more than one `declare module.exports`
-           * statement *)
-          | (Some DeclareModule.CommonJS, DeclareModuleExports _) ->
-            error env Parse_error.DuplicateDeclareModuleExports;
-            module_kind
-          (*
-           * It's never ok to mix and match `declare export` and
-           * `declare module.exports` in the same module because it leaves the
-           * kind of the module (CommonJS vs ES) ambiguous.
-           *
-           * The 1 exception to this rule is that `export type/interface` are
-           * both ok in CommonJS modules.
-           *)
-          | (Some DeclareModule.ES, DeclareModuleExports _) ->
-            error env Parse_error.AmbiguousDeclareModuleKind;
-            module_kind
-          | ( Some DeclareModule.CommonJS,
-              DeclareExportDeclaration { DeclareExportDeclaration.declaration; _ }
-            ) ->
-            (match declaration with
-            | Some (DeclareExportDeclaration.NamedType _)
-            | Some (DeclareExportDeclaration.Interface _) ->
-              ()
-            | _ -> error env Parse_error.AmbiguousDeclareModuleKind);
-            module_kind
-          | _ -> module_kind
-        in
-        module_items env ~module_kind (stmt :: acc)
-    in
-    let declare_module_ ~leading env =
-      let id =
-        match Peek.token env with
-        | T_STRING str ->
-          Statement.DeclareModule.Literal
-            (string_literal_remove_trailing env (string_literal env str))
-        | _ -> Statement.DeclareModule.Identifier (id_remove_trailing env (Parse.identifier env))
-      in
-      let (body, module_kind) =
-        with_loc_extra
-          (fun env ->
-            let leading = Peek.comments env in
-            Expect.token env T_LCURLY;
-            let (module_kind, body) = module_items env ~module_kind:None [] in
-            let internal =
-              if body = [] then
-                Peek.comments env
-              else
-                []
-            in
-            Expect.token env T_RCURLY;
-            let { trailing; _ } = statement_end_trailing_comments env in
-            let comments =
-              Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ()
-            in
-            let body = { Statement.Block.body; comments } in
-            (body, module_kind))
-          env
-      in
-      let kind =
-        match module_kind with
-        | Some k -> k
-        | None -> Statement.DeclareModule.CommonJS
-      in
-      let comments = Flow_ast_utils.mk_comments_opt ~leading () in
-      Statement.(DeclareModule DeclareModule.{ id; body; kind; comments })
-    in
-    fun ~in_module env ->
-      let start_loc = Peek.loc env in
-      let leading = Peek.comments env in
-      Expect.token env T_DECLARE;
-      let leading = leading @ Peek.comments env in
-      Expect.identifier env "module";
-      if in_module || Peek.token env = T_PERIOD then
-        with_loc ~start_loc (declare_module_exports ~leading) env
-      else
-        with_loc ~start_loc (declare_module_ ~leading) env
-
-  and declare_module_exports ~leading env =
-    let leading_period = Peek.comments env in
-    Expect.token env T_PERIOD;
-    let leading_exports = Peek.comments env in
-    Expect.identifier env "exports";
-    let leading_annot = Peek.comments env in
-    let leading = List.concat [leading; leading_period; leading_exports; leading_annot] in
-    let annot = Type.annotation env in
-    let (annot, trailing) =
-      match semicolon env with
-      | Explicit trailing -> (annot, trailing)
-      | Implicit { remove_trailing; _ } ->
-        (remove_trailing annot (fun remover annot -> remover#type_annotation annot), [])
-    in
-    let comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () in
-    Statement.DeclareModuleExports { Statement.DeclareModuleExports.annot; comments }
-
-  and declare ?(in_module = false) env =
-    if not (should_parse_types env) then error env Parse_error.UnexpectedTypeDeclaration;
-
-    (* eventually, just emit a wrapper AST node *)
-    match Peek.ith_token ~i:1 env with
-    | T_CLASS -> declare_class_statement env
-    | T_INTERFACE -> declare_interface env
-    | T_TYPE ->
-      (match Peek.token env with
-      | T_IMPORT when in_module -> import_declaration env
-      | _ -> declare_type_alias env)
-    | T_OPAQUE -> declare_opaque_type env
-    | T_TYPEOF when Peek.token env = T_IMPORT -> import_declaration env
-    | T_FUNCTION
-    | T_ASYNC ->
-      declare_function_statement env
-    | T_VAR -> declare_var_statement env
-    | T_EXPORT when in_module -> declare_export_declaration ~allow_export_type:in_module env
-    | T_IDENTIFIER { raw = "module"; _ } -> declare_module ~in_module env
-    | _ when in_module ->
-      (match Peek.token env with
-      | T_IMPORT ->
-        error env Parse_error.InvalidNonTypeImportInDeclareModule;
-        Parse.statement env
-      | _ ->
-        (* Oh boy, found some bad stuff in a declare module. Let's just
-         * pretend it's a declare var (arbitrary choice) *)
-        declare_var_statement env)
-    | _ -> Parse.statement env
-
-  and export_source env =
-    Expect.identifier env "from";
-    match Peek.token env with
-    | T_STRING str -> string_literal env str
-    | _ ->
-      (* Just make up a string for the error case *)
-      let ret = (Peek.loc env, { StringLiteral.value = ""; raw = ""; comments = None }) in
-      error_unexpected ~expected:"a string" env;
-      ret
-
-  and export_source_and_semicolon env =
-    let (source_loc, source) = export_source env in
-    match semicolon env with
-    | Explicit trailing -> ((source_loc, source), trailing)
-    | Implicit { remove_trailing; _ } ->
-      ( ( source_loc,
-          remove_trailing source (fun remover source ->
-              remover#string_literal_type source_loc source
-          )
-        ),
-        []
-      )
-
-  and export_specifiers ?(preceding_comma = true) env specifiers =
-    match Peek.token env with
-    | T_EOF
-    | T_RCURLY ->
-      List.rev specifiers
-    | _ ->
-      if not preceding_comma then error env Parse_error.ExportSpecifierMissingComma;
-      let specifier =
-        with_loc
-          (fun env ->
-            let local = identifier_name env in
-            let exported =
-              match Peek.token env with
-              | T_IDENTIFIER { raw = "as"; _ } ->
-                Eat.token env;
-                Some (identifier_name env)
-              | _ -> None
-            in
-            { Statement.ExportNamedDeclaration.ExportSpecifier.local; exported })
-          env
-      in
-      let preceding_comma = Eat.maybe env T_COMMA in
-      export_specifiers ~preceding_comma env (specifier :: specifiers)
-
-  and assert_export_specifier_identifiers env specifiers =
-    Statement.ExportNamedDeclaration.ExportSpecifier.(
-      List.iter
-        (function
-          | (_, { local = id; exported = None }) ->
-            assert_identifier_name_is_identifier ~restricted_error:Parse_error.StrictVarName env id
-          | _ -> ())
-        specifiers
-    )
-
-  and export_declaration ~decorators env =
-    let env = env |> with_strict true |> with_in_export true in
-    let leading = Peek.comments env in
-    let start_loc = Peek.loc env in
-    Expect.token env T_EXPORT;
-    match Peek.token env with
-    | T_DEFAULT ->
-      (* export default ... *)
-      with_loc
-        ~start_loc
-        (fun env ->
-          let open Statement.ExportDefaultDeclaration in
-          let leading = leading @ Peek.comments env in
-          let (default, ()) = with_loc (fun env -> Expect.token env T_DEFAULT) env in
-          let env = with_in_export_default true env in
-          let (declaration, trailing) =
-            if Peek.is_function env then
-              (* export default [async] function [foo] (...) { ... } *)
-              let fn = Declaration._function env in
-              (Declaration fn, [])
-            else if Peek.is_class env then
-              (* export default class foo { ... } *)
-              let _class = Object.class_declaration env decorators in
-              (Declaration _class, [])
-            else if Peek.token env = T_ENUM then
-              (* export default enum foo { ... } *)
-              (Declaration (Declaration.enum_declaration env), [])
-            else
-              (* export default [assignment expression]; *)
-              let expr = Parse.assignment env in
-              let (expr, trailing) =
-                match semicolon env with
-                | Explicit trailing -> (expr, trailing)
-                | Implicit { remove_trailing; _ } ->
-                  (remove_trailing expr (fun remover expr -> remover#expression expr), [])
-              in
-              (Expression expr, trailing)
-          in
-          Statement.ExportDefaultDeclaration
-            {
-              default;
-              declaration;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            })
-        env
-    | T_TYPE when Peek.ith_token ~i:1 env <> T_LCURLY ->
-      (* export type ... *)
-      with_loc
-        ~start_loc
-        (fun env ->
-          let open Statement.ExportNamedDeclaration in
-          if not (should_parse_types env) then error env Parse_error.UnexpectedTypeExport;
-          match Peek.ith_token ~i:1 env with
-          | T_MULT ->
-            Expect.token env T_TYPE;
-            let specifier_loc = Peek.loc env in
-            Expect.token env T_MULT;
-            let (source, trailing) = export_source_and_semicolon env in
-            Statement.ExportNamedDeclaration
-              {
-                declaration = None;
-                specifiers = Some (ExportBatchSpecifier (specifier_loc, None));
-                source = Some source;
-                export_kind = Statement.ExportType;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-              }
-          | T_ENUM ->
-            error env Parse_error.EnumInvalidExport;
-            Expect.token env T_TYPE;
-            Statement.ExportNamedDeclaration
-              {
-                declaration = None;
-                specifiers = None;
-                source = None;
-                export_kind = Statement.ExportType;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ();
-              }
-          | _ ->
-            let (loc, type_alias) = with_loc (type_alias_helper ~leading:[]) env in
-            let type_alias = (loc, Statement.TypeAlias type_alias) in
-            Statement.ExportNamedDeclaration
-              {
-                declaration = Some type_alias;
-                specifiers = None;
-                source = None;
-                export_kind = Statement.ExportType;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ();
-              })
-        env
-    | T_OPAQUE ->
-      (* export opaque type ... *)
-      with_loc
-        ~start_loc
-        (fun env ->
-          let open Statement.ExportNamedDeclaration in
-          let (loc, opaque_t) = with_loc (opaque_type_helper ~leading:[]) env in
-          let opaque_t = (loc, Statement.OpaqueType opaque_t) in
-          Statement.ExportNamedDeclaration
-            {
-              declaration = Some opaque_t;
-              specifiers = None;
-              source = None;
-              export_kind = Statement.ExportType;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            })
-        env
-    | T_INTERFACE ->
-      (* export interface I { ... } *)
-      with_loc
-        ~start_loc
-        (fun env ->
-          let open Statement.ExportNamedDeclaration in
-          if not (should_parse_types env) then error env Parse_error.UnexpectedTypeExport;
-          let interface =
-            let (loc, iface) = with_loc (interface_helper ~leading:[]) env in
-            (loc, Statement.InterfaceDeclaration iface)
-          in
-          Statement.ExportNamedDeclaration
-            {
-              declaration = Some interface;
-              specifiers = None;
-              source = None;
-              export_kind = Statement.ExportType;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            })
-        env
-    | _ when Peek.is_class env ->
-      with_loc
-        ~start_loc
-        (fun env ->
-          let stmt = Object.class_declaration env decorators in
-          Statement.ExportNamedDeclaration
-            {
-              Statement.ExportNamedDeclaration.declaration = Some stmt;
-              specifiers = None;
-              source = None;
-              export_kind = Statement.ExportValue;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            })
-        env
-    | _ when Peek.is_function env ->
-      with_loc
-        ~start_loc
-        (fun env ->
-          error_on_decorators env decorators;
-          let stmt = Declaration._function env in
-          Statement.ExportNamedDeclaration
-            {
-              Statement.ExportNamedDeclaration.declaration = Some stmt;
-              specifiers = None;
-              source = None;
-              export_kind = Statement.ExportValue;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            })
-        env
-    | T_LET
-    | T_CONST
-    | T_VAR ->
-      with_loc
-        ~start_loc
-        (fun env ->
-          let stmt = Parse.statement_list_item env ~decorators in
-          Statement.ExportNamedDeclaration
-            {
-              Statement.ExportNamedDeclaration.declaration = Some stmt;
-              specifiers = None;
-              source = None;
-              export_kind = Statement.ExportValue;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            })
-        env
-    | T_ENUM when (parse_options env).enums ->
-      with_loc
-        ~start_loc
-        (fun env ->
-          let stmt = Parse.statement_list_item env ~decorators in
-          Statement.ExportNamedDeclaration
-            {
-              Statement.ExportNamedDeclaration.declaration = Some stmt;
-              specifiers = None;
-              source = None;
-              export_kind = Statement.ExportValue;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            })
-        env
-    | T_MULT ->
-      with_loc
-        ~start_loc
-        (fun env ->
-          let open Statement.ExportNamedDeclaration in
-          let loc = Peek.loc env in
-          Expect.token env T_MULT;
-          let local_name =
-            match Peek.token env with
-            | T_IDENTIFIER { raw = "as"; _ } ->
-              Eat.token env;
-              Some (Parse.identifier env)
-            | _ -> None
-          in
-          let specifiers = Some (ExportBatchSpecifier (loc, local_name)) in
-          let (source, trailing) = export_source_and_semicolon env in
-          Statement.ExportNamedDeclaration
-            {
-              declaration = None;
-              specifiers;
-              source = Some source;
-              export_kind = Statement.ExportValue;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            })
-        env
-    | _ ->
-      let open Statement.ExportNamedDeclaration in
-      let export_kind =
-        if Eat.maybe env T_TYPE then
-          Statement.ExportType
-        else
-          Statement.ExportValue
-      in
-      if Eat.maybe env T_LCURLY then
-        with_loc
-          ~start_loc
-          (fun env ->
-            let specifiers = export_specifiers env [] in
-            Expect.token env T_RCURLY;
-            let (source, trailing) =
-              match Peek.token env with
-              | T_IDENTIFIER { raw = "from"; _ } ->
-                let (source, trailing) = export_source_and_semicolon env in
-                (Some source, trailing)
-              | _ ->
-                assert_export_specifier_identifiers env specifiers;
-                let trailing =
-                  match semicolon env with
-                  | Explicit trailing -> trailing
-                  | Implicit { trailing; _ } -> trailing
-                in
-                (None, trailing)
-            in
-            Statement.ExportNamedDeclaration
-              {
-                declaration = None;
-                specifiers = Some (ExportSpecifiers specifiers);
-                source;
-                export_kind;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-              })
-          env
-      else (
-        (* error. recover by ignoring the `export` *)
-        error_unexpected ~expected:"a declaration, statement or export specifiers" env;
-        Parse.statement_list_item env ~decorators
-      )
-
-  and declare_export_declaration ?(allow_export_type = false) =
-    with_loc (fun env ->
-        if not (should_parse_types env) then error env Parse_error.UnexpectedTypeDeclaration;
-        let leading = Peek.comments env in
-        Expect.token env T_DECLARE;
-        let env = env |> with_strict true |> with_in_export true in
-        let leading = leading @ Peek.comments env in
-        Expect.token env T_EXPORT;
-        Statement.DeclareExportDeclaration.(
-          match Peek.token env with
-          | T_DEFAULT ->
-            (* declare export default ... *)
-            let leading = leading @ Peek.comments env in
-            let (default, ()) = with_loc (fun env -> Expect.token env T_DEFAULT) env in
-            let env = with_in_export_default true env in
-            let (declaration, trailing) =
-              match Peek.token env with
-              | T_FUNCTION ->
-                (* declare export default function foo (...): ...  *)
-                let fn = with_loc declare_function env in
-                (Some (Function fn), [])
-              | T_CLASS ->
-                (* declare export default class foo { ... } *)
-                let class_ = with_loc (declare_class ~leading:[]) env in
-                (Some (Class class_), [])
-              | _ ->
-                (* declare export default [type]; *)
-                let type_ = Type._type env in
-                let (type_, trailing) =
-                  match semicolon env with
-                  | Explicit trailing -> (type_, trailing)
-                  | Implicit { remove_trailing; _ } ->
-                    (remove_trailing type_ (fun remover type_ -> remover#type_ type_), [])
-                in
-                (Some (DefaultType type_), trailing)
-            in
-            let comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () in
-            Statement.DeclareExportDeclaration
-              { default = Some default; declaration; specifiers = None; source = None; comments }
-          | T_LET
-          | T_CONST
-          | T_VAR
-          | T_CLASS
-          | T_FUNCTION ->
-            let declaration =
-              match Peek.token env with
-              | T_FUNCTION ->
-                (* declare export function foo (...): ...  *)
-                let fn = with_loc declare_function env in
-                Some (Function fn)
-              | T_CLASS ->
-                (* declare export class foo { ... } *)
-                let class_ = with_loc (declare_class ~leading:[]) env in
-                Some (Class class_)
-              | (T_LET | T_CONST | T_VAR) as token ->
-                (match token with
-                | T_LET -> error env Parse_error.DeclareExportLet
-                | T_CONST -> error env Parse_error.DeclareExportConst
-                | _ -> ());
-
-                (* declare export var foo: ... *)
-                let var = with_loc (fun env -> declare_var env []) env in
-                Some (Variable var)
-              | _ -> assert false
-            in
-            let comments = Flow_ast_utils.mk_comments_opt ~leading () in
-            Statement.DeclareExportDeclaration
-              { default = None; declaration; specifiers = None; source = None; comments }
-          | T_MULT ->
-            (* declare export * from 'foo' *)
-            let loc = Peek.loc env in
-            Expect.token env T_MULT;
-            let local_name =
-              match Peek.token env with
-              | T_IDENTIFIER { raw = "as"; _ } ->
-                Eat.token env;
-                Some (Parse.identifier env)
-              | _ -> None
-            in
-            let specifiers =
-              Statement.ExportNamedDeclaration.(Some (ExportBatchSpecifier (loc, local_name)))
-            in
-            let (source, trailing) = export_source_and_semicolon env in
-            let comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () in
-            Statement.DeclareExportDeclaration
-              { default = None; declaration = None; specifiers; source = Some source; comments }
-          | T_TYPE when allow_export_type ->
-            (* declare export type = ... *)
-            let alias = with_loc (type_alias_helper ~leading:[]) env in
-            let comments = Flow_ast_utils.mk_comments_opt ~leading () in
-            Statement.DeclareExportDeclaration
-              {
-                default = None;
-                declaration = Some (NamedType alias);
-                specifiers = None;
-                source = None;
-                comments;
-              }
-          | T_OPAQUE ->
-            (* declare export opaque type = ... *)
-            let opaque = with_loc (opaque_type_helper ~declare:true ~leading:[]) env in
-            let comments = Flow_ast_utils.mk_comments_opt ~leading () in
-            Statement.DeclareExportDeclaration
-              {
-                default = None;
-                declaration = Some (NamedOpaqueType opaque);
-                specifiers = None;
-                source = None;
-                comments;
-              }
-          | T_INTERFACE when allow_export_type ->
-            (* declare export interface ... *)
-            let iface = with_loc (interface_helper ~leading:[]) env in
-            let comments = Flow_ast_utils.mk_comments_opt ~leading () in
-            Statement.DeclareExportDeclaration
-              {
-                default = None;
-                declaration = Some (Interface iface);
-                specifiers = None;
-                source = None;
-                comments;
-              }
-          | _ ->
-            (match Peek.token env with
-            | T_TYPE -> error env Parse_error.DeclareExportType
-            | T_INTERFACE -> error env Parse_error.DeclareExportInterface
-            | _ -> ());
-            Expect.token env T_LCURLY;
-            let specifiers = export_specifiers env [] in
-            Expect.token env T_RCURLY;
-            let (source, trailing) =
-              match Peek.token env with
-              | T_IDENTIFIER { raw = "from"; _ } ->
-                let (source, trailing) = export_source_and_semicolon env in
-                (Some source, trailing)
-              | _ ->
-                assert_export_specifier_identifiers env specifiers;
-                let trailing =
-                  match semicolon env with
-                  | Explicit trailing -> trailing
-                  | Implicit { trailing; _ } -> trailing
-                in
-                (None, trailing)
-            in
-            let comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () in
-            Statement.DeclareExportDeclaration
-              {
-                default = None;
-                declaration = None;
-                specifiers = Some (Statement.ExportNamedDeclaration.ExportSpecifiers specifiers);
-                source;
-                comments;
-              }
-        )
-    )
-
-  and import_declaration =
-    Statement.ImportDeclaration.(
-      let missing_source env =
-        (* Just make up a string for the error case *)
-        let loc = Peek.loc_skip_lookahead env in
-        (loc, { StringLiteral.value = ""; raw = ""; comments = None })
-      in
-      let source env =
-        match Peek.token env with
-        | T_IDENTIFIER { raw = "from"; _ } ->
-          Eat.token env;
-          (match Peek.token env with
-          | T_STRING str -> string_literal env str
-          | _ ->
-            error_unexpected ~expected:"a string" env;
-            missing_source env)
-        | _ ->
-          error_unexpected ~expected:"the keyword `from`" env;
-          missing_source env
-      in
-      let is_type_import = function
-        | T_TYPE
-        | T_TYPEOF ->
-          true
-        | _ -> false
-        (* `x` or `x as y` in a specifier *)
-      in
-      let with_maybe_as ~for_type ?error_if_type env =
-        let identifier env =
-          if for_type then
-            Type.type_identifier env
-          else
-            Parse.identifier env
-        in
-        match Peek.ith_token ~i:1 env with
-        | T_IDENTIFIER { raw = "as"; _ } ->
-          let remote = identifier_name env in
-          Eat.token env;
-
-          (* as *)
-          let local = Some (identifier env) in
-          (remote, local)
-        | T_EOF
-        | T_COMMA
-        | T_RCURLY ->
-          (identifier env, None)
-        | _ ->
-          begin
-            match (error_if_type, Peek.token env) with
-            | (Some error_if_type, T_TYPE)
-            | (Some error_if_type, T_TYPEOF) ->
-              error env error_if_type;
-              Eat.token env;
-
-              (* consume `type` or `typeof` *)
-              (Type.type_identifier env, None)
-            | _ -> (identifier env, None)
-          end
-        (*
-           ImportSpecifier[Type]:
-             [~Type] ImportedBinding
-             [~Type] IdentifierName ImportedTypeBinding
-             [~Type] IdentifierName IdentifierName ImportedBinding
-             [~Type] IdentifierName IdentifierName IdentifierName ImportedTypeBinding
-             [+Type] ImportedTypeBinding
-             [+Type] IdentifierName IdentifierName ImportedTypeBinding
-
-           Static Semantics:
-
-           `IdentifierName ImportedTypeBinding`:
-           - It is a Syntax Error if IdentifierName's StringValue is not "type" or "typeof"
-
-           `IdentifierName IdentifierName ImportedBinding`:
-           - It is a Syntax Error if the second IdentifierName's StringValue is not "as"
-
-           `IdentifierName IdentifierName IdentifierName  ImportedTypeBinding`:
-           - It is a Syntax Error if the first IdentifierName's StringValue is not "type"
-             or "typeof", and the third IdentifierName's StringValue is not "as"
-        *)
-      in
-
-      let specifier env =
-        let kind =
-          match Peek.token env with
-          | T_TYPE -> Some ImportType
-          | T_TYPEOF -> Some ImportTypeof
-          | _ -> None
-        in
-        if is_type_import (Peek.token env) then
-          (* consume `type`, but we don't know yet whether this is `type foo` or
-             `type as foo`. *)
-          let type_keyword_or_remote = identifier_name env in
-          match Peek.token env with
-          (* `type` (a value) *)
-          | T_EOF
-          | T_RCURLY
-          | T_COMMA ->
-            let remote = type_keyword_or_remote in
-            (* `type` becomes a value *)
-            assert_identifier_name_is_identifier env remote;
-            { remote; local = None; kind = None }
-          (* `type as foo` (value named `type`) or `type as,` (type named `as`) *)
-          | T_IDENTIFIER { raw = "as"; _ } ->
-            begin
-              match Peek.ith_token ~i:1 env with
-              | T_EOF
-              | T_RCURLY
-              | T_COMMA ->
-                (* `type as` *)
-                { remote = Type.type_identifier env; local = None; kind }
-              | T_IDENTIFIER { raw = "as"; _ } ->
-                (* `type as as foo` *)
-                let remote = identifier_name env in
-                (* first `as` *)
-                Eat.token env;
-
-                (* second `as` *)
-                let local = Some (Type.type_identifier env) in
-                (* `foo` *)
-                { remote; local; kind }
-              | _ ->
-                (* `type as foo` *)
-                let remote = type_keyword_or_remote in
-                (* `type` becomes a value *)
-                assert_identifier_name_is_identifier env remote;
-                Eat.token env;
-
-                (* `as` *)
-                let local = Some (Parse.identifier env) in
-                { remote; local; kind = None }
-            end
-          (* `type x`, or `type x as y` *)
-          | _ ->
-            let (remote, local) = with_maybe_as ~for_type:true env in
-            { remote; local; kind }
-        else
-          (* standard `x` or `x as y` *)
-          let (remote, local) = with_maybe_as ~for_type:false env in
-          { remote; local; kind = None }
-        (* specifier in an `import type { ... }` *)
-      in
-      let type_specifier env =
-        let (remote, local) =
-          with_maybe_as
-            env
-            ~for_type:true
-            ~error_if_type:Parse_error.ImportTypeShorthandOnlyInPureImport
-        in
-        { remote; local; kind = None }
-        (* specifier in an `import typeof { ... }` *)
-      in
-      let typeof_specifier env =
-        let (remote, local) =
-          with_maybe_as
-            env
-            ~for_type:true
-            ~error_if_type:Parse_error.ImportTypeShorthandOnlyInPureImport
-        in
-        { remote; local; kind = None }
-      in
-      let rec specifier_list ?(preceding_comma = true) env statement_kind acc =
-        match Peek.token env with
-        | T_EOF
-        | T_RCURLY ->
-          List.rev acc
-        | _ ->
-          if not preceding_comma then error env Parse_error.ImportSpecifierMissingComma;
-          let specifier =
-            match statement_kind with
-            | ImportType -> type_specifier env
-            | ImportTypeof -> typeof_specifier env
-            | ImportValue -> specifier env
-          in
-          let preceding_comma = Eat.maybe env T_COMMA in
-          specifier_list ~preceding_comma env statement_kind (specifier :: acc)
-      in
-      let named_or_namespace_specifier env import_kind =
-        match Peek.token env with
-        | T_MULT ->
-          let id =
-            with_loc_opt
-              (fun env ->
-                (* consume T_MULT *)
-                Eat.token env;
-                match Peek.token env with
-                | T_IDENTIFIER { raw = "as"; _ } ->
-                  (* consume "as" *)
-                  Eat.token env;
-                  (match import_kind with
-                  | ImportType
-                  | ImportTypeof ->
-                    Some (Type.type_identifier env)
-                  | ImportValue -> Some (Parse.identifier env))
-                | _ ->
-                  error_unexpected ~expected:"the keyword `as`" env;
-                  None)
-              env
-          in
-          (match id with
-          | Some id -> Some (ImportNamespaceSpecifier id)
-          | None -> None)
-        | _ ->
-          Expect.token env T_LCURLY;
-          let specifiers = specifier_list env import_kind [] in
-          Expect.token env T_RCURLY;
-          Some (ImportNamedSpecifiers specifiers)
-      in
-      let semicolon_and_trailing env source =
-        match semicolon env with
-        | Explicit trailing -> (trailing, source)
-        | Implicit { remove_trailing; _ } ->
-          ( [],
-            remove_trailing source (fun remover (loc, source) ->
-                (loc, remover#string_literal_type loc source)
-            )
-          )
-      in
-      let with_specifiers import_kind env leading =
-        let specifiers = named_or_namespace_specifier env import_kind in
-        let source = source env in
-        let (trailing, source) = semicolon_and_trailing env source in
-        Statement.ImportDeclaration
-          {
-            import_kind;
-            source;
-            specifiers;
-            default = None;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-      in
-      let with_default import_kind env leading =
-        let default_specifier =
-          match import_kind with
-          | ImportType
-          | ImportTypeof ->
-            Type.type_identifier env
-          | ImportValue -> Parse.identifier env
-        in
-        let additional_specifiers =
-          match Peek.token env with
-          | T_COMMA ->
-            (* `import Foo, ...` *)
-            Expect.token env T_COMMA;
-            named_or_namespace_specifier env import_kind
-          | _ -> None
-        in
-        let source = source env in
-        let (trailing, source) = semicolon_and_trailing env source in
-        Statement.ImportDeclaration
-          {
-            import_kind;
-            source;
-            specifiers = additional_specifiers;
-            default = Some default_specifier;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-      in
-      with_loc (fun env ->
-          let env = env |> with_strict true in
-          let leading = Peek.comments env in
-          Expect.token env T_IMPORT;
-
-          match Peek.token env with
-          (* `import * as ns from "ModuleName";` *)
-          | T_MULT -> with_specifiers ImportValue env leading
-          (* `import { ... } from "ModuleName";` *)
-          | T_LCURLY -> with_specifiers ImportValue env leading
-          (* `import "ModuleName";` *)
-          | T_STRING str ->
-            let source = string_literal env str in
-            let (trailing, source) = semicolon_and_trailing env source in
-            Statement.ImportDeclaration
-              {
-                import_kind = ImportValue;
-                source;
-                specifiers = None;
-                default = None;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-              }
-          (* `import type [...] from "ModuleName";`
-             note that if [...] is missing, we're importing a value named `type`! *)
-          | T_TYPE when should_parse_types env ->
-            begin
-              match Peek.ith_token ~i:1 env with
-              (* `import type, { other, names } from "ModuleName";` *)
-              | T_COMMA
-              (* `import type from "ModuleName";` *)
-              | T_IDENTIFIER { raw = "from"; _ } ->
-                (* Importing the exported value named "type". This is not a type-import.*)
-                with_default ImportValue env leading
-              (* `import type *` is invalid, since the namespace can't be a type *)
-              | T_MULT ->
-                (* consume `type` *)
-                Eat.token env;
-
-                (* unexpected `*` *)
-                error_unexpected env;
-
-                with_specifiers ImportType env leading
-              | T_LCURLY ->
-                (* consume `type` *)
-                Eat.token env;
-
-                with_specifiers ImportType env leading
-              | _ ->
-                (* consume `type` *)
-                Eat.token env;
-
-                with_default ImportType env leading
-            end
-          (* `import typeof ... from "ModuleName";` *)
-          | T_TYPEOF when should_parse_types env ->
-            Expect.token env T_TYPEOF;
-            begin
-              match Peek.token env with
-              | T_MULT
-              | T_LCURLY ->
-                with_specifiers ImportTypeof env leading
-              | _ -> with_default ImportTypeof env leading
-            end
-          (* import Foo from "ModuleName"; *)
-          | _ -> with_default ImportValue env leading
-      )
-    )
-end
diff --git a/jscomp/js_parser/token.ml b/jscomp/js_parser/token.ml
deleted file mode 100644
index fe5c667..0000000
--- a/jscomp/js_parser/token.ml
+++ /dev/null
@@ -1,996 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-open Primitive_deriving
-
-type t =
-  | T_NUMBER of {
-      kind: number_type;
-      raw: string;
-    }
-  | T_BIGINT of {
-      kind: bigint_type;
-      raw: string;
-    }
-  | T_STRING of (Loc.t * string * string * bool) (* loc, value, raw, octal *)
-  | T_TEMPLATE_PART of (Loc.t * template_part * bool) (* loc, value, is_tail *)
-  | T_IDENTIFIER of {
-      loc: Loc.t;
-      value: string;
-      raw: string;
-    }
-  | T_REGEXP of Loc.t * string * string (* /pattern/flags *)
-  (* Syntax *)
-  | T_LCURLY
-  | T_RCURLY
-  | T_LCURLYBAR
-  | T_RCURLYBAR
-  | T_LPAREN
-  | T_RPAREN
-  | T_LBRACKET
-  | T_RBRACKET
-  | T_SEMICOLON
-  | T_COMMA
-  | T_PERIOD
-  | T_ARROW
-  | T_ELLIPSIS
-  | T_AT
-  | T_POUND
-  (* Keywords *)
-  | T_FUNCTION
-  | T_IF
-  | T_IN
-  | T_INSTANCEOF
-  | T_RETURN
-  | T_SWITCH
-  | T_THIS
-  | T_THROW
-  | T_TRY
-  | T_VAR
-  | T_WHILE
-  | T_WITH
-  | T_CONST
-  | T_LET
-  | T_NULL
-  | T_FALSE
-  | T_TRUE
-  | T_BREAK
-  | T_CASE
-  | T_CATCH
-  | T_CONTINUE
-  | T_DEFAULT
-  | T_DO
-  | T_FINALLY
-  | T_FOR
-  | T_CLASS
-  | T_EXTENDS
-  | T_STATIC
-  | T_ELSE
-  | T_NEW
-  | T_DELETE
-  | T_TYPEOF
-  | T_VOID
-  | T_ENUM
-  | T_EXPORT
-  | T_IMPORT
-  | T_SUPER
-  | T_IMPLEMENTS
-  | T_INTERFACE
-  | T_PACKAGE
-  | T_PRIVATE
-  | T_PROTECTED
-  | T_PUBLIC
-  | T_YIELD
-  | T_DEBUGGER
-  | T_DECLARE
-  | T_TYPE
-  | T_OPAQUE
-  | T_OF
-  | T_ASYNC
-  | T_AWAIT
-  | T_CHECKS
-  (* Operators *)
-  | T_RSHIFT3_ASSIGN
-  | T_RSHIFT_ASSIGN
-  | T_LSHIFT_ASSIGN
-  | T_BIT_XOR_ASSIGN
-  | T_BIT_OR_ASSIGN
-  | T_BIT_AND_ASSIGN
-  | T_MOD_ASSIGN
-  | T_DIV_ASSIGN
-  | T_MULT_ASSIGN
-  | T_EXP_ASSIGN
-  | T_MINUS_ASSIGN
-  | T_PLUS_ASSIGN
-  | T_NULLISH_ASSIGN
-  | T_AND_ASSIGN
-  | T_OR_ASSIGN
-  | T_ASSIGN
-  | T_PLING_PERIOD
-  | T_PLING_PLING
-  | T_PLING
-  | T_COLON
-  | T_OR
-  | T_AND
-  | T_BIT_OR
-  | T_BIT_XOR
-  | T_BIT_AND
-  | T_EQUAL
-  | T_NOT_EQUAL
-  | T_STRICT_EQUAL
-  | T_STRICT_NOT_EQUAL
-  | T_LESS_THAN_EQUAL
-  | T_GREATER_THAN_EQUAL
-  | T_LESS_THAN
-  | T_GREATER_THAN
-  | T_LSHIFT
-  | T_RSHIFT
-  | T_RSHIFT3
-  | T_PLUS
-  | T_MINUS
-  | T_DIV
-  | T_MULT
-  | T_EXP
-  | T_MOD
-  | T_NOT
-  | T_BIT_NOT
-  | T_INCR
-  | T_DECR
-  (* Extra tokens *)
-  | T_ERROR of string
-  | T_EOF
-  (* JSX *)
-  | T_JSX_IDENTIFIER of {
-      raw: string;
-      loc: Loc.t;
-    }
-  | T_JSX_TEXT of Loc.t * string * string (* loc, value, raw *)
-  (* Type primitives *)
-  | T_ANY_TYPE
-  | T_MIXED_TYPE
-  | T_EMPTY_TYPE
-  | T_BOOLEAN_TYPE of bool_or_boolean
-  | T_NUMBER_TYPE
-  | T_BIGINT_TYPE
-  | T_NUMBER_SINGLETON_TYPE of {
-      kind: number_type;
-      value: float;
-      raw: string;
-    }
-  | T_BIGINT_SINGLETON_TYPE of {
-      kind: bigint_type;
-      value: int64 option;
-      raw: string;
-    }
-  | T_STRING_TYPE
-  | T_VOID_TYPE
-  | T_SYMBOL_TYPE
-
-(* `bool` and `boolean` are equivalent annotations, but we need to track
-   which one was used for when it might be an identifier, as in
-   `(bool: boolean) => void`. It's lexed as two T_BOOLEAN_TYPEs, then the
-   first one is converted into an identifier. *)
-and bool_or_boolean =
-  | BOOL
-  | BOOLEAN
-
-and number_type =
-  | BINARY
-  | LEGACY_OCTAL
-  | LEGACY_NON_OCTAL (* NonOctalDecimalIntegerLiteral in Annex B *)
-  | OCTAL
-  | NORMAL
-
-and bigint_type =
-  | BIG_BINARY
-  | BIG_OCTAL
-  | BIG_NORMAL
-
-and template_part = {
-  cooked: string;
-  (* string after processing special chars *)
-  raw: string;
-  (* string as specified in source *)
-  literal: string; (* same as raw, plus characters like ` and ${ *)
-}
-[@@deriving_inline equal]
-let _ = fun (_ : t) -> ()
-let _ = fun (_ : bool_or_boolean) -> ()
-let _ = fun (_ : number_type) -> ()
-let _ = fun (_ : bigint_type) -> ()
-let _ = fun (_ : template_part) -> ()
-let rec equal =
-  (fun a__001_ ->
-     fun b__002_ ->
-       if Ppx_compare_lib.phys_equal a__001_ b__002_
-       then true
-       else
-         (match (a__001_, b__002_) with
-          | (T_NUMBER _a__003_, T_NUMBER _b__004_) ->
-              Ppx_compare_lib.(&&)
-                (equal_number_type _a__003_.kind _b__004_.kind)
-                (equal_string _a__003_.raw _b__004_.raw)
-          | (T_NUMBER _, _) -> false
-          | (_, T_NUMBER _) -> false
-          | (T_BIGINT _a__005_, T_BIGINT _b__006_) ->
-              Ppx_compare_lib.(&&)
-                (equal_bigint_type _a__005_.kind _b__006_.kind)
-                (equal_string _a__005_.raw _b__006_.raw)
-          | (T_BIGINT _, _) -> false
-          | (_, T_BIGINT _) -> false
-          | (T_STRING _a__007_, T_STRING _b__008_) ->
-              let (t__009_, t__010_, t__011_, t__012_) = _a__007_ in
-              let (t__013_, t__014_, t__015_, t__016_) = _b__008_ in
-              Ppx_compare_lib.(&&) (Loc.equal t__009_ t__013_)
-                (Ppx_compare_lib.(&&) (equal_string t__010_ t__014_)
-                   (Ppx_compare_lib.(&&) (equal_string t__011_ t__015_)
-                      (equal_bool t__012_ t__016_)))
-          | (T_STRING _, _) -> false
-          | (_, T_STRING _) -> false
-          | (T_TEMPLATE_PART _a__017_, T_TEMPLATE_PART _b__018_) ->
-              let (t__019_, t__020_, t__021_) = _a__017_ in
-              let (t__022_, t__023_, t__024_) = _b__018_ in
-              Ppx_compare_lib.(&&) (Loc.equal t__019_ t__022_)
-                (Ppx_compare_lib.(&&) (equal_template_part t__020_ t__023_)
-                   (equal_bool t__021_ t__024_))
-          | (T_TEMPLATE_PART _, _) -> false
-          | (_, T_TEMPLATE_PART _) -> false
-          | (T_IDENTIFIER _a__025_, T_IDENTIFIER _b__026_) ->
-              Ppx_compare_lib.(&&) (Loc.equal _a__025_.loc _b__026_.loc)
-                (Ppx_compare_lib.(&&)
-                   (equal_string _a__025_.value _b__026_.value)
-                   (equal_string _a__025_.raw _b__026_.raw))
-          | (T_IDENTIFIER _, _) -> false
-          | (_, T_IDENTIFIER _) -> false
-          | (T_REGEXP (_a__027_, _a__029_, _a__031_), T_REGEXP
-             (_b__028_, _b__030_, _b__032_)) ->
-              Ppx_compare_lib.(&&) (Loc.equal _a__027_ _b__028_)
-                (Ppx_compare_lib.(&&) (equal_string _a__029_ _b__030_)
-                   (equal_string _a__031_ _b__032_))
-          | (T_REGEXP _, _) -> false
-          | (_, T_REGEXP _) -> false
-          | (T_LCURLY, T_LCURLY) -> true
-          | (T_LCURLY, _) -> false
-          | (_, T_LCURLY) -> false
-          | (T_RCURLY, T_RCURLY) -> true
-          | (T_RCURLY, _) -> false
-          | (_, T_RCURLY) -> false
-          | (T_LCURLYBAR, T_LCURLYBAR) -> true
-          | (T_LCURLYBAR, _) -> false
-          | (_, T_LCURLYBAR) -> false
-          | (T_RCURLYBAR, T_RCURLYBAR) -> true
-          | (T_RCURLYBAR, _) -> false
-          | (_, T_RCURLYBAR) -> false
-          | (T_LPAREN, T_LPAREN) -> true
-          | (T_LPAREN, _) -> false
-          | (_, T_LPAREN) -> false
-          | (T_RPAREN, T_RPAREN) -> true
-          | (T_RPAREN, _) -> false
-          | (_, T_RPAREN) -> false
-          | (T_LBRACKET, T_LBRACKET) -> true
-          | (T_LBRACKET, _) -> false
-          | (_, T_LBRACKET) -> false
-          | (T_RBRACKET, T_RBRACKET) -> true
-          | (T_RBRACKET, _) -> false
-          | (_, T_RBRACKET) -> false
-          | (T_SEMICOLON, T_SEMICOLON) -> true
-          | (T_SEMICOLON, _) -> false
-          | (_, T_SEMICOLON) -> false
-          | (T_COMMA, T_COMMA) -> true
-          | (T_COMMA, _) -> false
-          | (_, T_COMMA) -> false
-          | (T_PERIOD, T_PERIOD) -> true
-          | (T_PERIOD, _) -> false
-          | (_, T_PERIOD) -> false
-          | (T_ARROW, T_ARROW) -> true
-          | (T_ARROW, _) -> false
-          | (_, T_ARROW) -> false
-          | (T_ELLIPSIS, T_ELLIPSIS) -> true
-          | (T_ELLIPSIS, _) -> false
-          | (_, T_ELLIPSIS) -> false
-          | (T_AT, T_AT) -> true
-          | (T_AT, _) -> false
-          | (_, T_AT) -> false
-          | (T_POUND, T_POUND) -> true
-          | (T_POUND, _) -> false
-          | (_, T_POUND) -> false
-          | (T_FUNCTION, T_FUNCTION) -> true
-          | (T_FUNCTION, _) -> false
-          | (_, T_FUNCTION) -> false
-          | (T_IF, T_IF) -> true
-          | (T_IF, _) -> false
-          | (_, T_IF) -> false
-          | (T_IN, T_IN) -> true
-          | (T_IN, _) -> false
-          | (_, T_IN) -> false
-          | (T_INSTANCEOF, T_INSTANCEOF) -> true
-          | (T_INSTANCEOF, _) -> false
-          | (_, T_INSTANCEOF) -> false
-          | (T_RETURN, T_RETURN) -> true
-          | (T_RETURN, _) -> false
-          | (_, T_RETURN) -> false
-          | (T_SWITCH, T_SWITCH) -> true
-          | (T_SWITCH, _) -> false
-          | (_, T_SWITCH) -> false
-          | (T_THIS, T_THIS) -> true
-          | (T_THIS, _) -> false
-          | (_, T_THIS) -> false
-          | (T_THROW, T_THROW) -> true
-          | (T_THROW, _) -> false
-          | (_, T_THROW) -> false
-          | (T_TRY, T_TRY) -> true
-          | (T_TRY, _) -> false
-          | (_, T_TRY) -> false
-          | (T_VAR, T_VAR) -> true
-          | (T_VAR, _) -> false
-          | (_, T_VAR) -> false
-          | (T_WHILE, T_WHILE) -> true
-          | (T_WHILE, _) -> false
-          | (_, T_WHILE) -> false
-          | (T_WITH, T_WITH) -> true
-          | (T_WITH, _) -> false
-          | (_, T_WITH) -> false
-          | (T_CONST, T_CONST) -> true
-          | (T_CONST, _) -> false
-          | (_, T_CONST) -> false
-          | (T_LET, T_LET) -> true
-          | (T_LET, _) -> false
-          | (_, T_LET) -> false
-          | (T_NULL, T_NULL) -> true
-          | (T_NULL, _) -> false
-          | (_, T_NULL) -> false
-          | (T_FALSE, T_FALSE) -> true
-          | (T_FALSE, _) -> false
-          | (_, T_FALSE) -> false
-          | (T_TRUE, T_TRUE) -> true
-          | (T_TRUE, _) -> false
-          | (_, T_TRUE) -> false
-          | (T_BREAK, T_BREAK) -> true
-          | (T_BREAK, _) -> false
-          | (_, T_BREAK) -> false
-          | (T_CASE, T_CASE) -> true
-          | (T_CASE, _) -> false
-          | (_, T_CASE) -> false
-          | (T_CATCH, T_CATCH) -> true
-          | (T_CATCH, _) -> false
-          | (_, T_CATCH) -> false
-          | (T_CONTINUE, T_CONTINUE) -> true
-          | (T_CONTINUE, _) -> false
-          | (_, T_CONTINUE) -> false
-          | (T_DEFAULT, T_DEFAULT) -> true
-          | (T_DEFAULT, _) -> false
-          | (_, T_DEFAULT) -> false
-          | (T_DO, T_DO) -> true
-          | (T_DO, _) -> false
-          | (_, T_DO) -> false
-          | (T_FINALLY, T_FINALLY) -> true
-          | (T_FINALLY, _) -> false
-          | (_, T_FINALLY) -> false
-          | (T_FOR, T_FOR) -> true
-          | (T_FOR, _) -> false
-          | (_, T_FOR) -> false
-          | (T_CLASS, T_CLASS) -> true
-          | (T_CLASS, _) -> false
-          | (_, T_CLASS) -> false
-          | (T_EXTENDS, T_EXTENDS) -> true
-          | (T_EXTENDS, _) -> false
-          | (_, T_EXTENDS) -> false
-          | (T_STATIC, T_STATIC) -> true
-          | (T_STATIC, _) -> false
-          | (_, T_STATIC) -> false
-          | (T_ELSE, T_ELSE) -> true
-          | (T_ELSE, _) -> false
-          | (_, T_ELSE) -> false
-          | (T_NEW, T_NEW) -> true
-          | (T_NEW, _) -> false
-          | (_, T_NEW) -> false
-          | (T_DELETE, T_DELETE) -> true
-          | (T_DELETE, _) -> false
-          | (_, T_DELETE) -> false
-          | (T_TYPEOF, T_TYPEOF) -> true
-          | (T_TYPEOF, _) -> false
-          | (_, T_TYPEOF) -> false
-          | (T_VOID, T_VOID) -> true
-          | (T_VOID, _) -> false
-          | (_, T_VOID) -> false
-          | (T_ENUM, T_ENUM) -> true
-          | (T_ENUM, _) -> false
-          | (_, T_ENUM) -> false
-          | (T_EXPORT, T_EXPORT) -> true
-          | (T_EXPORT, _) -> false
-          | (_, T_EXPORT) -> false
-          | (T_IMPORT, T_IMPORT) -> true
-          | (T_IMPORT, _) -> false
-          | (_, T_IMPORT) -> false
-          | (T_SUPER, T_SUPER) -> true
-          | (T_SUPER, _) -> false
-          | (_, T_SUPER) -> false
-          | (T_IMPLEMENTS, T_IMPLEMENTS) -> true
-          | (T_IMPLEMENTS, _) -> false
-          | (_, T_IMPLEMENTS) -> false
-          | (T_INTERFACE, T_INTERFACE) -> true
-          | (T_INTERFACE, _) -> false
-          | (_, T_INTERFACE) -> false
-          | (T_PACKAGE, T_PACKAGE) -> true
-          | (T_PACKAGE, _) -> false
-          | (_, T_PACKAGE) -> false
-          | (T_PRIVATE, T_PRIVATE) -> true
-          | (T_PRIVATE, _) -> false
-          | (_, T_PRIVATE) -> false
-          | (T_PROTECTED, T_PROTECTED) -> true
-          | (T_PROTECTED, _) -> false
-          | (_, T_PROTECTED) -> false
-          | (T_PUBLIC, T_PUBLIC) -> true
-          | (T_PUBLIC, _) -> false
-          | (_, T_PUBLIC) -> false
-          | (T_YIELD, T_YIELD) -> true
-          | (T_YIELD, _) -> false
-          | (_, T_YIELD) -> false
-          | (T_DEBUGGER, T_DEBUGGER) -> true
-          | (T_DEBUGGER, _) -> false
-          | (_, T_DEBUGGER) -> false
-          | (T_DECLARE, T_DECLARE) -> true
-          | (T_DECLARE, _) -> false
-          | (_, T_DECLARE) -> false
-          | (T_TYPE, T_TYPE) -> true
-          | (T_TYPE, _) -> false
-          | (_, T_TYPE) -> false
-          | (T_OPAQUE, T_OPAQUE) -> true
-          | (T_OPAQUE, _) -> false
-          | (_, T_OPAQUE) -> false
-          | (T_OF, T_OF) -> true
-          | (T_OF, _) -> false
-          | (_, T_OF) -> false
-          | (T_ASYNC, T_ASYNC) -> true
-          | (T_ASYNC, _) -> false
-          | (_, T_ASYNC) -> false
-          | (T_AWAIT, T_AWAIT) -> true
-          | (T_AWAIT, _) -> false
-          | (_, T_AWAIT) -> false
-          | (T_CHECKS, T_CHECKS) -> true
-          | (T_CHECKS, _) -> false
-          | (_, T_CHECKS) -> false
-          | (T_RSHIFT3_ASSIGN, T_RSHIFT3_ASSIGN) -> true
-          | (T_RSHIFT3_ASSIGN, _) -> false
-          | (_, T_RSHIFT3_ASSIGN) -> false
-          | (T_RSHIFT_ASSIGN, T_RSHIFT_ASSIGN) -> true
-          | (T_RSHIFT_ASSIGN, _) -> false
-          | (_, T_RSHIFT_ASSIGN) -> false
-          | (T_LSHIFT_ASSIGN, T_LSHIFT_ASSIGN) -> true
-          | (T_LSHIFT_ASSIGN, _) -> false
-          | (_, T_LSHIFT_ASSIGN) -> false
-          | (T_BIT_XOR_ASSIGN, T_BIT_XOR_ASSIGN) -> true
-          | (T_BIT_XOR_ASSIGN, _) -> false
-          | (_, T_BIT_XOR_ASSIGN) -> false
-          | (T_BIT_OR_ASSIGN, T_BIT_OR_ASSIGN) -> true
-          | (T_BIT_OR_ASSIGN, _) -> false
-          | (_, T_BIT_OR_ASSIGN) -> false
-          | (T_BIT_AND_ASSIGN, T_BIT_AND_ASSIGN) -> true
-          | (T_BIT_AND_ASSIGN, _) -> false
-          | (_, T_BIT_AND_ASSIGN) -> false
-          | (T_MOD_ASSIGN, T_MOD_ASSIGN) -> true
-          | (T_MOD_ASSIGN, _) -> false
-          | (_, T_MOD_ASSIGN) -> false
-          | (T_DIV_ASSIGN, T_DIV_ASSIGN) -> true
-          | (T_DIV_ASSIGN, _) -> false
-          | (_, T_DIV_ASSIGN) -> false
-          | (T_MULT_ASSIGN, T_MULT_ASSIGN) -> true
-          | (T_MULT_ASSIGN, _) -> false
-          | (_, T_MULT_ASSIGN) -> false
-          | (T_EXP_ASSIGN, T_EXP_ASSIGN) -> true
-          | (T_EXP_ASSIGN, _) -> false
-          | (_, T_EXP_ASSIGN) -> false
-          | (T_MINUS_ASSIGN, T_MINUS_ASSIGN) -> true
-          | (T_MINUS_ASSIGN, _) -> false
-          | (_, T_MINUS_ASSIGN) -> false
-          | (T_PLUS_ASSIGN, T_PLUS_ASSIGN) -> true
-          | (T_PLUS_ASSIGN, _) -> false
-          | (_, T_PLUS_ASSIGN) -> false
-          | (T_NULLISH_ASSIGN, T_NULLISH_ASSIGN) -> true
-          | (T_NULLISH_ASSIGN, _) -> false
-          | (_, T_NULLISH_ASSIGN) -> false
-          | (T_AND_ASSIGN, T_AND_ASSIGN) -> true
-          | (T_AND_ASSIGN, _) -> false
-          | (_, T_AND_ASSIGN) -> false
-          | (T_OR_ASSIGN, T_OR_ASSIGN) -> true
-          | (T_OR_ASSIGN, _) -> false
-          | (_, T_OR_ASSIGN) -> false
-          | (T_ASSIGN, T_ASSIGN) -> true
-          | (T_ASSIGN, _) -> false
-          | (_, T_ASSIGN) -> false
-          | (T_PLING_PERIOD, T_PLING_PERIOD) -> true
-          | (T_PLING_PERIOD, _) -> false
-          | (_, T_PLING_PERIOD) -> false
-          | (T_PLING_PLING, T_PLING_PLING) -> true
-          | (T_PLING_PLING, _) -> false
-          | (_, T_PLING_PLING) -> false
-          | (T_PLING, T_PLING) -> true
-          | (T_PLING, _) -> false
-          | (_, T_PLING) -> false
-          | (T_COLON, T_COLON) -> true
-          | (T_COLON, _) -> false
-          | (_, T_COLON) -> false
-          | (T_OR, T_OR) -> true
-          | (T_OR, _) -> false
-          | (_, T_OR) -> false
-          | (T_AND, T_AND) -> true
-          | (T_AND, _) -> false
-          | (_, T_AND) -> false
-          | (T_BIT_OR, T_BIT_OR) -> true
-          | (T_BIT_OR, _) -> false
-          | (_, T_BIT_OR) -> false
-          | (T_BIT_XOR, T_BIT_XOR) -> true
-          | (T_BIT_XOR, _) -> false
-          | (_, T_BIT_XOR) -> false
-          | (T_BIT_AND, T_BIT_AND) -> true
-          | (T_BIT_AND, _) -> false
-          | (_, T_BIT_AND) -> false
-          | (T_EQUAL, T_EQUAL) -> true
-          | (T_EQUAL, _) -> false
-          | (_, T_EQUAL) -> false
-          | (T_NOT_EQUAL, T_NOT_EQUAL) -> true
-          | (T_NOT_EQUAL, _) -> false
-          | (_, T_NOT_EQUAL) -> false
-          | (T_STRICT_EQUAL, T_STRICT_EQUAL) -> true
-          | (T_STRICT_EQUAL, _) -> false
-          | (_, T_STRICT_EQUAL) -> false
-          | (T_STRICT_NOT_EQUAL, T_STRICT_NOT_EQUAL) -> true
-          | (T_STRICT_NOT_EQUAL, _) -> false
-          | (_, T_STRICT_NOT_EQUAL) -> false
-          | (T_LESS_THAN_EQUAL, T_LESS_THAN_EQUAL) -> true
-          | (T_LESS_THAN_EQUAL, _) -> false
-          | (_, T_LESS_THAN_EQUAL) -> false
-          | (T_GREATER_THAN_EQUAL, T_GREATER_THAN_EQUAL) -> true
-          | (T_GREATER_THAN_EQUAL, _) -> false
-          | (_, T_GREATER_THAN_EQUAL) -> false
-          | (T_LESS_THAN, T_LESS_THAN) -> true
-          | (T_LESS_THAN, _) -> false
-          | (_, T_LESS_THAN) -> false
-          | (T_GREATER_THAN, T_GREATER_THAN) -> true
-          | (T_GREATER_THAN, _) -> false
-          | (_, T_GREATER_THAN) -> false
-          | (T_LSHIFT, T_LSHIFT) -> true
-          | (T_LSHIFT, _) -> false
-          | (_, T_LSHIFT) -> false
-          | (T_RSHIFT, T_RSHIFT) -> true
-          | (T_RSHIFT, _) -> false
-          | (_, T_RSHIFT) -> false
-          | (T_RSHIFT3, T_RSHIFT3) -> true
-          | (T_RSHIFT3, _) -> false
-          | (_, T_RSHIFT3) -> false
-          | (T_PLUS, T_PLUS) -> true
-          | (T_PLUS, _) -> false
-          | (_, T_PLUS) -> false
-          | (T_MINUS, T_MINUS) -> true
-          | (T_MINUS, _) -> false
-          | (_, T_MINUS) -> false
-          | (T_DIV, T_DIV) -> true
-          | (T_DIV, _) -> false
-          | (_, T_DIV) -> false
-          | (T_MULT, T_MULT) -> true
-          | (T_MULT, _) -> false
-          | (_, T_MULT) -> false
-          | (T_EXP, T_EXP) -> true
-          | (T_EXP, _) -> false
-          | (_, T_EXP) -> false
-          | (T_MOD, T_MOD) -> true
-          | (T_MOD, _) -> false
-          | (_, T_MOD) -> false
-          | (T_NOT, T_NOT) -> true
-          | (T_NOT, _) -> false
-          | (_, T_NOT) -> false
-          | (T_BIT_NOT, T_BIT_NOT) -> true
-          | (T_BIT_NOT, _) -> false
-          | (_, T_BIT_NOT) -> false
-          | (T_INCR, T_INCR) -> true
-          | (T_INCR, _) -> false
-          | (_, T_INCR) -> false
-          | (T_DECR, T_DECR) -> true
-          | (T_DECR, _) -> false
-          | (_, T_DECR) -> false
-          | (T_ERROR _a__033_, T_ERROR _b__034_) ->
-              equal_string _a__033_ _b__034_
-          | (T_ERROR _, _) -> false
-          | (_, T_ERROR _) -> false
-          | (T_EOF, T_EOF) -> true
-          | (T_EOF, _) -> false
-          | (_, T_EOF) -> false
-          | (T_JSX_IDENTIFIER _a__035_, T_JSX_IDENTIFIER _b__036_) ->
-              Ppx_compare_lib.(&&) (equal_string _a__035_.raw _b__036_.raw)
-                (Loc.equal _a__035_.loc _b__036_.loc)
-          | (T_JSX_IDENTIFIER _, _) -> false
-          | (_, T_JSX_IDENTIFIER _) -> false
-          | (T_JSX_TEXT (_a__037_, _a__039_, _a__041_), T_JSX_TEXT
-             (_b__038_, _b__040_, _b__042_)) ->
-              Ppx_compare_lib.(&&) (Loc.equal _a__037_ _b__038_)
-                (Ppx_compare_lib.(&&) (equal_string _a__039_ _b__040_)
-                   (equal_string _a__041_ _b__042_))
-          | (T_JSX_TEXT _, _) -> false
-          | (_, T_JSX_TEXT _) -> false
-          | (T_ANY_TYPE, T_ANY_TYPE) -> true
-          | (T_ANY_TYPE, _) -> false
-          | (_, T_ANY_TYPE) -> false
-          | (T_MIXED_TYPE, T_MIXED_TYPE) -> true
-          | (T_MIXED_TYPE, _) -> false
-          | (_, T_MIXED_TYPE) -> false
-          | (T_EMPTY_TYPE, T_EMPTY_TYPE) -> true
-          | (T_EMPTY_TYPE, _) -> false
-          | (_, T_EMPTY_TYPE) -> false
-          | (T_BOOLEAN_TYPE _a__043_, T_BOOLEAN_TYPE _b__044_) ->
-              equal_bool_or_boolean _a__043_ _b__044_
-          | (T_BOOLEAN_TYPE _, _) -> false
-          | (_, T_BOOLEAN_TYPE _) -> false
-          | (T_NUMBER_TYPE, T_NUMBER_TYPE) -> true
-          | (T_NUMBER_TYPE, _) -> false
-          | (_, T_NUMBER_TYPE) -> false
-          | (T_BIGINT_TYPE, T_BIGINT_TYPE) -> true
-          | (T_BIGINT_TYPE, _) -> false
-          | (_, T_BIGINT_TYPE) -> false
-          | (T_NUMBER_SINGLETON_TYPE _a__045_, T_NUMBER_SINGLETON_TYPE
-             _b__046_) ->
-              Ppx_compare_lib.(&&)
-                (equal_number_type _a__045_.kind _b__046_.kind)
-                (Ppx_compare_lib.(&&)
-                   (equal_float _a__045_.value _b__046_.value)
-                   (equal_string _a__045_.raw _b__046_.raw))
-          | (T_NUMBER_SINGLETON_TYPE _, _) -> false
-          | (_, T_NUMBER_SINGLETON_TYPE _) -> false
-          | (T_BIGINT_SINGLETON_TYPE _a__047_, T_BIGINT_SINGLETON_TYPE
-             _b__048_) ->
-              Ppx_compare_lib.(&&)
-                (equal_bigint_type _a__047_.kind _b__048_.kind)
-                (Ppx_compare_lib.(&&)
-                   (equal_option equal_int64 _a__047_.value _b__048_.value)
-                   (equal_string _a__047_.raw _b__048_.raw))
-          | (T_BIGINT_SINGLETON_TYPE _, _) -> false
-          | (_, T_BIGINT_SINGLETON_TYPE _) -> false
-          | (T_STRING_TYPE, T_STRING_TYPE) -> true
-          | (T_STRING_TYPE, _) -> false
-          | (_, T_STRING_TYPE) -> false
-          | (T_VOID_TYPE, T_VOID_TYPE) -> true
-          | (T_VOID_TYPE, _) -> false
-          | (_, T_VOID_TYPE) -> false
-          | (T_SYMBOL_TYPE, T_SYMBOL_TYPE) -> true) : t -> t -> bool)
-and equal_bool_or_boolean =
-  (fun a__051_ ->
-     fun b__052_ -> Ppx_compare_lib.polymorphic_equal a__051_ b__052_ :
-  bool_or_boolean -> bool_or_boolean -> bool)
-and equal_number_type =
-  (fun a__053_ ->
-     fun b__054_ -> Ppx_compare_lib.polymorphic_equal a__053_ b__054_ :
-  number_type -> number_type -> bool)
-and equal_bigint_type =
-  (fun a__055_ ->
-     fun b__056_ -> Ppx_compare_lib.polymorphic_equal a__055_ b__056_ :
-  bigint_type -> bigint_type -> bool)
-and equal_template_part =
-  (fun a__057_ ->
-     fun b__058_ ->
-       if Ppx_compare_lib.phys_equal a__057_ b__058_
-       then true
-       else
-         Ppx_compare_lib.(&&) (equal_string a__057_.cooked b__058_.cooked)
-           (Ppx_compare_lib.(&&) (equal_string a__057_.raw b__058_.raw)
-              (equal_string a__057_.literal b__058_.literal)) : template_part
-                                                                  ->
-                                                                  template_part
-                                                                    ->
-                                                                    bool)
-let _ = equal
-and _ = equal_bool_or_boolean
-and _ = equal_number_type
-and _ = equal_bigint_type
-and _ = equal_template_part
-[@@@end]
-(*****************************************************************************)
-(* Pretty printer (pretty?) *)
-(*****************************************************************************)
-let token_to_string = function
-  | T_NUMBER _ -> "T_NUMBER"
-  | T_BIGINT _ -> "T_BIGINT"
-  | T_STRING _ -> "T_STRING"
-  | T_TEMPLATE_PART _ -> "T_TEMPLATE_PART"
-  | T_IDENTIFIER _ -> "T_IDENTIFIER"
-  | T_REGEXP _ -> "T_REGEXP"
-  | T_FUNCTION -> "T_FUNCTION"
-  | T_IF -> "T_IF"
-  | T_IN -> "T_IN"
-  | T_INSTANCEOF -> "T_INSTANCEOF"
-  | T_RETURN -> "T_RETURN"
-  | T_SWITCH -> "T_SWITCH"
-  | T_THIS -> "T_THIS"
-  | T_THROW -> "T_THROW"
-  | T_TRY -> "T_TRY"
-  | T_VAR -> "T_VAR"
-  | T_WHILE -> "T_WHILE"
-  | T_WITH -> "T_WITH"
-  | T_CONST -> "T_CONST"
-  | T_LET -> "T_LET"
-  | T_NULL -> "T_NULL"
-  | T_FALSE -> "T_FALSE"
-  | T_TRUE -> "T_TRUE"
-  | T_BREAK -> "T_BREAK"
-  | T_CASE -> "T_CASE"
-  | T_CATCH -> "T_CATCH"
-  | T_CONTINUE -> "T_CONTINUE"
-  | T_DEFAULT -> "T_DEFAULT"
-  | T_DO -> "T_DO"
-  | T_FINALLY -> "T_FINALLY"
-  | T_FOR -> "T_FOR"
-  | T_CLASS -> "T_CLASS"
-  | T_EXTENDS -> "T_EXTENDS"
-  | T_STATIC -> "T_STATIC"
-  | T_ELSE -> "T_ELSE"
-  | T_NEW -> "T_NEW"
-  | T_DELETE -> "T_DELETE"
-  | T_TYPEOF -> "T_TYPEOF"
-  | T_VOID -> "T_VOID"
-  | T_ENUM -> "T_ENUM"
-  | T_EXPORT -> "T_EXPORT"
-  | T_IMPORT -> "T_IMPORT"
-  | T_SUPER -> "T_SUPER"
-  | T_IMPLEMENTS -> "T_IMPLEMENTS"
-  | T_INTERFACE -> "T_INTERFACE"
-  | T_PACKAGE -> "T_PACKAGE"
-  | T_PRIVATE -> "T_PRIVATE"
-  | T_PROTECTED -> "T_PROTECTED"
-  | T_PUBLIC -> "T_PUBLIC"
-  | T_YIELD -> "T_YIELD"
-  | T_DEBUGGER -> "T_DEBUGGER"
-  | T_DECLARE -> "T_DECLARE"
-  | T_TYPE -> "T_TYPE"
-  | T_OPAQUE -> "T_OPAQUE"
-  | T_OF -> "T_OF"
-  | T_ASYNC -> "T_ASYNC"
-  | T_AWAIT -> "T_AWAIT"
-  | T_CHECKS -> "T_CHECKS"
-  | T_LCURLY -> "T_LCURLY"
-  | T_RCURLY -> "T_RCURLY"
-  | T_LCURLYBAR -> "T_LCURLYBAR"
-  | T_RCURLYBAR -> "T_RCURLYBAR"
-  | T_LPAREN -> "T_LPAREN"
-  | T_RPAREN -> "T_RPAREN"
-  | T_LBRACKET -> "T_LBRACKET"
-  | T_RBRACKET -> "T_RBRACKET"
-  | T_SEMICOLON -> "T_SEMICOLON"
-  | T_COMMA -> "T_COMMA"
-  | T_PERIOD -> "T_PERIOD"
-  | T_ARROW -> "T_ARROW"
-  | T_ELLIPSIS -> "T_ELLIPSIS"
-  | T_AT -> "T_AT"
-  | T_POUND -> "T_POUND"
-  | T_RSHIFT3_ASSIGN -> "T_RSHIFT3_ASSIGN"
-  | T_RSHIFT_ASSIGN -> "T_RSHIFT_ASSIGN"
-  | T_LSHIFT_ASSIGN -> "T_LSHIFT_ASSIGN"
-  | T_BIT_XOR_ASSIGN -> "T_BIT_XOR_ASSIGN"
-  | T_BIT_OR_ASSIGN -> "T_BIT_OR_ASSIGN"
-  | T_BIT_AND_ASSIGN -> "T_BIT_AND_ASSIGN"
-  | T_MOD_ASSIGN -> "T_MOD_ASSIGN"
-  | T_DIV_ASSIGN -> "T_DIV_ASSIGN"
-  | T_MULT_ASSIGN -> "T_MULT_ASSIGN"
-  | T_EXP_ASSIGN -> "T_EXP_ASSIGN"
-  | T_MINUS_ASSIGN -> "T_MINUS_ASSIGN"
-  | T_PLUS_ASSIGN -> "T_PLUS_ASSIGN"
-  | T_NULLISH_ASSIGN -> "T_NULLISH_ASSIGN"
-  | T_AND_ASSIGN -> "T_AND_ASSIGN"
-  | T_OR_ASSIGN -> "T_OR_ASSIGN"
-  | T_ASSIGN -> "T_ASSIGN"
-  | T_PLING_PERIOD -> "T_PLING_PERIOD"
-  | T_PLING_PLING -> "T_PLING_PLING"
-  | T_PLING -> "T_PLING"
-  | T_COLON -> "T_COLON"
-  | T_OR -> "T_OR"
-  | T_AND -> "T_AND"
-  | T_BIT_OR -> "T_BIT_OR"
-  | T_BIT_XOR -> "T_BIT_XOR"
-  | T_BIT_AND -> "T_BIT_AND"
-  | T_EQUAL -> "T_EQUAL"
-  | T_NOT_EQUAL -> "T_NOT_EQUAL"
-  | T_STRICT_EQUAL -> "T_STRICT_EQUAL"
-  | T_STRICT_NOT_EQUAL -> "T_STRICT_NOT_EQUAL"
-  | T_LESS_THAN_EQUAL -> "T_LESS_THAN_EQUAL"
-  | T_GREATER_THAN_EQUAL -> "T_GREATER_THAN_EQUAL"
-  | T_LESS_THAN -> "T_LESS_THAN"
-  | T_GREATER_THAN -> "T_GREATER_THAN"
-  | T_LSHIFT -> "T_LSHIFT"
-  | T_RSHIFT -> "T_RSHIFT"
-  | T_RSHIFT3 -> "T_RSHIFT3"
-  | T_PLUS -> "T_PLUS"
-  | T_MINUS -> "T_MINUS"
-  | T_DIV -> "T_DIV"
-  | T_MULT -> "T_MULT"
-  | T_EXP -> "T_EXP"
-  | T_MOD -> "T_MOD"
-  | T_NOT -> "T_NOT"
-  | T_BIT_NOT -> "T_BIT_NOT"
-  | T_INCR -> "T_INCR"
-  | T_DECR -> "T_DECR"
-  (* Extra tokens *)
-  | T_ERROR _ -> "T_ERROR"
-  | T_EOF -> "T_EOF"
-  | T_JSX_IDENTIFIER _ -> "T_JSX_IDENTIFIER"
-  | T_JSX_TEXT _ -> "T_JSX_TEXT"
-  (* Type primitives *)
-  | T_ANY_TYPE -> "T_ANY_TYPE"
-  | T_MIXED_TYPE -> "T_MIXED_TYPE"
-  | T_EMPTY_TYPE -> "T_EMPTY_TYPE"
-  | T_BOOLEAN_TYPE _ -> "T_BOOLEAN_TYPE"
-  | T_NUMBER_TYPE -> "T_NUMBER_TYPE"
-  | T_BIGINT_TYPE -> "T_BIGINT_TYPE"
-  | T_NUMBER_SINGLETON_TYPE _ -> "T_NUMBER_SINGLETON_TYPE"
-  | T_BIGINT_SINGLETON_TYPE _ -> "T_BIGINT_SINGLETON_TYPE"
-  | T_STRING_TYPE -> "T_STRING_TYPE"
-  | T_VOID_TYPE -> "T_VOID_TYPE"
-  | T_SYMBOL_TYPE -> "T_SYMBOL_TYPE"
-
-let value_of_token = function
-  | T_NUMBER { raw; _ } -> raw
-  | T_BIGINT { raw; _ } -> raw
-  | T_STRING (_, _, raw, _) -> raw
-  | T_TEMPLATE_PART (_, { literal; _ }, _) -> literal
-  | T_IDENTIFIER { raw; _ } -> raw
-  | T_REGEXP (_, pattern, flags) -> "/" ^ pattern ^ "/" ^ flags
-  | T_LCURLY -> "{"
-  | T_RCURLY -> "}"
-  | T_LCURLYBAR -> "{|"
-  | T_RCURLYBAR -> "|}"
-  | T_LPAREN -> "("
-  | T_RPAREN -> ")"
-  | T_LBRACKET -> "["
-  | T_RBRACKET -> "]"
-  | T_SEMICOLON -> ";"
-  | T_COMMA -> ","
-  | T_PERIOD -> "."
-  | T_ARROW -> "=>"
-  | T_ELLIPSIS -> "..."
-  | T_AT -> "@"
-  | T_POUND -> "#"
-  | T_FUNCTION -> "function"
-  | T_IF -> "if"
-  | T_IN -> "in"
-  | T_INSTANCEOF -> "instanceof"
-  | T_RETURN -> "return"
-  | T_SWITCH -> "switch"
-  | T_THIS -> "this"
-  | T_THROW -> "throw"
-  | T_TRY -> "try"
-  | T_VAR -> "var"
-  | T_WHILE -> "while"
-  | T_WITH -> "with"
-  | T_CONST -> "const"
-  | T_LET -> "let"
-  | T_NULL -> "null"
-  | T_FALSE -> "false"
-  | T_TRUE -> "true"
-  | T_BREAK -> "break"
-  | T_CASE -> "case"
-  | T_CATCH -> "catch"
-  | T_CONTINUE -> "continue"
-  | T_DEFAULT -> "default"
-  | T_DO -> "do"
-  | T_FINALLY -> "finally"
-  | T_FOR -> "for"
-  | T_CLASS -> "class"
-  | T_EXTENDS -> "extends"
-  | T_STATIC -> "static"
-  | T_ELSE -> "else"
-  | T_NEW -> "new"
-  | T_DELETE -> "delete"
-  | T_TYPEOF -> "typeof"
-  | T_VOID -> "void"
-  | T_ENUM -> "enum"
-  | T_EXPORT -> "export"
-  | T_IMPORT -> "import"
-  | T_SUPER -> "super"
-  | T_IMPLEMENTS -> "implements"
-  | T_INTERFACE -> "interface"
-  | T_PACKAGE -> "package"
-  | T_PRIVATE -> "private"
-  | T_PROTECTED -> "protected"
-  | T_PUBLIC -> "public"
-  | T_YIELD -> "yield"
-  | T_DEBUGGER -> "debugger"
-  | T_DECLARE -> "declare"
-  | T_TYPE -> "type"
-  | T_OPAQUE -> "opaque"
-  | T_OF -> "of"
-  | T_ASYNC -> "async"
-  | T_AWAIT -> "await"
-  | T_CHECKS -> "%checks"
-  | T_RSHIFT3_ASSIGN -> ">>>="
-  | T_RSHIFT_ASSIGN -> ">>="
-  | T_LSHIFT_ASSIGN -> "<<="
-  | T_BIT_XOR_ASSIGN -> "^="
-  | T_BIT_OR_ASSIGN -> "|="
-  | T_BIT_AND_ASSIGN -> "&="
-  | T_MOD_ASSIGN -> "%="
-  | T_DIV_ASSIGN -> "/="
-  | T_MULT_ASSIGN -> "*="
-  | T_EXP_ASSIGN -> "**="
-  | T_MINUS_ASSIGN -> "-="
-  | T_PLUS_ASSIGN -> "+="
-  | T_NULLISH_ASSIGN -> "??="
-  | T_AND_ASSIGN -> "&&="
-  | T_OR_ASSIGN -> "||="
-  | T_ASSIGN -> "="
-  | T_PLING_PERIOD -> "?."
-  | T_PLING_PLING -> "??"
-  | T_PLING -> "?"
-  | T_COLON -> ":"
-  | T_OR -> "||"
-  | T_AND -> "&&"
-  | T_BIT_OR -> "|"
-  | T_BIT_XOR -> "^"
-  | T_BIT_AND -> "&"
-  | T_EQUAL -> "=="
-  | T_NOT_EQUAL -> "!="
-  | T_STRICT_EQUAL -> "==="
-  | T_STRICT_NOT_EQUAL -> "!=="
-  | T_LESS_THAN_EQUAL -> "<="
-  | T_GREATER_THAN_EQUAL -> ">="
-  | T_LESS_THAN -> "<"
-  | T_GREATER_THAN -> ">"
-  | T_LSHIFT -> "<<"
-  | T_RSHIFT -> ">>"
-  | T_RSHIFT3 -> ">>>"
-  | T_PLUS -> "+"
-  | T_MINUS -> "-"
-  | T_DIV -> "/"
-  | T_MULT -> "*"
-  | T_EXP -> "**"
-  | T_MOD -> "%"
-  | T_NOT -> "!"
-  | T_BIT_NOT -> "~"
-  | T_INCR -> "++"
-  | T_DECR -> "--"
-  (* Extra tokens *)
-  | T_ERROR raw -> raw
-  | T_EOF -> ""
-  | T_JSX_IDENTIFIER { raw; _ } -> raw
-  | T_JSX_TEXT (_, _, raw) -> raw
-  (* Type primitives *)
-  | T_ANY_TYPE -> "any"
-  | T_MIXED_TYPE -> "mixed"
-  | T_EMPTY_TYPE -> "empty"
-  | T_BOOLEAN_TYPE kind -> begin
-    match kind with
-    | BOOL -> "bool"
-    | BOOLEAN -> "boolean"
-  end
-  | T_NUMBER_TYPE -> "number"
-  | T_BIGINT_TYPE -> "bigint"
-  | T_NUMBER_SINGLETON_TYPE { raw; _ } -> raw
-  | T_BIGINT_SINGLETON_TYPE { raw; _ } -> raw
-  | T_STRING_TYPE -> "string"
-  | T_VOID_TYPE -> "void"
-  | T_SYMBOL_TYPE -> "symbol"
-
-let quote_token_value value = Printf.sprintf "token `%s`" value
-
-let explanation_of_token ?(use_article = false) token =
-  let (value, article) =
-    match token with
-    | T_NUMBER_SINGLETON_TYPE _
-    | T_NUMBER _ ->
-      ("number", "a")
-    | T_BIGINT_SINGLETON_TYPE _
-    | T_BIGINT _ ->
-      ("bigint", "a")
-    | T_JSX_TEXT _
-    | T_STRING _ ->
-      ("string", "a")
-    | T_TEMPLATE_PART _ -> ("template literal part", "a")
-    | T_JSX_IDENTIFIER _
-    | T_IDENTIFIER _ ->
-      ("identifier", "an")
-    | T_REGEXP _ -> ("regexp", "a")
-    | T_EOF -> ("end of input", "the")
-    | _ -> (quote_token_value (value_of_token token), "the")
-  in
-  if use_article then
-    article ^ " " ^ value
-  else
-    value
diff --git a/jscomp/js_parser/type_parser.ml b/jscomp/js_parser/type_parser.ml
deleted file mode 100644
index ba898a1..0000000
--- a/jscomp/js_parser/type_parser.ml
+++ /dev/null
@@ -1,1487 +0,0 @@
-(*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-module Ast = Flow_ast
-open Token
-open Parser_env
-open Flow_ast
-open Parser_common
-open Comment_attachment
-
-module type TYPE = sig
-  val _type : env -> (Loc.t, Loc.t) Ast.Type.t
-
-  val type_identifier : env -> (Loc.t, Loc.t) Ast.Identifier.t
-
-  val type_params : env -> (Loc.t, Loc.t) Ast.Type.TypeParams.t option
-
-  val type_args : env -> (Loc.t, Loc.t) Ast.Type.TypeArgs.t option
-
-  val generic : env -> Loc.t * (Loc.t, Loc.t) Ast.Type.Generic.t
-
-  val _object : is_class:bool -> env -> Loc.t * (Loc.t, Loc.t) Type.Object.t
-
-  val interface_helper :
-    env ->
-    (Loc.t * (Loc.t, Loc.t) Ast.Type.Generic.t) list * (Loc.t * (Loc.t, Loc.t) Ast.Type.Object.t)
-
-  val function_param_list : env -> (Loc.t, Loc.t) Type.Function.Params.t
-
-  val annotation : env -> (Loc.t, Loc.t) Ast.Type.annotation
-
-  val annotation_opt : env -> (Loc.t, Loc.t) Ast.Type.annotation_or_hint
-
-  val predicate_opt : env -> (Loc.t, Loc.t) Ast.Type.Predicate.t option
-
-  val annotation_and_predicate_opt :
-    env -> (Loc.t, Loc.t) Ast.Type.annotation_or_hint * (Loc.t, Loc.t) Ast.Type.Predicate.t option
-end
-
-module Type (Parse : Parser_common.PARSER) : TYPE = struct
-  type param_list_or_type =
-    | ParamList of (Loc.t, Loc.t) Type.Function.Params.t'
-    | Type of (Loc.t, Loc.t) Type.t
-
-  let maybe_variance env =
-    let loc = Peek.loc env in
-    match Peek.token env with
-    | T_PLUS ->
-      let leading = Peek.comments env in
-      Eat.token env;
-      Some
-        ( loc,
-          { Variance.kind = Variance.Plus; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-        )
-    | T_MINUS ->
-      let leading = Peek.comments env in
-      Eat.token env;
-      Some
-        ( loc,
-          { Variance.kind = Variance.Minus; comments = Flow_ast_utils.mk_comments_opt ~leading () }
-        )
-    | _ -> None
-
-  let rec _type env = union env
-
-  and annotation env =
-    if not (should_parse_types env) then error env Parse_error.UnexpectedTypeAnnotation;
-    with_loc
-      (fun env ->
-        Expect.token env T_COLON;
-        _type env)
-      env
-
-  and union env =
-    let leading =
-      if Peek.token env = T_BIT_OR then (
-        let leading = Peek.comments env in
-        Eat.token env;
-        leading
-      ) else
-        []
-    in
-    let left = intersection env in
-    union_with env ~leading left
-
-  and union_with =
-    let rec unions leading acc env =
-      match Peek.token env with
-      | T_BIT_OR ->
-        Expect.token env T_BIT_OR;
-        unions leading (intersection env :: acc) env
-      | _ ->
-        (match List.rev acc with
-        | t0 :: t1 :: ts ->
-          Type.Union
-            {
-              Type.Union.types = (t0, t1, ts);
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            }
-        | _ -> assert false)
-    in
-    fun env ?(leading = []) left ->
-      if Peek.token env = T_BIT_OR then
-        with_loc ~start_loc:(fst left) (unions leading [left]) env
-      else
-        left
-
-  and intersection env =
-    let leading =
-      if Peek.token env = T_BIT_AND then (
-        let leading = Peek.comments env in
-        Eat.token env;
-        leading
-      ) else
-        []
-    in
-    let left = anon_function_without_parens env in
-    intersection_with env ~leading left
-
-  and intersection_with =
-    let rec intersections leading acc env =
-      match Peek.token env with
-      | T_BIT_AND ->
-        Expect.token env T_BIT_AND;
-        intersections leading (anon_function_without_parens env :: acc) env
-      | _ ->
-        (match List.rev acc with
-        | t0 :: t1 :: ts ->
-          Type.Intersection
-            {
-              Type.Intersection.types = (t0, t1, ts);
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            }
-        | _ -> assert false)
-    in
-    fun env ?(leading = []) left ->
-      if Peek.token env = T_BIT_AND then
-        with_loc ~start_loc:(fst left) (intersections leading [left]) env
-      else
-        left
-
-  and anon_function_without_parens env =
-    let param = prefix env in
-    anon_function_without_parens_with env param
-
-  and anon_function_without_parens_with env param =
-    match Peek.token env with
-    | T_ARROW when not (no_anon_function_type env) ->
-      let (start_loc, tparams, params) =
-        let param = anonymous_function_param env param in
-        ( fst param,
-          None,
-          ( fst param,
-            {
-              Ast.Type.Function.Params.params = [param];
-              this_ = None;
-              rest = None;
-              comments = None;
-            }
-          )
-        )
-      in
-      function_with_params env start_loc tparams params
-    | _ -> param
-
-  and prefix env =
-    match Peek.token env with
-    | T_PLING ->
-      with_loc
-        (fun env ->
-          let leading = Peek.comments env in
-          Expect.token env T_PLING;
-          Type.Nullable
-            {
-              Type.Nullable.argument = prefix env;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            })
-        env
-    | _ -> postfix env
-
-  and postfix env =
-    let t = primary env in
-    postfix_with env t
-
-  and postfix_with ?(in_optional_indexed_access = false) env t =
-    if Peek.is_line_terminator env then
-      t
-    else
-      match Peek.token env with
-      | T_PLING_PERIOD ->
-        Eat.token env;
-        if Peek.token env <> T_LBRACKET then error env Parse_error.InvalidOptionalIndexedAccess;
-        Expect.token env T_LBRACKET;
-        postfix_brackets ~in_optional_indexed_access:true ~optional_indexed_access:true env t
-      | T_LBRACKET ->
-        Eat.token env;
-        postfix_brackets ~in_optional_indexed_access ~optional_indexed_access:false env t
-      | T_PERIOD ->
-        (match Peek.ith_token ~i:1 env with
-        | T_LBRACKET ->
-          error env (Parse_error.InvalidIndexedAccess { has_bracket = true });
-          Expect.token env T_PERIOD;
-          Expect.token env T_LBRACKET;
-          postfix_brackets ~in_optional_indexed_access ~optional_indexed_access:false env t
-        | _ ->
-          error env (Parse_error.InvalidIndexedAccess { has_bracket = false });
-          t)
-      | _ -> t
-
-  and postfix_brackets ~in_optional_indexed_access ~optional_indexed_access env t =
-    let t =
-      with_loc
-        ~start_loc:(fst t)
-        (fun env ->
-          (* Legacy Array syntax `Foo[]` *)
-          if (not optional_indexed_access) && Eat.maybe env T_RBRACKET then
-            let trailing = Eat.trailing_comments env in
-            Type.Array
-              { Type.Array.argument = t; comments = Flow_ast_utils.mk_comments_opt ~trailing () }
-          else
-            let index = _type env in
-            Expect.token env T_RBRACKET;
-            let trailing = Eat.trailing_comments env in
-            let indexed_access =
-              {
-                Type.IndexedAccess._object = t;
-                index;
-                comments = Flow_ast_utils.mk_comments_opt ~trailing ();
-              }
-            in
-            if in_optional_indexed_access then
-              Type.OptionalIndexedAccess
-                { Type.OptionalIndexedAccess.indexed_access; optional = optional_indexed_access }
-            else
-              Type.IndexedAccess indexed_access)
-        env
-    in
-    postfix_with env ~in_optional_indexed_access t
-
-  and typeof_expr env = raw_typeof_expr_with_identifier env (Parse.identifier env)
-
-  and raw_typeof_expr_with_identifier =
-    let rec identifier env (q_loc, qualification) =
-      if Peek.token env = T_PERIOD && Peek.ith_is_identifier ~i:1 env then
-        let (loc, q) =
-          with_loc
-            ~start_loc:q_loc
-            (fun env ->
-              Expect.token env T_PERIOD;
-              let id = identifier_name env in
-              { Type.Typeof.Target.qualification; id })
-            env
-        in
-        let qualification = Type.Typeof.Target.Qualified (loc, q) in
-        identifier env (loc, qualification)
-      else
-        qualification
-    in
-    fun env ((loc, _) as id) ->
-      let id = Type.Typeof.Target.Unqualified id in
-      identifier env (loc, id)
-
-  and typeof_arg env =
-    match Peek.token env with
-    | T_LPAREN ->
-      Eat.token env;
-      let typeof = typeof_arg env in
-      Expect.token env T_RPAREN;
-      typeof
-    | T_IDENTIFIER _ (* `static` is reserved in strict mode, but still an identifier *) ->
-      Some (typeof_expr env)
-    | _ ->
-      error env Parse_error.InvalidTypeof;
-      None
-
-  and typeof env =
-    with_loc
-      (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_TYPEOF;
-        match typeof_arg env with
-        | None -> Type.Any None
-        | Some argument ->
-          Type.Typeof
-            { Type.Typeof.argument; comments = Flow_ast_utils.mk_comments_opt ~leading () })
-      env
-
-  and primary env =
-    let loc = Peek.loc env in
-    match Peek.token env with
-    | T_MULT ->
-      let leading = Peek.comments env in
-      Expect.token env T_MULT;
-      let trailing = Eat.trailing_comments env in
-      (loc, Type.Exists (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | T_LESS_THAN -> _function env
-    | T_LPAREN -> function_or_group env
-    | T_LCURLY
-    | T_LCURLYBAR ->
-      let (loc, o) = _object env ~is_class:false ~allow_exact:true ~allow_spread:true in
-      (loc, Type.Object o)
-    | T_INTERFACE ->
-      with_loc
-        (fun env ->
-          let leading = Peek.comments env in
-          Expect.token env T_INTERFACE;
-          let (extends, body) = interface_helper env in
-          Type.Interface
-            { Type.Interface.extends; body; comments = Flow_ast_utils.mk_comments_opt ~leading () })
-        env
-    | T_TYPEOF -> typeof env
-    | T_LBRACKET -> tuple env
-    | T_IDENTIFIER _
-    | T_STATIC (* `static` is reserved in strict mode, but still an identifier *) ->
-      let (loc, g) = generic env in
-      (loc, Type.Generic g)
-    | T_STRING (loc, value, raw, octal) ->
-      if octal then strict_error env Parse_error.StrictOctalLiteral;
-      let leading = Peek.comments env in
-      Expect.token env (T_STRING (loc, value, raw, octal));
-      let trailing = Eat.trailing_comments env in
-      ( loc,
-        Type.StringLiteral
-          {
-            Ast.StringLiteral.value;
-            raw;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-      )
-    | T_NUMBER_SINGLETON_TYPE { kind; value; raw } ->
-      if kind = LEGACY_OCTAL then strict_error env Parse_error.StrictOctalLiteral;
-      let leading = Peek.comments env in
-      Expect.token env (T_NUMBER_SINGLETON_TYPE { kind; value; raw });
-      let trailing = Eat.trailing_comments env in
-      ( loc,
-        Type.NumberLiteral
-          {
-            Ast.NumberLiteral.value;
-            raw;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-      )
-    | T_BIGINT_SINGLETON_TYPE { kind; value; raw } ->
-      let leading = Peek.comments env in
-      Expect.token env (T_BIGINT_SINGLETON_TYPE { kind; value; raw });
-      let trailing = Eat.trailing_comments env in
-      ( loc,
-        Type.BigIntLiteral
-          {
-            Ast.BigIntLiteral.value;
-            raw;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-      )
-    | (T_TRUE | T_FALSE) as token ->
-      let leading = Peek.comments env in
-      Expect.token env token;
-      let trailing = Eat.trailing_comments env in
-      let value = token = T_TRUE in
-      ( loc,
-        Type.BooleanLiteral
-          { BooleanLiteral.value; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-      )
-    | _ ->
-      (match primitive env with
-      | Some t -> (loc, t)
-      | None ->
-        error_unexpected ~expected:"a type" env;
-        (loc, Type.Any None))
-
-  and is_primitive = function
-    | T_ANY_TYPE
-    | T_MIXED_TYPE
-    | T_EMPTY_TYPE
-    | T_BOOLEAN_TYPE _
-    | T_NUMBER_TYPE
-    | T_BIGINT_TYPE
-    | T_STRING_TYPE
-    | T_SYMBOL_TYPE
-    | T_VOID_TYPE
-    | T_NULL ->
-      true
-    | _ -> false
-
-  and primitive env =
-    let leading = Peek.comments env in
-    let token = Peek.token env in
-    match token with
-    | T_ANY_TYPE ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Some (Type.Any (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | T_MIXED_TYPE ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Some (Type.Mixed (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | T_EMPTY_TYPE ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Some (Type.Empty (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | T_BOOLEAN_TYPE _ ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Some (Type.Boolean (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | T_NUMBER_TYPE ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Some (Type.Number (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | T_BIGINT_TYPE ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Some (Type.BigInt (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | T_STRING_TYPE ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Some (Type.String (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | T_SYMBOL_TYPE ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Some (Type.Symbol (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | T_VOID_TYPE ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Some (Type.Void (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | T_NULL ->
-      Eat.token env;
-      let trailing = Eat.trailing_comments env in
-      Some (Type.Null (Flow_ast_utils.mk_comments_opt ~leading ~trailing ()))
-    | _ -> None
-
-  and tuple =
-    let rec types env acc =
-      match Peek.token env with
-      | T_EOF
-      | T_RBRACKET ->
-        List.rev acc
-      | _ ->
-        let acc = _type env :: acc in
-        (* Trailing comma support (like [number, string,]) *)
-        if Peek.token env <> T_RBRACKET then Expect.token env T_COMMA;
-        types env acc
-    in
-    fun env ->
-      with_loc
-        (fun env ->
-          let leading = Peek.comments env in
-          Expect.token env T_LBRACKET;
-          let tl = types (with_no_anon_function_type false env) [] in
-          Expect.token env T_RBRACKET;
-          let trailing = Eat.trailing_comments env in
-          Type.Tuple
-            {
-              Type.Tuple.types = tl;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            })
-        env
-
-  and anonymous_function_param _env annot =
-    (fst annot, Type.Function.Param.{ name = None; annot; optional = false })
-
-  and function_param_with_id env =
-    with_loc
-      (fun env ->
-        Eat.push_lex_mode env Lex_mode.NORMAL;
-        let name = Parse.identifier env in
-        Eat.pop_lex_mode env;
-        if not (should_parse_types env) then error env Parse_error.UnexpectedTypeAnnotation;
-        let optional = Eat.maybe env T_PLING in
-        Expect.token env T_COLON;
-        let annot = _type env in
-        { Type.Function.Param.name = Some name; annot; optional })
-      env
-
-  and function_param_list_without_parens =
-    let param env =
-      match Peek.ith_token ~i:1 env with
-      | T_COLON
-      | T_PLING ->
-        function_param_with_id env
-      | _ ->
-        let annot = _type env in
-        anonymous_function_param env annot
-    in
-    let rec param_list env this_ acc =
-      match Peek.token env with
-      | (T_EOF | T_ELLIPSIS | T_RPAREN) as t ->
-        let rest =
-          if t = T_ELLIPSIS then
-            let rest =
-              with_loc
-                (fun env ->
-                  let leading = Peek.comments env in
-                  Expect.token env T_ELLIPSIS;
-                  {
-                    Type.Function.RestParam.argument = param env;
-                    comments = Flow_ast_utils.mk_comments_opt ~leading ();
-                  })
-                env
-            in
-            Some rest
-          else
-            None
-        in
-        { Ast.Type.Function.Params.params = List.rev acc; rest; this_; comments = None }
-      | T_IDENTIFIER { raw = "this"; _ }
-        when Peek.ith_token ~i:1 env == T_COLON || Peek.ith_token ~i:1 env == T_PLING ->
-        if this_ <> None || acc <> [] then error env Parse_error.ThisParamMustBeFirst;
-        let this_ =
-          with_loc
-            (fun env ->
-              let leading = Peek.comments env in
-              Eat.token env;
-              if Peek.token env == T_PLING then error env Parse_error.ThisParamMayNotBeOptional;
-              {
-                Type.Function.ThisParam.annot = annotation env;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ();
-              })
-            env
-        in
-        if Peek.token env <> T_RPAREN then Expect.token env T_COMMA;
-        param_list env (Some this_) acc
-      | _ ->
-        let acc = param env :: acc in
-        if Peek.token env <> T_RPAREN then Expect.token env T_COMMA;
-        param_list env this_ acc
-    in
-    (fun env -> param_list env None)
-
-  and function_param_list env =
-    with_loc
-      (fun env ->
-        let leading = Peek.comments env in
-        Expect.token env T_LPAREN;
-        let params = function_param_list_without_parens env [] in
-        let internal = Peek.comments env in
-        Expect.token env T_RPAREN;
-        let trailing = Eat.trailing_comments env in
-        {
-          params with
-          Ast.Type.Function.Params.comments =
-            Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-        })
-      env
-
-  and param_list_or_type env =
-    let leading = Peek.comments env in
-    Expect.token env T_LPAREN;
-    let ret =
-      let env = with_no_anon_function_type false env in
-      match Peek.token env with
-      | T_EOF
-      | T_ELLIPSIS ->
-        (* (... is definitely the beginning of a param list *)
-        ParamList (function_param_list_without_parens env [])
-      | T_RPAREN ->
-        (* () or is definitely a param list *)
-        ParamList
-          { Ast.Type.Function.Params.this_ = None; params = []; rest = None; comments = None }
-      | T_IDENTIFIER _
-      | T_STATIC (* `static` is reserved in strict mode, but still an identifier *) ->
-        (* This could be a function parameter or a generic type *)
-        function_param_or_generic_type env
-      | token when is_primitive token ->
-        (* Don't know if this is (number) or (number: number). The first
-         * is a type, the second is a param. *)
-        (match Peek.ith_token ~i:1 env with
-        | T_PLING
-        | T_COLON ->
-          (* Ok this is definitely a parameter *)
-          ParamList (function_param_list_without_parens env [])
-        | _ -> Type (_type env))
-      | _ ->
-        (* All params start with an identifier or `...` *)
-        Type (_type env)
-    in
-    (* Now that we allow anonymous parameters in function types, we need to
-     * disambiguate a little bit more *)
-    let ret =
-      match ret with
-      | ParamList _ -> ret
-      | Type _ when no_anon_function_type env -> ret
-      | Type t ->
-        (match Peek.token env with
-        | T_RPAREN ->
-          (* Reinterpret `(type) =>` as a ParamList *)
-          if Peek.ith_token ~i:1 env = T_ARROW then
-            let param = anonymous_function_param env t in
-            ParamList (function_param_list_without_parens env [param])
-          else
-            Type t
-        | T_COMMA ->
-          (* Reinterpret `(type,` as a ParamList *)
-          Expect.token env T_COMMA;
-          let param = anonymous_function_param env t in
-          ParamList (function_param_list_without_parens env [param])
-        | _ -> ret)
-    in
-    let internal = Peek.comments env in
-    Expect.token env T_RPAREN;
-    let trailing = Eat.trailing_comments env in
-    let ret =
-      match ret with
-      | ParamList params ->
-        ParamList
-          {
-            params with
-            Ast.Type.Function.Params.comments =
-              Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-          }
-      | Type t -> Type (add_comments t leading trailing)
-    in
-    ret
-
-  and function_param_or_generic_type env =
-    match Peek.ith_token ~i:1 env with
-    | T_PLING
-    (* optional param *)
-    | T_COLON ->
-      ParamList (function_param_list_without_parens env [])
-    | _ ->
-      let id = type_identifier env in
-      Type
-        (generic_type_with_identifier env id
-        |> postfix_with env
-        |> anon_function_without_parens_with env
-        |> intersection_with env
-        |> union_with env
-        )
-
-  and function_or_group env =
-    let start_loc = Peek.loc env in
-    match with_loc param_list_or_type env with
-    | (loc, ParamList params) -> function_with_params env start_loc None (loc, params)
-    | (_, Type _type) -> _type
-
-  and _function env =
-    let start_loc = Peek.loc env in
-    let tparams = type_params_remove_trailing env (type_params env) in
-    let params = function_param_list env in
-    function_with_params env start_loc tparams params
-
-  and function_with_params env start_loc tparams (params : (Loc.t, Loc.t) Ast.Type.Function.Params.t)
-      =
-    with_loc
-      ~start_loc
-      (fun env ->
-        Expect.token env T_ARROW;
-        let return = _type env in
-        Type.(Function { Function.params; return; tparams; comments = None }))
-      env
-
-  and _object =
-    let methodish env start_loc tparams =
-      with_loc
-        ~start_loc
-        (fun env ->
-          let params = function_param_list env in
-          Expect.token env T_COLON;
-          let return = _type env in
-          { Type.Function.params; return; tparams; comments = None })
-        env
-    in
-    let method_property env start_loc static key ~leading =
-      let key = object_key_remove_trailing env key in
-      let tparams = type_params_remove_trailing env (type_params env) in
-      let value = methodish env start_loc tparams in
-      let value = (fst value, Type.Function (snd value)) in
-      Type.Object.(
-        Property
-          ( fst value,
-            {
-              Property.key;
-              value = Property.Init value;
-              optional = false;
-              static = static <> None;
-              proto = false;
-              _method = true;
-              variance = None;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            }
-          )
-      )
-    in
-    let call_property env start_loc static ~leading =
-      let prop =
-        with_loc
-          ~start_loc
-          (fun env ->
-            let start_loc = Peek.loc env in
-            let tparams = type_params_remove_trailing env (type_params env) in
-            let value = methodish env start_loc tparams in
-            Type.Object.CallProperty.
-              {
-                value;
-                static = static <> None;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ();
-              }
-            )
-          env
-      in
-      Type.Object.CallProperty prop
-    in
-    let init_property env start_loc ~variance ~static ~proto ~leading (key_loc, key) =
-      ignore proto;
-      if not (should_parse_types env) then error env Parse_error.UnexpectedTypeAnnotation;
-      let prop =
-        with_loc
-          ~start_loc
-          (fun env ->
-            let optional = Eat.maybe env T_PLING in
-            let value =
-              if Expect.token_maybe env T_COLON then
-                _type env
-              else
-                (key_loc, Type.Any None)
-            in
-            Type.Object.Property.
-              {
-                key;
-                value = Init value;
-                optional;
-                static = static <> None;
-                proto = proto <> None;
-                _method = false;
-                variance;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ();
-              }
-            )
-          env
-      in
-      Type.Object.Property prop
-    in
-    let getter_or_setter ~is_getter ~leading env start_loc static key =
-      let prop =
-        with_loc
-          ~start_loc
-          (fun env ->
-            let (key_loc, key) = key in
-            let key = object_key_remove_trailing env key in
-            let value = methodish env start_loc None in
-            let (_, { Type.Function.params; _ }) = value in
-            begin
-              match (is_getter, params) with
-              | (true, (_, { Type.Function.Params.this_ = Some _; _ })) ->
-                error_at env (key_loc, Parse_error.GetterMayNotHaveThisParam)
-              | (false, (_, { Type.Function.Params.this_ = Some _; _ })) ->
-                error_at env (key_loc, Parse_error.SetterMayNotHaveThisParam)
-              | ( true,
-                  (_, { Type.Function.Params.params = []; rest = None; this_ = None; comments = _ })
-                ) ->
-                ()
-              | (false, (_, { Type.Function.Params.rest = Some _; _ })) ->
-                (* rest params don't make sense on a setter *)
-                error_at env (key_loc, Parse_error.SetterArity)
-              | (false, (_, { Type.Function.Params.params = [_]; _ })) -> ()
-              | (true, _) -> error_at env (key_loc, Parse_error.GetterArity)
-              | (false, _) -> error_at env (key_loc, Parse_error.SetterArity)
-            end;
-            Type.Object.Property.
-              {
-                key;
-                value =
-                  ( if is_getter then
-                    Get value
-                  else
-                    Set value
-                  );
-                optional = false;
-                static = static <> None;
-                proto = false;
-                _method = false;
-                variance = None;
-                comments = Flow_ast_utils.mk_comments_opt ~leading ();
-              }
-            )
-          env
-      in
-      Type.Object.Property prop
-    in
-    let indexer_property env start_loc static variance ~leading =
-      let indexer =
-        with_loc
-          ~start_loc
-          (fun env ->
-            let leading = leading @ Peek.comments env in
-            Expect.token env T_LBRACKET;
-            let id =
-              if Peek.ith_token ~i:1 env = T_COLON then (
-                let id = identifier_name env in
-                Expect.token env T_COLON;
-                Some id
-              ) else
-                None
-            in
-            let key = _type env in
-            Expect.token env T_RBRACKET;
-            let trailing = Eat.trailing_comments env in
-            Expect.token env T_COLON;
-            let value = _type env in
-            {
-              Type.Object.Indexer.id;
-              key;
-              value;
-              static = static <> None;
-              variance;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            })
-          env
-      in
-      Type.Object.Indexer indexer
-    in
-    let internal_slot env start_loc static ~leading =
-      let islot =
-        with_loc
-          ~start_loc
-          (fun env ->
-            let leading = leading @ Peek.comments env in
-            Expect.token env T_LBRACKET;
-            Expect.token env T_LBRACKET;
-            let id = identifier_name env in
-            Expect.token env T_RBRACKET;
-            Expect.token env T_RBRACKET;
-            let (optional, _method, value, trailing) =
-              match Peek.token env with
-              | T_LESS_THAN
-              | T_LPAREN ->
-                let tparams = type_params_remove_trailing env (type_params env) in
-                let value =
-                  let (fn_loc, fn) = methodish env start_loc tparams in
-                  (fn_loc, Type.Function fn)
-                in
-                (false, true, value, [])
-              | _ ->
-                let optional = Eat.maybe env T_PLING in
-                let trailing = Eat.trailing_comments env in
-                Expect.token env T_COLON;
-                let value = _type env in
-                (optional, false, value, trailing)
-            in
-            {
-              Type.Object.InternalSlot.id;
-              value;
-              optional;
-              static = static <> None;
-              _method;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-            })
-          env
-      in
-      Type.Object.InternalSlot islot
-      (* Expects the T_ELLIPSIS has already been eaten *)
-    in
-    let spread_property env start_loc ~leading =
-      let spread =
-        with_loc
-          ~start_loc
-          (fun env ->
-            {
-              Type.Object.SpreadProperty.argument = _type env;
-              comments = Flow_ast_utils.mk_comments_opt ~leading ();
-            })
-          env
-      in
-      Type.Object.SpreadProperty spread
-    in
-    let semicolon exact env =
-      match Peek.token env with
-      | T_COMMA
-      | T_SEMICOLON ->
-        Eat.token env
-      | T_RCURLYBAR when exact -> ()
-      | T_RCURLY when not exact -> ()
-      | _ -> Expect.error env T_COMMA
-    in
-    let error_unexpected_variance env = function
-      | Some (loc, _) -> error_at env (loc, Parse_error.UnexpectedVariance)
-      | None -> ()
-    in
-    let error_unexpected_proto env = function
-      | Some loc -> error_at env (loc, Parse_error.UnexpectedProto)
-      | None -> ()
-    in
-    let error_invalid_property_name env is_class static key =
-      let is_static = static <> None in
-      let is_constructor = String.equal "constructor" in
-      let is_prototype = String.equal "prototype" in
-      match key with
-      | Expression.Object.Property.Identifier (loc, { Identifier.name; comments = _ })
-        when is_class && (is_constructor name || (is_static && is_prototype name)) ->
-        error_at
-          env
-          ( loc,
-            Parse_error.InvalidClassMemberName
-              { name; static = is_static; method_ = false; private_ = false }
-          )
-      | _ -> ()
-    in
-    let rec properties
-        ~is_class ~allow_inexact ~allow_spread ~exact env ((props, inexact, internal) as acc) =
-      (* no `static ...A` *)
-      assert (not (is_class && allow_spread));
-
-      (* allow_inexact implies allow_spread *)
-      assert ((not allow_inexact) || allow_spread);
-
-      let start_loc = Peek.loc env in
-      match Peek.token env with
-      | T_EOF -> (List.rev props, inexact, internal)
-      | T_RCURLYBAR when exact -> (List.rev props, inexact, internal)
-      | T_RCURLY when not exact -> (List.rev props, inexact, internal)
-      | T_ELLIPSIS when allow_spread ->
-        let leading = Peek.comments env in
-        Eat.token env;
-        begin
-          match Peek.token env with
-          | T_COMMA
-          | T_SEMICOLON
-          | T_RCURLY
-          | T_RCURLYBAR ->
-            semicolon exact env;
-            begin
-              match Peek.token env with
-              | T_RCURLY when allow_inexact -> (List.rev props, true, leading)
-              | T_RCURLYBAR ->
-                error_at env (start_loc, Parse_error.InexactInsideExact);
-                (List.rev props, inexact, internal)
-              | _ ->
-                error_at env (start_loc, Parse_error.UnexpectedExplicitInexactInObject);
-                properties ~is_class ~allow_inexact ~allow_spread ~exact env acc
-            end
-          | _ ->
-            let prop = spread_property env start_loc ~leading in
-            semicolon exact env;
-            properties
-              ~is_class
-              ~allow_inexact
-              ~allow_spread
-              ~exact
-              env
-              (prop :: props, inexact, internal)
-        end
-      (* In this case, allow_spread is false, so we may assume allow_inexact is false based on our
-       * assertion at the top of this function. Thus, any T_ELLIPSIS here is not allowed.
-       *)
-      | T_ELLIPSIS ->
-        Eat.token env;
-        begin
-          match Peek.token env with
-          | T_COMMA
-          | T_SEMICOLON
-          | T_RCURLY
-          | T_RCURLYBAR ->
-            error_at env (start_loc, Parse_error.InexactInsideNonObject);
-            semicolon exact env;
-            properties ~is_class ~allow_inexact ~allow_spread ~exact env acc
-          | _ ->
-            error_list env (Peek.errors env);
-            error_at env (start_loc, Parse_error.UnexpectedSpreadType);
-
-            (* It's likely the user is trying to spread something here, so we can
-             * eat what they try to spread to try to continue parsing the remaining
-             * properties.
-             *)
-            Eat.token env;
-            semicolon exact env;
-            properties ~is_class ~allow_inexact ~allow_spread ~exact env acc
-        end
-      | _ ->
-        let prop =
-          property
-            env
-            start_loc
-            ~is_class
-            ~allow_static:is_class
-            ~allow_proto:is_class
-            ~variance:None
-            ~static:None
-            ~proto:None
-            ~leading:[]
-        in
-        semicolon exact env;
-        properties
-          ~is_class
-          ~allow_inexact
-          ~allow_spread
-          ~exact
-          env
-          (prop :: props, inexact, internal)
-    and property
-        env ~is_class ~allow_static ~allow_proto ~variance ~static ~proto ~leading start_loc =
-      match Peek.token env with
-      | T_PLUS
-      | T_MINUS
-        when variance = None ->
-        let variance = maybe_variance env in
-        property
-          env
-          ~is_class
-          ~allow_static:false
-          ~allow_proto:false
-          ~variance
-          ~static
-          ~proto
-          ~leading
-          start_loc
-      | T_STATIC when allow_static ->
-        assert (variance = None);
-
-        (* if we parsed variance, allow_static = false *)
-        let static = Some (Peek.loc env) in
-        let leading = leading @ Peek.comments env in
-        Eat.token env;
-        property
-          env
-          ~is_class
-          ~allow_static:false
-          ~allow_proto:false
-          ~variance
-          ~static
-          ~proto
-          ~leading
-          start_loc
-      | T_IDENTIFIER { raw = "proto"; _ } when allow_proto ->
-        assert (variance = None);
-
-        (* if we parsed variance, allow_proto = false *)
-        let proto = Some (Peek.loc env) in
-        let leading = leading @ Peek.comments env in
-        Eat.token env;
-        property
-          env
-          ~is_class
-          ~allow_static:false
-          ~allow_proto:false
-          ~variance
-          ~static
-          ~proto
-          ~leading
-          start_loc
-      | T_LBRACKET ->
-        error_unexpected_proto env proto;
-        (match Peek.ith_token ~i:1 env with
-        | T_LBRACKET ->
-          error_unexpected_variance env variance;
-          internal_slot env start_loc static ~leading
-        | _ -> indexer_property env start_loc static variance ~leading)
-      | T_LESS_THAN
-      | T_LPAREN ->
-        (* Note that `static(): void` is a static callable property if we
-           successfully parsed the static modifier above. *)
-        error_unexpected_proto env proto;
-        error_unexpected_variance env variance;
-        call_property env start_loc static ~leading
-      | token ->
-        (match (static, proto, token) with
-        | (Some _, Some _, _) -> failwith "Can not have both `static` and `proto`"
-        | (Some static_loc, None, (T_PLING | T_COLON)) ->
-          (* We speculatively parsed `static` as a static modifier, but now
-             that we've parsed the next token, we changed our minds and want
-             to parse `static` as the key of a named property. *)
-          let key =
-            Expression.Object.Property.Identifier
-              (Flow_ast_utils.ident_of_source
-                 (static_loc, "static")
-                 ?comments:(Flow_ast_utils.mk_comments_opt ~leading ())
-              )
-          in
-          let static = None in
-          init_property env start_loc ~variance ~static ~proto ~leading:[] (static_loc, key)
-        | (None, Some proto_loc, (T_PLING | T_COLON)) ->
-          (* We speculatively parsed `proto` as a proto modifier, but now
-             that we've parsed the next token, we changed our minds and want
-             to parse `proto` as the key of a named property. *)
-          let key =
-            Expression.Object.Property.Identifier
-              (Flow_ast_utils.ident_of_source
-                 (proto_loc, "proto")
-                 ?comments:(Flow_ast_utils.mk_comments_opt ~leading ())
-              )
-          in
-          let proto = None in
-          init_property env start_loc ~variance ~static ~proto ~leading:[] (proto_loc, key)
-        | _ ->
-          let object_key env =
-            Eat.push_lex_mode env Lex_mode.NORMAL;
-            let result = Parse.object_key env in
-            Eat.pop_lex_mode env;
-            result
-          in
-          let leading_key = Peek.comments env in
-          (match object_key env with
-          | ( key_loc,
-              ( Expression.Object.Property.Identifier
-                  (_, { Identifier.name = ("get" | "set") as name; comments = _ }) as key
-              )
-            ) ->
-            begin
-              match Peek.token env with
-              | T_LESS_THAN
-              | T_LPAREN ->
-                error_unexpected_proto env proto;
-                error_unexpected_variance env variance;
-                method_property env start_loc static key ~leading
-              | T_COLON
-              | T_PLING ->
-                init_property env start_loc ~variance ~static ~proto ~leading (key_loc, key)
-              | _ ->
-                ignore (object_key_remove_trailing env key);
-                let key = object_key env in
-                let is_getter = name = "get" in
-                let leading = leading @ leading_key in
-                error_unexpected_proto env proto;
-                error_unexpected_variance env variance;
-                getter_or_setter ~is_getter ~leading env start_loc static key
-            end
-          | (key_loc, key) ->
-            begin
-              match Peek.token env with
-              | T_LESS_THAN
-              | T_LPAREN ->
-                error_unexpected_proto env proto;
-                error_unexpected_variance env variance;
-                method_property env start_loc static key ~leading
-              | _ ->
-                error_invalid_property_name env is_class static key;
-                init_property env start_loc ~variance ~static ~proto ~leading (key_loc, key)
-            end))
-    in
-    fun ~is_class ~allow_exact ~allow_spread env ->
-      let exact = allow_exact && Peek.token env = T_LCURLYBAR in
-      let allow_inexact = allow_exact && not exact in
-      with_loc
-        (fun env ->
-          let leading = Peek.comments env in
-          Expect.token
-            env
-            ( if exact then
-              T_LCURLYBAR
-            else
-              T_LCURLY
-            );
-          let (properties, inexact, internal) =
-            let env = with_no_anon_function_type false env in
-            properties ~is_class ~allow_inexact ~exact ~allow_spread env ([], false, [])
-          in
-          let internal = internal @ Peek.comments env in
-          Expect.token
-            env
-            ( if exact then
-              T_RCURLYBAR
-            else
-              T_RCURLY
-            );
-          let trailing = Eat.trailing_comments env in
-
-          (* inexact = true iff `...` was used to indicate inexactnes *)
-          {
-            Type.Object.exact;
-            properties;
-            inexact;
-            comments = Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-          })
-        env
-
-  and interface_helper =
-    let rec supers env acc =
-      let super = generic env in
-      let acc = super :: acc in
-      match Peek.token env with
-      | T_COMMA ->
-        Expect.token env T_COMMA;
-        supers env acc
-      | _ -> List.rev acc
-    in
-    fun env ->
-      let extends =
-        if Peek.token env = T_EXTENDS then (
-          Expect.token env T_EXTENDS;
-          let extends = supers env [] in
-          generic_type_list_remove_trailing env extends
-        ) else
-          []
-      in
-      let body = _object env ~allow_exact:false ~allow_spread:false ~is_class:false in
-      (extends, body)
-
-  and type_identifier env =
-    let (loc, { Identifier.name; comments }) = identifier_name env in
-    if is_reserved_type name then error_at env (loc, Parse_error.UnexpectedReservedType);
-    (loc, { Identifier.name; comments })
-
-  and bounded_type env =
-    with_loc
-      (fun env ->
-        let name = type_identifier env in
-        let bound =
-          if Peek.token env = T_COLON then
-            Ast.Type.Available (annotation env)
-          else
-            Ast.Type.Missing (Peek.loc_skip_lookahead env)
-        in
-        (name, bound))
-      env
-
-  and type_params =
-    let rec params env ~require_default acc =
-      Type.TypeParam.(
-        let (loc, (variance, name, bound, default, require_default)) =
-          with_loc
-            (fun env ->
-              let variance = maybe_variance env in
-              let (loc, (name, bound)) = bounded_type env in
-              let (default, require_default) =
-                match Peek.token env with
-                | T_ASSIGN ->
-                  Eat.token env;
-                  (Some (_type env), true)
-                | _ ->
-                  if require_default then error_at env (loc, Parse_error.MissingTypeParamDefault);
-                  (None, require_default)
-              in
-              (variance, name, bound, default, require_default))
-            env
-        in
-        let param = (loc, { name; bound; variance; default }) in
-        let acc = param :: acc in
-        match Peek.token env with
-        | T_EOF
-        | T_GREATER_THAN ->
-          List.rev acc
-        | _ ->
-          Expect.token env T_COMMA;
-          if Peek.token env = T_GREATER_THAN then
-            List.rev acc
-          else
-            params env ~require_default acc
-      )
-    in
-    fun env ->
-      if Peek.token env = T_LESS_THAN then (
-        if not (should_parse_types env) then error env Parse_error.UnexpectedTypeAnnotation;
-        Some
-          (with_loc
-             (fun env ->
-               let leading = Peek.comments env in
-               Expect.token env T_LESS_THAN;
-               let params = params env ~require_default:false [] in
-               let internal = Peek.comments env in
-               Expect.token env T_GREATER_THAN;
-               let trailing = Eat.trailing_comments env in
-               {
-                 Type.TypeParams.params;
-                 comments =
-                   Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-               })
-             env
-          )
-      ) else
-        None
-
-  and type_args =
-    let rec args env acc =
-      match Peek.token env with
-      | T_EOF
-      | T_GREATER_THAN ->
-        List.rev acc
-      | _ ->
-        let acc = _type env :: acc in
-        if Peek.token env <> T_GREATER_THAN then Expect.token env T_COMMA;
-        args env acc
-    in
-    fun env ->
-      if Peek.token env = T_LESS_THAN then
-        Some
-          (with_loc
-             (fun env ->
-               let leading = Peek.comments env in
-               Expect.token env T_LESS_THAN;
-               let env = with_no_anon_function_type false env in
-               let arguments = args env [] in
-               let internal = Peek.comments env in
-               Expect.token env T_GREATER_THAN;
-               let trailing = Eat.trailing_comments env in
-               {
-                 Type.TypeArgs.arguments;
-                 comments =
-                   Flow_ast_utils.mk_comments_with_internal_opt ~leading ~trailing ~internal ();
-               })
-             env
-          )
-      else
-        None
-
-  and generic env = raw_generic_with_identifier env (type_identifier env)
-
-  and raw_generic_with_identifier =
-    let rec identifier env (q_loc, qualification) =
-      if Peek.token env = T_PERIOD && Peek.ith_is_type_identifier ~i:1 env then
-        let (loc, q) =
-          with_loc
-            ~start_loc:q_loc
-            (fun env ->
-              Expect.token env T_PERIOD;
-              let id = type_identifier env in
-              { Type.Generic.Identifier.qualification; id })
-            env
-        in
-        let qualification = Type.Generic.Identifier.Qualified (loc, q) in
-        identifier env (loc, qualification)
-      else
-        (q_loc, qualification)
-    in
-    fun env id ->
-      with_loc
-        ~start_loc:(fst id)
-        (fun env ->
-          let id = (fst id, Type.Generic.Identifier.Unqualified id) in
-          let id =
-            let (_id_loc, id) = identifier env id in
-            if Peek.token env <> T_LESS_THAN then
-              id
-            else
-              let { remove_trailing; _ } = trailing_and_remover env in
-              remove_trailing id (fun remover id -> remover#generic_identifier_type id)
-          in
-          let targs = type_args env in
-          { Type.Generic.id; targs; comments = None })
-        env
-
-  and generic_type_with_identifier env id =
-    let (loc, generic) = raw_generic_with_identifier env id in
-    (loc, Type.Generic generic)
-
-  and annotation_opt env =
-    match Peek.token env with
-    | T_COLON -> Type.Available (annotation env)
-    | _ -> Type.Missing (Peek.loc_skip_lookahead env)
-
-  and add_comments (loc, t) leading trailing =
-    let merge_comments inner =
-      Flow_ast_utils.merge_comments
-        ~inner
-        ~outer:(Flow_ast_utils.mk_comments_opt ~leading ~trailing ())
-    in
-    let merge_comments_with_internal inner =
-      Flow_ast_utils.merge_comments_with_internal
-        ~inner
-        ~outer:(Flow_ast_utils.mk_comments_opt ~leading ~trailing ())
-    in
-    let open Ast.Type in
-    ( loc,
-      match t with
-      | Any comments -> Any (merge_comments comments)
-      | Mixed comments -> Mixed (merge_comments comments)
-      | Empty comments -> Empty (merge_comments comments)
-      | Void comments -> Void (merge_comments comments)
-      | Null comments -> Null (merge_comments comments)
-      | Number comments -> Number (merge_comments comments)
-      | BigInt comments -> BigInt (merge_comments comments)
-      | String comments -> String (merge_comments comments)
-      | Boolean comments -> Boolean (merge_comments comments)
-      | Symbol comments -> Symbol (merge_comments comments)
-      | Exists comments -> Exists (merge_comments comments)
-      | Nullable ({ Nullable.comments; _ } as t) ->
-        Nullable { t with Nullable.comments = merge_comments comments }
-      | Function ({ Function.comments; _ } as t) ->
-        Function { t with Function.comments = merge_comments comments }
-      | Object ({ Object.comments; _ } as t) ->
-        Object { t with Object.comments = merge_comments_with_internal comments }
-      | Interface ({ Interface.comments; _ } as t) ->
-        Interface { t with Interface.comments = merge_comments comments }
-      | Array ({ Array.comments; _ } as t) ->
-        Array { t with Array.comments = merge_comments comments }
-      | Generic ({ Generic.comments; _ } as t) ->
-        Generic { t with Generic.comments = merge_comments comments }
-      | IndexedAccess ({ IndexedAccess.comments; _ } as t) ->
-        IndexedAccess { t with IndexedAccess.comments = merge_comments comments }
-      | OptionalIndexedAccess
-          {
-            OptionalIndexedAccess.indexed_access = { IndexedAccess.comments; _ } as indexed_access;
-            optional;
-          } ->
-        OptionalIndexedAccess
-          {
-            OptionalIndexedAccess.indexed_access =
-              { indexed_access with IndexedAccess.comments = merge_comments comments };
-            optional;
-          }
-      | Union ({ Union.comments; _ } as t) ->
-        Union { t with Union.comments = merge_comments comments }
-      | Intersection ({ Intersection.comments; _ } as t) ->
-        Intersection { t with Intersection.comments = merge_comments comments }
-      | Typeof ({ Typeof.comments; _ } as t) ->
-        Typeof { t with Typeof.comments = merge_comments comments }
-      | Tuple ({ Tuple.comments; _ } as t) ->
-        Tuple { t with Tuple.comments = merge_comments comments }
-      | StringLiteral ({ StringLiteral.comments; _ } as t) ->
-        StringLiteral { t with StringLiteral.comments = merge_comments comments }
-      | NumberLiteral ({ NumberLiteral.comments; _ } as t) ->
-        NumberLiteral { t with NumberLiteral.comments = merge_comments comments }
-      | BigIntLiteral ({ BigIntLiteral.comments; _ } as t) ->
-        BigIntLiteral { t with BigIntLiteral.comments = merge_comments comments }
-      | BooleanLiteral ({ BooleanLiteral.comments; _ } as t) ->
-        BooleanLiteral { t with BooleanLiteral.comments = merge_comments comments }
-    )
-
-  let predicate =
-    with_loc (fun env ->
-        let open Ast.Type.Predicate in
-        let leading = Peek.comments env in
-        Expect.token env T_CHECKS;
-        if Peek.token env = T_LPAREN then (
-          let leading = leading @ Peek.comments env in
-          Expect.token env T_LPAREN;
-          Eat.push_lex_mode env Lex_mode.NORMAL;
-          let exp = Parse.conditional env in
-          Eat.pop_lex_mode env;
-          Expect.token env T_RPAREN;
-          let trailing = Eat.trailing_comments env in
-          { kind = Declared exp; comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing () }
-        ) else
-          let trailing = Eat.trailing_comments env in
-          {
-            kind = Ast.Type.Predicate.Inferred;
-            comments = Flow_ast_utils.mk_comments_opt ~leading ~trailing ();
-          }
-    )
-
-  let predicate_opt env =
-    let env = with_no_anon_function_type false env in
-    match Peek.token env with
-    | T_CHECKS -> Some (predicate env)
-    | _ -> None
-
-  let annotation_and_predicate_opt env =
-    let open Ast.Type in
-    match (Peek.token env, Peek.ith_token ~i:1 env) with
-    | (T_COLON, T_CHECKS) ->
-      Expect.token env T_COLON;
-      (Missing (Peek.loc_skip_lookahead env), predicate_opt env)
-    | (T_COLON, _) ->
-      let annotation =
-        let annotation = annotation_opt env in
-        if Peek.token env = T_CHECKS then
-          type_annotation_hint_remove_trailing env annotation
-        else
-          annotation
-      in
-      let predicate = predicate_opt env in
-      (annotation, predicate)
-    | _ -> (Missing (Peek.loc_skip_lookahead env), None)
-
-  let wrap f env =
-    let env = env |> with_strict true in
-    Eat.push_lex_mode env Lex_mode.TYPE;
-    let ret = f env in
-    Eat.pop_lex_mode env;
-    ret
-
-  let _type = wrap _type
-
-  let type_identifier = wrap type_identifier
-
-  let type_params = wrap type_params
-
-  let type_args = wrap type_args
-
-  let _object ~is_class env = wrap (_object ~is_class ~allow_exact:false ~allow_spread:false) env
-
-  let interface_helper = wrap interface_helper
-
-  let function_param_list = wrap function_param_list
-
-  let annotation = wrap annotation
-
-  let annotation_opt = wrap annotation_opt
-
-  let predicate_opt = wrap predicate_opt
-
-  let annotation_and_predicate_opt = wrap annotation_and_predicate_opt
-
-  let generic = wrap generic
-end
diff --git a/jscomp/js_parser/wtf8.ml b/jscomp/js_parser/wtf8.ml
deleted file mode 100644
index be7d371..0000000
--- a/jscomp/js_parser/wtf8.ml
+++ /dev/null
@@ -1,103 +0,0 @@
-(**
- * Copyright (c) 2017-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-(*
- * WTF-8 is a superset of UTF-8 that allows unpaired surrogates.
- *
- * From ES6 6.1.4, "The String Type":
- *
- *   Where ECMAScript operations interpret String values, each element is
- *   interpreted as a single UTF-16 code unit. However, ECMAScript does not
- *   place any restrictions or requirements on the sequence of code units in
- *   a String value, so they may be ill-formed when interpreted as UTF-16 code
- *   unit sequences. Operations that do not interpret String contents treat
- *   them as sequences of undifferentiated 16-bit unsigned integers.
- *
- * If we try to encode these ill-formed code units into UTF-8, we similarly
- * get ill-formed UTF-8. WTF-8 is a fun name for that encoding.
- *
- * https://simonsapin.github.io/wtf-8/
- *)
-
-type codepoint =
-  | Point of int
-  | Malformed
-
-type 'a folder = 'a -> int -> codepoint -> 'a
-
-(* WTF-8 is a variable length encoding. The first byte in each codepoint
-   determines how many other bytes follow. *)
-let needed_bytes c =
-  if 0x00 <= c && c <= 0x7F then 1 else
-  if 0xC2 <= c && c <= 0xDF then 2 else
-  if 0xE0 <= c && c <= 0xEF then 3 else
-  if 0xF0 <= c && c <= 0xF4 then 4 else
-  0
-
-let unsafe_char s i = Char.code (Bytes.unsafe_get s i)
-
-let codepoint s i = function
-  | 1 -> unsafe_char s i
-  | 2 ->
-    let b0 = unsafe_char s i in
-    let b1 = unsafe_char s (i + 1) in
-    ((b0 land 0x1F) lsl 6) lor (b1 land 0x3F)
-  | 3 ->
-    let b0 = unsafe_char s (i) in
-    let b1 = unsafe_char s (i + 1) in
-    let b2 = unsafe_char s (i + 2) in
-    ((b0 land 0x0F) lsl 12) lor
-    ((b1 land 0x3F) lsl 6) lor
-    (b2 land 0x3F)
-  | 4 ->
-    let b0 = unsafe_char s (i) in
-    let b1 = unsafe_char s (i + 1) in
-    let b2 = unsafe_char s (i + 2) in
-    let b3 = unsafe_char s (i + 3) in
-    ((b0 land 0x07) lsl 18) lor
-    ((b1 land 0x3F) lsl 12) lor
-    ((b2 land 0x3F) lsl 6) lor
-    (b3 land 0x3F)
-  | _ -> assert false
-
-(* Fold over the WTF-8 code units in a string *)
-let fold_wtf_8 ?(pos = 0) ?len f acc s =
-  let rec loop acc f s i l =
-    if i = l then acc else
-    let need = needed_bytes (unsafe_char s i) in
-    if need = 0 then (loop [@tailcall]) (f acc i Malformed) f s (i + 1) l else
-    let rem = l - i in
-    if rem < need then f acc i Malformed else
-    (loop [@tailcall]) (f acc i (Point (codepoint s i need))) f s (i + need) l
-  in
-  let len = match len with
-  | None -> String.length s - pos
-  | Some l -> l
-  in
-  loop acc f (Bytes.unsafe_of_string s) pos len
-
-(* Add a UTF-16 code unit to a buffer, encoded in WTF-8. *)
-let add_wtf_8 buf code =
-  let[@inline] w byte = Buffer.add_char buf (Char.unsafe_chr byte) in
-  if code >= 0x10000 then begin
-  (* 4 bytes *)
-    w (0xf0 lor (code lsr 18));
-    w (0x80 lor ((code lsr 12) land 0x3F));
-    w (0x80 lor ((code lsr 6) land 0x3F));
-    w (0x80 lor (code land 0x3F))
-  end else if code >= 0x800 then begin
-  (* 3 bytes *)
-    w (0xe0 lor (code lsr 12));
-    w (0x80 lor ((code lsr 6) land 0x3F));
-    w (0x80 lor (code land 0x3F))
-  end else if code >= 0x80 then begin
-  (* 2 bytes *)
-    w (0xc0 lor (code lsr 6));
-    w (0x80 lor (code land 0x3F))
-  end else
-  (* 1 byte *)
-    w code
diff --git a/jscomp/js_parser/wtf8.mli b/jscomp/js_parser/wtf8.mli
deleted file mode 100644
index 8aac2e9..0000000
--- a/jscomp/js_parser/wtf8.mli
+++ /dev/null
@@ -1,19 +0,0 @@
-(*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *)
-
-[@@@ocaml.text
-"\n * Copyright (c) 2017-present, Facebook, Inc.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n "]
-
-type codepoint =
-  | Point of int
-  | Malformed
-
-type 'a folder = 'a -> int -> codepoint -> 'a
-
-val fold_wtf_8 : ?pos:int -> ?len:int -> 'a folder -> 'a -> string -> 'a
-
-val add_wtf_8 : Buffer.t -> int -> unit
diff --git a/jscomp/jsoo/.ocamlformat b/jscomp/jsoo/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/jsoo/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/jsoo/dune b/jscomp/jsoo/dune
deleted file mode 100644
index 89169e6..0000000
--- a/jscomp/jsoo/dune
+++ /dev/null
@@ -1,10 +0,0 @@
-; Don't build the JS compiler by default as it slows down CI considerably.
-
-(executables
- (names jsoo_playground_main)
- (modes js)
- (enabled_if
-  (= %{profile} browser))
- (flags
-  (:standard -w -A))
- (libraries core syntax ml js_of_ocaml))
diff --git a/jscomp/jsoo/jsoo_playground_main.ml b/jscomp/jsoo/jsoo_playground_main.ml
deleted file mode 100644
index 0bc73da..0000000
--- a/jscomp/jsoo/jsoo_playground_main.ml
+++ /dev/null
@@ -1,709 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-
-(*
- * The API version is giving information about the feature set
- * of the resulting ReScript JS bundle API.
- *
- * It follows the semver format {major.minor} which means:
- * - Whenever there is a breaking change, raise the major version
- * - Whenever there is a feature addition, raise the minor version
- *
- * Whenever you are changing functionality in here, please double check
- * if you are breaking any APIs. If yes, make sure to update this apiVersion
- * value accordingly.
- *
- * Rationale:
- * We ship ReScript bindings that bind to this API. To be able to handle
- * different bundles with different API versions, we need a way to tell the
- * consumer on what interface the bundle provides.
- *
- * This will allow the frontend to have different sets of the same bindings,
- * and use the proper interfaces as stated by the apiVersion.
- *
- * -----------------------------
- * Version History: * v2: Remove refmt support (removes compiler.reason apis)
- * v3: Switched to Uncurried mode by default (requires third party packages
- to be built with uncurried: true in bsconfig.json). Also added
- `config.uncurried` to the BundleConfig.
- * v4: Added `config.open_modules` to the BundleConfig to enable implicitly opened
- * modules in the playground.
- * *)
-let apiVersion = "4"
-
-module Js = Js_of_ocaml.Js
-
-let export (field : string) v =
-  Js.Unsafe.set (Js.Unsafe.global) field v
-;;
-
-module Lang = struct
-  type t = OCaml | Res
-
-  let fromString t = match t with
-    | "ocaml" | "ml" -> Some OCaml
-    | "res" -> Some Res
-    | _ -> None
-
-  let toString t = match t with
-    | OCaml -> "ml"
-    | Res -> "res"
-end
-
-module BundleConfig = struct
-  type t = {
-    mutable module_system: Ext_module_system.t;
-    mutable filename: string option;
-    mutable warn_flags: string;
-    mutable open_modules: string list;
-
-    (* This one can't be mutated since we only provide
-       third-party packages that were compiled for uncurried
-       mode *)
-    uncurried: bool;
-  }
-
-  let make () = {
-    module_system=Ext_module_system.Commonjs;
-    filename=None;
-    warn_flags=Bsc_warnings.defaults_w;
-    open_modules=[];
-    uncurried=(!Config.uncurried = Uncurried);
-  }
-
-
-  let default_filename (lang: Lang.t) = "playground." ^ (Lang.toString lang)
-
-  let string_of_module_system m = (match m with
-    | Ext_module_system.Commonjs -> "nodejs"
-    | Esmodule -> "es6"
-    | Es6_global -> "es6_global")
-end
-
-type locErrInfo = {
-  fullMsg: string; (* Full report string with all context *)
-  shortMsg: string; (* simple explain message without any extra context *)
-  loc: Location.t;
-}
-
-module LocWarnInfo = struct
-  type t = {
-    fullMsg: string; (* Full super_error related warn string *)
-    shortMsg: string; (* Plain warn message without any context *)
-    warnNumber: int;
-    isError: bool;
-    loc: Location.t;
-  }
-end
-
-
-exception RescriptParsingErrors of locErrInfo list
-
-module ErrorRet = struct
-  let locErrorAttributes ~(type_: string) ~(fullMsg: string) ~(shortMsg: string) (loc: Location.t) =
-    let (_file,line,startchar) = Location.get_pos_info loc.Location.loc_start in
-    let (_file,endline,endchar) = Location.get_pos_info loc.Location.loc_end in
-    Js.Unsafe.([|
-      "fullMsg", inject @@ Js.string fullMsg;
-      "row"    , inject line;
-      "column" , inject startchar;
-      "endRow" , inject endline;
-      "endColumn" , inject endchar;
-      "shortMsg" , inject @@ Js.string shortMsg;
-      "type" , inject @@ Js.string type_;
-    |])
-
-  let makeWarning (e: LocWarnInfo.t) =
-    let locAttrs = locErrorAttributes
-        ~type_:"warning"
-        ~fullMsg: e.fullMsg
-        ~shortMsg: e.shortMsg
-        e.loc in
-    let warnAttrs =  Js.Unsafe.([|
-        "warnNumber", inject @@ (e.warnNumber |> float_of_int |> Js.number_of_float);
-        "isError", inject @@ Js.bool e.isError;
-      |]) in
-    let attrs = Array.append locAttrs warnAttrs in
-    Js.Unsafe.obj attrs
-
-  let fromLocErrors ?(warnings: LocWarnInfo.t array option) ~(type_: string) (errors: locErrInfo array) =
-    let jsErrors = Array.map
-        (fun (e: locErrInfo) ->
-           Js.Unsafe.(obj
-                        (locErrorAttributes
-                           ~type_
-                           ~fullMsg: e.fullMsg
-                           ~shortMsg: e.shortMsg
-                           e.loc))) errors
-    in
-    let locErrAttrs = Js.Unsafe.([|
-        "errors" , inject @@ Js.array jsErrors;
-        "type" , inject @@ Js.string type_
-      |])
-    in
-    let warningAttr = match warnings with
-      | Some warnings -> Js.Unsafe.([|
-          "warnings",
-          inject @@ Js.array (Array.map makeWarning warnings)
-        |])
-      | None -> [||]
-    in
-    let attrs = Array.append locErrAttrs warningAttr in
-    Js.Unsafe.(obj attrs)
-
-  let fromSyntaxErrors (errors: locErrInfo array) =
-    fromLocErrors ~type_:"syntax_error" errors
-
-  (* for raised errors caused by malformed warning / warning_error flags *)
-  let makeWarningFlagError ~(warn_flags: string) (msg: string)  =
-    Js.Unsafe.(obj [|
-        "msg" , inject @@ Js.string msg;
-        "warn_flags", inject @@ Js.string warn_flags;
-        "type" , inject @@ Js.string "warning_flag_error"
-      |])
-
-  let makeWarningError (errors: LocWarnInfo.t array) =
-    let type_ = "warning_error" in
-    let jsErrors = Array.map makeWarning errors in
-    Js.Unsafe.(obj [|
-        "errors" , inject @@ Js.array jsErrors;
-        "type" , inject @@ Js.string type_
-      |])
-
-  let makeUnexpectedError msg =
-    Js.Unsafe.(obj [|
-        "msg" , inject @@ Js.string msg;
-        "type" , inject @@ Js.string "unexpected_error"
-      |])
-
-end
-
-(* One time setup for all relevant modules *)
-let () =
-  Bs_conditional_initial.setup_env ();
-  (* From now on the default setting will be uncurried mode *)
-  Config.uncurried := Uncurried;
-  Clflags.binary_annotations := false;
-  Clflags.color := Some Always;
-  Lazy.force Res_outcome_printer.setup
-
-let error_of_exn e =
-  (match Location.error_of_exn e with
-  | Some (`Ok e) -> Some e
-  | Some `Already_displayed
-  | None -> None)
-
-(* Returns a default filename in case given value opt is not set *)
-let get_filename ~(lang: Lang.t) opt =
-  match opt with
-  | Some fname -> fname
-  | None -> BundleConfig.default_filename lang
-
-let lexbuf_from_string ~filename str =
-  let lexbuf = Lexing.from_string str in
-  lexbuf.lex_start_p <- { lexbuf.lex_start_p with pos_fname = filename };
-  lexbuf.lex_curr_p <- { lexbuf.lex_curr_p with pos_fname = filename };
-  lexbuf
-
-let ocaml_parse ~filename str =
-  lexbuf_from_string ~filename str |> Parse.implementation
-
-module ResDriver = struct
-  (* For now we are basically overriding functionality from Res_driver *)
-  open Res_driver
-
-  (* adds ~src parameter *)
-  let setup ~src ~filename ~forPrinter () =
-    let mode = if forPrinter
-      then Res_parser.Default
-      else ParseForTypeChecker
-    in
-    Res_parser.make ~mode src filename
-
-  (* get full super error message *)
-  let diagnosticToString ~(src: string) (d: Res_diagnostics.t) =
-    let startPos = Res_diagnostics.getStartPos(d) in
-    let endPos = Res_diagnostics.getEndPos(d) in
-    let msg = Res_diagnostics.explain(d) in
-    let loc = {loc_start = startPos; Location.loc_end=endPos; loc_ghost=false} in
-    let err = { Location.loc; msg; sub=[]; if_highlight=""} in
-    Location.default_error_reporter
-      ~src:(Some src)
-      Format.str_formatter
-      err;
-    Format.flush_str_formatter ()
-
-  let parse_implementation ~sourcefile ~forPrinter ~src =
-    Location.input_name := sourcefile;
-    let parseResult =
-      let engine = setup ~filename:sourcefile ~forPrinter ~src () in
-      let structure = Res_core.parseImplementation engine in
-      let (invalid, diagnostics) = match engine.diagnostics with
-        | [] as diagnostics -> (false, diagnostics)
-        | _ as diagnostics -> (true, diagnostics)
-      in {
-        filename = engine.scanner.filename;
-        source = engine.scanner.src;
-        parsetree = structure;
-        diagnostics;
-        invalid;
-        comments = List.rev engine.comments;
-      }
-    in
-    let () = if parseResult.invalid then
-        let errors = parseResult.diagnostics
-                     |> List.map (fun d ->
-                         let fullMsg = diagnosticToString ~src:parseResult.source d in
-                         let shortMsg = Res_diagnostics.explain d in
-                         let loc = {
-                           Location.loc_start = Res_diagnostics.getStartPos d;
-                           Location.loc_end = Res_diagnostics.getEndPos d;
-                           loc_ghost = false
-                         } in
-                         {
-                           fullMsg;
-                           shortMsg;
-                           loc;
-                         }
-                       )
-                     |> List.rev
-        in
-        raise (RescriptParsingErrors errors)
-    in
-    (parseResult.parsetree, parseResult.comments)
-end
-
-let rescript_parse ~filename src =
-  let (structure, _ ) = ResDriver.parse_implementation ~forPrinter:false ~sourcefile:filename ~src
-  in
-  structure
-
-
-module Printer = struct
-  let printExpr typ =
-    Printtyp.reset_names();
-    Printtyp.reset_and_mark_loops typ;
-    Res_doc.toString
-      ~width:60 (Res_outcome_printer.printOutTypeDoc (Printtyp.tree_of_typexp false typ))
-
-
-  let printDecl ~recStatus name decl =
-    Printtyp.reset_names();
-    Res_doc.toString
-      ~width:60
-      (Res_outcome_printer.printOutSigItemDoc (Printtyp.tree_of_type_declaration (Ident.create name) decl recStatus))
-end
-
-module Compile = struct
-  (* Apparently it's not possible to retrieve the loc info from
-   * Location.error_of_exn properly, so we need to do some extra
-   * overloading action
-   * *)
-  let warning_infos: LocWarnInfo.t array ref = ref [||]
-  let warning_buffer = Buffer.create 512
-  let warning_ppf = Format.formatter_of_buffer warning_buffer
-
-  let flush_warning_buffer () =
-    Format.pp_print_flush warning_ppf ();
-    let str = Buffer.contents warning_buffer in
-    Buffer.reset warning_buffer;
-    str
-
-  (* We need to overload the original warning printer to capture the warnings
-     as an array *)
-  let playground_warning_printer loc ppf w =
-    match Warnings.report w with
-      | `Inactive -> ()
-      | `Active { Warnings. number; is_error; } ->
-        Location.default_warning_printer loc ppf w;
-        let open LocWarnInfo in
-        let fullMsg = flush_warning_buffer () in
-        let shortMsg = Warnings.message w in
-        let info = {
-          fullMsg;
-          shortMsg;
-          warnNumber=number;
-          isError=is_error;
-          loc;
-        } in
-        warning_infos := Array.append !warning_infos [|info|]
-
-  let () =
-    Location.formatter_for_warnings := warning_ppf;
-    Location.warning_printer := playground_warning_printer
-
-  let handle_err e =
-    (match error_of_exn e with
-     | Some error ->
-       (* This branch handles all
-        * errors handled by the Location error reporting
-        * system.
-        *
-        * Here we can differentiate between the different kinds
-        * of error types just by looking at the raised exn names *)
-       let type_ = match e with
-         | Typetexp.Error _
-         | Typecore.Error _
-         | Typemod.Error _ -> "type_error"
-         | Lexer.Error _
-         | Syntaxerr.Error _ -> "syntax_error"
-         | _ -> "other_error"
-       in
-       let fullMsg =
-         Location.report_error Format.str_formatter error;
-         Format.flush_str_formatter ()
-       in
-       let err = { fullMsg; shortMsg=error.msg; loc=error.loc; } in
-       ErrorRet.fromLocErrors ~type_ [|err|]
-     | None ->
-       match e with
-       | RescriptParsingErrors errors ->
-         ErrorRet.fromSyntaxErrors(Array.of_list errors)
-       | _ ->
-         let msg = Printexc.to_string e in
-         match e with
-         | Warnings.Errors ->
-           ErrorRet.makeWarningError !warning_infos
-         | _ -> ErrorRet.makeUnexpectedError msg)
-
-  (* Responsible for resetting all compiler state as if it were a new instance *)
-  let reset_compiler () =
-    warning_infos := [||];
-    flush_warning_buffer () |> ignore;
-    Location.reset();
-    Warnings.reset_fatal ();
-    Env.reset_cache_toplevel ()
-
-  (* Collects the type information from the typed_tree, so we can use that
-   * data to display types on hover etc.
-   *
-   * Note: start / end positions
-   * *)
-  let collectTypeHints typed_tree =
-    let open Typedtree in
-    let createTypeHintObj loc kind hint =
-      let open Location in
-      let (_ , startline, startcol) = Location.get_pos_info loc.loc_start in
-      let (_ , endline, endcol) = Location.get_pos_info loc.loc_end in
-      Js.Unsafe.(obj [|
-          "start", inject @@ (obj [|
-              "line", inject @@ (startline |> float_of_int |> Js.number_of_float);
-              "col", inject @@ (startcol|> float_of_int |> Js.number_of_float);
-            |]);
-          "end", inject @@ (obj [|
-              "line", inject @@ (endline |> float_of_int |> Js.number_of_float);
-              "col", inject @@ (endcol |> float_of_int |> Js.number_of_float);
-            |]);
-          "kind", inject @@ Js.string kind;
-          "hint", inject @@ Js.string hint;
-        |])
-    in
-    let (structure, _) = typed_tree in
-    let acc = ref [] in
-    let module Iter = TypedtreeIter.MakeIterator (struct
-        include TypedtreeIter.DefaultIteratorArgument
-
-        let cur_rec_status = ref None
-
-        let enter_expression expr =
-          let hint = Printer.printExpr expr.exp_type in
-          let obj = createTypeHintObj expr.exp_loc "expression" hint in
-          acc := obj :: !acc
-
-        let enter_binding binding =
-          let hint = Printer.printExpr binding.vb_expr.exp_type in
-          let obj = createTypeHintObj binding.vb_loc "binding" hint in
-          acc := obj :: !acc
-
-        let enter_core_type ct =
-          let hint = Printer.printExpr ct.ctyp_type in
-          let obj = createTypeHintObj ct.ctyp_loc "core_type" hint in
-          acc := obj :: !acc
-
-        let enter_type_declarations recFlag =
-          let status = match recFlag with
-          | Asttypes.Nonrecursive -> Types.Trec_not
-          | Recursive -> Trec_first
-          in
-          cur_rec_status := Some status
-
-        let enter_type_declaration tdecl =
-          let open Types in
-          match !cur_rec_status with
-          | Some recStatus ->
-            let hint = Printer.printDecl ~recStatus tdecl.typ_name.Asttypes.txt tdecl.typ_type in
-            let obj = createTypeHintObj tdecl.typ_loc "type_declaration" hint in
-            acc := obj :: !acc;
-            (match recStatus with
-              | Trec_not
-              | Trec_first -> cur_rec_status := Some Trec_next
-              | _ -> ())
-          | None -> ()
-      end)
-    in
-    List.iter Iter.iter_structure_item structure.str_items;
-    Js.array (!acc |> Array.of_list)
-
-  let implementation ~(config: BundleConfig.t) ~lang str =
-    let {BundleConfig.module_system; warn_flags; open_modules} = config in
-    try
-      reset_compiler ();
-      Warnings.parse_options false warn_flags;
-      let filename = get_filename ~lang config.filename in
-      let modulename = "Playground" in
-      let impl = match lang with
-        | Lang.OCaml -> ocaml_parse ~filename
-        | Res -> rescript_parse ~filename
-      in
-      Clflags.open_modules := open_modules;
-      (* let env = !Toploop.toplevel_env in *)
-      (* Res_compmisc.init_path (); *)
-      (* let modulename = module_of_filename ppf sourcefile outputprefix in *)
-      (* Env.set_unit_name modulename; *)
-      Lam_compile_env.reset () ;
-      let env = Res_compmisc.initial_env () in (* Question ?? *)
-      (* let finalenv = ref Env.empty in *)
-      let types_signature = ref [] in
-      Js_config.jsx_version := Some Js_config.Jsx_v4; (* default *)
-      Js_config.jsx_mode := Js_config.Automatic; (* default *)
-      let ast = impl (str) in
-      let ast = Ppx_entry.rewrite_implementation ast in
-      let typed_tree =
-        let (a,b,_,signature) = Typemod.type_implementation_more modulename modulename modulename env ast in
-        (* finalenv := c ; *)
-        types_signature := signature;
-        (a,b) in
-      typed_tree
-      |>  Translmod.transl_implementation modulename
-      |> (* Printlambda.lambda ppf *) (fun (lam, exports) ->
-          let buffer = Buffer.create 1000 in
-          let () = Js_dump_program.pp_deps_program
-              ~output_prefix:"" (* does not matter here *)
-              module_system
-              (Lam_compile_main.compile "" exports lam)
-              (Ext_pp.from_buffer buffer) in
-          let v = Buffer.contents buffer in
-          let typeHints = collectTypeHints typed_tree in
-          Js.Unsafe.(obj [|
-              "js_code", inject @@ Js.string v;
-              "warnings",
-              inject @@ (
-                !warning_infos
-                |> Array.map ErrorRet.makeWarning
-                |> Js.array
-                |> inject
-              );
-              "type_hints", inject @@ typeHints;
-              "type" , inject @@ Js.string "success"
-            |]))
-    with
-    | e ->
-      match e with
-      | Arg.Bad msg ->
-        ErrorRet.makeWarningFlagError ~warn_flags msg
-      | _ -> handle_err e;;
-
-  let syntax_format ?(filename: string option) ~(from:Lang.t) ~(to_:Lang.t) (src: string) =
-    let filename = get_filename ~lang:from filename in
-    try
-      let code = match (from, to_) with
-        | (OCaml, Res) ->
-          let structure =
-            src
-            |> lexbuf_from_string ~filename
-            |> Parse.implementation
-          in
-          Res_printer.printImplementation ~width:80 structure ~comments:[]
-        | (Res, OCaml) ->
-          let (structure, _) =
-            ResDriver.parse_implementation ~forPrinter:false ~sourcefile:filename ~src
-          in
-          Pprintast.structure Format.str_formatter structure;
-          Format.flush_str_formatter ()
-        | (Res, Res) ->
-          (* Essentially pretty printing.
-           * IMPORTANT: we need forPrinter:true when parsing code here,
-           * otherwise we will loose some information for the ReScript printer *)
-          let (structure, comments) =
-            ResDriver.parse_implementation ~forPrinter:true ~sourcefile:filename ~src
-          in
-          Res_printer.printImplementation ~width:80 structure ~comments
-        | (OCaml, OCaml) -> src
-      in
-      Js.Unsafe.(obj [|
-          "code", inject @@ Js.string code;
-          "fromLang", inject @@ Js.string (Lang.toString from);
-          "toLang", inject @@ Js.string (Lang.toString to_);
-          "type" , inject @@ Js.string "success"
-        |])
-    with
-    | e -> handle_err e
-end
-
-
-(* To add a directory to the load path *)
-let dir_directory d =
-  Config.load_path := d :: !Config.load_path
-let () =
-  dir_directory "/static"
-
-module Export = struct
-  let make_compiler ~config ~lang =
-    let open Lang in
-    let open Js.Unsafe in
-    let baseAttrs =
-      [|"compile",
-        inject @@
-        Js.wrap_meth_callback
-          (fun _ code ->
-             (Compile.implementation ~config ~lang (Js.to_string code)));
-        "version",
-        inject @@
-        Js.string
-          (match lang with
-           | Res -> Bs_version.version
-           | OCaml -> Sys.ocaml_version);
-      |] in
-    let attrs =
-      if lang != OCaml then
-        Array.append baseAttrs [|
-          ("format",
-           inject @@
-           Js.wrap_meth_callback
-             (fun _ code ->
-                (match lang with
-                 | OCaml -> ErrorRet.makeUnexpectedError ("OCaml pretty printing not supported")
-                 | _ -> Compile.syntax_format ?filename:config.filename ~from:lang ~to_:lang (Js.to_string code))))
-        |]
-      else
-        baseAttrs
-    in
-    obj attrs
-
-  (* Creates a "compiler instance" binding the configuration context to the specific compile / formatter functions *)
-  let make () =
-    let open Lang in
-    let config = BundleConfig.make () in
-    let set_module_system value =
-      match value with
-      | "esmodule" | "es6" ->
-        config.module_system <- Ext_module_system.Esmodule; true
-      | "commonjs" | "nodejs" ->
-        config.module_system <- Commonjs; true
-      | _ -> false in
-    let set_filename value =
-      config.filename <- Some value; true
-    in
-    let set_warn_flags value =
-      config.warn_flags <- value; true
-    in
-    let set_open_modules value =
-      config.open_modules <- value; true
-    in
-    let convert_syntax ~(fromLang: string) ~(toLang: string) (src: string) =
-      let open Lang in
-      match (fromString fromLang, fromString toLang) with
-      | (Some from, Some to_) ->
-        Compile.syntax_format ?filename:config.filename ~from ~to_ src
-      | other ->
-        let msg = match other with
-          | (None, None) -> "Unknown from / to language: " ^ fromLang ^ ", " ^ toLang
-          | (None, Some _) -> "Unknown from language: " ^ fromLang
-          | (Some _, None) -> "Unknown to language: " ^ toLang
-          | (Some _, Some _) -> "Can't convert from " ^ fromLang ^ " to " ^ toLang
-        in
-        ErrorRet.makeUnexpectedError(msg)
-    in
-    Js.Unsafe.(obj [|
-        "version",
-        inject @@ Js.string Bs_version.version;
-        "ocaml",
-        inject @@ make_compiler ~config ~lang:OCaml;
-        "rescript",
-        inject @@ make_compiler ~config ~lang:Res;
-        "convertSyntax",
-        inject @@
-        Js.wrap_meth_callback
-          (fun _ fromLang toLang src ->
-             (convert_syntax ~fromLang:(Js.to_string fromLang) ~toLang:(Js.to_string toLang) (Js.to_string src))
-          );
-        "setModuleSystem",
-        inject @@
-        Js.wrap_meth_callback
-          (fun _ value ->
-             (Js.bool (set_module_system (Js.to_string value)))
-          );
-        "setFilename",
-        inject @@
-        Js.wrap_meth_callback
-          (fun _ value ->
-             (Js.bool (set_filename (Js.to_string value)))
-          );
-        "setWarnFlags",
-        inject @@
-        Js.wrap_meth_callback
-          (fun _ value ->
-             (Js.bool (set_warn_flags (Js.to_string value)))
-          );
-        "setOpenModules",
-        inject @@
-        Js.wrap_meth_callback
-          (fun _ (value) ->
-             (Js.bool (set_open_modules (value |> Js.to_array |> Array.map Js.to_string |> Array.to_list)))
-          );
-        "getConfig",
-        inject @@
-        Js.wrap_meth_callback
-          (fun _ ->
-             (Js.Unsafe.(obj
-                           [|
-                             "module_system",
-                             inject @@ (
-                               config.module_system
-                               |> BundleConfig.string_of_module_system
-                               |> Js.string
-                             );
-                             "warn_flags",
-                             inject @@ (Js.string config.warn_flags);
-                             "uncurried", inject @@ (Js.bool config.uncurried);
-                             "open_modules", inject @@ (config.open_modules |> Array.of_list |> Js.array);
-                           |]))
-          );
-      |])
-
-end
-
-let () =
-  export "rescript_compiler"
-    (Js.Unsafe.(obj
-                  [|
-                    "api_version",
-                    inject @@ Js.string apiVersion;
-                    "version",
-                    inject @@ Js.string Bs_version.version;
-                    "make",
-                    inject @@ Export.make
-                  |]))
-
diff --git a/jscomp/jsoo/jsoo_playground_main.mli b/jscomp/jsoo/jsoo_playground_main.mli
deleted file mode 100644
index f4f9d89..0000000
--- a/jscomp/jsoo/jsoo_playground_main.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-
diff --git a/jscomp/keywords.list b/jscomp/keywords.list
deleted file mode 100644
index b51740d..0000000
--- a/jscomp/keywords.list
+++ /dev/null
@@ -1,661 +0,0 @@
-AbortController
-AbortSignal
-AbstractRange
-AggregateError
-AnalyserNode
-Animation
-AnimationEffect
-AnimationEvent
-AnimationPlaybackEvent
-AnimationTimeline
-Array
-ArrayBuffer
-Atomics
-Attr
-Audio
-AudioBuffer
-AudioBufferSourceNode
-AudioContext
-AudioData
-AudioDestinationNode
-AudioListener
-AudioNode
-AudioParam
-AudioParamMap
-AudioProcessingEvent
-AudioScheduledSourceNode
-AudioSinkInfo
-AudioWorkletNode
-BackgroundFetchManager
-BackgroundFetchRecord
-BackgroundFetchRegistration
-BarProp
-BaseAudioContext
-BeforeInstallPromptEvent
-BeforeUnloadEvent
-BigInt
-BigInt64Array
-BigUint64Array
-BiquadFilterNode
-Blob
-BlobEvent
-BluetoothUUID
-Boolean
-BroadcastChannel
-BrowserCaptureMediaStreamTrack
-ByteLengthQueuingStrategy
-CDATASection
-CSS
-CSSAnimation
-CSSConditionRule
-CSSContainerRule
-CSSCounterStyleRule
-CSSFontFaceRule
-CSSFontPaletteValuesRule
-CSSGroupingRule
-CSSImageValue
-CSSImportRule
-CSSKeyframeRule
-CSSKeyframesRule
-CSSKeywordValue
-CSSLayerBlockRule
-CSSLayerStatementRule
-CSSMathClamp
-CSSMathInvert
-CSSMathMax
-CSSMathMin
-CSSMathNegate
-CSSMathProduct
-CSSMathSum
-CSSMathValue
-CSSMatrixComponent
-CSSMediaRule
-CSSNamespaceRule
-CSSNumericArray
-CSSNumericValue
-CSSPageRule
-CSSPerspective
-CSSPositionValue
-CSSPropertyRule
-CSSRotate
-CSSRule
-CSSRuleList
-CSSScale
-CSSSkew
-CSSSkewX
-CSSSkewY
-CSSStyleDeclaration
-CSSStyleRule
-CSSStyleSheet
-CSSStyleValue
-CSSSupportsRule
-CSSTransformComponent
-CSSTransformValue
-CSSTransition
-CSSTranslate
-CSSUnitValue
-CSSUnparsedValue
-CSSVariableReferenceValue
-CanvasCaptureMediaStreamTrack
-CanvasGradient
-CanvasPattern
-CanvasRenderingContext2D
-ChannelMergerNode
-ChannelSplitterNode
-CharacterData
-ClipboardEvent
-CloseEvent
-Comment
-CompositionEvent
-CompressionStream
-ConstantSourceNode
-ContentVisibilityAutoStateChangeEvent
-ConvolverNode
-CountQueuingStrategy
-CropTarget
-Crypto
-CustomElementRegistry
-CustomEvent
-CustomStateSet
-DOMError
-DOMException
-DOMImplementation
-DOMMatrix
-DOMMatrixReadOnly
-DOMParser
-DOMPoint
-DOMPointReadOnly
-DOMQuad
-DOMRect
-DOMRectList
-DOMRectReadOnly
-DOMStringList
-DOMStringMap
-DOMTokenList
-DataTransfer
-DataTransferItem
-DataTransferItemList
-DataView
-Date
-DecompressionStream
-DelayNode
-DelegatedInkTrailPresenter
-Document
-DocumentFragment
-DocumentPictureInPictureEvent
-DocumentTimeline
-DocumentType
-DragEvent
-DynamicsCompressorNode
-Element
-ElementInternals
-EncodedAudioChunk
-EncodedVideoChunk
-Error
-ErrorEvent
-EvalError
-Event
-EventCounts
-EventSource
-EventTarget
-External
-FeaturePolicy
-File
-FileList
-FileReader
-FinalizationRegistry
-Float32Array
-Float64Array
-FocusEvent
-FontFace
-FontFaceSetLoadEvent
-FormData
-FormDataEvent
-FragmentDirective
-Function
-GainNode
-Gamepad
-GamepadButton
-GamepadEvent
-GamepadHapticActuator
-Geolocation
-GeolocationCoordinates
-GeolocationPosition
-GeolocationPositionError
-HTMLAllCollection
-HTMLAnchorElement
-HTMLAreaElement
-HTMLAudioElement
-HTMLBRElement
-HTMLBaseElement
-HTMLBodyElement
-HTMLButtonElement
-HTMLCanvasElement
-HTMLCollection
-HTMLDListElement
-HTMLDataElement
-HTMLDataListElement
-HTMLDetailsElement
-HTMLDialogElement
-HTMLDirectoryElement
-HTMLDivElement
-HTMLDocument
-HTMLElement
-HTMLEmbedElement
-HTMLFieldSetElement
-HTMLFontElement
-HTMLFormControlsCollection
-HTMLFormElement
-HTMLFrameElement
-HTMLFrameSetElement
-HTMLHRElement
-HTMLHeadElement
-HTMLHeadingElement
-HTMLHtmlElement
-HTMLIFrameElement
-HTMLImageElement
-HTMLInputElement
-HTMLLIElement
-HTMLLabelElement
-HTMLLegendElement
-HTMLLinkElement
-HTMLMapElement
-HTMLMarqueeElement
-HTMLMediaElement
-HTMLMenuElement
-HTMLMetaElement
-HTMLMeterElement
-HTMLModElement
-HTMLOListElement
-HTMLObjectElement
-HTMLOptGroupElement
-HTMLOptionElement
-HTMLOptionsCollection
-HTMLOutputElement
-HTMLParagraphElement
-HTMLParamElement
-HTMLPictureElement
-HTMLPreElement
-HTMLProgressElement
-HTMLQuoteElement
-HTMLScriptElement
-HTMLSelectElement
-HTMLSlotElement
-HTMLSourceElement
-HTMLSpanElement
-HTMLStyleElement
-HTMLTableCaptionElement
-HTMLTableCellElement
-HTMLTableColElement
-HTMLTableElement
-HTMLTableRowElement
-HTMLTableSectionElement
-HTMLTemplateElement
-HTMLTextAreaElement
-HTMLTimeElement
-HTMLTitleElement
-HTMLTrackElement
-HTMLUListElement
-HTMLUnknownElement
-HTMLVideoElement
-HashChangeEvent
-Headers
-Highlight
-HighlightRegistry
-History
-IDBCursor
-IDBCursorWithValue
-IDBDatabase
-IDBFactory
-IDBIndex
-IDBKeyRange
-IDBObjectStore
-IDBOpenDBRequest
-IDBRequest
-IDBTransaction
-IDBVersionChangeEvent
-IIRFilterNode
-IdleDeadline
-Image
-ImageBitmap
-ImageBitmapRenderingContext
-ImageCapture
-ImageData
-ImageTrack
-ImageTrackList
-Infinity
-Ink
-InputDeviceCapabilities
-InputDeviceInfo
-InputEvent
-Int16Array
-Int32Array
-Int8Array
-IntersectionObserver
-IntersectionObserverEntry
-Intl
-JSON
-KeyboardEvent
-KeyframeEffect
-LargestContentfulPaint
-LaunchParams
-LaunchQueue
-LayoutShift
-LayoutShiftAttribution
-Location
-Map
-Math
-MathMLElement
-MediaCapabilities
-MediaElementAudioSourceNode
-MediaEncryptedEvent
-MediaError
-MediaList
-MediaMetadata
-MediaQueryList
-MediaQueryListEvent
-MediaRecorder
-MediaSession
-MediaSource
-MediaSourceHandle
-MediaStream
-MediaStreamAudioDestinationNode
-MediaStreamAudioSourceNode
-MediaStreamEvent
-MediaStreamTrack
-MediaStreamTrackEvent
-MediaStreamTrackGenerator
-MediaStreamTrackProcessor
-MessageChannel
-MessageEvent
-MessagePort
-MimeType
-MimeTypeArray
-MouseEvent
-MutationEvent
-MutationObserver
-MutationRecord
-NaN
-NamedNodeMap
-NavigateEvent
-Navigation
-NavigationCurrentEntryChangeEvent
-NavigationDestination
-NavigationHistoryEntry
-NavigationTransition
-Navigator
-NavigatorUAData
-NetworkInformation
-Node
-NodeFilter
-NodeIterator
-NodeList
-Notification
-Number
-Object
-OfflineAudioCompletionEvent
-OfflineAudioContext
-OffscreenCanvas
-OffscreenCanvasRenderingContext2D
-Option
-OscillatorNode
-OverconstrainedError
-PageTransitionEvent
-PannerNode
-Path2D
-PaymentManager
-PaymentRequestUpdateEvent
-Performance
-PerformanceElementTiming
-PerformanceEntry
-PerformanceEventTiming
-PerformanceLongTaskTiming
-PerformanceMark
-PerformanceMeasure
-PerformanceNavigation
-PerformanceNavigationTiming
-PerformanceObserver
-PerformanceObserverEntryList
-PerformancePaintTiming
-PerformanceResourceTiming
-PerformanceServerTiming
-PerformanceTiming
-PeriodicSyncManager
-PeriodicWave
-PermissionStatus
-Permissions
-PictureInPictureEvent
-PictureInPictureWindow
-Plugin
-PluginArray
-PointerEvent
-PopStateEvent
-ProcessingInstruction
-Profiler
-ProgressEvent
-Promise
-PromiseRejectionEvent
-Proxy
-PushManager
-PushSubscription
-PushSubscriptionOptions
-RTCCertificate
-RTCDTMFSender
-RTCDTMFToneChangeEvent
-RTCDataChannel
-RTCDataChannelEvent
-RTCDtlsTransport
-RTCEncodedAudioFrame
-RTCEncodedVideoFrame
-RTCError
-RTCErrorEvent
-RTCIceCandidate
-RTCIceTransport
-RTCPeerConnection
-RTCPeerConnectionIceErrorEvent
-RTCPeerConnectionIceEvent
-RTCRtpReceiver
-RTCRtpSender
-RTCRtpTransceiver
-RTCSctpTransport
-RTCSessionDescription
-RTCStatsReport
-RTCTrackEvent
-RadioNodeList
-Range
-RangeError
-ReadableByteStreamController
-ReadableStream
-ReadableStreamBYOBReader
-ReadableStreamBYOBRequest
-ReadableStreamDefaultController
-ReadableStreamDefaultReader
-ReferenceError
-Reflect
-RegExp
-RemotePlayback
-ReportingObserver
-Request
-ResizeObserver
-ResizeObserverEntry
-ResizeObserverSize
-Response
-SVGAElement
-SVGAngle
-SVGAnimateElement
-SVGAnimateMotionElement
-SVGAnimateTransformElement
-SVGAnimatedAngle
-SVGAnimatedBoolean
-SVGAnimatedEnumeration
-SVGAnimatedInteger
-SVGAnimatedLength
-SVGAnimatedLengthList
-SVGAnimatedNumber
-SVGAnimatedNumberList
-SVGAnimatedPreserveAspectRatio
-SVGAnimatedRect
-SVGAnimatedString
-SVGAnimatedTransformList
-SVGAnimationElement
-SVGCircleElement
-SVGClipPathElement
-SVGComponentTransferFunctionElement
-SVGDefsElement
-SVGDescElement
-SVGElement
-SVGEllipseElement
-SVGFEBlendElement
-SVGFEColorMatrixElement
-SVGFEComponentTransferElement
-SVGFECompositeElement
-SVGFEConvolveMatrixElement
-SVGFEDiffuseLightingElement
-SVGFEDisplacementMapElement
-SVGFEDistantLightElement
-SVGFEDropShadowElement
-SVGFEFloodElement
-SVGFEFuncAElement
-SVGFEFuncBElement
-SVGFEFuncGElement
-SVGFEFuncRElement
-SVGFEGaussianBlurElement
-SVGFEImageElement
-SVGFEMergeElement
-SVGFEMergeNodeElement
-SVGFEMorphologyElement
-SVGFEOffsetElement
-SVGFEPointLightElement
-SVGFESpecularLightingElement
-SVGFESpotLightElement
-SVGFETileElement
-SVGFETurbulenceElement
-SVGFilterElement
-SVGForeignObjectElement
-SVGGElement
-SVGGeometryElement
-SVGGradientElement
-SVGGraphicsElement
-SVGImageElement
-SVGLength
-SVGLengthList
-SVGLineElement
-SVGLinearGradientElement
-SVGMPathElement
-SVGMarkerElement
-SVGMaskElement
-SVGMatrix
-SVGMetadataElement
-SVGNumber
-SVGNumberList
-SVGPathElement
-SVGPatternElement
-SVGPoint
-SVGPointList
-SVGPolygonElement
-SVGPolylineElement
-SVGPreserveAspectRatio
-SVGRadialGradientElement
-SVGRect
-SVGRectElement
-SVGSVGElement
-SVGScriptElement
-SVGSetElement
-SVGStopElement
-SVGStringList
-SVGStyleElement
-SVGSwitchElement
-SVGSymbolElement
-SVGTSpanElement
-SVGTextContentElement
-SVGTextElement
-SVGTextPathElement
-SVGTextPositioningElement
-SVGTitleElement
-SVGTransform
-SVGTransformList
-SVGUnitTypes
-SVGUseElement
-SVGViewElement
-Scheduler
-Scheduling
-Screen
-ScreenOrientation
-ScriptProcessorNode
-ScrollTimeline
-SecurityPolicyViolationEvent
-Selection
-Set
-ShadowRoot
-SharedWorker
-SourceBuffer
-SourceBufferList
-SpeechSynthesisErrorEvent
-SpeechSynthesisEvent
-SpeechSynthesisUtterance
-StaticRange
-StereoPannerNode
-Storage
-StorageEvent
-String
-StylePropertyMap
-StylePropertyMapReadOnly
-StyleSheet
-StyleSheetList
-SubmitEvent
-Symbol
-SyncManager
-SyntaxError
-TaskAttributionTiming
-TaskController
-TaskPriorityChangeEvent
-TaskSignal
-Text
-TextDecoder
-TextDecoderStream
-TextEncoder
-TextEncoderStream
-TextEvent
-TextMetrics
-TextTrack
-TextTrackCue
-TextTrackCueList
-TextTrackList
-TimeRanges
-ToggleEvent
-Touch
-TouchEvent
-TouchList
-TrackEvent
-TransformStream
-TransformStreamDefaultController
-TransitionEvent
-TreeWalker
-TrustedHTML
-TrustedScript
-TrustedScriptURL
-TrustedTypePolicy
-TrustedTypePolicyFactory
-TypeError
-UIEvent
-URIError
-URL
-URLPattern
-URLSearchParams
-Uint16Array
-Uint32Array
-Uint8Array
-Uint8ClampedArray
-UserActivation
-VTTCue
-ValidityState
-VideoColorSpace
-VideoFrame
-VideoPlaybackQuality
-ViewTimeline
-ViewTransition
-VirtualKeyboardGeometryChangeEvent
-VisibilityStateEntry
-VisualViewport
-WaveShaperNode
-WeakMap
-WeakRef
-WeakSet
-WebAssembly
-WebGL2RenderingContext
-WebGLActiveInfo
-WebGLBuffer
-WebGLContextEvent
-WebGLFramebuffer
-WebGLProgram
-WebGLQuery
-WebGLRenderbuffer
-WebGLRenderingContext
-WebGLSampler
-WebGLShader
-WebGLShaderPrecisionFormat
-WebGLSync
-WebGLTexture
-WebGLTransformFeedback
-WebGLUniformLocation
-WebGLVertexArrayObject
-WebKitCSSMatrix
-WebKitMutationObserver
-WebSocket
-WheelEvent
-Window
-WindowControlsOverlay
-WindowControlsOverlayGeometryChangeEvent
-Worker
-WritableStream
-WritableStreamDefaultController
-WritableStreamDefaultWriter
-XMLDocument
-XMLHttpRequest
-XMLHttpRequestEventTarget
-XMLHttpRequestUpload
-XMLSerializer
-XPathEvaluator
-XPathExpression
-XPathResult
-XSLTProcessor
\ No newline at end of file
diff --git a/jscomp/ml/.ocamlformat b/jscomp/ml/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/ml/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/ml/ast_async.ml b/jscomp/ml/ast_async.ml
deleted file mode 100644
index b1552cd..0000000
--- a/jscomp/ml/ast_async.ml
+++ /dev/null
@@ -1,42 +0,0 @@
-let is_async : Parsetree.attribute -> bool =
-  fun ({txt}, _) -> txt = "async" || txt = "res.async"
-
-let add_promise_type ?(loc = Location.none) ~async
-    (result : Parsetree.expression) =
-  if async then
-    let unsafe_async =
-      Ast_helper.Exp.ident ~loc
-        {txt = Ldot (Ldot (Lident "Js", "Promise"), "unsafe_async"); loc}
-    in
-    Ast_helper.Exp.apply ~loc unsafe_async [(Nolabel, result)]
-  else result
-
-let add_async_attribute ~async (body : Parsetree.expression) =
-  if async then
-   (   
-      match body.pexp_desc with
-      | Pexp_construct (x, Some e) when Ast_uncurried.exprIsUncurriedFun body ->
-        {body with pexp_desc = Pexp_construct (x, Some {e  with pexp_attributes =
-        ({txt = "res.async"; loc = Location.none}, PStr []) :: e.pexp_attributes} )}
-      | _ ->
-        {
-          body with
-          pexp_attributes =
-            ({txt = "res.async"; loc = Location.none}, PStr [])
-            :: body.pexp_attributes;
-        })
-  else body
-
-let rec add_promise_to_result ~loc (e : Parsetree.expression) =
-  match e.pexp_desc with
-  | Pexp_fun (label, eo, pat, body) ->
-    let body = add_promise_to_result ~loc body in
-    {e with pexp_desc = Pexp_fun (label, eo, pat, body)}
-  | _ -> add_promise_type ~loc ~async:true e
-
-let make_function_async ~async (e : Parsetree.expression) =
-  if async then
-    match e.pexp_desc with
-    | Pexp_fun (_, _, {ppat_loc}, _) -> add_promise_to_result ~loc:ppat_loc e
-    | _ -> assert false
-  else e
diff --git a/jscomp/ml/ast_await.ml b/jscomp/ml/ast_await.ml
deleted file mode 100644
index 1393f04..0000000
--- a/jscomp/ml/ast_await.ml
+++ /dev/null
@@ -1,41 +0,0 @@
-let is_await : Parsetree.attribute -> bool =
-  fun ({txt}, _) -> txt = "await" || txt = "res.await"
-
-let create_await_expression (e : Parsetree.expression) =
-  let loc = {e.pexp_loc with loc_ghost = true} in
-  let unsafe_await =
-    Ast_helper.Exp.ident ~loc
-      {txt = Ldot (Ldot (Lident "Js", "Promise"), "unsafe_await"); loc}
-  in
-  Ast_helper.Exp.apply ~loc unsafe_await [(Nolabel, e)]
-
-(* Transform `@res.await M` to unpack(@res.await Js.import(module(M: __M0__))) *)
-let create_await_module_expression ~module_type_lid (e : Parsetree.module_expr)
-    =
-  let open Ast_helper in
-  let remove_await_attribute =
-    List.filter (fun ((loc, _) : Parsetree.attribute) -> loc.txt != "res.await")
-  in
-  {
-    e with
-    pmod_desc =
-      Pmod_unpack
-        (create_await_expression
-           (Exp.apply ~loc:e.pmod_loc
-              (Exp.ident ~loc:e.pmod_loc
-                 {
-                   txt = Longident.Ldot (Lident "Js", "import");
-                   loc = e.pmod_loc;
-                 })
-              [
-                ( Nolabel,
-                  Exp.constraint_ ~loc:e.pmod_loc
-                    (Exp.pack ~loc:e.pmod_loc
-                       {
-                         e with
-                         pmod_attributes =
-                           remove_await_attribute e.pmod_attributes;
-                       })
-                    (Typ.package ~loc:e.pmod_loc module_type_lid []) );
-              ]));
-  }
diff --git a/jscomp/ml/ast_helper.ml b/jscomp/ml/ast_helper.ml
deleted file mode 100644
index 80fb40a..0000000
--- a/jscomp/ml/ast_helper.ml
+++ /dev/null
@@ -1,560 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                         Alain Frisch, LexiFi                           *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Helpers to produce Parsetree fragments *)
-
-open Asttypes
-open Parsetree
-open Docstrings
-
-type lid = Longident.t loc
-type str = string loc
-type loc = Location.t
-type attrs = attribute list
-
-let default_loc = ref Location.none
-
-let with_default_loc l f =
-  let old = !default_loc in
-  default_loc := l;
-  try let r = f () in default_loc := old; r
-  with exn -> default_loc := old; raise exn
-
-module Const = struct
-  let integer ?suffix i = Pconst_integer (i, suffix)
-  let int ?suffix i = integer ?suffix (string_of_int i)
-  let int32 ?(suffix='l') i = integer ~suffix (Int32.to_string i)
-  let int64 ?(suffix='L') i = integer ~suffix (Int64.to_string i)
-  let nativeint ?(suffix='n') i = integer ~suffix (Nativeint.to_string i)
-  let float ?suffix f = Pconst_float (f, suffix)
-  let char c = Pconst_char (Char.code c)
-  let string ?quotation_delimiter s = Pconst_string (s, quotation_delimiter)
-end
-
-module Typ = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) d =
-    {ptyp_desc = d; ptyp_loc = loc; ptyp_attributes = attrs}
-  let attr d a = {d with ptyp_attributes = d.ptyp_attributes @ [a]}
-
-  let any ?loc ?attrs () = mk ?loc ?attrs Ptyp_any
-  let var ?loc ?attrs a = mk ?loc ?attrs (Ptyp_var a)
-  let arrow ?loc ?attrs a b c = mk ?loc ?attrs (Ptyp_arrow (a, b, c))
-  let tuple ?loc ?attrs a = mk ?loc ?attrs (Ptyp_tuple a)
-  let constr ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_constr (a, b))
-  let object_ ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_object (a, b))
-  let class_ ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_class (a, b))
-  let alias ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_alias (a, b))
-  let variant ?loc ?attrs a b c = mk ?loc ?attrs (Ptyp_variant (a, b, c))
-  let poly ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_poly (a, b))
-  let package ?loc ?attrs a b = mk ?loc ?attrs (Ptyp_package (a, b))
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Ptyp_extension a)
-
-  let force_poly t =
-    match t.ptyp_desc with
-    | Ptyp_poly _ -> t
-    | _ -> poly ~loc:t.ptyp_loc [] t (* -> ghost? *)
-
-  let varify_constructors var_names t =
-    let check_variable vl loc v =
-      if List.mem v vl then
-        raise Syntaxerr.(Error(Variable_in_scope(loc,v))) in
-    let var_names = List.map (fun v -> v.txt) var_names in
-    let rec loop t =
-      let desc =
-        match t.ptyp_desc with
-        | Ptyp_any -> Ptyp_any
-        | Ptyp_var x ->
-            check_variable var_names t.ptyp_loc x;
-            Ptyp_var x
-        | Ptyp_arrow (label,core_type,core_type') ->
-            Ptyp_arrow(label, loop core_type, loop core_type')
-        | Ptyp_tuple lst -> Ptyp_tuple (List.map loop lst)
-        | Ptyp_constr( { txt = Longident.Lident s }, [])
-          when List.mem s var_names ->
-            Ptyp_var s
-        | Ptyp_constr(longident, lst) ->
-            Ptyp_constr(longident, List.map loop lst)
-        | Ptyp_object (lst, o) ->
-            Ptyp_object (List.map loop_object_field lst, o)
-        | Ptyp_class (longident, lst) ->
-            Ptyp_class (longident, List.map loop lst)
-        | Ptyp_alias(core_type, string) ->
-            check_variable var_names t.ptyp_loc string;
-            Ptyp_alias(loop core_type, string)
-        | Ptyp_variant(row_field_list, flag, lbl_lst_option) ->
-            Ptyp_variant(List.map loop_row_field row_field_list,
-                         flag, lbl_lst_option)
-        | Ptyp_poly(string_lst, core_type) ->
-          List.iter (fun v ->
-            check_variable var_names t.ptyp_loc v.txt) string_lst;
-            Ptyp_poly(string_lst, loop core_type)
-        | Ptyp_package(longident,lst) ->
-            Ptyp_package(longident,List.map (fun (n,typ) -> (n,loop typ) ) lst)
-        | Ptyp_extension (s, arg) ->
-            Ptyp_extension (s, arg)
-      in
-      {t with ptyp_desc = desc}
-    and loop_row_field  =
-      function
-        | Rtag(label,attrs,flag,lst) ->
-            Rtag(label,attrs,flag,List.map loop lst)
-        | Rinherit t ->
-            Rinherit (loop t)
-    and loop_object_field =
-      function
-        | Otag(label, attrs, t) ->
-            Otag(label, attrs, loop t)
-        | Oinherit t ->
-            Oinherit (loop t)
-    in
-    loop t
-
-end
-
-module Pat = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) d =
-    {ppat_desc = d; ppat_loc = loc; ppat_attributes = attrs}
-  let attr d a = {d with ppat_attributes = d.ppat_attributes @ [a]}
-
-  let any ?loc ?attrs () = mk ?loc ?attrs Ppat_any
-  let var ?loc ?attrs a = mk ?loc ?attrs (Ppat_var a)
-  let alias ?loc ?attrs a b = mk ?loc ?attrs (Ppat_alias (a, b))
-  let constant ?loc ?attrs a = mk ?loc ?attrs (Ppat_constant a)
-  let interval ?loc ?attrs a b = mk ?loc ?attrs (Ppat_interval (a, b))
-  let tuple ?loc ?attrs a = mk ?loc ?attrs (Ppat_tuple a)
-  let construct ?loc ?attrs a b = mk ?loc ?attrs (Ppat_construct (a, b))
-  let variant ?loc ?attrs a b = mk ?loc ?attrs (Ppat_variant (a, b))
-  let record ?loc ?attrs a b = mk ?loc ?attrs (Ppat_record (a, b))
-  let array ?loc ?attrs a = mk ?loc ?attrs (Ppat_array a)
-  let or_ ?loc ?attrs a b = mk ?loc ?attrs (Ppat_or (a, b))
-  let constraint_ ?loc ?attrs a b = mk ?loc ?attrs (Ppat_constraint (a, b))
-  let type_ ?loc ?attrs a = mk ?loc ?attrs (Ppat_type a)
-  let lazy_ ?loc ?attrs a = mk ?loc ?attrs (Ppat_lazy a)
-  let unpack ?loc ?attrs a = mk ?loc ?attrs (Ppat_unpack a)
-  let open_ ?loc ?attrs a b = mk ?loc ?attrs (Ppat_open (a, b))
-  let exception_ ?loc ?attrs a = mk ?loc ?attrs (Ppat_exception a)
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Ppat_extension a)
-end
-
-module Exp = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) d =
-    {pexp_desc = d; pexp_loc = loc; pexp_attributes = attrs}
-  let attr d a = {d with pexp_attributes = d.pexp_attributes @ [a]}
-
-  let ident ?loc ?attrs a = mk ?loc ?attrs (Pexp_ident a)
-  let constant ?loc ?attrs a = mk ?loc ?attrs (Pexp_constant a)
-  let let_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_let (a, b, c))
-  let fun_ ?loc ?attrs a b c d = mk ?loc ?attrs (Pexp_fun (a, b, c, d))
-  let function_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_function a)
-  let apply ?loc ?attrs a b = mk ?loc ?attrs (Pexp_apply (a, b))
-  let match_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_match (a, b))
-  let try_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_try (a, b))
-  let tuple ?loc ?attrs a = mk ?loc ?attrs (Pexp_tuple a)
-  let construct ?loc ?attrs a b = mk ?loc ?attrs (Pexp_construct (a, b))
-  let variant ?loc ?attrs a b = mk ?loc ?attrs (Pexp_variant (a, b))
-  let record ?loc ?attrs a b = mk ?loc ?attrs (Pexp_record (a, b))
-  let field ?loc ?attrs a b = mk ?loc ?attrs (Pexp_field (a, b))
-  let setfield ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_setfield (a, b, c))
-  let array ?loc ?attrs a = mk ?loc ?attrs (Pexp_array a)
-  let ifthenelse ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_ifthenelse (a, b, c))
-  let sequence ?loc ?attrs a b = mk ?loc ?attrs (Pexp_sequence (a, b))
-  let while_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_while (a, b))
-  let for_ ?loc ?attrs a b c d e = mk ?loc ?attrs (Pexp_for (a, b, c, d, e))
-  let constraint_ ?loc ?attrs a b = mk ?loc ?attrs (Pexp_constraint (a, b))
-  let coerce ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_coerce (a, b, c))
-  let send ?loc ?attrs a b = mk ?loc ?attrs (Pexp_send (a, b))
-  let new_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_new a)
-  let setinstvar ?loc ?attrs a b = mk ?loc ?attrs (Pexp_setinstvar (a, b))
-  let override ?loc ?attrs a = mk ?loc ?attrs (Pexp_override a)
-  let letmodule ?loc ?attrs a b c= mk ?loc ?attrs (Pexp_letmodule (a, b, c))
-  let letexception ?loc ?attrs a b = mk ?loc ?attrs (Pexp_letexception (a, b))
-  let assert_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_assert a)
-  let lazy_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_lazy a)
-  let poly ?loc ?attrs a b = mk ?loc ?attrs (Pexp_poly (a, b))
-  let object_ ?loc ?attrs a = mk ?loc ?attrs (Pexp_object a)
-  let newtype ?loc ?attrs a b = mk ?loc ?attrs (Pexp_newtype (a, b))
-  let pack ?loc ?attrs a = mk ?loc ?attrs (Pexp_pack a)
-  let open_ ?loc ?attrs a b c = mk ?loc ?attrs (Pexp_open (a, b, c))
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Pexp_extension a)
-  let unreachable ?loc ?attrs () = mk ?loc ?attrs Pexp_unreachable
-
-  let case lhs ?guard rhs =
-    {
-     pc_lhs = lhs;
-     pc_guard = guard;
-     pc_rhs = rhs;
-    }
-end
-
-module Mty = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) d =
-    {pmty_desc = d; pmty_loc = loc; pmty_attributes = attrs}
-  let attr d a = {d with pmty_attributes = d.pmty_attributes @ [a]}
-
-  let ident ?loc ?attrs a = mk ?loc ?attrs (Pmty_ident a)
-  let alias ?loc ?attrs a = mk ?loc ?attrs (Pmty_alias a)
-  let signature ?loc ?attrs a = mk ?loc ?attrs (Pmty_signature a)
-  let functor_ ?loc ?attrs a b c = mk ?loc ?attrs (Pmty_functor (a, b, c))
-  let with_ ?loc ?attrs a b = mk ?loc ?attrs (Pmty_with (a, b))
-  let typeof_ ?loc ?attrs a = mk ?loc ?attrs (Pmty_typeof a)
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Pmty_extension a)
-end
-
-module Mod = struct
-let mk ?(loc = !default_loc) ?(attrs = []) d =
-  {pmod_desc = d; pmod_loc = loc; pmod_attributes = attrs}
-  let attr d a = {d with pmod_attributes = d.pmod_attributes @ [a]}
-
-  let ident ?loc ?attrs x = mk ?loc ?attrs (Pmod_ident x)
-  let structure ?loc ?attrs x = mk ?loc ?attrs (Pmod_structure x)
-  let functor_ ?loc ?attrs arg arg_ty body =
-    mk ?loc ?attrs (Pmod_functor (arg, arg_ty, body))
-  let apply ?loc ?attrs m1 m2 = mk ?loc ?attrs (Pmod_apply (m1, m2))
-  let constraint_ ?loc ?attrs m mty = mk ?loc ?attrs (Pmod_constraint (m, mty))
-  let unpack ?loc ?attrs e = mk ?loc ?attrs (Pmod_unpack e)
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Pmod_extension a)
-end
-
-module Sig = struct
-  let mk ?(loc = !default_loc) d = {psig_desc = d; psig_loc = loc}
-
-  let value ?loc a = mk ?loc (Psig_value a)
-  let type_ ?loc rec_flag a = mk ?loc (Psig_type (rec_flag, a))
-  let type_extension ?loc a = mk ?loc (Psig_typext a)
-  let exception_ ?loc a = mk ?loc (Psig_exception a)
-  let module_ ?loc a = mk ?loc (Psig_module a)
-  let rec_module ?loc a = mk ?loc (Psig_recmodule a)
-  let modtype ?loc a = mk ?loc (Psig_modtype a)
-  let open_ ?loc a = mk ?loc (Psig_open a)
-  let include_ ?loc a = mk ?loc (Psig_include a)
-
-  let class_type ?loc a = mk ?loc (Psig_class_type a)
-  let extension ?loc ?(attrs = []) a = mk ?loc (Psig_extension (a, attrs))
-  let attribute ?loc a = mk ?loc (Psig_attribute a)
-  let text txt =
-    let f_txt = Ext_list.filter txt (fun ds -> docstring_body ds <> "") in
-    List.map
-      (fun ds -> attribute ~loc:(docstring_loc ds) (text_attr ds))
-      f_txt
-end
-
-module Str = struct
-  let mk ?(loc = !default_loc) d = {pstr_desc = d; pstr_loc = loc}
-
-  let eval ?loc ?(attrs = []) a = mk ?loc (Pstr_eval (a, attrs))
-  let value ?loc a b = mk ?loc (Pstr_value (a, b))
-  let primitive ?loc a = mk ?loc (Pstr_primitive a)
-  let type_ ?loc rec_flag a = mk ?loc (Pstr_type (rec_flag, a))
-  let type_extension ?loc a = mk ?loc (Pstr_typext a)
-  let exception_ ?loc a = mk ?loc (Pstr_exception a)
-  let module_ ?loc a = mk ?loc (Pstr_module a)
-  let rec_module ?loc a = mk ?loc (Pstr_recmodule a)
-  let modtype ?loc a = mk ?loc (Pstr_modtype a)
-  let open_ ?loc a = mk ?loc (Pstr_open a)
-  let class_type ?loc a = mk ?loc (Pstr_class_type a)
-  let include_ ?loc a = mk ?loc (Pstr_include a)
-  let extension ?loc ?(attrs = []) a = mk ?loc (Pstr_extension (a, attrs))
-  let attribute ?loc a = mk ?loc (Pstr_attribute a)
-  let text txt =
-    let f_txt = Ext_list.filter txt (fun ds -> docstring_body ds <> "") in
-    List.map
-      (fun ds -> attribute ~loc:(docstring_loc ds) (text_attr ds))
-      f_txt
-end
-
-module Cl = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) d =
-    {
-     pcl_desc = d;
-     pcl_loc = loc;
-     pcl_attributes = attrs;
-    }
-  let attr d a = {d with pcl_attributes = d.pcl_attributes @ [a]}
-
-  let constr ?loc ?attrs a b = mk ?loc ?attrs (Pcl_constr (a, b))
-  let structure ?loc ?attrs a = mk ?loc ?attrs (Pcl_structure a)
-  let fun_ ?loc ?attrs a b c d = mk ?loc ?attrs (Pcl_fun (a, b, c, d))
-  let apply ?loc ?attrs a b = mk ?loc ?attrs (Pcl_apply (a, b))
-  let let_ ?loc ?attrs a b c = mk ?loc ?attrs (Pcl_let (a, b, c))
-  let constraint_ ?loc ?attrs a b = mk ?loc ?attrs (Pcl_constraint (a, b))
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Pcl_extension a)
-  let open_ ?loc ?attrs a b c = mk ?loc ?attrs (Pcl_open (a, b, c))
-end
-
-module Cty = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) d =
-    {
-     pcty_desc = d;
-     pcty_loc = loc;
-     pcty_attributes = attrs;
-    }
-  let attr d a = {d with pcty_attributes = d.pcty_attributes @ [a]}
-
-  let constr ?loc ?attrs a b = mk ?loc ?attrs (Pcty_constr (a, b))
-  let signature ?loc ?attrs a = mk ?loc ?attrs (Pcty_signature a)
-  let arrow ?loc ?attrs a b c = mk ?loc ?attrs (Pcty_arrow (a, b, c))
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Pcty_extension a)
-  let open_ ?loc ?attrs a b c = mk ?loc ?attrs (Pcty_open (a, b, c))
-end
-
-module Ctf = struct
-  let mk ?(loc = !default_loc) ?(attrs = [])
-           ?(docs = empty_docs) d =
-    {
-     pctf_desc = d;
-     pctf_loc = loc;
-     pctf_attributes = add_docs_attrs docs attrs;
-    }
-
-  let inherit_ ?loc ?attrs a = mk ?loc ?attrs (Pctf_inherit a)
-  let val_ ?loc ?attrs a b c d = mk ?loc ?attrs (Pctf_val (a, b, c, d))
-  let method_ ?loc ?attrs a b c d = mk ?loc ?attrs (Pctf_method (a, b, c, d))
-  let constraint_ ?loc ?attrs a b = mk ?loc ?attrs (Pctf_constraint (a, b))
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Pctf_extension a)
-  let attribute ?loc a = mk ?loc (Pctf_attribute a)
-  let text txt =
-   let f_txt = Ext_list.filter txt (fun ds -> docstring_body ds <> "")in
-     List.map
-      (fun ds -> attribute ~loc:(docstring_loc ds) (text_attr ds))
-      f_txt
-
-  let attr d a = {d with pctf_attributes = d.pctf_attributes @ [a]}
-
-end
-
-module Cf = struct
-  let mk ?(loc = !default_loc) ?(attrs = [])
-        ?(docs = empty_docs) d =
-    {
-     pcf_desc = d;
-     pcf_loc = loc;
-     pcf_attributes = add_docs_attrs docs attrs;
-    }
-
-  
-  let val_ ?loc ?attrs a b c = mk ?loc ?attrs (Pcf_val (a, b, c))
-  let method_ ?loc ?attrs a b c = mk ?loc ?attrs (Pcf_method (a, b, c))
-  let constraint_ ?loc ?attrs a b = mk ?loc ?attrs (Pcf_constraint (a, b))
-  let initializer_ ?loc ?attrs a = mk ?loc ?attrs (Pcf_initializer a)
-  let extension ?loc ?attrs a = mk ?loc ?attrs (Pcf_extension a)
-  let attribute ?loc a = mk ?loc (Pcf_attribute a)
-  let text txt =
-    let f_txt = Ext_list.filter txt (fun ds -> docstring_body ds <> "")in
-    List.map
-      (fun ds -> attribute ~loc:(docstring_loc ds) (text_attr ds))
-      f_txt
-
-  let virtual_ ct = Cfk_virtual ct
-  let concrete o e = Cfk_concrete (o, e)
-
-  let attr d a = {d with pcf_attributes = d.pcf_attributes @ [a]}
-
-end
-
-module Val = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) ?(docs = empty_docs)
-        ?(prim = []) name typ =
-    {
-     pval_name = name;
-     pval_type = typ;
-     pval_attributes = add_docs_attrs docs attrs;
-     pval_loc = loc;
-     pval_prim = prim;
-    }
-end
-
-module Md = struct
-  let mk ?(loc = !default_loc) ?(attrs = [])
-        ?(docs = empty_docs) ?(text = []) name typ =
-    {
-     pmd_name = name;
-     pmd_type = typ;
-     pmd_attributes =
-       add_text_attrs text (add_docs_attrs docs attrs);
-     pmd_loc = loc;
-    }
-end
-
-module Mtd = struct
-  let mk ?(loc = !default_loc) ?(attrs = [])
-        ?(docs = empty_docs) ?(text = []) ?typ name =
-    {
-     pmtd_name = name;
-     pmtd_type = typ;
-     pmtd_attributes =
-       add_text_attrs text (add_docs_attrs docs attrs);
-     pmtd_loc = loc;
-    }
-end
-
-module Mb = struct
-  let mk ?(loc = !default_loc) ?(attrs = [])
-        ?(docs = empty_docs) ?(text = []) name expr =
-    {
-     pmb_name = name;
-     pmb_expr = expr;
-     pmb_attributes =
-       add_text_attrs text (add_docs_attrs docs attrs);
-     pmb_loc = loc;
-    }
-end
-
-module Opn = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) ?(docs = empty_docs)
-        ?(override = Fresh) lid =
-    {
-     popen_lid = lid;
-     popen_override = override;
-     popen_loc = loc;
-     popen_attributes = add_docs_attrs docs attrs;
-    }
-end
-
-module Incl = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) ?(docs = empty_docs) mexpr =
-    {
-     pincl_mod = mexpr;
-     pincl_loc = loc;
-     pincl_attributes = add_docs_attrs docs attrs;
-    }
-
-end
-
-module Vb = struct
-  let mk ?(loc = !default_loc) ?(attrs = []) ?(docs = empty_docs)
-        ?(text = []) pat expr =
-    {
-     pvb_pat = pat;
-     pvb_expr = expr;
-     pvb_attributes =
-       add_text_attrs text (add_docs_attrs docs attrs);
-     pvb_loc = loc;
-    }
-end
-
-module Ci = struct
-  let mk ?(loc = !default_loc) ?(attrs = [])
-        ?(docs = empty_docs) ?(text = [])
-        ?(virt = Concrete) ?(params = []) name expr =
-    {
-     pci_virt = virt;
-     pci_params = params;
-     pci_name = name;
-     pci_expr = expr;
-     pci_attributes =
-       add_text_attrs text (add_docs_attrs docs attrs);
-     pci_loc = loc;
-    }
-end
-
-module Type = struct
-  let mk ?(loc = !default_loc) ?(attrs = [])
-        ?(docs = empty_docs) ?(text = [])
-      ?(params = [])
-      ?(cstrs = [])
-      ?(kind = Ptype_abstract)
-      ?(priv = Public)
-      ?manifest
-      name =
-    {
-     ptype_name = name;
-     ptype_params = params;
-     ptype_cstrs = cstrs;
-     ptype_kind = kind;
-     ptype_private = priv;
-     ptype_manifest = manifest;
-     ptype_attributes =
-       add_text_attrs text (add_docs_attrs docs attrs);
-     ptype_loc = loc;
-    }
-
-  let constructor ?(loc = !default_loc) ?(attrs = []) ?(info = empty_info)
-        ?(args = Pcstr_tuple []) ?res name =
-    {
-     pcd_name = name;
-     pcd_args = args;
-     pcd_res = res;
-     pcd_loc = loc;
-     pcd_attributes = add_info_attrs info attrs;
-    }
-
-  let field ?(loc = !default_loc) ?(attrs = []) ?(info = empty_info)
-        ?(mut = Immutable) name typ =
-    {
-     pld_name = name;
-     pld_mutable = mut;
-     pld_type = typ;
-     pld_loc = loc;
-     pld_attributes = add_info_attrs info attrs;
-    }
-
-end
-
-(** Type extensions *)
-module Te = struct
-  let mk ?(attrs = []) ?(docs = empty_docs)
-        ?(params = []) ?(priv = Public) path constructors =
-    {
-     ptyext_path = path;
-     ptyext_params = params;
-     ptyext_constructors = constructors;
-     ptyext_private = priv;
-     ptyext_attributes = add_docs_attrs docs attrs;
-    }
-
-  let constructor ?(loc = !default_loc) ?(attrs = [])
-        ?(docs = empty_docs) ?(info = empty_info) name kind =
-    {
-     pext_name = name;
-     pext_kind = kind;
-     pext_loc = loc;
-     pext_attributes = add_docs_attrs docs (add_info_attrs info attrs);
-    }
-
-  let decl ?(loc = !default_loc) ?(attrs = []) ?(docs = empty_docs)
-             ?(info = empty_info) ?(args = Pcstr_tuple []) ?res name =
-    {
-     pext_name = name;
-     pext_kind = Pext_decl(args, res);
-     pext_loc = loc;
-     pext_attributes = add_docs_attrs docs (add_info_attrs info attrs);
-    }
-
-  let rebind ?(loc = !default_loc) ?(attrs = [])
-        ?(docs = empty_docs) ?(info = empty_info) name lid =
-    {
-     pext_name = name;
-     pext_kind = Pext_rebind lid;
-     pext_loc = loc;
-     pext_attributes = add_docs_attrs docs (add_info_attrs info attrs);
-    }
-
-end
-
-module Csig = struct
-  let mk self fields =
-    {
-     pcsig_self = self;
-     pcsig_fields = fields;
-    }
-end
-
-module Cstr = struct
-  let mk self fields =
-    {
-     pcstr_self = self;
-     pcstr_fields = fields;
-    }
-end
diff --git a/jscomp/ml/ast_helper.mli b/jscomp/ml/ast_helper.mli
deleted file mode 100644
index 67f6249..0000000
--- a/jscomp/ml/ast_helper.mli
+++ /dev/null
@@ -1,438 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                         Alain Frisch, LexiFi                           *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Helpers to produce Parsetree fragments *)
-
-open Asttypes
-open Docstrings
-open Parsetree
-
-type lid = Longident.t loc
-type str = string loc
-type loc = Location.t
-type attrs = attribute list
-
-(** {1 Default locations} *)
-
-val default_loc: loc ref
-    (** Default value for all optional location arguments. *)
-
-val with_default_loc: loc -> (unit -> 'a) -> 'a
-    (** Set the [default_loc] within the scope of the execution
-        of the provided function. *)
-
-(** {1 Constants} *)
-
-module Const : sig
-  val char : char -> constant
-  val string : ?quotation_delimiter:string -> string -> constant
-  val integer : ?suffix:char -> string -> constant
-  val int : ?suffix:char -> int -> constant
-  val int32 : ?suffix:char -> int32 -> constant
-  val int64 : ?suffix:char -> int64 -> constant
-  val nativeint : ?suffix:char -> nativeint -> constant
-  val float : ?suffix:char -> string -> constant
-end
-
-(** {1 Core language} *)
-
-(** Type expressions *)
-module Typ :
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> core_type_desc -> core_type
-    val attr: core_type -> attribute -> core_type
-
-    val any: ?loc:loc -> ?attrs:attrs -> unit -> core_type
-    val var: ?loc:loc -> ?attrs:attrs -> string -> core_type
-    val arrow: ?loc:loc -> ?attrs:attrs -> arg_label -> core_type -> core_type
-               -> core_type
-    val tuple: ?loc:loc -> ?attrs:attrs -> core_type list -> core_type
-    val constr: ?loc:loc -> ?attrs:attrs -> lid -> core_type list -> core_type
-    val object_: ?loc:loc -> ?attrs:attrs -> object_field list
-                   -> closed_flag -> core_type
-    val class_: ?loc:loc -> ?attrs:attrs -> lid -> core_type list -> core_type
-    val alias: ?loc:loc -> ?attrs:attrs -> core_type -> string -> core_type
-    val variant: ?loc:loc -> ?attrs:attrs -> row_field list -> closed_flag
-                 -> label list option -> core_type
-    val poly: ?loc:loc -> ?attrs:attrs -> str list -> core_type -> core_type
-    val package: ?loc:loc -> ?attrs:attrs -> lid -> (lid * core_type) list
-                 -> core_type
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> core_type
-
-    val force_poly: core_type -> core_type
-
-    val varify_constructors: str list -> core_type -> core_type
-    (** [varify_constructors newtypes te] is type expression [te], of which
-        any of nullary type constructor [tc] is replaced by type variable of
-        the same name, if [tc]'s name appears in [newtypes].
-        Raise [Syntaxerr.Variable_in_scope] if any type variable inside [te]
-        appears in [newtypes].
-        @since 4.05
-     *)
-  end
-
-(** Patterns *)
-module Pat:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> pattern_desc -> pattern
-    val attr:pattern -> attribute -> pattern
-
-    val any: ?loc:loc -> ?attrs:attrs -> unit -> pattern
-    val var: ?loc:loc -> ?attrs:attrs -> str -> pattern
-    val alias: ?loc:loc -> ?attrs:attrs -> pattern -> str -> pattern
-    val constant: ?loc:loc -> ?attrs:attrs -> constant -> pattern
-    val interval: ?loc:loc -> ?attrs:attrs -> constant -> constant -> pattern
-    val tuple: ?loc:loc -> ?attrs:attrs -> pattern list -> pattern
-    val construct: ?loc:loc -> ?attrs:attrs -> lid -> pattern option -> pattern
-    val variant: ?loc:loc -> ?attrs:attrs -> label -> pattern option -> pattern
-    val record: ?loc:loc -> ?attrs:attrs -> (lid * pattern) list -> closed_flag
-                -> pattern
-    val array: ?loc:loc -> ?attrs:attrs -> pattern list -> pattern
-    val or_: ?loc:loc -> ?attrs:attrs -> pattern -> pattern -> pattern
-    val constraint_: ?loc:loc -> ?attrs:attrs -> pattern -> core_type -> pattern
-    val type_: ?loc:loc -> ?attrs:attrs -> lid -> pattern
-    val lazy_: ?loc:loc -> ?attrs:attrs -> pattern -> pattern
-    val unpack: ?loc:loc -> ?attrs:attrs -> str -> pattern
-    val open_: ?loc:loc -> ?attrs:attrs  -> lid -> pattern -> pattern
-    val exception_: ?loc:loc -> ?attrs:attrs -> pattern -> pattern
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> pattern
-  end
-
-(** Expressions *)
-module Exp:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> expression_desc -> expression
-    val attr: expression -> attribute -> expression
-
-    val ident: ?loc:loc -> ?attrs:attrs -> lid -> expression
-    val constant: ?loc:loc -> ?attrs:attrs -> constant -> expression
-    val let_: ?loc:loc -> ?attrs:attrs -> rec_flag -> value_binding list
-              -> expression -> expression
-    val fun_: ?loc:loc -> ?attrs:attrs -> arg_label -> expression option
-              -> pattern -> expression -> expression
-    val function_: ?loc:loc -> ?attrs:attrs -> case list -> expression
-    val apply: ?loc:loc -> ?attrs:attrs -> expression
-               -> (arg_label * expression) list -> expression
-    val match_: ?loc:loc -> ?attrs:attrs -> expression -> case list
-                -> expression
-    val try_: ?loc:loc -> ?attrs:attrs -> expression -> case list -> expression
-    val tuple: ?loc:loc -> ?attrs:attrs -> expression list -> expression
-    val construct: ?loc:loc -> ?attrs:attrs -> lid -> expression option
-                   -> expression
-    val variant: ?loc:loc -> ?attrs:attrs -> label -> expression option
-                 -> expression
-    val record: ?loc:loc -> ?attrs:attrs -> (lid * expression) list
-                -> expression option -> expression
-    val field: ?loc:loc -> ?attrs:attrs -> expression -> lid -> expression
-    val setfield: ?loc:loc -> ?attrs:attrs -> expression -> lid -> expression
-                  -> expression
-    val array: ?loc:loc -> ?attrs:attrs -> expression list -> expression
-    val ifthenelse: ?loc:loc -> ?attrs:attrs -> expression -> expression
-                    -> expression option -> expression
-    val sequence: ?loc:loc -> ?attrs:attrs -> expression -> expression
-                  -> expression
-    val while_: ?loc:loc -> ?attrs:attrs -> expression -> expression
-                -> expression
-    val for_: ?loc:loc -> ?attrs:attrs -> pattern -> expression -> expression
-              -> direction_flag -> expression -> expression
-    val coerce: ?loc:loc -> ?attrs:attrs -> expression -> core_type option
-                -> core_type -> expression
-    val constraint_: ?loc:loc -> ?attrs:attrs -> expression -> core_type
-                     -> expression
-    val send: ?loc:loc -> ?attrs:attrs -> expression -> str -> expression
-    val new_: ?loc:loc -> ?attrs:attrs -> lid -> expression
-    val setinstvar: ?loc:loc -> ?attrs:attrs -> str -> expression -> expression
-    val override: ?loc:loc -> ?attrs:attrs -> (str * expression) list
-                  -> expression
-    val letmodule: ?loc:loc -> ?attrs:attrs -> str -> module_expr -> expression
-                   -> expression
-    val letexception:
-      ?loc:loc -> ?attrs:attrs -> extension_constructor -> expression
-      -> expression
-    val assert_: ?loc:loc -> ?attrs:attrs -> expression -> expression
-    val lazy_: ?loc:loc -> ?attrs:attrs -> expression -> expression
-    val poly: ?loc:loc -> ?attrs:attrs -> expression -> core_type option
-              -> expression
-    val object_: ?loc:loc -> ?attrs:attrs -> class_structure -> expression
-    val newtype: ?loc:loc -> ?attrs:attrs -> str -> expression -> expression
-    val pack: ?loc:loc -> ?attrs:attrs -> module_expr -> expression
-    val open_: ?loc:loc -> ?attrs:attrs -> override_flag -> lid -> expression
-               -> expression
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> expression
-    val unreachable: ?loc:loc -> ?attrs:attrs -> unit -> expression
-
-    val case: pattern -> ?guard:expression -> expression -> case
-  end
-
-(** Value declarations *)
-module Val:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> ?docs:docs ->
-      ?prim:string list -> str -> core_type -> value_description
-  end
-
-(** Type declarations *)
-module Type:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> ?text:text ->
-      ?params:(core_type * variance) list ->
-      ?cstrs:(core_type * core_type * loc) list ->
-      ?kind:type_kind -> ?priv:private_flag -> ?manifest:core_type -> str ->
-      type_declaration
-
-    val constructor: ?loc:loc -> ?attrs:attrs -> ?info:info ->
-      ?args:constructor_arguments -> ?res:core_type -> str ->
-      constructor_declaration
-    val field: ?loc:loc -> ?attrs:attrs -> ?info:info ->
-      ?mut:mutable_flag -> str -> core_type -> label_declaration
-  end
-
-(** Type extensions *)
-module Te:
-  sig
-    val mk: ?attrs:attrs -> ?docs:docs ->
-      ?params:(core_type * variance) list -> ?priv:private_flag ->
-      lid -> extension_constructor list -> type_extension
-
-    val constructor: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> ?info:info ->
-      str -> extension_constructor_kind -> extension_constructor
-
-    val decl: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> ?info:info ->
-      ?args:constructor_arguments -> ?res:core_type -> str ->
-      extension_constructor
-    val rebind: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> ?info:info ->
-      str -> lid -> extension_constructor
-  end
-
-(** {1 Module language} *)
-
-(** Module type expressions *)
-module Mty:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> module_type_desc -> module_type
-    val attr: module_type -> attribute -> module_type
-
-    val ident: ?loc:loc -> ?attrs:attrs -> lid -> module_type
-    val alias: ?loc:loc -> ?attrs:attrs -> lid -> module_type
-    val signature: ?loc:loc -> ?attrs:attrs -> signature -> module_type
-    val functor_: ?loc:loc -> ?attrs:attrs ->
-      str -> module_type option -> module_type -> module_type
-    val with_: ?loc:loc -> ?attrs:attrs -> module_type ->
-      with_constraint list -> module_type
-    val typeof_: ?loc:loc -> ?attrs:attrs -> module_expr -> module_type
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> module_type
-  end
-
-(** Module expressions *)
-module Mod:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> module_expr_desc -> module_expr
-    val attr: module_expr -> attribute -> module_expr
-
-    val ident: ?loc:loc -> ?attrs:attrs -> lid -> module_expr
-    val structure: ?loc:loc -> ?attrs:attrs -> structure -> module_expr
-    val functor_: ?loc:loc -> ?attrs:attrs ->
-      str -> module_type option -> module_expr -> module_expr
-    val apply: ?loc:loc -> ?attrs:attrs -> module_expr -> module_expr ->
-      module_expr
-    val constraint_: ?loc:loc -> ?attrs:attrs -> module_expr -> module_type ->
-      module_expr
-    val unpack: ?loc:loc -> ?attrs:attrs -> expression -> module_expr
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> module_expr
-  end
-
-(** Signature items *)
-module Sig:
-  sig
-    val mk: ?loc:loc -> signature_item_desc -> signature_item
-
-    val value: ?loc:loc -> value_description -> signature_item
-    val type_: ?loc:loc -> rec_flag -> type_declaration list -> signature_item
-    val type_extension: ?loc:loc -> type_extension -> signature_item
-    val exception_: ?loc:loc -> extension_constructor -> signature_item
-    val module_: ?loc:loc -> module_declaration -> signature_item
-    val rec_module: ?loc:loc -> module_declaration list -> signature_item
-    val modtype: ?loc:loc -> module_type_declaration -> signature_item
-    val open_: ?loc:loc -> open_description -> signature_item
-    val include_: ?loc:loc -> include_description -> signature_item
-    val class_type: ?loc:loc -> class_type_declaration list -> signature_item
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> signature_item
-    val attribute: ?loc:loc -> attribute -> signature_item
-    val text: text -> signature_item list
-  end
-
-(** Structure items *)
-module Str:
-  sig
-    val mk: ?loc:loc -> structure_item_desc -> structure_item
-
-    val eval: ?loc:loc -> ?attrs:attributes -> expression -> structure_item
-    val value: ?loc:loc -> rec_flag -> value_binding list -> structure_item
-    val primitive: ?loc:loc -> value_description -> structure_item
-    val type_: ?loc:loc -> rec_flag -> type_declaration list -> structure_item
-    val type_extension: ?loc:loc -> type_extension -> structure_item
-    val exception_: ?loc:loc -> extension_constructor -> structure_item
-    val module_: ?loc:loc -> module_binding -> structure_item
-    val rec_module: ?loc:loc -> module_binding list -> structure_item
-    val modtype: ?loc:loc -> module_type_declaration -> structure_item
-    val open_: ?loc:loc -> open_description -> structure_item
-    val class_type: ?loc:loc -> class_type_declaration list -> structure_item
-    val include_: ?loc:loc -> include_declaration -> structure_item
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> structure_item
-    val attribute: ?loc:loc -> attribute -> structure_item
-    val text: text -> structure_item list
-  end
-
-(** Module declarations *)
-module Md:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> ?text:text ->
-      str -> module_type -> module_declaration
-  end
-
-(** Module type declarations *)
-module Mtd:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> ?text:text ->
-      ?typ:module_type -> str -> module_type_declaration
-  end
-
-(** Module bindings *)
-module Mb:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> ?text:text ->
-      str -> module_expr -> module_binding
-  end
-
-(** Opens *)
-module Opn:
-  sig
-    val mk: ?loc: loc -> ?attrs:attrs -> ?docs:docs ->
-      ?override:override_flag -> lid -> open_description
-  end
-
-(** Includes *)
-module Incl:
-  sig
-    val mk: ?loc: loc -> ?attrs:attrs -> ?docs:docs -> 'a -> 'a include_infos
-  end
-
-(** Value bindings *)
-module Vb:
-  sig
-    val mk: ?loc: loc -> ?attrs:attrs -> ?docs:docs -> ?text:text ->
-      pattern -> expression -> value_binding
-  end
-
-
-(** {1 Class language} *)
-
-(** Class type expressions *)
-module Cty:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> class_type_desc -> class_type
-    val attr: class_type -> attribute -> class_type
-
-    val constr: ?loc:loc -> ?attrs:attrs -> lid -> core_type list -> class_type
-    val signature: ?loc:loc -> ?attrs:attrs -> class_signature -> class_type
-    val arrow: ?loc:loc -> ?attrs:attrs -> arg_label -> core_type ->
-      class_type -> class_type
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> class_type
-    val open_: ?loc:loc -> ?attrs:attrs -> override_flag -> lid -> class_type
-               -> class_type
-  end
-
-(** Class type fields *)
-module Ctf:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> ?docs:docs ->
-      class_type_field_desc -> class_type_field
-    val attr: class_type_field -> attribute -> class_type_field
-
-    val inherit_: ?loc:loc -> ?attrs:attrs -> class_type -> class_type_field
-    val val_: ?loc:loc -> ?attrs:attrs -> str -> mutable_flag ->
-      virtual_flag -> core_type -> class_type_field
-    val method_: ?loc:loc -> ?attrs:attrs -> str -> private_flag ->
-      virtual_flag -> core_type -> class_type_field
-    val constraint_: ?loc:loc -> ?attrs:attrs -> core_type -> core_type ->
-      class_type_field
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> class_type_field
-    val attribute: ?loc:loc -> attribute -> class_type_field
-    val text: text -> class_type_field list
-  end
-
-(** Class expressions *)
-module Cl:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> class_expr_desc -> class_expr
-    val attr: class_expr -> attribute -> class_expr
-
-    val constr: ?loc:loc -> ?attrs:attrs -> lid -> core_type list -> class_expr
-    val structure: ?loc:loc -> ?attrs:attrs -> class_structure -> class_expr
-    val fun_: ?loc:loc -> ?attrs:attrs -> arg_label -> expression option ->
-      pattern -> class_expr -> class_expr
-    val apply: ?loc:loc -> ?attrs:attrs -> class_expr ->
-      (arg_label * expression) list -> class_expr
-    val let_: ?loc:loc -> ?attrs:attrs -> rec_flag -> value_binding list ->
-      class_expr -> class_expr
-    val constraint_: ?loc:loc -> ?attrs:attrs -> class_expr -> class_type ->
-      class_expr
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> class_expr
-    val open_: ?loc:loc -> ?attrs:attrs -> override_flag -> lid -> class_expr
-               -> class_expr
-  end
-
-(** Class fields *)
-module Cf:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> class_field_desc ->
-      class_field
-    val attr: class_field -> attribute -> class_field
-
-    val val_: ?loc:loc -> ?attrs:attrs -> str -> mutable_flag ->
-      class_field_kind -> class_field
-    val method_: ?loc:loc -> ?attrs:attrs -> str -> private_flag ->
-      class_field_kind -> class_field
-    val constraint_: ?loc:loc -> ?attrs:attrs -> core_type -> core_type ->
-      class_field
-    val initializer_: ?loc:loc -> ?attrs:attrs -> expression -> class_field
-    val extension: ?loc:loc -> ?attrs:attrs -> extension -> class_field
-    val attribute: ?loc:loc -> attribute -> class_field
-    val text: text -> class_field list
-
-    val virtual_: core_type -> class_field_kind
-    val concrete: override_flag -> expression -> class_field_kind
-
-  end
-
-(** Classes *)
-module Ci:
-  sig
-    val mk: ?loc:loc -> ?attrs:attrs -> ?docs:docs -> ?text:text ->
-      ?virt:virtual_flag -> ?params:(core_type * variance) list ->
-      str -> 'a -> 'a class_infos
-  end
-
-(** Class signatures *)
-module Csig:
-  sig
-    val mk: core_type -> class_type_field list -> class_signature
-  end
-
-(** Class structures *)
-module Cstr:
-  sig
-    val mk: pattern -> class_field list -> class_structure
-  end
diff --git a/jscomp/ml/ast_invariants.ml b/jscomp/ml/ast_invariants.ml
deleted file mode 100644
index 31ee17e..0000000
--- a/jscomp/ml/ast_invariants.ml
+++ /dev/null
@@ -1,166 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                   Jeremie Dimino, Jane Street Europe                   *)
-(*                                                                        *)
-(*   Copyright 2015 Jane Street Group LLC                                 *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Asttypes
-open Parsetree
-open Ast_iterator
-
-let err = Syntaxerr.ill_formed_ast
-
-let empty_record loc = err loc "Records cannot be empty."
-let empty_variant loc = err loc "Variant types cannot be empty."
-let invalid_tuple loc = err loc "Tuples must have at least 2 components."
-let no_args loc = err loc "Function application with no argument."
-let empty_let loc = err loc "Let with no bindings."
-let empty_type loc = err loc "Type declarations cannot be empty."
-let complex_id loc = err loc "Functor application not allowed here."
-
-let simple_longident id =
-  let rec is_simple = function
-    | Longident.Lident _ -> true
-    | Longident.Ldot (id, _) -> is_simple id
-    | Longident.Lapply _ -> false
-  in
-  if not (is_simple id.txt) then complex_id id.loc
-
-let iterator =
-  let super = Ast_iterator.default_iterator in
-  let type_declaration self td =
-    super.type_declaration self td;
-    let loc = td.ptype_loc in
-    match td.ptype_kind with
-    | Ptype_record [] -> empty_record loc
-    | Ptype_variant [] -> empty_variant loc
-    | _ -> ()
-  in
-  let typ self ty =
-    super.typ self ty;
-    let loc = ty.ptyp_loc in
-    match ty.ptyp_desc with
-    | Ptyp_tuple ([] | [_]) -> invalid_tuple loc
-    | Ptyp_class (id, _) -> simple_longident id
-    | Ptyp_package (_, cstrs) ->
-      List.iter (fun (id, _) -> simple_longident id) cstrs
-    | _ -> ()
-  in
-  let pat self pat =
-    begin match pat.ppat_desc with
-    | Ppat_construct (_, Some ({ppat_desc = Ppat_tuple _} as p))
-      when Builtin_attributes.explicit_arity pat.ppat_attributes ->
-        super.pat self p (* allow unary tuple, see GPR#523. *)
-    | _ ->
-        super.pat self pat
-    end;
-    let loc = pat.ppat_loc in
-    match pat.ppat_desc with
-    | Ppat_tuple ([] | [_]) -> invalid_tuple loc
-    | Ppat_record ([], _) -> empty_record loc
-    | Ppat_construct (id, _) -> simple_longident id
-    | Ppat_record (fields, _) ->
-      List.iter (fun (id, _) -> simple_longident id) fields
-    | _ -> ()
-  in
-  let expr self exp =
-    begin match exp.pexp_desc with
-    | Pexp_construct (_, Some ({pexp_desc = Pexp_tuple _} as e))
-      when Builtin_attributes.explicit_arity exp.pexp_attributes ->
-        super.expr self e (* allow unary tuple, see GPR#523. *)
-    | _ ->
-        super.expr self exp
-    end;
-    let loc = exp.pexp_loc in
-    match exp.pexp_desc with
-    | Pexp_tuple ([] | [_]) -> invalid_tuple loc
-    | Pexp_record ([], _) -> empty_record loc
-    | Pexp_apply (_, []) -> no_args loc
-    | Pexp_let (_, [], _) -> empty_let loc
-    | Pexp_ident id
-    | Pexp_construct (id, _)
-    | Pexp_field (_, id)
-    | Pexp_setfield (_, id, _)
-    | Pexp_new id
-    | Pexp_open (_, id, _) -> simple_longident id
-    | Pexp_record (fields, _) ->
-      List.iter (fun (id, _) -> simple_longident id) fields
-    | _ -> ()
-  in
-  let extension_constructor self ec =
-    super.extension_constructor self ec;
-    match ec.pext_kind with
-    | Pext_rebind id -> simple_longident id
-    | _ -> ()
-  in
-  let class_expr self ce =
-    super.class_expr self ce;
-    let loc = ce.pcl_loc in
-    match ce.pcl_desc with
-    | Pcl_apply (_, []) -> no_args loc
-    | Pcl_constr (id, _) -> simple_longident id
-    | _ -> ()
-  in
-  let module_type self mty =
-    super.module_type self mty;
-    match mty.pmty_desc with
-    | Pmty_alias id -> simple_longident id
-    | _ -> ()
-  in
-  let open_description self opn =
-    super.open_description self opn;
-    simple_longident opn.popen_lid
-  in
-  let with_constraint self wc =
-    super.with_constraint self wc;
-    match wc with
-    | Pwith_type (id, _)
-    | Pwith_module (id, _) -> simple_longident id
-    | _ -> ()
-  in
-  let module_expr self me =
-    super.module_expr self me;
-    match me.pmod_desc with
-    | Pmod_ident id -> simple_longident id
-    | _ -> ()
-  in
-  let structure_item self st =
-    super.structure_item self st;
-    let loc = st.pstr_loc in
-    match st.pstr_desc with
-    | Pstr_type (_, []) -> empty_type loc
-    | Pstr_value (_, []) -> empty_let loc
-    | _ -> ()
-  in
-  let signature_item self sg =
-    super.signature_item self sg;
-    let loc = sg.psig_loc in
-    match sg.psig_desc with
-    | Psig_type (_, []) -> empty_type loc
-    | _ -> ()
-  in
-  { super with
-    type_declaration
-  ; typ
-  ; pat
-  ; expr
-  ; extension_constructor
-  ; class_expr
-  ; module_expr
-  ; module_type
-  ; open_description
-  ; with_constraint
-  ; structure_item
-  ; signature_item
-  }
-
-let structure st = iterator.structure iterator st
-let signature sg = iterator.signature iterator sg
diff --git a/jscomp/ml/ast_invariants.mli b/jscomp/ml/ast_invariants.mli
deleted file mode 100644
index 51d3f9d..0000000
--- a/jscomp/ml/ast_invariants.mli
+++ /dev/null
@@ -1,18 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                   Jeremie Dimino, Jane Street Europe                   *)
-(*                                                                        *)
-(*   Copyright 2015 Jane Street Group LLC                                 *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Check AST invariants *)
-
-val structure : Parsetree.structure -> unit
-val signature : Parsetree.signature -> unit
diff --git a/jscomp/ml/ast_iterator.ml b/jscomp/ml/ast_iterator.ml
deleted file mode 100755
index f5fa930..0000000
--- a/jscomp/ml/ast_iterator.ml
+++ /dev/null
@@ -1,600 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                      Nicolas Ojeda Bar, LexiFi                         *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* A generic Parsetree mapping class *)
-
-(*
-[@@@warning "+9"]
-  (* Ensure that record patterns don't miss any field. *)
-*)
-
-
-open Parsetree
-open Location
-
-type iterator = {
-  attribute: iterator -> attribute -> unit;
-  attributes: iterator -> attribute list -> unit;
-  case: iterator -> case -> unit;
-  cases: iterator -> case list -> unit;
-  class_expr: iterator -> class_expr -> unit;
-  class_field: iterator -> class_field -> unit;
-  class_signature: iterator -> class_signature -> unit;
-  class_structure: iterator -> class_structure -> unit;
-  class_type: iterator -> class_type -> unit;
-  class_type_declaration: iterator -> class_type_declaration -> unit;
-  class_type_field: iterator -> class_type_field -> unit;
-  constructor_declaration: iterator -> constructor_declaration -> unit;
-  expr: iterator -> expression -> unit;
-  extension: iterator -> extension -> unit;
-  extension_constructor: iterator -> extension_constructor -> unit;
-  include_declaration: iterator -> include_declaration -> unit;
-  include_description: iterator -> include_description -> unit;
-  label_declaration: iterator -> label_declaration -> unit;
-  location: iterator -> Location.t -> unit;
-  module_binding: iterator -> module_binding -> unit;
-  module_declaration: iterator -> module_declaration -> unit;
-  module_expr: iterator -> module_expr -> unit;
-  module_type: iterator -> module_type -> unit;
-  module_type_declaration: iterator -> module_type_declaration -> unit;
-  open_description: iterator -> open_description -> unit;
-  pat: iterator -> pattern -> unit;
-  payload: iterator -> payload -> unit;
-  signature: iterator -> signature -> unit;
-  signature_item: iterator -> signature_item -> unit;
-  structure: iterator -> structure -> unit;
-  structure_item: iterator -> structure_item -> unit;
-  typ: iterator -> core_type -> unit;
-  type_declaration: iterator -> type_declaration -> unit;
-  type_extension: iterator -> type_extension -> unit;
-  type_kind: iterator -> type_kind -> unit;
-  value_binding: iterator -> value_binding -> unit;
-  value_description: iterator -> value_description -> unit;
-  with_constraint: iterator -> with_constraint -> unit;
-}
-(** A [iterator] record implements one "method" per syntactic category,
-    using an open recursion style: each method takes as its first
-    argument the iterator to be applied to children in the syntax
-    tree. *)
-
-let iter_fst f (x, _) = f x
-let iter_snd f (_, y) = f y
-let iter_tuple f1 f2 (x, y) = f1 x; f2 y
-let iter_tuple3 f1 f2 f3 (x, y, z) = f1 x; f2 y; f3 z
-let iter_opt f = function None -> () | Some x -> f x
-
-let iter_loc sub {loc; txt = _} = sub.location sub loc
-
-module T = struct
-  (* Type expressions for the core language *)
-
-  let row_field sub = function
-    | Rtag (_, attrs, _, tl) ->
-        sub.attributes sub attrs; List.iter (sub.typ sub) tl
-    | Rinherit t -> sub.typ sub t
-
-  let object_field sub = function
-    | Otag (_, attrs, t) ->
-        sub.attributes sub attrs; sub.typ sub t
-    | Oinherit t -> sub.typ sub t
-
-  let iter sub {ptyp_desc = desc; ptyp_loc = loc; ptyp_attributes = attrs} =
-    sub.location sub loc;
-    sub.attributes sub attrs;
-    match desc with
-    | Ptyp_any
-    | Ptyp_var _ -> ()
-    | Ptyp_arrow (_lab, t1, t2) ->
-        sub.typ sub t1; sub.typ sub t2
-    | Ptyp_tuple tyl -> List.iter (sub.typ sub) tyl
-    | Ptyp_constr (lid, tl) ->
-        iter_loc sub lid; List.iter (sub.typ sub) tl
-    | Ptyp_object (ol, _o) ->
-        List.iter (object_field sub) ol
-    | Ptyp_class (lid, tl) ->
-        iter_loc sub lid; List.iter (sub.typ sub) tl
-    | Ptyp_alias (t, _) -> sub.typ sub t
-    | Ptyp_variant (rl, _b, _ll) ->
-        List.iter (row_field sub) rl
-    | Ptyp_poly (_, t) -> sub.typ sub t
-    | Ptyp_package (lid, l) ->
-        iter_loc sub lid;
-        List.iter (iter_tuple (iter_loc sub) (sub.typ sub)) l
-    | Ptyp_extension x -> sub.extension sub x
-
-  let iter_type_declaration sub
-      {ptype_name; ptype_params; ptype_cstrs;
-       ptype_kind;
-       ptype_private = _;
-       ptype_manifest;
-       ptype_attributes;
-       ptype_loc} =
-    iter_loc sub ptype_name;
-    List.iter (iter_fst (sub.typ sub)) ptype_params;
-    List.iter
-      (iter_tuple3 (sub.typ sub) (sub.typ sub) (sub.location sub))
-      ptype_cstrs;
-    sub.type_kind sub ptype_kind;
-    iter_opt (sub.typ sub) ptype_manifest;
-    sub.location sub ptype_loc;
-    sub.attributes sub ptype_attributes
-
-  let iter_type_kind sub = function
-    | Ptype_abstract -> ()
-    | Ptype_variant l ->
-        List.iter (sub.constructor_declaration sub) l
-    | Ptype_record l -> List.iter (sub.label_declaration sub) l
-    | Ptype_open -> ()
-
-  let iter_constructor_arguments sub = function
-    | Pcstr_tuple l -> List.iter (sub.typ sub) l
-    | Pcstr_record l ->
-        List.iter (sub.label_declaration sub) l
-
-  let iter_type_extension sub
-      {ptyext_path; ptyext_params;
-       ptyext_constructors;
-       ptyext_private = _;
-       ptyext_attributes} =
-    iter_loc sub ptyext_path;
-    List.iter (sub.extension_constructor sub) ptyext_constructors;
-    List.iter (iter_fst (sub.typ sub)) ptyext_params;
-    sub.attributes sub ptyext_attributes
-
-  let iter_extension_constructor_kind sub = function
-      Pext_decl(ctl, cto) ->
-        iter_constructor_arguments sub ctl; iter_opt (sub.typ sub) cto
-    | Pext_rebind li ->
-        iter_loc sub li
-
-  let iter_extension_constructor sub
-      {pext_name;
-       pext_kind;
-       pext_loc;
-       pext_attributes} =
-    iter_loc sub pext_name;
-    iter_extension_constructor_kind sub pext_kind;
-    sub.location sub pext_loc;
-    sub.attributes sub pext_attributes
-
-end
-
-module CT = struct
-  (* Type expressions for the class language *)
-
-  let iter sub {pcty_loc = loc; pcty_desc = desc; pcty_attributes = attrs} =
-    sub.location sub loc;
-    sub.attributes sub attrs;
-    match desc with
-    | Pcty_constr (lid, tys) ->
-        iter_loc sub lid; List.iter (sub.typ sub) tys
-    | Pcty_signature x -> sub.class_signature sub x
-    | Pcty_arrow (_lab, t, ct) ->
-        sub.typ sub t; sub.class_type sub ct
-    | Pcty_extension x -> sub.extension sub x
-    | Pcty_open (_ovf, lid, e) ->
-        iter_loc sub lid; sub.class_type sub e
-
-  let iter_field sub {pctf_desc = desc; pctf_loc = loc; pctf_attributes = attrs}
-    =
-    sub.location sub loc;
-    sub.attributes sub attrs;
-    match desc with
-    | Pctf_inherit ct -> sub.class_type sub ct
-    | Pctf_val (_s, _m, _v, t) -> sub.typ sub t
-    | Pctf_method (_s, _p, _v, t) -> sub.typ sub t
-    | Pctf_constraint (t1, t2) ->
-        sub.typ sub t1; sub.typ sub t2
-    | Pctf_attribute x -> sub.attribute sub x
-    | Pctf_extension x -> sub.extension sub x
-
-  let iter_signature sub {pcsig_self; pcsig_fields} =
-    sub.typ sub pcsig_self;
-    List.iter (sub.class_type_field sub) pcsig_fields
-end
-
-module MT = struct
-  (* Type expressions for the module language *)
-
-  let iter sub {pmty_desc = desc; pmty_loc = loc; pmty_attributes = attrs} =
-    sub.location sub loc;
-    sub.attributes sub attrs;
-    match desc with
-    | Pmty_ident s -> iter_loc sub s
-    | Pmty_alias s -> iter_loc sub s
-    | Pmty_signature sg -> sub.signature sub sg
-    | Pmty_functor (s, mt1, mt2) ->
-        iter_loc sub s;
-        iter_opt (sub.module_type sub) mt1;
-        sub.module_type sub mt2
-    | Pmty_with (mt, l) ->
-        sub.module_type sub mt;
-        List.iter (sub.with_constraint sub) l
-    | Pmty_typeof me -> sub.module_expr sub me
-    | Pmty_extension x -> sub.extension sub x
-
-  let iter_with_constraint sub = function
-    | Pwith_type (lid, d) ->
-        iter_loc sub lid; sub.type_declaration sub d
-    | Pwith_module (lid, lid2) ->
-        iter_loc sub lid; iter_loc sub lid2
-    | Pwith_typesubst (lid, d) ->
-        iter_loc sub lid; sub.type_declaration sub d
-    | Pwith_modsubst (s, lid) ->
-        iter_loc sub s; iter_loc sub lid
-
-  let iter_signature_item sub {psig_desc = desc; psig_loc = loc} =
-    sub.location sub loc;
-    match desc with
-    | Psig_value vd -> sub.value_description sub vd
-    | Psig_type (_rf, l) -> List.iter (sub.type_declaration sub) l
-    | Psig_typext te -> sub.type_extension sub te
-    | Psig_exception ed -> sub.extension_constructor sub ed
-    | Psig_module x -> sub.module_declaration sub x
-    | Psig_recmodule l ->
-        List.iter (sub.module_declaration sub) l
-    | Psig_modtype x -> sub.module_type_declaration sub x
-    | Psig_open x -> sub.open_description sub x
-    | Psig_include x -> sub.include_description sub x
-    | Psig_class () -> ()
-    | Psig_class_type l ->
-        List.iter (sub.class_type_declaration sub) l
-    | Psig_extension (x, attrs) ->
-        sub.extension sub x; sub.attributes sub attrs
-    | Psig_attribute x -> sub.attribute sub x
-end
-
-
-module M = struct
-  (* Value expressions for the module language *)
-
-  let iter sub {pmod_loc = loc; pmod_desc = desc; pmod_attributes = attrs} =
-    sub.location sub loc;
-    sub.attributes sub attrs;
-    match desc with
-    | Pmod_ident x -> iter_loc sub x
-    | Pmod_structure str -> sub.structure sub str
-    | Pmod_functor (arg, arg_ty, body) ->
-        iter_loc sub arg;
-        iter_opt (sub.module_type sub) arg_ty;
-        sub.module_expr sub body
-    | Pmod_apply (m1, m2) ->
-        sub.module_expr sub m1; sub.module_expr sub m2
-    | Pmod_constraint (m, mty) ->
-        sub.module_expr sub m; sub.module_type sub mty
-    | Pmod_unpack e -> sub.expr sub e
-    | Pmod_extension x -> sub.extension sub x
-
-  let iter_structure_item sub {pstr_loc = loc; pstr_desc = desc} =
-    sub.location sub loc;
-    match desc with
-    | Pstr_eval (x, attrs) ->
-        sub.expr sub x; sub.attributes sub attrs
-    | Pstr_value (_r, vbs) -> List.iter (sub.value_binding sub) vbs
-    | Pstr_primitive vd -> sub.value_description sub vd
-    | Pstr_type (_rf, l) -> List.iter (sub.type_declaration sub) l
-    | Pstr_typext te -> sub.type_extension sub te
-    | Pstr_exception ed -> sub.extension_constructor sub ed
-    | Pstr_module x -> sub.module_binding sub x
-    | Pstr_recmodule l -> List.iter (sub.module_binding sub) l
-    | Pstr_modtype x -> sub.module_type_declaration sub x
-    | Pstr_open x -> sub.open_description sub x
-    | Pstr_class () -> ()
-    | Pstr_class_type l ->
-        List.iter (sub.class_type_declaration sub) l
-    | Pstr_include x -> sub.include_declaration sub x
-    | Pstr_extension (x, attrs) ->
-        sub.extension sub x; sub.attributes sub attrs
-    | Pstr_attribute x -> sub.attribute sub x
-end
-
-module E = struct
-  (* Value expressions for the core language *)
-
-  let iter sub {pexp_loc = loc; pexp_desc = desc; pexp_attributes = attrs} =
-    sub.location sub loc;
-    sub.attributes sub attrs;
-    match desc with
-    | Pexp_ident x -> iter_loc sub x
-    | Pexp_constant _ -> ()
-    | Pexp_let (_r, vbs, e) ->
-        List.iter (sub.value_binding sub) vbs;
-        sub.expr sub e
-    | Pexp_fun (_lab, def, p, e) ->
-        iter_opt (sub.expr sub) def;
-        sub.pat sub p;
-        sub.expr sub e
-    | Pexp_function pel -> sub.cases sub pel
-    | Pexp_apply (e, l) ->
-        sub.expr sub e; List.iter (iter_snd (sub.expr sub)) l
-    | Pexp_match (e, pel) ->
-        sub.expr sub e; sub.cases sub pel
-    | Pexp_try (e, pel) -> sub.expr sub e; sub.cases sub pel
-    | Pexp_tuple el -> List.iter (sub.expr sub) el
-    | Pexp_construct (lid, arg) ->
-        iter_loc sub lid; iter_opt (sub.expr sub) arg
-    | Pexp_variant (_lab, eo) ->
-        iter_opt (sub.expr sub) eo
-    | Pexp_record (l, eo) ->
-        List.iter (iter_tuple (iter_loc sub) (sub.expr sub)) l;
-        iter_opt (sub.expr sub) eo
-    | Pexp_field (e, lid) ->
-        sub.expr sub e; iter_loc sub lid
-    | Pexp_setfield (e1, lid, e2) ->
-        sub.expr sub e1; iter_loc sub lid;
-        sub.expr sub e2
-    | Pexp_array el -> List.iter (sub.expr sub) el
-    | Pexp_ifthenelse (e1, e2, e3) ->
-        sub.expr sub e1; sub.expr sub e2;
-        iter_opt (sub.expr sub) e3
-    | Pexp_sequence (e1, e2) ->
-        sub.expr sub e1; sub.expr sub e2
-    | Pexp_while (e1, e2) ->
-        sub.expr sub e1; sub.expr sub e2
-    | Pexp_for (p, e1, e2, _d, e3) ->
-        sub.pat sub p; sub.expr sub e1; sub.expr sub e2;
-        sub.expr sub e3
-    | Pexp_coerce (e, t1, t2) ->
-        sub.expr sub e; iter_opt (sub.typ sub) t1;
-        sub.typ sub t2
-    | Pexp_constraint (e, t) ->
-        sub.expr sub e; sub.typ sub t
-    | Pexp_send (e, _s) -> sub.expr sub e
-    | Pexp_new lid -> iter_loc sub lid
-    | Pexp_setinstvar (s, e) ->
-        iter_loc sub s; sub.expr sub e
-    | Pexp_override sel ->
-        List.iter (iter_tuple (iter_loc sub) (sub.expr sub)) sel
-    | Pexp_letmodule (s, me, e) ->
-        iter_loc sub s; sub.module_expr sub me;
-        sub.expr sub e
-    | Pexp_letexception (cd, e) ->
-        sub.extension_constructor sub cd;
-        sub.expr sub e
-    | Pexp_assert e -> sub.expr sub e
-    | Pexp_lazy e -> sub.expr sub e
-    | Pexp_poly (e, t) ->
-        sub.expr sub e; iter_opt (sub.typ sub) t
-    | Pexp_object cls -> sub.class_structure sub cls
-    | Pexp_newtype (_s, e) -> sub.expr sub e
-    | Pexp_pack me -> sub.module_expr sub me
-    | Pexp_open (_ovf, lid, e) ->
-        iter_loc sub lid; sub.expr sub e
-    | Pexp_extension x -> sub.extension sub x
-    | Pexp_unreachable -> ()
-end
-
-module P = struct
-  (* Patterns *)
-
-  let iter sub {ppat_desc = desc; ppat_loc = loc; ppat_attributes = attrs} =
-    sub.location sub loc;
-    sub.attributes sub attrs;
-    match desc with
-    | Ppat_any -> ()
-    | Ppat_var s -> iter_loc sub s
-    | Ppat_alias (p, s) -> sub.pat sub p; iter_loc sub s
-    | Ppat_constant _ -> ()
-    | Ppat_interval _ -> ()
-    | Ppat_tuple pl -> List.iter (sub.pat sub) pl
-    | Ppat_construct (l, p) ->
-        iter_loc sub l; iter_opt (sub.pat sub) p
-    | Ppat_variant (_l, p) -> iter_opt (sub.pat sub) p
-    | Ppat_record (lpl, _cf) ->
-        List.iter (iter_tuple (iter_loc sub) (sub.pat sub)) lpl
-    | Ppat_array pl -> List.iter (sub.pat sub) pl
-    | Ppat_or (p1, p2) -> sub.pat sub p1; sub.pat sub p2
-    | Ppat_constraint (p, t) ->
-        sub.pat sub p; sub.typ sub t
-    | Ppat_type s -> iter_loc sub s
-    | Ppat_lazy p -> sub.pat sub p
-    | Ppat_unpack s -> iter_loc sub s
-    | Ppat_exception p -> sub.pat sub p
-    | Ppat_extension x -> sub.extension sub x
-    | Ppat_open (lid, p) ->
-        iter_loc sub lid; sub.pat sub p
-
-end
-
-module CE = struct
-  (* Value expressions for the class language *)
-
-  let iter sub {pcl_loc = loc; pcl_desc = desc; pcl_attributes = attrs} =
-    sub.location sub loc;
-    sub.attributes sub attrs;
-    match desc with
-    | Pcl_constr (lid, tys) ->
-        iter_loc sub lid; List.iter (sub.typ sub) tys
-    | Pcl_structure s ->
-        sub.class_structure sub s
-    | Pcl_fun (_lab, e, p, ce) ->
-        iter_opt (sub.expr sub) e;
-        sub.pat sub p;
-        sub.class_expr sub ce
-    | Pcl_apply (ce, l) ->
-        sub.class_expr sub ce;
-        List.iter (iter_snd (sub.expr sub)) l
-    | Pcl_let (_r, vbs, ce) ->
-        List.iter (sub.value_binding sub) vbs;
-        sub.class_expr sub ce
-    | Pcl_constraint (ce, ct) ->
-        sub.class_expr sub ce; sub.class_type sub ct
-    | Pcl_extension x -> sub.extension sub x
-    | Pcl_open (_ovf, lid, e) ->
-        iter_loc sub lid; sub.class_expr sub e
-
-  let iter_kind sub = function
-    | Cfk_concrete (_o, e) -> sub.expr sub e
-    | Cfk_virtual t -> sub.typ sub t
-
-  let iter_field sub {pcf_desc = desc; pcf_loc = loc; pcf_attributes = attrs} =
-    sub.location sub loc;
-    sub.attributes sub attrs;
-    match desc with
-    | Pcf_inherit () -> ()
-    | Pcf_val (s, _m, k) -> iter_loc sub s; iter_kind sub k
-    | Pcf_method (s, _p, k) ->
-        iter_loc sub s; iter_kind sub k
-    | Pcf_constraint (t1, t2) ->
-        sub.typ sub t1; sub.typ sub t2
-    | Pcf_initializer e -> sub.expr sub e
-    | Pcf_attribute x -> sub.attribute sub x
-    | Pcf_extension x -> sub.extension sub x
-
-  let iter_structure sub {pcstr_self; pcstr_fields} =
-    sub.pat sub pcstr_self;
-    List.iter (sub.class_field sub) pcstr_fields
-
-  let class_infos sub f {pci_virt = _; pci_params = pl; pci_name; pci_expr;
-                         pci_loc; pci_attributes} =
-    List.iter (iter_fst (sub.typ sub)) pl;
-    iter_loc sub pci_name;
-    f pci_expr;
-    sub.location sub pci_loc;
-    sub.attributes sub pci_attributes
-end
-
-(* Now, a generic AST mapper, to be extended to cover all kinds and
-   cases of the OCaml grammar.  The default behavior of the mapper is
-   the identity. *)
-
-let default_iterator =
-  {
-    structure = (fun this l -> List.iter (this.structure_item this) l);
-    structure_item = M.iter_structure_item;
-    module_expr = M.iter;
-    signature = (fun this l -> List.iter (this.signature_item this) l);
-    signature_item = MT.iter_signature_item;
-    module_type = MT.iter;
-    with_constraint = MT.iter_with_constraint;
-    class_expr = CE.iter;
-    class_field = CE.iter_field;
-    class_structure = CE.iter_structure;
-    class_type = CT.iter;
-    class_type_field = CT.iter_field;
-    class_signature = CT.iter_signature;
-    class_type_declaration =
-      (fun this -> CE.class_infos this (this.class_type this));
-    type_declaration = T.iter_type_declaration;
-    type_kind = T.iter_type_kind;
-    typ = T.iter;
-    type_extension = T.iter_type_extension;
-    extension_constructor = T.iter_extension_constructor;
-    value_description =
-      (fun this {pval_name; pval_type; pval_prim = _; pval_loc;
-                 pval_attributes} ->
-        iter_loc this pval_name;
-        this.typ this pval_type;
-        this.attributes this pval_attributes;
-        this.location this pval_loc
-      );
-
-    pat = P.iter;
-    expr = E.iter;
-
-    module_declaration =
-      (fun this {pmd_name; pmd_type; pmd_attributes; pmd_loc} ->
-         iter_loc this pmd_name;
-         this.module_type this pmd_type;
-         this.attributes this pmd_attributes;
-         this.location this pmd_loc
-      );
-
-    module_type_declaration =
-      (fun this {pmtd_name; pmtd_type; pmtd_attributes; pmtd_loc} ->
-         iter_loc this pmtd_name;
-         iter_opt (this.module_type this) pmtd_type;
-         this.attributes this pmtd_attributes;
-         this.location this pmtd_loc
-      );
-
-    module_binding =
-      (fun this {pmb_name; pmb_expr; pmb_attributes; pmb_loc} ->
-         iter_loc this pmb_name; this.module_expr this pmb_expr;
-         this.attributes this pmb_attributes;
-         this.location this pmb_loc
-      );
-
-
-    open_description =
-      (fun this {popen_lid; popen_override = _; popen_attributes; popen_loc} ->
-         iter_loc this popen_lid;
-         this.location this popen_loc;
-         this.attributes this popen_attributes
-      );
-
-
-    include_description =
-      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
-         this.module_type this pincl_mod;
-         this.location this pincl_loc;
-         this.attributes this pincl_attributes
-      );
-
-    include_declaration =
-      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
-         this.module_expr this pincl_mod;
-         this.location this pincl_loc;
-         this.attributes this pincl_attributes
-      );
-
-
-    value_binding =
-      (fun this {pvb_pat; pvb_expr; pvb_attributes; pvb_loc} ->
-         this.pat this pvb_pat;
-         this.expr this pvb_expr;
-         this.location this pvb_loc;
-         this.attributes this pvb_attributes
-      );
-
-
-    constructor_declaration =
-      (fun this {pcd_name; pcd_args; pcd_res; pcd_loc; pcd_attributes} ->
-         iter_loc this pcd_name;
-         T.iter_constructor_arguments this pcd_args;
-         iter_opt (this.typ this) pcd_res;
-         this.location this pcd_loc;
-         this.attributes this pcd_attributes
-      );
-
-    label_declaration =
-      (fun this {pld_name; pld_type; pld_loc; pld_mutable = _; pld_attributes}->
-         iter_loc this pld_name;
-         this.typ this pld_type;
-         this.location this pld_loc;
-         this.attributes this pld_attributes
-      );
-
-    cases = (fun this l -> List.iter (this.case this) l);
-    case =
-      (fun this {pc_lhs; pc_guard; pc_rhs} ->
-         this.pat this pc_lhs;
-         iter_opt (this.expr this) pc_guard;
-         this.expr this pc_rhs
-      );
-
-    location = (fun _this _l -> ());
-
-    extension = (fun this (s, e) -> iter_loc this s; this.payload this e);
-    attribute = (fun this (s, e) -> iter_loc this s; this.payload this e);
-    attributes = (fun this l -> List.iter (this.attribute this) l);
-    payload =
-      (fun this -> function
-         | PStr x -> this.structure this x
-         | PSig x -> this.signature this x
-         | PTyp x -> this.typ this x
-         | PPat (x, g) -> this.pat this x; iter_opt (this.expr this) g
-      );
-  }
diff --git a/jscomp/ml/ast_mapper.ml b/jscomp/ml/ast_mapper.ml
deleted file mode 100644
index 5aa10df..0000000
--- a/jscomp/ml/ast_mapper.ml
+++ /dev/null
@@ -1,914 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                         Alain Frisch, LexiFi                           *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* A generic Parsetree mapping class *)
-
-(*
-[@@@warning "+9"]
-  (* Ensure that record patterns don't miss any field. *)
-*)
-
-
-open Parsetree
-open Ast_helper
-open Location
-
-type mapper = {
-  attribute: mapper -> attribute -> attribute;
-  attributes: mapper -> attribute list -> attribute list;
-  case: mapper -> case -> case;
-  cases: mapper -> case list -> case list;
-  class_expr: mapper -> class_expr -> class_expr;
-  class_field: mapper -> class_field -> class_field;
-  class_signature: mapper -> class_signature -> class_signature;
-  class_structure: mapper -> class_structure -> class_structure;
-  class_type: mapper -> class_type -> class_type;
-  class_type_declaration: mapper -> class_type_declaration
-                          -> class_type_declaration;
-  class_type_field: mapper -> class_type_field -> class_type_field;
-  constructor_declaration: mapper -> constructor_declaration
-                           -> constructor_declaration;
-  expr: mapper -> expression -> expression;
-  extension: mapper -> extension -> extension;
-  extension_constructor: mapper -> extension_constructor
-                         -> extension_constructor;
-  include_declaration: mapper -> include_declaration -> include_declaration;
-  include_description: mapper -> include_description -> include_description;
-  label_declaration: mapper -> label_declaration -> label_declaration;
-  location: mapper -> Location.t -> Location.t;
-  module_binding: mapper -> module_binding -> module_binding;
-  module_declaration: mapper -> module_declaration -> module_declaration;
-  module_expr: mapper -> module_expr -> module_expr;
-  module_type: mapper -> module_type -> module_type;
-  module_type_declaration: mapper -> module_type_declaration
-                           -> module_type_declaration;
-  open_description: mapper -> open_description -> open_description;
-  pat: mapper -> pattern -> pattern;
-  payload: mapper -> payload -> payload;
-  signature: mapper -> signature -> signature;
-  signature_item: mapper -> signature_item -> signature_item;
-  structure: mapper -> structure -> structure;
-  structure_item: mapper -> structure_item -> structure_item;
-  typ: mapper -> core_type -> core_type;
-  type_declaration: mapper -> type_declaration -> type_declaration;
-  type_extension: mapper -> type_extension -> type_extension;
-  type_kind: mapper -> type_kind -> type_kind;
-  value_binding: mapper -> value_binding -> value_binding;
-  value_description: mapper -> value_description -> value_description;
-  with_constraint: mapper -> with_constraint -> with_constraint;
-}
-
-let map_fst f (x, y) = (f x, y)
-let map_snd f (x, y) = (x, f y)
-let map_tuple f1 f2 (x, y) = (f1 x, f2 y)
-let map_tuple3 f1 f2 f3 (x, y, z) = (f1 x, f2 y, f3 z)
-let map_opt f = function None -> None | Some x -> Some (f x)
-
-let map_loc sub {loc; txt} = {loc = sub.location sub loc; txt}
-
-module T = struct
-  (* Type expressions for the core language *)
-
-  let row_field sub = function
-    | Rtag (l, attrs, b, tl) ->
-        Rtag (map_loc sub l, sub.attributes sub attrs,
-              b, List.map (sub.typ sub) tl)
-    | Rinherit t -> Rinherit (sub.typ sub t)
-
-  let object_field sub = function
-    | Otag (l, attrs, t) ->
-        Otag (map_loc sub l, sub.attributes sub attrs, sub.typ sub t)
-    | Oinherit t -> Oinherit (sub.typ sub t)
-
-  let map sub {ptyp_desc = desc; ptyp_loc = loc; ptyp_attributes = attrs} =
-    let open Typ in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Ptyp_any -> any ~loc ~attrs ()
-    | Ptyp_var s -> var ~loc ~attrs s
-    | Ptyp_arrow (lab, t1, t2) ->
-        arrow ~loc ~attrs lab (sub.typ sub t1) (sub.typ sub t2)
-    | Ptyp_tuple tyl -> tuple ~loc ~attrs (List.map (sub.typ sub) tyl)
-    | Ptyp_constr (lid, tl) ->
-        constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tl)
-    | Ptyp_object (l, o) ->
-        object_ ~loc ~attrs (List.map (object_field sub) l) o
-    | Ptyp_class (lid, tl) ->
-        class_ ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tl)
-    | Ptyp_alias (t, s) -> alias ~loc ~attrs (sub.typ sub t) s
-    | Ptyp_variant (rl, b, ll) ->
-        variant ~loc ~attrs (List.map (row_field sub) rl) b ll
-    | Ptyp_poly (sl, t) -> poly ~loc ~attrs
-                             (List.map (map_loc sub) sl) (sub.typ sub t)
-    | Ptyp_package (lid, l) ->
-        package ~loc ~attrs (map_loc sub lid)
-          (List.map (map_tuple (map_loc sub) (sub.typ sub)) l)
-    | Ptyp_extension x -> extension ~loc ~attrs (sub.extension sub x)
-
-  let map_type_declaration sub
-      {ptype_name; ptype_params; ptype_cstrs;
-       ptype_kind;
-       ptype_private;
-       ptype_manifest;
-       ptype_attributes;
-       ptype_loc} =
-    Type.mk (map_loc sub ptype_name)
-      ~params:(List.map (map_fst (sub.typ sub)) ptype_params)
-      ~priv:ptype_private
-      ~cstrs:(List.map
-                (map_tuple3 (sub.typ sub) (sub.typ sub) (sub.location sub))
-                ptype_cstrs)
-      ~kind:(sub.type_kind sub ptype_kind)
-      ?manifest:(map_opt (sub.typ sub) ptype_manifest)
-      ~loc:(sub.location sub ptype_loc)
-      ~attrs:(sub.attributes sub ptype_attributes)
-
-  let map_type_kind sub = function
-    | Ptype_abstract -> Ptype_abstract
-    | Ptype_variant l ->
-        Ptype_variant (List.map (sub.constructor_declaration sub) l)
-    | Ptype_record l -> Ptype_record (List.map (sub.label_declaration sub) l)
-    | Ptype_open -> Ptype_open
-
-  let map_constructor_arguments sub = function
-    | Pcstr_tuple l -> Pcstr_tuple (List.map (sub.typ sub) l)
-    | Pcstr_record l ->
-        Pcstr_record (List.map (sub.label_declaration sub) l)
-
-  let map_type_extension sub
-      {ptyext_path; ptyext_params;
-       ptyext_constructors;
-       ptyext_private;
-       ptyext_attributes} =
-    Te.mk
-      (map_loc sub ptyext_path)
-      (List.map (sub.extension_constructor sub) ptyext_constructors)
-      ~params:(List.map (map_fst (sub.typ sub)) ptyext_params)
-      ~priv:ptyext_private
-      ~attrs:(sub.attributes sub ptyext_attributes)
-
-  let map_extension_constructor_kind sub = function
-      Pext_decl(ctl, cto) ->
-        Pext_decl(map_constructor_arguments sub ctl, map_opt (sub.typ sub) cto)
-    | Pext_rebind li ->
-        Pext_rebind (map_loc sub li)
-
-  let map_extension_constructor sub
-      {pext_name;
-       pext_kind;
-       pext_loc;
-       pext_attributes} =
-    Te.constructor
-      (map_loc sub pext_name)
-      (map_extension_constructor_kind sub pext_kind)
-      ~loc:(sub.location sub pext_loc)
-      ~attrs:(sub.attributes sub pext_attributes)
-
-end
-
-module CT = struct
-  (* Type expressions for the class language *)
-
-  let map sub {pcty_loc = loc; pcty_desc = desc; pcty_attributes = attrs} =
-    let open Cty in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pcty_constr (lid, tys) ->
-        constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tys)
-    | Pcty_signature x -> signature ~loc ~attrs (sub.class_signature sub x)
-    | Pcty_arrow (lab, t, ct) ->
-        arrow ~loc ~attrs lab (sub.typ sub t) (sub.class_type sub ct)
-    | Pcty_extension x -> extension ~loc ~attrs (sub.extension sub x)
-    | Pcty_open (ovf, lid, ct) ->
-        open_ ~loc ~attrs ovf (map_loc sub lid) (sub.class_type sub ct)
-
-  let map_field sub {pctf_desc = desc; pctf_loc = loc; pctf_attributes = attrs}
-    =
-    let open Ctf in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pctf_inherit ct -> inherit_ ~loc ~attrs (sub.class_type sub ct)
-    | Pctf_val (s, m, v, t) ->
-        val_ ~loc ~attrs (map_loc sub s) m v (sub.typ sub t)
-    | Pctf_method (s, p, v, t) ->
-        method_ ~loc ~attrs (map_loc sub s) p v (sub.typ sub t)
-    | Pctf_constraint (t1, t2) ->
-        constraint_ ~loc ~attrs (sub.typ sub t1) (sub.typ sub t2)
-    | Pctf_attribute x -> attribute ~loc (sub.attribute sub x)
-    | Pctf_extension x -> extension ~loc ~attrs (sub.extension sub x)
-
-  let map_signature sub {pcsig_self; pcsig_fields} =
-    Csig.mk
-      (sub.typ sub pcsig_self)
-      (List.map (sub.class_type_field sub) pcsig_fields)
-end
-
-module MT = struct
-  (* Type expressions for the module language *)
-
-  let map sub {pmty_desc = desc; pmty_loc = loc; pmty_attributes = attrs} =
-    let open Mty in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pmty_ident s -> ident ~loc ~attrs (map_loc sub s)
-    | Pmty_alias s -> alias ~loc ~attrs (map_loc sub s)
-    | Pmty_signature sg -> signature ~loc ~attrs (sub.signature sub sg)
-    | Pmty_functor (s, mt1, mt2) ->
-        functor_ ~loc ~attrs (map_loc sub s)
-          (Misc.may_map (sub.module_type sub) mt1)
-          (sub.module_type sub mt2)
-    | Pmty_with (mt, l) ->
-        with_ ~loc ~attrs (sub.module_type sub mt)
-          (List.map (sub.with_constraint sub) l)
-    | Pmty_typeof me -> typeof_ ~loc ~attrs (sub.module_expr sub me)
-    | Pmty_extension x -> extension ~loc ~attrs (sub.extension sub x)
-
-  let map_with_constraint sub = function
-    | Pwith_type (lid, d) ->
-        Pwith_type (map_loc sub lid, sub.type_declaration sub d)
-    | Pwith_module (lid, lid2) ->
-        Pwith_module (map_loc sub lid, map_loc sub lid2)
-    | Pwith_typesubst (lid, d) ->
-        Pwith_typesubst (map_loc sub lid, sub.type_declaration sub d)
-    | Pwith_modsubst (s, lid) ->
-        Pwith_modsubst (map_loc sub s, map_loc sub lid)
-
-  let map_signature_item sub {psig_desc = desc; psig_loc = loc} =
-    let open Sig in
-    let loc = sub.location sub loc in
-    match desc with
-    | Psig_value vd -> value ~loc (sub.value_description sub vd)
-    | Psig_type (rf, l) -> type_ ~loc rf (List.map (sub.type_declaration sub) l)
-    | Psig_typext te -> type_extension ~loc (sub.type_extension sub te)
-    | Psig_exception ed -> exception_ ~loc (sub.extension_constructor sub ed)
-    | Psig_module x -> module_ ~loc (sub.module_declaration sub x)
-    | Psig_recmodule l ->
-        rec_module ~loc (List.map (sub.module_declaration sub) l)
-    | Psig_modtype x -> modtype ~loc (sub.module_type_declaration sub x)
-    | Psig_open x -> open_ ~loc (sub.open_description sub x)
-    | Psig_include x -> include_ ~loc (sub.include_description sub x)
-    | Psig_class _ -> assert false
-    | Psig_class_type l ->
-        class_type ~loc (List.map (sub.class_type_declaration sub) l)
-    | Psig_extension (x, attrs) ->
-        extension ~loc (sub.extension sub x) ~attrs:(sub.attributes sub attrs)
-    | Psig_attribute x -> attribute ~loc (sub.attribute sub x)
-end
-
-
-module M = struct
-  (* Value expressions for the module language *)
-
-  let map sub {pmod_loc = loc; pmod_desc = desc; pmod_attributes = attrs} =
-    let open Mod in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pmod_ident x -> ident ~loc ~attrs (map_loc sub x)
-    | Pmod_structure str -> structure ~loc ~attrs (sub.structure sub str)
-    | Pmod_functor (arg, arg_ty, body) ->
-        functor_ ~loc ~attrs (map_loc sub arg)
-          (Misc.may_map (sub.module_type sub) arg_ty)
-          (sub.module_expr sub body)
-    | Pmod_apply (m1, m2) ->
-        apply ~loc ~attrs (sub.module_expr sub m1) (sub.module_expr sub m2)
-    | Pmod_constraint (m, mty) ->
-        constraint_ ~loc ~attrs (sub.module_expr sub m)
-                    (sub.module_type sub mty)
-    | Pmod_unpack e -> unpack ~loc ~attrs (sub.expr sub e)
-    | Pmod_extension x -> extension ~loc ~attrs (sub.extension sub x)
-
-  let map_structure_item sub {pstr_loc = loc; pstr_desc = desc} =
-    let open Str in
-    let loc = sub.location sub loc in
-    match desc with
-    | Pstr_eval (x, attrs) ->
-        eval ~loc ~attrs:(sub.attributes sub attrs) (sub.expr sub x)
-    | Pstr_value (r, vbs) -> value ~loc r (List.map (sub.value_binding sub) vbs)
-    | Pstr_primitive vd -> primitive ~loc (sub.value_description sub vd)
-    | Pstr_type (rf, l) -> type_ ~loc rf (List.map (sub.type_declaration sub) l)
-    | Pstr_typext te -> type_extension ~loc (sub.type_extension sub te)
-    | Pstr_exception ed -> exception_ ~loc (sub.extension_constructor sub ed)
-    | Pstr_module x -> module_ ~loc (sub.module_binding sub x)
-    | Pstr_recmodule l -> rec_module ~loc (List.map (sub.module_binding sub) l)
-    | Pstr_modtype x -> modtype ~loc (sub.module_type_declaration sub x)
-    | Pstr_open x -> open_ ~loc (sub.open_description sub x)
-    | Pstr_class () -> {pstr_loc = loc ; pstr_desc = Pstr_class ()}
-    | Pstr_class_type l ->
-        class_type ~loc (List.map (sub.class_type_declaration sub) l)
-    | Pstr_include x -> include_ ~loc (sub.include_declaration sub x)
-    | Pstr_extension (x, attrs) ->
-        extension ~loc (sub.extension sub x) ~attrs:(sub.attributes sub attrs)
-    | Pstr_attribute x -> attribute ~loc (sub.attribute sub x)
-end
-
-module E = struct
-  (* Value expressions for the core language *)
-
-  let map sub {pexp_loc = loc; pexp_desc = desc; pexp_attributes = attrs} =
-    let open Exp in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pexp_ident x -> ident ~loc ~attrs (map_loc sub x)
-    | Pexp_constant x -> constant ~loc ~attrs x
-    | Pexp_let (r, vbs, e) ->
-        let_ ~loc ~attrs r (List.map (sub.value_binding sub) vbs)
-          (sub.expr sub e)
-    | Pexp_fun (lab, def, p, e) ->
-        fun_ ~loc ~attrs lab (map_opt (sub.expr sub) def) (sub.pat sub p)
-          (sub.expr sub e)
-    | Pexp_function pel -> function_ ~loc ~attrs (sub.cases sub pel)
-    | Pexp_apply (e, l) ->
-        apply ~loc ~attrs (sub.expr sub e) (List.map (map_snd (sub.expr sub)) l)
-    | Pexp_match (e, pel) ->
-        match_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
-    | Pexp_try (e, pel) -> try_ ~loc ~attrs (sub.expr sub e) (sub.cases sub pel)
-    | Pexp_tuple el -> tuple ~loc ~attrs (List.map (sub.expr sub) el)
-    | Pexp_construct (lid, arg) ->
-        construct ~loc ~attrs (map_loc sub lid) (map_opt (sub.expr sub) arg)
-    | Pexp_variant (lab, eo) ->
-        variant ~loc ~attrs lab (map_opt (sub.expr sub) eo)
-    | Pexp_record (l, eo) ->
-        record ~loc ~attrs (List.map (map_tuple (map_loc sub) (sub.expr sub)) l)
-          (map_opt (sub.expr sub) eo)
-    | Pexp_field (e, lid) ->
-        field ~loc ~attrs (sub.expr sub e) (map_loc sub lid)
-    | Pexp_setfield (e1, lid, e2) ->
-        setfield ~loc ~attrs (sub.expr sub e1) (map_loc sub lid)
-          (sub.expr sub e2)
-    | Pexp_array el -> array ~loc ~attrs (List.map (sub.expr sub) el)
-    | Pexp_ifthenelse (e1, e2, e3) ->
-        ifthenelse ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
-          (map_opt (sub.expr sub) e3)
-    | Pexp_sequence (e1, e2) ->
-        sequence ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
-    | Pexp_while (e1, e2) ->
-        while_ ~loc ~attrs (sub.expr sub e1) (sub.expr sub e2)
-    | Pexp_for (p, e1, e2, d, e3) ->
-        for_ ~loc ~attrs (sub.pat sub p) (sub.expr sub e1) (sub.expr sub e2) d
-          (sub.expr sub e3)
-    | Pexp_coerce (e, t1, t2) ->
-        coerce ~loc ~attrs (sub.expr sub e) (map_opt (sub.typ sub) t1)
-          (sub.typ sub t2)
-    | Pexp_constraint (e, t) ->
-        constraint_ ~loc ~attrs (sub.expr sub e) (sub.typ sub t)
-    | Pexp_send (e, s) ->
-        send ~loc ~attrs (sub.expr sub e) (map_loc sub s)
-    | Pexp_new lid -> new_ ~loc ~attrs (map_loc sub lid)
-    | Pexp_setinstvar (s, e) ->
-        setinstvar ~loc ~attrs (map_loc sub s) (sub.expr sub e)
-    | Pexp_override sel ->
-        override ~loc ~attrs
-          (List.map (map_tuple (map_loc sub) (sub.expr sub)) sel)
-    | Pexp_letmodule (s, me, e) ->
-        letmodule ~loc ~attrs (map_loc sub s) (sub.module_expr sub me)
-          (sub.expr sub e)
-    | Pexp_letexception (cd, e) ->
-        letexception ~loc ~attrs
-          (sub.extension_constructor sub cd)
-          (sub.expr sub e)
-    | Pexp_assert e -> assert_ ~loc ~attrs (sub.expr sub e)
-    | Pexp_lazy e -> lazy_ ~loc ~attrs (sub.expr sub e)
-    | Pexp_poly (e, t) ->
-        poly ~loc ~attrs (sub.expr sub e) (map_opt (sub.typ sub) t)
-    | Pexp_object cls -> object_ ~loc ~attrs (sub.class_structure sub cls)
-    | Pexp_newtype (s, e) ->
-        newtype ~loc ~attrs (map_loc sub s) (sub.expr sub e)
-    | Pexp_pack me -> pack ~loc ~attrs (sub.module_expr sub me)
-    | Pexp_open (ovf, lid, e) ->
-        open_ ~loc ~attrs ovf (map_loc sub lid) (sub.expr sub e)
-    | Pexp_extension x -> extension ~loc ~attrs (sub.extension sub x)
-    | Pexp_unreachable -> unreachable ~loc ~attrs ()
-end
-
-module P = struct
-  (* Patterns *)
-
-  let map sub {ppat_desc = desc; ppat_loc = loc; ppat_attributes = attrs} =
-    let open Pat in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Ppat_any -> any ~loc ~attrs ()
-    | Ppat_var s -> var ~loc ~attrs (map_loc sub s)
-    | Ppat_alias (p, s) -> alias ~loc ~attrs (sub.pat sub p) (map_loc sub s)
-    | Ppat_constant c -> constant ~loc ~attrs c
-    | Ppat_interval (c1, c2) -> interval ~loc ~attrs c1 c2
-    | Ppat_tuple pl -> tuple ~loc ~attrs (List.map (sub.pat sub) pl)
-    | Ppat_construct (l, p) ->
-        construct ~loc ~attrs (map_loc sub l) (map_opt (sub.pat sub) p)
-    | Ppat_variant (l, p) -> variant ~loc ~attrs l (map_opt (sub.pat sub) p)
-    | Ppat_record (lpl, cf) ->
-        record ~loc ~attrs
-               (List.map (map_tuple (map_loc sub) (sub.pat sub)) lpl) cf
-    | Ppat_array pl -> array ~loc ~attrs (List.map (sub.pat sub) pl)
-    | Ppat_or (p1, p2) -> or_ ~loc ~attrs (sub.pat sub p1) (sub.pat sub p2)
-    | Ppat_constraint (p, t) ->
-        constraint_ ~loc ~attrs (sub.pat sub p) (sub.typ sub t)
-    | Ppat_type s -> type_ ~loc ~attrs (map_loc sub s)
-    | Ppat_lazy p -> lazy_ ~loc ~attrs (sub.pat sub p)
-    | Ppat_unpack s -> unpack ~loc ~attrs (map_loc sub s)
-    | Ppat_open (lid,p) -> open_ ~loc ~attrs (map_loc sub lid) (sub.pat sub p)
-    | Ppat_exception p -> exception_ ~loc ~attrs (sub.pat sub p)
-    | Ppat_extension x -> extension ~loc ~attrs (sub.extension sub x)
-end
-
-module CE = struct
-  (* Value expressions for the class language *)
-
-  let map sub {pcl_loc = loc; pcl_desc = desc; pcl_attributes = attrs} =
-    let open Cl in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pcl_constr (lid, tys) ->
-        constr ~loc ~attrs (map_loc sub lid) (List.map (sub.typ sub) tys)
-    | Pcl_structure s ->
-        structure ~loc ~attrs (sub.class_structure sub s)
-    | Pcl_fun (lab, e, p, ce) ->
-        fun_ ~loc ~attrs lab
-          (map_opt (sub.expr sub) e)
-          (sub.pat sub p)
-          (sub.class_expr sub ce)
-    | Pcl_apply (ce, l) ->
-        apply ~loc ~attrs (sub.class_expr sub ce)
-          (List.map (map_snd (sub.expr sub)) l)
-    | Pcl_let (r, vbs, ce) ->
-        let_ ~loc ~attrs r (List.map (sub.value_binding sub) vbs)
-          (sub.class_expr sub ce)
-    | Pcl_constraint (ce, ct) ->
-        constraint_ ~loc ~attrs (sub.class_expr sub ce) (sub.class_type sub ct)
-    | Pcl_extension x -> extension ~loc ~attrs (sub.extension sub x)
-    | Pcl_open (ovf, lid, ce) ->
-        open_ ~loc ~attrs ovf (map_loc sub lid) (sub.class_expr sub ce)
-
-  let map_kind sub = function
-    | Cfk_concrete (o, e) -> Cfk_concrete (o, sub.expr sub e)
-    | Cfk_virtual t -> Cfk_virtual (sub.typ sub t)
-
-  let map_field sub {pcf_desc = desc; pcf_loc = loc; pcf_attributes = attrs} =
-    let open Cf in
-    let loc = sub.location sub loc in
-    let attrs = sub.attributes sub attrs in
-    match desc with
-    | Pcf_inherit () ->
-      {pcf_desc = desc; pcf_loc = loc; pcf_attributes = attrs}
-    | Pcf_val (s, m, k) -> val_ ~loc ~attrs (map_loc sub s) m (map_kind sub k)
-    | Pcf_method (s, p, k) ->
-        method_ ~loc ~attrs (map_loc sub s) p (map_kind sub k)
-    | Pcf_constraint (t1, t2) ->
-        constraint_ ~loc ~attrs (sub.typ sub t1) (sub.typ sub t2)
-    | Pcf_initializer e -> initializer_ ~loc ~attrs (sub.expr sub e)
-    | Pcf_attribute x -> attribute ~loc (sub.attribute sub x)
-    | Pcf_extension x -> extension ~loc ~attrs (sub.extension sub x)
-
-  let map_structure sub {pcstr_self; pcstr_fields} =
-    {
-      pcstr_self = sub.pat sub pcstr_self;
-      pcstr_fields = List.map (sub.class_field sub) pcstr_fields;
-    }
-
-  let class_infos sub f {pci_virt; pci_params = pl; pci_name; pci_expr;
-                         pci_loc; pci_attributes} =
-    Ci.mk
-     ~virt:pci_virt
-     ~params:(List.map (map_fst (sub.typ sub)) pl)
-      (map_loc sub pci_name)
-      (f pci_expr)
-      ~loc:(sub.location sub pci_loc)
-      ~attrs:(sub.attributes sub pci_attributes)
-end
-
-(* Now, a generic AST mapper, to be extended to cover all kinds and
-   cases of the OCaml grammar.  The default behavior of the mapper is
-   the identity. *)
-
-let default_mapper =
-  {
-    structure = (fun this l -> List.map (this.structure_item this) l);
-    structure_item = M.map_structure_item;
-    module_expr = M.map;
-    signature = (fun this l -> List.map (this.signature_item this) l);
-    signature_item = MT.map_signature_item;
-    module_type = MT.map;
-    with_constraint = MT.map_with_constraint;
-    class_expr = CE.map;
-    class_field = CE.map_field;
-    class_structure = CE.map_structure;
-    class_type = CT.map;
-    class_type_field = CT.map_field;
-    class_signature = CT.map_signature;
-    class_type_declaration =
-      (fun this -> CE.class_infos this (this.class_type this));
-    type_declaration = T.map_type_declaration;
-    type_kind = T.map_type_kind;
-    typ = T.map;
-    type_extension = T.map_type_extension;
-    extension_constructor = T.map_extension_constructor;
-    value_description =
-      (fun this {pval_name; pval_type; pval_prim; pval_loc;
-                 pval_attributes} ->
-        Val.mk
-          (map_loc this pval_name)
-          (this.typ this pval_type)
-          ~attrs:(this.attributes this pval_attributes)
-          ~loc:(this.location this pval_loc)
-          ~prim:pval_prim
-      );
-
-    pat = P.map;
-    expr = E.map;
-
-    module_declaration =
-      (fun this {pmd_name; pmd_type; pmd_attributes; pmd_loc} ->
-         Md.mk
-           (map_loc this pmd_name)
-           (this.module_type this pmd_type)
-           ~attrs:(this.attributes this pmd_attributes)
-           ~loc:(this.location this pmd_loc)
-      );
-
-    module_type_declaration =
-      (fun this {pmtd_name; pmtd_type; pmtd_attributes; pmtd_loc} ->
-         Mtd.mk
-           (map_loc this pmtd_name)
-           ?typ:(map_opt (this.module_type this) pmtd_type)
-           ~attrs:(this.attributes this pmtd_attributes)
-           ~loc:(this.location this pmtd_loc)
-      );
-
-    module_binding =
-      (fun this {pmb_name; pmb_expr; pmb_attributes; pmb_loc} ->
-         Mb.mk (map_loc this pmb_name) (this.module_expr this pmb_expr)
-           ~attrs:(this.attributes this pmb_attributes)
-           ~loc:(this.location this pmb_loc)
-      );
-
-
-    open_description =
-      (fun this {popen_lid; popen_override; popen_attributes; popen_loc} ->
-         Opn.mk (map_loc this popen_lid)
-           ~override:popen_override
-           ~loc:(this.location this popen_loc)
-           ~attrs:(this.attributes this popen_attributes)
-      );
-
-
-    include_description =
-      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
-         Incl.mk (this.module_type this pincl_mod)
-           ~loc:(this.location this pincl_loc)
-           ~attrs:(this.attributes this pincl_attributes)
-      );
-
-    include_declaration =
-      (fun this {pincl_mod; pincl_attributes; pincl_loc} ->
-         Incl.mk (this.module_expr this pincl_mod)
-           ~loc:(this.location this pincl_loc)
-           ~attrs:(this.attributes this pincl_attributes)
-      );
-
-
-    value_binding =
-      (fun this {pvb_pat; pvb_expr; pvb_attributes; pvb_loc} ->
-         Vb.mk
-           (this.pat this pvb_pat)
-           (this.expr this pvb_expr)
-           ~loc:(this.location this pvb_loc)
-           ~attrs:(this.attributes this pvb_attributes)
-      );
-
-
-    constructor_declaration =
-      (fun this {pcd_name; pcd_args; pcd_res; pcd_loc; pcd_attributes} ->
-        Type.constructor
-          (map_loc this pcd_name)
-          ~args:(T.map_constructor_arguments this pcd_args)
-          ?res:(map_opt (this.typ this) pcd_res)
-          ~loc:(this.location this pcd_loc)
-          ~attrs:(this.attributes this pcd_attributes)
-      );
-
-    label_declaration =
-      (fun this {pld_name; pld_type; pld_loc; pld_mutable; pld_attributes} ->
-         Type.field
-           (map_loc this pld_name)
-           (this.typ this pld_type)
-           ~mut:pld_mutable
-           ~loc:(this.location this pld_loc)
-           ~attrs:(this.attributes this pld_attributes)
-      );
-
-    cases = (fun this l -> List.map (this.case this) l);
-    case =
-      (fun this {pc_lhs; pc_guard; pc_rhs} ->
-         {
-           pc_lhs = this.pat this pc_lhs;
-           pc_guard = map_opt (this.expr this) pc_guard;
-           pc_rhs = this.expr this pc_rhs;
-         }
-      );
-
-
-
-    location = (fun _this l -> l);
-
-    extension = (fun this (s, e) -> (map_loc this s, this.payload this e));
-    attribute = (fun this (s, e) -> (map_loc this s, this.payload this e));
-    attributes = (fun this l -> List.map (this.attribute this) l);
-    payload =
-      (fun this -> function
-         | PStr x -> PStr (this.structure this x)
-         | PSig x -> PSig (this.signature this x)
-         | PTyp x -> PTyp (this.typ this x)
-         | PPat (x, g) -> PPat (this.pat this x, map_opt (this.expr this) g)
-      );
-  }
-
-let rec extension_of_error {loc; msg; if_highlight; sub} =
-  { loc; txt = "ocaml.error" },
-  PStr ([Str.eval (Exp.constant (Pconst_string (msg, None)));
-         Str.eval (Exp.constant (Pconst_string (if_highlight, None)))] @
-        (List.map (fun ext -> Str.extension (extension_of_error ext)) sub))
-
-let attribute_of_warning loc s =
-  { loc; txt = "ocaml.ppwarning" },
-  PStr ([Str.eval ~loc (Exp.constant (Pconst_string (s, None)))])
-
-module StringMap = Map.Make(struct
-    type t = string
-    let compare = compare
-end)
-
-let cookies = ref StringMap.empty
-
-let get_cookie k =
-  try Some (StringMap.find k !cookies)
-  with Not_found -> None
-
-let set_cookie k v =
-  cookies := StringMap.add k v !cookies
-
-let tool_name_ref = ref "_none_"
-
-let tool_name () = !tool_name_ref
-
-
-module PpxContext = struct
-  open Longident
-  open Asttypes
-  open Ast_helper
-
-  let lid name = { txt = Lident name; loc = Location.none }
-
-  let make_string x = Exp.constant (Pconst_string (x, None))
-
-  let make_bool x =
-    if x
-    then Exp.construct (lid "true") None
-    else Exp.construct (lid "false") None
-
-  let rec make_list f lst =
-    match lst with
-    | x :: rest ->
-      Exp.construct (lid "::") (Some (Exp.tuple [f x; make_list f rest]))
-    | [] ->
-      Exp.construct (lid "[]") None
-
-  let make_pair f1 f2 (x1, x2) =
-    Exp.tuple [f1 x1; f2 x2]
-
-
-  let get_cookies () =
-    lid "cookies",
-    make_list (make_pair make_string (fun x -> x))
-      (StringMap.bindings !cookies)
-
-  let mk fields =
-    { txt = "ocaml.ppx.context"; loc = Location.none },
-    Parsetree.PStr [Str.eval (Exp.record fields None)]
-
-  let make ~tool_name () =
-    let fields =
-      [
-        lid "tool_name",    make_string tool_name;
-        lid "include_dirs", make_list make_string !Clflags.include_dirs;
-        lid "load_path",    make_list make_string !Config.load_path;
-        lid "open_modules", make_list make_string !Clflags.open_modules;
-        lid "debug",        make_bool !Clflags.debug;
-        get_cookies ()
-      ]
-    in
-    mk fields
-
-  let get_fields = function
-    | PStr [{pstr_desc = Pstr_eval
-                 ({ pexp_desc = Pexp_record (fields, None) }, [])}] ->
-        fields
-    | _ ->
-        raise_errorf "Internal error: invalid [@@@ocaml.ppx.context] syntax"
-
-  let restore fields =
-    let field name payload =
-      let rec get_string = function
-        | { pexp_desc = Pexp_constant (Pconst_string (str, None)) } -> str
-        | _ -> raise_errorf "Internal error: invalid [@@@ocaml.ppx.context \
-                             { %s }] string syntax" name
-      and get_bool pexp =
-        match pexp with
-        | {pexp_desc = Pexp_construct ({txt = Longident.Lident "true"},
-                                       None)} ->
-            true
-        | {pexp_desc = Pexp_construct ({txt = Longident.Lident "false"},
-                                       None)} ->
-            false
-        | _ -> raise_errorf "Internal error: invalid [@@@ocaml.ppx.context \
-                             { %s }] bool syntax" name
-      and get_list elem = function
-        | {pexp_desc =
-             Pexp_construct ({txt = Longident.Lident "::"},
-                             Some {pexp_desc = Pexp_tuple [exp; rest]}) } ->
-            elem exp :: get_list elem rest
-        | {pexp_desc =
-             Pexp_construct ({txt = Longident.Lident "[]"}, None)} ->
-            []
-        | _ -> raise_errorf "Internal error: invalid [@@@ocaml.ppx.context \
-                             { %s }] list syntax" name
-      and get_pair f1 f2 = function
-        | {pexp_desc = Pexp_tuple [e1; e2]} ->
-            (f1 e1, f2 e2)
-        | _ -> raise_errorf "Internal error: invalid [@@@ocaml.ppx.context \
-                             { %s }] pair syntax" name
-      in
-      match name with
-      | "tool_name" ->
-          tool_name_ref := get_string payload
-      | "include_dirs" ->
-          Clflags.include_dirs := get_list get_string payload
-      | "load_path" ->
-          Config.load_path := get_list get_string payload
-      | "open_modules" ->
-          Clflags.open_modules := get_list get_string payload
-      | "debug" ->
-          Clflags.debug := get_bool payload
-      | "cookies" ->
-          let l = get_list (get_pair get_string (fun x -> x)) payload in
-          cookies :=
-            List.fold_left
-              (fun s (k, v) -> StringMap.add k v s) StringMap.empty
-              l
-      | _ ->
-          ()
-    in
-    List.iter (function ({txt=Lident name}, x) -> field name x | _ -> ()) fields
-
-  let update_cookies fields =
-    let fields =
-      Ext_list.filter fields
-        (function ({txt=Lident "cookies"}, _) -> false | _ -> true)        
-    in
-    fields @ [get_cookies ()]
-end
-
-let ppx_context = PpxContext.make
-
-let extension_of_exn exn =
-  match error_of_exn exn with
-  | Some (`Ok error) -> extension_of_error error
-  | Some `Already_displayed -> { loc = Location.none; txt = "ocaml.error" }, PStr []
-  | None -> raise exn
-
-
-let apply_lazy ~source ~target mapper =
-  let implem ast =
-    let fields, ast =
-      match ast with
-      | {pstr_desc = Pstr_attribute ({txt = "ocaml.ppx.context"}, x)} :: l ->
-          PpxContext.get_fields x, l
-      | _ -> [], ast
-    in
-    PpxContext.restore fields;
-    let ast =
-      try
-        let mapper = mapper () in
-        mapper.structure mapper ast
-      with exn ->
-        [{pstr_desc = Pstr_extension (extension_of_exn exn, []);
-          pstr_loc  = Location.none}]
-    in
-    let fields = PpxContext.update_cookies fields in
-    Str.attribute (PpxContext.mk fields) :: ast
-  in
-  let iface ast =
-    let fields, ast =
-      match ast with
-      | {psig_desc = Psig_attribute ({txt = "ocaml.ppx.context"}, x)} :: l ->
-          PpxContext.get_fields x, l
-      | _ -> [], ast
-    in
-    PpxContext.restore fields;
-    let ast =
-      try
-        let mapper = mapper () in
-        mapper.signature mapper ast
-      with exn ->
-        [{psig_desc = Psig_extension (extension_of_exn exn, []);
-          psig_loc  = Location.none}]
-    in
-    let fields = PpxContext.update_cookies fields in
-    Sig.attribute (PpxContext.mk fields) :: ast
-  in
-
-  let ic = open_in_bin source in
-  let magic =
-    really_input_string ic (String.length Config.ast_impl_magic_number)
-  in
-
-  let rewrite transform =
-    Location.set_input_name @@ input_value ic;
-    let ast = input_value ic in
-    close_in ic;
-    let ast = transform ast in
-    let oc = open_out_bin target in
-    output_string oc magic;
-    output_value oc !Location.input_name;
-    output_value oc ast;
-    close_out oc
-  and fail () =
-    close_in ic;
-    failwith "Ast_mapper: OCaml version mismatch or malformed input";
-  in
-
-  if magic = Config.ast_impl_magic_number then
-    rewrite (implem : structure -> structure)
-  else if magic = Config.ast_intf_magic_number then
-    rewrite (iface : signature -> signature)
-  else fail ()
-
-let drop_ppx_context_str ~restore = function
-  | {pstr_desc = Pstr_attribute({Location.txt = "ocaml.ppx.context"}, a)}
-    :: items ->
-      if restore then
-        PpxContext.restore (PpxContext.get_fields a);
-      items
-  | items -> items
-
-let drop_ppx_context_sig ~restore = function
-  | {psig_desc = Psig_attribute({Location.txt = "ocaml.ppx.context"}, a)}
-    :: items ->
-      if restore then
-        PpxContext.restore (PpxContext.get_fields a);
-      items
-  | items -> items
-
-let add_ppx_context_str ~tool_name ast =
-  Ast_helper.Str.attribute (ppx_context ~tool_name ()) :: ast
-
-let add_ppx_context_sig ~tool_name ast =
-  Ast_helper.Sig.attribute (ppx_context ~tool_name ()) :: ast
-
-
-let apply ~source ~target mapper =
-  apply_lazy ~source ~target (fun () -> mapper)
-
-let run_main mapper =
-  try
-    let a = Sys.argv in
-    let n = Array.length a in
-    if n > 2 then
-      let mapper () =
-        try mapper (Array.to_list (Array.sub a 1 (n - 3)))
-        with exn ->
-          (* PR#6463 *)
-          let f _ _ = raise exn in
-          {default_mapper with structure = f; signature = f}
-      in
-      apply_lazy ~source:a.(n - 2) ~target:a.(n - 1) mapper
-    else begin
-      Printf.eprintf "Usage: %s [extra_args] <infile> <outfile>\n%!"
-                     Sys.executable_name;
-      exit 2
-    end
-  with exn ->
-    prerr_endline (Printexc.to_string exn);
-    exit 2
-
-let register_function = ref (fun _name f -> run_main f)
-let register name f = !register_function name f
diff --git a/jscomp/ml/ast_uncurried.ml b/jscomp/ml/ast_uncurried.ml
deleted file mode 100644
index 432bb6c..0000000
--- a/jscomp/ml/ast_uncurried.ml
+++ /dev/null
@@ -1,125 +0,0 @@
-(* Uncurried AST *)
-
-
-let encode_arity_string arity = "Has_arity" ^ string_of_int arity
-let decode_arity_string arity_s = int_of_string ((String.sub [@doesNotRaise]) arity_s 9 (String.length arity_s - 9))
-
-let arityType ~loc arity =
-  Ast_helper.Typ.variant ~loc
-    [ Rtag ({ txt = encode_arity_string arity; loc }, [], true, []) ]
-    Closed None
-
-let arityFromType (typ : Parsetree.core_type) =
-  match typ.ptyp_desc with
-  | Ptyp_variant ([Rtag ({txt}, _, _, _)], _, _) -> decode_arity_string txt
-  | _ -> assert false
-
-let uncurriedType ~loc ~arity tArg =
-    let tArity = arityType ~loc arity in
-    Ast_helper.Typ.constr ~loc
-      { txt = Lident "function$"; loc }
-      [ tArg; tArity ]
-
-let arity_to_attributes arity =
-  [
-    ( Location.mknoloc "res.arity",
-      Parsetree.PStr
-        [
-          Ast_helper.Str.eval
-            (Ast_helper.Exp.constant
-               (Pconst_integer (string_of_int arity, None)));
-        ] );
-  ]
-
-let rec attributes_to_arity (attrs : Parsetree.attributes) =
-  match attrs with
-  | ( { txt = "res.arity" },
-      PStr
-        [
-          {
-            pstr_desc =
-              Pstr_eval
-                ({ pexp_desc = Pexp_constant (Pconst_integer (arity, _)) }, _);
-          };
-        ] )
-    :: _ ->
-      int_of_string arity
-  | _ :: rest -> attributes_to_arity rest
-  | _ -> assert false
-
-let uncurriedFun ~loc ~arity funExpr =
-    Ast_helper.Exp.construct ~loc
-      ~attrs:(arity_to_attributes arity)
-      (Location.mknoloc (Longident.Lident "Function$"))
-      (Some funExpr)
-
-let exprIsUncurriedFun (expr : Parsetree.expression) =
-  match expr.pexp_desc with
-  | Pexp_construct ({ txt = Lident "Function$" }, Some _) -> true
-  | _ -> false
-
-let exprExtractUncurriedFun (expr : Parsetree.expression) =
-  match expr.pexp_desc with
-  | Pexp_construct ({ txt = Lident "Function$" }, Some e) -> e
-  | _ -> assert false
-
-let coreTypeIsUncurriedFun (typ : Parsetree.core_type) =
-  match typ.ptyp_desc with
-  | Ptyp_constr ({txt = Lident "function$"}, [{ptyp_desc = Ptyp_arrow _}; _]) ->
-    true
-  | _ -> false
-
-let coreTypeExtractUncurriedFun (typ : Parsetree.core_type) =
-  match typ.ptyp_desc with
-  | Ptyp_constr ({txt = Lident "function$"}, [tArg; tArity]) ->
-    (arityFromType tArity, tArg)
-  | _ -> assert false
-
-let typeIsUncurriedFun = Ast_uncurried_utils.typeIsUncurriedFun
-
-let typeExtractUncurriedFun (typ : Types.type_expr) = 
-  match typ.desc with
-  | Tconstr (Pident {name = "function$"}, [tArg; _], _) ->
-    tArg
-  | _ -> assert false
-
-(* Typed AST *)
-
-let arity_to_type arity =
-  let arity_s = encode_arity_string arity in
-  Ctype.newty
-    (Tvariant
-       {
-         row_fields = [ (arity_s, Rpresent None) ];
-         row_more = Ctype.newty Tnil;
-         row_bound = ();
-         row_closed = true;
-         row_fixed = false;
-         row_name = None;
-       })
-
-let type_to_arity (tArity : Types.type_expr) =
-  match (Ctype.repr tArity).desc with
-  | Tvariant { row_fields = [ (label, _) ] } -> decode_arity_string label
-  | _ -> assert false
-
-let make_uncurried_type ~env ~arity t =
-  let typ_arity = arity_to_type arity in
-  let lid : Longident.t = Lident "function$" in
-  let path = Env.lookup_type lid env in
-  Ctype.newconstr path [ t; typ_arity ]
-
-let uncurried_type_get_arity ~env typ =
-  match (Ctype.expand_head env typ).desc with
-  | Tconstr (Pident { name = "function$" }, [ _t; tArity ], _) ->
-      type_to_arity tArity
-  | _ -> assert false
-
-let uncurried_type_get_arity_opt ~env typ =
-  match (Ctype.expand_head env typ).desc with
-  | Tconstr (Pident { name = "function$" }, [ _t; tArity ], _) ->
-      Some (type_to_arity tArity)
-  | _ -> None
-
-
-
diff --git a/jscomp/ml/ast_uncurried_utils.ml b/jscomp/ml/ast_uncurried_utils.ml
deleted file mode 100644
index ad18b01..0000000
--- a/jscomp/ml/ast_uncurried_utils.ml
+++ /dev/null
@@ -1,5 +0,0 @@
-let typeIsUncurriedFun (typ : Types.type_expr) =
-  match typ.desc with
-  | Tconstr (Pident {name = "function$"}, [{desc = Tarrow _}; _], _) ->
-    true
-  | _ -> false
\ No newline at end of file
diff --git a/jscomp/ml/ast_untagged_variants.ml b/jscomp/ml/ast_untagged_variants.ml
deleted file mode 100644
index 2622913..0000000
--- a/jscomp/ml/ast_untagged_variants.ml
+++ /dev/null
@@ -1,492 +0,0 @@
-module Instance = struct
-  type t = 
-    | Array
-    | Blob
-    | Date
-    | File
-    | Promise 
-    | RegExp
-  let to_string = function
-      Array -> "Array" 
-    | Blob -> "Blob"
-    | Date -> "Date"
-    | File -> "File"
-    | Promise -> "Promise" 
-    | RegExp -> "RegExp"
-end
-
-type untaggedError =
-  | OnlyOneUnknown of string
-  | AtMostOneObject
-  | AtMostOneInstance of Instance.t
-  | AtMostOneFunction
-  | AtMostOneString
-  | AtMostOneNumber
-  | AtMostOneBigint
-  | AtMostOneBoolean
-  | DuplicateLiteral of string
-  | ConstructorMoreThanOneArg of string
-type error =
-  | InvalidVariantAsAnnotation
-  | Duplicated_bs_as
-  | InvalidVariantTagAnnotation
-  | InvalidUntaggedVariantDefinition of untaggedError
-exception Error of Location.t * error
-
-let report_error ppf =
-  let open Format in
-  function
-  | InvalidVariantAsAnnotation ->
-    fprintf ppf
-      "A variant case annotation @as(...) must be a string or integer, \
-       boolean, null, undefined"
-  | Duplicated_bs_as -> fprintf ppf "duplicate @as "
-  | InvalidVariantTagAnnotation ->
-    fprintf ppf "A variant tag annotation @tag(...) must be a string"
-  | InvalidUntaggedVariantDefinition untaggedVariant ->
-    fprintf ppf "This untagged variant definition is invalid: %s"
-      (match untaggedVariant with
-      | OnlyOneUnknown name -> "Case " ^ name ^ " has a payload that is not of one of the recognized shapes (object, array, etc). Then it must be the only case with payloads."
-      | AtMostOneObject -> "At most one case can be an object type."
-      | AtMostOneInstance Array -> "At most one case can be an array or tuple type."
-      | AtMostOneInstance i -> "At most one case can be a " ^ (Instance.to_string i) ^ " type."
-      | AtMostOneFunction -> "At most one case can be a function type."
-      | AtMostOneString -> "At most one case can be a string type."
-      | AtMostOneBoolean -> "At most one case can be a boolean type."
-      | AtMostOneNumber ->
-        "At most one case can be a number type (int or float)."
-      | AtMostOneBigint ->
-        "At most one case can be a bigint type."
-      | DuplicateLiteral s -> "Duplicate literal " ^ s ^ "."
-      | ConstructorMoreThanOneArg (name) -> "Constructor " ^ name ^ " has more than one argument.")
-
-(* Type of the runtime representation of an untagged block (case with payoad) *)
-type block_type =
-  | IntType
-  | StringType
-  | FloatType
-  | BigintType
-  | BooleanType
-  | InstanceType of Instance.t
-  | FunctionType
-  | ObjectType
-  | UnknownType
-
-(*
-  Type of the runtime representation of a tag.
-  Can be a literal (case with no payload), or a block (case with payload).
-  In the case of block it can be tagged or untagged.
-*)
-type tag_type =
-  | String of string
-  | Int of int
-  | Float of string
-  | BigInt of string
-  | Bool of bool
-  | Null
-  | Undefined (* literal or tagged block *)
-  | Untagged of block_type (* untagged block *)
-type tag = {name: string; tag_type: tag_type option}
-type block = {tag: tag; tag_name: string option; block_type: block_type option}
-type switch_names = {consts: tag array; blocks: block array}
-
-let untagged = "unboxed"
-
-let has_untagged (attrs : Parsetree.attributes) =
-  Ext_list.exists attrs (function {txt}, _ -> txt = untagged)
-
-let process_untagged (attrs : Parsetree.attributes) =
-  let st = ref false in
-  Ext_list.iter attrs (fun ({txt}, _) ->
-      match txt with
-      | "unboxed" -> st := true
-      | _ -> ());
-  !st
-
-let extract_concrete_typedecl: (Env.t ->
-  Types.type_expr ->
-  Path.t * Path.t * Types.type_declaration) ref = ref (Obj.magic ())
-
-let expand_head: (Env.t -> Types.type_expr -> Types.type_expr) ref = ref (Obj.magic ())
-
-let process_tag_type (attrs : Parsetree.attributes) =
-  let st : tag_type option ref = ref None in
-  Ext_list.iter attrs (fun ({txt; loc}, payload) ->
-      match txt with
-      | "bs.as" | "as" ->
-        if !st = None then (
-          (match Ast_payload.is_single_string payload with
-          | None -> ()
-          | Some (s, _dec) -> st := Some (String s));
-          (match Ast_payload.is_single_int payload with
-          | None -> ()
-          | Some i -> st := Some (Int i));
-          (match Ast_payload.is_single_float payload with
-          | None -> ()
-          | Some f -> st := Some (Float f));
-          (match Ast_payload.is_single_bigint payload with
-          | None -> ()
-          | Some i -> st := Some (BigInt i));
-          (match Ast_payload.is_single_bool payload with
-          | None -> ()
-          | Some b -> st := Some (Bool b));
-          (match Ast_payload.is_single_ident payload with
-          | None -> ()
-          | Some (Lident "null") -> st := Some Null
-          | Some (Lident "undefined") -> st := Some Undefined
-          | Some _ -> raise (Error (loc, InvalidVariantAsAnnotation)));
-          if !st = None then raise (Error (loc, InvalidVariantAsAnnotation)))
-        else raise (Error (loc, Duplicated_bs_as))
-      | _ -> ());
-  !st
-
-let () =
-  Location.register_error_of_exn (function
-    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
-    | _ -> None)
-
-let reportConstructorMoreThanOneArg ~loc ~name =
-  raise (Error (loc, InvalidUntaggedVariantDefinition (ConstructorMoreThanOneArg name)))
-
-let type_is_builtin_object (t : Types.type_expr) =
-  match t.desc with
-  | Tconstr (Path.Pident ident, [_], _) when Ident.name ident = "dict" -> true
-  | Tconstr (path, _, _) ->
-    let name = Path.name path in
-    name = "Js.Dict.t" || name = "Js_dict.t"
-  | _ -> false
-
-let type_to_instanceof_backed_obj (t : Types.type_expr) =
-  match t.desc with
-  | Tconstr (path, _, _) when Path.same path Predef.path_promise ->
-    Some Instance.Promise
-  | Tconstr (path, _, _) when Path.same path Predef.path_array ->
-    Some Array
-  | Tconstr (path, _, _) -> (
-    match Path.name path with
-    | "Js_date.t" -> Some(Date)
-    | "Js_re.t" -> Some(RegExp)
-    | "Js_file.t" -> Some(File)
-    | "Js_blob.t" -> Some(Blob)
-    | _ -> None)
-  | _ -> None
-
-let get_block_type_from_typ ~env (t: Types.type_expr) : block_type option = 
-  let t = !expand_head env t in
-  match t with
-  | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_string ->
-    Some StringType
-  | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_int ->
-    Some IntType
-  | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_float ->
-    Some FloatType
-  | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_bigint ->
-    Some BigintType
-  | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_bool ->
-      Some BooleanType
-  | ({desc = Tconstr _} as t) when Ast_uncurried_utils.typeIsUncurriedFun t ->
-    Some FunctionType
-  | {desc = Tarrow _} -> Some FunctionType
-  | {desc = Tconstr (path, _, _)} when Path.same path Predef.path_string ->
-    Some StringType
-  | ({desc = Tconstr _} as t) when type_is_builtin_object t ->
-    Some ObjectType
-  | ({desc = Tconstr _} as t) when type_to_instanceof_backed_obj t |> Option.is_some ->
-    (match type_to_instanceof_backed_obj t with 
-    | None -> None 
-    | Some instanceType -> Some (InstanceType instanceType))
-  | {desc = Ttuple _} -> Some (InstanceType Array)
-  | _ -> None
-
-let get_block_type ~env (cstr : Types.constructor_declaration) :
-    block_type option =
-  match (process_untagged cstr.cd_attributes, cstr.cd_args) with
-  | false, _ -> None
-  | true, Cstr_tuple [t] when get_block_type_from_typ ~env t |> Option.is_some -> get_block_type_from_typ ~env t
-  | true, Cstr_tuple [ty] -> (
-    let default = Some UnknownType in
-    match !extract_concrete_typedecl env ty with
-    | _, _, {type_kind = Type_record (_, Record_unboxed _)} -> default
-    | _, _, {type_kind = Type_record (_, _)} -> Some ObjectType
-    | _ -> default
-    | exception _ -> default)
-  | true, Cstr_tuple (_ :: _ :: _) ->
-    (* C(_, _) with at least 2 args is an object *)
-    Some ObjectType
-  | true, Cstr_record _ ->
-    (* inline record is an object *)
-    Some ObjectType
-  | true, _ -> None (* TODO: add restrictions here *)
-
-let process_tag_name (attrs : Parsetree.attributes) =
-  let st = ref None in
-  Ext_list.iter attrs (fun ({txt; loc}, payload) ->
-      match txt with
-      | "tag" ->
-        if !st = None then (
-          (match Ast_payload.is_single_string payload with
-          | None -> ()
-          | Some (s, _dec) -> st := Some s);
-          if !st = None then raise (Error (loc, InvalidVariantTagAnnotation)))
-        else raise (Error (loc, Duplicated_bs_as))
-      | _ -> ());
-  !st
-
-let get_tag_name (cstr : Types.constructor_declaration) =
-  process_tag_name cstr.cd_attributes
-
-let is_nullary_variant (x : Types.constructor_arguments) =
-  match x with
-  | Types.Cstr_tuple [] -> true
-  | _ -> false
-
-let checkInvariant ~isUntaggedDef ~(consts : (Location.t * tag) list)
-    ~(blocks : (Location.t * block) list) =
-  let module StringSet = Set.Make (String) in
-  let string_literals = ref StringSet.empty in
-  let nonstring_literals = ref StringSet.empty in
-  let instanceTypes = Hashtbl.create 1 in
-  let functionTypes = ref 0 in
-  let objectTypes = ref 0 in
-  let stringTypes = ref 0 in
-  let numberTypes = ref 0 in
-  let bigintTypes = ref 0 in
-  let booleanTypes = ref 0 in
-  let unknownTypes = ref 0 in
-  let addStringLiteral ~loc s =
-    if StringSet.mem s !string_literals then
-      raise (Error (loc, InvalidUntaggedVariantDefinition (DuplicateLiteral s)));
-    string_literals := StringSet.add s !string_literals
-  in
-  let addNonstringLiteral ~loc s =
-    if StringSet.mem s !nonstring_literals then
-      raise (Error (loc, InvalidUntaggedVariantDefinition (DuplicateLiteral s)));
-    nonstring_literals := StringSet.add s !nonstring_literals
-  in
-  let invariant loc name =
-    if !unknownTypes <> 0 && List.length blocks <> 1 then
-      raise (Error (loc, InvalidUntaggedVariantDefinition (OnlyOneUnknown name)));
-    if !objectTypes > 1 then
-      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneObject));
-    Hashtbl.iter (fun i count ->
-        if count > 1 then
-          raise (Error (loc, InvalidUntaggedVariantDefinition (AtMostOneInstance i))))
-      instanceTypes;
-    if !functionTypes > 1 then
-      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneFunction));
-    if !stringTypes > 1 then
-      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneString));
-    if !numberTypes > 1 then
-      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneNumber));
-    if !bigintTypes > 1 then
-      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneBigint));
-    if !booleanTypes > 1 then
-      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneBoolean));
-    if !booleanTypes > 0 && (StringSet.mem "true" !nonstring_literals || StringSet.mem "false" !nonstring_literals) then
-      raise (Error (loc, InvalidUntaggedVariantDefinition AtMostOneBoolean));
-    ()
-  in
-  Ext_list.rev_iter consts (fun (loc, literal) ->
-      match literal.tag_type with
-      | Some (String s) -> addStringLiteral ~loc s
-      | Some (Int i) -> addNonstringLiteral ~loc (string_of_int i)
-      | Some (Float f) -> addNonstringLiteral ~loc f
-      | Some (BigInt i) -> addNonstringLiteral ~loc i
-      | Some Null -> addNonstringLiteral ~loc "null"
-      | Some Undefined -> addNonstringLiteral ~loc "undefined"
-      | Some (Bool b) -> addNonstringLiteral ~loc (if b then "true" else "false")
-      | Some (Untagged _) -> ()
-      | None -> addStringLiteral ~loc literal.name);
-  if isUntaggedDef then
-    Ext_list.rev_iter blocks (fun (loc, block) ->
-      match block.block_type with
-      | Some block_type ->
-        (match block_type with
-        | UnknownType -> incr unknownTypes;
-        | ObjectType -> incr objectTypes;
-        | (InstanceType i) ->
-          let count = Hashtbl.find_opt instanceTypes i |> Option.value ~default:0 in
-          Hashtbl.replace instanceTypes i (count + 1);
-        | FunctionType -> incr functionTypes;
-        | (IntType | FloatType) -> incr numberTypes;
-        | BigintType -> incr bigintTypes;
-        | BooleanType -> incr booleanTypes;
-        | StringType -> incr stringTypes;
-        );
-        invariant loc block.tag.name
-      | None -> ()
-    )
-
-let names_from_type_variant ?(isUntaggedDef = false) ~env
-    (cstrs : Types.constructor_declaration list) =
-  let get_cstr_name (cstr : Types.constructor_declaration) =
-    ( cstr.cd_loc,
-      {
-        name = Ident.name cstr.cd_id;
-        tag_type = process_tag_type cstr.cd_attributes;
-      } )
-  in
-  let get_block (cstr : Types.constructor_declaration) : block =
-    let tag = snd (get_cstr_name cstr) in
-    {tag; tag_name = get_tag_name cstr; block_type = get_block_type ~env cstr}
-  in
-  let consts, blocks =
-    Ext_list.fold_left cstrs ([], []) (fun (consts, blocks) cstr ->
-        if is_nullary_variant cstr.cd_args then
-          (get_cstr_name cstr :: consts, blocks)
-        else (consts, (cstr.cd_loc, get_block cstr) :: blocks))
-  in
-  checkInvariant ~isUntaggedDef ~consts ~blocks;
-  let blocks = blocks |> List.map snd in
-  let consts = consts |> List.map snd in
-  let consts = Ext_array.reverse_of_list consts in
-  let blocks = Ext_array.reverse_of_list blocks in
-  Some {consts; blocks}
-
-let check_well_formed ~env ~isUntaggedDef
-    (cstrs : Types.constructor_declaration list) =
-  ignore (names_from_type_variant ~env ~isUntaggedDef cstrs)
-
-let has_undefined_literal attrs = process_tag_type attrs = Some Undefined
-
-let block_is_object ~env attrs = get_block_type ~env attrs = Some ObjectType
-
-module DynamicChecks = struct
-  type op = EqEqEq | NotEqEq | Or | And
-  type 'a t =
-    | BinOp of op * 'a t * 'a t
-    | TagType of tag_type
-    | TypeOf of 'a t
-    | IsInstanceOf of Instance.t * 'a t
-    | Not of 'a t
-    | Expr of 'a
-
-  let bin op x y = BinOp (op, x, y)
-  let tag_type t = TagType t
-  let typeof x = TypeOf x
-  let str s = String s |> tag_type
-  let is_instance i x = IsInstanceOf (i, x)
-  let not x = Not x
-  let nil = Null |> tag_type
-  let undefined = Undefined |> tag_type
-  let object_ = Untagged ObjectType |> tag_type
-
-  let function_ = Untagged FunctionType |> tag_type
-  let string = Untagged StringType |> tag_type
-  let number = Untagged IntType |> tag_type
-
-  let bigint = Untagged BigintType |> tag_type
-
-  let boolean = Untagged BooleanType |> tag_type
-
-  let ( == ) x y = bin EqEqEq x y
-  let ( != ) x y = bin NotEqEq x y
-  let ( ||| ) x y = bin Or x y
-  let ( &&& ) x y = bin And x y
-
-  let rec is_a_literal_case ~(literal_cases : tag_type list) ~block_cases
-      (e : _ t) =
-    let literals_overlaps_with_string () =
-      Ext_list.exists literal_cases (function
-        | String _ -> true
-        | _ -> false)
-    in
-    let literals_overlaps_with_number () =
-      Ext_list.exists literal_cases (function
-        | Int _ | Float _ -> true
-        | _ -> false)
-    in
-    let literals_overlaps_with_bigint () =
-      Ext_list.exists literal_cases (function
-        | BigInt _ -> true
-        | _ -> false)
-    in
-    let literals_overlaps_with_boolean () =
-      Ext_list.exists literal_cases (function
-        | Bool _ -> true
-        | _ -> false)
-    in
-    let literals_overlaps_with_object () =
-      Ext_list.exists literal_cases (function
-        | Null -> true
-        | _ -> false)
-    in
-    let is_literal_case (t : tag_type) : _ t = e == tag_type t in
-    let is_not_block_case (c : block_type) : _ t =
-      match c with
-      | StringType
-        when literals_overlaps_with_string () = false (* No overlap *) ->
-        typeof e != string
-      | IntType when literals_overlaps_with_number () = false ->
-        typeof e != number
-      | FloatType when literals_overlaps_with_number () = false ->
-        typeof e != number
-      | BigintType when literals_overlaps_with_bigint () = false ->
-        typeof e != bigint
-      | BooleanType when literals_overlaps_with_boolean () = false ->
-        typeof e != boolean
-      | InstanceType i -> not (is_instance i e)
-      | FunctionType -> typeof e != function_
-      | ObjectType when literals_overlaps_with_object () = false ->
-        typeof e != object_
-      | ObjectType (* overlap *) -> e == nil ||| (typeof e != object_)
-      | StringType (* overlap *)
-      | IntType (* overlap *)
-      | FloatType (* overlap *)
-      | BigintType (* overlap *)
-      | BooleanType (* overlap *)
-      | UnknownType -> (
-        (* We don't know the type of unknown, so we need to express:
-           this is not one of the literals *)
-        match literal_cases with
-        | [] ->
-          (* this should not happen *)
-          assert false
-        | l1 :: others ->
-          let is_literal_1 = is_literal_case l1 in
-          Ext_list.fold_right others is_literal_1 (fun literal_n acc ->
-              is_literal_case literal_n ||| acc))
-    in
-    match block_cases with
-    | [c] -> is_not_block_case c
-    | c1 :: (_ :: _ as rest) ->
-      is_not_block_case c1
-      &&& is_a_literal_case ~literal_cases ~block_cases:rest e
-    | [] -> assert false
-
-  let is_int_tag ?(has_null_undefined_other = (false, false, false)) (e : _ t) :
-      _ t =
-    let has_null, has_undefined, has_other = has_null_undefined_other in
-    if has_null && has_undefined = false && has_other = false then
-      (* null *)
-      bin EqEqEq e nil
-    else if has_null && has_undefined && has_other = false then
-      (* null + undefined *)
-      e == nil ||| e == undefined
-    else if has_null = false && has_undefined && has_other = false then
-      (* undefined *)
-      e == undefined
-    else if has_null then
-      (* (null + undefined + other) || (null + other) *)
-      e == nil ||| typeof e != object_
-    else (* (undefiled + other) || other *)
-      typeof e != object_
-
-  let add_runtime_type_check ~tag_type ~(block_cases : block_type list) x y =
-    let instances = Ext_list.filter_map block_cases (function InstanceType i -> Some i | _ -> None) in
-    match tag_type with
-    | Untagged (IntType | StringType | FloatType | BigintType | BooleanType | FunctionType) ->
-      typeof y == x
-    | Untagged ObjectType ->
-      if instances <> [] then
-         let not_one_of_the_instances =
-          Ext_list.fold_right instances (typeof y == x) (fun i x -> x &&& not (is_instance i y))  in
-         not_one_of_the_instances
-      else
-        typeof y == x
-    | Untagged (InstanceType i) -> is_instance i y
-    | Untagged UnknownType ->
-      (* This should not happen because unknown must be the only non-literal case *)
-      assert false
-    | Bool _ | Float _ | Int _ | BigInt _ | String _ | Null | Undefined -> x
-end
diff --git a/jscomp/ml/asttypes.ml b/jscomp/ml/asttypes.ml
deleted file mode 100644
index 5abbdaa..0000000
--- a/jscomp/ml/asttypes.ml
+++ /dev/null
@@ -1,73 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Auxiliary AST types used by parsetree and typedtree. *)
-
-type constant =
-    Const_int of int
-  | Const_char of int
-  | Const_string of string * string option
-  | Const_float of string
-  | Const_int32 of int32
-  | Const_int64 of int64
-  | Const_bigint of bool * string
-
-type rec_flag = Nonrecursive | Recursive
-
-type direction_flag = Upto | Downto
-
-(* Order matters, used in polymorphic comparison *)
-type private_flag = Private | Public
-
-type mutable_flag = Immutable | Mutable
-
-type virtual_flag = Virtual | Concrete
-
-type override_flag = Override | Fresh
-
-type closed_flag = Closed | Open
-
-type label = string
-
-type arg_label =
-    Nolabel
-  | Labelled of string (*  label:T -> ... *)
-  | Optional of string (* ?label:T -> ... *)
-
-type 'a loc = 'a Location.loc = {
-  txt : 'a;
-  loc : Location.t;
-}
-
-
-type variance =
-  | Covariant
-  | Contravariant
-  | Invariant
-
-
-let same_arg_label (x : arg_label) y = 
-  match x with 
-  | Nolabel -> y = Nolabel
-  | Labelled s ->
-    begin match y with 
-    | Labelled s0 -> s = s0 
-    | _ -> false 
-    end 
-  | Optional s ->
-      begin match y with 
-      | Optional s0 -> s = s0
-      | _ -> false  
-      end  
diff --git a/jscomp/ml/bigint_utils.ml b/jscomp/ml/bigint_utils.ml
deleted file mode 100644
index e0f3fe9..0000000
--- a/jscomp/ml/bigint_utils.ml
+++ /dev/null
@@ -1,84 +0,0 @@
-let is_neg s = String.length s > 0 && s.[0] = '-'
-let is_pos s = String.length s > 0 && s.[0] = '+'
-
-let to_string sign s = (if sign then "" else "-") ^ s
-
-let remove_leading_sign str : bool * string =
-  let len = String.length str in
-  if len = 0 then (false, str)
-  else
-    if is_neg str || is_pos str then (not (is_neg str), String.sub str 1 (len -1))
-    else (true, str)
-
-(* 
-  Removes leading zeros from the string only if the first non-zero character
-  encountered is a digit. Unlike int and float, bigint cannot be of_string, so
-  This function removes only leading 0s. Instead, values like 00x1 are not converted
-  and are intended to be syntax errors.
-
-  000n -> 0n
-  001n -> 1n
-  01_000_000n -> 1000000n
-  -00100n -> -100n
-  
-  The following values are syntax errors
-
-  00o1n -> 00o1n 
-  00x1_000_000n -> 00x1000000n
-*)
-let remove_leading_zeros str =
-  let aux str =
-    let len = String.length str in
-    if len = 0 then ""
-    else
-      let is_digit c = c >= '0' && c <= '9' in
-      let idx = ref 0 in
-      while !idx < len && str.[!idx] = '0' do
-        incr idx
-      done;
-      if !idx >= len then "0" (* If the string contains only '0's, return '0'. *)
-      else if (is_digit str.[!idx]) then String.sub str !idx (len - !idx) (* Remove leading zeros and return the rest of the string. *)
-      else str
-  in
-  (* Replace the delimiters '_' inside number *)
-  let str = String.concat "" (String.split_on_char '_' str) in
-  (* Check if negative *)
-  let starts_with_minus = str <> "" && str.[0] = '-' in
-  let str = if is_neg str || is_pos str then String.sub str 1 (String.length str - 1) else str in
-  let processed_str = aux str in
-  if starts_with_minus then "-" ^ processed_str else processed_str
-
-let parse_bigint s =
-  let sign, i = remove_leading_sign s in
-  (sign, remove_leading_zeros i)
-
-let is_valid s =
-  let len = String.length s in
-  if len = 0 then false
-  else
-    let is_digit c = (c >= '0' && c <= '9') || c = '_' in
-    let first_char = s.[0] in
-    if first_char <> '-' && first_char <> '+' && not (is_digit first_char) then false
-    else
-      let rec check idx =
-        if idx >= len then true
-        else
-          let c = s.[idx] in
-          if is_digit c then check (idx + 1)
-          else false
-      in
-      check 1
-
-let compare (p0, s0) (p1, s1) =
-  match (p0, p1) with
-  | (false, true) -> -1  (* If only s1 is positive, s0 is smaller. *)
-  | (true, false) -> 1   (* If only s0 is positive, s0 is larger. *)
-  | _ ->
-    (* If both numbers are either negative or positive, compare their lengths. *)
-    let len0, len1 = (String.length s0, String.length s1) in
-    if len0 = len1 then
-      if p0 then String.compare s0 s1 else String.compare s1 s0   (* If lengths are equal, compare the strings directly. *)
-    else if len0 > len1 then 
-      if p0 then 1 else -1  (* A longer s0 means it's larger unless it's negative. *)
-    else  (* len0 < len1 *)
-      if p0 then -1 else 1  (* A longer s1 means s0 is smaller unless s1 is negative. *)
diff --git a/jscomp/ml/bigint_utils.mli b/jscomp/ml/bigint_utils.mli
deleted file mode 100644
index 34f9dfb..0000000
--- a/jscomp/ml/bigint_utils.mli
+++ /dev/null
@@ -1,8 +0,0 @@
-val is_neg: string -> bool
-val is_pos: string -> bool
-val to_string: bool -> string -> string
-val remove_leading_sign : string -> bool * string
-val remove_leading_zeros : string -> string
-val parse_bigint: string -> bool * string
-val is_valid : string -> bool
-val compare : bool * string -> bool * string -> int
diff --git a/jscomp/ml/btype.ml b/jscomp/ml/btype.ml
deleted file mode 100644
index de95c2d..0000000
--- a/jscomp/ml/btype.ml
+++ /dev/null
@@ -1,745 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*  Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt  *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Basic operations on core types *)
-
-open Misc
-open Asttypes
-open Types
-
-(**** Sets, maps and hashtables of types ****)
-
-module TypeSet = Set.Make(TypeOps)
-module TypeMap = Map.Make (TypeOps)
-module TypeHash = Hashtbl.Make(TypeOps)
-
-(**** Forward declarations ****)
-
-let print_raw =
-  ref (fun _ -> assert false : Format.formatter -> type_expr -> unit)
-
-(**** Type level management ****)
-
-let generic_level = 100000000
-
-(* Used to mark a type during a traversal. *)
-let lowest_level = 0
-let pivot_level = 2 * lowest_level - 1
-    (* pivot_level - lowest_level < lowest_level *)
-
-(**** Some type creators ****)
-
-let new_id = ref (-1)
-
-let newty2 level desc  =
-  incr new_id; { desc; level; id = !new_id }
-let newgenty desc      = newty2 generic_level desc
-let newgenvar ?name () = newgenty (Tvar name)
-(*
-let newmarkedvar level =
-  incr new_id; { desc = Tvar; level = pivot_level - level; id = !new_id }
-let newmarkedgenvar () =
-  incr new_id;
-  { desc = Tvar; level = pivot_level - generic_level; id = !new_id }
-*)
-
-(**** Check some types ****)
-
-let is_Tvar = function {desc=Tvar _} -> true | _ -> false
-let is_Tunivar = function {desc=Tunivar _} -> true | _ -> false
-let is_Tconstr = function {desc=Tconstr _} -> true | _ -> false
-
-let dummy_method = "*dummy method*"
-let default_mty = function
-    Some mty -> mty
-  | None -> Mty_signature []
-
-(**** Definitions for backtracking ****)
-
-type change =
-    Ctype of type_expr * type_desc
-  | Ccompress of type_expr * type_desc * type_desc
-  | Clevel of type_expr * int
-  | Cname of
-      (Path.t * type_expr list) option ref * (Path.t * type_expr list) option
-  | Crow of row_field option ref * row_field option
-  | Ckind of field_kind option ref * field_kind option
-  | Ccommu of commutable ref * commutable
-  | Cuniv of type_expr option ref * type_expr option
-  | Ctypeset of TypeSet.t ref * TypeSet.t
-
-type changes =
-    Change of change * changes ref
-  | Unchanged
-  | Invalid
-
-let trail = Weak.create 1
-
-let log_change ch =
-  match Weak.get trail 0 with None -> ()
-  | Some r ->
-      let r' = ref Unchanged in
-      r := Change (ch, r');
-      Weak.set trail 0 (Some r')
-
-(**** Representative of a type ****)
-
-let rec field_kind_repr =
-  function
-    Fvar {contents = Some kind} -> field_kind_repr kind
-  | kind                        -> kind
-
-let rec repr_link compress t d =
- function
-   {desc = Tlink t' as d'} ->
-     repr_link true t d' t'
- | {desc = Tfield (_, k, _, t') as d'} when field_kind_repr k = Fabsent ->
-     repr_link true t d' t'
- | t' ->
-     if compress then begin
-       log_change (Ccompress (t, t.desc, d)); t.desc <- d
-     end;
-     t'
-
-let repr t =
-  match t.desc with
-   Tlink t' as d ->
-     repr_link false t d t'
- | Tfield (_, k, _, t') as d when field_kind_repr k = Fabsent ->
-     repr_link false t d t'
- | _ -> t
-
-let rec commu_repr = function
-    Clink r when !r <> Cunknown -> commu_repr !r
-  | c -> c
-
-let rec row_field_repr_aux tl = function
-    Reither(_, tl', _, {contents = Some fi}) ->
-      row_field_repr_aux (tl@tl') fi
-  | Reither(c, tl', m, r) ->
-      Reither(c, tl@tl', m, r)
-  | Rpresent (Some _) when tl <> [] ->
-      Rpresent (Some (List.hd tl))
-  | fi -> fi
-
-let row_field_repr fi = row_field_repr_aux [] fi
-
-let rec rev_concat l ll =
-  match ll with
-    [] -> l
-  | l'::ll -> rev_concat (l'@l) ll
-
-let rec row_repr_aux ll row =
-  match (repr row.row_more).desc with
-  | Tvariant row' ->
-      let f = row.row_fields in
-      row_repr_aux (if f = [] then ll else f::ll) row'
-  | _ ->
-      if ll = [] then row else
-      {row with row_fields = rev_concat row.row_fields ll}
-
-let row_repr row = row_repr_aux [] row
-
-let rec row_field tag row =
-  let rec find = function
-    | (tag',f) :: fields ->
-        if tag = tag' then row_field_repr f else find fields
-    | [] ->
-        match repr row.row_more with
-        | {desc=Tvariant row'} -> row_field tag row'
-        | _ -> Rabsent
-  in find row.row_fields
-
-let rec row_more row =
-  match repr row.row_more with
-  | {desc=Tvariant row'} -> row_more row'
-  | ty -> ty
-
-let row_fixed row =
-  let row = row_repr row in
-  row.row_fixed ||
-  match (repr row.row_more).desc with
-    Tvar _ | Tnil -> false
-  | Tunivar _ | Tconstr _ -> true
-  | _ -> assert false
-
-let static_row row =
-  let row = row_repr row in
-  row.row_closed &&
-  List.for_all
-    (fun (_,f) -> match row_field_repr f with Reither _ -> false | _ -> true)
-    row.row_fields
-
-let hash_variant s =
-  let accu = ref 0 in
-  for i = 0 to String.length s - 1 do
-    accu := 223 * !accu + Char.code s.[i]
-  done;
-  (* reduce to 31 bits *)
-  accu := !accu land (1 lsl 31 - 1);
-  (* make it signed for 64 bits architectures *)
-  if !accu > 0x3FFFFFFF then !accu - (1 lsl 31) else !accu
-
-let proxy ty =
-  let ty0 = repr ty in
-  match ty0.desc with
-  | Tvariant row when not (static_row row) ->
-      row_more row
-  | Tobject (ty, _) ->
-      let rec proxy_obj ty =
-        match ty.desc with
-          Tfield (_, _, _, ty) | Tlink ty -> proxy_obj ty
-        | Tvar _ | Tunivar _ | Tconstr _ -> ty
-        | Tnil -> ty0
-        | _ -> assert false
-      in proxy_obj ty
-  | _ -> ty0
-
-(**** Utilities for fixed row private types ****)
-
-let row_of_type t = 
-  match (repr t).desc with
-    Tobject(t,_) ->
-      let rec get_row t =
-        let t = repr t in
-        match t.desc with
-          Tfield(_,_,_,t) -> get_row t
-        | _ -> t
-      in get_row t
-  | Tvariant row ->
-      row_more row
-  | _ ->
-      t
-
-let has_constr_row t =
-  not (is_Tconstr t) && is_Tconstr (row_of_type t)
-
-let is_row_name s =
-  let l = String.length s in
-  if l < 4 then false else String.sub s (l-4) 4 = "#row"
-
-let is_constr_row ~allow_ident t =
-  match t.desc with
-    Tconstr (Path.Pident id, _, _) when allow_ident ->
-      is_row_name (Ident.name id)
-  | Tconstr (Path.Pdot (_, s, _), _, _) -> is_row_name s
-  | _ -> false
-
-
-                  (**********************************)
-                  (*  Utilities for type traversal  *)
-                  (**********************************)
-
-let rec iter_row f row =
-  List.iter
-    (fun (_, fi) ->
-      match row_field_repr fi with
-      | Rpresent(Some ty) -> f ty
-      | Reither(_, tl, _, _) -> List.iter f tl
-      | _ -> ())
-    row.row_fields;
-  match (repr row.row_more).desc with
-    Tvariant row -> iter_row f row
-  | Tvar _ | Tunivar _ | Tsubst _ | Tconstr _ | Tnil ->
-      Misc.may (fun (_,l) -> List.iter f l) row.row_name
-  | _ -> assert false
-
-let iter_type_expr f ty =
-  match ty.desc with
-    Tvar _              -> ()
-  | Tarrow (_, ty1, ty2, _) -> f ty1; f ty2
-  | Ttuple l            -> List.iter f l
-  | Tconstr (_, l, _)   -> List.iter f l
-  | Tobject(ty, {contents = Some (_, p)})
-                        -> f ty; List.iter f p
-  | Tobject (ty, _)     -> f ty
-  | Tvariant row        -> iter_row f row; f (row_more row)
-  | Tfield (_, _, ty1, ty2) -> f ty1; f ty2
-  | Tnil                -> ()
-  | Tlink ty            -> f ty
-  | Tsubst ty           -> f ty
-  | Tunivar _           -> ()
-  | Tpoly (ty, tyl)     -> f ty; List.iter f tyl
-  | Tpackage (_, _, l)  -> List.iter f l
-
-let rec iter_abbrev f = function
-    Mnil                   -> ()
-  | Mcons(_, _, ty, ty', rem) -> f ty; f ty'; iter_abbrev f rem
-  | Mlink rem              -> iter_abbrev f !rem
-
-type type_iterators =
-  { it_signature: type_iterators -> signature -> unit;
-    it_signature_item: type_iterators -> signature_item -> unit;
-    it_value_description: type_iterators -> value_description -> unit;
-    it_type_declaration: type_iterators -> type_declaration -> unit;
-    it_extension_constructor: type_iterators -> extension_constructor -> unit;
-    it_module_declaration: type_iterators -> module_declaration -> unit;
-    it_modtype_declaration: type_iterators -> modtype_declaration -> unit;
-    it_class_declaration: type_iterators -> class_declaration -> unit;
-    it_class_type_declaration: type_iterators -> class_type_declaration -> unit;
-    it_module_type: type_iterators -> module_type -> unit;
-    it_class_type: type_iterators -> class_type -> unit;
-    it_type_kind: type_iterators -> type_kind -> unit;
-    it_do_type_expr: type_iterators -> type_expr -> unit;
-    it_type_expr: type_iterators -> type_expr -> unit;
-    it_path: Path.t -> unit; }
-
-let iter_type_expr_cstr_args f = function
-  | Cstr_tuple tl -> List.iter f tl
-  | Cstr_record lbls -> List.iter (fun d -> f d.ld_type) lbls
-
-let map_type_expr_cstr_args f = function
-  | Cstr_tuple tl -> Cstr_tuple (List.map f tl)
-  | Cstr_record lbls ->
-      Cstr_record (List.map (fun d -> {d with ld_type=f d.ld_type}) lbls)
-
-let iter_type_expr_kind f = function
-  | Type_abstract -> ()
-  | Type_variant cstrs ->
-      List.iter
-        (fun cd ->
-           iter_type_expr_cstr_args f cd.cd_args;
-           Misc.may f cd.cd_res
-        )
-        cstrs
-  | Type_record(lbls, _) ->
-      List.iter (fun d -> f d.ld_type) lbls
-  | Type_open ->
-      ()
-
-
-let type_iterators =
-  let it_signature it =
-    List.iter (it.it_signature_item it)
-  and it_signature_item it = function
-      Sig_value (_, vd)     -> it.it_value_description it vd
-    | Sig_type (_, td, _)   -> it.it_type_declaration it td
-    | Sig_typext (_, td, _) -> it.it_extension_constructor it td
-    | Sig_module (_, md, _) -> it.it_module_declaration it md
-    | Sig_modtype (_, mtd)  -> it.it_modtype_declaration it mtd
-    | Sig_class ()  -> assert false
-    | Sig_class_type (_, ctd, _) -> it.it_class_type_declaration it ctd
-  and it_value_description it vd =
-    it.it_type_expr it vd.val_type
-  and it_type_declaration it td =
-    List.iter (it.it_type_expr it) td.type_params;
-    may (it.it_type_expr it) td.type_manifest;
-    it.it_type_kind it td.type_kind
-  and it_extension_constructor it td =
-    it.it_path td.ext_type_path;
-    List.iter (it.it_type_expr it) td.ext_type_params;
-    iter_type_expr_cstr_args (it.it_type_expr it) td.ext_args;
-    may (it.it_type_expr it) td.ext_ret_type
-  and it_module_declaration it md =
-    it.it_module_type it md.md_type
-  and it_modtype_declaration it mtd =
-    may (it.it_module_type it) mtd.mtd_type
-  and it_class_declaration it cd =
-    List.iter (it.it_type_expr it) cd.cty_params;
-    it.it_class_type it cd.cty_type;
-    may (it.it_type_expr it) cd.cty_new;
-    it.it_path cd.cty_path
-  and it_class_type_declaration it ctd =
-    List.iter (it.it_type_expr it) ctd.clty_params;
-    it.it_class_type it ctd.clty_type;
-    it.it_path ctd.clty_path
-  and it_module_type it = function
-      Mty_ident p
-    | Mty_alias(_, p) -> it.it_path p
-    | Mty_signature sg -> it.it_signature it sg
-    | Mty_functor (_, mto, mt) ->
-        may (it.it_module_type it) mto;
-        it.it_module_type it mt
-  and it_class_type it = function
-      Cty_constr (p, tyl, cty) ->
-        it.it_path p;
-        List.iter (it.it_type_expr it) tyl;
-        it.it_class_type it cty
-    | Cty_signature cs ->
-        it.it_type_expr it cs.csig_self;
-        Vars.iter (fun _ (_,_,ty) -> it.it_type_expr it ty) cs.csig_vars;
-        List.iter
-          (fun (p, tl) -> it.it_path p; List.iter (it.it_type_expr it) tl)
-          cs.csig_inher
-    | Cty_arrow  (_, ty, cty) ->
-        it.it_type_expr it ty;
-        it.it_class_type it cty
-  and it_type_kind it kind =
-    iter_type_expr_kind (it.it_type_expr it) kind
-  and it_do_type_expr it ty =
-    iter_type_expr (it.it_type_expr it) ty;
-    match ty.desc with
-      Tconstr (p, _, _)
-    | Tobject (_, {contents=Some (p, _)})
-    | Tpackage (p, _, _) ->
-        it.it_path p
-    | Tvariant row ->
-        may (fun (p,_) -> it.it_path p) (row_repr row).row_name
-    | _ -> ()
-  and it_path _p = ()
-  in
-  { it_path; it_type_expr = it_do_type_expr; it_do_type_expr;
-    it_type_kind; it_class_type; it_module_type;
-    it_signature; it_class_type_declaration; it_class_declaration;
-    it_modtype_declaration; it_module_declaration; it_extension_constructor;
-    it_type_declaration; it_value_description; it_signature_item; }
-
-let copy_row f fixed row keep more =
-  let fields = List.map
-      (fun (l, fi) -> l,
-        match row_field_repr fi with
-        | Rpresent(Some ty) -> Rpresent(Some(f ty))
-        | Reither(c, tl, m, e) ->
-            let e = if keep then e else ref None in
-            let m = if row.row_fixed then fixed else m in
-            let tl = List.map f tl in
-            Reither(c, tl, m, e)
-        | _ -> fi)
-      row.row_fields in
-  let name =
-    match row.row_name with None -> None
-    | Some (path, tl) -> Some (path, List.map f tl) in
-  { row_fields = fields; row_more = more;
-    row_bound = (); row_fixed = row.row_fixed && fixed;
-    row_closed = row.row_closed; row_name = name; }
-
-let rec copy_kind = function
-    Fvar{contents = Some k} -> copy_kind k
-  | Fvar _   -> Fvar (ref None)
-  | Fpresent -> Fpresent
-  | Fabsent  -> assert false
-
-let copy_commu c =
-  if commu_repr c = Cok then Cok else Clink (ref Cunknown)
-
-(* Since univars may be used as row variables, we need to do some
-   encoding during substitution *)
-let rec norm_univar ty =
-  match ty.desc with
-    Tunivar _ | Tsubst _ -> ty
-  | Tlink ty           -> norm_univar ty
-  | Ttuple (ty :: _)   -> norm_univar ty
-  | _                  -> assert false
-
-let rec copy_type_desc ?(keep_names=false) f = function
-    Tvar _ as ty        -> if keep_names then ty else Tvar None
-  | Tarrow (p, ty1, ty2, c)-> Tarrow (p, f ty1, f ty2, copy_commu c)
-  | Ttuple l            -> Ttuple (List.map f l)
-  | Tconstr (p, l, _)   -> Tconstr (p, List.map f l, ref Mnil)
-  | Tobject(ty, {contents = Some (p, tl)})
-                        -> Tobject (f ty, ref (Some(p, List.map f tl)))
-  | Tobject (ty, _)     -> Tobject (f ty, ref None)
-  | Tvariant _          -> assert false (* too ambiguous *)
-  | Tfield (p, k, ty1, ty2) -> (* the kind is kept shared *)
-      Tfield (p, field_kind_repr k, f ty1, f ty2)
-  | Tnil                -> Tnil
-  | Tlink ty            -> copy_type_desc f ty.desc
-  | Tsubst _            -> assert false
-  | Tunivar _ as ty     -> ty (* always keep the name *)
-  | Tpoly (ty, tyl)     ->
-      let tyl = List.map (fun x -> norm_univar (f x)) tyl in
-      Tpoly (f ty, tyl)
-  | Tpackage (p, n, l)  -> Tpackage (p, n, List.map f l)
-
-(* Utilities for copying *)
-
-let saved_desc = ref []
-  (* Saved association of generic nodes with their description. *)
-
-let save_desc ty desc =
-  saved_desc := (ty, desc)::!saved_desc
-
-let saved_kinds = ref [] (* duplicated kind variables *)
-let new_kinds = ref []   (* new kind variables *)
-let dup_kind r =
-  (match !r with None -> () | Some _ -> assert false);
-  if not (List.memq r !new_kinds) then begin
-    saved_kinds := r :: !saved_kinds;
-    let r' = ref None in
-    new_kinds := r' :: !new_kinds;
-    r := Some (Fvar r')
-  end
-
-(* Restored type descriptions. *)
-let cleanup_types () =
-  List.iter (fun (ty, desc) -> ty.desc <- desc) !saved_desc;
-  List.iter (fun r -> r := None) !saved_kinds;
-  saved_desc := []; saved_kinds := []; new_kinds := []
-
-(* Mark a type. *)
-let rec mark_type ty =
-  let ty = repr ty in
-  if ty.level >= lowest_level then begin
-    ty.level <- pivot_level - ty.level;
-    iter_type_expr mark_type ty
-  end
-
-let mark_type_node ty =
-  let ty = repr ty in
-  if ty.level >= lowest_level then begin
-    ty.level <- pivot_level - ty.level;
-  end
-
-let mark_type_params ty =
-  iter_type_expr mark_type ty
-
-let type_iterators =
-  let it_type_expr it ty =
-    let ty = repr ty in
-    if ty.level >= lowest_level then begin
-      mark_type_node ty;
-      it.it_do_type_expr it ty;
-    end
-  in
-  {type_iterators with it_type_expr}
-
-
-(* Remove marks from a type. *)
-let rec unmark_type ty =
-  let ty = repr ty in
-  if ty.level < lowest_level then begin
-    ty.level <- pivot_level - ty.level;
-    iter_type_expr unmark_type ty
-  end
-
-let unmark_iterators =
-  let it_type_expr _it ty = unmark_type ty in
-  {type_iterators with it_type_expr}
-
-let unmark_type_decl decl =
-  unmark_iterators.it_type_declaration unmark_iterators decl
-
-let unmark_extension_constructor ext =
-  List.iter unmark_type ext.ext_type_params;
-  iter_type_expr_cstr_args unmark_type ext.ext_args;
-  Misc.may unmark_type ext.ext_ret_type
-
-let unmark_class_signature sign =
-  unmark_type sign.csig_self;
-  Vars.iter (fun _l (_m, _v, t) -> unmark_type t) sign.csig_vars
-
-let unmark_class_type cty =
-  unmark_iterators.it_class_type unmark_iterators cty
-
-
-                  (*******************************************)
-                  (*  Memorization of abbreviation expansion *)
-                  (*******************************************)
-
-(* Search whether the expansion has been memorized. *)
-
-let lte_public p1 p2 =  (* Private <= Public *)
-  match p1, p2 with
-  | Private, _ | _, Public -> true
-  | Public, Private -> false
-
-let rec find_expans priv p1 = function
-    Mnil -> None
-  | Mcons (priv', p2, _ty0, ty, _)
-    when lte_public priv priv' && Path.same p1 p2 -> Some ty
-  | Mcons (_, _, _, _, rem)   -> find_expans priv p1 rem
-  | Mlink {contents = rem} -> find_expans priv p1 rem
-
-(* debug: check for cycles in abbreviation. only works with -principal
-let rec check_expans visited ty =
-  let ty = repr ty in
-  assert (not (List.memq ty visited));
-  match ty.desc with
-    Tconstr (path, args, abbrev) ->
-      begin match find_expans path !abbrev with
-        Some ty' -> check_expans (ty :: visited) ty'
-      | None -> ()
-      end
-  | _ -> ()
-*)
-
-let memo = ref []
-        (* Contains the list of saved abbreviation expansions. *)
-
-let cleanup_abbrev () =
-        (* Remove all memorized abbreviation expansions. *)
-  List.iter (fun abbr -> abbr := Mnil) !memo;
-  memo := []
-
-let memorize_abbrev mem priv path v v' =
-        (* Memorize the expansion of an abbreviation. *)
-  mem := Mcons (priv, path, v, v', !mem);
-  (* check_expans [] v; *)
-  memo := mem :: !memo
-
-let rec forget_abbrev_rec mem path =
-  match mem with
-    Mnil ->
-      assert false
-  | Mcons (_, path', _, _, rem) when Path.same path path' ->
-      rem
-  | Mcons (priv, path', v, v', rem) ->
-      Mcons (priv, path', v, v', forget_abbrev_rec rem path)
-  | Mlink mem' ->
-      mem' := forget_abbrev_rec !mem' path;
-      raise Exit
-
-let forget_abbrev mem path =
-  try mem := forget_abbrev_rec !mem path with Exit -> ()
-
-(* debug: check for invalid abbreviations
-let rec check_abbrev_rec = function
-    Mnil -> true
-  | Mcons (_, ty1, ty2, rem) ->
-      repr ty1 != repr ty2
-  | Mlink mem' ->
-      check_abbrev_rec !mem'
-
-let check_memorized_abbrevs () =
-  List.for_all (fun mem -> check_abbrev_rec !mem) !memo
-*)
-
-                  (**********************************)
-                  (*  Utilities for labels          *)
-                  (**********************************)
-
-let is_optional = function Optional _ -> true | _ -> false
-
-let label_name = function
-    Nolabel -> ""
-  | Labelled s
-  | Optional s -> s
-
-let prefixed_label_name = function
-    Nolabel -> ""
-  | Labelled s -> "~" ^ s
-  | Optional s -> "?" ^ s
-
-
-type sargs = (Asttypes.arg_label * Parsetree.expression) list
-  
-let rec extract_label_aux hd l = function
-    [] -> None
-  | (l',t as p) :: ls ->
-      if label_name l' = l then Some (l', t, List.rev_append hd ls)
-      else extract_label_aux (p::hd) l ls
-
-let extract_label l (ls : sargs) : (arg_label * Parsetree.expression * sargs) option = extract_label_aux [] l ls
-
-
-let rec label_assoc x (args : sargs) = 
-  match args with 
-  | [] -> false
-  | (a, _) :: l -> Asttypes.same_arg_label a x  || label_assoc x l
-
-                  (**********************************)
-                  (*  Utilities for backtracking    *)
-                  (**********************************)
-
-let undo_change = function
-    Ctype  (ty, desc) -> ty.desc <- desc
-  | Ccompress  (ty, desc, _) -> ty.desc <- desc
-  | Clevel (ty, level) -> ty.level <- level
-  | Cname  (r, v) -> r := v
-  | Crow   (r, v) -> r := v
-  | Ckind  (r, v) -> r := v
-  | Ccommu (r, v) -> r := v
-  | Cuniv  (r, v) -> r := v
-  | Ctypeset (r, v) -> r := v
-
-type snapshot = changes ref * int
-let last_snapshot = ref 0
-
-let log_type ty =
-  if ty.id <= !last_snapshot then log_change (Ctype (ty, ty.desc))
-let link_type ty ty' =
-  log_type ty;
-  let desc = ty.desc in
-  ty.desc <- Tlink ty';
-  (* Name is a user-supplied name for this unification variable (obtained
-   * through a type annotation for instance). *)
-  match desc, ty'.desc with
-    Tvar name, Tvar name' ->
-      begin match name, name' with
-      | Some _, None ->  log_type ty'; ty'.desc <- Tvar name
-      | None, Some _ ->  ()
-      | Some _, Some _ ->
-          if ty.level < ty'.level then (log_type ty'; ty'.desc <- Tvar name)
-      | None, None   ->  ()
-      end
-  | _ -> ()
-  (* ; assert (check_memorized_abbrevs ()) *)
-  (*  ; check_expans [] ty' *)
-let set_level ty level =
-  if ty.id <= !last_snapshot then log_change (Clevel (ty, ty.level));
-  ty.level <- level
-let set_univar rty ty =
-  log_change (Cuniv (rty, !rty)); rty := Some ty
-let set_name nm v =
-  log_change (Cname (nm, !nm)); nm := v
-let set_row_field e v =
-  log_change (Crow (e, !e)); e := Some v
-let set_kind rk k =
-  log_change (Ckind (rk, !rk)); rk := Some k
-let set_commu rc c =
-  log_change (Ccommu (rc, !rc)); rc := c
-let set_typeset rs s =
-  log_change (Ctypeset (rs, !rs)); rs := s
-
-let snapshot () =
-  let old = !last_snapshot in
-  last_snapshot := !new_id;
-  match Weak.get trail 0 with Some r -> (r, old)
-  | None ->
-      let r = ref Unchanged in
-      Weak.set trail 0 (Some r);
-      (r, old)
-
-let rec rev_log accu = function
-    Unchanged -> accu
-  | Invalid -> assert false
-  | Change (ch, next) ->
-      let d = !next in
-      next := Invalid;
-      rev_log (ch::accu) d
-
-let backtrack (changes, old) =
-  match !changes with
-    Unchanged -> last_snapshot := old
-  | Invalid -> failwith "Btype.backtrack"
-  | Change _ as change ->
-      cleanup_abbrev ();
-      let backlog = rev_log [] change in
-      List.iter undo_change backlog;
-      changes := Unchanged;
-      last_snapshot := old;
-      Weak.set trail 0 (Some changes)
-
-let rec rev_compress_log log r =
-  match !r with
-    Unchanged | Invalid ->
-      log
-  | Change (Ccompress _, next) ->
-      rev_compress_log (r::log) next
-  | Change (_, next) ->
-      rev_compress_log log next
-
-let undo_compress (changes, _old) =
-  match !changes with
-    Unchanged
-  | Invalid -> ()
-  | Change _ ->
-      let log = rev_compress_log [] changes in
-      List.iter
-        (fun r -> match !r with
-          Change (Ccompress (ty, desc, d), next) when ty.desc == d ->
-            ty.desc <- desc; r := !next
-        | _ -> ())
-        log
diff --git a/jscomp/ml/btype.mli b/jscomp/ml/btype.mli
deleted file mode 100644
index ca1066c..0000000
--- a/jscomp/ml/btype.mli
+++ /dev/null
@@ -1,224 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Basic operations on core types *)
-
-open Asttypes
-open Types
-
-(**** Sets, maps and hashtables of types ****)
-
-module TypeSet  : Set.S with type elt = type_expr
-module TypeMap  : Map.S with type key = type_expr
-module TypeHash : Hashtbl.S with type key = type_expr
-
-(**** Levels ****)
-
-val generic_level: int
-
-val newty2: int -> type_desc -> type_expr
-        (* Create a type *)
-val newgenty: type_desc -> type_expr
-        (* Create a generic type *)
-val newgenvar: ?name:string -> unit -> type_expr
-        (* Return a fresh generic variable *)
-
-(* Use Tsubst instead
-val newmarkedvar: int -> type_expr
-        (* Return a fresh marked variable *)
-val newmarkedgenvar: unit -> type_expr
-        (* Return a fresh marked generic variable *)
-*)
-
-(**** Types ****)
-
-val is_Tvar: type_expr -> bool
-val is_Tunivar: type_expr -> bool
-val is_Tconstr: type_expr -> bool
-val dummy_method: label
-val default_mty: module_type option -> module_type
-
-val repr: type_expr -> type_expr
-        (* Return the canonical representative of a type. *)
-
-val field_kind_repr: field_kind -> field_kind
-        (* Return the canonical representative of an object field
-           kind. *)
-
-val commu_repr: commutable -> commutable
-        (* Return the canonical representative of a commutation lock *)
-
-(**** polymorphic variants ****)
-
-val row_repr: row_desc -> row_desc
-        (* Return the canonical representative of a row description *)
-val row_field_repr: row_field -> row_field
-val row_field: label -> row_desc -> row_field
-        (* Return the canonical representative of a row field *)
-val row_more: row_desc -> type_expr
-        (* Return the extension variable of the row *)
-val row_fixed: row_desc -> bool
-        (* Return whether the row should be treated as fixed or not *)
-val static_row: row_desc -> bool
-        (* Return whether the row is static or not *)
-val hash_variant: label -> int
-        (* Hash function for variant tags *)
-
-val proxy: type_expr -> type_expr
-        (* Return the proxy representative of the type: either itself
-           or a row variable *)
-
-(**** Utilities for private abbreviations with fixed rows ****)
-val row_of_type: type_expr -> type_expr
-val has_constr_row: type_expr -> bool
-val is_row_name: string -> bool
-val is_constr_row: allow_ident:bool -> type_expr -> bool
-
-(**** Utilities for type traversal ****)
-
-val iter_type_expr: (type_expr -> unit) -> type_expr -> unit
-        (* Iteration on types *)
-val iter_row: (type_expr -> unit) -> row_desc -> unit
-        (* Iteration on types in a row *)
-val iter_abbrev: (type_expr -> unit) -> abbrev_memo -> unit
-        (* Iteration on types in an abbreviation list *)
-
-type type_iterators =
-  { it_signature: type_iterators -> signature -> unit;
-    it_signature_item: type_iterators -> signature_item -> unit;
-    it_value_description: type_iterators -> value_description -> unit;
-    it_type_declaration: type_iterators -> type_declaration -> unit;
-    it_extension_constructor: type_iterators -> extension_constructor -> unit;
-    it_module_declaration: type_iterators -> module_declaration -> unit;
-    it_modtype_declaration: type_iterators -> modtype_declaration -> unit;
-    it_class_declaration: type_iterators -> class_declaration -> unit;
-    it_class_type_declaration: type_iterators -> class_type_declaration -> unit;
-    it_module_type: type_iterators -> module_type -> unit;
-    it_class_type: type_iterators -> class_type -> unit;
-    it_type_kind: type_iterators -> type_kind -> unit;
-    it_do_type_expr: type_iterators -> type_expr -> unit;
-    it_type_expr: type_iterators -> type_expr -> unit;
-    it_path: Path.t -> unit; }
-val type_iterators: type_iterators
-        (* Iteration on arbitrary type information.
-           [it_type_expr] calls [mark_type_node] to avoid loops. *)
-val unmark_iterators: type_iterators
-        (* Unmark any structure containing types. See [unmark_type] below. *)
-
-val copy_type_desc:
-    ?keep_names:bool -> (type_expr -> type_expr) -> type_desc -> type_desc
-        (* Copy on types *)
-val copy_row:
-    (type_expr -> type_expr) ->
-    bool -> row_desc -> bool -> type_expr -> row_desc
-val copy_kind: field_kind -> field_kind
-
-val save_desc: type_expr -> type_desc -> unit
-        (* Save a type description *)
-val dup_kind: field_kind option ref -> unit
-        (* Save a None field_kind, and make it point to a fresh Fvar *)
-val cleanup_types: unit -> unit
-        (* Restore type descriptions *)
-
-val lowest_level: int
-        (* Marked type: ty.level < lowest_level *)
-val pivot_level: int
-        (* Type marking: ty.level <- pivot_level - ty.level *)
-val mark_type: type_expr -> unit
-        (* Mark a type *)
-val mark_type_node: type_expr -> unit
-        (* Mark a type node (but not its sons) *)
-val mark_type_params: type_expr -> unit
-        (* Mark the sons of a type node *)
-val unmark_type: type_expr -> unit
-val unmark_type_decl: type_declaration -> unit
-val unmark_extension_constructor: extension_constructor -> unit
-val unmark_class_type: class_type -> unit
-val unmark_class_signature: class_signature -> unit
-        (* Remove marks from a type *)
-
-(**** Memorization of abbreviation expansion ****)
-
-val find_expans: private_flag -> Path.t -> abbrev_memo -> type_expr option
-        (* Look up a memorized abbreviation *)
-val cleanup_abbrev: unit -> unit
-        (* Flush the cache of abbreviation expansions.
-           When some types are saved (using [output_value]), this
-           function MUST be called just before. *)
-val memorize_abbrev:
-        abbrev_memo ref ->
-        private_flag -> Path.t -> type_expr -> type_expr -> unit
-        (* Add an expansion in the cache *)
-val forget_abbrev:
-        abbrev_memo ref -> Path.t -> unit
-        (* Remove an abbreviation from the cache *)
-
-(**** Utilities for labels ****)
-
-val is_optional : arg_label -> bool
-val label_name : arg_label -> label
-
-(* Returns the label name with first character '?' or '~' as appropriate. *)
-val prefixed_label_name : arg_label -> label
-
-type sargs = (arg_label * Parsetree.expression) list
-
-val extract_label :
-    label -> sargs ->
-    (arg_label * Parsetree.expression * sargs) option 
-    (* actual label, value, new list with the same order *)
-
-val label_assoc : arg_label -> sargs -> bool
-(**** Utilities for backtracking ****)
-
-type snapshot
-        (* A snapshot for backtracking *)
-val snapshot: unit -> snapshot
-        (* Make a snapshot for later backtracking. Costs nothing *)
-val backtrack: snapshot -> unit
-        (* Backtrack to a given snapshot. Only possible if you have
-           not already backtracked to a previous snapshot.
-           Calls [cleanup_abbrev] internally *)
-val undo_compress: snapshot -> unit
-        (* Backtrack only path compression. Only meaningful if you have
-           not already backtracked to a previous snapshot.
-           Does not call [cleanup_abbrev] *)
-
-(* Functions to use when modifying a type (only Ctype?) *)
-val link_type: type_expr -> type_expr -> unit
-        (* Set the desc field of [t1] to [Tlink t2], logging the old
-           value if there is an active snapshot *)
-val set_level: type_expr -> int -> unit
-val set_name:
-    (Path.t * type_expr list) option ref ->
-    (Path.t * type_expr list) option -> unit
-val set_row_field: row_field option ref -> row_field -> unit
-val set_univar: type_expr option ref -> type_expr -> unit
-val set_kind: field_kind option ref -> field_kind -> unit
-val set_commu: commutable ref -> commutable -> unit
-val set_typeset: TypeSet.t ref -> TypeSet.t -> unit
-        (* Set references, logging the old value *)
-val log_type: type_expr -> unit
-        (* Log the old value of a type, before modifying it by hand *)
-
-(**** Forward declarations ****)
-val print_raw: (Format.formatter -> type_expr -> unit) ref
-
-val iter_type_expr_kind: (type_expr -> unit) -> (type_kind -> unit)
-
-val iter_type_expr_cstr_args: (type_expr -> unit) ->
-  (constructor_arguments -> unit)
-val map_type_expr_cstr_args: (type_expr -> type_expr) ->
-  (constructor_arguments -> constructor_arguments)
diff --git a/jscomp/ml/builtin_attributes.ml b/jscomp/ml/builtin_attributes.ml
deleted file mode 100755
index f53edbf..0000000
--- a/jscomp/ml/builtin_attributes.ml
+++ /dev/null
@@ -1,207 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                         Alain Frisch, LexiFi                           *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Asttypes
-open Parsetree
-
-let string_of_cst = function
-  | Pconst_string(s, _) -> Some s
-  | _ -> None
-
-let string_of_payload = function
-  | PStr[{pstr_desc=Pstr_eval({pexp_desc=Pexp_constant c},_)}] ->
-      string_of_cst c
-  | _ -> None
-
-let string_of_opt_payload p =
-  match string_of_payload p with
-  | Some s -> s
-  | None -> ""
-
-let rec error_of_extension ext =
-  match ext with
-  | ({txt = ("ocaml.error"|"error") as txt; loc}, p) ->
-    let rec sub_from inner =
-      match inner with
-      | {pstr_desc=Pstr_extension (ext, _)} :: rest ->
-          error_of_extension ext :: sub_from rest
-      | _ :: rest ->
-          (Location.errorf ~loc
-             "Invalid syntax for sub-error of extension '%s'." txt) ::
-            sub_from rest
-      | [] -> []
-    in
-    begin match p with
-    | PStr [] -> raise Location.Already_displayed_error
-    | PStr({pstr_desc=Pstr_eval
-              ({pexp_desc=Pexp_constant(Pconst_string(msg,_))}, _)}::
-           {pstr_desc=Pstr_eval
-              ({pexp_desc=Pexp_constant(Pconst_string(if_highlight,_))}, _)}::
-           inner) ->
-        Location.error ~loc ~if_highlight ~sub:(sub_from inner) msg
-    | PStr({pstr_desc=Pstr_eval
-              ({pexp_desc=Pexp_constant(Pconst_string(msg,_))}, _)}::inner) ->
-        Location.error ~loc ~sub:(sub_from inner) msg
-    | _ -> Location.errorf ~loc "Invalid syntax for extension '%s'." txt
-    end
-  | ({txt; loc}, _) ->
-      Location.errorf ~loc "Uninterpreted extension '%s'." txt
-
-let cat s1 s2 =
-  if s2 = "" then s1 else
-    (* 2 spaces indentation for the next line *)
-    s1 ^ "\n  " ^ s2 
-
-let rec deprecated_of_attrs = function
-  | [] -> None
-  | ({txt = "ocaml.deprecated"|"deprecated"; _}, p) :: _ ->
-      Some (string_of_opt_payload p)
-  | _ :: tl -> deprecated_of_attrs tl
-
-let check_deprecated loc attrs s =
-  match deprecated_of_attrs attrs with
-  | None -> ()
-  | Some txt -> Location.deprecated loc (cat s txt)
-
-let check_deprecated_inclusion ~def ~use loc attrs1 attrs2 s =
-  match deprecated_of_attrs attrs1, deprecated_of_attrs attrs2 with
-  | None, _ | Some _, Some _ -> ()
-  | Some txt, None -> Location.deprecated ~def ~use loc (cat s txt)
-
-let rec deprecated_mutable_of_attrs = function
-  | [] -> None
-  | ({txt = "ocaml.deprecated_mutable"|"deprecated_mutable"; _}, p) :: _ ->
-      Some (string_of_opt_payload p)
-  | _ :: tl -> deprecated_mutable_of_attrs tl
-
-let check_deprecated_mutable loc attrs s =
-  match deprecated_mutable_of_attrs attrs with
-  | None -> ()
-  | Some txt ->
-      Location.deprecated loc (Printf.sprintf "mutating field %s" (cat s txt))
-
-let check_deprecated_mutable_inclusion ~def ~use loc attrs1 attrs2 s =
-  match deprecated_mutable_of_attrs attrs1,
-        deprecated_mutable_of_attrs attrs2
-  with
-  | None, _ | Some _, Some _ -> ()
-  | Some txt, None ->
-      Location.deprecated ~def ~use loc
-        (Printf.sprintf "mutating field %s" (cat s txt))
-
-let check_bs_attributes_inclusion = 
-  ref (fun _attrs1 _attrs2 _s -> 
-      None
-    )  
-
-let check_duplicated_labels : (_ -> _ option ) ref = ref (fun _lbls -> 
-  None
-)
-
-let rec deprecated_of_sig = function
-  | {psig_desc = Psig_attribute a} :: tl ->
-      begin match deprecated_of_attrs [a] with
-      | None -> deprecated_of_sig tl
-      | Some _ as r -> r
-      end
-  | _ -> None
-
-
-let rec deprecated_of_str = function
-  | {pstr_desc = Pstr_attribute a} :: tl ->
-      begin match deprecated_of_attrs [a] with
-      | None -> deprecated_of_str tl
-      | Some _ as r -> r
-      end
-  | _ -> None
-
-
-let warning_attribute ?(ppwarning = true) =
-  let process loc txt errflag payload =
-    match string_of_payload payload with
-    | Some s ->
-        begin try Warnings.parse_options errflag s
-        with Arg.Bad _ ->
-          Location.prerr_warning loc
-            (Warnings.Attribute_payload
-               (txt, "Ill-formed list of warnings"))
-        end
-    | None ->
-        Location.prerr_warning loc
-          (Warnings.Attribute_payload
-             (txt, "A single string literal is expected"))
-  in
-  function
-  | ({txt = ("ocaml.warning"|"warning") as txt; loc}, payload) ->
-      process loc txt false payload
-  | ({txt = ("ocaml.warnerror"|"warnerror") as txt; loc}, payload) ->
-      process loc txt true payload
-  | {txt="ocaml.ppwarning"|"ppwarning"},
-    PStr[{pstr_desc=Pstr_eval({pexp_desc=Pexp_constant
-                                   (Pconst_string (s, _))},_);
-          pstr_loc}] when ppwarning ->
-      Location.prerr_warning pstr_loc (Warnings.Preprocessor s)
-  | _ ->
-      ()
-
-let warning_scope ?ppwarning attrs f =
-  let prev = Warnings.backup () in
-  try
-    List.iter (warning_attribute ?ppwarning) (List.rev attrs);
-    let ret = f () in
-    Warnings.restore prev;
-    ret
-  with exn ->
-    Warnings.restore prev;
-    raise exn
-
-
-let warn_on_literal_pattern =
-  List.exists
-    (function
-      | ({txt="ocaml.warn_on_literal_pattern"|"warn_on_literal_pattern"; _}, _)
-        -> true
-      | _ -> false
-    )
-
-let explicit_arity =
-  List.exists
-    (function
-      | ({txt="ocaml.explicit_arity"|"explicit_arity"; _}, _) -> true
-      | _ -> false
-    )
-
-let immediate =
-  List.exists
-    (function
-      | ({txt="ocaml.immediate"|"immediate"; _}, _) -> true
-      | _ -> false
-    )
-
-(* The "ocaml.boxed (default)" and "ocaml.unboxed (default)"
-   attributes cannot be input by the user, they are added by the
-   compiler when applying the default setting. This is done to record
-   in the .cmi the default used by the compiler when compiling the
-   source file because the default can change between compiler
-   invocations. *)
-
-let check l (x, _) = List.mem x.txt l
-
-let has_unboxed attr =
-  List.exists (check ["ocaml.unboxed"; "unboxed"])
-    attr
-
-let has_boxed attr =
-  List.exists (check ["ocaml.boxed"; "boxed"]) attr
diff --git a/jscomp/ml/builtin_attributes.mli b/jscomp/ml/builtin_attributes.mli
deleted file mode 100755
index 7282dbb..0000000
--- a/jscomp/ml/builtin_attributes.mli
+++ /dev/null
@@ -1,84 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                         Alain Frisch, LexiFi                           *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Support for some of the builtin attributes:
-
-   ocaml.deprecated
-   ocaml.error
-   ocaml.ppwarning
-   ocaml.warning
-   ocaml.warnerror
-   ocaml.explicit_arity (for camlp4/camlp5)
-   ocaml.warn_on_literal_pattern
-   ocaml.deprecated_mutable
-   ocaml.immediate
-   ocaml.boxed / ocaml.unboxed
-*)
-
-
-val check_deprecated: Location.t -> Parsetree.attributes -> string -> unit
-val check_deprecated_inclusion:
-  def:Location.t -> use:Location.t -> Location.t -> Parsetree.attributes ->
-  Parsetree.attributes -> string -> unit
-val deprecated_of_attrs: Parsetree.attributes -> string option
-val deprecated_of_sig: Parsetree.signature -> string option
-val deprecated_of_str: Parsetree.structure -> string option
-
-val check_deprecated_mutable:
-    Location.t -> Parsetree.attributes -> string -> unit
-val check_deprecated_mutable_inclusion:
-  def:Location.t -> use:Location.t -> Location.t -> Parsetree.attributes ->
-  Parsetree.attributes -> string -> unit
-
-val check_bs_attributes_inclusion:
-  (Parsetree.attributes ->
-  Parsetree.attributes -> string -> (string*string) option ) ref
-
-val check_duplicated_labels: 
-  (Parsetree.label_declaration list ->
-    string Asttypes.loc option
-  ) ref    
-val error_of_extension: Parsetree.extension -> Location.error
-
-val warning_attribute: ?ppwarning:bool -> Parsetree.attribute -> unit
-  (** Apply warning settings from the specified attribute.
-      "ocaml.warning"/"ocaml.warnerror" (and variants without the prefix)
-      are processed and other attributes are ignored.
-
-      Also implement ocaml.ppwarning (unless ~ppwarning:false is
-      passed).
-  *)
-
-val warning_scope:
-  ?ppwarning:bool ->
-  Parsetree.attributes -> (unit -> 'a) -> 'a
-  (** Execute a function in a new scope for warning settings.  This
-      means that the effect of any call to [warning_attribute] during
-      the execution of this function will be discarded after
-      execution.
-
-      The function also takes a list of attributes which are processed
-      with [warning_attribute] in the fresh scope before the function
-      is executed.
-  *)
-
-val warn_on_literal_pattern: Parsetree.attributes -> bool
-val explicit_arity: Parsetree.attributes -> bool
-
-
-val immediate: Parsetree.attributes -> bool
-
-val has_unboxed: Parsetree.attributes -> bool
-val has_boxed: Parsetree.attributes -> bool
diff --git a/jscomp/ml/ccomp.ml b/jscomp/ml/ccomp.ml
deleted file mode 100644
index ae2fb79..0000000
--- a/jscomp/ml/ccomp.ml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-let command cmdline =
-  if !Clflags.verbose then begin
-    prerr_string "+ ";
-    prerr_string cmdline;
-    prerr_newline()
-  end;
-  Sys.command cmdline
-
diff --git a/jscomp/ml/ccomp.mli b/jscomp/ml/ccomp.mli
deleted file mode 100644
index 7ba8b4b..0000000
--- a/jscomp/ml/ccomp.mli
+++ /dev/null
@@ -1,2 +0,0 @@
-
-val command: string -> int
diff --git a/jscomp/ml/clflags.ml b/jscomp/ml/clflags.ml
deleted file mode 100644
index b2b2a78..0000000
--- a/jscomp/ml/clflags.ml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-let  output_name = ref (None : string option) (* -o *)
-and include_dirs = ref ([] : string list)(* -I *)
-and debug = ref false                   (* -g *)
-and fast = ref false                    (* -unsafe *)
-
-and nopervasives = ref false            (* -nopervasives *)
-and preprocessor = ref(None : string option) (* -pp *)
-and all_ppx = ref ([] : string list)        (* -ppx *)
-let annotations = ref false             (* -annot *)
-let binary_annotations = ref false      (* -annot *)
-and noassert = ref false                (* -noassert *)
-and verbose = ref false                 (* -verbose *)
-and open_modules = ref []               (* -open *)
-
-and real_paths = ref true               (* -short-paths *)
-and applicative_functors = ref true     (* -no-app-funct *)
-and error_size = ref 500                (* -error-size *)
-and transparent_modules = ref false     (* -trans-mod *)
-let dump_source = ref false             (* -dsource *)
-let dump_parsetree = ref false          (* -dparsetree *)
-and dump_typedtree = ref false          (* -dtypedtree *)
-and dump_rawlambda = ref false          (* -drawlambda *)
-and dump_lambda = ref false             (* -dlambda *)
-and only_parse = ref false              (* -only-parse *)
-and ignore_parse_errors = ref false     (* -ignore-parse-errors *)
-
-let dont_write_files = ref false        (* set to true under ocamldoc *)
-
-
-let reset_dump_state () = begin 
-  dump_source := false;
-  dump_parsetree := false;
-  dump_typedtree := false;
-  dump_rawlambda := false
-end
-
-
-
-
-let keep_docs = ref false              (* -keep-docs *)
-let keep_locs = ref true               (* -keep-locs *)
-
-
-
-
-let parse_color_setting = function
-  | "auto" -> Some Misc.Color.Auto
-  | "always" -> Some Misc.Color.Always
-  | "never" -> Some Misc.Color.Never
-  | _ -> None
-let color = ref None ;; (* -color *)
-
-let unboxed_types = ref false
-
-
-
-
-type mli_status =  Mli_exists | Mli_non_exists
-let assume_no_mli = ref Mli_non_exists
-let dont_record_crc_unit : string option ref = ref None
-let bs_gentype = ref false
-let no_assert_false = ref false
-let dump_location = ref true
diff --git a/jscomp/ml/cmi_format.ml b/jscomp/ml/cmi_format.ml
deleted file mode 100644
index ee95e82..0000000
--- a/jscomp/ml/cmi_format.ml
+++ /dev/null
@@ -1,144 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                   Fabrice Le Fessant, INRIA Saclay                     *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-type pers_flags =
-  | Deprecated of string
-
-
-
-type error =
-    Not_an_interface of string
-  | Wrong_version_interface of string * string
-  | Corrupted_interface of string
-
-exception Error of error
-
-type cmi_infos = {
-    cmi_name : string;
-    cmi_sign : Types.signature_item list;
-    cmi_crcs : (string * Digest.t option) list;
-    cmi_flags : pers_flags list;
-}
-
-let input_cmi ic =
-  let (name, sign) = input_value ic in
-  let crcs = input_value ic in
-  let flags = input_value ic in
-  {
-      cmi_name = name;
-      cmi_sign = sign;
-      cmi_crcs = crcs;
-      cmi_flags = flags;
-    }
-
-let read_cmi filename =
-  let ic = open_in_bin filename in
-  try
-    let buffer =
-      really_input_string ic (String.length Config.cmi_magic_number)
-    in
-    if buffer <> Config.cmi_magic_number then begin
-      close_in ic;
-      let pre_len = String.length Config.cmi_magic_number - 3 in
-      if String.sub buffer 0 pre_len
-          = String.sub Config.cmi_magic_number 0 pre_len then
-      begin
-        let msg =
-          if buffer < Config.cmi_magic_number then "an older" else "a newer" in
-        raise (Error (Wrong_version_interface (filename, msg)))
-      end else begin
-        raise(Error(Not_an_interface filename))
-      end
-    end;
-    let cmi = input_cmi ic in
-    close_in ic;
-    cmi
-  with End_of_file | Failure _ ->
-      close_in ic;
-      raise(Error(Corrupted_interface(filename)))
-    | Error e ->
-      close_in ic;
-      raise (Error e)
-
-let output_cmi filename oc cmi =
-(* beware: the provided signature must have been substituted for saving *)
-  output_string oc Config.cmi_magic_number;
-  output_value oc (cmi.cmi_name, cmi.cmi_sign);
-  flush oc;
-  let crc = Digest.file filename in
-  let crcs = (cmi.cmi_name, Some crc) :: cmi.cmi_crcs in
-  output_value oc crcs;
-  output_value oc cmi.cmi_flags;
-  crc
-
-
-(* This function is also called by [save_cmt] as cmi_format is subset of 
-       cmt_format, so dont close the channel yet
-*)
-let create_cmi ?check_exists filename (cmi : cmi_infos) =
-  (* beware: the provided signature must have been substituted for saving *)
-  let content = 
-    Config.cmi_magic_number ^ Marshal.to_string  (cmi.cmi_name, cmi.cmi_sign) []
-    (* checkout [output_value] in {!Pervasives} module *)
-  in 
-  let crc = Digest.string content in   
-  let cmi_infos = 
-    if check_exists <> None && Sys.file_exists filename then 
-      Some (read_cmi filename)
-    else None in   
-  match cmi_infos with 
-  | Some {cmi_name = _; cmi_sign = _; cmi_crcs = (old_name, Some old_crc)::rest ; cmi_flags} 
-    (* TODO: design the cmi format so that we don't need read the whole cmi *)
-    when 
-      cmi.cmi_name = old_name &&
-      crc = old_crc &&
-      cmi.cmi_crcs = rest &&
-      cmi_flags = cmi.cmi_flags -> 
-      crc 
-  | _ -> 
-      let crcs = (cmi.cmi_name, Some crc) :: cmi.cmi_crcs in
-      let oc = open_out_bin filename in 
-      output_string oc content;
-      output_value oc crcs;
-      output_value oc cmi.cmi_flags;
-      close_out oc; 
-      crc
-
-
-
-  
-(* Error report *)
-
-open Format
-
-let report_error ppf = function
-  | Not_an_interface filename ->
-      fprintf ppf "%a@ is not a compiled interface"
-        Location.print_filename filename
-  | Wrong_version_interface (filename, older_newer) ->
-      fprintf ppf
-        "%a@ is not a compiled interface for this version of OCaml.@.\
-         It seems to be for %s version of OCaml."
-        Location.print_filename filename older_newer
-  | Corrupted_interface filename ->
-      fprintf ppf "Corrupted compiled interface@ %a"
-        Location.print_filename filename
-
-let () =
-  Location.register_error_of_exn
-    (function
-      | Error err -> Some (Location.error_of_printer_file report_error err)
-      | _ -> None
-    )
diff --git a/jscomp/ml/code_frame.ml b/jscomp/ml/code_frame.ml
deleted file mode 100644
index dc53615..0000000
--- a/jscomp/ml/code_frame.ml
+++ /dev/null
@@ -1,258 +0,0 @@
-let digits_count n =
-  let rec loop n base count =
-    if n >= base then loop n (base * 10) (count + 1) else count
-  in
-  loop (abs n) 1 0
-
-let seek_2_lines_before src (pos : Lexing.position) =
-  let original_line = pos.pos_lnum in
-  let rec loop current_line current_char =
-    if current_line + 2 >= original_line then
-      (current_char, current_line)
-    else
-      loop
-        (if src.[current_char] = '\n' then current_line + 1 else current_line)
-        (current_char + 1)
-  in
-  loop 1 0
-
-let seek_2_lines_after src (pos : Lexing.position) =
-  let original_line = pos.pos_lnum in
-  let rec loop current_line current_char =
-    if current_char = String.length src then
-      (current_char, current_line)
-    else
-      match src.[current_char] with
-      | '\n' when current_line = original_line + 2 ->
-        (current_char, current_line)
-      | '\n' -> loop (current_line + 1) (current_char + 1)
-      | _ -> loop current_line (current_char + 1)
-  in
-  loop original_line pos.pos_cnum
-
-let leading_space_count str =
-  let rec loop i count =
-    if i = String.length str then count
-    else if str.[i] != ' ' then count
-    else loop (i + 1) (count + 1)
-  in
-  loop 0 0
-
-let break_long_line max_width line =
-  let rec loop pos accum =
-    if pos = String.length line then accum
-    else
-      let chunk_length = min max_width (String.length line - pos) in
-      let chunk = String.sub line pos chunk_length in
-      loop (pos + chunk_length) (chunk::accum)
-  in
-  loop 0 [] |> List.rev
-
-let filter_mapi f l =
-  let rec loop f l i accum =
-    match l with
-    | [] -> accum
-    | head::rest ->
-      let accum =
-        match f i head with
-        | None -> accum
-        | Some result -> result::accum
-      in
-      loop f rest (i + 1) accum
-  in
-  loop f l 0 [] |> List.rev
-
-(* Spiritual equivalent of
-  https://github.com/ocaml/ocaml/blob/414bdec9ae387129b8102cc6bf3c0b6ae173eeb9/utils/misc.ml#L601
-*)
-module Color = struct
-  type color =
-    | Dim
-    (* | Filename *)
-    | Err
-    | Warn
-    | NoColor
-
-  let dim = "\x1b[2m"
-  (* let filename = "\x1b[46m" *)
-  let err = "\x1b[1;31m"
-  let warn = "\x1b[1;33m"
-  let reset = "\x1b[0m"
-
-  external isatty : out_channel -> bool = "caml_sys_isatty"
-  (* reasonable heuristic on whether colors should be enabled *)
-  let should_enable_color () =
-    let term = try Sys.getenv "TERM" with Not_found -> "" in
-    term <> "dumb"
-    && term <> ""
-    && isatty stderr
-
-  let color_enabled = ref true
-
-  let setup =
-    let first = ref true in (* initialize only once *)
-    fun o ->
-      if !first then (
-        first := false;
-        color_enabled := (match o with
-            | Some Misc.Color.Always -> true
-            | Some Auto -> should_enable_color ()
-            | Some Never -> false
-            | None -> should_enable_color ())
-      );
-      ()
-end
-
-let setup = Color.setup
-
-type gutter = Number of int | Elided
-type highlighted_string = {s: string; start: int; end_: int}
-type line = {
-  gutter: gutter;
-  content: highlighted_string list;
-}
-(*
-  Features:
-  - display a line gutter
-  - break long line into multiple for terminal display
-  - peek 2 lines before & after for context
-  - center snippet when it's heavily indented
-  - ellide intermediate lines when the reported range is huge
-*)
-let print ~is_warning ~src ~(startPos : Lexing.position) ~(endPos:Lexing.position) =
-  let indent = 2 in
-  let highlight_line_start_line = startPos.pos_lnum in
-  let highlight_line_end_line = endPos.pos_lnum in
-  let (start_line_line_offset, first_shown_line) = seek_2_lines_before src startPos in
-  let (end_line_line_end_offset, last_shown_line) = seek_2_lines_after src endPos in
-
-  let more_than_5_highlighted_lines =
-    highlight_line_end_line - highlight_line_start_line + 1 > 5
-  in
-  let max_line_digits_count = digits_count last_shown_line in
-  (* TODO: change this back to a fixed 100? *)
-  (* 3 for separator + the 2 spaces around it *)
-  let line_width = 78 - max_line_digits_count - indent - 3 in
-  let lines =
-    String.sub src start_line_line_offset (end_line_line_end_offset - start_line_line_offset)
-    |> String.split_on_char '\n'
-    |> filter_mapi (fun i line ->
-      let line_number = i + first_shown_line in
-      if more_than_5_highlighted_lines then
-        if line_number = highlight_line_start_line + 2 then
-          Some (Elided, line)
-        else if line_number > highlight_line_start_line + 2 && line_number < highlight_line_end_line - 1 then None
-        else Some (Number line_number, line)
-      else Some (Number line_number, line)
-    )
-  in
-  let leading_space_to_cut = lines |> List.fold_left (fun current_max (_, line) ->
-    let leading_spaces = leading_space_count line in
-    if String.length line = leading_spaces then
-      (* the line's nothing but spaces. Doesn't count *)
-      current_max
-    else
-      min leading_spaces current_max
-  ) 99999
-  in
-  let separator = if leading_space_to_cut = 0 then "│" else "┆" in
-  let stripped_lines = lines |> List.map (fun (gutter, line) ->
-    let new_content =
-      if String.length line <= leading_space_to_cut then
-        [{s = ""; start = 0; end_ = 0}]
-      else
-        String.sub line leading_space_to_cut (String.length line - leading_space_to_cut)
-        |> break_long_line line_width
-        |> List.mapi (fun i line ->
-          match gutter with
-          | Elided -> {s = line; start = 0; end_ = 0}
-          | Number line_number ->
-            let highlight_line_start_offset = startPos.pos_cnum - startPos.pos_bol in
-            let highlight_line_end_offset = endPos.pos_cnum - endPos.pos_bol in
-            let start =
-              if i = 0 && line_number = highlight_line_start_line then
-                highlight_line_start_offset - leading_space_to_cut
-              else 0
-            in
-            let end_ =
-              if line_number < highlight_line_start_line then 0
-              else if line_number = highlight_line_start_line && line_number = highlight_line_end_line then
-                highlight_line_end_offset - leading_space_to_cut
-              else if line_number = highlight_line_start_line then
-                String.length line
-              else if line_number > highlight_line_start_line && line_number < highlight_line_end_line then
-                String.length line
-              else if line_number = highlight_line_end_line then highlight_line_end_offset - leading_space_to_cut
-              else 0
-            in
-            {s = line; start; end_}
-        )
-    in
-    {gutter; content = new_content}
-  )
-  in
-  let buf = Buffer.create 100 in
-  let open Color in
-  let add_ch =
-    let last_color = ref NoColor in
-    fun color ch ->
-      if not !Color.color_enabled || !last_color = color then
-        Buffer.add_char buf ch
-      else begin
-        let ansi = match !last_color, color with
-        | NoColor, Dim -> dim
-        (* | NoColor, Filename -> filename *)
-        | NoColor, Err -> err
-        | NoColor, Warn -> warn
-        | _, NoColor -> reset
-        | _, Dim -> reset ^ dim
-        (* | _, Filename -> reset ^ filename *)
-        | _, Err -> reset ^ err
-        | _, Warn -> reset ^ warn
-        in
-        Buffer.add_string buf ansi;
-        Buffer.add_char buf ch;
-        last_color := color;
-      end
-  in
-  let draw_gutter color s =
-    for _i = 1 to (max_line_digits_count + indent - String.length s) do
-      add_ch NoColor ' '
-    done;
-    s |> String.iter (add_ch color);
-    add_ch NoColor ' ';
-    separator |> String.iter (add_ch Dim);
-    add_ch NoColor ' ';
-  in
-  stripped_lines |> List.iter (fun {gutter; content} ->
-    match gutter with
-    | Elided ->
-      draw_gutter Dim ".";
-      add_ch Dim '.';
-      add_ch Dim '.';
-      add_ch Dim '.';
-      add_ch NoColor '\n';
-    | Number line_number -> begin
-      content |> List.iteri (fun i line ->
-        let gutter_content = if i = 0 then string_of_int line_number else "" in
-        let gutter_color =
-          if i = 0
-            && line_number >= highlight_line_start_line
-            && line_number <= highlight_line_end_line then
-            if is_warning then Warn else Err
-          else NoColor
-        in
-        draw_gutter gutter_color gutter_content;
-
-        line.s |> String.iteri (fun ii ch ->
-          let c =
-            if ii >= line.start && ii < line.end_ then
-              if is_warning then Warn else Err
-            else NoColor in
-          add_ch c ch;
-        );
-        add_ch NoColor '\n';
-      );
-    end
-  );
-  Buffer.contents buf
diff --git a/jscomp/ml/consistbl.ml b/jscomp/ml/consistbl.ml
deleted file mode 100644
index dbba5d1..0000000
--- a/jscomp/ml/consistbl.ml
+++ /dev/null
@@ -1,66 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 2002 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Consistency tables: for checking consistency of module CRCs *)
-
-type t = (string, Digest.t * string) Hashtbl.t
-
-let create () = Hashtbl.create 13
-
-let clear = Hashtbl.clear
-
-exception Inconsistency of string * string * string
-
-exception Not_available of string
-
-let check tbl name crc source =
-  try
-    let (old_crc, old_source) = Hashtbl.find tbl name in
-    if crc <> old_crc then raise(Inconsistency(name, source, old_source))
-  with Not_found ->
-    Hashtbl.add tbl name (crc, source)
-
-let check_noadd tbl name crc source =
-  try
-    let (old_crc, old_source) = Hashtbl.find tbl name in
-    if crc <> old_crc then raise(Inconsistency(name, source, old_source))
-  with Not_found ->
-    raise (Not_available name)
-
-let set tbl name crc source = Hashtbl.add tbl name (crc, source)
-
-let source tbl name = snd (Hashtbl.find tbl name)
-
-let extract l tbl =
-  let l = List.sort_uniq String.compare l in
-  List.fold_left
-    (fun assc name ->
-       try
-         let (crc, _) = Hashtbl.find tbl name in
-           (name, Some crc) :: assc
-       with Not_found ->
-         (name, None) :: assc)
-    [] l
-
-let filter p tbl =
-  let to_remove = ref [] in
-  Hashtbl.iter
-    (fun name _ ->
-      if not (p name) then to_remove := name :: !to_remove)
-    tbl;
-  List.iter
-    (fun name ->
-       while Hashtbl.mem tbl name do Hashtbl.remove tbl name done)
-    !to_remove
diff --git a/jscomp/ml/consistbl.mli b/jscomp/ml/consistbl.mli
deleted file mode 100644
index c532bdd..0000000
--- a/jscomp/ml/consistbl.mli
+++ /dev/null
@@ -1,62 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 2002 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Consistency tables: for checking consistency of module CRCs *)
-
-type t
-
-val create: unit -> t
-
-val clear: t -> unit
-
-val check: t -> string -> Digest.t -> string -> unit
-      (* [check tbl name crc source]
-           checks consistency of ([name], [crc]) with infos previously
-           stored in [tbl].  If no CRC was previously associated with
-           [name], record ([name], [crc]) in [tbl].
-           [source] is the name of the file from which the information
-           comes from.  This is used for error reporting. *)
-
-val check_noadd: t -> string -> Digest.t -> string -> unit
-      (* Same as [check], but raise [Not_available] if no CRC was previously
-           associated with [name]. *)
-
-val set: t -> string -> Digest.t -> string -> unit
-      (* [set tbl name crc source] forcefully associates [name] with
-         [crc] in [tbl], even if [name] already had a different CRC
-         associated with [name] in [tbl]. *)
-
-val source: t -> string -> string
-      (* [source tbl name] returns the file name associated with [name]
-         if the latter has an associated CRC in [tbl].
-         Raise [Not_found] otherwise. *)
-
-val extract: string list -> t -> (string * Digest.t option) list
-      (* [extract tbl names] returns an associative list mapping each string
-         in [names] to the CRC associated with it in [tbl]. If no CRC is
-         associated with a name then it is mapped to [None]. *)
-
-val filter: (string -> bool) -> t -> unit
-      (* [filter pred tbl] removes from [tbl] table all (name, CRC) pairs
-         such that [pred name] is [false]. *)
-
-exception Inconsistency of string * string * string
-      (* Raised by [check] when a CRC mismatch is detected.
-         First string is the name of the compilation unit.
-         Second string is the source that caused the inconsistency.
-         Third string is the source that set the CRC. *)
-
-exception Not_available of string
-      (* Raised by [check_noadd] when a name doesn't have an associated CRC. *)
diff --git a/jscomp/ml/ctype.ml b/jscomp/ml/ctype.ml
deleted file mode 100644
index 901a0db..0000000
--- a/jscomp/ml/ctype.ml
+++ /dev/null
@@ -1,4651 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*  Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt  *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Operations on core types *)
-
-open Misc
-open Asttypes
-open Types
-open Btype
-
-(*
-   Type manipulation after type inference
-   ======================================
-   If one wants to manipulate a type after type inference (for
-   instance, during code generation or in the debugger), one must
-   first make sure that the type levels are correct, using the
-   function [correct_levels]. Then, this type can be correctly
-   manipulated by [apply], [expand_head] and [moregeneral].
-*)
-
-(*
-   General notes
-   =============
-   - As much sharing as possible should be kept : it makes types
-     smaller and better abbreviated.
-     When necessary, some sharing can be lost. Types will still be
-     printed correctly (+++ TO DO...), and abbreviations defined by a
-     class do not depend on sharing thanks to constrained
-     abbreviations. (Of course, even if some sharing is lost, typing
-     will still be correct.)
-   - All nodes of a type have a level : that way, one know whether a
-     node need to be duplicated or not when instantiating a type.
-   - Levels of a type are decreasing (generic level being considered
-     as greatest).
-   - The level of a type constructor is superior to the binding
-     time of its path.
-   - Recursive types without limitation should be handled (even if
-     there is still an occur check). This avoid treating specially the
-     case for objects, for instance. Furthermore, the occur check
-     policy can then be easily changed.
-*)
-
-(**** Errors ****)
-
-exception Unify of (type_expr * type_expr) list
-
-exception Tags of label * label
-
-let () =
-  Location.register_error_of_exn
-    (function
-      | Tags (l, l') ->
-          Some
-            Location.
-              (errorf ~loc:(in_file !input_name)
-                 "In this program,@ variant constructors@ #%s and #%s@ \
-                  have the same hash value.@ Change one of them." l l'
-              )
-      | _ -> None
-    )
-
-exception Subtype of
-        (type_expr * type_expr) list * (type_expr * type_expr) list
-
-exception Cannot_expand
-
-exception Cannot_apply
-
-exception Recursive_abbrev
-
-(* GADT: recursive abbrevs can appear as a result of local constraints *)
-exception Unification_recursive_abbrev of (type_expr * type_expr) list
-
-(**** Type level management ****)
-
-let current_level = ref 0
-let nongen_level = ref 0
-let global_level = ref 1
-let saved_level = ref []
-
-type levels =
-    { current_level: int; nongen_level: int; global_level: int;
-      saved_level: (int * int) list; }
-let save_levels () =
-  { current_level = !current_level;
-    nongen_level = !nongen_level;
-    global_level = !global_level;
-    saved_level = !saved_level }
-let set_levels l =
-  current_level := l.current_level;
-  nongen_level := l.nongen_level;
-  global_level := l.global_level;
-  saved_level := l.saved_level
-
-let get_current_level () = !current_level
-let init_def level = current_level := level; nongen_level := level
-let begin_def () =
-  saved_level := (!current_level, !nongen_level) :: !saved_level;
-  incr current_level; nongen_level := !current_level
-let begin_class_def () =
-  saved_level := (!current_level, !nongen_level) :: !saved_level;
-  incr current_level
-let raise_nongen_level () =
-  saved_level := (!current_level, !nongen_level) :: !saved_level;
-  nongen_level := !current_level
-let end_def () =
-  let (cl, nl) = List.hd !saved_level in
-  saved_level := List.tl !saved_level;
-  current_level := cl; nongen_level := nl
-
-let reset_global_level () =
-  global_level := !current_level + 1
-let increase_global_level () =
-  let gl = !global_level in
-  global_level := !current_level;
-  gl
-let restore_global_level gl =
-  global_level := gl
-
-(**** Whether a path points to an object type (with hidden row variable) ****)
-let is_object_type path =
-  let name =
-    match path with Path.Pident id -> Ident.name id
-    | Path.Pdot(_, s,_) -> s
-    | Path.Papply _ -> assert false
-  in name.[0] = '#'
-
-(**** Control tracing of GADT instances *)
-
-let trace_gadt_instances = ref false
-let check_trace_gadt_instances env =
-  not !trace_gadt_instances && Env.has_local_constraints env &&
-  (trace_gadt_instances := true; cleanup_abbrev (); true)
-
-let reset_trace_gadt_instances b =
-  if b then trace_gadt_instances := false
-
-let wrap_trace_gadt_instances env f x =
-  let b = check_trace_gadt_instances env in
-  let y = f x in
-  reset_trace_gadt_instances b;
-  y
-
-(**** Abbreviations without parameters ****)
-(* Shall reset after generalizing *)
-
-let simple_abbrevs = ref Mnil
-
-let proper_abbrevs path tl abbrev =
-  if tl <> [] || !trace_gadt_instances ||
-     is_object_type path
-  then abbrev
-  else simple_abbrevs
-
-(**** Some type creators ****)
-
-(* Re-export generic type creators *)
-
-let newty2             = Btype.newty2
-let newty desc         = newty2 !current_level desc
-
-let newvar ?name ()         = newty2 !current_level (Tvar name)
-let newvar2 ?name level     = newty2 level (Tvar name)
-let new_global_var ?name () = newty2 !global_level (Tvar name)
-
-let newobj fields      = newty (Tobject (fields, ref None))
-
-let newconstr path tyl = newty (Tconstr (path, tyl, ref Mnil))
-
-let none = newty (Ttuple [])                (* Clearly ill-formed type *)
-
-(**** Representative of a type ****)
-
-(* Re-export repr *)
-let repr = repr
-
-(**** Type maps ****)
-
-module TypePairs =
-  Hashtbl.Make (struct
-    type t = type_expr * type_expr
-    let equal (t1, t1') (t2, t2') = (t1 == t2) && (t1' == t2')
-    let hash (t, t') = t.id + 93 * t'.id
- end)
-
-
-(**** unification mode ****)
-
-type unification_mode =
-  | Expression (* unification in expression *)
-  | Pattern (* unification in pattern which may add local constraints *)
-
-let umode = ref Expression
-let generate_equations = ref false
-let assume_injective = ref false
-let variant_is_subtype = ref (fun _env _row _p1 -> false)
-let set_mode_pattern ~generate ~injective f =
-  let old_unification_mode = !umode
-  and old_gen = !generate_equations
-  and old_inj = !assume_injective in
-  try
-    umode := Pattern;
-    generate_equations := generate;
-    assume_injective := injective;
-    let ret = f () in
-    umode := old_unification_mode;
-    generate_equations := old_gen;
-    assume_injective := old_inj;
-    ret
-  with e ->
-    umode := old_unification_mode;
-    generate_equations := old_gen;
-    assume_injective := old_inj;
-    raise e
-
-(*** Checks for type definitions ***)
-
-let in_current_module = function
-  | Path.Pident _ -> true
-  | Path.Pdot _ | Path.Papply _ -> false
-
-let in_pervasives p =
-  in_current_module p &&
-  try ignore (Env.find_type p Env.initial_safe_string); true
-  with Not_found -> false
-
-let is_datatype decl=
-  match decl.type_kind with
-    Type_record _ | Type_variant _ | Type_open -> true
-  | Type_abstract -> false
-
-
-                  (**********************************************)
-                  (*  Miscellaneous operations on object types  *)
-                  (**********************************************)
-
-(* Note:
-   We need to maintain some invariants:
-   * cty_self must be a Tobject
-   * ...
-*)
-type fields = (string * Types.field_kind * Types.type_expr) list      
-(**** Object field manipulation. ****)
-
-let object_fields ty =
-  match (repr ty).desc with
-    Tobject (fields, _) -> fields
-  | _                   -> assert false
-
-let flatten_fields (ty : Types.type_expr) : fields * _ =
-  let rec flatten (l : fields) ty =
-    let ty = repr ty in
-    match ty.desc with
-      Tfield(s, k, ty1, ty2) ->
-        flatten ((s, k, ty1)::l) ty2
-    | _ ->
-        (l, ty)
-  in
-    let (l, r) = flatten [] ty in
-    (List.sort (fun (n, _, _) (n', _, _) -> compare n n') l, r)
-
-let build_fields level =
-  List.fold_right
-    (fun (s, k, ty1) ty2 -> newty2 level (Tfield(s, k, ty1, ty2)))
-
-
-let associate_fields 
-  (fields1 : fields ) 
-  (fields2 : fields ) : _ * fields * fields =
-  let rec associate p s s'  : fields * fields -> _ =
-    function
-      (l, []) ->
-        (List.rev p, (List.rev s) @ l, List.rev s')
-    | ([], l') ->
-        (List.rev p, List.rev s, (List.rev s') @ l')
-    | ((n, k, t)::r, (n', k', t')::r') when n = n' ->
-        associate ((n, k, t, k', t')::p) s s' (r, r')
-    | ((n, k, t)::r, ((n', _k', _t')::_ as l')) when n < n' ->
-        associate p ((n, k, t)::s) s' (r, l')
-    | (((_n, _k, _t)::_ as l), (n', k', t')::r') (* when n > n' *) ->
-        associate p s ((n', k', t')::s') (l, r')
-  in
-  associate [] [] [] (fields1, fields2)
-
-(**** Check whether an object is open ****)
-
-(* +++ The abbreviation should eventually be expanded *)
-let rec object_row ty =
-  let ty = repr ty in
-  match ty.desc with
-    Tobject (t, _)     -> object_row t
-  | Tfield(_, _, _, t) -> object_row t
-  | _ -> ty
-
-let opened_object ty =
-  match (object_row ty).desc with
-  | Tvar _  | Tunivar _ | Tconstr _ -> true
-  | _                               -> false
-
-let concrete_object ty =
-  match (object_row ty).desc with
-  | Tvar _             -> false
-  | _                  -> true
-
-(**** Close an object ****)
-
-let close_object ty =
-  let rec close ty =
-    let ty = repr ty in
-    match ty.desc with
-      Tvar _ ->
-        link_type ty (newty2 ty.level Tnil)
-    | Tfield(_, _, _, ty') -> close ty'
-    | _                    -> assert false
-  in
-  match (repr ty).desc with
-    Tobject (ty, _)   -> close ty
-  | _                 -> assert false
-
-(**** Row variable of an object type ****)
-
-let row_variable ty =
-  let rec find ty =
-    let ty = repr ty in
-    match ty.desc with
-      Tfield (_, _, _, ty) -> find ty
-    | Tvar _               -> ty
-    | _                    -> assert false
-  in
-  match (repr ty).desc with
-    Tobject (fi, _) -> find fi
-  | _               -> assert false
-
-(**** Object name manipulation ****)
-(* +++ Bientot obsolete *)
-
-let set_object_name id rv params ty =
-  match (repr ty).desc with
-    Tobject (_fi, nm) ->
-      set_name nm (Some (Path.Pident id, rv::params))
-  | _ ->
-      assert false
-
-let remove_object_name ty =
-  match (repr ty).desc with
-    Tobject (_, nm)   -> set_name nm None
-  | Tconstr (_, _, _) -> ()
-  | _                 -> fatal_error "Ctype.remove_object_name"
-
-(**** Hiding of private methods ****)
-
-let hide_private_methods ty =
-  match (repr ty).desc with
-    Tobject (fi, nm) ->
-      nm := None;
-      let (fl, _) = flatten_fields fi in
-      List.iter
-        (function (_, k, _) ->
-          match field_kind_repr k with
-            Fvar r -> set_kind r Fabsent
-          | _      -> ())
-        fl
-  | _ ->
-      assert false
-
-
-                              (*******************************)
-                              (*  Operations on class types  *)
-                              (*******************************)
-
-
-let rec signature_of_class_type =
-  function
-    Cty_constr (_, _, cty) -> signature_of_class_type cty
-  | Cty_signature sign     -> sign
-  | Cty_arrow (_, _, cty)   -> signature_of_class_type cty
-
-let self_type cty =
-  repr (signature_of_class_type cty).csig_self
-
-let rec class_type_arity =
-  function
-    Cty_constr (_, _, cty) ->  class_type_arity cty
-  | Cty_signature _        ->  0
-  | Cty_arrow (_, _, cty)    ->  1 + class_type_arity cty
-
-
-                  (*******************************************)
-                  (*  Miscellaneous operations on row types  *)
-                  (*******************************************)
-type row_fields = (Asttypes.label * Types.row_field) list
-type row_pairs = (Asttypes.label * Types.row_field * Types.row_field) list
-let sort_row_fields : row_fields -> row_fields = List.sort (fun (p,_) (q,_) -> compare (p : string) q)
-
-let rec merge_rf (r1 : row_fields) (r2 : row_fields) (pairs : row_pairs) (fi1 : row_fields) (fi2 : row_fields) =
-  match fi1, fi2 with
-    (l1,f1 as p1)::fi1', (l2,f2 as p2)::fi2' ->
-      if l1 = l2 then merge_rf r1 r2 ((l1,f1,f2)::pairs) fi1' fi2' else
-      if l1 < l2 then merge_rf (p1::r1) r2 pairs fi1' fi2 else
-      merge_rf r1 (p2::r2) pairs fi1 fi2'
-  | [], _ -> (List.rev r1, List.rev_append r2 fi2, pairs)
-  | _, [] -> (List.rev_append r1 fi1, List.rev r2, pairs)
-
-let merge_row_fields (fi1 : row_fields) (fi2 : row_fields) : row_fields * row_fields * row_pairs =
-  match fi1, fi2 with
-    [], _ | _, [] -> (fi1, fi2, [])
-  | [p1], _ when not (List.mem_assoc (fst p1) fi2) -> (fi1, fi2, [])
-  | _, [p2] when not (List.mem_assoc (fst p2) fi1) -> (fi1, fi2, [])
-  | _ -> merge_rf [] [] [] (sort_row_fields fi1) (sort_row_fields fi2)
-
-let rec filter_row_fields erase = function
-    [] -> []
-  | (_l,f as p)::fi ->
-      let fi = filter_row_fields erase fi in
-      match row_field_repr f with
-        Rabsent -> fi
-      | Reither(_,_,false,e) when erase -> set_row_field e Rabsent; fi
-      | _ -> p :: fi
-
-                    (**************************************)
-                    (*  Check genericity of type schemes  *)
-                    (**************************************)
-
-
-exception Non_closed of type_expr * bool
-
-let free_variables = ref []
-let really_closed = ref None
-
-let rec free_vars_rec real ty =
-  let ty = repr ty in
-  if ty.level >= lowest_level then begin
-    ty.level <- pivot_level - ty.level;
-    begin match ty.desc, !really_closed with
-      Tvar _, _ ->
-        free_variables := (ty, real) :: !free_variables
-    | Tconstr (path, tl, _), Some env ->
-        begin try
-          let (_, body, _) = Env.find_type_expansion path env in
-          if (repr body).level <> generic_level then
-            free_variables := (ty, real) :: !free_variables
-        with Not_found -> ()
-        end;
-        List.iter (free_vars_rec true) tl
-(* Do not count "virtual" free variables
-    | Tobject(ty, {contents = Some (_, p)}) ->
-        free_vars_rec false ty; List.iter (free_vars_rec true) p
-*)
-    | Tobject (ty, _), _ ->
-        free_vars_rec false ty
-    | Tfield (_, _, ty1, ty2), _ ->
-        free_vars_rec true ty1; free_vars_rec false ty2
-    | Tvariant row, _ ->
-        let row = row_repr row in
-        iter_row (free_vars_rec true) row;
-        if not (static_row row) then free_vars_rec false row.row_more
-    | _    ->
-        iter_type_expr (free_vars_rec true) ty
-    end;
-  end
-
-let free_vars ?env ty =
-  free_variables := [];
-  really_closed := env;
-  free_vars_rec true ty;
-  let res = !free_variables in
-  free_variables := [];
-  really_closed := None;
-  res
-
-let free_variables ?env ty =
-  let tl = List.map fst (free_vars ?env ty) in
-  unmark_type ty;
-  tl
-
-let closed_type ty =
-  match free_vars ty with
-      []           -> ()
-  | (v, real) :: _ -> raise (Non_closed (v, real))
-
-let closed_parameterized_type params ty =
-  List.iter mark_type params;
-  let ok =
-    try closed_type ty; true with Non_closed _ -> false in
-  List.iter unmark_type params;
-  unmark_type ty;
-  ok
-
-let closed_type_decl decl =
-  try
-    List.iter mark_type decl.type_params;
-    begin match decl.type_kind with
-      Type_abstract ->
-        ()
-    | Type_variant v ->
-        List.iter
-          (fun {cd_args; cd_res; _} ->
-            match cd_res with
-            | Some _ -> ()
-            | None ->
-                match cd_args with
-                | Cstr_tuple l ->  List.iter closed_type l
-                | Cstr_record l -> List.iter (fun l -> closed_type l.ld_type) l
-          )
-          v
-    | Type_record(r, _rep) ->
-        List.iter (fun l -> closed_type l.ld_type) r
-    | Type_open -> ()
-    end;
-    begin match decl.type_manifest with
-      None    -> ()
-    | Some ty -> closed_type ty
-    end;
-    unmark_type_decl decl;
-    None
-  with Non_closed (ty, _) ->
-    unmark_type_decl decl;
-    Some ty
-
-let closed_extension_constructor ext =
-  try
-    List.iter mark_type ext.ext_type_params;
-    begin match ext.ext_ret_type with
-    | Some _ -> ()
-    | None -> iter_type_expr_cstr_args closed_type ext.ext_args
-    end;
-    unmark_extension_constructor ext;
-    None
-  with Non_closed (ty, _) ->
-    unmark_extension_constructor ext;
-    Some ty
-
-type closed_class_failure =
-    CC_Method of type_expr * bool * string * type_expr
-  | CC_Value of type_expr * bool * string * type_expr
-
-exception CCFailure of closed_class_failure
-
-let closed_class params sign =
-  let ty = object_fields (repr sign.csig_self) in
-  let (fields, rest) = flatten_fields ty in
-  List.iter mark_type params;
-  mark_type rest;
-  List.iter
-    (fun (lab, _, ty) -> if lab = dummy_method then mark_type ty)
-    fields;
-  try
-    mark_type_node (repr sign.csig_self);
-    List.iter
-      (fun (lab, kind, ty) ->
-        if field_kind_repr kind = Fpresent then
-        try closed_type ty with Non_closed (ty0, real) ->
-          raise (CCFailure (CC_Method (ty0, real, lab, ty))))
-      fields;
-    mark_type_params (repr sign.csig_self);
-    List.iter unmark_type params;
-    unmark_class_signature sign;
-    None
-  with CCFailure reason ->
-    mark_type_params (repr sign.csig_self);
-    List.iter unmark_type params;
-    unmark_class_signature sign;
-    Some reason
-
-
-                            (**********************)
-                            (*  Type duplication  *)
-                            (**********************)
-
-
-(* Duplicate a type, preserving only type variables *)
-let duplicate_type ty =
-  Subst.type_expr Subst.identity ty
-
-(* Same, for class types *)
-let duplicate_class_type ty =
-  Subst.class_type Subst.identity ty
-
-
-                         (*****************************)
-                         (*  Type level manipulation  *)
-                         (*****************************)
-
-(*
-   It would be a bit more efficient to remove abbreviation expansions
-   rather than generalizing them: these expansions will usually not be
-   used anymore. However, this is not possible in the general case, as
-   [expand_abbrev] (via [subst]) requires these expansions to be
-   preserved. Does it worth duplicating this code ?
-*)
-let rec generalize ty =
-  let ty = repr ty in
-  if (ty.level > !current_level) && (ty.level <> generic_level) then begin
-    set_level ty generic_level;
-    begin match ty.desc with
-      Tconstr (_, _, abbrev) ->
-        iter_abbrev generalize !abbrev
-    | _ -> ()
-    end;
-    iter_type_expr generalize ty
-  end
-
-let generalize ty =
-  simple_abbrevs := Mnil;
-  generalize ty
-
-(* Generalize the structure and lower the variables *)
-
-let rec generalize_structure var_level ty =
-  let ty = repr ty in
-  if ty.level <> generic_level then begin
-    if is_Tvar ty && ty.level > var_level then
-      set_level ty var_level
-    else if
-      ty.level > !current_level &&
-      match ty.desc with
-        Tconstr (p, _, abbrev) ->
-          not (is_object_type p) && (abbrev := Mnil; true)
-      | _ -> true
-    then begin
-      set_level ty generic_level;
-      iter_type_expr (generalize_structure var_level) ty
-    end
-  end
-
-let generalize_structure var_level ty =
-  simple_abbrevs := Mnil;
-  generalize_structure var_level ty
-
-
-let forward_try_expand_once = (* Forward declaration *)
-  ref (fun _env _ty -> raise Cannot_expand)
-
-(*
-   Lower the levels of a type (assume [level] is not
-   [generic_level]).
-*)
-(*
-    The level of a type constructor must be greater than its binding
-    time. That way, a type constructor cannot escape the scope of its
-    definition, as would be the case in
-      let x = ref []
-      module M = struct type t let _ = (x : t list ref) end
-    (without this constraint, the type system would actually be unsound.)
-*)
-let get_level env p =
-  try
-    match (Env.find_type p env).type_newtype_level with
-      | None -> Path.binding_time p
-      | Some (x, _) -> x
-  with
-    | Not_found ->
-      (* no newtypes in predef *)
-      Path.binding_time p
-
-let rec normalize_package_path env p =
-  let t =
-    try (Env.find_modtype p env).mtd_type
-    with Not_found -> None
-  in
-  match t with
-  | Some (Mty_ident p) -> normalize_package_path env p
-  | Some (Mty_signature _ | Mty_functor _ | Mty_alias _) | None ->
-      match p with
-        Path.Pdot (p1, s, n) ->
-          (* For module aliases *)
-          let p1' = Env.normalize_path None env p1 in
-          if Path.same p1 p1' then p else
-          normalize_package_path env (Path.Pdot (p1', s, n))
-      | _ -> p
-
-let rec update_level env level expand ty =
-  let ty = repr ty in
-  if ty.level > level then begin
-    begin match Env.gadt_instance_level env ty with
-      Some lv -> if level < lv then raise (Unify [(ty, newvar2 level)])
-    | None -> ()
-    end;
-    match ty.desc with
-      Tconstr(p, _tl, _abbrev) when level < get_level env p ->
-        (* Try first to replace an abbreviation by its expansion. *)
-        begin try
-          (* if is_newtype env p then raise Cannot_expand; *)
-          link_type ty (!forward_try_expand_once env ty);
-          update_level env level expand ty
-        with Cannot_expand ->
-          (* +++ Levels should be restored... *)
-          (* Format.printf "update_level: %i < %i@." level (get_level env p); *)
-          if level < get_level env p then raise (Unify [(ty, newvar2 level)]);
-          iter_type_expr (update_level env level expand) ty
-        end
-    | Tconstr(_, _ :: _, _) when expand ->
-        begin try
-          link_type ty (!forward_try_expand_once env ty);
-          update_level env level expand ty
-        with Cannot_expand ->
-          set_level ty level;
-          iter_type_expr (update_level env level expand) ty
-        end          
-    | Tpackage (p, nl, tl) when level < Path.binding_time p ->
-        let p' = normalize_package_path env p in
-        if Path.same p p' then raise (Unify [(ty, newvar2 level)]);
-        log_type ty; ty.desc <- Tpackage (p', nl, tl);
-        update_level env level expand ty
-    | Tobject(_, ({contents=Some(p, _tl)} as nm))
-      when level < get_level env p ->
-        set_name nm None;
-        update_level env level expand ty
-    | Tvariant row ->
-        let row = row_repr row in
-        begin match row.row_name with
-        | Some (p, _tl) when level < get_level env p ->
-            log_type ty;
-            ty.desc <- Tvariant {row with row_name = None}
-        | _ -> ()
-        end;
-        set_level ty level;
-        iter_type_expr (update_level env level expand) ty
-    | Tfield(lab, _, ty1, _)
-      when lab = dummy_method && (repr ty1).level > level ->
-        raise (Unify [(ty1, newvar2 level)])
-    | _ ->
-        set_level ty level;
-        (* XXX what about abbreviations in Tconstr ? *)
-        iter_type_expr (update_level env level expand) ty
-  end
-
-(* First try without expanding, then expand everything,
-   to avoid combinatorial blow-up *)
-let update_level env level ty =
-  let ty = repr ty in
-  if ty.level > level then begin
-    let snap = snapshot () in
-    try
-      update_level env level false ty
-    with Unify _ ->
-      backtrack snap;
-      update_level env level true ty
-  end
-
-(* Generalize and lower levels of contravariant branches simultaneously *)
-
-let rec generalize_expansive env var_level visited ty =
-  let ty = repr ty in
-  if ty.level = generic_level || ty.level <= var_level then () else
-  if not (Hashtbl.mem visited ty.id) then begin
-    Hashtbl.add visited ty.id ();
-    match ty.desc with
-      Tconstr (path, tyl, abbrev) ->
-        let variance =
-          try (Env.find_type path env).type_variance
-          with Not_found -> List.map (fun _ -> Variance.may_inv) tyl in
-        abbrev := Mnil;
-        List.iter2
-          (fun v t ->
-            if Variance.(mem May_weak v)
-            then generalize_structure var_level t
-            else generalize_expansive env var_level visited t)
-          variance tyl
-    | Tpackage (_, _, tyl) ->
-        List.iter (generalize_structure var_level) tyl
-    | Tarrow (_, t1, t2, _) ->
-        generalize_structure var_level t1;
-        generalize_expansive env var_level visited t2
-    | _ ->
-        iter_type_expr (generalize_expansive env var_level visited) ty
-  end
-
-let generalize_expansive env ty =
-  simple_abbrevs := Mnil;
-  try
-    generalize_expansive env !nongen_level (Hashtbl.create 7) ty
-  with Unify ([_, ty'] as tr) ->
-    raise (Unify ((ty, ty') :: tr))
-
-let generalize_global ty = generalize_structure !global_level ty
-let generalize_structure ty = generalize_structure !current_level ty
-
-(* Correct the levels of type [ty]. *)
-let correct_levels ty =
-  duplicate_type ty
-
-(* Only generalize the type ty0 in ty *)
-let limited_generalize ty0 ty =
-  let ty0 = repr ty0 in
-
-  let graph = Hashtbl.create 17 in
-  let idx = ref lowest_level in
-  let roots = ref [] in
-
-  let rec inverse pty ty =
-    let ty = repr ty in
-    if (ty.level > !current_level) || (ty.level = generic_level) then begin
-      decr idx;
-      Hashtbl.add graph !idx (ty, ref pty);
-      if (ty.level = generic_level) || (ty == ty0) then
-        roots := ty :: !roots;
-      set_level ty !idx;
-      iter_type_expr (inverse [ty]) ty
-    end else if ty.level < lowest_level then begin
-      let (_, parents) = Hashtbl.find graph ty.level in
-      parents := pty @ !parents
-    end
-
-  and generalize_parents ty =
-    let idx = ty.level in
-    if idx <> generic_level then begin
-      set_level ty generic_level;
-      List.iter generalize_parents !(snd (Hashtbl.find graph idx));
-      (* Special case for rows: must generalize the row variable *)
-      match ty.desc with
-        Tvariant row ->
-          let more = row_more row in
-          let lv = more.level in
-          if (lv < lowest_level || lv > !current_level)
-          && lv <> generic_level then set_level more generic_level
-      | _ -> ()
-    end
-  in
-
-  inverse [] ty;
-  if ty0.level < lowest_level then
-    iter_type_expr (inverse []) ty0;
-  List.iter generalize_parents !roots;
-  Hashtbl.iter
-    (fun _ (ty, _) ->
-       if ty.level <> generic_level then set_level ty !current_level)
-    graph
-
-
-(* Compute statically the free univars of all nodes in a type *)
-(* This avoids doing it repeatedly during instantiation *)
-
-type inv_type_expr =
-    { inv_type : type_expr;
-      mutable inv_parents : inv_type_expr list }
-
-let rec inv_type hash pty ty =
-  let ty = repr ty in
-  try
-    let inv = TypeHash.find hash ty in
-    inv.inv_parents <- pty @ inv.inv_parents
-  with Not_found ->
-    let inv = { inv_type = ty; inv_parents = pty } in
-    TypeHash.add hash ty inv;
-    iter_type_expr (inv_type hash [inv]) ty
-
-let compute_univars ty =
-  let inverted = TypeHash.create 17 in
-  inv_type inverted [] ty;
-  let node_univars = TypeHash.create 17 in
-  let rec add_univar univ inv =
-    match inv.inv_type.desc with
-      Tpoly (_ty, tl) when List.memq univ (List.map repr tl) -> ()
-    | _ ->
-        try
-          let univs = TypeHash.find node_univars inv.inv_type in
-          if not (TypeSet.mem univ !univs) then begin
-            univs := TypeSet.add univ !univs;
-            List.iter (add_univar univ) inv.inv_parents
-          end
-        with Not_found ->
-          TypeHash.add node_univars inv.inv_type (ref(TypeSet.singleton univ));
-          List.iter (add_univar univ) inv.inv_parents
-  in
-  TypeHash.iter (fun ty inv -> if is_Tunivar ty then add_univar ty inv)
-    inverted;
-  fun ty ->
-    try !(TypeHash.find node_univars ty) with Not_found -> TypeSet.empty
-
-
-                              (*******************)
-                              (*  Instantiation  *)
-                              (*******************)
-
-
-let rec find_repr p1 =
-  function
-    Mnil ->
-      None
-  | Mcons (Public, p2, ty, _, _) when Path.same p1 p2 ->
-      Some ty
-  | Mcons (_, _, _, _, rem) ->
-      find_repr p1 rem
-  | Mlink {contents = rem} ->
-      find_repr p1 rem
-
-(*
-   Generic nodes are duplicated, while non-generic nodes are left
-   as-is.
-   During instantiation, the description of a generic node is first
-   replaced by a link to a stub ([Tsubst (newvar ())]). Once the
-   copy is made, it replaces the stub.
-   After instantiation, the description of generic node, which was
-   stored by [save_desc], must be put back, using [cleanup_types].
-*)
-
-let abbreviations = ref (ref Mnil)
-  (* Abbreviation memorized. *)
-
-(* partial: we may not wish to copy the non generic types
-   before we call type_pat *)
-let rec copy ?env ?partial ?keep_names ty =
-  let copy = copy ?env ?partial ?keep_names in
-  let ty = repr ty in
-  match ty.desc with
-    Tsubst ty -> ty
-  | _ ->
-    if ty.level <> generic_level && partial = None then ty else
-    (* We only forget types that are non generic and do not contain
-       free univars *)
-    let forget =
-      if ty.level = generic_level then generic_level else
-      match partial with
-        None -> assert false
-      | Some (free_univars, keep) ->
-          if TypeSet.is_empty (free_univars ty) then
-            if keep then ty.level else !current_level
-          else generic_level
-    in
-    if forget <> generic_level then newty2 forget (Tvar None) else
-    let desc = ty.desc in
-    save_desc ty desc;
-    let t = newvar() in          (* Stub *)
-    begin match env with
-      Some env when Env.has_local_constraints env ->
-        begin match Env.gadt_instance_level env ty with
-          Some lv -> Env.add_gadt_instances env lv [t]
-        | None -> ()
-        end
-    | _ -> ()
-    end;
-    ty.desc <- Tsubst t;
-    t.desc <-
-      begin match desc with
-      | Tconstr (p, tl, _) ->
-          let abbrevs = proper_abbrevs p tl !abbreviations in
-          begin match find_repr p !abbrevs with
-            Some ty when repr ty != t ->
-              Tlink ty
-          | _ ->
-          (*
-             One must allocate a new reference, so that abbrevia-
-             tions belonging to different branches of a type are
-             independent.
-             Moreover, a reference containing a [Mcons] must be
-             shared, so that the memorized expansion of an abbrevi-
-             ation can be released by changing the content of just
-             one reference.
-          *)
-              Tconstr (p, List.map copy tl,
-                       ref (match !(!abbreviations) with
-                              Mcons _ -> Mlink !abbreviations
-                            | abbrev  -> abbrev))
-          end
-      | Tvariant row0 ->
-          let row = row_repr row0 in
-          let more = repr row.row_more in
-          (* We must substitute in a subtle way *)
-          (* Tsubst takes a tuple containing the row var and the variant *)
-          begin match more.desc with
-            Tsubst {desc = Ttuple [_;ty2]} ->
-              (* This variant type has been already copied *)
-              ty.desc <- Tsubst ty2; (* avoid Tlink in the new type *)
-              Tlink ty2
-          | _ ->
-              (* If the row variable is not generic, we must keep it *)
-              let keep = more.level <> generic_level in
-              let more' =
-                match more.desc with
-                  Tsubst ty -> ty
-                | Tconstr _ | Tnil ->
-                    if keep then save_desc more more.desc;
-                    copy more
-                | Tvar _ | Tunivar _ ->
-                    save_desc more more.desc;
-                    if keep then more else newty more.desc
-                |  _ -> assert false
-              in
-              let row =
-                match repr more' with (* PR#6163 *)
-                  {desc=Tconstr _} when not row.row_fixed ->
-                    {row with row_fixed = true}
-                | _ -> row
-              in
-              (* Open row if partial for pattern and contains Reither *)
-              let more', row =
-                match partial with
-                  Some (free_univars, false) ->
-                    let more' =
-                      if more.id != more'.id then more' else
-                      let lv = if keep then more.level else !current_level in
-                      newty2 lv (Tvar None)
-                    in
-                    let not_reither (_, f) =
-                      match row_field_repr f with
-                        Reither _ -> false
-                      | _ -> true
-                    in
-                    if row.row_closed && not row.row_fixed
-                    && TypeSet.is_empty (free_univars ty)
-                    && not (List.for_all not_reither row.row_fields) then
-                      (more',
-                       {row_fields = Ext_list.filter row.row_fields not_reither;
-                        row_more = more'; row_bound = ();
-                        row_closed = false; row_fixed = false; row_name = None})
-                    else (more', row)
-                | _ -> (more', row)
-              in
-              (* Register new type first for recursion *)
-              more.desc <- Tsubst(newgenty(Ttuple[more';t]));
-              (* Return a new copy *)
-              Tvariant (copy_row copy true row keep more')
-          end
-      | Tfield (_p, k, _ty1, ty2) ->
-          begin match field_kind_repr k with
-            Fabsent  -> Tlink (copy ty2)
-          | Fpresent -> copy_type_desc copy desc
-          | Fvar r ->
-              dup_kind r;
-              copy_type_desc copy desc
-          end
-      | Tobject (ty1, _) when partial <> None ->
-          Tobject (copy ty1, ref None)
-      | _ -> copy_type_desc ?keep_names copy desc
-      end;
-    t
-
-let simple_copy t = copy t
-
-(**** Variants of instantiations ****)
-
-let gadt_env env =
-  if Env.has_local_constraints env
-  then Some env
-  else None
-
-let instance ?partial env sch =
-  let env = gadt_env env in
-  let partial =
-    match partial with
-      None -> None
-    | Some keep -> Some (compute_univars sch, keep)
-  in
-  let ty = copy ?env ?partial sch in
-  cleanup_types ();
-  ty
-
-let instance_def sch =
-  let ty = copy sch in
-  cleanup_types ();
-  ty
-
-let generic_instance env sch =
-  let old = !current_level in
-  current_level := generic_level;
-  let ty = instance env sch in
-  current_level := old;
-  ty
-
-let instance_list env schl =
-  let env = gadt_env env in
-  let tyl = List.map (fun t -> copy ?env t) schl in
-  cleanup_types ();
-  tyl
-
-let reified_var_counter = ref Vars.empty
-let reset_reified_var_counter () =
-  reified_var_counter := Vars.empty
-
-(* names given to new type constructors.
-   Used for existential types and
-   local constraints *)
-let get_new_abstract_name s =
-  let index =
-    try Vars.find s !reified_var_counter + 1
-    with Not_found -> 0 in
-  reified_var_counter := Vars.add s index !reified_var_counter;
-  if index = 0 && s <> "" && s.[String.length s - 1] <> '$' then s else
-  Printf.sprintf "%s%d" s index
-
-let new_declaration newtype manifest =
-  {
-    type_params = [];
-    type_arity = 0;
-    type_kind = Type_abstract;
-    type_private = Public;
-    type_manifest = manifest;
-    type_variance = [];
-    type_newtype_level = newtype;
-    type_loc = Location.none;
-    type_attributes = [];
-    type_immediate = false;
-    type_unboxed = unboxed_false_default_false;
-  }
-
-let instance_constructor ?in_pattern cstr =
-  begin match in_pattern with
-  | None -> ()
-  | Some (env, newtype_lev) ->
-      let process existential =
-        let decl = new_declaration (Some (newtype_lev, newtype_lev)) None in
-        let name =
-          match repr existential with
-            {desc = Tvar (Some name)} -> "$" ^ cstr.cstr_name ^ "_'" ^ name
-          | _ -> "$" ^ cstr.cstr_name
-        in
-        let path = Path.Pident (Ident.create (get_new_abstract_name name)) in
-        let new_env = Env.add_local_type path decl !env in
-        env := new_env;
-        let to_unify = newty (Tconstr (path,[],ref Mnil)) in
-        let tv = copy existential in
-        assert (is_Tvar tv);
-        link_type tv to_unify
-      in
-      List.iter process cstr.cstr_existentials
-  end;
-  let ty_res = copy cstr.cstr_res in
-  let ty_args = List.map simple_copy  cstr.cstr_args in
-  cleanup_types ();
-  (ty_args, ty_res)
-
-let instance_parameterized_type ?keep_names sch_args sch =
-  let ty_args = List.map (fun t -> copy ?keep_names t) sch_args in
-  let ty = copy sch in
-  cleanup_types ();
-  (ty_args, ty)
-
-let instance_parameterized_type_2 sch_args sch_lst sch =
-  let ty_args = List.map simple_copy sch_args in
-  let ty_lst = List.map simple_copy sch_lst in
-  let ty = copy sch in
-  cleanup_types ();
-  (ty_args, ty_lst, ty)
-
-let map_kind f = function
-  | Type_abstract -> Type_abstract
-  | Type_open -> Type_open
-  | Type_variant cl ->
-      Type_variant (
-        List.map
-          (fun c ->
-             {c with
-              cd_args = map_type_expr_cstr_args f c.cd_args;
-              cd_res = may_map f c.cd_res
-             })
-          cl)
-  | Type_record (fl, rr) ->
-      Type_record (
-        List.map
-          (fun l ->
-             {l with ld_type = f l.ld_type}
-          ) fl, rr)
-
-
-let instance_declaration decl =
-  let decl =
-    {decl with type_params = List.map simple_copy decl.type_params;
-     type_manifest = may_map simple_copy decl.type_manifest;
-     type_kind = map_kind simple_copy decl.type_kind;
-    }
-  in
-  cleanup_types ();
-  decl
-
-let instance_class params cty =
-  let rec copy_class_type =
-    function
-      Cty_constr (path, tyl, cty) ->
-        Cty_constr (path, List.map simple_copy tyl, copy_class_type cty)
-    | Cty_signature sign ->
-        Cty_signature
-          {csig_self = copy sign.csig_self;
-           csig_vars =
-             Vars.map (function (m, v, ty) -> (m, v, copy ty)) sign.csig_vars;
-           csig_concr = sign.csig_concr;
-           csig_inher =
-             List.map (fun (p,tl) -> (p, List.map simple_copy tl))
-               sign.csig_inher}
-    | Cty_arrow (l, ty, cty) ->
-        Cty_arrow (l, copy ty, copy_class_type cty)
-  in
-  let params' = List.map simple_copy params in
-  let cty' = copy_class_type cty in
-  cleanup_types ();
-  (params', cty')
-
-(**** Instantiation for types with free universal variables ****)
-
-let rec diff_list l1 l2 =
-  if l1 == l2 then [] else
-  match l1 with [] -> invalid_arg "Ctype.diff_list"
-  | a :: l1 -> a :: diff_list l1 l2
-
-let conflicts free bound =
-  let bound = List.map repr bound in
-  TypeSet.exists (fun t -> List.memq (repr t) bound) free
-
-let delayed_copy = ref []
-    (* copying to do later *)
-
-(* Copy without sharing until there are no free univars left *)
-(* all free univars must be included in [visited]            *)
-let rec copy_sep fixed free bound visited ty =
-  let ty = repr ty in
-  let univars = free ty in
-  if TypeSet.is_empty univars then
-    if ty.level <> generic_level then ty else
-    let t = newvar () in
-    delayed_copy :=
-      lazy (t.desc <- Tlink (copy ty))
-      :: !delayed_copy;
-    t
-  else try
-    let t, bound_t = List.assq ty visited in
-    let dl = if is_Tunivar ty then [] else diff_list bound bound_t in
-    if dl <> [] && conflicts univars dl then raise Not_found;
-    t
-  with Not_found -> begin
-    let t = newvar() in          (* Stub *)
-    let visited =
-      match ty.desc with
-        Tarrow _ | Ttuple _ | Tvariant _ | Tconstr _ | Tobject _ | Tpackage _ ->
-          (ty,(t,bound)) :: visited
-      | _ -> visited in
-    let copy_rec = copy_sep fixed free bound visited in
-    t.desc <-
-      begin match ty.desc with
-      | Tvariant row0 ->
-          let row = row_repr row0 in
-          let more = repr row.row_more in
-          (* We shall really check the level on the row variable *)
-          let keep = is_Tvar more && more.level <> generic_level in
-          let more' = copy_rec more in
-          let fixed' = fixed && is_Tvar (repr more') in
-          let row = copy_row copy_rec fixed' row keep more' in
-          Tvariant row
-      | Tpoly (t1, tl) ->
-          let tl = List.map repr tl in
-          let tl' = List.map (fun t -> newty t.desc) tl in
-          let bound = tl @ bound in
-          let visited =
-            List.map2 (fun ty t -> ty,(t,bound)) tl tl' @ visited in
-          Tpoly (copy_sep fixed free bound visited t1, tl')
-      | _ -> copy_type_desc copy_rec ty.desc
-      end;
-    t
-  end
-
-let instance_poly ?(keep_names=false) fixed univars sch =
-  let univars = List.map repr univars in
-  let copy_var ty =
-    match ty.desc with
-      Tunivar name -> if keep_names then newty (Tvar name) else newvar ()
-    | _ -> assert false
-  in
-  let vars = List.map copy_var univars in
-  let pairs = List.map2 (fun u v -> u, (v, [])) univars vars in
-  delayed_copy := [];
-  let ty = copy_sep fixed (compute_univars sch) [] pairs sch in
-  List.iter Lazy.force !delayed_copy;
-  delayed_copy := [];
-  cleanup_types ();
-  vars, ty
-
-let instance_label fixed lbl =
-  let ty_res = copy lbl.lbl_res in
-  let vars, ty_arg =
-    match repr lbl.lbl_arg with
-      {desc = Tpoly (ty, tl)} ->
-        instance_poly fixed tl ty
-    | _ ->
-        [], copy lbl.lbl_arg
-  in
-  cleanup_types ();
-  (vars, ty_arg, ty_res)
-
-(**** Instantiation with parameter substitution ****)
-
-let unify' = (* Forward declaration *)
-  ref (fun _env _ty1 _ty2 -> raise (Unify []))
-
-let subst env level priv abbrev ty params args body =
-  if List.length params <> List.length args then raise (Unify []);
-  let old_level = !current_level in
-  current_level := level;
-  try
-    let body0 = newvar () in          (* Stub *)
-    begin match ty with
-      None      -> ()
-    | Some ({desc = Tconstr (path, tl, _)} as ty) ->
-        let abbrev = proper_abbrevs path tl abbrev in
-        memorize_abbrev abbrev priv path ty body0
-    | _ ->
-        assert false
-    end;
-    abbreviations := abbrev;
-    let (params', body') = instance_parameterized_type params body in
-    abbreviations := ref Mnil;
-    !unify' env body0 body';
-    List.iter2 (!unify' env) params' args;
-    current_level := old_level;
-    body'
-  with Unify _ as exn ->
-    current_level := old_level;
-    raise exn
-
-(*
-   Only the shape of the type matters, not whether it is generic or
-   not. [generic_level] might be somewhat slower, but it ensures
-   invariants on types are enforced (decreasing levels), and we don't
-   care about efficiency here.
-*)
-let apply env params body args =
-  try
-    subst env generic_level Public (ref Mnil) None params args body
-  with
-    Unify _ -> raise Cannot_apply
-
-let () = Subst.ctype_apply_env_empty := apply Env.empty
-
-                              (****************************)
-                              (*  Abbreviation expansion  *)
-                              (****************************)
-
-(*
-   If the environment has changed, memorized expansions might not
-   be correct anymore, and so we flush the cache. This is safe but
-   quite pessimistic: it would be enough to flush the cache when a
-   type or module definition is overridden in the environment.
-*)
-let previous_env = ref Env.empty
-(*let string_of_kind = function Public -> "public" | Private -> "private"*)
-let check_abbrev_env env =
-  if env != !previous_env then begin
-    (* prerr_endline "cleanup expansion cache"; *)
-    cleanup_abbrev ();
-    previous_env := env
-  end
-
-
-(* Expand an abbreviation. The expansion is memorized. *)
-(*
-   Assume the level is greater than the path binding time of the
-   expanded abbreviation.
-*)
-(*
-   An abbreviation expansion will fail in either of these cases:
-   1. The type constructor does not correspond to a manifest type.
-   2. The type constructor is defined in an external file, and this
-      file is not in the path (missing -I options).
-   3. The type constructor is not in the "local" environment. This can
-      happens when a non-generic type variable has been instantiated
-      afterwards to the not yet defined type constructor. (Actually,
-      this cannot happen at the moment due to the strong constraints
-      between type levels and constructor binding time.)
-   4. The expansion requires the expansion of another abbreviation,
-      and this other expansion fails.
-*)
-let expand_abbrev_gen kind find_type_expansion env ty =
-  check_abbrev_env env;
-  match ty with
-    {desc = Tconstr (path, args, abbrev); level = level} ->
-      let lookup_abbrev = proper_abbrevs path args abbrev in
-      begin match find_expans kind path !lookup_abbrev with
-        Some ty' ->
-          (* prerr_endline
-            ("found a "^string_of_kind kind^" expansion for "^Path.name path);*)
-          if level <> generic_level then
-            begin try
-              update_level env level ty'
-            with Unify _ ->
-              (* XXX This should not happen.
-                 However, levels are not correctly restored after a
-                 typing error *)
-              ()
-            end;
-          let ty' = repr ty' in
-          (* assert (ty != ty'); *) (* PR#7324 *)
-          ty'
-      | None ->
-          match find_type_expansion path env with
-          | exception Not_found ->
-            (* another way to expand is to normalize the path itself *)
-            let path' = Env.normalize_path None env path in
-            if Path.same path path' then raise Cannot_expand
-            else newty2 level (Tconstr (path', args, abbrev))
-          | (params, body, lv) ->
-            (* prerr_endline
-              ("add a "^string_of_kind kind^" expansion for "^Path.name path);*)
-            let ty' = subst env level kind abbrev (Some ty) params args body in
-            (* For gadts, remember type as non exportable *)
-            (* The ambiguous level registered for ty' should be the highest *)
-            if !trace_gadt_instances then begin
-              match Ext_pervasives.max_int_option lv (Env.gadt_instance_level env ty) with
-                None -> ()
-              | Some lv ->
-                  if level < lv then raise (Unify [(ty, newvar2 level)]);
-                  Env.add_gadt_instances env lv [ty; ty']
-            end;
-            ty'
-      end
-  | _ ->
-      assert false
-
-(* Expand respecting privacy *)
-let expand_abbrev env ty =
-  expand_abbrev_gen Public Env.find_type_expansion env ty
-
-(* Expand once the head of a type *)
-let expand_head_once env ty =
-  try expand_abbrev env (repr ty) with Cannot_expand -> assert false
-
-(* Check whether a type can be expanded *)
-let safe_abbrev env ty =
-  let snap = Btype.snapshot () in
-  try ignore (expand_abbrev env ty); true
-  with Cannot_expand | Unify _ ->
-    Btype.backtrack snap;
-    false
-
-(* Expand the head of a type once.
-   Raise Cannot_expand if the type cannot be expanded.
-   May raise Unify, if a recursion was hidden in the type. *)
-let try_expand_once env ty =
-  let ty = repr ty in
-  match ty.desc with
-    Tconstr _ -> repr (expand_abbrev env ty)
-  | _ -> raise Cannot_expand
-
-(* This one only raises Cannot_expand *)
-let try_expand_safe env ty =
-  let snap = Btype.snapshot () in
-  try try_expand_once env ty
-  with Unify _ ->
-    Btype.backtrack snap; raise Cannot_expand
-
-(* Fully expand the head of a type. *)
-let rec try_expand_head try_once env ty =
-  let ty' = try_once env ty in
-  try try_expand_head try_once env ty'
-  with Cannot_expand -> ty'
-
-let try_expand_head try_once env ty =
-  let ty' = try_expand_head try_once env ty in
-  begin match Env.gadt_instance_level env ty' with
-    None -> ()
-  | Some lv -> Env.add_gadt_instance_chain env lv ty
-  end;
-  ty'
-
-(* Unsafe full expansion, may raise Unify. *)
-let expand_head_unif env ty =
-  try try_expand_head try_expand_once env ty with Cannot_expand -> repr ty
-
-(* Safe version of expand_head, never fails *)
-let expand_head env ty =
-  try try_expand_head try_expand_safe env ty with Cannot_expand -> repr ty
-
-let _ = forward_try_expand_once := try_expand_safe
-
-
-(* Expand until we find a non-abstract type declaration *)
-
-let rec extract_concrete_typedecl env ty =
-  let ty = repr ty in
-  match ty.desc with
-    Tconstr (p, _, _) ->
-      let decl = Env.find_type p env in
-      if decl.type_kind <> Type_abstract then (p, p, decl) else
-      let ty =
-        try try_expand_once env ty with Cannot_expand -> raise Not_found
-      in
-      let (_, p', decl) = extract_concrete_typedecl env ty in
-        (p, p', decl)
-  | _ -> raise Not_found
-
-(* Implementing function [expand_head_opt], the compiler's own version of
-   [expand_head] used for type-based optimisations.
-   [expand_head_opt] uses [Env.find_type_expansion_opt] to access the
-   manifest type information of private abstract data types which is
-   normally hidden to the type-checker out of the implementation module of
-   the private abbreviation. *)
-
-let expand_abbrev_opt =
-  expand_abbrev_gen Private Env.find_type_expansion_opt
-
-let try_expand_once_opt env ty =
-  let ty = repr ty in
-  match ty.desc with
-    Tconstr _ -> repr (expand_abbrev_opt env ty)
-  | _ -> raise Cannot_expand
-
-let rec try_expand_head_opt env ty =
-  let ty' = try_expand_once_opt env ty in
-  begin try
-    try_expand_head_opt env ty'
-  with Cannot_expand ->
-    ty'
-  end
-
-let expand_head_opt env ty =
-  let snap = Btype.snapshot () in
-  try try_expand_head_opt env ty
-  with Cannot_expand | Unify _ -> (* expand_head shall never fail *)
-    Btype.backtrack snap;
-    repr ty
-
-(* Make sure that the type parameters of the type constructor [ty]
-   respect the type constraints *)
-let enforce_constraints env ty =
-  match ty with
-    {desc = Tconstr (path, args, _abbrev); level = level} ->
-      begin try
-        let decl = Env.find_type path env in
-        ignore
-          (subst env level Public (ref Mnil) None decl.type_params args
-             (newvar2 level))
-      with Not_found -> ()
-      end
-  | _ ->
-      assert false
-
-(* Recursively expand the head of a type.
-   Also expand #-types. *)
-let full_expand env ty =
-  let ty = repr (expand_head env ty) in
-  match ty.desc with
-    Tobject (fi, {contents = Some (_, v::_)}) when is_Tvar (repr v) ->
-      newty2 ty.level (Tobject (fi, ref None))
-  | _ ->
-      ty
-
-(*
-   Check whether the abbreviation expands to a well-defined type.
-   During the typing of a class, abbreviations for correspondings
-   types expand to non-generic types.
-*)
-let generic_abbrev env path =
-  try
-    let (_, body, _) = Env.find_type_expansion path env in
-    (repr body).level = generic_level
-  with
-    Not_found ->
-      false
-
-let generic_private_abbrev env path =
-  try
-    match Env.find_type path env with
-      {type_kind = Type_abstract;
-       type_private = Private;
-       type_manifest = Some body} ->
-         (repr body).level = generic_level
-    | _ -> false
-  with Not_found -> false
-
-let is_contractive env p =
-  try
-    let decl = Env.find_type p env in
-    in_pervasives p && decl.type_manifest = None || is_datatype decl
-  with Not_found -> false
-
-
-                              (*****************)
-                              (*  Occur check  *)
-                              (*****************)
-
-
-exception Occur
-
-let rec occur_rec env allow_recursive visited ty0 = function
-  | {desc=Tlink ty} ->
-      occur_rec env allow_recursive visited ty0 ty
-  | ty ->
-  if ty == ty0  then raise Occur;
-  match ty.desc with
-    Tconstr(p, _tl, _abbrev) ->
-      if allow_recursive && is_contractive env p then () else
-      begin try
-        if TypeSet.mem ty visited then raise Occur;
-        let visited = TypeSet.add ty visited in
-        iter_type_expr (occur_rec env allow_recursive visited ty0) ty
-      with Occur -> try
-        let ty' = try_expand_head try_expand_once env ty in
-        (* This call used to be inlined, but there seems no reason for it.
-           Message was referring to change in rev. 1.58 of the CVS repo. *)
-        occur_rec env allow_recursive visited ty0 ty'
-      with Cannot_expand ->
-        raise Occur
-      end
-  | Tobject _ | Tvariant _ ->
-      ()
-  | _ ->
-      if allow_recursive ||  TypeSet.mem ty visited then () else begin
-        let visited = TypeSet.add ty visited in
-        iter_type_expr (occur_rec env allow_recursive visited ty0) ty
-      end
-
-let type_changed = ref false (* trace possible changes to the studied type *)
-
-let merge r b = if b then r := true
-
-let occur env ty0 ty =
-  let allow_recursive = (*!Clflags.recursive_types ||*) !umode = Pattern  in
-  let old = !type_changed in
-  try
-    while
-      type_changed := false;
-      occur_rec env allow_recursive TypeSet.empty ty0 ty;
-      !type_changed
-    do () (* prerr_endline "changed" *) done;
-    merge type_changed old
-  with exn ->
-    merge type_changed old;
-    raise (match exn with Occur -> Unify [] | _ -> exn)
-
-let occur_in env ty0 t =
-  try occur env ty0 t; false with Unify _ -> true
-
-(* Check that a local constraint is well-founded *)
-(* PR#6405: not needed since we allow recursion and work on normalized types *)
-(* PR#6992: we actually need it for contractiveness *)
-(* This is a simplified version of occur, only for the rectypes case *)
-
-let rec local_non_recursive_abbrev strict visited env p ty =
-  (*Format.eprintf "@[Check %s =@ %a@]@." (Path.name p) !Btype.print_raw ty;*)
-  let ty = repr ty in
-  if not (List.memq ty visited) then begin
-    match ty.desc with
-      Tconstr(p', args, _abbrev) ->
-        if Path.same p p' then raise Occur;
-        if not strict && is_contractive env p' then () else
-        let visited = ty :: visited in
-        begin try
-          (* try expanding, since [p] could be hidden *)
-          local_non_recursive_abbrev strict visited env p
-            (try_expand_head try_expand_once env ty)
-        with Cannot_expand ->
-          let params =
-            try (Env.find_type p' env).type_params
-            with Not_found -> args
-          in
-          List.iter2
-            (fun tv ty ->
-              let strict = strict || not (is_Tvar (repr tv)) in
-              local_non_recursive_abbrev strict visited env p ty)
-            params args
-        end
-    | _ ->
-        if strict then (* PR#7374 *)
-          let visited = ty :: visited in
-          iter_type_expr (local_non_recursive_abbrev true visited env p) ty
-  end
-
-let local_non_recursive_abbrev env p ty =
-  try (* PR#7397: need to check trace_gadt_instances *)
-    wrap_trace_gadt_instances env
-      (local_non_recursive_abbrev false [] env p) ty;
-    true
-  with Occur -> false
-
-
-                   (*****************************)
-                   (*  Polymorphic Unification  *)
-                   (*****************************)
-
-(* Since we cannot duplicate universal variables, unification must
-   be done at meta-level, using bindings in univar_pairs *)
-let rec unify_univar t1 t2 = function
-    (cl1, cl2) :: rem ->
-      let find_univ t cl =
-        try
-          let (_, r) = List.find (fun (t',_) -> t == repr t') cl in
-          Some r
-        with Not_found -> None
-      in
-      begin match find_univ t1 cl1, find_univ t2 cl2 with
-        Some {contents=Some t'2}, Some _ when t2 == repr t'2 ->
-          ()
-      | Some({contents=None} as r1), Some({contents=None} as r2) ->
-          set_univar r1 t2; set_univar r2 t1
-      | None, None ->
-          unify_univar t1 t2 rem
-      | _ ->
-          raise (Unify [])
-      end
-  | [] -> raise (Unify [])
-
-(* Test the occurrence of free univars in a type *)
-(* that's way too expensive. Must do some kind of caching *)
-let occur_univar env ty =
-  let visited = ref TypeMap.empty in
-  let rec occur_rec bound ty =
-    let ty = repr ty in
-    if ty.level >= lowest_level &&
-      if TypeSet.is_empty bound then
-        (ty.level <- pivot_level - ty.level; true)
-      else try
-        let bound' = TypeMap.find ty !visited in
-        if TypeSet.exists (fun x -> not (TypeSet.mem x bound)) bound' then
-          (visited := TypeMap.add ty (TypeSet.inter bound bound') !visited;
-           true)
-        else false
-      with Not_found ->
-        visited := TypeMap.add ty bound !visited;
-        true
-    then
-      match ty.desc with
-        Tunivar _ ->
-          if not (TypeSet.mem ty bound) then raise (Unify [ty, newgenvar ()])
-      | Tpoly (ty, tyl) ->
-          let bound = List.fold_right TypeSet.add (List.map repr tyl) bound in
-          occur_rec bound  ty
-      | Tconstr (_, [], _) -> ()
-      | Tconstr (p, tl, _) ->
-          begin try
-            let td = Env.find_type p env in
-            List.iter2
-              (fun t v ->
-                if Variance.(mem May_pos v || mem May_neg v)
-                then occur_rec bound t)
-              tl td.type_variance
-          with Not_found ->
-            List.iter (occur_rec bound) tl
-          end
-      | _ -> iter_type_expr (occur_rec bound) ty
-  in
-  try
-    occur_rec TypeSet.empty ty; unmark_type ty
-  with exn ->
-    unmark_type ty; raise exn
-
-(* Grouping univars by families according to their binders *)
-let add_univars =
-  List.fold_left (fun s (t,_) -> TypeSet.add (repr t) s)
-
-let get_univar_family univar_pairs univars =
-  if univars = [] then TypeSet.empty else
-  let insert s = function
-      cl1, (_::_ as cl2) ->
-        if List.exists (fun (t1,_) -> TypeSet.mem (repr t1) s) cl1 then
-          add_univars s cl2
-        else s
-    | _ -> s
-  in
-  let s = List.fold_right TypeSet.add univars TypeSet.empty in
-  List.fold_left insert s univar_pairs
-
-(* Whether a family of univars escapes from a type *)
-let univars_escape env univar_pairs vl ty =
-  let family = get_univar_family univar_pairs vl in
-  let visited = ref TypeSet.empty in
-  let rec occur t =
-    let t = repr t in
-    if TypeSet.mem t !visited then () else begin
-      visited := TypeSet.add t !visited;
-      match t.desc with
-        Tpoly (t, tl) ->
-          if List.exists (fun t -> TypeSet.mem (repr t) family) tl then ()
-          else occur t
-      | Tunivar _ ->
-          if TypeSet.mem t family then raise Occur
-      | Tconstr (_, [], _) -> ()
-      | Tconstr (p, tl, _) ->
-          begin try
-            let td = Env.find_type p env in
-            List.iter2
-              (fun t v ->
-                if Variance.(mem May_pos v || mem May_neg v) then occur t)
-              tl td.type_variance
-          with Not_found ->
-            List.iter occur tl
-          end
-      | _ ->
-          iter_type_expr occur t
-    end
-  in
-  try occur ty; false with Occur -> true
-
-(* Wrapper checking that no variable escapes and updating univar_pairs *)
-let enter_poly env univar_pairs t1 tl1 t2 tl2 f =
-  let old_univars = !univar_pairs in
-  let known_univars =
-    List.fold_left (fun s (cl,_) -> add_univars s cl)
-      TypeSet.empty old_univars
-  in
-  let tl1 = List.map repr tl1 and tl2 = List.map repr tl2 in
-  if List.exists (fun t -> TypeSet.mem t known_univars) tl1 &&
-    univars_escape env old_univars tl1 (newty(Tpoly(t2,tl2)))
-  || List.exists (fun t -> TypeSet.mem t known_univars) tl2 &&
-    univars_escape env old_univars tl2 (newty(Tpoly(t1,tl1)))
-  then raise (Unify []);
-  let cl1 = List.map (fun t -> t, ref None) tl1
-  and cl2 = List.map (fun t -> t, ref None) tl2 in
-  univar_pairs := (cl1,cl2) :: (cl2,cl1) :: old_univars;
-  try let res = f t1 t2 in univar_pairs := old_univars; res
-  with exn -> univar_pairs := old_univars; raise exn
-
-let univar_pairs = ref []
-
-
-                              (*****************)
-                              (*  Unification  *)
-                              (*****************)
-
-
-
-let rec has_cached_expansion p abbrev =
-  match abbrev with
-    Mnil                   -> false
-  | Mcons(_, p', _, _, rem)   -> Path.same p p' || has_cached_expansion p rem
-  | Mlink rem              -> has_cached_expansion p !rem
-
-(**** Transform error trace ****)
-(* +++ Move it to some other place ? *)
-
-let expand_trace env trace =
-  List.fold_right
-    (fun (t1, t2) rem ->
-       (repr t1, full_expand env t1)::(repr t2, full_expand env t2)::rem)
-    trace []
-
-(* build a dummy variant type *)
-let mkvariant fields closed =
-  newgenty
-    (Tvariant
-       {row_fields = fields; row_closed = closed; row_more = newvar();
-        row_bound = (); row_fixed = false; row_name = None })
-
-(**** Unification ****)
-
-(* Return whether [t0] occurs in [ty]. Objects are also traversed. *)
-let deep_occur t0 ty =
-  let rec occur_rec ty =
-    let ty = repr ty in
-    if ty.level >= lowest_level then begin
-      if ty == t0 then raise Occur;
-      ty.level <- pivot_level - ty.level;
-      iter_type_expr occur_rec ty
-    end
-  in
-  try
-    occur_rec ty; unmark_type ty; false
-  with Occur ->
-    unmark_type ty; true
-
-(*
-   1. When unifying two non-abbreviated types, one type is made a link
-      to the other. When unifying an abbreviated type with a
-      non-abbreviated type, the non-abbreviated type is made a link to
-      the other one. When unifying to abbreviated types, these two
-      types are kept distincts, but they are made to (temporally)
-      expand to the same type.
-   2. Abbreviations with at least one parameter are systematically
-      expanded. The overhead does not seem too high, and that way
-      abbreviations where some parameters does not appear in the
-      expansion, such as ['a t = int], are correctly handled. In
-      particular, for this example, unifying ['a t] with ['b t] keeps
-      ['a] and ['b] distincts. (Is it really important ?)
-   3. Unifying an abbreviation ['a t = 'a] with ['a] should not yield
-      ['a t as 'a]. Indeed, the type variable would otherwise be lost.
-      This problem occurs for abbreviations expanding to a type
-      variable, but also to many other constrained abbreviations (for
-      instance, [(< x : 'a > -> unit) t = <x : 'a>]). The solution is
-      that, if an abbreviation is unified with some subpart of its
-      parameters, then the parameter actually does not get
-      abbreviated.  It would be possible to check whether some
-      information is indeed lost, but it probably does not worth it.
-*)
-
-let newtype_level = ref None
-
-let get_newtype_level () =
-  match !newtype_level with
-  | None -> assert false
-  | Some x -> x
-
-(* a local constraint can be added only if the rhs
-   of the constraint does not contain any Tvars.
-   They need to be removed using this function *)
-let reify env t =
-  let newtype_level = get_newtype_level () in
-  let create_fresh_constr lev name =
-    let decl = new_declaration (Some (newtype_level, newtype_level)) None in
-    let name = match name with Some s -> "$'"^s | _ -> "$" in
-    let path = Path.Pident (Ident.create (get_new_abstract_name name)) in
-    let new_env = Env.add_local_type path decl !env in
-    let t = newty2 lev (Tconstr (path,[],ref Mnil))  in
-    env := new_env;
-    t
-  in
-  let visited = ref TypeSet.empty in
-  let rec iterator ty =
-    let ty = repr ty in
-    if TypeSet.mem ty !visited then () else begin
-      visited := TypeSet.add ty !visited;
-      match ty.desc with
-        Tvar o ->
-          let t = create_fresh_constr ty.level o in
-          link_type ty t;
-          if ty.level < newtype_level then
-            raise (Unify [t, newvar2 ty.level])
-      | Tvariant r ->
-          let r = row_repr r in
-          if not (static_row r) then begin
-            if r.row_fixed then iterator (row_more r) else
-            let m = r.row_more in
-            match m.desc with
-              Tvar o ->
-                let t = create_fresh_constr m.level o in
-                let row =
-                  {r with row_fields=[]; row_fixed=true; row_more = t} in
-                link_type m (newty2 m.level (Tvariant row));
-                if m.level < newtype_level then
-                  raise (Unify [t, newvar2 m.level])
-            | _ -> assert false
-          end;
-          iter_row iterator r
-      | Tconstr (p, _, _) when is_object_type p ->
-          iter_type_expr iterator (full_expand !env ty)
-      | _ ->
-          iter_type_expr iterator ty
-    end
-  in
-  iterator t
-
-let is_newtype env p =
-  try
-    let decl = Env.find_type p env in
-    decl.type_newtype_level <> None &&
-    decl.type_kind = Type_abstract &&
-    decl.type_private = Public
-  with Not_found -> false
-
-let non_aliasable p decl =
-  (* in_pervasives p ||  (subsumed by in_current_module) *)
-  in_current_module p && decl.type_newtype_level = None
-
-let is_instantiable env p =
-  try
-    let decl = Env.find_type p env in
-    decl.type_kind = Type_abstract &&
-    decl.type_private = Public &&
-    decl.type_arity = 0 &&
-    decl.type_manifest = None &&
-    not (non_aliasable p decl)
-  with Not_found -> false
-
-
-(* PR#7113: -safe-string should be a global property *)
-let compatible_paths p1 p2 =
-  let open Predef in
-  Path.same p1 p2 ||
-  Path.same p1 path_bytes && Path.same p2 path_string ||
-  Path.same p1 path_string && Path.same p2 path_bytes
-
-(* Check for datatypes carefully; see PR#6348 *)
-let rec expands_to_datatype env ty =
-  let ty = repr ty in
-  match ty.desc with
-    Tconstr (p, _, _) ->
-      begin try
-        is_datatype (Env.find_type p env) ||
-        expands_to_datatype env (try_expand_once env ty)
-      with Not_found | Cannot_expand -> false
-      end
-  | _ -> false
-
-(* mcomp type_pairs subst env t1 t2 does not raise an
-   exception if it is possible that t1 and t2 are actually
-   equal, assuming the types in type_pairs are equal and
-   that the mapping subst holds.
-   Assumes that both t1 and t2 do not contain any tvars
-   and that both their objects and variants are closed
- *)
-
-let rec mcomp type_pairs env t1 t2 =
-  if t1 == t2 then () else
-  let t1 = repr t1 in
-  let t2 = repr t2 in
-  if t1 == t2 then () else
-  match (t1.desc, t2.desc) with
-  | (Tvar _, _)
-  | (_, Tvar _)  ->
-      ()
-  | (Tconstr (p1, [], _), Tconstr (p2, [], _)) when Path.same p1 p2 ->
-      ()
-  | _ ->
-      let t1' = expand_head_opt env t1 in
-      let t2' = expand_head_opt env t2 in
-      (* Expansion may have changed the representative of the types... *)
-      let t1' = repr t1' and t2' = repr t2' in
-      if t1' == t2' then () else
-      begin try TypePairs.find type_pairs (t1', t2')
-      with Not_found ->
-        TypePairs.add type_pairs (t1', t2') ();
-        match (t1'.desc, t2'.desc) with
-          (Tvar _, Tvar _) -> assert false
-        | (Tarrow (l1, t1, u1, _), Tarrow (l2, t2, u2, _))
-          when Asttypes.same_arg_label l1  l2 || not (is_optional l1 || is_optional l2) ->
-            mcomp type_pairs env t1 t2;
-            mcomp type_pairs env u1 u2;
-        | (Ttuple tl1, Ttuple tl2) ->
-            mcomp_list type_pairs env tl1 tl2
-        | (Tconstr (p1, tl1, _), Tconstr (p2, tl2, _)) ->
-            mcomp_type_decl type_pairs env p1 p2 tl1 tl2
-        | (Tconstr (p, _, _), _) | (_, Tconstr (p, _, _)) ->
-            begin try
-              let decl = Env.find_type p env in
-              if non_aliasable p decl || is_datatype decl then raise (Unify [])
-            with Not_found -> ()
-            end
-        (*
-        | (Tpackage (p1, n1, tl1), Tpackage (p2, n2, tl2)) when n1 = n2 ->
-            mcomp_list type_pairs env tl1 tl2
-        *)
-        | (Tpackage _, Tpackage _) -> ()
-        | (Tvariant row1, Tvariant row2) ->
-            mcomp_row type_pairs env row1 row2
-        | (Tobject (fi1, _), Tobject (fi2, _)) ->
-            mcomp_fields type_pairs env fi1 fi2
-        | (Tfield _, Tfield _) ->       (* Actually unused *)
-            mcomp_fields type_pairs env t1' t2'
-        | (Tnil, Tnil) ->
-            ()
-        | (Tpoly (t1, []), Tpoly (t2, [])) ->
-            mcomp type_pairs env t1 t2
-        | (Tpoly (t1, tl1), Tpoly (t2, tl2)) ->
-            enter_poly env univar_pairs t1 tl1 t2 tl2
-              (mcomp type_pairs env)
-        | (Tunivar _, Tunivar _) ->
-            unify_univar t1' t2' !univar_pairs
-        | (_, _) ->
-            raise (Unify [])
-      end
-
-and mcomp_list type_pairs env tl1 tl2 =
-  if List.length tl1 <> List.length tl2 then
-    raise (Unify []);
-  List.iter2 (mcomp type_pairs env) tl1 tl2
-
-and mcomp_fields type_pairs env ty1 ty2 =
-  if not (concrete_object ty1 && concrete_object ty2) then assert false;
-  let (fields2, rest2) = flatten_fields ty2 in
-  let (fields1, rest1) = flatten_fields ty1 in
-  let (pairs, miss1, miss2) = associate_fields fields1 fields2 in
-  let has_present =
-    List.exists (fun (_, k, _) -> field_kind_repr k = Fpresent) in
-  mcomp type_pairs env rest1 rest2;
-  if has_present miss1  && (object_row ty2).desc = Tnil
-  || has_present miss2  && (object_row ty1).desc = Tnil then raise (Unify []);
-  List.iter
-    (function (_n, k1, t1, k2, t2) ->
-       mcomp_kind k1 k2;
-       mcomp type_pairs env t1 t2)
-    pairs
-
-and mcomp_kind k1 k2 =
-  let k1 = field_kind_repr k1 in
-  let k2 = field_kind_repr k2 in
-  match k1, k2 with
-    (Fpresent, Fabsent)
-  | (Fabsent, Fpresent) -> raise (Unify [])
-  | _                   -> ()
-
-and mcomp_row type_pairs env row1 row2 =
-  let row1 = row_repr row1 and row2 = row_repr row2 in
-  let r1, r2, pairs = merge_row_fields row1.row_fields row2.row_fields in
-  let cannot_erase (_,f) =
-    match row_field_repr f with
-      Rpresent _ -> true
-    | Rabsent | Reither _ -> false
-  in
-  if row1.row_closed && List.exists cannot_erase r2
-  || row2.row_closed && List.exists cannot_erase r1 then raise (Unify []);
-  List.iter
-    (fun (_,f1,f2) ->
-      match row_field_repr f1, row_field_repr f2 with
-      | Rpresent None, (Rpresent (Some _) | Reither (_, _::_, _, _) | Rabsent)
-      | Rpresent (Some _), (Rpresent None | Reither (true, _, _, _) | Rabsent)
-      | (Reither (_, _::_, _, _) | Rabsent), Rpresent None
-      | (Reither (true, _, _, _) | Rabsent), Rpresent (Some _) ->
-          raise (Unify [])
-      | Rpresent(Some t1), Rpresent(Some t2) ->
-          mcomp type_pairs env t1 t2
-      | Rpresent(Some t1), Reither(false, tl2, _, _) ->
-          List.iter (mcomp type_pairs env t1) tl2
-      | Reither(false, tl1, _, _), Rpresent(Some t2) ->
-          List.iter (mcomp type_pairs env t2) tl1
-      | _ -> ())
-    pairs
-
-and mcomp_type_decl type_pairs env p1 p2 tl1 tl2 =
-  try
-    let decl = Env.find_type p1 env in
-    let decl' = Env.find_type p2 env in
-    if compatible_paths p1 p2 then begin
-      let inj =
-        try List.map Variance.(mem Inj) (Env.find_type p1 env).type_variance
-        with Not_found -> List.map (fun _ -> false) tl1
-      in
-      List.iter2
-        (fun i (t1,t2) -> if i then mcomp type_pairs env t1 t2)
-        inj (List.combine tl1 tl2)
-    end else if non_aliasable p1 decl && non_aliasable p2 decl' then
-      raise (Unify [])
-    else
-      match decl.type_kind, decl'.type_kind with
-      | Type_record (lst,r), Type_record (lst',r') when Types.same_record_representation r  r' ->
-          mcomp_list type_pairs env tl1 tl2;
-          mcomp_record_description type_pairs env lst lst'
-      | Type_variant v1, Type_variant v2 ->
-          mcomp_list type_pairs env tl1 tl2;
-          mcomp_variant_description type_pairs env v1 v2
-      | Type_open, Type_open ->
-          mcomp_list type_pairs env tl1 tl2
-      | Type_abstract, Type_abstract -> ()
-      | Type_abstract, _ when not (non_aliasable p1 decl)-> ()
-      | _, Type_abstract when not (non_aliasable p2 decl') -> ()
-      | _ -> raise (Unify [])
-  with Not_found -> ()
-
-and mcomp_type_option type_pairs env t t' =
-  match t, t' with
-    None, None -> ()
-  | Some t, Some t' -> mcomp type_pairs env t t'
-  | _ -> raise (Unify [])
-
-and mcomp_variant_description type_pairs env xs ys =
-  let rec iter = fun x y ->
-    match x, y with
-    | c1 :: xs, c2 :: ys   ->
-      mcomp_type_option type_pairs env c1.cd_res c2.cd_res;
-      begin match c1.cd_args, c2.cd_args with
-      | Cstr_tuple l1, Cstr_tuple l2 -> mcomp_list type_pairs env l1 l2
-      | Cstr_record l1, Cstr_record l2 ->
-          mcomp_record_description type_pairs env l1 l2
-      | _ -> raise (Unify [])
-      end;
-     if Ident.name c1.cd_id = Ident.name c2.cd_id
-      then iter xs ys
-      else raise (Unify [])
-    | [],[] -> ()
-    | _ -> raise (Unify [])
-  in
-  iter xs ys
-
-and mcomp_record_description type_pairs env =
-  let rec iter x y =
-    match x, y with
-    | l1 :: xs, l2 :: ys ->
-        mcomp type_pairs env l1.ld_type l2.ld_type;
-        if Ident.name l1.ld_id = Ident.name l2.ld_id &&
-           l1.ld_mutable = l2.ld_mutable
-        then iter xs ys
-        else raise (Unify [])
-    | [], [] -> ()
-    | _ -> raise (Unify [])
-  in
-  iter
-
-let mcomp env t1 t2 =
-  mcomp (TypePairs.create 4) env t1 t2
-
-(* Real unification *)
-
-
-let find_newtype_level env path =
-  try match (Env.find_type path env).type_newtype_level with
-    Some x -> x
-  | None -> raise Not_found
-  with Not_found -> let lev = Path.binding_time path in (lev, lev)
-
-let add_gadt_equation env source destination =
-  if local_non_recursive_abbrev !env source destination then begin
-    let destination = duplicate_type destination in
-    let source_lev = find_newtype_level !env source in
-    let decl = new_declaration (Some source_lev) (Some destination) in
-    let newtype_level = get_newtype_level () in
-    env := Env.add_local_constraint source decl newtype_level !env;
-    cleanup_abbrev ()
-  end
-
-let unify_eq_set = TypePairs.create 11
-
-let order_type_pair t1 t2 =
-  if t1.id <= t2.id then (t1, t2) else (t2, t1)
-
-let add_type_equality t1 t2 =
-  TypePairs.add unify_eq_set (order_type_pair t1 t2) ()
-
-let eq_package_path env p1 p2 =
-  Path.same p1 p2 ||
-  Path.same (normalize_package_path env p1) (normalize_package_path env p2)
-
-let nondep_type' = ref (fun _ _ _ -> assert false)
-let package_subtype = ref (fun _ _ _ _ _ _ _ -> assert false)
-
-let rec concat_longident lid1 =
-  let open Longident in
-  function
-    Lident s -> Ldot (lid1, s)
-  | Ldot (lid2, s) -> Ldot (concat_longident lid1 lid2, s)
-  | Lapply (lid2, lid) -> Lapply (concat_longident lid1 lid2, lid)
-
-let nondep_instance env level id ty =
-  let ty = !nondep_type' env id ty in
-  if level = generic_level then duplicate_type ty else
-  let old = !current_level in
-  current_level := level;
-  let ty = instance env ty in
-  current_level := old;
-  ty
-
-(* Find the type paths nl1 in the module type mty2, and add them to the
-   list (nl2, tl2). raise Not_found if impossible *)
-let complete_type_list ?(allow_absent=false) env nl1 lv2 mty2 nl2 tl2 =
-  let id2 = Ident.create "Pkg" in
-  let env' = Env.add_module id2 mty2 env in
-  let rec complete nl1 ntl2 =
-    match nl1, ntl2 with
-      [], _ -> ntl2
-    | n :: nl, (n2, _ as nt2) :: ntl' when Longident.cmp n n2 >= 0 ->
-        nt2 :: complete (if Longident.cmp n n2 = 0 then nl else nl1) ntl'
-    | n :: nl, _ ->
-        try
-          let path =
-            Env.lookup_type (concat_longident (Longident.Lident "Pkg") n) env'
-          in
-          match Env.find_type path env' with
-            {type_arity = 0; type_kind = Type_abstract;
-             type_private = Public; type_manifest = Some t2} ->
-               (n, nondep_instance env' lv2 id2 t2) :: complete nl ntl2
-          | {type_arity = 0; type_kind = Type_abstract;
-             type_private = Public; type_manifest = None} when allow_absent ->
-               complete nl ntl2
-          | _ -> raise Exit
-        with
-        | Not_found when allow_absent -> complete nl ntl2
-        | Exit -> raise Not_found
-  in
-  complete nl1 (List.combine nl2 tl2)
-
-(* raise Not_found rather than Unify if the module types are incompatible *)
-let unify_package env unify_list lv1 p1 n1 tl1 lv2 p2 n2 tl2 =
-  let ntl2 = complete_type_list env n1 lv2 (Mty_ident p2) n2 tl2
-  and ntl1 = complete_type_list env n2 lv1 (Mty_ident p1) n1 tl1 in
-  unify_list (List.map snd ntl1) (List.map snd ntl2);
-  if eq_package_path env p1 p2
-  || !package_subtype env p1 n1 tl1 p2 n2 tl2
-  && !package_subtype env p2 n2 tl2 p1 n1 tl1 then () else raise Not_found
-
-
-(* force unification in Reither when one side has a non-conjunctive type *)
-let rigid_variants = ref false
-
-(* drop not force unification in Reither, even in fixed case
-   (not sound, only use it when checking exhaustiveness) *)
-let passive_variants = ref false
-let with_passive_variants f x =
-  if !passive_variants then f x else
-  match passive_variants := true; f x with
-  | r           -> passive_variants := false; r
-  | exception e -> passive_variants := false; raise e
-
-let unify_eq t1 t2 =
-  t1 == t2 ||
-  match !umode with
-  | Expression -> false
-  | Pattern ->
-      try TypePairs.find unify_eq_set (order_type_pair t1 t2); true
-      with Not_found -> false
-
-let unify1_var env t1 t2 =
-  assert (is_Tvar t1);
-  occur env t1 t2;
-  occur_univar env t2;
-  let d1 = t1.desc in
-  link_type t1 t2;
-  try
-    update_level env t1.level t2
-  with Unify _ as e ->
-    t1.desc <- d1;
-    raise e
-
-let rec unify (env:Env.t ref) t1 t2 =
-  (* First step: special cases (optimizations) *)
-  if t1 == t2 then () else
-  let t1 = repr t1 in
-  let t2 = repr t2 in
-  if unify_eq t1 t2 then () else
-  let reset_tracing = check_trace_gadt_instances !env in
-
-  try
-    type_changed := true;
-    begin match (t1.desc, t2.desc) with
-      (Tvar _, Tconstr _) when deep_occur t1 t2 ->
-        unify2 env t1 t2
-    | (Tconstr _, Tvar _) when deep_occur t2 t1 ->
-        unify2 env t1 t2
-    | (Tvar _, _) ->
-        unify1_var !env t1 t2
-    | (_, Tvar _) ->
-        unify1_var !env t2 t1
-    | (Tunivar _, Tunivar _) ->
-        unify_univar t1 t2 !univar_pairs;
-        update_level !env t1.level t2;
-        link_type t1 t2
-    | (Tconstr (p1, [], a1), Tconstr (p2, [], a2))
-          when Path.same p1 p2 (* && actual_mode !env = Old *)
-            (* This optimization assumes that t1 does not expand to t2
-               (and conversely), so we fall back to the general case
-               when any of the types has a cached expansion. *)
-            && not (has_cached_expansion p1 !a1
-                 || has_cached_expansion p2 !a2) ->
-        update_level !env t1.level t2;
-        link_type t1 t2
-    | (Tconstr (p1, [], _), Tconstr (p2, [], _))
-      when Env.has_local_constraints !env
-      && is_newtype !env p1 && is_newtype !env p2 ->
-        (* Do not use local constraints more than necessary *)
-        begin try
-          let [@local] (<) ((a : int) ,(b : int)) (c,d) = 
-            a < c || (a = c && b < d) in 
-          if find_newtype_level !env p1 < find_newtype_level !env p2 then
-            unify env t1 (try_expand_once !env t2)
-          else
-            unify env (try_expand_once !env t1) t2
-        with Cannot_expand ->
-          unify2 env t1 t2
-        end
-    | _ ->
-        unify2 env t1 t2
-    end;
-    reset_trace_gadt_instances reset_tracing;
-  with Unify trace ->
-    reset_trace_gadt_instances reset_tracing;
-    raise (Unify ((t1, t2)::trace))
-
-and unify2 env t1 t2 =
-  (* Second step: expansion of abbreviations *)
-  (* Expansion may change the representative of the types. *)
-  ignore (expand_head_unif !env t1);
-  ignore (expand_head_unif !env t2);
-  let t1' = expand_head_unif !env t1 in
-  let t2' = expand_head_unif !env t2 in
-  let lv = Ext_pervasives.min_int t1'.level t2'.level in
-  update_level !env lv t2;
-  update_level !env lv t1;
-  if unify_eq t1' t2' then () else
-
-  let t1 = repr t1 and t2 = repr t2 in
-  if !trace_gadt_instances then begin
-    (* All types in chains already have the same ambiguity levels *)
-    let ilevel t =
-      match Env.gadt_instance_level !env t with None -> 0 | Some lv -> lv in
-    let lv1 = ilevel t1 and lv2 = ilevel t2 in
-    if lv1 > lv2 then Env.add_gadt_instance_chain !env lv1 t2 else
-    if lv2 > lv1 then Env.add_gadt_instance_chain !env lv2 t1
-  end;
-  if unify_eq t1 t1' || not (unify_eq t2 t2') then
-    unify3 env t1 t1' t2 t2'
-  else
-    try unify3 env t2 t2' t1 t1' with Unify trace ->
-      raise (Unify (List.map (fun (x, y) -> (y, x)) trace))
-
-and unify3 env t1 t1' t2 t2' =
-  (* Third step: truly unification *)
-  (* Assumes either [t1 == t1'] or [t2 != t2'] *)
-  let d1 = t1'.desc and d2 = t2'.desc in
-  let create_recursion = (t2 != t2') && (deep_occur t1' t2) in
-
-  begin match (d1, d2) with (* handle vars and univars specially *)
-    (Tunivar _, Tunivar _) ->
-      unify_univar t1' t2' !univar_pairs;
-      link_type t1' t2'
-  | (Tvar _, _) ->
-      occur !env t1' t2;
-      occur_univar !env t2;
-      link_type t1' t2;
-  | (_, Tvar _) ->
-      occur !env t2' t1;
-      occur_univar !env t1;
-      link_type t2' t1;
-  | (Tfield _, Tfield _) -> (* special case for GADTs *)
-      unify_fields env t1' t2'
-  | (Tconstr (Pident {name="function$"}, [tFun; _], _), Tarrow _) when !Config.uncurried = Uncurried ->
-      (* subtype: an uncurried function is cast to a curried one *)
-      unify2 env tFun t2
-  | _ ->
-    begin match !umode with
-    | Expression ->
-        occur !env t1' t2';
-        link_type t1' t2
-    | Pattern ->
-        add_type_equality t1' t2'
-    end;
-    try
-      begin match (d1, d2) with
-        (Tarrow (l1, t1, u1, c1), Tarrow (l2, t2, u2, c2)) when Asttypes.same_arg_label l1  l2 ||
-        (!umode = Pattern) &&
-        not (is_optional l1 || is_optional l2) ->
-          unify  env t1 t2; unify env  u1 u2;
-          begin match commu_repr c1, commu_repr c2 with
-            Clink r, c2 -> set_commu r c2
-          | c1, Clink r -> set_commu r c1
-          | _ -> ()
-          end
-      | (Ttuple tl1, Ttuple tl2) ->
-          unify_list env tl1 tl2
-      | (Tconstr (p1, tl1, _), Tconstr (p2, tl2, _)) when Path.same p1 p2 ->
-          if !umode = Expression || not !generate_equations then
-            unify_list env tl1 tl2
-          else if !assume_injective then
-            set_mode_pattern ~generate:true ~injective:false
-                             (fun () -> unify_list env tl1 tl2)
-          else if in_current_module p1 (* || in_pervasives p1 *)
-                  || List.exists (expands_to_datatype !env) [t1'; t1; t2] then
-            unify_list env tl1 tl2
-          else
-            let inj =
-              try List.map Variance.(mem Inj)
-                    (Env.find_type p1 !env).type_variance
-              with Not_found -> List.map (fun _ -> false) tl1
-            in
-            List.iter2
-              (fun i (t1, t2) ->
-                if i then unify env t1 t2 else
-                set_mode_pattern ~generate:false ~injective:false
-                  begin fun () ->
-                    let snap = snapshot () in
-                    try unify env t1 t2 with Unify _ ->
-                      backtrack snap;
-                      reify env t1; reify env t2
-                  end)
-              inj (List.combine tl1 tl2)
-      | (Tconstr (path,[],_),
-         Tconstr (path',[],_))
-        when is_instantiable !env path && is_instantiable !env path'
-        && !generate_equations ->
-          let [@local] (>) ((a:int),(b:int)) (c,d) = 
-            a > c || (a = c && b > d)
-          in 
-          let source, destination =
-            if find_newtype_level !env path > find_newtype_level !env path'
-            then  path , t2'
-            else  path', t1'
-          in
-          add_gadt_equation env source destination
-      | (Tconstr (path,[],_), _)
-        when is_instantiable !env path && !generate_equations ->
-          reify env t2';
-          add_gadt_equation env path t2'
-      | (_, Tconstr (path,[],_))
-        when is_instantiable !env path && !generate_equations ->
-          reify env t1';
-          add_gadt_equation env path t1'
-      | (Tconstr (_,_,_), _) | (_, Tconstr (_,_,_)) when !umode = Pattern ->
-          reify env t1';
-          reify env t2';
-          if !generate_equations then mcomp !env t1' t2'
-      | (Tobject (fi1, nm1), Tobject (fi2, _)) ->
-          unify_fields env fi1 fi2;
-          (* Type [t2'] may have been instantiated by [unify_fields] *)
-          (* XXX One should do some kind of unification... *)
-          begin match (repr t2').desc with
-            Tobject (_, {contents = Some (_, va::_)}) when
-              (match (repr va).desc with
-                Tvar _|Tunivar _|Tnil -> true | _ -> false) -> ()
-          | Tobject (_, nm2) -> set_name nm2 !nm1
-          | _ -> ()
-          end
-      | (Tvariant row1, Tvariant row2) ->
-          if !umode = Expression then
-            unify_row env row1 row2
-          else begin
-            let snap = snapshot () in
-            try unify_row env row1 row2
-            with Unify _ ->
-              backtrack snap;
-              reify env t1';
-              reify env t2';
-              if !generate_equations then mcomp !env t1' t2'
-          end
-      | (Tfield(f,kind,_,rem), Tnil) | (Tnil, Tfield(f,kind,_,rem)) ->
-          begin match field_kind_repr kind with
-            Fvar r when f <> dummy_method ->
-              set_kind r Fabsent;
-              if d2 = Tnil then unify env rem t2'
-              else unify env (newty2 rem.level Tnil) rem
-          | _      -> raise (Unify [])
-          end
-      | (Tnil, Tnil) ->
-          ()
-      | (Tpoly (t1, []), Tpoly (t2, [])) ->
-          unify env t1 t2
-      | (Tpoly (t1, tl1), Tpoly (t2, tl2)) ->
-          enter_poly !env univar_pairs t1 tl1 t2 tl2 (unify env)
-      | (Tpackage (p1, n1, tl1), Tpackage (p2, n2, tl2)) ->
-          begin try
-            unify_package !env (unify_list env)
-              t1.level p1 n1 tl1 t2.level p2 n2 tl2
-          with Not_found ->
-            if !umode = Expression then raise (Unify []);
-            List.iter (reify env) (tl1 @ tl2);
-            (* if !generate_equations then List.iter2 (mcomp !env) tl1 tl2 *)
-          end
-      | (_, _) ->
-          raise (Unify [])
-      end;
-      (* XXX Commentaires + changer "create_recursion"
-         ||| Comments + change "create_recursion" *)
-      if create_recursion then
-        match t2.desc with
-          Tconstr (p, tl, abbrev) ->
-            forget_abbrev abbrev p;
-            let t2'' = expand_head_unif !env t2 in
-            if not (closed_parameterized_type tl t2'') then
-              link_type (repr t2) (repr t2')
-        | _ ->
-            () (* t2 has already been expanded by update_level *)
-    with Unify trace ->
-      t1'.desc <- d1;
-      raise (Unify trace)
-  end
-
-and unify_list env tl1 tl2 =
-  if List.length tl1 <> List.length tl2 then
-    raise (Unify []);
-  List.iter2 (unify env) tl1 tl2
-
-(* Build a fresh row variable for unification *)
-and make_rowvar level use1 rest1 use2 rest2  =
-  let set_name ty name =
-    match ty.desc with
-      Tvar None -> log_type ty; ty.desc <- Tvar name
-    | _ -> ()
-  in
-  let name =
-    match rest1.desc, rest2.desc with
-      Tvar (Some _ as name1), Tvar (Some _ as name2) ->
-        if rest1.level <= rest2.level then name1 else name2
-    | Tvar (Some _ as name), _ ->
-        if use2 then set_name rest2 name; name
-    | _, Tvar (Some _ as name) ->
-        if use1 then set_name rest2 name; name
-    | _ -> None
-  in
-  if use1 then rest1 else
-  if use2 then rest2 else newvar2 ?name level
-
-and unify_fields env (ty1 : Types.type_expr) (ty2 : Types.type_expr) =          (* Optimization *)
-  let (fields1, rest1) = flatten_fields ty1
-  and (fields2, rest2) = flatten_fields ty2 in
-  let (pairs, miss1, miss2) = associate_fields fields1 fields2 in
-  let l1 = (repr ty1).level and l2 = (repr ty2).level in
-  let va = make_rowvar (Ext_pervasives.min_int l1 l2) (miss2=[]) rest1 (miss1=[]) rest2 in
-  let d1 = rest1.desc and d2 = rest2.desc in
-  try
-    unify env (build_fields l1 miss1 va) rest2;
-    unify env rest1 (build_fields l2 miss2 va);
-    List.iter
-      (fun (n, k1, t1, k2, t2) ->
-        unify_kind k1 k2;
-        try
-          if !trace_gadt_instances then update_level !env va.level t1;
-          unify env t1 t2
-        with Unify trace ->
-          raise (Unify ((newty (Tfield(n, k1, t1, newty Tnil)),
-                         newty (Tfield(n, k2, t2, newty Tnil)))::trace)))
-      pairs
-  with exn ->
-    log_type rest1; rest1.desc <- d1;
-    log_type rest2; rest2.desc <- d2;
-    raise exn
-
-and unify_kind k1 k2 =
-  let k1 = field_kind_repr k1 in
-  let k2 = field_kind_repr k2 in
-  if k1 == k2 then () else
-  match k1, k2 with
-    (Fvar r, (Fvar _ | Fpresent)) -> set_kind r k2
-  | (Fpresent, Fvar r)            -> set_kind r k1
-  | (Fpresent, Fpresent)          -> ()
-  | _                             -> assert false
-
-and unify_row env row1 row2 =
-  let row1 = row_repr row1 and row2 = row_repr row2 in
-  let rm1 = row_more row1 and rm2 = row_more row2 in
-  if unify_eq rm1 rm2 then () else
-  let r1, r2, pairs = merge_row_fields row1.row_fields row2.row_fields in
-  if not !Config.bs_only && (r1 <> [] && r2 <> []) then begin
-    (* pairs are the intersection, r1 , r2 should be disjoint *)
-    let ht = Hashtbl.create (List.length r1) in
-    List.iter (fun (l,_) -> Hashtbl.add ht (hash_variant l) l) r1;
-    List.iter
-      (fun (l,_) ->
-        try raise (Tags(l, Hashtbl.find ht (hash_variant l)))
-        with Not_found -> ())
-      r2
-  end;
-  let fixed1 = row_fixed row1 and fixed2 = row_fixed row2 in
-  let more =
-    if fixed1 then rm1 else
-    if fixed2 then rm2 else
-    newty2 (Ext_pervasives.min_int rm1.level rm2.level) (Tvar None) in
-  let fixed = fixed1 || fixed2
-  and closed = row1.row_closed || row2.row_closed in
-  let keep switch =
-    List.for_all
-      (fun (_,f1,f2) ->
-        let f1, f2 = switch f1 f2 in
-        row_field_repr f1 = Rabsent || row_field_repr f2 <> Rabsent)
-      pairs
-  in
-  let empty fields =
-    List.for_all (fun (_,f) -> row_field_repr f = Rabsent) fields in
-  (* Check whether we are going to build an empty type *)
-  if closed && (empty r1 || row2.row_closed) && (empty r2 || row1.row_closed)
-  && List.for_all
-      (fun (_,f1,f2) ->
-        row_field_repr f1 = Rabsent || row_field_repr f2 = Rabsent)
-      pairs
-  then raise (Unify [mkvariant [] true, mkvariant [] true]);
-  let name =
-    if row1.row_name <> None && (row1.row_closed || empty r2) &&
-      (not row2.row_closed || keep (fun f1 f2 -> f1, f2) && empty r1)
-    then row1.row_name
-    else if row2.row_name <> None && (row2.row_closed || empty r1) &&
-      (not row1.row_closed || keep (fun f1 f2 -> f2, f1) && empty r2)
-    then row2.row_name
-    else None
-  in
-  let row0 = {row_fields = []; row_more = more; row_bound = ();
-              row_closed = closed; row_fixed = fixed; row_name = name} in
-  let set_more row rest =
-    let rest =
-      if closed then
-        filter_row_fields row.row_closed rest
-      else rest in
-    if rest <> [] && (row.row_closed || row_fixed row)
-    || closed && row_fixed row && not row.row_closed then begin
-      let t1 = mkvariant [] true and t2 = mkvariant rest false in
-      raise (Unify [if row == row1 then (t1,t2) else (t2,t1)])
-    end;
-    (* The following test is not principal... should rather use Tnil *)
-    let rm = row_more row in
-    (*if !trace_gadt_instances && rm.desc = Tnil then () else*)
-    if !trace_gadt_instances then
-      update_level !env rm.level (newgenty (Tvariant row));
-    if row_fixed row then
-      if more == rm then () else
-      if is_Tvar rm then link_type rm more else unify env rm more
-    else
-      let ty = newgenty (Tvariant {row0 with row_fields = rest}) in
-      update_level !env rm.level ty;
-      link_type rm ty
-  in
-  let md1 = rm1.desc and md2 = rm2.desc in
-  begin try
-    set_more row2 r1;
-    set_more row1 r2;
-    List.iter
-      (fun (l,f1,f2) ->
-        try unify_row_field env fixed1 fixed2 more l f1 f2
-        with Unify trace ->
-          raise (Unify ((mkvariant [l,f1] true,
-                         mkvariant [l,f2] true) :: trace)))
-      pairs;
-    if static_row row1 then begin
-      let rm = row_more row1 in
-      if is_Tvar rm then link_type rm (newty2 rm.level Tnil)
-    end
-  with exn ->
-    log_type rm1; rm1.desc <- md1; log_type rm2; rm2.desc <- md2; raise exn
-  end
-
-and unify_row_field env fixed1 fixed2 more l f1 f2 =
-  let f1 = row_field_repr f1 and f2 = row_field_repr f2 in
-  if f1 == f2 then () else
-  match f1, f2 with
-    Rpresent(Some t1), Rpresent(Some t2) -> unify env t1 t2
-  | Rpresent None, Rpresent None -> ()
-  | Reither(c1, tl1, m1, e1), Reither(c2, tl2, m2, e2) ->
-      if e1 == e2 then () else
-      if (fixed1 || fixed2) && not (c1 || c2)
-      && List.length tl1 = List.length tl2 then begin
-        (* PR#7496 *)
-        let f = Reither (c1 || c2, [], m1 || m2, ref None) in
-        set_row_field e1 f; set_row_field e2 f;
-        List.iter2 (unify env) tl1 tl2
-      end
-      else let redo =
-        not !passive_variants &&
-        (m1 || m2 || fixed1 || fixed2 ||
-         !rigid_variants && (List.length tl1 = 1 || List.length tl2 = 1)) &&
-        begin match tl1 @ tl2 with [] -> false
-        | t1 :: tl ->
-            if c1 || c2 then raise (Unify []);
-            List.iter (unify env t1) tl;
-            !e1 <> None || !e2 <> None
-        end in
-      if redo then unify_row_field env fixed1 fixed2 more l f1 f2 else
-      let tl1 = List.map repr tl1 and tl2 = List.map repr tl2 in
-      let rec remq tl = function [] -> []
-        | ty :: tl' ->
-            if List.memq ty tl then remq tl tl' else ty :: remq tl tl'
-      in
-      let tl2' = remq tl2 tl1 and tl1' = remq tl1 tl2 in
-      (* PR#6744 *)
-      let split_univars =
-        List.partition
-          (fun ty -> try occur_univar !env ty; true with Unify _ -> false) in
-      let (tl1',tlu1) = split_univars tl1'
-      and (tl2',tlu2) = split_univars tl2' in
-      begin match tlu1, tlu2 with
-        [], [] -> ()
-      | (tu1::tlu1), _ :: _ ->
-          (* Attempt to merge all the types containing univars *)
-          if not !passive_variants then
-          List.iter (unify env tu1) (tlu1@tlu2)
-      | (tu::_, []) | ([], tu::_) -> occur_univar !env tu
-      end;
-      (* Is this handling of levels really principal? *)
-      List.iter (update_level !env (repr more).level) (tl1' @ tl2');
-      let e = ref None in
-      let f1' = Reither(c1 || c2, tl1', m1 || m2, e)
-      and f2' = Reither(c1 || c2, tl2', m1 || m2, e) in
-      set_row_field e1 f1'; set_row_field e2 f2';
-  | Reither(_, _, false, e1), Rabsent when not fixed1 -> set_row_field e1 f2
-  | Rabsent, Reither(_, _, false, e2) when not fixed2 -> set_row_field e2 f1
-  | Rabsent, Rabsent -> ()
-  | Reither(false, tl, _, e1), Rpresent(Some t2) when not fixed1 ->
-      set_row_field e1 f2;
-      update_level !env (repr more).level t2;
-      (try List.iter (fun t1 -> unify env t1 t2) tl
-      with exn -> e1 := None; raise exn)
-  | Rpresent(Some t1), Reither(false, tl, _, e2) when not fixed2 ->
-      set_row_field e2 f1;
-      update_level !env (repr more).level t1;
-      (try List.iter (unify env t1) tl
-      with exn -> e2 := None; raise exn)
-  | Reither(true, [], _, e1), Rpresent None when not fixed1 ->
-      set_row_field e1 f2
-  | Rpresent None, Reither(true, [], _, e2) when not fixed2 ->
-      set_row_field e2 f1
-  | _ -> raise (Unify [])
-
-
-let unify env ty1 ty2 =
-  let snap = Btype.snapshot () in
-  try
-    unify env ty1 ty2
-  with
-    Unify trace ->
-      undo_compress snap;
-      raise (Unify (expand_trace !env trace))
-  | Recursive_abbrev ->
-      undo_compress snap;
-      raise (Unification_recursive_abbrev (expand_trace !env [(ty1,ty2)]))
-
-let unify_gadt ~newtype_level:lev (env:Env.t ref) ty1 ty2 =
-  try
-    univar_pairs := [];
-    newtype_level := Some lev;
-    set_mode_pattern ~generate:true ~injective:true
-                     (fun () -> unify env ty1 ty2);
-    newtype_level := None;
-    TypePairs.clear unify_eq_set;
-  with e ->
-    newtype_level := None;
-    TypePairs.clear unify_eq_set;
-    raise e
-
-let unify_var env t1 t2 =
-  let t1 = repr t1 and t2 = repr t2 in
-  if t1 == t2 then () else
-  match t1.desc, t2.desc with
-    Tvar _, Tconstr _ when deep_occur t1 t2 ->
-      unify (ref env) t1 t2
-  | Tvar _, _ ->
-      let reset_tracing = check_trace_gadt_instances env in
-      begin try
-        occur env t1 t2;
-        update_level env t1.level t2;
-        link_type t1 t2;
-        reset_trace_gadt_instances reset_tracing;
-      with Unify trace ->
-        reset_trace_gadt_instances reset_tracing;
-        let expanded_trace = expand_trace env ((t1,t2)::trace) in
-        raise (Unify expanded_trace)
-      end
-  | _ ->
-      unify (ref env) t1 t2
-
-let _ = unify' := unify_var
-
-let unify_pairs env ty1 ty2 pairs =
-  univar_pairs := pairs;
-  unify env ty1 ty2
-
-let unify env ty1 ty2 =
-  unify_pairs (ref env) ty1 ty2 []
-
-
-
-(**** Special cases of unification ****)
-
-let expand_head_trace env t =
-  let reset_tracing = check_trace_gadt_instances env in
-  let t = expand_head_unif env t in
-  reset_trace_gadt_instances reset_tracing;
-  t
-
-(*
-   Unify [t] and [l:'a -> 'b]. Return ['a] and ['b].
-   In label mode, label mismatch is accepted when
-   (1) the requested label is ""
-   (2) the original label is not optional
-*)
-
-let filter_arrow env t l =
-  let t = expand_head_trace env t in
-  match t.desc with
-    Tvar _ ->
-      let lv = t.level in
-      let t1 = newvar2 lv and t2 = newvar2 lv in
-      let t' = newty2 lv (Tarrow (l, t1, t2, Cok)) in
-      link_type t t';
-      (t1, t2)
-  | Tarrow(l', t1, t2, _)
-    when Asttypes.same_arg_label l  l'  ->
-      (t1, t2)
-  | _ ->
-      raise (Unify [])
-
-(* Used by [filter_method]. *)
-let rec filter_method_field env name priv ty =
-  let ty = expand_head_trace env ty in
-  match ty.desc with
-    Tvar _ ->
-      let level = ty.level in
-      let ty1 = newvar2 level and ty2 = newvar2 level in
-      let ty' = newty2 level (Tfield (name,
-                                      begin match priv with
-                                        Private -> Fvar (ref None)
-                                      | Public  -> Fpresent
-                                      end,
-                                      ty1, ty2))
-      in
-      link_type ty ty';
-      ty1
-  | Tfield(n, kind, ty1, ty2) ->
-      let kind = field_kind_repr kind in
-      if (n = name) && (kind <> Fabsent) then begin
-        if priv = Public then
-          unify_kind kind Fpresent;
-        ty1
-      end else
-        filter_method_field env name priv ty2
-  | _ ->
-      raise (Unify [])
-
-(* Unify [ty] and [< name : 'a; .. >]. Return ['a]. *)
-let filter_method env name priv ty =
-  let ty = expand_head_trace env ty in
-  match ty.desc with
-    Tvar _ ->
-      let ty1 = newvar () in
-      let ty' = newobj ty1 in
-      update_level env ty.level ty';
-      link_type ty ty';
-      filter_method_field env name priv ty1
-  | Tobject(f, _) ->
-      filter_method_field env name priv f
-  | _ ->
-      raise (Unify [])
-
-let check_filter_method env name priv ty =
-  ignore(filter_method env name priv ty)
-
-let filter_self_method env lab priv meths ty =
-  let ty' = filter_method env lab priv ty in
-  try
-    Meths.find lab !meths
-  with Not_found ->
-    let pair = (Ident.create lab, ty') in
-    meths := Meths.add lab pair !meths;
-    pair
-
-
-                        (***********************************)
-                        (*  Matching between type schemes  *)
-                        (***********************************)
-
-(*
-   Update the level of [ty]. First check that the levels of generic
-   variables from the subject are not lowered.
-*)
-let moregen_occur env level ty =
-  let rec occur ty =
-    let ty = repr ty in
-    if ty.level > level then begin
-      if is_Tvar ty && ty.level >= generic_level - 1 then raise Occur;
-      ty.level <- pivot_level - ty.level;
-      match ty.desc with
-        Tvariant row when static_row row ->
-          iter_row occur row
-      | _ ->
-          iter_type_expr occur ty
-    end
-  in
-  begin try
-    occur ty; unmark_type ty
-  with Occur ->
-    unmark_type ty; raise (Unify [])
-  end;
-  (* also check for free univars *)
-  occur_univar env ty;
-  update_level env level ty
-
-let may_instantiate inst_nongen t1 =
-  if inst_nongen then t1.level <> generic_level - 1
-                 else t1.level =  generic_level
-
-let rec moregen inst_nongen type_pairs env t1 t2 =
-  if t1 == t2 then () else
-  let t1 = repr t1 in
-  let t2 = repr t2 in
-  if t1 == t2 then () else
-
-  try
-    match (t1.desc, t2.desc) with
-      (Tvar _, _) when may_instantiate inst_nongen t1 ->
-        moregen_occur env t1.level t2;
-        occur env t1 t2;
-        link_type t1 t2
-    | (Tconstr (p1, [], _), Tconstr (p2, [], _)) when Path.same p1 p2 ->
-        ()
-    | _ ->
-        let t1' = expand_head env t1 in
-        let t2' = expand_head env t2 in
-        (* Expansion may have changed the representative of the types... *)
-        let t1' = repr t1' and t2' = repr t2' in
-        if t1' == t2' then () else
-        begin try
-          TypePairs.find type_pairs (t1', t2')
-        with Not_found ->
-          TypePairs.add type_pairs (t1', t2') ();
-          match (t1'.desc, t2'.desc) with
-            (Tvar _, _) when may_instantiate inst_nongen t1' ->
-              moregen_occur env t1'.level t2;
-              link_type t1' t2
-          | (Tarrow (l1, t1, u1, _), Tarrow (l2, t2, u2, _)) when Asttypes.same_arg_label l1  l2
-            ->
-              moregen inst_nongen type_pairs env t1 t2;
-              moregen inst_nongen type_pairs env u1 u2
-          | (Ttuple tl1, Ttuple tl2) ->
-              moregen_list inst_nongen type_pairs env tl1 tl2
-          | (Tconstr (p1, tl1, _), Tconstr (p2, tl2, _))
-                when Path.same p1 p2 ->
-              moregen_list inst_nongen type_pairs env tl1 tl2
-          | (Tpackage (p1, n1, tl1), Tpackage (p2, n2, tl2)) ->
-              begin try
-                unify_package env (moregen_list inst_nongen type_pairs env)
-                  t1'.level p1 n1 tl1 t2'.level p2 n2 tl2
-              with Not_found -> raise (Unify [])
-              end
-          | (Tvariant row1, Tvariant row2) ->
-              moregen_row inst_nongen type_pairs env row1 row2
-          | (Tobject (fi1, _nm1), Tobject (fi2, _nm2)) ->
-              moregen_fields inst_nongen type_pairs env fi1 fi2
-          | (Tfield _, Tfield _) ->           (* Actually unused *)
-              moregen_fields inst_nongen type_pairs env t1' t2'
-          | (Tnil, Tnil) ->
-              ()
-          | (Tpoly (t1, []), Tpoly (t2, [])) ->
-              moregen inst_nongen type_pairs env t1 t2
-          | (Tpoly (t1, tl1), Tpoly (t2, tl2)) ->
-              enter_poly env univar_pairs t1 tl1 t2 tl2
-                (moregen inst_nongen type_pairs env)
-          | (Tunivar _, Tunivar _) ->
-              unify_univar t1' t2' !univar_pairs
-          | (_, _) ->
-              raise (Unify [])
-        end
-  with Unify trace ->
-    raise (Unify ((t1, t2)::trace))
-
-and moregen_list inst_nongen type_pairs env tl1 tl2 =
-  if List.length tl1 <> List.length tl2 then
-    raise (Unify []);
-  List.iter2 (moregen inst_nongen type_pairs env) tl1 tl2
-
-and moregen_fields inst_nongen type_pairs env ty1 ty2 =
-  let (fields1, rest1) = flatten_fields ty1
-  and (fields2, rest2) = flatten_fields ty2 in
-  let (pairs, miss1, miss2) = associate_fields fields1 fields2 in
-  if miss1 <> [] then raise (Unify []);
-  moregen inst_nongen type_pairs env rest1
-    (build_fields (repr ty2).level miss2 rest2);
-  List.iter
-    (fun (n, k1, t1, k2, t2) ->
-       moregen_kind k1 k2;
-       try moregen inst_nongen type_pairs env t1 t2 with Unify trace ->
-         raise (Unify ((newty (Tfield(n, k1, t1, rest2)),
-                        newty (Tfield(n, k2, t2, rest2)))::trace)))
-    pairs
-
-and moregen_kind k1 k2 =
-  let k1 = field_kind_repr k1 in
-  let k2 = field_kind_repr k2 in
-  if k1 == k2 then () else
-  match k1, k2 with
-    (Fvar r, (Fvar _ | Fpresent))  -> set_kind r k2
-  | (Fpresent, Fpresent)           -> ()
-  | _                              -> raise (Unify [])
-
-and moregen_row inst_nongen type_pairs env row1 row2 =
-  let row1 = row_repr row1 and row2 = row_repr row2 in
-  let rm1 = repr row1.row_more and rm2 = repr row2.row_more in
-  if rm1 == rm2 then () else
-  let may_inst =
-    is_Tvar rm1 && may_instantiate inst_nongen rm1 || rm1.desc = Tnil in
-  let r1, r2, pairs = merge_row_fields row1.row_fields row2.row_fields in
-  let r1, r2 =
-    if row2.row_closed then
-      filter_row_fields may_inst r1, filter_row_fields false r2
-    else r1, r2
-  in
-  if r1 <> [] || row1.row_closed && (not row2.row_closed || r2 <> [])
-  then raise (Unify []);
-  begin match rm1.desc, rm2.desc with
-    Tunivar _, Tunivar _ ->
-      unify_univar rm1 rm2 !univar_pairs
-  | Tunivar _, _ | _, Tunivar _ ->
-      raise (Unify [])
-  | _ when static_row row1 -> ()
-  | _ when may_inst ->
-      let ext =
-        newgenty (Tvariant {row2 with row_fields = r2; row_name = None})
-      in
-      moregen_occur env rm1.level ext;
-      link_type rm1 ext
-  | Tconstr _, Tconstr _ ->
-      moregen inst_nongen type_pairs env rm1 rm2
-  | _ -> raise (Unify [])
-  end;
-  List.iter
-    (fun (_l,f1,f2) ->
-      let f1 = row_field_repr f1 and f2 = row_field_repr f2 in
-      if f1 == f2 then () else
-      match f1, f2 with
-        Rpresent(Some t1), Rpresent(Some t2) ->
-          moregen inst_nongen type_pairs env t1 t2
-      | Rpresent None, Rpresent None -> ()
-      | Reither(false, tl1, _, e1), Rpresent(Some t2) when may_inst ->
-          set_row_field e1 f2;
-          List.iter (fun t1 -> moregen inst_nongen type_pairs env t1 t2) tl1
-      | Reither(c1, tl1, _, e1), Reither(c2, tl2, m2, e2) ->
-          if e1 != e2 then begin
-            if c1 && not c2 then raise(Unify []);
-            set_row_field e1 (Reither (c2, [], m2, e2));
-            if List.length tl1 = List.length tl2 then
-              List.iter2 (moregen inst_nongen type_pairs env) tl1 tl2
-            else match tl2 with
-              t2 :: _ ->
-                List.iter (fun t1 -> moregen inst_nongen type_pairs env t1 t2)
-                  tl1
-            | [] ->
-                if tl1 <> [] then raise (Unify [])
-          end
-      | Reither(true, [], _, e1), Rpresent None when may_inst ->
-          set_row_field e1 f2
-      | Reither(_, _, _, e1), Rabsent when may_inst ->
-          set_row_field e1 f2
-      | Rabsent, Rabsent -> ()
-      | _ -> raise (Unify []))
-    pairs
-
-(* Must empty univar_pairs first *)
-let moregen inst_nongen type_pairs env patt subj =
-  univar_pairs := [];
-  moregen inst_nongen type_pairs env patt subj
-
-(*
-   Non-generic variable can be instantiated only if [inst_nongen] is
-   true. So, [inst_nongen] should be set to false if the subject might
-   contain non-generic variables (and we do not want them to be
-   instantiated).
-   Usually, the subject is given by the user, and the pattern
-   is unimportant.  So, no need to propagate abbreviations.
-*)
-let moregeneral env inst_nongen pat_sch subj_sch =
-  let old_level = !current_level in
-  current_level := generic_level - 1;
-  (*
-     Generic variables are first duplicated with [instance].  So,
-     their levels are lowered to [generic_level - 1].  The subject is
-     then copied with [duplicate_type].  That way, its levels won't be
-     changed.
-  *)
-  let subj = duplicate_type (instance env subj_sch) in
-  current_level := generic_level;
-  (* Duplicate generic variables *)
-  let patt = instance env pat_sch in
-  let res =
-    try moregen inst_nongen (TypePairs.create 13) env patt subj; true with
-      Unify _ -> false
-  in
-  current_level := old_level;
-  res
-
-
-(* Alternative approach: "rigidify" a type scheme,
-   and check validity after unification *)
-(* Simpler, no? *)
-
-let rec rigidify_rec vars ty =
-  let ty = repr ty in
-  if ty.level >= lowest_level then begin
-    ty.level <- pivot_level - ty.level;
-    match ty.desc with
-    | Tvar _ ->
-        if not (List.memq ty !vars) then vars := ty :: !vars
-    | Tvariant row ->
-        let row = row_repr row in
-        let more = repr row.row_more in
-        if is_Tvar more && not (row_fixed row) then begin
-          let more' = newty2 more.level more.desc in
-          let row' = {row with row_fixed=true; row_fields=[]; row_more=more'}
-          in link_type more (newty2 ty.level (Tvariant row'))
-        end;
-        iter_row (rigidify_rec vars) row;
-        (* only consider the row variable if the variant is not static *)
-        if not (static_row row) then rigidify_rec vars (row_more row)
-    | _ ->
-        iter_type_expr (rigidify_rec vars) ty
-  end
-
-let rigidify ty =
-  let vars = ref [] in
-  rigidify_rec vars ty;
-  unmark_type ty;
-  !vars
-
-let all_distinct_vars env vars =
-  let tyl = ref [] in
-  List.for_all
-    (fun ty ->
-      let ty = expand_head env ty in
-      if List.memq ty !tyl then false else
-      (tyl := ty :: !tyl; is_Tvar ty))
-    vars
-
-let matches env ty ty' =
-  let snap = snapshot () in
-  let vars = rigidify ty in
-  cleanup_abbrev ();
-  let ok =
-    try unify env ty ty'; all_distinct_vars env vars
-    with Unify _ -> false
-  in
-  backtrack snap;
-  ok
-
-
-                 (*********************************************)
-                 (*  Equivalence between parameterized types  *)
-                 (*********************************************)
-
-let expand_head_rigid env ty =
-  let old = !rigid_variants in
-  rigid_variants := true;
-  let ty' = expand_head env ty in
-  rigid_variants := old; ty'
-
-let normalize_subst subst =
-  if List.exists
-      (function {desc=Tlink _}, _ | _, {desc=Tlink _} -> true | _ -> false)
-      !subst
-  then subst := List.map (fun (t1,t2) -> repr t1, repr t2) !subst
-
-let rec eqtype rename type_pairs subst env t1 t2 =
-  if t1 == t2 then () else
-  let t1 = repr t1 in
-  let t2 = repr t2 in
-  if t1 == t2 then () else
-
-  try
-    match (t1.desc, t2.desc) with
-      (Tvar _, Tvar _) when rename ->
-        begin try
-          normalize_subst subst;
-          if List.assq t1 !subst != t2 then raise (Unify [])
-        with Not_found ->
-          if List.exists (fun (_, t) -> t == t2) !subst then raise (Unify []);
-          subst := (t1, t2) :: !subst
-        end
-    | (Tconstr (p1, [], _), Tconstr (p2, [], _)) when Path.same p1 p2 ->
-        ()
-    | _ ->
-        let t1' = expand_head_rigid env t1 in
-        let t2' = expand_head_rigid env t2 in
-        (* Expansion may have changed the representative of the types... *)
-        let t1' = repr t1' and t2' = repr t2' in
-        if t1' == t2' then () else
-        begin try
-          TypePairs.find type_pairs (t1', t2')
-        with Not_found ->
-          TypePairs.add type_pairs (t1', t2') ();
-          match (t1'.desc, t2'.desc) with
-            (Tvar _, Tvar _) when rename ->
-              begin try
-                normalize_subst subst;
-                if List.assq t1' !subst != t2' then raise (Unify [])
-              with Not_found ->
-                if List.exists (fun (_, t) -> t == t2') !subst
-                then raise (Unify []);
-                subst := (t1', t2') :: !subst
-              end
-          | (Tarrow (l1, t1, u1, _), Tarrow (l2, t2, u2, _)) when Asttypes.same_arg_label l1 l2
-            ->
-              eqtype rename type_pairs subst env t1 t2;
-              eqtype rename type_pairs subst env u1 u2;
-          | (Ttuple tl1, Ttuple tl2) ->
-              eqtype_list rename type_pairs subst env tl1 tl2
-          | (Tconstr (p1, tl1, _), Tconstr (p2, tl2, _))
-                when Path.same p1 p2 ->
-              eqtype_list rename type_pairs subst env tl1 tl2
-          | (Tpackage (p1, n1, tl1), Tpackage (p2, n2, tl2)) ->
-              begin try
-                unify_package env (eqtype_list rename type_pairs subst env)
-                  t1'.level p1 n1 tl1 t2'.level p2 n2 tl2
-              with Not_found -> raise (Unify [])
-              end
-          | (Tvariant row1, Tvariant row2) ->
-              eqtype_row rename type_pairs subst env row1 row2
-          | (Tobject (fi1, _nm1), Tobject (fi2, _nm2)) ->
-              eqtype_fields rename type_pairs subst env fi1 fi2
-          | (Tfield _, Tfield _) ->       (* Actually unused *)
-              eqtype_fields rename type_pairs subst env t1' t2'
-          | (Tnil, Tnil) ->
-              ()
-          | (Tpoly (t1, []), Tpoly (t2, [])) ->
-              eqtype rename type_pairs subst env t1 t2
-          | (Tpoly (t1, tl1), Tpoly (t2, tl2)) ->
-              enter_poly env univar_pairs t1 tl1 t2 tl2
-                (eqtype rename type_pairs subst env)
-          | (Tunivar _, Tunivar _) ->
-              unify_univar t1' t2' !univar_pairs
-          | (_, _) ->
-              raise (Unify [])
-        end
-  with Unify trace ->
-    raise (Unify ((t1, t2)::trace))
-
-and eqtype_list rename type_pairs subst env tl1 tl2 =
-  if List.length tl1 <> List.length tl2 then
-    raise (Unify []);
-  List.iter2 (eqtype rename type_pairs subst env) tl1 tl2
-
-and eqtype_fields rename type_pairs subst env ty1 ty2 : unit =
-  let (fields1, rest1) = flatten_fields ty1 in
-  let (fields2, rest2) = flatten_fields ty2 in
-  (* First check if same row => already equal *)
-  let same_row =
-    rest1 == rest2 || TypePairs.mem type_pairs (rest1,rest2) ||
-    (rename && List.mem (rest1, rest2) !subst)
-  in
-  if same_row then () else
-  (* Try expansion, needed when called from Includecore.type_manifest *)
-  match expand_head_rigid env rest2 with
-    {desc=Tobject(ty2,_)} -> eqtype_fields rename type_pairs subst env ty1 ty2
-  | _ ->
-  let (pairs, miss1, miss2) = associate_fields fields1 fields2 in
-  eqtype rename type_pairs subst env rest1 rest2;
-  if (miss1 <> []) || (miss2 <> []) then raise (Unify []);
-  List.iter
-    (function (n, k1, t1, k2, t2) ->
-       eqtype_kind k1 k2;
-       try eqtype rename type_pairs subst env t1 t2 with Unify trace ->
-         raise (Unify ((newty (Tfield(n, k1, t1, rest2)),
-                        newty (Tfield(n, k2, t2, rest2)))::trace)))
-    pairs
-
-and eqtype_kind k1 k2 =
-  let k1 = field_kind_repr k1 in
-  let k2 = field_kind_repr k2 in
-  match k1, k2 with
-    (Fvar _, Fvar _)
-  | (Fpresent, Fpresent) -> ()
-  | _                    -> raise (Unify [])
-
-and eqtype_row rename type_pairs subst env row1 row2 =
-  (* Try expansion, needed when called from Includecore.type_manifest *)
-  match expand_head_rigid env (row_more row2) with
-    {desc=Tvariant row2} -> eqtype_row rename type_pairs subst env row1 row2
-  | _ ->
-  let row1 = row_repr row1 and row2 = row_repr row2 in
-  let r1, r2, pairs = merge_row_fields row1.row_fields row2.row_fields in
-  if row1.row_closed <> row2.row_closed
-  || not row1.row_closed && (r1 <> [] || r2 <> [])
-  || filter_row_fields false (r1 @ r2) <> []
-  then raise (Unify []);
-  if not (static_row row1) then
-    eqtype rename type_pairs subst env row1.row_more row2.row_more;
-  List.iter
-    (fun (_,f1,f2) ->
-      match row_field_repr f1, row_field_repr f2 with
-        Rpresent(Some t1), Rpresent(Some t2) ->
-          eqtype rename type_pairs subst env t1 t2
-      | Reither(c1, [], _, _), Reither(c2, [], _, _) when c1 = c2 ->
-          ()
-      | Reither(c1, t1::tl1, _, _), Reither(c2, t2::tl2, _, _) when c1 = c2 ->
-          eqtype rename type_pairs subst env t1 t2;
-          if List.length tl1 = List.length tl2 then
-            (* if same length allow different types (meaning?) *)
-            List.iter2 (eqtype rename type_pairs subst env) tl1 tl2
-          else begin
-            (* otherwise everything must be equal *)
-            List.iter (eqtype rename type_pairs subst env t1) tl2;
-            List.iter (fun t1 -> eqtype rename type_pairs subst env t1 t2) tl1
-          end
-      | Rpresent None, Rpresent None -> ()
-      | Rabsent, Rabsent -> ()
-      | _ -> raise (Unify []))
-    pairs
-
-(* Must empty univar_pairs first *)
-let eqtype_list rename type_pairs subst env tl1 tl2 =
-  univar_pairs := [];
-  let snap = Btype.snapshot () in
-  try eqtype_list rename type_pairs subst env tl1 tl2; backtrack snap
-  with exn -> backtrack snap; raise exn
-
-let eqtype rename type_pairs subst env t1 t2 =
-  eqtype_list rename type_pairs subst env [t1] [t2]
-
-(* Two modes: with or without renaming of variables *)
-let equal env rename tyl1 tyl2 =
-  try
-    eqtype_list rename (TypePairs.create 11) (ref []) env tyl1 tyl2; true
-  with
-    Unify _ -> false
-
-
-                          (*************************)
-                          (*  Class type matching  *)
-                          (*************************)
-
-
-type class_match_failure =
-    CM_Virtual_class
-  | CM_Parameter_arity_mismatch of int * int
-  | CM_Type_parameter_mismatch of Env.t * (type_expr * type_expr) list
-  | CM_Class_type_mismatch of Env.t * class_type * class_type
-  | CM_Parameter_mismatch of Env.t * (type_expr * type_expr) list
-  | CM_Val_type_mismatch of string * Env.t * (type_expr * type_expr) list
-  | CM_Meth_type_mismatch of string * Env.t * (type_expr * type_expr) list
-  | CM_Non_mutable_value of string
-  | CM_Non_concrete_value of string
-  | CM_Missing_value of string
-  | CM_Missing_method of string
-  | CM_Hide_public of string
-  | CM_Hide_virtual of string * string
-  | CM_Public_method of string
-  | CM_Private_method of string
-  | CM_Virtual_method of string
-
-exception Failure of class_match_failure list
-
-let rec moregen_clty trace type_pairs env cty1 cty2 =
-  try
-    match cty1, cty2 with
-      Cty_constr (_, _, cty1), _ ->
-        moregen_clty true type_pairs env cty1 cty2
-    | _, Cty_constr (_, _, cty2) ->
-        moregen_clty true type_pairs env cty1 cty2
-    | Cty_arrow (l1, ty1, cty1'), Cty_arrow (l2, ty2, cty2') when Asttypes.same_arg_label l1  l2 ->
-        begin try moregen true type_pairs env ty1 ty2 with Unify trace ->
-          raise (Failure [CM_Parameter_mismatch (env, expand_trace env trace)])
-        end;
-        moregen_clty false type_pairs env cty1' cty2'
-    | Cty_signature sign1, Cty_signature sign2 ->
-        let ty1 = object_fields (repr sign1.csig_self) in
-        let ty2 = object_fields (repr sign2.csig_self) in
-        let (fields1, _rest1) = flatten_fields ty1
-        and (fields2, _rest2) = flatten_fields ty2 in
-        let (pairs, _miss1, _miss2) = associate_fields fields1 fields2 in
-        List.iter
-          (fun (lab, _k1, t1, _k2, t2) ->
-            begin try moregen true type_pairs env t1 t2 with Unify trace ->
-              raise (Failure [CM_Meth_type_mismatch
-                                 (lab, env, expand_trace env trace)])
-           end)
-        pairs;
-      Vars.iter
-        (fun lab (_mut, _v, ty) ->
-           let (_mut', _v', ty') = Vars.find lab sign1.csig_vars in
-           try moregen true type_pairs env ty' ty with Unify trace ->
-             raise (Failure [CM_Val_type_mismatch
-                                (lab, env, expand_trace env trace)]))
-        sign2.csig_vars
-  | _ ->
-      raise (Failure [])
-  with
-    Failure error when trace || error = [] ->
-      raise (Failure (CM_Class_type_mismatch (env, cty1, cty2)::error))
-
-let match_class_types ?(trace=true) env pat_sch subj_sch =
-  let type_pairs = TypePairs.create 53 in
-  let old_level = !current_level in
-  current_level := generic_level - 1;
-  (*
-     Generic variables are first duplicated with [instance].  So,
-     their levels are lowered to [generic_level - 1].  The subject is
-     then copied with [duplicate_type].  That way, its levels won't be
-     changed.
-  *)
-  let (_, subj_inst) = instance_class [] subj_sch in
-  let subj = duplicate_class_type subj_inst in
-  current_level := generic_level;
-  (* Duplicate generic variables *)
-  let (_, patt) = instance_class [] pat_sch in
-  let res =
-    let sign1 = signature_of_class_type patt in
-    let sign2 = signature_of_class_type subj in
-    let t1 = repr sign1.csig_self in
-    let t2 = repr sign2.csig_self in
-    TypePairs.add type_pairs (t1, t2) ();
-    let (fields1, rest1) = flatten_fields (object_fields t1)
-    and (fields2, rest2) = flatten_fields (object_fields t2) in
-    let (pairs, miss1, miss2) = associate_fields fields1 fields2 in
-    let error =
-      List.fold_right
-        (fun (lab, k, _) err ->
-           let err =
-             let k = field_kind_repr k in
-             begin match k with
-               Fvar r -> set_kind r Fabsent; err
-             | _      -> CM_Hide_public lab::err
-             end
-           in
-           if Concr.mem lab sign1.csig_concr then err
-           else CM_Hide_virtual ("method", lab) :: err)
-        miss1 []
-    in
-    let missing_method = List.map (fun (m, _, _) -> m) miss2 in
-    let error =
-      (List.map (fun m -> CM_Missing_method m) missing_method) @ error
-    in
-    (* Always succeeds *)
-    moregen true type_pairs env rest1 rest2;
-    let error =
-      List.fold_right
-        (fun (lab, k1, _t1, k2, _t2) err ->
-           try moregen_kind k1 k2; err with
-             Unify _ -> CM_Public_method lab::err)
-        pairs error
-    in
-    let error =
-      Vars.fold
-        (fun lab (mut, vr, _ty) err ->
-          try
-            let (mut', vr', _ty') = Vars.find lab sign1.csig_vars in
-            if mut = Mutable && mut' <> Mutable then
-              CM_Non_mutable_value lab::err
-            else if vr = Concrete && vr' <> Concrete then
-              CM_Non_concrete_value lab::err
-            else
-              err
-          with Not_found ->
-            CM_Missing_value lab::err)
-        sign2.csig_vars error
-    in
-    let error =
-      Vars.fold
-        (fun lab (_,vr,_) err ->
-          if vr = Virtual && not (Vars.mem lab sign2.csig_vars) then
-            CM_Hide_virtual ("instance variable", lab) :: err
-          else err)
-        sign1.csig_vars error
-    in
-    let error =
-      List.fold_right
-        (fun e l ->
-           if List.mem e missing_method then l else CM_Virtual_method e::l)
-        (Concr.elements (Concr.diff sign2.csig_concr sign1.csig_concr))
-        error
-    in
-    match error with
-      [] ->
-        begin try
-          moregen_clty trace type_pairs env patt subj;
-          []
-        with
-          Failure r -> r
-        end
-    | error ->
-        CM_Class_type_mismatch (env, patt, subj)::error
-  in
-  current_level := old_level;
-  res
-
-let rec equal_clty trace type_pairs subst env cty1 cty2 =
-  try
-    match cty1, cty2 with
-      Cty_constr (_, _, cty1), Cty_constr (_, _, cty2) ->
-        equal_clty true type_pairs subst env cty1 cty2
-    | Cty_constr (_, _, cty1), _ ->
-        equal_clty true type_pairs subst env cty1 cty2
-    | _, Cty_constr (_, _, cty2) ->
-        equal_clty true type_pairs subst env cty1 cty2
-    | Cty_arrow (l1, ty1, cty1'), Cty_arrow (l2, ty2, cty2') when Asttypes.same_arg_label l1 l2 ->
-        begin try eqtype true type_pairs subst env ty1 ty2 with Unify trace ->
-          raise (Failure [CM_Parameter_mismatch (env, expand_trace env trace)])
-        end;
-        equal_clty false type_pairs subst env cty1' cty2'
-    | Cty_signature sign1, Cty_signature sign2 ->
-        let ty1 = object_fields (repr sign1.csig_self) in
-        let ty2 = object_fields (repr sign2.csig_self) in
-        let (fields1, _rest1) = flatten_fields ty1
-        and (fields2, _rest2) = flatten_fields ty2 in
-        let (pairs, _miss1, _miss2) = associate_fields fields1 fields2 in
-        List.iter
-          (fun (lab, _k1, t1, _k2, t2) ->
-             begin try eqtype true type_pairs subst env t1 t2 with
-               Unify trace ->
-                 raise (Failure [CM_Meth_type_mismatch
-                                    (lab, env, expand_trace env trace)])
-             end)
-          pairs;
-        Vars.iter
-          (fun lab (_, _, ty) ->
-             let (_, _, ty') = Vars.find lab sign1.csig_vars in
-             try eqtype true type_pairs subst env ty' ty with Unify trace ->
-               raise (Failure [CM_Val_type_mismatch
-                                  (lab, env, expand_trace env trace)]))
-          sign2.csig_vars
-    | _ ->
-        raise
-          (Failure (if trace then []
-                    else [CM_Class_type_mismatch (env, cty1, cty2)]))
-  with
-    Failure error when trace ->
-      raise (Failure (CM_Class_type_mismatch (env, cty1, cty2)::error))
-
-let match_class_declarations env patt_params patt_type subj_params subj_type =
-  let type_pairs = TypePairs.create 53 in
-  let subst = ref [] in
-  let sign1 = signature_of_class_type patt_type in
-  let sign2 = signature_of_class_type subj_type in
-  let t1 = repr sign1.csig_self in
-  let t2 = repr sign2.csig_self in
-  TypePairs.add type_pairs (t1, t2) ();
-  let (fields1, rest1) = flatten_fields (object_fields t1)
-  and (fields2, rest2) = flatten_fields (object_fields t2) in
-  let (pairs, miss1, miss2) = associate_fields fields1 fields2 in
-  let error =
-    List.fold_right
-      (fun (lab, k, _) err ->
-        let err =
-          let k = field_kind_repr k in
-          begin match k with
-            Fvar _ -> err
-          | _      -> CM_Hide_public lab::err
-          end
-        in
-        if Concr.mem lab sign1.csig_concr then err
-        else CM_Hide_virtual ("method", lab) :: err)
-      miss1 []
-  in
-  let missing_method = List.map (fun (m, _, _) -> m) miss2 in
-  let error =
-    (List.map (fun m -> CM_Missing_method m) missing_method) @ error
-  in
-  (* Always succeeds *)
-  eqtype true type_pairs subst env rest1 rest2;
-  let error =
-    List.fold_right
-      (fun (lab, k1, _t1, k2, _t2) err ->
-        let k1 = field_kind_repr k1 in
-        let k2 = field_kind_repr k2 in
-        match k1, k2 with
-          (Fvar _, Fvar _)
-        | (Fpresent, Fpresent) -> err
-        | (Fvar _, Fpresent)   -> CM_Private_method lab::err
-        | (Fpresent, Fvar _)  -> CM_Public_method lab::err
-        | _                    -> assert false)
-      pairs error
-  in
-  let error =
-    Vars.fold
-      (fun lab (mut, vr, _ty) err ->
-         try
-           let (mut', vr', _ty') = Vars.find lab sign1.csig_vars in
-           if mut = Mutable && mut' <> Mutable then
-             CM_Non_mutable_value lab::err
-           else if vr = Concrete && vr' <> Concrete then
-             CM_Non_concrete_value lab::err
-           else
-             err
-         with Not_found ->
-           CM_Missing_value lab::err)
-      sign2.csig_vars error
-  in
-  let error =
-    Vars.fold
-      (fun lab (_,vr,_) err ->
-        if vr = Virtual && not (Vars.mem lab sign2.csig_vars) then
-          CM_Hide_virtual ("instance variable", lab) :: err
-        else err)
-      sign1.csig_vars error
-  in
-  let error =
-    List.fold_right
-      (fun e l ->
-        if List.mem e missing_method then l else CM_Virtual_method e::l)
-      (Concr.elements (Concr.diff sign2.csig_concr sign1.csig_concr))
-      error
-  in
-  match error with
-    [] ->
-      begin try
-        let lp = List.length patt_params in
-        let ls = List.length subj_params in
-        if lp  <> ls then
-          raise (Failure [CM_Parameter_arity_mismatch (lp, ls)]);
-        List.iter2 (fun p s ->
-          try eqtype true type_pairs subst env p s with Unify trace ->
-            raise (Failure [CM_Type_parameter_mismatch
-                               (env, expand_trace env trace)]))
-          patt_params subj_params;
-     (* old code: equal_clty false type_pairs subst env patt_type subj_type; *)
-        equal_clty false type_pairs subst env
-          (Cty_signature sign1) (Cty_signature sign2);
-        (* Use moregeneral for class parameters, need to recheck everything to
-           keeps relationships (PR#4824) *)
-        let clty_params =
-          List.fold_right (fun ty cty -> Cty_arrow (Labelled "*",ty,cty)) in
-        match_class_types ~trace:false env
-          (clty_params patt_params patt_type)
-          (clty_params subj_params subj_type)
-      with
-        Failure r -> r
-      end
-  | error ->
-      error
-
-
-                              (***************)
-                              (*  Subtyping  *)
-                              (***************)
-
-
-(**** Build a subtype of a given type. ****)
-
-(* build_subtype:
-   [visited] traces traversed object and variant types
-   [loops] is a mapping from variables to variables, to reproduce
-     positive loops in a class type
-   [posi] true if the current variance is positive
-   [level] number of expansions/enlargement allowed on this branch *)
-
-let warn = ref false  (* whether double coercion might do better *)
-let pred_expand n = if n mod 2 = 0 && n > 0 then pred n else n
-let pred_enlarge n = if n mod 2 = 1 then pred n else n
-
-type change = Unchanged | Equiv | Changed [@@immediate]
-
-let [@inline] max (c1:change) (c2 :change)= 
-  (Obj.magic (Ext_pervasives.max_int (Obj.magic c1 : int) (Obj.magic c2 : int)) : change)
-let collect l = List.fold_left (fun c1 (_, c2) -> max c1 c2) Unchanged l
-
-let rec filter_visited = function
-    [] -> []
-  | {desc=Tobject _|Tvariant _} :: _ as l -> l
-  | _ :: l -> filter_visited l
-
-let memq_warn t visited =
-  if List.memq t visited then (warn := true; true) else false
-
-let rec lid_of_path ?(hash="") = function
-    Path.Pident id ->
-      Longident.Lident (hash ^ Ident.name id)
-  | Path.Pdot (p1, s, _) ->
-      Longident.Ldot (lid_of_path p1, hash ^ s)
-  | Path.Papply (p1, p2) ->
-      Longident.Lapply (lid_of_path ~hash p1, lid_of_path p2)
-
-let find_cltype_for_path env p =
-  let cl_path = Env.lookup_type (lid_of_path ~hash:"#" p) env in
-  let cl_abbr = Env.find_type cl_path env in
-
-  match cl_abbr.type_manifest with
-    Some ty ->
-      begin match (repr ty).desc with
-        Tobject(_,{contents=Some(p',_)}) when Path.same p p' -> cl_abbr, ty
-      | _ -> raise Not_found
-      end
-  | None -> assert false
-
-let has_constr_row' env t =
-  has_constr_row (expand_abbrev env t)
-
-let rec build_subtype env visited loops posi level t =
-  let t = repr t in
-  match t.desc with
-    Tvar _ ->
-      if posi then
-        try
-          let t' = List.assq t loops in
-          warn := true;
-          (t', Equiv)
-        with Not_found ->
-          (t, Unchanged)
-      else
-        (t, Unchanged)
-  | Tarrow(l, t1, t2, _) ->
-      if memq_warn t visited then (t, Unchanged) else
-      let visited = t :: visited in
-      let (t1', c1) = build_subtype env visited loops (not posi) level t1 in
-      let (t2', c2) = build_subtype env visited loops posi level t2 in
-      let c = max c1 c2 in
-      if c > Unchanged then (newty (Tarrow(l, t1', t2', Cok)), c)
-      else (t, Unchanged)
-  | Ttuple tlist ->
-      if memq_warn t visited then (t, Unchanged) else
-      let visited = t :: visited in
-      let tlist' =
-        List.map (build_subtype env visited loops posi level) tlist
-      in
-      let c = collect tlist' in
-      if c > Unchanged then (newty (Ttuple (List.map fst tlist')), c)
-      else (t, Unchanged)
-  | Tconstr(p, tl, abbrev)
-    when level > 0 && generic_abbrev env p && safe_abbrev env t
-    && not (has_constr_row' env t) ->
-      let t' = repr (expand_abbrev env t) in
-      let level' = pred_expand level in
-      begin try match t'.desc with
-        Tobject _ when posi && not (opened_object t') ->
-          let cl_abbr, body = find_cltype_for_path env p in
-          let ty =
-            subst env !current_level Public abbrev None
-              cl_abbr.type_params tl body in
-          let ty = repr ty in
-          let ty1, tl1 =
-            match ty.desc with
-              Tobject(ty1,{contents=Some(p',tl1)}) when Path.same p p' ->
-                ty1, tl1
-            | _ -> raise Not_found
-          in
-          (* Fix PR#4505: do not set ty to Tvar when it appears in tl1,
-             as this occurrence might break the occur check.
-             XXX not clear whether this correct anyway... *)
-          if List.exists (deep_occur ty) tl1 then raise Not_found;
-          ty.desc <- Tvar None;
-          let t'' = newvar () in
-          let loops = (ty, t'') :: loops in
-          (* May discard [visited] as level is going down *)
-          let (ty1', c) =
-            build_subtype env [t'] loops posi (pred_enlarge level') ty1 in
-          assert (is_Tvar t'');
-          let nm =
-            if c > Equiv || deep_occur ty ty1' then None else Some(p,tl1) in
-          t''.desc <- Tobject (ty1', ref nm);
-          (try unify_var env ty t with Unify _ -> assert false);
-          (t'', Changed)
-      | _ -> raise Not_found
-      with Not_found ->
-        let (t'',c) = build_subtype env visited loops posi level' t' in
-        if c > Unchanged then (t'',c)
-        else (t, Unchanged)
-      end
-  | Tconstr(p, tl, _abbrev) ->
-      (* Must check recursion on constructors, since we do not always
-         expand them *)
-      if memq_warn t visited then (t, Unchanged) else
-      let visited = t :: visited in
-      begin try
-        let decl = Env.find_type p env in
-        if level = 0 && generic_abbrev env p && safe_abbrev env t
-        && not (has_constr_row' env t)
-        then warn := true;
-        let tl' =
-          List.map2
-            (fun v t ->
-              let (co,cn) = Variance.get_upper v in
-              if cn then
-                if co then (t, Unchanged)
-                else build_subtype env visited loops (not posi) level t
-              else
-                if co then build_subtype env visited loops posi level t
-                else (newvar(), Changed))
-            decl.type_variance tl
-        in
-        let c = collect tl' in
-        if c > Unchanged then (newconstr p (List.map fst tl'), c)
-        else (t, Unchanged)
-      with Not_found ->
-        (t, Unchanged)
-      end
-  | Tvariant row ->
-      let row = row_repr row in
-      if memq_warn t visited || not (static_row row) then (t, Unchanged) else
-      let level' = pred_enlarge level in
-      let visited =
-        t :: if level' < level then [] else filter_visited visited in
-      let fields = filter_row_fields false row.row_fields in
-      let fields =
-        List.map
-          (fun (l,f as orig) -> match row_field_repr f with
-            Rpresent None ->
-              if posi then
-                (l, Reither(true, [], false, ref None)), Unchanged
-              else
-                orig, Unchanged
-          | Rpresent(Some t) ->
-              let (t', c) = build_subtype env visited loops posi level' t in
-              let f =
-                if posi && level > 0
-                then Reither(false, [t'], false, ref None)
-                else Rpresent(Some t')
-              in (l, f), c
-          | _ -> assert false)
-          fields
-      in
-      let c = collect fields in
-      let row =
-        { row_fields = List.map fst fields; row_more = newvar();
-          row_bound = (); row_closed = posi; row_fixed = false;
-          row_name = if c > Unchanged then None else row.row_name }
-      in
-      (newty (Tvariant row), Changed)
-  | Tobject (t1, _) ->
-      if memq_warn t visited || opened_object t1 then (t, Unchanged) else
-      let level' = pred_enlarge level in
-      let visited =
-        t :: if level' < level then [] else filter_visited visited in
-      let (t1', c) = build_subtype env visited loops posi level' t1 in
-      if c > Unchanged then (newty (Tobject (t1', ref None)), c)
-      else (t, Unchanged)
-  | Tfield(s, _, t1, t2) (* Always present *) ->
-      let (t1', c1) = build_subtype env visited loops posi level t1 in
-      let (t2', c2) = build_subtype env visited loops posi level t2 in
-      let c = max c1 c2 in
-      if c > Unchanged then (newty (Tfield(s, Fpresent, t1', t2')), c)
-      else (t, Unchanged)
-  | Tnil ->
-      if posi then
-        let v = newvar () in
-        (v, Changed)
-      else begin
-        warn := true;
-        (t, Unchanged)
-      end
-  | Tsubst _ | Tlink _ ->
-      assert false
-  | Tpoly(t1, tl) ->
-      let (t1', c) = build_subtype env visited loops posi level t1 in
-      if c > Unchanged then (newty (Tpoly(t1', tl)), c)
-      else (t, Unchanged)
-  | Tunivar _ | Tpackage _ ->
-      (t, Unchanged)
-
-let enlarge_type env ty =
-  warn := false;
-  (* [level = 4] allows 2 expansions involving objects/variants *)
-  let (ty', _) = build_subtype env [] [] true 4 ty in
-  (ty', !warn)
-
-(**** Check whether a type is a subtype of another type. ****)
-
-(*
-    During the traversal, a trace of visited types is maintained. It
-    is printed in case of error.
-    Constraints (pairs of types that must be equals) are accumulated
-    rather than being enforced straight. Indeed, the result would
-    otherwise depend on the order in which these constraints are
-    enforced.
-    A function enforcing these constraints is returned. That way, type
-    variables can be bound to their actual values before this function
-    is called (see Typecore).
-    Only well-defined abbreviations are expanded (hence the tests
-    [generic_abbrev ...]).
-*)
-
-let subtypes = TypePairs.create 17
-
-let subtype_error env trace =
-  raise (Subtype (expand_trace env (List.rev trace), []))
-
-let extract_concrete_typedecl_opt env t = 
-  match extract_concrete_typedecl env t with 
-  | v -> Some v 
-  | exception Not_found -> None
-
-let rec subtype_rec env trace t1 t2 cstrs =
-  let t1 = repr t1 in
-  let t2 = repr t2 in
-  if t1 == t2 then cstrs else
-
-  begin try
-    TypePairs.find subtypes (t1, t2);
-    cstrs
-  with Not_found ->
-    TypePairs.add subtypes (t1, t2) ();
-    match (t1.desc, t2.desc) with
-      (Tvar _, _) | (_, Tvar _) ->
-        (trace, t1, t2, !univar_pairs)::cstrs
-    | (Tarrow(l1, t1, u1, _), Tarrow(l2, t2, u2, _)) when Asttypes.same_arg_label l1 l2
-       ->
-        let cstrs = subtype_rec env ((t2, t1)::trace) t2 t1 cstrs in
-        subtype_rec env ((u1, u2)::trace) u1 u2 cstrs
-    | (Ttuple tl1, Ttuple tl2) ->
-        subtype_list env trace tl1 tl2 cstrs
-    | (Tconstr(p1, [], _), Tconstr(p2, [], _)) when Path.same p1 p2 ->
-        cstrs
-    | (Tconstr(p1, _tl1, _abbrev1), _)
-      when generic_abbrev env p1 && safe_abbrev env t1 ->
-        subtype_rec env trace (expand_abbrev env t1) t2 cstrs
-    | (_, Tconstr(p2, _tl2, _abbrev2))
-      when generic_abbrev env p2 && safe_abbrev env t2 ->
-        subtype_rec env trace t1 (expand_abbrev env t2) cstrs
-    | (Tconstr(p1, tl1, _), Tconstr(p2, tl2, _)) when Path.same p1 p2 ->
-        begin try
-          let decl = Env.find_type p1 env in
-          List.fold_left2
-            (fun cstrs v (t1, t2) ->
-              let (co, cn) = Variance.get_upper v in
-              if co then
-                if cn then
-                  (* Invariant type argument: check both ways *)
-                  if
-                    subtype_rec env ((t1, t2)::trace) t1 t2 [] = [] &&
-                    subtype_rec env ((t2, t1)::trace) t2 t1 [] = [] then
-                    cstrs
-                  else
-                      (trace, newty2 t1.level (Ttuple[t1]),
-                      newty2 t2.level (Ttuple[t2]), !univar_pairs) :: cstrs
-                else subtype_rec env ((t1, t2)::trace) t1 t2 cstrs
-              else
-                if cn then subtype_rec env ((t2, t1)::trace) t2 t1 cstrs
-                else cstrs)
-            cstrs decl.type_variance (List.combine tl1 tl2)
-        with Not_found ->
-          (trace, t1, t2, !univar_pairs)::cstrs
-        end
-    | (Tconstr(p1, _, _), _) when generic_private_abbrev env p1 ->
-        subtype_rec env trace (expand_abbrev_opt env t1) t2 cstrs
-    | (Tconstr(p1, [], _), Tconstr(p2, [], _)) when Path.same p1 Predef.path_int && Path.same p2 Predef.path_float ->
-        cstrs 
-    | (Tconstr(path, [], _), Tconstr(_, [], _)) when Variant_coercion.can_coerce_primitive path && 
-        extract_concrete_typedecl_opt env t2 |> Variant_coercion.can_try_coerce_variant_to_primitive_opt |> Option.is_some
-        ->
-      (* type coercion for primitives (int/float/string) to elgible unboxed variants:
-         - must be unboxed
-         - must have a constructor case with a supported and matching primitive payload *)
-      (match Variant_coercion.can_try_coerce_variant_to_primitive_opt (extract_concrete_typedecl_opt env t2) with
-      | Some (constructors, true) -> 
-        if Variant_coercion.variant_has_catch_all_case constructors (fun p -> Path.same p path) then
-          cstrs
-        else 
-          (trace, t1, t2, !univar_pairs)::cstrs
-      | _ -> (trace, t1, t2, !univar_pairs)::cstrs)
-    | (Tconstr(_, [], _), Tconstr(path, [], _)) when Variant_coercion.can_coerce_primitive path && 
-        extract_concrete_typedecl_opt env t1 |> Variant_coercion.can_try_coerce_variant_to_primitive_opt |> Option.is_some
-        ->
-      (* type coercion for variants to primitives *)
-      (match Variant_coercion.can_try_coerce_variant_to_primitive_opt (extract_concrete_typedecl_opt env t1) with
-      | Some (constructors, unboxed) -> 
-        if constructors |> Variant_coercion.variant_has_same_runtime_representation_as_target ~targetPath:path ~unboxed then
-          cstrs
-        else 
-          (trace, t1, t2, !univar_pairs)::cstrs
-      | None -> (trace, t1, t2, !univar_pairs)::cstrs)
-    | (Tconstr(_, [], _), Tconstr(_, [], _)) -> (* type coercion for variants and records *)
-      (match extract_concrete_typedecl env t1, extract_concrete_typedecl env t2 with
-      | (_, _, {type_kind=Type_variant (c1); type_attributes=t1attrs}), (_, _, {type_kind=Type_variant (c2); type_attributes=t2attrs}) ->
-        if 
-          Variant_coercion.variant_configuration_can_be_coerced t1attrs t2attrs = false 
-        then 
-          (trace, t1, t2, !univar_pairs)::cstrs 
-        else
-          let c1_len = List.length c1 in
-          if c1_len > List.length c2 then (trace, t1, t2, !univar_pairs)::cstrs
-          else
-            let constructor_map = Hashtbl.create c1_len in
-            c2
-            |> List.iter (fun (c : Types.constructor_declaration) ->
-                  Hashtbl.add constructor_map (Ident.name c.cd_id) c);
-            if c1 |> List.for_all (fun (c : Types.constructor_declaration) ->
-                  match (c, Hashtbl.find_opt constructor_map (Ident.name c.cd_id)) with
-                  | ( {Types.cd_args = Cstr_record fields1; cd_attributes=c1_attributes},
-                      Some {Types.cd_args = Cstr_record fields2; cd_attributes=c2_attributes} ) ->
-                      if Variant_coercion.variant_representation_matches c1_attributes c2_attributes then
-                        let violation, tl1, tl2 = Record_coercion.check_record_fields fields1 fields2 in
-                        if violation then false
-                        else
-                          begin try
-                            let lst = subtype_list env trace tl1 tl2 cstrs in
-                            List.length lst = List.length cstrs
-                          with | _ -> false end
-                      else false
-                  | ( {Types.cd_args = Cstr_tuple tl1; cd_attributes=c1_attributes},
-                      Some {Types.cd_args = Cstr_tuple tl2; cd_attributes=c2_attributes} ) ->
-                      if Variant_coercion.variant_representation_matches c1_attributes c2_attributes then
-                        begin try
-                          let lst = subtype_list env trace tl1 tl2 cstrs in
-                          List.length lst = List.length cstrs
-                        with | _ -> false end
-                      else false
-                  | _ -> false)
-            then cstrs
-            else (trace, t1, t2, !univar_pairs)::cstrs
-      | (_, _, {type_kind=Type_record (fields1, repr1)}), (_, _, {type_kind=Type_record (fields2, repr2)}) ->
-        let same_repr = match repr1, repr2 with
-          | (Record_regular | Record_optional_labels _), (Record_regular | Record_optional_labels _) ->
-            true (* handled in the fields checks *)
-          | Record_unboxed b1, Record_unboxed b2 -> b1 = b2
-          | Record_inlined _, Record_inlined _ -> repr1 = repr2
-          | Record_extension, Record_extension -> true
-          | _ -> false in
-        if same_repr then
-          let violation, tl1, tl2 = Record_coercion.check_record_fields ~repr1 ~repr2 fields1 fields2 in
-          if violation
-          then (trace, t1, t2, !univar_pairs)::cstrs
-          else
-            subtype_list env trace tl1 tl2 cstrs
-        else
-          (trace, t1, t2, !univar_pairs)::cstrs
-      | _ -> (trace, t1, t2, !univar_pairs)::cstrs
-      | exception Not_found -> (trace, t1, t2, !univar_pairs)::cstrs
-    )
-    (*  | (_, Tconstr(p2, _, _)) when generic_private_abbrev false env p2 ->
-        subtype_rec env trace t1 (expand_abbrev_opt env t2) cstrs *)
-    | (Tobject (f1, _), Tobject (f2, _))
-      when is_Tvar (object_row f1) && is_Tvar (object_row f2) ->
-        (* Same row variable implies same object. *)
-        (trace, t1, t2, !univar_pairs)::cstrs
-    | (Tobject (f1, _), Tobject (f2, _)) ->
-        subtype_fields env trace f1 f2 cstrs
-    | (Tvariant row1, Tvariant row2) ->
-        begin try
-          subtype_row env trace row1 row2 cstrs
-        with Exit ->
-          (trace, t1, t2, !univar_pairs)::cstrs
-        end
-    | Tvariant v, _ when 
-        !Config.bs_only &&
-        !variant_is_subtype env (row_repr v) t2 
-      -> 
-        cstrs
-    | (Tpoly (u1, []), Tpoly (u2, [])) ->
-        subtype_rec env trace u1 u2 cstrs
-    | (Tpoly (u1, tl1), Tpoly (u2, [])) ->
-        let _, u1' = instance_poly false tl1 u1 in
-        subtype_rec env trace u1' u2 cstrs
-    | (Tpoly (u1, tl1), Tpoly (u2,tl2)) ->
-        begin try
-          enter_poly env univar_pairs u1 tl1 u2 tl2
-            (fun t1 t2 -> subtype_rec env trace t1 t2 cstrs)
-        with Unify _ ->
-          (trace, t1, t2, !univar_pairs)::cstrs
-        end
-    | (Tpackage (p1, nl1, tl1), Tpackage (p2, nl2, tl2)) ->
-        begin try
-          let ntl1 = complete_type_list env nl2 t1.level (Mty_ident p1) nl1 tl1
-          and ntl2 = complete_type_list env nl1 t2.level (Mty_ident p2) nl2 tl2
-              ~allow_absent:true in
-          let cstrs' =
-            List.map
-              (fun (n2,t2) -> (trace, List.assoc n2 ntl1, t2, !univar_pairs))
-              ntl2
-          in
-          if eq_package_path env p1 p2 then cstrs' @ cstrs
-          else begin
-            (* need to check module subtyping *)
-            let snap = Btype.snapshot () in
-            try
-              List.iter (fun (_, t1, t2, _) -> unify env t1 t2) cstrs';
-              if !package_subtype env p1 nl1 tl1 p2 nl2 tl2
-              then (Btype.backtrack snap; cstrs' @ cstrs)
-              else raise (Unify [])
-            with Unify _ ->
-              Btype.backtrack snap; raise Not_found
-          end
-        with Not_found ->
-          (trace, t1, t2, !univar_pairs)::cstrs
-        end
-    | (_, _) ->
-        (trace, t1, t2, !univar_pairs)::cstrs
-  end
-
-and subtype_list env trace tl1 tl2 cstrs =
-  if List.length tl1 <> List.length tl2 then
-    subtype_error env trace;
-  List.fold_left2
-    (fun cstrs t1 t2 -> subtype_rec env ((t1, t2)::trace) t1 t2 cstrs)
-    cstrs tl1 tl2
-
-and subtype_fields env trace ty1 ty2 cstrs =
-  (* Assume that either rest1 or rest2 is not Tvar *)
-  let (fields1, rest1) = flatten_fields ty1 in
-  let (fields2, rest2) = flatten_fields ty2 in
-  let (pairs, miss1, miss2) = associate_fields fields1 fields2 in
-  let cstrs =
-    if rest2.desc = Tnil then cstrs else
-    if miss1 = [] then
-      subtype_rec env ((rest1, rest2)::trace) rest1 rest2 cstrs
-    else
-      (trace, build_fields (repr ty1).level miss1 rest1, rest2,
-       !univar_pairs) :: cstrs
-  in
-  let cstrs =
-    if miss2 = [] then cstrs else
-    (trace, rest1, build_fields (repr ty2).level miss2 (newvar ()),
-     !univar_pairs) :: cstrs
-  in
-  List.fold_left
-    (fun cstrs (_, _k1, t1, _k2, t2) ->
-      (* These fields are always present *)
-      subtype_rec env ((t1, t2)::trace) t1 t2 cstrs)
-    cstrs pairs
-
-and subtype_row env trace row1 row2 cstrs =
-  let row1 = row_repr row1 and row2 = row_repr row2 in
-  let r1, r2, pairs =
-    merge_row_fields row1.row_fields row2.row_fields in
-  let more1 = repr row1.row_more
-  and more2 = repr row2.row_more in
-  match more1.desc, more2.desc with
-    Tconstr(p1,_,_), Tconstr(p2,_,_) when Path.same p1 p2 ->
-      subtype_rec env ((more1,more2)::trace) more1 more2 cstrs
-  | (Tvar _|Tconstr _|Tnil), (Tvar _|Tconstr _|Tnil)
-    when row1.row_closed && r1 = [] ->
-      List.fold_left
-        (fun cstrs (_,f1,f2) ->
-          match row_field_repr f1, row_field_repr f2 with
-            (Rpresent None|Reither(true,_,_,_)), Rpresent None ->
-              cstrs
-          | Rpresent(Some t1), Rpresent(Some t2) ->
-              subtype_rec env ((t1, t2)::trace) t1 t2 cstrs
-          | Reither(false, t1::_, _, _), Rpresent(Some t2) ->
-              subtype_rec env ((t1, t2)::trace) t1 t2 cstrs
-          | Rabsent, _ -> cstrs
-          | _ -> raise Exit)
-        cstrs pairs
-  | Tunivar _, Tunivar _
-    when row1.row_closed = row2.row_closed && r1 = [] && r2 = [] ->
-      let cstrs =
-        subtype_rec env ((more1,more2)::trace) more1 more2 cstrs in
-      List.fold_left
-        (fun cstrs (_,f1,f2) ->
-          match row_field_repr f1, row_field_repr f2 with
-            Rpresent None, Rpresent None
-          | Reither(true,[],_,_), Reither(true,[],_,_)
-          | Rabsent, Rabsent ->
-              cstrs
-          | Rpresent(Some t1), Rpresent(Some t2)
-          | Reither(false,[t1],_,_), Reither(false,[t2],_,_) ->
-              subtype_rec env ((t1, t2)::trace) t1 t2 cstrs
-          | _ -> raise Exit)
-        cstrs pairs
-  | _ ->
-      raise Exit
-
-let subtype env ty1 ty2 =
-  TypePairs.clear subtypes;
-  univar_pairs := [];
-  (* Build constraint set. *)
-  let cstrs = subtype_rec env [(ty1, ty2)] ty1 ty2 [] in
-  TypePairs.clear subtypes;
-  (* Enforce constraints. *)
-  function () ->
-    List.iter
-      (function (trace0, t1, t2, pairs) ->
-         try unify_pairs (ref env) t1 t2 pairs with Unify trace ->
-           raise (Subtype (expand_trace env (List.rev trace0),
-                           List.tl (List.tl trace))))
-      (List.rev cstrs)
-
-                              (*******************)
-                              (*  Miscellaneous  *)
-                              (*******************)
-
-(* Utility for printing. The resulting type is not used in computation. *)
-let rec unalias_object ty =
-  let ty = repr ty in
-  match ty.desc with
-    Tfield (s, k, t1, t2) ->
-      newty2 ty.level (Tfield (s, k, t1, unalias_object t2))
-  | Tvar _ | Tnil ->
-      newty2 ty.level ty.desc
-  | Tunivar _ ->
-      ty
-  | Tconstr _ ->
-      newvar2 ty.level
-  | _ ->
-      assert false
-
-let unalias ty =
-  let ty = repr ty in
-  match ty.desc with
-    Tvar _ | Tunivar _ ->
-      ty
-  | Tvariant row ->
-      let row = row_repr row in
-      let more = row.row_more in
-      newty2 ty.level
-        (Tvariant {row with row_more = newty2 more.level more.desc})
-  | Tobject (ty, nm) ->
-      newty2 ty.level (Tobject (unalias_object ty, nm))
-  | _ ->
-      newty2 ty.level ty.desc
-
-(* Return the arity (as for curried functions) of the given type. *)
-let rec arity ty =
-  match (repr ty).desc with
-    Tarrow(_, _t1, t2, _) -> 1 + arity t2
-  | _ -> 0
-
-(* Check whether an abbreviation expands to itself. *)
-let cyclic_abbrev env id ty =
-  let rec check_cycle seen ty =
-    let ty = repr ty in
-    match ty.desc with
-      Tconstr (p, _tl, _abbrev) ->
-        (match p with  Path.Pident p -> Ident.same p id | _ -> false) || List.memq ty seen ||
-        begin try
-          check_cycle (ty :: seen) (expand_abbrev_opt env ty)
-        with
-          Cannot_expand -> false
-        | Unify _ -> true
-        end
-    | _ ->
-        false
-  in check_cycle [] ty
-
-(* Check for non-generalizable type variables *)
-exception Non_closed0
-let visited = ref TypeSet.empty
-
-let rec closed_schema_rec env ty =
-  let ty = repr ty in
-  if TypeSet.mem ty !visited then () else begin
-    visited := TypeSet.add ty !visited;
-    match ty.desc with
-      Tvar _ when ty.level <> generic_level ->
-        raise Non_closed0
-    | Tconstr _ ->
-        let old = !visited in
-        begin try iter_type_expr (closed_schema_rec env) ty
-        with Non_closed0 -> try
-          visited := old;
-          closed_schema_rec env (try_expand_head try_expand_safe env ty)
-        with Cannot_expand ->
-          raise Non_closed0
-        end
-    | Tfield(_, kind, t1, t2) ->
-        if field_kind_repr kind = Fpresent then
-          closed_schema_rec env t1;
-        closed_schema_rec env t2
-    | Tvariant row ->
-        let row = row_repr row in
-        iter_row (closed_schema_rec env) row;
-        if not (static_row row) then closed_schema_rec env row.row_more
-    | _ ->
-        iter_type_expr (closed_schema_rec env) ty
-  end
-
-(* Return whether all variables of type [ty] are generic. *)
-let closed_schema env ty =
-  visited := TypeSet.empty;
-  try
-    closed_schema_rec env ty;
-    visited := TypeSet.empty;
-    true
-  with Non_closed0 ->
-    visited := TypeSet.empty;
-    false
-
-(* Normalize a type before printing, saving... *)
-(* Cannot use mark_type because deep_occur uses it too *)
-let rec normalize_type_rec env visited ty =
-  let ty = repr ty in
-  if not (TypeSet.mem ty !visited) then begin
-    visited := TypeSet.add ty !visited;
-    let tm = row_of_type ty in
-    begin if not (is_Tconstr ty) && is_constr_row ~allow_ident:false tm then
-      match tm.desc with (* PR#7348 *)
-        Tconstr (Path.Pdot(m,i,pos), tl, _abbrev) ->
-          let i' = String.sub i 0 (String.length i - 4) in
-          log_type ty;
-          ty.desc <- Tconstr(Path.Pdot(m,i',pos), tl, ref Mnil)
-      | _ -> assert false
-    else match ty.desc with
-    | Tvariant row ->
-      let row = row_repr row in
-      let fields = List.map
-          (fun (l,f0) ->
-            let f = row_field_repr f0 in l,
-            match f with Reither(b, ty::(_::_ as tyl), m, e) ->
-              let tyl' =
-                List.fold_left
-                  (fun tyl ty ->
-                    if List.exists (fun ty' -> equal env false [ty] [ty']) tyl
-                    then tyl else ty::tyl)
-                  [ty] tyl
-              in
-              if f != f0 || List.length tyl' < List.length tyl then
-                Reither(b, List.rev tyl', m, e)
-              else f
-            | _ -> f)
-          row.row_fields in
-      let fields =
-        List.sort (fun (p,_) (q,_) -> compare p q)
-          (Ext_list.filter fields (fun (_,fi) -> fi <> Rabsent)) in
-      log_type ty;
-      ty.desc <- Tvariant {row with row_fields = fields}
-    | Tobject (fi, nm) ->
-        begin match !nm with
-        | None -> ()
-        | Some (n, v :: l) ->
-            if deep_occur ty (newgenty (Ttuple l)) then
-              (* The abbreviation may be hiding something, so remove it *)
-              set_name nm None
-            else let v' = repr v in
-            begin match v'.desc with
-            | Tvar _ | Tunivar _ ->
-                if v' != v then set_name nm (Some (n, v' :: l))
-            | Tnil ->
-                log_type ty; ty.desc <- Tconstr (n, l, ref Mnil)
-            | _ -> set_name nm None
-            end
-        | _ ->
-            fatal_error "Ctype.normalize_type_rec"
-        end;
-        let fi = repr fi in
-        if fi.level < lowest_level then () else
-        let fields, row = flatten_fields fi in
-        let fi' = build_fields fi.level fields row in
-        log_type ty; fi.desc <- fi'.desc
-    | _ -> ()
-    end;
-    iter_type_expr (normalize_type_rec env visited) ty
-  end
-
-let normalize_type env ty =
-  normalize_type_rec env (ref TypeSet.empty) ty
-
-
-                              (*************************)
-                              (*  Remove dependencies  *)
-                              (*************************)
-
-
-(*
-   Variables are left unchanged. Other type nodes are duplicated, with
-   levels set to generic level.
-   We cannot use Tsubst here, because unification may be called by
-   expand_abbrev.
-*)
-
-let nondep_hash     = TypeHash.create 47
-let nondep_variants = TypeHash.create 17
-let clear_hash ()   =
-  TypeHash.clear nondep_hash; TypeHash.clear nondep_variants
-
-let rec nondep_type_rec env id ty =
-  match ty.desc with
-    Tvar _ | Tunivar _ -> ty
-  | Tlink ty -> nondep_type_rec env id ty
-  | _ -> try TypeHash.find nondep_hash ty
-  with Not_found ->
-    let ty' = newgenvar () in        (* Stub *)
-    TypeHash.add nondep_hash ty ty';
-    ty'.desc <-
-      begin match ty.desc with
-      | Tconstr(p, tl, _abbrev) ->
-          if Path.isfree id p then
-            begin try
-              Tlink (nondep_type_rec env id
-                       (expand_abbrev env (newty2 ty.level ty.desc)))
-              (*
-                 The [Tlink] is important. The expanded type may be a
-                 variable, or may not be completely copied yet
-                 (recursive type), so one cannot just take its
-                 description.
-               *)
-            with Cannot_expand | Unify _ ->
-              raise Not_found
-            end
-          else
-            Tconstr(p, List.map (nondep_type_rec env id) tl, ref Mnil)
-      | Tpackage(p, nl, tl) when Path.isfree id p ->
-          let p' = normalize_package_path env p in
-          if Path.isfree id p' then raise Not_found;
-          Tpackage (p', nl, List.map (nondep_type_rec env id) tl)
-      | Tobject (t1, name) ->
-          Tobject (nondep_type_rec env id t1,
-                 ref (match !name with
-                        None -> None
-                      | Some (p, tl) ->
-                          if Path.isfree id p then None
-                          else Some (p, List.map (nondep_type_rec env id) tl)))
-      | Tvariant row ->
-          let row = row_repr row in
-          let more = repr row.row_more in
-          (* We must keep sharing according to the row variable *)
-          begin try
-            let ty2 = TypeHash.find nondep_variants more in
-            (* This variant type has been already copied *)
-            TypeHash.add nondep_hash ty ty2;
-            Tlink ty2
-          with Not_found ->
-            (* Register new type first for recursion *)
-            TypeHash.add nondep_variants more ty';
-            let static = static_row row in
-            let more' = if static then newgenty Tnil else more in
-            (* Return a new copy *)
-            let row =
-              copy_row (nondep_type_rec env id) true row true more' in
-            match row.row_name with
-              Some (p, _tl) when Path.isfree id p ->
-                Tvariant {row with row_name = None}
-            | _ -> Tvariant row
-          end
-      | _ -> copy_type_desc (nondep_type_rec env id) ty.desc
-      end;
-    ty'
-
-let nondep_type env id ty =
-  try
-    let ty' = nondep_type_rec env id ty in
-    clear_hash ();
-    ty'
-  with Not_found ->
-    clear_hash ();
-    raise Not_found
-
-let () = nondep_type' := nondep_type
-
-let unroll_abbrev id tl ty =
-  let ty = repr ty and path = Path.Pident id in
-  if is_Tvar ty || (List.exists (deep_occur ty) tl)
-  || is_object_type path then
-    ty
-  else
-    let ty' = newty2 ty.level ty.desc in
-    link_type ty (newty2 ty.level (Tconstr (path, tl, ref Mnil)));
-    ty'
-
-(* Preserve sharing inside type declarations. *)
-let nondep_type_decl env mid id is_covariant decl =
-  try
-    let params = List.map (nondep_type_rec env mid) decl.type_params in
-    let tk =
-      try map_kind (nondep_type_rec env mid) decl.type_kind
-      with Not_found when is_covariant -> Type_abstract
-    and tm =
-      try match decl.type_manifest with
-        None -> None
-      | Some ty ->
-          Some (unroll_abbrev id params (nondep_type_rec env mid ty))
-      with Not_found when is_covariant ->
-        None
-    in
-    clear_hash ();
-    let priv =
-      match tm with
-      | Some ty when Btype.has_constr_row ty -> Private
-      | _ -> decl.type_private
-    in
-    { type_params = params;
-      type_arity = decl.type_arity;
-      type_kind = tk;
-      type_manifest = tm;
-      type_private = priv;
-      type_variance = decl.type_variance;
-      type_newtype_level = None;
-      type_loc = decl.type_loc;
-      type_attributes = decl.type_attributes;
-      type_immediate = decl.type_immediate;
-      type_unboxed = decl.type_unboxed;
-    }
-  with Not_found ->
-    clear_hash ();
-    raise Not_found
-
-(* Preserve sharing inside extension constructors. *)
-let nondep_extension_constructor env mid ext =
-  try
-    let type_path, type_params =
-      if Path.isfree mid ext.ext_type_path then
-        begin
-          let ty =
-            newgenty (Tconstr(ext.ext_type_path, ext.ext_type_params, ref Mnil))
-          in
-          let ty' = nondep_type_rec env mid ty in
-            match (repr ty').desc with
-                Tconstr(p, tl, _) -> p, tl
-              | _ -> raise Not_found
-        end
-      else
-        let type_params =
-          List.map (nondep_type_rec env mid) ext.ext_type_params
-        in
-          ext.ext_type_path, type_params
-    in
-    let args = map_type_expr_cstr_args (nondep_type_rec env mid) ext.ext_args in
-    let ret_type = may_map (nondep_type_rec env mid) ext.ext_ret_type in
-      clear_hash ();
-      { ext_type_path = type_path;
-        ext_type_params = type_params;
-        ext_args = args;
-        ext_ret_type = ret_type;
-        ext_private = ext.ext_private;
-        ext_attributes = ext.ext_attributes;
-        ext_loc = ext.ext_loc;
-      }
-  with Not_found ->
-    clear_hash ();
-    raise Not_found
-
-
-(* Preserve sharing inside class types. *)
-let nondep_class_signature env id sign =
-  { csig_self = nondep_type_rec env id sign.csig_self;
-    csig_vars =
-      Vars.map (function (m, v, t) -> (m, v, nondep_type_rec env id t))
-        sign.csig_vars;
-    csig_concr = sign.csig_concr;
-    csig_inher =
-      List.map (fun (p,tl) -> (p, List.map (nondep_type_rec env id) tl))
-        sign.csig_inher }
-
-let rec nondep_class_type env id =
-  function
-    Cty_constr (p, _, cty) when Path.isfree id p ->
-      nondep_class_type env id cty
-  | Cty_constr (p, tyl, cty) ->
-      Cty_constr (p, List.map (nondep_type_rec env id) tyl,
-                   nondep_class_type env id cty)
-  | Cty_signature sign ->
-      Cty_signature (nondep_class_signature env id sign)
-  | Cty_arrow (l, ty, cty) ->
-      Cty_arrow (l, nondep_type_rec env id ty, nondep_class_type env id cty)
-
-let nondep_class_declaration env id decl =
-  assert (not (Path.isfree id decl.cty_path));
-  let decl =
-    { cty_params = List.map (nondep_type_rec env id) decl.cty_params;
-      cty_variance = decl.cty_variance;
-      cty_type = nondep_class_type env id decl.cty_type;
-      cty_path = decl.cty_path;
-      cty_new =
-        begin match decl.cty_new with
-          None    -> None
-        | Some ty -> Some (nondep_type_rec env id ty)
-        end;
-      cty_loc = decl.cty_loc;
-      cty_attributes = decl.cty_attributes;
-    }
-  in
-  clear_hash ();
-  decl
-
-let nondep_cltype_declaration env id decl =
-  assert (not (Path.isfree id decl.clty_path));
-  let decl =
-    { clty_params = List.map (nondep_type_rec env id) decl.clty_params;
-      clty_variance = decl.clty_variance;
-      clty_type = nondep_class_type env id decl.clty_type;
-      clty_path = decl.clty_path;
-      clty_loc = decl.clty_loc;
-      clty_attributes = decl.clty_attributes;
-    }
-  in
-  clear_hash ();
-  decl
-
-(* collapse conjunctive types in class parameters *)
-let rec collapse_conj env visited ty =
-  let ty = repr ty in
-  if List.memq ty visited then () else
-  let visited = ty :: visited in
-  match ty.desc with
-    Tvariant row ->
-      let row = row_repr row in
-      List.iter
-        (fun (_l,fi) ->
-          match row_field_repr fi with
-            Reither (c, t1::(_::_ as tl), m, e) ->
-              List.iter (unify env t1) tl;
-              set_row_field e (Reither (c, [t1], m, ref None))
-          | _ ->
-              ())
-        row.row_fields;
-      iter_row (collapse_conj env visited) row
-  | _ ->
-      iter_type_expr (collapse_conj env visited) ty
-
-let collapse_conj_params env params =
-  List.iter (collapse_conj env []) params
-
-let same_constr env t1 t2 =
-  let t1 = expand_head env t1 in
-  let t2 = expand_head env t2 in
-  match t1.desc, t2.desc with
-  | Tconstr (p1, _, _), Tconstr (p2, _, _) -> Path.same p1 p2
-  | _ -> false
-
-let () =
-  Env.same_constr := same_constr
-
-let maybe_pointer_type env typ =
-   match (repr typ).desc with
-  | Tconstr(p, _args, _abbrev) ->
-    begin try
-      let type_decl = Env.find_type p env in
-      not type_decl.type_immediate
-    with Not_found -> true
-    (* This can happen due to e.g. missing -I options,
-       causing some .cmi files to be unavailable.
-       Maybe we should emit a warning. *)
-    end
-  | Tvariant row ->
-      let row = Btype.row_repr row in
-      (* if all labels are devoid of arguments, not a pointer *)
-      not row.row_closed
-      || List.exists
-          (function
-            | _, (Rpresent (Some _) | Reither (false, _, _, _)) -> true
-            | _ -> false)
-          row.row_fields
-  | _ -> true
diff --git a/jscomp/ml/ctype.mli b/jscomp/ml/ctype.mli
deleted file mode 100644
index 7b68649..0000000
--- a/jscomp/ml/ctype.mli
+++ /dev/null
@@ -1,293 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Operations on core types *)
-
-open Asttypes
-open Types
-
-exception Unify of (type_expr * type_expr) list
-exception Tags of label * label
-exception Subtype of
-        (type_expr * type_expr) list * (type_expr * type_expr) list
-exception Cannot_expand
-exception Cannot_apply
-exception Recursive_abbrev
-exception Unification_recursive_abbrev of (type_expr * type_expr) list
-
-val init_def: int -> unit
-        (* Set the initial variable level *)
-val begin_def: unit -> unit
-        (* Raise the variable level by one at the beginning of a definition. *)
-val end_def: unit -> unit
-        (* Lower the variable level by one at the end of a definition *)
-val begin_class_def: unit -> unit
-val raise_nongen_level: unit -> unit
-val reset_global_level: unit -> unit
-        (* Reset the global level before typing an expression *)
-val increase_global_level: unit -> int
-val restore_global_level: int -> unit
-        (* This pair of functions is only used in Typetexp *)
-type levels =
-    { current_level: int; nongen_level: int; global_level: int;
-      saved_level: (int * int) list; }
-val save_levels: unit -> levels
-val set_levels: levels -> unit
-
-val newty: type_desc -> type_expr
-val newvar: ?name:string -> unit -> type_expr
-val newvar2: ?name:string -> int -> type_expr
-        (* Return a fresh variable *)
-val new_global_var: ?name:string -> unit -> type_expr
-        (* Return a fresh variable, bound at toplevel
-           (as type variables ['a] in type constraints). *)
-val newobj: type_expr -> type_expr
-val newconstr: Path.t -> type_expr list -> type_expr
-val none: type_expr
-        (* A dummy type expression *)
-
-val repr: type_expr -> type_expr
-        (* Return the canonical representative of a type. *)
-
-val object_fields: type_expr -> type_expr
-val flatten_fields:
-        type_expr -> (string * field_kind * type_expr) list * type_expr
-        (* Transform a field type into a list of pairs label-type *)
-        (* The fields are sorted *)
-val associate_fields:
-        (string * field_kind * type_expr) list ->
-        (string * field_kind * type_expr) list ->
-        (string * field_kind * type_expr * field_kind * type_expr) list *
-        (string * field_kind * type_expr) list *
-        (string * field_kind * type_expr) list
-val opened_object: type_expr -> bool
-val close_object: type_expr -> unit
-val row_variable: type_expr -> type_expr
-        (* Return the row variable of an open object type *)
-val set_object_name:
-        Ident.t -> type_expr -> type_expr list -> type_expr -> unit
-val remove_object_name: type_expr -> unit
-val hide_private_methods: type_expr -> unit
-val find_cltype_for_path: Env.t -> Path.t -> type_declaration * type_expr
-val lid_of_path: ?hash:string -> Path.t -> Longident.t
-
-val sort_row_fields: (label * row_field) list -> (label * row_field) list
-val merge_row_fields:
-        (label * row_field) list -> (label * row_field) list ->
-        (label * row_field) list * (label * row_field) list *
-        (label * row_field * row_field) list
-val filter_row_fields:
-        bool -> (label * row_field) list -> (label * row_field) list
-
-val generalize: type_expr -> unit
-        (* Generalize in-place the given type *)
-val generalize_expansive: Env.t -> type_expr -> unit
-        (* Generalize the covariant part of a type, making
-           contravariant branches non-generalizable *)
-val generalize_global: type_expr -> unit
-        (* Generalize the structure of a type, lowering variables
-           to !global_level *)
-val generalize_structure: type_expr -> unit
-        (* Same, but variables are only lowered to !current_level *)
-val correct_levels: type_expr -> type_expr
-        (* Returns a copy with decreasing levels *)
-val limited_generalize: type_expr -> type_expr -> unit
-        (* Only generalize some part of the type
-           Make the remaining of the type non-generalizable *)
-
-val instance: ?partial:bool -> Env.t -> type_expr -> type_expr
-        (* Take an instance of a type scheme *)
-        (* partial=None  -> normal
-           partial=false -> newvar() for non generic subterms
-           partial=true  -> newty2 ty.level Tvar for non generic subterms *)
-val instance_def: type_expr -> type_expr
-        (* use defaults *)
-val generic_instance: Env.t -> type_expr -> type_expr
-        (* Same as instance, but new nodes at generic_level *)
-val instance_list: Env.t -> type_expr list -> type_expr list
-        (* Take an instance of a list of type schemes *)
-val instance_constructor:
-        ?in_pattern:Env.t ref * int ->
-        constructor_description -> type_expr list * type_expr
-        (* Same, for a constructor *)
-val instance_parameterized_type:
-        ?keep_names:bool ->
-        type_expr list -> type_expr -> type_expr list * type_expr
-val instance_parameterized_type_2:
-        type_expr list -> type_expr list -> type_expr ->
-        type_expr list * type_expr list * type_expr
-val instance_declaration: type_declaration -> type_declaration
-val instance_class:
-        type_expr list -> class_type -> type_expr list * class_type
-val instance_poly:
-        ?keep_names:bool ->
-        bool -> type_expr list -> type_expr -> type_expr list * type_expr
-        (* Take an instance of a type scheme containing free univars *)
-val instance_label:
-        bool -> label_description -> type_expr list * type_expr * type_expr
-        (* Same, for a label *)
-val apply:
-        Env.t -> type_expr list -> type_expr -> type_expr list -> type_expr
-        (* [apply [p1...pN] t [a1...aN]] match the arguments [ai] to
-        the parameters [pi] and returns the corresponding instance of
-        [t]. Exception [Cannot_apply] is raised in case of failure. *)
-
-val expand_head_once: Env.t -> type_expr -> type_expr
-val expand_head: Env.t -> type_expr -> type_expr
-val try_expand_once_opt: Env.t -> type_expr -> type_expr
-val expand_head_opt: Env.t -> type_expr -> type_expr
-(** The compiler's own version of [expand_head] necessary for type-based
-    optimisations. *)
-
-val full_expand: Env.t -> type_expr -> type_expr
-val extract_concrete_typedecl:
-        Env.t -> type_expr -> Path.t * Path.t * type_declaration
-        (* Return the original path of the types, and the first concrete
-           type declaration found expanding it.
-           Raise [Not_found] if none appears or not a type constructor. *)
-
-val enforce_constraints: Env.t -> type_expr -> unit
-
-val unify: Env.t -> type_expr -> type_expr -> unit
-        (* Unify the two types given. Raise [Unify] if not possible. *)
-val unify_gadt: newtype_level:int -> Env.t ref -> type_expr -> type_expr -> unit
-        (* Unify the two types given and update the environment with the
-           local constraints. Raise [Unify] if not possible. *)
-val unify_var: Env.t -> type_expr -> type_expr -> unit
-        (* Same as [unify], but allow free univars when first type
-           is a variable. *)
-val with_passive_variants: ('a -> 'b) -> ('a -> 'b)
-        (* Call [f] in passive_variants mode, for exhaustiveness check. *)
-val filter_arrow: Env.t -> type_expr -> arg_label -> type_expr * type_expr
-        (* A special case of unification (with l:'a -> 'b). *)
-val filter_method: Env.t -> string -> private_flag -> type_expr -> type_expr
-        (* A special case of unification (with {m : 'a; 'b}). *)
-val check_filter_method: Env.t -> string -> private_flag -> type_expr -> unit
-        (* A special case of unification (with {m : 'a; 'b}), returning unit. *)
-val occur_in: Env.t -> type_expr -> type_expr -> bool
-val deep_occur: type_expr -> type_expr -> bool
-val filter_self_method:
-        Env.t -> string -> private_flag -> (Ident.t * type_expr) Meths.t ref ->
-        type_expr -> Ident.t * type_expr
-val moregeneral: Env.t -> bool -> type_expr -> type_expr -> bool
-        (* Check if the first type scheme is more general than the second. *)
-
-val rigidify: type_expr -> type_expr list
-        (* "Rigidify" a type and return its type variable *)
-val all_distinct_vars: Env.t -> type_expr list -> bool
-        (* Check those types are all distinct type variables *)
-val matches: Env.t -> type_expr -> type_expr -> bool
-        (* Same as [moregeneral false], implemented using the two above
-           functions and backtracking. Ignore levels *)
-
-type class_match_failure =
-    CM_Virtual_class
-  | CM_Parameter_arity_mismatch of int * int
-  | CM_Type_parameter_mismatch of Env.t * (type_expr * type_expr) list
-  | CM_Class_type_mismatch of Env.t * class_type * class_type
-  | CM_Parameter_mismatch of Env.t * (type_expr * type_expr) list
-  | CM_Val_type_mismatch of string * Env.t * (type_expr * type_expr) list
-  | CM_Meth_type_mismatch of string * Env.t * (type_expr * type_expr) list
-  | CM_Non_mutable_value of string
-  | CM_Non_concrete_value of string
-  | CM_Missing_value of string
-  | CM_Missing_method of string
-  | CM_Hide_public of string
-  | CM_Hide_virtual of string * string
-  | CM_Public_method of string
-  | CM_Private_method of string
-  | CM_Virtual_method of string
-val match_class_types:
-    ?trace:bool -> Env.t -> class_type -> class_type -> class_match_failure list
-        (* Check if the first class type is more general than the second. *)
-val equal: Env.t -> bool -> type_expr list -> type_expr list -> bool
-        (* [equal env [x1...xn] tau [y1...yn] sigma]
-           checks whether the parameterized types
-           [/\x1.../\xn.tau] and [/\y1.../\yn.sigma] are equivalent. *)
-val match_class_declarations:
-        Env.t -> type_expr list -> class_type -> type_expr list ->
-        class_type -> class_match_failure list
-        (* Check if the first class type is more general than the second. *)
-
-val enlarge_type: Env.t -> type_expr -> type_expr * bool
-        (* Make a type larger, flag is true if some pruning had to be done *)
-val subtype: Env.t -> type_expr -> type_expr -> unit -> unit
-        (* [subtype env t1 t2] checks that [t1] is a subtype of [t2].
-           It accumulates the constraints the type variables must
-           enforce and returns a function that enforces this
-           constraints. *)
-
-val nondep_type: Env.t -> Ident.t -> type_expr -> type_expr
-        (* Return a type equivalent to the given type but without
-           references to the given module identifier. Raise [Not_found]
-           if no such type exists. *)
-val nondep_type_decl:
-        Env.t -> Ident.t -> Ident.t -> bool -> type_declaration ->
-        type_declaration
-        (* Same for type declarations. *)
-val nondep_extension_constructor:
-        Env.t -> Ident.t -> extension_constructor ->
-        extension_constructor
-          (* Same for extension constructor *)
-val nondep_class_declaration:
-        Env.t -> Ident.t -> class_declaration -> class_declaration
-        (* Same for class declarations. *)
-val nondep_cltype_declaration:
-        Env.t -> Ident.t -> class_type_declaration -> class_type_declaration
-        (* Same for class type declarations. *)
-(*val correct_abbrev: Env.t -> Path.t -> type_expr list -> type_expr -> unit*)
-val cyclic_abbrev: Env.t -> Ident.t -> type_expr -> bool
-val is_contractive: Env.t -> Path.t -> bool
-val normalize_type: Env.t -> type_expr -> unit
-
-val closed_schema: Env.t -> type_expr -> bool
-        (* Check whether the given type scheme contains no non-generic
-           type variables *)
-
-val free_variables: ?env:Env.t -> type_expr -> type_expr list
-        (* If env present, then check for incomplete definitions too *)
-val closed_type_decl: type_declaration -> type_expr option
-val closed_extension_constructor: extension_constructor -> type_expr option
-type closed_class_failure =
-    CC_Method of type_expr * bool * string * type_expr
-  | CC_Value of type_expr * bool * string * type_expr
-val closed_class:
-        type_expr list -> class_signature -> closed_class_failure option
-        (* Check whether all type variables are bound *)
-
-val unalias: type_expr -> type_expr
-val signature_of_class_type: class_type -> class_signature
-val self_type: class_type -> type_expr
-val class_type_arity: class_type -> int
-val arity: type_expr -> int
-        (* Return the arity (as for curried functions) of the given type. *)
-
-val collapse_conj_params: Env.t -> type_expr list -> unit
-        (* Collapse conjunctive types in class parameters *)
-
-val get_current_level: unit -> int
-val wrap_trace_gadt_instances: Env.t -> ('a -> 'b) -> 'a -> 'b
-val reset_reified_var_counter: unit -> unit
-
-val maybe_pointer_type : Env.t -> type_expr -> bool
-       (* True if type is possibly pointer, false if definitely not a pointer *)
-
-(* Stubs *)
-val package_subtype :
-    (Env.t -> Path.t -> Longident.t list -> type_expr list ->
-      Path.t -> Longident.t list -> type_expr list -> bool) ref
-
-val variant_is_subtype:        
-  (Env.t -> Types.row_desc -> Types.type_expr -> bool) ref
\ No newline at end of file
diff --git a/jscomp/ml/datarepr.ml b/jscomp/ml/datarepr.ml
deleted file mode 100644
index 8412621..0000000
--- a/jscomp/ml/datarepr.ml
+++ /dev/null
@@ -1,286 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Compute constructor and label descriptions from type declarations,
-   determining their representation. *)
-
-open Asttypes
-open Types
-open Btype
-
-(* Simplified version of Ctype.free_vars *)
-let free_vars ?(param=false) ty =
-  let ret = ref TypeSet.empty in
-  let rec loop ty =
-    let ty = repr ty in
-    if ty.level >= lowest_level then begin
-      ty.level <- pivot_level - ty.level;
-      match ty.desc with
-      | Tvar _ ->
-          ret := TypeSet.add ty !ret
-      | Tvariant row ->
-          let row = row_repr row in
-          iter_row loop row;
-          if not (static_row row) then begin
-            match row.row_more.desc with
-            | Tvar _ when param -> ret := TypeSet.add ty !ret
-            | _ -> loop row.row_more
-          end
-      (* XXX: What about Tobject ? *)
-      | _ ->
-          iter_type_expr loop ty
-    end
-  in
-  loop ty;
-  unmark_type ty;
-  !ret
-
-let newgenconstr path tyl = newgenty (Tconstr (path, tyl, ref Mnil))
-
-let constructor_existentials cd_args cd_res =
-  let tyl =
-    match cd_args with
-    | Cstr_tuple l -> l
-    | Cstr_record l -> List.map (fun l -> l.ld_type) l
-  in
-  let existentials =
-    match cd_res with
-    | None -> []
-    | Some type_ret ->
-        let arg_vars_set = free_vars (newgenty (Ttuple tyl)) in
-        let res_vars = free_vars type_ret in
-        TypeSet.elements (TypeSet.diff arg_vars_set res_vars)
-  in
-  (tyl, existentials)
-
-let constructor_args priv cd_args cd_res path rep =
-  let tyl, existentials = constructor_existentials cd_args cd_res in
-  match cd_args with
-  | Cstr_tuple l -> existentials, l, None
-  | Cstr_record lbls ->
-      let arg_vars_set = free_vars ~param:true (newgenty (Ttuple tyl)) in
-      let type_params = TypeSet.elements arg_vars_set in
-      let type_unboxed =
-        match rep with
-        | Record_unboxed _ -> unboxed_true_default_false
-        | _ -> unboxed_false_default_false
-      in
-      let tdecl =
-        {
-          type_params;
-          type_arity = List.length type_params;
-          type_kind = Type_record (lbls, rep);
-          type_private = priv;
-          type_manifest = None;
-          type_variance = List.map (fun _ -> Variance.full) type_params;
-          type_newtype_level = None;
-          type_loc = Location.none;
-          type_attributes = [];
-          type_immediate = false;
-          type_unboxed;
-        }
-      in
-      existentials,
-      [ newgenconstr path type_params ],
-      Some tdecl
-
-let internal_optional = "internal.optional"
-  
-let optional_shape : Parsetree.attribute =
-  {txt = internal_optional ; loc = Location.none}, Parsetree.PStr []
-
-let constructor_has_optional_shape ({cstr_attributes = attrs} : constructor_description) =
-  List.exists (fun (x,_) -> x.txt = internal_optional) attrs
-
-
-let constructor_descrs ty_path decl cstrs =
-  let ty_res = newgenconstr ty_path decl.type_params in
-  let num_consts = ref 0 and num_nonconsts = ref 0  and num_normal = ref 0 in
-  List.iter
-    (fun {cd_args; cd_res; _} ->
-      if cd_args = Cstr_tuple [] then incr num_consts else incr num_nonconsts;
-      if cd_res = None then incr num_normal)
-    cstrs;
-  let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "res.optional") in
-  let rec describe_constructors idx_const idx_nonconst = function
-      [] -> []
-    | {cd_id; cd_args; cd_res; cd_loc; cd_attributes} :: rem ->
-        let ty_res =
-          match cd_res with
-          | Some ty_res' -> ty_res'
-          | None -> ty_res
-        in
-        let (tag, descr_rem) =
-          match cd_args with
-          | _ when decl.type_unboxed.unboxed ->
-            assert (rem = []);
-            (Cstr_unboxed, [])
-          | Cstr_tuple [] -> (Cstr_constant idx_const,
-                   describe_constructors (idx_const+1) idx_nonconst rem)
-          | _  -> (Cstr_block idx_nonconst,
-                   describe_constructors idx_const (idx_nonconst+1) rem) in
-        let cstr_name = Ident.name cd_id in
-        let optional_labels = match cd_args with
-          | Cstr_tuple _ -> []
-          | Cstr_record lbls ->
-            Ext_list.filter_map lbls (fun ({ld_id;ld_attributes; _}) ->
-              if has_optional ld_attributes then Some ld_id.name else None)
-        in
-        let existentials, cstr_args, cstr_inlined =
-          let representation =
-            if decl.type_unboxed.unboxed
-            then Record_unboxed true
-            else Record_inlined {tag = idx_nonconst; name = cstr_name; num_nonconsts = !num_nonconsts; optional_labels; attrs = cd_attributes}
-          in
-          constructor_args decl.type_private cd_args cd_res
-            (Path.Pdot (ty_path, cstr_name, Path.nopos)) representation
-        in
-        let cstr =
-          { cstr_name;
-            cstr_res = ty_res;
-            cstr_existentials = existentials;
-            cstr_args;
-            cstr_arity = List.length cstr_args;
-            cstr_tag = tag;
-            cstr_consts = !num_consts;
-            cstr_nonconsts = !num_nonconsts;
-            cstr_normal = !num_normal;
-            cstr_private = decl.type_private;
-            cstr_generalized = cd_res <> None;
-            cstr_loc = cd_loc;
-            cstr_attributes = cd_attributes;
-            cstr_inlined;
-          } in
-        (cd_id, cstr) :: descr_rem in
-  let result = describe_constructors 0 0 cstrs in 
-  match result with
-  | (
-    [ ({Ident.name = "None"} as a_id, ({cstr_args = []} as a_descr) )  ;
-      ({Ident.name = "Some"} as b_id, ({ cstr_args = [_]} as b_descr))
-    ] |
-    [ ({Ident.name = "Some"} as a_id, ({cstr_args = [_]} as a_descr) )  ;
-      ({Ident.name = "None"} as b_id, ({ cstr_args = []} as b_descr))
-    ]
-   )
-    ->
-      [
-        (a_id, {a_descr with
-                   cstr_attributes =
-                     optional_shape :: a_descr.cstr_attributes});
-        (b_id, {b_descr with
-                   cstr_attributes =
-                     optional_shape :: b_descr.cstr_attributes
-                  })
-      ]
-  | _ -> result        
-
-let extension_descr path_ext ext =
-  let ty_res =
-    match ext.ext_ret_type with
-        Some type_ret -> type_ret
-      | None -> newgenconstr ext.ext_type_path ext.ext_type_params
-  in
-  let existentials, cstr_args, cstr_inlined =
-    constructor_args ext.ext_private ext.ext_args ext.ext_ret_type
-      path_ext Record_extension
-  in
-    { cstr_name = Path.last path_ext;
-      cstr_res = ty_res;
-      cstr_existentials = existentials;
-      cstr_args;
-      cstr_arity = List.length cstr_args;
-      cstr_tag = Cstr_extension(path_ext, cstr_args = []);
-      cstr_consts = -1;
-      cstr_nonconsts = -1;
-      cstr_private = ext.ext_private;
-      cstr_normal = -1;
-      cstr_generalized = ext.ext_ret_type <> None;
-      cstr_loc = ext.ext_loc;
-      cstr_attributes = ext.ext_attributes;
-      cstr_inlined;
-    }
-
-let none = {desc = Ttuple []; level = -1; id = -1}
-                                        (* Clearly ill-formed type *)
-let dummy_label =
-  { lbl_name = ""; lbl_res = none; lbl_arg = none; lbl_mut = Immutable;
-    lbl_pos = (-1); lbl_all = [||]; lbl_repres = Record_regular;
-    lbl_private = Public;
-    lbl_loc = Location.none;
-    lbl_attributes = [];
-  }
-
-let label_descrs ty_res lbls repres priv =
-  let all_labels = Array.make (List.length lbls) dummy_label in
-  let rec describe_labels num = function
-      [] -> []
-    | l :: rest ->
-        let lbl =
-          { lbl_name = Ident.name l.ld_id;
-            lbl_res = ty_res;
-            lbl_arg = l.ld_type;
-            lbl_mut = l.ld_mutable;
-            lbl_pos = num;
-            lbl_all = all_labels;
-            lbl_repres = repres;
-            lbl_private = priv;
-            lbl_loc = l.ld_loc;
-            lbl_attributes = l.ld_attributes;
-          } in
-        all_labels.(num) <- lbl;
-        (l.ld_id, lbl) :: describe_labels (num+1) rest in
-  describe_labels 0 lbls
-
-exception Constr_not_found
-
-let rec find_constr tag num_const num_nonconst = function
-    [] ->
-      raise Constr_not_found
-  | {cd_args = Cstr_tuple []; _} as c  :: rem ->
-      if Types.equal_tag tag  (Cstr_constant num_const)
-      then c
-      else find_constr tag (num_const + 1) num_nonconst rem
-  | c :: rem ->
-      if Types.equal_tag tag (Cstr_block num_nonconst) || tag = Cstr_unboxed
-      then c
-      else find_constr tag num_const (num_nonconst + 1) rem
-
-let find_constr_by_tag tag cstrlist =
-  find_constr tag 0 0 cstrlist
-
-let constructors_of_type ty_path decl =
-  match decl.type_kind with
-  | Type_variant cstrs -> constructor_descrs ty_path decl cstrs
-  | Type_record _ | Type_abstract | Type_open -> []
-
-let labels_of_type ty_path decl =
-  match decl.type_kind with
-  | Type_record(labels, rep) ->
-      label_descrs (newgenconstr ty_path decl.type_params)
-        labels rep decl.type_private
-  | Type_variant _ | Type_abstract | Type_open -> []
-
-(* Set row_name in Env, cf. GPR#1204/1329 *)
-let set_row_name decl path =
-  match decl.type_manifest with
-    None -> ()
-  | Some ty ->
-      let ty = repr ty in
-      match ty.desc with
-        Tvariant row when static_row row ->
-          let row = {(row_repr row) with
-                     row_name = Some (path, decl.type_params)} in
-          ty.desc <- Tvariant row
-      | _ -> ()
diff --git a/jscomp/ml/datarepr.mli b/jscomp/ml/datarepr.mli
deleted file mode 100644
index f6bc50f..0000000
--- a/jscomp/ml/datarepr.mli
+++ /dev/null
@@ -1,51 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Compute constructor and label descriptions from type declarations,
-   determining their representation. *)
-
-open Types
-
-val constructor_has_optional_shape:
-  Types.constructor_description -> bool
-
-val extension_descr:
-  Path.t -> extension_constructor -> constructor_description
-
-val labels_of_type:
-  Path.t -> type_declaration ->
-  (Ident.t * label_description) list
-val constructors_of_type:
-  Path.t -> type_declaration ->
-  (Ident.t * constructor_description) list
-
-
-exception Constr_not_found
-
-val find_constr_by_tag:
-  constructor_tag -> constructor_declaration list ->
-    constructor_declaration
-
-val constructor_existentials :
-    constructor_arguments -> type_expr option -> type_expr list * type_expr list
-(** Takes [cd_args] and [cd_res] from a [constructor_declaration] and
-    returns:
-    - the types of the constructor's arguments
-    - the existential variables introduced by the constructor
- *)
-
-
-(* Set the polymorphic variant row_name field *)
-val set_row_name : type_declaration -> Path.t -> unit
diff --git a/jscomp/ml/depend.ml b/jscomp/ml/depend.ml
deleted file mode 100644
index 5a4a336..0000000
--- a/jscomp/ml/depend.ml
+++ /dev/null
@@ -1,501 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1999 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Asttypes
-open Location
-open Longident
-open Parsetree
-
-let pp_deps = ref []
-
-module StringSet = Set.Make(struct type t = string let compare = compare end)
-module StringMap = Map.Make(String)
-
-(* Module resolution map *)
-(* Node (set of imports for this path, map for submodules) *)
-type map_tree = Node of StringSet.t * bound_map
-and  bound_map = map_tree StringMap.t
-let bound = Node (StringSet.empty, StringMap.empty)
-
-(*let get_free (Node (s, _m)) = s*)
-let get_map (Node (_s, m)) = m
-let make_leaf s = Node (StringSet.singleton s, StringMap.empty)
-let make_node m =  Node (StringSet.empty, m)
-let rec weaken_map s (Node(s0,m0)) =
-  Node (StringSet.union s s0, StringMap.map (weaken_map s) m0)
-let rec collect_free (Node (s, m)) =
-  StringMap.fold (fun _ n -> StringSet.union (collect_free n)) m s
-
-(* Returns the imports required to access the structure at path p *)
-(* Only raises Not_found if the head of p is not in the toplevel map *)
-let rec lookup_free p m =
-  match p with
-    [] -> raise Not_found
-  | s::p ->
-      let Node (f, m') = StringMap.find s m  in
-      try lookup_free p m' with Not_found -> f
-
-(* Returns the node corresponding to the structure at path p *)
-let rec lookup_map lid m =
-  match lid with
-    Lident s    -> StringMap.find s m
-  | Ldot (l, s) -> StringMap.find s (get_map (lookup_map l m))
-  | Lapply _    -> raise Not_found
-
-(* Collect free module identifiers in the a.s.t. *)
-
-let free_structure_names = ref StringSet.empty
-
-let add_names s =
-  free_structure_names := StringSet.union s !free_structure_names
-
-let rec add_path bv ?(p=[]) = function
-  | Lident s ->
-      let free =
-        try lookup_free (s::p) bv with Not_found -> StringSet.singleton s
-      in
-      (*StringSet.iter (fun s -> Printf.eprintf "%s " s) free;
-        prerr_endline "";*)
-      add_names free
-  | Ldot(l, s) -> add_path bv ~p:(s::p) l
-  | Lapply(l1, l2) -> add_path bv l1; add_path bv l2
-
-let open_module bv lid =
-  match lookup_map lid bv with
-  | Node (s, m) ->
-      add_names s;
-      StringMap.fold StringMap.add m bv
-  | exception Not_found ->
-      add_path bv lid; bv
-
-let add_parent bv lid =
-  match lid.txt with
-    Ldot(l, _s) -> add_path bv l
-  | _ -> ()
-
-let add = add_parent
-
-let addmodule bv lid = add_path bv lid.txt
-
-let handle_extension ext =
-  match (fst ext).txt with
-  | "error" | "ocaml.error" ->
-    raise (Location.Error
-             (Builtin_attributes.error_of_extension ext))
-  | _ ->
-    ()
-
-let rec add_type bv ty =
-  match ty.ptyp_desc with
-    Ptyp_any -> ()
-  | Ptyp_var _ -> ()
-  | Ptyp_arrow(_, t1, t2) -> add_type bv t1; add_type bv t2
-  | Ptyp_tuple tl -> List.iter (add_type bv) tl
-  | Ptyp_constr(c, tl) -> add bv c; List.iter (add_type bv) tl
-  | Ptyp_object (fl, _) ->
-      List.iter
-       (function Otag (_, _, t) -> add_type bv t
-         | Oinherit t -> add_type bv t) fl
-  | Ptyp_class(c, tl) -> add bv c; List.iter (add_type bv) tl
-  | Ptyp_alias(t, _) -> add_type bv t
-  | Ptyp_variant(fl, _, _) ->
-      List.iter
-        (function Rtag(_,_,_,stl) -> List.iter (add_type bv) stl
-          | Rinherit sty -> add_type bv sty)
-        fl
-  | Ptyp_poly(_, t) -> add_type bv t
-  | Ptyp_package pt -> add_package_type bv pt
-  | Ptyp_extension e -> handle_extension e
-
-and add_package_type bv (lid, l) =
-  add bv lid;
-  List.iter (add_type bv) (List.map (fun (_, e) -> e) l)
-
-let add_opt add_fn bv = function
-    None -> ()
-  | Some x -> add_fn bv x
-
-let add_constructor_arguments bv = function
-  | Pcstr_tuple l -> List.iter (add_type bv) l
-  | Pcstr_record l -> List.iter (fun l -> add_type bv l.pld_type) l
-
-let add_constructor_decl bv pcd =
-  add_constructor_arguments bv pcd.pcd_args;
-  Misc.may (add_type bv) pcd.pcd_res
-
-let add_type_declaration bv td =
-  List.iter
-    (fun (ty1, ty2, _) -> add_type bv ty1; add_type bv ty2)
-    td.ptype_cstrs;
-  add_opt add_type bv td.ptype_manifest;
-  let add_tkind = function
-    Ptype_abstract -> ()
-  | Ptype_variant cstrs ->
-      List.iter (add_constructor_decl bv) cstrs
-  | Ptype_record lbls ->
-      List.iter (fun pld -> add_type bv pld.pld_type) lbls
-  | Ptype_open -> () in
-  add_tkind td.ptype_kind
-
-let add_extension_constructor bv ext =
-  match ext.pext_kind with
-    Pext_decl(args, rty) ->
-      add_constructor_arguments bv args;
-      Misc.may (add_type bv) rty
-  | Pext_rebind lid -> add bv lid
-
-let add_type_extension bv te =
-  add bv te.ptyext_path;
-  List.iter (add_extension_constructor bv) te.ptyext_constructors
-
-let rec add_class_type bv cty =
-  match cty.pcty_desc with
-    Pcty_constr(l, tyl) ->
-      add bv l; List.iter (add_type bv) tyl
-  | Pcty_signature { pcsig_self = ty; pcsig_fields = fieldl } ->
-      add_type bv ty;
-      List.iter (add_class_type_field bv) fieldl
-  | Pcty_arrow(_, ty1, cty2) ->
-      add_type bv ty1; add_class_type bv cty2
-  | Pcty_extension e -> handle_extension e
-  | Pcty_open (_ovf, m, e) ->
-      let bv = open_module bv m.txt in add_class_type bv e
-
-and add_class_type_field bv pctf =
-  match pctf.pctf_desc with
-    Pctf_inherit cty -> add_class_type bv cty
-  | Pctf_val(_, _, _, ty) -> add_type bv ty
-  | Pctf_method(_, _, _, ty) -> add_type bv ty
-  | Pctf_constraint(ty1, ty2) -> add_type bv ty1; add_type bv ty2
-  | Pctf_attribute _ -> ()
-  | Pctf_extension e -> handle_extension e
-
-let add_class_description bv infos =
-  add_class_type bv infos.pci_expr
-
-let add_class_type_declaration = add_class_description
-
-let pattern_bv = ref StringMap.empty
-
-let rec add_pattern bv pat =
-  match pat.ppat_desc with
-    Ppat_any -> ()
-  | Ppat_var _ -> ()
-  | Ppat_alias(p, _) -> add_pattern bv p
-  | Ppat_interval _
-  | Ppat_constant _ -> ()
-  | Ppat_tuple pl -> List.iter (add_pattern bv) pl
-  | Ppat_construct(c, op) -> add bv c; add_opt add_pattern bv op
-  | Ppat_record(pl, _) ->
-      List.iter (fun (lbl, p) -> add bv lbl; add_pattern bv p) pl
-  | Ppat_array pl -> List.iter (add_pattern bv) pl
-  | Ppat_or(p1, p2) -> add_pattern bv p1; add_pattern bv p2
-  | Ppat_constraint(p, ty) -> add_pattern bv p; add_type bv ty
-  | Ppat_variant(_, op) -> add_opt add_pattern bv op
-  | Ppat_type li -> add bv li
-  | Ppat_lazy p -> add_pattern bv p
-  | Ppat_unpack id -> pattern_bv := StringMap.add id.txt bound !pattern_bv
-  | Ppat_open ( m, p) -> let bv = open_module bv m.txt in add_pattern bv p
-  | Ppat_exception p -> add_pattern bv p
-  | Ppat_extension e -> handle_extension e
-
-let add_pattern bv pat =
-  pattern_bv := bv;
-  add_pattern bv pat;
-  !pattern_bv
-
-let rec add_expr bv exp =
-  match exp.pexp_desc with
-    Pexp_ident l -> add bv l
-  | Pexp_constant _ -> ()
-  | Pexp_let(rf, pel, e) ->
-      let bv = add_bindings rf bv pel in add_expr bv e
-  | Pexp_fun (_, opte, p, e) ->
-      add_opt add_expr bv opte; add_expr (add_pattern bv p) e
-  | Pexp_function pel ->
-      add_cases bv pel
-  | Pexp_apply(e, el) ->
-      add_expr bv e; List.iter (fun (_,e) -> add_expr bv e) el
-  | Pexp_match(e, pel) -> add_expr bv e; add_cases bv pel
-  | Pexp_try(e, pel) -> add_expr bv e; add_cases bv pel
-  | Pexp_tuple el -> List.iter (add_expr bv) el
-  | Pexp_construct(c, opte) -> add bv c; add_opt add_expr bv opte
-  | Pexp_variant(_, opte) -> add_opt add_expr bv opte
-  | Pexp_record(lblel, opte) ->
-      List.iter (fun (lbl, e) -> add bv lbl; add_expr bv e) lblel;
-      add_opt add_expr bv opte
-  | Pexp_field(e, fld) -> add_expr bv e; add bv fld
-  | Pexp_setfield(e1, fld, e2) -> add_expr bv e1; add bv fld; add_expr bv e2
-  | Pexp_array el -> List.iter (add_expr bv) el
-  | Pexp_ifthenelse(e1, e2, opte3) ->
-      add_expr bv e1; add_expr bv e2; add_opt add_expr bv opte3
-  | Pexp_sequence(e1, e2) -> add_expr bv e1; add_expr bv e2
-  | Pexp_while(e1, e2) -> add_expr bv e1; add_expr bv e2
-  | Pexp_for( _, e1, e2, _, e3) ->
-      add_expr bv e1; add_expr bv e2; add_expr bv e3
-  | Pexp_coerce(e1, oty2, ty3) ->
-      add_expr bv e1;
-      add_opt add_type bv oty2;
-      add_type bv ty3
-  | Pexp_constraint(e1, ty2) ->
-      add_expr bv e1;
-      add_type bv ty2
-  | Pexp_send(e, _m) -> add_expr bv e
-  | Pexp_new li -> add bv li
-  | Pexp_setinstvar(_v, e) -> add_expr bv e
-  | Pexp_override sel -> List.iter (fun (_s, e) -> add_expr bv e) sel
-  | Pexp_letmodule(id, m, e) ->
-      let b = add_module_binding bv m in
-      add_expr (StringMap.add id.txt b bv) e
-  | Pexp_letexception(_, e) -> add_expr bv e
-  | Pexp_assert (e) -> add_expr bv e
-  | Pexp_lazy (e) -> add_expr bv e
-  | Pexp_poly (e, t) -> add_expr bv e; add_opt add_type bv t
-  | Pexp_object { pcstr_self = pat; pcstr_fields = fieldl } ->
-      let bv = add_pattern bv pat in List.iter (add_class_field bv) fieldl
-  | Pexp_newtype (_, e) -> add_expr bv e
-  | Pexp_pack m -> add_module bv m
-  | Pexp_open (_ovf, m, e) ->
-      let bv = open_module bv m.txt in add_expr bv e
-  | Pexp_extension (({ txt = ("ocaml.extension_constructor"|
-                              "extension_constructor"); _ },
-                     PStr [item]) as e) ->
-      begin match item.pstr_desc with
-      | Pstr_eval ({ pexp_desc = Pexp_construct (c, None) }, _) -> add bv c
-      | _ -> handle_extension e
-      end
-  | Pexp_extension e -> handle_extension e
-  | Pexp_unreachable -> ()
-
-and add_cases bv cases =
-  List.iter (add_case bv) cases
-
-and add_case bv {pc_lhs; pc_guard; pc_rhs} =
-  let bv = add_pattern bv pc_lhs in
-  add_opt add_expr bv pc_guard;
-  add_expr bv pc_rhs
-
-and add_bindings recf bv pel =
-  let bv' = List.fold_left (fun bv x -> add_pattern bv x.pvb_pat) bv pel in
-  let bv = if recf = Recursive then bv' else bv in
-  List.iter (fun x -> add_expr bv x.pvb_expr) pel;
-  bv'
-
-and add_modtype bv mty =
-  match mty.pmty_desc with
-    Pmty_ident l -> add bv l
-  | Pmty_alias l -> addmodule bv l
-  | Pmty_signature s -> add_signature bv s
-  | Pmty_functor(id, mty1, mty2) ->
-      Misc.may (add_modtype bv) mty1;
-      add_modtype (StringMap.add id.txt bound bv) mty2
-  | Pmty_with(mty, cstrl) ->
-      add_modtype bv mty;
-      List.iter
-        (function
-          | Pwith_type (_, td) -> add_type_declaration bv td
-          | Pwith_module (_, lid) -> addmodule bv lid
-          | Pwith_typesubst (_, td) -> add_type_declaration bv td
-          | Pwith_modsubst (_, lid) -> addmodule bv lid
-        )
-        cstrl
-  | Pmty_typeof m -> add_module bv m
-  | Pmty_extension e -> handle_extension e
-
-and add_module_alias bv l =
-  try
-    add_parent bv l;
-    lookup_map l.txt bv
-  with Not_found ->
-    match l.txt with
-      Lident s -> make_leaf s
-    | _ -> addmodule bv l; bound (* cannot delay *)
-
-and add_modtype_binding bv mty =
-  if not !Clflags.transparent_modules then add_modtype bv mty;
-  match mty.pmty_desc with
-    Pmty_alias l ->
-      add_module_alias bv l
-  | Pmty_signature s ->
-      make_node (add_signature_binding bv s)
-  | Pmty_typeof modl ->
-      add_module_binding bv modl
-  | _ ->
-      if !Clflags.transparent_modules then add_modtype bv mty; bound
-
-and add_signature bv sg =
-  ignore (add_signature_binding bv sg)
-
-and add_signature_binding bv sg =
-  snd (List.fold_left add_sig_item (bv, StringMap.empty) sg)
-
-and add_sig_item (bv, m) item =
-  match item.psig_desc with
-    Psig_value vd ->
-      add_type bv vd.pval_type; (bv, m)
-  | Psig_type (_, dcls) ->
-      List.iter (add_type_declaration bv) dcls; (bv, m)
-  | Psig_typext te ->
-      add_type_extension bv te; (bv, m)
-  | Psig_exception pext ->
-      add_extension_constructor bv pext; (bv, m)
-  | Psig_module pmd ->
-      let m' = add_modtype_binding bv pmd.pmd_type in
-      let add = StringMap.add pmd.pmd_name.txt m' in
-      (add bv, add m)
-  | Psig_recmodule decls ->
-      let add =
-        List.fold_right (fun pmd -> StringMap.add pmd.pmd_name.txt bound)
-                        decls
-      in
-      let bv' = add bv and m' = add m in
-      List.iter (fun pmd -> add_modtype bv' pmd.pmd_type) decls;
-      (bv', m')
-  | Psig_modtype x ->
-      begin match x.pmtd_type with
-        None -> ()
-      | Some mty -> add_modtype bv mty
-      end;
-      (bv, m)
-  | Psig_open od ->
-      (open_module bv od.popen_lid.txt, m)
-  | Psig_include incl ->
-      let Node (s, m') = add_modtype_binding bv incl.pincl_mod in
-      add_names s;
-      let add = StringMap.fold StringMap.add m' in
-      (add bv, add m)
-  | Psig_class () ->
-      (bv, m)
-  | Psig_class_type cdtl ->
-      List.iter (add_class_type_declaration bv) cdtl; (bv, m)
-  | Psig_attribute _ -> (bv, m)
-  | Psig_extension (e, _) ->
-      handle_extension e;
-      (bv, m)
-
-and add_module_binding bv modl =
-  if not !Clflags.transparent_modules then add_module bv modl;
-  match modl.pmod_desc with
-    Pmod_ident l ->
-      begin try
-        add_parent bv l;
-        lookup_map l.txt bv
-      with Not_found ->
-        match l.txt with
-          Lident s -> make_leaf s
-        | _ ->  addmodule bv l; bound
-      end
-  | Pmod_structure s ->
-      make_node (snd (add_structure_binding bv s))
-  | _ ->
-      if !Clflags.transparent_modules then add_module bv modl; bound
-
-and add_module bv modl =
-  match modl.pmod_desc with
-    Pmod_ident l -> addmodule bv l
-  | Pmod_structure s -> ignore (add_structure bv s)
-  | Pmod_functor(id, mty, modl) ->
-      Misc.may (add_modtype bv) mty;
-      add_module (StringMap.add id.txt bound bv) modl
-  | Pmod_apply(mod1, mod2) ->
-      add_module bv mod1; add_module bv mod2
-  | Pmod_constraint(modl, mty) ->
-      add_module bv modl; add_modtype bv mty
-  | Pmod_unpack(e) ->
-      add_expr bv e
-  | Pmod_extension e ->
-      handle_extension e
-
-and add_structure bv item_list =
-  let (bv, m) = add_structure_binding bv item_list in
-  add_names (collect_free (make_node m));
-  bv
-
-and add_structure_binding bv item_list =
-  List.fold_left add_struct_item (bv, StringMap.empty) item_list
-
-and add_struct_item (bv, m) item : _ StringMap.t * _ StringMap.t =
-  match item.pstr_desc with
-    Pstr_eval (e, _attrs) ->
-      add_expr bv e; (bv, m)
-  | Pstr_value(rf, pel) ->
-      let bv = add_bindings rf bv pel in (bv, m)
-  | Pstr_primitive vd ->
-      add_type bv vd.pval_type; (bv, m)
-  | Pstr_type (_, dcls) ->
-      List.iter (add_type_declaration bv) dcls; (bv, m)
-  | Pstr_typext te ->
-      add_type_extension bv te;
-      (bv, m)
-  | Pstr_exception pext ->
-      add_extension_constructor bv pext; (bv, m)
-  | Pstr_module x ->
-      let b = add_module_binding bv x.pmb_expr in
-      let add = StringMap.add x.pmb_name.txt b in
-      (add bv, add m)
-  | Pstr_recmodule bindings ->
-      let add =
-        List.fold_right (fun x -> StringMap.add x.pmb_name.txt bound) bindings
-      in
-      let bv' = add bv and m = add m in
-      List.iter
-        (fun x -> add_module bv' x.pmb_expr)
-        bindings;
-      (bv', m)
-  | Pstr_modtype x ->
-      begin match x.pmtd_type with
-        None -> ()
-      | Some mty -> add_modtype bv mty
-      end;
-      (bv, m)
-  | Pstr_open od ->
-      (open_module bv od.popen_lid.txt, m)
-  | Pstr_class () ->
-      (bv,m)
-  | Pstr_class_type cdtl ->
-      List.iter (add_class_type_declaration bv) cdtl; (bv, m)
-  | Pstr_include incl ->
-      let Node (s, m') = add_module_binding bv incl.pincl_mod in
-      add_names s;
-      let add = StringMap.fold StringMap.add m' in
-      (add bv, add m)
-  | Pstr_attribute _ -> (bv, m)
-  | Pstr_extension (e, _) ->
-      handle_extension e;
-      (bv, m)
-
-
-and add_implementation bv l =
-  if !Clflags.transparent_modules then
-    ignore (add_structure_binding bv l)
-  else ignore (add_structure bv l)
-
-and add_implementation_binding bv l =
-  snd (add_structure_binding bv l)
-
-
-
-and add_class_field bv pcf =
-  match pcf.pcf_desc with
-    Pcf_inherit() -> ()
-  | Pcf_val(_, _, Cfk_concrete (_, e))
-  | Pcf_method(_, _, Cfk_concrete (_, e)) -> add_expr bv e
-  | Pcf_val(_, _, Cfk_virtual ty)
-  | Pcf_method(_, _, Cfk_virtual ty) -> add_type bv ty
-  | Pcf_constraint(ty1, ty2) -> add_type bv ty1; add_type bv ty2
-  | Pcf_initializer e -> add_expr bv e
-  | Pcf_attribute _ -> ()
-  | Pcf_extension e -> handle_extension e
-
diff --git a/jscomp/ml/docstrings.ml b/jscomp/ml/docstrings.ml
deleted file mode 100644
index 85c58ad..0000000
--- a/jscomp/ml/docstrings.ml
+++ /dev/null
@@ -1,343 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                               Leo White                                *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Location
-
-(* Docstrings *)
-
-(* A docstring is "attached" if it has been inserted in the AST. This
-   is used for generating unexpected docstring warnings. *)
-type ds_attached =
-  | Unattached   (* Not yet attached anything.*)
-  | Info         (* Attached to a field or constructor. *)
-  | Docs         (* Attached to an item or as floating text. *)
-
-(* A docstring is "associated" with an item if there are no blank lines between
-   them. This is used for generating docstring ambiguity warnings. *)
-type ds_associated =
-  | Zero             (* Not associated with an item *)
-  | One              (* Associated with one item *)
-  | Many             (* Associated with multiple items (ambiguity) *)
-
-type docstring =
-  { ds_body: string;
-    ds_loc: Location.t;
-    mutable ds_attached: ds_attached;
-    mutable ds_associated: ds_associated; }
-
-(* List of docstrings *)
-
-let docstrings : docstring list ref = ref []
-
-(* Warn for unused and ambiguous docstrings *)
-
-let warn_bad_docstrings () =
-  if Warnings.is_active (Warnings.Bad_docstring true) then begin
-    List.iter
-      (fun ds ->
-         match ds.ds_attached with
-         | Info -> ()
-         | Unattached ->
-           prerr_warning ds.ds_loc (Warnings.Bad_docstring true)
-         | Docs ->
-             match ds.ds_associated with
-             | Zero | One -> ()
-             | Many ->
-               prerr_warning ds.ds_loc (Warnings.Bad_docstring false))
-      (List.rev !docstrings)
-end
-
-(* Docstring constructors and destructors *)
-
-let docstring body loc =
-  let ds =
-    { ds_body = body;
-      ds_loc = loc;
-      ds_attached = Unattached;
-      ds_associated = Zero; }
-  in
-  ds
-
-let register ds =
-  docstrings := ds :: !docstrings
-
-let docstring_body ds = ds.ds_body
-
-let docstring_loc ds = ds.ds_loc
-
-(* Docstrings attached to items *)
-
-type docs =
-  { docs_pre: docstring option;
-    docs_post: docstring option; }
-
-let empty_docs = { docs_pre = None; docs_post = None }
-
-let doc_loc = {txt = "ocaml.doc"; loc = Location.none}
-
-let docs_attr ds =
-  let open Parsetree in
-  let exp =
-    { pexp_desc = Pexp_constant (Pconst_string(ds.ds_body, None));
-      pexp_loc = ds.ds_loc;
-      pexp_attributes = []; }
-  in
-  let item =
-    { pstr_desc = Pstr_eval (exp, []); pstr_loc = exp.pexp_loc }
-  in
-    (doc_loc, PStr [item])
-
-let add_docs_attrs docs attrs =
-  let attrs =
-    match docs.docs_pre with
-    | None | Some { ds_body=""; _ } -> attrs
-    | Some ds -> docs_attr ds :: attrs
-  in
-  let attrs =
-    match docs.docs_post with
-    | None | Some { ds_body=""; _ } -> attrs
-    | Some ds -> attrs @ [docs_attr ds]
-  in
-  attrs
-
-(* Docstrings attached to constructors or fields *)
-
-type info = docstring option
-
-let empty_info = None
-
-let info_attr = docs_attr
-
-let add_info_attrs info attrs =
-  match info with
-  | None | Some {ds_body=""; _} -> attrs
-  | Some ds -> attrs @ [info_attr ds]
-
-(* Docstrings not attached to a specific item *)
-
-type text = docstring list
-
-let empty_text = []
-let empty_text_lazy = lazy []
-
-let text_loc = {txt = "ocaml.text"; loc = Location.none}
-
-let text_attr ds =
-  let open Parsetree in
-  let exp =
-    { pexp_desc = Pexp_constant (Pconst_string(ds.ds_body, None));
-      pexp_loc = ds.ds_loc;
-      pexp_attributes = []; }
-  in
-  let item =
-    { pstr_desc = Pstr_eval (exp, []); pstr_loc = exp.pexp_loc }
-  in
-    (text_loc, PStr [item])
-
-let add_text_attrs dsl attrs =
-  let fdsl = Ext_list.filter dsl (function {ds_body=""} -> false| _ ->true) in
-  (List.map text_attr fdsl) @ attrs
-
-(* Find the first non-info docstring in a list, attach it and return it *)
-let get_docstring ~info dsl =
-  let rec loop = function
-    | [] -> None
-    | {ds_attached = Info; _} :: rest -> loop rest
-    | ds :: _ ->
-        ds.ds_attached <- if info then Info else Docs;
-        Some ds
-  in
-  loop dsl
-
-(* Find all the non-info docstrings in a list, attach them and return them *)
-let get_docstrings dsl =
-  let rec loop acc = function
-    | [] -> List.rev acc
-    | {ds_attached = Info; _} :: rest -> loop acc rest
-    | ds :: rest ->
-        ds.ds_attached <- Docs;
-        loop (ds :: acc) rest
-  in
-    loop [] dsl
-
-(* "Associate" all the docstrings in a list *)
-let associate_docstrings dsl =
-  List.iter
-    (fun ds ->
-       match ds.ds_associated with
-       | Zero -> ds.ds_associated <- One
-       | (One | Many) -> ds.ds_associated <- Many)
-    dsl
-
-(* Map from positions to pre docstrings *)
-
-let pre_table : (Lexing.position, docstring list) Hashtbl.t =
-  Hashtbl.create 50
-
-let set_pre_docstrings pos dsl =
-  if dsl <> [] then Hashtbl.add pre_table pos dsl
-
-let get_pre_docs pos =
-  try
-    let dsl = Hashtbl.find pre_table pos in
-      associate_docstrings dsl;
-      get_docstring ~info:false dsl
-  with Not_found -> None
-
-let mark_pre_docs pos =
-  try
-    let dsl = Hashtbl.find pre_table pos in
-      associate_docstrings dsl
-  with Not_found -> ()
-
-(* Map from positions to post docstrings *)
-
-let post_table : (Lexing.position, docstring list) Hashtbl.t =
-  Hashtbl.create 50
-
-let set_post_docstrings pos dsl =
-  if dsl <> [] then Hashtbl.add post_table pos dsl
-
-let get_post_docs pos =
-  try
-    let dsl = Hashtbl.find post_table pos in
-      associate_docstrings dsl;
-      get_docstring ~info:false dsl
-  with Not_found -> None
-
-let mark_post_docs pos =
-  try
-    let dsl = Hashtbl.find post_table pos in
-      associate_docstrings dsl
-  with Not_found -> ()
-
-let get_info pos =
-  try
-    let dsl = Hashtbl.find post_table pos in
-      get_docstring ~info:true dsl
-  with Not_found -> None
-
-(* Map from positions to floating docstrings *)
-
-let floating_table : (Lexing.position, docstring list) Hashtbl.t =
-  Hashtbl.create 50
-
-let set_floating_docstrings pos dsl =
-  if dsl <> [] then Hashtbl.add floating_table pos dsl
-
-let get_text pos =
-  try
-    let dsl = Hashtbl.find floating_table pos in
-      get_docstrings dsl
-  with Not_found -> []
-
-(* Maps from positions to extra docstrings *)
-
-let pre_extra_table : (Lexing.position, docstring list) Hashtbl.t =
-  Hashtbl.create 50
-
-let set_pre_extra_docstrings pos dsl =
-  if dsl <> [] then Hashtbl.add pre_extra_table pos dsl
-
-let get_pre_extra_text pos =
-  try
-    let dsl = Hashtbl.find pre_extra_table pos in
-      get_docstrings dsl
-  with Not_found -> []
-
-let post_extra_table : (Lexing.position, docstring list) Hashtbl.t =
-  Hashtbl.create 50
-
-let set_post_extra_docstrings pos dsl =
-  if dsl <> [] then Hashtbl.add post_extra_table pos dsl
-
-let get_post_extra_text pos =
-  try
-    let dsl = Hashtbl.find post_extra_table pos in
-      get_docstrings dsl
-  with Not_found -> []
-
-(* Docstrings from parser actions *)
-
-let symbol_docs () =
-  { docs_pre = get_pre_docs (Parsing.symbol_start_pos ());
-    docs_post = get_post_docs (Parsing.symbol_end_pos ()); }
-
-let symbol_docs_lazy () =
-  let p1 = Parsing.symbol_start_pos () in
-  let p2 = Parsing.symbol_end_pos () in
-    lazy { docs_pre = get_pre_docs p1;
-           docs_post = get_post_docs p2; }
-
-let rhs_docs pos1 pos2 =
-  { docs_pre = get_pre_docs (Parsing.rhs_start_pos pos1);
-    docs_post = get_post_docs (Parsing.rhs_end_pos pos2); }
-
-let rhs_docs_lazy pos1 pos2 =
-  let p1 = Parsing.rhs_start_pos pos1 in
-  let p2 = Parsing.rhs_end_pos pos2 in
-    lazy { docs_pre = get_pre_docs p1;
-           docs_post = get_post_docs p2; }
-
-let mark_symbol_docs () =
-  mark_pre_docs (Parsing.symbol_start_pos ());
-  mark_post_docs (Parsing.symbol_end_pos ())
-
-let mark_rhs_docs pos1 pos2 =
-  mark_pre_docs (Parsing.rhs_start_pos pos1);
-  mark_post_docs (Parsing.rhs_end_pos pos2)
-
-let symbol_info () =
-  get_info (Parsing.symbol_end_pos ())
-
-let rhs_info pos =
-  get_info (Parsing.rhs_end_pos pos)
-
-let symbol_text () =
-  get_text (Parsing.symbol_start_pos ())
-
-let symbol_text_lazy () =
-  let pos = Parsing.symbol_start_pos () in
-    lazy (get_text pos)
-
-let rhs_text pos =
-  get_text (Parsing.rhs_start_pos pos)
-
-let rhs_text_lazy pos =
-  let pos = Parsing.rhs_start_pos pos in
-    lazy (get_text pos)
-
-let symbol_pre_extra_text () =
-  get_pre_extra_text (Parsing.symbol_start_pos ())
-
-let symbol_post_extra_text () =
-  get_post_extra_text (Parsing.symbol_end_pos ())
-
-let rhs_pre_extra_text pos =
-  get_pre_extra_text (Parsing.rhs_start_pos pos)
-
-let rhs_post_extra_text pos =
-  get_post_extra_text (Parsing.rhs_end_pos pos)
-
-
-(* (Re)Initialise all comment state *)
-
-let init () =
-  docstrings := [];
-  Hashtbl.reset pre_table;
-  Hashtbl.reset post_table;
-  Hashtbl.reset floating_table;
-  Hashtbl.reset pre_extra_table;
-  Hashtbl.reset post_extra_table
diff --git a/jscomp/ml/docstrings.mli b/jscomp/ml/docstrings.mli
deleted file mode 100644
index 892a80e..0000000
--- a/jscomp/ml/docstrings.mli
+++ /dev/null
@@ -1,157 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                               Leo White                                *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Documentation comments *)
-
-(** (Re)Initialise all docstring state *)
-val init : unit -> unit
-
-(** Emit warnings for unattached and ambiguous docstrings *)
-val warn_bad_docstrings : unit -> unit
-
-(** {2 Docstrings} *)
-
-(** Documentation comments *)
-type docstring
-
-(** Create a docstring *)
-val docstring : string -> Location.t -> docstring
-
-(** Register a docstring *)
-val register : docstring -> unit
-
-(** Get the text of a docstring *)
-val docstring_body : docstring -> string
-
-(** Get the location of a docstring *)
-val docstring_loc : docstring -> Location.t
-
-(** {2 Set functions}
-
-   These functions are used by the lexer to associate docstrings to
-   the locations of tokens. *)
-
-(** Docstrings immediately preceding a token *)
-val set_pre_docstrings : Lexing.position -> docstring list -> unit
-
-(** Docstrings immediately following a token *)
-val set_post_docstrings : Lexing.position -> docstring list -> unit
-
-(** Docstrings not immediately adjacent to a token *)
-val set_floating_docstrings : Lexing.position -> docstring list -> unit
-
-(** Docstrings immediately following the token which precedes this one *)
-val set_pre_extra_docstrings : Lexing.position -> docstring list -> unit
-
-(** Docstrings immediately preceding the token which follows this one *)
-val set_post_extra_docstrings : Lexing.position -> docstring list -> unit
-
-(** {2 Items}
-
-    The {!docs} type represents documentation attached to an item. *)
-
-type docs =
-  { docs_pre: docstring option;
-    docs_post: docstring option; }
-
-val empty_docs : docs
-
-val docs_attr : docstring -> Parsetree.attribute
-
-(** Convert item documentation to attributes and add them to an
-    attribute list *)
-val add_docs_attrs : docs -> Parsetree.attributes -> Parsetree.attributes
-
-(** Fetch the item documentation for the current symbol. This also
-    marks this documentation (for ambiguity warnings). *)
-val symbol_docs : unit -> docs
-val symbol_docs_lazy : unit -> docs Lazy.t
-
-(** Fetch the item documentation for the symbols between two
-    positions. This also marks this documentation (for ambiguity
-    warnings). *)
-val rhs_docs : int -> int -> docs
-val rhs_docs_lazy : int -> int -> docs Lazy.t
-
-(** Mark the item documentation for the current symbol (for ambiguity
-    warnings). *)
-val mark_symbol_docs : unit -> unit
-
-(** Mark as associated the item documentation for the symbols between
-    two positions (for ambiguity warnings) *)
-val mark_rhs_docs : int -> int -> unit
-
-(** {2 Fields and constructors}
-
-    The {!info} type represents documentation attached to a field or
-    constructor. *)
-
-type info = docstring option
-
-val empty_info : info
-
-val info_attr : docstring -> Parsetree.attribute
-
-(** Convert field info to attributes and add them to an
-    attribute list *)
-val add_info_attrs : info -> Parsetree.attributes -> Parsetree.attributes
-
-(** Fetch the field info for the current symbol. *)
-val symbol_info : unit -> info
-
-(** Fetch the field info following the symbol at a given position. *)
-val rhs_info : int -> info
-
-(** {2 Unattached comments}
-
-    The {!text} type represents documentation which is not attached to
-    anything. *)
-
-type text = docstring list
-
-val empty_text : text
-val empty_text_lazy : text Lazy.t
-
-val text_attr : docstring -> Parsetree.attribute
-
-(** Convert text to attributes and add them to an attribute list *)
-val add_text_attrs : text -> Parsetree.attributes -> Parsetree.attributes
-
-(** Fetch the text preceding the current symbol. *)
-val symbol_text : unit -> text
-val symbol_text_lazy : unit -> text Lazy.t
-
-(** Fetch the text preceding the symbol at the given position. *)
-val rhs_text : int -> text
-val rhs_text_lazy : int -> text Lazy.t
-
-(** {2 Extra text}
-
-    There may be additional text attached to the delimiters of a block
-    (e.g. [struct] and [end]). This is fetched by the following
-    functions, which are applied to the contents of the block rather
-    than the delimiters. *)
-
-(** Fetch additional text preceding the current symbol *)
-val symbol_pre_extra_text : unit -> text
-
-(** Fetch additional text following the current symbol *)
-val symbol_post_extra_text : unit -> text
-
-(** Fetch additional text preceding the symbol at the given position *)
-val rhs_pre_extra_text : int -> text
-
-(** Fetch additional text following the symbol at the given position *)
-val rhs_post_extra_text : int -> text
diff --git a/jscomp/ml/dune b/jscomp/ml/dune
deleted file mode 100644
index 93a50c6..0000000
--- a/jscomp/ml/dune
+++ /dev/null
@@ -1,11 +0,0 @@
-(library
- (name ml)
- (wrapped false)
- (preprocess
-  (action
-   (run %{bin:cppo} %{env:CPPO_FLAGS=} %{input-file})))
- (flags
-  (:standard -w -A))
- (libraries ext js_parser))
-
-(ocamllex lexer)
diff --git a/jscomp/ml/env.ml b/jscomp/ml/env.ml
deleted file mode 100644
index 8a914c8..0000000
--- a/jscomp/ml/env.ml
+++ /dev/null
@@ -1,2325 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Environment handling *)
-
-open Cmi_format
-open Config
-open Misc
-open Asttypes
-open Longident
-open Path
-open Types
-open Btype
-
-
-
-let value_declarations : ((string * Location.t), (unit -> unit)) Hashtbl.t =
-  Hashtbl.create 16
-    (* This table is used to usage of value declarations.  A declaration is
-       identified with its name and location.  The callback attached to a
-       declaration is called whenever the value is used explicitly
-       (lookup_value) or implicitly (inclusion test between signatures,
-       cf Includemod.value_descriptions). *)
-
-let type_declarations = Hashtbl.create 16
-let module_declarations = Hashtbl.create 16
-
-type constructor_usage = Positive | Pattern | Privatize
-type constructor_usages =
-    {
-     mutable cu_positive: bool;
-     mutable cu_pattern: bool;
-     mutable cu_privatize: bool;
-    }
-let add_constructor_usage cu = function
-  | Positive -> cu.cu_positive <- true
-  | Pattern -> cu.cu_pattern <- true
-  | Privatize -> cu.cu_privatize <- true
-let constructor_usages () =
-  {cu_positive = false; cu_pattern = false; cu_privatize = false}
-
-let used_constructors :
-    (string * Location.t * string, (constructor_usage -> unit)) Hashtbl.t
-  = Hashtbl.create 16
-
-let prefixed_sg = Hashtbl.create 113
-
-type error =
-  | Illegal_renaming of string * string * string
-  | Inconsistent_import of string * string * string
-  | Need_recursive_types of string * string
-  | Missing_module of Location.t * Path.t * Path.t
-  | Illegal_value_name of Location.t * string
-
-exception Error of error
-
-let error err = raise (Error err)
-
-module EnvLazy : sig
-  type ('a,'b) t
-
-  type log
-
-  val force : ('a -> 'b) -> ('a,'b) t -> 'b
-  val create : 'a -> ('a,'b) t
-  val get_arg : ('a,'b) t -> 'a option
-
-  (* [force_logged log f t] is equivalent to [force f t] but if [f] returns [None] then
-     [t] is recorded in [log]. [backtrack log] will then reset all the recorded [t]s back
-     to their original state. *)
-  val log : unit -> log
-  val force_logged : log -> ('a -> 'b option) -> ('a,'b option) t -> 'b option
-  val backtrack : log -> unit
-
-end  = struct
-
-  type ('a,'b) t = ('a,'b) eval ref
-
-  and ('a,'b) eval =
-    | Done of 'b
-    | Raise of exn
-    | Thunk of 'a
-
-  type undo =
-    | Nil
-    | Cons : ('a, 'b) t * 'a * undo -> undo
-
-  type log = undo ref
-
-  let force f x =
-    match !x with
-    | Done x -> x
-    | Raise e -> raise e
-    | Thunk e ->
-        match f e with
-        | y ->
-          x := Done y;
-          y
-        | exception e ->
-          x := Raise e;
-          raise e
-
-  let get_arg x =
-    match !x with Thunk a -> Some a | _ -> None
-
-  let create x =
-    ref (Thunk x)
-
-  let log () =
-    ref Nil
-
-  let force_logged log f x =
-    match !x with
-    | Done x -> x
-    | Raise e -> raise e
-    | Thunk e ->
-      match f e with
-      | None ->
-          x := Done None;
-          log := Cons(x, e, !log);
-          None
-      | Some _ as y ->
-          x := Done y;
-          y
-      | exception e ->
-          x := Raise e;
-          raise e
-
-  let backtrack log =
-    let rec loop = function
-      | Nil -> ()
-      | Cons(x, e, rest) ->
-          x := Thunk e;
-          loop rest
-    in
-    loop !log
-
-end
-
-module PathMap = Map.Make(Path)
-
-type summary =
-    Env_empty
-  | Env_value of summary * Ident.t * value_description
-  | Env_type of summary * Ident.t * type_declaration
-  | Env_extension of summary * Ident.t * extension_constructor
-  | Env_module of summary * Ident.t * module_declaration
-  | Env_modtype of summary * Ident.t * modtype_declaration
-  | Env_class of unit
-  | Env_cltype of summary * Ident.t * class_type_declaration
-  | Env_open of summary * Path.t
-  | Env_functor_arg of summary * Ident.t
-  | Env_constraints of summary * type_declaration PathMap.t
-  | Env_copy_types of summary * string list
-
-module TycompTbl =
-  struct
-    (** This module is used to store components of types (i.e. labels
-        and constructors).  We keep a representation of each nested
-        "open" and the set of local bindings between each of them. *)
-
-    type 'a t = {
-      current: 'a Ident.tbl;
-      (** Local bindings since the last open. *)
-
-      opened: 'a opened option;
-      (** Symbolic representation of the last (innermost) open, if any. *)
-    }
-
-    and 'a opened = {
-      components: (string, 'a list) Tbl.t;
-      (** Components from the opened module. We keep a list of
-          bindings for each name, as in comp_labels and
-          comp_constrs. *)
-
-      using: (string -> ('a * 'a) option -> unit) option;
-      (** A callback to be applied when a component is used from this
-          "open".  This is used to detect unused "opens".  The
-          arguments are used to detect shadowing. *)
-
-      next: 'a t;
-      (** The table before opening the module. *)
-    }
-
-    let empty = { current = Ident.empty; opened = None }
-
-    let add id x tbl =
-      {tbl with current = Ident.add id x tbl.current}
-
-    let add_open slot wrap components next =
-      let using =
-        match slot with
-        | None -> None
-        | Some f -> Some (fun s x -> f s (wrap x))
-      in
-      {
-        current = Ident.empty;
-        opened = Some {using; components; next};
-      }
-
-    let rec find_same id tbl =
-      try Ident.find_same id tbl.current
-      with Not_found as exn ->
-        begin match tbl.opened with
-        | Some {next; _} -> find_same id next
-        | None -> raise exn
-        end
-
-    let nothing = fun () -> ()
-
-    let mk_callback rest name desc = function
-      | None -> nothing
-      | Some f ->
-          (fun () ->
-             match rest with
-             | [] -> f name None
-             | (hidden, _) :: _ -> f name (Some (desc, hidden))
-          )
-
-    let rec find_all name tbl =
-      List.map (fun (_id, desc) -> desc, nothing)
-        (Ident.find_all name tbl.current) @
-      match tbl.opened with
-      | None -> []
-      | Some {using; next; components} ->
-          let rest = find_all name next in
-          match Tbl.find_str name components with
-          | exception Not_found -> rest
-          | opened ->
-              List.map
-                (fun desc -> desc, mk_callback rest name desc using)
-                opened
-              @ rest
-
-    let rec fold_name f tbl acc =
-      let acc = Ident.fold_name (fun _id d -> f d) tbl.current acc in
-      match tbl.opened with
-      | Some {using = _; next; components} ->
-          acc
-          |> Tbl.fold
-            (fun _name -> List.fold_right (fun desc -> f desc))
-            components
-          |> fold_name f next
-      | None ->
-          acc
-
-    let rec local_keys tbl acc =
-      let acc = Ident.fold_all (fun k _ accu -> k::accu) tbl.current acc in
-      match tbl.opened with
-      | Some o -> local_keys o.next acc
-      | None -> acc
-
-    let diff_keys is_local tbl1 tbl2 =
-      let keys2 = local_keys tbl2 [] in
-      Ext_list.filter keys2
-        (fun id ->
-           is_local (find_same id tbl2) &&
-           try ignore (find_same id tbl1); false
-           with Not_found -> true)      
-
-  end
-
-
-module IdTbl =
-  struct
-    (** This module is used to store all kinds of components except
-        (labels and constructors) in environments.  We keep a
-        representation of each nested "open" and the set of local
-        bindings between each of them. *)
-
-
-    type 'a t = {
-      current: 'a Ident.tbl;
-      (** Local bindings since the last open *)
-
-      opened: 'a opened option;
-      (** Symbolic representation of the last (innermost) open, if any. *)
-    }
-
-    and 'a opened = {
-      root: Path.t;
-      (** The path of the opened module, to be prefixed in front of
-          its local names to produce a valid path in the current
-          environment. *)
-
-      components: (string, 'a * int) Tbl.t;
-      (** Components from the opened module. *)
-
-      using: (string -> ('a * 'a) option -> unit) option;
-      (** A callback to be applied when a component is used from this
-          "open".  This is used to detect unused "opens".  The
-          arguments are used to detect shadowing. *)
-
-      next: 'a t;
-      (** The table before opening the module. *)
-    }
-
-    let empty = { current = Ident.empty; opened = None }
-
-    let add id x tbl =
-      {tbl with current = Ident.add id x tbl.current}
-
-    let add_open slot wrap root components next =
-      let using =
-        match slot with
-        | None -> None
-        | Some f -> Some (fun s x -> f s (wrap x))
-      in
-      {
-        current = Ident.empty;
-        opened = Some {using; root; components; next};
-      }
-
-    let rec find_same id tbl =
-      try Ident.find_same id tbl.current
-      with Not_found as exn ->
-        begin match tbl.opened with
-        | Some {next; _} -> find_same id next
-        | None -> raise exn
-        end
-
-    let rec find_name mark name tbl =
-      try
-        let (id, desc) = Ident.find_name name tbl.current in
-        Pident id, desc
-      with Not_found as exn ->
-        begin match tbl.opened with
-        | Some {using; root; next; components} ->
-            begin try
-              let (descr, pos) = Tbl.find_str name components in
-              let res = Pdot (root, name, pos), descr in
-              if mark then begin match using with
-              | None -> ()
-              | Some f ->
-                  begin try f name (Some (snd (find_name false name next), snd res))
-                  with Not_found -> f name None
-                  end
-              end;
-              res
-            with Not_found ->
-              find_name mark name next
-            end
-        | None ->
-            raise exn
-        end
-
-    let find_name name tbl = find_name true name tbl
-
-    let rec update name f tbl =
-      try
-        let (id, desc) = Ident.find_name name tbl.current in
-        let new_desc = f desc in
-        {tbl with current = Ident.add id new_desc tbl.current}
-      with Not_found ->
-        begin match tbl.opened with
-        | Some {root; using; next; components} ->
-            begin try
-              let (desc, pos) = Tbl.find_str name components in
-              let new_desc = f desc in
-              let components = Tbl.add name (new_desc, pos) components in
-              {tbl with opened = Some {root; using; next; components}}
-            with Not_found ->
-              let next = update name f next in
-              {tbl with opened = Some {root; using; next; components}}
-            end
-        | None ->
-            tbl
-        end
-
-
-
-    let rec find_all name tbl =
-      List.map (fun (id, desc) -> Pident id, desc) (Ident.find_all name tbl.current) @
-      match tbl.opened with
-      | None -> []
-      | Some {root; using = _; next; components} ->
-          try
-            let (desc, pos) = Tbl.find_str name components in
-            (Pdot (root, name, pos), desc) :: find_all name next
-          with Not_found ->
-            find_all name next
-
-    let rec fold_name f tbl acc =
-      let acc = Ident.fold_name (fun id d -> f (Ident.name id) (Pident id, d)) tbl.current acc in
-      match tbl.opened with
-      | Some {root; using = _; next; components} ->
-          acc
-          |> Tbl.fold
-            (fun name (desc, pos) -> f name (Pdot (root, name, pos), desc))
-            components
-          |> fold_name f next
-      | None ->
-          acc
-
-    let rec local_keys tbl acc =
-      let acc = Ident.fold_all (fun k _ accu -> k::accu) tbl.current acc in
-      match tbl.opened with
-      | Some o -> local_keys o.next acc
-      | None -> acc
-
-
-    let rec iter f tbl =
-      Ident.iter (fun id desc -> f id (Pident id, desc)) tbl.current;
-      match tbl.opened with
-      | Some {root; using = _; next; components} ->
-          Tbl.iter
-            (fun s (x, pos) -> f (Ident.hide (Ident.create s) (* ??? *)) (Pdot (root, s, pos), x))
-            components;
-          iter f next
-      | None -> ()
-
-    let diff_keys tbl1 tbl2 =
-      let keys2 = local_keys tbl2 [] in
-      Ext_list.filter keys2
-        (fun id ->
-           try ignore (find_same id tbl1); false
-           with Not_found -> true)
-
-
-  end
-
-type type_descriptions =
-    constructor_description list * label_description list
-
-let in_signature_flag = 0x01
-let implicit_coercion_flag = 0x02
-
-type t = {
-  values: value_description IdTbl.t;
-  constrs: constructor_description TycompTbl.t;
-  labels: label_description TycompTbl.t;
-  types: (type_declaration * type_descriptions) IdTbl.t;
-  modules: (Subst.t * module_declaration, module_declaration) EnvLazy.t IdTbl.t;
-  modtypes: modtype_declaration IdTbl.t;
-  components: module_components IdTbl.t;
-  classes: class_declaration IdTbl.t;
-  cltypes: class_type_declaration IdTbl.t;
-  functor_args: unit Ident.tbl;
-  summary: summary;
-  local_constraints: type_declaration PathMap.t;
-  gadt_instances: (int * TypeSet.t ref) list;
-  flags: int;
-}
-
-and module_components =
-  {
-    deprecated: string option;
-    loc: Location.t;
-    comps:
-      (t * Subst.t * Path.t * Types.module_type, module_components_repr option)
-        EnvLazy.t;
-  }
-
-and module_components_repr =
-    Structure_comps of structure_components
-  | Functor_comps of functor_components
-
-and 'a comp_tbl = (string, ('a * int)) Tbl.t
-
-and structure_components = {
-  mutable comp_values: value_description comp_tbl;
-  mutable comp_constrs: (string, constructor_description list) Tbl.t;
-  mutable comp_labels: (string, label_description list) Tbl.t;
-  mutable comp_types: (type_declaration * type_descriptions) comp_tbl;
-  mutable comp_modules:
-   (Subst.t * module_declaration, module_declaration) EnvLazy.t comp_tbl;
-  mutable comp_modtypes: modtype_declaration comp_tbl;
-  mutable comp_components: module_components comp_tbl;
-  comp_classes: class_declaration comp_tbl; (* warning -69*)
-  mutable comp_cltypes: class_type_declaration comp_tbl;
-}
-
-and functor_components = {
-  fcomp_param: Ident.t;                 (* Formal parameter *)
-  fcomp_arg: module_type option;        (* Argument signature *)
-  fcomp_res: module_type;               (* Result signature *)
-  fcomp_cache: (Path.t, module_components) Hashtbl.t;  (* For memoization *)
-  fcomp_subst_cache: (Path.t, module_type) Hashtbl.t
-}
-
-let copy_local ~from env =
-  { env with
-    local_constraints = from.local_constraints;
-    gadt_instances = from.gadt_instances;
-    flags = from.flags }
-
-let same_constr = ref (fun _ _ _ -> assert false)
-
-(* Helper to decide whether to report an identifier shadowing
-   by some 'open'. For labels and constructors, we do not report
-   if the two elements are from the same re-exported declaration.
-
-   Later, one could also interpret some attributes on value and
-   type declarations to silence the shadowing warnings. *)
-
-let check_shadowing env = function
-  | `Constructor (Some (c1, c2))
-    when not (!same_constr env c1.cstr_res c2.cstr_res) ->
-      Some "constructor"
-  | `Label (Some (l1, l2))
-    when not (!same_constr env l1.lbl_res l2.lbl_res) ->
-      Some "label"
-  | `Value (Some _) -> Some "value"
-  | `Type (Some _) -> Some "type"
-  | `Module (Some _) | `Component (Some _) -> Some "module"
-  | `Module_type (Some _) -> Some "module type"
-  | `Class (Some _) -> Some "class"
-  | `Class_type (Some _) -> Some "class type"
-  | `Constructor _ | `Label _
-  | `Value None | `Type None | `Module None | `Module_type None
-  | `Class None | `Class_type None | `Component None ->
-      None
-
-let subst_modtype_maker (subst, md) =
-  if subst == Subst.identity then md
-  else {md with md_type = Subst.modtype subst md.md_type}
-
-let empty = {
-  values = IdTbl.empty; constrs = TycompTbl.empty;
-  labels = TycompTbl.empty; types = IdTbl.empty;
-  modules = IdTbl.empty; modtypes = IdTbl.empty;
-  components = IdTbl.empty; classes = IdTbl.empty;
-  cltypes = IdTbl.empty;
-  summary = Env_empty; local_constraints = PathMap.empty; gadt_instances = [];
-  flags = 0;
-  functor_args = Ident.empty;
- }
-
-let in_signature b env =
-  let flags =
-    if b then env.flags lor in_signature_flag
-    else env.flags land (lnot in_signature_flag)
-  in
-  {env with flags}
-
-let implicit_coercion env =
-  {env with flags = env.flags lor implicit_coercion_flag}
-
-let is_in_signature env = env.flags land in_signature_flag <> 0
-let is_implicit_coercion env = env.flags land implicit_coercion_flag <> 0
-
-let is_ident = function
-    Pident _ -> true
-  | Pdot _ | Papply _ -> false
-
-let is_local_ext = function
-  | {cstr_tag = Cstr_extension(p, _)} -> is_ident p
-  | _ -> false
-
-let diff env1 env2 =
-  IdTbl.diff_keys env1.values env2.values @
-  TycompTbl.diff_keys is_local_ext env1.constrs env2.constrs @
-  IdTbl.diff_keys env1.modules env2.modules @
-  IdTbl.diff_keys env1.classes env2.classes
-
-type can_load_cmis =
-  | Can_load_cmis
-  | Cannot_load_cmis of EnvLazy.log
-
-let can_load_cmis = ref Can_load_cmis
-
-let without_cmis f x =
-  let log = EnvLazy.log () in
-  let res =
-    Misc.(protect_refs
-            [R (can_load_cmis, Cannot_load_cmis log)]
-            (fun () -> f x))
-  in
-  EnvLazy.backtrack log;
-  res
-
-(* Forward declarations *)
-
-let components_of_module' =
-  ref ((fun ~deprecated:_ ~loc:_ _env _sub _path _mty -> assert false) :
-         deprecated:string option -> loc:Location.t -> t -> Subst.t ->
-       Path.t -> module_type ->
-       module_components)
-let components_of_module_maker' =
-  ref ((fun (_env, _sub, _path, _mty) -> assert false) :
-          t * Subst.t * Path.t * module_type -> module_components_repr option)
-let components_of_functor_appl' =
-  ref ((fun _f _env _p1 _p2 -> assert false) :
-          functor_components -> t -> Path.t -> Path.t -> module_components)
-let check_modtype_inclusion =
-  (* to be filled with Includemod.check_modtype_inclusion *)
-  ref ((fun ~loc:_ _env _mty1 _path1 _mty2 -> assert false) :
-          loc:Location.t -> t -> module_type -> Path.t -> module_type -> unit)
-let strengthen =
-  (* to be filled with Mtype.strengthen *)
-  ref ((fun ~aliasable:_ _env _mty _path -> assert false) :
-         aliasable:bool -> t -> module_type -> Path.t -> module_type)
-
-let md md_type =
-  {md_type; md_attributes=[]; md_loc=Location.none}
-
-let get_components_opt c =
-  match !can_load_cmis with
-  | Can_load_cmis ->
-    EnvLazy.force !components_of_module_maker' c.comps
-  | Cannot_load_cmis log ->
-    EnvLazy.force_logged log !components_of_module_maker' c.comps
-
-let empty_structure =
-  Structure_comps {
-    comp_values = Tbl.empty;
-    comp_constrs = Tbl.empty;
-    comp_labels = Tbl.empty;
-    comp_types = Tbl.empty;
-    comp_modules = Tbl.empty; comp_modtypes = Tbl.empty;
-    comp_components = Tbl.empty; comp_classes = Tbl.empty;
-    comp_cltypes = Tbl.empty }
-
-let get_components c =
-  match get_components_opt c with
-  | None -> empty_structure
-  | Some c -> c
-
-(* The name of the compilation unit currently compiled.
-   "" if outside a compilation unit. *)
-
-let current_unit = ref ""
-
-(* Persistent structure descriptions *)
-
-type [@warning "-69"] pers_struct =
-  { ps_name: string;
-    ps_sig: signature Lazy.t;
-    ps_comps: module_components;
-    ps_crcs: (string * Digest.t option) list;
-    ps_filename: string;
-    ps_flags: pers_flags list }
-
-let persistent_structures =
-  (Hashtbl.create 17 : (string, pers_struct option) Hashtbl.t)
-
-(* Consistency between persistent structures *)
-
-let crc_units = Consistbl.create()
-
-module StringSet =
-  Set.Make(struct type t = string let compare = String.compare end)
-
-let imported_units = ref StringSet.empty
-
-let add_import s =
-  imported_units := StringSet.add s !imported_units
-
-
-let clear_imports () =
-  Consistbl.clear crc_units;
-  imported_units := StringSet.empty
-
-
-let check_consistency ps =
-  try
-    List.iter
-      (fun (name, crco) ->
-         match crco with
-            None -> ()
-          | Some crc ->
-              add_import name;
-              Consistbl.check crc_units name crc ps.ps_filename)
-      ps.ps_crcs;
-  with Consistbl.Inconsistency(name, source, auth) ->
-    error (Inconsistent_import(name, auth, source))
-
-(* Reading persistent structures from .cmi files *)
-
-let save_pers_struct crc ps =
-  let modname = ps.ps_name in
-  Hashtbl.add persistent_structures modname (Some ps);
-  Consistbl.set crc_units modname crc ps.ps_filename;
-  add_import modname
-
-module Persistent_signature = struct
-  type t =
-    { filename : string;
-      cmi : Cmi_format.cmi_infos }
-
-  let load = ref (fun ~unit_name ->
-    match find_in_path_uncap !load_path (unit_name ^ ".cmi") with
-    | filename -> Some { filename; cmi = read_cmi filename }
-    | exception Not_found -> None)
-end
-
-let acknowledge_pers_struct check modname
-      { Persistent_signature.filename; cmi } =
-  let name = cmi.cmi_name in
-  let sign = cmi.cmi_sign in
-  let crcs = cmi.cmi_crcs in
-  let flags = cmi.cmi_flags in
-  let deprecated =
-    List.fold_left (fun _ -> function Deprecated s -> Some s ) None
-      flags
-  in
-  let comps =
-      !components_of_module' ~deprecated ~loc:Location.none
-        empty Subst.identity
-                             (Pident(Ident.create_persistent name))
-                             (Mty_signature sign)
-  in
-  let ps = { ps_name = name;
-             ps_sig = lazy (Subst.signature Subst.identity sign);
-             ps_comps = comps;
-             ps_crcs = crcs;
-             ps_filename = filename;
-             ps_flags = flags;
-           } in
-  if ps.ps_name <> modname then
-    error (Illegal_renaming(modname, ps.ps_name, filename));
-  if check then check_consistency ps;
-  Hashtbl.add persistent_structures modname (Some ps);
-  ps
-
-let read_pers_struct check modname filename =
-  add_import modname;
-  let cmi = read_cmi filename in
-  acknowledge_pers_struct check modname
-    { Persistent_signature.filename; cmi }
-
-let find_pers_struct check name =
-  if name = "*predef*" then raise Not_found;
-  match Hashtbl.find persistent_structures name with
-  | Some ps -> ps
-  | None -> raise Not_found
-  | exception Not_found ->
-    match !can_load_cmis with
-    | Cannot_load_cmis _ -> raise Not_found
-    | Can_load_cmis ->
-        let ps =
-          match !Persistent_signature.load ~unit_name:name with
-          | Some ps -> ps
-          | None ->
-            Hashtbl.add persistent_structures name None;
-            raise Not_found
-        in
-        add_import name;
-        acknowledge_pers_struct check name ps
-
-(* Emits a warning if there is no valid cmi for name *)
-let check_pers_struct name =
-  try
-    ignore (find_pers_struct false name)
-  with
-  | Not_found ->
-      let warn = Warnings.No_cmi_file(name, None) in
-        Location.prerr_warning Location.none warn
-  | Cmi_format.Error err ->
-      let msg = Format.asprintf "%a" Cmi_format.report_error err in
-      let warn = Warnings.No_cmi_file(name, Some msg) in
-        Location.prerr_warning Location.none warn
-  | Error err ->
-      let msg =
-        match err with
-        | Illegal_renaming(name, ps_name, filename) ->
-            Format.asprintf
-              " %a@ contains the compiled interface for @ \
-               %s when %s was expected"
-              Location.print_filename filename ps_name name
-        | Inconsistent_import _ -> assert false
-        | Need_recursive_types(name, _) ->
-            Format.sprintf
-              "%s uses recursive types"
-              name
-        | Missing_module _ -> assert false
-        | Illegal_value_name _ -> assert false
-      in
-      let warn = Warnings.No_cmi_file(name, Some msg) in
-        Location.prerr_warning Location.none warn
-
-let read_pers_struct modname filename =
-  read_pers_struct true modname filename
-
-let find_pers_struct name =
-  find_pers_struct true name
-
-let check_pers_struct name =
-  if not (Hashtbl.mem persistent_structures name) then begin
-    (* PR#6843: record the weak dependency ([add_import]) regardless of
-       whether the check succeeds, to help make builds more
-       deterministic. *)
-    add_import name;
-    if (Warnings.is_active (Warnings.No_cmi_file("", None))) then
-      Delayed_checks.add_delayed_check
-        (fun () -> check_pers_struct name)
-  end
-
-let reset_cache () =
-  current_unit := "";
-  Hashtbl.clear persistent_structures;
-  clear_imports ();
-  Hashtbl.clear value_declarations;
-  Hashtbl.clear type_declarations;
-  Hashtbl.clear module_declarations;
-  Hashtbl.clear used_constructors;
-  Hashtbl.clear prefixed_sg
-
-let reset_cache_toplevel () =
-  (* Delete 'missing cmi' entries from the cache. *)
-  let l =
-    Hashtbl.fold
-      (fun name r acc -> if r = None then name :: acc else acc)
-      persistent_structures []
-  in
-  List.iter (Hashtbl.remove persistent_structures) l;
-  Hashtbl.clear value_declarations;
-  Hashtbl.clear type_declarations;
-  Hashtbl.clear module_declarations;
-  Hashtbl.clear used_constructors;
-  Hashtbl.clear prefixed_sg
-
-
-let set_unit_name name =
-  current_unit := name
-
-let get_unit_name () =
-  !current_unit
-
-(* Lookup by identifier *)
-
-let rec find_module_descr path env =
-  match path with
-    Pident id ->
-      begin try
-        IdTbl.find_same id env.components
-      with Not_found ->
-        if Ident.persistent id && not (Ident.name id = !current_unit)
-        then (find_pers_struct (Ident.name id)).ps_comps
-        else raise Not_found
-      end
-  | Pdot(p, s, _pos) ->
-      begin match get_components (find_module_descr p env) with
-        Structure_comps c ->
-          let (descr, _pos) = Tbl.find_str s c.comp_components in
-          descr
-      | Functor_comps _ ->
-         raise Not_found
-      end
-  | Papply(p1, p2) ->
-      begin match get_components (find_module_descr p1 env) with
-        Functor_comps f ->
-          !components_of_functor_appl' f env p1 p2
-      | Structure_comps _ ->
-          raise Not_found
-      end
-
-let find proj1 proj2 path env =
-  match path with
-    Pident id ->
-      IdTbl.find_same id (proj1 env)
-  | Pdot(p, s, _pos) ->
-      begin match get_components (find_module_descr p env) with
-        Structure_comps c ->
-          let (data, _pos) = Tbl.find_str s (proj2 c) in data
-      | Functor_comps _ ->
-          raise Not_found
-      end
-  | Papply _ ->
-      raise Not_found
-
-let find_value =
-  find (fun env -> env.values) (fun sc -> sc.comp_values)
-and find_type_full =
-  find (fun env -> env.types) (fun sc -> sc.comp_types)
-and find_modtype =
-  find (fun env -> env.modtypes) (fun sc -> sc.comp_modtypes)
-and find_class =
-  find (fun env -> env.classes) (fun sc -> sc.comp_classes)
-and find_cltype =
-  find (fun env -> env.cltypes) (fun sc -> sc.comp_cltypes)
-
-let type_of_cstr path = function
-  | {cstr_inlined = Some d; _} ->
-      (d, ([], List.map snd (Datarepr.labels_of_type path d)))
-  | _ ->
-      assert false
-
-let find_type_full path env =
-  match Path.constructor_typath path with
-  | Regular p ->
-      (try (PathMap.find p env.local_constraints, ([], []))
-       with Not_found -> find_type_full p env)
-  | Cstr (ty_path, s) ->
-      let (_, (cstrs, _)) =
-        try find_type_full ty_path env
-        with Not_found -> assert false
-      in
-      let cstr =
-        try List.find (fun cstr -> cstr.cstr_name = s) cstrs
-        with Not_found -> assert false
-      in
-      type_of_cstr path cstr
-  | LocalExt id ->
-      let cstr =
-        try TycompTbl.find_same id env.constrs
-        with Not_found -> assert false
-      in
-      type_of_cstr path cstr
-  | Ext (mod_path, s) ->
-      let comps =
-        try find_module_descr mod_path env
-        with Not_found -> assert false
-      in
-      let comps =
-        match get_components comps with
-        | Structure_comps c -> c
-        | Functor_comps _ -> assert false
-      in
-      let exts =
-        Ext_list.filter
-          (try Tbl.find_str s comps.comp_constrs
-            with Not_found -> assert false)
-          (function {cstr_tag=Cstr_extension _} -> true | _ -> false)
-        
-      in
-      match exts with
-      | [cstr] -> type_of_cstr path cstr
-      | _ -> assert false
-
-let find_type p env =
-  fst (find_type_full p env)
-let find_type_descrs p env =
-  snd (find_type_full p env)
-
-let find_module ~alias path env =
-  match path with
-    Pident id ->
-      begin try
-        let data = IdTbl.find_same id env.modules in
-        EnvLazy.force subst_modtype_maker data
-      with Not_found ->
-        if Ident.persistent id && not (Ident.name id = !current_unit) then
-          let ps = find_pers_struct (Ident.name id) in
-          md (Mty_signature(Lazy.force ps.ps_sig))
-        else raise Not_found
-      end
-  | Pdot(p, s, _pos) ->
-      begin match get_components (find_module_descr p env) with
-        Structure_comps c ->
-          let (data, _pos) = Tbl.find_str s c.comp_modules in
-          EnvLazy.force subst_modtype_maker data
-      | Functor_comps _ ->
-          raise Not_found
-      end
-  | Papply(p1, p2) ->
-      let desc1 = find_module_descr p1 env in
-      begin match get_components desc1 with
-        Functor_comps f ->
-          md begin match f.fcomp_res with
-          | Mty_alias _ as mty -> mty
-          | mty ->
-              if alias then mty else
-              try
-                Hashtbl.find f.fcomp_subst_cache p2
-              with Not_found ->
-                let mty =
-                  Subst.modtype
-                    (Subst.add_module f.fcomp_param p2 Subst.identity)
-                    f.fcomp_res in
-                Hashtbl.add f.fcomp_subst_cache p2 mty;
-                mty
-          end
-      | Structure_comps _ ->
-          raise Not_found
-      end
-
-
-
-let rec normalize_path lax env path =
-  let path =
-    match path with
-      Pdot(p, s, pos) ->
-        Pdot(normalize_path lax env p, s, pos)
-    | Papply(p1, p2) ->
-        Papply(normalize_path lax env p1, normalize_path true env p2)
-    | _ -> path
-  in
-  try match find_module ~alias:true path env with
-    {md_type=Mty_alias(_, path1)} ->
-      normalize_path lax env path1
-  | _ -> path
-  with Not_found when lax
-  || (match path with Pident id -> not (Ident.persistent id) | _ -> true) ->
-      path
-
-let normalize_path oloc env path =
-  try normalize_path (oloc = None) env path
-  with Not_found ->
-    match oloc with None -> assert false
-    | Some loc ->
-        raise (Error(Missing_module(loc, path, normalize_path true env path)))
-
-let normalize_path_prefix oloc env path =
-  match path with
-    Pdot(p, s, pos) ->
-      Pdot(normalize_path oloc env p, s, pos)
-  | Pident _ ->
-      path
-  | Papply _ ->
-      assert false
-
-
-let find_module = find_module ~alias:false
-
-(* Find the manifest type associated to a type when appropriate:
-   - the type should be public or should have a private row,
-   - the type should have an associated manifest type. *)
-let find_type_expansion path env =
-  let decl = find_type path env in
-  match decl.type_manifest with
-  | Some body when decl.type_private = Public
-              || decl.type_kind <> Type_abstract
-              || Btype.has_constr_row body ->
-                  (decl.type_params, body, may_map snd decl.type_newtype_level)
-  (* The manifest type of Private abstract data types without
-     private row are still considered unknown to the type system.
-     Hence, this case is caught by the following clause that also handles
-     purely abstract data types without manifest type definition. *)
-  | _ -> raise Not_found
-
-(* Find the manifest type information associated to a type, i.e.
-   the necessary information for the compiler's type-based optimisations.
-   In particular, the manifest type associated to a private abstract type
-   is revealed for the sake of compiler's type-based optimisations. *)
-let find_type_expansion_opt path env =
-  let decl = find_type path env in
-  match decl.type_manifest with
-  (* The manifest type of Private abstract data types can still get
-     an approximation using their manifest type. *)
-  | Some body -> (decl.type_params, body, may_map snd decl.type_newtype_level)
-  | _ -> raise Not_found
-
-let find_modtype_expansion path env =
-  match (find_modtype path env).mtd_type with
-  | None -> raise Not_found
-  | Some mty -> mty
-
-let rec is_functor_arg path env =
-  match path with
-    Pident id ->
-      begin try Ident.find_same id env.functor_args; true
-      with Not_found -> false
-      end
-  | Pdot (p, _s, _) -> is_functor_arg p env
-  | Papply _ -> true
-
-(* Lookup by name *)
-
-exception Recmodule
-
-let report_deprecated ?loc p deprecated =
-  match loc, deprecated with
-  | Some loc, Some txt ->
-      let txt = if txt = "" then "" else "\n" ^ txt in
-      Location.deprecated loc (Printf.sprintf "module %s%s" (Path.name p) txt)
-  | _ -> ()
-
-let mark_module_used env name loc =
-  if not (is_implicit_coercion env) then
-    try Hashtbl.find module_declarations (name, loc) ()
-    with Not_found -> ()
-
-let rec lookup_module_descr_aux ?loc lid env =
-  match lid with
-    Lident s ->
-      begin try
-        IdTbl.find_name s env.components
-      with Not_found ->
-        if s = !current_unit then raise Not_found;
-        let ps = find_pers_struct s in
-        (Pident(Ident.create_persistent s), ps.ps_comps)
-      end
-  | Ldot(l, s) ->
-      let (p, descr) = lookup_module_descr ?loc l env in
-      begin match get_components descr with
-        Structure_comps c ->
-          let (descr, pos) = Tbl.find_str s c.comp_components in
-          (Pdot(p, s, pos), descr)
-      | Functor_comps _ ->
-          raise Not_found
-      end
-  | Lapply(l1, l2) ->
-      let (p1, desc1) = lookup_module_descr ?loc l1 env in
-      let p2 = lookup_module ~load:true ?loc l2 env in
-      let {md_type=mty2} = find_module p2 env in
-      begin match get_components desc1 with
-        Functor_comps f ->
-          let loc = match loc with Some l -> l | None -> Location.none in
-          Misc.may (!check_modtype_inclusion ~loc env mty2 p2) f.fcomp_arg;
-          (Papply(p1, p2), !components_of_functor_appl' f env p1 p2)
-      | Structure_comps _ ->
-          raise Not_found
-      end
-
-and lookup_module_descr ?loc lid env =
-  let (p, comps) as res = lookup_module_descr_aux ?loc lid env in
-  mark_module_used env (Path.last p) comps.loc;
-(*
-  Format.printf "USE module %s at %a@." (Path.last p)
-    Location.print comps.loc;
-*)
-  report_deprecated ?loc p comps.deprecated;
-  res
-
-and lookup_module ~load ?loc lid env : Path.t =
-  match lid with
-    Lident s ->
-      begin try
-        let (p, data) = IdTbl.find_name s env.modules in
-        let {md_loc; md_attributes; md_type} =
-          EnvLazy.force subst_modtype_maker data
-        in
-        mark_module_used env s md_loc;
-        begin match md_type with
-        | Mty_ident (Path.Pident id) when Ident.name id = "#recmod#" ->
-          (* see #5965 *)
-          raise Recmodule
-        | Mty_alias (_, Path.Pident id) ->   
-          if !Config.bs_only && not !Clflags.transparent_modules && Ident.persistent id then 
-            find_pers_struct (Ident.name id) |> ignore 
-        | _ -> ()
-        end;
-        report_deprecated ?loc p
-          (Builtin_attributes.deprecated_of_attrs md_attributes);
-        p
-      with Not_found ->
-        if s = !current_unit then raise Not_found;
-        let p = Pident(Ident.create_persistent s) in
-        if !Clflags.transparent_modules && not load then check_pers_struct s
-        else begin
-          let ps = find_pers_struct s in
-          report_deprecated ?loc p ps.ps_comps.deprecated
-        end;
-        p
-      end
-  | Ldot(l, s) ->
-      let (p, descr) = lookup_module_descr ?loc l env in
-      begin match get_components descr with
-        Structure_comps c ->
-          let (_data, pos) = Tbl.find_str s c.comp_modules in
-          let (comps, _) = Tbl.find_str s c.comp_components in
-          mark_module_used env s comps.loc;
-          let p = Pdot(p, s, pos) in
-          report_deprecated ?loc p comps.deprecated;
-          p
-      | Functor_comps _ ->
-          raise Not_found
-      end
-  | Lapply(l1, l2) ->
-      let (p1, desc1) = lookup_module_descr ?loc l1 env in
-      let p2 = lookup_module ~load:true ?loc l2 env in
-      let {md_type=mty2} = find_module p2 env in
-      let p = Papply(p1, p2) in
-      begin match get_components desc1 with
-        Functor_comps f ->
-          let loc = match loc with Some l -> l | None -> Location.none in
-          Misc.may (!check_modtype_inclusion ~loc env mty2 p2) f.fcomp_arg;
-          p
-      | Structure_comps _ ->
-          raise Not_found
-      end
-
-let lookup proj1 proj2 ?loc lid env =
-  match lid with
-    Lident s ->
-      IdTbl.find_name s (proj1 env)
-  | Ldot(l, s) ->
-      let (p, desc) = lookup_module_descr ?loc l env in
-      begin match get_components desc with
-        Structure_comps c ->
-          let (data, pos) = Tbl.find_str s (proj2 c) in
-          (Pdot(p, s, pos), data)
-      | Functor_comps _ ->
-          raise Not_found
-      end
-  | Lapply _ ->
-      raise Not_found
-
-let lookup_all_simple proj1 proj2 shadow ?loc lid env =
-  match lid with
-    Lident s ->
-      let xl = TycompTbl.find_all s (proj1 env) in
-      let rec do_shadow =
-        function
-        | [] -> []
-        | ((x, f) :: xs) ->
-            (x, f) ::
-              (do_shadow (Ext_list.filter xs (fun (y, _) -> not (shadow x y))))
-      in
-        do_shadow xl
-  | Ldot(l, s) ->
-      let (_p, desc) = lookup_module_descr ?loc l env in
-      begin match get_components desc with
-        Structure_comps c ->
-          let comps =
-            try Tbl.find_str s (proj2 c) with Not_found -> []
-          in
-          List.map
-            (fun data -> (data, (fun () -> ())))
-            comps
-      | Functor_comps _ ->
-          raise Not_found
-      end
-  | Lapply _ ->
-      raise Not_found
-
-let has_local_constraints env = not (PathMap.is_empty env.local_constraints)
-
-let cstr_shadow cstr1 cstr2 =
-  match cstr1.cstr_tag, cstr2.cstr_tag with
-  | Cstr_extension _, Cstr_extension _ -> true
-  | _ -> false
-
-let lbl_shadow _lbl1 _lbl2 = false
-
-let lookup_value =
-  lookup (fun env -> env.values) (fun sc -> sc.comp_values)
-let lookup_all_constructors =
-  lookup_all_simple (fun env -> env.constrs) (fun sc -> sc.comp_constrs)
-    cstr_shadow
-let lookup_all_labels =
-  lookup_all_simple (fun env -> env.labels) (fun sc -> sc.comp_labels)
-    lbl_shadow
-let lookup_type =
-  lookup (fun env -> env.types) (fun sc -> sc.comp_types)
-let lookup_modtype =
-  lookup (fun env -> env.modtypes) (fun sc -> sc.comp_modtypes)
-let lookup_class =
-  lookup (fun env -> env.classes) (fun sc -> sc.comp_classes)
-let lookup_cltype =
-  lookup (fun env -> env.cltypes) (fun sc -> sc.comp_cltypes)
-
-let copy_types l env =
-  let f desc = {desc with val_type = Subst.type_expr Subst.identity desc.val_type} in
-  let values = List.fold_left (fun env s -> IdTbl.update s f env) env.values l in
-  {env with values; summary = Env_copy_types (env.summary, l)}
-
-let mark_value_used env name vd =
-  if not (is_implicit_coercion env) then
-    try Hashtbl.find value_declarations (name, vd.val_loc) ()
-    with Not_found -> ()
-
-let mark_type_used env name vd =
-  if not (is_implicit_coercion env) then
-    try Hashtbl.find type_declarations (name, vd.type_loc) ()
-    with Not_found -> ()
-
-let mark_constructor_used usage env name vd constr =
-  if not (is_implicit_coercion env) then
-    try Hashtbl.find used_constructors (name, vd.type_loc, constr) usage
-    with Not_found -> ()
-
-let mark_extension_used usage env ext name =
-  if not (is_implicit_coercion env) then
-    let ty_name = Path.last ext.ext_type_path in
-    try Hashtbl.find used_constructors (ty_name, ext.ext_loc, name) usage
-    with Not_found -> ()
-
-let set_value_used_callback name vd callback =
-  let key = (name, vd.val_loc) in
-  try
-    let old = Hashtbl.find value_declarations key in
-    Hashtbl.replace value_declarations key (fun () -> old (); callback ())
-      (* this is to support cases like:
-               let x = let x = 1 in x in x
-         where the two declarations have the same location
-         (e.g. resulting from Camlp4 expansion of grammar entries) *)
-  with Not_found ->
-    Hashtbl.add value_declarations key callback
-
-let set_type_used_callback name td callback =
-  let loc = td.type_loc in
-  if loc.Location.loc_ghost then ()
-  else let key = (name, loc) in
-  let old =
-    try Hashtbl.find type_declarations key
-    with Not_found -> assert false
-  in
-  Hashtbl.replace type_declarations key (fun () -> callback old)
-
-let lookup_value ?loc lid env =
-  let (_, desc) as r = lookup_value ?loc lid env in
-  mark_value_used env (Longident.last lid) desc;
-  r
-
-let lookup_type ?loc lid env =
-  let (path, (decl, _)) = lookup_type ?loc lid env in
-  mark_type_used env (Longident.last lid) decl;
-  path
-
-let mark_type_path env path =
-  try
-    let decl = find_type path env in
-    mark_type_used env (Path.last path) decl
-  with Not_found -> ()
-
-let ty_path t =
-  match repr t with
-  | {desc=Tconstr(path, _, _)} -> path
-  | _ -> assert false
-
-let lookup_constructor ?loc lid env =
-  match lookup_all_constructors ?loc lid env with
-    [] -> raise Not_found
-  | (desc, use) :: _ ->
-      mark_type_path env (ty_path desc.cstr_res);
-      use ();
-      desc
-
-let is_lident = function
-    Lident _ -> true
-  | _ -> false
-
-let lookup_all_constructors ?loc lid env =
-  try
-    let cstrs = lookup_all_constructors ?loc lid env in
-    let wrap_use desc use () =
-      mark_type_path env (ty_path desc.cstr_res);
-      use ()
-    in
-    List.map (fun (cstr, use) -> (cstr, wrap_use cstr use)) cstrs
-  with
-    Not_found when is_lident lid -> []
-
-let mark_constructor usage env name desc =
-  if not (is_implicit_coercion env)
-  then match desc.cstr_tag with
-  | Cstr_extension _ ->
-      begin
-        let ty_path = ty_path desc.cstr_res in
-        let ty_name = Path.last ty_path in
-        try Hashtbl.find used_constructors (ty_name, desc.cstr_loc, name) usage
-        with Not_found -> ()
-      end
-  | _ ->
-      let ty_path = ty_path desc.cstr_res in
-      let ty_decl = try find_type ty_path env with Not_found -> assert false in
-      let ty_name = Path.last ty_path in
-      mark_constructor_used usage env ty_name ty_decl name
-
-let lookup_label ?loc lid env =
-  match lookup_all_labels ?loc lid env with
-    [] -> raise Not_found
-  | (desc, use) :: _ ->
-      mark_type_path env (ty_path desc.lbl_res);
-      use ();
-      desc
-
-let lookup_all_labels ?loc lid env =
-  try
-    let lbls = lookup_all_labels ?loc lid env in
-    let wrap_use desc use () =
-      mark_type_path env (ty_path desc.lbl_res);
-      use ()
-    in
-    List.map (fun (lbl, use) -> (lbl, wrap_use lbl use)) lbls
-  with
-    Not_found when is_lident lid -> []
-
-let lookup_class ?loc lid env =
-  let (_, desc) as r = lookup_class ?loc lid env in
-  (* special support for Typeclass.unbound_class *)
-  if Path.name desc.cty_path = "" then ignore (lookup_type ?loc lid env)
-  else mark_type_path env desc.cty_path;
-  r
-
-let lookup_cltype ?loc lid env =
-  let (_, desc) as r = lookup_cltype ?loc lid env in
-  if Path.name desc.clty_path = "" then ignore (lookup_type ?loc lid env)
-  else mark_type_path env desc.clty_path;
-  mark_type_path env desc.clty_path;
-  r
-
-(* Iter on an environment (ignoring the body of functors and
-   not yet evaluated structures) *)
-
-type iter_cont = unit -> unit
-let iter_env_cont = ref []
-
-let rec scrape_alias_for_visit env mty =
-  match mty with
-  | Mty_alias(_, Pident id)
-    when Ident.persistent id
-      && not (Hashtbl.mem persistent_structures (Ident.name id)) -> false
-  | Mty_alias(_, path) -> (* PR#6600: find_module may raise Not_found *)
-      begin try scrape_alias_for_visit env (find_module path env).md_type
-      with Not_found -> false
-      end
-  | _ -> true
-
-let iter_env proj1 proj2 f env () =
-  IdTbl.iter (fun id x -> f (Pident id) x) (proj1 env);
-  let rec iter_components path path' mcomps =
-    let cont () =
-      let visit =
-        match EnvLazy.get_arg mcomps.comps with
-        | None -> true
-        | Some (env, _sub, _path, mty) -> scrape_alias_for_visit env mty
-      in
-      if not visit then () else
-      match get_components mcomps with
-        Structure_comps comps ->
-          Tbl.iter
-            (fun s (d, n) -> f (Pdot (path, s, n)) (Pdot (path', s, n), d))
-            (proj2 comps);
-          Tbl.iter
-            (fun s (c, n) ->
-              iter_components (Pdot (path, s, n)) (Pdot (path', s, n)) c)
-            comps.comp_components
-      | Functor_comps _ -> ()
-    in iter_env_cont := (path, cont) :: !iter_env_cont
-  in
-  Hashtbl.iter
-    (fun s pso ->
-      match pso with None -> ()
-      | Some ps ->
-          let id = Pident (Ident.create_persistent s) in
-          iter_components id id ps.ps_comps)
-    persistent_structures;
-  IdTbl.iter
-    (fun id (path, comps) -> iter_components (Pident id) path comps)
-    env.components
-
-let run_iter_cont l =
-  iter_env_cont := [];
-  List.iter (fun c -> c ()) l;
-  let cont = List.rev !iter_env_cont in
-  iter_env_cont := [];
-  cont
-
-let iter_types f = iter_env (fun env -> env.types) (fun sc -> sc.comp_types) f
-
-let same_types env1 env2 =
-  env1.types == env2.types && env1.components == env2.components
-
-let used_persistent () =
-  let r = ref Concr.empty in
-  Hashtbl.iter (fun s pso -> if pso != None then r := Concr.add s !r)
-    persistent_structures;
-  !r
-
-let find_all_comps proj s (p,mcomps) =
-  match get_components mcomps with
-    Functor_comps _ -> []
-  | Structure_comps comps ->
-      try let (c,n) = Tbl.find_str s (proj comps) in [Pdot(p,s,n), c]
-      with Not_found -> []
-
-let rec find_shadowed_comps path env =
-  match path with
-    Pident id ->
-      IdTbl.find_all (Ident.name id) env.components
-  | Pdot (p, s, _) ->
-      let l = find_shadowed_comps p env in
-      let l' =
-        List.map (find_all_comps (fun comps -> comps.comp_components) s) l in
-      List.flatten l'
-  | Papply _ -> []
-
-let find_shadowed proj1 proj2 path env =
-  match path with
-    Pident id ->
-      IdTbl.find_all (Ident.name id) (proj1 env)
-  | Pdot (p, s, _) ->
-      let l = find_shadowed_comps p env in
-      let l' = List.map (find_all_comps proj2 s) l in
-      List.flatten l'
-  | Papply _ -> []
-
-let find_shadowed_types path env =
-  List.map fst
-    (find_shadowed
-       (fun env -> env.types) (fun comps -> comps.comp_types) path env)
-
-
-(* GADT instance tracking *)
-
-let add_gadt_instance_level lv env =
-  {env with
-   gadt_instances = (lv, ref TypeSet.empty) :: env.gadt_instances}
-
-let is_Tlink = function {desc = Tlink _} -> true | _ -> false
-
-let gadt_instance_level env t =
-  let rec find_instance = function
-      [] -> None
-    | (lv, r) :: rem ->
-        if TypeSet.exists is_Tlink !r then
-          (* Should we use set_typeset ? *)
-          r := TypeSet.fold (fun ty -> TypeSet.add (repr ty)) !r TypeSet.empty;
-        if TypeSet.mem t !r then Some lv else find_instance rem
-  in find_instance env.gadt_instances
-
-let add_gadt_instances env lv tl =
-  let r =
-    try List.assoc lv env.gadt_instances with Not_found -> assert false in
-  (* Format.eprintf "Added";
-  List.iter (fun ty -> Format.eprintf "@ %a" !Btype.print_raw ty) tl;
-  Format.eprintf "@."; *)
-  set_typeset r (List.fold_right TypeSet.add tl !r)
-
-(* Only use this after expand_head! *)
-let add_gadt_instance_chain env lv t =
-  let r =
-    try List.assoc lv env.gadt_instances with Not_found -> assert false in
-  let rec add_instance t =
-    let t = repr t in
-    if not (TypeSet.mem t !r) then begin
-      (* Format.eprintf "@ %a" !Btype.print_raw t; *)
-      set_typeset r (TypeSet.add t !r);
-      match t.desc with
-        Tconstr (p, _, memo) ->
-          may add_instance (find_expans Private p !memo)
-      | _ -> ()
-    end
-  in
-  (* Format.eprintf "Added chain"; *)
-  add_instance t
-  (* Format.eprintf "@." *)
-
-(* Expand manifest module type names at the top of the given module type *)
-
-let rec scrape_alias env ?path mty =
-  match mty, path with
-    Mty_ident p, _ ->
-      begin try
-        scrape_alias env (find_modtype_expansion p env) ?path
-      with Not_found ->
-        mty
-      end
-  | Mty_alias(_, path), _ ->
-      begin try
-        scrape_alias env (find_module path env).md_type ~path
-      with Not_found ->
-        (*Location.prerr_warning Location.none
-          (Warnings.No_cmi_file (Path.name path));*)
-        mty
-      end
-  | mty, Some path ->
-      !strengthen ~aliasable:true env mty path
-  | _ -> mty
-
-let scrape_alias env mty = scrape_alias env mty
-
-(* Given a signature and a root path, prefix all idents in the signature
-   by the root path and build the corresponding substitution. *)
-
-let rec prefix_idents root pos sub = function
-    [] -> ([], sub)
-  | Sig_value(id, decl) :: rem ->
-      let p = Pdot(root, Ident.name id, pos) in
-      let nextpos = match decl.val_kind with Val_prim _ -> pos | _ -> pos+1 in
-      let (pl, final_sub) = prefix_idents root nextpos sub rem in
-      (p::pl, final_sub)
-  | Sig_type(id, _, _) :: rem ->
-      let p = Pdot(root, Ident.name id, nopos) in
-      let (pl, final_sub) =
-        prefix_idents root pos (Subst.add_type id p sub) rem in
-      (p::pl, final_sub)
-  | Sig_typext(id, _, _) :: rem ->
-      let p = Pdot(root, Ident.name id, pos) in
-      (* we extend the substitution in case of an inlined record *)
-      let (pl, final_sub) =
-        prefix_idents root (pos+1) (Subst.add_type id p sub) rem in
-      (p::pl, final_sub)
-  | Sig_module(id, _, _) :: rem ->
-      let p = Pdot(root, Ident.name id, pos) in
-      let (pl, final_sub) =
-        prefix_idents root (pos+1) (Subst.add_module id p sub) rem in
-      (p::pl, final_sub)
-  | Sig_modtype(id, _) :: rem ->
-      let p = Pdot(root, Ident.name id, nopos) in
-      let (pl, final_sub) =
-        prefix_idents root pos
-                      (Subst.add_modtype id (Mty_ident p) sub) rem in
-      (p::pl, final_sub)
-  | Sig_class _ :: _ ->
-    assert false
-  | Sig_class_type(id, _, _) :: rem ->
-      let p = Pdot(root, Ident.name id, nopos) in
-      let (pl, final_sub) =
-        prefix_idents root pos (Subst.add_type id p sub) rem in
-      (p::pl, final_sub)
-
-let prefix_idents root sub sg =
-  if sub = Subst.identity then
-    let sgs =
-      try
-        Hashtbl.find prefixed_sg root
-      with Not_found ->
-        let sgs = ref [] in
-        Hashtbl.add prefixed_sg root sgs;
-        sgs
-    in
-    try
-      List.assq sg !sgs
-    with Not_found ->
-      let r = prefix_idents root 0 sub sg in
-      sgs := (sg, r) :: !sgs;
-      r
-  else
-    prefix_idents root 0 sub sg
-
-(* Compute structure descriptions *)
-
-let add_to_tbl id decl tbl =
-  let decls =
-    try Tbl.find_str id tbl with Not_found -> [] in
-  Tbl.add id (decl :: decls) tbl
-
-let rec components_of_module ~deprecated ~loc env sub path mty =
-  {
-    deprecated;
-    loc;
-    comps = EnvLazy.create (env, sub, path, mty)
-  }
-
-and components_of_module_maker (env, sub, path, mty) =
-  match scrape_alias env mty with
-    Mty_signature sg ->
-      let c =
-        { comp_values = Tbl.empty;
-          comp_constrs = Tbl.empty;
-          comp_labels = Tbl.empty; comp_types = Tbl.empty;
-          comp_modules = Tbl.empty; comp_modtypes = Tbl.empty;
-          comp_components = Tbl.empty; comp_classes = Tbl.empty;
-          comp_cltypes = Tbl.empty } in
-      let pl, sub = prefix_idents path sub sg in
-      let env = ref env in
-      let pos = ref 0 in
-      List.iter2 (fun item path ->
-        match item with
-          Sig_value(id, decl) ->
-            let decl' = Subst.value_description sub decl in
-            c.comp_values <-
-              Tbl.add (Ident.name id) (decl', !pos) c.comp_values;
-            begin match decl.val_kind with
-              Val_prim _ -> () | _ -> incr pos
-            end
-        | Sig_type(id, decl, _) ->
-            let decl' = Subst.type_declaration sub decl in
-            Datarepr.set_row_name decl' (Subst.type_path sub (Path.Pident id));
-            let constructors =
-              List.map snd (Datarepr.constructors_of_type path decl') in
-            let labels =
-              List.map snd (Datarepr.labels_of_type path decl') in
-            c.comp_types <-
-              Tbl.add (Ident.name id)
-                ((decl', (constructors, labels)), nopos)
-                  c.comp_types;
-            List.iter
-              (fun descr ->
-                c.comp_constrs <-
-                  add_to_tbl descr.cstr_name descr c.comp_constrs)
-              constructors;
-            List.iter
-              (fun descr ->
-                c.comp_labels <-
-                  add_to_tbl descr.lbl_name descr c.comp_labels)
-              labels;
-            env := store_type_infos id decl !env
-        | Sig_typext(id, ext, _) ->
-            let ext' = Subst.extension_constructor sub ext in
-            let descr = Datarepr.extension_descr path ext' in
-            c.comp_constrs <-
-              add_to_tbl (Ident.name id) descr c.comp_constrs;
-            incr pos
-        | Sig_module(id, md, _) ->
-            let md' = EnvLazy.create (sub, md) in
-            c.comp_modules <-
-              Tbl.add (Ident.name id) (md', !pos) c.comp_modules;
-            let deprecated =
-              Builtin_attributes.deprecated_of_attrs md.md_attributes
-            in
-            let comps =
-              components_of_module ~deprecated ~loc:md.md_loc !env sub path
-                md.md_type
-            in
-            c.comp_components <-
-              Tbl.add (Ident.name id) (comps, !pos) c.comp_components;
-            env := store_module ~check:false id md !env;
-            incr pos
-        | Sig_modtype(id, decl) ->
-            let decl' = Subst.modtype_declaration sub decl in
-            c.comp_modtypes <-
-              Tbl.add (Ident.name id) (decl', nopos) c.comp_modtypes;
-            env := store_modtype id decl !env
-        | Sig_class () -> assert false
-        | Sig_class_type(id, decl, _) ->
-            let decl' = Subst.cltype_declaration sub decl in
-            c.comp_cltypes <-
-              Tbl.add (Ident.name id) (decl', !pos) c.comp_cltypes)
-        sg pl;
-        Some (Structure_comps c)
-  | Mty_functor(param, ty_arg, ty_res) ->
-        Some (Functor_comps {
-          fcomp_param = param;
-          (* fcomp_arg and fcomp_res must be prefixed eagerly, because
-             they are interpreted in the outer environment *)
-          fcomp_arg = may_map (Subst.modtype sub) ty_arg;
-          fcomp_res = Subst.modtype sub ty_res;
-          fcomp_cache = Hashtbl.create 17;
-          fcomp_subst_cache = Hashtbl.create 17 })
-  | Mty_ident _
-  | Mty_alias _ -> None
-
-(* Insertion of bindings by identifier + path *)
-
-and check_usage loc id warn tbl =
-  if not loc.Location.loc_ghost && Warnings.is_active (warn "") then begin
-    let name = Ident.name id in
-    let key = (name, loc) in
-    if Hashtbl.mem tbl key then ()
-    else let used = ref false in
-    Hashtbl.add tbl key (fun () -> used := true);
-    if not (name = "" || name.[0] = '_' || name.[0] = '#')
-    then
-      Delayed_checks.add_delayed_check
-        (fun () -> if not !used then Location.prerr_warning loc (warn name))
-  end;
-
-and check_value_name name loc =
-  (* Note: we could also check here general validity of the
-     identifier, to protect against bad identifiers forged by -pp or
-     -ppx preprocessors. *)
-  if name = "|." then raise (Error(Illegal_value_name(loc, name)))  
-  else if String.length name > 0 && (name.[0] = '#') then
-    for i = 1 to String.length name - 1 do
-      if name.[i] = '#' then
-        raise (Error(Illegal_value_name(loc, name)))
-    done
-
-
-and store_value ?check id decl env =
-  check_value_name (Ident.name id) decl.val_loc;
-  may (fun f -> check_usage decl.val_loc id f value_declarations) check;
-  { env with
-    values = IdTbl.add id decl env.values;
-    summary = Env_value(env.summary, id, decl) }
-
-and store_type ~check id info env =
-  let loc = info.type_loc in
-  if check then
-    check_usage loc id (fun s -> Warnings.Unused_type_declaration s)
-      type_declarations;
-  let path = Pident id in
-  let constructors = Datarepr.constructors_of_type path info in
-  let labels = Datarepr.labels_of_type path info in
-  let descrs = (List.map snd constructors, List.map snd labels) in
-
-  if check && not loc.Location.loc_ghost &&
-    Warnings.is_active (Warnings.Unused_constructor ("", false, false))
-  then begin
-    let ty = Ident.name id in
-    List.iter
-      begin fun (_, {cstr_name = c; _}) ->
-        let k = (ty, loc, c) in
-        if not (Hashtbl.mem used_constructors k) then
-          let used = constructor_usages () in
-          Hashtbl.add used_constructors k (add_constructor_usage used);
-          if not (ty = "" || ty.[0] = '_')
-          then Delayed_checks.add_delayed_check
-              (fun () ->
-                if not (is_in_signature env) && not used.cu_positive then
-                  Location.prerr_warning loc
-                    (Warnings.Unused_constructor
-                       (c, used.cu_pattern, used.cu_privatize)))
-      end
-      constructors
-  end;
-  { env with
-    constrs =
-      List.fold_right
-        (fun (id, descr) constrs -> TycompTbl.add id descr constrs)
-        constructors
-        env.constrs;
-    labels =
-      List.fold_right
-        (fun (id, descr) labels -> TycompTbl.add id descr labels)
-        labels
-        env.labels;
-    types =
-      IdTbl.add id (info, descrs) env.types;
-    summary = Env_type(env.summary, id, info) }
-
-and store_type_infos id info env =
-  (* Simplified version of store_type that doesn't compute and store
-     constructor and label infos, but simply record the arity and
-     manifest-ness of the type.  Used in components_of_module to
-     keep track of type abbreviations (e.g. type t = float) in the
-     computation of label representations. *)
-  { env with
-    types = IdTbl.add id (info,([],[]))
-        env.types;
-    summary = Env_type(env.summary, id, info) }
-
-and store_extension ~check id ext env =
-  let loc = ext.ext_loc in
-  if check && not loc.Location.loc_ghost &&
-    Warnings.is_active (Warnings.Unused_extension ("", false, false, false))
-  then begin
-    let is_exception = Path.same ext.ext_type_path Predef.path_exn in
-    let ty = Path.last ext.ext_type_path in
-    let n = Ident.name id in
-    let k = (ty, loc, n) in
-    if not (Hashtbl.mem used_constructors k) then begin
-      let used = constructor_usages () in
-      Hashtbl.add used_constructors k (add_constructor_usage used);
-      Delayed_checks.add_delayed_check
-        (fun () ->
-          if not (is_in_signature env) && not used.cu_positive then
-            Location.prerr_warning loc
-              (Warnings.Unused_extension
-                 (n, is_exception, used.cu_pattern, used.cu_privatize)
-              )
-        )
-    end;
-  end;
-  { env with
-    constrs = TycompTbl.add id
-                (Datarepr.extension_descr (Pident id) ext)
-                env.constrs;
-    summary = Env_extension(env.summary, id, ext) }
-
-and store_module ~check id md env =
-  let loc = md.md_loc in
-  if check then
-    check_usage loc id (fun s -> Warnings.Unused_module s)
-      module_declarations;
-
-  let deprecated = Builtin_attributes.deprecated_of_attrs md.md_attributes in
-  { env with
-    modules = IdTbl.add id (EnvLazy.create (Subst.identity, md)) env.modules;
-    components =
-      IdTbl.add id
-        (components_of_module ~deprecated ~loc:md.md_loc
-           env Subst.identity (Pident id) md.md_type)
-        env.components;
-    summary = Env_module(env.summary, id, md) }
-
-and store_modtype id info env =
-  { env with
-    modtypes = IdTbl.add id info env.modtypes;
-    summary = Env_modtype(env.summary, id, info) }
-
-
-and store_cltype id desc env =
-  { env with
-    cltypes = IdTbl.add id desc env.cltypes;
-    summary = Env_cltype(env.summary, id, desc) }
-
-(* Compute the components of a functor application in a path. *)
-
-let components_of_functor_appl f env p1 p2 =
-  try
-    Hashtbl.find f.fcomp_cache p2
-  with Not_found ->
-    let p = Papply(p1, p2) in
-    let sub = Subst.add_module f.fcomp_param p2 Subst.identity in
-    let mty = Subst.modtype sub f.fcomp_res in
-    let comps = components_of_module ~deprecated:None ~loc:Location.none
-        (*???*)
-        env Subst.identity p mty in
-    Hashtbl.add f.fcomp_cache p2 comps;
-    comps
-
-(* Define forward functions *)
-
-let _ =
-  components_of_module' := components_of_module;
-  components_of_functor_appl' := components_of_functor_appl;
-  components_of_module_maker' := components_of_module_maker
-
-(* Insertion of bindings by identifier *)
-
-let add_functor_arg id env =
-  {env with
-   functor_args = Ident.add id () env.functor_args;
-   summary = Env_functor_arg (env.summary, id)}
-
-let add_value ?check id desc env =
-  store_value ?check id desc env
-
-let add_type ~check id info env =
-  store_type ~check id info env
-
-and add_extension ~check id ext env =
-  store_extension ~check id ext env
-
-and add_module_declaration ?(arg=false) ~check id md env =
-  let env = store_module ~check id md env in
-  if arg then add_functor_arg id env else env
-
-and add_modtype id info env =
-  store_modtype id info env
-
-
-
-and add_cltype id ty env =
-  store_cltype id ty env
-
-let add_module ?arg id mty env =
-  add_module_declaration ~check:false ?arg id (md mty) env
-
-let add_local_type path info env =
-  { env with
-    local_constraints = PathMap.add path info env.local_constraints }
-
-let add_local_constraint path info elv env =
-  match info with
-    {type_manifest = Some _; type_newtype_level = Some (lv, _)} ->
-      (* elv is the expansion level, lv is the definition level *)
-      let info = {info with type_newtype_level = Some (lv, elv)} in
-      add_local_type path info env
-  | _ -> assert false
-
-
-(* Insertion of bindings by name *)
-
-let enter store_fun name data env =
-  let id = Ident.create name in (id, store_fun id data env)
-
-let enter_value ?check = enter (store_value ?check)
-and enter_type = enter (store_type ~check:true)
-and enter_extension = enter (store_extension ~check:true)
-and enter_module_declaration ?arg id md env =
-  add_module_declaration ?arg ~check:true id md env
-  (* let (id, env) = enter store_module name md env in
-  (id, add_functor_arg ?arg id env) *)
-and enter_modtype = enter store_modtype
-
-and enter_cltype = enter store_cltype
-
-let enter_module ?arg s mty env =
-  let id = Ident.create s in
-  (id, enter_module_declaration ?arg id (md mty) env)
-
-(* Insertion of all components of a signature *)
-
-let add_item comp env =
-  match comp with
-    Sig_value(id, decl)     -> add_value id decl env
-  | Sig_type(id, decl, _)   -> add_type ~check:false id decl env
-  | Sig_typext(id, ext, _)  -> add_extension ~check:false id ext env
-  | Sig_module(id, md, _)   -> add_module_declaration ~check:false id md env
-  | Sig_modtype(id, decl)   -> add_modtype id decl env
-  | Sig_class()  -> env
-  | Sig_class_type(id, decl, _) -> add_cltype id decl env
-
-let rec add_signature sg env =
-  match sg with
-    [] -> env
-  | comp :: rem -> add_signature rem (add_item comp env)
-
-(* Open a signature path *)
-
-let add_components slot root env0 comps =
-  let add_l w comps env0 =
-    TycompTbl.add_open slot w comps env0
-  in
-
-  let add w comps env0 = IdTbl.add_open slot w root comps env0 in
-
-  let constrs =
-    add_l (fun x -> `Constructor x) comps.comp_constrs env0.constrs
-  in
-  let labels =
-    add_l (fun x -> `Label x) comps.comp_labels env0.labels
-  in
-
-  let values =
-    add (fun x -> `Value x) comps.comp_values env0.values
-  in
-  let types =
-    add (fun x -> `Type x) comps.comp_types env0.types
-  in
-  let modtypes =
-    add (fun x -> `Module_type x) comps.comp_modtypes env0.modtypes
-  in
-  let classes =
-    add (fun x -> `Class x) comps.comp_classes env0.classes
-  in
-  let cltypes =
-    add (fun x -> `Class_type x) comps.comp_cltypes env0.cltypes
-  in
-  let components =
-    add (fun x -> `Component x) comps.comp_components env0.components
-  in
-
-  let modules =
-    add (fun x -> `Module x) comps.comp_modules env0.modules
-  in
-
-  { env0 with
-    summary = Env_open(env0.summary, root);
-    constrs;
-    labels;
-    values;
-    types;
-    modtypes;
-    classes;
-    cltypes;
-    components;
-    modules;
-  }
-
-let open_signature slot root env0 =
-  match get_components (find_module_descr root env0) with
-  | Functor_comps _ -> None
-  | Structure_comps comps -> Some (add_components slot root env0 comps)
-
-
-(* Open a signature from a file *)
-
-let open_pers_signature name env =
-  match open_signature None (Pident(Ident.create_persistent name)) env with
-  | Some env -> env
-  | None -> assert false (* a compilation unit cannot refer to a functor *)
-
-let open_signature
-    ?(used_slot = ref false)
-    ?(loc = Location.none) ?(toplevel = false) ovf root env =
-  if not toplevel && ovf = Asttypes.Fresh && not loc.Location.loc_ghost
-     && (Warnings.is_active (Warnings.Unused_open "")
-         || Warnings.is_active (Warnings.Open_shadow_identifier ("", ""))
-         || Warnings.is_active (Warnings.Open_shadow_label_constructor ("","")))
-  then begin
-    let used = used_slot in
-    Delayed_checks.add_delayed_check
-      (fun () ->
-         if not !used then begin
-           used := true;
-           Location.prerr_warning loc (Warnings.Unused_open (Path.name root))
-         end
-      );
-    let shadowed = ref [] in
-    let slot s b =
-      begin match check_shadowing env b with
-      | Some kind when not (List.mem (kind, s) !shadowed) ->
-          shadowed := (kind, s) :: !shadowed;
-          let w =
-            match kind with
-            | "label" | "constructor" ->
-                Warnings.Open_shadow_label_constructor (kind, s)
-            | _ -> Warnings.Open_shadow_identifier (kind, s)
-          in
-          Location.prerr_warning loc w
-      | _ -> ()
-      end;
-      used := true
-    in
-    open_signature (Some slot) root env
-  end
-  else open_signature None root env
-
-(* Read a signature from a file *)
-
-let read_signature modname filename =
-  let ps = read_pers_struct modname filename in
-  Lazy.force ps.ps_sig
-
-(* Return the CRC of the interface of the given compilation unit *)
-
-let crc_of_unit name =
-  let ps = find_pers_struct name in
-  let crco =
-    try
-      List.assoc name ps.ps_crcs
-    with Not_found ->
-      assert false
-  in
-    match crco with
-      None -> assert false
-    | Some crc -> crc
-
-(* Return the list of imported interfaces with their CRCs *)
-
-let imports () =
-  let dont_record_crc_unit = !Clflags.dont_record_crc_unit in 
-  match dont_record_crc_unit with 
-  | None -> Consistbl.extract (StringSet.elements !imported_units) crc_units
-  | Some x -> 
-    Consistbl.extract 
-      (StringSet.fold 
-      (fun m acc -> if m = x then acc else m::acc) 
-      !imported_units []) crc_units
-
-(* Save a signature to a file *)
-
-let save_signature_with_imports ?check_exists ~deprecated sg modname filename imports =
-  (*prerr_endline filename;
-  List.iter (fun (name, crc) -> prerr_endline name) imports;*)
-  Btype.cleanup_abbrev ();
-  Subst.reset_for_saving ();
-  let sg = Subst.signature (Subst.for_saving Subst.identity) sg in
-  let flags =
-      (match deprecated with Some s -> [Deprecated s] | None -> [])
-  in
-  try
-    let cmi = {
-      cmi_name = modname;
-      cmi_sign = sg;
-      cmi_crcs = imports;
-      cmi_flags = flags;
-    } in
-    let crc =
-      create_cmi ?check_exists filename cmi in
-    (* Enter signature in persistent table so that imported_unit()
-       will also return its crc *)
-    let comps =
-      components_of_module ~deprecated ~loc:Location.none
-        empty Subst.identity
-        (Pident(Ident.create_persistent modname)) (Mty_signature sg) in
-    let ps =
-      { ps_name = modname;
-        ps_sig = lazy (Subst.signature Subst.identity sg);
-        ps_comps = comps;
-        ps_crcs = (cmi.cmi_name, Some crc) :: imports;
-        ps_filename = filename;
-        ps_flags = cmi.cmi_flags;
-      } in
-    save_pers_struct crc ps;
-    cmi
-  with exn ->
-    remove_file filename;
-    raise exn
-
-let save_signature ?check_exists ~deprecated sg modname filename =
-  save_signature_with_imports ?check_exists ~deprecated sg modname filename (imports())
-
-(* Folding on environments *)
-
-let find_all proj1 proj2 f lid env acc =
-  match lid with
-    | None ->
-      IdTbl.fold_name
-        (fun name (p, data) acc -> f name p data acc)
-        (proj1 env) acc
-    | Some l ->
-      let p, desc = lookup_module_descr l env in
-      begin match get_components desc with
-          Structure_comps c ->
-            Tbl.fold
-              (fun s (data, pos) acc -> f s (Pdot (p, s, pos)) data acc)
-              (proj2 c) acc
-        | Functor_comps _ ->
-            acc
-      end
-
-let find_all_simple_list proj1 proj2 f lid env acc =
-  match lid with
-    | None ->
-      TycompTbl.fold_name
-        (fun data acc -> f data acc)
-        (proj1 env) acc
-    | Some l ->
-      let (_p, desc) = lookup_module_descr l env in
-      begin match get_components desc with
-          Structure_comps c ->
-            Tbl.fold
-              (fun _s comps acc ->
-                match comps with
-                  [] -> acc
-                | data :: _ ->
-                  f data acc)
-              (proj2 c) acc
-        | Functor_comps _ ->
-            acc
-      end
-
-let fold_modules f lid env acc =
-  match lid with
-    | None ->
-      let acc =
-        IdTbl.fold_name
-          (fun name (p, data) acc ->
-             let data = EnvLazy.force subst_modtype_maker data in
-             f name p data acc
-          )
-          env.modules
-          acc
-      in
-      Hashtbl.fold
-        (fun name ps acc ->
-          match ps with
-              None -> acc
-            | Some ps ->
-              f name (Pident(Ident.create_persistent name))
-                     (md (Mty_signature (Lazy.force ps.ps_sig))) acc)
-        persistent_structures
-        acc
-    | Some l ->
-      let p, desc = lookup_module_descr l env in
-      begin match get_components desc with
-          Structure_comps c ->
-            Tbl.fold
-              (fun s (data, pos) acc ->
-                f s (Pdot (p, s, pos))
-                    (EnvLazy.force subst_modtype_maker data) acc)
-              c.comp_modules
-              acc
-        | Functor_comps _ ->
-            acc
-      end
-
-let fold_values f =
-  find_all (fun env -> env.values) (fun sc -> sc.comp_values) f
-and fold_constructors f =
-  find_all_simple_list (fun env -> env.constrs) (fun sc -> sc.comp_constrs) f
-and fold_labels f =
-  find_all_simple_list (fun env -> env.labels) (fun sc -> sc.comp_labels) f
-and fold_types f =
-  find_all (fun env -> env.types) (fun sc -> sc.comp_types) f
-and fold_modtypes f =
-  find_all (fun env -> env.modtypes) (fun sc -> sc.comp_modtypes) f
-and fold_classs f =
-  find_all (fun env -> env.classes) (fun sc -> sc.comp_classes) f
-and fold_cltypes f =
-  find_all (fun env -> env.cltypes) (fun sc -> sc.comp_cltypes) f
-
-
-(* Make the initial environment *)
-let initial_safe_string =
-  Predef.build_initial_env
-    (add_type ~check:false)
-    (add_extension ~check:false)
-    empty
-
-(* Return the environment summary *)
-
-let summary env =
-  if PathMap.is_empty env.local_constraints then env.summary
-  else Env_constraints (env.summary, env.local_constraints)
-
-let last_env = ref empty
-let last_reduced_env = ref empty
-
-let keep_only_summary env =
-  if !last_env == env then !last_reduced_env
-  else begin
-    let new_env =
-      {
-       empty with
-       summary = env.summary;
-       local_constraints = env.local_constraints;
-       flags = env.flags;
-      }
-    in
-    last_env := env;
-    last_reduced_env := new_env;
-    new_env
-  end
-
-
-let env_of_only_summary env_from_summary env =
-  let new_env = env_from_summary env.summary Subst.identity in
-  { new_env with
-    local_constraints = env.local_constraints;
-    flags = env.flags;
-  }
-
-(* Error report *)
-
-open Format
-
-(* taken from https://github.com/rescript-lang/ocaml/blob/d4144647d1bf9bc7dc3aadc24c25a7efa3a67915/typing/env.ml#L1842 *)
-(* modified branches are commented *)
-let report_error ppf = function
-  | Illegal_renaming(name, modname, _filename) ->
-    (* modified *)
-    fprintf ppf
-      "@[You referred to the module %s, but we've found one called %s instead.@ \
-       Is the name's casing right?@]"
-      name modname
-  | Inconsistent_import(name, source1, source2) ->
-    (* modified *)
-    fprintf ppf "@[<v>\
-                 @[@{<info>It's possible that your build is stale.@}@ Try to clean the artifacts and build again?@]@,@,\
-                 @[@{<info>Here's the original error message@}@]@,\
-                 @]";
-    fprintf ppf
-      "@[<hov>The files %a@ and %a@ \
-       make inconsistent assumptions@ over interface %s@]"
-      Location.print_filename source1 Location.print_filename source2 name
-  | Need_recursive_types(import, export) ->
-    fprintf ppf
-      "@[<hov>Unit %s imports from %s, which uses recursive types.@ %s@]"
-      export import "The compilation flag -rectypes is required"
-  | Missing_module(_, path1, path2) ->
-    fprintf ppf "@[@[<hov>";
-    if Path.same path1 path2 then
-      fprintf ppf "Internal path@ %s@ is dangling." (Path.name path1)
-    else
-      fprintf ppf "Internal path@ %s@ expands to@ %s@ which is dangling."
-        (Path.name path1) (Path.name path2);
-    fprintf ppf "@]@ @[%s@ %s@ %s.@]@]"
-      "The compiled interface for module" (Ident.name (Path.head path2))
-      "was not found"
-  | Illegal_value_name(_loc, name) ->
-    fprintf ppf "'%s' is not a valid value identifier."
-      name
-
-let () =
-  Location.register_error_of_exn
-    (function
-      | Error (Missing_module (loc, _, _)
-              | Illegal_value_name (loc, _)
-               as err) when loc <> Location.none ->
-          Some (Location.error_of_printer loc report_error err)
-      | Error err -> Some (Location.error_of_printer_file report_error err)
-      | _ -> None
-    )
diff --git a/jscomp/ml/env.mli b/jscomp/ml/env.mli
deleted file mode 100644
index dfa1027..0000000
--- a/jscomp/ml/env.mli
+++ /dev/null
@@ -1,323 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Environment handling *)
-
-open Types
-
-module PathMap : Map.S with type key = Path.t
-                        and type 'a t = 'a Map.Make(Path).t
-
-type summary =
-    Env_empty
-  | Env_value of summary * Ident.t * value_description
-  | Env_type of summary * Ident.t * type_declaration
-  | Env_extension of summary * Ident.t * extension_constructor
-  | Env_module of summary * Ident.t * module_declaration
-  | Env_modtype of summary * Ident.t * modtype_declaration
-  | Env_class of unit
-  | Env_cltype of summary * Ident.t * class_type_declaration
-  | Env_open of summary * Path.t
-  | Env_functor_arg of summary * Ident.t
-  | Env_constraints of summary * type_declaration PathMap.t
-  | Env_copy_types of summary * string list
-
-type t
-
-val empty: t
-val initial_safe_string: t
-
-val diff: t -> t -> Ident.t list
-val copy_local: from:t -> t -> t
-
-type type_descriptions =
-    constructor_description list * label_description list
-
-(* For short-paths *)
-type iter_cont
-val iter_types:
-    (Path.t -> Path.t * (type_declaration * type_descriptions) -> unit) ->
-    t -> iter_cont
-val run_iter_cont: iter_cont list -> (Path.t * iter_cont) list
-val same_types: t -> t -> bool
-val used_persistent: unit -> Concr.t
-val find_shadowed_types: Path.t -> t -> Path.t list
-val without_cmis: ('a -> 'b) -> 'a -> 'b
-        (* [without_cmis f arg] applies [f] to [arg], but does not
-           allow opening cmis during its execution *)
-
-(* Lookup by paths *)
-
-val find_value: Path.t -> t -> value_description
-val find_type: Path.t -> t -> type_declaration
-val find_type_descrs: Path.t -> t -> type_descriptions
-val find_module: Path.t -> t -> module_declaration
-val find_modtype: Path.t -> t -> modtype_declaration
-val find_class: Path.t -> t -> class_declaration
-val find_cltype: Path.t -> t -> class_type_declaration
-
-val find_type_expansion:
-    Path.t -> t -> type_expr list * type_expr * int option
-val find_type_expansion_opt:
-    Path.t -> t -> type_expr list * type_expr * int option
-(* Find the manifest type information associated to a type for the sake
-   of the compiler's type-based optimisations. *)
-val find_modtype_expansion: Path.t -> t -> module_type
-val add_functor_arg: Ident.t -> t -> t
-val is_functor_arg: Path.t -> t -> bool
-val normalize_path: Location.t option -> t -> Path.t -> Path.t
-(* Normalize the path to a concrete value or module.
-   If the option is None, allow returning dangling paths.
-   Otherwise raise a Missing_module error, and may add forgotten
-   head as required global. *)
-val normalize_path_prefix: Location.t option -> t -> Path.t -> Path.t
-(* Only normalize the prefix part of the path *)
-
-
-
-
-val has_local_constraints: t -> bool
-val add_gadt_instance_level: int -> t -> t
-val gadt_instance_level: t -> type_expr -> int option
-val add_gadt_instances: t -> int -> type_expr list -> unit
-val add_gadt_instance_chain: t -> int -> type_expr -> unit
-
-(* Lookup by long identifiers *)
-
-(* ?loc is used to report 'deprecated module' warnings *)
-
-val lookup_value:
-  ?loc:Location.t -> Longident.t -> t -> Path.t * value_description
-val lookup_constructor:
-  ?loc:Location.t -> Longident.t -> t -> constructor_description
-val lookup_all_constructors:
-  ?loc:Location.t ->
-  Longident.t -> t -> (constructor_description * (unit -> unit)) list
-val lookup_label:
-  ?loc:Location.t -> Longident.t -> t -> label_description
-val lookup_all_labels:
-  ?loc:Location.t ->
-  Longident.t -> t -> (label_description * (unit -> unit)) list
-val lookup_type:
-  ?loc:Location.t -> Longident.t -> t -> Path.t
-  (* Since 4.04, this function no longer returns [type_description].
-     To obtain it, you should either call [Env.find_type], or replace
-     it by [Typetexp.find_type] *)
-val lookup_module:
-  load:bool -> ?loc:Location.t -> Longident.t -> t -> Path.t
-val lookup_modtype:
-  ?loc:Location.t -> Longident.t -> t -> Path.t * modtype_declaration
-val lookup_class:
-  ?loc:Location.t -> Longident.t -> t -> Path.t * class_declaration
-val lookup_cltype:
-  ?loc:Location.t -> Longident.t -> t -> Path.t * class_type_declaration
-
-val copy_types: string list -> t -> t
-  (* Used only in Typecore.duplicate_ident_types. *)
-
-exception Recmodule
-  (* Raise by lookup_module when the identifier refers
-     to one of the modules of a recursive definition
-     during the computation of its approximation (see #5965). *)
-
-(* Insertion by identifier *)
-
-val add_value:
-    ?check:(string -> Warnings.t) -> Ident.t -> value_description -> t -> t
-val add_type: check:bool -> Ident.t -> type_declaration -> t -> t
-val add_extension: check:bool -> Ident.t -> extension_constructor -> t -> t
-val add_module: ?arg:bool -> Ident.t -> module_type -> t -> t
-val add_module_declaration: ?arg:bool -> check:bool -> Ident.t ->
-  module_declaration -> t -> t
-val add_modtype: Ident.t -> modtype_declaration -> t -> t
-
-val add_cltype: Ident.t -> class_type_declaration -> t -> t
-val add_local_constraint: Path.t -> type_declaration -> int -> t -> t
-val add_local_type: Path.t -> type_declaration -> t -> t
-
-(* Insertion of all fields of a signature. *)
-
-val add_item: signature_item -> t -> t
-val add_signature: signature -> t -> t
-
-(* Insertion of all fields of a signature, relative to the given path.
-   Used to implement open. Returns None if the path refers to a functor,
-   not a structure. *)
-val open_signature:
-    ?used_slot:bool ref ->
-    ?loc:Location.t -> ?toplevel:bool -> Asttypes.override_flag -> Path.t ->
-      t -> t option
-
-val open_pers_signature: string -> t -> t
-
-(* Insertion by name *)
-
-val enter_value:
-    ?check:(string -> Warnings.t) ->
-    string -> value_description -> t -> Ident.t * t
-val enter_type: string -> type_declaration -> t -> Ident.t * t
-val enter_extension: string -> extension_constructor -> t -> Ident.t * t
-val enter_module: ?arg:bool -> string -> module_type -> t -> Ident.t * t
-val enter_module_declaration:
-    ?arg:bool -> Ident.t -> module_declaration -> t -> t
-val enter_modtype: string -> modtype_declaration -> t -> Ident.t * t
-
-val enter_cltype: string -> class_type_declaration -> t -> Ident.t * t
-
-(* Initialize the cache of in-core module interfaces. *)
-val reset_cache: unit -> unit
-
-(* To be called before each toplevel phrase. *)
-val reset_cache_toplevel: unit -> unit
-
-(* Remember the name of the current compilation unit. *)
-val set_unit_name: string -> unit
-val get_unit_name: unit -> string
-
-(* Read, save a signature to/from a file *)
-
-val read_signature: string -> string -> signature
-        (* Arguments: module name, file name. Results: signature. *)
-val save_signature:
-  ?check_exists:unit ->
-  deprecated:string option -> signature -> string -> string -> Cmi_format.cmi_infos
-        (* Arguments: signature, module name, file name. *)
-val save_signature_with_imports:
-  ?check_exists:unit -> 
-  deprecated:string option ->
-  signature -> string -> string -> (string * Digest.t option) list
-  -> Cmi_format.cmi_infos
-        (* Arguments: signature, module name, file name,
-           imported units with their CRCs. *)
-
-(* Return the CRC of the interface of the given compilation unit *)
-
-val crc_of_unit: string -> Digest.t
-
-(* Return the set of compilation units imported, with their CRC *)
-
-val imports: unit -> (string * Digest.t option) list
-
-
-
-(* Direct access to the table of imported compilation units with their CRC *)
-
-val crc_units: Consistbl.t
-val add_import: string -> unit
-
-(* Summaries -- compact representation of an environment, to be
-   exported in debugging information. *)
-
-val summary: t -> summary
-
-(* Return an equivalent environment where all fields have been reset,
-   except the summary. The initial environment can be rebuilt from the
-   summary, using Envaux.env_of_only_summary. *)
-
-val keep_only_summary : t -> t
-val env_of_only_summary : (summary -> Subst.t -> t) -> t -> t
-
-(* Error report *)
-
-type error =
-  | Illegal_renaming of string * string * string
-  | Inconsistent_import of string * string * string
-  | Need_recursive_types of string * string
-  | Missing_module of Location.t * Path.t * Path.t
-  | Illegal_value_name of Location.t * string
-
-exception Error of error
-
-open Format
-
-val report_error: formatter -> error -> unit
-
-
-val mark_value_used: t -> string -> value_description -> unit
-val mark_module_used: t -> string -> Location.t -> unit
-val mark_type_used: t -> string -> type_declaration -> unit
-
-type constructor_usage = Positive | Pattern | Privatize
-val mark_constructor_used:
-    constructor_usage -> t -> string -> type_declaration -> string -> unit
-val mark_constructor:
-    constructor_usage -> t -> string -> constructor_description -> unit
-val mark_extension_used:
-    constructor_usage -> t -> extension_constructor -> string -> unit
-
-val in_signature: bool -> t -> t
-val implicit_coercion: t -> t
-
-val is_in_signature: t -> bool
-
-val set_value_used_callback:
-    string -> value_description -> (unit -> unit) -> unit
-val set_type_used_callback:
-    string -> type_declaration -> ((unit -> unit) -> unit) -> unit
-
-(* Forward declaration to break mutual recursion with Includemod. *)
-val check_modtype_inclusion:
-      (loc:Location.t -> t -> module_type -> Path.t -> module_type -> unit) ref
-
-(* Forward declaration to break mutual recursion with Mtype. *)
-val strengthen:
-    (aliasable:bool -> t -> module_type -> Path.t -> module_type) ref
-(* Forward declaration to break mutual recursion with Ctype. *)
-val same_constr: (t -> type_expr -> type_expr -> bool) ref
-
-(** Folding over all identifiers (for analysis purpose) *)
-
-val fold_values:
-  (string -> Path.t -> value_description -> 'a -> 'a) ->
-  Longident.t option -> t -> 'a -> 'a
-val fold_types:
-  (string -> Path.t -> type_declaration * type_descriptions -> 'a -> 'a) ->
-  Longident.t option -> t -> 'a -> 'a
-val fold_constructors:
-  (constructor_description -> 'a -> 'a) ->
-  Longident.t option -> t -> 'a -> 'a
-val fold_labels:
-  (label_description -> 'a -> 'a) ->
-  Longident.t option -> t -> 'a -> 'a
-
-(** Persistent structures are only traversed if they are already loaded. *)
-val fold_modules:
-  (string -> Path.t -> module_declaration -> 'a -> 'a) ->
-  Longident.t option -> t -> 'a -> 'a
-
-val fold_modtypes:
-  (string -> Path.t -> modtype_declaration -> 'a -> 'a) ->
-  Longident.t option -> t -> 'a -> 'a
-val fold_classs:
-  (string -> Path.t -> class_declaration -> 'a -> 'a) ->
-  Longident.t option -> t -> 'a -> 'a
-val fold_cltypes:
-  (string -> Path.t -> class_type_declaration -> 'a -> 'a) ->
-  Longident.t option -> t -> 'a -> 'a
-
-(** Utilities *)
-val scrape_alias: t -> module_type -> module_type
-val check_value_name: string -> Location.t -> unit
-
-module Persistent_signature : sig
-  type t =
-    { filename : string; (** Name of the file containing the signature. *)
-      cmi : Cmi_format.cmi_infos }
-
-  (** Function used to load a persistent signature. The default is to look for
-      the .cmi file in the load path. This function can be overridden to load
-      it from memory, for instance to build a self-contained toplevel. *)
-  val load : (unit_name:string -> t option) ref
-end
diff --git a/jscomp/ml/envaux.ml b/jscomp/ml/envaux.ml
deleted file mode 100644
index 5fd5020..0000000
--- a/jscomp/ml/envaux.ml
+++ /dev/null
@@ -1,94 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*           Jerome Vouillon, projet Cristal, INRIA Rocquencourt          *)
-(*           OCaml port by John Malecki and Xavier Leroy                  *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Env
-
-type error =
-    Module_not_found of Path.t
-
-exception Error of error
-
-let env_cache =
-  (Hashtbl.create 59 : ((Env.summary * Subst.t), Env.t) Hashtbl.t)
-
-let reset_cache () =
-  Hashtbl.clear env_cache;
-  Env.reset_cache()
-
-let rec env_from_summary sum subst =
-  try
-    Hashtbl.find env_cache (sum, subst)
-  with Not_found ->
-    let env =
-      match sum with
-        Env_empty ->
-          Env.empty
-      | Env_value(s, id, desc) ->
-          Env.add_value id (Subst.value_description subst desc)
-                        (env_from_summary s subst)
-      | Env_type(s, id, desc) ->
-          Env.add_type ~check:false id
-            (Subst.type_declaration subst desc)
-            (env_from_summary s subst)
-      | Env_extension(s, id, desc) ->
-          Env.add_extension ~check:false id
-            (Subst.extension_constructor subst desc)
-            (env_from_summary s subst)
-      | Env_module(s, id, desc) ->
-          Env.add_module_declaration ~check:false id
-            (Subst.module_declaration subst desc)
-            (env_from_summary s subst)
-      | Env_modtype(s, id, desc) ->
-          Env.add_modtype id (Subst.modtype_declaration subst desc)
-                          (env_from_summary s subst)
-      | Env_cltype (s, id, desc) ->
-          Env.add_cltype id (Subst.cltype_declaration subst desc)
-                         (env_from_summary s subst)
-      | Env_open(s, path) ->
-          let env = env_from_summary s subst in
-          let path' = Subst.module_path subst path in
-          begin match Env.open_signature Asttypes.Override path' env with
-          | Some env -> env
-          | None -> assert false
-          end
-      | Env_functor_arg(Env_module(s, id, desc), id') when Ident.same id id' ->
-          Env.add_module_declaration ~check:false
-            id (Subst.module_declaration subst desc)
-            ~arg:true (env_from_summary s subst)
-      | Env_class _      
-      | Env_functor_arg _ -> assert false
-      | Env_constraints(s, map) ->
-          PathMap.fold
-            (fun path info ->
-              Env.add_local_type (Subst.type_path subst path)
-                (Subst.type_declaration subst info))
-            map (env_from_summary s subst)
-      | Env_copy_types (s, sl) ->
-          Env.copy_types sl (env_from_summary s subst)
-    in
-      Hashtbl.add env_cache (sum, subst) env;
-      env
-
-let env_of_only_summary env =
-  Env.env_of_only_summary env_from_summary env
-
-(* Error report *)
-
-open Format
-
-let report_error ppf = function
-  | Module_not_found p ->
-      fprintf ppf "@[Cannot find module %a@].@." Printtyp.path p
diff --git a/jscomp/ml/envaux.mli b/jscomp/ml/envaux.mli
deleted file mode 100644
index 2869890..0000000
--- a/jscomp/ml/envaux.mli
+++ /dev/null
@@ -1,36 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*           Jerome Vouillon, projet Cristal, INRIA Rocquencourt          *)
-(*           OCaml port by John Malecki and Xavier Leroy                  *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Format
-
-(* Convert environment summaries to environments *)
-
-val env_from_summary : Env.summary -> Subst.t -> Env.t
-
-(* Empty the environment caches. To be called when load_path changes. *)
-
-val reset_cache: unit -> unit
-
-val env_of_only_summary : Env.t -> Env.t
-
-(* Error report *)
-
-type error =
-    Module_not_found of Path.t
-
-exception Error of error
-
-val report_error: formatter -> error -> unit
diff --git a/jscomp/ml/error_message_utils.ml b/jscomp/ml/error_message_utils.ml
deleted file mode 100644
index 14a4913..0000000
--- a/jscomp/ml/error_message_utils.ml
+++ /dev/null
@@ -1,215 +0,0 @@
-type typeClashStatement = FunctionCall
-type typeClashContext =
-  | SetRecordField
-  | ArrayValue
-  | FunctionReturn
-  | MaybeUnwrapOption
-  | IfCondition
-  | IfReturn
-  | Switch
-  | StringConcat
-  | ComparisonOperator
-  | MathOperator of {
-      forFloat: bool;
-      operator: string;
-      isConstant: string option;
-    }
-  | FunctionArgument
-  | Statement of typeClashStatement
-
-let fprintf = Format.fprintf
-
-let errorTypeText ppf typeClashContext =
-  let text =
-    match typeClashContext with
-    | Some (Statement FunctionCall) -> "This function call returns:"
-    | Some (MathOperator {isConstant = Some _}) -> "This value has type:"
-    | Some ArrayValue -> "This array item has type:"
-    | Some SetRecordField ->
-      "You're assigning something to this field that has type:"
-    | _ -> "This has type:"
-  in
-  fprintf ppf "%s" text
-
-let errorExpectedTypeText ppf typeClashContext =
-  match typeClashContext with
-  | Some FunctionArgument ->
-    fprintf ppf "But this function argument is expecting:"
-  | Some ComparisonOperator ->
-    fprintf ppf "But it's being compared to something of type:"
-  | Some Switch -> fprintf ppf "But this switch is expected to return:"
-  | Some IfCondition ->
-    fprintf ppf "But @{<info>if@} conditions must always be of type:"
-  | Some IfReturn ->
-    fprintf ppf "But this @{<info>if@} statement is expected to return:"
-  | Some ArrayValue ->
-    fprintf ppf "But this array is expected to have items of type:"
-  | Some SetRecordField -> fprintf ppf "But this record field is of type:"
-  | Some (Statement FunctionCall) -> fprintf ppf "But it's expected to return:"
-  | Some (MathOperator {operator}) ->
-    fprintf ppf
-      "But it's being used with the @{<info>%s@} operator, which works on:"
-      operator
-  | Some FunctionReturn ->
-    fprintf ppf "But this function is expecting you to return:"
-  | _ -> fprintf ppf "But it's expected to have type:"
-
-let printExtraTypeClashHelp ppf trace typeClashContext =
-  match (typeClashContext, trace) with
-  | Some (MathOperator {forFloat; operator; isConstant}), _ -> (
-    let operatorForOtherType =
-      match operator with
-      | "+" -> "+."
-      | "+." -> "+"
-      | "/" -> "/."
-      | "/." -> "/"
-      | "-" -> "-."
-      | "*" -> "*."
-      | "*." -> "*"
-      | v -> v
-    in
-    let operatorText =
-      match operator.[0] with
-      | '+' -> "add"
-      | '-' -> "subtract"
-      | '/' -> "divide"
-      | '*' -> "multiply"
-      | _ -> "compute"
-    in
-    (* TODO check int vs float explicitly before showing this *)
-    (match (operator, trace) with
-    | ( "+",
-        [
-          ({Types.desc = Tconstr (p1, _, _)}, _);
-          ({desc = Tconstr (p2, _, _)}, _);
-        ] )
-      when Path.same Predef.path_string p1 || Path.same Predef.path_string p2 ->
-      fprintf ppf
-        "\n\n\
-        \  Are you looking to concatenate strings? Use the operator \
-         @{<info>++@}, which concatenates strings.\n\n\
-        \  Possible solutions:\n\
-        \  - Change the @{<info>+@} operator to @{<info>++@} to concatenate \
-         strings instead."
-    | _ ->
-      fprintf ppf
-        "\n\n\
-        \  Floats and ints have their own mathematical operators. This means \
-         you cannot %s a float and an int without converting between the two.\n\n\
-        \  Possible solutions:\n\
-        \  - Ensure all values in this calculation has the type @{<info>%s@}. \
-         You can convert between floats and ints via \
-         @{<info>Belt.Float.toInt@} and @{<info>Belt.Int.fromFloat@}."
-        operatorText
-        (if forFloat then "float" else "int"));
-    match (isConstant, trace) with
-    | Some constant, _ ->
-      if forFloat then
-        fprintf ppf
-          "\n\
-          \  - Make @{<info>%s@} a @{<info>float@} by adding a trailing dot: \
-           @{<info>%s.@}"
-          constant constant
-      else
-        fprintf ppf
-          "\n\
-          \  - Make @{<info>%s@} an @{<info>int@} by removing the dot or \
-           explicitly converting to int"
-          constant
-    | ( _,
-        [
-          ({Types.desc = Tconstr (p1, _, _)}, _);
-          ({desc = Tconstr (p2, _, _)}, _);
-        ] ) -> (
-      match (Path.name p1, Path.name p2) with
-      | "float", "int" | "int", "float" ->
-        fprintf ppf
-          "\n\
-          \  - Change the operator to @{<info>%s@}, which works on @{<info>%s@}"
-          operatorForOtherType
-          (if forFloat then "int" else "float")
-      | _ -> ())
-    | _ -> ())
-  | Some Switch, _ ->
-    fprintf ppf
-      "\n\n\
-      \  All branches in a @{<info>switch@} must return the same type. To fix \
-       this, change your branch to return the expected type."
-  | Some IfCondition, _ ->
-    fprintf ppf
-      "\n\n\
-      \  To fix this, change the highlighted code so it evaluates to a \
-       @{<info>bool@}."
-  | Some IfReturn, _ ->
-    fprintf ppf
-      "\n\n\
-      \  @{<info>if@} expressions must return the same type in all branches \
-       (@{<info>if@}, @{<info>else if@}, @{<info>else@})."
-  | Some MaybeUnwrapOption, _ ->
-    fprintf ppf
-      "\n\n\
-      \  Possible solutions:\n\
-      \  - Unwrap the option to its underlying value using \
-       `yourValue->Belt.Option.getWithDefault(someDefaultValue)`"
-  | Some ComparisonOperator, _ ->
-    fprintf ppf "\n\n  You can only compare things of the same type."
-  | Some ArrayValue, _ ->
-    fprintf ppf
-      "\n\n\
-      \  Arrays can only contain items of the same type.\n\n\
-      \  Possible solutions:\n\
-      \  - Convert all values in the array to the same type.\n\
-      \  - Use a tuple, if your array is of fixed length. Tuples can mix types \
-       freely, and compiles to a JavaScript array. Example of a tuple: `let \
-       myTuple = (10, \"hello\", 15.5, true)"
-  | _ -> ()
-
-let typeClashContextFromFunction sexp sfunct =
-  let isConstant =
-    match sexp.Parsetree.pexp_desc with
-    | Pexp_constant (Pconst_integer (txt, _) | Pconst_float (txt, _)) ->
-      Some txt
-    | _ -> None
-  in
-  match sfunct.Parsetree.pexp_desc with
-  | Pexp_ident
-      {txt = Lident ("=" | "==" | "<>" | "!=" | ">" | ">=" | "<" | "<=")} ->
-    Some ComparisonOperator
-  | Pexp_ident {txt = Lident "++"} -> Some StringConcat
-  | Pexp_ident {txt = Lident (("/." | "*." | "+." | "-.") as operator)} ->
-    Some (MathOperator {forFloat = true; operator; isConstant})
-  | Pexp_ident {txt = Lident (("/" | "*" | "+" | "-") as operator)} ->
-    Some (MathOperator {forFloat = false; operator; isConstant})
-  | _ -> Some FunctionArgument
-
-let typeClashContextForFunctionArgument typeClashContext sarg0 =
-  match typeClashContext with
-  | Some (MathOperator {forFloat; operator}) ->
-    Some
-      (MathOperator
-         {
-           forFloat;
-           operator;
-           isConstant =
-             (match sarg0.Parsetree.pexp_desc with
-             | Pexp_constant (Pconst_integer (txt, _) | Pconst_float (txt, _))
-               ->
-               Some txt
-             | _ -> None);
-         })
-  | typeClashContext -> typeClashContext
-
-let typeClashContextMaybeOption ty_expected ty_res =
-  match (ty_expected, ty_res) with
-  | ( {Types.desc = Tconstr (expectedPath, _, _)},
-      {Types.desc = Tconstr (typePath, _, _)} )
-    when Path.same Predef.path_option typePath
-         && Path.same expectedPath Predef.path_option = false 
-         && Path.same expectedPath Predef.path_uncurried = false ->
-    Some MaybeUnwrapOption
-  | _ -> None
-
-let typeClashContextInStatement sexp =
-  match sexp.Parsetree.pexp_desc with
-  | Pexp_apply _ -> Some (Statement FunctionCall)
-  | _ -> None
diff --git a/jscomp/ml/includeclass.ml b/jscomp/ml/includeclass.ml
deleted file mode 100644
index 7f1b1bd..0000000
--- a/jscomp/ml/includeclass.ml
+++ /dev/null
@@ -1,116 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*           Jerome Vouillon, projet Cristal, INRIA Rocquencourt          *)
-(*                                                                        *)
-(*   Copyright 1997 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Inclusion checks for the class language *)
-
-open Types
-
-let class_types env cty1 cty2 =
-  Ctype.match_class_types env cty1 cty2
-
-let class_type_declarations ~loc env cty1 cty2 =
-  Builtin_attributes.check_deprecated_inclusion
-    ~def:cty1.clty_loc
-    ~use:cty2.clty_loc
-    loc
-    cty1.clty_attributes cty2.clty_attributes
-    (Path.last cty1.clty_path);
-  Ctype.match_class_declarations env
-    cty1.clty_params cty1.clty_type
-    cty2.clty_params cty2.clty_type
-
-let class_declarations env cty1 cty2 =
-  match cty1.cty_new, cty2.cty_new with
-    None, Some _ ->
-      [Ctype.CM_Virtual_class]
-  | _ ->
-      Ctype.match_class_declarations env
-        cty1.cty_params cty1.cty_type
-        cty2.cty_params cty2.cty_type
-
-open Format
-open Ctype
-
-(*
-let rec hide_params = function
-    Tcty_arrow ("*", _, cty) -> hide_params cty
-  | cty -> cty
-*)
-
-let include_err ppf =
-  function
-  | CM_Virtual_class ->
-      fprintf ppf "A class cannot be changed from virtual to concrete"
-  | CM_Parameter_arity_mismatch _ ->
-      fprintf ppf
-        "The classes do not have the same number of type parameters"
-  | CM_Type_parameter_mismatch (env, trace) ->
-      Printtyp.report_unification_error ppf env ~unif:false trace
-        (function ppf ->
-          fprintf ppf "A type parameter has type")
-        (function ppf ->
-          fprintf ppf "but is expected to have type")
-  | CM_Class_type_mismatch (env, cty1, cty2) ->
-      Printtyp.wrap_printing_env env (fun () ->
-        fprintf ppf
-          "@[The class type@;<1 2>%a@ %s@;<1 2>%a@]"
-          Printtyp.class_type cty1
-          "is not matched by the class type"
-          Printtyp.class_type cty2)
-  | CM_Parameter_mismatch (env, trace) ->
-      Printtyp.report_unification_error ppf env ~unif:false trace
-        (function ppf ->
-          fprintf ppf "A parameter has type")
-        (function ppf ->
-          fprintf ppf "but is expected to have type")
-  | CM_Val_type_mismatch (lab, env, trace) ->
-      Printtyp.report_unification_error ppf env ~unif:false trace
-        (function ppf ->
-          fprintf ppf "The instance variable %s@ has type" lab)
-        (function ppf ->
-          fprintf ppf "but is expected to have type")
-  | CM_Meth_type_mismatch (lab, env, trace) ->
-      Printtyp.report_unification_error ppf env ~unif:false trace
-        (function ppf ->
-          fprintf ppf "The method %s@ has type" lab)
-        (function ppf ->
-          fprintf ppf "but is expected to have type")
-  | CM_Non_mutable_value lab ->
-      fprintf ppf
-       "@[The non-mutable instance variable %s cannot become mutable@]" lab
-  | CM_Non_concrete_value lab ->
-      fprintf ppf
-       "@[The virtual instance variable %s cannot become concrete@]" lab
-  | CM_Missing_value lab ->
-      fprintf ppf "@[The first class type has no instance variable %s@]" lab
-  | CM_Missing_method lab ->
-      fprintf ppf "@[The first class type has no field %s@]" lab
-  | CM_Hide_public lab ->
-     fprintf ppf "@[The public method %s cannot be hidden@]" lab
-  | CM_Hide_virtual (k, lab) ->
-      fprintf ppf "@[The virtual %s %s cannot be hidden@]" k lab
-  | CM_Public_method lab ->
-      fprintf ppf "@[The public method %s cannot become private" lab
-  | CM_Virtual_method lab ->
-      fprintf ppf "@[The virtual method %s cannot become concrete" lab
-  | CM_Private_method lab ->
-      fprintf ppf "The private method %s cannot become public" lab
-
-let report_error ppf = function
-  |  [] -> ()
-  | err :: errs ->
-      let print_errs ppf errs =
-         List.iter (fun err -> fprintf ppf "@ %a" include_err err) errs in
-      fprintf ppf "@[<v>%a%a@]" include_err err print_errs errs
diff --git a/jscomp/ml/includeclass.mli b/jscomp/ml/includeclass.mli
deleted file mode 100644
index ebfa978..0000000
--- a/jscomp/ml/includeclass.mli
+++ /dev/null
@@ -1,32 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*           Jerome Vouillon, projet Cristal, INRIA Rocquencourt          *)
-(*                                                                        *)
-(*   Copyright 1997 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Inclusion checks for the class language *)
-
-open Types
-open Ctype
-open Format
-
-val class_types:
-        Env.t -> class_type -> class_type -> class_match_failure list
-val class_type_declarations:
-  loc:Location.t ->
-  Env.t -> class_type_declaration -> class_type_declaration ->
-  class_match_failure list
-val class_declarations:
-  Env.t -> class_declaration -> class_declaration ->
-  class_match_failure list
-
-val report_error: formatter -> class_match_failure list -> unit
diff --git a/jscomp/ml/includecore.ml b/jscomp/ml/includecore.ml
deleted file mode 100644
index 9bc13b9..0000000
--- a/jscomp/ml/includecore.ml
+++ /dev/null
@@ -1,432 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Inclusion checks for the core language *)
-
-open Asttypes
-open Path
-open Types
-open Typedtree
-
-(* Inclusion between value descriptions *)
-
-exception Dont_match
-
-let value_descriptions ~loc env name
-    (vd1 : Types.value_description)
-    (vd2 : Types.value_description) =
-  Builtin_attributes.check_deprecated_inclusion
-    ~def:vd1.val_loc
-    ~use:vd2.val_loc
-    loc
-    vd1.val_attributes vd2.val_attributes
-    (Ident.name name);
-  if Ctype.moregeneral env true vd1.val_type vd2.val_type then begin
-    match (vd1.val_kind, vd2.val_kind) with
-        (Val_prim p1, Val_prim p2) ->
-          if !Primitive.coerce p1 p2 then Tcoerce_none else raise Dont_match
-      | (Val_prim p, _) ->
-          let pc = {pc_desc = p; pc_type = vd2.Types.val_type;
-                  pc_env = env; pc_loc = vd1.Types.val_loc;
-                      pc_id = name;
-                   } in
-          Tcoerce_primitive pc
-      | (_, Val_prim _) -> raise Dont_match
-      | (_, _) -> Tcoerce_none
-  end else
-    raise Dont_match
-
-(* Inclusion between "private" annotations *)
-
-let private_flags decl1 decl2 =
-  match decl1.type_private, decl2.type_private with
-  | Private, Public ->
-      decl2.type_kind = Type_abstract &&
-      (decl2.type_manifest = None || decl1.type_kind <> Type_abstract)
-  | _, _ -> true
-
-(* Inclusion between manifest types (particularly for private row types) *)
-
-let is_absrow env ty =
-  match ty.desc with
-    Tconstr(Pident _, _, _) ->
-      begin match Ctype.expand_head env ty with
-        {desc=Tobject _|Tvariant _} -> true
-      | _ -> false
-      end
-  | _ -> false
-
-let type_manifest env ty1 params1 ty2 params2 priv2 =
-  let ty1' = Ctype.expand_head env ty1 and ty2' = Ctype.expand_head env ty2 in
-  match ty1'.desc, ty2'.desc with
-    Tvariant row1, Tvariant row2 when is_absrow env (Btype.row_more row2) ->
-      let row1 = Btype.row_repr row1 and row2 = Btype.row_repr row2 in
-      Ctype.equal env true (ty1::params1) (row2.row_more::params2) &&
-      begin match row1.row_more with
-        {desc=Tvar _|Tconstr _|Tnil} -> true
-      | _ -> false
-      end &&
-      let r1, r2, pairs =
-        Ctype.merge_row_fields row1.row_fields row2.row_fields in
-      (not row2.row_closed ||
-       row1.row_closed && Ctype.filter_row_fields false r1 = []) &&
-      List.for_all
-        (fun (_,f) -> match Btype.row_field_repr f with
-          Rabsent | Reither _ -> true | Rpresent _ -> false)
-        r2 &&
-      let to_equal = ref (List.combine params1 params2) in
-      List.for_all
-        (fun (_, f1, f2) ->
-          match Btype.row_field_repr f1, Btype.row_field_repr f2 with
-            Rpresent(Some t1),
-            (Rpresent(Some t2) | Reither(false, [t2], _, _)) ->
-              to_equal := (t1,t2) :: !to_equal; true
-          | Rpresent None, (Rpresent None | Reither(true, [], _, _)) -> true
-          | Reither(c1,tl1,_,_), Reither(c2,tl2,_,_)
-            when List.length tl1 = List.length tl2 && c1 = c2 ->
-              to_equal := List.combine tl1 tl2 @ !to_equal; true
-          | Rabsent, (Reither _ | Rabsent) -> true
-          | _ -> false)
-        pairs &&
-      let tl1, tl2 = List.split !to_equal in
-      Ctype.equal env true tl1 tl2
-  | Tobject (fi1, _), Tobject (fi2, _)
-    when is_absrow env (snd(Ctype.flatten_fields fi2)) ->
-      let (fields2,rest2) = Ctype.flatten_fields fi2 in
-      Ctype.equal env true (ty1::params1) (rest2::params2) &&
-      let (fields1,rest1) = Ctype.flatten_fields fi1 in
-      (match rest1 with {desc=Tnil|Tvar _|Tconstr _} -> true | _ -> false) &&
-      let pairs, _miss1, miss2 = Ctype.associate_fields fields1 fields2 in
-      miss2 = [] &&
-      let tl1, tl2 =
-        List.split (List.map (fun (_,_,t1,_,t2) -> t1, t2) pairs) in
-      Ctype.equal env true (params1 @ tl1) (params2 @ tl2)
-  | _ ->
-      let rec check_super ty1 =
-        Ctype.equal env true (ty1 :: params1) (ty2 :: params2) ||
-        priv2 = Private &&
-        try check_super
-              (Ctype.try_expand_once_opt env (Ctype.expand_head env ty1))
-        with Ctype.Cannot_expand -> false
-      in check_super ty1
-
-(* Inclusion between type declarations *)
-
-type type_mismatch =
-    Arity
-  | Privacy
-  | Kind
-  | Constraint
-  | Manifest
-  | Variance
-  | Field_type of Ident.t
-  | Field_mutable of Ident.t
-  | Field_arity of Ident.t
-  | Field_names of int * string * string
-  | Field_missing of bool * Ident.t
-  | Record_representation of record_representation * record_representation
-  | Unboxed_representation of bool  (* true means second one is unboxed *)
-  | Immediate
-  | Tag_name
-  | Variant_representation of Ident.t
-
-let report_type_mismatch0 first second decl ppf err =
-  let pr fmt = Format.fprintf ppf fmt in
-  match err with
-    Arity -> pr "They have different arities"
-  | Privacy -> pr "A private type would be revealed"
-  | Kind -> pr "Their kinds differ"
-  | Constraint -> pr "Their constraints differ"
-  | Manifest -> ()
-  | Variance -> pr "Their variances do not agree"
-  | Field_type s ->
-      pr "The types for field %s are not equal" (Ident.name s)
-  | Field_mutable s ->
-      pr "The mutability of field %s is different" (Ident.name s)
-  | Field_arity s ->
-      pr "The arities for field %s differ" (Ident.name s)
-  | Field_names (n, name1, name2) ->
-      pr "Fields number %i have different names, %s and %s"
-        n name1 name2
-  | Field_missing (b, s) ->
-      pr "The field %s is only present in %s %s"
-        (Ident.name s) (if b then second else first) decl
-  | Record_representation (rep1, rep2) ->
-      let default () = pr "Their internal representations differ" in
-      ( match rep1, rep2 with
-        | Record_optional_labels lbls1, Record_optional_labels lbls2 ->
-          let onlyInLhs =
-            Ext_list.find_first lbls1 (fun l -> not (Ext_list.mem_string lbls2 l)) in
-          let onlyInRhs =
-            Ext_list.find_first lbls2 (fun l -> not (Ext_list.mem_string lbls1 l)) in
-          (match onlyInLhs, onlyInRhs with
-            | Some l, _ ->
-              pr "@optional label %s only in %s" l second
-            | _, Some l ->
-              pr "@optional label %s only in %s" l first
-            | None, None -> default ())
-        | _ ->
-          default ()
-      )
-  | Unboxed_representation b ->
-      pr "Their internal representations differ:@ %s %s %s"
-         (if b then second else first) decl
-         "uses unboxed representation"
-  | Immediate -> pr "%s is not an immediate type" first
-  | Tag_name -> pr "Their @tag annotations differ"
-  | Variant_representation s ->
-    pr "The internal representations for case %s are not equal" (Ident.name s)
-
-let report_type_mismatch first second decl ppf =
-  List.iter
-    (fun err ->
-      if err = Manifest then () else
-      Format.fprintf ppf "@ %a." (report_type_mismatch0 first second decl) err)
-
-let rec compare_constructor_arguments ~loc env cstr params1 params2 arg1 arg2 =
-  match arg1, arg2 with
-  | Types.Cstr_tuple arg1, Types.Cstr_tuple arg2 ->
-      if List.length arg1 <> List.length arg2 then [Field_arity cstr]
-      else if
-        (* Ctype.equal must be called on all arguments at once, cf. PR#7378 *)
-        Ctype.equal env true (params1 @ arg1) (params2 @ arg2)
-      then [] else [Field_type cstr]
-  | Types.Cstr_record l1, Types.Cstr_record l2 ->
-      compare_records env ~loc params1 params2 0 l1 l2
-  | _ -> [Field_type cstr]
-
-and compare_variants ~loc env params1 params2 n
-    (cstrs1 : Types.constructor_declaration list)
-    (cstrs2 : Types.constructor_declaration list) =
-  match cstrs1, cstrs2 with
-    [], []           -> []
-  | [], c::_ -> [Field_missing (true, c.Types.cd_id)]
-  | c::_, [] -> [Field_missing (false, c.Types.cd_id)]
-  | cd1::rem1, cd2::rem2 ->
-      if Ident.name cd1.cd_id <> Ident.name cd2.cd_id then
-        [Field_names (n, cd1.cd_id.name, cd2.cd_id.name)]
-      else begin
-        Builtin_attributes.check_deprecated_inclusion
-          ~def:cd1.cd_loc
-          ~use:cd2.cd_loc
-          loc
-          cd1.cd_attributes cd2.cd_attributes
-          (Ident.name cd1.cd_id);
-        let r =
-          match cd1.cd_res, cd2.cd_res with
-          | Some r1, Some r2 ->
-              if Ctype.equal env true [r1] [r2] then
-                compare_constructor_arguments ~loc env cd1.cd_id [r1] [r2]
-                  cd1.cd_args cd2.cd_args
-              else [Field_type cd1.cd_id]
-          | Some _, None | None, Some _ ->
-              [Field_type cd1.cd_id]
-          | _ ->
-              compare_constructor_arguments ~loc env cd1.cd_id
-                params1 params2 cd1.cd_args cd2.cd_args
-        in
-        let r =
-          if r <> [] then r
-          else match Ast_untagged_variants.is_nullary_variant cd1.cd_args with
-          | true ->
-            let tag_type1 = Ast_untagged_variants.process_tag_type cd1.cd_attributes in
-            let tag_type2 = Ast_untagged_variants.process_tag_type cd2.cd_attributes in
-            if tag_type1 <> tag_type2 then [Variant_representation cd1.cd_id]
-            else []
-          | false ->
-            r
-        in
-        if r <> [] then r
-        else compare_variants ~loc env params1 params2 (n+1) rem1 rem2
-      end
-
-and compare_records ~loc env params1_ params2_ n_
-    (labels1_ : Types.label_declaration list)
-    (labels2_ : Types.label_declaration list) =
-  (* First try a fast path that checks if all the fields at once are consistent.
-     When that fails, try a slow path that blames the first inconsistent field *)
-  let rec aux ~fast params1 params2 n labels1 labels2 =
-    match labels1, labels2 with
-      [], [] ->
-        if fast then
-          if Ctype.equal env true params1 params2 then
-            []
-          else
-            aux ~fast:false params1_ params2_ n_ labels1_ labels2_
-        else
-          []
-    | [], l::_ -> [Field_missing (true, l.Types.ld_id)]
-    | l::_, [] -> [Field_missing (false, l.Types.ld_id)]
-    | ld1::rem1, ld2::rem2 ->
-        if Ident.name ld1.ld_id <> Ident.name ld2.ld_id
-        then [Field_names (n, ld1.ld_id.name, ld2.ld_id.name)]
-        else if ld1.ld_mutable <> ld2.ld_mutable then [Field_mutable ld1.ld_id] else begin
-          Builtin_attributes.check_deprecated_mutable_inclusion
-            ~def:ld1.ld_loc
-            ~use:ld2.ld_loc
-            loc
-            ld1.ld_attributes ld2.ld_attributes
-            (Ident.name ld1.ld_id);
-          let field_mismatch = !Builtin_attributes.check_bs_attributes_inclusion  
-            ld1.ld_attributes ld2.ld_attributes
-            (Ident.name ld1.ld_id) in 
-          match field_mismatch with
-          | Some (a,b) -> [Field_names (n,a,b)]
-          | None ->
-          let current_field_consistent =
-            if fast then true
-            else Ctype.equal env true (ld1.ld_type::params1)(ld2.ld_type::params2) in
-          if current_field_consistent
-          then (* add arguments to the parameters, cf. PR#7378 *)
-            aux ~fast
-              (ld1.ld_type::params1) (ld2.ld_type::params2)
-              (n+1)
-              rem1 rem2
-          else
-            [Field_type ld1.ld_id]
-      end in
-  aux ~fast:true params1_ params2_ n_ labels1_ labels2_
-
-
-let type_declarations ?(equality = false) ~loc env name decl1 id decl2 =
-  Builtin_attributes.check_deprecated_inclusion
-    ~def:decl1.type_loc
-    ~use:decl2.type_loc
-    loc
-    decl1.type_attributes decl2.type_attributes
-    name;
-  if decl1.type_arity <> decl2.type_arity then [Arity] else
-  if not (private_flags decl1 decl2) then [Privacy] else
-  let err = match (decl1.type_manifest, decl2.type_manifest) with
-      (_, None) ->
-        if Ctype.equal env true decl1.type_params decl2.type_params
-        then [] else [Constraint]
-    | (Some ty1, Some ty2) ->
-        if type_manifest env ty1 decl1.type_params ty2 decl2.type_params
-            decl2.type_private
-        then [] else [Manifest]
-    | (None, Some ty2) ->
-        let ty1 =
-          Btype.newgenty (Tconstr(Pident id, decl2.type_params, ref Mnil))
-        in
-        if Ctype.equal env true decl1.type_params decl2.type_params then
-          if Ctype.equal env false [ty1] [ty2] then []
-          else [Manifest]
-        else [Constraint]
-  in
-  if err <> [] then err else
-  let err =
-    let untagged1 = Ast_untagged_variants.process_untagged decl1.type_attributes in
-    let untagged2 = Ast_untagged_variants.process_untagged decl2.type_attributes in  
-    match (decl2.type_kind, decl1.type_unboxed.unboxed || untagged1,
-           decl2.type_unboxed.unboxed || untagged2) with
-    | Type_abstract, _, _ -> []
-    | _, true, false -> [Unboxed_representation false]
-    | _, false, true -> [Unboxed_representation true]
-    | _ -> []
-  in
-  if err <> [] then err else
-  let err =
-    let tag1 = Ast_untagged_variants.process_tag_name decl1.type_attributes in
-    let tag2 = Ast_untagged_variants.process_tag_name decl2.type_attributes in
-    if tag1 <> tag2 then [Tag_name] else err in
-  if err <> [] then err else
-  let err = match (decl1.type_kind, decl2.type_kind) with
-      (_, Type_abstract) -> []
-    | (Type_variant cstrs1, Type_variant cstrs2) ->
-        let mark cstrs usage name decl =
-          List.iter
-            (fun c ->
-              Env.mark_constructor_used usage env name decl
-                                        (Ident.name c.Types.cd_id))
-            cstrs
-        in
-        let usage =
-          if decl1.type_private = Private || decl2.type_private = Public
-          then Env.Positive else Env.Privatize
-        in
-        mark cstrs1 usage name decl1;
-        if equality then mark cstrs2 Env.Positive (Ident.name id) decl2;
-        compare_variants ~loc env decl1.type_params decl2.type_params 1 cstrs1 cstrs2
-    | (Type_record(labels1,rep1), Type_record(labels2,rep2)) ->
-        let err = compare_records ~loc env decl1.type_params decl2.type_params 1 labels1 labels2 in
-        if err <> [] || rep1 = rep2 then err else
-        [Record_representation (rep1, rep2)]
-    | (Type_open, Type_open) -> []
-    | (_, _) -> [Kind]
-  in
-  if err <> [] then err else
-  let abstr = decl2.type_kind = Type_abstract && decl2.type_manifest = None in
-  (* If attempt to assign a non-immediate type (e.g. string) to a type that
-   * must be immediate, then we error *)
-  let err =
-    if abstr &&
-       not decl1.type_immediate &&
-       decl2.type_immediate then
-      [Immediate]
-    else []
-  in
-  if err <> [] then err else
-  let need_variance =
-    abstr || decl1.type_private = Private || decl1.type_kind = Type_open in
-  if not need_variance then [] else
-  let abstr = abstr || decl2.type_private = Private in
-  let opn = decl2.type_kind = Type_open && decl2.type_manifest = None in
-  let constrained ty = not (Btype.(is_Tvar (repr ty))) in
-  if List.for_all2
-      (fun ty (v1,v2) ->
-        let open Variance in
-        let imp a b = not a || b in
-        let (co1,cn1) = get_upper v1 and (co2,cn2) = get_upper v2 in
-        (if abstr then (imp co1 co2 && imp cn1 cn2)
-         else if opn || constrained ty then (co1 = co2 && cn1 = cn2)
-         else true) &&
-        let (p1,n1,i1,j1) = get_lower v1 and (p2,n2,i2,j2) = get_lower v2 in
-        imp abstr (imp p2 p1 && imp n2 n1 && imp i2 i1 && imp j2 j1))
-      decl2.type_params (List.combine decl1.type_variance decl2.type_variance)
-  then [] else [Variance]
-
-(* Inclusion between extension constructors *)
-
-let extension_constructors ~loc env id ext1 ext2 =
-  let usage =
-    if ext1.ext_private = Private || ext2.ext_private = Public
-    then Env.Positive else Env.Privatize
-  in
-  Env.mark_extension_used usage env ext1 (Ident.name id);
-  let ty1 =
-    Btype.newgenty (Tconstr(ext1.ext_type_path, ext1.ext_type_params, ref Mnil))
-  in
-  let ty2 =
-    Btype.newgenty (Tconstr(ext2.ext_type_path, ext2.ext_type_params, ref Mnil))
-  in
-  if Ctype.equal env true
-       (ty1 :: ext1.ext_type_params)
-       (ty2 :: ext2.ext_type_params)
-  then
-    if compare_constructor_arguments ~loc env (Ident.create "")
-        ext1.ext_type_params ext2.ext_type_params
-        ext1.ext_args ext2.ext_args = [] then
-      if match ext1.ext_ret_type, ext2.ext_ret_type with
-          Some r1, Some r2 when not (Ctype.equal env true [r1] [r2]) -> false
-        | Some _, None | None, Some _ -> false
-        | _ -> true
-      then
-        match ext1.ext_private, ext2.ext_private with
-            Private, Public -> false
-          | _, _ -> true
-      else false
-    else false
-  else false
diff --git a/jscomp/ml/includemod.ml b/jscomp/ml/includemod.ml
deleted file mode 100644
index 1f73880..0000000
--- a/jscomp/ml/includemod.ml
+++ /dev/null
@@ -1,694 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Inclusion checks for the module language *)
-
-open Misc
-open Path
-open Typedtree
-open Types
-
-type symptom =
-    Missing_field of Ident.t * Location.t * string (* kind *)
-  | Value_descriptions of Ident.t * value_description * value_description
-  | Type_declarations of Ident.t * type_declaration
-        * type_declaration * Includecore.type_mismatch list
-  | Extension_constructors of
-      Ident.t * extension_constructor * extension_constructor
-  | Module_types of module_type * module_type
-  | Modtype_infos of Ident.t * modtype_declaration * modtype_declaration
-  | Modtype_permutation
-  | Interface_mismatch of string * string
-  | Class_type_declarations of
-      Ident.t * class_type_declaration * class_type_declaration *
-      Ctype.class_match_failure list
-  | Unbound_modtype_path of Path.t
-  | Unbound_module_path of Path.t
-  | Invalid_module_alias of Path.t
-
-type pos =
-    Module of Ident.t | Modtype of Ident.t | Arg of Ident.t | Body of Ident.t
-type error = pos list * Env.t * symptom
-
-exception Error of error list
-
-(* All functions "blah env x1 x2" check that x1 is included in x2,
-   i.e. that x1 is the type of an implementation that fulfills the
-   specification x2. If not, Error is raised with a backtrace of the error. *)
-
-(* Inclusion between value descriptions *)
-
-let value_descriptions ~loc env cxt subst id vd1 vd2 =
-  Cmt_format.record_value_dependency vd1 vd2;
-  Env.mark_value_used env (Ident.name id) vd1;
-  let vd2 = Subst.value_description subst vd2 in
-  try
-    Includecore.value_descriptions ~loc env id vd1 vd2
-  with Includecore.Dont_match ->
-    raise(Error[cxt, env, Value_descriptions(id, vd1, vd2)])
-
-(* Inclusion between type declarations *)
-
-let type_declarations ~loc env ?(old_env=env) cxt subst id decl1 decl2 =
-  Env.mark_type_used env (Ident.name id) decl1;
-  let decl2 = Subst.type_declaration subst decl2 in
-  let err =
-    Includecore.type_declarations ~loc env (Ident.name id) decl1 id decl2
-  in
-  if err <> [] then
-    raise(Error[cxt, old_env, Type_declarations(id, decl1, decl2, err)])
-
-(* Inclusion between extension constructors *)
-
-let extension_constructors ~loc env cxt subst id ext1 ext2 =
-  let ext2 = Subst.extension_constructor subst ext2 in
-  if Includecore.extension_constructors ~loc env id ext1 ext2
-  then ()
-  else raise(Error[cxt, env, Extension_constructors(id, ext1, ext2)])
-
-(* Inclusion between class declarations *)
-
-let class_type_declarations ~loc ~old_env env cxt subst id decl1 decl2 =
-  let decl2 = Subst.cltype_declaration subst decl2 in
-  match Includeclass.class_type_declarations ~loc env decl1 decl2 with
-    []     -> ()
-  | reason ->
-      raise(Error[cxt, old_env,
-                  Class_type_declarations(id, decl1, decl2, reason)])
-
-
-(* Expand a module type identifier when possible *)
-
-exception Dont_match
-
-let may_expand_module_path env path =
-  try ignore (Env.find_modtype_expansion path env); true
-  with Not_found -> false
-
-let expand_module_path env cxt path =
-  try
-    Env.find_modtype_expansion path env
-  with Not_found ->
-    raise(Error[cxt, env, Unbound_modtype_path path])
-
-let expand_module_alias env cxt path =
-  try (Env.find_module path env).md_type
-  with Not_found ->
-    raise(Error[cxt, env, Unbound_module_path path])
-
-(*
-let rec normalize_module_path env cxt path =
-  match expand_module_alias env cxt path with
-    Mty_alias path' -> normalize_module_path env cxt path'
-  | _ -> path
-*)
-
-(* Extract name, kind and ident from a signature item *)
-
-type field_desc =
-    Field_value of string
-  | Field_type of string
-  | Field_typext of string
-  | Field_module of string
-  | Field_modtype of string
-  | Field_classtype of string
-
-let kind_of_field_desc = function
-  | Field_value _ -> "value"
-  | Field_type _ -> "type"
-  | Field_typext _ -> "extension constructor"
-  | Field_module _ -> "module"
-  | Field_modtype _ -> "module type"
-  | Field_classtype _ -> "class type"
-
-let item_ident_name = function
-    Sig_value(id, d) -> (id, d.val_loc, Field_value(Ident.name id))
-  | Sig_type(id, d, _) -> (id, d.type_loc, Field_type(Ident.name id))
-  | Sig_typext(id, d, _) -> (id, d.ext_loc, Field_typext(Ident.name id))
-  | Sig_module(id, d, _) -> (id, d.md_loc, Field_module(Ident.name id))
-  | Sig_modtype(id, d) -> (id, d.mtd_loc, Field_modtype(Ident.name id))
-  | Sig_class () -> assert false
-  | Sig_class_type(id, d, _) -> (id, d.clty_loc, Field_classtype(Ident.name id))
-
-let is_runtime_component = function
-  | Sig_value(_,{val_kind = Val_prim _})
-  | Sig_type(_,_,_)
-  | Sig_modtype(_,_)
-  | Sig_class_type(_,_,_) -> false
-  | Sig_value(_,_)
-  | Sig_typext(_,_,_)
-  | Sig_module(_,_,_)
-  | Sig_class() -> true
-
-(* Print a coercion *)
-
-let rec print_list pr ppf = function
-    [] -> ()
-  | [a] -> pr ppf a
-  | a :: l -> pr ppf a; Format.fprintf ppf ";@ "; print_list pr ppf l
-let print_list pr ppf l =
-  Format.fprintf ppf "[@[%a@]]" (print_list pr) l
-
-let rec print_coercion ppf c =
-  let pr fmt = Format.fprintf ppf fmt in
-  match c with
-    Tcoerce_none -> pr "id"
-  | Tcoerce_structure (fl, nl, _) ->
-      pr "@[<2>struct@ %a@ %a@]"
-        (print_list print_coercion2) fl
-        (print_list print_coercion3) nl
-  | Tcoerce_functor (inp, out) ->
-      pr "@[<2>functor@ (%a)@ (%a)@]"
-        print_coercion inp
-        print_coercion out
-  | Tcoerce_primitive {pc_desc; pc_env = _; pc_type}  ->
-      pr "prim %s@ (%a)" pc_desc.Primitive.prim_name
-        Printtyp.raw_type_expr pc_type
-  | Tcoerce_alias (p, c) ->
-      pr "@[<2>alias %a@ (%a)@]"
-        Printtyp.path p
-        print_coercion c
-and print_coercion2 ppf (n, c) =
-  Format.fprintf ppf "@[%d,@ %a@]" n print_coercion c
-and print_coercion3 ppf (i, n, c) =
-  Format.fprintf ppf "@[%s, %d,@ %a@]"
-    (Ident.unique_name i) n print_coercion c
-
-(* Simplify a structure coercion *)
-
-let simplify_structure_coercion cc id_pos_list runtime_fields =
-  let rec is_identity_coercion pos = function
-  | [] ->
-      true
-  | (n, c) :: rem ->
-      n = pos && c = Tcoerce_none && is_identity_coercion (pos + 1) rem in
-  if is_identity_coercion 0 cc
-  then Tcoerce_none
-  else Tcoerce_structure (cc, id_pos_list, runtime_fields)
-
-(* Inclusion between module types.
-   Return the restriction that transforms a value of the smaller type
-   into a value of the bigger type. *)
-
-let rec modtypes ~loc env cxt subst mty1 mty2 =
-  try
-    try_modtypes ~loc env cxt subst mty1 mty2
-  with
-    Dont_match ->
-      raise(Error[cxt, env, Module_types(mty1, Subst.modtype subst mty2)])
-  | Error reasons as err ->
-      match mty1, mty2 with
-        Mty_alias _, _
-      | _, Mty_alias _ -> raise err
-      | _ ->
-          raise(Error((cxt, env, Module_types(mty1, Subst.modtype subst mty2))
-                      :: reasons))
-
-and try_modtypes ~loc env cxt subst mty1 mty2 =
-  match (mty1, mty2) with
-  | (Mty_alias(pres1, p1), Mty_alias(pres2, p2)) -> begin
-      if Env.is_functor_arg p2 env then
-        raise (Error[cxt, env, Invalid_module_alias p2]);
-      if not (Path.same p1 p2) then begin
-        let p1 = Env.normalize_path None env p1
-        and p2 = Env.normalize_path None env (Subst.module_path subst p2) in
-        if not (Path.same p1 p2) then raise Dont_match
-      end;
-      match pres1, pres2 with
-      | Mta_present, Mta_present -> Tcoerce_none
-        (* Should really be Tcoerce_ignore if it existed *)
-      | Mta_absent, Mta_absent -> Tcoerce_none
-        (* Should really be Tcoerce_empty if it existed *)
-      | Mta_present, Mta_absent -> Tcoerce_none
-      | Mta_absent, Mta_present ->
-        let p1 = try
-            Env.normalize_path (Some Location.none) env p1
-          with Env.Error (Env.Missing_module (_, _, path)) ->
-            raise (Error[cxt, env, Unbound_module_path path])
-        in
-        Tcoerce_alias (p1, Tcoerce_none)
-    end
-  | (Mty_alias(pres1, p1), _) -> begin
-      let p1 = try
-        Env.normalize_path (Some Location.none) env p1
-      with Env.Error (Env.Missing_module (_, _, path)) ->
-        raise (Error[cxt, env, Unbound_module_path path])
-      in
-      let mty1 =
-        Mtype.strengthen ~aliasable:true env
-          (expand_module_alias env cxt p1) p1
-      in
-      let cc = modtypes ~loc env cxt subst mty1 mty2 in
-      match pres1 with
-      | Mta_present -> cc
-      | Mta_absent -> Tcoerce_alias (p1, cc)
-    end
-  | (Mty_ident p1, _) when may_expand_module_path env p1 ->
-      try_modtypes ~loc env cxt subst (expand_module_path env cxt p1) mty2
-  | (_, Mty_ident _) ->
-      try_modtypes2 ~loc env cxt mty1 (Subst.modtype subst mty2)
-  | (Mty_signature sig1, Mty_signature sig2) ->
-      signatures ~loc env cxt subst sig1 sig2
-  | (Mty_functor(param1, None, res1), Mty_functor(_param2, None, res2)) ->
-      begin match modtypes ~loc env (Body param1::cxt) subst res1 res2 with
-        Tcoerce_none -> Tcoerce_none
-      | cc -> Tcoerce_functor (Tcoerce_none, cc)
-      end
-  | (Mty_functor(param1, Some arg1, res1),
-     Mty_functor(param2, Some arg2, res2)) ->
-      let arg2' = Subst.modtype subst arg2 in
-      let cc_arg = modtypes ~loc env (Arg param1::cxt) Subst.identity arg2' arg1 in
-      let cc_res =
-        modtypes ~loc (Env.add_module param1 arg2' env) (Body param1::cxt)
-          (Subst.add_module param2 (Pident param1) subst) res1 res2 in
-      begin match (cc_arg, cc_res) with
-          (Tcoerce_none, Tcoerce_none) -> Tcoerce_none
-        | _ -> Tcoerce_functor(cc_arg, cc_res)
-      end
-  | (_, _) ->
-      raise Dont_match
-
-and try_modtypes2 ~loc env cxt mty1 mty2 =
-  (* mty2 is an identifier *)
-  match (mty1, mty2) with
-    (Mty_ident p1, Mty_ident p2)
-    when Path.same (Env.normalize_path_prefix None env p1)
-                   (Env.normalize_path_prefix None env p2) ->
-      Tcoerce_none
-  | (_, Mty_ident p2) when may_expand_module_path env p2 ->
-      try_modtypes ~loc env cxt Subst.identity mty1 (expand_module_path env cxt p2)
-  | (_, _) ->
-      raise Dont_match
-
-(* Inclusion between signatures *)
-
-and signatures ~loc env cxt subst sig1 sig2 =
-  (* Environment used to check inclusion of components *)
-  let new_env =
-    Env.add_signature sig1 (Env.in_signature true env) in
-  (* Keep ids for module aliases *)
-  let (id_pos_list,_) =
-    List.fold_left
-      (fun ((l,pos) as id_pos) -> function
-          Sig_module (id, _, _) ->
-            ((id,pos,Tcoerce_none)::l , pos+1)
-        | item -> 
-          if is_runtime_component item then (l,pos+1 ) else id_pos
-      )
-      ([], 0) sig1 in
-
-  let runtime_fields =
-    let get_id = function
-      | Sig_value (i,_)
-      | Sig_module (i,_,_)
-      | Sig_typext (i,_,_)
-      | Sig_modtype(i,_)
-      | Sig_class_type(i,_,_)
-      | Sig_type(i,_,_) -> Ident.name i 
-      | Sig_class () -> assert false in
-     List.fold_right (fun item fields ->
-        if is_runtime_component item then get_id item :: fields else fields) sig2 [] in
-
-  (* Build a table of the components of sig1, along with their positions.
-     The table is indexed by kind and name of component *)
-  let rec build_component_table pos tbl = function
-      [] -> pos, tbl
-    | item :: rem ->
-        let (id, _loc, name) = item_ident_name item in
-        let nextpos = if is_runtime_component item then pos + 1 else pos in
-        build_component_table nextpos
-                              (Tbl.add name (id, item, pos) tbl) rem in
-  let len1, comps1 =
-    build_component_table 0 Tbl.empty sig1 in
-  let len2 =
-    List.fold_left
-      (fun n i -> if is_runtime_component i then n + 1 else n)
-      0
-      sig2
-  in
-  (* Pair each component of sig2 with a component of sig1,
-     identifying the names along the way.
-     Return a coercion list indicating, for all run-time components
-     of sig2, the position of the matching run-time components of sig1
-     and the coercion to be applied to it. *)
-  let rec pair_components subst paired unpaired = function
-      [] ->
-        begin match unpaired with
-            [] ->
-              let cc =
-                signature_components ~loc env new_env cxt subst
-                  (List.rev paired)
-              in
-              if len1 = len2 then (* see PR#5098 *)
-                simplify_structure_coercion cc id_pos_list runtime_fields
-              else
-                Tcoerce_structure (cc, id_pos_list, runtime_fields)
-          | _  -> raise(Error unpaired)
-        end
-    | item2 :: rem ->
-        let (id2, loc, name2) = item_ident_name item2 in
-        let name2, report =
-          match item2, name2 with
-            Sig_type (_, {type_manifest=None}, _), Field_type s
-            when Btype.is_row_name s ->
-              (* Do not report in case of failure,
-                 as the main type will generate an error *)
-              Field_type (String.sub s 0 (String.length s - 4)), false
-          | _ -> name2, true
-        in
-        begin match Tbl.find name2 comps1 with 
-          | (id1, item1, pos1) ->
-          let new_subst =
-            match item2 with
-              Sig_type _ ->
-                Subst.add_type id2 (Pident id1) subst
-            | Sig_module _ ->
-                Subst.add_module id2 (Pident id1) subst
-            | Sig_modtype _ ->
-                Subst.add_modtype id2 (Mty_ident (Pident id1)) subst
-            | Sig_value _ | Sig_typext _
-            | Sig_class _ | Sig_class_type _ ->
-                subst
-          in
-          pair_components new_subst
-            ((item1, item2, pos1) :: paired) unpaired rem
-        | exception Not_found ->
-          let unpaired =
-            if report then
-              (cxt, env, Missing_field (id2, loc, kind_of_field_desc name2)) ::
-              unpaired
-            else unpaired in
-          pair_components subst paired unpaired rem
-        end in
-  (* Do the pairing and checking, and return the final coercion *)
-  pair_components subst [] [] sig2
-
-(* Inclusion between signature components *)
-
-and signature_components ~loc old_env env cxt subst paired =
-  let comps_rec rem = signature_components ~loc old_env env cxt subst rem in
-  match paired with
-    [] -> []
-  | (Sig_value(id1, valdecl1), Sig_value(_id2, valdecl2), pos) :: rem ->
-      let cc = value_descriptions ~loc env cxt subst id1 valdecl1 valdecl2 in
-      begin match valdecl2.val_kind with
-        Val_prim _ -> comps_rec rem
-      | _ -> (pos, cc) :: comps_rec rem
-      end
-  | (Sig_type(id1, tydecl1, _), Sig_type(_id2, tydecl2, _), _pos) :: rem ->
-      type_declarations ~loc ~old_env env cxt subst id1 tydecl1 tydecl2;
-      comps_rec rem
-  | (Sig_typext(id1, ext1, _), Sig_typext(_id2, ext2, _), pos)
-    :: rem ->
-      extension_constructors ~loc env cxt subst id1 ext1 ext2;
-      (pos, Tcoerce_none) :: comps_rec rem
-  | (Sig_module(id1, mty1, _), Sig_module(_id2, mty2, _), pos) :: rem ->
-      let cc = module_declarations ~loc env cxt subst id1 mty1 mty2 in
-      (pos, cc) :: comps_rec rem
-  | (Sig_modtype(id1, info1), Sig_modtype(_id2, info2), _pos) :: rem ->
-      modtype_infos ~loc env cxt subst id1 info1 info2;
-      comps_rec rem
-  | (Sig_class _, Sig_class _ , _) :: _ -> assert false
-  | (Sig_class_type(id1, info1, _),
-     Sig_class_type(_id2, info2, _), _pos) :: rem ->
-      class_type_declarations ~loc ~old_env env cxt subst id1 info1 info2;
-      comps_rec rem
-  | _ ->
-      assert false
-
-and module_declarations ~loc env cxt subst id1 md1 md2 =
-  Builtin_attributes.check_deprecated_inclusion
-    ~def:md1.md_loc
-    ~use:md2.md_loc
-    loc
-    md1.md_attributes md2.md_attributes
-    (Ident.name id1);
-  let p1 = Pident id1 in
-  Env.mark_module_used env (Ident.name id1) md1.md_loc;
-  modtypes ~loc env (Module id1::cxt) subst
-    (Mtype.strengthen ~aliasable:true env md1.md_type p1) md2.md_type
-
-(* Inclusion between module type specifications *)
-
-and modtype_infos ~loc env cxt subst id info1 info2 =
-  Builtin_attributes.check_deprecated_inclusion
-    ~def:info1.mtd_loc
-    ~use:info2.mtd_loc
-    loc
-    info1.mtd_attributes info2.mtd_attributes
-    (Ident.name id);
-  let info2 = Subst.modtype_declaration subst info2 in
-  let cxt' = Modtype id :: cxt in
-  try
-    match (info1.mtd_type, info2.mtd_type) with
-      (None, None) -> ()
-    | (Some _, None) -> ()
-    | (Some mty1, Some mty2) ->
-        check_modtype_equiv ~loc env cxt' mty1 mty2
-    | (None, Some mty2) ->
-        check_modtype_equiv ~loc env cxt' (Mty_ident(Pident id)) mty2
-  with Error reasons ->
-    raise(Error((cxt, env, Modtype_infos(id, info1, info2)) :: reasons))
-
-and check_modtype_equiv ~loc env cxt mty1 mty2 =
-  match
-    (modtypes ~loc env cxt Subst.identity mty1 mty2,
-     modtypes ~loc env cxt Subst.identity mty2 mty1)
-  with
-    (Tcoerce_none, Tcoerce_none) -> ()
-  | (_c1, _c2) ->
-      (* Format.eprintf "@[c1 = %a@ c2 = %a@]@."
-        print_coercion _c1 print_coercion _c2; *)
-      raise(Error [cxt, env, Modtype_permutation])
-
-(* Simplified inclusion check between module types (for Env) *)
-
-let can_alias env path =
-  let rec no_apply = function
-    | Pident _ -> true
-    | Pdot(p, _, _) -> no_apply p
-    | Papply _ -> false
-  in
-  no_apply path && not (Env.is_functor_arg path env)
-
-let check_modtype_inclusion ~loc env mty1 path1 mty2 =
-  try
-    let aliasable = can_alias env path1 in
-    ignore(modtypes ~loc env [] Subst.identity
-                    (Mtype.strengthen ~aliasable env mty1 path1) mty2)
-  with Error _ ->
-    raise Not_found
-
-let _ = Env.check_modtype_inclusion := check_modtype_inclusion
-
-(* Check that an implementation of a compilation unit meets its
-   interface. *)
-
-let compunit env impl_name impl_sig intf_name intf_sig =
-  try
-    signatures ~loc:(Location.in_file impl_name) env [] Subst.identity
-      impl_sig intf_sig
-  with Error reasons ->
-    raise(Error(([], Env.empty,Interface_mismatch(impl_name, intf_name))
-                :: reasons))
-
-(* Hide the context and substitution parameters to the outside world *)
-
-let modtypes ~loc env mty1 mty2 = modtypes ~loc env [] Subst.identity mty1 mty2
-let signatures env sig1 sig2 =
-  signatures ~loc:Location.none env [] Subst.identity sig1 sig2
-let type_declarations ~loc env id decl1 decl2 =
-  type_declarations ~loc env [] Subst.identity id decl1 decl2
-
-(*
-let modtypes env m1 m2 =
-  let c = modtypes env m1 m2 in
-  Format.eprintf "@[<2>modtypes@ %a@ %a =@ %a@]@."
-    Printtyp.modtype m1 Printtyp.modtype m2
-    print_coercion c;
-  c
-*)
-
-(* Error report *)
-
-open Format
-open Printtyp
-
-let show_loc msg ppf loc =
-  fprintf ppf "@\n@[<2>%a:@ %s@]" Location.print_loc loc msg
-
-let show_locs ppf (loc1, loc2) =
-  show_loc "Expected declaration" ppf loc2;
-  show_loc "Actual declaration" ppf loc1
-
-let include_err ~env ppf = function
-  | Missing_field (id, loc, kind) ->
-      fprintf ppf "The %s `%a' is required but not provided" kind ident id;
-      show_loc "Expected declaration" ppf loc
-  | Value_descriptions(id, d1, d2) ->
-      let curry_kind_1, curry_kind_2 = 
-        match (Ctype.expand_head env d1.val_type,  Ctype.expand_head env d2.val_type ) with 
-        | { desc = Tarrow _ }, 
-            { desc = Tconstr (Pident {name = "function$"},_,_)} -> (" (curried)", " (uncurried)")
-        | { desc = Tconstr (Pident {name = "function$"},_,_)}, 
-            { desc = Tarrow _ } -> (" (uncurried)", " (curried)")
-        | _ -> ("", "")
-      in
-      fprintf ppf
-        "@[<hv 2>Values do not match:@ %a%s@;<1 -2>is not included in@ %a%s@]"
-        (value_description id) d1 curry_kind_1 (value_description id) d2 curry_kind_2;
-      show_locs ppf (d1.val_loc, d2.val_loc);
-  | Type_declarations(id, d1, d2, errs) ->
-      fprintf ppf "@[<v>@[<hv>%s:@;<1 2>%a@ %s@;<1 2>%a@]%a%a@]"
-        "Type declarations do not match"
-        (type_declaration id) d1
-        "is not included in"
-        (type_declaration id) d2
-        show_locs (d1.type_loc, d2.type_loc)
-        (Includecore.report_type_mismatch
-           "the first" "the second" "declaration") errs
-  | Extension_constructors(id, x1, x2) ->
-      fprintf ppf
-       "@[<hv 2>Extension declarations do not match:@ \
-        %a@;<1 -2>is not included in@ %a@]"
-      (extension_constructor id) x1
-      (extension_constructor id) x2;
-      show_locs ppf (x1.ext_loc, x2.ext_loc)
-  | Module_types(mty1, mty2)->
-      fprintf ppf
-       "@[<hv 2>Modules do not match:@ \
-        %a@;<1 -2>is not included in@ %a@]"
-      modtype mty1
-      modtype mty2
-  | Modtype_infos(id, d1, d2) ->
-      fprintf ppf
-       "@[<hv 2>Module type declarations do not match:@ \
-        %a@;<1 -2>does not match@ %a@]"
-      (modtype_declaration id) d1
-      (modtype_declaration id) d2
-  | Modtype_permutation ->
-      fprintf ppf "Illegal permutation of structure fields"
-  | Interface_mismatch(impl_name, intf_name) ->
-      fprintf ppf "@[The implementation %s@ does not match the interface %s:"
-       impl_name intf_name
-  | Class_type_declarations(id, d1, d2, reason) ->
-      fprintf ppf
-       "@[<hv 2>Class type declarations do not match:@ \
-        %a@;<1 -2>does not match@ %a@]@ %a"
-      (Printtyp.cltype_declaration id) d1
-      (Printtyp.cltype_declaration id) d2
-      Includeclass.report_error reason
-  | Unbound_modtype_path path ->
-      fprintf ppf "Unbound module type %a" Printtyp.path path
-  | Unbound_module_path path ->
-      fprintf ppf "Unbound module %a" Printtyp.path path
-  | Invalid_module_alias path ->
-      fprintf ppf "Module %a cannot be aliased" Printtyp.path path
-
-let rec context ppf = function
-    Module id :: rem ->
-      fprintf ppf "@[<2>module %a%a@]" ident id args rem
-  | Modtype id :: rem ->
-      fprintf ppf "@[<2>module type %a =@ %a@]" ident id context_mty rem
-  | Body x :: rem ->
-      fprintf ppf "functor (%s) ->@ %a" (argname x) context_mty rem
-  | Arg x :: rem ->
-      fprintf ppf "functor (%a : %a) -> ..." ident x context_mty rem
-  | [] ->
-      fprintf ppf "<here>"
-and context_mty ppf = function
-    (Module _ | Modtype _) :: _ as rem ->
-      fprintf ppf "@[<2>sig@ %a@;<1 -2>end@]" context rem
-  | cxt -> context ppf cxt
-and args ppf = function
-    Body x :: rem ->
-      fprintf ppf "(%s)%a" (argname x) args rem
-  | Arg x :: rem ->
-      fprintf ppf "(%a :@ %a) : ..." ident x context_mty rem
-  | cxt ->
-      fprintf ppf " :@ %a" context_mty cxt
-and argname x =
-  let s = Ident.name x in
-  if s = "*" then "" else s
-
-let path_of_context = function
-    Module id :: rem ->
-      let rec subm path = function
-          [] -> path
-        | Module id :: rem -> subm (Pdot (path, Ident.name id, -1)) rem
-        | _ -> assert false
-      in subm (Pident id) rem
-  | _ -> assert false
-
-let context ppf cxt =
-  if cxt = [] then () else
-  if List.for_all (function Module _ -> true | _ -> false) cxt then
-    fprintf ppf "In module %a:@ " path (path_of_context cxt)
-  else
-    fprintf ppf "@[<hv 2>At position@ %a@]@ " context cxt
-
-let include_err ppf (cxt, env, err) =
-  Printtyp.wrap_printing_env env (fun () ->
-    fprintf ppf "@[<v>%a%a@]" context (List.rev cxt) (include_err ~env) err)
-
-let buffer = ref Bytes.empty
-let is_big obj =
-  let size = !Clflags.error_size in
-  size > 0 &&
-  begin
-    if Bytes.length !buffer < size then buffer := Bytes.create size;
-    try ignore (Marshal.to_buffer !buffer 0 size obj []); false
-    with _ -> true
-  end
-
-let report_error ppf errs =
-  if errs = [] then () else
-  let (errs , err) = split_last errs in
-  let pe = ref true in
-  let include_err' ppf (_,_,obj as err) =
-    if not (is_big obj) then fprintf ppf "%a@ " include_err err
-    else if !pe then (fprintf ppf "...@ "; pe := false)
-  in
-  let print_errs ppf = List.iter (include_err' ppf) in
-  fprintf ppf "@[<v>%a%a@]" print_errs errs include_err err
-
-
-let better_candidate_loc (x : error list) = 
-    match x with 
-    | [ (_,_,Interface_mismatch _); (_,_,descr)]
-      ->
-        begin match descr with 
-        | Value_descriptions (_,d1,_) -> Some d1.val_loc
-        | Type_declarations (_,tdcl1,_,_) ->
-          Some tdcl1.type_loc
-        | Missing_field (_,loc,_) -> Some loc  
-        | _ -> None
-        end
-    | _ -> None    
-
-(* We could do a better job to split the individual error items
-   as sub-messages of the main interface mismatch on the whole unit. *)
-let () =
-  Location.register_error_of_exn
-    (function
-      | Error err -> 
-        begin match better_candidate_loc err with 
-        | None -> 
-          Some (Location.error_of_printer_file report_error err)
-        | Some loc -> 
-          Some (Location.error_of_printer loc report_error err)  
-        end
-      | _ -> None
-    )
diff --git a/jscomp/ml/includemod.mli b/jscomp/ml/includemod.mli
deleted file mode 100644
index 731baf7..0000000
--- a/jscomp/ml/includemod.mli
+++ /dev/null
@@ -1,62 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Inclusion checks for the module language *)
-
-open Typedtree
-open Types
-open Format
-
-val modtypes:
-  loc:Location.t -> Env.t ->
-  module_type -> module_type -> module_coercion
-
-val signatures: Env.t -> signature -> signature -> module_coercion
-
-val compunit:
-      Env.t -> string -> signature -> string -> signature -> module_coercion
-
-val type_declarations:
-  loc:Location.t -> Env.t ->
-  Ident.t -> type_declaration -> type_declaration -> unit
-
-val print_coercion: formatter -> module_coercion -> unit
-
-type symptom =
-    Missing_field of Ident.t * Location.t * string (* kind *)
-  | Value_descriptions of Ident.t * value_description * value_description
-  | Type_declarations of Ident.t * type_declaration
-        * type_declaration * Includecore.type_mismatch list
-  | Extension_constructors of
-      Ident.t * extension_constructor * extension_constructor
-  | Module_types of module_type * module_type
-  | Modtype_infos of Ident.t * modtype_declaration * modtype_declaration
-  | Modtype_permutation
-  | Interface_mismatch of string * string
-  | Class_type_declarations of
-      Ident.t * class_type_declaration * class_type_declaration *
-      Ctype.class_match_failure list
-  | Unbound_modtype_path of Path.t
-  | Unbound_module_path of Path.t
-  | Invalid_module_alias of Path.t
-
-type pos =
-    Module of Ident.t | Modtype of Ident.t | Arg of Ident.t | Body of Ident.t
-type error = pos list * Env.t * symptom
-
-exception Error of error list
-
-val report_error: formatter -> error list -> unit
-val expand_module_alias: Env.t -> pos list -> Path.t -> Types.module_type
diff --git a/jscomp/ml/lambda.ml b/jscomp/ml/lambda.ml
deleted file mode 100644
index 91f63a9..0000000
--- a/jscomp/ml/lambda.ml
+++ /dev/null
@@ -1,799 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-
-
-
-
-type compile_time_constant =
-  | Big_endian
-  | Word_size
-  | Int_size
-  | Max_wosize
-  | Ostype_unix
-  | Ostype_win32
-  | Ostype_cygwin
-  | Backend_type
-
-type loc_kind =
-  | Loc_FILE
-  | Loc_LINE
-  | Loc_MODULE
-  | Loc_LOC
-  | Loc_POS
-
-type record_repr = 
-  | Record_regular
-  | Record_optional
-
-
-type tag_info = 
-  | Blk_constructor of {name : string ; num_nonconst : int ; tag : int; attrs : Parsetree.attributes }
-  | Blk_record_inlined of { name : string ; num_nonconst :  int;  tag : int;  optional_labels: string list; fields : string array; mutable_flag : Asttypes.mutable_flag; attrs : Parsetree.attributes }   
-  | Blk_tuple
-  | Blk_poly_var of string 
-  | Blk_record of {fields : string array; mutable_flag : Asttypes.mutable_flag; record_repr : record_repr}  
-  | Blk_module of string list
-  | Blk_module_export of Ident.t list
-
-  | Blk_extension  
-  | Blk_some
-  | Blk_some_not_nested (* ['a option] where ['a] can not inhabit a non-like value *)
-  | Blk_record_ext of { fields :  string array; mutable_flag : Asttypes.mutable_flag}
-  | Blk_lazy_general
-
-let tag_of_tag_info (tag : tag_info ) = 
-  match tag with 
-  | Blk_constructor {tag}
-  | Blk_record_inlined {tag} -> tag 
-  | Blk_tuple 
-  | Blk_poly_var _ 
-  | Blk_record _ 
-  | Blk_module _ 
-  | Blk_module_export _ 
-  | Blk_extension 
-  | Blk_some (* tag not make sense *)
-  | Blk_some_not_nested (* tag not make sense *)
-  | Blk_lazy_general (* tag not make sense 248 *)
-  | Blk_record_ext _  (* similar to Blk_extension*)
-   -> 0
-
-let mutable_flag_of_tag_info (tag : tag_info) =
-  match tag with 
-  | Blk_record_inlined {mutable_flag}
-  | Blk_record {mutable_flag}
-  | Blk_record_ext {mutable_flag} -> mutable_flag
-  | Blk_lazy_general -> Mutable
-  | Blk_tuple
-  | Blk_constructor _ 
-  | Blk_poly_var _ 
-  | Blk_module _
-  | Blk_module_export _ 
-  | Blk_extension
-  | Blk_some_not_nested
-  | Blk_some 
-   -> Immutable
-
-type label = Types.label_description
-
-let find_name (attr : Parsetree.attribute) =
-  match attr with
-  | ( { txt = "bs.as" | "as" },
-      PStr
-        [
-          {
-            pstr_desc =
-              Pstr_eval ({ pexp_desc = Pexp_constant (Pconst_string (s, _)) }, _);
-          };
-        ] ) ->
-      Some s
-  | _ -> None
-     
-let blk_record (fields : (label * _) array) mut record_repr =
-  let all_labels_info =
-    Ext_array.map fields (fun (lbl, _) ->
-        Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
-  in
-  Blk_record
-    { fields = all_labels_info; mutable_flag = mut; record_repr }
-
-
-let blk_record_ext fields mutable_flag =
-  let all_labels_info =
-    Array.map
-      (fun ((lbl : label), _) ->
-        Ext_list.find_def lbl.Types.lbl_attributes find_name lbl.lbl_name)
-      fields
-  in
-  Blk_record_ext {fields = all_labels_info; mutable_flag }
-
-let blk_record_inlined fields name num_nonconst optional_labels ~tag ~attrs mutable_flag =
-  let fields =
-    Array.map
-      (fun ((lbl : label), _) ->
-        Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
-      fields
-  in
-  Blk_record_inlined {fields; name; num_nonconst; tag; mutable_flag; optional_labels; attrs }
-
-let ref_tag_info : tag_info = 
-  Blk_record {fields = [| "contents" |]; mutable_flag = Mutable; record_repr = Record_regular}
-  
-type field_dbg_info = 
-  | Fld_record of {name : string; mutable_flag : Asttypes.mutable_flag}
-  | Fld_module of {name : string }
-  | Fld_record_inline of { name : string}   
-  | Fld_record_extension of {name : string}
-  | Fld_tuple  
-  | Fld_poly_var_tag
-  | Fld_poly_var_content
-  | Fld_extension
-  | Fld_variant
-  | Fld_cons 
-  | Fld_array
-
-let fld_record (lbl : label) =
-  Fld_record
-    {
-      name = Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name;
-      mutable_flag = lbl.lbl_mut;
-    }
-
-let fld_record_extension (lbl : label) =
-  Fld_record_extension
-    { name = Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name }
-
-let ref_field_info : field_dbg_info = 
-  Fld_record { name = "contents"; mutable_flag = Mutable}
-
-
-type set_field_dbg_info = 
-    | Fld_record_set of string 
-    | Fld_record_inline_set of string
-    | Fld_record_extension_set of string
-
-let ref_field_set_info : set_field_dbg_info = Fld_record_set "contents"    
-let fld_record_set (lbl : label) =
-  Fld_record_set
-    (Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
-
-let fld_record_inline (lbl : label) =
-  Fld_record_inline
-    { name = Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name }
-
-let fld_record_inline_set (lbl : label) =
-  Fld_record_inline_set
-    (Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
-
-let fld_record_extension_set (lbl : label) =
-  Fld_record_extension_set
-    (Ext_list.find_def lbl.lbl_attributes find_name lbl.lbl_name)
-
-type immediate_or_pointer =
-  | Immediate
-  | Pointer
-
-
-
-type is_safe =
-  | Safe
-  | Unsafe
-
-type primitive =
-  | Pidentity
-  | Pbytes_to_string
-  | Pignore
-  | Prevapply
-  | Pdirapply
-  | Ploc of loc_kind
-    (* Globals *)
-  | Pgetglobal of Ident.t
-  (* Operations on heap blocks *)
-  | Pmakeblock of  tag_info 
-  | Pfield of int * field_dbg_info
-  | Psetfield of int *  set_field_dbg_info
-
-  
-
-  | Pduprecord
-  (* Force lazy values *)
-  | Plazyforce
-  (* External call *)
-  | Pccall of Primitive.description
-  (* Exceptions *)
-  | Praise of raise_kind
-  (* Boolean operations *)
-  | Psequand | Psequor | Pnot
-  (* Integer operations *)
-  | Pnegint | Paddint | Psubint | Pmulint
-  | Pdivint of is_safe | Pmodint of is_safe
-  | Pandint | Porint | Pxorint
-  | Plslint | Plsrint | Pasrint
-  | Pintcomp of comparison
-  | Poffsetint of int
-  | Poffsetref of int
-  (* Float operations *)
-  | Pintoffloat | Pfloatofint
-  | Pnegfloat | Pabsfloat
-  | Paddfloat | Psubfloat | Pmulfloat | Pdivfloat
-  | Pfloatcomp of comparison
-  (* BigInt operations *)
-  | Pnegbigint | Paddbigint | Psubbigint | Ppowbigint
-  | Pmulbigint | Pdivbigint | Pmodbigint
-  | Pandbigint | Porbigint | Pxorbigint
-  | Plslbigint | Pasrbigint
-  | Pbigintcomp of comparison
-  (* String operations *)
-  | Pstringlength | Pstringrefu  | Pstringrefs
-  | Pbyteslength | Pbytesrefu | Pbytessetu | Pbytesrefs | Pbytessets
-  (* Array operations *)
-  | Pmakearray of  Asttypes.mutable_flag
-  | Parraylength 
-  | Parrayrefu 
-  | Parraysetu 
-  | Parrayrefs 
-  | Parraysets 
-  (* Test if the argument is a block or an immediate integer *)
-  | Pisint
-  (* Test if the (integer) argument is outside an interval *)
-  | Pisout
-  | Pbintofint of boxed_integer
-  | Pintofbint of boxed_integer
-  | Pcvtbint of boxed_integer (*source*) * boxed_integer (*destination*)
-  | Pnegbint of boxed_integer
-  | Paddbint of boxed_integer
-  | Psubbint of boxed_integer
-  | Pmulbint of boxed_integer
-  | Pdivbint of { size : boxed_integer; is_safe : is_safe }
-  | Pmodbint of { size : boxed_integer; is_safe : is_safe }
-  | Pandbint of boxed_integer
-  | Porbint of boxed_integer
-  | Pxorbint of boxed_integer
-  | Plslbint of boxed_integer
-  | Plsrbint of boxed_integer
-  | Pasrbint of boxed_integer
-  | Pbintcomp of boxed_integer * comparison
-  | Pctconst of compile_time_constant
-  (* Inhibition of optimisation *)
-  | Popaque
-  | Puncurried_apply
-  | Pcreate_extension of string
-and comparison =
-    Ceq | Cneq | Clt | Cgt | Cle | Cge
-
-and value_kind =
-    Pgenval 
-
-
-
-and boxed_integer = Primitive.boxed_integer =
-    Pbigint | Pint32 | Pint64
-
-
-and raise_kind =
-  | Raise_regular
-  | Raise_reraise
-  | Raise_notrace
-
-type pointer_info =
-  | Pt_constructor of {name: string; const: int; non_const: int; attrs: Parsetree.attributes}
-  | Pt_variant of {name: string}
-  | Pt_module_alias
-  | Pt_shape_none
-  | Pt_assertfalse
-
-
-  
-type structured_constant =
-    Const_base of Asttypes.constant
-  | Const_pointer of int * pointer_info
-  | Const_block of tag_info * structured_constant list
-  | Const_float_array of string list
-  | Const_immstring of string
-  | Const_false
-  | Const_true
-type inline_attribute =
-  | Always_inline (* [@inline] or [@inline always] *)
-  | Never_inline (* [@inline never] *)
-  | Default_inline (* no [@inline] attribute *)
-
-
-
-
-type let_kind = Strict | Alias | StrictOpt | Variable
-
-
-
-
-type function_attribute = {
-  inline : inline_attribute;
-  is_a_functor: bool;
-  stub: bool;
-  return_unit : bool;
-  async : bool;
-  oneUnitArg : bool;
-}
-
-type lambda =
-    Lvar of Ident.t
-  | Lconst of structured_constant
-  | Lapply of lambda_apply
-  | Lfunction of lfunction
-  | Llet of let_kind * value_kind * Ident.t * lambda * lambda
-  | Lletrec of (Ident.t * lambda) list * lambda
-  | Lprim of primitive * lambda list * Location.t
-  | Lswitch of lambda * lambda_switch * Location.t
-  | Lstringswitch of
-      lambda * (string * lambda) list * lambda option * Location.t
-  | Lstaticraise of int * lambda list
-  | Lstaticcatch of lambda * (int * Ident.t list) * lambda
-  | Ltrywith of lambda * Ident.t * lambda
-  | Lifthenelse of lambda * lambda * lambda
-  | Lsequence of lambda * lambda
-  | Lwhile of lambda * lambda
-  | Lfor of Ident.t * lambda * lambda * Asttypes.direction_flag * lambda
-  | Lassign of Ident.t * lambda
-  | Lsend of string * lambda * Location.t
-
-and lfunction =
-  { 
-    params: Ident.t list;
-    body: lambda;
-    attr: function_attribute; (* specified with [@inline] attribute *)
-    loc: Location.t;
- }
-
-and lambda_apply =
-  { ap_func : lambda;
-    ap_args : lambda list;
-    ap_loc : Location.t;
-    ap_inlined : inline_attribute;
-    }
-
-and lambda_switch =
-  { sw_numconsts: int;
-    sw_consts: (int * lambda) list;
-    sw_numblocks: int;
-    sw_blocks: (int * lambda) list;
-    sw_failaction : lambda option;
-    sw_names: Ast_untagged_variants.switch_names option }
-
-
-
-
-(* This is actually a dummy value 
-    not necessary "()", it can be used as a place holder for module 
-    alias etc.
-*)
-let const_unit =
-  Const_pointer
-    (0, Pt_constructor {name = "()"; const = 1; non_const = 0; attrs = []})
-
-let lambda_assert_false = Lconst (Const_pointer(0, Pt_assertfalse))  
-
-let lambda_module_alias = Lconst (Const_pointer(0, Pt_module_alias)) 
-
-let lambda_unit = Lconst const_unit
-
-let default_function_attribute = {
-  inline = Default_inline;
-  is_a_functor = false;
-  stub = false;
-  return_unit = false;
-  async = false;
-  oneUnitArg = false;
-}
-
-let default_stub_attribute =
-  { default_function_attribute with stub = true }
-
-(* Build sharing keys *)
-(*
-   Those keys are later compared with Pervasives.compare.
-   For that reason, they should not include cycles.
-*)
-
-exception Not_simple
-
-let max_raw = 32
-
-let make_key e =
-  let count = ref 0   (* Used for controling size *)
-  and make_key = Ident.make_key_generator () in
-  (* make_key is used for normalizing let-bound variables *)
-  let rec tr_rec env e =
-    incr count ;
-    if !count > max_raw then raise_notrace Not_simple ; (* Too big ! *)
-    match e with
-    | Lvar id ->
-      begin
-        try Ident.find_same id env
-        with Not_found -> e
-      end
-    | Lconst  (Const_base (Const_string _)) ->
-        (* Mutable constants are not shared *)
-        raise_notrace Not_simple
-    | Lconst _ -> e
-    | Lapply ap ->
-        Lapply {ap with ap_func = tr_rec env ap.ap_func;
-                        ap_args = tr_recs env ap.ap_args;
-                        ap_loc = Location.none}
-    | Llet (Alias,_k,x,ex,e) -> (* Ignore aliases -> substitute *)
-        let ex = tr_rec env ex in
-        tr_rec (Ident.add x ex env) e
-    | Llet ((Strict | StrictOpt),_k,x,ex,Lvar v) when Ident.same v x ->
-        tr_rec env ex
-    | Llet (str,k,x,ex,e) ->
-     (* Because of side effects, keep other lets with normalized names *)
-        let ex = tr_rec env ex in
-        let y = make_key x in
-        Llet (str,k,y,ex,tr_rec (Ident.add x (Lvar y) env) e)
-    | Lprim (p,es,_) ->
-        Lprim (p,tr_recs env es, Location.none)
-    | Lswitch (e,sw,loc) ->
-        Lswitch (tr_rec env e,tr_sw env sw,loc)
-    | Lstringswitch (e,sw,d,_) ->
-        Lstringswitch
-          (tr_rec env e,
-           List.map (fun (s,e) -> s,tr_rec env e) sw,
-           tr_opt env d,
-          Location.none)
-    | Lstaticraise (i,es) ->
-        Lstaticraise (i,tr_recs env es)
-    | Lstaticcatch (e1,xs,e2) ->
-        Lstaticcatch (tr_rec env e1,xs,tr_rec env e2)
-    | Ltrywith (e1,x,e2) ->
-        Ltrywith (tr_rec env e1,x,tr_rec env e2)
-    | Lifthenelse (cond,ifso,ifnot) ->
-        Lifthenelse (tr_rec env cond,tr_rec env ifso,tr_rec env ifnot)
-    | Lsequence (e1,e2) ->
-        Lsequence (tr_rec env e1,tr_rec env e2)
-    | Lassign (x,e) ->
-        Lassign (x,tr_rec env e)
-    | Lsend (m,e1,_loc) ->
-        Lsend (m,tr_rec env e1,Location.none)
-    | Lletrec _|Lfunction _
-    | Lfor _ | Lwhile _
-     ->
-        raise_notrace Not_simple
-
-  and tr_recs env es = List.map (tr_rec env) es
-
-  and tr_sw env sw =
-    { sw with
-      sw_consts = List.map (fun (i,e) -> i,tr_rec env e) sw.sw_consts ;
-      sw_blocks = List.map (fun (i,e) -> i,tr_rec env e) sw.sw_blocks ;
-      sw_failaction = tr_opt env sw.sw_failaction ; }
-
-  and tr_opt env = function
-    | None -> None
-    | Some e -> Some (tr_rec env e) in
-
-  try
-    Some (tr_rec Ident.empty e)
-  with Not_simple -> None
-
-(***************)
-
-let name_lambda strict arg fn =
-  match arg with
-    Lvar id -> fn id
-  | _ -> let id = Ident.create "let" in Llet(strict, Pgenval, id, arg, fn id)
-
-let name_lambda_list args fn =
-  let rec name_list names = function
-    [] -> fn (List.rev names)
-  | (Lvar _ as arg) :: rem ->
-      name_list (arg :: names) rem
-  | arg :: rem ->
-      let id = Ident.create "let" in
-      Llet(Strict, Pgenval, id, arg, name_list (Lvar id :: names) rem) in
-  name_list [] args
-
-
-let iter_opt f = function
-  | None -> ()
-  | Some e -> f e
-
-let iter f = function
-    Lvar _
-  | Lconst _ -> ()
-  | Lapply{ap_func = fn; ap_args = args} ->
-      f fn; List.iter f args
-  | Lfunction{body} ->
-      f body
-  | Llet(_str, _k, _id, arg, body) ->
-      f arg; f body
-  | Lletrec(decl, body) ->
-      f body;
-      List.iter (fun (_id, exp) -> f exp) decl
-  | Lprim(_p, args, _loc) ->
-      List.iter f args
-  | Lswitch(arg, sw,_) ->
-      f arg;
-      List.iter (fun (_key, case) -> f case) sw.sw_consts;
-      List.iter (fun (_key, case) -> f case) sw.sw_blocks;
-      iter_opt f sw.sw_failaction
-  | Lstringswitch (arg,cases,default,_) ->
-      f arg ;
-      List.iter (fun (_,act) -> f act) cases ;
-      iter_opt f default
-  | Lstaticraise (_,args) ->
-      List.iter f args
-  | Lstaticcatch(e1, _, e2) ->
-      f e1; f e2
-  | Ltrywith(e1, _, e2) ->
-      f e1; f e2
-  | Lifthenelse(e1, e2, e3) ->
-      f e1; f e2; f e3
-  | Lsequence(e1, e2) ->
-      f e1; f e2
-  | Lwhile(e1, e2) ->
-      f e1; f e2
-  | Lfor(_v, e1, e2, _dir, e3) ->
-      f e1; f e2; f e3
-  | Lassign(_, e) ->
-      f e
-  | Lsend (_k,  obj,  _) ->
-      f obj
-
-module IdentSet = Set.Make(Ident)
-
-let free_ids get l =
-  let fv = ref IdentSet.empty in
-  let rec free l =
-    iter free l;
-    fv := List.fold_right IdentSet.add (get l) !fv;
-    match l with
-      Lfunction{params} ->
-        List.iter (fun param -> fv := IdentSet.remove param !fv) params
-    | Llet(_str, _k, id, _arg, _body) ->
-        fv := IdentSet.remove id !fv
-    | Lletrec(decl, _body) ->
-        List.iter (fun (id, _exp) -> fv := IdentSet.remove id !fv) decl
-    | Lstaticcatch(_e1, (_,vars), _e2) ->
-        List.iter (fun id -> fv := IdentSet.remove id !fv) vars
-    | Ltrywith(_e1, exn, _e2) ->
-        fv := IdentSet.remove exn !fv
-    | Lfor(v, _e1, _e2, _dir, _e3) ->
-        fv := IdentSet.remove v !fv
-    | Lassign(id, _e) ->
-        fv := IdentSet.add id !fv
-    | Lvar _ | Lconst _ | Lapply _
-    | Lprim _ | Lswitch _ | Lstringswitch _ | Lstaticraise _
-    | Lifthenelse _ | Lsequence _ | Lwhile _
-    | Lsend _
-     -> ()
-  in free l; !fv
-
-let free_variables l =
-  free_ids (function Lvar id -> [id] | _ -> []) l
-
-
-(* Check if an action has a "when" guard *)
-let raise_count = ref 0
-
-let next_raise_count () =
-  incr raise_count ;
-  !raise_count
-
-let negative_raise_count = ref 0
-
-let next_negative_raise_count () =
-  decr negative_raise_count ;
-  !negative_raise_count
-
-(* Anticipated staticraise, for guards *)
-let staticfail = Lstaticraise (0,[])
-
-let rec is_guarded = function
-  | Lifthenelse(_cond, _body, Lstaticraise (0,[])) -> true
-  | Llet(_str, _k, _id, _lam, body) -> is_guarded body
-  | _ -> false
-
-let rec patch_guarded patch = function
-  | Lifthenelse (cond, body, Lstaticraise (0,[])) ->
-      Lifthenelse (cond, body, patch)
-  | Llet(str, k, id, lam, body) ->
-      Llet (str, k, id, lam, patch_guarded patch body)
-  | _ -> assert false
-
-(* Translate an access path *)
-
-let rec transl_normal_path = function
-    Path.Pident id ->
-      if Ident.global id
-      then Lprim(Pgetglobal id, [], Location.none)
-      else Lvar id
-  | Pdot(p, s, pos) ->
-      Lprim(Pfield (pos, Fld_module {name = s}), [transl_normal_path p], Location.none)
-  | Papply _ ->
-      assert false
-
-(* Translation of identifiers *)
-
-let transl_module_path ?(loc=Location.none) env path =
-  transl_normal_path (Env.normalize_path (Some loc) env path)
-
-let transl_value_path ?(loc=Location.none) env path =
-  transl_normal_path (Env.normalize_path_prefix (Some loc) env path)
-
-
-let transl_extension_path = transl_value_path
-
-(* compatibility alias, deprecated in the .mli *)
-(* Compile a sequence of expressions *)
-
-let rec make_sequence fn = function
-    [] -> lambda_unit
-  | [x] -> fn x
-  | x::rem ->
-      let lam = fn x in Lsequence(lam, make_sequence fn rem)
-
-(* Apply a substitution to a lambda-term.
-   Assumes that the bound variables of the lambda-term do not
-   belong to the domain of the substitution.
-   Assumes that the image of the substitution is out of reach
-   of the bound variables of the lambda-term (no capture). *)
-
-let subst_lambda s lam =
-  let rec subst = function
-    Lvar id as l ->
-      begin try Ident.find_same id s with Not_found -> l end
-  | Lconst _ as l -> l
-  | Lapply ap ->
-      Lapply{ap with ap_func = subst ap.ap_func;
-                     ap_args = List.map subst ap.ap_args}
-  | Lfunction{ params; body; attr; loc} ->
-      Lfunction{ params; body = subst body; attr; loc}
-  | Llet(str, k, id, arg, body) -> Llet(str, k, id, subst arg, subst body)
-  | Lletrec(decl, body) -> Lletrec(List.map subst_decl decl, subst body)
-  | Lprim(p, args, loc) -> Lprim(p, List.map subst args, loc)
-  | Lswitch(arg, sw, loc) ->
-      Lswitch(subst arg,
-              {sw with sw_consts = List.map subst_case sw.sw_consts;
-                       sw_blocks = List.map subst_case sw.sw_blocks;
-                       sw_failaction = subst_opt  sw.sw_failaction; },
-              loc)
-  | Lstringswitch (arg,cases,default,loc) ->
-      Lstringswitch
-        (subst arg,List.map subst_strcase cases,subst_opt default,loc)
-  | Lstaticraise (i,args) ->  Lstaticraise (i, List.map subst args)
-  | Lstaticcatch(e1, io, e2) -> Lstaticcatch(subst e1, io, subst e2)
-  | Ltrywith(e1, exn, e2) -> Ltrywith(subst e1, exn, subst e2)
-  | Lifthenelse(e1, e2, e3) -> Lifthenelse(subst e1, subst e2, subst e3)
-  | Lsequence(e1, e2) -> Lsequence(subst e1, subst e2)
-  | Lwhile(e1, e2) -> Lwhile(subst e1, subst e2)
-  | Lfor(v, e1, e2, dir, e3) -> Lfor(v, subst e1, subst e2, dir, subst e3)
-  | Lassign(id, e) -> Lassign(id, subst e)
-  | Lsend (k,  obj,  loc) ->
-      Lsend (k,subst obj, loc)
-  and subst_decl (id, exp) = (id, subst exp)
-  and subst_case (key, case) = (key, subst case)
-  and subst_strcase (key, case) = (key, subst case)
-  and subst_opt = function
-    | None -> None
-    | Some e -> Some (subst e)
-  in subst lam
-
-let rec map f lam =
-  let lam =
-    match lam with
-    | Lvar _ -> lam
-    | Lconst _ -> lam
-    | Lapply { ap_func; ap_args; ap_loc; 
-          ap_inlined;  } ->
-        Lapply {
-          ap_func = map f ap_func;
-          ap_args = List.map (map f) ap_args;
-          ap_loc;
-          ap_inlined;
-        }
-    | Lfunction {  params; body; attr; loc; } ->
-        Lfunction {  params; body = map f body; attr; loc; }
-    | Llet (str, k, v, e1, e2) ->
-        Llet (str, k, v, map f e1, map f e2)
-    | Lletrec (idel, e2) ->
-        Lletrec (List.map (fun (v, e) -> (v, map f e)) idel, map f e2)
-    | Lprim (p, el, loc) ->
-        Lprim (p, List.map (map f) el, loc)
-    | Lswitch (e, sw, loc) ->
-        Lswitch (map f e,
-          { sw_numconsts = sw.sw_numconsts;
-            sw_consts = List.map (fun (n, e) -> (n, map f e)) sw.sw_consts;
-            sw_numblocks = sw.sw_numblocks;
-            sw_blocks = List.map (fun (n, e) -> (n, map f e)) sw.sw_blocks;
-            sw_failaction = Misc.may_map (map f) sw.sw_failaction;
-            sw_names = sw.sw_names
-          },
-          loc)
-    | Lstringswitch (e, sw, default, loc) ->
-        Lstringswitch (
-          map f e,
-          List.map (fun (s, e) -> (s, map f e)) sw,
-          Misc.may_map (map f) default,
-          loc)
-    | Lstaticraise (i, args) ->
-        Lstaticraise (i, List.map (map f) args)
-    | Lstaticcatch (body, id, handler) ->
-        Lstaticcatch (map f body, id, map f handler)
-    | Ltrywith (e1, v, e2) ->
-        Ltrywith (map f e1, v, map f e2)
-    | Lifthenelse (e1, e2, e3) ->
-        Lifthenelse (map f e1, map f e2, map f e3)
-    | Lsequence (e1, e2) ->
-        Lsequence (map f e1, map f e2)
-    | Lwhile (e1, e2) ->
-        Lwhile (map f e1, map f e2)
-    | Lfor (v, e1, e2, dir, e3) ->
-        Lfor (v, map f e1, map f e2, dir, map f e3)
-    | Lassign (v, e) ->
-        Lassign (v, map f e)
-    | Lsend (k, o, loc) ->
-        Lsend (k, map f o,  loc)
-  in
-  f lam
-
-(* To let-bind expressions to variables *)
-
-let bind str var exp body =
-  match exp with
-    Lvar var' when Ident.same var var' -> body
-  | _ -> Llet(str, Pgenval, var, exp, body)
-
-and commute_comparison = function
-| Ceq -> Ceq| Cneq -> Cneq
-| Clt -> Cgt | Cle -> Cge
-| Cgt -> Clt | Cge -> Cle
-
-and negate_comparison = function
-| Ceq -> Cneq| Cneq -> Ceq
-| Clt -> Cge | Cle -> Cgt
-| Cgt -> Cle | Cge -> Clt
-
-let raise_kind = function
-  | Raise_regular -> "raise"
-  | Raise_reraise -> "reraise"
-  | Raise_notrace -> "raise_notrace"
-
-let lam_of_loc kind loc =
-  let loc_start = loc.Location.loc_start in
-  let (file, lnum, cnum) = Location.get_pos_info loc_start in
-  let file = Filename.basename file in  
-  let enum = loc.Location.loc_end.Lexing.pos_cnum -
-      loc_start.Lexing.pos_cnum + cnum in
-  match kind with
-  | Loc_POS ->
-    Lconst (Const_block (Blk_tuple, [
-          Const_immstring file;
-          Const_base (Const_int lnum);
-          Const_base (Const_int cnum);
-          Const_base (Const_int enum);
-        ]))
-  | Loc_FILE -> Lconst (Const_immstring file)
-  | Loc_MODULE ->
-    let filename = Filename.basename file in
-    let name = Env.get_unit_name () in
-    let module_name = if name = "" then "//"^filename^"//" else name in
-    Lconst (Const_immstring module_name)
-  | Loc_LOC ->
-    let loc = Printf.sprintf "File %S, line %d, characters %d-%d"
-        file lnum cnum enum in
-    Lconst (Const_immstring loc)
-  | Loc_LINE -> Lconst (Const_base (Const_int lnum))
-
-
-let reset () =
-  raise_count := 0
diff --git a/jscomp/ml/lambda.mli b/jscomp/ml/lambda.mli
deleted file mode 100644
index f7fac1e..0000000
--- a/jscomp/ml/lambda.mli
+++ /dev/null
@@ -1,413 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* The "lambda" intermediate code *)
-
-open Asttypes
-
-type compile_time_constant =
-  | Big_endian
-  | Word_size
-  | Int_size
-  | Max_wosize
-  | Ostype_unix
-  | Ostype_win32
-  | Ostype_cygwin
-  | Backend_type
-
-type loc_kind =
-  | Loc_FILE
-  | Loc_LINE
-  | Loc_MODULE
-  | Loc_LOC
-  | Loc_POS
-
-type record_repr = 
-  | Record_regular 
-  | Record_optional
-
-type tag_info = 
-  | Blk_constructor of { name : string ; num_nonconst : int; tag : int; attrs : Parsetree.attributes }
-  | Blk_record_inlined of { name : string ; num_nonconst :  int ;  tag : int; optional_labels: string list; fields : string array; mutable_flag : mutable_flag; attrs : Parsetree.attributes }   
-  | Blk_tuple
-  | Blk_poly_var of string 
-  | Blk_record of {fields : string array; mutable_flag : mutable_flag; record_repr : record_repr }
-  | Blk_module of string list
-  | Blk_module_export of Ident.t list 
-  | Blk_extension
-    (* underlying is the same as tuple, immutable block
-      {[
-         exception A of int * int 
-      ]}
-      is translated into
-      {[
-        [A, x, y]
-      ]}
-
-    *)
-
-  | Blk_some
-  | Blk_some_not_nested (* ['a option] where ['a] can not inhabit a non-like value *)
-  | Blk_record_ext of {fields : string array; mutable_flag : mutable_flag}
-  | Blk_lazy_general    
-
-val find_name :
-  Parsetree.attribute -> Asttypes.label option
-
-val tag_of_tag_info : tag_info -> int 
-val mutable_flag_of_tag_info : tag_info -> mutable_flag 
-val blk_record :    
-  (Types.label_description* Typedtree.record_label_definition) array ->
-  mutable_flag -> 
-  record_repr -> 
-  tag_info
-  
-
-val blk_record_ext :
-  (Types.label_description* Typedtree.record_label_definition) array ->
-  mutable_flag -> 
-  tag_info
-
-
-val blk_record_inlined :   
-  (Types.label_description* Typedtree.record_label_definition) array ->
-  string ->
-  int ->
-  string list ->
-  tag:int ->
-  attrs:Parsetree.attributes ->
-  mutable_flag ->  
-  tag_info
-
-
-
-
-val ref_tag_info : tag_info
-
-type field_dbg_info = 
-  | Fld_record of {name : string; mutable_flag : Asttypes.mutable_flag}
-  | Fld_module of {name : string}     
-  | Fld_record_inline of {name : string}
-  | Fld_record_extension of {name : string}
-  | Fld_tuple
-  | Fld_poly_var_tag
-  | Fld_poly_var_content
-  | Fld_extension
-  | Fld_variant
-  | Fld_cons
-  | Fld_array
-  
-val fld_record :
-  Types.label_description -> 
-  field_dbg_info
-
-val fld_record_inline :
-  Types.label_description -> 
-  field_dbg_info
-
-val fld_record_extension :
-  Types.label_description -> 
-  field_dbg_info
-
-val ref_field_info : field_dbg_info   
-
-
-
-type set_field_dbg_info = 
-  | Fld_record_set of string 
-  | Fld_record_inline_set of string  
-  | Fld_record_extension_set of string
-
-val ref_field_set_info : set_field_dbg_info    
-
-val fld_record_set : 
-  Types.label_description ->
-  set_field_dbg_info
-
-val fld_record_inline_set : 
-  Types.label_description ->
-  set_field_dbg_info
-
-val fld_record_extension_set :
-  Types.label_description -> 
-  set_field_dbg_info
-
-type immediate_or_pointer =
-  | Immediate
-  | Pointer
-type is_safe =
-  | Safe
-  | Unsafe
-
-type pointer_info =
-  | Pt_constructor of {name: string; const: int; non_const: int; attrs: Parsetree.attributes}
-  | Pt_variant of {name: string}
-  | Pt_module_alias
-  | Pt_shape_none
-  | Pt_assertfalse
-
-type primitive =
-  | Pidentity
-  | Pbytes_to_string
-  | Pignore
-  | Prevapply
-  | Pdirapply
-  | Ploc of loc_kind
-    (* Globals *)
-  | Pgetglobal of Ident.t
-  (* Operations on heap blocks *)
-  | Pmakeblock of tag_info 
-  | Pfield of int * field_dbg_info
-  | Psetfield of int * set_field_dbg_info
-
-
-  | Pduprecord
-  (* Force lazy values *)
-  | Plazyforce
-  (* External call *)
-  | Pccall of Primitive.description
-  (* Exceptions *)
-  | Praise of raise_kind
-  (* Boolean operations *)
-  | Psequand | Psequor | Pnot
-  (* Integer operations *)
-  | Pnegint | Paddint | Psubint | Pmulint
-  | Pdivint of is_safe | Pmodint of is_safe
-  | Pandint | Porint | Pxorint
-  | Plslint | Plsrint | Pasrint
-  | Pintcomp of comparison
-  | Poffsetint of int
-  | Poffsetref of int
-  (* Float operations *)
-  | Pintoffloat | Pfloatofint
-  | Pnegfloat | Pabsfloat
-  | Paddfloat | Psubfloat | Pmulfloat | Pdivfloat
-  | Pfloatcomp of comparison
-  (* BigInt operations *)
-  | Pnegbigint | Paddbigint | Psubbigint | Ppowbigint
-  | Pmulbigint | Pdivbigint | Pmodbigint
-  | Pandbigint | Porbigint | Pxorbigint
-  | Plslbigint | Pasrbigint
-  | Pbigintcomp of comparison
-  (* String operations *)
-  | Pstringlength | Pstringrefu  | Pstringrefs
-  | Pbyteslength | Pbytesrefu | Pbytessetu | Pbytesrefs | Pbytessets
-  (* Array operations *)
-  | Pmakearray of  mutable_flag
-  | Parraylength 
-  | Parrayrefu 
-  | Parraysetu 
-  | Parrayrefs 
-  | Parraysets 
-  (* Test if the argument is a block or an immediate integer *)
-  | Pisint
-  (* Test if the (integer) argument is outside an interval *)
-  | Pisout
-  (* Operations on boxed integers (Nativeint.t, Int32.t, Int64.t) *)
-  | Pbintofint of boxed_integer
-  | Pintofbint of boxed_integer
-  | Pcvtbint of boxed_integer (*source*) * boxed_integer (*destination*)
-  | Pnegbint of boxed_integer
-  | Paddbint of boxed_integer
-  | Psubbint of boxed_integer
-  | Pmulbint of boxed_integer
-  | Pdivbint of { size : boxed_integer; is_safe : is_safe }
-  | Pmodbint of { size : boxed_integer; is_safe : is_safe }
-  | Pandbint of boxed_integer
-  | Porbint of boxed_integer
-  | Pxorbint of boxed_integer
-  | Plslbint of boxed_integer
-  | Plsrbint of boxed_integer
-  | Pasrbint of boxed_integer
-  | Pbintcomp of boxed_integer * comparison
-  | Pctconst of compile_time_constant
-  (* Inhibition of optimisation *)
-  | Popaque
-  | Puncurried_apply
-  | Pcreate_extension of string
-and comparison =
-    Ceq | Cneq | Clt | Cgt | Cle | Cge
-
-
-and value_kind =
-    Pgenval 
-
-
-and boxed_integer = Primitive.boxed_integer =
-    Pbigint | Pint32 | Pint64
-
-
-and raise_kind =
-  | Raise_regular
-  | Raise_reraise
-  | Raise_notrace
-
-type structured_constant =
-    Const_base of constant
-  | Const_pointer of int * pointer_info
-  | Const_block of  tag_info * structured_constant list
-  | Const_float_array of string list
-  | Const_immstring of string
-  | Const_false
-  | Const_true
-  
-type inline_attribute =
-  | Always_inline (* [@inline] or [@inline always] *)
-  | Never_inline (* [@inline never] *)
-  | Default_inline (* no [@inline] attribute *)
-
-
-
-
-type let_kind = Strict | Alias | StrictOpt | Variable
-(* Meaning of kinds for let x = e in e':
-    Strict: e may have side-effects; always evaluate e first
-      (If e is a simple expression, e.g. a variable or constant,
-       we may still substitute e'[x/e].)
-    Alias: e is pure, we can substitute e'[x/e] if x has 0 or 1 occurrences
-      in e'
-    StrictOpt: e does not have side-effects, but depend on the store;
-      we can discard e if x does not appear in e'
-    Variable: the variable x is assigned later in e'
- *)
-
-
-
-
-(* [true] means yes, [false] may mean unknown *)
-type function_attribute = {
-  inline : inline_attribute;
-  is_a_functor: bool;
-  stub: bool;
-  return_unit : bool;
-  async : bool;
-  oneUnitArg : bool;
-}
-
-type lambda =
-    Lvar of Ident.t
-  | Lconst of structured_constant
-  | Lapply of lambda_apply
-  | Lfunction of lfunction
-  | Llet of let_kind * value_kind * Ident.t * lambda * lambda
-  | Lletrec of (Ident.t * lambda) list * lambda
-  | Lprim of primitive * lambda list * Location.t
-  | Lswitch of lambda * lambda_switch * Location.t
-(* switch on strings, clauses are sorted by string order,
-   strings are pairwise distinct *)
-  | Lstringswitch of
-      lambda * (string * lambda) list * lambda option * Location.t
-  | Lstaticraise of int * lambda list
-  | Lstaticcatch of lambda * (int * Ident.t list) * lambda
-  | Ltrywith of lambda * Ident.t * lambda
-  | Lifthenelse of lambda * lambda * lambda
-  | Lsequence of lambda * lambda
-  | Lwhile of lambda * lambda
-  | Lfor of Ident.t * lambda * lambda * direction_flag * lambda
-  | Lassign of Ident.t * lambda
-  | Lsend of string * lambda *  Location.t
-
-and lfunction =
-  {
-    params: Ident.t list;
-    body: lambda;
-    attr: function_attribute; (* specified with [@inline] attribute *)
-    loc : Location.t; }
-
-and lambda_apply =
-  { ap_func : lambda;
-    ap_args : lambda list;
-    ap_loc : Location.t;
-    ap_inlined : inline_attribute; (* specified with the [@inlined] attribute *)
-    }
-
-and lambda_switch =
-  { sw_numconsts: int;                  (* Number of integer cases *)
-    sw_consts: (int * lambda) list;     (* Integer cases *)
-    sw_numblocks: int;                  (* Number of tag block cases *)
-    sw_blocks: (int * lambda) list;     (* Tag block cases *)
-    sw_failaction : lambda option;      (* Action to take if failure *)
-    sw_names: Ast_untagged_variants.switch_names option }
-
-
-
-(* Lambda code for the middle-end.
-   * In the closure case the code is a sequence of assignments to a
-     preallocated block of size [main_module_block_size] using
-     (Setfield(Getglobal(module_ident))). The size is used to preallocate
-     the block.
-   * In the flambda case the code is an expression returning a block
-     value of size [main_module_block_size]. The size is used to build
-     the module root as an initialize_symbol
-     Initialize_symbol(module_name, 0,
-       [getfield 0; ...; getfield (main_module_block_size - 1)])
-*)
-
-(* Sharing key *)
-val make_key: lambda -> lambda option
-
-val const_unit: structured_constant
-val lambda_assert_false: lambda
-val lambda_unit: lambda
-val lambda_module_alias : lambda
-val name_lambda: let_kind -> lambda -> (Ident.t -> lambda) -> lambda
-val name_lambda_list: lambda list -> (lambda list -> lambda) -> lambda
-
-val iter: (lambda -> unit) -> lambda -> unit
-module IdentSet: Set.S with type elt = Ident.t
-val free_variables: lambda -> IdentSet.t
-
-val transl_normal_path: Path.t -> lambda   (* Path.t is already normal *)
-
-val transl_module_path: ?loc:Location.t -> Env.t -> Path.t -> lambda
-val transl_value_path: ?loc:Location.t -> Env.t -> Path.t -> lambda
-val transl_extension_path: ?loc:Location.t -> Env.t -> Path.t -> lambda
-
-
-val make_sequence: ('a -> lambda) -> 'a list -> lambda
-
-val subst_lambda: lambda Ident.tbl -> lambda -> lambda
-val map : (lambda -> lambda) -> lambda -> lambda
-val bind : let_kind -> Ident.t -> lambda -> lambda -> lambda
-
-val commute_comparison : comparison -> comparison
-val negate_comparison : comparison -> comparison
-
-val default_function_attribute : function_attribute
-val default_stub_attribute : function_attribute
-
-(***********************)
-(* For static failures *)
-(***********************)
-
-(* Get a new static failure ident *)
-val next_raise_count : unit -> int
-val next_negative_raise_count : unit -> int
-  (* Negative raise counts are used to compile 'match ... with
-     exception x -> ...'.  This disabled some simplifications
-     performed by the Simplif module that assume that static raises
-     are in tail position in their handler. *)
-
-val staticfail : lambda (* Anticipated static failure *)
-
-(* Check anticipated failure, substitute its final value *)
-val is_guarded: lambda -> bool
-val patch_guarded : lambda -> lambda -> lambda
-
-val raise_kind: raise_kind -> string
-val lam_of_loc : loc_kind -> Location.t -> lambda
-
-
-val reset: unit -> unit
diff --git a/jscomp/ml/lexer.mli b/jscomp/ml/lexer.mli
deleted file mode 100644
index 2388b9b..0000000
--- a/jscomp/ml/lexer.mli
+++ /dev/null
@@ -1,65 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* The lexical analyzer *)
-
-val init : unit -> unit
-val token: Lexing.lexbuf -> Parser.token
-val skip_hash_bang: Lexing.lexbuf -> unit
-
-
-type error =
-  | Illegal_character of char
-  | Illegal_escape of string
-  | Unterminated_comment of Location.t
-  | Unterminated_string
-  | Unterminated_string_in_comment of Location.t * Location.t
-  | Keyword_as_label of string
-  | Invalid_literal of string
-  | Invalid_directive of string * string option
-                          
-;;
-
-exception Error of error * Location.t
-
-
-
-val in_comment : unit -> bool;;
-val in_string : unit -> bool;;
-
-
-val print_warnings : bool ref
-val handle_docstrings: bool ref
-val comments : unit -> (string * Location.t) list
-val token_with_comments : Lexing.lexbuf -> Parser.token
-
-(*
-  [set_preprocessor init preprocessor] registers [init] as the function
-to call to initialize the preprocessor when the lexer is initialized,
-and [preprocessor] a function that is called when a new token is needed
-by the parser, as [preprocessor lexer lexbuf] where [lexer] is the
-lexing function.
-
-When a preprocessor is configured by calling [set_preprocessor], the lexer
-changes its behavior to accept backslash-newline as a token-separating blank.
-*)
-
-val set_preprocessor :
-  (unit -> unit) ->
-  ((Lexing.lexbuf -> Parser.token) -> Lexing.lexbuf -> Parser.token) ->
-  unit
-
-
-
diff --git a/jscomp/ml/lexer.mll b/jscomp/ml/lexer.mll
deleted file mode 100644
index 3663fd3..0000000
--- a/jscomp/ml/lexer.mll
+++ /dev/null
@@ -1,792 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* The lexer definition *)
-
-{
-open Lexing
-open Misc
-open Parser
-
-type error =
-  | Illegal_character of char
-  | Illegal_escape of string
-  | Unterminated_comment of Location.t
-  | Unterminated_string
-  | Unterminated_string_in_comment of Location.t * Location.t
-  | Keyword_as_label of string
-  | Invalid_literal of string
-  | Invalid_directive of string * string option
-;;
-
-exception Error of error * Location.t;;
-
-(* The table of keywords *)
-
-let keyword_table =
-  create_hashtable 149 [
-    "and", AND;
-    "as", AS;
-    "assert", ASSERT;
-    "begin", BEGIN;
-    "class", CLASS;
-    "constraint", CONSTRAINT;
-    "do", DO;
-    "done", DONE;
-    "downto", DOWNTO;
-    "else", ELSE;
-    "end", END;
-    "exception", EXCEPTION;
-    "external", EXTERNAL;
-    "false", FALSE;
-    "for", FOR;
-    "fun", FUN;
-    "function", FUNCTION;
-    "functor", FUNCTOR;
-    "if", IF;
-    "in", IN;
-    "include", INCLUDE;
-    "inherit", INHERIT;
-    "initializer", INITIALIZER;
-    "lazy", LAZY;
-    "let", LET;
-    "match", MATCH;
-    "method", METHOD;
-    "module", MODULE;
-    "mutable", MUTABLE;
-    "new", NEW;
-    "nonrec", NONREC;
-    "object", OBJECT;
-    "of", OF;
-    "open", OPEN;
-    "or", OR;
-(*  "parser", PARSER; *)
-    "private", PRIVATE;
-    "rec", REC;
-    "sig", SIG;
-    "struct", STRUCT;
-    "then", THEN;
-    "to", TO;
-    "true", TRUE;
-    "try", TRY;
-    "type", TYPE;
-    "val", VAL;
-    "virtual", VIRTUAL;
-    "when", WHEN;
-    "while", WHILE;
-    "with", WITH;
-
-    "lor", INFIXOP3("lor"); (* Should be INFIXOP2 *)
-    "lxor", INFIXOP3("lxor"); (* Should be INFIXOP2 *)
-    "mod", INFIXOP3("mod");
-    "land", INFIXOP3("land");
-    "lsl", INFIXOP4("lsl");
-    "lsr", INFIXOP4("lsr");
-    "asr", INFIXOP4("asr")
-]
-
-(* To buffer string literals *)
-
-let string_buffer = Buffer.create 256
-let reset_string_buffer () = Buffer.reset string_buffer
-let get_stored_string () = Buffer.contents string_buffer
-
-let store_string_char c = Buffer.add_char string_buffer c
-let store_string_utf_8_uchar u = Buffer.add_utf_8_uchar string_buffer u
-let store_string s = Buffer.add_string string_buffer s
-let store_lexeme lexbuf = store_string (Lexing.lexeme lexbuf)
-
-(* To store the position of the beginning of a string and comment *)
-let string_start_loc = ref Location.none;;
-let comment_start_loc = ref [];;
-let in_comment () = !comment_start_loc <> [];;
-let is_in_string = ref false
-let in_string () = !is_in_string
-let print_warnings = ref true
-
-(* Escaped chars are interpreted in strings unless they are in comments. *)
-let store_escaped_char lexbuf c =
-  if in_comment () then store_lexeme lexbuf else store_string_char c
-
-let store_escaped_uchar lexbuf u =
-  if in_comment () then store_lexeme lexbuf else store_string_utf_8_uchar u
-
-let with_comment_buffer comment lexbuf =
-  let start_loc = Location.curr lexbuf  in
-  comment_start_loc := [start_loc];
-  reset_string_buffer ();
-  let end_loc = comment lexbuf in
-  let s = get_stored_string () in
-  reset_string_buffer ();
-  let loc = { start_loc with Location.loc_end = end_loc.Location.loc_end } in
-  s, loc
-
-(* To translate escape sequences *)
-
-let hex_digit_value d = (* assert (d in '0'..'9' 'a'..'f' 'A'..'F') *)
-  let d = Char.code d in
-  if d >= 97 then d - 87 else
-  if d >= 65 then d - 55 else
-  d - 48
-
-let hex_num_value lexbuf ~first ~last =
-  let rec loop acc i = match i > last with
-  | true -> acc
-  | false ->
-      let value = hex_digit_value (Lexing.lexeme_char lexbuf i) in
-      loop (16 * acc + value) (i + 1)
-  in
-  loop 0 first
-
-let char_for_backslash = function
-  | 'n' -> '\010'
-  | 'r' -> '\013'
-  | 'b' -> '\008'
-  | 't' -> '\009'
-  | c   -> c
-
-let char_for_decimal_code lexbuf i =
-  let c = 100 * (Char.code(Lexing.lexeme_char lexbuf i) - 48) +
-           10 * (Char.code(Lexing.lexeme_char lexbuf (i+1)) - 48) +
-                (Char.code(Lexing.lexeme_char lexbuf (i+2)) - 48) in
-  if not (Uchar.is_valid c ) then
-    if in_comment ()
-    then 'x'
-    else raise (Error(Illegal_escape (Lexing.lexeme lexbuf),
-                      Location.curr lexbuf))
-  else (Obj.magic (c : int) : char)
-
-let char_for_octal_code lexbuf i =
-  let c = 64 * (Char.code(Lexing.lexeme_char lexbuf i) - 48) +
-           8 * (Char.code(Lexing.lexeme_char lexbuf (i+1)) - 48) +
-               (Char.code(Lexing.lexeme_char lexbuf (i+2)) - 48) in
-  Char.chr c
-
-let char_for_hexadecimal_code lexbuf i =
-  let byte = hex_num_value lexbuf ~first:i ~last:(i+1) in
-  Char.chr byte
-
-let uchar_for_uchar_escape lexbuf =
-  let err e =
-    raise
-      (Error (Illegal_escape (Lexing.lexeme lexbuf ^ e), Location.curr lexbuf))
-  in
-  let len = Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf in
-  let first = 3 (* skip opening \u{ *) in
-  let last = len - 2 (* skip closing } *) in
-  let digit_count = last - first + 1 in
-  match digit_count > 6 with
-  | true -> err ", too many digits, expected 1 to 6 hexadecimal digits"
-  | false ->
-      let cp = hex_num_value lexbuf ~first ~last in
-      if Uchar.is_valid cp then Uchar.unsafe_of_int cp else
-      err (", " ^ Printf.sprintf "%X" cp ^ " is not a Unicode scalar value")
-
-(* recover the name from a LABEL or OPTLABEL token *)
-
-let get_label_name lexbuf =
-  let s = Lexing.lexeme lexbuf in
-  let name = String.sub s 1 (String.length s - 2) in
-  if Hashtbl.mem keyword_table name then
-    raise (Error(Keyword_as_label name, Location.curr lexbuf));
-  name
-;;
-
-(* Update the current location with file name and line number. *)
-
-let update_loc lexbuf file line absolute chars =
-  let pos = lexbuf.lex_curr_p in
-  let new_file = match file with
-                 | None -> pos.pos_fname
-                 | Some s -> s
-  in
-  lexbuf.lex_curr_p <- { pos with
-    pos_fname = new_file;
-    pos_lnum = if absolute then line else pos.pos_lnum + line;
-    pos_bol = pos.pos_cnum - chars;
-  }
-;;
-
-let preprocessor = ref None
-
-let escaped_newlines = ref false
-
-
-let handle_docstrings = ref true
-let comment_list = ref []
-
-let add_comment com =
-  comment_list := com :: !comment_list
-
-let add_docstring_comment ds =
-  let com =
-    ("*" ^ Docstrings.docstring_body ds, Docstrings.docstring_loc ds)
-  in
-    add_comment com
-
-let comments () = List.rev !comment_list
-
-(* Error report *)
-
-open Format
-
-let report_error ppf = function
-  | Illegal_character c ->
-      fprintf ppf "Illegal character (%s)" (Char.escaped c)
-  | Illegal_escape s ->
-      fprintf ppf "Illegal backslash escape in string or character (%s)" s
-  | Unterminated_comment _ ->
-      fprintf ppf "Comment not terminated"
-  | Unterminated_string ->
-      fprintf ppf "String literal not terminated"
-  | Unterminated_string_in_comment (_, loc) ->
-      fprintf ppf "This comment contains an unterminated string literal@.\
-                   %aString literal begins here"
-              (Location.print_error "") loc
-  | Keyword_as_label kwd ->
-      fprintf ppf "`%s' is a keyword, it cannot be used as label name" kwd
-  | Invalid_literal s ->
-      fprintf ppf "Invalid literal %s" s
-  | Invalid_directive (dir, explanation) ->
-      fprintf ppf "Invalid lexer directive %S" dir;
-      begin match explanation with
-        | None -> ()
-        | Some expl -> fprintf ppf ": %s" expl
-      end
-
-let () =
-  Location.register_error_of_exn
-    (function
-      | Error (err, loc) ->
-          Some (Location.error_of_printer loc report_error err)
-      | _ ->
-          None
-    )
-
-}
-
-let newline = ('\013'* '\010')
-let blank = [' ' '\009' '\012']
-let lowercase = ['a'-'z' '_']
-let uppercase = ['A'-'Z']
-let identchar = ['A'-'Z' 'a'-'z' '_' '\'' '0'-'9']
-let symbolchar =
-  ['!' '$' '%' '&' '*' '+' '-' '.' '/' ':' '<' '=' '>' '?' '@' '^' '|' '~']
-let dotsymbolchar =
-  ['!' '$' '%' '&' '*' '+' '-' '/' ':' '=' '>' '?' '@' '^' '|' '~']
-let decimal_literal =
-  ['0'-'9'] ['0'-'9' '_']*
-let hex_digit =
-  ['0'-'9' 'A'-'F' 'a'-'f']
-let hex_literal =
-  '0' ['x' 'X'] ['0'-'9' 'A'-'F' 'a'-'f']['0'-'9' 'A'-'F' 'a'-'f' '_']*
-let oct_literal =
-  '0' ['o' 'O'] ['0'-'7'] ['0'-'7' '_']*
-let bin_literal =
-  '0' ['b' 'B'] ['0'-'1'] ['0'-'1' '_']*
-let int_literal =
-  decimal_literal | hex_literal | oct_literal | bin_literal
-let float_literal =
-  ['0'-'9'] ['0'-'9' '_']*
-  ('.' ['0'-'9' '_']* )?
-  (['e' 'E'] ['+' '-']? ['0'-'9'] ['0'-'9' '_']* )?
-let hex_float_literal =
-  '0' ['x' 'X']
-  ['0'-'9' 'A'-'F' 'a'-'f'] ['0'-'9' 'A'-'F' 'a'-'f' '_']*
-  ('.' ['0'-'9' 'A'-'F' 'a'-'f' '_']* )?
-  (['p' 'P'] ['+' '-']? ['0'-'9'] ['0'-'9' '_']* )?
-let literal_modifier = ['G'-'Z' 'g'-'z']
-
-rule token = parse
-  | "\\" newline {
-      if not !escaped_newlines then
-        raise (Error(Illegal_character (Lexing.lexeme_char lexbuf 0),
-                     Location.curr lexbuf));
-      update_loc lexbuf None 1 false 0;
-      token lexbuf }
-  | newline
-      { update_loc lexbuf None 1 false 0;
-        EOL }
-  | blank +
-      { token lexbuf }
-  | "_"
-      { UNDERSCORE }
-  | "~"
-      { TILDE }
-  | "~" lowercase identchar * ':'
-      { LABEL (get_label_name lexbuf) }
-  | "?"
-      { QUESTION }
-  | "?" lowercase identchar * ':'
-      { OPTLABEL (get_label_name lexbuf) }
-  | lowercase identchar *
-      { let s = Lexing.lexeme lexbuf in
-        try Hashtbl.find keyword_table s
-        with Not_found -> LIDENT s }
-  | uppercase identchar *
-      { UIDENT(Lexing.lexeme lexbuf) }       (* No capitalized keywords *)
-  | int_literal { INT (Lexing.lexeme lexbuf, None) }
-  | (int_literal as lit) (literal_modifier as modif)
-      { INT (lit, Some modif) }
-  | float_literal | hex_float_literal
-      { FLOAT (Lexing.lexeme lexbuf, None) }
-  | ((float_literal | hex_float_literal) as lit) (literal_modifier as modif)
-      { FLOAT (lit, Some modif) }
-  | (float_literal | hex_float_literal | int_literal) identchar+
-      { raise (Error(Invalid_literal (Lexing.lexeme lexbuf),
-                     Location.curr lexbuf)) }
-  | "\""
-      { reset_string_buffer();
-        is_in_string := true;
-        let string_start = lexbuf.lex_start_p in
-        string_start_loc := Location.curr lexbuf;
-        string lexbuf;
-        is_in_string := false;
-        lexbuf.lex_start_p <- string_start;
-        STRING (get_stored_string(), None) }
-  | "{" lowercase* "|"
-      { reset_string_buffer();
-        let delim = Lexing.lexeme lexbuf in
-        let delim = String.sub delim 1 (String.length delim - 2) in
-        is_in_string := true;
-        let string_start = lexbuf.lex_start_p in
-        string_start_loc := Location.curr lexbuf;
-        quoted_string delim lexbuf;
-        is_in_string := false;
-        lexbuf.lex_start_p <- string_start;
-        STRING (get_stored_string(), Some delim) }
-  | "\'" newline "\'"
-      { update_loc lexbuf None 1 false 1;
-        CHAR (Lexing.lexeme_char lexbuf 1) }
-  | "\'" [^ '\\' '\'' '\010' '\013'] "\'"
-      { CHAR(Lexing.lexeme_char lexbuf 1) }
-  | "\'\\" ['\\' '\'' '\"' 'n' 't' 'b' 'r' ' '] "\'"
-      { CHAR(char_for_backslash (Lexing.lexeme_char lexbuf 2)) }
-  | "\'\\" ['0'-'9'] ['0'-'9'] ['0'-'9'] "\'"
-      { CHAR(char_for_decimal_code lexbuf 2) }
-  | "\'\\" 'o' ['0'-'3'] ['0'-'7'] ['0'-'7'] "\'"
-      { CHAR(char_for_octal_code lexbuf 3) }
-  | "\'\\" 'x' ['0'-'9' 'a'-'f' 'A'-'F'] ['0'-'9' 'a'-'f' 'A'-'F'] "\'"
-      { CHAR(char_for_hexadecimal_code lexbuf 3) }
-  | "\'\\" _
-      { let l = Lexing.lexeme lexbuf in
-        let esc = String.sub l 1 (String.length l - 1) in
-        raise (Error(Illegal_escape esc, Location.curr lexbuf))
-      }
-  | "(*"
-      { let s, loc = with_comment_buffer comment lexbuf in
-        COMMENT (s, loc) }
-  | "(**"
-      { let s, loc = with_comment_buffer comment lexbuf in
-        if !handle_docstrings then
-          DOCSTRING (Docstrings.docstring s loc)
-        else
-          COMMENT ("*" ^ s, loc)
-      }
-  | "(**" (('*'+) as stars)
-      { let s, loc =
-          with_comment_buffer
-            (fun lexbuf ->
-               store_string ("*" ^ stars);
-               comment lexbuf)
-            lexbuf
-        in
-        COMMENT (s, loc) }
-  | "(*)"
-      { if !print_warnings then
-          Location.prerr_warning (Location.curr lexbuf) Warnings.Comment_start;
-        let s, loc = with_comment_buffer comment lexbuf in
-        COMMENT (s, loc) }
-  | "(*" (('*'*) as stars) "*)"
-      { if !handle_docstrings && stars="" then
-         (* (**) is an empty docstring *)
-          DOCSTRING(Docstrings.docstring "" (Location.curr lexbuf))
-        else
-          COMMENT (stars, Location.curr lexbuf) }
-  | "*)"
-      { let loc = Location.curr lexbuf in
-        Location.prerr_warning loc Warnings.Comment_not_end;
-        lexbuf.Lexing.lex_curr_pos <- lexbuf.Lexing.lex_curr_pos - 1;
-        let curpos = lexbuf.lex_curr_p in
-        lexbuf.lex_curr_p <- { curpos with pos_cnum = curpos.pos_cnum - 1 };
-        STAR
-      }
-  | ("#" [' ' '\t']* (['0'-'9']+ as num) [' ' '\t']*
-        ("\"" ([^ '\010' '\013' '\"' ] * as name) "\"")?) as directive
-        [^ '\010' '\013'] * newline
-      {
-        match int_of_string num with
-        | exception _ ->
-            (* PR#7165 *)
-            let loc = Location.curr lexbuf in
-            let explanation = "line number out of range" in
-            let error = Invalid_directive (directive, Some explanation) in
-            raise (Error (error, loc))
-        | line_num ->
-           (* Documentation says that the line number should be
-              positive, but we have never guarded against this and it
-              might have useful hackish uses. *)
-            update_loc lexbuf name line_num true 0;
-            token lexbuf
-      }
-  | "#"  { HASH }
-  | "&"  { AMPERSAND }
-  | "&&" { AMPERAMPER }
-  | "`"  { BACKQUOTE }
-  | "\'" { QUOTE }
-  | "("  { LPAREN }
-  | ")"  { RPAREN }
-  | "*"  { STAR }
-  | ","  { COMMA }
-  | "->" { MINUSGREATER }
-  | "."  { DOT }
-  | ".." { DOTDOT }
-  | "." (dotsymbolchar symbolchar* as s) { DOTOP s }
-  | ":"  { COLON }
-  | "::" { COLONCOLON }
-  | ":=" { COLONEQUAL }
-  | ":>" { COLONGREATER }
-  | ";"  { SEMI }
-  | ";;" { SEMISEMI }
-  | "<"  { LESS }
-  | "<-" { LESSMINUS }
-  | "="  { EQUAL }
-  | "["  { LBRACKET }
-  | "[|" { LBRACKETBAR }
-  | "[<" { LBRACKETLESS }
-  | "[>" { LBRACKETGREATER }
-  | "]"  { RBRACKET }
-  | "{"  { LBRACE }
-  | "{<" { LBRACELESS }
-  | "|"  { BAR }
-  | "||" { BARBAR }
-  | "|]" { BARRBRACKET }
-  | ">"  { GREATER }
-  | ">]" { GREATERRBRACKET }
-  | "}"  { RBRACE }
-  | ">}" { GREATERRBRACE }
-  | "[@" { LBRACKETAT }
-  | "[@@"  { LBRACKETATAT }
-  | "[@@@" { LBRACKETATATAT }
-  | "[%"   { LBRACKETPERCENT }
-  | "[%%"  { LBRACKETPERCENTPERCENT }
-  | "!"  { BANG }
-  | "!=" { INFIXOP0 "!=" }
-  | "+"  { PLUS }
-  | "+." { PLUSDOT }
-  | "+=" { PLUSEQ }
-  | "-"  { MINUS }
-  | "-." { MINUSDOT }
-
-  | "!" symbolchar +
-            { PREFIXOP(Lexing.lexeme lexbuf) }
-  | ['~' '?'] symbolchar +
-            { PREFIXOP(Lexing.lexeme lexbuf) }
-  | ['=' '<' '>' '|' '&' '$'] symbolchar *
-            { INFIXOP0(Lexing.lexeme lexbuf) }
-  | ['@' '^'] symbolchar *
-            { INFIXOP1(Lexing.lexeme lexbuf) }
-  | ['+' '-'] symbolchar *
-            { INFIXOP2(Lexing.lexeme lexbuf) }
-  | "**" symbolchar *
-            { INFIXOP4(Lexing.lexeme lexbuf) }
-  | '%'     { PERCENT }
-  | ['*' '/' '%'] symbolchar *
-            { INFIXOP3(Lexing.lexeme lexbuf) }
-  | '#' (symbolchar | '#') +
-            { HASHOP(Lexing.lexeme lexbuf) }
-  | eof { Rescript_cpp.eof_check lexbuf; EOF}
-  | _
-      { raise (Error(Illegal_character (Lexing.lexeme_char lexbuf 0),
-                     Location.curr lexbuf))
-      }
-
-and comment = parse
-    "(*"
-      { comment_start_loc := (Location.curr lexbuf) :: !comment_start_loc;
-        store_lexeme lexbuf;
-        comment lexbuf
-      }
-  | "*)"
-      { match !comment_start_loc with
-        | [] -> assert false
-        | [_] -> comment_start_loc := []; Location.curr lexbuf
-        | _ :: l -> comment_start_loc := l;
-                  store_lexeme lexbuf;
-                  comment lexbuf
-       }
-  | "\""
-      {
-        string_start_loc := Location.curr lexbuf;
-        store_string_char '\"';
-        is_in_string := true;
-        begin try string lexbuf
-        with Error (Unterminated_string, str_start) ->
-          match !comment_start_loc with
-          | [] -> assert false
-          | loc :: _ ->
-            let start = List.hd (List.rev !comment_start_loc) in
-            comment_start_loc := [];
-            raise (Error (Unterminated_string_in_comment (start, str_start),
-                          loc))
-        end;
-        is_in_string := false;
-        store_string_char '\"';
-        comment lexbuf }
-  | "{" lowercase* "|"
-      {
-        let delim = Lexing.lexeme lexbuf in
-        let delim = String.sub delim 1 (String.length delim - 2) in
-        string_start_loc := Location.curr lexbuf;
-        store_lexeme lexbuf;
-        is_in_string := true;
-        begin try quoted_string delim lexbuf
-        with Error (Unterminated_string, str_start) ->
-          match !comment_start_loc with
-          | [] -> assert false
-          | loc :: _ ->
-            let start = List.hd (List.rev !comment_start_loc) in
-            comment_start_loc := [];
-            raise (Error (Unterminated_string_in_comment (start, str_start),
-                          loc))
-        end;
-        is_in_string := false;
-        store_string_char '|';
-        store_string delim;
-        store_string_char '}';
-        comment lexbuf }
-
-  | "\'\'"
-      { store_lexeme lexbuf; comment lexbuf }
-  | "\'" newline "\'"
-      { update_loc lexbuf None 1 false 1;
-        store_lexeme lexbuf;
-        comment lexbuf
-      }
-  | "\'" [^ '\\' '\'' '\010' '\013' ] "\'"
-      { store_lexeme lexbuf; comment lexbuf }
-  | "\'\\" ['\\' '\"' '\'' 'n' 't' 'b' 'r' ' '] "\'"
-      { store_lexeme lexbuf; comment lexbuf }
-  | "\'\\" ['0'-'9'] ['0'-'9'] ['0'-'9'] "\'"
-      { store_lexeme lexbuf; comment lexbuf }
-  | "\'\\" 'x' ['0'-'9' 'a'-'f' 'A'-'F'] ['0'-'9' 'a'-'f' 'A'-'F'] "\'"
-      { store_lexeme lexbuf; comment lexbuf }
-  | eof
-      { match !comment_start_loc with
-        | [] -> assert false
-        | loc :: _ ->
-          let start = List.hd (List.rev !comment_start_loc) in
-          comment_start_loc := [];
-          raise (Error (Unterminated_comment start, loc))
-      }
-  | newline
-      { update_loc lexbuf None 1 false 0;
-        store_lexeme lexbuf;
-        comment lexbuf
-      }
-  | _
-      { store_lexeme lexbuf; comment lexbuf }
-
-and string = parse
-    '\"'
-      { () }
-  | '\\' newline ([' ' '\t'] * as space)
-      { update_loc lexbuf None 1 false (String.length space);
-        if in_comment () then store_lexeme lexbuf;
-        string lexbuf
-      }
-  | '\\' ['\\' '\'' '\"' 'n' 't' 'b' 'r' ' ']
-      { store_escaped_char lexbuf
-                           (char_for_backslash(Lexing.lexeme_char lexbuf 1));
-        string lexbuf }
-  | '\\' ['0'-'9'] ['0'-'9'] ['0'-'9']
-      { store_escaped_char lexbuf (char_for_decimal_code lexbuf 1);
-         string lexbuf }
-  | '\\' 'o' ['0'-'3'] ['0'-'7'] ['0'-'7']
-      { store_escaped_char lexbuf (char_for_octal_code lexbuf 2);
-         string lexbuf }
-  | '\\' 'x' ['0'-'9' 'a'-'f' 'A'-'F'] ['0'-'9' 'a'-'f' 'A'-'F']
-      { store_escaped_char lexbuf (char_for_hexadecimal_code lexbuf 2);
-         string lexbuf }
-  | '\\' 'u' '{' hex_digit+ '}'
-        { store_escaped_uchar lexbuf (uchar_for_uchar_escape lexbuf);
-          string lexbuf }
-  | '\\' _
-      { if not (in_comment ()) then begin
-(*  Should be an error, but we are very lax.
-          raise (Error (Illegal_escape (Lexing.lexeme lexbuf),
-                        Location.curr lexbuf))
-*)
-          let loc = Location.curr lexbuf in
-          Location.prerr_warning loc Warnings.Illegal_backslash;
-        end;
-        store_lexeme lexbuf;
-        string lexbuf
-      }
-  | newline
-      { if not (in_comment ()) then
-          Location.prerr_warning (Location.curr lexbuf) Warnings.Eol_in_string;
-        update_loc lexbuf None 1 false 0;
-        store_lexeme lexbuf;
-        string lexbuf
-      }
-  | eof
-      { is_in_string := false;
-        raise (Error (Unterminated_string, !string_start_loc)) }
-  | _
-      { store_string_char(Lexing.lexeme_char lexbuf 0);
-        string lexbuf }
-
-and quoted_string delim = parse
-  | newline
-      { update_loc lexbuf None 1 false 0;
-        store_lexeme lexbuf;
-        quoted_string delim lexbuf
-      }
-  | eof
-      { is_in_string := false;
-        raise (Error (Unterminated_string, !string_start_loc)) }
-  | "|" lowercase* "}"
-      {
-        let edelim = Lexing.lexeme lexbuf in
-        let edelim = String.sub edelim 1 (String.length edelim - 2) in
-        if delim = edelim then ()
-        else (store_lexeme lexbuf; quoted_string delim lexbuf)
-      }
-  | _
-      { store_string_char(Lexing.lexeme_char lexbuf 0);
-        quoted_string delim lexbuf }
-
-and skip_hash_bang = parse
-  | "#!" [^ '\n']* '\n' [^ '\n']* "\n!#\n"
-       { update_loc lexbuf None 3 false 0 }
-  | "#!" [^ '\n']* '\n'
-       { update_loc lexbuf None 1 false 0 }
-  | "" { () }
-
-{
-  let token_with_comments lexbuf =
-    match !preprocessor with
-    | None -> token lexbuf
-    | Some (_init, preprocess) -> preprocess token lexbuf
-
-  type newline_state =
-    | NoLine (* There have been no blank lines yet. *)
-    | NewLine
-        (* There have been no blank lines, and the previous
-           token was a newline. *)
-    | BlankLine (* There have been blank lines. *)
-
-  type doc_state =
-    | Initial  (* There have been no docstrings yet *)
-    | After of docstring list
-        (* There have been docstrings, none of which were
-           preceded by a blank line *)
-    | Before of docstring list * docstring list * docstring list
-        (* There have been docstrings, some of which were
-           preceded by a blank line *)
-
-  and docstring = Docstrings.docstring
-
-  let token lexbuf =
-    let post_pos = lexeme_end_p lexbuf in
-    let attach lines docs pre_pos =
-      let open Docstrings in
-        match docs, lines with
-        | Initial, _ -> ()
-        | After a, (NoLine | NewLine) ->
-            set_post_docstrings post_pos (List.rev a);
-            set_pre_docstrings pre_pos a;
-        | After a, BlankLine ->
-            set_post_docstrings post_pos (List.rev a);
-            set_pre_extra_docstrings pre_pos (List.rev a)
-        | Before(a, f, b), (NoLine | NewLine) ->
-            set_post_docstrings post_pos (List.rev a);
-            set_post_extra_docstrings post_pos
-              (List.rev_append f (List.rev b));
-            set_floating_docstrings pre_pos (List.rev f);
-            set_pre_extra_docstrings pre_pos (List.rev a);
-            set_pre_docstrings pre_pos b
-        | Before(a, f, b), BlankLine ->
-            set_post_docstrings post_pos (List.rev a);
-            set_post_extra_docstrings post_pos
-              (List.rev_append f (List.rev b));
-            set_floating_docstrings pre_pos
-              (List.rev_append f (List.rev b));
-            set_pre_extra_docstrings pre_pos (List.rev a)
-    in
-    let rec loop lines docs lexbuf =
-      match token_with_comments lexbuf with
-      | COMMENT (s, loc) ->
-          add_comment (s, loc);
-          let lines' =
-            match lines with
-            | NoLine -> NoLine
-            | NewLine -> NoLine
-            | BlankLine -> BlankLine
-          in
-          loop lines' docs lexbuf
-      | EOL ->
-          let lines' =
-            match lines with
-            | NoLine -> NewLine
-            | NewLine -> BlankLine
-            | BlankLine -> BlankLine
-          in
-          loop lines' docs lexbuf
-      | HASH when Rescript_cpp.at_bol lexbuf -> 
-          Rescript_cpp.interpret_directive lexbuf 
-            ~cont:(fun lexbuf -> loop lines docs lexbuf)
-            ~token_with_comments
-      | DOCSTRING doc ->
-          Docstrings.register doc;
-          add_docstring_comment doc;
-          let docs' =
-            if Docstrings.docstring_body doc = "/*" then
-              match docs with
-              | Initial -> Before([], [doc], [])
-              | After a -> Before (a, [doc], [])
-              | Before(a, f, b) -> Before(a, doc :: b @ f, [])
-            else
-              match docs, lines with
-              | Initial, (NoLine | NewLine) -> After [doc]
-              | Initial, BlankLine -> Before([], [], [doc])
-              | After a, (NoLine | NewLine) -> After (doc :: a)
-              | After a, BlankLine -> Before (a, [], [doc])
-              | Before(a, f, b), (NoLine | NewLine) -> Before(a, f, doc :: b)
-              | Before(a, f, b), BlankLine -> Before(a, b @ f, [doc])
-          in
-          loop NoLine docs' lexbuf
-      | tok ->
-          attach lines docs (lexeme_start_p lexbuf);
-          tok
-    in
-    Rescript_cpp.check_sharp_look_ahead (fun _ -> loop NoLine Initial lexbuf)
-
-  let init () =
-    Rescript_cpp.init ();
-    is_in_string := false;
-    comment_start_loc := [];
-    comment_list := [];
-    match !preprocessor with
-    | None -> ()
-    | Some (init, _preprocess) -> init ()
-
-
-  let set_preprocessor init preprocess =
-    escaped_newlines := true;
-    preprocessor := Some (init, preprocess)
-
-}
diff --git a/jscomp/ml/location.ml b/jscomp/ml/location.ml
deleted file mode 100644
index 561a045..0000000
--- a/jscomp/ml/location.ml
+++ /dev/null
@@ -1,409 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Lexing
-
-let absname = ref false
-    (* This reference should be in Clflags, but it would create an additional
-       dependency and make bootstrapping Camlp4 more difficult. *)
-
-type t = Warnings.loc = { loc_start: position; loc_end: position; loc_ghost: bool };;
-
-let in_file name =
-  let loc = {
-    pos_fname = name;
-    pos_lnum = 1;
-    pos_bol = 0;
-    pos_cnum = -1;
-  } in
-  { loc_start = loc; loc_end = loc; loc_ghost = true }
-;;
-
-let none = in_file "_none_";;
-
-let curr lexbuf = {
-  loc_start = lexbuf.lex_start_p;
-  loc_end = lexbuf.lex_curr_p;
-  loc_ghost = false
-};;
-
-let init lexbuf fname =
-  lexbuf.lex_curr_p <- {
-    pos_fname = fname;
-    pos_lnum = 1;
-    pos_bol = 0;
-    pos_cnum = 0;
-  }
-;;
-
-let symbol_rloc () = {
-  loc_start = Parsing.symbol_start_pos ();
-  loc_end = Parsing.symbol_end_pos ();
-  loc_ghost = false;
-};;
-
-let symbol_gloc () = {
-  loc_start = Parsing.symbol_start_pos ();
-  loc_end = Parsing.symbol_end_pos ();
-  loc_ghost = true;
-};;
-
-let rhs_loc n = {
-  loc_start = Parsing.rhs_start_pos n;
-  loc_end = Parsing.rhs_end_pos n;
-  loc_ghost = false;
-};;
-
-let input_name = ref "_none_"
-let input_lexbuf = ref (None : lexbuf option)
-let set_input_name name =
-  if name <> "" then input_name := name
-(* Terminal info *)
-
-
-
-let num_loc_lines = ref 0 (* number of lines already printed after input *)
-
-(* Print the location in some way or another *)
-
-open Format
-
-let absolute_path s = (* This function could go into Filename *)
-  let open Filename in
-  let s = if is_relative s then concat (Sys.getcwd ()) s else s in
-  (* Now simplify . and .. components *)
-  let rec aux s =
-    let base = basename s in
-    let dir = dirname s in
-    if dir = s then dir
-    else if base = current_dir_name then aux dir
-    else if base = parent_dir_name then dirname (aux dir)
-    else concat (aux dir) base
-  in
-  aux s
-
-let show_filename file =
-  let file = if file = "_none_"  then !input_name else file in 
-  if !absname then absolute_path file else file
-
-let print_filename ppf file =
-  Format.fprintf ppf "%s" (show_filename file)
-
-let reset () =
-  num_loc_lines := 0
-
-(* return file, line, char from the given position *)
-let get_pos_info pos =
-  (pos.pos_fname, pos.pos_lnum, pos.pos_cnum - pos.pos_bol)
-;;
-
-let setup_colors () =
-  Misc.Color.setup !Clflags.color;
-  Code_frame.setup !Clflags.color
-
-(* ocaml's reported line/col numbering is horrible and super error-prone
-   when being handled programmatically (or humanly for that matter. If you're
-   an ocaml contributor reading this: who the heck reads the character count
-   starting from the first erroring character?) *)
-let normalize_range loc =
-  (* TODO: lots of the handlings here aren't needed anymore because the new
-  rescript syntax has much stronger invariants regarding positions, e.g.
-  no -1 *)
-  let (_, start_line, start_char) = get_pos_info loc.loc_start in
-  let (_, end_line, end_char) = get_pos_info loc.loc_end in
-  (* line is 1-indexed, column is 0-indexed. We convert all of them to 1-indexed to avoid confusion *)
-  (* start_char is inclusive, end_char is exclusive *)
-  if start_char == -1 || end_char == -1 then
-    (* happens sometimes. Syntax error for example *)
-    None
-  else if start_line = end_line && start_char >= end_char then
-    (* in some errors, starting char and ending char can be the same. But
-      since ending char was supposed to be exclusive, here it might end up
-      smaller than the starting char if we naively did start_char + 1 to
-      just the starting char and forget ending char *)
-    let same_char = start_char + 1 in
-    Some ((start_line, same_char), (end_line, same_char))
-  else
-    (* again: end_char is exclusive, so +1-1=0 *)
-    Some ((start_line, start_char + 1), (end_line, end_char))
-
-let print_loc ppf (loc : t) =
-  setup_colors ();
-  let normalized_range = normalize_range loc in
-  let dim_loc ppf = function
-    | None -> ()
-    | Some ((start_line, start_line_start_char), (end_line, end_line_end_char)) ->
-      if start_line = end_line then
-        if start_line_start_char = end_line_end_char then
-          fprintf ppf ":@{<dim>%i:%i@}" start_line start_line_start_char
-        else
-          fprintf ppf ":@{<dim>%i:%i-%i@}" start_line start_line_start_char end_line_end_char
-      else
-        fprintf ppf ":@{<dim>%i:%i-%i:%i@}" start_line start_line_start_char end_line end_line_end_char
-  in
-  fprintf ppf "@{<filename>%a@}%a" print_filename loc.loc_start.pos_fname dim_loc normalized_range
-;;
-
-let print ?(src = None) ~message_kind intro ppf (loc : t) =
-  begin match message_kind with
-    | `warning -> fprintf ppf "@[@{<info>%s@}@]@," intro
-    | `warning_as_error -> fprintf ppf "@[@{<error>%s@} (configured as error) @]@," intro
-    | `error -> fprintf ppf "@[@{<error>%s@}@]@," intro
-  end;
-  (* ocaml's reported line/col numbering is horrible and super error-prone
-     when being handled programmatically (or humanly for that matter. If you're
-     an ocaml contributor reading this: who the heck reads the character count
-     starting from the first erroring character?) *)
-  let (file, start_line, start_char) = get_pos_info loc.loc_start in
-  let (_, end_line, end_char) = get_pos_info loc.loc_end in
-  (* line is 1-indexed, column is 0-indexed. We convert all of them to 1-indexed to avoid confusion *)
-  (* start_char is inclusive, end_char is exclusive *)
-  let normalizedRange =
-    (* TODO: lots of the handlings here aren't needed anymore because the new
-      rescript syntax has much stronger invariants regarding positions, e.g.
-      no -1 *)
-    if start_char == -1 || end_char == -1 then
-      (* happens sometimes. Syntax error for example *)
-      None
-    else if start_line = end_line && start_char >= end_char then
-      (* in some errors, starting char and ending char can be the same. But
-         since ending char was supposed to be exclusive, here it might end up
-         smaller than the starting char if we naively did start_char + 1 to
-         just the starting char and forget ending char *)
-      let same_char = start_char + 1 in
-      Some ((start_line, same_char), (end_line, same_char))
-    else
-      (* again: end_char is exclusive, so +1-1=0 *)
-      Some ((start_line, start_char + 1), (end_line, end_char))
-  in
-  fprintf ppf "  @[%a@]@," print_loc loc;
-  match normalizedRange with
-  | None -> ()
-  | Some _ -> begin
-      try
-        (* Print a syntax error that is a list of Res_diagnostics.t.
-           Instead of reading file for every error, it uses the source that the parser already has. *)
-        let src = match src with
-        | Some src -> src
-        | None -> Ext_io.load_file file
-        in
-        (* we're putting the line break `@,` here rather than above, because this
-           branch might not be reached (aka no inline file content display) so
-           we don't wanna end up with two line breaks in the the consequent *)
-        fprintf ppf "@,%s"
-          (Code_frame.print
-            ~is_warning:(message_kind=`warning)
-            ~src
-            ~startPos:loc.loc_start
-            ~endPos:loc.loc_end
-          )
-      with
-      (* this might happen if the file is e.g. "", "_none_" or any of the fake file name placeholders.
-         we've already printed the location above, so nothing more to do here. *)
-      | Sys_error _ -> ()
-    end
-;;
-
-let error_prefix = "Error"
-
-let print_error_prefix ppf =
-  setup_colors ();
-  fprintf ppf "@{<error>%s@}" error_prefix;
-;;
-
-let print_compact ppf loc =
-  begin
-    let (file, line, startchar) = get_pos_info loc.loc_start in
-    let endchar = loc.loc_end.pos_cnum - loc.loc_start.pos_cnum + startchar in
-    fprintf ppf "%a:%i" print_filename file line;
-    if startchar >= 0 then fprintf ppf ",%i--%i" startchar endchar
-  end
-;;
-
-let print_error intro ppf loc =
-  fprintf ppf "%a%t:" (print ~message_kind:`error intro) loc print_error_prefix;
-;;
-
-let default_warning_printer loc ppf w =
-  match Warnings.report w with
-  | `Inactive -> ()
-  | `Active { Warnings. number = _; message = _; is_error; sub_locs = _} ->
-    setup_colors ();
-    let message_kind = if is_error then `warning_as_error else `warning in
-    Format.fprintf ppf "@[<v>@,  %a@,  %s@,@]@."
-      (print ~message_kind ("Warning number " ^ (Warnings.number w |> string_of_int)))
-      loc
-      (Warnings.message w);
-    (* at this point, you can display sub_locs too, from e.g. https://github.com/ocaml/ocaml/commit/f6d53cc38f87c67fbf49109f5fb79a0334bab17a
-       but we won't bother for now *)
-;;
-
-let warning_printer = ref default_warning_printer ;;
-
-let print_warning loc ppf w = 
-  !warning_printer loc ppf w  
-;;
-
-let formatter_for_warnings = ref err_formatter;;
-let prerr_warning loc w = 
-    print_warning loc !formatter_for_warnings w;;
-
-let echo_eof () =
-  print_newline ();
-  incr num_loc_lines
-
-type 'a loc = {
-  txt : 'a;
-  loc : t;
-}
-
-let mkloc txt loc = { txt ; loc }
-let mknoloc txt = mkloc txt none
-
-
-type error =
-  {
-    loc: t;
-    msg: string;
-    sub: error list;
-    if_highlight: string; (* alternative message if locations are highlighted *)
-  }
-
-let pp_ksprintf ?before k fmt =
-  let buf = Buffer.create 64 in
-  let ppf = Format.formatter_of_buffer buf in
-  Misc.Color.set_color_tag_handling ppf;
-  begin match before with
-    | None -> ()
-    | Some f -> f ppf
-  end;
-  kfprintf
-    (fun _ ->
-      pp_print_flush ppf ();
-      let msg = Buffer.contents buf in
-      k msg)
-    ppf fmt
-
-(* taken from https://github.com/rescript-lang/ocaml/blob/d4144647d1bf9bc7dc3aadc24c25a7efa3a67915/parsing/location.ml#L354 *)
-(* Shift the formatter's offset by the length of the error prefix, which
-   is always added by the compiler after the message has been formatted *)
-let print_phanton_error_prefix ppf =
-  (* modified from the original. We use only 2 indentations for error report
-     (see super_error_reporter above) *)
-  Format.pp_print_as ppf 2 ""
-
-let errorf ?(loc = none) ?(sub = []) ?(if_highlight = "") fmt =
-  pp_ksprintf
-    ~before:print_phanton_error_prefix
-    (fun msg -> {loc; msg; sub; if_highlight})
-    fmt
-
-let error ?(loc = none) ?(sub = []) ?(if_highlight = "") msg =
-  {loc; msg; sub; if_highlight}
-
-let error_of_exn : (exn -> error option) list ref = ref []
-
-let register_error_of_exn f = error_of_exn := f :: !error_of_exn
-
-exception Already_displayed_error = Warnings.Errors
-
-let error_of_exn exn =
-  match exn with
-  | Already_displayed_error -> Some `Already_displayed
-  | _ ->
-     let rec loop = function
-       | [] -> None
-       | f :: rest ->
-          match f exn with
-          | Some error -> Some (`Ok error)
-          | None -> loop rest
-     in
-     loop !error_of_exn
-
-(* taken from https://github.com/rescript-lang/ocaml/blob/d4144647d1bf9bc7dc3aadc24c25a7efa3a67915/parsing/location.ml#L380 *)
-(* This is the error report entry point. We'll replace the default reporter with this one. *)
-let rec default_error_reporter ?(src = None) ppf ({loc; msg; sub}) =
-  setup_colors ();
-  (* open a vertical box. Everything in our message is indented 2 spaces *)
-  (* If src is given, it will display a syntax error after parsing. *)
-  let intro = match src with
-  | Some _ -> "Syntax error!"
-  | None -> "We've found a bug for you!"
-  in
-  Format.fprintf ppf "@[<v>@,  %a@,  %s@,@]" (print ~src ~message_kind:`error intro) loc msg;
-  List.iter (Format.fprintf ppf "@,@[%a@]" (default_error_reporter ~src)) sub
-(* no need to flush here; location's report_exception (which uses this ultimately) flushes *)
-    
-let error_reporter = ref default_error_reporter
-
-let report_error ?(src = None) ppf err =
-   !error_reporter ~src ppf err
-;;
-
-let error_of_printer loc print x =
-  errorf ~loc "%a@?" print x
-
-let error_of_printer_file print x =
-  error_of_printer (in_file !input_name) print x
-
-let () =
-  register_error_of_exn
-    (function
-      | Sys_error msg ->
-          Some (errorf ~loc:(in_file !input_name)
-                "I/O error: %s" msg)
-
-      | Misc.HookExnWrapper {error = e; hook_name;
-                             hook_info={Misc.sourcefile}} ->
-          let sub = match error_of_exn e with
-            | None | Some `Already_displayed -> error (Printexc.to_string e)
-            | Some (`Ok err) -> err
-          in
-          Some
-            (errorf ~loc:(in_file sourcefile)
-               "In hook %S:" hook_name
-               ~sub:[sub])
-      | _ -> None
-    )
-
-external reraise : exn -> 'a = "%reraise"
-
-let rec report_exception_rec n ppf exn =
-  try
-    match error_of_exn exn with
-    | None -> reraise exn
-    | Some `Already_displayed -> ()
-    | Some (`Ok err) -> fprintf ppf "@[%a@]@." (report_error ~src:None) err
-  with exn when n > 0 -> report_exception_rec (n-1) ppf exn
-
-let report_exception ppf exn = report_exception_rec 5 ppf exn
-
-
-exception Error of error
-
-let () =
-  register_error_of_exn
-    (function
-      | Error e -> Some e
-      | _ -> None
-    )
-
-let raise_errorf ?(loc = none) ?(sub = []) ?(if_highlight = "") =
-  pp_ksprintf
-    ~before:print_phanton_error_prefix
-    (fun msg -> raise (Error ({loc; msg; sub; if_highlight})))
-
-let deprecated ?(def = none) ?(use = none) loc msg =
-  prerr_warning loc (Warnings.Deprecated (msg, def, use))
diff --git a/jscomp/ml/location.mli b/jscomp/ml/location.mli
deleted file mode 100644
index e0f91d4..0000000
--- a/jscomp/ml/location.mli
+++ /dev/null
@@ -1,145 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Source code locations (ranges of positions), used in parsetree. *)
-
-open Format
-
-type t = Warnings.loc = {
-  loc_start: Lexing.position;
-  loc_end: Lexing.position;
-  loc_ghost: bool;
-}
-
-(** Note on the use of Lexing.position in this module.
-   If [pos_fname = ""], then use [!input_name] instead.
-   If [pos_lnum = -1], then [pos_bol = 0]. Use [pos_cnum] and
-     re-parse the file to get the line and character numbers.
-   Else all fields are correct.
-*)
-
-val none : t
-(** An arbitrary value of type [t]; describes an empty ghost range. *)
-
-val in_file : string -> t
-(** Return an empty ghost range located in a given file. *)
-
-val init : Lexing.lexbuf -> string -> unit
-(** Set the file name and line number of the [lexbuf] to be the start
-    of the named file. *)
-
-val curr : Lexing.lexbuf -> t
-(** Get the location of the current token from the [lexbuf]. *)
-
-val symbol_rloc: unit -> t
-val symbol_gloc: unit -> t
-
-(** [rhs_loc n] returns the location of the symbol at position [n], starting
-  at 1, in the current parser rule. *)
-val rhs_loc: int -> t
-
-val input_name: string ref
-val set_input_name: string -> unit 
-val input_lexbuf: Lexing.lexbuf option ref
-
-val get_pos_info: Lexing.position -> string * int * int (* file, line, char *)
-val print_loc: formatter -> t -> unit
-val print_error: tag -> formatter -> t -> unit
-
-val prerr_warning: t -> Warnings.t -> unit
-val echo_eof: unit -> unit
-val reset: unit -> unit
-
-val warning_printer : (t -> formatter -> Warnings.t -> unit) ref
-(** Hook for intercepting warnings. *)
-
-val formatter_for_warnings : formatter ref
-
-val default_warning_printer : t -> formatter -> Warnings.t -> unit
-(** Original warning printer for use in hooks. *)
-
-type 'a loc = {
-  txt : 'a;
-  loc : t;
-}
-
-val mknoloc : 'a -> 'a loc
-val mkloc : 'a -> t -> 'a loc
-
-val print: ?src:string option -> message_kind:[< `error | `warning | `warning_as_error > `warning] -> string -> formatter -> t -> unit
-val print_compact: formatter -> t -> unit
-val print_filename: formatter -> string -> unit
-
-val absolute_path: string -> string
-
-val show_filename: string -> string
-    (** In -absname mode, return the absolute path for this filename.
-        Otherwise, returns the filename unchanged. *)
-
-
-val absname: bool ref
-
-(** Support for located errors *)
-
-type error =
-  {
-    loc: t;
-    msg: string;
-    sub: error list;
-    if_highlight: string; (* alternative message if locations are highlighted *)
-  }
-
-exception Already_displayed_error
-exception Error of error
-
-val error: ?loc:t -> ?sub:error list -> ?if_highlight:string -> string -> error
-
-
-val print_error_prefix : Format.formatter -> unit
-val pp_ksprintf : ?before:(formatter -> unit) -> (string -> 'a) -> ('b, formatter, unit, 'a) format4 -> 'b 
-
-
-val errorf: ?loc:t -> ?sub:error list -> ?if_highlight:string
-            -> ('a, Format.formatter, unit, error) format4 -> 'a
-
-val raise_errorf: ?loc:t -> ?sub:error list -> ?if_highlight:string
-            -> ('a, Format.formatter, unit, 'b) format4 -> 'a
-
-val error_of_printer: t -> (formatter -> 'a -> unit) -> 'a -> error
-
-val error_of_printer_file: (formatter -> 'a -> unit) -> 'a -> error
-
-val error_of_exn: exn -> [ `Ok of error | `Already_displayed ] option
-
-val register_error_of_exn: (exn -> error option) -> unit
-(** Each compiler module which defines a custom type of exception
-    which can surface as a user-visible error should register
-    a "printer" for this exception using [register_error_of_exn].
-    The result of the printer is an [error] value containing
-    a location, a message, and optionally sub-messages (each of them
-    being located as well). *)
-
-val report_error: ?src:string option -> formatter -> error -> unit
-
-val error_reporter : (?src:string option -> formatter -> error -> unit) ref
-(** Hook for intercepting error reports. *)
-
-val default_error_reporter : ?src:string option -> formatter -> error -> unit
-(** Original error reporter for use in hooks. *)
-
-val report_exception: formatter -> exn -> unit
-(** Reraise the exception if it is unknown. *)
-
-val deprecated: ?def:t -> ?use:t -> t -> string -> unit
diff --git a/jscomp/ml/longident.ml b/jscomp/ml/longident.ml
deleted file mode 100644
index acae9a6..0000000
--- a/jscomp/ml/longident.ml
+++ /dev/null
@@ -1,63 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-type t =
-    Lident of string
-  | Ldot of t * string
-  | Lapply of t * t
-let rec cmp : t -> t -> int =
- fun a b ->
-  if a == b then 0
-  else
-    match (a, b) with
-    | Lident a, Lident b -> compare a b
-    | Lident _, _ -> -1
-    | _, Lident _ -> 1
-    | Ldot (a, b), Ldot (c, d) -> (
-        match cmp a c with 0 -> compare b d | n -> n)
-    | Ldot _, _ -> -1
-    | _, Ldot _ -> 1
-    | Lapply (a, b), Lapply (c, d) -> (
-        match cmp a c with 0 -> cmp b d | n -> n)
-
-let rec flat accu = function
-    Lident s -> s :: accu
-  | Ldot(lid, s) -> flat (s :: accu) lid
-  | Lapply(_, _) -> Misc.fatal_error "Longident.flat"
-
-let flatten lid = flat [] lid
-
-let last = function
-    Lident s -> s
-  | Ldot(_, s) -> s
-  | Lapply(_, _) -> Misc.fatal_error "Longident.last"
-
-let rec split_at_dots s pos =
-  try
-    let dot = String.index_from s pos '.' in
-    String.sub s pos (dot - pos) :: split_at_dots s (dot + 1)
-  with Not_found ->
-    [String.sub s pos (String.length s - pos)]
-
-let unflatten l =
-  match l with
-  | [] -> None
-  | hd :: tl -> Some (List.fold_left (fun p s -> Ldot(p, s)) (Lident hd) tl)
-
-let parse s =
-  match unflatten (split_at_dots s 0) with
-  | None -> Lident ""  (* should not happen, but don't put assert false
-                          so as not to crash the toplevel (see Genprintval) *)
-  | Some v -> v
diff --git a/jscomp/ml/matching.ml b/jscomp/ml/matching.ml
deleted file mode 100644
index ff213fa..0000000
--- a/jscomp/ml/matching.ml
+++ /dev/null
@@ -1,3238 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Compilation of pattern matching *)
-
-open Misc
-open Asttypes
-open Types
-open Typedtree
-open Lambda
-open Parmatch
-open Printf
-
-
-let dbg = false
-
-(*  See Peyton-Jones, ``The Implementation of functional programming
-    languages'', chapter 5. *)
-(*
-  Well, it was true at the beginning of the world.
-  Now, see Lefessant-Maranget ``Optimizing Pattern-Matching'' ICFP'2001
-*)
-
-(*
-   Compatibility predicate that considers potential rebindings of constructors
-   of an extension type.
-
-   "may_compat p q" returns false when p and q never admit a common instance;
-   returns true when they may have a common instance.
-*)
-
-module MayCompat =
-  Parmatch.Compat (struct let equal = Types.may_equal_constr end)
-let may_compat = MayCompat.compat
-and may_compats = MayCompat.compats
-
-(*
-   Many functions on the various data structures of the algorithm :
-     - Pattern matrices.
-     - Default environments: mapping from matrices to exit numbers.
-     - Contexts:  matrices whose column are partitioned into
-       left and right.
-     - Jump summaries: mapping from exit numbers to contexts
-*)
-
-
-let string_of_lam lam =
-  Printlambda.lambda Format.str_formatter lam ;
-  Format.flush_str_formatter ()
-
-type matrix = pattern list list
-
-let add_omega_column pss = List.map (fun ps -> omega::ps) pss
-
-type ctx = {left:pattern list ; right:pattern list}
-
-let pretty_ctx ctx =
-  List.iter
-    (fun {left=left ; right=right} ->
-      prerr_string "LEFT:" ;
-      pretty_line left ;
-      prerr_string " RIGHT:" ;
-      pretty_line right ;
-      prerr_endline "")
-    ctx
-
-let le_ctx c1 c2 =
-  le_pats c1.left c2.left &&
-  le_pats c1.right c2.right
-
-let lshift {left=left ; right=right} = match right with
-| x::xs -> {left=x::left ; right=xs}
-| _ ->  assert false
-
-let lforget {left=left ; right=right} = match right with
-| _::xs -> {left=omega::left ; right=xs}
-|  _ -> assert false
-
-let rec small_enough n = function
-  | [] -> true
-  | _::rem ->
-      if n <= 0 then false
-      else small_enough (n-1) rem
-
-let ctx_lshift ctx =
-  if small_enough 31 ctx then
-    List.map lshift ctx
-  else (* Context pruning *) begin
-    get_mins le_ctx (List.map lforget ctx)
-  end
-
-let  rshift {left=left ; right=right} = match left with
-| p::ps -> {left=ps ; right=p::right}
-| _ -> assert false
-
-let ctx_rshift ctx = List.map rshift ctx
-
-let rec nchars n ps =
-  if n <= 0 then [],ps
-  else match ps with
-  | p::rem ->
-    let chars, cdrs = nchars (n-1) rem in
-    p::chars,cdrs
-  | _ -> assert false
-
-let  rshift_num n {left=left ; right=right} =
-  let shifted,left = nchars n left in
-  {left=left ; right = shifted@right}
-
-let ctx_rshift_num n ctx = List.map (rshift_num n) ctx
-
-(* Recombination of contexts (eg: (_,_)::p1::p2::rem ->  (p1,p2)::rem)
-  All mutable fields are replaced by '_', since side-effects in
-  guards can alter these fields *)
-
-let combine {left=left ; right=right} = match left with
-| p::ps -> {left=ps ; right=set_args_erase_mutable p right}
-| _ -> assert false
-
-let ctx_combine ctx = List.map combine ctx
-
-let ncols = function
-  | [] -> 0
-  | ps::_ -> List.length ps
-
-
-exception NoMatch
-exception OrPat
-
-let filter_matrix matcher pss =
-
-  let rec filter_rec = function
-    | (p::ps)::rem ->
-        begin match p.pat_desc with
-        | Tpat_alias (p,_,_) ->
-            filter_rec ((p::ps)::rem)
-        | Tpat_var _ ->
-            filter_rec ((omega::ps)::rem)
-        | _ ->
-            begin
-              let rem = filter_rec rem in
-              try
-                matcher p ps::rem
-              with
-              | NoMatch -> rem
-              | OrPat   ->
-                match p.pat_desc with
-                | Tpat_or (p1,p2,_) -> filter_rec [(p1::ps) ;(p2::ps)]@rem
-                | _ -> assert false
-            end
-        end
-    | [] -> []
-    | _ ->
-        pretty_matrix pss ;
-        fatal_error "Matching.filter_matrix" in
-  filter_rec pss
-
-let make_default matcher env =
-  let rec make_rec = function
-    | [] -> []
-    | ([[]],i)::_ -> [[[]],i]
-    | (pss,i)::rem ->
-        let rem = make_rec rem in
-        match filter_matrix matcher pss with
-        | [] -> rem
-        | ([]::_) -> ([[]],i)::rem
-        | pss -> (pss,i)::rem in
-  make_rec env
-
-let ctx_matcher p =
-  let p = normalize_pat p in
-  match p.pat_desc with
-  | Tpat_construct (_, cstr,omegas) ->
-      (fun q rem -> match q.pat_desc with
-      | Tpat_construct (_, cstr',args)
-(* NB:  may_constr_equal considers (potential) constructor rebinding *)
-        when Types.may_equal_constr cstr cstr' ->
-          p,args@rem
-      | Tpat_any -> p,omegas @ rem
-      | _ -> raise NoMatch)
-  | Tpat_constant cst ->
-      (fun q rem -> match q.pat_desc with
-      | Tpat_constant cst' when const_compare cst cst' = 0 ->
-          p,rem
-      | Tpat_any -> p,rem
-      | _ -> raise NoMatch)
-  | Tpat_variant (lab,Some omega,_) ->
-      (fun q rem -> match q.pat_desc with
-      | Tpat_variant (lab',Some arg,_) when lab=lab' ->
-          p,arg::rem
-      | Tpat_any -> p,omega::rem
-      | _ -> raise NoMatch)
-  | Tpat_variant (lab,None,_) ->
-      (fun q rem -> match q.pat_desc with
-      | Tpat_variant (lab',None,_) when lab=lab' ->
-          p,rem
-      | Tpat_any -> p,rem
-      | _ -> raise NoMatch)
-  | Tpat_array omegas ->
-      let len = List.length omegas in
-      (fun q rem -> match q.pat_desc with
-      | Tpat_array args when List.length args = len -> p,args @ rem
-      | Tpat_any -> p, omegas @ rem
-      | _ -> raise NoMatch)
-  | Tpat_tuple omegas ->
-      let len = List.length omegas  in
-      (fun q rem -> match q.pat_desc with
-      | Tpat_tuple args when List.length args = len -> p,args @ rem
-      | Tpat_any -> p, omegas @ rem
-      | _ -> raise NoMatch)
-  | Tpat_record (((_, lbl, _) :: _) as l,_) -> (* Records are normalized *)
-      let len = Array.length lbl.lbl_all in
-      (fun q rem -> match q.pat_desc with
-      | Tpat_record (((_, lbl', _) :: _) as l',_)
-        when Array.length lbl'.lbl_all = len ->
-          let l' = all_record_args l' in
-          p, List.fold_right (fun (_, _,p) r -> p::r) l' rem
-      | Tpat_any -> p,List.fold_right (fun (_, _,p) r -> p::r) l rem
-      | _ -> raise NoMatch)
-  | Tpat_lazy omega ->
-      (fun q rem -> match q.pat_desc with
-      | Tpat_lazy arg -> p, (arg::rem)
-      | Tpat_any      -> p, (omega::rem)
-      | _             -> raise NoMatch)
- | _ -> fatal_error "Matching.ctx_matcher"
-
-
-
-
-let filter_ctx q ctx =
-
-  let matcher = ctx_matcher q in
-
-  let rec filter_rec = function
-    | ({right=p::ps} as l)::rem ->
-        begin match p.pat_desc with
-        | Tpat_or (p1,p2,_) ->
-            filter_rec ({l with right=p1::ps}::{l with right=p2::ps}::rem)
-        | Tpat_alias (p,_,_) ->
-            filter_rec ({l with right=p::ps}::rem)
-        | Tpat_var _ ->
-            filter_rec ({l with right=omega::ps}::rem)
-        | _ ->
-            begin let rem = filter_rec rem in
-            try
-              let to_left, right = matcher p ps in
-              {left=to_left::l.left ; right=right}::rem
-            with
-            | NoMatch -> rem
-            end
-        end
-    | [] -> []
-    | _ ->  fatal_error "Matching.filter_ctx" in
-
-  filter_rec ctx
-
-let select_columns pss ctx =
-  let n = ncols pss in
-  List.fold_right
-    (fun ps r ->
-      List.fold_right
-        (fun {left=left ; right=right} r ->
-          let transfert, right = nchars n right in
-          try
-            {left = lubs transfert ps @ left ; right=right}::r
-          with
-          | Empty -> r)
-        ctx r)
-    pss []
-
-let ctx_lub p ctx =
-  List.fold_right
-    (fun {left=left ; right=right} r ->
-      match right with
-      | q::rem ->
-          begin try
-            {left=left ; right = lub p q::rem}::r
-          with
-          | Empty -> r
-          end
-      | _ -> fatal_error "Matching.ctx_lub")
-    ctx []
-
-let ctx_match ctx pss =
-  List.exists
-    (fun {right=qs} ->  List.exists (fun ps -> may_compats qs ps)  pss)
-    ctx
-
-type jumps = (int * ctx list) list
-
-let pretty_jumps (env : jumps) = match env with
-| [] -> ()
-| _ ->
-    List.iter
-      (fun (i,ctx) ->
-        Printf.fprintf stderr "jump for %d\n" i ;
-        pretty_ctx ctx)
-      env
-
-
-let rec jumps_extract (i : int) = function
-  | [] -> [],[]
-  | (j,pss) as x::rem as all ->
-      if i=j then pss,rem
-      else if j < i then [],all
-      else
-        let r,rem = jumps_extract i rem in
-        r,(x::rem)
-
-let rec jumps_remove (i:int) = function
-  | [] -> []
-  | (j,_)::rem when i=j -> rem
-  | x::rem -> x::jumps_remove i rem
-
-let jumps_empty = []
-and jumps_is_empty = function
-  |  [] -> true
-  |  _ -> false
-
-let jumps_singleton i = function
-  | []  -> []
-  | ctx ->  [i,ctx]
-
-let jumps_add i pss jumps = match pss with
-| [] -> jumps
-| _  ->
-    let rec add = function
-      | [] -> [i,pss]
-      | (j,qss) as x::rem as all ->
-          if (j:int) > i then x::add rem
-      else if j < i then (i,pss)::all
-      else (i,(get_mins le_ctx (pss@qss)))::rem in
-    add jumps
-
-
-let rec jumps_union (env1:(int*ctx list)list) env2 = match env1,env2 with
-| [],_ -> env2
-| _,[] -> env1
-| ((i1,pss1) as x1::rem1), ((i2,pss2) as x2::rem2) ->
-    if i1=i2 then
-      (i1,get_mins le_ctx (pss1@pss2))::jumps_union rem1 rem2
-    else if i1 > i2 then
-      x1::jumps_union rem1 env2
-    else
-      x2::jumps_union env1 rem2
-
-
-let rec merge = function
-  | env1::env2::rem ->  jumps_union env1 env2::merge rem
-  | envs -> envs
-
-let rec jumps_unions envs = match envs with
-  | [] -> []
-  | [env] -> env
-  | _ -> jumps_unions (merge envs)
-
-let jumps_map f env =
-  List.map
-    (fun (i,pss) -> i,f pss)
-    env
-
-(* Pattern matching before any compilation *)
-
-type pattern_matching =
-  { mutable cases : (pattern list * lambda) list;
-    args : (lambda * let_kind) list ;
-    default : (matrix * int) list}
-
-(* Pattern matching after application of both the or-pat rule and the
-   mixture rule *)
-
-type pm_or_compiled =
-  {body : pattern_matching ;
-   handlers : (matrix * int * Ident.t list * pattern_matching) list ;
-   or_matrix : matrix ; }
-
-type pm_half_compiled =
-  | PmOr of pm_or_compiled
-  | PmVar of pm_var_compiled
-  | Pm of pattern_matching
-
-and pm_var_compiled =
-    {inside : pm_half_compiled ; var_arg : lambda ; }
-
-type pm_half_compiled_info =
-    {me : pm_half_compiled ;
-     matrix : matrix ;
-     top_default : (matrix * int) list ; }
-
-let pretty_cases cases =
-  List.iter
-    (fun (ps,_l) ->
-      List.iter
-        (fun p ->
-          Parmatch.top_pretty Format.str_formatter p ;
-          prerr_string " " ;
-          prerr_string (Format.flush_str_formatter ()))
-        ps ;
-(*
-      prerr_string " -> " ;
-      Printlambda.lambda Format.str_formatter l ;
-      prerr_string (Format.flush_str_formatter ()) ;
-*)
-      prerr_endline "")
-    cases
-
-let pretty_def def =
-  prerr_endline "+++++ Defaults +++++" ;
-  List.iter
-    (fun (pss,i) ->
-      Printf.fprintf stderr "Matrix for %d\n"  i ;
-      pretty_matrix pss)
-    def ;
-  prerr_endline "+++++++++++++++++++++"
-
-let pretty_pm pm =
-  pretty_cases pm.cases ;
-  if pm.default <> [] then
-    pretty_def pm.default
-
-
-let rec pretty_precompiled = function
-  | Pm pm ->
-      prerr_endline "++++ PM ++++" ;
-      pretty_pm pm
-  | PmVar x ->
-      prerr_endline "++++ VAR ++++" ;
-      pretty_precompiled x.inside
-  | PmOr x ->
-      prerr_endline "++++ OR ++++" ;
-      pretty_pm x.body ;
-      pretty_matrix x.or_matrix ;
-      List.iter
-        (fun (_,i,_,pm) ->
-          eprintf "++ Handler %d ++\n" i ;
-          pretty_pm pm)
-        x.handlers
-
-let pretty_precompiled_res first nexts =
-  pretty_precompiled first ;
-  List.iter
-    (fun (e, pmh) ->
-      eprintf "** DEFAULT %d **\n" e ;
-      pretty_precompiled pmh)
-    nexts
-
-
-
-(* Identifying some semantically equivalent lambda-expressions,
-   Our goal here is also to
-   find alpha-equivalent (simple) terms *)
-
-(* However, as shown by PR#6359 such sharing may hinders the
-   lambda-code invariant that all bound idents are unique,
-   when switches are compiled to test sequences.
-   The definitive fix is the systematic introduction of exit/catch
-   in case action sharing is present.
-*)
-
-
-module StoreExp =
-  Switch.Store
-    (struct
-      type t = lambda
-      type key = lambda
-      let compare_key = compare
-      let make_key = Lambda.make_key
-    end)
-
-
-let make_exit i = Lstaticraise (i,[])
-
-(* Introduce a catch, if worth it *)
-let make_catch d k = match d with
-| Lstaticraise (_,[]) -> k d
-| _ ->
-    let e = next_raise_count () in
-    Lstaticcatch (k (make_exit e),(e,[]),d)
-
-(* Introduce a catch, if worth it, delayed version *)
-let rec as_simple_exit = function
-  | Lstaticraise (i,[]) -> Some i
-  | Llet (Alias,_k,_,_,e) -> as_simple_exit e
-  | _ -> None
-
-
-let make_catch_delayed handler = match as_simple_exit handler with
-| Some i -> i,(fun act -> act)
-| None ->
-    let i = next_raise_count () in
-(*
-    Printf.eprintf "SHARE LAMBDA: %i\n%s\n" i (string_of_lam handler);
-*)
-    i,
-    (fun body -> match body with
-    | Lstaticraise (j,_) ->
-        if i=j then handler else body
-    | _ -> Lstaticcatch (body,(i,[]),handler))
-
-
-let raw_action l =
-  match make_key l with | Some l -> l | None -> l
-
-
-let tr_raw act = match make_key act with
-| Some act -> act
-| None -> raise Exit
-
-let same_actions = function
-  | [] -> None
-  | [_,act] -> Some act
-  | (_,act0) :: rem ->
-      try
-        let raw_act0 = tr_raw act0 in
-        let rec s_rec = function
-          | [] -> Some act0
-          | (_,act)::rem ->
-              if raw_act0 = tr_raw act then
-                s_rec rem
-              else
-                None in
-        s_rec rem
-      with
-      | Exit -> None
-
-
-(* Test for swapping two clauses *)
-
-let up_ok_action act1 act2 =
-  try
-    let raw1 = tr_raw act1
-    and raw2 = tr_raw act2 in
-    raw1 = raw2
-  with
-  | Exit -> false
-
-let up_ok (ps,act_p) l =
-  List.for_all
-    (fun (qs,act_q) ->
-      up_ok_action act_p act_q || not (may_compats ps qs))
-    l
-
-(*
-   The simplify function normalizes the first column of the match
-     - records are expanded so that they possess all fields
-     - aliases are removed and replaced by bindings in actions.
-   However or-patterns are simplified differently,
-     - aliases are not removed
-     - or-patterns (_|p) are changed into _
-*)
-
-exception Var of pattern
-
-let simplify_or p =
-  let rec simpl_rec p = match p with
-    | {pat_desc = Tpat_any|Tpat_var _} -> raise (Var p)
-    | {pat_desc = Tpat_alias (q,id,s)} ->
-        begin try
-          {p with pat_desc = Tpat_alias (simpl_rec q,id,s)}
-        with
-        | Var q -> raise (Var {p with pat_desc = Tpat_alias (q,id,s)})
-        end
-    | {pat_desc = Tpat_or (p1,p2,o)} ->
-        let q1 = simpl_rec p1 in
-        begin try
-          let q2 = simpl_rec p2 in
-          {p with pat_desc = Tpat_or (q1, q2, o)}
-        with
-        | Var q2 -> raise (Var {p with pat_desc = Tpat_or (q1, q2, o)})
-        end
-    | {pat_desc = Tpat_record (lbls,closed)} ->
-        let all_lbls = all_record_args lbls in
-        {p with pat_desc=Tpat_record (all_lbls, closed)}
-    | _ -> p in
-  try
-    simpl_rec p
-  with
-  | Var p -> p
-
-let simplify_cases args cls = match args with
-| [] -> assert false
-| (arg,_)::_ ->
-    let rec simplify = function
-      | [] -> []
-      | ((pat :: patl, action) as cl) :: rem ->
-          begin match pat.pat_desc with
-          | Tpat_var (id, _) ->
-              (omega :: patl, bind Alias id arg action) ::
-              simplify rem
-          | Tpat_any ->
-              cl :: simplify rem
-          | Tpat_alias(p, id,_) ->
-              simplify ((p :: patl, bind Alias id arg action) :: rem)
-          | Tpat_record ([],_) ->
-              (omega :: patl, action)::
-              simplify rem
-          | Tpat_record (lbls, closed) ->
-              let all_lbls = all_record_args lbls in
-              let full_pat =
-                {pat with pat_desc=Tpat_record (all_lbls, closed)} in
-              (full_pat::patl,action)::
-              simplify rem
-          | Tpat_or _ ->
-              let pat_simple  = simplify_or pat in
-              begin match pat_simple.pat_desc with
-              | Tpat_or _ ->
-                  (pat_simple :: patl, action) ::
-                  simplify rem
-              | _ ->
-                  simplify ((pat_simple::patl,action) :: rem)
-              end
-          | _ -> cl :: simplify rem
-          end
-      | _ -> assert false in
-
-    simplify cls
-
-
-
-(* Once matchings are simplified one can easily find
-   their nature *)
-
-let rec what_is_cases cases = match cases with
-| ({pat_desc=Tpat_any} :: _, _) :: rem -> what_is_cases rem
-| (({pat_desc=(Tpat_var _|Tpat_or (_,_,_)|Tpat_alias (_,_,_))}::_),_)::_
-  -> assert false (* applies to simplified matchings only *)
-| (p::_,_)::_ -> p
-| [] -> omega
-| _ -> assert false
-
-
-
-(* A few operations on default environments *)
-let as_matrix cases = get_mins le_pats (List.map (fun (ps,_) -> ps) cases)
-
-let cons_default matrix raise_num default =
-  match matrix with
-  | [] -> default
-  | _ -> (matrix,raise_num)::default
-
-let default_compat p def =
-  List.fold_right
-    (fun (pss,i) r ->
-      let qss =
-        List.fold_right
-          (fun qs r -> match qs with
-            | q::rem when may_compat p q -> rem::r
-            | _ -> r)
-          pss [] in
-      match qss with
-      | [] -> r
-      | _  -> (qss,i)::r)
-    def []
-
-(* Or-pattern expansion, variables are a complication w.r.t. the article *)
-let rec extract_vars r p = match p.pat_desc with
-| Tpat_var (id, _) -> IdentSet.add id r
-| Tpat_alias (p, id,_ ) ->
-    extract_vars (IdentSet.add id r) p
-| Tpat_tuple pats ->
-    List.fold_left extract_vars r pats
-| Tpat_record (lpats,_) ->
-    List.fold_left
-      (fun r (_, _, p) -> extract_vars r p)
-      r lpats
-| Tpat_construct (_, _, pats) ->
-    List.fold_left extract_vars r pats
-| Tpat_array pats ->
-    List.fold_left extract_vars r pats
-| Tpat_variant (_,Some p, _) -> extract_vars r p
-| Tpat_lazy p -> extract_vars r p
-| Tpat_or (p,_,_) -> extract_vars r p
-| Tpat_constant _|Tpat_any|Tpat_variant (_,None,_) -> r
-
-exception Cannot_flatten
-
-let mk_alpha_env arg aliases ids =
-  List.map
-    (fun id -> id,
-      if List.mem id aliases then
-        match arg with
-        | Some v -> v
-        | _      -> raise Cannot_flatten
-      else
-        Ident.create (Ident.name id))
-    ids
-
-let rec explode_or_pat arg patl mk_action rem vars aliases = function
-  | {pat_desc = Tpat_or (p1,p2,_)} ->
-      explode_or_pat
-        arg patl mk_action
-        (explode_or_pat arg patl mk_action rem vars aliases p2)
-        vars aliases p1
-  | {pat_desc = Tpat_alias (p,id, _)} ->
-      explode_or_pat arg patl mk_action rem vars (id::aliases) p
-  | {pat_desc = Tpat_var (x, _)} ->
-      let env = mk_alpha_env arg (x::aliases) vars in
-      (omega::patl,mk_action (List.map snd env))::rem
-  | p ->
-      let env = mk_alpha_env arg aliases vars in
-      (alpha_pat env p::patl,mk_action (List.map snd env))::rem
-
-let pm_free_variables {cases=cases} =
-  List.fold_right
-    (fun (_,act) r -> IdentSet.union (free_variables act) r)
-    cases IdentSet.empty
-
-
-(* Basic grouping predicates *)
-let pat_as_constr = function
-  | {pat_desc=Tpat_construct (_, cstr,_)} -> cstr
-  | _ -> fatal_error "Matching.pat_as_constr"
-
-let group_constant = function
-  | {pat_desc= Tpat_constant _} -> true
-  | _                           -> false
-
-and group_constructor = function
-  | {pat_desc = Tpat_construct (_,_,_)} -> true
-  | _ -> false
-
-and group_variant = function
-  | {pat_desc = Tpat_variant (_, _, _)} -> true
-  | _ -> false
-
-and group_var = function
-  | {pat_desc=Tpat_any} -> true
-  | _ -> false
-
-and group_tuple = function
-  | {pat_desc = (Tpat_tuple _|Tpat_any)} -> true
-  | _ -> false
-
-and group_record = function
-  | {pat_desc = (Tpat_record _|Tpat_any)} -> true
-  | _ -> false
-
-and group_array = function
-  | {pat_desc=Tpat_array _} -> true
-  | _ -> false
-
-and group_lazy = function
-  | {pat_desc = Tpat_lazy _} -> true
-  | _ -> false
-
-let get_group p = match p.pat_desc with
-| Tpat_any -> group_var
-| Tpat_constant _ -> group_constant
-| Tpat_construct _ -> group_constructor
-| Tpat_tuple _ -> group_tuple
-| Tpat_record _ -> group_record
-| Tpat_array _ -> group_array
-| Tpat_variant (_,_,_) -> group_variant
-| Tpat_lazy _ -> group_lazy
-|  _ -> fatal_error "Matching.get_group"
-
-
-
-let is_or p = match p.pat_desc with
-| Tpat_or _ -> true
-| _ -> false
-
-(* Conditions for appending to the Or matrix *)
-let conda p q = not (may_compat p q)
-and condb act ps qs =  not (is_guarded act) && Parmatch.le_pats qs ps
-
-let or_ok p ps l =
-  List.for_all
-    (function
-      | ({pat_desc=Tpat_or _} as q::qs,act) ->
-          conda p q || condb act ps qs
-      | _ -> true)
-    l
-
-(* Insert or append a pattern in the Or matrix *)
-
-let equiv_pat p q = le_pat p q && le_pat q p
-
-let rec get_equiv p l = match l with
-  | (q::_,_) as cl::rem ->
-      if equiv_pat p q then
-        let others,rem = get_equiv p rem in
-        cl::others,rem
-      else
-        [],l
-  | _ -> [],l
-
-
-let insert_or_append p ps act ors no =
-  let rec attempt seen = function
-    | (q::qs,act_q) as cl::rem ->
-        if is_or q then begin
-          if may_compat p q then
-            if
-              IdentSet.is_empty (extract_vars IdentSet.empty p) &&
-              IdentSet.is_empty (extract_vars IdentSet.empty q) &&
-              equiv_pat p q
-            then (* attempt insert, for equivalent orpats with no variables *)
-              let _, not_e = get_equiv q rem in
-              if
-                or_ok p ps not_e && (* check append condition for head of O *)
-                List.for_all        (* check insert condition for tail of O *)
-                  (fun cl -> match cl with
-                  | (q::_,_) -> not (may_compat p q)
-                  | _        -> assert false)
-                  seen
-              then (* insert *)
-                List.rev_append seen ((p::ps,act)::cl::rem), no
-              else (* fail to insert or append *)
-                ors,(p::ps,act)::no
-            else if condb act_q ps qs then (* check condition (b) for append *)
-              attempt (cl::seen) rem
-            else
-              ors,(p::ps,act)::no
-          else (* p # q, go on with append/insert *)
-            attempt (cl::seen) rem
-        end else (* q is not an or-pat, go on with append/insert *)
-          attempt (cl::seen) rem
-    | _  -> (* [] in fact *)
-        (p::ps,act)::ors,no in (* success in appending *)
-  attempt [] ors
-
-(* Reconstruct default information from half_compiled  pm list *)
-
-let rec rebuild_matrix pmh = match pmh with
-  | Pm pm -> as_matrix pm.cases
-  | PmOr {or_matrix=m} -> m
-  | PmVar x -> add_omega_column  (rebuild_matrix x.inside)
-
-let rec rebuild_default nexts def = match nexts with
-| [] -> def
-| (e, pmh)::rem ->
-    (add_omega_column (rebuild_matrix pmh), e)::
-    rebuild_default rem def
-
-let rebuild_nexts arg nexts k =
-  List.fold_right
-    (fun (e, pm) k -> (e, PmVar {inside=pm ; var_arg=arg})::k)
-    nexts k
-
-
-(*
-  Split a matching.
-    Splitting is first directed by or-patterns, then by
-    tests (e.g. constructors)/variable transitions.
-
-    The approach is greedy, every split function attempts to
-    raise rows as much as possible in the top matrix,
-    then splitting applies again to the remaining rows.
-
-    Some precompilation of or-patterns and
-    variable pattern occurs. Mostly this means that bindings
-    are performed now,  being replaced by let-bindings
-    in actions (cf. simplify_cases).
-
-    Additionally, if the match argument is a variable, matchings whose
-    first column is made of variables only are splitted further
-    (cf. precompile_var).
-
-*)
-
-
-let rec split_or argo cls args def =
-
-  let cls = simplify_cases args cls in
-
-  let rec do_split before ors no = function
-    | [] ->
-        cons_next
-          (List.rev before) (List.rev ors) (List.rev no)
-    | ((p::ps,act) as cl)::rem ->
-        if up_ok cl no then
-          if is_or p then
-            let ors, no = insert_or_append p ps act ors no in
-            do_split before ors no rem
-          else begin
-            if up_ok cl ors then
-              do_split (cl::before) ors no rem
-            else if or_ok p ps ors then
-              do_split before (cl::ors) no rem
-            else
-              do_split before ors (cl::no) rem
-          end
-        else
-          do_split before ors (cl::no) rem
-    | _ -> assert false
-
-  and cons_next yes yesor = function
-    | [] ->
-        precompile_or argo yes yesor args def []
-    | rem ->
-        let {me=next ; matrix=matrix ; top_default=def},nexts =
-          do_split [] [] [] rem in
-        let idef = next_raise_count () in
-        precompile_or
-          argo yes yesor args
-          (cons_default matrix idef def)
-          ((idef,next)::nexts) in
-
-  do_split [] [] [] cls
-
-(* Ultra-naive splitting, close to semantics, used for extension,
-   as potential rebind prevents any kind of optimisation *)
-
-and split_naive cls args def k =
-
-  let rec split_exc cstr0 yes = function
-    | [] ->
-        let yes = List.rev yes in
-        { me = Pm {cases=yes; args=args; default=def;} ;
-          matrix = as_matrix yes ;
-          top_default=def},
-        k
-    | (p::_,_ as cl)::rem ->
-        if group_constructor p then
-          let cstr = pat_as_constr p in
-          if cstr = cstr0 then split_exc cstr0 (cl::yes) rem
-          else
-            let yes = List.rev yes in
-            let {me=next ; matrix=matrix ; top_default=def}, nexts =
-              split_exc cstr [cl] rem in
-            let idef = next_raise_count () in
-            let def = cons_default matrix idef def in
-            { me = Pm {cases=yes; args=args; default=def} ;
-              matrix = as_matrix yes ;
-              top_default = def; },
-            (idef,next)::nexts
-        else
-          let yes = List.rev yes in
-          let {me=next ; matrix=matrix ; top_default=def}, nexts =
-              split_noexc [cl] rem in
-            let idef = next_raise_count () in
-            let def = cons_default matrix idef def in
-            { me = Pm {cases=yes; args=args; default=def} ;
-              matrix = as_matrix yes ;
-              top_default = def; },
-            (idef,next)::nexts
-    | _ -> assert false
-
-  and split_noexc yes = function
-    | [] -> precompile_var args (List.rev yes) def k
-    | (p::_,_ as cl)::rem ->
-        if group_constructor p then
-          let yes= List.rev yes in
-          let {me=next; matrix=matrix; top_default=def;},nexts =
-            split_exc (pat_as_constr p) [cl] rem in
-          let idef = next_raise_count () in
-          precompile_var
-            args yes
-            (cons_default matrix idef def)
-            ((idef,next)::nexts)
-        else split_noexc (cl::yes) rem
-    | _ -> assert false in
-
-  match cls with
-  | [] -> assert false
-  | (p::_,_ as cl)::rem ->
-      if group_constructor p then
-        split_exc (pat_as_constr p) [cl] rem
-      else
-        split_noexc [cl] rem
-  | _ -> assert false
-
-and split_constr cls args def k =
-  let ex_pat = what_is_cases cls in
-  match ex_pat.pat_desc with
-  | Tpat_any -> precompile_var args cls def k
-  | Tpat_construct (_,{cstr_tag=Cstr_extension _},_) ->
-      split_naive cls args def k
-  | _ ->
-
-      let group = get_group ex_pat in
-
-      let rec split_ex yes no = function
-        | [] ->
-            let yes = List.rev yes and no = List.rev no in
-            begin match no with
-            | [] ->
-                {me = Pm {cases=yes ; args=args ; default=def} ;
-                  matrix = as_matrix yes ;
-                  top_default = def},
-                k
-            | cl::rem ->
-                begin match yes with
-                | [] ->
-                    (* Could not success in raising up a constr matching up *)
-                    split_noex [cl] [] rem
-                | _ ->
-                    let {me=next ; matrix=matrix ; top_default=def}, nexts =
-                      split_noex [cl] [] rem in
-                    let idef = next_raise_count () in
-                    let def = cons_default matrix idef def in
-                    {me = Pm {cases=yes ; args=args ; default=def} ;
-                      matrix = as_matrix yes ;
-                      top_default = def },
-                    (idef, next)::nexts
-                end
-            end
-        | (p::_,_) as cl::rem ->
-            if group p && up_ok cl no then
-              split_ex (cl::yes) no rem
-            else
-              split_ex yes (cl::no) rem
-        | _ -> assert false
-
-      and split_noex yes no = function
-        | [] ->
-            let yes = List.rev yes and no = List.rev no in
-            begin match no with
-            | [] -> precompile_var args yes def k
-            | cl::rem ->
-                let {me=next ; matrix=matrix ; top_default=def}, nexts =
-                  split_ex [cl] [] rem in
-                let idef = next_raise_count () in
-                precompile_var
-                  args yes
-                  (cons_default matrix idef def)
-                  ((idef,next)::nexts)
-            end
-        | [ps,_ as cl]
-            when List.for_all group_var ps && yes <> [] ->
-       (* This enables an extra division in some frequent cases :
-          last row is made of variables only *)
-              split_noex yes (cl::no) []
-        | (p::_,_) as cl::rem ->
-            if not (group p) && up_ok cl no then
-              split_noex (cl::yes) no rem
-            else
-              split_noex yes (cl::no) rem
-        | _ -> assert false in
-
-      match cls with
-      | ((p::_,_) as cl)::rem ->
-          if group p then split_ex [cl] [] rem
-          else split_noex [cl] [] rem
-      | _ ->  assert false
-
-and precompile_var  args cls def k = match args with
-| []  -> assert false
-| _::((Lvar v as av,_) as arg)::rargs ->
-    begin match cls with
-    | [_] -> (* as splitted as it can *)
-        dont_precompile_var args cls def k
-    | _ ->
-(* Precompile *)
-        let var_cls =
-          List.map
-            (fun (ps,act) -> match ps with
-            | _::ps -> ps,act | _     -> assert false)
-            cls
-        and var_def = make_default (fun _ rem -> rem) def in
-        let {me=first ; matrix=matrix}, nexts =
-          split_or (Some v) var_cls (arg::rargs) var_def in
-
-(* Compute top information *)
-        match nexts with
-        | [] -> (* If you need *)
-            dont_precompile_var args cls def k
-        | _  ->
-            let rfirst =
-              {me = PmVar {inside=first ; var_arg = av} ;
-                matrix = add_omega_column matrix ;
-                top_default = rebuild_default nexts def ; }
-            and rnexts = rebuild_nexts av nexts k in
-            rfirst, rnexts
-    end
-|  _ ->
-    dont_precompile_var args cls def k
-
-and dont_precompile_var args cls def k =
-  {me =  Pm {cases = cls ; args = args ; default = def } ;
-    matrix=as_matrix cls ;
-    top_default=def},k
-
-and precompile_or argo cls ors args def k = match ors with
-| [] -> split_constr cls args def k
-| _  ->
-    let rec do_cases = function
-      | ({pat_desc=Tpat_or _} as orp::patl, action)::rem ->
-          let others,rem = get_equiv orp rem in
-          let orpm =
-            {cases =
-              (patl, action)::
-              List.map
-                (function
-                  | (_::ps,action) -> ps,action
-                  | _ -> assert false)
-                others ;
-              args = (match args with _::r -> r | _ -> assert false) ;
-              default = default_compat orp def} in
-          let vars =
-            IdentSet.elements
-              (IdentSet.inter
-                 (extract_vars IdentSet.empty orp)
-                 (pm_free_variables orpm)) in
-          let or_num = next_raise_count () in
-          let new_patl = Parmatch.omega_list patl in
-
-          let mk_new_action vs =
-            Lstaticraise
-              (or_num, List.map (fun v -> Lvar v) vs) in
-
-          let body,handlers = do_cases rem in
-          explode_or_pat
-            argo new_patl mk_new_action body vars [] orp,
-          let mat = [[orp]] in
-          ((mat, or_num, vars , orpm):: handlers)
-      | cl::rem ->
-          let new_ord,new_to_catch = do_cases rem in
-          cl::new_ord,new_to_catch
-      | [] -> [],[] in
-
-    let end_body, handlers = do_cases ors in
-    let matrix = as_matrix (cls@ors)
-    and body = {cases=cls@end_body ; args=args ; default=def} in
-    {me = PmOr {body=body ; handlers=handlers ; or_matrix=matrix} ;
-      matrix=matrix ;
-      top_default=def},
-    k
-
-let split_precompile argo pm =
-  let {me=next}, nexts = split_or argo pm.cases pm.args pm.default  in
-  if dbg && (nexts <> [] || (match next with PmOr _ -> true | _ -> false))
-  then begin
-    prerr_endline "** SPLIT **" ;
-    pretty_pm pm ;
-    pretty_precompiled_res  next nexts
-  end ;
-  next, nexts
-
-
-(* General divide functions *)
-
-let add_line patl_action pm = pm.cases <- patl_action :: pm.cases; pm
-
-type cell =
-  {pm : pattern_matching ;
-  ctx : ctx list ;
-  pat : pattern}
-
-let add make_matching_fun division eq_key key patl_action args =
-  try
-    let (_,cell) = List.find (fun (k,_) -> eq_key key k) division in
-    cell.pm.cases <- patl_action :: cell.pm.cases;
-    division
-  with Not_found ->
-    let cell = make_matching_fun args in
-    cell.pm.cases <- [patl_action] ;
-    (key, cell) :: division
-
-
-let divide make eq_key get_key get_args ctx pm =
-
-  let rec divide_rec = function
-    | (p::patl,action) :: rem ->
-        let this_match = divide_rec rem in
-        add
-          (make p pm.default ctx)
-          this_match eq_key (get_key p) (get_args p patl,action) pm.args
-    | _ -> [] in
-
-  divide_rec pm.cases
-
-
-let divide_line make_ctx make get_args pat ctx pm =
-  let rec divide_rec = function
-    | (p::patl,action) :: rem ->
-        let this_match = divide_rec rem in
-        add_line (get_args p patl, action) this_match
-    | _ -> make pm.default pm.args in
-
-  {pm = divide_rec pm.cases ;
-  ctx=make_ctx ctx ;
-  pat=pat}
-
-
-
-(* Then come various functions,
-   There is one set of functions per matching style
-   (constants, constructors etc.)
-
-   - matcher functions are arguments to make_default (for default handlers)
-   They may raise NoMatch or OrPat and perform the full
-   matching (selection + arguments).
-
-
-   - get_args and get_key are for the compiled matrices, note that
-   selection and getting arguments are separated.
-
-   - make_ _matching combines the previous functions for producing
-   new  ``pattern_matching'' records.
-*)
-
-
-
-let rec matcher_const cst p rem = match p.pat_desc with
-| Tpat_or (p1,p2,_) ->
-    begin try
-      matcher_const cst p1 rem with
-    | NoMatch -> matcher_const cst p2 rem
-    end
-| Tpat_constant c1 when const_compare c1 cst = 0 -> rem
-| Tpat_any    -> rem
-| _ -> raise NoMatch
-
-let get_key_constant caller = function
-  | {pat_desc= Tpat_constant cst} -> cst
-  | p ->
-      prerr_endline ("BAD: "^caller) ;
-      pretty_pat p ;
-      assert false
-
-let get_args_constant _ rem = rem
-
-let make_constant_matching p def ctx = function
-    [] -> fatal_error "Matching.make_constant_matching"
-  | (_ :: argl) ->
-      let def =
-        make_default
-          (matcher_const (get_key_constant "make" p)) def
-      and ctx =
-        filter_ctx p  ctx in
-      {pm = {cases = []; args = argl ; default = def} ;
-        ctx = ctx ;
-        pat = normalize_pat p}
-
-
-
-
-let divide_constant ctx m =
-  divide
-    make_constant_matching
-    (fun c d -> const_compare c d = 0) (get_key_constant "divide")
-    get_args_constant
-    ctx m
-
-(* Matching against a constructor *)
-
-
-let make_field_args ~fld_info loc binding_kind arg first_pos last_pos argl =
-  let rec make_args pos =
-    if pos > last_pos
-    then argl
-    else (Lprim(Pfield (pos, fld_info), [arg], loc), binding_kind) :: make_args (pos + 1)
-  in make_args first_pos
-
-let get_key_constr = function
-  | {pat_desc=Tpat_construct (_, cstr,_)} -> cstr.cstr_tag
-  | _ -> assert false
-
-let get_args_constr p rem = match p with
-| {pat_desc=Tpat_construct (_, _, args)} -> args @ rem
-| _ -> assert false
-
-(* NB: matcher_constr applies to default matrices.
-
-       In that context, matching by constructors of extensible
-       types degrades to arity checking, due to potential rebinding.
-       This comparison is performed by Types.may_equal_constr.
-*)
-
-let matcher_constr cstr = match cstr.cstr_arity with
-| 0 ->
-    let rec matcher_rec q rem = match q.pat_desc with
-    | Tpat_or (p1,p2,_) ->
-        begin
-          try matcher_rec p1 rem
-          with NoMatch -> matcher_rec p2 rem
-        end
-    | Tpat_construct (_, cstr',[])
-      when Types.may_equal_constr cstr cstr' -> rem
-    | Tpat_any -> rem
-    | _ -> raise NoMatch in
-    matcher_rec
-| 1 ->
-    let rec matcher_rec q rem = match q.pat_desc with
-    | Tpat_or (p1,p2,_) ->
-        let r1 = try Some (matcher_rec p1 rem) with NoMatch -> None
-        and r2 = try Some (matcher_rec p2 rem) with NoMatch -> None in
-        begin match r1,r2 with
-        | None, None -> raise NoMatch
-        | Some r1, None -> r1
-        | None, Some r2 -> r2
-        | Some (a1::_), Some (a2::_) ->
-            {a1 with
-             pat_loc = Location.none ;
-             pat_desc = Tpat_or (a1, a2, None)}::
-            rem
-        | _, _ -> assert false
-        end
-    | Tpat_construct (_, cstr', [arg])
-      when Types.may_equal_constr cstr cstr' -> arg::rem
-    | Tpat_any -> omega::rem
-    | _ -> raise NoMatch in
-    matcher_rec
-| _ ->
-    fun q rem -> match q.pat_desc with
-    | Tpat_or (_,_,_) -> raise OrPat
-    | Tpat_construct (_,cstr',args)
-      when  Types.may_equal_constr cstr cstr' -> args @ rem
-    | Tpat_any -> Parmatch.omegas cstr.cstr_arity @ rem
-    | _        -> raise NoMatch
-
-let is_not_none_bs_primitve : Lambda.primitive =
-  Pccall 
-    (Primitive.simple ~name:"#is_not_none" ~arity:1 ~alloc:false)
-
-let val_from_option_bs_primitive : Lambda.primitive =
-  Pccall 
-    (Primitive.simple ~name:"#val_from_option" ~arity:1 ~alloc:true)
-
-let val_from_unnest_option_bs_primitive : Lambda.primitive =
-  Pccall
-    (Primitive.simple ~name:"#val_from_unnest_option" ~arity:1 ~alloc:true)
-
-let make_constr_matching p def ctx = function
-    [] -> fatal_error "Matching.make_constr_matching"
-  | ((arg, _mut) :: argl) ->
-      let cstr = pat_as_constr p in
-      let untagged = Ast_untagged_variants.has_untagged cstr.cstr_attributes in
-      let newargs =
-        if cstr.cstr_inlined <> None || (untagged && cstr.cstr_args <> []) then
-          (arg, Alias) :: argl
-        else match cstr.cstr_tag with
-        | Cstr_block _ when
-            !Config.bs_only &&
-            Datarepr.constructor_has_optional_shape cstr
-          ->
-            begin
-              let from_option = 
-                match p.pat_desc with
-                | Tpat_construct(_, _,
-                                 [ {
-                                   pat_type ; pat_env
-                                 } ])
-                  when Typeopt.type_cannot_contain_undefined pat_type pat_env
-                  -> val_from_unnest_option_bs_primitive
-                | _ -> val_from_option_bs_primitive in 
-              (Lprim (from_option, [arg], p.pat_loc), Alias) :: argl
-            end
-        | Cstr_constant _
-        | Cstr_block _ ->
-            make_field_args p.pat_loc Alias arg 0 (cstr.cstr_arity - 1) argl
-            ~fld_info:(if cstr.cstr_name = "::" then Fld_cons else Fld_variant)
-        | Cstr_unboxed -> (arg, Alias) :: argl
-        | Cstr_extension _ ->
-            make_field_args p.pat_loc Alias arg 1 cstr.cstr_arity argl 
-            ~fld_info:Fld_extension
-        in
-      {pm=
-        {cases = []; args = newargs;
-          default = make_default (matcher_constr cstr) def} ;
-        ctx =  filter_ctx p ctx ;
-        pat=normalize_pat p}
-
-
-let divide_constructor ctx pm =
-  divide
-    make_constr_matching
-    Types.equal_tag get_key_constr get_args_constr
-    ctx pm
-
-(* Matching against a variant *)
-
-let rec matcher_variant_const lab p rem = match p.pat_desc with
-| Tpat_or (p1, p2, _) ->
-    begin
-      try
-        matcher_variant_const lab p1 rem
-      with
-      | NoMatch -> matcher_variant_const lab p2 rem
-    end
-| Tpat_variant (lab1,_,_) when lab1=lab -> rem
-| Tpat_any -> rem
-| _   -> raise NoMatch
-
-
-let make_variant_matching_constant p lab def ctx = function
-    [] -> fatal_error "Matching.make_variant_matching_constant"
-  | (_ :: argl) ->
-      let def = make_default (matcher_variant_const lab) def
-      and ctx = filter_ctx p ctx in
-      {pm={ cases = []; args = argl ; default=def} ;
-        ctx=ctx ;
-        pat = normalize_pat p}
-
-let matcher_variant_nonconst lab p rem = match p.pat_desc with
-| Tpat_or (_,_,_) -> raise OrPat
-| Tpat_variant (lab1,Some arg,_) when lab1=lab -> arg::rem
-| Tpat_any -> omega::rem
-| _   -> raise NoMatch
-
-
-let make_variant_matching_nonconst p lab def ctx = function
-    [] -> fatal_error "Matching.make_variant_matching_nonconst"
-  | ((arg, _mut) :: argl) ->
-      let def = make_default (matcher_variant_nonconst lab) def
-      and ctx = filter_ctx p ctx in
-      {pm=
-        {cases = []; args = (Lprim(Pfield (1, Fld_poly_var_content), [arg], p.pat_loc), Alias) :: argl;
-          default=def} ;
-        ctx=ctx ;
-        pat = normalize_pat p}
-
-let divide_variant row ctx {cases = cl; args = al; default=def} =
-  let row = Btype.row_repr row in
-  let rec divide = function
-      ({pat_desc = Tpat_variant(lab, pato, _)} as p:: patl, action) :: rem ->
-        let variants = divide rem in
-        if try Btype.row_field_repr (List.assoc lab row.row_fields) = Rabsent
-        with Not_found -> true
-        then
-          variants
-        else begin
-          let tag = Btype.hash_variant lab in
-          let (=) ((a:string),(b:Types.constructor_tag)) (c,d) = 
-            a = c && Types.equal_tag b d 
-          in 
-          match pato with
-            None ->
-              add (make_variant_matching_constant p lab def ctx) variants
-                (=) (lab,Cstr_constant tag) (patl, action) al
-          | Some pat ->
-              add (make_variant_matching_nonconst p lab def ctx) variants
-                (=) (lab,Cstr_block tag) (pat :: patl, action) al
-        end
-    | _ -> []
-  in
-  divide cl
-
-(*
-  Three ``no-test'' cases
-  *)
-
-(* Matching against a variable *)
-
-let get_args_var _ rem = rem
-
-
-let make_var_matching def = function
-  | [] ->  fatal_error "Matching.make_var_matching"
-  | _::argl ->
-      {cases=[] ;
-        args = argl ;
-        default= make_default get_args_var def}
-
-let divide_var ctx pm =
-  divide_line ctx_lshift make_var_matching get_args_var omega ctx pm
-
-(* Matching and forcing a lazy value *)
-
-let get_arg_lazy p rem = match p with
-| {pat_desc = Tpat_any} -> omega :: rem
-| {pat_desc = Tpat_lazy arg} -> arg :: rem
-| _ ->  assert false
-
-let matcher_lazy p rem = match p.pat_desc with
-| Tpat_or (_,_,_)     -> raise OrPat
-| Tpat_any
-| Tpat_var _          -> omega :: rem
-| Tpat_lazy arg       -> arg :: rem
-| _                   -> raise NoMatch
-
-(* Inlining the tag tests before calling the primitive that works on
-   lazy blocks. This is also used in translcore.ml.
-   No other call than Obj.tag when the value has been forced before.
-*)
-
-
-let get_mod_field modname field =
-  lazy (
-    try
-      let mod_ident = Ident.create_persistent modname in
-      let env = Env.open_pers_signature modname Env.initial_safe_string in
-      let p = try
-        match Env.lookup_value (Longident.Lident field) env with
-        | (Path.Pdot(_,_,i), _) -> i
-        | _ -> fatal_error ("Primitive "^modname^"."^field^" not found.")
-      with Not_found ->
-        fatal_error ("Primitive "^modname^"."^field^" not found.")
-      in
-      Lprim(Pfield (p, Fld_module {name = field}),
-            [Lprim(Pgetglobal mod_ident, [], Location.none)],
-            Location.none)
-    with Not_found -> fatal_error ("Module "^modname^" unavailable.")
-  )
-
-
-let code_force =
-    get_mod_field "CamlinternalLazy" "force"
-;;
-
-(* inline_lazy_force inlines the beginning of the code of Lazy.force. When
-   the value argument is tagged as:
-   - forward, take field 0
-   - lazy, call the primitive that forces (without testing again the tag)
-   - anything else, return it
-
-   Using Lswitch below relies on the fact that the GC does not shortcut
-   Forward(val_out_of_heap).
-*)
-
-
-let inline_lazy_force arg loc =
-    Lapply { ap_func = Lazy.force code_force; ap_inlined = Default_inline;  ap_args = [arg]; ap_loc = loc}
-let make_lazy_matching def = function
-    [] -> fatal_error "Matching.make_lazy_matching"
-  | (arg,_mut) :: argl ->
-      { cases = [];
-        args =
-          (inline_lazy_force arg Location.none, Strict) :: argl;
-        default = make_default matcher_lazy def }
-
-let divide_lazy p ctx pm =
-  divide_line
-    (filter_ctx p)
-    make_lazy_matching
-    get_arg_lazy
-    p ctx pm
-
-(* Matching against a tuple pattern *)
-
-
-let get_args_tuple arity p rem = match p with
-| {pat_desc = Tpat_any} -> omegas arity @ rem
-| {pat_desc = Tpat_tuple args} ->
-    args @ rem
-| _ ->  assert false
-
-let matcher_tuple arity p rem = match p.pat_desc with
-| Tpat_or (_,_,_)     -> raise OrPat
-| Tpat_any
-| Tpat_var _ -> omegas arity @ rem
-| Tpat_tuple args when List.length args = arity -> args @ rem
-| _ ->  raise NoMatch
-
-let make_tuple_matching loc arity def = function
-    [] -> fatal_error "Matching.make_tuple_matching"
-  | (arg, _mut) :: argl ->
-      let rec make_args pos =
-        if pos >= arity
-        then argl
-        else (Lprim(Pfield (pos, Fld_tuple), [arg], loc), Alias) :: make_args (pos + 1) in
-      {cases = []; args = make_args 0 ;
-        default=make_default (matcher_tuple arity) def}
-
-
-let divide_tuple arity p ctx pm =
-  divide_line
-    (filter_ctx p)
-    (make_tuple_matching p.pat_loc arity)
-    (get_args_tuple  arity) p ctx pm
-
-(* Matching against a record pattern *)
-
-
-let record_matching_line num_fields lbl_pat_list =
-  let patv = Array.make num_fields omega in
-  List.iter (fun (_, lbl, pat) -> patv.(lbl.lbl_pos) <- pat) lbl_pat_list;
-  Array.to_list patv
-
-let get_args_record num_fields p rem = match p with
-| {pat_desc=Tpat_any} ->
-    record_matching_line num_fields [] @ rem
-| {pat_desc=Tpat_record (lbl_pat_list,_)} ->
-    record_matching_line num_fields lbl_pat_list @ rem
-| _ -> assert false
-
-let matcher_record num_fields p rem = match p.pat_desc with
-| Tpat_or (_,_,_) -> raise OrPat
-| Tpat_any
-| Tpat_var _      ->
-  record_matching_line num_fields [] @ rem
-| Tpat_record ([], _) when num_fields = 0 -> rem
-| Tpat_record ((_, lbl, _) :: _ as lbl_pat_list, _)
-  when Array.length lbl.lbl_all = num_fields ->
-    record_matching_line num_fields lbl_pat_list @ rem
-| _ -> raise NoMatch
-
-let make_record_matching loc all_labels def = function
-    [] -> fatal_error "Matching.make_record_matching"
-  | ((arg, _mut) :: argl) ->
-      let rec make_args pos =
-        if pos >= Array.length all_labels then argl else begin
-          let lbl = all_labels.(pos) in
-          let access =
-            match lbl.lbl_repres with
-            | Record_float_unused -> assert false
-            | Record_regular | Record_optional_labels _ -> 
-              Lprim (Pfield (lbl.lbl_pos, Lambda.fld_record lbl), [arg], loc) 
-            | Record_inlined _ ->
-              Lprim (Pfield (lbl.lbl_pos, Lambda.fld_record_inline lbl), [arg], loc)
-            | Record_unboxed _ -> arg
-            | Record_extension -> Lprim (Pfield (lbl.lbl_pos + 1, Lambda.fld_record_extension lbl), [arg], loc) 
-          in
-          let str =
-            match lbl.lbl_mut with
-              Immutable -> Alias
-            | Mutable -> StrictOpt in
-          (access, str) :: make_args(pos + 1)
-        end in
-      let nfields = Array.length all_labels in
-      let def= make_default (matcher_record nfields) def in
-      {cases = []; args = make_args 0 ; default = def}
-
-
-let divide_record all_labels p ctx pm =
-  let get_args = get_args_record (Array.length all_labels) in
-  divide_line
-    (filter_ctx p)
-    (make_record_matching p.pat_loc all_labels)
-    get_args
-    p ctx pm
-
-(* Matching against an array pattern *)
-
-let get_key_array = function
-  | {pat_desc=Tpat_array patl} -> List.length patl
-  | _ -> assert false
-
-let get_args_array p rem = match p with
-| {pat_desc=Tpat_array patl} -> patl@rem
-| _ -> assert false
-
-let matcher_array len p rem = match p.pat_desc with
-| Tpat_or (_,_,_) -> raise OrPat
-| Tpat_array args when List.length args=len -> args @ rem
-| Tpat_any -> Parmatch.omegas len @ rem
-| _ -> raise NoMatch
-
-let make_array_matching  p def ctx = function
-  | [] -> fatal_error "Matching.make_array_matching"
-  | ((arg, _mut) :: argl) ->
-      let len = get_key_array p in
-      let rec make_args pos =
-        if pos >= len
-        then argl
-        else (Lprim(Parrayrefu ,
-                    [arg; Lconst(Const_base(Const_int pos))],
-                    p.pat_loc),
-              StrictOpt) :: make_args (pos + 1) in
-      let def = make_default (matcher_array len) def
-      and ctx = filter_ctx p ctx in
-      {pm={cases = []; args = make_args 0 ; default = def} ;
-        ctx=ctx ;
-        pat = normalize_pat p}
-
-let divide_array ctx pm =
-  divide
-    make_array_matching 
-    (=) get_key_array get_args_array ctx pm
-
-
-(*
-   Specific string test sequence
-   Will be called by the bytecode compiler, from bytegen.ml.
-   The strategy is first dichotomic search (we perform 3-way tests
-   with compare_string), then sequence of equality tests
-   when there are less then T=strings_test_threshold static strings to match.
-
-  Increasing T entails (slightly) less code, decreasing T
-  (slightly) favors runtime speed.
-  T=8 looks a decent tradeoff.
-*)
-
-(* Utilities *)
-
-let strings_test_threshold = 8
-
-let prim_string_notequal =
-  Pccall(Primitive.simple
-           ~name:"caml_string_notequal"
-           ~arity:2
-           ~alloc:false)
-
-let prim_string_compare =
-  Pccall(Primitive.simple
-           ~name:"caml_string_compare"
-           ~arity:2
-           ~alloc:false)
-
-let bind_sw arg k = match arg with
-| Lvar _ -> k arg
-| _ ->
-    let id = Ident.create "switch" in
-    Llet (Strict,Pgenval,id,arg,k (Lvar id))
-
-
-(* Sequential equality tests *)
-
-let make_string_test_sequence loc arg sw d =
-  let d,sw = match d with
-  | None ->
-      begin match sw with
-      | (_,d)::sw -> d,sw
-      | [] -> assert false
-      end
-  | Some d -> d,sw in
-  bind_sw arg
-    (fun arg ->
-      List.fold_right
-        (fun (s,lam) k ->
-          Lifthenelse
-            (Lprim
-               (prim_string_notequal,
-                [arg; Lconst (Const_immstring s)], loc),
-             k,lam))
-        sw d)
-
-let rec split k xs = match xs with
-| [] -> assert false
-| x0::xs ->
-    if k <= 1 then [],x0,xs
-    else
-      let xs,y0,ys = split (k-2) xs in
-      x0::xs,y0,ys
-
-let zero_lam  = Lconst (Const_base (Const_int 0))
-
-let tree_way_test loc arg lt eq gt =
-  Lifthenelse
-    (Lprim (Pintcomp Clt,[arg;zero_lam], loc),lt,
-     Lifthenelse(Lprim (Pintcomp Clt,[zero_lam;arg], loc),gt,eq))
-
-(* Dichotomic tree *)
-
-
-let rec do_make_string_test_tree loc arg sw delta d =
-  let len = List.length sw in
-  if len <= strings_test_threshold+delta then
-    make_string_test_sequence loc arg sw d
-  else
-    let lt,(s,act),gt = split len sw in
-    bind_sw
-      (Lprim
-         (prim_string_compare,
-          [arg; Lconst (Const_immstring s)], loc))
-      (fun r ->
-        tree_way_test loc r
-          (do_make_string_test_tree loc arg lt delta d)
-          act
-          (do_make_string_test_tree loc arg gt delta d))
-
-(* Entry point *)
-let expand_stringswitch loc arg sw d = match d with
-| None ->
-    bind_sw arg
-      (fun arg -> do_make_string_test_tree loc arg sw 0 None)
-| Some e ->
-    bind_sw arg
-      (fun arg ->
-        make_catch e
-          (fun d -> do_make_string_test_tree loc arg sw 1 (Some d)))
-
-(**********************)
-(* Generic test trees *)
-(**********************)
-
-(* Sharing *)
-
-(* Add handler, if shared *)
-let handle_shared () =
-  let hs = ref (fun x -> x) in
-  let handle_shared act = match act with
-  | Switch.Single act -> act
-  | Switch.Shared act ->
-      let i,h = make_catch_delayed act in
-      let ohs = !hs in
-      hs := (fun act -> h (ohs act)) ;
-      make_exit i in
-  hs,handle_shared
-
-
-let share_actions_tree sw d =
-  let store = StoreExp.mk_store () in
-(* Default action is always shared *)
-  let d =
-    match d with
-    | None -> None
-    | Some d -> Some (store.Switch.act_store_shared d) in
-(* Store all other actions *)
-  let sw =
-    List.map  (fun (cst,act) -> cst,store.Switch.act_store act) sw in
-
-(* Retrieve all actions, including potential default *)
-  let acts = store.Switch.act_get_shared () in
-
-(* Array of actual actions *)
-  let hs,handle_shared = handle_shared () in
-  let acts = Array.map handle_shared acts in
-
-(* Reconstruct default and switch list *)
-  let d = match d with
-  | None -> None
-  | Some d -> Some (acts.(d)) in
-  let sw = List.map (fun (cst,j) -> cst,acts.(j)) sw in
-  !hs,sw,d
-
-(* Note: dichotomic search requires sorted input with no duplicates *)
-let rec uniq_lambda_list sw = match sw with
-  | []|[_] -> sw
-  | (c1,_ as p1)::((c2,_)::sw2 as sw1) ->
-      if const_compare c1 c2 = 0 then uniq_lambda_list (p1::sw2)
-      else p1::uniq_lambda_list sw1
-
-let sort_lambda_list l =
-  let l =
-    List.stable_sort (fun (x,_) (y,_) -> const_compare x y) l in
-  uniq_lambda_list l
-
-let rec cut n l =
-  if n = 0 then [],l
-  else match l with
-    [] -> raise (Invalid_argument "cut")
-  | a::l -> let l1,l2 = cut (n-1) l in a::l1, l2
-
-let rec do_tests_fail loc fail tst arg = function
-  | [] -> fail
-  | (c, act)::rem ->
-      Lifthenelse
-        (Lprim (tst, [arg ; Lconst (Const_base c)], loc),
-         do_tests_fail loc fail tst arg rem,
-         act)
-
-let rec do_tests_nofail loc tst arg = function
-  | [] -> fatal_error "Matching.do_tests_nofail"
-  | [_,act] -> act
-  | (c,act)::rem ->
-      Lifthenelse
-        (Lprim (tst, [arg ; Lconst (Const_base c)], loc),
-         do_tests_nofail loc tst arg rem,
-         act)
-
-let make_test_sequence loc fail tst lt_tst arg const_lambda_list =
-  let const_lambda_list = sort_lambda_list const_lambda_list in
-  let hs,const_lambda_list,fail =
-    share_actions_tree const_lambda_list fail in
-
-  let rec make_test_sequence const_lambda_list =
-    if List.length const_lambda_list >= 4 && lt_tst <> Pignore then
-      split_sequence const_lambda_list
-    else match fail with
-    | None -> do_tests_nofail loc tst arg const_lambda_list
-    | Some fail -> do_tests_fail loc fail tst arg const_lambda_list
-
-  and split_sequence const_lambda_list =
-    let list1, list2 =
-      cut (List.length const_lambda_list / 2) const_lambda_list in
-    Lifthenelse(Lprim(lt_tst,
-                      [arg; Lconst(Const_base (fst(List.hd list2)))],
-                      loc),
-                make_test_sequence list1, make_test_sequence list2)
-  in
-  hs (make_test_sequence const_lambda_list)
-
-
-module SArg = struct
-  type primitive = Lambda.primitive
-
-  let eqint = Pintcomp Ceq
-  let neint = Pintcomp Cneq
-  let leint = Pintcomp Cle
-  let ltint = Pintcomp Clt
-  let geint = Pintcomp Cge
-  let gtint = Pintcomp Cgt
-
-  type act = Lambda.lambda
-
-  let make_prim p args = Lprim (p,args,Location.none)
-  let make_offset arg n = match n with
-  | 0 -> arg
-  | _ -> Lprim (Poffsetint n,[arg],Location.none)
-
-  let bind arg body =
-    let newvar,newarg = match arg with
-    | Lvar v -> v,arg
-    | _      ->
-        let newvar = Ident.create "switcher" in
-        newvar,Lvar newvar in
-    bind Alias newvar arg (body newarg)
-  let make_const i = Lconst (Const_base (Const_int i))
-  let make_isout h arg = Lprim (Pisout, [h ; arg],Location.none)
-  let make_isin h arg = Lprim (Pnot,[make_isout h arg],Location.none)
-  let make_if cond ifso ifnot = Lifthenelse (cond, ifso, ifnot)
-  let make_switch loc arg cases acts ~offset sw_names =
-    let l = ref [] in
-    for i = Array.length cases-1 downto 0 do
-      l := (offset + i,acts.(cases.(i))) ::  !l
-    done ;
-    Lswitch(arg,
-            {sw_numconsts = Array.length cases ; sw_consts = !l ;
-             sw_numblocks = 0 ; sw_blocks =  []  ;
-             sw_failaction = None;
-             sw_names}, loc)
-  let make_catch  = make_catch_delayed
-  let make_exit = make_exit
-
-end
-
-(* Action sharing for Lswitch argument *)
-let share_actions_sw sw =
-(* Attempt sharing on all actions *)
-  let store = StoreExp.mk_store () in
-  let fail = match sw.sw_failaction with
-  | None -> None
-  | Some fail ->
-      (* Fail is translated to exit, whatever happens *)
-      Some (store.Switch.act_store_shared fail) in
-  let consts =
-    List.map
-      (fun (i,e) -> i,store.Switch.act_store e)
-      sw.sw_consts
-  and blocks =
-    List.map
-      (fun (i,e) -> i,store.Switch.act_store e)
-      sw.sw_blocks in
-  let acts = store.Switch.act_get_shared () in
-  let hs,handle_shared = handle_shared () in
-  let acts = Array.map handle_shared acts in
-  let fail = match fail with
-  | None -> None
-  | Some fail -> Some (acts.(fail)) in
-  !hs,
-  { sw with
-    sw_consts = List.map (fun (i,j) -> i,acts.(j)) consts ;
-    sw_blocks = List.map (fun (i,j) -> i,acts.(j)) blocks ;
-    sw_failaction = fail; }
-
-(* Reintroduce fail action in switch argument,
-   for the sake of avoiding carrying over huge switches *)
-
-let reintroduce_fail sw = match sw.sw_failaction with
-| None ->
-    let t = Hashtbl.create 17 in
-    let seen (_,l) = match as_simple_exit l with
-    | Some i ->
-        let old = try Hashtbl.find t i with Not_found -> 0 in
-        Hashtbl.replace t i (old+1)
-    | None -> () in
-    List.iter seen sw.sw_consts ;
-    List.iter seen sw.sw_blocks ;
-    let i_max = ref (-1)
-    and max = ref (-1) in
-    Hashtbl.iter
-      (fun i c ->
-        if c > !max then begin
-          i_max := i ;
-          max := c
-        end) t ;
-    if !max >= 3 then
-      let default = !i_max in
-      let remove ls =
-        Ext_list.filter ls
-          (fun (_,lam) -> match as_simple_exit lam with
-          | Some j -> j <> default
-          | None -> true) in
-      {sw with
-       sw_consts = remove sw.sw_consts ;
-       sw_blocks = remove sw.sw_blocks ;
-       sw_failaction = Some (make_exit default)}
-    else sw
-| Some _ -> sw
-
-
-module Switcher = Switch.Make(SArg)
-open Switch
-
-let rec last def = function
-  | [] -> def
-  | [x,_] -> x
-  | _::rem -> last def rem
-
-let get_edges low high l = match l with
-| [] -> low, high
-| (x,_)::_ -> x, last high l
-
-
-let as_interval_canfail fail low high l =
-  let store = StoreExp.mk_store () in
-
-  let do_store _tag act =
-
-    let i =  store.act_store act in
-(*
-    eprintf "STORE [%s] %i %s\n" tag i (string_of_lam act) ;
-*)
-    i in
-
-  let rec nofail_rec cur_low cur_high cur_act = function
-    | [] ->
-        if cur_high = high then
-          [cur_low,cur_high,cur_act]
-        else
-          [(cur_low,cur_high,cur_act) ; (cur_high+1,high, 0)]
-    | ((i,act_i)::rem) as all ->
-        let act_index = do_store "NO" act_i in
-        if cur_high+1= i then
-          if act_index=cur_act then
-            nofail_rec cur_low i cur_act rem
-          else if act_index=0 then
-            (cur_low,i-1, cur_act)::fail_rec i i rem
-          else
-            (cur_low, i-1, cur_act)::nofail_rec i i act_index rem
-        else if act_index = 0 then
-          (cur_low, cur_high, cur_act)::
-          fail_rec (cur_high+1) (cur_high+1) all
-        else
-          (cur_low, cur_high, cur_act)::
-          (cur_high+1,i-1,0)::
-          nofail_rec i i act_index rem
-
-  and fail_rec cur_low cur_high = function
-    | [] -> [(cur_low, cur_high, 0)]
-    | (i,act_i)::rem ->
-        let index = do_store "YES" act_i in
-        if index=0 then fail_rec cur_low i rem
-        else
-          (cur_low,i-1,0)::
-          nofail_rec i i index rem in
-
-  let init_rec = function
-    | [] -> [low,high,0]
-    | (i,act_i)::rem ->
-        let index = do_store "INIT" act_i in
-        if index=0 then
-          fail_rec low i rem
-        else
-          if low < i then
-            (low,i-1,0)::nofail_rec i i index rem
-          else
-            nofail_rec i i index rem in
-
-  assert (do_store "FAIL" fail = 0) ; (* fail has action index 0 *)
-  let r = init_rec l in
-  Array.of_list r,  store
-
-let as_interval_nofail l =
-  let store = StoreExp.mk_store () in
-  let rec some_hole = function
-    | []|[_] -> false
-    | (i,_)::((j,_)::_ as rem) ->
-        j > i+1 || some_hole rem in
-  let rec i_rec cur_low cur_high cur_act = function
-    | [] ->
-        [cur_low, cur_high, cur_act]
-    | (i,act)::rem ->
-        let act_index = store.act_store act in
-        if act_index = cur_act then
-          i_rec cur_low i cur_act rem
-        else
-          (cur_low, cur_high, cur_act)::
-          i_rec i i act_index rem in
-  let inters = match l with
-  | (i,act)::rem ->
-      let act_index =
-        (* In case there is some hole and that a switch is emitted,
-           action 0 will be used as the action of unreachable
-           cases (cf. switch.ml, make_switch).
-           Hence, this action will be shared *)
-        if some_hole rem then
-          store.act_store_shared act
-        else
-          store.act_store act in
-      assert (act_index = 0) ;
-      i_rec i i act_index rem
-  | _ -> assert false in
-
-  Array.of_list inters, store
-
-
-let sort_int_lambda_list l =
-  List.sort
-    (fun (i1,_) (i2,_) ->
-      if i1 < i2 then -1
-      else if i2 < i1 then 1
-      else 0)
-    l
-
-let as_interval fail low high l =
-  let l = sort_int_lambda_list l in
-  get_edges low high l,
-  (match fail with
-  | None -> as_interval_nofail l
-  | Some act -> as_interval_canfail act low high l)
-
-let call_switcher loc fail arg low high int_lambda_list sw_names =
-  let edges, (cases, actions) =
-    as_interval fail low high int_lambda_list in
-  Switcher.zyva loc edges arg cases actions sw_names
-
-
-let rec list_as_pat = function
-  | [] -> fatal_error "Matching.list_as_pat"
-  | [pat] -> pat
-  | pat::rem ->
-      {pat with pat_desc = Tpat_or (pat,list_as_pat rem,None)}
-
-
-let complete_pats_constrs = function
-  | p::_ as pats ->
-      List.map
-        (pat_of_constr p)
-        (complete_constrs p (List.map get_key_constr pats))
-  | _ -> assert false
-
-
-(*
-     Following two ``failaction'' function compute n, the trap handler
-    to jump to in case of failure of elementary tests
-*)
-
-let mk_failaction_neg partial ctx def = match partial with
-| Partial ->
-    begin match def with
-    | (_,idef)::_ ->
-        Some (Lstaticraise (idef,[])),jumps_singleton idef ctx
-    | [] ->
-       (* Act as Total, this means
-          If no appropriate default matrix exists,
-          then this switch cannot fail *)
-        None, jumps_empty
-    end
-| Total ->
-    None, jumps_empty
-
-
-
-(* In line with the article and simpler than before *)
-let mk_failaction_pos partial seen ctx defs  =
-  if dbg then begin
-    prerr_endline "**POS**" ;
-    pretty_def defs ;
-    ()
-  end ;
-  let rec scan_def env to_test defs = match to_test,defs with
-  | ([],_)|(_,[]) ->
-      List.fold_left
-        (fun  (klist,jumps) (pats,i)->
-          let action = Lstaticraise (i,[]) in
-          let klist =
-            List.fold_right
-              (fun pat r -> (get_key_constr pat,action)::r)
-              pats klist
-          and jumps =
-            jumps_add i (ctx_lub (list_as_pat pats) ctx) jumps in
-          klist,jumps)
-        ([],jumps_empty) env
-  | _,(pss,idef)::rem ->
-      let now, later =
-        List.partition
-          (fun (_p,p_ctx) -> ctx_match p_ctx pss) to_test in
-      match now with
-      | [] -> scan_def env to_test rem
-      | _  -> scan_def ((List.map fst now,idef)::env) later rem in
-
-  let fail_pats = complete_pats_constrs seen in
-  if List.length fail_pats < 32 then begin
-    let fail,jmps =
-      scan_def
-        []
-        (List.map
-           (fun pat -> pat, ctx_lub pat ctx)
-           fail_pats)
-        defs in
-    if dbg then begin
-      eprintf "POSITIVE JUMPS [%i]:\n" (List.length fail_pats);
-      pretty_jumps jmps
-    end ;
-    None,fail,jmps
-  end else begin (* Too many non-matched constructors -> reduced information *)
-    if dbg then eprintf "POS->NEG!!!\n%!" ;
-    let fail,jumps =  mk_failaction_neg partial ctx defs in
-    if dbg then
-      eprintf "FAIL: %s\n"
-        (match fail with
-        | None -> "<none>"
-        | Some lam -> string_of_lam lam) ;
-    fail,[],jumps
-  end
-
-let combine_constant names loc arg cst partial ctx def
-    (const_lambda_list, total, _pats) =
-  let fail, local_jumps =
-    mk_failaction_neg partial ctx def in
-  let lambda1 =
-    match cst with
-    | Const_int _ ->
-        let int_lambda_list =
-          List.map (function Const_int n, l -> n,l | _ -> assert false)
-            const_lambda_list in
-        call_switcher loc fail arg min_int max_int int_lambda_list names
-    | Const_char _ ->
-        let int_lambda_list =
-          List.map (function Const_char c, l -> (c, l)
-            | _ -> assert false)
-            const_lambda_list in
-        call_switcher loc fail arg 0 max_int int_lambda_list names
-    | Const_string _ ->
-(* Note as the bytecode compiler may resort to dichotomic search,
-   the clauses of stringswitch  are sorted with duplicates removed.
-   This partly applies to the native code compiler, which requires
-   no duplicates *)
-        let const_lambda_list = sort_lambda_list const_lambda_list in
-        let sw =
-          List.map
-            (fun (c,act) -> match c with
-            | Const_string (s,_) -> s,act
-            | _ -> assert false)
-            const_lambda_list in
-        let hs,sw,fail = share_actions_tree sw fail in
-        hs (Lstringswitch (arg,sw,fail,loc))
-    | Const_float _ ->
-        make_test_sequence loc
-          fail
-          (Pfloatcomp Cneq) (Pfloatcomp Clt)
-          arg const_lambda_list
-    | Const_int32 _ ->
-        make_test_sequence loc
-          fail
-          (Pbintcomp(Pint32, Cneq)) (Pbintcomp(Pint32, Clt))
-          arg const_lambda_list
-    | Const_int64 _ ->
-        make_test_sequence loc
-          fail
-          (Pbintcomp(Pint64, Cneq)) (Pbintcomp(Pint64, Clt))
-          arg const_lambda_list
-    | Const_bigint _ ->
-        make_test_sequence loc
-          fail
-          (Pbigintcomp Cneq) (Pbigintcomp Clt)
-          arg const_lambda_list
-  in lambda1,jumps_union local_jumps total
-
-
-
-let split_cases tag_lambda_list =
-  let rec split_rec = function
-      [] -> ([], [])
-    | (cstr, act) :: rem ->
-        let (consts, nonconsts) = split_rec rem in
-        match cstr with
-          Cstr_constant n -> ((n, act) :: consts, nonconsts)
-        | Cstr_block n    -> (consts, (n, act) :: nonconsts)
-        | Cstr_unboxed    -> (consts, (0, act) :: nonconsts)
-        | Cstr_extension _ -> assert false in
-  let const, nonconst = split_rec tag_lambda_list in
-  sort_int_lambda_list const,
-  sort_int_lambda_list nonconst
-  
-(* refine [split_cases] and [split_variant_cases] *)
-let split_variant_cases tag_lambda_list =
-  let rec split_rec = function
-      [] -> ([], [])
-    | ((name,cstr), act) :: rem ->
-        let (consts, nonconsts) = split_rec rem in
-        match cstr with
-          Cstr_constant n -> ((n, (name, act)) :: consts, nonconsts)
-        | Cstr_block n    -> (consts, (n, (name, act)) :: nonconsts)
-        | Cstr_unboxed    -> assert false
-        | Cstr_extension _ -> assert false in
-  let const, nonconst = split_rec tag_lambda_list in
-  sort_int_lambda_list const,
-  sort_int_lambda_list nonconst  
-
-let split_extension_cases tag_lambda_list =
-  let rec split_rec = function
-      [] -> ([], [])
-    | (cstr, act) :: rem ->
-        let (consts, nonconsts) = split_rec rem in
-        match cstr with
-          Cstr_extension(path, true) when not !Config.bs_only -> ((path, act) :: consts, nonconsts)
-        | Cstr_extension(path, _) -> (consts, (path, act) :: nonconsts)
-        | _ -> assert false in
-  split_rec tag_lambda_list
-
-    
-let extension_slot_eq = 
-   Pccall (Primitive.simple ~name:"#extension_slot_eq" ~arity:2 ~alloc:false)
-let combine_constructor sw_names loc arg ex_pat cstr partial ctx def
-    (tag_lambda_list, total1, pats) =
-  if cstr.cstr_consts < 0 then begin
-    (* Special cases for extensions *)
-    let fail, local_jumps =
-      mk_failaction_neg partial ctx def in
-    let lambda1 =
-      let consts, nonconsts = split_extension_cases tag_lambda_list in
-      let default, consts, nonconsts =
-        match fail with
-        | None ->
-            begin match consts, nonconsts with
-            | _, (_, act)::rem -> act, consts, rem
-            | (_, act)::rem, _ -> act, rem, nonconsts
-            | _ -> assert false
-            end
-        | Some fail -> fail, consts, nonconsts in
-      let nonconst_lambda =
-        match nonconsts with
-          [] -> default
-        | _ ->
-            let tag = Ident.create "tag" in
-            let tests =
-              List.fold_right
-                (fun (path, act) rem ->
-                   let ext = transl_extension_path ex_pat.pat_env path in
-                   Lifthenelse(Lprim(extension_slot_eq , [Lvar tag; ext], loc),
-                               act, rem))
-                nonconsts
-                default
-            in
-              Llet(Alias, Pgenval,tag,  arg, tests)
-      in
-        List.fold_right
-          (fun (path, act) rem ->
-             let ext = transl_extension_path ex_pat.pat_env path in
-             Lifthenelse(Lprim(extension_slot_eq , [arg; ext], loc),
-                         act, rem))
-          consts
-          nonconst_lambda
-    in
-    lambda1, jumps_union local_jumps total1
-  end else begin
-    (* Regular concrete type *)
-    let ncases = List.length tag_lambda_list
-    and nconstrs =  cstr.cstr_consts + cstr.cstr_nonconsts in
-    let sig_complete = ncases = nconstrs in
-    let fail_opt,fails,local_jumps =
-      if sig_complete then None,[],jumps_empty
-      else
-        mk_failaction_pos partial pats ctx def in
-
-    let tag_lambda_list = fails @ tag_lambda_list in
-    let (consts, nonconsts) = split_cases tag_lambda_list in
-    let lambda1 =
-      match fail_opt,same_actions tag_lambda_list with
-      | None,Some act -> act (* Identical actions, no failure *)
-      | _ ->
-          match
-            (cstr.cstr_consts, cstr.cstr_nonconsts, consts, nonconsts)
-          with
-          | (1, 1, [0, act1], [0, act2])
-            when cstr.cstr_name = "::" || cstr.cstr_name = "[]" || Datarepr.constructor_has_optional_shape cstr
-           ->
-              (* Typically, match on lists, will avoid isint primitive in that
-                case *)
-              let arg = 
-                if !Config.bs_only && Datarepr.constructor_has_optional_shape cstr then
-                  Lprim(is_not_none_bs_primitve , [arg], loc)
-                else arg
-              in 
-                Lifthenelse(arg, act2, act1)
-          | (2,0, [(i1,act1); (_,act2)],[]) when cstr.cstr_name = "true" || cstr.cstr_name = "false" ->
-              if i1 = 0 then Lifthenelse(arg, act2, act1)
-              else Lifthenelse (arg, act1, act2)                
-          | (n,0,_,[]) when false (* relies on tag being an int *) -> (* The type defines constant constructors only *)
-              call_switcher loc fail_opt arg 0 (n-1) consts sw_names
-          | (n, _, _, _) ->
-              let act0  =
-                (* = Some act when all non-const constructors match to act *)
-                match fail_opt,nonconsts with
-                | Some a,[] -> Some a
-                | Some _,_ ->
-                    if List.length nonconsts = cstr.cstr_nonconsts then
-                      same_actions nonconsts
-                    else None
-                | None,_ -> same_actions nonconsts in
-              match act0 with
-              | Some act when false (* relies on tag being an int *) ->
-                  Lifthenelse
-                    (Lprim (Pisint, [arg], loc),
-                     call_switcher loc
-                       fail_opt arg
-                       0 (n-1) consts sw_names,
-                     act)
-(* Emit a switch, as bytecode implements this sophisticated instruction *)
-              | _ ->
-                  let sw =
-                    {sw_numconsts = cstr.cstr_consts; sw_consts = consts;
-                     sw_numblocks = cstr.cstr_nonconsts; sw_blocks = nonconsts;
-                     sw_failaction = fail_opt;
-                     sw_names} in
-                  let hs,sw = share_actions_sw sw in
-                  let sw = reintroduce_fail sw in
-                  hs (Lswitch (arg,sw,loc)) in
-    lambda1, jumps_union local_jumps total1
-  end
-
-let make_test_sequence_variant_constant fail arg int_lambda_list =
-  let _, (cases, actions) =
-    as_interval fail min_int max_int (List.map (fun (a,(_,c)) -> (a,c)) int_lambda_list) in
-  Switcher.test_sequence arg cases actions
-
-let call_switcher_variant_constant loc fail arg int_lambda_list names =
-  call_switcher loc fail arg min_int max_int (List.map (fun (a,(_,c)) -> (a,c)) int_lambda_list) names
-
-
-let call_switcher_variant_constr loc fail arg int_lambda_list names =
-  let v = Ident.create "variant" in
-  Llet(Alias, Pgenval, v, Lprim(Pfield (0, Fld_poly_var_tag), [arg], loc),
-       call_switcher loc
-         fail (Lvar v) min_int max_int (List.map (fun (a,(_,c)) -> (a,c)) int_lambda_list) names)
-
-let call_switcher_variant_constant : 
-  (Location.t ->
-   Lambda.lambda option ->
-   Lambda.lambda ->
-   (int * (string * Lambda.lambda)) list -> 
-    Ast_untagged_variants.switch_names option -> 
-   Lambda.lambda)
-    ref= ref call_switcher_variant_constant
-
-let call_switcher_variant_constr :
-  (Location.t ->
-   Lambda.lambda option ->
-   Lambda.lambda ->
-   (int * (string * Lambda.lambda)) list -> 
-    Ast_untagged_variants.switch_names option -> 
-   Lambda.lambda)
-    ref
-  = ref call_switcher_variant_constr
-
-let make_test_sequence_variant_constant :
-  (Lambda.lambda option -> 
-   Lambda.lambda -> 
-   (int * (string * Lambda.lambda)) list -> 
-   Lambda.lambda)
-    ref
-  = ref make_test_sequence_variant_constant        
-
-let combine_variant names loc row arg partial ctx def
-                    (tag_lambda_list, total1, _pats) =
-  let row = Btype.row_repr row in
-  let num_constr = ref 0 in
-  if row.row_closed then
-    List.iter
-      (fun (_, f) ->
-        match Btype.row_field_repr f with
-          Rabsent | Reither(true, _::_, _, _) -> ()
-        | _ -> incr num_constr)
-      row.row_fields
-  else
-    num_constr := max_int;
-  let test_int_or_block arg if_int if_block =
-    if !Config.bs_only then 
-      Lifthenelse(Lprim (Pccall(Primitive.simple ~name:"#is_poly_var_block" ~arity:1 ~alloc:false), [arg], loc), if_block, if_int)
-    else   
-      Lifthenelse(Lprim (Pisint, [arg], loc), if_int, if_block) in
-  let sig_complete =  List.length tag_lambda_list = !num_constr
-  and one_action = same_actions tag_lambda_list in (* reduandant work under bs context *)
-  let fail, local_jumps =
-    if
-      sig_complete  || (match partial with Total -> true | _ -> false)
-    then
-      None, jumps_empty
-    else
-      mk_failaction_neg partial ctx def in
-  let (consts, nonconsts) = split_variant_cases tag_lambda_list in
-  let lambda1 = match fail, one_action with
-  | None, Some act -> act
-  | _,_ ->
-      match (consts, nonconsts) with
-      | ([_, (_,act1)], [_, (_,act2)]) when fail=None ->
-          test_int_or_block arg act1 act2
-      | (_, []) -> (* One can compare integers and pointers *)
-          !make_test_sequence_variant_constant fail arg consts
-      | ([], _) ->
-          let lam = !call_switcher_variant_constr loc
-              fail arg nonconsts names in
-          (* One must not dereference integers *)
-          begin match fail with
-          | None -> lam
-          | Some fail -> test_int_or_block arg fail lam
-          end
-      | (_, _) ->
-          let lam_const =
-            !call_switcher_variant_constant loc
-              fail arg consts names
-          and lam_nonconst =
-            !call_switcher_variant_constr loc
-              fail arg nonconsts names in
-          test_int_or_block arg lam_const lam_nonconst
-  in
-  lambda1, jumps_union local_jumps total1
-
-
-let combine_array names loc arg partial ctx def
-    (len_lambda_list, total1, _pats)  =
-  let fail, local_jumps = mk_failaction_neg partial  ctx def in
-  let lambda1 =
-    let newvar = Ident.create "len" in
-    let switch =
-      call_switcher loc
-        fail (Lvar newvar)
-        0 max_int len_lambda_list names in
-    bind
-      Alias newvar (Lprim(Parraylength , [arg], loc)) switch in
-  lambda1, jumps_union local_jumps total1
-
-(* Insertion of debugging events *)
-
-let [@inline] event_branch _repr lam = lam
-
-
-(*
-   This exception is raised when the compiler cannot produce code
-   because control cannot reach the compiled clause,
-
-   Unused is raised initially in compile_test.
-
-   compile_list (for compiling switch results) catch Unused
-
-   comp_match_handlers (for compiling splitted matches)
-   may reraise Unused
-
-
-*)
-
-exception Unused
-
-let compile_list compile_fun division =
-
-  let rec c_rec totals = function
-  | [] -> [], jumps_unions totals, []
-  | (key, cell) :: rem ->
-      begin match cell.ctx with
-      | [] -> c_rec totals rem
-      | _  ->
-          try
-            let (lambda1, total1) = compile_fun cell.ctx cell.pm in
-            let c_rem, total, new_pats =
-              c_rec
-                (jumps_map ctx_combine total1::totals) rem in
-            ((key,lambda1)::c_rem), total, (cell.pat::new_pats)
-          with
-          | Unused -> c_rec totals rem
-      end in
-  c_rec [] division
-
-
-let compile_orhandlers compile_fun lambda1 total1 ctx to_catch =
-  let rec do_rec r total_r = function
-    | [] -> r,total_r
-    | (mat,i,vars,pm)::rem ->
-        begin try
-          let ctx = select_columns mat ctx in
-          let handler_i, total_i =
-            compile_fun ctx pm in
-          match raw_action r with
-          | Lstaticraise (j,args) ->
-              if i=j then
-                List.fold_right2 (bind Alias) vars args handler_i,
-                jumps_map (ctx_rshift_num (ncols mat)) total_i
-              else
-                do_rec r total_r rem
-          | _ ->
-              do_rec
-                (Lstaticcatch (r,(i,vars), handler_i))
-                (jumps_union
-                   (jumps_remove i total_r)
-                   (jumps_map (ctx_rshift_num (ncols mat)) total_i))
-              rem
-        with
-        | Unused ->
-            do_rec (Lstaticcatch (r, (i,vars), lambda_unit)) total_r rem
-        end in
-  do_rec lambda1 total1 to_catch
-
-
-let compile_test compile_fun partial divide combine ctx to_match =
-  let division = divide ctx to_match in
-  let c_div = compile_list compile_fun division in
-  match c_div with
-  | [],_,_ ->
-     begin match mk_failaction_neg partial ctx to_match.default with
-     | None,_ -> raise Unused
-     | Some l,total -> l,total
-     end
-  | _ ->
-      combine ctx to_match.default c_div
-
-(* Attempt to avoid some useless bindings by lowering them *)
-
-(* Approximation of v present in lam *)
-let rec approx_present v = function
-  | Lconst _ -> false
-  | Lstaticraise (_,args) ->
-      List.exists (fun lam -> approx_present v lam) args
-  | Lprim (_,args,_) ->
-      List.exists (fun lam -> approx_present v lam) args
-  | Llet (Alias, _k, _, l1, l2) ->
-      approx_present v l1 || approx_present v l2
-  | Lvar vv -> Ident.same v vv
-  | _ -> true
-
-let rec lower_bind v arg lam = match lam with
-| Lifthenelse (cond, ifso, ifnot) ->
-    let pcond = approx_present v cond
-    and pso = approx_present v ifso
-    and pnot = approx_present v ifnot in
-    begin match pcond, pso, pnot with
-    | false, false, false -> lam
-    | false, true, false ->
-        Lifthenelse (cond, lower_bind v arg ifso, ifnot)
-    | false, false, true ->
-        Lifthenelse (cond, ifso, lower_bind v arg ifnot)
-    | _,_,_ -> bind Alias v arg lam
-    end
-| Lswitch (ls,({sw_consts=[i,act] ; sw_blocks = []} as sw), loc)
-    when not (approx_present v ls) ->
-      Lswitch (ls, {sw with sw_consts = [i,lower_bind v arg act]}, loc)
-| Lswitch (ls,({sw_consts=[] ; sw_blocks = [i,act]} as sw), loc)
-    when not (approx_present v ls) ->
-      Lswitch (ls, {sw with sw_blocks = [i,lower_bind v arg act]}, loc)
-| Llet (Alias, k, vv, lv, l) ->
-    if approx_present v lv then
-      bind Alias v arg lam
-    else
-      Llet (Alias, k, vv, lv, lower_bind v arg l)
-| Lvar u when Ident.same u v && Ident.name u = "*sth*" -> 
-    arg (* eliminate let *sth* = from_option x in *sth* *)
-| _ ->
-    bind Alias v arg lam
-
-let bind_check str v arg lam = match str,arg with
-| _, Lvar _ ->bind str v arg lam
-| Alias,_ -> lower_bind v arg lam
-| _,_     -> bind str v arg lam
-
-let comp_exit ctx m = match m.default with
-| (_,i)::_ -> Lstaticraise (i,[]), jumps_singleton i ctx
-| _        -> fatal_error "Matching.comp_exit"
-
-
-
-let rec comp_match_handlers comp_fun partial ctx arg first_match next_matchs =
-  match next_matchs with
-  | [] -> comp_fun partial ctx arg first_match
-  | rem ->
-      let rec c_rec body total_body = function
-        | [] -> body, total_body
-        (* Hum, -1 means never taken
-        | (-1,pm)::rem -> c_rec body total_body rem *)
-        | (i,pm)::rem ->
-            let ctx_i,total_rem = jumps_extract i total_body in
-            begin match ctx_i with
-            | [] -> c_rec body total_body rem
-            | _ ->
-                try
-                  let li,total_i =
-                    comp_fun
-                      (match rem with [] -> partial | _ -> Partial)
-                      ctx_i arg pm in
-                  c_rec
-                    (Lstaticcatch (body,(i,[]),li))
-                    (jumps_union total_i total_rem)
-                    rem
-                with
-                | Unused ->
-                    c_rec (Lstaticcatch (body,(i,[]),lambda_unit))
-                      total_rem  rem
-            end in
-   try
-      let first_lam,total = comp_fun Partial ctx arg first_match in
-      c_rec first_lam total rem
-   with Unused -> match next_matchs with
-   | [] -> raise Unused
-   | (_,x)::xs ->  comp_match_handlers comp_fun partial ctx arg x xs
-
-(* To find reasonable names for variables *)
-
-let rec name_pattern default = function
-    (pat :: _, _) :: rem ->
-      begin match Typecore.id_of_pattern pat with
-      | Some id ->  id              
-      | None -> name_pattern default rem
-      end
-  | _ -> Ident.create default
-
-let arg_to_var arg cls = match arg with
-| Lvar v -> v,arg
-| _ ->
-    let v = name_pattern "match" cls in
-    v,Lvar v
-
-(* To be set by Lam_compile *)
-let names_from_construct_pattern : (pattern -> Ast_untagged_variants.switch_names option) ref =
-  ref (fun _ -> None)
-
-(*
-  The main compilation function.
-   Input:
-      repr=used for inserting debug events
-      partial=exhaustiveness information from Parmatch
-      ctx=a context
-      m=a pattern matching
-
-   Output: a lambda term, a jump summary {..., exit number -> context, .. }
-*)
-
-let rec compile_match repr partial ctx m = match m with
-| { cases = []; args = [] } -> comp_exit ctx m
-| { cases = ([], action) :: rem } ->
-    if is_guarded action then begin
-      let (lambda, total) =
-        compile_match None partial ctx { m with cases = rem } in
-      event_branch repr (patch_guarded lambda action), total
-    end else
-      (event_branch repr action, jumps_empty)
-| { args = (arg, str)::argl } ->
-    let v,newarg = arg_to_var arg m.cases in
-    let first_match,rem =
-      split_precompile (Some v)
-        { m with args = (newarg, Alias) :: argl } in
-    let (lam, total) =
-      comp_match_handlers
-        ((if dbg then do_compile_matching_pr else do_compile_matching) repr)
-        partial ctx newarg first_match rem in
-    bind_check str v arg lam, total
-| _ -> assert false
-
-
-(* verbose version of do_compile_matching, for debug *)
-
-and do_compile_matching_pr repr partial ctx arg x =
-  prerr_string "COMPILE: " ;
-  prerr_endline (match partial with Partial -> "Partial" | Total -> "Total") ;
-  prerr_endline "MATCH" ;
-  pretty_precompiled x ;
-  prerr_endline "CTX" ;
-  pretty_ctx ctx ;
-  let (_, jumps) as r =  do_compile_matching repr partial ctx arg x in
-  prerr_endline "JUMPS" ;
-  pretty_jumps jumps ;
-  r
-
-and do_compile_matching repr partial ctx arg pmh = match pmh with
-| Pm pm ->
-  let pat = what_is_cases pm.cases in
-  begin match pat.pat_desc with
-  | Tpat_any ->
-      compile_no_test
-        divide_var ctx_rshift repr partial ctx pm
-  | Tpat_tuple patl ->
-      compile_no_test
-        (divide_tuple (List.length patl) (normalize_pat pat)) ctx_combine
-        repr partial ctx pm
-  | Tpat_record ((_, lbl,_)::_,_) ->
-      compile_no_test
-        (divide_record lbl.lbl_all (normalize_pat pat))
-        ctx_combine repr partial ctx pm
-  | Tpat_constant cst ->
-      let names = None in 
-      compile_test
-        (compile_match repr partial) partial
-        divide_constant
-        (combine_constant names pat.pat_loc arg cst partial)
-        ctx pm
-  | Tpat_construct (_, cstr, _) ->
-      let sw_names = !names_from_construct_pattern pat in  
-      compile_test
-        (compile_match repr partial) partial
-        divide_constructor
-        (combine_constructor sw_names pat.pat_loc arg pat cstr partial)
-        ctx pm
-  | Tpat_array _ ->
-      let names = None in 
-      compile_test (compile_match repr partial) partial
-        divide_array  (combine_array names pat.pat_loc arg partial)
-        ctx pm
-  | Tpat_lazy _ ->
-      compile_no_test
-        (divide_lazy (normalize_pat pat))
-        ctx_combine repr partial ctx pm
-  | Tpat_variant(_, _, row) ->
-      let names = None in 
-      compile_test (compile_match repr partial) partial
-        (divide_variant !row)
-        (combine_variant names pat.pat_loc !row arg partial)
-        ctx pm
-  | _ -> assert false
-  end
-| PmVar {inside=pmh ; var_arg=arg} ->
-    let lam, total =
-      do_compile_matching repr partial (ctx_lshift ctx) arg pmh in
-    lam, jumps_map ctx_rshift total
-| PmOr {body=body ; handlers=handlers} ->
-    let lam, total = compile_match repr partial ctx body in
-    compile_orhandlers (compile_match repr partial) lam total ctx handlers
-
-and compile_no_test divide up_ctx repr partial ctx to_match =
-  let {pm=this_match ; ctx=this_ctx } = divide ctx to_match in
-  let lambda,total = compile_match repr partial this_ctx this_match in
-  lambda, jumps_map up_ctx total
-
-
-
-
-(* The entry points *)
-
-(*
-   If there is a guard in a matching or a lazy pattern,
-   then set exhaustiveness info to Partial.
-   (because of side effects, assume the worst).
-
-   Notice that exhaustiveness information is trusted by the compiler,
-   that is, a match flagged as Total should not fail at runtime.
-   More specifically, for instance if match y with x::_ -> x is flagged
-   total (as it happens during JoCaml compilation) then y cannot be []
-   at runtime. As a consequence, the static Total exhaustiveness information
-   have to be downgraded to Partial, in the dubious cases where guards
-   or lazy pattern execute arbitrary code that may perform side effects
-   and change the subject values.
-LM:
-   Lazy pattern was PR#5992, initial patch by lpw25.
-   I have  generalized the patch, so as to also find mutable fields.
-*)
-
-let find_in_pat pred =
-  let rec find_rec p =
-    pred p.pat_desc ||
-    begin match p.pat_desc with
-    | Tpat_alias (p,_,_) | Tpat_variant (_,Some p,_) | Tpat_lazy p ->
-        find_rec p
-    | Tpat_tuple ps|Tpat_construct (_,_,ps) | Tpat_array ps ->
-        List.exists find_rec ps
-    | Tpat_record (lpats,_) ->
-        List.exists
-          (fun (_, _, p) -> find_rec p)
-          lpats
-    | Tpat_or (p,q,_) ->
-        find_rec p || find_rec q
-    | Tpat_constant _ | Tpat_var _
-    | Tpat_any | Tpat_variant (_,None,_) -> false
-  end in
-  find_rec
-
-let is_lazy_pat = function
-  | Tpat_lazy _ -> true
-  | Tpat_alias _ | Tpat_variant _ | Tpat_record _
-  | Tpat_tuple _|Tpat_construct _ | Tpat_array _
-  | Tpat_or _ | Tpat_constant _ | Tpat_var _ | Tpat_any
-      -> false
-
-let is_lazy p = find_in_pat is_lazy_pat p
-
-let have_mutable_field p = match p with
-| Tpat_record (lps,_) ->
-    List.exists
-      (fun (_,lbl,_) ->
-        match lbl.Types.lbl_mut with
-        | Mutable -> true
-        | Immutable -> false)
-      lps
-| Tpat_alias _ | Tpat_variant _ | Tpat_lazy _
-| Tpat_tuple _|Tpat_construct _ | Tpat_array _
-| Tpat_or _
-| Tpat_constant _ | Tpat_var _ | Tpat_any
-  -> false
-
-let is_mutable p = find_in_pat have_mutable_field p
-
-(* Downgrade Total when
-   1. Matching accesses some mutable fields;
-   2. And there are  guards or lazy patterns.
-*)
-
-let check_partial is_mutable is_lazy pat_act_list = function
-  | Partial -> Partial
-  | Total ->
-      if
-        pat_act_list = [] ||  (* allow empty case list *)
-        List.exists
-          (fun (pats, lam) ->
-            is_mutable pats && (is_guarded lam || is_lazy pats))
-          pat_act_list
-      then Partial
-      else Total
-
-let check_partial_list =
-  check_partial (List.exists is_mutable) (List.exists is_lazy)
-let check_partial = check_partial is_mutable is_lazy
-
-(* have toplevel handler when appropriate *)
-
-let start_ctx n = [{left=[] ; right = omegas n}]
-
-let check_total total lambda i handler_fun =
-  if jumps_is_empty total then
-    lambda
-  else begin
-    Lstaticcatch(lambda, (i,[]), handler_fun())
-  end
-
-let compile_matching repr handler_fun arg pat_act_list partial =
-  let partial = check_partial pat_act_list partial in
-  match partial with
-  | Partial ->
-      let raise_num = next_raise_count () in
-      let pm =
-        { cases = List.map (fun (pat, act) -> ([pat], act)) pat_act_list;
-          args = [arg, Strict] ;
-          default = [[[omega]],raise_num]} in
-      begin try
-        let (lambda, total) = compile_match repr partial (start_ctx 1) pm in
-        check_total total lambda raise_num handler_fun
-      with
-      | Unused -> assert false (* ; handler_fun() *)
-      end
-  | Total ->
-      let pm =
-        { cases = List.map (fun (pat, act) -> ([pat], act)) pat_act_list;
-          args = [arg, Strict] ;
-          default = []} in
-      let (lambda, total) = compile_match repr partial (start_ctx 1) pm in
-      assert (jumps_is_empty total) ;
-      lambda
-
-
-let partial_function loc () =
-  (* [Location.get_pos_info] is too expensive *)
-  let (fname, line, char) = Location.get_pos_info loc.Location.loc_start in
-  let fname = 
-    Filename.basename fname
-  in   
-  Lprim(Praise Raise_regular, [Lprim(Pmakeblock(Blk_extension),
-          [transl_normal_path Predef.path_match_failure;
-           Lconst(Const_block(Blk_tuple,
-              [Const_base(Const_string (fname, None));
-               Const_base(Const_int line);
-               Const_base(Const_int char)]))], loc)], loc)
-
-let for_function loc repr param pat_act_list partial =
-  compile_matching repr (partial_function loc) param pat_act_list partial
-
-(* In the following two cases, exhaustiveness info is not available! *)
-let for_trywith param pat_act_list =
-  compile_matching None
-    (fun () -> Lprim(Praise Raise_reraise, [param], Location.none))
-    param pat_act_list Partial
-
-let simple_for_let loc param pat body =
-  compile_matching None (partial_function loc) param [pat, body] Partial
-
-
-(* Optimize binding of immediate tuples
-
-   The goal of the implementation of 'for_let' below, which replaces
-   'simple_for_let', is to avoid tuple allocation in cases such as
-   this one:
-
-     let (x,y) =
-        let foo = ... in
-        if foo then (1, 2) else (3,4)
-     in bar
-
-   The compiler easily optimizes the simple `let (x,y) = (1,2) in ...`
-   case (call to Matching.for_multiple_match from Translcore), but
-   didn't optimize situations where the rhs tuples are hidden under
-   a more complex context.
-
-   The idea comes from Alain Frisch who suggested and implemented
-   the following compilation method, based on Lassign:
-
-     let x = dummy in let y = dummy in
-     begin
-      let foo = ... in
-      if foo then
-        (let x1 = 1 in let y1 = 2 in x <- x1; y <- y1)
-      else
-        (let x2 = 3 in let y2 = 4 in x <- x2; y <- y2)
-     end;
-     bar
-
-   The current implementation from Gabriel Scherer uses Lstaticcatch /
-   Lstaticraise instead:
-
-     catch
-       let foo = ... in
-       if foo then
-         (let x1 = 1 in let y1 = 2 in exit x1 y1)
-       else
-        (let x2 = 3 in let y2 = 4 in exit x2 y2)
-     with x y ->
-       bar
-
-   The catch/exit is used to avoid duplication of the let body ('bar'
-   in the example), on 'if' branches for example; it is useless for
-   linear contexts such as 'let', but we don't need to be careful to
-   generate nice code because Simplif will remove such useless
-   catch/exit.
-*)
-
-let rec map_return f = function
-  | Llet (str, k, id, l1, l2) -> Llet (str, k, id, l1, map_return f l2)
-  | Lletrec (l1, l2) -> Lletrec (l1, map_return f l2)
-  | Lifthenelse (lcond, lthen, lelse) ->
-      Lifthenelse (lcond, map_return f lthen, map_return f lelse)
-  | Lsequence (l1, l2) -> Lsequence (l1, map_return f l2)
-  | Ltrywith (l1, id, l2) -> Ltrywith (map_return f l1, id, map_return f l2)
-  | Lstaticcatch (l1, b, l2) ->
-      Lstaticcatch (map_return f l1, b, map_return f l2)
-  | Lstaticraise _ | Lprim(Praise _, _, _) as l -> l
-  | l -> f l
-
-(* The 'opt' reference indicates if the optimization is worthy.
-
-   It is shared by the different calls to 'assign_pat' performed from
-   'map_return'. For example with the code
-     let (x, y) = if foo then z else (1,2)
-   the else-branch will activate the optimization for both branches.
-
-   That means that the optimization is activated if *there exists* an
-   interesting tuple in one hole of the let-rhs context. We could
-   choose to activate it only if *all* holes are interesting. We made
-   that choice because being optimistic is extremely cheap (one static
-   exit/catch overhead in the "wrong cases"), while being pessimistic
-   can be costly (one unnecessary tuple allocation).
-*)
-
-let assign_pat opt nraise catch_ids loc pat lam =
-  let rec collect acc pat lam = match pat.pat_desc, lam with
-  | Tpat_tuple patl, Lprim(Pmakeblock _, lams, _) ->
-      opt := true;
-      List.fold_left2 collect acc patl lams
-  | Tpat_tuple patl, Lconst(Const_block( _, scl)) ->
-      opt := true;
-      let collect_const acc pat sc = collect acc pat (Lconst sc) in
-      List.fold_left2 collect_const acc patl scl
-  | _ ->
-    (* pattern idents will be bound in staticcatch (let body), so we
-       refresh them here to guarantee binders  uniqueness *)
-    let pat_ids = pat_bound_idents pat in
-    let fresh_ids = List.map (fun id -> id, Ident.rename id) pat_ids in
-    (fresh_ids, alpha_pat fresh_ids pat, lam) :: acc
-  in
-
-  (* sublets were accumulated by 'collect' with the leftmost tuple
-     pattern at the bottom of the list; to respect right-to-left
-     evaluation order for tuples, we must evaluate sublets
-     top-to-bottom. To preserve tail-rec, we will fold_left the
-     reversed list. *)
-  let rev_sublets = List.rev (collect [] pat lam) in
-  let exit =
-    (* build an Ident.tbl to avoid quadratic refreshing costs *)
-    let add t (id, fresh_id) = Ident.add id fresh_id t in
-    let add_ids acc (ids, _pat, _lam) = List.fold_left add acc ids in
-    let tbl = List.fold_left add_ids Ident.empty rev_sublets in
-    let fresh_var id = Lvar (Ident.find_same id tbl) in
-    Lstaticraise(nraise, List.map fresh_var catch_ids)
-  in
-  let push_sublet code (_ids, pat, lam) = simple_for_let loc lam pat code in
-  List.fold_left push_sublet exit rev_sublets
-
-let for_let loc param pat body =
-  match pat.pat_desc with
-  | Tpat_any ->
-      (* This eliminates a useless variable (and stack slot in bytecode)
-         for "let _ = ...". See #6865. *)
-      Lsequence(param, body)
-  | Tpat_var (id, _) ->
-      (* fast path, and keep track of simple bindings to unboxable numbers *)
-      Llet(Strict, Pgenval, id, param, body)
-  | _ ->
-      (* Turn off such optimization to reduce diff in the beginning - FIXME*)
-      if !Config.bs_only then simple_for_let loc param pat body 
-      else
-      let opt = ref false in
-      let nraise = next_raise_count () in
-      let catch_ids = pat_bound_idents pat in
-      let bind = map_return (assign_pat opt nraise catch_ids loc pat) param in
-      if !opt then Lstaticcatch(bind, (nraise, catch_ids), body)
-      else simple_for_let loc param pat body
-
-(* Handling of tupled functions and matchings *)
-
-(* Easy case since variables are available *)
-let for_tupled_function loc paraml pats_act_list partial =
-  let partial = check_partial_list pats_act_list partial in
-  let raise_num = next_raise_count () in
-  let omegas = [List.map (fun _ -> omega) paraml] in
-  let pm =
-    { cases = pats_act_list;
-      args = List.map (fun id -> (Lvar id, Strict)) paraml ;
-      default = [omegas,raise_num]
-    } in
-  try
-    let (lambda, total) = compile_match None partial
-        (start_ctx (List.length paraml)) pm in
-    check_total total lambda raise_num (partial_function loc)
-  with
-  | Unused -> partial_function loc ()
-
-
-
-let flatten_pattern size p = match p.pat_desc with
-| Tpat_tuple args -> args
-| Tpat_any -> omegas size
-| _ -> raise Cannot_flatten
-
-let rec flatten_pat_line size p k = match p.pat_desc with
-| Tpat_any ->  omegas size::k
-| Tpat_tuple args -> args::k
-| Tpat_or (p1,p2,_) ->  flatten_pat_line size p1 (flatten_pat_line size p2 k)
-| Tpat_alias (p,_,_) -> (* Note: if this 'as' pat is here, then this is a
-                           useless binding, solves PR#3780 *)
-    flatten_pat_line size p k
-| _ -> fatal_error "Matching.flatten_pat_line"
-
-let flatten_cases size cases =
-  List.map
-    (fun (ps,action) -> match ps with
-    | [p] -> flatten_pattern size p,action
-    | _ -> fatal_error "Matching.flatten_case")
-    cases
-
-let flatten_matrix size pss =
-  List.fold_right
-    (fun ps r -> match ps with
-    | [p] -> flatten_pat_line size p r
-    | _   -> fatal_error "Matching.flatten_matrix")
-    pss []
-
-let flatten_def size def =
-  List.map
-    (fun (pss,i) -> flatten_matrix size pss,i)
-    def
-
-let flatten_pm size args pm =
-    {args = args ; cases = flatten_cases size pm.cases ;
-     default = flatten_def size pm.default}
-
-
-let flatten_precompiled size args  pmh = match pmh with
-| Pm pm -> Pm (flatten_pm size args pm)
-| PmOr {body=b ; handlers=hs ; or_matrix=m} ->
-    PmOr
-      {body=flatten_pm size args b ;
-       handlers=
-         List.map
-          (fun (mat,i,vars,pm) -> flatten_matrix size mat,i,vars,pm)
-          hs ;
-       or_matrix=flatten_matrix size m ;}
-| PmVar _ -> assert false
-
-(*
-   compiled_flattened is a ``comp_fun'' argument to comp_match_handlers.
-   Hence it needs a fourth argument, which it ignores
-*)
-
-let compile_flattened repr partial ctx _ pmh = match pmh with
-| Pm pm -> compile_match repr partial ctx pm
-| PmOr {body=b ; handlers=hs} ->
-    let lam, total = compile_match repr partial ctx b in
-    compile_orhandlers (compile_match repr partial) lam total ctx hs
-| PmVar _ -> assert false
-
-let do_for_multiple_match loc paraml pat_act_list partial =
-  let repr = None in
-  let partial = check_partial pat_act_list partial in
-  let raise_num,pm1 =
-    match partial with
-    | Partial ->
-        let raise_num = next_raise_count () in
-        raise_num,
-        { cases = List.map (fun (pat, act) -> ([pat], act)) pat_act_list;
-          args = [Lprim(Pmakeblock( Blk_tuple), paraml, loc), Strict];
-          default = [[[omega]],raise_num] }
-    | _ ->
-        -1,
-        { cases = List.map (fun (pat, act) -> ([pat], act)) pat_act_list;
-          args = [Lprim(Pmakeblock( Blk_tuple), paraml, loc), Strict];
-          default = [] } in
-
-  try
-    try
-(* Once for checking that compilation is possible *)
-      let next, nexts = split_precompile None pm1 in
-
-      let size = List.length paraml
-      and idl = List.map (fun _ -> Ident.create "match") paraml in
-      let args =  List.map (fun id -> Lvar id, Alias) idl in
-
-      let flat_next = flatten_precompiled size args next
-      and flat_nexts =
-        List.map
-          (fun (e,pm) ->  e,flatten_precompiled size args pm)
-          nexts in
-
-      let lam, total =
-        comp_match_handlers
-          (compile_flattened repr)
-          partial (start_ctx size) () flat_next flat_nexts in
-      List.fold_right2 (bind Strict) idl paraml
-        (match partial with
-        | Partial ->
-            check_total total lam raise_num (partial_function loc)
-        | Total ->
-            assert (jumps_is_empty total) ;
-            lam)
-    with Cannot_flatten ->
-      let (lambda, total) = compile_match None partial (start_ctx 1) pm1 in
-      begin match partial with
-      | Partial ->
-          check_total total lambda raise_num (partial_function loc)
-      | Total ->
-          assert (jumps_is_empty total) ;
-          lambda
-      end
-  with Unused ->
-    assert false (* ; partial_function loc () *)
-
-(* PR#4828: Believe it or not, the 'paraml' argument below
-   may not be side effect free. *)
-
-let param_to_var param = match param with
-| Lvar v -> v,None
-| _ -> Ident.create "match",Some param
-
-let bind_opt (v,eo) k = match eo with
-| None -> k
-| Some e ->  Lambda.bind Strict v e k
-
-let for_multiple_match loc paraml pat_act_list partial =
-  let v_paraml = List.map param_to_var paraml in
-  let paraml = List.map (fun (v,_) -> Lvar v) v_paraml in
-  List.fold_right bind_opt v_paraml
-    (do_for_multiple_match loc paraml pat_act_list partial)
diff --git a/jscomp/ml/matching.mli b/jscomp/ml/matching.mli
deleted file mode 100644
index 16fda89..0000000
--- a/jscomp/ml/matching.mli
+++ /dev/null
@@ -1,73 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Compilation of pattern-matching *)
-
-open Typedtree
-open Lambda
-
-val call_switcher_variant_constant : 
-  (Location.t ->
-   Lambda.lambda option ->
-   Lambda.lambda ->
-   (int * (string * Lambda.lambda)) list -> 
-   Ast_untagged_variants.switch_names option -> 
-   Lambda.lambda)
-    ref
-
-val call_switcher_variant_constr :
-  (Location.t ->
-   Lambda.lambda option ->
-   Lambda.lambda ->
-   (int * (string * Lambda.lambda)) list -> 
-   Ast_untagged_variants.switch_names option -> 
-   Lambda.lambda)
-    ref
-
-val make_test_sequence_variant_constant :
-  (Lambda.lambda option -> 
-   Lambda.lambda -> 
-   (int * (string * Lambda.lambda)) list -> 
-   Lambda.lambda)
-    ref    
-    
-(* Entry points to match compiler *)
-val for_function:
-        Location.t -> int ref option -> lambda -> (pattern * lambda) list ->
-        partial -> lambda
-val for_trywith:
-        lambda -> (pattern * lambda) list -> lambda
-val for_let:
-        Location.t -> lambda -> pattern -> lambda -> lambda
-val for_multiple_match:
-        Location.t -> lambda list -> (pattern * lambda) list -> partial ->
-        lambda
-
-val for_tupled_function:
-        Location.t -> Ident.t list -> (pattern list * lambda) list ->
-        partial -> lambda
-
-exception Cannot_flatten
-
-val flatten_pattern: int -> pattern -> pattern list
-
-(* Expand stringswitch to  string test tree *)
-val expand_stringswitch:
-    Location.t -> lambda -> (string * lambda) list -> lambda option -> lambda
-
-val inline_lazy_force : lambda -> Location.t -> lambda
-
-(* To be set by Lam_compile *)
-val names_from_construct_pattern : (pattern -> Ast_untagged_variants.switch_names option) ref
diff --git a/jscomp/ml/mtype.ml b/jscomp/ml/mtype.ml
deleted file mode 100644
index 74aaedd..0000000
--- a/jscomp/ml/mtype.ml
+++ /dev/null
@@ -1,420 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Operations on module types *)
-
-open Asttypes
-open Path
-open Types
-
-
-let rec scrape env mty =
-  match mty with
-    Mty_ident p ->
-      begin try
-        scrape env (Env.find_modtype_expansion p env)
-      with Not_found ->
-        mty
-      end
-  | _ -> mty
-
-let freshen mty =
-  Subst.modtype Subst.identity mty
-
-let rec strengthen ~aliasable env mty p =
-  match scrape env mty with
-    Mty_signature sg ->
-      Mty_signature(strengthen_sig ~aliasable env sg p 0)
-  | Mty_functor(param, arg, res)
-    when !Clflags.applicative_functors && Ident.name param <> "*" ->
-      Mty_functor(param, arg,
-        strengthen ~aliasable:false env res (Papply(p, Pident param)))
-  | mty ->
-      mty
-
-and strengthen_sig ~aliasable env sg p pos =
-  match sg with
-    [] -> []
-  | (Sig_value(_, desc) as sigelt) :: rem ->
-      let nextpos =
-        match desc.val_kind with
-        | Val_prim _ -> pos
-        | _ -> pos + 1
-      in
-      sigelt :: strengthen_sig ~aliasable env rem p nextpos
-  | Sig_type(id, {type_kind=Type_abstract}, _) ::
-    (Sig_type(id', {type_private=Private}, _) :: _ as rem)
-    when Ident.name id = Ident.name id' ^ "#row" ->
-      strengthen_sig ~aliasable env rem p pos
-  | Sig_type(id, decl, rs) :: rem ->
-      let newdecl =
-        match decl.type_manifest, decl.type_private, decl.type_kind with
-          Some _, Public, _ -> decl
-        | Some _, Private, (Type_record _ | Type_variant _) -> decl
-        | _ ->
-            let manif =
-              Some(Btype.newgenty(Tconstr(Pdot(p, Ident.name id, nopos),
-                                          decl.type_params, ref Mnil))) in
-            if decl.type_kind = Type_abstract then
-              { decl with type_private = Public; type_manifest = manif }
-            else
-              { decl with type_manifest = manif }
-      in
-      Sig_type(id, newdecl, rs) :: strengthen_sig ~aliasable env rem p pos
-  | (Sig_typext _ as sigelt) :: rem ->
-      sigelt :: strengthen_sig ~aliasable env rem p (pos+1)
-  | Sig_module(id, md, rs) :: rem ->
-      let str =
-        strengthen_decl ~aliasable env md (Pdot(p, Ident.name id, pos))
-      in
-      Sig_module(id, str, rs)
-      :: strengthen_sig ~aliasable
-        (Env.add_module_declaration ~check:false id md env) rem p (pos+1)
-      (* Need to add the module in case it defines manifest module types *)
-  | Sig_modtype(id, decl) :: rem ->
-      let newdecl =
-        match decl.mtd_type with
-          None ->
-            {decl with mtd_type = Some(Mty_ident(Pdot(p,Ident.name id,nopos)))}
-        | Some _ ->
-            decl
-      in
-      Sig_modtype(id, newdecl) ::
-      strengthen_sig ~aliasable (Env.add_modtype id decl env) rem p pos
-      (* Need to add the module type in case it is manifest *)
-  | (Sig_class _ as sigelt) :: rem ->
-      sigelt :: strengthen_sig ~aliasable env rem p (pos+1)
-  | (Sig_class_type _ as sigelt) :: rem ->
-      sigelt :: strengthen_sig ~aliasable env rem p pos
-
-and strengthen_decl ~aliasable env md p =
-  match md.md_type with
-  | Mty_alias _ -> md
-  | _ when aliasable -> {md with md_type = Mty_alias(Mta_present, p)}
-  | mty -> {md with md_type = strengthen ~aliasable env mty p}
-
-let () = Env.strengthen := strengthen
-
-(* In nondep_supertype, env is only used for the type it assigns to id.
-   Hence there is no need to keep env up-to-date by adding the bindings
-   traversed. *)
-
-type variance = Co | Contra | Strict
-
-let nondep_supertype env mid mty =
-
-  let rec nondep_mty env va mty =
-    match mty with
-      Mty_ident p ->
-        if Path.isfree mid p then
-          nondep_mty env va (Env.find_modtype_expansion p env)
-        else mty
-    | Mty_alias(_, p) ->
-        if Path.isfree mid p then
-          nondep_mty env va (Env.find_module p env).md_type
-        else mty
-    | Mty_signature sg ->
-        Mty_signature(nondep_sig env va sg)
-    | Mty_functor(param, arg, res) ->
-        let var_inv =
-          match va with Co -> Contra | Contra -> Co | Strict -> Strict in
-        Mty_functor(param, Misc.may_map (nondep_mty env var_inv) arg,
-                    nondep_mty
-                      (Env.add_module ~arg:true param
-                         (Btype.default_mty arg) env) va res)
-
-  and nondep_sig env va = function
-    [] -> []
-  | item :: rem ->
-      let rem' = nondep_sig env va rem in
-      match item with
-        Sig_value(id, d) ->
-          Sig_value(id,
-                    {d with val_type = Ctype.nondep_type env mid d.val_type})
-          :: rem'
-      | Sig_type(id, d, rs) ->
-          Sig_type(id, Ctype.nondep_type_decl env mid id (va = Co) d, rs)
-          :: rem'
-      | Sig_typext(id, ext, es) ->
-          Sig_typext(id, Ctype.nondep_extension_constructor env mid ext, es)
-          :: rem'
-      | Sig_module(id, md, rs) ->
-          Sig_module(id, {md with md_type=nondep_mty env va md.md_type}, rs)
-          :: rem'
-      | Sig_modtype(id, d) ->
-          begin try
-            Sig_modtype(id, nondep_modtype_decl env d) :: rem'
-          with Not_found ->
-            match va with
-              Co -> Sig_modtype(id, {mtd_type=None; mtd_loc=Location.none;
-                                     mtd_attributes=[]}) :: rem'
-            | _  -> raise Not_found
-          end
-      | Sig_class _ -> assert false
-      | Sig_class_type(id, d, rs) ->
-          Sig_class_type(id, Ctype.nondep_cltype_declaration env mid d, rs)
-          :: rem'
-
-  and nondep_modtype_decl env mtd =
-    {mtd with mtd_type = Misc.may_map (nondep_mty env Strict) mtd.mtd_type}
-
-  in
-    nondep_mty env Co mty
-
-let enrich_typedecl env p decl =
-  match decl.type_manifest with
-    Some _ -> decl
-  | None ->
-      try
-        let orig_decl = Env.find_type p env in
-        if orig_decl.type_arity <> decl.type_arity
-        then decl
-        else {decl with type_manifest =
-                Some(Btype.newgenty(Tconstr(p, decl.type_params, ref Mnil)))}
-      with Not_found ->
-        decl
-
-let rec enrich_modtype env p mty =
-  match mty with
-    Mty_signature sg ->
-      Mty_signature(List.map (enrich_item env p) sg)
-  | _ ->
-      mty
-
-and enrich_item env p = function
-    Sig_type(id, decl, rs) ->
-      Sig_type(id,
-                enrich_typedecl env (Pdot(p, Ident.name id, nopos)) decl, rs)
-  | Sig_module(id, md, rs) ->
-      Sig_module(id,
-                  {md with
-                   md_type = enrich_modtype env
-                       (Pdot(p, Ident.name id, nopos)) md.md_type},
-                 rs)
-  | item -> item
-
-let rec type_paths env p mty =
-  match scrape env mty with
-    Mty_ident _ -> []
-  | Mty_alias _ -> []
-  | Mty_signature sg -> type_paths_sig env p 0 sg
-  | Mty_functor _ -> []
-
-and type_paths_sig env p pos sg =
-  match sg with
-    [] -> []
-  | Sig_value(_id, decl) :: rem ->
-      let pos' = match decl.val_kind with Val_prim _ -> pos | _ -> pos + 1 in
-      type_paths_sig env p pos' rem
-  | Sig_type(id, _decl, _) :: rem ->
-      Pdot(p, Ident.name id, nopos) :: type_paths_sig env p pos rem
-  | Sig_module(id, md, _) :: rem ->
-      type_paths env (Pdot(p, Ident.name id, pos)) md.md_type @
-      type_paths_sig (Env.add_module_declaration ~check:false id md env)
-        p (pos+1) rem
-  | Sig_modtype(id, decl) :: rem ->
-      type_paths_sig (Env.add_modtype id decl env) p pos rem
-  | (Sig_typext _ | Sig_class _) :: rem ->
-      type_paths_sig env p (pos+1) rem
-  | (Sig_class_type _) :: rem ->
-      type_paths_sig env p pos rem
-
-let rec no_code_needed env mty =
-  match scrape env mty with
-    Mty_ident _ -> false
-  | Mty_signature sg -> no_code_needed_sig env sg
-  | Mty_functor(_, _, _) -> false
-  | Mty_alias(Mta_absent, _) -> true
-  | Mty_alias(Mta_present, _) -> false
-
-and no_code_needed_sig env sg =
-  match sg with
-    [] -> true
-  | Sig_value(_id, decl) :: rem ->
-      begin match decl.val_kind with
-      | Val_prim _ -> no_code_needed_sig env rem
-      | _ -> false
-      end
-  | Sig_module(id, md, _) :: rem ->
-      no_code_needed env md.md_type &&
-      no_code_needed_sig
-        (Env.add_module_declaration ~check:false id md env) rem
-  | (Sig_type _ | Sig_modtype _ | Sig_class_type _) :: rem ->
-      no_code_needed_sig env rem
-  | (Sig_typext _ | Sig_class _) :: _ ->
-      false
-
-
-(* Check whether a module type may return types *)
-
-let rec contains_type env = function
-    Mty_ident path ->
-      begin try match (Env.find_modtype path env).mtd_type with
-      | None -> raise Exit (* PR#6427 *)
-      | Some mty -> contains_type env mty
-      with Not_found -> raise Exit
-      end
-  | Mty_signature sg ->
-      contains_type_sig env sg
-  | Mty_functor (_, _, body) ->
-      contains_type env body
-  | Mty_alias _ ->
-      ()
-
-and contains_type_sig env = List.iter (contains_type_item env)
-
-and contains_type_item env = function
-    Sig_type (_,({type_manifest = None} |
-                 {type_kind = Type_abstract; type_private = Private}),_)
-  | Sig_modtype _
-  | Sig_typext (_, {ext_args = Cstr_record _}, _) ->
-      (* We consider that extension constructors with an inlined
-         record create a type (the inlined record), even though
-         it would be technically safe to ignore that considering
-         the current constraints which guarantee that this type
-         is kept local to expressions.  *)
-      raise Exit
-  | Sig_module (_, {md_type = mty}, _) ->
-      contains_type env mty
-  | Sig_value _
-  | Sig_type _
-  | Sig_typext _
-  | Sig_class _
-  | Sig_class_type _ ->
-      ()
-
-let contains_type env mty =
-  try contains_type env mty; false with Exit -> true
-
-
-(* Remove module aliases from a signature *)
-
-module PathSet = Set.Make (Path)
-module PathMap = Map.Make (Path)
-module IdentSet = Set.Make (Ident)
-
-let rec get_prefixes = function
-    Pident _ -> PathSet.empty
-  | Pdot (p, _, _)
-  | Papply (p, _) -> PathSet.add p (get_prefixes p)
-
-let rec get_arg_paths = function
-    Pident _ -> PathSet.empty
-  | Pdot (p, _, _) -> get_arg_paths p
-  | Papply (p1, p2) ->
-      PathSet.add p2
-        (PathSet.union (get_prefixes p2)
-           (PathSet.union (get_arg_paths p1) (get_arg_paths p2)))
-
-let rec rollback_path subst p =
-  try Pident (PathMap.find p subst)
-  with Not_found ->
-    match p with
-      Pident _ | Papply _ -> p
-    | Pdot (p1, s, n) ->
-        let p1' = rollback_path subst p1 in
-        if Path.same p1 p1' then p else rollback_path subst (Pdot (p1', s, n))
-
-let rec collect_ids subst bindings p =
-    begin match rollback_path subst p with
-      Pident id ->
-        let ids =
-          try collect_ids subst bindings (Ident.find_same id bindings)
-          with Not_found -> IdentSet.empty
-        in
-        IdentSet.add id ids
-    | _ -> IdentSet.empty
-    end
-
-let collect_arg_paths mty =
-  let open Btype in
-  let paths = ref PathSet.empty
-  and subst = ref PathMap.empty
-  and bindings = ref Ident.empty in
-  (* let rt = Ident.create "Root" in
-     and prefix = ref (Path.Pident rt) in *)
-  let it_path p = paths := PathSet.union (get_arg_paths p) !paths
-  and it_signature_item it si =
-    type_iterators.it_signature_item it si;
-    match si with
-      Sig_module (id, {md_type=Mty_alias(_, p)}, _) ->
-        bindings := Ident.add id p !bindings
-    | Sig_module (id, {md_type=Mty_signature sg}, _) ->
-        List.iter
-          (function Sig_module (id', _, _) ->
-              subst :=
-                PathMap.add (Pdot (Pident id, Ident.name id', -1)) id' !subst
-            | _ -> ())
-          sg
-    | _ -> ()
-  in
-  let it = {type_iterators with it_path; it_signature_item} in
-  it.it_module_type it mty;
-  it.it_module_type unmark_iterators mty;
-  PathSet.fold (fun p -> IdentSet.union (collect_ids !subst !bindings p))
-    !paths IdentSet.empty
-
-let rec remove_aliases env excl mty =
-  match mty with
-    Mty_signature sg ->
-      Mty_signature (remove_aliases_sig env excl sg)
-  | Mty_alias _ ->
-      let mty' = Env.scrape_alias env mty in
-      if mty' = mty then mty else (* nested polymorphic comparison *)
-      remove_aliases env excl mty'
-  | mty ->
-      mty
-
-and remove_aliases_sig env excl sg =
-  match sg with
-    [] -> []
-  | Sig_module(id, md, rs) :: rem  ->
-      let mty =
-        match md.md_type with
-          Mty_alias _ when IdentSet.mem id excl ->
-            md.md_type
-        | mty ->
-            remove_aliases env excl mty
-      in
-      Sig_module(id, {md with md_type = mty} , rs) ::
-      remove_aliases_sig (Env.add_module id mty env) excl rem
-  | Sig_modtype(id, mtd) :: rem ->
-      Sig_modtype(id, mtd) ::
-      remove_aliases_sig (Env.add_modtype id mtd env) excl rem
-  | it :: rem ->
-      it :: remove_aliases_sig env excl rem
-
-let remove_aliases env sg =
-  let excl = collect_arg_paths sg in
-  (* PathSet.iter (fun p -> Format.eprintf "%a@ " Printtyp.path p) excl;
-  Format.eprintf "@."; *)
-  remove_aliases env excl sg
-
-
-(* Lower non-generalizable type variables *)
-
-let lower_nongen nglev mty =
-  let open Btype in
-  let it_type_expr it ty =
-    let ty = repr ty in
-    match ty with
-      {desc=Tvar _; level} ->
-        if level < generic_level && level > nglev then set_level ty nglev
-    | _ ->
-        type_iterators.it_type_expr it ty
-  in
-  let it = {type_iterators with it_type_expr} in
-  it.it_module_type it mty;
-  it.it_module_type unmark_iterators mty
diff --git a/jscomp/ml/mtype.mli b/jscomp/ml/mtype.mli
deleted file mode 100644
index 84e870a..0000000
--- a/jscomp/ml/mtype.mli
+++ /dev/null
@@ -1,45 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Operations on module types *)
-
-open Types
-
-val scrape: Env.t -> module_type -> module_type
-        (* Expand toplevel module type abbreviations
-           till hitting a "hard" module type (signature, functor,
-           or abstract module type ident. *)
-val freshen: module_type -> module_type
-        (* Return an alpha-equivalent copy of the given module type
-           where bound identifiers are fresh. *)
-val strengthen: aliasable:bool -> Env.t -> module_type -> Path.t -> module_type
-        (* Strengthen abstract type components relative to the
-           given path. *)
-val strengthen_decl:
-  aliasable:bool -> Env.t -> module_declaration -> Path.t -> module_declaration
-val nondep_supertype: Env.t -> Ident.t -> module_type -> module_type
-        (* Return the smallest supertype of the given type
-           in which the given ident does not appear.
-           Raise [Not_found] if no such type exists. *)
-val no_code_needed: Env.t -> module_type -> bool
-val no_code_needed_sig: Env.t -> signature -> bool
-        (* Determine whether a module needs no implementation code,
-           i.e. consists only of type definitions. *)
-val enrich_modtype: Env.t -> Path.t -> module_type -> module_type
-val enrich_typedecl: Env.t -> Path.t -> type_declaration -> type_declaration
-val type_paths: Env.t -> Path.t -> module_type -> Path.t list
-val contains_type: Env.t -> module_type -> bool
-val remove_aliases: Env.t -> module_type -> module_type
-val lower_nongen: int -> module_type -> unit
diff --git a/jscomp/ml/oprint.ml b/jscomp/ml/oprint.ml
deleted file mode 100644
index fb97c8b..0000000
--- a/jscomp/ml/oprint.ml
+++ /dev/null
@@ -1,776 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                   Projet Cristal, INRIA Rocquencourt                   *)
-(*                                                                        *)
-(*   Copyright 2002 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Format
-open Outcometree
-
-exception Ellipsis
-
-let cautious f ppf arg =
-  try f ppf arg with
-    Ellipsis -> fprintf ppf "..."
-
-let out_ident = ref pp_print_string
-let map_primitive_name = ref (fun x -> x)
-
-let print_lident ppf = function
-  | "::" -> !out_ident ppf "(::)"
-  | s -> !out_ident ppf s
-
-let rec print_ident ppf =
-  function
-    Oide_ident s -> print_lident ppf s
-  | Oide_dot (id, s) ->
-      print_ident ppf id; pp_print_char ppf '.'; print_lident ppf s
-  | Oide_apply (id1, id2) ->
-      fprintf ppf "%a(%a)" print_ident id1 print_ident id2
-
-let parenthesized_ident name =
-  (List.mem name ["or"; "mod"; "land"; "lor"; "lxor"; "lsl"; "lsr"; "asr"])
-  ||
-  (match name.[0] with
-      'a'..'z' | 'A'..'Z' | '\223'..'\246' | '\248'..'\255' | '_' ->
-        false
-    | _ -> true)
-
-let value_ident ppf name =
-  if parenthesized_ident name then
-    fprintf ppf "( %s )" name
-  else
-    pp_print_string ppf name
-
-(* Values *)
-
-let valid_float_lexeme s =
-  let l = String.length s in
-  let rec loop i =
-    if i >= l then s ^ "." else
-    match s.[i] with
-    | '0' .. '9' | '-' -> loop (i+1)
-    | _ -> s
-  in loop 0
-
-let float_repres f =
-  match classify_float f with
-    FP_nan -> "nan"
-  | FP_infinite ->
-      if f < 0.0 then "neg_infinity" else "infinity"
-  | _ ->
-      let float_val =
-        let s1 = Printf.sprintf "%.12g" f in
-        if f = float_of_string s1 then s1 else
-        let s2 = Printf.sprintf "%.15g" f in
-        if f = float_of_string s2 then s2 else
-        Printf.sprintf "%.18g" f
-      in valid_float_lexeme float_val
-
-let parenthesize_if_neg ppf fmt v isneg =
-  if isneg then pp_print_char ppf '(';
-  fprintf ppf fmt v;
-  if isneg then pp_print_char ppf ')'
-
-let escape_string s =
-  (* Escape only C0 control characters (bytes <= 0x1F), DEL(0x7F), '\\' and '"' *)
-   let n = ref 0 in
-  for i = 0 to String.length s - 1 do
-    n := !n +
-      (match String.unsafe_get s i with
-       | '\"' | '\\' | '\n' | '\t' | '\r' | '\b' -> 2
-       | '\x00' .. '\x1F'
-       | '\x7F' -> 4
-       | _ -> 1)
-  done;
-  if !n = String.length s then s else begin
-    let s' = Bytes.create !n in
-    n := 0;
-    for i = 0 to String.length s - 1 do
-      begin match String.unsafe_get s i with
-      | ('\"' | '\\') as c ->
-          Bytes.unsafe_set s' !n '\\'; incr n; Bytes.unsafe_set s' !n c
-      | '\n' ->
-          Bytes.unsafe_set s' !n '\\'; incr n; Bytes.unsafe_set s' !n 'n'
-      | '\t' ->
-          Bytes.unsafe_set s' !n '\\'; incr n; Bytes.unsafe_set s' !n 't'
-      | '\r' ->
-          Bytes.unsafe_set s' !n '\\'; incr n; Bytes.unsafe_set s' !n 'r'
-      | '\b' ->
-          Bytes.unsafe_set s' !n '\\'; incr n; Bytes.unsafe_set s' !n 'b'
-      | '\x00' .. '\x1F' | '\x7F' as c ->
-          let a = Char.code c in
-          Bytes.unsafe_set s' !n '\\';
-          incr n;
-          Bytes.unsafe_set s' !n (Char.chr (48 + a / 100));
-          incr n;
-          Bytes.unsafe_set s' !n (Char.chr (48 + (a / 10) mod 10));
-          incr n;
-          Bytes.unsafe_set s' !n (Char.chr (48 + a mod 10));
-      | c -> Bytes.unsafe_set s' !n c
-      end;
-      incr n
-    done;
-    Bytes.to_string s'
-  end
-
-
-let print_out_string ppf s =
-  let not_escaped =
-    (* let the user dynamically choose if strings should be escaped: *)
-    match Sys.getenv_opt "OCAMLTOP_UTF_8" with
-    | None -> true
-    | Some x ->
-        match bool_of_string_opt x with
-        | None -> true
-        | Some f -> f in
-  if not_escaped then
-    fprintf ppf "\"%s\"" (escape_string s)
-  else
-    fprintf ppf "%S" s
-
-let print_out_value ppf tree =
-  let rec print_tree_1 ppf =
-    function
-    | Oval_constr (name, [param]) ->
-        fprintf ppf "@[<1>%a@ %a@]" print_ident name print_constr_param param
-    | Oval_constr (name, (_ :: _ as params)) ->
-        fprintf ppf "@[<1>%a@ (%a)@]" print_ident name
-          (print_tree_list print_tree_1 ",") params
-    | Oval_variant (name, Some param) ->
-        fprintf ppf "@[<2>`%s@ %a@]" name print_constr_param param
-    | tree -> print_simple_tree ppf tree
-  and print_constr_param ppf = function
-    | Oval_int i -> parenthesize_if_neg ppf "%i" i (i < 0)
-    | Oval_int32 i -> parenthesize_if_neg ppf "%lil" i (i < 0l)
-    | Oval_int64 i -> parenthesize_if_neg ppf "%LiL" i (i < 0L)
-    | Oval_nativeint i -> parenthesize_if_neg ppf "%nin" i (i < 0n)
-    | Oval_float f -> parenthesize_if_neg ppf "%s" (float_repres f) (f < 0.0)
-    | Oval_string (_,_, Ostr_bytes) as tree ->
-      pp_print_char ppf '(';
-      print_simple_tree ppf tree;
-      pp_print_char ppf ')';
-    | tree -> print_simple_tree ppf tree
-  and print_simple_tree ppf =
-    function
-      Oval_int i -> fprintf ppf "%i" i
-    | Oval_int32 i -> fprintf ppf "%lil" i
-    | Oval_int64 i -> fprintf ppf "%LiL" i
-    | Oval_nativeint i -> fprintf ppf "%nin" i
-    | Oval_float f -> pp_print_string ppf (float_repres f)
-    | Oval_char c -> fprintf ppf "%C" c
-    | Oval_string (s, maxlen, kind) ->
-       begin try
-         let len = String.length s in
-         let s = if len > maxlen then String.sub s 0 maxlen else s in
-         begin match kind with
-         | Ostr_bytes -> fprintf ppf "Bytes.of_string %S" s
-         | Ostr_string -> print_out_string ppf s
-         end;
-         (if len > maxlen then
-            fprintf ppf
-              "... (* string length %d; truncated *)" len
-         )
-          with
-          Invalid_argument _ (* "String.create" *)-> fprintf ppf "<huge string>"
-        end
-    | Oval_list tl ->
-        fprintf ppf "@[<1>[%a]@]" (print_tree_list print_tree_1 ";") tl
-    | Oval_array tl ->
-        fprintf ppf "@[<2>[|%a|]@]" (print_tree_list print_tree_1 ";") tl
-    | Oval_constr (name, []) -> print_ident ppf name
-    | Oval_variant (name, None) -> fprintf ppf "`%s" name
-    | Oval_stuff s -> pp_print_string ppf s
-    | Oval_record fel ->
-        fprintf ppf "@[<1>{%a}@]" (cautious (print_fields true)) fel
-    | Oval_ellipsis -> raise Ellipsis
-    | Oval_printer f -> f ppf
-    | Oval_tuple tree_list ->
-        fprintf ppf "@[<1>(%a)@]" (print_tree_list print_tree_1 ",") tree_list
-    | tree -> fprintf ppf "@[<1>(%a)@]" (cautious print_tree_1) tree
-  and print_fields first ppf =
-    function
-      [] -> ()
-    | (name, tree) :: fields ->
-        if not first then fprintf ppf ";@ ";
-        fprintf ppf "@[<1>%a@ =@ %a@]" print_ident name (cautious print_tree_1)
-          tree;
-        print_fields false ppf fields
-  and print_tree_list print_item sep ppf tree_list =
-    let rec print_list first ppf =
-      function
-        [] -> ()
-      | tree :: tree_list ->
-          if not first then fprintf ppf "%s@ " sep;
-          print_item ppf tree;
-          print_list false ppf tree_list
-    in
-    cautious (print_list true) ppf tree_list
-  in
-  cautious print_tree_1 ppf tree
-
-let out_value = ref print_out_value
-
-(* Types *)
-
-let rec print_list_init pr sep ppf =
-  function
-    [] -> ()
-  | a :: l -> sep ppf; pr ppf a; print_list_init pr sep ppf l
-
-let rec print_list pr sep ppf =
-  function
-    [] -> ()
-  | [a] -> pr ppf a
-  | a :: l -> pr ppf a; sep ppf; print_list pr sep ppf l
-
-let pr_present =
-  print_list (fun ppf s -> fprintf ppf "`%s" s) (fun ppf -> fprintf ppf "@ ")
-
-let pr_vars =
-  print_list (fun ppf s -> fprintf ppf "'%s" s) (fun ppf -> fprintf ppf "@ ")
-
-let rec print_out_type ppf =
-  function
-  | Otyp_alias (ty, s) ->
-      fprintf ppf "@[%a@ as '%s@]" print_out_type ty s
-  | Otyp_poly (sl, ty) ->
-      fprintf ppf "@[<hov 2>%a.@ %a@]"
-        pr_vars sl
-        print_out_type ty
-  | ty ->
-      print_out_type_1 ppf ty
-
-and print_out_type_1 ppf =
-  function
-    Otyp_arrow (lab, ty1, ty2) ->
-      pp_open_box ppf 0;
-      if lab <> "" then (pp_print_string ppf lab; pp_print_char ppf ':');
-      print_out_type_2 ppf ty1;
-      pp_print_string ppf " ->";
-      pp_print_space ppf ();
-      print_out_type_1 ppf ty2;
-      pp_close_box ppf ()
-  | ty -> print_out_type_2 ppf ty
-and print_out_type_2 ppf =
-  function
-    Otyp_tuple tyl ->
-      fprintf ppf "@[<0>%a@]" (print_typlist print_simple_out_type " *") tyl
-  | ty -> print_simple_out_type ppf ty
-and print_simple_out_type ppf =
-  function
-    Otyp_class (ng, id, tyl) ->
-      fprintf ppf "@[%a%s#%a@]" print_typargs tyl (if ng then "_" else "")
-        print_ident id
-  | Otyp_constr (Oide_dot (Oide_dot (Oide_ident "Js", "Fn"), name  ),
-                 [tyl])
-    ->
-      let res =
-        if name = "arity0" then
-          Otyp_arrow ("", Otyp_constr (Oide_ident "unit", []),tyl)
-        else tyl
-      in
-          fprintf ppf "@[<0>(%a@ [@bs])@]" print_out_type_1 res
-  | Otyp_constr (Oide_dot (Oide_dot (Oide_ident "Js_OO", "Meth" ),name),
-        [tyl])
-    -> 
-      let res =
-        if name = "arity0" then
-          Otyp_arrow ("", Otyp_constr (Oide_ident "unit", []),tyl)
-        else tyl
-      in 
-      fprintf ppf "@[<0>(%a@ [@bs.meth])@]" print_out_type_1 res
-  | Otyp_constr (Oide_dot (Oide_dot (Oide_ident "Js_OO", "Callback" ), _),
-                 [tyl])
-    -> 
-      fprintf ppf "@[<0>(%a@ [@bs.this])@]" print_out_type_1 tyl  
-  | Otyp_constr (id, tyl) ->
-      pp_open_box ppf 0;
-      print_typargs ppf tyl;
-      print_ident ppf id;
-      pp_close_box ppf ()
-  | Otyp_object (fields, rest) ->
-      fprintf ppf "@[<2>< %a >@]" (print_fields rest) fields
-  | Otyp_stuff s -> pp_print_string ppf s
-  | Otyp_var (ng, s) -> fprintf ppf "'%s%s" (if ng then "_" else "") s
-  | Otyp_variant (non_gen, row_fields, closed, tags) ->
-      let print_present ppf =
-        function
-          None | Some [] -> ()
-        | Some l -> fprintf ppf "@;<1 -2>> @[<hov>%a@]" pr_present l
-      in
-      let print_fields ppf =
-        function
-          Ovar_fields fields ->
-            print_list print_row_field (fun ppf -> fprintf ppf "@;<1 -2>| ")
-              ppf fields
-        | Ovar_typ typ ->
-           print_simple_out_type ppf typ
-      in
-      fprintf ppf "%s[%s@[<hv>@[<hv>%a@]%a ]@]" (if non_gen then "_" else "")
-        (if closed then if tags = None then " " else "< "
-         else if tags = None then "> " else "? ")
-        print_fields row_fields
-        print_present tags
-  | Otyp_alias _ | Otyp_poly _ | Otyp_arrow _ | Otyp_tuple _ as ty ->
-      pp_open_box ppf 1;
-      pp_print_char ppf '(';
-      print_out_type ppf ty;
-      pp_print_char ppf ')';
-      pp_close_box ppf ()
-  | Otyp_abstract | Otyp_open
-  | Otyp_sum _ | Otyp_manifest (_, _) -> ()
-  | Otyp_record lbls -> print_record_decl ppf lbls
-  | Otyp_module (p, n, tyl) ->
-      fprintf ppf "@[<1>(module %s" p;
-      let first = ref true in
-      List.iter2
-        (fun s t ->
-          let sep = if !first then (first := false; "with") else "and" in
-          fprintf ppf " %s type %s = %a" sep s print_out_type t
-        )
-        n tyl;
-      fprintf ppf ")@]"
-  | Otyp_attribute (t, attr) ->
-      fprintf ppf "@[<1>(%a [@@%s])@]" print_out_type t attr.oattr_name
-and print_record_decl ppf lbls =
-  fprintf ppf "{%a@;<1 -2>}"
-    (print_list_init print_out_label (fun ppf -> fprintf ppf "@ ")) lbls
-and print_fields rest ppf =
-  function
-    [] ->
-      begin match rest with
-        Some non_gen -> fprintf ppf "%s.." (if non_gen then "_" else "")
-      | None -> ()
-      end
-  | [s, t] ->
-      fprintf ppf "%s : %a" s print_out_type t;
-      begin match rest with
-        Some _ -> fprintf ppf ";@ "
-      | None -> ()
-      end;
-      print_fields rest ppf []
-  | (s, t) :: l ->
-      fprintf ppf "%s : %a;@ %a" s print_out_type t (print_fields rest) l
-and print_row_field ppf (l, opt_amp, tyl) =
-  let pr_of ppf =
-    if opt_amp then fprintf ppf " of@ &@ "
-    else if tyl <> [] then fprintf ppf " of@ "
-    else fprintf ppf ""
-  in
-  fprintf ppf "@[<hv 2>`%s%t%a@]" l pr_of (print_typlist print_out_type " &")
-    tyl
-and print_typlist print_elem sep ppf =
-  function
-    [] -> ()
-  | [ty] -> print_elem ppf ty
-  | ty :: tyl ->
-      print_elem ppf ty;
-      pp_print_string ppf sep;
-      pp_print_space ppf ();
-      print_typlist print_elem sep ppf tyl
-and print_typargs ppf =
-  function
-    [] -> ()
-  | [ty1] -> print_simple_out_type ppf ty1; pp_print_space ppf ()
-  | tyl ->
-      pp_open_box ppf 1;
-      pp_print_char ppf '(';
-      print_typlist print_out_type "," ppf tyl;
-      pp_print_char ppf ')';
-      pp_close_box ppf ();
-      pp_print_space ppf ()
-and print_out_label ppf (name, mut, opt, arg) =
-  fprintf ppf "@[<2>%s%s%s :@ %a@];" (if opt then "@optional " else "") (if mut then "mutable " else "") name
-    print_out_type arg
-
-let out_type = ref print_out_type
-
-(* Class types *)
-
-let type_parameter ppf (ty, (co, cn)) =
-  fprintf ppf "%s%s"
-    (if not cn then "+" else if not co then "-" else "")
-    (if ty = "_" then ty else "'"^ty)
-
-let print_out_class_params ppf =
-  function
-    [] -> ()
-  | tyl ->
-      fprintf ppf "@[<1>[%a]@]@ "
-        (print_list type_parameter (fun ppf -> fprintf ppf ", "))
-        tyl
-
-let rec print_out_class_type ppf =
-  function
-    Octy_constr (id, tyl) ->
-      let pr_tyl ppf =
-        function
-          [] -> ()
-        | tyl ->
-            fprintf ppf "@[<1>[%a]@]@ " (print_typlist !out_type ",") tyl
-      in
-      fprintf ppf "@[%a%a@]" pr_tyl tyl print_ident id
-  | Octy_arrow (lab, ty, cty) ->
-      fprintf ppf "@[%s%a ->@ %a@]" (if lab <> "" then lab ^ ":" else "")
-        print_out_type_2 ty print_out_class_type cty
-  | Octy_signature (self_ty, csil) ->
-      let pr_param ppf =
-        function
-          Some ty -> fprintf ppf "@ @[(%a)@]" !out_type ty
-        | None -> ()
-      in
-      fprintf ppf "@[<hv 2>@[<2>object%a@]@ %a@;<1 -2>end@]" pr_param self_ty
-        (print_list print_out_class_sig_item (fun ppf -> fprintf ppf "@ "))
-        csil
-and print_out_class_sig_item ppf =
-  function
-    Ocsg_constraint (ty1, ty2) ->
-      fprintf ppf "@[<2>constraint %a =@ %a@]" !out_type ty1
-        !out_type ty2
-  | Ocsg_method (name, priv, virt, ty) ->
-      fprintf ppf "@[<2>method %s%s%s :@ %a@]"
-        (if priv then "private " else "") (if virt then "virtual " else "")
-        name !out_type ty
-  | Ocsg_value (name, mut, vr, ty) ->
-      fprintf ppf "@[<2>val %s%s%s :@ %a@]"
-        (if mut then "mutable " else "")
-        (if vr then "virtual " else "")
-        name !out_type ty
-
-let out_class_type = ref print_out_class_type
-
-(* Signature *)
-
-let out_module_type = ref (fun _ -> failwith "Oprint.out_module_type")
-let out_sig_item = ref (fun _ -> failwith "Oprint.out_sig_item")
-let out_signature = ref (fun _ -> failwith "Oprint.out_signature")
-let out_type_extension = ref (fun _ -> failwith "Oprint.out_type_extension")
-
-let rec print_out_functor funct ppf =
-  function
-    Omty_functor (_, None, mty_res) ->
-      if funct then fprintf ppf "() %a" (print_out_functor true) mty_res
-      else fprintf ppf "functor@ () %a" (print_out_functor true) mty_res
-  | Omty_functor (name, Some mty_arg, mty_res) -> begin
-      match name, funct with
-      | "_", true ->
-          fprintf ppf "->@ %a ->@ %a"
-            print_out_module_type mty_arg (print_out_functor false) mty_res
-      | "_", false ->
-          fprintf ppf "%a ->@ %a"
-            print_out_module_type mty_arg (print_out_functor false) mty_res
-      | name, true ->
-          fprintf ppf "(%s : %a) %a" name
-            print_out_module_type mty_arg (print_out_functor true) mty_res
-      | name, false ->
-            fprintf ppf "functor@ (%s : %a) %a" name
-              print_out_module_type mty_arg (print_out_functor true) mty_res
-    end
-  | m ->
-      if funct then fprintf ppf "->@ %a" print_out_module_type m
-      else print_out_module_type ppf m
-
-and print_out_module_type ppf =
-  function
-    Omty_abstract -> ()
-  | Omty_functor _ as t ->
-      fprintf ppf "@[<2>%a@]" (print_out_functor false) t
-  | Omty_ident id -> fprintf ppf "%a" print_ident id
-  | Omty_signature sg ->
-      fprintf ppf "@[<hv 2>sig@ %a@;<1 -2>end@]" !out_signature sg
-  | Omty_alias id -> fprintf ppf "(module %a)" print_ident id
-and print_out_signature ppf =
-  function
-    [] -> ()
-  | [item] -> !out_sig_item ppf item
-  | Osig_typext(ext, Oext_first) :: items ->
-      (* Gather together the extension constructors *)
-      let rec gather_extensions acc items =
-        match items with
-            Osig_typext(ext, Oext_next) :: items ->
-              gather_extensions
-                ((ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr) :: acc)
-                items
-          | _ -> (List.rev acc, items)
-      in
-      let exts, items =
-        gather_extensions
-          [(ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)]
-          items
-      in
-      let te =
-        { otyext_name = ext.oext_type_name;
-          otyext_params = ext.oext_type_params;
-          otyext_constructors = exts;
-          otyext_private = ext.oext_private }
-      in
-        fprintf ppf "%a@ %a" !out_type_extension te print_out_signature items
-  | item :: items ->
-      fprintf ppf "%a@ %a" !out_sig_item item print_out_signature items
-and print_out_sig_item ppf =
-  function
-    Osig_class (vir_flag, name, params, clt, rs) ->
-      fprintf ppf "@[<2>%s%s@ %a%s@ :@ %a@]"
-        (if rs = Orec_next then "and" else "class")
-        (if vir_flag then " virtual" else "") print_out_class_params params
-        name !out_class_type clt
-  | Osig_class_type (vir_flag, name, params, clt, rs) ->
-      fprintf ppf "@[<2>%s%s@ %a%s@ =@ %a@]"
-        (if rs = Orec_next then "and" else "class type")
-        (if vir_flag then " virtual" else "") print_out_class_params params
-        name !out_class_type clt
-  | Osig_typext (ext, Oext_exception) ->
-      fprintf ppf "@[<2>exception %a@]"
-        print_out_constr (ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)
-  | Osig_typext (ext, _es) ->
-      print_out_extension_constructor ppf ext
-  | Osig_modtype (name, Omty_abstract) ->
-      fprintf ppf "@[<2>module type %s@]" name
-  | Osig_modtype (name, mty) ->
-      fprintf ppf "@[<2>module type %s =@ %a@]" name !out_module_type mty
-  | Osig_module (name, Omty_alias id, _) ->
-      fprintf ppf "@[<2>module %s =@ %a@]" name print_ident id
-  | Osig_module (name, mty, rs) ->
-      fprintf ppf "@[<2>%s %s :@ %a@]"
-        (match rs with Orec_not -> "module"
-                     | Orec_first -> "module rec"
-                     | Orec_next -> "and")
-        name !out_module_type mty
-  | Osig_type(td, rs) ->
-        print_out_type_decl
-          (match rs with
-           | Orec_not   -> "type nonrec"
-           | Orec_first -> "type"
-           | Orec_next  -> "and")
-          ppf td
-  | Osig_value vd ->
-      let kwd = if vd.oval_prims = [] then "val" else "external" in
-      let pr_prims ppf =
-        function
-          [] -> ()
-        | s :: sl ->
-            fprintf ppf "@ = \"%s\"" s;
-            List.iter (fun s ->
-(* TODO: in general, we should print bs attributes, some attributes like
-  bs.splice does need it *)  
-      fprintf ppf "@ \"%s\"" (!map_primitive_name s)
-              ) sl
-      in
-      fprintf ppf "@[<2>%s %a :@ %a%a%a@]" kwd value_ident vd.oval_name
-        !out_type vd.oval_type pr_prims vd.oval_prims
-        (fun ppf -> List.iter (fun a -> fprintf ppf "@ [@@@@%s]" a.oattr_name))
-        vd.oval_attributes
-  | Osig_ellipsis ->
-      fprintf ppf "..."
-
-and print_out_type_decl kwd ppf td =
-  let print_constraints ppf =
-    List.iter
-      (fun (ty1, ty2) ->
-         fprintf ppf "@ @[<2>constraint %a =@ %a@]" !out_type ty1
-           !out_type ty2)
-      td.otype_cstrs
-  in
-  let type_defined ppf =
-    match td.otype_params with
-      [] -> pp_print_string ppf td.otype_name
-    | [param] -> fprintf ppf "@[%a@ %s@]" type_parameter param td.otype_name
-    | _ ->
-        fprintf ppf "@[(@[%a)@]@ %s@]"
-          (print_list type_parameter (fun ppf -> fprintf ppf ",@ "))
-          td.otype_params
-          td.otype_name
-  in
-  let print_manifest ppf =
-    function
-      Otyp_manifest (ty, _) -> fprintf ppf " =@ %a" !out_type ty
-    | _ -> ()
-  in
-  let print_name_params ppf =
-    fprintf ppf "%s %t%a" kwd type_defined print_manifest td.otype_type
-  in
-  let ty =
-    match td.otype_type with
-      Otyp_manifest (_, ty) -> ty
-    | _ -> td.otype_type
-  in
-  let print_private ppf = function
-    Asttypes.Private -> fprintf ppf " private"
-  | Asttypes.Public -> ()
-  in
-  let print_immediate ppf =
-    if td.otype_immediate then fprintf ppf " [%@%@immediate]" else ()
-  in
-  let print_unboxed ppf =
-    if td.otype_unboxed then fprintf ppf " [%@%@unboxed]" else ()
-  in
-  let print_out_tkind ppf = function
-  | Otyp_abstract -> ()
-  | Otyp_record lbls ->
-      fprintf ppf " =%a %a"
-        print_private td.otype_private
-        print_record_decl lbls
-  | Otyp_sum constrs ->
-      fprintf ppf " =%a@;<1 2>%a"
-        print_private td.otype_private
-        (print_list print_out_constr (fun ppf -> fprintf ppf "@ | ")) constrs
-  | Otyp_open ->
-      fprintf ppf " =%a .."
-        print_private td.otype_private
-  | ty ->
-      fprintf ppf " =%a@;<1 2>%a"
-        print_private td.otype_private
-        !out_type ty
-  in
-  fprintf ppf "@[<2>@[<hv 2>%t%a@]%t%t%t@]"
-    print_name_params
-    print_out_tkind ty
-    print_constraints
-    print_immediate
-    print_unboxed
-
-and print_out_constr ppf (name, tyl, ret_type_opt, repr) =
-  let () = match repr with
-    | None -> ()
-    | Some s -> pp_print_string ppf s in
-  let name =
-    match name with
-    | "::" -> "(::)"   (* #7200 *)
-    | s -> s
-  in
-  match ret_type_opt with
-  | None ->
-      begin match tyl with
-      | [] ->
-          pp_print_string ppf name
-      | _ ->
-          fprintf ppf "@[<2>%s of@ %a@]" name
-            (print_typlist print_simple_out_type " *") tyl
-      end
-  | Some ret_type ->
-      begin match tyl with
-      | [] ->
-          fprintf ppf "@[<2>%s :@ %a@]" name print_simple_out_type  ret_type
-      | _ ->
-          fprintf ppf "@[<2>%s :@ %a -> %a@]" name
-            (print_typlist print_simple_out_type " *")
-            tyl print_simple_out_type ret_type
-      end
-
-and print_out_extension_constructor ppf ext =
-  let print_extended_type ppf =
-    let print_type_parameter ppf ty =
-      fprintf ppf "%s"
-        (if ty = "_" then ty else "'"^ty)
-    in
-      match ext.oext_type_params with
-        [] -> fprintf ppf "%s" ext.oext_type_name
-      | [ty_param] ->
-        fprintf ppf "@[%a@ %s@]"
-          print_type_parameter
-          ty_param
-          ext.oext_type_name
-      | _ ->
-        fprintf ppf "@[(@[%a)@]@ %s@]"
-          (print_list print_type_parameter (fun ppf -> fprintf ppf ",@ "))
-          ext.oext_type_params
-          ext.oext_type_name
-  in
-  fprintf ppf "@[<hv 2>type %t +=%s@;<1 2>%a@]"
-    print_extended_type
-    (if ext.oext_private = Asttypes.Private then " private" else "")
-    print_out_constr (ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)
-
-and print_out_type_extension ppf te =
-  let print_extended_type ppf =
-    let print_type_parameter ppf ty =
-      fprintf ppf "%s"
-        (if ty = "_" then ty else "'"^ty)
-    in
-    match te.otyext_params with
-      [] -> fprintf ppf "%s" te.otyext_name
-    | [param] ->
-      fprintf ppf "@[%a@ %s@]"
-        print_type_parameter param
-        te.otyext_name
-    | _ ->
-        fprintf ppf "@[(@[%a)@]@ %s@]"
-          (print_list print_type_parameter (fun ppf -> fprintf ppf ",@ "))
-          te.otyext_params
-          te.otyext_name
-  in
-  fprintf ppf "@[<hv 2>type %t +=%s@;<1 2>%a@]"
-    print_extended_type
-    (if te.otyext_private = Asttypes.Private then " private" else "")
-    (print_list print_out_constr (fun ppf -> fprintf ppf "@ | "))
-    te.otyext_constructors
-
-let _ = out_module_type := print_out_module_type
-let _ = out_signature := print_out_signature
-let _ = out_sig_item := print_out_sig_item
-let _ = out_type_extension := print_out_type_extension
-
-(* Phrases *)
-
-let print_out_exception ppf exn outv =
-  match exn with
-    Sys.Break -> fprintf ppf "Interrupted.@."
-  | Out_of_memory -> fprintf ppf "Out of memory during evaluation.@."
-  | Stack_overflow ->
-      fprintf ppf "Stack overflow during evaluation (looping recursion?).@."
-  | _ -> fprintf ppf "@[Exception:@ %a.@]@." !out_value outv
-
-let rec print_items ppf =
-  function
-    [] -> ()
-  | (Osig_typext(ext, Oext_first), None) :: items ->
-      (* Gather together extension constructors *)
-      let rec gather_extensions acc items =
-        match items with
-            (Osig_typext(ext, Oext_next), None) :: items ->
-              gather_extensions
-                ((ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr) :: acc)
-                items
-          | _ -> (List.rev acc, items)
-      in
-      let exts, items =
-        gather_extensions
-          [(ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)]
-          items
-      in
-      let te =
-        { otyext_name = ext.oext_type_name;
-          otyext_params = ext.oext_type_params;
-          otyext_constructors = exts;
-          otyext_private = ext.oext_private }
-      in
-        fprintf ppf "@[%a@]" !out_type_extension te;
-        if items <> [] then fprintf ppf "@ %a" print_items items
-  | (tree, valopt) :: items ->
-      begin match valopt with
-        Some v ->
-          fprintf ppf "@[<2>%a =@ %a@]" !out_sig_item tree
-            !out_value v
-      | None -> fprintf ppf "@[%a@]" !out_sig_item tree
-      end;
-      if items <> [] then fprintf ppf "@ %a" print_items items
-
-let print_out_phrase ppf =
-  function
-    Ophr_eval (outv, ty) ->
-      fprintf ppf "@[- : %a@ =@ %a@]@." !out_type ty !out_value outv
-  | Ophr_signature [] -> ()
-  | Ophr_signature items -> fprintf ppf "@[<v>%a@]@." print_items items
-  | Ophr_exception (exn, outv) -> print_out_exception ppf exn outv
-
-let out_phrase = ref print_out_phrase
diff --git a/jscomp/ml/outcometree.ml b/jscomp/ml/outcometree.ml
deleted file mode 100644
index 2bad441..0000000
--- a/jscomp/ml/outcometree.ml
+++ /dev/null
@@ -1,145 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*      Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt          *)
-(*                                                                        *)
-(*   Copyright 2001 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Module [Outcometree]: results displayed by the toplevel *)
-
-(* These types represent messages that the toplevel displays as normal
-   results or errors. The real displaying is customisable using the hooks:
-      [Toploop.print_out_value]
-      [Toploop.print_out_type]
-      [Toploop.print_out_sig_item]
-      [Toploop.print_out_phrase] *)
-
-type out_ident =
-  | Oide_apply of out_ident * out_ident
-  | Oide_dot of out_ident * string
-  | Oide_ident of string
-
-type out_string =
-  | Ostr_string
-  | Ostr_bytes
-
-type out_attribute =
-  { oattr_name: string }
-
-type out_value =
-  | Oval_array of out_value list
-  | Oval_char of char
-  | Oval_constr of out_ident * out_value list
-  | Oval_ellipsis
-  | Oval_float of float
-  | Oval_int of int
-  | Oval_int32 of int32
-  | Oval_int64 of int64
-  | Oval_nativeint of nativeint
-  | Oval_list of out_value list
-  | Oval_printer of (Format.formatter -> unit)
-  | Oval_record of (out_ident * out_value) list
-  | Oval_string of string * int * out_string (* string, size-to-print, kind *)
-  | Oval_stuff of string
-  | Oval_tuple of out_value list
-  | Oval_variant of string * out_value option
-
-type out_type =
-  | Otyp_abstract
-  | Otyp_open
-  | Otyp_alias of out_type * string
-  | Otyp_arrow of string * out_type * out_type
-  | Otyp_class of bool * out_ident * out_type list
-  | Otyp_constr of out_ident * out_type list
-  | Otyp_manifest of out_type * out_type
-  | Otyp_object of (string * out_type) list * bool option
-  | Otyp_record of (string * bool * bool * out_type) list
-  | Otyp_stuff of string
-  | Otyp_sum of (string * out_type list * out_type option * string option) list
-  | Otyp_tuple of out_type list
-  | Otyp_var of bool * string
-  | Otyp_variant of
-      bool * out_variant * bool * (string list) option
-  | Otyp_poly of string list * out_type
-  | Otyp_module of string * string list * out_type list
-  | Otyp_attribute of out_type * out_attribute
-
-and out_variant =
-  | Ovar_fields of (string * bool * out_type list) list
-  | Ovar_typ of out_type
-
-type out_class_type =
-  | Octy_constr of out_ident * out_type list
-  | Octy_arrow of string * out_type * out_class_type
-  | Octy_signature of out_type option * out_class_sig_item list
-and out_class_sig_item =
-  | Ocsg_constraint of out_type * out_type
-  | Ocsg_method of string * bool * bool * out_type
-  | Ocsg_value of string * bool * bool * out_type
-
-type out_module_type =
-  | Omty_abstract
-  | Omty_functor of string * out_module_type option * out_module_type
-  | Omty_ident of out_ident
-  | Omty_signature of out_sig_item list
-  | Omty_alias of out_ident
-and out_sig_item =
-  | Osig_class of
-      bool * string * (string * (bool * bool)) list * out_class_type *
-        out_rec_status
-  | Osig_class_type of
-      bool * string * (string * (bool * bool)) list * out_class_type *
-        out_rec_status
-  | Osig_typext of out_extension_constructor * out_ext_status
-  | Osig_modtype of string * out_module_type
-  | Osig_module of string * out_module_type * out_rec_status
-  | Osig_type of out_type_decl * out_rec_status
-  | Osig_value of out_val_decl
-  | Osig_ellipsis
-and out_type_decl =
-  { otype_name: string;
-    otype_params: (string * (bool * bool)) list;
-    otype_type: out_type;
-    otype_private: Asttypes.private_flag;
-    otype_immediate: bool;
-    otype_unboxed: bool;
-    otype_cstrs: (out_type * out_type) list }
-and out_extension_constructor =
-  { oext_name: string;
-    oext_type_name: string;
-    oext_type_params: string list;
-    oext_args: out_type list;
-    oext_ret_type: out_type option;
-    oext_repr: string option;
-    oext_private: Asttypes.private_flag }
-and out_type_extension =
-  { otyext_name: string;
-    otyext_params: string list;
-    otyext_constructors: (string * out_type list * out_type option * string option) list;
-    otyext_private: Asttypes.private_flag }
-and out_val_decl =
-  { oval_name: string;
-    oval_type: out_type;
-    oval_prims: string list;
-    oval_attributes: out_attribute list }
-and out_rec_status =
-  | Orec_not
-  | Orec_first
-  | Orec_next
-and out_ext_status =
-  | Oext_first
-  | Oext_next
-  | Oext_exception
-
-type out_phrase =
-  | Ophr_eval of out_value * out_type
-  | Ophr_signature of (out_sig_item * out_value option) list
-  | Ophr_exception of (exn * out_value)
diff --git a/jscomp/ml/parmatch.ml b/jscomp/ml/parmatch.ml
deleted file mode 100644
index 7c98883..0000000
--- a/jscomp/ml/parmatch.ml
+++ /dev/null
@@ -1,2620 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Detection of partial matches and unused match cases. *)
-
-open Misc
-open Asttypes
-open Types
-open Typedtree
-
-(*************************************)
-(* Utilities for building patterns   *)
-(*************************************)
-
-let make_pat desc ty tenv =
-  {pat_desc = desc; pat_loc = Location.none; pat_extra = [];
-   pat_type = ty ; pat_env = tenv;
-   pat_attributes = [];
-  }
-
-let omega = make_pat Tpat_any Ctype.none Env.empty
-
-let extra_pat =
-  make_pat
-    (Tpat_var (Ident.create "+", mknoloc "+"))
-    Ctype.none Env.empty
-
-let rec omegas i =
-  if i <= 0 then [] else omega :: omegas (i-1)
-
-let omega_list l = List.map (fun _ -> omega) l
-
-let zero = make_pat (Tpat_constant (Const_int 0)) Ctype.none Env.empty
-
-(*******************)
-(* Coherence check *)
-(*******************)
-
-(* For some of the operations we do in this module, we would like (because it
-   simplifies matters) to assume that patterns appearing on a given column in a
-   pattern matrix are /coherent/ (think "of the same type").
-   Unfortunately that is not always true.
-
-   Consider the following (well-typed) example:
-   {[
-     type _ t = S : string t | U : unit t
-
-     let f (type a) (t1 : a t) (t2 : a t) (a : a) =
-       match t1, t2, a with
-       | U, _, () -> ()
-       | _, S, "" -> ()
-   ]}
-
-   Clearly the 3rd column contains incoherent patterns.
-
-   On the example above, most of the algorithms will explore the pattern matrix
-   as illustrated by the following tree:
-
-   {v
-                                                   S
-                                                -------> | "" |
-                             U     | S, "" | __/         | () |
-                         --------> | _, () |   \  ¬ S
-        | U, _, () | __/                        -------> | () |
-        | _, S, "" |   \
-                        ---------> | S, "" | ----------> | "" |
-                           ¬ U                    S
-   v}
-
-   where following an edge labelled by a pattern P means "assuming the value I
-   am matching on is filtered by [P] on the column I am currently looking at,
-   then the following submatrix is still reachable".
-
-   Notice that at any point of that tree, if the first column of a matrix is
-   incoherent, then the branch leading to it can only be taken if the scrutinee
-   is ill-typed.
-   In the example above the only case where we have a matrix with an incoherent
-   first column is when we consider [t1, t2, a] to be [U, S, ...]. However such
-   a value would be ill-typed, so we can never actually get there.
-
-   Checking the first column at each step of the recursion and making the
-   concious decision of "aborting" the algorithm whenever the first column
-   becomes incoherent, allows us to retain the initial assumption in later
-   stages of the algorithms.
-
-   ---
-
-   N.B. two patterns can be considered coherent even though they might not be of
-   the same type.
-
-   That's in part because we only care about the "head" of patterns and leave
-   checking coherence of subpatterns for the next steps of the algorithm:
-   ('a', 'b') and (1, ()) will be deemed coherent because they are both a tuples
-   of arity 2 (we'll notice at a later stage the incoherence of 'a' and 1).
-
-   But also because it can be hard/costly to determine exactly whether two
-   patterns are of the same type or not (eg. in the example above with _ and S,
-   but see also the module [Coherence_illustration] in
-   testsuite/tests/basic-more/robustmatch.ml).
-
-   For the moment our weak, loosely-syntactic, coherence check seems to be
-   enough and we leave it to each user to consider (and document!) what happens
-   when an "incoherence" is not detected by this check.
-*)
-
-
-let simplify_head_pat p k =
-  let rec simplify_head_pat p k =
-    match p.pat_desc with
-    | Tpat_alias (p,_,_) -> simplify_head_pat p k
-    | Tpat_var (_,_) -> omega :: k
-    | Tpat_or (p1,p2,_) -> simplify_head_pat p1 (simplify_head_pat p2 k)
-    | _ -> p :: k
-  in simplify_head_pat p k
-
-let rec simplified_first_col = function
-  | [] -> []
-  | [] :: _ -> assert false (* the rows are non-empty! *)
-  | (p::_) :: rows ->
-      simplify_head_pat p (simplified_first_col rows)
-
-(* Given the simplified first column of a matrix, this function first looks for
-   a "discriminating" pattern on that column (i.e. a non-omega one) and then
-   check that every other head pattern in the column is coherent with that one.
-*)
-let all_coherent column =
-  let coherent_heads hp1 hp2 =
-    match hp1.pat_desc, hp2.pat_desc with
-    | (Tpat_var _ | Tpat_alias _ | Tpat_or _), _
-    | _, (Tpat_var _ | Tpat_alias _ | Tpat_or _) ->
-      assert false
-    | Tpat_construct (_, c, _), Tpat_construct (_, c', _) ->
-      c.cstr_consts = c'.cstr_consts
-      && c.cstr_nonconsts = c'.cstr_nonconsts
-    | Tpat_constant c1, Tpat_constant c2 -> begin
-        match c1, c2 with
-        | Const_char _, Const_char _
-        | Const_int _, Const_int _
-        | Const_int32 _, Const_int32 _
-        | Const_int64 _, Const_int64 _
-        | Const_bigint _, Const_bigint _
-        | Const_float _, Const_float _
-        | Const_string _, Const_string _ -> true
-        | ( Const_char _
-          | Const_int _
-          | Const_int32 _
-          | Const_int64 _
-          | Const_bigint _
-          | Const_float _
-          | Const_string _), _ -> false
-      end
-    | Tpat_tuple l1, Tpat_tuple l2 -> List.length l1 = List.length l2
-    | Tpat_record ((_, lbl1, _) :: _, _), Tpat_record ((_, lbl2, _) :: _, _) ->
-      Array.length lbl1.lbl_all = Array.length lbl2.lbl_all
-    | Tpat_any, _
-    | _, Tpat_any
-    | Tpat_record ([], _), Tpat_record (_, _)
-    | Tpat_record (_, _), Tpat_record ([], _)
-    | Tpat_variant _, Tpat_variant _
-    | Tpat_array _, Tpat_array _
-    | Tpat_lazy _, Tpat_lazy _ -> true
-    | _, _ -> false
-  in
-  match
-    List.find (fun head_pat ->
-      match head_pat.pat_desc with
-      | Tpat_var _ | Tpat_alias _ | Tpat_or _ -> assert false
-      | Tpat_any -> false
-      | _ -> true
-    ) column
-  with
-  | exception Not_found ->
-    (* only omegas on the column: the column is coherent. *)
-    true
-  | discr_pat ->
-    List.for_all (coherent_heads discr_pat) column
-
-let first_column simplified_matrix =
-  List.map fst simplified_matrix
-
-(***********************)
-(* Compatibility check *)
-(***********************)
-
-(* Patterns p and q compatible means:
-   there exists value V that matches both, However....
-
-  The case of extension types is dubious, as constructor rebind permits
-  that different constructors are the same (and are thus compatible).
-
-  Compilation must take this into account, consider:
-
-  type t = ..
-  type t += A|B
-  type t += C=A
-
-  let f x y = match x,y with
-  | true,A  -> '1'
-  | _,C     -> '2'
-  | false,A -> '3'
-  | _,_     -> '_'
-
-  As C is bound to A the value of f false A is '2' (and not '3' as it would
-  be in the absence of rebinding).
-
-  Not considering rebinding, patterns "false,A" and "_,C" are incompatible
-  and the compiler can swap the second and third clause, resulting in the
-  (more efficiently compiled) matching
-
-  match x,y with
-  | true,A  -> '1'
-  | false,A -> '3'
-  | _,C     -> '2'
-  | _,_     -> '_'
-
-  This is not correct: when C is bound to A, "f false A" returns '2' (not '3')
-
-
-  However, diagnostics do not take constructor rebinding into account.
-  Notice, that due to module abstraction constructor rebinding is hidden.
-
-  module X : sig type t = .. type t += A|B end = struct
-    type t = ..
-    type t += A
-    type t += B=A
-  end
-
-  open X
-
-  let f x = match x with
-  | A -> '1'
-  | B -> '2'
-  | _ -> '_'
-
-  The second clause above will NOT (and cannot) be flagged as useless.
-
-  Finally, there are two compatibility fonction
-   compat p q      ---> 'syntactic compatibility, used for diagnostics.
-   may_compat p q --->   a safe approximation of possible compat,
-                         for compilation
-
-*)
-
-
-let is_absent tag row = Btype.row_field tag !row = Rabsent
-
-let is_absent_pat p = match p.pat_desc with
-| Tpat_variant (tag, _, row) -> is_absent tag row
-| _ -> false
-
-let const_compare x y =
-  match x,y with
-  | Const_float f1, Const_float f2 ->
-      compare (float_of_string f1) (float_of_string f2)
-  | Const_bigint (s1, b1), Const_bigint (s2, b2) ->
-      Bigint_utils.compare (s1, b1) (s2, b2)
-  | Const_string (s1, _), Const_string (s2, _) ->
-      String.compare s1 s2
-  | _, _ -> compare x y
-
-let records_args l1 l2 =
-  (* Invariant: fields are already sorted by Typecore.type_label_a_list *)
-  let rec combine r1 r2 l1 l2 = match l1,l2 with
-  | [],[] -> List.rev r1, List.rev r2
-  | [],(_,_,p2)::rem2 -> combine (omega::r1) (p2::r2) [] rem2
-  | (_,_,p1)::rem1,[] -> combine (p1::r1) (omega::r2) rem1 []
-  | (_,lbl1,p1)::rem1, ( _,lbl2,p2)::rem2 ->
-      if lbl1.lbl_pos < lbl2.lbl_pos then
-        combine (p1::r1) (omega::r2) rem1 l2
-      else if lbl1.lbl_pos > lbl2.lbl_pos then
-        combine (omega::r1) (p2::r2) l1 rem2
-      else (* same label on both sides *)
-        combine (p1::r1) (p2::r2) rem1 rem2 in
-  combine [] [] l1 l2
-
-
-
-module Compat
-    (Constr:sig
-      val equal :
-          Types.constructor_description ->
-            Types.constructor_description ->
-              bool
-    end) = struct
-
-  let rec compat p q = match p.pat_desc,q.pat_desc with
-(* Variables match any value *)
-  | ((Tpat_any|Tpat_var _),_)
-  | (_,(Tpat_any|Tpat_var _)) -> true
-(* Structural induction *)
-  | Tpat_alias (p,_,_),_      -> compat p q
-  | _,Tpat_alias (q,_,_)      -> compat p q
-  | Tpat_or (p1,p2,_),_ ->
-      (compat p1 q || compat p2 q)
-  | _,Tpat_or (q1,q2,_) ->
-      (compat p q1 || compat p q2)
-(* Constructors, with special case for extension *)
-  | Tpat_construct (_, c1,ps1), Tpat_construct (_, c2,ps2) ->
-      Constr.equal c1 c2 && compats ps1 ps2
-(* More standard stuff *)
-  | Tpat_variant(l1,op1, _), Tpat_variant(l2,op2,_) ->
-      l1=l2 && ocompat op1 op2
-  | Tpat_constant c1, Tpat_constant c2 ->
-      const_compare c1 c2 = 0
-  | Tpat_tuple ps, Tpat_tuple qs -> compats ps qs
-  | Tpat_lazy p, Tpat_lazy q -> compat p q
-  | Tpat_record (l1,_),Tpat_record (l2,_) ->
-      let ps,qs = records_args l1 l2 in
-      compats ps qs
-  | Tpat_array ps, Tpat_array qs ->
-      List.length ps = List.length qs &&
-      compats ps qs
-  | _,_  -> false
-
-  and ocompat op oq = match op,oq with
-  | None,None -> true
-  | Some p,Some q -> compat p q
-  | (None,Some _)|(Some _,None) -> false
-
-  and compats ps qs = match ps,qs with
-  | [], [] -> true
-  | p::ps, q::qs -> compat p q && compats ps qs
-  | _,_    -> false
-
-end
-
-module SyntacticCompat =
-  Compat
-    (struct
-      let equal c1 c2 =  Types.equal_tag c1.cstr_tag c2.cstr_tag
-    end)
-
-let compat =  SyntacticCompat.compat
-and compats = SyntacticCompat.compats
-
-(* Due to (potential) rebinding, two extension constructors
-   of the same arity type may equal *)
-
-exception Empty (* Empty pattern *)
-
-(****************************************)
-(* Utilities for retrieving type paths  *)
-(****************************************)
-
-(* May need a clean copy, cf. PR#4745 *)
-let clean_copy ty =
-  if ty.level = Btype.generic_level then ty
-  else Subst.type_expr Subst.identity ty
-
-let get_type_path ty tenv =
-  let ty = Ctype.repr (Ctype.expand_head tenv (clean_copy ty)) in
-  match ty.desc with
-  | Tconstr (path,_,_) -> path
-  | _ -> fatal_error "Parmatch.get_type_path"
-
-(*************************************)
-(* Values as patterns pretty printer *)
-(*************************************)
-
-let print_res_pat: (Typedtree.pattern -> string) ref =
-  ref (fun _ -> assert false)
-
-open Format
-;;
-
-let is_cons = function
-| {cstr_name = "::"} -> true
-| _ -> false
-
-let pretty_const c = match c with
-| Const_int i -> Printf.sprintf "%d" i
-| Const_char i -> Printf.sprintf "%s" (Pprintast.string_of_int_as_char i)
-| Const_string (s, _) -> Printf.sprintf "%S" s
-| Const_float f -> Printf.sprintf "%s" f
-| Const_int32 i -> Printf.sprintf "%ldl" i
-| Const_int64 i -> Printf.sprintf "%LdL" i
-| Const_bigint (sign, i) -> Printf.sprintf "%s" (Bigint_utils.to_string sign i)
-
-let rec pretty_val ppf v =
-  match v.pat_extra with
-      (cstr, _loc, _attrs) :: rem ->
-        begin match cstr with
-          | Tpat_unpack ->
-            fprintf ppf "@[(module %a)@]" pretty_val { v with pat_extra = rem }
-          | Tpat_constraint _ ->
-            fprintf ppf "@[(%a : _)@]" pretty_val { v with pat_extra = rem }
-          | Tpat_type _ ->
-            fprintf ppf "@[(# %a)@]" pretty_val { v with pat_extra = rem }
-          | Tpat_open _ ->
-              fprintf ppf "@[(# %a)@]" pretty_val { v with pat_extra = rem }
-        end
-    | [] ->
-  match v.pat_desc with
-  | Tpat_any -> fprintf ppf "_"
-  | Tpat_var (x,_) -> fprintf ppf "%s" (Ident.name x)
-  | Tpat_constant c -> fprintf ppf "%s" (pretty_const c)
-  | Tpat_tuple vs ->
-      fprintf ppf "@[(%a)@]" (pretty_vals ",") vs
-  | Tpat_construct (_, cstr, []) ->
-      fprintf ppf "%s" cstr.cstr_name
-  | Tpat_construct (_, cstr, [w]) ->
-      fprintf ppf "@[<2>%s(%a)@]" cstr.cstr_name pretty_arg w
-  | Tpat_construct (_, cstr, vs) ->
-      let name = cstr.cstr_name in
-      begin match (name, vs) with
-        ("::", [v1;v2]) ->
-          fprintf ppf "@[%a::@,%a@]" pretty_car v1 pretty_cdr v2
-      |  _ ->
-          fprintf ppf "@[<2>%s@ @[(%a)@]@]" name (pretty_vals ",") vs
-      end
-  | Tpat_variant (l, None, _) ->
-      fprintf ppf "#%s" l
-  | Tpat_variant (l, Some w, _) ->
-      fprintf ppf "@[<2>#%s(%a)@]" l pretty_arg w
-  | Tpat_record (lvs,_) ->
-      let filtered_lvs = Ext_list.filter lvs
-          (function
-            | (_,_,{pat_desc=Tpat_any}) -> false (* do not show lbl=_ *)
-            | _ -> true) in
-      begin match filtered_lvs with
-      | [] -> fprintf ppf "_"
-      | (_, _lbl, _) :: _q ->
-          let elision_mark _ = () in
-          fprintf ppf "@[{%a%t}@]"
-            pretty_lvals filtered_lvs elision_mark
-      end
-  | Tpat_array vs ->
-      fprintf ppf "@[[%a]@]" (pretty_vals ",") vs
-  | Tpat_lazy v ->
-      fprintf ppf "@[<2>lazy@ %a@]" pretty_arg v
-  | Tpat_alias (v, x,_) ->
-      fprintf ppf "@[(%a@ as %a)@]" pretty_val v Ident.print x
-  | Tpat_or (v,w,_)    ->
-      fprintf ppf "@[%a | @,%a@]" pretty_or v pretty_or w
-
-and pretty_car ppf v = match v.pat_desc with
-| Tpat_construct (_,cstr, [_ ; _])
-    when is_cons cstr ->
-      fprintf ppf "(%a)" pretty_val v
-| _ -> pretty_val ppf v
-
-and pretty_cdr ppf v = match v.pat_desc with
-| Tpat_construct (_,cstr, [v1 ; v2])
-    when is_cons cstr ->
-      fprintf ppf "%a::@,%a" pretty_car v1 pretty_cdr v2
-| _ -> pretty_val ppf v
-
-and pretty_arg ppf v = match v.pat_desc with
-| Tpat_construct (_,_,_::_)
-| Tpat_variant (_, Some _, _) -> fprintf ppf "(%a)" pretty_val v
-|  _ -> pretty_val ppf v
-
-and pretty_or ppf v = match v.pat_desc with
-| Tpat_or (v,w,_) ->
-    fprintf ppf "%a | @,%a" pretty_or v pretty_or w
-| _ -> pretty_val ppf v
-
-and pretty_vals sep ppf = function
-  | [] -> ()
-  | [v] -> pretty_val ppf v
-  | v::vs ->
-      fprintf ppf "%a%s@ %a" pretty_val v sep (pretty_vals sep) vs
-
-and pretty_lvals ppf = function
-  | [] -> ()
-  | [_,lbl,v] ->
-      fprintf ppf "%s: %a" lbl.lbl_name pretty_val v
-  | (_, lbl,v)::rest ->
-      fprintf ppf "%s: %a,@ %a"
-        lbl.lbl_name pretty_val v pretty_lvals rest
-
-let top_pretty ppf v =
-  fprintf ppf "@[%a@]@?" pretty_val v
-
-
-let pretty_pat p =
-  top_pretty Format.str_formatter p ;
-  prerr_string (Format.flush_str_formatter ())
-
-type matrix = pattern list list
-
-let pretty_line ps =
-  List.iter
-    (fun p ->
-      top_pretty Format.str_formatter p ;
-      prerr_string " <" ;
-      prerr_string (Format.flush_str_formatter ()) ;
-      prerr_string ">")
-    ps
-
-let pretty_matrix (pss : matrix) =
-  prerr_endline "begin matrix" ;
-  List.iter
-    (fun ps ->
-      pretty_line ps ;
-      prerr_endline "")
-    pss ;
-  prerr_endline "end matrix"
-
-
-(****************************)
-(* Utilities for matching   *)
-(****************************)
-
-(* Check top matching *)
-let simple_match p1 p2 =
-  match p1.pat_desc, p2.pat_desc with
-  | Tpat_construct(_, c1, _), Tpat_construct(_, c2, _) ->
-      Types.equal_tag c1.cstr_tag c2.cstr_tag
-  | Tpat_variant(l1, _, _), Tpat_variant(l2, _, _) ->
-      l1 = l2
-  | Tpat_constant(c1), Tpat_constant(c2) -> const_compare c1 c2 = 0
-  | Tpat_lazy _, Tpat_lazy _ -> true
-  | Tpat_record _ , Tpat_record _ -> true
-  | Tpat_tuple p1s, Tpat_tuple p2s
-  | Tpat_array p1s, Tpat_array p2s -> List.length p1s = List.length p2s
-  | _, (Tpat_any | Tpat_var(_)) -> true
-  | _, _ -> false
-
-
-
-
-(* extract record fields as a whole *)
-let record_arg p = match p.pat_desc with
-| Tpat_any -> []
-| Tpat_record (args,_) -> args
-| _ -> fatal_error "Parmatch.as_record"
-
-
-(* Raise Not_found when pos is not present in arg *)
-let get_field pos arg =
-  let _,_, p = List.find (fun (_,lbl,_) -> pos = lbl.lbl_pos) arg in
-  p
-
-let extract_fields omegas arg =
-  List.map
-    (fun (_,lbl,_) ->
-      try
-        get_field lbl.lbl_pos arg
-      with Not_found -> omega)
-    omegas
-
-let all_record_args lbls = match lbls with
-| (_,{lbl_all=lbl_all},_)::_ ->
-    let t =
-      Array.map
-        (fun lbl -> mknoloc (Longident.Lident "?temp?"), lbl,omega)
-        lbl_all in
-    List.iter
-      (fun ((_, lbl,_) as x) ->  t.(lbl.lbl_pos) <- x)
-      lbls ;
-    Array.to_list t
-|  _ -> fatal_error "Parmatch.all_record_args"
-
-
-(* Build argument list when p2 >= p1, where p1 is a simple pattern *)
-let rec simple_match_args p1 p2 = match p2.pat_desc with
-| Tpat_alias (p2,_,_) -> simple_match_args p1 p2
-| Tpat_construct(_, _, args) -> args
-| Tpat_variant(_, Some arg, _) -> [arg]
-| Tpat_tuple(args)  -> args
-| Tpat_record(args,_) ->  extract_fields (record_arg p1) args
-| Tpat_array(args) -> args
-| Tpat_lazy arg -> [arg]
-| (Tpat_any | Tpat_var(_)) ->
-    begin match p1.pat_desc with
-      Tpat_construct(_, _,args) -> omega_list args
-    | Tpat_variant(_, Some _, _) -> [omega]
-    | Tpat_tuple(args) -> omega_list args
-    | Tpat_record(args,_) ->  omega_list args
-    | Tpat_array(args) ->  omega_list args
-    | Tpat_lazy _ -> [omega]
-    | _ -> []
-    end
-| _ -> []
-
-(*
-  Normalize a pattern ->
-   all arguments are omega (simple pattern) and no more variables
-*)
-
-let rec normalize_pat q = match q.pat_desc with
-  | Tpat_any | Tpat_constant _ -> q
-  | Tpat_var _ -> make_pat Tpat_any q.pat_type q.pat_env
-  | Tpat_alias (p,_,_) -> normalize_pat p
-  | Tpat_tuple (args) ->
-      make_pat (Tpat_tuple (omega_list args)) q.pat_type q.pat_env
-  | Tpat_construct  (lid, c,args) ->
-      make_pat
-        (Tpat_construct (lid, c,omega_list args))
-        q.pat_type q.pat_env
-  | Tpat_variant (l, arg, row) ->
-      make_pat (Tpat_variant (l, may_map (fun _ -> omega) arg, row))
-        q.pat_type q.pat_env
-  | Tpat_array (args) ->
-      make_pat (Tpat_array (omega_list args))  q.pat_type q.pat_env
-  | Tpat_record (largs, closed) ->
-      make_pat
-        (Tpat_record (List.map (fun (lid,lbl,_) ->
-                                 lid, lbl,omega) largs, closed))
-        q.pat_type q.pat_env
-  | Tpat_lazy _ ->
-      make_pat (Tpat_lazy omega) q.pat_type q.pat_env
-  | Tpat_or _ -> fatal_error "Parmatch.normalize_pat"
-
-(*
-  Build normalized (cf. supra) discriminating pattern,
-  in the non-data type case
-*)
-
-let discr_pat q pss =
-
-  let rec acc_pat acc pss = match pss with
-    ({pat_desc = Tpat_alias (p,_,_)}::ps)::pss ->
-        acc_pat acc ((p::ps)::pss)
-  | ({pat_desc = Tpat_or (p1,p2,_)}::ps)::pss ->
-        acc_pat acc ((p1::ps)::(p2::ps)::pss)
-  | ({pat_desc = (Tpat_any | Tpat_var _)}::_)::pss ->
-        acc_pat acc pss
-  | (({pat_desc = Tpat_tuple _} as p)::_)::_ -> normalize_pat p
-  | (({pat_desc = Tpat_lazy _} as p)::_)::_ -> normalize_pat p
-  | (({pat_desc = Tpat_record (largs,closed)} as p)::_)::pss ->
-      let new_omegas =
-        List.fold_right
-          (fun (lid, lbl,_) r ->
-            try
-              let _ = get_field lbl.lbl_pos r in
-              r
-            with Not_found ->
-              (lid, lbl,omega)::r)
-          largs (record_arg acc)
-      in
-      acc_pat
-        (make_pat (Tpat_record (new_omegas, closed)) p.pat_type p.pat_env)
-        pss
-  | _ -> acc in
-
-  match normalize_pat q with
-  | {pat_desc= (Tpat_any | Tpat_record _)} as q -> acc_pat q pss
-  | q -> q
-
-(*
-   In case a matching value is found, set actual arguments
-   of the matching pattern.
-*)
-
-let rec read_args xs r = match xs,r with
-| [],_ -> [],r
-| _::xs, arg::rest ->
-   let args,rest = read_args xs rest in
-   arg::args,rest
-| _,_ ->
-    fatal_error "Parmatch.read_args"
-
-let do_set_args erase_mutable q r = match q with
-| {pat_desc = Tpat_tuple omegas} ->
-    let args,rest = read_args omegas r in
-    make_pat (Tpat_tuple args) q.pat_type q.pat_env::rest
-| {pat_desc = Tpat_record (omegas,closed)} ->
-    let args,rest = read_args omegas r in
-    make_pat
-      (Tpat_record
-         (List.map2 (fun (lid, lbl,_) arg ->
-           if
-             erase_mutable &&
-             (match lbl.lbl_mut with
-             | Mutable -> true | Immutable -> false)
-           then
-             lid, lbl, omega
-           else
-             lid, lbl, arg)
-            omegas args, closed))
-      q.pat_type q.pat_env::
-    rest
-| {pat_desc = Tpat_construct (lid, c,omegas)} ->
-    let args,rest = read_args omegas r in
-    make_pat
-      (Tpat_construct (lid, c,args))
-      q.pat_type q.pat_env::
-    rest
-| {pat_desc = Tpat_variant (l, omega, row)} ->
-    let arg, rest =
-      match omega, r with
-        Some _, a::r -> Some a, r
-      | None, r -> None, r
-      | _ -> assert false
-    in
-    make_pat
-      (Tpat_variant (l, arg, row)) q.pat_type q.pat_env::
-    rest
-| {pat_desc = Tpat_lazy _omega} ->
-    begin match r with
-      arg::rest ->
-        make_pat (Tpat_lazy arg) q.pat_type q.pat_env::rest
-    | _ -> fatal_error "Parmatch.do_set_args (lazy)"
-    end
-| {pat_desc = Tpat_array omegas} ->
-    let args,rest = read_args omegas r in
-    make_pat
-      (Tpat_array args) q.pat_type q.pat_env::
-    rest
-| {pat_desc=Tpat_constant _|Tpat_any} ->
-    q::r (* case any is used in matching.ml *)
-| _ -> fatal_error "Parmatch.set_args"
-
-let set_args q r = do_set_args false q r
-and set_args_erase_mutable q r = do_set_args true q r
-
-(* filter pss according to pattern q *)
-let filter_one q pss =
-  let rec filter_rec = function
-      ({pat_desc = Tpat_alias(p,_,_)}::ps)::pss ->
-        filter_rec ((p::ps)::pss)
-    | ({pat_desc = Tpat_or(p1,p2,_)}::ps)::pss ->
-        filter_rec ((p1::ps)::(p2::ps)::pss)
-    | (p::ps)::pss ->
-        if simple_match q p
-        then (simple_match_args q p @ ps) :: filter_rec pss
-        else filter_rec pss
-    | _ -> [] in
-  filter_rec pss
-
-(*
-  Filter pss in the ``extra case''. This applies :
-  - According to an extra constructor (datatype case, non-complete signature).
-  - According to anything (all-variables case).
-*)
-let filter_extra pss =
-  let rec filter_rec = function
-      ({pat_desc = Tpat_alias(p,_,_)}::ps)::pss ->
-        filter_rec ((p::ps)::pss)
-    | ({pat_desc = Tpat_or(p1,p2,_)}::ps)::pss ->
-        filter_rec ((p1::ps)::(p2::ps)::pss)
-    | ({pat_desc = (Tpat_any | Tpat_var(_))} :: qs) :: pss ->
-        qs :: filter_rec pss
-    | _::pss  -> filter_rec pss
-    | [] -> [] in
-  filter_rec pss
-
-(*
-  Pattern p0 is the discriminating pattern,
-  returns [(q0,pss0) ; ... ; (qn,pssn)]
-  where the qi's are simple patterns and the pssi's are
-  matched matrices.
-
-  NOTES
-   * (qi,[]) is impossible.
-   * In the case when matching is useless (all-variable case),
-     returns []
-*)
-
-let filter_all pat0 pss =
-
-  let rec insert q qs env =
-    match env with
-      [] ->
-        let q0 = normalize_pat q in
-        [q0, [simple_match_args q0 q @ qs]]
-    | ((q0,pss) as c)::env ->
-        if simple_match q0 q
-        then (q0, ((simple_match_args q0 q @ qs) :: pss)) :: env
-        else c :: insert q qs env in
-
-  let rec filter_rec env = function
-    ({pat_desc = Tpat_alias(p,_,_)}::ps)::pss ->
-      filter_rec env ((p::ps)::pss)
-  | ({pat_desc = Tpat_or(p1,p2,_)}::ps)::pss ->
-      filter_rec env ((p1::ps)::(p2::ps)::pss)
-  | ({pat_desc = (Tpat_any | Tpat_var(_))}::_)::pss ->
-      filter_rec env pss
-  | (p::ps)::pss ->
-      filter_rec (insert p ps env) pss
-  | _ -> env
-
-  and filter_omega env = function
-    ({pat_desc = Tpat_alias(p,_,_)}::ps)::pss ->
-      filter_omega env ((p::ps)::pss)
-  | ({pat_desc = Tpat_or(p1,p2,_)}::ps)::pss ->
-      filter_omega env ((p1::ps)::(p2::ps)::pss)
-  | ({pat_desc = (Tpat_any | Tpat_var(_))}::ps)::pss ->
-      filter_omega
-        (List.map (fun (q,qss) -> (q,(simple_match_args q omega @ ps) :: qss))
-           env)
-        pss
-  | _::pss -> filter_omega env pss
-  | [] -> env in
-
-  filter_omega
-    (filter_rec
-      (match pat0.pat_desc with
-        (Tpat_record(_) | Tpat_tuple(_) | Tpat_lazy(_)) -> [pat0,[]]
-      | _ -> [])
-      pss)
-    pss
-
-(* Variant related functions *)
-
-let rec set_last a = function
-    [] -> []
-  | [_] -> [a]
-  | x::l -> x :: set_last a l
-
-(* mark constructor lines for failure when they are incomplete *)
-let rec mark_partial = function
-    ({pat_desc = Tpat_alias(p,_,_)}::ps)::pss ->
-      mark_partial ((p::ps)::pss)
-  | ({pat_desc = Tpat_or(p1,p2,_)}::ps)::pss ->
-      mark_partial ((p1::ps)::(p2::ps)::pss)
-  | ({pat_desc = (Tpat_any | Tpat_var(_))} :: _ as ps) :: pss ->
-      ps :: mark_partial pss
-  | ps::pss  ->
-      (set_last zero ps) :: mark_partial pss
-  | [] -> []
-
-let close_variant env row =
-  let row = Btype.row_repr row in
-  let nm =
-    List.fold_left
-      (fun nm (_tag,f) ->
-        match Btype.row_field_repr f with
-        | Reither(_, _, false, e) ->
-            (* m=false means that this tag is not explicitly matched *)
-            Btype.set_row_field e Rabsent;
-            None
-        | Rabsent | Reither (_, _, true, _) | Rpresent _ -> nm)
-      row.row_name row.row_fields in
-  if not row.row_closed || nm != row.row_name then begin
-    (* this unification cannot fail *)
-    Ctype.unify env row.row_more
-      (Btype.newgenty
-         (Tvariant {row with row_fields = []; row_more = Btype.newgenvar();
-                    row_closed = true; row_name = nm}))
-  end
-
-let row_of_pat pat =
-  match Ctype.expand_head pat.pat_env pat.pat_type with
-    {desc = Tvariant row} -> Btype.row_repr row
-  | _ -> assert false
-
-(*
-  Check whether the first column of env makes up a complete signature or
-  not.
-*)
-
-let full_match closing env =  match env with
-| ({pat_desc = Tpat_construct(_,c,_)},_) :: _ ->
-    if c.cstr_consts < 0 then false (* extensions *)
-    else List.length env = c.cstr_consts + c.cstr_nonconsts
-| ({pat_desc = Tpat_variant _} as p,_) :: _ ->
-    let fields =
-      List.map
-        (function ({pat_desc = Tpat_variant (tag, _, _)}, _) -> tag
-          | _ -> assert false)
-        env
-    in
-    let row = row_of_pat p in
-    if closing && not (Btype.row_fixed row) then
-      (* closing=true, we are considering the variant as closed *)
-      List.for_all
-        (fun (tag,f) ->
-          match Btype.row_field_repr f with
-            Rabsent | Reither(_, _, false, _) -> true
-          | Reither (_, _, true, _)
-              (* m=true, do not discard matched tags, rather warn *)
-          | Rpresent _ -> List.mem tag fields)
-        row.row_fields
-    else
-      row.row_closed &&
-      List.for_all
-        (fun (tag,f) ->
-          Btype.row_field_repr f = Rabsent || List.mem tag fields)
-        row.row_fields
-| ({pat_desc = Tpat_constant(_)},_) :: _ -> false
-| ({pat_desc = Tpat_tuple(_)},_) :: _ -> true
-| ({pat_desc = Tpat_record(_)},_) :: _ -> true
-| ({pat_desc = Tpat_array(_)},_) :: _ -> false
-| ({pat_desc = Tpat_lazy(_)},_) :: _ -> true
-| ({pat_desc = (Tpat_any|Tpat_var _|Tpat_alias _|Tpat_or _)},_) :: _
-| []
-  ->
-    assert false
-
-(* Written as a non-fragile matching, PR#7451 originated from a fragile matching below. *)
-let should_extend ext env = match ext with
-| None -> false
-| Some ext -> begin match env with
-  | [] -> assert false
-  | (p,_)::_ ->
-      begin match p.pat_desc with
-      | Tpat_construct
-          (_, {cstr_tag=(Cstr_constant _|Cstr_block _|Cstr_unboxed)},_) ->
-            let path = get_type_path p.pat_type p.pat_env in
-            Path.same path ext
-      | Tpat_construct
-          (_, {cstr_tag=(Cstr_extension _)},_) -> false
-      | Tpat_constant _|Tpat_tuple _|Tpat_variant _
-      | Tpat_record  _|Tpat_array _ | Tpat_lazy _
-        -> false
-      | Tpat_any|Tpat_var _|Tpat_alias _|Tpat_or _
-        -> assert false
-      end
-end
-
-module ConstructorTagHashtbl = Hashtbl.Make(
-  struct
-    type t = Types.constructor_tag
-    let hash = Hashtbl.hash
-    let equal = Types.equal_tag
-  end
-)
-
-(* complement constructor tags *)
-let complete_tags nconsts nconstrs tags =
-  let seen_const = Array.make nconsts false
-  and seen_constr = Array.make nconstrs false in
-  List.iter
-    (function
-      | Cstr_constant i -> seen_const.(i) <- true
-      | Cstr_block i -> seen_constr.(i) <- true
-      | _  -> assert false)
-    tags ;
-  let r = ConstructorTagHashtbl.create (nconsts+nconstrs) in
-  for i = 0 to nconsts-1 do
-    if not seen_const.(i) then
-      ConstructorTagHashtbl.add r (Cstr_constant i) ()
-  done ;
-  for i = 0 to nconstrs-1 do
-    if not seen_constr.(i) then
-      ConstructorTagHashtbl.add r (Cstr_block i) ()
-  done ;
-  r
-
-(* build a pattern from a constructor list *)
-let pat_of_constr ex_pat cstr =
-  {ex_pat with pat_desc =
-   Tpat_construct (mknoloc (Longident.Lident "?pat_of_constr?"),
-                   cstr, omegas cstr.cstr_arity)}
-
-let orify x y = make_pat (Tpat_or (x, y, None)) x.pat_type x.pat_env
-
-let rec orify_many = function
-| [] -> assert false
-| [x] -> x
-| x :: xs -> orify x (orify_many xs)
-
-let pat_of_constrs ex_pat cstrs =
-  if cstrs = [] then raise Empty else
-  orify_many (List.map (pat_of_constr ex_pat) cstrs)
-
-let pats_of_type ?(always=false) env ty =
-  let ty' = Ctype.expand_head env ty in
-  match ty'.desc with
-  | Tconstr (path, _, _) ->
-      begin try match (Env.find_type path env).type_kind with
-      | Type_variant cl when always || List.length cl = 1 ||
-        List.for_all (fun cd -> cd.Types.cd_res <> None) cl ->
-          let cstrs = fst (Env.find_type_descrs path env) in
-          List.map (pat_of_constr (make_pat Tpat_any ty env)) cstrs
-      | Type_record _ ->
-          let labels = snd (Env.find_type_descrs path env) in
-          let fields =
-            List.map (fun ld ->
-              mknoloc (Longident.Lident "?pat_of_label?"), ld, omega)
-              labels
-          in
-          [make_pat (Tpat_record (fields, Closed)) ty env]
-      | _ -> [omega]
-      with Not_found -> [omega]
-      end
-  | Ttuple tl ->
-      [make_pat (Tpat_tuple (omegas (List.length tl))) ty env]
-  | _ -> [omega]
-
-let rec get_variant_constructors env ty =
-  match (Ctype.repr ty).desc with
-  | Tconstr (path,_,_) -> begin
-      try match Env.find_type path env with
-      | {type_kind=Type_variant _} ->
-          fst (Env.find_type_descrs path env)
-      | {type_manifest = Some _} ->
-          get_variant_constructors env
-            (Ctype.expand_head_once env (clean_copy ty))
-      | _ -> fatal_error "Parmatch.get_variant_constructors"
-      with Not_found ->
-        fatal_error "Parmatch.get_variant_constructors"
-    end
-  | _ -> fatal_error "Parmatch.get_variant_constructors"
-
-(* Sends back a pattern that complements constructor tags all_tag *)
-let complete_constrs p all_tags =
-  let c =
-    match p.pat_desc with Tpat_construct (_, c, _) -> c | _ -> assert false in
-  let not_tags = complete_tags c.cstr_consts c.cstr_nonconsts all_tags in
-  let constrs = get_variant_constructors p.pat_env c.cstr_res in
-  let others =
-    Ext_list.filter constrs
-      (fun cnstr -> ConstructorTagHashtbl.mem not_tags cnstr.cstr_tag)
-  in
-  let const, nonconst =
-    List.partition (fun cnstr -> cnstr.cstr_arity = 0) others in
-  const @ nonconst
-
-let build_other_constrs env p =
-  match p.pat_desc with
-    Tpat_construct (_, {cstr_tag=Cstr_constant _|Cstr_block _}, _) ->
-      let get_tag = function
-        | {pat_desc = Tpat_construct (_,c,_)} -> c.cstr_tag
-        | _ -> fatal_error "Parmatch.get_tag" in
-      let all_tags =  List.map (fun (p,_) -> get_tag p) env in
-      pat_of_constrs p (complete_constrs p all_tags)
-  | _ -> extra_pat
-
-(* Auxiliary for build_other *)
-
-let build_other_constant proj make first next p env =
-  let all = List.map (fun (p, _) -> proj p.pat_desc) env in
-  let rec try_const i =
-    if List.mem i all
-    then try_const (next i)
-    else make_pat (make i) p.pat_type p.pat_env
-  in try_const first
-
-(*
-  Builds a pattern that is incompatible with all patterns in
-  in the first column of env
-*)
-
-let some_other_tag = "<some other tag>"
-
-let build_other ext env : Typedtree.pattern = match env with
-| ({pat_desc = Tpat_construct (lid, {cstr_tag=Cstr_extension _},_)},_) :: _ ->
-        (* let c = {c with cstr_name = "*extension*"} in *) (* PR#7330 *)
-        make_pat (Tpat_var (Ident.create "*extension*",
-                            {lid with txt="*extension*"})) Ctype.none Env.empty
-| ({pat_desc = Tpat_construct _} as p,_) :: _ ->
-    begin match ext with
-    | Some ext when Path.same ext (get_type_path p.pat_type p.pat_env) ->
-        extra_pat
-    | _ ->
-        build_other_constrs env p
-    end
-| ({pat_desc = Tpat_variant (_,_,r)} as p,_) :: _ ->
-    let tags =
-      List.map
-        (function ({pat_desc = Tpat_variant (tag, _, _)}, _) -> tag
-                | _ -> assert false)
-        env
-    in
-    let row = row_of_pat p in
-    let make_other_pat tag const =
-      let arg = if const then None else Some omega in
-      make_pat (Tpat_variant(tag, arg, r)) p.pat_type p.pat_env in
-    begin match
-      List.fold_left
-        (fun others (tag,f) ->
-          if List.mem tag tags then others else
-          match Btype.row_field_repr f with
-            Rabsent (* | Reither _ *) -> others
-          (* This one is called after erasing pattern info *)
-          | Reither (c, _, _, _) -> make_other_pat tag c :: others
-          | Rpresent arg -> make_other_pat tag (arg = None) :: others)
-        [] row.row_fields
-    with
-      [] ->
-        make_other_pat some_other_tag true
-    | pat::other_pats ->
-        List.fold_left
-          (fun p_res pat ->
-            make_pat (Tpat_or (pat, p_res, None)) p.pat_type p.pat_env)
-          pat other_pats
-    end
-| ({pat_desc=(Tpat_constant (Const_int _ ))} as p,_) :: _ ->
-    build_other_constant
-      (function Tpat_constant(Const_int i) -> i 
-      | _ -> assert false)
-      (function i -> Tpat_constant(Const_int i))
-      0 succ p env
-| ({pat_desc=(Tpat_constant (Const_char _ ))} as p,_) :: _ ->
-        build_other_constant
-          (function 
-          | Tpat_constant (Const_char i) -> i
-          | _ -> assert false)
-          (function i -> Tpat_constant(Const_char i))
-          0 succ p env      
-| ({pat_desc=(Tpat_constant (Const_int32 _))} as p,_) :: _ ->
-    build_other_constant
-      (function Tpat_constant(Const_int32 i) -> i | _ -> assert false)
-      (function i -> Tpat_constant(Const_int32 i))
-      0l Int32.succ p env
-| ({pat_desc=(Tpat_constant (Const_int64 _))} as p,_) :: _ ->
-    build_other_constant
-      (function Tpat_constant(Const_int64 i) -> i | _ -> assert false)
-      (function i -> Tpat_constant(Const_int64 i))
-      0L Int64.succ p env
-| ({pat_desc=(Tpat_constant (Const_bigint _))} as p,_) :: _ ->
-    build_other_constant
-      (function Tpat_constant(Const_bigint (sign, i)) -> String.length (Bigint_utils.to_string sign i) | _ -> assert false)
-      (function i -> Tpat_constant(Const_bigint (true, (string_of_int i))))
-      0 succ p env
-| ({pat_desc=(Tpat_constant (Const_string _))} as p,_) :: _ ->
-    build_other_constant
-      (function Tpat_constant(Const_string (s, _)) -> String.length s
-              | _ -> assert false)
-      (function i -> Tpat_constant(Const_string(String.make i '*', None)))
-      0 succ p env
-| ({pat_desc=(Tpat_constant (Const_float _))} as p,_) :: _ ->
-    build_other_constant
-      (function Tpat_constant(Const_float f) -> float_of_string f
-              | _ -> assert false)
-      (function f -> Tpat_constant(Const_float (string_of_float f)))
-      0.0 (fun f -> f +. 1.0) p env
-
-| ({pat_desc = Tpat_array _} as p,_)::_ ->
-    let all_lengths =
-      List.map
-        (fun (p,_) -> match p.pat_desc with
-        | Tpat_array args -> List.length args
-        | _ -> assert false)
-        env in
-    let rec try_arrays l =
-      if List.mem l all_lengths then try_arrays (l+1)
-      else
-        make_pat
-          (Tpat_array (omegas l))
-          p.pat_type p.pat_env in
-    try_arrays 0
-| [] -> omega
-| _ -> omega
-
-(*
-  Core function :
-  Is the last row of pattern matrix pss + qs satisfiable ?
-  That is :
-    Does there exists at least one value vector, es such that :
-     1- for all ps in pss ps # es (ps and es are not compatible)
-     2- qs <= es                  (es matches qs)
-*)
-
-let rec has_instance p = match p.pat_desc with
-  | Tpat_variant (l,_,r) when is_absent l r -> false
-  | Tpat_any | Tpat_var _ | Tpat_constant _ | Tpat_variant (_,None,_) -> true
-  | Tpat_alias (p,_,_) | Tpat_variant (_,Some p,_) -> has_instance p
-  | Tpat_or (p1,p2,_) -> has_instance p1 || has_instance p2
-  | Tpat_construct (_,_,ps) | Tpat_tuple ps | Tpat_array ps ->
-      has_instances ps
-  | Tpat_record (lps,_) -> has_instances (List.map (fun (_,_,x) -> x) lps)
-  | Tpat_lazy p
-    -> has_instance p
-
-
-and has_instances = function
-  | [] -> true
-  | q::rem -> has_instance q && has_instances rem
-
-(*
-   In two places in the following function, we check the coherence of the first
-   column of (pss + qs).
-   If it is incoherent, then we exit early saying that (pss + qs) is not
-   satisfiable (which is equivalent to saying "oh, we shouldn't have considered
-   that branch, no good result came come from here").
-
-   But what happens if we have a coherent but ill-typed column?
-   - we might end up returning [false], which is equivalent to noticing the
-   incompatibility: clearly this is fine.
-   - if we end up returning [true] then we're saying that [qs] is useful while
-   it is not. This is sad but not the end of the world, we're just allowing dead
-   code to survive.
-*)
-let rec satisfiable pss qs = match pss with
-| [] -> has_instances qs
-| _  ->
-    match qs with
-    | [] -> false
-    | {pat_desc = Tpat_or(q1,q2,_)}::qs ->
-        satisfiable pss (q1::qs) || satisfiable pss (q2::qs)
-    | {pat_desc = Tpat_alias(q,_,_)}::qs ->
-          satisfiable pss (q::qs)
-    | {pat_desc = (Tpat_any | Tpat_var(_))}::qs ->
-        if not (all_coherent (simplified_first_col pss)) then
-          false
-        else begin
-          let q0 = discr_pat omega pss in
-          match filter_all q0 pss with
-            (* first column of pss is made of variables only *)
-          | [] -> satisfiable (filter_extra pss) qs
-          | constrs  ->
-              if full_match false constrs then
-                List.exists
-                  (fun (p,pss) ->
-                    not (is_absent_pat p) &&
-                    satisfiable pss (simple_match_args p omega @ qs))
-                  constrs
-              else
-                satisfiable (filter_extra pss) qs
-        end
-    | {pat_desc=Tpat_variant (l,_,r)}::_ when is_absent l r -> false
-    | q::qs ->
-        if not (all_coherent (q :: simplified_first_col pss)) then
-          false
-        else begin
-          let q0 = discr_pat q pss in
-          satisfiable (filter_one q0 pss) (simple_match_args q0 q @ qs)
-        end
-
-(* Also return the remaining cases, to enable GADT handling
-
-   For considerations regarding the coherence check, see the comment on
-   [satisfiable] above.  *)
-let rec satisfiables pss qs = match pss with
-| [] -> if has_instances qs then [qs] else []
-| _  ->
-    match qs with
-    | [] -> []
-    | {pat_desc = Tpat_or(q1,q2,_)}::qs ->
-        satisfiables pss (q1::qs) @ satisfiables pss (q2::qs)
-    | {pat_desc = Tpat_alias(q,_,_)}::qs ->
-        satisfiables pss (q::qs)
-    | {pat_desc = (Tpat_any | Tpat_var(_))}::qs ->
-        if not (all_coherent (simplified_first_col pss)) then
-          []
-        else begin
-          let q0 = discr_pat omega pss in
-          let wild p =
-            List.map (fun qs -> p::qs) (satisfiables (filter_extra pss) qs) in
-          match filter_all q0 pss with
-            (* first column of pss is made of variables only *)
-          | [] ->
-              wild omega
-          | (p,_)::_ as constrs  ->
-              let for_constrs () =
-                List.flatten (
-                List.map
-                  (fun (p,pss) ->
-                    if is_absent_pat p then [] else
-                    List.map (set_args p)
-                      (satisfiables pss (simple_match_args p omega @ qs)))
-                  constrs )
-              in
-              if full_match false constrs then for_constrs () else
-              match p.pat_desc with
-                Tpat_construct _ ->
-                  (* activate this code for checking non-gadt constructors *)
-                  wild (build_other_constrs constrs p) @ for_constrs ()
-              | _ ->
-                  wild omega
-        end
-    | {pat_desc=Tpat_variant (l,_,r)}::_ when is_absent l r -> []
-    | q::qs ->
-        if not (all_coherent (q :: simplified_first_col pss)) then
-          []
-        else begin
-          let q0 = discr_pat q pss in
-          List.map (set_args q0)
-            (satisfiables (filter_one q0 pss) (simple_match_args q0 q @ qs))
-        end
-
-(*
-  Now another satisfiable function that additionally
-  supplies an example of a matching value.
-
-  This function should be called for exhaustiveness check only.
-*)
-
-type 'a result =
-  | Rnone           (* No matching value *)
-  | Rsome of 'a     (* This matching value *)
-
-(*
-let rec try_many  f = function
-  | [] -> Rnone
-  | (p,pss)::rest ->
-      match f (p,pss) with
-      | Rnone -> try_many  f rest
-      | r -> r
-*)
-
-let rappend r1 r2 =
-  match r1, r2 with
-  | Rnone, _ -> r2
-  | _, Rnone -> r1
-  | Rsome l1, Rsome l2 -> Rsome (l1 @ l2)
-
-let rec try_many_gadt  f = function
-  | [] -> Rnone
-  | (p,pss)::rest ->
-      rappend (f (p, pss)) (try_many_gadt f rest)
-
-(*
-let rec exhaust ext pss n = match pss with
-| []    ->  Rsome (omegas n)
-| []::_ ->  Rnone
-| pss   ->
-    let q0 = discr_pat omega pss in
-    begin match filter_all q0 pss with
-          (* first column of pss is made of variables only *)
-    | [] ->
-        begin match exhaust ext (filter_extra pss) (n-1) with
-        | Rsome r -> Rsome (q0::r)
-        | r -> r
-      end
-    | constrs ->
-        let try_non_omega (p,pss) =
-          if is_absent_pat p then
-            Rnone
-          else
-            match
-              exhaust
-                ext pss (List.length (simple_match_args p omega) + n - 1)
-            with
-            | Rsome r -> Rsome (set_args p r)
-            | r       -> r in
-        if
-          full_match true false constrs && not (should_extend ext constrs)
-        then
-          try_many try_non_omega constrs
-        else
-          (*
-             D = filter_extra pss is the default matrix
-             as it is included in pss, one can avoid
-             recursive calls on specialized matrices,
-             Essentially :
-             * D exhaustive => pss exhaustive
-             * D non-exhaustive => we have a non-filtered value
-          *)
-          let r =  exhaust ext (filter_extra pss) (n-1) in
-          match r with
-          | Rnone -> Rnone
-          | Rsome r ->
-              try
-                Rsome (build_other ext constrs::r)
-              with
-      (* cannot occur, since constructors don't make a full signature *)
-              | Empty -> fatal_error "Parmatch.exhaust"
-    end
-
-let combinations f lst lst' =
-  let rec iter2 x =
-    function
-        [] -> []
-      | y :: ys ->
-          f x y :: iter2 x ys
-  in
-  let rec iter =
-    function
-        [] -> []
-      | x :: xs -> iter2 x lst' @ iter xs
-  in
-  iter lst
-*)
-(*
-let print_pat pat =
-  let rec string_of_pat pat =
-    match pat.pat_desc with
-        Tpat_var _ -> "v"
-      | Tpat_any -> "_"
-      | Tpat_alias (p, x) -> Printf.sprintf "(%s) as ?"  (string_of_pat p)
-      | Tpat_constant n -> "0"
-      | Tpat_construct (_, lid, _) ->
-        Printf.sprintf "%s" (String.concat "." (Longident.flatten lid.txt))
-      | Tpat_lazy p ->
-        Printf.sprintf "(lazy %s)" (string_of_pat p)
-      | Tpat_or (p1,p2,_) ->
-        Printf.sprintf "(%s | %s)" (string_of_pat p1) (string_of_pat p2)
-      | Tpat_tuple list ->
-        Printf.sprintf "(%s)" (String.concat "," (List.map string_of_pat list))
-      | Tpat_variant (_, _, _) -> "variant"
-      | Tpat_record (_, _) -> "record"
-      | Tpat_array _ -> "array"
-  in
-  Printf.fprintf stderr "PAT[%s]\n%!" (string_of_pat pat)
-*)
-
-(* strictly more powerful than exhaust; however, exhaust
-   was kept for backwards compatibility *)
-let rec exhaust_gadt (ext:Path.t option) pss n = match pss with
-| []    ->  Rsome [omegas n]
-| []::_ ->  Rnone
-| pss   ->
-    if not (all_coherent (simplified_first_col pss)) then
-      (* We're considering an ill-typed branch, we won't actually be able to
-         produce a well typed value taking that branch. *)
-      Rnone
-    else begin
-      (* Assuming the first column is ill-typed but considered coherent, we
-         might end up producing an ill-typed witness of non-exhaustivity
-         corresponding to the current branch.
-
-         If [exhaust] has been called by [do_check_partial], then the witnesses
-         produced get typechecked and the ill-typed ones are discarded.
-
-         If [exhaust] has been called by [do_check_fragile], then it is possible
-         we might fail to warn the user that the matching is fragile. See for
-         example testsuite/tests/warnings/w04_failure.ml. *)
-      let q0 = discr_pat omega pss in
-      match filter_all q0 pss with
-            (* first column of pss is made of variables only *)
-      | [] ->
-          begin match exhaust_gadt ext (filter_extra pss) (n-1) with
-          | Rsome r -> Rsome (List.map (fun row -> q0::row) r)
-          | r -> r
-        end
-      | constrs ->
-          let try_non_omega (p,pss) =
-            if is_absent_pat p then
-              Rnone
-            else
-              match
-                exhaust_gadt
-                  ext pss (List.length (simple_match_args p omega) + n - 1)
-              with
-              | Rsome r -> Rsome (List.map (fun row ->  (set_args p row)) r)
-              | r       -> r in
-          let before = try_many_gadt try_non_omega constrs in
-          if
-            full_match false constrs && not (should_extend ext constrs)
-          then
-            before
-          else
-            (*
-              D = filter_extra pss is the default matrix
-              as it is included in pss, one can avoid
-              recursive calls on specialized matrices,
-              Essentially :
-            * D exhaustive => pss exhaustive
-            * D non-exhaustive => we have a non-filtered value
-            *)
-            let r =  exhaust_gadt ext (filter_extra pss) (n-1) in
-            match r with
-            | Rnone -> before
-            | Rsome r ->
-                try
-                  let p = build_other ext constrs in
-                  let dug = List.map (fun tail -> p :: tail) r in
-                  match before with
-                  | Rnone -> Rsome dug
-                  | Rsome x -> Rsome (x @ dug)
-                with
-        (* cannot occur, since constructors don't make a full signature *)
-                | Empty -> fatal_error "Parmatch.exhaust"
-    end
-
-let exhaust_gadt ext pss n =
-  let ret = exhaust_gadt ext pss n in
-  match ret with
-    Rnone -> Rnone
-  | Rsome lst ->
-      (* The following line is needed to compile stdlib/printf.ml *)
-      if lst = [] then Rsome (omegas n) else
-      let singletons =
-        List.map
-          (function
-              [x] -> x
-            | _ -> assert false)
-          lst
-      in
-      Rsome [orify_many singletons]
-
-(*
-   Another exhaustiveness check, enforcing variant typing.
-   Note that it does not check exact exhaustiveness, but whether a
-   matching could be made exhaustive by closing all variant types.
-   When this is true of all other columns, the current column is left
-   open (even if it means that the whole matching is not exhaustive as
-   a result).
-   When this is false for the matrix minus the current column, and the
-   current column is composed of variant tags, we close the variant
-   (even if it doesn't help in making the matching exhaustive).
-*)
-
-let rec pressure_variants tdefs = function
-  | []    -> false
-  | []::_ -> true
-  | pss   ->
-      if not (all_coherent (simplified_first_col pss)) then
-        true
-      else begin
-        let q0 = discr_pat omega pss in
-        match filter_all q0 pss with
-          [] -> pressure_variants tdefs (filter_extra pss)
-        | constrs ->
-            let rec try_non_omega = function
-                (_p,pss) :: rem ->
-                  let ok = pressure_variants tdefs pss in
-                  try_non_omega rem && ok
-              | [] -> true
-            in
-            if full_match (tdefs=None) constrs then
-              try_non_omega constrs
-            else if tdefs = None then
-              pressure_variants None (filter_extra pss)
-            else
-              let full = full_match true constrs in
-              let ok =
-                if full then try_non_omega constrs
-                else try_non_omega (filter_all q0 (mark_partial pss))
-              in
-              begin match constrs, tdefs with
-                ({pat_desc=Tpat_variant _} as p,_):: _, Some env ->
-                  let row = row_of_pat p in
-                  if Btype.row_fixed row
-                  || pressure_variants None (filter_extra pss) then ()
-                  else close_variant env row
-              | _ -> ()
-              end;
-              ok
-      end
-
-
-(* Yet another satisfiable function *)
-
-(*
-   This time every_satisfiable pss qs checks the
-   utility of every expansion of qs.
-   Expansion means expansion of or-patterns inside qs
-*)
-
-type answer =
-  | Used                                (* Useful pattern *)
-  | Unused                              (* Useless pattern *)
-  | Upartial of Typedtree.pattern list  (* Mixed, with list of useless ones *)
-
-
-
-(* this row type enable column processing inside the matrix
-    - left  ->  elements not to be processed,
-    - right ->  elements to be processed
-*)
-type 'a row = {no_ors : 'a list ; ors : 'a list ; active : 'a list}
-
-
-(*
-let pretty_row {ors=ors ; no_ors=no_ors; active=active} =
-  pretty_line ors ; prerr_string " *" ;
-  pretty_line no_ors ; prerr_string " *" ;
-  pretty_line active
-
-let pretty_rows rs =
-  prerr_endline "begin matrix" ;
-  List.iter
-    (fun r ->
-      pretty_row r ;
-      prerr_endline "")
-    rs ;
-  prerr_endline "end matrix"
-*)
-
-(* Initial build *)
-let make_row ps = {ors=[] ; no_ors=[]; active=ps}
-
-let make_rows pss = List.map make_row pss
-
-
-(* Useful to detect and expand  or pats inside as pats *)
-let rec unalias p = match p.pat_desc with
-| Tpat_alias (p,_,_) -> unalias p
-| _ -> p
-
-
-let is_var p = match (unalias p).pat_desc with
-| Tpat_any|Tpat_var _ -> true
-| _                   -> false
-
-let is_var_column rs =
-  List.for_all
-    (fun r -> match r.active with
-    | p::_ -> is_var p
-    | []   -> assert false)
-    rs
-
-(* Standard or-args for left-to-right matching *)
-let rec or_args p = match p.pat_desc with
-| Tpat_or (p1,p2,_) -> p1,p2
-| Tpat_alias (p,_,_)  -> or_args p
-| _                 -> assert false
-
-(* Just remove current column *)
-let remove r = match r.active with
-| _::rem -> {r with active=rem}
-| []     -> assert false
-
-let remove_column rs = List.map remove rs
-
-(* Current column has been processed *)
-let push_no_or r = match r.active with
-| p::rem -> { r with no_ors = p::r.no_ors ; active=rem}
-| [] -> assert false
-
-let push_or r = match r.active with
-| p::rem -> { r with ors = p::r.ors ; active=rem}
-| [] -> assert false
-
-let push_or_column rs = List.map push_or rs
-and push_no_or_column rs = List.map push_no_or rs
-
-(* Those are adaptations of the previous homonymous functions that
-   work on the current column, instead of the first column
-*)
-
-let discr_pat q rs =
-  discr_pat q (List.map (fun r -> r.active) rs)
-
-let filter_one q rs =
-  let rec filter_rec rs = match rs with
-  | [] -> []
-  | r::rem ->
-      match r.active with
-      | [] -> assert false
-      | {pat_desc = Tpat_alias(p,_,_)}::ps ->
-          filter_rec ({r with active = p::ps}::rem)
-      | {pat_desc = Tpat_or(p1,p2,_)}::ps ->
-          filter_rec
-            ({r with active = p1::ps}::
-             {r with active = p2::ps}::
-             rem)
-      | p::ps ->
-          if simple_match q p then
-            {r with active=simple_match_args q p @ ps} :: filter_rec rem
-          else
-            filter_rec rem in
-  filter_rec rs
-
-
-(* Back to normal matrices *)
-let make_vector r = List.rev r.no_ors
-
-let make_matrix rs = List.map make_vector rs
-
-
-(* Standard union on answers *)
-let union_res r1 r2 = match r1, r2 with
-| (Unused,_)
-| (_, Unused) -> Unused
-| Used,_    -> r2
-| _, Used   -> r1
-| Upartial u1, Upartial u2 -> Upartial (u1@u2)
-
-(* propose or pats for expansion *)
-let extract_elements qs =
-  let rec do_rec seen = function
-    | [] -> []
-    | q::rem ->
-        {no_ors= List.rev_append seen rem @ qs.no_ors ;
-        ors=[] ;
-        active = [q]}::
-        do_rec (q::seen) rem in
-  do_rec [] qs.ors
-
-(* idem for matrices *)
-let transpose rs = match rs with
-| [] -> assert false
-| r::rem ->
-    let i = List.map (fun x -> [x]) r in
-    List.fold_left
-      (List.map2 (fun r x -> x::r))
-      i rem
-
-let extract_columns pss qs = match pss with
-| [] -> List.map (fun _ -> []) qs.ors
-| _  ->
-  let rows = List.map extract_elements pss in
-  transpose rows
-
-(* Core function
-   The idea is to first look for or patterns (recursive case), then
-   check or-patterns argument usefulness (terminal case)
-*)
-let rec simplified_first_usefulness_col = function
-  | [] -> []
-  | row :: rows ->
-    match row.active with
-    | [] -> assert false (* the rows are non-empty! *)
-    | p :: _ -> simplify_head_pat p (simplified_first_usefulness_col rows)
-
-let rec every_satisfiables pss qs = match qs.active with
-| []     ->
-    (* qs is now partitionned,  check usefulness *)
-    begin match qs.ors with
-    | [] -> (* no or-patterns *)
-        if satisfiable (make_matrix pss) (make_vector qs) then
-          Used
-        else
-          Unused
-    | _  -> (* n or-patterns -> 2n expansions *)
-        List.fold_right2
-          (fun pss qs r -> match r with
-          | Unused -> Unused
-          | _ ->
-              match qs.active with
-              | [q] ->
-                  let q1,q2 = or_args q in
-                  let r_loc = every_both pss qs q1 q2 in
-                  union_res r r_loc
-              | _   -> assert false)
-          (extract_columns pss qs) (extract_elements qs)
-          Used
-    end
-| q::rem ->
-    let uq = unalias q in
-    begin match uq.pat_desc with
-    | Tpat_any | Tpat_var _ ->
-        if is_var_column pss then
-(* forget about ``all-variable''  columns now *)
-          every_satisfiables (remove_column pss) (remove qs)
-        else
-(* otherwise this is direct food for satisfiable *)
-          every_satisfiables (push_no_or_column pss) (push_no_or qs)
-    | Tpat_or (q1,q2,_) ->
-        if
-          q1.pat_loc.Location.loc_ghost &&
-          q2.pat_loc.Location.loc_ghost
-        then
-(* syntactically generated or-pats should not be expanded *)
-          every_satisfiables (push_no_or_column pss) (push_no_or qs)
-        else
-(* this is a real or-pattern *)
-          every_satisfiables (push_or_column pss) (push_or qs)
-    | Tpat_variant (l,_,r) when is_absent l r -> (* Ah Jacques... *)
-        Unused
-    | _ ->
-(* standard case, filter matrix *)
-	(* The handling of incoherent matrices is kept in line with
-           [satisfiable] *)
-        if not (all_coherent (uq :: simplified_first_usefulness_col pss)) then
-          Unused
-        else begin
-          let q0 = discr_pat q pss in
-          every_satisfiables
-            (filter_one q0 pss)
-            {qs with active=simple_match_args q0 q @ rem}
-        end
-    end
-
-(*
-  This function ``every_both'' performs the usefulness check
-  of or-pat q1|q2.
-  The trick is to call every_satisfied twice with
-  current active columns restricted to q1 and q2,
-  That way,
-  - others orpats in qs.ors will not get expanded.
-  - all matching work performed on qs.no_ors is not performed again.
-  *)
-and every_both pss qs q1 q2 =
-  let qs1 = {qs with active=[q1]}
-  and qs2 =  {qs with active=[q2]} in
-  let r1 = every_satisfiables pss qs1
-  and r2 =  every_satisfiables (if compat q1 q2 then qs1::pss else pss) qs2 in
-  match r1 with
-  | Unused ->
-      begin match r2 with
-      | Unused -> Unused
-      | Used   -> Upartial [q1]
-      | Upartial u2 -> Upartial (q1::u2)
-      end
-  | Used ->
-      begin match r2 with
-      | Unused -> Upartial [q2]
-      | _      -> r2
-      end
-  | Upartial u1 ->
-      begin match r2 with
-      | Unused -> Upartial (u1@[q2])
-      | Used   -> r1
-      | Upartial u2 -> Upartial (u1 @ u2)
-      end
-
-
-
-
-(* le_pat p q  means, forall V,  V matches q implies V matches p *)
-let rec le_pat p q =
-  match (p.pat_desc, q.pat_desc) with
-  | (Tpat_var _|Tpat_any),_ -> true
-  | Tpat_alias(p,_,_), _ -> le_pat p q
-  | _, Tpat_alias(q,_,_) -> le_pat p q
-  | Tpat_constant(c1), Tpat_constant(c2) -> const_compare c1 c2 = 0
-  | Tpat_construct(_,c1,ps), Tpat_construct(_,c2,qs) ->
-      Types.equal_tag c1.cstr_tag c2.cstr_tag && le_pats ps qs
-  | Tpat_variant(l1,Some p1,_), Tpat_variant(l2,Some p2,_) ->
-      (l1 = l2 && le_pat p1 p2)
-  | Tpat_variant(l1,None,_r1), Tpat_variant(l2,None,_) ->
-      l1 = l2
-  | Tpat_variant(_,_,_), Tpat_variant(_,_,_) -> false
-  | Tpat_tuple(ps), Tpat_tuple(qs) -> le_pats ps qs
-  | Tpat_lazy p, Tpat_lazy q -> le_pat p q
-  | Tpat_record (l1,_), Tpat_record (l2,_) ->
-      let ps,qs = records_args l1 l2 in
-      le_pats ps qs
-  | Tpat_array(ps), Tpat_array(qs) ->
-      Ext_list.same_length ps qs && le_pats ps qs
-(* In all other cases, enumeration is performed *)
-  | _,_  -> not (satisfiable [[p]] [q])
-
-and le_pats ps qs =
-  match ps,qs with
-    p::ps, q::qs -> le_pat p q && le_pats ps qs
-  | _, _         -> true
-
-let get_mins le ps =
-  let rec select_rec r = function
-      [] -> r
-    | p::ps ->
-        if List.exists (fun p0 -> le p0 p) ps
-        then select_rec r ps
-        else select_rec (p::r) ps in
-  select_rec [] (select_rec [] ps)
-
-(*
-  lub p q is a pattern that matches all values matched by p and q
-  may raise Empty, when p and q are not compatible
-*)
-
-let rec lub p q = match p.pat_desc,q.pat_desc with
-| Tpat_alias (p,_,_),_      -> lub p q
-| _,Tpat_alias (q,_,_)      -> lub p q
-| (Tpat_any|Tpat_var _),_ -> q
-| _,(Tpat_any|Tpat_var _) -> p
-| Tpat_or (p1,p2,_),_     -> orlub p1 p2 q
-| _,Tpat_or (q1,q2,_)     -> orlub q1 q2 p (* Thanks god, lub is commutative *)
-| Tpat_constant c1, Tpat_constant c2 when const_compare c1 c2 = 0 -> p
-| Tpat_tuple ps, Tpat_tuple qs ->
-    let rs = lubs ps qs in
-    make_pat (Tpat_tuple rs) p.pat_type p.pat_env
-| Tpat_lazy p, Tpat_lazy q ->
-    let r = lub p q in
-    make_pat (Tpat_lazy r) p.pat_type p.pat_env
-| Tpat_construct (lid, c1,ps1), Tpat_construct (_,c2,ps2)
-      when  Types.equal_tag c1.cstr_tag c2.cstr_tag  ->
-        let rs = lubs ps1 ps2 in
-        make_pat (Tpat_construct (lid, c1,rs))
-          p.pat_type p.pat_env
-| Tpat_variant(l1,Some p1,row), Tpat_variant(l2,Some p2,_)
-          when  l1=l2 ->
-            let r=lub p1 p2 in
-            make_pat (Tpat_variant (l1,Some r,row)) p.pat_type p.pat_env
-| Tpat_variant (l1,None,_row), Tpat_variant(l2,None,_)
-              when l1 = l2 -> p
-| Tpat_record (l1,closed),Tpat_record (l2,_) ->
-    let rs = record_lubs l1 l2 in
-    make_pat (Tpat_record (rs, closed)) p.pat_type p.pat_env
-| Tpat_array ps, Tpat_array qs
-      when List.length ps = List.length qs ->
-        let rs = lubs ps qs in
-        make_pat (Tpat_array rs) p.pat_type p.pat_env
-| _,_  ->
-    raise Empty
-
-and orlub p1 p2 q =
-  try
-    let r1 = lub p1 q in
-    try
-      {q with pat_desc=(Tpat_or (r1,lub p2 q,None))}
-  with
-  | Empty -> r1
-with
-| Empty -> lub p2 q
-
-and record_lubs l1 l2 =
-  let rec lub_rec l1 l2 = match l1,l2 with
-  | [],_ -> l2
-  | _,[] -> l1
-  | (lid1, lbl1,p1)::rem1, (lid2, lbl2,p2)::rem2 ->
-      if lbl1.lbl_pos < lbl2.lbl_pos then
-        (lid1, lbl1,p1)::lub_rec rem1 l2
-      else if lbl2.lbl_pos < lbl1.lbl_pos  then
-        (lid2, lbl2,p2)::lub_rec l1 rem2
-      else
-        (lid1, lbl1,lub p1 p2)::lub_rec rem1 rem2 in
-  lub_rec l1 l2
-
-and lubs ps qs = match ps,qs with
-| p::ps, q::qs -> lub p q :: lubs ps qs
-| _,_ -> []
-
-
-(******************************)
-(* Exported variant closing   *)
-(******************************)
-
-(* Apply pressure to variants *)
-
-let pressure_variants tdefs patl =
-  let pss = List.map (fun p -> [p;omega]) patl in
-  ignore (pressure_variants (Some tdefs) pss)
-
-(*****************************)
-(* Utilities for diagnostics *)
-(*****************************)
-
-(*
-  Build up a working pattern matrix by forgetting
-  about guarded patterns
-*)
-
-let rec initial_matrix = function
-    [] -> []
-  | {c_guard=Some _} :: rem -> initial_matrix rem
-  | {c_guard=None; c_lhs=p} :: rem -> [p] :: initial_matrix rem
-
-(******************************************)
-(* Look for a row that matches some value *)
-(******************************************)
-
-(*
-  Useful for seeing if the example of
-  non-matched value can indeed be matched
-  (by a guarded clause)
-*)
-
-
-
-exception NoGuard
-
-let rec initial_all no_guard = function
-  | [] ->
-      if no_guard then
-        raise NoGuard
-      else
-        []
-  | {c_lhs=pat; c_guard; _} :: rem ->
-      ([pat], pat.pat_loc) :: initial_all (no_guard && c_guard = None) rem
-
-
-let rec do_filter_var = function
-  | (_::ps,loc)::rem -> (ps,loc)::do_filter_var rem
-  | _ -> []
-
-let do_filter_one q pss =
-  let rec filter_rec = function
-    | ({pat_desc = Tpat_alias(p,_,_)}::ps,loc)::pss ->
-        filter_rec ((p::ps,loc)::pss)
-    | ({pat_desc = Tpat_or(p1,p2,_)}::ps,loc)::pss ->
-        filter_rec ((p1::ps,loc)::(p2::ps,loc)::pss)
-    | (p::ps,loc)::pss ->
-        if simple_match q p
-        then (simple_match_args q p @ ps, loc) :: filter_rec pss
-        else filter_rec pss
-    | _ -> [] in
-  filter_rec pss
-
-let rec do_match pss qs = match qs with
-| [] ->
-    begin match pss  with
-    | ([],loc)::_ -> Some loc
-    | _ -> None
-    end
-| q::qs -> match q with
-  | {pat_desc = Tpat_or (q1,q2,_)} ->
-      begin match do_match pss (q1::qs) with
-      | None -> do_match pss (q2::qs)
-      | r -> r
-      end
-  | {pat_desc = Tpat_any} ->
-      do_match (do_filter_var pss) qs
-  | _ ->
-      let q0 = normalize_pat q in
-      (* [pss] will (or won't) match [q0 :: qs] regardless of the coherence of
-	 its first column. *)
-      do_match (do_filter_one q0 pss) (simple_match_args q0 q @ qs)
-
-
-let check_partial_all v casel =
-  try
-    let pss = initial_all true casel in
-    do_match pss [v]
-  with
-  | NoGuard -> None
-
-(************************)
-(* Exhaustiveness check *)
-(************************)
-
-(* conversion from Typedtree.pattern to Parsetree.pattern list *)
-module Conv = struct
-  open Parsetree
-  let mkpat desc = Ast_helper.Pat.mk desc
-
-  let name_counter = ref 0
-  let fresh name =
-    let current = !name_counter in
-    name_counter := !name_counter + 1;
-    "#$" ^ name ^ string_of_int current
-
-  let conv typed =
-    let constrs = Hashtbl.create 7 in
-    let labels = Hashtbl.create 7 in
-    let rec loop pat =
-      match pat.pat_desc with
-        Tpat_or (pa,pb,_) ->
-          mkpat (Ppat_or (loop pa, loop pb))
-      | Tpat_var (_, ({txt="*extension*"} as nm)) -> (* PR#7330 *)
-          mkpat (Ppat_var nm)
-      | Tpat_any
-      | Tpat_var _ ->
-          mkpat Ppat_any
-      | Tpat_constant c ->
-          mkpat (Ppat_constant (Untypeast.constant c))
-      | Tpat_alias (p,_,_) -> loop p
-      | Tpat_tuple lst ->
-          mkpat (Ppat_tuple (List.map loop lst))
-      | Tpat_construct (cstr_lid, cstr, lst) ->
-          let id = fresh cstr.cstr_name in
-          let lid = { cstr_lid with txt = Longident.Lident id } in
-          Hashtbl.add constrs id cstr;
-          let arg =
-            match List.map loop lst with
-            | []  -> None
-            | [p] -> Some p
-            | lst -> Some (mkpat (Ppat_tuple lst))
-          in
-          mkpat (Ppat_construct(lid, arg))
-      | Tpat_variant(label,p_opt,_row_desc) ->
-          let arg = Misc.may_map loop p_opt in
-          mkpat (Ppat_variant(label, arg))
-      | Tpat_record (subpatterns, _closed_flag) ->
-          let fields =
-            List.map
-              (fun (_, lbl, p) ->
-                let id = fresh lbl.lbl_name in
-                Hashtbl.add labels id lbl;
-                (mknoloc (Longident.Lident id), loop p))
-              subpatterns
-          in
-          mkpat (Ppat_record (fields, Open))
-      | Tpat_array lst ->
-          mkpat (Ppat_array (List.map loop lst))
-      | Tpat_lazy p ->
-          mkpat (Ppat_lazy (loop p))
-    in
-    let ps = loop typed in
-    (ps, constrs, labels)
-end
-
-
-(* Whether the counter-example contains an extension pattern *)
-let contains_extension pat =
-  let r = ref false in
-  let rec loop = function
-      {pat_desc=Tpat_var (_, {txt="*extension*"})} ->
-        r := true
-    | p -> Typedtree.iter_pattern_desc loop p.pat_desc
-  in loop pat; !r
-
-(* Build an untyped or-pattern from its expected type *)
-let ppat_of_type env ty =
-  match pats_of_type env ty with
-    [{pat_desc = Tpat_any}] ->
-      (Conv.mkpat Parsetree.Ppat_any, Hashtbl.create 0, Hashtbl.create 0)
-  | pats ->
-      Conv.conv (orify_many pats)
-
-let do_check_partial ?pred exhaust loc casel pss = match pss with
-| [] ->
-        (*
-          This can occur
-          - For empty matches generated by ocamlp4 (no warning)
-          - when all patterns have guards (then, casel <> [])
-          (specific warning)
-          Then match MUST be considered non-exhaustive,
-          otherwise compilation of PM is broken.
-          *)
-    begin match casel with
-    | [] -> ()
-    | _  ->
-      if Warnings.is_active Warnings.All_clauses_guarded then
-        Location.prerr_warning loc Warnings.All_clauses_guarded
-    end ;
-    Partial
-| ps::_  ->
-    begin match exhaust None pss (List.length ps) with
-    | Rnone -> Total
-    | Rsome [u] ->
-        let v =
-          match pred with
-          | Some pred ->
-              let (pattern,constrs,labels) = Conv.conv u in
-              let u' = pred constrs labels pattern in
-              (* pretty_pat u;
-              begin match u' with
-                None -> prerr_endline ": impossible"
-              | Some _ -> prerr_endline ": possible"
-              end; *)
-              u'
-          | None -> Some u
-        in
-        begin match v with
-          None -> Total
-        | Some v ->
-            if Warnings.is_active (Warnings.Partial_match "") then begin
-              let errmsg =
-                try
-                  let buf = Buffer.create 16 in
-                  Buffer.add_string buf "| ";
-                  Buffer.add_string buf (!print_res_pat v);
-                  begin match check_partial_all v casel with
-                  | None -> ()
-                  | Some _ ->
-                      (* This is 'Some loc', where loc is the location of
-                         a possibly matching clause.
-                         Forget about loc, because printing two locations
-                         is a pain in the top-level *)
-                      Buffer.add_string buf
-                        "\n(However, some guarded clause may match this value.)"
-                  end;
-                  if contains_extension v then
-                    Buffer.add_string buf
-                      "\nMatching over values of extensible variant types \
-                         (the *extension* above)\n\
-                      must include a wild card pattern in order to be exhaustive."
-                  ;
-                  Buffer.contents buf
-                with _ ->
-                  ""
-              in
-              Location.prerr_warning loc (Warnings.Partial_match errmsg)
-            end;
-            Partial
-        end
-    | _ ->
-        fatal_error "Parmatch.check_partial"
-    end
-
-(*
-let do_check_partial_normal loc casel pss =
-  do_check_partial exhaust loc casel pss
- *)
-
-let do_check_partial_gadt pred loc casel pss =
-  do_check_partial ~pred exhaust_gadt loc casel pss
-
-
-
-(*****************)
-(* Fragile check *)
-(*****************)
-
-(* Collect all data types in a pattern *)
-
-let rec add_path path = function
-  | [] -> [path]
-  | x::rem as paths ->
-      if Path.same path x then paths
-      else x::add_path path rem
-
-let extendable_path path =
-  not
-    (Path.same path Predef.path_bool ||
-    Path.same path Predef.path_list ||
-    Path.same path Predef.path_unit ||
-    Path.same path Predef.path_option)
-
-let rec collect_paths_from_pat r p = match p.pat_desc with
-| Tpat_construct(_, {cstr_tag=(Cstr_constant _|Cstr_block _|Cstr_unboxed)},ps)
-  ->
-    let path =  get_type_path p.pat_type p.pat_env in
-    List.fold_left
-      collect_paths_from_pat
-      (if extendable_path path then add_path path r else r)
-      ps
-| Tpat_any|Tpat_var _|Tpat_constant _| Tpat_variant (_,None,_) -> r
-| Tpat_tuple ps | Tpat_array ps
-| Tpat_construct (_, {cstr_tag=Cstr_extension _}, ps)->
-    List.fold_left collect_paths_from_pat r ps
-| Tpat_record (lps,_) ->
-    List.fold_left
-      (fun r (_, _, p) -> collect_paths_from_pat r p)
-      r lps
-| Tpat_variant (_, Some p, _) | Tpat_alias (p,_,_) -> collect_paths_from_pat r p
-| Tpat_or (p1,p2,_) ->
-    collect_paths_from_pat (collect_paths_from_pat r p1) p2
-| Tpat_lazy p
-    ->
-    collect_paths_from_pat r p
-
-
-(*
-  Actual fragile check
-   1. Collect data types in the patterns of the match.
-   2. One exhaustivity check per datatype, considering that
-      the type is extended.
-*)
-
-let do_check_fragile_param exhaust loc casel pss =
-  let exts =
-    List.fold_left
-      (fun r c -> collect_paths_from_pat r c.c_lhs)
-      [] casel in
-  match exts with
-  | [] -> ()
-  | _ -> match pss with
-    | [] -> ()
-    | ps::_ ->
-        List.iter
-          (fun ext ->
-            match exhaust (Some ext) pss (List.length ps) with
-            | Rnone ->
-                Location.prerr_warning
-                  loc
-                  (Warnings.Fragile_match (Path.name ext))
-            | Rsome _ -> ())
-          exts
-
-(*let do_check_fragile_normal = do_check_fragile_param exhaust*)
-let do_check_fragile_gadt = do_check_fragile_param exhaust_gadt
-
-(********************************)
-(* Exported unused clause check *)
-(********************************)
-
-let check_unused pred casel =
-  if Warnings.is_active Warnings.Unused_match
-  || List.exists (fun c -> c.c_rhs.exp_desc = Texp_unreachable) casel then
-    let rec do_rec pref = function
-      | [] -> ()
-      | {c_lhs=q; c_guard; c_rhs} :: rem ->
-          let qs = [q] in
-            begin try
-              let pss =
-                  get_mins le_pats (Ext_list.filter pref (compats qs)) in
-              (* First look for redundant or partially redundant patterns *)
-              let r = every_satisfiables (make_rows pss) (make_row qs) in
-              let refute = (c_rhs.exp_desc = Texp_unreachable) in
-              (* Do not warn for unused [pat -> .] *)
-              if r = Unused && refute then () else
-              let r =
-                (* Do not refine if there are no other lines *)
-                let skip =
-                  r = Unused || (not refute && pref = []) ||
-                  not(refute || Warnings.is_active Warnings.Unreachable_case) in
-                if skip then r else
-                (* Then look for empty patterns *)
-                let sfs = satisfiables pss qs in
-                if sfs = [] then Unused else
-                let sfs =
-                  List.map (function [u] -> u | _ -> assert false) sfs in
-                let u = orify_many sfs in
-                (*Format.eprintf "%a@." pretty_val u;*)
-                let (pattern,constrs,labels) = Conv.conv u in
-                let pattern = {pattern with Parsetree.ppat_loc = q.pat_loc} in
-                match pred refute constrs labels pattern with
-                  None when not refute ->
-                    Location.prerr_warning q.pat_loc Warnings.Unreachable_case;
-                    Used
-                | _ -> r
-              in
-              match r with
-              | Unused ->
-                  Location.prerr_warning
-                    q.pat_loc Warnings.Unused_match
-              | Upartial ps ->
-                  List.iter
-                    (fun p ->
-                      Location.prerr_warning
-                        p.pat_loc Warnings.Unused_pat)
-                    ps
-              | Used -> ()
-            with Empty | Not_found | NoGuard -> assert false
-            end ;
-
-          if c_guard <> None then
-            do_rec pref rem
-          else
-            do_rec ([q]::pref) rem in
-
-    do_rec [] casel
-
-(*********************************)
-(* Exported irrefutability tests *)
-(*********************************)
-
-let irrefutable pat = le_pat pat omega
-
-let inactive ~partial pat =
-  match partial with
-  | Partial -> false
-  | Total -> begin
-      let rec loop pat =
-        match pat.pat_desc with
-        | Tpat_lazy _ | Tpat_array _ ->
-          false
-        | Tpat_any | Tpat_var _ | Tpat_variant (_, None, _) ->
-            true
-        | Tpat_constant c -> begin
-            match c with
-            | Const_string _ -> true (*Config.safe_string*)
-            | Const_int _ | Const_char _ | Const_float _
-            | Const_int32 _ | Const_int64 _ | Const_bigint _ -> true
-          end
-        | Tpat_tuple ps | Tpat_construct (_, _, ps) ->
-            List.for_all (fun p -> loop p) ps
-        | Tpat_alias (p,_,_) | Tpat_variant (_, Some p, _) ->
-            loop p
-        | Tpat_record (ldps,_) ->
-            List.for_all
-              (fun (_, lbl, p) -> lbl.lbl_mut = Immutable && loop p)
-              ldps
-        | Tpat_or (p,q,_) ->
-            loop p && loop q
-      in
-      loop pat
-  end
-
-
-
-
-
-
-
-(*********************************)
-(* Exported exhaustiveness check *)
-(*********************************)
-
-(*
-   Fragile check is performed when required and
-   on exhaustive matches only.
-*)
-
-let check_partial_param do_check_partial do_check_fragile loc casel =
-    let pss = initial_matrix casel in
-    let pss = get_mins le_pats pss in
-    let total = do_check_partial loc casel pss in
-    if
-      total = Total && Warnings.is_active (Warnings.Fragile_match "")
-    then begin
-      do_check_fragile loc casel pss
-    end ;
-    total
-
-(*let check_partial =
-    check_partial_param
-      do_check_partial_normal
-      do_check_fragile_normal*)
-
-let check_partial_gadt pred loc casel =
-  check_partial_param (do_check_partial_gadt pred)
-    do_check_fragile_gadt loc casel
-
-
-(*************************************)
-(* Ambiguous variable in or-patterns *)
-(*************************************)
-
-(* Specification: ambiguous variables in or-patterns.
-
-   The semantics of or-patterns in OCaml is specified with
-   a left-to-right bias: a value [v] matches the pattern [p | q] if it
-   matches [p] or [q], but if it matches both, the environment
-   captured by the match is the environment captured by [p], never the
-   one captured by [q].
-
-   While this property is generally well-understood, one specific case
-   where users expect a different semantics is when a pattern is
-   followed by a when-guard: [| p when g -> e]. Consider for example:
-
-     | ((Const x, _) | (_, Const x)) when is_neutral x -> branch
-
-   The semantics is clear: match the scrutinee against the pattern, if
-   it matches, test the guard, and if the guard passes, take the
-   branch.
-
-   However, consider the input [(Const a, Const b)], where [a] fails
-   the test [is_neutral f], while [b] passes the test [is_neutral
-   b]. With the left-to-right semantics, the clause above is *not*
-   taken by its input: matching [(Const a, Const b)] against the
-   or-pattern succeeds in the left branch, it returns the environment
-   [x -> a], and then the guard [is_neutral a] is tested and fails,
-   the branch is not taken. Most users, however, intuitively expect
-   that any pair that has one side passing the test will take the
-   branch. They assume it is equivalent to the following:
-
-     | (Const x, _) when is_neutral x -> branch
-     | (_, Const x) when is_neutral x -> branch
-
-   while it is not.
-
-   The code below is dedicated to finding these confusing cases: the
-   cases where a guard uses "ambiguous" variables, that are bound to
-   different parts of the scrutinees by different sides of
-   a or-pattern. In other words, it finds the cases where the
-   specified left-to-right semantics is not equivalent to
-   a non-deterministic semantics (any branch can be taken) relatively
-   to a specific guard.
-*)
-
-module IdSet = Set.Make(Ident)
-
-let pattern_vars p = IdSet.of_list (Typedtree.pat_bound_idents p)
-
-(* Row for ambiguous variable search,
-   unseen is the traditional pattern row,
-   seen   is a list of position bindings *)
-
-type amb_row = { unseen : pattern list ; seen : IdSet.t list; }
-
-
-(* Push binding variables now *)
-
-let rec do_push r p ps seen k = match p.pat_desc with
-| Tpat_alias (p,x,_) -> do_push (IdSet.add x r) p ps seen k
-| Tpat_var (x,_) ->
-    (omega,{ unseen = ps; seen=IdSet.add x r::seen; })::k
-| Tpat_or (p1,p2,_) ->
-    do_push r p1 ps seen (do_push r p2 ps seen k)
-| _ ->
-    (p,{ unseen = ps; seen = r::seen; })::k
-
-let rec push_vars = function
-  | [] -> []
-  | { unseen = [] }::_ -> assert false
-  | { unseen = p::ps; seen; }::rem ->
-      do_push IdSet.empty p ps seen (push_vars rem)
-
-let collect_stable = function
-  | [] -> assert false
-  | { seen=xss; _}::rem ->
-      let rec c_rec xss = function
-        | [] -> xss
-        | {seen=yss; _}::rem ->
-            let xss = List.map2 IdSet.inter xss yss in
-            c_rec xss rem in
-      let inters = c_rec xss rem in
-      List.fold_left IdSet.union IdSet.empty inters
-
-
-(*********************************************)
-(* Filtering utilities for our specific rows *)
-(*********************************************)
-
-(* Take a pattern matrix as a list (rows) of lists (columns) of patterns
-     | p1, p2, .., pn
-     | q1, q2, .., qn
-     | r1, r2, .., rn
-     | ...
-
-   We split this matrix into a list of sub-matrices, one for each head
-   constructor appearing in the leftmost column. For each row whose
-   left column starts with a head constructor, remove this head
-   column, prepend one column for each argument of the constructor,
-   and add the resulting row in the sub-matrix corresponding to this
-   head constructor.
-
-   Rows whose left column is omega (the Any pattern _) may match any
-   head constructor, so they are added to all groups.
-
-   The list of sub-matrices is represented as a list of pair
-     (head constructor, submatrix)
-*)
-
-let filter_all =
-  (* the head constructor (as a pattern with omega arguments) of
-     a pattern *)
-  let discr_head pat =
-    match pat.pat_desc with
-    | Tpat_record (lbls, closed) ->
-        (* a partial record pattern { f1 = p1; f2 = p2; _ }
-           needs to be expanded, otherwise matching against this head
-           would drop the pattern arguments for non-mentioned fields *)
-        let lbls = all_record_args lbls in
-        normalize_pat { pat with pat_desc = Tpat_record (lbls, closed) }
-    | _ -> normalize_pat pat
-  in
-
-  (* insert a row of head [p] and rest [r] into the right group *)
-  let rec insert p r env = match env with
-  | [] ->
-      (* if no group matched this row, it has a head constructor that
-         was never seen before; add a new sub-matrix for this head *)
-      let p0 = discr_head p in
-      [p0,[{ r with unseen = simple_match_args p0 p @ r.unseen }]]
-  | (q0,rs) as bd::env ->
-      if simple_match q0 p then begin
-        let r = { r with unseen = simple_match_args q0 p@r.unseen; } in
-        (q0,r::rs)::env
-      end
-      else bd::insert p r env in
-
-  (* insert a row of head omega into all groups *)
-  let insert_omega r env =
-    List.map
-      (fun (q0,rs) ->
-         let r =
-           { r with unseen = simple_match_args q0 omega @ r.unseen; } in
-         (q0,r::rs))
-      env
-  in
-
-  let rec filter_rec env = function
-    | [] -> env
-    | ({pat_desc=(Tpat_var _|Tpat_alias _|Tpat_or _)},_)::_ -> assert false
-    | ({pat_desc=Tpat_any}, _)::rs -> filter_rec env rs
-    | (p,r)::rs -> filter_rec (insert p r env) rs in
-
-  let rec filter_omega env = function
-    | [] -> env
-    | ({pat_desc=(Tpat_var _|Tpat_alias _|Tpat_or _)},_)::_ -> assert false
-    | ({pat_desc=Tpat_any},r)::rs -> filter_omega (insert_omega r env) rs
-    | _::rs -> filter_omega env rs in
-
-  fun rs ->
-    (* first insert the rows with head constructors,
-       to get the definitive list of groups *)
-    let env = filter_rec [] rs in
-    (* then add the omega rows to all groups *)
-    filter_omega env rs
-
-(* Compute stable bindings *)
-
-let rec do_stable rs = match rs with
-| [] -> assert false (* No empty matrix *)
-| { unseen=[]; _ }::_ ->
-    collect_stable rs
-| _ ->
-    let rs = push_vars rs in
-    if not (all_coherent (first_column rs)) then begin
-      (* If the first column is incoherent, then all the variables of this
-         matrix are stable. *)
-      List.fold_left (fun acc (_, { seen; _ }) ->
-        List.fold_left IdSet.union acc seen
-      ) IdSet.empty rs
-    end else begin
-      (* If the column is ill-typed but deemed coherent, we might spuriously
-         warn about some variables being unstable.
-         As sad as that might be, the warning can be silenced by splitting the
-         or-pattern...  *)
-      match filter_all rs with
-      | [] ->
-          do_stable (List.map snd rs)
-      | (_,rs)::env ->
-          List.fold_left
-            (fun xs (_,rs) -> IdSet.inter xs (do_stable rs))
-            (do_stable rs) env
-    end
-
-let stable p = do_stable [{unseen=[p]; seen=[];}]
-
-
-(* All identifier paths that appear in an expression that occurs
-   as a clause right hand side or guard.
-
-  The function is rather complex due to the compilation of
-  unpack patterns by introducing code in rhs expressions
-  and **guards**.
-
-  For pattern (module M:S)  -> e the code is
-  let module M_mod = unpack M .. in e
-
-  Hence M is "free" in e iff M_mod is free in e.
-
-  Not doing so will yield excessive  warning in
-  (module (M:S) } ...) when true -> ....
-  as M is always present in
-  let module M_mod = unpack M .. in true
-*)
-
-let all_rhs_idents exp =
-  let ids = ref IdSet.empty in
-  let module Iterator = TypedtreeIter.MakeIterator(struct
-    include TypedtreeIter.DefaultIteratorArgument
-    let enter_expression exp = match exp.exp_desc with
-      | Texp_ident (path, _lid, _descr) ->
-          List.iter
-            (fun id -> ids := IdSet.add id !ids)
-            (Path.heads path)
-      | _ -> ()
-
-(* Very hackish, detect unpack pattern  compilation
-   and perform "indirect check for them" *)
-    let is_unpack exp =
-      List.exists
-        (fun (attr, _) -> attr.txt = "#modulepat") exp.exp_attributes
-
-    let leave_expression exp =
-      if is_unpack exp then begin match exp.exp_desc with
-      | Texp_letmodule
-          (id_mod,_,
-           {mod_desc=
-            Tmod_unpack ({exp_desc=Texp_ident (Path.Pident id_exp,_,_)},_)},
-           _) ->
-             assert (IdSet.mem id_exp !ids) ;
-             if not (IdSet.mem id_mod !ids) then begin
-               ids := IdSet.remove id_exp !ids
-             end
-      | _ -> assert false
-      end
-  end) in
-  Iterator.iter_expression exp;
-  !ids
-
-let check_ambiguous_bindings =
-  let open Warnings in
-  let warn0 = Ambiguous_pattern [] in
-  fun cases ->
-    if is_active warn0 then
-      List.iter
-        (fun case -> match case with
-        | { c_guard=None ; _} -> ()
-        | { c_lhs=p; c_guard=Some g; _} ->
-            let all =
-              IdSet.inter (pattern_vars p) (all_rhs_idents g) in
-            if not (IdSet.is_empty all) then begin
-              let st = stable p in
-              let ambiguous = IdSet.diff all st in
-              if not (IdSet.is_empty  ambiguous) then begin
-                let pps = IdSet.elements ambiguous |> List.map Ident.name in
-                let warn = Ambiguous_pattern pps in
-                Location.prerr_warning p.pat_loc warn
-              end
-            end)
-        cases
diff --git a/jscomp/ml/parmatch.mli b/jscomp/ml/parmatch.mli
deleted file mode 100644
index e44fb78..0000000
--- a/jscomp/ml/parmatch.mli
+++ /dev/null
@@ -1,102 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Detection of partial matches and unused match cases. *)
-open Asttypes
-open Typedtree
-open Types
-
-val pretty_const : constant -> string
-val top_pretty : Format.formatter -> pattern -> unit
-val pretty_pat : pattern -> unit
-val pretty_line : pattern list -> unit
-val pretty_matrix : pattern list list -> unit
-
-val print_res_pat: (Typedtree.pattern -> string) ref
-
-val omega : pattern
-val omegas : int -> pattern list
-val omega_list : 'a list -> pattern list
-val normalize_pat : pattern -> pattern
-val all_record_args :
-    (Longident.t loc * label_description * pattern) list ->
-    (Longident.t loc * label_description * pattern) list
-val const_compare : constant -> constant -> int
-
-val le_pat : pattern -> pattern -> bool
-val le_pats : pattern list -> pattern list -> bool
-
-(* Exported compatibility functor, abstracted over constructor equality *)
-module [@warning "-67"] Compat :
-  functor
-    (Constr: sig
-      val equal :
-          Types.constructor_description ->
-            Types.constructor_description ->
-              bool
-     end) -> sig
-       val compat : pattern -> pattern -> bool
-       val compats : pattern list -> pattern list -> bool
-     end
-
-exception Empty
-val lub : pattern -> pattern -> pattern
-val lubs : pattern list -> pattern list -> pattern list
-
-val get_mins : ('a -> 'a -> bool) -> 'a list -> 'a list
-
-(* Those two functions recombine one pattern and its arguments:
-   For instance:
-     (_,_)::p1::p2::rem -> (p1, p2)::rem
-   The second one will replace mutable arguments by '_'
-*)
-val set_args : pattern -> pattern list -> pattern list
-val set_args_erase_mutable : pattern -> pattern list -> pattern list
-
-val pat_of_constr : pattern -> constructor_description -> pattern
-val complete_constrs :
-    pattern -> constructor_tag list -> constructor_description  list
-val ppat_of_type :
-    Env.t -> type_expr ->
-    Parsetree.pattern *
-    (string, constructor_description) Hashtbl.t *
-    (string, label_description) Hashtbl.t
-
-val pressure_variants: Env.t -> pattern list -> unit
-val check_partial_gadt:
-    ((string, constructor_description) Hashtbl.t ->
-     (string, label_description) Hashtbl.t ->
-     Parsetree.pattern -> pattern option) ->
-    Location.t -> case list -> partial
-val check_unused:
-    (bool ->
-     (string, constructor_description) Hashtbl.t ->
-     (string, label_description) Hashtbl.t ->
-     Parsetree.pattern -> pattern option) ->
-    case list -> unit
-
-(* Irrefutability tests *)
-val irrefutable : pattern -> bool
-
-(** An inactive pattern is a pattern, matching against which can be duplicated, erased or
-    delayed without change in observable behavior of the program.  Patterns containing
-    (lazy _) subpatterns or reads of mutable fields are active. *)
-val inactive : partial:partial -> pattern -> bool
-
-(* Ambiguous bindings *)
-val check_ambiguous_bindings : case list -> unit
-
-(* The tag used for open polymorphic variant types *)
-val some_other_tag : label
diff --git a/jscomp/ml/parse.ml b/jscomp/ml/parse.ml
deleted file mode 100644
index 7de593c..0000000
--- a/jscomp/ml/parse.ml
+++ /dev/null
@@ -1,36 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Entry points in the parser *)
-
-
-let wrap parsing_fun lexbuf =
-  try
-    Docstrings.init ();
-    Lexer.init ();
-    let ast = parsing_fun Lexer.token lexbuf in
-    Parsing.clear_parser();
-    Docstrings.warn_bad_docstrings ();
-    ast
-  with
-  | Parsing.Parse_error | Syntaxerr.Escape_error ->
-      let loc = Location.curr lexbuf in
-      raise(Syntaxerr.Error(Syntaxerr.Other loc))
-
-let implementation = wrap Parser.implementation
-and interface = wrap Parser.interface
-and core_type = wrap Parser.parse_core_type
-and expression = wrap Parser.parse_expression
-and pattern = wrap Parser.parse_pattern
diff --git a/jscomp/ml/parse.mli b/jscomp/ml/parse.mli
deleted file mode 100644
index a35feb8..0000000
--- a/jscomp/ml/parse.mli
+++ /dev/null
@@ -1,22 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Entry points in the parser *)
-
-val implementation : Lexing.lexbuf -> Parsetree.structure
-val interface : Lexing.lexbuf -> Parsetree.signature
-val core_type : Lexing.lexbuf -> Parsetree.core_type
-val expression : Lexing.lexbuf -> Parsetree.expression
-val pattern : Lexing.lexbuf -> Parsetree.pattern
diff --git a/jscomp/ml/parser.ml b/jscomp/ml/parser.ml
deleted file mode 100644
index 31527cc..0000000
--- a/jscomp/ml/parser.ml
+++ /dev/null
@@ -1,12169 +0,0 @@
-type token =
-  | AMPERAMPER
-  | AMPERSAND
-  | AND
-  | AS
-  | ASSERT
-  | BACKQUOTE
-  | BANG
-  | BAR
-  | BARBAR
-  | BARRBRACKET
-  | BEGIN
-  | CHAR of (char)
-  | CLASS
-  | COLON
-  | COLONCOLON
-  | COLONEQUAL
-  | COLONGREATER
-  | COMMA
-  | CONSTRAINT
-  | DO
-  | DONE
-  | DOT
-  | DOTDOT
-  | DOWNTO
-  | ELSE
-  | END
-  | EOF
-  | EQUAL
-  | EXCEPTION
-  | EXTERNAL
-  | FALSE
-  | FLOAT of (string * char option)
-  | FOR
-  | FUN
-  | FUNCTION
-  | FUNCTOR
-  | GREATER
-  | GREATERRBRACE
-  | GREATERRBRACKET
-  | IF
-  | IN
-  | INCLUDE
-  | INFIXOP0 of (string)
-  | INFIXOP1 of (string)
-  | INFIXOP2 of (string)
-  | INFIXOP3 of (string)
-  | INFIXOP4 of (string)
-  | DOTOP of (string)
-  | INHERIT
-  | INITIALIZER
-  | INT of (string * char option)
-  | LABEL of (string)
-  | LAZY
-  | LBRACE
-  | LBRACELESS
-  | LBRACKET
-  | LBRACKETBAR
-  | LBRACKETLESS
-  | LBRACKETGREATER
-  | LBRACKETPERCENT
-  | LBRACKETPERCENTPERCENT
-  | LESS
-  | LESSMINUS
-  | LET
-  | LIDENT of (string)
-  | LPAREN
-  | LBRACKETAT
-  | LBRACKETATAT
-  | LBRACKETATATAT
-  | MATCH
-  | METHOD
-  | MINUS
-  | MINUSDOT
-  | MINUSGREATER
-  | MODULE
-  | MUTABLE
-  | NEW
-  | NONREC
-  | OBJECT
-  | OF
-  | OPEN
-  | OPTLABEL of (string)
-  | OR
-  | PERCENT
-  | PLUS
-  | PLUSDOT
-  | PLUSEQ
-  | PREFIXOP of (string)
-  | PRIVATE
-  | QUESTION
-  | QUOTE
-  | RBRACE
-  | RBRACKET
-  | REC
-  | RPAREN
-  | SEMI
-  | SEMISEMI
-  | HASH
-  | HASHOP of (string)
-  | SIG
-  | STAR
-  | STRING of (string * string option)
-  | STRUCT
-  | THEN
-  | TILDE
-  | TO
-  | TRUE
-  | TRY
-  | TYPE
-  | UIDENT of (string)
-  | UNDERSCORE
-  | VAL
-  | VIRTUAL
-  | WHEN
-  | WHILE
-  | WITH
-  | COMMENT of (string * Location.t)
-  | DOCSTRING of (Docstrings.docstring)
-  | EOL
-
-open Parsing;;
-let _ = parse_error;;
-# 19 "ml/parser.mly"
-open Location
-open Asttypes
-open Longident
-open Parsetree
-open Ast_helper
-open Docstrings
-
-let mktyp d = Typ.mk ~loc:(symbol_rloc()) d
-let mkpat d = Pat.mk ~loc:(symbol_rloc()) d
-let mkexp d = Exp.mk ~loc:(symbol_rloc()) d
-let mkmty ?attrs d = Mty.mk ~loc:(symbol_rloc()) ?attrs d
-let mksig d = Sig.mk ~loc:(symbol_rloc()) d
-let mkmod ?attrs d = Mod.mk ~loc:(symbol_rloc()) ?attrs d
-let mkstr d = Str.mk ~loc:(symbol_rloc()) d
-let mkcty ?attrs d = Cty.mk ~loc:(symbol_rloc()) ?attrs d
-let mkctf ?attrs ?docs d =
-  Ctf.mk ~loc:(symbol_rloc()) ?attrs ?docs d
-let mkcf ?attrs ?docs d =
-  Cf.mk ~loc:(symbol_rloc()) ?attrs ?docs d
-
-let mkrhs rhs pos = mkloc rhs (rhs_loc pos)
-
-let reloc_pat x = { x with ppat_loc = symbol_rloc () };;
-let reloc_exp x = { x with pexp_loc = symbol_rloc () };;
-
-let mkoperator name pos =
-  let loc = rhs_loc pos in
-  Exp.mk ~loc (Pexp_ident(mkloc (Lident name) loc))
-
-let mkpatvar name pos =
-  Pat.mk ~loc:(rhs_loc pos) (Ppat_var (mkrhs name pos))
-
-(*
-  Ghost expressions and patterns:
-  expressions and patterns that do not appear explicitly in the
-  source file they have the loc_ghost flag set to true.
-  Then the profiler will not try to instrument them and the
-  -annot option will not try to display their type.
-
-  Every grammar rule that generates an element with a location must
-  make at most one non-ghost element, the topmost one.
-
-  How to tell whether your location must be ghost:
-  A location corresponds to a range of characters in the source file.
-  If the location contains a piece of code that is syntactically
-  valid (according to the documentation), and corresponds to the
-  AST node, then the location must be real; in all other cases,
-  it must be ghost.
-*)
-let ghexp d = Exp.mk ~loc:(symbol_gloc ()) d
-let ghpat d = Pat.mk ~loc:(symbol_gloc ()) d
-let ghtyp d = Typ.mk ~loc:(symbol_gloc ()) d
-let ghloc d = { txt = d; loc = symbol_gloc () }
-let ghstr d = Str.mk ~loc:(symbol_gloc()) d
-let ghsig d = Sig.mk ~loc:(symbol_gloc()) d
-
-let mkinfix arg1 name arg2 =
-  mkexp(Pexp_apply(mkoperator name 2, [Nolabel, arg1; Nolabel, arg2]))
-
-let neg_string f =
-  if String.length f > 0 && f.[0] = '-'
-  then String.sub f 1 (String.length f - 1)
-  else "-" ^ f
-
-let mkuminus name arg =
-  match name, arg.pexp_desc with
-  | "-", Pexp_constant(Pconst_integer (n,m)) ->
-      mkexp(Pexp_constant(Pconst_integer(neg_string n,m)))
-  | ("-" | "-."), Pexp_constant(Pconst_float (f, m)) ->
-      mkexp(Pexp_constant(Pconst_float(neg_string f, m)))
-  | _ ->
-      mkexp(Pexp_apply(mkoperator ("~" ^ name) 1, [Nolabel, arg]))
-
-let mkuplus name arg =
-  let desc = arg.pexp_desc in
-  match name, desc with
-  | "+", Pexp_constant(Pconst_integer _)
-  | ("+" | "+."), Pexp_constant(Pconst_float _) -> mkexp desc
-  | _ ->
-      mkexp(Pexp_apply(mkoperator ("~" ^ name) 1, [Nolabel, arg]))
-
-let mkexp_cons consloc args loc =
-  Exp.mk ~loc (Pexp_construct(mkloc (Lident "::") consloc, Some args))
-
-let mkpat_cons consloc args loc =
-  Pat.mk ~loc (Ppat_construct(mkloc (Lident "::") consloc, Some args))
-
-let rec mktailexp nilloc = function
-    [] ->
-      let loc = { nilloc with loc_ghost = true } in
-      let nil = { txt = Lident "[]"; loc = loc } in
-      Exp.mk ~loc (Pexp_construct (nil, None))
-  | e1 :: el ->
-      let exp_el = mktailexp nilloc el in
-      let loc = {loc_start = e1.pexp_loc.loc_start;
-               loc_end = exp_el.pexp_loc.loc_end;
-               loc_ghost = true}
-      in
-      let arg = Exp.mk ~loc (Pexp_tuple [e1; exp_el]) in
-      mkexp_cons {loc with loc_ghost = true} arg loc
-
-let rec mktailpat nilloc = function
-    [] ->
-      let loc = { nilloc with loc_ghost = true } in
-      let nil = { txt = Lident "[]"; loc = loc } in
-      Pat.mk ~loc (Ppat_construct (nil, None))
-  | p1 :: pl ->
-      let pat_pl = mktailpat nilloc pl in
-      let loc = {loc_start = p1.ppat_loc.loc_start;
-               loc_end = pat_pl.ppat_loc.loc_end;
-               loc_ghost = true}
-      in
-      let arg = Pat.mk ~loc (Ppat_tuple [p1; pat_pl]) in
-      mkpat_cons {loc with loc_ghost = true} arg loc
-
-let mkstrexp e attrs =
-  { pstr_desc = Pstr_eval (e, attrs); pstr_loc = e.pexp_loc }
-
-let mkexp_constraint e (t1, t2) =
-  match t1, t2 with
-  | Some t, None -> ghexp(Pexp_constraint(e, t))
-  | _, Some t -> ghexp(Pexp_coerce(e, t1, t))
-  | None, None -> assert false
-
-let mkexp_opt_constraint e = function
-  | None -> e
-  | Some constraint_ -> mkexp_constraint e constraint_
-
-let mkpat_opt_constraint p = function
-  | None -> p
-  | Some typ -> mkpat (Ppat_constraint(p, typ))
-
-let array_function str name =
-  ghloc (Ldot(Lident str, (if !Clflags.fast then "unsafe_" ^ name else name)))
-
-let syntax_error () =
-  raise Syntaxerr.Escape_error
-
-let unclosed opening_name opening_num closing_name closing_num =
-  raise(Syntaxerr.Error(Syntaxerr.Unclosed(rhs_loc opening_num, opening_name,
-                                           rhs_loc closing_num, closing_name)))
-
-let expecting pos nonterm =
-    raise Syntaxerr.(Error(Expecting(rhs_loc pos, nonterm)))
-
-let not_expecting pos nonterm =
-    raise Syntaxerr.(Error(Not_expecting(rhs_loc pos, nonterm)))
-
-
-let lapply p1 p2 =
-  if !Clflags.applicative_functors
-  then Lapply(p1, p2)
-  else raise (Syntaxerr.Error(Syntaxerr.Applicative_path (symbol_rloc())))
-
-let exp_of_label lbl pos =
-  mkexp (Pexp_ident(mkrhs (Lident(Longident.last lbl)) pos))
-
-let pat_of_label lbl pos =
-  mkpat (Ppat_var (mkrhs (Longident.last lbl) pos))
-
-let mk_newtypes newtypes exp =
-  List.fold_right (fun newtype exp -> mkexp (Pexp_newtype (newtype, exp)))
-    newtypes exp
-
-let wrap_type_annotation newtypes core_type body =
-  let exp = mkexp(Pexp_constraint(body,core_type)) in
-  let exp = mk_newtypes newtypes exp in
-  (exp, ghtyp(Ptyp_poly(newtypes, Typ.varify_constructors newtypes core_type)))
-
-let wrap_exp_attrs body (ext, attrs) =
-  (* todo: keep exact location for the entire attribute *)
-  let body = {body with pexp_attributes = attrs @ body.pexp_attributes} in
-  match ext with
-  | None -> body
-  | Some id -> ghexp(Pexp_extension (id, PStr [mkstrexp body []]))
-
-let mkexp_attrs d attrs =
-  wrap_exp_attrs (mkexp d) attrs
-
-let wrap_typ_attrs typ (ext, attrs) =
-  (* todo: keep exact location for the entire attribute *)
-  let typ = {typ with ptyp_attributes = attrs @ typ.ptyp_attributes} in
-  match ext with
-  | None -> typ
-  | Some id -> ghtyp(Ptyp_extension (id, PTyp typ))
-
-let mktyp_attrs d attrs =
-  wrap_typ_attrs (mktyp d) attrs
-
-let wrap_pat_attrs pat (ext, attrs) =
-  (* todo: keep exact location for the entire attribute *)
-  let pat = {pat with ppat_attributes = attrs @ pat.ppat_attributes} in
-  match ext with
-  | None -> pat
-  | Some id -> ghpat(Ppat_extension (id, PPat (pat, None)))
-
-let mkpat_attrs d attrs =
-  wrap_pat_attrs (mkpat d) attrs
-
-let wrap_class_type_attrs body attrs =
-  {body with pcty_attributes = attrs @ body.pcty_attributes}
-let wrap_mod_attrs body attrs =
-  {body with pmod_attributes = attrs @ body.pmod_attributes}
-let wrap_mty_attrs body attrs =
-  {body with pmty_attributes = attrs @ body.pmty_attributes}
-
-let wrap_str_ext body ext =
-  match ext with
-  | None -> body
-  | Some id -> ghstr(Pstr_extension ((id, PStr [body]), []))
-
-let mkstr_ext d ext =
-  wrap_str_ext (mkstr d) ext
-
-let wrap_sig_ext body ext =
-  match ext with
-  | None -> body
-  | Some id -> ghsig(Psig_extension ((id, PSig [body]), []))
-
-let mksig_ext d ext =
-  wrap_sig_ext (mksig d) ext
-
-let text_str pos = Str.text (rhs_text pos)
-let text_sig pos = Sig.text (rhs_text pos)
-let text_cstr pos = Cf.text (rhs_text pos)
-let text_csig pos = Ctf.text (rhs_text pos)
-
-
-let extra_text text pos items =
-  let pre_extras = rhs_pre_extra_text pos in
-  let post_extras = rhs_post_extra_text pos in
-    text pre_extras @ items @ text post_extras
-
-let extra_str pos items = extra_text Str.text pos items
-let extra_sig pos items = extra_text Sig.text pos items
-let extra_cstr pos items = extra_text Cf.text pos items
-let extra_csig pos items = extra_text Ctf.text pos items
-
-let extra_rhs_core_type ct ~pos =
-  let docs = rhs_info pos in
-  { ct with ptyp_attributes = add_info_attrs docs ct.ptyp_attributes }
-
-type let_binding =
-  { lb_pattern: pattern;
-    lb_expression: expression;
-    lb_attributes: attributes;
-    lb_docs: docs Lazy.t;
-    lb_text: text Lazy.t;
-    lb_loc: Location.t; }
-
-type [@warning "-69"] let_bindings =
-  { lbs_bindings: let_binding list;
-    lbs_rec: rec_flag;
-    lbs_extension: string Asttypes.loc option;
-    lbs_loc: Location.t }
-
-let mklb first (p, e) attrs =
-  { lb_pattern = p;
-    lb_expression = e;
-    lb_attributes = attrs;
-    lb_docs = symbol_docs_lazy ();
-    lb_text = if first then empty_text_lazy
-              else symbol_text_lazy ();
-    lb_loc = symbol_rloc (); }
-
-let mklbs ext rf lb =
-  { lbs_bindings = [lb];
-    lbs_rec = rf;
-    lbs_extension = ext ;
-    lbs_loc = symbol_rloc (); }
-
-let addlb lbs lb =
-  { lbs with lbs_bindings = lb :: lbs.lbs_bindings }
-
-let val_of_let_bindings lbs =
-  let bindings =
-    List.map
-      (fun lb ->
-         Vb.mk ~loc:lb.lb_loc ~attrs:lb.lb_attributes
-           ~docs:(Lazy.force lb.lb_docs)
-           ~text:(Lazy.force lb.lb_text)
-           lb.lb_pattern lb.lb_expression)
-      lbs.lbs_bindings
-  in
-  let str = mkstr(Pstr_value(lbs.lbs_rec, List.rev bindings)) in
-  match lbs.lbs_extension with
-  | None -> str
-  | Some id -> ghstr (Pstr_extension((id, PStr [str]), []))
-
-let expr_of_let_bindings lbs body =
-  let bindings =
-    List.map
-      (fun lb ->
-         Vb.mk ~loc:lb.lb_loc ~attrs:lb.lb_attributes
-           lb.lb_pattern lb.lb_expression)
-      lbs.lbs_bindings
-  in
-    mkexp_attrs (Pexp_let(lbs.lbs_rec, List.rev bindings, body))
-      (lbs.lbs_extension, [])
-
-
-
-(* Alternatively, we could keep the generic module type in the Parsetree
-   and extract the package type during type-checking. In that case,
-   the assertions below should be turned into explicit checks. *)
-let package_type_of_module_type pmty =
-  let err loc s =
-    raise (Syntaxerr.Error (Syntaxerr.Invalid_package_type (loc, s)))
-  in
-  let map_cstr = function
-    | Pwith_type (lid, ptyp) ->
-        let loc = ptyp.ptype_loc in
-        if ptyp.ptype_params <> [] then
-          err loc "parametrized types are not supported";
-        if ptyp.ptype_cstrs <> [] then
-          err loc "constrained types are not supported";
-        if ptyp.ptype_private <> Public then
-          err loc "private types are not supported";
-
-        (* restrictions below are checked by the 'with_constraint' rule *)
-        assert (ptyp.ptype_kind = Ptype_abstract);
-        assert (ptyp.ptype_attributes = []);
-        let ty =
-          match ptyp.ptype_manifest with
-          | Some ty -> ty
-          | None -> assert false
-        in
-        (lid, ty)
-    | _ ->
-        err pmty.pmty_loc "only 'with type t =' constraints are supported"
-  in
-  match pmty with
-  | {pmty_desc = Pmty_ident lid} -> (lid, [])
-  | {pmty_desc = Pmty_with({pmty_desc = Pmty_ident lid}, cstrs)} ->
-      (lid, List.map map_cstr cstrs)
-  | _ ->
-      err pmty.pmty_loc
-        "only module type identifier and 'with type' constraints are supported"
-
-
-# 466 "ml/parser.ml"
-let yytransl_const = [|
-  257 (* AMPERAMPER *);
-  258 (* AMPERSAND *);
-  259 (* AND *);
-  260 (* AS *);
-  261 (* ASSERT *);
-  262 (* BACKQUOTE *);
-  263 (* BANG *);
-  264 (* BAR *);
-  265 (* BARBAR *);
-  266 (* BARRBRACKET *);
-  267 (* BEGIN *);
-  269 (* CLASS *);
-  270 (* COLON *);
-  271 (* COLONCOLON *);
-  272 (* COLONEQUAL *);
-  273 (* COLONGREATER *);
-  274 (* COMMA *);
-  275 (* CONSTRAINT *);
-  276 (* DO *);
-  277 (* DONE *);
-  278 (* DOT *);
-  279 (* DOTDOT *);
-  280 (* DOWNTO *);
-  281 (* ELSE *);
-  282 (* END *);
-    0 (* EOF *);
-  283 (* EQUAL *);
-  284 (* EXCEPTION *);
-  285 (* EXTERNAL *);
-  286 (* FALSE *);
-  288 (* FOR *);
-  289 (* FUN *);
-  290 (* FUNCTION *);
-  291 (* FUNCTOR *);
-  292 (* GREATER *);
-  293 (* GREATERRBRACE *);
-  294 (* GREATERRBRACKET *);
-  295 (* IF *);
-  296 (* IN *);
-  297 (* INCLUDE *);
-  304 (* INHERIT *);
-  305 (* INITIALIZER *);
-  308 (* LAZY *);
-  309 (* LBRACE *);
-  310 (* LBRACELESS *);
-  311 (* LBRACKET *);
-  312 (* LBRACKETBAR *);
-  313 (* LBRACKETLESS *);
-  314 (* LBRACKETGREATER *);
-  315 (* LBRACKETPERCENT *);
-  316 (* LBRACKETPERCENTPERCENT *);
-  317 (* LESS *);
-  318 (* LESSMINUS *);
-  319 (* LET *);
-  321 (* LPAREN *);
-  322 (* LBRACKETAT *);
-  323 (* LBRACKETATAT *);
-  324 (* LBRACKETATATAT *);
-  325 (* MATCH *);
-  326 (* METHOD *);
-  327 (* MINUS *);
-  328 (* MINUSDOT *);
-  329 (* MINUSGREATER *);
-  330 (* MODULE *);
-  331 (* MUTABLE *);
-  332 (* NEW *);
-  333 (* NONREC *);
-  334 (* OBJECT *);
-  335 (* OF *);
-  336 (* OPEN *);
-  338 (* OR *);
-  339 (* PERCENT *);
-  340 (* PLUS *);
-  341 (* PLUSDOT *);
-  342 (* PLUSEQ *);
-  344 (* PRIVATE *);
-  345 (* QUESTION *);
-  346 (* QUOTE *);
-  347 (* RBRACE *);
-  348 (* RBRACKET *);
-  349 (* REC *);
-  350 (* RPAREN *);
-  351 (* SEMI *);
-  352 (* SEMISEMI *);
-  353 (* HASH *);
-  355 (* SIG *);
-  356 (* STAR *);
-  358 (* STRUCT *);
-  359 (* THEN *);
-  360 (* TILDE *);
-  361 (* TO *);
-  362 (* TRUE *);
-  363 (* TRY *);
-  364 (* TYPE *);
-  366 (* UNDERSCORE *);
-  367 (* VAL *);
-  368 (* VIRTUAL *);
-  369 (* WHEN *);
-  370 (* WHILE *);
-  371 (* WITH *);
-  374 (* EOL *);
-    0|]
-
-let yytransl_block = [|
-  268 (* CHAR *);
-  287 (* FLOAT *);
-  298 (* INFIXOP0 *);
-  299 (* INFIXOP1 *);
-  300 (* INFIXOP2 *);
-  301 (* INFIXOP3 *);
-  302 (* INFIXOP4 *);
-  303 (* DOTOP *);
-  306 (* INT *);
-  307 (* LABEL *);
-  320 (* LIDENT *);
-  337 (* OPTLABEL *);
-  343 (* PREFIXOP *);
-  354 (* HASHOP *);
-  357 (* STRING *);
-  365 (* UIDENT *);
-  372 (* COMMENT *);
-  373 (* DOCSTRING *);
-    0|]
-
-let yylhs = "\255\255\
-\001\000\002\000\003\000\004\000\005\000\011\000\011\000\012\000\
-\012\000\014\000\014\000\015\000\015\000\015\000\015\000\015\000\
-\015\000\015\000\015\000\015\000\018\000\018\000\018\000\018\000\
-\018\000\018\000\018\000\018\000\018\000\018\000\018\000\006\000\
-\006\000\024\000\024\000\024\000\025\000\025\000\025\000\025\000\
-\025\000\025\000\025\000\025\000\025\000\025\000\025\000\025\000\
-\025\000\025\000\037\000\041\000\041\000\041\000\032\000\033\000\
-\033\000\042\000\043\000\013\000\013\000\013\000\013\000\013\000\
-\013\000\013\000\013\000\013\000\013\000\013\000\007\000\007\000\
-\007\000\046\000\046\000\046\000\046\000\046\000\046\000\046\000\
-\046\000\046\000\046\000\046\000\046\000\046\000\046\000\035\000\
-\052\000\054\000\054\000\054\000\049\000\050\000\051\000\051\000\
-\055\000\056\000\057\000\057\000\034\000\059\000\059\000\061\000\
-\062\000\062\000\062\000\063\000\063\000\064\000\064\000\064\000\
-\064\000\064\000\064\000\065\000\065\000\065\000\065\000\066\000\
-\066\000\066\000\066\000\066\000\075\000\075\000\075\000\075\000\
-\075\000\075\000\075\000\078\000\079\000\079\000\080\000\080\000\
-\081\000\081\000\081\000\081\000\081\000\081\000\082\000\082\000\
-\082\000\085\000\067\000\036\000\036\000\086\000\087\000\009\000\
-\009\000\009\000\009\000\089\000\089\000\089\000\089\000\089\000\
-\089\000\089\000\089\000\094\000\094\000\091\000\091\000\090\000\
-\090\000\092\000\093\000\093\000\021\000\021\000\021\000\021\000\
-\021\000\021\000\021\000\021\000\021\000\021\000\021\000\021\000\
-\021\000\021\000\021\000\021\000\021\000\021\000\021\000\021\000\
-\021\000\021\000\021\000\021\000\021\000\021\000\021\000\021\000\
-\021\000\021\000\021\000\021\000\021\000\021\000\021\000\021\000\
-\021\000\021\000\021\000\021\000\021\000\021\000\021\000\021\000\
-\021\000\021\000\021\000\021\000\021\000\021\000\021\000\021\000\
-\021\000\021\000\021\000\021\000\021\000\021\000\096\000\096\000\
-\096\000\096\000\096\000\096\000\096\000\096\000\096\000\096\000\
-\096\000\096\000\096\000\096\000\096\000\096\000\096\000\096\000\
-\096\000\096\000\096\000\096\000\096\000\096\000\096\000\096\000\
-\096\000\096\000\096\000\096\000\096\000\096\000\096\000\096\000\
-\096\000\096\000\096\000\096\000\096\000\096\000\096\000\096\000\
-\096\000\096\000\096\000\096\000\096\000\096\000\096\000\096\000\
-\096\000\096\000\096\000\096\000\096\000\096\000\096\000\096\000\
-\096\000\096\000\096\000\096\000\097\000\097\000\115\000\115\000\
-\116\000\116\000\116\000\116\000\117\000\074\000\074\000\118\000\
-\118\000\118\000\118\000\118\000\118\000\026\000\026\000\123\000\
-\124\000\126\000\126\000\073\000\073\000\073\000\100\000\100\000\
-\127\000\127\000\127\000\101\000\101\000\101\000\101\000\102\000\
-\102\000\111\000\111\000\129\000\129\000\129\000\130\000\130\000\
-\114\000\114\000\132\000\132\000\112\000\112\000\070\000\070\000\
-\070\000\070\000\070\000\131\000\131\000\010\000\010\000\010\000\
-\010\000\010\000\010\000\010\000\010\000\010\000\010\000\121\000\
-\121\000\121\000\121\000\121\000\121\000\121\000\121\000\121\000\
-\134\000\134\000\134\000\134\000\095\000\095\000\122\000\122\000\
-\122\000\122\000\122\000\122\000\122\000\122\000\122\000\122\000\
-\122\000\122\000\122\000\122\000\122\000\122\000\122\000\122\000\
-\122\000\122\000\122\000\122\000\138\000\138\000\138\000\138\000\
-\138\000\138\000\138\000\133\000\133\000\133\000\135\000\135\000\
-\135\000\140\000\140\000\139\000\139\000\139\000\139\000\141\000\
-\141\000\142\000\142\000\028\000\143\000\143\000\027\000\029\000\
-\029\000\144\000\145\000\149\000\149\000\148\000\148\000\148\000\
-\148\000\148\000\148\000\148\000\148\000\148\000\148\000\148\000\
-\147\000\147\000\147\000\152\000\153\000\153\000\155\000\155\000\
-\156\000\154\000\154\000\154\000\157\000\060\000\060\000\150\000\
-\150\000\150\000\158\000\159\000\031\000\031\000\048\000\098\000\
-\161\000\161\000\161\000\161\000\162\000\162\000\151\000\151\000\
-\151\000\164\000\165\000\030\000\047\000\167\000\167\000\167\000\
-\167\000\167\000\167\000\168\000\168\000\168\000\169\000\170\000\
-\171\000\172\000\045\000\045\000\173\000\173\000\173\000\173\000\
-\174\000\174\000\120\000\120\000\071\000\071\000\166\000\166\000\
-\008\000\008\000\175\000\175\000\177\000\177\000\177\000\177\000\
-\177\000\128\000\128\000\179\000\179\000\179\000\179\000\179\000\
-\179\000\179\000\179\000\179\000\179\000\179\000\179\000\179\000\
-\179\000\179\000\179\000\179\000\179\000\179\000\022\000\183\000\
-\183\000\184\000\184\000\182\000\182\000\186\000\186\000\187\000\
-\187\000\185\000\185\000\178\000\178\000\076\000\076\000\163\000\
-\163\000\180\000\180\000\180\000\180\000\180\000\180\000\180\000\
-\190\000\188\000\189\000\068\000\110\000\110\000\110\000\110\000\
-\136\000\136\000\136\000\136\000\136\000\058\000\058\000\119\000\
-\119\000\119\000\119\000\119\000\191\000\191\000\191\000\191\000\
-\191\000\191\000\191\000\191\000\191\000\191\000\191\000\191\000\
-\191\000\191\000\191\000\191\000\191\000\191\000\191\000\191\000\
-\191\000\191\000\191\000\191\000\191\000\191\000\191\000\191\000\
-\191\000\160\000\160\000\160\000\160\000\160\000\160\000\109\000\
-\109\000\103\000\103\000\103\000\103\000\103\000\103\000\103\000\
-\108\000\108\000\137\000\137\000\016\000\016\000\176\000\176\000\
-\176\000\044\000\044\000\077\000\077\000\181\000\181\000\104\000\
-\125\000\125\000\146\000\146\000\105\000\105\000\072\000\072\000\
-\069\000\069\000\084\000\084\000\083\000\083\000\083\000\083\000\
-\083\000\053\000\053\000\099\000\099\000\113\000\113\000\106\000\
-\106\000\107\000\107\000\192\000\192\000\192\000\192\000\192\000\
-\192\000\192\000\192\000\192\000\192\000\192\000\192\000\192\000\
-\192\000\192\000\192\000\192\000\192\000\192\000\192\000\192\000\
-\192\000\192\000\192\000\192\000\192\000\192\000\192\000\192\000\
-\192\000\192\000\192\000\192\000\192\000\192\000\192\000\192\000\
-\192\000\192\000\192\000\192\000\192\000\192\000\192\000\192\000\
-\192\000\192\000\192\000\192\000\192\000\192\000\088\000\088\000\
-\019\000\194\000\039\000\023\000\023\000\017\000\017\000\040\000\
-\040\000\040\000\020\000\038\000\193\000\193\000\193\000\193\000\
-\193\000\000\000\000\000\000\000\000\000\000\000"
-
-let yylen = "\002\000\
-\002\000\002\000\002\000\002\000\002\000\002\000\005\000\001\000\
-\001\000\002\000\001\000\001\000\004\000\004\000\005\000\002\000\
-\003\000\001\000\002\000\001\000\005\000\005\000\003\000\003\000\
-\005\000\007\000\009\000\007\000\006\000\006\000\005\000\003\000\
-\001\000\000\000\002\000\002\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\001\000\001\000\001\000\001\000\001\000\001\000\
-\002\000\001\000\004\000\002\000\004\000\002\000\005\000\001\000\
-\002\000\006\000\005\000\001\000\004\000\004\000\005\000\003\000\
-\003\000\005\000\003\000\003\000\001\000\002\000\000\000\002\000\
-\002\000\001\000\001\000\001\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\001\000\001\000\001\000\002\000\001\000\005\000\
-\004\000\002\000\006\000\003\000\005\000\006\000\001\000\002\000\
-\007\000\006\000\000\000\002\000\006\000\000\000\003\000\002\000\
-\003\000\005\000\000\000\000\000\002\000\003\000\003\000\004\000\
-\004\000\002\000\001\000\007\000\007\000\006\000\007\000\007\000\
-\007\000\005\000\008\000\011\000\004\000\001\000\004\000\004\000\
-\002\000\001\000\007\000\002\000\003\000\000\000\000\000\002\000\
-\004\000\004\000\007\000\004\000\002\000\001\000\005\000\005\000\
-\003\000\003\000\003\000\001\000\002\000\009\000\008\000\001\000\
-\002\000\003\000\005\000\005\000\002\000\005\000\002\000\004\000\
-\002\000\002\000\001\000\001\000\001\000\000\000\002\000\001\000\
-\003\000\001\000\001\000\003\000\001\000\002\000\003\000\007\000\
-\006\000\007\000\004\000\004\000\007\000\006\000\006\000\005\000\
-\001\000\002\000\002\000\007\000\005\000\006\000\010\000\003\000\
-\003\000\003\000\003\000\003\000\003\000\003\000\003\000\003\000\
-\003\000\003\000\003\000\003\000\003\000\003\000\003\000\003\000\
-\003\000\003\000\003\000\003\000\002\000\002\000\005\000\007\000\
-\007\000\007\000\007\000\007\000\009\000\009\000\009\000\003\000\
-\003\000\003\000\004\000\004\000\002\000\001\000\001\000\001\000\
-\001\000\001\000\003\000\003\000\004\000\003\000\004\000\004\000\
-\003\000\005\000\004\000\005\000\005\000\005\000\005\000\005\000\
-\005\000\005\000\005\000\005\000\005\000\005\000\007\000\007\000\
-\007\000\007\000\007\000\007\000\005\000\003\000\003\000\005\000\
-\005\000\004\000\004\000\002\000\006\000\004\000\006\000\004\000\
-\004\000\006\000\004\000\006\000\002\000\002\000\003\000\003\000\
-\002\000\005\000\004\000\005\000\003\000\003\000\005\000\007\000\
-\006\000\009\000\008\000\001\000\001\000\002\000\001\000\001\000\
-\002\000\002\000\002\000\002\000\001\000\001\000\002\000\002\000\
-\004\000\007\000\008\000\003\000\005\000\001\000\002\000\005\000\
-\004\000\001\000\003\000\002\000\002\000\005\000\001\000\003\000\
-\003\000\005\000\003\000\002\000\004\000\002\000\005\000\003\000\
-\003\000\003\000\001\000\001\000\003\000\002\000\004\000\002\000\
-\002\000\003\000\003\000\001\000\001\000\003\000\002\000\004\000\
-\002\000\002\000\002\000\001\000\000\000\003\000\003\000\001\000\
-\003\000\003\000\003\000\003\000\003\000\002\000\001\000\003\000\
-\003\000\001\000\003\000\003\000\003\000\003\000\002\000\001\000\
-\001\000\002\000\002\000\003\000\001\000\001\000\001\000\001\000\
-\003\000\001\000\001\000\002\000\001\000\003\000\004\000\004\000\
-\005\000\005\000\004\000\003\000\003\000\005\000\005\000\004\000\
-\005\000\007\000\007\000\001\000\003\000\003\000\004\000\004\000\
-\004\000\002\000\004\000\003\000\003\000\003\000\003\000\003\000\
-\003\000\001\000\003\000\001\000\002\000\004\000\003\000\004\000\
-\002\000\002\000\000\000\006\000\001\000\002\000\008\000\001\000\
-\002\000\008\000\007\000\003\000\000\000\000\000\002\000\003\000\
-\002\000\003\000\002\000\003\000\005\000\005\000\005\000\007\000\
-\000\000\001\000\003\000\002\000\001\000\003\000\002\000\001\000\
-\002\000\000\000\001\000\001\000\002\000\001\000\003\000\001\000\
-\001\000\002\000\003\000\004\000\001\000\007\000\006\000\003\000\
-\000\000\002\000\004\000\002\000\001\000\003\000\001\000\001\000\
-\002\000\005\000\007\000\009\000\009\000\001\000\001\000\001\000\
-\001\000\002\000\002\000\001\000\001\000\002\000\003\000\004\000\
-\004\000\005\000\001\000\003\000\006\000\005\000\004\000\004\000\
-\001\000\002\000\002\000\003\000\001\000\003\000\001\000\003\000\
-\001\000\002\000\001\000\004\000\001\000\006\000\004\000\005\000\
-\003\000\001\000\003\000\002\000\001\000\001\000\002\000\004\000\
-\003\000\002\000\002\000\003\000\005\000\003\000\004\000\005\000\
-\004\000\002\000\004\000\006\000\005\000\001\000\001\000\001\000\
-\003\000\001\000\001\000\005\000\002\000\001\000\000\000\001\000\
-\003\000\001\000\002\000\001\000\003\000\001\000\003\000\001\000\
-\003\000\002\000\002\000\001\000\001\000\001\000\001\000\001\000\
-\004\000\006\000\002\000\001\000\001\000\001\000\001\000\001\000\
-\001\000\002\000\002\000\002\000\002\000\001\000\001\000\001\000\
-\003\000\003\000\002\000\003\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\003\000\004\000\003\000\004\000\003\000\004\000\
-\001\000\001\000\001\000\001\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\001\000\001\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\002\000\002\000\003\000\001\000\001\000\001\000\
-\003\000\001\000\005\000\002\000\002\000\003\000\001\000\001\000\
-\001\000\003\000\001\000\003\000\001\000\003\000\001\000\003\000\
-\004\000\001\000\003\000\001\000\003\000\001\000\003\000\002\000\
-\000\000\001\000\000\000\001\000\001\000\001\000\000\000\001\000\
-\000\000\001\000\000\000\001\000\000\000\001\000\001\000\002\000\
-\002\000\000\000\001\000\000\000\001\000\000\000\001\000\001\000\
-\001\000\001\000\001\000\001\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\001\000\001\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\001\000\001\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\001\000\001\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\001\000\001\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\001\000\001\000\001\000\001\000\001\000\001\000\
-\001\000\001\000\001\000\001\000\001\000\001\000\001\000\003\000\
-\004\000\004\000\004\000\000\000\002\000\000\000\002\000\000\000\
-\002\000\003\000\004\000\004\000\001\000\002\000\002\000\002\000\
-\004\000\002\000\002\000\002\000\002\000\002\000"
-
-let yydefred = "\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\054\002\000\000\000\000\000\000\111\002\056\002\
-\000\000\000\000\000\000\000\000\000\000\053\002\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\152\002\153\002\000\000\000\000\000\000\154\002\
-\155\002\000\000\000\000\055\002\112\002\000\000\000\000\117\002\
-\230\000\000\000\000\000\226\002\000\000\000\000\000\000\036\001\
-\000\000\033\000\000\000\000\000\038\000\039\000\000\000\041\000\
-\042\000\043\000\000\000\045\000\046\000\000\000\048\000\000\000\
-\050\000\056\000\205\001\000\000\148\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\231\000\232\000\104\002\054\001\168\001\
-\000\000\000\000\000\000\000\000\000\000\227\002\000\000\075\000\
-\074\000\000\000\082\000\083\000\000\000\000\000\087\000\000\000\
-\077\000\078\000\079\000\080\000\000\000\084\000\095\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\119\002\005\002\228\002\000\000\022\002\000\000\006\002\
-\249\001\000\000\000\000\253\001\000\000\229\002\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\064\002\000\000\000\000\
-\000\000\000\000\119\001\230\002\000\000\000\000\140\001\113\001\
-\000\000\000\000\057\002\117\001\118\001\000\000\103\001\000\000\
-\125\001\000\000\000\000\000\000\000\000\063\002\062\002\128\002\
-\022\001\233\000\234\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\075\001\000\000\025\001\052\002\000\000\000\000\
-\000\000\108\002\000\000\000\000\012\001\000\000\158\002\159\002\
-\160\002\161\002\162\002\163\002\164\002\165\002\166\002\167\002\
-\168\002\169\002\170\002\171\002\172\002\173\002\174\002\175\002\
-\176\002\177\002\178\002\179\002\180\002\181\002\182\002\156\002\
-\183\002\184\002\185\002\186\002\187\002\188\002\189\002\190\002\
-\191\002\192\002\193\002\194\002\195\002\196\002\197\002\198\002\
-\199\002\200\002\201\002\157\002\202\002\203\002\204\002\205\002\
-\206\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\067\002\094\002\093\002\000\000\092\002\000\000\095\002\088\002\
-\090\002\070\002\071\002\072\002\073\002\074\002\000\000\089\002\
-\000\000\000\000\000\000\091\002\097\002\000\000\000\000\096\002\
-\000\000\109\002\081\002\087\002\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\147\002\000\000\021\001\035\000\000\000\
-\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\229\000\
-\000\000\036\000\000\000\000\000\000\000\055\001\000\000\169\001\
-\000\000\057\000\000\000\149\000\049\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\037\001\040\001\000\000\000\000\000\000\213\000\214\000\000\000\
-\000\000\000\000\072\000\000\000\002\000\086\000\073\000\000\000\
-\096\000\000\000\115\002\000\000\027\002\000\000\000\000\149\002\
-\000\000\018\002\000\000\048\002\010\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\045\002\000\000\000\000\000\000\000\000\
-\000\000\000\000\004\002\126\002\000\000\011\002\003\000\250\001\
-\000\000\000\000\000\000\000\000\000\000\000\000\007\002\004\000\
-\000\000\000\000\113\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\146\001\000\000\082\002\000\000\086\002\000\000\000\000\
-\084\002\069\002\000\000\059\002\058\002\061\002\060\002\124\001\
-\000\000\000\000\000\000\000\000\005\000\102\001\000\000\114\001\
-\115\001\000\000\000\000\000\000\000\000\217\002\000\000\000\000\
-\000\000\000\000\238\000\000\000\000\000\102\002\000\000\000\000\
-\103\002\098\002\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\163\000\122\001\123\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\018\000\020\000\
-\000\000\000\000\000\000\000\000\000\000\092\001\000\000\007\001\
-\006\001\000\000\000\000\024\001\023\001\000\000\081\001\000\000\
-\000\000\000\000\000\000\000\000\221\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\130\002\000\000\110\002\000\000\000\000\
-\000\000\068\002\000\000\236\000\235\000\000\000\066\002\065\002\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\108\000\
-\000\000\000\000\132\002\000\000\000\000\000\000\000\000\032\000\
-\213\002\000\000\000\000\000\000\000\000\000\000\118\002\105\002\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\154\000\000\000\
-\000\000\175\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\045\001\043\001\029\001\000\000\042\001\038\001\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\069\000\060\000\
-\122\002\000\000\000\000\000\000\000\000\000\000\026\002\000\000\
-\024\002\000\000\029\002\014\002\000\000\000\000\000\000\000\000\
-\051\002\009\002\042\002\043\002\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\040\002\000\000\116\002\120\002\000\000\
-\000\000\000\000\012\002\101\001\116\001\000\000\000\000\000\000\
-\142\001\141\001\000\000\000\000\000\000\000\000\000\000\133\001\
-\000\000\132\001\095\001\094\001\100\001\000\000\098\001\000\000\
-\150\001\000\000\000\000\000\000\126\001\000\000\121\001\000\000\
-\218\002\215\002\000\000\000\000\000\000\241\000\000\000\000\000\
-\000\000\239\000\237\000\140\002\000\000\099\002\000\000\100\002\
-\000\000\000\000\000\000\000\000\085\002\000\000\083\002\000\000\
-\000\000\162\000\000\000\164\000\000\000\165\000\159\000\170\000\
-\000\000\157\000\000\000\161\000\000\000\000\000\000\000\000\000\
-\180\000\000\000\000\000\063\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\016\000\019\000\051\000\000\000\000\000\074\001\
-\090\001\000\000\091\001\000\000\000\000\077\001\000\000\082\001\
-\000\000\017\001\016\001\011\001\010\001\222\002\000\000\000\000\
-\219\002\208\002\220\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\112\001\000\000\000\000\000\000\000\000\
-\000\000\240\000\211\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\228\000\227\000\000\000\000\000\
-\000\000\000\000\196\001\195\001\000\000\186\001\000\000\000\000\
-\000\000\000\000\000\000\027\001\000\000\019\001\000\000\014\001\
-\000\000\000\000\000\000\243\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\070\000\089\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\015\002\030\002\000\000\000\000\
-\000\000\019\002\017\002\000\000\000\000\000\000\247\001\000\000\
-\000\000\000\000\000\000\000\000\008\002\000\000\000\000\127\002\
-\000\000\000\000\121\002\252\001\114\002\000\000\000\000\000\000\
-\159\001\000\000\144\001\143\001\147\001\145\001\000\000\136\001\
-\000\000\127\001\131\001\128\001\000\000\209\002\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\101\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\210\001\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\068\001\070\001\000\000\000\000\
-\000\000\000\000\011\000\000\000\000\000\024\000\000\000\023\000\
-\000\000\017\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\056\001\000\000\000\000\000\000\000\000\048\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\111\001\000\000\000\000\
-\080\002\078\002\076\002\000\000\031\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\006\000\008\000\009\000\000\000\054\000\
-\055\000\000\000\105\000\000\000\000\000\000\000\000\000\000\000\
-\115\000\109\000\088\000\184\000\000\000\189\001\000\000\000\000\
-\000\000\000\000\192\001\188\001\000\000\000\000\210\002\009\001\
-\008\001\028\001\026\001\000\000\000\000\107\002\000\000\244\000\
-\242\000\155\000\057\001\000\000\000\000\000\000\005\001\248\000\
-\000\000\246\000\000\000\000\000\000\000\000\000\000\000\254\000\
-\000\000\250\000\000\000\252\000\000\000\000\000\068\000\067\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\235\001\000\000\
-\123\002\000\000\000\000\000\000\000\000\000\000\093\000\000\000\
-\000\000\025\002\032\002\000\000\016\002\034\002\000\000\000\000\
-\000\000\000\000\000\000\000\000\021\002\013\002\000\000\041\002\
-\000\000\151\002\158\001\000\000\137\001\135\001\134\001\130\001\
-\129\001\247\000\245\000\000\000\000\000\000\000\253\000\249\000\
-\251\000\000\000\000\000\198\001\000\000\138\002\000\000\000\000\
-\215\001\000\000\000\000\000\000\000\000\207\001\000\000\134\002\
-\133\002\000\000\047\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\160\000\000\000\000\000\067\001\065\001\000\000\064\001\
-\000\000\000\000\010\000\000\000\000\000\014\000\013\000\000\000\
-\225\002\177\000\208\001\000\000\000\000\000\000\000\000\060\001\
-\000\000\000\000\000\000\058\001\061\001\105\001\104\001\110\001\
-\000\000\108\001\000\000\153\001\000\000\052\001\000\000\000\000\
-\033\001\000\000\000\000\000\000\101\000\058\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\114\000\
-\000\000\000\000\187\001\000\000\173\001\000\000\191\001\164\001\
-\190\000\020\001\018\001\015\001\013\001\000\000\173\001\059\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\062\000\061\000\000\000\000\000\000\000\
-\000\000\094\000\092\000\000\000\000\000\000\000\000\000\028\002\
-\020\002\035\002\248\001\244\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\103\000\000\000\193\001\000\000\000\000\
-\214\001\217\001\211\001\000\000\206\001\000\000\000\000\000\000\
-\181\000\000\000\167\000\158\000\156\000\000\000\069\001\000\000\
-\000\000\000\000\000\000\031\000\000\000\000\000\025\000\022\000\
-\021\000\176\000\178\000\000\000\000\000\000\000\049\001\000\000\
-\000\000\032\001\000\000\000\000\106\000\000\000\000\000\000\000\
-\000\000\111\000\000\000\110\000\190\001\000\000\179\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\200\001\201\001\
-\000\000\000\000\136\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\004\001\000\000\000\001\000\000\002\001\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\236\001\
-\097\000\000\000\000\000\098\000\033\002\050\002\139\001\138\001\
-\003\001\255\000\001\001\199\001\197\001\000\000\000\000\124\002\
-\000\000\130\000\000\000\126\000\000\000\000\000\166\001\167\001\
-\000\000\071\001\066\001\029\000\000\000\030\000\000\000\000\000\
-\000\000\000\000\059\001\053\001\007\000\000\000\112\000\113\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\180\001\
-\000\000\000\000\000\000\000\000\202\001\000\000\000\000\170\001\
-\000\000\000\000\000\000\222\001\223\001\224\001\225\001\035\001\
-\000\000\171\001\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\228\001\
-\229\001\000\000\000\000\000\000\129\000\150\000\000\000\000\000\
-\000\000\000\000\026\000\028\000\000\000\000\000\062\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\203\001\000\000\172\001\000\000\000\000\000\000\220\001\
-\226\001\227\001\034\001\151\000\000\000\000\000\000\000\238\001\
-\242\001\173\001\091\000\000\000\221\001\230\001\000\000\000\000\
-\000\000\000\000\135\000\125\002\000\000\191\000\000\000\000\000\
-\050\001\000\000\000\000\000\000\122\000\000\000\000\000\000\000\
-\000\000\204\001\183\001\000\000\000\000\181\001\000\000\000\000\
-\000\000\000\000\231\001\000\000\125\000\000\000\000\000\128\000\
-\127\000\000\000\000\000\027\000\051\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\118\000\000\000\000\000\
-\000\000\000\000\232\001\233\001\000\000\133\000\000\000\000\000\
-\000\000\000\000\000\000\142\000\136\000\219\001\120\000\121\000\
-\000\000\000\000\000\000\000\000\000\000\119\000\184\001\234\001\
-\000\000\000\000\000\000\000\000\000\000\141\000\000\000\123\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\140\000\137\000\144\002\145\002\
-\000\000\000\000\000\000\000\000\138\000\000\000\000\000\000\000\
-\000\000\000\000\124\000\000\000\000\000\000\000\139\000\000\000\
-\000\000"
-
-let yydgoto = "\006\000\
-\052\000\094\000\124\000\134\000\148\000\245\001\095\000\153\005\
-\054\000\171\001\250\002\175\003\065\003\132\003\200\002\055\000\
-\190\001\223\001\072\001\056\000\057\000\066\003\046\001\058\000\
-\059\000\136\000\061\000\062\000\063\000\064\000\065\000\066\000\
-\067\000\068\000\069\000\070\000\071\000\072\000\073\000\000\001\
-\251\002\074\000\082\001\088\002\238\003\104\000\105\000\075\000\
-\107\000\108\000\109\000\110\000\037\001\049\003\111\000\113\001\
-\168\003\089\002\102\003\026\004\015\002\016\002\255\002\186\003\
-\103\004\101\004\199\004\076\000\031\004\075\004\154\005\213\004\
-\076\004\117\003\003\005\136\001\004\005\114\005\115\005\146\005\
-\173\005\203\005\199\005\165\002\092\005\077\000\084\001\250\000\
-\192\002\120\003\047\004\121\003\119\003\183\002\152\000\078\000\
-\096\001\228\002\121\001\195\002\193\002\079\000\080\000\081\000\
-\042\004\082\000\083\000\185\000\084\000\085\000\186\000\196\000\
-\239\001\192\000\097\001\098\001\074\002\232\002\086\000\155\005\
-\234\002\157\000\087\000\078\001\253\001\077\004\196\002\127\000\
-\187\000\188\000\231\001\193\000\158\000\159\000\237\002\160\000\
-\128\000\161\000\158\001\161\001\159\001\128\002\167\004\088\000\
-\080\001\020\002\005\003\109\004\218\004\214\004\032\004\006\003\
-\191\003\007\003\196\003\028\004\158\004\215\004\216\004\217\004\
-\172\002\106\003\107\003\033\004\034\004\062\003\043\005\063\005\
-\044\005\045\005\046\005\047\005\239\003\059\005\129\000\130\000\
-\131\000\132\000\133\000\129\001\142\001\095\002\096\002\097\002\
-\255\003\055\003\252\003\130\001\131\001\132\001\030\001\251\000\
-\246\001\047\001"
-
-let yysindex = "\180\007\
-\119\061\200\008\016\047\124\064\160\067\000\000\076\004\241\002\
-\244\009\076\004\000\000\236\254\076\004\076\004\000\000\000\000\
-\076\004\076\004\076\004\076\004\076\004\000\000\076\004\044\067\
-\174\002\205\061\037\062\122\057\122\057\068\003\000\000\232\054\
-\122\057\076\004\000\000\000\000\036\004\076\004\106\000\000\000\
-\000\000\244\009\119\061\000\000\000\000\076\004\076\004\000\000\
-\000\000\076\004\076\004\000\000\254\000\102\000\157\000\000\000\
-\225\072\000\000\222\005\236\255\000\000\000\000\241\000\000\000\
-\000\000\000\000\017\001\000\000\000\000\024\002\000\000\102\000\
-\000\000\000\000\000\000\089\001\000\000\034\069\015\002\244\009\
-\244\009\124\064\124\064\000\000\000\000\000\000\000\000\000\000\
-\076\004\076\004\036\004\200\008\076\004\000\000\140\003\000\000\
-\000\000\241\000\000\000\000\000\024\002\102\000\000\000\200\008\
-\000\000\000\000\000\000\000\000\113\002\000\000\000\000\145\007\
-\220\002\050\255\122\009\044\003\165\016\016\047\054\003\241\002\
-\021\003\000\000\000\000\000\000\038\000\000\000\023\003\000\000\
-\000\000\115\001\232\000\000\000\061\002\000\000\216\004\236\255\
-\076\004\076\004\035\003\163\066\226\066\000\000\088\059\018\004\
-\129\004\086\003\000\000\000\000\067\000\251\003\000\000\000\000\
-\160\067\160\067\000\000\000\000\000\000\039\004\000\000\107\004\
-\000\000\122\057\122\057\033\004\244\009\000\000\000\000\000\000\
-\000\000\000\000\000\000\122\062\076\004\041\002\097\005\160\067\
-\040\066\220\002\124\064\019\002\244\009\000\000\188\004\113\001\
-\212\002\117\255\000\000\127\004\000\000\000\000\246\004\165\002\
-\224\004\000\000\073\073\248\004\000\000\248\004\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\032\061\080\005\032\061\076\004\076\004\106\000\022\005\
-\000\000\000\000\000\000\244\009\000\000\036\005\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\083\005\000\000\
-\000\000\000\000\165\000\000\000\000\000\000\000\000\000\000\000\
-\244\009\000\000\000\000\000\000\184\255\130\255\032\061\124\064\
-\076\004\160\255\070\005\000\000\076\004\000\000\000\000\124\064\
-\069\005\097\005\124\064\000\000\122\057\222\005\102\000\225\004\
-\124\064\124\064\124\064\124\064\124\064\124\064\124\064\124\064\
-\124\064\124\064\124\064\124\064\124\064\124\064\124\064\124\064\
-\124\064\124\064\124\064\124\064\124\064\207\062\124\064\000\000\
-\076\004\000\000\173\005\033\004\124\064\000\000\033\004\000\000\
-\033\004\000\000\033\004\000\000\000\000\124\064\104\003\099\005\
-\244\009\244\009\150\005\157\005\244\009\150\005\119\002\041\069\
-\000\000\000\000\124\064\119\002\119\002\000\000\000\000\041\002\
-\219\003\168\004\000\000\069\005\000\000\000\000\000\000\033\004\
-\000\000\174\004\000\000\017\255\000\000\138\005\235\005\000\000\
-\174\004\000\000\174\004\000\000\000\000\000\000\233\005\163\005\
-\231\005\043\017\043\017\000\000\016\047\076\004\033\004\183\000\
-\198\005\004\006\000\000\000\000\255\005\000\000\000\000\000\000\
-\090\008\094\003\170\005\194\005\016\047\021\003\000\000\000\000\
-\160\067\168\068\000\000\010\006\034\006\203\255\224\005\037\004\
-\236\005\000\000\236\005\000\000\018\004\000\000\165\000\129\004\
-\000\000\000\000\076\001\000\000\000\000\000\000\000\000\000\000\
-\053\002\152\013\239\059\044\060\000\000\000\000\144\003\000\000\
-\000\000\160\067\076\003\032\061\033\004\000\000\033\004\119\002\
-\189\004\102\005\000\000\205\001\227\005\000\000\251\005\158\000\
-\000\000\000\000\009\002\006\070\077\006\128\003\168\068\011\058\
-\104\002\136\005\205\005\188\065\000\000\000\000\000\000\160\067\
-\241\005\033\004\141\001\033\004\115\005\072\006\000\000\000\000\
-\119\002\143\005\035\003\070\006\214\007\000\000\078\006\000\000\
-\000\000\035\003\124\064\000\000\000\000\157\005\000\000\124\064\
-\118\255\051\003\200\073\160\067\000\000\020\006\122\057\023\006\
-\041\002\009\006\076\004\000\000\229\050\000\000\022\006\028\006\
-\029\006\000\000\019\002\000\000\000\000\038\006\000\000\000\000\
-\041\006\027\006\241\002\037\006\178\002\160\067\232\002\000\000\
-\043\006\032\006\000\000\029\005\122\006\123\006\032\061\000\000\
-\000\000\044\067\116\003\036\063\124\063\087\055\000\000\000\000\
-\166\073\166\073\134\073\247\007\073\073\134\073\239\009\239\009\
-\239\009\239\009\089\002\104\006\104\006\239\009\089\002\089\002\
-\134\073\104\006\089\002\089\002\089\002\122\057\000\000\104\006\
-\229\050\000\000\029\005\044\006\227\005\073\073\124\064\124\064\
-\124\064\170\004\092\006\124\064\124\064\124\064\119\002\119\002\
-\000\000\000\000\000\000\218\004\000\000\000\000\134\073\027\001\
-\033\004\219\003\048\006\033\004\000\000\211\002\000\000\000\000\
-\000\000\123\002\055\006\186\002\029\005\057\006\000\000\199\255\
-\000\000\155\006\000\000\000\000\174\004\091\001\211\255\062\048\
-\000\000\000\000\000\000\000\000\096\006\219\003\016\047\159\002\
-\016\047\016\047\119\003\000\000\071\006\000\000\000\000\021\001\
-\241\002\097\006\000\000\000\000\000\000\121\003\016\047\148\006\
-\000\000\000\000\053\003\160\067\029\000\108\005\067\006\000\000\
-\097\011\000\000\000\000\000\000\000\000\179\002\000\000\162\006\
-\000\000\173\000\031\067\178\059\000\000\173\000\000\000\094\006\
-\000\000\000\000\124\064\124\064\235\004\000\000\124\064\124\064\
-\124\064\000\000\000\000\000\000\132\006\000\000\095\006\000\000\
-\019\015\074\002\019\015\033\004\000\000\188\006\000\000\016\047\
-\124\064\000\000\126\006\000\000\160\067\000\000\000\000\000\000\
-\127\006\000\000\127\006\000\000\090\008\122\058\124\064\188\065\
-\000\000\108\000\184\006\000\000\124\064\130\006\033\004\073\001\
-\119\061\155\001\000\000\000\000\000\000\087\006\000\000\000\000\
-\000\000\161\000\000\000\033\004\124\064\000\000\073\073\000\000\
-\073\073\000\000\000\000\000\000\000\000\000\000\033\004\243\000\
-\000\000\000\000\000\000\157\006\027\001\178\002\043\006\102\000\
-\100\065\068\005\190\006\000\000\187\006\146\006\149\006\153\006\
-\021\002\000\000\000\000\220\002\191\006\178\002\219\003\019\002\
-\078\003\178\002\102\000\007\002\000\000\000\000\169\001\201\003\
-\091\005\103\004\000\000\000\000\176\003\000\000\244\254\016\047\
-\124\064\125\006\221\255\000\000\255\002\000\000\248\004\000\000\
-\248\004\128\006\165\000\000\000\165\255\124\064\102\000\156\006\
-\178\002\132\006\073\073\038\005\063\000\190\255\162\005\124\064\
-\085\070\117\070\195\070\130\006\094\255\145\006\200\008\219\003\
-\129\002\000\000\000\000\186\003\212\006\219\003\043\006\214\004\
-\102\000\176\003\214\006\174\004\000\000\000\000\016\047\057\000\
-\224\006\000\000\000\000\241\002\057\255\033\004\000\000\016\047\
-\180\001\137\006\033\004\021\003\000\000\097\006\159\006\000\000\
-\090\008\124\006\000\000\000\000\000\000\033\004\160\067\142\006\
-\000\000\037\004\000\000\000\000\000\000\000\000\149\000\000\000\
-\223\255\000\000\000\000\000\000\208\001\000\000\098\000\245\255\
-\181\005\227\070\049\071\081\071\103\004\174\006\000\000\164\006\
-\000\000\172\006\071\006\158\006\169\000\225\006\033\004\000\000\
-\102\000\144\000\182\255\126\006\154\006\125\005\226\006\226\006\
-\237\006\166\006\179\006\126\006\000\000\000\000\210\063\124\064\
-\160\067\041\073\000\000\044\005\124\064\000\000\219\003\000\000\
-\030\003\000\000\016\047\073\073\124\064\124\064\033\004\216\006\
-\060\255\000\000\028\009\124\064\233\058\234\006\000\000\161\065\
-\059\002\105\060\166\060\227\060\124\064\000\000\016\047\160\067\
-\000\000\000\000\000\000\015\000\000\000\160\067\219\003\102\000\
-\102\000\175\001\226\005\000\000\000\000\000\000\248\006\000\000\
-\000\000\016\047\000\000\033\004\033\004\106\000\106\000\102\000\
-\000\000\000\000\000\000\000\000\160\067\000\000\217\000\236\006\
-\180\006\241\002\000\000\000\000\234\005\244\006\000\000\000\000\
-\000\000\000\000\000\000\110\000\122\005\000\000\019\002\000\000\
-\000\000\000\000\000\000\236\006\102\000\203\006\000\000\000\000\
-\206\006\000\000\210\006\124\064\124\064\124\064\073\073\000\000\
-\211\006\000\000\217\006\000\000\223\006\199\005\000\000\000\000\
-\033\004\120\004\180\001\043\006\029\005\015\007\000\000\000\000\
-\000\000\219\003\180\001\201\003\061\001\008\007\000\000\200\006\
-\219\003\000\000\000\000\087\001\000\000\000\000\074\255\000\000\
-\016\047\241\002\193\006\097\006\000\000\000\000\016\047\000\000\
-\037\004\000\000\000\000\219\003\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\124\064\124\064\124\064\000\000\000\000\
-\000\000\228\255\201\006\000\000\007\007\000\000\157\005\208\006\
-\000\000\164\006\090\008\184\000\102\000\000\000\204\006\000\000\
-\000\000\124\064\000\000\188\065\016\047\124\064\209\006\215\006\
-\016\047\000\000\124\064\218\006\000\000\000\000\219\006\000\000\
-\124\064\019\002\000\000\174\069\097\255\000\000\000\000\033\004\
-\000\000\000\000\000\000\124\064\124\064\126\006\046\001\000\000\
-\126\006\124\064\019\007\000\000\000\000\000\000\000\000\000\000\
-\179\002\000\000\162\006\000\000\173\000\000\000\088\003\173\000\
-\000\000\227\006\184\006\180\001\000\000\000\000\019\002\219\003\
-\255\254\016\047\124\064\033\004\102\000\033\004\102\000\000\000\
-\184\006\103\004\000\000\162\011\000\000\229\006\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\108\002\000\000\000\000\
-\036\007\124\064\124\064\168\071\200\071\022\072\124\064\124\064\
-\124\064\219\003\019\002\000\000\000\000\202\005\035\003\129\002\
-\211\002\000\000\000\000\219\003\229\006\211\002\016\047\000\000\
-\000\000\000\000\000\000\000\000\033\004\097\006\001\000\054\072\
-\132\072\164\072\103\004\000\000\241\002\000\000\131\005\053\007\
-\000\000\000\000\000\000\055\007\000\000\204\006\102\000\048\007\
-\000\000\033\004\000\000\000\000\000\000\033\004\000\000\188\065\
-\124\064\073\073\226\005\000\000\094\000\082\001\000\000\000\000\
-\000\000\000\000\000\000\049\007\016\047\239\006\000\000\124\064\
-\124\064\000\000\226\005\161\003\000\000\125\003\102\000\102\000\
-\174\255\000\000\187\003\000\000\000\000\041\002\000\000\249\006\
-\222\069\229\045\000\000\222\003\021\007\070\007\000\000\000\000\
-\027\001\054\255\000\000\252\000\015\003\054\255\131\005\073\073\
-\073\073\000\000\018\007\000\000\022\007\000\000\024\007\073\073\
-\073\073\073\073\180\001\226\005\170\005\170\005\046\005\000\000\
-\000\000\105\004\048\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\016\047\001\007\000\000\
-\033\004\000\000\234\005\000\000\254\002\062\048\000\000\000\000\
-\124\064\000\000\000\000\000\000\202\000\000\000\250\006\016\047\
-\238\003\161\065\000\000\000\000\000\000\016\047\000\000\000\000\
-\233\006\229\006\157\005\235\006\164\006\157\005\027\001\000\000\
-\033\004\070\007\229\006\164\006\000\000\033\004\016\047\000\000\
-\041\002\030\002\193\001\000\000\000\000\000\000\000\000\000\000\
-\254\006\000\000\234\005\124\064\124\064\124\064\007\003\007\003\
-\016\047\005\007\016\047\061\001\041\002\027\001\008\002\000\000\
-\000\000\099\000\106\000\029\007\000\000\000\000\194\003\033\004\
-\079\007\219\003\000\000\000\000\065\004\124\064\000\000\033\004\
-\157\005\157\005\013\066\157\005\157\005\110\005\033\004\093\255\
-\010\007\000\000\090\004\000\000\106\002\074\002\033\004\000\000\
-\000\000\000\000\000\000\000\000\073\073\073\073\073\073\000\000\
-\000\000\000\000\000\000\027\001\000\000\000\000\213\003\033\004\
-\016\047\135\004\000\000\000\000\009\007\000\000\011\007\124\064\
-\000\000\092\007\093\007\060\017\000\000\094\007\097\007\124\064\
-\085\007\000\000\000\000\164\006\070\007\000\000\016\047\074\002\
-\033\004\033\004\000\000\096\007\000\000\043\006\083\001\000\000\
-\000\000\037\002\033\004\000\000\000\000\062\048\062\048\126\006\
-\033\004\086\007\075\001\016\047\016\047\000\000\124\064\025\007\
-\033\004\033\004\000\000\000\000\039\005\000\000\033\004\033\004\
-\033\004\033\004\102\000\000\000\000\000\000\000\000\000\000\000\
-\095\007\124\064\016\047\033\004\033\004\000\000\000\000\000\000\
-\131\005\016\047\131\005\139\001\009\003\000\000\016\047\000\000\
-\033\004\033\004\102\000\234\005\006\007\032\007\157\005\227\005\
-\164\006\107\007\102\000\091\004\000\000\000\000\000\000\000\000\
-\109\007\157\005\157\005\016\047\000\000\124\064\062\048\110\007\
-\111\007\033\004\000\000\102\000\016\047\016\047\000\000\033\004\
-\033\004"
-
-let yyrindex = "\000\000\
-\126\008\127\008\000\000\000\000\000\000\000\000\106\069\000\000\
-\000\000\039\064\000\000\000\000\214\002\242\005\000\000\000\000\
-\221\067\101\066\099\067\209\064\139\003\000\000\106\069\000\000\
-\000\000\000\000\000\000\000\000\000\000\248\067\193\017\000\000\
-\000\000\209\064\000\000\000\000\200\004\096\000\042\004\000\000\
-\000\000\000\000\060\000\000\000\000\000\209\064\225\007\000\000\
-\000\000\242\005\209\064\000\000\000\000\021\043\103\016\000\000\
-\136\044\000\000\060\000\120\043\000\000\000\000\067\044\000\000\
-\000\000\000\000\081\053\000\000\000\000\102\053\000\000\021\043\
-\000\000\000\000\000\000\000\000\000\000\035\025\221\027\058\024\
-\174\024\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\214\002\099\004\200\004\062\000\225\007\000\000\000\000\000\000\
-\000\000\218\012\000\000\000\000\111\053\146\053\000\000\062\000\
-\000\000\000\000\000\000\000\000\167\053\000\000\000\000\000\000\
-\113\005\113\005\000\000\188\012\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\240\016\000\000\
-\000\000\000\000\151\015\000\000\163\014\000\000\000\000\000\000\
-\221\067\229\068\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\014\049\000\000\000\000\
-\255\001\098\003\000\000\000\000\000\000\050\005\000\000\125\049\
-\000\000\000\000\000\000\117\054\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\221\001\000\000\000\000\000\000\
-\000\000\053\068\000\000\000\000\000\000\135\255\016\002\000\000\
-\214\255\000\000\000\000\076\000\000\000\000\000\069\255\000\000\
-\040\004\000\000\215\255\131\000\000\000\245\005\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\038\007\004\054\038\007\214\002\026\007\042\004\080\068\
-\000\000\000\000\000\000\012\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\028\056\114\056\139\003\000\000\000\000\200\056\030\057\000\000\
-\014\000\000\000\000\000\000\000\000\000\000\000\038\007\000\000\
-\217\003\000\000\008\003\000\000\026\007\000\000\000\000\000\000\
-\084\006\000\000\000\000\000\000\000\000\060\000\132\050\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\057\034\000\000\000\000\
-\248\067\000\000\120\043\141\068\000\000\000\000\041\005\000\000\
-\031\007\000\000\055\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\221\022\151\025\
-\000\000\000\000\000\000\011\026\128\026\000\000\000\000\000\000\
-\000\000\000\000\000\000\084\006\000\000\000\000\000\000\031\007\
-\000\000\000\000\000\000\125\001\000\000\120\007\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\147\255\000\000\098\007\
-\000\000\102\007\116\007\000\000\000\000\099\004\180\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\045\000\000\000\194\000\090\000\
-\131\000\000\000\245\005\000\000\066\000\000\000\026\007\101\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\038\007\117\054\000\000\155\048\244\026\
-\000\000\000\000\000\000\000\000\164\005\000\000\000\000\000\000\
-\000\000\000\000\068\017\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\066\007\000\000\198\055\021\043\207\002\000\000\000\000\
-\104\027\000\000\000\000\000\000\000\000\000\000\085\255\000\000\
-\000\000\196\000\000\000\000\000\000\000\069\004\000\000\162\000\
-\000\000\000\000\041\007\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\026\007\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\001\003\000\000\000\000\038\007\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\096\037\205\037\053\038\174\034\208\039\157\038\034\035\150\035\
-\011\036\127\036\127\031\081\028\197\028\243\036\244\031\104\032\
-\005\039\058\029\220\032\081\033\197\033\000\000\000\000\174\029\
-\000\000\000\000\111\003\000\000\164\005\051\040\000\000\000\000\
-\000\000\000\000\082\018\000\000\000\000\000\000\081\023\198\023\
-\000\000\000\000\000\000\105\022\000\000\000\000\109\039\025\053\
-\066\007\000\000\000\000\005\004\030\006\146\053\000\000\000\000\
-\000\000\000\000\000\000\000\000\001\003\000\000\000\000\000\000\
-\000\000\193\049\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\246\044\
-\000\000\000\000\000\000\000\000\205\045\000\000\000\000\000\000\
-\000\000\048\046\000\000\000\000\000\000\000\000\000\000\102\255\
-\000\000\000\000\222\000\162\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\202\006\000\000\093\005\
-\000\000\225\003\000\000\000\000\000\000\165\005\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\090\007\000\000\000\000\000\000\
-\000\000\000\000\000\000\238\039\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\034\030\000\000\000\000\000\000\038\065\000\000\
-\169\004\000\000\000\000\000\000\000\000\000\000\025\001\000\000\
-\000\000\084\255\000\000\169\255\000\000\000\000\185\255\000\000\
-\097\000\000\000\000\000\000\000\000\000\000\000\064\007\065\007\
-\000\000\000\000\000\000\000\000\136\003\000\000\000\000\213\005\
-\182\004\000\000\074\006\000\000\191\002\105\000\139\000\143\000\
-\000\000\000\000\000\000\053\068\185\040\000\000\000\000\000\000\
-\000\000\000\000\021\043\000\000\000\000\000\000\234\004\021\043\
-\053\068\228\001\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\131\000\000\000\
-\245\005\000\000\139\003\000\000\000\000\000\000\213\005\000\000\
-\000\000\090\007\000\000\198\006\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\018\005\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\146\053\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\047\002\000\000\000\000\
-\087\255\000\000\210\000\000\000\000\000\147\046\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\197\000\000\000\229\000\
-\000\000\125\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\068\007\000\000\000\000\099\007\
-\012\050\000\000\074\050\000\000\000\000\040\011\238\039\000\000\
-\021\043\000\000\000\000\174\001\000\000\049\255\073\007\073\007\
-\068\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\089\045\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\136\255\000\000\000\000\122\007\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\021\043\
-\028\041\000\000\127\010\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\050\038\065\139\004\225\002\136\004\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\163\051\
-\000\000\000\000\000\000\000\000\021\043\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\016\052\028\041\000\000\000\000\000\000\
-\198\018\000\000\058\019\000\000\000\000\000\000\155\040\000\000\
-\175\019\000\000\035\020\000\000\151\020\000\000\000\000\000\000\
-\235\003\000\000\162\050\000\000\001\003\240\047\000\000\119\007\
-\000\000\000\000\191\047\146\053\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\125\001\000\000\000\000\000\000\190\057\
-\000\000\000\000\128\007\248\046\000\000\000\000\000\000\000\000\
-\186\255\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\048\004\000\000\000\000\021\043\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\220\255\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\012\005\000\000\125\004\000\000\203\004\000\000\000\000\062\005\
-\000\000\000\000\151\030\231\041\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\120\003\136\004\058\003\136\004\000\000\
-\011\031\228\001\000\000\115\007\000\000\063\001\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\069\007\000\000\000\000\000\000\063\001\069\007\000\000\000\000\
-\000\000\000\000\000\000\000\000\229\015\091\047\000\000\000\000\
-\000\000\000\000\068\007\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\074\042\021\043\000\000\
-\000\000\103\001\000\000\000\000\000\000\148\001\000\000\000\000\
-\000\000\254\040\175\008\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\026\012\000\000\000\000\000\000\136\004\136\004\
-\108\007\000\000\099\007\000\000\000\000\000\000\000\000\000\000\
-\000\000\118\007\199\049\069\052\000\000\122\052\000\000\000\000\
-\249\050\028\041\000\000\000\000\000\000\028\041\000\000\097\041\
-\201\041\000\000\012\021\000\000\128\021\000\000\244\021\044\042\
-\143\042\247\042\049\051\042\048\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\044\001\000\000\028\041\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\112\007\108\007\000\000\114\007\099\007\000\000\249\050\000\000\
-\178\052\208\052\056\006\099\007\000\000\219\051\000\000\000\000\
-\000\000\092\052\021\043\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\028\041\000\000\000\000\000\000\106\010\238\013\
-\000\000\156\050\000\000\000\000\000\000\028\015\146\053\000\000\
-\000\000\000\000\115\003\193\002\000\000\000\000\000\000\249\004\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\111\002\
-\000\000\000\000\000\000\000\000\000\000\000\000\219\051\000\000\
-\000\000\000\000\000\000\000\000\092\052\000\000\139\039\000\000\
-\000\000\000\000\000\000\000\000\090\043\189\043\037\044\000\000\
-\000\000\000\000\000\000\028\015\000\000\000\000\000\000\031\007\
-\000\000\000\000\000\000\000\000\082\007\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\099\007\008\053\000\000\000\000\000\000\
-\139\039\139\039\000\000\241\015\000\000\000\000\000\000\000\000\
-\000\000\019\005\161\004\000\000\000\000\000\000\000\000\000\000\
-\168\255\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\181\047\139\039\000\000\000\000\000\000\000\000\000\050\021\006\
-\120\003\058\003\243\004\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\032\002\071\003\000\000\000\000\000\000\
-\000\000\000\000\000\000\117\007\000\000\000\000\000\000\000\000\
-\182\002\105\051\243\004\243\004\125\007\126\007\000\000\130\007\
-\099\007\000\000\243\004\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\196\003\000\000\243\004\000\000\000\000\000\000\212\003\
-\237\004"
-
-let yygindex = "\000\000\
-\000\000\000\000\000\000\000\000\000\000\020\000\183\255\037\000\
-\168\000\184\005\119\253\000\000\166\254\147\005\096\255\145\008\
-\232\012\061\254\077\005\253\255\063\014\144\252\036\003\247\255\
-\000\000\046\000\016\000\021\000\027\000\000\000\000\000\000\000\
-\000\000\030\000\035\000\040\000\000\000\255\255\003\000\093\009\
-\084\002\000\000\000\000\000\000\000\000\000\000\000\000\041\000\
-\000\000\000\000\000\000\000\000\010\255\059\252\000\000\000\000\
-\000\000\004\000\148\005\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\010\003\056\000\112\251\081\255\136\253\214\251\
-\048\253\185\252\087\251\199\003\087\003\000\000\000\000\000\000\
-\000\000\000\000\000\000\211\253\000\000\000\000\000\000\042\000\
-\082\255\014\006\085\005\100\005\000\000\000\000\083\255\048\000\
-\000\000\000\000\170\255\035\002\103\253\160\006\187\010\173\011\
-\000\000\000\000\000\000\131\255\000\000\006\013\182\006\006\000\
-\104\255\048\003\121\007\000\000\124\007\165\006\244\010\176\253\
-\000\000\218\000\000\000\000\000\000\000\198\003\090\005\152\255\
-\254\004\000\000\000\000\000\000\000\000\227\000\000\000\034\007\
-\145\255\042\007\081\006\083\008\000\000\000\000\060\004\000\000\
-\000\000\129\007\233\253\016\005\193\251\101\251\000\252\028\253\
-\000\000\204\252\000\000\074\004\000\000\000\000\119\251\088\255\
-\101\253\062\006\091\007\000\000\000\000\232\003\000\000\000\000\
-\253\003\243\252\000\000\200\003\108\004\000\000\179\253\135\002\
-\155\255\000\000\000\000\192\005\147\254\157\255\199\254\151\255\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\055\255\000\000"
-
-let yytablesize = 19255
-let yytable = "\126\000\
-\102\000\151\000\212\001\213\001\103\000\203\001\119\001\117\001\
-\251\001\230\001\128\001\168\000\118\001\157\001\086\002\026\003\
-\137\001\096\000\107\001\221\001\053\000\151\001\097\000\061\003\
-\151\003\203\002\063\003\123\001\098\000\190\003\111\001\099\000\
-\198\000\162\004\176\001\024\003\100\000\143\001\126\003\125\000\
-\123\002\101\000\106\000\241\001\043\004\242\001\060\000\139\004\
-\027\004\074\001\248\001\090\004\052\004\051\005\034\005\222\004\
-\169\000\120\001\030\005\034\000\131\003\071\000\039\001\102\002\
-\162\000\103\002\181\001\220\004\084\001\050\003\252\000\184\000\
-\039\005\143\003\031\001\171\000\037\005\194\003\001\004\008\000\
-\191\000\206\002\162\000\087\001\080\001\009\002\023\002\173\000\
-\060\000\038\001\102\000\216\001\197\004\231\003\103\000\098\002\
-\184\004\195\003\243\004\069\004\206\004\161\001\102\000\023\002\
-\075\001\084\001\103\000\096\000\126\000\006\002\087\001\126\000\
-\097\000\126\000\126\000\131\005\232\001\218\002\098\000\096\000\
-\045\001\099\000\198\001\139\001\097\000\095\001\100\000\100\001\
-\101\001\007\002\098\000\101\000\106\000\099\000\113\002\079\001\
-\151\000\151\000\100\000\151\000\085\005\122\001\171\000\101\000\
-\106\000\132\005\002\004\199\001\113\002\151\000\151\000\113\002\
-\037\005\135\001\131\003\151\004\064\002\200\001\027\005\162\000\
-\052\002\113\002\162\000\084\001\208\003\145\004\040\003\245\001\
-\089\001\040\003\127\001\135\000\151\000\151\000\087\001\080\001\
-\224\001\087\001\087\001\080\001\023\002\064\002\115\002\004\002\
-\083\001\160\001\245\001\232\003\133\005\218\003\185\004\080\002\
-\161\001\245\001\245\001\089\001\161\001\228\001\201\001\029\001\
-\229\001\202\001\129\002\188\001\189\001\040\004\052\003\233\001\
-\041\003\219\002\115\002\041\003\192\001\093\001\085\001\245\001\
-\245\001\067\002\052\003\088\001\200\003\083\001\014\004\008\002\
-\085\001\113\002\079\001\245\001\225\001\113\002\079\001\064\002\
-\064\002\251\003\245\001\245\001\125\002\245\001\076\001\082\005\
-\093\001\115\002\152\002\115\002\218\003\155\004\088\001\037\003\
-\088\005\064\002\059\004\037\005\012\002\044\001\188\004\115\002\
-\247\004\190\004\209\003\089\001\203\002\025\005\089\001\089\001\
-\133\002\117\001\134\002\082\002\013\002\069\002\089\004\194\005\
-\117\001\196\005\117\001\077\001\160\001\005\002\245\001\083\001\
-\160\001\128\001\128\001\219\003\083\003\026\005\041\004\109\002\
-\162\000\178\002\053\003\089\005\024\002\130\002\213\001\060\000\
-\116\002\060\000\140\005\056\003\163\001\203\002\059\003\122\002\
-\093\001\081\002\085\001\169\000\093\001\085\001\088\001\201\003\
-\211\005\088\001\088\001\034\000\015\004\071\000\216\003\156\004\
-\052\003\085\002\071\004\158\002\013\005\015\005\177\001\163\001\
-\038\001\028\000\178\001\076\001\060\000\010\003\166\000\082\002\
-\229\002\179\001\019\004\196\001\180\001\034\000\023\002\071\000\
-\083\002\154\001\217\001\075\001\059\004\012\005\248\004\216\002\
-\086\001\216\003\241\002\154\001\083\002\087\002\027\004\162\000\
-\079\002\082\002\086\001\069\002\049\005\114\004\126\000\177\001\
-\036\001\084\002\216\002\178\001\111\002\126\000\107\005\126\000\
-\084\003\216\002\179\001\085\002\155\001\180\001\126\000\126\000\
-\081\002\126\000\150\002\160\005\162\000\205\004\155\001\163\001\
-\071\002\072\002\077\002\163\001\076\002\126\000\075\002\095\001\
-\216\002\126\000\169\004\075\002\253\003\151\000\151\000\034\000\
-\028\000\071\000\217\003\216\002\170\003\166\000\082\002\085\002\
-\216\002\151\002\012\004\216\002\002\002\216\002\076\001\083\002\
-\045\001\222\002\039\004\151\002\167\002\162\000\151\000\151\000\
-\151\000\139\003\048\001\147\004\127\003\154\001\151\000\006\001\
-\154\001\127\001\127\001\179\001\086\001\018\004\111\005\086\001\
-\084\002\156\001\083\002\078\001\162\001\038\002\079\002\010\002\
-\111\002\115\004\085\002\151\000\151\000\235\003\216\002\018\002\
-\151\000\162\000\022\002\243\003\151\000\135\004\006\004\224\001\
-\155\001\119\005\074\005\155\001\128\003\157\001\150\002\162\001\
-\126\000\126\000\162\000\039\002\150\002\065\005\162\000\203\002\
-\077\002\060\000\106\004\148\001\075\002\055\002\162\000\126\000\
-\151\000\102\000\013\004\079\001\058\002\103\000\177\001\163\000\
-\164\004\151\000\178\001\168\002\117\001\151\002\122\001\224\001\
-\069\003\179\001\096\000\041\005\180\001\157\001\026\001\097\000\
-\210\002\212\002\151\000\070\003\071\003\098\000\245\002\038\002\
-\099\000\038\002\213\001\081\001\112\002\100\000\010\005\223\002\
-\114\002\198\001\101\000\106\000\156\001\097\005\078\001\162\001\
-\226\002\015\003\017\003\162\001\031\002\191\000\114\002\075\005\
-\169\002\114\002\074\003\214\002\061\004\039\002\064\002\039\002\
-\149\001\110\005\199\001\114\002\162\000\151\000\107\004\061\005\
-\157\001\150\003\152\003\213\001\200\001\038\005\214\002\150\002\
-\105\003\245\004\116\002\189\004\060\000\214\002\135\002\064\002\
-\134\003\184\000\046\003\136\002\092\004\198\001\087\002\177\001\
-\177\005\014\005\191\000\178\001\123\003\147\001\135\003\171\003\
-\143\004\137\002\179\001\214\002\135\002\180\001\168\000\022\003\
-\179\005\126\000\052\003\141\003\126\000\201\001\199\001\214\002\
-\202\001\171\002\087\002\126\000\214\002\126\000\126\000\214\002\
-\200\001\214\002\075\003\114\002\081\002\135\002\204\003\114\002\
-\205\003\064\002\064\002\126\000\076\003\048\003\057\003\135\002\
-\151\000\172\000\125\005\087\005\214\002\126\000\193\001\002\004\
-\146\001\202\002\162\000\064\002\028\000\162\000\095\005\151\000\
-\151\000\166\000\082\002\067\003\162\000\193\003\086\001\137\004\
-\162\000\201\001\214\002\083\002\202\001\166\003\142\004\194\001\
-\214\002\168\000\095\005\078\003\002\004\126\000\136\003\126\000\
-\135\002\138\002\189\003\135\002\126\000\089\003\169\000\218\001\
-\166\005\151\000\203\002\147\001\084\002\061\003\058\003\011\004\
-\063\003\126\000\151\000\180\003\151\000\218\001\085\002\100\004\
-\102\004\137\005\248\003\046\001\172\000\021\003\224\001\028\000\
-\041\005\095\004\250\003\117\001\162\002\219\001\012\000\016\004\
-\137\005\092\001\093\001\177\001\114\003\028\000\235\002\178\001\
-\214\002\181\003\004\004\219\001\137\003\234\003\179\001\236\002\
-\008\004\180\001\197\005\227\001\029\000\151\000\163\002\029\003\
-\030\003\152\003\213\001\104\005\033\000\106\005\182\003\203\002\
-\162\000\169\000\220\001\087\002\224\001\162\000\060\000\040\003\
-\138\003\048\000\198\005\199\002\040\003\184\003\122\001\203\002\
-\220\001\185\003\122\001\045\001\126\000\196\004\122\001\048\000\
-\122\001\199\002\177\001\046\001\122\001\122\001\178\001\061\005\
-\122\001\162\000\235\002\216\002\178\003\179\001\169\002\183\003\
-\180\001\122\001\083\001\236\002\216\002\175\005\176\005\116\000\
-\099\001\041\003\164\003\170\002\087\002\102\000\041\003\235\004\
-\203\002\103\000\087\002\169\002\197\003\017\004\118\004\241\003\
-\126\000\242\004\116\000\126\000\139\002\218\001\096\000\167\005\
-\094\005\116\000\078\004\097\000\126\000\194\001\106\002\000\004\
-\122\001\098\000\095\003\096\003\099\000\126\000\198\001\122\001\
-\162\000\100\000\045\001\151\000\216\002\028\000\101\000\106\000\
-\116\000\194\001\214\002\219\001\168\005\202\002\162\000\171\002\
-\115\003\122\001\122\001\116\000\122\001\122\001\220\005\199\001\
-\029\000\123\001\116\000\116\000\179\003\116\000\125\003\015\000\
-\033\000\200\001\169\005\085\001\171\002\214\002\147\000\122\001\
-\106\002\106\002\165\003\112\001\142\000\204\001\214\002\169\002\
-\220\001\221\004\142\000\204\001\115\001\151\000\213\001\048\000\
-\108\003\147\000\106\002\087\002\136\005\060\001\061\001\126\000\
-\147\000\110\001\109\003\109\001\193\001\214\002\116\000\126\000\
-\044\003\151\000\201\001\170\005\151\000\202\001\151\000\151\000\
-\151\000\179\004\210\005\126\000\151\000\150\001\147\000\147\000\
-\087\002\150\004\151\000\087\002\236\001\194\001\214\002\180\002\
-\181\002\122\000\147\000\066\001\202\002\162\000\126\000\064\004\
-\198\003\147\000\147\000\045\000\147\000\246\001\048\000\210\002\
-\171\002\151\000\163\004\147\001\071\001\210\003\195\004\247\002\
-\134\000\179\001\106\001\087\004\180\001\111\004\106\001\046\003\
-\246\001\237\001\236\003\224\001\248\002\106\001\012\000\246\001\
-\246\001\012\000\189\000\134\000\047\003\182\002\097\004\092\001\
-\093\001\106\001\134\000\012\000\012\000\147\000\115\001\012\000\
-\149\001\228\001\236\004\120\001\229\001\246\001\246\001\253\002\
-\012\000\012\000\012\000\012\000\237\003\190\000\087\002\090\002\
-\134\000\246\001\249\002\216\002\162\000\087\002\012\000\012\000\
-\246\001\246\001\048\003\246\001\134\000\126\000\202\003\068\003\
-\106\001\254\002\213\001\126\000\134\000\148\004\134\000\107\000\
-\087\002\239\004\012\000\122\000\216\002\012\000\048\005\012\000\
-\012\000\012\000\012\000\071\005\162\000\045\001\216\002\012\000\
-\012\000\120\002\107\000\040\003\074\003\062\004\012\000\126\000\
-\146\002\107\000\146\002\203\003\246\001\031\005\054\004\055\004\
-\151\000\126\000\012\000\146\002\012\000\126\000\012\000\134\000\
-\166\000\081\002\220\002\042\005\065\004\066\004\224\001\063\004\
-\107\000\133\001\012\000\072\004\221\002\012\000\147\001\216\002\
-\185\001\012\000\216\002\107\000\086\004\041\003\117\000\147\001\
-\190\000\028\000\062\005\107\000\112\005\107\000\166\000\082\002\
-\146\002\170\004\025\002\200\005\140\001\174\004\160\004\011\000\
-\083\002\117\000\194\001\224\001\087\002\167\000\126\000\253\000\
-\117\000\123\001\155\001\152\003\213\001\123\001\119\001\117\001\
-\126\000\123\001\016\000\123\001\118\001\185\001\194\001\123\001\
-\123\001\084\002\193\004\123\001\155\001\138\001\107\000\117\000\
-\201\005\214\002\145\001\085\002\123\001\022\000\087\002\224\001\
-\093\005\048\000\117\000\177\001\214\002\162\000\198\004\178\001\
-\087\002\117\000\117\000\126\000\117\000\254\000\179\001\048\000\
-\212\004\180\001\144\000\255\000\108\005\115\001\163\000\022\005\
-\012\003\162\000\177\002\002\005\063\002\118\002\064\002\145\000\
-\253\004\048\000\080\003\123\001\152\003\213\001\129\005\155\001\
-\065\002\214\002\123\001\172\003\151\000\216\002\185\001\209\001\
-\044\000\087\002\087\002\190\000\146\002\117\000\072\003\214\002\
-\077\003\126\000\173\003\174\003\123\001\123\001\162\000\123\001\
-\123\001\162\000\122\000\145\000\139\000\216\002\147\002\141\000\
-\194\001\209\001\119\002\216\002\126\000\126\000\126\000\214\002\
-\148\002\168\004\123\001\144\000\048\000\171\004\145\000\152\001\
-\090\002\087\002\175\004\002\005\194\001\145\000\206\002\146\002\
-\149\001\017\005\162\000\031\002\149\001\031\002\144\000\214\002\
-\149\001\040\003\149\001\186\004\187\004\144\000\149\001\192\003\
-\216\002\191\004\149\001\145\000\090\002\135\001\033\005\216\002\
-\035\005\166\000\126\000\149\001\031\002\081\002\021\005\145\000\
-\205\002\116\005\126\000\144\000\214\002\028\005\145\000\145\000\
-\078\005\145\000\200\004\045\001\126\000\214\002\151\000\144\000\
-\183\001\214\002\126\000\041\003\000\005\028\000\144\000\144\000\
-\216\002\144\000\166\000\082\002\122\000\216\002\214\002\162\000\
-\214\002\214\002\135\001\126\000\083\002\214\002\240\003\150\002\
-\177\001\149\001\029\005\214\002\178\001\214\002\119\002\162\000\
-\172\001\096\001\145\000\179\001\077\005\126\000\180\001\126\000\
-\186\001\144\003\080\005\149\001\149\001\084\002\149\001\149\001\
-\214\002\122\000\144\000\173\001\151\002\216\002\087\002\085\002\
-\214\002\169\003\013\003\091\005\150\002\176\003\214\002\151\000\
-\214\002\149\001\083\005\164\000\214\002\086\005\164\000\214\002\
-\011\005\164\000\164\000\120\005\097\001\164\000\164\000\164\000\
-\164\000\164\000\162\000\164\000\214\002\162\000\162\000\019\005\
-\020\005\151\002\164\000\146\002\213\003\126\000\164\000\137\002\
-\214\002\164\000\164\000\214\002\135\005\214\005\163\000\132\004\
-\126\000\043\003\164\000\164\000\146\002\090\002\164\000\164\000\
-\107\001\187\001\162\000\126\000\107\001\216\002\144\005\212\002\
-\122\005\123\005\216\001\126\005\127\005\162\000\107\001\033\001\
-\171\005\133\004\126\000\126\000\172\005\143\005\146\002\107\001\
-\126\000\126\000\212\002\162\000\162\000\216\002\163\000\174\001\
-\145\005\212\002\216\002\216\002\148\001\164\000\164\000\164\000\
-\034\000\164\000\162\000\161\005\216\002\003\003\090\002\126\000\
-\073\005\040\003\175\001\008\000\090\002\002\005\126\000\002\005\
-\212\002\117\001\004\003\126\000\149\000\117\001\107\001\126\002\
-\180\005\181\005\034\000\212\002\117\001\216\002\060\005\117\001\
-\091\004\144\001\146\002\212\002\146\002\212\002\152\001\216\002\
-\126\000\226\001\152\001\126\000\212\002\164\000\164\000\193\005\
-\031\003\126\000\126\000\041\003\152\001\234\001\198\004\105\004\
-\214\002\182\001\146\002\204\005\112\000\152\001\113\000\114\000\
-\028\000\104\000\115\000\214\002\143\000\115\001\117\000\193\001\
-\191\001\063\002\212\002\155\002\202\005\121\005\212\002\117\001\
-\218\005\164\000\146\002\214\002\155\001\156\002\209\005\143\000\
-\126\002\224\005\225\005\104\000\091\002\212\002\143\000\120\000\
-\194\001\216\005\217\005\146\003\212\002\090\002\121\000\109\001\
-\235\001\071\000\132\000\109\001\092\002\026\002\027\002\028\002\
-\029\002\097\003\122\000\123\000\143\000\062\002\177\003\149\005\
-\142\000\030\002\212\002\187\003\216\002\215\003\109\001\158\005\
-\143\000\048\000\090\002\071\000\132\000\090\002\212\002\143\000\
-\143\000\096\001\143\000\245\003\216\002\096\001\212\002\099\001\
-\212\002\096\001\211\003\096\001\206\002\057\005\238\001\096\001\
-\096\001\151\001\246\003\160\001\160\001\151\001\182\005\153\003\
-\058\005\164\000\164\000\154\003\096\001\031\002\185\005\151\001\
-\184\001\185\001\155\003\214\002\247\003\156\003\240\001\214\002\
-\151\001\192\005\188\003\143\000\097\001\002\003\157\003\164\000\
-\097\001\212\002\120\001\003\003\097\001\247\001\097\001\206\001\
-\214\002\214\002\097\001\085\003\249\002\164\000\097\001\214\002\
-\004\003\164\000\252\001\096\001\058\004\086\003\148\002\097\001\
-\090\002\116\004\096\001\228\001\214\002\219\005\229\001\090\002\
-\177\001\254\001\214\002\117\004\178\001\162\000\014\002\255\001\
-\128\005\000\002\045\004\179\001\096\001\096\001\180\001\096\001\
-\096\001\019\002\090\002\001\002\038\004\164\000\214\002\068\002\
-\191\001\069\002\159\002\191\001\160\002\191\001\097\001\191\001\
-\142\000\204\001\096\001\070\002\148\001\097\001\161\002\148\002\
-\148\001\148\002\148\002\148\002\148\001\148\002\148\001\076\001\
-\148\002\148\002\148\001\202\002\162\000\045\001\148\001\097\001\
-\097\001\254\004\097\001\097\001\191\001\028\000\162\000\148\001\
-\191\001\255\004\000\005\026\002\027\002\028\002\029\002\184\002\
-\185\002\099\001\148\002\093\004\094\004\097\001\207\002\030\002\
-\001\005\148\002\164\000\144\001\212\002\073\002\220\003\212\002\
-\221\003\237\004\139\002\104\004\190\000\148\002\148\002\206\002\
-\208\002\212\002\222\003\139\002\238\004\100\002\090\002\214\002\
-\112\004\020\004\012\000\021\004\182\001\148\001\212\002\122\000\
-\212\002\212\002\101\002\164\000\150\002\022\004\104\002\182\001\
-\120\004\013\000\014\000\031\002\212\002\212\002\150\002\148\001\
-\148\001\105\002\148\001\148\001\182\001\182\001\021\000\249\002\
-\090\002\191\001\106\002\191\001\184\002\187\002\113\002\130\004\
-\212\002\114\002\090\002\212\002\115\002\148\001\122\000\138\004\
-\212\002\029\000\182\001\121\002\073\001\062\002\212\002\126\002\
-\062\002\033\000\202\002\162\000\212\002\005\005\191\001\037\000\
-\191\001\204\002\062\002\162\000\045\001\039\000\062\002\127\002\
-\212\002\216\002\216\002\119\002\212\002\186\002\188\002\062\002\
-\062\002\062\002\062\002\090\002\090\002\043\000\131\002\135\002\
-\212\002\107\002\108\002\212\002\212\002\209\002\062\002\164\000\
-\165\004\047\000\132\002\214\002\050\000\118\001\135\002\214\002\
-\124\002\118\001\164\002\214\002\214\002\135\002\166\002\197\002\
-\118\001\062\002\176\002\118\001\062\002\206\002\119\002\062\002\
-\062\002\062\002\214\002\090\002\118\001\005\005\062\002\062\002\
-\213\002\142\002\144\002\146\002\135\002\062\002\135\002\225\002\
-\238\002\150\002\227\002\055\005\056\005\230\002\062\002\239\002\
-\135\002\062\002\240\002\062\002\112\000\062\002\113\000\114\000\
-\028\000\214\002\115\000\242\002\243\002\116\000\117\000\008\003\
-\202\004\062\002\204\004\118\001\062\002\244\002\009\003\194\002\
-\062\002\246\002\001\003\131\002\131\002\061\001\118\000\048\000\
-\025\003\032\003\131\002\038\003\054\003\191\001\119\000\120\000\
-\191\001\135\002\042\003\045\003\135\002\051\003\121\000\131\002\
-\064\003\149\001\073\003\224\002\241\004\131\002\079\003\087\003\
-\179\001\244\004\122\000\123\000\001\000\002\000\003\000\004\000\
-\005\000\094\003\101\003\002\002\103\003\116\003\184\002\129\003\
-\131\002\131\002\249\002\031\002\142\003\252\002\185\000\185\000\
-\182\001\099\001\008\005\159\003\160\003\099\001\185\000\161\003\
-\090\002\099\001\162\003\099\001\185\000\185\000\163\003\099\001\
-\199\003\167\003\182\001\212\003\182\001\206\003\182\001\233\003\
-\185\000\242\003\182\001\249\003\099\001\008\000\005\004\007\004\
-\119\002\185\000\023\005\024\005\010\004\029\004\030\004\185\000\
-\185\000\185\000\185\000\185\000\035\004\005\005\036\004\044\004\
-\191\001\194\000\049\004\051\004\046\004\040\005\008\000\068\004\
-\114\001\050\005\185\000\050\004\074\004\096\004\108\004\185\000\
-\113\004\110\004\121\004\122\004\185\000\185\000\182\001\123\004\
-\127\004\136\004\099\001\191\001\204\002\140\004\128\004\185\000\
-\185\000\185\000\185\000\185\000\129\004\141\004\144\001\149\004\
-\144\001\159\004\157\004\177\004\099\001\099\001\070\005\099\001\
-\099\001\185\000\161\004\144\001\182\001\192\004\172\004\112\000\
-\166\004\113\000\114\000\028\000\173\004\115\000\158\003\176\004\
-\115\001\117\000\099\001\082\003\219\004\204\002\223\004\005\005\
-\194\004\005\005\006\005\009\005\212\002\018\003\016\005\212\002\
-\182\001\036\005\160\001\093\003\018\005\206\004\096\005\052\005\
-\067\005\212\002\120\000\053\005\166\002\054\005\100\005\076\005\
-\081\005\121\000\084\005\099\005\105\005\113\005\212\002\164\000\
-\212\002\212\002\109\005\118\005\134\005\122\000\123\000\147\005\
-\148\005\150\005\151\005\156\005\118\003\212\002\157\005\159\005\
-\178\005\042\003\039\005\183\005\191\005\207\005\062\002\208\005\
-\212\005\062\002\215\005\221\005\222\005\034\000\071\000\026\002\
-\212\002\034\000\214\002\062\002\071\000\047\002\216\002\062\002\
-\212\002\044\002\191\001\214\002\120\002\042\003\212\002\144\001\
-\062\002\062\002\062\002\062\002\212\002\150\000\008\000\046\002\
-\114\001\102\000\144\001\223\002\224\002\194\001\182\001\062\002\
-\212\002\214\002\137\002\049\002\212\002\144\001\166\000\135\002\
-\183\000\182\001\136\002\135\002\218\001\214\003\015\000\136\002\
-\212\002\138\002\062\002\212\002\141\002\062\002\230\003\120\002\
-\062\002\062\002\062\002\191\001\142\002\143\002\144\001\062\002\
-\062\002\139\002\182\001\195\005\066\005\141\005\062\002\112\000\
-\122\003\113\000\114\000\028\000\048\004\115\000\190\005\011\003\
-\115\001\117\000\062\002\081\003\062\002\211\002\062\002\079\005\
-\078\002\077\002\056\004\191\001\151\002\023\003\028\003\163\001\
-\149\002\007\005\062\002\119\004\252\004\062\002\205\005\206\005\
-\112\003\062\002\120\000\117\002\093\002\072\005\213\005\064\005\
-\000\000\121\000\098\005\240\004\000\000\000\000\042\003\204\002\
-\000\000\000\000\000\000\000\000\000\000\122\000\123\000\223\005\
-\191\001\191\001\000\000\000\000\000\000\052\001\009\004\000\000\
-\000\000\141\001\000\000\000\000\112\000\000\000\113\000\114\000\
-\028\000\144\001\115\000\000\000\000\000\116\000\117\000\000\000\
-\000\000\000\000\000\000\156\001\150\000\150\000\000\000\150\000\
-\216\002\216\002\059\001\060\001\061\001\000\000\118\000\216\002\
-\000\000\150\000\150\000\000\000\000\000\216\002\119\000\120\000\
-\000\000\000\000\000\000\000\000\216\002\191\001\121\000\042\003\
-\194\002\000\000\216\002\000\000\000\000\063\001\064\001\042\003\
-\150\000\150\000\122\000\123\000\222\001\000\000\000\000\000\000\
-\191\001\066\001\067\001\068\001\069\001\216\002\216\002\000\000\
-\000\000\081\004\083\004\085\004\000\000\182\001\000\000\088\004\
-\000\000\000\000\071\001\000\000\000\000\194\002\000\000\000\000\
-\000\000\000\000\000\000\165\000\000\000\000\000\172\000\000\000\
-\000\000\174\000\175\000\000\000\000\000\176\000\177\000\178\000\
-\179\000\180\000\000\000\181\000\194\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\032\001\000\000\
-\000\000\034\001\035\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\042\003\040\001\041\001\144\001\000\000\042\001\043\001\
-\112\000\000\000\113\000\114\000\028\000\000\000\115\000\000\000\
-\000\000\115\001\117\000\000\000\000\000\182\001\000\000\182\001\
-\000\000\182\001\000\000\144\001\182\001\000\000\000\000\000\000\
-\042\003\000\000\000\000\000\000\000\000\144\001\015\000\000\000\
-\191\001\015\000\191\001\120\000\000\000\104\001\105\001\106\001\
-\000\000\108\001\121\000\015\000\015\000\000\000\000\000\015\000\
-\000\000\000\000\204\002\000\000\000\000\000\000\122\000\123\000\
-\015\000\015\000\015\000\015\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\012\000\042\003\015\000\015\000\
-\000\000\000\000\042\003\000\000\000\000\000\000\000\000\000\000\
-\000\000\191\001\000\000\089\000\014\000\153\001\154\001\066\002\
-\000\000\000\000\015\000\000\000\000\000\015\000\000\000\000\000\
-\090\000\015\000\015\000\000\000\000\000\000\000\144\001\015\000\
-\015\000\000\000\144\001\000\000\000\000\000\000\015\000\204\002\
-\000\000\000\000\000\000\029\000\000\000\000\000\000\000\000\000\
-\000\000\197\001\015\000\033\000\015\000\000\000\015\000\204\002\
-\042\003\091\000\144\001\000\000\000\000\000\000\000\000\039\000\
-\000\000\000\000\015\000\209\002\000\000\015\000\000\000\000\000\
-\144\001\015\000\000\000\000\000\000\000\000\000\141\001\092\000\
-\000\000\150\000\150\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\093\000\000\000\000\000\050\000\042\003\
-\204\002\000\000\000\000\000\000\000\000\000\000\042\003\000\000\
-\000\000\000\000\150\000\150\000\150\000\000\000\000\000\000\000\
-\000\000\000\000\150\000\000\000\000\000\191\001\000\000\069\005\
-\000\000\157\002\112\000\000\000\113\000\114\000\028\000\000\000\
-\115\000\249\001\250\001\116\000\117\000\144\001\000\000\150\000\
-\150\000\000\000\000\000\000\000\150\000\000\000\000\000\000\000\
-\150\000\240\001\000\000\222\001\118\000\144\001\000\000\003\002\
-\000\000\000\000\191\001\156\001\119\000\060\003\000\000\000\000\
-\000\000\000\000\156\001\000\000\121\000\011\002\052\000\069\005\
-\000\000\017\002\000\000\000\000\150\000\000\000\000\000\070\004\
-\122\000\123\000\000\000\000\000\000\000\150\000\000\000\000\000\
-\124\001\000\000\000\000\222\001\191\001\000\000\000\000\000\000\
-\000\000\144\001\000\000\000\000\144\001\125\001\150\000\000\000\
-\000\000\000\003\000\000\191\001\000\000\000\000\000\000\144\001\
-\000\000\000\000\183\000\191\001\000\000\000\000\000\000\000\000\
-\112\000\000\000\113\000\114\000\028\000\000\000\115\000\000\000\
-\000\000\126\001\117\000\000\000\191\001\000\000\000\000\153\000\
-\000\000\000\000\000\000\170\000\000\000\000\000\000\000\000\000\
-\000\000\150\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\170\000\120\000\000\000\191\001\191\001\000\000\
-\000\000\000\000\121\000\144\001\000\000\000\000\000\000\191\001\
-\000\000\000\000\110\002\000\000\170\000\144\001\122\000\123\000\
-\000\000\000\000\000\000\000\000\000\000\144\001\191\001\000\000\
-\000\000\000\000\000\000\191\001\191\001\191\001\191\001\000\000\
-\156\000\008\000\009\000\000\000\000\000\052\001\010\000\011\000\
-\144\001\144\001\000\000\135\002\000\000\000\000\000\000\000\000\
-\170\000\000\000\170\000\170\000\000\000\144\001\069\005\000\000\
-\069\005\015\000\016\000\156\001\150\000\000\000\000\000\000\000\
-\144\001\058\001\059\001\060\001\061\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\150\000\150\000\022\000\144\001\106\002\
-\024\000\025\000\026\000\027\000\144\001\144\001\028\000\000\000\
-\162\000\000\000\000\000\142\000\032\000\063\001\064\001\000\000\
-\000\000\000\000\110\003\000\000\000\000\000\000\000\000\000\000\
-\000\000\066\001\067\001\068\001\069\001\150\000\153\000\153\000\
-\000\000\153\000\042\000\000\000\000\000\000\000\150\000\000\000\
-\150\000\000\000\071\001\153\000\153\000\000\000\000\000\231\002\
-\044\000\000\000\222\001\000\000\000\000\045\000\000\000\170\000\
-\048\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\240\001\153\000\214\001\240\001\000\000\000\000\170\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\240\001\145\003\
-\000\000\150\000\240\001\000\000\000\000\000\000\052\000\156\000\
-\156\000\052\000\156\000\240\001\240\001\240\001\240\001\000\000\
-\222\001\000\000\000\000\052\000\156\000\156\000\000\000\000\000\
-\000\000\000\000\240\001\000\000\000\000\000\000\000\000\000\000\
-\052\000\000\000\052\000\052\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\205\001\156\000\156\000\240\001\052\000\052\000\
-\240\001\000\000\000\000\240\001\240\001\240\001\000\000\000\000\
-\000\000\154\000\240\001\240\001\000\000\171\000\000\000\000\000\
-\000\000\240\001\052\000\000\000\000\000\052\000\170\000\244\003\
-\000\000\052\000\052\000\000\000\171\000\240\001\000\000\240\001\
-\052\000\240\001\000\000\000\000\000\000\000\000\052\000\000\000\
-\000\000\000\000\000\000\170\000\141\001\240\001\171\000\000\000\
-\240\001\000\000\052\000\000\000\240\001\000\000\052\000\150\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\052\000\000\000\000\000\052\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\171\000\000\000\171\000\171\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\150\000\000\000\170\000\170\000\000\000\000\000\170\000\
-\000\000\053\000\170\000\000\000\116\001\021\002\000\000\000\000\
-\000\000\000\000\000\000\032\002\000\000\150\000\000\000\106\002\
-\150\000\000\000\150\000\150\000\150\000\000\000\000\000\106\002\
-\150\000\000\000\000\000\000\000\106\002\000\000\150\000\000\000\
-\154\000\154\000\000\000\154\000\000\000\000\000\000\000\000\000\
-\000\000\106\002\000\000\106\002\106\002\154\000\154\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\150\000\000\000\000\000\
-\106\002\171\000\000\000\153\000\214\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\154\000\215\001\000\000\222\001\
-\088\003\171\000\000\000\106\002\000\000\000\000\106\002\000\000\
-\000\000\106\002\106\002\106\002\153\000\153\000\153\000\207\003\
-\000\000\106\002\000\000\000\000\153\000\000\000\000\000\106\002\
-\000\000\000\000\000\000\000\000\134\004\000\000\000\000\000\000\
-\000\000\000\000\000\000\106\002\000\000\000\000\000\000\106\002\
-\000\000\214\001\153\000\000\000\156\000\156\000\214\001\000\000\
-\000\000\000\000\153\000\106\002\000\000\000\000\106\002\112\000\
-\000\000\113\000\114\000\028\000\000\000\115\000\000\000\000\000\
-\116\000\117\000\000\000\000\000\140\002\156\000\156\000\156\000\
-\000\000\206\004\000\000\000\000\000\000\156\000\153\000\000\000\
-\171\000\118\000\000\000\000\000\000\000\000\000\000\000\153\000\
-\207\004\119\000\120\000\115\002\150\000\000\000\000\000\198\001\
-\000\000\121\000\156\000\156\000\000\000\171\000\000\000\156\000\
-\153\000\000\000\222\001\156\000\000\000\122\000\123\000\000\000\
-\000\000\000\000\000\000\000\000\170\000\032\002\000\000\000\000\
-\208\004\076\000\113\000\114\000\028\000\000\000\115\000\000\000\
-\000\000\116\000\209\004\000\000\000\000\000\000\000\000\156\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\222\001\
-\233\002\000\000\118\000\153\000\000\000\000\000\000\000\000\000\
-\000\000\210\004\119\000\120\000\000\000\000\000\000\000\000\000\
-\000\000\156\000\121\000\000\000\000\000\171\000\171\000\000\000\
-\000\000\171\000\155\000\201\001\171\000\000\000\211\004\123\000\
-\000\000\000\000\000\000\222\001\000\000\000\000\000\000\156\001\
-\000\000\053\000\000\000\000\000\053\000\000\000\116\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\116\001\053\000\116\001\
-\000\000\000\000\000\000\000\000\233\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\053\000\000\000\053\000\053\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\153\000\000\000\
-\150\000\053\000\053\000\000\000\000\000\154\000\215\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\153\000\153\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\053\000\000\000\000\000\
-\053\000\000\000\000\000\000\000\053\000\053\000\154\000\154\000\
-\154\000\000\000\000\000\053\000\111\003\000\000\154\000\000\000\
-\000\000\053\000\000\000\000\000\000\000\000\000\000\000\153\000\
-\000\000\000\000\000\000\000\000\000\000\053\000\000\000\156\000\
-\153\000\053\000\214\001\215\001\154\000\000\000\000\000\000\000\
-\215\001\000\000\000\000\000\000\154\000\053\000\156\000\156\000\
-\053\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\155\000\155\000\000\000\155\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\155\000\155\000\
-\154\000\000\000\150\000\214\001\000\000\000\000\000\000\000\000\
-\156\000\154\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\156\000\000\000\156\000\000\000\155\000\155\000\000\000\
-\000\000\000\000\154\000\115\002\000\000\115\002\115\002\115\002\
-\000\000\000\000\000\000\115\002\000\000\000\000\171\000\000\000\
-\115\002\000\000\000\000\000\000\115\002\115\002\115\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\115\002\115\002\115\002\
-\115\002\076\000\000\000\000\000\156\000\000\000\000\000\115\002\
-\000\000\000\000\000\000\150\000\115\002\154\000\076\000\000\000\
-\000\000\000\000\000\000\115\002\115\002\239\001\110\003\000\000\
-\000\000\000\000\000\000\076\000\000\000\076\000\076\000\115\002\
-\000\000\000\000\115\002\115\002\000\000\115\002\115\002\115\002\
-\000\000\115\002\076\000\000\000\115\002\115\002\000\000\000\000\
-\000\000\153\000\000\000\115\002\000\000\000\000\000\000\000\000\
-\000\000\116\001\000\000\000\000\000\000\076\000\115\002\115\002\
-\110\003\115\002\115\002\115\002\115\002\076\000\165\005\115\002\
-\000\000\000\000\000\000\076\000\000\000\000\000\000\000\115\002\
-\115\002\076\000\115\002\000\000\000\000\000\000\115\002\000\000\
-\154\000\000\000\000\000\057\002\000\000\076\000\059\002\000\000\
-\060\002\076\000\061\002\153\000\000\000\000\000\000\000\154\000\
-\154\000\000\000\156\000\000\000\000\000\076\000\000\000\000\000\
-\076\000\000\000\000\000\000\000\000\000\000\000\000\000\153\000\
-\000\000\000\000\214\001\000\000\153\000\153\000\153\000\094\002\
-\195\000\195\000\153\000\099\002\000\000\000\000\000\000\000\000\
-\153\000\154\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\154\000\000\000\215\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\156\000\000\000\000\000\153\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\156\000\000\000\000\000\156\000\079\004\156\000\156\000\156\000\
-\102\001\103\001\000\000\156\000\000\000\215\001\000\000\141\002\
-\000\000\156\000\000\000\000\000\000\000\008\000\155\000\155\000\
-\000\000\000\000\002\002\011\000\153\002\000\000\154\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\156\000\000\000\000\000\137\000\000\000\015\000\016\000\155\000\
-\155\000\155\000\000\000\000\000\000\000\000\000\000\000\155\000\
-\155\000\198\002\000\000\201\002\000\000\000\000\000\000\000\000\
-\000\000\022\000\000\000\138\000\139\000\000\000\140\000\141\000\
-\000\000\000\000\028\000\000\000\155\000\155\000\000\000\142\000\
-\143\000\155\000\000\000\000\000\000\000\155\000\144\000\000\000\
-\116\001\000\000\000\000\000\000\000\000\254\003\214\001\000\000\
-\000\000\000\000\000\000\145\000\000\000\239\001\000\000\000\000\
-\239\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\146\000\155\000\239\001\154\000\044\000\000\000\239\001\000\000\
-\000\000\045\000\155\000\000\000\048\000\147\000\000\000\239\001\
-\239\001\239\001\239\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\155\000\000\000\000\000\239\001\000\000\
-\000\000\000\000\000\000\209\001\000\000\000\000\000\000\156\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\239\001\000\000\000\000\239\001\154\000\000\000\239\001\
-\239\001\239\001\000\000\000\000\000\000\000\000\239\001\239\001\
-\036\003\000\000\000\000\039\003\000\000\239\001\155\000\000\000\
-\000\000\154\000\000\000\000\000\215\001\000\000\154\000\154\000\
-\154\000\239\001\000\000\239\001\154\000\239\001\000\000\000\000\
-\000\000\000\000\154\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\239\001\000\000\000\000\239\001\000\000\000\000\000\000\
-\239\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\154\000\214\001\000\000\000\000\000\000\000\000\033\002\
-\034\002\035\002\036\002\037\002\038\002\039\002\040\002\041\002\
-\042\002\043\002\044\002\045\002\046\002\047\002\048\002\049\002\
-\050\002\051\002\052\002\053\002\000\000\056\002\000\000\000\000\
-\000\000\155\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\113\003\062\002\000\000\251\001\000\000\
-\155\000\155\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\079\002\002\002\156\000\002\002\002\002\002\002\000\000\
-\000\000\000\000\002\002\146\004\000\000\000\000\133\003\002\002\
-\000\000\000\000\000\000\002\002\002\002\002\002\000\000\000\000\
-\000\000\000\000\155\000\000\000\002\002\002\002\002\002\002\002\
-\000\000\000\000\000\000\155\000\000\000\155\000\002\002\000\000\
-\000\000\000\000\002\002\002\002\214\001\000\000\000\000\000\000\
-\000\000\000\000\002\002\002\002\000\000\000\000\000\000\000\000\
-\215\001\000\000\000\000\000\000\000\000\000\000\002\002\000\000\
-\000\000\002\002\000\000\000\000\002\002\002\002\002\002\000\000\
-\002\002\000\000\000\000\002\002\002\002\000\000\155\000\000\000\
-\237\001\000\000\002\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\002\002\002\002\000\000\
-\002\002\002\002\002\002\000\000\000\000\156\000\002\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\214\001\002\002\000\000\
-\000\000\002\002\000\000\000\000\000\000\002\002\000\000\000\000\
-\138\005\000\000\000\000\209\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\209\001\000\000\003\004\000\000\000\000\
-\209\001\215\002\000\000\000\000\000\000\000\000\217\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\209\001\000\000\209\001\
-\209\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\162\005\000\000\209\001\000\000\156\000\104\003\
-\000\000\112\000\000\000\113\000\114\000\028\000\000\000\115\000\
-\000\000\000\000\115\001\117\000\155\000\000\000\037\004\209\001\
-\000\000\000\000\195\000\195\000\215\001\209\001\209\001\209\001\
-\000\000\000\000\000\000\000\000\000\000\209\001\106\002\000\000\
-\000\000\000\000\000\000\209\001\120\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\121\000\000\000\000\000\067\004\209\001\
-\000\000\000\000\000\000\209\001\116\001\027\003\000\000\122\000\
-\123\000\000\000\033\003\034\003\035\003\000\000\155\000\209\001\
-\000\000\000\000\209\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\251\001\000\000\
-\251\001\251\001\155\000\098\004\099\004\155\000\251\001\155\000\
-\155\000\155\000\000\000\251\001\000\000\155\000\000\000\251\001\
-\251\001\251\001\000\000\155\000\000\000\000\000\000\000\000\000\
-\251\001\251\001\251\001\251\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\251\001\000\000\000\000\000\000\215\001\251\001\
-\000\000\000\000\155\000\000\000\000\000\000\000\251\001\251\001\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\131\004\000\000\251\001\000\000\000\000\251\001\000\000\000\000\
-\251\001\251\001\251\001\000\000\251\001\098\003\099\003\100\003\
-\251\001\000\000\000\000\144\004\000\000\000\000\251\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\036\002\
-\237\001\251\001\251\001\237\001\251\001\251\001\251\001\000\000\
-\000\000\000\000\000\000\214\002\000\000\237\001\000\000\215\001\
-\000\000\237\001\251\001\130\003\000\000\251\001\000\000\000\000\
-\214\002\251\001\237\001\237\001\237\001\237\001\000\000\000\000\
-\000\000\000\000\000\000\140\003\000\000\000\000\000\000\000\000\
-\000\000\237\001\000\000\214\002\000\000\214\002\214\002\214\002\
-\000\000\214\002\000\000\000\000\214\002\214\002\000\000\000\000\
-\000\000\000\000\000\000\000\000\237\001\000\000\000\000\237\001\
-\000\000\155\000\237\001\237\001\237\001\000\000\000\000\000\000\
-\000\000\237\001\237\001\000\000\000\000\000\000\214\002\000\000\
-\237\001\000\000\000\000\209\001\000\000\214\002\000\000\000\000\
-\000\000\000\000\000\000\201\004\237\001\203\004\237\001\000\000\
-\237\001\214\002\214\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\237\001\000\000\223\003\237\001\
-\000\000\000\000\000\000\237\001\000\000\000\000\106\002\106\002\
-\106\002\106\002\000\000\000\000\106\002\106\002\106\002\106\002\
-\106\002\106\002\106\002\106\002\106\002\106\002\106\002\106\002\
-\106\002\106\002\106\002\106\002\246\004\000\000\106\002\106\002\
-\106\002\106\002\106\002\106\002\106\002\106\002\000\000\000\000\
-\000\000\000\000\106\002\106\002\000\000\000\000\106\002\106\002\
-\106\002\106\002\106\002\106\002\106\002\106\002\000\000\106\002\
-\106\002\106\002\000\000\106\002\106\002\106\002\106\002\000\000\
-\000\000\106\002\106\002\106\002\000\000\106\002\106\002\106\002\
-\106\002\106\002\106\002\000\000\106\002\106\002\106\002\106\002\
-\106\002\000\000\000\000\000\000\000\000\155\000\106\002\106\002\
-\106\002\106\002\106\002\106\002\106\002\106\002\000\000\106\002\
-\064\002\106\002\106\002\060\004\106\002\106\002\106\002\106\002\
-\106\002\000\000\106\002\106\002\000\000\106\002\106\002\106\002\
-\106\002\000\000\106\002\106\002\000\000\106\002\000\000\000\000\
-\000\000\106\002\000\000\112\000\000\000\113\000\114\000\028\000\
-\000\000\115\000\000\000\000\000\116\000\117\000\000\000\000\000\
-\068\005\000\000\000\000\000\000\000\000\000\000\134\001\036\002\
-\000\000\036\002\036\002\036\002\000\000\118\000\000\000\036\002\
-\000\000\000\000\000\000\000\000\036\002\119\000\120\000\000\000\
-\036\002\036\002\036\002\000\000\000\000\121\000\000\000\000\000\
-\000\000\036\002\036\002\036\002\036\002\090\005\000\000\000\000\
-\000\000\122\000\123\000\036\002\000\000\000\000\000\000\155\000\
-\036\002\000\000\124\004\125\004\126\004\000\000\000\000\036\002\
-\036\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\036\002\000\000\000\000\036\002\117\005\
-\000\000\036\002\036\002\036\002\000\000\036\002\000\000\000\000\
-\036\002\036\002\000\000\000\000\000\000\000\000\130\005\036\002\
-\000\000\124\001\000\000\209\001\000\000\000\000\139\005\000\000\
-\000\000\000\000\036\002\036\002\000\000\036\002\036\002\036\002\
-\209\001\241\000\152\004\153\004\154\004\000\000\000\000\142\005\
-\155\000\000\000\000\000\036\002\000\000\209\001\036\002\209\001\
-\209\001\112\000\036\002\113\000\114\000\028\000\000\000\115\000\
-\000\000\000\000\126\001\117\000\209\001\000\000\000\000\000\000\
-\163\005\164\005\112\000\000\000\113\000\114\000\028\000\178\004\
-\115\000\000\000\174\005\116\000\117\000\000\000\000\000\209\001\
-\000\000\000\000\209\001\000\000\120\000\209\001\209\001\209\001\
-\000\000\184\005\000\000\121\000\118\000\209\001\186\005\187\005\
-\188\005\189\005\000\000\209\001\119\000\060\003\000\000\122\000\
-\123\000\000\000\000\000\000\000\121\000\000\000\000\000\209\001\
-\000\000\000\000\000\000\209\001\000\000\000\000\000\000\152\005\
-\122\000\123\000\000\000\000\000\000\000\000\000\000\000\209\001\
-\000\000\000\000\209\001\000\000\000\000\000\000\000\000\000\000\
-\224\004\225\004\000\000\000\000\000\000\232\004\233\004\234\004\
-\064\002\064\002\064\002\064\002\000\000\247\000\064\002\064\002\
-\064\002\064\002\064\002\064\002\064\002\064\002\064\002\064\002\
-\064\002\064\002\064\002\064\002\064\002\064\002\064\002\000\000\
-\064\002\064\002\064\002\064\002\064\002\064\002\064\002\064\002\
-\000\000\000\000\000\000\000\000\064\002\064\002\000\000\000\000\
-\064\002\064\002\064\002\064\002\064\002\064\002\064\002\064\002\
-\000\000\064\002\064\002\064\002\000\000\064\002\064\002\064\002\
-\064\002\000\000\000\000\064\002\064\002\064\002\052\002\064\002\
-\064\002\064\002\064\002\064\002\064\002\000\000\064\002\064\002\
-\064\002\064\002\064\002\000\000\000\000\000\000\000\000\000\000\
-\064\002\064\002\064\002\064\002\064\002\064\002\064\002\064\002\
-\000\000\064\002\000\000\064\002\064\002\000\000\064\002\064\002\
-\064\002\064\002\064\002\000\000\064\002\064\002\000\000\064\002\
-\064\002\064\002\064\002\000\000\064\002\064\002\000\000\064\002\
-\000\000\000\000\000\000\064\002\000\000\000\000\000\000\000\000\
-\000\000\245\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\241\000\241\000\241\000\241\000\000\000\000\000\241\000\
-\241\000\241\000\241\000\241\000\241\000\241\000\241\000\241\000\
-\241\000\241\000\241\000\241\000\241\000\241\000\241\000\241\000\
-\000\000\241\000\241\000\241\000\241\000\241\000\241\000\241\000\
-\241\000\000\000\101\005\102\005\103\005\241\000\241\000\000\000\
-\000\000\241\000\241\000\241\000\241\000\241\000\241\000\241\000\
-\241\000\000\000\241\000\241\000\241\000\000\000\241\000\241\000\
-\241\000\241\000\000\000\000\000\241\000\241\000\241\000\000\000\
-\241\000\241\000\241\000\241\000\241\000\241\000\000\000\241\000\
-\241\000\241\000\241\000\241\000\000\000\000\000\000\000\000\000\
-\000\000\241\000\241\000\241\000\241\000\241\000\241\000\241\000\
-\241\000\000\000\241\000\000\000\241\000\241\000\253\000\241\000\
-\241\000\241\000\241\000\241\000\000\000\241\000\241\000\000\000\
-\241\000\241\000\241\000\241\000\000\000\241\000\241\000\000\000\
-\241\000\000\000\000\000\000\000\241\000\247\000\247\000\247\000\
-\247\000\000\000\000\000\247\000\247\000\247\000\247\000\247\000\
-\247\000\247\000\247\000\247\000\247\000\247\000\247\000\247\000\
-\247\000\247\000\247\000\247\000\000\000\247\000\247\000\247\000\
-\247\000\247\000\247\000\247\000\247\000\000\000\000\000\000\000\
-\000\000\247\000\247\000\000\000\000\000\247\000\247\000\247\000\
-\247\000\247\000\247\000\247\000\247\000\000\000\247\000\247\000\
-\247\000\000\000\247\000\247\000\247\000\247\000\000\000\000\000\
-\247\000\247\000\247\000\000\000\247\000\247\000\247\000\247\000\
-\247\000\247\000\000\000\247\000\247\000\247\000\247\000\247\000\
-\000\000\000\000\000\000\000\000\000\000\247\000\247\000\247\000\
-\247\000\247\000\247\000\247\000\247\000\000\000\247\000\000\000\
-\247\000\247\000\249\000\247\000\247\000\247\000\247\000\247\000\
-\000\000\247\000\247\000\000\000\247\000\247\000\247\000\247\000\
-\000\000\247\000\247\000\000\000\247\000\000\000\000\000\000\000\
-\247\000\245\000\245\000\245\000\245\000\000\000\000\000\245\000\
-\245\000\245\000\245\000\245\000\245\000\245\000\245\000\245\000\
-\245\000\245\000\245\000\245\000\245\000\245\000\245\000\245\000\
-\000\000\245\000\245\000\245\000\245\000\245\000\245\000\245\000\
-\245\000\000\000\000\000\000\000\000\000\245\000\245\000\000\000\
-\000\000\245\000\245\000\245\000\245\000\245\000\245\000\245\000\
-\245\000\000\000\245\000\245\000\245\000\000\000\245\000\245\000\
-\245\000\245\000\000\000\000\000\245\000\245\000\245\000\000\000\
-\245\000\245\000\245\000\245\000\245\000\245\000\000\000\245\000\
-\245\000\245\000\245\000\245\000\000\000\000\000\000\000\000\000\
-\000\000\245\000\245\000\245\000\245\000\245\000\245\000\245\000\
-\245\000\000\000\245\000\000\000\245\000\245\000\251\000\245\000\
-\245\000\245\000\245\000\245\000\000\000\245\000\245\000\000\000\
-\245\000\245\000\245\000\245\000\000\000\245\000\245\000\000\000\
-\245\000\000\000\000\000\000\000\245\000\000\000\253\000\253\000\
-\253\000\253\000\000\000\000\000\253\000\253\000\253\000\253\000\
-\253\000\253\000\253\000\253\000\253\000\253\000\253\000\253\000\
-\253\000\253\000\253\000\253\000\253\000\000\000\253\000\253\000\
-\253\000\253\000\253\000\253\000\253\000\253\000\000\000\000\000\
-\000\000\000\000\253\000\253\000\000\000\000\000\253\000\253\000\
-\253\000\253\000\253\000\253\000\253\000\253\000\000\000\253\000\
-\253\000\253\000\000\000\253\000\253\000\253\000\253\000\000\000\
-\000\000\253\000\253\000\253\000\000\000\253\000\253\000\253\000\
-\253\000\253\000\253\000\000\000\253\000\253\000\253\000\253\000\
-\253\000\000\000\000\000\000\000\000\000\000\000\253\000\253\000\
-\253\000\253\000\253\000\253\000\253\000\253\000\000\000\253\000\
-\000\000\253\000\253\000\003\001\253\000\253\000\253\000\253\000\
-\253\000\000\000\253\000\253\000\000\000\253\000\253\000\253\000\
-\253\000\000\000\253\000\253\000\000\000\253\000\000\000\000\000\
-\000\000\253\000\249\000\249\000\249\000\249\000\000\000\000\000\
-\249\000\249\000\249\000\249\000\249\000\249\000\249\000\249\000\
-\249\000\249\000\249\000\249\000\249\000\249\000\249\000\249\000\
-\249\000\000\000\249\000\249\000\249\000\249\000\249\000\249\000\
-\249\000\249\000\000\000\000\000\000\000\000\000\249\000\249\000\
-\000\000\000\000\249\000\249\000\249\000\249\000\249\000\249\000\
-\249\000\249\000\000\000\249\000\249\000\249\000\000\000\249\000\
-\249\000\249\000\249\000\000\000\000\000\249\000\249\000\249\000\
-\000\000\249\000\249\000\249\000\249\000\249\000\249\000\000\000\
-\249\000\249\000\249\000\249\000\249\000\000\000\000\000\000\000\
-\000\000\000\000\249\000\249\000\249\000\249\000\249\000\249\000\
-\249\000\249\000\000\000\249\000\000\000\249\000\249\000\255\000\
-\249\000\249\000\249\000\249\000\249\000\000\000\249\000\249\000\
-\000\000\249\000\249\000\249\000\249\000\000\000\249\000\249\000\
-\000\000\249\000\000\000\000\000\000\000\249\000\251\000\251\000\
-\251\000\251\000\000\000\000\000\251\000\251\000\251\000\251\000\
-\251\000\251\000\251\000\251\000\251\000\251\000\251\000\251\000\
-\251\000\251\000\251\000\251\000\251\000\000\000\251\000\251\000\
-\251\000\251\000\251\000\251\000\251\000\251\000\000\000\000\000\
-\000\000\000\000\251\000\251\000\000\000\000\000\251\000\251\000\
-\251\000\251\000\251\000\251\000\251\000\251\000\000\000\251\000\
-\251\000\251\000\000\000\251\000\251\000\251\000\251\000\000\000\
-\000\000\251\000\251\000\251\000\000\000\251\000\251\000\251\000\
-\251\000\251\000\251\000\000\000\251\000\251\000\251\000\251\000\
-\251\000\000\000\000\000\000\000\000\000\000\000\251\000\251\000\
-\251\000\251\000\251\000\251\000\251\000\251\000\000\000\251\000\
-\000\000\251\000\251\000\001\001\251\000\251\000\251\000\251\000\
-\251\000\000\000\251\000\251\000\000\000\251\000\251\000\251\000\
-\251\000\000\000\251\000\251\000\000\000\251\000\000\000\000\000\
-\000\000\251\000\000\000\003\001\003\001\003\001\003\001\000\000\
-\000\000\003\001\003\001\003\001\003\001\003\001\003\001\003\001\
-\003\001\003\001\003\001\003\001\003\001\003\001\003\001\003\001\
-\003\001\003\001\000\000\003\001\003\001\003\001\003\001\003\001\
-\003\001\003\001\003\001\000\000\000\000\000\000\000\000\003\001\
-\003\001\000\000\000\000\003\001\003\001\003\001\003\001\003\001\
-\003\001\003\001\003\001\000\000\003\001\003\001\003\001\000\000\
-\003\001\003\001\003\001\003\001\000\000\000\000\003\001\003\001\
-\003\001\000\000\003\001\003\001\003\001\003\001\003\001\003\001\
-\000\000\003\001\003\001\003\001\003\001\003\001\000\000\000\000\
-\000\000\000\000\000\000\003\001\003\001\003\001\003\001\003\001\
-\003\001\003\001\003\001\000\000\003\001\000\000\003\001\003\001\
-\030\001\003\001\003\001\003\001\003\001\003\001\000\000\003\001\
-\003\001\000\000\003\001\003\001\003\001\003\001\000\000\003\001\
-\003\001\000\000\003\001\000\000\000\000\000\000\003\001\255\000\
-\255\000\255\000\255\000\000\000\000\000\255\000\255\000\255\000\
-\255\000\255\000\255\000\255\000\255\000\255\000\255\000\255\000\
-\255\000\255\000\255\000\255\000\255\000\255\000\000\000\255\000\
-\255\000\255\000\255\000\255\000\255\000\255\000\255\000\000\000\
-\000\000\000\000\000\000\255\000\255\000\000\000\000\000\255\000\
-\255\000\255\000\255\000\255\000\255\000\255\000\255\000\000\000\
-\255\000\255\000\255\000\000\000\255\000\255\000\255\000\255\000\
-\000\000\000\000\255\000\255\000\255\000\000\000\255\000\255\000\
-\255\000\255\000\255\000\255\000\000\000\255\000\255\000\255\000\
-\255\000\255\000\000\000\000\000\000\000\000\000\000\000\255\000\
-\255\000\255\000\255\000\255\000\255\000\255\000\255\000\000\000\
-\255\000\000\000\255\000\255\000\039\001\255\000\255\000\255\000\
-\255\000\255\000\000\000\255\000\255\000\000\000\255\000\255\000\
-\255\000\255\000\000\000\255\000\255\000\000\000\255\000\000\000\
-\000\000\000\000\255\000\001\001\001\001\001\001\001\001\000\000\
-\000\000\001\001\001\001\001\001\001\001\001\001\001\001\001\001\
-\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\
-\001\001\001\001\000\000\001\001\001\001\001\001\001\001\001\001\
-\001\001\001\001\001\001\000\000\000\000\000\000\000\000\001\001\
-\001\001\000\000\000\000\001\001\001\001\001\001\001\001\001\001\
-\001\001\001\001\001\001\000\000\001\001\001\001\001\001\000\000\
-\001\001\001\001\001\001\001\001\000\000\000\000\001\001\001\001\
-\001\001\000\000\001\001\001\001\001\001\001\001\001\001\001\001\
-\000\000\001\001\001\001\001\001\001\001\001\001\000\000\000\000\
-\000\000\000\000\000\000\001\001\001\001\001\001\001\001\001\001\
-\001\001\001\001\001\001\000\000\001\001\000\000\001\001\001\001\
-\041\001\001\001\001\001\001\001\001\001\001\001\000\000\001\001\
-\001\001\000\000\001\001\001\001\001\001\001\001\000\000\001\001\
-\001\001\000\000\001\001\000\000\000\000\000\000\001\001\000\000\
-\030\001\030\001\030\001\030\001\000\000\000\000\030\001\030\001\
-\030\001\030\001\030\001\030\001\030\001\030\001\030\001\030\001\
-\030\001\030\001\030\001\030\001\030\001\030\001\000\000\000\000\
-\030\001\030\001\030\001\030\001\030\001\030\001\030\001\030\001\
-\000\000\000\000\000\000\000\000\030\001\030\001\000\000\000\000\
-\030\001\030\001\030\001\030\001\030\001\030\001\030\001\000\000\
-\000\000\030\001\030\001\030\001\000\000\030\001\030\001\030\001\
-\030\001\000\000\000\000\030\001\030\001\030\001\000\000\030\001\
-\030\001\030\001\030\001\030\001\030\001\000\000\030\001\030\001\
-\030\001\030\001\030\001\000\000\000\000\000\000\000\000\000\000\
-\030\001\030\001\030\001\030\001\030\001\030\001\030\001\030\001\
-\000\000\030\001\000\000\030\001\030\001\044\001\030\001\030\001\
-\030\001\030\001\030\001\000\000\030\001\030\001\000\000\030\001\
-\030\001\030\001\030\001\000\000\030\001\030\001\000\000\030\001\
-\000\000\000\000\000\000\030\001\039\001\039\001\039\001\039\001\
-\000\000\000\000\039\001\039\001\039\001\039\001\039\001\039\001\
-\039\001\039\001\039\001\039\001\039\001\039\001\039\001\039\001\
-\039\001\039\001\000\000\000\000\039\001\039\001\039\001\039\001\
-\039\001\039\001\039\001\039\001\000\000\000\000\000\000\000\000\
-\039\001\039\001\000\000\000\000\039\001\039\001\039\001\039\001\
-\039\001\039\001\039\001\000\000\000\000\039\001\039\001\039\001\
-\000\000\039\001\039\001\039\001\039\001\000\000\000\000\039\001\
-\039\001\039\001\000\000\039\001\039\001\039\001\039\001\039\001\
-\039\001\000\000\039\001\039\001\039\001\039\001\039\001\000\000\
-\000\000\000\000\000\000\000\000\039\001\039\001\039\001\039\001\
-\039\001\039\001\039\001\039\001\000\000\039\001\000\000\039\001\
-\039\001\233\000\039\001\039\001\039\001\000\000\000\000\000\000\
-\039\001\039\001\000\000\039\001\039\001\039\001\039\001\000\000\
-\039\001\039\001\000\000\039\001\000\000\000\000\000\000\039\001\
-\041\001\041\001\041\001\041\001\000\000\000\000\041\001\041\001\
-\041\001\041\001\041\001\041\001\041\001\041\001\041\001\041\001\
-\041\001\041\001\041\001\041\001\041\001\041\001\000\000\000\000\
-\041\001\041\001\041\001\041\001\041\001\041\001\041\001\041\001\
-\000\000\000\000\000\000\000\000\041\001\041\001\000\000\000\000\
-\041\001\041\001\041\001\041\001\041\001\041\001\041\001\000\000\
-\000\000\041\001\041\001\041\001\000\000\041\001\041\001\041\001\
-\041\001\000\000\000\000\041\001\041\001\041\001\000\000\041\001\
-\041\001\041\001\041\001\041\001\041\001\000\000\041\001\041\001\
-\041\001\041\001\041\001\000\000\000\000\000\000\000\000\000\000\
-\041\001\041\001\041\001\041\001\041\001\041\001\041\001\041\001\
-\000\000\041\001\000\000\041\001\041\001\234\000\041\001\041\001\
-\041\001\000\000\000\000\000\000\041\001\041\001\000\000\041\001\
-\041\001\041\001\041\001\000\000\041\001\041\001\000\000\041\001\
-\000\000\000\000\000\000\041\001\000\000\044\001\044\001\044\001\
-\044\001\000\000\000\000\044\001\044\001\044\001\044\001\044\001\
-\044\001\044\001\044\001\044\001\044\001\044\001\044\001\044\001\
-\044\001\044\001\044\001\000\000\000\000\044\001\044\001\044\001\
-\044\001\044\001\044\001\044\001\044\001\000\000\000\000\000\000\
-\000\000\044\001\044\001\000\000\000\000\044\001\044\001\044\001\
-\044\001\044\001\044\001\044\001\000\000\000\000\044\001\044\001\
-\044\001\000\000\044\001\044\001\044\001\044\001\000\000\000\000\
-\044\001\044\001\044\001\000\000\044\001\044\001\044\001\044\001\
-\044\001\044\001\000\000\044\001\044\001\044\001\044\001\044\001\
-\000\000\000\000\000\000\000\000\000\000\044\001\044\001\044\001\
-\044\001\044\001\044\001\044\001\044\001\000\000\044\001\000\000\
-\044\001\044\001\173\000\044\001\044\001\044\001\000\000\000\000\
-\000\000\044\001\044\001\000\000\044\001\044\001\044\001\044\001\
-\000\000\044\001\044\001\000\000\044\001\000\000\000\000\000\000\
-\044\001\233\000\233\000\233\000\233\000\000\000\000\000\000\000\
-\000\000\233\000\233\000\233\000\000\000\000\000\233\000\233\000\
-\233\000\233\000\233\000\233\000\233\000\233\000\233\000\233\000\
-\000\000\233\000\233\000\233\000\233\000\233\000\233\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\233\000\233\000\000\000\
-\000\000\233\000\233\000\233\000\233\000\233\000\233\000\233\000\
-\233\000\000\000\233\000\000\000\233\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\233\000\233\000\000\000\
-\233\000\000\000\000\000\233\000\233\000\233\000\000\000\233\000\
-\233\000\233\000\233\000\233\000\000\000\000\000\000\000\000\000\
-\000\000\233\000\233\000\233\000\233\000\233\000\233\000\233\000\
-\000\000\000\000\233\000\000\000\233\000\233\000\174\000\233\000\
-\233\000\233\000\233\000\233\000\000\000\233\000\000\000\000\000\
-\233\000\233\000\233\000\000\000\000\000\233\000\000\000\000\000\
-\233\000\000\000\000\000\000\000\233\000\234\000\234\000\234\000\
-\234\000\000\000\000\000\000\000\000\000\234\000\234\000\234\000\
-\000\000\000\000\234\000\234\000\234\000\234\000\234\000\234\000\
-\234\000\234\000\234\000\234\000\000\000\234\000\234\000\234\000\
-\234\000\234\000\234\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\234\000\234\000\000\000\000\000\234\000\234\000\234\000\
-\234\000\234\000\234\000\234\000\234\000\000\000\234\000\000\000\
-\234\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\234\000\234\000\000\000\234\000\000\000\000\000\234\000\
-\234\000\234\000\000\000\234\000\234\000\234\000\234\000\234\000\
-\000\000\000\000\000\000\000\000\000\000\234\000\234\000\234\000\
-\234\000\234\000\234\000\234\000\000\000\000\000\234\000\000\000\
-\234\000\234\000\186\000\234\000\234\000\234\000\234\000\234\000\
-\000\000\234\000\000\000\000\000\234\000\234\000\234\000\000\000\
-\000\000\234\000\000\000\000\000\234\000\000\000\000\000\000\000\
-\234\000\000\000\173\000\173\000\173\000\173\000\000\000\000\000\
-\000\000\000\000\173\000\173\000\173\000\000\000\000\000\173\000\
-\173\000\173\000\173\000\173\000\173\000\173\000\173\000\173\000\
-\000\000\000\000\173\000\173\000\173\000\173\000\173\000\173\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\173\000\173\000\
-\000\000\000\000\173\000\173\000\173\000\173\000\173\000\173\000\
-\173\000\000\000\000\000\173\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\173\000\173\000\
-\000\000\173\000\000\000\000\000\173\000\173\000\173\000\000\000\
-\173\000\173\000\173\000\173\000\173\000\000\000\000\000\000\000\
-\000\000\000\000\173\000\000\000\173\000\173\000\173\000\173\000\
-\173\000\000\000\000\000\000\000\000\000\173\000\173\000\187\000\
-\173\000\173\000\173\000\000\000\000\000\000\000\173\000\000\000\
-\000\000\173\000\000\000\173\000\000\000\000\000\173\000\000\000\
-\000\000\173\000\000\000\000\000\000\000\173\000\174\000\174\000\
-\174\000\174\000\000\000\000\000\000\000\000\000\174\000\174\000\
-\174\000\000\000\000\000\174\000\174\000\174\000\174\000\174\000\
-\174\000\174\000\174\000\174\000\000\000\000\000\174\000\174\000\
-\174\000\174\000\174\000\174\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\174\000\174\000\000\000\000\000\174\000\174\000\
-\174\000\174\000\174\000\174\000\174\000\000\000\000\000\174\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\174\000\174\000\000\000\174\000\000\000\000\000\
-\174\000\174\000\174\000\000\000\174\000\174\000\174\000\174\000\
-\174\000\000\000\000\000\000\000\000\000\000\000\174\000\000\000\
-\174\000\174\000\174\000\174\000\174\000\000\000\000\000\000\000\
-\000\000\174\000\174\000\225\000\174\000\174\000\174\000\000\000\
-\000\000\000\000\174\000\000\000\000\000\174\000\000\000\174\000\
-\000\000\000\000\174\000\000\000\000\000\174\000\000\000\000\000\
-\000\000\174\000\186\000\186\000\186\000\186\000\000\000\000\000\
-\000\000\000\000\186\000\186\000\186\000\000\000\000\000\186\000\
-\186\000\186\000\186\000\186\000\186\000\186\000\186\000\186\000\
-\000\000\000\000\186\000\186\000\186\000\186\000\186\000\186\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\186\000\186\000\
-\000\000\000\000\186\000\186\000\186\000\186\000\186\000\186\000\
-\186\000\000\000\000\000\186\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\186\000\186\000\
-\000\000\186\000\000\000\000\000\186\000\186\000\186\000\000\000\
-\186\000\186\000\186\000\186\000\186\000\000\000\000\000\000\000\
-\000\000\000\000\186\000\000\000\186\000\186\000\186\000\186\000\
-\186\000\000\000\000\000\000\000\000\000\186\000\186\000\226\000\
-\186\000\186\000\186\000\000\000\000\000\000\000\186\000\000\000\
-\000\000\186\000\000\000\186\000\000\000\000\000\186\000\000\000\
-\000\000\186\000\000\000\000\000\000\000\186\000\000\000\187\000\
-\187\000\187\000\187\000\000\000\000\000\000\000\000\000\187\000\
-\187\000\187\000\000\000\000\000\187\000\187\000\187\000\187\000\
-\187\000\187\000\187\000\187\000\187\000\000\000\000\000\187\000\
-\187\000\187\000\187\000\187\000\187\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\187\000\187\000\000\000\000\000\187\000\
-\187\000\187\000\187\000\187\000\187\000\187\000\000\000\000\000\
-\187\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\187\000\187\000\000\000\187\000\000\000\
-\000\000\187\000\187\000\187\000\000\000\187\000\187\000\187\000\
-\187\000\187\000\000\000\000\000\000\000\000\000\000\000\187\000\
-\000\000\187\000\187\000\187\000\187\000\187\000\000\000\000\000\
-\000\000\000\000\187\000\187\000\185\000\187\000\187\000\187\000\
-\000\000\000\000\000\000\187\000\000\000\000\000\187\000\000\000\
-\187\000\000\000\000\000\187\000\000\000\000\000\187\000\000\000\
-\000\000\000\000\187\000\225\000\225\000\225\000\225\000\000\000\
-\000\000\000\000\000\000\225\000\225\000\225\000\000\000\000\000\
-\225\000\225\000\225\000\225\000\225\000\225\000\225\000\225\000\
-\225\000\000\000\000\000\225\000\225\000\225\000\225\000\225\000\
-\225\000\000\000\000\000\000\000\000\000\000\000\000\000\225\000\
-\225\000\000\000\000\000\225\000\225\000\225\000\225\000\225\000\
-\225\000\225\000\000\000\000\000\225\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\225\000\
-\225\000\000\000\225\000\000\000\000\000\225\000\225\000\225\000\
-\000\000\225\000\225\000\225\000\225\000\225\000\000\000\000\000\
-\000\000\000\000\000\000\225\000\000\000\225\000\225\000\225\000\
-\225\000\225\000\000\000\000\000\000\000\000\000\225\000\225\000\
-\196\000\225\000\225\000\225\000\000\000\000\000\000\000\225\000\
-\000\000\000\000\225\000\000\000\225\000\000\000\000\000\225\000\
-\000\000\000\000\225\000\000\000\000\000\000\000\225\000\226\000\
-\226\000\226\000\226\000\000\000\000\000\000\000\000\000\226\000\
-\226\000\226\000\000\000\000\000\226\000\226\000\226\000\226\000\
-\226\000\226\000\226\000\226\000\226\000\000\000\000\000\226\000\
-\226\000\226\000\226\000\226\000\226\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\226\000\226\000\000\000\000\000\226\000\
-\226\000\226\000\226\000\226\000\226\000\226\000\000\000\000\000\
-\226\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\226\000\226\000\000\000\226\000\000\000\
-\000\000\226\000\226\000\226\000\000\000\226\000\226\000\226\000\
-\226\000\226\000\000\000\000\000\000\000\000\000\000\000\226\000\
-\000\000\226\000\226\000\226\000\226\000\226\000\000\000\000\000\
-\000\000\000\000\226\000\226\000\197\000\226\000\226\000\226\000\
-\000\000\000\000\000\000\226\000\000\000\000\000\226\000\000\000\
-\226\000\000\000\000\000\226\000\000\000\000\000\226\000\000\000\
-\000\000\000\000\226\000\000\000\185\000\185\000\185\000\185\000\
-\000\000\000\000\000\000\000\000\185\000\185\000\185\000\000\000\
-\000\000\185\000\185\000\185\000\185\000\185\000\000\000\185\000\
-\185\000\185\000\000\000\000\000\185\000\185\000\185\000\185\000\
-\185\000\185\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\185\000\185\000\000\000\000\000\185\000\185\000\185\000\185\000\
-\185\000\185\000\185\000\000\000\000\000\185\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\185\000\185\000\000\000\185\000\000\000\000\000\185\000\185\000\
-\185\000\000\000\185\000\185\000\185\000\185\000\185\000\000\000\
-\000\000\000\000\000\000\000\000\185\000\000\000\185\000\185\000\
-\185\000\185\000\185\000\000\000\000\000\000\000\000\000\185\000\
-\185\000\204\000\185\000\185\000\185\000\000\000\000\000\000\000\
-\185\000\000\000\000\000\185\000\000\000\185\000\000\000\000\000\
-\185\000\000\000\000\000\185\000\000\000\000\000\000\000\185\000\
-\196\000\196\000\196\000\196\000\000\000\000\000\000\000\000\000\
-\196\000\196\000\196\000\000\000\000\000\196\000\196\000\196\000\
-\196\000\196\000\196\000\196\000\196\000\196\000\000\000\000\000\
-\196\000\196\000\196\000\196\000\196\000\196\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\196\000\196\000\000\000\000\000\
-\196\000\196\000\196\000\196\000\196\000\196\000\000\000\000\000\
-\000\000\196\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\196\000\196\000\000\000\196\000\
-\000\000\000\000\196\000\196\000\196\000\000\000\196\000\196\000\
-\196\000\196\000\196\000\000\000\000\000\000\000\000\000\000\000\
-\196\000\000\000\196\000\196\000\196\000\196\000\196\000\000\000\
-\000\000\000\000\000\000\196\000\196\000\203\000\196\000\196\000\
-\196\000\000\000\000\000\000\000\196\000\000\000\000\000\196\000\
-\000\000\196\000\000\000\000\000\196\000\000\000\000\000\196\000\
-\000\000\000\000\000\000\196\000\197\000\197\000\197\000\197\000\
-\000\000\000\000\000\000\000\000\197\000\197\000\197\000\000\000\
-\000\000\197\000\197\000\197\000\197\000\197\000\197\000\197\000\
-\197\000\197\000\000\000\000\000\197\000\197\000\197\000\197\000\
-\197\000\197\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\197\000\197\000\000\000\000\000\197\000\197\000\197\000\197\000\
-\197\000\197\000\000\000\000\000\000\000\197\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\197\000\197\000\000\000\197\000\000\000\000\000\197\000\197\000\
-\197\000\000\000\197\000\197\000\197\000\197\000\197\000\000\000\
-\000\000\000\000\000\000\000\000\197\000\000\000\197\000\197\000\
-\197\000\197\000\197\000\000\000\000\000\000\000\000\000\197\000\
-\197\000\179\000\197\000\197\000\197\000\000\000\000\000\000\000\
-\197\000\000\000\000\000\197\000\000\000\197\000\000\000\000\000\
-\197\000\000\000\000\000\197\000\000\000\000\000\000\000\197\000\
-\000\000\204\000\204\000\204\000\204\000\000\000\000\000\000\000\
-\000\000\204\000\204\000\204\000\000\000\000\000\204\000\204\000\
-\204\000\204\000\204\000\204\000\204\000\204\000\204\000\000\000\
-\000\000\204\000\204\000\204\000\204\000\204\000\204\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\204\000\204\000\000\000\
-\000\000\204\000\204\000\204\000\204\000\204\000\204\000\000\000\
-\000\000\000\000\204\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\204\000\204\000\000\000\
-\204\000\000\000\000\000\204\000\204\000\204\000\000\000\204\000\
-\204\000\204\000\204\000\204\000\000\000\000\000\000\000\000\000\
-\000\000\204\000\000\000\204\000\204\000\204\000\204\000\204\000\
-\000\000\000\000\000\000\000\000\204\000\204\000\182\000\204\000\
-\204\000\204\000\000\000\000\000\000\000\204\000\000\000\000\000\
-\204\000\000\000\204\000\000\000\000\000\204\000\000\000\000\000\
-\204\000\000\000\000\000\000\000\204\000\203\000\203\000\203\000\
-\203\000\000\000\000\000\000\000\000\000\203\000\203\000\203\000\
-\000\000\000\000\203\000\203\000\203\000\203\000\203\000\203\000\
-\203\000\203\000\203\000\000\000\000\000\203\000\203\000\203\000\
-\203\000\203\000\203\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\203\000\203\000\000\000\000\000\203\000\203\000\203\000\
-\203\000\203\000\203\000\000\000\000\000\000\000\203\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\203\000\203\000\000\000\203\000\000\000\000\000\203\000\
-\203\000\203\000\000\000\203\000\203\000\203\000\203\000\203\000\
-\000\000\000\000\000\000\000\000\000\000\203\000\000\000\203\000\
-\203\000\203\000\203\000\203\000\000\000\000\000\000\000\000\000\
-\203\000\203\000\183\000\203\000\203\000\203\000\000\000\000\000\
-\000\000\203\000\000\000\000\000\203\000\000\000\203\000\000\000\
-\000\000\203\000\000\000\000\000\203\000\000\000\000\000\000\000\
-\203\000\179\000\179\000\179\000\179\000\000\000\000\000\000\000\
-\000\000\000\000\179\000\179\000\000\000\000\000\179\000\179\000\
-\179\000\179\000\179\000\179\000\179\000\179\000\179\000\000\000\
-\000\000\179\000\179\000\179\000\179\000\179\000\179\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\179\000\179\000\000\000\
-\000\000\179\000\179\000\179\000\179\000\179\000\179\000\179\000\
-\000\000\000\000\179\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\179\000\179\000\000\000\
-\179\000\000\000\000\000\179\000\179\000\179\000\000\000\179\000\
-\179\000\179\000\179\000\179\000\000\000\000\000\000\000\000\000\
-\000\000\179\000\000\000\179\000\179\000\179\000\179\000\179\000\
-\000\000\000\000\000\000\000\000\179\000\179\000\195\000\179\000\
-\179\000\179\000\000\000\000\000\000\000\179\000\000\000\000\000\
-\179\000\000\000\179\000\000\000\000\000\179\000\000\000\000\000\
-\179\000\000\000\000\000\000\000\179\000\000\000\182\000\182\000\
-\182\000\182\000\000\000\000\000\000\000\000\000\000\000\182\000\
-\182\000\000\000\000\000\182\000\182\000\182\000\182\000\182\000\
-\182\000\182\000\182\000\182\000\000\000\000\000\182\000\182\000\
-\182\000\182\000\182\000\182\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\182\000\182\000\000\000\000\000\182\000\182\000\
-\182\000\182\000\182\000\182\000\182\000\000\000\000\000\182\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\182\000\182\000\000\000\182\000\000\000\000\000\
-\182\000\182\000\182\000\000\000\182\000\182\000\182\000\182\000\
-\182\000\000\000\000\000\000\000\000\000\000\000\182\000\000\000\
-\182\000\182\000\182\000\182\000\182\000\000\000\000\000\000\000\
-\000\000\182\000\182\000\201\000\182\000\182\000\182\000\000\000\
-\000\000\000\000\182\000\000\000\000\000\182\000\000\000\182\000\
-\000\000\000\000\182\000\000\000\000\000\182\000\000\000\000\000\
-\000\000\182\000\183\000\183\000\183\000\183\000\000\000\000\000\
-\000\000\000\000\000\000\183\000\183\000\000\000\000\000\183\000\
-\183\000\183\000\183\000\183\000\183\000\183\000\183\000\183\000\
-\000\000\000\000\183\000\183\000\183\000\183\000\183\000\183\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\183\000\183\000\
-\000\000\000\000\183\000\183\000\183\000\183\000\183\000\183\000\
-\183\000\000\000\000\000\183\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\183\000\183\000\
-\000\000\183\000\000\000\000\000\183\000\183\000\183\000\000\000\
-\183\000\183\000\183\000\183\000\183\000\000\000\000\000\000\000\
-\000\000\000\000\183\000\000\000\183\000\183\000\183\000\183\000\
-\183\000\000\000\000\000\000\000\000\000\183\000\183\000\202\000\
-\183\000\183\000\183\000\000\000\000\000\000\000\183\000\000\000\
-\000\000\183\000\000\000\183\000\000\000\000\000\183\000\000\000\
-\000\000\183\000\000\000\000\000\000\000\183\000\195\000\195\000\
-\195\000\195\000\000\000\000\000\000\000\000\000\195\000\195\000\
-\195\000\000\000\000\000\195\000\195\000\195\000\195\000\195\000\
-\195\000\195\000\195\000\195\000\000\000\000\000\195\000\195\000\
-\195\000\195\000\195\000\195\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\195\000\195\000\000\000\000\000\195\000\195\000\
-\195\000\195\000\195\000\000\000\000\000\000\000\000\000\195\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\195\000\195\000\000\000\195\000\000\000\000\000\
-\195\000\195\000\195\000\000\000\195\000\195\000\195\000\195\000\
-\195\000\000\000\000\000\000\000\000\000\000\000\195\000\000\000\
-\195\000\000\000\195\000\195\000\195\000\000\000\000\000\000\000\
-\000\000\195\000\195\000\198\000\195\000\195\000\195\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\195\000\000\000\195\000\
-\000\000\000\000\195\000\000\000\000\000\195\000\000\000\000\000\
-\000\000\195\000\000\000\201\000\201\000\201\000\201\000\000\000\
-\000\000\000\000\000\000\201\000\201\000\201\000\000\000\000\000\
-\201\000\201\000\201\000\201\000\201\000\201\000\201\000\201\000\
-\201\000\000\000\000\000\201\000\201\000\201\000\201\000\201\000\
-\201\000\000\000\000\000\000\000\000\000\000\000\000\000\201\000\
-\201\000\000\000\000\000\201\000\201\000\201\000\201\000\201\000\
-\000\000\000\000\000\000\000\000\201\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\201\000\
-\201\000\000\000\201\000\000\000\000\000\201\000\201\000\201\000\
-\000\000\201\000\201\000\201\000\201\000\201\000\000\000\000\000\
-\000\000\000\000\000\000\201\000\000\000\201\000\000\000\201\000\
-\201\000\201\000\000\000\000\000\000\000\000\000\201\000\201\000\
-\199\000\201\000\201\000\201\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\201\000\000\000\201\000\000\000\000\000\201\000\
-\000\000\000\000\201\000\000\000\000\000\000\000\201\000\202\000\
-\202\000\202\000\202\000\000\000\000\000\000\000\000\000\202\000\
-\202\000\202\000\000\000\000\000\202\000\202\000\202\000\202\000\
-\202\000\202\000\202\000\202\000\202\000\000\000\000\000\202\000\
-\202\000\202\000\202\000\202\000\202\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\202\000\202\000\000\000\000\000\202\000\
-\202\000\202\000\202\000\202\000\000\000\000\000\000\000\000\000\
-\202\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\202\000\202\000\000\000\202\000\000\000\
-\000\000\202\000\202\000\202\000\000\000\202\000\202\000\202\000\
-\202\000\202\000\000\000\000\000\000\000\000\000\000\000\202\000\
-\000\000\202\000\000\000\202\000\202\000\202\000\000\000\000\000\
-\000\000\000\000\202\000\202\000\200\000\202\000\202\000\202\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\202\000\000\000\
-\202\000\000\000\000\000\202\000\000\000\000\000\202\000\000\000\
-\000\000\000\000\202\000\198\000\198\000\198\000\198\000\000\000\
-\000\000\000\000\000\000\198\000\198\000\198\000\000\000\000\000\
-\198\000\198\000\198\000\198\000\198\000\198\000\198\000\198\000\
-\198\000\000\000\000\000\198\000\198\000\198\000\198\000\198\000\
-\198\000\000\000\000\000\000\000\000\000\000\000\000\000\198\000\
-\198\000\000\000\000\000\198\000\198\000\198\000\198\000\198\000\
-\000\000\000\000\000\000\000\000\198\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\198\000\
-\198\000\000\000\198\000\000\000\000\000\198\000\198\000\198\000\
-\000\000\198\000\198\000\198\000\198\000\198\000\000\000\000\000\
-\000\000\000\000\000\000\198\000\000\000\198\000\000\000\198\000\
-\198\000\198\000\000\000\000\000\000\000\000\000\198\000\198\000\
-\153\000\198\000\198\000\198\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\198\000\000\000\198\000\000\000\000\000\198\000\
-\000\000\000\000\198\000\000\000\000\000\000\000\198\000\000\000\
-\199\000\199\000\199\000\199\000\000\000\000\000\000\000\000\000\
-\199\000\199\000\199\000\000\000\000\000\199\000\199\000\199\000\
-\199\000\199\000\199\000\199\000\199\000\199\000\000\000\000\000\
-\199\000\199\000\199\000\199\000\199\000\199\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\199\000\199\000\000\000\000\000\
-\199\000\199\000\199\000\199\000\199\000\000\000\000\000\000\000\
-\000\000\199\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\199\000\199\000\000\000\199\000\
-\000\000\000\000\199\000\199\000\199\000\000\000\199\000\199\000\
-\199\000\199\000\199\000\000\000\000\000\000\000\000\000\000\000\
-\199\000\000\000\199\000\000\000\199\000\199\000\199\000\000\000\
-\000\000\000\000\000\000\199\000\199\000\192\000\199\000\199\000\
-\199\000\000\000\000\000\000\000\000\000\000\000\000\000\199\000\
-\000\000\199\000\000\000\000\000\199\000\000\000\000\000\199\000\
-\000\000\000\000\000\000\199\000\200\000\200\000\200\000\200\000\
-\000\000\000\000\000\000\000\000\200\000\200\000\200\000\000\000\
-\000\000\200\000\200\000\200\000\200\000\200\000\200\000\200\000\
-\200\000\200\000\000\000\000\000\200\000\200\000\200\000\200\000\
-\200\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\200\000\200\000\000\000\000\000\200\000\200\000\200\000\200\000\
-\200\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\200\000\200\000\000\000\200\000\000\000\000\000\200\000\200\000\
-\200\000\000\000\200\000\200\000\200\000\200\000\200\000\000\000\
-\000\000\000\000\000\000\000\000\200\000\000\000\200\000\000\000\
-\200\000\200\000\200\000\000\000\000\000\000\000\000\000\200\000\
-\200\000\205\000\200\000\200\000\200\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\200\000\000\000\200\000\000\000\000\000\
-\200\000\000\000\000\000\200\000\000\000\000\000\000\000\200\000\
-\153\000\153\000\153\000\153\000\000\000\000\000\000\000\000\000\
-\153\000\153\000\153\000\000\000\000\000\153\000\153\000\153\000\
-\153\000\153\000\153\000\153\000\153\000\153\000\000\000\000\000\
-\153\000\153\000\153\000\153\000\153\000\153\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\153\000\153\000\000\000\000\000\
-\153\000\153\000\153\000\153\000\153\000\153\000\153\000\000\000\
-\000\000\153\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\153\000\153\000\000\000\000\000\
-\000\000\000\000\153\000\153\000\153\000\000\000\153\000\000\000\
-\000\000\153\000\153\000\000\000\000\000\000\000\000\000\000\000\
-\153\000\000\000\153\000\000\000\000\000\000\000\153\000\000\000\
-\000\000\000\000\000\000\153\000\153\000\207\000\153\000\153\000\
-\153\000\000\000\000\000\000\000\153\000\000\000\000\000\153\000\
-\000\000\153\000\000\000\000\000\153\000\000\000\000\000\153\000\
-\000\000\000\000\000\000\153\000\000\000\192\000\192\000\192\000\
-\192\000\000\000\000\000\000\000\000\000\192\000\192\000\192\000\
-\000\000\000\000\192\000\192\000\000\000\192\000\192\000\192\000\
-\192\000\192\000\192\000\000\000\000\000\192\000\192\000\192\000\
-\192\000\192\000\192\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\192\000\192\000\000\000\000\000\192\000\192\000\192\000\
-\192\000\000\000\000\000\000\000\000\000\000\000\192\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\192\000\192\000\000\000\192\000\000\000\000\000\192\000\
-\192\000\192\000\000\000\192\000\000\000\000\000\192\000\192\000\
-\000\000\000\000\000\000\000\000\000\000\192\000\000\000\192\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\192\000\192\000\193\000\192\000\192\000\192\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\192\000\000\000\192\000\000\000\
-\000\000\192\000\000\000\000\000\192\000\000\000\000\000\000\000\
-\192\000\205\000\205\000\205\000\205\000\000\000\000\000\000\000\
-\000\000\205\000\205\000\205\000\000\000\000\000\205\000\205\000\
-\000\000\205\000\205\000\205\000\205\000\205\000\205\000\000\000\
-\000\000\205\000\205\000\205\000\205\000\205\000\205\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\205\000\205\000\000\000\
-\000\000\205\000\205\000\205\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\205\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\205\000\205\000\000\000\
-\205\000\000\000\000\000\000\000\205\000\205\000\000\000\205\000\
-\000\000\000\000\205\000\205\000\000\000\000\000\000\000\000\000\
-\000\000\205\000\000\000\205\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\205\000\205\000\194\000\205\000\
-\205\000\205\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\205\000\000\000\205\000\000\000\000\000\205\000\000\000\000\000\
-\205\000\000\000\000\000\000\000\205\000\207\000\207\000\207\000\
-\207\000\000\000\000\000\000\000\000\000\207\000\207\000\207\000\
-\000\000\000\000\207\000\207\000\000\000\207\000\207\000\207\000\
-\207\000\207\000\207\000\000\000\000\000\207\000\207\000\207\000\
-\207\000\207\000\207\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\207\000\207\000\000\000\000\000\207\000\207\000\207\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\207\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\207\000\207\000\000\000\207\000\000\000\000\000\000\000\
-\207\000\207\000\000\000\207\000\000\000\000\000\207\000\207\000\
-\000\000\000\000\000\000\000\000\000\000\207\000\000\000\207\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\207\000\207\000\206\000\207\000\207\000\207\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\207\000\000\000\207\000\000\000\
-\000\000\207\000\000\000\000\000\207\000\000\000\000\000\000\000\
-\207\000\000\000\193\000\193\000\193\000\193\000\000\000\000\000\
-\000\000\000\000\193\000\193\000\193\000\000\000\000\000\193\000\
-\193\000\000\000\193\000\193\000\193\000\193\000\193\000\193\000\
-\000\000\000\000\193\000\193\000\193\000\193\000\193\000\193\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\193\000\193\000\
-\000\000\000\000\193\000\193\000\193\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\193\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\193\000\193\000\
-\000\000\193\000\000\000\000\000\000\000\193\000\193\000\000\000\
-\193\000\000\000\000\000\193\000\193\000\000\000\000\000\000\000\
-\000\000\000\000\193\000\000\000\193\000\000\000\000\000\211\000\
-\000\000\000\000\000\000\000\000\000\000\193\000\193\000\000\000\
-\193\000\193\000\193\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\193\000\000\000\193\000\000\000\000\000\193\000\000\000\
-\000\000\193\000\000\000\000\000\000\000\193\000\194\000\194\000\
-\194\000\194\000\000\000\000\000\000\000\000\000\194\000\194\000\
-\194\000\000\000\000\000\194\000\194\000\000\000\194\000\194\000\
-\194\000\194\000\194\000\194\000\000\000\000\000\194\000\194\000\
-\194\000\194\000\194\000\194\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\194\000\194\000\000\000\000\000\194\000\194\000\
-\194\000\000\000\000\000\000\000\000\000\000\000\000\000\194\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\194\000\194\000\000\000\194\000\000\000\000\000\
-\000\000\194\000\194\000\000\000\194\000\000\000\000\000\194\000\
-\194\000\000\000\000\000\000\000\210\000\000\000\194\000\000\000\
-\194\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\194\000\194\000\000\000\194\000\194\000\194\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\194\000\000\000\194\000\
-\000\000\000\000\194\000\000\000\000\000\194\000\000\000\000\000\
-\000\000\194\000\206\000\206\000\206\000\206\000\000\000\000\000\
-\000\000\000\000\206\000\206\000\206\000\000\000\000\000\206\000\
-\206\000\000\000\206\000\206\000\206\000\206\000\206\000\206\000\
-\000\000\000\000\206\000\206\000\206\000\206\000\206\000\206\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\206\000\206\000\
-\000\000\000\000\206\000\206\000\206\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\206\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\206\000\206\000\
-\000\000\206\000\000\000\000\000\209\000\206\000\206\000\000\000\
-\206\000\000\000\000\000\206\000\206\000\000\000\000\000\000\000\
-\000\000\000\000\206\000\000\000\206\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\206\000\206\000\000\000\
-\206\000\206\000\206\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\206\000\000\000\206\000\000\000\000\000\206\000\211\000\
-\000\000\206\000\211\000\000\000\000\000\206\000\000\000\211\000\
-\211\000\211\000\000\000\000\000\211\000\211\000\000\000\211\000\
-\211\000\211\000\211\000\211\000\211\000\000\000\000\000\211\000\
-\211\000\211\000\000\000\211\000\211\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\211\000\000\000\000\000\211\000\
-\211\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\211\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\211\000\073\001\000\000\211\000\000\000\
-\000\000\000\000\211\000\211\000\000\000\211\000\000\000\000\000\
-\211\000\211\000\000\000\000\000\000\000\000\000\000\000\211\000\
-\000\000\211\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\211\000\211\000\000\000\211\000\211\000\211\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\211\000\000\000\
-\211\000\000\000\000\000\211\000\210\000\000\000\211\000\210\000\
-\000\000\000\000\211\000\000\000\210\000\210\000\210\000\000\000\
-\000\000\210\000\210\000\000\000\210\000\210\000\210\000\210\000\
-\210\000\210\000\000\000\000\000\210\000\210\000\210\000\000\000\
-\210\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\210\000\000\000\000\000\210\000\210\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\210\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\208\000\000\000\000\000\000\000\
-\210\000\000\000\000\000\210\000\000\000\000\000\000\000\210\000\
-\210\000\000\000\210\000\000\000\000\000\210\000\210\000\000\000\
-\000\000\000\000\000\000\000\000\210\000\000\000\210\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\210\000\
-\210\000\000\000\210\000\210\000\210\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\210\000\209\000\210\000\000\000\209\000\
-\210\000\000\000\000\000\210\000\209\000\000\000\209\000\210\000\
-\000\000\209\000\209\000\000\000\209\000\209\000\209\000\209\000\
-\209\000\209\000\000\000\000\000\209\000\209\000\209\000\000\000\
-\209\000\209\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\209\000\000\000\000\000\209\000\209\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\209\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\072\001\000\000\000\000\000\000\
-\209\000\000\000\000\000\209\000\000\000\000\000\000\000\209\000\
-\209\000\000\000\209\000\000\000\000\000\209\000\209\000\000\000\
-\000\000\000\000\000\000\000\000\209\000\000\000\000\000\000\000\
-\000\000\000\000\214\002\000\000\000\000\000\000\000\000\209\000\
-\209\000\000\000\209\000\209\000\209\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\209\000\073\001\209\000\000\000\073\001\
-\209\000\000\000\000\000\209\000\073\001\000\000\073\001\209\000\
-\000\000\073\001\073\001\000\000\073\001\073\001\073\001\073\001\
-\073\001\073\001\000\000\000\000\073\001\073\001\073\001\000\000\
-\073\001\073\001\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\073\001\000\000\000\000\073\001\073\001\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\073\001\000\000\212\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\073\001\000\000\000\000\073\001\000\000\000\000\000\000\073\001\
-\073\001\000\000\073\001\000\000\000\000\073\001\073\001\000\000\
-\000\000\000\000\000\000\000\000\073\001\214\002\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\073\001\
-\073\001\000\000\073\001\073\001\073\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\073\001\208\000\073\001\000\000\208\000\
-\073\001\000\000\000\000\073\001\208\000\000\000\208\000\073\001\
-\000\000\208\000\208\000\000\000\208\000\208\000\208\000\208\000\
-\208\000\208\000\000\000\000\000\208\000\208\000\208\000\000\000\
-\208\000\208\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\208\000\000\000\000\000\208\000\208\000\000\000\000\000\
-\000\000\000\000\224\000\000\000\000\000\208\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\208\000\000\000\000\000\208\000\000\000\000\000\000\000\208\000\
-\208\000\000\000\208\000\000\000\000\000\208\000\208\000\000\000\
-\000\000\000\000\000\000\000\000\208\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\208\000\
-\208\000\000\000\208\000\208\000\208\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\208\000\072\001\208\000\000\000\072\001\
-\208\000\000\000\000\000\208\000\072\001\000\000\072\001\208\000\
-\000\000\072\001\072\001\000\000\072\001\072\001\072\001\072\001\
-\072\001\072\001\000\000\000\000\072\001\072\001\072\001\000\000\
-\072\001\072\001\214\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\072\001\214\002\000\000\072\001\072\001\000\000\214\002\
-\000\000\000\000\215\000\000\000\000\000\072\001\000\000\000\000\
-\000\000\000\000\000\000\000\000\214\002\000\000\214\002\214\002\
-\072\001\000\000\000\000\072\001\000\000\000\000\000\000\072\001\
-\072\001\000\000\072\001\214\002\000\000\072\001\072\001\000\000\
-\099\000\000\000\000\000\000\000\072\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\214\002\072\001\
-\072\001\214\002\072\001\072\001\072\001\214\002\214\002\212\000\
-\000\000\000\000\212\000\072\001\214\002\072\001\000\000\212\000\
-\072\001\212\000\214\002\072\001\212\000\212\000\000\000\072\001\
-\212\000\000\000\212\000\212\000\212\000\000\000\214\002\212\000\
-\212\000\212\000\214\002\212\000\212\000\214\002\000\000\000\000\
-\000\000\000\000\000\000\000\000\212\000\000\000\214\002\212\000\
-\212\000\214\002\214\002\000\000\000\000\188\000\000\000\000\000\
-\212\000\000\000\000\000\000\000\000\000\000\000\000\000\214\002\
-\000\000\214\002\214\002\212\000\000\000\000\000\212\000\000\000\
-\000\000\000\000\212\000\212\000\000\000\212\000\214\002\000\000\
-\212\000\212\000\000\000\212\002\000\000\000\000\000\000\212\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\214\002\212\000\212\000\214\002\212\000\212\000\212\000\
-\214\002\214\002\224\000\000\000\000\000\224\000\212\000\214\002\
-\212\000\000\000\224\000\212\000\224\000\214\002\212\000\224\000\
-\224\000\000\000\212\000\224\000\000\000\224\000\224\000\224\000\
-\000\000\214\002\224\000\224\000\224\000\214\002\224\000\224\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\224\000\
-\000\000\214\002\224\000\224\000\214\002\000\000\000\000\000\000\
-\217\000\000\000\000\000\224\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\224\000\000\000\
-\000\000\224\000\000\000\000\000\000\000\224\000\224\000\000\000\
-\224\000\000\000\000\000\224\000\224\000\000\000\000\000\000\000\
-\000\000\000\000\224\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\224\000\224\000\000\000\
-\224\000\224\000\224\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\224\000\215\000\224\000\000\000\215\000\224\000\000\000\
-\000\000\224\000\215\000\000\000\215\000\224\000\000\000\215\000\
-\215\000\000\000\000\000\215\000\000\000\215\000\215\000\215\000\
-\000\000\000\000\215\000\215\000\215\000\000\000\215\000\215\000\
-\099\000\000\000\000\000\000\000\000\000\000\000\000\000\215\000\
-\000\000\000\000\215\000\215\000\000\000\099\000\000\000\000\000\
-\216\000\000\000\000\000\215\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\099\000\000\000\099\000\099\000\215\000\000\000\
-\000\000\215\000\000\000\000\000\000\000\215\000\215\000\000\000\
-\215\000\099\000\000\000\215\000\215\000\000\000\100\000\000\000\
-\000\000\000\000\215\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\099\000\215\000\215\000\099\000\
-\215\000\215\000\215\000\099\000\099\000\188\000\000\000\000\000\
-\188\000\215\000\099\000\215\000\000\000\188\000\215\000\188\000\
-\099\000\215\000\188\000\188\000\000\000\215\000\188\000\000\000\
-\188\000\188\000\188\000\000\000\099\000\188\000\188\000\188\000\
-\099\000\188\000\188\000\212\002\000\000\000\000\212\002\000\000\
-\000\000\000\000\188\000\000\000\099\000\188\000\188\000\099\000\
-\212\002\000\000\000\000\220\000\000\000\000\000\188\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\212\002\000\000\212\002\
-\212\002\188\000\000\000\000\000\188\000\000\000\000\000\000\000\
-\188\000\188\000\000\000\188\000\212\002\000\000\188\000\188\000\
-\000\000\165\001\000\000\000\000\000\000\188\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\212\002\
-\188\000\188\000\212\002\188\000\188\000\188\000\000\000\212\002\
-\217\000\000\000\000\000\217\000\188\000\212\002\188\000\000\000\
-\217\000\188\000\217\000\212\002\188\000\217\000\217\000\000\000\
-\188\000\217\000\000\000\217\000\217\000\217\000\000\000\212\002\
-\217\000\217\000\217\000\212\002\217\000\217\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\217\000\000\000\212\002\
-\217\000\217\000\212\002\000\000\000\000\000\000\218\000\000\000\
-\000\000\217\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\217\000\000\000\000\000\217\000\
-\000\000\000\000\000\000\217\000\217\000\000\000\217\000\000\000\
-\000\000\217\000\217\000\000\000\000\000\000\000\000\000\000\000\
-\217\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\217\000\217\000\000\000\217\000\217\000\
-\217\000\000\000\000\000\000\000\000\000\000\000\000\000\217\000\
-\216\000\217\000\000\000\216\000\217\000\000\000\000\000\217\000\
-\216\000\000\000\216\000\217\000\000\000\216\000\216\000\000\000\
-\000\000\216\000\000\000\216\000\216\000\216\000\000\000\000\000\
-\216\000\216\000\216\000\000\000\216\000\216\000\100\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\216\000\000\000\000\000\
-\216\000\216\000\000\000\100\000\000\000\000\000\219\000\000\000\
-\000\000\216\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\100\000\000\000\100\000\100\000\216\000\000\000\000\000\216\000\
-\000\000\000\000\000\000\216\000\216\000\000\000\216\000\100\000\
-\000\000\216\000\216\000\000\000\212\002\000\000\000\000\000\000\
-\216\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\100\000\216\000\216\000\100\000\216\000\216\000\
-\216\000\100\000\100\000\220\000\000\000\000\000\220\000\216\000\
-\100\000\216\000\000\000\220\000\216\000\220\000\100\000\216\000\
-\220\000\220\000\000\000\216\000\220\000\000\000\220\000\220\000\
-\220\000\000\000\100\000\220\000\220\000\220\000\100\000\220\000\
-\220\000\165\001\000\000\000\000\000\000\000\000\000\000\000\000\
-\220\000\000\000\100\000\220\000\220\000\100\000\165\001\000\000\
-\000\000\223\000\000\000\000\000\220\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\165\001\000\000\165\001\165\001\220\000\
-\000\000\000\000\220\000\000\000\000\000\000\000\220\000\220\000\
-\000\000\220\000\165\001\000\000\220\000\220\000\000\000\037\000\
-\000\000\000\000\000\000\220\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\165\001\220\000\220\000\
-\165\001\220\000\220\000\220\000\165\001\165\001\218\000\000\000\
-\000\000\218\000\220\000\165\001\220\000\000\000\218\000\220\000\
-\218\000\165\001\220\000\218\000\218\000\000\000\220\000\218\000\
-\000\000\218\000\218\000\218\000\000\000\165\001\218\000\218\000\
-\218\000\165\001\218\000\218\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\218\000\000\000\165\001\218\000\218\000\
-\165\001\000\000\000\000\000\000\221\000\000\000\000\000\218\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\218\000\000\000\000\000\218\000\000\000\000\000\
-\000\000\218\000\218\000\000\000\218\000\000\000\000\000\218\000\
-\218\000\000\000\000\000\000\000\000\000\000\000\218\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\218\000\218\000\000\000\218\000\218\000\218\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\218\000\219\000\218\000\
-\000\000\219\000\218\000\000\000\000\000\218\000\219\000\000\000\
-\219\000\218\000\000\000\219\000\219\000\000\000\000\000\219\000\
-\000\000\219\000\219\000\219\000\000\000\000\000\219\000\219\000\
-\219\000\000\000\219\000\219\000\212\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\219\000\000\000\000\000\219\000\219\000\
-\000\000\212\002\000\000\000\000\222\000\000\000\000\000\219\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\212\002\000\000\
-\212\002\212\002\219\000\000\000\000\000\219\000\000\000\000\000\
-\000\000\219\000\219\000\000\000\219\000\212\002\000\000\219\000\
-\219\000\000\000\040\000\000\000\000\000\000\000\219\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\212\002\219\000\219\000\212\002\219\000\219\000\219\000\000\000\
-\212\002\223\000\000\000\000\000\223\000\219\000\212\002\219\000\
-\000\000\223\000\219\000\223\000\212\002\219\000\223\000\223\000\
-\000\000\219\000\223\000\000\000\223\000\223\000\223\000\000\000\
-\212\002\223\000\223\000\223\000\212\002\223\000\223\000\037\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\223\000\000\000\
-\212\002\223\000\223\000\212\002\037\000\000\000\000\000\152\000\
-\000\000\000\000\223\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\037\000\000\000\037\000\037\000\223\000\000\000\000\000\
-\223\000\000\000\000\000\000\000\223\000\223\000\000\000\223\000\
-\037\000\000\000\223\000\223\000\000\000\000\000\000\000\000\000\
-\000\000\223\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\037\000\223\000\223\000\037\000\223\000\
-\223\000\223\000\000\000\037\000\221\000\000\000\000\000\221\000\
-\223\000\037\000\223\000\000\000\221\000\223\000\221\000\037\000\
-\223\000\221\000\221\000\000\000\223\000\221\000\000\000\221\000\
-\221\000\221\000\000\000\037\000\221\000\221\000\221\000\037\000\
-\221\000\221\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\221\000\000\000\037\000\221\000\221\000\037\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\221\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\003\002\000\000\000\000\
-\221\000\000\000\000\000\221\000\000\000\000\000\000\000\221\000\
-\221\000\000\000\221\000\000\000\000\000\221\000\221\000\000\000\
-\000\000\000\000\000\000\000\000\221\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\221\000\
-\221\000\000\000\221\000\221\000\221\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\221\000\222\000\221\000\000\000\222\000\
-\221\000\000\000\000\000\221\000\222\000\000\000\222\000\221\000\
-\000\000\222\000\222\000\000\000\000\000\222\000\000\000\222\000\
-\222\000\222\000\000\000\000\000\222\000\222\000\222\000\000\000\
-\222\000\222\000\040\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\222\000\000\000\000\000\222\000\222\000\000\000\040\000\
-\000\000\000\000\000\000\000\000\000\000\222\000\000\000\000\000\
-\189\000\000\000\000\000\000\000\040\000\000\000\040\000\040\000\
-\222\000\000\000\000\000\222\000\000\000\000\000\000\000\222\000\
-\222\000\000\000\222\000\040\000\000\000\222\000\222\000\000\000\
-\000\000\000\000\000\000\000\000\222\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\040\000\222\000\
-\222\000\040\000\222\000\222\000\222\000\000\000\040\000\152\000\
-\000\000\000\000\152\000\222\000\040\000\222\000\000\000\152\000\
-\222\000\152\000\040\000\222\000\152\000\152\000\000\000\222\000\
-\152\000\000\000\152\000\152\000\152\000\000\000\040\000\152\000\
-\152\000\152\000\040\000\152\000\152\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\152\000\000\000\040\000\152\000\
-\152\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\152\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\152\000\000\000\000\000\152\000\000\000\
-\000\000\000\000\152\000\152\000\037\002\152\000\000\000\000\000\
-\152\000\152\000\000\000\000\000\000\000\000\000\000\000\152\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\152\000\152\000\000\000\152\000\000\000\152\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\152\000\000\000\
-\152\000\000\000\000\000\152\000\000\000\003\002\152\000\003\002\
-\003\002\003\002\152\000\000\000\000\000\003\002\000\000\000\000\
-\000\000\000\000\003\002\000\000\000\000\000\000\003\002\003\002\
-\003\002\000\000\000\000\000\000\000\000\000\000\000\000\003\002\
-\003\002\003\002\003\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\003\002\000\000\000\000\000\000\003\002\003\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\003\002\003\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\002\
-\000\000\003\002\000\000\000\000\003\002\000\000\000\000\003\002\
-\003\002\003\002\000\000\003\002\000\000\000\000\003\002\003\002\
-\000\000\000\000\000\000\000\000\000\000\003\002\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\003\002\003\002\000\000\003\002\003\002\003\002\000\000\000\000\
-\189\000\003\002\000\000\189\000\000\000\000\000\000\000\000\000\
-\189\000\003\002\189\000\000\000\003\002\189\000\189\000\000\000\
-\003\002\189\000\000\000\189\000\189\000\189\000\000\000\000\000\
-\189\000\000\000\189\000\000\000\189\000\189\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\189\000\000\000\000\000\
-\189\000\189\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\189\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\255\001\000\000\189\000\000\000\000\000\189\000\
-\000\000\000\000\000\000\189\000\189\000\000\000\189\000\000\000\
-\000\000\189\000\189\000\000\000\000\000\000\000\000\000\000\000\
-\189\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\189\000\189\000\000\000\189\000\189\000\
-\189\000\000\000\000\000\000\000\000\000\000\000\000\000\189\000\
-\000\000\189\000\000\000\000\000\189\000\000\000\000\000\189\000\
-\000\000\000\000\000\000\189\000\037\002\000\000\037\002\037\002\
-\037\002\000\000\000\000\000\000\037\002\000\000\000\000\000\000\
-\000\000\037\002\000\000\000\000\000\000\037\002\037\002\037\002\
-\000\000\000\000\000\000\000\000\000\000\000\000\037\002\037\002\
-\037\002\037\002\000\000\000\000\206\004\000\000\000\000\000\000\
-\037\002\000\000\000\000\000\000\000\000\037\002\000\000\000\002\
-\000\000\000\000\000\000\032\005\037\002\037\002\000\000\000\000\
-\000\000\000\000\198\001\000\000\000\000\000\000\000\000\000\000\
-\037\002\000\000\000\000\037\002\000\000\000\000\037\002\037\002\
-\037\002\000\000\037\002\000\000\000\000\037\002\037\002\000\000\
-\000\000\000\000\000\000\208\004\037\002\113\000\114\000\028\000\
-\000\000\115\000\000\000\000\000\116\000\209\004\000\000\037\002\
-\037\002\000\000\037\002\037\002\037\002\000\000\000\000\001\002\
-\000\000\001\002\001\002\001\002\000\000\118\000\000\000\001\002\
-\037\002\000\000\000\000\037\002\001\002\119\000\120\000\037\002\
-\001\002\001\002\001\002\000\000\000\000\121\000\000\000\000\000\
-\000\000\001\002\001\002\001\002\001\002\000\000\201\001\000\000\
-\000\000\211\004\123\000\001\002\000\000\000\000\000\000\000\000\
-\001\002\000\000\254\001\000\000\000\000\000\000\000\000\001\002\
-\001\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\001\002\000\000\000\000\001\002\000\000\
-\000\000\001\002\001\002\001\002\000\000\001\002\000\000\000\000\
-\000\000\001\002\000\000\000\000\000\000\000\000\000\000\001\002\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\001\002\001\002\000\000\001\002\001\002\001\002\
-\000\000\000\000\255\001\000\000\255\001\255\001\255\001\000\000\
-\000\000\000\000\255\001\001\002\000\000\000\000\001\002\255\001\
-\000\000\000\000\001\002\255\001\255\001\255\001\000\000\000\000\
-\000\000\000\000\000\000\000\000\255\001\255\001\255\001\255\001\
-\000\000\000\000\000\000\000\000\146\000\000\000\255\001\000\000\
-\000\000\000\000\000\000\255\001\000\000\000\000\090\000\000\000\
-\000\000\000\000\255\001\255\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\255\001\000\000\
-\000\000\255\001\000\000\000\000\255\001\255\001\255\001\000\000\
-\255\001\000\000\000\000\000\000\255\001\000\000\000\000\000\000\
-\000\000\000\000\255\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\255\001\255\001\065\000\
-\255\001\255\001\255\001\000\000\000\000\000\000\000\000\000\002\
-\000\000\000\002\000\002\000\002\000\000\000\000\255\001\000\002\
-\000\000\255\001\000\000\000\000\000\002\255\001\000\000\000\000\
-\000\002\000\002\000\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\002\000\002\000\002\000\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\
-\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\002\
-\000\002\066\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\002\000\000\000\000\000\002\000\000\
-\000\000\000\002\000\002\000\002\000\000\000\002\000\000\000\000\
-\000\000\000\002\000\000\000\000\000\000\000\000\112\000\000\002\
-\113\000\114\000\028\000\000\000\115\000\000\000\000\000\116\000\
-\117\000\000\000\000\002\000\002\000\000\000\002\000\002\000\002\
-\000\000\000\000\254\001\000\000\254\001\254\001\254\001\000\000\
-\118\000\000\000\254\001\000\002\000\000\000\000\000\002\254\001\
-\119\000\120\000\000\002\254\001\254\001\254\001\000\000\000\000\
-\121\000\000\000\000\000\000\000\254\001\254\001\254\001\254\001\
-\000\000\000\000\000\000\000\000\122\000\123\000\254\001\000\000\
-\000\000\000\000\000\000\254\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\254\001\254\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\254\001\000\000\
-\000\000\254\001\214\002\000\000\254\001\254\001\254\001\000\000\
-\254\001\000\000\000\000\000\000\254\001\000\000\000\000\000\000\
-\000\000\000\000\254\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\146\000\254\001\254\001\146\000\
-\254\001\254\001\254\001\000\000\000\000\000\000\090\000\000\000\
-\000\000\146\000\000\000\000\000\000\000\146\000\254\001\146\000\
-\000\000\254\001\000\000\090\000\000\000\254\001\146\000\146\000\
-\146\000\146\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\090\000\000\000\090\000\090\000\000\000\146\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\090\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\065\000\
-\146\000\000\000\000\000\146\000\000\000\000\000\000\000\146\000\
-\146\000\000\000\090\000\000\000\065\000\146\000\146\000\000\000\
-\065\000\090\000\090\000\000\000\146\000\000\000\000\000\000\000\
-\090\000\065\000\065\000\065\000\065\000\106\002\090\000\000\000\
-\146\000\000\000\146\000\000\000\146\000\000\000\000\000\000\000\
-\065\000\000\000\090\000\000\000\000\000\000\000\090\000\000\000\
-\146\000\000\000\000\000\146\000\000\000\000\000\000\000\146\000\
-\000\000\066\000\090\000\065\000\066\000\090\000\065\000\000\000\
-\000\000\065\000\065\000\065\000\000\000\000\000\066\000\000\000\
-\065\000\065\000\066\000\000\000\000\000\000\000\000\000\065\000\
-\000\000\000\000\000\000\066\000\066\000\066\000\066\000\000\000\
-\000\000\000\000\000\000\065\000\000\000\065\000\000\000\065\000\
-\000\000\000\000\066\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\065\000\000\000\000\000\065\000\000\000\
-\000\000\000\000\065\000\000\000\000\000\066\000\000\000\000\000\
-\066\000\000\000\000\000\000\000\066\000\066\000\000\000\000\000\
-\000\000\000\000\066\000\066\000\112\000\000\000\113\000\114\000\
-\028\000\066\000\115\000\000\000\120\001\116\000\117\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\066\000\000\000\066\000\
-\000\000\066\000\000\000\000\000\000\000\000\000\118\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\066\000\119\000\060\003\
-\066\000\000\000\214\002\000\000\066\000\214\002\121\000\214\002\
-\214\002\214\002\214\002\000\000\000\000\214\002\214\002\214\002\
-\000\000\000\000\122\000\123\000\000\000\214\002\000\000\000\000\
-\000\000\214\002\000\000\000\000\214\002\000\000\214\002\214\002\
-\214\002\214\002\214\002\214\002\214\002\214\002\214\002\000\000\
-\000\000\214\002\214\002\214\002\000\000\000\000\098\002\000\000\
-\000\000\000\000\214\002\214\002\214\002\214\002\214\002\214\002\
-\214\002\214\002\214\002\214\002\214\002\214\002\214\002\214\002\
-\000\000\214\002\214\002\214\002\000\000\214\002\214\002\214\002\
-\214\002\214\002\214\002\000\000\214\002\214\002\000\000\214\002\
-\214\002\000\000\214\002\214\002\000\000\000\000\214\002\214\002\
-\000\000\214\002\214\002\214\002\214\002\214\002\214\002\214\002\
-\000\000\214\002\214\002\214\002\000\000\214\002\000\000\214\002\
-\214\002\000\000\214\002\000\000\214\002\214\002\214\002\214\002\
-\214\002\214\002\214\002\212\001\214\002\106\002\000\000\000\000\
-\000\000\106\002\000\000\106\002\000\000\106\002\000\000\106\002\
-\000\000\106\002\000\000\106\002\106\002\000\000\106\002\106\002\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\106\002\106\002\000\000\106\002\106\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\106\002\
-\106\002\106\002\106\002\000\000\106\002\106\002\000\000\000\000\
-\106\002\213\001\000\000\000\000\000\000\106\002\106\002\106\002\
-\000\000\000\000\000\000\000\000\106\002\000\000\106\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\106\002\000\000\
-\000\000\106\002\000\000\000\000\000\000\000\000\106\002\000\000\
-\106\002\106\002\000\000\106\002\106\002\000\000\106\002\000\000\
-\000\000\000\000\106\002\000\000\000\000\106\002\000\000\106\002\
-\000\000\000\000\106\002\106\002\120\001\000\000\106\002\000\000\
-\120\001\000\000\120\001\212\002\120\001\000\000\120\001\000\000\
-\120\001\000\000\120\001\120\001\000\000\120\001\120\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\120\001\
-\000\000\000\000\120\001\120\001\000\000\000\000\000\000\000\000\
-\000\000\064\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\120\001\120\001\
-\000\000\120\001\000\000\120\001\120\001\000\000\000\000\120\001\
-\000\000\000\000\000\000\000\000\120\001\120\001\120\001\000\000\
-\000\000\000\000\000\000\120\001\000\000\120\001\098\002\000\000\
-\000\000\098\002\000\000\000\000\000\000\120\001\098\002\000\000\
-\120\001\000\000\000\000\098\002\098\002\120\001\000\000\120\001\
-\120\001\098\002\120\001\120\001\119\002\120\001\000\000\000\000\
-\098\002\120\001\098\002\098\002\120\001\000\000\120\001\000\000\
-\000\000\120\001\120\001\000\000\000\000\120\001\000\000\098\002\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\031\002\
-\209\001\031\002\031\002\031\002\000\000\031\002\000\000\000\000\
-\031\002\031\002\098\002\000\000\000\000\098\002\000\000\119\002\
-\098\002\098\002\098\002\212\001\000\000\000\000\212\001\000\000\
-\098\002\031\002\000\000\212\001\000\000\098\002\098\002\000\000\
-\212\001\031\002\031\002\000\000\000\000\000\000\212\001\000\000\
-\000\000\031\002\098\002\000\000\000\000\212\001\098\002\212\001\
-\212\001\000\000\000\000\000\000\000\000\031\002\031\002\000\000\
-\063\000\000\000\098\002\212\001\212\001\098\002\214\002\000\000\
-\214\002\214\002\214\002\000\000\214\002\000\000\000\000\214\002\
-\214\002\000\000\000\000\000\000\000\000\000\000\000\000\212\001\
-\000\000\213\001\212\001\000\000\213\001\212\001\212\001\212\001\
-\214\002\213\001\000\000\000\000\040\002\212\001\213\001\000\000\
-\214\002\214\002\000\000\212\001\213\001\000\000\000\000\000\000\
-\214\002\000\000\000\000\213\001\000\000\213\001\213\001\212\001\
-\131\000\000\000\000\000\212\001\214\002\214\002\000\000\040\002\
-\000\000\213\001\213\001\000\000\000\000\000\000\000\000\212\001\
-\000\000\000\000\212\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\212\002\000\000\213\001\212\002\000\000\
-\213\001\000\000\000\000\213\001\213\001\213\001\000\000\000\000\
-\212\002\000\000\213\001\213\001\000\000\000\000\212\002\000\000\
-\000\000\213\001\000\000\000\000\000\000\212\002\000\000\212\002\
-\212\002\064\000\174\001\000\000\064\000\213\001\000\000\000\000\
-\000\000\213\001\000\000\212\002\212\002\000\000\064\000\000\000\
-\000\000\000\000\064\000\212\002\212\002\213\001\000\000\000\000\
-\213\001\000\000\000\000\064\000\064\000\064\000\064\000\212\002\
-\000\000\000\000\212\002\000\000\000\000\000\000\000\000\212\002\
-\000\000\212\002\064\000\000\000\000\000\212\002\000\000\000\000\
-\000\000\000\000\241\001\212\002\241\001\241\001\241\001\000\000\
-\241\001\000\000\214\002\241\001\241\001\064\000\000\000\212\002\
-\064\000\000\000\000\000\212\002\064\000\064\000\000\000\000\000\
-\000\000\000\000\008\000\064\000\241\001\000\000\000\000\212\002\
-\011\000\064\000\212\002\000\000\241\001\241\001\000\000\000\000\
-\209\001\000\000\000\000\209\001\241\001\064\000\000\000\064\000\
-\209\001\064\000\015\000\016\000\000\000\209\001\000\000\000\000\
-\241\001\241\001\000\000\209\001\000\000\064\000\000\000\174\001\
-\064\000\000\000\209\001\000\000\209\001\209\001\022\000\000\000\
-\138\000\139\000\000\000\140\000\141\000\000\000\000\000\028\000\
-\000\000\209\001\000\000\000\000\142\000\143\000\000\000\000\000\
-\000\000\000\000\000\000\144\000\000\000\000\000\000\000\000\000\
-\063\000\000\000\000\000\063\000\209\001\000\000\000\000\209\001\
-\145\000\000\000\209\001\209\001\209\001\063\000\000\000\000\000\
-\000\000\063\000\209\001\000\000\175\001\146\000\000\000\000\000\
-\209\001\044\000\063\000\063\000\063\000\063\000\045\000\000\000\
-\000\000\048\000\147\000\000\000\209\001\000\000\000\000\000\000\
-\209\001\063\000\000\000\209\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\209\001\000\000\000\000\209\001\
-\131\000\000\000\000\000\131\000\063\000\000\000\000\000\063\000\
-\000\000\000\000\000\000\063\000\063\000\131\000\000\000\000\000\
-\000\000\177\001\063\000\131\000\000\000\000\000\000\000\000\000\
-\063\000\000\000\131\000\000\000\131\000\131\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\063\000\000\000\063\000\000\000\
-\063\000\131\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\131\000\000\000\000\000\000\000\063\000\000\000\000\000\063\000\
-\000\000\000\000\174\001\000\000\131\000\174\001\000\000\131\000\
-\000\000\000\000\000\000\131\000\131\000\000\000\131\000\174\001\
-\000\000\176\001\131\000\000\000\000\000\174\001\000\000\000\000\
-\131\000\000\000\000\000\000\000\174\001\000\000\174\001\174\001\
-\000\000\000\000\000\000\000\000\131\000\000\000\000\000\000\000\
-\131\000\000\000\000\000\174\001\000\000\000\000\000\000\178\001\
-\000\000\000\000\000\000\000\000\131\000\000\000\000\000\131\000\
-\000\000\000\000\214\002\000\000\000\000\214\002\174\001\000\000\
-\000\000\174\001\214\002\000\000\000\000\174\001\174\001\214\002\
-\000\000\000\000\000\000\000\000\174\001\214\002\000\000\000\000\
-\000\000\000\000\174\001\000\000\214\002\000\000\214\002\214\002\
-\115\002\000\000\000\000\000\000\000\000\000\000\174\001\000\000\
-\000\000\000\000\174\001\214\002\000\000\000\000\000\000\182\001\
-\000\000\000\000\000\000\000\000\000\000\000\000\174\001\174\001\
-\000\000\174\001\174\001\000\000\000\000\000\000\214\002\000\000\
-\209\001\214\002\000\000\000\000\174\001\214\002\214\002\000\000\
-\000\000\000\000\174\001\000\000\214\002\000\000\000\000\000\000\
-\000\000\174\001\214\002\174\001\174\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\214\002\000\000\
-\174\001\000\000\214\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\175\001\000\000\214\002\175\001\
-\000\000\214\002\000\000\174\001\000\000\000\000\174\001\000\000\
-\044\000\175\001\174\001\174\001\000\000\000\000\000\000\175\001\
-\000\000\174\001\000\000\209\001\000\000\000\000\175\001\174\001\
-\175\001\175\001\000\000\209\001\000\000\047\000\000\000\000\000\
-\209\001\000\000\000\000\174\001\000\000\175\001\085\000\174\001\
-\000\000\000\000\000\000\000\000\000\000\209\001\000\000\209\001\
-\209\001\177\001\000\000\174\001\177\001\000\000\174\001\000\000\
-\175\001\000\000\000\000\175\001\209\001\000\000\177\001\175\001\
-\175\001\000\000\000\000\000\000\177\001\000\000\175\001\000\000\
-\000\000\212\002\000\000\177\001\175\001\177\001\177\001\209\001\
-\000\000\000\000\209\001\000\000\000\000\209\001\209\001\209\001\
-\175\001\000\000\177\001\000\000\175\001\209\001\081\000\000\000\
-\000\000\000\000\000\000\209\001\000\000\000\000\000\000\000\000\
-\175\001\176\001\000\000\175\001\176\001\177\001\000\000\209\001\
-\177\001\000\000\000\000\209\001\177\001\177\001\176\001\000\000\
-\000\000\000\000\000\000\177\001\176\001\000\000\000\000\209\001\
-\000\000\177\001\209\001\176\001\000\000\176\001\176\001\178\001\
-\000\000\000\000\178\001\000\000\000\000\177\001\000\000\000\000\
-\000\000\177\001\176\001\000\000\178\001\000\000\000\000\000\000\
-\000\000\000\000\178\001\000\000\000\000\177\001\000\000\000\000\
-\177\001\178\001\000\000\178\001\178\001\176\001\000\000\000\000\
-\176\001\000\000\000\000\000\000\176\001\176\001\000\000\000\000\
-\178\001\000\000\000\000\176\001\000\000\000\000\000\000\000\000\
-\000\000\176\001\000\000\000\000\000\000\000\000\000\000\182\001\
-\000\000\000\000\182\001\178\001\000\000\176\001\178\001\000\000\
-\000\000\176\001\178\001\178\001\182\001\000\000\000\000\000\000\
-\209\001\178\001\182\001\000\000\000\000\176\001\000\000\178\001\
-\176\001\182\001\000\000\182\001\182\001\209\001\000\000\000\000\
-\000\000\000\000\000\000\178\001\000\000\000\000\000\000\178\001\
-\182\001\000\000\209\001\000\000\209\001\209\001\000\000\000\000\
-\000\000\000\000\000\000\178\001\000\000\000\000\178\001\000\000\
-\000\000\209\001\000\000\182\001\000\000\000\000\182\001\000\000\
-\000\000\000\000\182\001\182\001\000\000\000\000\000\000\000\000\
-\044\000\182\001\000\000\000\000\209\001\000\000\000\000\182\001\
-\000\000\000\000\209\001\209\001\209\001\044\000\000\000\000\000\
-\000\000\000\000\209\001\182\001\000\000\047\000\000\000\182\001\
-\209\001\000\000\044\000\000\000\044\000\044\000\085\000\000\000\
-\000\000\000\000\047\000\182\001\209\001\000\000\182\001\000\000\
-\209\001\044\000\000\000\085\000\000\000\000\000\000\000\047\000\
-\000\000\047\000\047\000\000\000\209\001\000\000\000\000\209\001\
-\085\000\000\000\085\000\085\000\044\000\000\000\047\000\044\000\
-\000\000\212\002\000\000\000\000\044\000\000\000\000\000\085\000\
-\000\000\000\000\044\000\000\000\000\000\000\000\212\002\000\000\
-\044\000\047\000\000\000\000\000\047\000\000\000\081\000\000\000\
-\000\000\047\000\085\000\212\002\044\000\212\002\212\002\047\000\
-\044\000\000\000\085\000\081\000\000\000\047\000\000\000\000\000\
-\085\000\000\000\212\002\000\000\044\000\000\000\085\000\044\000\
-\081\000\047\000\081\000\081\000\000\000\047\000\000\000\000\000\
-\000\000\000\000\085\000\000\000\000\000\212\002\085\000\081\000\
-\000\000\047\000\000\000\000\000\047\000\212\002\000\000\000\000\
-\000\000\000\000\085\000\212\002\000\000\085\000\000\000\000\000\
-\000\000\212\002\081\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\081\000\000\000\000\000\212\002\000\000\000\000\
-\081\000\212\002\000\000\000\000\000\000\000\000\081\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\212\002\000\000\000\000\
-\212\002\000\000\081\000\207\002\000\000\000\000\081\000\000\000\
-\207\002\207\002\207\002\207\002\000\000\000\000\207\002\207\002\
-\207\002\207\002\081\000\000\000\000\000\081\000\207\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\207\002\000\000\207\002\
-\207\002\207\002\207\002\207\002\207\002\207\002\207\002\000\000\
-\000\000\000\000\207\002\000\000\207\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\207\002\207\002\207\002\207\002\
-\207\002\207\002\207\002\207\002\000\000\000\000\207\002\207\002\
-\000\000\000\000\207\002\207\002\207\002\207\002\000\000\207\002\
-\207\002\207\002\207\002\207\002\000\000\207\002\000\000\000\000\
-\207\002\207\002\000\000\207\002\207\002\000\000\000\000\207\002\
-\207\002\000\000\207\002\000\000\207\002\207\002\000\000\207\002\
-\207\002\000\000\000\000\207\002\207\002\000\000\207\002\000\000\
-\207\002\207\002\000\000\207\002\000\000\207\002\207\002\207\002\
-\207\002\207\002\207\002\207\002\214\002\207\002\000\000\000\000\
-\000\000\214\002\214\002\214\002\214\002\000\000\000\000\214\002\
-\214\002\000\000\000\000\000\000\000\000\000\000\000\000\214\002\
-\000\000\000\000\000\000\000\000\000\000\000\000\214\002\000\000\
-\214\002\000\000\214\002\214\002\214\002\214\002\214\002\214\002\
-\000\000\000\000\000\000\214\002\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\214\002\214\002\214\002\
-\214\002\214\002\214\002\214\002\214\002\000\000\000\000\214\002\
-\214\002\000\000\000\000\214\002\214\002\214\002\000\000\000\000\
-\214\002\214\002\214\002\214\002\214\002\000\000\214\002\000\000\
-\000\000\214\002\214\002\000\000\000\000\214\002\000\000\000\000\
-\214\002\214\002\000\000\214\002\000\000\214\002\214\002\000\000\
-\000\000\214\002\000\000\000\000\000\000\214\002\000\000\214\002\
-\000\000\214\002\214\002\000\000\214\002\000\000\214\002\214\002\
-\000\000\214\002\214\002\214\002\214\002\000\000\214\002\001\001\
-\002\001\003\001\000\000\000\000\007\000\008\000\004\001\000\000\
-\005\001\000\000\010\000\011\000\000\000\000\000\006\001\007\001\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\008\001\000\000\000\000\015\000\016\000\017\000\
-\018\000\019\000\000\000\009\001\000\000\000\000\020\000\000\000\
-\000\000\010\001\011\001\012\001\013\001\014\001\015\001\000\000\
-\000\000\022\000\000\000\023\000\024\000\025\000\026\000\027\000\
-\000\000\000\000\028\000\000\000\016\001\000\000\030\000\031\000\
-\032\000\000\000\000\000\000\000\034\000\000\000\017\001\018\001\
-\000\000\019\001\000\000\000\000\000\000\038\000\000\000\000\000\
-\000\000\020\001\021\001\022\001\023\001\024\001\025\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\026\001\000\000\000\000\
-\000\000\027\001\000\000\028\001\044\000\000\000\000\000\000\000\
-\000\000\045\000\046\000\000\000\048\000\049\000\001\001\002\001\
-\003\001\051\000\000\000\007\000\008\000\004\001\000\000\005\001\
-\000\000\010\000\011\000\000\000\000\000\018\003\007\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\008\001\000\000\000\000\015\000\016\000\017\000\018\000\
-\019\000\000\000\009\001\000\000\000\000\020\000\000\000\000\000\
-\010\001\011\001\012\001\013\001\014\001\015\001\000\000\000\000\
-\022\000\000\000\023\000\024\000\025\000\026\000\027\000\000\000\
-\000\000\028\000\000\000\016\001\000\000\030\000\031\000\032\000\
-\000\000\000\000\000\000\034\000\000\000\017\001\018\001\000\000\
-\019\003\000\000\000\000\000\000\038\000\000\000\000\000\000\000\
-\020\001\021\001\022\001\023\001\024\001\025\001\000\000\000\000\
-\000\000\000\000\000\000\000\000\020\003\000\000\000\000\000\000\
-\027\001\000\000\028\001\044\000\000\000\000\000\000\000\000\000\
-\045\000\046\000\000\000\048\000\049\000\214\002\000\000\000\000\
-\051\000\000\000\214\002\214\002\214\002\000\000\000\000\000\000\
-\214\002\214\002\214\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\214\002\
-\000\000\214\002\214\002\214\002\214\002\214\002\214\002\214\002\
-\000\000\000\000\000\000\000\000\214\002\000\000\214\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\214\002\
-\000\000\214\002\214\002\214\002\214\002\214\002\000\000\000\000\
-\214\002\214\002\000\000\000\000\214\002\214\002\214\002\000\000\
-\000\000\214\002\214\002\000\000\214\002\214\002\000\000\214\002\
-\000\000\000\000\000\000\214\002\000\000\214\002\000\000\000\000\
-\000\000\214\002\214\002\085\002\214\002\000\000\000\000\000\000\
-\152\002\152\002\152\002\000\000\000\000\214\002\152\002\152\002\
-\000\000\000\000\214\002\000\000\000\000\000\000\000\000\214\002\
-\214\002\214\002\214\002\214\002\214\002\000\000\000\000\214\002\
-\000\000\152\002\152\002\152\002\152\002\152\002\000\000\000\000\
-\000\000\000\000\152\002\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\152\002\000\000\152\002\
-\152\002\152\002\152\002\152\002\000\000\000\000\152\002\000\000\
-\000\000\000\000\152\002\152\002\152\002\000\000\000\000\000\000\
-\152\002\000\000\152\002\152\002\000\000\000\000\000\000\000\000\
-\000\000\152\002\000\000\000\000\000\000\000\000\000\000\152\002\
-\152\002\086\002\152\002\000\000\000\000\000\000\153\002\153\002\
-\153\002\085\002\000\000\000\000\153\002\153\002\000\000\000\000\
-\152\002\000\000\000\000\000\000\000\000\152\002\152\002\000\000\
-\152\002\152\002\000\000\000\000\000\000\152\002\000\000\153\002\
-\153\002\153\002\153\002\153\002\000\000\000\000\000\000\000\000\
-\153\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\153\002\000\000\153\002\153\002\153\002\
-\153\002\153\002\000\000\000\000\153\002\000\000\000\000\000\000\
-\153\002\153\002\153\002\000\000\000\000\000\000\153\002\000\000\
-\153\002\153\002\000\000\000\000\000\000\000\000\000\000\153\002\
-\000\000\000\000\000\000\000\000\000\000\153\002\153\002\083\002\
-\153\002\000\000\000\000\000\000\154\002\154\002\154\002\086\002\
-\000\000\000\000\154\002\154\002\000\000\000\000\153\002\000\000\
-\000\000\000\000\000\000\153\002\153\002\000\000\153\002\153\002\
-\000\000\000\000\000\000\153\002\000\000\154\002\154\002\154\002\
-\154\002\154\002\000\000\000\000\000\000\000\000\154\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\154\002\000\000\154\002\154\002\154\002\154\002\154\002\
-\000\000\000\000\154\002\000\000\000\000\000\000\154\002\154\002\
-\154\002\000\000\000\000\000\000\154\002\000\000\154\002\154\002\
-\000\000\000\000\000\000\000\000\000\000\154\002\000\000\000\000\
-\000\000\000\000\000\000\154\002\154\002\084\002\154\002\000\000\
-\000\000\000\000\155\002\155\002\155\002\083\002\000\000\000\000\
-\155\002\155\002\000\000\000\000\154\002\000\000\000\000\000\000\
-\000\000\154\002\154\002\000\000\154\002\154\002\000\000\000\000\
-\000\000\154\002\000\000\155\002\155\002\155\002\155\002\155\002\
-\000\000\000\000\000\000\000\000\155\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\155\002\
-\000\000\155\002\155\002\155\002\155\002\155\002\000\000\000\000\
-\155\002\000\000\000\000\000\000\155\002\155\002\155\002\000\000\
-\000\000\000\000\155\002\000\000\155\002\155\002\000\000\000\000\
-\000\000\000\000\000\000\155\002\000\000\000\000\000\000\000\000\
-\000\000\155\002\155\002\000\000\155\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\084\002\199\000\200\000\201\000\000\000\
-\000\000\000\000\155\002\000\000\202\000\000\000\203\000\155\002\
-\155\002\000\000\155\002\155\002\204\000\205\000\206\000\155\002\
-\000\000\207\000\208\000\209\000\000\000\210\000\211\000\212\000\
-\000\000\213\000\214\000\215\000\216\000\000\000\000\000\000\000\
-\217\000\218\000\219\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\220\000\221\000\000\000\000\000\222\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\223\000\224\000\000\000\000\000\000\000\004\002\225\000\226\000\
-\000\000\004\002\000\000\227\000\228\000\229\000\230\000\231\000\
-\232\000\233\000\000\000\234\000\000\000\000\000\004\002\000\000\
-\004\002\235\000\000\000\243\001\000\000\000\000\236\000\004\002\
-\004\002\000\000\000\000\000\000\237\000\000\000\000\000\238\000\
-\239\000\004\002\240\000\241\000\242\000\243\000\244\000\000\000\
-\245\000\246\000\247\000\248\000\249\000\004\002\004\002\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\004\002\000\000\000\000\000\000\004\002\000\000\004\002\
-\004\002\004\002\000\000\004\002\000\000\000\000\004\002\000\000\
-\000\000\000\000\001\001\002\001\003\001\000\000\000\000\000\000\
-\008\000\164\001\000\000\005\001\000\000\000\000\011\000\243\001\
-\004\002\006\001\007\001\000\000\004\002\000\000\004\002\000\000\
-\000\000\004\002\000\000\000\000\000\000\008\001\137\000\000\000\
-\015\000\016\000\004\002\000\000\004\002\000\000\009\001\000\000\
-\000\000\000\000\000\000\000\000\010\001\011\001\012\001\013\001\
-\014\001\015\001\000\000\000\000\022\000\000\000\138\000\139\000\
-\000\000\140\000\141\000\000\000\000\000\028\000\000\000\016\001\
-\000\000\000\000\142\000\143\000\000\000\000\000\000\000\000\000\
-\000\000\165\001\166\001\000\000\167\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\020\001\021\001\168\001\169\001\
-\024\001\170\001\000\000\000\000\000\000\000\000\000\000\000\000\
-\026\001\000\000\000\000\146\000\027\001\000\000\028\001\044\000\
-\000\000\000\000\000\000\000\000\045\000\000\000\179\002\048\000\
-\147\000\001\001\002\001\003\001\000\000\000\000\000\000\008\000\
-\164\001\000\000\005\001\000\000\000\000\011\000\000\000\000\000\
-\006\001\007\001\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\008\001\137\000\000\000\015\000\
-\016\000\000\000\000\000\000\000\000\000\009\001\000\000\000\000\
-\000\000\000\000\000\000\010\001\011\001\012\001\013\001\014\001\
-\015\001\000\000\000\000\022\000\000\000\138\000\139\000\000\000\
-\140\000\141\000\000\000\000\000\028\000\000\000\016\001\000\000\
-\000\000\142\000\143\000\000\000\000\000\000\000\000\000\000\000\
-\165\001\166\001\000\000\167\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\020\001\021\001\168\001\169\001\024\001\
-\170\001\000\000\000\000\000\000\000\000\000\000\000\000\026\001\
-\000\000\000\000\146\000\027\001\000\000\028\001\044\000\000\000\
-\000\000\000\000\000\000\045\000\000\000\124\003\048\000\147\000\
-\001\001\002\001\003\001\000\000\000\000\000\000\008\000\164\001\
-\000\000\005\001\000\000\000\000\011\000\000\000\000\000\006\001\
-\007\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\008\001\137\000\000\000\015\000\016\000\
-\000\000\000\000\000\000\000\000\009\001\000\000\000\000\000\000\
-\000\000\000\000\010\001\011\001\012\001\013\001\014\001\015\001\
-\000\000\000\000\022\000\000\000\138\000\139\000\000\000\140\000\
-\141\000\000\000\000\000\028\000\000\000\016\001\000\000\000\000\
-\142\000\143\000\000\000\000\000\000\000\000\000\000\000\165\001\
-\166\001\000\000\167\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\020\001\021\001\168\001\169\001\024\001\170\001\
-\000\000\000\000\000\000\000\000\000\000\000\000\026\001\000\000\
-\000\000\146\000\027\001\000\000\028\001\044\000\000\000\000\000\
-\000\000\000\000\045\000\000\000\073\004\048\000\147\000\001\001\
-\002\001\003\001\000\000\000\000\000\000\008\000\164\001\000\000\
-\005\001\000\000\000\000\011\000\000\000\000\000\006\001\007\001\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\008\001\137\000\000\000\015\000\016\000\000\000\
-\000\000\000\000\000\000\009\001\000\000\000\000\000\000\000\000\
-\000\000\010\001\011\001\012\001\013\001\014\001\015\001\000\000\
-\000\000\022\000\000\000\138\000\139\000\000\000\140\000\141\000\
-\000\000\000\000\028\000\000\000\016\001\000\000\000\000\142\000\
-\143\000\000\000\000\000\000\000\000\000\000\000\165\001\166\001\
-\000\000\167\001\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\020\001\021\001\168\001\169\001\024\001\170\001\000\000\
-\000\000\091\003\000\000\000\000\000\000\026\001\000\000\008\000\
-\146\000\027\001\000\000\028\001\044\000\011\000\000\000\000\000\
-\018\003\045\000\000\000\000\000\048\000\147\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\137\000\000\000\015\000\
-\016\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\022\000\000\000\138\000\139\000\000\000\
-\140\000\141\000\000\000\000\000\028\000\000\000\143\002\000\000\
-\000\000\142\000\143\000\000\000\008\000\000\000\000\000\000\000\
-\144\000\000\000\011\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\145\000\000\000\000\000\
-\000\000\000\000\137\000\000\000\015\000\016\000\000\000\092\003\
-\000\000\000\000\146\000\000\000\000\000\000\000\044\000\000\000\
-\000\000\000\000\000\000\045\000\000\000\000\000\048\000\147\000\
-\022\000\000\000\138\000\139\000\000\000\140\000\141\000\000\000\
-\000\000\028\000\000\000\145\002\000\000\000\000\142\000\143\000\
-\000\000\008\000\000\000\000\000\000\000\144\000\000\000\011\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\145\000\000\000\000\000\000\000\000\000\137\000\
-\000\000\015\000\016\000\000\000\000\000\000\000\000\000\146\000\
-\000\000\000\000\000\000\044\000\000\000\000\000\000\000\000\000\
-\045\000\000\000\000\000\048\000\147\000\022\000\000\000\138\000\
-\139\000\000\000\140\000\141\000\000\000\000\000\028\000\000\000\
-\080\004\000\000\000\000\142\000\143\000\000\000\008\000\000\000\
-\000\000\000\000\144\000\000\000\011\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\145\000\
-\000\000\000\000\000\000\000\000\137\000\000\000\015\000\016\000\
-\000\000\000\000\000\000\000\000\146\000\000\000\000\000\000\000\
-\044\000\000\000\000\000\000\000\000\000\045\000\000\000\000\000\
-\048\000\147\000\022\000\000\000\138\000\139\000\000\000\140\000\
-\141\000\000\000\000\000\028\000\000\000\082\004\000\000\000\000\
-\142\000\143\000\000\000\008\000\000\000\000\000\000\000\144\000\
-\000\000\011\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\145\000\000\000\000\000\000\000\
-\000\000\137\000\000\000\015\000\016\000\000\000\000\000\000\000\
-\000\000\146\000\000\000\000\000\000\000\044\000\000\000\000\000\
-\000\000\000\000\045\000\000\000\000\000\048\000\147\000\022\000\
-\000\000\138\000\139\000\000\000\140\000\141\000\000\000\000\000\
-\028\000\000\000\084\004\000\000\000\000\142\000\143\000\000\000\
-\008\000\000\000\000\000\000\000\144\000\000\000\011\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\145\000\000\000\000\000\000\000\000\000\137\000\000\000\
-\015\000\016\000\000\000\000\000\000\000\000\000\146\000\000\000\
-\000\000\000\000\044\000\000\000\000\000\000\000\000\000\045\000\
-\000\000\000\000\048\000\147\000\022\000\000\000\138\000\139\000\
-\000\000\140\000\141\000\000\000\000\000\028\000\000\000\000\000\
-\000\000\000\000\142\000\143\000\007\000\008\000\009\000\000\000\
-\000\000\144\000\010\000\011\000\012\000\243\001\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\145\000\000\000\
-\000\000\000\000\000\000\013\000\014\000\015\000\016\000\017\000\
-\018\000\019\000\000\000\146\000\000\000\000\000\020\000\044\000\
-\021\000\000\000\000\000\000\000\045\000\000\000\000\000\048\000\
-\147\000\022\000\000\000\023\000\024\000\025\000\026\000\027\000\
-\000\000\000\000\028\000\029\000\000\000\000\000\030\000\031\000\
-\032\000\000\000\000\000\033\000\034\000\000\000\035\000\036\000\
-\000\000\037\000\000\000\000\000\000\000\038\000\000\000\039\000\
-\000\000\000\000\000\000\040\000\041\000\000\000\042\000\000\000\
-\244\001\000\000\000\000\007\000\008\000\009\000\000\000\043\000\
-\000\000\010\000\011\000\012\000\044\000\000\000\000\000\000\000\
-\000\000\045\000\046\000\047\000\048\000\049\000\050\000\000\000\
-\000\000\051\000\013\000\014\000\015\000\016\000\017\000\018\000\
-\019\000\000\000\000\000\000\000\000\000\020\000\000\000\021\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\022\000\000\000\023\000\024\000\025\000\026\000\027\000\000\000\
-\000\000\028\000\029\000\000\000\000\000\030\000\031\000\032\000\
-\000\000\000\000\033\000\034\000\000\000\035\000\036\000\000\000\
-\037\000\000\000\000\000\000\000\038\000\000\000\039\000\000\000\
-\000\000\000\000\040\000\041\000\000\000\042\000\000\000\000\000\
-\000\000\007\000\008\000\009\000\000\000\000\000\043\000\010\000\
-\011\000\000\000\000\000\044\000\000\000\000\000\000\000\000\000\
-\045\000\046\000\047\000\048\000\049\000\050\000\000\000\000\000\
-\051\000\000\000\015\000\016\000\017\000\018\000\019\000\000\000\
-\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\022\000\000\000\
-\023\000\024\000\025\000\026\000\027\000\000\000\000\000\028\000\
-\000\000\000\000\000\000\030\000\031\000\032\000\000\000\000\000\
-\000\000\034\000\000\000\035\000\036\000\000\000\000\000\000\000\
-\000\000\000\000\038\000\000\000\000\000\000\000\000\000\000\000\
-\040\000\041\000\000\000\042\000\000\000\000\000\000\000\000\000\
-\194\000\007\000\008\000\009\000\000\000\000\000\197\000\010\000\
-\011\000\044\000\000\000\000\000\000\000\000\000\045\000\046\000\
-\000\000\048\000\049\000\000\000\000\000\000\000\051\000\000\000\
-\000\000\000\000\015\000\016\000\017\000\018\000\019\000\000\000\
-\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\022\000\000\000\
-\023\000\024\000\025\000\026\000\027\000\000\000\000\000\028\000\
-\000\000\000\000\000\000\030\000\031\000\032\000\000\000\000\000\
-\000\000\034\000\000\000\035\000\036\000\000\000\000\000\000\000\
-\000\000\000\000\038\000\000\000\000\000\000\000\000\000\000\000\
-\040\000\041\000\000\000\042\000\000\000\000\000\007\000\008\000\
-\009\000\000\000\000\000\000\000\010\000\011\000\000\000\000\000\
-\000\000\044\000\000\000\000\000\000\000\000\000\045\000\046\000\
-\000\000\048\000\049\000\195\001\000\000\000\000\051\000\015\000\
-\016\000\017\000\018\000\019\000\000\000\000\000\000\000\000\000\
-\020\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\022\000\000\000\023\000\024\000\025\000\
-\026\000\027\000\000\000\000\000\028\000\000\000\000\000\000\000\
-\030\000\031\000\032\000\000\000\000\000\000\000\034\000\000\000\
-\035\000\036\000\000\000\000\000\000\000\000\000\000\000\038\000\
-\000\000\000\000\000\000\000\000\000\000\040\000\041\000\000\000\
-\042\000\000\000\000\000\007\000\008\000\009\000\000\000\000\000\
-\000\000\010\000\011\000\000\000\000\000\000\000\044\000\000\000\
-\000\000\000\000\000\000\045\000\046\000\000\000\048\000\049\000\
-\000\000\000\000\000\000\051\000\015\000\016\000\017\000\018\000\
-\019\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\022\000\000\000\023\000\024\000\025\000\026\000\027\000\000\000\
-\000\000\028\000\000\000\000\000\000\000\030\000\031\000\032\000\
-\000\000\000\000\000\000\034\000\000\000\035\000\036\000\000\000\
-\000\000\000\000\000\000\000\000\038\000\000\000\000\000\000\000\
-\000\000\054\002\040\000\041\000\000\000\042\000\000\000\000\000\
-\007\000\008\000\009\000\000\000\000\000\000\000\010\000\011\000\
-\000\000\000\000\000\000\044\000\000\000\000\000\000\000\000\000\
-\045\000\046\000\000\000\048\000\049\000\000\000\000\000\000\000\
-\051\000\015\000\016\000\017\000\018\000\019\000\000\000\000\000\
-\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\022\000\000\000\023\000\
-\024\000\025\000\026\000\027\000\000\000\000\000\028\000\000\000\
-\000\000\000\000\030\000\031\000\032\000\000\000\000\000\000\000\
-\034\000\000\000\035\000\036\000\000\000\000\000\000\000\000\000\
-\000\000\038\000\000\000\000\000\000\000\000\000\000\000\040\000\
-\041\000\000\000\042\000\000\000\000\000\000\000\000\000\014\003\
-\007\000\008\000\009\000\000\000\000\000\016\003\010\000\011\000\
-\044\000\000\000\000\000\000\000\000\000\045\000\046\000\000\000\
-\048\000\049\000\000\000\000\000\000\000\051\000\000\000\000\000\
-\000\000\015\000\016\000\017\000\018\000\019\000\000\000\000\000\
-\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\022\000\000\000\023\000\
-\024\000\025\000\026\000\027\000\000\000\000\000\028\000\000\000\
-\000\000\000\000\030\000\031\000\032\000\000\000\000\000\000\000\
-\034\000\000\000\035\000\036\000\000\000\000\000\000\000\000\000\
-\000\000\038\000\000\000\000\000\000\000\000\000\000\000\040\000\
-\041\000\000\000\042\000\000\000\000\000\000\000\007\000\008\000\
-\009\000\000\000\000\000\000\000\010\000\011\000\000\000\000\000\
-\044\000\000\000\000\000\000\000\000\000\045\000\046\000\053\004\
-\048\000\049\000\000\000\000\000\000\000\051\000\000\000\015\000\
-\016\000\017\000\018\000\019\000\000\000\000\000\000\000\000\000\
-\020\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\022\000\000\000\023\000\024\000\025\000\
-\026\000\027\000\000\000\000\000\028\000\000\000\000\000\000\000\
-\030\000\031\000\032\000\000\000\000\000\000\000\034\000\000\000\
-\035\000\036\000\000\000\000\000\000\000\000\000\000\000\038\000\
-\000\000\000\000\000\000\000\000\000\000\040\000\041\000\000\000\
-\042\000\000\000\000\000\216\002\216\002\216\002\000\000\000\000\
-\000\000\216\002\216\002\000\000\000\000\000\000\044\000\000\000\
-\000\000\000\000\000\000\045\000\046\000\000\000\048\000\049\000\
-\216\002\000\000\000\000\051\000\216\002\216\002\216\002\216\002\
-\216\002\000\000\000\000\000\000\000\000\216\002\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\216\002\000\000\216\002\216\002\216\002\216\002\216\002\000\000\
-\000\000\216\002\000\000\000\000\000\000\216\002\216\002\216\002\
-\000\000\000\000\000\000\216\002\000\000\216\002\216\002\000\000\
-\000\000\000\000\000\000\000\000\216\002\000\000\000\000\000\000\
-\000\000\000\000\216\002\216\002\000\000\216\002\000\000\000\000\
-\007\000\008\000\009\000\000\000\000\000\000\000\010\000\011\000\
-\000\000\000\000\000\000\216\002\000\000\000\000\000\000\000\000\
-\216\002\216\002\000\000\216\002\216\002\000\000\000\000\000\000\
-\216\002\015\000\016\000\017\000\018\000\019\000\000\000\000\000\
-\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\022\000\000\000\023\000\
-\024\000\025\000\026\000\027\000\000\000\000\000\028\000\000\000\
-\000\000\000\000\030\000\031\000\032\000\000\000\000\000\000\000\
-\034\000\000\000\035\000\036\000\000\000\000\000\000\000\000\000\
-\000\000\038\000\000\000\000\000\000\000\000\000\000\000\040\000\
-\041\000\000\000\042\000\000\000\000\000\216\002\216\002\216\002\
-\000\000\000\000\000\000\216\002\216\002\000\000\000\000\000\000\
-\044\000\000\000\000\000\000\000\000\000\045\000\046\000\000\000\
-\048\000\049\000\000\000\000\000\000\000\051\000\216\002\216\002\
-\216\002\216\002\216\002\000\000\000\000\000\000\000\000\216\002\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\216\002\000\000\216\002\216\002\216\002\216\002\
-\216\002\000\000\000\000\216\002\000\000\000\000\000\000\216\002\
-\216\002\216\002\000\000\000\000\000\000\216\002\000\000\216\002\
-\216\002\000\000\000\000\000\000\000\000\000\000\216\002\000\000\
-\000\000\000\000\000\000\000\000\216\002\216\002\000\000\216\002\
-\000\000\000\000\214\002\214\002\214\002\000\000\000\000\000\000\
-\214\002\214\002\000\000\000\000\000\000\216\002\000\000\000\000\
-\000\000\000\000\216\002\216\002\000\000\216\002\216\002\000\000\
-\000\000\000\000\216\002\214\002\214\002\214\002\214\002\214\002\
-\000\000\000\000\000\000\000\000\214\002\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\214\002\
-\000\000\214\002\214\002\214\002\214\002\214\002\000\000\000\000\
-\214\002\000\000\000\000\000\000\214\002\214\002\214\002\000\000\
-\000\000\008\000\214\002\000\000\214\002\214\002\000\000\011\000\
-\000\000\147\003\000\000\214\002\229\001\000\000\000\000\000\000\
-\000\000\214\002\214\002\000\000\214\002\000\000\148\003\000\000\
-\000\000\015\000\016\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\214\002\000\000\000\000\000\000\000\000\214\002\
-\214\002\000\000\214\002\214\002\000\000\022\000\207\001\214\002\
-\139\000\000\000\140\000\141\000\000\000\000\000\028\000\000\000\
-\000\000\000\000\000\000\142\000\149\003\000\000\008\000\000\000\
-\000\000\000\000\144\000\000\000\011\000\000\000\228\001\000\000\
-\000\000\229\001\000\000\000\000\209\001\000\000\000\000\145\000\
-\000\000\000\000\000\000\148\003\210\001\000\000\015\000\016\000\
-\000\000\008\000\000\000\000\000\146\000\000\000\000\000\011\000\
-\044\000\189\002\000\000\211\001\000\000\045\000\000\000\000\000\
-\048\000\147\000\022\000\207\001\000\000\139\000\000\000\140\000\
-\141\000\015\000\016\000\028\000\000\000\000\000\000\000\000\000\
-\142\000\149\003\000\000\000\000\000\000\000\000\000\000\144\000\
-\000\000\000\000\000\000\000\000\000\000\022\000\207\001\000\000\
-\139\000\209\001\140\000\141\000\145\000\000\000\028\000\000\000\
-\000\000\210\001\000\000\142\000\190\002\000\000\000\000\000\000\
-\000\000\146\000\144\000\000\000\191\002\044\000\000\000\000\000\
-\211\001\000\000\045\000\000\000\209\001\048\000\147\000\145\000\
-\000\000\000\000\008\000\000\000\210\001\000\000\000\000\000\000\
-\011\000\000\000\124\005\000\000\146\000\000\000\000\000\000\000\
-\044\000\000\000\000\000\211\001\000\000\045\000\000\000\148\003\
-\048\000\147\000\015\000\016\000\000\000\008\000\000\000\000\000\
-\000\000\000\000\000\000\011\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\022\000\207\001\
-\000\000\139\000\000\000\140\000\141\000\015\000\016\000\028\000\
-\000\000\000\000\000\000\000\000\142\000\149\003\000\000\000\000\
-\000\000\000\000\000\000\144\000\000\000\000\000\000\000\000\000\
-\000\000\022\000\207\001\000\000\139\000\209\001\140\000\141\000\
-\145\000\000\000\028\000\000\000\000\000\210\001\000\000\142\000\
-\208\001\000\000\216\002\000\000\000\000\146\000\144\000\000\000\
-\216\002\044\000\000\000\000\000\211\001\000\000\045\000\000\000\
-\209\001\048\000\147\000\145\000\000\000\000\000\000\000\000\000\
-\210\001\000\000\216\002\216\002\000\000\000\000\000\000\000\000\
-\146\000\000\000\000\000\000\000\044\000\000\000\000\000\211\001\
-\000\000\045\000\000\000\000\000\048\000\147\000\216\002\216\002\
-\000\000\216\002\000\000\216\002\216\002\000\000\000\000\216\002\
-\000\000\000\000\000\000\000\000\216\002\216\002\000\000\000\000\
-\008\000\000\000\000\000\216\002\000\000\000\000\011\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\216\002\000\000\000\000\
-\216\002\000\000\000\000\000\000\000\000\216\002\137\000\000\000\
-\015\000\016\000\000\000\000\000\000\000\216\002\000\000\000\000\
-\000\000\216\002\000\000\000\000\216\002\000\000\216\002\000\000\
-\000\000\216\002\216\002\000\000\022\000\000\000\138\000\139\000\
-\000\000\140\000\141\000\000\000\000\000\028\000\000\000\000\000\
-\000\000\000\000\142\000\143\000\000\000\000\000\000\000\008\000\
-\000\000\144\000\000\000\162\001\000\000\011\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\145\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\137\000\194\000\015\000\
-\016\000\000\000\000\000\146\000\000\000\000\000\000\000\044\000\
-\000\000\000\000\000\000\000\000\045\000\000\000\000\000\048\000\
-\147\000\000\000\000\000\022\000\000\000\138\000\139\000\000\000\
-\140\000\141\000\000\000\000\000\028\000\000\000\000\000\000\000\
-\000\000\142\000\143\000\000\000\008\000\000\000\000\000\000\000\
-\144\000\000\000\011\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\008\000\009\000\000\000\000\000\145\000\010\000\011\000\
-\000\000\000\000\137\000\000\000\015\000\016\000\000\000\000\000\
-\000\000\000\000\146\000\000\000\000\000\000\000\044\000\000\000\
-\000\000\015\000\016\000\045\000\000\000\000\000\048\000\147\000\
-\022\000\000\000\138\000\139\000\000\000\140\000\141\000\000\000\
-\000\000\028\000\000\000\000\000\000\000\022\000\142\000\143\000\
-\024\000\025\000\026\000\027\000\000\000\144\000\028\000\000\000\
-\216\002\000\000\216\002\182\000\032\000\000\000\216\002\000\000\
-\000\000\000\000\145\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\090\003\000\000\000\000\000\000\216\002\146\000\
-\216\002\216\002\042\000\044\000\000\000\000\000\000\000\000\000\
-\045\000\000\000\000\000\048\000\147\000\000\000\000\000\000\000\
-\044\000\000\000\000\000\000\000\216\002\045\000\216\002\216\002\
-\048\000\216\002\216\002\000\000\000\000\216\002\000\000\000\000\
-\000\000\000\000\216\002\216\002\000\000\008\000\000\000\000\000\
-\000\000\216\002\000\000\011\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\216\002\000\000\
-\000\000\000\000\000\000\137\000\000\000\015\000\016\000\000\000\
-\000\000\000\000\000\000\216\002\000\000\000\000\000\000\216\002\
-\000\000\000\000\000\000\000\000\216\002\000\000\000\000\216\002\
-\216\002\022\000\000\000\138\000\139\000\000\000\140\000\141\000\
-\000\000\000\000\028\000\000\000\000\000\000\000\000\000\142\000\
-\143\000\000\000\216\002\000\000\000\000\000\000\144\000\000\000\
-\216\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\145\000\000\000\000\000\000\000\000\000\
-\216\002\000\000\216\002\216\002\000\000\216\002\000\000\000\000\
-\146\000\000\000\000\000\216\002\044\000\000\000\000\000\000\000\
-\000\000\045\000\000\000\000\000\048\000\147\000\216\002\000\000\
-\216\002\216\002\000\000\216\002\216\002\216\002\216\002\216\002\
-\000\000\000\000\000\000\000\000\216\002\216\002\000\000\000\000\
-\000\000\000\000\000\000\216\002\000\000\000\000\000\000\000\000\
-\000\000\216\002\000\000\216\002\216\002\000\000\216\002\216\002\
-\216\002\000\000\216\002\000\000\000\000\000\000\000\000\216\002\
-\216\002\000\000\148\002\000\000\000\000\216\002\216\002\000\000\
-\148\002\216\002\000\000\000\000\000\000\000\000\216\002\000\000\
-\000\000\216\002\216\002\216\002\000\000\000\000\000\000\000\000\
-\148\002\000\000\148\002\148\002\216\002\129\002\000\000\000\000\
-\216\002\000\000\000\000\129\002\216\002\000\000\000\000\000\000\
-\000\000\216\002\000\000\000\000\216\002\216\002\148\002\000\000\
-\148\002\148\002\000\000\148\002\148\002\129\002\129\002\148\002\
-\000\000\000\000\000\000\000\000\148\002\148\002\000\000\000\000\
-\000\000\000\000\000\000\148\002\000\000\000\000\000\000\000\000\
-\000\000\129\002\000\000\129\002\129\002\000\000\129\002\129\002\
-\148\002\000\000\129\002\000\000\000\000\000\000\000\000\129\002\
-\129\002\000\000\214\002\000\000\000\000\148\002\129\002\000\000\
-\214\002\148\002\000\000\000\000\000\000\000\000\148\002\000\000\
-\000\000\148\002\148\002\129\002\000\000\000\000\000\000\000\000\
-\000\000\000\000\214\002\214\002\000\000\008\000\000\000\000\000\
-\129\002\000\000\000\000\011\000\129\002\000\000\000\000\000\000\
-\000\000\129\002\000\000\000\000\129\002\129\002\214\002\000\000\
-\214\002\214\002\000\000\214\002\214\002\015\000\016\000\214\002\
-\000\000\000\000\000\000\000\000\214\002\214\002\000\000\000\000\
-\000\000\000\000\000\000\214\002\000\000\000\000\000\000\000\000\
-\000\000\022\000\000\000\000\000\139\000\000\000\140\000\141\000\
-\214\002\000\000\028\000\000\000\000\000\000\000\000\000\142\000\
-\143\000\000\000\216\002\000\000\000\000\214\002\144\000\000\000\
-\216\002\214\002\000\000\000\000\000\000\000\000\214\002\000\000\
-\000\000\214\002\214\002\145\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\216\002\216\002\000\000\000\000\000\000\000\000\
-\146\000\000\000\000\000\000\000\044\000\000\000\000\000\000\000\
-\000\000\045\000\000\000\000\000\048\000\147\000\216\002\000\000\
-\000\000\216\002\000\000\216\002\216\002\000\000\000\000\216\002\
-\000\000\000\000\000\000\000\000\216\002\216\002\000\000\008\000\
-\009\000\000\000\000\000\216\002\010\000\011\000\008\000\009\000\
-\000\000\000\000\000\000\010\000\011\000\000\000\000\000\087\001\
-\216\002\000\000\000\000\000\000\000\000\000\000\000\000\015\000\
-\016\000\000\000\000\000\000\000\000\000\216\002\015\000\016\000\
-\000\000\216\002\000\000\000\000\000\000\000\000\216\002\000\000\
-\088\001\216\002\216\002\022\000\089\001\000\000\024\000\025\000\
-\026\000\027\000\022\000\089\001\028\000\024\000\025\000\026\000\
-\027\000\142\000\032\000\028\000\000\000\000\000\000\000\000\000\
-\142\000\032\000\000\000\000\000\000\000\000\000\000\000\216\002\
-\216\002\000\000\090\001\000\000\216\002\216\002\000\000\000\000\
-\042\000\090\001\091\001\000\000\000\000\000\000\000\000\042\000\
-\000\000\091\001\092\001\093\001\000\000\000\000\044\000\216\002\
-\216\002\094\001\000\000\045\000\000\000\044\000\048\000\000\000\
-\094\001\000\000\045\000\000\000\000\000\048\000\000\000\000\000\
-\000\000\000\000\000\000\216\002\000\000\000\000\216\002\216\002\
-\216\002\216\002\000\000\000\000\216\002\000\000\000\000\000\000\
-\000\000\216\002\216\002\000\000\000\000\180\004\049\001\050\001\
-\000\000\000\000\000\000\000\000\000\000\000\000\051\001\000\000\
-\000\000\000\000\000\000\181\004\052\001\053\001\182\004\054\001\
-\216\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\055\001\000\000\000\000\000\000\000\000\000\000\216\002\000\000\
-\000\000\056\001\000\000\216\002\000\000\000\000\216\002\057\001\
-\058\001\059\001\060\001\061\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\062\001\000\000\167\002\000\000\000\000\162\000\
-\000\000\000\000\000\000\000\000\063\001\064\001\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\065\001\
-\066\001\067\001\068\001\069\001\000\000\001\001\002\001\003\001\
-\000\000\000\000\000\000\183\004\164\001\000\000\005\001\000\000\
-\000\000\071\001\000\000\000\000\112\000\007\001\113\000\114\000\
-\028\000\000\000\115\000\000\000\000\000\116\000\117\000\000\000\
-\008\001\000\000\000\000\000\000\000\000\000\000\000\000\134\001\
-\000\000\009\001\000\000\000\000\000\000\000\000\118\000\010\001\
-\011\001\012\001\013\001\014\001\015\001\000\000\119\000\120\000\
-\000\000\000\000\000\000\168\002\000\000\000\000\121\000\000\000\
-\000\000\000\000\016\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\122\000\123\000\173\002\166\001\000\000\174\002\
-\000\000\000\000\000\000\000\000\224\003\049\001\050\001\020\001\
-\021\001\175\002\169\001\024\001\170\001\051\001\000\000\000\000\
-\000\000\000\000\000\000\052\001\053\001\000\000\054\001\027\001\
-\000\000\028\001\000\000\000\000\000\000\000\000\000\000\055\001\
-\000\000\000\000\000\000\000\000\226\003\049\001\050\001\000\000\
-\056\001\000\000\000\000\000\000\000\000\051\001\057\001\058\001\
-\059\001\060\001\061\001\052\001\053\001\000\000\054\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\055\001\
-\000\000\062\001\000\000\000\000\000\000\000\000\162\000\000\000\
-\056\001\000\000\000\000\063\001\064\001\000\000\057\001\058\001\
-\059\001\060\001\061\001\000\000\000\000\000\000\065\001\066\001\
-\067\001\068\001\069\001\000\000\000\000\000\000\000\000\225\003\
-\000\000\062\001\000\000\000\000\000\000\000\000\162\000\000\000\
-\071\001\000\000\000\000\063\001\064\001\000\000\000\000\000\000\
-\000\000\000\000\228\003\049\001\050\001\000\000\065\001\066\001\
-\067\001\068\001\069\001\051\001\000\000\000\000\000\000\000\000\
-\227\003\052\001\053\001\000\000\054\001\000\000\000\000\000\000\
-\071\001\000\000\000\000\000\000\000\000\055\001\000\000\000\000\
-\000\000\000\000\224\003\049\001\050\001\000\000\056\001\000\000\
-\000\000\000\000\000\000\051\001\057\001\058\001\059\001\060\001\
-\061\001\052\001\053\001\000\000\054\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\055\001\000\000\062\001\
-\000\000\000\000\000\000\000\000\162\000\000\000\056\001\000\000\
-\000\000\063\001\064\001\000\000\057\001\058\001\059\001\060\001\
-\061\001\000\000\000\000\000\000\065\001\066\001\067\001\068\001\
-\069\001\000\000\000\000\000\000\000\000\000\000\000\000\062\001\
-\229\003\000\000\000\000\000\000\162\000\000\000\071\001\000\000\
-\000\000\063\001\064\001\000\000\000\000\000\000\000\000\000\000\
-\226\003\049\001\050\001\000\000\065\001\066\001\067\001\068\001\
-\069\001\051\001\000\000\000\000\000\000\023\004\000\000\052\001\
-\053\001\000\000\054\001\000\000\000\000\000\000\071\001\000\000\
-\000\000\000\000\000\000\055\001\000\000\000\000\000\000\000\000\
-\228\003\049\001\050\001\000\000\056\001\000\000\000\000\000\000\
-\000\000\051\001\057\001\058\001\059\001\060\001\061\001\052\001\
-\053\001\000\000\054\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\055\001\000\000\062\001\000\000\000\000\
-\000\000\000\000\162\000\000\000\056\001\000\000\000\000\063\001\
-\064\001\000\000\057\001\058\001\059\001\060\001\061\001\000\000\
-\000\000\000\000\065\001\066\001\067\001\068\001\069\001\000\000\
-\000\000\000\000\000\000\000\000\024\004\062\001\000\000\000\000\
-\000\000\000\000\162\000\000\000\071\001\000\000\000\000\063\001\
-\064\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\065\001\066\001\067\001\068\001\069\001\226\004\
-\049\001\050\001\000\000\000\000\000\000\000\000\025\004\000\000\
-\051\001\000\000\000\000\000\000\071\001\000\000\052\001\053\001\
-\000\000\054\001\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\055\001\000\000\000\000\000\000\000\000\228\004\
-\049\001\050\001\000\000\056\001\000\000\000\000\000\000\000\000\
-\051\001\057\001\058\001\059\001\060\001\061\001\052\001\053\001\
-\000\000\054\001\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\055\001\000\000\062\001\000\000\000\000\000\000\
-\000\000\162\000\000\000\056\001\000\000\000\000\063\001\064\001\
-\000\000\057\001\058\001\059\001\060\001\061\001\000\000\000\000\
-\000\000\065\001\066\001\067\001\068\001\069\001\000\000\000\000\
-\000\000\000\000\227\004\000\000\062\001\000\000\000\000\000\000\
-\000\000\162\000\000\000\071\001\000\000\000\000\063\001\064\001\
-\000\000\000\000\000\000\000\000\000\000\230\004\049\001\050\001\
-\000\000\065\001\066\001\067\001\068\001\069\001\051\001\000\000\
-\000\000\000\000\000\000\229\004\052\001\053\001\000\000\054\001\
-\000\000\000\000\000\000\071\001\000\000\000\000\000\000\000\000\
-\055\001\000\000\000\000\000\000\000\000\226\004\049\001\050\001\
-\000\000\056\001\000\000\000\000\000\000\000\000\051\001\057\001\
-\058\001\059\001\060\001\061\001\052\001\053\001\000\000\054\001\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\055\001\000\000\062\001\000\000\000\000\000\000\000\000\162\000\
-\000\000\056\001\000\000\000\000\063\001\064\001\000\000\057\001\
-\058\001\059\001\060\001\061\001\000\000\000\000\000\000\065\001\
-\066\001\067\001\068\001\069\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\062\001\231\004\000\000\000\000\000\000\162\000\
-\000\000\071\001\000\000\000\000\063\001\064\001\000\000\000\000\
-\000\000\000\000\000\000\228\004\049\001\050\001\000\000\065\001\
-\066\001\067\001\068\001\069\001\051\001\000\000\000\000\000\000\
-\249\004\000\000\052\001\053\001\000\000\054\001\000\000\000\000\
-\000\000\071\001\000\000\000\000\000\000\000\000\055\001\000\000\
-\000\000\000\000\000\000\230\004\049\001\050\001\000\000\056\001\
-\000\000\000\000\000\000\000\000\051\001\057\001\058\001\059\001\
-\060\001\061\001\052\001\053\001\000\000\054\001\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\055\001\000\000\
-\062\001\000\000\000\000\000\000\000\000\162\000\000\000\056\001\
-\000\000\000\000\063\001\064\001\000\000\057\001\058\001\059\001\
-\060\001\061\001\000\000\000\000\000\000\065\001\066\001\067\001\
-\068\001\069\001\000\000\000\000\000\000\000\000\000\000\250\004\
-\062\001\049\001\050\001\000\000\000\000\162\000\000\000\071\001\
-\000\000\051\001\063\001\064\001\000\000\000\000\000\000\052\001\
-\053\001\000\000\054\001\000\000\000\000\065\001\066\001\067\001\
-\068\001\069\001\000\000\055\001\000\000\000\000\000\000\000\000\
-\000\000\251\004\000\000\000\000\056\001\000\000\000\000\071\001\
-\000\000\000\000\057\001\058\001\059\001\060\001\061\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\062\001\000\000\000\000\
-\000\000\000\000\162\000\000\000\000\000\000\000\000\000\063\001\
-\064\001\049\001\050\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\051\001\065\001\066\001\067\001\068\001\069\001\052\001\
-\053\001\000\000\054\001\000\000\000\000\000\000\000\000\070\001\
-\000\000\057\004\000\000\055\001\071\001\000\000\000\000\000\000\
-\000\000\049\001\050\001\000\000\056\001\000\000\000\000\000\000\
-\000\000\051\001\057\001\058\001\059\001\060\001\061\001\052\001\
-\053\001\000\000\054\001\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\055\001\000\000\062\001\000\000\000\000\
-\000\000\000\000\162\000\000\000\056\001\000\000\000\000\063\001\
-\064\001\000\000\057\001\058\001\059\001\060\001\061\001\000\000\
-\000\000\000\000\065\001\066\001\067\001\068\001\069\001\000\000\
-\000\000\000\000\000\000\000\000\000\000\062\001\049\001\050\001\
-\000\000\000\000\162\000\000\000\071\001\000\000\051\001\063\001\
-\064\001\000\000\000\000\000\000\052\001\000\000\000\000\000\000\
-\000\000\000\000\065\001\066\001\067\001\068\001\069\001\000\000\
-\055\001\000\000\000\000\000\000\000\000\000\000\049\001\050\001\
-\000\000\056\001\000\000\000\000\071\001\000\000\000\000\057\001\
-\058\001\059\001\060\001\061\001\052\001\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\055\001\000\000\062\001\000\000\000\000\000\000\000\000\162\000\
-\000\000\056\001\000\000\000\000\063\001\064\001\000\000\057\001\
-\058\001\059\001\060\001\061\001\012\000\000\000\000\000\065\001\
-\066\001\067\001\068\001\069\001\000\000\000\000\000\000\000\000\
-\000\000\000\000\062\001\089\000\014\000\000\000\000\000\162\000\
-\000\000\071\001\000\000\000\000\063\001\064\001\000\000\000\000\
-\090\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\066\001\067\001\068\001\069\001\000\000\000\000\112\000\000\000\
-\113\000\114\000\028\000\029\000\115\000\000\000\000\000\116\000\
-\117\000\071\001\000\000\033\000\000\000\000\000\000\000\000\000\
-\000\000\091\000\000\000\000\000\000\000\000\000\000\000\039\000\
-\118\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\119\000\120\000\000\000\000\000\000\000\000\000\000\000\092\000\
-\121\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\093\000\122\000\123\000\050\000"
-
-let yycheck = "\003\000\
-\002\000\005\000\177\000\177\000\002\000\174\000\112\000\112\000\
-\255\000\185\000\115\000\008\000\112\000\139\000\105\001\061\002\
-\118\000\002\000\092\000\180\000\001\000\133\000\002\000\104\002\
-\233\002\221\001\104\002\114\000\002\000\002\003\104\000\002\000\
-\027\000\034\004\146\000\059\002\002\000\000\000\192\002\003\000\
-\150\001\002\000\002\000\196\000\116\003\198\000\001\000\245\003\
-\101\003\059\000\252\000\164\003\124\003\223\004\210\004\119\004\
-\009\000\008\001\203\004\000\000\198\002\000\000\043\000\121\001\
-\066\001\123\001\000\000\110\004\000\001\093\002\029\000\024\000\
-\019\001\229\002\033\000\027\001\214\004\090\001\022\001\006\001\
-\025\000\022\001\066\001\000\001\000\001\031\001\000\001\108\001\
-\043\000\042\000\092\000\178\000\094\001\000\001\092\000\079\001\
-\000\001\110\001\141\004\040\001\008\001\000\001\104\000\017\001\
-\059\000\037\001\104\000\092\000\112\000\029\001\027\001\115\000\
-\092\000\117\000\118\000\023\001\000\001\000\001\092\000\104\000\
-\067\001\092\000\030\001\120\000\104\000\078\000\092\000\080\000\
-\081\000\000\001\104\000\092\000\092\000\104\000\000\001\000\001\
-\140\000\141\000\104\000\143\000\029\005\092\001\094\001\104\000\
-\104\000\053\001\090\001\055\001\014\001\153\000\154\000\017\001\
-\034\005\117\000\036\003\012\004\022\001\065\001\201\004\066\001\
-\014\001\027\001\066\001\095\001\000\001\092\001\073\001\000\001\
-\000\001\073\001\115\000\004\000\176\000\177\000\091\001\091\001\
-\180\000\094\001\095\001\095\001\094\001\047\001\036\001\000\001\
-\000\001\000\001\019\001\094\001\088\005\000\001\094\001\104\001\
-\091\001\026\001\027\001\027\001\095\001\014\001\106\001\032\000\
-\017\001\109\001\000\001\162\000\163\000\024\001\008\001\091\001\
-\115\001\092\001\064\001\115\001\165\000\000\001\000\001\048\001\
-\049\001\087\001\008\001\000\001\000\001\037\001\000\001\094\001\
-\010\001\091\001\091\001\060\001\181\000\095\001\095\001\097\001\
-\098\001\055\003\067\001\068\001\154\001\070\001\003\001\026\005\
-\027\001\095\001\188\001\097\001\000\001\018\001\027\001\082\002\
-\035\005\115\001\132\003\133\005\093\001\000\000\070\004\109\001\
-\000\001\073\004\094\001\091\001\200\002\088\001\094\001\095\001\
-\161\001\114\001\163\001\000\001\109\001\000\001\000\001\185\005\
-\121\001\187\005\123\001\040\001\091\001\094\001\111\001\095\001\
-\095\001\130\001\131\001\094\001\000\001\112\001\105\001\133\001\
-\066\001\207\001\092\001\036\005\046\001\091\001\212\001\250\000\
-\145\001\252\000\106\005\101\002\000\001\241\002\092\001\149\001\
-\091\001\035\001\092\001\004\001\095\001\095\001\091\001\091\001\
-\201\005\094\001\095\001\000\001\094\001\000\001\000\001\092\001\
-\008\001\000\001\147\003\193\001\181\004\182\004\004\001\027\001\
-\025\001\059\001\008\001\000\001\031\001\023\002\064\001\065\001\
-\249\001\015\001\094\001\172\000\018\001\026\001\045\001\026\001\
-\074\001\000\001\179\000\046\001\230\003\000\001\094\001\000\001\
-\000\001\000\001\003\002\010\001\000\001\105\001\155\004\066\001\
-\000\001\094\001\010\001\094\001\221\004\000\001\114\001\004\001\
-\007\001\099\001\019\001\008\001\018\001\121\001\060\005\123\001\
-\092\001\026\001\015\001\109\001\000\001\018\001\130\001\131\001\
-\035\001\133\001\000\001\132\005\066\001\106\004\010\001\091\001\
-\089\001\090\001\000\001\095\001\093\001\145\001\000\001\096\001\
-\049\001\149\001\044\004\092\001\092\001\153\001\154\001\092\001\
-\059\001\092\001\092\001\060\001\247\002\064\001\065\001\094\001\
-\065\001\000\001\014\001\068\001\000\001\070\001\091\001\074\001\
-\067\001\243\001\027\001\010\001\015\001\066\001\178\001\179\001\
-\180\001\017\001\022\001\001\004\073\001\092\001\186\001\015\001\
-\095\001\130\001\131\001\015\001\092\001\092\001\092\001\095\001\
-\099\001\000\001\094\001\000\001\000\001\018\001\094\001\032\001\
-\018\001\092\001\109\001\207\001\208\001\040\003\111\001\040\001\
-\212\001\066\001\043\001\046\003\216\001\237\003\068\003\219\001\
-\092\001\074\005\017\001\095\001\113\001\000\001\092\001\027\001\
-\228\001\229\001\066\001\018\001\000\001\243\004\066\001\171\003\
-\094\001\188\001\018\001\004\001\094\001\070\001\066\001\243\001\
-\244\001\243\001\094\001\003\001\077\001\243\001\004\001\083\001\
-\065\001\253\001\008\001\094\001\101\002\092\001\000\000\003\002\
-\112\002\015\001\243\001\008\001\018\001\131\002\094\001\243\001\
-\228\001\229\001\014\002\113\002\114\002\243\001\011\002\092\001\
-\243\001\094\001\192\002\003\001\094\001\243\001\176\004\243\001\
-\000\001\030\001\243\001\243\001\091\001\043\005\091\001\091\001\
-\247\001\028\002\029\002\095\001\109\001\238\001\014\001\094\001\
-\014\001\017\001\022\001\000\001\135\003\092\001\022\001\094\001\
-\073\001\063\005\055\001\027\001\066\001\057\002\094\001\008\001\
-\091\001\233\002\233\002\233\002\065\001\217\004\019\001\091\001\
-\169\002\143\004\171\002\022\001\023\002\026\001\008\001\047\001\
-\000\001\026\002\014\001\000\001\167\003\030\001\082\002\004\001\
-\152\005\000\001\027\002\008\001\189\002\065\001\014\001\248\002\
-\002\001\014\001\015\001\048\001\030\001\018\001\027\001\054\002\
-\022\001\101\002\008\001\113\001\104\002\106\001\055\001\060\001\
-\109\001\079\001\110\002\111\002\065\001\113\002\114\002\068\001\
-\065\001\070\001\094\001\091\001\035\001\055\001\015\003\095\001\
-\017\003\097\001\098\001\127\002\121\002\065\001\036\001\065\001\
-\132\002\027\001\083\005\031\005\008\001\137\002\022\001\090\001\
-\022\001\065\001\066\001\115\001\059\001\066\001\042\005\147\002\
-\148\002\064\001\065\001\111\002\066\001\005\003\062\001\242\003\
-\066\001\106\001\111\001\074\001\109\001\244\002\249\003\047\001\
-\036\001\094\001\062\005\127\002\090\001\169\002\094\001\171\002\
-\106\001\094\001\001\003\109\001\176\002\137\002\027\001\035\001\
-\094\001\181\002\118\004\065\001\099\001\006\005\092\001\080\003\
-\006\005\189\002\190\002\019\001\192\002\035\001\109\001\182\003\
-\183\003\093\005\050\003\022\001\094\001\030\002\202\002\059\001\
-\008\001\027\001\052\003\052\003\000\001\065\001\000\000\000\001\
-\108\005\097\001\098\001\004\001\176\002\059\001\253\001\008\001\
-\092\001\049\001\064\003\065\001\201\002\039\003\015\001\253\001\
-\073\003\018\001\088\001\115\001\060\001\233\002\026\001\064\002\
-\065\002\152\003\152\003\057\005\068\001\059\005\070\001\179\004\
-\066\001\094\001\102\001\247\002\248\002\066\001\201\002\073\001\
-\094\001\109\001\112\001\111\001\073\001\255\002\000\001\195\004\
-\102\001\255\002\004\001\067\001\008\003\096\004\008\001\109\001\
-\010\001\111\001\004\001\094\001\014\001\015\001\008\001\008\001\
-\018\001\066\001\057\002\055\001\014\001\015\001\014\001\111\001\
-\018\001\027\001\003\001\057\002\064\001\150\005\151\005\000\001\
-\018\001\115\001\014\001\027\001\040\003\039\003\115\001\130\004\
-\236\004\039\003\046\003\014\001\008\003\094\001\207\003\044\003\
-\052\003\140\004\019\001\055\003\000\001\035\001\039\003\019\001\
-\027\001\026\001\000\001\039\003\064\003\090\001\047\001\060\003\
-\066\001\039\003\155\002\156\002\039\003\073\003\030\001\073\001\
-\066\001\039\003\067\001\079\003\112\001\059\001\039\003\039\003\
-\049\001\110\001\036\001\065\001\048\001\065\001\066\001\079\001\
-\177\002\091\001\092\001\060\001\094\001\095\001\215\005\055\001\
-\060\001\000\000\067\001\068\001\094\001\070\001\191\002\030\001\
-\068\001\065\001\070\001\072\000\079\001\055\001\000\001\113\001\
-\097\001\098\001\094\001\003\001\064\001\065\001\064\001\014\001\
-\102\001\014\001\064\001\065\001\064\001\129\003\044\004\109\001\
-\055\001\019\001\115\001\135\003\027\001\045\001\046\001\139\003\
-\026\001\102\000\065\001\000\000\022\001\095\001\111\001\147\003\
-\022\001\149\003\106\001\111\001\152\003\109\001\154\003\155\003\
-\156\003\058\004\200\005\159\003\160\003\097\001\048\001\049\001\
-\164\003\007\004\166\003\167\003\000\001\047\001\112\001\064\001\
-\065\001\109\001\060\001\083\001\065\001\066\001\178\003\139\003\
-\009\003\067\001\068\001\106\001\070\001\000\001\109\001\147\003\
-\079\001\189\003\035\004\065\001\100\001\022\003\095\004\014\001\
-\000\001\015\001\004\001\159\003\018\001\194\003\008\001\014\001\
-\019\001\037\001\074\001\207\003\027\001\015\001\000\001\026\001\
-\027\001\003\001\037\001\019\001\027\001\110\001\178\003\097\001\
-\098\001\027\001\026\001\013\001\014\001\111\001\064\001\017\001\
-\000\000\014\001\131\004\008\001\017\001\048\001\049\001\000\001\
-\026\001\027\001\028\001\029\001\108\001\064\001\242\003\105\001\
-\048\001\060\001\065\001\030\001\066\001\249\003\040\001\041\001\
-\067\001\068\001\065\001\070\001\060\001\001\004\000\001\097\001\
-\066\001\026\001\176\004\007\004\068\001\002\004\070\001\000\001\
-\012\004\135\004\060\001\109\001\055\001\063\001\000\001\065\001\
-\066\001\067\001\068\001\022\001\066\001\067\001\065\001\073\001\
-\074\001\147\001\019\001\073\001\022\001\000\001\080\001\035\004\
-\064\001\026\001\066\001\037\001\111\001\206\004\127\003\128\003\
-\044\004\045\004\092\001\075\001\094\001\049\004\096\001\111\001\
-\064\001\035\001\000\001\220\004\141\003\142\003\058\004\026\001\
-\049\001\014\001\108\001\148\003\010\001\111\001\065\001\106\001\
-\064\001\115\001\109\001\060\001\157\003\115\001\000\001\065\001\
-\064\001\059\001\243\004\068\001\067\005\070\001\064\001\065\001\
-\112\001\045\004\047\001\075\001\064\001\049\004\031\004\012\001\
-\074\001\019\001\090\001\095\004\096\004\109\001\098\004\028\001\
-\026\001\000\001\064\001\018\005\018\005\004\001\208\004\208\004\
-\108\004\008\001\031\001\010\001\208\004\109\001\110\001\014\001\
-\015\001\099\001\027\001\018\001\064\001\064\001\111\001\049\001\
-\112\001\064\001\100\001\109\001\027\001\050\001\130\004\131\004\
-\041\005\109\001\060\001\004\001\075\001\066\001\098\004\008\001\
-\140\004\067\001\068\001\143\004\070\001\074\001\015\001\109\001\
-\108\004\018\001\071\001\080\001\061\005\064\001\083\001\027\001\
-\037\001\066\001\027\001\159\004\053\001\064\001\055\001\084\001\
-\157\004\109\001\110\001\066\001\083\005\083\005\086\005\064\001\
-\065\001\112\001\073\001\094\001\176\004\035\001\064\001\040\001\
-\101\001\181\004\182\004\064\001\066\001\111\001\064\001\064\001\
-\064\001\189\004\109\001\110\001\091\001\092\001\066\001\094\001\
-\095\001\066\001\109\001\000\001\053\001\059\001\055\001\056\001\
-\090\001\066\001\109\001\065\001\208\004\209\004\210\004\088\001\
-\065\001\042\004\113\001\000\001\109\001\046\004\019\001\000\000\
-\082\002\221\004\051\004\223\004\110\001\026\001\022\001\109\001\
-\000\001\189\004\066\001\109\001\004\001\109\001\019\001\112\001\
-\008\001\073\001\010\001\068\004\069\004\026\001\014\001\064\001\
-\102\001\074\004\018\001\048\001\110\002\209\004\210\004\109\001\
-\027\001\064\001\254\004\027\001\109\001\035\001\094\001\060\001\
-\221\001\064\001\006\005\048\001\000\001\075\001\067\001\068\001\
-\027\001\070\001\099\004\067\001\016\005\035\001\018\005\060\001\
-\022\001\013\001\022\005\115\001\064\001\059\001\067\001\068\001\
-\064\001\070\001\064\001\065\001\109\001\238\001\026\001\066\001\
-\028\001\029\001\254\004\039\005\074\001\059\001\109\001\000\001\
-\004\001\073\001\112\001\065\001\008\001\041\001\109\001\066\001\
-\031\001\000\000\111\001\015\001\016\005\057\005\018\001\059\005\
-\018\001\230\002\022\005\091\001\092\001\099\001\094\001\095\001\
-\060\001\109\001\111\001\050\001\000\001\109\001\074\005\109\001\
-\068\001\246\002\027\002\039\005\037\001\250\002\074\001\083\005\
-\102\001\113\001\027\005\007\000\080\001\030\005\010\000\109\001\
-\177\004\013\000\014\000\027\001\000\000\017\000\018\000\019\000\
-\020\000\021\000\066\001\023\000\096\001\066\001\066\001\192\004\
-\193\004\037\001\030\000\066\001\025\003\113\005\034\000\064\001\
-\108\001\037\000\038\000\111\001\027\001\027\001\083\001\000\001\
-\124\005\086\002\046\000\047\000\083\001\247\002\050\000\051\000\
-\004\001\023\001\066\001\135\005\008\001\035\001\000\001\000\001\
-\081\005\082\005\091\001\084\005\085\005\066\001\018\001\108\001\
-\146\005\026\001\150\005\151\005\146\005\113\005\109\001\027\001\
-\156\005\157\005\019\001\066\001\066\001\059\001\083\001\031\001\
-\026\001\026\001\064\001\065\001\000\000\089\000\090\000\091\000\
-\000\001\093\000\066\001\135\005\074\001\071\001\040\003\179\005\
-\009\005\073\001\050\001\006\001\046\003\185\005\186\005\187\005\
-\049\001\004\001\084\001\191\005\005\000\008\001\066\001\022\001\
-\156\005\157\005\026\001\060\001\015\001\099\001\094\001\018\001\
-\166\003\125\000\064\001\068\001\066\001\070\001\004\001\109\001\
-\212\005\022\001\008\001\215\005\000\000\137\000\138\000\179\005\
-\047\001\221\005\222\005\115\001\018\001\095\001\186\005\189\003\
-\064\001\149\000\088\001\191\005\055\001\027\001\057\001\058\001\
-\059\001\000\001\061\001\075\001\000\001\064\001\065\001\022\001\
-\164\000\053\001\000\001\055\001\189\005\078\005\111\001\066\001\
-\212\005\173\000\112\001\091\001\064\001\065\001\199\005\019\001\
-\022\001\221\005\222\005\026\001\093\001\019\001\026\001\090\001\
-\047\001\210\005\211\005\232\002\026\001\135\003\097\001\004\001\
-\027\001\000\001\000\001\008\001\109\001\053\001\054\001\055\001\
-\056\001\047\001\109\001\110\001\048\001\000\000\251\002\120\005\
-\064\001\065\001\048\001\000\003\093\001\000\001\027\001\128\005\
-\060\001\109\001\164\003\026\001\026\001\167\003\060\001\067\001\
-\068\001\000\001\070\001\094\001\109\001\004\001\068\001\018\001\
-\070\001\008\001\023\003\010\001\022\001\016\001\095\001\014\001\
-\015\001\004\001\109\001\140\000\141\000\008\001\159\005\004\001\
-\027\001\253\000\254\000\008\001\027\001\109\001\040\001\018\001\
-\153\000\154\000\015\001\091\001\049\003\018\001\095\001\095\001\
-\027\001\178\005\000\001\111\001\000\001\065\001\027\001\019\001\
-\004\001\111\001\008\001\071\001\008\001\022\001\010\001\176\000\
-\064\001\065\001\014\001\000\001\065\001\033\001\018\001\071\001\
-\084\001\037\001\093\001\066\001\073\001\010\001\006\001\027\001\
-\242\003\000\001\073\001\014\001\084\001\214\005\017\001\249\003\
-\004\001\094\001\090\001\010\001\008\001\066\001\065\001\053\001\
-\027\001\055\001\014\001\015\001\091\001\092\001\018\001\094\001\
-\095\001\077\001\012\004\065\001\113\003\073\001\110\001\053\001\
-\076\001\055\001\053\001\079\001\055\001\081\001\066\001\083\001\
-\064\001\065\001\113\001\065\001\000\001\073\001\065\001\055\001\
-\004\001\057\001\058\001\059\001\008\001\061\001\010\001\003\001\
-\064\001\065\001\014\001\065\001\066\001\067\001\018\001\091\001\
-\092\001\055\001\094\001\095\001\112\001\059\001\066\001\027\001\
-\116\001\063\001\064\001\053\001\054\001\055\001\056\001\064\001\
-\065\001\000\000\090\001\168\003\169\003\113\001\064\001\065\001\
-\078\001\097\001\134\001\135\001\000\001\064\001\053\001\003\001\
-\055\001\016\001\055\001\184\003\064\001\109\001\110\001\022\001\
-\227\001\013\001\065\001\064\001\027\001\092\001\096\004\234\001\
-\197\003\053\001\013\001\055\001\160\001\073\001\026\001\109\001\
-\028\001\029\001\008\001\167\001\000\001\065\001\014\001\171\001\
-\213\003\028\001\029\001\109\001\040\001\041\001\010\001\091\001\
-\092\001\095\001\094\001\095\001\184\001\185\001\041\001\065\001\
-\130\004\189\001\036\001\191\001\064\001\065\001\073\001\073\001\
-\060\001\014\001\140\004\063\001\022\001\113\001\109\001\244\003\
-\068\001\060\001\206\001\090\001\063\001\000\001\074\001\022\001\
-\003\001\068\001\065\001\066\001\080\001\159\004\218\001\074\001\
-\220\001\221\001\013\001\066\001\067\001\080\001\017\001\014\001\
-\092\001\064\001\065\001\022\001\096\001\210\001\211\001\026\001\
-\027\001\028\001\029\001\181\004\182\004\096\001\095\001\008\001\
-\108\001\130\001\131\001\111\001\000\000\000\001\041\001\251\001\
-\037\004\108\001\095\001\055\001\111\001\004\001\023\001\059\001\
-\153\001\008\001\112\001\063\001\064\001\030\001\092\001\103\001\
-\015\001\060\001\014\001\018\001\063\001\022\001\065\001\066\001\
-\067\001\068\001\078\001\221\004\027\001\223\004\073\001\074\001\
-\027\001\178\001\179\001\180\001\053\001\080\001\055\001\092\001\
-\091\001\186\001\092\001\237\004\238\004\109\001\000\000\092\001\
-\065\001\092\001\094\001\094\001\055\001\096\001\057\001\058\001\
-\059\001\109\001\061\001\094\001\092\001\064\001\065\001\014\001\
-\101\004\108\001\103\004\066\001\111\001\115\001\020\001\216\001\
-\115\001\109\001\115\001\064\001\065\001\046\001\081\001\109\001\
-\109\001\062\001\071\001\108\001\002\001\081\002\089\001\090\001\
-\084\002\106\001\086\002\109\001\109\001\109\001\097\001\084\001\
-\073\001\073\001\100\001\244\001\137\004\090\001\027\001\109\001\
-\015\001\142\004\109\001\110\001\001\000\002\000\003\000\004\000\
-\005\000\092\001\055\001\000\001\094\001\064\001\064\001\008\001\
-\109\001\110\001\065\001\109\001\040\001\014\002\001\001\002\001\
-\124\002\000\001\167\004\014\001\018\001\004\001\009\001\062\001\
-\074\005\008\001\062\001\010\001\015\001\016\001\062\001\014\001\
-\092\001\027\001\142\002\064\001\144\002\094\001\146\002\079\001\
-\027\001\014\001\150\002\014\001\027\001\006\001\094\001\073\001\
-\109\001\036\001\199\004\200\004\095\001\064\001\075\001\042\001\
-\043\001\044\001\045\001\046\001\073\001\111\005\022\001\094\001\
-\172\002\092\001\014\001\073\001\027\001\218\004\006\001\040\001\
-\008\001\222\004\061\001\094\001\027\001\014\001\027\001\066\001\
-\021\001\086\001\064\001\062\001\071\001\072\001\194\002\062\001\
-\062\001\003\001\073\001\199\002\200\002\014\001\062\001\082\001\
-\083\001\084\001\085\001\086\001\062\001\086\001\210\002\095\001\
-\212\002\027\001\090\001\073\001\091\001\092\001\003\005\094\001\
-\095\001\100\001\091\001\223\002\224\002\027\001\094\001\055\001\
-\101\001\057\001\058\001\059\001\094\001\061\001\234\002\094\001\
-\064\001\065\001\113\001\132\002\088\001\241\002\027\001\185\005\
-\094\001\187\005\014\001\020\001\000\001\015\001\022\001\003\001\
-\252\002\053\001\147\002\148\002\094\001\008\001\043\005\062\001\
-\080\001\013\001\090\001\062\001\092\001\062\001\051\005\094\001\
-\112\001\097\001\112\001\094\001\088\001\065\001\026\001\019\003\
-\028\001\029\001\063\005\021\001\091\001\109\001\110\001\095\001\
-\094\001\014\001\014\001\014\001\181\002\041\001\014\001\027\001\
-\027\001\037\003\019\001\091\001\022\001\112\001\000\001\088\001\
-\014\001\003\001\014\001\014\001\014\001\000\000\000\000\008\001\
-\060\001\092\001\065\001\013\001\092\001\036\001\109\001\017\001\
-\068\001\036\001\062\003\109\001\022\001\065\003\074\001\067\003\
-\026\001\027\001\028\001\029\001\080\001\005\000\006\001\036\001\
-\008\001\064\001\078\003\092\001\092\001\090\001\082\003\041\001\
-\092\001\040\001\064\001\036\001\096\001\089\003\094\001\053\001\
-\024\000\093\003\053\001\064\001\091\001\026\003\000\000\064\001\
-\108\001\064\001\060\001\111\001\064\001\063\001\036\003\065\001\
-\066\001\067\001\068\001\111\003\064\001\064\001\114\003\073\001\
-\074\001\064\001\118\003\186\005\254\004\111\005\080\001\055\001\
-\187\002\057\001\058\001\059\001\120\003\061\001\171\005\026\002\
-\064\001\065\001\092\001\131\002\094\001\000\001\096\001\018\005\
-\096\001\094\001\129\003\143\003\187\001\057\002\063\002\141\000\
-\183\001\166\004\108\001\212\003\155\004\111\001\195\005\196\005\
-\171\002\115\001\090\001\145\001\108\001\006\005\203\005\243\004\
-\255\255\097\001\043\005\136\004\255\255\255\255\170\003\171\003\
-\255\255\255\255\255\255\255\255\255\255\109\001\110\001\220\005\
-\180\003\181\003\255\255\255\255\255\255\015\001\079\003\255\255\
-\255\255\121\000\255\255\255\255\055\001\255\255\057\001\058\001\
-\059\001\197\003\061\001\255\255\255\255\064\001\065\001\255\255\
-\255\255\255\255\255\255\139\000\140\000\141\000\255\255\143\000\
-\064\001\065\001\044\001\045\001\046\001\255\255\081\001\071\001\
-\255\255\153\000\154\000\255\255\255\255\077\001\089\001\090\001\
-\255\255\255\255\255\255\255\255\084\001\233\003\097\001\235\003\
-\129\003\255\255\090\001\255\255\255\255\071\001\072\001\243\003\
-\176\000\177\000\109\001\110\001\180\000\255\255\255\255\255\255\
-\252\003\083\001\084\001\085\001\086\001\109\001\110\001\255\255\
-\255\255\154\003\155\003\156\003\255\255\009\004\255\255\160\003\
-\255\255\255\255\100\001\255\255\255\255\166\003\255\255\255\255\
-\255\255\255\255\255\255\007\000\255\255\255\255\010\000\255\255\
-\255\255\013\000\014\000\255\255\255\255\017\000\018\000\019\000\
-\020\000\021\000\255\255\023\000\189\003\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\034\000\255\255\
-\255\255\037\000\038\000\255\255\255\255\255\255\255\255\255\255\
-\255\255\061\004\046\000\047\000\064\004\255\255\050\000\051\000\
-\055\001\255\255\057\001\058\001\059\001\255\255\061\001\255\255\
-\255\255\064\001\065\001\255\255\255\255\081\004\255\255\083\004\
-\255\255\085\004\255\255\087\004\088\004\255\255\255\255\255\255\
-\092\004\255\255\255\255\255\255\255\255\097\004\000\001\255\255\
-\100\004\003\001\102\004\090\001\255\255\089\000\090\000\091\000\
-\255\255\093\000\097\001\013\001\014\001\255\255\255\255\017\001\
-\255\255\255\255\118\004\255\255\255\255\255\255\109\001\110\001\
-\026\001\027\001\028\001\029\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\013\001\137\004\040\001\041\001\
-\255\255\255\255\142\004\255\255\255\255\255\255\255\255\255\255\
-\255\255\149\004\255\255\028\001\029\001\137\000\138\000\087\001\
-\255\255\255\255\060\001\255\255\255\255\063\001\255\255\255\255\
-\041\001\067\001\068\001\255\255\255\255\255\255\170\004\073\001\
-\074\001\255\255\174\004\255\255\255\255\255\255\080\001\179\004\
-\255\255\255\255\255\255\060\001\255\255\255\255\255\255\255\255\
-\255\255\173\000\092\001\068\001\094\001\255\255\096\001\195\004\
-\196\004\074\001\198\004\255\255\255\255\255\255\255\255\080\001\
-\255\255\255\255\108\001\000\001\255\255\111\001\255\255\255\255\
-\212\004\115\001\255\255\255\255\255\255\255\255\150\001\096\001\
-\255\255\153\001\154\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\108\001\255\255\255\255\111\001\235\004\
-\236\004\255\255\255\255\255\255\255\255\255\255\242\004\255\255\
-\255\255\255\255\178\001\179\001\180\001\255\255\255\255\255\255\
-\255\255\255\255\186\001\255\255\255\255\001\005\255\255\003\005\
-\255\255\193\001\055\001\255\255\057\001\058\001\059\001\255\255\
-\061\001\253\000\254\000\064\001\065\001\017\005\255\255\207\001\
-\208\001\255\255\255\255\255\255\212\001\255\255\255\255\255\255\
-\216\001\000\000\255\255\219\001\081\001\033\005\255\255\019\001\
-\255\255\255\255\038\005\227\001\089\001\090\001\255\255\255\255\
-\255\255\255\255\234\001\255\255\097\001\033\001\000\000\051\005\
-\255\255\037\001\255\255\255\255\244\001\255\255\255\255\108\001\
-\109\001\110\001\255\255\255\255\255\255\253\001\255\255\255\255\
-\023\001\255\255\255\255\003\002\072\005\255\255\255\255\255\255\
-\255\255\077\005\255\255\255\255\080\005\036\001\014\002\255\255\
-\255\255\017\002\255\255\087\005\255\255\255\255\255\255\091\005\
-\255\255\255\255\026\002\095\005\255\255\255\255\255\255\255\255\
-\055\001\255\255\057\001\058\001\059\001\255\255\061\001\255\255\
-\255\255\064\001\065\001\255\255\112\005\255\255\255\255\005\000\
-\255\255\255\255\255\255\009\000\255\255\255\255\255\255\255\255\
-\255\255\057\002\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\024\000\090\001\255\255\137\005\138\005\255\255\
-\255\255\255\255\097\001\143\005\255\255\255\255\255\255\147\005\
-\255\255\255\255\134\001\255\255\042\000\153\005\109\001\110\001\
-\255\255\255\255\255\255\255\255\255\255\161\005\162\005\255\255\
-\255\255\255\255\255\255\167\005\168\005\169\005\170\005\255\255\
-\005\000\006\001\007\001\255\255\255\255\015\001\011\001\012\001\
-\180\005\181\005\255\255\167\001\255\255\255\255\255\255\255\255\
-\078\000\255\255\080\000\081\000\255\255\193\005\194\005\255\255\
-\196\005\030\001\031\001\131\002\132\002\255\255\255\255\255\255\
-\204\005\043\001\044\001\045\001\046\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\147\002\148\002\050\001\218\005\000\000\
-\053\001\054\001\055\001\056\001\224\005\225\005\059\001\255\255\
-\066\001\255\255\255\255\064\001\065\001\071\001\072\001\255\255\
-\255\255\255\255\170\002\255\255\255\255\255\255\255\255\255\255\
-\255\255\083\001\084\001\085\001\086\001\181\002\140\000\141\000\
-\255\255\143\000\087\001\255\255\255\255\255\255\190\002\255\255\
-\192\002\255\255\100\001\153\000\154\000\255\255\255\255\251\001\
-\101\001\255\255\202\002\255\255\255\255\106\001\255\255\165\000\
-\109\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\000\001\176\000\177\000\003\001\255\255\255\255\181\000\
-\255\255\255\255\255\255\255\255\255\255\255\255\013\001\231\002\
-\255\255\233\002\017\001\255\255\255\255\255\255\000\001\140\000\
-\141\000\003\001\143\000\026\001\027\001\028\001\029\001\255\255\
-\248\002\255\255\255\255\013\001\153\000\154\000\255\255\255\255\
-\255\255\255\255\041\001\255\255\255\255\255\255\255\255\255\255\
-\026\001\255\255\028\001\029\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\175\000\176\000\177\000\060\001\040\001\041\001\
-\063\001\255\255\255\255\066\001\067\001\068\001\255\255\255\255\
-\255\255\005\000\073\001\074\001\255\255\009\000\255\255\255\255\
-\255\255\080\001\060\001\255\255\255\255\063\001\004\001\047\003\
-\255\255\067\001\068\001\255\255\024\000\092\001\255\255\094\001\
-\074\001\096\001\255\255\255\255\255\255\255\255\080\001\255\255\
-\255\255\255\255\255\255\025\001\068\003\108\001\042\000\255\255\
-\111\001\255\255\092\001\255\255\115\001\255\255\096\001\079\003\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\108\001\255\255\255\255\111\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\078\000\255\255\080\000\081\000\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\129\003\255\255\089\001\090\001\255\255\255\255\093\001\
-\255\255\000\000\096\001\255\255\112\000\042\001\255\255\255\255\
-\255\255\255\255\255\255\048\001\255\255\149\003\255\255\000\001\
-\152\003\255\255\154\003\155\003\156\003\255\255\255\255\008\001\
-\160\003\255\255\255\255\255\255\013\001\255\255\166\003\255\255\
-\140\000\141\000\255\255\143\000\255\255\255\255\255\255\255\255\
-\255\255\026\001\255\255\028\001\029\001\153\000\154\000\255\255\
-\255\255\255\255\255\255\255\255\255\255\189\003\255\255\255\255\
-\041\001\165\000\255\255\153\001\154\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\176\000\177\000\255\255\207\003\
-\000\001\181\000\255\255\060\001\255\255\255\255\063\001\255\255\
-\255\255\066\001\067\001\068\001\178\001\179\001\180\001\019\003\
-\255\255\074\001\255\255\255\255\186\001\255\255\255\255\080\001\
-\255\255\255\255\255\255\255\255\236\003\255\255\255\255\255\255\
-\255\255\255\255\255\255\092\001\255\255\255\255\255\255\096\001\
-\255\255\207\001\208\001\255\255\153\001\154\001\212\001\255\255\
-\255\255\255\255\216\001\108\001\255\255\255\255\111\001\055\001\
-\255\255\057\001\058\001\059\001\255\255\061\001\255\255\255\255\
-\064\001\065\001\255\255\255\255\177\001\178\001\179\001\180\001\
-\255\255\008\001\255\255\255\255\255\255\186\001\244\001\255\255\
-\004\001\081\001\255\255\255\255\255\255\255\255\255\255\253\001\
-\023\001\089\001\090\001\000\000\044\004\255\255\255\255\030\001\
-\255\255\097\001\207\001\208\001\255\255\025\001\255\255\212\001\
-\014\002\255\255\058\004\216\001\255\255\109\001\110\001\255\255\
-\255\255\255\255\255\255\255\255\026\002\226\001\255\255\255\255\
-\055\001\000\000\057\001\058\001\059\001\255\255\061\001\255\255\
-\255\255\064\001\065\001\255\255\255\255\255\255\255\255\244\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\095\004\
-\253\001\255\255\081\001\057\002\255\255\255\255\255\255\255\255\
-\255\255\088\001\089\001\090\001\255\255\255\255\255\255\255\255\
-\255\255\014\002\097\001\255\255\255\255\089\001\090\001\255\255\
-\255\255\093\001\005\000\106\001\096\001\255\255\109\001\110\001\
-\255\255\255\255\255\255\131\004\255\255\255\255\255\255\135\004\
-\255\255\000\001\255\255\255\255\003\001\255\255\114\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\121\001\013\001\123\001\
-\255\255\255\255\255\255\255\255\057\002\255\255\255\255\255\255\
-\255\255\255\255\255\255\026\001\255\255\028\001\029\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\132\002\255\255\
-\176\004\040\001\041\001\255\255\255\255\153\001\154\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\147\002\148\002\255\255\
-\255\255\255\255\255\255\255\255\255\255\060\001\255\255\255\255\
-\063\001\255\255\255\255\255\255\067\001\068\001\178\001\179\001\
-\180\001\255\255\255\255\074\001\170\002\255\255\186\001\255\255\
-\255\255\080\001\255\255\255\255\255\255\255\255\255\255\181\002\
-\255\255\255\255\255\255\255\255\255\255\092\001\255\255\132\002\
-\190\002\096\001\192\002\207\001\208\001\255\255\255\255\255\255\
-\212\001\255\255\255\255\255\255\216\001\108\001\147\002\148\002\
-\111\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\140\000\141\000\255\255\143\000\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\153\000\154\000\
-\244\001\255\255\018\005\233\002\255\255\255\255\255\255\255\255\
-\181\002\253\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\190\002\255\255\192\002\255\255\176\000\177\000\255\255\
-\255\255\255\255\014\002\000\001\255\255\002\001\003\001\004\001\
-\255\255\255\255\255\255\008\001\255\255\255\255\026\002\255\255\
-\013\001\255\255\255\255\255\255\017\001\018\001\019\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\026\001\027\001\028\001\
-\029\001\000\001\255\255\255\255\233\002\255\255\255\255\036\001\
-\255\255\255\255\255\255\083\005\041\001\057\002\013\001\255\255\
-\255\255\255\255\255\255\048\001\049\001\000\000\094\005\255\255\
-\255\255\255\255\255\255\026\001\255\255\028\001\029\001\060\001\
-\255\255\255\255\063\001\064\001\255\255\066\001\067\001\068\001\
-\255\255\070\001\041\001\255\255\073\001\074\001\255\255\255\255\
-\255\255\079\003\255\255\080\001\255\255\255\255\255\255\255\255\
-\255\255\101\002\255\255\255\255\255\255\060\001\091\001\092\001\
-\136\005\094\001\095\001\096\001\097\001\068\001\142\005\100\001\
-\255\255\255\255\255\255\074\001\255\255\255\255\255\255\108\001\
-\109\001\080\001\111\001\255\255\255\255\255\255\115\001\255\255\
-\132\002\255\255\255\255\076\001\255\255\092\001\079\001\255\255\
-\081\001\096\001\083\001\129\003\255\255\255\255\255\255\147\002\
-\148\002\255\255\079\003\255\255\255\255\108\001\255\255\255\255\
-\111\001\255\255\255\255\255\255\255\255\255\255\255\255\149\003\
-\255\255\255\255\152\003\255\255\154\003\155\003\156\003\112\001\
-\026\000\027\000\160\003\116\001\255\255\255\255\255\255\255\255\
-\166\003\181\002\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\190\002\255\255\192\002\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\129\003\255\255\255\255\189\003\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\149\003\255\255\255\255\152\003\153\003\154\003\155\003\156\003\
-\082\000\083\000\255\255\160\003\255\255\233\002\255\255\000\001\
-\255\255\166\003\255\255\255\255\255\255\006\001\153\001\154\001\
-\255\255\255\255\000\000\012\001\189\001\255\255\191\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\189\003\255\255\255\255\028\001\255\255\030\001\031\001\178\001\
-\179\001\180\001\255\255\255\255\255\255\255\255\255\255\186\001\
-\187\001\218\001\255\255\220\001\255\255\255\255\255\255\255\255\
-\255\255\050\001\255\255\052\001\053\001\255\255\055\001\056\001\
-\255\255\255\255\059\001\255\255\207\001\208\001\255\255\064\001\
-\065\001\212\001\255\255\255\255\255\255\216\001\071\001\255\255\
-\052\003\255\255\255\255\255\255\255\255\057\003\044\004\255\255\
-\255\255\255\255\255\255\084\001\255\255\000\001\255\255\255\255\
-\003\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\097\001\244\001\013\001\079\003\101\001\255\255\017\001\255\255\
-\255\255\106\001\253\001\255\255\109\001\110\001\255\255\026\001\
-\027\001\028\001\029\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\014\002\255\255\255\255\041\001\255\255\
-\255\255\255\255\255\255\000\000\255\255\255\255\255\255\044\004\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\060\001\255\255\255\255\063\001\129\003\255\255\066\001\
-\067\001\068\001\255\255\255\255\255\255\255\255\073\001\074\001\
-\081\002\255\255\255\255\084\002\255\255\080\001\057\002\255\255\
-\255\255\149\003\255\255\255\255\152\003\255\255\154\003\155\003\
-\156\003\092\001\255\255\094\001\160\003\096\001\255\255\255\255\
-\255\255\255\255\166\003\255\255\255\255\255\255\255\255\255\255\
-\255\255\108\001\255\255\255\255\111\001\255\255\255\255\255\255\
-\115\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\189\003\176\004\255\255\255\255\255\255\255\255\049\001\
-\050\001\051\001\052\001\053\001\054\001\055\001\056\001\057\001\
-\058\001\059\001\060\001\061\001\062\001\063\001\064\001\065\001\
-\066\001\067\001\068\001\069\001\255\255\071\001\255\255\255\255\
-\255\255\132\002\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\172\002\086\001\255\255\000\000\255\255\
-\147\002\148\002\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\099\001\000\001\176\004\002\001\003\001\004\001\255\255\
-\255\255\255\255\008\001\255\003\255\255\255\255\199\002\013\001\
-\255\255\255\255\255\255\017\001\018\001\019\001\255\255\255\255\
-\255\255\255\255\181\002\255\255\026\001\027\001\028\001\029\001\
-\255\255\255\255\255\255\190\002\255\255\192\002\036\001\255\255\
-\255\255\255\255\040\001\041\001\018\005\255\255\255\255\255\255\
-\255\255\255\255\048\001\049\001\255\255\255\255\255\255\255\255\
-\044\004\255\255\255\255\255\255\255\255\255\255\060\001\255\255\
-\255\255\063\001\255\255\255\255\066\001\067\001\068\001\255\255\
-\070\001\255\255\255\255\073\001\074\001\255\255\233\002\255\255\
-\000\000\255\255\080\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\091\001\092\001\255\255\
-\094\001\095\001\096\001\255\255\255\255\018\005\100\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\083\005\108\001\255\255\
-\255\255\111\001\255\255\255\255\255\255\115\001\255\255\255\255\
-\094\005\255\255\255\255\000\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\008\001\255\255\062\003\255\255\255\255\
-\013\001\235\001\255\255\255\255\255\255\255\255\240\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\026\001\255\255\028\001\
-\029\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\136\005\255\255\041\001\255\255\083\005\053\001\
-\255\255\055\001\255\255\057\001\058\001\059\001\255\255\061\001\
-\255\255\255\255\064\001\065\001\079\003\255\255\111\003\060\001\
-\255\255\255\255\028\002\029\002\176\004\066\001\067\001\068\001\
-\255\255\255\255\255\255\255\255\255\255\074\001\000\000\255\255\
-\255\255\255\255\255\255\080\001\090\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\097\001\255\255\255\255\143\003\092\001\
-\255\255\255\255\255\255\096\001\208\004\063\002\255\255\109\001\
-\110\001\255\255\068\002\069\002\070\002\255\255\129\003\108\001\
-\255\255\255\255\111\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\000\001\255\255\
-\002\001\003\001\149\003\180\003\181\003\152\003\008\001\154\003\
-\155\003\156\003\255\255\013\001\255\255\160\003\255\255\017\001\
-\018\001\019\001\255\255\166\003\255\255\255\255\255\255\255\255\
-\026\001\027\001\028\001\029\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\036\001\255\255\255\255\255\255\018\005\041\001\
-\255\255\255\255\189\003\255\255\255\255\255\255\048\001\049\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\233\003\255\255\060\001\255\255\255\255\063\001\255\255\255\255\
-\066\001\067\001\068\001\255\255\070\001\159\002\160\002\161\002\
-\074\001\255\255\255\255\252\003\255\255\255\255\080\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\000\000\
-\000\001\091\001\092\001\003\001\094\001\095\001\096\001\255\255\
-\255\255\255\255\255\255\023\001\255\255\013\001\255\255\083\005\
-\255\255\017\001\108\001\197\002\255\255\111\001\255\255\255\255\
-\036\001\115\001\026\001\027\001\028\001\029\001\255\255\255\255\
-\255\255\255\255\255\255\213\002\255\255\255\255\255\255\255\255\
-\255\255\041\001\255\255\055\001\255\255\057\001\058\001\059\001\
-\255\255\061\001\255\255\255\255\064\001\065\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\060\001\255\255\255\255\063\001\
-\255\255\044\004\066\001\067\001\068\001\255\255\255\255\255\255\
-\255\255\073\001\074\001\255\255\255\255\255\255\090\001\255\255\
-\080\001\255\255\255\255\000\000\255\255\097\001\255\255\255\255\
-\255\255\255\255\255\255\100\004\092\001\102\004\094\001\255\255\
-\096\001\109\001\110\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\108\001\255\255\032\003\111\001\
-\255\255\255\255\255\255\115\001\255\255\255\255\000\001\001\001\
-\002\001\003\001\255\255\255\255\006\001\007\001\008\001\009\001\
-\010\001\011\001\012\001\013\001\014\001\015\001\016\001\017\001\
-\018\001\019\001\020\001\021\001\149\004\255\255\024\001\025\001\
-\026\001\027\001\028\001\029\001\030\001\031\001\255\255\255\255\
-\255\255\255\255\036\001\037\001\255\255\255\255\040\001\041\001\
-\042\001\043\001\044\001\045\001\046\001\047\001\255\255\049\001\
-\050\001\051\001\255\255\053\001\054\001\055\001\056\001\255\255\
-\255\255\059\001\060\001\061\001\255\255\063\001\064\001\065\001\
-\066\001\067\001\068\001\255\255\070\001\071\001\072\001\073\001\
-\074\001\255\255\255\255\255\255\255\255\176\004\080\001\081\001\
-\082\001\083\001\084\001\085\001\086\001\087\001\255\255\089\001\
-\000\000\091\001\092\001\133\003\094\001\095\001\096\001\097\001\
-\098\001\255\255\100\001\101\001\255\255\103\001\104\001\105\001\
-\106\001\255\255\108\001\109\001\255\255\111\001\255\255\255\255\
-\255\255\115\001\255\255\055\001\255\255\057\001\058\001\059\001\
-\255\255\061\001\255\255\255\255\064\001\065\001\255\255\255\255\
-\001\005\255\255\255\255\255\255\255\255\255\255\074\001\000\001\
-\255\255\002\001\003\001\004\001\255\255\081\001\255\255\008\001\
-\255\255\255\255\255\255\255\255\013\001\089\001\090\001\255\255\
-\017\001\018\001\019\001\255\255\255\255\097\001\255\255\255\255\
-\255\255\026\001\027\001\028\001\029\001\038\005\255\255\255\255\
-\255\255\109\001\110\001\036\001\255\255\255\255\255\255\018\005\
-\041\001\255\255\220\003\221\003\222\003\255\255\255\255\048\001\
-\049\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\060\001\255\255\255\255\063\001\072\005\
-\255\255\066\001\067\001\068\001\255\255\070\001\255\255\255\255\
-\073\001\074\001\255\255\255\255\255\255\255\255\087\005\080\001\
-\255\255\023\001\255\255\000\001\255\255\255\255\095\005\255\255\
-\255\255\255\255\091\001\092\001\255\255\094\001\095\001\096\001\
-\013\001\000\000\020\004\021\004\022\004\255\255\255\255\112\005\
-\083\005\255\255\255\255\108\001\255\255\026\001\111\001\028\001\
-\029\001\055\001\115\001\057\001\058\001\059\001\255\255\061\001\
-\255\255\255\255\064\001\065\001\041\001\255\255\255\255\255\255\
-\137\005\138\005\055\001\255\255\057\001\058\001\059\001\057\004\
-\061\001\255\255\147\005\064\001\065\001\255\255\255\255\060\001\
-\255\255\255\255\063\001\255\255\090\001\066\001\067\001\068\001\
-\255\255\162\005\255\255\097\001\081\001\074\001\167\005\168\005\
-\169\005\170\005\255\255\080\001\089\001\090\001\255\255\109\001\
-\110\001\255\255\255\255\255\255\097\001\255\255\255\255\092\001\
-\255\255\255\255\255\255\096\001\255\255\255\255\255\255\108\001\
-\109\001\110\001\255\255\255\255\255\255\255\255\255\255\108\001\
-\255\255\255\255\111\001\255\255\255\255\255\255\255\255\255\255\
-\122\004\123\004\255\255\255\255\255\255\127\004\128\004\129\004\
-\000\001\001\001\002\001\003\001\255\255\000\000\006\001\007\001\
-\008\001\009\001\010\001\011\001\012\001\013\001\014\001\015\001\
-\016\001\017\001\018\001\019\001\020\001\021\001\022\001\255\255\
-\024\001\025\001\026\001\027\001\028\001\029\001\030\001\031\001\
-\255\255\255\255\255\255\255\255\036\001\037\001\255\255\255\255\
-\040\001\041\001\042\001\043\001\044\001\045\001\046\001\047\001\
-\255\255\049\001\050\001\051\001\255\255\053\001\054\001\055\001\
-\056\001\255\255\255\255\059\001\060\001\061\001\062\001\063\001\
-\064\001\065\001\066\001\067\001\068\001\255\255\070\001\071\001\
-\072\001\073\001\074\001\255\255\255\255\255\255\255\255\255\255\
-\080\001\081\001\082\001\083\001\084\001\085\001\086\001\087\001\
-\255\255\089\001\255\255\091\001\092\001\255\255\094\001\095\001\
-\096\001\097\001\098\001\255\255\100\001\101\001\255\255\103\001\
-\104\001\105\001\106\001\255\255\108\001\109\001\255\255\111\001\
-\255\255\255\255\255\255\115\001\255\255\255\255\255\255\255\255\
-\255\255\000\000\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\000\001\001\001\002\001\003\001\255\255\255\255\006\001\
-\007\001\008\001\009\001\010\001\011\001\012\001\013\001\014\001\
-\015\001\016\001\017\001\018\001\019\001\020\001\021\001\022\001\
-\255\255\024\001\025\001\026\001\027\001\028\001\029\001\030\001\
-\031\001\255\255\052\005\053\005\054\005\036\001\037\001\255\255\
-\255\255\040\001\041\001\042\001\043\001\044\001\045\001\046\001\
-\047\001\255\255\049\001\050\001\051\001\255\255\053\001\054\001\
-\055\001\056\001\255\255\255\255\059\001\060\001\061\001\255\255\
-\063\001\064\001\065\001\066\001\067\001\068\001\255\255\070\001\
-\071\001\072\001\073\001\074\001\255\255\255\255\255\255\255\255\
-\255\255\080\001\081\001\082\001\083\001\084\001\085\001\086\001\
-\087\001\255\255\089\001\255\255\091\001\092\001\000\000\094\001\
-\095\001\096\001\097\001\098\001\255\255\100\001\101\001\255\255\
-\103\001\104\001\105\001\106\001\255\255\108\001\109\001\255\255\
-\111\001\255\255\255\255\255\255\115\001\000\001\001\001\002\001\
-\003\001\255\255\255\255\006\001\007\001\008\001\009\001\010\001\
-\011\001\012\001\013\001\014\001\015\001\016\001\017\001\018\001\
-\019\001\020\001\021\001\022\001\255\255\024\001\025\001\026\001\
-\027\001\028\001\029\001\030\001\031\001\255\255\255\255\255\255\
-\255\255\036\001\037\001\255\255\255\255\040\001\041\001\042\001\
-\043\001\044\001\045\001\046\001\047\001\255\255\049\001\050\001\
-\051\001\255\255\053\001\054\001\055\001\056\001\255\255\255\255\
-\059\001\060\001\061\001\255\255\063\001\064\001\065\001\066\001\
-\067\001\068\001\255\255\070\001\071\001\072\001\073\001\074\001\
-\255\255\255\255\255\255\255\255\255\255\080\001\081\001\082\001\
-\083\001\084\001\085\001\086\001\087\001\255\255\089\001\255\255\
-\091\001\092\001\000\000\094\001\095\001\096\001\097\001\098\001\
-\255\255\100\001\101\001\255\255\103\001\104\001\105\001\106\001\
-\255\255\108\001\109\001\255\255\111\001\255\255\255\255\255\255\
-\115\001\000\001\001\001\002\001\003\001\255\255\255\255\006\001\
-\007\001\008\001\009\001\010\001\011\001\012\001\013\001\014\001\
-\015\001\016\001\017\001\018\001\019\001\020\001\021\001\022\001\
-\255\255\024\001\025\001\026\001\027\001\028\001\029\001\030\001\
-\031\001\255\255\255\255\255\255\255\255\036\001\037\001\255\255\
-\255\255\040\001\041\001\042\001\043\001\044\001\045\001\046\001\
-\047\001\255\255\049\001\050\001\051\001\255\255\053\001\054\001\
-\055\001\056\001\255\255\255\255\059\001\060\001\061\001\255\255\
-\063\001\064\001\065\001\066\001\067\001\068\001\255\255\070\001\
-\071\001\072\001\073\001\074\001\255\255\255\255\255\255\255\255\
-\255\255\080\001\081\001\082\001\083\001\084\001\085\001\086\001\
-\087\001\255\255\089\001\255\255\091\001\092\001\000\000\094\001\
-\095\001\096\001\097\001\098\001\255\255\100\001\101\001\255\255\
-\103\001\104\001\105\001\106\001\255\255\108\001\109\001\255\255\
-\111\001\255\255\255\255\255\255\115\001\255\255\000\001\001\001\
-\002\001\003\001\255\255\255\255\006\001\007\001\008\001\009\001\
-\010\001\011\001\012\001\013\001\014\001\015\001\016\001\017\001\
-\018\001\019\001\020\001\021\001\022\001\255\255\024\001\025\001\
-\026\001\027\001\028\001\029\001\030\001\031\001\255\255\255\255\
-\255\255\255\255\036\001\037\001\255\255\255\255\040\001\041\001\
-\042\001\043\001\044\001\045\001\046\001\047\001\255\255\049\001\
-\050\001\051\001\255\255\053\001\054\001\055\001\056\001\255\255\
-\255\255\059\001\060\001\061\001\255\255\063\001\064\001\065\001\
-\066\001\067\001\068\001\255\255\070\001\071\001\072\001\073\001\
-\074\001\255\255\255\255\255\255\255\255\255\255\080\001\081\001\
-\082\001\083\001\084\001\085\001\086\001\087\001\255\255\089\001\
-\255\255\091\001\092\001\000\000\094\001\095\001\096\001\097\001\
-\098\001\255\255\100\001\101\001\255\255\103\001\104\001\105\001\
-\106\001\255\255\108\001\109\001\255\255\111\001\255\255\255\255\
-\255\255\115\001\000\001\001\001\002\001\003\001\255\255\255\255\
-\006\001\007\001\008\001\009\001\010\001\011\001\012\001\013\001\
-\014\001\015\001\016\001\017\001\018\001\019\001\020\001\021\001\
-\022\001\255\255\024\001\025\001\026\001\027\001\028\001\029\001\
-\030\001\031\001\255\255\255\255\255\255\255\255\036\001\037\001\
-\255\255\255\255\040\001\041\001\042\001\043\001\044\001\045\001\
-\046\001\047\001\255\255\049\001\050\001\051\001\255\255\053\001\
-\054\001\055\001\056\001\255\255\255\255\059\001\060\001\061\001\
-\255\255\063\001\064\001\065\001\066\001\067\001\068\001\255\255\
-\070\001\071\001\072\001\073\001\074\001\255\255\255\255\255\255\
-\255\255\255\255\080\001\081\001\082\001\083\001\084\001\085\001\
-\086\001\087\001\255\255\089\001\255\255\091\001\092\001\000\000\
-\094\001\095\001\096\001\097\001\098\001\255\255\100\001\101\001\
-\255\255\103\001\104\001\105\001\106\001\255\255\108\001\109\001\
-\255\255\111\001\255\255\255\255\255\255\115\001\000\001\001\001\
-\002\001\003\001\255\255\255\255\006\001\007\001\008\001\009\001\
-\010\001\011\001\012\001\013\001\014\001\015\001\016\001\017\001\
-\018\001\019\001\020\001\021\001\022\001\255\255\024\001\025\001\
-\026\001\027\001\028\001\029\001\030\001\031\001\255\255\255\255\
-\255\255\255\255\036\001\037\001\255\255\255\255\040\001\041\001\
-\042\001\043\001\044\001\045\001\046\001\047\001\255\255\049\001\
-\050\001\051\001\255\255\053\001\054\001\055\001\056\001\255\255\
-\255\255\059\001\060\001\061\001\255\255\063\001\064\001\065\001\
-\066\001\067\001\068\001\255\255\070\001\071\001\072\001\073\001\
-\074\001\255\255\255\255\255\255\255\255\255\255\080\001\081\001\
-\082\001\083\001\084\001\085\001\086\001\087\001\255\255\089\001\
-\255\255\091\001\092\001\000\000\094\001\095\001\096\001\097\001\
-\098\001\255\255\100\001\101\001\255\255\103\001\104\001\105\001\
-\106\001\255\255\108\001\109\001\255\255\111\001\255\255\255\255\
-\255\255\115\001\255\255\000\001\001\001\002\001\003\001\255\255\
-\255\255\006\001\007\001\008\001\009\001\010\001\011\001\012\001\
-\013\001\014\001\015\001\016\001\017\001\018\001\019\001\020\001\
-\021\001\022\001\255\255\024\001\025\001\026\001\027\001\028\001\
-\029\001\030\001\031\001\255\255\255\255\255\255\255\255\036\001\
-\037\001\255\255\255\255\040\001\041\001\042\001\043\001\044\001\
-\045\001\046\001\047\001\255\255\049\001\050\001\051\001\255\255\
-\053\001\054\001\055\001\056\001\255\255\255\255\059\001\060\001\
-\061\001\255\255\063\001\064\001\065\001\066\001\067\001\068\001\
-\255\255\070\001\071\001\072\001\073\001\074\001\255\255\255\255\
-\255\255\255\255\255\255\080\001\081\001\082\001\083\001\084\001\
-\085\001\086\001\087\001\255\255\089\001\255\255\091\001\092\001\
-\000\000\094\001\095\001\096\001\097\001\098\001\255\255\100\001\
-\101\001\255\255\103\001\104\001\105\001\106\001\255\255\108\001\
-\109\001\255\255\111\001\255\255\255\255\255\255\115\001\000\001\
-\001\001\002\001\003\001\255\255\255\255\006\001\007\001\008\001\
-\009\001\010\001\011\001\012\001\013\001\014\001\015\001\016\001\
-\017\001\018\001\019\001\020\001\021\001\022\001\255\255\024\001\
-\025\001\026\001\027\001\028\001\029\001\030\001\031\001\255\255\
-\255\255\255\255\255\255\036\001\037\001\255\255\255\255\040\001\
-\041\001\042\001\043\001\044\001\045\001\046\001\047\001\255\255\
-\049\001\050\001\051\001\255\255\053\001\054\001\055\001\056\001\
-\255\255\255\255\059\001\060\001\061\001\255\255\063\001\064\001\
-\065\001\066\001\067\001\068\001\255\255\070\001\071\001\072\001\
-\073\001\074\001\255\255\255\255\255\255\255\255\255\255\080\001\
-\081\001\082\001\083\001\084\001\085\001\086\001\087\001\255\255\
-\089\001\255\255\091\001\092\001\000\000\094\001\095\001\096\001\
-\097\001\098\001\255\255\100\001\101\001\255\255\103\001\104\001\
-\105\001\106\001\255\255\108\001\109\001\255\255\111\001\255\255\
-\255\255\255\255\115\001\000\001\001\001\002\001\003\001\255\255\
-\255\255\006\001\007\001\008\001\009\001\010\001\011\001\012\001\
-\013\001\014\001\015\001\016\001\017\001\018\001\019\001\020\001\
-\021\001\022\001\255\255\024\001\025\001\026\001\027\001\028\001\
-\029\001\030\001\031\001\255\255\255\255\255\255\255\255\036\001\
-\037\001\255\255\255\255\040\001\041\001\042\001\043\001\044\001\
-\045\001\046\001\047\001\255\255\049\001\050\001\051\001\255\255\
-\053\001\054\001\055\001\056\001\255\255\255\255\059\001\060\001\
-\061\001\255\255\063\001\064\001\065\001\066\001\067\001\068\001\
-\255\255\070\001\071\001\072\001\073\001\074\001\255\255\255\255\
-\255\255\255\255\255\255\080\001\081\001\082\001\083\001\084\001\
-\085\001\086\001\087\001\255\255\089\001\255\255\091\001\092\001\
-\000\000\094\001\095\001\096\001\097\001\098\001\255\255\100\001\
-\101\001\255\255\103\001\104\001\105\001\106\001\255\255\108\001\
-\109\001\255\255\111\001\255\255\255\255\255\255\115\001\255\255\
-\000\001\001\001\002\001\003\001\255\255\255\255\006\001\007\001\
-\008\001\009\001\010\001\011\001\012\001\013\001\014\001\015\001\
-\016\001\017\001\018\001\019\001\020\001\021\001\255\255\255\255\
-\024\001\025\001\026\001\027\001\028\001\029\001\030\001\031\001\
-\255\255\255\255\255\255\255\255\036\001\037\001\255\255\255\255\
-\040\001\041\001\042\001\043\001\044\001\045\001\046\001\255\255\
-\255\255\049\001\050\001\051\001\255\255\053\001\054\001\055\001\
-\056\001\255\255\255\255\059\001\060\001\061\001\255\255\063\001\
-\064\001\065\001\066\001\067\001\068\001\255\255\070\001\071\001\
-\072\001\073\001\074\001\255\255\255\255\255\255\255\255\255\255\
-\080\001\081\001\082\001\083\001\084\001\085\001\086\001\087\001\
-\255\255\089\001\255\255\091\001\092\001\000\000\094\001\095\001\
-\096\001\097\001\098\001\255\255\100\001\101\001\255\255\103\001\
-\104\001\105\001\106\001\255\255\108\001\109\001\255\255\111\001\
-\255\255\255\255\255\255\115\001\000\001\001\001\002\001\003\001\
-\255\255\255\255\006\001\007\001\008\001\009\001\010\001\011\001\
-\012\001\013\001\014\001\015\001\016\001\017\001\018\001\019\001\
-\020\001\021\001\255\255\255\255\024\001\025\001\026\001\027\001\
-\028\001\029\001\030\001\031\001\255\255\255\255\255\255\255\255\
-\036\001\037\001\255\255\255\255\040\001\041\001\042\001\043\001\
-\044\001\045\001\046\001\255\255\255\255\049\001\050\001\051\001\
-\255\255\053\001\054\001\055\001\056\001\255\255\255\255\059\001\
-\060\001\061\001\255\255\063\001\064\001\065\001\066\001\067\001\
-\068\001\255\255\070\001\071\001\072\001\073\001\074\001\255\255\
-\255\255\255\255\255\255\255\255\080\001\081\001\082\001\083\001\
-\084\001\085\001\086\001\087\001\255\255\089\001\255\255\091\001\
-\092\001\000\000\094\001\095\001\096\001\255\255\255\255\255\255\
-\100\001\101\001\255\255\103\001\104\001\105\001\106\001\255\255\
-\108\001\109\001\255\255\111\001\255\255\255\255\255\255\115\001\
-\000\001\001\001\002\001\003\001\255\255\255\255\006\001\007\001\
-\008\001\009\001\010\001\011\001\012\001\013\001\014\001\015\001\
-\016\001\017\001\018\001\019\001\020\001\021\001\255\255\255\255\
-\024\001\025\001\026\001\027\001\028\001\029\001\030\001\031\001\
-\255\255\255\255\255\255\255\255\036\001\037\001\255\255\255\255\
-\040\001\041\001\042\001\043\001\044\001\045\001\046\001\255\255\
-\255\255\049\001\050\001\051\001\255\255\053\001\054\001\055\001\
-\056\001\255\255\255\255\059\001\060\001\061\001\255\255\063\001\
-\064\001\065\001\066\001\067\001\068\001\255\255\070\001\071\001\
-\072\001\073\001\074\001\255\255\255\255\255\255\255\255\255\255\
-\080\001\081\001\082\001\083\001\084\001\085\001\086\001\087\001\
-\255\255\089\001\255\255\091\001\092\001\000\000\094\001\095\001\
-\096\001\255\255\255\255\255\255\100\001\101\001\255\255\103\001\
-\104\001\105\001\106\001\255\255\108\001\109\001\255\255\111\001\
-\255\255\255\255\255\255\115\001\255\255\000\001\001\001\002\001\
-\003\001\255\255\255\255\006\001\007\001\008\001\009\001\010\001\
-\011\001\012\001\013\001\014\001\015\001\016\001\017\001\018\001\
-\019\001\020\001\021\001\255\255\255\255\024\001\025\001\026\001\
-\027\001\028\001\029\001\030\001\031\001\255\255\255\255\255\255\
-\255\255\036\001\037\001\255\255\255\255\040\001\041\001\042\001\
-\043\001\044\001\045\001\046\001\255\255\255\255\049\001\050\001\
-\051\001\255\255\053\001\054\001\055\001\056\001\255\255\255\255\
-\059\001\060\001\061\001\255\255\063\001\064\001\065\001\066\001\
-\067\001\068\001\255\255\070\001\071\001\072\001\073\001\074\001\
-\255\255\255\255\255\255\255\255\255\255\080\001\081\001\082\001\
-\083\001\084\001\085\001\086\001\087\001\255\255\089\001\255\255\
-\091\001\092\001\000\000\094\001\095\001\096\001\255\255\255\255\
-\255\255\100\001\101\001\255\255\103\001\104\001\105\001\106\001\
-\255\255\108\001\109\001\255\255\111\001\255\255\255\255\255\255\
-\115\001\000\001\001\001\002\001\003\001\255\255\255\255\255\255\
-\255\255\008\001\009\001\010\001\255\255\255\255\013\001\014\001\
-\015\001\016\001\017\001\018\001\019\001\020\001\021\001\022\001\
-\255\255\024\001\025\001\026\001\027\001\028\001\029\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\036\001\037\001\255\255\
-\255\255\040\001\041\001\042\001\043\001\044\001\045\001\046\001\
-\047\001\255\255\049\001\255\255\051\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\060\001\061\001\255\255\
-\063\001\255\255\255\255\066\001\067\001\068\001\255\255\070\001\
-\071\001\072\001\073\001\074\001\255\255\255\255\255\255\255\255\
-\255\255\080\001\081\001\082\001\083\001\084\001\085\001\086\001\
-\255\255\255\255\089\001\255\255\091\001\092\001\000\000\094\001\
-\095\001\096\001\097\001\098\001\255\255\100\001\255\255\255\255\
-\103\001\104\001\105\001\255\255\255\255\108\001\255\255\255\255\
-\111\001\255\255\255\255\255\255\115\001\000\001\001\001\002\001\
-\003\001\255\255\255\255\255\255\255\255\008\001\009\001\010\001\
-\255\255\255\255\013\001\014\001\015\001\016\001\017\001\018\001\
-\019\001\020\001\021\001\022\001\255\255\024\001\025\001\026\001\
-\027\001\028\001\029\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\036\001\037\001\255\255\255\255\040\001\041\001\042\001\
-\043\001\044\001\045\001\046\001\047\001\255\255\049\001\255\255\
-\051\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\060\001\061\001\255\255\063\001\255\255\255\255\066\001\
-\067\001\068\001\255\255\070\001\071\001\072\001\073\001\074\001\
-\255\255\255\255\255\255\255\255\255\255\080\001\081\001\082\001\
-\083\001\084\001\085\001\086\001\255\255\255\255\089\001\255\255\
-\091\001\092\001\000\000\094\001\095\001\096\001\097\001\098\001\
-\255\255\100\001\255\255\255\255\103\001\104\001\105\001\255\255\
-\255\255\108\001\255\255\255\255\111\001\255\255\255\255\255\255\
-\115\001\255\255\000\001\001\001\002\001\003\001\255\255\255\255\
-\255\255\255\255\008\001\009\001\010\001\255\255\255\255\013\001\
-\014\001\015\001\016\001\017\001\018\001\019\001\020\001\021\001\
-\255\255\255\255\024\001\025\001\026\001\027\001\028\001\029\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\036\001\037\001\
-\255\255\255\255\040\001\041\001\042\001\043\001\044\001\045\001\
-\046\001\255\255\255\255\049\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\060\001\061\001\
-\255\255\063\001\255\255\255\255\066\001\067\001\068\001\255\255\
-\070\001\071\001\072\001\073\001\074\001\255\255\255\255\255\255\
-\255\255\255\255\080\001\255\255\082\001\083\001\084\001\085\001\
-\086\001\255\255\255\255\255\255\255\255\091\001\092\001\000\000\
-\094\001\095\001\096\001\255\255\255\255\255\255\100\001\255\255\
-\255\255\103\001\255\255\105\001\255\255\255\255\108\001\255\255\
-\255\255\111\001\255\255\255\255\255\255\115\001\000\001\001\001\
-\002\001\003\001\255\255\255\255\255\255\255\255\008\001\009\001\
-\010\001\255\255\255\255\013\001\014\001\015\001\016\001\017\001\
-\018\001\019\001\020\001\021\001\255\255\255\255\024\001\025\001\
-\026\001\027\001\028\001\029\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\036\001\037\001\255\255\255\255\040\001\041\001\
-\042\001\043\001\044\001\045\001\046\001\255\255\255\255\049\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\060\001\061\001\255\255\063\001\255\255\255\255\
-\066\001\067\001\068\001\255\255\070\001\071\001\072\001\073\001\
-\074\001\255\255\255\255\255\255\255\255\255\255\080\001\255\255\
-\082\001\083\001\084\001\085\001\086\001\255\255\255\255\255\255\
-\255\255\091\001\092\001\000\000\094\001\095\001\096\001\255\255\
-\255\255\255\255\100\001\255\255\255\255\103\001\255\255\105\001\
-\255\255\255\255\108\001\255\255\255\255\111\001\255\255\255\255\
-\255\255\115\001\000\001\001\001\002\001\003\001\255\255\255\255\
-\255\255\255\255\008\001\009\001\010\001\255\255\255\255\013\001\
-\014\001\015\001\016\001\017\001\018\001\019\001\020\001\021\001\
-\255\255\255\255\024\001\025\001\026\001\027\001\028\001\029\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\036\001\037\001\
-\255\255\255\255\040\001\041\001\042\001\043\001\044\001\045\001\
-\046\001\255\255\255\255\049\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\060\001\061\001\
-\255\255\063\001\255\255\255\255\066\001\067\001\068\001\255\255\
-\070\001\071\001\072\001\073\001\074\001\255\255\255\255\255\255\
-\255\255\255\255\080\001\255\255\082\001\083\001\084\001\085\001\
-\086\001\255\255\255\255\255\255\255\255\091\001\092\001\000\000\
-\094\001\095\001\096\001\255\255\255\255\255\255\100\001\255\255\
-\255\255\103\001\255\255\105\001\255\255\255\255\108\001\255\255\
-\255\255\111\001\255\255\255\255\255\255\115\001\255\255\000\001\
-\001\001\002\001\003\001\255\255\255\255\255\255\255\255\008\001\
-\009\001\010\001\255\255\255\255\013\001\014\001\015\001\016\001\
-\017\001\018\001\019\001\020\001\021\001\255\255\255\255\024\001\
-\025\001\026\001\027\001\028\001\029\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\036\001\037\001\255\255\255\255\040\001\
-\041\001\042\001\043\001\044\001\045\001\046\001\255\255\255\255\
-\049\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\060\001\061\001\255\255\063\001\255\255\
-\255\255\066\001\067\001\068\001\255\255\070\001\071\001\072\001\
-\073\001\074\001\255\255\255\255\255\255\255\255\255\255\080\001\
-\255\255\082\001\083\001\084\001\085\001\086\001\255\255\255\255\
-\255\255\255\255\091\001\092\001\000\000\094\001\095\001\096\001\
-\255\255\255\255\255\255\100\001\255\255\255\255\103\001\255\255\
-\105\001\255\255\255\255\108\001\255\255\255\255\111\001\255\255\
-\255\255\255\255\115\001\000\001\001\001\002\001\003\001\255\255\
-\255\255\255\255\255\255\008\001\009\001\010\001\255\255\255\255\
-\013\001\014\001\015\001\016\001\017\001\018\001\019\001\020\001\
-\021\001\255\255\255\255\024\001\025\001\026\001\027\001\028\001\
-\029\001\255\255\255\255\255\255\255\255\255\255\255\255\036\001\
-\037\001\255\255\255\255\040\001\041\001\042\001\043\001\044\001\
-\045\001\046\001\255\255\255\255\049\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\060\001\
-\061\001\255\255\063\001\255\255\255\255\066\001\067\001\068\001\
-\255\255\070\001\071\001\072\001\073\001\074\001\255\255\255\255\
-\255\255\255\255\255\255\080\001\255\255\082\001\083\001\084\001\
-\085\001\086\001\255\255\255\255\255\255\255\255\091\001\092\001\
-\000\000\094\001\095\001\096\001\255\255\255\255\255\255\100\001\
-\255\255\255\255\103\001\255\255\105\001\255\255\255\255\108\001\
-\255\255\255\255\111\001\255\255\255\255\255\255\115\001\000\001\
-\001\001\002\001\003\001\255\255\255\255\255\255\255\255\008\001\
-\009\001\010\001\255\255\255\255\013\001\014\001\015\001\016\001\
-\017\001\018\001\019\001\020\001\021\001\255\255\255\255\024\001\
-\025\001\026\001\027\001\028\001\029\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\036\001\037\001\255\255\255\255\040\001\
-\041\001\042\001\043\001\044\001\045\001\046\001\255\255\255\255\
-\049\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\060\001\061\001\255\255\063\001\255\255\
-\255\255\066\001\067\001\068\001\255\255\070\001\071\001\072\001\
-\073\001\074\001\255\255\255\255\255\255\255\255\255\255\080\001\
-\255\255\082\001\083\001\084\001\085\001\086\001\255\255\255\255\
-\255\255\255\255\091\001\092\001\000\000\094\001\095\001\096\001\
-\255\255\255\255\255\255\100\001\255\255\255\255\103\001\255\255\
-\105\001\255\255\255\255\108\001\255\255\255\255\111\001\255\255\
-\255\255\255\255\115\001\255\255\000\001\001\001\002\001\003\001\
-\255\255\255\255\255\255\255\255\008\001\009\001\010\001\255\255\
-\255\255\013\001\014\001\015\001\016\001\017\001\255\255\019\001\
-\020\001\021\001\255\255\255\255\024\001\025\001\026\001\027\001\
-\028\001\029\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\036\001\037\001\255\255\255\255\040\001\041\001\042\001\043\001\
-\044\001\045\001\046\001\255\255\255\255\049\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\060\001\061\001\255\255\063\001\255\255\255\255\066\001\067\001\
-\068\001\255\255\070\001\071\001\072\001\073\001\074\001\255\255\
-\255\255\255\255\255\255\255\255\080\001\255\255\082\001\083\001\
-\084\001\085\001\086\001\255\255\255\255\255\255\255\255\091\001\
-\092\001\000\000\094\001\095\001\096\001\255\255\255\255\255\255\
-\100\001\255\255\255\255\103\001\255\255\105\001\255\255\255\255\
-\108\001\255\255\255\255\111\001\255\255\255\255\255\255\115\001\
-\000\001\001\001\002\001\003\001\255\255\255\255\255\255\255\255\
-\008\001\009\001\010\001\255\255\255\255\013\001\014\001\015\001\
-\016\001\017\001\018\001\019\001\020\001\021\001\255\255\255\255\
-\024\001\025\001\026\001\027\001\028\001\029\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\036\001\037\001\255\255\255\255\
-\040\001\041\001\042\001\043\001\044\001\045\001\255\255\255\255\
-\255\255\049\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\060\001\061\001\255\255\063\001\
-\255\255\255\255\066\001\067\001\068\001\255\255\070\001\071\001\
-\072\001\073\001\074\001\255\255\255\255\255\255\255\255\255\255\
-\080\001\255\255\082\001\083\001\084\001\085\001\086\001\255\255\
-\255\255\255\255\255\255\091\001\092\001\000\000\094\001\095\001\
-\096\001\255\255\255\255\255\255\100\001\255\255\255\255\103\001\
-\255\255\105\001\255\255\255\255\108\001\255\255\255\255\111\001\
-\255\255\255\255\255\255\115\001\000\001\001\001\002\001\003\001\
-\255\255\255\255\255\255\255\255\008\001\009\001\010\001\255\255\
-\255\255\013\001\014\001\015\001\016\001\017\001\018\001\019\001\
-\020\001\021\001\255\255\255\255\024\001\025\001\026\001\027\001\
-\028\001\029\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\036\001\037\001\255\255\255\255\040\001\041\001\042\001\043\001\
-\044\001\045\001\255\255\255\255\255\255\049\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\060\001\061\001\255\255\063\001\255\255\255\255\066\001\067\001\
-\068\001\255\255\070\001\071\001\072\001\073\001\074\001\255\255\
-\255\255\255\255\255\255\255\255\080\001\255\255\082\001\083\001\
-\084\001\085\001\086\001\255\255\255\255\255\255\255\255\091\001\
-\092\001\000\000\094\001\095\001\096\001\255\255\255\255\255\255\
-\100\001\255\255\255\255\103\001\255\255\105\001\255\255\255\255\
-\108\001\255\255\255\255\111\001\255\255\255\255\255\255\115\001\
-\255\255\000\001\001\001\002\001\003\001\255\255\255\255\255\255\
-\255\255\008\001\009\001\010\001\255\255\255\255\013\001\014\001\
-\015\001\016\001\017\001\018\001\019\001\020\001\021\001\255\255\
-\255\255\024\001\025\001\026\001\027\001\028\001\029\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\036\001\037\001\255\255\
-\255\255\040\001\041\001\042\001\043\001\044\001\045\001\255\255\
-\255\255\255\255\049\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\060\001\061\001\255\255\
-\063\001\255\255\255\255\066\001\067\001\068\001\255\255\070\001\
-\071\001\072\001\073\001\074\001\255\255\255\255\255\255\255\255\
-\255\255\080\001\255\255\082\001\083\001\084\001\085\001\086\001\
-\255\255\255\255\255\255\255\255\091\001\092\001\000\000\094\001\
-\095\001\096\001\255\255\255\255\255\255\100\001\255\255\255\255\
-\103\001\255\255\105\001\255\255\255\255\108\001\255\255\255\255\
-\111\001\255\255\255\255\255\255\115\001\000\001\001\001\002\001\
-\003\001\255\255\255\255\255\255\255\255\008\001\009\001\010\001\
-\255\255\255\255\013\001\014\001\015\001\016\001\017\001\018\001\
-\019\001\020\001\021\001\255\255\255\255\024\001\025\001\026\001\
-\027\001\028\001\029\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\036\001\037\001\255\255\255\255\040\001\041\001\042\001\
-\043\001\044\001\045\001\255\255\255\255\255\255\049\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\060\001\061\001\255\255\063\001\255\255\255\255\066\001\
-\067\001\068\001\255\255\070\001\071\001\072\001\073\001\074\001\
-\255\255\255\255\255\255\255\255\255\255\080\001\255\255\082\001\
-\083\001\084\001\085\001\086\001\255\255\255\255\255\255\255\255\
-\091\001\092\001\000\000\094\001\095\001\096\001\255\255\255\255\
-\255\255\100\001\255\255\255\255\103\001\255\255\105\001\255\255\
-\255\255\108\001\255\255\255\255\111\001\255\255\255\255\255\255\
-\115\001\000\001\001\001\002\001\003\001\255\255\255\255\255\255\
-\255\255\255\255\009\001\010\001\255\255\255\255\013\001\014\001\
-\015\001\016\001\017\001\018\001\019\001\020\001\021\001\255\255\
-\255\255\024\001\025\001\026\001\027\001\028\001\029\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\036\001\037\001\255\255\
-\255\255\040\001\041\001\042\001\043\001\044\001\045\001\046\001\
-\255\255\255\255\049\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\060\001\061\001\255\255\
-\063\001\255\255\255\255\066\001\067\001\068\001\255\255\070\001\
-\071\001\072\001\073\001\074\001\255\255\255\255\255\255\255\255\
-\255\255\080\001\255\255\082\001\083\001\084\001\085\001\086\001\
-\255\255\255\255\255\255\255\255\091\001\092\001\000\000\094\001\
-\095\001\096\001\255\255\255\255\255\255\100\001\255\255\255\255\
-\103\001\255\255\105\001\255\255\255\255\108\001\255\255\255\255\
-\111\001\255\255\255\255\255\255\115\001\255\255\000\001\001\001\
-\002\001\003\001\255\255\255\255\255\255\255\255\255\255\009\001\
-\010\001\255\255\255\255\013\001\014\001\015\001\016\001\017\001\
-\018\001\019\001\020\001\021\001\255\255\255\255\024\001\025\001\
-\026\001\027\001\028\001\029\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\036\001\037\001\255\255\255\255\040\001\041\001\
-\042\001\043\001\044\001\045\001\046\001\255\255\255\255\049\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\060\001\061\001\255\255\063\001\255\255\255\255\
-\066\001\067\001\068\001\255\255\070\001\071\001\072\001\073\001\
-\074\001\255\255\255\255\255\255\255\255\255\255\080\001\255\255\
-\082\001\083\001\084\001\085\001\086\001\255\255\255\255\255\255\
-\255\255\091\001\092\001\000\000\094\001\095\001\096\001\255\255\
-\255\255\255\255\100\001\255\255\255\255\103\001\255\255\105\001\
-\255\255\255\255\108\001\255\255\255\255\111\001\255\255\255\255\
-\255\255\115\001\000\001\001\001\002\001\003\001\255\255\255\255\
-\255\255\255\255\255\255\009\001\010\001\255\255\255\255\013\001\
-\014\001\015\001\016\001\017\001\018\001\019\001\020\001\021\001\
-\255\255\255\255\024\001\025\001\026\001\027\001\028\001\029\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\036\001\037\001\
-\255\255\255\255\040\001\041\001\042\001\043\001\044\001\045\001\
-\046\001\255\255\255\255\049\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\060\001\061\001\
-\255\255\063\001\255\255\255\255\066\001\067\001\068\001\255\255\
-\070\001\071\001\072\001\073\001\074\001\255\255\255\255\255\255\
-\255\255\255\255\080\001\255\255\082\001\083\001\084\001\085\001\
-\086\001\255\255\255\255\255\255\255\255\091\001\092\001\000\000\
-\094\001\095\001\096\001\255\255\255\255\255\255\100\001\255\255\
-\255\255\103\001\255\255\105\001\255\255\255\255\108\001\255\255\
-\255\255\111\001\255\255\255\255\255\255\115\001\000\001\001\001\
-\002\001\003\001\255\255\255\255\255\255\255\255\008\001\009\001\
-\010\001\255\255\255\255\013\001\014\001\015\001\016\001\017\001\
-\018\001\019\001\020\001\021\001\255\255\255\255\024\001\025\001\
-\026\001\027\001\028\001\029\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\036\001\037\001\255\255\255\255\040\001\041\001\
-\042\001\043\001\044\001\255\255\255\255\255\255\255\255\049\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\060\001\061\001\255\255\063\001\255\255\255\255\
-\066\001\067\001\068\001\255\255\070\001\071\001\072\001\073\001\
-\074\001\255\255\255\255\255\255\255\255\255\255\080\001\255\255\
-\082\001\255\255\084\001\085\001\086\001\255\255\255\255\255\255\
-\255\255\091\001\092\001\000\000\094\001\095\001\096\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\103\001\255\255\105\001\
-\255\255\255\255\108\001\255\255\255\255\111\001\255\255\255\255\
-\255\255\115\001\255\255\000\001\001\001\002\001\003\001\255\255\
-\255\255\255\255\255\255\008\001\009\001\010\001\255\255\255\255\
-\013\001\014\001\015\001\016\001\017\001\018\001\019\001\020\001\
-\021\001\255\255\255\255\024\001\025\001\026\001\027\001\028\001\
-\029\001\255\255\255\255\255\255\255\255\255\255\255\255\036\001\
-\037\001\255\255\255\255\040\001\041\001\042\001\043\001\044\001\
-\255\255\255\255\255\255\255\255\049\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\060\001\
-\061\001\255\255\063\001\255\255\255\255\066\001\067\001\068\001\
-\255\255\070\001\071\001\072\001\073\001\074\001\255\255\255\255\
-\255\255\255\255\255\255\080\001\255\255\082\001\255\255\084\001\
-\085\001\086\001\255\255\255\255\255\255\255\255\091\001\092\001\
-\000\000\094\001\095\001\096\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\103\001\255\255\105\001\255\255\255\255\108\001\
-\255\255\255\255\111\001\255\255\255\255\255\255\115\001\000\001\
-\001\001\002\001\003\001\255\255\255\255\255\255\255\255\008\001\
-\009\001\010\001\255\255\255\255\013\001\014\001\015\001\016\001\
-\017\001\018\001\019\001\020\001\021\001\255\255\255\255\024\001\
-\025\001\026\001\027\001\028\001\029\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\036\001\037\001\255\255\255\255\040\001\
-\041\001\042\001\043\001\044\001\255\255\255\255\255\255\255\255\
-\049\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\060\001\061\001\255\255\063\001\255\255\
-\255\255\066\001\067\001\068\001\255\255\070\001\071\001\072\001\
-\073\001\074\001\255\255\255\255\255\255\255\255\255\255\080\001\
-\255\255\082\001\255\255\084\001\085\001\086\001\255\255\255\255\
-\255\255\255\255\091\001\092\001\000\000\094\001\095\001\096\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\103\001\255\255\
-\105\001\255\255\255\255\108\001\255\255\255\255\111\001\255\255\
-\255\255\255\255\115\001\000\001\001\001\002\001\003\001\255\255\
-\255\255\255\255\255\255\008\001\009\001\010\001\255\255\255\255\
-\013\001\014\001\015\001\016\001\017\001\018\001\019\001\020\001\
-\021\001\255\255\255\255\024\001\025\001\026\001\027\001\028\001\
-\029\001\255\255\255\255\255\255\255\255\255\255\255\255\036\001\
-\037\001\255\255\255\255\040\001\041\001\042\001\043\001\044\001\
-\255\255\255\255\255\255\255\255\049\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\060\001\
-\061\001\255\255\063\001\255\255\255\255\066\001\067\001\068\001\
-\255\255\070\001\071\001\072\001\073\001\074\001\255\255\255\255\
-\255\255\255\255\255\255\080\001\255\255\082\001\255\255\084\001\
-\085\001\086\001\255\255\255\255\255\255\255\255\091\001\092\001\
-\000\000\094\001\095\001\096\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\103\001\255\255\105\001\255\255\255\255\108\001\
-\255\255\255\255\111\001\255\255\255\255\255\255\115\001\255\255\
-\000\001\001\001\002\001\003\001\255\255\255\255\255\255\255\255\
-\008\001\009\001\010\001\255\255\255\255\013\001\014\001\015\001\
-\016\001\017\001\018\001\019\001\020\001\021\001\255\255\255\255\
-\024\001\025\001\026\001\027\001\028\001\029\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\036\001\037\001\255\255\255\255\
-\040\001\041\001\042\001\043\001\044\001\255\255\255\255\255\255\
-\255\255\049\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\060\001\061\001\255\255\063\001\
-\255\255\255\255\066\001\067\001\068\001\255\255\070\001\071\001\
-\072\001\073\001\074\001\255\255\255\255\255\255\255\255\255\255\
-\080\001\255\255\082\001\255\255\084\001\085\001\086\001\255\255\
-\255\255\255\255\255\255\091\001\092\001\000\000\094\001\095\001\
-\096\001\255\255\255\255\255\255\255\255\255\255\255\255\103\001\
-\255\255\105\001\255\255\255\255\108\001\255\255\255\255\111\001\
-\255\255\255\255\255\255\115\001\000\001\001\001\002\001\003\001\
-\255\255\255\255\255\255\255\255\008\001\009\001\010\001\255\255\
-\255\255\013\001\014\001\015\001\016\001\017\001\018\001\019\001\
-\020\001\021\001\255\255\255\255\024\001\025\001\026\001\027\001\
-\028\001\029\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\036\001\037\001\255\255\255\255\040\001\041\001\042\001\043\001\
-\044\001\255\255\255\255\255\255\255\255\049\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\060\001\061\001\255\255\063\001\255\255\255\255\066\001\067\001\
-\068\001\255\255\070\001\071\001\072\001\073\001\074\001\255\255\
-\255\255\255\255\255\255\255\255\080\001\255\255\082\001\255\255\
-\084\001\085\001\086\001\255\255\255\255\255\255\255\255\091\001\
-\092\001\000\000\094\001\095\001\096\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\103\001\255\255\105\001\255\255\255\255\
-\108\001\255\255\255\255\111\001\255\255\255\255\255\255\115\001\
-\000\001\001\001\002\001\003\001\255\255\255\255\255\255\255\255\
-\008\001\009\001\010\001\255\255\255\255\013\001\014\001\015\001\
-\016\001\017\001\018\001\019\001\020\001\021\001\255\255\255\255\
-\024\001\025\001\026\001\027\001\028\001\029\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\036\001\037\001\255\255\255\255\
-\040\001\041\001\042\001\043\001\044\001\045\001\046\001\255\255\
-\255\255\049\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\060\001\061\001\255\255\255\255\
-\255\255\255\255\066\001\067\001\068\001\255\255\070\001\255\255\
-\255\255\073\001\074\001\255\255\255\255\255\255\255\255\255\255\
-\080\001\255\255\082\001\255\255\255\255\255\255\086\001\255\255\
-\255\255\255\255\255\255\091\001\092\001\000\000\094\001\095\001\
-\096\001\255\255\255\255\255\255\100\001\255\255\255\255\103\001\
-\255\255\105\001\255\255\255\255\108\001\255\255\255\255\111\001\
-\255\255\255\255\255\255\115\001\255\255\000\001\001\001\002\001\
-\003\001\255\255\255\255\255\255\255\255\008\001\009\001\010\001\
-\255\255\255\255\013\001\014\001\255\255\016\001\017\001\018\001\
-\019\001\020\001\021\001\255\255\255\255\024\001\025\001\026\001\
-\027\001\028\001\029\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\036\001\037\001\255\255\255\255\040\001\041\001\042\001\
-\043\001\255\255\255\255\255\255\255\255\255\255\049\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\060\001\061\001\255\255\063\001\255\255\255\255\066\001\
-\067\001\068\001\255\255\070\001\255\255\255\255\073\001\074\001\
-\255\255\255\255\255\255\255\255\255\255\080\001\255\255\082\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\091\001\092\001\000\000\094\001\095\001\096\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\103\001\255\255\105\001\255\255\
-\255\255\108\001\255\255\255\255\111\001\255\255\255\255\255\255\
-\115\001\000\001\001\001\002\001\003\001\255\255\255\255\255\255\
-\255\255\008\001\009\001\010\001\255\255\255\255\013\001\014\001\
-\255\255\016\001\017\001\018\001\019\001\020\001\021\001\255\255\
-\255\255\024\001\025\001\026\001\027\001\028\001\029\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\036\001\037\001\255\255\
-\255\255\040\001\041\001\042\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\049\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\060\001\061\001\255\255\
-\063\001\255\255\255\255\255\255\067\001\068\001\255\255\070\001\
-\255\255\255\255\073\001\074\001\255\255\255\255\255\255\255\255\
-\255\255\080\001\255\255\082\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\091\001\092\001\000\000\094\001\
-\095\001\096\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\103\001\255\255\105\001\255\255\255\255\108\001\255\255\255\255\
-\111\001\255\255\255\255\255\255\115\001\000\001\001\001\002\001\
-\003\001\255\255\255\255\255\255\255\255\008\001\009\001\010\001\
-\255\255\255\255\013\001\014\001\255\255\016\001\017\001\018\001\
-\019\001\020\001\021\001\255\255\255\255\024\001\025\001\026\001\
-\027\001\028\001\029\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\036\001\037\001\255\255\255\255\040\001\041\001\042\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\049\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\060\001\061\001\255\255\063\001\255\255\255\255\255\255\
-\067\001\068\001\255\255\070\001\255\255\255\255\073\001\074\001\
-\255\255\255\255\255\255\255\255\255\255\080\001\255\255\082\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\091\001\092\001\000\000\094\001\095\001\096\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\103\001\255\255\105\001\255\255\
-\255\255\108\001\255\255\255\255\111\001\255\255\255\255\255\255\
-\115\001\255\255\000\001\001\001\002\001\003\001\255\255\255\255\
-\255\255\255\255\008\001\009\001\010\001\255\255\255\255\013\001\
-\014\001\255\255\016\001\017\001\018\001\019\001\020\001\021\001\
-\255\255\255\255\024\001\025\001\026\001\027\001\028\001\029\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\036\001\037\001\
-\255\255\255\255\040\001\041\001\042\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\049\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\060\001\061\001\
-\255\255\063\001\255\255\255\255\255\255\067\001\068\001\255\255\
-\070\001\255\255\255\255\073\001\074\001\255\255\255\255\255\255\
-\255\255\255\255\080\001\255\255\082\001\255\255\255\255\000\000\
-\255\255\255\255\255\255\255\255\255\255\091\001\092\001\255\255\
-\094\001\095\001\096\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\103\001\255\255\105\001\255\255\255\255\108\001\255\255\
-\255\255\111\001\255\255\255\255\255\255\115\001\000\001\001\001\
-\002\001\003\001\255\255\255\255\255\255\255\255\008\001\009\001\
-\010\001\255\255\255\255\013\001\014\001\255\255\016\001\017\001\
-\018\001\019\001\020\001\021\001\255\255\255\255\024\001\025\001\
-\026\001\027\001\028\001\029\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\036\001\037\001\255\255\255\255\040\001\041\001\
-\042\001\255\255\255\255\255\255\255\255\255\255\255\255\049\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\060\001\061\001\255\255\063\001\255\255\255\255\
-\255\255\067\001\068\001\255\255\070\001\255\255\255\255\073\001\
-\074\001\255\255\255\255\255\255\000\000\255\255\080\001\255\255\
-\082\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\091\001\092\001\255\255\094\001\095\001\096\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\103\001\255\255\105\001\
-\255\255\255\255\108\001\255\255\255\255\111\001\255\255\255\255\
-\255\255\115\001\000\001\001\001\002\001\003\001\255\255\255\255\
-\255\255\255\255\008\001\009\001\010\001\255\255\255\255\013\001\
-\014\001\255\255\016\001\017\001\018\001\019\001\020\001\021\001\
-\255\255\255\255\024\001\025\001\026\001\027\001\028\001\029\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\036\001\037\001\
-\255\255\255\255\040\001\041\001\042\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\049\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\060\001\061\001\
-\255\255\063\001\255\255\255\255\000\000\067\001\068\001\255\255\
-\070\001\255\255\255\255\073\001\074\001\255\255\255\255\255\255\
-\255\255\255\255\080\001\255\255\082\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\091\001\092\001\255\255\
-\094\001\095\001\096\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\103\001\255\255\105\001\255\255\255\255\108\001\000\001\
-\255\255\111\001\003\001\255\255\255\255\115\001\255\255\008\001\
-\009\001\010\001\255\255\255\255\013\001\014\001\255\255\016\001\
-\017\001\018\001\019\001\020\001\021\001\255\255\255\255\024\001\
-\025\001\026\001\255\255\028\001\029\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\037\001\255\255\255\255\040\001\
-\041\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\049\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\060\001\000\000\255\255\063\001\255\255\
-\255\255\255\255\067\001\068\001\255\255\070\001\255\255\255\255\
-\073\001\074\001\255\255\255\255\255\255\255\255\255\255\080\001\
-\255\255\082\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\091\001\092\001\255\255\094\001\095\001\096\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\103\001\255\255\
-\105\001\255\255\255\255\108\001\000\001\255\255\111\001\003\001\
-\255\255\255\255\115\001\255\255\008\001\009\001\010\001\255\255\
-\255\255\013\001\014\001\255\255\016\001\017\001\018\001\019\001\
-\020\001\021\001\255\255\255\255\024\001\025\001\026\001\255\255\
-\028\001\029\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\037\001\255\255\255\255\040\001\041\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\049\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\000\000\255\255\255\255\255\255\
-\060\001\255\255\255\255\063\001\255\255\255\255\255\255\067\001\
-\068\001\255\255\070\001\255\255\255\255\073\001\074\001\255\255\
-\255\255\255\255\255\255\255\255\080\001\255\255\082\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\091\001\
-\092\001\255\255\094\001\095\001\096\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\103\001\000\001\105\001\255\255\003\001\
-\108\001\255\255\255\255\111\001\008\001\255\255\010\001\115\001\
-\255\255\013\001\014\001\255\255\016\001\017\001\018\001\019\001\
-\020\001\021\001\255\255\255\255\024\001\025\001\026\001\255\255\
-\028\001\029\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\037\001\255\255\255\255\040\001\041\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\049\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\000\000\255\255\255\255\255\255\
-\060\001\255\255\255\255\063\001\255\255\255\255\255\255\067\001\
-\068\001\255\255\070\001\255\255\255\255\073\001\074\001\255\255\
-\255\255\255\255\255\255\255\255\080\001\255\255\255\255\255\255\
-\255\255\255\255\000\000\255\255\255\255\255\255\255\255\091\001\
-\092\001\255\255\094\001\095\001\096\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\103\001\000\001\105\001\255\255\003\001\
-\108\001\255\255\255\255\111\001\008\001\255\255\010\001\115\001\
-\255\255\013\001\014\001\255\255\016\001\017\001\018\001\019\001\
-\020\001\021\001\255\255\255\255\024\001\025\001\026\001\255\255\
-\028\001\029\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\037\001\255\255\255\255\040\001\041\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\049\001\255\255\000\000\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\060\001\255\255\255\255\063\001\255\255\255\255\255\255\067\001\
-\068\001\255\255\070\001\255\255\255\255\073\001\074\001\255\255\
-\255\255\255\255\255\255\255\255\080\001\000\000\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\091\001\
-\092\001\255\255\094\001\095\001\096\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\103\001\000\001\105\001\255\255\003\001\
-\108\001\255\255\255\255\111\001\008\001\255\255\010\001\115\001\
-\255\255\013\001\014\001\255\255\016\001\017\001\018\001\019\001\
-\020\001\021\001\255\255\255\255\024\001\025\001\026\001\255\255\
-\028\001\029\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\037\001\255\255\255\255\040\001\041\001\255\255\255\255\
-\255\255\255\255\000\000\255\255\255\255\049\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\060\001\255\255\255\255\063\001\255\255\255\255\255\255\067\001\
-\068\001\255\255\070\001\255\255\255\255\073\001\074\001\255\255\
-\255\255\255\255\255\255\255\255\080\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\091\001\
-\092\001\255\255\094\001\095\001\096\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\103\001\000\001\105\001\255\255\003\001\
-\108\001\255\255\255\255\111\001\008\001\255\255\010\001\115\001\
-\255\255\013\001\014\001\255\255\016\001\017\001\018\001\019\001\
-\020\001\021\001\255\255\255\255\024\001\025\001\026\001\255\255\
-\028\001\029\001\000\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\037\001\008\001\255\255\040\001\041\001\255\255\013\001\
-\255\255\255\255\000\000\255\255\255\255\049\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\026\001\255\255\028\001\029\001\
-\060\001\255\255\255\255\063\001\255\255\255\255\255\255\067\001\
-\068\001\255\255\070\001\041\001\255\255\073\001\074\001\255\255\
-\000\000\255\255\255\255\255\255\080\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\060\001\091\001\
-\092\001\063\001\094\001\095\001\096\001\067\001\068\001\000\001\
-\255\255\255\255\003\001\103\001\074\001\105\001\255\255\008\001\
-\108\001\010\001\080\001\111\001\013\001\014\001\255\255\115\001\
-\017\001\255\255\019\001\020\001\021\001\255\255\092\001\024\001\
-\025\001\026\001\096\001\028\001\029\001\000\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\037\001\255\255\108\001\040\001\
-\041\001\111\001\013\001\255\255\255\255\000\000\255\255\255\255\
-\049\001\255\255\255\255\255\255\255\255\255\255\255\255\026\001\
-\255\255\028\001\029\001\060\001\255\255\255\255\063\001\255\255\
-\255\255\255\255\067\001\068\001\255\255\070\001\041\001\255\255\
-\073\001\074\001\255\255\000\000\255\255\255\255\255\255\080\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\060\001\091\001\092\001\063\001\094\001\095\001\096\001\
-\067\001\068\001\000\001\255\255\255\255\003\001\103\001\074\001\
-\105\001\255\255\008\001\108\001\010\001\080\001\111\001\013\001\
-\014\001\255\255\115\001\017\001\255\255\019\001\020\001\021\001\
-\255\255\092\001\024\001\025\001\026\001\096\001\028\001\029\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\037\001\
-\255\255\108\001\040\001\041\001\111\001\255\255\255\255\255\255\
-\000\000\255\255\255\255\049\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\060\001\255\255\
-\255\255\063\001\255\255\255\255\255\255\067\001\068\001\255\255\
-\070\001\255\255\255\255\073\001\074\001\255\255\255\255\255\255\
-\255\255\255\255\080\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\091\001\092\001\255\255\
-\094\001\095\001\096\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\103\001\000\001\105\001\255\255\003\001\108\001\255\255\
-\255\255\111\001\008\001\255\255\010\001\115\001\255\255\013\001\
-\014\001\255\255\255\255\017\001\255\255\019\001\020\001\021\001\
-\255\255\255\255\024\001\025\001\026\001\255\255\028\001\029\001\
-\000\001\255\255\255\255\255\255\255\255\255\255\255\255\037\001\
-\255\255\255\255\040\001\041\001\255\255\013\001\255\255\255\255\
-\000\000\255\255\255\255\049\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\026\001\255\255\028\001\029\001\060\001\255\255\
-\255\255\063\001\255\255\255\255\255\255\067\001\068\001\255\255\
-\070\001\041\001\255\255\073\001\074\001\255\255\000\000\255\255\
-\255\255\255\255\080\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\060\001\091\001\092\001\063\001\
-\094\001\095\001\096\001\067\001\068\001\000\001\255\255\255\255\
-\003\001\103\001\074\001\105\001\255\255\008\001\108\001\010\001\
-\080\001\111\001\013\001\014\001\255\255\115\001\017\001\255\255\
-\019\001\020\001\021\001\255\255\092\001\024\001\025\001\026\001\
-\096\001\028\001\029\001\000\001\255\255\255\255\003\001\255\255\
-\255\255\255\255\037\001\255\255\108\001\040\001\041\001\111\001\
-\013\001\255\255\255\255\000\000\255\255\255\255\049\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\026\001\255\255\028\001\
-\029\001\060\001\255\255\255\255\063\001\255\255\255\255\255\255\
-\067\001\068\001\255\255\070\001\041\001\255\255\073\001\074\001\
-\255\255\000\000\255\255\255\255\255\255\080\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\060\001\
-\091\001\092\001\063\001\094\001\095\001\096\001\255\255\068\001\
-\000\001\255\255\255\255\003\001\103\001\074\001\105\001\255\255\
-\008\001\108\001\010\001\080\001\111\001\013\001\014\001\255\255\
-\115\001\017\001\255\255\019\001\020\001\021\001\255\255\092\001\
-\024\001\025\001\026\001\096\001\028\001\029\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\037\001\255\255\108\001\
-\040\001\041\001\111\001\255\255\255\255\255\255\000\000\255\255\
-\255\255\049\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\060\001\255\255\255\255\063\001\
-\255\255\255\255\255\255\067\001\068\001\255\255\070\001\255\255\
-\255\255\073\001\074\001\255\255\255\255\255\255\255\255\255\255\
-\080\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\091\001\092\001\255\255\094\001\095\001\
-\096\001\255\255\255\255\255\255\255\255\255\255\255\255\103\001\
-\000\001\105\001\255\255\003\001\108\001\255\255\255\255\111\001\
-\008\001\255\255\010\001\115\001\255\255\013\001\014\001\255\255\
-\255\255\017\001\255\255\019\001\020\001\021\001\255\255\255\255\
-\024\001\025\001\026\001\255\255\028\001\029\001\000\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\037\001\255\255\255\255\
-\040\001\041\001\255\255\013\001\255\255\255\255\000\000\255\255\
-\255\255\049\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\026\001\255\255\028\001\029\001\060\001\255\255\255\255\063\001\
-\255\255\255\255\255\255\067\001\068\001\255\255\070\001\041\001\
-\255\255\073\001\074\001\255\255\000\000\255\255\255\255\255\255\
-\080\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\060\001\091\001\092\001\063\001\094\001\095\001\
-\096\001\067\001\068\001\000\001\255\255\255\255\003\001\103\001\
-\074\001\105\001\255\255\008\001\108\001\010\001\080\001\111\001\
-\013\001\014\001\255\255\115\001\017\001\255\255\019\001\020\001\
-\021\001\255\255\092\001\024\001\025\001\026\001\096\001\028\001\
-\029\001\000\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\037\001\255\255\108\001\040\001\041\001\111\001\013\001\255\255\
-\255\255\000\000\255\255\255\255\049\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\026\001\255\255\028\001\029\001\060\001\
-\255\255\255\255\063\001\255\255\255\255\255\255\067\001\068\001\
-\255\255\070\001\041\001\255\255\073\001\074\001\255\255\000\000\
-\255\255\255\255\255\255\080\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\060\001\091\001\092\001\
-\063\001\094\001\095\001\096\001\067\001\068\001\000\001\255\255\
-\255\255\003\001\103\001\074\001\105\001\255\255\008\001\108\001\
-\010\001\080\001\111\001\013\001\014\001\255\255\115\001\017\001\
-\255\255\019\001\020\001\021\001\255\255\092\001\024\001\025\001\
-\026\001\096\001\028\001\029\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\037\001\255\255\108\001\040\001\041\001\
-\111\001\255\255\255\255\255\255\000\000\255\255\255\255\049\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\060\001\255\255\255\255\063\001\255\255\255\255\
-\255\255\067\001\068\001\255\255\070\001\255\255\255\255\073\001\
-\074\001\255\255\255\255\255\255\255\255\255\255\080\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\091\001\092\001\255\255\094\001\095\001\096\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\103\001\000\001\105\001\
-\255\255\003\001\108\001\255\255\255\255\111\001\008\001\255\255\
-\010\001\115\001\255\255\013\001\014\001\255\255\255\255\017\001\
-\255\255\019\001\020\001\021\001\255\255\255\255\024\001\025\001\
-\026\001\255\255\028\001\029\001\000\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\037\001\255\255\255\255\040\001\041\001\
-\255\255\013\001\255\255\255\255\000\000\255\255\255\255\049\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\026\001\255\255\
-\028\001\029\001\060\001\255\255\255\255\063\001\255\255\255\255\
-\255\255\067\001\068\001\255\255\070\001\041\001\255\255\073\001\
-\074\001\255\255\000\000\255\255\255\255\255\255\080\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\060\001\091\001\092\001\063\001\094\001\095\001\096\001\255\255\
-\068\001\000\001\255\255\255\255\003\001\103\001\074\001\105\001\
-\255\255\008\001\108\001\010\001\080\001\111\001\013\001\014\001\
-\255\255\115\001\017\001\255\255\019\001\020\001\021\001\255\255\
-\092\001\024\001\025\001\026\001\096\001\028\001\029\001\000\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\037\001\255\255\
-\108\001\040\001\041\001\111\001\013\001\255\255\255\255\000\000\
-\255\255\255\255\049\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\026\001\255\255\028\001\029\001\060\001\255\255\255\255\
-\063\001\255\255\255\255\255\255\067\001\068\001\255\255\070\001\
-\041\001\255\255\073\001\074\001\255\255\255\255\255\255\255\255\
-\255\255\080\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\060\001\091\001\092\001\063\001\094\001\
-\095\001\096\001\255\255\068\001\000\001\255\255\255\255\003\001\
-\103\001\074\001\105\001\255\255\008\001\108\001\010\001\080\001\
-\111\001\013\001\014\001\255\255\115\001\017\001\255\255\019\001\
-\020\001\021\001\255\255\092\001\024\001\025\001\026\001\096\001\
-\028\001\029\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\037\001\255\255\108\001\040\001\041\001\111\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\049\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\000\000\255\255\255\255\
-\060\001\255\255\255\255\063\001\255\255\255\255\255\255\067\001\
-\068\001\255\255\070\001\255\255\255\255\073\001\074\001\255\255\
-\255\255\255\255\255\255\255\255\080\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\091\001\
-\092\001\255\255\094\001\095\001\096\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\103\001\000\001\105\001\255\255\003\001\
-\108\001\255\255\255\255\111\001\008\001\255\255\010\001\115\001\
-\255\255\013\001\014\001\255\255\255\255\017\001\255\255\019\001\
-\020\001\021\001\255\255\255\255\024\001\025\001\026\001\255\255\
-\028\001\029\001\000\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\037\001\255\255\255\255\040\001\041\001\255\255\013\001\
-\255\255\255\255\255\255\255\255\255\255\049\001\255\255\255\255\
-\000\000\255\255\255\255\255\255\026\001\255\255\028\001\029\001\
-\060\001\255\255\255\255\063\001\255\255\255\255\255\255\067\001\
-\068\001\255\255\070\001\041\001\255\255\073\001\074\001\255\255\
-\255\255\255\255\255\255\255\255\080\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\060\001\091\001\
-\092\001\063\001\094\001\095\001\096\001\255\255\068\001\000\001\
-\255\255\255\255\003\001\103\001\074\001\105\001\255\255\008\001\
-\108\001\010\001\080\001\111\001\013\001\014\001\255\255\115\001\
-\017\001\255\255\019\001\020\001\021\001\255\255\092\001\024\001\
-\025\001\026\001\096\001\028\001\029\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\037\001\255\255\108\001\040\001\
-\041\001\111\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\049\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\060\001\255\255\255\255\063\001\255\255\
-\255\255\255\255\067\001\068\001\000\000\070\001\255\255\255\255\
-\073\001\074\001\255\255\255\255\255\255\255\255\255\255\080\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\091\001\092\001\255\255\094\001\255\255\096\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\103\001\255\255\
-\105\001\255\255\255\255\108\001\255\255\000\001\111\001\002\001\
-\003\001\004\001\115\001\255\255\255\255\008\001\255\255\255\255\
-\255\255\255\255\013\001\255\255\255\255\255\255\017\001\018\001\
-\019\001\255\255\255\255\255\255\255\255\255\255\255\255\026\001\
-\027\001\028\001\029\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\036\001\255\255\255\255\255\255\040\001\041\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\048\001\049\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\000\000\
-\255\255\060\001\255\255\255\255\063\001\255\255\255\255\066\001\
-\067\001\068\001\255\255\070\001\255\255\255\255\073\001\074\001\
-\255\255\255\255\255\255\255\255\255\255\080\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\091\001\092\001\255\255\094\001\095\001\096\001\255\255\255\255\
-\000\001\100\001\255\255\003\001\255\255\255\255\255\255\255\255\
-\008\001\108\001\010\001\255\255\111\001\013\001\014\001\255\255\
-\115\001\017\001\255\255\019\001\020\001\021\001\255\255\255\255\
-\024\001\255\255\026\001\255\255\028\001\029\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\037\001\255\255\255\255\
-\040\001\041\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\049\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\000\000\255\255\060\001\255\255\255\255\063\001\
-\255\255\255\255\255\255\067\001\068\001\255\255\070\001\255\255\
-\255\255\073\001\074\001\255\255\255\255\255\255\255\255\255\255\
-\080\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\091\001\092\001\255\255\094\001\095\001\
-\096\001\255\255\255\255\255\255\255\255\255\255\255\255\103\001\
-\255\255\105\001\255\255\255\255\108\001\255\255\255\255\111\001\
-\255\255\255\255\255\255\115\001\000\001\255\255\002\001\003\001\
-\004\001\255\255\255\255\255\255\008\001\255\255\255\255\255\255\
-\255\255\013\001\255\255\255\255\255\255\017\001\018\001\019\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\026\001\027\001\
-\028\001\029\001\255\255\255\255\008\001\255\255\255\255\255\255\
-\036\001\255\255\255\255\255\255\255\255\041\001\255\255\000\000\
-\255\255\255\255\255\255\023\001\048\001\049\001\255\255\255\255\
-\255\255\255\255\030\001\255\255\255\255\255\255\255\255\255\255\
-\060\001\255\255\255\255\063\001\255\255\255\255\066\001\067\001\
-\068\001\255\255\070\001\255\255\255\255\073\001\074\001\255\255\
-\255\255\255\255\255\255\055\001\080\001\057\001\058\001\059\001\
-\255\255\061\001\255\255\255\255\064\001\065\001\255\255\091\001\
-\092\001\255\255\094\001\095\001\096\001\255\255\255\255\000\001\
-\255\255\002\001\003\001\004\001\255\255\081\001\255\255\008\001\
-\108\001\255\255\255\255\111\001\013\001\089\001\090\001\115\001\
-\017\001\018\001\019\001\255\255\255\255\097\001\255\255\255\255\
-\255\255\026\001\027\001\028\001\029\001\255\255\106\001\255\255\
-\255\255\109\001\110\001\036\001\255\255\255\255\255\255\255\255\
-\041\001\255\255\000\000\255\255\255\255\255\255\255\255\048\001\
-\049\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\060\001\255\255\255\255\063\001\255\255\
-\255\255\066\001\067\001\068\001\255\255\070\001\255\255\255\255\
-\255\255\074\001\255\255\255\255\255\255\255\255\255\255\080\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\091\001\092\001\255\255\094\001\095\001\096\001\
-\255\255\255\255\000\001\255\255\002\001\003\001\004\001\255\255\
-\255\255\255\255\008\001\108\001\255\255\255\255\111\001\013\001\
-\255\255\255\255\115\001\017\001\018\001\019\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\026\001\027\001\028\001\029\001\
-\255\255\255\255\255\255\255\255\000\000\255\255\036\001\255\255\
-\255\255\255\255\255\255\041\001\255\255\255\255\000\000\255\255\
-\255\255\255\255\048\001\049\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\060\001\255\255\
-\255\255\063\001\255\255\255\255\066\001\067\001\068\001\255\255\
-\070\001\255\255\255\255\255\255\074\001\255\255\255\255\255\255\
-\255\255\255\255\080\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\091\001\092\001\000\000\
-\094\001\095\001\096\001\255\255\255\255\255\255\255\255\000\001\
-\255\255\002\001\003\001\004\001\255\255\255\255\108\001\008\001\
-\255\255\111\001\255\255\255\255\013\001\115\001\255\255\255\255\
-\017\001\018\001\019\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\026\001\027\001\028\001\029\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\036\001\255\255\255\255\255\255\255\255\
-\041\001\255\255\255\255\255\255\255\255\255\255\255\255\048\001\
-\049\001\000\000\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\060\001\255\255\255\255\063\001\255\255\
-\255\255\066\001\067\001\068\001\255\255\070\001\255\255\255\255\
-\255\255\074\001\255\255\255\255\255\255\255\255\055\001\080\001\
-\057\001\058\001\059\001\255\255\061\001\255\255\255\255\064\001\
-\065\001\255\255\091\001\092\001\255\255\094\001\095\001\096\001\
-\255\255\255\255\000\001\255\255\002\001\003\001\004\001\255\255\
-\081\001\255\255\008\001\108\001\255\255\255\255\111\001\013\001\
-\089\001\090\001\115\001\017\001\018\001\019\001\255\255\255\255\
-\097\001\255\255\255\255\255\255\026\001\027\001\028\001\029\001\
-\255\255\255\255\255\255\255\255\109\001\110\001\036\001\255\255\
-\255\255\255\255\255\255\041\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\048\001\049\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\060\001\255\255\
-\255\255\063\001\000\000\255\255\066\001\067\001\068\001\255\255\
-\070\001\255\255\255\255\255\255\074\001\255\255\255\255\255\255\
-\255\255\255\255\080\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\000\001\091\001\092\001\003\001\
-\094\001\095\001\096\001\255\255\255\255\255\255\000\001\255\255\
-\255\255\013\001\255\255\255\255\255\255\017\001\108\001\019\001\
-\255\255\111\001\255\255\013\001\255\255\115\001\026\001\027\001\
-\028\001\029\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\026\001\255\255\028\001\029\001\255\255\041\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\041\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\000\001\
-\060\001\255\255\255\255\063\001\255\255\255\255\255\255\067\001\
-\068\001\255\255\060\001\255\255\013\001\073\001\074\001\255\255\
-\017\001\067\001\068\001\255\255\080\001\255\255\255\255\255\255\
-\074\001\026\001\027\001\028\001\029\001\000\000\080\001\255\255\
-\092\001\255\255\094\001\255\255\096\001\255\255\255\255\255\255\
-\041\001\255\255\092\001\255\255\255\255\255\255\096\001\255\255\
-\108\001\255\255\255\255\111\001\255\255\255\255\255\255\115\001\
-\255\255\000\001\108\001\060\001\003\001\111\001\063\001\255\255\
-\255\255\066\001\067\001\068\001\255\255\255\255\013\001\255\255\
-\073\001\074\001\017\001\255\255\255\255\255\255\255\255\080\001\
-\255\255\255\255\255\255\026\001\027\001\028\001\029\001\255\255\
-\255\255\255\255\255\255\092\001\255\255\094\001\255\255\096\001\
-\255\255\255\255\041\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\108\001\255\255\255\255\111\001\255\255\
-\255\255\255\255\115\001\255\255\255\255\060\001\255\255\255\255\
-\063\001\255\255\255\255\255\255\067\001\068\001\255\255\255\255\
-\255\255\255\255\073\001\074\001\055\001\255\255\057\001\058\001\
-\059\001\080\001\061\001\255\255\000\000\064\001\065\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\092\001\255\255\094\001\
-\255\255\096\001\255\255\255\255\255\255\255\255\081\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\108\001\089\001\090\001\
-\111\001\255\255\000\001\255\255\115\001\003\001\097\001\005\001\
-\006\001\007\001\008\001\255\255\255\255\011\001\012\001\013\001\
-\255\255\255\255\109\001\110\001\255\255\019\001\255\255\255\255\
-\255\255\023\001\255\255\255\255\026\001\255\255\028\001\029\001\
-\030\001\031\001\032\001\033\001\034\001\035\001\036\001\255\255\
-\255\255\039\001\040\001\041\001\255\255\255\255\000\000\255\255\
-\255\255\255\255\048\001\049\001\050\001\051\001\052\001\053\001\
-\054\001\055\001\056\001\057\001\058\001\059\001\060\001\061\001\
-\255\255\063\001\064\001\065\001\255\255\067\001\068\001\069\001\
-\070\001\071\001\072\001\255\255\074\001\075\001\255\255\077\001\
-\078\001\255\255\080\001\081\001\255\255\255\255\084\001\085\001\
-\255\255\087\001\088\001\089\001\090\001\091\001\092\001\093\001\
-\255\255\095\001\096\001\097\001\255\255\099\001\255\255\101\001\
-\102\001\255\255\104\001\255\255\106\001\107\001\108\001\109\001\
-\110\001\111\001\112\001\000\000\114\001\000\001\255\255\255\255\
-\255\255\004\001\255\255\006\001\255\255\008\001\255\255\010\001\
-\255\255\012\001\255\255\014\001\015\001\255\255\017\001\018\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\027\001\028\001\255\255\030\001\031\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\050\001\
-\051\001\052\001\053\001\255\255\055\001\056\001\255\255\255\255\
-\059\001\000\000\255\255\255\255\255\255\064\001\065\001\066\001\
-\255\255\255\255\255\255\255\255\071\001\255\255\073\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\081\001\255\255\
-\255\255\084\001\255\255\255\255\255\255\255\255\089\001\255\255\
-\091\001\092\001\255\255\094\001\095\001\255\255\097\001\255\255\
-\255\255\255\255\101\001\255\255\255\255\104\001\255\255\106\001\
-\255\255\255\255\109\001\110\001\000\001\255\255\113\001\255\255\
-\004\001\255\255\006\001\000\000\008\001\255\255\010\001\255\255\
-\012\001\255\255\014\001\015\001\255\255\017\001\018\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\027\001\
-\255\255\255\255\030\001\031\001\255\255\255\255\255\255\255\255\
-\255\255\000\000\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\050\001\051\001\
-\255\255\053\001\255\255\055\001\056\001\255\255\255\255\059\001\
-\255\255\255\255\255\255\255\255\064\001\065\001\066\001\255\255\
-\255\255\255\255\255\255\071\001\255\255\073\001\000\001\255\255\
-\255\255\003\001\255\255\255\255\255\255\081\001\008\001\255\255\
-\084\001\255\255\255\255\013\001\014\001\089\001\255\255\091\001\
-\092\001\019\001\094\001\095\001\022\001\097\001\255\255\255\255\
-\026\001\101\001\028\001\029\001\104\001\255\255\106\001\255\255\
-\255\255\109\001\110\001\255\255\255\255\113\001\255\255\041\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\055\001\
-\000\000\057\001\058\001\059\001\255\255\061\001\255\255\255\255\
-\064\001\065\001\060\001\255\255\255\255\063\001\255\255\065\001\
-\066\001\067\001\068\001\000\001\255\255\255\255\003\001\255\255\
-\074\001\081\001\255\255\008\001\255\255\079\001\080\001\255\255\
-\013\001\089\001\090\001\255\255\255\255\255\255\019\001\255\255\
-\255\255\097\001\092\001\255\255\255\255\026\001\096\001\028\001\
-\029\001\255\255\255\255\255\255\255\255\109\001\110\001\255\255\
-\000\000\255\255\108\001\040\001\041\001\111\001\055\001\255\255\
-\057\001\058\001\059\001\255\255\061\001\255\255\255\255\064\001\
-\065\001\255\255\255\255\255\255\255\255\255\255\255\255\060\001\
-\255\255\000\001\063\001\255\255\003\001\066\001\067\001\068\001\
-\081\001\008\001\255\255\255\255\073\001\074\001\013\001\255\255\
-\089\001\090\001\255\255\080\001\019\001\255\255\255\255\255\255\
-\097\001\255\255\255\255\026\001\255\255\028\001\029\001\092\001\
-\000\000\255\255\255\255\096\001\109\001\110\001\255\255\100\001\
-\255\255\040\001\041\001\255\255\255\255\255\255\255\255\108\001\
-\255\255\255\255\111\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\000\001\255\255\060\001\003\001\255\255\
-\063\001\255\255\255\255\066\001\067\001\068\001\255\255\255\255\
-\013\001\255\255\073\001\074\001\255\255\255\255\019\001\255\255\
-\255\255\080\001\255\255\255\255\255\255\026\001\255\255\028\001\
-\029\001\000\001\000\000\255\255\003\001\092\001\255\255\255\255\
-\255\255\096\001\255\255\040\001\041\001\255\255\013\001\255\255\
-\255\255\255\255\017\001\048\001\049\001\108\001\255\255\255\255\
-\111\001\255\255\255\255\026\001\027\001\028\001\029\001\060\001\
-\255\255\255\255\063\001\255\255\255\255\255\255\255\255\068\001\
-\255\255\070\001\041\001\255\255\255\255\074\001\255\255\255\255\
-\255\255\255\255\055\001\080\001\057\001\058\001\059\001\255\255\
-\061\001\255\255\000\000\064\001\065\001\060\001\255\255\092\001\
-\063\001\255\255\255\255\096\001\067\001\068\001\255\255\255\255\
-\255\255\255\255\006\001\074\001\081\001\255\255\255\255\108\001\
-\012\001\080\001\111\001\255\255\089\001\090\001\255\255\255\255\
-\000\001\255\255\255\255\003\001\097\001\092\001\255\255\094\001\
-\008\001\096\001\030\001\031\001\255\255\013\001\255\255\255\255\
-\109\001\110\001\255\255\019\001\255\255\108\001\255\255\000\000\
-\111\001\255\255\026\001\255\255\028\001\029\001\050\001\255\255\
-\052\001\053\001\255\255\055\001\056\001\255\255\255\255\059\001\
-\255\255\041\001\255\255\255\255\064\001\065\001\255\255\255\255\
-\255\255\255\255\255\255\071\001\255\255\255\255\255\255\255\255\
-\000\001\255\255\255\255\003\001\060\001\255\255\255\255\063\001\
-\084\001\255\255\066\001\067\001\068\001\013\001\255\255\255\255\
-\255\255\017\001\074\001\255\255\000\000\097\001\255\255\255\255\
-\080\001\101\001\026\001\027\001\028\001\029\001\106\001\255\255\
-\255\255\109\001\110\001\255\255\092\001\255\255\255\255\255\255\
-\096\001\041\001\255\255\000\000\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\108\001\255\255\255\255\111\001\
-\000\001\255\255\255\255\003\001\060\001\255\255\255\255\063\001\
-\255\255\255\255\255\255\067\001\068\001\013\001\255\255\255\255\
-\255\255\000\000\074\001\019\001\255\255\255\255\255\255\255\255\
-\080\001\255\255\026\001\255\255\028\001\029\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\092\001\255\255\094\001\255\255\
-\096\001\041\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\048\001\255\255\255\255\255\255\108\001\255\255\255\255\111\001\
-\255\255\255\255\000\001\255\255\060\001\003\001\255\255\063\001\
-\255\255\255\255\255\255\067\001\068\001\255\255\070\001\013\001\
-\255\255\000\000\074\001\255\255\255\255\019\001\255\255\255\255\
-\080\001\255\255\255\255\255\255\026\001\255\255\028\001\029\001\
-\255\255\255\255\255\255\255\255\092\001\255\255\255\255\255\255\
-\096\001\255\255\255\255\041\001\255\255\255\255\255\255\000\000\
-\255\255\255\255\255\255\255\255\108\001\255\255\255\255\111\001\
-\255\255\255\255\000\001\255\255\255\255\003\001\060\001\255\255\
-\255\255\063\001\008\001\255\255\255\255\067\001\068\001\013\001\
-\255\255\255\255\255\255\255\255\074\001\019\001\255\255\255\255\
-\255\255\255\255\080\001\255\255\026\001\255\255\028\001\029\001\
-\086\001\255\255\255\255\255\255\255\255\255\255\092\001\255\255\
-\255\255\255\255\096\001\041\001\255\255\255\255\255\255\000\000\
-\255\255\255\255\255\255\255\255\255\255\255\255\108\001\000\001\
-\255\255\111\001\003\001\255\255\255\255\255\255\060\001\255\255\
-\000\000\063\001\255\255\255\255\013\001\067\001\068\001\255\255\
-\255\255\255\255\019\001\255\255\074\001\255\255\255\255\255\255\
-\255\255\026\001\080\001\028\001\029\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\092\001\255\255\
-\041\001\255\255\096\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\000\001\255\255\108\001\003\001\
-\255\255\111\001\255\255\060\001\255\255\255\255\063\001\255\255\
-\000\000\013\001\067\001\068\001\255\255\255\255\255\255\019\001\
-\255\255\074\001\255\255\000\001\255\255\255\255\026\001\080\001\
-\028\001\029\001\255\255\008\001\255\255\000\000\255\255\255\255\
-\013\001\255\255\255\255\092\001\255\255\041\001\000\000\096\001\
-\255\255\255\255\255\255\255\255\255\255\026\001\255\255\028\001\
-\029\001\000\001\255\255\108\001\003\001\255\255\111\001\255\255\
-\060\001\255\255\255\255\063\001\041\001\255\255\013\001\067\001\
-\068\001\255\255\255\255\255\255\019\001\255\255\074\001\255\255\
-\255\255\000\000\255\255\026\001\080\001\028\001\029\001\060\001\
-\255\255\255\255\063\001\255\255\255\255\066\001\067\001\068\001\
-\092\001\255\255\041\001\255\255\096\001\074\001\000\000\255\255\
-\255\255\255\255\255\255\080\001\255\255\255\255\255\255\255\255\
-\108\001\000\001\255\255\111\001\003\001\060\001\255\255\092\001\
-\063\001\255\255\255\255\096\001\067\001\068\001\013\001\255\255\
-\255\255\255\255\255\255\074\001\019\001\255\255\255\255\108\001\
-\255\255\080\001\111\001\026\001\255\255\028\001\029\001\000\001\
-\255\255\255\255\003\001\255\255\255\255\092\001\255\255\255\255\
-\255\255\096\001\041\001\255\255\013\001\255\255\255\255\255\255\
-\255\255\255\255\019\001\255\255\255\255\108\001\255\255\255\255\
-\111\001\026\001\255\255\028\001\029\001\060\001\255\255\255\255\
-\063\001\255\255\255\255\255\255\067\001\068\001\255\255\255\255\
-\041\001\255\255\255\255\074\001\255\255\255\255\255\255\255\255\
-\255\255\080\001\255\255\255\255\255\255\255\255\255\255\000\001\
-\255\255\255\255\003\001\060\001\255\255\092\001\063\001\255\255\
-\255\255\096\001\067\001\068\001\013\001\255\255\255\255\255\255\
-\000\001\074\001\019\001\255\255\255\255\108\001\255\255\080\001\
-\111\001\026\001\255\255\028\001\029\001\013\001\255\255\255\255\
-\255\255\255\255\255\255\092\001\255\255\255\255\255\255\096\001\
-\041\001\255\255\026\001\255\255\028\001\029\001\255\255\255\255\
-\255\255\255\255\255\255\108\001\255\255\255\255\111\001\255\255\
-\255\255\041\001\255\255\060\001\255\255\255\255\063\001\255\255\
-\255\255\255\255\067\001\068\001\255\255\255\255\255\255\255\255\
-\000\001\074\001\255\255\255\255\060\001\255\255\255\255\080\001\
-\255\255\255\255\066\001\067\001\068\001\013\001\255\255\255\255\
-\255\255\255\255\074\001\092\001\255\255\000\001\255\255\096\001\
-\080\001\255\255\026\001\255\255\028\001\029\001\000\001\255\255\
-\255\255\255\255\013\001\108\001\092\001\255\255\111\001\255\255\
-\096\001\041\001\255\255\013\001\255\255\255\255\255\255\026\001\
-\255\255\028\001\029\001\255\255\108\001\255\255\255\255\111\001\
-\026\001\255\255\028\001\029\001\060\001\255\255\041\001\063\001\
-\255\255\000\001\255\255\255\255\068\001\255\255\255\255\041\001\
-\255\255\255\255\074\001\255\255\255\255\255\255\013\001\255\255\
-\080\001\060\001\255\255\255\255\063\001\255\255\000\001\255\255\
-\255\255\068\001\060\001\026\001\092\001\028\001\029\001\074\001\
-\096\001\255\255\068\001\013\001\255\255\080\001\255\255\255\255\
-\074\001\255\255\041\001\255\255\108\001\255\255\080\001\111\001\
-\026\001\092\001\028\001\029\001\255\255\096\001\255\255\255\255\
-\255\255\255\255\092\001\255\255\255\255\060\001\096\001\041\001\
-\255\255\108\001\255\255\255\255\111\001\068\001\255\255\255\255\
-\255\255\255\255\108\001\074\001\255\255\111\001\255\255\255\255\
-\255\255\080\001\060\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\068\001\255\255\255\255\092\001\255\255\255\255\
-\074\001\096\001\255\255\255\255\255\255\255\255\080\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\108\001\255\255\255\255\
-\111\001\255\255\092\001\000\001\255\255\255\255\096\001\255\255\
-\005\001\006\001\007\001\008\001\255\255\255\255\011\001\012\001\
-\013\001\014\001\108\001\255\255\255\255\111\001\019\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\026\001\255\255\028\001\
-\029\001\030\001\031\001\032\001\033\001\034\001\035\001\255\255\
-\255\255\255\255\039\001\255\255\041\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\049\001\050\001\051\001\052\001\
-\053\001\054\001\055\001\056\001\255\255\255\255\059\001\060\001\
-\255\255\255\255\063\001\064\001\065\001\066\001\255\255\068\001\
-\069\001\070\001\071\001\072\001\255\255\074\001\255\255\255\255\
-\077\001\078\001\255\255\080\001\081\001\255\255\255\255\084\001\
-\085\001\255\255\087\001\255\255\089\001\090\001\255\255\092\001\
-\093\001\255\255\255\255\096\001\097\001\255\255\099\001\255\255\
-\101\001\102\001\255\255\104\001\255\255\106\001\107\001\108\001\
-\109\001\110\001\111\001\112\001\000\001\114\001\255\255\255\255\
-\255\255\005\001\006\001\007\001\008\001\255\255\255\255\011\001\
-\012\001\255\255\255\255\255\255\255\255\255\255\255\255\019\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\026\001\255\255\
-\028\001\255\255\030\001\031\001\032\001\033\001\034\001\035\001\
-\255\255\255\255\255\255\039\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\049\001\050\001\051\001\
-\052\001\053\001\054\001\055\001\056\001\255\255\255\255\059\001\
-\060\001\255\255\255\255\063\001\064\001\065\001\255\255\255\255\
-\068\001\069\001\070\001\071\001\072\001\255\255\074\001\255\255\
-\255\255\077\001\078\001\255\255\255\255\081\001\255\255\255\255\
-\084\001\085\001\255\255\087\001\255\255\089\001\090\001\255\255\
-\255\255\093\001\255\255\255\255\255\255\097\001\255\255\099\001\
-\255\255\101\001\102\001\255\255\104\001\255\255\106\001\107\001\
-\255\255\109\001\110\001\111\001\112\001\255\255\114\001\000\001\
-\001\001\002\001\255\255\255\255\005\001\006\001\007\001\255\255\
-\009\001\255\255\011\001\012\001\255\255\255\255\015\001\016\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\027\001\255\255\255\255\030\001\031\001\032\001\
-\033\001\034\001\255\255\036\001\255\255\255\255\039\001\255\255\
-\255\255\042\001\043\001\044\001\045\001\046\001\047\001\255\255\
-\255\255\050\001\255\255\052\001\053\001\054\001\055\001\056\001\
-\255\255\255\255\059\001\255\255\061\001\255\255\063\001\064\001\
-\065\001\255\255\255\255\255\255\069\001\255\255\071\001\072\001\
-\255\255\074\001\255\255\255\255\255\255\078\001\255\255\255\255\
-\255\255\082\001\083\001\084\001\085\001\086\001\087\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\094\001\255\255\255\255\
-\255\255\098\001\255\255\100\001\101\001\255\255\255\255\255\255\
-\255\255\106\001\107\001\255\255\109\001\110\001\000\001\001\001\
-\002\001\114\001\255\255\005\001\006\001\007\001\255\255\009\001\
-\255\255\011\001\012\001\255\255\255\255\015\001\016\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\027\001\255\255\255\255\030\001\031\001\032\001\033\001\
-\034\001\255\255\036\001\255\255\255\255\039\001\255\255\255\255\
-\042\001\043\001\044\001\045\001\046\001\047\001\255\255\255\255\
-\050\001\255\255\052\001\053\001\054\001\055\001\056\001\255\255\
-\255\255\059\001\255\255\061\001\255\255\063\001\064\001\065\001\
-\255\255\255\255\255\255\069\001\255\255\071\001\072\001\255\255\
-\074\001\255\255\255\255\255\255\078\001\255\255\255\255\255\255\
-\082\001\083\001\084\001\085\001\086\001\087\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\094\001\255\255\255\255\255\255\
-\098\001\255\255\100\001\101\001\255\255\255\255\255\255\255\255\
-\106\001\107\001\255\255\109\001\110\001\000\001\255\255\255\255\
-\114\001\255\255\005\001\006\001\007\001\255\255\255\255\255\255\
-\011\001\012\001\013\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\026\001\
-\255\255\028\001\029\001\030\001\031\001\032\001\033\001\034\001\
-\255\255\255\255\255\255\255\255\039\001\255\255\041\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\050\001\
-\255\255\052\001\053\001\054\001\055\001\056\001\255\255\255\255\
-\059\001\060\001\255\255\255\255\063\001\064\001\065\001\255\255\
-\255\255\068\001\069\001\255\255\071\001\072\001\255\255\074\001\
-\255\255\255\255\255\255\078\001\255\255\080\001\255\255\255\255\
-\255\255\084\001\085\001\000\001\087\001\255\255\255\255\255\255\
-\005\001\006\001\007\001\255\255\255\255\096\001\011\001\012\001\
-\255\255\255\255\101\001\255\255\255\255\255\255\255\255\106\001\
-\107\001\108\001\109\001\110\001\111\001\255\255\255\255\114\001\
-\255\255\030\001\031\001\032\001\033\001\034\001\255\255\255\255\
-\255\255\255\255\039\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\050\001\255\255\052\001\
-\053\001\054\001\055\001\056\001\255\255\255\255\059\001\255\255\
-\255\255\255\255\063\001\064\001\065\001\255\255\255\255\255\255\
-\069\001\255\255\071\001\072\001\255\255\255\255\255\255\255\255\
-\255\255\078\001\255\255\255\255\255\255\255\255\255\255\084\001\
-\085\001\000\001\087\001\255\255\255\255\255\255\005\001\006\001\
-\007\001\094\001\255\255\255\255\011\001\012\001\255\255\255\255\
-\101\001\255\255\255\255\255\255\255\255\106\001\107\001\255\255\
-\109\001\110\001\255\255\255\255\255\255\114\001\255\255\030\001\
-\031\001\032\001\033\001\034\001\255\255\255\255\255\255\255\255\
-\039\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\050\001\255\255\052\001\053\001\054\001\
-\055\001\056\001\255\255\255\255\059\001\255\255\255\255\255\255\
-\063\001\064\001\065\001\255\255\255\255\255\255\069\001\255\255\
-\071\001\072\001\255\255\255\255\255\255\255\255\255\255\078\001\
-\255\255\255\255\255\255\255\255\255\255\084\001\085\001\000\001\
-\087\001\255\255\255\255\255\255\005\001\006\001\007\001\094\001\
-\255\255\255\255\011\001\012\001\255\255\255\255\101\001\255\255\
-\255\255\255\255\255\255\106\001\107\001\255\255\109\001\110\001\
-\255\255\255\255\255\255\114\001\255\255\030\001\031\001\032\001\
-\033\001\034\001\255\255\255\255\255\255\255\255\039\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\050\001\255\255\052\001\053\001\054\001\055\001\056\001\
-\255\255\255\255\059\001\255\255\255\255\255\255\063\001\064\001\
-\065\001\255\255\255\255\255\255\069\001\255\255\071\001\072\001\
-\255\255\255\255\255\255\255\255\255\255\078\001\255\255\255\255\
-\255\255\255\255\255\255\084\001\085\001\000\001\087\001\255\255\
-\255\255\255\255\005\001\006\001\007\001\094\001\255\255\255\255\
-\011\001\012\001\255\255\255\255\101\001\255\255\255\255\255\255\
-\255\255\106\001\107\001\255\255\109\001\110\001\255\255\255\255\
-\255\255\114\001\255\255\030\001\031\001\032\001\033\001\034\001\
-\255\255\255\255\255\255\255\255\039\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\050\001\
-\255\255\052\001\053\001\054\001\055\001\056\001\255\255\255\255\
-\059\001\255\255\255\255\255\255\063\001\064\001\065\001\255\255\
-\255\255\255\255\069\001\255\255\071\001\072\001\255\255\255\255\
-\255\255\255\255\255\255\078\001\255\255\255\255\255\255\255\255\
-\255\255\084\001\085\001\255\255\087\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\094\001\003\001\004\001\005\001\255\255\
-\255\255\255\255\101\001\255\255\011\001\255\255\013\001\106\001\
-\107\001\255\255\109\001\110\001\019\001\020\001\021\001\114\001\
-\255\255\024\001\025\001\026\001\255\255\028\001\029\001\030\001\
-\255\255\032\001\033\001\034\001\035\001\255\255\255\255\255\255\
-\039\001\040\001\041\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\048\001\049\001\255\255\255\255\052\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\063\001\064\001\255\255\255\255\255\255\000\001\069\001\070\001\
-\255\255\004\001\255\255\074\001\075\001\076\001\077\001\078\001\
-\079\001\080\001\255\255\082\001\255\255\255\255\017\001\255\255\
-\019\001\088\001\255\255\022\001\255\255\255\255\093\001\026\001\
-\027\001\255\255\255\255\255\255\099\001\255\255\255\255\102\001\
-\103\001\036\001\105\001\106\001\107\001\108\001\109\001\255\255\
-\111\001\112\001\113\001\114\001\115\001\048\001\049\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\060\001\255\255\255\255\255\255\064\001\255\255\066\001\
-\067\001\068\001\255\255\070\001\255\255\255\255\073\001\255\255\
-\255\255\255\255\000\001\001\001\002\001\255\255\255\255\255\255\
-\006\001\007\001\255\255\009\001\255\255\255\255\012\001\090\001\
-\091\001\015\001\016\001\255\255\095\001\255\255\097\001\255\255\
-\255\255\100\001\255\255\255\255\255\255\027\001\028\001\255\255\
-\030\001\031\001\109\001\255\255\111\001\255\255\036\001\255\255\
-\255\255\255\255\255\255\255\255\042\001\043\001\044\001\045\001\
-\046\001\047\001\255\255\255\255\050\001\255\255\052\001\053\001\
-\255\255\055\001\056\001\255\255\255\255\059\001\255\255\061\001\
-\255\255\255\255\064\001\065\001\255\255\255\255\255\255\255\255\
-\255\255\071\001\072\001\255\255\074\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\082\001\083\001\084\001\085\001\
-\086\001\087\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\094\001\255\255\255\255\097\001\098\001\255\255\100\001\101\001\
-\255\255\255\255\255\255\255\255\106\001\255\255\108\001\109\001\
-\110\001\000\001\001\001\002\001\255\255\255\255\255\255\006\001\
-\007\001\255\255\009\001\255\255\255\255\012\001\255\255\255\255\
-\015\001\016\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\027\001\028\001\255\255\030\001\
-\031\001\255\255\255\255\255\255\255\255\036\001\255\255\255\255\
-\255\255\255\255\255\255\042\001\043\001\044\001\045\001\046\001\
-\047\001\255\255\255\255\050\001\255\255\052\001\053\001\255\255\
-\055\001\056\001\255\255\255\255\059\001\255\255\061\001\255\255\
-\255\255\064\001\065\001\255\255\255\255\255\255\255\255\255\255\
-\071\001\072\001\255\255\074\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\082\001\083\001\084\001\085\001\086\001\
-\087\001\255\255\255\255\255\255\255\255\255\255\255\255\094\001\
-\255\255\255\255\097\001\098\001\255\255\100\001\101\001\255\255\
-\255\255\255\255\255\255\106\001\255\255\108\001\109\001\110\001\
-\000\001\001\001\002\001\255\255\255\255\255\255\006\001\007\001\
-\255\255\009\001\255\255\255\255\012\001\255\255\255\255\015\001\
-\016\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\027\001\028\001\255\255\030\001\031\001\
-\255\255\255\255\255\255\255\255\036\001\255\255\255\255\255\255\
-\255\255\255\255\042\001\043\001\044\001\045\001\046\001\047\001\
-\255\255\255\255\050\001\255\255\052\001\053\001\255\255\055\001\
-\056\001\255\255\255\255\059\001\255\255\061\001\255\255\255\255\
-\064\001\065\001\255\255\255\255\255\255\255\255\255\255\071\001\
-\072\001\255\255\074\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\082\001\083\001\084\001\085\001\086\001\087\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\094\001\255\255\
-\255\255\097\001\098\001\255\255\100\001\101\001\255\255\255\255\
-\255\255\255\255\106\001\255\255\108\001\109\001\110\001\000\001\
-\001\001\002\001\255\255\255\255\255\255\006\001\007\001\255\255\
-\009\001\255\255\255\255\012\001\255\255\255\255\015\001\016\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\027\001\028\001\255\255\030\001\031\001\255\255\
-\255\255\255\255\255\255\036\001\255\255\255\255\255\255\255\255\
-\255\255\042\001\043\001\044\001\045\001\046\001\047\001\255\255\
-\255\255\050\001\255\255\052\001\053\001\255\255\055\001\056\001\
-\255\255\255\255\059\001\255\255\061\001\255\255\255\255\064\001\
-\065\001\255\255\255\255\255\255\255\255\255\255\071\001\072\001\
-\255\255\074\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\082\001\083\001\084\001\085\001\086\001\087\001\255\255\
-\255\255\000\001\255\255\255\255\255\255\094\001\255\255\006\001\
-\097\001\098\001\255\255\100\001\101\001\012\001\255\255\255\255\
-\015\001\106\001\255\255\255\255\109\001\110\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\028\001\255\255\030\001\
-\031\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\050\001\255\255\052\001\053\001\255\255\
-\055\001\056\001\255\255\255\255\059\001\255\255\000\001\255\255\
-\255\255\064\001\065\001\255\255\006\001\255\255\255\255\255\255\
-\071\001\255\255\012\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\084\001\255\255\255\255\
-\255\255\255\255\028\001\255\255\030\001\031\001\255\255\094\001\
-\255\255\255\255\097\001\255\255\255\255\255\255\101\001\255\255\
-\255\255\255\255\255\255\106\001\255\255\255\255\109\001\110\001\
-\050\001\255\255\052\001\053\001\255\255\055\001\056\001\255\255\
-\255\255\059\001\255\255\000\001\255\255\255\255\064\001\065\001\
-\255\255\006\001\255\255\255\255\255\255\071\001\255\255\012\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\084\001\255\255\255\255\255\255\255\255\028\001\
-\255\255\030\001\031\001\255\255\255\255\255\255\255\255\097\001\
-\255\255\255\255\255\255\101\001\255\255\255\255\255\255\255\255\
-\106\001\255\255\255\255\109\001\110\001\050\001\255\255\052\001\
-\053\001\255\255\055\001\056\001\255\255\255\255\059\001\255\255\
-\000\001\255\255\255\255\064\001\065\001\255\255\006\001\255\255\
-\255\255\255\255\071\001\255\255\012\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\084\001\
-\255\255\255\255\255\255\255\255\028\001\255\255\030\001\031\001\
-\255\255\255\255\255\255\255\255\097\001\255\255\255\255\255\255\
-\101\001\255\255\255\255\255\255\255\255\106\001\255\255\255\255\
-\109\001\110\001\050\001\255\255\052\001\053\001\255\255\055\001\
-\056\001\255\255\255\255\059\001\255\255\000\001\255\255\255\255\
-\064\001\065\001\255\255\006\001\255\255\255\255\255\255\071\001\
-\255\255\012\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\084\001\255\255\255\255\255\255\
-\255\255\028\001\255\255\030\001\031\001\255\255\255\255\255\255\
-\255\255\097\001\255\255\255\255\255\255\101\001\255\255\255\255\
-\255\255\255\255\106\001\255\255\255\255\109\001\110\001\050\001\
-\255\255\052\001\053\001\255\255\055\001\056\001\255\255\255\255\
-\059\001\255\255\000\001\255\255\255\255\064\001\065\001\255\255\
-\006\001\255\255\255\255\255\255\071\001\255\255\012\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\084\001\255\255\255\255\255\255\255\255\028\001\255\255\
-\030\001\031\001\255\255\255\255\255\255\255\255\097\001\255\255\
-\255\255\255\255\101\001\255\255\255\255\255\255\255\255\106\001\
-\255\255\255\255\109\001\110\001\050\001\255\255\052\001\053\001\
-\255\255\055\001\056\001\255\255\255\255\059\001\255\255\255\255\
-\255\255\255\255\064\001\065\001\005\001\006\001\007\001\255\255\
-\255\255\071\001\011\001\012\001\013\001\014\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\084\001\255\255\
-\255\255\255\255\255\255\028\001\029\001\030\001\031\001\032\001\
-\033\001\034\001\255\255\097\001\255\255\255\255\039\001\101\001\
-\041\001\255\255\255\255\255\255\106\001\255\255\255\255\109\001\
-\110\001\050\001\255\255\052\001\053\001\054\001\055\001\056\001\
-\255\255\255\255\059\001\060\001\255\255\255\255\063\001\064\001\
-\065\001\255\255\255\255\068\001\069\001\255\255\071\001\072\001\
-\255\255\074\001\255\255\255\255\255\255\078\001\255\255\080\001\
-\255\255\255\255\255\255\084\001\085\001\255\255\087\001\255\255\
-\089\001\255\255\255\255\005\001\006\001\007\001\255\255\096\001\
-\255\255\011\001\012\001\013\001\101\001\255\255\255\255\255\255\
-\255\255\106\001\107\001\108\001\109\001\110\001\111\001\255\255\
-\255\255\114\001\028\001\029\001\030\001\031\001\032\001\033\001\
-\034\001\255\255\255\255\255\255\255\255\039\001\255\255\041\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\050\001\255\255\052\001\053\001\054\001\055\001\056\001\255\255\
-\255\255\059\001\060\001\255\255\255\255\063\001\064\001\065\001\
-\255\255\255\255\068\001\069\001\255\255\071\001\072\001\255\255\
-\074\001\255\255\255\255\255\255\078\001\255\255\080\001\255\255\
-\255\255\255\255\084\001\085\001\255\255\087\001\255\255\255\255\
-\255\255\005\001\006\001\007\001\255\255\255\255\096\001\011\001\
-\012\001\255\255\255\255\101\001\255\255\255\255\255\255\255\255\
-\106\001\107\001\108\001\109\001\110\001\111\001\255\255\255\255\
-\114\001\255\255\030\001\031\001\032\001\033\001\034\001\255\255\
-\255\255\255\255\255\255\039\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\050\001\255\255\
-\052\001\053\001\054\001\055\001\056\001\255\255\255\255\059\001\
-\255\255\255\255\255\255\063\001\064\001\065\001\255\255\255\255\
-\255\255\069\001\255\255\071\001\072\001\255\255\255\255\255\255\
-\255\255\255\255\078\001\255\255\255\255\255\255\255\255\255\255\
-\084\001\085\001\255\255\087\001\255\255\255\255\255\255\255\255\
-\092\001\005\001\006\001\007\001\255\255\255\255\010\001\011\001\
-\012\001\101\001\255\255\255\255\255\255\255\255\106\001\107\001\
-\255\255\109\001\110\001\255\255\255\255\255\255\114\001\255\255\
-\255\255\255\255\030\001\031\001\032\001\033\001\034\001\255\255\
-\255\255\255\255\255\255\039\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\050\001\255\255\
-\052\001\053\001\054\001\055\001\056\001\255\255\255\255\059\001\
-\255\255\255\255\255\255\063\001\064\001\065\001\255\255\255\255\
-\255\255\069\001\255\255\071\001\072\001\255\255\255\255\255\255\
-\255\255\255\255\078\001\255\255\255\255\255\255\255\255\255\255\
-\084\001\085\001\255\255\087\001\255\255\255\255\005\001\006\001\
-\007\001\255\255\255\255\255\255\011\001\012\001\255\255\255\255\
-\255\255\101\001\255\255\255\255\255\255\255\255\106\001\107\001\
-\255\255\109\001\110\001\026\001\255\255\255\255\114\001\030\001\
-\031\001\032\001\033\001\034\001\255\255\255\255\255\255\255\255\
-\039\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\050\001\255\255\052\001\053\001\054\001\
-\055\001\056\001\255\255\255\255\059\001\255\255\255\255\255\255\
-\063\001\064\001\065\001\255\255\255\255\255\255\069\001\255\255\
-\071\001\072\001\255\255\255\255\255\255\255\255\255\255\078\001\
-\255\255\255\255\255\255\255\255\255\255\084\001\085\001\255\255\
-\087\001\255\255\255\255\005\001\006\001\007\001\255\255\255\255\
-\255\255\011\001\012\001\255\255\255\255\255\255\101\001\255\255\
-\255\255\255\255\255\255\106\001\107\001\255\255\109\001\110\001\
-\255\255\255\255\255\255\114\001\030\001\031\001\032\001\033\001\
-\034\001\255\255\255\255\255\255\255\255\039\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\050\001\255\255\052\001\053\001\054\001\055\001\056\001\255\255\
-\255\255\059\001\255\255\255\255\255\255\063\001\064\001\065\001\
-\255\255\255\255\255\255\069\001\255\255\071\001\072\001\255\255\
-\255\255\255\255\255\255\255\255\078\001\255\255\255\255\255\255\
-\255\255\083\001\084\001\085\001\255\255\087\001\255\255\255\255\
-\005\001\006\001\007\001\255\255\255\255\255\255\011\001\012\001\
-\255\255\255\255\255\255\101\001\255\255\255\255\255\255\255\255\
-\106\001\107\001\255\255\109\001\110\001\255\255\255\255\255\255\
-\114\001\030\001\031\001\032\001\033\001\034\001\255\255\255\255\
-\255\255\255\255\039\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\050\001\255\255\052\001\
-\053\001\054\001\055\001\056\001\255\255\255\255\059\001\255\255\
-\255\255\255\255\063\001\064\001\065\001\255\255\255\255\255\255\
-\069\001\255\255\071\001\072\001\255\255\255\255\255\255\255\255\
-\255\255\078\001\255\255\255\255\255\255\255\255\255\255\084\001\
-\085\001\255\255\087\001\255\255\255\255\255\255\255\255\092\001\
-\005\001\006\001\007\001\255\255\255\255\010\001\011\001\012\001\
-\101\001\255\255\255\255\255\255\255\255\106\001\107\001\255\255\
-\109\001\110\001\255\255\255\255\255\255\114\001\255\255\255\255\
-\255\255\030\001\031\001\032\001\033\001\034\001\255\255\255\255\
-\255\255\255\255\039\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\050\001\255\255\052\001\
-\053\001\054\001\055\001\056\001\255\255\255\255\059\001\255\255\
-\255\255\255\255\063\001\064\001\065\001\255\255\255\255\255\255\
-\069\001\255\255\071\001\072\001\255\255\255\255\255\255\255\255\
-\255\255\078\001\255\255\255\255\255\255\255\255\255\255\084\001\
-\085\001\255\255\087\001\255\255\255\255\255\255\005\001\006\001\
-\007\001\255\255\255\255\255\255\011\001\012\001\255\255\255\255\
-\101\001\255\255\255\255\255\255\255\255\106\001\107\001\022\001\
-\109\001\110\001\255\255\255\255\255\255\114\001\255\255\030\001\
-\031\001\032\001\033\001\034\001\255\255\255\255\255\255\255\255\
-\039\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\050\001\255\255\052\001\053\001\054\001\
-\055\001\056\001\255\255\255\255\059\001\255\255\255\255\255\255\
-\063\001\064\001\065\001\255\255\255\255\255\255\069\001\255\255\
-\071\001\072\001\255\255\255\255\255\255\255\255\255\255\078\001\
-\255\255\255\255\255\255\255\255\255\255\084\001\085\001\255\255\
-\087\001\255\255\255\255\005\001\006\001\007\001\255\255\255\255\
-\255\255\011\001\012\001\255\255\255\255\255\255\101\001\255\255\
-\255\255\255\255\255\255\106\001\107\001\255\255\109\001\110\001\
-\026\001\255\255\255\255\114\001\030\001\031\001\032\001\033\001\
-\034\001\255\255\255\255\255\255\255\255\039\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\050\001\255\255\052\001\053\001\054\001\055\001\056\001\255\255\
-\255\255\059\001\255\255\255\255\255\255\063\001\064\001\065\001\
-\255\255\255\255\255\255\069\001\255\255\071\001\072\001\255\255\
-\255\255\255\255\255\255\255\255\078\001\255\255\255\255\255\255\
-\255\255\255\255\084\001\085\001\255\255\087\001\255\255\255\255\
-\005\001\006\001\007\001\255\255\255\255\255\255\011\001\012\001\
-\255\255\255\255\255\255\101\001\255\255\255\255\255\255\255\255\
-\106\001\107\001\255\255\109\001\110\001\255\255\255\255\255\255\
-\114\001\030\001\031\001\032\001\033\001\034\001\255\255\255\255\
-\255\255\255\255\039\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\050\001\255\255\052\001\
-\053\001\054\001\055\001\056\001\255\255\255\255\059\001\255\255\
-\255\255\255\255\063\001\064\001\065\001\255\255\255\255\255\255\
-\069\001\255\255\071\001\072\001\255\255\255\255\255\255\255\255\
-\255\255\078\001\255\255\255\255\255\255\255\255\255\255\084\001\
-\085\001\255\255\087\001\255\255\255\255\005\001\006\001\007\001\
-\255\255\255\255\255\255\011\001\012\001\255\255\255\255\255\255\
-\101\001\255\255\255\255\255\255\255\255\106\001\107\001\255\255\
-\109\001\110\001\255\255\255\255\255\255\114\001\030\001\031\001\
-\032\001\033\001\034\001\255\255\255\255\255\255\255\255\039\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\050\001\255\255\052\001\053\001\054\001\055\001\
-\056\001\255\255\255\255\059\001\255\255\255\255\255\255\063\001\
-\064\001\065\001\255\255\255\255\255\255\069\001\255\255\071\001\
-\072\001\255\255\255\255\255\255\255\255\255\255\078\001\255\255\
-\255\255\255\255\255\255\255\255\084\001\085\001\255\255\087\001\
-\255\255\255\255\005\001\006\001\007\001\255\255\255\255\255\255\
-\011\001\012\001\255\255\255\255\255\255\101\001\255\255\255\255\
-\255\255\255\255\106\001\107\001\255\255\109\001\110\001\255\255\
-\255\255\255\255\114\001\030\001\031\001\032\001\033\001\034\001\
-\255\255\255\255\255\255\255\255\039\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\050\001\
-\255\255\052\001\053\001\054\001\055\001\056\001\255\255\255\255\
-\059\001\255\255\255\255\255\255\063\001\064\001\065\001\255\255\
-\255\255\006\001\069\001\255\255\071\001\072\001\255\255\012\001\
-\255\255\014\001\255\255\078\001\017\001\255\255\255\255\255\255\
-\255\255\084\001\085\001\255\255\087\001\255\255\027\001\255\255\
-\255\255\030\001\031\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\101\001\255\255\255\255\255\255\255\255\106\001\
-\107\001\255\255\109\001\110\001\255\255\050\001\051\001\114\001\
-\053\001\255\255\055\001\056\001\255\255\255\255\059\001\255\255\
-\255\255\255\255\255\255\064\001\065\001\255\255\006\001\255\255\
-\255\255\255\255\071\001\255\255\012\001\255\255\014\001\255\255\
-\255\255\017\001\255\255\255\255\081\001\255\255\255\255\084\001\
-\255\255\255\255\255\255\027\001\089\001\255\255\030\001\031\001\
-\255\255\006\001\255\255\255\255\097\001\255\255\255\255\012\001\
-\101\001\014\001\255\255\104\001\255\255\106\001\255\255\255\255\
-\109\001\110\001\050\001\051\001\255\255\053\001\255\255\055\001\
-\056\001\030\001\031\001\059\001\255\255\255\255\255\255\255\255\
-\064\001\065\001\255\255\255\255\255\255\255\255\255\255\071\001\
-\255\255\255\255\255\255\255\255\255\255\050\001\051\001\255\255\
-\053\001\081\001\055\001\056\001\084\001\255\255\059\001\255\255\
-\255\255\089\001\255\255\064\001\065\001\255\255\255\255\255\255\
-\255\255\097\001\071\001\255\255\073\001\101\001\255\255\255\255\
-\104\001\255\255\106\001\255\255\081\001\109\001\110\001\084\001\
-\255\255\255\255\006\001\255\255\089\001\255\255\255\255\255\255\
-\012\001\255\255\014\001\255\255\097\001\255\255\255\255\255\255\
-\101\001\255\255\255\255\104\001\255\255\106\001\255\255\027\001\
-\109\001\110\001\030\001\031\001\255\255\006\001\255\255\255\255\
-\255\255\255\255\255\255\012\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\050\001\051\001\
-\255\255\053\001\255\255\055\001\056\001\030\001\031\001\059\001\
-\255\255\255\255\255\255\255\255\064\001\065\001\255\255\255\255\
-\255\255\255\255\255\255\071\001\255\255\255\255\255\255\255\255\
-\255\255\050\001\051\001\255\255\053\001\081\001\055\001\056\001\
-\084\001\255\255\059\001\255\255\255\255\089\001\255\255\064\001\
-\065\001\255\255\006\001\255\255\255\255\097\001\071\001\255\255\
-\012\001\101\001\255\255\255\255\104\001\255\255\106\001\255\255\
-\081\001\109\001\110\001\084\001\255\255\255\255\255\255\255\255\
-\089\001\255\255\030\001\031\001\255\255\255\255\255\255\255\255\
-\097\001\255\255\255\255\255\255\101\001\255\255\255\255\104\001\
-\255\255\106\001\255\255\255\255\109\001\110\001\050\001\051\001\
-\255\255\053\001\255\255\055\001\056\001\255\255\255\255\059\001\
-\255\255\255\255\255\255\255\255\064\001\065\001\255\255\255\255\
-\006\001\255\255\255\255\071\001\255\255\255\255\012\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\081\001\255\255\255\255\
-\084\001\255\255\255\255\255\255\255\255\089\001\028\001\255\255\
-\030\001\031\001\255\255\255\255\255\255\097\001\255\255\255\255\
-\255\255\101\001\255\255\255\255\104\001\255\255\106\001\255\255\
-\255\255\109\001\110\001\255\255\050\001\255\255\052\001\053\001\
-\255\255\055\001\056\001\255\255\255\255\059\001\255\255\255\255\
-\255\255\255\255\064\001\065\001\255\255\255\255\255\255\006\001\
-\255\255\071\001\255\255\010\001\255\255\012\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\084\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\028\001\092\001\030\001\
-\031\001\255\255\255\255\097\001\255\255\255\255\255\255\101\001\
-\255\255\255\255\255\255\255\255\106\001\255\255\255\255\109\001\
-\110\001\255\255\255\255\050\001\255\255\052\001\053\001\255\255\
-\055\001\056\001\255\255\255\255\059\001\255\255\255\255\255\255\
-\255\255\064\001\065\001\255\255\006\001\255\255\255\255\255\255\
-\071\001\255\255\012\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\006\001\007\001\255\255\255\255\084\001\011\001\012\001\
-\255\255\255\255\028\001\255\255\030\001\031\001\255\255\255\255\
-\255\255\255\255\097\001\255\255\255\255\255\255\101\001\255\255\
-\255\255\030\001\031\001\106\001\255\255\255\255\109\001\110\001\
-\050\001\255\255\052\001\053\001\255\255\055\001\056\001\255\255\
-\255\255\059\001\255\255\255\255\255\255\050\001\064\001\065\001\
-\053\001\054\001\055\001\056\001\255\255\071\001\059\001\255\255\
-\006\001\255\255\008\001\064\001\065\001\255\255\012\001\255\255\
-\255\255\255\255\084\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\092\001\255\255\255\255\255\255\028\001\097\001\
-\030\001\031\001\087\001\101\001\255\255\255\255\255\255\255\255\
-\106\001\255\255\255\255\109\001\110\001\255\255\255\255\255\255\
-\101\001\255\255\255\255\255\255\050\001\106\001\052\001\053\001\
-\109\001\055\001\056\001\255\255\255\255\059\001\255\255\255\255\
-\255\255\255\255\064\001\065\001\255\255\006\001\255\255\255\255\
-\255\255\071\001\255\255\012\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\084\001\255\255\
-\255\255\255\255\255\255\028\001\255\255\030\001\031\001\255\255\
-\255\255\255\255\255\255\097\001\255\255\255\255\255\255\101\001\
-\255\255\255\255\255\255\255\255\106\001\255\255\255\255\109\001\
-\110\001\050\001\255\255\052\001\053\001\255\255\055\001\056\001\
-\255\255\255\255\059\001\255\255\255\255\255\255\255\255\064\001\
-\065\001\255\255\006\001\255\255\255\255\255\255\071\001\255\255\
-\012\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\084\001\255\255\255\255\255\255\255\255\
-\028\001\255\255\030\001\031\001\255\255\006\001\255\255\255\255\
-\097\001\255\255\255\255\012\001\101\001\255\255\255\255\255\255\
-\255\255\106\001\255\255\255\255\109\001\110\001\050\001\255\255\
-\052\001\053\001\255\255\055\001\056\001\030\001\031\001\059\001\
-\255\255\255\255\255\255\255\255\064\001\065\001\255\255\255\255\
-\255\255\255\255\255\255\071\001\255\255\255\255\255\255\255\255\
-\255\255\050\001\255\255\052\001\053\001\255\255\055\001\056\001\
-\084\001\255\255\059\001\255\255\255\255\255\255\255\255\064\001\
-\065\001\255\255\006\001\255\255\255\255\097\001\071\001\255\255\
-\012\001\101\001\255\255\255\255\255\255\255\255\106\001\255\255\
-\255\255\109\001\110\001\084\001\255\255\255\255\255\255\255\255\
-\028\001\255\255\030\001\031\001\093\001\006\001\255\255\255\255\
-\097\001\255\255\255\255\012\001\101\001\255\255\255\255\255\255\
-\255\255\106\001\255\255\255\255\109\001\110\001\050\001\255\255\
-\052\001\053\001\255\255\055\001\056\001\030\001\031\001\059\001\
-\255\255\255\255\255\255\255\255\064\001\065\001\255\255\255\255\
-\255\255\255\255\255\255\071\001\255\255\255\255\255\255\255\255\
-\255\255\050\001\255\255\052\001\053\001\255\255\055\001\056\001\
-\084\001\255\255\059\001\255\255\255\255\255\255\255\255\064\001\
-\065\001\255\255\006\001\255\255\255\255\097\001\071\001\255\255\
-\012\001\101\001\255\255\255\255\255\255\255\255\106\001\255\255\
-\255\255\109\001\110\001\084\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\030\001\031\001\255\255\006\001\255\255\255\255\
-\097\001\255\255\255\255\012\001\101\001\255\255\255\255\255\255\
-\255\255\106\001\255\255\255\255\109\001\110\001\050\001\255\255\
-\052\001\053\001\255\255\055\001\056\001\030\001\031\001\059\001\
-\255\255\255\255\255\255\255\255\064\001\065\001\255\255\255\255\
-\255\255\255\255\255\255\071\001\255\255\255\255\255\255\255\255\
-\255\255\050\001\255\255\255\255\053\001\255\255\055\001\056\001\
-\084\001\255\255\059\001\255\255\255\255\255\255\255\255\064\001\
-\065\001\255\255\006\001\255\255\255\255\097\001\071\001\255\255\
-\012\001\101\001\255\255\255\255\255\255\255\255\106\001\255\255\
-\255\255\109\001\110\001\084\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\030\001\031\001\255\255\255\255\255\255\255\255\
-\097\001\255\255\255\255\255\255\101\001\255\255\255\255\255\255\
-\255\255\106\001\255\255\255\255\109\001\110\001\050\001\255\255\
-\255\255\053\001\255\255\055\001\056\001\255\255\255\255\059\001\
-\255\255\255\255\255\255\255\255\064\001\065\001\255\255\006\001\
-\007\001\255\255\255\255\071\001\011\001\012\001\006\001\007\001\
-\255\255\255\255\255\255\011\001\012\001\255\255\255\255\022\001\
-\084\001\255\255\255\255\255\255\255\255\255\255\255\255\030\001\
-\031\001\255\255\255\255\255\255\255\255\097\001\030\001\031\001\
-\255\255\101\001\255\255\255\255\255\255\255\255\106\001\255\255\
-\047\001\109\001\110\001\050\001\051\001\255\255\053\001\054\001\
-\055\001\056\001\050\001\051\001\059\001\053\001\054\001\055\001\
-\056\001\064\001\065\001\059\001\255\255\255\255\255\255\255\255\
-\064\001\065\001\255\255\255\255\255\255\255\255\255\255\006\001\
-\007\001\255\255\081\001\255\255\011\001\012\001\255\255\255\255\
-\087\001\081\001\089\001\255\255\255\255\255\255\255\255\087\001\
-\255\255\089\001\097\001\098\001\255\255\255\255\101\001\030\001\
-\031\001\104\001\255\255\106\001\255\255\101\001\109\001\255\255\
-\104\001\255\255\106\001\255\255\255\255\109\001\255\255\255\255\
-\255\255\255\255\255\255\050\001\255\255\255\255\053\001\054\001\
-\055\001\056\001\255\255\255\255\059\001\255\255\255\255\255\255\
-\255\255\064\001\065\001\255\255\255\255\000\001\001\001\002\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\009\001\255\255\
-\255\255\255\255\255\255\014\001\015\001\016\001\017\001\018\001\
-\087\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\027\001\255\255\255\255\255\255\255\255\255\255\101\001\255\255\
-\255\255\036\001\255\255\106\001\255\255\255\255\109\001\042\001\
-\043\001\044\001\045\001\046\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\061\001\255\255\015\001\255\255\255\255\066\001\
-\255\255\255\255\255\255\255\255\071\001\072\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\082\001\
-\083\001\084\001\085\001\086\001\255\255\000\001\001\001\002\001\
-\255\255\255\255\255\255\094\001\007\001\255\255\009\001\255\255\
-\255\255\100\001\255\255\255\255\055\001\016\001\057\001\058\001\
-\059\001\255\255\061\001\255\255\255\255\064\001\065\001\255\255\
-\027\001\255\255\255\255\255\255\255\255\255\255\255\255\074\001\
-\255\255\036\001\255\255\255\255\255\255\255\255\081\001\042\001\
-\043\001\044\001\045\001\046\001\047\001\255\255\089\001\090\001\
-\255\255\255\255\255\255\094\001\255\255\255\255\097\001\255\255\
-\255\255\255\255\061\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\109\001\110\001\071\001\072\001\255\255\074\001\
-\255\255\255\255\255\255\255\255\000\001\001\001\002\001\082\001\
-\083\001\084\001\085\001\086\001\087\001\009\001\255\255\255\255\
-\255\255\255\255\255\255\015\001\016\001\255\255\018\001\098\001\
-\255\255\100\001\255\255\255\255\255\255\255\255\255\255\027\001\
-\255\255\255\255\255\255\255\255\000\001\001\001\002\001\255\255\
-\036\001\255\255\255\255\255\255\255\255\009\001\042\001\043\001\
-\044\001\045\001\046\001\015\001\016\001\255\255\018\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\027\001\
-\255\255\061\001\255\255\255\255\255\255\255\255\066\001\255\255\
-\036\001\255\255\255\255\071\001\072\001\255\255\042\001\043\001\
-\044\001\045\001\046\001\255\255\255\255\255\255\082\001\083\001\
-\084\001\085\001\086\001\255\255\255\255\255\255\255\255\091\001\
-\255\255\061\001\255\255\255\255\255\255\255\255\066\001\255\255\
-\100\001\255\255\255\255\071\001\072\001\255\255\255\255\255\255\
-\255\255\255\255\000\001\001\001\002\001\255\255\082\001\083\001\
-\084\001\085\001\086\001\009\001\255\255\255\255\255\255\255\255\
-\092\001\015\001\016\001\255\255\018\001\255\255\255\255\255\255\
-\100\001\255\255\255\255\255\255\255\255\027\001\255\255\255\255\
-\255\255\255\255\000\001\001\001\002\001\255\255\036\001\255\255\
-\255\255\255\255\255\255\009\001\042\001\043\001\044\001\045\001\
-\046\001\015\001\016\001\255\255\018\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\027\001\255\255\061\001\
-\255\255\255\255\255\255\255\255\066\001\255\255\036\001\255\255\
-\255\255\071\001\072\001\255\255\042\001\043\001\044\001\045\001\
-\046\001\255\255\255\255\255\255\082\001\083\001\084\001\085\001\
-\086\001\255\255\255\255\255\255\255\255\255\255\255\255\061\001\
-\094\001\255\255\255\255\255\255\066\001\255\255\100\001\255\255\
-\255\255\071\001\072\001\255\255\255\255\255\255\255\255\255\255\
-\000\001\001\001\002\001\255\255\082\001\083\001\084\001\085\001\
-\086\001\009\001\255\255\255\255\255\255\091\001\255\255\015\001\
-\016\001\255\255\018\001\255\255\255\255\255\255\100\001\255\255\
-\255\255\255\255\255\255\027\001\255\255\255\255\255\255\255\255\
-\000\001\001\001\002\001\255\255\036\001\255\255\255\255\255\255\
-\255\255\009\001\042\001\043\001\044\001\045\001\046\001\015\001\
-\016\001\255\255\018\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\027\001\255\255\061\001\255\255\255\255\
-\255\255\255\255\066\001\255\255\036\001\255\255\255\255\071\001\
-\072\001\255\255\042\001\043\001\044\001\045\001\046\001\255\255\
-\255\255\255\255\082\001\083\001\084\001\085\001\086\001\255\255\
-\255\255\255\255\255\255\255\255\092\001\061\001\255\255\255\255\
-\255\255\255\255\066\001\255\255\100\001\255\255\255\255\071\001\
-\072\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\082\001\083\001\084\001\085\001\086\001\000\001\
-\001\001\002\001\255\255\255\255\255\255\255\255\094\001\255\255\
-\009\001\255\255\255\255\255\255\100\001\255\255\015\001\016\001\
-\255\255\018\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\027\001\255\255\255\255\255\255\255\255\000\001\
-\001\001\002\001\255\255\036\001\255\255\255\255\255\255\255\255\
-\009\001\042\001\043\001\044\001\045\001\046\001\015\001\016\001\
-\255\255\018\001\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\027\001\255\255\061\001\255\255\255\255\255\255\
-\255\255\066\001\255\255\036\001\255\255\255\255\071\001\072\001\
-\255\255\042\001\043\001\044\001\045\001\046\001\255\255\255\255\
-\255\255\082\001\083\001\084\001\085\001\086\001\255\255\255\255\
-\255\255\255\255\091\001\255\255\061\001\255\255\255\255\255\255\
-\255\255\066\001\255\255\100\001\255\255\255\255\071\001\072\001\
-\255\255\255\255\255\255\255\255\255\255\000\001\001\001\002\001\
-\255\255\082\001\083\001\084\001\085\001\086\001\009\001\255\255\
-\255\255\255\255\255\255\092\001\015\001\016\001\255\255\018\001\
-\255\255\255\255\255\255\100\001\255\255\255\255\255\255\255\255\
-\027\001\255\255\255\255\255\255\255\255\000\001\001\001\002\001\
-\255\255\036\001\255\255\255\255\255\255\255\255\009\001\042\001\
-\043\001\044\001\045\001\046\001\015\001\016\001\255\255\018\001\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\027\001\255\255\061\001\255\255\255\255\255\255\255\255\066\001\
-\255\255\036\001\255\255\255\255\071\001\072\001\255\255\042\001\
-\043\001\044\001\045\001\046\001\255\255\255\255\255\255\082\001\
-\083\001\084\001\085\001\086\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\061\001\094\001\255\255\255\255\255\255\066\001\
-\255\255\100\001\255\255\255\255\071\001\072\001\255\255\255\255\
-\255\255\255\255\255\255\000\001\001\001\002\001\255\255\082\001\
-\083\001\084\001\085\001\086\001\009\001\255\255\255\255\255\255\
-\091\001\255\255\015\001\016\001\255\255\018\001\255\255\255\255\
-\255\255\100\001\255\255\255\255\255\255\255\255\027\001\255\255\
-\255\255\255\255\255\255\000\001\001\001\002\001\255\255\036\001\
-\255\255\255\255\255\255\255\255\009\001\042\001\043\001\044\001\
-\045\001\046\001\015\001\016\001\255\255\018\001\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\027\001\255\255\
-\061\001\255\255\255\255\255\255\255\255\066\001\255\255\036\001\
-\255\255\255\255\071\001\072\001\255\255\042\001\043\001\044\001\
-\045\001\046\001\255\255\255\255\255\255\082\001\083\001\084\001\
-\085\001\086\001\255\255\255\255\255\255\255\255\255\255\092\001\
-\061\001\001\001\002\001\255\255\255\255\066\001\255\255\100\001\
-\255\255\009\001\071\001\072\001\255\255\255\255\255\255\015\001\
-\016\001\255\255\018\001\255\255\255\255\082\001\083\001\084\001\
-\085\001\086\001\255\255\027\001\255\255\255\255\255\255\255\255\
-\255\255\094\001\255\255\255\255\036\001\255\255\255\255\100\001\
-\255\255\255\255\042\001\043\001\044\001\045\001\046\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\061\001\255\255\255\255\
-\255\255\255\255\066\001\255\255\255\255\255\255\255\255\071\001\
-\072\001\001\001\002\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\009\001\082\001\083\001\084\001\085\001\086\001\015\001\
-\016\001\255\255\018\001\255\255\255\255\255\255\255\255\095\001\
-\255\255\025\001\255\255\027\001\100\001\255\255\255\255\255\255\
-\255\255\001\001\002\001\255\255\036\001\255\255\255\255\255\255\
-\255\255\009\001\042\001\043\001\044\001\045\001\046\001\015\001\
-\016\001\255\255\018\001\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\027\001\255\255\061\001\255\255\255\255\
-\255\255\255\255\066\001\255\255\036\001\255\255\255\255\071\001\
-\072\001\255\255\042\001\043\001\044\001\045\001\046\001\255\255\
-\255\255\255\255\082\001\083\001\084\001\085\001\086\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\061\001\001\001\002\001\
-\255\255\255\255\066\001\255\255\100\001\255\255\009\001\071\001\
-\072\001\255\255\255\255\255\255\015\001\255\255\255\255\255\255\
-\255\255\255\255\082\001\083\001\084\001\085\001\086\001\255\255\
-\027\001\255\255\255\255\255\255\255\255\255\255\001\001\002\001\
-\255\255\036\001\255\255\255\255\100\001\255\255\255\255\042\001\
-\043\001\044\001\045\001\046\001\015\001\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\027\001\255\255\061\001\255\255\255\255\255\255\255\255\066\001\
-\255\255\036\001\255\255\255\255\071\001\072\001\255\255\042\001\
-\043\001\044\001\045\001\046\001\013\001\255\255\255\255\082\001\
-\083\001\084\001\085\001\086\001\255\255\255\255\255\255\255\255\
-\255\255\255\255\061\001\028\001\029\001\255\255\255\255\066\001\
-\255\255\100\001\255\255\255\255\071\001\072\001\255\255\255\255\
-\041\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\083\001\084\001\085\001\086\001\255\255\255\255\055\001\255\255\
-\057\001\058\001\059\001\060\001\061\001\255\255\255\255\064\001\
-\065\001\100\001\255\255\068\001\255\255\255\255\255\255\255\255\
-\255\255\074\001\255\255\255\255\255\255\255\255\255\255\080\001\
-\081\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\089\001\090\001\255\255\255\255\255\255\255\255\255\255\096\001\
-\097\001\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\108\001\109\001\110\001\111\001"
-
-let yynames_const = "\
-  AMPERAMPER\000\
-  AMPERSAND\000\
-  AND\000\
-  AS\000\
-  ASSERT\000\
-  BACKQUOTE\000\
-  BANG\000\
-  BAR\000\
-  BARBAR\000\
-  BARRBRACKET\000\
-  BEGIN\000\
-  CLASS\000\
-  COLON\000\
-  COLONCOLON\000\
-  COLONEQUAL\000\
-  COLONGREATER\000\
-  COMMA\000\
-  CONSTRAINT\000\
-  DO\000\
-  DONE\000\
-  DOT\000\
-  DOTDOT\000\
-  DOWNTO\000\
-  ELSE\000\
-  END\000\
-  EOF\000\
-  EQUAL\000\
-  EXCEPTION\000\
-  EXTERNAL\000\
-  FALSE\000\
-  FOR\000\
-  FUN\000\
-  FUNCTION\000\
-  FUNCTOR\000\
-  GREATER\000\
-  GREATERRBRACE\000\
-  GREATERRBRACKET\000\
-  IF\000\
-  IN\000\
-  INCLUDE\000\
-  INHERIT\000\
-  INITIALIZER\000\
-  LAZY\000\
-  LBRACE\000\
-  LBRACELESS\000\
-  LBRACKET\000\
-  LBRACKETBAR\000\
-  LBRACKETLESS\000\
-  LBRACKETGREATER\000\
-  LBRACKETPERCENT\000\
-  LBRACKETPERCENTPERCENT\000\
-  LESS\000\
-  LESSMINUS\000\
-  LET\000\
-  LPAREN\000\
-  LBRACKETAT\000\
-  LBRACKETATAT\000\
-  LBRACKETATATAT\000\
-  MATCH\000\
-  METHOD\000\
-  MINUS\000\
-  MINUSDOT\000\
-  MINUSGREATER\000\
-  MODULE\000\
-  MUTABLE\000\
-  NEW\000\
-  NONREC\000\
-  OBJECT\000\
-  OF\000\
-  OPEN\000\
-  OR\000\
-  PERCENT\000\
-  PLUS\000\
-  PLUSDOT\000\
-  PLUSEQ\000\
-  PRIVATE\000\
-  QUESTION\000\
-  QUOTE\000\
-  RBRACE\000\
-  RBRACKET\000\
-  REC\000\
-  RPAREN\000\
-  SEMI\000\
-  SEMISEMI\000\
-  HASH\000\
-  SIG\000\
-  STAR\000\
-  STRUCT\000\
-  THEN\000\
-  TILDE\000\
-  TO\000\
-  TRUE\000\
-  TRY\000\
-  TYPE\000\
-  UNDERSCORE\000\
-  VAL\000\
-  VIRTUAL\000\
-  WHEN\000\
-  WHILE\000\
-  WITH\000\
-  EOL\000\
-  "
-
-let yynames_block = "\
-  CHAR\000\
-  FLOAT\000\
-  INFIXOP0\000\
-  INFIXOP1\000\
-  INFIXOP2\000\
-  INFIXOP3\000\
-  INFIXOP4\000\
-  DOTOP\000\
-  INT\000\
-  LABEL\000\
-  LIDENT\000\
-  OPTLABEL\000\
-  PREFIXOP\000\
-  HASHOP\000\
-  STRING\000\
-  UIDENT\000\
-  COMMENT\000\
-  DOCSTRING\000\
-  "
-
-let yyact = [|
-  (fun _ -> failwith "parser")
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'structure) in
-    Obj.repr(
-# 568 "ml/parser.mly"
-                                         ( extra_str 1 _1 )
-# 6360 "ml/parser.ml"
-               : Parsetree.structure))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'signature) in
-    Obj.repr(
-# 571 "ml/parser.mly"
-                                         ( extra_sig 1 _1 )
-# 6367 "ml/parser.ml"
-               : Parsetree.signature))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'core_type) in
-    Obj.repr(
-# 576 "ml/parser.mly"
-                  ( _1 )
-# 6374 "ml/parser.ml"
-               : Parsetree.core_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 579 "ml/parser.mly"
-                 ( _1 )
-# 6381 "ml/parser.ml"
-               : Parsetree.expression))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'pattern) in
-    Obj.repr(
-# 582 "ml/parser.mly"
-                ( _1 )
-# 6388 "ml/parser.ml"
-               : Parsetree.pattern))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 589 "ml/parser.mly"
-      ( mkrhs "*" 2, None )
-# 6394 "ml/parser.ml"
-               : 'functor_arg))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'functor_arg_name) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'module_type) in
-    Obj.repr(
-# 591 "ml/parser.mly"
-      ( mkrhs _2 2, Some _4 )
-# 6402 "ml/parser.ml"
-               : 'functor_arg))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 595 "ml/parser.mly"
-               ( _1 )
-# 6409 "ml/parser.ml"
-               : 'functor_arg_name))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 596 "ml/parser.mly"
-               ( "_" )
-# 6415 "ml/parser.ml"
-               : 'functor_arg_name))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'functor_args) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'functor_arg) in
-    Obj.repr(
-# 601 "ml/parser.mly"
-      ( _2 :: _1 )
-# 6423 "ml/parser.ml"
-               : 'functor_args))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'functor_arg) in
-    Obj.repr(
-# 603 "ml/parser.mly"
-      ( [ _1 ] )
-# 6430 "ml/parser.ml"
-               : 'functor_args))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'mod_longident) in
-    Obj.repr(
-# 608 "ml/parser.mly"
-      ( mkmod(Pmod_ident (mkrhs _1 1)) )
-# 6437 "ml/parser.ml"
-               : 'module_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'structure) in
-    Obj.repr(
-# 610 "ml/parser.mly"
-      ( mkmod ~attrs:_2 (Pmod_structure(extra_str 3 _3)) )
-# 6445 "ml/parser.ml"
-               : 'module_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'structure) in
-    Obj.repr(
-# 612 "ml/parser.mly"
-      ( unclosed "struct" 1 "end" 4 )
-# 6453 "ml/parser.ml"
-               : 'module_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'functor_args) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'module_expr) in
-    Obj.repr(
-# 614 "ml/parser.mly"
-      ( let modexp =
-          List.fold_left
-            (fun acc (n, t) -> mkmod(Pmod_functor(n, t, acc)))
-            _5 _3
-        in wrap_mod_attrs modexp _2 )
-# 6466 "ml/parser.ml"
-               : 'module_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'module_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'paren_module_expr) in
-    Obj.repr(
-# 620 "ml/parser.mly"
-      ( mkmod(Pmod_apply(_1, _2)) )
-# 6474 "ml/parser.ml"
-               : 'module_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'module_expr) in
-    Obj.repr(
-# 622 "ml/parser.mly"
-      ( mkmod(Pmod_apply(_1, mkmod (Pmod_structure []))) )
-# 6481 "ml/parser.ml"
-               : 'module_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'paren_module_expr) in
-    Obj.repr(
-# 624 "ml/parser.mly"
-      ( _1 )
-# 6488 "ml/parser.ml"
-               : 'module_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'module_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attribute) in
-    Obj.repr(
-# 626 "ml/parser.mly"
-      ( Mod.attr _1 _2 )
-# 6496 "ml/parser.ml"
-               : 'module_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'extension) in
-    Obj.repr(
-# 628 "ml/parser.mly"
-      ( mkmod(Pmod_extension _1) )
-# 6503 "ml/parser.ml"
-               : 'module_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'module_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'module_type) in
-    Obj.repr(
-# 633 "ml/parser.mly"
-      ( mkmod(Pmod_constraint(_2, _4)) )
-# 6511 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'module_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'module_type) in
-    Obj.repr(
-# 635 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 5 )
-# 6519 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'module_expr) in
-    Obj.repr(
-# 637 "ml/parser.mly"
-      ( _2 )
-# 6526 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'module_expr) in
-    Obj.repr(
-# 639 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 3 )
-# 6533 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 641 "ml/parser.mly"
-      ( mkmod ~attrs:_3 (Pmod_unpack _4))
-# 6541 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'expr) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'package_type) in
-    Obj.repr(
-# 643 "ml/parser.mly"
-      ( mkmod ~attrs:_3
-          (Pmod_unpack(
-               ghexp(Pexp_constraint(_4, ghtyp(Ptyp_package _6))))) )
-# 6552 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 6 : 'attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 5 : 'expr) in
-    let _6 = (Parsing.peek_val __caml_parser_env 3 : 'package_type) in
-    let _8 = (Parsing.peek_val __caml_parser_env 1 : 'package_type) in
-    Obj.repr(
-# 648 "ml/parser.mly"
-      ( mkmod ~attrs:_3
-          (Pmod_unpack(
-               ghexp(Pexp_coerce(_4, Some(ghtyp(Ptyp_package _6)),
-                                 ghtyp(Ptyp_package _8))))) )
-# 6565 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'expr) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'package_type) in
-    Obj.repr(
-# 653 "ml/parser.mly"
-      ( mkmod ~attrs:_3
-          (Pmod_unpack(
-               ghexp(Pexp_coerce(_4, None, ghtyp(Ptyp_package _6))))) )
-# 6576 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    Obj.repr(
-# 657 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 6 )
-# 6584 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    Obj.repr(
-# 659 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 6 )
-# 6592 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 661 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 5 )
-# 6600 "ml/parser.ml"
-               : 'paren_module_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'seq_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'post_item_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'structure_tail) in
-    Obj.repr(
-# 666 "ml/parser.mly"
-      ( mark_rhs_docs 1 2;
-        (text_str 1) @ mkstrexp _1 _2 :: _3 )
-# 6610 "ml/parser.ml"
-               : 'structure))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'structure_tail) in
-    Obj.repr(
-# 668 "ml/parser.mly"
-                   ( _1 )
-# 6617 "ml/parser.ml"
-               : 'structure))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 671 "ml/parser.mly"
-                         ( [] )
-# 6623 "ml/parser.ml"
-               : 'structure_tail))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'structure) in
-    Obj.repr(
-# 672 "ml/parser.mly"
-                         ( (text_str 1) @ _2 )
-# 6630 "ml/parser.ml"
-               : 'structure_tail))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'structure_item) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'structure_tail) in
-    Obj.repr(
-# 673 "ml/parser.mly"
-                                  ( (text_str 1) @ _1 :: _2 )
-# 6638 "ml/parser.ml"
-               : 'structure_tail))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'let_bindings) in
-    Obj.repr(
-# 677 "ml/parser.mly"
-      ( val_of_let_bindings _1 )
-# 6645 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'primitive_declaration) in
-    Obj.repr(
-# 679 "ml/parser.mly"
-      ( let (body, ext) = _1 in mkstr_ext (Pstr_primitive body) ext )
-# 6652 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'value_description) in
-    Obj.repr(
-# 681 "ml/parser.mly"
-      ( let (body, ext) = _1 in mkstr_ext (Pstr_primitive body) ext )
-# 6659 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'type_declarations) in
-    Obj.repr(
-# 683 "ml/parser.mly"
-      ( let (nr, l, ext ) = _1 in mkstr_ext (Pstr_type (nr, List.rev l)) ext )
-# 6666 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'str_type_extension) in
-    Obj.repr(
-# 685 "ml/parser.mly"
-      ( let (l, ext) = _1 in mkstr_ext (Pstr_typext l) ext )
-# 6673 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'str_exception_declaration) in
-    Obj.repr(
-# 687 "ml/parser.mly"
-      ( let (l, ext) = _1 in mkstr_ext (Pstr_exception l) ext )
-# 6680 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'module_binding) in
-    Obj.repr(
-# 689 "ml/parser.mly"
-      ( let (body, ext) = _1 in mkstr_ext (Pstr_module body) ext )
-# 6687 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'rec_module_bindings) in
-    Obj.repr(
-# 691 "ml/parser.mly"
-      ( let (l, ext) = _1 in mkstr_ext (Pstr_recmodule(List.rev l)) ext )
-# 6694 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'module_type_declaration) in
-    Obj.repr(
-# 693 "ml/parser.mly"
-      ( let (body, ext) = _1 in mkstr_ext (Pstr_modtype body) ext )
-# 6701 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'open_statement) in
-    Obj.repr(
-# 695 "ml/parser.mly"
-      ( let (body, ext) = _1 in mkstr_ext (Pstr_open body) ext )
-# 6708 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'class_type_declarations) in
-    Obj.repr(
-# 697 "ml/parser.mly"
-      ( let (l, ext) = _1 in mkstr_ext (Pstr_class_type (List.rev l)) ext )
-# 6715 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'str_include_statement) in
-    Obj.repr(
-# 699 "ml/parser.mly"
-      ( let (body, ext) = _1 in mkstr_ext (Pstr_include body) ext )
-# 6722 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'item_extension) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 701 "ml/parser.mly"
-      ( mkstr(Pstr_extension (_1, (add_docs_attrs (symbol_docs ()) _2))) )
-# 6730 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'floating_attribute) in
-    Obj.repr(
-# 703 "ml/parser.mly"
-      ( mark_symbol_docs ();
-        mkstr(Pstr_attribute _1) )
-# 6738 "ml/parser.ml"
-               : 'structure_item))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'module_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 708 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        Incl.mk _3 ~attrs:(attrs@_4)
-            ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext )
-# 6750 "ml/parser.ml"
-               : 'str_include_statement))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'module_expr) in
-    Obj.repr(
-# 715 "ml/parser.mly"
-      ( _2 )
-# 6757 "ml/parser.ml"
-               : 'module_binding_body))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'module_type) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'module_expr) in
-    Obj.repr(
-# 717 "ml/parser.mly"
-      ( mkmod(Pmod_constraint(_4, _2)) )
-# 6765 "ml/parser.ml"
-               : 'module_binding_body))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'functor_arg) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'module_binding_body) in
-    Obj.repr(
-# 719 "ml/parser.mly"
-      ( mkmod(Pmod_functor(fst _1, snd _1, _2)) )
-# 6773 "ml/parser.ml"
-               : 'module_binding_body))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'module_binding_body) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 723 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        Mb.mk (mkrhs _3 3) _4 ~attrs:(attrs@_5)
-            ~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
-      , ext )
-# 6786 "ml/parser.ml"
-               : 'module_binding))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'rec_module_binding) in
-    Obj.repr(
-# 729 "ml/parser.mly"
-                                           ( let (b, ext) = _1 in ([b], ext) )
-# 6793 "ml/parser.ml"
-               : 'rec_module_bindings))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'rec_module_bindings) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'and_module_binding) in
-    Obj.repr(
-# 731 "ml/parser.mly"
-      ( let (l, ext) = _1 in (_2 :: l, ext) )
-# 6801 "ml/parser.ml"
-               : 'rec_module_bindings))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : string) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'module_binding_body) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 735 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        Mb.mk (mkrhs _4 4) _5 ~attrs:(attrs@_6)
-            ~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
-      , ext )
-# 6814 "ml/parser.ml"
-               : 'rec_module_binding))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'module_binding_body) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 742 "ml/parser.mly"
-      ( Mb.mk (mkrhs _3 3) _4 ~attrs:(_2@_5) ~loc:(symbol_rloc ())
-               ~text:(symbol_text ()) ~docs:(symbol_docs ()) )
-# 6825 "ml/parser.ml"
-               : 'and_module_binding))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'mty_longident) in
-    Obj.repr(
-# 750 "ml/parser.mly"
-      ( mkmty(Pmty_ident (mkrhs _1 1)) )
-# 6832 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'signature) in
-    Obj.repr(
-# 752 "ml/parser.mly"
-      ( mkmty ~attrs:_2 (Pmty_signature (extra_sig 3 _3)) )
-# 6840 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'signature) in
-    Obj.repr(
-# 754 "ml/parser.mly"
-      ( unclosed "sig" 1 "end" 4 )
-# 6848 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'functor_args) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'module_type) in
-    Obj.repr(
-# 757 "ml/parser.mly"
-      ( let mty =
-          List.fold_left
-            (fun acc (n, t) -> mkmty(Pmty_functor(n, t, acc)))
-            _5 _3
-        in wrap_mty_attrs mty _2 )
-# 6861 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'module_type) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'module_type) in
-    Obj.repr(
-# 764 "ml/parser.mly"
-      ( mkmty(Pmty_functor(mknoloc "_", Some _1, _3)) )
-# 6869 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'module_type) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'with_constraints) in
-    Obj.repr(
-# 766 "ml/parser.mly"
-      ( mkmty(Pmty_with(_1, List.rev _3)) )
-# 6877 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'attributes) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'module_expr) in
-    Obj.repr(
-# 768 "ml/parser.mly"
-      ( mkmty ~attrs:_4 (Pmty_typeof _5) )
-# 6885 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'module_type) in
-    Obj.repr(
-# 772 "ml/parser.mly"
-      ( _2 )
-# 6892 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'module_type) in
-    Obj.repr(
-# 774 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 3 )
-# 6899 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'extension) in
-    Obj.repr(
-# 776 "ml/parser.mly"
-      ( mkmty(Pmty_extension _1) )
-# 6906 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'module_type) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attribute) in
-    Obj.repr(
-# 778 "ml/parser.mly"
-      ( Mty.attr _1 _2 )
-# 6914 "ml/parser.ml"
-               : 'module_type))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 781 "ml/parser.mly"
-                         ( [] )
-# 6920 "ml/parser.ml"
-               : 'signature))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'signature) in
-    Obj.repr(
-# 782 "ml/parser.mly"
-                         ( (text_sig 1) @ _2 )
-# 6927 "ml/parser.ml"
-               : 'signature))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'signature_item) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'signature) in
-    Obj.repr(
-# 783 "ml/parser.mly"
-                             ( (text_sig 1) @ _1 :: _2 )
-# 6935 "ml/parser.ml"
-               : 'signature))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'value_description) in
-    Obj.repr(
-# 787 "ml/parser.mly"
-      ( let (body, ext) = _1 in mksig_ext (Psig_value body) ext )
-# 6942 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'primitive_declaration) in
-    Obj.repr(
-# 789 "ml/parser.mly"
-      ( let (body, ext) = _1 in mksig_ext (Psig_value body) ext)
-# 6949 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'type_declarations) in
-    Obj.repr(
-# 791 "ml/parser.mly"
-      ( let (nr, l, ext) = _1 in mksig_ext (Psig_type (nr, List.rev l)) ext )
-# 6956 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'sig_type_extension) in
-    Obj.repr(
-# 793 "ml/parser.mly"
-      ( let (l, ext) = _1 in mksig_ext (Psig_typext l) ext )
-# 6963 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'sig_exception_declaration) in
-    Obj.repr(
-# 795 "ml/parser.mly"
-      ( let (l, ext) = _1 in mksig_ext (Psig_exception l) ext )
-# 6970 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'module_declaration) in
-    Obj.repr(
-# 797 "ml/parser.mly"
-      ( let (body, ext) = _1 in mksig_ext (Psig_module body) ext )
-# 6977 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'module_alias) in
-    Obj.repr(
-# 799 "ml/parser.mly"
-      ( let (body, ext) = _1 in mksig_ext (Psig_module body) ext )
-# 6984 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'rec_module_declarations) in
-    Obj.repr(
-# 801 "ml/parser.mly"
-      ( let (l, ext) = _1 in mksig_ext (Psig_recmodule (List.rev l)) ext )
-# 6991 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'module_type_declaration) in
-    Obj.repr(
-# 803 "ml/parser.mly"
-      ( let (body, ext) = _1 in mksig_ext (Psig_modtype body) ext )
-# 6998 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'open_statement) in
-    Obj.repr(
-# 805 "ml/parser.mly"
-      ( let (body, ext) = _1 in mksig_ext (Psig_open body) ext )
-# 7005 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'sig_include_statement) in
-    Obj.repr(
-# 807 "ml/parser.mly"
-      ( let (body, ext) = _1 in mksig_ext (Psig_include body) ext )
-# 7012 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'class_type_declarations) in
-    Obj.repr(
-# 809 "ml/parser.mly"
-      ( let (l, ext) = _1 in mksig_ext (Psig_class_type (List.rev l)) ext )
-# 7019 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'item_extension) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 811 "ml/parser.mly"
-      ( mksig(Psig_extension (_1, (add_docs_attrs (symbol_docs ()) _2))) )
-# 7027 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'floating_attribute) in
-    Obj.repr(
-# 813 "ml/parser.mly"
-      ( mark_symbol_docs ();
-        mksig(Psig_attribute _1) )
-# 7035 "ml/parser.ml"
-               : 'signature_item))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'override_flag) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'mod_longident) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 818 "ml/parser.mly"
-      ( let (ext, attrs) = _3 in
-        Opn.mk (mkrhs _4 4) ~override:_2 ~attrs:(attrs@_5)
-          ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext)
-# 7048 "ml/parser.ml"
-               : 'open_statement))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'module_type) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 825 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        Incl.mk _3 ~attrs:(attrs@_4)
-            ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext)
-# 7060 "ml/parser.ml"
-               : 'sig_include_statement))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'module_type) in
-    Obj.repr(
-# 832 "ml/parser.mly"
-      ( _2 )
-# 7067 "ml/parser.ml"
-               : 'module_declaration_body))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'module_type) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'module_declaration_body) in
-    Obj.repr(
-# 834 "ml/parser.mly"
-      ( mkmty(Pmty_functor(mkrhs _2 2, Some _4, _6)) )
-# 7076 "ml/parser.ml"
-               : 'module_declaration_body))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'module_declaration_body) in
-    Obj.repr(
-# 836 "ml/parser.mly"
-      ( mkmty(Pmty_functor(mkrhs "*" 1, None, _3)) )
-# 7083 "ml/parser.ml"
-               : 'module_declaration_body))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'module_declaration_body) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 840 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        Md.mk (mkrhs _3 3) _4 ~attrs:(attrs@_5)
-          ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext )
-# 7096 "ml/parser.ml"
-               : 'module_declaration))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'mod_longident) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 847 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        Md.mk (mkrhs _3 3)
-          (Mty.alias ~loc:(rhs_loc 5) (mkrhs _5 5)) ~attrs:(attrs@_6)
-             ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext )
-# 7110 "ml/parser.ml"
-               : 'module_alias))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'rec_module_declaration) in
-    Obj.repr(
-# 855 "ml/parser.mly"
-      ( let (body, ext) = _1 in ([body], ext) )
-# 7117 "ml/parser.ml"
-               : 'rec_module_declarations))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'rec_module_declarations) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'and_module_declaration) in
-    Obj.repr(
-# 857 "ml/parser.mly"
-      ( let (l, ext) = _1 in (_2 :: l, ext) )
-# 7125 "ml/parser.ml"
-               : 'rec_module_declarations))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'module_type) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 861 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        Md.mk (mkrhs _4 4) _6 ~attrs:(attrs@_7)
-            ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext)
-# 7138 "ml/parser.ml"
-               : 'rec_module_declaration))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'module_type) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 868 "ml/parser.mly"
-      ( Md.mk (mkrhs _3 3) _5 ~attrs:(_2@_6) ~loc:(symbol_rloc())
-              ~text:(symbol_text()) ~docs:(symbol_docs()) )
-# 7149 "ml/parser.ml"
-               : 'and_module_declaration))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 872 "ml/parser.mly"
-                              ( None )
-# 7155 "ml/parser.ml"
-               : 'module_type_declaration_body))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'module_type) in
-    Obj.repr(
-# 873 "ml/parser.mly"
-                              ( Some _2 )
-# 7162 "ml/parser.ml"
-               : 'module_type_declaration_body))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'ident) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'module_type_declaration_body) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 878 "ml/parser.mly"
-      ( let (ext, attrs) = _3 in
-        Mtd.mk (mkrhs _4 4) ?typ:_5 ~attrs:(attrs@_6)
-          ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext )
-# 7175 "ml/parser.ml"
-               : 'module_type_declaration))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 886 "ml/parser.mly"
-                                                ( [] )
-# 7181 "ml/parser.ml"
-               : 'class_type_parameters))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'type_parameter_list) in
-    Obj.repr(
-# 887 "ml/parser.mly"
-                                                ( List.rev _2 )
-# 7188 "ml/parser.ml"
-               : 'class_type_parameters))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'class_self_pattern) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'class_fields) in
-    Obj.repr(
-# 891 "ml/parser.mly"
-       ( Cstr.mk _1 (extra_cstr 2 (List.rev _2)) )
-# 7196 "ml/parser.ml"
-               : 'class_structure))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'pattern) in
-    Obj.repr(
-# 895 "ml/parser.mly"
-      ( reloc_pat _2 )
-# 7203 "ml/parser.ml"
-               : 'class_self_pattern))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'pattern) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'core_type) in
-    Obj.repr(
-# 897 "ml/parser.mly"
-      ( mkpat(Ppat_constraint(_2, _4)) )
-# 7211 "ml/parser.ml"
-               : 'class_self_pattern))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 899 "ml/parser.mly"
-      ( ghpat(Ppat_any) )
-# 7217 "ml/parser.ml"
-               : 'class_self_pattern))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 903 "ml/parser.mly"
-      ( [] )
-# 7223 "ml/parser.ml"
-               : 'class_fields))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'class_fields) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'class_field) in
-    Obj.repr(
-# 905 "ml/parser.mly"
-      ( _2 :: (text_cstr 2) @ _1 )
-# 7231 "ml/parser.ml"
-               : 'class_fields))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'value) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 909 "ml/parser.mly"
-      ( let v, attrs = _2 in
-        mkcf (Pcf_val v) ~attrs:(attrs@_3) ~docs:(symbol_docs ()) )
-# 7240 "ml/parser.ml"
-               : 'class_field))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'method_) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 912 "ml/parser.mly"
-      ( let meth, attrs = _2 in
-        mkcf (Pcf_method meth) ~attrs:(attrs@_3) ~docs:(symbol_docs ()) )
-# 7249 "ml/parser.ml"
-               : 'class_field))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'constrain_field) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 915 "ml/parser.mly"
-      ( mkcf (Pcf_constraint _3) ~attrs:(_2@_4) ~docs:(symbol_docs ()) )
-# 7258 "ml/parser.ml"
-               : 'class_field))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 917 "ml/parser.mly"
-      ( mkcf (Pcf_initializer _3) ~attrs:(_2@_4) ~docs:(symbol_docs ()) )
-# 7267 "ml/parser.ml"
-               : 'class_field))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'item_extension) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 919 "ml/parser.mly"
-      ( mkcf (Pcf_extension _1) ~attrs:_2 ~docs:(symbol_docs ()) )
-# 7275 "ml/parser.ml"
-               : 'class_field))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'floating_attribute) in
-    Obj.repr(
-# 921 "ml/parser.mly"
-      ( mark_symbol_docs ();
-        mkcf (Pcf_attribute _1) )
-# 7283 "ml/parser.ml"
-               : 'class_field))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'override_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'attributes) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'label) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 927 "ml/parser.mly"
-      ( if _1 = Override then syntax_error ();
-        (mkloc _5 (rhs_loc 5), Mutable, Cfk_virtual _7), _2 )
-# 7294 "ml/parser.ml"
-               : 'value))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'override_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'mutable_flag) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'label) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 930 "ml/parser.mly"
-      ( if _1 = Override then syntax_error ();
-        (mkrhs _5 5, _4, Cfk_virtual _7), _2 )
-# 7306 "ml/parser.ml"
-               : 'value))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 5 : 'override_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'mutable_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'label) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 933 "ml/parser.mly"
-      ( (mkrhs _4 4, _3, Cfk_concrete (_1, _6)), _2 )
-# 7317 "ml/parser.ml"
-               : 'value))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'override_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'mutable_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'label) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'type_constraint) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 935 "ml/parser.mly"
-      (
-       let e = mkexp_constraint _7 _5 in
-       (mkrhs _4 4, _3, Cfk_concrete (_1, e)), _2
-      )
-# 7332 "ml/parser.ml"
-               : 'value))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'override_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'attributes) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'label) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'poly_type) in
-    Obj.repr(
-# 943 "ml/parser.mly"
-      ( if _1 = Override then syntax_error ();
-        (mkloc _5 (rhs_loc 5), Private, Cfk_virtual _7), _2 )
-# 7343 "ml/parser.ml"
-               : 'method_))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'override_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'private_flag) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'label) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'poly_type) in
-    Obj.repr(
-# 946 "ml/parser.mly"
-      ( if _1 = Override then syntax_error ();
-        (mkloc _5 (rhs_loc 5), _4, Cfk_virtual _7), _2 )
-# 7355 "ml/parser.ml"
-               : 'method_))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'override_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'private_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'label) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'strict_binding) in
-    Obj.repr(
-# 949 "ml/parser.mly"
-      ( (mkloc _4 (rhs_loc 4), _3,
-        Cfk_concrete (_1, ghexp(Pexp_poly (_5, None)))), _2 )
-# 7367 "ml/parser.ml"
-               : 'method_))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 7 : 'override_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 6 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 5 : 'private_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 4 : 'label) in
-    let _6 = (Parsing.peek_val __caml_parser_env 2 : 'poly_type) in
-    let _8 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 952 "ml/parser.mly"
-      ( (mkloc _4 (rhs_loc 4), _3,
-        Cfk_concrete (_1, ghexp(Pexp_poly(_8, Some _6)))), _2 )
-# 7380 "ml/parser.ml"
-               : 'method_))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 10 : 'override_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 9 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 8 : 'private_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 7 : 'label) in
-    let _7 = (Parsing.peek_val __caml_parser_env 4 : 'lident_list) in
-    let _9 = (Parsing.peek_val __caml_parser_env 2 : 'core_type) in
-    let _11 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 956 "ml/parser.mly"
-      ( let exp, poly = wrap_type_annotation _7 _9 _11 in
-        (mkloc _4 (rhs_loc 4), _3,
-        Cfk_concrete (_1, ghexp(Pexp_poly(exp, Some poly)))), _2 )
-# 7395 "ml/parser.ml"
-               : 'method_))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'core_type_comma_list) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'clty_longident) in
-    Obj.repr(
-# 965 "ml/parser.mly"
-      ( mkcty(Pcty_constr (mkloc _4 (rhs_loc 4), List.rev _2)) )
-# 7403 "ml/parser.ml"
-               : 'class_signature))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'clty_longident) in
-    Obj.repr(
-# 967 "ml/parser.mly"
-      ( mkcty(Pcty_constr (mkrhs _1 1, [])) )
-# 7410 "ml/parser.ml"
-               : 'class_signature))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'class_sig_body) in
-    Obj.repr(
-# 969 "ml/parser.mly"
-      ( mkcty ~attrs:_2 (Pcty_signature _3) )
-# 7418 "ml/parser.ml"
-               : 'class_signature))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'class_sig_body) in
-    Obj.repr(
-# 971 "ml/parser.mly"
-      ( unclosed "object" 1 "end" 4 )
-# 7426 "ml/parser.ml"
-               : 'class_signature))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'class_signature) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attribute) in
-    Obj.repr(
-# 973 "ml/parser.mly"
-      ( Cty.attr _1 _2 )
-# 7434 "ml/parser.ml"
-               : 'class_signature))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'extension) in
-    Obj.repr(
-# 975 "ml/parser.mly"
-      ( mkcty(Pcty_extension _1) )
-# 7441 "ml/parser.ml"
-               : 'class_signature))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'override_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'attributes) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'mod_longident) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'class_signature) in
-    Obj.repr(
-# 977 "ml/parser.mly"
-      ( wrap_class_type_attrs (mkcty(Pcty_open(_3, mkrhs _5 5, _7))) _4 )
-# 7451 "ml/parser.ml"
-               : 'class_signature))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'class_self_type) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'class_sig_fields) in
-    Obj.repr(
-# 981 "ml/parser.mly"
-      ( Csig.mk _1 (extra_csig 2 (List.rev _2)) )
-# 7459 "ml/parser.ml"
-               : 'class_sig_body))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'core_type) in
-    Obj.repr(
-# 985 "ml/parser.mly"
-      ( _2 )
-# 7466 "ml/parser.ml"
-               : 'class_self_type))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 987 "ml/parser.mly"
-      ( mktyp(Ptyp_any) )
-# 7472 "ml/parser.ml"
-               : 'class_self_type))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 990 "ml/parser.mly"
-                                                ( [] )
-# 7478 "ml/parser.ml"
-               : 'class_sig_fields))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'class_sig_fields) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'class_sig_field) in
-    Obj.repr(
-# 991 "ml/parser.mly"
-                                       ( _2 :: (text_csig 2) @ _1 )
-# 7486 "ml/parser.ml"
-               : 'class_sig_fields))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'class_signature) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 995 "ml/parser.mly"
-      ( mkctf (Pctf_inherit _3) ~attrs:(_2@_4) ~docs:(symbol_docs ()) )
-# 7495 "ml/parser.ml"
-               : 'class_sig_field))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'value_type) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 997 "ml/parser.mly"
-      ( mkctf (Pctf_val _3) ~attrs:(_2@_4) ~docs:(symbol_docs ()) )
-# 7504 "ml/parser.ml"
-               : 'class_sig_field))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'private_virtual_flags) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'label) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'poly_type) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1000 "ml/parser.mly"
-      (
-       let (p, v) = _3 in
-       mkctf (Pctf_method (mkrhs _4 4, p, v, _6)) ~attrs:(_2@_7) ~docs:(symbol_docs ())
-      )
-# 7518 "ml/parser.ml"
-               : 'class_sig_field))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'constrain_field) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1005 "ml/parser.mly"
-      ( mkctf (Pctf_constraint _3) ~attrs:(_2@_4) ~docs:(symbol_docs ()) )
-# 7527 "ml/parser.ml"
-               : 'class_sig_field))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'item_extension) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1007 "ml/parser.mly"
-      ( mkctf (Pctf_extension _1) ~attrs:_2 ~docs:(symbol_docs ()) )
-# 7535 "ml/parser.ml"
-               : 'class_sig_field))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'floating_attribute) in
-    Obj.repr(
-# 1009 "ml/parser.mly"
-      ( mark_symbol_docs ();
-        mkctf(Pctf_attribute _1) )
-# 7543 "ml/parser.ml"
-               : 'class_sig_field))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'mutable_flag) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'label) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1014 "ml/parser.mly"
-      ( mkrhs _3 3, _2, Virtual, _5 )
-# 7552 "ml/parser.ml"
-               : 'value_type))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'virtual_flag) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'label) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1016 "ml/parser.mly"
-      ( mkrhs _3 3, Mutable, _2, _5 )
-# 7561 "ml/parser.ml"
-               : 'value_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'label) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1018 "ml/parser.mly"
-      ( mkrhs _1 1, Immutable, Concrete, _3 )
-# 7569 "ml/parser.ml"
-               : 'value_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'core_type) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1021 "ml/parser.mly"
-                                           ( _1, _3, symbol_rloc() )
-# 7577 "ml/parser.ml"
-               : 'constrain))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'core_type) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1024 "ml/parser.mly"
-                                           ( _1, _3 )
-# 7585 "ml/parser.ml"
-               : 'constrain_field))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'class_type_declaration) in
-    Obj.repr(
-# 1028 "ml/parser.mly"
-      ( let (body, ext) = _1 in ([body],ext) )
-# 7592 "ml/parser.ml"
-               : 'class_type_declarations))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'class_type_declarations) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'and_class_type_declaration) in
-    Obj.repr(
-# 1030 "ml/parser.mly"
-      ( let (l, ext) = _1 in (_2 :: l, ext) )
-# 7600 "ml/parser.ml"
-               : 'class_type_declarations))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 6 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 5 : 'virtual_flag) in
-    let _5 = (Parsing.peek_val __caml_parser_env 4 : 'class_type_parameters) in
-    let _6 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _8 = (Parsing.peek_val __caml_parser_env 1 : 'class_signature) in
-    let _9 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1035 "ml/parser.mly"
-      ( let (ext, attrs) = _3 in
-        Ci.mk (mkrhs _6 6) _8 ~virt:_4 ~params:_5 ~attrs:(attrs@_9)
-            ~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
-      , ext)
-# 7615 "ml/parser.ml"
-               : 'class_type_declaration))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 6 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 5 : 'virtual_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 4 : 'class_type_parameters) in
-    let _5 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _7 = (Parsing.peek_val __caml_parser_env 1 : 'class_signature) in
-    let _8 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1043 "ml/parser.mly"
-      ( Ci.mk (mkrhs _5 5) _7 ~virt:_3 ~params:_4
-         ~attrs:(_2@_8) ~loc:(symbol_rloc ())
-         ~text:(symbol_text ()) ~docs:(symbol_docs ()) )
-# 7629 "ml/parser.ml"
-               : 'and_class_type_declaration))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1051 "ml/parser.mly"
-                                  ( _1 )
-# 7636 "ml/parser.ml"
-               : 'seq_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1052 "ml/parser.mly"
-                                  ( _1 )
-# 7643 "ml/parser.ml"
-               : 'seq_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1053 "ml/parser.mly"
-                                  ( mkexp(Pexp_sequence(_1, _3)) )
-# 7651 "ml/parser.ml"
-               : 'seq_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'attr_id) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1055 "ml/parser.mly"
-      ( let seq = mkexp(Pexp_sequence (_1, _5)) in
-        let payload = PStr [mkstrexp seq []] in
-        mkexp (Pexp_extension (_4, payload)) )
-# 7662 "ml/parser.ml"
-               : 'seq_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'label_let_pattern) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'opt_default) in
-    Obj.repr(
-# 1061 "ml/parser.mly"
-      ( (Optional (fst _3), _4, snd _3) )
-# 7670 "ml/parser.ml"
-               : 'labeled_simple_pattern))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'label_var) in
-    Obj.repr(
-# 1063 "ml/parser.mly"
-      ( (Optional (fst _2), None, snd _2) )
-# 7677 "ml/parser.ml"
-               : 'labeled_simple_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : string) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'let_pattern) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'opt_default) in
-    Obj.repr(
-# 1065 "ml/parser.mly"
-      ( (Optional _1, _4, _3) )
-# 7686 "ml/parser.ml"
-               : 'labeled_simple_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'pattern_var) in
-    Obj.repr(
-# 1067 "ml/parser.mly"
-      ( (Optional _1, None, _2) )
-# 7694 "ml/parser.ml"
-               : 'labeled_simple_pattern))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'label_let_pattern) in
-    Obj.repr(
-# 1069 "ml/parser.mly"
-      ( (Labelled (fst _3), None, snd _3) )
-# 7701 "ml/parser.ml"
-               : 'labeled_simple_pattern))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'label_var) in
-    Obj.repr(
-# 1071 "ml/parser.mly"
-      ( (Labelled (fst _2), None, snd _2) )
-# 7708 "ml/parser.ml"
-               : 'labeled_simple_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'simple_pattern) in
-    Obj.repr(
-# 1073 "ml/parser.mly"
-      ( (Labelled _1, None, _2) )
-# 7716 "ml/parser.ml"
-               : 'labeled_simple_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_pattern) in
-    Obj.repr(
-# 1075 "ml/parser.mly"
-      ( (Nolabel, None, _1) )
-# 7723 "ml/parser.ml"
-               : 'labeled_simple_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 1078 "ml/parser.mly"
-                      ( mkpat(Ppat_var (mkrhs _1 1)) )
-# 7730 "ml/parser.ml"
-               : 'pattern_var))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1079 "ml/parser.mly"
-                      ( mkpat Ppat_any )
-# 7736 "ml/parser.ml"
-               : 'pattern_var))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1082 "ml/parser.mly"
-                                        ( None )
-# 7742 "ml/parser.ml"
-               : 'opt_default))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1083 "ml/parser.mly"
-                                        ( Some _2 )
-# 7749 "ml/parser.ml"
-               : 'opt_default))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'label_var) in
-    Obj.repr(
-# 1087 "ml/parser.mly"
-      ( _1 )
-# 7756 "ml/parser.ml"
-               : 'label_let_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'label_var) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1089 "ml/parser.mly"
-      ( let (lab, pat) = _1 in (lab, mkpat(Ppat_constraint(pat, _3))) )
-# 7764 "ml/parser.ml"
-               : 'label_let_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 1092 "ml/parser.mly"
-              ( (_1, mkpat(Ppat_var (mkrhs _1 1))) )
-# 7771 "ml/parser.ml"
-               : 'label_var))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1096 "ml/parser.mly"
-      ( _1 )
-# 7778 "ml/parser.ml"
-               : 'let_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1098 "ml/parser.mly"
-      ( mkpat(Ppat_constraint(_1, _3)) )
-# 7786 "ml/parser.ml"
-               : 'let_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1102 "ml/parser.mly"
-      ( _1 )
-# 7793 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'simple_labeled_expr_list) in
-    Obj.repr(
-# 1104 "ml/parser.mly"
-      ( mkexp(Pexp_apply(_1, List.rev _2)) )
-# 7801 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'let_bindings) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1106 "ml/parser.mly"
-      ( expr_of_let_bindings _1 _3 )
-# 7809 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'module_binding_body) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1108 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_letmodule(mkrhs _4 4, _5, _7)) _3 )
-# 7819 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'let_exception_declaration) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1110 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_letexception(_4, _6)) _3 )
-# 7828 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'override_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'ext_attributes) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'mod_longident) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1112 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_open(_3, mkrhs _5 5, _7)) _4 )
-# 7838 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'opt_bar) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'match_cases) in
-    Obj.repr(
-# 1114 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_function(List.rev _4)) _2 )
-# 7847 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'labeled_simple_pattern) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'fun_def) in
-    Obj.repr(
-# 1116 "ml/parser.mly"
-      ( let (l,o,p) = _3 in
-        mkexp_attrs (Pexp_fun(l, o, p, _4)) _2 )
-# 7857 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'ext_attributes) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'lident_list) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'fun_def) in
-    Obj.repr(
-# 1119 "ml/parser.mly"
-      ( mkexp_attrs (mk_newtypes _5 _7).pexp_desc _2 )
-# 7866 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'seq_expr) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'opt_bar) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'match_cases) in
-    Obj.repr(
-# 1121 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_match(_3, List.rev _6)) _2 )
-# 7876 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'seq_expr) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'opt_bar) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'match_cases) in
-    Obj.repr(
-# 1123 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_try(_3, List.rev _6)) _2 )
-# 7886 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'seq_expr) in
-    Obj.repr(
-# 1125 "ml/parser.mly"
-      ( syntax_error() )
-# 7894 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'expr_comma_list) in
-    Obj.repr(
-# 1127 "ml/parser.mly"
-      ( mkexp(Pexp_tuple(List.rev _1)) )
-# 7901 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'constr_longident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1129 "ml/parser.mly"
-      ( mkexp(Pexp_construct(mkrhs _1 1, Some _2)) )
-# 7909 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'name_tag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1131 "ml/parser.mly"
-      ( mkexp(Pexp_variant(_1, Some _2)) )
-# 7917 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'seq_expr) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1133 "ml/parser.mly"
-      ( mkexp_attrs(Pexp_ifthenelse(_3, _5, Some _7)) _2 )
-# 7927 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'seq_expr) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1135 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_ifthenelse(_3, _5, None)) _2 )
-# 7936 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'seq_expr) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1137 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_while(_3, _5)) _2 )
-# 7945 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 8 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 7 : 'pattern) in
-    let _5 = (Parsing.peek_val __caml_parser_env 5 : 'seq_expr) in
-    let _6 = (Parsing.peek_val __caml_parser_env 4 : 'direction_flag) in
-    let _7 = (Parsing.peek_val __caml_parser_env 3 : 'seq_expr) in
-    let _9 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1140 "ml/parser.mly"
-      ( mkexp_attrs(Pexp_for(_3, _5, _7, _6, _9)) _2 )
-# 7957 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1142 "ml/parser.mly"
-      ( mkexp_cons (rhs_loc 2) (ghexp(Pexp_tuple[_1;_3])) (symbol_rloc()) )
-# 7965 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1144 "ml/parser.mly"
-      ( mkinfix _1 _2 _3 )
-# 7974 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1146 "ml/parser.mly"
-      ( mkinfix _1 _2 _3 )
-# 7983 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1148 "ml/parser.mly"
-      ( mkinfix _1 _2 _3 )
-# 7992 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1150 "ml/parser.mly"
-      ( mkinfix _1 _2 _3 )
-# 8001 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1152 "ml/parser.mly"
-      ( mkinfix _1 _2 _3 )
-# 8010 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1154 "ml/parser.mly"
-      ( mkinfix _1 "+" _3 )
-# 8018 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1156 "ml/parser.mly"
-      ( mkinfix _1 "+." _3 )
-# 8026 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1158 "ml/parser.mly"
-      ( mkinfix _1 "+=" _3 )
-# 8034 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1160 "ml/parser.mly"
-      ( mkinfix _1 "-" _3 )
-# 8042 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1162 "ml/parser.mly"
-      ( mkinfix _1 "-." _3 )
-# 8050 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1164 "ml/parser.mly"
-      ( mkinfix _1 "*" _3 )
-# 8058 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1166 "ml/parser.mly"
-      ( mkinfix _1 "%" _3 )
-# 8066 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1168 "ml/parser.mly"
-      ( mkinfix _1 "=" _3 )
-# 8074 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1170 "ml/parser.mly"
-    ( mkinfix _1 "<" _3 )
-# 8082 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1172 "ml/parser.mly"
-      ( mkinfix _1 ">" _3 )
-# 8090 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1174 "ml/parser.mly"
-      ( mkinfix _1 "or" _3 )
-# 8098 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1176 "ml/parser.mly"
-      ( mkinfix _1 "||" _3 )
-# 8106 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1178 "ml/parser.mly"
-      ( mkinfix _1 "&" _3 )
-# 8114 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1180 "ml/parser.mly"
-      ( mkinfix _1 "&&" _3 )
-# 8122 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1182 "ml/parser.mly"
-      ( mkinfix _1 ":=" _3 )
-# 8130 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'subtractive) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1184 "ml/parser.mly"
-      ( mkuminus _1 _2 )
-# 8138 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'additive) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1186 "ml/parser.mly"
-      ( mkuplus _1 _2 )
-# 8146 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'label_longident) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1188 "ml/parser.mly"
-      ( mkexp(Pexp_setfield(_1, mkrhs _3 3, _5)) )
-# 8155 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'seq_expr) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1190 "ml/parser.mly"
-      ( mkexp(Pexp_apply(ghexp(Pexp_ident(array_function "Array" "set")),
-                         [Nolabel,_1; Nolabel,_4; Nolabel,_7])) )
-# 8165 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'seq_expr) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1193 "ml/parser.mly"
-      ( mkexp(Pexp_apply(ghexp(Pexp_ident(array_function "String" "set")),
-                         [Nolabel,_1; Nolabel,_4; Nolabel,_7])) )
-# 8175 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'expr) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1196 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ _2 ^ "[]<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, _1; Nolabel, _4; Nolabel, _7]) )
-# 8186 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'expr) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1199 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ _2 ^ "()<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, _1; Nolabel, _4; Nolabel, _7]) )
-# 8197 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'expr) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1202 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ _2 ^ "{}<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, _1; Nolabel, _4; Nolabel, _7]) )
-# 8208 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 8 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 6 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 5 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 3 : 'expr) in
-    let _9 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1205 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Ldot(_3,"." ^ _4 ^ "[]<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, _1; Nolabel, _6; Nolabel, _9]) )
-# 8220 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 8 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 6 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 5 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 3 : 'expr) in
-    let _9 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1208 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Ldot(_3, "." ^ _4 ^ "()<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, _1; Nolabel, _6; Nolabel, _9]) )
-# 8232 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 8 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 6 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 5 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 3 : 'expr) in
-    let _9 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1211 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Ldot(_3, "." ^ _4 ^ "{}<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, _1; Nolabel, _6; Nolabel, _9]) )
-# 8244 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'label) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1214 "ml/parser.mly"
-      ( mkexp(Pexp_setinstvar(mkrhs _1 1, _3)) )
-# 8252 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1216 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_assert _3) _2 )
-# 8260 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1218 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_lazy _3) _2 )
-# 8268 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'class_structure) in
-    Obj.repr(
-# 1220 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_object _3) _2 )
-# 8276 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'class_structure) in
-    Obj.repr(
-# 1222 "ml/parser.mly"
-      ( unclosed "object" 1 "end" 4 )
-# 8284 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attribute) in
-    Obj.repr(
-# 1224 "ml/parser.mly"
-      ( Exp.attr _1 _2 )
-# 8292 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1226 "ml/parser.mly"
-     ( not_expecting 1 "wildcard \"_\"" )
-# 8298 "ml/parser.ml"
-               : 'expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'val_longident) in
-    Obj.repr(
-# 1230 "ml/parser.mly"
-      ( mkexp(Pexp_ident (mkrhs _1 1)) )
-# 8305 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'constant) in
-    Obj.repr(
-# 1232 "ml/parser.mly"
-      ( mkexp(Pexp_constant _1) )
-# 8312 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'constr_longident) in
-    Obj.repr(
-# 1234 "ml/parser.mly"
-      ( mkexp(Pexp_construct(mkrhs _1 1, None)) )
-# 8319 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'name_tag) in
-    Obj.repr(
-# 1236 "ml/parser.mly"
-      ( mkexp(Pexp_variant(_1, None)) )
-# 8326 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1238 "ml/parser.mly"
-      ( reloc_exp _2 )
-# 8333 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1240 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 3 )
-# 8340 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1242 "ml/parser.mly"
-      ( wrap_exp_attrs (reloc_exp _3) _2 (* check location *) )
-# 8348 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'ext_attributes) in
-    Obj.repr(
-# 1244 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_construct (mkloc (Lident "()") (symbol_rloc ()),
-                               None)) _2 )
-# 8356 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1247 "ml/parser.mly"
-      ( unclosed "begin" 1 "end" 4 )
-# 8364 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'seq_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'type_constraint) in
-    Obj.repr(
-# 1249 "ml/parser.mly"
-      ( mkexp_constraint _2 _3 )
-# 8372 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'label_longident) in
-    Obj.repr(
-# 1251 "ml/parser.mly"
-      ( mkexp(Pexp_field(_1, mkrhs _3 3)) )
-# 8380 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1253 "ml/parser.mly"
-      ( mkexp(Pexp_open(Fresh, mkrhs _1 1, _4)) )
-# 8388 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'mod_longident) in
-    Obj.repr(
-# 1255 "ml/parser.mly"
-      ( mkexp(Pexp_open(Fresh, mkrhs _1 1,
-                        mkexp(Pexp_construct(mkrhs (Lident "()") 1, None)))) )
-# 8396 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1258 "ml/parser.mly"
-      ( unclosed "(" 3 ")" 5 )
-# 8404 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1260 "ml/parser.mly"
-      ( mkexp(Pexp_apply(ghexp(Pexp_ident(array_function "Array" "get")),
-                         [Nolabel,_1; Nolabel,_4])) )
-# 8413 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1263 "ml/parser.mly"
-      ( unclosed "(" 3 ")" 5 )
-# 8421 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1265 "ml/parser.mly"
-      ( mkexp(Pexp_apply(ghexp(Pexp_ident(array_function "String" "get")),
-                         [Nolabel,_1; Nolabel,_4])) )
-# 8430 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'seq_expr) in
-    Obj.repr(
-# 1268 "ml/parser.mly"
-      ( unclosed "[" 3 "]" 5 )
-# 8438 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1270 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ _2 ^ "[]")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, _1; Nolabel, _4]) )
-# 8448 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1273 "ml/parser.mly"
-      ( unclosed "[" 3 "]" 5 )
-# 8457 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1275 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ _2 ^ "()")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, _1; Nolabel, _4]) )
-# 8467 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1278 "ml/parser.mly"
-      ( unclosed "(" 3 ")" 5 )
-# 8476 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1280 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ _2 ^ "{}")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, _1; Nolabel, _4]) )
-# 8486 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1283 "ml/parser.mly"
-      ( unclosed "{" 3 "}" 5 )
-# 8495 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1285 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Ldot(_3, "." ^ _4 ^ "[]")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, _1; Nolabel, _6]) )
-# 8506 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1288 "ml/parser.mly"
-      ( unclosed "[" 5 "]" 7 )
-# 8516 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1290 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Ldot(_3, "." ^ _4 ^ "()")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, _1; Nolabel, _6]) )
-# 8527 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1293 "ml/parser.mly"
-      ( unclosed "(" 5 ")" 7 )
-# 8537 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1295 "ml/parser.mly"
-      ( let id = mkexp @@ Pexp_ident( ghloc @@ Ldot(_3, "." ^ _4 ^ "{}")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, _1; Nolabel, _6]) )
-# 8548 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'expr) in
-    Obj.repr(
-# 1298 "ml/parser.mly"
-      ( unclosed "{" 5 "}" 7 )
-# 8558 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_expr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'expr_comma_list) in
-    Obj.repr(
-# 1300 "ml/parser.mly"
-      ( unclosed "{" 3 "}" 5 )
-# 8566 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'record_expr) in
-    Obj.repr(
-# 1302 "ml/parser.mly"
-      ( let (exten, fields) = _2 in mkexp (Pexp_record(fields, exten)) )
-# 8573 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'record_expr) in
-    Obj.repr(
-# 1304 "ml/parser.mly"
-      ( unclosed "{" 1 "}" 3 )
-# 8580 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'record_expr) in
-    Obj.repr(
-# 1306 "ml/parser.mly"
-      ( let (exten, fields) = _4 in
-        let rec_exp = mkexp(Pexp_record(fields, exten)) in
-        mkexp(Pexp_open(Fresh, mkrhs _1 1, rec_exp)) )
-# 8590 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'record_expr) in
-    Obj.repr(
-# 1310 "ml/parser.mly"
-      ( unclosed "{" 3 "}" 5 )
-# 8598 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'expr_semi_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1312 "ml/parser.mly"
-      ( mkexp (Pexp_array(List.rev _2)) )
-# 8606 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'expr_semi_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1314 "ml/parser.mly"
-      ( unclosed "[|" 1 "|]" 4 )
-# 8614 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1316 "ml/parser.mly"
-      ( mkexp (Pexp_array []) )
-# 8620 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 5 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'expr_semi_list) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1318 "ml/parser.mly"
-      ( mkexp(Pexp_open(Fresh, mkrhs _1 1, mkexp(Pexp_array(List.rev _4)))) )
-# 8629 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'mod_longident) in
-    Obj.repr(
-# 1320 "ml/parser.mly"
-      ( mkexp(Pexp_open(Fresh, mkrhs _1 1, mkexp(Pexp_array []))) )
-# 8636 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 5 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'expr_semi_list) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1322 "ml/parser.mly"
-      ( unclosed "[|" 3 "|]" 6 )
-# 8645 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'expr_semi_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1324 "ml/parser.mly"
-      ( reloc_exp (mktailexp (rhs_loc 4) (List.rev _2)) )
-# 8653 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'expr_semi_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1326 "ml/parser.mly"
-      ( unclosed "[" 1 "]" 4 )
-# 8661 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 5 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'expr_semi_list) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1328 "ml/parser.mly"
-      ( let list_exp = reloc_exp (mktailexp (rhs_loc 6) (List.rev _4)) in
-        mkexp(Pexp_open(Fresh, mkrhs _1 1, list_exp)) )
-# 8671 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'mod_longident) in
-    Obj.repr(
-# 1331 "ml/parser.mly"
-      ( mkexp(Pexp_open(Fresh, mkrhs _1 1,
-                        mkexp(Pexp_construct(mkrhs (Lident "[]") 1, None)))) )
-# 8679 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 5 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'expr_semi_list) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1334 "ml/parser.mly"
-      ( unclosed "[" 3 "]" 6 )
-# 8688 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1336 "ml/parser.mly"
-      ( mkexp(Pexp_apply(mkoperator _1 1, [Nolabel,_2])) )
-# 8696 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1338 "ml/parser.mly"
-      ( mkexp(Pexp_apply(mkoperator "!" 1, [Nolabel,_2])) )
-# 8703 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'field_expr_list) in
-    Obj.repr(
-# 1340 "ml/parser.mly"
-      ( mkexp (Pexp_override _2) )
-# 8710 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'field_expr_list) in
-    Obj.repr(
-# 1342 "ml/parser.mly"
-      ( unclosed "{<" 1 ">}" 3 )
-# 8717 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1344 "ml/parser.mly"
-      ( mkexp (Pexp_override []))
-# 8723 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'field_expr_list) in
-    Obj.repr(
-# 1346 "ml/parser.mly"
-      ( mkexp(Pexp_open(Fresh, mkrhs _1 1, mkexp (Pexp_override _4))))
-# 8731 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'mod_longident) in
-    Obj.repr(
-# 1348 "ml/parser.mly"
-      ( mkexp(Pexp_open(Fresh, mkrhs _1 1, mkexp (Pexp_override []))))
-# 8738 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'field_expr_list) in
-    Obj.repr(
-# 1350 "ml/parser.mly"
-      ( unclosed "{<" 3 ">}" 5 )
-# 8746 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'label) in
-    Obj.repr(
-# 1352 "ml/parser.mly"
-      ( mkexp(Pexp_send(_1, mkrhs _3 3)) )
-# 8754 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'simple_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1354 "ml/parser.mly"
-      ( mkinfix _1 _2 _3 )
-# 8763 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'module_expr) in
-    Obj.repr(
-# 1356 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_pack _4) _3 )
-# 8771 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'module_expr) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'package_type) in
-    Obj.repr(
-# 1358 "ml/parser.mly"
-      ( mkexp_attrs (Pexp_constraint (ghexp (Pexp_pack _4),
-                                      ghtyp (Ptyp_package _6)))
-                    _3 )
-# 8782 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'module_expr) in
-    Obj.repr(
-# 1362 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 6 )
-# 8790 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 8 : 'mod_longident) in
-    let _5 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _6 = (Parsing.peek_val __caml_parser_env 3 : 'module_expr) in
-    let _8 = (Parsing.peek_val __caml_parser_env 1 : 'package_type) in
-    Obj.repr(
-# 1365 "ml/parser.mly"
-      ( mkexp(Pexp_open(Fresh, mkrhs _1 1,
-        mkexp_attrs (Pexp_constraint (ghexp (Pexp_pack _6),
-                                ghtyp (Ptyp_package _8)))
-                    _5 )) )
-# 8803 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 7 : 'mod_longident) in
-    let _5 = (Parsing.peek_val __caml_parser_env 3 : 'ext_attributes) in
-    let _6 = (Parsing.peek_val __caml_parser_env 2 : 'module_expr) in
-    Obj.repr(
-# 1370 "ml/parser.mly"
-      ( unclosed "(" 3 ")" 8 )
-# 8812 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'extension) in
-    Obj.repr(
-# 1372 "ml/parser.mly"
-      ( mkexp (Pexp_extension _1) )
-# 8819 "ml/parser.ml"
-               : 'simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'labeled_simple_expr) in
-    Obj.repr(
-# 1376 "ml/parser.mly"
-      ( [_1] )
-# 8826 "ml/parser.ml"
-               : 'simple_labeled_expr_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'simple_labeled_expr_list) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'labeled_simple_expr) in
-    Obj.repr(
-# 1378 "ml/parser.mly"
-      ( _2 :: _1 )
-# 8834 "ml/parser.ml"
-               : 'simple_labeled_expr_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1382 "ml/parser.mly"
-      ( (Nolabel, _1) )
-# 8841 "ml/parser.ml"
-               : 'labeled_simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'label_expr) in
-    Obj.repr(
-# 1384 "ml/parser.mly"
-      ( _1 )
-# 8848 "ml/parser.ml"
-               : 'labeled_simple_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1388 "ml/parser.mly"
-      ( (Labelled _1, _2) )
-# 8856 "ml/parser.ml"
-               : 'label_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'label_ident) in
-    Obj.repr(
-# 1390 "ml/parser.mly"
-      ( (Labelled (fst _2), snd _2) )
-# 8863 "ml/parser.ml"
-               : 'label_expr))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'label_ident) in
-    Obj.repr(
-# 1392 "ml/parser.mly"
-      ( (Optional (fst _2), snd _2) )
-# 8870 "ml/parser.ml"
-               : 'label_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'simple_expr) in
-    Obj.repr(
-# 1394 "ml/parser.mly"
-      ( (Optional _1, _2) )
-# 8878 "ml/parser.ml"
-               : 'label_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 1397 "ml/parser.mly"
-             ( (_1, mkexp(Pexp_ident(mkrhs (Lident _1) 1))) )
-# 8885 "ml/parser.ml"
-               : 'label_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 1400 "ml/parser.mly"
-                                      ( [mkrhs _1 1] )
-# 8892 "ml/parser.ml"
-               : 'lident_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'lident_list) in
-    Obj.repr(
-# 1401 "ml/parser.mly"
-                                      ( mkrhs _1 1 :: _2 )
-# 8900 "ml/parser.ml"
-               : 'lident_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'val_ident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'strict_binding) in
-    Obj.repr(
-# 1405 "ml/parser.mly"
-      ( (mkpatvar _1 1, _2) )
-# 8908 "ml/parser.ml"
-               : 'let_binding_body))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'val_ident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'type_constraint) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1407 "ml/parser.mly"
-      ( let v = mkpatvar _1 1 in (* PR#7344 *)
-        let t =
-          match _2 with
-            Some t, None -> t
-          | _, Some t -> t
-          | _ -> assert false
-        in
-        (ghpat(Ppat_constraint(v, ghtyp(Ptyp_poly([],t)))),
-         mkexp_constraint _4 _2) )
-# 8925 "ml/parser.ml"
-               : 'let_binding_body))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'val_ident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'typevar_list) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'core_type) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1417 "ml/parser.mly"
-      ( (ghpat(Ppat_constraint(mkpatvar _1 1,
-                               ghtyp(Ptyp_poly(List.rev _3,_5)))),
-         _7) )
-# 8937 "ml/parser.ml"
-               : 'let_binding_body))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 7 : 'val_ident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 4 : 'lident_list) in
-    let _6 = (Parsing.peek_val __caml_parser_env 2 : 'core_type) in
-    let _8 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1421 "ml/parser.mly"
-      ( let exp, poly = wrap_type_annotation _4 _6 _8 in
-        (ghpat(Ppat_constraint(mkpatvar _1 1, poly)), exp) )
-# 8948 "ml/parser.ml"
-               : 'let_binding_body))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_no_exn) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1424 "ml/parser.mly"
-      ( (_1, _3) )
-# 8956 "ml/parser.ml"
-               : 'let_binding_body))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'simple_pattern_not_ident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'core_type) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1426 "ml/parser.mly"
-      ( (ghpat(Ppat_constraint(_1, _3)), _5) )
-# 8965 "ml/parser.ml"
-               : 'let_binding_body))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'let_binding) in
-    Obj.repr(
-# 1429 "ml/parser.mly"
-                                                ( _1 )
-# 8972 "ml/parser.ml"
-               : 'let_bindings))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'let_bindings) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'and_let_binding) in
-    Obj.repr(
-# 1430 "ml/parser.mly"
-                                                ( addlb _1 _2 )
-# 8980 "ml/parser.ml"
-               : 'let_bindings))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'rec_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'let_binding_body) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1434 "ml/parser.mly"
-      ( let (ext, attr) = _2 in
-        mklbs ext _3 (mklb true _4 (attr@_5)) )
-# 8991 "ml/parser.ml"
-               : 'let_binding))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'let_binding_body) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1439 "ml/parser.mly"
-      ( mklb false _3 (_2@_4) )
-# 9000 "ml/parser.ml"
-               : 'and_let_binding))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'strict_binding) in
-    Obj.repr(
-# 1443 "ml/parser.mly"
-      ( _1 )
-# 9007 "ml/parser.ml"
-               : 'fun_binding))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'type_constraint) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1445 "ml/parser.mly"
-      ( mkexp_constraint _3 _1 )
-# 9015 "ml/parser.ml"
-               : 'fun_binding))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1449 "ml/parser.mly"
-      ( _2 )
-# 9022 "ml/parser.ml"
-               : 'strict_binding))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'labeled_simple_pattern) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'fun_binding) in
-    Obj.repr(
-# 1451 "ml/parser.mly"
-      ( let (l, o, p) = _1 in ghexp(Pexp_fun(l, o, p, _2)) )
-# 9030 "ml/parser.ml"
-               : 'strict_binding))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'lident_list) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'fun_binding) in
-    Obj.repr(
-# 1453 "ml/parser.mly"
-      ( mk_newtypes _3 _5 )
-# 9038 "ml/parser.ml"
-               : 'strict_binding))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'match_case) in
-    Obj.repr(
-# 1456 "ml/parser.mly"
-               ( [_1] )
-# 9045 "ml/parser.ml"
-               : 'match_cases))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'match_cases) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'match_case) in
-    Obj.repr(
-# 1457 "ml/parser.mly"
-                               ( _3 :: _1 )
-# 9053 "ml/parser.ml"
-               : 'match_cases))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1461 "ml/parser.mly"
-      ( Exp.case _1 _3 )
-# 9061 "ml/parser.ml"
-               : 'match_case))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'pattern) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'seq_expr) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1463 "ml/parser.mly"
-      ( Exp.case _1 ~guard:_3 _5 )
-# 9070 "ml/parser.ml"
-               : 'match_case))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    Obj.repr(
-# 1465 "ml/parser.mly"
-      ( Exp.case _1 (Exp.unreachable ~loc:(rhs_loc 3) ()))
-# 9077 "ml/parser.ml"
-               : 'match_case))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1469 "ml/parser.mly"
-      ( _2 )
-# 9084 "ml/parser.ml"
-               : 'fun_def))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'simple_core_type) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 1471 "ml/parser.mly"
-      ( mkexp (Pexp_constraint (_4, _2)) )
-# 9092 "ml/parser.ml"
-               : 'fun_def))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'labeled_simple_pattern) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'fun_def) in
-    Obj.repr(
-# 1474 "ml/parser.mly"
-      (
-       let (l,o,p) = _1 in
-       ghexp(Pexp_fun(l, o, p, _2))
-      )
-# 9103 "ml/parser.ml"
-               : 'fun_def))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'lident_list) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'fun_def) in
-    Obj.repr(
-# 1479 "ml/parser.mly"
-      ( mk_newtypes _3 _5 )
-# 9111 "ml/parser.ml"
-               : 'fun_def))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr_comma_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1482 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 9119 "ml/parser.ml"
-               : 'expr_comma_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1483 "ml/parser.mly"
-                                                ( [_3; _1] )
-# 9127 "ml/parser.ml"
-               : 'expr_comma_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'simple_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'lbl_expr_list) in
-    Obj.repr(
-# 1486 "ml/parser.mly"
-                                                ( (Some _1, _3) )
-# 9135 "ml/parser.ml"
-               : 'record_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'lbl_expr_list) in
-    Obj.repr(
-# 1487 "ml/parser.mly"
-                                                ( (None, _1) )
-# 9142 "ml/parser.ml"
-               : 'record_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'lbl_expr) in
-    Obj.repr(
-# 1490 "ml/parser.mly"
-              ( [_1] )
-# 9149 "ml/parser.ml"
-               : 'lbl_expr_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'lbl_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'lbl_expr_list) in
-    Obj.repr(
-# 1491 "ml/parser.mly"
-                                 ( _1 :: _3 )
-# 9157 "ml/parser.ml"
-               : 'lbl_expr_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'lbl_expr) in
-    Obj.repr(
-# 1492 "ml/parser.mly"
-                   ( [_1] )
-# 9164 "ml/parser.ml"
-               : 'lbl_expr_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'label_longident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'opt_type_constraint) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1496 "ml/parser.mly"
-      ( (mkrhs _1 1, mkexp_opt_constraint _4 _2) )
-# 9173 "ml/parser.ml"
-               : 'lbl_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'label_longident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'opt_type_constraint) in
-    Obj.repr(
-# 1498 "ml/parser.mly"
-      ( (mkrhs _1 1, mkexp_opt_constraint (exp_of_label _1 1) _2) )
-# 9181 "ml/parser.ml"
-               : 'lbl_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'field_expr) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'opt_semi) in
-    Obj.repr(
-# 1501 "ml/parser.mly"
-                        ( [_1] )
-# 9189 "ml/parser.ml"
-               : 'field_expr_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'field_expr) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'field_expr_list) in
-    Obj.repr(
-# 1502 "ml/parser.mly"
-                                    ( _1 :: _3 )
-# 9197 "ml/parser.ml"
-               : 'field_expr_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'label) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1506 "ml/parser.mly"
-      ( (mkrhs _1 1, _3) )
-# 9205 "ml/parser.ml"
-               : 'field_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'label) in
-    Obj.repr(
-# 1508 "ml/parser.mly"
-      ( (mkrhs _1 1, exp_of_label (Lident _1) 1) )
-# 9212 "ml/parser.ml"
-               : 'field_expr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1511 "ml/parser.mly"
-                                                ( [_1] )
-# 9219 "ml/parser.ml"
-               : 'expr_semi_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'expr_semi_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'expr) in
-    Obj.repr(
-# 1512 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 9227 "ml/parser.ml"
-               : 'expr_semi_list))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1515 "ml/parser.mly"
-                                                ( (Some _2, None) )
-# 9234 "ml/parser.ml"
-               : 'type_constraint))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'core_type) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1516 "ml/parser.mly"
-                                                ( (Some _2, Some _4) )
-# 9242 "ml/parser.ml"
-               : 'type_constraint))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1517 "ml/parser.mly"
-                                                ( (None, Some _2) )
-# 9249 "ml/parser.ml"
-               : 'type_constraint))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1518 "ml/parser.mly"
-                                                ( syntax_error() )
-# 9255 "ml/parser.ml"
-               : 'type_constraint))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1519 "ml/parser.mly"
-                                                ( syntax_error() )
-# 9261 "ml/parser.ml"
-               : 'type_constraint))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'type_constraint) in
-    Obj.repr(
-# 1522 "ml/parser.mly"
-                    ( Some _1 )
-# 9268 "ml/parser.ml"
-               : 'opt_type_constraint))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1523 "ml/parser.mly"
-                ( None )
-# 9274 "ml/parser.ml"
-               : 'opt_type_constraint))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'val_ident) in
-    Obj.repr(
-# 1530 "ml/parser.mly"
-      ( mkpat(Ppat_alias(_1, mkrhs _3 3)) )
-# 9282 "ml/parser.ml"
-               : 'pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    Obj.repr(
-# 1532 "ml/parser.mly"
-      ( expecting 3 "identifier" )
-# 9289 "ml/parser.ml"
-               : 'pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'pattern_comma_list) in
-    Obj.repr(
-# 1534 "ml/parser.mly"
-      ( mkpat(Ppat_tuple(List.rev _1)) )
-# 9296 "ml/parser.ml"
-               : 'pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1536 "ml/parser.mly"
-      ( mkpat_cons (rhs_loc 2) (ghpat(Ppat_tuple[_1;_3])) (symbol_rloc()) )
-# 9304 "ml/parser.ml"
-               : 'pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    Obj.repr(
-# 1538 "ml/parser.mly"
-      ( expecting 3 "pattern" )
-# 9311 "ml/parser.ml"
-               : 'pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1540 "ml/parser.mly"
-      ( mkpat(Ppat_or(_1, _3)) )
-# 9319 "ml/parser.ml"
-               : 'pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    Obj.repr(
-# 1542 "ml/parser.mly"
-      ( expecting 3 "pattern" )
-# 9326 "ml/parser.ml"
-               : 'pattern))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1544 "ml/parser.mly"
-      ( mkpat_attrs (Ppat_exception _3) _2)
-# 9334 "ml/parser.ml"
-               : 'pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'pattern) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attribute) in
-    Obj.repr(
-# 1546 "ml/parser.mly"
-      ( Pat.attr _1 _2 )
-# 9342 "ml/parser.ml"
-               : 'pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'pattern_gen) in
-    Obj.repr(
-# 1547 "ml/parser.mly"
-                ( _1 )
-# 9349 "ml/parser.ml"
-               : 'pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_no_exn) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'val_ident) in
-    Obj.repr(
-# 1551 "ml/parser.mly"
-      ( mkpat(Ppat_alias(_1, mkrhs _3 3)) )
-# 9357 "ml/parser.ml"
-               : 'pattern_no_exn))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_no_exn) in
-    Obj.repr(
-# 1553 "ml/parser.mly"
-      ( expecting 3 "identifier" )
-# 9364 "ml/parser.ml"
-               : 'pattern_no_exn))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'pattern_no_exn_comma_list) in
-    Obj.repr(
-# 1555 "ml/parser.mly"
-      ( mkpat(Ppat_tuple(List.rev _1)) )
-# 9371 "ml/parser.ml"
-               : 'pattern_no_exn))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_no_exn) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1557 "ml/parser.mly"
-      ( mkpat_cons (rhs_loc 2) (ghpat(Ppat_tuple[_1;_3])) (symbol_rloc()) )
-# 9379 "ml/parser.ml"
-               : 'pattern_no_exn))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_no_exn) in
-    Obj.repr(
-# 1559 "ml/parser.mly"
-      ( expecting 3 "pattern" )
-# 9386 "ml/parser.ml"
-               : 'pattern_no_exn))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_no_exn) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1561 "ml/parser.mly"
-      ( mkpat(Ppat_or(_1, _3)) )
-# 9394 "ml/parser.ml"
-               : 'pattern_no_exn))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_no_exn) in
-    Obj.repr(
-# 1563 "ml/parser.mly"
-      ( expecting 3 "pattern" )
-# 9401 "ml/parser.ml"
-               : 'pattern_no_exn))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'pattern_no_exn) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attribute) in
-    Obj.repr(
-# 1565 "ml/parser.mly"
-      ( Pat.attr _1 _2 )
-# 9409 "ml/parser.ml"
-               : 'pattern_no_exn))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'pattern_gen) in
-    Obj.repr(
-# 1566 "ml/parser.mly"
-                ( _1 )
-# 9416 "ml/parser.ml"
-               : 'pattern_no_exn))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_pattern) in
-    Obj.repr(
-# 1570 "ml/parser.mly"
-      ( _1 )
-# 9423 "ml/parser.ml"
-               : 'pattern_gen))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'constr_longident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1572 "ml/parser.mly"
-      ( mkpat(Ppat_construct(mkrhs _1 1, Some _2)) )
-# 9431 "ml/parser.ml"
-               : 'pattern_gen))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'name_tag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1574 "ml/parser.mly"
-      ( mkpat(Ppat_variant(_1, Some _2)) )
-# 9439 "ml/parser.ml"
-               : 'pattern_gen))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'simple_pattern) in
-    Obj.repr(
-# 1576 "ml/parser.mly"
-      ( mkpat_attrs (Ppat_lazy _3) _2)
-# 9447 "ml/parser.ml"
-               : 'pattern_gen))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'val_ident) in
-    Obj.repr(
-# 1580 "ml/parser.mly"
-      ( mkpat(Ppat_var (mkrhs _1 1)) )
-# 9454 "ml/parser.ml"
-               : 'simple_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_pattern_not_ident) in
-    Obj.repr(
-# 1581 "ml/parser.mly"
-                             ( _1 )
-# 9461 "ml/parser.ml"
-               : 'simple_pattern))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1585 "ml/parser.mly"
-      ( mkpat(Ppat_any) )
-# 9467 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'signed_constant) in
-    Obj.repr(
-# 1587 "ml/parser.mly"
-      ( mkpat(Ppat_constant _1) )
-# 9474 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'signed_constant) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'signed_constant) in
-    Obj.repr(
-# 1589 "ml/parser.mly"
-      ( mkpat(Ppat_interval (_1, _3)) )
-# 9482 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'constr_longident) in
-    Obj.repr(
-# 1591 "ml/parser.mly"
-      ( mkpat(Ppat_construct(mkrhs _1 1, None)) )
-# 9489 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'name_tag) in
-    Obj.repr(
-# 1593 "ml/parser.mly"
-      ( mkpat(Ppat_variant(_1, None)) )
-# 9496 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'type_longident) in
-    Obj.repr(
-# 1595 "ml/parser.mly"
-      ( mkpat(Ppat_type (mkrhs _2 2)) )
-# 9503 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_delimited_pattern) in
-    Obj.repr(
-# 1597 "ml/parser.mly"
-      ( _1 )
-# 9510 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'mod_longident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'simple_delimited_pattern) in
-    Obj.repr(
-# 1599 "ml/parser.mly"
-      ( mkpat @@ Ppat_open(mkrhs _1 1, _3) )
-# 9518 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'mod_longident) in
-    Obj.repr(
-# 1601 "ml/parser.mly"
-    ( mkpat @@ Ppat_open(mkrhs _1 1, mkpat @@
-               Ppat_construct ( mkrhs (Lident "[]") 4, None)) )
-# 9526 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'mod_longident) in
-    Obj.repr(
-# 1604 "ml/parser.mly"
-      ( mkpat @@ Ppat_open( mkrhs _1 1, mkpat @@
-                 Ppat_construct ( mkrhs (Lident "()") 4, None) ) )
-# 9534 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'pattern) in
-    Obj.repr(
-# 1607 "ml/parser.mly"
-      ( mkpat @@ Ppat_open (mkrhs _1 1, _4))
-# 9542 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'pattern) in
-    Obj.repr(
-# 1609 "ml/parser.mly"
-      (unclosed "(" 3 ")" 5  )
-# 9550 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'mod_longident) in
-    Obj.repr(
-# 1611 "ml/parser.mly"
-      ( expecting 4 "pattern" )
-# 9557 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'pattern) in
-    Obj.repr(
-# 1613 "ml/parser.mly"
-      ( reloc_pat _2 )
-# 9564 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'pattern) in
-    Obj.repr(
-# 1615 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 3 )
-# 9571 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'pattern) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'core_type) in
-    Obj.repr(
-# 1617 "ml/parser.mly"
-      ( mkpat(Ppat_constraint(_2, _4)) )
-# 9579 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'pattern) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'core_type) in
-    Obj.repr(
-# 1619 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 5 )
-# 9587 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    Obj.repr(
-# 1621 "ml/parser.mly"
-      ( expecting 4 "type" )
-# 9594 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : string) in
-    Obj.repr(
-# 1623 "ml/parser.mly"
-      ( mkpat_attrs (Ppat_unpack (mkrhs _4 4)) _3 )
-# 9602 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'package_type) in
-    Obj.repr(
-# 1625 "ml/parser.mly"
-      ( mkpat_attrs
-          (Ppat_constraint(mkpat(Ppat_unpack (mkrhs _4 4)),
-                           ghtyp(Ptyp_package _6)))
-          _3 )
-# 9614 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'package_type) in
-    Obj.repr(
-# 1630 "ml/parser.mly"
-      ( unclosed "(" 1 ")" 7 )
-# 9623 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'extension) in
-    Obj.repr(
-# 1632 "ml/parser.mly"
-      ( mkpat(Ppat_extension _1) )
-# 9630 "ml/parser.ml"
-               : 'simple_pattern_not_ident))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'lbl_pattern_list) in
-    Obj.repr(
-# 1637 "ml/parser.mly"
-    ( let (fields, closed) = _2 in mkpat(Ppat_record(fields, closed)) )
-# 9637 "ml/parser.ml"
-               : 'simple_delimited_pattern))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'lbl_pattern_list) in
-    Obj.repr(
-# 1639 "ml/parser.mly"
-    ( unclosed "{" 1 "}" 3 )
-# 9644 "ml/parser.ml"
-               : 'simple_delimited_pattern))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_semi_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1641 "ml/parser.mly"
-    ( reloc_pat (mktailpat (rhs_loc 4) (List.rev _2)) )
-# 9652 "ml/parser.ml"
-               : 'simple_delimited_pattern))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_semi_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1643 "ml/parser.mly"
-    ( unclosed "[" 1 "]" 4 )
-# 9660 "ml/parser.ml"
-               : 'simple_delimited_pattern))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_semi_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1645 "ml/parser.mly"
-    ( mkpat(Ppat_array(List.rev _2)) )
-# 9668 "ml/parser.ml"
-               : 'simple_delimited_pattern))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1647 "ml/parser.mly"
-    ( mkpat(Ppat_array []) )
-# 9674 "ml/parser.ml"
-               : 'simple_delimited_pattern))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_semi_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'opt_semi) in
-    Obj.repr(
-# 1649 "ml/parser.mly"
-    ( unclosed "[|" 1 "|]" 4 )
-# 9682 "ml/parser.ml"
-               : 'simple_delimited_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_comma_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1652 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 9690 "ml/parser.ml"
-               : 'pattern_comma_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1653 "ml/parser.mly"
-                                                ( [_3; _1] )
-# 9698 "ml/parser.ml"
-               : 'pattern_comma_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    Obj.repr(
-# 1654 "ml/parser.mly"
-                                                ( expecting 3 "pattern" )
-# 9705 "ml/parser.ml"
-               : 'pattern_comma_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_no_exn_comma_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1657 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 9713 "ml/parser.ml"
-               : 'pattern_no_exn_comma_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_no_exn) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1658 "ml/parser.mly"
-                                                ( [_3; _1] )
-# 9721 "ml/parser.ml"
-               : 'pattern_no_exn_comma_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_no_exn) in
-    Obj.repr(
-# 1659 "ml/parser.mly"
-                                                ( expecting 3 "pattern" )
-# 9728 "ml/parser.ml"
-               : 'pattern_no_exn_comma_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1662 "ml/parser.mly"
-                                                ( [_1] )
-# 9735 "ml/parser.ml"
-               : 'pattern_semi_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'pattern_semi_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1663 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 9743 "ml/parser.ml"
-               : 'pattern_semi_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'lbl_pattern) in
-    Obj.repr(
-# 1666 "ml/parser.mly"
-                ( [_1], Closed )
-# 9750 "ml/parser.ml"
-               : 'lbl_pattern_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'lbl_pattern) in
-    Obj.repr(
-# 1667 "ml/parser.mly"
-                     ( [_1], Closed )
-# 9757 "ml/parser.ml"
-               : 'lbl_pattern_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'lbl_pattern) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'opt_semi) in
-    Obj.repr(
-# 1668 "ml/parser.mly"
-                                         ( [_1], Open )
-# 9765 "ml/parser.ml"
-               : 'lbl_pattern_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'lbl_pattern) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'lbl_pattern_list) in
-    Obj.repr(
-# 1670 "ml/parser.mly"
-      ( let (fields, closed) = _3 in _1 :: fields, closed )
-# 9773 "ml/parser.ml"
-               : 'lbl_pattern_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'label_longident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'opt_pattern_type_constraint) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 1674 "ml/parser.mly"
-     ( (mkrhs _1 1, mkpat_opt_constraint _4 _2) )
-# 9782 "ml/parser.ml"
-               : 'lbl_pattern))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'label_longident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'opt_pattern_type_constraint) in
-    Obj.repr(
-# 1676 "ml/parser.mly"
-     ( (mkrhs _1 1, mkpat_opt_constraint (pat_of_label _1 1) _2) )
-# 9790 "ml/parser.ml"
-               : 'lbl_pattern))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1679 "ml/parser.mly"
-                    ( Some _2 )
-# 9797 "ml/parser.ml"
-               : 'opt_pattern_type_constraint))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1680 "ml/parser.mly"
-                ( None )
-# 9803 "ml/parser.ml"
-               : 'opt_pattern_type_constraint))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'val_ident) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'core_type) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1687 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        Val.mk (mkrhs _3 3) _5 ~attrs:(attrs@_6)
-              ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext )
-# 9816 "ml/parser.ml"
-               : 'value_description))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string * string option) in
-    Obj.repr(
-# 1696 "ml/parser.mly"
-                                                ( [fst _1] )
-# 9823 "ml/parser.ml"
-               : 'primitive_declaration_body))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : string * string option) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'primitive_declaration_body) in
-    Obj.repr(
-# 1697 "ml/parser.mly"
-                                                ( fst _1 :: _2 )
-# 9831 "ml/parser.ml"
-               : 'primitive_declaration_body))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 6 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 5 : 'val_ident) in
-    let _5 = (Parsing.peek_val __caml_parser_env 3 : 'core_type) in
-    let _7 = (Parsing.peek_val __caml_parser_env 1 : 'primitive_declaration_body) in
-    let _8 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1702 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        Val.mk (mkrhs _3 3) _5 ~prim:_7 ~attrs:(attrs@_8)
-              ~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
-      , ext )
-# 9845 "ml/parser.ml"
-               : 'primitive_declaration))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'type_declaration) in
-    Obj.repr(
-# 1712 "ml/parser.mly"
-      ( let (nonrec_flag, ty, ext) = _1 in (nonrec_flag, [ty], ext) )
-# 9852 "ml/parser.ml"
-               : 'type_declarations))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'type_declarations) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'and_type_declaration) in
-    Obj.repr(
-# 1714 "ml/parser.mly"
-      ( let (nonrec_flag, tys, ext) = _1 in (nonrec_flag, _2 :: tys, ext) )
-# 9860 "ml/parser.ml"
-               : 'type_declarations))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 6 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 5 : 'nonrec_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 4 : 'optional_type_parameters) in
-    let _5 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _6 = (Parsing.peek_val __caml_parser_env 2 : 'type_kind) in
-    let _7 = (Parsing.peek_val __caml_parser_env 1 : 'constraints) in
-    let _8 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1720 "ml/parser.mly"
-      ( let (kind, priv, manifest) = _6 in
-        let (ext, attrs) = _2 in
-        let ty =
-          Type.mk (mkrhs _5 5) ~params:_4 ~cstrs:(List.rev _7) ~kind
-            ~priv ?manifest ~attrs:(attrs@_8)
-            ~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
-        in
-          (_3, ty, ext) )
-# 9880 "ml/parser.ml"
-               : 'type_declaration))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'optional_type_parameters) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'type_kind) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'constraints) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1732 "ml/parser.mly"
-      ( let (kind, priv, manifest) = _5 in
-          Type.mk (mkrhs _4 4) ~params:_3 ~cstrs:(List.rev _6)
-            ~kind ~priv ?manifest ~attrs:(_2@_7) ~loc:(symbol_rloc ())
-            ~text:(symbol_text ()) ~docs:(symbol_docs ()) )
-# 9895 "ml/parser.ml"
-               : 'and_type_declaration))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'constraints) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'constrain) in
-    Obj.repr(
-# 1738 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 9903 "ml/parser.ml"
-               : 'constraints))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1739 "ml/parser.mly"
-                                                ( [] )
-# 9909 "ml/parser.ml"
-               : 'constraints))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1743 "ml/parser.mly"
-      ( (Ptype_abstract, Public, None) )
-# 9915 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1745 "ml/parser.mly"
-      ( (Ptype_abstract, Public, Some _2) )
-# 9922 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1747 "ml/parser.mly"
-      ( (Ptype_abstract, Private, Some _3) )
-# 9929 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'constructor_declarations) in
-    Obj.repr(
-# 1749 "ml/parser.mly"
-      ( (Ptype_variant(List.rev _2), Public, None) )
-# 9936 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'constructor_declarations) in
-    Obj.repr(
-# 1751 "ml/parser.mly"
-      ( (Ptype_variant(List.rev _3), Private, None) )
-# 9943 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1753 "ml/parser.mly"
-      ( (Ptype_open, Public, None) )
-# 9949 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1755 "ml/parser.mly"
-      ( (Ptype_open, Private, None) )
-# 9955 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'private_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'label_declarations) in
-    Obj.repr(
-# 1757 "ml/parser.mly"
-      ( (Ptype_record _4, _2, None) )
-# 9963 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'core_type) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'private_flag) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'constructor_declarations) in
-    Obj.repr(
-# 1759 "ml/parser.mly"
-      ( (Ptype_variant(List.rev _5), _4, Some _2) )
-# 9972 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'core_type) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'private_flag) in
-    Obj.repr(
-# 1761 "ml/parser.mly"
-      ( (Ptype_open, _4, Some _2) )
-# 9980 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'core_type) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'private_flag) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'label_declarations) in
-    Obj.repr(
-# 1763 "ml/parser.mly"
-      ( (Ptype_record _6, _4, Some _2) )
-# 9989 "ml/parser.ml"
-               : 'type_kind))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1766 "ml/parser.mly"
-                                                ( [] )
-# 9995 "ml/parser.ml"
-               : 'optional_type_parameters))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'optional_type_parameter) in
-    Obj.repr(
-# 1767 "ml/parser.mly"
-                                                ( [_1] )
-# 10002 "ml/parser.ml"
-               : 'optional_type_parameters))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'optional_type_parameter_list) in
-    Obj.repr(
-# 1768 "ml/parser.mly"
-                                                ( List.rev _2 )
-# 10009 "ml/parser.ml"
-               : 'optional_type_parameters))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'type_variance) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'optional_type_variable) in
-    Obj.repr(
-# 1771 "ml/parser.mly"
-                                                ( _2, _1 )
-# 10017 "ml/parser.ml"
-               : 'optional_type_parameter))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'optional_type_parameter) in
-    Obj.repr(
-# 1774 "ml/parser.mly"
-                                                         ( [_1] )
-# 10024 "ml/parser.ml"
-               : 'optional_type_parameter_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'optional_type_parameter_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'optional_type_parameter) in
-    Obj.repr(
-# 1775 "ml/parser.mly"
-                                                                  ( _3 :: _1 )
-# 10032 "ml/parser.ml"
-               : 'optional_type_parameter_list))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'ident) in
-    Obj.repr(
-# 1778 "ml/parser.mly"
-                                                ( mktyp(Ptyp_var _2) )
-# 10039 "ml/parser.ml"
-               : 'optional_type_variable))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1779 "ml/parser.mly"
-                                                ( mktyp(Ptyp_any) )
-# 10045 "ml/parser.ml"
-               : 'optional_type_variable))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'type_variance) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'type_variable) in
-    Obj.repr(
-# 1784 "ml/parser.mly"
-                                                  ( _2, _1 )
-# 10053 "ml/parser.ml"
-               : 'type_parameter))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1787 "ml/parser.mly"
-                                                ( Invariant )
-# 10059 "ml/parser.ml"
-               : 'type_variance))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1788 "ml/parser.mly"
-                                                ( Covariant )
-# 10065 "ml/parser.ml"
-               : 'type_variance))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1789 "ml/parser.mly"
-                                                ( Contravariant )
-# 10071 "ml/parser.ml"
-               : 'type_variance))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'ident) in
-    Obj.repr(
-# 1792 "ml/parser.mly"
-                                                ( mktyp(Ptyp_var _2) )
-# 10078 "ml/parser.ml"
-               : 'type_variable))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'type_parameter) in
-    Obj.repr(
-# 1795 "ml/parser.mly"
-                                                ( [_1] )
-# 10085 "ml/parser.ml"
-               : 'type_parameter_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'type_parameter_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'type_parameter) in
-    Obj.repr(
-# 1796 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 10093 "ml/parser.ml"
-               : 'type_parameter_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'constructor_declaration) in
-    Obj.repr(
-# 1799 "ml/parser.mly"
-                                                         ( [_1] )
-# 10100 "ml/parser.ml"
-               : 'constructor_declarations))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'bar_constructor_declaration) in
-    Obj.repr(
-# 1800 "ml/parser.mly"
-                                                         ( [_1] )
-# 10107 "ml/parser.ml"
-               : 'constructor_declarations))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'constructor_declarations) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'bar_constructor_declaration) in
-    Obj.repr(
-# 1801 "ml/parser.mly"
-                                                         ( _2 :: _1 )
-# 10115 "ml/parser.ml"
-               : 'constructor_declarations))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'constr_ident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'generalized_constructor_arguments) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 1805 "ml/parser.mly"
-      (
-       let args,res = _2 in
-       Type.constructor (mkrhs _1 1) ~args ?res ~attrs:_3
-         ~loc:(symbol_rloc()) ~info:(symbol_info ())
-      )
-# 10128 "ml/parser.ml"
-               : 'constructor_declaration))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'constr_ident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'generalized_constructor_arguments) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 1813 "ml/parser.mly"
-      (
-       let args,res = _3 in
-       Type.constructor (mkrhs _2 2) ~args ?res ~attrs:_4
-         ~loc:(symbol_rloc()) ~info:(symbol_info ())
-      )
-# 10141 "ml/parser.ml"
-               : 'bar_constructor_declaration))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'sig_exception_declaration) in
-    Obj.repr(
-# 1820 "ml/parser.mly"
-                                                 ( _1 )
-# 10148 "ml/parser.ml"
-               : 'str_exception_declaration))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 4 : 'constr_ident) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'constr_longident) in
-    let _6 = (Parsing.peek_val __caml_parser_env 1 : 'attributes) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1823 "ml/parser.mly"
-      ( let (ext,attrs) = _2 in
-        Te.rebind (mkrhs _3 3) (mkrhs _5 5) ~attrs:(attrs @ _6 @ _7)
-          ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-        , ext )
-# 10162 "ml/parser.ml"
-               : 'str_exception_declaration))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'constr_ident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'generalized_constructor_arguments) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'attributes) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1831 "ml/parser.mly"
-      ( let args, res = _4 in
-        let (ext,attrs) = _2 in
-          Te.decl (mkrhs _3 3) ~args ?res ~attrs:(attrs @ _5 @ _6)
-            ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-        , ext )
-# 10177 "ml/parser.ml"
-               : 'sig_exception_declaration))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'constr_ident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'generalized_constructor_arguments) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 1839 "ml/parser.mly"
-      ( let args, res = _2 in
-        Te.decl (mkrhs _1 1) ~args ?res ~attrs:_3 ~loc:(symbol_rloc()) )
-# 10187 "ml/parser.ml"
-               : 'let_exception_declaration))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1843 "ml/parser.mly"
-                                  ( (Pcstr_tuple [],None) )
-# 10193 "ml/parser.ml"
-               : 'generalized_constructor_arguments))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'constructor_arguments) in
-    Obj.repr(
-# 1844 "ml/parser.mly"
-                                  ( (_2,None) )
-# 10200 "ml/parser.ml"
-               : 'generalized_constructor_arguments))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'constructor_arguments) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'simple_core_type) in
-    Obj.repr(
-# 1846 "ml/parser.mly"
-                                  ( (_2,Some _4) )
-# 10208 "ml/parser.ml"
-               : 'generalized_constructor_arguments))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'simple_core_type) in
-    Obj.repr(
-# 1848 "ml/parser.mly"
-                                  ( (Pcstr_tuple [],Some _2) )
-# 10215 "ml/parser.ml"
-               : 'generalized_constructor_arguments))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'core_type_list) in
-    Obj.repr(
-# 1852 "ml/parser.mly"
-                                     ( Pcstr_tuple (List.rev _1) )
-# 10222 "ml/parser.ml"
-               : 'constructor_arguments))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'label_declarations) in
-    Obj.repr(
-# 1853 "ml/parser.mly"
-                                     ( Pcstr_record _2 )
-# 10229 "ml/parser.ml"
-               : 'constructor_arguments))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'label_declaration) in
-    Obj.repr(
-# 1856 "ml/parser.mly"
-                                                ( [_1] )
-# 10236 "ml/parser.ml"
-               : 'label_declarations))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'label_declaration_semi) in
-    Obj.repr(
-# 1857 "ml/parser.mly"
-                                                ( [_1] )
-# 10243 "ml/parser.ml"
-               : 'label_declarations))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'label_declaration_semi) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'label_declarations) in
-    Obj.repr(
-# 1858 "ml/parser.mly"
-                                                ( _1 :: _2 )
-# 10251 "ml/parser.ml"
-               : 'label_declarations))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'mutable_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'label) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'poly_type_no_attr) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 1862 "ml/parser.mly"
-      (
-       Type.field (mkrhs _2 2) _4 ~mut:_1 ~attrs:_5
-         ~loc:(symbol_rloc()) ~info:(symbol_info ())
-      )
-# 10264 "ml/parser.ml"
-               : 'label_declaration))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 6 : 'mutable_flag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 5 : 'label) in
-    let _4 = (Parsing.peek_val __caml_parser_env 3 : 'poly_type_no_attr) in
-    let _5 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _7 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 1869 "ml/parser.mly"
-      (
-       let info =
-         match rhs_info 5 with
-         | Some _ as info_before_semi -> info_before_semi
-         | None -> symbol_info ()
-       in
-       Type.field (mkrhs _2 2) _4 ~mut:_1 ~attrs:(_5 @ _7)
-         ~loc:(symbol_rloc()) ~info
-      )
-# 10283 "ml/parser.ml"
-               : 'label_declaration_semi))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 7 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 6 : 'nonrec_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 5 : 'optional_type_parameters) in
-    let _5 = (Parsing.peek_val __caml_parser_env 4 : 'type_longident) in
-    let _7 = (Parsing.peek_val __caml_parser_env 2 : 'private_flag) in
-    let _8 = (Parsing.peek_val __caml_parser_env 1 : 'str_extension_constructors) in
-    let _9 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1885 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        if _3 <> Recursive then not_expecting 3 "nonrec flag";
-        Te.mk (mkrhs _5 5) (List.rev _8) ~params:_4 ~priv:_7
-          ~attrs:(attrs@_9) ~docs:(symbol_docs ())
-        , ext )
-# 10300 "ml/parser.ml"
-               : 'str_type_extension))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 7 : 'ext_attributes) in
-    let _3 = (Parsing.peek_val __caml_parser_env 6 : 'nonrec_flag) in
-    let _4 = (Parsing.peek_val __caml_parser_env 5 : 'optional_type_parameters) in
-    let _5 = (Parsing.peek_val __caml_parser_env 4 : 'type_longident) in
-    let _7 = (Parsing.peek_val __caml_parser_env 2 : 'private_flag) in
-    let _8 = (Parsing.peek_val __caml_parser_env 1 : 'sig_extension_constructors) in
-    let _9 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 1894 "ml/parser.mly"
-      ( let (ext, attrs) = _2 in
-        if _3 <> Recursive then not_expecting 3 "nonrec flag";
-        Te.mk (mkrhs _5 5) (List.rev _8) ~params:_4 ~priv:_7
-          ~attrs:(attrs @ _9) ~docs:(symbol_docs ())
-        , ext )
-# 10317 "ml/parser.ml"
-               : 'sig_type_extension))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'extension_constructor_declaration) in
-    Obj.repr(
-# 1901 "ml/parser.mly"
-                                                          ( [_1] )
-# 10324 "ml/parser.ml"
-               : 'str_extension_constructors))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'bar_extension_constructor_declaration) in
-    Obj.repr(
-# 1902 "ml/parser.mly"
-                                                          ( [_1] )
-# 10331 "ml/parser.ml"
-               : 'str_extension_constructors))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'extension_constructor_rebind) in
-    Obj.repr(
-# 1903 "ml/parser.mly"
-                                                          ( [_1] )
-# 10338 "ml/parser.ml"
-               : 'str_extension_constructors))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'bar_extension_constructor_rebind) in
-    Obj.repr(
-# 1904 "ml/parser.mly"
-                                                          ( [_1] )
-# 10345 "ml/parser.ml"
-               : 'str_extension_constructors))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'str_extension_constructors) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'bar_extension_constructor_declaration) in
-    Obj.repr(
-# 1906 "ml/parser.mly"
-      ( _2 :: _1 )
-# 10353 "ml/parser.ml"
-               : 'str_extension_constructors))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'str_extension_constructors) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'bar_extension_constructor_rebind) in
-    Obj.repr(
-# 1908 "ml/parser.mly"
-      ( _2 :: _1 )
-# 10361 "ml/parser.ml"
-               : 'str_extension_constructors))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'extension_constructor_declaration) in
-    Obj.repr(
-# 1911 "ml/parser.mly"
-                                                          ( [_1] )
-# 10368 "ml/parser.ml"
-               : 'sig_extension_constructors))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'bar_extension_constructor_declaration) in
-    Obj.repr(
-# 1912 "ml/parser.mly"
-                                                          ( [_1] )
-# 10375 "ml/parser.ml"
-               : 'sig_extension_constructors))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'sig_extension_constructors) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'bar_extension_constructor_declaration) in
-    Obj.repr(
-# 1914 "ml/parser.mly"
-      ( _2 :: _1 )
-# 10383 "ml/parser.ml"
-               : 'sig_extension_constructors))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'constr_ident) in
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'generalized_constructor_arguments) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 1918 "ml/parser.mly"
-      ( let args, res = _2 in
-        Te.decl (mkrhs _1 1) ~args ?res ~attrs:_3
-          ~loc:(symbol_rloc()) ~info:(symbol_info ()) )
-# 10394 "ml/parser.ml"
-               : 'extension_constructor_declaration))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'constr_ident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'generalized_constructor_arguments) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 1924 "ml/parser.mly"
-      ( let args, res = _3 in
-        Te.decl (mkrhs _2 2) ~args ?res ~attrs:_4
-           ~loc:(symbol_rloc()) ~info:(symbol_info ()) )
-# 10405 "ml/parser.ml"
-               : 'bar_extension_constructor_declaration))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'constr_ident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'constr_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 1930 "ml/parser.mly"
-      ( Te.rebind (mkrhs _1 1) (mkrhs _3 3) ~attrs:_4
-          ~loc:(symbol_rloc()) ~info:(symbol_info ()) )
-# 10415 "ml/parser.ml"
-               : 'extension_constructor_rebind))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'constr_ident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'constr_longident) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 1935 "ml/parser.mly"
-      ( Te.rebind (mkrhs _2 2) (mkrhs _4 4) ~attrs:_5
-          ~loc:(symbol_rloc()) ~info:(symbol_info ()) )
-# 10425 "ml/parser.ml"
-               : 'bar_extension_constructor_rebind))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'with_constraint) in
-    Obj.repr(
-# 1942 "ml/parser.mly"
-                                                ( [_1] )
-# 10432 "ml/parser.ml"
-               : 'with_constraints))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'with_constraints) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'with_constraint) in
-    Obj.repr(
-# 1943 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 10440 "ml/parser.ml"
-               : 'with_constraints))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'optional_type_parameters) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'label_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'with_type_binder) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'core_type_no_attr) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'constraints) in
-    Obj.repr(
-# 1948 "ml/parser.mly"
-      ( Pwith_type
-          (mkrhs _3 3,
-           (Type.mk (mkrhs (Longident.last _3) 3)
-              ~params:_2
-              ~cstrs:(List.rev _6)
-              ~manifest:_5
-              ~priv:_4
-              ~loc:(symbol_rloc()))) )
-# 10458 "ml/parser.ml"
-               : 'with_constraint))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'optional_type_parameters) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'label_longident) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'core_type_no_attr) in
-    Obj.repr(
-# 1959 "ml/parser.mly"
-      ( Pwith_typesubst
-         (mkrhs _3 3,
-           (Type.mk (mkrhs (Longident.last _3) 3)
-             ~params:_2
-             ~manifest:_5
-             ~loc:(symbol_rloc()))) )
-# 10472 "ml/parser.ml"
-               : 'with_constraint))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'mod_ext_longident) in
-    Obj.repr(
-# 1966 "ml/parser.mly"
-      ( Pwith_module (mkrhs _2 2, mkrhs _4 4) )
-# 10480 "ml/parser.ml"
-               : 'with_constraint))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'mod_longident) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'mod_ext_longident) in
-    Obj.repr(
-# 1968 "ml/parser.mly"
-      ( Pwith_modsubst (mkrhs _2 2, mkrhs _4 4) )
-# 10488 "ml/parser.ml"
-               : 'with_constraint))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1971 "ml/parser.mly"
-                   ( Public )
-# 10494 "ml/parser.ml"
-               : 'with_type_binder))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 1972 "ml/parser.mly"
-                   ( Private )
-# 10500 "ml/parser.ml"
-               : 'with_type_binder))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'ident) in
-    Obj.repr(
-# 1978 "ml/parser.mly"
-                                                ( [mkrhs _2 2] )
-# 10507 "ml/parser.ml"
-               : 'typevar_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'typevar_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'ident) in
-    Obj.repr(
-# 1979 "ml/parser.mly"
-                                                ( mkrhs _3 3 :: _1 )
-# 10515 "ml/parser.ml"
-               : 'typevar_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1983 "ml/parser.mly"
-          ( _1 )
-# 10522 "ml/parser.ml"
-               : 'poly_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'typevar_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 1985 "ml/parser.mly"
-          ( mktyp(Ptyp_poly(List.rev _1, _3)) )
-# 10530 "ml/parser.ml"
-               : 'poly_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'core_type_no_attr) in
-    Obj.repr(
-# 1989 "ml/parser.mly"
-          ( _1 )
-# 10537 "ml/parser.ml"
-               : 'poly_type_no_attr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'typevar_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type_no_attr) in
-    Obj.repr(
-# 1991 "ml/parser.mly"
-          ( mktyp(Ptyp_poly(List.rev _1, _3)) )
-# 10545 "ml/parser.ml"
-               : 'poly_type_no_attr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'core_type_no_attr) in
-    Obj.repr(
-# 1998 "ml/parser.mly"
-      ( _1 )
-# 10552 "ml/parser.ml"
-               : 'core_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'core_type) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attribute) in
-    Obj.repr(
-# 2000 "ml/parser.mly"
-      ( Typ.attr _1 _2 )
-# 10560 "ml/parser.ml"
-               : 'core_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'core_type2) in
-    Obj.repr(
-# 2004 "ml/parser.mly"
-      ( _1 )
-# 10567 "ml/parser.ml"
-               : 'core_type_no_attr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'core_type2) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'ident) in
-    Obj.repr(
-# 2006 "ml/parser.mly"
-      ( mktyp(Ptyp_alias(_1, _4)) )
-# 10575 "ml/parser.ml"
-               : 'core_type_no_attr))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_core_type_or_tuple) in
-    Obj.repr(
-# 2010 "ml/parser.mly"
-      ( _1 )
-# 10582 "ml/parser.ml"
-               : 'core_type2))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : string) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'core_type2) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'core_type2) in
-    Obj.repr(
-# 2012 "ml/parser.mly"
-      ( let param = extra_rhs_core_type _4 ~pos:4 in
-        mktyp (Ptyp_arrow(Optional _2 , param, _6)) )
-# 10592 "ml/parser.ml"
-               : 'core_type2))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'core_type2) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'core_type2) in
-    Obj.repr(
-# 2015 "ml/parser.mly"
-      ( let param = extra_rhs_core_type _2 ~pos:2 in
-        mktyp(Ptyp_arrow(Optional _1 , param, _4))
-      )
-# 10603 "ml/parser.ml"
-               : 'core_type2))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : string) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'core_type2) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'core_type2) in
-    Obj.repr(
-# 2019 "ml/parser.mly"
-      ( let param = extra_rhs_core_type _3 ~pos:3 in
-        mktyp(Ptyp_arrow(Labelled _1, param, _5)) )
-# 10613 "ml/parser.ml"
-               : 'core_type2))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'core_type2) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type2) in
-    Obj.repr(
-# 2022 "ml/parser.mly"
-      ( let param = extra_rhs_core_type _1 ~pos:1 in
-        mktyp(Ptyp_arrow(Nolabel, param, _3)) )
-# 10622 "ml/parser.ml"
-               : 'core_type2))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_core_type2) in
-    Obj.repr(
-# 2028 "ml/parser.mly"
-      ( _1 )
-# 10629 "ml/parser.ml"
-               : 'simple_core_type))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'core_type_comma_list) in
-    Obj.repr(
-# 2030 "ml/parser.mly"
-      ( match _2 with [sty] -> sty | _ -> raise Parse_error )
-# 10636 "ml/parser.ml"
-               : 'simple_core_type))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'ident) in
-    Obj.repr(
-# 2035 "ml/parser.mly"
-      ( mktyp(Ptyp_var _2) )
-# 10643 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2037 "ml/parser.mly"
-      ( mktyp(Ptyp_any) )
-# 10649 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'type_longident) in
-    Obj.repr(
-# 2039 "ml/parser.mly"
-      ( mktyp(Ptyp_constr(mkrhs _1 1, [])) )
-# 10656 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'simple_core_type2) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'type_longident) in
-    Obj.repr(
-# 2041 "ml/parser.mly"
-      ( mktyp(Ptyp_constr(mkrhs _2 2, [_1])) )
-# 10664 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'core_type_comma_list) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'type_longident) in
-    Obj.repr(
-# 2043 "ml/parser.mly"
-      ( mktyp(Ptyp_constr(mkrhs _4 4, List.rev _2)) )
-# 10672 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'meth_list) in
-    Obj.repr(
-# 2045 "ml/parser.mly"
-      ( let (f, c) = _2 in mktyp(Ptyp_object (f, c)) )
-# 10679 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2047 "ml/parser.mly"
-      ( mktyp(Ptyp_object ([], Closed)) )
-# 10685 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'class_longident) in
-    Obj.repr(
-# 2049 "ml/parser.mly"
-      ( mktyp(Ptyp_class(mkrhs _2 2, [])) )
-# 10692 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'simple_core_type2) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'class_longident) in
-    Obj.repr(
-# 2051 "ml/parser.mly"
-      ( mktyp(Ptyp_class(mkrhs _3 3, [_1])) )
-# 10700 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'core_type_comma_list) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'class_longident) in
-    Obj.repr(
-# 2053 "ml/parser.mly"
-      ( mktyp(Ptyp_class(mkrhs _5 5, List.rev _2)) )
-# 10708 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'tag_field) in
-    Obj.repr(
-# 2055 "ml/parser.mly"
-      ( mktyp(Ptyp_variant([_2], Closed, None)) )
-# 10715 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'row_field_list) in
-    Obj.repr(
-# 2061 "ml/parser.mly"
-      ( mktyp(Ptyp_variant(List.rev _3, Closed, None)) )
-# 10722 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 3 : 'row_field) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'row_field_list) in
-    Obj.repr(
-# 2063 "ml/parser.mly"
-      ( mktyp(Ptyp_variant(_2 :: List.rev _4, Closed, None)) )
-# 10730 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'opt_bar) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'row_field_list) in
-    Obj.repr(
-# 2065 "ml/parser.mly"
-      ( mktyp(Ptyp_variant(List.rev _3, Open, None)) )
-# 10738 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2067 "ml/parser.mly"
-      ( mktyp(Ptyp_variant([], Open, None)) )
-# 10744 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'opt_bar) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'row_field_list) in
-    Obj.repr(
-# 2069 "ml/parser.mly"
-      ( mktyp(Ptyp_variant(List.rev _3, Closed, Some [])) )
-# 10752 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 4 : 'opt_bar) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'row_field_list) in
-    let _5 = (Parsing.peek_val __caml_parser_env 1 : 'name_tag_list) in
-    Obj.repr(
-# 2071 "ml/parser.mly"
-      ( mktyp(Ptyp_variant(List.rev _3, Closed, Some (List.rev _5))) )
-# 10761 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'ext_attributes) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'package_type) in
-    Obj.repr(
-# 2073 "ml/parser.mly"
-      ( mktyp_attrs (Ptyp_package _4) _3 )
-# 10769 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'extension) in
-    Obj.repr(
-# 2075 "ml/parser.mly"
-      ( mktyp (Ptyp_extension _1) )
-# 10776 "ml/parser.ml"
-               : 'simple_core_type2))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'module_type) in
-    Obj.repr(
-# 2078 "ml/parser.mly"
-                ( package_type_of_module_type _1 )
-# 10783 "ml/parser.ml"
-               : 'package_type))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'row_field) in
-    Obj.repr(
-# 2081 "ml/parser.mly"
-                                                ( [_1] )
-# 10790 "ml/parser.ml"
-               : 'row_field_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'row_field_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'row_field) in
-    Obj.repr(
-# 2082 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 10798 "ml/parser.ml"
-               : 'row_field_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'tag_field) in
-    Obj.repr(
-# 2085 "ml/parser.mly"
-                                                ( _1 )
-# 10805 "ml/parser.ml"
-               : 'row_field))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_core_type) in
-    Obj.repr(
-# 2086 "ml/parser.mly"
-                                                ( Rinherit _1 )
-# 10812 "ml/parser.ml"
-               : 'row_field))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'name_tag) in
-    let _3 = (Parsing.peek_val __caml_parser_env 2 : 'opt_ampersand) in
-    let _4 = (Parsing.peek_val __caml_parser_env 1 : 'amper_type_list) in
-    let _5 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 2090 "ml/parser.mly"
-      ( Rtag (mkrhs _1 1, add_info_attrs (symbol_info ()) _5,
-               _3, List.rev _4) )
-# 10823 "ml/parser.ml"
-               : 'tag_field))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'name_tag) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 2093 "ml/parser.mly"
-      ( Rtag (mkrhs _1 1, add_info_attrs (symbol_info ()) _2, true, []) )
-# 10831 "ml/parser.ml"
-               : 'tag_field))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2096 "ml/parser.mly"
-                                                ( true )
-# 10837 "ml/parser.ml"
-               : 'opt_ampersand))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2097 "ml/parser.mly"
-                                                ( false )
-# 10843 "ml/parser.ml"
-               : 'opt_ampersand))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'core_type_no_attr) in
-    Obj.repr(
-# 2100 "ml/parser.mly"
-                                                ( [_1] )
-# 10850 "ml/parser.ml"
-               : 'amper_type_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'amper_type_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type_no_attr) in
-    Obj.repr(
-# 2101 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 10858 "ml/parser.ml"
-               : 'amper_type_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'name_tag) in
-    Obj.repr(
-# 2104 "ml/parser.mly"
-                                                ( [_1] )
-# 10865 "ml/parser.ml"
-               : 'name_tag_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'name_tag_list) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'name_tag) in
-    Obj.repr(
-# 2105 "ml/parser.mly"
-                                                ( _2 :: _1 )
-# 10873 "ml/parser.ml"
-               : 'name_tag_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_core_type) in
-    Obj.repr(
-# 2108 "ml/parser.mly"
-                     ( _1 )
-# 10880 "ml/parser.ml"
-               : 'simple_core_type_or_tuple))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'simple_core_type) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type_list) in
-    Obj.repr(
-# 2110 "ml/parser.mly"
-      ( mktyp(Ptyp_tuple(_1 :: List.rev _3)) )
-# 10888 "ml/parser.ml"
-               : 'simple_core_type_or_tuple))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 2113 "ml/parser.mly"
-                                                ( [_1] )
-# 10895 "ml/parser.ml"
-               : 'core_type_comma_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'core_type_comma_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 2114 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 10903 "ml/parser.ml"
-               : 'core_type_comma_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_core_type) in
-    Obj.repr(
-# 2117 "ml/parser.mly"
-                                                ( [_1] )
-# 10910 "ml/parser.ml"
-               : 'core_type_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'core_type_list) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'simple_core_type) in
-    Obj.repr(
-# 2118 "ml/parser.mly"
-                                                ( _3 :: _1 )
-# 10918 "ml/parser.ml"
-               : 'core_type_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'field_semi) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'meth_list) in
-    Obj.repr(
-# 2121 "ml/parser.mly"
-                                                ( let (f, c) = _2 in (_1 :: f, c) )
-# 10926 "ml/parser.ml"
-               : 'meth_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'inherit_field_semi) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'meth_list) in
-    Obj.repr(
-# 2122 "ml/parser.mly"
-                                                ( let (f, c) = _2 in (_1 :: f, c) )
-# 10934 "ml/parser.ml"
-               : 'meth_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'field_semi) in
-    Obj.repr(
-# 2123 "ml/parser.mly"
-                                                ( [_1], Closed )
-# 10941 "ml/parser.ml"
-               : 'meth_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'field) in
-    Obj.repr(
-# 2124 "ml/parser.mly"
-                                                ( [_1], Closed )
-# 10948 "ml/parser.ml"
-               : 'meth_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'inherit_field_semi) in
-    Obj.repr(
-# 2125 "ml/parser.mly"
-                                                ( [_1], Closed )
-# 10955 "ml/parser.ml"
-               : 'meth_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'simple_core_type) in
-    Obj.repr(
-# 2126 "ml/parser.mly"
-                                                ( [Oinherit _1], Closed )
-# 10962 "ml/parser.ml"
-               : 'meth_list))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2127 "ml/parser.mly"
-                                                ( [], Open )
-# 10968 "ml/parser.ml"
-               : 'meth_list))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'label) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'poly_type_no_attr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 2131 "ml/parser.mly"
-    ( Otag (mkrhs _1 1, add_info_attrs (symbol_info ()) _4, _3) )
-# 10977 "ml/parser.ml"
-               : 'field))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 5 : 'label) in
-    let _3 = (Parsing.peek_val __caml_parser_env 3 : 'poly_type_no_attr) in
-    let _4 = (Parsing.peek_val __caml_parser_env 2 : 'attributes) in
-    let _6 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 2136 "ml/parser.mly"
-    ( let info =
-        match rhs_info 4 with
-        | Some _ as info_before_semi -> info_before_semi
-        | None -> symbol_info ()
-      in
-      ( Otag (mkrhs _1 1, add_info_attrs info (_4 @ _6), _3)) )
-# 10992 "ml/parser.ml"
-               : 'field_semi))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'simple_core_type) in
-    Obj.repr(
-# 2145 "ml/parser.mly"
-                        ( Oinherit _1 )
-# 10999 "ml/parser.ml"
-               : 'inherit_field_semi))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2148 "ml/parser.mly"
-                                                ( _1 )
-# 11006 "ml/parser.ml"
-               : 'label))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string * char option) in
-    Obj.repr(
-# 2154 "ml/parser.mly"
-                 ( let (n, m) = _1 in Pconst_integer (n, m) )
-# 11013 "ml/parser.ml"
-               : 'constant))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : char) in
-    Obj.repr(
-# 2155 "ml/parser.mly"
-                 ( Pconst_char (Char.code _1) )
-# 11020 "ml/parser.ml"
-               : 'constant))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string * string option) in
-    Obj.repr(
-# 2156 "ml/parser.mly"
-                 ( let (s, d) = _1 in Pconst_string (s, d) )
-# 11027 "ml/parser.ml"
-               : 'constant))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string * char option) in
-    Obj.repr(
-# 2157 "ml/parser.mly"
-                 ( let (f, m) = _1 in Pconst_float (f, m) )
-# 11034 "ml/parser.ml"
-               : 'constant))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'constant) in
-    Obj.repr(
-# 2160 "ml/parser.mly"
-                 ( _1 )
-# 11041 "ml/parser.ml"
-               : 'signed_constant))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : string * char option) in
-    Obj.repr(
-# 2161 "ml/parser.mly"
-                 ( let (n, m) = _2 in Pconst_integer("-" ^ n, m) )
-# 11048 "ml/parser.ml"
-               : 'signed_constant))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : string * char option) in
-    Obj.repr(
-# 2162 "ml/parser.mly"
-                 ( let (f, m) = _2 in Pconst_float("-" ^ f, m) )
-# 11055 "ml/parser.ml"
-               : 'signed_constant))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : string * char option) in
-    Obj.repr(
-# 2163 "ml/parser.mly"
-                 ( let (n, m) = _2 in Pconst_integer (n, m) )
-# 11062 "ml/parser.ml"
-               : 'signed_constant))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : string * char option) in
-    Obj.repr(
-# 2164 "ml/parser.mly"
-                 ( let (f, m) = _2 in Pconst_float(f, m) )
-# 11069 "ml/parser.ml"
-               : 'signed_constant))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2170 "ml/parser.mly"
-                                                ( _1 )
-# 11076 "ml/parser.ml"
-               : 'ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2171 "ml/parser.mly"
-                                                ( _1 )
-# 11083 "ml/parser.ml"
-               : 'ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2174 "ml/parser.mly"
-                                                ( _1 )
-# 11090 "ml/parser.ml"
-               : 'val_ident))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'operator) in
-    Obj.repr(
-# 2175 "ml/parser.mly"
-                                                ( _2 )
-# 11097 "ml/parser.ml"
-               : 'val_ident))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'operator) in
-    Obj.repr(
-# 2176 "ml/parser.mly"
-                                                ( unclosed "(" 1 ")" 3 )
-# 11104 "ml/parser.ml"
-               : 'val_ident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2177 "ml/parser.mly"
-                                                ( expecting 2 "operator" )
-# 11110 "ml/parser.ml"
-               : 'val_ident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2178 "ml/parser.mly"
-                                                ( expecting 3 "module-expr" )
-# 11116 "ml/parser.ml"
-               : 'val_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2181 "ml/parser.mly"
-                                                ( _1 )
-# 11123 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2182 "ml/parser.mly"
-                                                ( _1 )
-# 11130 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2183 "ml/parser.mly"
-                                                ( _1 )
-# 11137 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2184 "ml/parser.mly"
-                                                ( _1 )
-# 11144 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2185 "ml/parser.mly"
-                                                ( _1 )
-# 11151 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2186 "ml/parser.mly"
-                                                ( _1 )
-# 11158 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : string) in
-    Obj.repr(
-# 2187 "ml/parser.mly"
-                                                ( "."^ _1 ^"()" )
-# 11165 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    Obj.repr(
-# 2188 "ml/parser.mly"
-                                                ( "."^ _1 ^ "()<-" )
-# 11172 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : string) in
-    Obj.repr(
-# 2189 "ml/parser.mly"
-                                                ( "."^ _1 ^"[]" )
-# 11179 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    Obj.repr(
-# 2190 "ml/parser.mly"
-                                                ( "."^ _1 ^ "[]<-" )
-# 11186 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : string) in
-    Obj.repr(
-# 2191 "ml/parser.mly"
-                                                ( "."^ _1 ^"{}" )
-# 11193 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : string) in
-    Obj.repr(
-# 2192 "ml/parser.mly"
-                                                ( "."^ _1 ^ "{}<-" )
-# 11200 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2193 "ml/parser.mly"
-                                                ( _1 )
-# 11207 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2194 "ml/parser.mly"
-                                                ( "!" )
-# 11213 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2195 "ml/parser.mly"
-                                                ( "+" )
-# 11219 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2196 "ml/parser.mly"
-                                                ( "+." )
-# 11225 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2197 "ml/parser.mly"
-                                                ( "-" )
-# 11231 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2198 "ml/parser.mly"
-                                                ( "-." )
-# 11237 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2199 "ml/parser.mly"
-                                                ( "*" )
-# 11243 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2200 "ml/parser.mly"
-                                                ( "=" )
-# 11249 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2201 "ml/parser.mly"
-                                                ( "<" )
-# 11255 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2202 "ml/parser.mly"
-                                                ( ">" )
-# 11261 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2203 "ml/parser.mly"
-                                                ( "or" )
-# 11267 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2204 "ml/parser.mly"
-                                                ( "||" )
-# 11273 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2205 "ml/parser.mly"
-                                                ( "&" )
-# 11279 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2206 "ml/parser.mly"
-                                                ( "&&" )
-# 11285 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2207 "ml/parser.mly"
-                                                ( ":=" )
-# 11291 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2208 "ml/parser.mly"
-                                                ( "+=" )
-# 11297 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2209 "ml/parser.mly"
-                                                ( "%" )
-# 11303 "ml/parser.ml"
-               : 'operator))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2212 "ml/parser.mly"
-                                                ( _1 )
-# 11310 "ml/parser.ml"
-               : 'constr_ident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2213 "ml/parser.mly"
-                                                ( "[]" )
-# 11316 "ml/parser.ml"
-               : 'constr_ident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2214 "ml/parser.mly"
-                                                ( "()" )
-# 11322 "ml/parser.ml"
-               : 'constr_ident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2215 "ml/parser.mly"
-                                                ( "::" )
-# 11328 "ml/parser.ml"
-               : 'constr_ident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2216 "ml/parser.mly"
-                                                ( "false" )
-# 11334 "ml/parser.ml"
-               : 'constr_ident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2217 "ml/parser.mly"
-                                                ( "true" )
-# 11340 "ml/parser.ml"
-               : 'constr_ident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'val_ident) in
-    Obj.repr(
-# 2221 "ml/parser.mly"
-                                                ( Lident _1 )
-# 11347 "ml/parser.ml"
-               : 'val_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'mod_longident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'val_ident) in
-    Obj.repr(
-# 2222 "ml/parser.mly"
-                                                ( Ldot(_1, _3) )
-# 11355 "ml/parser.ml"
-               : 'val_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'mod_longident) in
-    Obj.repr(
-# 2225 "ml/parser.mly"
-                                                ( _1 )
-# 11362 "ml/parser.ml"
-               : 'constr_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 4 : 'mod_longident) in
-    Obj.repr(
-# 2226 "ml/parser.mly"
-                                                ( Ldot(_1,"::") )
-# 11369 "ml/parser.ml"
-               : 'constr_longident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2227 "ml/parser.mly"
-                                                ( Lident "[]" )
-# 11375 "ml/parser.ml"
-               : 'constr_longident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2228 "ml/parser.mly"
-                                                ( Lident "()" )
-# 11381 "ml/parser.ml"
-               : 'constr_longident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2229 "ml/parser.mly"
-                                                ( Lident "::" )
-# 11387 "ml/parser.ml"
-               : 'constr_longident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2230 "ml/parser.mly"
-                                                ( Lident "false" )
-# 11393 "ml/parser.ml"
-               : 'constr_longident))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2231 "ml/parser.mly"
-                                                ( Lident "true" )
-# 11399 "ml/parser.ml"
-               : 'constr_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2234 "ml/parser.mly"
-                                                ( Lident _1 )
-# 11406 "ml/parser.ml"
-               : 'label_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'mod_longident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2235 "ml/parser.mly"
-                                                ( Ldot(_1, _3) )
-# 11414 "ml/parser.ml"
-               : 'label_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2238 "ml/parser.mly"
-                                                ( Lident _1 )
-# 11421 "ml/parser.ml"
-               : 'type_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'mod_ext_longident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2239 "ml/parser.mly"
-                                                ( Ldot(_1, _3) )
-# 11429 "ml/parser.ml"
-               : 'type_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2242 "ml/parser.mly"
-                                                ( Lident _1 )
-# 11436 "ml/parser.ml"
-               : 'mod_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'mod_longident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2243 "ml/parser.mly"
-                                                ( Ldot(_1, _3) )
-# 11444 "ml/parser.ml"
-               : 'mod_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2246 "ml/parser.mly"
-                                                ( Lident _1 )
-# 11451 "ml/parser.ml"
-               : 'mod_ext_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'mod_ext_longident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2247 "ml/parser.mly"
-                                                ( Ldot(_1, _3) )
-# 11459 "ml/parser.ml"
-               : 'mod_ext_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 3 : 'mod_ext_longident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'mod_ext_longident) in
-    Obj.repr(
-# 2248 "ml/parser.mly"
-                                                      ( lapply _1 _3 )
-# 11467 "ml/parser.ml"
-               : 'mod_ext_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'ident) in
-    Obj.repr(
-# 2251 "ml/parser.mly"
-                                                ( Lident _1 )
-# 11474 "ml/parser.ml"
-               : 'mty_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'mod_ext_longident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'ident) in
-    Obj.repr(
-# 2252 "ml/parser.mly"
-                                                ( Ldot(_1, _3) )
-# 11482 "ml/parser.ml"
-               : 'mty_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2255 "ml/parser.mly"
-                                                ( Lident _1 )
-# 11489 "ml/parser.ml"
-               : 'clty_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'mod_ext_longident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2256 "ml/parser.mly"
-                                                ( Ldot(_1, _3) )
-# 11497 "ml/parser.ml"
-               : 'clty_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2259 "ml/parser.mly"
-                                                ( Lident _1 )
-# 11504 "ml/parser.ml"
-               : 'class_longident))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'mod_longident) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2260 "ml/parser.mly"
-                                                ( Ldot(_1, _3) )
-# 11512 "ml/parser.ml"
-               : 'class_longident))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'ident) in
-    Obj.repr(
-# 2269 "ml/parser.mly"
-                                                ( _2 )
-# 11519 "ml/parser.ml"
-               : 'name_tag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2272 "ml/parser.mly"
-                                                ( Nonrecursive )
-# 11525 "ml/parser.ml"
-               : 'rec_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2273 "ml/parser.mly"
-                                                ( Recursive )
-# 11531 "ml/parser.ml"
-               : 'rec_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2276 "ml/parser.mly"
-                                                ( Recursive )
-# 11537 "ml/parser.ml"
-               : 'nonrec_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2277 "ml/parser.mly"
-                                                ( Nonrecursive )
-# 11543 "ml/parser.ml"
-               : 'nonrec_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2280 "ml/parser.mly"
-                                                ( Upto )
-# 11549 "ml/parser.ml"
-               : 'direction_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2281 "ml/parser.mly"
-                                                ( Downto )
-# 11555 "ml/parser.ml"
-               : 'direction_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2284 "ml/parser.mly"
-                                                ( Public )
-# 11561 "ml/parser.ml"
-               : 'private_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2285 "ml/parser.mly"
-                                                ( Private )
-# 11567 "ml/parser.ml"
-               : 'private_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2288 "ml/parser.mly"
-                                                ( Immutable )
-# 11573 "ml/parser.ml"
-               : 'mutable_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2289 "ml/parser.mly"
-                                                ( Mutable )
-# 11579 "ml/parser.ml"
-               : 'mutable_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2292 "ml/parser.mly"
-                                                ( Concrete )
-# 11585 "ml/parser.ml"
-               : 'virtual_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2293 "ml/parser.mly"
-                                                ( Virtual )
-# 11591 "ml/parser.ml"
-               : 'virtual_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2296 "ml/parser.mly"
-                 ( Public, Concrete )
-# 11597 "ml/parser.ml"
-               : 'private_virtual_flags))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2297 "ml/parser.mly"
-            ( Private, Concrete )
-# 11603 "ml/parser.ml"
-               : 'private_virtual_flags))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2298 "ml/parser.mly"
-            ( Public, Virtual )
-# 11609 "ml/parser.ml"
-               : 'private_virtual_flags))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2299 "ml/parser.mly"
-                    ( Private, Virtual )
-# 11615 "ml/parser.ml"
-               : 'private_virtual_flags))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2300 "ml/parser.mly"
-                    ( Private, Virtual )
-# 11621 "ml/parser.ml"
-               : 'private_virtual_flags))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2303 "ml/parser.mly"
-                                                ( Fresh )
-# 11627 "ml/parser.ml"
-               : 'override_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2304 "ml/parser.mly"
-                                                ( Override )
-# 11633 "ml/parser.ml"
-               : 'override_flag))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2307 "ml/parser.mly"
-                                                ( () )
-# 11639 "ml/parser.ml"
-               : 'opt_bar))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2308 "ml/parser.mly"
-                                                ( () )
-# 11645 "ml/parser.ml"
-               : 'opt_bar))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2311 "ml/parser.mly"
-                                                ( () )
-# 11651 "ml/parser.ml"
-               : 'opt_semi))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2312 "ml/parser.mly"
-                                                ( () )
-# 11657 "ml/parser.ml"
-               : 'opt_semi))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2315 "ml/parser.mly"
-                                                ( "-" )
-# 11663 "ml/parser.ml"
-               : 'subtractive))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2316 "ml/parser.mly"
-                                                ( "-." )
-# 11669 "ml/parser.ml"
-               : 'subtractive))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2319 "ml/parser.mly"
-                                                ( "+" )
-# 11675 "ml/parser.ml"
-               : 'additive))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2320 "ml/parser.mly"
-                                                ( "+." )
-# 11681 "ml/parser.ml"
-               : 'additive))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2326 "ml/parser.mly"
-           ( _1 )
-# 11688 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
-    Obj.repr(
-# 2327 "ml/parser.mly"
-           ( _1 )
-# 11695 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2328 "ml/parser.mly"
-        ( "and" )
-# 11701 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2329 "ml/parser.mly"
-       ( "as" )
-# 11707 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2330 "ml/parser.mly"
-           ( "assert" )
-# 11713 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2331 "ml/parser.mly"
-          ( "begin" )
-# 11719 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2332 "ml/parser.mly"
-          ( "class" )
-# 11725 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2333 "ml/parser.mly"
-               ( "constraint" )
-# 11731 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2334 "ml/parser.mly"
-       ( "do" )
-# 11737 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2335 "ml/parser.mly"
-         ( "done" )
-# 11743 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2336 "ml/parser.mly"
-           ( "downto" )
-# 11749 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2337 "ml/parser.mly"
-         ( "else" )
-# 11755 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2338 "ml/parser.mly"
-        ( "end" )
-# 11761 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2339 "ml/parser.mly"
-              ( "exception" )
-# 11767 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2340 "ml/parser.mly"
-             ( "external" )
-# 11773 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2341 "ml/parser.mly"
-          ( "false" )
-# 11779 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2342 "ml/parser.mly"
-        ( "for" )
-# 11785 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2343 "ml/parser.mly"
-        ( "fun" )
-# 11791 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2344 "ml/parser.mly"
-             ( "function" )
-# 11797 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2345 "ml/parser.mly"
-            ( "functor" )
-# 11803 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2346 "ml/parser.mly"
-       ( "if" )
-# 11809 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2347 "ml/parser.mly"
-       ( "in" )
-# 11815 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2348 "ml/parser.mly"
-            ( "include" )
-# 11821 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2349 "ml/parser.mly"
-            ( "inherit" )
-# 11827 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2350 "ml/parser.mly"
-                ( "initializer" )
-# 11833 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2351 "ml/parser.mly"
-         ( "lazy" )
-# 11839 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2352 "ml/parser.mly"
-        ( "let" )
-# 11845 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2353 "ml/parser.mly"
-          ( "match" )
-# 11851 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2354 "ml/parser.mly"
-           ( "method" )
-# 11857 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2355 "ml/parser.mly"
-           ( "module" )
-# 11863 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2356 "ml/parser.mly"
-            ( "mutable" )
-# 11869 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2357 "ml/parser.mly"
-        ( "new" )
-# 11875 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2358 "ml/parser.mly"
-           ( "nonrec" )
-# 11881 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2359 "ml/parser.mly"
-           ( "object" )
-# 11887 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2360 "ml/parser.mly"
-       ( "of" )
-# 11893 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2361 "ml/parser.mly"
-         ( "open" )
-# 11899 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2362 "ml/parser.mly"
-       ( "or" )
-# 11905 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2363 "ml/parser.mly"
-            ( "private" )
-# 11911 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2364 "ml/parser.mly"
-        ( "rec" )
-# 11917 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2365 "ml/parser.mly"
-        ( "sig" )
-# 11923 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2366 "ml/parser.mly"
-           ( "struct" )
-# 11929 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2367 "ml/parser.mly"
-         ( "then" )
-# 11935 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2368 "ml/parser.mly"
-       ( "to" )
-# 11941 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2369 "ml/parser.mly"
-         ( "true" )
-# 11947 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2370 "ml/parser.mly"
-        ( "try" )
-# 11953 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2371 "ml/parser.mly"
-         ( "type" )
-# 11959 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2372 "ml/parser.mly"
-        ( "val" )
-# 11965 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2373 "ml/parser.mly"
-            ( "virtual" )
-# 11971 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2374 "ml/parser.mly"
-         ( "when" )
-# 11977 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2375 "ml/parser.mly"
-          ( "while" )
-# 11983 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2376 "ml/parser.mly"
-         ( "with" )
-# 11989 "ml/parser.ml"
-               : 'single_attr_id))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'single_attr_id) in
-    Obj.repr(
-# 2381 "ml/parser.mly"
-                   ( mkloc _1 (symbol_rloc()) )
-# 11996 "ml/parser.ml"
-               : 'attr_id))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 2 : 'single_attr_id) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'attr_id) in
-    Obj.repr(
-# 2382 "ml/parser.mly"
-                               ( mkloc (_1 ^ "." ^ _3.txt) (symbol_rloc()))
-# 12004 "ml/parser.ml"
-               : 'attr_id))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attr_id) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'payload) in
-    Obj.repr(
-# 2385 "ml/parser.mly"
-                                      ( (_2, _3) )
-# 12012 "ml/parser.ml"
-               : 'attribute))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attr_id) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'payload) in
-    Obj.repr(
-# 2388 "ml/parser.mly"
-                                        ( (_2, _3) )
-# 12020 "ml/parser.ml"
-               : 'post_item_attribute))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attr_id) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'payload) in
-    Obj.repr(
-# 2391 "ml/parser.mly"
-                                          ( (_2, _3) )
-# 12028 "ml/parser.ml"
-               : 'floating_attribute))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2394 "ml/parser.mly"
-                 ( [] )
-# 12034 "ml/parser.ml"
-               : 'post_item_attributes))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'post_item_attribute) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'post_item_attributes) in
-    Obj.repr(
-# 2395 "ml/parser.mly"
-                                             ( _1 :: _2 )
-# 12042 "ml/parser.ml"
-               : 'post_item_attributes))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2398 "ml/parser.mly"
-               ( [] )
-# 12048 "ml/parser.ml"
-               : 'attributes))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'attribute) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 2399 "ml/parser.mly"
-                         ( _1 :: _2 )
-# 12056 "ml/parser.ml"
-               : 'attributes))
-; (fun __caml_parser_env ->
-    Obj.repr(
-# 2402 "ml/parser.mly"
-                 ( None, [] )
-# 12062 "ml/parser.ml"
-               : 'ext_attributes))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 1 : 'attribute) in
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 2403 "ml/parser.mly"
-                         ( None, _1 :: _2 )
-# 12070 "ml/parser.ml"
-               : 'ext_attributes))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 1 : 'attr_id) in
-    let _3 = (Parsing.peek_val __caml_parser_env 0 : 'attributes) in
-    Obj.repr(
-# 2404 "ml/parser.mly"
-                               ( Some _2, _3 )
-# 12078 "ml/parser.ml"
-               : 'ext_attributes))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attr_id) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'payload) in
-    Obj.repr(
-# 2407 "ml/parser.mly"
-                                           ( (_2, _3) )
-# 12086 "ml/parser.ml"
-               : 'extension))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'attr_id) in
-    let _3 = (Parsing.peek_val __caml_parser_env 1 : 'payload) in
-    Obj.repr(
-# 2410 "ml/parser.mly"
-                                                  ( (_2, _3) )
-# 12094 "ml/parser.ml"
-               : 'item_extension))
-; (fun __caml_parser_env ->
-    let _1 = (Parsing.peek_val __caml_parser_env 0 : 'structure) in
-    Obj.repr(
-# 2413 "ml/parser.mly"
-              ( PStr _1 )
-# 12101 "ml/parser.ml"
-               : 'payload))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'signature) in
-    Obj.repr(
-# 2414 "ml/parser.mly"
-                    ( PSig _2 )
-# 12108 "ml/parser.ml"
-               : 'payload))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'core_type) in
-    Obj.repr(
-# 2415 "ml/parser.mly"
-                    ( PTyp _2 )
-# 12115 "ml/parser.ml"
-               : 'payload))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 0 : 'pattern) in
-    Obj.repr(
-# 2416 "ml/parser.mly"
-                     ( PPat (_2, None) )
-# 12122 "ml/parser.ml"
-               : 'payload))
-; (fun __caml_parser_env ->
-    let _2 = (Parsing.peek_val __caml_parser_env 2 : 'pattern) in
-    let _4 = (Parsing.peek_val __caml_parser_env 0 : 'seq_expr) in
-    Obj.repr(
-# 2417 "ml/parser.mly"
-                                   ( PPat (_2, Some _4) )
-# 12130 "ml/parser.ml"
-               : 'payload))
-(* Entry implementation *)
-; (fun __caml_parser_env -> raise (Parsing.YYexit (Parsing.peek_val __caml_parser_env 0)))
-(* Entry interface *)
-; (fun __caml_parser_env -> raise (Parsing.YYexit (Parsing.peek_val __caml_parser_env 0)))
-(* Entry parse_core_type *)
-; (fun __caml_parser_env -> raise (Parsing.YYexit (Parsing.peek_val __caml_parser_env 0)))
-(* Entry parse_expression *)
-; (fun __caml_parser_env -> raise (Parsing.YYexit (Parsing.peek_val __caml_parser_env 0)))
-(* Entry parse_pattern *)
-; (fun __caml_parser_env -> raise (Parsing.YYexit (Parsing.peek_val __caml_parser_env 0)))
-|]
-let yytables =
-  { Parsing.actions=yyact;
-    Parsing.transl_const=yytransl_const;
-    Parsing.transl_block=yytransl_block;
-    Parsing.lhs=yylhs;
-    Parsing.len=yylen;
-    Parsing.defred=yydefred;
-    Parsing.dgoto=yydgoto;
-    Parsing.sindex=yysindex;
-    Parsing.rindex=yyrindex;
-    Parsing.gindex=yygindex;
-    Parsing.tablesize=yytablesize;
-    Parsing.table=yytable;
-    Parsing.check=yycheck;
-    Parsing.error_function=parse_error;
-    Parsing.names_const=yynames_const;
-    Parsing.names_block=yynames_block }
-let implementation (lexfun : Lexing.lexbuf -> token) (lexbuf : Lexing.lexbuf) =
-   (Parsing.yyparse yytables 1 lexfun lexbuf : Parsetree.structure)
-let interface (lexfun : Lexing.lexbuf -> token) (lexbuf : Lexing.lexbuf) =
-   (Parsing.yyparse yytables 2 lexfun lexbuf : Parsetree.signature)
-let parse_core_type (lexfun : Lexing.lexbuf -> token) (lexbuf : Lexing.lexbuf) =
-   (Parsing.yyparse yytables 3 lexfun lexbuf : Parsetree.core_type)
-let parse_expression (lexfun : Lexing.lexbuf -> token) (lexbuf : Lexing.lexbuf) =
-   (Parsing.yyparse yytables 4 lexfun lexbuf : Parsetree.expression)
-let parse_pattern (lexfun : Lexing.lexbuf -> token) (lexbuf : Lexing.lexbuf) =
-   (Parsing.yyparse yytables 5 lexfun lexbuf : Parsetree.pattern)
-;;
diff --git a/jscomp/ml/parser.mli b/jscomp/ml/parser.mli
deleted file mode 100644
index fd7969f..0000000
--- a/jscomp/ml/parser.mli
+++ /dev/null
@@ -1,131 +0,0 @@
-type token =
-  | AMPERAMPER
-  | AMPERSAND
-  | AND
-  | AS
-  | ASSERT
-  | BACKQUOTE
-  | BANG
-  | BAR
-  | BARBAR
-  | BARRBRACKET
-  | BEGIN
-  | CHAR of (char)
-  | CLASS
-  | COLON
-  | COLONCOLON
-  | COLONEQUAL
-  | COLONGREATER
-  | COMMA
-  | CONSTRAINT
-  | DO
-  | DONE
-  | DOT
-  | DOTDOT
-  | DOWNTO
-  | ELSE
-  | END
-  | EOF
-  | EQUAL
-  | EXCEPTION
-  | EXTERNAL
-  | FALSE
-  | FLOAT of (string * char option)
-  | FOR
-  | FUN
-  | FUNCTION
-  | FUNCTOR
-  | GREATER
-  | GREATERRBRACE
-  | GREATERRBRACKET
-  | IF
-  | IN
-  | INCLUDE
-  | INFIXOP0 of (string)
-  | INFIXOP1 of (string)
-  | INFIXOP2 of (string)
-  | INFIXOP3 of (string)
-  | INFIXOP4 of (string)
-  | DOTOP of (string)
-  | INHERIT
-  | INITIALIZER
-  | INT of (string * char option)
-  | LABEL of (string)
-  | LAZY
-  | LBRACE
-  | LBRACELESS
-  | LBRACKET
-  | LBRACKETBAR
-  | LBRACKETLESS
-  | LBRACKETGREATER
-  | LBRACKETPERCENT
-  | LBRACKETPERCENTPERCENT
-  | LESS
-  | LESSMINUS
-  | LET
-  | LIDENT of (string)
-  | LPAREN
-  | LBRACKETAT
-  | LBRACKETATAT
-  | LBRACKETATATAT
-  | MATCH
-  | METHOD
-  | MINUS
-  | MINUSDOT
-  | MINUSGREATER
-  | MODULE
-  | MUTABLE
-  | NEW
-  | NONREC
-  | OBJECT
-  | OF
-  | OPEN
-  | OPTLABEL of (string)
-  | OR
-  | PERCENT
-  | PLUS
-  | PLUSDOT
-  | PLUSEQ
-  | PREFIXOP of (string)
-  | PRIVATE
-  | QUESTION
-  | QUOTE
-  | RBRACE
-  | RBRACKET
-  | REC
-  | RPAREN
-  | SEMI
-  | SEMISEMI
-  | HASH
-  | HASHOP of (string)
-  | SIG
-  | STAR
-  | STRING of (string * string option)
-  | STRUCT
-  | THEN
-  | TILDE
-  | TO
-  | TRUE
-  | TRY
-  | TYPE
-  | UIDENT of (string)
-  | UNDERSCORE
-  | VAL
-  | VIRTUAL
-  | WHEN
-  | WHILE
-  | WITH
-  | COMMENT of (string * Location.t)
-  | DOCSTRING of (Docstrings.docstring)
-  | EOL
-
-val implementation :
-  (Lexing.lexbuf  -> token) -> Lexing.lexbuf -> Parsetree.structure
-val interface :
-  (Lexing.lexbuf  -> token) -> Lexing.lexbuf -> Parsetree.signature
-val parse_core_type :
-  (Lexing.lexbuf  -> token) -> Lexing.lexbuf -> Parsetree.core_type
-val parse_expression :
-  (Lexing.lexbuf  -> token) -> Lexing.lexbuf -> Parsetree.expression
-val parse_pattern :
-  (Lexing.lexbuf  -> token) -> Lexing.lexbuf -> Parsetree.pattern
diff --git a/jscomp/ml/parser.mly b/jscomp/ml/parser.mly
deleted file mode 100644
index fe4ace9..0000000
--- a/jscomp/ml/parser.mly
+++ /dev/null
@@ -1,2419 +0,0 @@
-/**************************************************************************/
-/*                                                                        */
-/*                                 OCaml                                  */
-/*                                                                        */
-/*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           */
-/*                                                                        */
-/*   Copyright 1996 Institut National de Recherche en Informatique et     */
-/*     en Automatique.                                                    */
-/*                                                                        */
-/*   All rights reserved.  This file is distributed under the terms of    */
-/*   the GNU Lesser General Public License version 2.1, with the          */
-/*   special exception on linking described in the file LICENSE.          */
-/*                                                                        */
-/**************************************************************************/
-
-/* The parser definition */
-
-%{
-open Location
-open Asttypes
-open Longident
-open Parsetree
-open Ast_helper
-open Docstrings
-
-let mktyp d = Typ.mk ~loc:(symbol_rloc()) d
-let mkpat d = Pat.mk ~loc:(symbol_rloc()) d
-let mkexp d = Exp.mk ~loc:(symbol_rloc()) d
-let mkmty ?attrs d = Mty.mk ~loc:(symbol_rloc()) ?attrs d
-let mksig d = Sig.mk ~loc:(symbol_rloc()) d
-let mkmod ?attrs d = Mod.mk ~loc:(symbol_rloc()) ?attrs d
-let mkstr d = Str.mk ~loc:(symbol_rloc()) d
-let mkcty ?attrs d = Cty.mk ~loc:(symbol_rloc()) ?attrs d
-let mkctf ?attrs ?docs d =
-  Ctf.mk ~loc:(symbol_rloc()) ?attrs ?docs d
-let mkcf ?attrs ?docs d =
-  Cf.mk ~loc:(symbol_rloc()) ?attrs ?docs d
-
-let mkrhs rhs pos = mkloc rhs (rhs_loc pos)
-
-let reloc_pat x = { x with ppat_loc = symbol_rloc () };;
-let reloc_exp x = { x with pexp_loc = symbol_rloc () };;
-
-let mkoperator name pos =
-  let loc = rhs_loc pos in
-  Exp.mk ~loc (Pexp_ident(mkloc (Lident name) loc))
-
-let mkpatvar name pos =
-  Pat.mk ~loc:(rhs_loc pos) (Ppat_var (mkrhs name pos))
-
-(*
-  Ghost expressions and patterns:
-  expressions and patterns that do not appear explicitly in the
-  source file they have the loc_ghost flag set to true.
-  Then the profiler will not try to instrument them and the
-  -annot option will not try to display their type.
-
-  Every grammar rule that generates an element with a location must
-  make at most one non-ghost element, the topmost one.
-
-  How to tell whether your location must be ghost:
-  A location corresponds to a range of characters in the source file.
-  If the location contains a piece of code that is syntactically
-  valid (according to the documentation), and corresponds to the
-  AST node, then the location must be real; in all other cases,
-  it must be ghost.
-*)
-let ghexp d = Exp.mk ~loc:(symbol_gloc ()) d
-let ghpat d = Pat.mk ~loc:(symbol_gloc ()) d
-let ghtyp d = Typ.mk ~loc:(symbol_gloc ()) d
-let ghloc d = { txt = d; loc = symbol_gloc () }
-let ghstr d = Str.mk ~loc:(symbol_gloc()) d
-let ghsig d = Sig.mk ~loc:(symbol_gloc()) d
-
-let mkinfix arg1 name arg2 =
-  mkexp(Pexp_apply(mkoperator name 2, [Nolabel, arg1; Nolabel, arg2]))
-
-let neg_string f =
-  if String.length f > 0 && f.[0] = '-'
-  then String.sub f 1 (String.length f - 1)
-  else "-" ^ f
-
-let mkuminus name arg =
-  match name, arg.pexp_desc with
-  | "-", Pexp_constant(Pconst_integer (n,m)) ->
-      mkexp(Pexp_constant(Pconst_integer(neg_string n,m)))
-  | ("-" | "-."), Pexp_constant(Pconst_float (f, m)) ->
-      mkexp(Pexp_constant(Pconst_float(neg_string f, m)))
-  | _ ->
-      mkexp(Pexp_apply(mkoperator ("~" ^ name) 1, [Nolabel, arg]))
-
-let mkuplus name arg =
-  let desc = arg.pexp_desc in
-  match name, desc with
-  | "+", Pexp_constant(Pconst_integer _)
-  | ("+" | "+."), Pexp_constant(Pconst_float _) -> mkexp desc
-  | _ ->
-      mkexp(Pexp_apply(mkoperator ("~" ^ name) 1, [Nolabel, arg]))
-
-let mkexp_cons consloc args loc =
-  Exp.mk ~loc (Pexp_construct(mkloc (Lident "::") consloc, Some args))
-
-let mkpat_cons consloc args loc =
-  Pat.mk ~loc (Ppat_construct(mkloc (Lident "::") consloc, Some args))
-
-let rec mktailexp nilloc = function
-    [] ->
-      let loc = { nilloc with loc_ghost = true } in
-      let nil = { txt = Lident "[]"; loc = loc } in
-      Exp.mk ~loc (Pexp_construct (nil, None))
-  | e1 :: el ->
-      let exp_el = mktailexp nilloc el in
-      let loc = {loc_start = e1.pexp_loc.loc_start;
-               loc_end = exp_el.pexp_loc.loc_end;
-               loc_ghost = true}
-      in
-      let arg = Exp.mk ~loc (Pexp_tuple [e1; exp_el]) in
-      mkexp_cons {loc with loc_ghost = true} arg loc
-
-let rec mktailpat nilloc = function
-    [] ->
-      let loc = { nilloc with loc_ghost = true } in
-      let nil = { txt = Lident "[]"; loc = loc } in
-      Pat.mk ~loc (Ppat_construct (nil, None))
-  | p1 :: pl ->
-      let pat_pl = mktailpat nilloc pl in
-      let loc = {loc_start = p1.ppat_loc.loc_start;
-               loc_end = pat_pl.ppat_loc.loc_end;
-               loc_ghost = true}
-      in
-      let arg = Pat.mk ~loc (Ppat_tuple [p1; pat_pl]) in
-      mkpat_cons {loc with loc_ghost = true} arg loc
-
-let mkstrexp e attrs =
-  { pstr_desc = Pstr_eval (e, attrs); pstr_loc = e.pexp_loc }
-
-let mkexp_constraint e (t1, t2) =
-  match t1, t2 with
-  | Some t, None -> ghexp(Pexp_constraint(e, t))
-  | _, Some t -> ghexp(Pexp_coerce(e, t1, t))
-  | None, None -> assert false
-
-let mkexp_opt_constraint e = function
-  | None -> e
-  | Some constraint_ -> mkexp_constraint e constraint_
-
-let mkpat_opt_constraint p = function
-  | None -> p
-  | Some typ -> mkpat (Ppat_constraint(p, typ))
-
-let array_function str name =
-  ghloc (Ldot(Lident str, (if !Clflags.fast then "unsafe_" ^ name else name)))
-
-let syntax_error () =
-  raise Syntaxerr.Escape_error
-
-let unclosed opening_name opening_num closing_name closing_num =
-  raise(Syntaxerr.Error(Syntaxerr.Unclosed(rhs_loc opening_num, opening_name,
-                                           rhs_loc closing_num, closing_name)))
-
-let expecting pos nonterm =
-    raise Syntaxerr.(Error(Expecting(rhs_loc pos, nonterm)))
-
-let not_expecting pos nonterm =
-    raise Syntaxerr.(Error(Not_expecting(rhs_loc pos, nonterm)))
-
-
-let lapply p1 p2 =
-  if !Clflags.applicative_functors
-  then Lapply(p1, p2)
-  else raise (Syntaxerr.Error(Syntaxerr.Applicative_path (symbol_rloc())))
-
-let exp_of_label lbl pos =
-  mkexp (Pexp_ident(mkrhs (Lident(Longident.last lbl)) pos))
-
-let pat_of_label lbl pos =
-  mkpat (Ppat_var (mkrhs (Longident.last lbl) pos))
-
-let mk_newtypes newtypes exp =
-  List.fold_right (fun newtype exp -> mkexp (Pexp_newtype (newtype, exp)))
-    newtypes exp
-
-let wrap_type_annotation newtypes core_type body =
-  let exp = mkexp(Pexp_constraint(body,core_type)) in
-  let exp = mk_newtypes newtypes exp in
-  (exp, ghtyp(Ptyp_poly(newtypes, Typ.varify_constructors newtypes core_type)))
-
-let wrap_exp_attrs body (ext, attrs) =
-  (* todo: keep exact location for the entire attribute *)
-  let body = {body with pexp_attributes = attrs @ body.pexp_attributes} in
-  match ext with
-  | None -> body
-  | Some id -> ghexp(Pexp_extension (id, PStr [mkstrexp body []]))
-
-let mkexp_attrs d attrs =
-  wrap_exp_attrs (mkexp d) attrs
-
-let wrap_typ_attrs typ (ext, attrs) =
-  (* todo: keep exact location for the entire attribute *)
-  let typ = {typ with ptyp_attributes = attrs @ typ.ptyp_attributes} in
-  match ext with
-  | None -> typ
-  | Some id -> ghtyp(Ptyp_extension (id, PTyp typ))
-
-let mktyp_attrs d attrs =
-  wrap_typ_attrs (mktyp d) attrs
-
-let wrap_pat_attrs pat (ext, attrs) =
-  (* todo: keep exact location for the entire attribute *)
-  let pat = {pat with ppat_attributes = attrs @ pat.ppat_attributes} in
-  match ext with
-  | None -> pat
-  | Some id -> ghpat(Ppat_extension (id, PPat (pat, None)))
-
-let mkpat_attrs d attrs =
-  wrap_pat_attrs (mkpat d) attrs
-
-let wrap_class_type_attrs body attrs =
-  {body with pcty_attributes = attrs @ body.pcty_attributes}
-let wrap_mod_attrs body attrs =
-  {body with pmod_attributes = attrs @ body.pmod_attributes}
-let wrap_mty_attrs body attrs =
-  {body with pmty_attributes = attrs @ body.pmty_attributes}
-
-let wrap_str_ext body ext =
-  match ext with
-  | None -> body
-  | Some id -> ghstr(Pstr_extension ((id, PStr [body]), []))
-
-let mkstr_ext d ext =
-  wrap_str_ext (mkstr d) ext
-
-let wrap_sig_ext body ext =
-  match ext with
-  | None -> body
-  | Some id -> ghsig(Psig_extension ((id, PSig [body]), []))
-
-let mksig_ext d ext =
-  wrap_sig_ext (mksig d) ext
-
-let text_str pos = Str.text (rhs_text pos)
-let text_sig pos = Sig.text (rhs_text pos)
-let text_cstr pos = Cf.text (rhs_text pos)
-let text_csig pos = Ctf.text (rhs_text pos)
-
-
-let extra_text text pos items =
-  let pre_extras = rhs_pre_extra_text pos in
-  let post_extras = rhs_post_extra_text pos in
-    text pre_extras @ items @ text post_extras
-
-let extra_str pos items = extra_text Str.text pos items
-let extra_sig pos items = extra_text Sig.text pos items
-let extra_cstr pos items = extra_text Cf.text pos items
-let extra_csig pos items = extra_text Ctf.text pos items
-
-let extra_rhs_core_type ct ~pos =
-  let docs = rhs_info pos in
-  { ct with ptyp_attributes = add_info_attrs docs ct.ptyp_attributes }
-
-type let_binding =
-  { lb_pattern: pattern;
-    lb_expression: expression;
-    lb_attributes: attributes;
-    lb_docs: docs Lazy.t;
-    lb_text: text Lazy.t;
-    lb_loc: Location.t; }
-
-type [@warning "-69"] let_bindings =
-  { lbs_bindings: let_binding list;
-    lbs_rec: rec_flag;
-    lbs_extension: string Asttypes.loc option;
-    lbs_loc: Location.t }
-
-let mklb first (p, e) attrs =
-  { lb_pattern = p;
-    lb_expression = e;
-    lb_attributes = attrs;
-    lb_docs = symbol_docs_lazy ();
-    lb_text = if first then empty_text_lazy
-              else symbol_text_lazy ();
-    lb_loc = symbol_rloc (); }
-
-let mklbs ext rf lb =
-  { lbs_bindings = [lb];
-    lbs_rec = rf;
-    lbs_extension = ext ;
-    lbs_loc = symbol_rloc (); }
-
-let addlb lbs lb =
-  { lbs with lbs_bindings = lb :: lbs.lbs_bindings }
-
-let val_of_let_bindings lbs =
-  let bindings =
-    List.map
-      (fun lb ->
-         Vb.mk ~loc:lb.lb_loc ~attrs:lb.lb_attributes
-           ~docs:(Lazy.force lb.lb_docs)
-           ~text:(Lazy.force lb.lb_text)
-           lb.lb_pattern lb.lb_expression)
-      lbs.lbs_bindings
-  in
-  let str = mkstr(Pstr_value(lbs.lbs_rec, List.rev bindings)) in
-  match lbs.lbs_extension with
-  | None -> str
-  | Some id -> ghstr (Pstr_extension((id, PStr [str]), []))
-
-let expr_of_let_bindings lbs body =
-  let bindings =
-    List.map
-      (fun lb ->
-         Vb.mk ~loc:lb.lb_loc ~attrs:lb.lb_attributes
-           lb.lb_pattern lb.lb_expression)
-      lbs.lbs_bindings
-  in
-    mkexp_attrs (Pexp_let(lbs.lbs_rec, List.rev bindings, body))
-      (lbs.lbs_extension, [])
-
-
-
-(* Alternatively, we could keep the generic module type in the Parsetree
-   and extract the package type during type-checking. In that case,
-   the assertions below should be turned into explicit checks. *)
-let package_type_of_module_type pmty =
-  let err loc s =
-    raise (Syntaxerr.Error (Syntaxerr.Invalid_package_type (loc, s)))
-  in
-  let map_cstr = function
-    | Pwith_type (lid, ptyp) ->
-        let loc = ptyp.ptype_loc in
-        if ptyp.ptype_params <> [] then
-          err loc "parametrized types are not supported";
-        if ptyp.ptype_cstrs <> [] then
-          err loc "constrained types are not supported";
-        if ptyp.ptype_private <> Public then
-          err loc "private types are not supported";
-
-        (* restrictions below are checked by the 'with_constraint' rule *)
-        assert (ptyp.ptype_kind = Ptype_abstract);
-        assert (ptyp.ptype_attributes = []);
-        let ty =
-          match ptyp.ptype_manifest with
-          | Some ty -> ty
-          | None -> assert false
-        in
-        (lid, ty)
-    | _ ->
-        err pmty.pmty_loc "only 'with type t =' constraints are supported"
-  in
-  match pmty with
-  | {pmty_desc = Pmty_ident lid} -> (lid, [])
-  | {pmty_desc = Pmty_with({pmty_desc = Pmty_ident lid}, cstrs)} ->
-      (lid, List.map map_cstr cstrs)
-  | _ ->
-      err pmty.pmty_loc
-        "only module type identifier and 'with type' constraints are supported"
-
-
-%}
-
-/* Tokens */
-
-%token AMPERAMPER
-%token AMPERSAND
-%token AND
-%token AS
-%token ASSERT
-%token BACKQUOTE
-%token BANG
-%token BAR
-%token BARBAR
-%token BARRBRACKET
-%token BEGIN
-%token <char> CHAR
-%token CLASS
-%token COLON
-%token COLONCOLON
-%token COLONEQUAL
-%token COLONGREATER
-%token COMMA
-%token CONSTRAINT
-%token DO
-%token DONE
-%token DOT
-%token DOTDOT
-%token DOWNTO
-%token ELSE
-%token END
-%token EOF
-%token EQUAL
-%token EXCEPTION
-%token EXTERNAL
-%token FALSE
-%token <string * char option> FLOAT
-%token FOR
-%token FUN
-%token FUNCTION
-%token FUNCTOR
-%token GREATER
-%token GREATERRBRACE
-%token GREATERRBRACKET
-%token IF
-%token IN
-%token INCLUDE
-%token <string> INFIXOP0
-%token <string> INFIXOP1
-%token <string> INFIXOP2
-%token <string> INFIXOP3
-%token <string> INFIXOP4
-%token <string> DOTOP
-%token INHERIT
-%token INITIALIZER
-%token <string * char option> INT
-%token <string> LABEL
-%token LAZY
-%token LBRACE
-%token LBRACELESS
-%token LBRACKET
-%token LBRACKETBAR
-%token LBRACKETLESS
-%token LBRACKETGREATER
-%token LBRACKETPERCENT
-%token LBRACKETPERCENTPERCENT
-%token LESS
-%token LESSMINUS
-%token LET
-%token <string> LIDENT
-%token LPAREN
-%token LBRACKETAT
-%token LBRACKETATAT
-%token LBRACKETATATAT
-%token MATCH
-%token METHOD
-%token MINUS
-%token MINUSDOT
-%token MINUSGREATER
-%token MODULE
-%token MUTABLE
-%token NEW
-%token NONREC
-%token OBJECT
-%token OF
-%token OPEN
-%token <string> OPTLABEL
-%token OR
-/* %token PARSER */
-%token PERCENT
-%token PLUS
-%token PLUSDOT
-%token PLUSEQ
-%token <string> PREFIXOP
-%token PRIVATE
-%token QUESTION
-%token QUOTE
-%token RBRACE
-%token RBRACKET
-%token REC
-%token RPAREN
-%token SEMI
-%token SEMISEMI
-%token HASH
-%token <string> HASHOP
-%token SIG
-%token STAR
-%token <string * string option> STRING
-%token STRUCT
-%token THEN
-%token TILDE
-%token TO
-%token TRUE
-%token TRY
-%token TYPE
-%token <string> UIDENT
-%token UNDERSCORE
-%token VAL
-%token VIRTUAL
-%token WHEN
-%token WHILE
-%token WITH
-%token <string * Location.t> COMMENT
-%token <Docstrings.docstring> DOCSTRING
-
-%token EOL
-
-/* Precedences and associativities.
-
-Tokens and rules have precedences.  A reduce/reduce conflict is resolved
-in favor of the first rule (in source file order).  A shift/reduce conflict
-is resolved by comparing the precedence and associativity of the token to
-be shifted with those of the rule to be reduced.
-
-By default, a rule has the precedence of its rightmost terminal (if any).
-
-When there is a shift/reduce conflict between a rule and a token that
-have the same precedence, it is resolved using the associativity:
-if the token is left-associative, the parser will reduce; if
-right-associative, the parser will shift; if non-associative,
-the parser will declare a syntax error.
-
-We will only use associativities with operators of the kind  x * x -> x
-for example, in the rules of the form    expr: expr BINOP expr
-in all other cases, we define two precedences if needed to resolve
-conflicts.
-
-The precedences must be listed from low to high.
-*/
-
-%nonassoc IN
-%nonassoc below_SEMI
-%nonassoc SEMI                          /* below EQUAL ({lbl=...; lbl=...}) */
-%nonassoc LET                           /* above SEMI ( ...; let ... in ...) */
-%nonassoc below_WITH
-%nonassoc FUNCTION WITH                 /* below BAR  (match ... with ...) */
-%nonassoc AND             /* above WITH (module rec A: SIG with ... and ...) */
-%nonassoc THEN                          /* below ELSE (if ... then ...) */
-%nonassoc ELSE                          /* (if ... then ... else ...) */
-%nonassoc LESSMINUS                     /* below COLONEQUAL (lbl <- x := e) */
-%right    COLONEQUAL                    /* expr (e := e := e) */
-%nonassoc AS
-%left     BAR                           /* pattern (p|p|p) */
-%nonassoc below_COMMA
-%left     COMMA                         /* expr/expr_comma_list (e,e,e) */
-%right    MINUSGREATER                  /* core_type2 (t -> t -> t) */
-%right    OR BARBAR                     /* expr (e || e || e) */
-%right    AMPERSAND AMPERAMPER          /* expr (e && e && e) */
-%nonassoc below_EQUAL
-%left     INFIXOP0 EQUAL LESS GREATER   /* expr (e OP e OP e) */
-%right    INFIXOP1                      /* expr (e OP e OP e) */
-%nonassoc below_LBRACKETAT
-%nonassoc LBRACKETAT
-%nonassoc LBRACKETATAT
-%right    COLONCOLON                    /* expr (e :: e :: e) */
-%left     INFIXOP2 PLUS PLUSDOT MINUS MINUSDOT PLUSEQ /* expr (e OP e OP e) */
-%left     PERCENT INFIXOP3 STAR                 /* expr (e OP e OP e) */
-%right    INFIXOP4                      /* expr (e OP e OP e) */
-%nonassoc prec_unary_minus prec_unary_plus /* unary - */
-%nonassoc prec_constant_constructor     /* cf. simple_expr (C versus C x) */
-%nonassoc prec_constr_appl              /* above AS BAR COLONCOLON COMMA */
-%nonassoc below_HASH
-%nonassoc HASH                         /* simple_expr/toplevel_directive */
-%left     HASHOP
-%nonassoc below_DOT
-%nonassoc DOT DOTOP
-/* Finally, the first tokens of simple_expr are above everything else. */
-%nonassoc BACKQUOTE BANG BEGIN CHAR FALSE FLOAT INT
-          LBRACE LBRACELESS LBRACKET LBRACKETBAR LIDENT LPAREN
-          NEW PREFIXOP STRING TRUE UIDENT
-          LBRACKETPERCENT LBRACKETPERCENTPERCENT
-
-
-/* Entry points */
-
-%start implementation                   /* for implementation files */
-%type <Parsetree.structure> implementation
-%start interface                        /* for interface files */
-%type <Parsetree.signature> interface
-%start parse_core_type
-%type <Parsetree.core_type> parse_core_type
-%start parse_expression
-%type <Parsetree.expression> parse_expression
-%start parse_pattern
-%type <Parsetree.pattern> parse_pattern
-%%
-
-/* Entry points */
-
-implementation:
-    structure EOF                        { extra_str 1 $1 }
-;
-interface:
-    signature EOF                        { extra_sig 1 $1 }
-;
-
-
-parse_core_type:
-    core_type EOF { $1 }
-;
-parse_expression:
-    seq_expr EOF { $1 }
-;
-parse_pattern:
-    pattern EOF { $1 }
-;
-
-/* Module expressions */
-
-functor_arg:
-    LPAREN RPAREN
-      { mkrhs "*" 2, None }
-  | LPAREN functor_arg_name COLON module_type RPAREN
-      { mkrhs $2 2, Some $4 }
-;
-
-functor_arg_name:
-    UIDENT     { $1 }
-  | UNDERSCORE { "_" }
-;
-
-functor_args:
-    functor_args functor_arg
-      { $2 :: $1 }
-  | functor_arg
-      { [ $1 ] }
-;
-
-module_expr:
-    mod_longident
-      { mkmod(Pmod_ident (mkrhs $1 1)) }
-  | STRUCT attributes structure END
-      { mkmod ~attrs:$2 (Pmod_structure(extra_str 3 $3)) }
-  | STRUCT attributes structure error
-      { unclosed "struct" 1 "end" 4 }
-  | FUNCTOR attributes functor_args MINUSGREATER module_expr
-      { let modexp =
-          List.fold_left
-            (fun acc (n, t) -> mkmod(Pmod_functor(n, t, acc)))
-            $5 $3
-        in wrap_mod_attrs modexp $2 }
-  | module_expr paren_module_expr
-      { mkmod(Pmod_apply($1, $2)) }
-  | module_expr LPAREN RPAREN
-      { mkmod(Pmod_apply($1, mkmod (Pmod_structure []))) }
-  | paren_module_expr
-      { $1 }
-  | module_expr attribute
-      { Mod.attr $1 $2 }
-  | extension
-      { mkmod(Pmod_extension $1) }
-;
-
-paren_module_expr:
-    LPAREN module_expr COLON module_type RPAREN
-      { mkmod(Pmod_constraint($2, $4)) }
-  | LPAREN module_expr COLON module_type error
-      { unclosed "(" 1 ")" 5 }
-  | LPAREN module_expr RPAREN
-      { $2 }
-  | LPAREN module_expr error
-      { unclosed "(" 1 ")" 3 }
-  | LPAREN VAL attributes expr RPAREN
-      { mkmod ~attrs:$3 (Pmod_unpack $4)}
-  | LPAREN VAL attributes expr COLON package_type RPAREN
-      { mkmod ~attrs:$3
-          (Pmod_unpack(
-               ghexp(Pexp_constraint($4, ghtyp(Ptyp_package $6))))) }
-  | LPAREN VAL attributes expr COLON package_type COLONGREATER package_type
-    RPAREN
-      { mkmod ~attrs:$3
-          (Pmod_unpack(
-               ghexp(Pexp_coerce($4, Some(ghtyp(Ptyp_package $6)),
-                                 ghtyp(Ptyp_package $8))))) }
-  | LPAREN VAL attributes expr COLONGREATER package_type RPAREN
-      { mkmod ~attrs:$3
-          (Pmod_unpack(
-               ghexp(Pexp_coerce($4, None, ghtyp(Ptyp_package $6))))) }
-  | LPAREN VAL attributes expr COLON error
-      { unclosed "(" 1 ")" 6 }
-  | LPAREN VAL attributes expr COLONGREATER error
-      { unclosed "(" 1 ")" 6 }
-  | LPAREN VAL attributes expr error
-      { unclosed "(" 1 ")" 5 }
-;
-
-structure:
-    seq_expr post_item_attributes structure_tail
-      { mark_rhs_docs 1 2;
-        (text_str 1) @ mkstrexp $1 $2 :: $3 }
-  | structure_tail { $1 }
-;
-structure_tail:
-    /* empty */          { [] }
-  | SEMISEMI structure   { (text_str 1) @ $2 }
-  | structure_item structure_tail { (text_str 1) @ $1 :: $2 }
-;
-structure_item:
-    let_bindings
-      { val_of_let_bindings $1 }
-  | primitive_declaration
-      { let (body, ext) = $1 in mkstr_ext (Pstr_primitive body) ext }
-  | value_description
-      { let (body, ext) = $1 in mkstr_ext (Pstr_primitive body) ext }
-  | type_declarations
-      { let (nr, l, ext ) = $1 in mkstr_ext (Pstr_type (nr, List.rev l)) ext }
-  | str_type_extension
-      { let (l, ext) = $1 in mkstr_ext (Pstr_typext l) ext }
-  | str_exception_declaration
-      { let (l, ext) = $1 in mkstr_ext (Pstr_exception l) ext }
-  | module_binding
-      { let (body, ext) = $1 in mkstr_ext (Pstr_module body) ext }
-  | rec_module_bindings
-      { let (l, ext) = $1 in mkstr_ext (Pstr_recmodule(List.rev l)) ext }
-  | module_type_declaration
-      { let (body, ext) = $1 in mkstr_ext (Pstr_modtype body) ext }
-  | open_statement
-      { let (body, ext) = $1 in mkstr_ext (Pstr_open body) ext }
-  | class_type_declarations
-      { let (l, ext) = $1 in mkstr_ext (Pstr_class_type (List.rev l)) ext }
-  | str_include_statement
-      { let (body, ext) = $1 in mkstr_ext (Pstr_include body) ext }
-  | item_extension post_item_attributes
-      { mkstr(Pstr_extension ($1, (add_docs_attrs (symbol_docs ()) $2))) }
-  | floating_attribute
-      { mark_symbol_docs ();
-        mkstr(Pstr_attribute $1) }
-;
-str_include_statement:
-    INCLUDE ext_attributes module_expr post_item_attributes
-      { let (ext, attrs) = $2 in
-        Incl.mk $3 ~attrs:(attrs@$4)
-            ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext }
-;
-module_binding_body:
-    EQUAL module_expr
-      { $2 }
-  | COLON module_type EQUAL module_expr
-      { mkmod(Pmod_constraint($4, $2)) }
-  | functor_arg module_binding_body
-      { mkmod(Pmod_functor(fst $1, snd $1, $2)) }
-;
-module_binding:
-    MODULE ext_attributes UIDENT module_binding_body post_item_attributes
-      { let (ext, attrs) = $2 in
-        Mb.mk (mkrhs $3 3) $4 ~attrs:(attrs@$5)
-            ~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
-      , ext }
-;
-rec_module_bindings:
-    rec_module_binding                     { let (b, ext) = $1 in ([b], ext) }
-  | rec_module_bindings and_module_binding
-      { let (l, ext) = $1 in ($2 :: l, ext) }
-;
-rec_module_binding:
-    MODULE ext_attributes REC UIDENT module_binding_body post_item_attributes
-      { let (ext, attrs) = $2 in
-        Mb.mk (mkrhs $4 4) $5 ~attrs:(attrs@$6)
-            ~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
-      , ext }
-;
-and_module_binding:
-    AND attributes UIDENT module_binding_body post_item_attributes
-      { Mb.mk (mkrhs $3 3) $4 ~attrs:($2@$5) ~loc:(symbol_rloc ())
-               ~text:(symbol_text ()) ~docs:(symbol_docs ()) }
-;
-
-/* Module types */
-
-module_type:
-    mty_longident
-      { mkmty(Pmty_ident (mkrhs $1 1)) }
-  | SIG attributes signature END
-      { mkmty ~attrs:$2 (Pmty_signature (extra_sig 3 $3)) }
-  | SIG attributes signature error
-      { unclosed "sig" 1 "end" 4 }
-  | FUNCTOR attributes functor_args MINUSGREATER module_type
-      %prec below_WITH
-      { let mty =
-          List.fold_left
-            (fun acc (n, t) -> mkmty(Pmty_functor(n, t, acc)))
-            $5 $3
-        in wrap_mty_attrs mty $2 }
-  | module_type MINUSGREATER module_type
-      %prec below_WITH
-      { mkmty(Pmty_functor(mknoloc "_", Some $1, $3)) }
-  | module_type WITH with_constraints
-      { mkmty(Pmty_with($1, List.rev $3)) }
-  | MODULE TYPE OF attributes module_expr %prec below_LBRACKETAT
-      { mkmty ~attrs:$4 (Pmty_typeof $5) }
-/*  | LPAREN MODULE mod_longident RPAREN
-      { mkmty (Pmty_alias (mkrhs $3 3)) } */
-  | LPAREN module_type RPAREN
-      { $2 }
-  | LPAREN module_type error
-      { unclosed "(" 1 ")" 3 }
-  | extension
-      { mkmty(Pmty_extension $1) }
-  | module_type attribute
-      { Mty.attr $1 $2 }
-;
-signature:
-    /* empty */          { [] }
-  | SEMISEMI signature   { (text_sig 1) @ $2 }
-  | signature_item signature { (text_sig 1) @ $1 :: $2 }
-;
-signature_item:
-    value_description
-      { let (body, ext) = $1 in mksig_ext (Psig_value body) ext }
-  | primitive_declaration
-      { let (body, ext) = $1 in mksig_ext (Psig_value body) ext}
-  | type_declarations
-      { let (nr, l, ext) = $1 in mksig_ext (Psig_type (nr, List.rev l)) ext }
-  | sig_type_extension
-      { let (l, ext) = $1 in mksig_ext (Psig_typext l) ext }
-  | sig_exception_declaration
-      { let (l, ext) = $1 in mksig_ext (Psig_exception l) ext }
-  | module_declaration
-      { let (body, ext) = $1 in mksig_ext (Psig_module body) ext }
-  | module_alias
-      { let (body, ext) = $1 in mksig_ext (Psig_module body) ext }
-  | rec_module_declarations
-      { let (l, ext) = $1 in mksig_ext (Psig_recmodule (List.rev l)) ext }
-  | module_type_declaration
-      { let (body, ext) = $1 in mksig_ext (Psig_modtype body) ext }
-  | open_statement
-      { let (body, ext) = $1 in mksig_ext (Psig_open body) ext }
-  | sig_include_statement
-      { let (body, ext) = $1 in mksig_ext (Psig_include body) ext }
-  | class_type_declarations
-      { let (l, ext) = $1 in mksig_ext (Psig_class_type (List.rev l)) ext }
-  | item_extension post_item_attributes
-      { mksig(Psig_extension ($1, (add_docs_attrs (symbol_docs ()) $2))) }
-  | floating_attribute
-      { mark_symbol_docs ();
-        mksig(Psig_attribute $1) }
-;
-open_statement:
-  | OPEN override_flag ext_attributes mod_longident post_item_attributes
-      { let (ext, attrs) = $3 in
-        Opn.mk (mkrhs $4 4) ~override:$2 ~attrs:(attrs@$5)
-          ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext}
-;
-sig_include_statement:
-    INCLUDE ext_attributes module_type post_item_attributes %prec below_WITH
-      { let (ext, attrs) = $2 in
-        Incl.mk $3 ~attrs:(attrs@$4)
-            ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext}
-;
-module_declaration_body:
-    COLON module_type
-      { $2 }
-  | LPAREN UIDENT COLON module_type RPAREN module_declaration_body
-      { mkmty(Pmty_functor(mkrhs $2 2, Some $4, $6)) }
-  | LPAREN RPAREN module_declaration_body
-      { mkmty(Pmty_functor(mkrhs "*" 1, None, $3)) }
-;
-module_declaration:
-    MODULE ext_attributes UIDENT module_declaration_body post_item_attributes
-      { let (ext, attrs) = $2 in
-        Md.mk (mkrhs $3 3) $4 ~attrs:(attrs@$5)
-          ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext }
-;
-module_alias:
-    MODULE ext_attributes UIDENT EQUAL mod_longident post_item_attributes
-      { let (ext, attrs) = $2 in
-        Md.mk (mkrhs $3 3)
-          (Mty.alias ~loc:(rhs_loc 5) (mkrhs $5 5)) ~attrs:(attrs@$6)
-             ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext }
-;
-rec_module_declarations:
-    rec_module_declaration
-      { let (body, ext) = $1 in ([body], ext) }
-  | rec_module_declarations and_module_declaration
-      { let (l, ext) = $1 in ($2 :: l, ext) }
-;
-rec_module_declaration:
-    MODULE ext_attributes REC UIDENT COLON module_type post_item_attributes
-      { let (ext, attrs) = $2 in
-        Md.mk (mkrhs $4 4) $6 ~attrs:(attrs@$7)
-            ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext}
-;
-and_module_declaration:
-    AND attributes UIDENT COLON module_type post_item_attributes
-      { Md.mk (mkrhs $3 3) $5 ~attrs:($2@$6) ~loc:(symbol_rloc())
-              ~text:(symbol_text()) ~docs:(symbol_docs()) }
-;
-module_type_declaration_body:
-    /* empty */               { None }
-  | EQUAL module_type         { Some $2 }
-;
-module_type_declaration:
-    MODULE TYPE ext_attributes ident module_type_declaration_body
-    post_item_attributes
-      { let (ext, attrs) = $3 in
-        Mtd.mk (mkrhs $4 4) ?typ:$5 ~attrs:(attrs@$6)
-          ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext }
-;
-/* Class expressions */
-
-class_type_parameters:
-    /*empty*/                                   { [] }
-  | LBRACKET type_parameter_list RBRACKET       { List.rev $2 }
-;
-class_structure:
-  |  class_self_pattern class_fields
-       { Cstr.mk $1 (extra_cstr 2 (List.rev $2)) }
-;
-class_self_pattern:
-    LPAREN pattern RPAREN
-      { reloc_pat $2 }
-  | LPAREN pattern COLON core_type RPAREN
-      { mkpat(Ppat_constraint($2, $4)) }
-  | /* empty */
-      { ghpat(Ppat_any) }
-;
-class_fields:
-    /* empty */
-      { [] }
-  | class_fields class_field
-      { $2 :: (text_cstr 2) @ $1 }
-;
-class_field:
-  | VAL value post_item_attributes
-      { let v, attrs = $2 in
-        mkcf (Pcf_val v) ~attrs:(attrs@$3) ~docs:(symbol_docs ()) }
-  | METHOD method_ post_item_attributes
-      { let meth, attrs = $2 in
-        mkcf (Pcf_method meth) ~attrs:(attrs@$3) ~docs:(symbol_docs ()) }
-  | CONSTRAINT attributes constrain_field post_item_attributes
-      { mkcf (Pcf_constraint $3) ~attrs:($2@$4) ~docs:(symbol_docs ()) }
-  | INITIALIZER attributes seq_expr post_item_attributes
-      { mkcf (Pcf_initializer $3) ~attrs:($2@$4) ~docs:(symbol_docs ()) }
-  | item_extension post_item_attributes
-      { mkcf (Pcf_extension $1) ~attrs:$2 ~docs:(symbol_docs ()) }
-  | floating_attribute
-      { mark_symbol_docs ();
-        mkcf (Pcf_attribute $1) }
-;
-value:
-/* TODO: factorize these rules (also with method): */
-    override_flag attributes MUTABLE VIRTUAL label COLON core_type
-      { if $1 = Override then syntax_error ();
-        (mkloc $5 (rhs_loc 5), Mutable, Cfk_virtual $7), $2 }
-  | override_flag attributes VIRTUAL mutable_flag label COLON core_type
-      { if $1 = Override then syntax_error ();
-        (mkrhs $5 5, $4, Cfk_virtual $7), $2 }
-  | override_flag attributes mutable_flag label EQUAL seq_expr
-      { (mkrhs $4 4, $3, Cfk_concrete ($1, $6)), $2 }
-  | override_flag attributes mutable_flag label type_constraint EQUAL seq_expr
-      {
-       let e = mkexp_constraint $7 $5 in
-       (mkrhs $4 4, $3, Cfk_concrete ($1, e)), $2
-      }
-;
-method_:
-/* TODO: factorize those rules... */
-    override_flag attributes PRIVATE VIRTUAL label COLON poly_type
-      { if $1 = Override then syntax_error ();
-        (mkloc $5 (rhs_loc 5), Private, Cfk_virtual $7), $2 }
-  | override_flag attributes VIRTUAL private_flag label COLON poly_type
-      { if $1 = Override then syntax_error ();
-        (mkloc $5 (rhs_loc 5), $4, Cfk_virtual $7), $2 }
-  | override_flag attributes private_flag label strict_binding
-      { (mkloc $4 (rhs_loc 4), $3,
-        Cfk_concrete ($1, ghexp(Pexp_poly ($5, None)))), $2 }
-  | override_flag attributes private_flag label COLON poly_type EQUAL seq_expr
-      { (mkloc $4 (rhs_loc 4), $3,
-        Cfk_concrete ($1, ghexp(Pexp_poly($8, Some $6)))), $2 }
-  | override_flag attributes private_flag label COLON TYPE lident_list
-    DOT core_type EQUAL seq_expr
-      { let exp, poly = wrap_type_annotation $7 $9 $11 in
-        (mkloc $4 (rhs_loc 4), $3,
-        Cfk_concrete ($1, ghexp(Pexp_poly(exp, Some poly)))), $2 }
-;
-
-/* Class types */
-
-class_signature:
-    LBRACKET core_type_comma_list RBRACKET clty_longident
-      { mkcty(Pcty_constr (mkloc $4 (rhs_loc 4), List.rev $2)) }
-  | clty_longident
-      { mkcty(Pcty_constr (mkrhs $1 1, [])) }
-  | OBJECT attributes class_sig_body END
-      { mkcty ~attrs:$2 (Pcty_signature $3) }
-  | OBJECT attributes class_sig_body error
-      { unclosed "object" 1 "end" 4 }
-  | class_signature attribute
-      { Cty.attr $1 $2 }
-  | extension
-      { mkcty(Pcty_extension $1) }
-  | LET OPEN override_flag attributes mod_longident IN class_signature
-      { wrap_class_type_attrs (mkcty(Pcty_open($3, mkrhs $5 5, $7))) $4 }
-;
-class_sig_body:
-    class_self_type class_sig_fields
-      { Csig.mk $1 (extra_csig 2 (List.rev $2)) }
-;
-class_self_type:
-    LPAREN core_type RPAREN
-      { $2 }
-  | /* empty */
-      { mktyp(Ptyp_any) }
-;
-class_sig_fields:
-    /* empty */                                 { [] }
-| class_sig_fields class_sig_field     { $2 :: (text_csig 2) @ $1 }
-;
-class_sig_field:
-    INHERIT attributes class_signature post_item_attributes
-      { mkctf (Pctf_inherit $3) ~attrs:($2@$4) ~docs:(symbol_docs ()) }
-  | VAL attributes value_type post_item_attributes
-      { mkctf (Pctf_val $3) ~attrs:($2@$4) ~docs:(symbol_docs ()) }
-  | METHOD attributes private_virtual_flags label COLON poly_type
-    post_item_attributes
-      {
-       let (p, v) = $3 in
-       mkctf (Pctf_method (mkrhs $4 4, p, v, $6)) ~attrs:($2@$7) ~docs:(symbol_docs ())
-      }
-  | CONSTRAINT attributes constrain_field post_item_attributes
-      { mkctf (Pctf_constraint $3) ~attrs:($2@$4) ~docs:(symbol_docs ()) }
-  | item_extension post_item_attributes
-      { mkctf (Pctf_extension $1) ~attrs:$2 ~docs:(symbol_docs ()) }
-  | floating_attribute
-      { mark_symbol_docs ();
-        mkctf(Pctf_attribute $1) }
-;
-value_type:
-    VIRTUAL mutable_flag label COLON core_type
-      { mkrhs $3 3, $2, Virtual, $5 }
-  | MUTABLE virtual_flag label COLON core_type
-      { mkrhs $3 3, Mutable, $2, $5 }
-  | label COLON core_type
-      { mkrhs $1 1, Immutable, Concrete, $3 }
-;
-constrain:
-        core_type EQUAL core_type          { $1, $3, symbol_rloc() }
-;
-constrain_field:
-        core_type EQUAL core_type          { $1, $3 }
-;
-class_type_declarations:
-    class_type_declaration
-      { let (body, ext) = $1 in ([body],ext) }
-  | class_type_declarations and_class_type_declaration
-      { let (l, ext) = $1 in ($2 :: l, ext) }
-;
-class_type_declaration:
-    CLASS TYPE ext_attributes virtual_flag class_type_parameters LIDENT EQUAL
-    class_signature post_item_attributes
-      { let (ext, attrs) = $3 in
-        Ci.mk (mkrhs $6 6) $8 ~virt:$4 ~params:$5 ~attrs:(attrs@$9)
-            ~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
-      , ext}
-;
-and_class_type_declaration:
-    AND attributes virtual_flag class_type_parameters LIDENT EQUAL
-    class_signature post_item_attributes
-      { Ci.mk (mkrhs $5 5) $7 ~virt:$3 ~params:$4
-         ~attrs:($2@$8) ~loc:(symbol_rloc ())
-         ~text:(symbol_text ()) ~docs:(symbol_docs ()) }
-;
-
-/* Core expressions */
-
-seq_expr:
-  | expr        %prec below_SEMI  { $1 }
-  | expr SEMI                     { $1 }
-  | expr SEMI seq_expr            { mkexp(Pexp_sequence($1, $3)) }
-  | expr SEMI PERCENT attr_id seq_expr
-      { let seq = mkexp(Pexp_sequence ($1, $5)) in
-        let payload = PStr [mkstrexp seq []] in
-        mkexp (Pexp_extension ($4, payload)) }
-;
-labeled_simple_pattern:
-    QUESTION LPAREN label_let_pattern opt_default RPAREN
-      { (Optional (fst $3), $4, snd $3) }
-  | QUESTION label_var
-      { (Optional (fst $2), None, snd $2) }
-  | OPTLABEL LPAREN let_pattern opt_default RPAREN
-      { (Optional $1, $4, $3) }
-  | OPTLABEL pattern_var
-      { (Optional $1, None, $2) }
-  | TILDE LPAREN label_let_pattern RPAREN
-      { (Labelled (fst $3), None, snd $3) }
-  | TILDE label_var
-      { (Labelled (fst $2), None, snd $2) }
-  | LABEL simple_pattern
-      { (Labelled $1, None, $2) }
-  | simple_pattern
-      { (Nolabel, None, $1) }
-;
-pattern_var:
-    LIDENT            { mkpat(Ppat_var (mkrhs $1 1)) }
-  | UNDERSCORE        { mkpat Ppat_any }
-;
-opt_default:
-    /* empty */                         { None }
-  | EQUAL seq_expr                      { Some $2 }
-;
-label_let_pattern:
-    label_var
-      { $1 }
-  | label_var COLON core_type
-      { let (lab, pat) = $1 in (lab, mkpat(Ppat_constraint(pat, $3))) }
-;
-label_var:
-    LIDENT    { ($1, mkpat(Ppat_var (mkrhs $1 1))) }
-;
-let_pattern:
-    pattern
-      { $1 }
-  | pattern COLON core_type
-      { mkpat(Ppat_constraint($1, $3)) }
-;
-expr:
-    simple_expr %prec below_HASH
-      { $1 }
-  | simple_expr simple_labeled_expr_list
-      { mkexp(Pexp_apply($1, List.rev $2)) }
-  | let_bindings IN seq_expr
-      { expr_of_let_bindings $1 $3 }
-  | LET MODULE ext_attributes UIDENT module_binding_body IN seq_expr
-      { mkexp_attrs (Pexp_letmodule(mkrhs $4 4, $5, $7)) $3 }
-  | LET EXCEPTION ext_attributes let_exception_declaration IN seq_expr
-      { mkexp_attrs (Pexp_letexception($4, $6)) $3 }
-  | LET OPEN override_flag ext_attributes mod_longident IN seq_expr
-      { mkexp_attrs (Pexp_open($3, mkrhs $5 5, $7)) $4 }
-  | FUNCTION ext_attributes opt_bar match_cases
-      { mkexp_attrs (Pexp_function(List.rev $4)) $2 }
-  | FUN ext_attributes labeled_simple_pattern fun_def
-      { let (l,o,p) = $3 in
-        mkexp_attrs (Pexp_fun(l, o, p, $4)) $2 }
-  | FUN ext_attributes LPAREN TYPE lident_list RPAREN fun_def
-      { mkexp_attrs (mk_newtypes $5 $7).pexp_desc $2 }
-  | MATCH ext_attributes seq_expr WITH opt_bar match_cases
-      { mkexp_attrs (Pexp_match($3, List.rev $6)) $2 }
-  | TRY ext_attributes seq_expr WITH opt_bar match_cases
-      { mkexp_attrs (Pexp_try($3, List.rev $6)) $2 }
-  | TRY ext_attributes seq_expr WITH error
-      { syntax_error() }
-  | expr_comma_list %prec below_COMMA
-      { mkexp(Pexp_tuple(List.rev $1)) }
-  | constr_longident simple_expr %prec below_HASH
-      { mkexp(Pexp_construct(mkrhs $1 1, Some $2)) }
-  | name_tag simple_expr %prec below_HASH
-      { mkexp(Pexp_variant($1, Some $2)) }
-  | IF ext_attributes seq_expr THEN expr ELSE expr
-      { mkexp_attrs(Pexp_ifthenelse($3, $5, Some $7)) $2 }
-  | IF ext_attributes seq_expr THEN expr
-      { mkexp_attrs (Pexp_ifthenelse($3, $5, None)) $2 }
-  | WHILE ext_attributes seq_expr DO seq_expr DONE
-      { mkexp_attrs (Pexp_while($3, $5)) $2 }
-  | FOR ext_attributes pattern EQUAL seq_expr direction_flag seq_expr DO
-    seq_expr DONE
-      { mkexp_attrs(Pexp_for($3, $5, $7, $6, $9)) $2 }
-  | expr COLONCOLON expr
-      { mkexp_cons (rhs_loc 2) (ghexp(Pexp_tuple[$1;$3])) (symbol_rloc()) }
-  | expr INFIXOP0 expr
-      { mkinfix $1 $2 $3 }
-  | expr INFIXOP1 expr
-      { mkinfix $1 $2 $3 }
-  | expr INFIXOP2 expr
-      { mkinfix $1 $2 $3 }
-  | expr INFIXOP3 expr
-      { mkinfix $1 $2 $3 }
-  | expr INFIXOP4 expr
-      { mkinfix $1 $2 $3 }
-  | expr PLUS expr
-      { mkinfix $1 "+" $3 }
-  | expr PLUSDOT expr
-      { mkinfix $1 "+." $3 }
-  | expr PLUSEQ expr
-      { mkinfix $1 "+=" $3 }
-  | expr MINUS expr
-      { mkinfix $1 "-" $3 }
-  | expr MINUSDOT expr
-      { mkinfix $1 "-." $3 }
-  | expr STAR expr
-      { mkinfix $1 "*" $3 }
-  | expr PERCENT expr
-      { mkinfix $1 "%" $3 }
-  | expr EQUAL expr
-      { mkinfix $1 "=" $3 }
-  | expr LESS expr
-    { mkinfix $1 "<" $3 }
-  | expr GREATER expr
-      { mkinfix $1 ">" $3 }
-  | expr OR expr
-      { mkinfix $1 "or" $3 }
-  | expr BARBAR expr
-      { mkinfix $1 "||" $3 }
-  | expr AMPERSAND expr
-      { mkinfix $1 "&" $3 }
-  | expr AMPERAMPER expr
-      { mkinfix $1 "&&" $3 }
-  | expr COLONEQUAL expr
-      { mkinfix $1 ":=" $3 }
-  | subtractive expr %prec prec_unary_minus
-      { mkuminus $1 $2 }
-  | additive expr %prec prec_unary_plus
-      { mkuplus $1 $2 }
-  | simple_expr DOT label_longident LESSMINUS expr
-      { mkexp(Pexp_setfield($1, mkrhs $3 3, $5)) }
-  | simple_expr DOT LPAREN seq_expr RPAREN LESSMINUS expr
-      { mkexp(Pexp_apply(ghexp(Pexp_ident(array_function "Array" "set")),
-                         [Nolabel,$1; Nolabel,$4; Nolabel,$7])) }
-  | simple_expr DOT LBRACKET seq_expr RBRACKET LESSMINUS expr
-      { mkexp(Pexp_apply(ghexp(Pexp_ident(array_function "String" "set")),
-                         [Nolabel,$1; Nolabel,$4; Nolabel,$7])) }
-  | simple_expr DOTOP LBRACKET expr RBRACKET LESSMINUS expr
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ $2 ^ "[]<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, $1; Nolabel, $4; Nolabel, $7]) }
-  | simple_expr DOTOP LPAREN expr RPAREN LESSMINUS expr
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ $2 ^ "()<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, $1; Nolabel, $4; Nolabel, $7]) }
-  | simple_expr DOTOP LBRACE expr RBRACE LESSMINUS expr
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ $2 ^ "{}<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, $1; Nolabel, $4; Nolabel, $7]) }
-  | simple_expr DOT mod_longident DOTOP LBRACKET expr RBRACKET LESSMINUS expr
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Ldot($3,"." ^ $4 ^ "[]<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, $1; Nolabel, $6; Nolabel, $9]) }
-  | simple_expr DOT mod_longident DOTOP LPAREN expr RPAREN LESSMINUS expr
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Ldot($3, "." ^ $4 ^ "()<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, $1; Nolabel, $6; Nolabel, $9]) }
-  | simple_expr DOT mod_longident DOTOP LBRACE expr RBRACE LESSMINUS expr
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Ldot($3, "." ^ $4 ^ "{}<-")) in
-        mkexp @@ Pexp_apply(id , [Nolabel, $1; Nolabel, $6; Nolabel, $9]) }
-  | label LESSMINUS expr
-      { mkexp(Pexp_setinstvar(mkrhs $1 1, $3)) }
-  | ASSERT ext_attributes simple_expr %prec below_HASH
-      { mkexp_attrs (Pexp_assert $3) $2 }
-  | LAZY ext_attributes simple_expr %prec below_HASH
-      { mkexp_attrs (Pexp_lazy $3) $2 }
-  | OBJECT ext_attributes class_structure END
-      { mkexp_attrs (Pexp_object $3) $2 }
-  | OBJECT ext_attributes class_structure error
-      { unclosed "object" 1 "end" 4 }
-  | expr attribute
-      { Exp.attr $1 $2 }
-  | UNDERSCORE
-     { not_expecting 1 "wildcard \"_\"" }
-;
-simple_expr:
-    val_longident
-      { mkexp(Pexp_ident (mkrhs $1 1)) }
-  | constant
-      { mkexp(Pexp_constant $1) }
-  | constr_longident %prec prec_constant_constructor
-      { mkexp(Pexp_construct(mkrhs $1 1, None)) }
-  | name_tag %prec prec_constant_constructor
-      { mkexp(Pexp_variant($1, None)) }
-  | LPAREN seq_expr RPAREN
-      { reloc_exp $2 }
-  | LPAREN seq_expr error
-      { unclosed "(" 1 ")" 3 }
-  | BEGIN ext_attributes seq_expr END
-      { wrap_exp_attrs (reloc_exp $3) $2 (* check location *) }
-  | BEGIN ext_attributes END
-      { mkexp_attrs (Pexp_construct (mkloc (Lident "()") (symbol_rloc ()),
-                               None)) $2 }
-  | BEGIN ext_attributes seq_expr error
-      { unclosed "begin" 1 "end" 4 }
-  | LPAREN seq_expr type_constraint RPAREN
-      { mkexp_constraint $2 $3 }
-  | simple_expr DOT label_longident
-      { mkexp(Pexp_field($1, mkrhs $3 3)) }
-  | mod_longident DOT LPAREN seq_expr RPAREN
-      { mkexp(Pexp_open(Fresh, mkrhs $1 1, $4)) }
-  | mod_longident DOT LPAREN RPAREN
-      { mkexp(Pexp_open(Fresh, mkrhs $1 1,
-                        mkexp(Pexp_construct(mkrhs (Lident "()") 1, None)))) }
-  | mod_longident DOT LPAREN seq_expr error
-      { unclosed "(" 3 ")" 5 }
-  | simple_expr DOT LPAREN seq_expr RPAREN
-      { mkexp(Pexp_apply(ghexp(Pexp_ident(array_function "Array" "get")),
-                         [Nolabel,$1; Nolabel,$4])) }
-  | simple_expr DOT LPAREN seq_expr error
-      { unclosed "(" 3 ")" 5 }
-  | simple_expr DOT LBRACKET seq_expr RBRACKET
-      { mkexp(Pexp_apply(ghexp(Pexp_ident(array_function "String" "get")),
-                         [Nolabel,$1; Nolabel,$4])) }
-  | simple_expr DOT LBRACKET seq_expr error
-      { unclosed "[" 3 "]" 5 }
-  | simple_expr DOTOP LBRACKET expr RBRACKET
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ $2 ^ "[]")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, $1; Nolabel, $4]) }
-  | simple_expr DOTOP LBRACKET expr error
-      { unclosed "[" 3 "]" 5 }
-  | simple_expr DOTOP LPAREN expr RPAREN
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ $2 ^ "()")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, $1; Nolabel, $4]) }
-  | simple_expr DOTOP LPAREN expr error
-      { unclosed "(" 3 ")" 5 }
-  | simple_expr DOTOP LBRACE expr RBRACE
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Lident ("." ^ $2 ^ "{}")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, $1; Nolabel, $4]) }
-  | simple_expr DOTOP LBRACE expr error
-      { unclosed "{" 3 "}" 5 }
-  | simple_expr DOT mod_longident DOTOP LBRACKET expr RBRACKET
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Ldot($3, "." ^ $4 ^ "[]")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, $1; Nolabel, $6]) }
-  | simple_expr DOT mod_longident DOTOP LBRACKET expr error
-      { unclosed "[" 5 "]" 7 }
-  | simple_expr DOT mod_longident DOTOP LPAREN expr RPAREN
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Ldot($3, "." ^ $4 ^ "()")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, $1; Nolabel, $6]) }
-  | simple_expr DOT mod_longident DOTOP LPAREN expr error
-      { unclosed "(" 5 ")" 7 }
-  | simple_expr DOT mod_longident DOTOP LBRACE expr RBRACE
-      { let id = mkexp @@ Pexp_ident( ghloc @@ Ldot($3, "." ^ $4 ^ "{}")) in
-        mkexp @@ Pexp_apply(id, [Nolabel, $1; Nolabel, $6]) }
-  | simple_expr DOT mod_longident DOTOP LBRACE expr error
-      { unclosed "{" 5 "}" 7 }
-  | simple_expr DOT LBRACE expr_comma_list error
-      { unclosed "{" 3 "}" 5 }
-  | LBRACE record_expr RBRACE
-      { let (exten, fields) = $2 in mkexp (Pexp_record(fields, exten)) }
-  | LBRACE record_expr error
-      { unclosed "{" 1 "}" 3 }
-  | mod_longident DOT LBRACE record_expr RBRACE
-      { let (exten, fields) = $4 in
-        let rec_exp = mkexp(Pexp_record(fields, exten)) in
-        mkexp(Pexp_open(Fresh, mkrhs $1 1, rec_exp)) }
-  | mod_longident DOT LBRACE record_expr error
-      { unclosed "{" 3 "}" 5 }
-  | LBRACKETBAR expr_semi_list opt_semi BARRBRACKET
-      { mkexp (Pexp_array(List.rev $2)) }
-  | LBRACKETBAR expr_semi_list opt_semi error
-      { unclosed "[|" 1 "|]" 4 }
-  | LBRACKETBAR BARRBRACKET
-      { mkexp (Pexp_array []) }
-  | mod_longident DOT LBRACKETBAR expr_semi_list opt_semi BARRBRACKET
-      { mkexp(Pexp_open(Fresh, mkrhs $1 1, mkexp(Pexp_array(List.rev $4)))) }
-  | mod_longident DOT LBRACKETBAR BARRBRACKET
-      { mkexp(Pexp_open(Fresh, mkrhs $1 1, mkexp(Pexp_array []))) }
-  | mod_longident DOT LBRACKETBAR expr_semi_list opt_semi error
-      { unclosed "[|" 3 "|]" 6 }
-  | LBRACKET expr_semi_list opt_semi RBRACKET
-      { reloc_exp (mktailexp (rhs_loc 4) (List.rev $2)) }
-  | LBRACKET expr_semi_list opt_semi error
-      { unclosed "[" 1 "]" 4 }
-  | mod_longident DOT LBRACKET expr_semi_list opt_semi RBRACKET
-      { let list_exp = reloc_exp (mktailexp (rhs_loc 6) (List.rev $4)) in
-        mkexp(Pexp_open(Fresh, mkrhs $1 1, list_exp)) }
-  | mod_longident DOT LBRACKET RBRACKET
-      { mkexp(Pexp_open(Fresh, mkrhs $1 1,
-                        mkexp(Pexp_construct(mkrhs (Lident "[]") 1, None)))) }
-  | mod_longident DOT LBRACKET expr_semi_list opt_semi error
-      { unclosed "[" 3 "]" 6 }
-  | PREFIXOP simple_expr
-      { mkexp(Pexp_apply(mkoperator $1 1, [Nolabel,$2])) }
-  | BANG simple_expr
-      { mkexp(Pexp_apply(mkoperator "!" 1, [Nolabel,$2])) }
-  | LBRACELESS field_expr_list GREATERRBRACE
-      { mkexp (Pexp_override $2) }
-  | LBRACELESS field_expr_list error
-      { unclosed "{<" 1 ">}" 3 }
-  | LBRACELESS GREATERRBRACE
-      { mkexp (Pexp_override [])}
-  | mod_longident DOT LBRACELESS field_expr_list GREATERRBRACE
-      { mkexp(Pexp_open(Fresh, mkrhs $1 1, mkexp (Pexp_override $4)))}
-  | mod_longident DOT LBRACELESS GREATERRBRACE
-      { mkexp(Pexp_open(Fresh, mkrhs $1 1, mkexp (Pexp_override [])))}
-  | mod_longident DOT LBRACELESS field_expr_list error
-      { unclosed "{<" 3 ">}" 5 }
-  | simple_expr HASH label
-      { mkexp(Pexp_send($1, mkrhs $3 3)) }
-  | simple_expr HASHOP simple_expr
-      { mkinfix $1 $2 $3 }
-  | LPAREN MODULE ext_attributes module_expr RPAREN
-      { mkexp_attrs (Pexp_pack $4) $3 }
-  | LPAREN MODULE ext_attributes module_expr COLON package_type RPAREN
-      { mkexp_attrs (Pexp_constraint (ghexp (Pexp_pack $4),
-                                      ghtyp (Ptyp_package $6)))
-                    $3 }
-  | LPAREN MODULE ext_attributes module_expr COLON error
-      { unclosed "(" 1 ")" 6 }
-  | mod_longident DOT LPAREN MODULE ext_attributes module_expr COLON
-    package_type RPAREN
-      { mkexp(Pexp_open(Fresh, mkrhs $1 1,
-        mkexp_attrs (Pexp_constraint (ghexp (Pexp_pack $6),
-                                ghtyp (Ptyp_package $8)))
-                    $5 )) }
-  | mod_longident DOT LPAREN MODULE ext_attributes module_expr COLON error
-      { unclosed "(" 3 ")" 8 }
-  | extension
-      { mkexp (Pexp_extension $1) }
-;
-simple_labeled_expr_list:
-    labeled_simple_expr
-      { [$1] }
-  | simple_labeled_expr_list labeled_simple_expr
-      { $2 :: $1 }
-;
-labeled_simple_expr:
-    simple_expr %prec below_HASH
-      { (Nolabel, $1) }
-  | label_expr
-      { $1 }
-;
-label_expr:
-    LABEL simple_expr %prec below_HASH
-      { (Labelled $1, $2) }
-  | TILDE label_ident
-      { (Labelled (fst $2), snd $2) }
-  | QUESTION label_ident
-      { (Optional (fst $2), snd $2) }
-  | OPTLABEL simple_expr %prec below_HASH
-      { (Optional $1, $2) }
-;
-label_ident:
-    LIDENT   { ($1, mkexp(Pexp_ident(mkrhs (Lident $1) 1))) }
-;
-lident_list:
-    LIDENT                            { [mkrhs $1 1] }
-  | LIDENT lident_list                { mkrhs $1 1 :: $2 }
-;
-let_binding_body:
-    val_ident strict_binding
-      { (mkpatvar $1 1, $2) }
-  | val_ident type_constraint EQUAL seq_expr
-      { let v = mkpatvar $1 1 in (* PR#7344 *)
-        let t =
-          match $2 with
-            Some t, None -> t
-          | _, Some t -> t
-          | _ -> assert false
-        in
-        (ghpat(Ppat_constraint(v, ghtyp(Ptyp_poly([],t)))),
-         mkexp_constraint $4 $2) }
-  | val_ident COLON typevar_list DOT core_type EQUAL seq_expr
-      { (ghpat(Ppat_constraint(mkpatvar $1 1,
-                               ghtyp(Ptyp_poly(List.rev $3,$5)))),
-         $7) }
-  | val_ident COLON TYPE lident_list DOT core_type EQUAL seq_expr
-      { let exp, poly = wrap_type_annotation $4 $6 $8 in
-        (ghpat(Ppat_constraint(mkpatvar $1 1, poly)), exp) }
-  | pattern_no_exn EQUAL seq_expr
-      { ($1, $3) }
-  | simple_pattern_not_ident COLON core_type EQUAL seq_expr
-      { (ghpat(Ppat_constraint($1, $3)), $5) }
-;
-let_bindings:
-    let_binding                                 { $1 }
-  | let_bindings and_let_binding                { addlb $1 $2 }
-;
-let_binding:
-    LET ext_attributes rec_flag let_binding_body post_item_attributes
-      { let (ext, attr) = $2 in
-        mklbs ext $3 (mklb true $4 (attr@$5)) }
-;
-and_let_binding:
-    AND attributes let_binding_body post_item_attributes
-      { mklb false $3 ($2@$4) }
-;
-fun_binding:
-    strict_binding
-      { $1 }
-  | type_constraint EQUAL seq_expr
-      { mkexp_constraint $3 $1 }
-;
-strict_binding:
-    EQUAL seq_expr
-      { $2 }
-  | labeled_simple_pattern fun_binding
-      { let (l, o, p) = $1 in ghexp(Pexp_fun(l, o, p, $2)) }
-  | LPAREN TYPE lident_list RPAREN fun_binding
-      { mk_newtypes $3 $5 }
-;
-match_cases:
-    match_case { [$1] }
-  | match_cases BAR match_case { $3 :: $1 }
-;
-match_case:
-    pattern MINUSGREATER seq_expr
-      { Exp.case $1 $3 }
-  | pattern WHEN seq_expr MINUSGREATER seq_expr
-      { Exp.case $1 ~guard:$3 $5 }
-  | pattern MINUSGREATER DOT
-      { Exp.case $1 (Exp.unreachable ~loc:(rhs_loc 3) ())}
-;
-fun_def:
-    MINUSGREATER seq_expr
-      { $2 }
-  | COLON simple_core_type MINUSGREATER seq_expr
-      { mkexp (Pexp_constraint ($4, $2)) }
-/* Cf #5939: we used to accept (fun p when e0 -> e) */
-  | labeled_simple_pattern fun_def
-      {
-       let (l,o,p) = $1 in
-       ghexp(Pexp_fun(l, o, p, $2))
-      }
-  | LPAREN TYPE lident_list RPAREN fun_def
-      { mk_newtypes $3 $5 }
-;
-expr_comma_list:
-    expr_comma_list COMMA expr                  { $3 :: $1 }
-  | expr COMMA expr                             { [$3; $1] }
-;
-record_expr:
-    simple_expr WITH lbl_expr_list              { (Some $1, $3) }
-  | lbl_expr_list                               { (None, $1) }
-;
-lbl_expr_list:
-     lbl_expr { [$1] }
-  |  lbl_expr SEMI lbl_expr_list { $1 :: $3 }
-  |  lbl_expr SEMI { [$1] }
-;
-lbl_expr:
-    label_longident opt_type_constraint EQUAL expr
-      { (mkrhs $1 1, mkexp_opt_constraint $4 $2) }
-  | label_longident opt_type_constraint
-      { (mkrhs $1 1, mkexp_opt_constraint (exp_of_label $1 1) $2) }
-;
-field_expr_list:
-    field_expr opt_semi { [$1] }
-  | field_expr SEMI field_expr_list { $1 :: $3 }
-;
-field_expr:
-    label EQUAL expr
-      { (mkrhs $1 1, $3) }
-  | label
-      { (mkrhs $1 1, exp_of_label (Lident $1) 1) }
-;
-expr_semi_list:
-    expr                                        { [$1] }
-  | expr_semi_list SEMI expr                    { $3 :: $1 }
-;
-type_constraint:
-    COLON core_type                             { (Some $2, None) }
-  | COLON core_type COLONGREATER core_type      { (Some $2, Some $4) }
-  | COLONGREATER core_type                      { (None, Some $2) }
-  | COLON error                                 { syntax_error() }
-  | COLONGREATER error                          { syntax_error() }
-;
-opt_type_constraint:
-    type_constraint { Some $1 }
-  | /* empty */ { None }
-;
-
-/* Patterns */
-
-pattern:
-  | pattern AS val_ident
-      { mkpat(Ppat_alias($1, mkrhs $3 3)) }
-  | pattern AS error
-      { expecting 3 "identifier" }
-  | pattern_comma_list  %prec below_COMMA
-      { mkpat(Ppat_tuple(List.rev $1)) }
-  | pattern COLONCOLON pattern
-      { mkpat_cons (rhs_loc 2) (ghpat(Ppat_tuple[$1;$3])) (symbol_rloc()) }
-  | pattern COLONCOLON error
-      { expecting 3 "pattern" }
-  | pattern BAR pattern
-      { mkpat(Ppat_or($1, $3)) }
-  | pattern BAR error
-      { expecting 3 "pattern" }
-  | EXCEPTION ext_attributes pattern %prec prec_constr_appl
-      { mkpat_attrs (Ppat_exception $3) $2}
-  | pattern attribute
-      { Pat.attr $1 $2 }
-  | pattern_gen { $1 }
-;
-pattern_no_exn:
-  | pattern_no_exn AS val_ident
-      { mkpat(Ppat_alias($1, mkrhs $3 3)) }
-  | pattern_no_exn AS error
-      { expecting 3 "identifier" }
-  | pattern_no_exn_comma_list  %prec below_COMMA
-      { mkpat(Ppat_tuple(List.rev $1)) }
-  | pattern_no_exn COLONCOLON pattern
-      { mkpat_cons (rhs_loc 2) (ghpat(Ppat_tuple[$1;$3])) (symbol_rloc()) }
-  | pattern_no_exn COLONCOLON error
-      { expecting 3 "pattern" }
-  | pattern_no_exn BAR pattern
-      { mkpat(Ppat_or($1, $3)) }
-  | pattern_no_exn BAR error
-      { expecting 3 "pattern" }
-  | pattern_no_exn attribute
-      { Pat.attr $1 $2 }
-  | pattern_gen { $1 }
-;
-pattern_gen:
-    simple_pattern
-      { $1 }
-  | constr_longident pattern %prec prec_constr_appl
-      { mkpat(Ppat_construct(mkrhs $1 1, Some $2)) }
-  | name_tag pattern %prec prec_constr_appl
-      { mkpat(Ppat_variant($1, Some $2)) }
-  | LAZY ext_attributes simple_pattern
-      { mkpat_attrs (Ppat_lazy $3) $2}
-;
-simple_pattern:
-    val_ident %prec below_EQUAL
-      { mkpat(Ppat_var (mkrhs $1 1)) }
-  | simple_pattern_not_ident { $1 }
-;
-simple_pattern_not_ident:
-  | UNDERSCORE
-      { mkpat(Ppat_any) }
-  | signed_constant
-      { mkpat(Ppat_constant $1) }
-  | signed_constant DOTDOT signed_constant
-      { mkpat(Ppat_interval ($1, $3)) }
-  | constr_longident
-      { mkpat(Ppat_construct(mkrhs $1 1, None)) }
-  | name_tag
-      { mkpat(Ppat_variant($1, None)) }
-  | HASH type_longident
-      { mkpat(Ppat_type (mkrhs $2 2)) }
-  | simple_delimited_pattern
-      { $1 }
-  | mod_longident DOT simple_delimited_pattern
-      { mkpat @@ Ppat_open(mkrhs $1 1, $3) }
-  | mod_longident DOT LBRACKET RBRACKET
-    { mkpat @@ Ppat_open(mkrhs $1 1, mkpat @@
-               Ppat_construct ( mkrhs (Lident "[]") 4, None)) }
-  | mod_longident DOT LPAREN RPAREN
-      { mkpat @@ Ppat_open( mkrhs $1 1, mkpat @@
-                 Ppat_construct ( mkrhs (Lident "()") 4, None) ) }
-  | mod_longident DOT LPAREN pattern RPAREN
-      { mkpat @@ Ppat_open (mkrhs $1 1, $4)}
-  | mod_longident DOT LPAREN pattern error
-      {unclosed "(" 3 ")" 5  }
-  | mod_longident DOT LPAREN error
-      { expecting 4 "pattern" }
-  | LPAREN pattern RPAREN
-      { reloc_pat $2 }
-  | LPAREN pattern error
-      { unclosed "(" 1 ")" 3 }
-  | LPAREN pattern COLON core_type RPAREN
-      { mkpat(Ppat_constraint($2, $4)) }
-  | LPAREN pattern COLON core_type error
-      { unclosed "(" 1 ")" 5 }
-  | LPAREN pattern COLON error
-      { expecting 4 "type" }
-  | LPAREN MODULE ext_attributes UIDENT RPAREN
-      { mkpat_attrs (Ppat_unpack (mkrhs $4 4)) $3 }
-  | LPAREN MODULE ext_attributes UIDENT COLON package_type RPAREN
-      { mkpat_attrs
-          (Ppat_constraint(mkpat(Ppat_unpack (mkrhs $4 4)),
-                           ghtyp(Ptyp_package $6)))
-          $3 }
-  | LPAREN MODULE ext_attributes UIDENT COLON package_type error
-      { unclosed "(" 1 ")" 7 }
-  | extension
-      { mkpat(Ppat_extension $1) }
-;
-
-simple_delimited_pattern:
-  | LBRACE lbl_pattern_list RBRACE
-    { let (fields, closed) = $2 in mkpat(Ppat_record(fields, closed)) }
-  | LBRACE lbl_pattern_list error
-    { unclosed "{" 1 "}" 3 }
-  | LBRACKET pattern_semi_list opt_semi RBRACKET
-    { reloc_pat (mktailpat (rhs_loc 4) (List.rev $2)) }
-  | LBRACKET pattern_semi_list opt_semi error
-    { unclosed "[" 1 "]" 4 }
-  | LBRACKETBAR pattern_semi_list opt_semi BARRBRACKET
-    { mkpat(Ppat_array(List.rev $2)) }
-  | LBRACKETBAR BARRBRACKET
-    { mkpat(Ppat_array []) }
-  | LBRACKETBAR pattern_semi_list opt_semi error
-    { unclosed "[|" 1 "|]" 4 }
-
-pattern_comma_list:
-    pattern_comma_list COMMA pattern            { $3 :: $1 }
-  | pattern COMMA pattern                       { [$3; $1] }
-  | pattern COMMA error                         { expecting 3 "pattern" }
-;
-pattern_no_exn_comma_list:
-    pattern_no_exn_comma_list COMMA pattern     { $3 :: $1 }
-  | pattern_no_exn COMMA pattern                { [$3; $1] }
-  | pattern_no_exn COMMA error                  { expecting 3 "pattern" }
-;
-pattern_semi_list:
-    pattern                                     { [$1] }
-  | pattern_semi_list SEMI pattern              { $3 :: $1 }
-;
-lbl_pattern_list:
-    lbl_pattern { [$1], Closed }
-  | lbl_pattern SEMI { [$1], Closed }
-  | lbl_pattern SEMI UNDERSCORE opt_semi { [$1], Open }
-  | lbl_pattern SEMI lbl_pattern_list
-      { let (fields, closed) = $3 in $1 :: fields, closed }
-;
-lbl_pattern:
-    label_longident opt_pattern_type_constraint EQUAL pattern
-     { (mkrhs $1 1, mkpat_opt_constraint $4 $2) }
-  | label_longident opt_pattern_type_constraint
-     { (mkrhs $1 1, mkpat_opt_constraint (pat_of_label $1 1) $2) }
-;
-opt_pattern_type_constraint:
-    COLON core_type { Some $2 }
-  | /* empty */ { None }
-;
-
-/* Value descriptions */
-
-value_description:
-    VAL ext_attributes val_ident COLON core_type post_item_attributes
-      { let (ext, attrs) = $2 in
-        Val.mk (mkrhs $3 3) $5 ~attrs:(attrs@$6)
-              ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-      , ext }
-;
-
-/* Primitive declarations */
-
-primitive_declaration_body:
-    STRING                                      { [fst $1] }
-  | STRING primitive_declaration_body           { fst $1 :: $2 }
-;
-primitive_declaration:
-    EXTERNAL ext_attributes val_ident COLON core_type EQUAL
-    primitive_declaration_body post_item_attributes
-      { let (ext, attrs) = $2 in
-        Val.mk (mkrhs $3 3) $5 ~prim:$7 ~attrs:(attrs@$8)
-              ~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
-      , ext }
-;
-
-/* Type declarations */
-
-type_declarations:
-    type_declaration
-      { let (nonrec_flag, ty, ext) = $1 in (nonrec_flag, [ty], ext) }
-  | type_declarations and_type_declaration
-      { let (nonrec_flag, tys, ext) = $1 in (nonrec_flag, $2 :: tys, ext) }
-;
-
-type_declaration:
-    TYPE ext_attributes nonrec_flag optional_type_parameters LIDENT
-    type_kind constraints post_item_attributes
-      { let (kind, priv, manifest) = $6 in
-        let (ext, attrs) = $2 in
-        let ty =
-          Type.mk (mkrhs $5 5) ~params:$4 ~cstrs:(List.rev $7) ~kind
-            ~priv ?manifest ~attrs:(attrs@$8)
-            ~loc:(symbol_rloc ()) ~docs:(symbol_docs ())
-        in
-          ($3, ty, ext) }
-;
-and_type_declaration:
-    AND attributes optional_type_parameters LIDENT type_kind constraints
-    post_item_attributes
-      { let (kind, priv, manifest) = $5 in
-          Type.mk (mkrhs $4 4) ~params:$3 ~cstrs:(List.rev $6)
-            ~kind ~priv ?manifest ~attrs:($2@$7) ~loc:(symbol_rloc ())
-            ~text:(symbol_text ()) ~docs:(symbol_docs ()) }
-;
-constraints:
-        constraints CONSTRAINT constrain        { $3 :: $1 }
-      | /* empty */                             { [] }
-;
-type_kind:
-    /*empty*/
-      { (Ptype_abstract, Public, None) }
-  | EQUAL core_type
-      { (Ptype_abstract, Public, Some $2) }
-  | EQUAL PRIVATE core_type
-      { (Ptype_abstract, Private, Some $3) }
-  | EQUAL constructor_declarations
-      { (Ptype_variant(List.rev $2), Public, None) }
-  | EQUAL PRIVATE constructor_declarations
-      { (Ptype_variant(List.rev $3), Private, None) }
-  | EQUAL DOTDOT
-      { (Ptype_open, Public, None) }
-  | EQUAL PRIVATE DOTDOT
-      { (Ptype_open, Private, None) }
-  | EQUAL private_flag LBRACE label_declarations RBRACE
-      { (Ptype_record $4, $2, None) }
-  | EQUAL core_type EQUAL private_flag constructor_declarations
-      { (Ptype_variant(List.rev $5), $4, Some $2) }
-  | EQUAL core_type EQUAL private_flag DOTDOT
-      { (Ptype_open, $4, Some $2) }
-  | EQUAL core_type EQUAL private_flag LBRACE label_declarations RBRACE
-      { (Ptype_record $6, $4, Some $2) }
-;
-optional_type_parameters:
-    /*empty*/                                   { [] }
-  | optional_type_parameter                     { [$1] }
-  | LPAREN optional_type_parameter_list RPAREN  { List.rev $2 }
-;
-optional_type_parameter:
-    type_variance optional_type_variable        { $2, $1 }
-;
-optional_type_parameter_list:
-    optional_type_parameter                              { [$1] }
-  | optional_type_parameter_list COMMA optional_type_parameter    { $3 :: $1 }
-;
-optional_type_variable:
-    QUOTE ident                                 { mktyp(Ptyp_var $2) }
-  | UNDERSCORE                                  { mktyp(Ptyp_any) }
-;
-
-
-type_parameter:
-    type_variance type_variable                   { $2, $1 }
-;
-type_variance:
-    /* empty */                                 { Invariant }
-  | PLUS                                        { Covariant }
-  | MINUS                                       { Contravariant }
-;
-type_variable:
-    QUOTE ident                                 { mktyp(Ptyp_var $2) }
-;
-type_parameter_list:
-    type_parameter                              { [$1] }
-  | type_parameter_list COMMA type_parameter    { $3 :: $1 }
-;
-constructor_declarations:
-    constructor_declaration                              { [$1] }
-  | bar_constructor_declaration                          { [$1] }
-  | constructor_declarations bar_constructor_declaration { $2 :: $1 }
-;
-constructor_declaration:
-  | constr_ident generalized_constructor_arguments attributes
-      {
-       let args,res = $2 in
-       Type.constructor (mkrhs $1 1) ~args ?res ~attrs:$3
-         ~loc:(symbol_rloc()) ~info:(symbol_info ())
-      }
-;
-bar_constructor_declaration:
-  | BAR constr_ident generalized_constructor_arguments attributes
-      {
-       let args,res = $3 in
-       Type.constructor (mkrhs $2 2) ~args ?res ~attrs:$4
-         ~loc:(symbol_rloc()) ~info:(symbol_info ())
-      }
-;
-str_exception_declaration:
-  | sig_exception_declaration                    { $1 }
-  | EXCEPTION ext_attributes constr_ident EQUAL constr_longident attributes
-    post_item_attributes
-      { let (ext,attrs) = $2 in
-        Te.rebind (mkrhs $3 3) (mkrhs $5 5) ~attrs:(attrs @ $6 @ $7)
-          ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-        , ext }
-;
-sig_exception_declaration:
-  | EXCEPTION ext_attributes constr_ident generalized_constructor_arguments
-    attributes post_item_attributes
-      { let args, res = $4 in
-        let (ext,attrs) = $2 in
-          Te.decl (mkrhs $3 3) ~args ?res ~attrs:(attrs @ $5 @ $6)
-            ~loc:(symbol_rloc()) ~docs:(symbol_docs ())
-        , ext }
-;
-let_exception_declaration:
-    constr_ident generalized_constructor_arguments attributes
-      { let args, res = $2 in
-        Te.decl (mkrhs $1 1) ~args ?res ~attrs:$3 ~loc:(symbol_rloc()) }
-;
-generalized_constructor_arguments:
-    /*empty*/                     { (Pcstr_tuple [],None) }
-  | OF constructor_arguments      { ($2,None) }
-  | COLON constructor_arguments MINUSGREATER simple_core_type
-                                  { ($2,Some $4) }
-  | COLON simple_core_type
-                                  { (Pcstr_tuple [],Some $2) }
-;
-
-constructor_arguments:
-  | core_type_list                   { Pcstr_tuple (List.rev $1) }
-  | LBRACE label_declarations RBRACE { Pcstr_record $2 }
-;
-label_declarations:
-    label_declaration                           { [$1] }
-  | label_declaration_semi                      { [$1] }
-  | label_declaration_semi label_declarations   { $1 :: $2 }
-;
-label_declaration:
-    mutable_flag label COLON poly_type_no_attr attributes
-      {
-       Type.field (mkrhs $2 2) $4 ~mut:$1 ~attrs:$5
-         ~loc:(symbol_rloc()) ~info:(symbol_info ())
-      }
-;
-label_declaration_semi:
-    mutable_flag label COLON poly_type_no_attr attributes SEMI attributes
-      {
-       let info =
-         match rhs_info 5 with
-         | Some _ as info_before_semi -> info_before_semi
-         | None -> symbol_info ()
-       in
-       Type.field (mkrhs $2 2) $4 ~mut:$1 ~attrs:($5 @ $7)
-         ~loc:(symbol_rloc()) ~info
-      }
-;
-
-/* Type Extensions */
-
-str_type_extension:
-  TYPE ext_attributes nonrec_flag optional_type_parameters type_longident
-  PLUSEQ private_flag str_extension_constructors post_item_attributes
-      { let (ext, attrs) = $2 in
-        if $3 <> Recursive then not_expecting 3 "nonrec flag";
-        Te.mk (mkrhs $5 5) (List.rev $8) ~params:$4 ~priv:$7
-          ~attrs:(attrs@$9) ~docs:(symbol_docs ())
-        , ext }
-;
-sig_type_extension:
-  TYPE ext_attributes nonrec_flag optional_type_parameters type_longident
-  PLUSEQ private_flag sig_extension_constructors post_item_attributes
-      { let (ext, attrs) = $2 in
-        if $3 <> Recursive then not_expecting 3 "nonrec flag";
-        Te.mk (mkrhs $5 5) (List.rev $8) ~params:$4 ~priv:$7
-          ~attrs:(attrs @ $9) ~docs:(symbol_docs ())
-        , ext }
-;
-str_extension_constructors:
-    extension_constructor_declaration                     { [$1] }
-  | bar_extension_constructor_declaration                 { [$1] }
-  | extension_constructor_rebind                          { [$1] }
-  | bar_extension_constructor_rebind                      { [$1] }
-  | str_extension_constructors bar_extension_constructor_declaration
-      { $2 :: $1 }
-  | str_extension_constructors bar_extension_constructor_rebind
-      { $2 :: $1 }
-;
-sig_extension_constructors:
-    extension_constructor_declaration                     { [$1] }
-  | bar_extension_constructor_declaration                 { [$1] }
-  | sig_extension_constructors bar_extension_constructor_declaration
-      { $2 :: $1 }
-;
-extension_constructor_declaration:
-  | constr_ident generalized_constructor_arguments attributes
-      { let args, res = $2 in
-        Te.decl (mkrhs $1 1) ~args ?res ~attrs:$3
-          ~loc:(symbol_rloc()) ~info:(symbol_info ()) }
-;
-bar_extension_constructor_declaration:
-  | BAR constr_ident generalized_constructor_arguments attributes
-      { let args, res = $3 in
-        Te.decl (mkrhs $2 2) ~args ?res ~attrs:$4
-           ~loc:(symbol_rloc()) ~info:(symbol_info ()) }
-;
-extension_constructor_rebind:
-  | constr_ident EQUAL constr_longident attributes
-      { Te.rebind (mkrhs $1 1) (mkrhs $3 3) ~attrs:$4
-          ~loc:(symbol_rloc()) ~info:(symbol_info ()) }
-;
-bar_extension_constructor_rebind:
-  | BAR constr_ident EQUAL constr_longident attributes
-      { Te.rebind (mkrhs $2 2) (mkrhs $4 4) ~attrs:$5
-          ~loc:(symbol_rloc()) ~info:(symbol_info ()) }
-;
-
-/* "with" constraints (additional type equations over signature components) */
-
-with_constraints:
-    with_constraint                             { [$1] }
-  | with_constraints AND with_constraint        { $3 :: $1 }
-;
-with_constraint:
-    TYPE optional_type_parameters label_longident with_type_binder
-    core_type_no_attr constraints
-      { Pwith_type
-          (mkrhs $3 3,
-           (Type.mk (mkrhs (Longident.last $3) 3)
-              ~params:$2
-              ~cstrs:(List.rev $6)
-              ~manifest:$5
-              ~priv:$4
-              ~loc:(symbol_rloc()))) }
-    /* used label_longident instead of type_longident to disallow
-       functor applications in type path */
-  | TYPE optional_type_parameters label_longident COLONEQUAL core_type_no_attr
-      { Pwith_typesubst
-         (mkrhs $3 3,
-           (Type.mk (mkrhs (Longident.last $3) 3)
-             ~params:$2
-             ~manifest:$5
-             ~loc:(symbol_rloc()))) }
-  | MODULE mod_longident EQUAL mod_ext_longident
-      { Pwith_module (mkrhs $2 2, mkrhs $4 4) }
-  | MODULE mod_longident COLONEQUAL mod_ext_longident
-      { Pwith_modsubst (mkrhs $2 2, mkrhs $4 4) }
-;
-with_type_binder:
-    EQUAL          { Public }
-  | EQUAL PRIVATE  { Private }
-;
-
-/* Polymorphic types */
-
-typevar_list:
-        QUOTE ident                             { [mkrhs $2 2] }
-      | typevar_list QUOTE ident                { mkrhs $3 3 :: $1 }
-;
-poly_type:
-        core_type
-          { $1 }
-      | typevar_list DOT core_type
-          { mktyp(Ptyp_poly(List.rev $1, $3)) }
-;
-poly_type_no_attr:
-        core_type_no_attr
-          { $1 }
-      | typevar_list DOT core_type_no_attr
-          { mktyp(Ptyp_poly(List.rev $1, $3)) }
-;
-
-/* Core types */
-
-core_type:
-    core_type_no_attr
-      { $1 }
-  | core_type attribute
-      { Typ.attr $1 $2 }
-;
-core_type_no_attr:
-    core_type2 %prec MINUSGREATER
-      { $1 }
-  | core_type2 AS QUOTE ident
-      { mktyp(Ptyp_alias($1, $4)) }
-;
-core_type2:
-    simple_core_type_or_tuple
-      { $1 }
-  | QUESTION LIDENT COLON core_type2 MINUSGREATER core_type2
-      { let param = extra_rhs_core_type $4 ~pos:4 in
-        mktyp (Ptyp_arrow(Optional $2 , param, $6)) }
-  | OPTLABEL core_type2 MINUSGREATER core_type2
-      { let param = extra_rhs_core_type $2 ~pos:2 in
-        mktyp(Ptyp_arrow(Optional $1 , param, $4))
-      }
-  | LIDENT COLON core_type2 MINUSGREATER core_type2
-      { let param = extra_rhs_core_type $3 ~pos:3 in
-        mktyp(Ptyp_arrow(Labelled $1, param, $5)) }
-  | core_type2 MINUSGREATER core_type2
-      { let param = extra_rhs_core_type $1 ~pos:1 in
-        mktyp(Ptyp_arrow(Nolabel, param, $3)) }
-;
-
-simple_core_type:
-    simple_core_type2  %prec below_HASH
-      { $1 }
-  | LPAREN core_type_comma_list RPAREN %prec below_HASH
-      { match $2 with [sty] -> sty | _ -> raise Parse_error }
-;
-
-simple_core_type2:
-    QUOTE ident
-      { mktyp(Ptyp_var $2) }
-  | UNDERSCORE
-      { mktyp(Ptyp_any) }
-  | type_longident
-      { mktyp(Ptyp_constr(mkrhs $1 1, [])) }
-  | simple_core_type2 type_longident
-      { mktyp(Ptyp_constr(mkrhs $2 2, [$1])) }
-  | LPAREN core_type_comma_list RPAREN type_longident
-      { mktyp(Ptyp_constr(mkrhs $4 4, List.rev $2)) }
-  | LESS meth_list GREATER
-      { let (f, c) = $2 in mktyp(Ptyp_object (f, c)) }
-  | LESS GREATER
-      { mktyp(Ptyp_object ([], Closed)) }
-  | HASH class_longident
-      { mktyp(Ptyp_class(mkrhs $2 2, [])) }
-  | simple_core_type2 HASH class_longident
-      { mktyp(Ptyp_class(mkrhs $3 3, [$1])) }
-  | LPAREN core_type_comma_list RPAREN HASH class_longident
-      { mktyp(Ptyp_class(mkrhs $5 5, List.rev $2)) }
-  | LBRACKET tag_field RBRACKET
-      { mktyp(Ptyp_variant([$2], Closed, None)) }
-/* PR#3835: this is not LR(1), would need lookahead=2
-  | LBRACKET simple_core_type RBRACKET
-      { mktyp(Ptyp_variant([$2], Closed, None)) }
-*/
-  | LBRACKET BAR row_field_list RBRACKET
-      { mktyp(Ptyp_variant(List.rev $3, Closed, None)) }
-  | LBRACKET row_field BAR row_field_list RBRACKET
-      { mktyp(Ptyp_variant($2 :: List.rev $4, Closed, None)) }
-  | LBRACKETGREATER opt_bar row_field_list RBRACKET
-      { mktyp(Ptyp_variant(List.rev $3, Open, None)) }
-  | LBRACKETGREATER RBRACKET
-      { mktyp(Ptyp_variant([], Open, None)) }
-  | LBRACKETLESS opt_bar row_field_list RBRACKET
-      { mktyp(Ptyp_variant(List.rev $3, Closed, Some [])) }
-  | LBRACKETLESS opt_bar row_field_list GREATER name_tag_list RBRACKET
-      { mktyp(Ptyp_variant(List.rev $3, Closed, Some (List.rev $5))) }
-  | LPAREN MODULE ext_attributes package_type RPAREN
-      { mktyp_attrs (Ptyp_package $4) $3 }
-  | extension
-      { mktyp (Ptyp_extension $1) }
-;
-package_type:
-    module_type { package_type_of_module_type $1 }
-;
-row_field_list:
-    row_field                                   { [$1] }
-  | row_field_list BAR row_field                { $3 :: $1 }
-;
-row_field:
-    tag_field                                   { $1 }
-  | simple_core_type                            { Rinherit $1 }
-;
-tag_field:
-    name_tag OF opt_ampersand amper_type_list attributes
-      { Rtag (mkrhs $1 1, add_info_attrs (symbol_info ()) $5,
-               $3, List.rev $4) }
-  | name_tag attributes
-      { Rtag (mkrhs $1 1, add_info_attrs (symbol_info ()) $2, true, []) }
-;
-opt_ampersand:
-    AMPERSAND                                   { true }
-  | /* empty */                                 { false }
-;
-amper_type_list:
-    core_type_no_attr                           { [$1] }
-  | amper_type_list AMPERSAND core_type_no_attr { $3 :: $1 }
-;
-name_tag_list:
-    name_tag                                    { [$1] }
-  | name_tag_list name_tag                      { $2 :: $1 }
-;
-simple_core_type_or_tuple:
-    simple_core_type { $1 }
-  | simple_core_type STAR core_type_list
-      { mktyp(Ptyp_tuple($1 :: List.rev $3)) }
-;
-core_type_comma_list:
-    core_type                                   { [$1] }
-  | core_type_comma_list COMMA core_type        { $3 :: $1 }
-;
-core_type_list:
-    simple_core_type                            { [$1] }
-  | core_type_list STAR simple_core_type        { $3 :: $1 }
-;
-meth_list:
-    field_semi meth_list                        { let (f, c) = $2 in ($1 :: f, c) }
-  | inherit_field_semi meth_list                { let (f, c) = $2 in ($1 :: f, c) }
-  | field_semi                                  { [$1], Closed }
-  | field                                       { [$1], Closed }
-  | inherit_field_semi                          { [$1], Closed }
-  | simple_core_type                            { [Oinherit $1], Closed }
-  | DOTDOT                                      { [], Open }
-;
-field:
-  label COLON poly_type_no_attr attributes
-    { Otag (mkrhs $1 1, add_info_attrs (symbol_info ()) $4, $3) }
-;
-
-field_semi:
-  label COLON poly_type_no_attr attributes SEMI attributes
-    { let info =
-        match rhs_info 4 with
-        | Some _ as info_before_semi -> info_before_semi
-        | None -> symbol_info ()
-      in
-      ( Otag (mkrhs $1 1, add_info_attrs info ($4 @ $6), $3)) }
-;
-
-inherit_field_semi:
-  simple_core_type SEMI { Oinherit $1 }
-
-label:
-    LIDENT                                      { $1 }
-;
-
-/* Constants */
-
-constant:
-  | INT          { let (n, m) = $1 in Pconst_integer (n, m) }
-  | CHAR         { Pconst_char (Char.code $1) }
-  | STRING       { let (s, d) = $1 in Pconst_string (s, d) }
-  | FLOAT        { let (f, m) = $1 in Pconst_float (f, m) }
-;
-signed_constant:
-    constant     { $1 }
-  | MINUS INT    { let (n, m) = $2 in Pconst_integer("-" ^ n, m) }
-  | MINUS FLOAT  { let (f, m) = $2 in Pconst_float("-" ^ f, m) }
-  | PLUS INT     { let (n, m) = $2 in Pconst_integer (n, m) }
-  | PLUS FLOAT   { let (f, m) = $2 in Pconst_float(f, m) }
-;
-
-/* Identifiers and long identifiers */
-
-ident:
-    UIDENT                                      { $1 }
-  | LIDENT                                      { $1 }
-;
-val_ident:
-    LIDENT                                      { $1 }
-  | LPAREN operator RPAREN                      { $2 }
-  | LPAREN operator error                       { unclosed "(" 1 ")" 3 }
-  | LPAREN error                                { expecting 2 "operator" }
-  | LPAREN MODULE error                         { expecting 3 "module-expr" }
-;
-operator:
-    PREFIXOP                                    { $1 }
-  | INFIXOP0                                    { $1 }
-  | INFIXOP1                                    { $1 }
-  | INFIXOP2                                    { $1 }
-  | INFIXOP3                                    { $1 }
-  | INFIXOP4                                    { $1 }
-  | DOTOP LPAREN RPAREN                         { "."^ $1 ^"()" }
-  | DOTOP LPAREN RPAREN LESSMINUS               { "."^ $1 ^ "()<-" }
-  | DOTOP LBRACKET RBRACKET                     { "."^ $1 ^"[]" }
-  | DOTOP LBRACKET RBRACKET LESSMINUS           { "."^ $1 ^ "[]<-" }
-  | DOTOP LBRACE RBRACE                         { "."^ $1 ^"{}" }
-  | DOTOP LBRACE RBRACE LESSMINUS               { "."^ $1 ^ "{}<-" }
-  | HASHOP                                      { $1 }
-  | BANG                                        { "!" }
-  | PLUS                                        { "+" }
-  | PLUSDOT                                     { "+." }
-  | MINUS                                       { "-" }
-  | MINUSDOT                                    { "-." }
-  | STAR                                        { "*" }
-  | EQUAL                                       { "=" }
-  | LESS                                        { "<" }
-  | GREATER                                     { ">" }
-  | OR                                          { "or" }
-  | BARBAR                                      { "||" }
-  | AMPERSAND                                   { "&" }
-  | AMPERAMPER                                  { "&&" }
-  | COLONEQUAL                                  { ":=" }
-  | PLUSEQ                                      { "+=" }
-  | PERCENT                                     { "%" }
-;
-constr_ident:
-    UIDENT                                      { $1 }
-  | LBRACKET RBRACKET                           { "[]" }
-  | LPAREN RPAREN                               { "()" }
-  | LPAREN COLONCOLON RPAREN                    { "::" }
-  | FALSE                                       { "false" }
-  | TRUE                                        { "true" }
-;
-
-val_longident:
-    val_ident                                   { Lident $1 }
-  | mod_longident DOT val_ident                 { Ldot($1, $3) }
-;
-constr_longident:
-    mod_longident       %prec below_DOT         { $1 }
-  | mod_longident DOT LPAREN COLONCOLON RPAREN  { Ldot($1,"::") }
-  | LBRACKET RBRACKET                           { Lident "[]" }
-  | LPAREN RPAREN                               { Lident "()" }
-  | LPAREN COLONCOLON RPAREN                    { Lident "::" }
-  | FALSE                                       { Lident "false" }
-  | TRUE                                        { Lident "true" }
-;
-label_longident:
-    LIDENT                                      { Lident $1 }
-  | mod_longident DOT LIDENT                    { Ldot($1, $3) }
-;
-type_longident:
-    LIDENT                                      { Lident $1 }
-  | mod_ext_longident DOT LIDENT                { Ldot($1, $3) }
-;
-mod_longident:
-    UIDENT                                      { Lident $1 }
-  | mod_longident DOT UIDENT                    { Ldot($1, $3) }
-;
-mod_ext_longident:
-    UIDENT                                      { Lident $1 }
-  | mod_ext_longident DOT UIDENT                { Ldot($1, $3) }
-  | mod_ext_longident LPAREN mod_ext_longident RPAREN { lapply $1 $3 }
-;
-mty_longident:
-    ident                                       { Lident $1 }
-  | mod_ext_longident DOT ident                 { Ldot($1, $3) }
-;
-clty_longident:
-    LIDENT                                      { Lident $1 }
-  | mod_ext_longident DOT LIDENT                { Ldot($1, $3) }
-;
-class_longident:
-    LIDENT                                      { Lident $1 }
-  | mod_longident DOT LIDENT                    { Ldot($1, $3) }
-;
-
-/* Toplevel directives */
-
-
-/* Miscellaneous */
-
-name_tag:
-    BACKQUOTE ident                             { $2 }
-;
-rec_flag:
-    /* empty */                                 { Nonrecursive }
-  | REC                                         { Recursive }
-;
-nonrec_flag:
-    /* empty */                                 { Recursive }
-  | NONREC                                      { Nonrecursive }
-;
-direction_flag:
-    TO                                          { Upto }
-  | DOWNTO                                      { Downto }
-;
-private_flag:
-    /* empty */                                 { Public }
-  | PRIVATE                                     { Private }
-;
-mutable_flag:
-    /* empty */                                 { Immutable }
-  | MUTABLE                                     { Mutable }
-;
-virtual_flag:
-    /* empty */                                 { Concrete }
-  | VIRTUAL                                     { Virtual }
-;
-private_virtual_flags:
-    /* empty */  { Public, Concrete }
-  | PRIVATE { Private, Concrete }
-  | VIRTUAL { Public, Virtual }
-  | PRIVATE VIRTUAL { Private, Virtual }
-  | VIRTUAL PRIVATE { Private, Virtual }
-;
-override_flag:
-    /* empty */                                 { Fresh }
-  | BANG                                        { Override }
-;
-opt_bar:
-    /* empty */                                 { () }
-  | BAR                                         { () }
-;
-opt_semi:
-  | /* empty */                                 { () }
-  | SEMI                                        { () }
-;
-subtractive:
-  | MINUS                                       { "-" }
-  | MINUSDOT                                    { "-." }
-;
-additive:
-  | PLUS                                        { "+" }
-  | PLUSDOT                                     { "+." }
-;
-
-/* Attributes and extensions */
-
-single_attr_id:
-    LIDENT { $1 }
-  | UIDENT { $1 }
-  | AND { "and" }
-  | AS { "as" }
-  | ASSERT { "assert" }
-  | BEGIN { "begin" }
-  | CLASS { "class" }
-  | CONSTRAINT { "constraint" }
-  | DO { "do" }
-  | DONE { "done" }
-  | DOWNTO { "downto" }
-  | ELSE { "else" }
-  | END { "end" }
-  | EXCEPTION { "exception" }
-  | EXTERNAL { "external" }
-  | FALSE { "false" }
-  | FOR { "for" }
-  | FUN { "fun" }
-  | FUNCTION { "function" }
-  | FUNCTOR { "functor" }
-  | IF { "if" }
-  | IN { "in" }
-  | INCLUDE { "include" }
-  | INHERIT { "inherit" }
-  | INITIALIZER { "initializer" }
-  | LAZY { "lazy" }
-  | LET { "let" }
-  | MATCH { "match" }
-  | METHOD { "method" }
-  | MODULE { "module" }
-  | MUTABLE { "mutable" }
-  | NEW { "new" }
-  | NONREC { "nonrec" }
-  | OBJECT { "object" }
-  | OF { "of" }
-  | OPEN { "open" }
-  | OR { "or" }
-  | PRIVATE { "private" }
-  | REC { "rec" }
-  | SIG { "sig" }
-  | STRUCT { "struct" }
-  | THEN { "then" }
-  | TO { "to" }
-  | TRUE { "true" }
-  | TRY { "try" }
-  | TYPE { "type" }
-  | VAL { "val" }
-  | VIRTUAL { "virtual" }
-  | WHEN { "when" }
-  | WHILE { "while" }
-  | WITH { "with" }
-/* mod/land/lor/lxor/lsl/lsr/asr are not supported for now */
-;
-
-attr_id:
-    single_attr_id { mkloc $1 (symbol_rloc()) }
-  | single_attr_id DOT attr_id { mkloc ($1 ^ "." ^ $3.txt) (symbol_rloc())}
-;
-attribute:
-  LBRACKETAT attr_id payload RBRACKET { ($2, $3) }
-;
-post_item_attribute:
-  LBRACKETATAT attr_id payload RBRACKET { ($2, $3) }
-;
-floating_attribute:
-  LBRACKETATATAT attr_id payload RBRACKET { ($2, $3) }
-;
-post_item_attributes:
-    /* empty */  { [] }
-  | post_item_attribute post_item_attributes { $1 :: $2 }
-;
-attributes:
-    /* empty */{ [] }
-  | attribute attributes { $1 :: $2 }
-;
-ext_attributes:
-    /* empty */  { None, [] }
-  | attribute attributes { None, $1 :: $2 }
-  | PERCENT attr_id attributes { Some $2, $3 }
-;
-extension:
-  LBRACKETPERCENT attr_id payload RBRACKET { ($2, $3) }
-;
-item_extension:
-  LBRACKETPERCENTPERCENT attr_id payload RBRACKET { ($2, $3) }
-;
-payload:
-    structure { PStr $1 }
-  | COLON signature { PSig $2 }
-  | COLON core_type { PTyp $2 }
-  | QUESTION pattern { PPat ($2, None) }
-  | QUESTION pattern WHEN seq_expr { PPat ($2, Some $4) }
-;
-%%
diff --git a/jscomp/ml/parsetree.ml b/jscomp/ml/parsetree.ml
deleted file mode 100644
index 159a832..0000000
--- a/jscomp/ml/parsetree.ml
+++ /dev/null
@@ -1,860 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Abstract syntax tree produced by parsing *)
-
-open Asttypes
-
-type constant =
-    Pconst_integer of string * char option
-  (* 3 3l 3L 3n
-
-     Suffixes [g-z][G-Z] are accepted by the parser.
-     Suffixes except 'l', 'L' are rejected by the typechecker
-  *)
-  | Pconst_char of int
-  (* 'c' *)
-  | Pconst_string of string * string option
-  (* "constant"
-     {delim|other constant|delim}
-  *)
-  | Pconst_float of string * char option
-  (* 3.4 2e5 1.4e-4
-
-     Suffixes [g-z][G-Z] are accepted by the parser.
-     Suffixes are rejected by the typechecker.
-  *)
-
-(** {1 Extension points} *)
-
-type attribute = string loc * payload
-       (* [@id ARG]
-          [@@id ARG]
-
-          Metadata containers passed around within the AST.
-          The compiler ignores unknown attributes.
-       *)
-
-and extension = string loc * payload
-      (* [%id ARG]
-         [%%id ARG]
-
-         Sub-language placeholder -- rejected by the typechecker.
-      *)
-
-and attributes = attribute list
-
-and payload =
-  | PStr of structure
-  | PSig of signature (* : SIG *)
-  | PTyp of core_type  (* : T *)
-  | PPat of pattern * expression option  (* ? P  or  ? P when E *)
-
-(** {1 Core language} *)
-
-(* Type expressions *)
-
-and core_type =
-    {
-     ptyp_desc: core_type_desc;
-     ptyp_loc: Location.t;
-     ptyp_attributes: attributes; (* ... [@id1] [@id2] *)
-    }
-
-and core_type_desc =
-  | Ptyp_any
-        (*  _ *)
-  | Ptyp_var of string
-        (* 'a *)
-  | Ptyp_arrow of arg_label * core_type * core_type
-        (* T1 -> T2       Simple
-           ~l:T1 -> T2    Labelled
-           ?l:T1 -> T2    Optional
-         *)
-  | Ptyp_tuple of core_type list
-        (* T1 * ... * Tn
-
-           Invariant: n >= 2
-        *)
-  | Ptyp_constr of Longident.t loc * core_type list
-        (* tconstr
-           T tconstr
-           (T1, ..., Tn) tconstr
-         *)
-  | Ptyp_object of object_field list * closed_flag
-        (* < l1:T1; ...; ln:Tn >     (flag = Closed)
-           < l1:T1; ...; ln:Tn; .. > (flag = Open)
-         *)
-  | Ptyp_class of Longident.t loc * core_type list
-        (* #tconstr
-           T #tconstr
-           (T1, ..., Tn) #tconstr
-         *)
-  | Ptyp_alias of core_type * string
-        (* T as 'a *)
-  | Ptyp_variant of row_field list * closed_flag * label list option
-        (* [ `A|`B ]         (flag = Closed; labels = None)
-           [> `A|`B ]        (flag = Open;   labels = None)
-           [< `A|`B ]        (flag = Closed; labels = Some [])
-           [< `A|`B > `X `Y ](flag = Closed; labels = Some ["X";"Y"])
-         *)
-  | Ptyp_poly of string loc list * core_type
-        (* 'a1 ... 'an. T
-
-           Can only appear in the following context:
-
-           - As the core_type of a Ppat_constraint node corresponding
-             to a constraint on a let-binding: let x : 'a1 ... 'an. T
-             = e ...
-
-           - Under Cfk_virtual for methods (not values).
-
-           - As the core_type of a Pctf_method node.
-
-           - As the core_type of a Pexp_poly node.
-
-           - As the pld_type field of a label_declaration.
-
-           - As a core_type of a Ptyp_object node.
-         *)
-
-  | Ptyp_package of package_type
-        (* (module S) *)
-  | Ptyp_extension of extension
-        (* [%id] *)
-
-and package_type = Longident.t loc * (Longident.t loc * core_type) list
-      (*
-        (module S)
-        (module S with type t1 = T1 and ... and tn = Tn)
-       *)
-
-and row_field =
-  | Rtag of label loc * attributes * bool * core_type list
-        (* [`A]                   ( true,  [] )
-           [`A of T]              ( false, [T] )
-           [`A of T1 & .. & Tn]   ( false, [T1;...Tn] )
-           [`A of & T1 & .. & Tn] ( true,  [T1;...Tn] )
-
-          - The 2nd field is true if the tag contains a
-            constant (empty) constructor.
-          - '&' occurs when several types are used for the same constructor
-            (see 4.2 in the manual)
-
-          - TODO: switch to a record representation, and keep location
-        *)
-  | Rinherit of core_type
-        (* [ T ] *)
-
-and object_field =
-  | Otag of label loc * attributes * core_type
-  | Oinherit of core_type
-
-(* Patterns *)
-
-and pattern =
-    {
-     ppat_desc: pattern_desc;
-     ppat_loc: Location.t;
-     ppat_attributes: attributes; (* ... [@id1] [@id2] *)
-    }
-
-and pattern_desc =
-  | Ppat_any
-        (* _ *)
-  | Ppat_var of string loc
-        (* x *)
-  | Ppat_alias of pattern * string loc
-        (* P as 'a *)
-  | Ppat_constant of constant
-        (* 1, 'a', "true", 1.0, 1l, 1L, 1n *)
-  | Ppat_interval of constant * constant
-        (* 'a'..'z'
-
-           Other forms of interval are recognized by the parser
-           but rejected by the type-checker. *)
-  | Ppat_tuple of pattern list
-        (* (P1, ..., Pn)
-
-           Invariant: n >= 2
-        *)
-  | Ppat_construct of Longident.t loc * pattern option
-        (* C                None
-           C P              Some P
-           C (P1, ..., Pn)  Some (Ppat_tuple [P1; ...; Pn])
-         *)
-  | Ppat_variant of label * pattern option
-        (* `A             (None)
-           `A P           (Some P)
-         *)
-  | Ppat_record of (Longident.t loc * pattern) list * closed_flag
-        (* { l1=P1; ...; ln=Pn }     (flag = Closed)
-           { l1=P1; ...; ln=Pn; _}   (flag = Open)
-
-           Invariant: n > 0
-         *)
-  | Ppat_array of pattern list
-        (* [| P1; ...; Pn |] *)
-  | Ppat_or of pattern * pattern
-        (* P1 | P2 *)
-  | Ppat_constraint of pattern * core_type
-        (* (P : T) *)
-  | Ppat_type of Longident.t loc
-        (* #tconst *)
-  | Ppat_lazy of pattern
-        (* lazy P *)
-  | Ppat_unpack of string loc
-        (* (module P)
-           Note: (module P : S) is represented as
-           Ppat_constraint(Ppat_unpack, Ptyp_package)
-         *)
-  | Ppat_exception of pattern
-        (* exception P *)
-  | Ppat_extension of extension
-        (* [%id] *)
-  | Ppat_open of Longident.t loc * pattern
-        (* M.(P) *)
-
-(* Value expressions *)
-
-and expression =
-    {
-     pexp_desc: expression_desc;
-     pexp_loc: Location.t;
-     pexp_attributes: attributes; (* ... [@id1] [@id2] *)
-    }
-
-and expression_desc =
-  | Pexp_ident of Longident.t loc
-        (* x
-           M.x
-         *)
-  | Pexp_constant of constant
-        (* 1, 'a', "true", 1.0, 1l, 1L, 1n *)
-  | Pexp_let of rec_flag * value_binding list * expression
-        (* let P1 = E1 and ... and Pn = EN in E       (flag = Nonrecursive)
-           let rec P1 = E1 and ... and Pn = EN in E   (flag = Recursive)
-         *)
-  | Pexp_function of case list
-        (* function P1 -> E1 | ... | Pn -> En *)
-  | Pexp_fun of arg_label * expression option * pattern * expression
-        (* fun P -> E1                          (Simple, None)
-           fun ~l:P -> E1                       (Labelled l, None)
-           fun ?l:P -> E1                       (Optional l, None)
-           fun ?l:(P = E0) -> E1                (Optional l, Some E0)
-
-           Notes:
-           - If E0 is provided, only Optional is allowed.
-           - "fun P1 P2 .. Pn -> E1" is represented as nested Pexp_fun.
-           - "let f P = E" is represented using Pexp_fun.
-         *)
-  | Pexp_apply of expression * (arg_label * expression) list
-        (* E0 ~l1:E1 ... ~ln:En
-           li can be empty (non labeled argument) or start with '?'
-           (optional argument).
-
-           Invariant: n > 0
-         *)
-  | Pexp_match of expression * case list
-        (* match E0 with P1 -> E1 | ... | Pn -> En *)
-  | Pexp_try of expression * case list
-        (* try E0 with P1 -> E1 | ... | Pn -> En *)
-  | Pexp_tuple of expression list
-        (* (E1, ..., En)
-
-           Invariant: n >= 2
-        *)
-  | Pexp_construct of Longident.t loc * expression option
-        (* C                None
-           C E              Some E
-           C (E1, ..., En)  Some (Pexp_tuple[E1;...;En])
-        *)
-  | Pexp_variant of label * expression option
-        (* `A             (None)
-           `A E           (Some E)
-         *)
-  | Pexp_record of (Longident.t loc * expression) list * expression option
-        (* { l1=P1; ...; ln=Pn }     (None)
-           { E0 with l1=P1; ...; ln=Pn }   (Some E0)
-
-           Invariant: n > 0
-         *)
-  | Pexp_field of expression * Longident.t loc
-        (* E.l *)
-  | Pexp_setfield of expression * Longident.t loc * expression
-        (* E1.l <- E2 *)
-  | Pexp_array of expression list
-        (* [| E1; ...; En |] *)
-  | Pexp_ifthenelse of expression * expression * expression option
-        (* if E1 then E2 else E3 *)
-  | Pexp_sequence of expression * expression
-        (* E1; E2 *)
-  | Pexp_while of expression * expression
-        (* while E1 do E2 done *)
-  | Pexp_for of
-      pattern *  expression * expression * direction_flag * expression
-        (* for i = E1 to E2 do E3 done      (flag = Upto)
-           for i = E1 downto E2 do E3 done  (flag = Downto)
-         *)
-  | Pexp_constraint of expression * core_type
-        (* (E : T) *)
-  | Pexp_coerce of expression * core_type option * core_type
-        (* (E :> T)        (None, T)
-           (E : T0 :> T)   (Some T0, T)
-         *)
-  | Pexp_send of expression * label loc
-        (*  E # m *)
-  | Pexp_new of Longident.t loc
-        (* new M.c *)
-  | Pexp_setinstvar of label loc * expression
-        (* x <- 2 *)
-  | Pexp_override of (label loc * expression) list
-        (* {< x1 = E1; ...; Xn = En >} *)
-  | Pexp_letmodule of string loc * module_expr * expression
-        (* let module M = ME in E *)
-  | Pexp_letexception of extension_constructor * expression
-        (* let exception C in E *)
-  | Pexp_assert of expression
-        (* assert E
-           Note: "assert false" is treated in a special way by the
-           type-checker. *)
-  | Pexp_lazy of expression
-        (* lazy E *)
-  | Pexp_poly of expression * core_type option
-        (* Used for method bodies.
-
-           Can only be used as the expression under Cfk_concrete
-           for methods (not values). *)
-  | Pexp_object of class_structure
-        (* object ... end *)
-  | Pexp_newtype of string loc * expression
-        (* fun (type t) -> E *)
-  | Pexp_pack of module_expr
-        (* (module ME)
-
-           (module ME : S) is represented as
-           Pexp_constraint(Pexp_pack, Ptyp_package S) *)
-  | Pexp_open of override_flag * Longident.t loc * expression
-        (* M.(E)
-           let open M in E
-           let! open M in E *)
-  | Pexp_extension of extension
-        (* [%id] *)
-  | Pexp_unreachable
-        (* . *)
-
-and case =   (* (P -> E) or (P when E0 -> E) *)
-    {
-     pc_lhs: pattern;
-     pc_guard: expression option;
-     pc_rhs: expression;
-    }
-
-(* Value descriptions *)
-
-and value_description =
-    {
-     pval_name: string loc;
-     pval_type: core_type;
-     pval_prim: string list;
-     pval_attributes: attributes;  (* ... [@@id1] [@@id2] *)
-     pval_loc: Location.t;
-    }
-
-(*
-  val x: T                            (prim = [])
-  external x: T = "s1" ... "sn"       (prim = ["s1";..."sn"])
-*)
-
-(* Type declarations *)
-
-and type_declaration =
-    {
-     ptype_name: string loc;
-     ptype_params: (core_type * variance) list;
-           (* ('a1,...'an) t; None represents  _*)
-     ptype_cstrs: (core_type * core_type * Location.t) list;
-           (* ... constraint T1=T1'  ... constraint Tn=Tn' *)
-     ptype_kind: type_kind;
-     ptype_private: private_flag;   (* = private ... *)
-     ptype_manifest: core_type option;  (* = T *)
-     ptype_attributes: attributes;   (* ... [@@id1] [@@id2] *)
-     ptype_loc: Location.t;
-    }
-
-(*
-  type t                     (abstract, no manifest)
-  type t = T0                (abstract, manifest=T0)
-  type t = C of T | ...      (variant,  no manifest)
-  type t = T0 = C of T | ... (variant,  manifest=T0)
-  type t = {l: T; ...}       (record,   no manifest)
-  type t = T0 = {l : T; ...} (record,   manifest=T0)
-  type t = ..                (open,     no manifest)
-*)
-
-and type_kind =
-  | Ptype_abstract
-  | Ptype_variant of constructor_declaration list
-        (* Invariant: non-empty list *)
-  | Ptype_record of label_declaration list
-        (* Invariant: non-empty list *)
-  | Ptype_open
-
-and label_declaration =
-    {
-     pld_name: string loc;
-     pld_mutable: mutable_flag;
-     pld_type: core_type;
-     pld_loc: Location.t;
-     pld_attributes: attributes; (* l : T [@id1] [@id2] *)
-    }
-
-(*  { ...; l: T; ... }            (mutable=Immutable)
-    { ...; mutable l: T; ... }    (mutable=Mutable)
-
-    Note: T can be a Ptyp_poly.
-*)
-
-and constructor_declaration =
-    {
-     pcd_name: string loc;
-     pcd_args: constructor_arguments;
-     pcd_res: core_type option;
-     pcd_loc: Location.t;
-     pcd_attributes: attributes; (* C of ... [@id1] [@id2] *)
-    }
-
-and constructor_arguments =
-  | Pcstr_tuple of core_type list
-  | Pcstr_record of label_declaration list
-
-(*
-  | C of T1 * ... * Tn     (res = None,    args = Pcstr_tuple [])
-  | C: T0                  (res = Some T0, args = [])
-  | C: T1 * ... * Tn -> T0 (res = Some T0, args = Pcstr_tuple)
-  | C of {...}             (res = None,    args = Pcstr_record)
-  | C: {...} -> T0         (res = Some T0, args = Pcstr_record)
-  | C of {...} as t        (res = None,    args = Pcstr_record)
-*)
-
-and type_extension =
-    {
-     ptyext_path: Longident.t loc;
-     ptyext_params: (core_type * variance) list;
-     ptyext_constructors: extension_constructor list;
-     ptyext_private: private_flag;
-     ptyext_attributes: attributes;   (* ... [@@id1] [@@id2] *)
-    }
-(*
-  type t += ...
-*)
-
-and extension_constructor =
-    {
-     pext_name: string loc;
-     pext_kind : extension_constructor_kind;
-     pext_loc : Location.t;
-     pext_attributes: attributes; (* C of ... [@id1] [@id2] *)
-    }
-
-and extension_constructor_kind =
-    Pext_decl of constructor_arguments * core_type option
-      (*
-         | C of T1 * ... * Tn     ([T1; ...; Tn], None)
-         | C: T0                  ([], Some T0)
-         | C: T1 * ... * Tn -> T0 ([T1; ...; Tn], Some T0)
-       *)
-  | Pext_rebind of Longident.t loc
-      (*
-         | C = D
-       *)
-
-(** {1 Class language} *)
-
-(* Type expressions for the class language *)
-
-and class_type =
-    {
-     pcty_desc: class_type_desc;
-     pcty_loc: Location.t;
-     pcty_attributes: attributes; (* ... [@id1] [@id2] *)
-    }
-
-and class_type_desc =
-  | Pcty_constr of Longident.t loc * core_type list
-        (* c
-           ['a1, ..., 'an] c *)
-  | Pcty_signature of class_signature
-        (* object ... end *)
-  | Pcty_arrow of arg_label * core_type * class_type
-        (* T -> CT       Simple
-           ~l:T -> CT    Labelled l
-           ?l:T -> CT    Optional l
-         *)
-  | Pcty_extension of extension
-        (* [%id] *)
-  | Pcty_open of override_flag * Longident.t loc * class_type
-        (* let open M in CT *)
-
-and class_signature =
-    {
-     pcsig_self: core_type;
-     pcsig_fields: class_type_field list;
-    }
-(* object('selfpat) ... end
-   object ... end             (self = Ptyp_any)
- *)
-
-and class_type_field =
-    {
-     pctf_desc: class_type_field_desc;
-     pctf_loc: Location.t;
-     pctf_attributes: attributes; (* ... [@@id1] [@@id2] *)
-    }
-
-and class_type_field_desc =
-  | Pctf_inherit of class_type
-        (* inherit CT *)
-  | Pctf_val of (label loc * mutable_flag * virtual_flag * core_type)
-        (* val x: T *)
-  | Pctf_method  of (label loc * private_flag * virtual_flag * core_type)
-        (* method x: T
-
-           Note: T can be a Ptyp_poly.
-         *)
-  | Pctf_constraint  of (core_type * core_type)
-        (* constraint T1 = T2 *)
-  | Pctf_attribute of attribute
-        (* [@@@id] *)
-  | Pctf_extension of extension
-        (* [%%id] *)
-
-and 'a class_infos =
-    {
-     pci_virt: virtual_flag;
-     pci_params: (core_type * variance) list;
-     pci_name: string loc;
-     pci_expr: 'a;
-     pci_loc: Location.t;
-     pci_attributes: attributes;  (* ... [@@id1] [@@id2] *)
-    }
-(* class c = ...
-   class ['a1,...,'an] c = ...
-   class virtual c = ...
-
-   Also used for "class type" declaration.
-*)
-
-
-
-and class_type_declaration = class_type class_infos
-
-(* Value expressions for the class language *)
-
-and class_expr =
-    {
-     pcl_desc: class_expr_desc;
-     pcl_loc: Location.t;
-     pcl_attributes: attributes; (* ... [@id1] [@id2] *)
-    }
-
-and class_expr_desc =
-  | Pcl_constr of Longident.t loc * core_type list
-        (* c
-           ['a1, ..., 'an] c *)
-  | Pcl_structure of class_structure
-        (* object ... end *)
-  | Pcl_fun of arg_label * expression option * pattern * class_expr
-        (* fun P -> CE                          (Simple, None)
-           fun ~l:P -> CE                       (Labelled l, None)
-           fun ?l:P -> CE                       (Optional l, None)
-           fun ?l:(P = E0) -> CE                (Optional l, Some E0)
-         *)
-  | Pcl_apply of class_expr * (arg_label * expression) list
-        (* CE ~l1:E1 ... ~ln:En
-           li can be empty (non labeled argument) or start with '?'
-           (optional argument).
-
-           Invariant: n > 0
-         *)
-  | Pcl_let of rec_flag * value_binding list * class_expr
-        (* let P1 = E1 and ... and Pn = EN in CE      (flag = Nonrecursive)
-           let rec P1 = E1 and ... and Pn = EN in CE  (flag = Recursive)
-         *)
-  | Pcl_constraint of class_expr * class_type
-        (* (CE : CT) *)
-  | Pcl_extension of extension
-  (* [%id] *)
-  | Pcl_open of override_flag * Longident.t loc * class_expr
-  (* let open M in CE *)
-
-
-and class_structure =
-    {
-     pcstr_self: pattern;
-     pcstr_fields: class_field list;
-    }
-(* object(selfpat) ... end
-   object ... end           (self = Ppat_any)
- *)
-
-and class_field =
-    {
-     pcf_desc: class_field_desc;
-     pcf_loc: Location.t;
-     pcf_attributes: attributes; (* ... [@@id1] [@@id2] *)
-    }
-
-and class_field_desc =
-  | Pcf_inherit of unit
-        (* inherit CE
-           inherit CE as x
-           inherit! CE
-           inherit! CE as x
-         *)
-  | Pcf_val of (label loc * mutable_flag * class_field_kind)
-        (* val x = E
-           val virtual x: T
-         *)
-  | Pcf_method of (label loc * private_flag * class_field_kind)
-        (* method x = E            (E can be a Pexp_poly)
-           method virtual x: T     (T can be a Ptyp_poly)
-         *)
-  | Pcf_constraint of (core_type * core_type)
-        (* constraint T1 = T2 *)
-  | Pcf_initializer of expression
-        (* initializer E *)
-  | Pcf_attribute of attribute
-        (* [@@@id] *)
-  | Pcf_extension of extension
-        (* [%%id] *)
-
-and class_field_kind =
-  | Cfk_virtual of core_type
-  | Cfk_concrete of override_flag * expression
-
-
-
-(** {1 Module language} *)
-
-(* Type expressions for the module language *)
-
-and module_type =
-    {
-     pmty_desc: module_type_desc;
-     pmty_loc: Location.t;
-     pmty_attributes: attributes; (* ... [@id1] [@id2] *)
-    }
-
-and module_type_desc =
-  | Pmty_ident of Longident.t loc
-        (* S *)
-  | Pmty_signature of signature
-        (* sig ... end *)
-  | Pmty_functor of string loc * module_type option * module_type
-        (* functor(X : MT1) -> MT2 *)
-  | Pmty_with of module_type * with_constraint list
-        (* MT with ... *)
-  | Pmty_typeof of module_expr
-        (* module type of ME *)
-  | Pmty_extension of extension
-        (* [%id] *)
-  | Pmty_alias of Longident.t loc
-        (* (module M) *)
-
-and signature = signature_item list
-
-and signature_item =
-    {
-     psig_desc: signature_item_desc;
-     psig_loc: Location.t;
-    }
-
-and signature_item_desc =
-  | Psig_value of value_description
-        (*
-          val x: T
-          external x: T = "s1" ... "sn"
-         *)
-  | Psig_type of rec_flag * type_declaration list
-        (* type t1 = ... and ... and tn = ... *)
-  | Psig_typext of type_extension
-        (* type t1 += ... *)
-  | Psig_exception of extension_constructor
-        (* exception C of T *)
-  | Psig_module of module_declaration
-        (* module X : MT *)
-  | Psig_recmodule of module_declaration list
-        (* module rec X1 : MT1 and ... and Xn : MTn *)
-  | Psig_modtype of module_type_declaration
-        (* module type S = MT
-           module type S *)
-  | Psig_open of open_description
-        (* open X *)
-  | Psig_include of include_description
-        (* include MT *)
-  | Psig_class of unit
-        (* class c1 : ... and ... and cn : ... *)
-  | Psig_class_type of class_type_declaration list
-        (* class type ct1 = ... and ... and ctn = ... *)
-  | Psig_attribute of attribute
-        (* [@@@id] *)
-  | Psig_extension of extension * attributes
-        (* [%%id] *)
-
-and module_declaration =
-    {
-     pmd_name: string loc;
-     pmd_type: module_type;
-     pmd_attributes: attributes; (* ... [@@id1] [@@id2] *)
-     pmd_loc: Location.t;
-    }
-(* S : MT *)
-
-and module_type_declaration =
-    {
-     pmtd_name: string loc;
-     pmtd_type: module_type option;
-     pmtd_attributes: attributes; (* ... [@@id1] [@@id2] *)
-     pmtd_loc: Location.t;
-    }
-(* S = MT
-   S       (abstract module type declaration, pmtd_type = None)
-*)
-
-and open_description =
-    {
-     popen_lid: Longident.t loc;
-     popen_override: override_flag;
-     popen_loc: Location.t;
-     popen_attributes: attributes;
-    }
-(* open! X - popen_override = Override (silences the 'used identifier
-                              shadowing' warning)
-   open  X - popen_override = Fresh
- *)
-
-and 'a include_infos =
-    {
-     pincl_mod: 'a;
-     pincl_loc: Location.t;
-     pincl_attributes: attributes;
-    }
-
-and include_description = module_type include_infos
-(* include MT *)
-
-and include_declaration = module_expr include_infos
-(* include ME *)
-
-and with_constraint =
-  | Pwith_type of Longident.t loc * type_declaration
-        (* with type X.t = ...
-
-           Note: the last component of the longident must match
-           the name of the type_declaration. *)
-  | Pwith_module of Longident.t loc * Longident.t loc
-        (* with module X.Y = Z *)
-  | Pwith_typesubst of Longident.t loc * type_declaration
-        (* with type X.t := ..., same format as [Pwith_type] *)
-  | Pwith_modsubst of Longident.t loc * Longident.t loc
-        (* with module X.Y := Z *)
-
-(* Value expressions for the module language *)
-
-and module_expr =
-    {
-     pmod_desc: module_expr_desc;
-     pmod_loc: Location.t;
-     pmod_attributes: attributes; (* ... [@id1] [@id2] *)
-    }
-
-and module_expr_desc =
-  | Pmod_ident of Longident.t loc
-        (* X *)
-  | Pmod_structure of structure
-        (* struct ... end *)
-  | Pmod_functor of string loc * module_type option * module_expr
-        (* functor(X : MT1) -> ME *)
-  | Pmod_apply of module_expr * module_expr
-        (* ME1(ME2) *)
-  | Pmod_constraint of module_expr * module_type
-        (* (ME : MT) *)
-  | Pmod_unpack of expression
-        (* (val E) *)
-  | Pmod_extension of extension
-        (* [%id] *)
-
-and structure = structure_item list
-
-and structure_item =
-    {
-     pstr_desc: structure_item_desc;
-     pstr_loc: Location.t;
-    }
-
-and structure_item_desc =
-  | Pstr_eval of expression * attributes
-        (* E *)
-  | Pstr_value of rec_flag * value_binding list
-        (* let P1 = E1 and ... and Pn = EN       (flag = Nonrecursive)
-           let rec P1 = E1 and ... and Pn = EN   (flag = Recursive)
-         *)
-  | Pstr_primitive of value_description
-        (*  val x: T
-            external x: T = "s1" ... "sn" *)
-  | Pstr_type of rec_flag * type_declaration list
-        (* type t1 = ... and ... and tn = ... *)
-  | Pstr_typext of type_extension
-        (* type t1 += ... *)
-  | Pstr_exception of extension_constructor
-        (* exception C of T
-           exception C = M.X *)
-  | Pstr_module of module_binding
-        (* module X = ME *)
-  | Pstr_recmodule of module_binding list
-        (* module rec X1 = ME1 and ... and Xn = MEn *)
-  | Pstr_modtype of module_type_declaration
-        (* module type S = MT *)
-  | Pstr_open of open_description
-        (* open X *)
-  | Pstr_class of unit
-        (* Dummy AST node *)
-  | Pstr_class_type of class_type_declaration list
-        (* class type ct1 = ... and ... and ctn = ... *)
-  | Pstr_include of include_declaration
-        (* include ME *)
-  | Pstr_attribute of attribute
-        (* [@@@id] *)
-  | Pstr_extension of extension * attributes
-        (* [%%id] *)
-
-and value_binding =
-  {
-    pvb_pat: pattern;
-    pvb_expr: expression;
-    pvb_attributes: attributes;
-    pvb_loc: Location.t;
-  }
-
-and module_binding =
-    {
-     pmb_name: string loc;
-     pmb_expr: module_expr;
-     pmb_attributes: attributes;
-     pmb_loc: Location.t;
-    }
-(* X = ME *)
-
diff --git a/jscomp/ml/path.ml b/jscomp/ml/path.ml
deleted file mode 100644
index 5189386..0000000
--- a/jscomp/ml/path.ml
+++ /dev/null
@@ -1,109 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-type t =
-    Pident of Ident.t
-  | Pdot of t * string * int
-  | Papply of t * t
-
-let nopos = -1
-
-let rec same p1 p2 =
-  match (p1, p2) with
-    (Pident id1, Pident id2) -> Ident.same id1 id2
-  | (Pdot(p1, s1, _pos1), Pdot(p2, s2, _pos2)) -> s1 = s2 && same p1 p2
-  | (Papply(fun1, arg1), Papply(fun2, arg2)) ->
-       same fun1 fun2 && same arg1 arg2
-  | (_, _) -> false
-
-let rec compare p1 p2 =
-  match (p1, p2) with
-    (Pident id1, Pident id2) -> Ident.compare id1 id2
-  | (Pdot(p1, s1, _pos1), Pdot(p2, s2, _pos2)) ->
-      let h = compare p1 p2 in
-      if h <> 0 then h else String.compare s1 s2
-  | (Papply(fun1, arg1), Papply(fun2, arg2)) ->
-      let h = compare fun1 fun2 in
-      if h <> 0 then h else compare arg1 arg2
-  | ((Pident _ | Pdot _), (Pdot _ | Papply _)) -> -1
-  | ((Pdot _ | Papply _), (Pident _ | Pdot _)) -> 1
-
-let rec isfree id = function
-    Pident id' -> Ident.same id id'
-  | Pdot(p, _s, _pos) -> isfree id p
-  | Papply(p1, p2) -> isfree id p1 || isfree id p2
-
-let rec binding_time = function
-    Pident id -> Ident.binding_time id
-  | Pdot(p, _s, _pos) -> binding_time p
-  | Papply(p1, p2) -> Ext_pervasives.max_int (binding_time p1) (binding_time p2)
-
-let kfalse _ = false
-
-let rec name ?(paren=kfalse) = function
-    Pident id -> Ident.name id
-  | Pdot(p, s, _pos) ->
-      name ~paren p ^ if paren s then ".( " ^ s ^ " )" else "." ^ s
-  | Papply(p1, p2) -> name ~paren p1 ^ "(" ^ name ~paren p2 ^ ")"
-
-let rec head = function
-    Pident id -> id
-  | Pdot(p, _s, _pos) -> head p
-  | Papply _ -> assert false
-
-let flatten =
-  let rec flatten acc = function
-    | Pident id -> `Ok (id, acc)
-    | Pdot (p, s, _) -> flatten (s :: acc) p
-    | Papply _ -> `Contains_apply
-  in
-  fun t -> flatten [] t
-
-let heads p =
-  let rec heads p acc = match p with
-    | Pident id -> id :: acc
-    | Pdot (p, _s, _pos) -> heads p acc
-    | Papply(p1, p2) ->
-        heads p1 (heads p2 acc)
-  in heads p []
-
-let rec last = function
-  | Pident id -> Ident.name id
-  | Pdot(_, s, _) -> s
-  | Papply(_, p) -> last p
-
-let is_uident s =
-  assert (s <> "");
-  match s.[0] with
-  | 'A'..'Z' -> true
-  | _ -> false
-
-type typath =
-  | Regular of t
-  | Ext of t * string
-  | LocalExt of Ident.t
-  | Cstr of t * string
-
-let constructor_typath = function
-  | Pident id when is_uident (Ident.name id) -> LocalExt id
-  | Pdot(ty_path, s, _) when is_uident s ->
-      if is_uident (last ty_path) then Ext (ty_path, s)
-      else Cstr (ty_path, s)
-  | p -> Regular p
-
-let is_constructor_typath p =
-  match constructor_typath p with
-  | Regular _ -> false
-  | _ -> true
diff --git a/jscomp/ml/path.mli b/jscomp/ml/path.mli
deleted file mode 100644
index 1849146..0000000
--- a/jscomp/ml/path.mli
+++ /dev/null
@@ -1,46 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Access paths *)
-
-type t =
-    Pident of Ident.t
-  | Pdot of t * string * int
-  | Papply of t * t
-
-val same: t -> t -> bool
-val compare: t -> t -> int
-val isfree: Ident.t -> t -> bool
-val binding_time: t -> int
-val flatten : t -> [ `Contains_apply | `Ok of Ident.t * string list ]
-
-val nopos: int
-
-val name: ?paren:(string -> bool) -> t -> string
-    (* [paren] tells whether a path suffix needs parentheses *)
-val head: t -> Ident.t
-
-val heads: t -> Ident.t list
-
-val last: t -> string
-
-type typath =
-  | Regular of t
-  | Ext of t * string
-  | LocalExt of Ident.t
-  | Cstr of t * string
-
-val constructor_typath: t -> typath
-val is_constructor_typath: t -> bool
diff --git a/jscomp/ml/pprintast.ml b/jscomp/ml/pprintast.ml
deleted file mode 100644
index b531404..0000000
--- a/jscomp/ml/pprintast.ml
+++ /dev/null
@@ -1,1444 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                      Thomas Gazagnaire, OCamlPro                       *)
-(*                   Fabrice Le Fessant, INRIA Saclay                     *)
-(*               Hongbo Zhang, University of Pennsylvania                 *)
-(*                                                                        *)
-(*   Copyright 2007 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Original Code from Ber-metaocaml, modified for 3.12.0 and fixed *)
-(* Printing code expressions *)
-(* Authors:  Ed Pizzi, Fabrice Le Fessant *)
-(* Extensive Rewrite: Hongbo Zhang: University of Pennsylvania *)
-(* TODO more fine-grained precedence pretty-printing *)
-
-open Asttypes
-open Format
-open Location
-open Longident
-open Parsetree
-open Ast_helper
-
-let prefix_symbols  = [ '!'; '?'; '~' ] ;;
-let infix_symbols = [ '='; '<'; '>'; '@'; '^'; '|'; '&'; '+'; '-'; '*'; '/';
-                      '$'; '%'; '#' ]
-
-(* type fixity = Infix| Prefix  *)
-let special_infix_strings =
-  ["asr"; "land"; "lor"; "lsl"; "lsr"; "lxor"; "mod"; "or"; ":="; "!="; "::" ]
-
-(* determines if the string is an infix string.
-   checks backwards, first allowing a renaming postfix ("_102") which
-   may have resulted from Pexp -> Texp -> Pexp translation, then checking
-   if all the characters in the beginning of the string are valid infix
-   characters. *)
-let fixity_of_string  = function
-  | s when List.mem s special_infix_strings -> `Infix s
-  | s when List.mem s.[0] infix_symbols -> `Infix s
-  | s when List.mem s.[0] prefix_symbols -> `Prefix s
-  | s when s.[0] = '.' -> `Mixfix s
-  | _ -> `Normal
-
-let view_fixity_of_exp = function
-  | {pexp_desc = Pexp_ident {txt=Lident l;_}; pexp_attributes = []} ->
-      fixity_of_string l
-  | _ -> `Normal
-
-let is_infix  = function  | `Infix _ -> true | _  -> false
-let is_mixfix = function `Mixfix _ -> true | _ -> false
-
-(* which identifiers are in fact operators needing parentheses *)
-let needs_parens txt =
-  let fix = fixity_of_string txt in
-  is_infix fix
-  || is_mixfix fix
-  || List.mem txt.[0] prefix_symbols
-
-(* some infixes need spaces around parens to avoid clashes with comment
-   syntax *)
-let needs_spaces txt =
-  txt.[0]='*' || txt.[String.length txt - 1] = '*'
-
-(* add parentheses to binders when they are in fact infix or prefix operators *)
-let protect_ident ppf txt =
-  let format : (_, _, _) format =
-    if not (needs_parens txt) then "%s"
-    else if needs_spaces txt then "(@;%s@;)"
-    else "(%s)"
-  in fprintf ppf format txt
-
-let protect_longident ppf print_longident longprefix txt =
-  let format : (_, _, _) format =
-    if not (needs_parens txt) then "%a.%s"
-    else if needs_spaces txt then  "%a.(@;%s@;)"
-    else "%a.(%s)" in
-  fprintf ppf format print_longident longprefix txt
-
-type space_formatter = (unit, Format.formatter, unit) format
-
-let override = function
-  | Override -> "!"
-  | Fresh -> ""
-
-(* variance encoding: need to sync up with the [parser.mly] *)
-let type_variance = function
-  | Invariant -> ""
-  | Covariant -> "+"
-  | Contravariant -> "-"
-
-type construct =
-  [ `cons of expression list
-  | `list of expression list
-  | `nil
-  | `normal
-  | `simple of Longident.t
-  | `tuple ]
-
-let view_expr x =
-  match x.pexp_desc with
-  | Pexp_construct ( {txt= Lident "()"; _},_) -> `tuple
-  | Pexp_construct ( {txt= Lident "[]";_},_) -> `nil
-  | Pexp_construct ( {txt= Lident"::";_},Some _) ->
-      let rec loop exp acc = match exp with
-          | {pexp_desc=Pexp_construct ({txt=Lident "[]";_},_);
-             pexp_attributes = []} ->
-              (List.rev acc,true)
-          | {pexp_desc=
-             Pexp_construct ({txt=Lident "::";_},
-                             Some ({pexp_desc= Pexp_tuple([e1;e2]);
-                                    pexp_attributes = []}));
-             pexp_attributes = []}
-            ->
-              loop e2 (e1::acc)
-          | e -> (List.rev (e::acc),false) in
-      let (ls,b) = loop x []  in
-      if b then
-        `list ls
-      else `cons ls
-  | Pexp_construct (x,None) -> `simple (x.txt)
-  | _ -> `normal
-
-let is_simple_construct :construct -> bool = function
-  | `nil | `tuple | `list _ | `simple _  -> true
-  | `cons _ | `normal -> false
-
-let pp = fprintf
-
-type ctxt = {
-  pipe : bool;
-  semi : bool;
-  ifthenelse : bool;
-}
-
-let reset_ctxt = { pipe=false; semi=false; ifthenelse=false }
-let under_pipe ctxt = { ctxt with pipe=true }
-let under_semi ctxt = { ctxt with semi=true }
-let under_ifthenelse ctxt = { ctxt with ifthenelse=true }
-(*
-let reset_semi ctxt = { ctxt with semi=false }
-let reset_ifthenelse ctxt = { ctxt with ifthenelse=false }
-let reset_pipe ctxt = { ctxt with pipe=false }
-*)
-
-let list : 'a . ?sep:space_formatter -> ?first:space_formatter ->
-  ?last:space_formatter -> (Format.formatter -> 'a -> unit) ->
-  Format.formatter -> 'a list -> unit
-  = fun ?sep ?first ?last fu f xs ->
-    let first = match first with Some x -> x |None -> ("": _ format6)
-    and last = match last with Some x -> x |None -> ("": _ format6)
-    and sep = match sep with Some x -> x |None -> ("@ ": _ format6) in
-    let aux f = function
-      | [] -> ()
-      | [x] -> fu f x
-      | xs ->
-          let rec loop  f = function
-            | [x] -> fu f x
-            | x::xs ->  fu f x; pp f sep; loop f xs;
-            | _ -> assert false in begin
-            pp f first; loop f xs; pp f last;
-          end in
-    aux f xs
-
-let option : 'a. ?first:space_formatter -> ?last:space_formatter ->
-  (Format.formatter -> 'a -> unit) -> Format.formatter -> 'a option -> unit
-  = fun  ?first  ?last fu f a ->
-    let first = match first with Some x -> x | None -> ("": _ format6)
-    and last = match last with Some x -> x | None -> ("": _ format6) in
-    match a with
-    | None -> ()
-    | Some x -> pp f first; fu f x; pp f last
-
-let paren: 'a . ?first:space_formatter -> ?last:space_formatter ->
-  bool -> (Format.formatter -> 'a -> unit) -> Format.formatter -> 'a -> unit
-  = fun  ?(first=("": _ format6)) ?(last=("": _ format6)) b fu f x ->
-    if b then (pp f "("; pp f first; fu f x; pp f last; pp f ")")
-    else fu f x
-
-let rec longident f = function
-  | Lident s -> protect_ident f s
-  | Ldot(y,s) -> protect_longident f longident y s
-  | Lapply (y,s) ->
-      pp f "%a(%a)" longident y longident s
-
-let longident_loc f x = pp f "%a" longident x.txt
-
-let string_of_int_as_char i = Ext_util.string_of_int_as_char i
-
-let constant f = function
-  | Pconst_char i -> pp f "%s"  (string_of_int_as_char i)
-  | Pconst_string (i, None) -> pp f "%S" i
-  | Pconst_string (i, Some delim) -> pp f "{%s|%s|%s}" delim i delim
-  | Pconst_integer (i, None) -> paren (i.[0]='-') (fun f -> pp f "%s") f i
-  | Pconst_integer (i, Some m) ->
-    paren (i.[0]='-') (fun f (i, m) -> pp f "%s%c" i m) f (i,m)
-  | Pconst_float (i, None) -> paren (i.[0]='-') (fun f -> pp f "%s") f i
-  | Pconst_float (i, Some m) -> paren (i.[0]='-') (fun f (i,m) ->
-      pp f "%s%c" i m) f (i,m)
-
-(* trailing space*)
-let mutable_flag f = function
-  | Immutable -> ()
-  | Mutable -> pp f "mutable@;"
-let virtual_flag f  = function
-  | Concrete -> ()
-  | Virtual -> pp f "virtual@;"
-
-(* trailing space added *)
-let rec_flag f rf =
-  match rf with
-  | Nonrecursive -> ()
-  | Recursive -> pp f "rec "
-let nonrec_flag f rf =
-  match rf with
-  | Nonrecursive -> pp f "nonrec "
-  | Recursive -> ()
-let direction_flag f = function
-  | Upto -> pp f "to@ "
-  | Downto -> pp f "downto@ "
-let private_flag f = function
-  | Public -> ()
-  | Private -> pp f "private@ "
-
-let constant_string f s = pp f "%S" s
-let tyvar f str = pp f "'%s" str
-let tyvar_loc f str = pp f "'%s" str.txt
-let string_quot f x = pp f "`%s" x
-
-(* c ['a,'b] *)
-let rec class_params_def ctxt f =  function
-  | [] -> ()
-  | l ->
-      pp f "[%a] " (* space *)
-        (list (type_param ctxt) ~sep:",") l
-
-and type_with_label ctxt f (label, c) =
-  match label with
-  | Nolabel    -> core_type1 ctxt f c (* otherwise parenthesize *)
-  | Labelled s -> pp f "%s:%a" s (core_type1 ctxt) c
-  | Optional s -> pp f "?%s:%a" s (core_type1 ctxt) c
-
-and core_type ctxt f x =
-  if x.ptyp_attributes <> [] then begin
-    pp f "((%a)%a)" (core_type ctxt) {x with ptyp_attributes=[]}
-      (attributes ctxt) x.ptyp_attributes
-  end
-  else match x.ptyp_desc with
-    | Ptyp_arrow (l, ct1, ct2) ->
-        pp f "@[<2>%a@;->@;%a@]" (* FIXME remove parens later *)
-          (type_with_label ctxt) (l,ct1) (core_type ctxt) ct2
-    | Ptyp_alias (ct, s) ->
-        pp f "@[<2>%a@;as@;'%s@]" (core_type1 ctxt) ct s
-    | Ptyp_poly ([], ct) ->
-        core_type ctxt f ct
-    | Ptyp_poly (sl, ct) ->
-        pp f "@[<2>%a%a@]"
-          (fun f l ->
-             pp f "%a"
-               (fun f l -> match l with
-                  | [] -> ()
-                  | _ ->
-                      pp f "%a@;.@;"
-                        (list tyvar_loc ~sep:"@;")  l)
-               l)
-          sl (core_type ctxt) ct
-    | _ -> pp f "@[<2>%a@]" (core_type1 ctxt) x
-
-and core_type1 ctxt f x =
-  if x.ptyp_attributes <> [] then core_type ctxt f x
-  else match x.ptyp_desc with
-    | Ptyp_any -> pp f "_";
-    | Ptyp_var s -> tyvar f  s;
-    | Ptyp_tuple l ->  pp f "(%a)" (list (core_type1 ctxt) ~sep:"@;*@;") l
-    | Ptyp_constr (li, l) ->
-        pp f (* "%a%a@;" *) "%a%a"
-          (fun f l -> match l with
-             |[] -> ()
-             |[x]-> pp f "%a@;" (core_type1 ctxt)  x
-             | _ -> list ~first:"(" ~last:")@;" (core_type ctxt) ~sep:",@;" f l)
-          l longident_loc li
-    | Ptyp_variant (l, closed, low) ->
-        let type_variant_helper f x =
-          match x with
-          | Rtag (l, attrs, _, ctl) ->
-              pp f "@[<2>%a%a@;%a@]" string_quot l.txt
-                (fun f l -> match l with
-                   |[] -> ()
-                   | _ -> pp f "@;of@;%a"
-                            (list (core_type ctxt) ~sep:"&")  ctl) ctl
-                (attributes ctxt) attrs
-          | Rinherit ct -> core_type ctxt f ct in
-        pp f "@[<2>[%a%a]@]"
-          (fun f l ->
-             match l, closed with
-             | [], Closed -> ()
-             | [], Open -> pp f ">" (* Cf #7200: print [>] correctly *)
-             | _ ->
-                 pp f "%s@;%a"
-                   (match (closed,low) with
-                    | (Closed,None) -> ""
-                    | (Closed,Some _) -> "<" (* FIXME desugar the syntax sugar*)
-                    | (Open,_) -> ">")
-                   (list type_variant_helper ~sep:"@;<1 -2>| ") l) l
-          (fun f low -> match low with
-             |Some [] |None -> ()
-             |Some xs ->
-                 pp f ">@ %a"
-                   (list string_quot) xs) low
-    | Ptyp_object (l, o) ->
-        let core_field_type f = function
-          | Otag (l, attrs, ct) ->
-            pp f "@[<hov2>%s: %a@ %a@ @]" l.txt
-              (core_type ctxt) ct (attributes ctxt) attrs (* Cf #7200 *)
-          | Oinherit ct ->
-            pp f "@[<hov2>%a@ @]" (core_type ctxt) ct
-        in
-        let field_var f = function
-          | Asttypes.Closed -> ()
-          | Asttypes.Open ->
-              match l with
-              | [] -> pp f ".."
-              | _ -> pp f " ;.."
-        in
-        pp f "@[<hov2><@ %a%a@ > @]" (list core_field_type ~sep:";") l
-          field_var o (* Cf #7200 *)
-    | Ptyp_class (li, l) ->   (*FIXME*)
-        pp f "@[<hov2>%a#%a@]"
-          (list (core_type ctxt) ~sep:"," ~first:"(" ~last:")") l
-          longident_loc li
-    | Ptyp_package (lid, cstrs) ->
-        let aux f (s, ct) =
-          pp f "type %a@ =@ %a" longident_loc s (core_type ctxt) ct  in
-        (match cstrs with
-         |[] -> pp f "@[<hov2>(module@ %a)@]" longident_loc lid
-         |_ ->
-             pp f "@[<hov2>(module@ %a@ with@ %a)@]" longident_loc lid
-               (list aux  ~sep:"@ and@ ")  cstrs)
-    | Ptyp_extension e -> extension ctxt f e
-    | _ -> paren true (core_type ctxt) f x
-
-(********************pattern********************)
-(* be cautious when use [pattern], [pattern1] is preferred *)
-and pattern ctxt f x =
-  let rec list_of_pattern acc = function (* only consider ((A|B)|C)*)
-    | {ppat_desc= Ppat_or (p1,p2); ppat_attributes = []} ->
-        list_of_pattern  (p2::acc) p1
-    | x -> x::acc
-  in
-  if x.ppat_attributes <> [] then begin
-    pp f "((%a)%a)" (pattern ctxt) {x with ppat_attributes=[]}
-      (attributes ctxt) x.ppat_attributes
-  end
-  else match x.ppat_desc with
-    | Ppat_alias (p, s) ->
-        pp f "@[<2>%a@;as@;%a@]" (pattern ctxt) p protect_ident s.txt (* RA*)
-    | Ppat_or _ -> (* *)
-        pp f "@[<hov0>%a@]" (list ~sep:"@,|" (pattern ctxt))
-          (list_of_pattern [] x)
-    | _ -> pattern1 ctxt f x
-
-and pattern1 ctxt (f:Format.formatter) (x:pattern) : unit =
-  let rec pattern_list_helper f = function
-    | {ppat_desc =
-         Ppat_construct
-           ({ txt = Lident("::") ;_},
-            Some ({ppat_desc = Ppat_tuple([pat1; pat2]);_}));
-       ppat_attributes = []}
-
-      ->
-        pp f "%a::%a" (simple_pattern ctxt) pat1 pattern_list_helper pat2 (*RA*)
-    | p -> pattern1 ctxt f p
-  in
-  if x.ppat_attributes <> [] then pattern ctxt f x
-  else match x.ppat_desc with
-    | Ppat_variant (l, Some p) ->
-        pp f "@[<2>`%s@;%a@]" l (simple_pattern ctxt) p
-    | Ppat_construct (({txt=Lident("()"|"[]");_}), _) -> simple_pattern ctxt f x
-    | Ppat_construct (({txt;_} as li), po) ->
-        (* FIXME The third field always false *)
-        if txt = Lident "::" then
-          pp f "%a" pattern_list_helper x
-        else
-          (match po with
-           | Some x -> pp f "%a@;%a"  longident_loc li (simple_pattern ctxt) x
-           | None -> pp f "%a" longident_loc li)
-    | _ -> simple_pattern ctxt f x
-
-and simple_pattern ctxt (f:Format.formatter) (x:pattern) : unit =
-  if x.ppat_attributes <> [] then pattern ctxt f x
-  else match x.ppat_desc with
-    | Ppat_construct (({txt=Lident ("()"|"[]" as x);_}), _) -> pp f  "%s" x
-    | Ppat_any -> pp f "_";
-    | Ppat_var ({txt = txt;_}) -> protect_ident f txt
-    | Ppat_array l ->
-        pp f "@[<2>[|%a|]@]"  (list (pattern1 ctxt) ~sep:";") l
-    | Ppat_unpack (s) ->
-        pp f "(module@ %s)@ " s.txt
-    | Ppat_type li ->
-        pp f "#%a" longident_loc li
-    | Ppat_record (l, closed) ->
-        let longident_x_pattern f (li, p) =
-          match (li,p) with
-          | ({txt=Lident s;_ },
-             {ppat_desc=Ppat_var {txt;_};
-              ppat_attributes=[]; _})
-            when s = txt ->
-              pp f "@[<2>%a@]"  longident_loc li
-          | _ ->
-              pp f "@[<2>%a@;=@;%a@]" longident_loc li (pattern1 ctxt) p
-        in
-        begin match closed with
-        | Closed ->
-            pp f "@[<2>{@;%a@;}@]" (list longident_x_pattern ~sep:";@;") l
-        | _ ->
-            pp f "@[<2>{@;%a;_}@]" (list longident_x_pattern ~sep:";@;") l
-        end
-    | Ppat_tuple l ->
-        pp f "@[<1>(%a)@]" (list  ~sep:",@;" (pattern1 ctxt))  l (* level1*)
-    | Ppat_constant (c) -> pp f "%a" constant c
-    | Ppat_interval (c1, c2) -> pp f "%a..%a" constant c1 constant c2
-    | Ppat_variant (l,None) ->  pp f "`%s" l
-    | Ppat_constraint (p, ct) ->
-        pp f "@[<2>(%a@;:@;%a)@]" (pattern1 ctxt) p (core_type ctxt) ct
-    | Ppat_lazy p ->
-        pp f "@[<2>(lazy@;%a)@]" (pattern1 ctxt) p
-    | Ppat_exception p ->
-        pp f "@[<2>exception@;%a@]" (pattern1 ctxt) p
-    | Ppat_extension e -> extension ctxt f e
-    | Ppat_open (lid, p) ->
-        let with_paren =
-        match p.ppat_desc with
-        | Ppat_array _ | Ppat_record _
-        | Ppat_construct (({txt=Lident ("()"|"[]");_}), _) -> false
-        | _ -> true in
-        pp f "@[<2>%a.%a @]" longident_loc lid
-          (paren with_paren @@ pattern1 ctxt) p
-    | _ -> paren true (pattern ctxt) f x
-
-and label_exp ctxt f (l,opt,p) =
-  match l with
-  | Nolabel ->
-      (* single case pattern parens needed here *)
-      pp f "%a@ " (simple_pattern ctxt) p
-  | Optional rest ->
-      begin match p with
-      | {ppat_desc = Ppat_var {txt;_}; ppat_attributes = []}
-        when txt = rest ->
-          (match opt with
-           | Some o -> pp f "?(%s=@;%a)@;" rest  (expression ctxt) o
-           | None -> pp f "?%s@ " rest)
-      | _ ->
-          (match opt with
-           | Some o ->
-               pp f "?%s:(%a=@;%a)@;"
-                 rest (pattern1 ctxt) p (expression ctxt) o
-           | None -> pp f "?%s:%a@;" rest (simple_pattern ctxt) p)
-      end
-  | Labelled l -> match p with
-    | {ppat_desc  = Ppat_var {txt;_}; ppat_attributes = []}
-      when txt = l ->
-        pp f "~%s@;" l
-    | _ ->  pp f "~%s:%a@;" l (simple_pattern ctxt) p
-
-and sugar_expr ctxt f e =
-  if e.pexp_attributes <> [] then false
-  else match e.pexp_desc with
-  | Pexp_apply ({ pexp_desc = Pexp_ident {txt = id; _};
-                  pexp_attributes=[]; _}, args)
-    when List.for_all (fun (lab, _) -> lab = Nolabel) args -> begin
-      let print_indexop a path_prefix assign left right print_index indices
-          rem_args =
-        let print_path ppf = function
-          | None -> ()
-          | Some m -> pp ppf ".%a" longident m in
-        match assign, rem_args with
-            | false, [] ->
-              pp f "@[%a%a%s%a%s@]"
-                (simple_expr ctxt) a print_path path_prefix
-                left (list ~sep:"," print_index) indices right; true
-            | true, [v] ->
-              pp f "@[%a%a%s%a%s@ <-@;<1 2>%a@]"
-                (simple_expr ctxt) a print_path path_prefix
-                left (list ~sep:"," print_index) indices right
-                (simple_expr ctxt) v; true
-            | _ -> false in
-      match id, List.map snd args with
-      | Lident "!", [e] ->
-        pp f "@[<hov>!%a@]" (simple_expr ctxt) e; true
-      | Ldot (path, ("get"|"set" as func)), a :: other_args -> begin
-          let assign = func = "set" in
-          let print = print_indexop a None assign in
-          match path, other_args with
-          | Lident "Array", i :: rest ->
-            print ".(" ")" (expression ctxt) [i] rest
-          | Lident "String", i :: rest ->
-            print ".[" "]" (expression ctxt) [i] rest
-          | Ldot (Lident "Bigarray", "Array1"), i1 :: rest ->
-            print ".{" "}" (simple_expr ctxt) [i1] rest
-          | Ldot (Lident "Bigarray", "Array2"), i1 :: i2 :: rest ->
-            print ".{" "}" (simple_expr ctxt) [i1; i2] rest
-          | Ldot (Lident "Bigarray", "Array3"), i1 :: i2 :: i3 :: rest ->
-            print ".{" "}" (simple_expr ctxt) [i1; i2; i3] rest
-          | Ldot (Lident "Bigarray", "Genarray"),
-            {pexp_desc = Pexp_array indexes; pexp_attributes = []} :: rest ->
-              print ".{" "}" (simple_expr ctxt) indexes rest
-          | _ -> false
-        end
-      | (Lident s | Ldot(_,s)) , a :: i :: rest
-        when s.[0] = '.' ->
-          let n = String.length s in
-          (* extract operator:
-             assignment operators end with [right_bracket ^ "<-"],
-             access operators end with [right_bracket] directly
-          *)
-          let assign = s.[n - 1] = '-'  in
-          let kind =
-            (* extract the right end bracket *)
-            if assign then s.[n - 3] else s.[n - 1] in
-          let left, right = match kind with
-            | ')' -> '(', ")"
-            | ']' -> '[', "]"
-            | '}' -> '{', "}"
-            | _ -> assert false in
-          let path_prefix = match id with
-            | Ldot(m,_) -> Some m
-            | _ -> None in
-          let left = String.sub s 0 (1+String.index s left) in
-          print_indexop a path_prefix assign left right
-            (expression ctxt) [i] rest
-      | _ -> false
-    end
-  | _ -> false
-
-and expression ctxt f x =
-  if x.pexp_attributes <> [] then
-    pp f "((%a)@,%a)" (expression ctxt) {x with pexp_attributes=[]}
-      (attributes ctxt) x.pexp_attributes
-  else match x.pexp_desc with
-    | Pexp_function _ | Pexp_fun _ | Pexp_match _ | Pexp_try _ | Pexp_sequence _
-      when ctxt.pipe || ctxt.semi ->
-        paren true (expression reset_ctxt) f x
-    | Pexp_ifthenelse _ | Pexp_sequence _ when ctxt.ifthenelse ->
-        paren true (expression reset_ctxt) f x
-    | Pexp_let _ | Pexp_letmodule _ | Pexp_open _ | Pexp_letexception _
-        when ctxt.semi ->
-        paren true (expression reset_ctxt) f x
-    | Pexp_fun (l, e0, p, e) ->
-        pp f "@[<2>fun@;%a->@;%a@]"
-          (label_exp ctxt) (l, e0, p)
-          (expression ctxt) e
-    | Pexp_function l ->
-        pp f "@[<hv>function%a@]" (case_list ctxt) l
-    | Pexp_match (e, l) ->
-        pp f "@[<hv0>@[<hv0>@[<2>match %a@]@ with@]%a@]"
-          (expression reset_ctxt) e (case_list ctxt) l
-
-    | Pexp_try (e, l) ->
-        pp f "@[<0>@[<hv2>try@ %a@]@ @[<0>with%a@]@]"
-             (* "try@;@[<2>%a@]@\nwith@\n%a"*)
-          (expression reset_ctxt) e  (case_list ctxt) l
-    | Pexp_let (rf, l, e) ->
-        (* pp f "@[<2>let %a%a in@;<1 -2>%a@]"
-           (*no indentation here, a new line*) *)
-        (*   rec_flag rf *)
-        pp f "@[<2>%a in@;<1 -2>%a@]"
-          (bindings reset_ctxt) (rf,l)
-          (expression ctxt) e
-    | Pexp_apply (e, l) ->
-        begin if not (sugar_expr ctxt f x) then
-            match view_fixity_of_exp e with
-            | `Infix s ->
-                begin match l with
-                | [ (Nolabel, _) as arg1; (Nolabel, _) as arg2 ] ->
-                    (* FIXME associativity label_x_expression_param *)
-                    pp f "@[<2>%a@;%s@;%a@]"
-                      (label_x_expression_param reset_ctxt) arg1 s
-                      (label_x_expression_param ctxt) arg2
-                | _ ->
-                    pp f "@[<2>%a %a@]"
-                      (simple_expr ctxt) e
-                      (list (label_x_expression_param ctxt)) l
-                end
-            | `Prefix s ->
-                let s =
-                  if List.mem s ["~+";"~-";"~+.";"~-."] &&
-                   (match l with
-                    (* See #7200: avoid turning (~- 1) into (- 1) which is
-                       parsed as an int literal *)
-                    |[(_,{pexp_desc=Pexp_constant _})] -> false
-                    | _ -> true)
-                  then String.sub s 1 (String.length s -1)
-                  else s in
-                begin match l with
-                | [(Nolabel, x)] ->
-                  pp f "@[<2>%s@;%a@]" s (simple_expr ctxt) x
-                | _   ->
-                  pp f "@[<2>%a %a@]" (simple_expr ctxt) e
-                    (list (label_x_expression_param ctxt)) l
-                end
-            | _ ->
-                pp f "@[<hov2>%a@]" begin fun f (e,l) ->
-                  pp f "%a@ %a" (expression2 ctxt) e
-                    (list (label_x_expression_param reset_ctxt))  l
-                    (* reset here only because [function,match,try,sequence]
-                       are lower priority *)
-                end (e,l)
-        end
-
-    | Pexp_construct (li, Some eo)
-      when not (is_simple_construct (view_expr x))-> (* Not efficient FIXME*)
-        (match view_expr x with
-         | `cons ls -> list (simple_expr ctxt) f ls ~sep:"@;::@;"
-         | `normal ->
-             pp f "@[<2>%a@;%a@]" longident_loc li
-               (simple_expr ctxt) eo
-         | _ -> assert false)
-    | Pexp_setfield (e1, li, e2) ->
-        pp f "@[<2>%a.%a@ <-@ %a@]"
-          (simple_expr ctxt) e1 longident_loc li (simple_expr ctxt) e2
-    | Pexp_ifthenelse (e1, e2, eo) ->
-        (* @;@[<2>else@ %a@]@] *)
-        let fmt:(_,_,_)format ="@[<hv0>@[<2>if@ %a@]@;@[<2>then@ %a@]%a@]" in
-        let expression_under_ifthenelse = expression (under_ifthenelse ctxt) in
-        pp f fmt expression_under_ifthenelse e1 expression_under_ifthenelse e2
-          (fun f eo -> match eo with
-             | Some x ->
-                 pp f "@;@[<2>else@;%a@]" (expression (under_semi ctxt)) x
-             | None -> () (* pp f "()" *)) eo
-    | Pexp_sequence _ ->
-        let rec sequence_helper acc = function
-          | {pexp_desc=Pexp_sequence(e1,e2); pexp_attributes = []} ->
-              sequence_helper (e1::acc) e2
-          | v -> List.rev (v::acc) in
-        let lst = sequence_helper [] x in
-        pp f "@[<hv>%a@]"
-          (list (expression (under_semi ctxt)) ~sep:";@;") lst
-    | Pexp_new (li) ->
-        pp f "@[<hov2>new@ %a@]" longident_loc li;
-    | Pexp_setinstvar (s, e) ->
-        pp f "@[<hov2>%s@ <-@ %a@]" s.txt (expression ctxt) e
-    | Pexp_override l -> (* FIXME *)
-        let string_x_expression f (s, e) =
-          pp f "@[<hov2>%s@ =@ %a@]" s.txt (expression ctxt) e in
-        pp f "@[<hov2>{<%a>}@]"
-          (list string_x_expression  ~sep:";"  )  l;
-    | Pexp_letmodule (s, me, e) ->
-        pp f "@[<hov2>let@ module@ %s@ =@ %a@ in@ %a@]" s.txt
-          (module_expr reset_ctxt) me (expression ctxt) e
-    | Pexp_letexception (cd, e) ->
-        pp f "@[<hov2>let@ exception@ %a@ in@ %a@]"
-          (extension_constructor ctxt) cd
-          (expression ctxt) e
-    | Pexp_assert e ->
-        pp f "@[<hov2>assert@ %a@]" (simple_expr ctxt) e
-    | Pexp_lazy (e) ->
-        pp f "@[<hov2>lazy@ %a@]" (simple_expr ctxt) e
-    (* Pexp_poly: impossible but we should print it anyway, rather than
-       assert false *)
-    | Pexp_poly (e, None) ->
-        pp f "@[<hov2>!poly!@ %a@]" (simple_expr ctxt) e
-    | Pexp_poly (e, Some ct) ->
-        pp f "@[<hov2>(!poly!@ %a@ : %a)@]"
-          (simple_expr ctxt) e (core_type ctxt) ct
-    | Pexp_open (ovf, lid, e) ->
-        pp f "@[<2>let open%s %a in@;%a@]" (override ovf) longident_loc lid
-          (expression ctxt) e
-    | Pexp_variant (l,Some eo) ->
-        pp f "@[<2>`%s@;%a@]" l (simple_expr ctxt) eo
-    | Pexp_extension e -> extension ctxt f e
-    | Pexp_unreachable -> pp f "."
-    | _ -> expression1 ctxt f x
-
-and expression1 ctxt f x =
-  if x.pexp_attributes <> [] then expression ctxt f x
-  else match x.pexp_desc with
-    | Pexp_object cs -> pp f "%a" (class_structure ctxt) cs
-    | _ -> expression2 ctxt f x
-(* used in [Pexp_apply] *)
-
-and expression2 ctxt f x =
-  if x.pexp_attributes <> [] then expression ctxt f x
-  else match x.pexp_desc with
-    | Pexp_field (e, li) ->
-        pp f "@[<hov2>%a.%a@]" (simple_expr ctxt) e longident_loc li
-    | Pexp_send (e, s) -> pp f "@[<hov2>%a#%s@]" (simple_expr ctxt) e s.txt
-
-    | _ -> simple_expr ctxt f x
-
-and simple_expr ctxt f x =
-  if x.pexp_attributes <> [] then expression ctxt f x
-  else match x.pexp_desc with
-    | Pexp_construct _  when is_simple_construct (view_expr x) ->
-        (match view_expr x with
-         | `nil -> pp f "[]"
-         | `tuple -> pp f "()"
-         | `list xs ->
-             pp f "@[<hv0>[%a]@]"
-               (list (expression (under_semi ctxt)) ~sep:";@;") xs
-         | `simple x -> longident f x
-         | _ -> assert false)
-    | Pexp_ident li ->
-        longident_loc f li
-    (* (match view_fixity_of_exp x with *)
-    (* |`Normal -> longident_loc f li *)
-    (* | `Prefix _ | `Infix _ -> pp f "( %a )" longident_loc li) *)
-    | Pexp_constant c -> constant f c;
-    | Pexp_pack me ->
-        pp f "(module@;%a)" (module_expr ctxt) me
-    | Pexp_newtype (lid, e) ->
-        pp f "fun@;(type@;%s)@;->@;%a" lid.txt (expression ctxt) e
-    | Pexp_tuple l ->
-        pp f "@[<hov2>(%a)@]" (list (simple_expr ctxt) ~sep:",@;") l
-    | Pexp_constraint (e, ct) ->
-        pp f "(%a : %a)" (expression ctxt) e (core_type ctxt) ct
-    | Pexp_coerce (e, cto1, ct) ->
-        pp f "(%a%a :> %a)" (expression ctxt) e
-          (option (core_type ctxt) ~first:" : " ~last:" ") cto1 (* no sep hint*)
-          (core_type ctxt) ct
-    | Pexp_variant (l, None) -> pp f "`%s" l
-    | Pexp_record (l, eo) ->
-        let longident_x_expression f ( li, e) =
-          match e with
-          |  {pexp_desc=Pexp_ident {txt;_};
-              pexp_attributes=[]; _} when li.txt = txt ->
-              pp f "@[<hov2>%a@]" longident_loc li
-          | _ ->
-              pp f "@[<hov2>%a@;=@;%a@]" longident_loc li (simple_expr ctxt) e
-        in
-        pp f "@[<hv0>@[<hv2>{@;%a%a@]@;}@]"(* "@[<hov2>{%a%a}@]" *)
-          (option ~last:" with@;" (simple_expr ctxt)) eo
-          (list longident_x_expression ~sep:";@;") l
-    | Pexp_array (l) ->
-        pp f "@[<0>@[<2>[|%a|]@]@]"
-          (list (simple_expr (under_semi ctxt)) ~sep:";") l
-    | Pexp_while (e1, e2) ->
-        let fmt : (_,_,_) format = "@[<2>while@;%a@;do@;%a@;done@]" in
-        pp f fmt (expression ctxt) e1 (expression ctxt) e2
-    | Pexp_for (s, e1, e2, df, e3) ->
-        let fmt:(_,_,_)format =
-          "@[<hv0>@[<hv2>@[<2>for %a =@;%a@;%a%a@;do@]@;%a@]@;done@]" in
-        let expression = expression ctxt in
-        pp f fmt (pattern ctxt) s expression e1 direction_flag
-          df expression e2 expression e3
-    | _ ->  paren true (expression ctxt) f x
-
-and attributes ctxt f l =
-  List.iter (attribute ctxt f) l
-
-and item_attributes ctxt f l =
-  List.iter (item_attribute ctxt f) l
-
-and attribute ctxt f (s, e) =
-  pp f "@[<2>[@@%s@ %a]@]" s.txt (payload ctxt) e
-
-and item_attribute ctxt f (s, e) =
-  pp f "@[<2>[@@@@%s@ %a]@]" s.txt (payload ctxt) e
-
-and floating_attribute ctxt f (s, e) =
-  pp f "@[<2>[@@@@@@%s@ %a]@]" s.txt (payload ctxt) e
-
-and value_description ctxt f x =
-  (* note: value_description has an attribute field,
-           but they're already printed by the callers this method *)
-  pp f "@[<hov2>%a%a@]" (core_type ctxt) x.pval_type
-    (fun f x ->
-#ifndef RELEASE
-      match x.pval_prim with 
-      | first :: second :: _ 
-        when Ext_string.first_marshal_char second
-        -> 
-        pp f "@ =@ %a -- %a" 
-          constant_string first
-          Ext_obj.pp_any (Marshal.from_string second 0)
-      | [] -> ()
-      | _ -> 
-        pp f "@ =@ %a" (list constant_string) x.pval_prim
-      
-#else        
-       if x.pval_prim <> []
-       then pp f "@ =@ %a" (list constant_string) x.pval_prim
-#endif
-    ) x
-
-and extension ctxt f (s, e) =
-  pp f "@[<2>[%%%s@ %a]@]" s.txt (payload ctxt) e
-
-and item_extension ctxt f (s, e) =
-  pp f "@[<2>[%%%%%s@ %a]@]" s.txt (payload ctxt) e
-
-and exception_declaration ctxt f ext =
-  pp f "@[<hov2>exception@ %a@]" (extension_constructor ctxt) ext
-
-and class_signature ctxt f { pcsig_self = ct; pcsig_fields = l ;_} =
-  let class_type_field f x =
-    match x.pctf_desc with
-    | Pctf_inherit (ct) ->
-        pp f "@[<2>inherit@ %a@]%a" (class_type ctxt) ct
-          (item_attributes ctxt) x.pctf_attributes
-    | Pctf_val (s, mf, vf, ct) ->
-        pp f "@[<2>val @ %a%a%s@ :@ %a@]%a"
-          mutable_flag mf virtual_flag vf s.txt (core_type ctxt) ct
-          (item_attributes ctxt) x.pctf_attributes
-    | Pctf_method (s, pf, vf, ct) ->
-        pp f "@[<2>method %a %a%s :@;%a@]%a"
-          private_flag pf virtual_flag vf s.txt (core_type ctxt) ct
-          (item_attributes ctxt) x.pctf_attributes
-    | Pctf_constraint (ct1, ct2) ->
-        pp f "@[<2>constraint@ %a@ =@ %a@]%a"
-          (core_type ctxt) ct1 (core_type ctxt) ct2
-          (item_attributes ctxt) x.pctf_attributes
-    | Pctf_attribute a -> floating_attribute ctxt f a
-    | Pctf_extension e ->
-        item_extension ctxt f e;
-        item_attributes ctxt f x.pctf_attributes
-  in
-  pp f "@[<hv0>@[<hv2>object@[<1>%a@]@ %a@]@ end@]"
-    (fun f -> function
-         {ptyp_desc=Ptyp_any; ptyp_attributes=[]; _} -> ()
-       | ct -> pp f " (%a)" (core_type ctxt) ct) ct
-    (list class_type_field ~sep:"@;") l
-
-(* call [class_signature] called by [class_signature] *)
-and class_type ctxt f x =
-  match x.pcty_desc with
-  | Pcty_signature cs ->
-      class_signature ctxt f cs;
-      attributes ctxt f x.pcty_attributes
-  | Pcty_constr (li, l) ->
-      pp f "%a%a%a"
-        (fun f l -> match l with
-           | [] -> ()
-           | _  -> pp f "[%a]@ " (list (core_type ctxt) ~sep:"," ) l) l
-        longident_loc li
-        (attributes ctxt) x.pcty_attributes
-  | Pcty_arrow (l, co, cl) ->
-      pp f "@[<2>%a@;->@;%a@]" (* FIXME remove parens later *)
-        (type_with_label ctxt) (l,co)
-        (class_type ctxt) cl
-  | Pcty_extension e ->
-      extension ctxt f e;
-      attributes ctxt f x.pcty_attributes
-  | Pcty_open (ovf, lid, e) ->
-      pp f "@[<2>let open%s %a in@;%a@]" (override ovf) longident_loc lid
-        (class_type ctxt) e
-
-(* [class type a = object end] *)
-and class_type_declaration_list ctxt f l =
-  let class_type_declaration kwd f x =
-    let { pci_params=ls; pci_name={ txt; _ }; _ } = x in
-    pp f "@[<2>%s %a%a%s@ =@ %a@]%a" kwd
-      virtual_flag x.pci_virt
-      (class_params_def ctxt) ls txt
-      (class_type ctxt) x.pci_expr
-      (item_attributes ctxt) x.pci_attributes
-  in
-  match l with
-  | [] -> ()
-  | [x] -> class_type_declaration "class type" f x
-  | x :: xs ->
-      pp f "@[<v>%a@,%a@]"
-        (class_type_declaration "class type") x
-        (list ~sep:"@," (class_type_declaration "and")) xs
-
-and class_field ctxt f x =
-  match x.pcf_desc with
-  | Pcf_inherit () -> ()  
-  | Pcf_val (s, mf, Cfk_concrete (ovf, e)) ->
-      pp f "@[<2>val%s %a%s =@;%a@]%a" (override ovf)
-        mutable_flag mf s.txt
-        (expression ctxt) e
-        (item_attributes ctxt) x.pcf_attributes
-  | Pcf_method (s, pf, Cfk_virtual ct) ->
-      pp f "@[<2>method virtual %a %s :@;%a@]%a"
-        private_flag pf s.txt
-        (core_type ctxt) ct
-        (item_attributes ctxt) x.pcf_attributes
-  | Pcf_val (s, mf, Cfk_virtual ct) ->
-      pp f "@[<2>val virtual %a%s :@ %a@]%a"
-        mutable_flag mf s.txt
-        (core_type ctxt) ct
-        (item_attributes ctxt) x.pcf_attributes
-  | Pcf_method (s, pf, Cfk_concrete (ovf, e)) ->
-      let bind e =
-        binding ctxt f
-          {pvb_pat=
-             {ppat_desc=Ppat_var s;ppat_loc=Location.none;ppat_attributes=[]};
-           pvb_expr=e;
-           pvb_attributes=[];
-           pvb_loc=Location.none;
-          }
-      in
-      pp f "@[<2>method%s %a%a@]%a"
-        (override ovf)
-        private_flag pf
-        (fun f -> function
-           | {pexp_desc=Pexp_poly (e, Some ct); pexp_attributes=[]; _} ->
-               pp f "%s :@;%a=@;%a"
-                 s.txt (core_type ctxt) ct (expression ctxt) e
-           | {pexp_desc=Pexp_poly (e, None); pexp_attributes=[]; _} ->
-               bind e
-           | _ -> bind e) e
-        (item_attributes ctxt) x.pcf_attributes
-  | Pcf_constraint (ct1, ct2) ->
-      pp f "@[<2>constraint %a =@;%a@]%a"
-        (core_type ctxt) ct1
-        (core_type ctxt) ct2
-        (item_attributes ctxt) x.pcf_attributes
-  | Pcf_initializer (e) ->
-      pp f "@[<2>initializer@ %a@]%a"
-        (expression ctxt) e
-        (item_attributes ctxt) x.pcf_attributes
-  | Pcf_attribute a -> floating_attribute ctxt f a
-  | Pcf_extension e ->
-      item_extension ctxt f e;
-      item_attributes ctxt f x.pcf_attributes
-
-and class_structure ctxt f { pcstr_self = p; pcstr_fields =  l } =
-  pp f "@[<hv0>@[<hv2>object%a@;%a@]@;end@]"
-    (fun f p -> match p.ppat_desc with
-       | Ppat_any -> ()
-       | Ppat_constraint _ -> pp f " %a" (pattern ctxt) p
-       | _ -> pp f " (%a)" (pattern ctxt) p) p
-    (list (class_field ctxt)) l
-
-and module_type ctxt f x =
-  if x.pmty_attributes <> [] then begin
-    pp f "((%a)%a)" (module_type ctxt) {x with pmty_attributes=[]}
-      (attributes ctxt) x.pmty_attributes
-  end else
-    match x.pmty_desc with
-    | Pmty_ident li ->
-        pp f "%a" longident_loc li;
-    | Pmty_alias li ->
-        pp f "(module %a)" longident_loc li;
-    | Pmty_signature (s) ->
-        pp f "@[<hv0>@[<hv2>sig@ %a@]@ end@]" (* "@[<hov>sig@ %a@ end@]" *)
-          (list (signature_item ctxt)) s (* FIXME wrong indentation*)
-    | Pmty_functor (_, None, mt2) ->
-        pp f "@[<hov2>functor () ->@ %a@]" (module_type ctxt) mt2
-    | Pmty_functor (s, Some mt1, mt2) ->
-        if s.txt = "_" then
-          pp f "@[<hov2>%a@ ->@ %a@]"
-            (module_type ctxt) mt1 (module_type ctxt) mt2
-        else
-          pp f "@[<hov2>functor@ (%s@ :@ %a)@ ->@ %a@]" s.txt
-            (module_type ctxt) mt1 (module_type ctxt) mt2
-    | Pmty_with (mt, l) ->
-        let with_constraint f = function
-          | Pwith_type (li, ({ptype_params= ls ;_} as td)) ->
-              let ls = List.map fst ls in
-              pp f "type@ %a %a =@ %a"
-                (list (core_type ctxt) ~sep:"," ~first:"(" ~last:")")
-                ls longident_loc li (type_declaration ctxt) td
-          | Pwith_module (li, li2) ->
-              pp f "module %a =@ %a" longident_loc li longident_loc li2;
-          | Pwith_typesubst (li, ({ptype_params=ls;_} as td)) ->
-              let ls = List.map fst ls in
-              pp f "type@ %a %a :=@ %a"
-                (list (core_type ctxt) ~sep:"," ~first:"(" ~last:")")
-                ls longident_loc li
-                (type_declaration ctxt) td
-          | Pwith_modsubst (li, li2) ->
-             pp f "module %a :=@ %a" longident_loc li longident_loc li2 in
-        (match l with
-         | [] -> pp f "@[<hov2>%a@]" (module_type ctxt) mt
-         | _ -> pp f "@[<hov2>(%a@ with@ %a)@]"
-                  (module_type ctxt) mt (list with_constraint ~sep:"@ and@ ") l)
-    | Pmty_typeof me ->
-        pp f "@[<hov2>module@ type@ of@ %a@]" (module_expr ctxt) me
-    | Pmty_extension e -> extension ctxt f e
-
-and signature ctxt f x =  list ~sep:"@\n" (signature_item ctxt) f x
-
-and signature_item ctxt f x : unit =
-  match x.psig_desc with
-  | Psig_type (rf, l) ->
-      type_def_list ctxt f (rf, l)
-  | Psig_value vd ->
-      let intro = if vd.pval_prim = [] then "val" else "external" in
-      pp f "@[<2>%s@ %a@ :@ %a@]%a" intro
-        protect_ident vd.pval_name.txt
-        (value_description ctxt) vd
-        (item_attributes ctxt) vd.pval_attributes
-  | Psig_typext te ->
-      type_extension ctxt f te
-  | Psig_exception ed ->
-      exception_declaration ctxt f ed
-  | Psig_class () ->
-    ()
-  | Psig_module ({pmd_type={pmty_desc=Pmty_alias alias;
-                            pmty_attributes=[]; _};_} as pmd) ->
-      pp f "@[<hov>module@ %s@ =@ %a@]%a" pmd.pmd_name.txt
-        longident_loc alias
-        (item_attributes ctxt) pmd.pmd_attributes
-  | Psig_module pmd ->
-      pp f "@[<hov>module@ %s@ :@ %a@]%a"
-        pmd.pmd_name.txt
-        (module_type ctxt) pmd.pmd_type
-        (item_attributes ctxt) pmd.pmd_attributes
-  | Psig_open od ->
-      pp f "@[<hov2>open%s@ %a@]%a"
-        (override od.popen_override)
-        longident_loc od.popen_lid
-        (item_attributes ctxt) od.popen_attributes
-  | Psig_include incl ->
-      pp f "@[<hov2>include@ %a@]%a"
-        (module_type ctxt) incl.pincl_mod
-        (item_attributes ctxt) incl.pincl_attributes
-  | Psig_modtype {pmtd_name=s; pmtd_type=md; pmtd_attributes=attrs} ->
-      pp f "@[<hov2>module@ type@ %s%a@]%a"
-        s.txt
-        (fun f md -> match md with
-           | None -> ()
-           | Some mt ->
-               pp_print_space f () ;
-               pp f "@ =@ %a" (module_type ctxt) mt
-        ) md
-        (item_attributes ctxt) attrs
-  | Psig_class_type (l) -> class_type_declaration_list ctxt f l
-  | Psig_recmodule decls ->
-      let rec  string_x_module_type_list f ?(first=true) l =
-        match l with
-        | [] -> () ;
-        | pmd :: tl ->
-            if not first then
-              pp f "@ @[<hov2>and@ %s:@ %a@]%a" pmd.pmd_name.txt
-                (module_type ctxt) pmd.pmd_type
-                (item_attributes ctxt) pmd.pmd_attributes
-            else
-              pp f "@[<hov2>module@ rec@ %s:@ %a@]%a" pmd.pmd_name.txt
-                (module_type ctxt) pmd.pmd_type
-                (item_attributes ctxt) pmd.pmd_attributes;
-            string_x_module_type_list f ~first:false tl
-      in
-      string_x_module_type_list f decls
-  | Psig_attribute a -> floating_attribute ctxt f a
-  | Psig_extension(e, a) ->
-      item_extension ctxt f e;
-      item_attributes ctxt f a
-
-and module_expr ctxt f x =
-  if x.pmod_attributes <> [] then
-    pp f "((%a)%a)" (module_expr ctxt) {x with pmod_attributes=[]}
-      (attributes ctxt) x.pmod_attributes
-  else match x.pmod_desc with
-    | Pmod_structure (s) ->
-        pp f "@[<hv2>struct@;@[<0>%a@]@;<1 -2>end@]"
-          (list (structure_item ctxt) ~sep:"@\n") s;
-    | Pmod_constraint (me, mt) ->
-        pp f "@[<hov2>(%a@ :@ %a)@]"
-          (module_expr ctxt) me
-          (module_type ctxt) mt
-    | Pmod_ident (li) ->
-        pp f "%a" longident_loc li;
-    | Pmod_functor (_, None, me) ->
-        pp f "functor ()@;->@;%a" (module_expr ctxt) me
-    | Pmod_functor (s, Some mt, me) ->
-        pp f "functor@ (%s@ :@ %a)@;->@;%a"
-          s.txt (module_type ctxt) mt (module_expr ctxt) me
-    | Pmod_apply (me1, me2) ->
-        pp f "(%a)(%a)" (module_expr ctxt) me1 (module_expr ctxt) me2
-        (* Cf: #7200 *)
-    | Pmod_unpack e ->
-        pp f "(val@ %a)" (expression ctxt) e
-    | Pmod_extension e -> extension ctxt f e
-
-and structure ctxt f x = list ~sep:"@\n" (structure_item ctxt) f x
-
-and payload ctxt f = function
-  | PStr [{pstr_desc = Pstr_eval (e, attrs)}] ->
-      pp f "@[<2>%a@]%a"
-        (expression ctxt) e
-        (item_attributes ctxt) attrs
-  | PStr x -> structure ctxt f x
-  | PTyp x -> pp f ":"; core_type ctxt f x
-  | PSig x -> pp f ":"; signature ctxt f x
-  | PPat (x, None) -> pp f "?"; pattern ctxt f x
-  | PPat (x, Some e) ->
-      pp f "?"; pattern ctxt f x;
-      pp f " when "; expression ctxt f e
-
-(* transform [f = fun g h -> ..] to [f g h = ... ] could be improved *)
-and binding ctxt f {pvb_pat=p; pvb_expr=x; _} =
-  (* .pvb_attributes have already been printed by the caller, #bindings *)
-  let rec pp_print_pexp_function f x =
-    if x.pexp_attributes <> [] then pp f "=@;%a" (expression ctxt) x
-    else match x.pexp_desc with
-      | Pexp_fun (label, eo, p, e) ->
-          if label=Nolabel then
-            pp f "%a@ %a" (simple_pattern ctxt) p pp_print_pexp_function e
-          else
-            pp f "%a@ %a"
-              (label_exp ctxt) (label,eo,p) pp_print_pexp_function e
-      | Pexp_newtype (str,e) ->
-          pp f "(type@ %s)@ %a" str.txt pp_print_pexp_function e
-      | _ -> pp f "=@;%a" (expression ctxt) x
-  in
-  let tyvars_str tyvars = List.map (fun v -> v.txt) tyvars in
-  let is_desugared_gadt p e =
-    let gadt_pattern =
-      match p with
-      | {ppat_desc=Ppat_constraint({ppat_desc=Ppat_var _} as pat,
-                                   {ptyp_desc=Ptyp_poly (args_tyvars, rt)});
-         ppat_attributes=[]}->
-          Some (pat, args_tyvars, rt)
-      | _ -> None in
-    let rec gadt_exp tyvars e =
-      match e with
-      | {pexp_desc=Pexp_newtype (tyvar, e); pexp_attributes=[]} ->
-          gadt_exp (tyvar :: tyvars) e
-      | {pexp_desc=Pexp_constraint (e, ct); pexp_attributes=[]} ->
-          Some (List.rev tyvars, e, ct)
-      | _ -> None in
-    let gadt_exp = gadt_exp [] e in
-    match gadt_pattern, gadt_exp with
-    | Some (p, pt_tyvars, pt_ct), Some (e_tyvars, e, e_ct)
-      when tyvars_str pt_tyvars = tyvars_str e_tyvars ->
-      let ety = Typ.varify_constructors e_tyvars e_ct in
-      if ety = pt_ct then
-      Some (p, pt_tyvars, e_ct, e) else None
-    | _ -> None in
-  if x.pexp_attributes <> []
-  then pp f "%a@;=@;%a" (pattern ctxt) p (expression ctxt) x else
-  match is_desugared_gadt p x with
-  | Some (p, [], ct, e) ->
-      pp f "%a@;: %a@;=@;%a"
-        (simple_pattern ctxt) p (core_type ctxt) ct (expression ctxt) e
-  | Some (p, tyvars, ct, e) -> begin
-    pp f "%a@;: type@;%a.@;%a@;=@;%a"
-    (simple_pattern ctxt) p (list pp_print_string ~sep:"@;")
-    (tyvars_str tyvars) (core_type ctxt) ct (expression ctxt) e
-    end
-  | None -> begin
-      match p with
-      | {ppat_desc=Ppat_constraint(p ,ty);
-         ppat_attributes=[]} -> (* special case for the first*)
-          begin match ty with
-          | {ptyp_desc=Ptyp_poly _; ptyp_attributes=[]} ->
-              pp f "%a@;:@;%a@;=@;%a" (simple_pattern ctxt) p
-                (core_type ctxt) ty (expression ctxt) x
-          | _ ->
-              pp f "(%a@;:@;%a)@;=@;%a" (simple_pattern ctxt) p
-                (core_type ctxt) ty (expression ctxt) x
-          end
-      | {ppat_desc=Ppat_var _; ppat_attributes=[]} ->
-          pp f "%a@ %a" (simple_pattern ctxt) p pp_print_pexp_function x
-      | _ ->
-          pp f "%a@;=@;%a" (pattern ctxt) p (expression ctxt) x
-    end
-
-(* [in] is not printed *)
-and bindings ctxt f (rf,l) =
-  let binding kwd rf f x =
-    pp f "@[<2>%s %a%a@]%a" kwd rec_flag rf
-      (binding ctxt) x (item_attributes ctxt) x.pvb_attributes
-  in
-  match l with
-  | [] -> ()
-  | [x] -> binding "let" rf f x
-  | x::xs ->
-      pp f "@[<v>%a@,%a@]"
-        (binding "let" rf) x
-        (list ~sep:"@," (binding "and" Nonrecursive)) xs
-
-and structure_item ctxt f x =
-  match x.pstr_desc with
-  | Pstr_eval (e, attrs) ->
-      pp f "@[<hov2>;;%a@]%a"
-        (expression ctxt) e
-        (item_attributes ctxt) attrs
-  | Pstr_type (_, []) -> assert false
-  | Pstr_type (rf, l)  -> type_def_list ctxt f (rf, l)
-  | Pstr_value (rf, l) ->
-      (* pp f "@[<hov2>let %a%a@]"  rec_flag rf bindings l *)
-      pp f "@[<2>%a@]" (bindings ctxt) (rf,l)
-  | Pstr_typext te -> type_extension ctxt f te
-  | Pstr_exception ed -> exception_declaration ctxt f ed
-  | Pstr_module x ->
-      let rec module_helper = function
-        | {pmod_desc=Pmod_functor(s,mt,me'); pmod_attributes = []} ->
-            if mt = None then pp f "()"
-            else Misc.may (pp f "(%s:%a)" s.txt (module_type ctxt)) mt;
-            module_helper me'
-        | me -> me
-      in
-      pp f "@[<hov2>module %s%a@]%a"
-        x.pmb_name.txt
-        (fun f me ->
-           let me = module_helper me in
-           match me with
-           | {pmod_desc=
-                Pmod_constraint
-                  (me',
-                   ({pmty_desc=(Pmty_ident (_)
-                               | Pmty_signature (_));_} as mt));
-              pmod_attributes = []} ->
-               pp f " :@;%a@;=@;%a@;"
-                 (module_type ctxt) mt (module_expr ctxt) me'
-           | _ -> pp f " =@ %a" (module_expr ctxt) me
-        ) x.pmb_expr
-        (item_attributes ctxt) x.pmb_attributes
-  | Pstr_open od ->
-      pp f "@[<2>open%s@;%a@]%a"
-        (override od.popen_override)
-        longident_loc od.popen_lid
-        (item_attributes ctxt) od.popen_attributes
-  | Pstr_modtype {pmtd_name=s; pmtd_type=md; pmtd_attributes=attrs} ->
-      pp f "@[<hov2>module@ type@ %s%a@]%a"
-        s.txt
-        (fun f md -> match md with
-           | None -> ()
-           | Some mt ->
-               pp_print_space f () ;
-               pp f "@ =@ %a" (module_type ctxt) mt
-        ) md
-        (item_attributes ctxt) attrs
-  | Pstr_class () -> ()
-  | Pstr_class_type l -> class_type_declaration_list ctxt f l
-  | Pstr_primitive vd ->
-      pp f "@[<hov2>external@ %a@ :@ %a@]%a"
-        protect_ident vd.pval_name.txt
-        (value_description ctxt) vd
-        (item_attributes ctxt) vd.pval_attributes
-  | Pstr_include incl ->
-      pp f "@[<hov2>include@ %a@]%a"
-        (module_expr ctxt) incl.pincl_mod
-        (item_attributes ctxt) incl.pincl_attributes
-  | Pstr_recmodule decls -> (* 3.07 *)
-      let aux f = function
-        | ({pmb_expr={pmod_desc=Pmod_constraint (expr, typ)}} as pmb) ->
-            pp f "@[<hov2>@ and@ %s:%a@ =@ %a@]%a" pmb.pmb_name.txt
-              (module_type ctxt) typ
-              (module_expr ctxt) expr
-              (item_attributes ctxt) pmb.pmb_attributes
-        | _ -> assert false
-      in
-      begin match decls with
-      | ({pmb_expr={pmod_desc=Pmod_constraint (expr, typ)}} as pmb) :: l2 ->
-          pp f "@[<hv>@[<hov2>module@ rec@ %s:%a@ =@ %a@]%a@ %a@]"
-            pmb.pmb_name.txt
-            (module_type ctxt) typ
-            (module_expr ctxt) expr
-            (item_attributes ctxt) pmb.pmb_attributes
-            (fun f l2 -> List.iter (aux f) l2) l2
-      | _ -> assert false
-      end
-  | Pstr_attribute a -> floating_attribute ctxt f a
-  | Pstr_extension(e, a) ->
-      item_extension ctxt f e;
-      item_attributes ctxt f a
-
-and type_param ctxt f (ct, a) =
-  pp f "%s%a" (type_variance a) (core_type ctxt) ct
-
-and type_params ctxt f = function
-  | [] -> ()
-  | l -> pp f "%a " (list (type_param ctxt) ~first:"(" ~last:")" ~sep:",@;") l
-
-and type_def_list ctxt f (rf, l) =
-  let type_decl kwd rf f x =
-    let eq =
-      if (x.ptype_kind = Ptype_abstract)
-         && (x.ptype_manifest = None) then ""
-      else " ="
-    in
-    pp f "@[<2>%s %a%a%s%s%a@]%a" kwd
-      nonrec_flag rf
-      (type_params ctxt) x.ptype_params
-      x.ptype_name.txt eq
-      (type_declaration ctxt) x
-      (item_attributes ctxt) x.ptype_attributes
-  in
-  match l with
-  | [] -> assert false
-  | [x] -> type_decl "type" rf f x
-  | x :: xs -> pp f "@[<v>%a@,%a@]"
-                 (type_decl "type" rf) x
-                 (list ~sep:"@," (type_decl "and" Recursive)) xs
-
-and record_declaration ctxt f lbls =
-  let type_record_field f pld =
-    pp f "@[<2>%a%s:@;%a@;%a@]"
-      mutable_flag pld.pld_mutable
-      pld.pld_name.txt
-      (core_type ctxt) pld.pld_type
-      (attributes ctxt) pld.pld_attributes
-  in
-  pp f "{@\n%a}"
-    (list type_record_field ~sep:";@\n" )  lbls
-
-and type_declaration ctxt f x =
-  (* type_declaration has an attribute field,
-     but it's been printed by the caller of this method *)
-  let priv f =
-    match x.ptype_private with
-    | Public -> ()
-    | Private -> pp f "@;private"
-  in
-  let manifest f =
-    match x.ptype_manifest with
-    | None -> ()
-    | Some y ->
-        if x.ptype_kind = Ptype_abstract then
-          pp f "%t@;%a" priv (core_type ctxt) y
-        else
-          pp f "@;%a" (core_type ctxt) y
-  in
-  let constructor_declaration f pcd =
-    pp f "|@;";
-    constructor_declaration ctxt f
-      (pcd.pcd_name.txt, pcd.pcd_args, pcd.pcd_res, pcd.pcd_attributes)
-  in
-  let repr f =
-    let intro f =
-      if x.ptype_manifest = None then ()
-      else pp f "@;="
-    in
-    match x.ptype_kind with
-    | Ptype_variant xs ->
-        pp f "%t%t@\n%a" intro priv
-          (list ~sep:"@\n" constructor_declaration) xs
-    | Ptype_abstract -> ()
-    | Ptype_record l ->
-        pp f "%t%t@;%a" intro priv (record_declaration ctxt) l
-    | Ptype_open -> pp f "%t%t@;.." intro priv
-  in
-  let constraints f =
-    List.iter
-      (fun (ct1,ct2,_) ->
-         pp f "@[<hov2>@ constraint@ %a@ =@ %a@]"
-           (core_type ctxt) ct1 (core_type ctxt) ct2)
-      x.ptype_cstrs
-  in
-  pp f "%t%t%t" manifest repr constraints
-
-and type_extension ctxt f x =
-  let extension_constructor f x =
-    pp f "@\n|@;%a" (extension_constructor ctxt) x
-  in
-  pp f "@[<2>type %a%a += %a@ %a@]%a"
-    (fun f -> function
-       | [] -> ()
-       | l ->
-           pp f "%a@;" (list (type_param ctxt) ~first:"(" ~last:")" ~sep:",") l)
-    x.ptyext_params
-    longident_loc x.ptyext_path
-    private_flag x.ptyext_private (* Cf: #7200 *)
-    (list ~sep:"" extension_constructor)
-    x.ptyext_constructors
-    (item_attributes ctxt) x.ptyext_attributes
-
-and constructor_declaration ctxt f (name, args, res, attrs) =
-  let name =
-    match name with
-    | "::" -> "(::)"
-    | s -> s in
-  match res with
-  | None ->
-      pp f "%s%a@;%a" name
-        (fun f -> function
-           | Pcstr_tuple [] -> ()
-           | Pcstr_tuple l ->
-             pp f "@;of@;%a" (list (core_type1 ctxt) ~sep:"@;*@;") l
-           | Pcstr_record l -> pp f "@;of@;%a" (record_declaration ctxt) l
-        ) args
-        (attributes ctxt) attrs
-  | Some r ->
-      pp f "%s:@;%a@;%a" name
-        (fun f -> function
-           | Pcstr_tuple [] -> core_type1 ctxt f r
-           | Pcstr_tuple l -> pp f "%a@;->@;%a"
-                                (list (core_type1 ctxt) ~sep:"@;*@;") l
-                                (core_type1 ctxt) r
-           | Pcstr_record l ->
-               pp f "%a@;->@;%a" (record_declaration ctxt) l (core_type1 ctxt) r
-        )
-        args
-        (attributes ctxt) attrs
-
-and extension_constructor ctxt f x =
-  (* Cf: #7200 *)
-  match x.pext_kind with
-  | Pext_decl(l, r) ->
-      constructor_declaration ctxt f (x.pext_name.txt, l, r, x.pext_attributes)
-  | Pext_rebind li ->
-      pp f "%s%a@;=@;%a" x.pext_name.txt
-        (attributes ctxt) x.pext_attributes
-        longident_loc li
-
-and case_list ctxt f l : unit =
-  let aux f {pc_lhs; pc_guard; pc_rhs} =
-    pp f "@;| @[<2>%a%a@;->@;%a@]"
-      (pattern ctxt) pc_lhs (option (expression ctxt) ~first:"@;when@;")
-      pc_guard (expression (under_pipe ctxt)) pc_rhs
-  in
-  list aux f l ~sep:""
-
-and label_x_expression_param ctxt f (l,e) =
-  let simple_name = match e with
-    | {pexp_desc=Pexp_ident {txt=Lident l;_};
-       pexp_attributes=[]} -> Some l
-    | _ -> None
-  in match l with
-  | Nolabel  -> expression2 ctxt f e (* level 2*)
-  | Optional str ->
-      if Some str = simple_name then
-        pp f "?%s" str
-      else
-        pp f "?%s:%a" str (simple_expr ctxt) e
-  | Labelled lbl ->
-      if Some lbl = simple_name then
-        pp f "~%s" lbl
-      else
-        pp f "~%s:%a" lbl (simple_expr ctxt) e
-
-
-
-let expression f x =
-  pp f "@[%a@]" (expression reset_ctxt) x
-
-let string_of_expression x =
-  ignore (flush_str_formatter ()) ;
-  let f = str_formatter in
-  expression f x;
-  flush_str_formatter ()
-
-let string_of_structure x =
-  ignore (flush_str_formatter ());
-  let f = str_formatter in
-  structure reset_ctxt f x;
-  flush_str_formatter ()
-
-
-let core_type = core_type reset_ctxt
-let pattern = pattern reset_ctxt
-let signature = signature reset_ctxt
-let structure = structure reset_ctxt
diff --git a/jscomp/ml/predef.ml b/jscomp/ml/predef.ml
deleted file mode 100644
index fb45e34..0000000
--- a/jscomp/ml/predef.ml
+++ /dev/null
@@ -1,348 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Predefined type constructors (with special typing rules in typecore) *)
-
-open Path
-open Types
-open Btype
-
-let builtin_idents = ref []
-
-let wrap create s =
-  let id = create s in
-  builtin_idents := (s, id) :: !builtin_idents;
-  id
-
-let ident_create = wrap Ident.create
-let ident_create_predef_exn = wrap Ident.create_predef_exn
-
-let ident_int = ident_create "int"
-and ident_char = ident_create "char"
-and ident_bytes = ident_create "bytes"
-and ident_float = ident_create "float"
-and ident_bool = ident_create "bool"
-and ident_unit = ident_create "unit"
-and ident_exn = ident_create "exn"
-and ident_array = ident_create "array"
-and ident_list = ident_create "list"
-and ident_option = ident_create "option"
-and ident_result = ident_create "result"
-and ident_dict = ident_create "dict"
-
-and ident_int64 = ident_create "int64"
-and ident_bigint = ident_create "bigint"
-and ident_lazy_t = ident_create "lazy_t"
-and ident_string = ident_create "string"
-and ident_extension_constructor = ident_create "extension_constructor"
-and ident_floatarray = ident_create "floatarray"
-
-and ident_unknown = ident_create "unknown"
-
-and ident_promise = ident_create "promise"
-and ident_uncurried = ident_create "function$"
-
-type test =
-  | For_sure_yes
-  | For_sure_no 
-  | NA
-
-let type_is_builtin_path_but_option (p : Path.t) : test  =
-  match p with
-  | Pident {stamp} ->
-      if 
-        stamp >= ident_int.stamp
-        && stamp  <= ident_floatarray.stamp    
-      then    
-        if  (stamp = ident_option.stamp)
-         || (stamp = ident_unit.stamp) then 
-          For_sure_no
-        else For_sure_yes
-      else NA 
-  | _ -> NA
-
-let path_int = Pident ident_int
-and path_char = Pident ident_char
-and path_bytes = Pident ident_bytes
-and path_float = Pident ident_float
-and path_bool = Pident ident_bool
-and path_unit = Pident ident_unit
-and path_exn = Pident ident_exn
-and path_array = Pident ident_array
-and path_list = Pident ident_list
-and path_option = Pident ident_option
-and path_result = Pident ident_result
-and path_dict = Pident ident_dict
-
-
-and path_int64 = Pident ident_int64
-and path_bigint = Pident ident_bigint
-and path_lazy_t = Pident ident_lazy_t
-and path_string = Pident ident_string
-
-and path_unkonwn = Pident ident_unknown
-and path_extension_constructor = Pident ident_extension_constructor
-and path_floatarray = Pident ident_floatarray
-
-and path_promise = Pident ident_promise
-and path_uncurried = Pident ident_uncurried
-
-let type_int = newgenty (Tconstr(path_int, [], ref Mnil))
-and type_char = newgenty (Tconstr(path_char, [], ref Mnil))
-and type_bytes = newgenty (Tconstr(path_bytes, [], ref Mnil))
-and type_float = newgenty (Tconstr(path_float, [], ref Mnil))
-and type_bool = newgenty (Tconstr(path_bool, [], ref Mnil))
-and type_unit = newgenty (Tconstr(path_unit, [], ref Mnil))
-and type_exn = newgenty (Tconstr(path_exn, [], ref Mnil))
-and type_array t = newgenty (Tconstr(path_array, [t], ref Mnil))
-and type_list t = newgenty (Tconstr(path_list, [t], ref Mnil))
-and type_option t = newgenty (Tconstr(path_option, [t], ref Mnil))
-and type_result t1 t2 = newgenty (Tconstr(path_result, [t1; t2], ref Mnil))
-and type_dict t = newgenty (Tconstr(path_dict, [t], ref Mnil))
-
-and type_int64 = newgenty (Tconstr(path_int64, [], ref Mnil))
-and type_bigint = newgenty (Tconstr(path_bigint, [], ref Mnil))
-and type_lazy_t t = newgenty (Tconstr(path_lazy_t, [t], ref Mnil))
-and type_string = newgenty (Tconstr(path_string, [], ref Mnil))
-
-and type_unknown = newgenty (Tconstr(path_unkonwn, [], ref Mnil))
-and type_extension_constructor =
-      newgenty (Tconstr(path_extension_constructor, [], ref Mnil))
-and type_floatarray = newgenty (Tconstr(path_floatarray, [], ref Mnil))
-
-let ident_match_failure = ident_create_predef_exn "Match_failure"
-
-and ident_invalid_argument = ident_create_predef_exn "Invalid_argument"
-and ident_failure = ident_create_predef_exn "Failure"
-and ident_ok = ident_create_predef_exn "Ok"
-and ident_error = ident_create_predef_exn "Error"
-
-and ident_js_error = ident_create_predef_exn "JsError"
-and ident_not_found = ident_create_predef_exn "Not_found"
-
-and ident_end_of_file = ident_create_predef_exn "End_of_file"
-and ident_division_by_zero = ident_create_predef_exn "Division_by_zero"
-
-
-and ident_assert_failure = ident_create_predef_exn "Assert_failure"
-and ident_undefined_recursive_module =
-        ident_create_predef_exn "Undefined_recursive_module"
-
-let all_predef_exns = [
-  ident_match_failure;
-  ident_invalid_argument;
-  ident_failure;
-  ident_js_error;
-  ident_not_found;
-  ident_end_of_file;
-  ident_division_by_zero;
-  ident_assert_failure;
-  ident_undefined_recursive_module;
-]
-
-let path_match_failure = Pident ident_match_failure
-and path_assert_failure = Pident ident_assert_failure
-and path_undefined_recursive_module = Pident ident_undefined_recursive_module
-
-let decl_abstr =
-  {type_params = [];
-   type_arity = 0;
-   type_kind = Type_abstract;
-   type_loc = Location.none;
-   type_private = Asttypes.Public;
-   type_manifest = None;
-   type_variance = [];
-   type_newtype_level = None;
-   type_attributes = [];
-   type_immediate = false;
-   type_unboxed = unboxed_false_default_false;
-  }
-
-let decl_abstr_imm = {decl_abstr with type_immediate = true}
-
-let cstr id args =
-  {
-    cd_id = id;
-    cd_args = Cstr_tuple args;
-    cd_res = None;
-    cd_loc = Location.none;
-    cd_attributes = [];
-  }
-
-let ident_false = ident_create "false"
-and ident_true = ident_create "true"
-and ident_void = ident_create "()"
-and ident_nil = ident_create "[]"
-and ident_cons = ident_create "::"
-and ident_none = ident_create "None"
-and ident_some = ident_create "Some"
-and ident_ctor_unknown = ident_create "Unknown"
-and ident_ctor_uncurried = ident_create "Function$"
-
-let common_initial_env add_type add_extension empty_env =
-  let decl_bool =
-    {decl_abstr with
-     type_kind = Type_variant([cstr ident_false []; cstr ident_true []]);
-     type_immediate = true}
-  and decl_unit =
-    {decl_abstr with
-     type_kind = Type_variant([cstr ident_void []]);
-     type_immediate = true}
-  and decl_exn =
-    {decl_abstr with
-     type_kind = Type_open}
-  and decl_array =
-    let tvar = newgenvar() in
-    {decl_abstr with
-     type_params = [tvar];
-     type_arity = 1;
-     type_variance = [Variance.full]}
-  and decl_list =
-    let tvar = newgenvar() in
-    {decl_abstr with
-     type_params = [tvar];
-     type_arity = 1;
-     type_kind =
-     Type_variant([cstr ident_nil []; cstr ident_cons [tvar; type_list tvar]]);
-     type_variance = [Variance.covariant]}
-  and decl_option =
-    let tvar = newgenvar() in
-    {decl_abstr with
-     type_params = [tvar];
-     type_arity = 1;
-     type_kind = Type_variant([cstr ident_none []; cstr ident_some [tvar]]);
-     type_variance = [Variance.covariant]}
-  and decl_result =
-    let tvar1, tvar2 = newgenvar(), newgenvar() in
-    {decl_abstr with
-     type_params = [tvar1; tvar2];
-     type_arity = 2;
-     type_kind =
-     Type_variant([cstr ident_ok [tvar1];
-                   cstr ident_error [tvar2]]);
-     type_variance = [Variance.covariant; Variance.covariant]}
-  and decl_dict =
-    let tvar = newgenvar() in
-    {decl_abstr with
-      type_params = [tvar];
-      type_arity = 1;
-      type_variance = [Variance.full]}
-  and decl_uncurried =
-    let tvar1, tvar2 = newgenvar(), newgenvar() in
-    {decl_abstr with
-     type_params = [tvar1; tvar2];
-     type_arity = 2;
-     type_kind = Type_variant([cstr ident_ctor_uncurried [tvar1]]);
-     type_variance = [Variance.covariant; Variance.covariant];
-     type_unboxed = Types.unboxed_true_default_false;
-     }
-  and decl_unknown = 
-    let tvar = newgenvar () in 
-    {decl_abstr with 
-      type_params = [];
-      type_arity = 0;
-      type_kind = Type_variant ([ {
-        cd_id = ident_ctor_unknown;
-        cd_args = Cstr_tuple [tvar]; 
-        cd_res = Some type_unknown; 
-        cd_loc = Location.none;
-        cd_attributes = []
-      }]);
-      type_unboxed = Types.unboxed_true_default_false
-    }   
-  and decl_lazy_t =
-    let tvar = newgenvar() in
-    {decl_abstr with
-     type_params = [tvar];
-     type_arity = 1;
-     type_variance = [Variance.covariant]}
-  and decl_promise =
-    let tvar = newgenvar() in
-    {decl_abstr with
-     type_params = [tvar];
-     type_arity = 1;
-     type_variance = [Variance.covariant]}
-  in
-
-  let add_extension id l =
-    add_extension id
-      { ext_type_path = path_exn;
-        ext_type_params = [];
-        ext_args = Cstr_tuple l;
-        ext_ret_type = None;
-        ext_private = Asttypes.Public;
-        ext_loc = Location.none;
-        ext_attributes = [{Asttypes.txt="ocaml.warn_on_literal_pattern";
-                           loc=Location.none},
-                          Parsetree.PStr[]] }
-  in
-  add_extension ident_match_failure
-                         [newgenty (Ttuple[type_string; type_int; type_int])] (
-  add_extension ident_invalid_argument [type_string] (
-  add_extension ident_js_error [type_unknown] (
-  add_extension ident_failure [type_string] (
-  add_extension ident_not_found [] (
-  add_extension ident_end_of_file [] (
-  add_extension ident_division_by_zero [] (
-  add_extension ident_assert_failure
-                         [newgenty (Ttuple[type_string; type_int; type_int])] (
-  add_extension ident_undefined_recursive_module
-                         [newgenty (Ttuple[type_string; type_int; type_int])] (
-  add_type ident_int64 decl_abstr (
-  add_type ident_bigint decl_abstr (
-
-  add_type ident_lazy_t decl_lazy_t (
-  add_type ident_option decl_option (
-  add_type ident_result decl_result (
-  add_type ident_dict decl_dict (
-  add_type ident_list decl_list (
-  add_type ident_array decl_array (
-  add_type ident_exn decl_exn (
-  add_type ident_unit decl_unit (
-  add_type ident_bool decl_bool (
-  add_type ident_float decl_abstr (
-  add_type ident_unknown decl_unknown (  
-  add_type ident_uncurried decl_uncurried (  
-  add_type ident_string decl_abstr (
-  add_type ident_int decl_abstr_imm (
-  add_type ident_extension_constructor decl_abstr (
-  add_type ident_floatarray decl_abstr (
-    add_type ident_promise decl_promise (
-      empty_env))))))))))))))))))))))))))))
-
-let build_initial_env add_type add_exception empty_env =
-  let common = common_initial_env add_type add_exception empty_env in
-  let res = add_type ident_bytes decl_abstr common in 
-  let decl_type_char = 
-        {decl_abstr with 
-        type_manifest = Some type_int; 
-        type_private = Private} in 
-    add_type ident_char decl_type_char res 
-  
-  
-let builtin_values =
-  List.map (fun id -> Ident.make_global id; (Ident.name id, id))
-      [ident_match_failure; 
-       ident_invalid_argument;
-       ident_failure; ident_js_error; ident_not_found;  ident_end_of_file;
-       ident_division_by_zero; 
-       ident_assert_failure; ident_undefined_recursive_module ]
-
-(* Start non-predef identifiers at 1000.  This way, more predefs can
-   be defined in this file (above!) without breaking .cmi
-   compatibility. *)
-
-let _ = Ident.set_current_time 999
-let builtin_idents = List.rev !builtin_idents
diff --git a/jscomp/ml/predef.mli b/jscomp/ml/predef.mli
deleted file mode 100644
index a8049b5..0000000
--- a/jscomp/ml/predef.mli
+++ /dev/null
@@ -1,93 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Predefined type constructors (with special typing rules in typecore) *)
-
-open Types
-
-val type_int: type_expr
-val type_char: type_expr
-val type_string: type_expr
-val type_bytes: type_expr
-val type_float: type_expr
-val type_bool: type_expr
-val type_unit: type_expr
-val type_exn: type_expr
-val type_array: type_expr -> type_expr
-val type_list: type_expr -> type_expr
-val type_option: type_expr -> type_expr
-val type_result: type_expr -> type_expr -> type_expr
-val type_dict: type_expr -> type_expr
-
-val type_int64: type_expr
-val type_bigint: type_expr
-val type_lazy_t: type_expr -> type_expr
-val type_extension_constructor:type_expr
-val type_floatarray:type_expr
-
-val path_int: Path.t
-val path_char: Path.t
-val path_string: Path.t
-val path_bytes: Path.t
-val path_float: Path.t
-val path_bool: Path.t
-val path_unit: Path.t
-val path_exn: Path.t
-val path_array: Path.t
-val path_list: Path.t
-val path_option: Path.t
-val path_result: Path.t
-val path_dict: Path.t
-
-val path_int64: Path.t
-val path_bigint: Path.t
-val path_lazy_t: Path.t
-val path_extension_constructor: Path.t
-val path_floatarray: Path.t
-val path_promise: Path.t
-val path_uncurried: Path.t
-
-val path_match_failure: Path.t
-val path_assert_failure : Path.t
-val path_undefined_recursive_module : Path.t
-
-(* To build the initial environment. Since there is a nasty mutual
-   recursion between predef and env, we break it by parameterizing
-   over Env.t, Env.add_type and Env.add_extension. *)
-
-val build_initial_env:
-  (Ident.t -> type_declaration -> 'a -> 'a) ->
-  (Ident.t -> extension_constructor -> 'a -> 'a) ->
-  'a -> 'a 
-
-(* To initialize linker tables *)
-
-val builtin_values: (string * Ident.t) list
-val builtin_idents: (string * Ident.t) list
-
-(** All predefined exceptions, exposed as [Ident.t] for flambda (for
-    building value approximations).
-    The [Ident.t] for division by zero is also exported explicitly
-    so flambda can generate code to raise it. *)
-val ident_division_by_zero: Ident.t
-val all_predef_exns : Ident.t list
-
-type test =
-  | For_sure_yes
-  | For_sure_no 
-  | NA
-
-val type_is_builtin_path_but_option : 
-  Path.t -> test 
diff --git a/jscomp/ml/primitive.ml b/jscomp/ml/primitive.ml
deleted file mode 100644
index 0fff0cc..0000000
--- a/jscomp/ml/primitive.ml
+++ /dev/null
@@ -1,100 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Description of primitive functions *)
-
-open Misc
-open Parsetree
-
-type boxed_integer = Pbigint | Pint32 | Pint64
-
-type native_repr =
-  | Same_as_ocaml_repr
-
-type description =
-  { prim_name: string;         (* Name of primitive  or C function *)
-    prim_arity: int;           (* Number of arguments *)
-    prim_alloc: bool;          (* Does it allocates or raise? *)
-    prim_native_name: string;  (* Name of C function for the nat. code gen. *)
-    prim_native_repr_args: native_repr list;
-    prim_native_repr_res: native_repr }
-
-let coerce : (description -> description -> bool) ref = 
-  ref (fun 
-        (p1 : description) (p2 : description) ->
-        p1 = p2
-      )
-
-
-
-let rec make_native_repr_args arity x =
-  if arity = 0 then
-    []
-  else
-    x :: make_native_repr_args (arity - 1) x
-
-let simple ~name ~arity ~alloc =
-  {prim_name = name;
-   prim_arity = arity;
-   prim_alloc = alloc;
-   prim_native_name = "";
-   prim_native_repr_args = make_native_repr_args arity Same_as_ocaml_repr;
-   prim_native_repr_res = Same_as_ocaml_repr}
-
-let make ~name ~alloc ~native_name ~native_repr_args ~native_repr_res =
-  {prim_name = name;
-   prim_arity = List.length native_repr_args;
-   prim_alloc = alloc;
-   prim_native_name = native_name;
-   prim_native_repr_args = native_repr_args;
-   prim_native_repr_res = native_repr_res}
-
-let parse_declaration valdecl ~native_repr_args ~native_repr_res =
-  let arity = List.length native_repr_args in
-  let name, native_name =
-    match valdecl.pval_prim with
-    | name :: name2 :: _ -> (name, name2)
-    | name :: _ -> (name, "")
-    | [] ->
-        fatal_error "Primitive.parse_declaration"
-  in
-  {prim_name = name;
-   prim_arity = arity;
-   prim_alloc = true;
-   prim_native_name = native_name;
-   prim_native_repr_args = native_repr_args;
-   prim_native_repr_res = native_repr_res}
-
-open Outcometree
-
-let print p osig_val_decl =
-  let prims =
-    if p.prim_native_name <> "" then
-      [p.prim_name; p.prim_native_name]
-    else
-      [p.prim_name]
-  in
-  { osig_val_decl with
-    oval_prims = prims;
-    oval_attributes = [] }
-
-let native_name p =
-  if p.prim_native_name <> ""
-  then p.prim_native_name
-  else p.prim_name
-
-let byte_name p =
-  p.prim_name
-
diff --git a/jscomp/ml/primitive.mli b/jscomp/ml/primitive.mli
deleted file mode 100644
index c364c4c..0000000
--- a/jscomp/ml/primitive.mli
+++ /dev/null
@@ -1,65 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Description of primitive functions *)
-
-type boxed_integer = Pbigint | Pint32 | Pint64
-
-(* Representation of arguments/result for the native code version
-   of a primitive *)
-type native_repr =
-  | Same_as_ocaml_repr
-
-type description = private
-  { prim_name: string;         (* Name of primitive  or C function *)
-    prim_arity: int;           (* Number of arguments *)
-    prim_alloc: bool;          (* Does it allocates or raise? *)
-    prim_native_name: string;  (* Name of C function for the nat. code gen. *)
-    prim_native_repr_args: native_repr list;
-    prim_native_repr_res: native_repr }
-
-(* Invariant [List.length d.prim_native_repr_args = d.prim_arity] *)
-
-val simple
-  :  name:string
-  -> arity:int
-  -> alloc:bool
-  -> description
-
-val make
-  :  name:string
-  -> alloc:bool
-  -> native_name:string
-  -> native_repr_args: native_repr list
-  -> native_repr_res: native_repr
-  -> description
-
-val parse_declaration
-  :  Parsetree.value_description
-  -> native_repr_args:native_repr list
-  -> native_repr_res:native_repr
-  -> description
-
-val print
-  :  description
-  -> Outcometree.out_val_decl
-  -> Outcometree.out_val_decl
-
-val native_name: description -> string
-val byte_name: description -> string
-
-
-val coerce : 
-  (description -> description -> bool ) ref
diff --git a/jscomp/ml/printast.ml b/jscomp/ml/printast.ml
deleted file mode 100644
index eee7a90..0000000
--- a/jscomp/ml/printast.ml
+++ /dev/null
@@ -1,840 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*              Damien Doligez, projet Para, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1999 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Asttypes;;
-open Format;;
-open Lexing;;
-open Location;;
-open Parsetree;;
-
-let fmt_position with_name f l =
-  let fname = if with_name then l.pos_fname else "" in
-  if l.pos_lnum = -1
-  then fprintf f "%s[%d]" fname l.pos_cnum
-  else fprintf f "%s[%d,%d+%d]" fname l.pos_lnum l.pos_bol
-               (l.pos_cnum - l.pos_bol)
-;;
-
-let fmt_location f loc =
-  if !Clflags.dump_location then (
-  let p_2nd_name = loc.loc_start.pos_fname <> loc.loc_end.pos_fname in
-  fprintf f "(%a..%a)" (fmt_position true) loc.loc_start
-                       (fmt_position p_2nd_name) loc.loc_end;
-  if loc.loc_ghost then fprintf f " ghost";
-  )
-;;
-
-let rec fmt_longident_aux f x =
-  match x with
-  | Longident.Lident (s) -> fprintf f "%s" s;
-  | Longident.Ldot (y, s) -> fprintf f "%a.%s" fmt_longident_aux y s;
-  | Longident.Lapply (y, z) ->
-      fprintf f "%a(%a)" fmt_longident_aux y fmt_longident_aux z;
-;;
-
-
-let fmt_longident_loc f (x : Longident.t loc) =
-  fprintf f "\"%a\" %a" fmt_longident_aux x.txt fmt_location x.loc;
-;;
-
-let fmt_string_loc f (x : string loc) =
-  fprintf f "\"%s\" %a" x.txt fmt_location x.loc;
-;;
-
-let fmt_char_option f = function
-  | None -> fprintf f "None"
-  | Some c -> fprintf f "Some %c" c
-
-let fmt_constant f x =
-  match x with
-  | Pconst_integer (i,m) -> fprintf f "PConst_int (%s,%a)" i fmt_char_option m;
-  | Pconst_char (c) -> fprintf f "PConst_char %02x" c;
-  | Pconst_string (s, None) -> fprintf f "PConst_string(%S,None)" s;
-  | Pconst_string (s, Some delim) ->
-      fprintf f "PConst_string (%S,Some %S)" s delim;
-  | Pconst_float (s,m) -> fprintf f "PConst_float (%s,%a)" s fmt_char_option m;
-;;
-
-let fmt_mutable_flag f x =
-  match x with
-  | Immutable -> fprintf f "Immutable";
-  | Mutable -> fprintf f "Mutable";
-;;
-
-let fmt_virtual_flag f x =
-  match x with
-  | Virtual -> fprintf f "Virtual";
-  | Concrete -> fprintf f "Concrete";
-;;
-
-let fmt_override_flag f x =
-  match x with
-  | Override -> fprintf f "Override";
-  | Fresh -> fprintf f "Fresh";
-;;
-
-let fmt_closed_flag f x =
-  match x with
-  | Closed -> fprintf f "Closed"
-  | Open -> fprintf f "Open"
-
-let fmt_rec_flag f x =
-  match x with
-  | Nonrecursive -> fprintf f "Nonrec";
-  | Recursive -> fprintf f "Rec";
-;;
-
-let fmt_direction_flag f x =
-  match x with
-  | Upto -> fprintf f "Up";
-  | Downto -> fprintf f "Down";
-;;
-
-let fmt_private_flag f x =
-  match x with
-  | Public -> fprintf f "Public";
-  | Private -> fprintf f "Private";
-;;
-
-let line i f s (*...*) =
-  fprintf f "%s" (String.make ((2*i) mod 72) ' ');
-  fprintf f s (*...*)
-;;
-
-let list i f ppf l =
-  match l with
-  | [] -> line i ppf "[]\n";
-  | _ :: _ ->
-     line i ppf "[\n";
-     List.iter (f (i+1) ppf) l;
-     line i ppf "]\n";
-;;
-
-let option i f ppf x =
-  match x with
-  | None -> line i ppf "None\n";
-  | Some x ->
-      line i ppf "Some\n";
-      f (i+1) ppf x;
-;;
-
-let longident_loc i ppf li = line i ppf "%a\n" fmt_longident_loc li;;
-let string i ppf s = line i ppf "\"%s\"\n" s;;
-let string_loc i ppf s = line i ppf "%a\n" fmt_string_loc s;;
-let arg_label i ppf = function
-  | Nolabel -> line i ppf "Nolabel\n"
-  | Optional s -> line i ppf "Optional \"%s\"\n" s
-  | Labelled s -> line i ppf "Labelled \"%s\"\n" s
-;;
-
-let rec core_type i ppf x =
-  line i ppf "core_type %a\n" fmt_location x.ptyp_loc;
-  attributes i ppf x.ptyp_attributes;
-  let i = i+1 in
-  match x.ptyp_desc with
-  | Ptyp_any -> line i ppf "Ptyp_any\n";
-  | Ptyp_var (s) -> line i ppf "Ptyp_var %s\n" s;
-  | Ptyp_arrow (l, ct1, ct2) ->
-      line i ppf "Ptyp_arrow\n";
-      arg_label i ppf l;
-      core_type i ppf ct1;
-      core_type i ppf ct2;
-  | Ptyp_tuple l ->
-      line i ppf "Ptyp_tuple\n";
-      list i core_type ppf l;
-  | Ptyp_constr (li, l) ->
-      line i ppf "Ptyp_constr %a\n" fmt_longident_loc li;
-      list i core_type ppf l;
-  | Ptyp_variant (l, closed, low) ->
-      line i ppf "Ptyp_variant closed=%a\n" fmt_closed_flag closed;
-      list i label_x_bool_x_core_type_list ppf l;
-      option i (fun i -> list i string) ppf low
-  | Ptyp_object (l, c) ->
-      line i ppf "Ptyp_object %a\n" fmt_closed_flag c;
-      let i = i + 1 in
-      List.iter (
-        function
-          | Otag (l, attrs, t) ->
-            line i ppf "method %s\n" l.txt;
-            attributes i ppf attrs;
-            core_type (i + 1) ppf t
-          | Oinherit ct ->
-              line i ppf "Oinherit\n";
-              core_type (i + 1) ppf ct
-      ) l
-  | Ptyp_class (li, l) ->
-      line i ppf "Ptyp_class %a\n" fmt_longident_loc li;
-      list i core_type ppf l
-  | Ptyp_alias (ct, s) ->
-      line i ppf "Ptyp_alias \"%s\"\n" s;
-      core_type i ppf ct;
-  | Ptyp_poly (sl, ct) ->
-      line i ppf "Ptyp_poly%a\n"
-        (fun ppf -> List.iter (fun x -> fprintf ppf " '%s" x.txt)) sl;
-      core_type i ppf ct;
-  | Ptyp_package (s, l) ->
-      line i ppf "Ptyp_package %a\n" fmt_longident_loc s;
-      list i package_with ppf l;
-  | Ptyp_extension (s, arg) ->
-      line i ppf "Ptyp_extension \"%s\"\n" s.txt;
-      payload i ppf arg
-
-and package_with i ppf (s, t) =
-  line i ppf "with type %a\n" fmt_longident_loc s;
-  core_type i ppf t
-
-and pattern i ppf x =
-  line i ppf "pattern %a\n" fmt_location x.ppat_loc;
-  attributes i ppf x.ppat_attributes;
-  let i = i+1 in
-  match x.ppat_desc with
-  | Ppat_any -> line i ppf "Ppat_any\n";
-  | Ppat_var (s) -> line i ppf "Ppat_var %a\n" fmt_string_loc s;
-  | Ppat_alias (p, s) ->
-      line i ppf "Ppat_alias %a\n" fmt_string_loc s;
-      pattern i ppf p;
-  | Ppat_constant (c) -> line i ppf "Ppat_constant %a\n" fmt_constant c;
-  | Ppat_interval (c1, c2) ->
-      line i ppf "Ppat_interval %a..%a\n" fmt_constant c1 fmt_constant c2;
-  | Ppat_tuple (l) ->
-      line i ppf "Ppat_tuple\n";
-      list i pattern ppf l;
-  | Ppat_construct (li, po) ->
-      line i ppf "Ppat_construct %a\n" fmt_longident_loc li;
-      option i pattern ppf po;
-  | Ppat_variant (l, po) ->
-      line i ppf "Ppat_variant \"%s\"\n" l;
-      option i pattern ppf po;
-  | Ppat_record (l, c) ->
-      line i ppf "Ppat_record %a\n" fmt_closed_flag c;
-      list i longident_x_pattern ppf l;
-  | Ppat_array (l) ->
-      line i ppf "Ppat_array\n";
-      list i pattern ppf l;
-  | Ppat_or (p1, p2) ->
-      line i ppf "Ppat_or\n";
-      pattern i ppf p1;
-      pattern i ppf p2;
-  | Ppat_lazy p ->
-      line i ppf "Ppat_lazy\n";
-      pattern i ppf p;
-  | Ppat_constraint (p, ct) ->
-      line i ppf "Ppat_constraint\n";
-      pattern i ppf p;
-      core_type i ppf ct;
-  | Ppat_type (li) ->
-      line i ppf "Ppat_type\n";
-      longident_loc i ppf li
-  | Ppat_unpack s ->
-      line i ppf "Ppat_unpack %a\n" fmt_string_loc s;
-  | Ppat_exception p ->
-      line i ppf "Ppat_exception\n";
-      pattern i ppf p
-  | Ppat_open (m,p) ->
-      line i ppf "Ppat_open \"%a\"\n" fmt_longident_loc m;
-      pattern i ppf p
-  | Ppat_extension (s, arg) ->
-      line i ppf "Ppat_extension \"%s\"\n" s.txt;
-      payload i ppf arg
-
-and expression i ppf x =
-  line i ppf "expression %a\n" fmt_location x.pexp_loc;
-  attributes i ppf x.pexp_attributes;
-  let i = i+1 in
-  match x.pexp_desc with
-  | Pexp_ident (li) -> line i ppf "Pexp_ident %a\n" fmt_longident_loc li;
-  | Pexp_constant (c) -> line i ppf "Pexp_constant %a\n" fmt_constant c;
-  | Pexp_let (rf, l, e) ->
-      line i ppf "Pexp_let %a\n" fmt_rec_flag rf;
-      list i value_binding ppf l;
-      expression i ppf e;
-  | Pexp_function l ->
-      line i ppf "Pexp_function\n";
-      list i case ppf l;
-  | Pexp_fun (l, eo, p, e) ->
-      line i ppf "Pexp_fun\n";
-      arg_label i ppf l;
-      option i expression ppf eo;
-      pattern i ppf p;
-      expression i ppf e;
-  | Pexp_apply (e, l) ->
-      line i ppf "Pexp_apply\n";
-      expression i ppf e;
-      list i label_x_expression ppf l;
-  | Pexp_match (e, l) ->
-      line i ppf "Pexp_match\n";
-      expression i ppf e;
-      list i case ppf l;
-  | Pexp_try (e, l) ->
-      line i ppf "Pexp_try\n";
-      expression i ppf e;
-      list i case ppf l;
-  | Pexp_tuple (l) ->
-      line i ppf "Pexp_tuple\n";
-      list i expression ppf l;
-  | Pexp_construct (li, eo) ->
-      line i ppf "Pexp_construct %a\n" fmt_longident_loc li;
-      option i expression ppf eo;
-  | Pexp_variant (l, eo) ->
-      line i ppf "Pexp_variant \"%s\"\n" l;
-      option i expression ppf eo;
-  | Pexp_record (l, eo) ->
-      line i ppf "Pexp_record\n";
-      list i longident_x_expression ppf l;
-      option i expression ppf eo;
-  | Pexp_field (e, li) ->
-      line i ppf "Pexp_field\n";
-      expression i ppf e;
-      longident_loc i ppf li;
-  | Pexp_setfield (e1, li, e2) ->
-      line i ppf "Pexp_setfield\n";
-      expression i ppf e1;
-      longident_loc i ppf li;
-      expression i ppf e2;
-  | Pexp_array (l) ->
-      line i ppf "Pexp_array\n";
-      list i expression ppf l;
-  | Pexp_ifthenelse (e1, e2, eo) ->
-      line i ppf "Pexp_ifthenelse\n";
-      expression i ppf e1;
-      expression i ppf e2;
-      option i expression ppf eo;
-  | Pexp_sequence (e1, e2) ->
-      line i ppf "Pexp_sequence\n";
-      expression i ppf e1;
-      expression i ppf e2;
-  | Pexp_while (e1, e2) ->
-      line i ppf "Pexp_while\n";
-      expression i ppf e1;
-      expression i ppf e2;
-  | Pexp_for (p, e1, e2, df, e3) ->
-      line i ppf "Pexp_for %a\n" fmt_direction_flag df;
-      pattern i ppf p;
-      expression i ppf e1;
-      expression i ppf e2;
-      expression i ppf e3;
-  | Pexp_constraint (e, ct) ->
-      line i ppf "Pexp_constraint\n";
-      expression i ppf e;
-      core_type i ppf ct;
-  | Pexp_coerce (e, cto1, cto2) ->
-      line i ppf "Pexp_coerce\n";
-      expression i ppf e;
-      option i core_type ppf cto1;
-      core_type i ppf cto2;
-  | Pexp_send (e, s) ->
-      line i ppf "Pexp_send \"%s\"\n" s.txt;
-      expression i ppf e;
-  | Pexp_new (li) -> line i ppf "Pexp_new %a\n" fmt_longident_loc li;
-  | Pexp_setinstvar (s, e) ->
-      line i ppf "Pexp_setinstvar %a\n" fmt_string_loc s;
-      expression i ppf e;
-  | Pexp_override (l) ->
-      line i ppf "Pexp_override\n";
-      list i string_x_expression ppf l;
-  | Pexp_letmodule (s, me, e) ->
-      line i ppf "Pexp_letmodule %a\n" fmt_string_loc s;
-      module_expr i ppf me;
-      expression i ppf e;
-  | Pexp_letexception (cd, e) ->
-      line i ppf "Pexp_letexception\n";
-      extension_constructor i ppf cd;
-      expression i ppf e;
-  | Pexp_assert (e) ->
-      line i ppf "Pexp_assert\n";
-      expression i ppf e;
-  | Pexp_lazy (e) ->
-      line i ppf "Pexp_lazy\n";
-      expression i ppf e;
-  | Pexp_poly (e, cto) ->
-      line i ppf "Pexp_poly\n";
-      expression i ppf e;
-      option i core_type ppf cto;
-  | Pexp_object s ->
-      line i ppf "Pexp_object\n";
-      class_structure i ppf s
-  | Pexp_newtype (s, e) ->
-      line i ppf "Pexp_newtype \"%s\"\n" s.txt;
-      expression i ppf e
-  | Pexp_pack me ->
-      line i ppf "Pexp_pack\n";
-      module_expr i ppf me
-  | Pexp_open (ovf, m, e) ->
-      line i ppf "Pexp_open %a \"%a\"\n" fmt_override_flag ovf
-        fmt_longident_loc m;
-      expression i ppf e
-  | Pexp_extension (s, arg) ->
-      line i ppf "Pexp_extension \"%s\"\n" s.txt;
-      payload i ppf arg
-  | Pexp_unreachable ->
-      line i ppf "Pexp_unreachable"
-
-and value_description i ppf x =
-  line i ppf "value_description %a %a\n" fmt_string_loc
-       x.pval_name fmt_location x.pval_loc;
-  attributes i ppf x.pval_attributes;
-  core_type (i+1) ppf x.pval_type;
-  list (i+1) string ppf x.pval_prim
-
-and type_parameter i ppf (x, _variance) = core_type i ppf x
-
-and type_declaration i ppf x =
-  line i ppf "type_declaration %a %a\n" fmt_string_loc x.ptype_name
-       fmt_location x.ptype_loc;
-  attributes i ppf x.ptype_attributes;
-  let i = i+1 in
-  line i ppf "ptype_params =\n";
-  list (i+1) type_parameter ppf x.ptype_params;
-  line i ppf "ptype_cstrs =\n";
-  list (i+1) core_type_x_core_type_x_location ppf x.ptype_cstrs;
-  line i ppf "ptype_kind =\n";
-  type_kind (i+1) ppf x.ptype_kind;
-  line i ppf "ptype_private = %a\n" fmt_private_flag x.ptype_private;
-  line i ppf "ptype_manifest =\n";
-  option (i+1) core_type ppf x.ptype_manifest
-
-and attributes i ppf l =
-  let i = i + 1 in
-  List.iter
-    (fun (s, arg) ->
-      line i ppf "attribute %a \"%s\"\n"  fmt_location (s: _ Asttypes.loc).loc s.txt;    
-      payload (i + 1) ppf arg;
-    )
-    l
-
-and payload i ppf = function
-  | PStr x -> structure i ppf x
-  | PSig x -> signature i ppf x
-  | PTyp x -> core_type i ppf x
-  | PPat (x, None) -> pattern i ppf x
-  | PPat (x, Some g) ->
-    pattern i ppf x;
-    line i ppf "<when>\n";
-    expression (i + 1) ppf g
-
-
-and type_kind i ppf x =
-  match x with
-  | Ptype_abstract ->
-      line i ppf "Ptype_abstract\n"
-  | Ptype_variant l ->
-      line i ppf "Ptype_variant\n";
-      list (i+1) constructor_decl ppf l;
-  | Ptype_record l ->
-      line i ppf "Ptype_record\n";
-      list (i+1) label_decl ppf l;
-  | Ptype_open ->
-      line i ppf "Ptype_open\n";
-
-and type_extension i ppf x =
-  line i ppf "type_extension\n";
-  attributes i ppf x.ptyext_attributes;
-  let i = i+1 in
-  line i ppf "ptyext_path = %a\n" fmt_longident_loc x.ptyext_path;
-  line i ppf "ptyext_params =\n";
-  list (i+1) type_parameter ppf x.ptyext_params;
-  line i ppf "ptyext_constructors =\n";
-  list (i+1) extension_constructor ppf x.ptyext_constructors;
-  line i ppf "ptyext_private = %a\n" fmt_private_flag x.ptyext_private;
-
-and extension_constructor i ppf x =
-  line i ppf "extension_constructor %a\n" fmt_location x.pext_loc;
-  attributes i ppf x.pext_attributes;
-  let i = i + 1 in
-  line i ppf "pext_name = \"%s\"\n" x.pext_name.txt;
-  line i ppf "pext_kind =\n";
-  extension_constructor_kind (i + 1) ppf x.pext_kind;
-
-and extension_constructor_kind i ppf x =
-  match x with
-      Pext_decl(a, r) ->
-        line i ppf "Pext_decl\n";
-        constructor_arguments (i+1) ppf a;
-        option (i+1) core_type ppf r;
-    | Pext_rebind li ->
-        line i ppf "Pext_rebind\n";
-        line (i+1) ppf "%a\n" fmt_longident_loc li;
-
-and class_type i ppf x =
-  line i ppf "class_type %a\n" fmt_location x.pcty_loc;
-  attributes i ppf x.pcty_attributes;
-  let i = i+1 in
-  match x.pcty_desc with
-  | Pcty_constr (li, l) ->
-      line i ppf "Pcty_constr %a\n" fmt_longident_loc li;
-      list i core_type ppf l;
-  | Pcty_signature (cs) ->
-      line i ppf "Pcty_signature\n";
-      class_signature i ppf cs;
-  | Pcty_arrow (l, co, cl) ->
-      line i ppf "Pcty_arrow\n";
-      arg_label i ppf l;
-      core_type i ppf co;
-      class_type i ppf cl;
-  | Pcty_extension (s, arg) ->
-      line i ppf "Pcty_extension \"%s\"\n" s.txt;
-      payload i ppf arg
-  | Pcty_open (ovf, m, e) ->
-      line i ppf "Pcty_open %a \"%a\"\n" fmt_override_flag ovf
-        fmt_longident_loc m;
-      class_type i ppf e
-
-and class_signature i ppf cs =
-  line i ppf "class_signature\n";
-  core_type (i+1) ppf cs.pcsig_self;
-  list (i+1) class_type_field ppf cs.pcsig_fields;
-
-and class_type_field i ppf x =
-  line i ppf "class_type_field %a\n" fmt_location x.pctf_loc;
-  let i = i+1 in
-  attributes i ppf x.pctf_attributes;
-  match x.pctf_desc with
-  | Pctf_inherit (ct) ->
-      line i ppf "Pctf_inherit\n";
-      class_type i ppf ct;
-  | Pctf_val (s, mf, vf, ct) ->
-      line i ppf "Pctf_val \"%s\" %a %a\n" s.txt fmt_mutable_flag mf
-           fmt_virtual_flag vf;
-      core_type (i+1) ppf ct;
-  | Pctf_method (s, pf, vf, ct) ->
-      line i ppf "Pctf_method \"%s\" %a %a\n" s.txt fmt_private_flag pf
-           fmt_virtual_flag vf;
-      core_type (i+1) ppf ct;
-  | Pctf_constraint (ct1, ct2) ->
-      line i ppf "Pctf_constraint\n";
-      core_type (i+1) ppf ct1;
-      core_type (i+1) ppf ct2;
-  | Pctf_attribute (s, arg) ->
-      line i ppf "Pctf_attribute \"%s\"\n" s.txt;
-      payload i ppf arg
-  | Pctf_extension (s, arg) ->
-      line i ppf "Pctf_extension \"%s\"\n" s.txt;
-     payload i ppf arg
-
-
-and class_type_declaration i ppf x =
-  line i ppf "class_type_declaration %a\n" fmt_location x.pci_loc;
-  attributes i ppf x.pci_attributes;
-  let i = i+1 in
-  line i ppf "pci_virt = %a\n" fmt_virtual_flag x.pci_virt;
-  line i ppf "pci_params =\n";
-  list (i+1) type_parameter ppf x.pci_params;
-  line i ppf "pci_name = %a\n" fmt_string_loc x.pci_name;
-  line i ppf "pci_expr =\n";
-  class_type (i+1) ppf x.pci_expr;
-
-and class_structure i ppf { pcstr_self = p; pcstr_fields = l } =
-  line i ppf "class_structure\n";
-  pattern (i+1) ppf p;
-  list (i+1) class_field ppf l;
-
-and class_field i ppf x =
-  line i ppf "class_field %a\n" fmt_location x.pcf_loc;
-  let i = i + 1 in
-  attributes i ppf x.pcf_attributes;
-  match x.pcf_desc with
-  | Pcf_inherit () -> ()
-  | Pcf_val (s, mf, k) ->
-      line i ppf "Pcf_val %a\n" fmt_mutable_flag mf;
-      line (i+1) ppf "%a\n" fmt_string_loc s;
-      class_field_kind (i+1) ppf k
-  | Pcf_method (s, pf, k) ->
-      line i ppf "Pcf_method %a\n" fmt_private_flag pf;
-      line (i+1) ppf "%a\n" fmt_string_loc s;
-      class_field_kind (i+1) ppf k
-  | Pcf_constraint (ct1, ct2) ->
-      line i ppf "Pcf_constraint\n";
-      core_type (i+1) ppf ct1;
-      core_type (i+1) ppf ct2;
-  | Pcf_initializer (e) ->
-      line i ppf "Pcf_initializer\n";
-      expression (i+1) ppf e;
-  | Pcf_attribute (s, arg) ->
-      line i ppf "Pcf_attribute \"%s\"\n" s.txt;
-      payload i ppf arg
-  | Pcf_extension (s, arg) ->
-      line i ppf "Pcf_extension \"%s\"\n" s.txt;
-      payload i ppf arg
-
-and class_field_kind i ppf = function
-  | Cfk_concrete (o, e) ->
-      line i ppf "Concrete %a\n" fmt_override_flag o;
-      expression i ppf e
-  | Cfk_virtual t ->
-      line i ppf "Virtual\n";
-      core_type i ppf t
-
-and module_type i ppf x =
-  line i ppf "module_type %a\n" fmt_location x.pmty_loc;
-  attributes i ppf x.pmty_attributes;
-  let i = i+1 in
-  match x.pmty_desc with
-  | Pmty_ident li -> line i ppf "Pmty_ident %a\n" fmt_longident_loc li;
-  | Pmty_alias li -> line i ppf "Pmty_alias %a\n" fmt_longident_loc li;
-  | Pmty_signature (s) ->
-      line i ppf "Pmty_signature\n";
-      signature i ppf s;
-  | Pmty_functor (s, mt1, mt2) ->
-      line i ppf "Pmty_functor %a\n" fmt_string_loc s;
-      Misc.may (module_type i ppf) mt1;
-      module_type i ppf mt2;
-  | Pmty_with (mt, l) ->
-      line i ppf "Pmty_with\n";
-      module_type i ppf mt;
-      list i with_constraint ppf l;
-  | Pmty_typeof m ->
-      line i ppf "Pmty_typeof\n";
-      module_expr i ppf m;
-  | Pmty_extension (s, arg) ->
-      line i ppf "Pmod_extension \"%s\"\n" s.txt;
-      payload i ppf arg
-
-and signature i ppf x = list i signature_item ppf x
-
-and signature_item i ppf x =
-  line i ppf "signature_item %a\n" fmt_location x.psig_loc;
-  let i = i+1 in
-  match x.psig_desc with
-  | Psig_value vd ->
-      line i ppf "Psig_value\n";
-      value_description i ppf vd;
-  | Psig_type (rf, l) ->
-      line i ppf "Psig_type %a\n" fmt_rec_flag rf;
-      list i type_declaration ppf l;
-  | Psig_typext te ->
-      line i ppf "Psig_typext\n";
-      type_extension i ppf te
-  | Psig_exception ext ->
-      line i ppf "Psig_exception\n";
-      extension_constructor i ppf ext;
-  | Psig_module pmd ->
-      line i ppf "Psig_module %a\n" fmt_string_loc pmd.pmd_name;
-      attributes i ppf pmd.pmd_attributes;
-      module_type i ppf pmd.pmd_type
-  | Psig_recmodule decls ->
-      line i ppf "Psig_recmodule\n";
-      list i module_declaration ppf decls;
-  | Psig_modtype x ->
-      line i ppf "Psig_modtype %a\n" fmt_string_loc x.pmtd_name;
-      attributes i ppf x.pmtd_attributes;
-      modtype_declaration i ppf x.pmtd_type
-  | Psig_open od ->
-      line i ppf "Psig_open %a %a\n"
-        fmt_override_flag od.popen_override
-        fmt_longident_loc od.popen_lid;
-      attributes i ppf od.popen_attributes
-  | Psig_include incl ->
-      line i ppf "Psig_include\n";
-      module_type i ppf incl.pincl_mod;
-      attributes i ppf incl.pincl_attributes
-  | Psig_class () -> ()  
-  | Psig_class_type (l) ->
-      line i ppf "Psig_class_type\n";
-      list i class_type_declaration ppf l;
-  | Psig_extension ((s, arg), attrs) ->
-      line i ppf "Psig_extension \"%s\"\n" s.txt;
-      attributes i ppf attrs;
-      payload i ppf arg
-  | Psig_attribute (s, arg) ->
-      line i ppf "Psig_attribute \"%s\"\n" s.txt;
-      payload i ppf arg
-
-and modtype_declaration i ppf = function
-  | None -> line i ppf "#abstract"
-  | Some mt -> module_type (i+1) ppf mt
-
-and with_constraint i ppf x =
-  match x with
-  | Pwith_type (lid, td) ->
-      line i ppf "Pwith_type %a\n" fmt_longident_loc lid;
-      type_declaration (i+1) ppf td;
-  | Pwith_typesubst (lid, td) ->
-      line i ppf "Pwith_typesubst %a\n" fmt_longident_loc lid;
-      type_declaration (i+1) ppf td;
-  | Pwith_module (lid1, lid2) ->
-      line i ppf "Pwith_module %a = %a\n"
-        fmt_longident_loc lid1
-        fmt_longident_loc lid2;
-  | Pwith_modsubst (lid1, lid2) ->
-      line i ppf "Pwith_modsubst %a = %a\n"
-        fmt_longident_loc lid1
-        fmt_longident_loc lid2;
-
-and module_expr i ppf x =
-  line i ppf "module_expr %a\n" fmt_location x.pmod_loc;
-  attributes i ppf x.pmod_attributes;
-  let i = i+1 in
-  match x.pmod_desc with
-  | Pmod_ident (li) -> line i ppf "Pmod_ident %a\n" fmt_longident_loc li;
-  | Pmod_structure (s) ->
-      line i ppf "Pmod_structure\n";
-      structure i ppf s;
-  | Pmod_functor (s, mt, me) ->
-      line i ppf "Pmod_functor %a\n" fmt_string_loc s;
-      Misc.may (module_type i ppf) mt;
-      module_expr i ppf me;
-  | Pmod_apply (me1, me2) ->
-      line i ppf "Pmod_apply\n";
-      module_expr i ppf me1;
-      module_expr i ppf me2;
-  | Pmod_constraint (me, mt) ->
-      line i ppf "Pmod_constraint\n";
-      module_expr i ppf me;
-      module_type i ppf mt;
-  | Pmod_unpack (e) ->
-      line i ppf "Pmod_unpack\n";
-      expression i ppf e;
-  | Pmod_extension (s, arg) ->
-      line i ppf "Pmod_extension \"%s\"\n" s.txt;
-      payload i ppf arg
-
-and structure i ppf x = list i structure_item ppf x
-
-and structure_item i ppf x =
-  line i ppf "structure_item %a\n" fmt_location x.pstr_loc;
-  let i = i+1 in
-  match x.pstr_desc with
-  | Pstr_eval (e, attrs) ->
-      line i ppf "Pstr_eval\n";
-      attributes i ppf attrs;
-      expression i ppf e;
-  | Pstr_value (rf, l) ->
-      line i ppf "Pstr_value %a\n" fmt_rec_flag rf;
-      list i value_binding ppf l;
-  | Pstr_primitive vd ->
-      line i ppf "Pstr_primitive\n";
-      value_description i ppf vd;
-  | Pstr_type (rf, l) ->
-      line i ppf "Pstr_type %a\n" fmt_rec_flag rf;
-      list i type_declaration ppf l;
-  | Pstr_typext te ->
-      line i ppf "Pstr_typext\n";
-      type_extension i ppf te
-  | Pstr_exception ext ->
-      line i ppf "Pstr_exception\n";
-      extension_constructor i ppf ext;
-  | Pstr_module x ->
-      line i ppf "Pstr_module\n";
-      module_binding i ppf x
-  | Pstr_recmodule bindings ->
-      line i ppf "Pstr_recmodule\n";
-      list i module_binding ppf bindings;
-  | Pstr_modtype x ->
-      line i ppf "Pstr_modtype %a\n" fmt_string_loc x.pmtd_name;
-      attributes i ppf x.pmtd_attributes;
-      modtype_declaration i ppf x.pmtd_type
-  | Pstr_open od ->
-      line i ppf "Pstr_open %a %a\n"
-        fmt_override_flag od.popen_override
-        fmt_longident_loc od.popen_lid;
-      attributes i ppf od.popen_attributes
-  | Pstr_class () -> ()
-  | Pstr_class_type (l) ->
-      line i ppf "Pstr_class_type\n";
-      list i class_type_declaration ppf l;
-  | Pstr_include incl ->
-      line i ppf "Pstr_include";
-      attributes i ppf incl.pincl_attributes;
-      module_expr i ppf incl.pincl_mod
-  | Pstr_extension ((s, arg), attrs) ->
-      line i ppf "Pstr_extension \"%s\"\n" s.txt;
-      attributes i ppf attrs;
-      payload i ppf arg
-  | Pstr_attribute (s, arg) ->
-      line i ppf "Pstr_attribute \"%s\"\n" s.txt;
-      payload i ppf arg
-
-and module_declaration i ppf pmd =
-  string_loc i ppf pmd.pmd_name;
-  attributes i ppf pmd.pmd_attributes;
-  module_type (i+1) ppf pmd.pmd_type;
-
-and module_binding i ppf x =
-  string_loc i ppf x.pmb_name;
-  attributes i ppf x.pmb_attributes;
-  module_expr (i+1) ppf x.pmb_expr
-
-and core_type_x_core_type_x_location i ppf (ct1, ct2, l) =
-  line i ppf "<constraint> %a\n" fmt_location l;
-  core_type (i+1) ppf ct1;
-  core_type (i+1) ppf ct2;
-
-and constructor_decl i ppf
-                     {pcd_name; pcd_args; pcd_res; pcd_loc; pcd_attributes} =
-  line i ppf "%a\n" fmt_location pcd_loc;
-  line (i+1) ppf "%a\n" fmt_string_loc pcd_name;
-  attributes i ppf pcd_attributes;
-  constructor_arguments (i+1) ppf pcd_args;
-  option (i+1) core_type ppf pcd_res
-
-and constructor_arguments i ppf = function
-  | Pcstr_tuple l -> list i core_type ppf l
-  | Pcstr_record l -> list i label_decl ppf l
-
-and label_decl i ppf {pld_name; pld_mutable; pld_type; pld_loc; pld_attributes}=
-  line i ppf "%a\n" fmt_location pld_loc;
-  attributes i ppf pld_attributes;
-  line (i+1) ppf "%a\n" fmt_mutable_flag pld_mutable;
-  line (i+1) ppf "%a" fmt_string_loc pld_name;
-  core_type (i+1) ppf pld_type
-
-and longident_x_pattern i ppf (li, p) =
-  line i ppf "%a\n" fmt_longident_loc li;
-  pattern (i+1) ppf p;
-
-and case i ppf {pc_lhs; pc_guard; pc_rhs} =
-  line i ppf "<case>\n";
-  pattern (i+1) ppf pc_lhs;
-  begin match pc_guard with
-  | None -> ()
-  | Some g -> line (i+1) ppf "<when>\n"; expression (i + 2) ppf g
-  end;
-  expression (i+1) ppf pc_rhs;
-
-and value_binding i ppf x =
-  line i ppf "<def>\n";
-  attributes (i+1) ppf x.pvb_attributes;
-  pattern (i+1) ppf x.pvb_pat;
-  expression (i+1) ppf x.pvb_expr
-
-and string_x_expression i ppf (s, e) =
-  line i ppf "<override> %a\n" fmt_string_loc s;
-  expression (i+1) ppf e;
-
-and longident_x_expression i ppf (li, e) =
-  line i ppf "%a\n" fmt_longident_loc li;
-  expression (i+1) ppf e;
-
-and label_x_expression i ppf (l,e) =
-  line i ppf "<arg>\n";
-  arg_label i ppf l;
-  expression (i+1) ppf e;
-
-and label_x_bool_x_core_type_list i ppf x =
-  match x with
-    Rtag (l, attrs, b, ctl) ->
-      line i ppf "Rtag \"%s\" %s\n" l.txt (string_of_bool b);
-      attributes (i+1) ppf attrs;
-      list (i+1) core_type ppf ctl
-  | Rinherit (ct) ->
-      line i ppf "Rinherit\n";
-      core_type (i+1) ppf ct
-;;
-
-
-let interface ppf x = list 0 signature_item ppf x;;
-
-let implementation ppf x = list 0 structure_item ppf x;;
-
diff --git a/jscomp/ml/printlambda.ml b/jscomp/ml/printlambda.ml
deleted file mode 100644
index ee67f25..0000000
--- a/jscomp/ml/printlambda.ml
+++ /dev/null
@@ -1,496 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Format
-open Asttypes
-open Primitive
-open Lambda
-
-
-let rec struct_const ppf = function
-  | Const_base(Const_int n) -> fprintf ppf "%i" n
-  | Const_base(Const_char i) -> fprintf ppf "%s" (Pprintast.string_of_int_as_char i)
-  | Const_base(Const_string (s, _)) -> fprintf ppf "%S" s
-  | Const_immstring s -> fprintf ppf "#%S" s
-  | Const_base(Const_float f) -> fprintf ppf "%s" f
-  | Const_base(Const_int32 n) -> fprintf ppf "%lil" n
-  | Const_base(Const_int64 n) -> fprintf ppf "%LiL" n
-  | Const_base(Const_bigint (sign, n)) -> fprintf ppf "%sn" (Bigint_utils.to_string sign n)
-  | Const_pointer (n,_) -> fprintf ppf "%ia" n
-  | Const_block(tag_info, []) ->
-      let tag = Lambda.tag_of_tag_info tag_info in 
-      fprintf ppf "[%i]" tag
-  | Const_block(tag_info,sc1::scl) ->
-      let tag = Lambda.tag_of_tag_info tag_info in 
-      let sconsts ppf scl =
-        List.iter (fun sc -> fprintf ppf "@ %a" struct_const sc) scl in
-      fprintf ppf "@[<1>[%i:@ @[%a%a@]]@]" tag struct_const sc1 sconsts scl
-  | Const_float_array [] ->
-      fprintf ppf "[| |]"
-  | Const_float_array (f1 :: fl) ->
-      let floats ppf fl =
-        List.iter (fun f -> fprintf ppf "@ %s" f) fl in
-      fprintf ppf "@[<1>[|@[%s%a@]|]@]" f1 floats fl
-
-  | Const_false -> fprintf ppf "false"      
-  | Const_true -> fprintf ppf "true"
-let boxed_integer_name = function
-  | Pbigint -> "bigint"
-  | Pint32 -> "int32"
-  | Pint64 -> "int64"
-
-let value_kind = function
-  | Pgenval -> ""
-
-(* let field_kind = function
-  | Pgenval -> "*"
-  | Pintval -> "int"
-  | Pfloatval -> "float"
-  | Pboxedintval bi -> boxed_integer_name bi *)
-
-let print_boxed_integer_conversion ppf bi1 bi2 =
-  fprintf ppf "%s_of_%s" (boxed_integer_name bi2) (boxed_integer_name bi1)
-
-let boxed_integer_mark name = function
-  | Pbigint -> Printf.sprintf "BigInt.%s" name
-  | Pint32 -> Printf.sprintf "Int32.%s" name
-  | Pint64 -> Printf.sprintf "Int64.%s" name
-
-let print_boxed_integer name ppf bi =
-  fprintf ppf "%s" (boxed_integer_mark name bi);;
-
-
-
-
-let string_of_loc_kind = function
-  | Loc_FILE -> "loc_FILE"
-  | Loc_LINE -> "loc_LINE"
-  | Loc_MODULE -> "loc_MODULE"
-  | Loc_POS -> "loc_POS"
-  | Loc_LOC -> "loc_LOC"
-
-(* let block_shape ppf shape = match shape with
-  | None | Some [] -> ()
-  | Some l when List.for_all ((=) Pgenval) l -> ()
-  | Some [elt] ->
-      Format.fprintf ppf " (%s)" (field_kind elt)
-  | Some (h :: t) ->
-      Format.fprintf ppf " (%s" (field_kind h);
-      List.iter (fun elt ->
-          Format.fprintf ppf ",%s" (field_kind elt))
-        t;
-      Format.fprintf ppf ")" *)
-
-
-let str_of_field_info (fld_info : Lambda.field_dbg_info)= 
-  match fld_info with 
-  | (Fld_module {name } | Fld_record {name} | Fld_record_inline {name} | Fld_record_extension {name})
-    -> name
-  | Fld_tuple -> "[]"
-  | Fld_poly_var_tag->"`"
-  | Fld_poly_var_content -> "#"
-  | Fld_extension -> "ext"
-  | Fld_variant -> "var"
-  | Fld_cons -> "cons"
-  | Fld_array -> "[||]" 
-let print_taginfo ppf = function
-  | Blk_extension -> fprintf ppf "ext" 
-  | Blk_record_ext {fields = ss} -> fprintf ppf "[%s]" (String.concat ";" (Array.to_list ss) )
-  | Blk_tuple -> fprintf ppf "tuple"
-  | Blk_constructor {name ;num_nonconst} -> fprintf ppf "%s/%i" name num_nonconst
-  | Blk_poly_var name -> fprintf ppf "`%s" name 
-  | Blk_record  {fields = ss} ->  fprintf ppf "[%s]" (String.concat ";" (Array.to_list ss) )
-  | Blk_module ss ->  fprintf ppf "[%s]" (String.concat ";"  ss) 
-  | Blk_some -> fprintf ppf "some"
-  | Blk_some_not_nested -> fprintf ppf "some_not_nested" 
-  | Blk_lazy_general -> fprintf ppf "lazy_general"
-  | Blk_module_export _ -> fprintf ppf "module/exports"
-  | Blk_record_inlined {fields = ss }
-    -> fprintf ppf "[%s]" (String.concat ";" (Array.to_list ss) )
-
-let primitive ppf = function
-  | Puncurried_apply -> fprintf ppf "@app"
-  | Pidentity -> fprintf ppf "id"
-  | Pbytes_to_string -> fprintf ppf "bytes_to_string"
-  | Pignore -> fprintf ppf "ignore"
-  | Prevapply -> fprintf ppf "revapply"
-  | Pdirapply -> fprintf ppf "dirapply"
-  | Ploc kind -> fprintf ppf "%s" (string_of_loc_kind kind)
-  | Pgetglobal id -> fprintf ppf "global %a" Ident.print id
-  | Pmakeblock(taginfo) ->
-      fprintf ppf "makeblock %a" print_taginfo taginfo
-  | Pfield (n, fld) -> fprintf ppf "field:%s/%i" (str_of_field_info fld) n      
-  | Psetfield(n,  _) ->
-      fprintf ppf "setfield %i"   n
-  | Pduprecord -> fprintf ppf "duprecord"
-  | Plazyforce -> fprintf ppf "force"
-  | Pccall p -> fprintf ppf "%s" p.prim_name
-  | Praise k -> fprintf ppf "%s" (Lambda.raise_kind k)
-  | Psequand -> fprintf ppf "&&"
-  | Psequor -> fprintf ppf "||"
-  | Pnot -> fprintf ppf "not"
-  | Pnegint -> fprintf ppf "~"
-  | Paddint -> fprintf ppf "+"
-  | Psubint -> fprintf ppf "-"
-  | Pmulint -> fprintf ppf "*"
-  | Pdivint Safe -> fprintf ppf "/"
-  | Pdivint Unsafe -> fprintf ppf "/u"
-  | Pmodint Safe -> fprintf ppf "mod"
-  | Pmodint Unsafe -> fprintf ppf "mod_unsafe"
-  | Pandint -> fprintf ppf "and"
-  | Porint -> fprintf ppf "or"
-  | Pxorint -> fprintf ppf "xor"
-  | Plslint -> fprintf ppf "lsl"
-  | Plsrint -> fprintf ppf "lsr"
-  | Pasrint -> fprintf ppf "asr"
-  | Pintcomp(Ceq) -> fprintf ppf "=="
-  | Pintcomp(Cneq) -> fprintf ppf "!="
-  | Pintcomp(Clt) -> fprintf ppf "<"
-  | Pintcomp(Cle) -> fprintf ppf "<="
-  | Pintcomp(Cgt) -> fprintf ppf ">"
-  | Pintcomp(Cge) -> fprintf ppf ">="
-  | Poffsetint n -> fprintf ppf "%i+" n
-  | Poffsetref n -> fprintf ppf "+:=%i"n
-  | Pintoffloat -> fprintf ppf "int_of_float"
-  | Pfloatofint -> fprintf ppf "float_of_int"
-  | Pnegfloat -> fprintf ppf "~."
-  | Pabsfloat -> fprintf ppf "abs."
-  | Paddfloat -> fprintf ppf "+."
-  | Psubfloat -> fprintf ppf "-."
-  | Pmulfloat -> fprintf ppf "*."
-  | Pdivfloat -> fprintf ppf "/."
-  | Pfloatcomp(Ceq) -> fprintf ppf "==."
-  | Pfloatcomp(Cneq) -> fprintf ppf "!=."
-  | Pfloatcomp(Clt) -> fprintf ppf "<."
-  | Pfloatcomp(Cle) -> fprintf ppf "<=."
-  | Pfloatcomp(Cgt) -> fprintf ppf ">."
-  | Pfloatcomp(Cge) -> fprintf ppf ">=."
-  | Pnegbigint -> fprintf ppf "~"
-  | Paddbigint -> fprintf ppf "+"
-  | Psubbigint -> fprintf ppf "-"
-  | Pmulbigint -> fprintf ppf "*"
-  | Ppowbigint -> fprintf ppf "**"
-  | Pandbigint -> fprintf ppf "and"
-  | Porbigint -> fprintf ppf "or"
-  | Pxorbigint -> fprintf ppf "xor"
-  | Plslbigint -> fprintf ppf "lsl"
-  | Pasrbigint -> fprintf ppf "asr"
-  | Pdivbigint -> fprintf ppf "/"
-  | Pmodbigint -> fprintf ppf "mod"
-  | Pbigintcomp(Ceq) -> fprintf ppf "==,"
-  | Pbigintcomp(Cneq) -> fprintf ppf "!=,"
-  | Pbigintcomp(Clt) -> fprintf ppf "<,"
-  | Pbigintcomp(Cle) -> fprintf ppf "<=,"
-  | Pbigintcomp(Cgt) -> fprintf ppf ">,"
-  | Pbigintcomp(Cge) -> fprintf ppf ">=,"
-  | Pstringlength -> fprintf ppf "string.length"
-  | Pstringrefu -> fprintf ppf "string.unsafe_get"
-  | Pstringrefs -> fprintf ppf "string.get"
-  | Pbyteslength -> fprintf ppf "bytes.length"
-  | Pbytesrefu -> fprintf ppf "bytes.unsafe_get"
-  | Pbytessetu -> fprintf ppf "bytes.unsafe_set"
-  | Pbytesrefs -> fprintf ppf "bytes.get"
-  | Pbytessets -> fprintf ppf "bytes.set"
-
-  | Parraylength  -> fprintf ppf "array.length" 
-  | Pmakearray Mutable -> fprintf ppf "makearray" 
-  | Pmakearray Immutable -> fprintf ppf "makearray_imm" 
-  | Parrayrefu -> fprintf ppf "array.unsafe_get" 
-  | Parraysetu -> fprintf ppf "array.unsafe_set" 
-  | Parrayrefs -> fprintf ppf "array.get" 
-  | Parraysets -> fprintf ppf "array.set" 
-  | Pctconst c ->
-     let const_name = match c with
-       | Big_endian -> "big_endian"
-       | Word_size -> "word_size"
-       | Int_size -> "int_size"
-       | Max_wosize -> "max_wosize"
-       | Ostype_unix -> "ostype_unix"
-       | Ostype_win32 -> "ostype_win32"
-       | Ostype_cygwin -> "ostype_cygwin"
-       | Backend_type -> "backend_type" in
-     fprintf ppf "sys.constant_%s" const_name
-  | Pisint -> fprintf ppf "isint"
-  | Pisout -> fprintf ppf "isout"
-  | Pbintofint bi -> print_boxed_integer "of_int" ppf bi
-  | Pintofbint bi -> print_boxed_integer "to_int" ppf bi
-  | Pcvtbint (bi1, bi2) -> print_boxed_integer_conversion ppf bi1 bi2
-  | Pnegbint bi -> print_boxed_integer "neg" ppf bi
-  | Paddbint bi -> print_boxed_integer "add" ppf bi
-  | Psubbint bi -> print_boxed_integer "sub" ppf bi
-  | Pmulbint bi -> print_boxed_integer "mul" ppf bi
-  | Pdivbint { size = bi; is_safe = Safe } ->
-      print_boxed_integer "div" ppf bi
-  | Pdivbint { size = bi; is_safe = Unsafe } ->
-      print_boxed_integer "div_unsafe" ppf bi
-  | Pmodbint { size = bi; is_safe = Safe } ->
-      print_boxed_integer "mod" ppf bi
-  | Pmodbint { size = bi; is_safe = Unsafe } ->
-      print_boxed_integer "mod_unsafe" ppf bi
-  | Pandbint bi -> print_boxed_integer "and" ppf bi
-  | Porbint bi -> print_boxed_integer "or" ppf bi
-  | Pxorbint bi -> print_boxed_integer "xor" ppf bi
-  | Plslbint bi -> print_boxed_integer "lsl" ppf bi
-  | Plsrbint bi -> print_boxed_integer "lsr" ppf bi
-  | Pasrbint bi -> print_boxed_integer "asr" ppf bi
-  | Pbintcomp(bi, Ceq) -> print_boxed_integer "==" ppf bi
-  | Pbintcomp(bi, Cneq) -> print_boxed_integer "!=" ppf bi
-  | Pbintcomp(bi, Clt) -> print_boxed_integer "<" ppf bi
-  | Pbintcomp(bi, Cgt) -> print_boxed_integer ">" ppf bi
-  | Pbintcomp(bi, Cle) -> print_boxed_integer "<=" ppf bi
-  | Pbintcomp(bi, Cge) -> print_boxed_integer ">=" ppf bi
-  | Popaque -> fprintf ppf "opaque"
-  | Pcreate_extension s -> fprintf ppf "extension[%s]" s   
-let name_of_primitive = function
-  | Puncurried_apply -> "Puncurried_apply"
-  | Pidentity -> "Pidentity"
-  | Pbytes_to_string -> "Pbytes_to_string"
-  | Pignore -> "Pignore"
-  | Prevapply -> "Prevapply"
-  | Pdirapply -> "Pdirapply"
-  | Ploc _ -> "Ploc"
-  | Pgetglobal _ -> "Pgetglobal"
-  | Pmakeblock _ -> "Pmakeblock"
-  | Pfield _ -> "Pfield"
-  | Psetfield _ -> "Psetfield"
-  | Pduprecord  -> "Pduprecord"
-  | Plazyforce -> "Plazyforce"
-  | Pccall _ -> "Pccall"
-  | Praise _ -> "Praise"
-  | Psequand -> "Psequand"
-  | Psequor -> "Psequor"
-  | Pnot -> "Pnot"
-  | Pnegint -> "Pnegint"
-  | Paddint -> "Paddint"
-  | Psubint -> "Psubint"
-  | Pmulint -> "Pmulint"
-  | Pdivint _ -> "Pdivint"
-  | Pmodint _ -> "Pmodint"
-  | Pandint -> "Pandint"
-  | Porint -> "Porint"
-  | Pxorint -> "Pxorint"
-  | Plslint -> "Plslint"
-  | Plsrint -> "Plsrint"
-  | Pasrint -> "Pasrint"
-  | Pintcomp _ -> "Pintcomp"
-  | Poffsetint _ -> "Poffsetint"
-  | Poffsetref _ -> "Poffsetref"
-  | Pintoffloat -> "Pintoffloat"
-  | Pfloatofint -> "Pfloatofint"
-  | Pnegfloat -> "Pnegfloat"
-  | Pabsfloat -> "Pabsfloat"
-  | Paddfloat -> "Paddfloat"
-  | Psubfloat -> "Psubfloat"
-  | Pmulfloat -> "Pmulfloat"
-  | Pdivfloat -> "Pdivfloat"
-  | Pfloatcomp _ -> "Pfloatcomp"
-  | Pnegbigint -> "Pnegbigint"
-  | Paddbigint -> "Paddbigint"
-  | Psubbigint -> "Psubbigint"
-  | Pmulbigint -> "Pmulbigint"
-  | Pdivbigint -> "Pdivbigint"
-  | Pmodbigint -> "Pmodbigint"
-  | Ppowbigint -> "Ppowbigint"
-  | Pandbigint -> "Pandbigint"
-  | Porbigint -> "Porbigint"
-  | Pxorbigint -> "Pxorbigint"
-  | Plslbigint -> "Plslbigint"
-  | Pasrbigint -> "Pasrbigint"
-  | Pbigintcomp _ -> "Pbigintcomp"
-  | Pstringlength -> "Pstringlength"
-  | Pstringrefu -> "Pstringrefu"
-  | Pstringrefs -> "Pstringrefs"
-  | Pbyteslength -> "Pbyteslength"
-  | Pbytesrefu -> "Pbytesrefu"
-  | Pbytessetu -> "Pbytessetu"
-  | Pbytesrefs -> "Pbytesrefs"
-  | Pbytessets -> "Pbytessets"
-  | Parraylength -> "Parraylength"
-  | Pmakearray _-> "Pmakearray"
-  | Parrayrefu -> "Parrayrefu"
-  | Parraysetu -> "Parraysetu"
-  | Parrayrefs -> "Parrayrefs"
-  | Parraysets -> "Parraysets"
-  | Pctconst _ -> "Pctconst"
-  | Pisint -> "Pisint"
-  | Pisout -> "Pisout"
-  | Pbintofint _ -> "Pbintofint"
-  | Pintofbint _ -> "Pintofbint"
-  | Pcvtbint _ -> "Pcvtbint"
-  | Pnegbint _ -> "Pnegbint"
-  | Paddbint _ -> "Paddbint"
-  | Psubbint _ -> "Psubbint"
-  | Pmulbint _ -> "Pmulbint"
-  | Pdivbint _ -> "Pdivbint"
-  | Pmodbint _ -> "Pmodbint"
-  | Pandbint _ -> "Pandbint"
-  | Porbint _ -> "Porbint"
-  | Pxorbint _ -> "Pxorbint"
-  | Plslbint _ -> "Plslbint"
-  | Plsrbint _ -> "Plsrbint"
-  | Pasrbint _ -> "Pasrbint"
-  | Pbintcomp _ -> "Pbintcomp"
-  | Popaque -> "Popaque"
-  | Pcreate_extension _ -> "Pcreate_extension"
-
-let function_attribute ppf { inline; is_a_functor; stub; return_unit } =
-  if is_a_functor then
-    fprintf ppf "is_a_functor@ ";
-  if stub then
-    fprintf ppf "stub@ ";
-  if return_unit then 
-    fprintf ppf "void@ ";  
-  begin match inline with
-  | Default_inline -> ()
-  | Always_inline -> fprintf ppf "always_inline@ "
-  | Never_inline -> fprintf ppf "never_inline@ "
-  end
-
-
-let apply_inlined_attribute ppf = function
-  | Default_inline -> ()
-  | Always_inline -> fprintf ppf " always_inline"
-  | Never_inline -> fprintf ppf " never_inline"
-
-
-let rec lam ppf = function
-  | Lvar id ->
-      Ident.print ppf id
-  | Lconst cst ->
-      struct_const ppf cst
-  | Lapply ap ->
-      let lams ppf largs =
-        List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
-      fprintf ppf "@[<2>(apply@ %a%a%a)@]" lam ap.ap_func lams ap.ap_args
-        apply_inlined_attribute ap.ap_inlined
-
-  | Lfunction{ params; body; attr} ->
-      let pr_params ppf params =
-            List.iter (fun param -> fprintf ppf "@ %a" Ident.print param) params
-      in
-      fprintf ppf "@[<2>(function%a@ %a%a)@]" pr_params params
-        function_attribute attr lam body
-  | Llet(str, k, id, arg, body) ->
-      let kind = function
-          Alias -> "a" | Strict -> "" | StrictOpt -> "o" | Variable -> "v"
-      in
-      let rec letbody = function
-        | Llet(str, k, id, arg, body) ->
-            fprintf ppf "@ @[<2>%a =%s%s@ %a@]"
-              Ident.print id (kind str) (value_kind k) lam arg;
-            letbody body
-        | expr -> expr in
-      fprintf ppf "@[<2>(let@ @[<hv 1>(@[<2>%a =%s%s@ %a@]"
-        Ident.print id (kind str) (value_kind k) lam arg;
-      let expr = letbody body in
-      fprintf ppf ")@]@ %a)@]" lam expr
-  | Lletrec(id_arg_list, body) ->
-      let bindings ppf id_arg_list =
-        let spc = ref false in
-        List.iter
-          (fun (id, l) ->
-            if !spc then fprintf ppf "@ " else spc := true;
-            fprintf ppf "@[<2>%a@ %a@]" Ident.print id lam l)
-          id_arg_list in
-      fprintf ppf
-        "@[<2>(letrec@ (@[<hv 1>%a@])@ %a)@]" bindings id_arg_list lam body
-  | Lprim(prim, largs, _) ->
-      let lams ppf largs =
-        List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
-      fprintf ppf "@[<2>(%a%a)@]" primitive prim lams largs
-  | Lswitch(larg, sw, _loc) ->
-      let switch ppf sw =
-        let spc = ref false in
-        List.iter
-         (fun (n, l) ->
-           if !spc then fprintf ppf "@ " else spc := true;
-           fprintf ppf "@[<hv 1>case int %i:@ %a@]" n lam l)
-         sw.sw_consts;
-        List.iter
-          (fun (n, l) ->
-            if !spc then fprintf ppf "@ " else spc := true;
-            fprintf ppf "@[<hv 1>case tag %i:@ %a@]" n lam l)
-          sw.sw_blocks ;
-        begin match sw.sw_failaction with
-        | None  -> ()
-        | Some l ->
-            if !spc then fprintf ppf "@ " else spc := true;
-            fprintf ppf "@[<hv 1>default:@ %a@]" lam l
-        end in
-      fprintf ppf
-       "@[<1>(%s %a@ @[<v 0>%a@])@]"
-       (match sw.sw_failaction with None -> "switch*" | _ -> "switch")
-       lam larg switch sw
-  | Lstringswitch(arg, cases, default, _) ->
-      let switch ppf cases =
-        let spc = ref false in
-        List.iter
-         (fun (s, l) ->
-           if !spc then fprintf ppf "@ " else spc := true;
-           fprintf ppf "@[<hv 1>case \"%s\":@ %a@]" (String.escaped s) lam l)
-          cases;
-        begin match default with
-        | Some default ->
-            if !spc then fprintf ppf "@ " else spc := true;
-            fprintf ppf "@[<hv 1>default:@ %a@]" lam default
-        | None -> ()
-        end in
-      fprintf ppf
-       "@[<1>(stringswitch %a@ @[<v 0>%a@])@]" lam arg switch cases
-  | Lstaticraise (i, ls)  ->
-      let lams ppf largs =
-        List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
-      fprintf ppf "@[<2>(exit@ %d%a)@]" i lams ls;
-  | Lstaticcatch(lbody, (i, vars), lhandler) ->
-      fprintf ppf "@[<2>(catch@ %a@;<1 -1>with (%d%a)@ %a)@]"
-        lam lbody i
-        (fun ppf vars -> match vars with
-          | [] -> ()
-          | _ ->
-              List.iter
-                (fun x -> fprintf ppf " %a" Ident.print x)
-                vars)
-        vars
-        lam lhandler
-  | Ltrywith(lbody, param, lhandler) ->
-      fprintf ppf "@[<2>(try@ %a@;<1 -1>with %a@ %a)@]"
-        lam lbody Ident.print param lam lhandler
-  | Lifthenelse(lcond, lif, lelse) ->
-      fprintf ppf "@[<2>(if@ %a@ %a@ %a)@]" lam lcond lam lif lam lelse
-  | Lsequence(l1, l2) ->
-      fprintf ppf "@[<2>(seq@ %a@ %a)@]" lam l1 sequence l2
-  | Lwhile(lcond, lbody) ->
-      fprintf ppf "@[<2>(while@ %a@ %a)@]" lam lcond lam lbody
-  | Lfor(param, lo, hi, dir, body) ->
-      fprintf ppf "@[<2>(for %a@ %a@ %s@ %a@ %a)@]"
-       Ident.print param lam lo
-       (match dir with Upto -> "to" | Downto -> "downto")
-       lam hi lam body
-  | Lassign(id, expr) ->
-      fprintf ppf "@[<2>(assign@ %a@ %a)@]" Ident.print id lam expr
-  | Lsend (name,obj,  _) ->
-      fprintf ppf "@[<2>(send%s@ %a@ )@]"  name lam obj
-
-and sequence ppf = function
-  | Lsequence(l1, l2) ->
-      fprintf ppf "%a@ %a" sequence l1 sequence l2
-  | l ->
-      lam ppf l
-
-let structured_constant = struct_const
-
-let lambda = lam
-
-
diff --git a/jscomp/ml/printtyp.ml b/jscomp/ml/printtyp.ml
deleted file mode 100644
index 7f89f03..0000000
--- a/jscomp/ml/printtyp.ml
+++ /dev/null
@@ -1,1716 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*  Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt  *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Printing functions *)
-
-open Misc
-open Ctype
-open Format
-open Longident
-open Path
-open Asttypes
-open Types
-open Btype
-open Outcometree
-
-let print_res_poly_identifier: (string -> string) ref = ref (fun _ -> assert false)
-
-(* Print a long identifier *)
-
-let rec longident ppf = function
-  | Lident s -> pp_print_string ppf s
-  | Ldot(p, s) -> fprintf ppf "%a.%s" longident p s
-  | Lapply(p1, p2) -> fprintf ppf "%a(%a)" longident p1 longident p2
-
-(* Print an identifier *)
-
-let unique_names = ref Ident.empty
-
-let ident_name id =
-  try Ident.find_same id !unique_names with Not_found -> Ident.name id
-
-let add_unique id =
-  try ignore (Ident.find_same id !unique_names)
-  with Not_found ->
-    unique_names := Ident.add id (Ident.unique_toplevel_name id) !unique_names
-
-let ident ppf id = pp_print_string ppf (ident_name id)
-
-(* Print a path *)
-
-let ident_pervasives = Ident.create_persistent "Pervasives"
-let ident_pervasives_u = Ident.create_persistent "PervasivesU"
-let printing_env = ref Env.empty
-let non_shadowed_pervasive = function
-  | Pdot(Pident id, s, _pos) as path ->
-      (Ident.same id ident_pervasives || Ident.same id ident_pervasives_u) &&
-      (try Path.same path (Env.lookup_type (Lident s) !printing_env)
-       with Not_found -> true)
-  | _ -> false
-
-let rec tree_of_path = function
-  | Pident id ->
-      Oide_ident (ident_name id)
-  | Pdot(_, s, _pos) as path when non_shadowed_pervasive path ->
-      Oide_ident s
-  | Pdot(p, s, _pos) ->
-      Oide_dot (tree_of_path p, s)
-  | Papply(p1, p2) ->
-      Oide_apply (tree_of_path p1, tree_of_path p2)
-
-let rec path ppf = function
-  | Pident id ->
-      ident ppf id
-  | Pdot(_, s, _pos) as path when non_shadowed_pervasive path ->
-      pp_print_string ppf s
-  | Pdot(p, s, _pos) ->
-      path ppf p;
-      pp_print_char ppf '.';
-      pp_print_string ppf s
-  | Papply(p1, p2) ->
-      fprintf ppf "%a(%a)" path p1 path p2
-
-let rec string_of_out_ident = function
-  | Oide_ident s -> s
-  | Oide_dot (id, s) -> String.concat "." [string_of_out_ident id; s]
-  | Oide_apply (id1, id2) ->
-      String.concat ""
-        [string_of_out_ident id1; "("; string_of_out_ident id2; ")"]
-
-let string_of_path p = string_of_out_ident (tree_of_path p)
-
-(* Print a recursive annotation *)
-
-let tree_of_rec = function
-  | Trec_not -> Orec_not
-  | Trec_first -> Orec_first
-  | Trec_next -> Orec_next
-
-(* Print a raw type expression, with sharing *)
-
-let raw_list pr ppf = function
-    [] -> fprintf ppf "[]"
-  | a :: l ->
-      fprintf ppf "@[<1>[%a%t]@]" pr a
-        (fun ppf -> List.iter (fun x -> fprintf ppf ";@,%a" pr x) l)
-
-let kind_vars = ref []
-let kind_count = ref 0
-
-let rec safe_kind_repr v = function
-    Fvar {contents=Some k}  ->
-      if List.memq k v then "Fvar loop" else
-      safe_kind_repr (k::v) k
-  | Fvar r ->
-      let vid =
-        try List.assq r !kind_vars
-        with Not_found ->
-          let c = incr kind_count; !kind_count in
-          kind_vars := (r,c) :: !kind_vars;
-          c
-      in
-      Printf.sprintf "Fvar {None}@%d" vid
-  | Fpresent -> "Fpresent"
-  | Fabsent -> "Fabsent"
-
-let rec safe_commu_repr v = function
-    Cok -> "Cok"
-  | Cunknown -> "Cunknown"
-  | Clink r ->
-      if List.memq r v then "Clink loop" else
-      safe_commu_repr (r::v) !r
-
-let rec safe_repr v = function
-    {desc = Tlink t} when not (List.memq t v) ->
-      safe_repr (t::v) t
-  | t -> t
-
-let rec list_of_memo = function
-    Mnil -> []
-  | Mcons (_priv, p, _t1, _t2, rem) -> p :: list_of_memo rem
-  | Mlink rem -> list_of_memo !rem
-
-let print_name ppf = function
-    None -> fprintf ppf "None"
-  | Some name -> fprintf ppf "\"%s\"" name
-
-let string_of_label = function
-    Nolabel -> ""
-  | Labelled s -> s
-  | Optional s -> "?"^s
-
-let visited = ref []
-let rec raw_type ppf ty =
-  let ty = safe_repr [] ty in
-  if List.memq ty !visited then fprintf ppf "{id=%d}" ty.id else begin
-    visited := ty :: !visited;
-    fprintf ppf "@[<1>{id=%d;level=%d;desc=@,%a}@]" ty.id ty.level
-      raw_type_desc ty.desc
-  end
-and raw_type_list tl = raw_list raw_type tl
-and raw_type_desc ppf = function
-    Tvar name -> fprintf ppf "Tvar %a" print_name name
-  | Tarrow(l,t1,t2,c) ->
-      fprintf ppf "@[<hov1>Tarrow(\"%s\",@,%a,@,%a,@,%s)@]"
-        (string_of_label l) raw_type t1 raw_type t2
-        (safe_commu_repr [] c)
-  | Ttuple tl ->
-      fprintf ppf "@[<1>Ttuple@,%a@]" raw_type_list tl
-  | Tconstr (p, tl, abbrev) ->
-      fprintf ppf "@[<hov1>Tconstr(@,%a,@,%a,@,%a)@]" path p
-        raw_type_list tl
-        (raw_list path) (list_of_memo !abbrev)
-  | Tobject (t, nm) ->
-      fprintf ppf "@[<hov1>Tobject(@,%a,@,@[<1>ref%t@])@]" raw_type t
-        (fun ppf ->
-          match !nm with None -> fprintf ppf " None"
-          | Some(p,tl) ->
-              fprintf ppf "(Some(@,%a,@,%a))" path p raw_type_list tl)
-  | Tfield (f, k, t1, t2) ->
-      fprintf ppf "@[<hov1>Tfield(@,%s,@,%s,@,%a,@;<0 -1>%a)@]" f
-        (safe_kind_repr [] k)
-        raw_type t1 raw_type t2
-  | Tnil -> fprintf ppf "Tnil"
-  | Tlink t -> fprintf ppf "@[<1>Tlink@,%a@]" raw_type t
-  | Tsubst t -> fprintf ppf "@[<1>Tsubst@,%a@]" raw_type t
-  | Tunivar name -> fprintf ppf "Tunivar %a" print_name name
-  | Tpoly (t, tl) ->
-      fprintf ppf "@[<hov1>Tpoly(@,%a,@,%a)@]"
-        raw_type t
-        raw_type_list tl
-  | Tvariant row ->
-      fprintf ppf
-        "@[<hov1>{@[%s@,%a;@]@ @[%s@,%a;@]@ %s%B;@ %s%B;@ @[<1>%s%t@]}@]"
-        "row_fields="
-        (raw_list (fun ppf (l, f) ->
-          fprintf ppf "@[%s,@ %a@]" l raw_field f))
-        row.row_fields
-        "row_more=" raw_type row.row_more
-        "row_closed=" row.row_closed
-        "row_fixed=" row.row_fixed
-        "row_name="
-        (fun ppf ->
-          match row.row_name with None -> fprintf ppf "None"
-          | Some(p,tl) ->
-              fprintf ppf "Some(@,%a,@,%a)" path p raw_type_list tl)
-  | Tpackage (p, _, tl) ->
-      fprintf ppf "@[<hov1>Tpackage(@,%a@,%a)@]" path p
-        raw_type_list tl
-
-and raw_field ppf = function
-    Rpresent None -> fprintf ppf "Rpresent None"
-  | Rpresent (Some t) -> fprintf ppf "@[<1>Rpresent(Some@,%a)@]" raw_type t
-  | Reither (c,tl,m,e) ->
-      fprintf ppf "@[<hov1>Reither(%B,@,%a,@,%B,@,@[<1>ref%t@])@]" c
-        raw_type_list tl m
-        (fun ppf ->
-          match !e with None -> fprintf ppf " None"
-          | Some f -> fprintf ppf "@,@[<1>(%a)@]" raw_field f)
-  | Rabsent -> fprintf ppf "Rabsent"
-
-let raw_type_expr ppf t =
-  visited := []; kind_vars := []; kind_count := 0;
-  raw_type ppf t;
-  visited := []; kind_vars := []
-
-let () = Btype.print_raw := raw_type_expr
-
-(* Normalize paths *)
-
-type param_subst = Id | Nth of int | Map of int list
-
-let is_nth = function
-    Nth _ -> true
-  | _ -> false
-
-let compose l1 = function
-  | Id -> Map l1
-  | Map l2 -> Map (List.map (List.nth l1) l2)
-  | Nth n  -> Nth (List.nth l1 n)
-
-let apply_subst s1 tyl =
-  if tyl = [] then []
-  (* cf. PR#7543: Typemod.type_package doesn't respect type constructor arity *)
-  else
-    match s1 with
-      Nth n1 -> [List.nth tyl n1]
-    | Map l1 -> List.map (List.nth tyl) l1
-    | Id -> tyl
-
-type best_path = Paths of Path.t list | Best of Path.t
-
-let printing_depth = ref 0
-let printing_cont = ref ([] : Env.iter_cont list)
-let printing_old = ref Env.empty
-let printing_pers = ref Concr.empty
-module PathMap = Map.Make(Path)
-let printing_map = ref PathMap.empty
-
-let same_type t t' = repr t == repr t'
-
-let rec index l x =
-  match l with
-    [] -> raise Not_found
-  | a :: l -> if x == a then 0 else 1 + index l x
-
-let rec uniq = function
-    [] -> true
-  | a :: l -> not (List.memq a l) && uniq l
-
-let rec normalize_type_path ?(cache=false) env p =
-  try
-    let (params, ty, _) = Env.find_type_expansion p env in
-    let params = List.map repr params in
-    match repr ty with
-      {desc = Tconstr (p1, tyl, _)} ->
-        let tyl = List.map repr tyl in
-        if List.length params = List.length tyl
-        && List.for_all2 (==) params tyl
-        then normalize_type_path ~cache env p1
-        else if cache || List.length params <= List.length tyl
-             || not (uniq tyl) then (p, Id)
-        else
-          let l1 = List.map (index params) tyl in
-          let (p2, s2) = normalize_type_path ~cache env p1 in
-          (p2, compose l1 s2)
-    | ty ->
-        (p, Nth (index params ty))
-  with
-    Not_found ->
-      (Env.normalize_path None env p, Id)
-
-let penalty s =
-  if s <> "" && s.[0] = '_' then
-    10
-  else
-    try
-      for i = 0 to String.length s - 2 do
-        if s.[i] = '_' && s.[i + 1] = '_' then
-          raise Exit
-      done;
-      1
-    with Exit -> 10
-
-let rec path_size = function
-    Pident id ->
-      penalty (Ident.name id), -Ident.binding_time id
-  | Pdot (p, _, _) ->
-      let (l, b) = path_size p in (1+l, b)
-  | Papply (p1, p2) ->
-      let (l, b) = path_size p1 in
-      (l + fst (path_size p2), b)
-
-let same_printing_env env =
-  let used_pers = Env.used_persistent () in
-  Env.same_types !printing_old env && Concr.equal !printing_pers used_pers
-
-let set_printing_env env =
-  printing_env := env;
-  if !Clflags.real_paths
-  || !printing_env == Env.empty || same_printing_env env then () else
-  begin
-    (* printf "Reset printing_map@."; *)
-    printing_old := env;
-    printing_pers := Env.used_persistent ();
-    printing_map := PathMap.empty;
-    printing_depth := 0;
-    (* printf "Recompute printing_map.@."; *)
-    let cont =
-      Env.iter_types
-        (fun p (p', _decl) ->
-          let (p1, s1) = normalize_type_path env p' ~cache:true in
-          (* Format.eprintf "%a -> %a = %a@." path p path p' path p1 *)
-          if s1 = Id then
-          try
-            let r = PathMap.find p1 !printing_map in
-            match !r with
-              Paths l -> r := Paths (p :: l)
-            | Best p' -> r := Paths [p; p'] (* assert false *)
-          with Not_found ->
-            printing_map := PathMap.add p1 (ref (Paths [p])) !printing_map)
-        env in
-    printing_cont := [cont];
-  end
-
-let wrap_printing_env env f =
-  set_printing_env env;
-  try_finally f (fun () -> set_printing_env Env.empty)
-
-let wrap_printing_env env f =
-  Env.without_cmis (wrap_printing_env env) f
-
-let is_unambiguous path env =
-  let l = Env.find_shadowed_types path env in
-  List.exists (Path.same path) l || (* concrete paths are ok *)
-  match l with
-    [] -> true
-  | p :: rem ->
-      (* allow also coherent paths:  *)
-      let normalize p = fst (normalize_type_path ~cache:true env p) in
-      let p' = normalize p in
-      List.for_all (fun p -> Path.same (normalize p) p') rem ||
-      (* also allow repeatedly defining and opening (for toplevel) *)
-      let id = lid_of_path p in
-      List.for_all (fun p -> lid_of_path p = id) rem &&
-      Path.same p (Env.lookup_type id env)
-
-let rec get_best_path r =
-  match !r with
-    Best p' -> p'
-  | Paths [] -> raise Not_found
-  | Paths l ->
-      r := Paths [];
-      List.iter
-        (fun p ->
-          (* Format.eprintf "evaluating %a@." path p; *)
-          match !r with
-            Best p' when path_size p >= path_size p' -> ()
-          | _ -> if is_unambiguous p !printing_env then r := Best p)
-              (* else Format.eprintf "%a ignored as ambiguous@." path p *)
-        l;
-      get_best_path r
-
-let best_type_path p =
-  if !Clflags.real_paths || !printing_env == Env.empty
-  then (p, Id)
-  else
-    let (p', s) = normalize_type_path !printing_env p in
-    let get_path () = get_best_path (PathMap.find  p' !printing_map) in
-    while !printing_cont <> [] &&
-      try fst (path_size (get_path ())) > !printing_depth with Not_found -> true
-    do
-      printing_cont := List.map snd (Env.run_iter_cont !printing_cont);
-      incr printing_depth;
-    done;
-    let p'' = try get_path () with Not_found -> p' in
-    (* Format.eprintf "%a = %a -> %a@." path p path p' path p''; *)
-    (p'', s)
-
-(* Print a type expression *)
-
-let names = ref ([] : (type_expr * string) list)
-let name_counter = ref 0
-let named_vars = ref ([] : string list)
-
-let weak_counter = ref 1
-let weak_var_map = ref TypeMap.empty
-let named_weak_vars = ref StringSet.empty
-
-let reset_names () = names := []; name_counter := 0; named_vars := []
-let add_named_var ty =
-  match ty.desc with
-    Tvar (Some name) | Tunivar (Some name) ->
-      if List.mem name !named_vars then () else
-      named_vars := name :: !named_vars
-  | _ -> ()
-
-let name_is_already_used name =
-  List.mem name !named_vars
-  || List.exists (fun (_, name') -> name = name') !names
-  || StringSet.mem name !named_weak_vars
-
-let rec new_name () =
-  let name =
-    if !name_counter < 26
-    then String.make 1 (Char.chr(97 + !name_counter))
-    else String.make 1 (Char.chr(97 + !name_counter mod 26)) ^
-           string_of_int(!name_counter / 26) in
-  incr name_counter;
-  if name_is_already_used name then new_name () else name
-
-let rec new_weak_name ty () =
-  let name = "weak" ^ string_of_int !weak_counter in
-  incr weak_counter;
-  if name_is_already_used name then new_weak_name ty ()
-  else begin
-      named_weak_vars := StringSet.add name !named_weak_vars;
-      weak_var_map := TypeMap.add ty name !weak_var_map;
-      name
-    end
-
-let name_of_type name_generator t =
-  (* We've already been through repr at this stage, so t is our representative
-     of the union-find class. *)
-  try List.assq t !names with Not_found ->
-    try TypeMap.find t !weak_var_map with Not_found ->
-    let name =
-      match t.desc with
-        Tvar (Some name) | Tunivar (Some name) ->
-          (* Some part of the type we've already printed has assigned another
-           * unification variable to that name. We want to keep the name, so try
-           * adding a number until we find a name that's not taken. *)
-          let current_name = ref name in
-          let i = ref 0 in
-          while List.exists (fun (_, name') -> !current_name = name') !names do
-            current_name := name ^ (string_of_int !i);
-            i := !i + 1;
-          done;
-          !current_name
-      | _ ->
-          (* No name available, create a new one *)
-          name_generator ()
-    in
-    (* Exception for type declarations *)
-    if name <> "_" then names := (t, name) :: !names;
-    name
-
-let check_name_of_type t = ignore(name_of_type new_name t)
-
-let remove_names tyl =
-  let tyl = List.map repr tyl in
-  names := Ext_list.filter !names (fun (ty,_) -> not (List.memq ty tyl))
-
-let visited_objects = ref ([] : type_expr list)
-let aliased = ref ([] : type_expr list)
-let delayed = ref ([] : type_expr list)
-
-let add_delayed t =
-  if not (List.memq t !delayed) then delayed := t :: !delayed
-
-let is_aliased ty = List.memq (proxy ty) !aliased
-let add_alias ty =
-  let px = proxy ty in
-  if not (is_aliased px) then begin
-    aliased := px :: !aliased;
-    add_named_var px
-  end
-
-let aliasable ty =
-  match ty.desc with
-    Tvar _ | Tunivar _ | Tpoly _ -> false
-  | Tconstr (p, _, _) ->
-      not (is_nth (snd (best_type_path p)))
-  | _ -> true
-
-let namable_row row =
-  row.row_name <> None &&
-  List.for_all
-    (fun (_, f) ->
-       match row_field_repr f with
-       | Reither(c, l, _, _) ->
-           row.row_closed && if c then l = [] else List.length l = 1
-       | _ -> true)
-    row.row_fields
-
-let rec mark_loops_rec visited ty =
-  let ty = repr ty in
-  let px = proxy ty in
-  if List.memq px visited && aliasable ty then add_alias px else
-    let visited = px :: visited in
-    match ty.desc with
-    | Tvar _ -> add_named_var ty
-    | Tarrow(_, ty1, ty2, _) ->
-        mark_loops_rec visited ty1; mark_loops_rec visited ty2
-    | Ttuple tyl -> List.iter (mark_loops_rec visited) tyl
-    | Tconstr(p, tyl, _) ->
-        let (_p', s) = best_type_path p in
-        List.iter (mark_loops_rec visited) (apply_subst s tyl)
-    | Tpackage (_, _, tyl) ->
-        List.iter (mark_loops_rec visited) tyl
-    | Tvariant row ->
-        if List.memq px !visited_objects then add_alias px else
-         begin
-          let row = row_repr row in
-          if not (static_row row) then
-            visited_objects := px :: !visited_objects;
-          match row.row_name with
-          | Some(_p, tyl) when namable_row row ->
-              List.iter (mark_loops_rec visited) tyl
-          | _ ->
-              iter_row (mark_loops_rec visited) row
-         end
-    | Tobject (fi, nm) ->
-        if List.memq px !visited_objects then add_alias px else
-         begin
-          if opened_object ty then
-            visited_objects := px :: !visited_objects;
-          begin match !nm with
-          | None ->
-              let fields, _ = flatten_fields fi in
-              List.iter
-                (fun (_, kind, ty) ->
-                  if field_kind_repr kind = Fpresent then
-                    mark_loops_rec visited ty)
-                fields
-          | Some (_, l) ->
-              List.iter (mark_loops_rec visited) (List.tl l)
-          end
-        end
-    | Tfield(_, kind, ty1, ty2) when field_kind_repr kind = Fpresent ->
-        mark_loops_rec visited ty1; mark_loops_rec visited ty2
-    | Tfield(_, _, _, ty2) ->
-        mark_loops_rec visited ty2
-    | Tnil -> ()
-    | Tsubst ty -> mark_loops_rec visited ty
-    | Tlink _ -> fatal_error "Printtyp.mark_loops_rec (2)"
-    | Tpoly (ty, tyl) ->
-        List.iter (fun t -> add_alias t) tyl;
-        mark_loops_rec visited ty
-    | Tunivar _ -> add_named_var ty
-
-let mark_loops ty =
-  normalize_type Env.empty ty;
-  mark_loops_rec [] ty;;
-
-let reset_loop_marks () =
-  visited_objects := []; aliased := []; delayed := []
-
-let reset () =
-  unique_names := Ident.empty; reset_names (); reset_loop_marks ()
-
-let reset_and_mark_loops ty =
-  reset (); mark_loops ty
-
-let reset_and_mark_loops_list tyl =
-  reset (); List.iter mark_loops tyl
-
-(* Disabled in classic mode when printing an unification error *)
-
-
-let rec tree_of_typexp sch ty =
-  let ty = repr ty in
-  let px = proxy ty in
-  if List.mem_assq px !names && not (List.memq px !delayed) then
-   let mark = is_non_gen sch ty in
-   let name = name_of_type (if mark then new_weak_name ty else new_name) px in
-   Otyp_var (mark, name) else
-
-  let pr_typ () =
-    match ty.desc with
-    | Tvar _ ->
-        (*let lev =
-          if is_non_gen sch ty then "/" ^ string_of_int ty.level else "" in*)
-        let non_gen = is_non_gen sch ty in
-        let name_gen = if non_gen then new_weak_name ty else new_name in
-        Otyp_var (non_gen, name_of_type name_gen ty)
-    | Tarrow(l, ty1, ty2, _) ->
-        let pr_arrow l ty1 ty2 =
-          let lab =
-            string_of_label l
-          in
-          let t1 =
-            if is_optional l then
-              match (repr ty1).desc with
-              | Tconstr(path, [ty], _)
-                when Path.same path Predef.path_option ->
-                  tree_of_typexp sch ty
-              | _ -> Otyp_stuff "<hidden>"
-            else tree_of_typexp sch ty1 in
-          Otyp_arrow (lab, t1, tree_of_typexp sch ty2) in
-        pr_arrow l ty1 ty2
-    | Ttuple tyl ->
-        Otyp_tuple (tree_of_typlist sch tyl)
-    | Tconstr(p, tyl, _abbrev) ->
-        let p', s = best_type_path p in
-        let tyl' = apply_subst s tyl in
-        if is_nth s && not (tyl'=[]) then tree_of_typexp sch (List.hd tyl') else
-        Otyp_constr (tree_of_path p', tree_of_typlist sch tyl')
-    | Tvariant row ->
-        let row = row_repr row in
-        let fields =
-          if row.row_closed then
-            Ext_list.filter row.row_fields (fun (_, f) -> row_field_repr f <> Rabsent)
-          else row.row_fields in
-        let present =
-          Ext_list.filter fields
-            (fun (_, f) ->
-               match row_field_repr f with
-               | Rpresent _ -> true
-               | _ -> false)
-        in
-        let all_present = List.length present = List.length fields in
-        begin match row.row_name with
-        | Some(p, tyl) when namable_row row ->
-            let (p', s) = best_type_path p in
-            let id = tree_of_path p' in
-            let args = tree_of_typlist sch (apply_subst s tyl) in
-            let out_variant =
-              if is_nth s then List.hd args else Otyp_constr (id, args) in
-            if row.row_closed && all_present then
-              out_variant
-            else
-              let non_gen = is_non_gen sch px in
-              let tags =
-                if all_present then None else Some (List.map fst present) in
-              Otyp_variant (non_gen, Ovar_typ out_variant, row.row_closed, tags)
-        | _ ->
-            let non_gen =
-              not (row.row_closed && all_present) && is_non_gen sch px in
-            let fields = List.map (tree_of_row_field sch) fields in
-            let tags =
-              if all_present then None else Some (List.map fst present) in
-            Otyp_variant (non_gen, Ovar_fields fields, row.row_closed, tags)
-        end
-    | Tobject (fi, nm) ->
-        tree_of_typobject sch fi !nm
-    | Tnil | Tfield _ ->
-        tree_of_typobject sch ty None
-    | Tsubst ty ->
-        tree_of_typexp sch ty
-    | Tlink _ ->
-        fatal_error "Printtyp.tree_of_typexp"
-    | Tpoly (ty, []) ->
-        tree_of_typexp sch ty
-    | Tpoly (ty, tyl) ->
-        (*let print_names () =
-          List.iter (fun (_, name) -> prerr_string (name ^ " ")) !names;
-          prerr_string "; " in *)
-        let tyl = List.map repr tyl in
-        if tyl = [] then tree_of_typexp sch ty else begin
-          let old_delayed = !delayed in
-          (* Make the names delayed, so that the real type is
-             printed once when used as proxy *)
-          List.iter add_delayed tyl;
-          let tl = List.map (name_of_type new_name) tyl in
-          let tr = Otyp_poly (tl, tree_of_typexp sch ty) in
-          (* Forget names when we leave scope *)
-          remove_names tyl;
-          delayed := old_delayed; tr
-        end
-    | Tunivar _ ->
-        Otyp_var (false, name_of_type new_name ty)
-    | Tpackage (p, n, tyl) ->
-        let n =
-          List.map (fun li -> String.concat "." (Longident.flatten li)) n in
-        Otyp_module (Path.name p, n, tree_of_typlist sch tyl)
-  in
-  if List.memq px !delayed then delayed := Ext_list.filter !delayed ((!=) px) ;
-  if is_aliased px && aliasable ty then begin
-    check_name_of_type px;
-    Otyp_alias (pr_typ (), name_of_type new_name px) end
-  else pr_typ ()
-
-and tree_of_row_field sch (l, f) =
-  match row_field_repr f with
-  | Rpresent None | Reither(true, [], _, _) -> (l, false, [])
-  | Rpresent(Some ty) -> (l, false, [tree_of_typexp sch ty])
-  | Reither(c, tyl, _, _) ->
-      if c (* contradiction: constant constructor with an argument *)
-      then (l, true, tree_of_typlist sch tyl)
-      else (l, false, tree_of_typlist sch tyl)
-  | Rabsent -> (l, false, [] (* actually, an error *))
-
-and tree_of_typlist sch tyl =
-  List.map (tree_of_typexp sch) tyl
-
-and tree_of_typobject sch fi nm =
-  begin match nm with
-  | None ->
-      let pr_fields fi =
-        let (fields, rest) = flatten_fields fi in
-        let present_fields =
-          List.fold_right
-            (fun (n, k, t) l ->
-               match field_kind_repr k with
-               | Fpresent -> (n, t) :: l
-               | _ -> l)
-            fields [] in
-        let sorted_fields =
-          List.sort
-            (fun (n, _) (n', _) -> String.compare n n') present_fields in
-        tree_of_typfields sch rest sorted_fields in
-      let (fields, rest) = pr_fields fi in
-      Otyp_object (fields, rest)
-  | Some (p, ty :: tyl) ->
-      let non_gen = is_non_gen sch (repr ty) in
-      let args = tree_of_typlist sch tyl in
-      let (p', s) = best_type_path p in
-      assert (s = Id);
-      Otyp_class (non_gen, tree_of_path p', args)
-  | _ ->
-      fatal_error "Printtyp.tree_of_typobject"
-  end
-
-and is_non_gen sch ty =
-    sch && is_Tvar ty && ty.level <> generic_level
-
-and tree_of_typfields sch rest = function
-  | [] ->
-      let rest =
-        match rest.desc with
-        | Tvar _ | Tunivar _ -> Some (is_non_gen sch rest)
-        | Tconstr _ -> Some false
-        | Tnil -> None
-        | _ -> fatal_error "typfields (1)"
-      in
-      ([], rest)
-  | (s, t) :: l ->
-      let field = (s, tree_of_typexp sch t) in
-      let (fields, rest) = tree_of_typfields sch rest l in
-      (field :: fields, rest)
-
-let typexp sch ppf ty =
-  !Oprint.out_type ppf (tree_of_typexp sch ty)
-
-let type_expr ppf ty = typexp false ppf ty
-
-and type_sch ppf ty = typexp true ppf ty
-
-and type_scheme ppf ty = reset_and_mark_loops ty; typexp true ppf ty
-
-(* Maxence *)
-let type_scheme_max ?(b_reset_names=true) ppf ty =
-  if b_reset_names then reset_names () ;
-  typexp true ppf ty
-(* End Maxence *)
-
-let tree_of_type_scheme ty = reset_and_mark_loops ty; tree_of_typexp true ty
-
-(* Print one type declaration *)
-
-let tree_of_constraints params =
-  List.fold_right
-    (fun ty list ->
-       let ty' = unalias ty in
-       if proxy ty != proxy ty' then
-         let tr = tree_of_typexp true ty in
-         (tr, tree_of_typexp true ty') :: list
-       else list)
-    params []
-
-let filter_params tyl =
-  let params =
-    List.fold_left
-      (fun tyl ty ->
-        let ty = repr ty in
-        if List.memq ty tyl then Btype.newgenty (Tsubst ty) :: tyl
-        else ty :: tyl)
-      [] tyl
-  in List.rev params
-
-let mark_loops_constructor_arguments = function
-  | Cstr_tuple l -> List.iter mark_loops l
-  | Cstr_record l -> List.iter (fun l -> mark_loops l.ld_type) l
-
-let rec tree_of_type_decl id decl =
-
-  reset();
-
-  let params = filter_params decl.type_params in
-
-  begin match decl.type_manifest with
-  | Some ty ->
-      let vars = free_variables ty in
-      List.iter
-        (function {desc = Tvar (Some "_")} as ty ->
-            if List.memq ty vars then ty.desc <- Tvar None
-          | _ -> ())
-        params
-  | None -> ()
-  end;
-
-  List.iter add_alias params;
-  List.iter mark_loops params;
-  List.iter check_name_of_type (List.map proxy params);
-  let ty_manifest =
-    match decl.type_manifest with
-    | None -> None
-    | Some ty ->
-        let ty =
-          (* Special hack to hide variant name *)
-          match repr ty with {desc=Tvariant row} ->
-            let row = row_repr row in
-            begin match row.row_name with
-              Some (Pident id', _) when Ident.same id id' ->
-                newgenty (Tvariant {row with row_name = None})
-            | _ -> ty
-            end
-          | _ -> ty
-        in
-        mark_loops ty;
-        Some ty
-  in
-  begin match decl.type_kind with
-  | Type_abstract -> ()
-  | Type_variant cstrs ->
-      List.iter
-        (fun c ->
-           mark_loops_constructor_arguments c.cd_args;
-           may mark_loops c.cd_res)
-        cstrs
-  | Type_record(l, _rep) ->
-      List.iter (fun l -> mark_loops l.ld_type) l
-  | Type_open -> ()
-  end;
-
-  let type_param =
-    function
-    | Otyp_var (_, id) -> id
-    | _ -> "?"
-  in
-  let type_defined decl =
-    let abstr =
-      match decl.type_kind with
-        Type_abstract ->
-          decl.type_manifest = None || decl.type_private = Private
-      | Type_record _ ->
-          decl.type_private = Private
-      | Type_variant tll ->
-          decl.type_private = Private ||
-          List.exists (fun cd -> cd.cd_res <> None) tll
-      | Type_open ->
-          decl.type_manifest = None
-    in
-    let vari =
-      List.map2
-        (fun ty v ->
-          if abstr || not (is_Tvar (repr ty)) then Variance.get_upper v
-          else (true,true))
-        decl.type_params decl.type_variance
-    in
-    (Ident.name id,
-     List.map2 (fun ty cocn -> type_param (tree_of_typexp false ty), cocn)
-       params vari)
-  in
-  let tree_of_manifest ty1 =
-    match ty_manifest with
-    | None -> ty1
-    | Some ty -> Otyp_manifest (tree_of_typexp false ty, ty1)
-  in
-  let (name, args) = type_defined decl in
-  let constraints = tree_of_constraints params in
-  let untagged = ref false in
-  let ty, priv =
-    match decl.type_kind with
-    | Type_abstract ->
-        begin match ty_manifest with
-        | None -> (Otyp_abstract, Public)
-        | Some ty ->
-            tree_of_typexp false ty, decl.type_private
-        end
-    | Type_variant cstrs ->
-        untagged := Ast_untagged_variants.process_untagged decl.type_attributes;
-        tree_of_manifest (Otyp_sum (List.map tree_of_constructor cstrs)),
-        decl.type_private
-    | Type_record(lbls, _rep) ->
-        tree_of_manifest (Otyp_record (List.map tree_of_label lbls)),
-        decl.type_private
-    | Type_open ->
-        tree_of_manifest Otyp_open,
-        decl.type_private
-  in
-  let immediate =
-    Builtin_attributes.immediate decl.type_attributes
-  in
-    { otype_name = name;
-      otype_params = args;
-      otype_type = ty;
-      otype_private = priv;
-      otype_immediate = immediate;
-      otype_unboxed = decl.type_unboxed.unboxed || !untagged;
-      otype_cstrs = constraints ;
-      }
-
-and tree_of_constructor_arguments = function
-  | Cstr_tuple l -> tree_of_typlist false l
-  | Cstr_record l -> [ Otyp_record (List.map tree_of_label l) ]
-
-and tree_of_constructor cd =
-  let name = Ident.name cd.cd_id in
-  let nullary = Ast_untagged_variants.is_nullary_variant cd.cd_args in
-  let repr =
-    if not nullary then None
-    else match Ast_untagged_variants.process_tag_type cd.cd_attributes with
-      | Some Null -> Some "@as(null)"
-      | Some Undefined -> Some "@as(undefined)"
-      | Some (String s) -> Some (Printf.sprintf "@as(%S)" s)
-      | Some (Int i) -> Some (Printf.sprintf "@as(%d)" i)
-      | Some (Float f) -> Some (Printf.sprintf "@as(%s)" f)
-      | Some (Bool b) -> Some (Printf.sprintf "@as(%b)" b)
-      | Some (BigInt s) -> Some (Printf.sprintf "@as(%sn)" s)
-      | Some (Untagged _) (* should never happen *)
-      | None -> None in
-  let arg () = tree_of_constructor_arguments cd.cd_args in
-  match cd.cd_res with
-  | None -> (name, arg (), None, repr)
-  | Some res ->
-      let nm = !names in
-      names := [];
-      let ret = tree_of_typexp false res in
-      let args = arg () in
-      names := nm;
-      (name, args, Some ret, repr)
-
-and tree_of_label l =
-  let opt = l.ld_attributes |> List.exists (fun ({txt}, _) -> txt = "ns.optional" || txt = "res.optional") in
-  let typ = match l.ld_type.desc with
-    | Tconstr (p, [t1], _) when opt && Path.same p Predef.path_option -> t1
-    | _ -> l.ld_type in
-  (Ident.name l.ld_id, l.ld_mutable = Mutable, opt, tree_of_typexp false typ)
-
-let tree_of_type_declaration id decl rs =
-  Osig_type (tree_of_type_decl id decl, tree_of_rec rs)
-
-let type_declaration id ppf decl =
-  !Oprint.out_sig_item ppf (tree_of_type_declaration id decl Trec_not)
-
-let constructor_arguments ppf a =
-  let tys = tree_of_constructor_arguments a in
-  !Oprint.out_type ppf (Otyp_tuple tys)
-
-(* Print an extension declaration *)
-
-let tree_of_extension_constructor id ext es =
-  reset ();
-  let ty_name = Path.name ext.ext_type_path in
-  let ty_params = filter_params ext.ext_type_params in
-  List.iter add_alias ty_params;
-  List.iter mark_loops ty_params;
-  List.iter check_name_of_type (List.map proxy ty_params);
-  mark_loops_constructor_arguments ext.ext_args;
-  may mark_loops ext.ext_ret_type;
-  let type_param =
-    function
-    | Otyp_var (_, id) -> id
-    | _ -> "?"
-  in
-  let ty_params =
-    List.map (fun ty -> type_param (tree_of_typexp false ty)) ty_params
-  in
-  let name = Ident.name id in
-  let args, ret =
-    match ext.ext_ret_type with
-    | None -> (tree_of_constructor_arguments ext.ext_args, None)
-    | Some res ->
-        let nm = !names in
-        names := [];
-        let ret = tree_of_typexp false res in
-        let args = tree_of_constructor_arguments ext.ext_args in
-        names := nm;
-        (args, Some ret)
-  in
-  let ext =
-    { oext_name = name;
-      oext_type_name = ty_name;
-      oext_type_params = ty_params;
-      oext_args = args;
-      oext_ret_type = ret;
-      oext_repr = None;
-      oext_private = ext.ext_private }
-  in
-  let es =
-    match es with
-        Text_first -> Oext_first
-      | Text_next -> Oext_next
-      | Text_exception -> Oext_exception
-  in
-    Osig_typext (ext, es)
-
-let extension_constructor id ppf ext =
-  !Oprint.out_sig_item ppf (tree_of_extension_constructor id ext Text_first)
-
-(* Print a value declaration *)
-
-let tree_of_value_description id decl =
-  (* Format.eprintf "@[%a@]@." raw_type_expr decl.val_type; *)
-  let id = Ident.name id in
-  let ty = tree_of_type_scheme decl.val_type in
-  let vd =
-    { oval_name = id;
-      oval_type = ty;
-      oval_prims = [];
-      oval_attributes = [] }
-  in
-  let vd =
-    match decl.val_kind with
-    | Val_prim p -> Primitive.print p vd
-    | _ -> vd
-  in
-  Osig_value vd
-
-let value_description id ppf decl =
-  !Oprint.out_sig_item ppf (tree_of_value_description id decl)
-
-(* Print a class type *)
-
-let method_type (_, kind, ty) =
-  match field_kind_repr kind, repr ty with
-    Fpresent, {desc=Tpoly(ty, tyl)} -> (ty, tyl)
-  | _       , ty                    -> (ty, [])
-
-let tree_of_metho sch concrete csil (lab, kind, ty) =
-  if lab <> dummy_method then begin
-    let kind = field_kind_repr kind in
-    let priv = kind <> Fpresent in
-    let virt = not (Concr.mem lab concrete) in
-    let (ty, tyl) = method_type (lab, kind, ty) in
-    let tty = tree_of_typexp sch ty in
-    remove_names tyl;
-    Ocsg_method (lab, priv, virt, tty) :: csil
-  end
-  else csil
-
-let rec prepare_class_type params = function
-  | Cty_constr (_p, tyl, cty) ->
-      let sty = Ctype.self_type cty in
-      if List.memq (proxy sty) !visited_objects
-      || not (List.for_all is_Tvar params)
-      || List.exists (deep_occur sty) tyl
-      then prepare_class_type params cty
-      else List.iter mark_loops tyl
-  | Cty_signature sign ->
-      let sty = repr sign.csig_self in
-      (* Self may have a name *)
-      let px = proxy sty in
-      if List.memq px !visited_objects then add_alias sty
-      else visited_objects := px :: !visited_objects;
-      let (fields, _) =
-        Ctype.flatten_fields (Ctype.object_fields sign.csig_self)
-      in
-      List.iter (fun met -> mark_loops (fst (method_type met))) fields;
-      Vars.iter (fun _ (_, _, ty) -> mark_loops ty) sign.csig_vars
-  | Cty_arrow (_, ty, cty) ->
-      mark_loops ty;
-      prepare_class_type params cty
-
-let rec tree_of_class_type sch params =
-  function
-  | Cty_constr (p', tyl, cty) ->
-      let sty = Ctype.self_type cty in
-      if List.memq (proxy sty) !visited_objects
-      || not (List.for_all is_Tvar params)
-      then
-        tree_of_class_type sch params cty
-      else
-        Octy_constr (tree_of_path p', tree_of_typlist true tyl)
-  | Cty_signature sign ->
-      let sty = repr sign.csig_self in
-      let self_ty =
-        if is_aliased sty then
-          Some (Otyp_var (false, name_of_type new_name (proxy sty)))
-        else None
-      in
-      let (fields, _) =
-        Ctype.flatten_fields (Ctype.object_fields sign.csig_self)
-      in
-      let csil = [] in
-      let csil =
-        List.fold_left
-          (fun csil (ty1, ty2) -> Ocsg_constraint (ty1, ty2) :: csil)
-          csil (tree_of_constraints params)
-      in
-      let all_vars =
-        Vars.fold (fun l (m, v, t) all -> (l, m, v, t) :: all) sign.csig_vars []
-      in
-      (* Consequence of PR#3607: order of Map.fold has changed! *)
-      let all_vars = List.rev all_vars in
-      let csil =
-        List.fold_left
-          (fun csil (l, m, v, t) ->
-            Ocsg_value (l, m = Mutable, v = Virtual, tree_of_typexp sch t)
-            :: csil)
-          csil all_vars
-      in
-      let csil =
-        List.fold_left (tree_of_metho sch sign.csig_concr) csil fields
-      in
-      Octy_signature (self_ty, List.rev csil)
-  | Cty_arrow (l, ty, cty) ->
-      let lab =
-         string_of_label l
-      in
-      let ty =
-       if is_optional l then
-         match (repr ty).desc with
-         | Tconstr(path, [ty], _) when Path.same path Predef.path_option -> ty
-         | _ -> newconstr (Path.Pident(Ident.create "<hidden>")) []
-       else ty in
-      let tr = tree_of_typexp sch ty in
-      Octy_arrow (lab, tr, tree_of_class_type sch params cty)
-
-let class_type ppf cty =
-  reset ();
-  prepare_class_type [] cty;
-  !Oprint.out_class_type ppf (tree_of_class_type false [] cty)
-
-let tree_of_class_param param variance =
-  (match tree_of_typexp true param with
-    Otyp_var (_, s) -> s
-  | _ -> "?"),
-  if is_Tvar (repr param) then (true, true) else variance
-
-let class_variance =
-  List.map Variance.(fun v -> mem May_pos v, mem May_neg v)
-
-let tree_of_class_declaration id cl rs =
-  let params = filter_params cl.cty_params in
-
-  reset ();
-  List.iter add_alias params;
-  prepare_class_type params cl.cty_type;
-  let sty = Ctype.self_type cl.cty_type in
-  List.iter mark_loops params;
-
-  List.iter check_name_of_type (List.map proxy params);
-  if is_aliased sty then check_name_of_type (proxy sty);
-
-  let vir_flag = cl.cty_new = None in
-  Osig_class
-    (vir_flag, Ident.name id,
-     List.map2 tree_of_class_param params (class_variance cl.cty_variance),
-     tree_of_class_type true params cl.cty_type,
-     tree_of_rec rs)
-
-let class_declaration id ppf cl =
-  !Oprint.out_sig_item ppf (tree_of_class_declaration id cl Trec_first)
-
-let tree_of_cltype_declaration id cl rs =
-  let params = List.map repr cl.clty_params in
-
-  reset ();
-  List.iter add_alias params;
-  prepare_class_type params cl.clty_type;
-  let sty = Ctype.self_type cl.clty_type in
-  List.iter mark_loops params;
-
-  List.iter check_name_of_type (List.map proxy params);
-  if is_aliased sty then check_name_of_type (proxy sty);
-
-  let sign = Ctype.signature_of_class_type cl.clty_type in
-
-  let virt =
-    let (fields, _) =
-      Ctype.flatten_fields (Ctype.object_fields sign.csig_self) in
-    List.exists
-      (fun (lab, _, _) ->
-         not (lab = dummy_method || Concr.mem lab sign.csig_concr))
-      fields
-    || Vars.fold (fun _ (_,vr,_) b -> vr = Virtual || b) sign.csig_vars false
-  in
-
-  Osig_class_type
-    (virt, Ident.name id,
-     List.map2 tree_of_class_param params (class_variance cl.clty_variance),
-     tree_of_class_type true params cl.clty_type,
-     tree_of_rec rs)
-
-let cltype_declaration id ppf cl =
-  !Oprint.out_sig_item ppf (tree_of_cltype_declaration id cl Trec_first)
-
-(* Print a module type *)
-
-let wrap_env fenv ftree arg =
-  let env = !printing_env in
-  set_printing_env (fenv env);
-  let tree = ftree arg in
-  set_printing_env env;
-  tree
-
-let filter_rem_sig item rem =
-  match item, rem with
-  | Sig_class_type _, tydecl1 :: tydecl2 :: rem ->
-      ([tydecl1; tydecl2], rem)
-  | _ ->
-      ([], rem)
-
-let dummy =
-  { type_params = []; type_arity = 0; type_kind = Type_abstract;
-    type_private = Public; type_manifest = None; type_variance = [];
-    type_newtype_level = None; type_loc = Location.none;
-    type_attributes = [];
-    type_immediate = false;
-    type_unboxed = unboxed_false_default_false;
-  }
-
-let hide_rec_items = function
-  | Sig_type(id, _decl, rs) ::rem
-    when rs = Trec_first && not !Clflags.real_paths ->
-      let rec get_ids = function
-          Sig_type (id, _, Trec_next) :: rem ->
-            id :: get_ids rem
-        | _ -> []
-      in
-      let ids = id :: get_ids rem in
-      set_printing_env
-        (List.fold_right
-           (fun id -> Env.add_type ~check:false (Ident.rename id) dummy)
-           ids !printing_env)
-  | _ -> ()
-
-let rec tree_of_modtype ?(ellipsis=false) = function
-  | Mty_ident p ->
-      Omty_ident (tree_of_path p)
-  | Mty_signature sg ->
-      Omty_signature (if ellipsis then [Osig_ellipsis]
-                      else tree_of_signature sg)
-  | Mty_functor(param, ty_arg, ty_res) ->
-      let res =
-        match ty_arg with None -> tree_of_modtype ~ellipsis ty_res
-        | Some mty ->
-            wrap_env (Env.add_module ~arg:true param mty)
-                     (tree_of_modtype ~ellipsis) ty_res
-      in
-      Omty_functor (Ident.name param,
-                    may_map (tree_of_modtype ~ellipsis:false) ty_arg, res)
-  | Mty_alias(_, p) ->
-      Omty_alias (tree_of_path p)
-
-and tree_of_signature sg =
-  wrap_env (fun env -> env) (tree_of_signature_rec !printing_env false) sg
-
-and tree_of_signature_rec env' in_type_group = function
-    [] -> []
-  | item :: rem as items ->
-      let in_type_group =
-        match in_type_group, item with
-          true, Sig_type (_, _, Trec_next) -> true
-        | _, Sig_type (_, _, (Trec_not | Trec_first)) ->
-            set_printing_env env'; true
-        | _ -> set_printing_env env'; false
-      in
-      let (sg, rem) = filter_rem_sig item rem in
-      hide_rec_items items;
-      let trees = trees_of_sigitem item in
-      let env' = Env.add_signature (item :: sg) env' in
-      trees @ tree_of_signature_rec env' in_type_group rem
-
-and trees_of_sigitem = function
-  | Sig_value(id, decl) ->
-      [tree_of_value_description id decl]
-  | Sig_type(id, _, _) when is_row_name (Ident.name id) ->
-      []
-  | Sig_type(id, decl, rs) ->
-      [tree_of_type_declaration id decl rs]
-  | Sig_typext(id, ext, es) ->
-      [tree_of_extension_constructor id ext es]
-  | Sig_module(id, md, rs) ->
-      let ellipsis =
-        List.exists (function ({txt="..."}, Parsetree.PStr []) -> true
-                            | _ -> false)
-          md.md_attributes in
-      [tree_of_module id md.md_type rs ~ellipsis]
-  | Sig_modtype(id, decl) ->
-      [tree_of_modtype_declaration id decl]
-  | Sig_class() ->
-      []
-  | Sig_class_type(id, decl, rs) ->
-      [tree_of_cltype_declaration id decl rs]
-
-and tree_of_modtype_declaration id decl =
-  let mty =
-    match decl.mtd_type with
-    | None -> Omty_abstract
-    | Some mty -> tree_of_modtype mty
-  in
-  Osig_modtype (Ident.name id, mty)
-
-and tree_of_module id ?ellipsis mty rs =
-  Osig_module (Ident.name id, tree_of_modtype ?ellipsis mty, tree_of_rec rs)
-
-let modtype ppf mty = !Oprint.out_module_type ppf (tree_of_modtype mty)
-let modtype_declaration id ppf decl =
-  !Oprint.out_sig_item ppf (tree_of_modtype_declaration id decl)
-
-(* For the toplevel: merge with tree_of_signature? *)
-
-(* Refresh weak variable map in the toplevel *)
-let refresh_weak () =
-  let refresh t name (m,s) =
-    if is_non_gen true (repr t) then
-      begin
-        TypeMap.add t name m,
-        StringSet.add name s
-      end
-    else m, s in
-  let m, s =
-    TypeMap.fold refresh !weak_var_map (TypeMap.empty ,StringSet.empty)  in
-  named_weak_vars := s;
-  weak_var_map := m
-
-let print_items showval env x =
-  refresh_weak();
-  let rec print showval env = function
-  | [] -> []
-  | item :: rem as items ->
-      let (_sg, rem) = filter_rem_sig item rem in
-      hide_rec_items items;
-      let trees = trees_of_sigitem item in
-      List.map (fun d -> (d, showval env item)) trees @
-      print showval env rem in
-  print showval env x
-
-(* Print a signature body (used by -i when compiling a .ml) *)
-
-let print_signature ppf tree =
-  fprintf ppf "@[<v>%a@]" !Oprint.out_signature tree
-
-let signature ppf sg =
-  fprintf ppf "%a" print_signature (tree_of_signature sg)
-
-(* Print an unification error *)
-
-let same_path t t' =
-  let t = repr t and t' = repr t' in
-  t == t' ||
-  match t.desc, t'.desc with
-    Tconstr(p,tl,_), Tconstr(p',tl',_) ->
-      let (p1, s1) = best_type_path p and (p2, s2)  = best_type_path p' in
-      begin match s1, s2 with
-        Nth n1, Nth n2 when n1 = n2 -> true
-      | (Id | Map _), (Id | Map _) when Path.same p1 p2 ->
-          let tl = apply_subst s1 tl and tl' = apply_subst s2 tl' in
-          List.length tl = List.length tl' &&
-          List.for_all2 same_type tl tl'
-      | _ -> false
-      end
-  | _ ->
-      false
-
-let type_expansion t ppf t' =
-  if same_path t t'
-  then begin add_delayed (proxy t); type_expr ppf t end
-  else
-  let t' = if proxy t == proxy t' then unalias t' else t' in
-  fprintf ppf "@[<2>%a@ =@ %a@]" type_expr t type_expr t'
-
-let type_path_expansion tp ppf tp' =
-  if Path.same tp tp' then path ppf tp else
-  fprintf ppf "@[<2>%a@ =@ %a@]" path tp path tp'
-
-let rec trace fst txt ppf = function
-  | (t1, t1') :: (t2, t2') :: rem ->
-      if not fst then fprintf ppf "@,";
-      fprintf ppf "@[Type@;<1 2>%a@ %s@;<1 2>%a@] %a"
-       (type_expansion t1) t1' txt (type_expansion t2) t2'
-       (trace false txt) rem
-  | _ -> ()
-
-let rec filter_trace keep_last = function
-  | (_, t1') :: (_, t2') :: [] when is_Tvar t1' || is_Tvar t2' ->
-      []
-  | (t1, t1') :: (t2, t2') :: rem ->
-      let rem' = filter_trace keep_last rem in
-      if is_constr_row ~allow_ident:true t1'
-      || is_constr_row ~allow_ident:true t2'
-      || same_path t1 t1' && same_path t2 t2' && not (keep_last && rem' = [])
-      then rem'
-      else (t1, t1') :: (t2, t2') :: rem'
-  | _ -> []
-
-let rec type_path_list ppf = function
-  | [tp, tp'] -> type_path_expansion tp ppf tp'
-  | (tp, tp') :: rem ->
-      fprintf ppf "%a@;<2 0>%a"
-        (type_path_expansion tp) tp'
-        type_path_list rem
-  | [] -> ()
-
-(* Hide variant name and var, to force printing the expanded type *)
-let hide_variant_name t =
-  match repr t with
-  | {desc = Tvariant row} as t when (row_repr row).row_name <> None ->
-      newty2 t.level
-        (Tvariant {(row_repr row) with row_name = None;
-                   row_more = newvar2 (row_more row).level})
-  | _ -> t
-
-let prepare_expansion (t, t') =
-  let t' = hide_variant_name t' in
-  mark_loops t;
-  if not (same_path t t') then mark_loops t';
-  (t, t')
-
-let may_prepare_expansion compact (t, t') =
-  match (repr t').desc with
-    Tvariant _ | Tobject _ when compact ->
-      mark_loops t; (t, t)
-  | _ -> prepare_expansion (t, t')
-
-let print_tags ppf fields =
-  match fields with [] -> ()
-  | (t, _) :: fields ->
-      fprintf ppf "%s" (!print_res_poly_identifier t);
-      List.iter (fun (t, _) -> fprintf ppf ",@ %s" (!print_res_poly_identifier t)) fields
-
-let has_explanation t3 t4 =
-  match t3.desc, t4.desc with
-    Tfield _, (Tnil|Tconstr _) | (Tnil|Tconstr _), Tfield _
-  | Tnil, Tconstr _ | Tconstr _, Tnil
-  | _, Tvar _ | Tvar _, _
-  | Tvariant _, Tvariant _ -> true
-  | Tfield (l,_,_,{desc=Tnil}), Tfield (l',_,_,{desc=Tnil}) -> l = l'
-  | _ -> false
-
-let rec mismatch = function
-    (_, t) :: (_, t') :: rem ->
-      begin match mismatch rem with
-        Some _ as m -> m
-      | None ->
-          if has_explanation t t' then Some(t,t') else None
-      end
-  | [] -> None
-  | _ -> assert false
-
-let explanation unif t3 t4 ppf =
-  match t3.desc, t4.desc with
-  | Ttuple [], Tvar _ | Tvar _, Ttuple [] ->
-      fprintf ppf "@,Self type cannot escape its class"
-  | Tconstr (p, _, _), Tvar _
-    when unif && t4.level < Path.binding_time p ->
-      fprintf ppf
-        "@,@[The type constructor@;<1 2>%a@ would escape its scope@]"
-        path p
-  | Tvar _, Tconstr (p, _, _)
-    when unif && t3.level < Path.binding_time p ->
-      fprintf ppf
-        "@,@[The type constructor@;<1 2>%a@ would escape its scope@]"
-        path p
-  | Tvar _, Tunivar _ | Tunivar _, Tvar _ ->
-      fprintf ppf "@,The universal variable %a would escape its scope"
-        type_expr (if is_Tunivar t3 then t3 else t4)
-  | Tvar _, _ | _, Tvar _ ->
-      let t, t' = if is_Tvar t3 then (t3, t4) else (t4, t3) in
-      if occur_in Env.empty t t' then
-        fprintf ppf "@,@[<hov>The type variable %a occurs inside@ %a@]"
-          type_expr t type_expr t'
-      else
-        fprintf ppf "@,@[<hov>This instance of %a is ambiguous:@ %s@]"
-          type_expr t'
-          "it would escape the scope of its equation"
-  | Tfield (lab, _, _, _), _ when lab = dummy_method ->
-      fprintf ppf
-        "@,Self type cannot be unified with a closed object type"
-  | _, Tfield (lab, _, _, _) when lab = dummy_method ->
-      fprintf ppf
-        "@,Self type cannot be unified with a closed object type"
-  | Tfield (l,_,_,{desc=Tnil}), Tfield (l',_,_,{desc=Tnil}) when l = l' ->
-      fprintf ppf "@,Types for method %s are incompatible" l
-  | (Tnil|Tconstr _), Tfield (l, _, _, _) ->
-      fprintf ppf
-        "@,@[The first object type has no field %s@]" l
-  | Tfield (l, _, _, _), (Tnil|Tconstr _) ->
-      fprintf ppf
-        "@,@[The second object type has no field %s@]" l
-  | Tnil, Tconstr _ | Tconstr _, Tnil ->
-      fprintf ppf
-        "@,@[The %s object type has an abstract row, it cannot be closed@]"
-        (if t4.desc = Tnil then "first" else "second")
-  | Tvariant row1, Tvariant row2 ->
-      let row1 = row_repr row1 and row2 = row_repr row2 in
-      begin match
-        row1.row_fields, row1.row_closed, row2.row_fields, row2.row_closed with
-      | [], true, [], true ->
-          fprintf ppf "@,These two variant types have no intersection"
-      | [], true, (_::_ as fields), _ ->
-          fprintf ppf
-            "@,@[The first variant type does not allow tag(s)@ @[<hov>%a@]@]"
-            print_tags fields
-      | (_::_ as fields), _, [], true ->
-          fprintf ppf
-            "@,@[The second variant type does not allow tag(s)@ @[<hov>%a@]@]"
-            print_tags fields
-      | [l1,_], true, [l2,_], true when l1 = l2 ->
-          fprintf ppf "@,Types for tag %s are incompatible" (!print_res_poly_identifier l1)
-      | _ -> ()
-      end
-  | _ -> ()
-
-
-let warn_on_missing_def env ppf t =
-  match t.desc with
-  | Tconstr (p,_,_) ->
-    begin
-      try
-        ignore(Env.find_type p env : Types.type_declaration)
-      with Not_found ->
-        fprintf ppf
-          "@,@[%a is abstract because no corresponding cmi file was found \
-           in path.@]" path p
-    end
-  | _ -> ()
-
-let explanation unif mis ppf =
-  match mis with
-    None -> ()
-  | Some (t3, t4) -> explanation unif t3 t4 ppf
-
-let ident_same_name id1 id2 =
-  if Ident.equal id1 id2 && not (Ident.same id1 id2) then begin
-    add_unique id1; add_unique id2
-  end
-
-let rec path_same_name p1 p2 =
-  match p1, p2 with
-    Pident id1, Pident id2 -> ident_same_name id1 id2
-  | Pdot (p1, s1, _), Pdot (p2, s2, _) when s1 = s2 -> path_same_name p1 p2
-  | Papply (p1, p1'), Papply (p2, p2') ->
-      path_same_name p1 p2; path_same_name p1' p2'
-  | _ -> ()
-
-let type_same_name t1 t2 =
-  match (repr t1).desc, (repr t2).desc with
-    Tconstr (p1, _, _), Tconstr (p2, _, _) ->
-      path_same_name (fst (best_type_path p1)) (fst (best_type_path p2))
-  | _ -> ()
-
-let rec trace_same_names = function
-    (t1, t1') :: (t2, t2') :: rem ->
-      type_same_name t1 t2; type_same_name t1' t2'; trace_same_names rem
-  | _ -> ()
-
-let unification_error env unif tr txt1 ppf txt2 =
-  reset ();
-  trace_same_names tr;
-  let tr = List.map (fun (t, t') -> (t, hide_variant_name t')) tr in
-  let mis = mismatch tr in
-  match tr with
-  | [] | _ :: [] -> assert false
-  | t1 :: t2 :: tr ->
-    try
-      let tr = filter_trace (mis = None) tr in
-      let t1, t1' = may_prepare_expansion (tr = []) t1
-      and t2, t2' = may_prepare_expansion (tr = []) t2 in
-      let tr = List.map prepare_expansion tr in
-      fprintf ppf
-        "@[<v>\
-          @[%t@;<1 2>%a@ \
-            %t@;<1 2>%a\
-          @]%a%t\
-         @]"
-        txt1 (type_expansion t1) t1'
-        txt2 (type_expansion t2) t2'
-        (trace false "is not compatible with type") tr
-        (explanation unif mis);
-      if env <> Env.empty
-      then begin
-        warn_on_missing_def env ppf t1;
-        warn_on_missing_def env ppf t2
-      end;
-    with exn ->
-      raise exn
-
-let report_unification_error ppf env ?(unif=true)
-    tr txt1 txt2 =
-  wrap_printing_env env (fun () -> unification_error env unif tr txt1 ppf txt2)
-;;
-
-
-let super_type_expansion ~tag t ppf t' =
-  let tag = Format.String_tag tag in
-  if same_path t t' then begin
-    Format.pp_open_stag ppf tag;
-    type_expr ppf t;
-    Format.pp_close_stag ppf ();
-  end else begin
-    let t' = if proxy t == proxy t' then unalias t' else t' in
-    fprintf ppf "@[<2>";
-    Format.pp_open_stag ppf tag;
-    fprintf ppf "%a" type_expr t;
-    Format.pp_close_stag ppf ();
-    fprintf ppf "@ @{<dim>(defined as@}@ ";
-    Format.pp_open_stag ppf tag;
-    fprintf ppf "%a" type_expr t';
-    Format.pp_close_stag ppf ();
-    fprintf ppf "@{<dim>)@}";
-    fprintf ppf "@]";
-  end
-
-let super_trace ppf =
-  let rec super_trace first_report ppf = function
-    | (t1, t1') :: (t2, t2') :: rem ->
-      fprintf ppf
-        "@,@,@[<v 2>";
-      if first_report then
-        fprintf ppf "The incompatible parts:@,"
-      else begin
-        fprintf ppf "Further expanded:@,"
-      end;
-      fprintf ppf
-        "@[<hov>%a@ vs@ %a@]%a"
-        (super_type_expansion ~tag:"error" t1) t1'
-        (super_type_expansion ~tag:"info" t2) t2'
-        (super_trace false) rem;
-      fprintf ppf "@]"
-    | _ -> ()
-  in super_trace true ppf
-
-let super_unification_error unif tr txt1 ppf txt2 = begin
-  reset ();
-  trace_same_names tr;
-  let tr = List.map (fun (t, t') -> (t, hide_variant_name t')) tr in
-  let mis = mismatch tr in
-  match tr with
-  | [] | _ :: [] -> assert false
-  | t1 :: t2 :: tr ->
-    try
-      let tr = filter_trace (mis = None) tr in
-      let t1, t1' = may_prepare_expansion (tr = []) t1
-      and t2, t2' = may_prepare_expansion (tr = []) t2 in
-      let tr = List.map prepare_expansion tr in
-      fprintf ppf
-        "@[<v 0>\
-          @[<hov 2>%t@ %a@]@,\
-          @[<hov 2>%t@ %a@]\
-          %a\
-          %t\
-        @]"
-        txt1 (super_type_expansion ~tag:"error" t1) t1'
-        txt2 (super_type_expansion ~tag:"info" t2) t2'
-        super_trace tr
-        (explanation unif mis);
-    with exn ->
-      raise exn
-end
-
-let super_report_unification_error ppf env ?(unif=true)
-    tr txt1 txt2 =
-  wrap_printing_env env (fun () -> super_unification_error unif tr txt1 ppf txt2)
-;;
-
-
-let trace fst keep_last txt ppf tr =
-  trace_same_names tr;
-  try match tr with
-    t1 :: t2 :: tr' ->
-      if fst then trace fst txt ppf (t1 :: t2 :: filter_trace keep_last tr')
-      else trace fst txt ppf (filter_trace keep_last tr);
-  | _ -> ()
-  with exn ->
-    raise exn
-
-let report_subtyping_error ppf env tr1 txt1 tr2 =
-  wrap_printing_env env (fun () ->
-    reset ();
-    let tr1 = List.map prepare_expansion tr1
-    and tr2 = List.map prepare_expansion tr2 in
-    fprintf ppf "@[<v>%a" (trace true (tr2 = []) txt1) tr1;
-    if tr2 = [] then fprintf ppf "@]" else
-    let mis = mismatch tr2 in
-    fprintf ppf "%a%t@]"
-      (trace false (mis = None) "is not compatible with type") tr2
-      (explanation true mis))
-
-let report_ambiguous_type_error ppf env (tp0, tp0') tpl txt1 txt2 txt3 =
-  wrap_printing_env env (fun () ->
-    reset ();
-    List.iter
-      (fun (tp, tp') -> path_same_name tp0 tp; path_same_name tp0' tp')
-      tpl;
-    match tpl with
-      [] -> assert false
-    | [tp, tp'] ->
-        fprintf ppf
-          "@[%t@;<1 2>%a@ \
-             %t@;<1 2>%a\
-           @]"
-          txt1 (type_path_expansion tp) tp'
-          txt3 (type_path_expansion tp0) tp0'
-    | _ ->
-        fprintf ppf
-          "@[%t@;<1 2>@[<hv>%a@]\
-             @ %t@;<1 2>%a\
-           @]"
-          txt2 type_path_list tpl
-          txt3 (type_path_expansion tp0) tp0')
diff --git a/jscomp/ml/printtyp.mli b/jscomp/ml/printtyp.mli
deleted file mode 100644
index af92ffa..0000000
--- a/jscomp/ml/printtyp.mli
+++ /dev/null
@@ -1,99 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Printing functions *)
-
-open Format
-open Types
-open Outcometree
-
-val print_res_poly_identifier: (string -> string) ref
-val longident: formatter -> Longident.t -> unit
-val ident: formatter -> Ident.t -> unit
-val tree_of_path: Path.t -> out_ident
-val path: formatter -> Path.t -> unit
-val string_of_path: Path.t -> string
-val raw_type_expr: formatter -> type_expr -> unit
-val string_of_label: Asttypes.arg_label -> string
-
-val wrap_printing_env: Env.t -> (unit -> 'a) -> 'a
-    (* Call the function using the environment for type path shortening *)
-    (* This affects all the printing functions below *)
-
-val reset: unit -> unit
-val mark_loops: type_expr -> unit
-val reset_and_mark_loops: type_expr -> unit
-val reset_and_mark_loops_list: type_expr list -> unit
-val type_expr: formatter -> type_expr -> unit
-val constructor_arguments: formatter -> constructor_arguments -> unit
-val tree_of_type_scheme: type_expr -> out_type
-val type_sch : formatter -> type_expr -> unit
-val type_scheme: formatter -> type_expr -> unit
-(* Maxence *)
-val reset_names: unit -> unit
-val type_scheme_max: ?b_reset_names: bool ->
-        formatter -> type_expr -> unit
-(* End Maxence *)
-val tree_of_value_description: Ident.t -> value_description -> out_sig_item
-val value_description: Ident.t -> formatter -> value_description -> unit
-val tree_of_type_declaration:
-    Ident.t -> type_declaration -> rec_status -> out_sig_item
-val type_declaration: Ident.t -> formatter -> type_declaration -> unit
-val tree_of_extension_constructor:
-    Ident.t -> extension_constructor -> ext_status -> out_sig_item
-val extension_constructor:
-    Ident.t -> formatter -> extension_constructor -> unit
-val tree_of_module:
-    Ident.t -> ?ellipsis:bool -> module_type -> rec_status -> out_sig_item
-val modtype: formatter -> module_type -> unit
-val signature: formatter -> signature -> unit
-val tree_of_modtype_declaration:
-    Ident.t -> modtype_declaration -> out_sig_item
-val tree_of_signature: Types.signature -> out_sig_item list
-val tree_of_typexp: bool -> type_expr -> out_type
-val modtype_declaration: Ident.t -> formatter -> modtype_declaration -> unit
-val class_type: formatter -> class_type -> unit
-val tree_of_class_declaration:
-    Ident.t -> class_declaration -> rec_status -> out_sig_item
-val class_declaration: Ident.t -> formatter -> class_declaration -> unit
-val tree_of_cltype_declaration:
-    Ident.t -> class_type_declaration -> rec_status -> out_sig_item
-val cltype_declaration: Ident.t -> formatter -> class_type_declaration -> unit
-val type_expansion: type_expr -> Format.formatter -> type_expr -> unit
-val prepare_expansion: type_expr * type_expr -> type_expr * type_expr
-val trace:
-    bool -> bool-> string -> formatter -> (type_expr * type_expr) list -> unit
-val report_unification_error:
-    formatter -> Env.t -> ?unif:bool -> (type_expr * type_expr) list ->
-    (formatter -> unit) -> (formatter -> unit) ->
-    unit
-
-
-val super_report_unification_error:
-    formatter -> Env.t -> ?unif:bool -> (type_expr * type_expr) list ->
-    (formatter -> unit) -> (formatter -> unit) ->
-    unit
-
-
-val report_subtyping_error:
-    formatter -> Env.t -> (type_expr * type_expr) list ->
-    string -> (type_expr * type_expr) list -> unit
-val report_ambiguous_type_error:
-    formatter -> Env.t -> (Path.t * Path.t) -> (Path.t * Path.t) list ->
-    (formatter -> unit) -> (formatter -> unit) -> (formatter -> unit) -> unit
-
-(* for toploop *)
-val print_items: (Env.t -> signature_item -> 'a option) ->
-  Env.t -> signature_item list -> (out_sig_item * 'a option) list
diff --git a/jscomp/ml/printtyped.ml b/jscomp/ml/printtyped.ml
deleted file mode 100644
index e38d17d..0000000
--- a/jscomp/ml/printtyped.ml
+++ /dev/null
@@ -1,786 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                   Fabrice Le Fessant, INRIA Saclay                     *)
-(*                                                                        *)
-(*   Copyright 1999 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Asttypes;;
-open Format;;
-open Lexing;;
-open Location;;
-open Typedtree;;
-
-let fmt_position f l =
-  if l.pos_lnum = -1
-  then fprintf f "%s[%d]" l.pos_fname l.pos_cnum
-  else fprintf f "%s[%d,%d+%d]" l.pos_fname l.pos_lnum l.pos_bol
-               (l.pos_cnum - l.pos_bol)
-;;
-
-let fmt_location f loc =
-  if !Clflags.dump_location then (
-  fprintf f "(%a..%a)" fmt_position loc.loc_start fmt_position loc.loc_end;
-  if loc.loc_ghost then fprintf f " ghost";
-  )
-;;
-
-let rec fmt_longident_aux f x =
-  match x with
-  | Longident.Lident (s) -> fprintf f "%s" s;
-  | Longident.Ldot (y, s) -> fprintf f "%a.%s" fmt_longident_aux y s;
-  | Longident.Lapply (y, z) ->
-      fprintf f "%a(%a)" fmt_longident_aux y fmt_longident_aux z;
-;;
-
-let fmt_longident f x = fprintf f "\"%a\"" fmt_longident_aux x.txt;;
-
-let fmt_ident = Ident.print
-
-let rec fmt_path_aux f x =
-  match x with
-  | Path.Pident (s) -> fprintf f "%a" fmt_ident s;
-  | Path.Pdot (y, s, _pos) -> fprintf f "%a.%s" fmt_path_aux y s;
-  | Path.Papply (y, z) ->
-      fprintf f "%a(%a)" fmt_path_aux y fmt_path_aux z;
-;;
-
-let fmt_path f x = fprintf f "\"%a\"" fmt_path_aux x;;
-
-let fmt_constant f x =
-  match x with
-  | Const_int (i) -> fprintf f "Const_int %d" i;
-  | Const_char (c) -> fprintf f "Const_char %02x" c;
-  | Const_string (s, None) -> fprintf f "Const_string(%S,None)" s;
-  | Const_string (s, Some delim) ->
-      fprintf f "Const_string (%S,Some %S)" s delim;
-  | Const_float (s) -> fprintf f "Const_float %s" s;
-  | Const_int32 (i) -> fprintf f "Const_int32 %ld" i;
-  | Const_int64 (i) -> fprintf f "Const_int64 %Ld" i;
-  | Const_bigint (sign, i) -> fprintf f "Const_bigint %s" (Bigint_utils.to_string sign i);
-;;
-
-let fmt_mutable_flag f x =
-  match x with
-  | Immutable -> fprintf f "Immutable";
-  | Mutable -> fprintf f "Mutable";
-;;
-
-let fmt_virtual_flag f x =
-  match x with
-  | Virtual -> fprintf f "Virtual";
-  | Concrete -> fprintf f "Concrete";
-;;
-
-let fmt_override_flag f x =
-  match x with
-  | Override -> fprintf f "Override";
-  | Fresh -> fprintf f "Fresh";
-;;
-
-let fmt_closed_flag f x =
-  match x with
-  | Closed -> fprintf f "Closed"
-  | Open -> fprintf f "Open"
-
-let fmt_rec_flag f x =
-  match x with
-  | Nonrecursive -> fprintf f "Nonrec";
-  | Recursive -> fprintf f "Rec";
-;;
-
-let fmt_direction_flag f x =
-  match x with
-  | Upto -> fprintf f "Up";
-  | Downto -> fprintf f "Down";
-;;
-
-let fmt_private_flag f x =
-  match x with
-  | Public -> fprintf f "Public";
-  | Private -> fprintf f "Private";
-;;
-
-let line i f s (*...*) =
-  fprintf f "%s" (String.make (2*i) ' ');
-  fprintf f s (*...*)
-;;
-
-let list i f ppf l =
-  match l with
-  | [] -> line i ppf "[]\n";
-  | _ :: _ ->
-     line i ppf "[\n";
-     List.iter (f (i+1) ppf) l;
-     line i ppf "]\n";
-;;
-
-let array i f ppf a =
-  if Array.length a = 0 then
-    line i ppf "[]\n"
-  else begin
-    line i ppf "[\n";
-    Array.iter (f (i+1) ppf) a;
-    line i ppf "]\n"
-  end
-;;
-
-let option i f ppf x =
-  match x with
-  | None -> line i ppf "None\n";
-  | Some x ->
-      line i ppf "Some\n";
-      f (i+1) ppf x;
-;;
-
-let longident i ppf li = line i ppf "%a\n" fmt_longident li;;
-let string i ppf s = line i ppf "\"%s\"\n" s;;
-let arg_label i ppf = function
-  | Nolabel -> line i ppf "Nolabel\n"
-  | Optional s -> line i ppf "Optional \"%s\"\n" s
-  | Labelled s -> line i ppf "Labelled \"%s\"\n" s
-;;
-
-let record_representation i ppf = let open Types in function
-  | Record_regular -> line i ppf "Record_regular\n"
-  | Record_float_unused -> assert false
-  | Record_optional_labels lbls ->
-    line i ppf "Record_optional_labels %s\n" (lbls |> String.concat ", ")
-  | Record_unboxed b -> line i ppf "Record_unboxed %b\n" b
-  | Record_inlined {tag = i} -> line i ppf "Record_inlined %d\n" i
-  | Record_extension -> line i ppf "Record_extension\n"
-
-let attributes i ppf l =
-  let i = i + 1 in
-  List.iter
-    (fun (s, arg) ->
-      line i ppf "attribute \"%s\"\n" s.txt;
-      Printast.payload (i + 1) ppf arg;
-    )
-    l
-
-let rec core_type i ppf x =
-  line i ppf "core_type %a\n" fmt_location x.ctyp_loc;
-  attributes i ppf x.ctyp_attributes;
-  let i = i+1 in
-  match x.ctyp_desc with
-  | Ttyp_any -> line i ppf "Ttyp_any\n";
-  | Ttyp_var (s) -> line i ppf "Ttyp_var %s\n" s;
-  | Ttyp_arrow (l, ct1, ct2) ->
-      line i ppf "Ttyp_arrow\n";
-      arg_label i ppf l;
-      core_type i ppf ct1;
-      core_type i ppf ct2;
-  | Ttyp_tuple l ->
-      line i ppf "Ttyp_tuple\n";
-      list i core_type ppf l;
-  | Ttyp_constr (li, _, l) ->
-      line i ppf "Ttyp_constr %a\n" fmt_path li;
-      list i core_type ppf l;
-  | Ttyp_variant (l, closed, low) ->
-      line i ppf "Ttyp_variant closed=%a\n" fmt_closed_flag closed;
-      list i label_x_bool_x_core_type_list ppf l;
-      option i (fun i -> list i string) ppf low
-  | Ttyp_object (l, c) ->
-      line i ppf "Ttyp_object %a\n" fmt_closed_flag c;
-      let i = i + 1 in
-      List.iter (function
-        | OTtag (s, attrs, t) ->
-            line i ppf "method %s\n" s.txt;
-            attributes i ppf attrs;
-            core_type (i + 1) ppf t
-        | OTinherit ct ->
-            line i ppf "OTinherit\n";
-            core_type (i + 1) ppf ct
-        ) l
-  | Ttyp_class (li, _, l) ->
-      line i ppf "Ttyp_class %a\n" fmt_path li;
-      list i core_type ppf l;
-  | Ttyp_alias (ct, s) ->
-      line i ppf "Ttyp_alias \"%s\"\n" s;
-      core_type i ppf ct;
-  | Ttyp_poly (sl, ct) ->
-      line i ppf "Ttyp_poly%a\n"
-        (fun ppf -> List.iter (fun x -> fprintf ppf " '%s" x)) sl;
-      core_type i ppf ct;
-  | Ttyp_package { pack_path = s; pack_fields = l } ->
-      line i ppf "Ttyp_package %a\n" fmt_path s;
-      list i package_with ppf l;
-
-and package_with i ppf (s, t) =
-  line i ppf "with type %a\n" fmt_longident s;
-  core_type i ppf t
-
-and pattern i ppf x =
-  line i ppf "pattern %a\n" fmt_location x.pat_loc;
-  attributes i ppf x.pat_attributes;
-  let i = i+1 in
-  match x.pat_extra with
-    | (Tpat_unpack, _, attrs) :: rem ->
-        line i ppf "Tpat_unpack\n";
-        attributes i ppf attrs;
-        pattern i ppf { x with pat_extra = rem }
-    | (Tpat_constraint cty, _, attrs) :: rem ->
-        line i ppf "Tpat_constraint\n";
-        attributes i ppf attrs;
-        core_type i ppf cty;
-        pattern i ppf { x with pat_extra = rem }
-    | (Tpat_type (id, _), _, attrs) :: rem ->
-        line i ppf "Tpat_type %a\n" fmt_path id;
-        attributes i ppf attrs;
-        pattern i ppf { x with pat_extra = rem }
-    | (Tpat_open (id,_,_), _, attrs)::rem ->
-        line i ppf "Tpat_open \"%a\"\n" fmt_path id;
-        attributes i ppf attrs;
-        pattern i ppf { x with pat_extra = rem }
-    | [] ->
-  match x.pat_desc with
-  | Tpat_any -> line i ppf "Tpat_any\n";
-  | Tpat_var (s,_) -> line i ppf "Tpat_var \"%a\"\n" fmt_ident s;
-  | Tpat_alias (p, s,_) ->
-      line i ppf "Tpat_alias \"%a\"\n" fmt_ident s;
-      pattern i ppf p;
-  | Tpat_constant (c) -> line i ppf "Tpat_constant %a\n" fmt_constant c;
-  | Tpat_tuple (l) ->
-      line i ppf "Tpat_tuple\n";
-      list i pattern ppf l;
-  | Tpat_construct (li, _, po) ->
-      line i ppf "Tpat_construct %a\n" fmt_longident li;
-      list i pattern ppf po;
-  | Tpat_variant (l, po, _) ->
-      line i ppf "Tpat_variant \"%s\"\n" l;
-      option i pattern ppf po;
-  | Tpat_record (l, _c) ->
-      line i ppf "Tpat_record\n";
-      list i longident_x_pattern ppf l;
-  | Tpat_array (l) ->
-      line i ppf "Tpat_array\n";
-      list i pattern ppf l;
-  | Tpat_or (p1, p2, _) ->
-      line i ppf "Tpat_or\n";
-      pattern i ppf p1;
-      pattern i ppf p2;
-  | Tpat_lazy p ->
-      line i ppf "Tpat_lazy\n";
-      pattern i ppf p;
-
-and expression_extra i ppf x attrs =
-  match x with
-  | Texp_constraint ct ->
-      line i ppf "Texp_constraint\n";
-      attributes i ppf attrs;
-      core_type i ppf ct;
-  | Texp_coerce (cto1, cto2) ->
-      line i ppf "Texp_coerce\n";
-      attributes i ppf attrs;
-      option i core_type ppf cto1;
-      core_type i ppf cto2;
-  | Texp_open (ovf, m, _, _) ->
-      line i ppf "Texp_open %a \"%a\"\n" fmt_override_flag ovf fmt_path m;
-      attributes i ppf attrs;
-  | Texp_poly cto ->
-      line i ppf "Texp_poly\n";
-      attributes i ppf attrs;
-      option i core_type ppf cto;
-  | Texp_newtype s ->
-      line i ppf "Texp_newtype \"%s\"\n" s;
-      attributes i ppf attrs;
-
-and expression i ppf x =
-  line i ppf "expression %a\n" fmt_location x.exp_loc;
-  attributes i ppf x.exp_attributes;
-  let i =
-    List.fold_left (fun i (extra,_,attrs) ->
-                      expression_extra i ppf extra attrs; i+1)
-      (i+1) x.exp_extra
-  in
-  match x.exp_desc with
-  | Texp_ident (li,_,_) -> line i ppf "Texp_ident %a\n" fmt_path li;
-  | Texp_instvar () -> assert false
-  | Texp_constant (c) -> line i ppf "Texp_constant %a\n" fmt_constant c;
-  | Texp_let (rf, l, e) ->
-      line i ppf "Texp_let %a\n" fmt_rec_flag rf;
-      list i value_binding ppf l;
-      expression i ppf e;
-  | Texp_function { arg_label = p; param ; cases; partial = _; } ->
-      line i ppf "Texp_function\n";
-      line i ppf "%a" Ident.print param;
-      arg_label i ppf p;
-      list i case ppf cases;
-  | Texp_apply (e, l) ->
-      line i ppf "Texp_apply\n";
-      expression i ppf e;
-      list i label_x_expression ppf l;
-  | Texp_match (e, l1, l2, _partial) ->
-      line i ppf "Texp_match\n";
-      expression i ppf e;
-      list i case ppf l1;
-      list i case ppf l2;
-  | Texp_try (e, l) ->
-      line i ppf "Texp_try\n";
-      expression i ppf e;
-      list i case ppf l;
-  | Texp_tuple (l) ->
-      line i ppf "Texp_tuple\n";
-      list i expression ppf l;
-  | Texp_construct (li, _, eo) ->
-      line i ppf "Texp_construct %a\n" fmt_longident li;
-      list i expression ppf eo;
-  | Texp_variant (l, eo) ->
-      line i ppf "Texp_variant \"%s\"\n" l;
-      option i expression ppf eo;
-  | Texp_record { fields; representation; extended_expression } ->
-      line i ppf "Texp_record\n";
-      let i = i+1 in
-      line i ppf "fields =\n";
-      array (i+1) record_field ppf fields;
-      line i ppf "representation =\n";
-      record_representation (i+1) ppf representation;
-      line i ppf "extended_expression =\n";
-      option (i+1) expression ppf extended_expression;
-  | Texp_field (e, li, _) ->
-      line i ppf "Texp_field\n";
-      expression i ppf e;
-      longident i ppf li;
-  | Texp_setfield (e1, li, _, e2) ->
-      line i ppf "Texp_setfield\n";
-      expression i ppf e1;
-      longident i ppf li;
-      expression i ppf e2;
-  | Texp_array (l) ->
-      line i ppf "Texp_array\n";
-      list i expression ppf l;
-  | Texp_ifthenelse (e1, e2, eo) ->
-      line i ppf "Texp_ifthenelse\n";
-      expression i ppf e1;
-      expression i ppf e2;
-      option i expression ppf eo;
-  | Texp_sequence (e1, e2) ->
-      line i ppf "Texp_sequence\n";
-      expression i ppf e1;
-      expression i ppf e2;
-  | Texp_while (e1, e2) ->
-      line i ppf "Texp_while\n";
-      expression i ppf e1;
-      expression i ppf e2;
-  | Texp_for (s, _, e1, e2, df, e3) ->
-      line i ppf "Texp_for \"%a\" %a\n" fmt_ident s fmt_direction_flag df;
-      expression i ppf e1;
-      expression i ppf e2;
-      expression i ppf e3;
-  | Texp_send (e, Tmeth_name s, eo) ->
-      line i ppf "Texp_send \"%s\"\n" s;
-      expression i ppf e;
-      option i expression ppf eo
-  | Texp_new _
-  | Texp_setinstvar _
-  | Texp_override _ ->
-    ()
-  | Texp_letmodule (s, _, me, e) ->
-      line i ppf "Texp_letmodule \"%a\"\n" fmt_ident s;
-      module_expr i ppf me;
-      expression i ppf e;
-  | Texp_letexception (cd, e) ->
-      line i ppf "Texp_letexception\n";
-      extension_constructor i ppf cd;
-      expression i ppf e;
-  | Texp_assert (e) ->
-      line i ppf "Texp_assert";
-      expression i ppf e;
-  | Texp_lazy (e) ->
-      line i ppf "Texp_lazy";
-      expression i ppf e;
-  | Texp_object () ->
-      ()
-  | Texp_pack me ->
-      line i ppf "Texp_pack";
-      module_expr i ppf me
-  | Texp_unreachable ->
-      line i ppf "Texp_unreachable"
-  | Texp_extension_constructor (li, _) ->
-      line i ppf "Texp_extension_constructor %a" fmt_longident li
-
-and value_description i ppf x =
-  line i ppf "value_description %a %a\n" fmt_ident x.val_id fmt_location
-       x.val_loc;
-  attributes i ppf x.val_attributes;
-  core_type (i+1) ppf x.val_desc;
-  list (i+1) string ppf x.val_prim;
-
-and type_parameter i ppf (x, _variance) = core_type i ppf x
-
-and type_declaration i ppf x =
-  line i ppf "type_declaration %a %a\n" fmt_ident x.typ_id fmt_location
-       x.typ_loc;
-  attributes i ppf x.typ_attributes;
-  let i = i+1 in
-  line i ppf "ptype_params =\n";
-  list (i+1) type_parameter ppf x.typ_params;
-  line i ppf "ptype_cstrs =\n";
-  list (i+1) core_type_x_core_type_x_location ppf x.typ_cstrs;
-  line i ppf "ptype_kind =\n";
-  type_kind (i+1) ppf x.typ_kind;
-  line i ppf "ptype_private = %a\n" fmt_private_flag x.typ_private;
-  line i ppf "ptype_manifest =\n";
-  option (i+1) core_type ppf x.typ_manifest;
-
-and type_kind i ppf x =
-  match x with
-  | Ttype_abstract ->
-      line i ppf "Ttype_abstract\n"
-  | Ttype_variant l ->
-      line i ppf "Ttype_variant\n";
-      list (i+1) constructor_decl ppf l;
-  | Ttype_record l ->
-      line i ppf "Ttype_record\n";
-      list (i+1) label_decl ppf l;
-  | Ttype_open ->
-      line i ppf "Ttype_open\n"
-
-and type_extension i ppf x =
-  line i ppf "type_extension\n";
-  attributes i ppf x.tyext_attributes;
-  let i = i+1 in
-  line i ppf "ptyext_path = %a\n" fmt_path x.tyext_path;
-  line i ppf "ptyext_params =\n";
-  list (i+1) type_parameter ppf x.tyext_params;
-  line i ppf "ptyext_constructors =\n";
-  list (i+1) extension_constructor ppf x.tyext_constructors;
-  line i ppf "ptyext_private = %a\n" fmt_private_flag x.tyext_private;
-
-and extension_constructor i ppf x =
-  line i ppf "extension_constructor %a\n" fmt_location x.ext_loc;
-  attributes i ppf x.ext_attributes;
-  let i = i + 1 in
-  line i ppf "pext_name = \"%a\"\n" fmt_ident x.ext_id;
-  line i ppf "pext_kind =\n";
-  extension_constructor_kind (i + 1) ppf x.ext_kind;
-
-and extension_constructor_kind i ppf x =
-  match x with
-      Text_decl(a, r) ->
-        line i ppf "Text_decl\n";
-        constructor_arguments (i+1) ppf a;
-        option (i+1) core_type ppf r;
-    | Text_rebind(p, _) ->
-        line i ppf "Text_rebind\n";
-        line (i+1) ppf "%a\n" fmt_path p;
-
-and class_type i ppf x =
-  line i ppf "class_type %a\n" fmt_location x.cltyp_loc;
-  attributes i ppf x.cltyp_attributes;
-  let i = i+1 in
-  match x.cltyp_desc with
-  | Tcty_constr (li, _, l) ->
-      line i ppf "Tcty_constr %a\n" fmt_path li;
-      list i core_type ppf l;
-  | Tcty_signature (cs) ->
-      line i ppf "Tcty_signature\n";
-      class_signature i ppf cs;
-  | Tcty_arrow (l, co, cl) ->
-      line i ppf "Tcty_arrow\n";
-      arg_label i ppf l;
-      core_type i ppf co;
-      class_type i ppf cl;
-  | Tcty_open (ovf, m, _, _, e) ->
-      line i ppf "Tcty_open %a \"%a\"\n" fmt_override_flag ovf fmt_path m;
-      class_type i ppf e
-
-and class_signature i ppf { csig_self = ct; csig_fields = l } =
-  line i ppf "class_signature\n";
-  core_type (i+1) ppf ct;
-  list (i+1) class_type_field ppf l;
-
-and class_type_field i ppf x =
-  line i ppf "class_type_field %a\n" fmt_location x.ctf_loc;
-  let i = i+1 in
-  attributes i ppf x.ctf_attributes;
-  match x.ctf_desc with
-  | Tctf_inherit (ct) ->
-      line i ppf "Tctf_inherit\n";
-      class_type i ppf ct;
-  | Tctf_val (s, mf, vf, ct) ->
-      line i ppf "Tctf_val \"%s\" %a %a\n" s fmt_mutable_flag mf
-           fmt_virtual_flag vf;
-      core_type (i+1) ppf ct;
-  | Tctf_method (s, pf, vf, ct) ->
-      line i ppf "Tctf_method \"%s\" %a %a\n" s fmt_private_flag pf
-           fmt_virtual_flag vf;
-      core_type (i+1) ppf ct;
-  | Tctf_constraint (ct1, ct2) ->
-      line i ppf "Tctf_constraint\n";
-      core_type (i+1) ppf ct1;
-      core_type (i+1) ppf ct2;
-  | Tctf_attribute (s, arg) ->
-      line i ppf "Tctf_attribute \"%s\"\n" s.txt;
-      Printast.payload i ppf arg
-
-
-and class_type_declaration i ppf x =
-  line i ppf "class_type_declaration %a\n" fmt_location x.ci_loc;
-  let i = i+1 in
-  line i ppf "pci_virt = %a\n" fmt_virtual_flag x.ci_virt;
-  line i ppf "pci_params =\n";
-  list (i+1) type_parameter ppf x.ci_params;
-  line i ppf "pci_name = \"%s\"\n" x.ci_id_name.txt;
-  line i ppf "pci_expr =\n";
-  class_type (i+1) ppf x.ci_expr;
-
-
-and module_type i ppf x =
-  line i ppf "module_type %a\n" fmt_location x.mty_loc;
-  attributes i ppf x.mty_attributes;
-  let i = i+1 in
-  match x.mty_desc with
-  | Tmty_ident (li,_) -> line i ppf "Tmty_ident %a\n" fmt_path li;
-  | Tmty_alias (li,_) -> line i ppf "Tmty_alias %a\n" fmt_path li;
-  | Tmty_signature (s) ->
-      line i ppf "Tmty_signature\n";
-      signature i ppf s;
-  | Tmty_functor (s, _, mt1, mt2) ->
-      line i ppf "Tmty_functor \"%a\"\n" fmt_ident s;
-      Misc.may (module_type i ppf) mt1;
-      module_type i ppf mt2;
-  | Tmty_with (mt, l) ->
-      line i ppf "Tmty_with\n";
-      module_type i ppf mt;
-      list i longident_x_with_constraint ppf l;
-  | Tmty_typeof m ->
-      line i ppf "Tmty_typeof\n";
-      module_expr i ppf m;
-
-and signature i ppf x = list i signature_item ppf x.sig_items
-
-and signature_item i ppf x =
-  line i ppf "signature_item %a\n" fmt_location x.sig_loc;
-  let i = i+1 in
-  match x.sig_desc with
-  | Tsig_value vd ->
-      line i ppf "Tsig_value\n";
-      value_description i ppf vd;
-  | Tsig_type (rf, l) ->
-      line i ppf "Tsig_type %a\n" fmt_rec_flag rf;
-      list i type_declaration ppf l;
-  | Tsig_typext e ->
-      line i ppf "Tsig_typext\n";
-      type_extension i ppf e;
-  | Tsig_exception ext ->
-      line i ppf "Tsig_exception\n";
-      extension_constructor i ppf ext
-  | Tsig_module md ->
-      line i ppf "Tsig_module \"%a\"\n" fmt_ident md.md_id;
-      attributes i ppf md.md_attributes;
-      module_type i ppf md.md_type
-  | Tsig_recmodule decls ->
-      line i ppf "Tsig_recmodule\n";
-      list i module_declaration ppf decls;
-  | Tsig_modtype x ->
-      line i ppf "Tsig_modtype \"%a\"\n" fmt_ident x.mtd_id;
-      attributes i ppf x.mtd_attributes;
-      modtype_declaration i ppf x.mtd_type
-  | Tsig_open od ->
-      line i ppf "Tsig_open %a %a\n"
-           fmt_override_flag od.open_override
-           fmt_path od.open_path;
-      attributes i ppf od.open_attributes
-  | Tsig_include incl ->
-      line i ppf "Tsig_include\n";
-      attributes i ppf incl.incl_attributes;
-      module_type i ppf incl.incl_mod
-  | Tsig_class () ->
-      ()
-  | Tsig_class_type (l) ->
-      line i ppf "Tsig_class_type\n";
-      list i class_type_declaration ppf l;
-  | Tsig_attribute (s, arg) ->
-      line i ppf "Tsig_attribute \"%s\"\n" s.txt;
-      Printast.payload i ppf arg
-
-and module_declaration i ppf md =
-  line i ppf "%a" fmt_ident md.md_id;
-  attributes i ppf md.md_attributes;
-  module_type (i+1) ppf md.md_type;
-
-and module_binding i ppf x =
-  line i ppf "%a\n" fmt_ident x.mb_id;
-  attributes i ppf x.mb_attributes;
-  module_expr (i+1) ppf x.mb_expr
-
-and modtype_declaration i ppf = function
-  | None -> line i ppf "#abstract"
-  | Some mt -> module_type (i + 1) ppf mt
-
-and with_constraint i ppf x =
-  match x with
-  | Twith_type (td) ->
-      line i ppf "Twith_type\n";
-      type_declaration (i+1) ppf td;
-  | Twith_typesubst (td) ->
-      line i ppf "Twith_typesubst\n";
-      type_declaration (i+1) ppf td;
-  | Twith_module (li,_) -> line i ppf "Twith_module %a\n" fmt_path li;
-  | Twith_modsubst (li,_) -> line i ppf "Twith_modsubst %a\n" fmt_path li;
-
-and module_expr i ppf x =
-  line i ppf "module_expr %a\n" fmt_location x.mod_loc;
-  attributes i ppf x.mod_attributes;
-  let i = i+1 in
-  match x.mod_desc with
-  | Tmod_ident (li,_) -> line i ppf "Tmod_ident %a\n" fmt_path li;
-  | Tmod_structure (s) ->
-      line i ppf "Tmod_structure\n";
-      structure i ppf s;
-  | Tmod_functor (s, _, mt, me) ->
-      line i ppf "Tmod_functor \"%a\"\n" fmt_ident s;
-      Misc.may (module_type i ppf) mt;
-      module_expr i ppf me;
-  | Tmod_apply (me1, me2, _) ->
-      line i ppf "Tmod_apply\n";
-      module_expr i ppf me1;
-      module_expr i ppf me2;
-  | Tmod_constraint (me, _, Tmodtype_explicit mt, _) ->
-      line i ppf "Tmod_constraint\n";
-      module_expr i ppf me;
-      module_type i ppf mt;
-  | Tmod_constraint (me, _, Tmodtype_implicit, _) -> module_expr i ppf me
-  | Tmod_unpack (e, _) ->
-      line i ppf "Tmod_unpack\n";
-      expression i ppf e;
-
-and structure i ppf x = list i structure_item ppf x.str_items
-
-and structure_item i ppf x =
-  line i ppf "structure_item %a\n" fmt_location x.str_loc;
-  let i = i+1 in
-  match x.str_desc with
-  | Tstr_eval (e, attrs) ->
-      line i ppf "Tstr_eval\n";
-      attributes i ppf attrs;
-      expression i ppf e;
-  | Tstr_value (rf, l) ->
-      line i ppf "Tstr_value %a\n" fmt_rec_flag rf;
-      list i value_binding ppf l;
-  | Tstr_primitive vd ->
-      line i ppf "Tstr_primitive\n";
-      value_description i ppf vd;
-  | Tstr_type (rf, l) ->
-      line i ppf "Tstr_type %a\n" fmt_rec_flag rf;
-      list i type_declaration ppf l;
-  | Tstr_typext te ->
-      line i ppf "Tstr_typext\n";
-      type_extension i ppf te
-  | Tstr_exception ext ->
-      line i ppf "Tstr_exception\n";
-      extension_constructor i ppf ext;
-  | Tstr_module x ->
-      line i ppf "Tstr_module\n";
-      module_binding i ppf x
-  | Tstr_recmodule bindings ->
-      line i ppf "Tstr_recmodule\n";
-      list i module_binding ppf bindings
-  | Tstr_modtype x ->
-      line i ppf "Tstr_modtype \"%a\"\n" fmt_ident x.mtd_id;
-      attributes i ppf x.mtd_attributes;
-      modtype_declaration i ppf x.mtd_type
-  | Tstr_open od ->
-      line i ppf "Tstr_open %a %a\n"
-           fmt_override_flag od.open_override
-           fmt_path od.open_path;
-      attributes i ppf od.open_attributes
-  | Tstr_class () -> ()
-  | Tstr_class_type (l) ->
-      line i ppf "Tstr_class_type\n";
-      list i class_type_declaration ppf (List.map (fun (_, _, cl) -> cl) l);
-  | Tstr_include incl ->
-      line i ppf "Tstr_include";
-      attributes i ppf incl.incl_attributes;
-      module_expr i ppf incl.incl_mod;
-  | Tstr_attribute (s, arg) ->
-      line i ppf "Tstr_attribute \"%s\"\n" s.txt;
-      Printast.payload i ppf arg
-
-and longident_x_with_constraint i ppf (li, _, wc) =
-  line i ppf "%a\n" fmt_path li;
-  with_constraint (i+1) ppf wc;
-
-and core_type_x_core_type_x_location i ppf (ct1, ct2, l) =
-  line i ppf "<constraint> %a\n" fmt_location l;
-  core_type (i+1) ppf ct1;
-  core_type (i+1) ppf ct2;
-
-and constructor_decl i ppf {cd_id; cd_name = _; cd_args; cd_res; cd_loc;
-                            cd_attributes} =
-  line i ppf "%a\n" fmt_location cd_loc;
-  line (i+1) ppf "%a\n" fmt_ident cd_id;
-  attributes i ppf cd_attributes;
-  constructor_arguments (i+1) ppf cd_args;
-  option (i+1) core_type ppf cd_res
-
-and constructor_arguments i ppf = function
-  | Cstr_tuple l -> list i core_type ppf l
-  | Cstr_record l -> list i label_decl ppf l
-
-and label_decl i ppf {ld_id; ld_name = _; ld_mutable; ld_type; ld_loc;
-                      ld_attributes} =
-  line i ppf "%a\n" fmt_location ld_loc;
-  attributes i ppf ld_attributes;
-  line (i+1) ppf "%a\n" fmt_mutable_flag ld_mutable;
-  line (i+1) ppf "%a" fmt_ident ld_id;
-  core_type (i+1) ppf ld_type
-
-and longident_x_pattern i ppf (li, _, p) =
-  line i ppf "%a\n" fmt_longident li;
-  pattern (i+1) ppf p;
-
-and case i ppf {c_lhs; c_guard; c_rhs} =
-  line i ppf "<case>\n";
-  pattern (i+1) ppf c_lhs;
-  begin match c_guard with
-  | None -> ()
-  | Some g -> line (i+1) ppf "<when>\n"; expression (i + 2) ppf g
-  end;
-  expression (i+1) ppf c_rhs;
-
-and value_binding i ppf x =
-  line i ppf "<def>\n";
-  attributes (i+1) ppf x.vb_attributes;
-  pattern (i+1) ppf x.vb_pat;
-  expression (i+1) ppf x.vb_expr
-
-
-and record_field i ppf = function
-  | _, Overridden (li, e) ->
-      line i ppf "%a\n" fmt_longident li;
-      expression (i+1) ppf e;
-  | _, Kept _ ->
-      line i ppf "<kept>"
-
-and label_x_expression i ppf (l, e) =
-  line i ppf "<arg>\n";
-  arg_label (i+1) ppf l;
-  (match e with None -> () | Some e -> expression (i+1) ppf e)
-
-and label_x_bool_x_core_type_list i ppf x =
-  match x with
-    Ttag (l, attrs, b, ctl) ->
-      line i ppf "Ttag \"%s\" %s\n" l.txt (string_of_bool b);
-      attributes (i+1) ppf attrs;
-      list (i+1) core_type ppf ctl
-  | Tinherit (ct) ->
-      line i ppf "Tinherit\n";
-      core_type (i+1) ppf ct
-;;
-
-let interface ppf x = list 0 signature_item ppf x.sig_items;;
-
-let implementation ppf x = list 0 structure_item ppf x.str_items;;
-
-let implementation_with_coercion ppf (x, _) = implementation ppf x
diff --git a/jscomp/ml/rec_check.ml b/jscomp/ml/rec_check.ml
deleted file mode 100644
index 161afcd..0000000
--- a/jscomp/ml/rec_check.ml
+++ /dev/null
@@ -1,474 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-type error = Illegal_letrec_expr
-
-exception Error of Location.t * error
-
-module Rec_context = struct
-  type access =
-    | Dereferenced
-        (** [Dereferenced] indicates that the value (not just the address) of a
-        variable is accessed *)
-    | Guarded
-        (** [Guarded] indicates that the address of a variable is used in a
-        guarded context, i.e. under a constructor.  A variable that is
-        dereferenced within a function body or lazy context is also considered
-        guarded. *)
-    | Unguarded
-        (** [Unguarded] indicates that the address of a variable is used in an
-        unguarded context, i.e. not under a constructor. *)
-
-  (** [guard] represents guarded contexts such as [C -] and [{l = -}] *)
-  let guard : access -> access = function
-    | Dereferenced -> Dereferenced
-    | Guarded -> Guarded
-    | Unguarded -> Guarded
-
-  (** [inspect] represents elimination contexts such as [match - with cases],
-      [e -] and [- e] *)
-  let inspect : access -> access = function
-    | Dereferenced -> Dereferenced
-    | Guarded -> Dereferenced
-    | Unguarded -> Dereferenced
-
-  (** [delay] represents contexts that delay evaluation such as [fun p -> -]
-      or [lazy -] *)
-  let delay : access -> access = function
-    | Dereferenced -> Guarded
-    | Guarded -> Guarded
-    | Unguarded -> Guarded
-
-  module Use : sig
-    type t
-
-    val guard : t -> t
-    (** An expression appears in a guarded context *)
-
-    val discard : t -> t
-    (** The address of a subexpression is not used, but may be bound *)
-
-    val inspect : t -> t
-    (** The value of a subexpression is inspected with match, application, etc. *)
-
-    val delay : t -> t
-    (** An expression appears under 'fun p ->' or 'lazy' *)
-
-    val join : t -> t -> t
-    (** Combine the access information of two expressions *)
-
-    val single : Ident.t -> access -> t
-    (** Combine the access information of two expressions *)
-
-    val empty : t
-    (** No variables are accessed in an expression; it might be a
-        constant or a global identifier *)
-
-    val unguarded : t -> Ident.t list
-    (** The list of identifiers that are used in an unguarded context *)
-
-    val dependent : t -> Ident.t list
-    (** The list of all used identifiers *)
-  end = struct
-    module M = Map.Make (Ident)
-
-    type t = access M.t
-    (** A "t" maps each rec-bound variable to an access status *)
-
-    let map f tbl = M.map f tbl
-
-    let guard t = map guard t
-
-    let inspect t = map inspect t
-
-    let delay t = map delay t
-
-    let discard = guard
-
-    let prec x y =
-      match (x, y) with
-      | Dereferenced, _ | _, Dereferenced -> Dereferenced
-      | Unguarded, _ | _, Unguarded -> Unguarded
-      | _ -> Guarded
-
-    let join x y =
-      M.fold
-        (fun id v tbl ->
-          let v' = try M.find id tbl with Not_found -> Guarded in
-          M.add id (prec v v') tbl)
-        x y
-
-    let single id access = M.add id access M.empty
-
-    let empty = M.empty
-
-    let list_matching p t =
-      let r = ref [] in
-      M.iter (fun id v -> if p v then r := id :: !r) t;
-      !r
-
-    let unguarded =
-      list_matching (function Unguarded | Dereferenced -> true | _ -> false)
-
-    let dependent = list_matching (function _ -> true)
-  end
-
-  module Env = struct
-    (* A typing environment maps identifiers to types *)
-    type env = Use.t Ident.tbl
-
-    let empty = Ident.empty
-
-    let join x y =
-      let r =
-        Ident.fold_all
-          (fun id v tbl ->
-            let v' = try Ident.find_same id tbl with Not_found -> Use.empty in
-            Ident.add id (Use.join v v') tbl)
-          x y
-      in
-      r
-  end
-end
-
-let rec pattern_variables : Typedtree.pattern -> Ident.t list =
- fun pat ->
-  match pat.pat_desc with
-  | Tpat_any -> []
-  | Tpat_var (id, _) -> [ id ]
-  | Tpat_alias (pat, id, _) -> id :: pattern_variables pat
-  | Tpat_constant _ -> []
-  | Tpat_tuple pats -> List.concat (List.map pattern_variables pats)
-  | Tpat_construct (_, _, pats) -> List.concat (List.map pattern_variables pats)
-  | Tpat_variant (_, Some pat, _) -> pattern_variables pat
-  | Tpat_variant (_, None, _) -> []
-  | Tpat_record (fields, _) ->
-      List.concat (List.map (fun (_, _, p) -> pattern_variables p) fields)
-  | Tpat_array pats -> List.concat (List.map pattern_variables pats)
-  | Tpat_or (l, r, _) -> pattern_variables l @ pattern_variables r
-  | Tpat_lazy p -> pattern_variables p
-
-open Rec_context
-open Asttypes
-open Typedtree
-
-let build_unguarded_env : Ident.t list -> Env.env =
- fun idlist ->
-  List.fold_left
-    (fun env id -> Ident.add id (Use.single id Unguarded) env)
-    Env.empty idlist
-
-let is_ref : Types.value_description -> bool = function
-  | {
-      Types.val_kind =
-        Types.Val_prim { Primitive.prim_name = "%makemutable"; prim_arity = 1 };
-    } ->
-      true
-  | _ -> false
-
-type sd = Static | Dynamic
-
-let rec classify_expression : Typedtree.expression -> sd =
- fun exp ->
-  match exp.exp_desc with
-  | Texp_let (_, _, e)
-  | Texp_letmodule (_, _, _, e)
-  | Texp_sequence (_, e)
-  | Texp_letexception (_, e) ->
-      classify_expression e
-  | Texp_ident _ | Texp_for _ | Texp_constant _ | Texp_new _ | Texp_instvar _
-  | Texp_tuple _ | Texp_array _ | Texp_construct _ | Texp_variant _
-  | Texp_record _ | Texp_setfield _ | Texp_while _ | Texp_setinstvar _
-  | Texp_pack _ | Texp_object _ | Texp_function _ | Texp_lazy _
-  | Texp_unreachable | Texp_extension_constructor _ ->
-      Static
-  | Texp_apply ({ exp_desc = Texp_ident (_, _, vd) }, _) when is_ref vd ->
-      Static
-  | Texp_apply _ | Texp_match _ | Texp_ifthenelse _ | Texp_send _ | Texp_field _
-  | Texp_assert _ | Texp_try _ | Texp_override _ ->
-      Dynamic
-
-let rec expression : Env.env -> Typedtree.expression -> Use.t =
- fun env exp ->
-  match exp.exp_desc with
-  | Texp_ident (pth, _, _) -> path env pth
-  | Texp_let (rec_flag, bindings, body) ->
-      let env', ty = value_bindings rec_flag env bindings in
-      (* Here and in other binding constructs 'discard' is used in a
-         similar way to the way it's used in sequence: uses are
-         propagated, but unguarded access are not. *)
-      Use.join (Use.discard ty) (expression (Env.join env env') body)
-  | Texp_letmodule (x, _, m, e) ->
-      let ty = modexp env m in
-      Use.join (Use.discard ty) (expression (Ident.add x ty env) e)
-  | Texp_match (e, val_cases, exn_cases, _) ->
-      let t = expression env e in
-      let exn_case env { Typedtree.c_rhs } = expression env c_rhs in
-      let cs = list (case ~scrutinee:t) env val_cases
-      and es = list exn_case env exn_cases in
-      Use.(join cs es)
-  | Texp_for (_, _, e1, e2, _, e3) ->
-      Use.(
-        join
-          (join (inspect (expression env e1)) (inspect (expression env e2)))
-          (* The body is evaluated, but not used, and not available
-             for inclusion in another value *)
-          (discard (expression env e3)))
-  | Texp_constant _ -> Use.empty
-  | Texp_new _ -> assert false
-  | Texp_instvar _ -> Use.empty
-  | Texp_apply ({ exp_desc = Texp_ident (_, _, vd) }, [ (_, Some arg) ])
-    when is_ref vd ->
-      Use.guard (expression env arg)
-  | Texp_apply (e, args) ->
-      let arg env (_, eo) = option expression env eo in
-      Use.(join (inspect (expression env e)) (inspect (list arg env args)))
-  | Texp_tuple exprs -> Use.guard (list expression env exprs)
-  | Texp_array exprs -> Use.guard (list expression env exprs)
-  | Texp_construct (_, desc, exprs) ->
-      let access_constructor =
-        match desc.cstr_tag with
-        | Cstr_extension (pth, _) -> Use.inspect (path env pth)
-        | _ -> Use.empty
-      in
-      let use =
-        match desc.cstr_tag with
-        | Cstr_unboxed -> fun x -> x
-        | Cstr_constant _ | Cstr_block _ | Cstr_extension _ -> Use.guard
-      in
-      Use.join access_constructor (use (list expression env exprs))
-  | Texp_variant (_, eo) -> Use.guard (option expression env eo)
-  | Texp_record { fields = es; extended_expression = eo; representation = rep }
-    ->
-      let use =
-        match rep with
-        | Record_unboxed _ -> fun x -> x
-        | Record_float_unused -> assert false
-        | Record_optional_labels _ | Record_regular | Record_inlined _ | Record_extension
-          ->
-            Use.guard
-      in
-      let field env = function
-        | _, Kept _ -> Use.empty
-        | _, Overridden (_, e) -> expression env e
-      in
-      Use.join (use (array field env es)) (option expression env eo)
-  | Texp_ifthenelse (cond, ifso, ifnot) ->
-      Use.(
-        join
-          (inspect (expression env cond))
-          (join (expression env ifso) (option expression env ifnot)))
-  | Texp_setfield (e1, _, _, e2) ->
-      Use.(join (inspect (expression env e1)) (inspect (expression env e2)))
-  | Texp_sequence (e1, e2) ->
-      Use.(join (discard (expression env e1)) (expression env e2))
-  | Texp_while (e1, e2) ->
-      Use.(join (inspect (expression env e1)) (discard (expression env e2)))
-  | Texp_send (e1, _, eo) ->
-      Use.(
-        join (inspect (expression env e1)) (inspect (option expression env eo)))
-  | Texp_field (e, _, _) -> Use.(inspect (expression env e))
-  | Texp_setinstvar () -> assert false
-  | Texp_letexception (_, e) -> expression env e
-  | Texp_assert e -> Use.inspect (expression env e)
-  | Texp_pack m -> modexp env m
-  | Texp_object () -> assert false
-  | Texp_try (e, cases) ->
-      (* This is more permissive than the old check. *)
-      let case env { Typedtree.c_rhs } = expression env c_rhs in
-      Use.join (expression env e) (list case env cases)
-  | Texp_override () -> assert false
-  | Texp_function { cases } ->
-      Use.delay (list (case ~scrutinee:Use.empty) env cases)
-  | Texp_lazy e -> (
-      match Typeopt.classify_lazy_argument e with
-      | `Constant_or_function | `Identifier _ | `Float -> expression env e
-      | `Other -> Use.delay (expression env e))
-  | Texp_unreachable -> Use.empty
-  | Texp_extension_constructor _ -> Use.empty
-
-and option : 'a. (Env.env -> 'a -> Use.t) -> Env.env -> 'a option -> Use.t =
- fun f env -> Misc.Stdlib.Option.value_default (f env) ~default:Use.empty
-
-and list : 'a. (Env.env -> 'a -> Use.t) -> Env.env -> 'a list -> Use.t =
- fun f env ->
-  List.fold_left (fun typ item -> Use.join (f env item) typ) Use.empty
-
-and array : 'a. (Env.env -> 'a -> Use.t) -> Env.env -> 'a array -> Use.t =
- fun f env ->
-  Array.fold_left (fun typ item -> Use.join (f env item) typ) Use.empty
-
-and modexp : Env.env -> Typedtree.module_expr -> Use.t =
- fun env m ->
-  match m.mod_desc with
-  | Tmod_ident (pth, _) -> path env pth
-  | Tmod_structure s -> structure env s
-  | Tmod_functor (_, _, _, e) -> Use.delay (modexp env e)
-  | Tmod_apply (f, p, _) ->
-      Use.(join (inspect (modexp env f)) (inspect (modexp env p)))
-  | Tmod_constraint (m, _, _, Tcoerce_none) -> modexp env m
-  | Tmod_constraint (m, _, _, _) -> Use.inspect (modexp env m)
-  | Tmod_unpack (e, _) -> expression env e
-
-and path : Env.env -> Path.t -> Use.t =
- fun env pth ->
-  match pth with
-  | Path.Pident x -> ( try Ident.find_same x env with Not_found -> Use.empty)
-  | Path.Pdot (t, _, _) -> Use.inspect (path env t)
-  | Path.Papply (f, p) -> Use.(inspect (join (path env f) (path env p)))
-
-and structure : Env.env -> Typedtree.structure -> Use.t =
- fun env s ->
-  let _, ty =
-    List.fold_left
-      (fun (env, ty) item ->
-        let env', ty' = structure_item env item in
-        (Env.join env env', Use.join ty ty'))
-      (env, Use.empty) s.str_items
-  in
-  Use.guard ty
-
-and structure_item : Env.env -> Typedtree.structure_item -> Env.env * Use.t =
- fun env s ->
-  match s.str_desc with
-  | Tstr_eval (e, _) -> (Env.empty, expression env e)
-  | Tstr_value (rec_flag, valbinds) -> value_bindings rec_flag env valbinds
-  | Tstr_module { mb_id; mb_expr } ->
-      let ty = modexp env mb_expr in
-      (Ident.add mb_id ty Env.empty, ty)
-  | Tstr_recmodule mbs ->
-      let modbind env { mb_expr } = modexp env mb_expr in
-      (* Over-approximate: treat any access as a use *)
-      (Env.empty, Use.inspect (list modbind env mbs))
-  | Tstr_primitive _ -> (Env.empty, Use.empty)
-  | Tstr_type _ -> (Env.empty, Use.empty)
-  | Tstr_typext _ -> (Env.empty, Use.empty)
-  | Tstr_exception _ -> (Env.empty, Use.empty)
-  | Tstr_modtype _ -> (Env.empty, Use.empty)
-  | Tstr_open _ -> (Env.empty, Use.empty)
-  | Tstr_class () -> (Env.empty, Use.empty)
-  | Tstr_class_type _ -> (Env.empty, Use.empty)
-  | Tstr_include inc ->
-      (* This is a kind of projection.  There's no need to add
-         anything to the environment because everything is used in
-         the type component already *)
-      (Env.empty, Use.inspect (modexp env inc.incl_mod))
-  | Tstr_attribute _ -> (Env.empty, Use.empty)
-
-and case : Env.env -> Typedtree.case -> scrutinee:Use.t -> Use.t =
- fun env { Typedtree.c_lhs; c_guard; c_rhs } ~scrutinee:ty ->
-  let ty =
-    if is_destructuring_pattern c_lhs then Use.inspect ty else Use.discard ty
-    (* as in 'let' *)
-  in
-  let vars = pattern_variables c_lhs in
-  let env = List.fold_left (fun env id -> Ident.add id ty env) env vars in
-  Use.(
-    join ty
-      (join (expression env c_rhs) (inspect (option expression env c_guard))))
-
-and value_bindings :
-    rec_flag -> Env.env -> Typedtree.value_binding list -> Env.env * Use.t =
- fun rec_flag env bindings ->
-  match rec_flag with
-  | Recursive ->
-      (* Approximation:
-            let rec y =
-              let rec x1 = e1
-                  and x2 = e2
-                in e
-         treated as
-            let rec y =
-               let rec x = (e1, e2)[x1:=fst x, x2:=snd x] in
-                  e[x1:=fst x, x2:=snd x]
-         Further, use the fact that x1,x2 cannot occur unguarded in e1, e2
-         to avoid recursive trickiness.
-      *)
-      let ids, ty =
-        List.fold_left
-          (fun (pats, tys) { vb_pat = p; vb_expr = e } ->
-            (pattern_variables p @ pats, Use.join (expression env e) tys))
-          ([], Use.empty) bindings
-      in
-      ( List.fold_left
-          (fun (env : Env.env) (id : Ident.t) -> Ident.add id ty env)
-          Env.empty ids,
-        ty )
-  | Nonrecursive ->
-      List.fold_left
-        (fun (env2, ty) binding ->
-          let env', ty' = value_binding env binding in
-          (Env.join env2 env', Use.join ty ty'))
-        (Env.empty, Use.empty) bindings
-
-and value_binding : Env.env -> Typedtree.value_binding -> Env.env * Use.t =
- (* NB: returns new environment only *)
- fun env { vb_pat; vb_expr } ->
-  let vars = pattern_variables vb_pat in
-  let ty = expression env vb_expr in
-  let ty = if is_destructuring_pattern vb_pat then Use.inspect ty else ty in
-  (List.fold_left (fun env id -> Ident.add id ty env) Env.empty vars, ty)
-
-and is_destructuring_pattern : Typedtree.pattern -> bool =
- fun pat ->
-  match pat.pat_desc with
-  | Tpat_any -> false
-  | Tpat_var (_, _) -> false
-  | Tpat_alias (pat, _, _) -> is_destructuring_pattern pat
-  | Tpat_constant _ -> true
-  | Tpat_tuple _ -> true
-  | Tpat_construct (_, _, _) -> true
-  | Tpat_variant _ -> true
-  | Tpat_record (_, _) -> true
-  | Tpat_array _ -> true
-  | Tpat_or (l, r, _) ->
-      is_destructuring_pattern l || is_destructuring_pattern r
-  | Tpat_lazy _ -> true
-
-let check_recursive_expression idlist expr =
-  let ty = expression (build_unguarded_env idlist) expr in
-  match (Use.unguarded ty, Use.dependent ty, classify_expression expr) with
-  | _ :: _, _, _ (* The expression inspects rec-bound variables *)
-  | _, _ :: _, Dynamic ->
-      (* The expression depends on rec-bound variables
-         and its size is unknown *)
-      raise (Error (expr.exp_loc, Illegal_letrec_expr))
-  | [], _, Static (* The expression has known size *) | [], [], Dynamic ->
-      (* The expression has unknown size,
-         but does not depend on rec-bound variables *)
-      ()
-
-let check_recursive_bindings valbinds =
-  let ids =
-    List.concat (List.map (fun b -> pattern_variables b.vb_pat) valbinds)
-  in
-  Ext_list.iter valbinds (fun { vb_expr } ->
-      match vb_expr.exp_desc with
-      | Texp_record
-          { fields = [| (_, Overridden (_, { exp_desc = Texp_function _ })) |] }
-      | Texp_function _ ->
-          ()
-      (*TODO: add uncurried function too*)
-      | _ -> check_recursive_expression ids vb_expr)
-
-let report_error ppf = function
-  | Illegal_letrec_expr ->
-      Format.fprintf ppf
-        "This kind of expression is not allowed as right-hand side of `let rec'"
-
-let () =
-  Location.register_error_of_exn (function
-    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
-    | _ -> None)
diff --git a/jscomp/ml/rec_check.mli b/jscomp/ml/rec_check.mli
deleted file mode 100644
index f37e891..0000000
--- a/jscomp/ml/rec_check.mli
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-val check_recursive_bindings :  Typedtree.value_binding list -> unit
diff --git a/jscomp/ml/record_coercion.ml b/jscomp/ml/record_coercion.ml
deleted file mode 100644
index 338749e..0000000
--- a/jscomp/ml/record_coercion.ml
+++ /dev/null
@@ -1,33 +0,0 @@
-let check_record_fields ?repr1 ?repr2 (fields1 : Types.label_declaration list)
-    (fields2 : Types.label_declaration list) =
-  let field_is_optional id repr =
-    match repr with
-    | Some (Types.Record_optional_labels lbls) -> List.mem (Ident.name id) lbls
-    | _ -> false
-  in
-  let violation = ref false in
-  let label_decl_sub (acc1, acc2) (ld2 : Types.label_declaration) =
-    match
-      Ext_list.find_first fields1 (fun ld1 -> ld1.ld_id.name = ld2.ld_id.name)
-    with
-    | Some ld1 ->
-      if field_is_optional ld1.ld_id repr1 <> field_is_optional ld2.ld_id repr2
-      then (* optional field can't be modified *)
-        violation := true;
-      let get_as (({txt}, payload) : Parsetree.attribute) =
-        if txt = "as" then Ast_payload.is_single_string payload else None
-      in
-      let get_as_name (ld : Types.label_declaration) =
-        match Ext_list.filter_map ld.ld_attributes get_as with
-        | [] -> ld.ld_id.name
-        | (s, _) :: _ -> s
-      in
-      if get_as_name ld1 <> get_as_name ld2 then violation := true;
-      (ld1.ld_type :: acc1, ld2.ld_type :: acc2)
-    | None ->
-      (* field must be present *)
-      violation := true;
-      (acc1, acc2)
-  in
-  let tl1, tl2 = List.fold_left label_decl_sub ([], []) fields2 in
-  (!violation, tl1, tl2)
\ No newline at end of file
diff --git a/jscomp/ml/record_type_spread.ml b/jscomp/ml/record_type_spread.ml
deleted file mode 100644
index 76cc710..0000000
--- a/jscomp/ml/record_type_spread.ml
+++ /dev/null
@@ -1,88 +0,0 @@
-module StringMap = Map.Make (String)
-
-let t_equals t1 t2 = t1.Types.level = t2.Types.level && t1.id = t2.id
-
-let substitute_types ~type_map (t : Types.type_expr) =
-  if StringMap.is_empty type_map then t
-  else
-    let apply_substitution type_variable_name t =
-      match StringMap.find_opt type_variable_name type_map with
-      | None -> t
-      | Some substituted_type -> substituted_type
-    in
-    let rec loop (t : Types.type_expr) =
-      match t.desc with
-      | Tlink t -> {t with desc = Tlink (loop t)}
-      | Tvar (Some type_variable_name) ->
-        apply_substitution type_variable_name t
-      | Tvar None -> t
-      | Tunivar _ -> t
-      | Tconstr (path, args, _memo) ->
-        {t with desc = Tconstr (path, args |> List.map loop, ref Types.Mnil)}
-      | Tsubst t -> {t with desc = Tsubst (loop t)}
-      | Tvariant rd -> {t with desc = Tvariant (row_desc rd)}
-      | Tnil -> t
-      | Tarrow (lbl, t1, t2, c) ->
-        {t with desc = Tarrow (lbl, loop t1, loop t2, c)}
-      | Ttuple tl -> {t with desc = Ttuple (tl |> List.map loop)}
-      | Tobject (t, r) -> {t with desc = Tobject (loop t, r)}
-      | Tfield (n, k, t1, t2) -> {t with desc = Tfield (n, k, loop t1, loop t2)}
-      | Tpoly (t, []) -> loop t
-      | Tpoly (t, tl) -> {t with desc = Tpoly (loop t, tl |> List.map loop)}
-      | Tpackage (p, l, tl) ->
-        {t with desc = Tpackage (p, l, tl |> List.map loop)}
-    and row_desc (rd : Types.row_desc) =
-      let row_fields =
-        rd.row_fields |> List.map (fun (l, rf) -> (l, row_field rf))
-      in
-      let row_more = loop rd.row_more in
-      let row_name =
-        match rd.row_name with
-        | None -> None
-        | Some (p, tl) -> Some (p, tl |> List.map loop)
-      in
-      {rd with row_fields; row_more; row_name}
-    and row_field (rf : Types.row_field) =
-      match rf with
-      | Rpresent None -> rf
-      | Rpresent (Some t) -> Rpresent (Some (loop t))
-      | Reither (b1, tl, b2, r) -> Reither (b1, tl |> List.map loop, b2, r)
-      | Rabsent -> Rabsent
-    in
-    loop t
-
-let substitute_type_vars (type_vars : (string * Types.type_expr) list)
-    (typ : Types.type_expr) =
-  let type_map =
-    type_vars
-    |> List.fold_left
-         (fun acc (tvar_name, tvar_typ) -> StringMap.add tvar_name tvar_typ acc)
-         StringMap.empty
-  in
-  substitute_types ~type_map typ
-
-let has_type_spread (lbls : Typedtree.label_declaration list) =
-  lbls
-  |> List.exists (fun (l : Typedtree.label_declaration) ->
-         match l with
-         | {ld_name = {txt = "..."}} -> true
-         | _ -> false)
-
-let extract_type_vars (type_params : Types.type_expr list)
-    (typ : Types.type_expr) =
-  (* The type variables applied to the record spread itself. *)
-  let applied_type_vars =
-    match Ctype.repr typ with
-    | {desc = Tpoly ({desc = Tconstr (_, tvars, _)}, _)} -> tvars
-    | _ -> []
-  in
-  if List.length type_params = List.length applied_type_vars then
-    (* Track which type param in the record we're spreading
-       belongs to which type variable applied to the spread itself. *)
-    let paired_type_vars = List.combine type_params applied_type_vars in
-    paired_type_vars
-    |> List.filter_map (fun (t, applied_tvar) ->
-           match t.Types.desc with
-           | Tvar (Some tname) -> Some (tname, applied_tvar)
-           | _ -> None)
-  else []
\ No newline at end of file
diff --git a/jscomp/ml/rescript_cpp.ml b/jscomp/ml/rescript_cpp.ml
deleted file mode 100644
index 71938df..0000000
--- a/jscomp/ml/rescript_cpp.ml
+++ /dev/null
@@ -1,572 +0,0 @@
-(* Copyright (C) 2021- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 directive_type =
-  | Dir_type_bool
-  | Dir_type_float
-  | Dir_type_int
-  | Dir_type_string
-  | Dir_type_null
-
-type pp_error =
-  | Unterminated_paren_in_conditional
-  | Unterminated_if
-  | Unterminated_else
-  | Unexpected_token_in_conditional
-  | Expect_hash_then_in_conditional
-  | Illegal_semver of string
-  | Unexpected_directive
-  | Conditional_expr_expected_type of directive_type * directive_type
-
-exception Pp_error of pp_error * Location.t
-
-type directive_value =
-  | Dir_bool of bool
-  | Dir_float of float
-  | Dir_int of int
-  | Dir_string of string
-  | Dir_null
-
-let type_of_directive x =
-  match x with
-  | Dir_bool _ -> Dir_type_bool
-  | Dir_float _ -> Dir_type_float
-  | Dir_int _ -> Dir_type_int
-  | Dir_string _ -> Dir_type_string
-  | Dir_null -> Dir_type_null
-
-let string_of_type_directive x =
-  match x with
-  | Dir_type_bool -> "bool"
-  | Dir_type_float -> "float"
-  | Dir_type_int -> "int"
-  | Dir_type_string -> "string"
-  | Dir_type_null -> "null"
-
-let prepare_pp_error loc = function
-  | Unterminated_if -> Location.errorf ~loc "#if not terminated"
-  | Unterminated_else -> Location.errorf ~loc "#else not terminated"
-  | Unexpected_directive -> Location.errorf ~loc "Unexpected directive"
-  | Unexpected_token_in_conditional ->
-      Location.errorf ~loc "Unexpected token in conditional predicate"
-  | Unterminated_paren_in_conditional ->
-      Location.errorf ~loc "Unterminated parens in conditional predicate"
-  | Expect_hash_then_in_conditional ->
-      Location.errorf ~loc "Expect `then` after conditional predicate"
-  | Conditional_expr_expected_type (a, b) ->
-      Location.errorf ~loc "Conditional expression type mismatch (%s,%s)"
-        (string_of_type_directive a)
-        (string_of_type_directive b)
-  | Illegal_semver s ->
-      Location.errorf ~loc "Illegal semantic version string %s" s
-
-let () =
-  Location.register_error_of_exn (function
-    | Pp_error (err, loc) -> Some (prepare_pp_error loc err)
-    | _ -> None)
-
-let assert_same_type lexbuf x y =
-  let lhs = type_of_directive x in
-  let rhs = type_of_directive y in
-  if lhs <> rhs then
-    raise
-      (Pp_error (Conditional_expr_expected_type (lhs, rhs), Location.curr lexbuf))
-  else y
-
-let directive_built_in_values = Hashtbl.create 51
-
-let replace_directive_built_in_value k v =
-  Hashtbl.replace directive_built_in_values k v
-
-let remove_directive_built_in_value k =
-  Hashtbl.replace directive_built_in_values k Dir_null
-
-let replace_directive_bool k v =
-  Hashtbl.replace directive_built_in_values k (Dir_bool v)
-
-let replace_directive_string k v =
-  Hashtbl.replace directive_built_in_values k (Dir_string v)
-
-let () =
-  (* Note we use {!Config} instead of {!Sys} becasue
-     we want to overwrite in some cases with the
-     same stdlib
-  *)
-  let version = Config.version (* so that it can be overridden*) in
-  replace_directive_built_in_value "OCAML_VERSION" (Dir_string version);
-  replace_directive_built_in_value "OS_TYPE" (Dir_string Sys.os_type)
-
-let find_directive_built_in_value k = Hashtbl.find directive_built_in_values k
-
-let iter_directive_built_in_value f = Hashtbl.iter f directive_built_in_values
-(* let iter_directive_built_in_value f = Hashtbl.iter f directive_built_in_values *)
-
-(*
-     {[
-       # semver 0 "12";;
-       - : int * int * int * string = (12, 0, 0, "");;
-       # semver 0 "12.3";;
-       - : int * int * int * string = (12, 3, 0, "");;
-         semver 0 "12.3.10";;
-       - : int * int * int * string = (12, 3, 10, "");;
-       # semver 0 "12.3.10+x";;
-       - : int * int * int * string = (12, 3, 10, "+x")
-     ]}
-  *)
-let zero = Char.code '0'
-
-let dot = Char.code '.'
-
-let semantic_version_parse str start last_index =
-  let rec aux start acc last_index =
-    if start <= last_index then
-      let c = Char.code (String.unsafe_get str start) in
-      if c = dot then (acc, start + 1) (* consume [4.] instead of [4]*)
-      else
-        let v = c - zero in
-        if v >= 0 && v <= 9 then aux (start + 1) ((acc * 10) + v) last_index
-        else (acc, start)
-    else (acc, start)
-  in
-  let major, major_end = aux start 0 last_index in
-  let minor, minor_end = aux major_end 0 last_index in
-  let patch, patch_end = aux minor_end 0 last_index in
-  let additional = String.sub str patch_end (last_index - patch_end + 1) in
-  ((major, minor, patch), additional)
-
-(** 
-     {[
-       semver Location.none "1.2.3" "~1.3.0" = false;;
-       semver Location.none "1.2.3" "^1.3.0" = true ;;
-       semver Location.none "1.2.3" ">1.3.0" = false ;;
-       semver Location.none "1.2.3" ">=1.3.0" = false ;;
-       semver Location.none "1.2.3" "<1.3.0" = true ;;
-       semver Location.none "1.2.3" "<=1.3.0" = true ;;
-     ]}
-  *)
-let semver loc lhs str =
-  let last_index = String.length str - 1 in
-  if last_index < 0 then raise (Pp_error (Illegal_semver str, loc))
-  else
-    let pred, (((major, minor, _patch) as version), _) =
-      let v = String.unsafe_get str 0 in
-      match v with
-      | '>' ->
-          if last_index = 0 then raise (Pp_error (Illegal_semver str, loc))
-          else if String.unsafe_get str 1 = '=' then
-            (`Ge, semantic_version_parse str 2 last_index)
-          else (`Gt, semantic_version_parse str 1 last_index)
-      | '<' ->
-          if last_index = 0 then raise (Pp_error (Illegal_semver str, loc))
-          else if String.unsafe_get str 1 = '=' then
-            (`Le, semantic_version_parse str 2 last_index)
-          else (`Lt, semantic_version_parse str 1 last_index)
-      | '^' -> (`Compatible, semantic_version_parse str 1 last_index)
-      | '~' -> (`Approximate, semantic_version_parse str 1 last_index)
-      | _ -> (`Exact, semantic_version_parse str 0 last_index)
-    in
-    let ((l_major, l_minor, _l_patch) as lversion), _ =
-      semantic_version_parse lhs 0 (String.length lhs - 1)
-    in
-    match pred with
-    | `Ge -> lversion >= version
-    | `Gt -> lversion > version
-    | `Le -> lversion <= version
-    | `Lt -> lversion < version
-    | `Approximate -> major = l_major && minor = l_minor
-    | `Compatible -> major = l_major
-    | `Exact -> lversion = version
-
-let pp_directive_value fmt (x : directive_value) =
-  match x with
-  | Dir_bool b -> Format.pp_print_bool fmt b
-  | Dir_int b -> Format.pp_print_int fmt b
-  | Dir_float b -> Format.pp_print_float fmt b
-  | Dir_string s -> Format.fprintf fmt "%S" s
-  | Dir_null -> Format.pp_print_string fmt "null"
-
-let list_variables fmt =
-  iter_directive_built_in_value (fun s dir_value ->
-      Format.fprintf fmt "@[%s@ %a@]@." s pp_directive_value dir_value)
-
-let defined str =
-  match find_directive_built_in_value str with
-  | Dir_null -> false
-  | _ -> true
-  | exception _ -> (
-      try
-        ignore @@ Sys.getenv str;
-        true
-      with _ -> false)
-
-let query _loc str =
-  match find_directive_built_in_value str with
-  | Dir_null -> Dir_bool false
-  | v -> v
-  | exception Not_found -> (
-      match Sys.getenv str with
-      | v -> (
-          try Dir_bool (bool_of_string v)
-          with _ -> (
-            try Dir_int (int_of_string v)
-            with _ -> (
-              try Dir_float (float_of_string v) with _ -> Dir_string v)))
-      | exception Not_found -> Dir_bool false)
-
-let define_key_value key v =
-  if String.length key > 0 && Char.uppercase_ascii key.[0] = key.[0] then (
-    replace_directive_built_in_value key
-      (* NEED Sync up across {!lexer.mll} {!bspp.ml} and here,
-         TODO: put it in {!lexer.mll}
-      *)
-      (try Dir_bool (bool_of_string v)
-       with _ -> (
-         try Dir_int (int_of_string v)
-         with _ -> (
-           try Dir_float (float_of_string v) with _ -> Dir_string v)));
-    true)
-  else false
-
-let cvt_int_literal s = -int_of_string ("-" ^ s)
-
-let value_of_token loc (t : Parser.token) =
-  match t with
-  | INT (i, None) -> Dir_int (cvt_int_literal i)
-  | STRING (s, _) -> Dir_string s
-  | FLOAT (s, None) -> Dir_float (float_of_string s)
-  | TRUE -> Dir_bool true
-  | FALSE -> Dir_bool false
-  | UIDENT s -> query loc s
-  | _ -> raise (Pp_error (Unexpected_token_in_conditional, loc))
-
-let directive_parse (token_with_comments : Lexing.lexbuf -> Parser.token) lexbuf
-    =
-  let look_ahead = ref None in
-  let token () : Parser.token =
-    let v = !look_ahead in
-    match v with
-    | Some v ->
-        look_ahead := None;
-        v
-    | None ->
-        let rec skip () =
-          match token_with_comments lexbuf with
-          | COMMENT _ | DOCSTRING _ -> skip ()
-          | EOF -> raise (Pp_error (Unterminated_if, Location.curr lexbuf))
-          | t -> t
-        in
-        skip ()
-  in
-  let push e =
-    (* INVARIANT: only look at most one token *)
-    assert (!look_ahead = None);
-    look_ahead := Some e
-  in
-  let rec token_op calc ~no lhs =
-    match token () with
-    | (LESS | GREATER | INFIXOP0 "<=" | INFIXOP0 ">=" | EQUAL | INFIXOP0 "<>")
-      as op ->
-        let f =
-          match op with
-          | LESS -> ( < )
-          | GREATER -> ( > )
-          | INFIXOP0 "<=" -> ( <= )
-          | EQUAL -> ( = )
-          | INFIXOP0 "<>" -> ( <> )
-          | _ -> assert false
-        in
-        let curr_loc = Location.curr lexbuf in
-        let rhs = value_of_token curr_loc (token ()) in
-        (not calc) || f lhs (assert_same_type lexbuf lhs rhs)
-    | INFIXOP0 "=~" -> (
-        (not calc)
-        ||
-        match lhs with
-        | Dir_string s -> (
-            let curr_loc = Location.curr lexbuf in
-            let rhs = value_of_token curr_loc (token ()) in
-            match rhs with
-            | Dir_string rhs -> semver curr_loc s rhs
-            | _ ->
-                raise
-                  (Pp_error
-                     ( Conditional_expr_expected_type
-                         (Dir_type_string, type_of_directive lhs),
-                       Location.curr lexbuf )))
-        | _ ->
-            raise
-              (Pp_error
-                 ( Conditional_expr_expected_type
-                     (Dir_type_string, type_of_directive lhs),
-                   Location.curr lexbuf )))
-    | e -> no e
-  and parse_or calc : bool = parse_or_aux calc (parse_and calc)
-  and (* a || (b || (c || d))*)
-      parse_or_aux calc v : bool =
-    (* let l = v  in *)
-    match token () with
-    | BARBAR ->
-        let b = parse_or (calc && not v) in
-        v || b
-    | e ->
-        push e;
-        v
-  and parse_and calc = parse_and_aux calc (parse_relation calc)
-  and parse_and_aux calc v =
-    (* a && (b && (c && d)) *)
-    (* let l = v  in *)
-    match token () with
-    | AMPERAMPER ->
-        let b = parse_and (calc && v) in
-        v && b
-    | e ->
-        push e;
-        v
-  and parse_relation (calc : bool) : bool =
-    let curr_token = token () in
-    let curr_loc = Location.curr lexbuf in
-    match curr_token with
-    | TRUE -> true
-    | FALSE -> false
-    | UIDENT v ->
-        let value_v = query curr_loc v in
-        token_op calc
-          ~no:(fun e ->
-            push e;
-            match value_v with
-            | Dir_bool b -> b
-            | _ ->
-                let ty = type_of_directive value_v in
-                raise
-                  (Pp_error
-                     ( Conditional_expr_expected_type (Dir_type_bool, ty),
-                       curr_loc )))
-          value_v
-    | INT (v, None) ->
-        let num_v = cvt_int_literal v in
-        token_op calc
-          ~no:(fun e ->
-            push e;
-            num_v <> 0)
-          (Dir_int num_v)
-    | FLOAT (v, None) ->
-        token_op calc
-          ~no:(fun _e ->
-            raise
-              (Pp_error
-                 ( Conditional_expr_expected_type (Dir_type_bool, Dir_type_float),
-                   curr_loc )))
-          (Dir_float (float_of_string v))
-    | STRING (v, _) ->
-        token_op calc
-          ~no:(fun _e ->
-            raise
-              (Pp_error
-                 ( Conditional_expr_expected_type
-                     (Dir_type_bool, Dir_type_string),
-                   curr_loc )))
-          (Dir_string v)
-    | LIDENT (("defined" | "undefined") as r) -> (
-        let t = token () in
-        let loc = Location.curr lexbuf in
-        match t with
-        | UIDENT s ->
-            (not calc) || if r.[0] = 'u' then not @@ defined s else defined s
-        | _ -> raise (Pp_error (Unexpected_token_in_conditional, loc)))
-    | LPAREN -> (
-        let v = parse_or calc in
-        match token () with
-        | RPAREN -> v
-        | _ ->
-            raise
-              (Pp_error (Unterminated_paren_in_conditional, Location.curr lexbuf))
-        )
-    | _ -> raise (Pp_error (Unexpected_token_in_conditional, curr_loc))
-  in
-  let v = parse_or true in
-  match token () with
-  | THEN | EOL -> v
-  | _ ->
-      raise (Pp_error (Expect_hash_then_in_conditional, Location.curr lexbuf))
-
-type dir_conditional = Dir_if_true | Dir_if_false | Dir_out
-
-(* let string_of_dir_conditional (x : dir_conditional) = *)
-(*   match x with  *)
-(*   | Dir_if_true -> "Dir_if_true" *)
-(*   | Dir_if_false -> "Dir_if_false" *)
-(*   | Dir_out -> "Dir_out" *)
-
-let if_then_else = ref Dir_out
-
-(* store the token after hash, [# token]
-   when we see `#if` we do the processing immediately
-   when we see #method, we produce `HASH` token and save `method`
-   token so that the next lexing produce the right one.
-*)
-let sharp_look_ahead = ref None
-
-let update_if_then_else v =
-  (* Format.fprintf Format.err_formatter "@[update %s \n@]@." (string_of_dir_conditional v); *)
-  if_then_else := v
-
-let at_bol lexbuf =
-  let pos = Lexing.lexeme_start_p lexbuf in
-  pos.pos_cnum = pos.pos_bol
-
-(* skip to #else | #end | #elif *)
-let rec skip_from_if_false (token_with_comments : Lexing.lexbuf -> Parser.token)
-    cont lexbuf =
-  let token = token_with_comments lexbuf in
-  if token = EOF then raise (Pp_error (Unterminated_if, Location.curr lexbuf))
-  else if token = HASH && at_bol lexbuf then
-    let token = token_with_comments lexbuf in
-    match token with
-    | END | LIDENT "endif" ->
-        update_if_then_else Dir_out;
-        cont lexbuf
-    | ELSE ->
-        update_if_then_else Dir_if_false;
-        cont lexbuf
-    | IF -> raise (Pp_error (Unexpected_directive, Location.curr lexbuf))
-    | LIDENT "elif" when directive_parse token_with_comments lexbuf ->
-        update_if_then_else Dir_if_true;
-        cont lexbuf
-    | _ -> skip_from_if_false token_with_comments cont lexbuf
-  else skip_from_if_false token_with_comments cont lexbuf
-
-let interpret_directive_cont lexbuf ~cont
-    ~(token_with_comments : Lexing.lexbuf -> Parser.token) look_ahead =
-  (* current state *)
-  let if_then_else = !if_then_else in
-  match (token_with_comments lexbuf, if_then_else) with
-  | IF, Dir_out ->
-      if directive_parse token_with_comments lexbuf then (
-        update_if_then_else Dir_if_true (* Next state: ELSE *);
-        cont lexbuf)
-      else skip_from_if_false token_with_comments cont lexbuf
-  | LIDENT (("ifndef" | "ifdef") as s), Dir_out ->
-      let rec token () =
-        match token_with_comments lexbuf with
-        | COMMENT _ | DOCSTRING _ -> token ()
-        | EOF -> raise (Pp_error (Unterminated_if, Location.curr lexbuf))
-        | t -> t
-      in
-      let t0 = token () in
-      let t =
-        match t0 with
-        | UIDENT t -> t
-        | _ ->
-            raise
-              (Pp_error (Unexpected_token_in_conditional, Location.curr lexbuf))
-      in
-      let t1 = token () in
-      (match t1 with
-      | THEN | EOL -> ()
-      | _ ->
-          raise
-            (Pp_error (Expect_hash_then_in_conditional, Location.curr lexbuf)));
-      let boolean = defined t = (s = "ifdef") in
-      if boolean then (
-        update_if_then_else Dir_if_true (* Next state: ELSE *);
-        cont lexbuf)
-      else skip_from_if_false token_with_comments cont lexbuf
-  | (IF | LIDENT "ifndef" | LIDENT "ifdef"), (Dir_if_false | Dir_if_true) ->
-      raise (Pp_error (Unexpected_directive, Location.curr lexbuf))
-  | LIDENT "elif", (Dir_if_false | Dir_out) ->
-      (* when the predicate is false, it will continue eating `elif` *)
-      raise (Pp_error (Unexpected_directive, Location.curr lexbuf))
-  | ((LIDENT "elif" | ELSE) as token), Dir_if_true ->
-      (* looking for #end, however, it can not see #if anymore,
-         we need do some validation *)
-      let rec skip_from_if_true else_seen =
-        let token = token_with_comments lexbuf in
-        if token = EOF then
-          raise (Pp_error (Unterminated_else, Location.curr lexbuf))
-        else if token = HASH && at_bol lexbuf then
-          let token = token_with_comments lexbuf in
-          match token with
-          | END | LIDENT "endif" ->
-              update_if_then_else Dir_out;
-              cont lexbuf
-          | IF -> raise (Pp_error (Unexpected_directive, Location.curr lexbuf))
-          | ELSE ->
-              if else_seen then
-                raise (Pp_error (Unexpected_directive, Location.curr lexbuf))
-              else skip_from_if_true true
-          | LIDENT "elif" when else_seen ->
-              raise (Pp_error (Unexpected_directive, Location.curr lexbuf))
-          | _ -> skip_from_if_true else_seen
-        else skip_from_if_true else_seen
-      in
-      skip_from_if_true (token = ELSE)
-  | ELSE, Dir_if_false | ELSE, Dir_out ->
-      raise (Pp_error (Unexpected_directive, Location.curr lexbuf))
-  | (END | LIDENT "endif"), (Dir_if_false | Dir_if_true) ->
-      update_if_then_else Dir_out;
-      cont lexbuf
-  | (END | LIDENT "endif"), Dir_out ->
-      raise (Pp_error (Unexpected_directive, Location.curr lexbuf))
-  | token, (Dir_if_true | Dir_if_false | Dir_out) -> look_ahead token
-
-let interpret_directive lexbuf ~cont ~token_with_comments : Parser.token =
-  interpret_directive_cont lexbuf ~cont ~token_with_comments
-    (fun (token : 'a) : 'a ->
-      sharp_look_ahead := Some token;
-      HASH)
-
-let eof_check lexbuf =
-  if !if_then_else <> Dir_out then
-    if !if_then_else = Dir_if_true then
-      raise (Pp_error (Unterminated_if, Location.curr lexbuf))
-    else raise (Pp_error (Unterminated_else, Location.curr lexbuf))
-
-let init () =
-  sharp_look_ahead := None;
-  update_if_then_else Dir_out
-
-let check_sharp_look_ahead action : Parser.token =
-  match !sharp_look_ahead with
-  | None -> action ()
-  | Some token ->
-      sharp_look_ahead := None;
-      token
-
-let rec filter_directive ~(token_with_comments : Lexing.lexbuf -> Parser.token)
-    pos acc lexbuf : (int * int) list =
-  match token_with_comments lexbuf with
-  | HASH when at_bol lexbuf ->
-      (* ^[start_pos]#if ... #then^[end_pos] *)
-      let start_pos = Lexing.lexeme_start lexbuf in
-      interpret_directive_cont lexbuf
-        ~cont:(fun lexbuf ->
-          filter_directive (Lexing.lexeme_end lexbuf) ~token_with_comments
-            ((pos, start_pos) :: acc) lexbuf)
-        ~token_with_comments
-        (fun _token -> filter_directive pos acc lexbuf ~token_with_comments)
-  | EOF -> (pos, Lexing.lexeme_end lexbuf) :: acc
-  | _ -> filter_directive ~token_with_comments pos acc lexbuf
-
-let filter_directive_from_lexbuf lexbuf ~token_with_comments =
-  List.rev (filter_directive 0 [] lexbuf ~token_with_comments)
diff --git a/jscomp/ml/rescript_cpp.mli b/jscomp/ml/rescript_cpp.mli
deleted file mode 100644
index 46fe631..0000000
--- a/jscomp/ml/rescript_cpp.mli
+++ /dev/null
@@ -1,54 +0,0 @@
-(* Copyright (C) 2021- Hongbo Zhang, Authors of ReScript
- * 
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-val at_bol : Lexing.lexbuf -> bool
-
-val interpret_directive :
-  Lexing.lexbuf ->
-  cont:(Lexing.lexbuf -> Parser.token) ->
-  token_with_comments:(Lexing.lexbuf -> Parser.token) ->
-  Parser.token
-
-val eof_check : Lexing.lexbuf -> unit
-
-val init : unit -> unit
-
-val check_sharp_look_ahead : (unit -> Parser.token) -> Parser.token
-
-(* Methods below are used for cpp, they are not needed by the compiler patches*)
-val remove_directive_built_in_value : string -> unit
-
-val replace_directive_string : string -> string -> unit
-
-val replace_directive_bool : string -> bool -> unit
-
-val define_key_value : string -> string -> bool
-(** @return false means failed to define *)
-
-val list_variables : Format.formatter -> unit
-
-val filter_directive_from_lexbuf :
-  Lexing.lexbuf ->
-  token_with_comments:(Lexing.lexbuf -> Parser.token) ->
-  (int * int) list
diff --git a/jscomp/ml/stypes.ml b/jscomp/ml/stypes.ml
deleted file mode 100644
index 879aef7..0000000
--- a/jscomp/ml/stypes.ml
+++ /dev/null
@@ -1,210 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*           Damien Doligez, projet Moscova, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 2003 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Recording and dumping (partial) type information *)
-
-(*
-  We record all types in a list as they are created.
-  This means we can dump type information even if type inference fails,
-  which is extremely important, since type information is most
-  interesting in case of errors.
-*)
-
-open Annot;;
-open Lexing;;
-open Location;;
-open Typedtree;;
-
-let output_int oc i = output_string oc (string_of_int i)
-
-type annotation =
-  | Ti_pat   of pattern
-  | Ti_expr  of expression
-  | Ti_class of unit
-  | Ti_mod   of module_expr
-  | An_call of Location.t * Annot.call
-  | An_ident of Location.t * string * Annot.ident
-;;
-
-let get_location ti =
-  match ti with
-    Ti_pat p   -> p.pat_loc
-  | Ti_expr e  -> e.exp_loc
-  | Ti_class () -> assert false
-  | Ti_mod m   -> m.mod_loc
-  | An_call (l, _k) -> l
-  | An_ident (l, _s, _k) -> l
-;;
-
-let annotations = ref ([] : annotation list);;
-let phrases = ref ([] : Location.t list);;
-
-let record ti =
-  if !Clflags.annotations && not (get_location ti).Location.loc_ghost then
-    annotations := ti :: !annotations
-;;
-
-let record_phrase loc =
-  if !Clflags.annotations then phrases := loc :: !phrases;
-;;
-
-(* comparison order:
-   the intervals are sorted by order of increasing upper bound
-   same upper bound -> sorted by decreasing lower bound
-*)
-let cmp_loc_inner_first loc1 loc2 =
-  match compare loc1.loc_end.pos_cnum loc2.loc_end.pos_cnum with
-  | 0 -> compare loc2.loc_start.pos_cnum loc1.loc_start.pos_cnum
-  | x -> x
-;;
-let cmp_ti_inner_first ti1 ti2 =
-  cmp_loc_inner_first (get_location ti1) (get_location ti2)
-;;
-
-let print_position pp pos =
-  if pos = dummy_pos then
-    output_string pp "--"
-  else begin
-    output_char pp '\"';
-    output_string pp (String.escaped pos.pos_fname);
-    output_string pp "\" ";
-    output_int pp pos.pos_lnum;
-    output_char pp ' ';
-    output_int pp pos.pos_bol;
-    output_char pp ' ';
-    output_int pp pos.pos_cnum;
-  end
-;;
-
-let print_location pp loc =
-  print_position pp loc.loc_start;
-  output_char pp ' ';
-  print_position pp loc.loc_end;
-;;
-
-let sort_filter_phrases () =
-  let ph = List.sort (fun x y -> cmp_loc_inner_first y x) !phrases in
-  let rec loop accu cur l =
-    match l with
-    | [] -> accu
-    | loc :: t ->
-       if cur.loc_start.pos_cnum <= loc.loc_start.pos_cnum
-          && cur.loc_end.pos_cnum >= loc.loc_end.pos_cnum
-       then loop accu cur t
-       else loop (loc :: accu) loc t
-  in
-  phrases := loop [] Location.none ph;
-;;
-
-let rec printtyp_reset_maybe loc =
-  match !phrases with
-  | cur :: t when cur.loc_start.pos_cnum <= loc.loc_start.pos_cnum ->
-     Printtyp.reset ();
-     phrases := t;
-     printtyp_reset_maybe loc;
-  | _ -> ()
-;;
-
-let call_kind_string k =
-  match k with
-  | Tail -> "tail"
-  | Stack -> "stack"
-  | Inline -> "inline"
-;;
-
-let print_ident_annot pp str k =
-  match k with
-  | Idef l ->
-      output_string pp "def ";
-      output_string pp str;
-      output_char pp ' ';
-      print_location pp l;
-      output_char pp '\n'
-  | Iref_internal l ->
-      output_string pp "int_ref ";
-      output_string pp str;
-      output_char pp ' ';
-      print_location pp l;
-      output_char pp '\n'
-  | Iref_external ->
-      output_string pp "ext_ref ";
-      output_string pp str;
-      output_char pp '\n'
-;;
-
-(* The format of the annotation file is documented in emacs/caml-types.el. *)
-
-let print_info pp prev_loc ti =
-  match ti with
-  | Ti_class _ | Ti_mod _ -> prev_loc
-  | Ti_pat  {pat_loc = loc; pat_type = typ; pat_env = env}
-  | Ti_expr {exp_loc = loc; exp_type = typ; exp_env = env} ->
-      if loc <> prev_loc then begin
-        print_location pp loc;
-        output_char pp '\n'
-      end;
-      output_string pp "type(\n";
-      printtyp_reset_maybe loc;
-      Printtyp.mark_loops typ;
-      Format.pp_print_string Format.str_formatter "  ";
-      Printtyp.wrap_printing_env env
-                       (fun () -> Printtyp.type_sch Format.str_formatter typ);
-      Format.pp_print_newline Format.str_formatter ();
-      let s = Format.flush_str_formatter () in
-      output_string pp s;
-      output_string pp ")\n";
-      loc
-  | An_call (loc, k) ->
-      if loc <> prev_loc then begin
-        print_location pp loc;
-        output_char pp '\n'
-      end;
-      output_string pp "call(\n  ";
-      output_string pp (call_kind_string k);
-      output_string pp "\n)\n";
-      loc
-  | An_ident (loc, str, k) ->
-      if loc <> prev_loc then begin
-        print_location pp loc;
-        output_char pp '\n'
-      end;
-      output_string pp "ident(\n  ";
-      print_ident_annot pp str k;
-      output_string pp ")\n";
-      loc
-;;
-
-let get_info () =
-  let info = List.fast_sort cmp_ti_inner_first !annotations in
-  annotations := [];
-  info
-;;
-
-let dump filename =
-  if !Clflags.annotations then begin
-    let do_dump _temp_filename pp =
-      let info = get_info () in
-      sort_filter_phrases ();
-      ignore (List.fold_left (print_info pp) Location.none info) in
-    begin match filename with
-    | None -> do_dump "" stdout
-    | Some filename ->
-        Misc.output_to_file_via_temporary ~mode:[Open_text] filename do_dump
-    end;
-    phrases := [];
-  end else begin
-    annotations := [];
-  end;
-;;
diff --git a/jscomp/ml/subst.ml b/jscomp/ml/subst.ml
deleted file mode 100644
index f30b7a1..0000000
--- a/jscomp/ml/subst.ml
+++ /dev/null
@@ -1,474 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Substitutions *)
-
-open Misc
-open Path
-open Types
-open Btype
-
-type type_replacement =
-  | Path of Path.t
-  | Type_function of { params : type_expr list; body : type_expr }
-
-module PathMap = Map.Make(Path)
-
-type t =
-  { types: type_replacement PathMap.t;
-    modules: Path.t PathMap.t;
-    modtypes: (Ident.t, module_type) Tbl.t;
-    for_saving: bool;
-  }
-
-let identity =
-  { types = PathMap.empty;
-    modules = PathMap.empty;
-    modtypes = Tbl.empty;
-    for_saving = false;
-  }
-
-let add_type_path id p s = { s with types = PathMap.add id (Path p) s.types }
-let add_type id p s = add_type_path (Pident id) p s
-
-let add_type_function id ~params ~body s =
-  { s with types = PathMap.add id (Type_function { params; body }) s.types }
-
-let add_module_path id p s = { s with modules = PathMap.add id p s.modules }
-let add_module id p s = add_module_path (Pident id) p s
-
-let add_modtype id ty s = { s with modtypes = Tbl.add id ty s.modtypes }
-
-let for_saving s = { s with for_saving = true }
-
-let loc s x =
-  if s.for_saving && not !Clflags.keep_locs then Location.none else x
-
-let remove_loc =
-  let open Ast_mapper in
-  {default_mapper with location = (fun _this _loc -> Location.none)}
-
-let is_not_doc = function
-  | ({Location.txt = "ocaml.doc"}, _) -> false
-  | ({Location.txt = "ocaml.text"}, _) -> false
-  | ({Location.txt = "doc"}, _) -> false
-  | ({Location.txt = "text"}, _) -> false
-  | _ -> true
-
-let attrs s x =
-  let x =
-    if s.for_saving && not !Clflags.keep_docs then
-      Ext_list.filter x is_not_doc
-    else x
-  in
-    if s.for_saving && not !Clflags.keep_locs
-    then remove_loc.Ast_mapper.attributes remove_loc x
-    else x
-
-let rec module_path s path =
-  try PathMap.find path s.modules
-  with Not_found ->
-    match path with
-    | Pident _ -> path
-    | Pdot(p, n, pos) ->
-       Pdot(module_path s p, n, pos)
-    | Papply(p1, p2) ->
-       Papply(module_path s p1, module_path s p2)
-
-let modtype_path s = function
-    Pident id as p ->
-      begin try
-        match Tbl.find id s.modtypes with
-          | Mty_ident p -> p
-          | _ -> fatal_error "Subst.modtype_path"
-      with Not_found -> p end
-  | Pdot(p, n, pos) ->
-      Pdot(module_path s p, n, pos)
-  | Papply _ ->
-      fatal_error "Subst.modtype_path"
-
-let type_path s path =
-  match PathMap.find path s.types with
-  | Path p -> p
-  | Type_function _ -> assert false
-  | exception Not_found ->
-     match path with
-     | Pident _ -> path
-     | Pdot(p, n, pos) ->
-        Pdot(module_path s p, n, pos)
-     | Papply _ ->
-        fatal_error "Subst.type_path"
-
-let type_path s p =
-  match Path.constructor_typath p with
-  | Regular p -> type_path s p
-  | Cstr (ty_path, cstr) -> Pdot(type_path s ty_path, cstr, nopos)
-  | LocalExt _ -> type_path s p
-  | Ext (p, cstr) -> Pdot(module_path s p, cstr, nopos)
-
-let to_subst_by_type_function s p =
-  match PathMap.find p s.types with
-  | Path _ -> false
-  | Type_function _ -> true
-  | exception Not_found -> false
-
-(* Special type ids for saved signatures *)
-
-let new_id = ref (-1)
-let reset_for_saving () = new_id := -1
-
-let newpersty desc =
-  decr new_id;
-  { desc = desc; level = generic_level; id = !new_id }
-
-(* ensure that all occurrences of 'Tvar None' are physically shared *)
-let tvar_none = Tvar None
-let tunivar_none = Tunivar None
-let norm = function
-  | Tvar None -> tvar_none
-  | Tunivar None -> tunivar_none
-  | d -> d
-
-let ctype_apply_env_empty = ref (fun _ -> assert false)
-
-(* Similar to [Ctype.nondep_type_rec]. *)
-let rec typexp s ty =
-  let ty = repr ty in
-  match ty.desc with
-    Tvar _ | Tunivar _ as desc ->
-      if s.for_saving || ty.id < 0 then
-        let ty' =
-          if s.for_saving then newpersty (norm desc)
-          else newty2 ty.level desc
-        in
-        save_desc ty desc; ty.desc <- Tsubst ty'; ty'
-      else ty
-  | Tsubst ty ->
-      ty
-  | Tfield (m, k, _t1, _t2) when not s.for_saving && m = dummy_method
-      && field_kind_repr k <> Fabsent && (repr ty).level < generic_level ->
-      (* do not copy the type of self when it is not generalized *)
-      ty
-(* cannot do it, since it would omit substitution
-  | Tvariant row when not (static_row row) ->
-      ty
-*)
-  | _ ->
-    let desc = ty.desc in
-    save_desc ty desc;
-    let tm = row_of_type ty in
-    let has_fixed_row =
-      not (is_Tconstr ty) && is_constr_row ~allow_ident:false tm in
-    (* Make a stub *)
-    let ty' = if s.for_saving then newpersty (Tvar None) else newgenvar () in
-    ty.desc <- Tsubst ty';
-    ty'.desc <-
-      begin if has_fixed_row then
-        match tm.desc with (* PR#7348 *)
-          Tconstr (Pdot(m,i,pos), tl, _abbrev) ->
-            let i' = String.sub i 0 (String.length i - 4) in
-            Tconstr(type_path s (Pdot(m,i',pos)), tl, ref Mnil)
-        | _ -> assert false
-      else match desc with
-      | Tconstr (p, args, _abbrev) ->
-         let args = List.map (typexp s) args in
-         begin match PathMap.find p s.types with
-         | exception Not_found -> Tconstr(type_path s p, args, ref Mnil)
-         | Path _ -> Tconstr(type_path s p, args, ref Mnil)
-         | Type_function { params; body } ->
-            (!ctype_apply_env_empty params body args).desc
-         end
-      | Tpackage(p, n, tl) ->
-          Tpackage(modtype_path s p, n, List.map (typexp s) tl)
-      | Tobject (t1, name) ->
-          Tobject (typexp s t1,
-                 ref (match !name with
-                        None -> None
-                      | Some (p, tl) ->
-                         if to_subst_by_type_function s p
-                         then None
-                         else Some (type_path s p, List.map (typexp s) tl)))
-      | Tvariant row ->
-          let row = row_repr row in
-          let more = repr row.row_more in
-          (* We must substitute in a subtle way *)
-          (* Tsubst takes a tuple containing the row var and the variant *)
-          begin match more.desc with
-            Tsubst {desc = Ttuple [_;ty2]} ->
-              (* This variant type has been already copied *)
-              ty.desc <- Tsubst ty2; (* avoid Tlink in the new type *)
-              Tlink ty2
-          | _ ->
-              let dup =
-                s.for_saving || more.level = generic_level || static_row row ||
-                match more.desc with Tconstr _ -> true | _ -> false in
-              (* Various cases for the row variable *)
-              let more' =
-                match more.desc with
-                  Tsubst ty -> ty
-                | Tconstr _ | Tnil -> typexp s more
-                | Tunivar _ | Tvar _ ->
-                    save_desc more more.desc;
-                    if s.for_saving then newpersty (norm more.desc) else
-                    if dup && is_Tvar more then newgenty more.desc else more
-                | _ -> assert false
-              in
-              (* Register new type first for recursion *)
-              more.desc <- Tsubst(newgenty(Ttuple[more';ty']));
-              (* Return a new copy *)
-              let row =
-                copy_row (typexp s) true row (not dup) more' in
-              match row.row_name with
-              | Some (p, tl) ->
-                 Tvariant {row with row_name =
-                                      if to_subst_by_type_function s p
-                                      then None
-                                      else Some (type_path s p, tl)}
-              | None ->
-                  Tvariant row
-          end
-      | Tfield(_label, kind, _t1, t2) when field_kind_repr kind = Fabsent ->
-          Tlink (typexp s t2)
-      | _ -> copy_type_desc (typexp s) desc
-      end;
-    ty'
-
-(*
-   Always make a copy of the type. If this is not done, type levels
-   might not be correct.
-*)
-let type_expr s ty =
-  let ty' = typexp s ty in
-  cleanup_types ();
-  ty'
-
-let label_declaration s l =
-  {
-    ld_id = l.ld_id;
-    ld_mutable = l.ld_mutable;
-    ld_type = typexp s l.ld_type;
-    ld_loc = loc s l.ld_loc;
-    ld_attributes = attrs s l.ld_attributes;
-  }
-
-let constructor_arguments s = function
-  | Cstr_tuple l ->
-      Cstr_tuple (List.map (typexp s) l)
-  | Cstr_record l ->
-      Cstr_record (List.map (label_declaration s) l)
-
-let constructor_declaration s c =
-  {
-    cd_id = c.cd_id;
-    cd_args = constructor_arguments s c.cd_args;
-    cd_res = may_map (typexp s) c.cd_res;
-    cd_loc = loc s c.cd_loc;
-    cd_attributes = attrs s c.cd_attributes;
-  }
-
-let type_declaration s decl =
-  let decl =
-    { type_params = List.map (typexp s) decl.type_params;
-      type_arity = decl.type_arity;
-      type_kind =
-        begin match decl.type_kind with
-          Type_abstract -> Type_abstract
-        | Type_variant cstrs ->
-            Type_variant (List.map (constructor_declaration s) cstrs)
-        | Type_record(lbls, rep) ->
-            Type_record (List.map (label_declaration s) lbls, rep)
-        | Type_open -> Type_open
-        end;
-      type_manifest =
-        begin
-          match decl.type_manifest with
-            None -> None
-          | Some ty -> Some(typexp s ty)
-        end;
-      type_private = decl.type_private;
-      type_variance = decl.type_variance;
-      type_newtype_level = None;
-      type_loc = loc s decl.type_loc;
-      type_attributes = attrs s decl.type_attributes;
-      type_immediate = decl.type_immediate;
-      type_unboxed = decl.type_unboxed;
-    }
-  in
-  cleanup_types ();
-  decl
-
-let class_signature s sign =
-  { csig_self = typexp s sign.csig_self;
-    csig_vars =
-      Vars.map (function (m, v, t) -> (m, v, typexp s t)) sign.csig_vars;
-    csig_concr = sign.csig_concr;
-    csig_inher =
-      List.map (fun (p, tl) -> (type_path s p, List.map (typexp s) tl))
-        sign.csig_inher;
-  }
-
-let rec class_type s =
-  function
-    Cty_constr (p, tyl, cty) ->
-      Cty_constr (type_path s p, List.map (typexp s) tyl, class_type s cty)
-  | Cty_signature sign ->
-      Cty_signature (class_signature s sign)
-  | Cty_arrow (l, ty, cty) ->
-      Cty_arrow (l, typexp s ty, class_type s cty)
-
-
-
-let cltype_declaration s decl =
-  let decl =
-    { clty_params = List.map (typexp s) decl.clty_params;
-      clty_variance = decl.clty_variance;
-      clty_type = class_type s decl.clty_type;
-      clty_path = type_path s decl.clty_path;
-      clty_loc = loc s decl.clty_loc;
-      clty_attributes = attrs s decl.clty_attributes;
-    }
-  in
-  (* Do clean up even if saving: type_declaration may be recursive *)
-  cleanup_types ();
-  decl
-
-let class_type s cty =
-  let cty = class_type s cty in
-  cleanup_types ();
-  cty
-
-let value_description s descr =
-  { val_type = type_expr s descr.val_type;
-    val_kind = descr.val_kind;
-    val_loc = loc s descr.val_loc;
-    val_attributes = attrs s descr.val_attributes;
-   }
-
-let extension_constructor s ext =
-  let ext =
-    { ext_type_path = type_path s ext.ext_type_path;
-      ext_type_params = List.map (typexp s) ext.ext_type_params;
-      ext_args = constructor_arguments s ext.ext_args;
-      ext_ret_type = may_map (typexp s) ext.ext_ret_type;
-      ext_private = ext.ext_private;
-      ext_attributes = attrs s ext.ext_attributes;
-      ext_loc = if s.for_saving then Location.none else ext.ext_loc; }
-  in
-    cleanup_types ();
-    ext
-
-let rec rename_bound_idents s idents = function
-    [] -> (List.rev idents, s)
-  | Sig_type(id, _, _) :: sg ->
-      let id' = Ident.rename id in
-      rename_bound_idents (add_type id (Pident id') s) (id' :: idents) sg
-  | Sig_module(id, _, _) :: sg ->
-      let id' = Ident.rename id in
-      rename_bound_idents (add_module id (Pident id') s) (id' :: idents) sg
-  | Sig_modtype(id, _) :: sg ->
-      let id' = Ident.rename id in
-      rename_bound_idents (add_modtype id (Mty_ident(Pident id')) s)
-                          (id' :: idents) sg
-  |  Sig_class_type(id, _, _) :: sg ->
-      (* cheat and pretend they are types cf. PR#6650 *)
-      let id' = Ident.rename id in
-      rename_bound_idents (add_type id (Pident id') s) (id' :: idents) sg
-  | (Sig_value(id, _) | Sig_typext(id, _, _)) :: sg ->
-      let id' = Ident.rename id in
-      rename_bound_idents s (id' :: idents) sg
-  | Sig_class _ :: _ -> assert false
-let rec modtype s = function
-    Mty_ident p as mty ->
-      begin match p with
-        Pident id ->
-          begin try Tbl.find id s.modtypes with Not_found -> mty end
-      | Pdot(p, n, pos) ->
-          Mty_ident(Pdot(module_path s p, n, pos))
-      | Papply _ ->
-          fatal_error "Subst.modtype"
-      end
-  | Mty_signature sg ->
-      Mty_signature(signature s sg)
-  | Mty_functor(id, arg, res) ->
-      let id' = Ident.rename id in
-      Mty_functor(id', may_map (modtype s) arg,
-                       modtype (add_module id (Pident id') s) res)
-  | Mty_alias(pres, p) ->
-      Mty_alias(pres, module_path s p)
-
-and signature s sg =
-  (* Components of signature may be mutually recursive (e.g. type declarations
-     or class and type declarations), so first build global renaming
-     substitution... *)
-  let (new_idents, s') = rename_bound_idents s [] sg in
-  (* ... then apply it to each signature component in turn *)
-  List.map2 (signature_component s') sg new_idents
-
-and signature_component s comp newid =
-  match comp with
-    Sig_value(_id, d) ->
-      Sig_value(newid, value_description s d)
-  | Sig_type(_id, d, rs) ->
-      Sig_type(newid, type_declaration s d, rs)
-  | Sig_typext(_id, ext, es) ->
-      Sig_typext(newid, extension_constructor s ext, es)
-  | Sig_module(_id, d, rs) ->
-      Sig_module(newid, module_declaration s d, rs)
-  | Sig_modtype(_id, d) ->
-      Sig_modtype(newid, modtype_declaration s d)
-  | Sig_class() ->
-      Sig_class()
-  | Sig_class_type(_id, d, rs) ->
-      Sig_class_type(newid, cltype_declaration s d, rs)
-
-and module_declaration s decl =
-  {
-    md_type = modtype s decl.md_type;
-    md_attributes = attrs s decl.md_attributes;
-    md_loc = loc s decl.md_loc;
-  }
-
-and modtype_declaration s decl  =
-  {
-    mtd_type = may_map (modtype s) decl.mtd_type;
-    mtd_attributes = attrs s decl.mtd_attributes;
-    mtd_loc = loc s decl.mtd_loc;
-  }
-
-(* For every binding k |-> d of m1, add k |-> f d to m2
-   and return resulting merged map. *)
-
-let merge_tbls f m1 m2 =
-  Tbl.fold (fun k d accu -> Tbl.add k (f d) accu) m1 m2
-
-let merge_path_maps f m1 m2 =
-  PathMap.fold (fun k d accu -> PathMap.add k (f d) accu) m1 m2
-
-let type_replacement s = function
-  | Path p -> Path (type_path s p)
-  | Type_function { params; body } ->
-     let params = List.map (typexp s) params in
-     let body = typexp s body in
-     Type_function { params; body }
-
-(* Composition of substitutions:
-     apply (compose s1 s2) x = apply s2 (apply s1 x) *)
-
-let compose s1 s2 =
-  { types = merge_path_maps (type_replacement s2) s1.types s2.types;
-    modules = merge_path_maps (module_path s2) s1.modules s2.modules;
-    modtypes = merge_tbls (modtype s2) s1.modtypes s2.modtypes;
-    for_saving = s1.for_saving || s2.for_saving;
-  }
diff --git a/jscomp/ml/subst.mli b/jscomp/ml/subst.mli
deleted file mode 100644
index 3f975b4..0000000
--- a/jscomp/ml/subst.mli
+++ /dev/null
@@ -1,70 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Substitutions *)
-
-open Types
-
-type t
-
-(*
-   Substitutions are used to translate a type from one context to
-   another.  This requires substituting paths for identifiers, and
-   possibly also lowering the level of non-generic variables so that
-   they are inferior to the maximum level of the new context.
-
-   Substitutions can also be used to create a "clean" copy of a type.
-   Indeed, non-variable node of a type are duplicated, with their
-   levels set to generic level.  That way, the resulting type is
-   well-formed (decreasing levels), even if the original one was not.
-*)
-
-val identity: t
-
-val add_type: Ident.t -> Path.t -> t -> t
-val add_type_path: Path.t -> Path.t -> t -> t
-val add_type_function:
-  Path.t -> params:type_expr list -> body:type_expr -> t -> t
-val add_module: Ident.t -> Path.t -> t -> t
-val add_module_path: Path.t -> Path.t -> t -> t
-val add_modtype: Ident.t -> module_type -> t -> t
-val for_saving: t -> t
-val reset_for_saving: unit -> unit
-
-val module_path: t -> Path.t -> Path.t
-val type_path: t -> Path.t -> Path.t
-
-val type_expr: t -> type_expr -> type_expr
-val class_type: t -> class_type -> class_type
-val value_description: t -> value_description -> value_description
-val type_declaration: t -> type_declaration -> type_declaration
-val extension_constructor:
-        t -> extension_constructor -> extension_constructor
-
-val cltype_declaration: t -> class_type_declaration -> class_type_declaration
-val modtype: t -> module_type -> module_type
-val signature: t -> signature -> signature
-val modtype_declaration: t -> modtype_declaration -> modtype_declaration
-val module_declaration: t -> module_declaration -> module_declaration
-val typexp : t -> Types.type_expr -> Types.type_expr
-val class_signature: t -> class_signature -> class_signature
-
-(* Composition of substitutions:
-     apply (compose s1 s2) x = apply s2 (apply s1 x) *)
-val compose: t -> t -> t
-
-(* A forward reference to be filled in ctype.ml. *)
-val ctype_apply_env_empty:
-  (type_expr list -> type_expr -> type_expr list -> type_expr) ref
diff --git a/jscomp/ml/switch.ml b/jscomp/ml/switch.ml
deleted file mode 100644
index a4bab63..0000000
--- a/jscomp/ml/switch.ml
+++ /dev/null
@@ -1,868 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Luc Maranget, projet Moscova, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 2000 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-
-type 'a shared = Shared of 'a | Single of 'a
-
-type 'a t_store =
-    {act_get : unit -> 'a array ;
-     act_get_shared : unit -> 'a shared array ;
-     act_store : 'a -> int ;
-     act_store_shared : 'a -> int ; }
-
-exception Not_simple
-
-module type Stored = sig
-  type t
-  type key
-  val compare_key : key -> key -> int
-  val make_key : t -> key option
-end
-
-module Store(A:Stored) = struct
-  module AMap =
-    Map.Make(struct type t = A.key let compare = A.compare_key end)
-
-  type intern =
-      { mutable map : (bool * int)  AMap.t ;
-        mutable next : int ;
-        mutable acts : (bool * A.t) list; }
-
-  let mk_store () =
-    let st =
-      { map = AMap.empty ;
-        next = 0 ;
-        acts = [] ; } in
-
-    let add mustshare act =
-      let i = st.next in
-      st.acts <- (mustshare,act) :: st.acts ;
-      st.next <- i+1 ;
-      i in
-
-    let store mustshare act = match A.make_key act with
-    | Some key ->
-        begin try
-          let (shared,i) = AMap.find key st.map in
-          if not shared then st.map <- AMap.add key (true,i) st.map ;
-          i
-        with Not_found ->
-          let i = add mustshare act in
-          st.map <- AMap.add key (mustshare,i) st.map ;
-          i
-        end
-    | None ->
-        add mustshare act
-
-    and get () = Array.of_list (List.rev_map (fun (_,act) -> act) st.acts)
-
-    and get_shared () =
-      let acts =
-        Array.of_list
-          (List.rev_map
-             (fun (shared,act) ->
-               if shared then Shared act else Single act)
-             st.acts) in
-      AMap.iter
-        (fun _ (shared,i) ->
-          if shared then match acts.(i) with
-          | Single act -> acts.(i) <- Shared act
-          | Shared _ -> ())
-        st.map ;
-      acts in
-    {act_store = store false ; act_store_shared = store true ;
-     act_get = get; act_get_shared = get_shared; }
-end
-
-
-
-module type S =
- sig
-   type primitive
-   val eqint : primitive
-   val neint : primitive
-   val leint : primitive
-   val ltint : primitive
-   val geint : primitive
-   val gtint : primitive
-   type act
-
-   val bind : act -> (act -> act) -> act
-   val make_const : int -> act
-   val make_offset : act -> int -> act
-   val make_prim : primitive -> act list -> act
-   val make_isout : act -> act -> act
-   val make_isin : act -> act -> act
-   val make_if : act -> act -> act -> act
-   val make_switch : Location.t -> act -> int array -> act array -> offset:int -> Ast_untagged_variants.switch_names option -> act
-   val make_catch : act -> int * (act -> act)
-   val make_exit : int -> act
- end
-
-(* The module will ``produce good code for the case statement'' *)
-(*
-  Adaptation of
-   R.L. Berstein
-   ``Producing good code for the case statement''
-   Sofware Practice and Experience, 15(10) (1985)
- and
-   D.L. Spuler
-    ``Two-Way Comparison Search Trees, a Generalisation of Binary Search Trees
-      and Split Trees''
-    ``Compiler Code Generation for Multiway Branch Statement as
-      a Static Search Problem''
-   Technical Reports, James Cook University
-*)
-(*
-  Main adaptation is considering interval tests
- (implemented as one addition + one unsigned test and branch)
-  which leads to exhaustive search for finding the optimal
-  test sequence in small cases and heuristics otherwise.
-*)
-module Make (Arg : S) =
-  struct
-
-    type 'a inter =
-        {cases : (int * int * int) array ;
-          actions : 'a array}
-
-type 'a t_ctx =  {off : int ; arg : 'a}
-
-let cut = ref 8
-and more_cut = ref 16
-
-(*
-let pint chan i =
-  if i = min_int then Printf.fprintf chan "-oo"
-  else if i=max_int then Printf.fprintf chan "oo"
-  else Printf.fprintf chan "%d" i
-
-let pcases chan cases =
-  for i =0 to Array.length cases-1 do
-    let l,h,act = cases.(i) in
-    if l=h then
-      Printf.fprintf chan "%d:%d " l act
-    else
-      Printf.fprintf chan "%a..%a:%d " pint l pint h act
-  done
-
-let prerr_inter i = Printf.fprintf stderr
-        "cases=%a" pcases i.cases
-*)
-
-let get_act cases i =
-  let _,_,r = cases.(i) in
-  r
-and get_low cases i =
-  let r,_,_ = cases.(i) in
-  r
-
-type ctests = {
-    mutable n : int ;
-    mutable ni : int ;
-  }
-
-let too_much = {n=max_int ; ni=max_int}
-
-(*
-let ptests chan {n=n ; ni=ni} =
-  Printf.fprintf chan "{n=%d ; ni=%d}" n ni
-
-let pta chan t =
-  for i =0 to Array.length t-1 do
-    Printf.fprintf chan "%d: %a\n" i ptests t.(i)
-  done
-*)
-
-let less_tests c1 c2 =
-  if c1.n < c2.n then
-    true
-  else if c1.n = c2.n then begin
-    if c1.ni < c2.ni then
-      true
-    else
-      false
-  end else
-    false
-
-and eq_tests c1 c2 = c1.n = c2.n && c1.ni=c2.ni
-
-let less2tests (c1,d1) (c2,d2) =
-  if eq_tests c1 c2 then
-    less_tests d1 d2
-  else
-    less_tests c1 c2
-
-let add_test t1 t2 =
-  t1.n <- t1.n + t2.n ;
-  t1.ni <- t1.ni + t2.ni ;
-
-type t_ret = Inter of int * int  | Sep of int | No
-
-(*
-let pret chan = function
-  | Inter (i,j)-> Printf.fprintf chan "Inter %d %d" i j
-  | Sep i -> Printf.fprintf chan "Sep %d" i
-  | No -> Printf.fprintf chan "No"
-*)
-
-let coupe cases i =
-  let l,_,_ = cases.(i) in
-  l,
-  Array.sub cases 0 i,
-  Array.sub cases i (Array.length cases-i)
-
-
-let case_append c1 c2 =
-  let len1 = Array.length c1
-  and len2 = Array.length c2 in
-  match len1,len2 with
-  | 0,_ -> c2
-  | _,0 -> c1
-  | _,_ ->
-      let l1,h1,act1 = c1.(Array.length c1-1)
-      and l2,h2,act2 = c2.(0) in
-      if act1 = act2 then
-        let r = Array.make (len1+len2-1) c1.(0) in
-        for i = 0 to len1-2 do
-          r.(i) <- c1.(i)
-        done ;
-
-        let l =
-          if len1-2 >= 0 then begin
-            let _,h,_ = r.(len1-2) in
-            if h+1 < l1 then
-              h+1
-            else
-              l1
-          end else
-            l1
-        and h =
-          if 1 < len2-1 then begin
-            let l,_,_ = c2.(1) in
-            if h2+1 < l then
-              l-1
-            else
-              h2
-          end else
-            h2 in
-        r.(len1-1) <- (l,h,act1) ;
-        for i=1 to len2-1  do
-          r.(len1-1+i) <- c2.(i)
-        done ;
-        r
-      else if h1 > l1 then
-        let r = Array.make (len1+len2) c1.(0) in
-        for i = 0 to len1-2 do
-          r.(i) <- c1.(i)
-        done ;
-        r.(len1-1) <- (l1,l2-1,act1) ;
-        for i=0 to len2-1  do
-          r.(len1+i) <- c2.(i)
-        done ;
-        r
-      else if h2 > l2 then
-        let r = Array.make (len1+len2) c1.(0) in
-        for i = 0 to len1-1 do
-          r.(i) <- c1.(i)
-        done ;
-        r.(len1) <- (h1+1,h2,act2) ;
-        for i=1 to len2-1  do
-          r.(len1+i) <- c2.(i)
-        done ;
-        r
-      else
-        Array.append c1 c2
-
-
-let coupe_inter i j cases =
-  let lcases = Array.length cases in
-  let low,_,_ = cases.(i)
-  and _,high,_ = cases.(j) in
-  low,high,
-  Array.sub cases i (j-i+1),
-  case_append (Array.sub cases 0 i) (Array.sub cases (j+1) (lcases-(j+1)))
-
-type kind = Kvalue of int | Kinter of int | Kempty
-
-(*
-let pkind chan = function
-  | Kvalue i ->Printf.fprintf chan "V%d" i
-  | Kinter i -> Printf.fprintf chan "I%d" i
-  | Kempty -> Printf.fprintf chan "E"
-
-let rec pkey chan  = function
-  | [] -> ()
-  | [k] -> pkind chan k
-  | k::rem ->
-      Printf.fprintf chan "%a %a" pkey rem pkind k
-*)
-
-let t = Hashtbl.create 17
-
-let make_key  cases =
-  let seen = ref []
-  and count = ref 0 in
-  let rec got_it act = function
-    | [] ->
-        seen := (act,!count):: !seen ;
-        let r = !count in
-        incr count ;
-        r
-    | (act0,index) :: rem ->
-        if act0 = act then
-          index
-        else
-          got_it act rem in
-
-  let make_one (l:int) h act =
-    if l=h then
-      Kvalue (got_it act !seen)
-    else
-      Kinter (got_it act !seen) in
-
-  let rec make_rec i pl =
-    if i < 0 then
-      []
-    else
-      let l,h,act = cases.(i) in
-      if pl = h+1 then
-        make_one l h act::make_rec (i-1) l
-      else
-        Kempty::make_one l h act::make_rec (i-1) l in
-
-  let l,h,act = cases.(Array.length cases-1) in
-  make_one l h act::make_rec (Array.length cases-2) l
-
-
-    let same_act t =
-      let len = Array.length t in
-      let a = get_act t (len-1) in
-      let rec do_rec i =
-        if i < 0 then true
-        else
-          let b = get_act t i in
-          b=a && do_rec (i-1) in
-      do_rec (len-2)
-
-
-(*
-  Interval test x in [l,h] works by checking x-l in [0,h-l]
-   * This may be false for arithmetic modulo 2^31
-   * Subtracting l may change the relative ordering of values
-     and invalid the invariant that matched values are given in
-     increasing order
-
-   To avoid this, interval check is allowed only when the
-   integers indeed present in the whole case interval are
-   in [-2^16 ; 2^16]
-
-   This condition is checked by zyva
-*)
-
-let inter_limit = 1 lsl 16
-
-let ok_inter = ref false
-
-let rec opt_count top cases =
-  let key = make_key cases in
-  try
-    Hashtbl.find t key
-  with
-  | Not_found ->
-      let r =
-        let lcases = Array.length cases in
-        match lcases with
-        | 0 -> assert false
-        | _ when same_act cases -> No, ({n=0; ni=0},{n=0; ni=0})
-        | _ ->
-            if lcases < !cut then
-              enum top cases
-            else if lcases < !more_cut then
-              heuristic cases
-            else
-              divide cases in
-      Hashtbl.add t key r ;
-      r
-
-and divide cases =
-  let lcases = Array.length cases in
-  let m = lcases/2 in
-  let _,left,right = coupe cases m in
-  let ci = {n=1 ; ni=0}
-  and cm = {n=1 ; ni=0}
-  and _,(cml,cleft) = opt_count false left
-  and _,(cmr,cright) = opt_count false right in
-  add_test ci cleft ;
-  add_test ci cright ;
-  if less_tests cml cmr then
-    add_test cm cmr
-  else
-    add_test cm cml ;
-  Sep m,(cm, ci)
-
-and heuristic cases =
-  let lcases = Array.length cases in
-
-  let sep,csep = divide cases
-
-  and inter,cinter =
-    if !ok_inter then begin
-      let _,_,act0 = cases.(0)
-      and _,_,act1 = cases.(lcases-1) in
-      if act0 = act1 then begin
-        let low, high, inside, outside = coupe_inter 1 (lcases-2) cases in
-        let _,(cmi,cinside) = opt_count false inside
-        and _,(cmo,coutside) = opt_count false outside
-        and cmij = {n=1 ; ni=(if low=high then 0 else 1)}
-        and cij = {n=1 ; ni=(if low=high then 0 else 1)} in
-        add_test cij cinside ;
-        add_test cij coutside ;
-        if less_tests cmi cmo then
-          add_test cmij cmo
-        else
-          add_test cmij cmi ;
-        Inter (1,lcases-2),(cmij,cij)
-      end else
-        Inter (-1,-1),(too_much, too_much)
-    end else
-      Inter (-1,-1),(too_much, too_much) in
-  if less2tests csep cinter then
-    sep,csep
-  else
-    inter,cinter
-
-
-and enum top cases =
-  let lcases = Array.length cases in
-  let lim, with_sep =
-    let best = ref (-1) and best_cost = ref (too_much,too_much) in
-
-    for i = 1 to lcases-(1) do
-      let _,left,right = coupe cases i in
-      let ci = {n=1 ; ni=0}
-      and cm = {n=1 ; ni=0}
-      and _,(cml,cleft) = opt_count false left
-      and _,(cmr,cright) = opt_count false right in
-      add_test ci cleft ;
-      add_test ci cright ;
-      if less_tests cml cmr then
-        add_test cm cmr
-      else
-        add_test cm cml ;
-
-      if
-        less2tests (cm,ci) !best_cost
-      then begin
-        if top then
-          Printf.fprintf stderr "Get it: %d\n" i ;
-        best := i ;
-        best_cost := (cm,ci)
-      end
-    done ;
-    !best, !best_cost in
-
-  let ilow, ihigh, with_inter =
-    if not !ok_inter then
-      let rlow = ref (-1) and rhigh = ref (-1)
-      and best_cost= ref (too_much,too_much) in
-      for i=1 to lcases-2 do
-        let low, high, inside, outside = coupe_inter i i cases in
-         if low=high then begin
-           let _,(cmi,cinside) = opt_count false inside
-           and _,(cmo,coutside) = opt_count false outside
-           and cmij = {n=1 ; ni=0}
-           and cij = {n=1 ; ni=0} in
-           add_test cij cinside ;
-           add_test cij coutside ;
-           if less_tests cmi cmo then
-             add_test cmij cmo
-           else
-             add_test cmij cmi ;
-           if less2tests (cmij,cij) !best_cost then begin
-             rlow := i ;
-             rhigh := i ;
-             best_cost := (cmij,cij)
-           end
-         end
-      done ;
-      !rlow, !rhigh, !best_cost
-    else
-      let rlow = ref (-1) and rhigh = ref (-1)
-      and best_cost= ref (too_much,too_much) in
-      for i=1 to lcases-2 do
-        for j=i to lcases-2 do
-          let low, high, inside, outside = coupe_inter i j cases in
-          let _,(cmi,cinside) = opt_count false inside
-          and _,(cmo,coutside) = opt_count false outside
-          and cmij = {n=1 ; ni=(if low=high then 0 else 1)}
-          and cij = {n=1 ; ni=(if low=high then 0 else 1)} in
-          add_test cij cinside ;
-          add_test cij coutside ;
-          if less_tests cmi cmo then
-            add_test cmij cmo
-          else
-            add_test cmij cmi ;
-          if less2tests (cmij,cij) !best_cost then begin
-            rlow := i ;
-            rhigh := j ;
-            best_cost := (cmij,cij)
-          end
-        done
-      done ;
-      !rlow, !rhigh, !best_cost in
-  let r = ref (Inter (ilow,ihigh)) and rc = ref with_inter in
-  if less2tests with_sep !rc then begin
-    r := Sep lim ; rc := with_sep
-  end ;
-  !r, !rc
-
-    let make_if_test test arg i ifso ifnot =
-      Arg.make_if
-        (Arg.make_prim test [arg ; Arg.make_const i])
-        ifso ifnot
-
-    let make_if_lt arg i  ifso ifnot = match i with
-    | 1 ->
-        make_if_test Arg.leint arg 0 ifso ifnot
-    | _ ->
-        make_if_test Arg.ltint arg i ifso ifnot
-
-    and make_if_ge arg i  ifso ifnot = match i with
-    | 1 ->
-        make_if_test Arg.gtint arg 0 ifso ifnot
-    | _ ->
-        make_if_test Arg.geint arg i ifso ifnot
-
-    and make_if_eq  arg i ifso ifnot =
-      make_if_test Arg.eqint arg i ifso ifnot
-
-    and make_if_ne  arg i ifso ifnot =
-      make_if_test Arg.neint arg i ifso ifnot
-
-    let do_make_if_out h arg ifso ifno =
-      Arg.make_if (Arg.make_isout h arg) ifso ifno
-
-    let make_if_out ctx l d mk_ifso mk_ifno = match l with
-    | 0 ->
-        do_make_if_out
-          (Arg.make_const d) ctx.arg (mk_ifso ctx) (mk_ifno ctx)
-    | _ ->
-        if (*true || *)!Config.bs_only then 
-          do_make_if_out
-            (Arg.make_const d) (Arg.make_offset ctx.arg (-l)) (mk_ifso ctx) (mk_ifno ctx) else
-        Arg.bind
-          (Arg.make_offset ctx.arg (-l))
-          (fun arg ->
-            let ctx = {off= (-l+ctx.off) ; arg=arg} in
-            do_make_if_out
-              (Arg.make_const d) arg (mk_ifso ctx) (mk_ifno ctx))
-
-    let do_make_if_in h arg ifso ifno =
-      Arg.make_if (Arg.make_isin h arg) ifso ifno
-
-    let make_if_in ctx l d mk_ifso mk_ifno = match l with
-    | 0 ->
-        do_make_if_in
-          (Arg.make_const d) ctx.arg (mk_ifso ctx) (mk_ifno ctx)
-    | _ ->
-        if (*true || *) !Config.bs_only then
-          do_make_if_in
-            (Arg.make_const d) (Arg.make_offset ctx.arg (-l)) (mk_ifso ctx) (mk_ifno ctx) else
-        Arg.bind
-          (Arg.make_offset ctx.arg (-l))
-          (fun arg ->
-            let ctx = {off= (-l+ctx.off) ; arg=arg} in
-            do_make_if_in
-              (Arg.make_const d) arg (mk_ifso ctx) (mk_ifno ctx))
-
-    let rec c_test ctx ({cases=cases ; actions=actions} as s) =
-      let lcases = Array.length cases in
-      assert(lcases > 0) ;
-      if lcases = 1 then
-        actions.(get_act cases 0) ctx
-
-      else begin
-
-        let w,_c = opt_count false cases in
-(*
-  Printf.fprintf stderr
-  "off=%d tactic=%a for %a\n"
-  ctx.off pret w pcases cases ;
-  *)
-    match w with
-    | No -> actions.(get_act cases 0) ctx
-    | Inter (i,j) ->
-        let low,high,inside, outside = coupe_inter i j cases in
-        let _,(cinside,_) = opt_count false inside
-        and _,(coutside,_) = opt_count false outside in
-(* Costs are retrieved to put the code with more remaining tests
-   in the privileged (positive) branch of ``if'' *)
-        if low=high then begin
-          if less_tests coutside cinside then
-            make_if_eq
-              ctx.arg
-              (low+ctx.off)
-              (c_test ctx {s with cases=inside})
-              (c_test ctx {s with cases=outside})
-          else
-            make_if_ne
-              ctx.arg
-              (low+ctx.off)
-              (c_test ctx {s with cases=outside})
-              (c_test ctx {s with cases=inside})
-        end else begin
-          if less_tests coutside cinside then
-            make_if_in
-              ctx
-              (low+ctx.off)
-              (high-low)
-              (fun ctx -> c_test ctx {s with cases=inside})
-              (fun ctx -> c_test ctx {s with cases=outside})
-          else
-            make_if_out
-              ctx
-              (low+ctx.off)
-              (high-low)
-              (fun ctx -> c_test ctx {s with cases=outside})
-              (fun ctx -> c_test ctx {s with cases=inside})
-        end
-    | Sep i ->
-        let lim,left,right = coupe cases i in
-        let _,(cleft,_) = opt_count false left
-        and _,(cright,_) = opt_count false right in
-        let left = {s with cases=left}
-        and right = {s with cases=right} in
-
-        if i=1 && (lim+ctx.off)=1 && get_low cases 0+ctx.off=0 then
-          make_if_ne
-            ctx.arg 0
-            (c_test ctx right) (c_test ctx left)
-        else if less_tests cright cleft then
-          make_if_lt
-            ctx.arg (lim+ctx.off)
-            (c_test ctx left) (c_test ctx right)
-        else
-          make_if_ge
-             ctx.arg (lim+ctx.off)
-            (c_test ctx right) (c_test ctx left)
-
-  end
-
-
-(* Minimal density of switches *)
-let theta = ref 0.33333
-
-(* Minimal number of tests to make a switch *)
-let switch_min = ref 3
-
-(* Particular case 0, 1, 2 *)
-let particular_case cases i j =
-  j-i = 2 &&
-  (let l1,_h1,act1 = cases.(i)
-  and  l2,_h2,_act2 = cases.(i+1)
-  and  l3,h3,act3 = cases.(i+2) in
-  l1+1=l2 && l2+1=l3 && l3=h3 &&
-  act1 <> act3)
-
-let approx_count cases i j =
-  let l = j-i+1 in
-  if l < !cut then
-     let _,(_,{n=ntests}) = opt_count false (Array.sub cases i l) in
-     ntests
-  else
-    l-1
-
-(* Sends back a boolean that says whether is switch is worth or not *)
-
-let dense {cases} i j =
-  if i=j then true
-  else
-    let l,_,_ = cases.(i)
-    and _,h,_ = cases.(j) in
-    let ntests =  approx_count cases i j in
-(*
-  (ntests+1) >= theta * (h-l+1)
-*)
-    particular_case cases i j ||
-    (ntests >= !switch_min &&
-    float_of_int ntests +. 1.0 >=
-    !theta *. (float_of_int h -. float_of_int l +. 1.0))
-
-(* Compute clusters by dynamic programming
-   Adaptation of the correction to Bernstein
-   ``Correction to `Producing Good Code for the Case Statement' ''
-   S.K. Kannan and T.A. Proebsting
-   Software Practice and Experience Vol. 24(2) 233 (Feb 1994)
-*)
-
-let comp_clusters s =
-  let len = Array.length s.cases in
-  let min_clusters = Array.make len max_int
-  and k = Array.make len 0 in
-  let get_min i = if i < 0 then 0 else min_clusters.(i) in
-
-  for i = 0 to len-1 do
-    for j = 0 to i do
-      if
-        dense s j i &&
-        get_min (j-1) + 1 < min_clusters.(i)
-      then begin
-        k.(i) <- j ;
-        min_clusters.(i) <- get_min (j-1) + 1
-      end
-    done ;
-  done ;
-  min_clusters.(len-1),k
-
-(* Assume j > i *)
-let make_switch loc {cases=cases ; actions=actions} i j sw_names =
-  let ll,_,_ = cases.(i)
-  and _,hh,_ = cases.(j) in
-  let tbl = Array.make (hh-ll+1) 0
-  and t = Hashtbl.create 17
-  and index = ref 0 in
-  let get_index act =
-    try
-      Hashtbl.find t act
-    with
-    | Not_found ->
-        let i = !index in
-        incr index ;
-        Hashtbl.add t act i ;
-        i in
-
-  for k=i to j do
-    let l,h,act = cases.(k) in
-    let index = get_index act in
-    for kk=l-ll to h-ll do
-      tbl.(kk) <- index
-    done
-  done ;
-  let acts = Array.make !index actions.(0) in
-  Hashtbl.iter
-    (fun act i -> acts.(i) <- actions.(act))
-    t ;
-  (fun ctx ->
-  if !Config.bs_only then
-  Arg.make_switch ~offset:(ll+ctx.off) loc ctx.arg tbl acts sw_names
-  else 
-    match -ll-ctx.off with
-    | 0 -> Arg.make_switch loc ctx.arg tbl acts sw_names ~offset:0
-    | _ ->
-        Arg.bind
-          (Arg.make_offset ctx.arg (-ll-ctx.off))
-          (fun arg -> Arg.make_switch loc arg tbl acts sw_names ~offset:0))
-
-
-let make_clusters loc ({cases=cases ; actions=actions} as s) n_clusters k sw_names =
-  let len = Array.length cases in
-  let r = Array.make n_clusters (0,0,0)
-  and t = Hashtbl.create 17
-  and index = ref 0
-  and bidon = ref (Array.length actions) in
-  let get_index act =
-    try
-      let i,_ = Hashtbl.find t act in
-      i
-    with
-    | Not_found ->
-        let i = !index in
-        incr index ;
-        Hashtbl.add
-          t act
-          (i,(fun _ -> actions.(act))) ;
-        i
-  and add_index act =
-    let i = !index in
-    incr index ;
-    incr bidon ;
-    Hashtbl.add t !bidon (i,act) ;
-    i in
-
-  let rec zyva j ir =
-    let i = k.(j) in
-    begin if i=j then
-      let l,h,act = cases.(i) in
-      r.(ir) <- (l,h,get_index act)
-    else (* assert i < j *)
-      let l,_,_ = cases.(i)
-      and _,h,_ = cases.(j) in
-      r.(ir) <- (l,h,add_index (make_switch loc s i j sw_names))
-    end ;
-    if i > 0 then zyva (i-1) (ir-1) in
-
-  zyva (len-1) (n_clusters-1) ;
-  let acts = Array.make !index (fun _ -> assert false) in
-  Hashtbl.iter (fun _ (i,act) -> acts.(i) <- act) t ;
-  {cases = r ; actions = acts}
-;;
-
-
-let do_zyva loc (low,high) arg cases actions sw_names =
-  let old_ok = !ok_inter in
-  ok_inter := (abs low <= inter_limit && abs high <= inter_limit) ;
-  if !ok_inter <> old_ok then Hashtbl.clear t ;
-
-  let s = {cases=cases ; actions=actions} in
-
-(*
-  Printf.eprintf "ZYVA: %B [low=%i,high=%i]\n" !ok_inter low high ;
-  pcases stderr cases ;
-  prerr_endline "" ;
-*)
-  let n_clusters,k = comp_clusters s in
-  let clusters = make_clusters loc s n_clusters k sw_names in
-  c_test {arg=arg ; off=0} clusters
-
-let abstract_shared actions =
-  let handlers = ref (fun x -> x) in
-  let actions =
-    Array.map
-      (fun act -> match  act with
-      | Single act -> act
-      | Shared act ->
-          let i,h = Arg.make_catch act in
-          let oh = !handlers in
-          handlers := (fun act -> h (oh act)) ;
-          Arg.make_exit i)
-      actions in
-  !handlers,actions
-
-let zyva loc lh arg cases actions names =
-  assert (Array.length cases > 0) ;
-  let actions = actions.act_get_shared () in
-  let hs,actions = abstract_shared actions in
-  hs (do_zyva loc lh arg cases actions names)
-
-and test_sequence arg cases actions =
-  assert (Array.length cases > 0) ;
-  let actions = actions.act_get_shared () in
-  let hs,actions = abstract_shared actions in
-  let old_ok = !ok_inter in
-  ok_inter := false ;
-  if !ok_inter <> old_ok then Hashtbl.clear t ;
-  let s =
-    {cases=cases ;
-    actions=Array.map (fun act -> (fun _ -> act)) actions} in
-(*
-  Printf.eprintf "SEQUENCE: %B\n" !ok_inter ;
-  pcases stderr cases ;
-  prerr_endline "" ;
-*)
-  hs (c_test {arg=arg ; off=0} s)
-;;
-
-end
diff --git a/jscomp/ml/switch.mli b/jscomp/ml/switch.mli
deleted file mode 100644
index a12a1be..0000000
--- a/jscomp/ml/switch.mli
+++ /dev/null
@@ -1,119 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Luc Maranget, projet Moscova, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 2000 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(*
-  This module transforms generic switches in combinations
-  of if tests and switches.
-*)
-
-(* For detecting action sharing, object style *)
-
-(* Store for actions in object style:
-  act_store : store an action, returns index in table
-              In case an action with equal key exists, returns index
-              of the stored action. Otherwise add entry in table.
-  act_store_shared : This stored action will always be shared.
-  act_get   : retrieve table
-  act_get_shared : retrieve table, with sharing explicit
-*)
-
-type 'a shared = Shared of 'a | Single of 'a
-
-type 'a t_store =
-    {act_get : unit -> 'a array ;
-     act_get_shared : unit -> 'a shared array ;
-     act_store : 'a -> int ;
-     act_store_shared : 'a -> int ; }
-
-exception Not_simple
-
-module type Stored = sig
-  type t
-  type key
-  val compare_key : key -> key -> int
-  val make_key : t -> key option
-end
-
-module Store(A:Stored) :
-    sig
-      val mk_store : unit -> A.t t_store
-    end
-
-(* Arguments to the Make functor *)
-module type S =
-  sig
-    (* type of basic tests *)
-    type primitive
-    (* basic tests themselves *)
-    val eqint : primitive
-    val neint : primitive
-    val leint : primitive
-    val ltint : primitive
-    val geint : primitive
-    val gtint : primitive
-    (* type of actions *)
-    type act
-
-    (* Various constructors, for making a binder,
-        adding one integer, etc. *)
-    val bind : act -> (act -> act) -> act
-    val make_const : int -> act
-    val make_offset : act -> int -> act
-    val make_prim : primitive -> act list -> act
-    val make_isout : act -> act -> act
-    val make_isin : act -> act -> act
-    val make_if : act -> act -> act -> act
-   (* construct an actual switch :
-      make_switch arg cases acts
-      NB:  cases is in the value form *)
-    val make_switch :
-        Location.t -> act -> int array -> act array -> offset:int -> Ast_untagged_variants.switch_names option -> act
-   (* Build last minute sharing of action stuff *)
-   val make_catch : act -> int * (act -> act)
-   val make_exit : int -> act
-
-  end
-
-
-(*
-  Make.zyva arg low high cases actions where
-    - arg is the argument of the switch.
-    - low, high are the interval limits.
-    - cases is a list of sub-interval and action indices
-    - actions is an array of actions.
-
-  All these arguments specify a switch construct and zyva
-  returns an action that performs the switch.
-*)
-module Make :
-  functor (Arg : S) ->
-    sig
-(* Standard entry point, sharing is tracked *)
-      val zyva :
-          Location.t ->
-          (int * int) ->
-           Arg.act ->
-           (int * int * int) array ->
-           Arg.act t_store ->
-            Ast_untagged_variants.switch_names option ->
-           Arg.act
-
-(* Output test sequence, sharing tracked *)
-     val test_sequence :
-           Arg.act ->
-           (int * int * int) array ->
-           Arg.act t_store ->
-           Arg.act
-    end
diff --git a/jscomp/ml/syntaxerr.ml b/jscomp/ml/syntaxerr.ml
deleted file mode 100644
index 0bb55ab..0000000
--- a/jscomp/ml/syntaxerr.ml
+++ /dev/null
@@ -1,87 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1997 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Auxiliary type for reporting syntax errors *)
-
-type error =
-    Unclosed of Location.t * string * Location.t * string
-  | Expecting of Location.t * string
-  | Not_expecting of Location.t * string
-  | Applicative_path of Location.t
-  | Variable_in_scope of Location.t * string
-  | Other of Location.t
-  | Ill_formed_ast of Location.t * string
-  | Invalid_package_type of Location.t * string
-
-exception Error of error
-exception Escape_error
-
-let prepare_error = function
-  | Unclosed(opening_loc, opening, closing_loc, closing) ->
-      Location.errorf ~loc:closing_loc
-        ~sub:[
-          Location.errorf ~loc:opening_loc
-            "This '%s' might be unmatched" opening
-        ]
-        ~if_highlight:
-          (Printf.sprintf "Syntax error: '%s' expected, \
-                           the highlighted '%s' might be unmatched"
-             closing opening)
-        "Syntax error: '%s' expected" closing
-
-  | Expecting (loc, nonterm) ->
-      Location.errorf ~loc "Syntax error: %s expected." nonterm
-  | Not_expecting (loc, nonterm) ->
-      Location.errorf ~loc "Syntax error: %s not expected." nonterm
-  | Applicative_path loc ->
-      Location.errorf ~loc
-        "Syntax error: applicative paths of the form F(X).t \
-         are not supported when the option -no-app-func is set."
-  | Variable_in_scope (loc, var) ->
-      Location.errorf ~loc
-        "In this scoped type, variable '%s \
-         is reserved for the local type %s."
-         var var
-  | Other loc ->
-      Location.errorf ~loc "Syntax error"
-  | Ill_formed_ast (loc, s) ->
-      Location.errorf ~loc "broken invariant in parsetree: %s" s
-  | Invalid_package_type (loc, s) ->
-      Location.errorf ~loc "invalid package type: %s" s
-
-let () =
-  Location.register_error_of_exn
-    (function
-      | Error err -> Some (prepare_error err)
-      | _ -> None
-    )
-
-
-let report_error ppf err =
-  Location.report_error ppf (prepare_error err)
-
-let location_of_error = function
-  | Unclosed(l,_,_,_)
-  | Applicative_path l
-  | Variable_in_scope(l,_)
-  | Other l
-  | Not_expecting (l, _)
-  | Ill_formed_ast (l, _)
-  | Invalid_package_type (l, _)
-  | Expecting (l, _) -> l
-
-
-let ill_formed_ast loc s =
-  raise (Error (Ill_formed_ast (loc, s)))
diff --git a/jscomp/ml/syntaxerr.mli b/jscomp/ml/syntaxerr.mli
deleted file mode 100644
index 319eb57..0000000
--- a/jscomp/ml/syntaxerr.mli
+++ /dev/null
@@ -1,37 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1997 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Auxiliary type for reporting syntax errors *)
-
-open Format
-
-type error =
-    Unclosed of Location.t * string * Location.t * string
-  | Expecting of Location.t * string
-  | Not_expecting of Location.t * string
-  | Applicative_path of Location.t
-  | Variable_in_scope of Location.t * string
-  | Other of Location.t
-  | Ill_formed_ast of Location.t * string
-  | Invalid_package_type of Location.t * string
-
-exception Error of error
-exception Escape_error
-
-val report_error: formatter -> error -> unit
- (** @deprecated Use {!Location.error_of_exn}, {!Location.report_error}. *)
-
-val location_of_error: error -> Location.t
-val ill_formed_ast: Location.t -> string -> 'a
diff --git a/jscomp/ml/tast_mapper.ml b/jscomp/ml/tast_mapper.ml
deleted file mode 100644
index eaf6aa4..0000000
--- a/jscomp/ml/tast_mapper.ml
+++ /dev/null
@@ -1,610 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                        Alain Frisch, LexiFi                            *)
-(*                                                                        *)
-(*   Copyright 2015 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Asttypes
-open Typedtree
-
-(* TODO: add 'methods' for location, attribute, extension,
-   open_description, include_declaration, include_description *)
-
-type mapper =
-  {
-    case: mapper -> case -> case;
-    cases: mapper -> case list -> case list;
-    class_description: mapper -> class_description -> class_description;
-
-    class_signature: mapper -> class_signature -> class_signature;
-    class_type: mapper -> class_type -> class_type;
-    class_type_declaration: mapper -> class_type_declaration ->
-      class_type_declaration;
-    class_type_field: mapper -> class_type_field -> class_type_field;
-    env: mapper -> Env.t -> Env.t;
-    expr: mapper -> expression -> expression;
-    extension_constructor: mapper -> extension_constructor ->
-      extension_constructor;
-    module_binding: mapper -> module_binding -> module_binding;
-    module_coercion: mapper -> module_coercion -> module_coercion;
-    module_declaration: mapper -> module_declaration -> module_declaration;
-    module_expr: mapper -> module_expr -> module_expr;
-    module_type: mapper -> module_type -> module_type;
-    module_type_declaration:
-      mapper -> module_type_declaration -> module_type_declaration;
-    package_type: mapper -> package_type -> package_type;
-    pat: mapper -> pattern -> pattern;
-    row_field: mapper -> row_field -> row_field;
-    object_field: mapper -> object_field -> object_field;
-    signature: mapper -> signature -> signature;
-    signature_item: mapper -> signature_item -> signature_item;
-    structure: mapper -> structure -> structure;
-    structure_item: mapper -> structure_item -> structure_item;
-    typ: mapper -> core_type -> core_type;
-    type_declaration: mapper -> type_declaration -> type_declaration;
-    type_declarations: mapper -> (rec_flag * type_declaration list) ->
-      (rec_flag * type_declaration list);
-    type_extension: mapper -> type_extension -> type_extension;
-    type_kind: mapper -> type_kind -> type_kind;
-    value_binding: mapper -> value_binding -> value_binding;
-    value_bindings: mapper -> (rec_flag * value_binding list) ->
-      (rec_flag * value_binding list);
-    value_description: mapper -> value_description -> value_description;
-    with_constraint: mapper -> with_constraint -> with_constraint;
-  }
-
-let id x = x
-let tuple2 f1 f2 (x, y) = (f1 x, f2 y)
-let tuple3 f1 f2 f3 (x, y, z) = (f1 x, f2 y, f3 z)
-let opt f = function None -> None | Some x -> Some (f x)
-
-let structure sub {str_items; str_type; str_final_env} =
-  {
-    str_items = List.map (sub.structure_item sub) str_items;
-    str_final_env = sub.env sub str_final_env;
-    str_type;
-  }
-
-let class_infos sub f x =
-  {x with
-   ci_params = List.map (tuple2 (sub.typ sub) id) x.ci_params;
-   ci_expr = f x.ci_expr;
-  }
-
-let module_type_declaration sub x =
-  let mtd_type = opt (sub.module_type sub) x.mtd_type in
-  {x with mtd_type}
-
-let module_declaration sub x =
-  let md_type = sub.module_type sub x.md_type in
-  {x with md_type}
-
-let include_infos f x = {x with incl_mod = f x.incl_mod}
-
-let class_type_declaration sub x =
-  class_infos sub (sub.class_type sub) x
-
-
-let structure_item sub {str_desc; str_loc; str_env} =
-  let str_env = sub.env sub str_env in
-  let str_desc =
-    match str_desc with
-    | Tstr_eval (exp, attrs) -> Tstr_eval (sub.expr sub exp, attrs)
-    | Tstr_value (rec_flag, list) ->
-        let (rec_flag, list) = sub.value_bindings sub (rec_flag, list) in
-        Tstr_value (rec_flag, list)
-    | Tstr_primitive v -> Tstr_primitive (sub.value_description sub v)
-    | Tstr_type (rec_flag, list) ->
-        let (rec_flag, list) = sub.type_declarations sub (rec_flag, list) in
-        Tstr_type (rec_flag, list)
-    | Tstr_typext te -> Tstr_typext (sub.type_extension sub te)
-    | Tstr_exception ext -> Tstr_exception (sub.extension_constructor sub ext)
-    | Tstr_module mb -> Tstr_module (sub.module_binding sub mb)
-    | Tstr_recmodule list ->
-        Tstr_recmodule (List.map (sub.module_binding sub) list)
-    | Tstr_modtype x -> Tstr_modtype (sub.module_type_declaration sub x)
-    | Tstr_class () -> Tstr_class ()
-    | Tstr_class_type list ->
-        Tstr_class_type
-          (List.map (tuple3 id id (sub.class_type_declaration sub)) list)
-    | Tstr_include incl ->
-        Tstr_include (include_infos (sub.module_expr sub) incl)
-    | Tstr_open _
-    | Tstr_attribute _ as d -> d
-  in
-  {str_desc; str_env; str_loc}
-
-let value_description sub x =
-  let val_desc = sub.typ sub x.val_desc in
-  {x with val_desc}
-
-let label_decl sub x =
-  let ld_type = sub.typ sub x.ld_type in
-  {x with ld_type}
-
-let constructor_args sub = function
-  | Cstr_tuple l -> Cstr_tuple (List.map (sub.typ sub) l)
-  | Cstr_record l -> Cstr_record (List.map (label_decl sub) l)
-
-let constructor_decl sub cd =
-  let cd_args = constructor_args sub cd.cd_args in
-  let cd_res = opt (sub.typ sub) cd.cd_res in
-  {cd with cd_args; cd_res}
-
-let type_kind sub = function
-  | Ttype_abstract -> Ttype_abstract
-  | Ttype_variant list -> Ttype_variant (List.map (constructor_decl sub) list)
-  | Ttype_record list -> Ttype_record (List.map (label_decl sub) list)
-  | Ttype_open -> Ttype_open
-
-let type_declaration sub x =
-  let typ_cstrs =
-    List.map
-      (tuple3 (sub.typ sub) (sub.typ sub) id)
-      x.typ_cstrs
-  in
-  let typ_kind = sub.type_kind sub x.typ_kind in
-  let typ_manifest = opt (sub.typ sub) x.typ_manifest in
-  let typ_params = List.map (tuple2 (sub.typ sub) id) x.typ_params in
-  {x with typ_cstrs; typ_kind; typ_manifest; typ_params}
-
-let type_declarations sub (rec_flag, list) =
-  (rec_flag, List.map (sub.type_declaration sub) list)
-
-let type_extension sub x =
-  let tyext_params = List.map (tuple2 (sub.typ sub) id) x.tyext_params in
-  let tyext_constructors =
-    List.map (sub.extension_constructor sub) x.tyext_constructors
-  in
-  {x with tyext_constructors; tyext_params}
-
-let extension_constructor sub x =
-  let ext_kind =
-    match x.ext_kind with
-      Text_decl(ctl, cto) ->
-        Text_decl(constructor_args sub ctl, opt (sub.typ sub) cto)
-    | Text_rebind _ as d -> d
-  in
-  {x with ext_kind}
-
-let pat sub x =
-  let extra = function
-    | Tpat_type _
-    | Tpat_unpack as d -> d
-    | Tpat_open (path,loc,env) ->  Tpat_open (path, loc, sub.env sub env)
-    | Tpat_constraint ct -> Tpat_constraint (sub.typ sub ct)
-  in
-  let pat_env = sub.env sub x.pat_env in
-  let pat_extra = List.map (tuple3 extra id id) x.pat_extra in
-  let pat_desc =
-    match x.pat_desc with
-    | Tpat_any
-    | Tpat_var _
-    | Tpat_constant _ as d -> d
-    | Tpat_tuple l -> Tpat_tuple (List.map (sub.pat sub) l)
-    | Tpat_construct (loc, cd, l) ->
-        Tpat_construct (loc, cd, List.map (sub.pat sub) l)
-    | Tpat_variant (l, po, rd) -> Tpat_variant (l, opt (sub.pat sub) po, rd)
-    | Tpat_record (l, closed) ->
-        Tpat_record (List.map (tuple3 id id (sub.pat sub)) l, closed)
-    | Tpat_array l -> Tpat_array (List.map (sub.pat sub) l)
-    | Tpat_or (p1, p2, rd) ->
-        Tpat_or (sub.pat sub p1, sub.pat sub p2, rd)
-    | Tpat_alias (p, id, s) -> Tpat_alias (sub.pat sub p, id, s)
-    | Tpat_lazy p -> Tpat_lazy (sub.pat sub p)
-  in
-  {x with pat_extra; pat_desc; pat_env}
-
-let expr sub x =
-  let extra = function
-    | Texp_constraint cty ->
-        Texp_constraint (sub.typ sub cty)
-    | Texp_coerce (cty1, cty2) ->
-        Texp_coerce (opt (sub.typ sub) cty1, sub.typ sub cty2)
-    | Texp_open (ovf, path, loc, env) ->
-        Texp_open (ovf, path, loc, sub.env sub env)
-    | Texp_newtype _ as d -> d
-    | Texp_poly cto -> Texp_poly (opt (sub.typ sub) cto)
-  in
-  let exp_extra = List.map (tuple3 extra id id) x.exp_extra in
-  let exp_env = sub.env sub x.exp_env in
-  let exp_desc =
-    match x.exp_desc with
-    | Texp_ident _
-    | Texp_constant _ as d -> d
-    | Texp_let (rec_flag, list, exp) ->
-        let (rec_flag, list) = sub.value_bindings sub (rec_flag, list) in
-        Texp_let (rec_flag, list, sub.expr sub exp)
-    | Texp_function { arg_label; param; cases; partial; } ->
-        Texp_function { arg_label; param; cases = sub.cases sub cases;
-          partial; }
-    | Texp_apply (exp, list) ->
-        Texp_apply (
-          sub.expr sub exp,
-          List.map (tuple2 id (opt (sub.expr sub))) list
-        )
-    | Texp_match (exp, cases, exn_cases, p) ->
-        Texp_match (
-          sub.expr sub exp,
-          sub.cases sub cases,
-          sub.cases sub exn_cases,
-          p
-        )
-    | Texp_try (exp, cases) ->
-        Texp_try (
-          sub.expr sub exp,
-          sub.cases sub cases
-        )
-    | Texp_tuple list ->
-        Texp_tuple (List.map (sub.expr sub) list)
-    | Texp_construct (lid, cd, args) ->
-        Texp_construct (lid, cd, List.map (sub.expr sub) args)
-    | Texp_variant (l, expo) ->
-        Texp_variant (l, opt (sub.expr sub) expo)
-    | Texp_record { fields; representation; extended_expression } ->
-        let fields = Array.map (function
-            | label, Kept t -> label, Kept t
-            | label, Overridden (lid, exp) ->
-                label, Overridden (lid, sub.expr sub exp))
-            fields
-        in
-        Texp_record {
-          fields; representation;
-          extended_expression = opt (sub.expr sub) extended_expression;
-        }
-    | Texp_field (exp, lid, ld) ->
-        Texp_field (sub.expr sub exp, lid, ld)
-    | Texp_setfield (exp1, lid, ld, exp2) ->
-        Texp_setfield (
-          sub.expr sub exp1,
-          lid,
-          ld,
-          sub.expr sub exp2
-        )
-    | Texp_array list ->
-        Texp_array (List.map (sub.expr sub) list)
-    | Texp_ifthenelse (exp1, exp2, expo) ->
-        Texp_ifthenelse (
-          sub.expr sub exp1,
-          sub.expr sub exp2,
-          opt (sub.expr sub) expo
-        )
-    | Texp_sequence (exp1, exp2) ->
-        Texp_sequence (
-          sub.expr sub exp1,
-          sub.expr sub exp2
-        )
-    | Texp_while (exp1, exp2) ->
-        Texp_while (
-          sub.expr sub exp1,
-          sub.expr sub exp2
-        )
-    | Texp_for (id, p, exp1, exp2, dir, exp3) ->
-        Texp_for (
-          id,
-          p,
-          sub.expr sub exp1,
-          sub.expr sub exp2,
-          dir,
-          sub.expr sub exp3
-        )
-    | Texp_send (exp, meth, expo) ->
-        Texp_send
-          (
-            sub.expr sub exp,
-            meth,
-            opt (sub.expr sub) expo
-          )
-    | Texp_new _
-    | Texp_instvar _ as d -> d
-    | Texp_setinstvar _
-    | Texp_override _ ->
-      assert false
-    | Texp_letmodule (id, s, mexpr, exp) ->
-        Texp_letmodule (
-          id,
-          s,
-          sub.module_expr sub mexpr,
-          sub.expr sub exp
-        )
-    | Texp_letexception (cd, exp) ->
-        Texp_letexception (
-          sub.extension_constructor sub cd,
-          sub.expr sub exp
-        )
-    | Texp_assert exp ->
-        Texp_assert (sub.expr sub exp)
-    | Texp_lazy exp ->
-        Texp_lazy (sub.expr sub exp)
-    | Texp_object () ->
-        Texp_object ()
-    | Texp_pack mexpr ->
-        Texp_pack (sub.module_expr sub mexpr)
-    | Texp_unreachable ->
-        Texp_unreachable
-    | Texp_extension_constructor _ as e ->
-        e
-  in
-  {x with exp_extra; exp_desc; exp_env}
-
-
-let package_type sub x =
-  let pack_fields = List.map (tuple2 id (sub.typ sub)) x.pack_fields in
-  {x with pack_fields}
-
-let signature sub x =
-  let sig_final_env = sub.env sub x.sig_final_env in
-  let sig_items = List.map (sub.signature_item sub) x.sig_items in
-  {x with sig_items; sig_final_env}
-
-let signature_item sub x =
-  let sig_env = sub.env sub x.sig_env in
-  let sig_desc =
-    match x.sig_desc with
-    | Tsig_value v ->
-        Tsig_value (sub.value_description sub v)
-    | Tsig_type (rec_flag, list) ->
-        let (rec_flag, list) = sub.type_declarations sub (rec_flag, list) in
-        Tsig_type (rec_flag, list)
-    | Tsig_typext te ->
-        Tsig_typext (sub.type_extension sub te)
-    | Tsig_exception ext ->
-        Tsig_exception (sub.extension_constructor sub ext)
-    | Tsig_module x ->
-        Tsig_module (sub.module_declaration sub x)
-    | Tsig_recmodule list ->
-        Tsig_recmodule (List.map (sub.module_declaration sub) list)
-    | Tsig_modtype x ->
-        Tsig_modtype (sub.module_type_declaration sub x)
-    | Tsig_include incl ->
-        Tsig_include (include_infos (sub.module_type sub) incl)
-    | Tsig_class_type list ->
-        Tsig_class_type
-          (List.map (sub.class_type_declaration sub) list)
-    | Tsig_class _      
-    | Tsig_open _
-    | Tsig_attribute _ as d -> d
-  in
-  {x with sig_desc; sig_env}
-
-let class_description sub x =
-  class_infos sub (sub.class_type sub) x
-
-let module_type sub x =
-  let mty_env = sub.env sub x.mty_env in
-  let mty_desc =
-    match x.mty_desc with
-    | Tmty_ident _
-    | Tmty_alias _ as d -> d
-    | Tmty_signature sg -> Tmty_signature (sub.signature sub sg)
-    | Tmty_functor (id, s, mtype1, mtype2) ->
-        Tmty_functor (
-          id,
-          s,
-          opt (sub.module_type sub) mtype1,
-          sub.module_type sub mtype2
-        )
-    | Tmty_with (mtype, list) ->
-        Tmty_with (
-          sub.module_type sub mtype,
-          List.map (tuple3 id id (sub.with_constraint sub)) list
-        )
-    | Tmty_typeof mexpr ->
-        Tmty_typeof (sub.module_expr sub mexpr)
-  in
-  {x with mty_desc; mty_env}
-
-let with_constraint sub = function
-  | Twith_type decl -> Twith_type (sub.type_declaration sub decl)
-  | Twith_typesubst decl -> Twith_typesubst (sub.type_declaration sub decl)
-  | Twith_module _
-  | Twith_modsubst _ as d -> d
-
-let module_coercion sub = function
-  | Tcoerce_none -> Tcoerce_none
-  | Tcoerce_functor (c1,c2) ->
-      Tcoerce_functor (sub.module_coercion sub c1, sub.module_coercion sub c2)
-  | Tcoerce_alias (p, c1) ->
-      Tcoerce_alias (p, sub.module_coercion sub c1)
-  | Tcoerce_structure (l1, l2, runtime_fields) ->
-      let l1' = List.map (fun (i,c) -> i, sub.module_coercion sub c) l1 in
-      let l2' =
-        List.map (fun (id,i,c) -> id, i, sub.module_coercion sub c) l2
-      in
-      Tcoerce_structure (l1', l2', runtime_fields)
-  | Tcoerce_primitive pc ->
-      Tcoerce_primitive {pc with pc_env = sub.env sub pc.pc_env}
-
-let module_expr sub x =
-  let mod_env = sub.env sub x.mod_env in
-  let mod_desc =
-    match x.mod_desc with
-    | Tmod_ident _ as d -> d
-    | Tmod_structure st -> Tmod_structure (sub.structure sub st)
-    | Tmod_functor (id, s, mtype, mexpr) ->
-        Tmod_functor (
-          id,
-          s,
-          opt (sub.module_type sub) mtype,
-          sub.module_expr sub mexpr
-        )
-    | Tmod_apply (mexp1, mexp2, c) ->
-        Tmod_apply (
-          sub.module_expr sub mexp1,
-          sub.module_expr sub mexp2,
-          sub.module_coercion sub c
-        )
-    | Tmod_constraint (mexpr, mt, Tmodtype_implicit, c) ->
-        Tmod_constraint (sub.module_expr sub mexpr, mt, Tmodtype_implicit,
-                         sub.module_coercion sub c)
-    | Tmod_constraint (mexpr, mt, Tmodtype_explicit mtype, c) ->
-        Tmod_constraint (
-          sub.module_expr sub mexpr,
-          mt,
-          Tmodtype_explicit (sub.module_type sub mtype),
-          sub.module_coercion sub c
-        )
-    | Tmod_unpack (exp, mty) ->
-        Tmod_unpack
-          (
-            sub.expr sub exp,
-            mty
-          )
-  in
-  {x with mod_desc; mod_env}
-
-let module_binding sub x =
-  let mb_expr = sub.module_expr sub x.mb_expr in
-  {x with mb_expr}
-
-
-let class_type sub x =
-  let cltyp_env = sub.env sub x.cltyp_env in
-  let cltyp_desc =
-    match x.cltyp_desc with
-    | Tcty_signature csg -> Tcty_signature (sub.class_signature sub csg)
-    | Tcty_constr (path, lid, list) ->
-        Tcty_constr (
-          path,
-          lid,
-          List.map (sub.typ sub) list
-        )
-    | Tcty_arrow (label, ct, cl) ->
-        Tcty_arrow
-          (label,
-           sub.typ sub ct,
-           sub.class_type sub cl
-          )
-    | Tcty_open (ovf, p, lid, env, e) ->
-        Tcty_open (ovf, p, lid, sub.env sub env, sub.class_type sub e)
-  in
-  {x with cltyp_desc; cltyp_env}
-
-let class_signature sub x =
-  let csig_self = sub.typ sub x.csig_self in
-  let csig_fields = List.map (sub.class_type_field sub) x.csig_fields in
-  {x with csig_self; csig_fields}
-
-let class_type_field sub x =
-  let ctf_desc =
-    match x.ctf_desc with
-    | Tctf_inherit ct ->
-        Tctf_inherit (sub.class_type sub ct)
-    | Tctf_val (s, mut, virt, ct) ->
-        Tctf_val (s, mut, virt, sub.typ sub ct)
-    | Tctf_method (s, priv, virt, ct) ->
-        Tctf_method (s, priv, virt, sub.typ sub ct)
-    | Tctf_constraint  (ct1, ct2) ->
-        Tctf_constraint (sub.typ sub ct1, sub.typ sub ct2)
-    | Tctf_attribute _ as d -> d
-  in
-  {x with ctf_desc}
-
-let typ sub x =
-  let ctyp_env = sub.env sub x.ctyp_env in
-  let ctyp_desc =
-    match x.ctyp_desc with
-    | Ttyp_any
-    | Ttyp_var _ as d -> d
-    | Ttyp_arrow (label, ct1, ct2) ->
-        Ttyp_arrow (label, sub.typ sub ct1, sub.typ sub ct2)
-    | Ttyp_tuple list -> Ttyp_tuple (List.map (sub.typ sub) list)
-    | Ttyp_constr (path, lid, list) ->
-        Ttyp_constr (path, lid, List.map (sub.typ sub) list)
-    | Ttyp_object (list, closed) ->
-        Ttyp_object ((List.map (sub.object_field sub) list), closed)
-    | Ttyp_class (path, lid, list) ->
-        Ttyp_class
-          (path,
-           lid,
-           List.map (sub.typ sub) list
-          )
-    | Ttyp_alias (ct, s) ->
-        Ttyp_alias (sub.typ sub ct, s)
-    | Ttyp_variant (list, closed, labels) ->
-        Ttyp_variant (List.map (sub.row_field sub) list, closed, labels)
-    | Ttyp_poly (sl, ct) ->
-        Ttyp_poly (sl, sub.typ sub ct)
-    | Ttyp_package pack ->
-        Ttyp_package (sub.package_type sub pack)
-  in
-  {x with ctyp_desc; ctyp_env}
-
-
-let row_field sub = function
-  | Ttag (label, attrs, b, list) ->
-      Ttag (label, attrs, b, List.map (sub.typ sub) list)
-  | Tinherit ct -> Tinherit (sub.typ sub ct)
-
-let object_field sub = function
-  | OTtag (label, attrs, ct) ->
-      OTtag (label, attrs, (sub.typ sub ct))
-  | OTinherit ct -> OTinherit (sub.typ sub ct)
-
-
-
-let value_bindings sub (rec_flag, list) =
-  (rec_flag, List.map (sub.value_binding sub) list)
-
-let cases sub l =
-  List.map (sub.case sub) l
-
-let case sub {c_lhs; c_guard; c_rhs} =
-  {
-    c_lhs = sub.pat sub c_lhs;
-    c_guard = opt (sub.expr sub) c_guard;
-    c_rhs = sub.expr sub c_rhs;
-  }
-
-let value_binding sub x =
-  let vb_pat = sub.pat sub x.vb_pat in
-  let vb_expr = sub.expr sub x.vb_expr in
-  {x with vb_pat; vb_expr}
-
-let env _sub x = x
-
-let default =
-  {
-    case;
-    cases;
-    class_description;
-    class_signature;
-    class_type;
-    class_type_declaration;
-    class_type_field;
-    env;
-    expr;
-    extension_constructor;
-    module_binding;
-    module_coercion;
-    module_declaration;
-    module_expr;
-    module_type;
-    module_type_declaration;
-    package_type;
-    pat;
-    row_field;
-    object_field;
-    signature;
-    signature_item;
-    structure;
-    structure_item;
-    typ;
-    type_declaration;
-    type_declarations;
-    type_extension;
-    type_kind;
-    value_binding;
-    value_bindings;
-    value_description;
-    with_constraint;
-  }
diff --git a/jscomp/ml/tast_mapper.mli b/jscomp/ml/tast_mapper.mli
deleted file mode 100644
index 4fd87b6..0000000
--- a/jscomp/ml/tast_mapper.mli
+++ /dev/null
@@ -1,64 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                        Alain Frisch, LexiFi                            *)
-(*                                                                        *)
-(*   Copyright 2015 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Asttypes
-open Typedtree
-
-(** {1 A generic Typedtree mapper} *)
-
-type mapper =
-  {
-    case: mapper -> case -> case;
-    cases: mapper -> case list -> case list;
-    class_description: mapper -> class_description -> class_description;
-    class_signature: mapper -> class_signature -> class_signature;
-    class_type: mapper -> class_type -> class_type;
-    class_type_declaration: mapper -> class_type_declaration ->
-      class_type_declaration;
-    class_type_field: mapper -> class_type_field -> class_type_field;
-    env: mapper -> Env.t -> Env.t;
-    expr: mapper -> expression -> expression;
-    extension_constructor: mapper -> extension_constructor ->
-      extension_constructor;
-    module_binding: mapper -> module_binding -> module_binding;
-    module_coercion: mapper -> module_coercion -> module_coercion;
-    module_declaration: mapper -> module_declaration -> module_declaration;
-    module_expr: mapper -> module_expr -> module_expr;
-    module_type: mapper -> module_type -> module_type;
-    module_type_declaration:
-      mapper -> module_type_declaration -> module_type_declaration;
-    package_type: mapper -> package_type -> package_type;
-    pat: mapper -> pattern -> pattern;
-    row_field: mapper -> row_field -> row_field;
-    object_field: mapper -> object_field -> object_field;
-    signature: mapper -> signature -> signature;
-    signature_item: mapper -> signature_item -> signature_item;
-    structure: mapper -> structure -> structure;
-    structure_item: mapper -> structure_item -> structure_item;
-    typ: mapper -> core_type -> core_type;
-    type_declaration: mapper -> type_declaration -> type_declaration;
-    type_declarations: mapper -> (rec_flag * type_declaration list) ->
-      (rec_flag * type_declaration list);
-    type_extension: mapper -> type_extension -> type_extension;
-    type_kind: mapper -> type_kind -> type_kind;
-    value_binding: mapper -> value_binding -> value_binding;
-    value_bindings: mapper -> (rec_flag * value_binding list) ->
-      (rec_flag * value_binding list);
-    value_description: mapper -> value_description -> value_description;
-    with_constraint: mapper -> with_constraint -> with_constraint;
-  }
-
-
-val default: mapper
diff --git a/jscomp/ml/tbl.ml b/jscomp/ml/tbl.ml
deleted file mode 100644
index fa278b4..0000000
--- a/jscomp/ml/tbl.ml
+++ /dev/null
@@ -1,123 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-type ('k, 'v) t =
-    Empty
-  | Node of ('k, 'v) t * 'k * 'v * ('k, 'v) t * int
-
-let empty = Empty
-
-let height = function
-    Empty -> 0
-  | Node(_,_,_,_,h) -> h
-
-let create l x d r =
-  let hl = height l and hr = height r in
-  Node(l, x, d, r, (if hl >= hr then hl + 1 else hr + 1))
-
-let bal l x d r =
-  let hl = height l and hr = height r in
-  if hl > hr + 1 then
-    match l with
-    | Node (ll, lv, ld, lr, _) when height ll >= height lr ->
-        create ll lv ld (create lr x d r)
-    | Node (ll, lv, ld, Node (lrl, lrv, lrd, lrr, _), _) ->
-        create (create ll lv ld lrl) lrv lrd (create lrr x d r)
-    | _ -> assert false
-  else if hr > hl + 1 then
-    match r with
-    | Node (rl, rv, rd, rr, _) when height rr >= height rl ->
-        create (create l x d rl) rv rd rr
-    | Node (Node (rll, rlv, rld, rlr, _), rv, rd, rr, _) ->
-        create (create l x d rll) rlv rld (create rlr rv rd rr)
-    | _ -> assert false
-  else
-    create l x d r
-
-let rec add x data = function
-    Empty ->
-      Node(Empty, x, data, Empty, 1)
-  | Node(l, v, d, r, h) ->
-      let c = compare x v in
-      if c = 0 then
-        Node(l, x, data, r, h)
-      else if c < 0 then
-        bal (add x data l) v d r
-      else
-        bal l v d (add x data r)
-
-let rec find x = function
-    Empty ->
-      raise Not_found
-  | Node(l, v, d, r, _) ->
-      let c = compare x v in
-      if c = 0 then d
-      else find x (if c < 0 then l else r)
-
-let rec find_str (x : string) = function
-    Empty ->
-      raise Not_found
-  | Node(l, v, d, r, _) ->
-      let c = compare x v in
-      if c = 0 then d
-      else find_str x (if c < 0 then l else r)
-
-let rec mem x = function
-    Empty -> false
-  | Node(l, v, _d, r, _) ->
-      let c = compare x v in
-      c = 0 || mem x (if c < 0 then l else r)
-
-let rec merge t1 t2 =
-  match (t1, t2) with
-    (Empty, t) -> t
-  | (t, Empty) -> t
-  | (Node(l1, v1, d1, r1, _h1), Node(l2, v2, d2, r2, _h2)) ->
-      bal l1 v1 d1 (bal (merge r1 l2) v2 d2 r2)
-
-let rec remove x = function
-    Empty ->
-      Empty
-  | Node(l, v, d, r, _h) ->
-      let c = compare x v in
-      if c = 0 then
-        merge l r
-      else if c < 0 then
-        bal (remove x l) v d r
-      else
-        bal l v d (remove x r)
-
-let rec iter f = function
-    Empty -> ()
-  | Node(l, v, d, r, _) ->
-      iter f l; f v d; iter f r
-
-let rec map f = function
-    Empty -> Empty
-  | Node(l, v, d, r, h) -> Node(map f l, v, f v d, map f r, h)
-
-let rec fold f m accu =
-  match m with
-  | Empty -> accu
-  | Node(l, v, d, r, _) ->
-      fold f r (f v d (fold f l accu))
-
-open Format
-
-let print print_key print_data ppf tbl =
-  let print_tbl ppf tbl =
-    iter (fun k d -> fprintf ppf "@[<2>%a ->@ %a;@]@ " print_key k print_data d)
-      tbl in
-  fprintf ppf "@[<hv 2>[[%a]]@]" print_tbl tbl
diff --git a/jscomp/ml/tbl.mli b/jscomp/ml/tbl.mli
deleted file mode 100644
index d23b959..0000000
--- a/jscomp/ml/tbl.mli
+++ /dev/null
@@ -1,34 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Association tables from any ordered type to any type.
-   We use the generic ordering to compare keys. *)
-
-type ('k, 'v) t
-
-val empty: ('k, 'v) t
-val add: 'k -> 'v -> ('k, 'v) t -> ('k, 'v) t
-val find: 'k -> ('k, 'v) t -> 'v
-val find_str: string -> (string, 'v) t -> 'v
-val mem: 'k -> ('k, 'v) t -> bool
-val remove: 'k -> ('k,  'v) t -> ('k, 'v) t
-val iter: ('k -> 'v -> unit) -> ('k, 'v) t -> unit
-val map: ('k -> 'v1 -> 'v2) -> ('k, 'v1) t -> ('k, 'v2) t
-val fold: ('k -> 'v -> 'acc -> 'acc) -> ('k, 'v) t -> 'acc -> 'acc
-
-open Format
-
-val print: (formatter -> 'k -> unit) -> (formatter -> 'v -> unit) ->
-           formatter -> ('k, 'v) t -> unit
diff --git a/jscomp/ml/terminfo.ml b/jscomp/ml/terminfo.ml
deleted file mode 100644
index 5ed4bb5..0000000
--- a/jscomp/ml/terminfo.ml
+++ /dev/null
@@ -1,26 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Basic interface to the terminfo database *)
-
-type status =
-  | Uninitialised
-  | Bad_term
-  | Good_term of int
-;;
-external setup : out_channel -> status = "caml_terminfo_setup";;
-external backup : int -> unit = "caml_terminfo_backup";;
-external standout : bool -> unit = "caml_terminfo_standout";;
-external resume : int -> unit = "caml_terminfo_resume";;
diff --git a/jscomp/ml/terminfo.mli b/jscomp/ml/terminfo.mli
deleted file mode 100644
index 92af80f..0000000
--- a/jscomp/ml/terminfo.mli
+++ /dev/null
@@ -1,26 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Basic interface to the terminfo database *)
-
-type status =
-  | Uninitialised
-  | Bad_term
-  | Good_term of int  (* number of lines of the terminal *)
-;;
-external setup : out_channel -> status = "caml_terminfo_setup";;
-external backup : int -> unit = "caml_terminfo_backup";;
-external standout : bool -> unit = "caml_terminfo_standout";;
-external resume : int -> unit = "caml_terminfo_resume";;
diff --git a/jscomp/ml/transl_recmodule.ml b/jscomp/ml/transl_recmodule.ml
deleted file mode 100644
index 5d2c174..0000000
--- a/jscomp/ml/transl_recmodule.ml
+++ /dev/null
@@ -1,280 +0,0 @@
-open Types
-open Typedtree
-open Lambda
-
-type error = Circular_dependency of Ident.t
-
-exception Error of Location.t * error
-(* Reorder bindings to honor dependencies.  *)
-
-(* Utilities for compiling "module rec" definitions *)
-
-let undefined_location loc =
-  let fname, line, char = Location.get_pos_info loc.Location.loc_start in
-  let fname = Filename.basename fname in
-  Lconst
-    (Const_block
-       ( Lambda.Blk_tuple,
-         [
-           Const_base (Const_string (fname, None));
-           Const_base (Const_int line);
-           Const_base (Const_int char);
-         ] ))
-
-let cstr_const = 3
-
-let cstr_non_const = 2
-
-let init_shape modl =
-  let add_name x id =
-    Const_block
-      (Blk_tuple, [ x; Const_base (Const_string (Ident.name id, None)) ])
-  in
-  let module_tag_info : Lambda.tag_info =
-    Blk_constructor { name="Module"; num_nonconst = 2; tag = 0; attrs = [] }
-  in
-  let value_tag_info : Lambda.tag_info =
-    Blk_constructor { name = "value"; num_nonconst = 2; tag = 1; attrs = [] }
-  in
-  let rec init_shape_mod env mty =
-    match Mtype.scrape env mty with
-    | Mty_ident _ -> raise Not_found
-    | Mty_alias _ ->
-        Const_block (value_tag_info, [ Const_pointer (0, Pt_module_alias) ])
-    | Mty_signature sg ->
-        Const_block
-          ( module_tag_info,
-            [ Const_block (Blk_tuple, init_shape_struct env sg) ] )
-    | Mty_functor _ -> raise Not_found
-  (* can we do better? *)
-  and init_shape_struct env sg =
-    match sg with
-    | [] -> []
-    | Sig_value (id, { val_kind = Val_reg; val_type = ty }) :: rem ->
-        let is_function t =
-          Ast_uncurried_utils.typeIsUncurriedFun t || match t.desc with
-          | Tarrow _ -> true
-          | _ -> false in
-        let init_v =
-          match Ctype.expand_head env ty with
-          | t when is_function t ->
-            Const_pointer
-            ( 0,
-              Pt_constructor
-                {
-                  name = "Function";
-                  const = cstr_const;
-                  non_const = cstr_non_const;
-                  attrs = [];
-                } )
-          | { desc = Tconstr (p, _, _) } when Path.same p Predef.path_lazy_t ->
-              Const_pointer
-                ( 1,
-                  Pt_constructor
-                    {
-                      name = "Lazy";
-                      const = cstr_const;
-                      non_const = cstr_non_const;
-                      attrs = [];
-                    } )
-          | _ -> raise Not_found
-        in
-        add_name init_v id :: init_shape_struct env rem
-    | Sig_value (_, { val_kind = Val_prim _ }) :: rem ->
-        init_shape_struct env rem
-    | Sig_type (id, tdecl, _) :: rem ->
-        init_shape_struct (Env.add_type ~check:false id tdecl env) rem
-    | Sig_typext _ :: _ -> raise Not_found
-    | Sig_module (id, md, _) :: rem ->
-        add_name (init_shape_mod env md.md_type) id
-        ::
-        init_shape_struct
-          (Env.add_module_declaration ~check:false id md env)
-          rem
-    | Sig_modtype (id, minfo) :: rem ->
-        init_shape_struct (Env.add_modtype id minfo env) rem
-    | Sig_class _ :: _ -> assert false
-    | Sig_class_type _ :: rem -> init_shape_struct env rem
-  in
-  try
-    Some
-      ( undefined_location modl.mod_loc,
-        Lconst (init_shape_mod modl.mod_env modl.mod_type) )
-  with Not_found -> None
-
-type binding_status = Undefined | Inprogress | Defined
-
-let reorder_rec_bindings bindings =
-  let id = Array.of_list (List.map (fun (id, _, _, _) -> id) bindings)
-  and loc = Array.of_list (List.map (fun (_, loc, _, _) -> loc) bindings)
-  and init = Array.of_list (List.map (fun (_, _, init, _) -> init) bindings)
-  and rhs = Array.of_list (List.map (fun (_, _, _, rhs) -> rhs) bindings) in
-  let fv = Array.map Lambda.free_variables rhs in
-  let num_bindings = Array.length id in
-  let status = Array.make num_bindings Undefined in
-  let res = ref [] in
-  let rec emit_binding i =
-    match status.(i) with
-    | Defined -> ()
-    | Inprogress -> raise (Error (loc.(i), Circular_dependency id.(i)))
-    | Undefined ->
-        if init.(i) = None then (
-          status.(i) <- Inprogress;
-          for j = 0 to num_bindings - 1 do
-            if IdentSet.mem id.(j) fv.(i) then emit_binding j
-          done);
-        res := (id.(i), init.(i), rhs.(i)) :: !res;
-        status.(i) <- Defined
-  in
-  for i = 0 to num_bindings - 1 do
-    match status.(i) with
-    | Undefined -> emit_binding i
-    | Inprogress -> assert false
-    | Defined -> ()
-  done;
-  List.rev !res
-
-type t = Lambda.lambda
-
-(* Utilities for compiling "module rec" definitions *)
-
-let bs_init_mod (args : t list) loc : t =
-  Lprim
-    (Pccall (Primitive.simple ~name:"#init_mod" ~arity:2 ~alloc:true), args, loc)
-
-let bs_update_mod (args : t list) loc : t =
-  Lprim
-    ( Pccall (Primitive.simple ~name:"#update_mod" ~arity:3 ~alloc:true),
-      args,
-      loc )
-
-type loc = t
-
-type shape = t
-
-type binding = Ident.t * (loc * shape) option * t
-
-let eval_rec_bindings_aux (bindings : binding list) (cont : t) : t =
-  let rec bind_inits args acc =
-    match args with
-    | [] -> acc
-    | (_id, None, _rhs) :: rem -> bind_inits rem acc
-    | (id, Some (loc, shape), _rhs) :: rem ->
-        Lambda.Llet
-          ( Strict,
-            Pgenval,
-            id,
-            bs_init_mod [ loc; shape ] Location.none,
-            bind_inits rem acc )
-  in
-  let rec bind_strict args acc =
-    match args with
-    | [] -> acc
-    | (id, None, rhs) :: rem ->
-        Lambda.Llet (Strict, Pgenval, id, rhs, bind_strict rem acc)
-    | (_id, Some _, _rhs) :: rem -> bind_strict rem acc
-  in
-  let rec patch_forwards args =
-    match args with
-    | [] -> cont
-    | (_id, None, _rhs) :: rem -> patch_forwards rem
-    | (id, Some (_loc, shape), rhs) :: rem ->
-        Lsequence
-          ( bs_update_mod [ shape; Lvar id; rhs ] Location.none,
-            patch_forwards rem )
-  in
-  bind_inits bindings (bind_strict bindings (patch_forwards bindings))
-
-(* collect all function declarations
-    if the module creation is just a set of function declarations and consts,
-    it is good
-*)
-let rec is_function_or_const_block (lam : Lambda.lambda) acc =
-  match lam with
-  | Lprim (Pmakeblock _, args, _) ->
-      Ext_list.for_all args (fun x ->
-          match x with
-          | Lvar id -> Set_ident.mem acc id
-          | Lfunction _ | Lconst _ -> true
-          | _ -> false)
-  | Llet (_, _, id, Lfunction _, cont) ->
-      is_function_or_const_block cont (Set_ident.add acc id)
-  | Lletrec (bindings, cont) -> (
-      let rec aux_bindings bindings acc =
-        match bindings with
-        | [] -> Some acc
-        | (id, Lambda.Lfunction _) :: rest ->
-            aux_bindings rest (Set_ident.add acc id)
-        | (_, _) :: _ -> None
-      in
-      match aux_bindings bindings acc with
-      | None -> false
-      | Some acc -> is_function_or_const_block cont acc)
-  | Llet (_, _, _, Lconst _, cont) -> is_function_or_const_block cont acc
-  | Llet (_, _, id1, Lvar id2, cont) when Set_ident.mem acc id2 ->
-      is_function_or_const_block cont (Set_ident.add acc id1)
-  | _ -> false
-
-let is_strict_or_all_functions (xs : binding list) =
-  Ext_list.for_all xs (fun (_, opt, rhs) ->
-      match opt with
-      | None -> true
-      | _ -> is_function_or_const_block rhs Set_ident.empty)
-
-(* Without such optimizations:
-
-   {[
-     module rec X : sig 
-       val f : int -> int   
-     end = struct 
-       let f x = x + 1
-     end   
-     and Y : sig 
-       val f : int -> int  
-     end = struct 
-       let f x  = x + 2
-     end
-   ]}
-   would generate such rawlambda:
-
-   {[
-     (setglobal Debug_tmp!
-        (let
-          (X/1002 = (#init_mod [0: "debug_tmp.ml" 15 6] [0: [0: [0: 0a "f"]]])
-             Y/1003 = (#init_mod [0: "debug_tmp.ml" 20 6] [0: [0: [0: 0a "f"]]]))
-            (seq
-               (#update_mod [0: [0: [0: 0a "f"]]] X/1002
-                  (let (f/1010 = (function x/1011 (+ x/1011 1)))
-                       (makeblock 0/[f] f/1010)))
-               (#update_mod [0: [0: [0: 0a "f"]]] Y/1003
-                  (let (f/1012 = (function x/1013 (+ x/1013 2)))
-                       (makeblock 0/[f] f/1012)))
-               (makeblock 0/module/exports X/1002 Y/1003))))
-
-   ]}
-*)
-let eval_rec_bindings (bindings : binding list) (cont : t) : t =
-  if is_strict_or_all_functions bindings then
-    Lambda.Lletrec (Ext_list.map bindings (fun (id, _, rhs) -> (id, rhs)), cont)
-  else eval_rec_bindings_aux bindings cont
-
-let compile_recmodule compile_rhs bindings cont =
-  eval_rec_bindings
-    (reorder_rec_bindings
-       (List.map
-          (fun { mb_id = id; mb_expr = modl; mb_loc = loc; _ } ->
-            (id, modl.mod_loc, init_shape modl, compile_rhs id modl loc))
-          bindings))
-    cont
-
-let report_error ppf = function
-  | Circular_dependency id ->
-      Format.fprintf ppf
-        "@[Cannot safely evaluate the definition@ of the recursively-defined \
-         module %a@]"
-        Printtyp.ident id
-
-let () =
-  Location.register_error_of_exn (function
-    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
-    | _ -> None)
diff --git a/jscomp/ml/translattribute.ml b/jscomp/ml/translattribute.ml
deleted file mode 100644
index 4f7eca2..0000000
--- a/jscomp/ml/translattribute.ml
+++ /dev/null
@@ -1,124 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                      Pierre Chambart, OCamlPro                         *)
-(*                                                                        *)
-(*   Copyright 2015 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-type t = Parsetree.attribute
-
-let is_inline_attribute (attr : t) =
-  match attr with { txt = "inline" }, _ -> true | _ -> false
-
-let is_inlined_attribute (attr : t) =
-  match attr with { txt = "inlined" }, _ -> true | _ -> false
-
-let find_attribute p (attributes : t list) =
-  let inline_attribute, other_attributes = List.partition p attributes in
-  let attr =
-    match inline_attribute with
-    | [] -> None
-    | [ attr ] -> Some attr
-    | _ :: ({ txt; loc }, _) :: _ ->
-        Location.prerr_warning loc (Warnings.Duplicated_attribute txt);
-        None
-  in
-  (attr, other_attributes)
-
-let parse_inline_attribute (attr : t option) : Lambda.inline_attribute =
-  match attr with
-  | None -> Default_inline
-  | Some ({ txt; loc }, payload) -> (
-      let open Parsetree in
-      (* the 'inline' and 'inlined' attributes can be used as
-         [@inline], [@inline never] or [@inline always].
-         [@inline] is equivalent to [@inline always] *)
-      let warning txt =
-        Warnings.Attribute_payload
-          (txt, "It must be either empty, 'always' or 'never'")
-      in
-      match payload with
-      | PStr [] -> Always_inline
-      | PStr [ { pstr_desc = Pstr_eval ({ pexp_desc }, []) } ] -> (
-          match pexp_desc with
-          | Pexp_ident { txt = Longident.Lident "never" } -> Never_inline
-          | Pexp_ident { txt = Longident.Lident "always" } -> Always_inline
-          | _ ->
-              Location.prerr_warning loc (warning txt);
-              Default_inline)
-      | _ ->
-          Location.prerr_warning loc (warning txt);
-          Default_inline)
-
-let get_inline_attribute l =
-  let attr, _ = find_attribute is_inline_attribute l in
-  parse_inline_attribute attr
-
-let rec add_inline_attribute (expr : Lambda.lambda) loc attributes =
-  match (expr, get_inline_attribute attributes) with
-  | expr, Default_inline -> expr
-  | Lfunction ({ attr = { stub = false } as attr } as funct), inline ->
-      (match attr.inline with
-      | Default_inline -> ()
-      | Always_inline | Never_inline ->
-          Location.prerr_warning loc (Warnings.Duplicated_attribute "inline"));
-      let attr = { attr with inline } in
-      Lfunction { funct with attr }
-  | Lprim (Pccall {prim_name = "#fn_mk" | "#fn_mk_unit"} as p, [e], l), _ ->
-    Lambda.Lprim (p, [add_inline_attribute e loc attributes], l)
-  | expr, (Always_inline) ->
-      Location.prerr_warning loc (Warnings.Misplaced_attribute "inline1");
-      expr
-  | expr, (Never_inline) ->
-      Location.prerr_warning loc (Warnings.Misplaced_attribute "inline2");
-      expr
-
-(* Get the [@inlined] attribute payload (or default if not present).
-   It also returns the expression without this attribute. This is
-   used to ensure that this attribute is not misplaced: If it
-   appears on any expression, it is an error, otherwise it would
-   have been removed by this function *)
-let get_and_remove_inlined_attribute (e : Typedtree.expression) =
-  let attr, exp_attributes =
-    find_attribute is_inlined_attribute e.exp_attributes
-  in
-  let inlined = parse_inline_attribute attr in
-  (inlined, { e with exp_attributes })
-
-let get_and_remove_inlined_attribute_on_module (e : Typedtree.module_expr) =
-  let attr, mod_attributes =
-    find_attribute is_inlined_attribute e.mod_attributes
-  in
-  let inlined = parse_inline_attribute attr in
-  (inlined, { e with mod_attributes })
-
-let check_attribute (e : Typedtree.expression) (({ txt; loc }, _) : t) =
-  match txt with
-  | "inline" -> (
-      match e.exp_desc with
-      | Texp_function _ -> ()
-      | _ -> Location.prerr_warning loc (Warnings.Misplaced_attribute txt))
-  | "inlined" ->
-      (* Removed by the Texp_apply cases *)
-      Location.prerr_warning loc (Warnings.Misplaced_attribute txt)
-  | _ -> ()
-
-let check_attribute_on_module (e : Typedtree.module_expr)
-    (({ txt; loc }, _) : t) =
-  match txt with
-  | "inline" -> (
-      match e.mod_desc with
-      | Tmod_functor _ -> ()
-      | _ -> Location.prerr_warning loc (Warnings.Misplaced_attribute txt))
-  | "inlined" ->
-      (* Removed by the Texp_apply cases *)
-      Location.prerr_warning loc (Warnings.Misplaced_attribute txt)
-  | _ -> ()
diff --git a/jscomp/ml/translcore.ml b/jscomp/ml/translcore.ml
deleted file mode 100644
index 9cf09f8..0000000
--- a/jscomp/ml/translcore.ml
+++ /dev/null
@@ -1,1362 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Translation from typed abstract syntax to lambda terms,
-   for the core language *)
-
-open Misc
-open Asttypes
-open Primitive
-open Types
-open Typedtree
-open Typeopt
-open Lambda
-
-type error = Unknown_builtin_primitive of string | Unreachable_reached
-
-exception Error of Location.t * error
-
-(* Forward declaration -- to be filled in by Translmod.transl_module *)
-let transl_module =
-  ref
-    (fun _cc _rootpath _modl -> assert false
-      : module_coercion -> Path.t option -> module_expr -> lambda)
-
-(* Compile an exception/extension definition *)
-
-let transl_extension_constructor env path ext =
-  let name =
-    match path (*!Clflags.for_package*) with
-    | None -> Ident.name ext.ext_id
-    | Some p -> Path.name p
-  in
-  let loc = ext.ext_loc in
-  match ext.ext_kind with
-  | Text_decl _ -> Lprim (Pcreate_extension name, [], loc)
-  | Text_rebind (path, _lid) -> transl_extension_path ~loc env path
-
-(* Translation of primitives *)
-
-type specialized = {
-  gencomp : Lambda.primitive;
-  intcomp : Lambda.primitive;
-  boolcomp : Lambda.primitive;
-  floatcomp : Lambda.primitive;
-  stringcomp : Lambda.primitive;
-  bytescomp : Lambda.primitive;
-  int64comp : Lambda.primitive;
-  bigintcomp : Lambda.primitive;
-  simplify_constant_constructor : bool;
-}
-
-let arity2 name : Lambda.primitive =
-  Lambda.Pccall (Primitive.simple ~name ~arity:2 ~alloc:true)
-
-let comparisons_table =
-  create_hashtable 11
-    [
-      ( "%equal",
-        {
-          gencomp =
-            Pccall (Primitive.simple ~name:"caml_equal" ~arity:2 ~alloc:true);
-          intcomp = Pintcomp Ceq;
-          boolcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bool_equal" ~arity:2 ~alloc:false);
-          floatcomp = Pfloatcomp Ceq;
-          stringcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_string_equal" ~arity:2 ~alloc:false);
-          bytescomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bytes_equal" ~arity:2 ~alloc:false);
-          int64comp = Pbintcomp (Pint64, Ceq);
-          bigintcomp = Pbigintcomp Ceq;
-          simplify_constant_constructor = true;
-        } );
-      ( "%notequal",
-        {
-          gencomp =
-            Pccall (Primitive.simple ~name:"caml_notequal" ~arity:2 ~alloc:true);
-          intcomp = Pintcomp Cneq;
-          boolcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bool_notequal" ~arity:2 ~alloc:false);
-          floatcomp = Pfloatcomp Cneq;
-          stringcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_string_notequal" ~arity:2
-                 ~alloc:false);
-          bytescomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bytes_notequal" ~arity:2
-                 ~alloc:false);
-          int64comp = Pbintcomp (Pint64, Cneq);
-          bigintcomp = Pbigintcomp Cneq;
-          simplify_constant_constructor = true;
-        } );
-      ( "%lessthan",
-        {
-          gencomp =
-            Pccall (Primitive.simple ~name:"caml_lessthan" ~arity:2 ~alloc:true);
-          intcomp = Pintcomp Clt;
-          boolcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bool_lessthan" ~arity:2 ~alloc:false);
-          floatcomp = Pfloatcomp Clt;
-          stringcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_string_lessthan" ~arity:2
-                 ~alloc:false);
-          bytescomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bytes_lessthan" ~arity:2
-                 ~alloc:false);
-          int64comp = Pbintcomp (Pint64, Clt);
-          bigintcomp = Pbigintcomp Clt;
-          simplify_constant_constructor = false;
-        } );
-      ( "%greaterthan",
-        {
-          gencomp =
-            Pccall
-              (Primitive.simple ~name:"caml_greaterthan" ~arity:2 ~alloc:true);
-          intcomp = Pintcomp Cgt;
-          boolcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bool_greaterthan" ~arity:2
-                 ~alloc:false);
-          floatcomp = Pfloatcomp Cgt;
-          stringcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_string_greaterthan" ~arity:2
-                 ~alloc:false);
-          bytescomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bytes_greaterthan" ~arity:2
-                 ~alloc:false);
-          int64comp = Pbintcomp (Pint64, Cgt);
-          bigintcomp = Pbigintcomp Cgt;
-          simplify_constant_constructor = false;
-        } );
-      ( "%lessequal",
-        {
-          gencomp =
-            Pccall
-              (Primitive.simple ~name:"caml_lessequal" ~arity:2 ~alloc:true);
-          intcomp = Pintcomp Cle;
-          boolcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bool_lessequal" ~arity:2
-                 ~alloc:false);
-          floatcomp = Pfloatcomp Cle;
-          stringcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_string_lessequal" ~arity:2
-                 ~alloc:false);
-          bytescomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bytes_lessequal" ~arity:2
-                 ~alloc:false);
-          int64comp = Pbintcomp (Pint64, Cle);
-          bigintcomp = Pbigintcomp Cle;
-          simplify_constant_constructor = false;
-        } );
-      ( "%greaterequal",
-        {
-          gencomp =
-            Pccall
-              (Primitive.simple ~name:"caml_greaterequal" ~arity:2 ~alloc:true);
-          intcomp = Pintcomp Cge;
-          boolcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bool_greaterequal" ~arity:2
-                 ~alloc:false);
-          floatcomp = Pfloatcomp Cge;
-          stringcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_string_greaterequal" ~arity:2
-                 ~alloc:false);
-          bytescomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bytes_greaterequal" ~arity:2
-                 ~alloc:false);
-          int64comp = Pbintcomp (Pint64, Cge);
-          bigintcomp = Pbigintcomp Cge;
-          simplify_constant_constructor = false;
-        } );
-      ( "%compare",
-        {
-          gencomp =
-            Pccall (Primitive.simple ~name:"caml_compare" ~arity:2 ~alloc:true);
-          (* Not unboxed since the comparison is done directly on tagged int *)
-          intcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_int_compare" ~arity:2 ~alloc:false);
-          boolcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bool_compare" ~arity:2 ~alloc:false);
-          floatcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_float_compare" ~arity:2 ~alloc:false);
-          stringcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_string_compare" ~arity:2
-                 ~alloc:false);
-          bytescomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bytes_compare" ~arity:2 ~alloc:false);
-          int64comp =
-            Pccall
-              (Primitive.simple ~name:"caml_int64_compare" ~arity:2 ~alloc:false);
-          bigintcomp =
-            Pccall
-              (Primitive.simple ~name:"caml_bigint_compare" ~arity:2 ~alloc:false);
-          simplify_constant_constructor = false;
-        } );
-      ( "%bs_max",
-        {
-          gencomp = arity2 "caml_max";
-          bytescomp = arity2 "caml_max";
-          (* FIXME bytescomp*)
-          intcomp = arity2 "caml_int_max";
-          boolcomp = arity2 "caml_bool_max";
-          floatcomp = arity2 "caml_float_max";
-          stringcomp = arity2 "caml_string_max";
-          int64comp = arity2 "caml_int64_max";
-          bigintcomp = arity2 "caml_bigint_max";
-          simplify_constant_constructor = false;
-        } );
-      ( "%bs_min",
-        {
-          gencomp = arity2 "caml_min";
-          bytescomp = arity2 "caml_min";
-          intcomp = arity2 "caml_int_min";
-          boolcomp = arity2 "caml_bool_min";
-          floatcomp = arity2 "caml_float_min";
-          stringcomp = arity2 "caml_string_min";
-          int64comp = arity2 "caml_int64_min";
-          bigintcomp = arity2 "caml_bigint_min";
-          simplify_constant_constructor = false;
-        } );
-      ( "%bs_equal_null",
-        {
-          gencomp = arity2 "caml_equal_null";
-          bytescomp = arity2 "caml_equal_null";
-          (* FIXME*)
-          intcomp = arity2 "caml_int_equal_null";
-          boolcomp = arity2 "caml_bool_equal_null";
-          floatcomp = arity2 "caml_float_equal_null";
-          stringcomp = arity2 "caml_string_equal_null";
-          int64comp = arity2 "caml_int64_equal_null";
-          bigintcomp = arity2 "caml_bigint_equal_null";
-          simplify_constant_constructor = true;
-        } );
-      ( "%bs_equal_undefined",
-        {
-          gencomp = arity2 "caml_equal_undefined";
-          bytescomp = arity2 "caml_equal_undefined";
-          (* FIXME*)
-          intcomp = arity2 "caml_int_equal_undefined";
-          boolcomp = arity2 "caml_bool_equal_undefined";
-          floatcomp = arity2 "caml_float_equal_undefined";
-          stringcomp = arity2 "caml_string_equal_undefined";
-          int64comp = arity2 "caml_int64_equal_undefined";
-          bigintcomp = arity2 "caml_bigint_equal_undefined";
-          simplify_constant_constructor = true;
-        } );
-      ( "%bs_equal_nullable",
-        {
-          gencomp = arity2 "caml_equal_nullable";
-          bytescomp = arity2 "caml_equal_nullable";
-          (* FIXME *)
-          intcomp = arity2 "caml_int_equal_nullable";
-          boolcomp = arity2 "caml_bool_equal_nullable";
-          floatcomp = arity2 "caml_float_equal_nullable";
-          stringcomp = arity2 "caml_string_equal_nullable";
-          int64comp = arity2 "caml_int64_equal_nullable";
-          bigintcomp = arity2 "caml_bigint_equal_nullable";
-          simplify_constant_constructor = true;
-        } );
-    ]
-
-let primitives_table =
-  create_hashtable 57
-    [
-      ("%identity", Pidentity);
-      ("%bytes_to_string", Pbytes_to_string);
-      ("%ignore", Pignore);
-      ("%revapply", Prevapply);
-      ("%apply", Pdirapply);
-      ("%loc_LOC", Ploc Loc_LOC);
-      ("%loc_FILE", Ploc Loc_FILE);
-      ("%loc_LINE", Ploc Loc_LINE);
-      ("%loc_POS", Ploc Loc_POS);
-      ("%loc_MODULE", Ploc Loc_MODULE);
-      (* BEGIN Triples for  ref data type *)
-      ("%bs_ref_setfield0", Psetfield (0, Lambda.ref_field_set_info));
-      ("%bs_ref_field0", Pfield (0, Lambda.ref_field_info));
-      ("%makemutable", Pmakeblock Lambda.ref_tag_info);
-      ("%incr", Poffsetref 1);
-      ("%decr", Poffsetref (-1));
-      (* Finish Triples for  ref data type *)
-      ("%field0", Pfield (0, Fld_tuple));
-      ("%field1", Pfield (1, Fld_tuple));
-      ("%obj_field", Parrayrefu);
-      ("%obj_set_field", Parraysetu);
-      ("%obj_is_int", Pisint);
-      ("%raise", Praise Raise_regular);
-      ("%reraise", Praise Raise_reraise);
-      ("%raise_notrace", Praise Raise_notrace);
-      ("%sequand", Psequand);
-      ("%sequor", Psequor);
-      ("%boolnot", Pnot);
-      ("%big_endian", Pctconst Big_endian);
-      ("%backend_type", Pctconst Backend_type);
-      ("%word_size", Pctconst Word_size);
-      ("%int_size", Pctconst Int_size);
-      ("%max_wosize", Pctconst Max_wosize);
-      ("%ostype_unix", Pctconst Ostype_unix);
-      ("%ostype_win32", Pctconst Ostype_win32);
-      ("%ostype_cygwin", Pctconst Ostype_cygwin);
-      ("%negint", Pnegint);
-      ("%succint", Poffsetint 1);
-      ("%predint", Poffsetint (-1));
-      ("%addint", Paddint);
-      ("%subint", Psubint);
-      ("%mulint", Pmulint);
-      ("%divint", Pdivint Safe);
-      ("%modint", Pmodint Safe);
-      ("%andint", Pandint);
-      ("%orint", Porint);
-      ("%xorint", Pxorint);
-      ("%lslint", Plslint);
-      ("%lsrint", Plsrint);
-      ("%asrint", Pasrint);
-      ("%andbigint", Pandbigint);
-      ("%orbigint", Porbigint);
-      ("%xorbigint", Pxorbigint);
-      ("%lslbigint", Plslbigint);
-      ("%asrbigint", Pasrbigint);
-      ("%eq", Pintcomp Ceq);
-      ("%noteq", Pintcomp Cneq);
-      ("%ltint", Pintcomp Clt);
-      ("%leint", Pintcomp Cle);
-      ("%gtint", Pintcomp Cgt);
-      ("%geint", Pintcomp Cge);
-      ("%intoffloat", Pintoffloat);
-      ("%floatofint", Pfloatofint);
-      ("%negfloat", Pnegfloat);
-      ("%absfloat", Pabsfloat);
-      ("%addfloat", Paddfloat);
-      ("%subfloat", Psubfloat);
-      ("%mulfloat", Pmulfloat);
-      ("%divfloat", Pdivfloat);
-      ("%eqfloat", Pfloatcomp Ceq);
-      ("%noteqfloat", Pfloatcomp Cneq);
-      ("%ltfloat", Pfloatcomp Clt);
-      ("%lefloat", Pfloatcomp Cle);
-      ("%gtfloat", Pfloatcomp Cgt);
-      ("%gefloat", Pfloatcomp Cge);
-      ("%negbigint", Pnegbigint);
-      ("%addbigint", Paddbigint);
-      ("%subbigint", Psubbigint);
-      ("%mulbigint", Pmulbigint);
-      ("%divbigint", Pdivbigint);
-      ("%powbigint", Ppowbigint);
-      ("%modbigint", Pmodbigint);
-      ("%eqbigint", Pbigintcomp Ceq);
-      ("%noteqbigint", Pbigintcomp Cneq);
-      ("%ltbigint", Pbigintcomp Clt);
-      ("%lebigint", Pbigintcomp Cle);
-      ("%gtbigint", Pbigintcomp Cgt);
-      ("%gebigint", Pbigintcomp Cge);
-      ("%string_length", Pstringlength);
-      ("%string_safe_get", Pstringrefs);
-      ("%string_unsafe_get", Pstringrefu);
-      ("%bytes_length", Pbyteslength);
-      ("%bytes_safe_get", Pbytesrefs);
-      ("%bytes_safe_set", Pbytessets);
-      ("%bytes_unsafe_get", Pbytesrefu);
-      ("%bytes_unsafe_set", Pbytessetu);
-      ("%array_length", Parraylength);
-      ("%array_safe_get", Parrayrefs);
-      ("%array_safe_set", Parraysets);
-      ("%array_unsafe_get", Parrayrefu);
-      ("%array_unsafe_set", Parraysetu);
-      ("%floatarray_length", Parraylength);
-      ("%floatarray_safe_get", Parrayrefs);
-      ("%floatarray_safe_set", Parraysets);
-      ("%floatarray_unsafe_get", Parrayrefu);
-      ("%floatarray_unsafe_set", Parraysetu);
-      ("%lazy_force", Plazyforce);
-      ("%int64_of_int", Pbintofint Pint64);
-      ("%int64_to_int", Pintofbint Pint64);
-      ("%int64_neg", Pnegbint Pint64);
-      ("%int64_add", Paddbint Pint64);
-      ("%int64_sub", Psubbint Pint64);
-      ("%int64_mul", Pmulbint Pint64);
-      ("%int64_div", Pdivbint { size = Pint64; is_safe = Safe });
-      ("%int64_mod", Pmodbint { size = Pint64; is_safe = Safe });
-      ("%int64_and", Pandbint Pint64);
-      ("%int64_or", Porbint Pint64);
-      ("%int64_xor", Pxorbint Pint64);
-      ("%int64_lsl", Plslbint Pint64);
-      ("%int64_lsr", Plsrbint Pint64);
-      ("%int64_asr", Pasrbint Pint64);
-      ("%bigint_of_int32", Pcvtbint (Pint32, Pbigint));
-      ("%bigint_to_int32", Pcvtbint (Pbigint, Pint32));
-      ("%int64_of_int32", Pcvtbint (Pint32, Pint64));
-      ("%int64_to_int32", Pcvtbint (Pint64, Pint32));
-      ("%int64_of_bigint", Pcvtbint (Pbigint, Pint64));
-      ("%int64_to_bigint", Pcvtbint (Pint64, Pbigint));
-      ("%opaque", Popaque);
-      ("%uncurried_apply", Puncurried_apply);
-    ]
-
-let find_primitive prim_name = Hashtbl.find primitives_table prim_name
-
-let specialize_comparison
-    ({ gencomp; intcomp; floatcomp; stringcomp; bytescomp; int64comp; bigintcomp; boolcomp } :
-      specialized) env ty =
-  match () with
-  | ()
-    when is_base_type env ty Predef.path_int
-         || is_base_type env ty Predef.path_char
-         || maybe_pointer_type env ty = Immediate ->
-      intcomp
-  | () when is_base_type env ty Predef.path_float -> floatcomp
-  | () when is_base_type env ty Predef.path_string -> stringcomp
-  | () when is_base_type env ty Predef.path_bytes -> bytescomp
-  | () when is_base_type env ty Predef.path_int64 -> int64comp
-  | () when is_base_type env ty Predef.path_bigint -> bigintcomp
-  | () when is_base_type env ty Predef.path_bool -> boolcomp
-  | () -> gencomp
-
-(* Specialize a primitive from available type information,
-   raise Not_found if primitive is unknown  *)
-
-let specialize_primitive p env ty (* ~has_constant_constructor *) =
-  try
-    let table = Hashtbl.find comparisons_table p.prim_name in
-    match is_function_type env ty with
-    | Some (lhs, _rhs) -> specialize_comparison table env lhs
-    | None -> table.gencomp
-  with Not_found -> find_primitive p.prim_name
-
-(* Eta-expand a primitive *)
-
-let transl_primitive loc p env ty =
-  let prim =
-    try specialize_primitive p env ty (* ~has_constant_constructor:false *)
-    with Not_found -> Pccall p
-  in
-  match prim with
-  | Plazyforce ->
-      let parm = Ident.create "prim" in
-      Lfunction
-        {
-          params = [ parm ];
-          body = Matching.inline_lazy_force (Lvar parm) Location.none;
-          loc;
-          attr = default_stub_attribute;
-        }
-  | Ploc kind -> (
-      let lam = lam_of_loc kind loc in
-      match p.prim_arity with
-      | 0 -> lam
-      | 1 ->
-          (* TODO: we should issue a warning ? *)
-          let param = Ident.create "prim" in
-          Lfunction
-            {
-              params = [ param ];
-              attr = default_stub_attribute;
-              loc;
-              body = Lprim (Pmakeblock Blk_tuple, [ lam; Lvar param ], loc);
-            }
-      | _ -> assert false)
-  | _ ->
-      let rec make_params n total =
-        if n <= 0 then []
-        else
-          Ident.create ("prim" ^ string_of_int (total - n))
-          :: make_params (n - 1) total
-      in
-      let prim_arity = p.prim_arity in
-      if prim_arity = 0 then Lprim (prim, [], loc)
-      else
-        let params =
-          if prim_arity = 1 then [ Ident.create "prim" ]
-          else make_params prim_arity prim_arity
-        in
-        Lfunction
-          {
-            params;
-            attr = default_stub_attribute;
-            loc;
-            body = Lprim (prim, List.map (fun id -> Lvar id) params, loc);
-          }
-
-let transl_primitive_application loc prim env ty args =
-  let prim_name = prim.prim_name in
-  try
-    match args with
-    | [ arg1; _ ]
-      when is_base_type env arg1.exp_type Predef.path_bool
-           && Hashtbl.mem comparisons_table prim_name ->
-        (Hashtbl.find comparisons_table prim_name).boolcomp
-    | _ ->
-        let has_constant_constructor =
-          match args with
-          | [
-              _;
-              {
-                exp_desc = Texp_construct (_, { cstr_tag = Cstr_constant _ }, _);
-              };
-            ]
-          | [
-              {
-                exp_desc = Texp_construct (_, { cstr_tag = Cstr_constant _ }, _);
-              };
-              _;
-            ]
-          | [ _; { exp_desc = Texp_variant (_, None) } ]
-          | [ { exp_desc = Texp_variant (_, None) }; _ ] ->
-              true
-          | _ -> false
-        in
-        if has_constant_constructor then
-          match Hashtbl.find_opt comparisons_table prim_name with
-          | Some table when table.simplify_constant_constructor -> table.intcomp
-          | Some _ | None -> specialize_primitive prim env ty
-          (* ~has_constant_constructor*)
-        else specialize_primitive prim env ty
-  with Not_found ->
-    if String.length prim_name > 0 && prim_name.[0] = '%' then
-      raise (Error (loc, Unknown_builtin_primitive prim_name));
-    Pccall prim
-
-(* To propagate structured constants *)
-
-exception Not_constant
-
-let extract_constant = function
-  | Lconst sc -> sc
-  | _ -> raise_notrace Not_constant
-
-(* Push the default values under the functional abstractions *)
-(* Also push bindings of module patterns, since this sound *)
-
-type binding =
-  | Bind_value of value_binding list
-  | Bind_module of Ident.t * string loc * module_expr
-
-let rec push_defaults loc bindings cases partial =
-  match cases with
-  | [
-   {
-     c_lhs = pat;
-     c_guard = None;
-     c_rhs =
-       { exp_desc = Texp_function { arg_label; param; cases; partial } } as exp;
-   };
-  ] ->
-      let cases = push_defaults exp.exp_loc bindings cases partial in
-      [
-        {
-          c_lhs = pat;
-          c_guard = None;
-          c_rhs =
-            {
-              exp with
-              exp_desc = Texp_function { arg_label; param; cases; partial };
-            };
-        };
-      ]
-  | [
-   {
-     c_lhs = pat;
-     c_guard = None;
-     c_rhs =
-       {
-         exp_attributes = [ ({ txt = "#default" }, _) ];
-         exp_desc =
-           Texp_let (Nonrecursive, binds, ({ exp_desc = Texp_function _ } as e2));
-       };
-   };
-  ] ->
-      push_defaults loc
-        (Bind_value binds :: bindings)
-        [ { c_lhs = pat; c_guard = None; c_rhs = e2 } ]
-        partial
-  | [
-   {
-     c_lhs = pat;
-     c_guard = None;
-     c_rhs =
-       {
-         exp_attributes = [ ({ txt = "#modulepat" }, _) ];
-         exp_desc =
-           Texp_letmodule
-             (id, name, mexpr, ({ exp_desc = Texp_function _ } as e2));
-       };
-   };
-  ] ->
-      push_defaults loc
-        (Bind_module (id, name, mexpr) :: bindings)
-        [ { c_lhs = pat; c_guard = None; c_rhs = e2 } ]
-        partial
-  | [ case ] ->
-      let exp =
-        List.fold_left
-          (fun exp binds ->
-            {
-              exp with
-              exp_desc =
-                (match binds with
-                | Bind_value binds -> Texp_let (Nonrecursive, binds, exp)
-                | Bind_module (id, name, mexpr) ->
-                    Texp_letmodule (id, name, mexpr, exp));
-            })
-          case.c_rhs bindings
-      in
-      [ { case with c_rhs = exp } ]
-  | { c_lhs = pat; c_rhs = exp; c_guard = _ } :: _ when bindings <> [] ->
-      let param = Typecore.name_pattern "param" cases in
-      let name = Ident.name param in
-      let exp =
-        {
-          exp with
-          exp_loc = loc;
-          exp_desc =
-            Texp_match
-              ( {
-                  exp with
-                  exp_type = pat.pat_type;
-                  exp_desc =
-                    Texp_ident
-                      ( Path.Pident param,
-                        mknoloc (Longident.Lident name),
-                        {
-                          val_type = pat.pat_type;
-                          val_kind = Val_reg;
-                          val_attributes = [];
-                          Types.val_loc = Location.none;
-                        } );
-                },
-                cases,
-                [],
-                partial );
-        }
-      in
-      push_defaults loc bindings
-        [
-          {
-            c_lhs = { pat with pat_desc = Tpat_var (param, mknoloc name) };
-            c_guard = None;
-            c_rhs = exp;
-          };
-        ]
-        Total
-  | _ -> cases
-
-
-
-(* Assertions *)
-
-let assert_failed exp =
-  let fname, line, char =
-    Location.get_pos_info exp.exp_loc.Location.loc_start
-  in
-  let fname = Filename.basename fname in
-  Lprim
-    ( Praise Raise_regular,
-      [
-        Lprim
-          ( Pmakeblock Blk_extension,
-            [
-              transl_normal_path Predef.path_assert_failure;
-              Lconst
-                (Const_block
-                   ( Blk_tuple,
-                     [
-                       Const_base (Const_string (fname, None));
-                       Const_base (Const_int line);
-                       Const_base (Const_int char);
-                     ] ));
-            ],
-            exp.exp_loc );
-      ],
-      exp.exp_loc )
-
-let rec cut n l =
-  if n = 0 then ([], l)
-  else
-    match l with
-    | [] -> failwith "Translcore.cut"
-    | a :: l ->
-        let l1, l2 = cut (n - 1) l in
-        (a :: l1, l2)
-
-(* Translation of expressions *)
-
-let try_ids = Hashtbl.create 8
-
-let has_async_attribute exp = exp.exp_attributes |> List.exists (fun ({txt}, _payload) -> txt = "res.async")
-
-let rec transl_exp e =
-  List.iter (Translattribute.check_attribute e) e.exp_attributes;
-  transl_exp0 e
-
-and transl_exp0 (e : Typedtree.expression) : Lambda.lambda =
-  match e.exp_desc with
-  | Texp_ident (_, _, { val_kind = Val_prim p }) ->
-      transl_primitive e.exp_loc p e.exp_env e.exp_type
-  | Texp_ident (path, _, { val_kind = Val_reg }) ->
-      transl_value_path ~loc:e.exp_loc e.exp_env path
-  | Texp_constant cst -> Lconst (Const_base cst)
-  | Texp_let (rec_flag, pat_expr_list, body) ->
-      transl_let rec_flag pat_expr_list (transl_exp body)
-  | Texp_function { arg_label = _; param; cases; partial } ->
-      let async = has_async_attribute e in
-      let params, body, return_unit =
-        let pl = push_defaults e.exp_loc [] cases partial in
-        transl_function e.exp_loc partial param pl
-      in
-      let attr =
-        {
-          default_function_attribute with
-          inline = Translattribute.get_inline_attribute e.exp_attributes;
-          async;
-          return_unit;
-        }
-      in
-      let loc = e.exp_loc in
-      Lfunction { params; body; attr; loc }
-  | Texp_apply
-      ( ({
-           exp_desc = Texp_ident (_, _, { val_kind = Val_prim p });
-           exp_type = prim_type;
-         } as funct),
-        oargs )
-    when List.length oargs >= p.prim_arity
-         && List.for_all (fun (_, arg) -> arg <> None) oargs -> (
-      let args, args' = cut p.prim_arity oargs in
-      let wrap f =
-        if args' = [] then f
-        else
-          let inlined, _ =
-            Translattribute.get_and_remove_inlined_attribute funct
-          in
-          transl_apply ~inlined f args' e.exp_loc
-      in
-      let args =
-        List.map (function _, Some x -> x | _ -> assert false) args
-      in
-      let argl = transl_list args in
-      let prim =
-        transl_primitive_application e.exp_loc p e.exp_env prim_type args
-      in
-      match (prim, args) with
-      | Praise k, [ _ ] ->
-          let targ = List.hd argl in
-          let k =
-            match (k, targ) with
-            | Raise_regular, Lvar id when Hashtbl.mem try_ids id ->
-                Raise_reraise
-            | _ -> k
-          in
-          wrap (Lprim (Praise k, [ targ ], e.exp_loc))
-      | Ploc kind, [] -> lam_of_loc kind e.exp_loc
-      | Ploc kind, [ arg1 ] ->
-          let lam = lam_of_loc kind arg1.exp_loc in
-          Lprim (Pmakeblock Blk_tuple, lam :: argl, e.exp_loc)
-      | Ploc _, _ -> assert false
-      | _, _ -> (
-          match (prim, argl) with
-          | Plazyforce, [ a ] -> wrap (Matching.inline_lazy_force a e.exp_loc)
-          | Plazyforce, _ -> assert false
-          | _ ->
-              wrap (Lprim (prim, argl, e.exp_loc))
-              ))
-  | Texp_apply (funct, oargs) ->
-      let inlined, funct =
-        Translattribute.get_and_remove_inlined_attribute funct
-      in
-      let uncurried_partial_application =
-        (* In case of partial application foo(args, ...) when some args are missing,
-           get the arity *)
-        let uncurried_partial_app = Ext_list.exists e.exp_attributes (fun ({txt },_) -> txt = "res.partial") in
-        if uncurried_partial_app then
-          let arity_opt = Ast_uncurried.uncurried_type_get_arity_opt ~env:funct.exp_env funct.exp_type in
-          match arity_opt with
-            | Some arity ->
-              let real_args = List.filter (fun (_, x) -> Option.is_some x) oargs in
-              if arity > List.length real_args then
-                Some arity
-              else None 
-            | None -> None
-        else
-          None in
-      transl_apply ~inlined ~uncurried_partial_application (transl_exp funct) oargs e.exp_loc
-  | Texp_match (arg, pat_expr_list, exn_pat_expr_list, partial) ->
-      transl_match e arg pat_expr_list exn_pat_expr_list partial
-  | Texp_try (body, pat_expr_list) ->
-      let id = Typecore.name_pattern "exn" pat_expr_list in
-      Ltrywith
-        ( transl_exp body,
-          id,
-          Matching.for_trywith (Lvar id) (transl_cases_try pat_expr_list) )
-  | Texp_tuple el -> (
-      let ll = transl_list el in
-      try Lconst (Const_block (Blk_tuple, List.map extract_constant ll))
-      with Not_constant -> Lprim (Pmakeblock Blk_tuple, ll, e.exp_loc))
-  | Texp_construct ({ txt = Lident "false" }, _, []) -> Lconst Const_false
-  | Texp_construct ({ txt = Lident "true" }, _, []) -> Lconst Const_true
-  | Texp_construct ({ txt = Lident "Function$"}, _, [expr]) ->
-      (* ReScript uncurried encoding *)
-      let loc = expr.exp_loc in
-      let lambda = transl_exp expr in
-      let arity = Ast_uncurried.uncurried_type_get_arity ~env:e.exp_env e.exp_type in
-      let arity_s = arity |> string_of_int in
-      let name = match (Ctype.expand_head expr.exp_env expr.exp_type).desc with
-      | Tarrow (Nolabel, t, _, _) -> (
-        match (Ctype.expand_head expr.exp_env t).desc with
-        | Tconstr (Pident {name= "unit"}, [], _) -> "#fn_mk_unit"
-        | _ -> "#fn_mk"
-      )
-      | _ -> "#fn_mk" in
-      let prim =
-        Primitive.make ~name ~alloc:true ~native_name:arity_s
-          ~native_repr_args:[ Same_as_ocaml_repr ]
-          ~native_repr_res:Same_as_ocaml_repr
-      in
-      Lprim
-        ( Pccall prim
-          (* could be replaced with Opaque in the future except arity 0*),
-          [ lambda ],
-          loc )
-  | Texp_construct (lid, cstr, args) -> (
-      let ll = transl_list args in
-      if cstr.cstr_inlined <> None then
-        match ll with [ x ] -> x | _ -> assert false
-      else
-        match cstr.cstr_tag with
-        | Cstr_constant n ->
-            Lconst
-              (Const_pointer
-                 ( n,
-                   match lid.txt with
-                   | Longident.Ldot (Longident.Lident "*predef*", "None")
-                   | Longident.Lident "None"
-                     when Datarepr.constructor_has_optional_shape cstr ->
-                       Pt_shape_none
-                   | _ ->
-                       if Datarepr.constructor_has_optional_shape cstr then
-                         Pt_shape_none
-                       else
-                         Pt_constructor
-                           {
-                             name = cstr.cstr_name;
-                             const = cstr.cstr_consts;
-                             non_const = cstr.cstr_nonconsts;
-                             attrs = cstr.cstr_attributes;
-                           } ))
-        | Cstr_unboxed -> ( match ll with [ v ] -> v | _ -> assert false)
-        | Cstr_block n -> (
-            let tag_info : Lambda.tag_info =
-              if Datarepr.constructor_has_optional_shape cstr then
-                match args with
-                | [ arg ]
-                  when Typeopt.type_cannot_contain_undefined arg.exp_type
-                         arg.exp_env ->
-                    (* Format.fprintf Format.err_formatter "@[special boxingl@]@."; *)
-                    Blk_some_not_nested
-                | _ -> Blk_some
-              else
-                Blk_constructor
-                  {
-                    name = cstr.cstr_name;
-                    num_nonconst = cstr.cstr_nonconsts;
-                    tag = n;
-                    attrs = cstr.cstr_attributes;
-                  }
-            in
-            try Lconst (Const_block (tag_info, List.map extract_constant ll))
-            with Not_constant -> Lprim (Pmakeblock tag_info, ll, e.exp_loc))
-        | Cstr_extension (path, _) ->
-            Lprim
-              ( Pmakeblock Blk_extension,
-                transl_extension_path e.exp_env path :: ll,
-                e.exp_loc ))
-  | Texp_extension_constructor (_, path) -> transl_extension_path e.exp_env path
-  | Texp_variant (l, arg) -> (
-      let tag = Btype.hash_variant l in
-      match arg with
-      | None -> Lconst (Const_pointer (tag, Pt_variant { name = l }))
-      | Some arg -> (
-          let lam = transl_exp arg in
-          let tag_info = Blk_poly_var l in
-          try
-            Lconst
-              (Const_block
-                 (tag_info, [ Const_base (Const_int tag); extract_constant lam ]))
-          with Not_constant ->
-            Lprim
-              ( Pmakeblock tag_info,
-                [ Lconst (Const_base (Const_int tag)); lam ],
-                e.exp_loc )))
-  | Texp_record { fields; representation; extended_expression } ->
-      transl_record e.exp_loc e.exp_env fields representation
-        extended_expression
-  | Texp_field (arg, _, lbl) -> (
-      let targ = transl_exp arg in
-      match lbl.lbl_repres with
-      | Record_float_unused -> assert false
-      | Record_regular | Record_optional_labels _ ->
-          Lprim
-            (Pfield (lbl.lbl_pos, Lambda.fld_record lbl), [ targ ], e.exp_loc)
-      | Record_inlined _ ->
-          Lprim
-            ( Pfield (lbl.lbl_pos, Lambda.fld_record_inline lbl),
-              [ targ ],
-              e.exp_loc )
-      | Record_unboxed _ -> targ
-      | Record_extension ->
-          Lprim
-            ( Pfield
-                (lbl.lbl_pos + 1, Lambda.fld_record_extension lbl),
-              [ targ ],
-              e.exp_loc ))
-  | Texp_setfield (arg, _, lbl, newval) ->
-      let access =
-        match lbl.lbl_repres with
-        | Record_float_unused -> assert false
-        | Record_regular | Record_optional_labels _ ->
-            Psetfield (lbl.lbl_pos, Lambda.fld_record_set lbl)
-        | Record_inlined _ ->
-            Psetfield (lbl.lbl_pos, Lambda.fld_record_inline_set lbl)
-        | Record_unboxed _ -> assert false
-        | Record_extension ->
-            Psetfield (lbl.lbl_pos + 1, Lambda.fld_record_extension_set lbl)
-      in
-      Lprim (access, [ transl_exp arg; transl_exp newval ], e.exp_loc)
-  | Texp_array expr_list ->
-      let ll = transl_list expr_list in
-      Lprim (Pmakearray Mutable, ll, e.exp_loc)
-  | Texp_ifthenelse (cond, ifso, Some ifnot) ->
-      Lifthenelse (transl_exp cond, transl_exp ifso, transl_exp ifnot)
-  | Texp_ifthenelse (cond, ifso, None) ->
-      Lifthenelse (transl_exp cond, transl_exp ifso, lambda_unit)
-  | Texp_sequence (expr1, expr2) ->
-      Lsequence (transl_exp expr1, transl_exp expr2)
-  | Texp_while (cond, body) -> Lwhile (transl_exp cond, transl_exp body)
-  | Texp_for (param, _, low, high, dir, body) ->
-      Lfor (param, transl_exp low, transl_exp high, dir, transl_exp body)
-  | Texp_send (expr, Tmeth_name nm, _) ->
-      let obj = transl_exp expr in
-      Lsend (nm, obj, e.exp_loc)
-  | Texp_new _ | Texp_instvar _ | Texp_setinstvar _ | Texp_override _ ->
-      assert false
-  | Texp_letmodule (id, _loc, modl, body) ->
-      let defining_expr = !transl_module Tcoerce_none None modl in
-      Llet (Strict, Pgenval, id, defining_expr, transl_exp body)
-  | Texp_letexception (cd, body) ->
-      Llet
-        ( Strict,
-          Pgenval,
-          cd.ext_id,
-          transl_extension_constructor e.exp_env None cd,
-          transl_exp body )
-  | Texp_pack modl -> !transl_module Tcoerce_none None modl
-  | Texp_assert { exp_desc = Texp_construct (_, { cstr_name = "false" }, _) } ->
-      if !Clflags.no_assert_false then Lambda.lambda_assert_false
-      else assert_failed e
-  | Texp_assert cond ->
-      if !Clflags.noassert then lambda_unit
-      else Lifthenelse (transl_exp cond, lambda_unit, assert_failed e)
-  | Texp_lazy e ->
-      (* when e needs no computation (constants, identifiers, ...), we
-         optimize the translation just as Lazy.lazy_from_val would
-         do *)
-      Lprim (Pmakeblock Blk_lazy_general, [ transl_exp e ], e.exp_loc)
-  | Texp_object () -> assert false
-  | Texp_unreachable -> raise (Error (e.exp_loc, Unreachable_reached))
-
-and transl_list expr_list = List.map transl_exp expr_list
-
-and transl_guard guard rhs =
-  let expr = transl_exp rhs in
-  match guard with
-  | None -> expr
-  | Some cond -> Lifthenelse (transl_exp cond, expr, staticfail)
-
-and transl_case { c_lhs; c_guard; c_rhs } = (c_lhs, transl_guard c_guard c_rhs)
-
-and transl_cases cases =
-  let cases =
-    Ext_list.filter cases (fun c -> c.c_rhs.exp_desc <> Texp_unreachable)
-  in
-  List.map transl_case cases
-
-and transl_case_try { c_lhs; c_guard; c_rhs } =
-  match c_lhs.pat_desc with
-  | Tpat_var (id, _) | Tpat_alias (_, id, _) ->
-      Hashtbl.replace try_ids id ();
-      Misc.try_finally
-        (fun () -> (c_lhs, transl_guard c_guard c_rhs))
-        (fun () -> Hashtbl.remove try_ids id)
-  | _ -> (c_lhs, transl_guard c_guard c_rhs)
-
-and transl_cases_try cases =
-  let cases =
-    Ext_list.filter cases (fun c -> c.c_rhs.exp_desc <> Texp_unreachable)
-  in
-  List.map transl_case_try cases
-
-and transl_apply ?(inlined = Default_inline) ?(uncurried_partial_application=None) lam sargs loc =
-  let lapply funct args =
-    match funct with
-    (* Attention: This may not be what we need to change the application arity*)
-    | Lapply ap -> Lapply { ap with ap_args = ap.ap_args @ args; ap_loc = loc }
-    | lexp ->
-        Lapply
-          { ap_loc = loc; ap_func = lexp; ap_args = args; ap_inlined = inlined }
-  in
-  let rec build_apply lam args = function
-    | (None, optional) :: l ->
-        let defs = ref [] in
-        let protect name lam =
-          match lam with
-          | Lvar _ | Lconst _ -> lam
-          | _ ->
-              let id = Ident.create name in
-              defs := (id, lam) :: !defs;
-              Lvar id
-        in
-        let args, args' =
-          if List.for_all (fun (_, opt) -> opt) args then ([], args)
-          else (args, [])
-        in
-        let lam =
-          if args = [] then lam else lapply lam (List.rev_map fst args)
-        in
-        let handle = protect "func" lam
-        and l =
-          List.map (fun (arg, opt) -> (may_map (protect "arg") arg, opt)) l
-        and id_arg = Ident.create "param" in
-        let body =
-          match build_apply handle ((Lvar id_arg, optional) :: args') l with
-          | Lfunction { params = ids; body = lam; attr; loc } ->
-              Lfunction { params = id_arg :: ids; body = lam; attr; loc }
-          | lam ->
-              Lfunction
-                {
-                  params = [ id_arg ];
-                  body = lam;
-                  attr = default_stub_attribute;
-                  loc;
-                }
-        in
-        List.fold_left
-          (fun body (id, lam) -> Llet (Strict, Pgenval, id, lam, body))
-          body !defs
-    | (Some arg, optional) :: l -> build_apply lam ((arg, optional) :: args) l
-    | [] -> lapply lam (List.rev_map fst args)
-  in
-  match uncurried_partial_application with
-  | Some arity ->
-    let extra_arity = arity - List.length sargs in
-    let none_ids = ref [] in
-    let args = Ext_list.filter_map sargs (function
-     | _, Some e ->
-        Some (transl_exp e)
-     | _, None ->
-        let id_arg = Ident.create "none" in
-        none_ids := id_arg :: !none_ids;
-        Some (Lvar id_arg)) in
-    let extra_ids = ref [] in
-    extra_ids := Ident.create "extra" :: !extra_ids;
-    let extra_ids = Array.init extra_arity (fun _ -> Ident.create "extra") |> Array.to_list in
-    let extra_args = Ext_list.map extra_ids (fun id -> Lvar id) in
-    let ap_args = args @ extra_args in
-    let l0 = Lapply { ap_func = lam; ap_args; ap_inlined = inlined; ap_loc = loc } in
-    Lfunction
-      {
-        params = List.rev_append !none_ids extra_ids ;
-        body = l0;
-        attr = default_function_attribute;
-        loc;
-      }
-  | _ ->
-    (build_apply lam []
-      (List.map
-          (fun (l, x) -> (may_map transl_exp x, Btype.is_optional l))
-          sargs)
-      : Lambda.lambda)
-
-and transl_function loc partial param cases =
-  match cases with
-  | [
-   {
-     c_lhs = pat;
-     c_guard = None;
-     c_rhs =
-       {
-         exp_desc =
-           Texp_function
-             { arg_label = _; param = param'; cases; partial = partial' };
-       } as exp;
-   };
-  ]
-    when Parmatch.inactive ~partial pat && not (exp |> has_async_attribute) ->
-      let params, body, return_unit =
-        transl_function exp.exp_loc partial' param' cases
-      in
-      ( param :: params,
-        Matching.for_function loc None (Lvar param) [ (pat, body) ] partial,
-        return_unit )
-  | { c_rhs = { exp_env; exp_type }; _ } :: _ ->
-      ( [ param ],
-        Matching.for_function loc None (Lvar param) (transl_cases cases) partial,
-        is_base_type exp_env exp_type Predef.path_unit )
-  | _ -> assert false
-
-and transl_let rec_flag pat_expr_list body =
-  match rec_flag with
-  | Nonrecursive ->
-      let rec transl = function
-        | [] -> body
-        | { vb_pat = pat; vb_expr = expr; vb_attributes = attr; vb_loc } :: rem
-          ->
-            let lam = transl_exp expr in
-            let lam = Translattribute.add_inline_attribute lam vb_loc attr in
-            Matching.for_let pat.pat_loc lam pat (transl rem)
-      in
-      transl pat_expr_list
-  | Recursive ->
-      let transl_case { vb_expr = expr; vb_attributes; vb_loc; vb_pat = pat } =
-        let id =
-          match pat.pat_desc with
-          | Tpat_var (id, _) -> id
-          | Tpat_alias ({ pat_desc = Tpat_any }, id, _) -> id
-          | _ -> assert false
-          (* Illegal_letrec_pat
-             Only variables are allowed as left-hand side of `let rec'
-          *)
-        in
-        let lam = transl_exp expr in
-        let lam =
-          Translattribute.add_inline_attribute lam vb_loc vb_attributes
-        in
-        (id, lam)
-      in
-      Lletrec (Ext_list.map pat_expr_list transl_case, body)
-
-and transl_record loc env fields repres opt_init_expr =
-  match (opt_init_expr, repres, fields) with
-  | None, Record_unboxed _, [| ({ lbl_name; lbl_loc }, Overridden (_, expr)) |]
-    ->
-      (* ReScript uncurried encoding *)
-      let loc = lbl_loc in
-      let lambda = transl_exp expr in
-      if lbl_name.[0] = 'I' then
-        let arity_s = String.sub lbl_name 1 (String.length lbl_name - 1) in
-        let prim =
-          Primitive.make ~name:"#fn_mk" ~alloc:true ~native_name:arity_s
-            ~native_repr_args:[ Same_as_ocaml_repr ]
-            ~native_repr_res:Same_as_ocaml_repr
-        in
-        Lprim
-          ( Pccall prim
-            (* could be replaced with Opaque in the future except arity 0*),
-            [ lambda ],
-            loc )
-      else lambda
-  | _ -> (
-      let size = Array.length fields in
-      (* Determine if there are "enough" fields (only relevant if this is a
-         functional-style record update *)
-      let no_init = match opt_init_expr with None -> true | _ -> false in
-      if
-        no_init || (size < 20 && (match repres with Record_optional_labels _ -> false | _ -> true))
-        (* TODO: More strategies
-           3 + 2 * List.length lbl_expr_list >= size (density)
-        *)
-      then
-        (* Allocate new record with given fields (and remaining fields
-           taken from init_expr if any *)
-        let init_id = Ident.create "init" in
-        let lv =
-          Array.mapi
-            (fun i (lbl, definition) ->
-              match definition with
-              | Kept _ ->
-                  let access =
-                    match repres with
-                    | Record_float_unused -> assert false
-                    | Record_regular | Record_optional_labels _ ->
-                        Pfield (i, Lambda.fld_record lbl)
-                    | Record_inlined _ ->
-                        Pfield (i, Lambda.fld_record_inline lbl)
-                    | Record_unboxed _ -> assert false
-                    | Record_extension ->
-                        Pfield
-                          (i + 1, Lambda.fld_record_extension lbl)
-                  in
-                  Lprim (access, [ Lvar init_id ], loc)
-              | Overridden (_lid, expr) -> transl_exp expr)
-            fields
-        in
-        let ll = Array.to_list lv in
-        let mut =
-          if Array.exists (fun (lbl, _) -> lbl.lbl_mut = Mutable) fields then
-            Mutable
-          else Immutable
-        in
-        let lam =
-          try
-            if mut = Mutable then raise Not_constant;
-            let cl = List.map extract_constant ll in
-            match repres with
-            | Record_float_unused -> assert false
-            | Record_regular ->
-                Lconst
-                  (Const_block (Lambda.blk_record fields mut Record_regular, cl))
-            | Record_optional_labels _ ->
-                Lconst
-                  (Const_block (Lambda.blk_record fields mut Record_optional, cl))
-            | Record_inlined { tag; name; num_nonconsts; optional_labels; attrs } ->
-                Lconst
-                  (Const_block
-                     ( Lambda.blk_record_inlined fields name num_nonconsts optional_labels ~tag ~attrs
-                         mut,
-                       cl ))
-            | Record_unboxed _ ->
-                Lconst (match cl with [ v ] -> v | _ -> assert false)
-            | Record_extension -> raise Not_constant
-          with Not_constant -> (
-            match repres with
-            | Record_regular ->
-                Lprim
-                  ( Pmakeblock (Lambda.blk_record fields mut Record_regular),
-                    ll,
-                    loc )
-            | Record_optional_labels _ ->
-                Lprim
-                  ( Pmakeblock (Lambda.blk_record fields mut Record_optional),
-                    ll,
-                    loc )
-            | Record_float_unused -> assert false
-            | Record_inlined { tag; name; num_nonconsts; optional_labels; attrs } ->
-                Lprim
-                  ( Pmakeblock
-                      (Lambda.blk_record_inlined fields name num_nonconsts optional_labels ~tag ~attrs
-                         mut),
-                    ll,
-                    loc )
-            | Record_unboxed _ -> (
-                match ll with [ v ] -> v | _ -> assert false)
-            | Record_extension ->
-                let path =
-                  let label, _ = fields.(0) in
-                  match label.lbl_res.desc with
-                  | Tconstr (p, _, _) -> p
-                  | _ -> assert false
-                in
-                let slot = transl_extension_path env path in
-                Lprim
-                  ( Pmakeblock (Lambda.blk_record_ext fields mut),
-                    slot :: ll,
-                    loc ))
-        in
-        match opt_init_expr with
-        | None -> lam
-        | Some init_expr ->
-            Llet (Strict, Pgenval, init_id, transl_exp init_expr, lam)
-      else
-        (* Take a shallow copy of the init record, then mutate the fields
-           of the copy *)
-        let copy_id = Ident.create "newrecord" in
-        let update_field cont (lbl, definition) =
-          match definition with
-          | Kept _type -> cont
-          | Overridden (_lid, expr) ->
-              let upd =
-                match repres with
-                | Record_float_unused -> assert false
-                | Record_regular | Record_optional_labels _ ->
-                    Psetfield (lbl.lbl_pos, Lambda.fld_record_set lbl)
-                | Record_inlined _ ->
-                    Psetfield (lbl.lbl_pos, Lambda.fld_record_inline_set lbl)
-                | Record_unboxed _ -> assert false
-                | Record_extension ->
-                    Psetfield
-                      (lbl.lbl_pos + 1, Lambda.fld_record_extension_set lbl)
-              in
-              Lsequence
-                (Lprim (upd, [ Lvar copy_id; transl_exp expr ], loc), cont)
-        in
-        match opt_init_expr with
-        | None -> assert false
-        | Some init_expr ->
-            Llet
-              ( Strict,
-                Pgenval,
-                copy_id,
-                Lprim (Pduprecord, [ transl_exp init_expr ], loc),
-                Array.fold_left update_field (Lvar copy_id) fields ))
-
-and transl_match e arg pat_expr_list exn_pat_expr_list partial =
-  let id = Typecore.name_pattern "exn" exn_pat_expr_list
-  and cases = transl_cases pat_expr_list
-  and exn_cases = transl_cases_try exn_pat_expr_list in
-  let static_catch body val_ids handler =
-    let static_exception_id = next_negative_raise_count () in
-    Lstaticcatch
-      ( Ltrywith
-          ( Lstaticraise (static_exception_id, body),
-            id,
-            Matching.for_trywith (Lvar id) exn_cases ),
-        (static_exception_id, val_ids),
-        handler )
-  in
-  match (arg, exn_cases) with
-  | { exp_desc = Texp_tuple argl }, [] ->
-      Matching.for_multiple_match e.exp_loc (transl_list argl) cases partial
-  | { exp_desc = Texp_tuple argl }, _ :: _ ->
-      let val_ids = List.map (fun _ -> Typecore.name_pattern "val" []) argl in
-      let lvars = List.map (fun id -> Lvar id) val_ids in
-      static_catch (transl_list argl) val_ids
-        (Matching.for_multiple_match e.exp_loc lvars cases partial)
-  | arg, [] ->
-      Matching.for_function e.exp_loc None (transl_exp arg) cases partial
-  | arg, _ :: _ ->
-      let val_id = Typecore.name_pattern "val" pat_expr_list in
-      static_catch [ transl_exp arg ] [ val_id ]
-        (Matching.for_function e.exp_loc None (Lvar val_id) cases partial)
-
-open Format
-
-let report_error ppf = function
-  | Unknown_builtin_primitive prim_name ->
-      fprintf ppf "Unknown builtin primitive \"%s\"" prim_name
-  | Unreachable_reached -> fprintf ppf "Unreachable expression was reached"
-
-let () =
-  Location.register_error_of_exn (function
-    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
-    | _ -> None)
diff --git a/jscomp/ml/translmod.ml b/jscomp/ml/translmod.ml
deleted file mode 100644
index 8815209..0000000
--- a/jscomp/ml/translmod.ml
+++ /dev/null
@@ -1,535 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Translation from typed abstract syntax to lambda terms,
-   for the module language *)
-
-open Typedtree
-
-type error = Conflicting_inline_attributes | Fragile_pattern_in_toplevel
-
-exception Error of Location.t * error
-
-(* Keep track of the root path (from the root of the namespace to the
-   currently compiled module expression).  Useful for naming extensions. *)
-
-let global_path glob : Path.t option = Some (Pident glob)
-
-let is_top (rootpath : Path.t option) =
-  match rootpath with Some (Pident _) -> true | _ -> false
-
-let functor_path path param : Path.t option =
-  match path with None -> None | Some p -> Some (Papply (p, Pident param))
-
-let field_path path field : Path.t option =
-  match path with
-  | None -> None
-  | Some p -> Some (Pdot (p, Ident.name field, Path.nopos))
-
-(* Compile type extensions *)
-
-let transl_type_extension env rootpath (tyext : Typedtree.type_extension) body :
-    Lambda.lambda =
-  List.fold_right
-    (fun ext body ->
-      let lam =
-        Translcore.transl_extension_constructor env
-          (field_path rootpath ext.ext_id)
-          ext
-      in
-      Lambda.Llet (Strict, Pgenval, ext.ext_id, lam, body))
-    tyext.tyext_constructors body
-
-(* Compile a coercion *)
-
-let rec apply_coercion loc strict (restr : Typedtree.module_coercion) arg =
-  match restr with
-  | Tcoerce_none -> arg
-  | Tcoerce_structure (pos_cc_list, id_pos_list, runtime_fields) ->
-      Lambda.name_lambda strict arg (fun id ->
-          let get_field_name name pos =
-            Lambda.Lprim (Pfield (pos, Fld_module { name }), [ Lvar id ], loc)
-          in
-          let lam =
-            Lambda.Lprim
-              ( Pmakeblock (Blk_module runtime_fields),
-                Ext_list.map2 pos_cc_list runtime_fields (fun (pos, cc) name ->
-                    apply_coercion loc Alias cc
-                      (Lprim
-                         (Pfield (pos, Fld_module { name }), [ Lvar id ], loc))),
-                loc )
-          in
-          wrap_id_pos_list loc id_pos_list get_field_name lam)
-  | Tcoerce_functor (cc_arg, cc_res) ->
-      let param = Ident.create "funarg" in
-      let carg = apply_coercion loc Alias cc_arg (Lvar param) in
-      apply_coercion_result loc strict arg [ param ] [ carg ] cc_res
-  | Tcoerce_primitive { pc_loc; pc_desc; pc_env; pc_type } ->
-      Translcore.transl_primitive pc_loc pc_desc pc_env pc_type
-  | Tcoerce_alias (path, cc) ->
-      Lambda.name_lambda strict arg (fun _ ->
-          apply_coercion loc Alias cc (Lambda.transl_normal_path path))
-
-and apply_coercion_result loc strict funct params args cc_res =
-  match cc_res with
-  | Tcoerce_functor (cc_arg, cc_res) ->
-      let param = Ident.create "funarg" in
-      let arg = apply_coercion loc Alias cc_arg (Lvar param) in
-      apply_coercion_result loc strict funct (param :: params) (arg :: args)
-        cc_res
-  | _ ->
-      Lambda.name_lambda strict funct (fun id ->
-          Lfunction
-            {
-              params = List.rev params;
-              attr =
-                {
-                  Lambda.default_function_attribute with
-                  is_a_functor = true;
-                  stub = true;
-                };
-              loc;
-              body =
-                apply_coercion loc Strict cc_res
-                  (Lapply
-                     {
-                       ap_loc = loc;
-                       ap_func = Lvar id;
-                       ap_args = List.rev args;
-                       ap_inlined = Default_inline;
-                     });
-            })
-
-and wrap_id_pos_list loc id_pos_list get_field lam =
-  let fv = Lambda.free_variables lam in
-  (*Format.eprintf "%a@." Printlambda.lambda lam;
-    IdentSet.iter (fun id -> Format.eprintf "%a " Ident.print id) fv;
-    Format.eprintf "@.";*)
-  let lam, s =
-    List.fold_left
-      (fun (lam, s) (id', pos, c) ->
-        if Lambda.IdentSet.mem id' fv then
-          let id'' = Ident.create (Ident.name id') in
-          ( Lambda.Llet
-              ( Alias,
-                Pgenval,
-                id'',
-                apply_coercion loc Alias c (get_field (Ident.name id') pos),
-                lam ),
-            Ident.add id' (Lambda.Lvar id'') s )
-        else (lam, s))
-      (lam, Ident.empty) id_pos_list
-  in
-  if s == Ident.empty then lam else Lambda.subst_lambda s lam
-
-(* Compose two coercions
-   apply_coercion c1 (apply_coercion c2 e) behaves like
-   apply_coercion (compose_coercions c1 c2) e. *)
-
-let rec compose_coercions c1 c2 =
-  match (c1, c2) with
-  | Tcoerce_none, c2 -> c2
-  | c1, Tcoerce_none -> c1
-  | ( Tcoerce_structure (pc1, ids1, runtime_fields1),
-      Tcoerce_structure (pc2, ids2, _runtime_fields2) ) ->
-      let v2 = Array.of_list pc2 in
-      let ids1 =
-        List.map
-          (fun (id, pos1, c1) ->
-            let pos2, c2 = v2.(pos1) in
-            (id, pos2, compose_coercions c1 c2))
-          ids1
-      in
-      Tcoerce_structure
-        ( List.map
-            (function
-              | (_p1, Tcoerce_primitive _) as x ->
-                  x (* (p1, Tcoerce_primitive p) *)
-              | p1, c1 ->
-                  let p2, c2 = v2.(p1) in
-                  (p2, compose_coercions c1 c2))
-            pc1,
-          ids1 @ ids2,
-          runtime_fields1 )
-  | Tcoerce_functor (arg1, res1), Tcoerce_functor (arg2, res2) ->
-      Tcoerce_functor (compose_coercions arg2 arg1, compose_coercions res1 res2)
-  | c1, Tcoerce_alias (path, c2) -> Tcoerce_alias (path, compose_coercions c1 c2)
-  | _, _ -> Misc.fatal_error "Translmod.compose_coercions"
-
-(*
-let apply_coercion a b c =
-  Format.eprintf "@[<2>apply_coercion@ %a@]@." Includemod.print_coercion b;
-  apply_coercion a b c
-
-let compose_coercions c1 c2 =
-  let c3 = compose_coercions c1 c2 in
-  let open Includemod in
-  Format.eprintf "@[<2>compose_coercions@ (%a)@ (%a) =@ %a@]@."
-    print_coercion c1 print_coercion c2 print_coercion c3;
-  c3
-*)
-
-(* Record the primitive declarations occurring in the module compiled *)
-
-let rec pure_module m : Lambda.let_kind =
-  match m.mod_desc with
-  | Tmod_ident _ -> Alias
-  | Tmod_constraint (m, _, _, _) -> pure_module m
-  | _ -> Strict
-
-(* Generate lambda-code for a reordered list of bindings *)
-
-(* Extract the list of "value" identifiers bound by a signature.
-   "Value" identifiers are identifiers for signature components that
-   correspond to a run-time value: values, extensions, modules, classes.
-   Note: manifest primitives do not correspond to a run-time value! *)
-
-let rec bound_value_identifiers : Types.signature_item list -> Ident.t list =
-  function
-  | [] -> []
-  | Sig_value (id, { val_kind = Val_reg }) :: rem ->
-      id :: bound_value_identifiers rem
-  | Sig_typext (id, _, _) :: rem -> id :: bound_value_identifiers rem
-  | Sig_module (id, _, _) :: rem -> id :: bound_value_identifiers rem
-  | Sig_class _ :: _ -> assert false
-  | _ :: rem -> bound_value_identifiers rem
-
-(* Compile one or more functors, merging curried functors to produce
-   multi-argument functors.  Any [@inline] attribute on a functor that is
-   merged must be consistent with any other [@inline] attribute(s) on the
-   functor(s) being merged with.  Such an attribute will be placed on the
-   resulting merged functor. *)
-
-let merge_inline_attributes (attr1 : Lambda.inline_attribute)
-    (attr2 : Lambda.inline_attribute) loc =
-  match (attr1, attr2) with
-  | Lambda.Default_inline, _ -> attr2
-  | _, Lambda.Default_inline -> attr1
-  | _, _ ->
-      if attr1 = attr2 then attr1
-      else raise (Error (loc, Conflicting_inline_attributes))
-
-let merge_functors mexp coercion root_path =
-  let rec merge mexp coercion path acc inline_attribute =
-    let finished = (acc, mexp, path, coercion, inline_attribute) in
-    match mexp.mod_desc with
-    | Tmod_functor (param, _, _, body) ->
-        let inline_attribute' =
-          Translattribute.get_inline_attribute mexp.mod_attributes
-        in
-        let arg_coercion, res_coercion =
-          match coercion with
-          | Tcoerce_none -> (Tcoerce_none, Tcoerce_none)
-          | Tcoerce_functor (arg_coercion, res_coercion) ->
-              (arg_coercion, res_coercion)
-          | _ -> Misc.fatal_error "Translmod.merge_functors: bad coercion"
-        in
-        let loc = mexp.mod_loc in
-        let path = functor_path path param in
-        let inline_attribute =
-          merge_inline_attributes inline_attribute inline_attribute' loc
-        in
-        merge body res_coercion path
-          ((param, loc, arg_coercion) :: acc)
-          inline_attribute
-    | _ -> finished
-  in
-  merge mexp coercion root_path [] Default_inline
-
-let export_identifiers : Ident.t list ref = ref []
-
-let rec compile_functor mexp coercion root_path loc =
-  let functor_params_rev, body, body_path, res_coercion, inline_attribute =
-    merge_functors mexp coercion root_path
-  in
-  assert (functor_params_rev <> []);
-  (* cf. [transl_module] *)
-  let params, body =
-    List.fold_left
-      (fun (params, body) (param, loc, arg_coercion) ->
-        let param' = Ident.rename param in
-        let arg = apply_coercion loc Alias arg_coercion (Lvar param') in
-        let params = param' :: params in
-        let body = Lambda.Llet (Alias, Pgenval, param, arg, body) in
-        (params, body))
-      ([], transl_module res_coercion body_path body)
-      functor_params_rev
-  in
-  Lambda.Lfunction
-    {
-      params;
-      attr =
-        {
-          inline = inline_attribute;
-          is_a_functor = true;
-          stub = false;
-          return_unit = false;
-          async = false;
-          oneUnitArg = false;
-        };
-      loc;
-      body;
-    }
-
-(* Compile a module expression *)
-and transl_module cc rootpath mexp =
-  List.iter (Translattribute.check_attribute_on_module mexp) mexp.mod_attributes;
-  let loc = mexp.mod_loc in
-  match mexp.mod_type with
-  | Mty_alias (Mta_absent, _) ->
-      apply_coercion loc Alias cc Lambda.lambda_module_alias
-  | _ -> (
-      match mexp.mod_desc with
-      | Tmod_ident (path, _) ->
-          apply_coercion loc Strict cc
-            (Lambda.transl_module_path ~loc mexp.mod_env path)
-      | Tmod_structure str -> fst (transl_struct loc [] cc rootpath str)
-      | Tmod_functor _ -> compile_functor mexp cc rootpath loc
-      | Tmod_apply (funct, arg, ccarg) ->
-          let inlined_attribute, funct =
-            Translattribute.get_and_remove_inlined_attribute_on_module funct
-          in
-          apply_coercion loc Strict cc
-            (Lapply
-               {
-                 ap_loc = loc;
-                 ap_func = transl_module Tcoerce_none None funct;
-                 ap_args = [ transl_module ccarg None arg ];
-                 ap_inlined = inlined_attribute;
-               })
-      | Tmod_constraint (arg, _, _, ccarg) ->
-          transl_module (compose_coercions cc ccarg) rootpath arg
-      | Tmod_unpack (arg, _) ->
-          apply_coercion loc Strict cc (Translcore.transl_exp arg))
-
-and transl_struct loc fields cc rootpath str =
-  transl_structure loc fields cc rootpath str.str_final_env str.str_items
-
-and transl_structure loc fields cc rootpath final_env = function
-  | [] -> (
-      let is_top_root_path = is_top rootpath in
-
-      match cc with
-      | Tcoerce_none ->
-          let block_fields =
-            List.fold_left
-              (fun acc id ->
-                if is_top_root_path then
-                  export_identifiers := id :: !export_identifiers;
-                Lambda.Lvar id :: acc)
-              [] fields
-          in
-          ( Lambda.Lprim
-              ( Pmakeblock
-                  (if is_top_root_path then
-                   Blk_module_export !export_identifiers
-                  else
-                    Blk_module (List.rev_map (fun id -> id.Ident.name) fields)),
-                block_fields,
-                loc ),
-            List.length fields )
-      | Tcoerce_structure (pos_cc_list, id_pos_list, runtime_fields) ->
-          (* Do not ignore id_pos_list ! *)
-          (*Format.eprintf "%a@.@[" Includemod.print_coercion cc;
-            List.iter (fun l -> Format.eprintf "%a@ " Ident.print l)
-              fields;
-            Format.eprintf "@]@.";*)
-          assert (List.length runtime_fields = List.length pos_cc_list);
-          let v = Ext_array.reverse_of_list fields in
-          let get_field pos = Lambda.Lvar v.(pos)
-          and ids =
-            List.fold_right Lambda.IdentSet.add fields Lambda.IdentSet.empty
-          in
-          let get_field_name _name = get_field in
-          let result =
-            List.fold_right
-              (fun (pos, cc) code ->
-                match cc with
-                | Tcoerce_primitive p ->
-                    if is_top rootpath then
-                      export_identifiers := p.pc_id :: !export_identifiers;
-                    Translcore.transl_primitive p.pc_loc p.pc_desc p.pc_env
-                      p.pc_type
-                    :: code
-                | _ ->
-                    if is_top rootpath then
-                      export_identifiers := v.(pos) :: !export_identifiers;
-                    apply_coercion loc Strict cc (get_field pos) :: code)
-              pos_cc_list []
-          in
-          let lam =
-            Lambda.Lprim
-              ( Pmakeblock
-                  (if is_top_root_path then
-                   Blk_module_export !export_identifiers
-                  else Blk_module runtime_fields),
-                result,
-                loc )
-          and id_pos_list =
-            Ext_list.filter id_pos_list (fun (id, _, _) ->
-                not (Lambda.IdentSet.mem id ids))
-          in
-          ( wrap_id_pos_list loc id_pos_list get_field_name lam,
-            List.length pos_cc_list )
-      | _ -> Misc.fatal_error "Translmod.transl_structure")
-  | item :: rem -> (
-      match item.str_desc with
-      | Tstr_eval (expr, _) ->
-          let body, size =
-            transl_structure loc fields cc rootpath final_env rem
-          in
-          (Lsequence (Translcore.transl_exp expr, body), size)
-      | Tstr_value (rec_flag, pat_expr_list) ->
-          let ext_fields = rev_let_bound_idents pat_expr_list @ fields in
-          let body, size =
-            transl_structure loc ext_fields cc rootpath final_env rem
-          in
-          (* Recursve already excludes complex pattern bindings*)
-          if is_top rootpath && rec_flag = Nonrecursive then
-            Ext_list.iter pat_expr_list (fun { vb_pat } ->
-                match vb_pat.pat_desc with
-                | Tpat_var _ | Tpat_alias _ -> ()
-                | _ ->
-                    if not (Parmatch.irrefutable vb_pat) then
-                      raise
-                        (Error (vb_pat.pat_loc, Fragile_pattern_in_toplevel)));
-          (Translcore.transl_let rec_flag pat_expr_list body, size)
-      | Tstr_typext tyext ->
-          let ids = List.map (fun ext -> ext.ext_id) tyext.tyext_constructors in
-          let body, size =
-            transl_structure loc
-              (List.rev_append ids fields)
-              cc rootpath final_env rem
-          in
-          (transl_type_extension item.str_env rootpath tyext body, size)
-      | Tstr_exception ext ->
-          let id = ext.ext_id in
-          let path = field_path rootpath id in
-          let body, size =
-            transl_structure loc (id :: fields) cc rootpath final_env rem
-          in
-          ( Llet
-              ( Strict,
-                Pgenval,
-                id,
-                Translcore.transl_extension_constructor item.str_env path ext,
-                body ),
-            size )
-      | Tstr_module mb as s ->
-          let id = mb.mb_id in
-          let body, size =
-            transl_structure loc
-              (if Typemod.rescript_hide s then fields else id :: fields)
-              cc rootpath final_env rem
-          in
-          let module_body =
-            transl_module Tcoerce_none (field_path rootpath id) mb.mb_expr
-          in
-          let module_body =
-            Translattribute.add_inline_attribute module_body mb.mb_loc
-              mb.mb_attributes
-          in
-          (Llet (pure_module mb.mb_expr, Pgenval, id, module_body, body), size)
-      | Tstr_recmodule bindings ->
-          let ext_fields =
-            List.rev_append (List.map (fun mb -> mb.mb_id) bindings) fields
-          in
-          let body, size =
-            transl_structure loc ext_fields cc rootpath final_env rem
-          in
-          let lam =
-            Transl_recmodule.compile_recmodule
-              (fun id modl _loc ->
-                transl_module Tcoerce_none (field_path rootpath id) modl)
-              bindings body
-          in
-          (lam, size)
-      | Tstr_include incl ->
-          let ids = bound_value_identifiers incl.incl_type in
-          let modl = incl.incl_mod in
-          let mid = Ident.create "include" in
-          let rec rebind_idents pos newfields = function
-            | [] -> transl_structure loc newfields cc rootpath final_env rem
-            | id :: ids ->
-                let body, size =
-                  rebind_idents (pos + 1) (id :: newfields) ids
-                in
-                ( Llet
-                    ( Alias,
-                      Pgenval,
-                      id,
-                      Lprim
-                        ( Pfield (pos, Fld_module { name = Ident.name id }),
-                          [ Lvar mid ],
-                          incl.incl_loc ),
-                      body ),
-                  size )
-          in
-          let body, size = rebind_idents 0 fields ids in
-          ( Llet
-              ( pure_module modl,
-                Pgenval,
-                mid,
-                transl_module Tcoerce_none None modl,
-                body ),
-            size )
-      | Tstr_class _ | Tstr_primitive _ | Tstr_type _ | Tstr_modtype _
-      | Tstr_open _ | Tstr_class_type _ | Tstr_attribute _ ->
-          transl_structure loc fields cc rootpath final_env rem)
-
-(* Update forward declaration in Translcore *)
-let _ = Translcore.transl_module := transl_module
-
-(* Introduce dependencies on modules referenced only by "external". *)
-
-(* Compile an implementation *)
-
-let transl_implementation module_name (str, cc) =
-  export_identifiers := [];
-  let module_id = Ident.create_persistent module_name in
-  let body, _ = transl_struct Location.none [] cc (global_path module_id) str in
-  (body, !export_identifiers)
-
-(* Build the list of value identifiers defined by a toplevel structure
-   (excluding primitive declarations). *)
-
-(* second level idents (module M = struct ... let id = ... end),
-   and all sub-levels idents *)
-(* A variant of transl_structure used to compile toplevel structure definitions
-   for the native-code compiler. Store the defined values in the fields
-   of the global as soon as they are defined, in order to reduce register
-   pressure.  Also rewrites the defining expressions so that they
-   refer to earlier fields of the structure through the fields of
-   the global, not by their names.
-   "map" is a table from defined idents to (pos in global block, coercion).
-   "prim" is a list of (pos in global block, primitive declaration). *)
-
-(* Compile an implementation using transl_store_structure
-   (for the native-code compiler). *)
-
-(* Compile a toplevel phrase *)
-
-(* Error report *)
-
-let report_error ppf = function
-  | Conflicting_inline_attributes ->
-      Format.fprintf ppf "@[Conflicting ``inline'' attributes@]"
-  | Fragile_pattern_in_toplevel ->
-      Format.fprintf ppf "@[Such fragile pattern not allowed in the toplevel@]"
-
-let () =
-  Location.register_error_of_exn (function
-    | Error (loc, err) -> Some (Location.error_of_printer loc report_error err)
-    | _ -> None)
diff --git a/jscomp/ml/typeclass.ml b/jscomp/ml/typeclass.ml
deleted file mode 100644
index 00ea7df..0000000
--- a/jscomp/ml/typeclass.ml
+++ /dev/null
@@ -1,1105 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*          Jerome Vouillon, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Parsetree
-open Asttypes
-open Types
-open Typetexp
-open Format
-
-type 'a class_info = {
-  cls_id : Ident.t;
-  cls_id_loc : string loc;
-  cls_decl : class_declaration;
-  cls_ty_id : Ident.t;
-  cls_ty_decl : class_type_declaration;
-  cls_obj_id : Ident.t;
-  cls_obj_abbr : type_declaration;
-  cls_typesharp_id : Ident.t;
-  cls_abbr : type_declaration;
-  cls_arity : int;
-  cls_pub_methods : string list;
-  cls_info : 'a;
-}
-
-type class_type_info = {
-  clsty_ty_id : Ident.t;
-  clsty_id_loc : string loc;
-  clsty_ty_decl : class_type_declaration;
-  clsty_obj_id : Ident.t;
-  clsty_obj_abbr : type_declaration;
-  clsty_typesharp_id : Ident.t;
-  clsty_abbr : type_declaration;
-  clsty_info : Typedtree.class_type_declaration;
-}
-
-type error =
-    Unconsistent_constraint of (type_expr * type_expr) list
-  | Field_type_mismatch of string * string * (type_expr * type_expr) list
-  | Structure_expected of class_type
-  | Pattern_type_clash of type_expr
-  | Repeated_parameter
-  | Unbound_class_type_2 of Longident.t
-  | Abbrev_type_clash of type_expr * type_expr * type_expr
-  | Constructor_type_mismatch of string * (type_expr * type_expr) list
-  | Virtual_class of bool * bool * string list * string list
-  | Parameter_arity_mismatch of Longident.t * int * int
-  | Parameter_mismatch of (type_expr * type_expr) list
-  | Bad_parameters of Ident.t * type_expr * type_expr
- 
-  | Unbound_type_var of (formatter -> unit) * Ctype.closed_class_failure
-  | Non_generalizable_class of Ident.t * Types.class_declaration
-  | Cannot_coerce_self of type_expr
-  | Non_collapsable_conjunction of
-      Ident.t * Types.class_declaration * (type_expr * type_expr) list
-  | No_overriding of string * string
- 
-
-exception Error of Location.t * Env.t * error
-exception Error_forward of Location.error
-
-open Typedtree
-
-let ctyp desc typ env loc =
-  { ctyp_desc = desc; ctyp_type = typ; ctyp_loc = loc; ctyp_env = env;
-    ctyp_attributes = [] }
-
-                       (**********************)
-                       (*  Useful constants  *)
-                       (**********************)
-
-
-(*
-   Self type have a dummy private method, thus preventing it to become
-   closed.
-*)
-let dummy_method = Btype.dummy_method
-
-(*
-   Path associated to the temporary class type of a class being typed
-   (its constructor is not available).
-*)
-let unbound_class = Path.Pident (Ident.create "*undef*")
-
-
-                (************************************)
-                (*  Some operations on class types  *)
-                (************************************)
-
-
-(* Fully expand the head of a class type *)
-let rec scrape_class_type =
-  function
-    Cty_constr (_, _, cty) -> scrape_class_type cty
-  | cty                     -> cty
-
-(* Generalize a class type *)
-let rec generalize_class_type gen =
-  function
-    Cty_constr (_, params, cty) ->
-      List.iter gen params;
-      generalize_class_type gen cty
-  | Cty_signature {csig_self = sty; csig_vars = vars; csig_inher = inher} ->
-      gen sty;
-      Vars.iter (fun _ (_, _, ty) -> gen ty) vars;
-      List.iter (fun (_,tl) -> List.iter gen tl) inher
-  | Cty_arrow (_, ty, cty) ->
-      gen ty;
-      generalize_class_type gen cty
-
-let generalize_class_type vars =
-  let gen = if vars then Ctype.generalize else Ctype.generalize_structure in
-  generalize_class_type gen
-
-(* Return the virtual methods of a class type *)
-let virtual_methods sign =
-  let (fields, _) =
-    Ctype.flatten_fields (Ctype.object_fields sign.Types.csig_self)
-  in
-  List.fold_left
-    (fun virt (lab, _, _) ->
-       if lab = dummy_method then virt else
-       if Concr.mem lab sign.csig_concr then virt else
-       lab::virt)
-    [] fields
-
-(* Return the constructor type associated to a class type *)
-let rec constructor_type constr cty =
-  match cty with
-    Cty_constr (_, _, cty) ->
-      constructor_type constr cty
-  | Cty_signature _ ->
-      constr
-  | Cty_arrow (l, ty, cty) ->
-      Ctype.newty (Tarrow (l, ty, constructor_type constr cty, Cok))
-
-let rec class_body cty =
-  match cty with
-    Cty_constr _ ->
-      cty (* Only class bodies can be abbreviated *)
-  | Cty_signature _ ->
-      cty
-  | Cty_arrow (_, _, cty) ->
-      class_body cty
-
-
-(* Check that all type variables are generalizable *)
-(* Use Env.empty to prevent expansion of recursively defined object types;
-   cf. typing-poly/poly.ml *)
-let rec closed_class_type =
-  function
-    Cty_constr (_, params, _) ->
-      List.for_all (Ctype.closed_schema Env.empty) params
-  | Cty_signature sign ->
-      Ctype.closed_schema Env.empty sign.csig_self
-        &&
-      Vars.fold (fun _ (_, _, ty) cc -> Ctype.closed_schema Env.empty ty && cc)
-        sign.csig_vars
-        true
-  | Cty_arrow (_, ty, cty) ->
-      Ctype.closed_schema Env.empty ty
-        &&
-      closed_class_type cty
-
-let closed_class cty =
-  List.for_all (Ctype.closed_schema Env.empty) cty.cty_params
-    &&
-  closed_class_type cty.cty_type
-
-let rec limited_generalize rv =
-  function
-    Cty_constr (_path, params, cty) ->
-      List.iter (Ctype.limited_generalize rv) params;
-      limited_generalize rv cty
-  | Cty_signature sign ->
-      Ctype.limited_generalize rv sign.csig_self;
-      Vars.iter (fun _ (_, _, ty) -> Ctype.limited_generalize rv ty)
-        sign.csig_vars;
-      List.iter (fun (_, tl) -> List.iter (Ctype.limited_generalize rv) tl)
-        sign.csig_inher
-  | Cty_arrow (_, ty, cty) ->
-      Ctype.limited_generalize rv ty;
-      limited_generalize rv cty
-
-
-
-                (***********************************)
-                (*  Primitives for typing classes  *)
-                (***********************************)
-
-
-
-(* Enter an instance variable in the environment *)
-let concr_vals vars =
-  Vars.fold
-    (fun id (_, vf, _) s -> if vf = Virtual then s else Concr.add id s)
-    vars Concr.empty
-
-let inheritance self_type env ovf concr_meths warn_vals loc parent =
-  match scrape_class_type parent with
-    Cty_signature cl_sig ->
-
-      (* Methods *)
-      begin try
-        Ctype.unify env self_type cl_sig.csig_self
-      with Ctype.Unify trace ->
-        match trace with
-          _::_::_::({desc = Tfield(n, _, _, _)}, _)::rem ->
-            raise(Error(loc, env, Field_type_mismatch ("method", n, rem)))
-        | _ ->
-            assert false
-      end;
-
-      (* Overriding *)
-      let over_meths = Concr.inter cl_sig.csig_concr concr_meths in
-      let concr_vals = concr_vals cl_sig.csig_vars in
-      let over_vals = Concr.inter concr_vals warn_vals in
-      begin match ovf with
-        Some Fresh ->
-          let cname =
-            match parent with
-              Cty_constr (p, _, _) -> Path.name p
-            | _ -> "inherited"
-          in
-          if not (Concr.is_empty over_meths) then
-            Location.prerr_warning loc
-              (Warnings.Method_override (cname :: Concr.elements over_meths));
-          if not (Concr.is_empty over_vals) then
-            Location.prerr_warning loc
-              (Warnings.Instance_variable_override
-                 (cname :: Concr.elements over_vals));
-      | Some Override
-        when Concr.is_empty over_meths && Concr.is_empty over_vals ->
-        raise (Error(loc, env, No_overriding ("","")))
-      | _ -> ()
-      end;
-
-      let concr_meths = Concr.union cl_sig.csig_concr concr_meths
-      and warn_vals = Concr.union concr_vals warn_vals in
-
-      (cl_sig, concr_meths, warn_vals)
-
-  | _ ->
-      raise(Error(loc, env, Structure_expected parent))
-
-
-let delayed_meth_specs = ref []
-
-let declare_method val_env meths self_type lab priv sty loc =
-  let (_, ty') =
-     Ctype.filter_self_method val_env lab priv meths self_type
-  in
-  let unif ty =
-    try Ctype.unify val_env ty ty' with Ctype.Unify trace ->
-      raise(Error(loc, val_env, Field_type_mismatch ("method", lab, trace)))
-  in
-  let sty = Ast_helper.Typ.force_poly sty in
-  match sty.ptyp_desc, priv with
-    Ptyp_poly ([],sty'), Public ->
-(* TODO: we moved the [transl_simple_type_univars] outside of the lazy,
-so that we can get an immediate value. Is that correct ? Ask Jacques. *)
-      let returned_cty = ctyp Ttyp_any (Ctype.newty Tnil) val_env loc in
-      delayed_meth_specs :=
-      Warnings.mk_lazy (fun () ->
-            let cty = transl_simple_type_univars val_env sty' in
-            let ty = cty.ctyp_type in
-            unif ty;
-            returned_cty.ctyp_desc <- Ttyp_poly ([], cty);
-            returned_cty.ctyp_type <- ty;
-          ) ::
-      !delayed_meth_specs;
-      returned_cty
-  | _ ->
-      let cty = transl_simple_type val_env false sty in
-      let ty = cty.ctyp_type in
-      unif ty;
-      cty
-
-let type_constraint val_env sty sty' loc =
-  let cty  = transl_simple_type val_env false sty in
-  let ty = cty.ctyp_type in
-  let cty' = transl_simple_type val_env false sty' in
-  let ty' = cty'.ctyp_type in
-  begin
-    try Ctype.unify val_env ty ty' with Ctype.Unify trace ->
-        raise(Error(loc, val_env, Unconsistent_constraint trace));
-  end;
-  (cty, cty')
-
-
-(*******************************)
-
-let add_val lab (mut, virt, ty) val_sig =
-  let virt =
-    try
-      let (_mut', virt', _ty') = Vars.find lab val_sig in
-      if virt' = Concrete then virt' else virt
-    with Not_found -> virt
-  in
-  Vars.add lab (mut, virt, ty) val_sig
-
-let rec class_type_field env self_type meths arg ctf =
-  Builtin_attributes.warning_scope ctf.pctf_attributes
-    (fun () -> class_type_field_aux env self_type meths arg ctf)
-
-and class_type_field_aux env self_type meths
-    (fields, val_sig, concr_meths, inher) ctf =
-
-  let loc = ctf.pctf_loc in
-  let mkctf desc =
-    { ctf_desc = desc; ctf_loc = loc; ctf_attributes = ctf.pctf_attributes }
-  in
-  match ctf.pctf_desc with
-    Pctf_inherit sparent ->
-      let parent = class_type env sparent in
-      let inher =
-        match parent.cltyp_type with
-          Cty_constr (p, tl, _) -> (p, tl) :: inher
-        | _ -> inher
-      in
-      let (cl_sig, concr_meths, _) =
-        inheritance self_type env None concr_meths Concr.empty sparent.pcty_loc
-          parent.cltyp_type
-      in
-      let val_sig =
-        Vars.fold add_val cl_sig.csig_vars val_sig in
-      (mkctf (Tctf_inherit parent) :: fields,
-       val_sig, concr_meths, inher)
-
-  | Pctf_val ({txt=lab}, mut, virt, sty) ->
-      let cty = transl_simple_type env false sty in
-      let ty = cty.ctyp_type in
-      (mkctf (Tctf_val (lab, mut, virt, cty)) :: fields,
-      add_val lab (mut, virt, ty) val_sig, concr_meths, inher)
-
-  | Pctf_method ({txt=lab}, priv, virt, sty)  ->
-      let cty =
-        declare_method env meths self_type lab priv sty  ctf.pctf_loc in
-      let concr_meths =
-        match virt with
-        | Concrete -> Concr.add lab concr_meths
-        | Virtual -> concr_meths
-      in
-      (mkctf (Tctf_method (lab, priv, virt, cty)) :: fields,
-        val_sig, concr_meths, inher)
-
-  | Pctf_constraint (sty, sty') ->
-      let (cty, cty') = type_constraint env sty sty'  ctf.pctf_loc in
-      (mkctf (Tctf_constraint (cty, cty')) :: fields,
-        val_sig, concr_meths, inher)
-
-  | Pctf_attribute x ->
-      Builtin_attributes.warning_attribute x;
-      (mkctf (Tctf_attribute x) :: fields,
-        val_sig, concr_meths, inher)
-
-  | Pctf_extension ext ->
-      raise (Error_forward (Builtin_attributes.error_of_extension ext))
-
-and class_signature env {pcsig_self=sty; pcsig_fields=sign} =
-  let meths = ref Meths.empty in
-  let self_cty = transl_simple_type env false sty in
-  let self_cty = { self_cty with
-    ctyp_type = Ctype.expand_head env self_cty.ctyp_type } in
-  let self_type =  self_cty.ctyp_type in
-
-  (* Check that the binder is a correct type, and introduce a dummy
-     method preventing self type from being closed. *)
-  let dummy_obj = Ctype.newvar () in
-  Ctype.unify env (Ctype.filter_method env dummy_method Private dummy_obj)
-    (Ctype.newty (Ttuple []));
-  begin try
-    Ctype.unify env self_type dummy_obj
-  with Ctype.Unify _ ->
-    raise(Error(sty.ptyp_loc, env, Pattern_type_clash self_type))
-  end;
-
-  (* Class type fields *)
-  let (rev_fields, val_sig, concr_meths, inher) =
-    Builtin_attributes.warning_scope []
-      (fun () ->
-         List.fold_left (class_type_field env self_type meths)
-           ([], Vars.empty, Concr.empty, [])
-           sign
-      )
-  in
-  let cty =   {csig_self = self_type;
-   csig_vars = val_sig;
-   csig_concr = concr_meths;
-   csig_inher = inher}
-  in
-  { csig_self = self_cty;
-    csig_fields = List.rev rev_fields;
-    csig_type = cty;
-  }
-
-and class_type env scty =
-  Builtin_attributes.warning_scope scty.pcty_attributes
-    (fun () -> class_type_aux env scty)
-
-and class_type_aux env scty =
-  let cltyp desc typ =
-    {
-     cltyp_desc = desc;
-     cltyp_type = typ;
-     cltyp_loc = scty.pcty_loc;
-     cltyp_env = env;
-     cltyp_attributes = scty.pcty_attributes;
-    }
-  in
-  match scty.pcty_desc with
-    Pcty_constr (lid, styl) ->
-      let (path, decl) = Typetexp.find_class_type env scty.pcty_loc lid.txt in
-      if Path.same decl.clty_path unbound_class then
-        raise(Error(scty.pcty_loc, env, Unbound_class_type_2 lid.txt));
-      let (params, clty) =
-        Ctype.instance_class decl.clty_params decl.clty_type
-      in
-      if List.length params <> List.length styl then
-        raise(Error(scty.pcty_loc, env,
-                    Parameter_arity_mismatch (lid.txt, List.length params,
-                                                   List.length styl)));
-      let ctys = List.map2
-        (fun sty ty ->
-          let cty' = transl_simple_type env false sty in
-          let ty' = cty'.ctyp_type in
-          begin
-           try Ctype.unify env ty' ty with Ctype.Unify trace ->
-                  raise(Error(sty.ptyp_loc, env, Parameter_mismatch trace))
-            end;
-            cty'
-        )       styl params
-      in
-      let typ = Cty_constr (path, params, clty) in
-      cltyp (Tcty_constr ( path, lid , ctys)) typ
-
-  | Pcty_signature pcsig ->
-      let clsig = class_signature env pcsig in
-      let typ = Cty_signature clsig.csig_type in
-      cltyp (Tcty_signature clsig) typ
-
-  | Pcty_arrow (l, sty, scty) ->
-      let cty = transl_simple_type env false sty in
-      let ty = cty.ctyp_type in
-      let ty =
-        if Btype.is_optional l
-        then Ctype.newty (Tconstr(Predef.path_option,[ty], ref Mnil))
-        else ty in
-      let clty = class_type env scty in
-      let typ = Cty_arrow (l, ty, clty.cltyp_type) in
-      cltyp (Tcty_arrow (l, cty, clty)) typ
-
-  | Pcty_open (ovf, lid, e) ->
-      let (path, newenv) = !Typecore.type_open ovf env scty.pcty_loc lid in
-      let clty = class_type newenv e in
-      cltyp (Tcty_open (ovf, path, lid, newenv, clty)) clty.cltyp_type
-
-  | Pcty_extension ext ->
-      raise (Error_forward (Builtin_attributes.error_of_extension ext))
-
-let class_type env scty =
-  delayed_meth_specs := [];
-  let cty = class_type env scty in
-  List.iter Lazy.force (List.rev !delayed_meth_specs);
-  delayed_meth_specs := [];
-  cty
-
-(*******************************)
-
-
-(*******************************)
-
-(* Approximate the type of the constructor to allow recursive use *)
-(* of optional parameters                                         *)
-
-let var_option = Predef.type_option (Btype.newgenvar ())
-
-
-let rec approx_description ct =
-  match ct.pcty_desc with
-    Pcty_arrow (l, _, ct) ->
-      let arg =
-        if Btype.is_optional l then Ctype.instance_def var_option
-        else Ctype.newvar () in
-      Ctype.newty (Tarrow (l, arg, approx_description ct, Cok))
-  | _ -> Ctype.newvar ()
-
-(*******************************)
-
-let temp_abbrev loc env id arity =
-  let params = ref [] in
-  for _i = 1 to arity do
-    params := Ctype.newvar () :: !params
-  done;
-  let ty = Ctype.newobj (Ctype.newvar ()) in
-  let env =
-    Env.add_type ~check:true id
-      {type_params = !params;
-       type_arity = arity;
-       type_kind = Type_abstract;
-       type_private = Public;
-       type_manifest = Some ty;
-       type_variance = Misc.replicate_list Variance.full arity;
-       type_newtype_level = None;
-       type_loc = loc;
-       type_attributes = []; (* or keep attrs from the class decl? *)
-       type_immediate = false;
-       type_unboxed = unboxed_false_default_false;
-      }
-      env
-  in
-  (!params, ty, env)
-
-let initial_env  approx
-    (res, env) (cl, id, ty_id, obj_id, cl_id) =
-  (* Temporary abbreviations *)
-  let arity = List.length cl.pci_params in
-  let (obj_params, obj_ty, env) = temp_abbrev cl.pci_loc env obj_id arity in
-  let (cl_params, cl_ty, env) = temp_abbrev cl.pci_loc env cl_id arity in
-
-  (* Temporary type for the class constructor *)
-  let constr_type = approx cl.pci_expr in
-  let dummy_cty =
-    Cty_signature
-      { csig_self = Ctype.newvar ();
-        csig_vars = Vars.empty;
-        csig_concr = Concr.empty;
-        csig_inher = [] }
-  in
-  let dummy_class =
-    {Types.cty_params = [];             (* Dummy value *)
-     cty_variance = [];
-     cty_type = dummy_cty;        (* Dummy value *)
-     cty_path = unbound_class;
-     cty_new =
-       begin match cl.pci_virt with
-       | Virtual  -> None
-       | Concrete -> Some constr_type
-       end;
-     cty_loc = Location.none;
-     cty_attributes = [];
-    }
-  in
-  let env =
-    Env.add_cltype ty_id
-      {clty_params = [];            (* Dummy value *)
-       clty_variance = [];
-       clty_type = dummy_cty;       (* Dummy value *)
-       clty_path = unbound_class;
-       clty_loc = Location.none;
-       clty_attributes = [];
-      } env
-  in
-  ((cl, id, ty_id,
-    obj_id, obj_params, obj_ty,
-    cl_id, cl_params, cl_ty,
-    constr_type, dummy_class)::res,
-   env)
-
-let class_infos  kind
-    (cl, id, ty_id,
-     obj_id, obj_params, obj_ty,
-     cl_id, cl_params, cl_ty,
-     constr_type, dummy_class)
-    (res, env) =
-
-  reset_type_variables ();
-  Ctype.begin_class_def ();
-
-  (* Introduce class parameters *)
-  let ci_params =
-    let make_param (sty, v) =
-      try
-          (transl_type_param env sty, v)
-      with Already_bound ->
-        raise(Error(sty.ptyp_loc, env, Repeated_parameter))
-    in
-      List.map make_param cl.pci_params
-  in
-  let params = List.map (fun (cty, _) -> cty.ctyp_type) ci_params in
-
-  (* Allow self coercions (only for class declarations) *)
-  let coercion_locs = ref [] in
-
-  (* Type the class expression *)
-  let (expr, typ) =
-    try
-      Typecore.self_coercion :=
-        (Path.Pident obj_id, coercion_locs) :: !Typecore.self_coercion;
-      let res = kind env cl.pci_expr in
-      Typecore.self_coercion := List.tl !Typecore.self_coercion;
-      res
-    with exn ->
-      Typecore.self_coercion := []; raise exn
-  in
-
-  Ctype.end_def ();
-
-  let sty = Ctype.self_type typ in
-
-  (* First generalize the type of the dummy method (cf PR#6123) *)
-  let (fields, _) = Ctype.flatten_fields (Ctype.object_fields sty) in
-  List.iter (fun (met, _, ty) -> if met = dummy_method then Ctype.generalize ty)
-    fields;
-  (* Generalize the row variable *)
-  let rv = Ctype.row_variable sty in
-  List.iter (Ctype.limited_generalize rv) params;
-  limited_generalize rv typ;
-
-  (* Check the abbreviation for the object type *)
-  let (obj_params', obj_type) = Ctype.instance_class params typ in
-  let constr = Ctype.newconstr (Path.Pident obj_id) obj_params in
-  begin
-    let ty = Ctype.self_type obj_type in
-    Ctype.hide_private_methods ty;
-    Ctype.close_object ty;
-    begin try
-      List.iter2 (Ctype.unify env) obj_params obj_params'
-    with Ctype.Unify _ ->
-      raise(Error(cl.pci_loc, env,
-            Bad_parameters (obj_id, constr,
-                            Ctype.newconstr (Path.Pident obj_id)
-                                            obj_params')))
-    end;
-    begin try
-      Ctype.unify env ty constr
-    with Ctype.Unify _ ->
-      raise(Error(cl.pci_loc, env,
-        Abbrev_type_clash (constr, ty, Ctype.expand_head env constr)))
-    end
-  end;
-
-  (* Check the other temporary abbreviation (#-type) *)
-  begin
-    let (cl_params', cl_type) = Ctype.instance_class params typ in
-    let ty = Ctype.self_type cl_type in
-    Ctype.hide_private_methods ty;
-    Ctype.set_object_name obj_id (Ctype.row_variable ty) cl_params ty;
-    begin try
-      List.iter2 (Ctype.unify env) cl_params cl_params'
-    with Ctype.Unify _ ->
-      raise(Error(cl.pci_loc, env,
-            Bad_parameters (cl_id,
-                            Ctype.newconstr (Path.Pident cl_id)
-                                            cl_params,
-                            Ctype.newconstr (Path.Pident cl_id)
-                                            cl_params')))
-    end;
-    begin try
-      Ctype.unify env ty cl_ty
-    with Ctype.Unify _ ->
-      let constr = Ctype.newconstr (Path.Pident cl_id) params in
-      raise(Error(cl.pci_loc, env, Abbrev_type_clash (constr, ty, cl_ty)))
-    end
-  end;
-
-  (* Type of the class constructor *)
-  begin try
-    Ctype.unify env
-      (constructor_type constr obj_type)
-      (Ctype.instance env constr_type)
-  with Ctype.Unify trace ->
-    raise(Error(cl.pci_loc, env,
-                Constructor_type_mismatch (cl.pci_name.txt, trace)))
-  end;
-
-  (* Class and class type temporary definitions *)
-  let cty_variance = List.map (fun _ -> Variance.full) params in
-  let cltydef =
-    {clty_params = params; clty_type = class_body typ;
-     clty_variance = cty_variance;
-     clty_path = Path.Pident obj_id;
-     clty_loc = cl.pci_loc;
-     clty_attributes = cl.pci_attributes;
-    }
-  in
-  dummy_class.cty_type <- typ;
-  let env =
-    Env.add_cltype ty_id cltydef (
-     env)
-  in
-
-  if cl.pci_virt = Concrete then begin
-    let sign = Ctype.signature_of_class_type typ in
-    let mets = virtual_methods sign in
-    let vals =
-      Vars.fold
-        (fun name (_mut, vr, _ty) l -> if vr = Virtual then name :: l else l)
-        sign.csig_vars [] in
-    if mets <> []  || vals <> [] then
-      raise(Error(cl.pci_loc, env, Virtual_class(false, false, mets,
-                                                 vals)));
-  end;
-
-  (* Misc. *)
-  let arity = Ctype.class_type_arity typ in
-  let pub_meths =
-    let (fields, _) =
-      Ctype.flatten_fields (Ctype.object_fields (Ctype.expand_head env obj_ty))
-    in
-    List.map (function (lab, _, _) -> lab) fields
-  in
-
-  (* Final definitions *)
-  let (params', typ') = Ctype.instance_class params typ in
-  let cltydef =
-    {clty_params = params'; clty_type = class_body typ';
-     clty_variance = cty_variance;
-     clty_path = Path.Pident obj_id;
-     clty_loc = cl.pci_loc;
-     clty_attributes = cl.pci_attributes;
-    }
-  and clty =
-    {cty_params = params'; cty_type = typ';
-     cty_variance = cty_variance;
-     cty_path = Path.Pident obj_id;
-     cty_new =
-       begin match cl.pci_virt with
-       | Virtual  -> None
-       | Concrete -> Some (Ctype.instance env constr_type)
-       end;
-     cty_loc = cl.pci_loc;
-     cty_attributes = cl.pci_attributes;
-    }
-  in
-  let obj_abbr =
-    {type_params = obj_params;
-     type_arity = List.length obj_params;
-     type_kind = Type_abstract;
-     type_private = Public;
-     type_manifest = Some obj_ty;
-     type_variance = List.map (fun _ -> Variance.full) obj_params;
-     type_newtype_level = None;
-     type_loc = cl.pci_loc;
-     type_attributes = []; (* or keep attrs from cl? *)
-     type_immediate = false;
-     type_unboxed = unboxed_false_default_false;
-    }
-  in
-  let (cl_params, cl_ty) =
-    Ctype.instance_parameterized_type params (Ctype.self_type typ)
-  in
-  Ctype.hide_private_methods cl_ty;
-  Ctype.set_object_name obj_id (Ctype.row_variable cl_ty) cl_params cl_ty;
-  let cl_abbr =
-    {type_params = cl_params;
-     type_arity = List.length cl_params;
-     type_kind = Type_abstract;
-     type_private = Public;
-     type_manifest = Some cl_ty;
-     type_variance = List.map (fun _ -> Variance.full) cl_params;
-     type_newtype_level = None;
-     type_loc = cl.pci_loc;
-     type_attributes = []; (* or keep attrs from cl? *)
-     type_immediate = false;
-     type_unboxed = unboxed_false_default_false;
-    }
-  in
-  ((cl, id, clty, ty_id, cltydef, obj_id, obj_abbr, cl_id, cl_abbr, ci_params,
-    arity, pub_meths, List.rev !coercion_locs, expr) :: res,
-   env)
-
-let final_decl env 
-    (cl, id, clty, ty_id, cltydef, obj_id, obj_abbr, cl_id, cl_abbr, ci_params,
-     arity, pub_meths, coe, expr) =
-
-  begin try Ctype.collapse_conj_params env clty.cty_params
-  with Ctype.Unify trace ->
-    raise(Error(cl.pci_loc, env, Non_collapsable_conjunction (id, clty, trace)))
-  end;
-
-  List.iter Ctype.generalize clty.cty_params;
-  generalize_class_type true clty.cty_type;
-  Misc.may  Ctype.generalize clty.cty_new;
-  List.iter Ctype.generalize obj_abbr.type_params;
-  Misc.may  Ctype.generalize obj_abbr.type_manifest;
-  List.iter Ctype.generalize cl_abbr.type_params;
-  Misc.may  Ctype.generalize cl_abbr.type_manifest;
-
-  if not (closed_class clty) then
-    raise(Error(cl.pci_loc, env, Non_generalizable_class (id, clty)));
-
-  begin match
-    Ctype.closed_class clty.cty_params
-      (Ctype.signature_of_class_type clty.cty_type)
-  with
-    None        -> ()
-  | Some reason ->
-      let printer =
-        function ppf -> Printtyp.cltype_declaration id ppf cltydef
-      in
-      raise(Error(cl.pci_loc, env, Unbound_type_var(printer, reason)))
-  end;
-
-  (id, cl.pci_name, clty, ty_id, cltydef, obj_id, obj_abbr, cl_id, cl_abbr,
-   arity, pub_meths, coe, expr,
-   { ci_loc = cl.pci_loc;
-     ci_virt = cl.pci_virt;
-     ci_params = ci_params;
-(* TODO : check that we have the correct use of identifiers *)
-     ci_id_name = cl.pci_name;
-     ci_id_class = id;
-     ci_id_class_type = ty_id;
-     ci_id_object = obj_id;
-     ci_id_typehash = cl_id;
-     ci_expr = expr;
-     ci_decl = clty;
-     ci_type_decl = cltydef;
-     ci_attributes = cl.pci_attributes;
- })
-(*   (cl.pci_variance, cl.pci_loc)) *)
-
-let class_infos  kind
-    (cl, id, ty_id,
-     obj_id, obj_params, obj_ty,
-     cl_id, cl_params, cl_ty,
-     constr_type, dummy_class)
-    (res, env) =
-  Builtin_attributes.warning_scope cl.pci_attributes
-    (fun () ->
-       class_infos  kind
-         (cl, id, ty_id,
-          obj_id, obj_params, obj_ty,
-          cl_id, cl_params, cl_ty,
-          constr_type, dummy_class)
-         (res, env)
-    )
-
-let extract_type_decls
-    (_id, _id_loc, clty, _ty_id, cltydef, obj_id, obj_abbr, _cl_id, cl_abbr,
-     _arity, _pub_meths, _coe, _expr, required) decls =
-  (obj_id, obj_abbr, cl_abbr, clty, cltydef, required) :: decls
-
-let merge_type_decls
-    (id, id_loc, _clty, ty_id, _cltydef, obj_id, _obj_abbr, cl_id, _cl_abbr,
-     arity, pub_meths, coe, expr, req) (obj_abbr, cl_abbr, clty, cltydef) =
-  (id, id_loc, clty, ty_id, cltydef, obj_id, obj_abbr, cl_id, cl_abbr,
-   arity, pub_meths, coe, expr, req)
-
-let final_env env
-    (_id, _id_loc, _clty, ty_id, cltydef, obj_id, obj_abbr, cl_id, cl_abbr,
-     _arity, _pub_meths, _coe, _expr, _req) =
-  (* Add definitions after cleaning them *)
-  Env.add_type ~check:true obj_id
-    (Subst.type_declaration Subst.identity obj_abbr) (
-  Env.add_type ~check:true cl_id
-    (Subst.type_declaration Subst.identity cl_abbr) (
-  Env.add_cltype ty_id (Subst.cltype_declaration Subst.identity cltydef)   
-   env))
-
-(* Check that #c is coercible to c if there is a self-coercion *)
-let check_coercions env
-    (id, id_loc, clty, ty_id, cltydef, obj_id, obj_abbr, cl_id, cl_abbr,
-     arity, pub_meths, coercion_locs, _expr, req) =
-  begin match coercion_locs with [] -> ()
-  | loc :: _ ->
-      let cl_ty, obj_ty =
-        match cl_abbr.type_manifest, obj_abbr.type_manifest with
-          Some cl_ab, Some obj_ab ->
-            let cl_params, cl_ty =
-              Ctype.instance_parameterized_type cl_abbr.type_params cl_ab
-            and obj_params, obj_ty =
-              Ctype.instance_parameterized_type obj_abbr.type_params obj_ab
-            in
-            List.iter2 (Ctype.unify env) cl_params obj_params;
-            cl_ty, obj_ty
-        | _ -> assert false
-      in
-      begin try Ctype.subtype env cl_ty obj_ty ()
-      with Ctype.Subtype (tr1, tr2) ->
-        raise(Typecore.Error(loc, env, Typecore.Not_subtype(tr1, tr2)))
-      end;
-      if not (Ctype.opened_object cl_ty) then
-        raise(Error(loc, env, Cannot_coerce_self obj_ty))
-  end;
-  {cls_id = id;
-   cls_id_loc = id_loc;
-   cls_decl = clty;
-   cls_ty_id = ty_id;
-   cls_ty_decl = cltydef;
-   cls_obj_id = obj_id;
-   cls_obj_abbr = obj_abbr;
-   cls_typesharp_id = cl_id;
-   cls_abbr = cl_abbr;
-   cls_arity = arity;
-   cls_pub_methods = pub_meths;
-   cls_info=req}
-
-(*******************************)
-(* FIXME: [define_class] is always [false] here *)
-let type_classes  approx kind env cls =
-  let cls =
-    List.map
-      (function cl ->
-         (cl,
-          Ident.create cl.pci_name.txt, Ident.create cl.pci_name.txt,
-          Ident.create cl.pci_name.txt, Ident.create ("#" ^ cl.pci_name.txt)))
-      cls
-  in
-  Ctype.init_def (Ident.current_time ());
-  Ctype.begin_class_def ();
-  let (res, env) =
-    List.fold_left (initial_env  approx) ([], env) cls
-  in
-  let (res, env) =
-    List.fold_right (class_infos  kind) res ([], env)
-  in
-  Ctype.end_def ();
-  let res = List.rev_map (final_decl env ) res in
-  let decls = List.fold_right extract_type_decls res [] in
-  let decls = Typedecl.compute_variance_decls env decls in
-  let res = List.map2 merge_type_decls res decls in
-  let env = List.fold_left final_env env res in
-  let res = List.map (check_coercions env) res in
-  (res, env)
-
-
-let class_description env sexpr =
-  let expr = class_type env sexpr in
-  (expr, expr.cltyp_type)
-
-
-
-let class_type_declarations env cls =
-  let (decls, env) =
-    type_classes  approx_description class_description env cls
-  in
-  (List.map
-     (fun decl ->
-        {clsty_ty_id = decl.cls_ty_id;
-         clsty_id_loc = decl.cls_id_loc;
-         clsty_ty_decl = decl.cls_ty_decl;
-         clsty_obj_id = decl.cls_obj_id;
-         clsty_obj_abbr = decl.cls_obj_abbr;
-         clsty_typesharp_id = decl.cls_typesharp_id;
-         clsty_abbr = decl.cls_abbr;
-         clsty_info = decl.cls_info})
-     decls,
-   env)
-
-
-
-(*******************************)
-
-(* Approximate the class declaration as class ['params] id = object end *)
-let approx_class sdecl =
-  let open Ast_helper in
-  let self' = Typ.any () in
-  let clty' = Cty.signature ~loc:sdecl.pci_expr.pcty_loc (Csig.mk self' []) in
-  { sdecl with pci_expr = clty' }
-
-let approx_class_declarations env sdecls =
-  fst (class_type_declarations env (List.map approx_class sdecls))
-
-(*******************************)
-
-(* Error report *)
-
-open Format
-
-let report_error env ppf = function
-  | Repeated_parameter ->
-      fprintf ppf "A type parameter occurs several times"
-  | Unconsistent_constraint trace ->
-      fprintf ppf "The class constraints are not consistent.@.";
-      Printtyp.report_unification_error ppf env trace
-        (fun ppf -> fprintf ppf "Type")
-        (fun ppf -> fprintf ppf "is not compatible with type")
-  | Field_type_mismatch (k, m, trace) ->
-      Printtyp.report_unification_error ppf env trace
-        (function ppf ->
-           fprintf ppf "The %s %s@ has type" k m)
-        (function ppf ->
-           fprintf ppf "but is expected to have type")
-  | Structure_expected clty ->
-      fprintf ppf
-        "@[This class expression is not a class structure; it has type@ %a@]"
-        Printtyp.class_type clty
-  | Pattern_type_clash ty ->
-      (* XXX Trace *)
-      (* XXX Revoir message d'erreur | Improve error message *)
-      Printtyp.reset_and_mark_loops ty;
-      fprintf ppf "@[%s@ %a@]"
-        "This pattern cannot match self: it only matches values of type"
-        Printtyp.type_expr ty
-  | Unbound_class_type_2 cl ->
-      fprintf ppf "@[The class type@ %a@ is not yet completely defined@]"
-      Printtyp.longident cl
-  | Abbrev_type_clash (abbrev, actual, expected) ->
-      (* XXX Afficher une trace ? | Print a trace? *)
-      Printtyp.reset_and_mark_loops_list [abbrev; actual; expected];
-      fprintf ppf "@[The abbreviation@ %a@ expands to type@ %a@ \
-       but is used with type@ %a@]"
-       Printtyp.type_expr abbrev
-       Printtyp.type_expr actual
-       Printtyp.type_expr expected
-  | Constructor_type_mismatch (c, trace) ->
-      Printtyp.report_unification_error ppf env trace
-        (function ppf ->
-           fprintf ppf "The expression \"new %s\" has type" c)
-        (function ppf ->
-           fprintf ppf "but is used with type")
-  | Virtual_class (cl, imm, mets, vals) ->
-      let print_mets ppf mets =
-        List.iter (function met -> fprintf ppf "@ %s" met) mets in
-      let missings =
-        match mets, vals with
-          [], _ -> "variables"
-        | _, [] -> "methods"
-        | _ -> "methods and variables"
-      in
-      let print_msg ppf =
-        if imm then fprintf ppf "This object has virtual %s" missings
-        else if cl then fprintf ppf "This class should be virtual"
-        else fprintf ppf "This class type should be virtual"
-      in
-      fprintf ppf
-        "@[%t.@ @[<2>The following %s are undefined :%a@]@]"
-        print_msg missings print_mets (mets @ vals)
-  | Parameter_arity_mismatch(lid, expected, provided) ->
-      fprintf ppf
-        "@[The class constructor %a@ expects %i type argument(s),@ \
-           but is here applied to %i type argument(s)@]"
-        Printtyp.longident lid expected provided
-  | Parameter_mismatch trace ->
-      Printtyp.report_unification_error ppf env trace
-        (function ppf ->
-           fprintf ppf "The type parameter")
-        (function ppf ->
-           fprintf ppf "does not meet its constraint: it should be")
-  | Bad_parameters (id, params, cstrs) ->
-      Printtyp.reset_and_mark_loops_list [params; cstrs];
-      fprintf ppf
-        "@[The abbreviation %a@ is used with parameters@ %a@ \
-           which are incompatible with constraints@ %a@]"
-        Printtyp.ident id Printtyp.type_expr params Printtyp.type_expr cstrs
-  | Unbound_type_var (printer, reason) ->
-      let print_common ppf kind ty0 real lab ty =
-        let ty1 =
-          if real then ty0 else Btype.newgenty(Tobject(ty0, ref None)) in
-        List.iter Printtyp.mark_loops [ty; ty1];
-        fprintf ppf
-          "The %s %s@ has type@;<1 2>%a@ where@ %a@ is unbound"
-            kind lab Printtyp.type_expr ty Printtyp.type_expr ty0
-      in
-      let print_reason ppf = function
-      | Ctype.CC_Method (ty0, real, lab, ty) ->
-          print_common ppf "method" ty0 real lab ty
-      | Ctype.CC_Value (ty0, real, lab, ty) ->
-          print_common ppf "instance variable" ty0 real lab ty
-      in
-      Printtyp.reset ();
-      fprintf ppf
-        "@[<v>@[Some type variables are unbound in this type:@;<1 2>%t@]@ \
-              @[%a@]@]"
-       printer print_reason reason
-  | Non_generalizable_class (id, clty) ->
-      fprintf ppf
-        "@[The type of this class,@ %a,@ \
-           contains type variables that cannot be generalized@]"
-        (Printtyp.class_declaration id) clty
-  | Cannot_coerce_self ty ->
-      fprintf ppf
-        "@[The type of self cannot be coerced to@ \
-           the type of the current class:@ %a.@.\
-           Some occurrences are contravariant@]"
-        Printtyp.type_scheme ty
-  | Non_collapsable_conjunction (id, clty, trace) ->
-      fprintf ppf
-        "@[The type of this class,@ %a,@ \
-           contains non-collapsible conjunctive types in constraints@]"
-        (Printtyp.class_declaration id) clty;
-      Printtyp.report_unification_error ppf env trace
-        (fun ppf -> fprintf ppf "Type")
-        (fun ppf -> fprintf ppf "is not compatible with type")
-  | No_overriding (_, "") ->
-      fprintf ppf "@[This inheritance does not override any method@ %s@]"
-        "instance variable"
-  | No_overriding (kind, name) ->
-      fprintf ppf "@[The %s `%s'@ has no previous definition@]" kind name
-
-let report_error env ppf err =
-  Printtyp.wrap_printing_env env (fun () -> report_error env ppf err)
-
-let () =
-  Location.register_error_of_exn
-    (function
-      | Error (loc, env, err) ->
-        Some (Location.error_of_printer loc (report_error env) err)
-      | Error_forward err ->
-        Some err
-      | _ ->
-        None
-    )
diff --git a/jscomp/ml/typeclass.mli b/jscomp/ml/typeclass.mli
deleted file mode 100644
index b31bff9..0000000
--- a/jscomp/ml/typeclass.mli
+++ /dev/null
@@ -1,65 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*          Jerome Vouillon, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Asttypes
-open Types
-open Format
-
-type 'a class_info = {
-  cls_id : Ident.t;
-  cls_id_loc : string loc;
-  cls_decl : class_declaration;
-  cls_ty_id : Ident.t;
-  cls_ty_decl : class_type_declaration;
-  cls_obj_id : Ident.t;
-  cls_obj_abbr : type_declaration;
-  cls_typesharp_id : Ident.t;
-  cls_abbr : type_declaration;
-  cls_arity : int;
-  cls_pub_methods : string list;
-  cls_info : 'a;
-}
-
-type class_type_info = {
-  clsty_ty_id : Ident.t;
-  clsty_id_loc : string loc;
-  clsty_ty_decl : class_type_declaration;
-  clsty_obj_id : Ident.t;
-  clsty_obj_abbr : type_declaration;
-  clsty_typesharp_id : Ident.t;
-  clsty_abbr : type_declaration;
-  clsty_info : Typedtree.class_type_declaration;
-}
-
-
-
-
-
-val class_type_declarations:
-  Env.t -> Parsetree.class_type_declaration list -> class_type_info list * Env.t
-
-
-val approx_class_declarations:
-  Env.t -> Parsetree.class_type_declaration list -> class_type_info list
-
-val virtual_methods: Types.class_signature -> label list
-
-
-type error 
-
-exception Error of Location.t * Env.t * error
-exception Error_forward of Location.error
-
-val report_error : Env.t -> formatter -> error -> unit
diff --git a/jscomp/ml/typecore.ml b/jscomp/ml/typecore.ml
deleted file mode 100644
index 0c9f0eb..0000000
--- a/jscomp/ml/typecore.ml
+++ /dev/null
@@ -1,4114 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Typechecking for the core language *)
-
-open Misc
-open Asttypes
-open Parsetree
-open Types
-open Typedtree
-open Btype
-open Ctype
-open Error_message_utils
-
-type error =
-    Polymorphic_label of Longident.t
-  | Constructor_arity_mismatch of Longident.t * int * int
-  | Label_mismatch of Longident.t * (type_expr * type_expr) list
-  | Pattern_type_clash of (type_expr * type_expr) list
-  | Or_pattern_type_clash of Ident.t * (type_expr * type_expr) list
-  | Multiply_bound_variable of string
-  | Orpat_vars of Ident.t * Ident.t list
-  | Expr_type_clash of (type_expr * type_expr) list * (typeClashContext option)
-  | Apply_non_function of type_expr
-  | Apply_wrong_label of arg_label * type_expr
-  | Label_multiply_defined of string
-  | Labels_missing of string list * bool
-  | Label_not_mutable of Longident.t
-  | Wrong_name of string * type_expr * string * Path.t * string * string list
-  | Name_type_mismatch of
-      string * Longident.t * (Path.t * Path.t) * (Path.t * Path.t) list
-  | Undefined_method of type_expr * string * string list option
-  | Private_type of type_expr
-  | Private_label of Longident.t * type_expr
-
-  | Not_subtype of (type_expr * type_expr) list * (type_expr * type_expr) list
-  | Coercion_failure of
-      type_expr * type_expr * (type_expr * type_expr) list * bool
-  | Too_many_arguments of bool * type_expr
-  | Abstract_wrong_label of arg_label * type_expr
-  | Scoping_let_module of string * type_expr
-  | Not_a_variant_type of Longident.t
-  | Incoherent_label_order
-  | Less_general of string * (type_expr * type_expr) list
-  | Modules_not_allowed
-  | Cannot_infer_signature
-  | Not_a_packed_module of type_expr
-  | Recursive_local_constraint of (type_expr * type_expr) list
-  | Unexpected_existential
-  | Unqualified_gadt_pattern of Path.t * string
-  | Invalid_interval
-  | Invalid_for_loop_index
-  | No_value_clauses
-  | Exception_pattern_below_toplevel
-  | Inlined_record_escape
-  | Inlined_record_expected
-  | Unrefuted_pattern of pattern
-  | Invalid_extension_constructor_payload
-  | Not_an_extension_constructor
-  | Literal_overflow of string
-  | Unknown_literal of string * char
-  | Illegal_letrec_pat
-  | Labels_omitted of string list
-  | Empty_record_literal
-  | Uncurried_arity_mismatch of type_expr * int * int
-  | Field_not_optional of string * type_expr
-exception Error of Location.t * Env.t * error
-exception Error_forward of Location.error
-
-(* Forward declaration, to be filled in by Typemod.type_module *)
-
-let type_module =
-  ref ((fun _env _md -> assert false) :
-       Env.t -> Parsetree.module_expr -> Typedtree.module_expr)
-
-(* Forward declaration, to be filled in by Typemod.type_open *)
-
-let type_open :
-  (?used_slot:bool ref -> override_flag -> Env.t -> Location.t ->
-   Longident.t loc -> Path.t * Env.t)
-    ref =
-  ref (fun ?used_slot:_ _ -> assert false)
-
-(* Forward declaration, to be filled in by Typemod.type_package *)
-
-let type_package =
-  ref (fun _ -> assert false)
-
-(* Forward declaration, to be filled in by Typeclass.class_structure *)
-
-(*
-  Saving and outputting type information.
-  We keep these function names short, because they have to be
-  called each time we create a record of type [Typedtree.expression]
-  or [Typedtree.pattern] that will end up in the typed AST.
-*)
-let re node =
-  Cmt_format.add_saved_type (Cmt_format.Partial_expression node);
-  Stypes.record (Stypes.Ti_expr node);
-  node
-;;
-let rp node =
-  Cmt_format.add_saved_type (Cmt_format.Partial_pattern node);
-  Stypes.record (Stypes.Ti_pat node);
-  node
-;;
-
-
-type recarg =
-  | Allowed
-  | Required
-  | Rejected
-
-
-let case lhs rhs =
-  {c_lhs = lhs; c_guard = None; c_rhs = rhs}
-
-(* Upper approximation of free identifiers on the parse tree *)
-
-let iter_expression f e =
-
-  let rec expr e =
-    f e;
-    match e.pexp_desc with
-    | Pexp_extension _ (* we don't iterate under extension point *)
-    | Pexp_ident _
-    | Pexp_new _
-    | Pexp_constant _ -> ()
-    | Pexp_function pel -> List.iter case pel
-    | Pexp_fun (_, eo, _, e) -> may expr eo; expr e
-    | Pexp_apply (e, lel) -> expr e; List.iter (fun (_, e) -> expr e) lel
-    | Pexp_let (_, pel, e) ->  expr e; List.iter binding pel
-    | Pexp_match (e, pel)
-    | Pexp_try (e, pel) -> expr e; List.iter case pel
-    | Pexp_array el
-    | Pexp_tuple el -> List.iter expr el
-    | Pexp_construct (_, eo)
-    | Pexp_variant (_, eo) -> may expr eo
-    | Pexp_record (iel, eo) ->
-        may expr eo; List.iter (fun (_, e) -> expr e) iel
-    | Pexp_open (_, _, e)
-    | Pexp_newtype (_, e)
-    | Pexp_poly (e, _)
-    | Pexp_lazy e
-    | Pexp_assert e
-    | Pexp_setinstvar (_, e)
-    | Pexp_send (e, _)
-    | Pexp_constraint (e, _)
-    | Pexp_coerce (e, _, _)
-    | Pexp_letexception (_, e)
-    | Pexp_field (e, _) -> expr e
-    | Pexp_while (e1, e2)
-    | Pexp_sequence (e1, e2)
-    | Pexp_setfield (e1, _, e2) -> expr e1; expr e2
-    | Pexp_ifthenelse (e1, e2, eo) -> expr e1; expr e2; may expr eo
-    | Pexp_for (_, e1, e2, _, e3) -> expr e1; expr e2; expr e3
-    | Pexp_override sel -> List.iter (fun (_, e) -> expr e) sel
-    | Pexp_letmodule (_, me, e) -> expr e; module_expr me
-    | Pexp_object _ -> assert false
-    | Pexp_pack me -> module_expr me
-    | Pexp_unreachable -> ()
-
-  and case {pc_lhs = _; pc_guard; pc_rhs} =
-    may expr pc_guard;
-    expr pc_rhs
-
-  and binding x =
-    expr x.pvb_expr
-
-  and module_expr me =
-    match me.pmod_desc with
-    | Pmod_extension _
-    | Pmod_ident _ -> ()
-    | Pmod_structure str -> List.iter structure_item str
-    | Pmod_constraint (me, _)
-    | Pmod_functor (_, _, me) -> module_expr me
-    | Pmod_apply (me1, me2) -> module_expr me1; module_expr me2
-    | Pmod_unpack e -> expr e
-
-
-  and structure_item str =
-    match str.pstr_desc with
-    | Pstr_eval (e, _) -> expr e
-    | Pstr_value (_, pel) -> List.iter binding pel
-    | Pstr_primitive _
-    | Pstr_type _
-    | Pstr_typext _
-    | Pstr_exception _
-    | Pstr_modtype _
-    | Pstr_open _
-    | Pstr_class_type _
-    | Pstr_attribute _
-    | Pstr_extension _ -> ()
-    | Pstr_include {pincl_mod = me}
-    | Pstr_module {pmb_expr = me} -> module_expr me
-    | Pstr_recmodule l -> List.iter (fun x -> module_expr x.pmb_expr) l
-    | Pstr_class () -> ()
-
-
-
-
-  in
-  expr e
-
-
-let all_idents_cases el =
-  let idents = Hashtbl.create 8 in
-  let f = function
-    | {pexp_desc=Pexp_ident { txt = Longident.Lident id; _ }; _} ->
-        Hashtbl.replace idents id ()
-    | _ -> ()
-  in
-  List.iter
-    (fun cp ->
-      may (iter_expression f) cp.pc_guard;
-      iter_expression f cp.pc_rhs
-    )
-    el;
-  Hashtbl.fold (fun x () rest -> x :: rest) idents []
-
-
-(* Typing of constants *)
-
-let type_constant = function
-    Const_int _ -> instance_def Predef.type_int
-  | Const_char _ -> instance_def Predef.type_char
-  | Const_string _ -> instance_def Predef.type_string
-  | Const_float _ -> instance_def Predef.type_float
-  | Const_int64 _ -> instance_def Predef.type_int64
-  | Const_bigint _ -> instance_def Predef.type_bigint
-  | Const_int32 _ ->  assert false
-
-let constant : Parsetree.constant -> (Asttypes.constant, error) result =
-  function
-  | Pconst_integer (i,None) ->
-     begin
-       try Ok (Const_int (Misc.Int_literal_converter.int i))
-       with Failure _ -> Error (Literal_overflow "int")
-     end
-  | Pconst_integer (i,Some 'l') ->
-     begin
-       try Ok (Const_int32 (Misc.Int_literal_converter.int32 i))
-       with Failure _ -> Error (Literal_overflow "int32")
-     end
-  | Pconst_integer (i,Some 'L') ->
-     begin
-       try Ok (Const_int64 (Misc.Int_literal_converter.int64 i))
-       with Failure _ -> Error (Literal_overflow "int64")
-     end
-  | Pconst_integer (i,Some 'n') ->
-    let sign, i = Bigint_utils.parse_bigint i in
-    Ok (Const_bigint (sign, i))
-  | Pconst_integer (i,Some c) -> Error (Unknown_literal (i, c))
-  | Pconst_char c -> Ok (Const_char c)
-  | Pconst_string (s,d) -> Ok (Const_string (s,d))
-  | Pconst_float (f,None)-> Ok (Const_float f)
-  | Pconst_float (f,Some c) -> Error (Unknown_literal (f, c))
-
-let constant_or_raise env loc cst =
-  match constant cst with
-  | Ok c -> c
-  | Error err -> raise (Error (loc, env, err))
-
-(* Specific version of type_option, using newty rather than newgenty *)
-
-let type_option ty =
-  newty (Tconstr(Predef.path_option,[ty], ref Mnil))
-
-let mkexp exp_desc exp_type exp_loc exp_env =
-  { exp_desc; exp_type; exp_loc; exp_env; exp_extra = []; exp_attributes = [] }
-
-let option_none ty loc =
-  let lid = Longident.Lident "None"
-  and env = Env.initial_safe_string in
-  let cnone = Env.lookup_constructor lid env in
-  mkexp (Texp_construct(mknoloc lid, cnone, [])) ty loc env
-
-let option_some texp =
-  let lid = Longident.Lident "Some" in
-  let csome = Env.lookup_constructor lid Env.initial_safe_string in
-  mkexp ( Texp_construct(mknoloc lid , csome, [texp]) )
-    (type_option texp.exp_type) texp.exp_loc texp.exp_env
-
-let extract_option_type env ty =
-  match expand_head env ty with {desc = Tconstr(path, [ty], _)}
-    when Path.same path Predef.path_option -> ty
-  | _ -> assert false
-
-let extract_concrete_record env ty =
-  match extract_concrete_typedecl env ty with
-    (p0, p, {type_kind=Type_record (fields, repr)}) -> (p0, p, fields, repr)
-  | _ -> raise Not_found
-
-let extract_concrete_variant env ty =
-  match extract_concrete_typedecl env ty with
-    (p0, p, {type_kind=Type_variant cstrs}) 
-      when not (Ast_uncurried.typeIsUncurriedFun ty)  
-      -> (p0, p, cstrs)
-  | (p0, p, {type_kind=Type_open}) -> (p0, p, [])
-  | _ -> raise Not_found
-
-let has_optional_labels ld =
-  match ld.lbl_repres with
-  | Record_optional_labels _ -> true
-  | Record_inlined {optional_labels} -> optional_labels <> []
-  | _ -> false
-
-let label_is_optional ld =
-  match ld.lbl_repres with
-  | Record_optional_labels lbls -> Ext_list.mem_string lbls ld.lbl_name
-  | Record_inlined {optional_labels} -> Ext_list.mem_string optional_labels ld.lbl_name
-  | _ -> false
-
-let check_optional_attr env ld attrs loc =
-  let check_redundant () =
-    if not (label_is_optional ld) then
-      raise (Error (loc, env, Field_not_optional (ld.lbl_name, ld.lbl_res)));
-    true in 
-  Ext_list.exists attrs (fun ({txt}, _) ->
-    txt = "res.optional" && check_redundant ())
-
-(* unification inside type_pat*)
-let unify_pat_types loc env ty ty' =
-  try
-    unify env ty ty'
-  with
-    Unify trace ->
-      raise(Error(loc, env, Pattern_type_clash(trace)))
-  | Tags(l1,l2) ->
-      raise(Typetexp.Error(loc, env, Typetexp.Variant_tags (l1, l2)))
-
-(* unification inside type_exp and type_expect *)
-let unify_exp_types ?typeClashContext loc env ty expected_ty =
-  (* Format.eprintf "@[%a@ %a@]@." Printtyp.raw_type_expr exp.exp_type
-    Printtyp.raw_type_expr expected_ty; *)
-  try
-    unify env ty expected_ty
-  with
-    Unify trace ->
-      raise(Error(loc, env, Expr_type_clash(trace, typeClashContext)))
-  | Tags(l1,l2) ->
-      raise(Typetexp.Error(loc, env, Typetexp.Variant_tags (l1, l2)))
-
-(* level at which to create the local type declarations *)
-let newtype_level = ref None
-let get_newtype_level () =
-  match !newtype_level with
-    Some y -> y
-  | None -> assert false
-
-let unify_pat_types_gadt loc env ty ty' =
-  let newtype_level =
-    match !newtype_level with
-    | None -> assert false
-    | Some x -> x
-  in
-  try
-    unify_gadt ~newtype_level env ty ty'
-  with
-    Unify trace ->
-      raise(Error(loc, !env, Pattern_type_clash(trace)))
-  | Tags(l1,l2) ->
-      raise(Typetexp.Error(loc, !env, Typetexp.Variant_tags (l1, l2)))
-  | Unification_recursive_abbrev trace ->
-      raise(Error(loc, !env, Recursive_local_constraint trace))
-
-
-(* Creating new conjunctive types is not allowed when typing patterns *)
-
-let unify_pat env pat expected_ty =
-  unify_pat_types pat.pat_loc env pat.pat_type expected_ty
-
-(* make all Reither present in open variants *)
-let finalize_variant pat =
-  match pat.pat_desc with
-    Tpat_variant(tag, opat, r) ->
-      let row =
-        match expand_head pat.pat_env pat.pat_type with
-          {desc = Tvariant row} -> r := row; row_repr row
-        | _ -> assert false
-      in
-      begin match row_field tag row with
-      | Rabsent -> () (* assert false *)
-      | Reither (true, [], _, e) when not row.row_closed ->
-          set_row_field e (Rpresent None)
-      | Reither (false, ty::tl, _, e) when not row.row_closed ->
-          set_row_field e (Rpresent (Some ty));
-          begin match opat with None -> assert false
-          | Some pat -> List.iter (unify_pat pat.pat_env pat) (ty::tl)
-          end
-      | Reither (c, _l, true, e) when not (row_fixed row) ->
-          set_row_field e (Reither (c, [], false, ref None))
-      | _ -> ()
-      end;
-      (* Force check of well-formedness   WHY? *)
-      (* unify_pat pat.pat_env pat
-        (newty(Tvariant{row_fields=[]; row_more=newvar(); row_closed=false;
-                        row_bound=(); row_fixed=false; row_name=None})); *)
-  | _ -> ()
-
-let rec iter_pattern f p =
-  f p;
-  iter_pattern_desc (iter_pattern f) p.pat_desc
-
-let has_variants p =
-  try
-    iter_pattern (function {pat_desc=Tpat_variant _} -> raise Exit | _ -> ())
-      p;
-    false
-  with Exit ->
-    true
-
-
-(* pattern environment *)
-let pattern_variables = ref ([] :
- (Ident.t * type_expr * string loc * Location.t * bool (* as-variable *)) list)
-let pattern_force = ref ([] : (unit -> unit) list)
-let pattern_scope = ref (None : Annot.ident option);;
-let allow_modules = ref false
-let module_variables = ref ([] : (string loc * Location.t) list)
-let reset_pattern scope allow =
-  pattern_variables := [];
-  pattern_force := [];
-  pattern_scope := scope;
-  allow_modules := allow;
-  module_variables := [];
-;;
-
-let enter_variable ?(is_module=false) ?(is_as_variable=false) loc name ty =
-  if List.exists (fun (id, _, _, _, _) -> Ident.name id = name.txt)
-      !pattern_variables
-  then raise(Error(loc, Env.empty, Multiply_bound_variable name.txt));
-  let id = Ident.create name.txt in
-  pattern_variables :=
-    (id, ty, name, loc, is_as_variable) :: !pattern_variables;
-  if is_module then begin
-    (* Note: unpack patterns enter a variable of the same name *)
-    if not !allow_modules then
-      raise (Error (loc, Env.empty, Modules_not_allowed));
-    module_variables := (name, loc) :: !module_variables
-  end else
-    (* moved to genannot *)
-    may (fun s -> Stypes.record (Stypes.An_ident (name.loc, name.txt, s)))
-        !pattern_scope;
-  id
-
-let sort_pattern_variables vs =
-  List.sort
-    (fun (x,_,_,_,_) (y,_,_,_,_) ->
-      compare (Ident.name x) (Ident.name y))
-    vs
-
-let enter_orpat_variables loc env  p1_vs p2_vs =
-  (* unify_vars operate on sorted lists *)
-
-  let p1_vs = sort_pattern_variables p1_vs
-  and p2_vs = sort_pattern_variables p2_vs in
-
-  let rec unify_vars p1_vs p2_vs =
-    let vars vs = List.map (fun (x,_t,_,_l,_a) -> x) vs in
-    match p1_vs, p2_vs with
-      | (x1,t1,_,_l1,_a1)::rem1, (x2,t2,_,_l2,_a2)::rem2
-        when Ident.equal x1 x2 ->
-          if x1==x2 then
-            unify_vars rem1 rem2
-          else begin
-            begin try
-              unify env t1 t2
-            with
-            | Unify trace ->
-                raise(Error(loc, env, Or_pattern_type_clash(x1, trace)))
-            end;
-          (x2,x1)::unify_vars rem1 rem2
-          end
-      | [],[] -> []
-      | (x,_,_,_,_)::_, [] -> raise (Error (loc, env, Orpat_vars (x, [])))
-      | [],(y,_,_,_,_)::_  -> raise (Error (loc, env, Orpat_vars (y, [])))
-      | (x,_,_,_,_)::_, (y,_,_,_,_)::_ ->
-          let err =
-            if Ident.name x < Ident.name y
-            then Orpat_vars (x, vars p2_vs)
-            else Orpat_vars (y, vars p1_vs) in
-          raise (Error (loc, env, err)) in
-  unify_vars p1_vs p2_vs
-
-let rec build_as_type env p =
-  match p.pat_desc with
-    Tpat_alias(p1,_, _) -> build_as_type env p1
-  | Tpat_tuple pl ->
-      let tyl = List.map (build_as_type env) pl in
-      newty (Ttuple tyl)
-  | Tpat_construct(_, cstr, pl) ->
-      let keep = cstr.cstr_private = Private || cstr.cstr_existentials <> [] in
-      if keep then p.pat_type else
-      let tyl = List.map (build_as_type env) pl in
-      let ty_args, ty_res = instance_constructor cstr in
-      List.iter2 (fun (p,ty) -> unify_pat env {p with pat_type = ty})
-        (List.combine pl tyl) ty_args;
-      ty_res
-  | Tpat_variant(l, p', _) ->
-      let ty = may_map (build_as_type env) p' in
-      newty (Tvariant{row_fields=[l, Rpresent ty]; row_more=newvar();
-                      row_bound=(); row_name=None;
-                      row_fixed=false; row_closed=false})
-  | Tpat_record (lpl,_) ->
-      let lbl = snd3 (List.hd lpl) in
-      if lbl.lbl_private = Private then p.pat_type else
-      let ty = newvar () in
-      let ppl = List.map (fun (_, l, p) -> l.lbl_pos, p) lpl in
-      let do_label lbl =
-        let _, ty_arg, ty_res = instance_label false lbl in
-        unify_pat env {p with pat_type = ty} ty_res;
-        let refinable =
-          lbl.lbl_mut = Immutable && List.mem_assoc lbl.lbl_pos ppl &&
-          match (repr lbl.lbl_arg).desc with Tpoly _ -> false | _ -> true in
-        if refinable then begin
-          let arg = List.assoc lbl.lbl_pos ppl in
-          unify_pat env {arg with pat_type = build_as_type env arg} ty_arg
-        end else begin
-          let _, ty_arg', ty_res' = instance_label false lbl in
-          unify env ty_arg ty_arg';
-          unify_pat env p ty_res'
-        end in
-      Array.iter do_label lbl.lbl_all;
-      ty
-  | Tpat_or(p1, p2, row) ->
-      begin match row with
-        None ->
-          let ty1 = build_as_type env p1 and ty2 = build_as_type env p2 in
-          unify_pat env {p2 with pat_type = ty2} ty1;
-          ty1
-      | Some row ->
-          let row = row_repr row in
-          newty (Tvariant{row with row_closed=false; row_more=newvar()})
-      end
-  | Tpat_any | Tpat_var _ | Tpat_constant _
-  | Tpat_array _ | Tpat_lazy _ -> p.pat_type
-
-let build_or_pat env loc lid =
-  let path, decl = Typetexp.find_type env lid.loc lid.txt
-  in
-  let tyl = List.map (fun _ -> newvar()) decl.type_params in
-  let row0 =
-    let ty = expand_head env (newty(Tconstr(path, tyl, ref Mnil))) in
-    match ty.desc with
-      Tvariant row when static_row row -> row
-    | _ -> raise(Error(lid.loc, env, Not_a_variant_type lid.txt))
-  in
-  let pats, fields =
-    List.fold_left
-      (fun (pats,fields) (l,f) ->
-        match row_field_repr f with
-          Rpresent None ->
-            (l,None) :: pats,
-            (l, Reither(true,[], true, ref None)) :: fields
-        | Rpresent (Some ty) ->
-            (l, Some {pat_desc=Tpat_any; pat_loc=Location.none; pat_env=env;
-                      pat_type=ty; pat_extra=[]; pat_attributes=[]})
-            :: pats,
-            (l, Reither(false, [ty], true, ref None)) :: fields
-        | _ -> pats, fields)
-      ([],[]) (row_repr row0).row_fields in
-  let row =
-    { row_fields = List.rev fields; row_more = newvar(); row_bound = ();
-      row_closed = false; row_fixed = false; row_name = Some (path, tyl) }
-  in
-  let ty = newty (Tvariant row) in
-  let gloc = {loc with Location.loc_ghost=true} in
-  let row' = ref {row with row_more=newvar()} in
-  let pats =
-    List.map
-      (fun (l,p) ->
-        {pat_desc=Tpat_variant(l,p,row'); pat_loc=gloc;
-         pat_env=env; pat_type=ty; pat_extra=[]; pat_attributes=[]})
-      pats
-  in
-  match pats with
-    [] -> raise(Error(lid.loc, env, Not_a_variant_type lid.txt))
-  | pat :: pats ->
-      let r =
-        List.fold_left
-          (fun pat pat0 ->
-            {pat_desc=Tpat_or(pat0,pat,Some row0); pat_extra=[];
-             pat_loc=gloc; pat_env=env; pat_type=ty; pat_attributes=[]})
-          pat pats in
-      (path, rp { r with pat_loc = loc },ty)
-
-(* Type paths *)
-
-let rec expand_path env p =
-  let decl =
-    try Some (Env.find_type p env) with Not_found -> None
-  in
-  match decl with
-    Some {type_manifest = Some ty} ->
-      begin match repr ty with
-        {desc=Tconstr(p,_,_)} -> expand_path env p
-      | _ -> p
-         (* PR#6394: recursive module may introduce incoherent manifest *)
-      end
-  | _ ->
-      let p' = Env.normalize_path None env p in
-      if Path.same p p' then p else expand_path env p'
-
-let compare_type_path env tpath1 tpath2 =
-  Path.same (expand_path env tpath1) (expand_path env tpath2)
-
-let fprintf = Format.fprintf
-
-let rec bottom_aliases = function
-  | (_, one) :: (_, two) :: rest -> begin match bottom_aliases rest with
-      | Some types -> Some types
-      | None -> Some (one, two)
-    end
-  | _ -> None
-
-let simple_conversions = [
-  (("float", "int"), "Belt.Float.toInt");
-  (("float", "string"), "Belt.Float.toString");
-  (("int", "float"), "Belt.Int.toFloat");
-  (("int", "string"), "Belt.Int.toString");
-  (("string", "float"), "Belt.Float.fromString");
-  (("string", "int"), "Belt.Int.fromString");
-]
-
-let print_simple_conversion ppf (actual, expected) =
-  try (
-    let converter = List.assoc (actual, expected) simple_conversions in
-    fprintf ppf "@,@,@[<v 2>You can convert @{<info>%s@} to @{<info>%s@} with @{<info>%s@}.@]" actual expected converter
-  ) with | Not_found -> ()
-  
-let print_simple_message ppf = function
-  | ("float", "int") -> fprintf ppf "@ If this is a literal, try a number without a trailing dot (e.g. @{<info>20@})."
-  | ("int", "float") -> fprintf ppf "@ If this is a literal, try a number with a trailing dot (e.g. @{<info>20.@})."
-  | _ -> ()
-
-let show_extra_help ppf _env trace = begin
-  match bottom_aliases trace with
-  | Some ({Types.desc = Tconstr (actualPath, actualArgs, _)}, {desc = Tconstr (expectedPath, expextedArgs, _)}) -> begin
-      match (actualPath, actualArgs, expectedPath, expextedArgs) with
-      | (Pident {name = actualName}, [], Pident {name = expectedName}, []) -> begin
-          print_simple_conversion ppf (actualName, expectedName);
-          print_simple_message ppf (actualName, expectedName);
-        end
-      | _ -> ()
-    end;
-  | _ -> ();
-end
-
-let rec collect_missing_arguments env type1 type2 = match type1 with
-  (* why do we use Ctype.matches here? Please see https://github.com/rescript-lang/rescript-compiler/pull/2554 *)
-  | {Types.desc=Tarrow (label, argtype, typ, _)} when Ctype.matches env typ type2 ->
-    Some [(label, argtype)]
-  | {desc=Tarrow (label, argtype, typ, _)} -> begin
-      match collect_missing_arguments env typ type2 with
-      | Some res -> Some ((label, argtype) :: res)
-      | None -> None
-    end
-  | t when Ast_uncurried.typeIsUncurriedFun t -> 
-    let typ = Ast_uncurried.typeExtractUncurriedFun t in 
-    collect_missing_arguments env typ type2
-  | _ -> None
-
-let print_expr_type_clash ?typeClashContext env trace ppf = begin
-  (* this is the most frequent error. We should do whatever we can to provide
-      specific guidance to this generic error before giving up *)
-  let bottom_aliases_result = bottom_aliases trace in
-  let missing_arguments = match bottom_aliases_result with
-    | Some (actual, expected) -> collect_missing_arguments env actual expected
-    | None -> assert false
-  in
-  let print_arguments =
-    Format.pp_print_list
-      ~pp_sep:(fun ppf _ -> fprintf ppf ",@ ")
-      (fun ppf (label, argtype) ->
-          match label with
-          | Asttypes.Nolabel -> fprintf ppf "@[%a@]" Printtyp.type_expr argtype
-          | Labelled label ->
-            fprintf ppf "@[(~%s: %a)@]" label Printtyp.type_expr argtype
-          | Optional label ->
-            fprintf ppf "@[(?%s: %a)@]" label Printtyp.type_expr argtype
-      )
-  in
-  match missing_arguments with
-  | Some [singleArgument] ->
-    (* btw, you can't say "final arguments". Intermediate labeled
-        arguments might be the ones missing *)
-    fprintf ppf "@[@{<info>This call is missing an argument@} of type@ %a@]"
-      print_arguments [singleArgument]
-  | Some arguments ->
-    fprintf ppf "@[<hv>@{<info>This call is missing arguments@} of type:@ %a@]"
-      print_arguments arguments
-  | None ->
-    let missing_parameters = match bottom_aliases_result with
-      | Some (actual, expected) -> collect_missing_arguments env expected actual
-      | None -> assert false
-    in
-    begin match missing_parameters with
-      | Some [singleParameter] ->
-        fprintf ppf "@[This value might need to be @{<info>wrapped in a function@ that@ takes@ an@ extra@ parameter@}@ of@ type@ %a@]@,@,"
-          print_arguments [singleParameter];
-        fprintf ppf "@[@{<info>Here's the original error message@}@]@,"
-      | Some arguments ->
-        fprintf ppf "@[This value seems to @{<info>need to be wrapped in a function that takes extra@ arguments@}@ of@ type:@ @[<hv>%a@]@]@,@,"
-          print_arguments arguments;
-        fprintf ppf "@[@{<info>Here's the original error message@}@]@,"
-      | None -> ()
-    end;
-
-    Printtyp.super_report_unification_error ppf env trace
-      (function ppf ->
-          errorTypeText ppf typeClashContext)
-      (function ppf ->
-          errorExpectedTypeText ppf typeClashContext);
-    printExtraTypeClashHelp ppf trace typeClashContext;
-    show_extra_help ppf env trace;
-end
-  
-let reportArityMismatch ~arityA ~arityB ppf =
-  fprintf ppf "This function expected @{<info>%s@} %s, but got @{<error>%s@}"
-    arityB
-    (if arityB = "1" then "argument" else "arguments")
-    arityA
-  
-(* Records *)
-let label_of_kind kind =
-  if kind = "record" then "field" else "constructor"
-
-module NameChoice(Name : sig
-  type t
-  val type_kind: string
-  val get_name: t -> string
-  val get_type: t -> type_expr
-  val get_descrs: Env.type_descriptions -> t list
-  val unbound_name_error: Env.t -> Longident.t loc -> 'a
-
-end) = struct
-  open Name
-
-  let get_type_path d =
-    match (repr (get_type d)).desc with
-    | Tconstr(p, _, _) -> p
-    | _ -> assert false
-
-  let lookup_from_type env tpath lid =
-    let descrs = get_descrs (Env.find_type_descrs tpath env) in
-    Env.mark_type_used env (Path.last tpath) (Env.find_type tpath env);
-    match lid.txt with
-      Longident.Lident s -> begin
-        try
-          List.find (fun nd -> get_name nd = s) descrs
-        with Not_found ->
-          let names = List.map get_name descrs in
-          raise (Error (lid.loc, env,
-                        Wrong_name ("", newvar (), type_kind, tpath, s, names)))
-      end
-    | _ -> raise Not_found
-
-  let rec unique eq acc = function
-      [] -> List.rev acc
-    | x :: rem ->
-        if List.exists (eq x) acc then unique eq acc rem
-        else unique eq (x :: acc) rem
-
-  let ambiguous_types env lbl others =
-    let tpath = get_type_path lbl in
-    let others =
-      List.map (fun (lbl, _) -> get_type_path lbl) others in
-    let tpaths = unique (compare_type_path env) [tpath] others in
-    match tpaths with
-      [_] -> []
-    | _ -> List.map Printtyp.string_of_path tpaths
-
-  let disambiguate_by_type env tpath lbls =
-    let check_type (lbl, _) =
-      let lbl_tpath = get_type_path lbl in
-      compare_type_path env tpath lbl_tpath
-    in
-    List.find check_type lbls
-
-  let disambiguate ?(warn=Location.prerr_warning) ?(check_lk=fun _ _ -> ())
-      ?scope lid env opath lbls =
-    let scope = match scope with None -> lbls | Some l -> l in
-    let lbl = match opath with
-      None ->
-        begin match lbls with
-          [] -> unbound_name_error env lid
-        | (lbl, use) :: rest ->
-            use ();
-            let paths = ambiguous_types env lbl rest in
-            if paths <> [] then
-              warn lid.loc
-                (Warnings.Ambiguous_name ([Longident.last lid.txt],
-                                          paths, false));
-            lbl
-        end
-    | Some(tpath0, tpath) ->
-        try
-          let lbl, use = disambiguate_by_type env tpath scope in
-          use ();
-          lbl
-        with Not_found -> try
-          let lbl = lookup_from_type env tpath lid in
-          check_lk tpath lbl;
-          lbl
-        with Not_found ->
-          if lbls = [] then unbound_name_error env lid else
-          let tp = (tpath0, expand_path env tpath) in
-          let tpl =
-            List.map
-              (fun (lbl, _) ->
-                let tp0 = get_type_path lbl in
-                let tp = expand_path env tp0 in
-                  (tp0, tp))
-              lbls
-          in
-          raise (Error (lid.loc, env,
-                        Name_type_mismatch (type_kind, lid.txt, tp, tpl)))
-    in
-    lbl
-end
-
-let wrap_disambiguate kind ty f x =
-  try f x with Error (loc, env, Wrong_name ("",_,tk,tp,name,valid_names)) ->
-    raise (Error (loc, env, Wrong_name (kind,ty,tk,tp,name,valid_names)))
-
-module Label = NameChoice (struct
-  type t = label_description
-  let type_kind = "record"
-  let get_name lbl = lbl.lbl_name
-  let get_type lbl = lbl.lbl_res
-  let get_descrs = snd
-  let unbound_name_error = Typetexp.unbound_label_error
-end)
-
-let disambiguate_label_by_ids keep closed ids labels =
-  let check_ids (lbl, _) =
-    let lbls = Hashtbl.create 8 in
-    Array.iter (fun lbl -> Hashtbl.add lbls lbl.lbl_name ()) lbl.lbl_all;
-    List.for_all (Hashtbl.mem lbls) ids in
-  let mandatory_labels_are_present num_ids lbl = (* check that all mandatory labels are present *)
-    if has_optional_labels lbl then (
-      let mandatory_lbls = ref 0 in
-      Ext_array.iter lbl.lbl_all (fun l -> if not (label_is_optional l) then incr mandatory_lbls);
-      num_ids >= !mandatory_lbls)
-    else num_ids = Array.length lbl.lbl_all in
-  let check_closed (lbl, _) =
-    (not closed || mandatory_labels_are_present (List.length ids) lbl)
-  in
-  let labels' = Ext_list.filter labels check_ids in
-  if keep && labels' = [] then (false, labels) else
-  let labels'' = Ext_list.filter labels' check_closed in
-  if keep && labels'' = [] then (false, labels') else (true, labels'')
-
-(* Only issue warnings once per record constructor/pattern *)
-let disambiguate_lid_a_list loc closed env opath lid_a_list =
-  let ids = List.map (fun (lid, _) -> Longident.last lid.txt) lid_a_list in
-  let w_amb = ref [] in
-  let warn loc msg =
-    let open Warnings in
-    match msg with
-
-    | Ambiguous_name([s], l, _) -> w_amb := (s, l) :: !w_amb
-    | _ -> Location.prerr_warning loc msg
-  in
-  let process_label lid =
-    (* Strategy for each field:
-       * collect all the labels in scope for that name
-       * if the type is known and principal, just eventually warn
-         if the real label was not in scope
-       * fail if there is no known type and no label found
-       * otherwise use other fields to reduce the list of candidates
-       * if there is no known type reduce it incrementally, so that
-         there is still at least one candidate (for error message)
-       * if the reduced list is valid, call Label.disambiguate
-     *)
-    let scope = Typetexp.find_all_labels env lid.loc lid.txt in
-    if opath = None && scope = [] then
-      Typetexp.unbound_label_error env lid;
-    let (ok, labels) =
-      match opath with
-        Some (_, _) -> (true, scope) (* disambiguate only checks scope *)
-      | _  -> disambiguate_label_by_ids (opath=None) closed ids scope
-    in
-    if ok then Label.disambiguate lid env opath labels ~warn ~scope
-          else fst (List.hd labels) (* will fail later *)
-  in
-  let lbl_a_list =
-    List.map (fun (lid,a) -> lid, process_label lid, a) lid_a_list in
-  begin
-    match List.rev !w_amb with
-      (_,types)::_ as amb ->
-        let paths =
-          List.map (fun (_,lbl,_) -> Label.get_type_path lbl) lbl_a_list in
-        let path = List.hd paths in
-        if List.for_all (compare_type_path env path) (List.tl paths) then
-          Location.prerr_warning loc
-            (Warnings.Ambiguous_name (List.map fst amb, types, true))
-        else
-          List.iter
-            (fun (s,l) -> Location.prerr_warning loc
-                (Warnings.Ambiguous_name ([s],l,false)))
-            amb
-    | _ -> ()
-  end;
-  lbl_a_list
-
-let rec find_record_qual = function
-  | [] -> None
-  | ({ txt = Longident.Ldot (modname, _) }, _) :: _ -> Some modname
-  | _ :: rest -> find_record_qual rest
-
-let map_fold_cont f xs k =
-  List.fold_right (fun x k ys -> f x (fun y -> k (y :: ys)))
-    xs (fun ys -> k (List.rev ys)) []
-
-let type_label_a_list ?labels loc closed env type_lbl_a opath lid_a_list k =
-  let lbl_a_list =
-    match lid_a_list, labels with
-      ({txt=Longident.Lident s}, _)::_, Some labels when Hashtbl.mem labels s ->
-        (* Special case for rebuilt syntax trees *)
-        List.map
-          (function lid, a -> match lid.txt with
-            Longident.Lident s -> lid, Hashtbl.find labels s, a
-          | _ -> assert false)
-          lid_a_list
-    | _ ->
-        let lid_a_list =
-          match find_record_qual lid_a_list with
-            None -> lid_a_list
-          | Some modname ->
-              List.map
-                (fun (lid, a as lid_a) ->
-                  match lid.txt with Longident.Lident s ->
-                    {lid with txt=Longident.Ldot (modname, s)}, a
-                  | _ -> lid_a)
-                lid_a_list
-        in
-        disambiguate_lid_a_list loc closed env opath lid_a_list
-  in
-  (* Invariant: records are sorted in the typed tree *)
-  let lbl_a_list =
-    List.sort
-      (fun (_,lbl1,_) (_,lbl2,_) -> compare lbl1.lbl_pos lbl2.lbl_pos)
-      lbl_a_list
-  in
-  map_fold_cont type_lbl_a lbl_a_list k
-;;
-
-(* Checks over the labels mentioned in a record pattern:
-   no duplicate definitions (error); properly closed (warning) *)
-
-let check_recordpat_labels loc lbl_pat_list closed =
-  match lbl_pat_list with
-  | [] -> ()                            (* should not happen *)
-  | (_, label1, _) :: _ ->
-      let all = label1.lbl_all in
-      let defined = Array.make (Array.length all) false in
-      let check_defined (_, label, _) =
-        if defined.(label.lbl_pos)
-        then raise(Error(loc, Env.empty, Label_multiply_defined label.lbl_name))
-        else defined.(label.lbl_pos) <- true in
-      List.iter check_defined lbl_pat_list;
-      if closed = Closed
-      && Warnings.is_active (Warnings.Non_closed_record_pattern "")
-      then begin
-        let undefined = ref [] in
-        for i = 0 to Array.length all - 1 do
-          if not defined.(i) then undefined := all.(i).lbl_name :: !undefined
-        done;
-        if !undefined <> [] then begin
-          let u = String.concat ", " (List.rev !undefined) in
-          Location.prerr_warning loc (Warnings.Non_closed_record_pattern u)
-        end
-      end
-
-(* Constructors *)
-
-module Constructor = NameChoice (struct
-  type t = constructor_description
-  let type_kind = "variant"
-  let get_name cstr = cstr.cstr_name
-  let get_type cstr = cstr.cstr_res
-  let get_descrs = fst
-  let unbound_name_error = Typetexp.unbound_constructor_error
-end)
-
-(* unification of a type with a tconstr with
-   freshly created arguments *)
-let unify_head_only loc env ty constr =
-  let (_, ty_res) = instance_constructor constr in
-  match (repr ty_res).desc with
-  | Tconstr(p,args,m) ->
-      ty_res.desc <- Tconstr(p,List.map (fun _ -> newvar ()) args,m);
-      enforce_constraints env ty_res;
-      unify_pat_types loc env ty_res ty
-  | _ -> assert false
-
-(* Typing of patterns *)
-
-(* Remember current state for backtracking.
-   No variable information, as we only backtrack on
-   patterns without variables (cf. assert statements). *)
-type state =
- { snapshot: Btype.snapshot;
-   levels: Ctype.levels;
-   env: Env.t; }
-let save_state env =
-  { snapshot = Btype.snapshot ();
-    levels = Ctype.save_levels ();
-    env = !env; }
-let set_state s env =
-  Btype.backtrack s.snapshot;
-  Ctype.set_levels s.levels;
-  env := s.env
-
-(* type_pat does not generate local constraints inside or patterns *)
-type type_pat_mode =
-  | Normal
-  | Splitting_or   (* splitting an or-pattern *)
-  | Inside_or      (* inside a non-split or-pattern *)
-  | Split_or       (* always split or-patterns *)
-
-exception Need_backtrack
-
-(* type_pat propagates the expected type as well as maps for
-   constructors and labels.
-   Unification may update the typing environment. *)
-(* constrs <> None => called from parmatch: backtrack on or-patterns
-   explode > 0 => explode Ppat_any for gadts *)
-let rec type_pat ~constrs ~labels ~no_existentials ~mode ~explode ~env
-    sp expected_ty k =
-  Builtin_attributes.warning_scope sp.ppat_attributes
-    (fun () ->
-       type_pat_aux ~constrs ~labels ~no_existentials ~mode ~explode ~env
-         sp expected_ty k
-    )
-
-and type_pat_aux ~constrs ~labels ~no_existentials ~mode ~explode ~env
-    sp expected_ty k =
-  let mode' = if mode = Splitting_or then Normal else mode in
-  let type_pat ?(constrs=constrs) ?(labels=labels) ?(mode=mode')
-      ?(explode=explode) ?(env=env) =
-    type_pat ~constrs ~labels ~no_existentials ~mode ~explode ~env in
-  let loc = sp.ppat_loc in
-  let rp k x : pattern = if constrs = None then k (rp x) else k x in
-  match sp.ppat_desc with
-    Ppat_any ->
-      let k' d = rp k {
-        pat_desc = d;
-        pat_loc = loc; pat_extra=[];
-        pat_type = expected_ty;
-        pat_attributes = sp.ppat_attributes;
-        pat_env = !env }
-      in
-      if explode > 0 then
-        let (sp, constrs, labels) = Parmatch.ppat_of_type !env expected_ty in
-        if sp.ppat_desc = Parsetree.Ppat_any then k' Tpat_any else
-        if mode = Inside_or then raise Need_backtrack else
-        let explode =
-          match sp.ppat_desc with
-            Parsetree.Ppat_or _ -> explode - 5
-          | _ -> explode - 1
-        in
-        type_pat ~constrs:(Some constrs) ~labels:(Some labels)
-          ~explode sp expected_ty k
-      else k' Tpat_any
-  | Ppat_var name ->
-      let id = (* PR#7330 *)
-        if name.txt = "*extension*" then Ident.create name.txt else
-        enter_variable loc name expected_ty
-      in
-      rp k {
-        pat_desc = Tpat_var (id, name);
-        pat_loc = loc; pat_extra=[];
-        pat_type = expected_ty;
-        pat_attributes = sp.ppat_attributes;
-        pat_env = !env }
-  | Ppat_unpack name ->
-      assert (constrs = None);
-      let id = enter_variable loc name expected_ty ~is_module:true in
-      rp k {
-        pat_desc = Tpat_var (id, name);
-        pat_loc = sp.ppat_loc;
-        pat_extra=[Tpat_unpack, loc, sp.ppat_attributes];
-        pat_type = expected_ty;
-        pat_attributes = [];
-        pat_env = !env }
-  | Ppat_constraint({ppat_desc=Ppat_var name; ppat_loc=lloc},
-                    ({ptyp_desc=Ptyp_poly _} as sty)) ->
-      (* explicitly polymorphic type *)
-      assert (constrs = None);
-      let cty, force = Typetexp.transl_simple_type_delayed !env sty in
-      let ty = cty.ctyp_type in
-      unify_pat_types lloc !env ty expected_ty;
-      pattern_force := force :: !pattern_force;
-      begin match ty.desc with
-      | Tpoly (body, tyl) ->
-          begin_def ();
-          let _, ty' = instance_poly ~keep_names:true false tyl body in
-          end_def ();
-          generalize ty';
-          let id = enter_variable lloc name ty' in
-          rp k {
-            pat_desc = Tpat_var (id, name);
-            pat_loc = lloc;
-            pat_extra = [Tpat_constraint cty, loc, sp.ppat_attributes];
-            pat_type = ty;
-            pat_attributes = [];
-            pat_env = !env
-          }
-      | _ -> assert false
-      end
-  | Ppat_alias(sq, name) ->
-      assert (constrs = None);
-      type_pat sq expected_ty (fun q ->
-        begin_def ();
-        let ty_var = build_as_type !env q in
-        end_def ();
-        generalize ty_var;
-        let id = enter_variable ~is_as_variable:true loc name ty_var in
-        rp k {
-          pat_desc = Tpat_alias(q, id, name);
-          pat_loc = loc; pat_extra=[];
-          pat_type = q.pat_type;
-          pat_attributes = sp.ppat_attributes;
-          pat_env = !env })
-  | Ppat_constant cst ->
-      let cst = constant_or_raise !env loc cst in
-      unify_pat_types loc !env (type_constant cst) expected_ty;
-      rp k {
-        pat_desc = Tpat_constant cst;
-        pat_loc = loc; pat_extra=[];
-        pat_type = expected_ty;
-        pat_attributes = sp.ppat_attributes;
-        pat_env = !env }
-  | Ppat_interval (Pconst_char c1, Pconst_char c2) ->
-      let open Ast_helper.Pat in
-      let gloc = {loc with Location.loc_ghost=true} in
-      let rec loop c1 c2 =
-        if c1 = c2 then constant ~loc:gloc (Pconst_char c1)
-        else
-          or_ ~loc:gloc
-            (constant ~loc:gloc (Pconst_char c1))
-            (loop (c1 + 1) c2)
-      in
-      let p = if c1 <= c2 then loop c1 c2 else loop c2 c1 in
-      let p = {p with ppat_loc=loc} in
-      type_pat ~explode:0 p expected_ty k
-        (* TODO: record 'extra' to remember about interval *)
-  | Ppat_interval _ ->
-      raise (Error (loc, !env, Invalid_interval))
-  | Ppat_tuple spl ->
-      assert (List.length spl >= 2);
-      let spl_ann = List.map (fun p -> (p,newvar ())) spl in
-      let ty = newty (Ttuple(List.map snd spl_ann)) in
-      unify_pat_types loc !env ty expected_ty;
-      map_fold_cont (fun (p,t) -> type_pat p t) spl_ann (fun pl ->
-        rp k {
-        pat_desc = Tpat_tuple pl;
-        pat_loc = loc; pat_extra=[];
-        pat_type = expected_ty;
-        pat_attributes = sp.ppat_attributes;
-        pat_env = !env })
-  | Ppat_construct(lid, sarg) ->
-      let opath =
-        try
-          let (p0, p, _) = extract_concrete_variant !env expected_ty in
-            Some (p0, p)
-        with Not_found -> None
-      in
-      let candidates =
-        match lid.txt, constrs with
-          Longident.Lident s, Some constrs when Hashtbl.mem constrs s ->
-            [Hashtbl.find constrs s, (fun () -> ())]
-        | _ ->  Typetexp.find_all_constructors !env lid.loc lid.txt
-      in
-      let check_lk tpath constr =
-        if constr.cstr_generalized then
-          raise (Error (lid.loc, !env,
-                        Unqualified_gadt_pattern (tpath, constr.cstr_name)))
-      in
-      let constr =
-        wrap_disambiguate "This variant pattern is expected to have" expected_ty
-          (Constructor.disambiguate lid !env opath ~check_lk) candidates
-      in
-      if constr.cstr_generalized && constrs <> None && mode = Inside_or
-      then raise Need_backtrack;
-      Env.mark_constructor Env.Pattern !env (Longident.last lid.txt) constr;
-      Builtin_attributes.check_deprecated loc constr.cstr_attributes
-        constr.cstr_name;
-      if no_existentials && constr.cstr_existentials <> [] then
-        raise (Error (loc, !env, Unexpected_existential));
-      (* if constructor is gadt, we must verify that the expected type has the
-         correct head *)
-      if constr.cstr_generalized then
-        unify_head_only loc !env expected_ty constr;
-      let sargs =
-        match sarg with
-          None -> []
-        | Some {ppat_desc = Ppat_tuple spl} when
-            constr.cstr_arity > 1 ||
-            Builtin_attributes.explicit_arity sp.ppat_attributes
-          -> spl
-        | Some({ppat_desc = Ppat_any} as sp) when constr.cstr_arity <> 1 ->
-            if constr.cstr_arity = 0 then
-              Location.prerr_warning sp.ppat_loc
-                                     Warnings.Wildcard_arg_to_constant_constr;
-            replicate_list sp constr.cstr_arity
-        | Some sp -> [sp] in
-      begin match sargs with
-      | [{ppat_desc = Ppat_constant _} as sp]
-        when Builtin_attributes.warn_on_literal_pattern
-            constr.cstr_attributes ->
-          Location.prerr_warning sp.ppat_loc
-            Warnings.Fragile_literal_pattern
-      | _ -> ()
-      end;
-      if List.length sargs <> constr.cstr_arity then
-        raise(Error(loc, !env, Constructor_arity_mismatch(lid.txt,
-                                     constr.cstr_arity, List.length sargs)));
-      let (ty_args, ty_res) =
-        instance_constructor ~in_pattern:(env, get_newtype_level ()) constr
-      in
-      (* PR#7214: do not use gadt unification for toplevel lets *)
-      if not constr.cstr_generalized || mode = Inside_or || no_existentials
-      then unify_pat_types loc !env ty_res expected_ty
-      else unify_pat_types_gadt loc env ty_res expected_ty;
-
-      let rec check_non_escaping p =
-        match p.ppat_desc with
-        | Ppat_or (p1, p2) ->
-            check_non_escaping p1;
-            check_non_escaping p2
-        | Ppat_alias (p, _) ->
-            check_non_escaping p
-        | Ppat_constraint _ ->
-            raise (Error (p.ppat_loc, !env, Inlined_record_escape))
-        | _ ->
-            ()
-      in
-      if constr.cstr_inlined <> None then List.iter check_non_escaping sargs;
-
-      map_fold_cont (fun (p,t) -> type_pat p t) (List.combine sargs ty_args)
-      (fun args ->
-        rp k {
-          pat_desc=Tpat_construct(lid, constr, args);
-          pat_loc = loc; pat_extra=[];
-          pat_type = expected_ty;
-          pat_attributes = sp.ppat_attributes;
-          pat_env = !env })
-  | Ppat_variant(l, sarg) ->
-      let arg_type = match sarg with None -> [] | Some _ -> [newvar()] in
-      let row = { row_fields =
-                    [l, Reither(sarg = None, arg_type, true, ref None)];
-                  row_bound = ();
-                  row_closed = false;
-                  row_more = newvar ();
-                  row_fixed = false;
-                  row_name = None } in
-      (* PR#7404: allow some_other_tag blindly, as it would not unify with
-         the abstract row variable *)
-      if l = Parmatch.some_other_tag then assert (constrs <> None)
-      else unify_pat_types loc !env (newty (Tvariant row)) expected_ty;
-      let k arg =
-        rp k {
-        pat_desc = Tpat_variant(l, arg, ref {row with row_more = newvar()});
-        pat_loc = loc; pat_extra=[];
-        pat_type =  expected_ty;
-        pat_attributes = sp.ppat_attributes;
-        pat_env = !env }
-      in begin
-        (* PR#6235: propagate type information *)
-        match sarg, arg_type with
-          Some p, [ty] -> type_pat p ty (fun p -> k (Some p))
-        | _            -> k None
-      end
-  | Ppat_record(lid_sp_list, closed) ->
-      let opath, record_ty =
-        try
-          let (p0, p, _, _) = extract_concrete_record !env expected_ty in
-          Some (p0, p), expected_ty
-        with Not_found -> None, newvar ()
-      in
-      let process_optional_label (ld, pat) =
-        let exp_optional_attr = check_optional_attr !env ld pat.ppat_attributes pat.ppat_loc in
-        let isFromPamatch = match pat.ppat_desc with
-          | Ppat_construct ({txt = Lident s}, _) ->
-            String.length s >= 2 && s.[0] = '#' && s.[1] = '$'
-          | _ -> false
-        in
-        if label_is_optional ld && not exp_optional_attr && not isFromPamatch then
-          let lid = mknoloc (Longident.(Ldot (Lident "*predef*", "Some"))) in
-          Ast_helper.Pat.construct ~loc:pat.ppat_loc lid (Some pat)
-        else pat
-      in    
-      let type_label_pat (label_lid, label, sarg) k =
-        let sarg = process_optional_label (label, sarg) in
-        begin_def ();
-        let (vars, ty_arg, ty_res) = instance_label false label in
-        if vars = [] then end_def ();
-        begin try
-          unify_pat_types loc !env ty_res record_ty
-        with Unify trace ->
-          raise(Error(label_lid.loc, !env,
-                      Label_mismatch(label_lid.txt, trace)))
-        end;
-        type_pat sarg ty_arg (fun arg ->
-          if vars <> [] then begin
-            end_def ();
-            generalize ty_arg;
-            List.iter generalize vars;
-            let instantiated tv =
-              let tv = expand_head !env tv in
-              not (is_Tvar tv) || tv.level <> generic_level in
-            if List.exists instantiated vars then
-              raise
-                (Error(label_lid.loc, !env, Polymorphic_label label_lid.txt))
-          end;
-          k (label_lid, label, arg))
-      in
-      let k' k lbl_pat_list =
-        check_recordpat_labels loc lbl_pat_list closed;
-        unify_pat_types loc !env record_ty expected_ty;
-        rp k {
-        pat_desc = Tpat_record (lbl_pat_list, closed);
-        pat_loc = loc; pat_extra=[];
-        pat_type = expected_ty;
-        pat_attributes = sp.ppat_attributes;
-        pat_env = !env }
-      in
-      if constrs = None then
-        k (wrap_disambiguate "This record pattern is expected to have"
-             expected_ty
-             (type_label_a_list ?labels loc false !env type_label_pat opath
-                lid_sp_list)
-             (k' (fun x -> x)))
-      else
-        type_label_a_list ?labels loc false !env type_label_pat opath
-          lid_sp_list (k' k)
-  | Ppat_array spl ->
-      let ty_elt = newvar() in
-      unify_pat_types
-        loc !env (instance_def (Predef.type_array ty_elt)) expected_ty;
-      let spl_ann = List.map (fun p -> (p,newvar())) spl in
-      map_fold_cont (fun (p,_) -> type_pat p ty_elt) spl_ann (fun pl ->
-        rp k {
-        pat_desc = Tpat_array pl;
-        pat_loc = loc; pat_extra=[];
-        pat_type = expected_ty;
-        pat_attributes = sp.ppat_attributes;
-        pat_env = !env })
-  | Ppat_or(sp1, sp2) ->
-      let state = save_state env in
-      begin match
-        if mode = Split_or || mode = Splitting_or then raise Need_backtrack;
-        let initial_pattern_variables = !pattern_variables in
-        let initial_module_variables = !module_variables in
-        let p1 =
-          try Some (type_pat ~mode:Inside_or sp1 expected_ty (fun x -> x))
-          with Need_backtrack -> None in
-        let p1_variables = !pattern_variables in
-        let p1_module_variables = !module_variables in
-        pattern_variables := initial_pattern_variables;
-        module_variables := initial_module_variables;
-        let p2 =
-          try Some (type_pat ~mode:Inside_or sp2 expected_ty (fun x -> x))
-          with Need_backtrack -> None in
-        let p2_variables = !pattern_variables in
-        match p1, p2 with
-          None, None -> raise Need_backtrack
-        | Some p, None | None, Some p -> p (* no variables in this case *)
-        | Some p1, Some p2 ->
-        let alpha_env =
-          enter_orpat_variables loc !env p1_variables p2_variables in
-        pattern_variables := p1_variables;
-        module_variables := p1_module_variables;
-        { pat_desc = Tpat_or(p1, alpha_pat alpha_env p2, None);
-          pat_loc = loc; pat_extra=[];
-          pat_type = expected_ty;
-          pat_attributes = sp.ppat_attributes;
-          pat_env = !env }
-      with
-        p -> rp k p
-      | exception Need_backtrack when mode <> Inside_or ->
-          assert (constrs <> None);
-          set_state state env;
-          let mode =
-            if mode = Split_or then mode else Splitting_or in
-          try type_pat ~mode sp1 expected_ty k with Error _ ->
-            set_state state env;
-            type_pat ~mode sp2 expected_ty k
-      end
-  | Ppat_lazy sp1 ->
-      let nv = newvar () in
-      unify_pat_types loc !env (instance_def (Predef.type_lazy_t nv))
-        expected_ty;
-      (* do not explode under lazy: PR#7421 *)
-      type_pat ~explode:0 sp1 nv (fun p1 ->
-        rp k {
-        pat_desc = Tpat_lazy p1;
-        pat_loc = loc; pat_extra=[];
-        pat_type = expected_ty;
-        pat_attributes = sp.ppat_attributes;
-        pat_env = !env })
-  | Ppat_constraint(sp, sty) ->
-      (* Separate when not already separated by !principal *)
-      let separate = true in
-      if separate then begin_def();
-      let cty, force = Typetexp.transl_simple_type_delayed !env sty in
-      let ty = cty.ctyp_type in
-      let ty, expected_ty' =
-        if separate then begin
-          end_def();
-          generalize_structure ty;
-          instance !env ty, instance !env ty
-        end else ty, ty
-      in
-      unify_pat_types loc !env ty expected_ty;
-      type_pat sp expected_ty' (fun p ->
-        (*Format.printf "%a@.%a@."
-          Printtyp.raw_type_expr ty
-          Printtyp.raw_type_expr p.pat_type;*)
-        pattern_force := force :: !pattern_force;
-        let extra = (Tpat_constraint cty, loc, sp.ppat_attributes) in
-        let p =
-          if not separate then p else
-          match p.pat_desc with
-            Tpat_var (id,s) ->
-              {p with pat_type = ty;
-               pat_desc = Tpat_alias
-                 ({p with pat_desc = Tpat_any; pat_attributes = []}, id,s);
-               pat_extra = [extra];
-             }
-          | _ -> {p with pat_type = ty;
-                  pat_extra = extra :: p.pat_extra}
-        in k p)
-  | Ppat_type lid ->
-      let (path, p,ty) = build_or_pat !env loc lid in
-      unify_pat_types loc !env ty expected_ty;
-      k { p with pat_extra =
-        (Tpat_type (path, lid), loc, sp.ppat_attributes) :: p.pat_extra }
-  | Ppat_open (lid,p) ->
-      let path, new_env =
-        !type_open Asttypes.Fresh !env sp.ppat_loc lid in
-      let new_env = ref new_env in
-      type_pat ~env:new_env p expected_ty ( fun p ->
-        env := Env.copy_local !env ~from:!new_env;
-        k { p with pat_extra =( Tpat_open (path,lid,!new_env),
-                            loc, sp.ppat_attributes) :: p.pat_extra }
-      )
-  | Ppat_exception _ ->
-      raise (Error (loc, !env, Exception_pattern_below_toplevel))
-  | Ppat_extension ext ->
-      raise (Error_forward (Builtin_attributes.error_of_extension ext))
-
-let type_pat ?(allow_existentials=false) ?constrs ?labels ?(mode=Normal)
-    ?(explode=0) ?(lev=get_current_level()) env sp expected_ty =
-  newtype_level := Some lev;
-  try
-    let r =
-      type_pat ~no_existentials:(not allow_existentials) ~constrs ~labels
-        ~mode ~explode ~env sp expected_ty (fun x -> x) in
-    iter_pattern (fun p -> p.pat_env <- !env) r;
-    newtype_level := None;
-    r
-  with e ->
-    newtype_level := None;
-    raise e
-
-
-(* this function is passed to Partial.parmatch
-   to type check gadt nonexhaustiveness *)
-let partial_pred ~lev ?mode ?explode env expected_ty constrs labels p =
-  let env = ref env in
-  let state = save_state env in
-  try
-    reset_pattern None true;
-    let typed_p =
-      Ctype.with_passive_variants
-        (type_pat ~allow_existentials:true ~lev
-           ~constrs ~labels ?mode ?explode env p)
-        expected_ty
-    in
-    set_state state env;
-    (* types are invalidated but we don't need them here *)
-    Some typed_p
-  with Error _ ->
-    set_state state env;
-    None
-
-let check_partial ?(lev=get_current_level ()) env expected_ty loc cases =
-  let explode = match cases with [_] -> 5 | _ -> 0 in
-  Parmatch.check_partial_gadt
-    (partial_pred ~lev ~explode env expected_ty) loc cases
-
-let check_unused ?(lev=get_current_level ()) env expected_ty cases =
-  Parmatch.check_unused
-    (fun refute constrs labels spat ->
-      match
-        partial_pred ~lev ~mode:Split_or ~explode:5
-          env expected_ty constrs labels spat
-      with
-        Some pat when refute ->
-          raise (Error (spat.ppat_loc, env, Unrefuted_pattern pat))
-      | r -> r)
-    cases
-
-let add_pattern_variables ?check ?check_as env =
-  let pv = get_ref pattern_variables in
-  (List.fold_right
-     (fun (id, ty, _name, loc, as_var) env ->
-       let check = if as_var then check_as else check in
-       Env.add_value ?check id
-         {val_type = ty; val_kind = Val_reg; Types.val_loc = loc;
-          val_attributes = [];
-         } env
-     )
-     pv env,
-   get_ref module_variables)
-
-let type_pattern ~lev env spat scope expected_ty =
-  reset_pattern scope true;
-  let new_env = ref env in
-  let pat = type_pat ~allow_existentials:true ~lev new_env spat expected_ty in
-  let new_env, unpacks =
-    add_pattern_variables !new_env
-      ~check:(fun s -> Warnings.Unused_var_strict s)
-      ~check_as:(fun s -> Warnings.Unused_var s) in
-  (pat, new_env, get_ref pattern_force, unpacks)
-
-let type_pattern_list env spatl scope expected_tys allow =
-  reset_pattern scope allow;
-  let new_env = ref env in
-  let type_pat (attrs, pat) ty =
-    Builtin_attributes.warning_scope ~ppwarning:false attrs
-      (fun () ->
-         type_pat new_env pat ty
-      )
-  in
-  let patl = List.map2 type_pat spatl expected_tys in
-  let new_env, unpacks = add_pattern_variables !new_env in
-  (patl, new_env, get_ref pattern_force, unpacks)
-
-
-
-
-let rec final_subexpression sexp =
-  match sexp.pexp_desc with
-    Pexp_let (_, _, e)
-  | Pexp_sequence (_, e)
-  | Pexp_try (e, _)
-  | Pexp_ifthenelse (_, e, _)
-  | Pexp_match (_, {pc_rhs=e} :: _)
-    -> final_subexpression e
-  | _ -> sexp
-
-(* Generalization criterion for expressions *)
-
-let rec is_nonexpansive exp =
-  List.exists (function (({txt = "internal.expansive"},_) : Parsetree.attribute) -> true | _ -> false)
-   exp.exp_attributes ||
-  match exp.exp_desc with
-    Texp_ident(_,_,_) -> true
-  | Texp_constant _ -> true
-  | Texp_let(_rec_flag, pat_exp_list, body) ->
-      List.for_all (fun vb -> is_nonexpansive vb.vb_expr) pat_exp_list &&
-      is_nonexpansive body
-  | Texp_function _ -> true
-  | Texp_apply(e, (_,None)::el) ->
-      is_nonexpansive e && List.for_all is_nonexpansive_opt (List.map snd el)
-  | Texp_match(e, cases, [], _) ->
-      is_nonexpansive e &&
-      List.for_all
-        (fun {c_lhs = _; c_guard; c_rhs} ->
-           is_nonexpansive_opt c_guard && is_nonexpansive c_rhs
-        ) cases
-  | Texp_tuple el ->
-      List.for_all is_nonexpansive el
-  | Texp_construct( _, _, el) ->
-      List.for_all is_nonexpansive el
-  | Texp_variant(_, arg) -> is_nonexpansive_opt arg
-  | Texp_record { fields; extended_expression } ->
-      Array.for_all
-        (fun (lbl, definition) ->
-           match definition with
-           | Overridden (_, exp) ->
-               lbl.lbl_mut = Immutable && is_nonexpansive exp
-           | Kept _ -> true)
-        fields
-      && is_nonexpansive_opt extended_expression
-  | Texp_field(exp, _, _) -> is_nonexpansive exp
-  | Texp_array [] ->  !Config.unsafe_empty_array
-  | Texp_ifthenelse(_cond, ifso, ifnot) ->
-      is_nonexpansive ifso && is_nonexpansive_opt ifnot
-  | Texp_sequence (_e1, e2) -> is_nonexpansive e2  (* PR#4354 *)
-  | Texp_new _ ->
-      assert false
-  (* Note: nonexpansive only means no _observable_ side effects *)
-  | Texp_lazy e -> is_nonexpansive e
-  | Texp_object () ->
-    assert false
-  | Texp_letmodule (_, _, mexp, e) ->
-      is_nonexpansive_mod mexp && is_nonexpansive e
-  | Texp_pack mexp ->
-      is_nonexpansive_mod mexp
-  (* Computations which raise exceptions are nonexpansive, since (raise e) is equivalent
-     to (raise e; diverge), and a nonexpansive "diverge" can be produced using lazy values
-     or the relaxed value restriction. See GPR#1142 *)
-  | Texp_assert exp ->
-      is_nonexpansive exp
-  | Texp_apply (
-      { exp_desc = Texp_ident (_, _, {val_kind =
-             Val_prim {Primitive.prim_name = "%raise"}}) },
-      [Nolabel, Some e]) ->
-     is_nonexpansive e
-  | _ -> false
-
-and is_nonexpansive_mod mexp =
-  match mexp.mod_desc with
-  | Tmod_ident _ -> true
-  | Tmod_functor _ -> true
-  | Tmod_unpack (e, _) -> is_nonexpansive e
-  | Tmod_constraint (m, _, _, _) -> is_nonexpansive_mod m
-  | Tmod_structure str ->
-      List.for_all
-        (fun item -> match item.str_desc with
-          | Tstr_eval _ | Tstr_primitive _ | Tstr_type _
-          | Tstr_modtype _ | Tstr_open _ | Tstr_class_type _  -> true
-          | Tstr_value (_, pat_exp_list) ->
-              List.for_all (fun vb -> is_nonexpansive vb.vb_expr) pat_exp_list
-          | Tstr_module {mb_expr=m;_}
-          | Tstr_include {incl_mod=m;_} -> is_nonexpansive_mod m
-          | Tstr_recmodule id_mod_list ->
-              List.for_all (fun {mb_expr=m;_} -> is_nonexpansive_mod m)
-                id_mod_list
-          | Tstr_exception {ext_kind = Text_decl _} ->
-              false (* true would be unsound *)
-          | Tstr_exception {ext_kind = Text_rebind _} -> true
-          | Tstr_typext te ->
-              List.for_all
-                (function {ext_kind = Text_decl _} -> false
-                        | {ext_kind = Text_rebind _} -> true)
-                te.tyext_constructors
-          | Tstr_class _ -> false (* could be more precise *)
-          | Tstr_attribute _ -> true
-        )
-        str.str_items
-  | Tmod_apply _ -> false
-
-and is_nonexpansive_opt = function
-    None -> true
-  | Some e -> is_nonexpansive e
-
-
-
-
-(* Approximate the type of an expression, for better recursion *)
-
-let rec approx_type env sty =
-  match sty.ptyp_desc with
-    Ptyp_arrow (p, _, sty) ->
-      let ty1 = if is_optional p then type_option (newvar ()) else newvar () in
-      newty (Tarrow (p, ty1, approx_type env sty, Cok))
-  | Ptyp_tuple args ->
-      newty (Ttuple (List.map (approx_type env) args))
-  | Ptyp_constr (lid, ctl) ->
-      begin try
-        let path = Env.lookup_type lid.txt env in
-        let decl = Env.find_type path env in
-        if List.length ctl <> decl.type_arity then raise Not_found;
-        let tyl = List.map (approx_type env) ctl in
-        newconstr path tyl
-      with Not_found -> newvar ()
-      end
-  | Ptyp_poly (_, sty) ->
-      approx_type env sty
-  | _ -> newvar ()
-
-let rec type_approx env sexp =
-  match sexp.pexp_desc with
-    Pexp_let (_, _, e) -> type_approx env e
-  | Pexp_fun (p, _, _, e) ->
-      let ty = if is_optional p then type_option (newvar ()) else newvar () in
-      newty (Tarrow(p, ty, type_approx env e, Cok))
-  | Pexp_function ({pc_rhs=e}::_) ->
-      newty (Tarrow(Nolabel, newvar (), type_approx env e, Cok))
-  | Pexp_match (_, {pc_rhs=e}::_) -> type_approx env e
-  | Pexp_try (e, _) -> type_approx env e
-  | Pexp_tuple l -> newty (Ttuple(List.map (type_approx env) l))
-  | Pexp_ifthenelse (_,e,_) -> type_approx env e
-  | Pexp_sequence (_,e) -> type_approx env e
-  | Pexp_constraint (e, sty) ->
-      let ty = type_approx env e in
-      let ty1 = approx_type env sty in
-      begin try unify env ty ty1 with Unify trace ->
-        raise(Error(sexp.pexp_loc, env, Expr_type_clash (trace, None)))
-      end;
-      ty1
-  | Pexp_coerce (e, sty1, sty2) ->
-      let approx_ty_opt = function
-        | None -> newvar ()
-        | Some sty -> approx_type env sty
-      in
-      let ty = type_approx env e
-      and ty1 = approx_ty_opt sty1
-      and ty2 = approx_type env sty2 in
-      begin try unify env ty ty1 with Unify trace ->
-        raise(Error(sexp.pexp_loc, env, Expr_type_clash (trace, None)))
-      end;
-      ty2
-  | _ -> newvar ()
-
-(* List labels in a function type, and whether return type is a variable *)
-let rec list_labels_aux env visited ls ty_fun =
-  let ty = expand_head env ty_fun in
-  if List.memq ty visited then
-    List.rev ls, false
-  else match ty.desc with
-    Tarrow (l, _, ty_res, _) ->
-      list_labels_aux env (ty::visited) (l::ls) ty_res
-  | _ ->
-      List.rev ls, is_Tvar ty
-
-let list_labels env ty =
-  wrap_trace_gadt_instances env (list_labels_aux env [] []) ty
-
-(* Check that all univars are safe in a type *)
-let check_univars env expans kind exp ty_expected vars =
-  if expans && not (is_nonexpansive exp) then
-    generalize_expansive env exp.exp_type;
-  (* need to expand twice? cf. Ctype.unify2 *)
-  let vars = List.map (expand_head env) vars in
-  let vars = List.map (expand_head env) vars in
-  let vars' =
-    Ext_list.filter vars
-      (fun t ->
-        let t = repr t in
-        generalize t;
-        match t.desc with
-          Tvar name when t.level = generic_level ->
-            log_type t; t.desc <- Tunivar name; true
-        | _ -> false)
-  in
-  if List.length vars = List.length vars' then () else
-  let ty = newgenty (Tpoly(repr exp.exp_type, vars'))
-  and ty_expected = repr ty_expected in
-  raise (Error (exp.exp_loc, env,
-                Less_general(kind, [ty, ty; ty_expected, ty_expected])))
-
-(* Check that a type is not a function *)
-let check_application_result env statement exp =
-  let loc = exp.exp_loc in
-  match (expand_head env exp.exp_type).desc with
-  | Tarrow _ ->
-      Location.prerr_warning exp.exp_loc Warnings.Partial_application
-  | Tvar _ -> ()
-  | Tconstr (p, _, _) when Path.same p Predef.path_unit -> ()
-  | _ ->
-      if statement then
-        Location.prerr_warning loc Warnings.Statement_type
-
-(* Check that a type is generalizable at some level *)
-let generalizable level ty =
-  let rec check ty =
-    let ty = repr ty in
-    if ty.level < lowest_level then () else
-    if ty.level <= level then raise Exit else
-    (mark_type_node ty; iter_type_expr check ty)
-  in
-  try check ty; unmark_type ty; true
-  with Exit -> unmark_type ty; false
-
-(* Hack to allow coercion of self. Will clean-up later. *)
-let self_coercion = ref ([] : (Path.t * Location.t list ref) list)
-
-(* Helpers for packaged modules. *)
-let create_package_type loc env (p, l) =
-  let s = !Typetexp.transl_modtype_longident loc env p in
-  let fields = List.map (fun (name, ct) ->
-                           name, Typetexp.transl_simple_type env false ct) l in
-  let ty = newty (Tpackage (s,
-                    List.map fst l,
-                   List.map (fun (_, cty) -> cty.ctyp_type) fields))
-  in
-   (s, fields, ty)
-
- let wrap_unpacks sexp unpacks =
-   let open Ast_helper in
-   List.fold_left
-     (fun sexp (name, loc) ->
-       Exp.letmodule ~loc:sexp.pexp_loc ~attrs:[mknoloc "#modulepat",PStr []]
-         name
-         (Mod.unpack ~loc
-            (Exp.ident ~loc:name.loc (mkloc (Longident.Lident name.txt)
-                                            name.loc)))
-         sexp
-     )
-    sexp unpacks
-
-(* Helpers for type_cases *)
-
-let contains_variant_either ty =
-  let rec loop ty =
-    let ty = repr ty in
-    if ty.level >= lowest_level then begin
-      mark_type_node ty;
-      match ty.desc with
-        Tvariant row ->
-          let row = row_repr row in
-          if not row.row_fixed then
-            List.iter
-              (fun (_,f) ->
-                match row_field_repr f with Reither _ -> raise Exit | _ -> ())
-              row.row_fields;
-          iter_row loop row
-      | _ ->
-          iter_type_expr loop ty
-    end
-  in
-  try loop ty; unmark_type ty; false
-  with Exit -> unmark_type ty; true
-
-let iter_ppat f p =
-  match p.ppat_desc with
-  | Ppat_any | Ppat_var _ | Ppat_constant _ | Ppat_interval _
-  | Ppat_extension _
-  | Ppat_type _ | Ppat_unpack _ -> ()
-  | Ppat_array pats -> List.iter f pats
-  | Ppat_or (p1,p2) -> f p1; f p2
-  | Ppat_variant (_, arg) | Ppat_construct (_, arg) -> may f arg
-  | Ppat_tuple lst ->  List.iter f lst
-  | Ppat_exception p | Ppat_alias (p,_)
-  | Ppat_open (_,p)
-  | Ppat_constraint (p,_) | Ppat_lazy p -> f p
-  | Ppat_record (args, _flag) -> List.iter (fun (_,p) -> f p) args
-
-let contains_polymorphic_variant p =
-  let rec loop p =
-    match p.ppat_desc with
-      Ppat_variant _ | Ppat_type _ -> raise Exit
-    | _ -> iter_ppat loop p
-  in
-  try loop p; false with Exit -> true
-
-let contains_gadt env p =
-  let rec loop env p =
-    match p.ppat_desc with
-      | Ppat_construct (lid, _) ->
-        begin try
-          let cstrs = Env.lookup_all_constructors lid.txt env in
-          List.iter (fun (cstr,_) -> if cstr.cstr_generalized then raise_notrace Exit)
-            cstrs
-        with Not_found -> ()
-        end; iter_ppat (loop env) p
-      | Ppat_open (lid,sub_p) ->
-        let _, new_env = !type_open Asttypes.Override env p.ppat_loc lid in
-        loop new_env sub_p
-    | _ -> iter_ppat (loop env) p
-  in
-  try loop env p; false with Exit -> true
-
-let check_absent_variant env =
-  iter_pattern
-    (function {pat_desc = Tpat_variant (s, arg, row)} as pat ->
-      let row = row_repr !row in
-      if List.exists (fun (s',fi) -> s = s' && row_field_repr fi <> Rabsent)
-          row.row_fields
-      || not row.row_fixed && not (static_row row)  (* same as Ctype.poly *)
-      then () else
-      let ty_arg =
-        match arg with None -> [] | Some p -> [correct_levels p.pat_type] in
-      let row' = {row_fields = [s, Reither(arg=None,ty_arg,true,ref None)];
-                  row_more = newvar (); row_bound = ();
-                  row_closed = false; row_fixed = false; row_name = None} in
-      (* Should fail *)
-      unify_pat env {pat with pat_type = newty (Tvariant row')}
-                    (correct_levels pat.pat_type)
-      | _ -> ())
-
-(* Duplicate types of values in the environment *)
-(* XXX Should we do something about global type variables too? *)
-
-let duplicate_ident_types caselist env =
-  let caselist =
-    Ext_list.filter caselist (fun {pc_lhs} -> contains_gadt env pc_lhs) in
-  Env.copy_types (all_idents_cases caselist) env
-
-  
-(* type_label_a_list returns a list of labels sorted by lbl_pos *)
-(* note: check_duplicates would better be implemented in
-         type_label_a_list directly *)  
-let rec check_duplicates loc env = function
-  | (_, lbl1, _) :: (_, lbl2, _) :: _ when lbl1.lbl_pos = lbl2.lbl_pos ->
-    raise(Error(loc, env, Label_multiply_defined lbl1.lbl_name))
-  | _ :: rem ->
-      check_duplicates loc env rem
-  | [] -> ()  
-(* Getting proper location of already typed expressions.
-
-   Used to avoid confusing locations on type error messages in presence of
-   type constraints.
-   For example:
-
-       (* Before patch *)
-       # let x : string = (5 : int);;
-                           ^
-       (* After patch *)
-       # let x : string = (5 : int);;
-                          ^^^^^^^^^
-*)
-let proper_exp_loc exp =
-  let rec aux = function
-    | [] -> exp.exp_loc
-    | ((Texp_constraint _ | Texp_coerce _), loc, _) :: _ -> loc
-    | _ :: rest -> aux rest
-  in
-  aux exp.exp_extra
-
-let id_of_pattern : Typedtree.pattern -> Ident.t option = fun pat -> 
-  match pat.pat_desc with 
-  | Tpat_var (id, _) -> Some id
-  | Tpat_alias(_, id, _) -> Some id
-  | Tpat_construct (_,_,
-                    [{pat_desc = (Tpat_var (id,_) | Tpat_alias(_,id,_))}]) 
-    -> Some (Ident.rename id)     
-  | _ -> None
-(* To find reasonable names for let-bound and lambda-bound idents *)
-
-let rec name_pattern default = function
-    [] -> Ident.create default
-  | {c_lhs=p; _} :: rem ->
-    match id_of_pattern p with 
-    | None -> name_pattern default rem
-    | Some id -> id    
-
-(* Typing of expressions *)
-
-let unify_exp ?typeClashContext env exp expected_ty =
-  let loc = proper_exp_loc exp in
-  unify_exp_types ?typeClashContext loc env exp.exp_type expected_ty
-
-
-let is_ignore funct env =
-  match funct.exp_desc with
-    Texp_ident (_, _, {val_kind=Val_prim{Primitive.prim_name="%ignore"}}) ->
-      (try ignore (filter_arrow env (instance env funct.exp_type) Nolabel);
-             true
-        with Unify _ -> false)
-  | _ -> false
-
-let not_identity = function
-  | Texp_ident(_,_,{val_kind=Val_prim
-                  {Primitive.prim_name="%identity"}}) ->
-    false
-  | _ -> true  
-
-let rec lower_args env seen ty_fun  =
-  let ty = expand_head env ty_fun in
-    if List.memq ty seen then () else
-    match ty.desc with
-      Tarrow (_l, ty_arg, ty_fun, _com) ->
-        (try unify_var env (newvar()) ty_arg with Unify _ -> assert false);
-        lower_args env (ty::seen) ty_fun
-    | _ -> ()
-
-let not_function env ty =
-  let ls, tvar = list_labels env ty in
-  ls = [] && not tvar
-
-let check_might_be_component env ty_record =
-  match (expand_head env ty_record).desc with 
-  | Tconstr (path, _, _) when path |> Path.last = "props" -> true 
-  | _ -> false
-    
-type lazy_args = 
-  (Asttypes.arg_label * (unit -> Typedtree.expression) option) list
-
-type targs = 
-  (Asttypes.arg_label * Typedtree.expression option) list  
-let rec type_exp ?recarg env sexp =
-  (* We now delegate everything to type_expect *)
-  type_expect ?recarg env sexp (newvar ())
-
-(* Typing of an expression with an expected type.
-   This provide better error messages, and allows controlled
-   propagation of return type information.
-   In the principal case, [type_expected'] may be at generic_level.
- *)
-
-and type_expect ?typeClashContext ?in_function ?recarg env sexp ty_expected =
-  let previous_saved_types = Cmt_format.get_saved_types () in
-  let exp =
-    Builtin_attributes.warning_scope sexp.pexp_attributes
-      (fun () ->
-         type_expect_ ?typeClashContext ?in_function ?recarg env sexp ty_expected
-      )
-  in
-  Cmt_format.set_saved_types
-  (Cmt_format.Partial_expression exp :: previous_saved_types);
-  exp
-
-and type_expect_ ?typeClashContext ?in_function ?(recarg=Rejected) env sexp ty_expected =
-  let loc = sexp.pexp_loc in
-  (* Record the expression type before unifying it with the expected type *)
-  let rue exp =
-    unify_exp ?typeClashContext env (re exp) (instance env ty_expected);
-    exp
-  in
-  let process_optional_label (id, ld, e) =
-    let exp_optional_attr = check_optional_attr env ld e.pexp_attributes e.pexp_loc in
-    if label_is_optional ld && not exp_optional_attr then
-      let lid = mknoloc (Longident.(Ldot (Lident "*predef*", "Some"))) in
-      let e = Ast_helper.Exp.construct ~loc:e.pexp_loc lid (Some e)
-      in (id, ld, e)
-    else (id, ld, e)
-  in
-  match sexp.pexp_desc with
-  | Pexp_ident lid ->
-      begin
-        let (path, desc) = Typetexp.find_value env lid.loc lid.txt in
-        if !Clflags.annotations then begin
-          let dloc = desc.Types.val_loc in
-          let annot =
-            if dloc.Location.loc_ghost then Annot.Iref_external
-            else Annot.Iref_internal dloc
-          in
-          let name = Path.name ~paren:Oprint.parenthesized_ident path in
-          Stypes.record (Stypes.An_ident (loc, name, annot))
-        end;
-        let is_recarg =
-          match (repr desc.val_type).desc with
-          | Tconstr(p, _, _) -> Path.is_constructor_typath p
-          | _ -> false
-        in
-
-        begin match is_recarg, recarg, (repr desc.val_type).desc with
-        | _, Allowed, _
-        | true, Required, _
-        | false, Rejected, _
-          -> ()
-        | true, Rejected, _
-        | false, Required, (Tvar _ | Tconstr _) ->
-            raise (Error (loc, env, Inlined_record_escape))
-        | false, Required, _  ->
-            () (* will fail later *)
-        end;
-        rue {
-          exp_desc = Texp_ident(path, lid, desc);
-          exp_loc = loc; exp_extra = [];
-          exp_type = instance env desc.val_type;
-          exp_attributes = sexp.pexp_attributes;
-          exp_env = env }
-      end
-  | Pexp_constant cst ->
-      let cst = constant_or_raise env loc cst in
-      rue {
-        exp_desc = Texp_constant cst;
-        exp_loc = loc; exp_extra = [];
-        exp_type = type_constant cst;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_let(Nonrecursive,
-             [{pvb_pat=spat; pvb_expr=sval; pvb_attributes=[]}], sbody)
-    when contains_gadt env spat ->
-    (* TODO: allow non-empty attributes? *)
-      type_expect ?in_function env
-        {sexp with
-         pexp_desc = Pexp_match (sval, [Ast_helper.Exp.case spat sbody])}
-        ty_expected
-  | Pexp_let(rec_flag, spat_sexp_list, sbody) ->
-      let scp =
-        match sexp.pexp_attributes, rec_flag with
-        | [{txt="#default"},_], _ -> None
-        | _, Recursive -> Some (Annot.Idef loc)
-        | _, Nonrecursive -> Some (Annot.Idef sbody.pexp_loc)
-      in
-      let (pat_exp_list, new_env, unpacks) =
-        type_let env rec_flag spat_sexp_list scp true in
-      let body =
-        type_expect new_env (wrap_unpacks sbody unpacks) ty_expected in
-      let () =
-        if rec_flag = Recursive then
-          Rec_check.check_recursive_bindings pat_exp_list
-      in
-      re {
-        exp_desc = Texp_let(rec_flag, pat_exp_list, body);
-        exp_loc = loc; exp_extra = [];
-        exp_type = body.exp_type;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_fun (l, Some default, spat, sbody) ->
-      assert(is_optional l); (* default allowed only with optional argument *)
-      let open Ast_helper in
-      let default_loc = default.pexp_loc in
-      let scases = [
-        Exp.case
-          (Pat.construct ~loc:default_loc
-             (mknoloc (Longident.(Ldot (Lident "*predef*", "Some"))))
-             (Some (Pat.var ~loc:default_loc (mknoloc "*sth*"))))
-          (Exp.ident ~loc:default_loc (mknoloc (Longident.Lident "*sth*")));
-
-        Exp.case
-          (Pat.construct ~loc:default_loc
-             (mknoloc (Longident.(Ldot (Lident "*predef*", "None"))))
-             None)
-          default;
-       ]
-      in
-      let sloc =
-        { Location.loc_start = spat.ppat_loc.Location.loc_start;
-          loc_end = default_loc.Location.loc_end;
-          loc_ghost = true }
-      in
-      let smatch =
-        Exp.match_ ~loc:sloc
-          (Exp.ident ~loc (mknoloc (Longident.Lident "*opt*")))
-          scases
-      in
-      let pat = Pat.var ~loc:sloc (mknoloc "*opt*") in
-      let body =
-        Exp.let_ ~loc Nonrecursive ~attrs:[mknoloc "#default",PStr []]
-          [Vb.mk spat smatch] sbody
-      in
-      type_function ?in_function loc sexp.pexp_attributes env ty_expected
-        l [Exp.case pat body]
-  | Pexp_fun (l, None, spat, sbody) ->
-      type_function ?in_function loc sexp.pexp_attributes env ty_expected
-        l [Ast_helper.Exp.case spat sbody]
-  | Pexp_function caselist ->
-      type_function ?in_function
-        loc sexp.pexp_attributes env ty_expected Nolabel caselist
-  | Pexp_apply(sfunct, sargs) ->
-      assert (sargs <> []);
-      begin_def (); (* one more level for non-returning functions *)
-      let funct = type_exp env sfunct in
-      let ty = instance env funct.exp_type in
-      end_def ();
-      wrap_trace_gadt_instances env (lower_args env []) ty;
-      begin_def ();
-      let uncurried =
-        Ext_list.exists sexp.pexp_attributes (fun ({txt },_) -> txt = "res.uapp")
-        && not @@ Ext_list.exists sexp.pexp_attributes (fun ({txt },_) -> txt = "res.partial")
-        && not @@ is_automatic_curried_application env funct in
-      let typeClashContext = typeClashContextFromFunction sexp sfunct in
-      let (args, ty_res, fully_applied) = type_application ?typeClashContext uncurried env funct sargs in
-      end_def ();
-      unify_var env (newvar()) funct.exp_type;
-
-      let mk_exp ?(loc=Location.none) exp_desc exp_type =
-        { exp_desc;
-          exp_loc = loc; exp_extra = [];
-          exp_type;
-          exp_attributes = [];
-          exp_env = env } in
-      let apply_internal name e =
-        let lid:Longident.t = Ldot (Ldot (Lident "Js", "Internal"), name) in
-        let (path, desc) = Env.lookup_value lid env in
-        let id = mk_exp (Texp_ident(path, {txt=lid; loc=Location.none}, desc)) desc.val_type in
-        mk_exp ~loc:e.exp_loc (Texp_apply(id, [(Nolabel, Some e)])) e.exp_type in
-        
-      let mk_apply funct args =
-        rue {
-          exp_desc = Texp_apply(funct, args);
-          exp_loc = loc; exp_extra = [];
-          exp_type = ty_res;
-          exp_attributes = sexp.pexp_attributes;
-          exp_env = env } in
-
-      let is_primitive = match funct.exp_desc with
-        | Texp_ident (_, _, {val_kind = Val_prim _}) -> true
-        | _ -> false in
-
-      if fully_applied && not is_primitive then
-        rue (apply_internal "opaqueFullApply" (mk_apply (apply_internal "opaque" funct) args))
-      else
-        rue (mk_apply funct args)
-  | Pexp_match(sarg, caselist) ->
-      begin_def ();
-      let arg = type_exp env sarg in
-      end_def ();
-      if not (is_nonexpansive arg) then generalize_expansive env arg.exp_type;
-      generalize arg.exp_type;
-      let rec split_cases vc ec = function
-        | [] -> List.rev vc, List.rev ec
-        | {pc_lhs = {ppat_desc=Ppat_exception p}} as c :: rest ->
-            split_cases vc ({c with pc_lhs = p} :: ec) rest
-        | c :: rest ->
-            split_cases (c :: vc) ec rest
-      in
-      let val_caselist, exn_caselist = split_cases [] [] caselist in
-      if val_caselist = [] && exn_caselist <> [] then
-        raise (Error (loc, env, No_value_clauses));
-      (* Note: val_caselist = [] and exn_caselist = [], i.e. a fully
-         empty pattern matching can be generated by Camlp4 with its
-         revised syntax.  Let's accept it for backward compatibility. *)
-      let val_cases, partial =
-        type_cases ~rootTypeClashContext:Switch env arg.exp_type ty_expected true loc val_caselist in
-      let exn_cases, _ =
-        type_cases ~rootTypeClashContext:Switch env Predef.type_exn ty_expected false loc exn_caselist in
-      re {
-        exp_desc = Texp_match(arg, val_cases, exn_cases, partial);
-        exp_loc = loc; exp_extra = [];
-        exp_type = instance env ty_expected;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_try(sbody, caselist) ->
-      let body = type_expect env sbody ty_expected in
-      let cases, _ =
-        type_cases env Predef.type_exn ty_expected false loc caselist in
-      re {
-        exp_desc = Texp_try(body, cases);
-        exp_loc = loc; exp_extra = [];
-        exp_type = body.exp_type;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_tuple sexpl ->
-      assert (List.length sexpl >= 2);
-      let subtypes = List.map (fun _ -> newgenvar ()) sexpl in
-      let to_unify = newgenty (Ttuple subtypes) in
-      unify_exp_types loc env to_unify ty_expected;
-      let expl =
-        List.map2 (fun body ty -> type_expect env body ty) sexpl subtypes
-      in
-      re {
-        exp_desc = Texp_tuple expl;
-        exp_loc = loc; exp_extra = [];
-        (* Keep sharing *)
-        exp_type = newty (Ttuple (List.map (fun e -> e.exp_type) expl));
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_construct({txt = Lident "Function$"} as lid, sarg) ->
-      let state = Warnings.backup () in
-      let arity = Ast_uncurried.attributes_to_arity sexp.pexp_attributes in
-      let uncurried_typ = Ast_uncurried.make_uncurried_type ~env ~arity (newvar()) in
-      unify_exp_types loc env uncurried_typ ty_expected;
-      (* Disable Unerasable_optional_argument for uncurried functions *)
-      let unerasable_optional_argument = Warnings.number Unerasable_optional_argument in
-      Warnings.parse_options false ("-" ^ string_of_int unerasable_optional_argument);
-      let exp = type_construct env loc lid sarg uncurried_typ sexp.pexp_attributes in
-      Warnings.restore state;
-      exp
-  | Pexp_construct(lid, sarg) ->
-      type_construct env loc lid sarg ty_expected sexp.pexp_attributes
-  | Pexp_variant(l, sarg) ->
-      (* Keep sharing *)
-      let ty_expected0 = instance env ty_expected in
-      begin try match
-        sarg, expand_head env ty_expected, expand_head env ty_expected0 with
-      | Some sarg, {desc = Tvariant row}, {desc = Tvariant row0} ->
-          let row = row_repr row in
-          begin match row_field_repr (List.assoc l row.row_fields),
-          row_field_repr (List.assoc l row0.row_fields) with
-            Rpresent (Some ty), Rpresent (Some ty0) ->
-              let arg = type_argument env sarg ty ty0 in
-              re { exp_desc = Texp_variant(l, Some arg);
-                   exp_loc = loc; exp_extra = [];
-                   exp_type = ty_expected0;
-                   exp_attributes = sexp.pexp_attributes;
-                   exp_env = env }
-          | _ -> raise Not_found
-          end
-      | _ -> raise Not_found
-      with Not_found ->
-        let arg = may_map (type_exp env) sarg in
-        let arg_type = may_map (fun arg -> arg.exp_type) arg in
-        rue {
-          exp_desc = Texp_variant(l, arg);
-          exp_loc = loc; exp_extra = [];
-          exp_type= newty (Tvariant{row_fields = [l, Rpresent arg_type];
-                                    row_more = newvar ();
-                                    row_bound = ();
-                                    row_closed = false;
-                                    row_fixed = false;
-                                    row_name = None});
-          exp_attributes = sexp.pexp_attributes;
-          exp_env = env }
-      end
-    | Pexp_record(lid_sexp_list, None) ->
-        let ty_record, opath, fields, repr_opt =          
-          match extract_concrete_record env ty_expected with
-          |  (p0, p, fields, repr) ->
-              (* XXX level may be wrong *)
-              ty_expected, Some (p0, p), fields, Some repr 
-          | exception Not_found -> 
-               newvar (), None, [], None
-          
-        in
-        let lbl_exp_list =
-          wrap_disambiguate "This record expression is expected to have" ty_record
-            (type_label_a_list loc true env
-               (fun e k -> k (type_label_exp true env loc ty_record (process_optional_label e)))
-               opath lid_sexp_list)
-            (fun x -> x)
-        in
-        unify_exp_types loc env ty_record (instance env ty_expected);
-        check_duplicates loc env lbl_exp_list;
-        let label_descriptions, representation = match lbl_exp_list, repr_opt with
-        | (_, { lbl_all = label_descriptions; lbl_repres = representation}, _) :: _, _ -> label_descriptions, representation
-        | [], Some (representation) when lid_sexp_list = [] ->
-            let optional_labels = match representation with
-            | Record_optional_labels optional_labels -> optional_labels
-            | Record_inlined {optional_labels} -> optional_labels
-            | _ -> [] in
-            let filter_missing (ld : Types.label_declaration) =
-              let name = Ident.name ld.ld_id in
-              if List.mem name optional_labels then
-                None
-              else
-                Some name in
-            let labels_missing = fields |> List.filter_map filter_missing in
-            if labels_missing <> [] then (
-              let might_be_component = check_might_be_component env ty_record in
-              raise(Error(loc, env, Labels_missing (labels_missing, might_be_component))));
-            [||], representation
-        | [], _ ->
-          if fields = [] && repr_opt <> None then
-            [||], Record_optional_labels []
-          else
-            raise(Error(loc, env, Empty_record_literal)) in
-        let labels_missing = ref [] in
-        let label_definitions =
-          let matching_label lbl =
-            List.find
-              (fun (_, lbl',_) -> lbl'.lbl_pos = lbl.lbl_pos)
-              lbl_exp_list
-          in
-          Array.map 
-          (fun lbl ->
-                    match matching_label lbl with
-                    | (lid, _lbl, lbl_exp) ->
-                        Overridden (lid, lbl_exp)
-                    | exception Not_found ->
-                      if not (label_is_optional lbl) then labels_missing := lbl.lbl_name :: !labels_missing;
-                      Overridden ({loc ; txt = Lident lbl.lbl_name}, option_none lbl.lbl_arg loc))
-                  label_descriptions
-        in
-        if !labels_missing <> [] then (
-          let might_be_component = check_might_be_component env ty_record in
-          raise(Error(loc, env, Labels_missing ((List.rev !labels_missing), might_be_component))));
-        let fields =
-          Array.map2 (fun descr def -> descr, def)
-            label_descriptions label_definitions
-        in
-        re {
-          exp_desc = Texp_record {
-              fields; representation;
-              extended_expression = None
-            };
-          exp_loc = loc; exp_extra = [];
-          exp_type = instance env ty_expected;
-          exp_attributes = sexp.pexp_attributes;
-          exp_env = env }      
-  | Pexp_record(lid_sexp_list, Some sexp) ->
-      assert (lid_sexp_list <> []);      
-      let exp = type_exp ~recarg env sexp in                  
-      let ty_record, opath =
-        let get_path ty =
-          try
-            let (p0, p, _, _) = extract_concrete_record env ty in
-            (* XXX level may be wrong *)
-            Some (p0, p) 
-          with Not_found -> None
-        in
-        match get_path ty_expected with
-          None ->
-            begin 
-                match get_path exp.exp_type with
-                  None -> newvar (), None
-                | Some (_, p') as op ->
-                    let decl = Env.find_type p' env in
-                    begin_def ();
-                    let ty =
-                      newconstr p' (instance_list env decl.type_params) in
-                    end_def ();
-                    generalize_structure ty;
-                    ty, op
-            end
-        | op -> ty_expected, op
-      in
-      let closed = false in
-      let lbl_exp_list =
-        wrap_disambiguate "This record expression is expected to have" ty_record
-          (type_label_a_list loc closed env
-             (fun e k -> k (type_label_exp true env loc ty_record (process_optional_label e)))
-             opath lid_sexp_list)
-          (fun x -> x)
-      in
-      unify_exp_types loc env ty_record (instance env ty_expected);
-      check_duplicates loc env lbl_exp_list;
-      let opt_exp, label_definitions =
-        let (_lid, lbl, _lbl_exp) = List.hd lbl_exp_list in
-        let matching_label lbl =
-          List.find
-            (fun (_, lbl',_) -> lbl'.lbl_pos = lbl.lbl_pos)
-            lbl_exp_list
-        in
-            let ty_exp = instance env exp.exp_type in
-            let unify_kept lbl =
-              let _, ty_arg1, ty_res1 = instance_label false lbl in
-              unify_exp_types exp.exp_loc env ty_exp ty_res1;
-              match matching_label lbl with
-              | lid, _lbl, lbl_exp ->
-                  (* do not connect result types for overridden labels *)
-                  Overridden (lid, lbl_exp)
-              | exception Not_found -> begin
-                  let _, ty_arg2, ty_res2 = instance_label false lbl in
-                  unify_exp_types loc env ty_arg1 ty_arg2;
-                  unify_exp_types loc env (instance env ty_expected) ty_res2;
-                  Kept ty_arg1
-                end
-            in
-            let label_definitions = Array.map unify_kept lbl.lbl_all in
-            Some {exp with exp_type = ty_exp}, label_definitions
-      in
-      let num_fields =
-        match lbl_exp_list with [] -> assert false
-        | (_, lbl,_)::_ -> Array.length lbl.lbl_all in
-      let opt_exp =
-        if List.length lid_sexp_list = num_fields then
-          (Location.prerr_warning loc Warnings.Useless_record_with; None)
-        else opt_exp
-      in
-      let label_descriptions, representation =
-        let (_, { lbl_all; lbl_repres }, _) = List.hd lbl_exp_list in
-        lbl_all, lbl_repres
-      in
-      let fields =
-        Array.map2 (fun descr def -> descr, def)
-          label_descriptions label_definitions
-      in
-      re {
-        exp_desc = Texp_record {
-            fields; representation;
-            extended_expression = opt_exp
-          };
-        exp_loc = loc; exp_extra = [];
-        exp_type = instance env ty_expected;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_field(srecord, lid) ->
-      let (record, label, _) = type_label_access env srecord lid in
-      let (_, ty_arg, ty_res) = instance_label false label in
-      unify_exp env record ty_res;
-      rue {
-        exp_desc = Texp_field(record, lid, label);
-        exp_loc = loc; exp_extra = [];
-        exp_type = ty_arg;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_setfield(srecord, lid, snewval) ->
-      let (record, label, opath) = type_label_access env srecord lid in
-      let ty_record = if opath = None then newvar () else record.exp_type in
-      let (label_loc, label, newval) =
-        type_label_exp ~typeClashContext:SetRecordField false env loc ty_record (lid, label, snewval) in
-      unify_exp env record ty_record;
-      if label.lbl_mut = Immutable then
-        raise(Error(loc, env, Label_not_mutable lid.txt));
-      Builtin_attributes.check_deprecated_mutable lid.loc label.lbl_attributes
-        (Longident.last lid.txt);
-      rue {
-        exp_desc = Texp_setfield(record, label_loc, label, newval);
-        exp_loc = loc; exp_extra = [];
-        exp_type = instance_def Predef.type_unit;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_array(sargl) ->
-      let ty = newgenvar() in
-      let to_unify = Predef.type_array ty in
-      unify_exp_types loc env to_unify ty_expected;
-      let argl = List.map (fun sarg -> type_expect ~typeClashContext:ArrayValue env sarg ty) sargl in
-      re {
-        exp_desc = Texp_array argl;
-        exp_loc = loc; exp_extra = [];
-        exp_type = instance env ty_expected;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_ifthenelse(scond, sifso, sifnot) ->
-      let cond = type_expect ~typeClashContext:IfCondition env scond Predef.type_bool in
-      begin match sifnot with
-        None ->
-          let ifso = type_expect ~typeClashContext:IfReturn env sifso Predef.type_unit in
-          rue {
-            exp_desc = Texp_ifthenelse(cond, ifso, None);
-            exp_loc = loc; exp_extra = [];
-            exp_type = ifso.exp_type;
-            exp_attributes = sexp.pexp_attributes;
-            exp_env = env }
-      | Some sifnot ->
-          let ifso = type_expect ~typeClashContext:IfReturn env sifso ty_expected in
-          let ifnot = type_expect ~typeClashContext:IfReturn env sifnot ty_expected in
-          (* Keep sharing *)
-          unify_exp ~typeClashContext:IfReturn env ifnot ifso.exp_type;
-          re {
-            exp_desc = Texp_ifthenelse(cond, ifso, Some ifnot);
-            exp_loc = loc; exp_extra = [];
-            exp_type = ifso.exp_type;
-            exp_attributes = sexp.pexp_attributes;
-            exp_env = env }
-      end
-  | Pexp_sequence(sexp1, sexp2) ->
-      let exp1 = type_statement env sexp1 in
-      let exp2 = type_expect env sexp2 ty_expected in
-      re {
-        exp_desc = Texp_sequence(exp1, exp2);
-        exp_loc = loc; exp_extra = [];
-        exp_type = exp2.exp_type;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_while(scond, sbody) ->
-      let cond = type_expect env scond Predef.type_bool in
-      let body = type_statement env sbody in
-      rue {
-        exp_desc = Texp_while(cond, body);
-        exp_loc = loc; exp_extra = [];
-        exp_type = instance_def Predef.type_unit;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_for(param, slow, shigh, dir, sbody) ->
-      let low = type_expect env slow Predef.type_int in
-      let high = type_expect env shigh Predef.type_int in
-      let id, new_env =
-        match param.ppat_desc with
-        | Ppat_any -> Ident.create "_for", env
-        | Ppat_var {txt} ->
-            Env.enter_value txt {val_type = instance_def Predef.type_int;
-                                 val_attributes = [];
-                                 val_kind = Val_reg; Types.val_loc = loc; } env
-              ~check:(fun s -> Warnings.Unused_for_index s)
-        | _ ->
-            raise (Error (param.ppat_loc, env, Invalid_for_loop_index))
-      in
-      let body = type_statement new_env sbody in
-      rue {
-        exp_desc = Texp_for(id, param, low, high, dir, body);
-        exp_loc = loc; exp_extra = [];
-        exp_type = instance_def Predef.type_unit;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_constraint (sarg, sty) ->
-      let separate = true in (* always separate, 1% slowdown for lablgtk *)
-      if separate then begin_def ();
-      let cty = Typetexp.transl_simple_type env false sty in
-      let ty = cty.ctyp_type in
-      let (arg, ty') =
-        if separate then begin
-          end_def ();
-          generalize_structure ty;
-          (type_argument env sarg ty (instance env ty), instance env ty)
-        end else
-          (type_argument env sarg ty ty, ty)
-      in
-      rue {
-        exp_desc = arg.exp_desc;
-        exp_loc = arg.exp_loc;
-        exp_type = ty';
-        exp_attributes = arg.exp_attributes;
-        exp_env = env;
-        exp_extra =
-          (Texp_constraint cty, loc, sexp.pexp_attributes) :: arg.exp_extra;
-      }
-  | Pexp_coerce(sarg, sty, sty') ->
-      let separate = true in (* always separate, 1% slowdown for lablgtk *)
-      (* Also see PR#7199 for a problem with the following:
-         let separate =  Env.has_local_constraints env in*)
-      let (arg, ty',cty,cty') =
-        match sty with
-        | None ->
-            let (cty', force) =
-              Typetexp.transl_simple_type_delayed env sty'
-            in
-            let ty' = cty'.ctyp_type in
-            if separate then begin_def ();
-            let arg = type_exp env sarg in
-            let gen =
-              if separate then begin
-                end_def ();
-                let tv = newvar () in
-                let gen = generalizable tv.level arg.exp_type in
-                (try unify_var env tv arg.exp_type with Unify trace ->
-                  raise(Error(arg.exp_loc, env, Expr_type_clash (trace, typeClashContext))));
-                gen
-              end else true
-            in
-            begin match arg.exp_desc, !self_coercion, (repr ty').desc with
-            | _ when free_variables ~env arg.exp_type = []
-                  && free_variables ~env ty' = [] ->
-                if not gen && (* first try a single coercion *)
-                  let snap = snapshot () in
-                  let ty, _b = enlarge_type env ty' in
-                  try
-                    force (); Ctype.unify env arg.exp_type ty; true
-                  with Unify _ ->
-                    backtrack snap; false
-                then ()
-                else begin try
-                  let force' = subtype env arg.exp_type ty' in
-                  force (); force' ();
-                with Subtype (tr1, tr2) ->
-                  (* prerr_endline "coercion failed"; *)
-                  raise(Error(loc, env, Not_subtype(tr1, tr2)))
-                end;
-            | _ ->
-                let ty, b = enlarge_type env ty' in
-                force ();
-                begin try Ctype.unify env arg.exp_type ty with Unify trace ->
-                  raise(Error(sarg.pexp_loc, env,
-                        Coercion_failure(ty', full_expand env ty', trace, b)))
-                end
-            end;
-            (arg, ty', None, cty')
-        | Some sty ->
-            if separate then begin_def ();
-            let (cty, force) =
-              Typetexp.transl_simple_type_delayed env sty
-            and (cty', force') =
-              Typetexp.transl_simple_type_delayed env sty'
-            in
-            let ty = cty.ctyp_type in
-            let ty' = cty'.ctyp_type in
-            begin try
-              let force'' = subtype env ty ty' in
-              force (); force' (); force'' ()
-            with Subtype (tr1, tr2) ->
-              raise(Error(loc, env, Not_subtype(tr1, tr2)))
-            end;
-            if separate then begin
-              end_def ();
-              generalize_structure ty;
-              generalize_structure ty';
-              (type_argument env sarg ty (instance env ty),
-               instance env ty', Some cty, cty')
-            end else
-              (type_argument env sarg ty ty, ty', Some cty, cty')
-      in
-      rue {
-        exp_desc = arg.exp_desc;
-        exp_loc = arg.exp_loc;
-        exp_type = ty';
-        exp_attributes = arg.exp_attributes;
-        exp_env = env;
-        exp_extra = (Texp_coerce (cty, cty'), loc, sexp.pexp_attributes) ::
-                       arg.exp_extra;
-      }
-  | Pexp_send (e, {txt=met}) ->
-      let obj = type_exp env e in
-      let obj_meths = ref None in
-      begin try
-        let (meth, exp, typ) =
-          match obj.exp_desc with
-          | _ ->
-              (Tmeth_name met, None,
-               filter_method env met Public obj.exp_type)
-        in
-        let typ =
-          match repr typ with
-            {desc = Tpoly (ty, [])} ->
-              instance env ty
-          | {desc = Tpoly (ty, tl); level = _} ->
-              snd (instance_poly false tl ty)
-          | {desc = Tvar _} as ty ->
-              let ty' = newvar () in
-              unify env (instance_def ty) (newty(Tpoly(ty',[])));
-              (* if not !Clflags.nolabels then
-                 Location.prerr_warning loc (Warnings.Unknown_method met); *)
-              ty'
-          | _ ->
-              assert false
-        in
-        rue {
-          exp_desc = Texp_send(obj, meth, exp);
-          exp_loc = loc; exp_extra = [];
-          exp_type = typ;
-          exp_attributes = sexp.pexp_attributes;
-          exp_env = env }
-      with Unify _ ->
-        let valid_methods =
-          match !obj_meths with
-          | Some meths ->
-             Some (Meths.fold (fun meth _meth_ty li -> meth::li) !meths [])
-          | None ->
-             match (expand_head env obj.exp_type).desc with
-             | Tobject (fields, _) ->
-                let (fields, _) = Ctype.flatten_fields fields in
-                let collect_fields li (meth, meth_kind, _meth_ty) =
-                  if meth_kind = Fpresent then meth::li else li in
-                Some (List.fold_left collect_fields [] fields)
-             | _ -> None
-        in
-        raise(Error(e.pexp_loc, env,
-                    Undefined_method (obj.exp_type, met, valid_methods)))
-      end
-  | Pexp_new _ 
-  | Pexp_setinstvar _ 
-  | Pexp_override _ ->
-        assert false
-  | Pexp_letmodule(name, smodl, sbody) ->
-      let ty = newvar() in
-      (* remember original level *)
-      begin_def ();
-      Ident.set_current_time ty.level;
-      let context = Typetexp.narrow () in
-      let modl = !type_module env smodl in
-      let (id, new_env) = Env.enter_module name.txt modl.mod_type env in
-      Ctype.init_def(Ident.current_time());
-      Typetexp.widen context;
-      let body = type_expect new_env sbody ty_expected in
-      (* go back to original level *)
-      end_def ();
-      (* Unification of body.exp_type with the fresh variable ty
-         fails if and only if the prefix condition is violated,
-         i.e. if generative types rooted at id show up in the
-         type body.exp_type.  Thus, this unification enforces the
-         scoping condition on "let module". *)
-      (* Note that this code will only be reached if ty_expected
-         is a generic type variable, otherwise the error will occur
-         above in type_expect *)
-      begin try
-        Ctype.unify_var new_env ty body.exp_type
-      with Unify _ ->
-        raise(Error(loc, env, Scoping_let_module(name.txt, body.exp_type)))
-      end;
-      re {
-        exp_desc = Texp_letmodule(id, name, modl, body);
-        exp_loc = loc; exp_extra = [];
-        exp_type = ty;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_letexception(cd, sbody) ->
-      let (cd, newenv) = Typedecl.transl_exception env cd in
-      let body = type_expect newenv sbody ty_expected in
-      re {
-        exp_desc = Texp_letexception(cd, body);
-        exp_loc = loc; exp_extra = [];
-        exp_type = body.exp_type;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-
-  | Pexp_assert (e) ->
-      let cond = type_expect env e Predef.type_bool in
-      let exp_type =
-        match cond.exp_desc with
-        | Texp_construct(_, {cstr_name="false"}, _) ->
-            instance env ty_expected
-        | _ ->
-            instance_def Predef.type_unit
-      in
-      rue {
-        exp_desc = Texp_assert cond;
-        exp_loc = loc; exp_extra = [];
-        exp_type;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env;
-      }
-  | Pexp_lazy e ->
-      let ty = newgenvar () in
-      let to_unify = Predef.type_lazy_t ty in
-      unify_exp_types loc env to_unify ty_expected;
-      let arg = type_expect env e ty in
-      re {
-        exp_desc = Texp_lazy arg;
-        exp_loc = loc; exp_extra = [];
-        exp_type = instance env ty_expected;
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env;
-      }
-  | Pexp_object _ -> assert false  
-  | Pexp_poly(sbody, sty) ->
-      let ty, cty =
-        match sty with None -> repr ty_expected, None
-        | Some sty ->
-            let sty = Ast_helper.Typ.force_poly sty in
-            let cty = Typetexp.transl_simple_type env false sty in
-            repr cty.ctyp_type, Some cty
-      in
-      if sty <> None then
-        unify_exp_types loc env (instance env ty) (instance env ty_expected);
-      let exp =
-        match (expand_head env ty).desc with
-          Tpoly (ty', []) ->
-            let exp = type_expect env sbody ty' in
-            { exp with exp_type = instance env ty }
-        | Tpoly (ty', tl) ->
-            (* One more level to generalize locally *)
-            begin_def ();
-            let vars, ty'' = instance_poly true tl ty' in
-            let exp = type_expect env sbody ty'' in
-            end_def ();
-            check_univars env false "method" exp ty_expected vars;
-            { exp with exp_type = instance env ty }
-        | Tvar _ ->
-            let exp = type_exp env sbody in
-            let exp = {exp with exp_type = newty (Tpoly (exp.exp_type, []))} in
-            unify_exp env exp ty;
-            exp
-        | _ -> assert false
-      in
-      re { exp with exp_extra =
-             (Texp_poly cty, loc, sexp.pexp_attributes) :: exp.exp_extra }
-  | Pexp_newtype({txt=name}, sbody) ->
-      let ty = newvar () in
-      (* remember original level *)
-      begin_def ();
-      (* Create a fake abstract type declaration for name. *)
-      let level = get_current_level () in
-      let decl = {
-        type_params = [];
-        type_arity = 0;
-        type_kind = Type_abstract;
-        type_private = Public;
-        type_manifest = None;
-        type_variance = [];
-        type_newtype_level = Some (level, level);
-        type_loc = loc;
-        type_attributes = [];
-        type_immediate = false;
-        type_unboxed = unboxed_false_default_false;
-      }
-      in
-      Ident.set_current_time ty.level;
-      let (id, new_env) = Env.enter_type name decl env in
-      Ctype.init_def(Ident.current_time());
-
-      let body = type_exp new_env sbody in
-      (* Replace every instance of this type constructor in the resulting
-         type. *)
-      let seen = Hashtbl.create 8 in
-      let rec replace t =
-        if Hashtbl.mem seen t.id then ()
-        else begin
-          Hashtbl.add seen t.id ();
-          match t.desc with
-          | Tconstr (Path.Pident id', _, _) when id == id' -> link_type t ty
-          | _ -> Btype.iter_type_expr replace t
-        end
-      in
-      let ety = Subst.type_expr Subst.identity body.exp_type in
-      replace ety;
-      (* back to original level *)
-      end_def ();
-      (* lower the levels of the result type *)
-      (* unify_var env ty ety; *)
-
-      (* non-expansive if the body is non-expansive, so we don't introduce
-         any new extra node in the typed AST. *)
-      rue { body with exp_loc = loc; exp_type = ety;
-            exp_extra =
-            (Texp_newtype name, loc, sexp.pexp_attributes) :: body.exp_extra }
-  | Pexp_pack m ->
-      let (p, nl) =
-        match Ctype.expand_head env (instance env ty_expected) with
-          {desc = Tpackage (p, nl, _tl)} ->
-            (p, nl)
-        | {desc = Tvar _} ->
-            raise (Error (loc, env, Cannot_infer_signature))
-        | _ ->
-            raise (Error (loc, env, Not_a_packed_module ty_expected))
-      in
-      let (modl, tl') = !type_package env m p nl in
-      rue {
-        exp_desc = Texp_pack modl;
-        exp_loc = loc; exp_extra = [];
-        exp_type = newty (Tpackage (p, nl, tl'));
-        exp_attributes = sexp.pexp_attributes;
-        exp_env = env }
-  | Pexp_open (ovf, lid, e) ->
-      let (path, newenv) = !type_open ovf env sexp.pexp_loc lid in
-      let exp = type_expect newenv e ty_expected in
-      { exp with
-        exp_extra = (Texp_open (ovf, path, lid, newenv), loc,
-                     sexp.pexp_attributes) ::
-                      exp.exp_extra;
-      }
-
-  | Pexp_extension ({ txt = ("ocaml.extension_constructor"
-                             |"extension_constructor"); _ },
-                    payload) ->
-      begin match payload with
-      | PStr [ { pstr_desc =
-                   Pstr_eval ({ pexp_desc = Pexp_construct (lid, None); _ }, _)
-               } ] ->
-          let path =
-            match (Typetexp.find_constructor env lid.loc lid.txt).cstr_tag with
-            | Cstr_extension (path, _) -> path
-            | _ -> raise (Error (lid.loc, env, Not_an_extension_constructor))
-          in
-          rue {
-            exp_desc = Texp_extension_constructor (lid, path);
-            exp_loc = loc; exp_extra = [];
-            exp_type = instance_def Predef.type_extension_constructor;
-            exp_attributes = sexp.pexp_attributes;
-            exp_env = env }
-      | _ ->
-          raise (Error (loc, env, Invalid_extension_constructor_payload))
-      end
-  | Pexp_extension ext ->
-      raise (Error_forward (Builtin_attributes.error_of_extension ext))
-
-  | Pexp_unreachable ->
-      re { exp_desc = Texp_unreachable;
-           exp_loc = loc; exp_extra = [];
-           exp_type = instance env ty_expected;
-           exp_attributes = sexp.pexp_attributes;
-           exp_env = env }
-
-and type_function ?in_function loc attrs env ty_expected l caselist =
-  let (loc_fun, ty_fun) =
-    match in_function with Some p -> p
-    | None -> (loc, instance env ty_expected)
-  in
-  let separate = Env.has_local_constraints env in
-  if separate then begin_def ();
-  let (ty_arg, ty_res) =
-    try filter_arrow env (instance env ty_expected) l
-    with Unify _ ->
-      match expand_head env ty_expected with
-        {desc = Tarrow _} as ty ->
-          raise(Error(loc, env, Abstract_wrong_label(l, ty)))
-      | _ ->
-          raise(Error(loc_fun, env,
-                      Too_many_arguments (in_function <> None, ty_fun)))
-  in
-  let ty_arg =
-    if is_optional l then
-      let tv = newvar() in
-      begin
-        try unify env ty_arg (type_option tv)
-        with Unify _ -> assert false
-      end;
-      type_option tv
-    else ty_arg
-  in
-  if separate then begin
-    end_def ();
-    generalize_structure ty_arg;
-    generalize_structure ty_res
-  end;
-  let cases, partial =
-    type_cases ~in_function:(loc_fun,ty_fun) env ty_arg ty_res
-      true loc caselist in
-  if is_optional l && not_function env ty_res then
-    Location.prerr_warning (List.hd cases).c_lhs.pat_loc
-      Warnings.Unerasable_optional_argument;
-  let param = name_pattern "param" cases in
-  re {
-    exp_desc = Texp_function { arg_label = l; param; cases; partial; };
-    exp_loc = loc; exp_extra = [];
-    exp_type = instance env (newgenty (Tarrow(l, ty_arg, ty_res, Cok)));
-    exp_attributes = attrs;
-    exp_env = env }
-
-
-and type_label_access env srecord lid =
-  let record = type_exp ~recarg:Allowed env srecord in
-  let ty_exp = record.exp_type in
-  let opath =
-    try
-      let (p0, p, _, _) = extract_concrete_record env ty_exp in
-      Some(p0, p)
-    with Not_found -> None
-  in
-  let labels = Typetexp.find_all_labels env lid.loc lid.txt in
-  let label =
-    wrap_disambiguate "This expression has" ty_exp
-      (Label.disambiguate lid env opath) labels in
-  (record, label, opath)
-
-(* Typing format strings for printing or reading.
-   These formats are used by functions in modules Printf, Format, and Scanf.
-   (Handling of * modifiers contributed by Thorsten Ohl.) *)
-and type_label_exp ?typeClashContext create env loc ty_expected
-          (lid, label, sarg) =
-  (* Here also ty_expected may be at generic_level *)
-  begin_def ();
-  let separate = Env.has_local_constraints env in
-  if separate then (begin_def (); begin_def ());
-  let (vars, ty_arg, ty_res) = instance_label true label in
-  if separate then begin
-    end_def ();
-    (* Generalize label information *)
-    generalize_structure ty_arg;
-    generalize_structure ty_res
-  end;
-  begin try
-    unify env (instance_def ty_res) (instance env ty_expected)
-  with Unify trace ->
-    raise (Error(lid.loc, env, Label_mismatch(lid.txt, trace)))
-  end;
-  (* Instantiate so that we can generalize internal nodes *)
-  let ty_arg = instance_def ty_arg in
-  if separate then begin
-    end_def ();
-    (* Generalize information merged from ty_expected *)
-    generalize_structure ty_arg
-  end;
-  if label.lbl_private = Private then
-    if create then
-      raise (Error(loc, env, Private_type ty_expected))
-    else
-      raise (Error(lid.loc, env, Private_label(lid.txt, ty_expected)));
-  let arg =
-    let snap = if vars = [] then None else Some (Btype.snapshot ()) in
-    let arg = type_argument ?typeClashContext env sarg ty_arg (instance env ty_arg) in
-    end_def ();
-    try
-      check_univars env (vars <> []) "field value" arg label.lbl_arg vars;
-      arg
-    with exn when not (is_nonexpansive arg) -> try
-      (* Try to retype without propagating ty_arg, cf PR#4862 *)
-      may Btype.backtrack snap;
-      begin_def ();
-      let arg = type_exp env sarg in
-      end_def ();
-      generalize_expansive env arg.exp_type;
-      unify_exp env arg ty_arg;
-      check_univars env false "field value" arg label.lbl_arg vars;
-      arg
-    with Error (_, _, Less_general _) as e -> raise e
-    | _ -> raise exn    (* In case of failure return the first error *)
-  in
-  (lid, label, {arg with exp_type = instance env arg.exp_type})
-
-and type_argument ?typeClashContext ?recarg env sarg ty_expected' ty_expected =
-  (* ty_expected' may be generic *)
-  let no_labels ty =
-    let ls, tvar = list_labels env ty in
-    not tvar && List.for_all (fun x -> x = Nolabel) ls
-  in
-  let rec is_inferred sexp =
-    match sexp.pexp_desc with
-      Pexp_ident _ | Pexp_apply _ | Pexp_field _ | Pexp_constraint _
-    | Pexp_coerce _ | Pexp_send _ | Pexp_new _ -> true
-    | Pexp_sequence (_, e) | Pexp_open (_, _, e) -> is_inferred e
-    | Pexp_ifthenelse (_, e1, Some e2) -> is_inferred e1 && is_inferred e2
-    | _ -> false
-  in
-  match expand_head env ty_expected' with
-    {desc = Tarrow(Nolabel,ty_arg,ty_res,_); level = _}
-    when is_inferred sarg ->
-      (* apply optional arguments when expected type is "" *)
-      (* we must be very careful about not breaking the semantics *)
-      let texp = type_exp env sarg in
-      let rec make_args args ty_fun =
-        match (expand_head env ty_fun).desc with
-        | Tarrow (l,ty_arg,ty_fun,_) when is_optional l ->
-            let ty = option_none (instance env ty_arg) sarg.pexp_loc in
-            make_args ((l, Some ty) :: args) ty_fun
-        | Tarrow (Nolabel,_,ty_res',_) ->
-            List.rev args, ty_fun, no_labels ty_res'
-        | Tvar _ ->  List.rev args, ty_fun, false
-        |  _ -> [], texp.exp_type, false
-      in
-      let args, ty_fun', simple_res = make_args [] texp.exp_type in
-      let texp = {texp with exp_type = instance env texp.exp_type}
-      and ty_fun = instance env ty_fun' in
-      if not (simple_res || no_labels ty_res) then begin
-        unify_exp env texp ty_expected;
-        texp
-      end else begin
-      unify_exp env {texp with exp_type = ty_fun} ty_expected;
-      if args = [] then texp else
-      (* eta-expand to avoid side effects *)
-      let var_pair name ty =
-        let id = Ident.create name in
-        {pat_desc = Tpat_var (id, mknoloc name); pat_type = ty;pat_extra=[];
-         pat_attributes = [];
-         pat_loc = Location.none; pat_env = env},
-        {exp_type = ty; exp_loc = Location.none; exp_env = env;
-         exp_extra = []; exp_attributes = [];
-         exp_desc =
-         Texp_ident(Path.Pident id, mknoloc (Longident.Lident name),
-                    {val_type = ty; val_kind = Val_reg;
-                     val_attributes = [];
-                     Types.val_loc = Location.none})}
-      in
-      let eta_pat, eta_var = var_pair "eta" ty_arg in
-      let func texp =
-        let e =
-          {texp with exp_type = ty_res; exp_desc =
-           Texp_apply
-             (texp,
-              args @ [Nolabel, Some eta_var])}
-        in
-        let cases = [case eta_pat e] in
-        let param = name_pattern "param" cases in
-        { texp with exp_type = ty_fun; exp_desc =
-          Texp_function { arg_label = Nolabel; param; cases;
-            partial = Total; } }
-      in
-      Location.prerr_warning texp.exp_loc
-        (Warnings.Eliminated_optional_arguments
-           (List.map (fun (l, _) -> Printtyp.string_of_label l) args));
-      (* let-expand to have side effects *)
-      let let_pat, let_var = var_pair "arg" texp.exp_type in
-      re { texp with exp_type = ty_fun; exp_desc =
-           Texp_let (Nonrecursive,
-                     [{vb_pat=let_pat; vb_expr=texp; vb_attributes=[];
-                       vb_loc=Location.none;
-                      }],
-                     func let_var) }
-      end
-  | _ ->
-      let texp = type_expect ?typeClashContext ?recarg env sarg ty_expected' in
-      unify_exp ?typeClashContext env texp ty_expected;
-      texp
-and is_automatic_curried_application env funct =
-  (* When a curried function is used with uncurried application, treat it as a curried application *)
-  !Config.uncurried = Uncurried &&
-  match (expand_head env funct.exp_type).desc with
-  | Tarrow _ -> true
-  | _ -> false
-and type_application ?typeClashContext uncurried env funct (sargs : sargs) : targs * Types.type_expr * bool =
-  (* funct.exp_type may be generic *)
-  let result_type omitted ty_fun =
-    List.fold_left
-      (fun ty_fun (l,ty,lv) -> newty2 lv (Tarrow(l,ty,ty_fun,Cok)))
-      ty_fun omitted
-  in
-  let has_label l ty_fun =
-    let ls, tvar = list_labels env ty_fun in
-    tvar || List.mem l ls
-  in
-  let ignored = ref [] in
-  let has_uncurried_type t =
-    match (expand_head env t).desc with
-    | Tconstr (Pident {name = "function$"},[t; tArity],_) ->
-      let arity = Ast_uncurried.type_to_arity tArity in
-      Some (arity, t)
-    | _ -> None in
-  let force_uncurried_type funct =
-    match has_uncurried_type funct.exp_type with
-    | None ->
-      let arity = List.length sargs in
-      let uncurried_typ = Ast_uncurried.make_uncurried_type ~env ~arity (newvar()) in
-      begin
-        match (expand_head env funct.exp_type).desc with
-        | Tvar _ | Tarrow _ ->
-          unify_exp env funct uncurried_typ
-        | _ ->
-          raise(Error(funct.exp_loc, env, Apply_non_function (expand_head env funct.exp_type)))
-      end
-    | Some _ -> () in
-  let extract_uncurried_type t =
-    match has_uncurried_type t with
-    | Some (arity, t1) ->
-      if List.length sargs > arity then
-        raise(Error(funct.exp_loc, env,
-          Uncurried_arity_mismatch (t, arity, List.length sargs)));
-      t1, arity
-    | None -> t, max_int in
-  let update_uncurried_arity ~nargs t newT =
-    match has_uncurried_type t with
-    | Some (arity, _) ->
-      let newarity = arity - nargs in
-      let fully_applied = newarity <= 0 in
-      if uncurried && not fully_applied then
-        raise(Error(funct.exp_loc, env,
-          Uncurried_arity_mismatch (t, arity, List.length sargs)));
-      let newT = if fully_applied then newT else Ast_uncurried.make_uncurried_type ~env ~arity:newarity newT in
-      (fully_applied, newT)
-    | _ -> (false, newT)
-  in
-  let rec type_unknown_args max_arity ~(args : lazy_args) omitted ty_fun (syntax_args : sargs)
-     : targs * _ = 
-    match syntax_args with
-    | [] ->
-        let collect_args () =
-          (List.map
-              (function l, None -> l, None
-                  | l, Some f -> l, Some (f ()))
-            (List.rev args),
-          instance env (result_type omitted ty_fun)) in
-        if List.length args < max_arity && uncurried then
-          (match (expand_head env ty_fun).desc with
-          | Tarrow (Optional l,t1,t2,_) ->
-            ignored := (Optional l,t1,ty_fun.level) :: !ignored;
-            let arg = Optional l, Some (fun () -> option_none (instance env t1) Location.none) in
-            type_unknown_args max_arity ~args:(arg::args) omitted t2 []
-          | _ -> collect_args ())
-        else
-          collect_args ()
-    | [(Nolabel, {pexp_desc = Pexp_construct ({txt = Lident "()"}, None)})]
-      when uncurried && omitted = [] && args <> [] && List.length args = List.length !ignored ->
-      (* foo(. ) treated as empty application if all args are optional (hence ignored) *)
-        type_unknown_args max_arity ~args omitted ty_fun []
-    | (l1, sarg1) :: sargl ->
-        let (ty1, ty2) =
-          let ty_fun = expand_head env ty_fun in
-          let arity_ok = List.length args < max_arity in
-          match ty_fun.desc with
-            Tvar _  ->
-              let t1 = newvar () and t2 = newvar () in
-              if ty_fun.level >= t1.level && not_identity funct.exp_desc then
-                Location.prerr_warning sarg1.pexp_loc Warnings.Unused_argument;
-              unify env ty_fun (newty (Tarrow(l1,t1,t2,Clink(ref Cunknown))));
-              (t1, t2)
-          | Tarrow (l,t1,t2,_) when Asttypes.same_arg_label l l1 && arity_ok
-            ->
-              (t1, t2)
-          | td ->
-              let ty_fun =
-                match td with Tarrow _ -> newty td | _ -> ty_fun in
-              let ty_res = result_type (omitted @ !ignored) ty_fun in
-              match ty_res.desc with
-                Tarrow _ ->
-                  if not arity_ok then
-                    raise (Error(sarg1.pexp_loc, env,
-                                 Apply_wrong_label(l1, funct.exp_type))) else
-                  if (not (has_label l1 ty_fun)) then
-                    raise (Error(sarg1.pexp_loc, env,
-                                 Apply_wrong_label(l1, ty_res)))
-                  else
-                    raise (Error(funct.exp_loc, env, Incoherent_label_order))
-              | _ ->
-                  raise(Error(funct.exp_loc, env, Apply_non_function
-                                (expand_head env funct.exp_type)))
-        in
-        let optional = is_optional l1 in
-        let arg1 () =
-          let arg1 = type_expect env sarg1 ty1 in
-          if optional then
-            unify_exp env arg1 (type_option(newvar()));
-          arg1
-        in
-        type_unknown_args max_arity ~args:((l1, Some arg1) :: args) omitted ty2 sargl
-  in
-  let rec type_args ?typeClashContext max_arity args omitted ~ty_fun ty_fun0  ~(sargs : sargs)  =
-    match expand_head env ty_fun, expand_head env ty_fun0 with
-      {desc=Tarrow (l, ty, ty_fun, com); level=lv} ,
-      {desc=Tarrow (_, ty0, ty_fun0, _)}
-      when (sargs <> [] ) && commu_repr com = Cok && List.length args < max_arity ->
-        let name = label_name l
-        and optional = is_optional l in
-        let sargs, omitted,  arg =          
-            match extract_label name sargs with 
-            | None ->          
-                if optional && (uncurried || label_assoc Nolabel sargs)
-                then begin
-                  ignored := (l,ty,lv) :: !ignored;
-                  sargs, omitted , Some (fun () -> option_none (instance env ty) Location.none)
-                end else 
-                  sargs, (l,ty,lv) :: omitted , None
-            | Some (l', sarg0, sargs) ->                   
-            if not optional && is_optional l' then
-              Location.prerr_warning sarg0.pexp_loc
-                (Warnings.Nonoptional_label (Printtyp.string_of_label l));
-             sargs, omitted ,            
-             Some (
-            if not optional || is_optional l' then
-               (fun () -> type_argument ?typeClashContext:(typeClashContextForFunctionArgument typeClashContext sarg0) env sarg0 ty ty0)
-            else 
-               (fun () -> option_some (type_argument ?typeClashContext env sarg0
-                                             (extract_option_type env ty)
-                                             (extract_option_type env ty0))))
-        in
-        type_args ?typeClashContext max_arity ((l,arg)::args) omitted ~ty_fun ty_fun0 ~sargs 
-    | _ ->
-        type_unknown_args max_arity ~args omitted ty_fun0 sargs (* This is the hot path for non-labeled function*)
-  in
-  let () =  
-    let ls, tvar = list_labels env funct.exp_type in
-    if not tvar then
-    let labels = Ext_list.filter ls (fun l -> not (is_optional l)) in
-    if Ext_list.same_length labels sargs &&
-       List.for_all (fun (l,_) -> l = Nolabel) sargs &&
-       List.exists (fun l -> l <> Nolabel) labels then
-        raise 
-          (Error(
-          funct.exp_loc, env,
-          (Labels_omitted
-            (List.map Printtyp.string_of_label
-                      (Ext_list.filter labels (fun x -> x <> Nolabel))))))  
-  in
-  match sargs with
-    (* Special case for ignore: avoid discarding warning *)
-    [Nolabel, sarg] when is_ignore funct env ->
-      let ty_arg, ty_res =
-        filter_arrow env (instance env funct.exp_type) Nolabel
-      in
-      let exp = type_expect env sarg ty_arg in
-      begin match (expand_head env exp.exp_type).desc with
-      | Tarrow _ ->
-          Location.prerr_warning exp.exp_loc Warnings.Partial_application
-      | Tvar _ ->
-          Delayed_checks.add_delayed_check (fun () -> check_application_result env false exp)
-      | _ -> ()
-      end;
-      ([Nolabel, Some exp], ty_res, false)
-  | _ ->
-      if uncurried then force_uncurried_type funct;
-      let ty, max_arity = extract_uncurried_type funct.exp_type in
-      let targs, ret_t = type_args ?typeClashContext max_arity [] [] ~ty_fun:ty (instance env ty) ~sargs in
-      let fully_applied, ret_t =
-        update_uncurried_arity funct.exp_type ~nargs:(List.length !ignored + List.length sargs) ret_t in
-      targs, ret_t, fully_applied
-
-and type_construct env loc lid sarg ty_expected attrs =
-  let opath =
-    try
-      let (p0, p,_) = extract_concrete_variant env ty_expected in
-      Some(p0, p)
-    with Not_found -> None
-  in
-  let constrs = Typetexp.find_all_constructors env lid.loc lid.txt in
-  let constr =
-    wrap_disambiguate "This variant expression is expected to have" ty_expected
-      (Constructor.disambiguate lid env opath) constrs in
-  Env.mark_constructor Env.Positive env (Longident.last lid.txt) constr;
-  Builtin_attributes.check_deprecated loc constr.cstr_attributes
-    constr.cstr_name;
-  let sargs =
-    match sarg with
-      None -> []
-    | Some {pexp_desc = Pexp_tuple sel} when
-        constr.cstr_arity > 1 || Builtin_attributes.explicit_arity attrs
-      -> sel
-    | Some se -> [se] in
-  if List.length sargs <> constr.cstr_arity then
-    raise(Error(loc, env, Constructor_arity_mismatch
-                  (lid.txt, constr.cstr_arity, List.length sargs)));
-  let separate = Env.has_local_constraints env in
-  if separate then (begin_def (); begin_def ());
-  let (ty_args, ty_res) = instance_constructor constr in
-  let texp =
-    re {
-      exp_desc = Texp_construct(lid, constr, []);
-      exp_loc = loc; exp_extra = [];
-      exp_type = ty_res;
-      exp_attributes = attrs;
-      exp_env = env } in
-  let typeClashContext = typeClashContextMaybeOption ty_expected ty_res in
-  if separate then begin
-    end_def ();
-    generalize_structure ty_res;
-    unify_exp ?typeClashContext env {texp with exp_type = instance_def ty_res}
-                  (instance env ty_expected);
-    end_def ();
-    List.iter generalize_structure ty_args;
-    generalize_structure ty_res;
-  end;
-  let ty_args0, ty_res =
-    match instance_list env (ty_res :: ty_args) with
-      t :: tl -> tl, t
-    | _ -> assert false
-  in
-  let texp = {texp with exp_type = ty_res} in
-  if not separate then unify_exp ?typeClashContext env texp (instance env ty_expected);
-  let recarg =
-    match constr.cstr_inlined with
-    | None -> Rejected
-    | Some _ ->
-        begin match sargs with
-        | [{pexp_desc =
-              Pexp_ident _ |
-              Pexp_record (_, (Some {pexp_desc = Pexp_ident _}| None))}] ->
-            Required
-        | _ ->
-            raise (Error(loc, env, Inlined_record_expected))
-        end
-  in
-  let args =
-    List.map2 (fun e (t,t0) -> type_argument ~recarg env e t t0) sargs
-      (List.combine ty_args ty_args0) in
-  if constr.cstr_private = Private then
-    raise(Error(loc, env, Private_type ty_res));
-  (* NOTE: shouldn't we call "re" on this final expression? -- AF *)
-  { texp with
-    exp_desc = Texp_construct(lid, constr, args) }
-
-(* Typing of statements (expressions whose values are discarded) *)
-
-and type_statement env sexp =
-  let loc = (final_subexpression sexp).pexp_loc in
-  begin_def();
-  let exp = type_exp env sexp in
-  end_def();
-  let ty = expand_head env exp.exp_type and tv = newvar() in
-  if is_Tvar ty && ty.level > tv.level then
-      Location.prerr_warning loc Warnings.Nonreturning_statement;
-  let expected_ty = instance_def Predef.type_unit in
-  let typeClashContext = typeClashContextInStatement sexp in
-  unify_exp ?typeClashContext env exp expected_ty;
-  exp
-
-(* Typing of match cases *)
-
-and type_cases ?rootTypeClashContext ?in_function env ty_arg ty_res partial_flag loc caselist : _ * Typedtree.partial =
-  (* ty_arg is _fully_ generalized *)
-  let patterns = List.map (fun {pc_lhs=p} -> p) caselist in
-  let contains_polyvars = List.exists contains_polymorphic_variant patterns in
-  let erase_either = contains_polyvars && contains_variant_either ty_arg
-  and has_gadts = List.exists (contains_gadt env) patterns in
-(*  prerr_endline ( if has_gadts then "contains gadt" else "no gadt"); *)
-  let ty_arg =
-    if (has_gadts || erase_either) 
-    then correct_levels ty_arg else ty_arg
-  and ty_res, env =
-    if has_gadts then
-      correct_levels ty_res, duplicate_ident_types caselist env
-    else ty_res, env
-  in
-  let rec is_var spat =
-    match spat.ppat_desc with
-      Ppat_any | Ppat_var _ -> true
-    | Ppat_alias (spat, _) -> is_var spat
-    | _ -> false in
-  let needs_exhaust_check =
-    match caselist with
-      [{pc_rhs = {pexp_desc = Pexp_unreachable}}] -> true
-    | [{pc_lhs}] when is_var pc_lhs -> false
-    | _ -> true
-  in
-  let init_env () =
-    (* raise level for existentials *)
-    begin_def ();
-    Ident.set_current_time (get_current_level ());
-    let lev = Ident.current_time () in
-    Ctype.init_def (lev+1000);                 (* up to 1000 existentials *)
-    (lev, Env.add_gadt_instance_level lev env)
-  in
-  let lev, env =
-    if has_gadts then init_env () else (get_current_level (), env)
-  in
-(*  if has_gadts then
-    Format.printf "lev = %d@.%a@." lev Printtyp.raw_type_expr ty_res; *)
-  (* Do we need to propagate polymorphism *)
-  let propagate =
-     has_gadts || (repr ty_arg).level = generic_level ||
-    match caselist with
-      [{pc_lhs}] when is_var pc_lhs -> false
-    | _ -> true in
-  if propagate then begin_def (); (* propagation of the argument *)
-  let pattern_force = ref [] in
-(*  Format.printf "@[%i %i@ %a@]@." lev (get_current_level())
-    Printtyp.raw_type_expr ty_arg; *)
-  let pat_env_list =
-    List.map
-      (fun {pc_lhs; pc_guard; pc_rhs} ->
-        let loc =
-          let open Location in
-          match pc_guard with
-          | None -> pc_rhs.pexp_loc
-          | Some g -> {pc_rhs.pexp_loc with loc_start=g.pexp_loc.loc_start}
-        in
-        let scope = Some (Annot.Idef loc) in
-        let (pat, ext_env, force, unpacks) =
-          let partial =
-            if  erase_either
-            then Some false else None in
-          let ty_arg = instance ?partial env ty_arg in
-          type_pattern ~lev env pc_lhs scope ty_arg
-        in
-        pattern_force := force @ !pattern_force;
-        (pat, (ext_env, unpacks)))
-      caselist in
-  (* Unify all cases (delayed to keep it order-free) *)
-  let ty_arg' = newvar () in
-  let unify_pats ty =
-    List.iter (fun (pat, (ext_env, _)) -> unify_pat ext_env pat ty)
-      pat_env_list in
-  unify_pats ty_arg';
-  (* Check for polymorphic variants to close *)
-  let patl = List.map fst pat_env_list in
-  if List.exists has_variants patl then begin
-    Parmatch.pressure_variants env patl;
-    List.iter (iter_pattern finalize_variant) patl
-  end;
-  (* `Contaminating' unifications start here *)
-  List.iter (fun f -> f()) !pattern_force;
-  (* Post-processing and generalization *)
-  if propagate || erase_either then unify_pats (instance env ty_arg);
-  if propagate then begin
-    List.iter
-      (iter_pattern (fun {pat_type=t} -> unify_var env t (newvar()))) patl;
-    end_def ();
-    List.iter (iter_pattern (fun {pat_type=t} -> generalize t)) patl;
-  end;
-  (* type bodies *)
-  let in_function = if List.length caselist = 1 then in_function else None in
-  let cases =
-    List.map2
-      (fun (pat, (ext_env, unpacks)) {pc_lhs; pc_guard; pc_rhs} ->
-        let sexp = wrap_unpacks pc_rhs unpacks in
-        let ty_res' =
-          if contains_gadt env pc_lhs then correct_levels ty_res
-          else ty_res in
-(*        Format.printf "@[%i %i, ty_res' =@ %a@]@." lev (get_current_level())
-          Printtyp.raw_type_expr ty_res'; *)
-        let guard =
-          match pc_guard with
-          | None -> None
-          | Some scond ->
-              Some
-                (type_expect ?typeClashContext:(if Option.is_some rootTypeClashContext then Some IfCondition else None) ext_env (wrap_unpacks scond unpacks)
-                   Predef.type_bool)
-        in
-        let exp = type_expect ?typeClashContext:rootTypeClashContext ?in_function ext_env sexp ty_res' in
-        {
-         c_lhs = pat;
-         c_guard = guard;
-         c_rhs = {exp with exp_type = instance env ty_res'}
-        }
-      )
-      pat_env_list caselist
-  in
-  if has_gadts then begin
-    let ty_res' = instance env ty_res in
-    List.iter (fun c -> unify_exp env c.c_rhs ty_res') cases
-  end;
-  let do_init = has_gadts || needs_exhaust_check in
-  let lev, env =
-    if do_init && not has_gadts then init_env () else lev, env in
-  let ty_arg_check =
-    if do_init then
-      (* Hack: use for_saving to copy variables too *)
-      Subst.type_expr (Subst.for_saving Subst.identity) ty_arg
-    else ty_arg
-  in
-  let partial =
-    if partial_flag then
-      check_partial ~lev env ty_arg_check loc cases
-    else
-      Partial
-  in
-  let unused_check () =
-    List.iter (fun (pat, (env, _)) -> check_absent_variant env pat)
-      pat_env_list;
-    check_unused ~lev env (instance env ty_arg_check) cases ;
-    Parmatch.check_ambiguous_bindings cases
-  in
-  if contains_polyvars || do_init then
-    Delayed_checks.add_delayed_check unused_check
-  else
-    unused_check ();
-  (* Check for unused cases, do not delay because of gadts *)
-  if do_init then begin
-    end_def ();
-    (* Ensure that existential types do not escape *)
-    unify_exp_types loc env (instance env ty_res) (newvar ()) ;
-  end;
-  cases, partial
-
-(* Typing of let bindings *)
-
-and type_let ?(check = fun s -> Warnings.Unused_var s)
-             ?(check_strict = fun s -> Warnings.Unused_var_strict s)
-    env rec_flag spat_sexp_list scope allow =
-  begin_def();
-  let is_fake_let =
-    match spat_sexp_list with
-    | [{pvb_expr={pexp_desc=Pexp_match(
-           {pexp_desc=Pexp_ident({ txt = Longident.Lident "*opt*"})},_)}}] ->
-        true (* the fake let-declaration introduced by fun ?(x = e) -> ... *)
-    | _ ->
-        false
-  in
-  let check = if is_fake_let then check_strict else check in
-
-  let spatl =
-    List.map
-      (fun {pvb_pat=spat; pvb_attributes=attrs} ->
-        attrs, spat)
-      spat_sexp_list in
-  let nvs = List.map (fun _ -> newvar ()) spatl in
-  let (pat_list, new_env, force, unpacks) =
-    type_pattern_list env spatl scope nvs allow in
-  let attrs_list = List.map fst spatl in
-  let is_recursive = (rec_flag = Recursive) in
-  (* If recursive, first unify with an approximation of the expression *)
-  if is_recursive then
-    List.iter2
-      (fun pat binding ->
-        let pat =
-          match pat.pat_type.desc with
-          | Tpoly (ty, tl) ->
-              {pat with pat_type =
-               snd (instance_poly ~keep_names:true false tl ty)}
-          | _ -> pat
-        in unify_pat env pat (type_approx env binding.pvb_expr))
-      pat_list spat_sexp_list;
-  (* Polymorphic variant processing *)
-  List.iter
-    (fun pat ->
-      if has_variants pat then begin
-        Parmatch.pressure_variants env [pat];
-        iter_pattern finalize_variant pat
-      end)
-    pat_list;
-  (* Only bind pattern variables after generalizing *)
-  List.iter (fun f -> f()) force;
-  let exp_env =
-    if is_recursive then new_env else env in
-
-  let current_slot = ref None in
-  let rec_needed = ref false in
-  let warn_about_unused_bindings =
-    List.exists
-      (fun attrs ->
-         Builtin_attributes.warning_scope ~ppwarning:false attrs (fun () ->
-           Warnings.is_active (check "") || Warnings.is_active (check_strict "") ||
-           (is_recursive && (Warnings.is_active Warnings.Unused_rec_flag))))
-      attrs_list
-  in
-  let pat_slot_list =
-    (* Algorithm to detect unused declarations in recursive bindings:
-       - During type checking of the definitions, we capture the 'value_used'
-         events on the bound identifiers and record them in a slot corresponding
-         to the current definition (!current_slot).
-         In effect, this creates a dependency graph between definitions.
-
-       - After type checking the definition (!current_slot = None),
-         when one of the bound identifier is effectively used, we trigger
-         again all the events recorded in the corresponding slot.
-         The effect is to traverse the transitive closure of the graph created
-         in the first step.
-
-       We also keep track of whether *all* variables in a given pattern
-       are unused. If this is the case, for local declarations, the issued
-       warning is 26, not 27.
-     *)
-    List.map2
-      (fun attrs pat ->
-         Builtin_attributes.warning_scope ~ppwarning:false attrs (fun () ->
-           if not warn_about_unused_bindings then pat, None
-           else
-             let some_used = ref false in
-             (* has one of the identifier of this pattern been used? *)
-             let slot = ref [] in
-             List.iter
-               (fun id ->
-                  let vd = Env.find_value (Path.Pident id) new_env in
-                  (* note: Env.find_value does not trigger the value_used event *)
-                  let name = Ident.name id in
-                  let used = ref false in
-                  if not (name = "" || name.[0] = '_' || name.[0] = '#') then
-                    Delayed_checks.add_delayed_check
-                      (fun () ->
-                         if not !used then
-                           Location.prerr_warning vd.Types.val_loc
-                             ((if !some_used then check_strict else check) name)
-                      );
-                  Env.set_value_used_callback
-                    name vd
-                    (fun () ->
-                       match !current_slot with
-                       | Some slot ->
-                         slot := (name, vd) :: !slot; rec_needed := true
-                       | None ->
-                         List.iter
-                           (fun (name, vd) -> Env.mark_value_used env name vd)
-                           (get_ref slot);
-                         used := true;
-                         some_used := true
-                    )
-               )
-               (Typedtree.pat_bound_idents pat);
-             pat, Some slot
-         ))
-      attrs_list
-      pat_list
-  in
-  let exp_list =
-    List.map2
-      (fun {pvb_expr=sexp; pvb_attributes; _} (pat, slot) ->
-        let sexp =
-          if rec_flag = Recursive then wrap_unpacks sexp unpacks else sexp in
-        if is_recursive then current_slot := slot;
-        match pat.pat_type.desc with
-        | Tpoly (ty, tl) ->
-            begin_def ();
-            let vars, ty' = instance_poly ~keep_names:true true tl ty in
-            let exp =
-              Builtin_attributes.warning_scope pvb_attributes
-                  (fun () -> type_expect exp_env sexp ty')
-            in
-            end_def ();
-            check_univars env true "definition" exp pat.pat_type vars;
-            {exp with exp_type = instance env exp.exp_type}
-        | _ ->
-            Builtin_attributes.warning_scope pvb_attributes (fun () ->
-              type_expect exp_env sexp pat.pat_type))
-      spat_sexp_list pat_slot_list in
-  current_slot := None;
-  if is_recursive && not !rec_needed
-  && Warnings.is_active Warnings.Unused_rec_flag then begin
-    let {pvb_pat; pvb_attributes} = List.hd spat_sexp_list in
-    (* See PR#6677 *)
-    Builtin_attributes.warning_scope ~ppwarning:false pvb_attributes
-      (fun () ->
-         Location.prerr_warning pvb_pat.ppat_loc Warnings.Unused_rec_flag
-      )
-  end;
-  List.iter2
-    (fun pat (attrs, exp) ->
-       Builtin_attributes.warning_scope ~ppwarning:false attrs
-         (fun () ->
-            ignore(check_partial env pat.pat_type pat.pat_loc
-                     [case pat exp])
-         )
-    )
-    pat_list
-    (List.map2 (fun (attrs, _) e -> attrs, e) spatl exp_list);
-  end_def();
-  List.iter2
-    (fun pat exp ->
-       if not (is_nonexpansive exp) then
-         iter_pattern (fun pat -> generalize_expansive env pat.pat_type) pat)
-    pat_list exp_list;
-  List.iter
-    (fun pat -> iter_pattern (fun pat -> generalize pat.pat_type) pat)
-    pat_list;
-  let l = List.combine pat_list exp_list in
-  let l =
-    List.map2
-      (fun (p, e) pvb ->
-        {vb_pat=p; vb_expr=e; vb_attributes=pvb.pvb_attributes;
-         vb_loc=pvb.pvb_loc;
-        })
-      l spat_sexp_list
-  in
-  if is_recursive then
-    List.iter 
-      (fun {vb_pat=pat} -> match pat.pat_desc with
-           Tpat_var _ -> ()
-         | Tpat_alias ({pat_desc=Tpat_any}, _, _) -> ()
-         | _ -> raise(Error(pat.pat_loc, env, Illegal_letrec_pat)))
-      l;
-  (l, new_env, unpacks)
-
-(* Typing of toplevel bindings *)
-
-let type_binding env rec_flag spat_sexp_list scope =
-  Typetexp.reset_type_variables();
-  let (pat_exp_list, new_env, _unpacks) =
-    type_let
-      ~check:(fun s -> Warnings.Unused_value_declaration s)
-      ~check_strict:(fun s -> Warnings.Unused_value_declaration s)
-      env rec_flag spat_sexp_list scope false
-  in
-  (pat_exp_list, new_env)
-
-let type_let env rec_flag spat_sexp_list scope =
-  let (pat_exp_list, new_env, _unpacks) =
-    type_let env rec_flag spat_sexp_list scope false in
-  (pat_exp_list, new_env)
-
-(* Typing of toplevel expressions *)
-
-let type_expression env sexp =
-  Typetexp.reset_type_variables();
-  begin_def();
-  let exp = type_exp env sexp in
-  if Warnings.is_active (Bs_toplevel_expression_unit None) then 
-    (try unify env exp.exp_type 
-      (instance_def Predef.type_unit) with 
-    | Unify _ ->
-      let buffer = Buffer.create 10 in
-      let formatter = Format.formatter_of_buffer buffer in
-      Printtyp.type_expr formatter exp.exp_type;
-      Format.pp_print_flush formatter ();
-      let returnType = Buffer.contents buffer in
-      Location.prerr_warning sexp.pexp_loc (Bs_toplevel_expression_unit (
-        match sexp.pexp_desc with 
-        | Pexp_apply _ -> Some (returnType, FunctionCall)
-        | _ -> Some (returnType, Other)
-      ))
-    | Tags _  -> Location.prerr_warning sexp.pexp_loc (Bs_toplevel_expression_unit None));
-  end_def();
-  if not (is_nonexpansive exp) then generalize_expansive env exp.exp_type;
-  generalize exp.exp_type;
-  match sexp.pexp_desc with
-    Pexp_ident lid ->
-      (* Special case for keeping type variables when looking-up a variable *)
-      let (_path, desc) = Env.lookup_value lid.txt env in
-      {exp with exp_type = desc.val_type}
-  | _ -> exp
-
-(* Error report *)
-
-let spellcheck ppf unbound_name valid_names =
-  Misc.did_you_mean ppf (fun () ->
-    Misc.spellcheck valid_names unbound_name
-  )
-
-let spellcheck_idents ppf unbound valid_idents =
-  spellcheck ppf (Ident.name unbound) (List.map Ident.name valid_idents)
-
-open Format
-let longident = Printtyp.longident
-let super_report_unification_error = Printtyp.super_report_unification_error
-let report_ambiguous_type_error = Printtyp.report_ambiguous_type_error
-let report_subtyping_error = Printtyp.report_subtyping_error
-let type_expr ppf typ = (* print a type and avoid infinite loops *)
-  Printtyp.reset_and_mark_loops typ;
-  Printtyp.type_expr ppf typ
-
-let report_error env ppf = function
-  | Polymorphic_label lid ->
-      fprintf ppf "@[The record field %a is polymorphic.@ %s@]"
-        longident lid "You cannot instantiate it in a pattern."
-  | Constructor_arity_mismatch(lid, expected, provided) ->
-    (* modified *)
-    fprintf ppf
-      "@[This variant constructor, %a, expects %i %s; here, we've %sfound %i.@]"
-      longident lid expected (if expected == 1 then "argument" else "arguments") (if provided < expected then "only " else "") provided
-  | Label_mismatch(lid, trace) ->
-    (* modified *)
-    super_report_unification_error ppf env trace
-      (function ppf ->
-         fprintf ppf "The record field %a@ belongs to the type"
-           longident lid)
-      (function ppf ->
-         fprintf ppf "but is mixed here with fields of type")
-  | Pattern_type_clash trace ->
-    (* modified *)
-    super_report_unification_error ppf env trace
-      (function ppf ->
-         fprintf ppf "This pattern matches values of type")
-      (function ppf ->
-         fprintf ppf "but a pattern was expected which matches values of type")
-  | Or_pattern_type_clash (id, trace) ->
-    (* modified *)
-    super_report_unification_error ppf env trace
-      (function ppf ->
-         fprintf ppf "The variable %s on the left-hand side of this or-pattern has type" (Ident.name id))
-      (function ppf ->
-         fprintf ppf "but on the right-hand side it has type")
-  | Multiply_bound_variable name ->
-      fprintf ppf "Variable %s is bound several times in this matching" name
-  | Orpat_vars (id, valid_idents) ->
-      fprintf ppf "Variable %s must occur on both sides of this | pattern"
-        (Ident.name id);
-      spellcheck_idents ppf id valid_idents
-  | Expr_type_clash (( 
-    (_, {desc = Tarrow _}) ::
-    (_, {desc = Tconstr (Pident {name = "function$"},_,_)}) :: _
-   ), _) -> 
-    fprintf ppf "This function is a curried function where an uncurried function is expected"
-  | Expr_type_clash (( 
-    (_, {desc = Tconstr (Pident {name = "function$"}, [{desc=Tvar _}; _],_)}) ::
-    (_, {desc = Tarrow _}) :: _
-   ), _) -> 
-    fprintf ppf "This function is an uncurried function where a curried function is expected"
-  | Expr_type_clash ((
-      (_, {desc = Tconstr (Pident {name = "function$"},[_; tA],_)}) ::
-      (_, {desc = Tconstr (Pident {name = "function$"},[_; tB],_)}) :: _
-    ), _) when Ast_uncurried.type_to_arity tA <> Ast_uncurried.type_to_arity tB ->
-    let arityA = Ast_uncurried.type_to_arity tA |> string_of_int in
-    let arityB = Ast_uncurried.type_to_arity tB |> string_of_int in
-    reportArityMismatch ~arityA ~arityB ppf
-  | Expr_type_clash (( 
-      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),a,_),_,_)}) ::
-      (_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),b,_),_,_)}) :: _
-   ), _) when a <> b -> 
-      fprintf ppf "This method has %s but was expected %s" a b 
-
-  | Expr_type_clash (trace, typeClashContext) ->
-    (* modified *)
-    fprintf ppf "@[<v>";
-    print_expr_type_clash ?typeClashContext env trace ppf;
-    fprintf ppf "@]"
-  | Apply_non_function typ ->
-    (* modified *)
-    begin match (repr typ).desc with
-        Tarrow (_, _inputType, returnType, _) ->
-        let rec countNumberOfArgs count {Types.desc} = match desc with
-          | Tarrow (_, _inputType, returnType, _) -> countNumberOfArgs (count + 1) returnType
-          | _ -> count
-        in
-        let countNumberOfArgs = countNumberOfArgs 1 in
-        let acceptsCount = countNumberOfArgs returnType in
-        fprintf ppf "@[<v>@[<2>This function has type@ @{<info>%a@}@]"
-          type_expr typ;
-        fprintf ppf "@ @[It only accepts %i %s; here, it's called with more.@]@]"
-          acceptsCount (if acceptsCount == 1 then "argument" else "arguments")
-      | _ ->
-        fprintf ppf "@[<v>@[<2>This expression has type@ %a@]@ %s@]"
-          type_expr typ
-          "It is not a function."
-    end
-  | Apply_wrong_label (l, ty) ->
-      let print_label ppf = function
-        | Nolabel -> fprintf ppf "without label"
-        | l ->
-            fprintf ppf "with label %s" (prefixed_label_name l)
-      in
-      fprintf ppf
-        "@[<v>@[<2>The function applied to this argument has type@ %a@]@.\
-          This argument cannot be applied %a@]"
-        type_expr ty print_label l
-  | Label_multiply_defined s ->
-      fprintf ppf "The record field label %s is defined several times" s
-  | Labels_missing (labels, might_be_component) ->
-      let print_labels ppf =
-        List.iter (fun lbl -> fprintf ppf "@ %s" ( lbl)) in
-      let component_text = if might_be_component then " If this is a component, add the missing props." else "" in
-      fprintf ppf "@[<hov>Some required record fields are missing:%a.%s@]"
-        print_labels labels component_text
-  | Label_not_mutable lid ->
-      fprintf ppf "The record field %a is not mutable" longident lid
-  | Wrong_name (eorp, ty, kind, p, name, valid_names) ->
-    (* modified *)
-    if Path.is_constructor_typath p then begin
-      fprintf ppf "@[The field %s is not part of the record \
-                   argument for the %a constructor@]"
-        name
-        Printtyp.path p;
-    end else begin
-      fprintf ppf "@[<v>";
-
-      fprintf ppf "@[<2>The %s @{<error>%s@} does not belong to type @{<info>%a@}@]@,@,"
-        (label_of_kind kind)
-        name (*kind*) Printtyp.path p;
-
-      fprintf ppf "@[<2>%s type@ @{<info>%a@}@]"
-        eorp type_expr ty;
-
-      fprintf ppf "@]";      
-    end;
-    spellcheck ppf name valid_names;
-  | Name_type_mismatch (kind, lid, tp, tpl) ->
-      let name = label_of_kind kind in
-      report_ambiguous_type_error ppf env tp tpl
-        (function ppf ->
-           fprintf ppf "The %s %a@ belongs to the %s type"
-             name longident lid kind)
-        (function ppf ->
-           fprintf ppf "The %s %a@ belongs to one of the following %s types:"
-             name longident lid kind)
-        (function ppf ->
-           fprintf ppf "but a %s was expected belonging to the %s type"
-             name kind)
-  | Undefined_method (ty, me, valid_methods) ->
-      fprintf ppf
-        "@[<v>@[This expression has type@;<1 2>%a@]@,\
-         It has no field %s@]" type_expr ty me;
-      begin match valid_methods with
-        | None -> ()
-        | Some valid_methods -> spellcheck ppf me valid_methods
-      end
-  | Not_subtype(tr1, tr2) ->
-      report_subtyping_error ppf env tr1 "is not a subtype of" tr2
-  | Coercion_failure (ty, ty', trace, b) ->
-    (* modified *)
-    super_report_unification_error ppf env trace
-      (function ppf ->
-         let ty, ty' = Printtyp.prepare_expansion (ty, ty') in
-         fprintf ppf
-           "This expression cannot be coerced to type@;<1 2>%a;@ it has type"
-           (Printtyp.type_expansion ty) ty')
-      (function ppf ->
-         fprintf ppf "but is here used with type");
-    if b then
-      fprintf ppf ".@.@[<hov>%s@ %s@]"
-        "This simple coercion was not fully general."
-        "Consider using a double coercion."
-  | Too_many_arguments (in_function, ty) ->
-    (* modified *)
-    if in_function then begin
-      fprintf ppf "@[This function expects too many arguments,@ ";
-      fprintf ppf "it should have type@ %a@]"
-        type_expr ty
-    end else begin
-      match ty with
-      | {desc = Tconstr (Pident {name = "function$"},_,_)} ->
-        fprintf ppf "This expression is expected to have an uncurried function"
-      | _ ->
-        fprintf ppf "@[This expression should not be a function,@ ";
-        fprintf ppf "the expected type is@ %a@]"
-          type_expr ty
-    end
-  | Abstract_wrong_label (l, ty) ->
-      let label_mark = function
-        | Nolabel -> "but its first argument is not labelled"
-        | l -> sprintf "but its first argument is labelled %s"
-                       (prefixed_label_name l) in
-      fprintf ppf "@[<v>@[<2>This function should have type@ %a@]@,%s@]"
-      type_expr ty (label_mark l)
-  | Scoping_let_module(id, ty) ->
-      fprintf ppf
-       "This `let module' expression has type@ %a@ " type_expr ty;
-      fprintf ppf
-       "In this type, the locally bound module name %s escapes its scope" id
-  | Private_type ty ->
-      fprintf ppf "Cannot create values of the private type %a" type_expr ty
-  | Private_label (lid, ty) ->
-      fprintf ppf "Cannot assign field %a of the private type %a"
-        longident lid type_expr ty
-  | Not_a_variant_type lid ->
-      fprintf ppf "The type %a@ is not a variant type" longident lid
-  | Incoherent_label_order ->
-      fprintf ppf "This labeled function is applied to arguments@ ";
-      fprintf ppf "in an order different from other calls.@ ";
-      fprintf ppf "This is only allowed when the real type is known."
-  | Less_general (kind, trace) ->
-    (* modified *)
-    super_report_unification_error ppf env trace
-      (fun ppf -> fprintf ppf "This %s has type" kind)
-      (fun ppf -> fprintf ppf "which is less general than")
-  | Modules_not_allowed ->
-      fprintf ppf "Modules are not allowed in this pattern."
-  | Cannot_infer_signature ->
-      fprintf ppf
-        "The signature for this packaged module couldn't be inferred."
-  | Not_a_packed_module ty ->
-      fprintf ppf
-        "This expression is packed module, but the expected type is@ %a"
-        type_expr ty
-  | Recursive_local_constraint trace ->
-    (* modified *)
-    super_report_unification_error ppf env trace
-      (function ppf ->
-         fprintf ppf "Recursive local constraint when unifying")
-      (function ppf ->
-         fprintf ppf "with")
-  | Unexpected_existential ->
-      fprintf ppf
-        "Unexpected existential"
-  | Unqualified_gadt_pattern (tpath, name) ->
-      fprintf ppf "@[The GADT constructor %s of type %a@ %s.@]"
-        name Printtyp.path tpath
-        "must be qualified in this pattern"
-  | Invalid_interval ->
-      fprintf ppf "@[Only character intervals are supported in patterns.@]"
-  | Invalid_for_loop_index ->
-      fprintf ppf
-        "@[Invalid for-loop index: only variables and _ are allowed.@]"
-  | No_value_clauses ->
-      fprintf ppf
-        "None of the patterns in this 'match' expression match values."
-  | Exception_pattern_below_toplevel ->
-      fprintf ppf
-        "@[Exception patterns must be at the top level of a match case.@]"
-  | Inlined_record_escape ->
-      fprintf ppf
-        "@[This form is not allowed as the type of the inlined record could \
-         escape.@]"
-  | Inlined_record_expected ->
-      fprintf ppf
-        "@[This constructor expects an inlined record argument.@]"
-  | Unrefuted_pattern pat ->
-      fprintf ppf
-        "@[%s@ %s@ %a@]"
-        "This match case could not be refuted."
-        "Here is an example of a value that would reach it:"
-        Parmatch.top_pretty pat
-  | Invalid_extension_constructor_payload ->
-      fprintf ppf
-        "Invalid [%%extension_constructor] payload, a constructor is expected."
-  | Not_an_extension_constructor ->
-      fprintf ppf
-        "This constructor is not an extension constructor."
-  | Literal_overflow ty ->
-      fprintf ppf "Integer literal exceeds the range of representable \
-                   integers of type %s" ty
-  | Unknown_literal (n, m) ->
-      fprintf ppf "Unknown modifier '%c' for literal %s%c" m n m
-  | Illegal_letrec_pat ->
-      fprintf ppf
-        "Only variables are allowed as left-hand side of `let rec'"
-  | Labels_omitted [label] ->
-      fprintf ppf "Label ~%s was omitted in the application of this labeled function." 
-      label  
-  | Labels_omitted labels ->
-      let labelsString = labels |> List.map(fun label -> "~" ^ label) |> String.concat ", " in
-      fprintf ppf "Labels %s were omitted in the application of this labeled function." 
-      labelsString 
-  | Empty_record_literal ->
-      fprintf ppf  "Empty record literal {} should be type annotated or used in a record context."
-  | Uncurried_arity_mismatch (typ, arity, args) ->
-    fprintf ppf "@[<v>@[<2>This uncurried function has type@ %a@]"
-      type_expr typ;
-    fprintf ppf "@ @[It is applied with @{<error>%d@} argument%s but it requires @{<info>%d@}.@]@]"
-      args (if args = 0 then "" else "s") arity
-  | Field_not_optional (name, typ) ->
-    fprintf ppf
-      "Field @{<info>%s@} is not optional in type %a. Use without ?" name
-      type_expr typ
-
-
-let super_report_error_no_wrap_printing_env = report_error
-
-
-let report_error env ppf err =
-  Printtyp.wrap_printing_env env (fun () -> report_error env ppf err)
-
-let () =
-  Location.register_error_of_exn
-    (function
-      | Error (loc, env, err) ->
-        Some (Location.error_of_printer loc (report_error env) err)
-      | Error_forward err ->
-        Some err
-      | _ ->
-        None
-    )
-
-
-(* drop ?recarg argument from the external API *)
-let type_expect ?in_function env e ty = type_expect ?in_function env e ty
-let type_exp env e = type_exp env e
-let type_argument env e t1 t2 = type_argument env e t1 t2
diff --git a/jscomp/ml/typecore.mli b/jscomp/ml/typecore.mli
deleted file mode 100644
index 650bae0..0000000
--- a/jscomp/ml/typecore.mli
+++ /dev/null
@@ -1,142 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Type inference for the core language *)
-
-open Asttypes
-open Types
-open Format
-
-val is_nonexpansive: Typedtree.expression -> bool
-
-val type_binding:
-        Env.t -> rec_flag ->
-          Parsetree.value_binding list ->
-          Annot.ident option ->
-          Typedtree.value_binding list * Env.t
-val type_let:
-        Env.t -> rec_flag ->
-          Parsetree.value_binding list ->
-          Annot.ident option ->
-          Typedtree.value_binding list * Env.t
-val type_expression:
-        Env.t -> Parsetree.expression -> Typedtree.expression
-val check_partial:
-        ?lev:int -> Env.t -> type_expr ->
-        Location.t -> Typedtree.case list -> Typedtree.partial
-val type_expect:
-        ?in_function:(Location.t * type_expr) ->
-        Env.t -> Parsetree.expression -> type_expr -> Typedtree.expression
-val type_exp:
-        Env.t -> Parsetree.expression -> Typedtree.expression
-val type_approx:
-        Env.t -> Parsetree.expression -> type_expr
-val type_argument:
-        Env.t -> Parsetree.expression ->
-        type_expr -> type_expr -> Typedtree.expression
-
-val option_some: Typedtree.expression -> Typedtree.expression
-val option_none: type_expr -> Location.t -> Typedtree.expression
-val extract_option_type: Env.t -> type_expr -> type_expr
-val iter_pattern: (Typedtree.pattern -> unit) -> Typedtree.pattern -> unit
-val generalizable: int -> type_expr -> bool
-
-
-
-val id_of_pattern : Typedtree.pattern -> Ident.t option
-val name_pattern : string -> Typedtree.case list -> Ident.t
-
-val self_coercion : (Path.t * Location.t list ref) list ref
-
-type error =
-    Polymorphic_label of Longident.t
-  | Constructor_arity_mismatch of Longident.t * int * int
-  | Label_mismatch of Longident.t * (type_expr * type_expr) list
-  | Pattern_type_clash of (type_expr * type_expr) list
-  | Or_pattern_type_clash of Ident.t * (type_expr * type_expr) list
-  | Multiply_bound_variable of string
-  | Orpat_vars of Ident.t * Ident.t list
-  | Expr_type_clash of (type_expr * type_expr) list * (Error_message_utils.typeClashContext option)
-  | Apply_non_function of type_expr
-  | Apply_wrong_label of arg_label * type_expr
-  | Label_multiply_defined of string
-  | Labels_missing of string list * bool
-  | Label_not_mutable of Longident.t
-  | Wrong_name of string * type_expr * string * Path.t * string * string list
-  | Name_type_mismatch of
-      string * Longident.t * (Path.t * Path.t) * (Path.t * Path.t) list
-  | Undefined_method of type_expr * string * string list option
-  | Private_type of type_expr
-  | Private_label of Longident.t * type_expr
-  | Not_subtype of (type_expr * type_expr) list * (type_expr * type_expr) list
-  | Coercion_failure of
-      type_expr * type_expr * (type_expr * type_expr) list * bool
-  | Too_many_arguments of bool * type_expr
-  | Abstract_wrong_label of arg_label * type_expr
-  | Scoping_let_module of string * type_expr
-  | Not_a_variant_type of Longident.t
-  | Incoherent_label_order
-  | Less_general of string * (type_expr * type_expr) list
-  | Modules_not_allowed
-  | Cannot_infer_signature
-  | Not_a_packed_module of type_expr
-  | Recursive_local_constraint of (type_expr * type_expr) list
-  | Unexpected_existential
-  | Unqualified_gadt_pattern of Path.t * string
-  | Invalid_interval
-  | Invalid_for_loop_index
-  | No_value_clauses
-  | Exception_pattern_below_toplevel
-  | Inlined_record_escape
-  | Inlined_record_expected
-  | Unrefuted_pattern of Typedtree.pattern
-  | Invalid_extension_constructor_payload
-  | Not_an_extension_constructor
-  | Literal_overflow of string
-  | Unknown_literal of string * char
-  | Illegal_letrec_pat
-  | Labels_omitted of string list
-  | Empty_record_literal
-  | Uncurried_arity_mismatch of type_expr * int * int
-  | Field_not_optional of string * type_expr
-exception Error of Location.t * Env.t * error
-exception Error_forward of Location.error
-
-
-val super_report_error_no_wrap_printing_env: Env.t -> formatter -> error -> unit
-
-
-val report_error: Env.t -> formatter -> error -> unit
- (* Deprecated.  Use Location.{error_of_exn, report_error}. *)
-
-(* Forward declaration, to be filled in by Typemod.type_module *)
-val type_module: (Env.t -> Parsetree.module_expr -> Typedtree.module_expr) ref
-(* Forward declaration, to be filled in by Typemod.type_open *)
-val type_open:
-  (?used_slot:bool ref -> override_flag -> Env.t -> Location.t ->
-   Longident.t loc -> Path.t * Env.t)
-    ref
-(* Forward declaration, to be filled in by Typeclass.class_structure *)
-val type_package:
-  (Env.t -> Parsetree.module_expr -> Path.t -> Longident.t list ->
-  Typedtree.module_expr * type_expr list) ref
-
-val create_package_type : Location.t -> Env.t ->
-  Longident.t * (Longident.t * Parsetree.core_type) list ->
-  Path.t * (Longident.t * Typedtree.core_type) list * Types.type_expr
-
-val constant: Parsetree.constant -> (Asttypes.constant, error) result
-
-
diff --git a/jscomp/ml/typedecl.ml b/jscomp/ml/typedecl.ml
deleted file mode 100644
index 532c093..0000000
--- a/jscomp/ml/typedecl.ml
+++ /dev/null
@@ -1,2206 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*  Xavier Leroy and Jerome Vouillon, projet Cristal, INRIA Rocquencourt  *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(**** Typing of type definitions ****)
-
-open Misc
-open Asttypes
-open Parsetree
-open Primitive
-open Types
-open Typetexp
-
-type native_repr_kind = Unboxed | Untagged
-
-type error =
-    Repeated_parameter
-  | Duplicate_constructor of string
-  | Duplicate_label of string * string option
-  | Recursive_abbrev of string
-  | Cycle_in_def of string * type_expr
-  | Definition_mismatch of type_expr * Includecore.type_mismatch list
-  | Constraint_failed of type_expr * type_expr
-  | Inconsistent_constraint of Env.t * (type_expr * type_expr) list
-  | Type_clash of Env.t * (type_expr * type_expr) list
-  | Parameters_differ of Path.t * type_expr * type_expr
-  | Null_arity_external
-  | Unbound_type_var of type_expr * type_declaration
-  | Cannot_extend_private_type of Path.t
-  | Not_extensible_type of Path.t
-  | Extension_mismatch of Path.t * Includecore.type_mismatch list
-  | Rebind_wrong_type of Longident.t * Env.t * (type_expr * type_expr) list
-  | Rebind_mismatch of Longident.t * Path.t * Path.t
-  | Rebind_private of Longident.t
-  | Bad_variance of int * (bool * bool * bool) * (bool * bool * bool)
-  | Unavailable_type_constructor of Path.t
-  | Bad_fixed_type of string
-  | Unbound_type_var_ext of type_expr * extension_constructor
-  | Varying_anonymous
-  | Val_in_structure
-  | Bad_immediate_attribute
-  | Bad_unboxed_attribute of string
-  | Boxed_and_unboxed
-  | Nonrec_gadt
-  | Variant_runtime_representation_mismatch of Variant_coercion.variant_error
-  | Variant_spread_fail of Variant_type_spread.variant_type_spread_error
-
-open Typedtree
-
-exception Error of Location.t * error
-
-(* Note: do not factor the branches in the following pattern-matching:
-   the records must be constants for the compiler to do sharing on them.
-*)
-let get_unboxed_from_attributes sdecl =
-  let unboxed = Builtin_attributes.has_unboxed sdecl.ptype_attributes in
-  let boxed = Builtin_attributes.has_boxed sdecl.ptype_attributes in
-  match boxed, unboxed, !Clflags.unboxed_types with
-  | true, true, _ -> raise (Error(sdecl.ptype_loc, Boxed_and_unboxed))
-  | true, false, _ -> unboxed_false_default_false
-  | false, true, _ -> unboxed_true_default_false
-  | false, false, false -> unboxed_false_default_true
-  | false, false, true -> unboxed_true_default_true
-
-(* Enter all declared types in the environment as abstract types *)
-
-let enter_type rec_flag env sdecl id =
-  let needed =
-    match rec_flag with
-    | Asttypes.Nonrecursive ->
-        begin match sdecl.ptype_kind with
-        | Ptype_variant scds ->
-            List.iter (fun cd ->
-              if cd.pcd_res <> None then raise (Error(cd.pcd_loc, Nonrec_gadt)))
-              scds
-        | _ -> ()
-        end;
-        Btype.is_row_name (Ident.name id)
-    | Asttypes.Recursive -> true
-  in
-  if not needed then env else
-  let decl =
-    { type_params =
-        List.map (fun _ -> Btype.newgenvar ()) sdecl.ptype_params;
-      type_arity = List.length sdecl.ptype_params;
-      type_kind = Type_abstract;
-      type_private = sdecl.ptype_private;
-      type_manifest =
-        begin match sdecl.ptype_manifest with None -> None
-        | Some _ -> Some(Ctype.newvar ()) end;
-      type_variance = List.map (fun _ -> Variance.full) sdecl.ptype_params;
-      type_newtype_level = None;
-      type_loc = sdecl.ptype_loc;
-      type_attributes = sdecl.ptype_attributes;
-      type_immediate = false;
-      type_unboxed = unboxed_false_default_false;
-    }
-  in
-  Env.add_type ~check:true id decl env
-
-let update_type temp_env env id loc =
-  let path = Path.Pident id in
-  let decl = Env.find_type path temp_env in
-  match decl.type_manifest with None -> ()
-  | Some ty ->
-      let params = List.map (fun _ -> Ctype.newvar ()) decl.type_params in
-      try Ctype.unify env (Ctype.newconstr path params) ty
-      with Ctype.Unify trace ->
-        raise (Error(loc, Type_clash (env, trace)))
-
-(* We use the Ctype.expand_head_opt version of expand_head to get access
-   to the manifest type of private abbreviations. *)
-let rec get_unboxed_type_representation env ty fuel =
-  if fuel < 0 then None else
-  let ty = Ctype.repr (Ctype.expand_head_opt env ty) in
-  match ty.desc with
-  | Tconstr (p, args, _) ->
-    begin match Env.find_type p env with
-    | exception Not_found -> Some ty
-    | {type_unboxed = {unboxed = false}} -> Some ty
-    | {type_params; type_kind =
-         Type_record ([{ld_type = ty2; _}], _)
-       | Type_variant [{cd_args = Cstr_tuple [ty2]; _}]
-       | Type_variant [{cd_args = Cstr_record [{ld_type = ty2; _}]; _}]}
-
-         -> get_unboxed_type_representation env
-             (Ctype.apply env type_params ty2 args) (fuel - 1)
-    | {type_kind=Type_abstract} -> None
-          (* This case can occur when checking a recursive unboxed type
-             declaration. *)
-    | _ -> assert false (* only the above can be unboxed *)
-    end
-  | _ -> Some ty
-
-let get_unboxed_type_representation env ty =
-  (* Do not give too much fuel: PR#7424 *)
-  get_unboxed_type_representation env ty 100
-;;
-
-
-(* Determine if a type definition defines a fixed type. (PW) *)
-let is_fixed_type sd =
-  let rec has_row_var sty =
-    match sty.ptyp_desc with
-      Ptyp_alias (sty, _) -> has_row_var sty
-    | Ptyp_class _
-    | Ptyp_object (_, Open)
-    | Ptyp_variant (_, Open, _)
-    | Ptyp_variant (_, Closed, Some _) -> true
-    | _ -> false
-  in
-  match sd.ptype_manifest with
-    None -> false
-  | Some sty ->
-      sd.ptype_kind = Ptype_abstract &&
-      sd.ptype_private = Private &&
-      has_row_var sty
-
-(* Set the row variable in a fixed type *)
-let set_fixed_row env loc p decl =
-  let tm =
-    match decl.type_manifest with
-      None -> assert false
-    | Some t -> Ctype.expand_head env t
-  in
-  let rv =
-    match tm.desc with
-      Tvariant row ->
-        let row = Btype.row_repr row in
-        tm.desc <- Tvariant {row with row_fixed = true};
-        if Btype.static_row row then Btype.newgenty Tnil
-        else row.row_more
-    | Tobject (ty, _) ->
-        snd (Ctype.flatten_fields ty)
-    | _ ->
-        raise (Error (loc, Bad_fixed_type "is not an object or variant"))
-  in
-  if not (Btype.is_Tvar rv) then
-    raise (Error (loc, Bad_fixed_type "has no row variable"));
-  rv.desc <- Tconstr (p, decl.type_params, ref Mnil)
-
-(* Translate one type declaration *)
-
-module StringSet =
-  Set.Make(struct
-    type t = string
-    let compare (x:t) y = compare x y
-  end)
-
-let make_params env params =
-  let make_param (sty, v) =
-    try
-      (transl_type_param env sty, v)
-    with Already_bound ->
-      raise(Error(sty.ptyp_loc, Repeated_parameter))
-  in
-    List.map make_param params
-
-let transl_labels ?recordName env closed lbls =
-  if !Config.bs_only then 
-    match !Builtin_attributes.check_duplicated_labels lbls with 
-    | None -> ()
-    | Some {loc;txt=name} -> raise (Error(loc,Duplicate_label (name, recordName)))
-  else (
-  let all_labels = ref StringSet.empty in
-  List.iter
-    (fun {pld_name = {txt=name; loc}} ->
-       if StringSet.mem name !all_labels then
-         raise(Error(loc, Duplicate_label (name, recordName)));
-       all_labels := StringSet.add name !all_labels)
-    lbls);
-  let mk {pld_name=name;pld_mutable=mut;pld_type=arg;pld_loc=loc;
-          pld_attributes=attrs} =
-    Builtin_attributes.warning_scope attrs
-      (fun () ->
-         let arg = Ast_helper.Typ.force_poly arg in
-         let cty = transl_simple_type env closed arg in
-         {ld_id = Ident.create name.txt; ld_name = name; ld_mutable = mut;
-          ld_type = cty; ld_loc = loc; ld_attributes = attrs}
-      )
-  in
-  let lbls = List.map mk lbls in
-  let lbls' =
-    List.map
-      (fun ld ->
-         let ty = ld.ld_type.ctyp_type in
-         let ty = match ty.desc with Tpoly(t,[]) -> t | _ -> ty in
-         {Types.ld_id = ld.ld_id;
-          ld_mutable = ld.ld_mutable;
-          ld_type = ty;
-          ld_loc = ld.ld_loc;
-          ld_attributes = ld.ld_attributes
-         }
-      )
-      lbls in
-  lbls, lbls'
-
-let transl_constructor_arguments env closed = function
-  | Pcstr_tuple l ->
-      let l = List.map (transl_simple_type env closed) l in
-      Types.Cstr_tuple (List.map (fun t -> t.ctyp_type) l),
-      Cstr_tuple l
-  | Pcstr_record l ->
-      let lbls, lbls' = transl_labels env closed l in
-      Types.Cstr_record lbls',
-      Cstr_record lbls
-
-let make_constructor env type_path type_params sargs sret_type =
-  match sret_type with
-  | None ->
-      let args, targs =
-        transl_constructor_arguments env true sargs
-      in
-        targs, None, args, None, type_params
-  | Some sret_type ->
-      (* if it's a generalized constructor we must first narrow and
-         then widen so as to not introduce any new constraints *)
-      let z = narrow () in
-      reset_type_variables ();
-      let args, targs =
-        transl_constructor_arguments env false sargs
-      in
-      let tret_type = transl_simple_type env false sret_type in
-      let ret_type = tret_type.ctyp_type in
-      let params =
-        match (Ctype.repr ret_type).desc with
-        | Tconstr (p', params, _) when Path.same type_path p' ->
-            params
-        | _ ->
-            raise (Error (sret_type.ptyp_loc, Constraint_failed
-                            (ret_type, Ctype.newconstr type_path type_params)))
-      in
-      widen z;
-      targs, Some tret_type, args, Some ret_type, params
-
-
-(* Check that all the variables found in [ty] are in [univ].
-   Because [ty] is the argument to an abstract type, the representation
-   of that abstract type could be any subexpression of [ty], in particular
-   any type variable present in [ty].
-*)
-
-
-let transl_declaration ~typeRecordAsObject env sdecl id =
-  (* Bind type parameters *)
-  reset_type_variables();
-  Ctype.begin_def ();
-  let tparams = make_params env sdecl.ptype_params in
-  let params = List.map (fun (cty, _) -> cty.ctyp_type) tparams in
-  let cstrs = List.map
-    (fun (sty, sty', loc) ->
-      transl_simple_type env false sty,
-      transl_simple_type env false sty', loc)
-    sdecl.ptype_cstrs
-  in
-  let raw_status = get_unboxed_from_attributes sdecl in
-
-  let checkUntaggedVariant() = match sdecl.ptype_kind with
-  | Ptype_variant cds -> Ext_list.for_all cds (function
-      | {pcd_args = Pcstr_tuple ([] | [_])} ->
-        (* at most one payload allowed for untagged  variants *)
-        true
-      | {pcd_args = Pcstr_tuple (_::_::_); pcd_name={txt=name}} ->
-        Ast_untagged_variants.reportConstructorMoreThanOneArg ~loc:sdecl.ptype_loc ~name
-      | {pcd_args = Pcstr_record _} -> true
-     )
-  | _ -> false
-  in
-
-  if raw_status.unboxed && not raw_status.default && not (checkUntaggedVariant()) then begin
-    match sdecl.ptype_kind with
-    | Ptype_abstract ->
-        raise(Error(sdecl.ptype_loc, Bad_unboxed_attribute
-                      "it is abstract"))
-    | Ptype_variant _ -> ()
-    | Ptype_record [{pld_mutable=Immutable; _}] -> ()
-    | Ptype_record [{pld_mutable=Mutable; _}] ->
-      raise(Error(sdecl.ptype_loc, Bad_unboxed_attribute
-                    "it is mutable"))
-    | Ptype_record _ ->
-      raise(Error(sdecl.ptype_loc, Bad_unboxed_attribute
-                    "it has more than one field"))
-    | Ptype_open ->
-      raise(Error(sdecl.ptype_loc, Bad_unboxed_attribute
-                    "extensible variant types cannot be unboxed"))
-  end;
-  let unboxed_status =
-    match sdecl.ptype_kind with
-    | Ptype_variant [{pcd_args = Pcstr_tuple []; _}] ->
-      unboxed_false_default_false
-    | Ptype_variant [{pcd_args = Pcstr_tuple _; _}]
-      | Ptype_variant [{pcd_args = Pcstr_record
-                          [{pld_mutable = Immutable; _}]; _}]
-      | Ptype_record [{pld_mutable = Immutable; _}] ->
-    raw_status
-    | _ -> (* The type is not unboxable, mark it as boxed *)
-      unboxed_false_default_false
-  in
-  let unbox = unboxed_status.unboxed in
-  let (tkind, kind, sdecl) =
-    match sdecl.ptype_kind with
-      | Ptype_abstract -> Ttype_abstract, Type_abstract, sdecl
-      | Ptype_variant scstrs ->
-        assert (scstrs <> []);
-        if List.exists (fun cstr -> cstr.pcd_res <> None) scstrs then begin
-          match cstrs with
-            [] -> ()
-          | (_,_,loc)::_ ->
-              Location.prerr_warning loc Warnings.Constraint_on_gadt
-        end;
-        let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "res.optional") in
-        let scstrs =
-          Ext_list.map scstrs (fun ({pcd_args} as cstr) ->
-            match pcd_args with
-            | Pcstr_tuple _ -> cstr
-            | Pcstr_record lds ->
-              {cstr with pcd_args = Pcstr_record (Ext_list.map lds (fun ld ->
-                if has_optional ld.pld_attributes then
-                  let typ = ld.pld_type in
-                  let typ = {typ with ptyp_desc = Ptyp_constr ({txt = Lident "option"; loc=typ.ptyp_loc}, [typ])} in
-                  {ld with pld_type = typ}
-                else ld
-              ))}
-            ) in
-        let all_constrs = ref StringSet.empty in
-        List.iter
-          (fun {pcd_name = {txt = name}} ->
-            if StringSet.mem name !all_constrs then
-              raise(Error(sdecl.ptype_loc, Duplicate_constructor name));
-            all_constrs := StringSet.add name !all_constrs)
-          scstrs;
-        let copy_tag_attr_from_decl attr =
-          let tag_attrs = Ext_list.filter sdecl.ptype_attributes (fun ({txt}, _) -> txt = "tag" || txt = Ast_untagged_variants.untagged) in
-          if tag_attrs = [] then attr else tag_attrs @ attr in
-        let constructors_from_variant_spreads = Hashtbl.create 10 in
-        let make_cstr scstr =
-          let name = Ident.create scstr.pcd_name.txt in
-          let targs, tret_type, args, ret_type, _cstr_params =
-            make_constructor env (Path.Pident id) params
-                             scstr.pcd_args scstr.pcd_res
-          in
-          if String.starts_with scstr.pcd_name.txt ~prefix:"..." then (
-            (* Any constructor starting with "..." represents a variant type spread, and
-               will have the spread variant itself as a single argument.
-
-               We pull that variant type out, and then track the type of each of its
-               constructors, so that we can replace our dummy constructors added before 
-               type checking  with the realtypes for each constructor.
-               *)
-            (match args with
-            | Cstr_tuple [spread_variant] -> (
-              match Ctype.extract_concrete_typedecl env spread_variant with
-              | (_, _, {type_kind=Type_variant constructors}) -> (
-                constructors |> List.iter(fun (c: Types.constructor_declaration) ->
-                  Hashtbl.add constructors_from_variant_spreads c.cd_id.name c)
-              )
-              | _ -> ()
-            )
-            | _ -> ()); 
-              None)
-          else (
-          (* Check if this constructor is from a variant spread. If so, we need to replace 
-             its type with the right type we've pulled from the type checked spread variant
-             itself. *)
-          let tcstr, cstr = match Hashtbl.find_opt constructors_from_variant_spreads (Ident.name name) with
-          | Some cstr ->
-            let tcstr =
-              {
-                cd_id = name;
-                cd_name = scstr.pcd_name;
-                cd_args =
-                  (match cstr.cd_args with
-                  | Cstr_tuple args ->
-                    Cstr_tuple
-                      (args
-                      |> List.map (fun texpr : Typedtree.core_type ->
-                             {
-                               ctyp_attributes = cstr.cd_attributes;
-                               ctyp_loc = cstr.cd_loc;
-                               ctyp_env = env;
-                               ctyp_type = texpr;
-                               ctyp_desc = Ttyp_any;
-                               (* This is fine because the type checker seems to only look at `ctyp_type` for type checking. *)
-                             }))
-                  | Cstr_record lbls ->
-                    Cstr_record
-                      (lbls
-                      |> List.map
-                           (fun (l : Types.label_declaration) : Typedtree.label_declaration
-                           ->
-                             {
-                               ld_id = l.ld_id;
-                               ld_name = Location.mkloc (Ident.name l.ld_id) l.ld_loc;
-                               ld_mutable = l.ld_mutable;
-                               ld_type =
-                                 {
-                                   ctyp_desc = Ttyp_any;
-                                   ctyp_type = l.ld_type;
-                                   ctyp_env = env;
-                                   ctyp_loc = l.ld_loc;
-                                   ctyp_attributes = [];
-                                 };
-                               ld_loc = l.ld_loc;
-                               ld_attributes = l.ld_attributes;
-                             })));
-                cd_res = tret_type;
-                (* This is also strictly wrong, but is fine because the type checker does not look at this field. *)
-                cd_loc = scstr.pcd_loc;
-                cd_attributes = scstr.pcd_attributes |> copy_tag_attr_from_decl;
-              }
-            in            
-            tcstr, cstr
-          | None ->
-            let tcstr =
-              { cd_id = name;
-                cd_name = scstr.pcd_name;
-                cd_args = targs;
-                cd_res = tret_type;
-                cd_loc = scstr.pcd_loc;
-                cd_attributes = scstr.pcd_attributes |> copy_tag_attr_from_decl }
-            in
-            let cstr =
-              { Types.cd_id = name;
-                cd_args = args;
-                cd_res = ret_type;
-                cd_loc = scstr.pcd_loc;
-                cd_attributes = scstr.pcd_attributes |> copy_tag_attr_from_decl }
-            in
-            tcstr, cstr
-          in Some (tcstr, cstr)
-          )
-        in
-        let make_cstr scstr =
-          Builtin_attributes.warning_scope scstr.pcd_attributes
-            (fun () -> make_cstr scstr)
-        in
-        let tcstrs, cstrs = List.split (List.filter_map make_cstr scstrs) in
-        let isUntaggedDef = Ast_untagged_variants.has_untagged sdecl.ptype_attributes in
-        Ast_untagged_variants.check_well_formed ~env ~isUntaggedDef cstrs;
-        Ttype_variant tcstrs, Type_variant cstrs, sdecl
-      | Ptype_record lbls_ ->
-          let has_optional attrs = Ext_list.exists attrs (fun ({txt },_) -> txt = "res.optional") in
-          let optionalLabels =
-              Ext_list.filter_map lbls_
-              (fun lbl -> if has_optional lbl.pld_attributes then Some lbl.pld_name.txt else None) in
-          let lbls =
-            if optionalLabels = [] then lbls_
-            else Ext_list.map lbls_ (fun lbl ->
-              let typ = lbl.pld_type in
-              let typ =
-                if has_optional lbl.pld_attributes then
-                  {typ with ptyp_desc = Ptyp_constr ({txt = Lident "option"; loc=typ.ptyp_loc}, [typ])}
-                else typ in
-              {lbl with  pld_type = typ }) in
-          let lbls, lbls' = transl_labels ~recordName:(sdecl.ptype_name.txt) env true lbls in
-          let lbls_opt = match Record_type_spread.has_type_spread lbls with
-            | true ->
-              let rec extract t = match t.desc with
-                | Tpoly(t, []) -> extract t
-                | _ -> Ctype.repr t in
-              let mkLbl (l: Types.label_declaration) (ld_type: Typedtree.core_type) (type_vars: (string * Types.type_expr) list) : Typedtree.label_declaration =
-                {
-                  ld_id = l.ld_id;
-                  ld_name = {txt = Ident.name l.ld_id; loc = l.ld_loc};
-                  ld_mutable = l.ld_mutable;
-                  ld_type = {ld_type with ctyp_type = Record_type_spread.substitute_type_vars type_vars l.ld_type};
-                  ld_loc = l.ld_loc;
-                  ld_attributes = l.ld_attributes;
-                } in
-              let rec process_lbls acc lbls lbls' = match lbls, lbls' with
-                | {ld_name = {txt = "..."}; ld_type} :: rest, _ :: rest' ->
-                  (match Ctype.extract_concrete_typedecl env (extract ld_type.ctyp_type) with
-                    (_p0, _p, {type_kind=Type_record (fields, _repr); type_params}) ->
-                      let type_vars = Record_type_spread.extract_type_vars type_params ld_type.ctyp_type in
-                      process_lbls
-                        ( fst acc
-                          @ (Ext_list.map fields (fun l ->
-                            mkLbl l ld_type type_vars))
-                          ,
-                          snd acc
-                          @ (Ext_list.map fields (fun l ->
-                            {
-                              l with
-                              ld_type =
-                                Record_type_spread.substitute_type_vars type_vars l.ld_type;
-                            })) )
-                        rest rest'
-                    | _ -> assert false
-                    | exception _ -> None)
-                | lbl::rest, lbl'::rest' -> process_lbls (fst acc @ [lbl], snd acc @ [lbl']) rest rest'
-                | _ -> Some acc
-              in
-              process_lbls ([], []) lbls lbls'
-            | false -> Some (lbls, lbls') in
-          let rec check_duplicates loc (lbls : Typedtree.label_declaration list) seen = match lbls with
-          | [] -> ()
-          | lbl::rest ->
-            let name = lbl.ld_id.name in
-            if StringSet.mem name seen then raise(Error(loc, Duplicate_label (name, Some sdecl.ptype_name.txt)));
-            check_duplicates loc rest (StringSet.add name seen) in
-          (match lbls_opt with
-          | Some (lbls, lbls') ->
-            check_duplicates sdecl.ptype_loc lbls StringSet.empty;
-            let optionalLabels =
-              Ext_list.filter_map lbls (fun lbl ->
-                  if has_optional lbl.ld_attributes then Some lbl.ld_name.txt else None)
-            in
-            Ttype_record lbls, Type_record(lbls', if unbox then 
-                Record_unboxed false
-              else if optionalLabels <> [] then 
-                Record_optional_labels optionalLabels
-              else Record_regular), sdecl
-          | None ->
-             (* Could not find record type decl for ...t: assume t is an object type and this is syntax ambiguity *)
-             typeRecordAsObject := true;
-             let fields = Ext_list.map lbls_ (fun ld ->
-              match ld.pld_name.txt with
-              | "..." -> Parsetree.Oinherit ld.pld_type
-              | _ -> Otag (ld.pld_name, ld.pld_attributes, ld.pld_type)) in
-             let sdecl =
-              {sdecl with
-               ptype_kind = Ptype_abstract;
-               ptype_manifest = Some (Ast_helper.Typ.object_ ~loc:sdecl.ptype_loc fields Closed);
-              } in
-             (Ttype_abstract, Type_abstract, sdecl))
-      | Ptype_open -> Ttype_open, Type_open, sdecl
-      in
-    let (tman, man) = match sdecl.ptype_manifest with
-        None -> None, None
-      | Some sty ->
-        let no_row = not (is_fixed_type sdecl) in
-        let cty = transl_simple_type env no_row sty in
-        Some cty, Some cty.ctyp_type
-    in
-    let decl =
-      { type_params = params;
-        type_arity = List.length params;
-        type_kind = kind;
-        type_private = sdecl.ptype_private;
-        type_manifest = man;
-        type_variance = List.map (fun _ -> Variance.full) params;
-        type_newtype_level = None;
-        type_loc = sdecl.ptype_loc;
-        type_attributes = sdecl.ptype_attributes;
-        type_immediate = false;
-        type_unboxed = unboxed_status;
-      } in
-
-  (* Check constraints *)
-    List.iter
-      (fun (cty, cty', loc) ->
-        let ty = cty.ctyp_type in
-        let ty' = cty'.ctyp_type in
-        try Ctype.unify env ty ty' with Ctype.Unify tr ->
-          raise(Error(loc, Inconsistent_constraint (env, tr))))
-      cstrs;
-    Ctype.end_def ();
-  (* Add abstract row *)
-    if is_fixed_type sdecl then begin
-      let p =
-        try Env.lookup_type (Longident.Lident(Ident.name id ^ "#row")) env
-        with Not_found -> assert false in
-      set_fixed_row env sdecl.ptype_loc p decl
-    end;
-  (* Check for cyclic abbreviations *)
-    begin match decl.type_manifest with None -> ()
-      | Some ty ->
-        if Ctype.cyclic_abbrev env id ty then
-          raise(Error(sdecl.ptype_loc, Recursive_abbrev sdecl.ptype_name.txt));
-    end;
-    {
-      typ_id = id;
-      typ_name = sdecl.ptype_name;
-      typ_params = tparams;
-      typ_type = decl;
-      typ_cstrs = cstrs;
-      typ_loc = sdecl.ptype_loc;
-      typ_manifest = tman;
-      typ_kind = tkind;
-      typ_private = sdecl.ptype_private;
-      typ_attributes = sdecl.ptype_attributes;
-    }
-
-(* Generalize a type declaration *)
-
-let generalize_decl decl =
-  List.iter Ctype.generalize decl.type_params;
-  Btype.iter_type_expr_kind Ctype.generalize decl.type_kind;
-  begin match decl.type_manifest with
-  | None    -> ()
-  | Some ty -> Ctype.generalize ty
-  end
-
-(* Check that all constraints are enforced *)
-
-module TypeSet = Btype.TypeSet
-module TypeMap = Btype.TypeMap
-
-let rec check_constraints_rec env loc visited ty =
-  let ty = Ctype.repr ty in
-  if TypeSet.mem ty !visited then () else begin
-  visited := TypeSet.add ty !visited;
-  match ty.desc with
-  | Tconstr (path, args, _) ->
-      let args' = List.map (fun _ -> Ctype.newvar ()) args in
-      let ty' = Ctype.newconstr path args' in
-      begin try Ctype.enforce_constraints env ty'
-      with Ctype.Unify _ -> assert false
-      | Not_found -> raise (Error(loc, Unavailable_type_constructor path))
-      end;
-      if not (Ctype.matches env ty ty') then
-        raise (Error(loc, Constraint_failed (ty, ty')));
-      List.iter (check_constraints_rec env loc visited) args
-  | Tpoly (ty, tl) ->
-      let _, ty = Ctype.instance_poly false tl ty in
-      check_constraints_rec env loc visited ty
-  | _ ->
-      Btype.iter_type_expr (check_constraints_rec env loc visited) ty
-  end
-
-module SMap = Map.Make(String)
-
-let check_constraints_labels env visited l pl =
-  let rec get_loc name = function
-      [] -> Location.none
-    | pld :: tl ->
-        if name = pld.pld_name.txt then pld.pld_type.ptyp_loc
-        else get_loc name tl
-  in
-  List.iter
-    (fun {Types.ld_id=name; ld_type=ty} ->
-       check_constraints_rec env (get_loc (Ident.name name) pl) visited ty)
-    l
-
-let check_constraints ~typeRecordAsObject env sdecl (_, decl) =
-  let visited = ref TypeSet.empty in
-  begin match decl.type_kind with
-  | Type_abstract -> ()
-  | Type_variant l ->
-      let find_pl = function
-          Ptype_variant pl -> pl
-        | Ptype_record _ | Ptype_abstract | Ptype_open -> assert false
-      in
-      let pl = find_pl sdecl.ptype_kind in
-      let pl_index =
-        let foldf acc x =
-          SMap.add x.pcd_name.txt x acc
-        in
-        List.fold_left foldf SMap.empty pl
-      in
-      List.iter
-        (fun {Types.cd_id=name; cd_args; cd_res} ->
-          let {pcd_args; pcd_res; _} =
-            try SMap.find (Ident.name name) pl_index
-            with Not_found -> assert false in
-          begin match cd_args, pcd_args with
-          | Cstr_tuple tyl, Pcstr_tuple styl ->
-              List.iter2
-                (fun sty ty ->
-                   check_constraints_rec env sty.ptyp_loc visited ty)
-                styl tyl
-          | Cstr_record tyl, Pcstr_record styl ->
-              check_constraints_labels env visited tyl styl
-          | _ -> assert false
-          end;
-          match pcd_res, cd_res with
-          | Some sr, Some r ->
-              check_constraints_rec env sr.ptyp_loc visited r
-          | _ ->
-              () )
-        l
-  | Type_record (l, _) ->
-      let find_pl = function
-          Ptype_record pl -> pl
-        | Ptype_variant _ | Ptype_abstract | Ptype_open -> assert false
-      in
-      let pl = find_pl sdecl.ptype_kind in
-      check_constraints_labels env visited l pl
-  | Type_open -> ()
-  end;
-  begin match decl.type_manifest with
-  | None -> ()
-  | Some ty ->
-    if not !typeRecordAsObject then 
-      let sty =
-        match sdecl.ptype_manifest with Some sty -> sty | _ -> assert false
-      in
-      check_constraints_rec env sty.ptyp_loc visited ty
-  
-  end
-
-(*
-   If both a variant/record definition and a type equation are given,
-   need to check that the equation refers to a type of the same kind
-   with the same constructors and labels.
-*)
-let check_coherence env loc id decl =
-  match decl with
-    { type_kind = (Type_variant _ | Type_record _| Type_open);
-      type_manifest = Some ty } ->
-      begin match (Ctype.repr ty).desc with
-        Tconstr(path, args, _) ->
-          begin try
-            let decl' = Env.find_type path env in
-            let err =
-              if List.length args <> List.length decl.type_params
-              then [Includecore.Arity]
-              else if not (Ctype.equal env false args decl.type_params)
-              then [Includecore.Constraint]
-              else
-                Includecore.type_declarations ~loc ~equality:true env
-                  (Path.last path)
-                  decl'
-                  id
-                  (Subst.type_declaration
-                     (Subst.add_type id path Subst.identity) decl)
-            in
-            if err <> [] then
-              raise(Error(loc, Definition_mismatch (ty, err)))
-          with Not_found ->
-            raise(Error(loc, Unavailable_type_constructor path))
-          end
-      | _ -> raise(Error(loc, Definition_mismatch (ty, [])))
-      end
-  | _ -> ()
-
-let check_abbrev env sdecl (id, decl) =
-  check_coherence env sdecl.ptype_loc id decl
-
-(* Check that recursion is well-founded *)
-
-let check_well_founded env loc path to_check ty =
-  let visited = ref TypeMap.empty in
-  let rec check ty0 parents ty =
-    let ty = Btype.repr ty in
-    if TypeSet.mem ty parents then begin
-      (*Format.eprintf "@[%a@]@." Printtyp.raw_type_expr ty;*)
-      if match ty0.desc with
-      | Tconstr (p, _, _) -> Path.same p path
-      | _ -> false
-      then raise (Error (loc, Recursive_abbrev (Path.name path)))
-      else raise (Error (loc, Cycle_in_def (Path.name path, ty0)))
-    end;
-    let (fini, parents) =
-      try
-        let prev = TypeMap.find ty !visited in
-        if TypeSet.subset parents prev then (true, parents) else
-        (false, TypeSet.union parents prev)
-      with Not_found ->
-        (false, parents)
-    in
-    if fini then () else
-    let rec_ok =
-      match ty.desc with
-        Tconstr(_p,_,_) ->
-          false (*!Clflags.recursive_types && Ctype.is_contractive env p*)
-      | Tobject _ | Tvariant _ -> true
-      | _ -> false (* !Clflags.recursive_types*)
-    in
-    let visited' = TypeMap.add ty parents !visited in
-    let arg_exn =
-      try
-        visited := visited';
-        let parents =
-          if rec_ok then TypeSet.empty else TypeSet.add ty parents in
-        Btype.iter_type_expr (check ty0 parents) ty;
-        None
-      with e ->
-        visited := visited'; Some e
-    in
-    match ty.desc with
-    | Tconstr(p, _, _) when arg_exn <> None || to_check p ->
-        if to_check p then may raise arg_exn
-        else Btype.iter_type_expr (check ty0 TypeSet.empty) ty;
-        begin try
-          let ty' = Ctype.try_expand_once_opt env ty in
-          let ty0 = if TypeSet.is_empty parents then ty else ty0 in
-          check ty0 (TypeSet.add ty parents) ty'
-        with
-          Ctype.Cannot_expand -> may raise arg_exn
-        end
-    | _ -> may raise arg_exn
-  in
-  let snap = Btype.snapshot () in
-  try Ctype.wrap_trace_gadt_instances env (check ty TypeSet.empty) ty
-  with Ctype.Unify _ ->
-    (* Will be detected by check_recursion *)
-    Btype.backtrack snap
-
-let check_well_founded_manifest env loc path decl =
-  if decl.type_manifest = None then () else
-  let args = List.map (fun _ -> Ctype.newvar()) decl.type_params in
-  check_well_founded env loc path (Path.same path) (Ctype.newconstr path args)
-
-let check_well_founded_decl env loc path decl to_check =
-  let open Btype in
-  let it =
-    {type_iterators with
-     it_type_expr = (fun _ -> check_well_founded env loc path to_check)} in
-  it.it_type_declaration it (Ctype.instance_declaration decl)
-
-(* Check for ill-defined abbrevs *)
-
-let check_recursion env loc path decl to_check =
-  (* to_check is true for potentially mutually recursive paths.
-     (path, decl) is the type declaration to be checked. *)
-
-  if decl.type_params = [] then () else
-
-  let visited = ref [] in
-
-  let rec check_regular cpath args prev_exp ty =
-    let ty = Ctype.repr ty in
-    if not (List.memq ty !visited) then begin
-      visited := ty :: !visited;
-      match ty.desc with
-      | Tconstr(path', args', _) ->
-          if Path.same path path' then begin
-            if not (Ctype.equal env false args args') then
-              raise (Error(loc,
-                     Parameters_differ(cpath, ty, Ctype.newconstr path args)))
-          end
-          (* Attempt to expand a type abbreviation if:
-              1- [to_check path'] holds
-                 (otherwise the expansion cannot involve [path]);
-              2- we haven't expanded this type constructor before
-                 (otherwise we could loop if [path'] is itself
-                 a non-regular abbreviation). *)
-          else if to_check path' && not (List.mem path' prev_exp) then begin
-            try
-              (* Attempt expansion *)
-              let (params0, body0, _) = Env.find_type_expansion path' env in
-              let (params, body) =
-                Ctype.instance_parameterized_type params0 body0 in
-              begin
-                try List.iter2 (Ctype.unify env) params args'
-                with Ctype.Unify _ ->
-                  raise (Error(loc, Constraint_failed
-                                 (ty, Ctype.newconstr path' params0)));
-              end;
-              check_regular path' args (path' :: prev_exp) body
-            with Not_found -> ()
-          end;
-          List.iter (check_regular cpath args prev_exp) args'
-      | Tpoly (ty, tl) ->
-          let (_, ty) = Ctype.instance_poly ~keep_names:true false tl ty in
-          check_regular cpath args prev_exp ty
-      | _ ->
-          Btype.iter_type_expr (check_regular cpath args prev_exp) ty
-    end in
-
-  Misc.may
-    (fun body ->
-      let (args, body) =
-        Ctype.instance_parameterized_type
-          ~keep_names:true decl.type_params body in
-      check_regular path args [] body)
-    decl.type_manifest
-
-let check_abbrev_recursion env id_loc_list to_check tdecl =
-  let decl = tdecl.typ_type in
-  let id = tdecl.typ_id in
-  check_recursion env (List.assoc id id_loc_list) (Path.Pident id) decl to_check
-
-(* Compute variance *)
-
-let get_variance ty visited =
-  try TypeMap.find ty !visited with Not_found -> Variance.null
-
-let compute_variance env visited vari ty =
-  let rec compute_variance_rec vari ty =
-    (* Format.eprintf "%a: %x@." Printtyp.type_expr ty (Obj.magic vari); *)
-    let ty = Ctype.repr ty in
-    let vari' = get_variance ty visited in
-    if Variance.subset vari vari' then () else
-    let vari = Variance.union vari vari' in
-    visited := TypeMap.add ty vari !visited;
-    let compute_same = compute_variance_rec vari in
-    match ty.desc with
-      Tarrow (_, ty1, ty2, _) ->
-        let open Variance in
-        let v = conjugate vari in
-        let v1 =
-          if mem May_pos v || mem May_neg v
-          then set May_weak true v else v
-        in
-        compute_variance_rec v1 ty1;
-        compute_same ty2
-    | Ttuple tl ->
-        List.iter compute_same tl
-    | Tconstr (path, tl, _) ->
-        let open Variance in
-        if tl = [] then () else begin
-          try
-            let decl = Env.find_type path env in
-            let cvari f = mem f vari in
-            List.iter2
-              (fun ty v ->
-                let cv f = mem f v in
-                let strict =
-                  cvari Inv && cv Inj || (cvari Pos || cvari Neg) && cv Inv
-                in
-                if strict then compute_variance_rec full ty else
-                let p1 = inter v vari
-                and n1 = inter v (conjugate vari) in
-                let v1 =
-                  union (inter covariant (union p1 (conjugate p1)))
-                    (inter (conjugate covariant) (union n1 (conjugate n1)))
-                and weak =
-                  cvari May_weak && (cv May_pos || cv May_neg) ||
-                  (cvari May_pos || cvari May_neg) && cv May_weak
-                in
-                let v2 = set May_weak weak v1 in
-                compute_variance_rec v2 ty)
-              tl decl.type_variance
-          with Not_found ->
-            List.iter (compute_variance_rec may_inv) tl
-        end
-    | Tobject (ty, _) ->
-        compute_same ty
-    | Tfield (_, _, ty1, ty2) ->
-        compute_same ty1;
-        compute_same ty2
-    | Tsubst ty ->
-        compute_same ty
-    | Tvariant row ->
-        let row = Btype.row_repr row in
-        List.iter
-          (fun (_,f) ->
-            match Btype.row_field_repr f with
-              Rpresent (Some ty) ->
-                compute_same ty
-            | Reither (_, tyl, _, _) ->
-                let open Variance in
-                let upper =
-                  List.fold_left (fun s f -> set f true s)
-                    null [May_pos; May_neg; May_weak]
-                in
-                let v = inter vari upper in
-                (* cf PR#7269:
-                   if List.length tyl > 1 then upper else inter vari upper *)
-                List.iter (compute_variance_rec v) tyl
-            | _ -> ())
-          row.row_fields;
-        compute_same row.row_more
-    | Tpoly (ty, _) ->
-        compute_same ty
-    | Tvar _ | Tnil | Tlink _ | Tunivar _ -> ()
-    | Tpackage (_, _, tyl) ->
-        let v =
-          Variance.(if mem Pos vari || mem Neg vari then full else may_inv)
-        in
-        List.iter (compute_variance_rec v) tyl
-  in
-  compute_variance_rec vari ty
-
-let make p n i =
-  let open Variance in
-  set May_pos p (set May_neg n (set May_weak n (set Inj i null)))
-
-let compute_variance_type env check (required, loc) decl tyl =
-  (* Requirements *)
-  let required =
-    List.map (fun (c,n,i) -> if c || n then (c,n,i) else (true,true,i))
-      required
-  in
-  (* Prepare *)
-  let params = List.map Btype.repr decl.type_params in
-  let tvl = ref TypeMap.empty in
-  (* Compute occurrences in the body *)
-  let open Variance in
-  List.iter
-    (fun (cn,ty) ->
-      compute_variance env tvl (if cn then full else covariant) ty)
-    tyl;
-  if check then begin
-    (* Check variance of parameters *)
-    let pos = ref 0 in
-    List.iter2
-      (fun ty (c, n, i) ->
-        incr pos;
-        let var = get_variance ty tvl in
-        let (co,cn) = get_upper var and ij = mem Inj var in
-        if Btype.is_Tvar ty && (co && not c || cn && not n || not ij && i)
-        then raise (Error(loc, Bad_variance (!pos, (co,cn,ij), (c,n,i)))))
-      params required;
-    (* Check propagation from constrained parameters *)
-    let args = Btype.newgenty (Ttuple params) in
-    let fvl = Ctype.free_variables args in
-    let fvl = Ext_list.filter fvl (fun v -> not (List.memq v params)) in
-    (* If there are no extra variables there is nothing to do *)
-    if fvl = [] then () else
-    let tvl2 = ref TypeMap.empty in
-    List.iter2
-      (fun ty (p,n,_) ->
-        if Btype.is_Tvar ty then () else
-        let v =
-          if p then if n then full else covariant else conjugate covariant in
-        compute_variance env tvl2 v ty)
-      params required;
-    let visited = ref TypeSet.empty in
-    let rec check ty =
-      let ty = Ctype.repr ty in
-      if TypeSet.mem ty !visited then () else
-      let visited' = TypeSet.add ty !visited in
-      visited := visited';
-      let v1 = get_variance ty tvl in
-      let snap = Btype.snapshot () in
-      let v2 =
-        TypeMap.fold
-          (fun t vt v ->
-            if Ctype.equal env false [ty] [t] then union vt v else v)
-          !tvl2 null in
-      Btype.backtrack snap;
-      let (c1,n1) = get_upper v1 and (c2,n2,_,i2) = get_lower v2 in
-      if c1 && not c2 || n1 && not n2 then
-        if List.memq ty fvl then
-          let code = if not i2 then -2 else if c2 || n2 then -1 else -3 in
-          raise (Error (loc, Bad_variance (code, (c1,n1,false), (c2,n2,false))))
-        else
-          Btype.iter_type_expr check ty
-    in
-    List.iter (fun (_,ty) -> check ty) tyl;
-  end;
-  List.map2
-    (fun ty (p, n, i) ->
-      let v = get_variance ty tvl in
-      let tr = decl.type_private in
-      (* Use required variance where relevant *)
-      let concr = decl.type_kind <> Type_abstract (*|| tr = Type_new*) in
-      let (p, n) =
-        if tr = Private || not (Btype.is_Tvar ty) then (p, n) (* set *)
-        else (false, false) (* only check *)
-      and i = concr  || i && tr = Private in
-      let v = union v (make p n i) in
-      let v =
-        if not concr then v else
-        if mem Pos v && mem Neg v then full else
-        if Btype.is_Tvar ty then v else
-        union v
-          (if p then if n then full else covariant else conjugate covariant)
-      in
-      if decl.type_kind = Type_abstract && tr = Public then v else
-      set May_weak (mem May_neg v) v)
-    params required
-
-let add_false = List.map (fun ty -> false, ty)
-
-(* A parameter is constrained if it is either instantiated,
-   or it is a variable appearing in another parameter *)
-let constrained vars ty =
-  match ty.desc with
-  | Tvar _ -> List.exists (fun tl -> List.memq ty tl) vars
-  | _ -> true
-
-let for_constr = function
-  | Types.Cstr_tuple l -> add_false l
-  | Types.Cstr_record l ->
-      List.map
-        (fun {Types.ld_mutable; ld_type} -> (ld_mutable = Mutable, ld_type))
-        l
-
-let compute_variance_gadt env check (required, loc as rloc) decl
-    (tl, ret_type_opt) =
-  match ret_type_opt with
-  | None ->
-      compute_variance_type env check rloc {decl with type_private = Private}
-        (for_constr tl)
-  | Some ret_type ->
-      match Ctype.repr ret_type with
-      | {desc=Tconstr (_, tyl, _)} ->
-          (* let tyl = List.map (Ctype.expand_head env) tyl in *)
-          let tyl = List.map Ctype.repr tyl in
-          let fvl = List.map (Ctype.free_variables ?env:None) tyl in
-          let _ =
-            List.fold_left2
-              (fun (fv1,fv2) ty (c,n,_) ->
-                match fv2 with [] -> assert false
-                | fv :: fv2 ->
-                    (* fv1 @ fv2 = free_variables of other parameters *)
-                    if (c||n) && constrained (fv1 @ fv2) ty then
-                      raise (Error(loc, Varying_anonymous));
-                    (fv :: fv1, fv2))
-              ([], fvl) tyl required
-          in
-          compute_variance_type env check rloc
-            {decl with type_params = tyl; type_private = Private}
-            (for_constr tl)
-      | _ -> assert false
-
-let compute_variance_extension env check decl ext rloc =
-  compute_variance_gadt env check rloc
-    {decl with type_params = ext.ext_type_params}
-    (ext.ext_args, ext.ext_ret_type)
-
-let compute_variance_decl env check decl (required, _ as rloc) =
-  if (decl.type_kind = Type_abstract || decl.type_kind = Type_open)
-       && decl.type_manifest = None then
-    List.map
-      (fun (c, n, i) ->
-        make (not n) (not c) (decl.type_kind <> Type_abstract || i))
-      required
-  else
-  let mn =
-    match decl.type_manifest with
-      None -> []
-    | Some ty -> [false, ty]
-  in
-  match decl.type_kind with
-    Type_abstract | Type_open ->
-      compute_variance_type env check rloc decl mn
-  | Type_variant tll ->
-      if List.for_all (fun c -> c.Types.cd_res = None) tll then
-        compute_variance_type env check rloc decl
-          (mn @ List.flatten (List.map (fun c -> for_constr c.Types.cd_args)
-                                tll))
-      else begin
-        let mn =
-          List.map (fun (_,ty) -> (Types.Cstr_tuple [ty],None)) mn in
-        let tll =
-          mn @ List.map (fun c -> c.Types.cd_args, c.Types.cd_res) tll in
-        match List.map (compute_variance_gadt env check rloc decl) tll with
-        | vari :: rem ->
-            let varl = List.fold_left (List.map2 Variance.union) vari rem in
-            List.map
-              Variance.(fun v -> if mem Pos v && mem Neg v then full else v)
-              varl
-        | _ -> assert false
-      end
-  | Type_record (ftl, _) ->
-      compute_variance_type env check rloc decl
-        (mn @ List.map (fun {Types.ld_mutable; ld_type} ->
-             (ld_mutable = Mutable, ld_type)) ftl)
-
-let is_hash id =
-  let s = Ident.name id in
-  String.length s > 0 && s.[0] = '#'
-
-let marked_as_immediate decl =
-  Builtin_attributes.immediate decl.type_attributes
-
-let compute_immediacy env tdecl =
-  match (tdecl.type_kind, tdecl.type_manifest) with
-  | (Type_variant [{cd_args = Cstr_tuple [arg]; _}], _)
-    | (Type_variant [{cd_args = Cstr_record [{ld_type = arg; _}]; _}], _)
-    | (Type_record ([{ld_type = arg; _}], _), _)
-  when tdecl.type_unboxed.unboxed ->
-    begin match get_unboxed_type_representation env arg with
-    | Some argrepr -> not (Ctype.maybe_pointer_type env argrepr)
-    | None -> false
-    end
-  | (Type_variant (_ :: _ as cstrs), _) ->
-    not (List.exists (fun c -> c.Types.cd_args <> Types.Cstr_tuple []) cstrs)
-  | (Type_abstract, Some(typ)) ->
-    not (Ctype.maybe_pointer_type env typ)
-  | (Type_abstract, None) -> marked_as_immediate tdecl
-  | _ -> false
-
-(* Computes the fixpoint for the variance and immediacy of type declarations *)
-
-let rec compute_properties_fixpoint env decls required variances immediacies =
-  let new_decls =
-    List.map2
-      (fun (id, decl) (variance, immediacy) ->
-         id, {decl with type_variance = variance; type_immediate = immediacy})
-      decls (List.combine variances immediacies)
-  in
-  let new_env =
-    List.fold_right
-      (fun (id, decl) env -> Env.add_type ~check:true id decl env)
-      new_decls env
-  in
-  let new_variances =
-    List.map2
-      (fun (_id, decl) -> compute_variance_decl new_env false decl)
-      new_decls required
-  in
-  let new_variances =
-    List.map2 (List.map2 Variance.union) new_variances variances in
-  let new_immediacies =
-    List.map
-      (fun (_id, decl) -> compute_immediacy new_env decl)
-      new_decls
-  in
-  if new_variances <> variances || new_immediacies <> immediacies then
-    compute_properties_fixpoint env decls required new_variances new_immediacies
-  else begin
-    (* List.iter (fun (id, decl) ->
-      Printf.eprintf "%s:" (Ident.name id);
-      List.iter (fun (v : Variance.t) ->
-        Printf.eprintf " %x" (Obj.magic v : int))
-        decl.type_variance;
-      prerr_endline "")
-      new_decls; *)
-    List.iter (fun (_, decl) ->
-      if (marked_as_immediate decl) && (not decl.type_immediate) then
-        raise (Error (decl.type_loc, Bad_immediate_attribute))
-      else ())
-      new_decls;
-    List.iter2
-      (fun (id, decl) req -> if not (is_hash id) then
-        ignore (compute_variance_decl new_env true decl req))
-      new_decls required;
-    new_decls, new_env
-  end
-
-let init_variance (_id, decl) =
-  List.map (fun _ -> Variance.null) decl.type_params
-
-let add_injectivity =
-  List.map
-    (function
-      | Covariant -> (true, false, false)
-      | Contravariant -> (false, true, false)
-      | Invariant -> (false, false, false)
-    )
-
-(* for typeclass.ml *)
-let compute_variance_decls env cldecls =
-  let decls, required =
-    List.fold_right
-      (fun (obj_id, obj_abbr, _cl_abbr, _clty, _cltydef, ci) (decls, req) ->
-        let variance = List.map snd ci.ci_params in
-        (obj_id, obj_abbr) :: decls,
-        (add_injectivity variance, ci.ci_loc) :: req)
-      cldecls ([],[])
-  in
-  let (decls, _) =
-    compute_properties_fixpoint env decls required
-      (List.map init_variance decls)
-      (List.map (fun _ -> false) decls)
-  in
-  List.map2
-    (fun (_,decl) (_, _, cl_abbr, clty, cltydef, _) ->
-      let variance = decl.type_variance in
-      (decl, {cl_abbr with type_variance = variance},
-       {clty with cty_variance = variance},
-       {cltydef with clty_variance = variance}))
-    decls cldecls
-
-(* Check multiple declarations of labels/constructors *)
-
-let check_duplicates sdecl_list =
-  let labels = Hashtbl.create 7 and constrs = Hashtbl.create 7 in
-  List.iter
-    (fun sdecl -> match sdecl.ptype_kind with
-      Ptype_variant cl ->
-        List.iter
-          (fun pcd ->
-            try
-              let name' = Hashtbl.find constrs pcd.pcd_name.txt in
-              Location.prerr_warning pcd.pcd_loc
-                (Warnings.Duplicate_definitions
-                   ("constructor", pcd.pcd_name.txt, name',
-                    sdecl.ptype_name.txt))
-            with Not_found ->
-              Hashtbl.add constrs pcd.pcd_name.txt sdecl.ptype_name.txt)
-          cl
-    | Ptype_record fl ->
-        List.iter
-          (fun {pld_name=cname;pld_loc=loc} ->
-            try
-              let name' = Hashtbl.find labels cname.txt in
-              if cname.txt <> "..." then
-              Location.prerr_warning loc
-                (Warnings.Duplicate_definitions
-                   ("label", cname.txt, name', sdecl.ptype_name.txt))
-            with Not_found -> Hashtbl.add labels cname.txt sdecl.ptype_name.txt)
-          fl
-    | Ptype_abstract -> ()
-    | Ptype_open -> ())
-    sdecl_list
-
-(* Force recursion to go through id for private types*)
-let name_recursion sdecl id decl =
-  match decl with
-  | { type_kind = Type_abstract;
-      type_manifest = Some ty;
-      type_private = Private; } when is_fixed_type sdecl ->
-    let ty = Ctype.repr ty in
-    let ty' = Btype.newty2 ty.level ty.desc in
-    if Ctype.deep_occur ty ty' then
-      let td = Tconstr(Path.Pident id, decl.type_params, ref Mnil) in
-      Btype.link_type ty (Btype.newty2 ty.level td);
-      {decl with type_manifest = Some ty'}
-    else decl
-  | _ -> decl
-
-(* Translate a set of type declarations, mutually recursive or not *)
-let transl_type_decl env rec_flag sdecl_list =
-  (* Add dummy types for fixed rows *)
-  let fixed_types = Ext_list.filter sdecl_list is_fixed_type in
-  let sdecl_list =
-    List.map
-      (fun sdecl ->
-        let ptype_name =
-          mkloc (sdecl.ptype_name.txt ^"#row") sdecl.ptype_name.loc in
-        {sdecl with
-         ptype_name; ptype_kind = Ptype_abstract; ptype_manifest = None})
-      fixed_types
-    @ (try 
-        sdecl_list |> Variant_type_spread.expand_variant_spreads env 
-      with 
-      | Variant_coercion.VariantConfigurationError ((VariantError {left_loc}) as err) -> raise(Error(left_loc, Variant_runtime_representation_mismatch err))
-      | Variant_type_spread.VariantTypeSpreadError (loc, err) -> raise(Error(loc, Variant_spread_fail err))
-    )
-  in
-
-  (* Create identifiers. *)
-  let id_list =
-    List.map (fun sdecl -> Ident.create sdecl.ptype_name.txt) sdecl_list
-  in
-  (*
-     Since we've introduced fresh idents, make sure the definition
-     level is at least the binding time of these events. Otherwise,
-     passing one of the recursively-defined type constrs as argument
-     to an abbreviation may fail.
-  *)
-  Ctype.init_def(Ident.current_time());
-  Ctype.begin_def();
-  (* Enter types. *)
-  let temp_env =
-    List.fold_left2 (enter_type rec_flag) env sdecl_list id_list in
-  (* Translate each declaration. *)
-  let current_slot = ref None in
-  let warn_unused = Warnings.is_active (Warnings.Unused_type_declaration "") in
-  let id_slots id =
-    match rec_flag with
-    | Asttypes.Recursive when warn_unused ->
-        (* See typecore.ml for a description of the algorithm used
-             to detect unused declarations in a set of recursive definitions. *)
-        let slot = ref [] in
-        let td = Env.find_type (Path.Pident id) temp_env in
-        let name = Ident.name id in
-        Env.set_type_used_callback
-          name td
-          (fun old_callback ->
-             match !current_slot with
-             | Some slot -> slot := (name, td) :: !slot
-             | None ->
-                 List.iter (fun (name, d) -> Env.mark_type_used env name d)
-                   (get_ref slot);
-                 old_callback ()
-          );
-        id, Some slot
-    | Asttypes.Recursive | Asttypes.Nonrecursive ->
-        id, None
-  in
-  let typeRecordAsObject = ref false in
-  let transl_declaration name_sdecl (id, slot) =
-    current_slot := slot;
-    Builtin_attributes.warning_scope
-      name_sdecl.ptype_attributes
-      (fun () -> transl_declaration ~typeRecordAsObject temp_env name_sdecl id)
-  in
-  let tdecls =
-    List.map2 transl_declaration sdecl_list (List.map id_slots id_list) in
-  let decls =
-    List.map (fun tdecl -> (tdecl.typ_id, tdecl.typ_type)) tdecls in
-  let sdecl_list = Variant_type_spread.expand_dummy_constructor_args sdecl_list decls in
-  current_slot := None;
-  (* Check for duplicates *)
-  check_duplicates sdecl_list;
-  (* Build the final env. *)
-  let newenv =
-    List.fold_right
-      (fun (id, decl) env -> Env.add_type ~check:true id decl env)
-      decls env
-  in
-  (* Update stubs *)
-  begin match rec_flag with
-    | Asttypes.Nonrecursive -> ()
-    | Asttypes.Recursive ->
-      List.iter2
-        (fun id sdecl -> update_type temp_env newenv id sdecl.ptype_loc)
-        id_list sdecl_list
-  end;
-  (* Generalize type declarations. *)
-  Ctype.end_def();
-  List.iter (fun (_, decl) -> generalize_decl decl) decls;
-  (* Check for ill-formed abbrevs *)
-  let id_loc_list =
-    List.map2 (fun id sdecl -> (id, sdecl.ptype_loc))
-      id_list sdecl_list
-  in
-  List.iter (fun (id, decl) ->
-    check_well_founded_manifest newenv (List.assoc id id_loc_list)
-      (Path.Pident id) decl)
-    decls;
-  let to_check =
-    function Path.Pident id -> List.mem_assoc id id_loc_list | _ -> false in
-  List.iter (fun (id, decl) ->
-    check_well_founded_decl newenv (List.assoc id id_loc_list) (Path.Pident id)
-      decl to_check)
-    decls;
-  List.iter (check_abbrev_recursion newenv id_loc_list to_check) tdecls;
-  (* Check that all type variables are closed *)
-  List.iter2
-    (fun sdecl tdecl ->
-      let decl = tdecl.typ_type in
-       match Ctype.closed_type_decl decl with
-         Some ty -> raise(Error(sdecl.ptype_loc, Unbound_type_var(ty,decl)))
-       | None   -> ())
-    sdecl_list tdecls;
-  (* Check that constraints are enforced *)
-  List.iter2 (check_constraints ~typeRecordAsObject newenv) sdecl_list decls;
-  (* Name recursion *)
-  let decls =
-    List.map2 (fun sdecl (id, decl) -> id, name_recursion sdecl id decl)
-      sdecl_list decls
-  in
-  (* Add variances to the environment *)
-  let required =
-    List.map
-      (fun sdecl ->
-         add_injectivity (List.map snd sdecl.ptype_params),
-         sdecl.ptype_loc
-      )
-      sdecl_list
-  in
-  let final_decls, final_env =
-    compute_properties_fixpoint env decls required
-      (List.map init_variance decls)
-      (List.map (fun _ -> false) decls)
-  in
-  (* Check re-exportation *)
-  List.iter2 (check_abbrev final_env) sdecl_list final_decls;
-  (* Keep original declaration *)
-  let final_decls =
-    List.map2
-      (fun tdecl (_id2, decl) ->
-        { tdecl with typ_type = decl }
-      ) tdecls final_decls
-  in
-  (* Done *)
-  (final_decls, final_env)
-
-(* Translating type extensions *)
-
-let transl_extension_constructor env type_path type_params
-                                 typext_params priv sext =
-  let id = Ident.create sext.pext_name.txt in
-  let args, ret_type, kind =
-    match sext.pext_kind with
-      Pext_decl(sargs, sret_type) ->
-        let targs, tret_type, args, ret_type, _ =
-          make_constructor env type_path typext_params
-            sargs sret_type
-        in
-          args, ret_type, Text_decl(targs, tret_type)
-    | Pext_rebind lid ->
-        let cdescr = Typetexp.find_constructor env lid.loc lid.txt in
-        let usage =
-          if cdescr.cstr_private = Private || priv = Public
-          then Env.Positive else Env.Privatize
-        in
-        Env.mark_constructor usage env (Longident.last lid.txt) cdescr;
-        let (args, cstr_res) = Ctype.instance_constructor cdescr in
-        let res, ret_type =
-          if cdescr.cstr_generalized then
-            let params = Ctype.instance_list env type_params in
-            let res = Ctype.newconstr type_path params in
-            let ret_type = Some (Ctype.newconstr type_path params) in
-              res, ret_type
-          else (Ctype.newconstr type_path typext_params), None
-        in
-        begin
-          try
-            Ctype.unify env cstr_res res
-          with Ctype.Unify trace ->
-            raise (Error(lid.loc,
-                     Rebind_wrong_type(lid.txt, env, trace)))
-        end;
-        (* Remove "_" names from parameters used in the constructor *)
-        if not cdescr.cstr_generalized then begin
-          let vars =
-            Ctype.free_variables (Btype.newgenty (Ttuple args))
-          in
-            List.iter
-              (function {desc = Tvar (Some "_")} as ty ->
-                          if List.memq ty vars then ty.desc <- Tvar None
-                        | _ -> ())
-              typext_params
-        end;
-        (* Ensure that constructor's type matches the type being extended *)
-        let cstr_type_path, cstr_type_params =
-          match cdescr.cstr_res.desc with
-            Tconstr (p, _, _) ->
-              let decl = Env.find_type p env in
-                p, decl.type_params
-          | _ -> assert false
-        in
-        let cstr_types =
-          (Btype.newgenty
-             (Tconstr(cstr_type_path, cstr_type_params, ref Mnil)))
-          :: cstr_type_params
-        in
-        let ext_types =
-          (Btype.newgenty
-             (Tconstr(type_path, type_params, ref Mnil)))
-          :: type_params
-        in
-        if not (Ctype.equal env true cstr_types ext_types) then
-          raise (Error(lid.loc,
-                       Rebind_mismatch(lid.txt, cstr_type_path, type_path)));
-        (* Disallow rebinding private constructors to non-private *)
-        begin
-          match cdescr.cstr_private, priv with
-            Private, Public ->
-              raise (Error(lid.loc, Rebind_private lid.txt))
-          | _ -> ()
-        end;
-        let path =
-          match cdescr.cstr_tag with
-            Cstr_extension(path, _) -> path
-          | _ -> assert false
-        in
-        let args =
-          match cdescr.cstr_inlined with
-          | None ->
-              Types.Cstr_tuple args
-          | Some decl ->
-              let tl =
-                match args with
-                | [ {desc=Tconstr(_, tl, _)} ] -> tl
-                | _ -> assert false
-              in
-              let decl = Ctype.instance_declaration decl in
-              assert (List.length decl.type_params = List.length tl);
-              List.iter2 (Ctype.unify env) decl.type_params tl;
-              let lbls =
-                match decl.type_kind with
-                | Type_record (lbls, Record_extension) -> lbls
-                | _ -> assert false
-              in
-              Types.Cstr_record lbls
-        in
-        args, ret_type, Text_rebind(path, lid)
-  in
-  let ext =
-    { ext_type_path = type_path;
-      ext_type_params = typext_params;
-      ext_args = args;
-      ext_ret_type = ret_type;
-      ext_private = priv;
-      Types.ext_loc = sext.pext_loc;
-      Types.ext_attributes = sext.pext_attributes; }
-  in
-    { ext_id = id;
-      ext_name = sext.pext_name;
-      ext_type = ext;
-      ext_kind = kind;
-      Typedtree.ext_loc = sext.pext_loc;
-      Typedtree.ext_attributes = sext.pext_attributes; }
-
-let transl_extension_constructor env type_path type_params
-    typext_params priv sext =
-  Builtin_attributes.warning_scope sext.pext_attributes
-    (fun () -> transl_extension_constructor env type_path type_params
-        typext_params priv sext)
-
-let transl_type_extension extend env loc styext =
-  reset_type_variables();
-  Ctype.begin_def();
-  let (type_path, type_decl) =
-    let lid = styext.ptyext_path in
-    Typetexp.find_type env lid.loc lid.txt
-  in
-  begin
-    match type_decl.type_kind with
-    | Type_open -> begin
-        match type_decl.type_private with
-        | Private when extend -> begin
-            match
-              List.find
-                (function {pext_kind = Pext_decl _} -> true
-                        | {pext_kind = Pext_rebind _} -> false)
-                styext.ptyext_constructors
-            with
-            | {pext_loc} ->
-                raise (Error(pext_loc, Cannot_extend_private_type type_path))
-            | exception Not_found -> ()
-          end
-        | _ -> ()
-      end
-    | _ ->
-        raise (Error(loc, Not_extensible_type type_path))
-  end;
-  let type_variance =
-    List.map (fun v ->
-                let (co, cn) = Variance.get_upper v in
-                  (not cn, not co, false))
-             type_decl.type_variance
-  in
-  let err =
-    if type_decl.type_arity <> List.length styext.ptyext_params then
-      [Includecore.Arity]
-    else
-      if List.for_all2
-           (fun (c1, n1, _) (c2, n2, _) -> (not c2 || c1) && (not n2 || n1))
-           type_variance
-           (add_injectivity (List.map snd styext.ptyext_params))
-      then [] else [Includecore.Variance]
-  in
-  if err <> [] then
-    raise (Error(loc, Extension_mismatch (type_path, err)));
-  let ttype_params = make_params env styext.ptyext_params in
-  let type_params = List.map (fun (cty, _) -> cty.ctyp_type) ttype_params in
-  List.iter2 (Ctype.unify_var env)
-    (Ctype.instance_list env type_decl.type_params)
-    type_params;
-  let constructors =
-    List.map (transl_extension_constructor env type_path
-               type_decl.type_params type_params styext.ptyext_private)
-      styext.ptyext_constructors
-  in
-  Ctype.end_def();
-  (* Generalize types *)
-  List.iter Ctype.generalize type_params;
-  List.iter
-    (fun ext ->
-       Btype.iter_type_expr_cstr_args Ctype.generalize ext.ext_type.ext_args;
-       may Ctype.generalize ext.ext_type.ext_ret_type)
-    constructors;
-  (* Check that all type variables are closed *)
-  List.iter
-    (fun ext ->
-       match Ctype.closed_extension_constructor ext.ext_type with
-         Some ty ->
-           raise(Error(ext.ext_loc, Unbound_type_var_ext(ty, ext.ext_type)))
-       | None -> ())
-    constructors;
-  (* Check variances are correct *)
-  List.iter
-    (fun ext->
-      ignore (compute_variance_extension env true type_decl
-                ext.ext_type (type_variance, loc)))
-    constructors;
-  (* Add extension constructors to the environment *)
-  let newenv =
-    List.fold_left
-      (fun env ext ->
-         Env.add_extension ~check:true ext.ext_id ext.ext_type env)
-      env constructors
-  in
-  let tyext =
-    { tyext_path = type_path;
-      tyext_txt = styext.ptyext_path;
-      tyext_params = ttype_params;
-      tyext_constructors = constructors;
-      tyext_private = styext.ptyext_private;
-      tyext_attributes = styext.ptyext_attributes; }
-  in
-    (tyext, newenv)
-
-let transl_type_extension extend env loc styext =
-  Builtin_attributes.warning_scope styext.ptyext_attributes
-    (fun () -> transl_type_extension extend env loc styext)
-
-let transl_exception env sext =
-  reset_type_variables();
-  Ctype.begin_def();
-  let ext =
-    transl_extension_constructor env
-      Predef.path_exn [] [] Asttypes.Public sext
-  in
-  Ctype.end_def();
-  (* Generalize types *)
-  Btype.iter_type_expr_cstr_args Ctype.generalize ext.ext_type.ext_args;
-  may Ctype.generalize ext.ext_type.ext_ret_type;
-  (* Check that all type variables are closed *)
-  begin match Ctype.closed_extension_constructor ext.ext_type with
-    Some ty ->
-      raise (Error(ext.ext_loc, Unbound_type_var_ext(ty, ext.ext_type)))
-  | None -> ()
-  end;
-  let newenv = Env.add_extension ~check:true ext.ext_id ext.ext_type env in
-    ext, newenv
-
-
-
-let rec parse_native_repr_attributes env core_type ty =
-  match core_type.ptyp_desc, (Ctype.repr ty).desc
-  with
-  | Ptyp_arrow (_, _, ct2), Tarrow (_, _, t2, _) ->
-    let repr_arg = Same_as_ocaml_repr  in
-    let repr_args, repr_res =
-      parse_native_repr_attributes env ct2 t2 
-    in
-    (repr_arg :: repr_args, repr_res)
-  | Ptyp_arrow _, _ | _, Tarrow _ -> assert false
-  | _ -> ([], Same_as_ocaml_repr)
-
-
-let parse_native_repr_attributes env core_type ty =
-  match core_type.ptyp_desc, (Ctype.repr ty).desc
-  with
-  | Ptyp_constr ({txt = Lident "function$"}, [{ptyp_desc = Ptyp_arrow (_, _, ct2)}; _]),
-    Tconstr (Pident {name = "function$"},[{desc = Tarrow (_, _, t2, _)}; _],_) ->
-    let repr_args, repr_res = parse_native_repr_attributes env ct2 t2 in
-    let native_repr_args = Same_as_ocaml_repr :: repr_args in
-    (native_repr_args, repr_res)
-  | _ -> parse_native_repr_attributes env core_type ty
-
-(* Translate a value declaration *)
-let transl_value_decl env loc valdecl =
-  let cty = Typetexp.transl_type_scheme env valdecl.pval_type in
-  let ty = cty.ctyp_type in
-  let v =
-  match valdecl.pval_prim with
-    [] when Env.is_in_signature env ->
-      { val_type = ty; val_kind = Val_reg; Types.val_loc = loc;
-        val_attributes = valdecl.pval_attributes }
-  | [] ->
-      raise (Error(valdecl.pval_loc, Val_in_structure))
-  | _ ->
-      let native_repr_args, native_repr_res =
-          let rec scann (attrs : Parsetree.attributes)  = 
-            match attrs with 
-            | ({txt = "internal.arity";_},
-              PStr [ {pstr_desc = Pstr_eval
-                        (
-                          ({pexp_desc = Pexp_constant (Pconst_integer (i,_))} :
-                             Parsetree.expression) ,_)}]) :: _ ->
-               Some (int_of_string i)              
-            | _ :: rest  -> scann rest 
-            | [] -> None 
-          and make n = 
-            if n = 0 then []
-            else Primitive.Same_as_ocaml_repr :: make (n - 1)
-          in 
-            match scann valdecl.pval_attributes with 
-            | None ->  parse_native_repr_attributes env valdecl.pval_type ty 
-            | Some x -> make x , Primitive.Same_as_ocaml_repr
-      in
-      let prim =
-        Primitive.parse_declaration valdecl
-          ~native_repr_args
-          ~native_repr_res
-      in
-      let prim_native_name = prim.prim_native_name in 
-      if prim.prim_arity = 0 &&
-         not ( String.length prim_native_name >= 20 &&
-               String.unsafe_get prim_native_name 0 = '\132' &&
-               String.unsafe_get prim_native_name 1 = '\149' 
-             ) && 
-         (prim.prim_name = "" || (prim.prim_name.[0] <> '%' && prim.prim_name.[0] <> '#')) then
-        raise(Error(valdecl.pval_type.ptyp_loc, Null_arity_external));
-      { val_type = ty; val_kind = Val_prim prim; Types.val_loc = loc;
-        val_attributes = valdecl.pval_attributes }
-  in
-  let (id, newenv) =
-    Env.enter_value valdecl.pval_name.txt v env
-      ~check:(fun s -> Warnings.Unused_value_declaration s)
-  in
-  let desc =
-    {
-     val_id = id;
-     val_name = valdecl.pval_name;
-     val_desc = cty; val_val = v;
-     val_prim = valdecl.pval_prim;
-     val_loc = valdecl.pval_loc;
-     val_attributes = valdecl.pval_attributes;
-    }
-  in
-  desc, newenv
-
-let transl_value_decl env loc valdecl =
-  Builtin_attributes.warning_scope valdecl.pval_attributes
-    (fun () -> transl_value_decl env loc valdecl)
-
-(* Translate a "with" constraint -- much simplified version of
-    transl_type_decl. *)
-let transl_with_constraint env id row_path orig_decl sdecl =
-  Env.mark_type_used env (Ident.name id) orig_decl;
-  reset_type_variables();
-  Ctype.begin_def();
-  let tparams = make_params env sdecl.ptype_params in
-  let params = List.map (fun (cty, _) -> cty.ctyp_type) tparams in
-  let orig_decl = Ctype.instance_declaration orig_decl in
-  let arity_ok = List.length params = orig_decl.type_arity in
-  if arity_ok then
-    List.iter2 (Ctype.unify_var env) params orig_decl.type_params;
-  let constraints = List.map
-    (function (ty, ty', loc) ->
-       try
-         let cty = transl_simple_type env false ty in
-         let cty' = transl_simple_type env false ty' in
-         let ty = cty.ctyp_type in
-         let ty' = cty'.ctyp_type in
-         Ctype.unify env ty ty';
-         (cty, cty', loc)
-       with Ctype.Unify tr ->
-         raise(Error(loc, Inconsistent_constraint (env, tr))))
-    sdecl.ptype_cstrs
-  in
-  let no_row = not (is_fixed_type sdecl) in
-  let (tman, man) =  match sdecl.ptype_manifest with
-      None -> None, None
-    | Some sty ->
-        let cty = transl_simple_type env no_row sty in
-        Some cty, Some cty.ctyp_type
-  in
-  let priv =
-    if sdecl.ptype_private = Private then Private else
-    if arity_ok && orig_decl.type_kind <> Type_abstract
-    then orig_decl.type_private else sdecl.ptype_private
-  in
-  if arity_ok && orig_decl.type_kind <> Type_abstract
-  && sdecl.ptype_private = Private then
-    Location.deprecated sdecl.ptype_loc "spurious use of private";
-  let type_kind, type_unboxed =
-    if arity_ok && man <> None then
-      orig_decl.type_kind, orig_decl.type_unboxed
-    else
-      Type_abstract, unboxed_false_default_false
-  in
-  let decl =
-    { type_params = params;
-      type_arity = List.length params;
-      type_kind;
-      type_private = priv;
-      type_manifest = man;
-      type_variance = [];
-      type_newtype_level = None;
-      type_loc = sdecl.ptype_loc;
-      type_attributes = sdecl.ptype_attributes;
-      type_immediate = false;
-      type_unboxed;
-    }
-  in
-  begin match row_path with None -> ()
-  | Some p -> set_fixed_row env sdecl.ptype_loc p decl
-  end;
-  begin match Ctype.closed_type_decl decl with None -> ()
-  | Some ty -> raise(Error(sdecl.ptype_loc, Unbound_type_var(ty,decl)))
-  end;
-  let decl = name_recursion sdecl id decl in
-  let type_variance =
-    compute_variance_decl env true decl
-      (add_injectivity (List.map snd sdecl.ptype_params), sdecl.ptype_loc)
-  in
-  let type_immediate = compute_immediacy env decl in
-  let decl = {decl with type_variance; type_immediate} in
-  Ctype.end_def();
-  generalize_decl decl;
-  {
-    typ_id = id;
-    typ_name = sdecl.ptype_name;
-    typ_params = tparams;
-    typ_type = decl;
-    typ_cstrs = constraints;
-    typ_loc = sdecl.ptype_loc;
-    typ_manifest = tman;
-    typ_kind = Ttype_abstract;
-    typ_private = sdecl.ptype_private;
-    typ_attributes = sdecl.ptype_attributes;
-  }
-
-(* Approximate a type declaration: just make all types abstract *)
-
-let abstract_type_decl arity =
-  let rec make_params n =
-    if n <= 0 then [] else Ctype.newvar() :: make_params (n-1) in
-  Ctype.begin_def();
-  let decl =
-    { type_params = make_params arity;
-      type_arity = arity;
-      type_kind = Type_abstract;
-      type_private = Public;
-      type_manifest = None;
-      type_variance = replicate_list Variance.full arity;
-      type_newtype_level = None;
-      type_loc = Location.none;
-      type_attributes = [];
-      type_immediate = false;
-      type_unboxed = unboxed_false_default_false;
-     } in
-  Ctype.end_def();
-  generalize_decl decl;
-  decl
-
-let approx_type_decl sdecl_list =
-  List.map
-    (fun sdecl ->
-      (Ident.create sdecl.ptype_name.txt,
-       abstract_type_decl (List.length sdecl.ptype_params)))
-    sdecl_list
-
-(* Variant of check_abbrev_recursion to check the well-formedness
-   conditions on type abbreviations defined within recursive modules. *)
-
-let check_recmod_typedecl env loc recmod_ids path decl =
-  (* recmod_ids is the list of recursively-defined module idents.
-     (path, decl) is the type declaration to be checked. *)
-  let to_check path =
-    List.exists (fun id -> Path.isfree id path) recmod_ids in
-  check_well_founded_decl env loc path decl to_check;
-  check_recursion env loc path decl to_check
-
-
-(**** Error report ****)
-
-open Format
-
-let explain_unbound_gen ppf tv tl typ kwd pr =
-  try
-    let ti = List.find (fun ti -> Ctype.deep_occur tv (typ ti)) tl in
-    let ty0 = (* Hack to force aliasing when needed *)
-      Btype.newgenty (Tobject(tv, ref None)) in
-    Printtyp.reset_and_mark_loops_list [typ ti; ty0];
-    fprintf ppf
-      ".@.@[<hov2>In %s@ %a@;<1 -2>the variable %a is unbound@]"
-      kwd pr ti Printtyp.type_expr tv
-  with Not_found -> ()
-
-let explain_unbound ppf tv tl typ kwd lab =
-  explain_unbound_gen ppf tv tl typ kwd
-    (fun ppf ti -> fprintf ppf "%s%a" (lab ti) Printtyp.type_expr (typ ti))
-
-let explain_unbound_single ppf tv ty =
-  let trivial ty =
-    explain_unbound ppf tv [ty] (fun t -> t) "type" (fun _ -> "") in
-  match (Ctype.repr ty).desc with
-    Tobject(fi,_) ->
-      let (tl, rv) = Ctype.flatten_fields fi in
-      if rv == tv then trivial ty else
-      explain_unbound ppf tv tl (fun (_,_,t) -> t)
-        "method" (fun (lab,_,_) -> lab ^ ": ")
-  | Tvariant row ->
-      let row = Btype.row_repr row in
-      if row.row_more == tv then trivial ty else
-      explain_unbound ppf tv row.row_fields
-        (fun (_l,f) -> match Btype.row_field_repr f with
-          Rpresent (Some t) -> t
-        | Reither (_,[t],_,_) -> t
-        | Reither (_,tl,_,_) -> Btype.newgenty (Ttuple tl)
-        | _ -> Btype.newgenty (Ttuple[]))
-        "case" (fun (lab,_) -> "`" ^ lab ^ " of ")
-  | _ -> trivial ty
-
-
-let tys_of_constr_args = function
-  | Types.Cstr_tuple tl -> tl
-  | Types.Cstr_record lbls -> List.map (fun l -> l.Types.ld_type) lbls
-
-let report_error ppf = function
-  | Repeated_parameter ->
-      fprintf ppf "A type parameter occurs several times"
-  | Duplicate_constructor s ->
-      fprintf ppf "Two constructors are named %s" s
-  | Duplicate_label (s, None) ->
-      fprintf ppf "The field @{<info>%s@} is defined several times in this record. Fields can only be added once to a record." s
-  | Duplicate_label (s, Some recordName) ->
-    fprintf ppf "The field @{<info>%s@} is defined several times in the record @{<info>%s@}. Fields can only be added once to a record." s recordName
-  | Recursive_abbrev s ->
-      fprintf ppf "The type abbreviation %s is cyclic" s
-  | Cycle_in_def (s, ty) ->
-      Printtyp.reset_and_mark_loops ty;
-      fprintf ppf "@[<v>The definition of %s contains a cycle:@ %a@]"
-        s Printtyp.type_expr ty
-  | Definition_mismatch (ty, errs) ->
-      Printtyp.reset_and_mark_loops ty;
-      fprintf ppf "@[<v>@[<hov>%s@ %s@;<1 2>%a@]%a@]"
-        "This variant or record definition" "does not match that of type"
-        Printtyp.type_expr ty
-        (Includecore.report_type_mismatch "the original" "this" "definition")
-        errs
-  | Constraint_failed (ty, ty') ->
-      Printtyp.reset_and_mark_loops ty;
-      Printtyp.mark_loops ty';
-      fprintf ppf "@[%s@ @[<hv>Type@ %a@ should be an instance of@ %a@]@]"
-        "Constraints are not satisfied in this type."
-        Printtyp.type_expr ty Printtyp.type_expr ty'
-  | Parameters_differ (path, ty, ty') ->
-      Printtyp.reset_and_mark_loops ty;
-      Printtyp.mark_loops ty';
-      fprintf ppf
-        "@[<hv>In the definition of %s, type@ %a@ should be@ %a@]"
-        (Path.name path) Printtyp.type_expr ty Printtyp.type_expr ty'
-  | Inconsistent_constraint (env, trace) ->
-      fprintf ppf "The type constraints are not consistent.@.";
-      Printtyp.report_unification_error ppf env trace
-        (fun ppf -> fprintf ppf "Type")
-        (fun ppf -> fprintf ppf "is not compatible with type")
-  | Type_clash (env, trace) ->
-      Printtyp.report_unification_error ppf env trace
-        (function ppf ->
-           fprintf ppf "This type constructor expands to type")
-        (function ppf ->
-           fprintf ppf "but is used here with type")
-  | Null_arity_external ->
-      fprintf ppf "External identifiers must be functions"
-  | Unbound_type_var (ty, decl) ->
-      fprintf ppf "A type variable is unbound in this type declaration";
-      let ty = Ctype.repr ty in
-      begin match decl.type_kind, decl.type_manifest with
-      | Type_variant tl, _ ->
-          explain_unbound_gen ppf ty tl (fun c ->
-              let tl = tys_of_constr_args c.Types.cd_args in
-              Btype.newgenty (Ttuple tl)
-            )
-            "case" (fun ppf c ->
-                fprintf ppf
-                  "%s of %a" (Ident.name c.Types.cd_id)
-                  Printtyp.constructor_arguments c.Types.cd_args)
-      | Type_record (tl, _), _ ->
-          explain_unbound ppf ty tl (fun l -> l.Types.ld_type)
-            "field" (fun l -> Ident.name l.Types.ld_id ^ ": ")
-      | Type_abstract, Some ty' ->
-          explain_unbound_single ppf ty ty'
-      | _ -> ()
-      end
-  | Unbound_type_var_ext (ty, ext) ->
-      fprintf ppf "A type variable is unbound in this extension constructor";
-      let args = tys_of_constr_args ext.ext_args in
-      explain_unbound ppf ty args (fun c -> c) "type" (fun _ -> "")
-  | Cannot_extend_private_type path ->
-      fprintf ppf "@[%s@ %a@]"
-        "Cannot extend private type definition"
-        Printtyp.path path
-  | Not_extensible_type path ->
-      fprintf ppf "@[%s@ %a@ %s@]"
-        "Type definition"
-        Printtyp.path path
-        "is not extensible"
-  | Extension_mismatch (path, errs) ->
-      fprintf ppf "@[<v>@[<hov>%s@ %s@;<1 2>%s@]%a@]"
-        "This extension" "does not match the definition of type"
-        (Path.name path)
-        (Includecore.report_type_mismatch
-           "the type" "this extension" "definition")
-        errs
-  | Rebind_wrong_type (lid, env, trace) ->
-      Printtyp.report_unification_error ppf env trace
-        (function ppf ->
-          fprintf ppf "The constructor %a@ has type"
-            Printtyp.longident lid)
-        (function ppf ->
-           fprintf ppf "but was expected to be of type")
-  | Rebind_mismatch (lid, p, p') ->
-      fprintf ppf
-        "@[%s@ %a@ %s@ %s@ %s@ %s@ %s@]"
-        "The constructor" Printtyp.longident lid
-        "extends type" (Path.name p)
-        "whose declaration does not match"
-        "the declaration of type" (Path.name p')
-  | Rebind_private lid ->
-      fprintf ppf "@[%s@ %a@ %s@]"
-        "The constructor"
-        Printtyp.longident lid
-        "is private"
-  | Bad_variance (n, v1, v2) ->
-      let variance (p,n,i) =
-        let inj = if i then "injective " else "" in
-        match p, n with
-          true,  true  -> inj ^ "invariant"
-        | true,  false -> inj ^ "covariant"
-        | false, true  -> inj ^ "contravariant"
-        | false, false -> if inj = "" then "unrestricted" else inj
-      in
-      let suffix n =
-        let teen = (n mod 100)/10 = 1 in
-        match n mod 10 with
-        | 1 when not teen -> "st"
-        | 2 when not teen -> "nd"
-        | 3 when not teen -> "rd"
-        | _ -> "th"
-      in
-      if n = -1 then
-        fprintf ppf "@[%s@ %s@ It"
-          "In this definition, a type variable has a variance that"
-          "is not reflected by its occurrence in type parameters."
-      else if n = -2 then
-        fprintf ppf "@[%s@ %s@]"
-          "In this definition, a type variable cannot be deduced"
-          "from the type parameters."
-      else if n = -3 then
-        fprintf ppf "@[%s@ %s@ It"
-          "In this definition, a type variable has a variance that"
-          "cannot be deduced from the type parameters."
-      else
-        fprintf ppf "@[%s@ %s@ The %d%s type parameter"
-          "In this definition, expected parameter"
-          "variances are not satisfied."
-          n (suffix n);
-      if n <> -2 then
-        fprintf ppf " was expected to be %s,@ but it is %s.@]"
-          (variance v2) (variance v1)
-  | Unavailable_type_constructor p ->
-      fprintf ppf "The definition of type %a@ is unavailable" Printtyp.path p
-  | Bad_fixed_type r ->
-      fprintf ppf "This fixed type %s" r
-  | Varying_anonymous ->
-      fprintf ppf "@[%s@ %s@ %s@]"
-        "In this GADT definition," "the variance of some parameter"
-        "cannot be checked"
-  | Val_in_structure ->
-      fprintf ppf "Value declarations are only allowed in signatures"
-  | Bad_immediate_attribute ->
-      fprintf ppf "@[%s@ %s@]"
-        "Types marked with the immediate attribute must be"
-        "non-pointer types like int or bool"
-  | Bad_unboxed_attribute msg ->
-      fprintf ppf "@[This type cannot be unboxed because@ %s.@]" msg
-  | Boxed_and_unboxed ->
-      fprintf ppf "@[A type cannot be boxed and unboxed at the same time.@]"
-  | Nonrec_gadt ->
-      fprintf ppf
-        "@[GADT case syntax cannot be used in a 'nonrec' block.@]"
-  | Variant_runtime_representation_mismatch
-      (Variant_coercion.VariantError
-        {is_spread_context; error = Variant_coercion.Untagged {left_is_unboxed}})
-    ->
-    let other_variant_text =
-      if is_spread_context then "the variant where this is spread"
-      else "the other variant"
-    in
-    fprintf ppf "@[%s.@]"
-      ("This variant is "
-      ^ (if left_is_unboxed then "unboxed" else "not unboxed")
-      ^ ", but " ^ other_variant_text
-      ^ " is not. Both variants unboxed configuration must match")
-  | Variant_runtime_representation_mismatch
-      (Variant_coercion.VariantError
-        {is_spread_context; error = Variant_coercion.TagName _}) ->
-    let other_variant_text =
-      if is_spread_context then "the variant where this is spread"
-      else "the other variant"
-    in
-    fprintf ppf "@[%s.@]"
-      ("The @tag attribute does not match for this variant and "
-      ^ other_variant_text
-      ^ ". Both variants must have the same @tag attribute configuration, or no \
-        @tag attribute at all")
-  | Variant_spread_fail Variant_type_spread.InvalidType ->
-    fprintf ppf "@[This type is not a valid type to spread. It's only possible to spread other variants.@]"
-  | Variant_spread_fail Variant_type_spread.CouldNotFindType ->
-    fprintf ppf "@[This type could not be found. It's only possible to spread variants that are known as the spread happens. This means for example that you can't spread variants in recursive definitions.@]"
-  | Variant_spread_fail Variant_type_spread.HasTypeParams ->
-    fprintf ppf "@[Type parameters are not supported in variant type spreads.@]"
-  | Variant_spread_fail Variant_type_spread.DuplicateConstructor 
-    {variant_with_overlapping_constructor; overlapping_constructor_name} ->
-    fprintf ppf "@[Variant %s has a constructor named %s, but a constructor named %s already exists in the variant it's spread into.@ You cannot spread variants with overlapping constructors.@]" 
-      variant_with_overlapping_constructor overlapping_constructor_name overlapping_constructor_name
-  
-
-let () =
-  Location.register_error_of_exn
-    (function
-      | Error (loc, err) ->
-        Some (Location.error_of_printer loc report_error err)
-      | _ ->
-        None
-    )
diff --git a/jscomp/ml/typedecl.mli b/jscomp/ml/typedecl.mli
deleted file mode 100644
index 03f1b8b..0000000
--- a/jscomp/ml/typedecl.mli
+++ /dev/null
@@ -1,72 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Typing of type definitions and primitive definitions *)
-
-open Types
-open Format
-
-val transl_type_decl:
-    Env.t -> Asttypes.rec_flag -> Parsetree.type_declaration list ->
-    Typedtree.type_declaration list * Env.t
-
-val transl_exception:
-    Env.t ->
-    Parsetree.extension_constructor -> Typedtree.extension_constructor * Env.t
-
-val transl_type_extension:
-    bool -> Env.t -> Location.t -> Parsetree.type_extension ->
-    Typedtree.type_extension * Env.t
-
-val transl_value_decl:
-    Env.t -> Location.t ->
-    Parsetree.value_description -> Typedtree.value_description * Env.t
-
-val transl_with_constraint:
-    Env.t -> Ident.t -> Path.t option -> Types.type_declaration ->
-    Parsetree.type_declaration -> Typedtree.type_declaration
-
-val abstract_type_decl: int -> type_declaration
-val approx_type_decl:
-    Parsetree.type_declaration list ->
-                                  (Ident.t * type_declaration) list
-val check_recmod_typedecl:
-    Env.t -> Location.t -> Ident.t list -> Path.t -> type_declaration -> unit
-val check_coherence:
-    Env.t -> Location.t -> Ident.t -> type_declaration -> unit
-
-(* for fixed types *)
-val is_fixed_type : Parsetree.type_declaration -> bool
-
-(* for typeclass.ml *)
-val compute_variance_decls:
-    Env.t ->
-    (Ident.t * Types.type_declaration * Types.type_declaration *
-     Types.class_declaration * Types.class_type_declaration *
-     'a Typedtree.class_infos) list ->
-    (Types.type_declaration * Types.type_declaration *
-     Types.class_declaration * Types.class_type_declaration) list
-
-(* for typeopt.ml *)
-val get_unboxed_type_representation: Env.t -> type_expr -> type_expr option
-
-
-type native_repr_kind = Unboxed | Untagged
-
-type error 
-
-exception Error of Location.t * error
-
-val report_error: formatter -> error -> unit
diff --git a/jscomp/ml/typedtree.ml b/jscomp/ml/typedtree.ml
deleted file mode 100644
index 5744f0d..0000000
--- a/jscomp/ml/typedtree.ml
+++ /dev/null
@@ -1,569 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Abstract syntax tree after typing *)
-
-open Misc
-open Asttypes
-open Types
-
-(* Value expressions for the core language *)
-
-type partial = Partial | Total
-
-type attribute = Parsetree.attribute
-type attributes = attribute list
-
-type pattern =
-  { pat_desc: pattern_desc;
-    pat_loc: Location.t;
-    pat_extra : (pat_extra * Location.t * attribute list) list;
-    pat_type: type_expr;
-    mutable pat_env: Env.t;
-    pat_attributes: attribute list;
-   }
-
-and pat_extra =
-  | Tpat_constraint of core_type
-  | Tpat_type of Path.t * Longident.t loc
-  | Tpat_open of Path.t * Longident.t loc * Env.t
-  | Tpat_unpack
-
-and pattern_desc =
-    Tpat_any
-  | Tpat_var of Ident.t * string loc
-  | Tpat_alias of pattern * Ident.t * string loc
-  | Tpat_constant of constant
-  | Tpat_tuple of pattern list
-  | Tpat_construct of
-      Longident.t loc * constructor_description * pattern list
-  | Tpat_variant of label * pattern option * row_desc ref
-  | Tpat_record of
-      (Longident.t loc * label_description * pattern) list *
-        closed_flag
-  | Tpat_array of pattern list
-  | Tpat_or of pattern * pattern * row_desc option
-  | Tpat_lazy of pattern
-
-and expression =
-  { exp_desc: expression_desc;
-    exp_loc: Location.t;
-    exp_extra: (exp_extra * Location.t * attribute list) list;
-    exp_type: type_expr;
-    exp_env: Env.t;
-    exp_attributes: attribute list;
-   }
-
-and exp_extra =
-  | Texp_constraint of core_type
-  | Texp_coerce of core_type option * core_type
-  | Texp_open of override_flag * Path.t * Longident.t loc * Env.t
-  | Texp_poly of core_type option
-  | Texp_newtype of string
-
-and expression_desc =
-    Texp_ident of Path.t * Longident.t loc * Types.value_description
-  | Texp_constant of constant
-  | Texp_let of rec_flag * value_binding list * expression
-  | Texp_function of { arg_label : arg_label; param : Ident.t;
-      cases : case list; partial : partial; }
-  | Texp_apply of expression * (arg_label * expression option) list
-  | Texp_match of expression * case list * case list * partial
-  | Texp_try of expression * case list
-  | Texp_tuple of expression list
-  | Texp_construct of
-      Longident.t loc * constructor_description * expression list
-  | Texp_variant of label * expression option
-  | Texp_record of {
-      fields : ( Types.label_description * record_label_definition ) array;
-      representation : Types.record_representation;
-      extended_expression : expression option;
-    }
-  | Texp_field of expression * Longident.t loc * label_description
-  | Texp_setfield of
-      expression * Longident.t loc * label_description * expression
-  | Texp_array of expression list
-  | Texp_ifthenelse of expression * expression * expression option
-  | Texp_sequence of expression * expression
-  | Texp_while of expression * expression
-  | Texp_for of
-      Ident.t * Parsetree.pattern * expression * expression * direction_flag *
-        expression
-  | Texp_send of expression * meth * expression option
-  | Texp_new of unit
-  | Texp_instvar of unit
-  | Texp_setinstvar of unit
-  | Texp_override of unit
-  | Texp_letmodule of Ident.t * string loc * module_expr * expression
-  | Texp_letexception of extension_constructor * expression
-  | Texp_assert of expression
-  | Texp_lazy of expression
-  | Texp_object of unit
-  | Texp_pack of module_expr
-  | Texp_unreachable
-  | Texp_extension_constructor of Longident.t loc * Path.t
-
-and meth =
-    Tmeth_name of string
-
-and case =
-    {
-     c_lhs: pattern;
-     c_guard: expression option;
-     c_rhs: expression;
-    }
-
-and record_label_definition =
-  | Kept of Types.type_expr
-  | Overridden of Longident.t loc * expression
-
-(* Value expressions for the class language *)
-
-
-
-
-
-(* Value expressions for the module language *)
-
-and module_expr =
-  { mod_desc: module_expr_desc;
-    mod_loc: Location.t;
-    mod_type: Types.module_type;
-    mod_env: Env.t;
-    mod_attributes: attribute list;
-   }
-
-and module_type_constraint =
-  Tmodtype_implicit
-| Tmodtype_explicit of module_type
-
-and module_expr_desc =
-    Tmod_ident of Path.t * Longident.t loc
-  | Tmod_structure of structure
-  | Tmod_functor of Ident.t * string loc * module_type option * module_expr
-  | Tmod_apply of module_expr * module_expr * module_coercion
-  | Tmod_constraint of
-      module_expr * Types.module_type * module_type_constraint * module_coercion
-  | Tmod_unpack of expression * Types.module_type
-
-and structure = {
-  str_items : structure_item list;
-  str_type : Types.signature;
-  str_final_env : Env.t;
-}
-
-and structure_item =
-  { str_desc : structure_item_desc;
-    str_loc : Location.t;
-    str_env : Env.t
-  }
-
-and structure_item_desc =
-    Tstr_eval of expression * attributes
-  | Tstr_value of rec_flag * value_binding list
-  | Tstr_primitive of value_description
-  | Tstr_type of rec_flag * type_declaration list
-  | Tstr_typext of type_extension
-  | Tstr_exception of extension_constructor
-  | Tstr_module of module_binding
-  | Tstr_recmodule of module_binding list
-  | Tstr_modtype of module_type_declaration
-  | Tstr_open of open_description
-  | Tstr_class of unit
-  | Tstr_class_type of (Ident.t * string loc * class_type_declaration) list
-  | Tstr_include of include_declaration
-  | Tstr_attribute of attribute
-
-and module_binding =
-    {
-     mb_id: Ident.t;
-     mb_name: string loc;
-     mb_expr: module_expr;
-     mb_attributes: attribute list;
-     mb_loc: Location.t;
-    }
-
-and value_binding =
-  {
-    vb_pat: pattern;
-    vb_expr: expression;
-    vb_attributes: attributes;
-    vb_loc: Location.t;
-  }
-
-and module_coercion =
-    Tcoerce_none
-  | Tcoerce_structure of (int * module_coercion) list *
-                         (Ident.t * int * module_coercion) list *
-                         string list (* runtime fields *)
-  | Tcoerce_functor of module_coercion * module_coercion
-  | Tcoerce_primitive of primitive_coercion
-  | Tcoerce_alias of Path.t * module_coercion
-
-and module_type =
-  { mty_desc: module_type_desc;
-    mty_type : Types.module_type;
-    mty_env : Env.t;
-    mty_loc: Location.t;
-    mty_attributes: attribute list;
-   }
-
-and module_type_desc =
-    Tmty_ident of Path.t * Longident.t loc
-  | Tmty_signature of signature
-  | Tmty_functor of Ident.t * string loc * module_type option * module_type
-  | Tmty_with of module_type * (Path.t * Longident.t loc * with_constraint) list
-  | Tmty_typeof of module_expr
-  | Tmty_alias of Path.t * Longident.t loc
-
-(* Keep primitive type information for type-based lambda-code specialization *)
-and primitive_coercion =
-  {
-    pc_desc: Primitive.description;
-    pc_type: type_expr;
-    pc_env: Env.t;
-    pc_loc : Location.t;
-    pc_id : Ident.t; (*RE:Added *)
-  }
-
-and signature = {
-  sig_items : signature_item list;
-  sig_type : Types.signature;
-  sig_final_env : Env.t;
-}
-
-and signature_item =
-  { sig_desc: signature_item_desc;
-    sig_env : Env.t; (* BINANNOT ADDED *)
-    sig_loc: Location.t }
-
-and signature_item_desc =
-    Tsig_value of value_description
-  | Tsig_type of rec_flag * type_declaration list
-  | Tsig_typext of type_extension
-  | Tsig_exception of extension_constructor
-  | Tsig_module of module_declaration
-  | Tsig_recmodule of module_declaration list
-  | Tsig_modtype of module_type_declaration
-  | Tsig_open of open_description
-  | Tsig_include of include_description
-  | Tsig_class of unit
-  | Tsig_class_type of class_type_declaration list
-  | Tsig_attribute of attribute
-
-and module_declaration =
-    {
-     md_id: Ident.t;
-     md_name: string loc;
-     md_type: module_type;
-     md_attributes: attribute list;
-     md_loc: Location.t;
-    }
-
-and module_type_declaration =
-    {
-     mtd_id: Ident.t;
-     mtd_name: string loc;
-     mtd_type: module_type option;
-     mtd_attributes: attribute list;
-     mtd_loc: Location.t;
-    }
-
-and open_description =
-    {
-     open_path: Path.t;
-     open_txt: Longident.t loc;
-     open_override: override_flag;
-     open_loc: Location.t;
-     open_attributes: attribute list;
-    }
-
-and 'a include_infos =
-    {
-     incl_mod: 'a;
-     incl_type: Types.signature;
-     incl_loc: Location.t;
-     incl_attributes: attribute list;
-    }
-
-and include_description = module_type include_infos
-
-and include_declaration = module_expr include_infos
-
-and with_constraint =
-    Twith_type of type_declaration
-  | Twith_module of Path.t * Longident.t loc
-  | Twith_typesubst of type_declaration
-  | Twith_modsubst of Path.t * Longident.t loc
-
-and core_type =
-(* mutable because of [Typeclass.declare_method] *)
-  { mutable ctyp_desc : core_type_desc;
-    mutable ctyp_type : type_expr;
-    ctyp_env : Env.t; (* BINANNOT ADDED *)
-    ctyp_loc : Location.t;
-    ctyp_attributes: attribute list;
-   }
-
-and core_type_desc =
-    Ttyp_any
-  | Ttyp_var of string
-  | Ttyp_arrow of arg_label * core_type * core_type
-  | Ttyp_tuple of core_type list
-  | Ttyp_constr of Path.t * Longident.t loc * core_type list
-  | Ttyp_object of object_field list * closed_flag
-  | Ttyp_class of Path.t * Longident.t loc * core_type list
-  | Ttyp_alias of core_type * string
-  | Ttyp_variant of row_field list * closed_flag * label list option
-  | Ttyp_poly of string list * core_type
-  | Ttyp_package of package_type
-
-and package_type = {
-  pack_path : Path.t;
-  pack_fields : (Longident.t loc * core_type) list;
-  pack_type : Types.module_type;
-  pack_txt : Longident.t loc;
-}
-
-and row_field =
-    Ttag of string loc * attributes * bool * core_type list
-  | Tinherit of core_type
-
-and object_field =
-  | OTtag of string loc * attributes * core_type
-  | OTinherit of core_type
-
-and value_description =
-  { val_id: Ident.t;
-    val_name: string loc;
-    val_desc: core_type;
-    val_val: Types.value_description;
-    val_prim: string list;
-    val_loc: Location.t;
-    val_attributes: attribute list;
-    }
-
-and type_declaration =
-  { typ_id: Ident.t;
-    typ_name: string loc;
-    typ_params: (core_type * variance) list;
-    typ_type: Types.type_declaration;
-    typ_cstrs: (core_type * core_type * Location.t) list;
-    typ_kind: type_kind;
-    typ_private: private_flag;
-    typ_manifest: core_type option;
-    typ_loc: Location.t;
-    typ_attributes: attribute list;
-   }
-
-and type_kind =
-    Ttype_abstract
-  | Ttype_variant of constructor_declaration list
-  | Ttype_record of label_declaration list
-  | Ttype_open
-
-and label_declaration =
-    {
-     ld_id: Ident.t;
-     ld_name: string loc;
-     ld_mutable: mutable_flag;
-     ld_type: core_type;
-     ld_loc: Location.t;
-     ld_attributes: attribute list;
-    }
-
-and constructor_declaration =
-    {
-     cd_id: Ident.t;
-     cd_name: string loc;
-     cd_args: constructor_arguments;
-     cd_res: core_type option;
-     cd_loc: Location.t;
-     cd_attributes: attribute list;
-    }
-
-and constructor_arguments =
-  | Cstr_tuple of core_type list
-  | Cstr_record of label_declaration list
-
-and type_extension =
-  {
-    tyext_path: Path.t;
-    tyext_txt: Longident.t loc;
-    tyext_params: (core_type * variance) list;
-    tyext_constructors: extension_constructor list;
-    tyext_private: private_flag;
-    tyext_attributes: attribute list;
-  }
-
-and extension_constructor =
-  {
-    ext_id: Ident.t;
-    ext_name: string loc;
-    ext_type: Types.extension_constructor;
-    ext_kind: extension_constructor_kind;
-    ext_loc: Location.t;
-    ext_attributes: attribute list;
-  }
-
-and extension_constructor_kind =
-    Text_decl of constructor_arguments * core_type option
-  | Text_rebind of Path.t * Longident.t loc
-
-and class_type =
-    {
-     cltyp_desc: class_type_desc;
-     cltyp_type: Types.class_type;
-     cltyp_env: Env.t;
-     cltyp_loc: Location.t;
-     cltyp_attributes: attribute list;
-    }
-
-and class_type_desc =
-    Tcty_constr of Path.t * Longident.t loc * core_type list
-  | Tcty_signature of class_signature
-  | Tcty_arrow of arg_label * core_type * class_type
-  | Tcty_open of override_flag * Path.t * Longident.t loc * Env.t * class_type
-
-and class_signature = {
-    csig_self: core_type;
-    csig_fields: class_type_field list;
-    csig_type: Types.class_signature;
-  }
-
-and class_type_field = {
-    ctf_desc: class_type_field_desc;
-    ctf_loc: Location.t;
-    ctf_attributes: attribute list;
-  }
-
-and class_type_field_desc =
-  | Tctf_inherit of class_type
-  | Tctf_val of (string * mutable_flag * virtual_flag * core_type)
-  | Tctf_method of (string * private_flag * virtual_flag * core_type)
-  | Tctf_constraint of (core_type * core_type)
-  | Tctf_attribute of attribute
-
-
-and class_description =
-  class_type class_infos
-
-and class_type_declaration =
-  class_type class_infos
-
-and 'a class_infos =
-  { ci_virt: virtual_flag;
-    ci_params: (core_type * variance) list;
-    ci_id_name: string loc;
-    ci_id_class: Ident.t;
-    ci_id_class_type: Ident.t;
-    ci_id_object: Ident.t;
-    ci_id_typehash: Ident.t;
-    ci_expr: 'a;
-    ci_decl: Types.class_declaration;
-    ci_type_decl: Types.class_type_declaration;
-    ci_loc: Location.t;
-    ci_attributes: attribute list;
-   }
-
-(* Auxiliary functions over the a.s.t. *)
-
-let iter_pattern_desc f = function
-  | Tpat_alias(p, _, _) -> f p
-  | Tpat_tuple patl -> List.iter f patl
-  | Tpat_construct(_, _, patl) -> List.iter f patl
-  | Tpat_variant(_, pat, _) -> may f pat
-  | Tpat_record (lbl_pat_list, _) ->
-      List.iter (fun (_, _, pat) -> f pat) lbl_pat_list
-  | Tpat_array patl -> List.iter f patl
-  | Tpat_or(p1, p2, _) -> f p1; f p2
-  | Tpat_lazy p -> f p
-  | Tpat_any
-  | Tpat_var _
-  | Tpat_constant _ -> ()
-
-let map_pattern_desc f d =
-  match d with
-  | Tpat_alias (p1, id, s) ->
-      Tpat_alias (f p1, id, s)
-  | Tpat_tuple pats ->
-      Tpat_tuple (List.map f pats)
-  | Tpat_record (lpats, closed) ->
-      Tpat_record (List.map (fun (lid, l,p) -> lid, l, f p) lpats, closed)
-  | Tpat_construct (lid, c,pats) ->
-      Tpat_construct (lid, c, List.map f pats)
-  | Tpat_array pats ->
-      Tpat_array (List.map f pats)
-  | Tpat_lazy p1 -> Tpat_lazy (f p1)
-  | Tpat_variant (x1, Some p1, x2) ->
-      Tpat_variant (x1, Some (f p1), x2)
-  | Tpat_or (p1,p2,path) ->
-      Tpat_or (f p1, f p2, path)
-  | Tpat_var _
-  | Tpat_constant _
-  | Tpat_any
-  | Tpat_variant (_,None,_) -> d
-
-(* List the identifiers bound by a pattern or a let *)
-
-let idents = ref([]: (Ident.t * string loc) list)
-
-let rec bound_idents pat =
-  match pat.pat_desc with
-  | Tpat_var (id,s) -> idents := (id,s) :: !idents
-  | Tpat_alias(p, id, s ) ->
-      bound_idents p; idents := (id,s) :: !idents
-  | Tpat_or(p1, _, _) ->
-      (* Invariant : both arguments binds the same variables *)
-      bound_idents p1
-  | d -> iter_pattern_desc bound_idents d
-
-let pat_bound_idents pat =
-  idents := [];
-  bound_idents pat;
-  let res = !idents in
-  idents := [];
-  List.map fst res
-
-let rev_let_bound_idents_with_loc bindings =
-  idents := [];
-  List.iter (fun vb -> bound_idents vb.vb_pat) bindings;
-  let res = !idents in idents := []; res
-
-let let_bound_idents_with_loc pat_expr_list =
-  List.rev(rev_let_bound_idents_with_loc pat_expr_list)
-
-let rev_let_bound_idents pat = List.map fst (rev_let_bound_idents_with_loc pat)
-let let_bound_idents pat = List.map  fst (let_bound_idents_with_loc pat)
-
-let alpha_var env id = List.assoc id env
-
-let rec alpha_pat env p = match p.pat_desc with
-| Tpat_var (id, s) -> (* note the ``Not_found'' case *)
-    {p with pat_desc =
-     try Tpat_var (alpha_var env id, s) with
-     | Not_found -> Tpat_any}
-| Tpat_alias (p1, id, s) ->
-    let new_p =  alpha_pat env p1 in
-    begin try
-      {p with pat_desc = Tpat_alias (new_p, alpha_var env id, s)}
-    with
-    | Not_found -> new_p
-    end
-| d ->
-    {p with pat_desc = map_pattern_desc (alpha_pat env) d}
-
-let mkloc = Location.mkloc
-let mknoloc = Location.mknoloc
diff --git a/jscomp/ml/typedtree.mli b/jscomp/ml/typedtree.mli
deleted file mode 100644
index a4559f3..0000000
--- a/jscomp/ml/typedtree.mli
+++ /dev/null
@@ -1,614 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Abstract syntax tree after typing *)
-
-
-(** By comparison with {!Parsetree}:
-    - Every {!Longindent.t} is accompanied by a resolved {!Path.t}.
-
-*)
-
-open Asttypes
-open Types
-
-(* Value expressions for the core language *)
-
-type partial = Partial | Total
-
-(** {1 Extension points} *)
-
-type attribute = Parsetree.attribute
-type attributes = attribute list
-
-(** {1 Core language} *)
-
-type pattern =
-  { pat_desc: pattern_desc;
-    pat_loc: Location.t;
-    pat_extra : (pat_extra * Location.t * attributes) list;
-    pat_type: type_expr;
-    mutable pat_env: Env.t;
-    pat_attributes: attributes;
-   }
-
-and pat_extra =
-  | Tpat_constraint of core_type
-        (** P : T          { pat_desc = P
-                           ; pat_extra = (Tpat_constraint T, _, _) :: ... }
-         *)
-  | Tpat_type of Path.t * Longident.t loc
-        (** #tconst        { pat_desc = disjunction
-                           ; pat_extra = (Tpat_type (P, "tconst"), _, _) :: ...}
-
-                           where [disjunction] is a [Tpat_or _] representing the
-                           branches of [tconst].
-         *)
-  | Tpat_open of Path.t * Longident.t loc * Env.t
-  | Tpat_unpack
-        (** (module P)     { pat_desc  = Tpat_var "P"
-                           ; pat_extra = (Tpat_unpack, _, _) :: ... }
-         *)
-
-and pattern_desc =
-    Tpat_any
-        (** _ *)
-  | Tpat_var of Ident.t * string loc
-        (** x *)
-  | Tpat_alias of pattern * Ident.t * string loc
-        (** P as a *)
-  | Tpat_constant of constant
-        (** 1, 'a', "true", 1.0, 1l, 1L, 1n *)
-  | Tpat_tuple of pattern list
-        (** (P1, ..., Pn)
-
-            Invariant: n >= 2
-         *)
-  | Tpat_construct of
-      Longident.t loc * constructor_description * pattern list
-        (** C                []
-            C P              [P]
-            C (P1, ..., Pn)  [P1; ...; Pn]
-          *)
-  | Tpat_variant of label * pattern option * row_desc ref
-        (** `A             (None)
-            `A P           (Some P)
-
-            See {!Types.row_desc} for an explanation of the last parameter.
-         *)
-  | Tpat_record of
-      (Longident.t loc * label_description * pattern) list *
-        closed_flag
-        (** { l1=P1; ...; ln=Pn }     (flag = Closed)
-            { l1=P1; ...; ln=Pn; _}   (flag = Open)
-
-            Invariant: n > 0
-         *)
-  | Tpat_array of pattern list
-        (** [| P1; ...; Pn |] *)
-  | Tpat_or of pattern * pattern * row_desc option
-        (** P1 | P2
-
-            [row_desc] = [Some _] when translating [Ppat_type _],
-                         [None] otherwise.
-         *)
-  | Tpat_lazy of pattern
-        (** lazy P *)
-
-and expression =
-  { exp_desc: expression_desc;
-    exp_loc: Location.t;
-    exp_extra: (exp_extra * Location.t * attributes) list;
-    exp_type: type_expr;
-    exp_env: Env.t;
-    exp_attributes: attributes;
-   }
-
-and exp_extra =
-  | Texp_constraint of core_type
-        (** E : T *)
-  | Texp_coerce of core_type option * core_type
-        (** E :> T           [Texp_coerce (None, T)]
-            E : T0 :> T      [Texp_coerce (Some T0, T)]
-         *)
-  | Texp_open of override_flag * Path.t * Longident.t loc * Env.t
-        (** let open[!] M in    [Texp_open (!, P, M, env)]
-                                where [env] is the environment after opening [P]
-         *)
-  | Texp_poly of core_type option
-        (** Used for method bodies. *)
-  | Texp_newtype of string
-        (** fun (type t) ->  *)
-
-and expression_desc =
-    Texp_ident of Path.t * Longident.t loc * Types.value_description
-        (** x
-            M.x
-         *)
-  | Texp_constant of constant
-        (** 1, 'a', "true", 1.0, 1l, 1L, 1n *)
-  | Texp_let of rec_flag * value_binding list * expression
-        (** let P1 = E1 and ... and Pn = EN in E       (flag = Nonrecursive)
-            let rec P1 = E1 and ... and Pn = EN in E   (flag = Recursive)
-         *)
-  | Texp_function of { arg_label : arg_label; param : Ident.t;
-      cases : case list; partial : partial; }
-        (** [Pexp_fun] and [Pexp_function] both translate to [Texp_function].
-            See {!Parsetree} for more details.
-
-            [param] is the identifier that is to be used to name the
-            parameter of the function.
-
-            partial =
-              [Partial] if the pattern match is partial
-              [Total] otherwise.
-         *)
-  | Texp_apply of expression * (arg_label * expression option) list
-        (** E0 ~l1:E1 ... ~ln:En
-
-            The expression can be None if the expression is abstracted over
-            this argument. It currently appears when a label is applied.
-
-            For example:
-            let f x ~y = x + y in
-            f ~y:3
-
-            The resulting typedtree for the application is:
-            Texp_apply (Texp_ident "f/1037",
-                        [(Nolabel, None);
-                         (Labelled "y", Some (Texp_constant Const_int 3))
-                        ])
-         *)
-  | Texp_match of expression * case list * case list * partial
-        (** match E0 with
-            | P1 -> E1
-            | P2 -> E2
-            | exception P3 -> E3
-
-            [Texp_match (E0, [(P1, E1); (P2, E2)], [(P3, E3)], _)]
-         *)
-  | Texp_try of expression * case list
-        (** try E with P1 -> E1 | ... | PN -> EN *)
-  | Texp_tuple of expression list
-        (** (E1, ..., EN) *)
-  | Texp_construct of
-      Longident.t loc * constructor_description * expression list
-        (** C                []
-            C E              [E]
-            C (E1, ..., En)  [E1;...;En]
-         *)
-  | Texp_variant of label * expression option
-  | Texp_record of {
-      fields : ( Types.label_description * record_label_definition ) array;
-      representation : Types.record_representation;
-      extended_expression : expression option;
-    }
-        (** { l1=P1; ...; ln=Pn }           (extended_expression = None)
-            { E0 with l1=P1; ...; ln=Pn }   (extended_expression = Some E0)
-
-            Invariant: n > 0
-
-            If the type is { l1: t1; l2: t2 }, the expression
-            { E0 with t2=P2 } is represented as
-            Texp_record
-              { fields = [| l1, Kept t1; l2 Override P2 |]; representation;
-                extended_expression = Some E0 }
-        *)
-  | Texp_field of expression * Longident.t loc * label_description
-  | Texp_setfield of
-      expression * Longident.t loc * label_description * expression
-  | Texp_array of expression list
-  | Texp_ifthenelse of expression * expression * expression option
-  | Texp_sequence of expression * expression
-  | Texp_while of expression * expression
-  | Texp_for of
-      Ident.t * Parsetree.pattern * expression * expression * direction_flag *
-        expression
-  | Texp_send of expression * meth * expression option
-  | Texp_new of unit
-  | Texp_instvar of unit
-  | Texp_setinstvar of unit
-  | Texp_override of unit
-  | Texp_letmodule of Ident.t * string loc * module_expr * expression
-  | Texp_letexception of extension_constructor * expression
-  | Texp_assert of expression
-  | Texp_lazy of expression
-  | Texp_object of unit
-  | Texp_pack of module_expr
-  | Texp_unreachable
-  | Texp_extension_constructor of Longident.t loc * Path.t
-
-and meth =
-    Tmeth_name of string
-
-and case =
-    {
-     c_lhs: pattern;
-     c_guard: expression option;
-     c_rhs: expression;
-    }
-
-and record_label_definition =
-  | Kept of Types.type_expr
-  | Overridden of Longident.t loc * expression
-
-
-
-(* Value expressions for the module language *)
-
-and module_expr =
-  { mod_desc: module_expr_desc;
-    mod_loc: Location.t;
-    mod_type: Types.module_type;
-    mod_env: Env.t;
-    mod_attributes: attributes;
-   }
-
-(** Annotations for [Tmod_constraint]. *)
-and module_type_constraint =
-  | Tmodtype_implicit
-  (** The module type constraint has been synthesized during typechecking. *)
-  | Tmodtype_explicit of module_type
-  (** The module type was in the source file. *)
-
-and module_expr_desc =
-    Tmod_ident of Path.t * Longident.t loc
-  | Tmod_structure of structure
-  | Tmod_functor of Ident.t * string loc * module_type option * module_expr
-  | Tmod_apply of module_expr * module_expr * module_coercion
-  | Tmod_constraint of
-      module_expr * Types.module_type * module_type_constraint * module_coercion
-    (** ME          (constraint = Tmodtype_implicit)
-        (ME : MT)   (constraint = Tmodtype_explicit MT)
-     *)
-  | Tmod_unpack of expression * Types.module_type
-
-and structure = {
-  str_items : structure_item list;
-  str_type : Types.signature;
-  str_final_env : Env.t;
-}
-
-and structure_item =
-  { str_desc : structure_item_desc;
-    str_loc : Location.t;
-    str_env : Env.t
-  }
-
-and structure_item_desc =
-    Tstr_eval of expression * attributes
-  | Tstr_value of rec_flag * value_binding list
-  | Tstr_primitive of value_description
-  | Tstr_type of rec_flag * type_declaration list
-  | Tstr_typext of type_extension
-  | Tstr_exception of extension_constructor
-  | Tstr_module of module_binding
-  | Tstr_recmodule of module_binding list
-  | Tstr_modtype of module_type_declaration
-  | Tstr_open of open_description
-  | Tstr_class of unit
-  | Tstr_class_type of (Ident.t * string loc * class_type_declaration) list
-  | Tstr_include of include_declaration
-  | Tstr_attribute of attribute
-
-and module_binding =
-    {
-     mb_id: Ident.t;
-     mb_name: string loc;
-     mb_expr: module_expr;
-     mb_attributes: attributes;
-     mb_loc: Location.t;
-    }
-
-and value_binding =
-  {
-    vb_pat: pattern;
-    vb_expr: expression;
-    vb_attributes: attributes;
-    vb_loc: Location.t;
-  }
-
-and module_coercion =
-    Tcoerce_none
-  | Tcoerce_structure of (int * module_coercion) list *
-                         (Ident.t * int * module_coercion) list *
-                         string list (* runtime fields *)
-  | Tcoerce_functor of module_coercion * module_coercion
-  | Tcoerce_primitive of primitive_coercion
-  | Tcoerce_alias of Path.t * module_coercion
-
-and module_type =
-  { mty_desc: module_type_desc;
-    mty_type : Types.module_type;
-    mty_env : Env.t;
-    mty_loc: Location.t;
-    mty_attributes: attributes;
-   }
-
-and module_type_desc =
-    Tmty_ident of Path.t * Longident.t loc
-  | Tmty_signature of signature
-  | Tmty_functor of Ident.t * string loc * module_type option * module_type
-  | Tmty_with of module_type * (Path.t * Longident.t loc * with_constraint) list
-  | Tmty_typeof of module_expr
-  | Tmty_alias of Path.t * Longident.t loc
-
-and primitive_coercion =
-  {
-    pc_desc: Primitive.description;
-    pc_type: type_expr;
-    pc_env: Env.t;
-    pc_loc : Location.t;
-    pc_id : Ident.t;
-  }
-
-and signature = {
-  sig_items : signature_item list;
-  sig_type : Types.signature;
-  sig_final_env : Env.t;
-}
-
-and signature_item =
-  { sig_desc: signature_item_desc;
-    sig_env : Env.t; (* BINANNOT ADDED *)
-    sig_loc: Location.t }
-
-and signature_item_desc =
-    Tsig_value of value_description
-  | Tsig_type of rec_flag * type_declaration list
-  | Tsig_typext of type_extension
-  | Tsig_exception of extension_constructor
-  | Tsig_module of module_declaration
-  | Tsig_recmodule of module_declaration list
-  | Tsig_modtype of module_type_declaration
-  | Tsig_open of open_description
-  | Tsig_include of include_description
-  | Tsig_class of unit
-  | Tsig_class_type of class_type_declaration list
-  | Tsig_attribute of attribute
-
-and module_declaration =
-    {
-     md_id: Ident.t;
-     md_name: string loc;
-     md_type: module_type;
-     md_attributes: attributes;
-     md_loc: Location.t;
-    }
-
-and module_type_declaration =
-    {
-     mtd_id: Ident.t;
-     mtd_name: string loc;
-     mtd_type: module_type option;
-     mtd_attributes: attributes;
-     mtd_loc: Location.t;
-    }
-
-and open_description =
-    {
-     open_path: Path.t;
-     open_txt: Longident.t loc;
-     open_override: override_flag;
-     open_loc: Location.t;
-     open_attributes: attribute list;
-    }
-
-and 'a include_infos =
-    {
-     incl_mod: 'a;
-     incl_type: Types.signature;
-     incl_loc: Location.t;
-     incl_attributes: attribute list;
-    }
-
-and include_description = module_type include_infos
-
-and include_declaration = module_expr include_infos
-
-and with_constraint =
-    Twith_type of type_declaration
-  | Twith_module of Path.t * Longident.t loc
-  | Twith_typesubst of type_declaration
-  | Twith_modsubst of Path.t * Longident.t loc
-
-and core_type =
-  { mutable ctyp_desc : core_type_desc;
-      (** mutable because of [Typeclass.declare_method] *)
-    mutable ctyp_type : type_expr;
-      (** mutable because of [Typeclass.declare_method] *)
-    ctyp_env : Env.t; (* BINANNOT ADDED *)
-    ctyp_loc : Location.t;
-    ctyp_attributes: attributes;
-   }
-
-and core_type_desc =
-    Ttyp_any
-  | Ttyp_var of string
-  | Ttyp_arrow of arg_label * core_type * core_type
-  | Ttyp_tuple of core_type list
-  | Ttyp_constr of Path.t * Longident.t loc * core_type list
-  | Ttyp_object of object_field list * closed_flag
-  | Ttyp_class of Path.t * Longident.t loc * core_type list
-  | Ttyp_alias of core_type * string
-  | Ttyp_variant of row_field list * closed_flag * label list option
-  | Ttyp_poly of string list * core_type
-  | Ttyp_package of package_type
-
-and package_type = {
-  pack_path : Path.t;
-  pack_fields : (Longident.t loc * core_type) list;
-  pack_type : Types.module_type;
-  pack_txt : Longident.t loc;
-}
-
-and row_field =
-    Ttag of string loc * attributes * bool * core_type list
-  | Tinherit of core_type
-
-and object_field =
-  | OTtag of string loc * attributes * core_type
-  | OTinherit of core_type
-
-and value_description =
-  { val_id: Ident.t;
-    val_name: string loc;
-    val_desc: core_type;
-    val_val: Types.value_description;
-    val_prim: string list;
-    val_loc: Location.t;
-    val_attributes: attributes;
-    }
-
-and type_declaration =
-  {
-    typ_id: Ident.t;
-    typ_name: string loc;
-    typ_params: (core_type * variance) list;
-    typ_type: Types.type_declaration;
-    typ_cstrs: (core_type * core_type * Location.t) list;
-    typ_kind: type_kind;
-    typ_private: private_flag;
-    typ_manifest: core_type option;
-    typ_loc: Location.t;
-    typ_attributes: attributes;
-   }
-
-and type_kind =
-    Ttype_abstract
-  | Ttype_variant of constructor_declaration list
-  | Ttype_record of label_declaration list
-  | Ttype_open
-
-and label_declaration =
-    {
-     ld_id: Ident.t;
-     ld_name: string loc;
-     ld_mutable: mutable_flag;
-     ld_type: core_type;
-     ld_loc: Location.t;
-     ld_attributes: attributes;
-    }
-
-and constructor_declaration =
-    {
-     cd_id: Ident.t;
-     cd_name: string loc;
-     cd_args: constructor_arguments;
-     cd_res: core_type option;
-     cd_loc: Location.t;
-     cd_attributes: attributes;
-    }
-
-and constructor_arguments =
-  | Cstr_tuple of core_type list
-  | Cstr_record of label_declaration list
-
-and type_extension =
-  {
-    tyext_path: Path.t;
-    tyext_txt: Longident.t loc;
-    tyext_params: (core_type * variance) list;
-    tyext_constructors: extension_constructor list;
-    tyext_private: private_flag;
-    tyext_attributes: attributes;
-  }
-
-and extension_constructor =
-  {
-    ext_id: Ident.t;
-    ext_name: string loc;
-    ext_type : Types.extension_constructor;
-    ext_kind : extension_constructor_kind;
-    ext_loc : Location.t;
-    ext_attributes: attributes;
-  }
-
-and extension_constructor_kind =
-    Text_decl of constructor_arguments * core_type option
-  | Text_rebind of Path.t * Longident.t loc
-
-and class_type =
-    {
-     cltyp_desc: class_type_desc;
-     cltyp_type: Types.class_type;
-     cltyp_env: Env.t;
-     cltyp_loc: Location.t;
-     cltyp_attributes: attributes;
-    }
-
-and class_type_desc =
-    Tcty_constr of Path.t * Longident.t loc * core_type list
-  | Tcty_signature of class_signature
-  | Tcty_arrow of arg_label * core_type * class_type
-  | Tcty_open of override_flag * Path.t * Longident.t loc * Env.t * class_type
-
-and class_signature = {
-    csig_self : core_type;
-    csig_fields : class_type_field list;
-    csig_type : Types.class_signature;
-  }
-
-and class_type_field = {
-    ctf_desc: class_type_field_desc;
-    ctf_loc: Location.t;
-    ctf_attributes: attributes;
-  }
-
-and class_type_field_desc =
-  | Tctf_inherit of class_type
-  | Tctf_val of (string * mutable_flag * virtual_flag * core_type)
-  | Tctf_method of (string * private_flag * virtual_flag * core_type)
-  | Tctf_constraint of (core_type * core_type)
-  | Tctf_attribute of attribute
-
-
-and class_description =
-  class_type class_infos
-
-and class_type_declaration =
-  class_type class_infos
-
-and 'a class_infos =
-  { ci_virt: virtual_flag;
-    ci_params: (core_type * variance) list;
-    ci_id_name : string loc;
-    ci_id_class: Ident.t;
-    ci_id_class_type : Ident.t;
-    ci_id_object : Ident.t;
-    ci_id_typehash : Ident.t;
-    ci_expr: 'a;
-    ci_decl: Types.class_declaration;
-    ci_type_decl : Types.class_type_declaration;
-    ci_loc: Location.t;
-    ci_attributes: attributes;
-   }
-
-(* Auxiliary functions over the a.s.t. *)
-
-val iter_pattern_desc: (pattern -> unit) -> pattern_desc -> unit
-val map_pattern_desc: (pattern -> pattern) -> pattern_desc -> pattern_desc
-
-val let_bound_idents: value_binding list -> Ident.t list
-val rev_let_bound_idents: value_binding list -> Ident.t list
-
-
-(** Alpha conversion of patterns *)
-val alpha_pat: (Ident.t * Ident.t) list -> pattern -> pattern
-
-val mknoloc: 'a -> 'a Asttypes.loc
-val mkloc: 'a -> Location.t -> 'a Asttypes.loc
-
-val pat_bound_idents: pattern -> Ident.t list
diff --git a/jscomp/ml/typedtreeIter.ml b/jscomp/ml/typedtreeIter.ml
deleted file mode 100644
index 779a7c9..0000000
--- a/jscomp/ml/typedtreeIter.ml
+++ /dev/null
@@ -1,594 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*    Thomas Gazagnaire (OCamlPro), Fabrice Le Fessant (INRIA Saclay)     *)
-(*                                                                        *)
-(*   Copyright 2007 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(*
-TODO:
- - 2012/05/10: Follow camlp4 way of building map and iter using classes
-     and inheritance ?
-*)
-
-open Asttypes
-open Typedtree
-
-module type IteratorArgument = sig
-
-    val enter_structure : structure -> unit
-    val enter_value_description : value_description -> unit
-    val enter_type_extension : type_extension -> unit
-    val enter_extension_constructor : extension_constructor -> unit
-    val enter_pattern : pattern -> unit
-    val enter_expression : expression -> unit
-    val enter_package_type : package_type -> unit
-    val enter_signature : signature -> unit
-    val enter_signature_item : signature_item -> unit
-    val enter_module_type_declaration : module_type_declaration -> unit
-    val enter_module_type : module_type -> unit
-    val enter_module_expr : module_expr -> unit
-    val enter_with_constraint : with_constraint -> unit
-    val enter_class_signature : class_signature -> unit
-
-    val enter_class_description : class_description -> unit
-    val enter_class_type_declaration : class_type_declaration -> unit
-    val enter_class_type : class_type -> unit
-    val enter_class_type_field : class_type_field -> unit
-    val enter_core_type : core_type -> unit
-    val enter_structure_item : structure_item -> unit
-
-
-    val leave_structure : structure -> unit
-    val leave_value_description : value_description -> unit
-    val leave_type_extension : type_extension -> unit
-    val leave_extension_constructor : extension_constructor -> unit
-    val leave_pattern : pattern -> unit
-    val leave_expression : expression -> unit
-    val leave_package_type : package_type -> unit
-    val leave_signature : signature -> unit
-    val leave_signature_item : signature_item -> unit
-    val leave_module_type_declaration : module_type_declaration -> unit
-    val leave_module_type : module_type -> unit
-    val leave_module_expr : module_expr -> unit
-    val leave_with_constraint : with_constraint -> unit
-    val leave_class_signature : class_signature -> unit
-
-    val leave_class_description : class_description -> unit
-    val leave_class_type_declaration : class_type_declaration -> unit
-    val leave_class_type : class_type -> unit
-    val leave_class_type_field : class_type_field -> unit
-    val leave_core_type : core_type -> unit
-    val leave_structure_item : structure_item -> unit
-
-    val enter_bindings : rec_flag -> unit
-    val enter_binding : value_binding -> unit
-    val leave_binding : value_binding -> unit
-    val leave_bindings : rec_flag -> unit
-
-    val enter_type_declarations : rec_flag -> unit
-    val enter_type_declaration : type_declaration -> unit
-    val leave_type_declaration : type_declaration -> unit
-    val leave_type_declarations : rec_flag -> unit
-
-      end
-
-module MakeIterator(Iter : IteratorArgument) : sig
-
-    val iter_structure : structure -> unit
-    val iter_signature : signature -> unit
-    val iter_structure_item : structure_item -> unit
-    val iter_signature_item : signature_item -> unit
-    val iter_expression : expression -> unit
-    val iter_module_type : module_type -> unit
-    val iter_pattern : pattern -> unit
-
-  end = struct
-
-    let may_iter f v =
-      match v with
-        None -> ()
-      | Some x -> f x
-
-
-    let rec iter_structure str =
-      Iter.enter_structure str;
-      List.iter iter_structure_item str.str_items;
-      Iter.leave_structure str
-
-
-    and iter_binding vb =
-      Iter.enter_binding vb;
-      iter_pattern vb.vb_pat;
-      iter_expression vb.vb_expr;
-      Iter.leave_binding vb
-
-    and iter_bindings rec_flag list =
-      Iter.enter_bindings rec_flag;
-      List.iter iter_binding list;
-      Iter.leave_bindings rec_flag
-
-    and iter_case {c_lhs; c_guard; c_rhs} =
-      iter_pattern c_lhs;
-      may_iter iter_expression c_guard;
-      iter_expression c_rhs
-
-    and iter_cases cases =
-      List.iter iter_case cases
-
-    and iter_structure_item item =
-      Iter.enter_structure_item item;
-      begin
-        match item.str_desc with
-          Tstr_eval (exp, _attrs) -> iter_expression exp
-        | Tstr_value (rec_flag, list) ->
-            iter_bindings rec_flag list
-        | Tstr_primitive vd -> iter_value_description vd
-        | Tstr_type (rf, list) -> iter_type_declarations rf list
-        | Tstr_typext tyext -> iter_type_extension tyext
-        | Tstr_exception ext -> iter_extension_constructor ext
-        | Tstr_module x -> iter_module_binding x
-        | Tstr_recmodule list -> List.iter iter_module_binding list
-        | Tstr_modtype mtd -> iter_module_type_declaration mtd
-        | Tstr_open _ -> ()
-        | Tstr_class () -> ()
-        | Tstr_class_type list ->
-            List.iter
-              (fun (_, _, ct) -> iter_class_type_declaration ct)
-              list
-        | Tstr_include incl -> iter_module_expr incl.incl_mod
-        | Tstr_attribute _ ->
-            ()
-      end;
-      Iter.leave_structure_item item
-
-    and iter_module_binding x =
-      iter_module_expr x.mb_expr
-
-    and iter_value_description v =
-      Iter.enter_value_description v;
-      iter_core_type v.val_desc;
-      Iter.leave_value_description v
-
-    and iter_constructor_arguments = function
-      | Cstr_tuple l -> List.iter iter_core_type l
-      | Cstr_record l -> List.iter (fun ld -> iter_core_type ld.ld_type) l
-
-    and iter_constructor_declaration cd =
-      iter_constructor_arguments cd.cd_args;
-      option iter_core_type cd.cd_res;
-
-    and iter_type_parameter (ct, _v) =
-      iter_core_type ct
-
-    and iter_type_declaration decl =
-      Iter.enter_type_declaration decl;
-      List.iter iter_type_parameter decl.typ_params;
-      List.iter (fun (ct1, ct2, _loc) ->
-          iter_core_type ct1;
-          iter_core_type ct2
-      ) decl.typ_cstrs;
-      begin match decl.typ_kind with
-          Ttype_abstract -> ()
-        | Ttype_variant list ->
-            List.iter iter_constructor_declaration list
-        | Ttype_record list ->
-            List.iter
-              (fun ld ->
-                iter_core_type ld.ld_type
-            ) list
-        | Ttype_open -> ()
-      end;
-      option iter_core_type decl.typ_manifest;
-      Iter.leave_type_declaration decl
-
-    and iter_type_declarations rec_flag decls =
-      Iter.enter_type_declarations rec_flag;
-      List.iter iter_type_declaration decls;
-      Iter.leave_type_declarations rec_flag
-
-    and iter_extension_constructor ext =
-      Iter.enter_extension_constructor ext;
-      begin match ext.ext_kind with
-          Text_decl(args, ret) ->
-          iter_constructor_arguments args;
-            option iter_core_type ret
-        | Text_rebind _ -> ()
-      end;
-      Iter.leave_extension_constructor ext;
-
-    and iter_type_extension tyext =
-      Iter.enter_type_extension tyext;
-      List.iter iter_type_parameter tyext.tyext_params;
-      List.iter iter_extension_constructor tyext.tyext_constructors;
-      Iter.leave_type_extension tyext
-
-    and iter_pattern pat =
-      Iter.enter_pattern pat;
-      List.iter (fun (cstr, _, _attrs) -> match cstr with
-              | Tpat_type _ -> ()
-              | Tpat_unpack -> ()
-              | Tpat_open _ -> ()
-              | Tpat_constraint ct -> iter_core_type ct) pat.pat_extra;
-      begin
-        match pat.pat_desc with
-          Tpat_any -> ()
-        | Tpat_var _ -> ()
-        | Tpat_alias (pat1, _, _) -> iter_pattern pat1
-        | Tpat_constant _ -> ()
-        | Tpat_tuple list ->
-            List.iter iter_pattern list
-        | Tpat_construct (_, _, args) ->
-            List.iter iter_pattern args
-        | Tpat_variant (_, pato, _) ->
-            begin match pato with
-                None -> ()
-              | Some pat -> iter_pattern pat
-            end
-        | Tpat_record (list, _closed) ->
-            List.iter (fun (_, _, pat) -> iter_pattern pat) list
-        | Tpat_array list -> List.iter iter_pattern list
-        | Tpat_or (p1, p2, _) -> iter_pattern p1; iter_pattern p2
-        | Tpat_lazy p -> iter_pattern p
-      end;
-      Iter.leave_pattern pat
-
-    and option f x = match x with None -> () | Some e -> f e
-
-    and iter_expression exp =
-      Iter.enter_expression exp;
-      List.iter (function (cstr, _, _attrs) ->
-        match cstr with
-          Texp_constraint ct ->
-            iter_core_type ct
-        | Texp_coerce (cty1, cty2) ->
-            option iter_core_type cty1; iter_core_type cty2
-        | Texp_open _ -> ()
-        | Texp_poly cto -> option iter_core_type cto
-        | Texp_newtype _ -> ())
-        exp.exp_extra;
-      begin
-        match exp.exp_desc with
-          Texp_ident _ -> ()
-        | Texp_constant _ -> ()
-        | Texp_let (rec_flag, list, exp) ->
-            iter_bindings rec_flag list;
-            iter_expression exp
-        | Texp_function { cases; _ } ->
-            iter_cases cases
-        | Texp_apply (exp, list) ->
-            iter_expression exp;
-            List.iter (fun (_label, expo) ->
-                match expo with
-                  None -> ()
-                | Some exp -> iter_expression exp
-            ) list
-        | Texp_match (exp, list1, list2, _) ->
-            iter_expression exp;
-            iter_cases list1;
-            iter_cases list2;
-        | Texp_try (exp, list) ->
-            iter_expression exp;
-            iter_cases list
-        | Texp_tuple list ->
-            List.iter iter_expression list
-        | Texp_construct (_, _, args) ->
-            List.iter iter_expression args
-        | Texp_variant (_label, expo) ->
-            begin match expo with
-                None -> ()
-              | Some exp -> iter_expression exp
-            end
-        | Texp_record { fields; extended_expression; _ } ->
-            Array.iter (function
-                | _, Kept _ -> ()
-                | _, Overridden (_, exp) -> iter_expression exp)
-              fields;
-            begin match extended_expression with
-                None -> ()
-              | Some exp -> iter_expression exp
-            end
-        | Texp_field (exp, _, _label) ->
-            iter_expression exp
-        | Texp_setfield (exp1, _, _label, exp2) ->
-            iter_expression exp1;
-            iter_expression exp2
-        | Texp_array list ->
-            List.iter iter_expression list
-        | Texp_ifthenelse (exp1, exp2, expo) ->
-            iter_expression exp1;
-            iter_expression exp2;
-            begin match expo with
-                None -> ()
-              | Some exp -> iter_expression exp
-            end
-        | Texp_sequence (exp1, exp2) ->
-            iter_expression exp1;
-            iter_expression exp2
-        | Texp_while (exp1, exp2) ->
-            iter_expression exp1;
-            iter_expression exp2
-        | Texp_for (_id, _, exp1, exp2, _dir, exp3) ->
-            iter_expression exp1;
-            iter_expression exp2;
-            iter_expression exp3
-        | Texp_send (exp, _meth, expo) ->
-            iter_expression exp;
-          begin
-            match expo with
-                None -> ()
-              | Some exp -> iter_expression exp
-          end
-        | Texp_new _ 
-        | Texp_instvar _ 
-        | Texp_setinstvar _ 
-        | Texp_override _ -> ()
-        | Texp_letmodule (_id, _, mexpr, exp) ->
-            iter_module_expr mexpr;
-            iter_expression exp
-        | Texp_letexception (cd, exp) ->
-            iter_extension_constructor cd;
-            iter_expression exp
-        | Texp_assert exp -> iter_expression exp
-        | Texp_lazy exp -> iter_expression exp
-        | Texp_object () ->
-            ()
-        | Texp_pack (mexpr) ->
-            iter_module_expr mexpr
-        | Texp_unreachable ->
-            ()
-        | Texp_extension_constructor _ ->
-            ()
-      end;
-      Iter.leave_expression exp;
-
-    and iter_package_type pack =
-      Iter.enter_package_type pack;
-      List.iter (fun (_s, ct) -> iter_core_type ct) pack.pack_fields;
-      Iter.leave_package_type pack;
-
-    and iter_signature sg =
-      Iter.enter_signature sg;
-      List.iter iter_signature_item sg.sig_items;
-      Iter.leave_signature sg;
-
-    and iter_signature_item item =
-      Iter.enter_signature_item item;
-      begin
-        match item.sig_desc with
-          Tsig_value vd ->
-            iter_value_description vd
-        | Tsig_type (rf, list) ->
-            iter_type_declarations rf list
-        | Tsig_exception ext ->
-            iter_extension_constructor ext
-        | Tsig_typext tyext ->
-            iter_type_extension tyext
-        | Tsig_module md ->
-            iter_module_type md.md_type
-        | Tsig_recmodule list ->
-            List.iter (fun md -> iter_module_type md.md_type) list
-        | Tsig_modtype mtd ->
-            iter_module_type_declaration mtd
-        | Tsig_open _ -> ()
-        | Tsig_include incl -> iter_module_type incl.incl_mod
-        | Tsig_class () -> ()
-        | Tsig_class_type list ->
-            List.iter iter_class_type_declaration list
-        | Tsig_attribute _ -> ()
-      end;
-      Iter.leave_signature_item item;
-
-    and iter_module_type_declaration mtd =
-      Iter.enter_module_type_declaration mtd;
-      begin
-        match mtd.mtd_type with
-        | None -> ()
-        | Some mtype -> iter_module_type mtype
-      end;
-      Iter.leave_module_type_declaration mtd
-
-
-
-    and iter_class_type_declaration cd =
-      Iter.enter_class_type_declaration cd;
-      List.iter iter_type_parameter cd.ci_params;
-      iter_class_type cd.ci_expr;
-      Iter.leave_class_type_declaration cd;
-
-    and iter_module_type mty =
-      Iter.enter_module_type mty;
-      begin
-        match mty.mty_desc with
-          Tmty_ident _ -> ()
-        | Tmty_alias _ -> ()
-        | Tmty_signature sg -> iter_signature sg
-        | Tmty_functor (_, _, mtype1, mtype2) ->
-            Misc.may iter_module_type mtype1; iter_module_type mtype2
-        | Tmty_with (mtype, list) ->
-            iter_module_type mtype;
-            List.iter (fun (_path, _, withc) ->
-                iter_with_constraint withc
-            ) list
-        | Tmty_typeof mexpr ->
-            iter_module_expr mexpr
-      end;
-      Iter.leave_module_type mty;
-
-    and iter_with_constraint cstr =
-      Iter.enter_with_constraint cstr;
-      begin
-        match cstr with
-          Twith_type decl -> iter_type_declaration decl
-        | Twith_module _ -> ()
-        | Twith_typesubst decl -> iter_type_declaration decl
-        | Twith_modsubst _ -> ()
-      end;
-      Iter.leave_with_constraint cstr;
-
-    and iter_module_expr mexpr =
-      Iter.enter_module_expr mexpr;
-      begin
-        match mexpr.mod_desc with
-          Tmod_ident _ -> ()
-        | Tmod_structure st -> iter_structure st
-        | Tmod_functor (_, _, mtype, mexpr) ->
-            Misc.may iter_module_type mtype;
-            iter_module_expr mexpr
-        | Tmod_apply (mexp1, mexp2, _) ->
-            iter_module_expr mexp1;
-            iter_module_expr mexp2
-        | Tmod_constraint (mexpr, _, Tmodtype_implicit, _ ) ->
-            iter_module_expr mexpr
-        | Tmod_constraint (mexpr, _, Tmodtype_explicit mtype, _) ->
-            iter_module_expr mexpr;
-            iter_module_type mtype
-        | Tmod_unpack (exp, _mty) ->
-            iter_expression exp
-(*          iter_module_type mty *)
-      end;
-      Iter.leave_module_expr mexpr;
-
-
-    and iter_class_type ct =
-      Iter.enter_class_type ct;
-      begin
-        match ct.cltyp_desc with
-          Tcty_signature csg -> iter_class_signature csg
-        | Tcty_constr (_path, _, list) ->
-            List.iter iter_core_type list
-        | Tcty_arrow (_label, ct, cl) ->
-            iter_core_type ct;
-            iter_class_type cl
-        | Tcty_open (_, _, _, _, e) ->
-            iter_class_type e
-      end;
-      Iter.leave_class_type ct;
-
-    and iter_class_signature cs =
-      Iter.enter_class_signature cs;
-      iter_core_type cs.csig_self;
-      List.iter iter_class_type_field cs.csig_fields;
-      Iter.leave_class_signature cs
-
-
-    and iter_class_type_field ctf =
-      Iter.enter_class_type_field ctf;
-      begin
-        match ctf.ctf_desc with
-          Tctf_inherit ct -> iter_class_type ct
-        | Tctf_val (_s, _mut, _virt, ct) ->
-            iter_core_type ct
-        | Tctf_method (_s, _priv, _virt, ct) ->
-            iter_core_type ct
-        | Tctf_constraint  (ct1, ct2) ->
-            iter_core_type ct1;
-            iter_core_type ct2
-        | Tctf_attribute _ -> ()
-      end;
-      Iter.leave_class_type_field ctf
-
-    and iter_core_type ct =
-      Iter.enter_core_type ct;
-      begin
-        match ct.ctyp_desc with
-          Ttyp_any -> ()
-        | Ttyp_var _ -> ()
-        | Ttyp_arrow (_label, ct1, ct2) ->
-            iter_core_type ct1;
-            iter_core_type ct2
-        | Ttyp_tuple list -> List.iter iter_core_type list
-        | Ttyp_constr (_path, _, list) ->
-            List.iter iter_core_type list
-        | Ttyp_object (list, _o) ->
-            List.iter iter_object_field list
-        | Ttyp_class (_path, _, list) ->
-            List.iter iter_core_type list
-        | Ttyp_alias (ct, _s) ->
-            iter_core_type ct
-        | Ttyp_variant (list, _bool, _labels) ->
-            List.iter iter_row_field list
-        | Ttyp_poly (_list, ct) -> iter_core_type ct
-        | Ttyp_package pack -> iter_package_type pack
-      end;
-      Iter.leave_core_type ct
-
-    and iter_row_field rf =
-      match rf with
-        Ttag (_label, _attrs, _bool, list) ->
-          List.iter iter_core_type list
-      | Tinherit ct -> iter_core_type ct
-
-    and iter_object_field ofield =
-      match ofield with
-        OTtag (_, _, ct) | OTinherit ct -> iter_core_type ct
-
-  end
-
-module DefaultIteratorArgument = struct
-
-      let enter_structure _ = ()
-      let enter_value_description _ = ()
-      let enter_type_extension _ = ()
-      let enter_extension_constructor _ = ()
-      let enter_pattern _ = ()
-      let enter_expression _ = ()
-      let enter_package_type _ = ()
-      let enter_signature _ = ()
-      let enter_signature_item _ = ()
-      let enter_module_type_declaration _ = ()
-      let enter_module_type _ = ()
-      let enter_module_expr _ = ()
-      let enter_with_constraint _ = ()
-      let enter_class_signature _ = ()
-
-      let enter_class_description _ = ()
-      let enter_class_type_declaration _ = ()
-      let enter_class_type _ = ()
-      let enter_class_type_field _ = ()
-      let enter_core_type _ = ()
-    let enter_structure_item _ = ()
-
-
-      let leave_structure _ = ()
-      let leave_value_description _ = ()
-      let leave_type_extension _ = ()
-      let leave_extension_constructor _ = ()
-      let leave_pattern _ = ()
-      let leave_expression _ = ()
-      let leave_package_type _ = ()
-      let leave_signature _ = ()
-      let leave_signature_item _ = ()
-      let leave_module_type_declaration _ = ()
-      let leave_module_type _ = ()
-      let leave_module_expr _ = ()
-      let leave_with_constraint _ = ()
-      let leave_class_signature _ = ()
-
-      let leave_class_description _ = ()
-      let leave_class_type_declaration _ = ()
-      let leave_class_type _ = ()
-      let leave_class_type_field _ = ()
-      let leave_core_type _ = ()
-    let leave_structure_item _ = ()
-
-    let enter_binding _ = ()
-    let leave_binding _ = ()
-
-    let enter_bindings _ = ()
-    let leave_bindings _ = ()
-
-    let enter_type_declaration _ = ()
-    let leave_type_declaration _ = ()
-
-    let enter_type_declarations _ = ()
-    let leave_type_declarations _ = ()
-end
diff --git a/jscomp/ml/typedtreeIter.mli b/jscomp/ml/typedtreeIter.mli
deleted file mode 100644
index b215c20..0000000
--- a/jscomp/ml/typedtreeIter.mli
+++ /dev/null
@@ -1,88 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*    Thomas Gazagnaire (OCamlPro), Fabrice Le Fessant (INRIA Saclay)     *)
-(*                                                                        *)
-(*   Copyright 2007 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Asttypes
-open Typedtree
-
-
-module type IteratorArgument = sig
-    val enter_structure : structure -> unit
-    val enter_value_description : value_description -> unit
-    val enter_type_extension : type_extension -> unit
-    val enter_extension_constructor : extension_constructor -> unit
-    val enter_pattern : pattern -> unit
-    val enter_expression : expression -> unit
-    val enter_package_type : package_type -> unit
-    val enter_signature : signature -> unit
-    val enter_signature_item : signature_item -> unit
-    val enter_module_type_declaration : module_type_declaration -> unit
-    val enter_module_type : module_type -> unit
-    val enter_module_expr : module_expr -> unit
-    val enter_with_constraint : with_constraint -> unit
-    val enter_class_signature : class_signature -> unit
-    val enter_class_description : class_description -> unit
-    val enter_class_type_declaration : class_type_declaration -> unit
-    val enter_class_type : class_type -> unit
-    val enter_class_type_field : class_type_field -> unit
-    val enter_core_type : core_type -> unit
-    val enter_structure_item : structure_item -> unit
-
-
-    val leave_structure : structure -> unit
-    val leave_value_description : value_description -> unit
-    val leave_type_extension : type_extension -> unit
-    val leave_extension_constructor : extension_constructor -> unit
-    val leave_pattern : pattern -> unit
-    val leave_expression : expression -> unit
-    val leave_package_type : package_type -> unit
-    val leave_signature : signature -> unit
-    val leave_signature_item : signature_item -> unit
-    val leave_module_type_declaration : module_type_declaration -> unit
-    val leave_module_type : module_type -> unit
-    val leave_module_expr : module_expr -> unit
-    val leave_with_constraint : with_constraint -> unit
-    val leave_class_signature : class_signature -> unit
-    val leave_class_description : class_description -> unit
-    val leave_class_type_declaration : class_type_declaration -> unit
-    val leave_class_type : class_type -> unit
-    val leave_class_type_field : class_type_field -> unit
-    val leave_core_type : core_type -> unit
-    val leave_structure_item : structure_item -> unit
-
-    val enter_bindings : rec_flag -> unit
-    val enter_binding : value_binding -> unit
-    val leave_binding : value_binding -> unit
-    val leave_bindings : rec_flag -> unit
-
-    val enter_type_declarations : rec_flag -> unit
-    val enter_type_declaration : type_declaration -> unit
-    val leave_type_declaration : type_declaration -> unit
-    val leave_type_declarations : rec_flag -> unit
-
-end
-
-module [@warning "-67"] MakeIterator :
-  functor (Iter : IteratorArgument) ->
-    sig
-      val iter_structure : structure -> unit
-      val iter_signature : signature -> unit
-      val iter_structure_item : structure_item -> unit
-      val iter_signature_item : signature_item -> unit
-      val iter_expression : expression -> unit
-      val iter_module_type : module_type -> unit
-      val iter_pattern : pattern -> unit
-    end
-
-module DefaultIteratorArgument : IteratorArgument
diff --git a/jscomp/ml/typedtreeMap.ml b/jscomp/ml/typedtreeMap.ml
deleted file mode 100644
index 7d4119b..0000000
--- a/jscomp/ml/typedtreeMap.ml
+++ /dev/null
@@ -1,633 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                   Fabrice Le Fessant, INRIA Saclay                     *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Typedtree
-
-module type MapArgument = sig
-  val enter_structure : structure -> structure
-  val enter_value_description : value_description -> value_description
-  val enter_type_declaration : type_declaration -> type_declaration
-  val enter_type_extension : type_extension -> type_extension
-  val enter_extension_constructor :
-    extension_constructor -> extension_constructor
-  val enter_pattern : pattern -> pattern
-  val enter_expression : expression -> expression
-  val enter_package_type : package_type -> package_type
-  val enter_signature : signature -> signature
-  val enter_signature_item : signature_item -> signature_item
-  val enter_module_type_declaration :
-      module_type_declaration -> module_type_declaration
-  val enter_module_type : module_type -> module_type
-  val enter_module_expr : module_expr -> module_expr
-  val enter_with_constraint : with_constraint -> with_constraint
-  val enter_class_signature : class_signature -> class_signature
-
-  val enter_class_description : class_description -> class_description
-  val enter_class_type_declaration :
-    class_type_declaration -> class_type_declaration
-  val enter_class_type : class_type -> class_type
-  val enter_class_type_field : class_type_field -> class_type_field
-  val enter_core_type : core_type -> core_type
-  val enter_structure_item : structure_item -> structure_item
-
-  val leave_structure : structure -> structure
-  val leave_value_description : value_description -> value_description
-  val leave_type_declaration : type_declaration -> type_declaration
-  val leave_type_extension : type_extension -> type_extension
-  val leave_extension_constructor :
-    extension_constructor -> extension_constructor
-  val leave_pattern : pattern -> pattern
-  val leave_expression : expression -> expression
-  val leave_package_type : package_type -> package_type
-  val leave_signature : signature -> signature
-  val leave_signature_item : signature_item -> signature_item
-  val leave_module_type_declaration :
-      module_type_declaration -> module_type_declaration
-  val leave_module_type : module_type -> module_type
-  val leave_module_expr : module_expr -> module_expr
-  val leave_with_constraint : with_constraint -> with_constraint
-  val leave_class_signature : class_signature -> class_signature
-
-  val leave_class_description : class_description -> class_description
-  val leave_class_type_declaration :
-    class_type_declaration -> class_type_declaration
-  val leave_class_type : class_type -> class_type
-  val leave_class_type_field : class_type_field -> class_type_field
-  val leave_core_type : core_type -> core_type
-  val leave_structure_item : structure_item -> structure_item
-
-end
-
-
-module MakeMap(Map : MapArgument) = struct
-
-  open Misc
-
-  let rec map_structure str =
-    let str = Map.enter_structure str in
-    let str_items = List.map map_structure_item str.str_items in
-    Map.leave_structure { str with str_items = str_items }
-
-  and map_binding vb =
-    {
-      vb_pat = map_pattern vb.vb_pat;
-      vb_expr = map_expression vb.vb_expr;
-      vb_attributes = vb.vb_attributes;
-      vb_loc = vb.vb_loc;
-    }
-
-  and map_bindings list =
-    List.map map_binding list
-
-  and map_case {c_lhs; c_guard; c_rhs} =
-    {
-     c_lhs = map_pattern c_lhs;
-     c_guard = may_map map_expression c_guard;
-     c_rhs = map_expression c_rhs;
-    }
-
-  and map_cases list =
-    List.map map_case list
-
-  and map_structure_item item =
-    let item = Map.enter_structure_item item in
-    let str_desc =
-      match item.str_desc with
-          Tstr_eval (exp, attrs) -> Tstr_eval (map_expression exp, attrs)
-        | Tstr_value (rec_flag, list) ->
-          Tstr_value (rec_flag, map_bindings list)
-        | Tstr_primitive vd ->
-          Tstr_primitive (map_value_description vd)
-        | Tstr_type (rf, list) ->
-          Tstr_type (rf, List.map map_type_declaration list)
-        | Tstr_typext tyext ->
-          Tstr_typext (map_type_extension tyext)
-        | Tstr_exception ext ->
-          Tstr_exception (map_extension_constructor ext)
-        | Tstr_module x ->
-          Tstr_module (map_module_binding x)
-        | Tstr_recmodule list ->
-          let list = List.map map_module_binding list in
-          Tstr_recmodule list
-        | Tstr_modtype mtd ->
-          Tstr_modtype (map_module_type_declaration mtd)
-        | Tstr_open od -> Tstr_open od
-        | Tstr_class () -> assert false        
-        | Tstr_class_type list ->
-          let list =
-            List.map
-              (fun (id, name, ct) ->
-               id, name, map_class_type_declaration ct)
-              list
-          in
-            Tstr_class_type list
-        | Tstr_include incl ->
-          Tstr_include {incl with incl_mod = map_module_expr incl.incl_mod}
-        | Tstr_attribute x -> Tstr_attribute x
-    in
-    Map.leave_structure_item { item with str_desc = str_desc}
-
-  and map_module_binding x =
-    {x with mb_expr = map_module_expr x.mb_expr}
-
-  and map_value_description v =
-    let v = Map.enter_value_description v in
-    let val_desc = map_core_type v.val_desc in
-    Map.leave_value_description { v with val_desc = val_desc }
-
-  and map_type_declaration decl =
-    let decl = Map.enter_type_declaration decl in
-    let typ_params = List.map map_type_parameter decl.typ_params in
-    let typ_cstrs = List.map (fun (ct1, ct2, loc) ->
-      (map_core_type ct1,
-       map_core_type ct2,
-       loc)
-    ) decl.typ_cstrs in
-    let typ_kind = match decl.typ_kind with
-        Ttype_abstract -> Ttype_abstract
-      | Ttype_variant list ->
-          let list = List.map map_constructor_declaration list in
-          Ttype_variant list
-      | Ttype_record list ->
-        let list =
-          List.map
-            (fun ld ->
-              {ld with ld_type = map_core_type ld.ld_type}
-            ) list
-        in
-        Ttype_record list
-      | Ttype_open -> Ttype_open
-    in
-    let typ_manifest = may_map map_core_type decl.typ_manifest in
-    Map.leave_type_declaration { decl with typ_params = typ_params;
-      typ_cstrs = typ_cstrs; typ_kind = typ_kind; typ_manifest = typ_manifest }
-
-  and map_type_parameter (ct, v) = (map_core_type ct, v)
-
-  and map_constructor_arguments = function
-    | Cstr_tuple l ->
-        Cstr_tuple (List.map map_core_type l)
-    | Cstr_record l ->
-        Cstr_record
-          (List.map (fun ld -> {ld with ld_type = map_core_type ld.ld_type})
-             l)
-
-  and map_constructor_declaration cd =
-    let cd_args = map_constructor_arguments cd.cd_args in
-    {cd with cd_args;
-     cd_res = may_map map_core_type cd.cd_res
-    }
-
-  and map_type_extension tyext =
-    let tyext = Map.enter_type_extension tyext in
-    let tyext_params = List.map map_type_parameter tyext.tyext_params in
-    let tyext_constructors  =
-      List.map map_extension_constructor tyext.tyext_constructors
-    in
-    Map.leave_type_extension { tyext with tyext_params = tyext_params;
-      tyext_constructors = tyext_constructors }
-
-  and map_extension_constructor ext =
-    let ext = Map.enter_extension_constructor ext in
-    let ext_kind = match ext.ext_kind with
-        Text_decl(args, ret) ->
-          let args = map_constructor_arguments args in
-          let ret = may_map map_core_type ret in
-            Text_decl(args, ret)
-      | Text_rebind(p, lid) -> Text_rebind(p, lid)
-    in
-    Map.leave_extension_constructor {ext with ext_kind = ext_kind}
-
-  and map_pattern pat =
-    let pat = Map.enter_pattern pat in
-    let pat_desc =
-      match pat.pat_desc with
-        | Tpat_alias (pat1, p, text) ->
-          let pat1 = map_pattern pat1 in
-          Tpat_alias (pat1, p, text)
-        | Tpat_tuple list -> Tpat_tuple (List.map map_pattern list)
-        | Tpat_construct (lid, cstr_decl, args) ->
-          Tpat_construct (lid, cstr_decl,
-                          List.map map_pattern args)
-        | Tpat_variant (label, pato, rowo) ->
-          let pato = match pato with
-              None -> pato
-            | Some pat -> Some (map_pattern pat)
-          in
-          Tpat_variant (label, pato, rowo)
-        | Tpat_record (list, closed) ->
-          Tpat_record (List.map (fun (lid, lab_desc, pat) ->
-            (lid, lab_desc, map_pattern pat) ) list, closed)
-        | Tpat_array list -> Tpat_array (List.map map_pattern list)
-        | Tpat_or (p1, p2, rowo) ->
-          Tpat_or (map_pattern p1, map_pattern p2, rowo)
-        | Tpat_lazy p -> Tpat_lazy (map_pattern p)
-        | Tpat_constant _
-        | Tpat_any
-        | Tpat_var _ -> pat.pat_desc
-
-    in
-    let pat_extra = List.map map_pat_extra pat.pat_extra in
-    Map.leave_pattern { pat with pat_desc = pat_desc; pat_extra = pat_extra }
-
-  and map_pat_extra pat_extra =
-    match pat_extra with
-      | Tpat_constraint ct, loc, attrs ->
-          (Tpat_constraint (map_core_type  ct), loc, attrs)
-      | (Tpat_type _ | Tpat_unpack | Tpat_open _ ), _, _ -> pat_extra
-
-  and map_expression exp =
-    let exp = Map.enter_expression exp in
-    let exp_desc =
-      match exp.exp_desc with
-          Texp_ident (_, _, _)
-        | Texp_constant _ -> exp.exp_desc
-        | Texp_let (rec_flag, list, exp) ->
-          Texp_let (rec_flag,
-                    map_bindings list,
-                    map_expression exp)
-        | Texp_function { arg_label; param; cases; partial; } ->
-          Texp_function { arg_label; param; cases = map_cases cases; partial; }
-        | Texp_apply (exp, list) ->
-          Texp_apply (map_expression exp,
-                      List.map (fun (label, expo) ->
-                        let expo =
-                          match expo with
-                              None -> expo
-                            | Some exp -> Some (map_expression exp)
-                        in
-                        (label, expo)
-                      ) list )
-        | Texp_match (exp, list1, list2, partial) ->
-          Texp_match (
-            map_expression exp,
-            map_cases list1,
-            map_cases list2,
-            partial
-          )
-        | Texp_try (exp, list) ->
-          Texp_try (
-            map_expression exp,
-            map_cases list
-          )
-        | Texp_tuple list ->
-          Texp_tuple (List.map map_expression list)
-        | Texp_construct (lid, cstr_desc, args) ->
-          Texp_construct (lid, cstr_desc,
-                          List.map map_expression args )
-        | Texp_variant (label, expo) ->
-          let expo =match expo with
-              None -> expo
-            | Some exp -> Some (map_expression exp)
-          in
-          Texp_variant (label, expo)
-        | Texp_record { fields; representation; extended_expression } ->
-          let fields =
-            Array.map (function
-                | label, Kept t -> label, Kept t
-                | label, Overridden (lid, exp) ->
-                    label, Overridden (lid, map_expression exp))
-              fields
-          in
-          let extended_expression = match extended_expression with
-              None -> extended_expression
-            | Some exp -> Some (map_expression exp)
-          in
-          Texp_record { fields; representation; extended_expression }
-        | Texp_field (exp, lid, label) ->
-          Texp_field (map_expression exp, lid, label)
-        | Texp_setfield (exp1, lid, label, exp2) ->
-          Texp_setfield (
-            map_expression exp1,
-            lid,
-            label,
-            map_expression exp2)
-        | Texp_array list ->
-          Texp_array (List.map map_expression list)
-        | Texp_ifthenelse (exp1, exp2, expo) ->
-          Texp_ifthenelse (
-            map_expression exp1,
-            map_expression exp2,
-            match expo with
-                None -> expo
-              | Some exp -> Some (map_expression exp)
-          )
-        | Texp_sequence (exp1, exp2) ->
-          Texp_sequence (
-            map_expression exp1,
-            map_expression exp2
-          )
-        | Texp_while (exp1, exp2) ->
-          Texp_while (
-            map_expression exp1,
-            map_expression exp2
-          )
-        | Texp_for (id, name, exp1, exp2, dir, exp3) ->
-          Texp_for (
-            id, name,
-            map_expression exp1,
-            map_expression exp2,
-            dir,
-            map_expression exp3
-          )
-        | Texp_send (exp, meth, expo) ->
-          Texp_send (map_expression exp, meth, may_map map_expression expo)
-        | Texp_new _ 
-        | Texp_instvar _ 
-        | Texp_setinstvar _ 
-        | Texp_override _ -> 
-          assert false
-        | Texp_letmodule (id, name, mexpr, exp) ->
-          Texp_letmodule (
-            id, name,
-            map_module_expr mexpr,
-            map_expression exp
-          )
-        | Texp_letexception (cd, exp) ->
-          Texp_letexception (
-            map_extension_constructor cd,
-            map_expression exp
-          )
-        | Texp_assert exp -> Texp_assert (map_expression exp)
-        | Texp_lazy exp -> Texp_lazy (map_expression exp)
-        | Texp_object () ->
-          Texp_object ()
-        | Texp_pack (mexpr) ->
-          Texp_pack (map_module_expr mexpr)
-        | Texp_unreachable ->
-          Texp_unreachable
-        | Texp_extension_constructor _ as e ->
-          e
-    in
-    let exp_extra = List.map map_exp_extra exp.exp_extra in
-    Map.leave_expression {
-      exp with
-        exp_desc = exp_desc;
-        exp_extra = exp_extra; }
-
-  and map_exp_extra ((desc, loc, attrs) as exp_extra) =
-    match desc with
-      | Texp_constraint ct ->
-        Texp_constraint (map_core_type ct), loc, attrs
-      | Texp_coerce (None, ct) ->
-        Texp_coerce (None, map_core_type ct), loc, attrs
-      | Texp_coerce (Some ct1, ct2) ->
-        Texp_coerce (Some (map_core_type ct1),
-                         map_core_type ct2), loc, attrs
-      | Texp_poly (Some ct) ->
-        Texp_poly (Some ( map_core_type ct )), loc, attrs
-      | Texp_newtype _
-      | Texp_open _
-      | Texp_poly None -> exp_extra
-
-
-  and map_package_type pack =
-    let pack = Map.enter_package_type pack in
-    let pack_fields = List.map (
-      fun (s, ct) -> (s, map_core_type ct) ) pack.pack_fields in
-    Map.leave_package_type { pack with pack_fields = pack_fields }
-
-  and map_signature sg =
-    let sg = Map.enter_signature sg in
-    let sig_items = List.map map_signature_item sg.sig_items in
-    Map.leave_signature { sg with sig_items = sig_items }
-
-  and map_signature_item item =
-    let item = Map.enter_signature_item item in
-    let sig_desc =
-      match item.sig_desc with
-          Tsig_value vd ->
-            Tsig_value (map_value_description vd)
-        | Tsig_type (rf, list) ->
-            Tsig_type (rf, List.map map_type_declaration list)
-        | Tsig_typext tyext ->
-            Tsig_typext (map_type_extension tyext)
-        | Tsig_exception ext ->
-            Tsig_exception (map_extension_constructor ext)
-        | Tsig_module md ->
-            Tsig_module {md with md_type = map_module_type md.md_type}
-        | Tsig_recmodule list ->
-            Tsig_recmodule
-                (List.map
-                   (fun md -> {md with md_type = map_module_type md.md_type})
-                   list
-                )
-        | Tsig_modtype mtd ->
-            Tsig_modtype (map_module_type_declaration mtd)
-        | Tsig_open _ -> item.sig_desc
-        | Tsig_include incl ->
-            Tsig_include {incl with incl_mod = map_module_type incl.incl_mod}
-        | Tsig_class () -> Tsig_class ()
-        | Tsig_class_type list ->
-            Tsig_class_type (List.map map_class_type_declaration list)
-        | Tsig_attribute _ as x -> x
-    in
-    Map.leave_signature_item { item with sig_desc = sig_desc }
-
-  and map_module_type_declaration mtd =
-    let mtd = Map.enter_module_type_declaration mtd in
-    let mtd = {mtd with mtd_type = may_map map_module_type mtd.mtd_type} in
-    Map.leave_module_type_declaration mtd
-
-
-
-  and map_class_type_declaration cd =
-    let cd = Map.enter_class_type_declaration cd in
-    let ci_params = List.map map_type_parameter cd.ci_params in
-    let ci_expr = map_class_type cd.ci_expr in
-    Map.leave_class_type_declaration
-      { cd with ci_params = ci_params; ci_expr = ci_expr }
-
-  and map_module_type mty =
-    let mty = Map.enter_module_type mty in
-    let mty_desc =
-      match mty.mty_desc with
-          Tmty_ident _ -> mty.mty_desc
-        | Tmty_alias _ -> mty.mty_desc
-        | Tmty_signature sg -> Tmty_signature (map_signature sg)
-        | Tmty_functor (id, name, mtype1, mtype2) ->
-          Tmty_functor (id, name, Misc.may_map map_module_type mtype1,
-                        map_module_type mtype2)
-        | Tmty_with (mtype, list) ->
-          Tmty_with (map_module_type mtype,
-                     List.map (fun (path, lid, withc) ->
-                       (path, lid, map_with_constraint withc)
-                     ) list)
-        | Tmty_typeof mexpr ->
-          Tmty_typeof (map_module_expr mexpr)
-    in
-    Map.leave_module_type { mty with mty_desc = mty_desc}
-
-  and map_with_constraint cstr =
-    let cstr = Map.enter_with_constraint cstr in
-    let cstr =
-      match cstr with
-          Twith_type decl -> Twith_type (map_type_declaration decl)
-        | Twith_typesubst decl -> Twith_typesubst (map_type_declaration decl)
-        | Twith_module _ -> cstr
-        | Twith_modsubst _ -> cstr
-    in
-    Map.leave_with_constraint cstr
-
-  and map_module_expr mexpr =
-    let mexpr = Map.enter_module_expr mexpr in
-    let mod_desc =
-      match mexpr.mod_desc with
-          Tmod_ident _ -> mexpr.mod_desc
-        | Tmod_structure st -> Tmod_structure (map_structure st)
-        | Tmod_functor (id, name, mtype, mexpr) ->
-          Tmod_functor (id, name, Misc.may_map map_module_type mtype,
-                        map_module_expr mexpr)
-        | Tmod_apply (mexp1, mexp2, coercion) ->
-          Tmod_apply (map_module_expr mexp1, map_module_expr mexp2, coercion)
-        | Tmod_constraint (mexpr, mod_type, Tmodtype_implicit, coercion ) ->
-          Tmod_constraint (map_module_expr mexpr, mod_type,
-                           Tmodtype_implicit, coercion)
-        | Tmod_constraint (mexpr, mod_type,
-                           Tmodtype_explicit mtype, coercion) ->
-          Tmod_constraint (map_module_expr mexpr, mod_type,
-                           Tmodtype_explicit (map_module_type mtype),
-                           coercion)
-        | Tmod_unpack (exp, mod_type) ->
-          Tmod_unpack (map_expression exp, mod_type)
-    in
-    Map.leave_module_expr { mexpr with mod_desc = mod_desc }
-
-  and map_class_type ct =
-    let ct = Map.enter_class_type ct in
-    let cltyp_desc =
-      match ct.cltyp_desc with
-          Tcty_signature csg -> Tcty_signature (map_class_signature csg)
-        | Tcty_constr (path, lid, list) ->
-          Tcty_constr (path, lid, List.map map_core_type list)
-        | Tcty_arrow (label, ct, cl) ->
-          Tcty_arrow (label, map_core_type ct, map_class_type cl)
-        | Tcty_open (ovf, p, lid, env, e) ->
-          Tcty_open (ovf, p, lid, env, map_class_type e)
-    in
-    Map.leave_class_type { ct with cltyp_desc = cltyp_desc }
-
-  and map_class_signature cs =
-    let cs = Map.enter_class_signature cs in
-    let csig_self = map_core_type cs.csig_self in
-    let csig_fields = List.map map_class_type_field cs.csig_fields in
-    Map.leave_class_signature { cs with
-      csig_self = csig_self; csig_fields = csig_fields }
-
-
-  and map_class_type_field ctf =
-    let ctf = Map.enter_class_type_field ctf in
-    let ctf_desc =
-      match ctf.ctf_desc with
-          Tctf_inherit ct -> Tctf_inherit (map_class_type ct)
-        | Tctf_val (s, mut, virt, ct) ->
-          Tctf_val (s, mut, virt, map_core_type ct)
-        | Tctf_method (s, priv, virt, ct) ->
-          Tctf_method (s, priv, virt, map_core_type ct)
-        | Tctf_constraint (ct1, ct2) ->
-          Tctf_constraint (map_core_type ct1, map_core_type ct2)
-        | Tctf_attribute _ as x -> x
-    in
-    Map.leave_class_type_field { ctf with ctf_desc = ctf_desc }
-
-  and map_core_type ct =
-    let ct = Map.enter_core_type ct in
-    let ctyp_desc =
-      match ct.ctyp_desc with
-          Ttyp_any
-        | Ttyp_var _ -> ct.ctyp_desc
-        | Ttyp_arrow (label, ct1, ct2) ->
-          Ttyp_arrow (label, map_core_type ct1, map_core_type ct2)
-        | Ttyp_tuple list -> Ttyp_tuple (List.map map_core_type list)
-        | Ttyp_constr (path, lid, list) ->
-          Ttyp_constr (path, lid, List.map map_core_type list)
-        | Ttyp_object (list, o) ->
-          Ttyp_object
-            (List.map map_object_field list, o)
-        | Ttyp_class (path, lid, list) ->
-          Ttyp_class (path, lid, List.map map_core_type list)
-        | Ttyp_alias (ct, s) -> Ttyp_alias (map_core_type ct, s)
-        | Ttyp_variant (list, bool, labels) ->
-          Ttyp_variant (List.map map_row_field list, bool, labels)
-        | Ttyp_poly (list, ct) -> Ttyp_poly (list, map_core_type ct)
-        | Ttyp_package pack -> Ttyp_package (map_package_type pack)
-    in
-    Map.leave_core_type { ct with ctyp_desc = ctyp_desc }
-
-  and map_row_field rf =
-    match rf with
-        Ttag (label, attrs, bool, list) ->
-          Ttag (label, attrs, bool, List.map map_core_type list)
-      | Tinherit ct -> Tinherit (map_core_type ct)
-
-  and map_object_field ofield =
-    match ofield with
-        OTtag (label, attrs, ct) ->
-          OTtag (label, attrs, map_core_type ct)
-      | OTinherit ct -> OTinherit (map_core_type ct)
-
-end
-
-
-module DefaultMapArgument = struct
-
-  let enter_structure t = t
-  let enter_value_description t = t
-  let enter_type_declaration t = t
-  let enter_type_extension t = t
-  let enter_extension_constructor t = t
-  let enter_pattern t = t
-  let enter_expression t = t
-  let enter_package_type t = t
-  let enter_signature t = t
-  let enter_signature_item t = t
-  let enter_module_type_declaration t = t
-  let enter_module_type t = t
-  let enter_module_expr t = t
-  let enter_with_constraint t = t
-  let enter_class_signature t = t
-
-  let enter_class_description t = t
-  let enter_class_type_declaration t = t
-  let enter_class_type t = t
-  let enter_class_type_field t = t
-  let enter_core_type t = t
-  let enter_structure_item t = t
-
-
-  let leave_structure t = t
-  let leave_value_description t = t
-  let leave_type_declaration t = t
-  let leave_type_extension t = t
-  let leave_extension_constructor t = t
-  let leave_pattern t = t
-  let leave_expression t = t
-  let leave_package_type t = t
-  let leave_signature t = t
-  let leave_signature_item t = t
-  let leave_module_type_declaration t = t
-  let leave_module_type t = t
-  let leave_module_expr t = t
-  let leave_with_constraint t = t
-  let leave_class_signature t = t
-
-  let leave_class_description t = t
-  let leave_class_type_declaration t = t
-  let leave_class_type t = t
-  let leave_class_type_field t = t
-  let leave_core_type t = t
-  let leave_structure_item t = t
-
-end
diff --git a/jscomp/ml/typedtreeMap.mli b/jscomp/ml/typedtreeMap.mli
deleted file mode 100644
index ca23e62..0000000
--- a/jscomp/ml/typedtreeMap.mli
+++ /dev/null
@@ -1,85 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*                   Fabrice Le Fessant, INRIA Saclay                     *)
-(*                                                                        *)
-(*   Copyright 2012 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Typedtree
-
-module type MapArgument = sig
-  val enter_structure : structure -> structure
-  val enter_value_description : value_description -> value_description
-  val enter_type_declaration : type_declaration -> type_declaration
-  val enter_type_extension : type_extension -> type_extension
-  val enter_extension_constructor :
-    extension_constructor -> extension_constructor
-  val enter_pattern : pattern -> pattern
-  val enter_expression : expression -> expression
-  val enter_package_type : package_type -> package_type
-  val enter_signature : signature -> signature
-  val enter_signature_item : signature_item -> signature_item
-  val enter_module_type_declaration :
-      module_type_declaration -> module_type_declaration
-  val enter_module_type : module_type -> module_type
-  val enter_module_expr : module_expr -> module_expr
-  val enter_with_constraint : with_constraint -> with_constraint
-  val enter_class_signature : class_signature -> class_signature
-  val enter_class_description : class_description -> class_description
-  val enter_class_type_declaration :
-    class_type_declaration -> class_type_declaration
-  val enter_class_type : class_type -> class_type
-  val enter_class_type_field : class_type_field -> class_type_field
-  val enter_core_type : core_type -> core_type
-  val enter_structure_item : structure_item -> structure_item
-
-  val leave_structure : structure -> structure
-  val leave_value_description : value_description -> value_description
-  val leave_type_declaration : type_declaration -> type_declaration
-  val leave_type_extension : type_extension -> type_extension
-  val leave_extension_constructor :
-    extension_constructor -> extension_constructor
-  val leave_pattern : pattern -> pattern
-  val leave_expression : expression -> expression
-  val leave_package_type : package_type -> package_type
-  val leave_signature : signature -> signature
-  val leave_signature_item : signature_item -> signature_item
-  val leave_module_type_declaration :
-      module_type_declaration -> module_type_declaration
-  val leave_module_type : module_type -> module_type
-  val leave_module_expr : module_expr -> module_expr
-  val leave_with_constraint : with_constraint -> with_constraint
-  val leave_class_signature : class_signature -> class_signature
-  val leave_class_description : class_description -> class_description
-  val leave_class_type_declaration :
-    class_type_declaration -> class_type_declaration
-  val leave_class_type : class_type -> class_type
-  val leave_class_type_field : class_type_field -> class_type_field
-  val leave_core_type : core_type -> core_type
-  val leave_structure_item : structure_item -> structure_item
-
-end
-
-module MakeMap :
-  functor
-    (Iter : MapArgument) ->
-sig
-  val map_structure : structure -> structure
-  val map_pattern : pattern -> pattern
-  val map_structure_item : structure_item -> structure_item
-  val map_expression : expression -> expression
-
-  val map_signature : signature -> signature
-  val map_signature_item : signature_item -> signature_item
-  val map_module_type : module_type -> module_type
-end
-
-module DefaultMapArgument : MapArgument
diff --git a/jscomp/ml/typemod.ml b/jscomp/ml/typemod.ml
deleted file mode 100644
index 76b9cf1..0000000
--- a/jscomp/ml/typemod.ml
+++ /dev/null
@@ -1,1935 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Misc
-open Longident
-open Path
-open Asttypes
-open Parsetree
-open Types
-open Format
-
-type error =
-    Cannot_apply of module_type
-  | Not_included of Includemod.error list
-  | Cannot_eliminate_dependency of module_type
-  | Signature_expected
-  | Structure_expected of module_type
-  | With_no_component of Longident.t
-  | With_mismatch of Longident.t * Includemod.error list
-  | With_makes_applicative_functor_ill_typed of
-      Longident.t * Path.t * Includemod.error list
-  | With_changes_module_alias of Longident.t * Ident.t * Path.t
-  | With_cannot_remove_constrained_type
-  | Repeated_name of string * string * Warnings.loc
-  | Non_generalizable of type_expr
-  | Non_generalizable_module of module_type
-  | Interface_not_compiled of string
-  | Not_allowed_in_functor_body
-  | Not_a_packed_module of type_expr
-  | Incomplete_packed_module of type_expr
-  | Scoping_pack of Longident.t * type_expr
-  | Recursive_module_require_explicit_type
-  | Apply_generative
-  | Cannot_scrape_alias of Path.t
-
-exception Error of Location.t * Env.t * error
-exception Error_forward of Location.error
-
-
-
-let rescript_hide_attributes (x : Typedtree.attributes) = 
-  match x with 
-  | [] -> false
-  | ({txt = "internal.local";_},_) :: _ -> true
-  | _ :: rest -> 
-    Ext_list.exists rest (fun (x,_) -> x.txt = "internal.local")
-
-let rescript_hide (x : Typedtree.structure_item_desc) = 
-  match x with 
-  | Tstr_module {mb_attributes} -> rescript_hide_attributes mb_attributes
-  | _ -> false
-  
-open Typedtree
-
-let fst3 (x,_,_) = x
-
-let rec path_concat head p =
-  match p with
-    Pident tail -> Pdot (Pident head, Ident.name tail, 0)
-  | Pdot (pre, s, pos) -> Pdot (path_concat head pre, s, pos)
-  | Papply _ -> assert false
-
-(* Extract a signature from a module type *)
-
-let extract_sig env loc mty =
-  match Env.scrape_alias env mty with
-    Mty_signature sg -> sg
-  | Mty_alias(_, path) ->
-      raise(Error(loc, env, Cannot_scrape_alias path))
-  | _ -> raise(Error(loc, env, Signature_expected))
-
-let extract_sig_open env loc mty =
-  match Env.scrape_alias env mty with
-    Mty_signature sg -> sg
-  | Mty_alias(_, path) ->
-      raise(Error(loc, env, Cannot_scrape_alias path))
-  | mty -> raise(Error(loc, env, Structure_expected mty))
-
-(* Compute the environment after opening a module *)
-
-let type_open_ ?used_slot ?toplevel ovf env loc lid =
-  let path = Typetexp.lookup_module ~load:true env lid.loc lid.txt in
-  match Env.open_signature ~loc ?used_slot ?toplevel ovf path env with
-  | Some env -> path, env
-  | None ->
-      let md = Env.find_module path env in
-      ignore (extract_sig_open env lid.loc md.md_type);
-      assert false
-
-let type_open ?toplevel env sod =
-  let (path, newenv) =
-    Builtin_attributes.warning_scope sod.popen_attributes
-      (fun () ->
-         type_open_ ?toplevel sod.popen_override env sod.popen_loc
-           sod.popen_lid
-      )
-  in
-  let od =
-    {
-      open_override = sod.popen_override;
-      open_path = path;
-      open_txt = sod.popen_lid;
-      open_attributes = sod.popen_attributes;
-      open_loc = sod.popen_loc;
-    }
-  in
-  (path, newenv, od)
-
-(* Record a module type *)
-let rm node =
-  Stypes.record (Stypes.Ti_mod node);
-  node
-
-(* Forward declaration, to be filled in by type_module_type_of *)
-let type_module_type_of_fwd :
-    (Env.t -> Parsetree.module_expr ->
-      Typedtree.module_expr * Types.module_type) ref
-  = ref (fun _env _m -> assert false)
-
-(* Merge one "with" constraint in a signature *)
-
-let rec add_rec_types env = function
-    Sig_type(id, decl, Trec_next) :: rem ->
-      add_rec_types (Env.add_type ~check:true id decl env) rem
-  | _ -> env
-
-let check_type_decl env loc id row_id newdecl decl rs rem =
-  let env = Env.add_type ~check:true id newdecl env in
-  let env =
-    match row_id with
-    | None -> env
-    | Some id -> Env.add_type ~check:false id newdecl env
-  in
-  let env = if rs = Trec_not then env else add_rec_types env rem in
-  Includemod.type_declarations ~loc env id newdecl decl;
-  Typedecl.check_coherence env loc id newdecl
-
-let update_rec_next rs rem =
-  match rs with
-    Trec_next -> rem
-  | Trec_first | Trec_not ->
-      match rem with
-        Sig_type (id, decl, Trec_next) :: rem ->
-          Sig_type (id, decl, rs) :: rem
-      | Sig_module (id, mty, Trec_next) :: rem ->
-          Sig_module (id, mty, rs) :: rem
-      | _ -> rem
-
-let make p n i =
-  let open Variance in
-  set May_pos p (set May_neg n (set May_weak n (set Inj i null)))
-
-let rec iter_path_apply p ~f =
-  match p with
-  | Pident _ -> ()
-  | Pdot (p, _, _) -> iter_path_apply p ~f
-  | Papply (p1, p2) ->
-     iter_path_apply p1 ~f;
-     iter_path_apply p2 ~f;
-     f p1 p2 (* after recursing, so we know both paths are well typed *)
-
-let path_is_strict_prefix =
-  let rec list_is_strict_prefix l ~prefix =
-    match l, prefix with
-    | [], [] -> false
-    | _ :: _, [] -> true
-    | [], _ :: _ -> false
-    | s1 :: t1, s2 :: t2 ->
-       String.equal s1 s2 && list_is_strict_prefix t1 ~prefix:t2
-  in
-  fun path ~prefix ->
-    match Path.flatten path, Path.flatten prefix with
-    | `Contains_apply, _ | _, `Contains_apply -> false
-    | `Ok (ident1, l1), `Ok (ident2, l2) ->
-       Ident.same ident1 ident2
-       && list_is_strict_prefix l1 ~prefix:l2
-
-let iterator_with_env env =
-  let env = ref env in
-  let super = Btype.type_iterators in
-  env, { super with
-    Btype.it_signature = (fun self sg ->
-      (* add all items to the env before recursing down, to handle recursive
-         definitions *)
-      let env_before = !env in
-      List.iter (fun i -> env := Env.add_item i !env) sg;
-      super.Btype.it_signature self sg;
-      env := env_before
-    );
-    Btype.it_module_type = (fun self -> function
-    | Mty_functor (param, mty_arg, mty_body) ->
-      may (self.Btype.it_module_type self) mty_arg;
-      let env_before = !env in
-      env := Env.add_module ~arg:true param (Btype.default_mty mty_arg) !env;
-      self.Btype.it_module_type self mty_body;
-      env := env_before;
-    | mty ->
-      super.Btype.it_module_type self mty
-    )
-  }
-
-let retype_applicative_functor_type ~loc env funct arg =
-  let mty_functor = (Env.find_module funct env).md_type in
-  let mty_arg = (Env.find_module arg env).md_type in
-  let mty_param =
-    match Env.scrape_alias env mty_functor with
-    | Mty_functor (_, Some mty_param, _) -> mty_param
-    | _ -> assert false (* could trigger due to MPR#7611 *)
-  in
-  let aliasable = not (Env.is_functor_arg arg env) in
-  ignore(Includemod.modtypes ~loc env
-           (Mtype.strengthen ~aliasable env mty_arg arg) mty_param)
-
-(* When doing a deep destructive substitution with type M.N.t := .., we change M
-   and M.N and so we have to check that uses of the modules other than just
-   extracting components from them still make sense. There are only two such
-   kinds of uses:
-   - applicative functor types: F(M).t might not be well typed anymore
-   - aliases: module A = M still makes sense but it doesn't mean the same thing
-     anymore, so it's forbidden until it's clear what we should do with it.
-   This function would be called with M.N.t and N.t to check for these uses. *)
-let check_usage_of_path_of_substituted_item paths env signature ~loc ~lid =
-  let iterator =
-    let env, super = iterator_with_env env in
-    { super with
-      Btype.it_signature_item = (fun self -> function
-      | Sig_module (id, { md_type = Mty_alias (_, aliased_path); _ }, _)
-        when List.exists
-               (fun path -> path_is_strict_prefix path ~prefix:aliased_path)
-               paths
-        ->
-         let e = With_changes_module_alias (lid.txt, id, aliased_path) in
-         raise(Error(loc, !env, e))
-      | sig_item ->
-         super.Btype.it_signature_item self sig_item
-      );
-      Btype.it_path = (fun referenced_path ->
-        iter_path_apply referenced_path ~f:(fun funct arg ->
-          if List.exists
-               (fun path -> path_is_strict_prefix path ~prefix:arg)
-               paths
-          then
-            let env = !env in
-            try retype_applicative_functor_type ~loc env funct arg
-            with Includemod.Error explanation ->
-              raise(Error(loc, env,
-                          With_makes_applicative_functor_ill_typed
-                            (lid.txt, referenced_path, explanation)))
-        )
-      );
-    }
-  in
-  iterator.Btype.it_signature iterator signature;
-  Btype.unmark_iterators.Btype.it_signature Btype.unmark_iterators signature
-
-let type_decl_is_alias sdecl = (* assuming no explicit constraint *)
-  match sdecl.ptype_manifest with
-  | Some {ptyp_desc = Ptyp_constr (lid, stl)}
-       when List.length stl = List.length sdecl.ptype_params ->
-     begin
-       match
-         List.iter2 (fun x (y, _) ->
-             match x, y with
-               {ptyp_desc=Ptyp_var sx}, {ptyp_desc=Ptyp_var sy}
-                  when sx = sy -> ()
-             | _, _ -> raise Exit)
-           stl sdecl.ptype_params;
-       with
-       | exception Exit -> None
-       | () -> Some lid
-     end
-  | _ -> None
-;;
-
-let params_are_constrained =
-  let rec loop = function
-    | [] -> false
-    | hd :: tl ->
-       match (Btype.repr hd).desc with
-       | Tvar _ -> List.memq hd tl || loop tl
-       | _ -> true
-  in
-  loop
-;;
-
-let merge_constraint initial_env loc sg constr =
-  let lid =
-    match constr with
-    | Pwith_type (lid, _) | Pwith_module (lid, _)
-    | Pwith_typesubst (lid, _) | Pwith_modsubst (lid, _) -> lid
-  in
-  let destructive_substitution =
-    match constr with
-    | Pwith_type _ | Pwith_module _ -> false
-    | Pwith_typesubst _ | Pwith_modsubst _ -> true
-  in
-  let real_ids = ref [] in
-  let rec merge env sg namelist row_id =
-    match (sg, namelist, constr) with
-      ([], _, _) ->
-        raise(Error(loc, env, With_no_component lid.txt))
-    | (Sig_type(id, decl, rs) :: rem, [s],
-       Pwith_type (_, ({ptype_kind = Ptype_abstract} as sdecl)))
-      when Ident.name id = s && Typedecl.is_fixed_type sdecl ->
-        let decl_row =
-          { type_params =
-              List.map (fun _ -> Btype.newgenvar()) sdecl.ptype_params;
-            type_arity = List.length sdecl.ptype_params;
-            type_kind = Type_abstract;
-            type_private = Private;
-            type_manifest = None;
-            type_variance =
-              List.map
-                (fun (_, v) ->
-                   let (c, n) =
-                     match v with
-                     | Covariant -> true, false
-                     | Contravariant -> false, true
-                     | Invariant -> false, false
-                   in
-                   make (not n) (not c) false
-                )
-                sdecl.ptype_params;
-            type_loc = sdecl.ptype_loc;
-            type_newtype_level = None;
-            type_attributes = [];
-            type_immediate = false;
-            type_unboxed = unboxed_false_default_false;
-          }
-        and id_row = Ident.create (s^"#row") in
-        let initial_env =
-          Env.add_type ~check:false id_row decl_row initial_env
-        in
-        let tdecl = Typedecl.transl_with_constraint
-                        initial_env id (Some(Pident id_row)) decl sdecl in
-        let newdecl = tdecl.typ_type in
-        check_type_decl env sdecl.ptype_loc id row_id newdecl decl rs rem;
-        let decl_row = {decl_row with type_params = newdecl.type_params} in
-        let rs' = if rs = Trec_first then Trec_not else rs in
-        (Pident id, lid, Twith_type tdecl),
-        Sig_type(id_row, decl_row, rs') :: Sig_type(id, newdecl, rs) :: rem
-    | (Sig_type(id, decl, rs) :: rem , [s], Pwith_type (_, sdecl))
-      when Ident.name id = s ->
-        let tdecl =
-          Typedecl.transl_with_constraint initial_env id None decl sdecl in
-        let newdecl = tdecl.typ_type in
-        check_type_decl env sdecl.ptype_loc id row_id newdecl decl rs rem;
-        (Pident id, lid, Twith_type tdecl), Sig_type(id, newdecl, rs) :: rem
-    | (Sig_type(id, _, _) :: rem, [s], (Pwith_type _ | Pwith_typesubst _))
-      when Ident.name id = s ^ "#row" ->
-        merge env rem namelist (Some id)
-    | (Sig_type(id, decl, rs) :: rem, [s], Pwith_typesubst (_, sdecl))
-      when Ident.name id = s ->
-        (* Check as for a normal with constraint, but discard definition *)
-        let tdecl =
-          Typedecl.transl_with_constraint initial_env id None decl sdecl in
-        let newdecl = tdecl.typ_type in
-        check_type_decl env sdecl.ptype_loc id row_id newdecl decl rs rem;
-        real_ids := [Pident id];
-        (Pident id, lid, Twith_typesubst tdecl),
-        update_rec_next rs rem
-    | (Sig_module(id, md, rs) :: rem, [s], Pwith_module (_, lid'))
-      when Ident.name id = s ->
-        let path, md' = Typetexp.find_module initial_env loc lid'.txt in
-        let md'' = {md' with md_type = Mtype.remove_aliases env md'.md_type} in
-        let newmd = Mtype.strengthen_decl ~aliasable:false env md'' path in
-        ignore(Includemod.modtypes ~loc env newmd.md_type md.md_type);
-        (Pident id, lid, Twith_module (path, lid')),
-        Sig_module(id, newmd, rs) :: rem
-    | (Sig_module(id, md, rs) :: rem, [s], Pwith_modsubst (_, lid'))
-      when Ident.name id = s ->
-        let path, md' = Typetexp.find_module initial_env loc lid'.txt in
-        let newmd = Mtype.strengthen_decl ~aliasable:false env md' path in
-        ignore(Includemod.modtypes ~loc env newmd.md_type md.md_type);
-        real_ids := [Pident id];
-        (Pident id, lid, Twith_modsubst (path, lid')),
-        update_rec_next rs rem
-    | (Sig_module(id, md, rs) :: rem, s :: namelist, _)
-      when Ident.name id = s ->
-        let ((path, _path_loc, tcstr), newsg) =
-          merge env (extract_sig env loc md.md_type) namelist None in
-        let path = path_concat id path in
-        real_ids := path :: !real_ids;
-        let item = Sig_module(id, {md with md_type=Mty_signature newsg}, rs) in
-        (path, lid, tcstr),
-        item :: rem
-    | (item :: rem, _, _) ->
-        let (cstr, items) = merge (Env.add_item item env) rem namelist row_id
-        in
-        cstr, item :: items
-  in
-  try
-    let names = Longident.flatten lid.txt in
-    let (tcstr, sg) = merge initial_env sg names None in
-    if destructive_substitution then (
-      match List.rev !real_ids with
-      | [] -> assert false
-      | last :: rest ->
-        (* The last item is the one that's removed. We don't need to check how
-           it's used since it's replaced by a more specific type/module. *)
-        assert (match last with Pident _ -> true | _ -> false);
-        match rest with
-        | [] -> ()
-        | _ :: _ ->
-          check_usage_of_path_of_substituted_item
-            rest initial_env sg ~loc ~lid;
-    );
-    let sg =
-    match tcstr with
-    | (_, _, Twith_typesubst tdecl) ->
-       let how_to_extend_subst =
-         let sdecl =
-           match constr with
-           | Pwith_typesubst (_, sdecl) -> sdecl
-           | _ -> assert false
-         in
-         match type_decl_is_alias sdecl with
-         | Some lid ->
-            let replacement =
-              try Env.lookup_type lid.txt initial_env
-              with Not_found -> assert false
-            in
-            fun s path -> Subst.add_type_path path replacement s
-         | None ->
-            let body =
-              match tdecl.typ_type.type_manifest with
-              | None -> assert false
-              | Some x -> x
-            in
-            let params = tdecl.typ_type.type_params in
-            if params_are_constrained params
-            then raise(Error(loc, initial_env, With_cannot_remove_constrained_type));
-            fun s path -> Subst.add_type_function path ~params ~body s
-       in
-       let sub = List.fold_left how_to_extend_subst Subst.identity !real_ids in
-       Subst.signature sub sg
-    | (_, _, Twith_modsubst (real_path, _)) ->
-       let sub =
-         List.fold_left
-           (fun s path -> Subst.add_module_path path real_path s)
-           Subst.identity
-           !real_ids
-       in
-       Subst.signature sub sg
-    | _ ->
-       sg
-    in
-    (tcstr, sg)
-  with Includemod.Error explanation ->
-    raise(Error(loc, initial_env, With_mismatch(lid.txt, explanation)))
-
-(* Add recursion flags on declarations arising from a mutually recursive
-   block. *)
-
-let map_rec fn decls rem =
-  match decls with
-  | [] -> rem
-  | d1 :: dl -> fn Trec_first d1 :: map_end (fn Trec_next) dl rem
-
-let map_rec_type ~rec_flag fn decls rem =
-  match decls with
-  | [] -> rem
-  | d1 :: dl ->
-      let first =
-        match rec_flag with
-        | Recursive -> Trec_first
-        | Nonrecursive -> Trec_not
-      in
-      fn first d1 :: map_end (fn Trec_next) dl rem
-
-let rec map_rec_type_with_row_types ~rec_flag fn decls rem =
-  match decls with
-  | [] -> rem
-  | d1 :: dl ->
-      if Btype.is_row_name (Ident.name d1.typ_id) then
-        fn Trec_not d1 :: map_rec_type_with_row_types ~rec_flag fn dl rem
-      else
-        map_rec_type ~rec_flag fn decls rem
-
-(* Add type extension flags to extension constructors *)
-let map_ext fn exts rem =
-  match exts with
-  | [] -> rem
-  | d1 :: dl -> fn Text_first d1 :: map_end (fn Text_next) dl rem
-
-(* Auxiliary for translating recursively-defined module types.
-   Return a module type that approximates the shape of the given module
-   type AST.  Retain only module, type, and module type
-   components of signatures.  For types, retain only their arity,
-   making them abstract otherwise. *)
-
-let rec approx_modtype env smty =
-  match smty.pmty_desc with
-    Pmty_ident lid ->
-      let (path, _info) = Typetexp.find_modtype env smty.pmty_loc lid.txt in
-      Mty_ident path
-  | Pmty_alias lid ->
-      let path = Typetexp.lookup_module env smty.pmty_loc lid.txt in
-      Mty_alias(Mta_absent, path)
-  | Pmty_signature ssg ->
-      Mty_signature(approx_sig env ssg)
-  | Pmty_functor(param, sarg, sres) ->
-      let arg = may_map (approx_modtype env) sarg in
-      let (id, newenv) =
-        Env.enter_module ~arg:true param.txt (Btype.default_mty arg) env in
-      let res = approx_modtype newenv sres in
-      Mty_functor(id, arg, res)
-  | Pmty_with(sbody, _constraints) ->
-      approx_modtype env sbody
-  | Pmty_typeof smod ->
-      let (_, mty) = !type_module_type_of_fwd env smod in
-      mty
-  | Pmty_extension ext ->
-      raise (Error_forward (Builtin_attributes.error_of_extension ext))
-
-and approx_module_declaration env pmd =
-  {
-    Types.md_type = approx_modtype env pmd.pmd_type;
-    md_attributes = pmd.pmd_attributes;
-    md_loc = pmd.pmd_loc;
-  }
-
-and approx_sig env ssg =
-  match ssg with
-    [] -> []
-  | item :: srem ->
-      match item.psig_desc with
-      | Psig_type (rec_flag, sdecls) ->
-          let decls = Typedecl.approx_type_decl sdecls in
-          let rem = approx_sig env srem in
-          map_rec_type ~rec_flag
-            (fun rs (id, info) -> Sig_type(id, info, rs)) decls rem
-      | Psig_module pmd ->
-          let id = Ident.create pmd.pmd_name.txt in
-          let md = approx_module_declaration env pmd in
-          let newenv = Env.enter_module_declaration id md env in
-          Sig_module(id, md, Trec_not) :: approx_sig newenv srem
-      | Psig_recmodule sdecls ->
-          let decls =
-            List.map
-              (fun pmd ->
-                 (Ident.create pmd.pmd_name.txt,
-                  approx_module_declaration env pmd)
-              )
-              sdecls
-          in
-          let newenv =
-            List.fold_left
-              (fun env (id, md) -> Env.add_module_declaration ~check:false
-                  id md env)
-              env decls in
-          map_rec (fun rs (id, md) -> Sig_module(id, md, rs)) decls
-                  (approx_sig newenv srem)
-      | Psig_modtype d ->
-          let info = approx_modtype_info env d in
-          let (id, newenv) = Env.enter_modtype d.pmtd_name.txt info env in
-          Sig_modtype(id, info) :: approx_sig newenv srem
-      | Psig_open sod ->
-          let (_path, mty, _od) = type_open env sod in
-          approx_sig mty srem
-      | Psig_include sincl ->
-          let smty = sincl.pincl_mod in
-          let mty = approx_modtype env smty in
-          let sg = Subst.signature Subst.identity
-              (extract_sig env smty.pmty_loc mty) in
-          let newenv = Env.add_signature sg env in
-          sg @ approx_sig newenv srem
-      | Psig_class_type sdecls ->
-          let decls = Typeclass.approx_class_declarations env sdecls in
-          let rem = approx_sig env srem in
-          List.flatten
-            (map_rec
-               (fun rs decl ->
-                  let open Typeclass in
-                  [Sig_class_type(decl.clsty_ty_id, decl.clsty_ty_decl, rs);
-                   Sig_type(decl.clsty_obj_id, decl.clsty_obj_abbr, rs);
-                   Sig_type(decl.clsty_typesharp_id, decl.clsty_abbr, rs)])
-              decls [rem])
-      | Psig_class () -> assert false               
-      | _ ->
-          approx_sig env srem
-
-and approx_modtype_info env sinfo =
-  {
-   mtd_type = may_map (approx_modtype env) sinfo.pmtd_type;
-   mtd_attributes = sinfo.pmtd_attributes;
-   mtd_loc = sinfo.pmtd_loc;
-  }
-
-let approx_modtype env smty =
-  Warnings.without_warnings
-    (fun () -> approx_modtype env smty)
-
-(* Additional validity checks on type definitions arising from
-   recursive modules *)
-
-let check_recmod_typedecls env sdecls decls =
-  let recmod_ids = List.map fst3 decls in
-  List.iter2
-    (fun pmd (id, _, mty) ->
-       let mty = mty.mty_type in
-      List.iter
-        (fun path ->
-          Typedecl.check_recmod_typedecl env pmd.pmd_type.pmty_loc recmod_ids
-                                         path (Env.find_type path env))
-        (Mtype.type_paths env (Pident id) mty))
-    sdecls decls
-
-(* Auxiliaries for checking uniqueness of names in signatures and structures *)
-
-module StringSet =
-  Set.Make(struct type t = string let compare (x:t) y = String.compare x y end)
-
-let check cl loc tbl name =
-  match Hashtbl.find_opt tbl name with
-  | Some repeated_loc ->
-    raise(Error(loc, Env.empty, Repeated_name(cl, name, repeated_loc)))
-  | None -> Hashtbl.add tbl name loc
-
-type names =
-  {
-    types: (string, Warnings.loc) Hashtbl.t;
-    modules: (string, Warnings.loc) Hashtbl.t;
-    modtypes: (string, Warnings.loc) Hashtbl.t;
-    typexts: (string, Warnings.loc) Hashtbl.t;
-  }
-
-let new_names () =
-  {
-    types = (Hashtbl.create 10);
-    modules = (Hashtbl.create 10);
-    modtypes = (Hashtbl.create 10);
-    typexts = (Hashtbl.create 10);
-  }
-
-
-let check_name check names name = check names name.loc name.txt
-let check_type names loc s = check "type" loc names.types s
-let check_module names loc s = check "module" loc names.modules s
-let check_modtype names loc s = check "module type" loc names.modtypes s
-let check_typext names loc s = check "extension constructor" loc names.typexts s
-
-
-let check_sig_item names loc = function
-  | Sig_type(id, _, _) -> check_type names loc (Ident.name id)
-  | Sig_module(id, _, _) -> check_module names loc (Ident.name id)
-  | Sig_modtype(id, _) -> check_modtype names loc (Ident.name id)
-  | Sig_typext(id, _, _) -> check_typext names loc (Ident.name id)
-  | _ -> ()
-
-(* Simplify multiple specifications of a value or an extension in a signature.
-   (Other signature components, e.g. types, modules, etc, are checked for
-   name uniqueness.)  If multiple specifications with the same name,
-   keep only the last (rightmost) one. *)
-
-let simplify_signature sg =
-  let rec aux = function
-    | [] -> [], StringSet.empty
-    | (Sig_value(id, _descr) as component) :: sg ->
-        let (sg, val_names) as k = aux sg in
-        let name = Ident.name id in
-        if StringSet.mem name val_names then k
-        else (component :: sg, StringSet.add name val_names)
-    | component :: sg ->
-        let (sg, val_names) = aux sg in
-        (component :: sg, val_names)
-  in
-  let (sg, _) = aux sg in
-  sg
-
-(* Check and translate a module type expression *)
-
-let transl_modtype_longident loc env lid =
-  let (path, _info) = Typetexp.find_modtype env loc lid in
-  path
-
-let transl_module_alias loc env lid =
-  Typetexp.lookup_module env loc lid
-
-let mkmty desc typ env loc attrs =
-  let mty = {
-    mty_desc = desc;
-    mty_type = typ;
-    mty_loc = loc;
-    mty_env = env;
-    mty_attributes = attrs;
-    } in
-  Cmt_format.add_saved_type (Cmt_format.Partial_module_type mty);
-  mty
-
-let mksig desc env loc =
-  let sg = { sig_desc = desc; sig_loc = loc; sig_env = env } in
-  Cmt_format.add_saved_type (Cmt_format.Partial_signature_item sg);
-  sg
-
-(* let signature sg = List.map (fun item -> item.sig_type) sg *)
-
-let rec transl_modtype env smty =
-  Builtin_attributes.warning_scope smty.pmty_attributes
-    (fun () -> transl_modtype_aux env smty)
-
-and transl_modtype_aux env smty =
-  let loc = smty.pmty_loc in
-  match smty.pmty_desc with
-    Pmty_ident lid ->
-      let path = transl_modtype_longident loc env lid.txt in
-      mkmty (Tmty_ident (path, lid)) (Mty_ident path) env loc
-        smty.pmty_attributes
-  | Pmty_alias lid ->
-      let path = transl_module_alias loc env lid.txt in
-      mkmty (Tmty_alias (path, lid)) (Mty_alias(Mta_absent, path)) env loc
-        smty.pmty_attributes
-  | Pmty_signature ssg ->
-      let sg = transl_signature env ssg in
-      mkmty (Tmty_signature sg) (Mty_signature sg.sig_type) env loc
-        smty.pmty_attributes
-  | Pmty_functor(param, sarg, sres) ->
-      let arg = Misc.may_map (transl_modtype env) sarg in
-      let ty_arg = Misc.may_map (fun m -> m.mty_type) arg in
-      let (id, newenv) =
-        Env.enter_module ~arg:true param.txt (Btype.default_mty ty_arg) env in
-      Ctype.init_def(Ident.current_time()); (* PR#6513 *)
-      let res = transl_modtype newenv sres in
-      mkmty (Tmty_functor (id, param, arg, res))
-      (Mty_functor(id, ty_arg, res.mty_type)) env loc
-        smty.pmty_attributes
-  | Pmty_with(sbody, constraints) ->
-      let body = transl_modtype env sbody in
-      let init_sg = extract_sig env sbody.pmty_loc body.mty_type in
-      let (rev_tcstrs, final_sg) =
-        List.fold_left
-          (fun (rev_tcstrs,sg) sdecl ->
-            let (tcstr, sg) = merge_constraint env smty.pmty_loc sg sdecl
-            in
-            (tcstr :: rev_tcstrs, sg)
-        )
-        ([],init_sg) constraints in
-      mkmty (Tmty_with ( body, List.rev rev_tcstrs))
-        (Mtype.freshen (Mty_signature final_sg)) env loc
-        smty.pmty_attributes
-  | Pmty_typeof smod ->
-      let env = Env.in_signature false env in
-      let tmty, mty = !type_module_type_of_fwd env smod in
-      mkmty (Tmty_typeof tmty) mty env loc smty.pmty_attributes
-  | Pmty_extension ext ->
-      raise (Error_forward (Builtin_attributes.error_of_extension ext))
-
-and transl_signature env sg =
-  let names = new_names () in
-  let rec transl_sig env sg =
-    Ctype.init_def(Ident.current_time());
-    match sg with
-      [] -> [], [], env
-    | item :: srem ->
-        let loc = item.psig_loc in
-        match item.psig_desc with
-        | Psig_value sdesc ->
-            let (tdesc, newenv) =
-              Typedecl.transl_value_decl env item.psig_loc sdesc
-            in
-            let (trem,rem, final_env) = transl_sig newenv srem in
-            mksig (Tsig_value tdesc) env loc :: trem,
-            Sig_value(tdesc.val_id, tdesc.val_val) :: rem,
-              final_env
-        | Psig_type (rec_flag, sdecls) ->
-            List.iter
-              (fun decl -> check_name check_type names decl.ptype_name)
-              sdecls;
-            let (decls, newenv) =
-              Typedecl.transl_type_decl env rec_flag sdecls
-            in
-            let (trem, rem, final_env) = transl_sig newenv srem in
-            mksig (Tsig_type (rec_flag, decls)) env loc :: trem,
-            map_rec_type_with_row_types ~rec_flag
-              (fun rs td -> Sig_type(td.typ_id, td.typ_type, rs)) decls rem,
-            final_env
-        | Psig_typext styext ->
-            List.iter
-              (fun pext -> check_name check_typext names pext.pext_name)
-              styext.ptyext_constructors;
-            let (tyext, newenv) =
-              Typedecl.transl_type_extension false env item.psig_loc styext
-            in
-            let (trem, rem, final_env) = transl_sig newenv srem in
-            let constructors = tyext.tyext_constructors in
-              mksig (Tsig_typext tyext) env loc :: trem,
-              map_ext (fun es ext ->
-                Sig_typext(ext.ext_id, ext.ext_type, es)) constructors rem,
-              final_env
-        | Psig_exception sext ->
-            check_name check_typext names sext.pext_name;
-            let (ext, newenv) = Typedecl.transl_exception env sext in
-            let (trem, rem, final_env) = transl_sig newenv srem in
-            mksig (Tsig_exception ext) env loc :: trem,
-            Sig_typext(ext.ext_id, ext.ext_type, Text_exception) :: rem,
-            final_env
-        | Psig_module pmd ->
-            check_name check_module names pmd.pmd_name;
-            let id = Ident.create pmd.pmd_name.txt in
-            let tmty =
-              Builtin_attributes.warning_scope pmd.pmd_attributes
-                (fun () -> transl_modtype env pmd.pmd_type)
-            in
-            let md = {
-              md_type=tmty.mty_type;
-              md_attributes=pmd.pmd_attributes;
-              md_loc=pmd.pmd_loc;
-            }
-            in
-            let newenv = Env.enter_module_declaration id md env in
-            let (trem, rem, final_env) = transl_sig newenv srem in
-            mksig (Tsig_module {md_id=id; md_name=pmd.pmd_name; md_type=tmty;
-                                md_loc=pmd.pmd_loc;
-                                md_attributes=pmd.pmd_attributes})
-              env loc :: trem,
-            Sig_module(id, md, Trec_not) :: rem,
-            final_env
-        | Psig_recmodule sdecls ->
-            List.iter
-              (fun pmd -> check_name check_module names pmd.pmd_name)
-              sdecls;
-            let (decls, newenv) =
-              transl_recmodule_modtypes env sdecls in
-            let (trem, rem, final_env) = transl_sig newenv srem in
-            mksig (Tsig_recmodule decls) env loc :: trem,
-            map_rec (fun rs md ->
-                let d = {Types.md_type = md.md_type.mty_type;
-                         md_attributes = md.md_attributes;
-                         md_loc = md.md_loc;
-                        } in
-                Sig_module(md.md_id, d, rs))
-              decls rem,
-            final_env
-        | Psig_modtype pmtd ->
-            let newenv, mtd, sg =
-              transl_modtype_decl names env pmtd
-            in
-            let (trem, rem, final_env) = transl_sig newenv srem in
-            mksig (Tsig_modtype mtd) env loc :: trem,
-            sg :: rem,
-            final_env
-        | Psig_open sod ->
-            let (_path, newenv, od) = type_open env sod in
-            let (trem, rem, final_env) = transl_sig newenv srem in
-            mksig (Tsig_open od) env loc :: trem,
-            rem, final_env
-        | Psig_include sincl ->
-            let smty = sincl.pincl_mod in
-            let tmty =
-              Builtin_attributes.warning_scope sincl.pincl_attributes
-                (fun () -> transl_modtype env smty)
-            in
-            let mty = tmty.mty_type in
-            let sg = Subst.signature Subst.identity
-                       (extract_sig env smty.pmty_loc mty) in
-            List.iter (check_sig_item names item.psig_loc) sg;
-            let newenv = Env.add_signature sg env in
-            let incl =
-              { incl_mod = tmty;
-                incl_type = sg;
-                incl_attributes = sincl.pincl_attributes;
-                incl_loc = sincl.pincl_loc;
-              }
-            in
-            let (trem, rem, final_env) = transl_sig newenv srem  in
-            mksig (Tsig_include incl) env loc :: trem,
-            sg @ rem,
-            final_env
-        | Psig_class _ -> assert false        
-        | Psig_class_type cl ->
-            List.iter
-              (fun {pci_name} -> check_name check_type names pci_name)
-              cl;
-            let (classes, newenv) = Typeclass.class_type_declarations env cl in
-            let (trem,rem, final_env) = transl_sig newenv srem in
-            mksig (Tsig_class_type
-                     (List.map (fun decl -> decl.Typeclass.clsty_info) classes))
-              env loc :: trem,
-            List.flatten
-              (map_rec
-                 (fun rs decl ->
-                    let open Typeclass in
-                    [Sig_class_type(decl.clsty_ty_id, decl.clsty_ty_decl, rs);
-                     Sig_type(decl.clsty_obj_id, decl.clsty_obj_abbr, rs);
-                     Sig_type(decl.clsty_typesharp_id, decl.clsty_abbr, rs)])
-                 classes [rem]),
-            final_env
-        | Psig_attribute x ->
-            Builtin_attributes.warning_attribute x;
-            let (trem,rem, final_env) = transl_sig env srem in
-            mksig (Tsig_attribute x) env loc :: trem, rem, final_env
-        | Psig_extension (ext, _attrs) ->
-            raise (Error_forward (Builtin_attributes.error_of_extension ext))
-  in
-  let previous_saved_types = Cmt_format.get_saved_types () in
-  Builtin_attributes.warning_scope []
-    (fun () ->
-       let (trem, rem, final_env) = transl_sig (Env.in_signature true env) sg in
-       let rem = simplify_signature rem in
-       let sg = { sig_items = trem; sig_type =  rem; sig_final_env = final_env } in
-       Cmt_format.set_saved_types
-         ((Cmt_format.Partial_signature sg) :: previous_saved_types);
-       sg
-    )
-
-and transl_modtype_decl names env pmtd =
-  Builtin_attributes.warning_scope pmtd.pmtd_attributes
-    (fun () -> transl_modtype_decl_aux names env pmtd)
-
-and transl_modtype_decl_aux names env
-    {pmtd_name; pmtd_type; pmtd_attributes; pmtd_loc} =
-  check_name check_modtype names pmtd_name;
-  let tmty = Misc.may_map (transl_modtype env) pmtd_type in
-  let decl =
-    {
-     Types.mtd_type=may_map (fun t -> t.mty_type) tmty;
-     mtd_attributes=pmtd_attributes;
-     mtd_loc=pmtd_loc;
-    }
-  in
-  let (id, newenv) = Env.enter_modtype pmtd_name.txt decl env in
-  let mtd =
-    {
-     mtd_id=id;
-     mtd_name=pmtd_name;
-     mtd_type=tmty;
-     mtd_attributes=pmtd_attributes;
-     mtd_loc=pmtd_loc;
-    }
-  in
-  newenv, mtd, Sig_modtype(id, decl)
-
-and transl_recmodule_modtypes env sdecls =
-  let make_env curr =
-    List.fold_left
-      (fun env (id, _, mty) -> Env.add_module ~arg:true id mty env)
-      env curr in
-  let make_env2 curr =
-    List.fold_left
-      (fun env (id, _, mty) -> Env.add_module ~arg:true id mty.mty_type env)
-      env curr in
-  let transition env_c curr =
-    List.map2
-      (fun pmd (id, id_loc, _mty) ->
-        let tmty =
-          Builtin_attributes.warning_scope pmd.pmd_attributes
-            (fun () -> transl_modtype env_c pmd.pmd_type)
-        in
-        (id, id_loc, tmty))
-      sdecls curr in
-  let ids = List.map (fun x -> Ident.create x.pmd_name.txt) sdecls in
-  let approx_env =
-    (*
-       cf #5965
-       We use a dummy module type in order to detect a reference to one
-       of the module being defined during the call to approx_modtype.
-       It will be detected in Env.lookup_module.
-    *)
-    List.fold_left
-      (fun env id ->
-         let dummy = Mty_ident (Path.Pident (Ident.create "#recmod#")) in
-         Env.add_module ~arg:true id dummy env
-      )
-      env ids
-  in
-  Ctype.init_def(Ident.current_time()); (* PR#7082 *)
-  let init =
-    List.map2
-      (fun id pmd ->
-        (id, pmd.pmd_name, approx_modtype approx_env pmd.pmd_type))
-      ids sdecls
-  in
-  let env0 = make_env init in
-  let dcl1 =
-    Warnings.without_warnings
-      (fun () -> transition env0 init)
-  in
-  let env1 = make_env2 dcl1 in
-  check_recmod_typedecls env1 sdecls dcl1;
-  let dcl2 = transition env1 dcl1 in
-(*
-  List.iter
-    (fun (id, mty) ->
-      Format.printf "%a: %a@." Printtyp.ident id Printtyp.modtype mty)
-    dcl2;
-*)
-  let env2 = make_env2 dcl2 in
-  check_recmod_typedecls env2 sdecls dcl2;
-  let dcl2 =
-    List.map2
-      (fun pmd (id, id_loc, mty) ->
-        {md_id=id; md_name=id_loc; md_type=mty;
-         md_loc=pmd.pmd_loc;
-         md_attributes=pmd.pmd_attributes})
-      sdecls dcl2
-  in
-  (dcl2, env2)
-
-(* Try to convert a module expression to a module path. *)
-
-exception Not_a_path
-
-let rec path_of_module mexp =
-  match mexp.mod_desc with
-    Tmod_ident (p,_) -> p
-  | Tmod_apply(funct, arg, _coercion) when !Clflags.applicative_functors ->
-      Papply(path_of_module funct, path_of_module arg)
-  | Tmod_constraint (mexp, _, _, _) ->
-      path_of_module mexp
-  | _ -> raise Not_a_path
-
-let path_of_module mexp =
- try Some (path_of_module mexp) with Not_a_path -> None
-
-(* Check that all core type schemes in a structure are closed *)
-
-let rec closed_modtype env = function
-    Mty_ident _ -> true
-  | Mty_alias _ -> true
-  | Mty_signature sg ->
-      let env = Env.add_signature sg env in
-      List.for_all (closed_signature_item env) sg
-  | Mty_functor(id, param, body) ->
-      let env = Env.add_module ~arg:true id (Btype.default_mty param) env in
-      closed_modtype env body
-
-and closed_signature_item env = function
-    Sig_value(_id, desc) -> Ctype.closed_schema env desc.val_type
-  | Sig_module(_id, md, _) -> closed_modtype env md.md_type
-  | _ -> true
-
-let check_nongen_scheme env sig_item =
-  match sig_item with
-    Sig_value(_id, vd) ->
-      if not (Ctype.closed_schema env vd.val_type) then
-        raise (Error (vd.val_loc, env, Non_generalizable vd.val_type))
-  | Sig_module (_id, md, _) ->
-      if not (closed_modtype env md.md_type) then
-        raise(Error(md.md_loc, env, Non_generalizable_module md.md_type))
-  | _ -> ()
-
-let check_nongen_schemes env sg =
-  List.iter (check_nongen_scheme env) sg
-
-(* Helpers for typing recursive modules *)
-
-let anchor_submodule name anchor =
-  match anchor with None -> None | Some p -> Some(Pdot(p, name, nopos))
-let anchor_recmodule id =
-  Some (Pident id)
-
-let enrich_type_decls anchor decls oldenv newenv =
-  match anchor with
-    None -> newenv
-  | Some p ->
-      List.fold_left
-        (fun e info ->
-          let id = info.typ_id in
-          let info' =
-            Mtype.enrich_typedecl oldenv (Pdot(p, Ident.name id, nopos))
-              info.typ_type
-          in
-            Env.add_type ~check:true id info' e)
-        oldenv decls
-
-let enrich_module_type anchor name mty env =
-  match anchor with
-    None -> mty
-  | Some p -> Mtype.enrich_modtype env (Pdot(p, name, nopos)) mty
-
-let check_recmodule_inclusion env bindings =
-  (* PR#4450, PR#4470: consider
-        module rec X : DECL = MOD  where MOD has inferred type ACTUAL
-     The "natural" typing condition
-        E, X: ACTUAL |- ACTUAL <: DECL
-     leads to circularities through manifest types.
-     Instead, we "unroll away" the potential circularities a finite number
-     of times.  The (weaker) condition we implement is:
-        E, X: DECL,
-           X1: ACTUAL,
-           X2: ACTUAL{X <- X1}/X1
-           ...
-           Xn: ACTUAL{X <- X(n-1)}/X(n-1)
-        |- ACTUAL{X <- Xn}/Xn <: DECL{X <- Xn}
-     so that manifest types rooted at X(n+1) are expanded in terms of X(n),
-     avoiding circularities.  The strengthenings ensure that
-     Xn.t = X(n-1).t = ... = X2.t = X1.t.
-     N can be chosen arbitrarily; larger values of N result in more
-     recursive definitions being accepted.  A good choice appears to be
-     the number of mutually recursive declarations. *)
-
-  let subst_and_strengthen env s id mty =
-    Mtype.strengthen ~aliasable:false env (Subst.modtype s mty)
-      (Subst.module_path s (Pident id)) in
-
-  let rec check_incl first_time n env s =
-    if n > 0 then begin
-      (* Generate fresh names Y_i for the rec. bound module idents X_i *)
-      let bindings1 =
-        List.map
-          (fun (id, _, _mty_decl, _modl, mty_actual, _attrs, _loc) ->
-             (id, Ident.rename id, mty_actual))
-          bindings in
-      (* Enter the Y_i in the environment with their actual types substituted
-         by the input substitution s *)
-      let env' =
-        List.fold_left
-          (fun env (id, id', mty_actual) ->
-             let mty_actual' =
-               if first_time
-               then mty_actual
-               else subst_and_strengthen env s id mty_actual in
-             Env.add_module ~arg:false id' mty_actual' env)
-          env bindings1 in
-      (* Build the output substitution Y_i <- X_i *)
-      let s' =
-        List.fold_left
-          (fun s (id, id', _mty_actual) ->
-             Subst.add_module id (Pident id') s)
-          Subst.identity bindings1 in
-      (* Recurse with env' and s' *)
-      check_incl false (n-1) env' s'
-    end else begin
-      (* Base case: check inclusion of s(mty_actual) in s(mty_decl)
-         and insert coercion if needed *)
-      let check_inclusion (id, id_loc, mty_decl, modl, mty_actual, attrs, loc) =
-        let mty_decl' = Subst.modtype s mty_decl.mty_type
-        and mty_actual' = subst_and_strengthen env s id mty_actual in
-        let coercion =
-          try
-            Includemod.modtypes ~loc:modl.mod_loc env mty_actual' mty_decl'
-          with Includemod.Error msg ->
-            raise(Error(modl.mod_loc, env, Not_included msg)) in
-        let modl' =
-            { mod_desc = Tmod_constraint(modl, mty_decl.mty_type,
-                Tmodtype_explicit mty_decl, coercion);
-              mod_type = mty_decl.mty_type;
-              mod_env = env;
-              mod_loc = modl.mod_loc;
-              mod_attributes = [];
-             } in
-        {
-         mb_id = id;
-         mb_name = id_loc;
-         mb_expr = modl';
-         mb_attributes = attrs;
-         mb_loc = loc;
-        }
-      in
-      List.map check_inclusion bindings
-    end
-  in check_incl true (List.length bindings) env Subst.identity
-
-(* Helper for unpack *)
-
-let rec package_constraints env loc mty constrs =
-  if constrs = [] then mty
-  else let sg = extract_sig env loc mty in
-  let sg' =
-    List.map
-      (function
-        | Sig_type (id, ({type_params=[]} as td), rs)
-          when List.mem_assoc [Ident.name id] constrs ->
-            let ty = List.assoc [Ident.name id] constrs in
-            Sig_type (id, {td with type_manifest = Some ty}, rs)
-        | Sig_module (id, md, rs) ->
-            let rec aux = function
-              | (m :: ((_ :: _) as l), t) :: rest when m = Ident.name id ->
-                  (l, t) :: aux rest
-              | _ :: rest -> aux rest
-              | [] -> []
-            in
-            let md =
-              {md with
-               md_type = package_constraints env loc md.md_type (aux constrs)
-              }
-            in
-            Sig_module (id, md, rs)
-        | item -> item
-      )
-      sg
-  in
-  Mty_signature sg'
-
-let modtype_of_package env loc p nl tl =
-  try match (Env.find_modtype p env).mtd_type with
-  | Some mty when nl <> [] ->
-      package_constraints env loc mty
-        (List.combine (List.map Longident.flatten nl) tl)
-  | _ ->
-      if nl = [] then Mty_ident p
-      else raise(Error(loc, env, Signature_expected))
-  with Not_found ->
-    let error = Typetexp.Unbound_modtype (Ctype.lid_of_path p) in
-    raise(Typetexp.Error(loc, env, error))
-
-let package_subtype env p1 nl1 tl1 p2 nl2 tl2 =
-  let mkmty p nl tl =
-    let ntl =
-      Ext_list.filter (List.combine nl tl) (fun (_n,t) -> Ctype.free_variables t = [])
-    in
-    let (nl, tl) = List.split ntl in
-    modtype_of_package env Location.none p nl tl
-  in
-  let mty1 = mkmty p1 nl1 tl1 and mty2 = mkmty p2 nl2 tl2 in
-  try Includemod.modtypes ~loc:Location.none env mty1 mty2 = Tcoerce_none
-  with Includemod.Error _msg -> false
-    (* raise(Error(Location.none, env, Not_included msg)) *)
-
-let () = Ctype.package_subtype := package_subtype
-
-let wrap_constraint env arg mty explicit =
-  let coercion =
-    try
-      Includemod.modtypes ~loc:arg.mod_loc env arg.mod_type mty
-    with Includemod.Error msg ->
-      raise(Error(arg.mod_loc, env, Not_included msg)) in
-  { mod_desc = Tmod_constraint(arg, mty, explicit, coercion);
-    mod_type = mty;
-    mod_env = env;
-    mod_attributes = [];
-    mod_loc = arg.mod_loc }
-
-(* Type a module value expression *)
-
-let rec type_module ?(alias=false) sttn funct_body anchor env smod =
-  Builtin_attributes.warning_scope smod.pmod_attributes
-    (fun () -> type_module_aux ~alias sttn funct_body anchor env smod)
-
-and type_module_aux ~alias sttn funct_body anchor env smod =
-  match smod.pmod_desc with
-    Pmod_ident lid ->
-      let path =
-        Typetexp.lookup_module ~load:(not alias) env smod.pmod_loc lid.txt in
-      let md = { mod_desc = Tmod_ident (path, lid);
-                 mod_type = Mty_alias(Mta_absent, path);
-                 mod_env = env;
-                 mod_attributes = smod.pmod_attributes;
-                 mod_loc = smod.pmod_loc } in
-      let aliasable = not (Env.is_functor_arg path env) in
-      let md =
-        if alias && aliasable then
-          md
-        else match (Env.find_module path env).md_type with
-          Mty_alias(_, p1) when not alias ->
-            let p1 = Env.normalize_path (Some smod.pmod_loc) env p1 in
-            let mty = Includemod.expand_module_alias env [] p1 in
-            { md with
-              mod_desc = Tmod_constraint (md, mty, Tmodtype_implicit,
-                                          Tcoerce_alias (p1, Tcoerce_none));
-              mod_type =
-                if sttn then Mtype.strengthen ~aliasable:true env mty p1
-                else mty }
-        | mty ->
-            let mty =
-              if sttn then Mtype.strengthen ~aliasable env mty path
-              else mty
-            in
-            { md with mod_type = mty }
-      in rm md
-  | Pmod_structure sstr ->
-      let (str, sg, _finalenv) =
-        type_structure funct_body anchor env sstr smod.pmod_loc in
-      let md =
-        rm { mod_desc = Tmod_structure str;
-             mod_type = Mty_signature sg;
-             mod_env = env;
-             mod_attributes = smod.pmod_attributes;
-             mod_loc = smod.pmod_loc }
-      in
-      let sg' = simplify_signature sg in
-      if List.length sg' = List.length sg then md else
-      wrap_constraint (Env.implicit_coercion env) md (Mty_signature sg')
-        Tmodtype_implicit
-  | Pmod_functor(name, smty, sbody) ->
-      let mty = may_map (transl_modtype env) smty in
-      let ty_arg = may_map (fun m -> m.mty_type) mty in
-      let (id, newenv), funct_body =
-        match ty_arg with None -> (Ident.create "*", env), false
-        | Some mty -> Env.enter_module ~arg:true name.txt mty env, true in
-      Ctype.init_def(Ident.current_time()); (* PR#6981 *)
-      let body = type_module sttn funct_body None newenv sbody in
-      rm { mod_desc = Tmod_functor(id, name, mty, body);
-           mod_type = Mty_functor(id, ty_arg, body.mod_type);
-           mod_env = env;
-           mod_attributes = smod.pmod_attributes;
-           mod_loc = smod.pmod_loc }
-  | Pmod_apply(sfunct, sarg) ->
-      let arg = type_module true funct_body None env sarg in
-      let path = path_of_module arg in
-      let funct =
-        type_module (sttn && path <> None) funct_body None env sfunct in
-      begin match Env.scrape_alias env funct.mod_type with
-        Mty_functor(param, mty_param, mty_res) as mty_functor ->
-          let generative, mty_param =
-            (mty_param = None, Btype.default_mty mty_param) in
-          if generative then begin
-            if sarg.pmod_desc <> Pmod_structure [] then
-              raise (Error (sfunct.pmod_loc, env, Apply_generative));
-            if funct_body && Mtype.contains_type env funct.mod_type then
-              raise (Error (smod.pmod_loc, env, Not_allowed_in_functor_body));
-          end;
-          let coercion =
-            try
-              Includemod.modtypes ~loc:sarg.pmod_loc env arg.mod_type mty_param
-            with Includemod.Error msg ->
-              raise(Error(sarg.pmod_loc, env, Not_included msg)) in
-          let mty_appl =
-            match path with
-              Some path ->
-                Subst.modtype (Subst.add_module param path Subst.identity)
-                              mty_res
-            | None ->
-                if generative then mty_res else
-                try
-                  Mtype.nondep_supertype
-                    (Env.add_module ~arg:true param arg.mod_type env)
-                    param mty_res
-                with Not_found ->
-                  raise(Error(smod.pmod_loc, env,
-                              Cannot_eliminate_dependency mty_functor))
-          in
-          rm { mod_desc = Tmod_apply(funct, arg, coercion);
-               mod_type = mty_appl;
-               mod_env = env;
-               mod_attributes = smod.pmod_attributes;
-               mod_loc = smod.pmod_loc }
-      | Mty_alias(_, path) ->
-          raise(Error(sfunct.pmod_loc, env, Cannot_scrape_alias path))
-      | _ ->
-          raise(Error(sfunct.pmod_loc, env, Cannot_apply funct.mod_type))
-      end
-  | Pmod_constraint(sarg, smty) ->
-      let arg = type_module ~alias true funct_body anchor env sarg in
-      let mty = transl_modtype env smty in
-      rm {(wrap_constraint env arg mty.mty_type (Tmodtype_explicit mty)) with
-          mod_loc = smod.pmod_loc;
-          mod_attributes = smod.pmod_attributes;
-         }
-
-  | Pmod_unpack sexp ->
-      let exp = Typecore.type_exp env sexp in
-      let mty =
-        match Ctype.expand_head env exp.exp_type with
-          {desc = Tpackage (p, nl, tl)} ->
-            if List.exists (fun t -> Ctype.free_variables t <> []) tl then
-              raise (Error (smod.pmod_loc, env,
-                            Incomplete_packed_module exp.exp_type));
-            modtype_of_package env smod.pmod_loc p nl tl
-        | {desc = Tvar _} ->
-            raise (Typecore.Error
-                     (smod.pmod_loc, env, Typecore.Cannot_infer_signature))
-        | _ ->
-            raise (Error(smod.pmod_loc, env, Not_a_packed_module exp.exp_type))
-      in
-      if funct_body && Mtype.contains_type env mty then
-        raise (Error (smod.pmod_loc, env, Not_allowed_in_functor_body));
-      rm { mod_desc = Tmod_unpack(exp, mty);
-           mod_type = mty;
-           mod_env = env;
-           mod_attributes = smod.pmod_attributes;
-           mod_loc = smod.pmod_loc }
-  | Pmod_extension ext ->
-      raise (Error_forward (Builtin_attributes.error_of_extension ext))
-
-and type_structure ?(toplevel = false) funct_body anchor env sstr scope =
-  let names = new_names () in
-
-  let type_str_item env srem {pstr_loc = loc; pstr_desc = desc} =
-    match desc with
-    | Pstr_eval (sexpr, attrs) ->
-        let expr =
-          Builtin_attributes.warning_scope attrs
-            (fun () -> Typecore.type_expression env sexpr)
-        in
-        Tstr_eval (expr, attrs), [], env
-    | Pstr_value(rec_flag, sdefs) ->
-        let scope =
-          match rec_flag with
-          | Recursive ->
-              Some (Annot.Idef {scope with
-                                Location.loc_start = loc.Location.loc_start})
-          | Nonrecursive ->
-              let start =
-                match srem with
-                | [] -> loc.Location.loc_end
-                | {pstr_loc = loc2} :: _ -> loc2.Location.loc_start
-              in
-              Some (Annot.Idef {scope with Location.loc_start = start})
-        in
-        let (defs, newenv) =
-          Typecore.type_binding env rec_flag sdefs scope in
-        let () = if rec_flag = Recursive then
-          Rec_check.check_recursive_bindings defs
-        in
-        (* Note: Env.find_value does not trigger the value_used event. Values
-           will be marked as being used during the signature inclusion test. *)
-        Tstr_value(rec_flag, defs),
-        List.map (fun id -> Sig_value(id, Env.find_value (Pident id) newenv))
-          (let_bound_idents defs),
-        newenv
-    | Pstr_primitive sdesc ->
-        let (desc, newenv) = Typedecl.transl_value_decl env loc sdesc in
-        Tstr_primitive desc, [Sig_value(desc.val_id, desc.val_val)], newenv
-    | Pstr_type (rec_flag, sdecls) ->
-        List.iter
-          (fun decl -> check_name check_type names decl.ptype_name)
-          sdecls;
-        let (decls, newenv) = Typedecl.transl_type_decl env rec_flag sdecls in
-        Tstr_type (rec_flag, decls),
-        map_rec_type_with_row_types ~rec_flag
-          (fun rs info -> Sig_type(info.typ_id, info.typ_type, rs))
-          decls [],
-        enrich_type_decls anchor decls env newenv
-    | Pstr_typext styext ->
-        List.iter
-          (fun pext -> check_name check_typext names pext.pext_name)
-          styext.ptyext_constructors;
-        let (tyext, newenv) =
-          Typedecl.transl_type_extension true env loc styext
-        in
-        (Tstr_typext tyext,
-         map_ext
-           (fun es ext -> Sig_typext(ext.ext_id, ext.ext_type, es))
-           tyext.tyext_constructors [],
-         newenv)
-    | Pstr_exception sext ->
-        check_name check_typext names sext.pext_name;
-        let (ext, newenv) = Typedecl.transl_exception env sext in
-        Tstr_exception ext,
-        [Sig_typext(ext.ext_id, ext.ext_type, Text_exception)],
-        newenv
-    | Pstr_module {pmb_name = name; pmb_expr = smodl; pmb_attributes = attrs;
-                   pmb_loc;
-                  } ->
-        check_name check_module names name;
-        let id = Ident.create name.txt in (* create early for PR#6752 *)
-        let modl =
-          Builtin_attributes.warning_scope attrs
-            (fun () ->
-               type_module ~alias:true true funct_body
-                 (anchor_submodule name.txt anchor) env smodl
-            )
-        in
-        let md =
-          { md_type = enrich_module_type anchor name.txt modl.mod_type env;
-            md_attributes = attrs;
-            md_loc = pmb_loc;
-          }
-        in
-        (*prerr_endline (Ident.unique_toplevel_name id);*)
-        Mtype.lower_nongen (Ident.binding_time id - 1) md.md_type;
-        let newenv = Env.enter_module_declaration id md env in
-        Tstr_module {mb_id=id; mb_name=name; mb_expr=modl;
-                     mb_attributes=attrs;  mb_loc=pmb_loc;
-                    },
-        [Sig_module(id,
-                    {md_type = modl.mod_type;
-                     md_attributes = attrs;
-                     md_loc = pmb_loc;
-                    }, Trec_not)],
-        newenv
-    | Pstr_recmodule sbind ->
-        let sbind =
-          List.map
-            (function
-              | {pmb_name = name;
-                 pmb_expr = {pmod_desc=Pmod_constraint(expr, typ)};
-                 pmb_attributes = attrs;
-                 pmb_loc = loc;
-                } ->
-                  name, typ, expr, attrs, loc
-              | mb ->
-                  raise (Error (mb.pmb_expr.pmod_loc, env,
-                                Recursive_module_require_explicit_type))
-            )
-            sbind
-        in
-        List.iter
-          (fun (name, _, _, _, _) -> check_name check_module names name)
-          sbind;
-        let (decls, newenv) =
-          transl_recmodule_modtypes env
-            (List.map (fun (name, smty, _smodl, attrs, loc) ->
-                 {pmd_name=name; pmd_type=smty;
-                  pmd_attributes=attrs; pmd_loc=loc}) sbind
-            ) in
-        let bindings1 =
-          List.map2
-            (fun {md_id=id; md_type=mty} (name, _, smodl, attrs, loc) ->
-               let modl =
-                 Builtin_attributes.warning_scope attrs
-                   (fun () ->
-                      type_module true funct_body (anchor_recmodule id)
-                        newenv smodl
-                   )
-               in
-               let mty' =
-                 enrich_module_type anchor (Ident.name id) modl.mod_type newenv
-               in
-               (id, name, mty, modl, mty', attrs, loc))
-            decls sbind in
-        let newenv = (* allow aliasing recursive modules from outside *)
-          List.fold_left
-            (fun env md ->
-               let mdecl =
-                 {
-                   md_type = md.md_type.mty_type;
-                   md_attributes = md.md_attributes;
-                   md_loc = md.md_loc;
-                 }
-               in
-               Env.add_module_declaration ~check:true md.md_id mdecl env
-            )
-            env decls
-        in
-        let bindings2 =
-          check_recmodule_inclusion newenv bindings1 in
-        Tstr_recmodule bindings2,
-        map_rec (fun rs mb ->
-            Sig_module(mb.mb_id, {
-                md_type=mb.mb_expr.mod_type;
-                md_attributes=mb.mb_attributes;
-                md_loc=mb.mb_loc;
-              }, rs))
-           bindings2 [],
-        newenv
-    | Pstr_modtype pmtd ->
-        (* check that it is non-abstract *)
-        let newenv, mtd, sg =
-          transl_modtype_decl names env pmtd
-        in
-        Tstr_modtype mtd, [sg], newenv
-    | Pstr_open sod ->
-        let (_path, newenv, od) = type_open ~toplevel env sod in
-        Tstr_open od, [], newenv
-    | Pstr_class () ->
-      assert false
-    | Pstr_class_type cl ->
-        List.iter
-          (fun {pci_name} -> check_name check_type names pci_name)
-          cl;
-        let (classes, new_env) = Typeclass.class_type_declarations env cl in
-        Tstr_class_type
-          (List.map (fun cl ->
-               (cl.Typeclass.clsty_ty_id,
-                cl.Typeclass.clsty_id_loc,
-                cl.Typeclass.clsty_info)) classes),
-(*  TODO: check with Jacques why this is here
-           Tstr_type
-             (List.map (fun (_, _, i, d, _, _) -> (i, d)) classes) ::
-           Tstr_type
-             (List.map (fun (_, _, _, _, i, d) -> (i, d)) classes) :: *)
-        List.flatten
-          (map_rec
-             (fun rs decl ->
-                let open Typeclass in
-                [Sig_class_type(decl.clsty_ty_id, decl.clsty_ty_decl, rs);
-                 Sig_type(decl.clsty_obj_id, decl.clsty_obj_abbr, rs);
-                 Sig_type(decl.clsty_typesharp_id, decl.clsty_abbr, rs)])
-             classes []),
-        new_env
-    | Pstr_include sincl ->
-        let smodl = sincl.pincl_mod in
-        let modl =
-          Builtin_attributes.warning_scope sincl.pincl_attributes
-            (fun () -> type_module true funct_body None env smodl)
-        in
-        (* Rename all identifiers bound by this signature to avoid clashes *)
-        let sg = Subst.signature Subst.identity
-            (extract_sig_open env smodl.pmod_loc modl.mod_type) in
-        List.iter (check_sig_item names loc) sg;
-        let new_env = Env.add_signature sg env in
-        let incl =
-          { incl_mod = modl;
-            incl_type = sg;
-            incl_attributes = sincl.pincl_attributes;
-            incl_loc = sincl.pincl_loc;
-          }
-        in
-        Tstr_include incl, sg, new_env
-    | Pstr_extension (ext, _attrs) ->
-        raise (Error_forward (Builtin_attributes.error_of_extension ext))
-    | Pstr_attribute x ->
-        Builtin_attributes.warning_attribute x;
-        Tstr_attribute x, [], env
-  in
-  let rec type_struct env sstr =
-    Ctype.init_def(Ident.current_time());
-    match sstr with
-    | [] -> ([], [], env)
-    | pstr :: srem ->
-        let previous_saved_types = Cmt_format.get_saved_types () in
-        let desc, sg, new_env = type_str_item env srem pstr in
-        let str = { str_desc = desc; str_loc = pstr.pstr_loc; str_env = env } in
-        Cmt_format.set_saved_types (Cmt_format.Partial_structure_item str
-                                    :: previous_saved_types);
-        let (str_rem, sig_rem, final_env) = type_struct new_env srem in
-        let new_sg = 
-          if rescript_hide desc then sig_rem 
-          else 
-            sg @ sig_rem in 
-        (str :: str_rem, new_sg, final_env)
-  in
-  if !Clflags.annotations then
-    (* moved to genannot *)
-    List.iter (function {pstr_loc = l} -> Stypes.record_phrase l) sstr;
-  let previous_saved_types = Cmt_format.get_saved_types () in
-  let run () =
-    let (items, sg, final_env) = type_struct env sstr in
-    let str = { str_items = items; str_type = sg; str_final_env = final_env } in
-    Cmt_format.set_saved_types
-      (Cmt_format.Partial_structure str :: previous_saved_types);
-    str, sg, final_env
-  in
-  if toplevel then run ()
-  else Builtin_attributes.warning_scope [] run
-
-let type_toplevel_phrase env s =
-  type_structure ~toplevel:true false None env s Location.none
-
-
-let type_module_alias = type_module ~alias:true true false None
-let type_module = type_module true false None
-let type_structure = type_structure false None
-
-(* Normalize types in a signature *)
-
-let rec normalize_modtype env = function
-    Mty_ident _
-  | Mty_alias _ -> ()
-  | Mty_signature sg -> normalize_signature env sg
-  | Mty_functor(_id, _param, body) -> normalize_modtype env body
-
-and normalize_signature env = List.iter (normalize_signature_item env)
-
-and normalize_signature_item env = function
-    Sig_value(_id, desc) -> Ctype.normalize_type env desc.val_type
-  | Sig_module(_id, md, _) -> normalize_modtype env md.md_type
-  | _ -> ()
-
-(* Extract the module type of a module expression *)
-
-let type_module_type_of env smod =
-  let tmty =
-    match smod.pmod_desc with
-    | Pmod_ident lid -> (* turn off strengthening in this case *)
-        let path, md = Typetexp.find_module env smod.pmod_loc lid.txt in
-        rm { mod_desc = Tmod_ident (path, lid);
-             mod_type = md.md_type;
-             mod_env = env;
-             mod_attributes = smod.pmod_attributes;
-             mod_loc = smod.pmod_loc }
-    | _ -> type_module env smod in
-  let mty = tmty.mod_type in
-  (* PR#6307: expand aliases at root and submodules *)
-  let mty = Mtype.remove_aliases env mty in
-  (* PR#5036: must not contain non-generalized type variables *)
-  if not (closed_modtype env mty) then
-    raise(Error(smod.pmod_loc, env, Non_generalizable_module mty));
-  tmty, mty
-
-(* For Typecore *)
-
-let type_package env m p nl =
-  (* Same as Pexp_letmodule *)
-  (* remember original level *)
-  let lv = Ctype.get_current_level () in
-  Ctype.begin_def ();
-  Ident.set_current_time lv;
-  let context = Typetexp.narrow () in
-  let modl = type_module env m in
-  Ctype.init_def(Ident.current_time());
-  Typetexp.widen context;
-  let (mp, env) =
-    match modl.mod_desc with
-      Tmod_ident (mp,_) -> (mp, env)
-    | Tmod_constraint ({mod_desc=Tmod_ident (mp,_)}, _, Tmodtype_implicit, _)
-        -> (mp, env)  (* PR#6982 *)
-    | _ ->
-      let (id, new_env) = Env.enter_module ~arg:true "%M" modl.mod_type env in
-      (Pident id, new_env)
-  in
-  let rec mkpath mp = function
-    | Lident name -> Pdot(mp, name, nopos)
-    | Ldot (m, name) -> Pdot(mkpath mp m, name, nopos)
-    | _ -> assert false
-  in
-  let tl' =
-    List.map
-      (fun name -> Btype.newgenty (Tconstr (mkpath mp name,[],ref Mnil)))
-      (* beware of interactions with Printtyp and short-path:
-         mp.name may have an arity > 0, cf. PR#7534 *)
-      nl in
-  (* go back to original level *)
-  Ctype.end_def ();
-  if nl = [] then
-    (wrap_constraint env modl (Mty_ident p) Tmodtype_implicit, [])
-  else let mty = modtype_of_package env modl.mod_loc p nl tl' in
-  List.iter2
-    (fun n ty ->
-      try Ctype.unify env ty (Ctype.newvar ())
-      with Ctype.Unify _ ->
-        raise (Error(m.pmod_loc, env, Scoping_pack (n,ty))))
-    nl tl';
-  (wrap_constraint env modl mty Tmodtype_implicit, tl')
-
-(* Fill in the forward declarations *)
-let () =
-  Typecore.type_module := type_module_alias;
-  Typetexp.transl_modtype_longident := transl_modtype_longident;
-  Typetexp.transl_modtype := transl_modtype;
-  Typecore.type_open := type_open_ ?toplevel:None;
-  Typecore.type_package := type_package;
-  type_module_type_of_fwd := type_module_type_of
-
-
-(* Typecheck an implementation file *)
-
-let type_implementation_more ?check_exists sourcefile outputprefix modulename initial_env ast =
-  Cmt_format.clear ();
-  try
-  Delayed_checks.reset_delayed_checks ();
-  let (str, sg, finalenv) =
-    type_structure initial_env ast (Location.in_file sourcefile) in
-  let simple_sg = simplify_signature sg in
-  begin
-    let sourceintf =
-      Filename.remove_extension sourcefile ^ !Config.interface_suffix in
-    let mli_status = !Clflags.assume_no_mli in 
-    if mli_status = Clflags.Mli_exists then begin
-      let intf_file =
-        try
-          find_in_path_uncap !Config.load_path (modulename ^ ".cmi")
-        with Not_found ->
-          raise(Error(Location.in_file sourcefile, Env.empty,
-                      Interface_not_compiled sourceintf)) in
-      let dclsig = Env.read_signature modulename intf_file in
-      let coercion =
-        Includemod.compunit initial_env sourcefile sg intf_file dclsig in
-      Delayed_checks.force_delayed_checks ();
-      (* It is important to run these checks after the inclusion test above,
-         so that value declarations which are not used internally but exported
-         are not reported as being unused. *)
-      Cmt_format.save_cmt (outputprefix ^ ".cmt") modulename
-        (Cmt_format.Implementation str) (Some sourcefile) initial_env None;
-      (str, coercion, finalenv, dclsig)
-        (* identifier is useless might read from serialized cmi files*)      
-    end else begin
-      let coercion =
-        Includemod.compunit initial_env sourcefile sg
-                            "(inferred signature)" simple_sg in
-      check_nongen_schemes finalenv simple_sg;
-      normalize_signature finalenv simple_sg;
-      Delayed_checks.force_delayed_checks ();
-      (* See comment above. Here the target signature contains all
-         the value being exported. We can still capture unused
-         declarations like "let x = true;; let x = 1;;", because in this
-         case, the inferred signature contains only the last declaration. *)
-      if not !Clflags.dont_write_files then begin
-        let deprecated = Builtin_attributes.deprecated_of_str ast in
-        let cmi =
-          Env.save_signature ?check_exists ~deprecated
-            simple_sg modulename (outputprefix ^ ".cmi")
-        in
-        Cmt_format.save_cmt  (outputprefix ^ ".cmt") modulename
-          (Cmt_format.Implementation str)
-          (Some sourcefile) initial_env (Some cmi);
-      end;
-      (str, coercion, finalenv, simple_sg)
-    end
-    end
-  with e ->
-    Cmt_format.save_cmt  (outputprefix ^ ".cmt") modulename
-      (Cmt_format.Partial_implementation
-         (Array.of_list (Cmt_format.get_saved_types ())))
-      (Some sourcefile) initial_env None;
-    raise e
-
-let type_implementation sourcefile outputprefix modulename initial_env ast =
-  let (a,b,_,_) = 
-    type_implementation_more sourcefile outputprefix modulename initial_env ast in 
-  a,b    
-
-
-let save_signature modname tsg outputprefix source_file initial_env cmi =
-  Cmt_format.save_cmt  (outputprefix ^ ".cmti") modname
-    (Cmt_format.Interface tsg) (Some source_file) initial_env (Some cmi)
-
-
-(* "Packaging" of several compilation units into one unit
-   having them as sub-modules.  *)
-
-
-(* Error report *)
-
-open Printtyp
-
-let non_generalizable_msg ppf print_fallback_msg =
-  fprintf ppf
-    "%a@,@,\
-     @[This happens when the type system senses there's a mutation/side-effect,@ in combination with a polymorphic value.@,\
-     @{<info>Using or annotating that value usually solves it.@}@]"
-    print_fallback_msg ()
-
-let report_error ppf = function
-    Cannot_apply mty ->
-      fprintf ppf
-        "@[This module is not a functor; it has type@ %a@]" modtype mty
-  | Not_included errs ->
-      fprintf ppf
-        "@[<v>Signature mismatch:@ %a@]" Includemod.report_error errs
-  | Cannot_eliminate_dependency mty ->
-      fprintf ppf
-        "@[This functor has type@ %a@ \
-           The parameter cannot be eliminated in the result type.@  \
-           Please bind the argument to a module identifier.@]" modtype mty
-  | Signature_expected -> fprintf ppf "This module type is not a signature"
-  | Structure_expected mty ->
-      fprintf ppf
-        "@[This module is not a structure; it has type@ %a" modtype mty
-  | With_no_component lid ->
-      fprintf ppf
-        "@[The signature constrained by `with' has no component named %a@]"
-        longident lid
-  | With_mismatch(lid, explanation) ->
-      fprintf ppf
-        "@[<v>\
-           @[In this `with' constraint, the new definition of %a@ \
-             does not match its original definition@ \
-             in the constrained signature:@]@ \
-           %a@]"
-        longident lid Includemod.report_error explanation
-  | With_makes_applicative_functor_ill_typed(lid, path, explanation) ->
-      fprintf ppf
-        "@[<v>\
-           @[This `with' constraint on %a makes the applicative functor @ \
-             type %s ill-typed in the constrained signature:@]@ \
-           %a@]"
-        longident lid (Path.name path) Includemod.report_error explanation
-  | With_changes_module_alias(lid, id, path) ->
-      fprintf ppf
-        "@[<v>\
-           @[This `with' constraint on %a changes %s, which is aliased @ \
-             in the constrained signature (as %s)@].@]"
-        longident lid (Path.name path) (Ident.name id)
-  | With_cannot_remove_constrained_type ->
-      fprintf ppf
-        "@[<v>Destructive substitutions are not supported for constrained @ \
-              types (other than when replacing a type constructor with @ \
-              a type constructor with the same arguments).@]"
-  | Repeated_name(kind, name, repeated_loc) ->
-      fprintf ppf
-        "@[Multiple definition of the %s name %s @ \
-           at @{<loc>%a@}@ @ \
-           Names must be unique in a given structure or signature.@]" kind name Location.print_loc repeated_loc
-  | Non_generalizable typ ->
-    (* modified *)
-    fprintf ppf "@[<v>";
-    non_generalizable_msg
-      ppf
-      (fun ppf () ->
-         fprintf ppf
-           "@[This expression's type contains type variables that cannot be generalized:@,@{<error>%a@}@]"
-           type_scheme typ);
-    fprintf ppf "@]"
-  | Non_generalizable_module mty ->
-    (* modified *)
-    fprintf ppf "@[<v>";
-    non_generalizable_msg
-      ppf
-      (fun ppf () ->
-         fprintf ppf
-           "@[The type of this module contains type variables that cannot be generalized:@,@{<error>%a@}@]"
-           modtype mty);
-    fprintf ppf "@]"
-  | Interface_not_compiled intf_name ->
-      fprintf ppf
-        "@[Could not find the .cmi file for interface@ %a.@]"
-        Location.print_filename intf_name
-  | Not_allowed_in_functor_body ->
-      fprintf ppf
-        "@[This expression creates fresh types.@ %s@]"
-        "It is not allowed inside applicative functors."
-  | Not_a_packed_module ty ->
-      fprintf ppf
-        "This expression is not a packed module. It has type@ %a"
-        type_expr ty
-  | Incomplete_packed_module ty ->
-      fprintf ppf
-        "The type of this packed module contains variables:@ %a"
-        type_expr ty
-  | Scoping_pack (lid, ty) ->
-      fprintf ppf
-        "The type %a in this module cannot be exported.@ " longident lid;
-      fprintf ppf
-        "Its type contains local dependencies:@ %a" type_expr ty
-  | Recursive_module_require_explicit_type ->
-      fprintf ppf "Recursive modules require an explicit module type."
-  | Apply_generative ->
-      fprintf ppf "This is a generative functor. It can only be applied to ()"
-  | Cannot_scrape_alias p ->
-      fprintf ppf
-        "This is an alias for module %a, which is missing"
-        path p
-
-
-let super_report_error_no_wrap_printing_env = report_error
-
-
-let report_error env ppf err =
-  Printtyp.wrap_printing_env env (fun () -> report_error ppf err)
-
-let () =
-  Location.register_error_of_exn
-    (function
-      | Error (loc, env, err) ->
-        Some (Location.error_of_printer loc (report_error env) err)
-      | Error_forward err ->
-        Some err
-      | _ ->
-        None
-    )
diff --git a/jscomp/ml/typemod.mli b/jscomp/ml/typemod.mli
deleted file mode 100644
index e7bcece..0000000
--- a/jscomp/ml/typemod.mli
+++ /dev/null
@@ -1,89 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** Type-checking of the module language and typed ast plugin hooks *)
-
-open Types
-open Format
-
-val type_module:
-        Env.t -> Parsetree.module_expr -> Typedtree.module_expr
-val type_structure:
-        Env.t -> Parsetree.structure -> Location.t ->
-         Typedtree.structure * Types.signature * Env.t
-val type_toplevel_phrase:
-        Env.t -> Parsetree.structure ->
-         Typedtree.structure * Types.signature * Env.t
-
-
-val rescript_hide : Typedtree.structure_item_desc -> bool
-
-val type_implementation_more: ?check_exists:unit -> 
-  string -> string -> string -> Env.t -> Parsetree.structure ->
-  Typedtree.structure * Typedtree.module_coercion * Env.t * Types.signature
-
-val type_implementation:
-  string -> string -> string -> Env.t -> Parsetree.structure ->
-  Typedtree.structure * Typedtree.module_coercion
-  
-val transl_signature:
-        Env.t -> Parsetree.signature -> Typedtree.signature
-val check_nongen_schemes:
-        Env.t -> Types.signature -> unit
-val type_open_:
-        ?used_slot:bool ref -> ?toplevel:bool -> Asttypes.override_flag ->
-        Env.t -> Location.t -> Longident.t Asttypes.loc -> Path.t * Env.t
-val simplify_signature: signature -> signature
-
-val path_of_module : Typedtree.module_expr -> Path.t option
-
-val save_signature:
-  string -> Typedtree.signature -> string -> string ->
-  Env.t -> Cmi_format.cmi_infos -> unit
-
-type error =
-    Cannot_apply of module_type
-  | Not_included of Includemod.error list
-  | Cannot_eliminate_dependency of module_type
-  | Signature_expected
-  | Structure_expected of module_type
-  | With_no_component of Longident.t
-  | With_mismatch of Longident.t * Includemod.error list
-  | With_makes_applicative_functor_ill_typed of
-      Longident.t * Path.t * Includemod.error list
-  | With_changes_module_alias of Longident.t * Ident.t * Path.t
-  | With_cannot_remove_constrained_type
-  | Repeated_name of string * string * Warnings.loc
-  | Non_generalizable of type_expr
-  | Non_generalizable_module of module_type
-  | Interface_not_compiled of string
-  | Not_allowed_in_functor_body
-  | Not_a_packed_module of type_expr
-  | Incomplete_packed_module of type_expr
-  | Scoping_pack of Longident.t * type_expr
-  | Recursive_module_require_explicit_type
-  | Apply_generative
-  | Cannot_scrape_alias of Path.t
-
-exception Error of Location.t * Env.t * error
-exception Error_forward of Location.error
-
-
-val super_report_error_no_wrap_printing_env: formatter -> error -> unit
-
-
-val report_error: Env.t -> formatter -> error -> unit
-
-
diff --git a/jscomp/ml/typeopt.ml b/jscomp/ml/typeopt.ml
deleted file mode 100644
index 565cc3b..0000000
--- a/jscomp/ml/typeopt.ml
+++ /dev/null
@@ -1,200 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1998 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Auxiliaries for type-based optimizations, e.g. array kinds *)
-
-
-open Types
-open Asttypes
-open Typedtree
-open Lambda
-
-let scrape_ty env ty =
-  let ty = Ctype.expand_head_opt env (Ctype.correct_levels ty) in
-  match ty.desc with
-  | Tconstr (p, _, _) ->
-      begin match Env.find_type p env with
-      | {type_unboxed = {unboxed = true; _}; _} ->
-        begin match Typedecl.get_unboxed_type_representation env ty with
-        | None -> ty
-        | Some ty2 -> ty2
-        end
-      | _ -> ty
-      | exception Not_found -> ty
-      end
-  | _ -> ty
-
-let scrape env ty =
-  (scrape_ty env ty).desc
-
-
-(**  [Types.constructor_description]
-     records the type at the definition type so for ['a option]
-     it will always be [Tvar]
-*)
-let rec type_cannot_contain_undefined (typ : Types.type_expr) (env : Env.t) =
-  match scrape env typ with
-  |  Tconstr(p, _,_) ->
-      (* all built in types could not inhabit none-like values:
-         int, char, float, bool, unit, exn, array, list, nativeint,
-         int32, int64, lazy_t, bytes
-      *)
-      (match Predef.type_is_builtin_path_but_option p with
-      | For_sure_yes -> true
-      | For_sure_no -> false
-      | NA ->
-        let untagged = ref false in
-        begin match
-        let decl = Env.find_type p env in
-        let () =
-          if Ast_untagged_variants.has_untagged decl.type_attributes
-          then untagged := true in
-        decl.type_kind with
-        | exception _ -> 
-            false
-        | Type_abstract | Type_open -> false
-        | Type_record _ -> true
-        | Type_variant
-             ([{cd_id = {name="None"}; cd_args = Cstr_tuple [] };
-               {cd_id = {name = "Some"}; cd_args = Cstr_tuple [_]}]
-             |
-              [{cd_id = {name="Some"}; cd_args = Cstr_tuple [_] };
-               {cd_id = {name = "None"}; cd_args = Cstr_tuple []}]
-             | [{cd_id= {name = "()"}; cd_args = Cstr_tuple []}]               
-             )
-             -> false (* conservative *)
-        | Type_variant cdecls ->
-            Ext_list.for_all cdecls (fun cd ->
-              if Ast_untagged_variants.has_undefined_literal cd.cd_attributes
-              then false
-              else if !untagged then
-                match cd.cd_args with
-                | Cstr_tuple [t] ->
-                  Ast_untagged_variants.type_is_builtin_object t || type_cannot_contain_undefined t env
-                | Cstr_tuple [] -> true
-                | Cstr_tuple (_::_::_) -> true (* Not actually possible for untagged *)
-                | Cstr_record [{ld_type=t}] ->
-                  Ast_untagged_variants.type_is_builtin_object t || type_cannot_contain_undefined t env
-                | Cstr_record ([] | _::_::_) -> true
-              else
-                true)
-        end)
-  | Ttuple _
-  | Tvariant _
-  | Tpackage _ 
-  | Tarrow _ -> true
-  | Tfield _ 
-  | Tpoly _ 
-  | Tunivar _ 
-  | Tlink _ 
-  | Tsubst _
-  | Tnil 
-  | Tvar _
-  | Tobject _ 
-    -> false
-
-let is_function_type env ty =
-  match scrape env ty with
-  | Tarrow (_, lhs, rhs, _) -> Some (lhs, rhs)
-  | _ -> None
-
-let is_base_type env ty base_ty_path =
-  match scrape env ty with
-  | Tconstr(p, _, _) -> Path.same p base_ty_path
-  | _ -> false
-
-let maybe_pointer_type env ty =
-  if Ctype.maybe_pointer_type env ty then
-    Pointer
-  else
-    Immediate
-
-let maybe_pointer exp = maybe_pointer_type exp.exp_env exp.exp_type
-
-type classification =
-  | Int
-  | Float
-  | Lazy
-  | Addr  (* anything except a float or a lazy *)
-  | Any
-
-let classify env ty =
-  let ty = scrape_ty env ty in
-  if maybe_pointer_type env ty = Immediate then Int
-  else match ty.desc with
-  | Tvar _ | Tunivar _ ->
-      Any
-  | Tconstr (p, _args, _abbrev) ->
-      if Path.same p Predef.path_float then Float
-      else if Path.same p Predef.path_lazy_t then Lazy
-      else if Path.same p Predef.path_string
-           || Path.same p Predef.path_bytes
-           || Path.same p Predef.path_array
-           || Path.same p Predef.path_int64 then Addr
-      else begin
-        try
-          match (Env.find_type p env).type_kind with
-          | Type_abstract ->
-              Any
-          | Type_record _ | Type_variant _ | Type_open ->
-              Addr
-        with Not_found ->
-          (* This can happen due to e.g. missing -I options,
-             causing some .cmi files to be unavailable.
-             Maybe we should emit a warning. *)
-          Any
-      end
-  | Tarrow _ | Ttuple _ | Tpackage _ | Tobject _ | Tnil | Tvariant _ ->
-      Addr
-  | Tlink _ | Tsubst _ | Tpoly _ | Tfield _ ->
-      assert false
-
-
-
-
-
-
-
-(** Whether a forward block is needed for a lazy thunk on a value, i.e.
-    if the value can be represented as a float/forward/lazy *)
-let lazy_val_requires_forward env ty =
-  match classify env ty with
-  | Any | Lazy -> true
-  | Float (*-> Config.flat_float_array*)
-  | Addr | Int -> false
-
-(** The compilation of the expression [lazy e] depends on the form of e:
-    constants, floats and identifiers are optimized.  The optimization must be
-    taken into account when determining whether a recursive binding is safe. *)
-let classify_lazy_argument : Typedtree.expression ->
-                             [`Constant_or_function
-                             |`Float
-                             |`Identifier of [`Forward_value|`Other]
-                             |`Other] =
-  fun e -> match e.exp_desc with
-    | Texp_constant
-        ( Const_int _ | Const_char _ | Const_string _
-        | Const_int32 _ | Const_int64 _ | Const_bigint _ )
-    | Texp_function _
-    | Texp_construct (_, {cstr_arity = 0}, _) ->
-       `Constant_or_function
-    | Texp_constant(Const_float _) ->
-       `Float
-    | Texp_ident _ when lazy_val_requires_forward e.exp_env e.exp_type ->
-       `Identifier `Forward_value
-    | Texp_ident _ ->
-       `Identifier `Other
-    | _ ->
-       `Other
diff --git a/jscomp/ml/typeopt.mli b/jscomp/ml/typeopt.mli
deleted file mode 100644
index d0d5dff..0000000
--- a/jscomp/ml/typeopt.mli
+++ /dev/null
@@ -1,41 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1998 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Auxiliaries for type-based optimizations, e.g. array kinds *)
-
-val is_function_type :
-      Env.t -> Types.type_expr -> (Types.type_expr * Types.type_expr) option
-val is_base_type : Env.t -> Types.type_expr -> Path.t -> bool
-
-val maybe_pointer_type : Env.t -> Types.type_expr
-  -> Lambda.immediate_or_pointer
-val maybe_pointer : Typedtree.expression -> Lambda.immediate_or_pointer
-
-
-
-
-
-
-val classify_lazy_argument : Typedtree.expression ->
-                             [ `Constant_or_function
-                             | `Float
-                             | `Identifier of [`Forward_value | `Other]
-                             | `Other]
-
-val type_cannot_contain_undefined:
-  Types.type_expr ->
-  Env.t -> 
-  bool
-
diff --git a/jscomp/ml/types.ml b/jscomp/ml/types.ml
deleted file mode 100644
index 0c94b4b..0000000
--- a/jscomp/ml/types.ml
+++ /dev/null
@@ -1,357 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Representation of types and declarations *)
-
-open Asttypes
-
-(* Type expressions for the core language *)
-
-type type_expr =
-  { mutable desc: type_desc;
-    mutable level: int;
-    id: int }
-
-and type_desc =
-    Tvar of string option
-  | Tarrow of arg_label * type_expr * type_expr * commutable
-  | Ttuple of type_expr list
-  | Tconstr of Path.t * type_expr list * abbrev_memo ref
-  | Tobject of type_expr * (Path.t * type_expr list) option ref
-  | Tfield of string * field_kind * type_expr * type_expr
-  | Tnil
-  | Tlink of type_expr
-  | Tsubst of type_expr         (* for copying *)
-  | Tvariant of row_desc
-  | Tunivar of string option
-  | Tpoly of type_expr * type_expr list
-  | Tpackage of Path.t * Longident.t list * type_expr list
-
-and row_desc =
-    { row_fields: (label * row_field) list;
-      row_more: type_expr;
-      row_bound: unit;
-      row_closed: bool;
-      row_fixed: bool;
-      row_name: (Path.t * type_expr list) option }
-
-and row_field =
-    Rpresent of type_expr option
-  | Reither of bool * type_expr list * bool * row_field option ref
-        (* 1st true denotes a constant constructor *)
-        (* 2nd true denotes a tag in a pattern matching, and
-           is erased later *)
-  | Rabsent
-
-and abbrev_memo =
-    Mnil
-  | Mcons of private_flag * Path.t * type_expr * type_expr * abbrev_memo
-  | Mlink of abbrev_memo ref
-
-and field_kind =
-    Fvar of field_kind option ref
-  | Fpresent
-  | Fabsent
-
-and commutable =
-    Cok
-  | Cunknown
-  | Clink of commutable ref
-
-module TypeOps = struct
-  type t = type_expr
-  let compare t1 t2 = t1.id - t2.id
-  let hash t = t.id
-  let equal t1 t2 = t1 == t2
-end
-
-(* Maps of methods and instance variables *)
-
-module OrderedString =
-  struct type t = string let compare (x:t) y = compare x y end
-module Meths = Map.Make(OrderedString)
-module Vars = Meths
-
-(* Value descriptions *)
-
-type value_description =
-  { val_type: type_expr;                (* Type of the value *)
-    val_kind: value_kind;
-    val_loc: Location.t;
-    val_attributes: Parsetree.attributes;
- }
-
-and value_kind =
-    Val_reg                             (* Regular value *)
-  | Val_prim of Primitive.description   (* Primitive *)
-
-(* Variance *)
-
-module Variance = struct
-  type t = int
-  type f = May_pos | May_neg | May_weak | Inj | Pos | Neg | Inv
-  let single = function
-    | May_pos -> 1
-    | May_neg -> 2
-    | May_weak -> 4
-    | Inj -> 8
-    | Pos -> 16
-    | Neg -> 32
-    | Inv -> 64
-  let union v1 v2 = v1 lor v2
-  let inter v1 v2 = v1 land v2
-  let subset v1 v2 = (v1 land v2 = v1)
-  let set x b v =
-    if b then v lor single x else  v land (lnot (single x))
-  let mem x = subset (single x)
-  let null = 0
-  let may_inv = 7
-  let full = 127
-  let covariant = single May_pos lor single Pos lor single Inj
-  let swap f1 f2 v =
-    let v' = set f1 (mem f2 v) v in set f2 (mem f1 v) v'
-  let conjugate v = swap May_pos May_neg (swap Pos Neg v)
-  let get_upper v = (mem May_pos v, mem May_neg v)
-  let get_lower v = (mem Pos v, mem Neg v, mem Inv v, mem Inj v)
-end
-
-(* Type definitions *)
-
-type type_declaration =
-  { type_params: type_expr list;
-    type_arity: int;
-    type_kind: type_kind;
-    type_private: private_flag;
-    type_manifest: type_expr option;
-    type_variance: Variance.t list;
-    type_newtype_level: (int * int) option;
-    type_loc: Location.t;
-    type_attributes: Parsetree.attributes;
-    type_immediate: bool;
-    type_unboxed: unboxed_status;
- }
-
-and type_kind =
-    Type_abstract
-  | Type_record of label_declaration list  * record_representation
-  | Type_variant of constructor_declaration list
-  | Type_open
-
-and record_representation =
-  | Record_regular                        (* All fields are boxed / tagged *)
-  | Record_float_unused                   (* Was: all fields are floats. Now: unused *)
-  | Record_unboxed of bool                (* Unboxed single-field record, inlined or not *)
-  | Record_inlined of                     (* Inlined record *)
-      { tag : int ; name : string; num_nonconsts : int; optional_labels : string list; attrs: Parsetree.attributes}
-  | Record_extension                      (* Inlined record under extension *)
-  | Record_optional_labels of string list (* List of optional labels *)
-
-and label_declaration =
-  {
-    ld_id: Ident.t;
-    ld_mutable: mutable_flag;
-    ld_type: type_expr;
-    ld_loc: Location.t;
-    ld_attributes: Parsetree.attributes;
-  }
-
-and constructor_declaration =
-  {
-    cd_id: Ident.t;
-    cd_args: constructor_arguments;
-    cd_res: type_expr option;
-    cd_loc: Location.t;
-    cd_attributes: Parsetree.attributes;
-  }
-
-and constructor_arguments =
-  | Cstr_tuple of type_expr list
-  | Cstr_record of label_declaration list
-
-and unboxed_status =
-  {
-    unboxed: bool;
-    default: bool; (* False if the unboxed field was set from an attribute. *)
-  }
-
-let unboxed_false_default_false = {unboxed = false; default = false}
-let unboxed_false_default_true = {unboxed = false; default = true}
-let unboxed_true_default_false = {unboxed = true; default = false}
-let unboxed_true_default_true = {unboxed = true; default = true}
-
-type extension_constructor =
-    { ext_type_path: Path.t;
-      ext_type_params: type_expr list;
-      ext_args: constructor_arguments;
-      ext_ret_type: type_expr option;
-      ext_private: private_flag;
-      ext_loc: Location.t;
-      ext_attributes: Parsetree.attributes; }
-
-and type_transparence =
-    Type_public      (* unrestricted expansion *)
-  | Type_new         (* "new" type *)
-  | Type_private     (* private type *)
-
-(* Type expressions for the class language *)
-
-module Concr = Set.Make(OrderedString)
-
-type class_type =
-    Cty_constr of Path.t * type_expr list * class_type
-  | Cty_signature of class_signature
-  | Cty_arrow of arg_label * type_expr * class_type
-
-and class_signature =
-  { csig_self: type_expr;
-    csig_vars:
-      (Asttypes.mutable_flag * Asttypes.virtual_flag * type_expr) Vars.t;
-    csig_concr: Concr.t;
-    csig_inher: (Path.t * type_expr list) list }
-
-type class_declaration =
-  { cty_params: type_expr list;
-    mutable cty_type: class_type;
-    cty_path: Path.t;
-    cty_new: type_expr option;
-    cty_variance: Variance.t list;
-    cty_loc: Location.t;
-    cty_attributes: Parsetree.attributes;
- }
-
-type class_type_declaration =
-  { clty_params: type_expr list;
-    clty_type: class_type;
-    clty_path: Path.t;
-    clty_variance: Variance.t list;
-    clty_loc: Location.t;
-    clty_attributes: Parsetree.attributes;
-  }
-
-(* Type expressions for the module language *)
-
-type module_type =
-    Mty_ident of Path.t
-  | Mty_signature of signature
-  | Mty_functor of Ident.t * module_type option * module_type
-  | Mty_alias of alias_presence * Path.t
-
-and alias_presence =
-  | Mta_present
-  | Mta_absent
-
-and signature = signature_item list
-
-and signature_item =
-    Sig_value of Ident.t * value_description
-  | Sig_type of Ident.t * type_declaration * rec_status
-  | Sig_typext of Ident.t * extension_constructor * ext_status
-  | Sig_module of Ident.t * module_declaration * rec_status
-  | Sig_modtype of Ident.t * modtype_declaration
-  | Sig_class of unit
-  | Sig_class_type of Ident.t * class_type_declaration * rec_status
-
-and module_declaration =
-  {
-    md_type: module_type;
-    md_attributes: Parsetree.attributes;
-    md_loc: Location.t;
-  }
-
-and modtype_declaration =
-  {
-    mtd_type: module_type option;  (* Note: abstract *)
-    mtd_attributes: Parsetree.attributes;
-    mtd_loc: Location.t;
-  }
-
-and rec_status =
-    Trec_not                   (* first in a nonrecursive group *)
-  | Trec_first                 (* first in a recursive group *)
-  | Trec_next                  (* not first in a recursive/nonrecursive group *)
-
-and ext_status =
-    Text_first                     (* first constructor of an extension *)
-  | Text_next                      (* not first constructor of an extension *)
-  | Text_exception                 (* an exception *)
-
-
-(* Constructor and record label descriptions inserted held in typing
-   environments *)
-
-type constructor_description =
-  { cstr_name: string;                  (* Constructor name *)
-    cstr_res: type_expr;                (* Type of the result *)
-    cstr_existentials: type_expr list;  (* list of existentials *)
-    cstr_args: type_expr list;          (* Type of the arguments *)
-    cstr_arity: int;                    (* Number of arguments *)
-    cstr_tag: constructor_tag;          (* Tag for heap blocks *)
-    cstr_consts: int;                   (* Number of constant constructors *)
-    cstr_nonconsts: int;                (* Number of non-const constructors *)
-    cstr_normal: int;                   (* Number of non generalized constrs *)
-    cstr_generalized: bool;             (* Constrained return type? *)
-    cstr_private: private_flag;         (* Read-only constructor? *)
-    cstr_loc: Location.t;
-    cstr_attributes: Parsetree.attributes;
-    cstr_inlined: type_declaration option;
-   }
-
-and constructor_tag =
-    Cstr_constant of int                (* Constant constructor (an int) *)
-  | Cstr_block of int                   (* Regular constructor (a block) *)
-  | Cstr_unboxed                        (* Constructor of an unboxed type *)
-  | Cstr_extension of Path.t * bool     (* Extension constructor
-                                           true if a constant false if a block*)
-
-let equal_tag t1 t2 = 
-  match (t1, t2) with
-  | Cstr_constant i1, Cstr_constant i2 -> i2 = i1
-  | Cstr_block i1, Cstr_block i2 -> i2 = i1
-  | Cstr_unboxed, Cstr_unboxed -> true
-  | Cstr_extension (path1, b1), Cstr_extension (path2, b2) -> 
-      Path.same path1 path2 && b1 = b2
-  | (Cstr_constant _|Cstr_block _|Cstr_unboxed|Cstr_extension _), _ -> false
-
-let may_equal_constr c1 c2 = match c1.cstr_tag,c2.cstr_tag with
-| Cstr_extension _,Cstr_extension _ -> c1.cstr_arity = c2.cstr_arity
-| tag1,tag2 -> equal_tag tag1 tag2
-
-type label_description =
-  { lbl_name: string;                   (* Short name *)
-    lbl_res: type_expr;                 (* Type of the result *)
-    lbl_arg: type_expr;                 (* Type of the argument *)
-    lbl_mut: mutable_flag;              (* Is this a mutable field? *)
-    lbl_pos: int;                       (* Position in block *)
-    lbl_all: label_description array;   (* All the labels in this type *)
-    lbl_repres: record_representation;  (* Representation for this record *)
-    lbl_private: private_flag;          (* Read-only field? *)
-    lbl_loc: Location.t;
-    lbl_attributes: Parsetree.attributes;
-   }
-let same_record_representation x y =
-  match x with
-  | Record_regular -> y = Record_regular
-  | Record_float_unused -> y = Record_float_unused
-  | Record_optional_labels lbls -> (
-      match y with
-      | Record_optional_labels lbls2 -> lbls = lbls2
-      | _ -> false)
-  | Record_inlined {tag; name; num_nonconsts; optional_labels} -> (
-      match y with
-      | Record_inlined y ->
-          tag = y.tag && name = y.name && num_nonconsts = y.num_nonconsts && optional_labels = y.optional_labels
-      | _ -> false)
-  | Record_extension -> y = Record_extension
-  | Record_unboxed x -> ( match y with Record_unboxed y -> x = y | _ -> false)
diff --git a/jscomp/ml/types.mli b/jscomp/ml/types.mli
deleted file mode 100644
index eacf0b7..0000000
--- a/jscomp/ml/types.mli
+++ /dev/null
@@ -1,490 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(** {0 Representation of types and declarations} *)
-
-(** [Types] defines the representation of types and declarations (that is, the
-    content of module signatures).
-
-    CMI files are made of marshalled types.
-*)
-
-(** Asttypes exposes basic definitions shared both by Parsetree and Types. *)
-open Asttypes
-
-(** Type expressions for the core language.
-
-    The [type_desc] variant defines all the possible type expressions one can
-    find in OCaml. [type_expr] wraps this with some annotations.
-
-    The [level] field tracks the level of polymorphism associated to a type,
-    guiding the generalization algorithm.
-    Put shortly, when referring to a type in a given environment, both the type
-    and the environment have a level. If the type has an higher level, then it
-    can be considered fully polymorphic (type variables will be printed as
-    ['a]), otherwise it'll be weakly polymorphic, or non generalized (type
-    variables printed as ['_a]).
-    See [http://okmij.org/ftp/ML/generalization.html] for more information.
-
-    Note about [type_declaration]: one should not make the confusion between
-    [type_expr] and [type_declaration].
-
-    [type_declaration] refers specifically to the [type] construct in OCaml
-    language, where you create and name a new type or type alias.
-
-    [type_expr] is used when you refer to existing types, e.g. when annotating
-    the expected type of a value.
-
-    Also, as the type system of OCaml is generative, a [type_declaration] can
-    have the side-effect of introducing a new type constructor, different from
-    all other known types.
-    Whereas [type_expr] is a pure construct which allows referring to existing
-    types.
-
-    Note on mutability: TBD.
- *)
-type type_expr =
-  { mutable desc: type_desc;
-    mutable level: int;
-    id: int }
-
-and type_desc =
-  | Tvar of string option
-  (** [Tvar (Some "a")] ==> ['a] or ['_a]
-      [Tvar None]       ==> [_] *)
-
-  | Tarrow of arg_label * type_expr * type_expr * commutable
-  (** [Tarrow (Nolabel,      e1, e2, c)] ==> [e1    -> e2]
-      [Tarrow (Labelled "l", e1, e2, c)] ==> [l:e1  -> e2]
-      [Tarrow (Optional "l", e1, e2, c)] ==> [?l:e1 -> e2]
-
-      See [commutable] for the last argument. *)
-
-  | Ttuple of type_expr list
-  (** [Ttuple [t1;...;tn]] ==> [(t1 * ... * tn)] *)
-
-  | Tconstr of Path.t * type_expr list * abbrev_memo ref
-  (** [Tconstr (`A.B.t', [t1;...;tn], _)] ==> [(t1,...,tn) A.B.t]
-      The last parameter keep tracks of known expansions, see [abbrev_memo]. *)
-
-  | Tobject of type_expr * (Path.t * type_expr list) option ref
-  (** [Tobject (`f1:t1;...;fn: tn', `None')] ==> [< f1: t1; ...; fn: tn >]
-      f1, fn are represented as a linked list of types using Tfield and Tnil
-      constructors.
-
-      [Tobject (_, `Some (`A.ct', [t1;...;tn]')] ==> [(t1, ..., tn) A.ct].
-      where A.ct is the type of some class.
-
-      There are also special cases for so-called "class-types", cf. [Typeclass]
-      and [Ctype.set_object_name]:
-
-        [Tobject (Tfield(_,_,...(Tfield(_,_,rv)...),
-                         Some(`A.#ct`, [rv;t1;...;tn])]
-             ==> [(t1, ..., tn) #A.ct]
-        [Tobject (_, Some(`A.#ct`, [Tnil;t1;...;tn])] ==> [(t1, ..., tn) A.ct]
-
-      where [rv] is the hidden row variable.
-  *)
-
-  | Tfield of string * field_kind * type_expr * type_expr
-  (** [Tfield ("foo", Fpresent, t, ts)] ==> [<...; foo : t; ts>] *)
-
-  | Tnil
-  (** [Tnil] ==> [<...; >] *)
-
-  | Tlink of type_expr
-  (** Indirection used by unification engine. *)
-
-  | Tsubst of type_expr         (* for copying *)
-  (** [Tsubst] is used temporarily to store information in low-level
-      functions manipulating representation of types, such as
-      instantiation or copy.
-      This constructor should not appear outside of these cases. *)
-
-  | Tvariant of row_desc
-  (** Representation of polymorphic variants, see [row_desc]. *)
-
-  | Tunivar of string option
-  (** Occurrence of a type variable introduced by a
-      forall quantifier / [Tpoly]. *)
-
-  | Tpoly of type_expr * type_expr list
-  (** [Tpoly (ty,tyl)] ==> ['a1... 'an. ty],
-      where 'a1 ... 'an are names given to types in tyl
-      and occurrences of those types in ty. *)
-
-  | Tpackage of Path.t * Longident.t list * type_expr list
-  (** Type of a first-class module (a.k.a package). *)
-
-(** [  `X | `Y ]       (row_closed = true)
-    [< `X | `Y ]       (row_closed = true)
-    [> `X | `Y ]       (row_closed = false)
-    [< `X | `Y > `X ]  (row_closed = true)
-
-    type t = [> `X ] as 'a      (row_more = Tvar a)
-    type t = private [> `X ]    (row_more = Tconstr (t#row, [], ref Mnil)
-
-    And for:
-
-        let f = function `X -> `X -> | `Y -> `X
-
-    the type of "f" will be a [Tarrow] whose lhs will (basically) be:
-
-        Tvariant { row_fields = [("X", _)];
-                   row_more   =
-                     Tvariant { row_fields = [("Y", _)];
-                                row_more   =
-                                  Tvariant { row_fields = [];
-                                             row_more   = _;
-                                             _ };
-                                _ };
-                   _
-                 }
-
-*)
-and row_desc =
-    { row_fields: (label * row_field) list;
-      row_more: type_expr;
-      row_bound: unit; (* kept for compatibility *)
-      row_closed: bool;
-      row_fixed: bool;
-      row_name: (Path.t * type_expr list) option }
-
-and row_field =
-    Rpresent of type_expr option
-  | Reither of bool * type_expr list * bool * row_field option ref
-        (* 1st true denotes a constant constructor *)
-        (* 2nd true denotes a tag in a pattern matching, and
-           is erased later *)
-  | Rabsent
-
-(** [abbrev_memo] allows one to keep track of different expansions of a type
-    alias. This is done for performance purposes.
-
-    For instance, when defining [type 'a pair = 'a * 'a], when one refers to an
-    ['a pair], it is just a shortcut for the ['a * 'a] type.
-    This expansion will be stored in the [abbrev_memo] of the corresponding
-    [Tconstr] node.
-
-    In practice, [abbrev_memo] behaves like list of expansions with a mutable
-    tail.
-
-    Note on marshalling: [abbrev_memo] must not appear in saved types.
-    [Btype], with [cleanup_abbrev] and [memo], takes care of tracking and
-    removing abbreviations.
-*)
-and abbrev_memo =
-  | Mnil (** No known abbreviation *)
-
-  | Mcons of private_flag * Path.t * type_expr * type_expr * abbrev_memo
-  (** Found one abbreviation.
-      A valid abbreviation should be at least as visible and reachable by the
-      same path.
-      The first expression is the abbreviation and the second the expansion. *)
-
-  | Mlink of abbrev_memo ref
-  (** Abbreviations can be found after this indirection *)
-
-and field_kind =
-    Fvar of field_kind option ref
-  | Fpresent
-  | Fabsent
-
-(** [commutable] is a flag appended to every arrow type.
-
-    When typing an application, if the type of the functional is
-    known, its type is instantiated with [Cok] arrows, otherwise as
-    [Clink (ref Cunknown)].
-
-    When the type is not known, the application will be used to infer
-    the actual type.  This is fragile in presence of labels where
-    there is no principal type.
-
-    Two incompatible applications relying on [Cunknown] arrows will
-    trigger an error.
-
-    let f g =
-      g ~a:() ~b:();
-      g ~b:() ~a:();
-
-    Error: This function is applied to arguments
-    in an order different from other calls.
-    This is only allowed when the real type is known.
-*)
-and commutable =
-    Cok
-  | Cunknown
-  | Clink of commutable ref
-
-module TypeOps : sig
-  type t = type_expr
-  val compare : t -> t -> int
-  val equal : t -> t -> bool
-  val hash : t -> int
-end
-
-(* Maps of methods and instance variables *)
-
-module Meths : Map.S with type key = string
-module Vars  : Map.S with type key = string
-
-(* Value descriptions *)
-
-type value_description =
-  { val_type: type_expr;                (* Type of the value *)
-    val_kind: value_kind;
-    val_loc: Location.t;
-    val_attributes: Parsetree.attributes;
-   }
-
-and value_kind =
-    Val_reg                             (* Regular value *)
-  | Val_prim of Primitive.description   (* Primitive *)
-
-(* Variance *)
-
-module Variance : sig
-  type t
-  type f = May_pos | May_neg | May_weak | Inj | Pos | Neg | Inv
-  val null : t                          (* no occurrence *)
-  val full : t                          (* strictly invariant *)
-  val covariant : t                     (* strictly covariant *)
-  val may_inv : t                       (* maybe invariant *)
-  val union  : t -> t -> t
-  val inter  : t -> t -> t
-  val subset : t -> t -> bool
-  val set : f -> bool -> t -> t
-  val mem : f -> t -> bool
-  val conjugate : t -> t                (* exchange positive and negative *)
-  val get_upper : t -> bool * bool                  (* may_pos, may_neg   *)
-  val get_lower : t -> bool * bool * bool * bool    (* pos, neg, inv, inj *)
-end
-
-(* Type definitions *)
-
-type type_declaration =
-  { type_params: type_expr list;
-    type_arity: int;
-    type_kind: type_kind;
-    type_private: private_flag;
-    type_manifest: type_expr option;
-    type_variance: Variance.t list;
-    (* covariant, contravariant, weakly contravariant, injective *)
-    type_newtype_level: (int * int) option;
-    (* definition level * expansion level *)
-    type_loc: Location.t;
-    type_attributes: Parsetree.attributes;
-    type_immediate: bool; (* true iff type should not be a pointer *)
-    type_unboxed: unboxed_status;
-  }
-
-and type_kind =
-    Type_abstract
-  | Type_record of label_declaration list  * record_representation
-  | Type_variant of constructor_declaration list
-  | Type_open
-
-and record_representation =
-  | Record_regular                        (* All fields are boxed / tagged *)
-  | Record_float_unused                   (* Was: all fields are floats. Now: unused *)
-  | Record_unboxed of bool                (* Unboxed single-field record, inlined or not *)
-  | Record_inlined of                     (* Inlined record *)
-      { tag : int ; name : string; num_nonconsts : int; optional_labels : string list; attrs: Parsetree.attributes }
-  | Record_extension                      (* Inlined record under extension *)
-  | Record_optional_labels of string list (* List of optional labels *)
-
-and label_declaration =
-  {
-    ld_id: Ident.t;
-    ld_mutable: mutable_flag;
-    ld_type: type_expr;
-    ld_loc: Location.t;
-    ld_attributes: Parsetree.attributes;
-  }
-
-and constructor_declaration =
-  {
-    cd_id: Ident.t;
-    cd_args: constructor_arguments;
-    cd_res: type_expr option;
-    cd_loc: Location.t;
-    cd_attributes: Parsetree.attributes;
-  }
-
-and constructor_arguments =
-  | Cstr_tuple of type_expr list
-  | Cstr_record of label_declaration list
-
-and unboxed_status = private
-  (* This type must be private in order to ensure perfect sharing of the
-     four possible values. Otherwise, ocamlc.byte and ocamlc.opt produce
-     different executables. *)
-  {
-    unboxed: bool;
-    default: bool; (* True for unannotated unboxable types. *)
-  }
-
-val unboxed_false_default_false : unboxed_status
-val unboxed_false_default_true : unboxed_status
-val unboxed_true_default_false : unboxed_status
-val unboxed_true_default_true : unboxed_status
-
-type extension_constructor =
-    {
-      ext_type_path: Path.t;
-      ext_type_params: type_expr list;
-      ext_args: constructor_arguments;
-      ext_ret_type: type_expr option;
-      ext_private: private_flag;
-      ext_loc: Location.t;
-      ext_attributes: Parsetree.attributes;
-    }
-
-and type_transparence =
-    Type_public      (* unrestricted expansion *)
-  | Type_new         (* "new" type *)
-  | Type_private     (* private type *)
-
-(* Type expressions for the class language *)
-
-module Concr : Set.S with type elt = string
-
-type class_type =
-    Cty_constr of Path.t * type_expr list * class_type
-  | Cty_signature of class_signature
-  | Cty_arrow of arg_label * type_expr * class_type
-
-and class_signature =
-  { csig_self: type_expr;
-    csig_vars:
-      (Asttypes.mutable_flag * Asttypes.virtual_flag * type_expr) Vars.t;
-    csig_concr: Concr.t;
-    csig_inher: (Path.t * type_expr list) list }
-
-type class_declaration =
-  { cty_params: type_expr list;
-    mutable cty_type: class_type;
-    cty_path: Path.t;
-    cty_new: type_expr option;
-    cty_variance: Variance.t list;
-    cty_loc: Location.t;
-    cty_attributes: Parsetree.attributes;
-  }
-
-type class_type_declaration =
-  { clty_params: type_expr list;
-    clty_type: class_type;
-    clty_path: Path.t;
-    clty_variance: Variance.t list;
-    clty_loc: Location.t;
-    clty_attributes: Parsetree.attributes;
-  }
-
-(* Type expressions for the module language *)
-
-type module_type =
-    Mty_ident of Path.t
-  | Mty_signature of signature
-  | Mty_functor of Ident.t * module_type option * module_type
-  | Mty_alias of alias_presence * Path.t
-
-and alias_presence =
-  | Mta_present
-  | Mta_absent
-
-and signature = signature_item list
-
-and signature_item =
-    Sig_value of Ident.t * value_description
-  | Sig_type of Ident.t * type_declaration * rec_status
-  | Sig_typext of Ident.t * extension_constructor * ext_status
-  | Sig_module of Ident.t * module_declaration * rec_status
-  | Sig_modtype of Ident.t * modtype_declaration
-  | Sig_class of unit
-  | Sig_class_type of Ident.t * class_type_declaration * rec_status
-
-and module_declaration =
-  {
-    md_type: module_type;
-    md_attributes: Parsetree.attributes;
-    md_loc: Location.t;
-  }
-
-and modtype_declaration =
-  {
-    mtd_type: module_type option;  (* None: abstract *)
-    mtd_attributes: Parsetree.attributes;
-    mtd_loc: Location.t;
-  }
-
-and rec_status =
-    Trec_not                   (* first in a nonrecursive group *)
-  | Trec_first                 (* first in a recursive group *)
-  | Trec_next                  (* not first in a recursive/nonrecursive group *)
-
-and ext_status =
-    Text_first                     (* first constructor in an extension *)
-  | Text_next                      (* not first constructor in an extension *)
-  | Text_exception
-
-
-(* Constructor and record label descriptions inserted held in typing
-   environments *)
-
-type constructor_description =
-  { cstr_name: string;                  (* Constructor name *)
-    cstr_res: type_expr;                (* Type of the result *)
-    cstr_existentials: type_expr list;  (* list of existentials *)
-    cstr_args: type_expr list;          (* Type of the arguments *)
-    cstr_arity: int;                    (* Number of arguments *)
-    cstr_tag: constructor_tag;          (* Tag for heap blocks *)
-    cstr_consts: int;                   (* Number of constant constructors *)
-    cstr_nonconsts: int;                (* Number of non-const constructors *)
-    cstr_normal: int;                   (* Number of non generalized constrs *)
-    cstr_generalized: bool;             (* Constrained return type? *)
-    cstr_private: private_flag;         (* Read-only constructor? *)
-    cstr_loc: Location.t;
-    cstr_attributes: Parsetree.attributes;
-    cstr_inlined: type_declaration option;
-   }
-
-and constructor_tag =
-    Cstr_constant of int                (* Constant constructor (an int) *)
-  | Cstr_block of int                   (* Regular constructor (a block) *)
-  | Cstr_unboxed                        (* Constructor of an unboxed type *)
-  | Cstr_extension of Path.t * bool     (* Extension constructor
-                                           true if a constant false if a block*)
-
-(* Constructors are the same *)
-val equal_tag :  constructor_tag -> constructor_tag -> bool
-
-(* Constructors may be the same, given potential rebinding *)
-val may_equal_constr :
-    constructor_description ->  constructor_description -> bool
-
-type label_description =
-  { lbl_name: string;                   (* Short name *)
-    lbl_res: type_expr;                 (* Type of the result *)
-    lbl_arg: type_expr;                 (* Type of the argument *)
-    lbl_mut: mutable_flag;              (* Is this a mutable field? *)
-    lbl_pos: int;                       (* Position in block *)
-    lbl_all: label_description array;   (* All the labels in this type *)
-    lbl_repres: record_representation;  (* Representation for this record *)
-    lbl_private: private_flag;          (* Read-only field? *)
-    lbl_loc: Location.t;
-    lbl_attributes: Parsetree.attributes;
-  }
-
-val same_record_representation : record_representation -> record_representation -> bool
\ No newline at end of file
diff --git a/jscomp/ml/typetexp.ml b/jscomp/ml/typetexp.ml
deleted file mode 100644
index 5e63257..0000000
--- a/jscomp/ml/typetexp.ml
+++ /dev/null
@@ -1,1070 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* typetexp.ml,v 1.34.4.9 2002/01/07 08:39:16 garrigue Exp *)
-
-(* Typechecking of type expressions for the core language *)
-
-open Asttypes
-open Misc
-open Parsetree
-open Typedtree
-open Types
-open Ctype
-
-exception Already_bound
-
-type error =
-    Unbound_type_variable of string
-  | Unbound_type_constructor of Longident.t
-  | Unbound_type_constructor_2 of Path.t
-  | Type_arity_mismatch of Longident.t * int * int
-  | Bound_type_variable of string
-  | Recursive_type
-  | Unbound_row_variable of Longident.t
-  | Type_mismatch of (type_expr * type_expr) list
-  | Alias_type_mismatch of (type_expr * type_expr) list
-  | Present_has_conjunction of string
-  | Present_has_no_type of string
-  | Constructor_mismatch of type_expr * type_expr
-  | Not_a_variant of type_expr
-  | Variant_tags of string * string
-  | Invalid_variable_name of string
-  | Cannot_quantify of string * type_expr
-  | Multiple_constraints_on_type of Longident.t
-  | Method_mismatch of string * type_expr * type_expr
-  | Unbound_value of Longident.t
-  | Unbound_constructor of Longident.t
-  | Unbound_label of Longident.t
-  | Unbound_module of Longident.t
-  | Unbound_class of Longident.t
-  | Unbound_modtype of Longident.t
-  | Unbound_cltype of Longident.t
-  | Ill_typed_functor_application of Longident.t
-  | Illegal_reference_to_recursive_module
-  | Access_functor_as_structure of Longident.t
-  | Apply_structure_as_functor of Longident.t
-  | Cannot_scrape_alias of Longident.t * Path.t
-  | Opened_object of Path.t option
-  | Not_an_object of type_expr
-
-exception Error of Location.t * Env.t * error
-exception Error_forward of Location.error
-
-
-type variable_context = int * (string, type_expr) Tbl.t
-
-(* Local definitions *)
-
-let instance_list = Ctype.instance_list Env.empty
-
-(* Narrowing unbound identifier errors. *)
-
-let rec narrow_unbound_lid_error : 'a. _ -> _ -> _ -> _ -> 'a =
-  fun env loc lid make_error ->
-  let check_module mlid =
-    try ignore (Env.lookup_module ~load:true mlid env) with
-    | Not_found ->
-        narrow_unbound_lid_error env loc mlid (fun lid -> Unbound_module lid)
-    | Env.Recmodule ->
-        raise (Error (loc, env, Illegal_reference_to_recursive_module))
-  in
-  begin match lid with
-  | Longident.Lident _ -> ()
-  | Longident.Ldot (mlid, _) ->
-      check_module mlid;
-      let md = Env.find_module (Env.lookup_module ~load:true mlid env) env in
-      begin match Env.scrape_alias env md.md_type with
-      | Mty_functor _ ->
-          raise (Error (loc, env, Access_functor_as_structure mlid))
-      | Mty_alias(_, p) ->
-          raise (Error (loc, env, Cannot_scrape_alias(mlid, p)))
-      | _ -> ()
-      end
-  | Longident.Lapply (flid, mlid) ->
-      check_module flid;
-      let fmd = Env.find_module (Env.lookup_module ~load:true flid env) env in
-      begin match Env.scrape_alias env fmd.md_type with
-      | Mty_signature _ ->
-          raise (Error (loc, env, Apply_structure_as_functor flid))
-      | Mty_alias(_, p) ->
-          raise (Error (loc, env, Cannot_scrape_alias(flid, p)))
-      | _ -> ()
-      end;
-      check_module mlid;
-      let mmd = Env.find_module (Env.lookup_module ~load:true mlid env) env in
-      begin match Env.scrape_alias env mmd.md_type with
-      | Mty_alias(_, p) ->
-          raise (Error (loc, env, Cannot_scrape_alias(mlid, p)))
-      | _ ->
-          raise (Error (loc, env, Ill_typed_functor_application lid))
-      end
-  end;
-  raise (Error (loc, env, make_error lid))
-
-let find_component (lookup : ?loc:_ -> _) make_error env loc lid =
-  try
-    match lid with
-    | Longident.Ldot (Longident.Lident "*predef*", s) ->
-        lookup ~loc (Longident.Lident s) Env.initial_safe_string
-    | _ ->
-        lookup ~loc lid env
-  with Not_found ->
-    narrow_unbound_lid_error env loc lid make_error
-  | Env.Recmodule ->
-    raise (Error (loc, env, Illegal_reference_to_recursive_module))
-
-let find_type env loc lid =
-  let path =
-    find_component Env.lookup_type (fun lid -> Unbound_type_constructor lid)
-      env loc lid
-  in
-  let decl = Env.find_type path env in
-  Builtin_attributes.check_deprecated loc decl.type_attributes (Path.name path);
-  (path, decl)
-
-let find_constructor =
-  find_component Env.lookup_constructor (fun lid -> Unbound_constructor lid)
-let find_all_constructors =
-  find_component Env.lookup_all_constructors
-    (fun lid -> Unbound_constructor lid)
-let find_label =
-  find_component Env.lookup_label (fun lid -> Unbound_label lid)
-let find_all_labels =
-  find_component Env.lookup_all_labels (fun lid -> Unbound_label lid)
-
-let find_class env loc lid =
-  let (path, decl) as r =
-    find_component Env.lookup_class (fun lid -> Unbound_class lid) env loc lid
-  in
-  Builtin_attributes.check_deprecated loc decl.cty_attributes (Path.name path);
-  r
-
-let find_value env loc lid =
-  Env.check_value_name (Longident.last lid) loc;
-  let (path, decl) as r =
-    find_component Env.lookup_value (fun lid -> Unbound_value lid) env loc lid
-  in
-  Builtin_attributes.check_deprecated loc decl.val_attributes (Path.name path);
-  r
-
-let lookup_module ?(load=false) env loc lid =
-  find_component (fun ?loc lid env -> (Env.lookup_module ~load ?loc lid env))
-    (fun lid -> Unbound_module lid) env loc lid
-
-let find_module env loc lid =
-  let path = lookup_module ~load:true env loc lid in
-  let decl = Env.find_module path env in
-  (* No need to check for deprecated here, this is done in Env. *)
-  (path, decl)
-
-let find_modtype env loc lid =
-  let (path, decl) as r =
-    find_component Env.lookup_modtype (fun lid -> Unbound_modtype lid)
-      env loc lid
-  in
-  Builtin_attributes.check_deprecated loc decl.mtd_attributes (Path.name path);
-  r
-
-let find_class_type env loc lid =
-  let (path, decl) as r =
-    find_component Env.lookup_cltype (fun lid -> Unbound_cltype lid)
-      env loc lid
-  in
-  Builtin_attributes.check_deprecated loc decl.clty_attributes (Path.name path);
-  r
-
-let unbound_constructor_error env lid =
-  narrow_unbound_lid_error env lid.loc lid.txt
-    (fun lid -> Unbound_constructor lid)
-
-let unbound_label_error env lid =
-  narrow_unbound_lid_error env lid.loc lid.txt
-    (fun lid -> Unbound_label lid)
-
-(* Support for first-class modules. *)
-
-let transl_modtype_longident = ref (fun _ -> assert false)
-let transl_modtype = ref (fun _ -> assert false)
-
-let create_package_mty fake loc env (p, l) =
-  let l =
-    List.sort
-      (fun (s1, _t1) (s2, _t2) ->
-         if s1.txt = s2.txt then
-           raise (Error (loc, env, Multiple_constraints_on_type s1.txt));
-         compare s1.txt s2.txt)
-      l
-  in
-  l,
-  List.fold_left
-    (fun mty (s, t) ->
-      let d = {ptype_name = mkloc (Longident.last s.txt) s.loc;
-               ptype_params = [];
-               ptype_cstrs = [];
-               ptype_kind = Ptype_abstract;
-               ptype_private = Asttypes.Public;
-               ptype_manifest = if fake then None else Some t;
-               ptype_attributes = [];
-               ptype_loc = loc} in
-      Ast_helper.Mty.mk ~loc
-        (Pmty_with (mty, [ Pwith_type ({ txt = s.txt; loc }, d) ]))
-    )
-    (Ast_helper.Mty.mk ~loc (Pmty_ident p))
-    l
-
-(* Translation of type expressions *)
-
-let type_variables = ref (Tbl.empty : (string, type_expr) Tbl.t)
-let univars        = ref ([] : (string * type_expr) list)
-let pre_univars    = ref ([] : type_expr list)
-let used_variables = ref (Tbl.empty : (string, type_expr * Location.t) Tbl.t)
-
-let reset_type_variables () =
-  reset_global_level ();
-  Ctype.reset_reified_var_counter ();
-  type_variables := Tbl.empty
-
-let narrow () =
-  (increase_global_level (), !type_variables)
-
-let widen (gl, tv) =
-  restore_global_level gl;
-  type_variables := tv
-
-let strict_ident c = (c = '_' || c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z')
-
-let validate_name = function
-    None -> None
-  | Some name as s ->
-      if name <> "" && strict_ident name.[0] then s else None
-
-let new_global_var ?name () =
-  new_global_var ?name:(validate_name name) ()
-let newvar ?name () =
-  newvar ?name:(validate_name name) ()
-
-let type_variable loc name =
-  try
-    Tbl.find name !type_variables
-  with Not_found ->
-    raise(Error(loc, Env.empty, Unbound_type_variable ("'" ^ name)))
-
-let transl_type_param env styp =
-  let loc = styp.ptyp_loc in
-  match styp.ptyp_desc with
-    Ptyp_any ->
-      let ty = new_global_var ~name:"_" () in
-        { ctyp_desc = Ttyp_any; ctyp_type = ty; ctyp_env = env;
-          ctyp_loc = loc; ctyp_attributes = styp.ptyp_attributes; }
-  | Ptyp_var name ->
-      let ty =
-        try
-          if name <> "" && name.[0] = '_' then
-            raise (Error (loc, Env.empty, Invalid_variable_name ("'" ^ name)));
-          ignore (Tbl.find name !type_variables);
-          raise Already_bound
-        with Not_found ->
-          let v = new_global_var ~name () in
-            type_variables := Tbl.add name v !type_variables;
-            v
-      in
-        { ctyp_desc = Ttyp_var name; ctyp_type = ty; ctyp_env = env;
-          ctyp_loc = loc; ctyp_attributes = styp.ptyp_attributes; }
-  | _ -> assert false
-
-let transl_type_param env styp =
-  (* Currently useless, since type parameters cannot hold attributes
-     (but this could easily be lifted in the future). *)
-  Builtin_attributes.warning_scope styp.ptyp_attributes
-    (fun () -> transl_type_param env styp)
-
-
-let new_pre_univar ?name () =
-  let v = newvar ?name () in pre_univars := v :: !pre_univars; v
-
-let rec swap_list = function
-    x :: y :: l -> y :: x :: swap_list l
-  | l -> l
-
-type policy = Fixed | Extensible | Univars
-
-let rec transl_type env policy styp =
-  Builtin_attributes.warning_scope styp.ptyp_attributes
-    (fun () -> transl_type_aux env policy styp)
-
-and transl_type_aux env policy styp =
-  let loc = styp.ptyp_loc in
-  let ctyp ctyp_desc ctyp_type =
-    { ctyp_desc; ctyp_type; ctyp_env = env;
-      ctyp_loc = loc; ctyp_attributes = styp.ptyp_attributes }
-  in
-  match styp.ptyp_desc with
-    Ptyp_any ->
-      let ty =
-        if policy = Univars then new_pre_univar () else
-          if policy = Fixed then
-            raise (Error (styp.ptyp_loc, env, Unbound_type_variable "_"))
-          else newvar ()
-      in
-      ctyp Ttyp_any ty
-  | Ptyp_var name ->
-    let ty =
-      if name <> "" && name.[0] = '_' then
-        raise (Error (styp.ptyp_loc, env, Invalid_variable_name ("'" ^ name)));
-      begin try
-        instance env (List.assoc name !univars)
-      with Not_found -> try
-        instance env (fst(Tbl.find name !used_variables))
-      with Not_found ->
-        let v =
-          if policy = Univars then new_pre_univar ~name () else newvar ~name ()
-        in
-        used_variables := Tbl.add name (v, styp.ptyp_loc) !used_variables;
-        v
-      end
-    in
-    ctyp (Ttyp_var name) ty
-  | Ptyp_arrow(l, st1, st2) ->
-    let cty1 = transl_type env policy st1 in
-    let cty2 = transl_type env policy st2 in
-    let ty1 = cty1.ctyp_type in
-    let ty1 =
-      if Btype.is_optional l
-      then newty (Tconstr(Predef.path_option,[ty1], ref Mnil))
-      else ty1 in
-    let ty = newty (Tarrow(l, ty1, cty2.ctyp_type, Cok)) in
-    ctyp (Ttyp_arrow (l, cty1, cty2)) ty
-  | Ptyp_tuple stl ->
-    assert (List.length stl >= 2);
-    let ctys = List.map (transl_type env policy) stl in
-    let ty = newty (Ttuple (List.map (fun ctyp -> ctyp.ctyp_type) ctys)) in
-    ctyp (Ttyp_tuple ctys) ty
-  | Ptyp_constr(lid, stl) ->
-      let (path, decl) = find_type env lid.loc lid.txt in
-      let stl =
-        match stl with
-        | [ {ptyp_desc=Ptyp_any} as t ] when decl.type_arity > 1 ->
-            List.map (fun _ -> t) decl.type_params
-        | _ -> stl
-      in
-      if List.length stl <> decl.type_arity then
-        raise(Error(styp.ptyp_loc, env,
-                    Type_arity_mismatch(lid.txt, decl.type_arity,
-                                        List.length stl)));
-      let args = List.map (transl_type env policy) stl in
-      let params = instance_list decl.type_params in
-      let unify_param =
-        match decl.type_manifest with
-          None -> unify_var
-        | Some ty ->
-            if (repr ty).level = Btype.generic_level then unify_var else unify
-      in
-      List.iter2
-        (fun (sty, cty) ty' ->
-           try unify_param env ty' cty.ctyp_type with Unify trace ->
-             raise (Error(sty.ptyp_loc, env, Type_mismatch (swap_list trace))))
-        (List.combine stl args) params;
-      let constr =
-        newconstr path (List.map (fun ctyp -> ctyp.ctyp_type) args) in
-      begin try
-        Ctype.enforce_constraints env constr
-      with Unify trace ->
-        raise (Error(styp.ptyp_loc, env, Type_mismatch trace))
-      end;
-      ctyp (Ttyp_constr (path, lid, args)) constr
-  | Ptyp_object (fields, o) ->
-      let ty, fields = transl_fields env policy o fields in
-      ctyp (Ttyp_object (fields, o)) (newobj ty)
-  | Ptyp_class(lid, stl) ->
-      let (path, decl, _is_variant) =
-        try
-          let path = Env.lookup_type lid.txt env in
-          let decl = Env.find_type path env in
-          let rec check decl =
-            match decl.type_manifest with
-              None -> raise Not_found
-            | Some ty ->
-                match (repr ty).desc with
-                  Tvariant row when Btype.static_row row -> ()
-                | Tconstr (path, _, _) ->
-                    check (Env.find_type path env)
-                | _ -> raise Not_found
-          in check decl;
-          Location.deprecated styp.ptyp_loc
-            "old syntax for polymorphic variant type";
-          (path, decl,true)
-        with Not_found -> try
-          let lid2 =
-            match lid.txt with
-              Longident.Lident s     -> Longident.Lident ("#" ^ s)
-            | Longident.Ldot(r, s)   -> Longident.Ldot (r, "#" ^ s)
-            | Longident.Lapply(_, _) -> fatal_error "Typetexp.transl_type"
-          in
-          let path = Env.lookup_type lid2 env in
-          let decl = Env.find_type path env in
-          (path, decl, false)
-        with Not_found ->
-          ignore (find_class env lid.loc lid.txt); assert false
-      in
-      if List.length stl <> decl.type_arity then
-        raise(Error(styp.ptyp_loc, env,
-                    Type_arity_mismatch(lid.txt, decl.type_arity,
-                                        List.length stl)));
-      let args = List.map (transl_type env policy) stl in
-      let params = instance_list decl.type_params in
-      List.iter2
-        (fun (sty, cty) ty' ->
-           try unify_var env ty' cty.ctyp_type with Unify trace ->
-             raise (Error(sty.ptyp_loc, env, Type_mismatch (swap_list trace))))
-        (List.combine stl args) params;
-        let ty_args = List.map (fun ctyp -> ctyp.ctyp_type) args in
-      let ty =
-        try Ctype.expand_head env (newconstr path ty_args)
-        with Unify trace ->
-          raise (Error(styp.ptyp_loc, env, Type_mismatch trace))
-      in
-      let ty = match ty.desc with
-        Tvariant row ->
-          let row = Btype.row_repr row in
-          let fields =
-            List.map
-              (fun (l,f) -> l,
-                match Btype.row_field_repr f with
-                | Rpresent (Some ty) ->
-                    Reither(false, [ty], false, ref None)
-                | Rpresent None ->
-                    Reither (true, [], false, ref None)
-                | _ -> f)
-              row.row_fields
-          in
-          let row = { row_closed = true; row_fields = fields;
-                      row_bound = (); row_name = Some (path, ty_args);
-                      row_fixed = false; row_more = newvar () } in
-          let static = Btype.static_row row in
-          let row =
-            if static then { row with row_more = newty Tnil }
-            else if policy <> Univars then row
-            else { row with row_more = new_pre_univar () }
-          in
-          newty (Tvariant row)
-      | Tobject (fi, _) ->
-          let _, tv = flatten_fields fi in
-          if policy = Univars then pre_univars := tv :: !pre_univars;
-          ty
-      | _ ->
-          assert false
-      in
-      ctyp (Ttyp_class (path, lid, args)) ty
-  | Ptyp_alias(st, alias) ->
-      let cty =
-        try
-          let t =
-            try List.assoc alias !univars
-            with Not_found ->
-              instance env (fst(Tbl.find alias !used_variables))
-          in
-          let ty = transl_type env policy st in
-          begin try unify_var env t ty.ctyp_type with Unify trace ->
-            let trace = swap_list trace in
-            raise(Error(styp.ptyp_loc, env, Alias_type_mismatch trace))
-          end;
-          ty
-        with Not_found ->
-          let t = newvar () in
-          used_variables := Tbl.add alias (t, styp.ptyp_loc) !used_variables;
-          let ty = transl_type env policy st in
-          begin try unify_var env t ty.ctyp_type with Unify trace ->
-            let trace = swap_list trace in
-            raise(Error(styp.ptyp_loc, env, Alias_type_mismatch trace))
-          end;
-          let t = instance env t in
-          let px = Btype.proxy t in
-          begin match px.desc with
-          | Tvar None -> Btype.log_type px; px.desc <- Tvar (Some alias)
-          | Tunivar None -> Btype.log_type px; px.desc <- Tunivar (Some alias)
-          | _ -> ()
-          end;
-          { ty with ctyp_type = t }
-      in
-      ctyp (Ttyp_alias (cty, alias)) cty.ctyp_type
-  | Ptyp_variant(fields, closed, present) ->
-      let name = ref None in
-      let mkfield l f =
-        newty (Tvariant {row_fields=[l,f]; row_more=newvar();
-                         row_bound=(); row_closed=true;
-                         row_fixed=false; row_name=None}) in
-      let hfields = Hashtbl.create 17 in
-      let collection_detect = Hashtbl.create 17 in 
-      let add_typed_field loc l f =
-        if not !Config.bs_only  then begin 
-          let h = Btype.hash_variant l in
-          if Hashtbl.mem collection_detect h then 
-            let l' = Hashtbl.find collection_detect h  in 
-            (* Check for tag conflicts *)
-            if l <> l' then raise(Error(styp.ptyp_loc, env, Variant_tags(l, l')));
-          else Hashtbl.add collection_detect h l 
-        end ;
-        try
-          let (_,f') = Hashtbl.find hfields l in
-          let ty = mkfield l f and ty' = mkfield l f' in
-          if equal env false [ty] [ty'] then () else
-          try unify env ty ty'
-          with Unify _trace ->
-            raise(Error(loc, env, Constructor_mismatch (ty,ty')))
-        with Not_found ->
-          Hashtbl.add hfields l (l,f)
-      in
-      let add_field = function
-          Rtag (l, attrs, c, stl) ->
-            name := None;
-            let tl =
-              Builtin_attributes.warning_scope attrs
-                (fun () -> List.map (transl_type env policy) stl)
-            in
-            let f = match present with
-              Some present when not (List.mem l.txt present) ->
-                let ty_tl = List.map (fun cty -> cty.ctyp_type) tl in
-                Reither(c, ty_tl, false, ref None)
-            | _ ->
-                if List.length stl > 1 || c && stl <> [] then
-                  raise(Error(styp.ptyp_loc, env,
-                              Present_has_conjunction l.txt));
-                match tl with [] -> Rpresent None
-                | st :: _ ->
-                      Rpresent (Some st.ctyp_type)
-            in
-            add_typed_field styp.ptyp_loc l.txt f;
-              Ttag (l,attrs,c,tl)
-        | Rinherit sty ->
-            let cty = transl_type env policy sty in
-            let ty = cty.ctyp_type in
-            let nm =
-              match repr cty.ctyp_type with
-                {desc=Tconstr(p, tl, _)} -> Some(p, tl)
-              | _                        -> None
-            in
-            begin 
-              (* Set name if there are no fields yet *)
-              if Hashtbl.length hfields <> 0 then name := None
-              else name := nm
-            end;
-            let fl = match expand_head env cty.ctyp_type, nm with
-              {desc=Tvariant row}, _ when Btype.static_row row ->
-                let row = Btype.row_repr row in
-                row.row_fields
-            | {desc=Tvar _}, Some(p, _) ->
-                raise(Error(sty.ptyp_loc, env, Unbound_type_constructor_2 p))
-            | _ ->
-                raise(Error(sty.ptyp_loc, env, Not_a_variant ty))
-            in
-            List.iter
-              (fun (l, f) ->
-                let f = match present with
-                  Some present when not (List.mem l present) ->
-                    begin match f with
-                      Rpresent(Some ty) ->
-                        Reither(false, [ty], false, ref None)
-                    | Rpresent None ->
-                        Reither(true, [], false, ref None)
-                    | _ ->
-                        assert false
-                    end
-                | _ -> f
-                in
-                add_typed_field sty.ptyp_loc l f)
-              fl;
-              Tinherit cty
-      in
-      let tfields = List.map add_field fields in
-      let fields = Hashtbl.fold (fun _ p l -> p :: l) hfields [] in
-      begin match present with None -> ()
-      | Some present ->
-          List.iter
-            (fun l -> if not (List.mem_assoc l fields) then
-              raise(Error(styp.ptyp_loc, env, Present_has_no_type l)))
-            present
-      end;
-      let row =
-        { row_fields = List.rev fields; row_more = newvar ();
-          row_bound = (); row_closed = (closed = Closed);
-          row_fixed = false; row_name = !name } in
-      let static = Btype.static_row row in
-      let row =
-        if static then { row with row_more = newty Tnil }
-        else if policy <> Univars then row
-        else { row with row_more = new_pre_univar () }
-      in
-      let ty = newty (Tvariant row) in
-      ctyp (Ttyp_variant (tfields, closed, present)) ty
-  | Ptyp_poly(vars, st) ->
-      let vars = List.map (fun v -> v.txt) vars in
-      begin_def();
-      let new_univars = List.map (fun name -> name, newvar ~name ()) vars in
-      let old_univars = !univars in
-      univars := new_univars @ !univars;
-      let cty = transl_type env policy st in
-      let ty = cty.ctyp_type in
-      univars := old_univars;
-      end_def();
-      generalize ty;
-      let ty_list =
-        List.fold_left
-          (fun tyl (name, ty1) ->
-            let v = Btype.proxy ty1 in
-            if deep_occur v ty then begin
-              match v.desc with
-                Tvar name when v.level = Btype.generic_level ->
-                  v.desc <- Tunivar name;
-                  v :: tyl
-              | _ ->
-                raise (Error (styp.ptyp_loc, env, Cannot_quantify (name, v)))
-            end else tyl)
-          [] new_univars
-      in
-      let ty' = Btype.newgenty (Tpoly(ty, List.rev ty_list)) in
-      unify_var env (newvar()) ty';
-      ctyp (Ttyp_poly (vars, cty)) ty'
-  | Ptyp_package (p, l) ->
-      let l, mty = create_package_mty true styp.ptyp_loc env (p, l) in
-      let z = narrow () in
-      let mty = !transl_modtype env mty in
-      widen z;
-      let ptys = List.map (fun (s, pty) ->
-                             s, transl_type env policy pty
-                          ) l in
-      let path = !transl_modtype_longident styp.ptyp_loc env p.txt in
-      let ty = newty (Tpackage (path,
-                       List.map (fun (s, _pty) -> s.txt) l,
-                       List.map (fun (_,cty) -> cty.ctyp_type) ptys))
-      in
-      ctyp (Ttyp_package {
-            pack_path = path;
-            pack_type = mty.mty_type;
-            pack_fields = ptys;
-            pack_txt = p;
-           }) ty
-  | Ptyp_extension ext ->
-      raise (Error_forward (Builtin_attributes.error_of_extension ext))
-
-and transl_poly_type env policy t =
-  transl_type env policy (Ast_helper.Typ.force_poly t)
-
-and transl_fields env policy o fields =
-  let hfields = Hashtbl.create 17 in
-  let add_typed_field loc l ty =
-    try
-      let ty' = Hashtbl.find hfields l in
-      if equal env false [ty] [ty'] then () else
-        try unify env ty ty'
-        with Unify _trace ->
-          raise(Error(loc, env, Method_mismatch (l, ty, ty')))
-    with Not_found ->
-      Hashtbl.add hfields l ty in
-  let add_field = function
-    | Otag (s, a, ty1) -> begin
-        let ty1 =
-          Builtin_attributes.warning_scope a
-            (fun () -> transl_poly_type env policy ty1)
-        in
-        let field = OTtag (s, a, ty1) in
-        add_typed_field ty1.ctyp_loc s.txt ty1.ctyp_type;
-        field
-      end
-    | Oinherit sty -> begin
-        let cty = transl_type env policy sty in
-        let nm =
-          match repr cty.ctyp_type with
-            {desc=Tconstr(p, _, _)} -> Some p
-          | _                        -> None in
-        let t = expand_head env cty.ctyp_type in
-        match t, nm with
-          {desc=Tobject ({desc=(Tfield _ | Tnil) as tf}, _)}, _ -> begin
-            if opened_object t then
-              raise (Error (sty.ptyp_loc, env, Opened_object nm));
-            let rec iter_add = function
-              | Tfield (s, _k, ty1, ty2) -> begin
-                  add_typed_field sty.ptyp_loc s ty1;
-                  iter_add ty2.desc
-                end
-              | Tnil -> ()
-              | _ -> assert false in
-            iter_add tf;
-            OTinherit cty
-            end
-        | {desc=Tvar _}, Some p ->
-            raise (Error (sty.ptyp_loc, env, Unbound_type_constructor_2 p))
-        | _ -> raise (Error (sty.ptyp_loc, env, Not_an_object t))
-      end in
-  let object_fields = List.map add_field fields in
-  let fields = Hashtbl.fold (fun s ty l -> (s, ty) :: l) hfields [] in
-  let ty_init =
-     match o, policy with
-     | Closed, _ -> newty Tnil
-     | Open, Univars -> new_pre_univar ()
-     | Open, _ -> newvar () in
-  let ty = List.fold_left (fun ty (s, ty') ->
-      newty (Tfield (s, Fpresent, ty', ty))) ty_init fields in
-  ty, object_fields
-
-
-(* Make the rows "fixed" in this type, to make universal check easier *)
-let rec make_fixed_univars ty =
-  let ty = repr ty in
-  if ty.level >= Btype.lowest_level then begin
-    Btype.mark_type_node ty;
-    match ty.desc with
-    | Tvariant row ->
-        let row = Btype.row_repr row in
-        if Btype.is_Tunivar (Btype.row_more row) then
-          ty.desc <- Tvariant
-              {row with row_fixed=true;
-               row_fields = List.map
-                 (fun (s,f as p) -> match Btype.row_field_repr f with
-                   Reither (c, tl, _m, r) -> s, Reither (c, tl, true, r)
-                 | _ -> p)
-                 row.row_fields};
-        Btype.iter_row make_fixed_univars row
-    | _ ->
-        Btype.iter_type_expr make_fixed_univars ty
-  end
-
-let make_fixed_univars ty =
-  make_fixed_univars ty;
-  Btype.unmark_type ty
-
-let create_package_mty = create_package_mty false
-
-let globalize_used_variables env fixed =
-  let r = ref [] in
-  Tbl.iter
-    (fun name (ty, loc) ->
-      let v = new_global_var () in
-      let snap = Btype.snapshot () in
-      if try unify env v ty; true with _ -> Btype.backtrack snap; false
-      then try
-        r := (loc, v,  Tbl.find name !type_variables) :: !r
-      with Not_found ->
-        if fixed && Btype.is_Tvar (repr ty) then
-          raise(Error(loc, env, Unbound_type_variable ("'"^name)));
-        let v2 = new_global_var () in
-        r := (loc, v, v2) :: !r;
-        type_variables := Tbl.add name v2 !type_variables)
-    !used_variables;
-  used_variables := Tbl.empty;
-  fun () ->
-    List.iter
-      (function (loc, t1, t2) ->
-        try unify env t1 t2 with Unify trace ->
-          raise (Error(loc, env, Type_mismatch trace)))
-      !r
-
-let transl_simple_type env fixed styp =
-  univars := []; used_variables := Tbl.empty;
-  let typ = transl_type env (if fixed then Fixed else Extensible) styp in
-  globalize_used_variables env fixed ();
-  make_fixed_univars typ.ctyp_type;
-  typ
-
-let transl_simple_type_univars env styp =
-  univars := []; used_variables := Tbl.empty; pre_univars := [];
-  begin_def ();
-  let typ = transl_type env Univars styp in
-  (* Only keep already global variables in used_variables *)
-  let new_variables = !used_variables in
-  used_variables := Tbl.empty;
-  Tbl.iter
-    (fun name p ->
-      if Tbl.mem name !type_variables then
-        used_variables := Tbl.add name p !used_variables)
-    new_variables;
-  globalize_used_variables env false ();
-  end_def ();
-  generalize typ.ctyp_type;
-  let univs =
-    List.fold_left
-      (fun acc v ->
-        let v = repr v in
-        match v.desc with
-          Tvar name when v.level = Btype.generic_level ->
-            v.desc <- Tunivar name; v :: acc
-        | _ -> acc)
-      [] !pre_univars
-  in
-  make_fixed_univars typ.ctyp_type;
-    { typ with ctyp_type =
-        instance env (Btype.newgenty (Tpoly (typ.ctyp_type, univs))) }
-
-let transl_simple_type_delayed env styp =
-  univars := []; used_variables := Tbl.empty;
-  let typ = transl_type env Extensible styp in
-  make_fixed_univars typ.ctyp_type;
-  (typ, globalize_used_variables env false)
-
-let transl_type_scheme env styp =
-  reset_type_variables();
-  begin_def();
-  let typ = transl_simple_type env false styp in
-  end_def();
-  generalize typ.ctyp_type;
-  typ
-
-
-(* Error report *)
-
-open Format
-open Printtyp
-
-let did_you_mean ppf choices : bool = 
-  (* flush now to get the error report early, in the (unheard of) case
-     where the linear search would take a bit of time; in the worst
-     case, the user has seen the error, she can interrupt the process
-     before the spell-checking terminates. *)
-  Format.fprintf ppf "@?";  
-  match choices () with   
-  | [] -> false
-  | last :: rev_rest ->
-    Format.fprintf ppf "@[<v 2>@,@,@{<info>Hint: Did you mean %s%s%s?@}@]"
-      (String.concat ", " (List.rev rev_rest))
-      (if rev_rest = [] then "" else " or ")
-      last;
-    true
-
-let super_spellcheck ppf fold env lid =
-  let choices path name : string list = 
-    let env : string list = fold (fun x  _ _ xs -> x ::xs ) path env []   in
-    Misc.spellcheck env name in 
-  match lid with
-  | Longident.Lapply _ -> false
-  | Longident.Lident s ->
-    did_you_mean ppf (fun _ -> choices None s)
-  | Longident.Ldot (r, s) ->
-    did_you_mean ppf (fun _ -> choices (Some r) s)
-
-let spellcheck ppf fold env lid =
-  let choices ~path name =
-    let env = fold (fun x xs -> x::xs) path env [] in
-    Misc.spellcheck env name in
-  match lid with
-    | Longident.Lapply _ -> ()
-    | Longident.Lident s ->
-        Misc.did_you_mean ppf (fun () -> choices ~path:None s)
-    | Longident.Ldot (r, s) ->
-        Misc.did_you_mean ppf (fun () -> choices ~path:(Some r) s)
-
-let fold_descr fold get_name f = fold (fun descr acc -> f (get_name descr) acc)
-let fold_simple fold4 f = fold4 (fun name _path _descr acc -> f name acc)
-
-let fold_constructors = fold_descr Env.fold_constructors (fun d -> d.cstr_name)
-let fold_labels = fold_descr Env.fold_labels (fun d -> d.lbl_name)
-let fold_classs = fold_simple Env.fold_classs
-let fold_modtypes = fold_simple Env.fold_modtypes
-let fold_cltypes = fold_simple Env.fold_cltypes
-
-let report_error env ppf = function
-  | Unbound_type_variable name ->
-     (* we don't use "spellcheck" here: the function that raises this
-        error seems not to be called anywhere, so it's unclear how it
-        should be handled *)
-    fprintf ppf "Unbound type parameter %s@." name
-  | Unbound_type_constructor lid ->
-    (* modified *)
-    Format.fprintf ppf "@[<v>This type constructor, `%a`, can't be found.@ "  Printtyp.longident lid;
-    let has_candidate = super_spellcheck ppf Env.fold_types env lid in
-    if !Config.syntax_kind = `rescript && not has_candidate then 
-      Format.fprintf ppf "If you wanted to write a recursive type, don't forget the `rec` in `type rec`@]"
-  | Unbound_type_constructor_2 p ->
-    fprintf ppf "The type constructor@ %a@ is not yet completely defined"
-      path p
-  | Type_arity_mismatch(lid, expected, provided) ->
-    if expected==0 then
-      fprintf ppf
-        "@[The type %a is not generic so expects no arguments,@ \
-          but is here applied to %i argument(s).@ \
-          Have you tried removing the angular brackets `<` and `>` and the@ \
-          arguments within them and just writing `%a` instead? @]"
-        longident lid provided longident lid
-    else 
-      fprintf ppf
-        "@[The type constructor %a@ expects %i argument(s),@ \
-          but is here applied to %i argument(s)@]"
-        longident lid expected provided
-  | Bound_type_variable name ->
-    fprintf ppf "Already bound type parameter '%s" name
-  | Recursive_type ->
-    fprintf ppf "This type is recursive"
-  | Unbound_row_variable lid ->
-      (* we don't use "spellcheck" here: this error is not raised
-         anywhere so it's unclear how it should be handled *)
-      fprintf ppf "Unbound row variable in #%a" longident lid
-  | Type_mismatch trace ->
-      Printtyp.report_unification_error ppf Env.empty trace
-        (function ppf ->
-           fprintf ppf "This type")
-        (function ppf ->
-           fprintf ppf "should be an instance of type")
-  | Alias_type_mismatch trace ->
-      Printtyp.report_unification_error ppf Env.empty trace
-        (function ppf ->
-           fprintf ppf "This alias is bound to type")
-        (function ppf ->
-           fprintf ppf "but is used as an instance of type")
-  | Present_has_conjunction l ->
-      fprintf ppf "The present constructor %s has a conjunctive type" l
-  | Present_has_no_type l ->
-      fprintf ppf "The present constructor %s has no type" l
-  | Constructor_mismatch (ty, ty') ->
-      wrap_printing_env env (fun ()  ->
-        Printtyp.reset_and_mark_loops_list [ty; ty'];
-        fprintf ppf "@[<hov>%s %a@ %s@ %a@]"
-          "This variant type contains a constructor"
-          Printtyp.type_expr ty
-          "which should be"
-          Printtyp.type_expr ty')
-  | Not_a_variant ty ->
-      Printtyp.reset_and_mark_loops ty;
-      fprintf ppf
-        "@[The type %a@ does not expand to a polymorphic variant type@]"
-        Printtyp.type_expr ty;
-      begin match ty.desc with
-        | Tvar (Some s) ->
-           (* PR#7012: help the user that wrote 'Foo instead of `Foo *)
-           Misc.did_you_mean ppf (fun () -> ["`" ^ s])
-        | _ -> ()
-      end
-  | Variant_tags (lab1, lab2) ->
-      fprintf ppf
-        "@[Variant tags %s@ and %s have the same hash value.@ %s@]"
-        (!Printtyp.print_res_poly_identifier lab1) (!Printtyp.print_res_poly_identifier lab2) "Change one of them."
-  | Invalid_variable_name name ->
-      fprintf ppf "The type variable name %s is not allowed in programs" name
-  | Cannot_quantify (name, v) ->
-      fprintf ppf
-        "@[<hov>The universal type variable '%s cannot be generalized:@ %s.@]"
-        name
-        (if Btype.is_Tvar v then "it escapes its scope" else
-         if Btype.is_Tunivar v then "it is already bound to another variable"
-         else "it is not a variable")
-  | Multiple_constraints_on_type s ->
-      fprintf ppf "Multiple constraints for type %a" longident s
-  | Method_mismatch (l, ty, ty') ->
-      wrap_printing_env env (fun ()  ->
-        Printtyp.reset_and_mark_loops_list [ty; ty'];
-        fprintf ppf "@[<hov>Method '%s' has type %a,@ which should be %a@]"
-          l Printtyp.type_expr ty Printtyp.type_expr ty')
-  | Unbound_value lid ->
-    (* modified *)
-    begin
-      match lid with
-      | Ldot (outer, inner) ->
-        Format.fprintf ppf "The value %s can't be found in %a"
-          inner
-          Printtyp.longident outer;
-      | other_ident -> Format.fprintf ppf "The value %a can't be found" Printtyp.longident other_ident
-    end;
-    super_spellcheck ppf Env.fold_values env lid |> ignore
-  | Unbound_module lid ->
-    (* modified *)
-    begin match lid with
-      | Lident "Str" ->
-        begin
-          Format.fprintf ppf "@[\
-                              @{<info>The module or file %a can't be found.@}@,@,\
-                              Are you trying to use the standard library's Str?@ \
-                              If you're compiling to JavaScript,@ use @{<info>Js.Re@} instead.@ \
-                              Otherwise, add str.cma to your ocamlc/ocamlopt command.\
-                              @]"
-            Printtyp.longident lid
-        end
-      | lid ->
-        begin
-          Format.fprintf ppf "@[<v>\
-                              @{<info>The module or file %a can't be found.@}@,\
-                              @[<v 2>- If it's a third-party dependency:@,\
-                              - Did you add it to the \"bs-dependencies\" or \"bs-dev-dependencies\" in bsconfig.json?@]@,\
-                              - Did you include the file's directory to the \"sources\" in bsconfig.json?@,\
-                              "
-            Printtyp.longident lid
-        end
-    end;
-    super_spellcheck ppf Env.fold_modules env lid |> ignore
-  | Unbound_constructor lid ->
-    (* modified *)
-    Format.fprintf ppf "@[<v>\
-                        @{<info>The variant constructor %a can't be found.@}@,@,\
-                        @[<v 2>- If it's defined in another module or file, bring it into scope by:@,\
-                        @[- Prefixing it with said module name:@ @{<info>TheModule.%a@}@]@,\
-                        @[- Or specifying its type:@ @{<info>let theValue: TheModule.theType = %a@}@]\
-                        @]@,\
-                        - @[Constructors and modules are both capitalized.@ Did you want the latter?@ Then instead of @{<dim>let foo = Bar@}, try @{<info>module Foo = Bar@}.@]\
-                        @]"
-      Printtyp.longident lid
-      Printtyp.longident lid
-      Printtyp.longident lid;
-    spellcheck ppf fold_constructors env lid
-  | Unbound_label lid ->
-    (* modified *)
-    Format.fprintf ppf "@[<v>\
-                        @{<info>The record field %a can't be found.@}@,@,\
-                        If it's defined in another module or file, bring it into scope by:@,\
-                        @[- Prefixing it with said module name:@ @{<info>TheModule.%a@}@]@,\
-                        @[- Or specifying its type:@ @{<info>let theValue: TheModule.theType = {%a: VALUE}@}@]\
-                        @]"
-      Printtyp.longident lid
-      Printtyp.longident lid
-      Printtyp.longident lid;
-    spellcheck ppf fold_labels env lid;
-  | Unbound_class lid ->
-      fprintf ppf "Unbound class %a" longident lid;
-      spellcheck ppf fold_classs env lid;
-  | Unbound_modtype lid ->
-      fprintf ppf "Unbound module type %a" longident lid;
-      spellcheck ppf fold_modtypes env lid;
-  | Unbound_cltype lid ->
-      fprintf ppf "Unbound class type %a" longident lid;
-      spellcheck ppf fold_cltypes env lid;
-  | Ill_typed_functor_application lid ->
-      fprintf ppf "Ill-typed functor application %a" longident lid
-  | Illegal_reference_to_recursive_module ->
-      fprintf ppf "Illegal recursive module reference"
-  | Access_functor_as_structure lid ->
-      fprintf ppf "The module %a is a functor, not a structure" longident lid
-  | Apply_structure_as_functor lid ->
-      fprintf ppf "The module %a is a structure, not a functor" longident lid
-  | Cannot_scrape_alias(lid, p) ->
-      fprintf ppf
-        "The module %a is an alias for module %a, which is missing"
-        longident lid path p
-  | Opened_object nm ->
-      fprintf ppf
-        "Illegal open object type%a"
-        (fun ppf -> function
-             Some p -> fprintf ppf "@ %a" path p
-           | None -> fprintf ppf "") nm
-  | Not_an_object ty ->
-      Printtyp.reset_and_mark_loops ty;
-      fprintf ppf "@[The type %a@ is not an object type@]"
-        Printtyp.type_expr ty
-
-let () =
-  Location.register_error_of_exn
-    (function
-      | Error (loc, env, err) ->
-        Some (Location.error_of_printer loc (report_error env) err)
-      | Error_forward err ->
-        Some err
-      | _ ->
-        None
-    )
diff --git a/jscomp/ml/typetexp.mli b/jscomp/ml/typetexp.mli
deleted file mode 100644
index 165c17d..0000000
--- a/jscomp/ml/typetexp.mli
+++ /dev/null
@@ -1,122 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* Typechecking of type expressions for the core language *)
-
-open Types
-
-val transl_simple_type:
-        Env.t -> bool -> Parsetree.core_type -> Typedtree.core_type
-val transl_simple_type_univars:
-        Env.t -> Parsetree.core_type -> Typedtree.core_type
-val transl_simple_type_delayed:
-        Env.t -> Parsetree.core_type -> Typedtree.core_type * (unit -> unit)
-        (* Translate a type, but leave type variables unbound. Returns
-           the type and a function that binds the type variable. *)
-val transl_type_scheme:
-        Env.t -> Parsetree.core_type -> Typedtree.core_type
-val reset_type_variables: unit -> unit
-val type_variable: Location.t -> string -> type_expr
-val transl_type_param:
-  Env.t -> Parsetree.core_type -> Typedtree.core_type
-
-type variable_context
-val narrow: unit -> variable_context
-val widen: variable_context -> unit
-
-exception Already_bound
-
-type error =
-    Unbound_type_variable of string
-  | Unbound_type_constructor of Longident.t
-  | Unbound_type_constructor_2 of Path.t
-  | Type_arity_mismatch of Longident.t * int * int
-  | Bound_type_variable of string
-  | Recursive_type
-  | Unbound_row_variable of Longident.t
-  | Type_mismatch of (type_expr * type_expr) list
-  | Alias_type_mismatch of (type_expr * type_expr) list
-  | Present_has_conjunction of string
-  | Present_has_no_type of string
-  | Constructor_mismatch of type_expr * type_expr
-  | Not_a_variant of type_expr
-  | Variant_tags of string * string
-  | Invalid_variable_name of string
-  | Cannot_quantify of string * type_expr
-  | Multiple_constraints_on_type of Longident.t
-  | Method_mismatch of string * type_expr * type_expr
-  | Unbound_value of Longident.t
-  | Unbound_constructor of Longident.t
-  | Unbound_label of Longident.t
-  | Unbound_module of Longident.t
-  | Unbound_class of Longident.t
-  | Unbound_modtype of Longident.t
-  | Unbound_cltype of Longident.t
-  | Ill_typed_functor_application of Longident.t
-  | Illegal_reference_to_recursive_module
-  | Access_functor_as_structure of Longident.t
-  | Apply_structure_as_functor of Longident.t
-  | Cannot_scrape_alias of Longident.t * Path.t
-  | Opened_object of Path.t option
-  | Not_an_object of type_expr
-
-exception Error of Location.t * Env.t * error
-
-val report_error: Env.t -> Format.formatter -> error -> unit
-
-(* Support for first-class modules. *)
-val transl_modtype_longident:  (* from Typemod *)
-    (Location.t -> Env.t -> Longident.t -> Path.t) ref
-val transl_modtype: (* from Typemod *)
-    (Env.t -> Parsetree.module_type -> Typedtree.module_type) ref
-val create_package_mty:
-    Location.t -> Env.t -> Parsetree.package_type ->
-    (Longident.t Asttypes.loc * Parsetree.core_type) list *
-      Parsetree.module_type
-
-val find_type:
-    Env.t -> Location.t -> Longident.t -> Path.t * type_declaration
-val find_constructor:
-    Env.t -> Location.t -> Longident.t -> constructor_description
-val find_all_constructors:
-    Env.t -> Location.t -> Longident.t ->
-    (constructor_description * (unit -> unit)) list
-val find_label:
-    Env.t -> Location.t -> Longident.t -> label_description
-val find_all_labels:
-    Env.t -> Location.t -> Longident.t ->
-    (label_description * (unit -> unit)) list
-val find_value:
-    Env.t -> Location.t -> Longident.t -> Path.t * value_description
-val find_class:
-    Env.t -> Location.t -> Longident.t -> Path.t * class_declaration
-val find_module:
-    Env.t -> Location.t -> Longident.t -> Path.t * module_declaration
-val lookup_module:
-    ?load:bool -> Env.t -> Location.t -> Longident.t -> Path.t
-val find_modtype:
-    Env.t -> Location.t -> Longident.t -> Path.t * modtype_declaration
-val find_class_type:
-    Env.t -> Location.t -> Longident.t -> Path.t * class_type_declaration
-
-val unbound_constructor_error: Env.t -> Longident.t Location.loc -> 'a
-val unbound_label_error: Env.t -> Longident.t Location.loc -> 'a
-
-
-val spellcheck: 
-  Format.formatter ->
-  (('a -> 'a list -> 'a list) ->
-   Longident.t option -> 'b -> 'c list -> string list) ->
-  'b -> Longident.t -> unit
diff --git a/jscomp/ml/untypeast.ml b/jscomp/ml/untypeast.ml
deleted file mode 100644
index 17203b0..0000000
--- a/jscomp/ml/untypeast.ml
+++ /dev/null
@@ -1,717 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*    Thomas Gazagnaire (OCamlPro), Fabrice Le Fessant (INRIA Saclay)     *)
-(*                                                                        *)
-(*   Copyright 2007 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Longident
-open Asttypes
-open Parsetree
-open Ast_helper
-
-module T = Typedtree
-
-type mapper = {
-  attribute: mapper -> T.attribute -> attribute;
-  attributes: mapper -> T.attribute list -> attribute list;
-  case: mapper -> T.case -> case;
-  cases: mapper -> T.case list -> case list;
-  class_signature: mapper -> T.class_signature -> class_signature;
-  class_type: mapper -> T.class_type -> class_type;
-  class_type_declaration: mapper -> T.class_type_declaration
-                          -> class_type_declaration;
-  class_type_field: mapper -> T.class_type_field -> class_type_field;
-  constructor_declaration: mapper -> T.constructor_declaration
-                           -> constructor_declaration;
-  expr: mapper -> T.expression -> expression;
-  extension_constructor: mapper -> T.extension_constructor
-                         -> extension_constructor;
-  include_declaration: mapper -> T.include_declaration -> include_declaration;
-  include_description: mapper -> T.include_description -> include_description;
-  label_declaration: mapper -> T.label_declaration -> label_declaration;
-  location: mapper -> Location.t -> Location.t;
-  module_binding: mapper -> T.module_binding -> module_binding;
-  module_declaration: mapper -> T.module_declaration -> module_declaration;
-  module_expr: mapper -> T.module_expr -> module_expr;
-  module_type: mapper -> T.module_type -> module_type;
-  module_type_declaration:
-    mapper -> T.module_type_declaration -> module_type_declaration;
-  package_type: mapper -> T.package_type -> package_type;
-  open_description: mapper -> T.open_description -> open_description;
-  pat: mapper -> T.pattern -> pattern;
-  row_field: mapper -> T.row_field -> row_field;
-  object_field: mapper -> T.object_field -> object_field;
-  signature: mapper -> T.signature -> signature;
-  signature_item: mapper -> T.signature_item -> signature_item;
-  structure: mapper -> T.structure -> structure;
-  structure_item: mapper -> T.structure_item -> structure_item;
-  typ: mapper -> T.core_type -> core_type;
-  type_declaration: mapper -> T.type_declaration -> type_declaration;
-  type_extension: mapper -> T.type_extension -> type_extension;
-  type_kind: mapper -> T.type_kind -> type_kind;
-  value_binding: mapper -> T.value_binding -> value_binding;
-  value_description: mapper -> T.value_description -> value_description;
-  with_constraint:
-    mapper -> (Path.t * Longident.t Location.loc * T.with_constraint)
-    -> with_constraint;
-}
-
-open T
-
-(*
-Some notes:
-
-   * For Pexp_function, we cannot go back to the exact original version
-   when there is a default argument, because the default argument is
-   translated in the typer. The code, if printed, will not be parsable because
-   new generated identifiers are not correct.
-
-   * For Pexp_apply, it is unclear whether arguments are reordered, especially
-    when there are optional arguments.
-
-*)
-
-
-(** Utility functions. *)
-
-
-let map_opt f = function None -> None | Some e -> Some (f e)
-
-let rec lident_of_path = function
-  | Path.Pident id -> Longident.Lident (Ident.name id)
-  | Path.Pdot (p, s, _) -> Longident.Ldot (lident_of_path p, s)
-  | Path.Papply (p1, p2) ->
-      Longident.Lapply (lident_of_path p1, lident_of_path p2)
-
-let map_loc sub {loc; txt} = {loc = sub.location sub loc; txt}
-
-(** Try a name [$name$0], check if it's free, if not, increment and repeat. *)
-let fresh_name s env =
-  let rec aux i =
-    let name = s ^ string_of_int i in
-    try
-      let _ = Env.lookup_value (Lident name) env in
-      name
-    with
-      | Not_found -> aux (i+1)
-  in
-  aux 0
-
-(** Mapping functions. *)
-
-let constant = function
-  | Const_char c -> Pconst_char c
-  | Const_string (s,d) -> Pconst_string (s,d)
-  | Const_int i -> Pconst_integer (string_of_int i, None)
-  | Const_int32 i -> Pconst_integer (Int32.to_string i, Some 'l')
-  | Const_int64 i -> Pconst_integer (Int64.to_string i, Some 'L')
-  | Const_bigint (sign, i) -> 
-    Pconst_integer (Bigint_utils.to_string sign i, Some 'n')
-  | Const_float f -> Pconst_float (f,None)
-
-let attribute sub (s, p) = (map_loc sub s, p)
-let attributes sub l = List.map (sub.attribute sub) l
-
-let structure sub str =
-  List.map (sub.structure_item sub) str.str_items
-
-let open_description sub od =
-  let loc = sub.location sub od.open_loc in
-  let attrs = sub.attributes sub od.open_attributes in
-  Opn.mk ~loc ~attrs
-    ~override:od.open_override
-    (map_loc sub od.open_txt)
-
-let structure_item sub item =
-  let loc = sub.location sub item.str_loc in
-  let desc =
-    match item.str_desc with
-      Tstr_eval (exp, attrs) -> Pstr_eval (sub.expr sub exp, attrs)
-    | Tstr_value (rec_flag, list) ->
-        Pstr_value (rec_flag, List.map (sub.value_binding sub) list)
-    | Tstr_primitive vd ->
-        Pstr_primitive (sub.value_description sub vd)
-    | Tstr_type (rec_flag, list) ->
-        Pstr_type (rec_flag, List.map (sub.type_declaration sub) list)
-    | Tstr_typext tyext ->
-        Pstr_typext (sub.type_extension sub tyext)
-    | Tstr_exception ext ->
-        Pstr_exception (sub.extension_constructor sub ext)
-    | Tstr_module mb ->
-        Pstr_module (sub.module_binding sub mb)
-    | Tstr_recmodule list ->
-        Pstr_recmodule (List.map (sub.module_binding sub) list)
-    | Tstr_modtype mtd ->
-        Pstr_modtype (sub.module_type_declaration sub mtd)
-    | Tstr_open od ->
-        Pstr_open (sub.open_description sub od)
-    | Tstr_class _list ->
-        Pstr_class ()
-    | Tstr_class_type list ->
-        Pstr_class_type
-          (List.map
-             (fun (_id, _name, ct) -> sub.class_type_declaration sub ct)
-             list)
-    | Tstr_include incl ->
-        Pstr_include (sub.include_declaration sub incl)
-    | Tstr_attribute x ->
-        Pstr_attribute x
-  in
-  Str.mk ~loc desc
-
-let value_description sub v =
-  let loc = sub.location sub v.val_loc in
-  let attrs = sub.attributes sub v.val_attributes in
-  Val.mk ~loc ~attrs
-    ~prim:v.val_prim
-    (map_loc sub v.val_name)
-    (sub.typ sub v.val_desc)
-
-let module_binding sub mb =
-  let loc = sub.location sub mb.mb_loc in
-  let attrs = sub.attributes sub mb.mb_attributes in
-  Mb.mk ~loc ~attrs
-    (map_loc sub mb.mb_name)
-    (sub.module_expr sub mb.mb_expr)
-
-let type_parameter sub (ct, v) = (sub.typ sub ct, v)
-
-let type_declaration sub decl =
-  let loc = sub.location sub decl.typ_loc in
-  let attrs = sub.attributes sub decl.typ_attributes in
-  Type.mk ~loc ~attrs
-    ~params:(List.map (type_parameter sub) decl.typ_params)
-    ~cstrs:(
-      List.map
-        (fun (ct1, ct2, loc) ->
-           (sub.typ sub ct1, sub.typ sub ct2, sub.location sub loc))
-        decl.typ_cstrs)
-    ~kind:(sub.type_kind sub decl.typ_kind)
-    ~priv:decl.typ_private
-    ?manifest:(map_opt (sub.typ sub) decl.typ_manifest)
-    (map_loc sub decl.typ_name)
-
-let type_kind sub tk = match tk with
-  | Ttype_abstract -> Ptype_abstract
-  | Ttype_variant list ->
-      Ptype_variant (List.map (sub.constructor_declaration sub) list)
-  | Ttype_record list ->
-      Ptype_record (List.map (sub.label_declaration sub) list)
-  | Ttype_open -> Ptype_open
-
-let constructor_arguments sub = function
-   | Cstr_tuple l -> Pcstr_tuple (List.map (sub.typ sub) l)
-   | Cstr_record l -> Pcstr_record (List.map (sub.label_declaration sub) l)
-
-let constructor_declaration sub cd =
-  let loc = sub.location sub cd.cd_loc in
-  let attrs = sub.attributes sub cd.cd_attributes in
-  Type.constructor ~loc ~attrs
-    ~args:(constructor_arguments sub cd.cd_args)
-    ?res:(map_opt (sub.typ sub) cd.cd_res)
-    (map_loc sub cd.cd_name)
-
-let label_declaration sub ld =
-  let loc = sub.location sub ld.ld_loc in
-  let attrs = sub.attributes sub ld.ld_attributes in
-  Type.field ~loc ~attrs
-    ~mut:ld.ld_mutable
-    (map_loc sub ld.ld_name)
-    (sub.typ sub ld.ld_type)
-
-let type_extension sub tyext =
-  let attrs = sub.attributes sub tyext.tyext_attributes in
-  Te.mk ~attrs
-    ~params:(List.map (type_parameter sub) tyext.tyext_params)
-    ~priv:tyext.tyext_private
-    (map_loc sub tyext.tyext_txt)
-    (List.map (sub.extension_constructor sub) tyext.tyext_constructors)
-
-let extension_constructor sub ext =
-  let loc = sub.location sub ext.ext_loc in
-  let attrs = sub.attributes sub ext.ext_attributes in
-  Te.constructor ~loc ~attrs
-    (map_loc sub ext.ext_name)
-    (match ext.ext_kind with
-      | Text_decl (args, ret) ->
-          Pext_decl (constructor_arguments sub args,
-                     map_opt (sub.typ sub) ret)
-      | Text_rebind (_p, lid) -> Pext_rebind (map_loc sub lid)
-    )
-
-let pattern sub pat =
-  let loc = sub.location sub pat.pat_loc in
-  (* todo: fix attributes on extras *)
-  let attrs = sub.attributes sub pat.pat_attributes in
-  let desc =
-  match pat with
-      { pat_extra=[Tpat_unpack, _, _attrs]; pat_desc = Tpat_var (_,name); _ } ->
-        Ppat_unpack name
-    | { pat_extra=[Tpat_type (_path, lid), _, _attrs]; _ } ->
-        Ppat_type (map_loc sub lid)
-    | { pat_extra= (Tpat_constraint ct, _, _attrs) :: rem; _ } ->
-        Ppat_constraint (sub.pat sub { pat with pat_extra=rem },
-                         sub.typ sub ct)
-    | _ ->
-    match pat.pat_desc with
-      Tpat_any -> Ppat_any
-    | Tpat_var (id, name) ->
-        begin
-          match (Ident.name id).[0] with
-            'A'..'Z' ->
-              Ppat_unpack name
-          | _ ->
-              Ppat_var name
-        end
-
-    (* We transform (_ as x) in x if _ and x have the same location.
-       The compiler transforms (x:t) into (_ as x : t).
-       This avoids transforming a warning 27 into a 26.
-     *)
-    | Tpat_alias ({pat_desc = Tpat_any; pat_loc}, _id, name)
-         when pat_loc = pat.pat_loc ->
-       Ppat_var name
-
-    | Tpat_alias (pat, _id, name) ->
-        Ppat_alias (sub.pat sub pat, name)
-    | Tpat_constant cst -> Ppat_constant (constant cst)
-    | Tpat_tuple list ->
-        Ppat_tuple (List.map (sub.pat sub) list)
-    | Tpat_construct (lid, _, args) ->
-        Ppat_construct (map_loc sub lid,
-          (match args with
-              [] -> None
-            | [arg] -> Some (sub.pat sub arg)
-            | args ->
-                Some
-                  (Pat.tuple ~loc
-                     (List.map (sub.pat sub) args)
-                  )
-          ))
-    | Tpat_variant (label, pato, _) ->
-        Ppat_variant (label, map_opt (sub.pat sub) pato)
-    | Tpat_record (list, closed) ->
-        Ppat_record (List.map (fun (lid, _, pat) ->
-            map_loc sub lid, sub.pat sub pat) list, closed)
-    | Tpat_array list -> Ppat_array (List.map (sub.pat sub) list)
-    | Tpat_or (p1, p2, _) -> Ppat_or (sub.pat sub p1, sub.pat sub p2)
-    | Tpat_lazy p -> Ppat_lazy (sub.pat sub p)
-  in
-  Pat.mk ~loc ~attrs desc
-
-let exp_extra sub (extra, loc, attrs) sexp =
-  let loc = sub.location sub loc in
-  let attrs = sub.attributes sub attrs in
-  let desc =
-    match extra with
-      Texp_coerce (cty1, cty2) ->
-        Pexp_coerce (sexp,
-                     map_opt (sub.typ sub) cty1,
-                     sub.typ sub cty2)
-    | Texp_constraint cty ->
-        Pexp_constraint (sexp, sub.typ sub cty)
-    | Texp_open (ovf, _path, lid, _) ->
-        Pexp_open (ovf, map_loc sub lid, sexp)
-    | Texp_poly cto -> Pexp_poly (sexp, map_opt (sub.typ sub) cto)
-    | Texp_newtype s -> Pexp_newtype (mkloc s loc, sexp)
-  in
-  Exp.mk ~loc ~attrs desc
-
-let cases sub l = List.map (sub.case sub) l
-
-let case sub {c_lhs; c_guard; c_rhs} =
-  {
-   pc_lhs = sub.pat sub c_lhs;
-   pc_guard = map_opt (sub.expr sub) c_guard;
-   pc_rhs = sub.expr sub c_rhs;
-  }
-
-let value_binding sub vb =
-  let loc = sub.location sub vb.vb_loc in
-  let attrs = sub.attributes sub vb.vb_attributes in
-  Vb.mk ~loc ~attrs
-    (sub.pat sub vb.vb_pat)
-    (sub.expr sub vb.vb_expr)
-
-let expression sub exp =
-  let loc = sub.location sub exp.exp_loc in
-  let attrs = sub.attributes sub exp.exp_attributes in
-  let desc =
-    match exp.exp_desc with
-      Texp_ident (_path, lid, _) -> Pexp_ident (map_loc sub lid)
-    | Texp_constant cst -> Pexp_constant (constant cst)
-    | Texp_let (rec_flag, list, exp) ->
-        Pexp_let (rec_flag,
-          List.map (sub.value_binding sub) list,
-          sub.expr sub exp)
-
-    (* Pexp_function can't have a label, so we split in 3 cases. *)
-    (* One case, no guard: It's a fun. *)
-    | Texp_function { arg_label; cases = [{c_lhs=p; c_guard=None; c_rhs=e}];
-          _ } ->
-        Pexp_fun (arg_label, None, sub.pat sub p, sub.expr sub e)
-    (* No label: it's a function. *)
-    | Texp_function { arg_label = Nolabel; cases; _; } ->
-        Pexp_function (sub.cases sub cases)
-    (* Mix of both, we generate `fun ~label:$name$ -> match $name$ with ...` *)
-    | Texp_function { arg_label = Labelled s | Optional s as label; cases;
-          _ } ->
-        let name = fresh_name s exp.exp_env in
-        Pexp_fun (label, None, Pat.var ~loc {loc;txt = name },
-          Exp.match_ ~loc (Exp.ident ~loc {loc;txt= Lident name})
-                          (sub.cases sub cases))
-    | Texp_apply (exp, list) ->
-        Pexp_apply (sub.expr sub exp,
-          List.fold_right (fun (label, expo) list ->
-              match expo with
-                None -> list
-              | Some exp -> (label, sub.expr sub exp) :: list
-          ) list [])
-    | Texp_match (exp, cases, exn_cases, _) ->
-      let merged_cases = sub.cases sub cases
-        @ List.map
-          (fun c ->
-            let uc = sub.case sub c in
-            let pat = { uc.pc_lhs
-                        with ppat_desc = Ppat_exception uc.pc_lhs }
-            in
-            { uc with pc_lhs = pat })
-          exn_cases
-      in
-      Pexp_match (sub.expr sub exp, merged_cases)
-    | Texp_try (exp, cases) ->
-        Pexp_try (sub.expr sub exp, sub.cases sub cases)
-    | Texp_tuple list ->
-        Pexp_tuple (List.map (sub.expr sub) list)
-    | Texp_construct (lid, _, args) ->
-        Pexp_construct (map_loc sub lid,
-          (match args with
-              [] -> None
-          | [ arg ] -> Some (sub.expr sub arg)
-          | args ->
-              Some
-                (Exp.tuple ~loc (List.map (sub.expr sub) args))
-          ))
-    | Texp_variant (label, expo) ->
-        Pexp_variant (label, map_opt (sub.expr sub) expo)
-    | Texp_record { fields; extended_expression; _ } ->
-        let list = Array.fold_left (fun l -> function
-            | _, Kept _ -> l
-            | _, Overridden (lid, exp) -> (lid, sub.expr sub exp) :: l)
-            [] fields
-        in
-        Pexp_record (list, map_opt (sub.expr sub) extended_expression)
-    | Texp_field (exp, lid, _label) ->
-        Pexp_field (sub.expr sub exp, map_loc sub lid)
-    | Texp_setfield (exp1, lid, _label, exp2) ->
-        Pexp_setfield (sub.expr sub exp1, map_loc sub lid,
-          sub.expr sub exp2)
-    | Texp_array list ->
-        Pexp_array (List.map (sub.expr sub) list)
-    | Texp_ifthenelse (exp1, exp2, expo) ->
-        Pexp_ifthenelse (sub.expr sub exp1,
-          sub.expr sub exp2,
-          map_opt (sub.expr sub) expo)
-    | Texp_sequence (exp1, exp2) ->
-        Pexp_sequence (sub.expr sub exp1, sub.expr sub exp2)
-    | Texp_while (exp1, exp2) ->
-        Pexp_while (sub.expr sub exp1, sub.expr sub exp2)
-    | Texp_for (_id, name, exp1, exp2, dir, exp3) ->
-        Pexp_for (name,
-          sub.expr sub exp1, sub.expr sub exp2,
-          dir, sub.expr sub exp3)
-    | Texp_send (exp, meth, _) ->
-        Pexp_send (sub.expr sub exp, match meth with
-            Tmeth_name name -> mkloc name loc)
-    | Texp_new _
-    | Texp_instvar _
-    | Texp_setinstvar _
-    | Texp_override _ ->
-        assert false
-    | Texp_letmodule (_id, name, mexpr, exp) ->
-        Pexp_letmodule (name, sub.module_expr sub mexpr,
-          sub.expr sub exp)
-    | Texp_letexception (ext, exp) ->
-        Pexp_letexception (sub.extension_constructor sub ext,
-                           sub.expr sub exp)
-    | Texp_assert exp -> Pexp_assert (sub.expr sub exp)
-    | Texp_lazy exp -> Pexp_lazy (sub.expr sub exp)
-    | Texp_object () ->
-        assert false
-    | Texp_pack (mexpr) ->
-        Pexp_pack (sub.module_expr sub mexpr)
-    | Texp_unreachable ->
-        Pexp_unreachable
-    | Texp_extension_constructor (lid, _) ->
-        Pexp_extension ({ txt = "ocaml.extension_constructor"; loc },
-                        PStr [ Str.eval ~loc
-                                 (Exp.construct ~loc (map_loc sub lid) None)
-                             ])
-  in
-  List.fold_right (exp_extra sub) exp.exp_extra
-    (Exp.mk ~loc ~attrs desc)
-
-let package_type sub pack =
-  (map_loc sub pack.pack_txt,
-    List.map (fun (s, ct) ->
-        (s, sub.typ sub ct)) pack.pack_fields)
-
-let module_type_declaration sub mtd =
-  let loc = sub.location sub mtd.mtd_loc in
-  let attrs = sub.attributes sub mtd.mtd_attributes in
-  Mtd.mk ~loc ~attrs
-    ?typ:(map_opt (sub.module_type sub) mtd.mtd_type)
-    (map_loc sub mtd.mtd_name)
-
-let signature sub sg =
-  List.map (sub.signature_item sub) sg.sig_items
-
-let signature_item sub item =
-  let loc = sub.location sub item.sig_loc in
-  let desc =
-    match item.sig_desc with
-      Tsig_value v ->
-        Psig_value (sub.value_description sub v)
-    | Tsig_type (rec_flag, list) ->
-        Psig_type (rec_flag, List.map (sub.type_declaration sub) list)
-    | Tsig_typext tyext ->
-        Psig_typext (sub.type_extension sub tyext)
-    | Tsig_exception ext ->
-        Psig_exception (sub.extension_constructor sub ext)
-    | Tsig_module md ->
-        Psig_module (sub.module_declaration sub md)
-    | Tsig_recmodule list ->
-        Psig_recmodule (List.map (sub.module_declaration sub) list)
-    | Tsig_modtype mtd ->
-        Psig_modtype (sub.module_type_declaration sub mtd)
-    | Tsig_open od ->
-        Psig_open (sub.open_description sub od)
-    | Tsig_include incl ->
-        Psig_include (sub.include_description sub incl)
-    | Tsig_class () ->
-        Psig_class ()
-    | Tsig_class_type list ->
-        Psig_class_type (List.map (sub.class_type_declaration sub) list)
-    | Tsig_attribute x ->
-        Psig_attribute x
-  in
-  Sig.mk ~loc desc
-
-let module_declaration sub md =
-  let loc = sub.location sub md.md_loc in
-  let attrs = sub.attributes sub md.md_attributes in
-  Md.mk ~loc ~attrs
-    (map_loc sub md.md_name)
-    (sub.module_type sub md.md_type)
-
-let include_infos f sub incl =
-  let loc = sub.location sub incl.incl_loc in
-  let attrs = sub.attributes sub incl.incl_attributes in
-  Incl.mk ~loc ~attrs
-    (f sub incl.incl_mod)
-
-let include_declaration sub = include_infos sub.module_expr sub
-let include_description sub = include_infos sub.module_type sub
-
-let class_infos f sub ci =
-  let loc = sub.location sub ci.ci_loc in
-  let attrs = sub.attributes sub ci.ci_attributes in
-  Ci.mk ~loc ~attrs
-    ~virt:ci.ci_virt
-    ~params:(List.map (type_parameter sub) ci.ci_params)
-    (map_loc sub ci.ci_id_name)
-    (f sub ci.ci_expr)
-
-let class_type_declaration sub = class_infos sub.class_type sub
-
-let module_type sub mty =
-  let loc = sub.location sub mty.mty_loc in
-  let attrs = sub.attributes sub mty.mty_attributes in
-  let desc = match mty.mty_desc with
-      Tmty_ident (_path, lid) -> Pmty_ident (map_loc sub lid)
-    | Tmty_alias (_path, lid) -> Pmty_alias (map_loc sub lid)
-    | Tmty_signature sg -> Pmty_signature (sub.signature sub sg)
-    | Tmty_functor (_id, name, mtype1, mtype2) ->
-        Pmty_functor (name, map_opt (sub.module_type sub) mtype1,
-          sub.module_type sub mtype2)
-    | Tmty_with (mtype, list) ->
-        Pmty_with (sub.module_type sub mtype,
-          List.map (sub.with_constraint sub) list)
-    | Tmty_typeof mexpr ->
-        Pmty_typeof (sub.module_expr sub mexpr)
-  in
-  Mty.mk ~loc ~attrs desc
-
-let with_constraint sub (_path, lid, cstr) =
-  match cstr with
-  | Twith_type decl ->
-      Pwith_type (map_loc sub lid, sub.type_declaration sub decl)
-  | Twith_module (_path, lid2) ->
-      Pwith_module (map_loc sub lid, map_loc sub lid2)
-  | Twith_typesubst decl ->
-     Pwith_typesubst (map_loc sub lid, sub.type_declaration sub decl)
-  | Twith_modsubst (_path, lid2) ->
-      Pwith_modsubst (map_loc sub lid, map_loc sub lid2)
-
-let module_expr sub mexpr =
-  let loc = sub.location sub mexpr.mod_loc in
-  let attrs = sub.attributes sub mexpr.mod_attributes in
-  match mexpr.mod_desc with
-      Tmod_constraint (m, _, Tmodtype_implicit, _ ) ->
-        sub.module_expr sub m
-    | _ ->
-        let desc = match mexpr.mod_desc with
-            Tmod_ident (_p, lid) -> Pmod_ident (map_loc sub lid)
-          | Tmod_structure st -> Pmod_structure (sub.structure sub st)
-          | Tmod_functor (_id, name, mtype, mexpr) ->
-              Pmod_functor (name, Misc.may_map (sub.module_type sub) mtype,
-                sub.module_expr sub mexpr)
-          | Tmod_apply (mexp1, mexp2, _) ->
-              Pmod_apply (sub.module_expr sub mexp1, sub.module_expr sub mexp2)
-          | Tmod_constraint (mexpr, _, Tmodtype_explicit mtype, _) ->
-              Pmod_constraint (sub.module_expr sub mexpr,
-                sub.module_type sub mtype)
-          | Tmod_constraint (_mexpr, _, Tmodtype_implicit, _) ->
-              assert false
-          | Tmod_unpack (exp, _pack) ->
-              Pmod_unpack (sub.expr sub exp)
-              (* TODO , sub.package_type sub pack) *)
-        in
-        Mod.mk ~loc ~attrs desc
-
-
-
-let class_type sub ct =
-  let loc = sub.location sub ct.cltyp_loc in
-  let attrs = sub.attributes sub ct.cltyp_attributes in
-  let desc = match ct.cltyp_desc with
-      Tcty_signature csg -> Pcty_signature (sub.class_signature sub csg)
-    | Tcty_constr (_path, lid, list) ->
-        Pcty_constr (map_loc sub lid, List.map (sub.typ sub) list)
-    | Tcty_arrow (label, ct, cl) ->
-        Pcty_arrow (label, sub.typ sub ct, sub.class_type sub cl)
-    | Tcty_open (ovf, _p, lid, _env, e) ->
-        Pcty_open (ovf, lid, sub.class_type sub e)
-  in
-  Cty.mk ~loc ~attrs desc
-
-let class_signature sub cs =
-  {
-    pcsig_self = sub.typ sub cs.csig_self;
-    pcsig_fields = List.map (sub.class_type_field sub) cs.csig_fields;
-  }
-
-let class_type_field sub ctf =
-  let loc = sub.location sub ctf.ctf_loc in
-  let attrs = sub.attributes sub ctf.ctf_attributes in
-  let desc = match ctf.ctf_desc with
-      Tctf_inherit ct -> Pctf_inherit (sub.class_type sub ct)
-    | Tctf_val (s, mut, virt, ct) ->
-        Pctf_val (mkloc s loc, mut, virt, sub.typ sub ct)
-    | Tctf_method  (s, priv, virt, ct) ->
-        Pctf_method  (mkloc s loc, priv, virt, sub.typ sub ct)
-    | Tctf_constraint  (ct1, ct2) ->
-        Pctf_constraint (sub.typ sub ct1, sub.typ sub ct2)
-    | Tctf_attribute x -> Pctf_attribute x
-  in
-  Ctf.mk ~loc ~attrs desc
-
-let core_type sub ct =
-  let loc = sub.location sub ct.ctyp_loc in
-  let attrs = sub.attributes sub ct.ctyp_attributes in
-  let desc = match ct.ctyp_desc with
-      Ttyp_any -> Ptyp_any
-    | Ttyp_var s -> Ptyp_var s
-    | Ttyp_arrow (label, ct1, ct2) ->
-        Ptyp_arrow (label, sub.typ sub ct1, sub.typ sub ct2)
-    | Ttyp_tuple list -> Ptyp_tuple (List.map (sub.typ sub) list)
-    | Ttyp_constr (_path, lid, list) ->
-        Ptyp_constr (map_loc sub lid,
-          List.map (sub.typ sub) list)
-    | Ttyp_object (list, o) ->
-        Ptyp_object
-          (List.map (sub.object_field sub) list, o)
-    | Ttyp_class (_path, lid, list) ->
-        Ptyp_class (map_loc sub lid, List.map (sub.typ sub) list)
-    | Ttyp_alias (ct, s) ->
-        Ptyp_alias (sub.typ sub ct, s)
-    | Ttyp_variant (list, bool, labels) ->
-        Ptyp_variant (List.map (sub.row_field sub) list, bool, labels)
-    | Ttyp_poly (list, ct) ->
-        let list = List.map (fun v -> mkloc v loc) list in
-        Ptyp_poly (list, sub.typ sub ct)
-    | Ttyp_package pack -> Ptyp_package (sub.package_type sub pack)
-  in
-  Typ.mk ~loc ~attrs desc
-
-
-let row_field sub rf =
-  match rf with
-    Ttag (label, attrs, bool, list) ->
-      Rtag (label, sub.attributes sub attrs, bool, List.map (sub.typ sub) list)
-  | Tinherit ct -> Rinherit (sub.typ sub ct)
-
-let object_field sub ofield =
-  match ofield with
-    OTtag (label, attrs, ct) ->
-      Otag (label, sub.attributes sub attrs, sub.typ sub ct)
-  | OTinherit ct -> Oinherit (sub.typ sub ct)
-
-
-
-let location _sub l = l
-
-let default_mapper =
-  {
-    attribute = attribute ;
-    attributes = attributes ;
-    structure = structure;
-    structure_item = structure_item;
-    module_expr = module_expr;
-    signature = signature;
-    signature_item = signature_item;
-    module_type = module_type;
-    with_constraint = with_constraint;
-    class_type = class_type;
-    class_type_field = class_type_field;
-    class_signature = class_signature;
-    class_type_declaration = class_type_declaration;
-    type_declaration = type_declaration;
-    type_kind = type_kind;
-    typ = core_type;
-    type_extension = type_extension;
-    extension_constructor = extension_constructor;
-    value_description = value_description;
-    pat = pattern;
-    expr = expression;
-    module_declaration = module_declaration;
-    module_type_declaration = module_type_declaration;
-    module_binding = module_binding;
-    package_type = package_type ;
-    open_description = open_description;
-    include_description = include_description;
-    include_declaration = include_declaration;
-    value_binding = value_binding;
-    constructor_declaration = constructor_declaration;
-    label_declaration = label_declaration;
-    cases = cases;
-    case = case;
-    location = location;
-    row_field = row_field ;
-    object_field = object_field ;
-  }
-
-let untype_structure ?(mapper=default_mapper) structure =
-  mapper.structure mapper structure
-
-let untype_signature ?(mapper=default_mapper) signature =
-  mapper.signature mapper signature
diff --git a/jscomp/ml/untypeast.mli b/jscomp/ml/untypeast.mli
deleted file mode 100644
index d6bfdd0..0000000
--- a/jscomp/ml/untypeast.mli
+++ /dev/null
@@ -1,74 +0,0 @@
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*      Thomas Gazagnaire (OCamlPro), Fabrice Le Fessant (INRIA Saclay)   *)
-(*                                                                        *)
-(*   Copyright 2007 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-open Parsetree
-
-val lident_of_path : Path.t -> Longident.t
-
-type mapper = {
-  attribute: mapper -> Typedtree.attribute -> attribute;
-  attributes: mapper -> Typedtree.attribute list -> attribute list;
-  case: mapper -> Typedtree.case -> case;
-  cases: mapper -> Typedtree.case list -> case list;
-  class_signature: mapper -> Typedtree.class_signature -> class_signature;
-  class_type: mapper -> Typedtree.class_type -> class_type;
-  class_type_declaration: mapper -> Typedtree.class_type_declaration
-                          -> class_type_declaration;
-  class_type_field: mapper -> Typedtree.class_type_field -> class_type_field;
-  constructor_declaration: mapper -> Typedtree.constructor_declaration
-                           -> constructor_declaration;
-  expr: mapper -> Typedtree.expression -> expression;
-  extension_constructor: mapper -> Typedtree.extension_constructor
-                         -> extension_constructor;
-  include_declaration:
-    mapper -> Typedtree.include_declaration -> include_declaration;
-  include_description:
-    mapper -> Typedtree.include_description -> include_description;
-  label_declaration:
-    mapper -> Typedtree.label_declaration -> label_declaration;
-  location: mapper -> Location.t -> Location.t;
-  module_binding: mapper -> Typedtree.module_binding -> module_binding;
-  module_declaration:
-    mapper -> Typedtree.module_declaration -> module_declaration;
-  module_expr: mapper -> Typedtree.module_expr -> module_expr;
-  module_type: mapper -> Typedtree.module_type -> module_type;
-  module_type_declaration:
-    mapper -> Typedtree.module_type_declaration -> module_type_declaration;
-  package_type: mapper -> Typedtree.package_type -> package_type;
-  open_description: mapper -> Typedtree.open_description -> open_description;
-  pat: mapper -> Typedtree.pattern -> pattern;
-  row_field: mapper -> Typedtree.row_field -> row_field;
-  object_field: mapper -> Typedtree.object_field -> object_field;
-  signature: mapper -> Typedtree.signature -> signature;
-  signature_item: mapper -> Typedtree.signature_item -> signature_item;
-  structure: mapper -> Typedtree.structure -> structure;
-  structure_item: mapper -> Typedtree.structure_item -> structure_item;
-  typ: mapper -> Typedtree.core_type -> core_type;
-  type_declaration: mapper -> Typedtree.type_declaration -> type_declaration;
-  type_extension: mapper -> Typedtree.type_extension -> type_extension;
-  type_kind: mapper -> Typedtree.type_kind -> type_kind;
-  value_binding: mapper -> Typedtree.value_binding -> value_binding;
-  value_description: mapper -> Typedtree.value_description -> value_description;
-  with_constraint:
-    mapper -> (Path.t * Longident.t Location.loc * Typedtree.with_constraint)
-    -> with_constraint;
-}
-
-val default_mapper : mapper
-
-val untype_structure : ?mapper:mapper -> Typedtree.structure -> structure
-val untype_signature : ?mapper:mapper -> Typedtree.signature -> signature
-
-val constant : Asttypes.constant -> Parsetree.constant
diff --git a/jscomp/ml/variant_coercion.ml b/jscomp/ml/variant_coercion.ml
deleted file mode 100644
index e2b272d..0000000
--- a/jscomp/ml/variant_coercion.ml
+++ /dev/null
@@ -1,153 +0,0 @@
-(* TODO: Improve error messages? Say why we can't coerce. *)
-
-(* Right now we only allow coercing to primitives string/int/float *)
-let can_coerce_primitive (path : Path.t) =
-  Path.same path Predef.path_string
-  || Path.same path Predef.path_int
-  || Path.same path Predef.path_float
-  || Path.same path Predef.path_bigint
-
-let check_paths_same p1 p2 target_path =
-  Path.same p1 target_path && Path.same p2 target_path
-
-let variant_has_catch_all_case (constructors : Types.constructor_declaration list) path_is_same =
-  let has_catch_all_string_case (c : Types.constructor_declaration) =
-    let args = c.cd_args in
-    match args with
-    | Cstr_tuple [{desc = Tconstr (p, [], _)}] ->
-      path_is_same p
-    | _ -> false
-  in
-
-  constructors |> List.exists has_catch_all_string_case 
-
-let variant_has_relevant_primitive_catch_all (constructors : Types.constructor_declaration list) = 
-  variant_has_catch_all_case constructors can_coerce_primitive
-
-(* Checks if every case of the variant has the same runtime representation as the target type. *)
-let variant_has_same_runtime_representation_as_target ~(targetPath : Path.t)
-    ~unboxed (constructors : Types.constructor_declaration list) =
-  (* Helper function to check if a constructor has the same runtime representation as the target type *)
-  let has_same_runtime_representation (c : Types.constructor_declaration) =
-    let args = c.cd_args in
-    let asPayload = Ast_untagged_variants.process_tag_type c.cd_attributes in
-
-    match args with
-    | Cstr_tuple [{desc = Tconstr (p, [], _)}] when unboxed ->
-      let path_same = check_paths_same p targetPath in
-      (* unboxed String(string) :> string *)
-      path_same Predef.path_string
-      || (* unboxed Number(float) :> float *)
-      path_same Predef.path_float
-      || (* unboxed BigInt(bigint) :> bigint *)
-      path_same Predef.path_bigint
-    | Cstr_tuple [] -> (
-      (* Check that @as payloads match with the target path to coerce to.
-           No @as means the default encoding, which is string *)
-      match asPayload with
-      | None | Some (String _) -> Path.same targetPath Predef.path_string
-      | Some (Int _) -> Path.same targetPath Predef.path_int
-      | Some (Float _) -> Path.same targetPath Predef.path_float
-      | Some (BigInt _) -> Path.same targetPath Predef.path_bigint
-      | Some (Null | Undefined | Bool _ | Untagged _) -> false)
-    | _ -> false
-  in
-
-  List.for_all has_same_runtime_representation constructors
-
-let can_try_coerce_variant_to_primitive
-    ((_, p, typedecl) : Path.t * Path.t * Types.type_declaration) =
-  match typedecl with
-  | {type_kind = Type_variant constructors; type_params = []; type_attributes}
-    when Path.name p <> "bool" ->
-    (* bool is represented as a variant internally, so we need to account for that *)
-    Some (constructors, type_attributes |> Ast_untagged_variants.has_untagged)
-  | _ -> None
-
-let can_try_coerce_variant_to_primitive_opt p = 
-  match p with 
-  | None -> None 
-  | Some p -> can_try_coerce_variant_to_primitive p
-
-let variant_representation_matches (c1_attrs : Parsetree.attributes)
-    (c2_attrs : Parsetree.attributes) =
-  match
-    ( Ast_untagged_variants.process_tag_type c1_attrs,
-      Ast_untagged_variants.process_tag_type c2_attrs )
-  with
-  | None, None -> true
-  | Some s1, Some s2 when s1 = s2 -> true
-  | _ -> false
-
-type variant_configuration_error =
-  | Untagged of {left_is_unboxed: bool}
-  | TagName of {left_tag: string option; right_tag: string option}
-
-type variant_error =
-  | VariantError of {
-      left_loc: Location.t;
-      right_loc: Location.t;
-      error: variant_configuration_error;
-      is_spread_context: bool;
-    }
-
-exception VariantConfigurationError of variant_error
-
-let variant_configuration_can_be_coerced (a1 : Parsetree.attributes)
-    (a2 : Parsetree.attributes) =
-  let unboxed =
-    match
-      ( Ast_untagged_variants.process_untagged a1,
-        Ast_untagged_variants.process_untagged a2 )
-    with
-    | true, true | false, false -> true
-    | _ -> false
-  in
-  if not unboxed then false
-  else
-    let tag =
-      match
-        ( Ast_untagged_variants.process_tag_name a1,
-          Ast_untagged_variants.process_tag_name a2 )
-      with
-      | Some tag1, Some tag2 when tag1 = tag2 -> true
-      | None, None -> true
-      | _ -> false
-    in
-    if not tag then false else true
-
-let variant_configuration_can_be_coerced_raises ~is_spread_context ~left_loc
-    ~right_loc ~(left_attributes : Parsetree.attributes)
-    ~(right_attributes : Parsetree.attributes) =
-  (match
-     ( Ast_untagged_variants.process_untagged left_attributes,
-       Ast_untagged_variants.process_untagged right_attributes )
-   with
-  | true, true | false, false -> ()
-  | left, _right ->
-    raise
-      (VariantConfigurationError
-         (VariantError
-            {
-              is_spread_context;
-              left_loc;
-              right_loc;
-              error = Untagged {left_is_unboxed = left};
-            })));
-
-  match
-    ( Ast_untagged_variants.process_tag_name left_attributes,
-      Ast_untagged_variants.process_tag_name right_attributes )
-  with
-  | Some host_tag, Some spread_tag when host_tag = spread_tag -> ()
-  | None, None -> ()
-  | left_tag, right_tag ->
-    raise
-      (VariantConfigurationError
-         (VariantError
-            {
-              is_spread_context;
-              left_loc;
-              right_loc;
-              error = TagName {left_tag; right_tag};
-            }))
diff --git a/jscomp/others/.depend b/jscomp/others/.depend
deleted file mode 100644
index 30f49d6..0000000
--- a/jscomp/others/.depend
+++ /dev/null
@@ -1,162 +0,0 @@
-node_path.cmj :
-node_fs.cmj : node.cmj js_string.cmj
-node_process.cmj : js_dict.cmj node_process.cmi
-node_module.cmj : node.cmj js_dict.cmj
-js_array.cmj :
-js_string.cmj : js_re.cmi js_array.cmj
-js_int.cmj :
-js_float.cmj :
-js_exn.cmj : js_exn.cmi
-js_null.cmj : js_exn.cmj js_null.cmi
-js_undefined.cmj : js_exn.cmj js_undefined.cmi
-js_null_undefined.cmj : js_null_undefined.cmi
-js_typed_array.cmj :
-node_buffer.cmj : node.cmj
-js_types.cmj : js_null.cmj js_types.cmi
-js_json.cmj : js_types.cmj js_string.cmj js_dict.cmj js_array.cmj \
-    js_json.cmi
-js_obj.cmj :
-js_vector.cmj : js_array.cmj js_vector.cmi
-js_list.cmj : js_vector.cmj js_list.cmi
-js_option.cmj : js_exn.cmj js_option.cmi
-js_console.cmj :
-js_result.cmj : js_result.cmi
-js_mapperRt.cmj : js_exn.cmj js_array.cmj js_mapperRt.cmi
-belt_Array.cmj : js_math.cmj belt_Array.cmi
-belt_internalAVLset.cmj : belt_SortArray.cmj belt_Id.cmj belt_Array.cmj \
-    belt_internalAVLset.cmi
-belt_internalAVLtree.cmj : belt_SortArray.cmj belt_Id.cmj belt_Array.cmj \
-    belt_internalAVLtree.cmi
-belt_List.cmj : belt_SortArray.cmj belt_Array.cmj belt_List.cmi
-belt_SortArray.cmj : belt_SortArrayString.cmj belt_SortArrayInt.cmj \
-    belt_Array.cmj belt_SortArray.cmi
-belt_SortArrayInt.cmj : belt_Array.cmj belt_SortArrayInt.cmi
-belt_SortArrayString.cmj : belt_Array.cmj belt_SortArrayString.cmi
-belt_Range.cmj : belt_Range.cmi
-belt_internalBucketsType.cmj : belt_Array.cmj belt_internalBucketsType.cmi
-belt_internalSetBuckets.cmj : belt_internalBucketsType.cmj belt_Array.cmj \
-    belt_internalSetBuckets.cmi
-belt_internalBuckets.cmj : belt_internalBucketsType.cmj belt_Array.cmj \
-    belt_internalBuckets.cmi
-belt_HashMap.cmj : belt_internalBucketsType.cmj belt_internalBuckets.cmj \
-    belt_Id.cmj belt_HashMapString.cmj belt_HashMapInt.cmj belt_Array.cmj \
-    belt_HashMap.cmi
-belt_HashSet.cmj : belt_internalSetBuckets.cmj belt_internalBucketsType.cmj \
-    belt_Id.cmj belt_HashSetString.cmj belt_HashSetInt.cmj belt_Array.cmj \
-    belt_HashSet.cmi
-belt_HashSetString.cmj : belt_internalSetBuckets.cmj \
-    belt_internalBucketsType.cmj belt_Array.cmj belt_HashSetString.cmi
-belt_HashSetInt.cmj : belt_internalSetBuckets.cmj \
-    belt_internalBucketsType.cmj belt_Array.cmj belt_HashSetInt.cmi
-belt_Id.cmj : belt_Id.cmi
-belt_MapDict.cmj : belt_internalAVLtree.cmj belt_Id.cmj belt_Array.cmj \
-    belt_MapDict.cmi
-belt_SetDict.cmj : belt_internalAVLset.cmj belt_Id.cmj belt_Array.cmj \
-    belt_SetDict.cmi
-belt_Map.cmj : belt_MapString.cmj belt_MapInt.cmj belt_MapDict.cmj \
-    belt_Id.cmj belt_Array.cmj belt_Map.cmi
-belt_internalMapInt.cmj : belt_internalAVLtree.cmj belt_SortArray.cmj \
-    belt_Array.cmj
-belt_internalMapString.cmj : belt_internalAVLtree.cmj belt_SortArray.cmj \
-    belt_Array.cmj
-belt_MapString.cmj : belt_internalMapString.cmj belt_internalAVLtree.cmj \
-    belt_Array.cmj belt_MapString.cmi
-belt_MapInt.cmj : belt_internalMapInt.cmj belt_internalAVLtree.cmj \
-    belt_Array.cmj belt_MapInt.cmi
-belt_Option.cmj : belt_Option.cmi
-belt_Result.cmj : belt_Result.cmi
-belt_Set.cmj : belt_SetString.cmj belt_SetInt.cmj belt_SetDict.cmj \
-    belt_Id.cmj belt_Array.cmj belt_Set.cmi
-belt_MutableSet.cmj : belt_internalAVLset.cmj belt_SortArray.cmj \
-    belt_MutableSetString.cmj belt_MutableSetInt.cmj belt_Id.cmj \
-    belt_Array.cmj belt_MutableSet.cmi
-belt_MutableSetInt.cmj : belt_internalSetInt.cmj belt_internalAVLset.cmj \
-    belt_SortArrayInt.cmj belt_Array.cmj belt_MutableSetInt.cmi
-belt_MutableSetString.cmj : belt_internalSetString.cmj \
-    belt_internalAVLset.cmj belt_SortArrayString.cmj belt_Array.cmj \
-    belt_MutableSetString.cmi
-belt_MutableMap.cmj : belt_internalAVLtree.cmj belt_MutableMapString.cmj \
-    belt_MutableMapInt.cmj belt_Id.cmj belt_Array.cmj belt_MutableMap.cmi
-belt_MutableMapInt.cmj : belt_internalMapInt.cmj belt_internalAVLtree.cmj \
-    belt_Array.cmj belt_MutableMapInt.cmi
-belt_MutableMapString.cmj : belt_internalMapString.cmj \
-    belt_internalAVLtree.cmj belt_Array.cmj belt_MutableMapString.cmi
-belt_internalSetInt.cmj : belt_internalAVLset.cmj belt_SortArrayInt.cmj \
-    belt_Array.cmj
-belt_internalSetString.cmj : belt_internalAVLset.cmj \
-    belt_SortArrayString.cmj belt_Array.cmj
-belt_SetInt.cmj : belt_internalSetInt.cmj belt_internalAVLset.cmj \
-    belt_Array.cmj belt_SetInt.cmi
-belt_SetString.cmj : belt_internalSetString.cmj belt_internalAVLset.cmj \
-    belt_Array.cmj belt_SetString.cmi
-belt_MutableStack.cmj : js_null.cmj belt_MutableStack.cmi
-belt_MutableQueue.cmj : js_null.cmj belt_Array.cmj belt_MutableQueue.cmi
-node_child_process.cmj : node.cmj
-js_math.cmj : js_int.cmj
-js_dict.cmj : js_array.cmj js_dict.cmi
-js_date.cmj :
-js_global.cmj :
-js_cast.cmj : js_cast.cmi
-js_promise.cmj :
-belt_HashMapInt.cmj : belt_internalBucketsType.cmj belt_internalBuckets.cmj \
-    belt_Array.cmj belt_HashMapInt.cmi
-belt_HashMapString.cmj : belt_internalBucketsType.cmj \
-    belt_internalBuckets.cmj belt_Array.cmj belt_HashMapString.cmi
-belt_Debug.cmj :
-node_process.cmi : js_dict.cmi
-js_exn.cmi :
-js_re.cmi :
-js_null.cmi :
-js_undefined.cmi :
-js_null_undefined.cmi :
-js_types.cmi :
-js_json.cmi : js_types.cmi js_string.cmj js_null.cmi js_dict.cmi
-js_vector.cmi :
-js_list.cmi : js_vector.cmi
-js_option.cmi :
-js_result.cmi :
-js_mapperRt.cmi :
-belt_Array.cmi :
-belt_internalAVLset.cmi : belt_Id.cmi
-belt_internalAVLtree.cmi : belt_Id.cmi
-belt_List.cmi :
-belt_SortArray.cmi : belt_SortArrayString.cmi belt_SortArrayInt.cmi
-belt_SortArrayInt.cmi :
-belt_SortArrayString.cmi :
-belt_Range.cmi :
-belt_internalBucketsType.cmi :
-belt_internalSetBuckets.cmi : belt_internalBucketsType.cmi
-belt_internalBuckets.cmi : belt_internalBucketsType.cmi
-belt_HashMap.cmi : belt_Id.cmi belt_HashMapString.cmi belt_HashMapInt.cmi
-belt_HashSet.cmi : belt_Id.cmi belt_HashSetString.cmi belt_HashSetInt.cmi
-belt_HashSetString.cmi :
-belt_HashSetInt.cmi :
-belt_Id.cmi :
-belt_MapDict.cmi : belt_Id.cmi
-belt_SetDict.cmi : belt_Id.cmi
-belt_Map.cmi : belt_MapString.cmi belt_MapInt.cmi belt_MapDict.cmi \
-    belt_Id.cmi
-belt_MapString.cmi :
-belt_MapInt.cmi :
-belt_Option.cmi :
-belt_Result.cmi :
-belt_Set.cmi : belt_SetString.cmi belt_SetInt.cmi belt_SetDict.cmi \
-    belt_Id.cmi
-belt_MutableSet.cmi : belt_MutableSetString.cmi belt_MutableSetInt.cmi \
-    belt_Id.cmi
-belt_MutableSetInt.cmi :
-belt_MutableSetString.cmi :
-belt_MutableMap.cmi : belt_MutableMapString.cmi belt_MutableMapInt.cmi \
-    belt_Id.cmi
-belt_MutableMapInt.cmi :
-belt_MutableMapString.cmi :
-belt_SetInt.cmi :
-belt_SetString.cmi :
-belt_MutableStack.cmi :
-belt_MutableQueue.cmi :
-js_dict.cmi :
-js_cast.cmi :
-dom.cmi : dom_storage.cmi
-dom_storage.cmi :
-belt_HashMapInt.cmi :
-belt_HashMapString.cmi :
diff --git a/jscomp/others/Design.md b/jscomp/others/Design.md
deleted file mode 100644
index 0447c3e..0000000
--- a/jscomp/others/Design.md
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-hierachy
-
-# set 
-## bs_internalAVLset (basic module with rotation)
-
-  methods in this moudle could be shared  by (at least 2 of them)
-
-  fuctional set, functional specialized set
-  mutable set, mutable specialized set.
-
-  for example, [mem0] could be shared by functional/mutable poly set
-
-
-## bs_Set
-  functional poly set (depends on bs_internalAVLset)
-
-## intenral_set.cppo.ml
-## bs_intenralSetInt
-## bs_internalSetString
-
-  methods could be shared by funcitional/imperative specialized set.
-  This intermediate module is created since we want to share methods
-  like [findOpt], [cmp]
-
-## set.cppo.ml
-## bs_SetInt
-## bs_SetString
-
-
-
-## setm.cpp.ml
-## bs_SetIntM
-## bs_SetStringM
-
-# map 
-## bs_internalAVLtree (basic module with rotation)
-
-## bs_Map
-
-## internal_map.cpp.ml
-## bs_internalMapInt
-## bs_internalMapString
-
-## map.cppo.ml
-## bs_MapInt
-## bs_MapString
-
-## mapm.cppo.ml
-## bs_MapIntM
-## bs_MapStringM
\ No newline at end of file
diff --git a/jscomp/others/README.md b/jscomp/others/README.md
deleted file mode 100644
index cb5a854..0000000
--- a/jscomp/others/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Belt is a data structures and utilities library that ships with ReScript and bsb-native, optimized for the web.
-
-```ocaml
-let a = Belt.Array.make 10 0
-let b = Belt.Array.map a (fun x  -> x + 1)
-
-module Comparator = Belt.Id.MakeComparable(struct 
-  type t = int
-  let cmp = Pervasives.compare 
-end)
-
-let c = Belt.Map.make ~id:(module Comparator)
-
-let d = Belt.Map.set c 10 "Hello"
-let e = Belt.Map.set d 11 "World!"
-
-let _ =
-  match Belt.Map.get e 11 with
-  | None -> print_endline "Not possible, I'm pretty sure!"
-  | Some world -> print_endline ("Hello " ^ world)
-
-let _ =
-  match Belt.Map.get d 11 with
-  | None -> print_endline "Maps are immutable"
-  | _ -> print_endline "I will never print!"
-```
-
-## Contributing
-
-You'll need to build `bspp.exe` that is inside `../lib` by simply running `make -C ../lib bspp.exe`.
-
-Then you can recompile all of belt to JS by running `make all`.
diff --git a/jscomp/others/belt.res b/jscomp/others/belt.res
deleted file mode 100644
index c97d77f..0000000
--- a/jscomp/others/belt.res
+++ /dev/null
@@ -1,361 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** The ReScript standard library.
-
-Belt is currently mostly covering collection types. It has no string or date functions yet, although Belt.String is in the works. In the meantime, use [Js.String](js/string) for string functions and [Js.Date](js/date) for date functions.
-
-## Motivation
-
-Belt provides:
-
-- The **highest quality** immutable data structures in JavaScript.
-- Safety by default: A Belt function will never throw exceptions, unless it is
-  indicated explicitly in the function name (suffix "Exn").
-- Better performance and smaller code size running on the JS platform.
-- Ready for [Tree Shaking](https://webpack.js.org/guides/tree-shaking/).
-
-## Usage
-
-To use modules from Belt, either refer to them by their fully qualified name (`Belt.List`, `Belt.Array` etc.) or open the `Belt` module by putting
-
-## Examples
-
-```rescript
-open Belt
-```
-
-at the top of your source files. After opening Belt this way, `Array` will refer to `Belt.Array`, `List` will refer to `Belt.List` etc. in the subsequent code.
-
-If you want to open Belt globally for all files in your project instead, you can put
-
-```json
-{
-  "bsc-flags": ["-open Belt"]
-}
-```
-
-into your `bsconfig.json`.
-
-**Note**: this is the **only** `open` we encourage.
-
-Example usage:
-
-## Examples
-
-```rescript
-let someNumbers = [1, 1, 4, 2, 3, 6, 3, 4, 2]
-
-let greaterThan2UniqueAndSorted =
-  someNumbers
-  ->Belt.Array.keep(x => x > 2)
-  // convert to and from set to make values unique
-  ->Belt.Set.Int.fromArray
-  ->Belt.Set.Int.toArray // output is already sorted
-
-Js.log2("result", greaterThan2UniqueAndSorted)
-```
-
-## Curried vs. Uncurried Callbacks
-
-For functions taking a callback parameter, there are usually two versions
-available:
-
-- curried (no suffix)
-- uncurried (suffixed with `U`)
-
-E.g.:
-
-## Examples
-
-```rescript
-let forEach: (t<'a>, 'a => unit) => unit
-
-let forEachU: (t<'a>, (. 'a) => unit) => unit
-```
-
-The uncurried version will be faster in some cases, but for simplicity we recommend to stick with the curried version unless you need the extra performance.
-
-The two versions can be invoked as follows:
-
-## Examples
-
-```rescript
-["a", "b", "c"]->Belt.Array.forEach(x => Js.log(x))
-
-["a", "b", "c"]->Belt.Array.forEachU((. x) => Js.log(x))
-```
-
-## Specialized Collections
-
-For collections types like set or map, Belt provides both a generic module as well as specialized, more efficient implementations for string and int keys.
-
-For example, Belt has the following set modules:
-
-- [Belt.Set](belt/set)
-- [Belt.Set.Int](belt/set/int)
-- [Belt.Set.String](belt/set/string)
-
-## Implementation Details
-
-### Array access runtime safety
-
-One common confusion comes from the way Belt handles array access. It differs from than the default standard library's.
-
-## Examples
-
-```rescript
-let letters = ["a", "b", "c"]
-let a = letters[0] // a == "a"
-let capitalA = Js.String.toUpperCase(a)
-let k = letters[10] // Raises an exception! The 10th index doesn't exist.
-```
-
-Because Belt avoids exceptions and returns `options` instead, this code behaves differently:
-
-## Examples
-
-```rescript
-open Belt
-let letters = ["a", "b", "c"]
-let a = letters[0] // a == Some("a")
-let captialA = Js.String.toUpperCase(a) // Type error! This code will not compile.
-let k = letters[10] // k == None
-```
-
-Although we've fixed the problem where `k` raises an exception, we now have a type error when trying to capitalize `a`. There are a few things going on here:
-
-- Reason transforms array index access to the function `Array.get`. So `letters[0]` is the same as `Array.get(letters, 0)`.
-- The compiler uses whichever `Array` module is in scope. If you `open Belt`, then it uses `Belt.Array`.
-- `Belt.Array.get` returns values wrapped in options, so `letters[0] == Some("a")`.
-
-Fortunately, this is easy to fix:
-
-## Examples
-
-```rescript
-open Belt
-let letters = ["a", "b", "c"]
-let a = letters[0]
-
-// Use a switch statement:
-let capitalA =
-  switch a {
-  | Some(a) => Some(Js.String.toUpperCase(a))
-  | None => None
-  }
-
-let k = letters[10] // k == None
-```
-
-With that little bit of tweaking, our code now compiles successfully and is 100% free of runtime errors!
-
-### A Special Encoding for Collection Safety
-
-When we create a collection library for a custom data type we need a way to provide a comparator function. Take Set for example, suppose its element type is a pair of ints, it needs a custom compare function that takes two tuples and returns their order. The Set could not just be typed as Set.t (int \* int) , its customized compare function needs to manifest itself in the signature, otherwise, if the user creates another customized compare function, the two collection could mix which would result in runtime error.
-
-We use a phantom type to solve the problem:
-
-## Examples
-
-```rescript
-module Comparable1 =
-  Belt.Id.MakeComparable(
-    {
-      type t = (int, int)
-      let cmp = ((a0, a1), (b0, b1)) =>
-        switch Pervasives.compare(a0, b0) {
-        | 0 => Pervasives.compare(a1, b1)
-        | c => c
-        }
-    }
-  )
-
-let mySet1 = Belt.Set.make(~id=module(Comparable1))
-
-module Comparable2 =
-  Belt.Id.MakeComparable(
-    {
-      type t = (int, int)
-      let cmp = ((a0, a1), (b0, b1)) =>
-        switch Pervasives.compare(a0, b0) {
-        | 0 => Pervasives.compare(a1, b1)
-        | c => c
-        }
-    }
-  )
-
-let mySet2 = Belt.Set.make(~id=module(Comparable2))
-```
-
-Here, the compiler would infer `mySet1` and `mySet2` having different type, so e.g. a `merge` operation that tries to merge these two sets will correctly fail.
-
-## Examples
-
-```rescript
-let mySet1: t<(int, int), Comparable1.identity>
-let mySet2: t<(int, int), Comparable2.identity>
-```
-
-`Comparable1.identity` and `Comparable2.identity` are not the same using our encoding scheme.
-
-*/
-
-@@warning("-49")
-
-/** [`Belt.Id`]()
-
-  Provide utilities to create identified comparators or hashes for
-  data structures used below.
-
-  It create a unique identifier per module of
-  functions so that different data structures with slightly different
-  comparison functions won't mix
-*/
-module Id = Belt_Id
-
-/** [`Belt.Array`]()
-
-  **mutable array**: Utilities functions
-*/
-module Array = Belt_Array
-
-/** [`Belt.SortArray`]()
-
-  The top level provides some generic sort related utilities.
-
-  It also has two specialized inner modules
-  [`Belt.SortArray.Int`]() and [`Belt.SortArray.String`]()
-*/
-module SortArray = Belt_SortArray
-
-/** [`Belt.MutableQueue`]()
-
-  An FIFO(first in first out) queue data structure
-*/
-module MutableQueue = Belt_MutableQueue
-
-/** [`Belt.MutableStack`]()
-
-  An FILO(first in last out) stack data structure
-*/
-module MutableStack = Belt_MutableStack
-
-/** [`Belt.List`]()
-
-  Utilities for List data type
-*/
-module List = Belt_List
-
-/** [`Belt.Range`]()
-
-  Utilities for a closed range `(from, start)`
-*/
-module Range = Belt_Range
-
-/** [`Belt.Set`]()
-
-  The top level provides generic **immutable** set operations.
-
-  It also has three specialized inner modules
-  [`Belt.Set.Int`](), [`Belt.Set.String`]() and
-
-  [`Belt.Set.Dict`](): This module separates data from function
-  which is more verbose but slightly more efficient
-
-*/
-module Set = Belt_Set
-
-/** [`Belt.Map`](),
-
-  The top level provides generic **immutable** map operations.
-
-  It also has three specialized inner modules
-  [`Belt.Map.Int`](), [`Belt.Map.String`]() and
-
-  [`Belt.Map.Dict`](): This module separates data from function
-  which  is more verbose but slightly more efficient
-*/
-module Map = Belt_Map
-
-/** [`Belt.MutableSet`]()
-
-  The top level provides generic **mutable** set operations.
-
-  It also has two specialized inner modules
-  [`Belt.MutableSet.Int`]() and [`Belt.MutableSet.String`]()
-*/
-module MutableSet = Belt_MutableSet
-
-/** [`Belt.MutableMap`]()
-
-  The top level provides generic **mutable** map operations.
-
-  It also has two specialized inner modules
-  [`Belt.MutableMap.Int`]() and [`Belt.MutableMap.String`]()
-
-*/
-module MutableMap = Belt_MutableMap
-
-/** [`Belt.HashSet`]()
-
-  The top level provides generic **mutable** hash set operations.
-
-  It also has two specialized inner modules
-  [`Belt.HashSet.Int`]() and [`Belt.HashSet.String`]()
-*/
-module HashSet = Belt_HashSet
-
-/** [`Belt.HashMap`]()
-
-  The top level provides generic **mutable** hash map operations.
-
-  It also has two specialized inner modules
-  [`Belt.HashMap.Int`]() and [`Belt.HashMap.String`]()
-*/
-module HashMap = Belt_HashMap
-
-/** [`Belt.Option`]()
-
-  Utilities for option data type.
-*/
-module Option = Belt_Option
-
-/** [`Belt.Result`]()
-
-  Utilities for result data type.
-*/
-module Result = Belt_Result
-
-/** [`Belt.Int`]()
-
-  Utilities for Int.
-*/
-module Int = Belt_Int
-
-/** [`Belt.Float`]()
-
-  Utilities for Float.
-*/
-module Float = Belt_Float
diff --git a/jscomp/others/belt_Array.res b/jscomp/others/belt_Array.res
deleted file mode 100644
index fdb72f4..0000000
--- a/jscomp/others/belt_Array.res
+++ /dev/null
@@ -1,647 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-/* Array operations */
-type t<'a> = array<'a>
-
-external length: t<'a> => int = "%array_length"
-
-external size: t<'a> => int = "%array_length"
-
-external getUnsafe: (t<'a>, int) => 'a = "%array_unsafe_get"
-
-external setUnsafe: (t<'a>, int, 'a) => unit = "%array_unsafe_set"
-
-external getUndefined: (t<'a>, int) => Js.undefined<'a> = "%array_unsafe_get"
-
-/* external get: 'a t -> int -> 'a = "%array_safe_get" */
-let get = (arr, i) =>
-  if i >= 0 && i < length(arr) {
-    Some(getUnsafe(arr, i))
-  } else {
-    None
-  }
-
-let getExn = (arr, i) => {
-  assert(i >= 0 && i < length(arr))
-  getUnsafe(arr, i)
-}
-
-let set = (arr, i, v) =>
-  if i >= 0 && i < length(arr) {
-    setUnsafe(arr, i, v)
-    true
-  } else {
-    false
-  }
-
-let setExn = (arr, i, v) => {
-  assert(i >= 0 && i < length(arr))
-  setUnsafe(arr, i, v)
-}
-
-@set external truncateToLengthUnsafe: (t<'a>, int) => unit = "length"
-
-@new external makeUninitialized: int => array<Js.undefined<'a>> = "Array"
-
-@new external makeUninitializedUnsafe: int => array<'a> = "Array"
-
-@send external copy: (t<'a>, @as(0) _) => t<'a> = "slice"
-
-let swapUnsafe = (xs, i, j) => {
-  let tmp = getUnsafe(xs, i)
-  setUnsafe(xs, i, getUnsafe(xs, j))
-  setUnsafe(xs, j, tmp)
-}
-
-let shuffleInPlace = xs => {
-  let len = length(xs)
-  for i in 0 to len - 1 {
-    swapUnsafe(xs, i, Js_math.random_int(i, len)) /* [i,len) */
-  }
-}
-
-let shuffle = xs => {
-  let result = copy(xs)
-  shuffleInPlace(result)
-
-  /* TODO: improve */
-  result
-}
-
-let reverseAux = (xs, ofs, len) =>
-  for i in 0 to len / 2 - 1 {
-    swapUnsafe(xs, ofs + i, ofs + len - i - 1)
-  }
-
-let reverseInPlace = xs => {
-  let len = length(xs)
-  reverseAux(xs, 0, len)
-}
-
-let reverse = xs => {
-  let len = length(xs)
-  let result = makeUninitializedUnsafe(len)
-  for i in 0 to len - 1 {
-    setUnsafe(result, i, getUnsafe(xs, len - 1 - i))
-  }
-  result
-}
-
-let make = (l, f) =>
-  if l <= 0 {
-    []
-  } else {
-    let res = makeUninitializedUnsafe(l)
-    for i in 0 to l - 1 {
-      setUnsafe(res, i, f)
-    }
-    res
-  }
-
-/* See #6575. We could also check for maximum array size, but this depends
- on whether we create a float array or a regular one... */
-let makeByU = (l, f) =>
-  if l <= 0 {
-    []
-  } else {
-    let res = makeUninitializedUnsafe(l)
-    for i in 0 to l - 1 {
-      setUnsafe(res, i, f(. i))
-    }
-    res
-  }
-
-let makeBy = (l, f) => makeByU(l, (. a) => f(a))
-
-let makeByAndShuffleU = (l, f) => {
-  let u = makeByU(l, f)
-  shuffleInPlace(u)
-  u
-}
-
-let makeByAndShuffle = (l, f) => makeByAndShuffleU(l, (. a) => f(a))
-
-let range = (start, finish) => {
-  let cut = finish - start
-  if cut < 0 {
-    []
-  } else {
-    let arr = makeUninitializedUnsafe(cut + 1)
-    for i in 0 to cut {
-      setUnsafe(arr, i, start + i)
-    }
-    arr
-  }
-}
-
-let rangeBy = (start, finish, ~step) => {
-  let cut = finish - start
-  if cut < 0 || step <= 0 {
-    []
-  } else {
-    let nb = cut / step + 1
-    let arr = makeUninitializedUnsafe(nb)
-    let cur = ref(start)
-    for i in 0 to nb - 1 {
-      setUnsafe(arr, i, cur.contents)
-      cur.contents = cur.contents + step
-    }
-    arr
-  }
-}
-
-let zip = (xs, ys) => {
-  let (lenx, leny) = (length(xs), length(ys))
-  let len = Pervasives.min(lenx, leny)
-  let s = makeUninitializedUnsafe(len)
-  for i in 0 to len - 1 {
-    setUnsafe(s, i, (getUnsafe(xs, i), getUnsafe(ys, i)))
-  }
-  s
-}
-
-let zipByU = (xs, ys, f) => {
-  let (lenx, leny) = (length(xs), length(ys))
-  let len = Pervasives.min(lenx, leny)
-  let s = makeUninitializedUnsafe(len)
-  for i in 0 to len - 1 {
-    setUnsafe(s, i, f(. getUnsafe(xs, i), getUnsafe(ys, i)))
-  }
-  s
-}
-
-let zipBy = (xs, ys, f) => zipByU(xs, ys, (. a, b) => f(a, b))
-
-let concat = (a1, a2) => {
-  let l1 = length(a1)
-  let l2 = length(a2)
-  let a1a2 = makeUninitializedUnsafe(l1 + l2)
-  for i in 0 to l1 - 1 {
-    setUnsafe(a1a2, i, getUnsafe(a1, i))
-  }
-  for i in 0 to l2 - 1 {
-    setUnsafe(a1a2, l1 + i, getUnsafe(a2, i))
-  }
-  a1a2
-}
-
-let concatMany = arrs => {
-  let lenArrs = length(arrs)
-  let totalLen = ref(0)
-  for i in 0 to lenArrs - 1 {
-    totalLen.contents = totalLen.contents + length(getUnsafe(arrs, i))
-  }
-  let result = makeUninitializedUnsafe(totalLen.contents)
-  totalLen.contents = 0
-  for j in 0 to lenArrs - 1 {
-    let cur = getUnsafe(arrs, j)
-    for k in 0 to length(cur) - 1 {
-      setUnsafe(result, totalLen.contents, getUnsafe(cur, k))
-      totalLen.contents = totalLen.contents + 1
-    }
-  }
-  result
-}
-
-let slice = (a, ~offset, ~len) =>
-  if len <= 0 {
-    []
-  } else {
-    let lena = length(a)
-    let ofs = if offset < 0 {
-      Pervasives.max(lena + offset, 0)
-    } else {
-      offset
-    }
-    let hasLen = lena - ofs
-    let copyLength = Pervasives.min(hasLen, len)
-    if copyLength <= 0 {
-      []
-    } else {
-      let result = makeUninitializedUnsafe(copyLength)
-      for i in 0 to copyLength - 1 {
-        setUnsafe(result, i, getUnsafe(a, ofs + i))
-      }
-      result
-    }
-  }
-
-let sliceToEnd = (a, offset) => {
-  let lena = length(a)
-  let ofs = if offset < 0 {
-    Pervasives.max(lena + offset, 0)
-  } else {
-    offset
-  }
-  let len = if lena > ofs {
-    lena - ofs
-  } else {
-    0
-  }
-  let result = makeUninitializedUnsafe(len)
-  for i in 0 to len - 1 {
-    setUnsafe(result, i, getUnsafe(a, ofs + i))
-  }
-  result
-}
-
-let fill = (a, ~offset, ~len, v) =>
-  if len > 0 {
-    let lena = length(a)
-    let ofs = if offset < 0 {
-      Pervasives.max(lena + offset, 0)
-    } else {
-      offset
-    }
-    let hasLen = lena - ofs
-    let fillLength = Pervasives.min(hasLen, len)
-    if fillLength > 0 {
-      for i in ofs to ofs + fillLength - 1 {
-        setUnsafe(a, i, v)
-      }
-    }
-  }
-
-let blitUnsafe = (
-  ~src as a1,
-  ~srcOffset as srcofs1,
-  ~dst as a2,
-  ~dstOffset as srcofs2,
-  ~len as blitLength,
-) =>
-  if srcofs2 <= srcofs1 {
-    for j in 0 to blitLength - 1 {
-      setUnsafe(a2, j + srcofs2, getUnsafe(a1, j + srcofs1))
-    }
-  } else {
-    for j in blitLength - 1 downto 0 {
-      setUnsafe(a2, j + srcofs2, getUnsafe(a1, j + srcofs1))
-    }
-  }
-
-/* We don't need check `blitLength` since when `blitLength < 0` the
-   for loop will be nop
-*/
-let blit = (~src as a1, ~srcOffset as ofs1, ~dst as a2, ~dstOffset as ofs2, ~len) => {
-  let lena1 = length(a1)
-  let lena2 = length(a2)
-  let srcofs1 = if ofs1 < 0 {
-    Pervasives.max(lena1 + ofs1, 0)
-  } else {
-    ofs1
-  }
-  let srcofs2 = if ofs2 < 0 {
-    Pervasives.max(lena2 + ofs2, 0)
-  } else {
-    ofs2
-  }
-  let blitLength = Pervasives.min(len, Pervasives.min(lena1 - srcofs1, lena2 - srcofs2))
-
-  /* blitUnsafe a1 srcofs1 a2 srcofs2 blitLength */
-  if srcofs2 <= srcofs1 {
-    for j in 0 to blitLength - 1 {
-      setUnsafe(a2, j + srcofs2, getUnsafe(a1, j + srcofs1))
-    }
-  } else {
-    for j in blitLength - 1 downto 0 {
-      setUnsafe(a2, j + srcofs2, getUnsafe(a1, j + srcofs1))
-    }
-  }
-}
-
-let forEachU = (a, f) =>
-  for i in 0 to length(a) - 1 {
-    f(. getUnsafe(a, i))
-  }
-
-let forEach = (a, f) => forEachU(a, (. a) => f(a))
-
-let mapU = (a, f) => {
-  let l = length(a)
-  let r = makeUninitializedUnsafe(l)
-  for i in 0 to l - 1 {
-    setUnsafe(r, i, f(. getUnsafe(a, i)))
-  }
-  r
-}
-
-let map = (a, f) => mapU(a, (. a) => f(a))
-
-let flatMapU = (a, f) => concatMany(mapU(a, f))
-
-let flatMap = (a, f) => flatMapU(a, (. a) => f(a))
-
-let getByU = (a, p) => {
-  let l = length(a)
-  let i = ref(0)
-  let r = ref(None)
-  while r.contents == None && i.contents < l {
-    let v = getUnsafe(a, i.contents)
-    if p(. v) {
-      r.contents = Some(v)
-    }
-    i.contents = i.contents + 1
-  }
-  r.contents
-}
-
-let getBy = (a, p) => getByU(a, (. a) => p(a))
-
-let getIndexByU = (a, p) => {
-  let l = length(a)
-  let i = ref(0)
-  let r = ref(None)
-  while r.contents == None && i.contents < l {
-    let v = getUnsafe(a, i.contents)
-    if p(. v) {
-      r.contents = Some(i.contents)
-    }
-    i.contents = i.contents + 1
-  }
-  r.contents
-}
-
-let getIndexBy = (a, p) => getIndexByU(a, (. a) => p(a))
-
-let keepU = (a, f) => {
-  let l = length(a)
-  let r = makeUninitializedUnsafe(l)
-  let j = ref(0)
-  for i in 0 to l - 1 {
-    let v = getUnsafe(a, i)
-    if f(. v) {
-      setUnsafe(r, j.contents, v)
-      j.contents = j.contents + 1
-    }
-  }
-  truncateToLengthUnsafe(r, j.contents)
-  r
-}
-
-let keep = (a, f) => keepU(a, (. a) => f(a))
-
-let keepWithIndexU = (a, f) => {
-  let l = length(a)
-  let r = makeUninitializedUnsafe(l)
-  let j = ref(0)
-  for i in 0 to l - 1 {
-    let v = getUnsafe(a, i)
-    if f(. v, i) {
-      setUnsafe(r, j.contents, v)
-      j.contents = j.contents + 1
-    }
-  }
-  truncateToLengthUnsafe(r, j.contents)
-  r
-}
-
-let keepWithIndex = (a, f) => keepWithIndexU(a, (. a, i) => f(a, i))
-
-let keepMapU = (a, f) => {
-  let l = length(a)
-  let r = makeUninitializedUnsafe(l)
-  let j = ref(0)
-  for i in 0 to l - 1 {
-    let v = getUnsafe(a, i)
-    switch f(. v) {
-    | None => ()
-    | Some(v) =>
-      setUnsafe(r, j.contents, v)
-      j.contents = j.contents + 1
-    }
-  }
-  truncateToLengthUnsafe(r, j.contents)
-  r
-}
-
-let keepMap = (a, f) => keepMapU(a, (. a) => f(a))
-
-let forEachWithIndexU = (a, f) =>
-  for i in 0 to length(a) - 1 {
-    f(. i, getUnsafe(a, i))
-  }
-
-let forEachWithIndex = (a, f) => forEachWithIndexU(a, (. a, b) => f(a, b))
-
-let mapWithIndexU = (a, f) => {
-  let l = length(a)
-  let r = makeUninitializedUnsafe(l)
-  for i in 0 to l - 1 {
-    setUnsafe(r, i, f(. i, getUnsafe(a, i)))
-  }
-  r
-}
-
-let mapWithIndex = (a, f) => mapWithIndexU(a, (. a, b) => f(a, b))
-
-let reduceU = (a, x, f) => {
-  let r = ref(x)
-  for i in 0 to length(a) - 1 {
-    r.contents = f(. r.contents, getUnsafe(a, i))
-  }
-  r.contents
-}
-
-let reduce = (a, x, f) => reduceU(a, x, (. a, b) => f(a, b))
-
-let reduceReverseU = (a, x, f) => {
-  let r = ref(x)
-  for i in length(a) - 1 downto 0 {
-    r.contents = f(. r.contents, getUnsafe(a, i))
-  }
-  r.contents
-}
-
-let reduceReverse = (a, x, f) => reduceReverseU(a, x, (. a, b) => f(a, b))
-
-let reduceReverse2U = (a, b, x, f) => {
-  let r = ref(x)
-  let len = Pervasives.min(length(a), length(b))
-  for i in len - 1 downto 0 {
-    r.contents = f(. r.contents, getUnsafe(a, i), getUnsafe(b, i))
-  }
-  r.contents
-}
-
-let reduceReverse2 = (a, b, x, f) => reduceReverse2U(a, b, x, (. a, b, c) => f(a, b, c))
-
-let reduceWithIndexU = (a, x, f) => {
-  let r = ref(x)
-  for i in 0 to length(a) - 1 {
-    r.contents = f(. r.contents, getUnsafe(a, i), i)
-  }
-  r.contents
-}
-
-let reduceWithIndex = (a, x, f) => reduceWithIndexU(a, x, (. a, b, c) => f(a, b, c))
-
-let rec everyAux = (arr, i, b, len) =>
-  if i == len {
-    true
-  } else if b(. getUnsafe(arr, i)) {
-    everyAux(arr, i + 1, b, len)
-  } else {
-    false
-  }
-
-let rec someAux = (arr, i, b, len) =>
-  if i == len {
-    false
-  } else if b(. getUnsafe(arr, i)) {
-    true
-  } else {
-    someAux(arr, i + 1, b, len)
-  }
-
-let everyU = (arr, b) => {
-  let len = length(arr)
-  everyAux(arr, 0, b, len)
-}
-
-let every = (arr, f) => everyU(arr, (. b) => f(b))
-
-let someU = (arr, b) => {
-  let len = length(arr)
-  someAux(arr, 0, b, len)
-}
-
-let some = (arr, f) => someU(arr, (. b) => f(b))
-
-let rec everyAux2 = (arr1, arr2, i, b, len) =>
-  if i == len {
-    true
-  } else if b(. getUnsafe(arr1, i), getUnsafe(arr2, i)) {
-    everyAux2(arr1, arr2, i + 1, b, len)
-  } else {
-    false
-  }
-
-let rec someAux2 = (arr1, arr2, i, b, len) =>
-  if i == len {
-    false
-  } else if b(. getUnsafe(arr1, i), getUnsafe(arr2, i)) {
-    true
-  } else {
-    someAux2(arr1, arr2, i + 1, b, len)
-  }
-
-let every2U = (a, b, p) => everyAux2(a, b, 0, p, Pervasives.min(length(a), length(b)))
-
-let every2 = (a, b, p) => every2U(a, b, (. a, b) => p(a, b))
-
-let some2U = (a, b, p) => someAux2(a, b, 0, p, Pervasives.min(length(a), length(b)))
-
-let some2 = (a, b, p) => some2U(a, b, (. a, b) => p(a, b))
-
-let eqU = (a, b, p) => {
-  let lena = length(a)
-  let lenb = length(b)
-  if lena == lenb {
-    everyAux2(a, b, 0, p, lena)
-  } else {
-    false
-  }
-}
-
-let eq = (a, b, p) => eqU(a, b, (. a, b) => p(a, b))
-
-let rec everyCmpAux2 = (arr1, arr2, i, b, len) =>
-  if i == len {
-    0
-  } else {
-    let c = b(. getUnsafe(arr1, i), getUnsafe(arr2, i))
-    if c == 0 {
-      everyCmpAux2(arr1, arr2, i + 1, b, len)
-    } else {
-      c
-    }
-  }
-
-let cmpU = (a, b, p) => {
-  let lena = length(a)
-  let lenb = length(b)
-  if lena > lenb {
-    1
-  } else if lena < lenb {
-    -1
-  } else {
-    everyCmpAux2(a, b, 0, p, lena)
-  }
-}
-
-let cmp = (a, b, p) => cmpU(a, b, (. a, b) => p(a, b))
-
-let partitionU = (a, f) => {
-  let l = length(a)
-  let i = ref(0)
-  let j = ref(0)
-  let a1 = makeUninitializedUnsafe(l)
-  let a2 = makeUninitializedUnsafe(l)
-  for ii in 0 to l - 1 {
-    let v = getUnsafe(a, ii)
-    if f(. v) {
-      setUnsafe(a1, i.contents, v)
-      i.contents = i.contents + 1
-    } else {
-      setUnsafe(a2, j.contents, v)
-      j.contents = j.contents + 1
-    }
-  }
-  truncateToLengthUnsafe(a1, i.contents)
-  truncateToLengthUnsafe(a2, j.contents)
-  (a1, a2)
-}
-
-let partition = (a, f) => partitionU(a, (. x) => f(x))
-
-let unzip = a => {
-  let l = length(a)
-  let a1 = makeUninitializedUnsafe(l)
-  let a2 = makeUninitializedUnsafe(l)
-  for i in 0 to l - 1 {
-    let (v1, v2) = getUnsafe(a, i)
-    setUnsafe(a1, i, v1)
-    setUnsafe(a2, i, v2)
-  }
-  (a1, a2)
-}
-
-let joinWithU = (a, sep, toString) =>
-  switch length(a) {
-  | 0 => ""
-  | l =>
-    let lastIndex = l - 1
-    let rec aux = (i, res) =>
-      if i == lastIndex {
-        res ++ toString(. getUnsafe(a, i))
-      } else {
-        aux(i + 1, res ++ (toString(. getUnsafe(a, i)) ++ sep))
-      }
-
-    aux(0, "")
-  }
-
-let joinWith = (a, sep, toString) => joinWithU(a, sep, (. x) => toString(x))
-
-let initU = (n, f) => {
-  let v = makeUninitializedUnsafe(n)
-  for i in 0 to n - 1 {
-    setUnsafe(v, i, f(. i))
-  }
-  v
-}
-
-let init = (n, f) => initU(n, (. i) => f(i))
-
-@send external push: (t<'a>, 'a) => unit = "push"
diff --git a/jscomp/others/belt_Array.resi b/jscomp/others/belt_Array.resi
deleted file mode 100644
index eb81098..0000000
--- a/jscomp/others/belt_Array.resi
+++ /dev/null
@@ -1,771 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-/* Adapted significantly by Authors of ReScript */
-
-/***
-Utilities for `Array` functions.
-
-### Note about index syntax
-
-Code like `arr[0]` does *not* compile to JavaScript `arr[0]`. Reason transforms
-the `[]` index syntax into a function: `Array.get(arr, 0)`. By default, this
-uses the default standard library's `Array.get` function, which may raise an
-exception if the index isn't found. If you `open Belt`, it will use the
-`Belt.Array.get` function which returns options instead of raising exceptions. 
-[See this for more information](../belt.mdx#array-access-runtime-safety).
-*/
-
-type t<'a> = array<'a>
-
-/**
-Return the size of the array
-
-## Examples
-
-```rescript
-// Returns 1
-Belt.Array.length(["test"])
-```
-*/
-external length: t<'a> => int = "%array_length"
-
-/** See [`Belt.Array.length`]() */
-external size: t<'a> => int = "%array_length"
-
-/**
-If `i <= 0 <= length(arr)` returns `Some(value)` where `value` is the item at index `i`.
-If `i` is out of range returns `None`.
-
-## Examples
-
-```rescript
-Belt.Array.get(["a", "b", "c"], 0) == Some("a")
-Belt.Array.get(["a", "b", "c"], 3) == None
-Belt.Array.get(["a", "b", "c"], -1) == None
-```
-*/
-let get: (t<'a>, int) => option<'a>
-
-/**
-Raise an exception if `i` is out of range.
-Otherwise return the value at index `i` in `arr`.
-*/
-let getExn: (t<'a>, int) => 'a
-
-/**
-`getUnsafe(arr, i)`
-
-**Unsafe**
-
-no bounds checking; this would cause type error if `i` does not stay within range
-*/
-external getUnsafe: (t<'a>, int) => 'a = "%array_unsafe_get"
-
-/**
-`getUndefined(arr, i)`
-
-It does the samething in the runtime as [`getUnsafe`]();
-it is _type safe_ since the return type still track whether it is
-in range or not
-*/
-external getUndefined: (t<'a>, int) => Js.undefined<'a> = "%array_unsafe_get"
-
-/**
-`set(arr, n, x)` modifies `arr` in place; it replaces the nth element of `arr`
-with `x`. Returning `false` means not updated due to out of range.
-*/
-let set: (t<'a>, int, 'a) => bool
-
-/**
-`setExn(arr, i, x)` raise an exception if `i` is out of range.
-*/
-let setExn: (t<'a>, int, 'a) => unit
-
-external setUnsafe: (t<'a>, int, 'a) => unit = "%array_unsafe_set"
-
-/**
-`shuffleInPlace(arr)` randomly re-orders the items in `arr`
-*/
-let shuffleInPlace: t<'a> => unit
-
-/** Returns a fresh array with items in original array randomly shuffled. */
-let shuffle: t<'a> => t<'a>
-
-/**
-`reverseInPlace(arr)` reverses items in `arr` in place.
-
-## Examples
-
-```rescript
-let arr = [10, 11, 12, 13, 14]
-
-let () = Belt.Array.reverseInPlace(arr)
-
-arr == [14, 13, 12, 11, 10]
-```
-*/
-let reverseInPlace: t<'a> => unit
-
-/**
-`reverse(arr)` returns a fresh array with items in arr in reverse order.
-
-## Examples
-
-```rescript
-Belt.Array.reverse([10, 11, 12, 13, 14]) == [14, 13, 12, 11, 10]
-```
-*/
-let reverse: t<'a> => t<'a>
-
-@new
-/**
-`makeUninitialized(n)` creates an array of length `n` filled with the undefined
-value. You must specify the type of data that will eventually fill the array.
-
-## Examples
-
-```rescript
-let arr: array<Js.undefined<string>> = Belt.Array.makeUninitialized(5)
-
-Belt.Array.getExn(arr, 0) == Js.undefined
-```
-*/
-external makeUninitialized: int => array<Js.undefined<'a>> = "Array"
-
-@new
-/**
-**Unsafe**
-
-## Examples
-
-```rescript
-let arr = Belt.Array.makeUninitializedUnsafe(5)
-
-Js.log(Belt.Array.getExn(arr, 0)) // undefined
-
-Belt.Array.setExn(arr, 0, "example")
-
-Js.log(Belt.Array.getExn(arr, 0) == "example")
-```
-*/
-external makeUninitializedUnsafe: int => t<'a> = "Array"
-
-/**
-`make(n, e)` return an array of size `n` filled with value `e`.
-Returns an empty array when `n` is negative.
-*/
-let make: (int, 'a) => t<'a>
-
-/**
-`range(start, finish)` create an inclusive array.
-
-## Examples
-
-```rescript
-Belt.Array.range(0, 3) == [0, 1, 2, 3]
-
-Belt.Array.range(3, 0) == []
-
-Belt.Array.range(3, 3) == [3]
-```
-*/
-let range: (int, int) => array<int>
-
-/**
-`rangeBy(start, finish, ~step)` returns empty array when step is 0 or negative.
-It also return an empty array when `start > finish`.
-
-## Examples
-
-```rescript
-Belt.Array.rangeBy(0, 10, ~step=3) == [0, 3, 6, 9]
-
-Belt.Array.rangeBy(0, 12, ~step=3) == [0, 3, 6, 9, 12]
-
-Belt.Array.rangeBy(33, 0, ~step=1) == []
-
-Belt.Array.rangeBy(33, 0, ~step=-1) == []
-
-Belt.Array.rangeBy(3, 12, ~step=-1) == []
-
-Belt.Array.rangeBy(3, 3, ~step=0) == []
-
-Belt.Array.rangeBy(3, 3, ~step=1) == [3]
-```
-*/
-let rangeBy: (int, int, ~step: int) => array<int>
-
-let makeByU: (int, (. int) => 'a) => t<'a>
-/**
-`makeBy(n, f)` return an empty array when n is negative return an array of size
-n populated by `f(i)` start from `0` to `n - 1`.
-
-## Examples
-
-```rescript
-Belt.Array.makeBy(5, (i) => i) == [0, 1, 2, 3, 4]
-
-Belt.Array.makeBy(5, (i) => i * i) == [0, 1, 4, 9, 16]
-```
-*/
-let makeBy: (int, int => 'a) => t<'a>
-
-let makeByAndShuffleU: (int, (. int) => 'a) => t<'a>
-/**
-Equivalent to `shuffle(makeBy(n, f))`
-*/
-let makeByAndShuffle: (int, int => 'a) => t<'a>
-
-/**
-`zip(a, b)` create an array of pairs from corresponding elements of a and b.
-Stop with the shorter array.
-
-## Examples
-
-```rescript
-Belt.Array.zip([1, 2], [3, 4, 5]) == [(1, 3), (2, 4)]
-```
-*/
-let zip: (t<'a>, array<'b>) => array<('a, 'b)>
-
-let zipByU: (t<'a>, array<'b>, (. 'a, 'b) => 'c) => array<'c>
-/**
-`zipBy(xs, ys, f)` create an array by applying `f` to corresponding elements of
-`xs` and `ys`. Stops with shorter array.
-
-Equivalent to `map(zip(xs, ys), ((a, b)) => f(a, b))`
-
-## Examples
-
-```rescript
-Belt.Array.zipBy([1, 2, 3], [4, 5], (a, b) => 2 * a + b) == [6, 9]
-```
-*/
-let zipBy: (t<'a>, array<'b>, ('a, 'b) => 'c) => array<'c>
-
-/**
-`unzip(a)` takes an array of pairs and creates a pair of arrays. The first array
-contains all the first items of the pairs; the second array contains all the
-second items.
-
-## Examples
-
-```rescript
-Belt.Array.unzip([(1, 2), (3, 4)]) == ([1, 3], [2, 4])
-
-Belt.Array.unzip([(1, 2), (3, 4), (5, 6), (7, 8)]) == ([1, 3, 5, 7], [2, 4, 6, 8])
-```
-*/
-let unzip: array<('a, 'b)> => (t<'a>, array<'b>)
-
-/**
-`concat(xs, ys)` returns a fresh array containing the concatenation of the arrays
-`v1` and `v2`, so even if `v1` or `v2` is empty; it can not be shared.
-
-## Examples
-
-```rescript
-Belt.Array.concat([1, 2, 3], [4, 5]) == [1, 2, 3, 4, 5]
-
-Belt.Array.concat([], ["a", "b", "c"]) == ["a", "b", "c"]
-```
-*/
-let concat: (t<'a>, t<'a>) => t<'a>
-
-/**
-`concatMany(xss)` returns a fresh array as the concatenation of `xss` (an array of arrays)
-
-## Examples
-
-```rescript
-Belt.Array.concatMany([[1, 2, 3], [4, 5, 6], [7, 8]]) == [1, 2, 3, 4, 5, 6, 7, 8]
-```
-*/
-let concatMany: array<t<'a>> => t<'a>
-
-/**
-`slice(xs, offset, len)` creates a new array with the len elements of `xs`
-starting at `offset` for `offset` can be negative;and is evaluated as
-`length(xs) - offset(slice, xs) - 1(1)` means get the last element as a
-singleton array `slice(xs, ~-len, len)` will return a copy of the array if the
-array does not have enough data; `slice` extracts through the end of sequence.
-
-if `len` is negative; returns the empty array.
-
-## Examples
-
-```rescript
-Belt.Array.slice([10, 11, 12, 13, 14, 15, 16], ~offset=2, ~len=3) == [12, 13, 14]
-
-Belt.Array.slice([10, 11, 12, 13, 14, 15, 16], ~offset=-4, ~len=3) == [13, 14, 15]
-
-Belt.Array.slice([10, 11, 12, 13, 14, 15, 16], ~offset=4, ~len=9) == [14, 15, 16]
-```
-*/
-let slice: (t<'a>, ~offset: int, ~len: int) => t<'a>
-
-/**
-`sliceToEnd(xs, offset)` creates a new array with the elements of `xs` starting
-at `offset`
-
-`offset` can be negative; and is evaluated as `length(xs) - offset(sliceToEnd, xs) - 1`
-means get the last element as a singleton array
-
-`sliceToEnd(xs, 0)` will return a copy of the array
-
-## Examples
-
-```rescript
-Belt.Array.sliceToEnd([10, 11, 12, 13, 14, 15, 16], 2) == [12, 13, 14, 15, 16]
-
-Belt.Array.sliceToEnd([10, 11, 12, 13, 14, 15, 16], -4) == [13, 14, 15, 16]
-```
-*/
-let sliceToEnd: (t<'a>, int) => t<'a>
-
-@send
-/**
-`copy(a)` returns a copy of `a`; that is; a fresh array containing the same
-elements as `a`.
-*/
-external copy: (t<'a>, @as(0) _) => t<'a> = "slice"
-
-/**
-`fill(arr, ~offset, ~len, x)` modifies `arr` in place, storing `x` in elements
-number `offset` to `offset + len - 1`. `offset` can be negative; and is evaluated
-as `length(arr - offset)`.
-
-`fill(arr, ~offset=-1, ~len=1)` means fill the last element, if the array does not have enough data; `fill` will ignore it
-
-## Examples
-
-```rescript
-let arr = Belt.Array.makeBy(5, (i) => i)
-
-Belt.Array.fill(arr, ~offset=2, ~len=2, 9)
-
-arr == [0, 1, 9, 9, 4]
-
-Belt.Array.fill(arr, ~offset=7, ~len=2, 8)
-
-arr == [0, 1, 9, 9, 4]
-*/
-let fill: (t<'a>, ~offset: int, ~len: int, 'a) => unit
-
-/**
-`blit(~src=v1, ~srcOffset=o1, ~dst=v2, ~dstOffset=o2, ~len)` copies `len` elements
-from array `v1`;starting at element number `o1`;to array `v2`, starting at element
-number `o2`. It works correctly even if `v1` and `v2` are the same array and the
-source and destination chunks overlap.
-
-`offset` can be negative; `-1` means `len - 1`; if `len + offset` is still negative;it will be set as 0
-
-For each of the examples;presume that `v1 == [10, 11, 12, 13, 14, 15, 16, 17]` and `v2 == [20, 21, 22, 23, 24, 25, 26, 27]`. The result shown is the content of the destination array.
-
-## Examples
-
-```rescript
-let v1 = [10, 11, 12, 13, 14, 15, 16, 17]
-let v2 = [20, 21, 22, 23, 24, 25, 26, 27]
-
-Belt.Array.blit(~src=v1, ~srcOffset=4, ~dst=v2, ~dstOffset=2, ~len=3)
-v2 == [20, 21, 14, 15, 16, 25, 26, 27]
-
-Belt.Array.blit(~src=v1, ~srcOffset=4, ~dst=v1, ~dstOffset=2, ~len=3)
-v1 == [10, 11, 14, 15, 16, 15, 16, 17]
-```
-*/
-let blit: (~src: t<'a>, ~srcOffset: int, ~dst: t<'a>, ~dstOffset: int, ~len: int) => unit
-
-/**
-Unsafe blit without bounds checking.
-*/
-let blitUnsafe: (~src: t<'a>, ~srcOffset: int, ~dst: t<'a>, ~dstOffset: int, ~len: int) => unit
-
-let forEachU: (t<'a>, (. 'a) => unit) => unit
-/**
-`forEach(xs, f)`
-
-Call `f` on each element of `xs` from the beginning to end. `f` returns `unit`
-so no new array is created. Use `forEach` when you are primarily concerned with
-repetitively creating side effects.
-
-## Examples
-
-```rescript
-Belt.Array.forEach(["a", "b", "c"], x => Js.log("Item: " ++ x))
-
-/*
-  prints:
-  Item: a
-  Item: b
-  Item: c
-*/
-let total = ref(0)
-
-Belt.Array.forEach([1, 2, 3, 4], x => total := total.contents + x)
-
-total.contents == 1 + 2 + 3 + 4
-```
-*/
-let forEach: (t<'a>, 'a => unit) => unit
-
-let mapU: (t<'a>, (. 'a) => 'b) => array<'b>
-/**
-`map(xs, f)` returns a new array by calling `f` for each element of `xs` from
-the beginning to end.
-
-## Examples
-
-```rescript
-Belt.Array.map([1, 2], (x) => x + 1) == [3, 4]
-```
-*/
-let map: (t<'a>, 'a => 'b) => array<'b>
-
-let flatMapU: (t<'a>, (. 'a) => array<'b>) => array<'b>
-/**
-`flatMap(xs, f)` returns a new array by calling `f` for each element of `xs` from
-the beginning to end, concatenating the results.
-
-## Examples
-
-```rescript
-Belt.Array.flatMap([1, 2], x => [x + 10, x + 20]) == [11, 21, 12, 22]
-```
-*/
-let flatMap: (t<'a>, 'a => array<'b>) => array<'b>
-
-let getByU: (t<'a>, (. 'a) => bool) => option<'a>
-/**
-`getBy(xs, p)` returns `Some(value)` for the first value in `xs` that satisifies
-the predicate function `p`; returns `None` if no element satisifies the function.
-
-## Examples
-
-```rescript
-Belt.Array.getBy([1, 4, 3, 2], (x) => mod(x, 2) == 0) == Some(4)
-Belt.Array.getBy([15, 13, 11], (x) => mod(x, 2) == 0) == None
-```
-*/
-let getBy: (t<'a>, 'a => bool) => option<'a>
-
-let getIndexByU: (t<'a>, (. 'a) => bool) => option<int>
-/**
-`getIndexBy(xs, p)` returns `Some(index)` for the first value in `xs` that
-satisifies the predicate function `p`; returns `None` if no element satisifies
-the function.
-
-## Examples
-
-```rescript
-Belt.Array.getIndexBy([1, 4, 3, 2], (x) => mod(x, 2) == 0) == Some(1)
-Belt.Array.getIndexBy([15, 13, 11], (x) => mod(x, 2) == 0) == None
-```
-*/
-let getIndexBy: (t<'a>, 'a => bool) => option<int>
-
-let keepU: (t<'a>, (. 'a) => bool) => t<'a>
-/**
-`keep(xs, p)` returns a new array that keep all elements satisfy `p`.
-*/
-let keep: (t<'a>, 'a => bool) => t<'a>
-
-let keepWithIndexU: (t<'a>, (. 'a, int) => bool) => t<'a>
-/**
-`keepWithIndex(xs, p)` returns a new array that keep all elements satisfy `p`.
-
-## Examples
-
-```rescript
-Belt.Array.keepWithIndex([1, 2, 3], (_x, i) => i == 1) == [2]
-```
-*/
-let keepWithIndex: (t<'a>, ('a, int) => bool) => t<'a>
-
-let keepMapU: (t<'a>, (. 'a) => option<'b>) => array<'b>
-/**
-`keepMap(xs, p)` returns a new array that keep all elements that return a non
-None applied `p`.
-
-## Examples
-
-```rescript
-Belt.Array.keepMap([1, 2, 3], x =>
-  if mod(x, 2) == 0 {
-    Some(x)
-  } else {
-    None
-  }
-)
-== [2]
-```
-*/
-let keepMap: (t<'a>, 'a => option<'b>) => array<'b>
-
-let forEachWithIndexU: (t<'a>, (. int, 'a) => unit) => unit
-/**
-`forEachWithIndex(xs, f)` same as `Belt.Array.forEach`, except that `f` is
-supplied two arguments: the index starting from 0 and the element from `xs`.
-
-## Examples
-
-```rescript
-Belt.Array.forEachWithIndex(["a", "b", "c"], (i, x) => Js.log("Item " ++ Belt.Int.toString(i) ++ " is " ++ x))
-
-/*
-  prints:
-  Item 0 is a
-  Item 1 is b
-  Item 2 is cc
-*/
-let total = ref(0)
-
-Belt.Array.forEachWithIndex([10, 11, 12, 13], (i, x) => total := total.contents + x + i)
-
-total.contents == 0 + 10 + 1 + 11 + 2 + 12 + 3 + 13
-```
-*/
-let forEachWithIndex: (t<'a>, (int, 'a) => unit) => unit
-
-let mapWithIndexU: (t<'a>, (. int, 'a) => 'b) => array<'b>
-/**
-`mapWithIndex(xs, f)` applies `f` to each element of `xs`. Function `f` takes
-two arguments: the index starting from 0 and the element from `xs`.
-
-## Examples
-
-```rescript
-Belt.Array.mapWithIndex([1, 2, 3], (i, x) => i + x) == [0 + 1, 1 + 2, 2 + 3]
-```
-*/
-let mapWithIndex: (t<'a>, (int, 'a) => 'b) => array<'b>
-
-let partitionU: (t<'a>, (. 'a) => bool) => (t<'a>, t<'a>)
-/**
-`partition(f, a)` split array into tuple of two arrays based on predicate `f`;
-first of tuple where predicate cause true, second where predicate cause false
-
-## Examples
-
-```rescript
-Belt.Array.partition([1, 2, 3, 4, 5], (x) => mod(x, 2) == 0) == ([2, 4], [1, 3, 5])
-
-Belt.Array.partition([1, 2, 3, 4, 5], (x) => mod(x, 2) != 0) == ([1, 3, 5], [2, 4])
-```
-*/
-let partition: (t<'a>, 'a => bool) => (t<'a>, t<'a>)
-
-let reduceU: (array<'b>, 'a, (. 'a, 'b) => 'a) => 'a
-/**
-`reduce(xs, init, f)` applies `f` to each element of `xs` from beginning to end.
-Function `f` has two parameters: the item from the list and an “accumulator”;
-which starts with a value of `init`. `reduce` returns the final value of the
-accumulator.
-
-## Examples
-
-```rescript
-Belt.Array.reduce([2, 3, 4], 1, (a, b) => a + b) == 10
-
-Belt.Array.reduce(["a", "b", "c", "d"], "", (a, b) => a ++ b) == "abcd"
-```
-*/
-let reduce: (array<'b>, 'a, ('a, 'b) => 'a) => 'a
-
-let reduceReverseU: (array<'b>, 'a, (. 'a, 'b) => 'a) => 'a
-/**
-`reduceReverse(xs, init, f)` works like `Belt.Array.reduce` except that
-function `f` is applied to each item of `xs` from the last back to the first.
-
-## Examples
-
-```rescript
-Belt.Array.reduceReverse(["a", "b", "c", "d"], "", (a, b) => a ++ b) == "dcba"
-```
-*/
-let reduceReverse: (array<'b>, 'a, ('a, 'b) => 'a) => 'a
-
-let reduceReverse2U: (t<'a>, array<'b>, 'c, (. 'c, 'a, 'b) => 'c) => 'c
-/**
-`reduceReverse2(xs, ys, init, f)` reduces two arrays xs and ys;taking items
-starting at `min(length(xs), length(ys))` down to and including zero.
-
-## Examples
-
-```rescript
-Belt.Array.reduceReverse2([1, 2, 3], [1, 2], 0, (acc, x, y) => acc + x + y) == 6
-```
-*/
-let reduceReverse2: (t<'a>, array<'b>, 'c, ('c, 'a, 'b) => 'c) => 'c
-
-let reduceWithIndexU: (t<'a>, 'b, (. 'b, 'a, int) => 'b) => 'b
-/**
-Applies `f` to each element of `xs` from beginning to end. Function `f` has
-three parameters: the item from the array and an “accumulator”, which starts 
-with a value of `init` and the index of each element. `reduceWithIndex` returns
-the final value of the accumulator.
-
-## Examples
-
-```rescript
-Belt.Array.reduceWithIndex([1, 2, 3, 4], 0, (acc, x, i) => acc + x + i) == 16
-```
-*/
-let reduceWithIndex: (t<'a>, 'b, ('b, 'a, int) => 'b) => 'b
-
-let joinWithU: (t<'a>, string, (. 'a) => string) => string
-/**
-`joinWith(xs, sep, toString)`
-
-Concatenates all the elements of `xs` converted to string with `toString`, each
-separated by `sep`, the string given as the second argument, into a single string.
-If the array has only one element, then that element will be returned without 
-using the separator. If the array is empty, the empty string will be returned.
-
-## Examples
-
-```rescript
-Belt.Array.joinWith([0, 1], ", ", Js.Int.toString) == "0, 1"
-Belt.Array.joinWith([], " ", Js.Int.toString) == ""
-Belt.Array.joinWith([1], " ", Js.Int.toString) == "1"
-```
-*/
-let joinWith: (t<'a>, string, 'a => string) => string
-
-let someU: (t<'a>, (. 'a) => bool) => bool
-/**
-`some(xs, p)` returns true if at least one of the elements in `xs` satifies `p`;
-where `p` is a predicate: a function taking an element and returning a `bool`.
-
-## Examples
-
-```rescript
-Belt.Array.some([2, 3, 4], (x) => mod(x, 2) == 1) == true
-
-Belt.Array.some([(-1), (-3), (-5)], (x) => x > 0) == false
-```
-*/
-let some: (t<'a>, 'a => bool) => bool
-
-let everyU: (t<'a>, (. 'a) => bool) => bool
-/**
-`every(xs, p)` returns `true` if all elements satisfy `p`; where `p` is a
-predicate: a function taking an element and returning a `bool`.
-
-## Examples
-
-```rescript
-Belt.Array.every([1, 3, 5], (x) => mod(x, 2) == 1) == true
-
-Belt.Array.every([1, (-3), 5], (x) => x > 0) == false
-```
-*/
-let every: (t<'a>, 'a => bool) => bool
-
-let every2U: (t<'a>, array<'b>, (. 'a, 'b) => bool) => bool
-/**
-`every2(xs, ys, p)` returns true if `p(xi, yi)` is true for all pairs of
-elements up to the shorter length (i.e. `min(length(xs), length(ys))`)
-
-## Examples
-
-```rescript
-Belt.Array.every2([1, 2, 3], [0, 1], (a, b) => a > b) == true
-
-Belt.Array.every2([], [1], (x, y) => x > y) == true
-
-Belt.Array.every2([2, 3], [1], (x, y) => x > y) == true
-
-Belt.Array.every2([0, 1], [5, 0], (x, y) => x > y) == false
-```
-*/
-let every2: (t<'a>, array<'b>, ('a, 'b) => bool) => bool
-
-let some2U: (t<'a>, array<'b>, (. 'a, 'b) => bool) => bool
-/**
-`some2(xs, ys, p)` returns true if `p(xi, yi)` is true for any pair of elements
-up to the shorter length (i.e. `min(length(xs), length(ys))`)
-
-## Examples
-
-```rescript
-Belt.Array.some2([0, 2], [1, 0, 3], (a, b) => a > b) == true
-
-Belt.Array.some2([], [1], (x, y) => x > y) == false
-
-Belt.Array.some2([2, 3], [1, 4], (x, y) => x > y) == true
-```
-*/
-let some2: (t<'a>, array<'b>, ('a, 'b) => bool) => bool
-
-let cmpU: (t<'a>, t<'a>, (. 'a, 'a) => int) => int
-/**
-`cmp(xs, ys, f)` compared by length if `length(xs) != length(ys)`; returning `-1`
-if `length(xs) < length(ys)` or 1 if `length(xs) > length(ys)`. Otherwise
-compare one by one `f(x, y)`. `f` returns a negative number if `x` is “less than” `y`
-zero if `x` is “equal to” `y` a positive number if `x` is “greater than”
-`y`. The comparison returns the first non-zero result of `f`; or zero if `f`
-returns zero for all `x` and `y`.
-
-## Examples
-
-```rescript
-Belt.Array.cmp([1, 3, 5], [1, 4, 2], (a, b) => compare(a, b)) == -1
-
-Belt.Array.cmp([1, 3, 5], [1, 2, 3], (a, b) => compare(a, b)) == 1
-
-Belt.Array.cmp([1, 3, 5], [1, 3, 5], (a, b) => compare(a, b)) == 0
-```
-*/
-let cmp: (t<'a>, t<'a>, ('a, 'a) => int) => int
-
-let eqU: (t<'a>, t<'a>, (. 'a, 'a) => bool) => bool
-/**
-`eq(xs, ys)` return `false` if length is not the same otherwise compare items
-one by one using `f(xi, yi)`; and return true if all results are true false otherwise
-
-## Examples
-
-```rescript
-Belt.Array.eq([1, 2, 3], [(-1), (-2), (-3)], (a, b) => abs(a) == abs(b)) == true
-```
-*/
-let eq: (t<'a>, t<'a>, ('a, 'a) => bool) => bool
-
-@set
-/**
-Unsafe `truncateToLengthUnsafe(xs, n)` sets length of array `xs` to `n`. If `n`
-is greater than the length of `xs`; the extra elements are set to `Js.Null_undefined.null`.
-If `n` is less than zero; raises a `RangeError`.
-
-## Examples
-
-```rescript
-let arr = ["ant", "bee", "cat", "dog", "elk"]
-
-Belt.Array.truncateToLengthUnsafe(arr, 3)
-
-arr == ["ant", "bee", "cat"]
-```
-*/
-external truncateToLengthUnsafe: (t<'a>, int) => unit = "length"
-
-let initU: (int, (. int) => 'a) => t<'a>
-let init: (int, int => 'a) => t<'a>
-
-/**
-`arr->push(item)` pushes an element `item` into an array `arr`.
-*/
-@send
-external push: (t<'a>, 'a) => unit = "push"
diff --git a/jscomp/others/belt_Float.res b/jscomp/others/belt_Float.res
deleted file mode 100644
index a30e295..0000000
--- a/jscomp/others/belt_Float.res
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** [`Belt.Float`]()
-    Utilities for Float
-*/
-
-@val external isNaN: float => bool = "isNaN"
-
-external toInt: float => int = "%intoffloat"
-
-external fromInt: int => float = "%identity"
-
-@val external fromString: string => float = "parseFloat"
-
-let fromString = i =>
-  switch fromString(i) {
-  | i if isNaN(i) => None
-  | i => Some(i)
-  }
-
-@val external toString: float => string = "String"
-
-external \"+": (float, float) => float = "%addfloat"
-
-external \"-": (float, float) => float = "%subfloat"
-
-external \"*": (float, float) => float = "%mulfloat"
-
-external \"/": (float, float) => float = "%divfloat"
diff --git a/jscomp/others/belt_Float.resi b/jscomp/others/belt_Float.resi
deleted file mode 100644
index bc6fbf9..0000000
--- a/jscomp/others/belt_Float.resi
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** This module includes convenience methods for handling `float` types. */
-
-/**
-Converts a given `float` to an `int`.
-
-## Examples
-
-```rescript
-Js.log(Belt.Float.toInt(1.0) === 1) /* true */
-```
-*/
-external toInt: float => int = "%intoffloat"
-
-/** 
-Converts a given `int` to a `float`.
-
-## Examples
-
-```rescript
-Js.log(Belt.Float.fromInt(1) === 1.0) /* true */
-```
-*/
-external fromInt: int => float = "%identity"
-
-/** 
-Converts a given `string` to a `float`. Returns `Some(float)` when the input is a number, `None` otherwise.
-
-## Examples
-
-```rescript
-Js.log(Belt.Float.fromString("1.0") === Some(1.0)) /* true */
-```
-*/
-let fromString: string => option<float>
-
-@val
-/**
-Converts a given `float` to a `string`. Uses the JavaScript `String` constructor under the hood.
-
-## Examples
-
-```rescript
-Js.log(Belt.Float.toString(1.0) === "1.0") /* true */
-```
-*/
-external toString: float => string = "String"
-
-/**
-Addition of two `float` values.
-Can be opened in a module to avoid dot-notation (`+.`), however this yields a shadow warning (Warning number 44) in the default configuration.
-
-## Examples
-
-```rescript
-open Belt.Float
-Js.log(2.0 + 2.0 === 4.0) /* true */
-```
-*/
-external \"+": (float, float) => float = "%addfloat"
-
-/**
-Subtraction of two `float` values.
-Can be opened in a module to avoid dot-notation (`-.`), however this yields a shadow warning (Warning number 44) in the default configuration.
-
-## Examples
-
-```rescript
-open Belt.Float
-Js.log(2.0 - 1.0 === 1.0) /* true */
-```
-*/
-external \"-": (float, float) => float = "%subfloat"
-
-/**
-Multiplication of two `float` values.
-Can be opened in a module to avoid dot-notation (`*.`), however this yields a shadow warning (Warning number 44) in the default configuration.
-
-## Examples
-
-```rescript
-open Belt.Float
-Js.log(2.0 * 2.0 === 4.0) /* true */
-```
-*/
-external \"*": (float, float) => float = "%mulfloat"
-
-/** 
-Division of two `float` values.
-Can be opened in a module to avoid dot-notation (`/.`), however this yields a shadow warning (Warning number 44) in the default configuration.
-
-## Examples
-
-```rescript
-open Belt.Float
-Js.log(4.0 / 2.0 === 2.0) /* true */
-```
-*/
-external \"/": (float, float) => float = "%divfloat"
diff --git a/jscomp/others/belt_HashMap.res b/jscomp/others/belt_HashMap.res
deleted file mode 100644
index 38650bd..0000000
--- a/jscomp/others/belt_HashMap.res
+++ /dev/null
@@ -1,229 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* Adapted by Hongbo Zhang, Authors of ReScript 2017 */
-/* ********************************************************************* */
-
-module N = Belt_internalBuckets
-module C = Belt_internalBucketsType
-module A = Belt_Array
-
-type eq<'a, 'id> = Belt_Id.eq<'a, 'id>
-type hash<'a, 'id> = Belt_Id.hash<'a, 'id>
-type id<'a, 'id> = Belt_Id.hashable<'a, 'id>
-type t<'a, 'b, 'id> = N.t<hash<'a, 'id>, eq<'a, 'id>, 'a, 'b>
-
-let clear = C.clear
-let size = h => h.C.size
-let forEach = N.forEach
-let forEachU = N.forEachU
-let reduce = N.reduce
-let reduceU = N.reduceU
-let logStats = N.logStats
-let keepMapInPlaceU = N.keepMapInPlaceU
-let keepMapInPlace = N.keepMapInPlace
-let toArray = N.toArray
-let copy = N.copy
-let keysToArray = N.keysToArray
-let valuesToArray = N.valuesToArray
-let getBucketHistogram = N.getBucketHistogram
-let isEmpty = C.isEmpty
-
-let rec copyBucketReHash = (~hash, ~h_buckets, ~ndata_tail, old_bucket) =>
-  switch C.toOpt(old_bucket) {
-  | None => ()
-  | Some(cell) =>
-    let nidx = land(hash(. cell.N.key), A.length(h_buckets) - 1)
-    let v = C.return(cell)
-    switch C.toOpt(A.getUnsafe(ndata_tail, nidx)) {
-    | None => A.setUnsafe(h_buckets, nidx, v)
-    | Some(tail) => tail.N.next = v /* cell put at the end */
-    }
-    A.setUnsafe(ndata_tail, nidx, v)
-    copyBucketReHash(~hash, ~h_buckets, ~ndata_tail, cell.N.next)
-  }
-
-let resize = (~hash, h) => {
-  let odata = h.C.buckets
-  let osize = A.length(odata)
-  let nsize = osize * 2
-  if nsize >= osize {
-    /* no overflow */
-    let h_buckets = A.makeUninitialized(nsize)
-    let ndata_tail = A.makeUninitialized(nsize) /* keep track of tail */
-    h.C.buckets = h_buckets /* so that indexfun sees the new bucket count */
-    for i in 0 to osize - 1 {
-      copyBucketReHash(~hash, ~h_buckets, ~ndata_tail, A.getUnsafe(odata, i))
-    }
-    for i in 0 to nsize - 1 {
-      switch C.toOpt(A.getUnsafe(ndata_tail, i)) {
-      | None => ()
-      | Some(tail) => tail.N.next = C.emptyOpt
-      }
-    }
-  }
-}
-
-let rec replaceInBucket = (~eq, key, info, cell) =>
-  if eq(. cell.N.key, key) {
-    cell.N.value = info
-    false
-  } else {
-    switch C.toOpt(cell.N.next) {
-    | None => true
-    | Some(cell) => replaceInBucket(~eq, key, info, cell)
-    }
-  }
-
-let set0 = (h, key, value, ~eq, ~hash) => {
-  let h_buckets = h.C.buckets
-  let buckets_len = A.length(h_buckets)
-  let i = land(hash(. key), buckets_len - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None =>
-    A.setUnsafe(h_buckets, i, C.return({N.key, value, next: C.emptyOpt}))
-    h.C.size = h.C.size + 1
-  | Some(bucket) =>
-    if replaceInBucket(~eq, key, value, bucket) {
-      A.setUnsafe(h_buckets, i, C.return({N.key, value, next: l}))
-      h.C.size = h.C.size + 1
-    }
-  }
-  if h.C.size > lsl(buckets_len, 1) {
-    resize(~hash, h)
-  }
-}
-
-/* if `key` already exists, replace it, otherwise add it 
-   Here we add it to the head, it could be tail
-*/
-let set = (h, key, value) =>
-  set0(h, key, value, ~eq=Belt_Id.getEqInternal(h.C.eq), ~hash=Belt_Id.getHashInternal(h.C.hash))
-
-let rec removeInBucket = (h, h_buckets, i, key, prec, bucket, ~eq) =>
-  switch C.toOpt(bucket) {
-  | None => ()
-  | Some(cell) =>
-    let cell_next = cell.N.next
-    if eq(. cell.N.key, key) {
-      prec.N.next = cell_next
-      h.C.size = h.C.size - 1
-    } else {
-      removeInBucket(~eq, h, h_buckets, i, key, cell, cell_next)
-    }
-  }
-
-let remove = (h, key) => {
-  let h_buckets = h.C.buckets
-  let i = land(Belt_Id.getHashInternal(h.C.hash)(. key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(bucket) {
-  | None => ()
-  | Some(cell) =>
-    let eq = Belt_Id.getEqInternal(h.C.eq)
-    if eq(. cell.N.key, key) {
-      A.setUnsafe(h_buckets, i, cell.N.next)
-      h.C.size = h.C.size - 1
-    } else {
-      removeInBucket(~eq, h, h_buckets, i, key, cell, cell.N.next)
-    }
-  }
-}
-
-let rec getAux = (~eq, key, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => None
-  | Some(cell) =>
-    if eq(. key, cell.N.key) {
-      Some(cell.N.value)
-    } else {
-      getAux(~eq, key, cell.N.next)
-    }
-  }
-
-let get = (h, key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(Belt_Id.getHashInternal(h.C.hash)(. key), A.length(h_buckets) - 1)
-  switch C.toOpt(A.getUnsafe(h_buckets, nid)) {
-  | None => None
-  | Some(cell1: N.bucket<_>) =>
-    let eq = Belt_Id.getEqInternal(h.C.eq)
-    if eq(. key, cell1.key) {
-      Some(cell1.value)
-    } else {
-      switch C.toOpt(cell1.N.next) {
-      | None => None
-      | Some(cell2) =>
-        if eq(. key, cell2.key) {
-          Some(cell2.value)
-        } else {
-          switch C.toOpt(cell2.next) {
-          | None => None
-          | Some(cell3) =>
-            if eq(. key, cell3.key) {
-              Some(cell3.value)
-            } else {
-              getAux(~eq, key, cell3.next)
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-let rec memInBucket = (key, cell, ~eq) =>
-  eq(. cell.N.key, key) ||
-  switch C.toOpt(cell.N.next) {
-  | None => false
-  | Some(nextCell) => memInBucket(~eq, key, nextCell)
-  }
-
-let has = (h, key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(Belt_Id.getHashInternal(h.C.hash)(. key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, nid)
-  switch C.toOpt(bucket) {
-  | None => false
-  | Some(bucket) => memInBucket(~eq=Belt_Id.getEqInternal(h.C.eq), key, bucket)
-  }
-}
-
-let make = (type key identity, ~hintSize, ~id: id<key, identity>) => {
-  module M = unpack(id)
-  C.make(~hash=M.hash, ~eq=M.eq, ~hintSize)
-}
-
-let fromArray = (type a identity, arr, ~id: id<a, identity>) => {
-  module M = unpack(id)
-  let (hash, eq) = (M.hash, M.eq)
-  let len = A.length(arr)
-  let v = C.make(~hash, ~eq, ~hintSize=len)
-  let (eq, hash) = (Belt_Id.getEqInternal(eq), Belt_Id.getHashInternal(hash))
-  for i in 0 to len - 1 {
-    let (key, value) = A.getUnsafe(arr, i)
-    set0(~eq, ~hash, v, key, value)
-  }
-  v
-}
-
-let mergeMany = (h, arr) => {
-  let (hash, eq) = (Belt_Id.getHashInternal(h.C.hash), Belt_Id.getEqInternal(h.C.eq))
-  let len = A.length(arr)
-  for i in 0 to len - 1 {
-    let (key, value) = A.getUnsafe(arr, i)
-    set0(h, ~eq, ~hash, key, value)
-  }
-}
-
-module Int = Belt_HashMapInt
-module String = Belt_HashMapString
diff --git a/jscomp/others/belt_HashMap.resi b/jscomp/others/belt_HashMap.resi
deleted file mode 100644
index 972b858..0000000
--- a/jscomp/others/belt_HashMap.resi
+++ /dev/null
@@ -1,467 +0,0 @@
-/* Copyright (C) 2018 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-A **mutable** Hash map which allows customized [`hash`]() behavior.
-
-All data are parameterized by not its only type but also a unique identity in
-the time of initialization, so that two _HashMaps of ints_ initialized with different
-_hash_ functions will have different type.
-
-## Examples
-
-```rescript
-type t = int
-module I0 = unpack(Belt.Id.hashableU(~hash=(. a: t) => "&"(a, 0xff_ff), ~eq=(. a, b) => a == b))
-let s0: t<_, string, _> = make(~hintSize=40, ~id=module(I0))
-
-module I1 = unpack(Belt.Id.hashableU(~hash=(. a: t) => "&"(a, 0xff), ~eq=(. a, b) => a == b))
-let s1: t<_, string, _> = make(~hintSize=40, ~id=module(I1))
-```
-
-The invariant must be held: for two elements who are _equal_,
-their hashed value should be the same
-
-Here the compiler would infer `s0` and `s1` having different type so that
-it would not mix.
-
-## Examples
-
-```rescript
-let s0: t<int, I0.identity>
-let s1: t<int, I1.identity>
-```
-
-We can add elements to the collection:
-
-## Examples
-
-```rescript
-let () = {
-  add(s1, 0, "3")
-  add(s1, 1, "3")
-}
-```
-
-Since this is an mutable data strucure, `s1` will contain two pairs.
-*/
-
-/** Specalized when key type is `int`, more efficient than the generic type */
-module Int = Belt_HashMapInt
-
-/** Specalized when key type is `string`, more efficient than the generic type */
-module String = Belt_HashMapString
-
-/** The type of hash tables from type `'key` to type `'value`. */
-type t<'key, 'value, 'id>
-
-/** The identity needed for making an empty hash map. */
-type id<'a, 'id> = Belt_Id.hashable<'a, 'id>
-
-/**
-`make(~hintSize=10, ~id)` creates a new map by taking in the comparator and `hintSize`.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let hMap = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-
-Belt.HashMap.set(hMap, 0, "a")
-```
-*/
-let make: (~hintSize: int, ~id: id<'key, 'id>) => t<'key, 'value, 'id>
-
-/* TODO: allow randomization for security */
-
-/** 
-Clears a hash table.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let hMap = Belt.HashMap.fromArray([(1, "1")], ~id=module(IntHash))
-Belt.HashMap.clear(hMap)
-Belt.HashMap.isEmpty(hMap) == true
-```
-*/
-let clear: t<'key, 'value, 'id> => unit
-
-/**
-`isEmpty(m)` checks whether a hash map is empty.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-Belt.HashMap.isEmpty(Belt.HashMap.fromArray([(1, "1")], ~id=module(IntHash))) == false
-```
-*/
-let isEmpty: t<_> => bool
-
-/**
-`set(hMap, k, v)` if `k` does not exist, add the binding `k,v`, otherwise, update the old value with the new `v`.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.fromArray([(2, "2"), (1, "1"), (3, "3")], ~id=module(IntHash))
-
-Belt.HashMap.set(s0, 2, "3")
-
-Belt.HashMap.valuesToArray(s0) == ["1", "3", "3"]
-```
-*/
-let set: (t<'key, 'value, 'id>, 'key, 'value) => unit
-
-/**
-Creates copy of a hash map.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.fromArray([(2, "2"), (1, "1"), (3, "3")], ~id=module(IntHash))
-let s1 = Belt.HashMap.copy(s0)
-
-Belt.HashMap.set(s0, 2, "3")
-
-Belt.HashMap.get(s0, 2) != Belt.HashMap.get(s1, 2)
-```
-*/
-let copy: t<'key, 'value, 'id> => t<'key, 'value, 'id>
-
-/**
-Returns value bound under specific key. If values not exist returns `None`.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(s0, 1, "value1")
-
-Belt.HashMap.get(s0, 1) == Some("value1")
-Belt.HashMap.get(s0, 2) == None
-```
-*/
-let get: (t<'key, 'value, 'id>, 'key) => option<'value>
-
-/** 
-Checks if `x` is bound in `tbl`.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(s0, 1, "value1")
-
-Belt.HashMap.has(s0, 1) == true
-Belt.HashMap.has(s0, 2) == false
-```
-*/
-let has: (t<'key, 'value, 'id>, 'key) => bool
-
-/**
-If bound exists, removes it from the hash map.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(s0, 1, "value1")
-Belt.HashMap.remove(s0, 1)
-Belt.HashMap.has(s0, 1) == false
-```
-*/
-let remove: (t<'key, 'value, 'id>, 'key) => unit
-
-/** Same as [forEach](#forEach) but takes uncurried function. */
-let forEachU: (t<'key, 'value, 'id>, (. 'key, 'value) => unit) => unit
-
-/**
-`forEach(tbl, f)` applies `f` to all bindings in table `tbl`. `f` receives the key as first argument, and the associated value as second argument. Each binding is presented exactly once to `f`.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(s0, 1, "value1")
-Belt.HashMap.forEach(s0, (key, value) => Js.log2(key, value))
-// prints (1, "value1")
-```
-*/
-let forEach: (t<'key, 'value, 'id>, ('key, 'value) => unit) => unit
-
-let reduceU: (t<'key, 'value, 'id>, 'c, (. 'c, 'key, 'value) => 'c) => 'c
-/**
-`reduce(tbl, init, f)` computes `(f(kN, dN) ... (f(k1, d1, init))...)`, where `k1 ... kN` are the keys of all bindings in `tbl`, and `d1 ... dN` are the associated values. Each binding is presented exactly once to `f`.
-
-The order in which the bindings are passed to `f` is unspecified. However, if the table contains several bindings for the same key, they are passed to `f` in reverse order of introduction, that is, the most recent binding is passed first.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(s0, 1, "value1")
-Belt.HashMap.set(s0, 2, "value2")
-
-Belt.HashMap.reduce(s0, "", (acc, key, value) => acc ++ (", " ++ value)) == "value1, value2"
-```
-*/
-let reduce: (t<'key, 'value, 'id>, 'c, ('c, 'key, 'value) => 'c) => 'c
-
-/** Same as [keepMapInPlace](#keepMapInPlace) but takes uncurried function.  */
-let keepMapInPlaceU: (t<'key, 'value, 'id>, (. 'key, 'value) => option<'value>) => unit
-
-/**
-Filters out values for which function `f` returned `None`.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(s0, 1, "value1")
-Belt.HashMap.set(s0, 2, "value2")
-
-Belt.HashMap.keepMapInPlace(s0, (key, value) => key == 1 ? None : Some(value))
-```
-*/
-let keepMapInPlace: (t<'key, 'value, 'id>, ('key, 'value) => option<'value>) => unit
-
-/** 
-`size(tbl)` returns the number of bindings in `tbl`. It takes constant time.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(s0, 1, "value1")
-Belt.HashMap.set(s0, 2, "value2")
-
-Belt.HashMap.size(s0) == 2
-```
-*/
-let size: t<_> => int
-
-/**
-Returns array of key value pairs.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(s0, 1, "value1")
-Belt.HashMap.set(s0, 2, "value2")
-
-Belt.HashMap.toArray(s0) == [(1, "value1"), (2, "value2")]
-```
-*/
-let toArray: t<'key, 'value, 'id> => array<('key, 'value)>
-
-/**
-Returns array of keys.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(s0, 1, "value1")
-Belt.HashMap.set(s0, 2, "value2")
-
-Belt.HashMap.keysToArray(s0) == [1, 2]
-```
- */
-let keysToArray: t<'key, _, _> => array<'key>
-
-/**
-Returns array of values.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(s0, 1, "value1")
-Belt.HashMap.set(s0, 2, "value2")
-
-Belt.HashMap.valuesToArray(s0) == ["value1", "value2"]
-```
-*/
-let valuesToArray: t<_, 'value, _> => array<'value>
-
-/**
-Creates new hash map from array of pairs.
-
-Returns array of values.
-
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let s0 = Belt.HashMap.fromArray([(1, "value1"), (2, "value2")], ~id=module(IntHash))
-Belt.HashMap.toArray(s0) == [(1, "value1"), (2, "value2")]
-```
-*/
-let fromArray: (array<('key, 'value)>, ~id: id<'key, 'id>) => t<'key, 'value, 'id>
-
-/**
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-
-let hMap = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.mergeMany(hMap, [(1, "1"), (2, "2")])
-```
-*/
-let mergeMany: (t<'key, 'value, 'id>, array<('key, 'value)>) => unit
-
-/**
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-let hMap = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(hMap, 1, "1")
-
-Belt.HashMap.getBucketHistogram(hMap)
-```
-*/
-let getBucketHistogram: t<_> => array<int>
-
-/**
-## Examples
-
-```rescript
-module IntHash = Belt.Id.MakeHashable({
-  type t = int
-  let hash = a => a
-  let eq = (a, b) => a == b
-})
-let hMap = Belt.HashMap.make(~hintSize=10, ~id=module(IntHash))
-Belt.HashMap.set(hMap, 1, "1")
-
-Belt.HashMap.logStats(hMap)
-```
-*/
-let logStats: t<_> => unit
diff --git a/jscomp/others/belt_HashMapInt.res b/jscomp/others/belt_HashMapInt.res
deleted file mode 100644
index 0c19f8c..0000000
--- a/jscomp/others/belt_HashMapInt.res
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-/* Adapted by Hongbo Zhang, Authors of ReScript 2017 */
-
-type key = int
-type seed = int
-external caml_hash_mix_int: (seed, int) => seed = "?hash_mix_int"
-external final_mix: seed => seed = "?hash_final_mix"
-let hash = (s: key) => final_mix(caml_hash_mix_int(0, s))
-
-module N = Belt_internalBuckets
-module C = Belt_internalBucketsType
-module A = Belt_Array
-
-type t<'b> = N.t<unit, unit, key, 'b>
-
-let rec copyBucketReHash = (~h_buckets, ~ndata_tail, old_bucket: C.opt<N.bucket<_>>) =>
-  switch C.toOpt(old_bucket) {
-  | None => ()
-  | Some(cell) =>
-    let nidx = land(hash(cell.key), A.length(h_buckets) - 1)
-    let v = C.return(cell)
-    switch C.toOpt(A.getUnsafe(ndata_tail, nidx)) {
-    | None => A.setUnsafe(h_buckets, nidx, v)
-    | Some(tail) => tail.N.next = v /* cell put at the end */
-    }
-    A.setUnsafe(ndata_tail, nidx, v)
-    copyBucketReHash(~h_buckets, ~ndata_tail, cell.next)
-  }
-
-let resize = h => {
-  let odata = h.C.buckets
-  let osize = A.length(odata)
-  let nsize = osize * 2
-  if nsize >= osize {
-    /* no overflow */
-    let h_buckets = A.makeUninitialized(nsize)
-    let ndata_tail = A.makeUninitialized(nsize) /* keep track of tail */
-    h.C.buckets = h_buckets /* so that indexfun sees the new bucket count */
-    for i in 0 to osize - 1 {
-      copyBucketReHash(~h_buckets, ~ndata_tail, A.getUnsafe(odata, i))
-    }
-    for i in 0 to nsize - 1 {
-      switch C.toOpt(A.getUnsafe(ndata_tail, i)) {
-      | None => ()
-      | Some(tail) => tail.next = C.emptyOpt
-      }
-    }
-  }
-}
-
-let rec replaceInBucket = (key: key, info, cell) =>
-  if cell.N.key == key {
-    cell.N.value = info
-    false
-  } else {
-    switch C.toOpt(cell.next) {
-    | None => true
-    | Some(cell) => replaceInBucket(key, info, cell)
-    }
-  }
-
-let set = (h, key: key, value) => {
-  let h_buckets = h.C.buckets
-  let buckets_len = A.length(h_buckets)
-  let i = land(hash(key), buckets_len - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None =>
-    A.setUnsafe(h_buckets, i, C.return({N.key, value, next: C.emptyOpt}))
-    h.C.size = h.C.size + 1
-  | Some(bucket) =>
-    if replaceInBucket(key, value, bucket) {
-      A.setUnsafe(h_buckets, i, C.return({N.key, value, next: l}))
-      h.C.size = h.C.size + 1
-    }
-  }
-  if h.C.size > lsl(buckets_len, 1) {
-    resize(h)
-  }
-}
-
-let rec removeInBucket = (h, h_buckets, i, key: key, prec, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => ()
-  | Some(cell) =>
-    let cell_next = cell.N.next
-    if cell.N.key == key {
-      prec.N.next = cell_next
-      h.C.size = h.C.size - 1
-    } else {
-      removeInBucket(h, h_buckets, i, key, cell, cell_next)
-    }
-  }
-
-let remove = (h, key) => {
-  let h_buckets = h.C.buckets
-  let i = land(hash(key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(bucket) {
-  | None => ()
-  | Some(cell) =>
-    if cell.N.key == key {
-      A.setUnsafe(h_buckets, i, cell.next)
-      h.C.size = h.C.size - 1
-    } else {
-      removeInBucket(h, h_buckets, i, key, cell, cell.next)
-    }
-  }
-}
-
-let rec getAux = (key: key, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => None
-  | Some(cell) =>
-    if key == cell.N.key {
-      Some(cell.N.value)
-    } else {
-      getAux(key, cell.next)
-    }
-  }
-
-let get = (h, key: key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(hash(key), A.length(h_buckets) - 1)
-  switch C.toOpt(A.getUnsafe(h_buckets, nid)) {
-  | None => None
-  | Some(cell1) =>
-    if key == cell1.N.key {
-      Some(cell1.N.value)
-    } else {
-      switch C.toOpt(cell1.N.next) {
-      | None => None
-      | Some(cell2) =>
-        if key == cell2.N.key {
-          Some(cell2.N.value)
-        } else {
-          switch C.toOpt(cell2.N.next) {
-          | None => None
-          | Some(cell3) =>
-            if key == cell3.N.key {
-              Some(cell3.N.value)
-            } else {
-              getAux(key, cell3.N.next)
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-let rec memInBucket = (key: key, cell) =>
-  cell.N.key == key ||
-    switch C.toOpt(cell.next) {
-    | None => false
-    | Some(nextCell) => memInBucket(key, nextCell)
-    }
-
-let has = (h, key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(hash(key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, nid)
-  switch C.toOpt(bucket) {
-  | None => false
-  | Some(bucket) => memInBucket(key, bucket)
-  }
-}
-
-let make = (~hintSize) => C.make(~hintSize, ~hash=(), ~eq=())
-let clear = C.clear
-let size = h => h.C.size
-let forEachU = N.forEachU
-let forEach = N.forEach
-let reduceU = N.reduceU
-let reduce = N.reduce
-let logStats = N.logStats
-let keepMapInPlaceU = N.keepMapInPlaceU
-let keepMapInPlace = N.keepMapInPlace
-let toArray = N.toArray
-let copy = N.copy
-let keysToArray = N.keysToArray
-let valuesToArray = N.valuesToArray
-let getBucketHistogram = N.getBucketHistogram
-let isEmpty = C.isEmpty
-
-let fromArray = arr => {
-  let len = A.length(arr)
-  let v = make(~hintSize=len)
-  for i in 0 to len - 1 {
-    let (k, value) = A.getUnsafe(arr, i)
-    set(v, k, value)
-  }
-  v
-}
-
-/* TOOD: optimize heuristics for resizing */
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  for i in 0 to len - 1 {
-    let (k, v) = A.getUnsafe(arr, i)
-    set(h, k, v)
-  }
-}
diff --git a/jscomp/others/belt_HashMapInt.resi b/jscomp/others/belt_HashMapInt.resi
deleted file mode 100644
index 67ea502..0000000
--- a/jscomp/others/belt_HashMapInt.resi
+++ /dev/null
@@ -1,41 +0,0 @@
-type key = int
-
-type t<'b>
-
-let make: (~hintSize: int) => t<'b>
-
-let clear: t<'b> => unit
-
-let isEmpty: t<_> => bool
-
-/**
-`setDone(tbl, k, v)` if `k` does not exist, add the binding `k,v`, otherwise,
-update the old value with the new `v`
-*/
-let set: (t<'a>, key, 'a) => unit
-
-let copy: t<'a> => t<'a>
-let get: (t<'a>, key) => option<'a>
-
-let has: (t<'b>, key) => bool
-
-let remove: (t<'a>, key) => unit
-
-let forEachU: (t<'b>, (. key, 'b) => unit) => unit
-let forEach: (t<'b>, (key, 'b) => unit) => unit
-
-let reduceU: (t<'b>, 'c, (. 'c, key, 'b) => 'c) => 'c
-let reduce: (t<'b>, 'c, ('c, key, 'b) => 'c) => 'c
-
-let keepMapInPlaceU: (t<'a>, (. key, 'a) => option<'a>) => unit
-let keepMapInPlace: (t<'a>, (key, 'a) => option<'a>) => unit
-
-let size: t<_> => int
-
-let toArray: t<'a> => array<(key, 'a)>
-let keysToArray: t<'a> => array<key>
-let valuesToArray: t<'a> => array<'a>
-let fromArray: array<(key, 'a)> => t<'a>
-let mergeMany: (t<'a>, array<(key, 'a)>) => unit
-let getBucketHistogram: t<_> => array<int>
-let logStats: t<_> => unit
diff --git a/jscomp/others/belt_HashMapString.res b/jscomp/others/belt_HashMapString.res
deleted file mode 100644
index c4959dd..0000000
--- a/jscomp/others/belt_HashMapString.res
+++ /dev/null
@@ -1,215 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-/* Adapted by Hongbo Zhang, Authors of ReScript 2017 */
-
-type key = string
-type seed = int
-external caml_hash_mix_string: (seed, string) => seed = "?hash_mix_string"
-external final_mix: seed => seed = "?hash_final_mix"
-let hash = (s: key) => final_mix(caml_hash_mix_string(0, s))
-
-module N = Belt_internalBuckets
-module C = Belt_internalBucketsType
-module A = Belt_Array
-
-type t<'b> = N.t<unit, unit, key, 'b>
-
-let rec copyBucketReHash = (~h_buckets, ~ndata_tail, old_bucket: C.opt<N.bucket<_>>) =>
-  switch C.toOpt(old_bucket) {
-  | None => ()
-  | Some(cell) =>
-    let nidx = land(hash(cell.key), A.length(h_buckets) - 1)
-    let v = C.return(cell)
-    switch C.toOpt(A.getUnsafe(ndata_tail, nidx)) {
-    | None => A.setUnsafe(h_buckets, nidx, v)
-    | Some(tail) => tail.N.next = v /* cell put at the end */
-    }
-    A.setUnsafe(ndata_tail, nidx, v)
-    copyBucketReHash(~h_buckets, ~ndata_tail, cell.next)
-  }
-
-let resize = h => {
-  let odata = h.C.buckets
-  let osize = A.length(odata)
-  let nsize = osize * 2
-  if nsize >= osize {
-    /* no overflow */
-    let h_buckets = A.makeUninitialized(nsize)
-    let ndata_tail = A.makeUninitialized(nsize) /* keep track of tail */
-    h.C.buckets = h_buckets /* so that indexfun sees the new bucket count */
-    for i in 0 to osize - 1 {
-      copyBucketReHash(~h_buckets, ~ndata_tail, A.getUnsafe(odata, i))
-    }
-    for i in 0 to nsize - 1 {
-      switch C.toOpt(A.getUnsafe(ndata_tail, i)) {
-      | None => ()
-      | Some(tail) => tail.next = C.emptyOpt
-      }
-    }
-  }
-}
-
-let rec replaceInBucket = (key: key, info, cell) =>
-  if cell.N.key == key {
-    cell.N.value = info
-    false
-  } else {
-    switch C.toOpt(cell.next) {
-    | None => true
-    | Some(cell) => replaceInBucket(key, info, cell)
-    }
-  }
-
-let set = (h, key: key, value) => {
-  let h_buckets = h.C.buckets
-  let buckets_len = A.length(h_buckets)
-  let i = land(hash(key), buckets_len - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None =>
-    A.setUnsafe(h_buckets, i, C.return({N.key, value, next: C.emptyOpt}))
-    h.C.size = h.C.size + 1
-  | Some(bucket) =>
-    if replaceInBucket(key, value, bucket) {
-      A.setUnsafe(h_buckets, i, C.return({N.key, value, next: l}))
-      h.C.size = h.C.size + 1
-    }
-  }
-  if h.C.size > lsl(buckets_len, 1) {
-    resize(h)
-  }
-}
-
-let rec removeInBucket = (h, h_buckets, i, key: key, prec, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => ()
-  | Some(cell) =>
-    let cell_next = cell.N.next
-    if cell.N.key == key {
-      prec.N.next = cell_next
-      h.C.size = h.C.size - 1
-    } else {
-      removeInBucket(h, h_buckets, i, key, cell, cell_next)
-    }
-  }
-
-let remove = (h, key) => {
-  let h_buckets = h.C.buckets
-  let i = land(hash(key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(bucket) {
-  | None => ()
-  | Some(cell) =>
-    if cell.N.key == key {
-      A.setUnsafe(h_buckets, i, cell.next)
-      h.C.size = h.C.size - 1
-    } else {
-      removeInBucket(h, h_buckets, i, key, cell, cell.next)
-    }
-  }
-}
-
-let rec getAux = (key: key, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => None
-  | Some(cell) =>
-    if key == cell.N.key {
-      Some(cell.N.value)
-    } else {
-      getAux(key, cell.next)
-    }
-  }
-
-let get = (h, key: key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(hash(key), A.length(h_buckets) - 1)
-  switch C.toOpt(A.getUnsafe(h_buckets, nid)) {
-  | None => None
-  | Some(cell1) =>
-    if key == cell1.N.key {
-      Some(cell1.N.value)
-    } else {
-      switch C.toOpt(cell1.N.next) {
-      | None => None
-      | Some(cell2) =>
-        if key == cell2.N.key {
-          Some(cell2.N.value)
-        } else {
-          switch C.toOpt(cell2.N.next) {
-          | None => None
-          | Some(cell3) =>
-            if key == cell3.N.key {
-              Some(cell3.N.value)
-            } else {
-              getAux(key, cell3.N.next)
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-let rec memInBucket = (key: key, cell) =>
-  cell.N.key == key ||
-    switch C.toOpt(cell.next) {
-    | None => false
-    | Some(nextCell) => memInBucket(key, nextCell)
-    }
-
-let has = (h, key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(hash(key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, nid)
-  switch C.toOpt(bucket) {
-  | None => false
-  | Some(bucket) => memInBucket(key, bucket)
-  }
-}
-
-let make = (~hintSize) => C.make(~hintSize, ~hash=(), ~eq=())
-let clear = C.clear
-let size = h => h.C.size
-let forEachU = N.forEachU
-let forEach = N.forEach
-let reduceU = N.reduceU
-let reduce = N.reduce
-let logStats = N.logStats
-let keepMapInPlaceU = N.keepMapInPlaceU
-let keepMapInPlace = N.keepMapInPlace
-let toArray = N.toArray
-let copy = N.copy
-let keysToArray = N.keysToArray
-let valuesToArray = N.valuesToArray
-let getBucketHistogram = N.getBucketHistogram
-let isEmpty = C.isEmpty
-
-let fromArray = arr => {
-  let len = A.length(arr)
-  let v = make(~hintSize=len)
-  for i in 0 to len - 1 {
-    let (k, value) = A.getUnsafe(arr, i)
-    set(v, k, value)
-  }
-  v
-}
-
-/* TOOD: optimize heuristics for resizing */
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  for i in 0 to len - 1 {
-    let (k, v) = A.getUnsafe(arr, i)
-    set(h, k, v)
-  }
-}
diff --git a/jscomp/others/belt_HashMapString.resi b/jscomp/others/belt_HashMapString.resi
deleted file mode 100644
index be4cf46..0000000
--- a/jscomp/others/belt_HashMapString.resi
+++ /dev/null
@@ -1,41 +0,0 @@
-type key = string
-
-type t<'b>
-
-let make: (~hintSize: int) => t<'b>
-
-let clear: t<'b> => unit
-
-let isEmpty: t<_> => bool
-
-/**
-`setDone(tbl, k, v)` if `k` does not exist, add the binding `k,v`, otherwise,
-update the old value with the new `v`
-*/
-let set: (t<'a>, key, 'a) => unit
-
-let copy: t<'a> => t<'a>
-let get: (t<'a>, key) => option<'a>
-
-let has: (t<'b>, key) => bool
-
-let remove: (t<'a>, key) => unit
-
-let forEachU: (t<'b>, (. key, 'b) => unit) => unit
-let forEach: (t<'b>, (key, 'b) => unit) => unit
-
-let reduceU: (t<'b>, 'c, (. 'c, key, 'b) => 'c) => 'c
-let reduce: (t<'b>, 'c, ('c, key, 'b) => 'c) => 'c
-
-let keepMapInPlaceU: (t<'a>, (. key, 'a) => option<'a>) => unit
-let keepMapInPlace: (t<'a>, (key, 'a) => option<'a>) => unit
-
-let size: t<_> => int
-
-let toArray: t<'a> => array<(key, 'a)>
-let keysToArray: t<'a> => array<key>
-let valuesToArray: t<'a> => array<'a>
-let fromArray: array<(key, 'a)> => t<'a>
-let mergeMany: (t<'a>, array<(key, 'a)>) => unit
-let getBucketHistogram: t<_> => array<int>
-let logStats: t<_> => unit
diff --git a/jscomp/others/belt_HashSet.res b/jscomp/others/belt_HashSet.res
deleted file mode 100644
index f4d0a70..0000000
--- a/jscomp/others/belt_HashSet.res
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module Int = Belt_HashSetInt
-
-module String = Belt_HashSetString
-
-module N = Belt_internalSetBuckets
-module C = Belt_internalBucketsType
-module A = Belt_Array
-
-type eq<'a, 'id> = Belt_Id.eq<'a, 'id>
-type hash<'a, 'id> = Belt_Id.hash<'a, 'id>
-type id<'a, 'id> = Belt_Id.hashable<'a, 'id>
-
-type t<'a, 'id> = N.t<hash<'a, 'id>, eq<'a, 'id>, 'a>
-
-let rec copyBucket = (~hash, ~h_buckets, ~ndata_tail, old_bucket) =>
-  switch C.toOpt(old_bucket) {
-  | None => ()
-  | Some(cell) =>
-    let nidx = land(Belt_Id.getHashInternal(hash)(. cell.N.key), A.length(h_buckets) - 1)
-    let v = C.return(cell)
-    switch C.toOpt(A.getUnsafe(ndata_tail, nidx)) {
-    | None => A.setUnsafe(h_buckets, nidx, v)
-    | Some(tail) => tail.N.next = v /* cell put at the end */
-    }
-    A.setUnsafe(ndata_tail, nidx, v)
-    copyBucket(~hash, ~h_buckets, ~ndata_tail, cell.N.next)
-  }
-
-let tryDoubleResize = (~hash, h) => {
-  let odata = h.C.buckets
-  let osize = A.length(odata)
-  let nsize = osize * 2
-  if nsize >= osize {
-    /* no overflow */
-    let h_buckets = A.makeUninitialized(nsize)
-    let ndata_tail = A.makeUninitialized(nsize) /* keep track of tail */
-    h.buckets = h_buckets /* so that indexfun sees the new bucket count */
-    for i in 0 to osize - 1 {
-      copyBucket(~hash, ~h_buckets, ~ndata_tail, A.getUnsafe(odata, i))
-    }
-    for i in 0 to nsize - 1 {
-      switch C.toOpt(A.getUnsafe(ndata_tail, i)) {
-      | None => ()
-      | Some(tail) => tail.N.next = C.emptyOpt
-      }
-    }
-  }
-}
-
-let rec removeBucket = (~eq, h, h_buckets, i, key, prec, cell) => {
-  let cell_next = cell.N.next
-  if Belt_Id.getEqInternal(eq)(. cell.N.key, key) {
-    prec.N.next = cell_next
-    h.C.size = h.C.size - 1
-  } else {
-    switch C.toOpt(cell_next) {
-    | None => ()
-    | Some(cell_next) => removeBucket(~eq, h, h_buckets, i, key, cell, cell_next)
-    }
-  }
-}
-
-let remove = (h, key) => {
-  let eq = h.C.eq
-  let h_buckets = h.C.buckets
-  let i = land(Belt_Id.getHashInternal(h.C.hash)(. key), A.length(h_buckets) - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None => ()
-  | Some(cell) =>
-    let next_cell = cell.N.next
-    if Belt_Id.getEqInternal(eq)(. cell.N.key, key) {
-      h.C.size = h.C.size - 1
-      A.setUnsafe(h_buckets, i, next_cell)
-    } else {
-      switch C.toOpt(next_cell) {
-      | None => ()
-      | Some(next_cell) => removeBucket(~eq, h, h_buckets, i, key, cell, next_cell)
-      }
-    }
-  }
-}
-
-let rec addBucket = (h, key, cell, ~eq) =>
-  if !Belt_Id.getEqInternal(eq)(. cell.N.key, key) {
-    let n = cell.N.next
-    switch C.toOpt(n) {
-    | None =>
-      h.C.size = h.C.size + 1
-      cell.N.next = C.return({N.key, next: C.emptyOpt})
-    | Some(n) => addBucket(~eq, h, key, n)
-    }
-  }
-
-let add0 = (h, key, ~hash, ~eq) => {
-  let h_buckets = h.C.buckets
-  let buckets_len = A.length(h_buckets)
-  let i = land(Belt_Id.getHashInternal(hash)(. key), buckets_len - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None =>
-    h.C.size = h.C.size + 1
-    A.setUnsafe(h_buckets, i, C.return({N.key, next: C.emptyOpt}))
-  | Some(cell) => addBucket(~eq, h, key, cell)
-  }
-  if h.C.size > lsl(buckets_len, 1) {
-    tryDoubleResize(~hash, h)
-  }
-}
-
-let add = (h, key) => add0(~hash=h.C.hash, ~eq=h.C.eq, h, key)
-
-let rec memInBucket = (~eq, key, cell) =>
-  Belt_Id.getEqInternal(eq)(. cell.N.key, key) ||
-  switch C.toOpt(cell.N.next) {
-  | None => false
-  | Some(nextCell) => memInBucket(~eq, key, nextCell)
-  }
-
-let has = (h, key) => {
-  let (eq, h_buckets) = (h.C.eq, h.C.buckets)
-  let nid = land(Belt_Id.getHashInternal(h.C.hash)(. key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, nid)
-  switch C.toOpt(bucket) {
-  | None => false
-  | Some(bucket) => memInBucket(~eq, key, bucket)
-  }
-}
-
-let make = (type value identity, ~hintSize, ~id: id<value, identity>) => {
-  module M = unpack(id)
-  C.make(~hintSize, ~hash=M.hash, ~eq=M.eq)
-}
-
-let clear = C.clear
-let size = h => h.C.size
-let forEachU = N.forEachU
-let forEach = N.forEach
-let reduceU = N.reduceU
-let reduce = N.reduce
-let logStats = N.logStats
-let toArray = N.toArray
-let copy = N.copy
-let getBucketHistogram = N.getBucketHistogram
-let isEmpty = C.isEmpty
-
-let fromArray = (type a identity, arr, ~id: id<a, identity>) => {
-  module M = unpack(id)
-  let (eq, hash) = (M.eq, M.hash)
-  let len = A.length(arr)
-  let v = C.make(~hintSize=len, ~hash, ~eq)
-  for i in 0 to len - 1 {
-    add0(~eq, ~hash, v, A.getUnsafe(arr, i))
-  }
-  v
-}
-
-let mergeMany = (h, arr) => {
-  let (eq, hash) = (h.C.eq, h.hash)
-  let len = A.length(arr)
-  for i in 0 to len - 1 {
-    add0(h, ~eq, ~hash, A.getUnsafe(arr, i))
-  }
-}
diff --git a/jscomp/others/belt_HashSet.resi b/jscomp/others/belt_HashSet.resi
deleted file mode 100644
index 6055194..0000000
--- a/jscomp/others/belt_HashSet.resi
+++ /dev/null
@@ -1,122 +0,0 @@
-/* Copyright (C) 2018 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-A **mutable** Hash set which allows customized `hash` behavior.
-
-All data are parameterized by not its only type but also a unique identity in
-the time of initialization, so that two _HashSets of ints_ initialized with
-different _hash_ functions will have different type.
-
-## Examples
-
-```rescript
-module I0 = unpack(
-  Belt.Id.hashableU(
-    ~hash=(. a: int) => land(a, 65535),
-    ~eq=(. a, b) => a == b,
-  )
-)
-
-let s0 = Belt.HashSet.make(~id=module(I0), ~hintSize=40)
-
-module I1 = unpack(
-  Belt.Id.hashableU(
-    ~hash=(. a: int) => land(a, 255),
-    ~eq=(. a, b) => a == b,
-  )
-)
-
-let s1 = Belt.HashSet.make(~id=module(I1), ~hintSize=40)
-
-Belt.HashSet.add(s1, 0)
-Belt.HashSet.add(s1, 1)
-```
-
-The invariant must be held: for two elements who are equal, their hashed
-value should be the same.
-
-Here the compiler would infer `s0` and `s1` having different type so that it
-would not mix.
-
-## Examples
-
-```rescript
-let s0: Belt.HashSet.t<int, I0.identity>
-let s1: Belt.HashSet.t<int, I1.identity>
-```
-
-We can add elements to the collection (see last two lines in the example
-above). Since this is an mutable data structure, `s1` will contain two pairs.
-*/
-
-/** Specalized when key type is `int`, more efficient than the generic type */
-module Int = Belt_HashSetInt
-
-/** Specalized when key type is `string`, more efficient than the generic type */
-module String = Belt_HashSetString
-
-/* TODO: add a poly module
-   module Poly = Belt_HashSetPoly
-   challenge:
-   - generic equal handles JS data structure
-   - eq/hash consistent
-*/
-
-type t<'a, 'id>
-
-/** The type of hash tables from type `'a` to type `'b`. */
-type id<'a, 'id> = Belt_Id.hashable<'a, 'id>
-
-let make: (~hintSize: int, ~id: id<'a, 'id>) => t<'a, 'id>
-let clear: t<'a, 'id> => unit
-let isEmpty: t<_> => bool
-
-let add: (t<'a, 'id>, 'a) => unit
-
-let copy: t<'a, 'id> => t<'a, 'id>
-
-let has: (t<'a, 'id>, 'a) => bool
-
-let remove: (t<'a, 'id>, 'a) => unit
-
-let forEachU: (t<'a, 'id>, (. 'a) => unit) => unit
-/** Order unspecified. */
-let forEach: (t<'a, 'id>, 'a => unit) => unit
-
-let reduceU: (t<'a, 'id>, 'c, (. 'c, 'a) => 'c) => 'c
-/** Order unspecified. */
-let reduce: (t<'a, 'id>, 'c, ('c, 'a) => 'c) => 'c
-
-let size: t<'a, 'id> => int
-
-let logStats: t<_> => unit
-
-let toArray: t<'a, 'id> => array<'a>
-
-let fromArray: (array<'a>, ~id: id<'a, 'id>) => t<'a, 'id>
-
-let mergeMany: (t<'a, 'id>, array<'a>) => unit
-
-let getBucketHistogram: t<_> => array<int>
diff --git a/jscomp/others/belt_HashSetInt.res b/jscomp/others/belt_HashSetInt.res
deleted file mode 100644
index f8ad65c..0000000
--- a/jscomp/others/belt_HashSetInt.res
+++ /dev/null
@@ -1,154 +0,0 @@
-type key = int
-type seed = int
-external caml_hash_mix_int: (seed, int) => seed = "?hash_mix_int"
-external final_mix: seed => seed = "?hash_final_mix"
-let hash = (s: key) => final_mix(caml_hash_mix_int(0, s))
-
-module N = Belt_internalSetBuckets
-module C = Belt_internalBucketsType
-module A = Belt_Array
-
-type t = N.t<unit, unit, key>
-
-let rec copyBucket = (~h_buckets, ~ndata_tail, old_bucket) =>
-  switch C.toOpt(old_bucket) {
-  | None => ()
-  | Some(cell) =>
-    let nidx = land(hash(cell.N.key), A.length(h_buckets) - 1)
-    let v = C.return(cell)
-    switch C.toOpt(A.getUnsafe(ndata_tail, nidx)) {
-    | None => A.setUnsafe(h_buckets, nidx, v)
-    | Some(tail) => tail.N.next = v /* cell put at the end */
-    }
-    A.setUnsafe(ndata_tail, nidx, v)
-    copyBucket(~h_buckets, ~ndata_tail, cell.N.next)
-  }
-
-let tryDoubleResize = h => {
-  let odata = h.C.buckets
-  let osize = A.length(odata)
-  let nsize = osize * 2
-  if nsize >= osize {
-    /* no overflow */
-    let h_buckets = A.makeUninitialized(nsize)
-    let ndata_tail = A.makeUninitialized(nsize) /* keep track of tail */
-    h.C.buckets = h_buckets /* so that indexfun sees the new bucket count */
-    for i in 0 to osize - 1 {
-      copyBucket(~h_buckets, ~ndata_tail, A.getUnsafe(odata, i))
-    }
-    for i in 0 to nsize - 1 {
-      switch C.toOpt(A.getUnsafe(ndata_tail, i)) {
-      | None => ()
-      | Some(tail) => tail.N.next = C.emptyOpt
-      }
-    }
-  }
-}
-
-let rec removeBucket = (h, h_buckets, i, key: key, prec, cell) => {
-  let cell_next = cell.N.next
-  if cell.N.key == key {
-    prec.N.next = cell_next
-    h.C.size = h.C.size - 1
-  } else {
-    switch C.toOpt(cell_next) {
-    | None => ()
-    | Some(cell_next) => removeBucket(h, h_buckets, i, key, cell, cell_next)
-    }
-  }
-}
-
-let remove = (h, key: key) => {
-  let h_buckets = h.C.buckets
-  let i = land(hash(key), A.length(h_buckets) - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None => ()
-  | Some(cell) =>
-    let next_cell = cell.N.next
-    if cell.N.key == key {
-      h.C.size = h.C.size - 1
-      A.setUnsafe(h_buckets, i, next_cell)
-    } else {
-      switch C.toOpt(next_cell) {
-      | None => ()
-      | Some(next_cell) => removeBucket(h, h_buckets, i, key, cell, next_cell)
-      }
-    }
-  }
-}
-
-let rec addBucket = (h, key: key, cell) =>
-  if cell.N.key != key {
-    let n = cell.N.next
-    switch C.toOpt(n) {
-    | None =>
-      h.C.size = h.C.size + 1
-      cell.N.next = C.return({N.key, next: C.emptyOpt})
-    | Some(n) => addBucket(h, key, n)
-    }
-  }
-
-let add = (h, key: key) => {
-  let h_buckets = h.C.buckets
-  let buckets_len = A.length(h_buckets)
-  let i = land(hash(key), buckets_len - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None =>
-    A.setUnsafe(h_buckets, i, C.return({N.key, next: C.emptyOpt}))
-    h.C.size = h.C.size + 1
-  | Some(cell) => addBucket(h, key, cell)
-  }
-  if h.C.size > lsl(buckets_len, 1) {
-    tryDoubleResize(h)
-  }
-}
-
-let rec memInBucket = (key: key, cell) =>
-  cell.N.key == key ||
-    switch C.toOpt(cell.N.next) {
-    | None => false
-    | Some(nextCell) => memInBucket(key, nextCell)
-    }
-
-let has = (h, key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(hash(key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, nid)
-  switch C.toOpt(bucket) {
-  | None => false
-  | Some(bucket) => memInBucket(key, bucket)
-  }
-}
-
-let make = (~hintSize) => C.make(~hintSize, ~hash=(), ~eq=())
-
-let clear = C.clear
-let size = h => h.C.size
-let forEachU = N.forEachU
-let forEach = N.forEach
-let reduceU = N.reduceU
-let reduce = N.reduce
-let logStats = N.logStats
-let toArray = N.toArray
-let copy = N.copy
-let getBucketHistogram = N.getBucketHistogram
-let isEmpty = C.isEmpty
-
-let fromArray = arr => {
-  let len = A.length(arr)
-  let v = C.make(~hintSize=len, ~hash=(), ~eq=())
-  for i in 0 to len - 1 {
-    add(v, A.getUnsafe(arr, i))
-  }
-  v
-}
-
-/* TOOD: optimize heuristics for resizing */
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  for i in 0 to len - 1 {
-    add(h, A.getUnsafe(arr, i))
-  }
-}
diff --git a/jscomp/others/belt_HashSetInt.resi b/jscomp/others/belt_HashSetInt.resi
deleted file mode 100644
index 05325e8..0000000
--- a/jscomp/others/belt_HashSetInt.resi
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This module is [`Belt.HashSet`]() specialized with key type to be a primitive type.
-
-It is more efficient in general, the  API is the same with [`Belt.HashSet`]() except its key type is fixed,
-and identity is not needed(using the built-in one)
-
-**See** [`Belt.HashSet`]()
-*/
-
-type key = int
-
-type t
-
-let make: (~hintSize: int) => t
-
-let clear: t => unit
-
-let isEmpty: t => bool
-
-let add: (t, key) => unit
-
-let copy: t => t
-
-let has: (t, key) => bool
-
-let remove: (t, key) => unit
-
-let forEachU: (t, (. key) => unit) => unit
-let forEach: (t, key => unit) => unit
-
-let reduceU: (t, 'c, (. 'c, key) => 'c) => 'c
-let reduce: (t, 'c, ('c, key) => 'c) => 'c
-
-let size: t => int
-
-let logStats: t => unit
-
-let toArray: t => array<key>
-
-let fromArray: array<key> => t
-
-let mergeMany: (t, array<key>) => unit
-
-let getBucketHistogram: t => array<int>
diff --git a/jscomp/others/belt_HashSetString.res b/jscomp/others/belt_HashSetString.res
deleted file mode 100644
index be19839..0000000
--- a/jscomp/others/belt_HashSetString.res
+++ /dev/null
@@ -1,154 +0,0 @@
-type key = string
-type seed = int
-external caml_hash_mix_string: (seed, string) => seed = "?hash_mix_string"
-external final_mix: seed => seed = "?hash_final_mix"
-let hash = (s: key) => final_mix(caml_hash_mix_string(0, s))
-
-module N = Belt_internalSetBuckets
-module C = Belt_internalBucketsType
-module A = Belt_Array
-
-type t = N.t<unit, unit, key>
-
-let rec copyBucket = (~h_buckets, ~ndata_tail, old_bucket) =>
-  switch C.toOpt(old_bucket) {
-  | None => ()
-  | Some(cell) =>
-    let nidx = land(hash(cell.N.key), A.length(h_buckets) - 1)
-    let v = C.return(cell)
-    switch C.toOpt(A.getUnsafe(ndata_tail, nidx)) {
-    | None => A.setUnsafe(h_buckets, nidx, v)
-    | Some(tail) => tail.N.next = v /* cell put at the end */
-    }
-    A.setUnsafe(ndata_tail, nidx, v)
-    copyBucket(~h_buckets, ~ndata_tail, cell.N.next)
-  }
-
-let tryDoubleResize = h => {
-  let odata = h.C.buckets
-  let osize = A.length(odata)
-  let nsize = osize * 2
-  if nsize >= osize {
-    /* no overflow */
-    let h_buckets = A.makeUninitialized(nsize)
-    let ndata_tail = A.makeUninitialized(nsize) /* keep track of tail */
-    h.C.buckets = h_buckets /* so that indexfun sees the new bucket count */
-    for i in 0 to osize - 1 {
-      copyBucket(~h_buckets, ~ndata_tail, A.getUnsafe(odata, i))
-    }
-    for i in 0 to nsize - 1 {
-      switch C.toOpt(A.getUnsafe(ndata_tail, i)) {
-      | None => ()
-      | Some(tail) => tail.N.next = C.emptyOpt
-      }
-    }
-  }
-}
-
-let rec removeBucket = (h, h_buckets, i, key: key, prec, cell) => {
-  let cell_next = cell.N.next
-  if cell.N.key == key {
-    prec.N.next = cell_next
-    h.C.size = h.C.size - 1
-  } else {
-    switch C.toOpt(cell_next) {
-    | None => ()
-    | Some(cell_next) => removeBucket(h, h_buckets, i, key, cell, cell_next)
-    }
-  }
-}
-
-let remove = (h, key: key) => {
-  let h_buckets = h.C.buckets
-  let i = land(hash(key), A.length(h_buckets) - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None => ()
-  | Some(cell) =>
-    let next_cell = cell.N.next
-    if cell.N.key == key {
-      h.C.size = h.C.size - 1
-      A.setUnsafe(h_buckets, i, next_cell)
-    } else {
-      switch C.toOpt(next_cell) {
-      | None => ()
-      | Some(next_cell) => removeBucket(h, h_buckets, i, key, cell, next_cell)
-      }
-    }
-  }
-}
-
-let rec addBucket = (h, key: key, cell) =>
-  if cell.N.key != key {
-    let n = cell.N.next
-    switch C.toOpt(n) {
-    | None =>
-      h.C.size = h.C.size + 1
-      cell.N.next = C.return({N.key, next: C.emptyOpt})
-    | Some(n) => addBucket(h, key, n)
-    }
-  }
-
-let add = (h, key: key) => {
-  let h_buckets = h.C.buckets
-  let buckets_len = A.length(h_buckets)
-  let i = land(hash(key), buckets_len - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None =>
-    A.setUnsafe(h_buckets, i, C.return({N.key, next: C.emptyOpt}))
-    h.C.size = h.C.size + 1
-  | Some(cell) => addBucket(h, key, cell)
-  }
-  if h.C.size > lsl(buckets_len, 1) {
-    tryDoubleResize(h)
-  }
-}
-
-let rec memInBucket = (key: key, cell) =>
-  cell.N.key == key ||
-    switch C.toOpt(cell.N.next) {
-    | None => false
-    | Some(nextCell) => memInBucket(key, nextCell)
-    }
-
-let has = (h, key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(hash(key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, nid)
-  switch C.toOpt(bucket) {
-  | None => false
-  | Some(bucket) => memInBucket(key, bucket)
-  }
-}
-
-let make = (~hintSize) => C.make(~hintSize, ~hash=(), ~eq=())
-
-let clear = C.clear
-let size = h => h.C.size
-let forEachU = N.forEachU
-let forEach = N.forEach
-let reduceU = N.reduceU
-let reduce = N.reduce
-let logStats = N.logStats
-let toArray = N.toArray
-let copy = N.copy
-let getBucketHistogram = N.getBucketHistogram
-let isEmpty = C.isEmpty
-
-let fromArray = arr => {
-  let len = A.length(arr)
-  let v = C.make(~hintSize=len, ~hash=(), ~eq=())
-  for i in 0 to len - 1 {
-    add(v, A.getUnsafe(arr, i))
-  }
-  v
-}
-
-/* TOOD: optimize heuristics for resizing */
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  for i in 0 to len - 1 {
-    add(h, A.getUnsafe(arr, i))
-  }
-}
diff --git a/jscomp/others/belt_HashSetString.resi b/jscomp/others/belt_HashSetString.resi
deleted file mode 100644
index 3c2532f..0000000
--- a/jscomp/others/belt_HashSetString.resi
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This module is [`Belt.HashSet`]() specialized with key type to be a primitive type.
-
-It is more efficient in general, the  API is the same with [`Belt.HashSet`]() except its key type is fixed,
-and identity is not needed(using the built-in one)
-
-**See** [`Belt.HashSet`]()
-*/
-
-type key = string
-
-type t
-
-let make: (~hintSize: int) => t
-
-let clear: t => unit
-
-let isEmpty: t => bool
-
-let add: (t, key) => unit
-
-let copy: t => t
-
-let has: (t, key) => bool
-
-let remove: (t, key) => unit
-
-let forEachU: (t, (. key) => unit) => unit
-let forEach: (t, key => unit) => unit
-
-let reduceU: (t, 'c, (. 'c, key) => 'c) => 'c
-let reduce: (t, 'c, ('c, key) => 'c) => 'c
-
-let size: t => int
-
-let logStats: t => unit
-
-let toArray: t => array<key>
-
-let fromArray: array<key> => t
-
-let mergeMany: (t, array<key>) => unit
-
-let getBucketHistogram: t => array<int>
diff --git a/jscomp/others/belt_Id.res b/jscomp/others/belt_Id.res
deleted file mode 100644
index 7fc993e..0000000
--- a/jscomp/others/belt_Id.res
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 hash<'a, 'id> = (. 'a) => int
-type eq<'a, 'id> = (. 'a, 'a) => bool
-type cmp<'a, 'id> = (. 'a, 'a) => int
-
-external getHashInternal: hash<'a, 'id> => (. 'a) => int = "%identity"
-external getEqInternal: eq<'a, 'id> => (. 'a, 'a) => bool = "%identity"
-external getCmpInternal: cmp<'a, 'id> => (. 'a, 'a) => int = "%identity"
-
-module type Comparable = {
-  type identity
-  type t
-  let cmp: cmp<t, identity>
-}
-
-type comparable<'key, 'id> = module(Comparable with type t = 'key and type identity = 'id)
-
-module MakeComparableU = (
-  M: {
-    type t
-    let cmp: (. t, t) => int
-  },
-) => {
-  type identity
-  include M
-}
-
-module MakeComparable = (
-  M: {
-    type t
-    let cmp: (t, t) => int
-  },
-) => {
-  type identity
-  type t = M.t
-  /* see https://github.com/rescript-lang/rescript-compiler/pull/2589/files/5ef875b7665ee08cfdc59af368fc52bac1fe9130#r173330825 */
-  let cmp = {
-    let cmp = M.cmp
-    (. a, b) => cmp(a, b)
-  }
-}
-
-let comparableU = (type key, ~cmp): module(Comparable with type t = key) =>
-  module(
-    MakeComparableU({
-      type t = key
-      let cmp = cmp
-    })
-  )
-
-let comparable = (type key, ~cmp) => {
-  module N = MakeComparable({
-    type t = key
-    let cmp = cmp
-  })
-  module(N: Comparable with type t = key)
-}
-
-module type Hashable = {
-  type identity
-  type t
-  let hash: hash<t, identity>
-  let eq: eq<t, identity>
-}
-
-type hashable<'key, 'id> = module(Hashable with type t = 'key and type identity = 'id)
-
-module MakeHashableU = (
-  M: {
-    type t
-    let hash: (. t) => int
-    let eq: (. t, t) => bool
-  },
-) => {
-  type identity
-  include M
-}
-
-module MakeHashable = (
-  M: {
-    type t
-    let hash: t => int
-    let eq: (t, t) => bool
-  },
-) => {
-  type identity
-  type t = M.t
-  let hash = {
-    let hash = M.hash
-    (. a) => hash(a)
-  }
-  let eq = {
-    let eq = M.eq
-    (. a, b) => eq(a, b)
-  }
-}
-
-let hashableU = (type key, ~hash, ~eq): module(Hashable with type t = key) =>
-  module(
-    MakeHashableU({
-      type t = key
-      let hash = hash
-      let eq = eq
-    })
-  )
-
-let hashable = (type key, ~hash, ~eq) => {
-  module N = MakeHashable({
-    type t = key
-    let hash = hash
-    let eq = eq
-  })
-  module(N: Hashable with type t = key)
-}
diff --git a/jscomp/others/belt_Id.resi b/jscomp/others/belt_Id.resi
deleted file mode 100644
index 72aecc4..0000000
--- a/jscomp/others/belt_Id.resi
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-[`Belt.Id`]()
-
-Provide utiliites to create identified comparators or hashes for
-data structures used below.
-
-It create a unique identifer per module of functions so that different data structures with slightly different
-comparison functions won't mix.
-*/
-
-/**
-`('a, 'id) hash`
-
-Its runtime represenation is a `hash` function, but signed with a
-type parameter, so that different hash functions type mismatch
-*/
-type hash<'a, 'id>
-
-/**
-`('a, 'id) eq`
-
-Its runtime represenation is an `eq` function, but signed with a
-type parameter, so that different hash functions type mismatch
-*/
-type eq<'a, 'id>
-
-/**
-`('a,'id) cmp`
-
-Its runtime representation is a `cmp` function, but signed with a
-type parameter, so that different hash functions type mismatch
-*/
-type cmp<'a, 'id>
-
-module type Comparable = {
-  type identity
-  type t
-  let cmp: cmp<t, identity>
-}
-
-/**
-`('key, 'id) cmparable` is a module of functions, here it only includes `cmp`.
-
-Unlike normal functions, when created, it comes with a unique identity (guaranteed
-by the type system).
-
-It can be created using function [`comparableU`]() or [`comparable`]().
-
-The idea of a unique identity when created is that it makes sure two sets would type
-mismatch if they use different comparison function
-*/
-type comparable<'key, 'id> = module(Comparable with type t = 'key and type identity = 'id)
-
-module MakeComparableU: (
-  M: {
-    type t
-    let cmp: (. t, t) => int
-  },
-) => (Comparable with type t = M.t)
-
-module MakeComparable: (
-  M: {
-    type t
-    let cmp: (t, t) => int
-  },
-) => (Comparable with type t = M.t)
-
-let comparableU: (~cmp: (. 'a, 'a) => int) => module(Comparable with type t = 'a)
-
-/**
-## Examples
-
-```rescript
-module C = (
-  val Belt.Id.comparable ~cmp:(compare : int -> int -> int)
-)
-let m = Belt.Set.make(module C)
-```
-Note that the name of C can not be ignored
-*/
-let comparable: (~cmp: ('a, 'a) => int) => module(Comparable with type t = 'a)
-
-module type Hashable = {
-  type identity
-  type t
-  let hash: hash<t, identity>
-  let eq: eq<t, identity>
-}
-
-/**
-`('key, 'id) hashable` is a module of functions, here it only includes `hash`, `eq`.
-
-Unlike normal functions, when created, it comes with a unique identity (guaranteed
-by the type system).
-
-It can be created using function [`hashableU`]() or [`hashable`]().
-
-The idea of a unique identity when created is that it makes sure two hash sets would type
-mismatch if they use different comparison function
-*/
-type hashable<'key, 'id> = module(Hashable with type t = 'key and type identity = 'id)
-
-module MakeHashableU: (
-  M: {
-    type t
-    let hash: (. t) => int
-    let eq: (. t, t) => bool
-  },
-) => (Hashable with type t = M.t)
-
-module MakeHashable: (
-  M: {
-    type t
-    let hash: t => int
-    let eq: (t, t) => bool
-  },
-) => (Hashable with type t = M.t)
-
-let hashableU: (~hash: (. 'a) => int, ~eq: (. 'a, 'a) => bool) => module(Hashable with type t = 'a)
-
-let hashable: (~hash: 'a => int, ~eq: ('a, 'a) => bool) => module(Hashable with type t = 'a)
-
-external getHashInternal: hash<'a, 'id> => (. 'a) => int = "%identity"
-external getEqInternal: eq<'a, 'id> => (. 'a, 'a) => bool = "%identity"
-external getCmpInternal: cmp<'a, 'id> => (. 'a, 'a) => int = "%identity"
diff --git a/jscomp/others/belt_Int.res b/jscomp/others/belt_Int.res
deleted file mode 100644
index fdf1423..0000000
--- a/jscomp/others/belt_Int.res
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** [`Belt.Int`]()
-    Utilities for Int
-*/
-
-@val external isNaN: int => bool = "isNaN"
-
-external toFloat: int => float = "%identity"
-
-external fromFloat: float => int = "%intoffloat"
-
-@val external fromString: (string, @as(10) _) => int = "parseInt"
-
-let fromString = i =>
-  switch fromString(i) {
-  | i if isNaN(i) => None
-  | i => Some(i)
-  }
-
-@val external toString: int => string = "String"
-
-external \"+": (int, int) => int = "%addint"
-
-external \"-": (int, int) => int = "%subint"
-
-external \"*": (int, int) => int = "%mulint"
-
-external \"/": (int, int) => int = "%divint"
diff --git a/jscomp/others/belt_Int.resi b/jscomp/others/belt_Int.resi
deleted file mode 100644
index 0d64b76..0000000
--- a/jscomp/others/belt_Int.resi
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This module includes convenience methods for handling `int` types.
-*/
-
-/**
-Converts a given `int` to a `float`.
-
-## Examples
-
-```rescript
-Js.log(Belt.Int.toFloat(1) === 1.0) /* true */
-```
-*/
-external toFloat: int => float = "%identity"
-
-/**
-Converts a given `float` to an `int`.
-
-## Examples
-
-```rescript
-Js.log(Belt.Int.fromFloat(1.0) === 1) /* true */
-```
-*/
-external fromFloat: float => int = "%intoffloat"
-
-/**
-Converts a given `string` to an `int`. Returns `Some(int)` when the input is a number, `None` otherwise.
-
-## Examples
-
-```rescript
-Js.log(Belt.Int.fromString("1") === Some(1)) /* true */
-```
-*/
-let fromString: string => option<int>
-
-/**
-Converts a given `int` to a `string`. Uses the JavaScript `String` constructor under the hood.
-
-## Examples
-
-```rescript
-Js.log(Belt.Int.toString(1) === "1") /* true */
-```
-*/
-@val
-external toString: int => string = "String"
-
-/**
-Addition of two `int` values. Same as the addition from `Pervasives`.
-
-## Examples
-
-```rescript
-open Belt.Int
-Js.log(2 + 2 === 4) /* true */
-```
-*/
-external \"+": (int, int) => int = "%addint"
-
-/**
-Subtraction of two `int` values. Same as the subtraction from `Pervasives`.
-
-## Examples
-
-```rescript
-open Belt.Int
-Js.log(2 - 1 === 1) /* true */
-```
-*/
-external \"-": (int, int) => int = "%subint"
-
-/**
-Multiplication of two `int` values. Same as the multiplication from `Pervasives`.
-
-## Examples
-
-```rescript
-open Belt.Int
-Js.log(2 * 2 === 4) /* true */
-```
-*/
-external \"*": (int, int) => int = "%mulint"
-
-/**
-Division of two `int` values. Same as the division from `Pervasives`.
-
-## Examples
-
-```rescript
-open Belt.Int
-Js.log(4 / 2 === 2); /* true */
-```
-*/
-external \"/": (int, int) => int = "%divint"
diff --git a/jscomp/others/belt_List.res b/jscomp/others/belt_List.res
deleted file mode 100644
index e3f73fd..0000000
--- a/jscomp/others/belt_List.res
+++ /dev/null
@@ -1,909 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*
-  perf is not everything, there are better memory represenations
-
-  ```
-  type 'a cell = {
-    mutable head : 'a;
-    mutable tail : 'a opt_cell
-  }
-
-  and 'a opt_cell = 'a cell Js.null
-
-  and 'a t = {
-    length : int ;
-    data : 'a opt_cell
-  }
-  ```
-  However,
-  - people use List not because of its perf, but its
-    convenience, in that case, pattern match and compatibility seems
-    more attractive, we could keep a mutable list
-  - The built in types would indicate that
-    its construtor is immutable, a better optimizer would break such code
-
-  ```
-  type 'a t = {
-    head : 'a;
-    mutable tail : 'a t | int
-  }
-  ```
-  In the future, we could come up with a safer version
-  ```
-  type 'a t =
-  | Nil
-  | Cons of { hd : 'a ; mutable tail : 'a t }
-  ```
-*/
-
-@@bs.config({flags: ["-bs-noassertfalse"]})
-
-type t<'a> = list<'a>
-
-module A = Belt_Array
-
-external mutableCell: ('a, t<'a>) => t<'a> = "#makemutablelist"
-
-/*
-  `mutableCell x []` == `x`
-  but tell the compiler that is a mutable cell, so it wont
-  be mis-inlined in the future
-   dont inline a binding to mutable cell, it is mutable
-*/
-/* INVARIANT: relies on Literals.tl (internal representation) */
-@set external unsafeMutateTail: (t<'a>, t<'a>) => unit = "tl"
-
-/*
-   - the cell is not empty
-*/
-
-let head = x =>
-  switch x {
-  | list{} => None
-  | list{x, ..._} => Some(x)
-  }
-
-let headExn = x =>
-  switch x {
-  | list{} => raise(Not_found)
-  | list{x, ..._} => x
-  }
-
-let tail = x =>
-  switch x {
-  | list{} => None
-  | list{_, ...xs} => Some(xs)
-  }
-
-let tailExn = x =>
-  switch x {
-  | list{} => raise(Not_found)
-  | list{_, ...t} => t
-  }
-
-let add = (xs, x) => list{x, ...xs}
-
-/* Assume `n >=0` */
-let rec nthAux = (x, n) =>
-  switch x {
-  | list{h, ...t} =>
-    if n == 0 {
-      Some(h)
-    } else {
-      nthAux(t, n - 1)
-    }
-  | _ => None
-  }
-
-let rec nthAuxAssert = (x, n) =>
-  switch x {
-  | list{h, ...t} =>
-    if n == 0 {
-      h
-    } else {
-      nthAuxAssert(t, n - 1)
-    }
-  | _ => raise(Not_found)
-  }
-
-let get = (x, n) =>
-  if n < 0 {
-    None
-  } else {
-    nthAux(x, n)
-  }
-
-let getExn = (x, n) =>
-  if n < 0 {
-    raise(Not_found)
-  } else {
-    nthAuxAssert(x, n)
-  }
-
-let rec partitionAux = (p, cell, precX, precY) =>
-  switch cell {
-  | list{} => ()
-  | list{h, ...t} =>
-    let next = mutableCell(h, list{})
-    if p(. h) {
-      unsafeMutateTail(precX, next)
-      partitionAux(p, t, next, precY)
-    } else {
-      unsafeMutateTail(precY, next)
-      partitionAux(p, t, precX, next)
-    }
-  }
-
-let rec splitAux = (cell, precX, precY) =>
-  switch cell {
-  | list{} => ()
-  | list{(a, b), ...t} =>
-    let nextA = mutableCell(a, list{})
-    let nextB = mutableCell(b, list{})
-    unsafeMutateTail(precX, nextA)
-    unsafeMutateTail(precY, nextB)
-    splitAux(t, nextA, nextB)
-  }
-
-/* return the tail pointer so it can continue copy other
-   list
-*/
-let rec copyAuxCont = (cellX, prec) =>
-  switch cellX {
-  | list{} => prec
-  | list{h, ...t} =>
-    let next = mutableCell(h, list{})
-    unsafeMutateTail(prec, next)
-    copyAuxCont(t, next)
-  }
-
-let rec copyAuxWitFilter = (f, cellX, prec) =>
-  switch cellX {
-  | list{} => ()
-  | list{h, ...t} =>
-    if f(. h) {
-      let next = mutableCell(h, list{})
-      unsafeMutateTail(prec, next)
-      copyAuxWitFilter(f, t, next)
-    } else {
-      copyAuxWitFilter(f, t, prec)
-    }
-  }
-
-let rec copyAuxWithFilterIndex = (f, cellX, prec, i) =>
-  switch cellX {
-  | list{} => ()
-  | list{h, ...t} =>
-    if f(. h, i) {
-      let next = mutableCell(h, list{})
-      unsafeMutateTail(prec, next)
-      copyAuxWithFilterIndex(f, t, next, i + 1)
-    } else {
-      copyAuxWithFilterIndex(f, t, prec, i + 1)
-    }
-  }
-
-let rec copyAuxWitFilterMap = (f, cellX, prec) =>
-  switch cellX {
-  | list{} => ()
-  | list{h, ...t} =>
-    switch f(. h) {
-    | Some(h) =>
-      let next = mutableCell(h, list{})
-      unsafeMutateTail(prec, next)
-      copyAuxWitFilterMap(f, t, next)
-    | None => copyAuxWitFilterMap(f, t, prec)
-    }
-  }
-
-let rec removeAssocAuxWithMap = (cellX, x, prec, f) =>
-  switch cellX {
-  | list{} => false
-  | list{(a, _) as h, ...t} =>
-    if f(. a, x) {
-      unsafeMutateTail(prec, t)
-      true
-    } else {
-      let next = mutableCell(h, list{})
-      unsafeMutateTail(prec, next)
-      removeAssocAuxWithMap(t, x, next, f)
-    }
-  }
-
-let rec setAssocAuxWithMap = (cellX, x, k, prec, eq) =>
-  switch cellX {
-  | list{} => false
-  | list{(a, _) as h, ...t} =>
-    if eq(. a, x) {
-      unsafeMutateTail(prec, list{(x, k), ...t})
-      true
-    } else {
-      let next = mutableCell(h, list{})
-      unsafeMutateTail(prec, next)
-      setAssocAuxWithMap(t, x, k, next, eq)
-    }
-  }
-
-let rec copyAuxWithMap = (cellX, prec, f) =>
-  switch cellX {
-  | list{} => ()
-  | list{h, ...t} =>
-    let next = mutableCell(f(. h), list{})
-    unsafeMutateTail(prec, next)
-    copyAuxWithMap(t, next, f)
-  }
-
-let rec zipAux = (cellX, cellY, prec) =>
-  switch (cellX, cellY) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    let next = mutableCell((h1, h2), list{})
-    unsafeMutateTail(prec, next)
-    zipAux(t1, t2, next)
-  | (list{}, _) | (_, list{}) => ()
-  }
-
-let rec copyAuxWithMap2 = (f, cellX, cellY, prec) =>
-  switch (cellX, cellY) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    let next = mutableCell(f(. h1, h2), list{})
-    unsafeMutateTail(prec, next)
-    copyAuxWithMap2(f, t1, t2, next)
-  | (list{}, _) | (_, list{}) => ()
-  }
-
-let rec copyAuxWithMapI = (f, i, cellX, prec) =>
-  switch cellX {
-  | list{h, ...t} =>
-    let next = mutableCell(f(. i, h), list{})
-    unsafeMutateTail(prec, next)
-    copyAuxWithMapI(f, i + 1, t, next)
-  | list{} => ()
-  }
-
-let rec takeAux = (n, cell, prec) =>
-  if n == 0 {
-    true
-  } else {
-    switch cell {
-    | list{} => false
-    | list{x, ...xs} =>
-      let cell = mutableCell(x, list{})
-      unsafeMutateTail(prec, cell)
-      takeAux(n - 1, xs, cell)
-    }
-  }
-
-let rec splitAtAux = (n, cell, prec) =>
-  if n == 0 {
-    Some(cell)
-  } else {
-    switch cell {
-    | list{} => None
-    | list{x, ...xs} =>
-      let cell = mutableCell(x, list{})
-      unsafeMutateTail(prec, cell)
-      splitAtAux(n - 1, xs, cell)
-    }
-  }
-
-/* invarint `n >= 0` */
-let take = (lst, n) =>
-  if n < 0 {
-    None
-  } else if n == 0 {
-    Some(list{})
-  } else {
-    switch lst {
-    | list{} => None
-    | list{x, ...xs} =>
-      let cell = mutableCell(x, list{})
-      let has = takeAux(n - 1, xs, cell)
-      if has {
-        Some(cell)
-      } else {
-        None
-      }
-    }
-  }
-/* invariant `n >= 0 ` */
-let rec dropAux = (l, n) =>
-  if n == 0 {
-    Some(l)
-  } else {
-    switch l {
-    | list{_, ...tl} => dropAux(tl, n - 1)
-    | list{} => None
-    }
-  }
-
-let drop = (lst, n) =>
-  if n < 0 {
-    None
-  } else {
-    dropAux(lst, n)
-  }
-
-let splitAt = (lst, n) =>
-  if n < 0 {
-    None
-  } else if n == 0 {
-    Some(list{}, lst)
-  } else {
-    switch lst {
-    | list{} => None
-    | list{x, ...xs} =>
-      let cell = mutableCell(x, list{})
-      let rest = splitAtAux(n - 1, xs, cell)
-      switch rest {
-      | Some(rest) => Some(cell, rest)
-      | None => None
-      }
-    }
-  }
-
-let concat = (xs, ys) =>
-  switch xs {
-  | list{} => ys
-  | list{h, ...t} =>
-    let cell = mutableCell(h, list{})
-    unsafeMutateTail(copyAuxCont(t, cell), ys)
-    cell
-  }
-
-let mapU = (xs, f) =>
-  switch xs {
-  | list{} => list{}
-  | list{h, ...t} =>
-    let cell = mutableCell(f(. h), list{})
-    copyAuxWithMap(t, cell, f)
-    cell
-  }
-
-let map = (xs, f) => mapU(xs, (. x) => f(x))
-
-let zipByU = (l1, l2, f) =>
-  switch (l1, l2) {
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    let cell = mutableCell(f(. a1, a2), list{})
-    copyAuxWithMap2(f, l1, l2, cell)
-    cell
-  | (list{}, _) | (_, list{}) => list{}
-  }
-
-let zipBy = (l1, l2, f) => zipByU(l1, l2, (. x, y) => f(x, y))
-
-let mapWithIndexU = (xs, f) =>
-  switch xs {
-  | list{} => list{}
-  | list{h, ...t} =>
-    let cell = mutableCell(f(. 0, h), list{})
-    copyAuxWithMapI(f, 1, t, cell)
-    cell
-  }
-
-let mapWithIndex = (xs, f) => mapWithIndexU(xs, (. i, x) => f(i, x))
-
-let makeByU = (n, f) =>
-  if n <= 0 {
-    list{}
-  } else {
-    let headX = mutableCell(f(. 0), list{})
-    let cur = ref(headX)
-    let i = ref(1)
-    while i.contents < n {
-      let v = mutableCell(f(. i.contents), list{})
-      unsafeMutateTail(cur.contents, v)
-      cur.contents = v
-      i.contents = i.contents + 1
-    }
-
-    headX
-  }
-
-let makeBy = (n, f) => makeByU(n, (. x) => f(x))
-
-let make = (type a, n, v: a): list<a> =>
-  if n <= 0 {
-    list{}
-  } else {
-    let headX = mutableCell(v, list{})
-    let cur = ref(headX)
-    let i = ref(1)
-    while i.contents < n {
-      let v = mutableCell(v, list{})
-      unsafeMutateTail(cur.contents, v)
-      cur.contents = v
-      i.contents = i.contents + 1
-    }
-
-    headX
-  }
-
-let rec lengthAux = (x, acc) =>
-  switch x {
-  | list{} => acc
-  | list{_, ...t} => lengthAux(t, acc + 1)
-  }
-
-let length = xs => lengthAux(xs, 0)
-let size = length
-
-let rec fillAux = (arr, i, x) =>
-  switch x {
-  | list{} => ()
-  | list{h, ...t} =>
-    A.setUnsafe(arr, i, h)
-    fillAux(arr, i + 1, t)
-  }
-
-let rec fromArrayAux = (a, i, res) =>
-  if i < 0 {
-    res
-  } else {
-    fromArrayAux(a, i - 1, list{A.getUnsafe(a, i), ...res})
-  }
-
-let fromArray = a => fromArrayAux(a, A.length(a) - 1, list{})
-
-let toArray = (x: t<_>) => {
-  let len = length(x)
-  let arr = A.makeUninitializedUnsafe(len)
-  fillAux(arr, 0, x)
-  arr
-}
-
-let shuffle = xs => {
-  let v = toArray(xs)
-  A.shuffleInPlace(v)
-  fromArray(v)
-}
-
-/* let rec fillAuxMap arr i x f =
-  match x with
-  | [] -> ()
-  | h::t ->
-    A.setUnsafe arr i (f h [@bs]) ;
-    fillAuxMap arr (i + 1) t f */
-
-/* module J = Js_json */
-/* type json = J.t */
-/* let toJson x f = */
-/* let len = length x in */
-/* let arr = Belt_Array.makeUninitializedUnsafe len in */
-/* fillAuxMap arr 0 x f; */
-/* J.array arr */
-
-/* TODO: best practice about raising excpetion
-   1. raise OCaml exception, no stacktrace
-   2. raise JS exception, how to pattern match
-*/
-
-let rec reverseConcat = (l1, l2) =>
-  switch l1 {
-  | list{} => l2
-  | list{a, ...l} => reverseConcat(l, list{a, ...l2})
-  }
-
-let reverse = l => reverseConcat(l, list{})
-
-let rec flattenAux = (prec, xs) =>
-  switch xs {
-  | list{} => unsafeMutateTail(prec, list{})
-  | list{h, ...r} => flattenAux(copyAuxCont(h, prec), r)
-  }
-
-let rec flatten = xs =>
-  switch xs {
-  | list{} => list{}
-  | list{list{}, ...xs} => flatten(xs)
-  | list{list{h, ...t}, ...r} =>
-    let cell = mutableCell(h, list{})
-    flattenAux(copyAuxCont(t, cell), r)
-    cell
-  }
-
-let concatMany = xs =>
-  switch xs {
-  | [] => list{}
-  | [x] => x
-  | _ =>
-    let len = A.length(xs)
-    let v = ref(A.getUnsafe(xs, len - 1))
-    for i in len - 2 downto 0 {
-      v.contents = concat(A.getUnsafe(xs, i), v.contents)
-    }
-    v.contents
-  }
-
-let rec mapRevAux = (f, accu, xs) =>
-  switch xs {
-  | list{} => accu
-  | list{a, ...l} => mapRevAux(f, list{f(. a), ...accu}, l)
-  }
-
-let mapReverseU = (l, f) => mapRevAux(f, list{}, l)
-
-let mapReverse = (l, f) => mapReverseU(l, (. x) => f(x))
-
-let rec forEachU = (xs, f) =>
-  switch xs {
-  | list{} => ()
-  | list{a, ...l} =>
-    f(. a)->ignore
-    forEachU(l, f)
-  }
-
-let forEach = (xs, f) => forEachU(xs, (. x) => f(x))
-
-let rec iteri = (xs, i, f) =>
-  switch xs {
-  | list{} => ()
-  | list{a, ...l} =>
-    f(. i, a)->ignore
-    iteri(l, i + 1, f)
-  }
-
-let forEachWithIndexU = (l, f) => iteri(l, 0, f)
-let forEachWithIndex = (l, f) => forEachWithIndexU(l, (. i, x) => f(i, x))
-
-let rec reduceU = (l, accu, f) =>
-  switch l {
-  | list{} => accu
-  | list{a, ...l} => reduceU(l, f(. accu, a), f)
-  }
-
-let reduce = (l, accu, f) => reduceU(l, accu, (. acc, x) => f(acc, x))
-
-let rec reduceReverseUnsafeU = (l, accu, f) =>
-  switch l {
-  | list{} => accu
-  | list{a, ...l} => f(. reduceReverseUnsafeU(l, accu, f), a)
-  }
-
-let reduceReverseU = (type a b, l: list<a>, acc: b, f) => {
-  let len = length(l)
-  if len < 1000 {
-    reduceReverseUnsafeU(l, acc, f)
-  } else {
-    A.reduceReverseU(toArray(l), acc, f)
-  }
-}
-
-let reduceReverse = (l, accu, f) => reduceReverseU(l, accu, (. a, b) => f(a, b))
-
-let rec reduceWithIndexAuxU = (l, acc, f, i) =>
-  switch l {
-  | list{} => acc
-  | list{x, ...xs} => reduceWithIndexAuxU(xs, f(. acc, x, i), f, i + 1)
-  }
-
-let reduceWithIndexU = (l, acc, f) => reduceWithIndexAuxU(l, acc, f, 0)
-
-let reduceWithIndex = (l, acc, f) => reduceWithIndexU(l, acc, (. acc, x, i) => f(acc, x, i))
-
-let rec mapRevAux2 = (l1, l2, accu, f) =>
-  switch (l1, l2) {
-  | (list{a1, ...l1}, list{a2, ...l2}) => mapRevAux2(l1, l2, list{f(. a1, a2), ...accu}, f)
-  | (_, list{}) | (list{}, _) => accu
-  }
-
-let mapReverse2U = (l1, l2, f) => mapRevAux2(l1, l2, list{}, f)
-
-let mapReverse2 = (l1, l2, f) => mapReverse2U(l1, l2, (. a, b) => f(a, b))
-
-let rec forEach2U = (l1, l2, f) =>
-  switch (l1, l2) {
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    f(. a1, a2)->ignore
-    forEach2U(l1, l2, f)
-  | (list{}, _) | (_, list{}) => ()
-  }
-
-let forEach2 = (l1, l2, f) => forEach2U(l1, l2, (. a, b) => f(a, b))
-
-let rec reduce2U = (l1, l2, accu, f) =>
-  switch (l1, l2) {
-  | (list{a1, ...l1}, list{a2, ...l2}) => reduce2U(l1, l2, f(. accu, a1, a2), f)
-  | (list{}, _) | (_, list{}) => accu
-  }
-
-let reduce2 = (l1, l2, acc, f) => reduce2U(l1, l2, acc, (. a, b, c) => f(a, b, c))
-
-let rec reduceReverse2UnsafeU = (l1, l2, accu, f) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => accu
-  | (list{a1, ...l1}, list{a2, ...l2}) => f(. reduceReverse2UnsafeU(l1, l2, accu, f), a1, a2)
-  | (_, list{}) | (list{}, _) => accu
-  }
-
-let reduceReverse2U = (type a b c, l1: list<a>, l2: list<b>, acc: c, f) => {
-  let len = length(l1)
-  if len < 1000 {
-    reduceReverse2UnsafeU(l1, l2, acc, f)
-  } else {
-    A.reduceReverse2U(toArray(l1), toArray(l2), acc, f)
-  }
-}
-
-let reduceReverse2 = (l1, l2, acc, f) => reduceReverse2U(l1, l2, acc, (. a, b, c) => f(a, b, c))
-
-let rec everyU = (xs, p) =>
-  switch xs {
-  | list{} => true
-  | list{a, ...l} => p(. a) && everyU(l, p)
-  }
-
-let every = (xs, p) => everyU(xs, (. x) => p(x))
-
-let rec someU = (xs, p) =>
-  switch xs {
-  | list{} => false
-  | list{a, ...l} => p(. a) || someU(l, p)
-  }
-
-let some = (xs, p) => someU(xs, (. x) => p(x))
-
-let rec every2U = (l1, l2, p) =>
-  switch (l1, l2) {
-  | (_, list{}) | (list{}, _) => true
-  | (list{a1, ...l1}, list{a2, ...l2}) => p(. a1, a2) && every2U(l1, l2, p)
-  }
-
-let every2 = (l1, l2, p) => every2U(l1, l2, (. a, b) => p(a, b))
-
-let rec cmpByLength = (l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => 0
-  | (_, list{}) => 1
-  | (list{}, _) => -1
-  | (list{_, ...l1s}, list{_, ...l2s}) => cmpByLength(l1s, l2s)
-  }
-
-let rec cmpU = (l1, l2, p) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => 0
-  | (_, list{}) => 1
-  | (list{}, _) => -1
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    let c = p(. a1, a2)
-    if c == 0 {
-      cmpU(l1, l2, p)
-    } else {
-      c
-    }
-  }
-
-let cmp = (l1, l2, f) => cmpU(l1, l2, (. x, y) => f(x, y))
-
-let rec eqU = (l1, l2, p) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => true
-  | (_, list{})
-  | (list{}, _) => false
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    if p(. a1, a2) {
-      eqU(l1, l2, p)
-    } else {
-      false
-    }
-  }
-let eq = (l1, l2, f) => eqU(l1, l2, (. x, y) => f(x, y))
-
-let rec some2U = (l1, l2, p) =>
-  switch (l1, l2) {
-  | (list{}, _) | (_, list{}) => false
-  | (list{a1, ...l1}, list{a2, ...l2}) => p(. a1, a2) || some2U(l1, l2, p)
-  }
-
-let some2 = (l1, l2, p) => some2U(l1, l2, (. a, b) => p(a, b))
-
-let rec hasU = (xs, x, eq) =>
-  switch xs {
-  | list{} => false
-  | list{a, ...l} => eq(. a, x) || hasU(l, x, eq)
-  }
-
-let has = (xs, x, eq) => hasU(xs, x, (. a, b) => eq(a, b))
-
-let rec getAssocU = (xs, x, eq) =>
-  switch xs {
-  | list{} => None
-  | list{(a, b), ...l} =>
-    if eq(. a, x) {
-      Some(b)
-    } else {
-      getAssocU(l, x, eq)
-    }
-  }
-
-let getAssoc = (xs, x, eq) => getAssocU(xs, x, (. a, b) => eq(a, b))
-
-let rec hasAssocU = (xs, x, eq) =>
-  switch xs {
-  | list{} => false
-  | list{(a, _), ...l} => eq(. a, x) || hasAssocU(l, x, eq)
-  }
-
-let hasAssoc = (xs, x, eq) => hasAssocU(xs, x, (. a, b) => eq(a, b))
-
-let removeAssocU = (xs, x, eq) =>
-  switch xs {
-  | list{} => list{}
-  | list{(a, _) as pair, ...l} =>
-    if eq(. a, x) {
-      l
-    } else {
-      let cell = mutableCell(pair, list{})
-      let removed = removeAssocAuxWithMap(l, x, cell, eq)
-      if removed {
-        cell
-      } else {
-        xs
-      }
-    }
-  }
-
-let removeAssoc = (xs, x, eq) => removeAssocU(xs, x, (. a, b) => eq(a, b))
-
-let setAssocU = (xs, x, k, eq) =>
-  switch xs {
-  | list{} => list{(x, k)}
-  | list{(a, _) as pair, ...l} =>
-    if eq(. a, x) {
-      list{(x, k), ...l}
-    } else {
-      let cell = mutableCell(pair, list{})
-      let replaced = setAssocAuxWithMap(l, x, k, cell, eq)
-      if replaced {
-        cell
-      } else {
-        list{(x, k), ...xs}
-      }
-    }
-  }
-
-let setAssoc = (xs, x, k, eq) => setAssocU(xs, x, k, (. a, b) => eq(a, b))
-
-let sortU = (xs, cmp) => {
-  let arr = toArray(xs)
-  Belt_SortArray.stableSortInPlaceByU(arr, cmp)
-  fromArray(arr)
-}
-
-let sort = (xs, cmp) => sortU(xs, (. x, y) => cmp(x, y))
-
-let rec getByU = (xs, p) =>
-  switch xs {
-  | list{} => None
-  | list{x, ...l} =>
-    if p(. x) {
-      Some(x)
-    } else {
-      getByU(l, p)
-    }
-  }
-
-let getBy = (xs, p) => getByU(xs, (. a) => p(a))
-
-let rec keepU = (xs, p) =>
-  switch xs {
-  | list{} => list{}
-  | list{h, ...t} =>
-    if p(. h) {
-      let cell = mutableCell(h, list{})
-      copyAuxWitFilter(p, t, cell)
-      cell
-    } else {
-      keepU(t, p)
-    }
-  }
-
-let keep = (xs, p) => keepU(xs, (. x) => p(x))
-
-let filter = keep
-
-let keepWithIndexU = (xs, p) => {
-  let rec auxKeepWithIndex = (xs, p, i) =>
-    switch xs {
-    | list{} => list{}
-    | list{h, ...t} =>
-      if p(. h, i) {
-        let cell = mutableCell(h, list{})
-        copyAuxWithFilterIndex(p, t, cell, i + 1)
-        cell
-      } else {
-        auxKeepWithIndex(t, p, i + 1)
-      }
-    }
-  auxKeepWithIndex(xs, p, 0)
-}
-
-let keepWithIndex = (xs, p) => keepWithIndexU(xs, (. x, i) => p(x, i))
-
-let filterWithIndex = keepWithIndex
-
-let rec keepMapU = (xs, p) =>
-  switch xs {
-  | list{} => list{}
-  | list{h, ...t} =>
-    switch p(. h) {
-    | Some(h) =>
-      let cell = mutableCell(h, list{})
-      copyAuxWitFilterMap(p, t, cell)
-      cell
-    | None => keepMapU(t, p)
-    }
-  }
-
-let keepMap = (xs, p) => keepMapU(xs, (. x) => p(x))
-
-let partitionU = (l, p) =>
-  switch l {
-  | list{} => (list{}, list{})
-  | list{h, ...t} =>
-    let nextX = mutableCell(h, list{})
-    let nextY = mutableCell(h, list{})
-    let b = p(. h)
-    partitionAux(p, t, nextX, nextY)
-    if b {
-      (
-        nextX,
-        switch nextY {
-        | list{_, ...tail} => tail
-        | list{} => assert(false)
-        },
-      )
-    } else {
-      (
-        switch nextX {
-        | list{_, ...tail} => tail
-        | list{} => assert(false)
-        },
-        nextY,
-      )
-    }
-  }
-
-let partition = (l, p) => partitionU(l, (. x) => p(x))
-
-let unzip = xs =>
-  switch xs {
-  | list{} => (list{}, list{})
-  | list{(x, y), ...l} =>
-    let cellX = mutableCell(x, list{})
-    let cellY = mutableCell(y, list{})
-    splitAux(l, cellX, cellY)
-    (cellX, cellY)
-  }
-
-let zip = (l1, l2) =>
-  switch (l1, l2) {
-  | (_, list{}) | (list{}, _) => list{}
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    let cell = mutableCell((a1, a2), list{})
-    zipAux(l1, l2, cell)
-    cell
-  }
diff --git a/jscomp/others/belt_List.resi b/jscomp/others/belt_List.resi
deleted file mode 100644
index 15811ed..0000000
--- a/jscomp/others/belt_List.resi
+++ /dev/null
@@ -1,955 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Collection functions for manipulating the `list` data structures, a singly-linked list.
-
-**Prefer Array** if you need any of the following:
-
-- Random access of element
-- Better interop with JavaScript
-- Better memory usage & performance.
-*/
-
-/** `'a t` is compatible with built-in `list` type */
-type t<'a> = list<'a>
-
-/**
-Returns the length of a list.
-
-## Examples
-
-```rescript
-Belt.List.length(list{1, 2, 3}) // 3
-```
-*/
-let length: t<'a> => int
-
-/** See `Belt.List.length` */
-let size: t<'a> => int
-
-/**
-Returns `Some(value)` where `value` is the first element in the list, or
-`None` if `someList` is an empty list.
-
-## Examples
-
-```rescript
-Belt.List.head(list{}) // None
-Belt.List.head(list{1, 2, 3}) // Some(1)
-```
-*/
-let head: t<'a> => option<'a>
-
-/**
-Same as `Belt.List.head` but raises an exception if `someList` is empty. Use
-with care.
-
-## Examples
-
-```rescript
-Belt.List.headExn(list{1, 2, 3}) // 1
-
-Belt.List.headExn(list{}) // Raises an Error
-```
-*/
-let headExn: t<'a> => 'a
-
-/**
-Returns `None` if `someList` is empty, otherwise it returns `Some(tail)`
-where `tail` is everything except the first element of `someList`.
-
-## Examples
-
-```rescript
-Belt.List.tail(list{1, 2, 3}) // Some(list{2, 3})
-
-Belt.List.tail(list{}) // None
-```
-*/
-let tail: t<'a> => option<t<'a>>
-
-/**
-Same as `Belt.List.tail` but raises an exception if `someList` is empty. Use
-with care.
-
-## Examples
-
-```rescript
-Belt.List.tailExn(list{1, 2, 3}) // list{2, 3}
-
-Belt.List.tailExn(list{}) // Raises an Error
-```
-*/
-let tailExn: t<'a> => t<'a>
-
-/**
-Adds `value` to the beginning of `someList`.
-
-## Examples
-
-```rescript
-Belt.List.add(list{2, 3}, 1) // list{1, 2, 3}
-
-Belt.List.add(list{"World", "!"}, "Hello") // list{"Hello", "World", "!"}
-```
-*/
-let add: (t<'a>, 'a) => t<'a>
-
-/**
-Return the nth element in `someList`, or `None` if `index` is larger than the
-length.
-
-## Examples
-
-```rescript
-let abc = list{"A", "B", "C"}
-
-abc->Belt.List.get(1) // Some("B")
-
-abc->Belt.List.get(4) // None
-```
-*/
-let get: (t<'a>, int) => option<'a>
-
-/**
-Same as `Belt.List.get` but raises an exception if `index` is larger than the
-length. Use with care.
-
-## Examples
-
-```rescript
-let abc = list{"A", "B", "C"}
-
-abc->Belt.List.getExn(1) // "B"
-
-abc->Belt.List.getExn(4) // Raises an Error
-```
-*/
-let getExn: (t<'a>, int) => 'a
-
-/**
-Returns a list of length `numItems` with each element filled with value `v`. Returns an empty list if `numItems` is negative.
-
-## Examples
-
-```rescript
-Belt.List.make(3, 1) // list{1, 1, 1}
-```
-*/
-let make: (int, 'a) => t<'a>
-
-/** Uncurried version of [makeBy](#makeBy) */
-let makeByU: (int, (. int) => 'a) => t<'a>
-
-/**
-Return a list of length `numItems` with element `i` initialized with `f(i)`.
-Returns an empty list if `numItems` is negative.
-
-## Examples
-
-```rescript
-Belt.List.makeBy(5, i => i) // list{0, 1, 2, 3, 4}
-
-Belt.List.makeBy(5, i => i * i) // list{0, 1, 4, 9, 16}
-```
-*/
-let makeBy: (int, int => 'a) => t<'a>
-
-/**
-Returns a new list in random order.
-
-## Examples
-
-```rescript
-Belt.List.shuffle(list{1, 2, 3}) // list{2, 1, 3}
-```
-*/
-let shuffle: t<'a> => t<'a>
-
-/**
-Return a new list, dropping the first `n` elements. Returns `None` if `someList` has fewer than `n` elements.
-
-## Examples
-
-```rescript
-list{1, 2, 3}->Belt.List.drop(2) // Some(list{3})
-
-list{1, 2, 3}->Belt.List.drop(3) // Some(list{})
-
-list{1, 2, 3}->Belt.List.drop(4) // None
-```
-*/
-let drop: (t<'a>, int) => option<t<'a>>
-
-/**
-Returns a list with the first `n` elements from `someList`, or `None` if `someList` has fewer than `n` elements.
-
-## Examples
-
-```rescript
-list{1, 2, 3}->Belt.List.take(1) // Some(list{1})
-
-list{1, 2, 3}->Belt.List.take(2) // Some(list{1, 2})
-
-list{1, 2, 3}->Belt.List.take(4) // None
-```
-*/
-let take: (t<'a>, int) => option<t<'a>>
-
-/**
-Split the list `someList` at `index`. Returns `None` when the length of `someList` is less than `index`.
-
-## Examples
-
-```rescript
-list{"Hello", "World"}->Belt.List.splitAt(1) // Some((list{"Hello"}, list{"World"}))
-
-list{0, 1, 2, 3, 4}->Belt.List.splitAt(2) // Some((list{0, 1}, list{2, 3, 4}))
-```
-*/
-let splitAt: (t<'a>, int) => option<(list<'a>, list<'a>)>
-
-/**
-Returns the list obtained by adding `secondList` after `firstList`.
-
-## Examples
-
-```rescript
-Belt.List.concat(list{1, 2, 3}, list{4, 5}) // list{1, 2, 3, 4, 5}
-```
-*/
-let concat: (t<'a>, t<'a>) => t<'a>
-
-/**
-Returns the list obtained by concatenating all the lists in array `a`, in
-order.
-
-## Examples
-
-```rescript
-Belt.List.concatMany([list{1, 2, 3}, list{}, list{3}]) // list{1, 2, 3, 3}
-```
-*/
-let concatMany: array<t<'a>> => t<'a>
-
-/**
-Equivalent to writing: `concat(reverse(firstList, secondList)`
-
-## Examples
-
-```rescript
-Belt.List.reverseConcat(list{1, 2}, list{3, 4}) // list{2, 1, 3, 4}
-```
-*/
-let reverseConcat: (t<'a>, t<'a>) => t<'a>
-
-/**
-Return the list obtained by concatenating all the lists in list `ls`, in order.
-
-## Examples
-
-```rescript
-Belt.List.flatten(list{list{1, 2, 3}, list{}, list{3}}) // list{1, 2, 3, 3}
-```
-*/
-let flatten: t<t<'a>> => t<'a>
-
-/** Uncurried version of [map](#map). */
-let mapU: (t<'a>, (. 'a) => 'b) => t<'b>
-
-/**
-Returns a new list with `f` applied to each element of `someList`.
-
-## Examples
-
-```rescript
-list{1, 2}->Belt.List.map(x => x + 1) // list{3, 4}
-```
-*/
-let map: (t<'a>, 'a => 'b) => t<'b>
-
-/**
-Returns a list of pairs from the two lists with the length of the shorter list.
-
-## Examples
-
-```rescript
-Belt.List.zip(list{1, 2}, list{3, 4, 5}) // list{(1, 3), (2, 4)}
-```
-*/
-let zip: (t<'a>, t<'b>) => t<('a, 'b)>
-
-/** Uncurried version of [zipBy](#zipBy). */
-let zipByU: (t<'a>, t<'b>, (. 'a, 'b) => 'c) => t<'c>
-
-/**
-See [Belt.List.zip](#zip)
-
-## Examples
-
-```rescript
-Belt.List.zipBy(list{1, 2, 3}, list{4, 5}, (a, b) => 2 * a + b) // list{6, 9}
-```
-*/
-let zipBy: (t<'a>, t<'b>, ('a, 'b) => 'c) => t<'c>
-
-/** Uncurried version of [mapWithIndex](#mapWithIndex). */
-let mapWithIndexU: (t<'a>, (. int, 'a) => 'b) => t<'b>
-
-/**
-Applies `f` to each element of `someList`.
-Function `f` takes two arguments: the index starting from 0 and the element from `someList`, in that order.
-
-## Examples
-
-```rescript
-list{1, 2, 3}->Belt.List.mapWithIndex((index, x) => index + x) // list{1, 3, 5}
-```
-*/
-let mapWithIndex: (t<'a>, (int, 'a) => 'b) => t<'b>
-
-/**
-Converts the given array to a list.
-
-## Examples
-
-```rescript
-Belt.List.fromArray([1, 2, 3]) // list{1, 2, 3}
-```
-*/
-let fromArray: array<'a> => t<'a>
-
-/**
-Converts the given list to an array.
-
-## Examples
-
-```rescript
-Belt.List.toArray(list{1, 2, 3}) // [1, 2, 3]
-```
-*/
-let toArray: t<'a> => array<'a>
-
-/* type json = Js_json.t */
-
-/* val toJson : 'a t -> ('a -> json  [@bs]) -> json */
-/* val fromJson : json -> (json -> 'a [@bs]) -> 'a t */
-
-/**
-Returns a new list whose elements are those of `someList` in reversed order.
-
-## Examples
-
-```rescript
-Belt.List.reverse(list{1, 2, 3}) /* list{3, 2, 1} */
-```
-*/
-let reverse: t<'a> => t<'a>
-
-/** Uncurried version of [mapReverse](#mapReverse). */
-let mapReverseU: (t<'a>, (. 'a) => 'b) => t<'b>
-
-/**
-Equivalent to:
-
-```res
-map(someList, f)->reverse
-```
-
-## Examples
-
-```rescript
-list{3, 4, 5}->Belt.List.mapReverse(x => x * x) /* list{25, 16, 9} */
-```
-*/
-let mapReverse: (t<'a>, 'a => 'b) => t<'b>
-
-/** Uncurried version of [forEach](#forEach). */
-let forEachU: (t<'a>, (. 'a) => 'b) => unit
-
-/**
-Call `f` on each element of `someList` from the beginning to end.
-`f` returns `unit`, so no new array is created. Use `forEach` when you are primarily concerned with repetitively creating side effects.
-
-## Examples
-
-```rescript
-Belt.List.forEach(list{"a", "b", "c"}, x => Js.log("Item: " ++ x))
-/*
-  prints:
-  Item: a
-  Item: b
-  Item: c
-*/
-```
-*/
-let forEach: (t<'a>, 'a => 'b) => unit
-
-/** Uncurried version of [forEachWithIndex](#forEachWithIndex). */
-let forEachWithIndexU: (t<'a>, (. int, 'a) => 'b) => unit
-
-/**
-Call `f` on each element of `someList` from beginning to end.
-Function `f` takes two arguments: the index starting from 0 and the element from `someList`. `f` returns `unit`.
-
-## Examples
-
-```rescript
-Belt.List.forEachWithIndex(list{"a", "b", "c"}, (index, x) => {
-  Js.log("Item " ++ Belt.Int.toString(index) ++ " is " ++ x)
-})
-/*
-  prints:
-  Item 0 is a
-  Item 1 is b
-  Item 2 is cc
-*/
-```
-*/
-let forEachWithIndex: (t<'a>, (int, 'a) => 'b) => unit
-
-/** Uncurried version of [reduce](#reduce). */
-let reduceU: (t<'a>, 'b, (. 'b, 'a) => 'b) => 'b
-
-/**
-Applies `f` to each element of `someList` from beginning to end. Function `f` has two parameters: the item from the list and an “accumulator”, which starts with a value of `initialValue`. reduce returns the final value of the accumulator.
-
-## Examples
-
-```rescript
-list{1, 2, 3, 4}->Belt.List.reduce(0, (a, b) => a + b) /* 10 */
-
-/* same as */
-
-list{1, 2, 3, 4}->Belt.List.reduce(0, (acc, item) => acc + item) /* 10 */
-```
-*/
-let reduce: (t<'a>, 'b, ('b, 'a) => 'b) => 'b
-
-/** Uncurried version of [reduceWithIndex](#reduceWithIndex). */
-let reduceWithIndexU: (t<'a>, 'b, (. 'b, 'a, int) => 'b) => 'b
-
-/**
-Applies `f` to each element of `someList` from beginning to end. Function `f` has three parameters: the item from the list and an “accumulator”, which starts with a value of `initialValue` and the index of each element. `reduceWithIndex` returns the final value of the accumulator.
-
-## Examples
-
-```rescript
-list{1, 2, 3, 4}->Belt.List.reduceWithIndex(0, (acc, item, index) => acc + item + index) /* 16 */
-```
-*/
-let reduceWithIndex: (t<'a>, 'b, ('b, 'a, int) => 'b) => 'b
-
-/** Uncurried version of [reduceReverse](#reduceReverse). */
-let reduceReverseU: (t<'a>, 'b, (. 'b, 'a) => 'b) => 'b
-
-/**
-Works like [reduce](#reduce), except that function `f` is applied to each
-item of `someList` from the last back to the first.
-
-## Examples
-
-```rescript
-list{1, 2, 3, 4}->Belt.List.reduceReverse(0, (a, b) => a + b) /* 10 */
-
-list{1, 2, 3, 4}->Belt.List.reduceReverse(10, (a, b) => a - b) /* 0 */
-
-list{1, 2, 3, 4}->Belt.List.reduceReverse(list{}, Belt.List.add) // list{1, 2, 3, 4}
-```
-*/
-let reduceReverse: (t<'a>, 'b, ('b, 'a) => 'b) => 'b
-
-/** Uncurried version of [mapReverse2](#mapReverse2). */
-let mapReverse2U: (t<'a>, t<'b>, (. 'a, 'b) => 'c) => t<'c>
-
-/**
-Equivalent to: `zipBy(xs, ys, f)->reverse`
-
-## Examples
-
-```rescript
-
-Belt.List.mapReverse2(list{1, 2, 3}, list{1, 2}, (a, b) => a + b) // list{4, 2}
-```
-*/
-let mapReverse2: (t<'a>, t<'b>, ('a, 'b) => 'c) => t<'c>
-
-/** Uncurried version of [forEach2](#forEach2). */
-let forEach2U: (t<'a>, t<'b>, (. 'a, 'b) => 'c) => unit
-
-/**
-Stops at the length of the shorter list.
-
-## Examples
-
-```rescript
-Belt.List.forEach2(list{"Z", "Y"}, list{"A", "B", "C"}, (x, y) => Js.log2(x, y))
-
-/*
-  prints:
-  "Z" "A"
-  "Y" "B"
-*/
-```
-*/
-let forEach2: (t<'a>, t<'b>, ('a, 'b) => 'c) => unit
-
-/** Uncurried version of [reduce2](#reduce2). */
-let reduce2U: (t<'b>, t<'c>, 'a, (. 'a, 'b, 'c) => 'a) => 'a
-
-/**
-Applies `f` to each element of `firstList` and `secondList` from beginning to end. Stops with the shorter list. Function `f` has three parameters: an “accumulator” which starts with a value of `initialValue`, an item from `firstList`, and an item from `secondList`. `reduce2` returns the final value of the accumulator.
-
-## Examples
-
-```rescript
-Belt.List.reduce2(list{1, 2, 3}, list{4, 5}, 0, (acc, x, y) => acc + x * x + y) /* 0 + (1 * 1 + 4) + (2 * 2 + 5) */
-```
-*/
-let reduce2: (t<'b>, t<'c>, 'a, ('a, 'b, 'c) => 'a) => 'a
-
-/** Uncurried version of [reduceReverse2](#reduceReverse2). */
-let reduceReverse2U: (t<'a>, t<'b>, 'c, (. 'c, 'a, 'b) => 'c) => 'c
-
-/**
-Applies `f` to each element of `firstList` and `secondList` from end to
-beginning. Stops with the shorter list. Function `f` has three parameters: an
-“accumulator” which starts with a value of init, an item from `firstList`,
-and an item from `secondList`. `reduce2` returns the final value of the
-accumulator.
-
-## Examples
-
-```rescript
-Belt.List.reduceReverse2(list{1, 2, 3}, list{4, 5}, 0, (acc, x, y) => acc + x * x + y) /*  + (1 * 1 + 4) + (2 * 2 + 5) */
-```
-*/
-let reduceReverse2: (t<'a>, t<'b>, 'c, ('c, 'a, 'b) => 'c) => 'c
-
-/** Uncurried version of [every](#every). */
-let everyU: (t<'a>, (. 'a) => bool) => bool
-
-/**
-Returns `true` if all elements satisfy `pred`, where `pred` is a predicate: a function taking an element and returning a bool.
-
-## Examples
-
-```rescript
-let isBelow10 = value => value < 10
-
-list{1, 9, 8, 2}->Belt.List.every(isBelow10) /* true */
-
-list{1, 99, 8, 2}->Belt.List.every(isBelow10) /* false */
-```
-*/
-let every: (t<'a>, 'a => bool) => bool
-
-/** Uncurried version of [some](#some). */
-let someU: (t<'a>, (. 'a) => bool) => bool
-
-/**
-Returns `true` if at least _one_ of the elements in `someList` satisfies
-`pred`, where `pred` is a predicate: a function taking an element and
-returning a bool.
-
-## Examples
-
-```rescript
-let isAbove100 = value => value > 100
-
-list{101, 1, 2, 3}->Belt.List.some(isAbove100) /* true */
-
-list{1, 2, 3, 4}->Belt.List.some(isAbove100) /* false */
-```
-*/
-let some: (t<'a>, 'a => bool) => bool
-
-/** Uncurried version of [every2](#every2). */
-let every2U: (t<'a>, t<'b>, (. 'a, 'b) => bool) => bool
-
-/**
-Returns `true` if predicate `pred(a, b)` is `true` for all pairs of elements
-up to the shorter length (i.e. `min(length(firstList), length(secondList))`)
-
-## Examples
-
-```rescript
-Belt.List.every2(list{1, 2, 3}, list{0, 1}, (a, b) => a > b) /* true */
-
-Belt.List.every2(list{}, list{1}, (a, b) => a > b) /* true */
-
-Belt.List.every2(list{2, 3}, list{1}, (a, b) => a > b) /* true */
-
-Belt.List.every2(list{0, 1}, list{5, 0}, (a, b) => a > b) /* false */
-```
-*/
-let every2: (t<'a>, t<'b>, ('a, 'b) => bool) => bool
-
-/** Uncurried version of [some2](#some2). */
-let some2U: (t<'a>, t<'b>, (. 'a, 'b) => bool) => bool
-
-/**
-Returns `true` if predicate `pred(a, b)` is true for any pair of elements up
-to the shorter length (i.e. `min(length(firstList), length(secondList))`)
-
-## Examples
-
-```rescript
-Belt.List.some2(list{1, 2, 3}, list{0, 1}, (a, b) => a > b) /* true */
-
-Belt.List.some2(list{}, list{1}, (a, b) => a > b) /* false */
-
-Belt.List.some2(list{2, 3}, list{1}, (a, b) => a > b) /* true */
-
-Belt.List.some2(list{0, 1}, list{5, 0}, (a, b) => a > b) /* true */
-```
-*/
-let some2: (t<'a>, t<'b>, ('a, 'b) => bool) => bool
-
-/**
-Compare two lists solely by length. Returns `-1` if `length(firstList)` is
-less than `length(secondList)`, `0` if `length(firstList)` equals
-`length(secondList)`, and `1` if `length(firstList)` is greater than
-`length(secondList)`.
-
-## Examples
-
-```rescript
-Belt.List.cmpByLength(list{1, 2}, list{3, 4, 5, 6}) /* -1 */
-
-Belt.List.cmpByLength(list{1, 2, 3}, list{4, 5, 6}) /* = 0 */
-
-Belt.List.cmpByLength(list{1, 2, 3, 4}, list{5, 6}) /* = 1 */
-```
-*/
-let cmpByLength: (t<'a>, t<'a>) => int
-
-/** Uncurried version of [cmp](#cmp). */
-let cmpU: (t<'a>, t<'a>, (. 'a, 'a) => int) => int
-
-/**
-Compare elements one by one `compareFn(a, b)`. `compareFn` returns a negative number if `a` is "less than" `b`, zero if `a` is "equal to" `b`, a positive number if `a` is "greater than" `b`.
-
-The comparison returns the first non-zero result of `compareFn`, or zero if `compareFn` returns zero for all `a` and `b`.
-
-If all items have compared equal, but `firstList` is exhausted first, return `-1`. (`firstList` is shorter).
-If all items have compared equal, but `secondList` is exhausted first, return `1` (`firstList` is longer).
-
-## Examples
-
-```rescript
-Belt.List.cmp(list{3}, list{3, 7}, (a, b) => compare(a, b)) /* (-1) */
-
-Belt.List.cmp(list{5, 3}, list{5}, (a, b) => compare(a, b)) /* 1 */
-
-Belt.List.cmp(list{1, 3, 5}, list{1, 4, 2}, (a, b) => compare(a, b)) /* (-1) */
-
-Belt.List.cmp(list{1, 3, 5}, list{1, 2, 3}, (a, b) => compare(a, b)) /* 1 */
-
-Belt.List.cmp(list{1, 3, 5}, list{1, 3, 5}, (a, b) => compare(a, b)) /* 0 */
-```
-
-**Please note:** The total ordering of List is different from Array,
-for Array, we compare the length first and, only if the lengths are equal, elements one by one.
-For lists, we just compare elements one by one.
-*/
-let cmp: (t<'a>, t<'a>, ('a, 'a) => int) => int
-
-/** Uncurried version of [eq](#eq). */
-let eqU: (t<'a>, t<'a>, (. 'a, 'a) => bool) => bool
-
-/**
-Check equality of `firstList` and `secondList` using `eqElem` for equality on
-elements, where `eqElem` is a function that returns `true` if items `x` and
-`y` meet some criterion for equality, `false` otherwise. eq `false` if length
-of `firstList` and `secondList` are not the same.
-
-## Examples
-
-```rescript
-Belt.List.eq(list{1, 2, 3}, list{1, 2}, (a, b) => a == b) /* false */
-
-Belt.List.eq(list{1, 2}, list{1, 2}, (a, b) => a == b) /* true */
-
-Belt.List.eq(list{1, 2, 3}, list{(-1), (-2), (-3)}, (a, b) => abs(a) == abs(b)) /* true */
-```
-*/
-let eq: (t<'a>, t<'a>, ('a, 'a) => bool) => bool
-
-/** Uncurried version of [has](#has). */
-let hasU: (t<'a>, 'b, (. 'a, 'b) => bool) => bool
-
-/**
-Returns `true` if the list contains at least one element for which
-`eqFunction(x)` returns true.
-
-## Examples
-
-```rescript
-list{1, 2, 3}->Belt.List.has(2, (a, b) => a == b) /* true */
-
-list{1, 2, 3}->Belt.List.has(4, (a, b) => a == b) /* false */
-
-list{(-1), (-2), (-3)}->Belt.List.has(2, (a, b) => abs(a) == abs(b)) /* true */
-```
-*/
-let has: (t<'a>, 'b, ('a, 'b) => bool) => bool
-
-/** Uncurried version of [getBy](#getBy). */
-let getByU: (t<'a>, (. 'a) => bool) => option<'a>
-
-/**
-Returns `Some(value)` for the first value in `someList` that satisfies the
-predicate function `pred`. Returns `None` if no element satisfies the function.
-
-## Examples
-
-```rescript
-Belt.List.getBy(list{1, 4, 3, 2}, x => x > 3) /* Some(4) */
-
-Belt.List.getBy(list{1, 4, 3, 2}, x => x > 4) /* None */
-```
-*/
-let getBy: (t<'a>, 'a => bool) => option<'a>
-
-/** Uncurried version of [keep](#keep). */
-let keepU: (t<'a>, (. 'a) => bool) => t<'a>
-
-/**
-Returns a list of all elements in `someList` which satisfy the predicate function `pred`.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-
-Belt.List.keep(list{1, 2, 3, 4}, isEven) /* list{2, 4} */
-
-Belt.List.keep(list{None, Some(2), Some(3), None}, Belt.Option.isSome) /* list{Some(2), Some(3)} */
-```
-*/
-let keep: (t<'a>, 'a => bool) => t<'a>
-
-@deprecated("This function will soon be deprecated. Please, use `List.keep` instead.")
-/**
-Returns a list of all elements in `someList` which satisfy the predicate function `pred`.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-
-Belt.List.filter(list{1, 2, 3, 4}, isEven) /* list{2, 4} */
-
-Belt.List.filter(list{None, Some(2), Some(3), None}, Belt.Option.isSome) /* list{Some(2), Some(3)} */
-```
-*/
-let filter: (t<'a>, 'a => bool) => t<'a>
-
-/** Uncurried version of [keepWithIndex](#keepWithIndex). */
-let keepWithIndexU: (t<'a>, (. 'a, int) => bool) => t<'a>
-
-/**
-Returns a list of all elements in `someList` which satisfy the predicate function `pred`.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-
-Belt.List.keepWithIndex(list{1, 2, 3, 4}, (_x, index) => isEven(index)) /* list{1, 3} */
-```
-*/
-let keepWithIndex: (t<'a>, ('a, int) => bool) => t<'a>
-
-@deprecated(
-  "This function will soon be deprecated. Please, use `List.keepWithIndex` \
-     instead."
-)
-/**
-Returns a list of all elements in `someList` which satisfy the predicate function `pred`.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-
-Belt.List.filterWithIndex(list{1, 2, 3, 4}, (_x, index) => isEven(index)) /* list{1, 3} */
-```
-*/
-let filterWithIndex: (t<'a>, ('a, int) => bool) => t<'a>
-
-/** Uncurried version of [keepMap](#keepMap). */
-let keepMapU: (t<'a>, (. 'a) => option<'b>) => t<'b>
-
-/**
-Applies `f` to each element of `someList`. If `f(x)` returns `Some(value)`, then `value` is _kept_ in the resulting list.
-If `f(x)` returns `None`, the element is _not_ retained in the result.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-
-list{1, 2, 3, 4}
-->Belt.List.keepMap(x =>
-    if (isEven(x)) {
-      Some(x)
-    } else {
-      None
-    }
-  ) /* list{2, 4} */
-
-list{Some(1), Some(2), None}->Belt.List.keepMap(x => x) /* list{1, 2} */
-```
-*/
-let keepMap: (t<'a>, 'a => option<'b>) => t<'b>
-
-/** Uncurried version of [partition](#partition). */
-let partitionU: (t<'a>, (. 'a) => bool) => (t<'a>, t<'a>)
-
-/**
-Creates a pair of lists; the first list consists of all elements of `someList` that satisfy the predicate function `pred`; the second list consists of all elements of `someList` that _do not_ satisfy `pred.
-
-In other words:
-
-```rescript
-(elementsThatSatisfies, elementsThatDoesNotSatisfy)
-```
-
-## Examples
-
-```rescript
-Belt.List.partition(list{1, 2, 3, 4}, x => x > 2) /* (list{3, 4}, list{1, 2}) */
-```
-*/
-let partition: (t<'a>, 'a => bool) => (t<'a>, t<'a>)
-
-/**
-Takes a list of pairs and creates a pair of lists. The first list contains all the first items of the pairs; the second list contains all the second items.
-
-## Examples
-
-```rescript
-Belt.List.unzip(list{(1, 2), (3, 4)}) /* (list{1, 3}, list{2, 4}) */
-
-Belt.List.unzip(list{("H", "W"), ("e", "o"), ("l", "r"), ("l", "l"), ("o", "d"), (" ", "!")})
-/* (list{"H", "e", "l", "l", "o", " "}, list{"W", "o", "r", "l", "d", "!"}) */
-```
-*/
-let unzip: t<('a, 'b)> => (t<'a>, t<'b>)
-
-/** Uncurried version of [getAssoc](#getAssoc). */
-let getAssocU: (t<('a, 'c)>, 'b, (. 'a, 'b) => bool) => option<'c>
-
-/**
-Return the second element of a pair in `someList` where the first element equals `k` as per the predicate function `eqFunction`, or `None` if not found.
-
-## Examples
-
-```rescript
-list{(1, "a"), (2, "b"), (3, "c")}->Belt.List.getAssoc(3, (a, b) => a == b) /* Some("c") */
-
-list{(9, "morning"), (15, "afternoon"), (22, "night")}
-->Belt.List.getAssoc(15, (k, item) => k /* 15 */ == item /* 9, 5, 22 */)
-/* Some("afternoon") */
-```
-*/
-let getAssoc: (t<('a, 'c)>, 'b, ('a, 'b) => bool) => option<'c>
-
-/** Uncurried version of [hasAssoc](#hasAssoc). */
-let hasAssocU: (t<('a, 'c)>, 'b, (. 'a, 'b) => bool) => bool
-
-/**
-Returns `true` if there is a pair in `someList` where the first element equals `k` as per the predicate function `eqFunction`.
-
-## Examples
-
-```rescript
-list{(1, "a"), (2, "b"), (3, "c")}->Belt.List.hasAssoc(1, (a, b) => a == b) /* true */
-
-list{(9, "morning"), (15, "afternoon"), (22, "night")}
-->Belt.List.hasAssoc(25, (k, item) => k /* 25 */ == item /* 9, 5, 22 */) /* false */
-```
-*/
-let hasAssoc: (t<('a, 'c)>, 'b, ('a, 'b) => bool) => bool
-
-/** Uncurried version of [removeAssoc](#removeAssoc). */
-let removeAssocU: (t<('a, 'c)>, 'b, (. 'a, 'b) => bool) => t<('a, 'c)>
-
-/**
-Return a list after removing the first pair whose first value is `k` per the equality predicate `eqFunction`; if not found, return a new list identical to `someList`.
-
-## Examples
-
-```rescript
-list{(1, "a"), (2, "b"), (3, "c")}->Belt.List.removeAssoc(1, (a, b) => a == b) /* list{(2, "b"), (3, "c")} */
-
-list{(9, "morning"), (15, "afternoon"), (22, "night")}
-->Belt.List.removeAssoc(9, (k, item) => k /* 9 */ == item /* 9, 5, 22 */)
-/* list{(15, "afternoon"), (22, "night")} */
-```
-*/
-let removeAssoc: (t<('a, 'c)>, 'b, ('a, 'b) => bool) => t<('a, 'c)>
-
-/** Uncurried version of [setAssoc](#setAssoc). */
-let setAssocU: (t<('a, 'c)>, 'a, 'c, (. 'a, 'a) => bool) => t<('a, 'c)>
-
-/**
-If `k` exists in `someList` by satisfying the `eqFunction` predicate, return a new list with the key and value replaced by the new `k` and `v`; otherwise, return a new list with the pair `k`, `v` added to the head of `someList`.
-
-## Examples
-
-```rescript
-list{(1, "a"), (2, "b"), (3, "c")}->Belt.List.setAssoc(2, "x", (a, b) => a == b) /* list{(1, "a"), (2, "x"), (3, "c")} */
-
-list{(1, "a"), (3, "c")}->Belt.List.setAssoc(2, "b", (a, b) => a == b) /* list{(2, "b"), (1, "a"), (3, "c")} */
-
-list{(9, "morning"), (3, "morning?!"), (22, "night")}
-->Belt.List.setAssoc(15, "afternoon", (a, b) => mod(a, 12) == mod(b, 12))
-/* list{(9, "morning"), (15, "afternoon"), (22, "night")} */
-```
-
-**Please note**
-
-In the last example, since: `15 mod 12` equals `3 mod 12`
-
-Both the key _and_ the value are replaced in the list.
-*/
-let setAssoc: (t<('a, 'c)>, 'a, 'c, ('a, 'a) => bool) => t<('a, 'c)>
-
-/** Uncurried version of [sort](#sort). */
-let sortU: (t<'a>, (. 'a, 'a) => int) => t<'a>
-
-/**
-Returns a sorted list.
-
-## Examples
-
-```rescript
-Belt.List.sort(list{5, 4, 9, 3, 7}, (a, b) => a - b) // list{3, 4, 5, 7, 9}
-```
-*/
-let sort: (t<'a>, ('a, 'a) => int) => t<'a>
diff --git a/jscomp/others/belt_Map.res b/jscomp/others/belt_Map.res
deleted file mode 100644
index cfd9edf..0000000
--- a/jscomp/others/belt_Map.res
+++ /dev/null
@@ -1,164 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* Adapted by authors of ReScript without using functors */
-/* ********************************************************************* */
-
-/** specalized when key type is `int`, more efficient
-    than the generic type
-*/
-module Int = Belt_MapInt
-
-/** specalized when key type is `string`, more efficient
-    than the generic type */
-module String = Belt_MapString
-
-/** seprate function from data, a more verboe but slightly
-    more efficient
-*/
-module Dict = Belt_MapDict
-
-type id<'key, 'id> = Belt_Id.comparable<'key, 'id>
-type cmp<'key, 'id> = Belt_Id.cmp<'key, 'id>
-
-type t<'k, 'v, 'id> = {
-  cmp: cmp<'k, 'id>,
-  data: Dict.t<'k, 'v, 'id>,
-}
-
-let fromArray = (type k idx, data, ~id: id<k, idx>) => {
-  module M = unpack(id)
-  let cmp = M.cmp
-  {cmp, data: Dict.fromArray(~cmp, data)}
-}
-
-let remove = (m, x) => {
-  let {cmp, data: odata} = m
-  let newData = Dict.remove(odata, x, ~cmp)
-  if newData === odata {
-    m
-  } else {
-    {cmp, data: newData}
-  }
-}
-
-let removeMany = (m, x) => {
-  let {cmp, data: odata} = m
-  let newData = Dict.removeMany(odata, x, ~cmp)
-  {cmp, data: newData}
-}
-
-let set = (m, key, d) => {
-  let cmp = m.cmp
-  {cmp, data: Dict.set(~cmp, m.data, key, d)}
-}
-
-let mergeMany = (m, e) => {
-  let cmp = m.cmp
-  {cmp, data: Dict.mergeMany(~cmp, m.data, e)}
-}
-
-let updateU = (m, key, f) => {
-  let cmp = m.cmp
-  {cmp, data: Dict.updateU(~cmp, m.data, key, f)}
-}
-let update = (m, key, f) => updateU(m, key, (. a) => f(a))
-let split = (m, x) => {
-  let cmp = m.cmp
-  let ((l, r), b) = Dict.split(~cmp, m.data, x)
-  (({cmp, data: l}, {cmp, data: r}), b)
-}
-
-let mergeU = (s1, s2, f) => {
-  let cmp = s1.cmp
-  {cmp, data: Dict.mergeU(~cmp, s1.data, s2.data, f)}
-}
-
-let merge = (s1, s2, f) => mergeU(s1, s2, (. a, b, c) => f(a, b, c))
-
-let make = (type key idx, ~id: id<key, idx>) => {
-  module M = unpack(id)
-  {cmp: M.cmp, data: Dict.empty}
-}
-
-let isEmpty = map => Dict.isEmpty(map.data)
-
-let findFirstByU = (m, f) => Dict.findFirstByU(m.data, f)
-let findFirstBy = (m, f) => findFirstByU(m, (. a, b) => f(a, b))
-let forEachU = (m, f) => Dict.forEachU(m.data, f)
-let forEach = (m, f) => forEachU(m, (. a, b) => f(a, b))
-let reduceU = (m, acc, f) => Dict.reduceU(m.data, acc, f)
-let reduce = (m, acc, f) => reduceU(m, acc, (. a, b, c) => f(a, b, c))
-let everyU = (m, f) => Dict.everyU(m.data, f)
-let every = (m, f) => everyU(m, (. a, b) => f(a, b))
-let someU = (m, f) => Dict.someU(m.data, f)
-let some = (m, f) => someU(m, (. a, b) => f(a, b))
-let keepU = (m, f) => {cmp: m.cmp, data: Dict.keepU(m.data, f)}
-let keep = (m, f) => keepU(m, (. a, b) => f(a, b))
-
-let partitionU = (m, p) => {
-  let cmp = m.cmp
-  let (l, r) = m.data->Dict.partitionU(p)
-  ({cmp, data: l}, {cmp, data: r})
-}
-let partition = (m, p) => partitionU(m, (. a, b) => p(a, b))
-
-let mapU = (m, f) => {cmp: m.cmp, data: Dict.mapU(m.data, f)}
-let map = (m, f) => mapU(m, (. a) => f(a))
-let mapWithKeyU = (m, f) => {cmp: m.cmp, data: Dict.mapWithKeyU(m.data, f)}
-let mapWithKey = (m, f) => mapWithKeyU(m, (. a, b) => f(a, b))
-let size = map => Dict.size(map.data)
-let toList = map => Dict.toList(map.data)
-let toArray = m => Dict.toArray(m.data)
-let keysToArray = m => Dict.keysToArray(m.data)
-let valuesToArray = m => Dict.valuesToArray(m.data)
-let minKey = m => Dict.minKey(m.data)
-let minKeyUndefined = m => Dict.minKeyUndefined(m.data)
-let maxKey = m => Dict.maxKey(m.data)
-let maxKeyUndefined = m => Dict.maxKeyUndefined(m.data)
-let minimum = m => Dict.minimum(m.data)
-let minUndefined = m => Dict.minUndefined(m.data)
-let maximum = m => Dict.maximum(m.data)
-let maxUndefined = m => Dict.maxUndefined(m.data)
-
-let get = (map, x) => Dict.get(~cmp=map.cmp, map.data, x)
-
-let getUndefined = (map, x) => Dict.getUndefined(~cmp=map.cmp, map.data, x)
-
-let getWithDefault = (map, x, def) => Dict.getWithDefault(~cmp=map.cmp, map.data, x, def)
-
-let getExn = (map, x) => Dict.getExn(~cmp=map.cmp, map.data, x)
-
-let has = (map, x) => Dict.has(~cmp=map.cmp, map.data, x)
-
-let checkInvariantInternal = m => Dict.checkInvariantInternal(m.data)
-
-let eqU = (m1, m2, veq) => Dict.eqU(~kcmp=m1.cmp, ~veq, m1.data, m2.data)
-let eq = (m1, m2, veq) => eqU(m1, m2, (. a, b) => veq(a, b))
-
-let cmpU = (m1, m2, vcmp) => Dict.cmpU(~kcmp=m1.cmp, ~vcmp, m1.data, m2.data)
-let cmp = (m1, m2, vcmp) => cmpU(m1, m2, (. a, b) => vcmp(a, b))
-
-let getData = m => m.data
-
-let getId = (type key identity, m: t<key, _, identity>): id<key, identity> => {
-  module T = {
-    type identity = identity
-    type t = key
-    let cmp = m.cmp
-  }
-  module(T)
-}
-
-let packIdData = (type key idx, ~id: id<key, idx>, ~data) => {
-  module M = unpack(id)
-  {cmp: M.cmp, data}
-}
diff --git a/jscomp/others/belt_Map.resi b/jscomp/others/belt_Map.resi
deleted file mode 100644
index ae5638d..0000000
--- a/jscomp/others/belt_Map.resi
+++ /dev/null
@@ -1,520 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* Adapted by authors of ReScript without using functors */
-/* ********************************************************************* */
-
-/***
-The top level provides generic immutable map operations.
-
-It also has three specialized inner modules `Belt.Map.Int`, `Belt.Map.String`
-and `Belt.Map.Dict`.
-*/
-
-/**
-## Examples
-
-```rescript
-type t<'key, 'value, 'identity>
-type id<'key, 'id> = Belt_Id.comparable<'key, 'id>
-```
-*/
-
-module Int = Belt_MapInt
-
-module String = Belt_MapString
-
-module Dict = Belt_MapDict
-
-/**
-`'key` is the field type
-
-`'value` is the element type
-
-`'identity` the identity of the collection
-*/
-type t<'key, 'value, 'identity>
-
-/** The identity needed for making an empty map. */
-type id<'key, 'id> = Belt_Id.comparable<'key, 'id>
-
-/**
-`make(~id)` creates a new map by taking in the comparator.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-let m = Belt.Map.make(~id=module(IntCmp))
-
-Belt.Map.set(m, 0, "a")
-```
-*/
-let make: (~id: id<'k, 'id>) => t<'k, 'v, 'id>
-
-/**
-
-`isEmpty(m)` checks whether a map m is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-Belt.Map.isEmpty(Belt.Map.fromArray([(1, "1")], ~id=module(IntCmp))) == false
-```
-*/
-let isEmpty: t<_> => bool
-
-/**
-`has(m, k)` checks whether `m` has the key `k`.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-    type t = int
-    let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-Belt.Map.has(Belt.Map.fromArray([(1, "1")], ~id=module(IntCmp)), 1) == true
-```
-*/
-let has: (t<'k, 'v, 'id>, 'k) => bool
-
-let cmpU: (t<'k, 'v, 'id>, t<'k, 'v, 'id>, (. 'v, 'v) => int) => int
-/** 
-`cmp(m0, m1, vcmp);`
-
-Total ordering of map given total ordering of value function.
-
-It will compare size first and each element following the order one by one.
-*/
-let cmp: (t<'k, 'v, 'id>, t<'k, 'v, 'id>, ('v, 'v) => int) => int
-
-let eqU: (t<'k, 'v, 'id>, t<'k, 'v, 'id>, (. 'v, 'v) => bool) => bool
-/**
-eq(m1, m2, veq)` tests whether the maps `m1` and `m2` are equal, that is,
-contain equal keys and associate them with equal data. `veq` is the
-equality predicate used to compare the data associated with the keys. 
-*/
-let eq: (t<'k, 'v, 'id>, t<'k, 'v, 'id>, ('v, 'v) => bool) => bool
-
-let findFirstByU: (t<'k, 'v, 'id>, (. 'k, 'v) => bool) => option<('k, 'v)>
-/** `
-findFirstBy(m, p)` uses function `f` to find the first key value pair to match predicate `p`.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-let s0 = Belt.Map.fromArray(~id=module(IntCmp), [(4, "4"), (1, "1"), (2, "2"), (3, "")])
-
-Belt.Map.findFirstBy(s0, (k, v) => k == 4) /* (4, "4") */
-```
-*/
-let findFirstBy: (t<'k, 'v, 'id>, ('k, 'v) => bool) => option<('k, 'v)>
-
-let forEachU: (t<'k, 'v, 'id>, (. 'k, 'v) => unit) => unit
-/** 
- `forEach(m, f)` applies `f` to all bindings in map `m`. `f` receives the
-`'k` as first argument, and the associated value as second argument. The
-bindings are passed to `f` in increasing order with respect to the ordering
-over the type of the keys.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-let s0 = Belt.Map.fromArray(~id=module(IntCmp), [(4, "4"), (1, "1"), (2, "2"), (3, "")])
-
-let acc = ref(list{})
-
-Belt.Map.forEach(s0, (k, v) => acc := list{(k, v), ...acc.contents})
-
-acc.contents == list{(4, "4"), (3, "3"), (2, "2"), (1, "1")}
-```
-*/
-let forEach: (t<'k, 'v, 'id>, ('k, 'v) => unit) => unit
-
-let reduceU: (t<'k, 'v, 'id>, 'acc, (. 'acc, 'k, 'v) => 'acc) => 'acc
-/** 
- `reduce(m, a, f)` computes `(f(kN, dN) ... (f(k1, d1, a))...)`, where `k1
-... kN` are the keys of all bindings in m (in increasing order), and `d1
-... dN` are the associated data.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-let s0 = Belt.Map.fromArray(~id=module(IntCmp), [(4, "4"), (1, "1"), (2, "2"), (3, "3")])
-
-Belt.Map.reduce(s0, list{}, (acc, k, v) => list{
-    (k, v),
-    ...acc,
-}) /* [(4, "4"), (3, "3"), (2, "2"), (1, "1"), 0] */
-```
-*/
-let reduce: (t<'k, 'v, 'id>, 'acc, ('acc, 'k, 'v) => 'acc) => 'acc
-
-let everyU: (t<'k, 'v, 'id>, (. 'k, 'v) => bool) => bool
-/**
-`every(m, p)` checks if all the bindings of the map satisfy the predicate
-`p`. Order unspecified
-*/
-let every: (t<'k, 'v, 'id>, ('k, 'v) => bool) => bool
-
-let someU: (t<'k, 'v, 'id>, (. 'k, 'v) => bool) => bool
-/**
-`some(m, p)` checks if at least one binding of the map satisfy the predicate 
-`p`. Order unspecified */
-let some: (t<'k, 'v, 'id>, ('k, 'v) => bool) => bool
-
-/** 
- `size(s)`
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-Belt.Map.size(Belt.Map.fromArray([(2, "2"), (2, "1"), (3, "3")], ~id=module(IntCmp))) == 2
-```
-*/
-let size: t<'k, 'v, 'id> => int
-
-/** 
- `toArray(s)`
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-Belt.Map.toArray(Belt.Map.fromArray([(2, "2"), (1, "1"), (3, "3")], ~id=module(IntCmp))) == [
-  (1, "1"),
-  (2, "2"),
-  (3, "3"),
-  ]
-```
-*/
-let toArray: t<'k, 'v, 'id> => array<('k, 'v)>
-
-/** In increasing order. See `Belt.Map.toArray`*/
-let toList: t<'k, 'v, 'id> => list<('k, 'v)>
-
-/** 
-`fromArray(kvs, ~id);`
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-Belt.Map.toArray(Belt.Map.fromArray([(2, "2"), (1, "1"), (3, "3")], ~id=module(IntCmp))) == [
-    (1, "1"),
-    (2, "2"),
-    (3, "3"),
-  ]
-```
-*/
-let fromArray: (array<('k, 'v)>, ~id: id<'k, 'id>) => t<'k, 'v, 'id>
-
-/** 
-`keysToArray(s);`
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-Belt.Map.keysToArray(Belt.Map.fromArray([(2, "2"), (1, "1"), (3, "3")], ~id=module(IntCmp))) == [
-    1,
-    2,
-    3,
-  ]
-```
-*/
-let keysToArray: t<'k, 'v, 'id> => array<'k>
-
-/** 
- `valuesToArray(s);`
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-Belt.Map.valuesToArray(
-  Belt.Map.fromArray([(2, "2"), (1, "1"), (3, "3")], ~id=module(IntCmp)),
-) == ["1", "2", "3"]
-```
-*/
-let valuesToArray: t<'k, 'v, 'id> => array<'v>
-
-/** `minKey(s)` returns the minimum key, None if not exist. */
-let minKey: t<'k, _, _> => option<'k>
-
-/** See `Belt.Map.minKey` */
-let minKeyUndefined: t<'k, _, _> => Js.undefined<'k>
-
-/** `maxKey(s)` returns the maximum key, None if not exist. */
-let maxKey: t<'k, _, _> => option<'k>
-
-/** See `Belt.Map.maxKey` */
-let maxKeyUndefined: t<'k, _, _> => Js.undefined<'k>
-
-/** `minimum(s)` returns the minimum key value pair, None if not exist. */
-let minimum: t<'k, 'v, _> => option<('k, 'v)>
-
-/** See `Belt.Map.minimum` */
-let minUndefined: t<'k, 'v, _> => Js.undefined<('k, 'v)>
-
-/** `maximum(s)` returns the maximum key value pair, None if not exist. */
-let maximum: t<'k, 'v, _> => option<('k, 'v)>
-
-/** See `Belt.Map.maximum` */
-let maxUndefined: t<'k, 'v, _> => Js.undefined<('k, 'v)>
-
-/** 
- `get(s, k)`
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-Belt.Map.get(Belt.Map.fromArray([(2, "2"), (1, "1"), (3, "3")], ~id=module(IntCmp)), 2) ==
-  Some("2")
-
-Belt.Map.get(Belt.Map.fromArray([(2, "2"), (1, "1"), (3, "3")], ~id=module(IntCmp)), 2) == None
-```
-*/
-let get: (t<'k, 'v, 'id>, 'k) => option<'v>
-
-/** See `Belt.Map.get`. Returns `undefined` when not found*/
-let getUndefined: (t<'k, 'v, 'id>, 'k) => Js.undefined<'v>
-
-/** 
-`getWithDefault(s, k, default)`
-
-See `Belt.Map.get`
-
-Returns default when `k` is not found.
-*/
-let getWithDefault: (t<'k, 'v, 'id>, 'k, 'v) => 'v
-
-/** 
-`getExn(s, k)`
-
-See `Belt.Map.getExn`
-
-raise when `k` not exist
-*/
-let getExn: (t<'k, 'v, 'id>, 'k) => 'v
-
-/* ************************************************************************** */
-
-/** 
-`remove(m, x)` when `x` is not in `m`, `m` is returned reference unchanged.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-let s0 = Belt.Map.fromArray([(2, "2"), (1, "1"), (3, "3")], ~id=module(IntCmp))
-
-let s1 = Belt.Map.remove(s0, 1)
-
-let s2 = Belt.Map.remove(s1, 1)
-
-s1 === s2
-
-Belt.Map.keysToArray(s1) == [2, 3]
-```
-*/
-let remove: (t<'k, 'v, 'id>, 'k) => t<'k, 'v, 'id>
-
-/** 
-`removeMany(s, xs)`
-
-Removing each of `xs` to `s`, note unlike `Belt.Map.remove`, the reference
-of return value might be changed even if none in `xs` exists `s`.
-*/
-let removeMany: (t<'k, 'v, 'id>, array<'k>) => t<'k, 'v, 'id>
-
-/** 
-`set(m, x, y)` returns a map containing the same bindings as `m`, with a
-new binding of `x` to `y`. If `x` was already bound in `m`, its previous
-binding disappears.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = (a, b) => Pervasives.compare(a, b)
-})
-
-let s0 = Belt.Map.fromArray([(2, "2"), (1, "1"), (3, "3")], ~id=module(IntCmp))
-
-let s1 = Belt.Map.set(s0, 2, "3")
-
-Belt.Map.valuesToArray(s1) == ["1", "3", "3"]
-```
-*/
-let set: (t<'k, 'v, 'id>, 'k, 'v) => t<'k, 'v, 'id>
-
-let updateU: (t<'k, 'v, 'id>, 'k, (. option<'v>) => option<'v>) => t<'k, 'v, 'id>
-/** 
-`update(m, x, f)` returns a map containing the same bindings as `m`, except
-for the binding of `x`. Depending on the value of `y` where `y` is
-`f(get(m, x))`, the binding of `x` is added, removed or updated. If `y` is
-`None`, the binding is removed if it exists; otherwise, if `y` is `Some(z)`
-then `x` is associated to `z` in the resulting map. 
-*/
-let update: (t<'k, 'v, 'id>, 'k, option<'v> => option<'v>) => t<'k, 'v, 'id>
-
-/** 
- `mergeMany(s, xs)`
-
-Adding each of `xs` to `s`, note unlike `add`, the reference of return
-value might be changed even if all values in `xs` exist `s`.
-*/
-let mergeMany: (t<'k, 'v, 'id>, array<('k, 'v)>) => t<'k, 'v, 'id>
-
-let mergeU: (
-  t<'k, 'v, 'id>,
-  t<'k, 'v2, 'id>,
-  (. 'k, option<'v>, option<'v2>) => option<'v3>,
-) => t<'k, 'v3, 'id>
-/** 
-`merge(m1, m2, f)` computes a map whose keys is a subset of keys of `m1`
-and of `m2`. The presence of each such binding, and the corresponding
-value, is determined with the function `f`. 
-*/
-let merge: (
-  t<'k, 'v, 'id>,
-  t<'k, 'v2, 'id>,
-  ('k, option<'v>, option<'v2>) => option<'v3>,
-) => t<'k, 'v3, 'id>
-
-let keepU: (t<'k, 'v, 'id>, (. 'k, 'v) => bool) => t<'k, 'v, 'id>
-/**
-`keep(m, p)` returns the map with all the bindings in m that satisfy
-predicate `p`.
-*/
-let keep: (t<'k, 'v, 'id>, ('k, 'v) => bool) => t<'k, 'v, 'id>
-
-let partitionU: (t<'k, 'v, 'id>, (. 'k, 'v) => bool) => (t<'k, 'v, 'id>, t<'k, 'v, 'id>)
-/**
-`partition(m, p)` returns a pair of maps `(m1, m2)`, where `m1` contains
-all the bindings of `s` that satisfy the predicate `p`, and `m2` is the map
-with all the bindings of `s` that do not satisfy `p`.
-*/
-let partition: (t<'k, 'v, 'id>, ('k, 'v) => bool) => (t<'k, 'v, 'id>, t<'k, 'v, 'id>)
-
-/** 
-`split(x, m)` returns a tuple `(l, r)`, data, where `l` is the map with all
-the bindings of `m` whose 'k is strictly less than `x`; `r` is the map with
-all the bindings of m whose 'k is strictly greater than `x`; `data` is
-`None` if `m` contains no binding for `x`, or `Some(v)` if `m` binds `v` to
-`x`.
-*/
-let split: (t<'k, 'v, 'id>, 'k) => ((t<'k, 'v, 'id>, t<'k, 'v, 'id>), option<'v>)
-
-let mapU: (t<'k, 'v, 'id>, (. 'v) => 'v2) => t<'k, 'v2, 'id>
-/** 
-`map(m, f) returns a map with same domain as`m`, where the associated
-value`a`of all bindings of`m`has been replaced by the result of the
-application of`f`to`a`. The bindings are passed to`f` in increasing order
-with respect to the ordering over the type of the keys. 
-*/
-let map: (t<'k, 'v, 'id>, 'v => 'v2) => t<'k, 'v2, 'id>
-
-let mapWithKeyU: (t<'k, 'v, 'id>, (. 'k, 'v) => 'v2) => t<'k, 'v2, 'id>
-/** 
-`mapWithKey(m, f)`
-
-The same as `Belt.Map.map` except that `f` is supplied with one more
-argument: the key.
-*/
-let mapWithKey: (t<'k, 'v, 'id>, ('k, 'v) => 'v2) => t<'k, 'v2, 'id>
-
-/** 
-`getData(s0)`
-
-Advanced usage only
-
-Returns the raw data (detached from comparator), but its type is still
-manifested, so that user can pass identity directly without boxing.
-*/
-let getData: t<'k, 'v, 'id> => Belt_MapDict.t<'k, 'v, 'id>
-
-/**
-Advanced usage only. Returns the identity of s0.
-*/
-let getId: t<'k, 'v, 'id> => id<'k, 'id>
-
-/** 
-`packIdData(~id, ~data)`
-
-Advanced usage only
-
-Returns the packed collection.
-*/
-let packIdData: (~id: id<'k, 'id>, ~data: Belt_MapDict.t<'k, 'v, 'id>) => t<'k, 'v, 'id>
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
diff --git a/jscomp/others/belt_MapDict.res b/jscomp/others/belt_MapDict.res
deleted file mode 100644
index 0b9dff9..0000000
--- a/jscomp/others/belt_MapDict.res
+++ /dev/null
@@ -1,294 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-
-type t<'key, 'a, 'id> = N.t<'key, 'a>
-
-type cmp<'key, 'id> = Belt_Id.cmp<'key, 'id>
-
-let empty = None
-let fromArray = N.fromArray
-let isEmpty = N.isEmpty
-let cmp = N.cmp
-let cmpU = N.cmpU
-let eq = N.eq
-let eqU = N.eqU
-let has = N.has
-
-let forEach = N.forEach
-let forEachU = N.forEachU
-let reduce = N.reduce
-let reduceU = N.reduceU
-let every = N.every
-let everyU = N.everyU
-let some = N.some
-let someU = N.someU
-
-let size = N.size
-let toList = N.toList
-let toArray = N.toArray
-let keysToArray = N.keysToArray
-let valuesToArray = N.valuesToArray
-
-let minimum = N.minimum
-let maximum = N.maximum
-let minKey = N.minKey
-let maxKey = N.maxKey
-let minKeyUndefined = N.minKeyUndefined
-let maxKeyUndefined = N.maxKeyUndefined
-let minUndefined = N.minUndefined
-let maxUndefined = N.maxUndefined
-let get = N.get
-let getUndefined = N.getUndefined
-let getWithDefault = N.getWithDefault
-let getExn = N.getExn
-
-let mapWithKey = N.mapWithKey
-let mapWithKeyU = N.mapWithKeyU
-
-let mapU = N.mapU
-let map = N.map
-let keep = N.keepShared
-let keepU = N.keepSharedU
-let partitionU = N.partitionSharedU
-let partition = N.partitionShared
-let checkInvariantInternal = N.checkInvariantInternal
-let rec set = (t: t<_>, newK, newD, ~cmp) =>
-  switch t {
-  | None => N.singleton(newK, newD)
-  | Some(n) =>
-    let k = n.N.key
-    let c = Belt_Id.getCmpInternal(cmp)(. newK, k)
-    if c == 0 {
-      Some(N.updateValue(n, newD))
-    } else {
-      let (l, r, v) = (n.N.left, n.N.right, n.N.value)
-      if c < 0 {
-        /* Worth optimize for reference equality? */
-        N.bal(set(~cmp, l, newK, newD), k, v, r)
-      } else {
-        N.bal(l, k, v, set(~cmp, r, newK, newD))
-      }
-    }
-  }
-
-let rec updateU = (t: t<_>, newK, f, ~cmp): t<_> =>
-  switch t {
-  | None =>
-    switch f(. None) {
-    | None => t
-    | Some(newD) => N.singleton(newK, newD)
-    }
-  | Some(n) =>
-    let k = n.N.key
-    let c = Belt_Id.getCmpInternal(cmp)(. newK, k)
-    if c == 0 {
-      switch f(. Some(n.N.value)) {
-      | None =>
-        let (l, r) = (n.N.left, n.N.right)
-        switch (l, r) {
-        | (None, _) => r
-        | (_, None) => l
-        | (_, Some(rn)) =>
-          let (kr, vr) = (ref(rn.key), ref(rn.value))
-          let r = N.removeMinAuxWithRef(rn, kr, vr)
-          N.bal(l, kr.contents, vr.contents, r)
-        }
-      | Some(newD) => Some(N.updateValue(n, newD))
-      }
-    } else {
-      let (l, r, v) = (n.N.left, n.N.right, n.N.value)
-      if c < 0 {
-        let ll = updateU(~cmp, l, newK, f)
-        if l === ll {
-          t
-        } else {
-          N.bal(ll, k, v, r)
-        }
-      } else {
-        let rr = updateU(~cmp, r, newK, f)
-        if r === rr {
-          t
-        } else {
-          N.bal(l, k, v, rr)
-        }
-      }
-    }
-  }
-
-let update = (t, newK, f, ~cmp) => updateU(t, newK, (. a) => f(a), ~cmp)
-
-/* unboxing API was not exported
-    since the correct API is really awkard
-    `bool -> 'k Js.null -> ('a Js.null * bool)`
-    even for specialized `k` the first `bool` can 
-    be erased, maybe the perf boost does not justify the inclusion of such API
-
-    `updateWithNull m x f`
-    the callback to `f exist v` 
-    when `v` is non-null,
-    `exist` is guaranteed to be true
-    `v` is guranteed to be `null`,
-    when `exist` is `true`, `v` could be `null`, 
-    since `'a` is polymorphic
-*/
-
-let rec removeAux0 = (n, x, ~cmp) => {
-  let {N.left: l, key: v, right: r} = n
-  let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-  if c == 0 {
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (_, Some(rn)) =>
-      let (kr, vr) = (ref(rn.key), ref(rn.value))
-      let r = N.removeMinAuxWithRef(rn, kr, vr)
-      N.bal(l, kr.contents, vr.contents, r)
-    }
-  } else if c < 0 {
-    switch l {
-    | None => Some(n) /* Nothing to remove */
-    | Some(left) =>
-      let ll = removeAux0(left, x, ~cmp)
-      if ll === l {
-        Some(n)
-      } else {
-        N.bal(ll, v, n.N.value, r)
-      }
-    }
-  } else {
-    switch r {
-    | None => Some(n) /* Nothing to remove */
-    | Some(right) =>
-      let rr = removeAux0(~cmp, right, x)
-      if rr === r {
-        Some(n)
-      } else {
-        N.bal(l, v, n.N.value, rr)
-      }
-    }
-  }
-}
-
-let remove = (n, x, ~cmp) =>
-  switch n {
-  | None => None
-  | Some(n) => removeAux0(n, x, ~cmp)
-  }
-
-let mergeMany = (h, arr, ~cmp) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let (key, value) = A.getUnsafe(arr, i)
-    v.contents = set(v.contents, ~cmp, key, value)
-  }
-  v.contents
-}
-
-let rec splitAuxPivot = (n, x, pres, ~cmp) => {
-  let {N.left: l, key: v, value: d, right: r} = n
-  let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-  if c == 0 {
-    pres.contents = Some(d)
-    (l, r)
-  } else if c < 0 {
-    switch l {
-    | None => (None, Some(n))
-    | Some(l) =>
-      let (ll, rl) = splitAuxPivot(~cmp, l, x, pres)
-      (ll, N.join(rl, v, d, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None)
-    | Some(r) =>
-      let (lr, rr) = splitAuxPivot(~cmp, r, x, pres)
-      (N.join(l, v, d, lr), rr)
-    }
-  }
-}
-
-let split = (n, x, ~cmp) =>
-  switch n {
-  | None => ((None, None), None)
-  | Some(n) =>
-    let pres = ref(None)
-    let v = splitAuxPivot(~cmp, n, x, pres)
-    (v, pres.contents)
-  }
-
-let findFirstByU = N.findFirstByU
-let findFirstBy = N.findFirstBy
-
-let rec mergeU = (s1, s2, f, ~cmp) =>
-  switch (s1, s2) {
-  | (None, None) => None
-  | (Some(_), None) => N.keepMapU(s1, (. k, v) => f(. k, Some(v), None))
-  | (None, Some(_)) => N.keepMapU(s2, (. k, v) => f(. k, None, Some(v)))
-  | (Some(s1n), Some(s2n)) =>
-    if s1n.height >= s2n.height {
-      let {N.left: l1, key: v1, value: d1, right: r1} = s1n
-      let d2 = ref(None)
-      let (l2, r2) = splitAuxPivot(~cmp, s2n, v1, d2)
-      let d2 = d2.contents
-      let newLeft = mergeU(~cmp, l1, l2, f)
-      let newD = f(. v1, Some(d1), d2)
-      let newRight = mergeU(~cmp, r1, r2, f)
-      N.concatOrJoin(newLeft, v1, newD, newRight)
-    } else {
-      let {N.left: l2, key: v2, value: d2, right: r2} = s2n
-      let d1 = ref(None)
-      let (l1, r1) = splitAuxPivot(~cmp, s1n, v2, d1)
-      let d1 = d1.contents
-      let newLeft = mergeU(~cmp, l1, l2, f)
-      let newD = f(. v2, d1, Some(d2))
-      let newRight = mergeU(~cmp, r1, r2, f)
-      N.concatOrJoin(newLeft, v2, newD, newRight)
-    }
-  }
-
-let merge = (s1, s2, f, ~cmp) => mergeU(s1, s2, (. a, b, c) => f(a, b, c), ~cmp)
-
-let rec removeMany0 = (t, xs, i, len, ~cmp) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = removeAux0(t, ele, ~cmp)
-    switch u {
-    | None => u
-    | Some(t) => removeMany0(t, xs, i + 1, len, ~cmp)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (t, keys, ~cmp) => {
-  let len = A.length(keys)
-  switch t {
-  | None => None
-  | Some(t) => removeMany0(t, keys, 0, len, ~cmp)
-  }
-}
diff --git a/jscomp/others/belt_MapDict.resi b/jscomp/others/belt_MapDict.resi
deleted file mode 100644
index 7dafef6..0000000
--- a/jscomp/others/belt_MapDict.resi
+++ /dev/null
@@ -1,234 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This module separates identity from data, it is a bit more verbose but
-slightly more efficient due to the fact that there is no need to pack
-identity and data back after each operation.
-
-**_Advanced usage only_**
-*/
-
-/*
-## Examples
-
-```rescript
-type t<'key, 'value, 'id>
-type cmp<'key, 'id> = Belt_Id.cmp<'key, 'id>
-```
-*/
-
-type t<'key, 'value, 'id>
-
-type cmp<'key, 'id> = Belt_Id.cmp<'key, 'id>
-
-let empty: t<'k, 'v, 'id>
-
-let isEmpty: t<'k, 'v, 'id> => bool
-
-let has: (t<'k, 'a, 'id>, 'k, ~cmp: cmp<'k, 'id>) => bool
-
-let cmpU: (t<'k, 'v, 'id>, t<'k, 'v, 'id>, ~kcmp: cmp<'k, 'id>, ~vcmp: (. 'v, 'v) => int) => int
-let cmp: (t<'k, 'v, 'id>, t<'k, 'v, 'id>, ~kcmp: cmp<'k, 'id>, ~vcmp: ('v, 'v) => int) => int
-
-let eqU: (t<'k, 'a, 'id>, t<'k, 'a, 'id>, ~kcmp: cmp<'k, 'id>, ~veq: (. 'a, 'a) => bool) => bool
-/**
-`eq(m1, m2, cmp)` tests whether the maps `m1` and `m2` are equal, that is,
-contain equal keys and associate them with equal data. `cmp` is the
-equality predicate used to compare the data associated with the keys. 
-*/
-let eq: (t<'k, 'a, 'id>, t<'k, 'a, 'id>, ~kcmp: cmp<'k, 'id>, ~veq: ('a, 'a) => bool) => bool
-
-let findFirstByU: (t<'k, 'v, 'id>, (. 'k, 'v) => bool) => option<('k, 'v)>
-/** 
-`findFirstBy(m, p)` uses function `f` to find the first key value pair to
-match predicate `p`.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-    type t = int
-    let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Map.Dict.fromArray([(4, "4"), (1, "1"), (2, "2"), (3, "3")], ~cmp=IntCmp.cmp)
-
-Belt.Map.Dict.findFirstBy(s0, (k, _) => k == 4) == Some((4, "4"))
-```
-*/
-let findFirstBy: (t<'k, 'v, 'id>, ('k, 'v) => bool) => option<('k, 'v)>
-
-let forEachU: (t<'k, 'a, 'id>, (. 'k, 'a) => unit) => unit
-/**
-`forEach(m, f)` applies `f` to all bindings in map `m`. `f` receives the
-key as first argument, and the associated value as second argument. The
-bindings are passed to `f` in increasing order with respect to the ordering
-over the type of the keys.
-*/
-let forEach: (t<'k, 'a, 'id>, ('k, 'a) => unit) => unit
-
-let reduceU: (t<'k, 'a, 'id>, 'b, (. 'b, 'k, 'a) => 'b) => 'b
-/**
-`reduce(m, a, f)` computes `f(kN, dN ... f(k1, d1, a)...)`, where `k1 ... kN` 
-are the keys of all bindings in `m` (in increasing order), and `d1 ... dN` 
-are the associated data.
-*/
-let reduce: (t<'k, 'a, 'id>, 'b, ('b, 'k, 'a) => 'b) => 'b
-
-let everyU: (t<'k, 'a, 'id>, (. 'k, 'a) => bool) => bool
-/** 
-`every(m, p)` checks if all the bindings of the map satisfy the predicate
-`p`. Order unspecified
-*/
-let every: (t<'k, 'a, 'id>, ('k, 'a) => bool) => bool
-
-let someU: (t<'k, 'a, 'id>, (. 'k, 'a) => bool) => bool
-/**
-`some(m, p)` checks if at least one binding of the map satisfy the
-predicate `p`. Order unspecified
-*/
-let some: (t<'k, 'a, 'id>, ('k, 'a) => bool) => bool
-
-let size: t<'k, 'a, 'id> => int
-
-/** In increasing order. */
-let toList: t<'k, 'a, 'id> => list<('k, 'a)>
-
-let toArray: t<'k, 'a, 'id> => array<('k, 'a)>
-
-let fromArray: (array<('k, 'a)>, ~cmp: cmp<'k, 'id>) => t<'k, 'a, 'id>
-
-let keysToArray: t<'k, 'a, 'id> => array<'k>
-
-let valuesToArray: t<'k, 'a, 'id> => array<'a>
-
-let minKey: t<'k, _, _> => option<'k>
-
-let minKeyUndefined: t<'k, _, _> => Js.undefined<'k>
-
-let maxKey: t<'k, _, _> => option<'k>
-
-let maxKeyUndefined: t<'k, _, _> => Js.undefined<'k>
-
-let minimum: t<'k, 'a, _> => option<('k, 'a)>
-
-let minUndefined: t<'k, 'a, _> => Js.undefined<('k, 'a)>
-
-let maximum: t<'k, 'a, _> => option<('k, 'a)>
-
-let maxUndefined: t<'k, 'a, _> => Js.undefined<('k, 'a)>
-
-let get: (t<'k, 'a, 'id>, 'k, ~cmp: cmp<'k, 'id>) => option<'a>
-
-let getUndefined: (t<'k, 'a, 'id>, 'k, ~cmp: cmp<'k, 'id>) => Js.undefined<'a>
-
-let getWithDefault: (t<'k, 'a, 'id>, 'k, 'a, ~cmp: cmp<'k, 'id>) => 'a
-
-let getExn: (t<'k, 'a, 'id>, 'k, ~cmp: cmp<'k, 'id>) => 'a
-
-let checkInvariantInternal: t<_> => unit
-
-/**
-`remove(m, x)` returns a map containing the same bindings as `m`, except
-for `x` which is unbound in the returned map.
-*/
-let remove: (t<'a, 'b, 'id>, 'a, ~cmp: cmp<'a, 'id>) => t<'a, 'b, 'id>
-
-let removeMany: (t<'a, 'b, 'id>, array<'a>, ~cmp: cmp<'a, 'id>) => t<'a, 'b, 'id>
-
-/**
-`set(m, x, y)` returns a map containing the same bindings as `m`, plus a
-binding of `x` to `y`. If `x` was already bound in `m`, its previous
-binding disappears.
-*/
-let set: (t<'a, 'b, 'id>, 'a, 'b, ~cmp: cmp<'a, 'id>) => t<'a, 'b, 'id>
-
-let updateU: (
-  t<'a, 'b, 'id>,
-  'a,
-  (. option<'b>) => option<'b>,
-  ~cmp: cmp<'a, 'id>,
-) => t<'a, 'b, 'id>
-let update: (t<'a, 'b, 'id>, 'a, option<'b> => option<'b>, ~cmp: cmp<'a, 'id>) => t<'a, 'b, 'id>
-
-let mergeU: (
-  t<'a, 'b, 'id>,
-  t<'a, 'c, 'id>,
-  (. 'a, option<'b>, option<'c>) => option<'d>,
-  ~cmp: cmp<'a, 'id>,
-) => t<'a, 'd, 'id>
-/** 
-`merge(m1, m2, f)` computes a map whose keys is a subset of keys of `m1`
-and of `m2`. The presence of each such binding, and the corresponding
-value, is determined with the function `f`.
-*/
-let merge: (
-  t<'a, 'b, 'id>,
-  t<'a, 'c, 'id>,
-  ('a, option<'b>, option<'c>) => option<'d>,
-  ~cmp: cmp<'a, 'id>,
-) => t<'a, 'd, 'id>
-
-let mergeMany: (t<'a, 'b, 'id>, array<('a, 'b)>, ~cmp: cmp<'a, 'id>) => t<'a, 'b, 'id>
-
-let keepU: (t<'k, 'a, 'id>, (. 'k, 'a) => bool) => t<'k, 'a, 'id>
-/**
-`keep(m, p)` returns the map with all the bindings in `m` that satisfy
-predicate `p`.
-*/
-let keep: (t<'k, 'a, 'id>, ('k, 'a) => bool) => t<'k, 'a, 'id>
-
-let partitionU: (t<'k, 'a, 'id>, (. 'k, 'a) => bool) => (t<'k, 'a, 'id>, t<'k, 'a, 'id>)
-/** 
-`partition(m, p)` returns a pair of maps `(m1, m2)`, where `m1` contains
-all the bindings of `s` that satisfy the predicate `p`, and `m2` is the map
-with all the bindings of `s` that do not satisfy `p`.
-*/
-let partition: (t<'k, 'a, 'id>, ('k, 'a) => bool) => (t<'k, 'a, 'id>, t<'k, 'a, 'id>)
-
-/** 
-`split(x, m)` returns a triple `(l, data, r)`, where `l` is the map with
-all the bindings of `m` whose key is strictly less than `x`; `r` is the map
-with all the bindings of `m` whose key is strictly greater than `x`; `data`
-is `None` if `m` contains no binding for `x`, or `Some(v)` if `m` binds `v`
-to `x`.
-*/
-let split: (
-  t<'a, 'b, 'id>,
-  'a,
-  ~cmp: cmp<'a, 'id>,
-) => ((t<'a, 'b, 'id>, t<'a, 'b, 'id>), option<'b>)
-
-let mapU: (t<'k, 'a, 'id>, (. 'a) => 'b) => t<'k, 'b, 'id>
-/** 
-`map(m, f)` returns a map with same domain as `m`, where the associated
-value `a` of all bindings of `m` has been replaced by the result of the
-application of `f` to `a`. The bindings are passed to `f` in increasing
-order with respect to the ordering over the type of the keys.
-*/
-let map: (t<'k, 'a, 'id>, 'a => 'b) => t<'k, 'b, 'id>
-
-let mapWithKeyU: (t<'k, 'a, 'id>, (. 'k, 'a) => 'b) => t<'k, 'b, 'id>
-let mapWithKey: (t<'k, 'a, 'id>, ('k, 'a) => 'b) => t<'k, 'b, 'id>
diff --git a/jscomp/others/belt_MapInt.res b/jscomp/others/belt_MapInt.res
deleted file mode 100644
index d560164..0000000
--- a/jscomp/others/belt_MapInt.res
+++ /dev/null
@@ -1,192 +0,0 @@
-type key = int
-module I = Belt_internalMapInt
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-
-type t<'a> = N.t<key, 'a>
-
-let empty = None
-let isEmpty = N.isEmpty
-/* let singleton = N.singleton */
-
-let minKey = N.minKey
-let minKeyUndefined = N.minKeyUndefined
-let maxKey = N.maxKey
-let maxKeyUndefined = N.maxKeyUndefined
-let minimum = N.minimum
-let minUndefined = N.minUndefined
-let maximum = N.maximum
-let maxUndefined = N.maxUndefined
-let forEachU = N.forEachU
-let forEach = N.forEach
-let mapU = N.mapU
-let map = N.map
-let mapWithKeyU = N.mapWithKeyU
-let mapWithKey = N.mapWithKey
-let reduceU = N.reduceU
-let reduce = N.reduce
-let everyU = N.everyU
-let every = N.every
-let someU = N.someU
-let some = N.some
-let keepU = N.keepSharedU
-let keep = N.keepShared
-let partitionU = N.partitionSharedU
-let partition = N.partitionShared
-let size = N.size
-let toList = N.toList
-let toArray = N.toArray
-let keysToArray = N.keysToArray
-let valuesToArray = N.valuesToArray
-let checkInvariantInternal = N.checkInvariantInternal
-
-let rec set = (t, newK: key, newD: _) =>
-  switch t {
-  | None => N.singleton(newK, newD)
-  | Some(n) =>
-    let k = n.N.key
-    if newK == k {
-      Some(N.updateValue(n, newD))
-    } else {
-      let v = n.N.value
-      if newK < k {
-        N.bal(set(n.N.left, newK, newD), k, v, n.N.right)
-      } else {
-        N.bal(n.N.left, k, v, set(n.N.right, newK, newD))
-      }
-    }
-  }
-
-let rec updateU = (t, x: key, f) =>
-  switch t {
-  | None =>
-    switch f(. None) {
-    | None => t
-    | Some(data) => N.singleton(x, data)
-    }
-  | Some(n) =>
-    let k = n.N.key
-    if x == k {
-      switch f(. Some(n.N.value)) {
-      | None =>
-        let {N.left: l, right: r} = n
-        switch (l, r) {
-        | (None, _) => r
-        | (_, None) => l
-        | (_, Some(rn)) =>
-          let (kr, vr) = (ref(rn.N.key), ref(rn.N.value))
-          let r = N.removeMinAuxWithRef(rn, kr, vr)
-          N.bal(l, kr.contents, vr.contents, r)
-        }
-      | Some(data) => Some(N.updateValue(n, data))
-      }
-    } else {
-      let {N.left: l, right: r, value: v} = n
-      if x < k {
-        let ll = updateU(l, x, f)
-        if l === ll {
-          t
-        } else {
-          N.bal(ll, k, v, r)
-        }
-      } else {
-        let rr = updateU(r, x, f)
-        if r === rr {
-          t
-        } else {
-          N.bal(l, k, v, rr)
-        }
-      }
-    }
-  }
-
-let update = (t, x, f) => updateU(t, x, (. a) => f(a))
-
-let rec removeAux = (n, x: key) => {
-  let {N.left: l, key: v, right: r} = n
-  if x == v {
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (_, Some(rn)) =>
-      let (kr, vr) = (ref(rn.N.key), ref(rn.N.value))
-      let r = N.removeMinAuxWithRef(rn, kr, vr)
-      N.bal(l, kr.contents, vr.contents, r)
-    }
-  } else if x < v {
-    switch l {
-    | None => Some(n)
-    | Some(left) =>
-      let ll = removeAux(left, x)
-      if ll === l {
-        Some(n)
-      } else {
-        open N
-        bal(ll, v, n.value, r)
-      }
-    }
-  } else {
-    switch r {
-    | None => Some(n)
-    | Some(right) =>
-      let rr = removeAux(right, x)
-      N.bal(l, v, n.N.value, rr)
-    }
-  }
-}
-
-let remove = (n, x) =>
-  switch n {
-  | None => None
-  | Some(n) => removeAux(n, x)
-  }
-
-let rec removeMany0 = (t, xs, i, len) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = removeAux(t, ele)
-    switch u {
-    | None => u
-    | Some(t) => removeMany0(t, xs, i + 1, len)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (t, keys) => {
-  let len = A.length(keys)
-  switch t {
-  | None => None
-  | Some(t) => removeMany0(t, keys, 0, len)
-  }
-}
-
-let findFirstByU = N.findFirstByU
-let findFirstBy = N.findFirstBy
-
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let (key, value) = A.getUnsafe(arr, i)
-    v.contents = set(v.contents, key, value)
-  }
-  v.contents
-}
-
-/* let mergeArray = mergeMany */
-
-let has = I.has
-let cmpU = I.cmpU
-let cmp = I.cmp
-let eqU = I.eqU
-let eq = I.eq
-let get = I.get
-let getUndefined = I.getUndefined
-let getWithDefault = I.getWithDefault
-let getExn = I.getExn
-let split = I.split
-let mergeU = I.mergeU
-let merge = I.merge
-let fromArray = I.fromArray
diff --git a/jscomp/others/belt_MapInt.resi b/jscomp/others/belt_MapInt.resi
deleted file mode 100644
index a4c1f60..0000000
--- a/jscomp/others/belt_MapInt.resi
+++ /dev/null
@@ -1,175 +0,0 @@
-type key = int
-
-/** The type of maps from type `key` to type `'value`. */
-type t<'value>
-
-let empty: t<'v>
-
-let isEmpty: t<'v> => bool
-
-let has: (t<'v>, key) => bool
-
-let cmpU: (t<'v>, t<'v>, (. 'v, 'v) => int) => int
-let cmp: (t<'v>, t<'v>, ('v, 'v) => int) => int
-
-let eqU: (t<'v>, t<'v>, (. 'v, 'v) => bool) => bool
-
-/**
-`eq(m1, m2)` tests whether the maps `m1` and `m2` are
-equal, that is, contain equal keys and associate them with
-equal data.
-*/
-let eq: (t<'v>, t<'v>, ('v, 'v) => bool) => bool
-
-let findFirstByU: (t<'v>, (. key, 'v) => bool) => option<(key, 'v)>
-
-/**
-`findFirstBy(m, p)` uses funcion `f` to find the first key value pair
-to match predicate `p`.
-
-```rescript
-let s0 = fromArray(~id=module(IntCmp), [(4, "4"), (1, "1"), (2, "2,"(3, ""))])
-findFirstBy(s0, (k, v) => k == 4) == option((4, "4"))
-```
-*/
-let findFirstBy: (t<'v>, (key, 'v) => bool) => option<(key, 'v)>
-
-let forEachU: (t<'v>, (. key, 'v) => unit) => unit
-
-/**
-`forEach(m, f)` applies `f` to all bindings in map `m`.
-`f` receives the key as first argument, and the associated value
-as second argument. The bindings are passed to `f` in increasing
-order with respect to the ordering over the type of the keys.
-*/
-let forEach: (t<'v>, (key, 'v) => unit) => unit
-
-let reduceU: (t<'v>, 'v2, (. 'v2, key, 'v) => 'v2) => 'v2
-
-/**
-`reduce(m, a, f)` computes `(f kN dN ... (f k1 d1 a)...)`,
-where `k1 ... kN` are the keys of all bindings in `m`
-(in increasing order), and `d1 ... dN` are the associated data.
-*/
-let reduce: (t<'v>, 'v2, ('v2, key, 'v) => 'v2) => 'v2
-
-let everyU: (t<'v>, (. key, 'v) => bool) => bool
-
-/** 
-`every(m, p)` checks if all the bindings of the map satisfy the predicate `p`.
-Order unspecified */
-let every: (t<'v>, (key, 'v) => bool) => bool
-
-let someU: (t<'v>, (. key, 'v) => bool) => bool
-
-/** 
-`some(m, p)` checks if at least one binding of the map satisfy the predicate
-`p`. Order unspecified */
-let some: (t<'v>, (key, 'v) => bool) => bool
-
-let size: t<'v> => int
-
-/** In increasing order. */
-let toList: t<'v> => list<(key, 'v)>
-
-let toArray: t<'v> => array<(key, 'v)>
-
-let fromArray: array<(key, 'v)> => t<'v>
-
-let keysToArray: t<'v> => array<key>
-
-let valuesToArray: t<'v> => array<'v>
-
-let minKey: t<_> => option<key>
-
-let minKeyUndefined: t<_> => Js.undefined<key>
-
-let maxKey: t<_> => option<key>
-
-let maxKeyUndefined: t<_> => Js.undefined<key>
-
-let minimum: t<'v> => option<(key, 'v)>
-
-let minUndefined: t<'v> => Js.undefined<(key, 'v)>
-
-let maximum: t<'v> => option<(key, 'v)>
-
-let maxUndefined: t<'v> => Js.undefined<(key, 'v)>
-
-let get: (t<'v>, key) => option<'v>
-
-let getUndefined: (t<'v>, key) => Js.undefined<'v>
-
-let getWithDefault: (t<'v>, key, 'v) => 'v
-
-let getExn: (t<'v>, key) => 'v
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
-
-/** `remove m x` returns a map containing the same bindings as
-    `m`, except for `x` which is unbound in the returned map. */
-let remove: (t<'v>, key) => t<'v>
-
-let removeMany: (t<'v>, array<key>) => t<'v>
-
-/**
-`set(m, x, y)` returns a map containing the same bindings as
-`m`, plus a binding of `x` to `y`. If `x` was already bound
-in `m`, its previous binding disappears.
-*/
-let set: (t<'v>, key, 'v) => t<'v>
-
-let updateU: (t<'v>, key, (. option<'v>) => option<'v>) => t<'v>
-let update: (t<'v>, key, option<'v> => option<'v>) => t<'v>
-
-let mergeU: (t<'v>, t<'v2>, (. key, option<'v>, option<'v2>) => option<'c>) => t<'c>
-
-/**
-`merge(m1, m2, f)` computes a map whose keys is a subset of keys of `m1`
-and of `m2`. The presence of each such binding, and the corresponding
-value, is determined with the function `f`.
-*/
-let merge: (t<'v>, t<'v2>, (key, option<'v>, option<'v2>) => option<'c>) => t<'c>
-
-let mergeMany: (t<'v>, array<(key, 'v)>) => t<'v>
-
-let keepU: (t<'v>, (. key, 'v) => bool) => t<'v>
-
-/** 
-`keep(m, p)` returns the map with all the bindings in `m` that satisfy predicate
-`p`.
-*/
-let keep: (t<'v>, (key, 'v) => bool) => t<'v>
-
-let partitionU: (t<'v>, (. key, 'v) => bool) => (t<'v>, t<'v>)
-
-/**
-`partition(m, p)` returns a pair of maps `(m1, m2)`, where `m1` contains all the
-bindings of `s` that satisfy the predicate `p`, and `m2` is the map with all the
-bindings of `s` that do not satisfy `p`.
-*/
-let partition: (t<'v>, (key, 'v) => bool) => (t<'v>, t<'v>)
-
-/**
-`split(x, m)` returns a triple `(l, data, r)`, where `l` is the map with all the
-bindings of `m` whose key is strictly less than `x`; `r` is the map with all the
-bindings of `m` whose key is strictly greater than `x`; `data` is `None` if `m`
-contains no binding for `x`, or `Some(v)` if `m` binds `v` to `x`.
-*/
-let split: (key, t<'v>) => (t<'v>, option<'v>, t<'v>)
-
-let mapU: (t<'v>, (. 'v) => 'v2) => t<'v2>
-
-/**
-`map(m, f)` returns a map with same domain as `m`, where the associated value `a`
-of all bindings of `m` has been replaced by the result of the application of `f`
-to `a`. The bindings are passed to `f` in increasing order with respect to the
-ordering over the type of the keys.
-*/
-let map: (t<'v>, 'v => 'v2) => t<'v2>
-
-let mapWithKeyU: (t<'v>, (. key, 'v) => 'v2) => t<'v2>
-let mapWithKey: (t<'v>, (key, 'v) => 'v2) => t<'v2>
diff --git a/jscomp/others/belt_MapString.res b/jscomp/others/belt_MapString.res
deleted file mode 100644
index 460e6a4..0000000
--- a/jscomp/others/belt_MapString.res
+++ /dev/null
@@ -1,192 +0,0 @@
-type key = string
-module I = Belt_internalMapString
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-
-type t<'a> = N.t<key, 'a>
-
-let empty = None
-let isEmpty = N.isEmpty
-/* let singleton = N.singleton */
-
-let minKey = N.minKey
-let minKeyUndefined = N.minKeyUndefined
-let maxKey = N.maxKey
-let maxKeyUndefined = N.maxKeyUndefined
-let minimum = N.minimum
-let minUndefined = N.minUndefined
-let maximum = N.maximum
-let maxUndefined = N.maxUndefined
-let forEachU = N.forEachU
-let forEach = N.forEach
-let mapU = N.mapU
-let map = N.map
-let mapWithKeyU = N.mapWithKeyU
-let mapWithKey = N.mapWithKey
-let reduceU = N.reduceU
-let reduce = N.reduce
-let everyU = N.everyU
-let every = N.every
-let someU = N.someU
-let some = N.some
-let keepU = N.keepSharedU
-let keep = N.keepShared
-let partitionU = N.partitionSharedU
-let partition = N.partitionShared
-let size = N.size
-let toList = N.toList
-let toArray = N.toArray
-let keysToArray = N.keysToArray
-let valuesToArray = N.valuesToArray
-let checkInvariantInternal = N.checkInvariantInternal
-
-let rec set = (t, newK: key, newD: _) =>
-  switch t {
-  | None => N.singleton(newK, newD)
-  | Some(n) =>
-    let k = n.N.key
-    if newK == k {
-      Some(N.updateValue(n, newD))
-    } else {
-      let v = n.N.value
-      if newK < k {
-        N.bal(set(n.N.left, newK, newD), k, v, n.N.right)
-      } else {
-        N.bal(n.N.left, k, v, set(n.N.right, newK, newD))
-      }
-    }
-  }
-
-let rec updateU = (t, x: key, f) =>
-  switch t {
-  | None =>
-    switch f(. None) {
-    | None => t
-    | Some(data) => N.singleton(x, data)
-    }
-  | Some(n) =>
-    let k = n.N.key
-    if x == k {
-      switch f(. Some(n.N.value)) {
-      | None =>
-        let {N.left: l, right: r} = n
-        switch (l, r) {
-        | (None, _) => r
-        | (_, None) => l
-        | (_, Some(rn)) =>
-          let (kr, vr) = (ref(rn.N.key), ref(rn.N.value))
-          let r = N.removeMinAuxWithRef(rn, kr, vr)
-          N.bal(l, kr.contents, vr.contents, r)
-        }
-      | Some(data) => Some(N.updateValue(n, data))
-      }
-    } else {
-      let {N.left: l, right: r, value: v} = n
-      if x < k {
-        let ll = updateU(l, x, f)
-        if l === ll {
-          t
-        } else {
-          N.bal(ll, k, v, r)
-        }
-      } else {
-        let rr = updateU(r, x, f)
-        if r === rr {
-          t
-        } else {
-          N.bal(l, k, v, rr)
-        }
-      }
-    }
-  }
-
-let update = (t, x, f) => updateU(t, x, (. a) => f(a))
-
-let rec removeAux = (n, x: key) => {
-  let {N.left: l, key: v, right: r} = n
-  if x == v {
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (_, Some(rn)) =>
-      let (kr, vr) = (ref(rn.N.key), ref(rn.N.value))
-      let r = N.removeMinAuxWithRef(rn, kr, vr)
-      N.bal(l, kr.contents, vr.contents, r)
-    }
-  } else if x < v {
-    switch l {
-    | None => Some(n)
-    | Some(left) =>
-      let ll = removeAux(left, x)
-      if ll === l {
-        Some(n)
-      } else {
-        open N
-        bal(ll, v, n.value, r)
-      }
-    }
-  } else {
-    switch r {
-    | None => Some(n)
-    | Some(right) =>
-      let rr = removeAux(right, x)
-      N.bal(l, v, n.N.value, rr)
-    }
-  }
-}
-
-let remove = (n, x) =>
-  switch n {
-  | None => None
-  | Some(n) => removeAux(n, x)
-  }
-
-let rec removeMany0 = (t, xs, i, len) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = removeAux(t, ele)
-    switch u {
-    | None => u
-    | Some(t) => removeMany0(t, xs, i + 1, len)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (t, keys) => {
-  let len = A.length(keys)
-  switch t {
-  | None => None
-  | Some(t) => removeMany0(t, keys, 0, len)
-  }
-}
-
-let findFirstByU = N.findFirstByU
-let findFirstBy = N.findFirstBy
-
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let (key, value) = A.getUnsafe(arr, i)
-    v.contents = set(v.contents, key, value)
-  }
-  v.contents
-}
-
-/* let mergeArray = mergeMany */
-
-let has = I.has
-let cmpU = I.cmpU
-let cmp = I.cmp
-let eqU = I.eqU
-let eq = I.eq
-let get = I.get
-let getUndefined = I.getUndefined
-let getWithDefault = I.getWithDefault
-let getExn = I.getExn
-let split = I.split
-let mergeU = I.mergeU
-let merge = I.merge
-let fromArray = I.fromArray
diff --git a/jscomp/others/belt_MapString.resi b/jscomp/others/belt_MapString.resi
deleted file mode 100644
index 5cd8792..0000000
--- a/jscomp/others/belt_MapString.resi
+++ /dev/null
@@ -1,175 +0,0 @@
-type key = string
-
-/** The type of maps from type `key` to type `'value`. */
-type t<'value>
-
-let empty: t<'v>
-
-let isEmpty: t<'v> => bool
-
-let has: (t<'v>, key) => bool
-
-let cmpU: (t<'v>, t<'v>, (. 'v, 'v) => int) => int
-let cmp: (t<'v>, t<'v>, ('v, 'v) => int) => int
-
-let eqU: (t<'v>, t<'v>, (. 'v, 'v) => bool) => bool
-
-/**
-`eq(m1, m2)` tests whether the maps `m1` and `m2` are
-equal, that is, contain equal keys and associate them with
-equal data.
-*/
-let eq: (t<'v>, t<'v>, ('v, 'v) => bool) => bool
-
-let findFirstByU: (t<'v>, (. key, 'v) => bool) => option<(key, 'v)>
-
-/**
-`findFirstBy(m, p)` uses funcion `f` to find the first key value pair
-to match predicate `p`.
-
-```rescript
-let s0 = fromArray(~id=module(IntCmp), [(4, "4"), (1, "1"), (2, "2,"(3, ""))])
-findFirstBy(s0, (k, v) => k == 4) == option((4, "4"))
-```
-*/
-let findFirstBy: (t<'v>, (key, 'v) => bool) => option<(key, 'v)>
-
-let forEachU: (t<'v>, (. key, 'v) => unit) => unit
-
-/**
-`forEach(m, f)` applies `f` to all bindings in map `m`.
-`f` receives the key as first argument, and the associated value
-as second argument. The bindings are passed to `f` in increasing
-order with respect to the ordering over the type of the keys.
-*/
-let forEach: (t<'v>, (key, 'v) => unit) => unit
-
-let reduceU: (t<'v>, 'v2, (. 'v2, key, 'v) => 'v2) => 'v2
-
-/**
-`reduce(m, a, f)` computes `(f kN dN ... (f k1 d1 a)...)`,
-where `k1 ... kN` are the keys of all bindings in `m`
-(in increasing order), and `d1 ... dN` are the associated data.
-*/
-let reduce: (t<'v>, 'v2, ('v2, key, 'v) => 'v2) => 'v2
-
-let everyU: (t<'v>, (. key, 'v) => bool) => bool
-
-/** 
-`every(m, p)` checks if all the bindings of the map satisfy the predicate `p`.
-Order unspecified */
-let every: (t<'v>, (key, 'v) => bool) => bool
-
-let someU: (t<'v>, (. key, 'v) => bool) => bool
-
-/** 
-`some(m, p)` checks if at least one binding of the map satisfy the predicate
-`p`. Order unspecified */
-let some: (t<'v>, (key, 'v) => bool) => bool
-
-let size: t<'v> => int
-
-/** In increasing order. */
-let toList: t<'v> => list<(key, 'v)>
-
-let toArray: t<'v> => array<(key, 'v)>
-
-let fromArray: array<(key, 'v)> => t<'v>
-
-let keysToArray: t<'v> => array<key>
-
-let valuesToArray: t<'v> => array<'v>
-
-let minKey: t<_> => option<key>
-
-let minKeyUndefined: t<_> => Js.undefined<key>
-
-let maxKey: t<_> => option<key>
-
-let maxKeyUndefined: t<_> => Js.undefined<key>
-
-let minimum: t<'v> => option<(key, 'v)>
-
-let minUndefined: t<'v> => Js.undefined<(key, 'v)>
-
-let maximum: t<'v> => option<(key, 'v)>
-
-let maxUndefined: t<'v> => Js.undefined<(key, 'v)>
-
-let get: (t<'v>, key) => option<'v>
-
-let getUndefined: (t<'v>, key) => Js.undefined<'v>
-
-let getWithDefault: (t<'v>, key, 'v) => 'v
-
-let getExn: (t<'v>, key) => 'v
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
-
-/** `remove m x` returns a map containing the same bindings as
-    `m`, except for `x` which is unbound in the returned map. */
-let remove: (t<'v>, key) => t<'v>
-
-let removeMany: (t<'v>, array<key>) => t<'v>
-
-/**
-`set(m, x, y)` returns a map containing the same bindings as
-`m`, plus a binding of `x` to `y`. If `x` was already bound
-in `m`, its previous binding disappears.
-*/
-let set: (t<'v>, key, 'v) => t<'v>
-
-let updateU: (t<'v>, key, (. option<'v>) => option<'v>) => t<'v>
-let update: (t<'v>, key, option<'v> => option<'v>) => t<'v>
-
-let mergeU: (t<'v>, t<'v2>, (. key, option<'v>, option<'v2>) => option<'c>) => t<'c>
-
-/**
-`merge(m1, m2, f)` computes a map whose keys is a subset of keys of `m1`
-and of `m2`. The presence of each such binding, and the corresponding
-value, is determined with the function `f`.
-*/
-let merge: (t<'v>, t<'v2>, (key, option<'v>, option<'v2>) => option<'c>) => t<'c>
-
-let mergeMany: (t<'v>, array<(key, 'v)>) => t<'v>
-
-let keepU: (t<'v>, (. key, 'v) => bool) => t<'v>
-
-/** 
-`keep(m, p)` returns the map with all the bindings in `m` that satisfy predicate
-`p`.
-*/
-let keep: (t<'v>, (key, 'v) => bool) => t<'v>
-
-let partitionU: (t<'v>, (. key, 'v) => bool) => (t<'v>, t<'v>)
-
-/**
-`partition(m, p)` returns a pair of maps `(m1, m2)`, where `m1` contains all the
-bindings of `s` that satisfy the predicate `p`, and `m2` is the map with all the
-bindings of `s` that do not satisfy `p`.
-*/
-let partition: (t<'v>, (key, 'v) => bool) => (t<'v>, t<'v>)
-
-/**
-`split(x, m)` returns a triple `(l, data, r)`, where `l` is the map with all the
-bindings of `m` whose key is strictly less than `x`; `r` is the map with all the
-bindings of `m` whose key is strictly greater than `x`; `data` is `None` if `m`
-contains no binding for `x`, or `Some(v)` if `m` binds `v` to `x`.
-*/
-let split: (key, t<'v>) => (t<'v>, option<'v>, t<'v>)
-
-let mapU: (t<'v>, (. 'v) => 'v2) => t<'v2>
-
-/**
-`map(m, f)` returns a map with same domain as `m`, where the associated value `a`
-of all bindings of `m` has been replaced by the result of the application of `f`
-to `a`. The bindings are passed to `f` in increasing order with respect to the
-ordering over the type of the keys.
-*/
-let map: (t<'v>, 'v => 'v2) => t<'v2>
-
-let mapWithKeyU: (t<'v>, (. key, 'v) => 'v2) => t<'v2>
-let mapWithKey: (t<'v>, (key, 'v) => 'v2) => t<'v2>
diff --git a/jscomp/others/belt_MutableMap.res b/jscomp/others/belt_MutableMap.res
deleted file mode 100644
index ba367b4..0000000
--- a/jscomp/others/belt_MutableMap.res
+++ /dev/null
@@ -1,235 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module Int = Belt_MutableMapInt
-module String = Belt_MutableMapString
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-
-type id<'key, 'id> = Belt_Id.comparable<'key, 'id>
-type cmp<'key, 'id> = Belt_Id.cmp<'key, 'id>
-
-type t<'k, 'v, 'id> = {
-  cmp: cmp<'k, 'id>,
-  mutable data: N.t<'k, 'v>,
-}
-
-let rec removeMutateAux = (nt, x, ~cmp) => {
-  let k = nt.N.key
-  let c = Belt_Id.getCmpInternal(cmp)(. x, k)
-  if c == 0 {
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (Some(_), Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    | (None, Some(_)) => r
-    | (Some(_) | None, None) => l
-    }
-  } else if c < 0 {
-    switch nt.N.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = removeMutateAux(~cmp, l, x)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = removeMutateAux(~cmp, r, x)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let remove = (d, k) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(oldRoot2) =>
-    let newRoot = removeMutateAux(~cmp=d.cmp, oldRoot2, k)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-let rec removeArrayMutateAux = (t, xs, i, len, ~cmp) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = removeMutateAux(t, ele, ~cmp)
-    switch u {
-    | None => None
-    | Some(t) => removeArrayMutateAux(t, xs, i + 1, len, ~cmp)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (d, xs) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(nt) =>
-    let len = A.length(xs)
-    let newRoot = removeArrayMutateAux(nt, xs, 0, len, ~cmp=d.cmp)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-let rec updateDone = (t, x, f, ~cmp) =>
-  switch t {
-  | None =>
-    switch f(. None) {
-    | Some(data) => N.singleton(x, data)
-    | None => t
-    }
-  | Some(nt) =>
-    let k = nt.N.key
-    let c = Belt_Id.getCmpInternal(cmp)(. x, k)
-    if c == 0 {
-      switch f(. Some(nt.value)) {
-      | None =>
-        let {N.left: l, right: r} = nt
-        switch (l, r) {
-        | (Some(_), Some(nr)) =>
-          nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-          Some(N.balMutate(nt))
-        | (None, Some(_)) => r
-        | (Some(_) | None, None) => l
-        }
-      | Some(data) =>
-        nt.value = data
-        Some(nt)
-      }
-    } else {
-      if c < 0 {
-        nt.left = updateDone(nt.left, x, f, ~cmp)
-      } else {
-        nt.right = updateDone(nt.right, x, f, ~cmp)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-let updateU = (t, x, f) => {
-  let oldRoot = t.data
-  let newRoot = updateDone(oldRoot, x, f, ~cmp=t.cmp)
-  if newRoot !== oldRoot {
-    t.data = newRoot
-  }
-}
-let update = (t, x, f) => updateU(t, x, (. a) => f(a))
-
-let make = (type key identity, ~id: id<key, identity>) => {
-  module M = unpack(id)
-  {cmp: M.cmp, data: None}
-}
-
-let clear = m => m.data = None
-
-let isEmpty = d => N.isEmpty(d.data)
-
-let minKey = m => N.minKey(m.data)
-let minKeyUndefined = m => N.minKeyUndefined(m.data)
-let maxKey = m => N.maxKey(m.data)
-let maxKeyUndefined = m => N.maxKeyUndefined(m.data)
-let minimum = m => N.minimum(m.data)
-let minUndefined = m => N.minUndefined(m.data)
-let maximum = m => N.maximum(m.data)
-let maxUndefined = m => N.maxUndefined(m.data)
-
-let forEachU = (d, f) => N.forEachU(d.data, f)
-let forEach = (d, f) => forEachU(d, (. a, b) => f(a, b))
-let reduceU = (d, acc, cb) => N.reduceU(d.data, acc, cb)
-let reduce = (d, acc, cb) => reduceU(d, acc, (. a, b, c) => cb(a, b, c))
-let everyU = (d, p) => N.everyU(d.data, p)
-let every = (d, p) => everyU(d, (. a, b) => p(a, b))
-let someU = (d, p) => N.someU(d.data, p)
-let some = (d, p) => someU(d, (. a, b) => p(a, b))
-let size = d => N.size(d.data)
-let toList = d => N.toList(d.data)
-let toArray = d => N.toArray(d.data)
-let keysToArray = d => N.keysToArray(d.data)
-let valuesToArray = d => N.valuesToArray(d.data)
-
-/* let fromSortedArrayUnsafe (type key) (type identity) ~(id : (key,identity) id) xs : _ t =
-  let module M = (val id) in 
-  S.t ~data:(N.fromSortedArrayUnsafe xs) ~cmp:M.cmp */
-
-let checkInvariantInternal = d => N.checkInvariantInternal(d.data)
-
-let cmpU = (m1, m2, cmp) => N.cmpU(~kcmp=m1.cmp, ~vcmp=cmp, m1.data, m2.data)
-let cmp = (m1, m2, cmp) => cmpU(m1, m2, (. a, b) => cmp(a, b))
-
-let eqU = (m1, m2, cmp) => N.eqU(~kcmp=m1.cmp, ~veq=cmp, m1.data, m2.data)
-let eq = (m1, m2, cmp) => eqU(m1, m2, (. a, b) => cmp(a, b))
-
-let mapU = (m, f) => {cmp: m.cmp, data: N.mapU(m.data, f)}
-let map = (m, f) => mapU(m, (. a) => f(a))
-let mapWithKeyU = (m, f) => {cmp: m.cmp, data: N.mapWithKeyU(m.data, f)}
-let mapWithKey = (m, f) => mapWithKeyU(m, (. a, b) => f(a, b))
-let get = (m, x) => N.get(~cmp=m.cmp, m.data, x)
-
-let getUndefined = (m, x) => N.getUndefined(~cmp=m.cmp, m.data, x)
-
-let getWithDefault = (m, x, def) => N.getWithDefault(~cmp=m.cmp, m.data, x, def)
-
-let getExn = (m, x) => N.getExn(~cmp=m.cmp, m.data, x)
-
-let has = (m, x) => N.has(~cmp=m.cmp, m.data, x)
-
-let fromArray = (type k identity, data, ~id: id<k, identity>) => {
-  module M = unpack(id)
-  let cmp = M.cmp
-  {cmp, data: N.fromArray(~cmp, data)}
-}
-
-let set = (m, e, v) => {
-  let oldRoot = m.data
-  let newRoot = N.updateMutate(~cmp=m.cmp, oldRoot, e, v)
-  if newRoot !== oldRoot {
-    m.data = newRoot
-  }
-}
-
-let mergeManyAux = (t, xs, ~cmp) => {
-  let v = ref(t)
-  for i in 0 to A.length(xs) - 1 {
-    let (key, value) = A.getUnsafe(xs, i)
-    v.contents = N.updateMutate(v.contents, key, value, ~cmp)
-  }
-  v.contents
-}
-
-let mergeMany = (d, xs) => {
-  let oldRoot = d.data
-  let newRoot = mergeManyAux(oldRoot, xs, ~cmp=d.cmp)
-  if newRoot !== oldRoot {
-    d.data = newRoot
-  }
-}
diff --git a/jscomp/others/belt_MutableMap.resi b/jscomp/others/belt_MutableMap.resi
deleted file mode 100644
index 5451272..0000000
--- a/jscomp/others/belt_MutableMap.resi
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module Int = Belt_MutableMapInt
-
-module String = Belt_MutableMapString
-
-/***
-A mutable sorted map module which allows customize compare behavior.
-
-Same as `Belt.Map`, but mutable.
-*/
-
-/*
-## Examples
-
-```rescript
-type t<'k, 'v, 'id>
-type id<'key, 'id> = Belt_Id.comparable<'key, 'id>
-```
-*/
-
-type t<'k, 'v, 'id>
-type id<'key, 'id> = Belt_Id.comparable<'key, 'id>
-
-let make: (~id: id<'k, 'id>) => t<'k, 'a, 'id>
-let clear: t<_> => unit
-let isEmpty: t<_> => bool
-let has: (t<'k, _, _>, 'k) => bool
-
-let cmpU: (t<'k, 'a, 'id>, t<'k, 'a, 'id>, (. 'a, 'a) => int) => int
-/**
-`cmp(m1, m2, cmp)` First compare by size, if size is the same, compare by
-key, value pair.
-*/
-let cmp: (t<'k, 'a, 'id>, t<'k, 'a, 'id>, ('a, 'a) => int) => int
-
-let eqU: (t<'k, 'a, 'id>, t<'k, 'a, 'id>, (. 'a, 'a) => bool) => bool
-/**
-`eq(m1, m2, eqf)` tests whether the maps `m1` and `m2` are equal, that is,
-contain equal keys and associate them with equal data. `eqf` is the
-equality predicate used to compare the data associated with the keys.
-*/
-let eq: (t<'k, 'a, 'id>, t<'k, 'a, 'id>, ('a, 'a) => bool) => bool
-
-let forEachU: (t<'k, 'a, 'id>, (. 'k, 'a) => unit) => unit
-/**
-`forEach(m, f)` applies f to all bindings in map `m`. `f` receives the `'k`
-as first argument, and the associated value as second argument. The
-bindings are passed to `f` in increasing order with respect to the ordering
-over the type of the keys.
-*/
-let forEach: (t<'k, 'a, 'id>, ('k, 'a) => unit) => unit
-
-let reduceU: (t<'k, 'a, 'id>, 'b, (. 'b, 'k, 'a) => 'b) => 'b
-/**
-`reduce(m, a, f), computes`(f(kN, dN) ... (f(k1, d1, a))...)`, where`k1 ...
-kN`are the keys of all bindings in`m`(in increasing order), and`d1 ... dN`
-are the associated data.
-*/
-let reduce: (t<'k, 'a, 'id>, 'b, ('b, 'k, 'a) => 'b) => 'b
-
-let everyU: (t<'k, 'a, 'id>, (. 'k, 'a) => bool) => bool
-/**
-`every(m, p)` checks if all the bindings of the map satisfy the predicate `p`.
-*/
-let every: (t<'k, 'a, 'id>, ('k, 'a) => bool) => bool
-
-let someU: (t<'k, 'a, 'id>, (. 'k, 'a) => bool) => bool
-/**
-`some(m, p)` checks if at least one binding of the map satisfy the predicate `p`.
-*/
-let some: (t<'k, 'a, 'id>, ('k, 'a) => bool) => bool
-
-let size: t<'k, 'a, 'id> => int
-
-/** In increasing order. */
-let toList: t<'k, 'a, 'id> => list<('k, 'a)>
-
-let toArray: t<'k, 'a, 'id> => array<('k, 'a)>
-
-let fromArray: (array<('k, 'a)>, ~id: id<'k, 'id>) => t<'k, 'a, 'id>
-let keysToArray: t<'k, _, _> => array<'k>
-let valuesToArray: t<_, 'a, _> => array<'a>
-let minKey: t<'k, _, _> => option<'k>
-let minKeyUndefined: t<'k, _, _> => Js.undefined<'k>
-let maxKey: t<'k, _, _> => option<'k>
-let maxKeyUndefined: t<'k, _, _> => Js.undefined<'k>
-let minimum: t<'k, 'a, _> => option<('k, 'a)>
-let minUndefined: t<'k, 'a, _> => Js.undefined<('k, 'a)>
-let maximum: t<'k, 'a, _> => option<('k, 'a)>
-let maxUndefined: t<'k, 'a, _> => Js.undefined<('k, 'a)>
-let get: (t<'k, 'a, 'id>, 'k) => option<'a>
-let getUndefined: (t<'k, 'a, 'id>, 'k) => Js.undefined<'a>
-let getWithDefault: (t<'k, 'a, 'id>, 'k, 'a) => 'a
-let getExn: (t<'k, 'a, 'id>, 'k) => 'a
-/** Raise when invariant is not held. */
-let checkInvariantInternal: t<_> => unit
-
-/* ************************************************************************** */
-
-/* TODO: add functional `merge, partition, keep, split` */
-
-/** `remove(m, x)` do the in-place modification. */
-let remove: (t<'k, 'a, 'id>, 'k) => unit
-
-let removeMany: (t<'k, 'a, 'id>, array<'k>) => unit
-
-/** `set(m, x, y)` do the in-place modification */
-let set: (t<'k, 'a, 'id>, 'k, 'a) => unit
-
-let updateU: (t<'k, 'a, 'id>, 'k, (. option<'a>) => option<'a>) => unit
-let update: (t<'k, 'a, 'id>, 'k, option<'a> => option<'a>) => unit
-
-let mergeMany: (t<'k, 'a, 'id>, array<('k, 'a)>) => unit
-
-let mapU: (t<'k, 'a, 'id>, (. 'a) => 'b) => t<'k, 'b, 'id>
-/**
-`map(m, f)` returns a map with same domain as `m`, where the associated
-value a of all bindings of `m` has been replaced by the result of the
-application of `f` to `a`. The bindings are passed to `f` in increasing
-order with respect to the ordering over the type of the keys.
-*/
-let map: (t<'k, 'a, 'id>, 'a => 'b) => t<'k, 'b, 'id>
-
-let mapWithKeyU: (t<'k, 'a, 'id>, (. 'k, 'a) => 'b) => t<'k, 'b, 'id>
-let mapWithKey: (t<'k, 'a, 'id>, ('k, 'a) => 'b) => t<'k, 'b, 'id>
diff --git a/jscomp/others/belt_MutableMapInt.res b/jscomp/others/belt_MutableMapInt.res
deleted file mode 100644
index a8e7d69..0000000
--- a/jscomp/others/belt_MutableMapInt.res
+++ /dev/null
@@ -1,176 +0,0 @@
-module I = Belt_internalMapInt
-type key = int
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-
-type t<'a> = {mutable data: I.t<'a>}
-
-let make = () => {data: None}
-let isEmpty = m => N.isEmpty(m.data)
-let clear = m => m.data = None
-/* let singleton k v = t ~data:(N.singleton k v) */
-
-let minKeyUndefined = m => N.minKeyUndefined(m.data)
-let minKey = m => N.minKey(m.data)
-let maxKeyUndefined = m => N.maxKeyUndefined(m.data)
-let maxKey = m => N.maxKey(m.data)
-let minimum = m => N.minimum(m.data)
-let minUndefined = m => N.minUndefined(m.data)
-let maximum = m => N.maximum(m.data)
-let maxUndefined = m => N.maxUndefined(m.data)
-
-let set = (m: t<_>, k, v) => {
-  let old_data = m.data
-  let v = I.addMutate(old_data, k, v)
-  if v !== old_data {
-    m.data = v
-  }
-}
-
-let forEachU = (d, f) => N.forEachU(d.data, f)
-let forEach = (d, f) => forEachU(d, (. a, b) => f(a, b))
-let mapU = (d, f) => {data: N.mapU(d.data, f)}
-let map = (d, f) => mapU(d, (. a) => f(a))
-let mapWithKeyU = (d, f) => {data: N.mapWithKeyU(d.data, f)}
-let mapWithKey = (d, f) => mapWithKeyU(d, (. a, b) => f(a, b))
-let reduceU = (d, acc, f) => N.reduceU(d.data, acc, f)
-let reduce = (d, acc, f) => reduceU(d, acc, (. a, b, c) => f(a, b, c))
-let everyU = (d, f) => N.everyU(d.data, f)
-let every = (d, f) => everyU(d, (. a, b) => f(a, b))
-let someU = (d, f) => N.someU(d.data, f)
-let some = (d, f) => someU(d, (. a, b) => f(a, b))
-let size = d => N.size(d.data)
-let toList = d => N.toList(d.data)
-let toArray = d => N.toArray(d.data)
-let keysToArray = d => N.keysToArray(d.data)
-let valuesToArray = d => N.valuesToArray(d.data)
-let checkInvariantInternal = d => N.checkInvariantInternal(d.data)
-let has = (d, v) => I.has(d.data, v)
-
-let rec removeMutateAux = (nt, x: key) => {
-  let k = nt.N.key
-  if x == k {
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (_, Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if x < k {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = removeMutateAux(l, x)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = removeMutateAux(r, x)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let remove = (d, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(root) =>
-    let newRoot = removeMutateAux(root, v)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-let rec updateDone = (t, x: key, f) =>
-  switch t {
-  | None =>
-    switch f(. None) {
-    | Some(data) => N.singleton(x, data)
-    | None => t
-    }
-  | Some(nt) =>
-    let k = nt.N.key
-
-    /* let  c = (Belt_Cmp.getCmpInternal cmp) x k [@bs] in */
-    if k == x {
-      switch f(. Some(nt.value)) {
-      | None =>
-        let {N.left: l, right: r} = nt
-        switch (l, r) {
-        | (None, _) => r
-        | (_, None) => l
-        | (_, Some(nr)) =>
-          nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-          Some(N.balMutate(nt))
-        }
-      | Some(data) =>
-        nt.value = data
-        Some(nt)
-      }
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < k {
-        let ll = updateDone(l, x, f)
-        nt.left = ll
-      } else {
-        nt.right = updateDone(r, x, f)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let updateU = (t, x, f) => {
-  let oldRoot = t.data
-  let newRoot = updateDone(oldRoot, x, f)
-  if newRoot !== oldRoot {
-    t.data = newRoot
-  }
-}
-let update = (t, x, f) => updateU(t, x, (. a) => f(a))
-let rec removeArrayMutateAux = (t, xs, i, len) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = removeMutateAux(t, ele)
-    switch u {
-    | None => None
-    | Some(t) => removeArrayMutateAux(t, xs, i + 1, len)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (d: t<_>, xs) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(nt) =>
-    let len = A.length(xs)
-    let newRoot = removeArrayMutateAux(nt, xs, 0, len)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-/* let split = I.split */
-/* let merge = I.merge */
-
-let fromArray = xs => {data: I.fromArray(xs)}
-
-let cmpU = (d0, d1, f) => I.cmpU(d0.data, d1.data, f)
-let cmp = (d0, d1, f) => cmpU(d0, d1, (. a, b) => f(a, b))
-
-let eqU = (d0, d1, f) => I.eqU(d0.data, d1.data, f)
-let eq = (d0, d1, f) => eqU(d0, d1, (. a, b) => f(a, b))
-
-let get = (d, x) => I.get(d.data, x)
-let getUndefined = (d, x) => I.getUndefined(d.data, x)
-let getWithDefault = (d, x, def) => I.getWithDefault(d.data, x, def)
-let getExn = (d, x) => I.getExn(d.data, x)
diff --git a/jscomp/others/belt_MutableMapInt.resi b/jscomp/others/belt_MutableMapInt.resi
deleted file mode 100644
index 6f1b66a..0000000
--- a/jscomp/others/belt_MutableMapInt.resi
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 key = int
-
-type t<'a>
-
-let make: unit => t<'a>
-let clear: t<'a> => unit
-let isEmpty: t<'a> => bool
-
-let has: (t<'a>, key) => bool
-
-let cmpU: (t<'a>, t<'a>, (. 'a, 'a) => int) => int
-
-/** 
-`cmp(m1, m2, cmp)`. First compare by size, if size is the same, compare by key,
-value pair
-*/
-let cmp: (t<'a>, t<'a>, ('a, 'a) => int) => int
-
-let eqU: (t<'a>, t<'a>, (. 'a, 'a) => bool) => bool
-
-/** `eq(m1, m2, cmp)` */
-let eq: (t<'a>, t<'a>, ('a, 'a) => bool) => bool
-
-let forEachU: (t<'a>, (. key, 'a) => unit) => unit
-
-/** 
-`forEach(m, f)` applies `f` to all bindings in map `m`. `f` receives the key as
-first argument, and the associated value as second argument. The application 
-order of `f` is in increasing order. */
-let forEach: (t<'a>, (key, 'a) => unit) => unit
-
-let reduceU: (t<'a>, 'b, (. 'b, key, 'a) => 'b) => 'b
-
-/** 
-`reduce(m, a, f)` computes `(f kN dN ... (f k1 d1 a)...)`, where `k1 ... kN` are
-the keys of all bindings in `m` (in increasing order), and `d1 ... dN` are the
-associated data. */
-let reduce: (t<'a>, 'b, ('b, key, 'a) => 'b) => 'b
-
-let everyU: (t<'a>, (. key, 'a) => bool) => bool
-
-/** 
-`every(m, p)` checks if all the bindings of the map satisfy the predicate `p`.
-The application order of `p` is unspecified.
-*/
-let every: (t<'a>, (key, 'a) => bool) => bool
-
-let someU: (t<'a>, (. key, 'a) => bool) => bool
-
-/** 
-`some(m, p)` checks if at least one binding of the map satisfy the predicate `p`.
-The application order of `p` is unspecified.
-*/
-let some: (t<'a>, (key, 'a) => bool) => bool
-
-let size: t<'a> => int
-
-/** In increasing order */
-let toList: t<'a> => list<(key, 'a)>
-
-/** In increasing order */
-let toArray: t<'a> => array<(key, 'a)>
-
-let fromArray: array<(key, 'a)> => t<'a>
-let keysToArray: t<'a> => array<key>
-let valuesToArray: t<'a> => array<'a>
-let minKey: t<_> => option<key>
-let minKeyUndefined: t<_> => Js.undefined<key>
-let maxKey: t<_> => option<key>
-let maxKeyUndefined: t<_> => Js.undefined<key>
-let minimum: t<'a> => option<(key, 'a)>
-let minUndefined: t<'a> => Js.undefined<(key, 'a)>
-let maximum: t<'a> => option<(key, 'a)>
-let maxUndefined: t<'a> => Js.undefined<(key, 'a)>
-let get: (t<'a>, key) => option<'a>
-let getUndefined: (t<'a>, key) => Js.undefined<'a>
-let getWithDefault: (t<'a>, key, 'a) => 'a
-let getExn: (t<'a>, key) => 'a
-
-/**
-  **raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
-
-/* ************************************************************************** */
-
-/* TODO: add functional `merge, partition, keep, split` */
-
-/** `remove(m, x)` do the in-place modification */
-let remove: (t<'a>, key) => unit
-
-let removeMany: (t<'a>, array<key>) => unit
-
-/** 
-`set(m, x, y)` do the in-place modification, return `m` for chaining. If `x` was
-already bound in `m`, its previous binding disappears.
-*/
-let set: (t<'a>, key, 'a) => unit
-
-let updateU: (t<'a>, key, (. option<'a>) => option<'a>) => unit
-let update: (t<'a>, key, option<'a> => option<'a>) => unit
-
-let mapU: (t<'a>, (. 'a) => 'b) => t<'b>
-
-/** 
-`map(m, f)` returns a map with same domain as `m`, where the associated value `a`
-of all bindings of `m` has been replaced by the result of the application of `f`
-to `a`. The bindings are passed to `f` in increasing order with respect to the
-ordering over the type of the keys. */
-let map: (t<'a>, 'a => 'b) => t<'b>
-
-let mapWithKeyU: (t<'a>, (. key, 'a) => 'b) => t<'b>
-let mapWithKey: (t<'a>, (key, 'a) => 'b) => t<'b>
diff --git a/jscomp/others/belt_MutableMapString.res b/jscomp/others/belt_MutableMapString.res
deleted file mode 100644
index 3bbb2c0..0000000
--- a/jscomp/others/belt_MutableMapString.res
+++ /dev/null
@@ -1,176 +0,0 @@
-module I = Belt_internalMapString
-type key = string
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-
-type t<'a> = {mutable data: I.t<'a>}
-
-let make = () => {data: None}
-let isEmpty = m => N.isEmpty(m.data)
-let clear = m => m.data = None
-/* let singleton k v = t ~data:(N.singleton k v) */
-
-let minKeyUndefined = m => N.minKeyUndefined(m.data)
-let minKey = m => N.minKey(m.data)
-let maxKeyUndefined = m => N.maxKeyUndefined(m.data)
-let maxKey = m => N.maxKey(m.data)
-let minimum = m => N.minimum(m.data)
-let minUndefined = m => N.minUndefined(m.data)
-let maximum = m => N.maximum(m.data)
-let maxUndefined = m => N.maxUndefined(m.data)
-
-let set = (m: t<_>, k, v) => {
-  let old_data = m.data
-  let v = I.addMutate(old_data, k, v)
-  if v !== old_data {
-    m.data = v
-  }
-}
-
-let forEachU = (d, f) => N.forEachU(d.data, f)
-let forEach = (d, f) => forEachU(d, (. a, b) => f(a, b))
-let mapU = (d, f) => {data: N.mapU(d.data, f)}
-let map = (d, f) => mapU(d, (. a) => f(a))
-let mapWithKeyU = (d, f) => {data: N.mapWithKeyU(d.data, f)}
-let mapWithKey = (d, f) => mapWithKeyU(d, (. a, b) => f(a, b))
-let reduceU = (d, acc, f) => N.reduceU(d.data, acc, f)
-let reduce = (d, acc, f) => reduceU(d, acc, (. a, b, c) => f(a, b, c))
-let everyU = (d, f) => N.everyU(d.data, f)
-let every = (d, f) => everyU(d, (. a, b) => f(a, b))
-let someU = (d, f) => N.someU(d.data, f)
-let some = (d, f) => someU(d, (. a, b) => f(a, b))
-let size = d => N.size(d.data)
-let toList = d => N.toList(d.data)
-let toArray = d => N.toArray(d.data)
-let keysToArray = d => N.keysToArray(d.data)
-let valuesToArray = d => N.valuesToArray(d.data)
-let checkInvariantInternal = d => N.checkInvariantInternal(d.data)
-let has = (d, v) => I.has(d.data, v)
-
-let rec removeMutateAux = (nt, x: key) => {
-  let k = nt.N.key
-  if x == k {
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (_, Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if x < k {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = removeMutateAux(l, x)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = removeMutateAux(r, x)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let remove = (d, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(root) =>
-    let newRoot = removeMutateAux(root, v)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-let rec updateDone = (t, x: key, f) =>
-  switch t {
-  | None =>
-    switch f(. None) {
-    | Some(data) => N.singleton(x, data)
-    | None => t
-    }
-  | Some(nt) =>
-    let k = nt.N.key
-
-    /* let  c = (Belt_Cmp.getCmpInternal cmp) x k [@bs] in */
-    if k == x {
-      switch f(. Some(nt.value)) {
-      | None =>
-        let {N.left: l, right: r} = nt
-        switch (l, r) {
-        | (None, _) => r
-        | (_, None) => l
-        | (_, Some(nr)) =>
-          nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-          Some(N.balMutate(nt))
-        }
-      | Some(data) =>
-        nt.value = data
-        Some(nt)
-      }
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < k {
-        let ll = updateDone(l, x, f)
-        nt.left = ll
-      } else {
-        nt.right = updateDone(r, x, f)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let updateU = (t, x, f) => {
-  let oldRoot = t.data
-  let newRoot = updateDone(oldRoot, x, f)
-  if newRoot !== oldRoot {
-    t.data = newRoot
-  }
-}
-let update = (t, x, f) => updateU(t, x, (. a) => f(a))
-let rec removeArrayMutateAux = (t, xs, i, len) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = removeMutateAux(t, ele)
-    switch u {
-    | None => None
-    | Some(t) => removeArrayMutateAux(t, xs, i + 1, len)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (d: t<_>, xs) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(nt) =>
-    let len = A.length(xs)
-    let newRoot = removeArrayMutateAux(nt, xs, 0, len)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-/* let split = I.split */
-/* let merge = I.merge */
-
-let fromArray = xs => {data: I.fromArray(xs)}
-
-let cmpU = (d0, d1, f) => I.cmpU(d0.data, d1.data, f)
-let cmp = (d0, d1, f) => cmpU(d0, d1, (. a, b) => f(a, b))
-
-let eqU = (d0, d1, f) => I.eqU(d0.data, d1.data, f)
-let eq = (d0, d1, f) => eqU(d0, d1, (. a, b) => f(a, b))
-
-let get = (d, x) => I.get(d.data, x)
-let getUndefined = (d, x) => I.getUndefined(d.data, x)
-let getWithDefault = (d, x, def) => I.getWithDefault(d.data, x, def)
-let getExn = (d, x) => I.getExn(d.data, x)
diff --git a/jscomp/others/belt_MutableMapString.resi b/jscomp/others/belt_MutableMapString.resi
deleted file mode 100644
index fc4fcb3..0000000
--- a/jscomp/others/belt_MutableMapString.resi
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 key = string
-
-type t<'a>
-
-let make: unit => t<'a>
-let clear: t<'a> => unit
-let isEmpty: t<'a> => bool
-
-let has: (t<'a>, key) => bool
-
-let cmpU: (t<'a>, t<'a>, (. 'a, 'a) => int) => int
-
-/** 
-`cmp(m1, m2, cmp)`. First compare by size, if size is the same, compare by key,
-value pair
-*/
-let cmp: (t<'a>, t<'a>, ('a, 'a) => int) => int
-
-let eqU: (t<'a>, t<'a>, (. 'a, 'a) => bool) => bool
-
-/** `eq(m1, m2, cmp)` */
-let eq: (t<'a>, t<'a>, ('a, 'a) => bool) => bool
-
-let forEachU: (t<'a>, (. key, 'a) => unit) => unit
-
-/** 
-`forEach(m, f)` applies `f` to all bindings in map `m`. `f` receives the key as
-first argument, and the associated value as second argument. The application 
-order of `f` is in increasing order. */
-let forEach: (t<'a>, (key, 'a) => unit) => unit
-
-let reduceU: (t<'a>, 'b, (. 'b, key, 'a) => 'b) => 'b
-
-/** 
-`reduce(m, a, f)` computes `(f kN dN ... (f k1 d1 a)...)`, where `k1 ... kN` are
-the keys of all bindings in `m` (in increasing order), and `d1 ... dN` are the
-associated data. */
-let reduce: (t<'a>, 'b, ('b, key, 'a) => 'b) => 'b
-
-let everyU: (t<'a>, (. key, 'a) => bool) => bool
-
-/** 
-`every(m, p)` checks if all the bindings of the map satisfy the predicate `p`.
-The application order of `p` is unspecified.
-*/
-let every: (t<'a>, (key, 'a) => bool) => bool
-
-let someU: (t<'a>, (. key, 'a) => bool) => bool
-
-/** 
-`some(m, p)` checks if at least one binding of the map satisfy the predicate `p`.
-The application order of `p` is unspecified.
-*/
-let some: (t<'a>, (key, 'a) => bool) => bool
-
-let size: t<'a> => int
-
-/** In increasing order */
-let toList: t<'a> => list<(key, 'a)>
-
-/** In increasing order */
-let toArray: t<'a> => array<(key, 'a)>
-
-let fromArray: array<(key, 'a)> => t<'a>
-let keysToArray: t<'a> => array<key>
-let valuesToArray: t<'a> => array<'a>
-let minKey: t<_> => option<key>
-let minKeyUndefined: t<_> => Js.undefined<key>
-let maxKey: t<_> => option<key>
-let maxKeyUndefined: t<_> => Js.undefined<key>
-let minimum: t<'a> => option<(key, 'a)>
-let minUndefined: t<'a> => Js.undefined<(key, 'a)>
-let maximum: t<'a> => option<(key, 'a)>
-let maxUndefined: t<'a> => Js.undefined<(key, 'a)>
-let get: (t<'a>, key) => option<'a>
-let getUndefined: (t<'a>, key) => Js.undefined<'a>
-let getWithDefault: (t<'a>, key, 'a) => 'a
-let getExn: (t<'a>, key) => 'a
-
-/**
-  **raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
-
-/* ************************************************************************** */
-
-/* TODO: add functional `merge, partition, keep, split` */
-
-/** `remove(m, x)` do the in-place modification */
-let remove: (t<'a>, key) => unit
-
-let removeMany: (t<'a>, array<key>) => unit
-
-/** 
-`set(m, x, y)` do the in-place modification, return `m` for chaining. If `x` was
-already bound in `m`, its previous binding disappears.
-*/
-let set: (t<'a>, key, 'a) => unit
-
-let updateU: (t<'a>, key, (. option<'a>) => option<'a>) => unit
-let update: (t<'a>, key, option<'a> => option<'a>) => unit
-
-let mapU: (t<'a>, (. 'a) => 'b) => t<'b>
-
-/** 
-`map(m, f)` returns a map with same domain as `m`, where the associated value `a`
-of all bindings of `m` has been replaced by the result of the application of `f`
-to `a`. The bindings are passed to `f` in increasing order with respect to the
-ordering over the type of the keys. */
-let map: (t<'a>, 'a => 'b) => t<'b>
-
-let mapWithKeyU: (t<'a>, (. key, 'a) => 'b) => t<'b>
-let mapWithKey: (t<'a>, (key, 'a) => 'b) => t<'b>
diff --git a/jscomp/others/belt_MutableQueue.res b/jscomp/others/belt_MutableQueue.res
deleted file mode 100644
index 86dd07f..0000000
--- a/jscomp/others/belt_MutableQueue.res
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Francois Pottier, projet Cristal, INRIA Rocquencourt */
-/* Jeremie Dimino, Jane Street Europe */
-/*  */
-/* Copyright 2002 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-/* Adapted significantly by ReScript Authors */
-module A = Belt_Array
-
-type rec node<'a> = {
-  content: 'a,
-  mutable next: cell<'a>,
-}
-and cell<'a> = option<node<'a>>
-and t<'a> = {
-  mutable length: int,
-  mutable first: cell<'a>,
-  mutable last: cell<'a>,
-}
-
-let make = () => {
-  length: 0,
-  first: None,
-  last: None,
-}
-
-let clear = q => {
-  q.length = 0
-  q.first = None
-  q.last = None
-}
-
-let add = (q, x) => {
-  let cell = Some({
-    content: x,
-    next: None,
-  })
-  switch q.last {
-  | None =>
-    /* TODO: better names for intermediate var */
-    q.length = 1
-    q.first = cell
-    q.last = cell
-  | Some(last) =>
-    q.length = q.length + 1
-    last.next = cell
-    q.last = cell
-  }
-}
-
-let peek = q =>
-  switch q.first {
-  /* same here could be v */
-  | None => None
-  | Some(v) => Some(v.content)
-  }
-
-let peekUndefined = q =>
-  switch q.first {
-  | None => Js.undefined
-  | Some(v) => Js.Undefined.return(v.content)
-  }
-
-let peekExn = q =>
-  switch q.first {
-  | None => raise(Not_found)
-  | Some(v) => v.content
-  }
-
-let pop = q =>
-  switch q.first {
-  | None => None
-  | Some(x) =>
-    let next = x.next
-    if next == None {
-      /* only one element */
-      clear(q)
-      Some(x.content)
-    } else {
-      q.length = q.length - 1
-      q.first = next
-      Some(x.content)
-    }
-  }
-
-let popExn = q =>
-  /* TO fix */
-  switch q.first {
-  | None => raise(Not_found)
-  | Some(x) =>
-    let next = x.next
-    if next == None {
-      /* only one element */
-      clear(q)
-      x.content
-    } else {
-      q.length = q.length - 1
-      q.first = next
-      x.content
-    }
-  }
-
-let popUndefined = q =>
-  switch q.first {
-  | None => Js.undefined
-  | Some(x) =>
-    let next = x.next
-    if next == None {
-      /* only one element */
-      clear(q)
-      Js.Undefined.return(x.content)
-    } else {
-      q.length = q.length - 1
-      q.first = next
-      Js.Undefined.return(x.content)
-    }
-  }
-
-let rec copyAux = (qRes, prev, cell) =>
-  switch cell {
-  | None =>
-    qRes.last = prev
-    qRes
-  | Some(x) =>
-    let content = x.content
-    let res = Some({content, next: None})
-    switch prev {
-    | None => qRes.first = res
-    | Some(p) => p.next = res
-    }
-    copyAux(qRes, res, x.next)
-  }
-
-let copy = q => copyAux({length: q.length, first: None, last: None}, None, q.first)
-
-let rec copyMapAux = (qRes, prev, cell, f) =>
-  switch cell {
-  | None =>
-    qRes.last = prev
-    qRes
-  | Some(x) =>
-    let content = f(. x.content)
-    let res = Some({content, next: None})
-    switch prev {
-    /* TODO: optimize to remove such check */
-    | None => qRes.first = res
-    | Some(p) => p.next = res
-    }
-    copyMapAux(qRes, res, x.next, f)
-  }
-
-let mapU = (q, f) => copyMapAux({length: q.length, first: None, last: None}, None, q.first, f)
-
-let map = (q, f) => mapU(q, (. a) => f(a))
-
-let isEmpty = q => q.length == 0
-
-let size = q => q.length
-
-let rec iterAux = (cell, f) =>
-  switch cell {
-  | None => ()
-  | Some(x) =>
-    f(. x.content)
-    iterAux(x.next, f)
-  }
-
-let forEachU = (q, f) => iterAux(q.first, f)
-
-let forEach = (q, f) => forEachU(q, (. a) => f(a))
-
-let rec foldAux = (f, accu, cell) =>
-  switch cell {
-  | None => accu
-  | Some(x) =>
-    let accu = f(. accu, x.content)
-    foldAux(f, accu, x.next)
-  }
-
-let reduceU = (q, accu, f) => foldAux(f, accu, q.first)
-
-let reduce = (q, accu, f) => reduceU(q, accu, (. a, b) => f(a, b))
-
-let transfer = (q1, q2) =>
-  if q1.length > 0 {
-    switch q2.last {
-    | None =>
-      q2.length = q1.length
-      q2.first = q1.first
-      q2.last = q1.last
-      clear(q1)
-    | Some(l) =>
-      q2.length = q2.length + q1.length
-      l.next = q1.first
-      q2.last = q1.last
-      clear(q1)
-    }
-  }
-
-let rec fillAux = (i, arr, cell) =>
-  switch cell {
-  | None => ()
-  | Some(x) =>
-    A.setUnsafe(arr, i, x.content)
-    fillAux(i + 1, arr, x.next)
-  }
-
-let toArray = x => {
-  let v = A.makeUninitializedUnsafe(x.length)
-  fillAux(0, v, x.first)
-  v
-}
-
-/* TODO: optimize */
-let fromArray = arr => {
-  let q = make()
-  for i in 0 to A.length(arr) - 1 {
-    add(q, A.getUnsafe(arr, i))
-  }
-  q
-}
diff --git a/jscomp/others/belt_MutableQueue.resi b/jscomp/others/belt_MutableQueue.resi
deleted file mode 100644
index 1bc2f8c..0000000
--- a/jscomp/others/belt_MutableQueue.resi
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-/* Adapted significantly by ReScript Authors */
-
-/***
-A FIFO (first in first out) queue data structure.
-*/
-
-/**
-The type of queues containing elements of `type('a)`.
-*/
-type t<'a>
-
-/** 
-Returns a new queue, initially empty.
-*/
-let make: unit => t<'a>
-
-/**
-Discard all elements from the queue.
-*/
-let clear: t<'a> => unit
-
-/**
-Returns `true` if the given queue is empty, `false` otherwise.
-*/
-let isEmpty: t<'a> => bool
-
-/**
-`fromArray` a is equivalent to `Array.forEach(a, add(q, a));`
-*/
-let fromArray: array<'a> => t<'a>
-
-/**
-`add(q, x)` adds the element `x` at the end of the queue `q`.
-*/
-let add: (t<'a>, 'a) => unit
-
-/**
-`peekOpt(q)` returns the first element in queue `q`, without removing it from the queue.
-*/
-let peek: t<'a> => option<'a>
-
-/**
-`peekUndefined(q)` returns `undefined` if not found.
-*/
-let peekUndefined: t<'a> => Js.undefined<'a>
-
-/**
-raise an exception if `q` is empty
-*/
-let peekExn: t<'a> => 'a
-
-/**
-`pop(q)` removes and returns the first element in queue `q`.
-*/
-let pop: t<'a> => option<'a>
-
-/**
-`popUndefined(q)` removes and returns the first element in queue `q`. it will
-return `undefined` if it is already empty.
-*/
-let popUndefined: t<'a> => Js.undefined<'a>
-
-/**
-`popExn(q)` raise an exception if q is empty.
-*/
-let popExn: t<'a> => 'a
-
-/**
-`copy(q)` returns a fresh queue.
-*/
-let copy: t<'a> => t<'a>
-
-/**
-Returns the number of elements in a queue.
-*/
-let size: t<'a> => int
-
-let mapU: (t<'a>, (. 'a) => 'b) => t<'b>
-let map: (t<'a>, 'a => 'b) => t<'b>
-let forEachU: (t<'a>, (. 'a) => unit) => unit
-
-/**
-`forEach(q, f) applies`f`in turn to all elements of`q`, from the least
-recently entered to the most recently entered. The queue itself is unchanged.
-*/
-let forEach: (t<'a>, 'a => unit) => unit
-
-let reduceU: (t<'a>, 'b, (. 'b, 'a) => 'b) => 'b
-
-/**
-`reduce(q, accu, f)` is equivalent to `List.reduce(l, accu, f)`, where `l` is the
-list of `q`'s elements. The queue remains unchanged.
-*/
-let reduce: (t<'a>, 'b, ('b, 'a) => 'b) => 'b
-
-/**
-`transfer(q1, q2)` adds all of `q1`'s elements at the end of the queue `q2`,
-then clears `q1`. It is equivalent to the sequence `forEach((x) => add(x, q2), q1)`;
-clear `q1`, but runs in constant time.
-*/
-let transfer: (t<'a>, t<'a>) => unit
-
-/**
-First added will be in the beginning of the array.
-*/
-let toArray: t<'a> => array<'a>
diff --git a/jscomp/others/belt_MutableSet.res b/jscomp/others/belt_MutableSet.res
deleted file mode 100644
index e48b6a0..0000000
--- a/jscomp/others/belt_MutableSet.res
+++ /dev/null
@@ -1,374 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module Int = Belt_MutableSetInt
-module String = Belt_MutableSetString
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-module Sort = Belt_SortArray
-
-type id<'k, 'id> = Belt_Id.comparable<'k, 'id>
-type cmp<'key, 'id> = Belt_Id.cmp<'key, 'id>
-
-type t<'value, 'id> = {
-  cmp: cmp<'value, 'id>,
-  mutable data: N.t<'value>,
-}
-
-let rec remove0 = (nt, x, ~cmp) => {
-  let k = nt.N.value
-  let c = cmp(. x, k)
-  if c == 0 {
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (Some(_), Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if c < 0 {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = remove0(~cmp, l, x)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = remove0(~cmp, r, x)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let remove = (d, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(oldRoot2) =>
-    let newRoot = remove0(~cmp=Belt_Id.getCmpInternal(d.cmp), oldRoot2, v)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-let rec removeMany0 = (t, xs, i, len, ~cmp) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = remove0(t, ele, ~cmp)
-    switch u {
-    | None => None
-    | Some(t) => removeMany0(t, xs, i + 1, len, ~cmp)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (d, xs) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(nt) =>
-    let len = A.length(xs)
-    d.data = removeMany0(nt, xs, 0, len, ~cmp=Belt_Id.getCmpInternal(d.cmp))
-  }
-}
-
-let rec removeCheck0 = (nt, x, removed, ~cmp) => {
-  let k = nt.N.value
-  let c = Belt_Id.getCmpInternal(cmp)(. x, k)
-  if c == 0 {
-    let () = removed.contents = true
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (Some(_), Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if c < 0 {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = removeCheck0(~cmp, l, x, removed)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = removeCheck0(~cmp, r, x, removed)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let removeCheck = (d, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => false
-  | Some(oldRoot2) =>
-    let removed = ref(false)
-    let newRoot = removeCheck0(~cmp=d.cmp, oldRoot2, v, removed)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-    removed.contents
-  }
-}
-
-let rec addCheck0 = (t, x, added, ~cmp) =>
-  switch t {
-  | None =>
-    added.contents = true
-    N.singleton(x)
-  | Some(nt) =>
-    let k = nt.N.value
-    let c = cmp(. x, k)
-    if c == 0 {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if c < 0 {
-        let ll = addCheck0(~cmp, l, x, added)
-        nt.left = ll
-      } else {
-        nt.right = addCheck0(~cmp, r, x, added)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let addCheck = (m, e) => {
-  let oldRoot = m.data
-  let added = ref(false)
-  let newRoot = addCheck0(~cmp=Belt_Id.getCmpInternal(m.cmp), oldRoot, e, added)
-  if newRoot !== oldRoot {
-    m.data = newRoot
-  }
-  added.contents
-}
-
-let add = (m, e) => {
-  let oldRoot = m.data
-  let newRoot = N.addMutate(~cmp=m.cmp, oldRoot, e)
-  if newRoot !== oldRoot {
-    m.data = newRoot
-  }
-}
-
-let addArrayMutate = (t, xs, ~cmp) => {
-  let v = ref(t)
-  for i in 0 to A.length(xs) - 1 {
-    v.contents = N.addMutate(v.contents, A.getUnsafe(xs, i), ~cmp)
-  }
-  v.contents
-}
-
-let mergeMany = (d, xs) => d.data = addArrayMutate(d.data, xs, ~cmp=d.cmp)
-
-let make = (type value identity, ~id: id<value, identity>) => {
-  module M = unpack(id)
-  {cmp: M.cmp, data: None}
-}
-
-let isEmpty = d => N.isEmpty(d.data)
-
-let minimum = d => N.minimum(d.data)
-let minUndefined = d => N.minUndefined(d.data)
-let maximum = d => N.maximum(d.data)
-let maxUndefined = d => N.maxUndefined(d.data)
-
-let forEachU = (d, f) => N.forEachU(d.data, f)
-let forEach = (d, f) => forEachU(d, (. a) => f(a))
-let reduceU = (d, acc, cb) => N.reduceU(d.data, acc, cb)
-let reduce = (d, acc, cb) => reduceU(d, acc, (. a, b) => cb(a, b))
-let everyU = (d, p) => N.everyU(d.data, p)
-let every = (d, p) => everyU(d, (. a) => p(a))
-let someU = (d, p) => N.someU(d.data, p)
-let some = (d, p) => someU(d, (. a) => p(a))
-let size = d => N.size(d.data)
-let toList = d => N.toList(d.data)
-let toArray = d => N.toArray(d.data)
-
-let fromSortedArrayUnsafe = (type value identity, xs, ~id: id<value, identity>): t<_> => {
-  module M = unpack(id)
-  {data: N.fromSortedArrayUnsafe(xs), cmp: M.cmp}
-}
-
-let checkInvariantInternal = d => N.checkInvariantInternal(d.data)
-
-let fromArray = (type value identity, data, ~id: id<value, identity>) => {
-  module M = unpack(id)
-  let cmp = M.cmp
-  {cmp, data: N.fromArray(~cmp, data)}
-}
-
-let cmp = (d0, d1) => N.cmp(~cmp=d0.cmp, d0.data, d1.data)
-
-let eq = (d0, d1) => N.eq(~cmp=d0.cmp, d0.data, d1.data)
-
-let get = (d, x) => N.get(~cmp=d.cmp, d.data, x)
-
-let getUndefined = (d, x) => N.getUndefined(~cmp=d.cmp, d.data, x)
-
-let getExn = (d, x) => N.getExn(~cmp=d.cmp, d.data, x)
-
-let split = (d, key) => {
-  let arr = N.toArray(d.data)
-  let cmp = d.cmp
-  let i = Sort.binarySearchByU(arr, key, Belt_Id.getCmpInternal(cmp))
-  let len = A.length(arr)
-  if i < 0 {
-    let next = -i - 1
-    (
-      (
-        {
-          data: N.fromSortedArrayAux(arr, 0, next),
-          cmp,
-        },
-        {
-          data: N.fromSortedArrayAux(arr, next, len - next),
-          cmp,
-        },
-      ),
-      false,
-    )
-  } else {
-    (
-      (
-        {
-          data: N.fromSortedArrayAux(arr, 0, i),
-          cmp,
-        },
-        {
-          data: N.fromSortedArrayAux(arr, i + 1, len - i - 1),
-          cmp,
-        },
-      ),
-      true,
-    )
-  }
-}
-
-let keepU = (d, p) => {data: N.keepCopyU(d.data, p), cmp: d.cmp}
-
-let keep = (d, p) => keepU(d, (. a) => p(a))
-
-let partitionU = (d, p) => {
-  let cmp = d.cmp
-  let (a, b) = N.partitionCopyU(d.data, p)
-  ({data: a, cmp}, {data: b, cmp})
-}
-
-let partition = (d, p) => partitionU(d, (. a) => p(a))
-
-let subset = (a, b) => N.subset(~cmp=a.cmp, a.data, b.data)
-
-let intersect = (a, b): t<_> => {
-  let cmp = a.cmp
-  switch (a.data, b.data) {
-  | (None, _) => {cmp, data: None}
-  | (_, None) => {cmp, data: None}
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    let p = Belt_Id.getCmpInternal(cmp)
-    if (
-      p(. A.getUnsafe(tmp, sizea - 1), A.getUnsafe(tmp, sizea)) < 0 ||
-        p(. A.getUnsafe(tmp, totalSize - 1), A.getUnsafe(tmp, 0)) < 0
-    ) {
-      {cmp, data: None}
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(Pervasives.min(sizea, sizeb))
-      let k = Sort.intersectU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, p)
-      {
-        data: N.fromSortedArrayAux(tmp2, 0, k),
-        cmp,
-      }
-    }
-  }
-}
-
-let diff = (a, b): t<_> => {
-  let cmp = a.cmp
-  let dataa = a.data
-  switch (dataa, b.data) {
-  | (None, _) => {cmp, data: None}
-  | (_, None) => {data: N.copy(dataa), cmp}
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    let p = Belt_Id.getCmpInternal(cmp)
-    if (
-      p(. A.getUnsafe(tmp, sizea - 1), A.getUnsafe(tmp, sizea)) < 0 ||
-        p(. A.getUnsafe(tmp, totalSize - 1), A.getUnsafe(tmp, 0)) < 0
-    ) {
-      {data: N.copy(dataa), cmp}
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(sizea)
-      let k = Sort.diffU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, p)
-      {data: N.fromSortedArrayAux(tmp2, 0, k), cmp}
-    }
-  }
-}
-
-let union = (a, b) => {
-  let cmp = a.cmp
-  let (dataa, datab) = (a.data, b.data)
-  switch (dataa, datab) {
-  | (None, _) => {data: N.copy(datab), cmp}
-  | (_, None) => {data: N.copy(dataa), cmp}
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    let p = Belt_Id.getCmpInternal(cmp)
-    if p(. A.getUnsafe(tmp, sizea - 1), A.getUnsafe(tmp, sizea)) < 0 {
-      {data: N.fromSortedArrayAux(tmp, 0, totalSize), cmp}
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(totalSize)
-      let k = Sort.unionU(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0, p)
-      {data: N.fromSortedArrayAux(tmp2, 0, k), cmp}
-    }
-  }
-}
-
-let has = (d, x) => N.has(~cmp=d.cmp, d.data, x)
-
-let copy = d => {data: N.copy(d.data), cmp: d.cmp}
diff --git a/jscomp/others/belt_MutableSet.resi b/jscomp/others/belt_MutableSet.resi
deleted file mode 100644
index 8a52652..0000000
--- a/jscomp/others/belt_MutableSet.resi
+++ /dev/null
@@ -1,666 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-A **mutable** sorted set module which allows customized compare behavior.
-The implementation uses balanced binary trees, and therefore searching and insertion take time logarithmic in the size of the map.
-
-It also has two specialized inner modules [Belt.MutableSet.Int](mutable-set-int) and [Belt.MutableSet.String](mutable-set-string) - This module separates data from function which is more verbose but slightly more efficient
-
-## Examples
-
-```rescript
-module PairComparator = Belt.Id.MakeComparable({
-  type t = (int, int)
-  let cmp = ((a0, a1), (b0, b1)) =>
-    switch Pervasives.compare(a0, b0) {
-    | 0 => Pervasives.compare(a1, b1)
-    | c => c
-    }
-})
-
-let mySet = Belt.MutableSet.make(~id=module(PairComparator))
-mySet->Belt.MutableSet.add((1, 2))
-```
-*/
-
-/** Specialized when key type is `int`, more efficient than the generic type */
-module Int = Belt_MutableSetInt
-
-/** Specialized when key type is `string`, more efficient than the generic type */
-module String = Belt_MutableSetString
-
-/**
-`'value` is the element type
-
-`'identity` the identity of the collection
-*/
-type t<'value, 'identity>
-
-/**
-The identity needed for making a set from scratch
-*/
-type id<'value, 'id> = Belt_Id.comparable<'value, 'id>
-
-/**
-Creates a new set by taking in the comparator
-*/
-let make: (~id: id<'value, 'id>) => t<'value, 'id>
-
-/**
-Creates new set from array of elements.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([1, 3, 2, 4], ~id=module(IntCmp))
-
-s0->Belt.MutableSet.toArray /* [1, 2, 3, 4] */
-```
-*/
-let fromArray: (array<'value>, ~id: id<'value, 'id>) => t<'value, 'id>
-
-/**
-The same as [fromArray][#fromarray] except it is after assuming the input array is already sorted.
-*/
-let fromSortedArrayUnsafe: (array<'value>, ~id: id<'value, 'id>) => t<'value, 'id>
-
-/**
-Returns copy of a set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([1, 3, 2, 4], ~id=module(IntCmp))
-
-let copied = s0->Belt.MutableSet.copy
-copied->Belt.MutableSet.toArray /* [1, 2, 3, 4] */
-```
-*/
-let copy: t<'value, 'id> => t<'value, 'id>
-
-/**
-Checks if set is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let empty = Belt.MutableSet.fromArray([], ~id=module(IntCmp))
-let notEmpty = Belt.MutableSet.fromArray([1], ~id=module(IntCmp))
-
-Belt.MutableSet.isEmpty(empty) /* true */
-Belt.MutableSet.isEmpty(notEmpty) /* false */
-```
-*/
-let isEmpty: t<_> => bool
-
-/**
-Checks if element exists in set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let set = Belt.MutableSet.fromArray([1, 4, 2, 5], ~id=module(IntCmp))
-
-set->Belt.MutableSet.has(3) /* false */
-set->Belt.MutableSet.has(1) /* true */
-```
-*/
-let has: (t<'value, 'id>, 'value) => bool
-
-/**
-Adds element to set. If element existed in set, value is unchanged.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.make(~id=module(IntCmp))
-s0->Belt.MutableSet.add(1)
-s0->Belt.MutableSet.add(2)
-s0->Belt.MutableSet.add(2)
-
-s0->Belt.MutableSet.toArray /* [1, 2] */
-```
-*/
-let add: (t<'value, 'id>, 'value) => unit
-
-let addCheck: (t<'value, 'id>, 'value) => bool
-
-/**
-Adds each element of array to set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let set = Belt.MutableSet.make(~id=module(IntCmp))
-
-set->Belt.MutableSet.mergeMany([5, 4, 3, 2, 1])
-set->Belt.MutableSet.toArray /* [1, 2, 3, 4, 5] */
-```
-*/
-let mergeMany: (t<'value, 'id>, array<'value>) => unit
-
-/**
-Removes element from set. If element did not exist in set, value is unchanged.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([2, 3, 1, 4, 5], ~id=module(IntCmp))
-s0->Belt.MutableSet.remove(1)
-s0->Belt.MutableSet.remove(3)
-s0->Belt.MutableSet.remove(3)
-
-s0->Belt.MutableSet.toArray /* [2,4,5] */
-```
-*/
-let remove: (t<'value, 'id>, 'value) => unit
-
-let removeCheck: (t<'value, 'id>, 'value) => bool
-/* `b = removeCheck s e` `b` is true means one element removed */
-
-/**
-Removes each element of array from set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let set = Belt.MutableSet.fromArray([1, 2, 3, 4], ~id=module(IntCmp))
-
-set->Belt.MutableSet.removeMany([5, 4, 3, 2, 1])
-set->Belt.MutableSet.toArray /* [] */
-```
-*/
-let removeMany: (t<'value, 'id>, array<'value>) => unit
-
-/**
-Returns union of two sets.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([5, 2, 3, 5, 6], ~id=module(IntCmp))
-let s1 = Belt.MutableSet.fromArray([5, 2, 3, 1, 5, 4], ~id=module(IntCmp))
-let union = Belt.MutableSet.union(s0, s1)
-union->Belt.MutableSet.toArray /* [1,2,3,4,5,6] */
-```
-*/
-let union: (t<'value, 'id>, t<'value, 'id>) => t<'value, 'id>
-
-/**
-Returns intersection of two sets.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([5, 2, 3, 5, 6], ~id=module(IntCmp))
-let s1 = Belt.MutableSet.fromArray([5, 2, 3, 1, 5, 4], ~id=module(IntCmp))
-let intersect = Belt.MutableSet.intersect(s0, s1)
-intersect->Belt.MutableSet.toArray /* [2,3,5] */
-```
-*/
-let intersect: (t<'value, 'id>, t<'value, 'id>) => t<'value, 'id>
-
-/**
-Returns elements from first set, not existing in second set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([5, 2, 3, 5, 6], ~id=module(IntCmp))
-let s1 = Belt.MutableSet.fromArray([5, 2, 3, 1, 5, 4], ~id=module(IntCmp))
-Belt.MutableSet.toArray(Belt.MutableSet.diff(s0, s1)) /* [6] */
-Belt.MutableSet.toArray(Belt.MutableSet.diff(s1, s0)) /* [1,4] */
-```
-*/
-let diff: (t<'value, 'id>, t<'value, 'id>) => t<'value, 'id>
-
-/**
-Checks if second set is subset of first set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([5, 2, 3, 5, 6], ~id=module(IntCmp))
-let s1 = Belt.MutableSet.fromArray([5, 2, 3, 1, 5, 4], ~id=module(IntCmp))
-let s2 = Belt.MutableSet.intersect(s0, s1)
-Belt.MutableSet.subset(s2, s0) /* true */
-Belt.MutableSet.subset(s2, s1) /* true */
-Belt.MutableSet.subset(s1, s0) /* false */
-```
-*/
-let subset: (t<'value, 'id>, t<'value, 'id>) => bool
-
-/**
-Total ordering between sets. Can be used as the ordering function for doing sets of sets.
-It compares size first and then iterates over each element following the order of elements.
-*/
-let cmp: (t<'value, 'id>, t<'value, 'id>) => int
-
-/**
-Checks if two sets are equal.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([5, 2, 3], ~id=module(IntCmp))
-let s1 = Belt.MutableSet.fromArray([3, 2, 5], ~id=module(IntCmp))
-
-Belt.MutableSet.eq(s0, s1) /* true */
-```
-*/
-let eq: (t<'value, 'id>, t<'value, 'id>) => bool
-
-/**
-  Same as `Belt.MutableSet.forEach` but takes uncurried functon.
-*/
-let forEachU: (t<'value, 'id>, (. 'value) => unit) => unit
-
-/**
-Applies function `f` in turn to all elements of set in increasing order.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([5, 2, 3, 5, 6], ~id=module(IntCmp))
-let acc = ref(list{})
-s0->Belt.MutableSet.forEach(x => acc := Belt.List.add(acc.contents, x))
-acc /* [6,5,3,2] */
-```
-*/
-let forEach: (t<'value, 'id>, 'value => unit) => unit
-
-let reduceU: (t<'value, 'id>, 'a, (. 'a, 'value) => 'a) => 'a
-
-/**
-Applies function `f` to each element of set in increasing order. Function `f` has two parameters: the item from the set and an “accumulator”, which starts with a value of `initialValue`. `reduce` returns the final value of the accumulator.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([5, 2, 3, 5, 6], ~id=module(IntCmp))
-s0->Belt.MutableSet.reduce(list{}, (acc, element) => acc->Belt.List.add(element)) /* [6,5,3,2] */
-```
-*/
-let reduce: (t<'value, 'id>, 'a, ('a, 'value) => 'a) => 'a
-
-let everyU: (t<'value, 'id>, (. 'value) => bool) => bool
-
-/**
-Checks if all elements of the set satisfy the predicate. Order unspecified.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let isEven = x => mod(x, 2) == 0
-
-let s0 = Belt.MutableSet.fromArray([2, 4, 6, 8], ~id=module(IntCmp))
-s0->Belt.MutableSet.every(isEven) /* true */
-```
-*/
-let every: (t<'value, 'id>, 'value => bool) => bool
-
-let someU: (t<'value, 'id>, (. 'value) => bool) => bool
-
-/**
-Checks if at least one element of the set satisfies the predicate.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let isOdd = x => mod(x, 2) != 0
-
-let s0 = Belt.MutableSet.fromArray([1, 2, 4, 6, 8], ~id=module(IntCmp))
-s0->Belt.MutableSet.some(isOdd) /* true */
-```
-*/
-let some: (t<'value, 'id>, 'value => bool) => bool
-
-let keepU: (t<'value, 'id>, (. 'value) => bool) => t<'value, 'id>
-
-/**
-Returns the set of all elements that satisfy the predicate.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let isEven = x => mod(x, 2) == 0
-
-let s0 = Belt.MutableSet.fromArray([1, 2, 3, 4, 5], ~id=module(IntCmp))
-let s1 = s0->Belt.MutableSet.keep(isEven)
-
-s1->Belt.MutableSet.toArray /* [2, 4] */
-```
-*/
-let keep: (t<'value, 'id>, 'value => bool) => t<'value, 'id>
-
-let partitionU: (t<'value, 'id>, (. 'value) => bool) => (t<'value, 'id>, t<'value, 'id>)
-
-/**
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let isOdd = x => mod(x, 2) != 0
-
-let s0 = Belt.MutableSet.fromArray([1, 2, 3, 4, 5], ~id=module(IntCmp))
-let (s1, s2) = s0->Belt.MutableSet.partition(isOdd)
-
-s1->Belt.MutableSet.toArray /* [1,3,5] */
-s2->Belt.MutableSet.toArray /* [2,4] */
-```
-*/
-let partition: (t<'value, 'id>, 'value => bool) => (t<'value, 'id>, t<'value, 'id>)
-
-/**
-Returns size of the set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([1, 2, 3, 4], ~id=module(IntCmp))
-
-s0->Belt.MutableSet.size /* 4 */
-```
-*/
-let size: t<'value, 'id> => int
-
-/**
-Returns list of ordered set elements.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([3, 2, 1, 5], ~id=module(IntCmp))
-
-s0->Belt.MutableSet.toList /* [1,2,3,5] */
-```
-*/
-let toList: t<'value, 'id> => list<'value>
-
-/**
-Returns array of ordered set elements.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([3, 2, 1, 5], ~id=module(IntCmp))
-
-s0->Belt.MutableSet.toArray /* [1,2,3,5] */
-```
-*/
-let toArray: t<'value, 'id> => array<'value>
-
-/**
-Returns minimum value of the collection. `None` if collection is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.make(~id=module(IntCmp))
-let s1 = Belt.MutableSet.fromArray([3, 2, 1, 5], ~id=module(IntCmp))
-
-s0->Belt.MutableSet.minimum /* None */
-s1->Belt.MutableSet.minimum /* Some(1) */
-```
-*/
-let minimum: t<'value, 'id> => option<'value>
-
-/**
-Returns minimum value of the collection. `undefined` if collection is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.make(~id=module(IntCmp))
-let s1 = Belt.MutableSet.fromArray([3, 2, 1, 5], ~id=module(IntCmp))
-
-s0->Belt.MutableSet.minUndefined /* undefined */
-s1->Belt.MutableSet.minUndefined /* 1 */
-```
-*/
-let minUndefined: t<'value, 'id> => Js.undefined<'value>
-
-/**
-Returns maximum value of the collection. `None` if collection is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.make(~id=module(IntCmp))
-let s1 = Belt.MutableSet.fromArray([3, 2, 1, 5], ~id=module(IntCmp))
-
-s0->Belt.MutableSet.maximum /* None */
-s1->Belt.MutableSet.maximum /* Some(5) */
-```
-*/
-let maximum: t<'value, 'id> => option<'value>
-
-/**
-Returns maximum value of the collection. `undefined` if collection is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.make(~id=module(IntCmp))
-let s1 = Belt.MutableSet.fromArray([3, 2, 1, 5], ~id=module(IntCmp))
-
-s0->Belt.MutableSet.maxUndefined /* undefined */
-s1->Belt.MutableSet.maxUndefined /* 5 */
-```
-*/
-let maxUndefined: t<'value, 'id> => Js.undefined<'value>
-
-/**
-Returns the reference of the value which is equivalent to value using the comparator specifiecd by this collection. Returns `None` if element does not exist.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([1, 2, 3, 4, 5], ~id=module(IntCmp))
-
-s0->Belt.MutableSet.get(3) /* Some(3) */
-s0->Belt.MutableSet.get(20) /* None */
-```
-*/
-let get: (t<'value, 'id>, 'value) => option<'value>
-
-/**
-Same as `Belt.MutableSet.get` but returns `undefined` when element does not exist.
-*/
-let getUndefined: (t<'value, 'id>, 'value) => Js.undefined<'value>
-
-/**
-Same as `Belt.MutableSet.get` but raise when element does not exist.
-*/
-let getExn: (t<'value, 'id>, 'value) => 'value
-
-/**
-Returns a tuple `((smaller, larger), present)`, `present` is true when element exist in set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.MutableSet.fromArray([1, 2, 3, 4, 5], ~id=module(IntCmp))
-
-let ((smaller, larger), present) = s0->Belt.MutableSet.split(3)
-
-present /* true */
-smaller->Belt.MutableSet.toArray /* [1,2] */
-larger->Belt.MutableSet.toArray /* [4,5] */
-```
-*/
-let split: (t<'value, 'id>, 'value) => ((t<'value, 'id>, t<'value, 'id>), bool)
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
-
-/*
-  `add0` was not exposed for various reasons:
-  1. such api is dangerious
-  [ cmp: ('value,'id) Belt_Cmp.cmp ->
-    ('value, 'id) t0 -> 'value ->
-    ('value, 'id) t0]
-  2. It is not really significantly more */
diff --git a/jscomp/others/belt_MutableSetInt.res b/jscomp/others/belt_MutableSetInt.res
deleted file mode 100644
index 4c50fcd..0000000
--- a/jscomp/others/belt_MutableSetInt.res
+++ /dev/null
@@ -1,339 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** This module is [`Belt.MutableSet`]() specialized with key type to be a primitive type.
-    It is more efficient in general, the  API is the same with [`Belt_MutableSet`]() except its key type is fixed,
-    and identity is not needed(using the built-in one)
-*/
-
-module I = Belt_internalSetInt
-module S = Belt_SortArrayInt
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-
-/** The type of the set elements. */
-type value = I.value
-
-/** The type of sets. */
-type t = {mutable data: I.t}
-
-let rec remove0 = (nt, x: value) => {
-  let k = nt.N.value
-  if x == k {
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (Some(_), Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if x < k {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = remove0(l, x)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = remove0(r, x)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let remove = (d, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(oldRoot2) =>
-    let newRoot = remove0(oldRoot2, v)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-let rec removeMany0 = (t, xs, i, len) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = remove0(t, ele)
-    switch u {
-    | None => None
-    | Some(t) => removeMany0(t, xs, i + 1, len)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (d: t, xs) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(nt) =>
-    let len = A.length(xs)
-    d.data = removeMany0(nt, xs, 0, len)
-  }
-}
-
-let rec removeCheck0 = (nt, x: value, removed) => {
-  let k = nt.N.value
-  if x == k {
-    let () = removed.contents = true
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (Some(_), Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if x < k {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = removeCheck0(l, x, removed)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = removeCheck0(r, x, removed)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let removeCheck = (d: t, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => false
-  | Some(oldRoot2) =>
-    let removed = ref(false)
-    let newRoot = removeCheck0(oldRoot2, v, removed)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-    removed.contents
-  }
-}
-
-let rec addCheck0 = (t, x: value, added) =>
-  switch t {
-  | None =>
-    added.contents = true
-    N.singleton(x)
-  | Some(nt) =>
-    let k = nt.N.value
-    if x == k {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < k {
-        let ll = addCheck0(l, x, added)
-        nt.left = ll
-      } else {
-        nt.right = addCheck0(r, x, added)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let addCheck = (m: t, e) => {
-  let oldRoot = m.data
-  let added = ref(false)
-  let newRoot = addCheck0(oldRoot, e, added)
-  if newRoot !== oldRoot {
-    m.data = newRoot
-  }
-  added.contents
-}
-
-let add = (d, k) => {
-  let oldRoot = d.data
-  let v = I.addMutate(oldRoot, k)
-  if v !== oldRoot {
-    d.data = v
-  }
-}
-
-let addArrayMutate = (t, xs) => {
-  let v = ref(t)
-  for i in 0 to A.length(xs) - 1 {
-    v.contents = I.addMutate(v.contents, A.getUnsafe(xs, i))
-  }
-  v.contents
-}
-
-let mergeMany = (d, arr) => d.data = addArrayMutate(d.data, arr)
-
-let make = () => {data: None}
-
-let isEmpty = d => N.isEmpty(d.data)
-
-let minimum = d => N.minimum(d.data)
-
-let minUndefined = d => N.minUndefined(d.data)
-
-let maximum = d => N.maximum(d.data)
-
-let maxUndefined = d => N.maxUndefined(d.data)
-
-let forEachU = (d, f) => N.forEachU(d.data, f)
-let forEach = (d, f) => forEachU(d, (. a) => f(a))
-
-let reduceU = (d, acc, cb) => N.reduceU(d.data, acc, cb)
-let reduce = (d, acc, cb) => reduceU(d, acc, (. a, b) => cb(a, b))
-
-let everyU = (d, p) => N.everyU(d.data, p)
-let every = (d, p) => everyU(d, (. a) => p(a))
-let someU = (d, p) => N.someU(d.data, p)
-let some = (d, p) => someU(d, (. a) => p(a))
-let size = d => N.size(d.data)
-let toList = d => N.toList(d.data)
-let toArray = d => N.toArray(d.data)
-
-let fromSortedArrayUnsafe = xs => {data: N.fromSortedArrayUnsafe(xs)}
-
-let checkInvariantInternal = d => N.checkInvariantInternal(d.data)
-
-let fromArray = xs => {data: I.fromArray(xs)}
-
-let cmp = (d0, d1) => I.cmp(d0.data, d1.data)
-let eq = (d0, d1) => I.eq(d0.data, d1.data)
-let get = (d, x) => I.get(d.data, x)
-let getUndefined = (d, x) => I.getUndefined(d.data, x)
-let getExn = (d, x) => I.getExn(d.data, x)
-
-let split = (d, key) => {
-  let arr = N.toArray(d.data)
-  let i = S.binarySearch(arr, key)
-  let len = A.length(arr)
-  if i < 0 {
-    let next = -i - 1
-    (
-      (
-        {data: N.fromSortedArrayAux(arr, 0, next)},
-        {data: N.fromSortedArrayAux(arr, next, len - next)},
-      ),
-      false,
-    )
-  } else {
-    (
-      (
-        {data: N.fromSortedArrayAux(arr, 0, i)},
-        {data: N.fromSortedArrayAux(arr, i + 1, len - i - 1)},
-      ),
-      true,
-    )
-  }
-}
-
-let keepU = (d, p) => {data: N.keepCopyU(d.data, p)}
-let keep = (d, p) => keepU(d, (. a) => p(a))
-
-let partitionU = (d, p) => {
-  let (a, b) = N.partitionCopyU(d.data, p)
-  ({data: a}, {data: b})
-}
-let partition = (d, p) => partitionU(d, (. a) => p(a))
-
-let subset = (a, b) => I.subset(a.data, b.data)
-let intersect = (dataa, datab) => {
-  let (dataa, datab) = (dataa.data, datab.data)
-  switch (dataa, datab) {
-  | (None, _) => make()
-  | (_, None) => make()
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    if (
-      A.getUnsafe(tmp, sizea - 1) < A.getUnsafe(tmp, sizea) ||
-        A.getUnsafe(tmp, totalSize - 1) < A.getUnsafe(tmp, 0)
-    ) {
-      make()
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(Pervasives.min(sizea, sizeb))
-      let k = S.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0)
-      {data: N.fromSortedArrayAux(tmp2, 0, k)}
-    }
-  }
-}
-
-let diff = (dataa, datab): t => {
-  let (dataa, datab) = (dataa.data, datab.data)
-  switch (dataa, datab) {
-  | (None, _) => make()
-  | (_, None) => {data: N.copy(dataa)}
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    if (
-      A.getUnsafe(tmp, sizea - 1) < A.getUnsafe(tmp, sizea) ||
-        A.getUnsafe(tmp, totalSize - 1) < A.getUnsafe(tmp, 0)
-    ) {
-      {data: N.copy(dataa)}
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(sizea)
-      let k = S.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0)
-      {data: N.fromSortedArrayAux(tmp2, 0, k)}
-    }
-  }
-}
-
-let union = (dataa: t, datab: t): t => {
-  let (dataa, datab) = (dataa.data, datab.data)
-  switch (dataa, datab) {
-  | (None, _) => {data: N.copy(datab)}
-  | (_, None) => {data: N.copy(dataa)}
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    if A.getUnsafe(tmp, sizea - 1) < A.getUnsafe(tmp, sizea) {
-      {data: N.fromSortedArrayAux(tmp, 0, totalSize)}
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(totalSize)
-      let k = S.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0)
-      {data: N.fromSortedArrayAux(tmp2, 0, k)}
-    }
-  }
-}
-
-let has = (d, x) => I.has(d.data, x)
-
-let copy = d => {data: N.copy(d.data)}
diff --git a/jscomp/others/belt_MutableSetInt.resi b/jscomp/others/belt_MutableSetInt.resi
deleted file mode 100644
index e7dc512..0000000
--- a/jscomp/others/belt_MutableSetInt.resi
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This module is [`Belt.MutableSet`]() specialized with key type to be a primitive type.
-
-It is more efficient in general, the  API is the same with [`Belt.MutableSet`]() except its key type is fixed,
-and identity is not needed(using the built-in one)
-
-**See** [`Belt.MutableSet`]()
-*/
-
-/** The type of the set elements. */
-type value = int
-
-/** The type of sets. */
-type t
-
-let make: unit => t
-
-let fromArray: array<value> => t
-let fromSortedArrayUnsafe: array<value> => t
-
-let copy: t => t
-let isEmpty: t => bool
-let has: (t, value) => bool
-
-let add: (t, value) => unit
-let addCheck: (t, value) => bool
-let mergeMany: (t, array<value>) => unit
-let remove: (t, value) => unit
-let removeCheck: (t, value) => bool
-let removeMany: (t, array<value>) => unit
-
-let union: (t, t) => t
-let intersect: (t, t) => t
-let diff: (t, t) => t
-let subset: (t, t) => bool
-
-let cmp: (t, t) => int
-let eq: (t, t) => bool
-
-let forEachU: (t, (. value) => unit) => unit
-
-/** In increasing order*/
-let forEach: (t, value => unit) => unit
-
-let reduceU: (t, 'a, (. 'a, value) => 'a) => 'a
-
-/** Iterate in increasing order. */
-let reduce: (t, 'a, ('a, value) => 'a) => 'a
-
-let everyU: (t, (. value) => bool) => bool
-
-/**
-`every(p, s)` checks if all elements of the set satisfy the predicate `p`.
-Order unspecified. */
-let every: (t, value => bool) => bool
-
-let someU: (t, (. value) => bool) => bool
-
-/**
-`some(p, s)` checks if at least one element of the set satisfies the predicate
-`p`. Oder unspecified.
-*/
-let some: (t, value => bool) => bool
-
-let keepU: (t, (. value) => bool) => t
-
-/** 
-`keep(s, p)` returns a fresh copy of the set of all elements in `s` that satisfy
-predicate `p`.
-*/
-let keep: (t, value => bool) => t
-
-let partitionU: (t, (. value) => bool) => (t, t)
-
-/** 
-`partition(s, p)` returns a fresh copy pair of sets `(s1, s2)`, where `s1` is
-the set of all the elements of `s` that satisfy the predicate `p`, and `s2` is
-the set of all the elements of `s` that do not satisfy `p`. 
-*/
-let partition: (t, value => bool) => (t, t)
-
-let size: t => int
-
-/** In increasing order with respect */
-let toList: t => list<value>
-
-/** In increasing order with respect */
-let toArray: t => array<value>
-
-let minimum: t => option<value>
-let minUndefined: t => Js.undefined<value>
-let maximum: t => option<value>
-let maxUndefined: t => Js.undefined<value>
-
-let get: (t, value) => option<value>
-let getUndefined: (t, value) => Js.undefined<value>
-let getExn: (t, value) => value
-
-/**
-`split(s, key)` return a fresh copy of each
-*/
-let split: (t, value) => ((t, t), bool)
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t => unit
diff --git a/jscomp/others/belt_MutableSetString.res b/jscomp/others/belt_MutableSetString.res
deleted file mode 100644
index eb0cb4f..0000000
--- a/jscomp/others/belt_MutableSetString.res
+++ /dev/null
@@ -1,339 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** This module is [`Belt.MutableSet`]() specialized with key type to be a primitive type.
-    It is more efficient in general, the  API is the same with [`Belt_MutableSet`]() except its key type is fixed,
-    and identity is not needed(using the built-in one)
-*/
-
-module I = Belt_internalSetString
-module S = Belt_SortArrayString
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-
-/** The type of the set elements. */
-type value = I.value
-
-/** The type of sets. */
-type t = {mutable data: I.t}
-
-let rec remove0 = (nt, x: value) => {
-  let k = nt.N.value
-  if x == k {
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (Some(_), Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if x < k {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = remove0(l, x)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = remove0(r, x)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let remove = (d, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(oldRoot2) =>
-    let newRoot = remove0(oldRoot2, v)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-let rec removeMany0 = (t, xs, i, len) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = remove0(t, ele)
-    switch u {
-    | None => None
-    | Some(t) => removeMany0(t, xs, i + 1, len)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (d: t, xs) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(nt) =>
-    let len = A.length(xs)
-    d.data = removeMany0(nt, xs, 0, len)
-  }
-}
-
-let rec removeCheck0 = (nt, x: value, removed) => {
-  let k = nt.N.value
-  if x == k {
-    let () = removed.contents = true
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (Some(_), Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if x < k {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = removeCheck0(l, x, removed)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = removeCheck0(r, x, removed)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let removeCheck = (d: t, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => false
-  | Some(oldRoot2) =>
-    let removed = ref(false)
-    let newRoot = removeCheck0(oldRoot2, v, removed)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-    removed.contents
-  }
-}
-
-let rec addCheck0 = (t, x: value, added) =>
-  switch t {
-  | None =>
-    added.contents = true
-    N.singleton(x)
-  | Some(nt) =>
-    let k = nt.N.value
-    if x == k {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < k {
-        let ll = addCheck0(l, x, added)
-        nt.left = ll
-      } else {
-        nt.right = addCheck0(r, x, added)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let addCheck = (m: t, e) => {
-  let oldRoot = m.data
-  let added = ref(false)
-  let newRoot = addCheck0(oldRoot, e, added)
-  if newRoot !== oldRoot {
-    m.data = newRoot
-  }
-  added.contents
-}
-
-let add = (d, k) => {
-  let oldRoot = d.data
-  let v = I.addMutate(oldRoot, k)
-  if v !== oldRoot {
-    d.data = v
-  }
-}
-
-let addArrayMutate = (t, xs) => {
-  let v = ref(t)
-  for i in 0 to A.length(xs) - 1 {
-    v.contents = I.addMutate(v.contents, A.getUnsafe(xs, i))
-  }
-  v.contents
-}
-
-let mergeMany = (d, arr) => d.data = addArrayMutate(d.data, arr)
-
-let make = () => {data: None}
-
-let isEmpty = d => N.isEmpty(d.data)
-
-let minimum = d => N.minimum(d.data)
-
-let minUndefined = d => N.minUndefined(d.data)
-
-let maximum = d => N.maximum(d.data)
-
-let maxUndefined = d => N.maxUndefined(d.data)
-
-let forEachU = (d, f) => N.forEachU(d.data, f)
-let forEach = (d, f) => forEachU(d, (. a) => f(a))
-
-let reduceU = (d, acc, cb) => N.reduceU(d.data, acc, cb)
-let reduce = (d, acc, cb) => reduceU(d, acc, (. a, b) => cb(a, b))
-
-let everyU = (d, p) => N.everyU(d.data, p)
-let every = (d, p) => everyU(d, (. a) => p(a))
-let someU = (d, p) => N.someU(d.data, p)
-let some = (d, p) => someU(d, (. a) => p(a))
-let size = d => N.size(d.data)
-let toList = d => N.toList(d.data)
-let toArray = d => N.toArray(d.data)
-
-let fromSortedArrayUnsafe = xs => {data: N.fromSortedArrayUnsafe(xs)}
-
-let checkInvariantInternal = d => N.checkInvariantInternal(d.data)
-
-let fromArray = xs => {data: I.fromArray(xs)}
-
-let cmp = (d0, d1) => I.cmp(d0.data, d1.data)
-let eq = (d0, d1) => I.eq(d0.data, d1.data)
-let get = (d, x) => I.get(d.data, x)
-let getUndefined = (d, x) => I.getUndefined(d.data, x)
-let getExn = (d, x) => I.getExn(d.data, x)
-
-let split = (d, key) => {
-  let arr = N.toArray(d.data)
-  let i = S.binarySearch(arr, key)
-  let len = A.length(arr)
-  if i < 0 {
-    let next = -i - 1
-    (
-      (
-        {data: N.fromSortedArrayAux(arr, 0, next)},
-        {data: N.fromSortedArrayAux(arr, next, len - next)},
-      ),
-      false,
-    )
-  } else {
-    (
-      (
-        {data: N.fromSortedArrayAux(arr, 0, i)},
-        {data: N.fromSortedArrayAux(arr, i + 1, len - i - 1)},
-      ),
-      true,
-    )
-  }
-}
-
-let keepU = (d, p) => {data: N.keepCopyU(d.data, p)}
-let keep = (d, p) => keepU(d, (. a) => p(a))
-
-let partitionU = (d, p) => {
-  let (a, b) = N.partitionCopyU(d.data, p)
-  ({data: a}, {data: b})
-}
-let partition = (d, p) => partitionU(d, (. a) => p(a))
-
-let subset = (a, b) => I.subset(a.data, b.data)
-let intersect = (dataa, datab) => {
-  let (dataa, datab) = (dataa.data, datab.data)
-  switch (dataa, datab) {
-  | (None, _) => make()
-  | (_, None) => make()
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    if (
-      A.getUnsafe(tmp, sizea - 1) < A.getUnsafe(tmp, sizea) ||
-        A.getUnsafe(tmp, totalSize - 1) < A.getUnsafe(tmp, 0)
-    ) {
-      make()
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(Pervasives.min(sizea, sizeb))
-      let k = S.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0)
-      {data: N.fromSortedArrayAux(tmp2, 0, k)}
-    }
-  }
-}
-
-let diff = (dataa, datab): t => {
-  let (dataa, datab) = (dataa.data, datab.data)
-  switch (dataa, datab) {
-  | (None, _) => make()
-  | (_, None) => {data: N.copy(dataa)}
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    if (
-      A.getUnsafe(tmp, sizea - 1) < A.getUnsafe(tmp, sizea) ||
-        A.getUnsafe(tmp, totalSize - 1) < A.getUnsafe(tmp, 0)
-    ) {
-      {data: N.copy(dataa)}
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(sizea)
-      let k = S.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0)
-      {data: N.fromSortedArrayAux(tmp2, 0, k)}
-    }
-  }
-}
-
-let union = (dataa: t, datab: t): t => {
-  let (dataa, datab) = (dataa.data, datab.data)
-  switch (dataa, datab) {
-  | (None, _) => {data: N.copy(datab)}
-  | (_, None) => {data: N.copy(dataa)}
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    if A.getUnsafe(tmp, sizea - 1) < A.getUnsafe(tmp, sizea) {
-      {data: N.fromSortedArrayAux(tmp, 0, totalSize)}
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(totalSize)
-      let k = S.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0)
-      {data: N.fromSortedArrayAux(tmp2, 0, k)}
-    }
-  }
-}
-
-let has = (d, x) => I.has(d.data, x)
-
-let copy = d => {data: N.copy(d.data)}
diff --git a/jscomp/others/belt_MutableSetString.resi b/jscomp/others/belt_MutableSetString.resi
deleted file mode 100644
index 72aa9be..0000000
--- a/jscomp/others/belt_MutableSetString.resi
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This module is [`Belt.MutableSet`]() specialized with key type to be a primitive type.
-
-It is more efficient in general, the  API is the same with [`Belt.MutableSet`]() except its key type is fixed,
-and identity is not needed(using the built-in one)
-
-**See** [`Belt.MutableSet`]()
-*/
-
-/** The type of the set elements. */
-type value = string
-
-/** The type of sets. */
-type t
-
-let make: unit => t
-
-let fromArray: array<value> => t
-let fromSortedArrayUnsafe: array<value> => t
-
-let copy: t => t
-let isEmpty: t => bool
-let has: (t, value) => bool
-
-let add: (t, value) => unit
-let addCheck: (t, value) => bool
-let mergeMany: (t, array<value>) => unit
-let remove: (t, value) => unit
-let removeCheck: (t, value) => bool
-let removeMany: (t, array<value>) => unit
-
-let union: (t, t) => t
-let intersect: (t, t) => t
-let diff: (t, t) => t
-let subset: (t, t) => bool
-
-let cmp: (t, t) => int
-let eq: (t, t) => bool
-
-let forEachU: (t, (. value) => unit) => unit
-
-/** In increasing order*/
-let forEach: (t, value => unit) => unit
-
-let reduceU: (t, 'a, (. 'a, value) => 'a) => 'a
-
-/** Iterate in increasing order. */
-let reduce: (t, 'a, ('a, value) => 'a) => 'a
-
-let everyU: (t, (. value) => bool) => bool
-
-/**
-`every(p, s)` checks if all elements of the set satisfy the predicate `p`.
-Order unspecified. */
-let every: (t, value => bool) => bool
-
-let someU: (t, (. value) => bool) => bool
-
-/**
-`some(p, s)` checks if at least one element of the set satisfies the predicate
-`p`. Oder unspecified.
-*/
-let some: (t, value => bool) => bool
-
-let keepU: (t, (. value) => bool) => t
-
-/** 
-`keep(s, p)` returns a fresh copy of the set of all elements in `s` that satisfy
-predicate `p`.
-*/
-let keep: (t, value => bool) => t
-
-let partitionU: (t, (. value) => bool) => (t, t)
-
-/** 
-`partition(s, p)` returns a fresh copy pair of sets `(s1, s2)`, where `s1` is
-the set of all the elements of `s` that satisfy the predicate `p`, and `s2` is
-the set of all the elements of `s` that do not satisfy `p`. 
-*/
-let partition: (t, value => bool) => (t, t)
-
-let size: t => int
-
-/** In increasing order with respect */
-let toList: t => list<value>
-
-/** In increasing order with respect */
-let toArray: t => array<value>
-
-let minimum: t => option<value>
-let minUndefined: t => Js.undefined<value>
-let maximum: t => option<value>
-let maxUndefined: t => Js.undefined<value>
-
-let get: (t, value) => option<value>
-let getUndefined: (t, value) => Js.undefined<value>
-let getExn: (t, value) => value
-
-/**
-`split(s, key)` return a fresh copy of each
-*/
-let split: (t, value) => ((t, t), bool)
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t => unit
diff --git a/jscomp/others/belt_MutableStack.res b/jscomp/others/belt_MutableStack.res
deleted file mode 100644
index 2d7b34f..0000000
--- a/jscomp/others/belt_MutableStack.res
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 rec t<'a> = {mutable root: opt_cell<'a>}
-and opt_cell<'a> = option<cell<'a>>
-and cell<'a> = {
-  head: 'a,
-  tail: opt_cell<'a>,
-}
-
-let make = () => {root: None}
-
-let clear = s => s.root = None
-
-let copy = (s: t<_>): t<_> => {root: s.root}
-
-let push = (s, x) => s.root = Some({head: x, tail: s.root})
-
-let topUndefined = (s: t<'a>) =>
-  switch s.root {
-  | None => Js.undefined
-  | Some(x) => Js.Undefined.return(x.head)
-  }
-
-let top = s =>
-  switch s.root {
-  | None => None
-  | Some(x) => Some(x.head)
-  }
-
-let isEmpty = s => s.root == None
-
-let popUndefined = s =>
-  switch s.root {
-  | None => Js.undefined
-  | Some(x) =>
-    s.root = x.tail
-    Js.Undefined.return(x.head)
-  }
-
-let pop = s =>
-  switch s.root {
-  | None => None
-  | Some(x) =>
-    s.root = x.tail
-    Some(x.head)
-  }
-
-let rec lengthAux = (x: cell<_>, acc) =>
-  switch x.tail {
-  | None => acc + 1
-  | Some(x) => lengthAux(x, acc + 1)
-  }
-
-let size = s =>
-  switch s.root {
-  | None => 0
-  | Some(x) => lengthAux(x, 0)
-  }
-
-let rec iterAux = (s: opt_cell<_>, f) =>
-  switch s {
-  | None => ()
-  | Some(x) =>
-    f(. x.head)
-    iterAux(x.tail, f)
-  }
-
-let forEachU = (s, f) => iterAux(s.root, f)
-
-let forEach = (s, f) => forEachU(s, (. x) => f(x))
-
-let rec dynamicPopIterU = (s, f) =>
-  switch s.root {
-  | Some({tail, head}) =>
-    s.root = tail
-    f(. head)
-    dynamicPopIterU(s, f) /* using root, `f` may change it */
-  | None => ()
-  }
-
-let dynamicPopIter = (s, f) => dynamicPopIterU(s, (. x) => f(x))
diff --git a/jscomp/others/belt_MutableStack.resi b/jscomp/others/belt_MutableStack.resi
deleted file mode 100644
index cb11d4a..0000000
--- a/jscomp/others/belt_MutableStack.resi
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-First in last out stack. This module implements stacks, with in-place
-modification.
-*/
-
-type t<'a>
-
-/**
-Returns a new stack, initially empty.
-*/
-let make: unit => t<'a>
-
-/**
-Discard all elements from the stack.
-*/
-let clear: t<'a> => unit
-
-/**
-`copy(x)` O(1) operation, return a new stack.
-*/
-let copy: t<'a> => t<'a>
-
-let push: (t<'a>, 'a) => unit
-let popUndefined: t<'a> => Js.undefined<'a>
-let pop: t<'a> => option<'a>
-let topUndefined: t<'a> => Js.undefined<'a>
-let top: t<'a> => option<'a>
-let isEmpty: t<'a> => bool
-let size: t<'a> => int
-let forEachU: (t<'a>, (. 'a) => unit) => unit
-let forEach: (t<'a>, 'a => unit) => unit
-let dynamicPopIterU: (t<'a>, (. 'a) => unit) => unit
-
-/**
-`dynamicPopIter(s, f)` apply `f` to each element of `s`. The item is poped
-before applying `f`, `s` will be empty after this opeartion. This function is
-useful for worklist algorithm.
- */
-let dynamicPopIter: (t<'a>, 'a => unit) => unit
diff --git a/jscomp/others/belt_Option.res b/jscomp/others/belt_Option.res
deleted file mode 100644
index b7371b4..0000000
--- a/jscomp/others/belt_Option.res
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let keepU = (opt, p) =>
-  switch opt {
-  | Some(x) as some if p(. x) => some
-  | _ => None
-  }
-
-let keep = (opt, p) => keepU(opt, (. x) => p(x))
-
-let forEachU = (opt, f) =>
-  switch opt {
-  | Some(x) => f(. x)
-  | None => ()
-  }
-
-let forEach = (opt, f) => forEachU(opt, (. x) => f(x))
-
-let getExn = x =>
-  switch x {
-  | Some(x) => x
-  | None => raise(Not_found)
-  }
-
-external getUnsafe: option<'a> => 'a = "%identity"
-
-let mapWithDefaultU = (opt, default, f) =>
-  switch opt {
-  | Some(x) => f(. x)
-  | None => default
-  }
-
-let mapWithDefault = (opt, default, f) => mapWithDefaultU(opt, default, (. x) => f(x))
-
-let mapU = (opt, f) =>
-  switch opt {
-  | Some(x) => Some(f(. x))
-  | None => None
-  }
-
-let map = (opt, f) => mapU(opt, (. x) => f(x))
-
-let flatMapU = (opt, f) =>
-  switch opt {
-  | Some(x) => f(. x)
-  | None => None
-  }
-
-let flatMap = (opt, f) => flatMapU(opt, (. x) => f(x))
-
-let getWithDefault = (opt, default) =>
-  switch opt {
-  | Some(x) => x
-  | None => default
-  }
-
-let orElse = (opt, other) =>
-  switch opt {
-  | Some(_) as some => some
-  | None => other
-  }
-
-let isSome = x =>
-  switch x {
-  | Some(_) => true
-  | None => false
-  }
-
-let isNone = x => x == None
-
-let eqU = (a, b, f) =>
-  switch a {
-  | Some(a) =>
-    switch b {
-    | None => false
-    | Some(b) => f(. a, b)
-    }
-  | None => b == None
-  }
-
-let eq = (a, b, f) => eqU(a, b, (. x, y) => f(x, y))
-
-let cmpU = (a, b, f) =>
-  switch (a, b) {
-  | (Some(a), Some(b)) => f(. a, b)
-  | (None, Some(_)) => -1
-  | (Some(_), None) => 1
-  | (None, None) => 0
-  }
-
-let cmp = (a, b, f) => cmpU(a, b, (. x, y) => f(x, y))
diff --git a/jscomp/others/belt_Option.resi b/jscomp/others/belt_Option.resi
deleted file mode 100644
index 5764811..0000000
--- a/jscomp/others/belt_Option.resi
+++ /dev/null
@@ -1,295 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-In Belt we represent the existence and nonexistence of a value by wrapping it
-with the `option` type.  In order to make it a bit more convenient to work with
-option-types, Belt provides utility-functions for it.
-
-The `option` type is a part of the ReScript standard library which is defined like this:
-
-## Examples
-
-```rescript
-type option<'a> = None | Some('a)
-```
-
-```rescript
-let someString: option<string> = Some("hello")
-```
-*/
-
-/** Uncurried version of `keep` */
-let keepU: (option<'a>, (. 'a) => bool) => option<'a>
-
-/**
-If `optionValue` is `Some(value)` and `p(value) = true`, it returns `Some(value)`; otherwise returns `None`
-
-## Examples
-
-```rescript
-Belt.Option.keep(Some(10), x => x > 5) /* returns `Some(10)` */
-Belt.Option.keep(Some(4), x => x > 5) /* returns `None` */
-Belt.Option.keep(None, x => x > 5) /* returns `None` */
-```
-*/
-let keep: (option<'a>, 'a => bool) => option<'a>
-
-/** Uncurried version of `forEach` */
-let forEachU: (option<'a>, (. 'a) => unit) => unit
-
-/**
-If `optionValue` is `Some(value`), it calls `f(value)`; otherwise returns `()`
-
-## Examples
-
-```rescript
-Belt.Option.forEach(Some("thing"), x => Js.log(x)) /* logs "thing" */
-Belt.Option.forEach(None, x => Js.log(x)) /* returns () */
-```
-*/
-let forEach: (option<'a>, 'a => unit) => unit
-
-/**
-Raises an Error in case `None` is provided. Use with care.
-
-## Examples
-
-```rescript
-Belt.Option.getExn(Some(3)) /* 3 */
-
-Belt.Option.getExn(None) /* Raises an Error */
-```
-*/
-let getExn: option<'a> => 'a
-
-/**
-`getUnsafe(x)` returns `x`
-
-This is an unsafe operation, it assumes `x` is neither `None`
-nor `Some(None(...)))`
-*/
-external getUnsafe: option<'a> => 'a = "%identity"
-
-/** Uncurried version of `mapWithDefault` */
-let mapWithDefaultU: (option<'a>, 'b, (. 'a) => 'b) => 'b
-
-/**
-If `optionValue` is of `Some(value)`,
-this function returns that value applied with `f`, in other words `f(value)`.
-
-If `optionValue` is `None`, the default is returned.
-
-## Examples
-
-```rescript
-let someValue = Some(3)
-someValue->Belt.Option.mapWithDefault(0, x => x + 5) /* 8 */
-
-let noneValue = None
-noneValue->Belt.Option.mapWithDefault(0, x => x + 5) /* 0 */
-```
-*/
-let mapWithDefault: (option<'a>, 'b, 'a => 'b) => 'b
-
-/** Uncurried version of `map` */
-let mapU: (option<'a>, (. 'a) => 'b) => option<'b>
-
-/**
-If `optionValue` is `Some(value)` this returns `f(value)`, otherwise it returns `None`.
-
-## Examples
-
-```rescript
-Belt.Option.map(Some(3), x => x * x) /* Some(9) */
-
-Belt.Option.map(None, x => x * x) /* None */
-```
-*/
-let map: (option<'a>, 'a => 'b) => option<'b>
-
-/** Uncurried version of `flatMap` */
-let flatMapU: (option<'a>, (. 'a) => option<'b>) => option<'b>
-
-/**
-If `optionValue` is `Some(value)`, returns `f(value)`, otherwise returns
-`None`.<br/>
-The function `f` must have a return type of `option<'b>`.
-
-## Examples
-
-```rescript
-let addIfAboveOne = value =>
-   if (value > 1) {
-      Some(value + 1)
-   } else {
-      None
-   }
-
-Belt.Option.flatMap(Some(2), addIfAboveOne) /* Some(3) */
-
-Belt.Option.flatMap(Some(-4), addIfAboveOne) /* None */
-
-Belt.Option.flatMap(None, addIfAboveOne) /* None */
-```
-*/
-let flatMap: (option<'a>, 'a => option<'b>) => option<'b>
-
-/**
-If `optionalValue` is `Some(value)`, returns `value`, otherwise default.
-
-## Examples
-
-```rescript
-Belt.Option.getWithDefault(None, "Banana") /* Banana */
-
-Belt.Option.getWithDefault(Some("Apple"), "Banana") /* Apple */
-```
-
-```rescript
-let greet = (firstName: option<string>) =>
-   "Greetings " ++ firstName->Belt.Option.getWithDefault("Anonymous")
-
-Some("Jane")->greet /* "Greetings Jane" */
-
-None->greet /* "Greetings Anonymous" */
-```
-*/
-let getWithDefault: (option<'a>, 'a) => 'a
-
-/**
-`orElse(optionalValue, otherOptional)` if `optionalValue` is `Some(value)`,
-returns `Some(value)`, otherwise `otherOptional`
-
-## Examples
-
-```rescript
-Belt.Option.orElse(Some(1812), Some(1066)) == Some(1812)
-Belt.Option.orElse(None, Some(1066)) == Some(1066)
-Belt.Option.orElse(None, None) == None
-```
-*/
-let orElse: (option<'a>, option<'a>) => option<'a>
-
-/**
-Returns `true` if the argument is `Some(value)`, `false` otherwise.
-
-## Examples
-
-```rescript
-Belt.Option.isSome(None) /* false */
-
-Belt.Option.isSome(Some(1)) /* true */
-```
-*/
-let isSome: option<'a> => bool
-
-/**
-Returns `true` if the argument is `None`, `false` otherwise.
-
-## Examples
-
-```rescript
-Belt.Option.isNone(None) /* true */
-
-Belt.Option.isNone(Some(1)) /* false */
-```
-*/
-let isNone: option<'a> => bool
-
-/**
-Uncurried version of `eq`
-*/
-let eqU: (option<'a>, option<'b>, (. 'a, 'b) => bool) => bool
-
-/**
-Evaluates two optional values for equality with respect to a predicate
-function. If both `optValue1` and `optValue2` are `None`, returns `true`.
-If one of the arguments is `Some(value)` and the other is `None`, returns
-`false`.
-
-If arguments are `Some(value1)` and `Some(value2)`, returns the result of
-`predicate(value1, value2)`; the predicate function must return a bool.
-
-## Examples
-
-```rescript
-let clockEqual = (a, b) => mod(a, 12) == mod(b, 12)
-
-open Belt.Option
-
-eq(Some(3), Some(15), clockEqual) /* true */
-
-eq(Some(3), None, clockEqual) /* false */
-
-eq(None, Some(3), clockEqual) /* false */
-
-eq(None, None, clockEqual) /* true */
-```
-*/
-let eq: (option<'a>, option<'b>, ('a, 'b) => bool) => bool
-
-/**
-Uncurried version of `cmp`
-*/
-let cmpU: (option<'a>, option<'b>, (. 'a, 'b) => int) => int
-
-/**
-`cmp(optValue1, optValue2, comparisonFunction)` compares two optional values
-with respect to given `comparisonFunction`.
-
-If both `optValue1` and `optValue2` are `None`, it returns `0`.
-
-If the first argument is `Some(value1)` and the second is `None`, returns `1`
-(something is greater than nothing).
-
-If the first argument is `None` and the second is `Some(value2)`, returns `-1`
-(nothing is less than something).
-
-If the arguments are `Some(value1)` and `Some(value2)`, returns the result of
-`comparisonFunction(value1, value2)`; comparisonFunction takes two arguments
-and returns `-1` if the first argument is less than the second, `0` if the
-arguments are equal, and `1` if the first argument is greater than the second.
-
-## Examples
-
-```rescript
-let clockCompare = (a, b) => compare(mod(a, 12), mod(b, 12))
-
-open Belt.Option
-
-cmp(Some(3), Some(15), clockCompare) /* 0 */
-
-cmp(Some(3), Some(14), clockCompare) /* 1 */
-
-cmp(Some(2), Some(15), clockCompare) /* (-1) */
-
-cmp(None, Some(15), clockCompare) /* (-1) */
-
-cmp(Some(14), None, clockCompare) /* 1 */
-
-cmp(None, None, clockCompare) /* 0 */
-```
-*/
-let cmp: (option<'a>, option<'b>, ('a, 'b) => int) => int
diff --git a/jscomp/others/belt_Range.res b/jscomp/others/belt_Range.res
deleted file mode 100644
index c8f5d33..0000000
--- a/jscomp/others/belt_Range.res
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let forEachU = (s, f, action) =>
-  for i in s to f {
-    (action(. i): unit)
-  }
-
-let forEach = (s, f, action) => forEachU(s, f, (. a) => action(a))
-
-let rec everyU = (s, f, p) =>
-  if s > f {
-    true
-  } else {
-    p(. s) && everyU(s + 1, f, p)
-  }
-
-let every = (s, f, p) => everyU(s, f, (. a) => p(a))
-
-let rec everyByAux = (s, f, ~step, p) =>
-  if s > f {
-    true
-  } else {
-    p(. s) && everyByAux(s + step, f, ~step, p)
-  }
-
-let everyByU = (s, f, ~step, p) =>
-  if step > 0 {
-    everyByAux(s, f, ~step, p)
-  } else {
-    true
-  } /* return empty range `true` */
-
-let everyBy = (s, f, ~step, p) => everyByU(s, f, ~step, (. a) => p(a))
-
-let rec someU = (s, f, p) =>
-  if s > f {
-    false
-  } else {
-    p(. s) || someU(s + 1, f, p)
-  }
-
-let some = (s, f, p) => someU(s, f, (. a) => p(a))
-
-let rec someByAux = (s, f, ~step, p) =>
-  if s > f {
-    false
-  } else {
-    p(. s) || someByAux(s + step, f, ~step, p)
-  }
-
-let someByU = (s, f, ~step, p) =>
-  if step > 0 {
-    someByAux(s, f, ~step, p)
-  } else {
-    false
-  } /* return empty range, `false` */
-
-let someBy = (s, f, ~step, p) => someByU(s, f, ~step, (. a) => p(a))
diff --git a/jscomp/others/belt_Range.resi b/jscomp/others/belt_Range.resi
deleted file mode 100644
index b0ad2f2..0000000
--- a/jscomp/others/belt_Range.resi
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-A small utility module to provide inclusive range operations for `[start, finish]`.
-Internally it is relying on loops instead of creating new arrays, which makes it
-pretty performant and memory friendly.
-*/
-
-let forEachU: (int, int, (. int) => unit) => unit
-
-/**
-`forEach(start, finish, action)` equivalent to `Belt.Array.forEach(Belt.Array.range(start, finish), action))`
-
-## Examples
-
-```rescript
-Belt.Range.forEach(0, 4, (i) => Js.log(i))
-
-// Prints:
-// 0
-// 1
-// 2
-// 3
-// 4
-```
-*/
-let forEach: (int, int, int => unit) => unit
-
-let everyU: (int, int, (. int) => bool) => bool
-
-/**
-`every(start, finish, p)` equivalent to `Belt.Array.every(Belt.Array.range(start, finish), p)`
-## Examples
-
-```rescript
-Belt.Range.every(0, 4, (i) => i < 5) /* true */
-
-Belt.Range.every(0, 4, (i) => i < 4) /* false */
-```
-*/
-let every: (int, int, int => bool) => bool
-
-let everyByU: (int, int, ~step: int, (. int) => bool) => bool
-
-/**
-`everyBy(start, finish, ~step, p)`. See `Belt.Array.rangeBy`, equivalent to
-`Belt.Array.every(Belt.Array.rangeBy(start, finish, ~step), p)`
-
-## Examples
-
-```rescript
-Belt.Range.everyBy(0, 4, ~step=1, (i) => mod(i, 2) === 0) /* false */
-
-Belt.Range.everyBy(0, 4, ~step=2, (i) => mod(i, 2) === 0) /* true */
-```
-*/
-let everyBy: (int, int, ~step: int, int => bool) => bool
-
-let someU: (int, int, (. int) => bool) => bool
-
-/**
-`some(start, finish, p)` equivalent to `Belt.Array.some(Belt.Array.range(start, finish), p)`
-
-## Examples
-
-```rescript
-Belt.Range.some(0, 4, (i) => i > 5) /* false */
-
-Belt.Range.some(0, 4, (i) => i > 2) /* true */
-```
-*/
-let some: (int, int, int => bool) => bool
-
-let someByU: (int, int, ~step: int, (. int) => bool) => bool
-
-/**
-`someBy(start, finish, ~step, p)` See `Belt.Array.rangeBy`, equivalent to
-`Belt.Array.some(Belt.Array.rangeBy(start, finish, ~step), p)`
-
-## Examples
-
-```rescript
-Belt.Range.someBy(1, 5, ~step=2, (i) => mod(i, 2) === 0) /* false */
-Belt.Range.someBy(0, 4, ~step=2, (i) => mod(i, 2) === 0) /* true */
-```
-*/
-let someBy: (int, int, ~step: int, int => bool) => bool
diff --git a/jscomp/others/belt_Result.res b/jscomp/others/belt_Result.res
deleted file mode 100644
index a1cbba1..0000000
--- a/jscomp/others/belt_Result.res
+++ /dev/null
@@ -1,95 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t<'a, 'b> = result<'a, 'b> =
-  | Ok('a)
-  | Error('b)
-
-let getExn = x =>
-  switch x {
-  | Ok(x) => x
-  | Error(_) => raise(Not_found)
-  }
-
-let mapWithDefaultU = (opt, default, f) =>
-  switch opt {
-  | Ok(x) => f(. x)
-  | Error(_) => default
-  }
-
-let mapWithDefault = (opt, default, f) => mapWithDefaultU(opt, default, (. x) => f(x))
-
-let mapU = (opt, f) =>
-  switch opt {
-  | Ok(x) => Ok(f(. x))
-  | Error(y) => Error(y)
-  }
-
-let map = (opt, f) => mapU(opt, (. x) => f(x))
-
-let flatMapU = (opt, f) =>
-  switch opt {
-  | Ok(x) => f(. x)
-  | Error(y) => Error(y)
-  }
-
-let flatMap = (opt, f) => flatMapU(opt, (. x) => f(x))
-
-let getWithDefault = (opt, default) =>
-  switch opt {
-  | Ok(x) => x
-  | Error(_) => default
-  }
-
-let isOk = x =>
-  switch x {
-  | Ok(_) => true
-  | Error(_) => false
-  }
-
-let isError = x =>
-  switch x {
-  | Ok(_) => false
-  | Error(_) => true
-  }
-
-let eqU = (a, b, f) =>
-  switch (a, b) {
-  | (Ok(a), Ok(b)) => f(. a, b)
-  | (Error(_), Ok(_))
-  | (Ok(_), Error(_)) => false
-  | (Error(_), Error(_)) => true
-  }
-
-let eq = (a, b, f) => eqU(a, b, (. x, y) => f(x, y))
-
-let cmpU = (a, b, f) =>
-  switch (a, b) {
-  | (Ok(a), Ok(b)) => f(. a, b)
-  | (Error(_), Ok(_)) => -1
-  | (Ok(_), Error(_)) => 1
-  | (Error(_), Error(_)) => 0
-  }
-
-let cmp = (a, b, f) => cmpU(a, b, (. x, y) => f(x, y))
diff --git a/jscomp/others/belt_Result.resi b/jscomp/others/belt_Result.resi
deleted file mode 100644
index 91e1f66..0000000
--- a/jscomp/others/belt_Result.resi
+++ /dev/null
@@ -1,204 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Result types are really useful to describe the result of a certain operation
-without relying on exceptions or `option` types.
-
-This module gives you useful utilities to create and combine `Result` data.
-*/
-
-type t<'a, 'b> = result<'a, 'b> =
-  | Ok('a)
-  | Error('b)
-
-/**
-`getExn(res)`: when `res` is `Ok(n)`, returns `n` when `res` is `Error(m)`, raise an exception
-
-## Examples
-
-```rescript
-Belt.Result.getExn(Belt.Result.Ok(42)) == 42
-
-Belt.Result.getExn(Belt.Result.Error("Invalid data")) /* raises exception */
-```
-*/
-let getExn: t<'a, 'b> => 'a
-
-let mapWithDefaultU: (t<'a, 'c>, 'b, (. 'a) => 'b) => 'b
-/**
-`mapWithDefault(res, default, f)`: When res is `Ok(n)`, returns `f(n)`,
-otherwise `default`.
-
-## Examples
-
-```rescript
-let ok = Belt.Result.Ok(42)
-Belt.Result.mapWithDefault(ok, 0, (x) => x / 2) == 21
-
-let error = Belt.Result.Error("Invalid data")
-Belt.Result.mapWithDefault(error, 0, (x) => x / 2) == 0
-```
-*/
-let mapWithDefault: (t<'a, 'c>, 'b, 'a => 'b) => 'b
-
-let mapU: (t<'a, 'c>, (. 'a) => 'b) => t<'b, 'c>
-/**
-`map(res, f)`: When res is `Ok(n)`, returns `Ok(f(n))`. Otherwise returns res
-unchanged. Function `f` takes a value of the same type as `n` and returns an
-ordinary value.
-
-## Examples
-
-```rescript
-let f = (x) => sqrt(Belt.Int.toFloat(x))
-
-Belt.Result.map(Ok(64), f) == Ok(8.0)
-
-Belt.Result.map(Error("Invalid data"), f) == Error("Invalid data")
-```
-*/
-let map: (t<'a, 'c>, 'a => 'b) => t<'b, 'c>
-
-let flatMapU: (t<'a, 'c>, (. 'a) => t<'b, 'c>) => t<'b, 'c>
-/**
-`flatMap(res, f)`: When res is `Ok(n)`, returns `f(n)`. Otherwise, returns res
-unchanged. Function `f` takes a value of the same type as `n` and returns a
-`Belt.Result`.
-
-## Examples
-
-```rescript
-let recip = (x) =>
-  if (x !== 0.0) {
-    Belt.Result.Ok(1.0 /. x)
-  } else {
-    Belt.Result.Error("Divide by zero")
-  }
-
-Belt.Result.flatMap(Ok(2.0), recip) == Ok(0.5)
-
-Belt.Result.flatMap(Ok(0.0), recip) == Error("Divide by zero")
-
-Belt.Result.flatMap(Error("Already bad"), recip) == Error("Already bad")
-```
-*/
-let flatMap: (t<'a, 'c>, 'a => t<'b, 'c>) => t<'b, 'c>
-
-/**
-`getWithDefault(res, defaultValue)`: If `res` is `Ok(n)`, returns `n`,
-otherwise `default`
-
-## Examples
-
-```rescript
-Belt.Result.getWithDefault(Ok(42), 0) == 42
-
-Belt.Result.getWithDefault(Error("Invalid Data"), 0) == 0
-```
-*/
-let getWithDefault: (t<'a, 'b>, 'a) => 'a
-
-/**
-`isOk(res)`: Returns `true` if `res` is of the form `Ok(n)`, `false` if it is
-the `Error(e)` variant.
-*/
-let isOk: t<'a, 'b> => bool
-
-/**
-`isError(res)`: Returns `true` if `res` is of the form `Error(e)`, `false` if
-it is the `Ok(n)` variant.
-*/
-let isError: t<'a, 'b> => bool
-
-let eqU: (t<'a, 'c>, t<'b, 'd>, (. 'a, 'b) => bool) => bool
-/**
-`eq(res1, res2, f)`: Determine if two `Belt.Result` variables are equal with
-respect to an equality function. If `res1` and `res2` are of the form `Ok(n)`
-and `Ok(m)`, return the result of `f(n, m)`. If one of `res1` and `res2` are of
-the form `Error(e)`, return false If both `res1` and `res2` are of the form
-`Error(e)`, return true
-
-## Examples
-
-```rescript
-let good1 = Belt.Result.Ok(42)
-
-let good2 = Belt.Result.Ok(32)
-
-let bad1 = Belt.Result.Error("invalid")
-
-let bad2 = Belt.Result.Error("really invalid")
-
-let mod10equal = (a, b) => mod(a, 10) === mod(b, 10)
-
-Belt.Result.eq(good1, good2, mod10equal) == true
-
-Belt.Result.eq(good1, bad1, mod10equal) == false
-
-Belt.Result.eq(bad2, good2, mod10equal) == false
-
-Belt.Result.eq(bad1, bad2, mod10equal) == true
-```
-*/
-let eq: (t<'a, 'c>, t<'b, 'd>, ('a, 'b) => bool) => bool
-
-let cmpU: (t<'a, 'c>, t<'b, 'd>, (. 'a, 'b) => int) => int
-/**
-`cmp(res1, res2, f)`: Compare two `Belt.Result` variables with respect to a
-comparison function. The comparison function returns -1 if the first variable
-is "less than" the second, 0 if the two variables are equal, and 1 if the first
-is "greater than" the second.
-
-If `res1` and `res2` are of the form `Ok(n)` and `Ok(m)`, return the result of
-`f(n, m)`. If `res1` is of the form `Error(e)` and `res2` of the form `Ok(n)`,
-return -1 (nothing is less than something) If `res1` is of the form `Ok(n)` and
-`res2` of the form `Error(e)`, return 1 (something is greater than nothing) If
-both `res1` and `res2` are of the form `Error(e)`, return 0 (equal)
-
-## Examples
-
-```rescript
-let good1 = Belt.Result.Ok(59)
-
-let good2 = Belt.Result.Ok(37)
-
-let bad1 = Belt.Result.Error("invalid")
-
-let bad2 = Belt.Result.Error("really invalid")
-
-let mod10cmp = (a, b) => Pervasives.compare(mod(a, 10), mod(b, 10))
-
-Belt.Result.cmp(Ok(39), Ok(57), mod10cmp) == 1
-
-Belt.Result.cmp(Ok(57), Ok(39), mod10cmp) == (-1)
-
-Belt.Result.cmp(Ok(39), Error("y"), mod10cmp) == 1
-
-Belt.Result.cmp(Error("x"), Ok(57), mod10cmp) == (-1)
-
-Belt.Result.cmp(Error("x"), Error("y"), mod10cmp) == 0
-```
-*/
-let cmp: (t<'a, 'c>, t<'b, 'd>, ('a, 'b) => int) => int
diff --git a/jscomp/others/belt_Set.cppo.res b/jscomp/others/belt_Set.cppo.res
deleted file mode 100644
index 2ef4124..0000000
--- a/jscomp/others/belt_Set.cppo.res
+++ /dev/null
@@ -1,233 +0,0 @@
-#ifdef TYPE_INT
-module I = Belt_internalSetInt
-#elif defined TYPE_STRING
-module I = Belt_internalSetString
-#else
-[%error "unknown type"]
-#endif
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-
-type value = I.value
-type t = I.t
-
-let empty = None
-let isEmpty = N.isEmpty
-let minimum = N.minimum
-let minUndefined = N.minUndefined
-let maximum = N.maximum
-let maxUndefined = N.maxUndefined
-
-let forEach = N.forEach
-let forEachU = N.forEachU
-let reduce = N.reduce
-let reduceU = N.reduceU
-let every = N.every
-let everyU = N.everyU
-let some = N.some
-let someU = N.someU
-let keep = N.keepShared
-let keepU = N.keepSharedU
-let partition = N.partitionShared
-let partitionU = N.partitionSharedU
-
-let size = N.size
-let toList = N.toList
-let toArray = N.toArray
-let fromSortedArrayUnsafe = N.fromSortedArrayUnsafe
-let checkInvariantInternal = N.checkInvariantInternal
-
-let rec add = (t: t, x: value): t =>
-  switch t {
-  | None => N.singleton(x)
-  | Some(nt) =>
-    let v = nt.value
-    if x == v {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < v {
-        let ll = add(l, x)
-        if ll === l {
-          t
-        } else {
-          N.bal(ll, v, r)
-        }
-      } else {
-        let rr = add(r, x)
-        if rr === r {
-          t
-        } else {
-          N.bal(l, v, rr)
-        }
-      }
-    }
-  }
-
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let key = A.getUnsafe(arr, i)
-    v.contents = add(v.contents, key)
-  }
-  v.contents
-}
-
-let rec remove = (t: t, x: value): t =>
-  switch t {
-  | None => t
-  | Some(n) =>
-    let {N.left: l, value: v, right: r} = n
-    if x == v {
-      switch (l, r) {
-      | (None, _) => r
-      | (_, None) => l
-      | (_, Some(rn)) =>
-        let v = ref(rn.value)
-        let r = N.removeMinAuxWithRef(rn, v)
-        N.bal(l, v.contents, r)
-      }
-    } else if x < v {
-      let ll = remove(l, x)
-      if ll === l {
-        t
-      } else {
-        N.bal(ll, v, r)
-      }
-    } else {
-      let rr = remove(r, x)
-      if rr === r {
-        t
-      } else {
-        N.bal(l, v, rr)
-      }
-    }
-  }
-
-let removeMany = (h, arr) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let key = A.getUnsafe(arr, i)
-    v.contents = remove(v.contents, key)
-  }
-  v.contents
-}
-
-let fromArray = I.fromArray
-let cmp = I.cmp
-let eq = I.eq
-let get = I.get
-let getUndefined = I.getUndefined
-let getExn = I.getExn
-let subset = I.subset
-let has = I.has
-
-let rec splitAuxNoPivot = (n: N.node<_>, x: value): (t, t) => {
-  let {N.left: l, value: v, right: r} = n
-  if x == v {
-    (l, r)
-  } else if x < v {
-    switch l {
-    | None => (None, Some(n))
-    | Some(l) =>
-      let (ll, rl) = splitAuxNoPivot(l, x)
-      (ll, N.joinShared(rl, v, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None)
-    | Some(r) =>
-      let (lr, rr) = splitAuxNoPivot(r, x)
-      (N.joinShared(l, v, lr), rr)
-    }
-  }
-}
-
-let rec splitAuxPivot = (n: N.node<_>, x: value, pres): (t, t) => {
-  let {N.left: l, value: v, right: r} = n
-  if x == v {
-    pres.contents = true
-    (l, r)
-  } else if x < v {
-    switch l {
-    | None => (None, Some(n))
-    | Some(l) =>
-      let (ll, rl) = splitAuxPivot(l, x, pres)
-      (ll, N.joinShared(rl, v, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None)
-    | Some(r) =>
-      let (lr, rr) = splitAuxPivot(r, x, pres)
-      (N.joinShared(l, v, lr), rr)
-    }
-  }
-}
-
-let split = (t: t, x: value) =>
-  switch t {
-  | None => ((None, None), false)
-  | Some(n) =>
-    let pres = ref(false)
-    let v = splitAuxPivot(n, x, pres)
-    (v, pres.contents)
-  }
-
-let rec union = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) => s2
-  | (_, None) => s1
-  | (Some(n1), Some(n2)) /* (Node(l1, v1, r1, h1), Node(l2, v2, r2, h2)) */ =>
-    let (h1, h2) = (n1.height, n2.height)
-    if h1 >= h2 {
-      if h2 == 1 {
-        add(s1, n2.value)
-      } else {
-        let {N.left: l1, value: v1, right: r1} = n1
-        let (l2, r2) = splitAuxNoPivot(n2, v1)
-        N.joinShared(union(l1, l2), v1, union(r1, r2))
-      }
-    } else if h1 == 1 {
-      add(s2, n1.value)
-    } else {
-      let {N.left: l2, value: v2, right: r2} = n2
-      let (l1, r1) = splitAuxNoPivot(n1, v2)
-      N.joinShared(union(l1, l2), v2, union(r1, r2))
-    }
-  }
-
-let rec intersect = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) | (_, None) => None
-  | (Some(n1), Some(n2)) /* (Node(l1, v1, r1, _), t2) */ =>
-    let {N.left: l1, value: v1, right: r1} = n1
-    let pres = ref(false)
-    let (l2, r2) = splitAuxPivot(n2, v1, pres)
-    let ll = intersect(l1, l2)
-    let rr = intersect(r1, r2)
-    if pres.contents {
-      N.joinShared(ll, v1, rr)
-    } else {
-      N.concatShared(ll, rr)
-    }
-  }
-
-let rec diff = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) | (_, None) => s1
-  | (Some(n1), Some(n2)) /* (Node(l1, v1, r1, _), t2) */ =>
-    let {N.left: l1, value: v1, right: r1} = n1
-    let pres = ref(false)
-    let (l2, r2) = splitAuxPivot(n2, v1, pres)
-    let ll = diff(l1, l2)
-    let rr = diff(r1, r2)
-    if pres.contents {
-      N.concatShared(ll, rr)
-    } else {
-      N.joinShared(ll, v1, rr)
-    }
-  }
diff --git a/jscomp/others/belt_Set.cppo.resi b/jscomp/others/belt_Set.cppo.resi
deleted file mode 100644
index 6871bd3..0000000
--- a/jscomp/others/belt_Set.cppo.resi
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-  This module is [`Belt.Set`]() specialized with value type to be a primitive type.
-  It is more efficient in general, the  API is the same with [`Belt_Set`]() except its value type is fixed,
-  and identity is not needed(using the built-in one)
-
-  **See** [`Belt.Set`]()
-*/
-
-#ifdef TYPE_STRING
-/** The type of the set elements. */
-type value = string
-#elif defined TYPE_INT
-/** The type of the set elements. */
-type value = int
-#else
-[%error "unknown type"]
-#endif
-
-/** The type of sets. */
-type t
-
-let empty: t
-
-let fromArray: array<value> => t
-
-let fromSortedArrayUnsafe: array<value> => t
-
-let isEmpty: t => bool
-
-let has: (t, value) => bool
-
-/**
-`add(s, x)` If `x` was already in `s`, `s` is returned unchanged.
-*/
-let add: (t, value) => t
-
-let mergeMany: (t, array<value>) => t
-
-/**
-`remove(m, x)` If `x` was not in `m`, `m` is returned reference unchanged.
-*/
-let remove: (t, value) => t
-
-let removeMany: (t, array<value>) => t
-
-let union: (t, t) => t
-
-let intersect: (t, t) => t
-
-let diff: (t, t) => t
-
-/**
-`subset(s1, s2)` tests whether the set `s1` is a subset of the set `s2`.
-*/
-let subset: (t, t) => bool
-
-/**
-Total ordering between sets. Can be used as the ordering function for doing sets
-of sets.
-*/
-let cmp: (t, t) => int
-
-/** 
-`eq(s1, s2)` tests whether the sets `s1` and `s2` are equal, that is, contain
-equal elements.
-*/
-let eq: (t, t) => bool
-
-let forEachU: (t, (. value) => unit) => unit
-
-/**
-`forEach(s, f)` applies `f` in turn to all elements of `s`. In increasing order
-*/
-let forEach: (t, value => unit) => unit
-
-let reduceU: (t, 'a, (. 'a, value) => 'a) => 'a
-
-/** Iterate in increasing order. */
-let reduce: (t, 'a, ('a, value) => 'a) => 'a
-
-let everyU: (t, (. value) => bool) => bool
-
-/**
-`every(p, s)` checks if all elements of the set satisfy the predicate `p`. Order
-unspecified.
-*/
-let every: (t, value => bool) => bool
-
-let someU: (t, (. value) => bool) => bool
-
-/** 
-`some(p, s)` checks if at least one element of the set satisfies the predicate
-`p`. Oder unspecified.
-*/
-let some: (t, value => bool) => bool
-
-let keepU: (t, (. value) => bool) => t
-
-/**
-`keep(p, s)` returns the set of all elements in `s` that satisfy predicate `p`.
-*/
-let keep: (t, value => bool) => t
-
-let partitionU: (t, (. value) => bool) => (t, t)
-
-/**
-`partition(p, s)` returns a pair of sets `(s1, s2)`, where `s1` is the set of
-all the elements of `s` that satisfy the predicate `p`, and `s2` is the set of
-all the elements of `s` that do not satisfy `p`.
-*/
-let partition: (t, value => bool) => (t, t)
-
-let size: t => int
-
-/** In increasing order */
-let toList: t => list<value>
-
-let toArray: t => array<value>
-
-let minimum: t => option<value>
-
-let minUndefined: t => Js.undefined<value>
-
-let maximum: t => option<value>
-
-let maxUndefined: t => Js.undefined<value>
-
-let get: (t, value) => option<value>
-
-let getUndefined: (t, value) => Js.undefined<value>
-
-let getExn: (t, value) => value
-
-/**
-`split(x, s)` returns a triple `(l, present, r)`, where `l` is the set of
-elements of `s` that are strictly less than `x`;`r` is the set of elements of
-`s` that are strictly greater than `x`; `present` is `false` if `s` contains no
-element equal to `x`, or `true` if `s` contains an element equal to `x`.
-*/
-let split: (t, value) => ((t, t), bool)
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t => unit
diff --git a/jscomp/others/belt_Set.res b/jscomp/others/belt_Set.res
deleted file mode 100644
index 612a9fd..0000000
--- a/jscomp/others/belt_Set.res
+++ /dev/null
@@ -1,164 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module Int = Belt_SetInt
-module String = Belt_SetString
-module Dict = Belt_SetDict
-
-type id<'value, 'id> = Belt_Id.comparable<'value, 'id>
-type cmp<'value, 'id> = Belt_Id.cmp<'value, 'id>
-
-type t<'value, 'id> = {
-  cmp: cmp<'value, 'id>,
-  data: Dict.t<'value, 'id>,
-}
-
-let fromArray = (type value identity, data, ~id: id<value, identity>) => {
-  module M = unpack(id)
-  let cmp = M.cmp
-  {cmp, data: Dict.fromArray(~cmp, data)}
-}
-
-let remove = (m, e) => {
-  let {cmp, data} = m
-  let newData = Dict.remove(~cmp, data, e)
-  if newData === data {
-    m
-  } else {
-    {cmp, data: newData}
-  }
-}
-
-let add = (m, e) => {
-  let {cmp, data} = m
-  let newData = Dict.add(~cmp, data, e)
-  if newData === data {
-    m
-  } else {
-    {cmp, data: newData}
-  }
-}
-
-let mergeMany = ({cmp} as m, e) => {cmp, data: Dict.mergeMany(~cmp, m.data, e)}
-
-let removeMany = ({cmp} as m, e) => {cmp, data: Dict.removeMany(~cmp, m.data, e)}
-
-let union = ({cmp} as m, n) => {data: Dict.union(~cmp, m.data, n.data), cmp}
-
-let intersect = (m, n) => {
-  let cmp = m.cmp
-  {data: Dict.intersect(~cmp, m.data, n.data), cmp}
-}
-
-let diff = (m, n) => {
-  let cmp = m.cmp
-  {cmp, data: Dict.diff(~cmp, m.data, n.data)}
-}
-
-let subset = (m, n) => {
-  let cmp = m.cmp
-  Dict.subset(~cmp, m.data, n.data)
-}
-
-let split = (m, e) => {
-  let cmp = m.cmp
-  let ((l, r), b) = Dict.split(~cmp, m.data, e)
-  (({cmp, data: l}, {cmp, data: r}), b)
-}
-
-let make = (type value identity, ~id: id<value, identity>) => {
-  module M = unpack(id)
-  {cmp: M.cmp, data: Dict.empty}
-}
-
-let isEmpty = m => Dict.isEmpty(m.data)
-
-let cmp = (m, n) => {
-  let cmp = m.cmp
-  Dict.cmp(~cmp, m.data, n.data)
-}
-
-let eq = (m, n) => Dict.eq(~cmp=m.cmp, m.data, n.data)
-
-let forEachU = (m, f) => Dict.forEachU(m.data, f)
-let forEach = (m, f) => forEachU(m, (. a) => f(a))
-
-let reduceU = (m, acc, f) => Dict.reduceU(m.data, acc, f)
-let reduce = (m, acc, f) => reduceU(m, acc, (. a, b) => f(a, b))
-
-let everyU = (m, f) => Dict.everyU(m.data, f)
-let every = (m, f) => everyU(m, (. a) => f(a))
-
-let someU = (m, f) => Dict.someU(m.data, f)
-let some = (m, f) => someU(m, (. a) => f(a))
-
-let keepU = (m, f) => {cmp: m.cmp, data: Dict.keepU(m.data, f)}
-let keep = (m, f) => keepU(m, (. a) => f(a))
-
-let partitionU = (m, f) => {
-  let (l, r) = Dict.partitionU(m.data, f)
-  let cmp = m.cmp
-  ({data: l, cmp}, {data: r, cmp})
-}
-let partition = (m, f) => partitionU(m, (. a) => f(a))
-
-let size = m => Dict.size(m.data)
-let toList = m => Dict.toList(m.data)
-let toArray = m => Dict.toArray(m.data)
-
-let minimum = m => Dict.minimum(m.data)
-let minUndefined = m => Dict.minUndefined(m.data)
-let maximum = m => Dict.maximum(m.data)
-let maxUndefined = m => Dict.maxUndefined(m.data)
-
-let get = (m, e) => Dict.get(~cmp=m.cmp, m.data, e)
-
-let getUndefined = (m, e) => Dict.getUndefined(~cmp=m.cmp, m.data, e)
-
-let getExn = (m, e) => Dict.getExn(~cmp=m.cmp, m.data, e)
-
-let has = (m, e) => Dict.has(~cmp=m.cmp, m.data, e)
-
-let fromSortedArrayUnsafe = (type value identity, xs, ~id: id<value, identity>) => {
-  module M = unpack(id)
-  {cmp: M.cmp, data: Dict.fromSortedArrayUnsafe(xs)}
-}
-
-let getData = m => m.data
-
-let getId = (type value identity, m: t<value, identity>): id<value, identity> => {
-  module T = {
-    type identity = identity
-    type t = value
-    let cmp = m.cmp
-  }
-  module(T)
-}
-
-let packIdData = (type value identity, ~id: id<value, identity>, ~data) => {
-  module M = unpack(id)
-  {cmp: M.cmp, data}
-}
-
-let checkInvariantInternal = d => Dict.checkInvariantInternal(d.data)
diff --git a/jscomp/others/belt_Set.resi b/jscomp/others/belt_Set.resi
deleted file mode 100644
index a7b8e00..0000000
--- a/jscomp/others/belt_Set.resi
+++ /dev/null
@@ -1,575 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-An _immutable_ sorted set module which allows customized _compare_ behavior.
-
-The implementation uses balanced binary trees, and therefore searching
-and insertion take time logarithmic in the size of the map.
-
-For more info on this module's usage of identity, `make` and others, please see
-the top level documentation of Belt, **A special encoding for collection safety**.
-
-## Examples
-
-```rescript
-module PairComparator =
-  Belt.Id.MakeComparable({
-    type t = (int, int)
-    let cmp = ((a0, a1), (b0, b1)) =>
-      switch (Pervasives.compare(a0, b0)) {
-      | 0 => Pervasives.compare(a1, b1)
-      | c => c
-      }
-  })
-
-let mySet = Belt.Set.make(~id=module(PairComparator))
-let mySet2 = Belt.Set.add(mySet, (1, 2))
-```
-
-**Note:** This module's examples will assume a predeclared module for integers
-called `IntCmp`. It is declared like this:
-
-```rescript
-module IntCmp =
-  Belt.Id.MakeComparable({
-    type t = int
-    let cmp = Pervasives.compare
-  })
-```
-*/
-
-/** 
-Specialized when value type is `int`, more efficient than the generic type, its
-compare behavior is fixed using the built-in comparison
-*/
-module Int = Belt_SetInt
-
-/**
-Specialized when value type is `string`, more efficient than the generic type,
-its compare behavior is fixed using the built-in comparison
-*/
-module String = Belt_SetString
-
-/** 
-This module separates identity from data, it is a bit more verbose but slightly
-more efficient due to the fact that there is no need to pack identity and data back
-after each operation
-*/
-module Dict = Belt_SetDict
-
-/**
-`'value` is the element type
-
-`'identity` the identity of the collection
-*/
-type t<'value, 'identity>
-
-/**
-The identity needed for making a set from scratch
-*/
-type id<'value, 'id> = Belt_Id.comparable<'value, 'id>
-
-/**
-Creates a new set by taking in the comparator
-
-## Examples
-
-```rescript
-let set = Belt.Set.make(~id=module(IntCmp))
-```
-*/
-let make: (~id: id<'value, 'id>) => t<'value, 'id>
-
-/**
-Creates new set from array of elements.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([1, 3, 2, 4], ~id=module(IntCmp))
-
-s0->Belt.Set.toArray /* [1, 2, 3, 4] */
-```
-*/
-let fromArray: (array<'value>, ~id: id<'value, 'id>) => t<'value, 'id>
-
-/**
-The same as [fromArray][#fromarray] except it is after assuming the input array
-is already sorted.
-*/
-let fromSortedArrayUnsafe: (array<'value>, ~id: id<'value, 'id>) => t<'value, 'id>
-
-/**
-Checks if set is empty.
-
-## Examples
-
-```rescript
-let empty = Belt.Set.fromArray([], ~id=module(IntCmp))
-let notEmpty = Belt.Set.fromArray([1],~id=module(IntCmp))
-
-Belt.Set.isEmpty(empty) /* true */
-Belt.Set.isEmpty(notEmpty) /* false */
-```
-*/
-let isEmpty: t<_> => bool
-
-/**
-Checks if element exists in set.
-
-## Examples
-
-```rescript
-let set = Belt.Set.fromArray([1, 4, 2, 5], ~id=module(IntCmp))
-
-set->Belt.Set.has(3) /* false */
-set->Belt.Set.has(1) /* true */
-```
-*/
-let has: (t<'value, 'id>, 'value) => bool
-
-/**
-Adds element to set. If element existed in set, value is unchanged.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.make(~id=module(IntCmp))
-let s1 = s0->Belt.Set.add(1)
-let s2 = s1->Belt.Set.add(2)
-let s3 = s2->Belt.Set.add(2)
-s0->Belt.Set.toArray /* [] */
-s1->Belt.Set.toArray /* [1] */
-s2->Belt.Set.toArray /* [1, 2] */
-s3->Belt.Set.toArray /* [1,2 ] */
-s2 == s3 /* true */
-```
-*/
-let add: (t<'value, 'id>, 'value) => t<'value, 'id>
-
-/**
-Adds each element of array to set. Unlike `Belt.Set.add`](#add), the reference of return value might be changed even if all values in array already exist in set
-
-## Examples
-
-```rescript
-let set = Belt.Set.make(~id=module(IntCmp))
-
-let newSet = set->Belt.Set.mergeMany([5, 4, 3, 2, 1])
-newSet->Belt.Set.toArray /* [1, 2, 3, 4, 5] */
-```
-*/
-let mergeMany: (t<'value, 'id>, array<'value>) => t<'value, 'id>
-
-/**
-Removes element from set. If element did not exist in set, value is unchanged.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([2,3,1,4,5], ~id=module(IntCmp))
-let s1 = s0->Belt.Set.remove(1)
-let s2 = s1->Belt.Set.remove(3)
-let s3 = s2->Belt.Set.remove(3)
-
-s1->Belt.Set.toArray /* [2,3,4,5] */
-s2->Belt.Set.toArray /* [2,4,5] */
-s2 == s3 /* true */
-```
-*/
-let remove: (t<'value, 'id>, 'value) => t<'value, 'id>
-
-/**
-Removes each element of array from set. Unlike [remove](#remove), the reference of return value might be changed even if none of values in array existed in set.
-
-## Examples
-
-```rescript
-let set = Belt.Set.fromArray([1, 2, 3, 4],~id=module(IntCmp))
-
-let newSet = set->Belt.Set.removeMany([5, 4, 3, 2, 1])
-newSet->Belt.Set.toArray /* [] */
-```
-*/
-let removeMany: (t<'value, 'id>, array<'value>) => t<'value, 'id>
-
-/**
- Returns union of two sets.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([5,2,3,5,6], ~id=module(IntCmp))
-let s1 = Belt.Set.fromArray([5,2,3,1,5,4], ~id=module(IntCmp))
-let union = Belt.Set.union(s0, s1)
-union->Belt.Set.toArray /* [1,2,3,4,5,6] */
-```
-*/
-let union: (t<'value, 'id>, t<'value, 'id>) => t<'value, 'id>
-
-/**
-Returns intersection of two sets.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([5,2,3,5,6], ~id=module(IntCmp))
-let s1 = Belt.Set.fromArray([5,2,3,1,5,4], ~id=module(IntCmp))
-let intersect = Belt.Set.intersect(s0, s1)
-intersect->Belt.Set.toArray /* [2,3,5] */
-```
-*/
-let intersect: (t<'value, 'id>, t<'value, 'id>) => t<'value, 'id>
-
-/**
-Returns elements from first set, not existing in second set.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([5,2,3,5,6], ~id=module(IntCmp))
-let s1 = Belt.Set.fromArray([5,2,3,1,5,4], ~id=module(IntCmp))
-Belt.Set.toArray(Belt.Set.diff(s0, s1)) /* [6] */
-Belt.Set.toArray(Belt.Set.diff(s1,s0)) /* [1,4] */
-```
-*/
-let diff: (t<'value, 'id>, t<'value, 'id>) => t<'value, 'id>
-
-/**
-Checks if second set is subset of first set.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([5,2,3,5,6], ~id=module(IntCmp))
-let s1 = Belt.Set.fromArray([5,2,3,1,5,4], ~id=module(IntCmp))
-let s2 = Belt.Set.intersect(s0, s1)
-Belt.Set.subset(s2, s0) /* true */
-Belt.Set.subset(s2, s1) /* true */
-Belt.Set.subset(s1, s0) /* false */
-```
-*/
-let subset: (t<'value, 'id>, t<'value, 'id>) => bool
-
-/**
-Total ordering between sets. Can be used as the ordering function for doing sets
-of sets. It compares size first and then iterates over each element following
-the order of elements.
-*/
-let cmp: (t<'value, 'id>, t<'value, 'id>) => int
-
-/**
-Checks if two sets are equal.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([5,2,3], ~id=module(IntCmp))
-let s1 = Belt.Set.fromArray([3,2,5], ~id=module(IntCmp))
-
-Belt.Set.eq(s0, s1) /* true */
-```
-*/
-let eq: (t<'value, 'id>, t<'value, 'id>) => bool
-
-/**
-Same as [forEach](#forEach) but takes uncurried functon.
-*/
-let forEachU: (t<'value, 'id>, (. 'value) => unit) => unit
-
-/**
-Applies function `f` in turn to all elements of set in increasing order.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([5,2,3,5,6], ~id=module(IntCmp))
-let acc = ref(list{})
-s0->Belt.Set.forEach(x => {
-  acc := Belt.List.add(acc.contents, x)
-})
-acc /* [6,5,3,2] */
-```
-*/
-let forEach: (t<'value, 'id>, 'value => unit) => unit
-
-let reduceU: (t<'value, 'id>, 'a, (. 'a, 'value) => 'a) => 'a
-
-/**
-Applies function `f` to each element of set in increasing order. Function `f` has two parameters: the item from the set and an “accumulator”, which starts with a value of `initialValue`. `reduce` returns the final value of the accumulator.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([5,2,3,5,6], ~id=module(IntCmp))
-s0->Belt.Set.reduce(list{}, (acc, element) =>
-  acc->Belt.List.add(element)
-) /* [6,5,3,2] */
-```
-*/
-let reduce: (t<'value, 'id>, 'a, ('a, 'value) => 'a) => 'a
-
-let everyU: (t<'value, 'id>, (. 'value) => bool) => bool
-
-/**
-Checks if all elements of the set satisfy the predicate. Order unspecified.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-
-let s0 = Belt.Set.fromArray([2,4,6,8], ~id=module(IntCmp))
-s0->Belt.Set.every(isEven) /* true */
-```
-*/
-let every: (t<'value, 'id>, 'value => bool) => bool
-
-let someU: (t<'value, 'id>, (. 'value) => bool) => bool
-
-/**
-Checks if at least one element of the set satisfies the predicate.
-
-## Examples
-
-```rescript
-let isOdd = x => mod(x, 2) != 0
-
-let s0 = Belt.Set.fromArray([1,2,4,6,8], ~id=module(IntCmp))
-s0->Belt.Set.some(isOdd) /* true */
-```
-*/
-let some: (t<'value, 'id>, 'value => bool) => bool
-
-let keepU: (t<'value, 'id>, (. 'value) => bool) => t<'value, 'id>
-
-/**
-Returns the set of all elements that satisfy the predicate.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-
-let s0 = Belt.Set.fromArray([1,2,3,4,5], ~id=module(IntCmp))
-let s1 = s0->Belt.Set.keep(isEven)
-
-s1->Belt.Set.toArray /* [2,4] */
-```
-*/
-let keep: (t<'value, 'id>, 'value => bool) => t<'value, 'id>
-
-let partitionU: (t<'value, 'id>, (. 'value) => bool) => (t<'value, 'id>, t<'value, 'id>)
-
-/**
-Returns a pair of sets, where first is the set of all the elements of set that satisfy the predicate, and second is the set of all the elements of set that do not satisfy the predicate.
-
-## Examples
-
-```rescript
-let isOdd = x => mod(x, 2) != 0
-
-let s0 = Belt.Set.fromArray([1,2,3,4,5], ~id=module(IntCmp))
-let (s1, s2) = s0->Belt.Set.partition(isOdd)
-
-s1->Belt.Set.toArray /* [1,3,5] */
-s2->Belt.Set.toArray /* [2,4] */
-```
-*/
-let partition: (t<'value, 'id>, 'value => bool) => (t<'value, 'id>, t<'value, 'id>)
-
-/**
-Returns size of the set.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([1,2,3,4], ~id=module(IntCmp))
-
-s0->Belt.Set.size /* 4 */
-```
-*/
-let size: t<'value, 'id> => int
-
-/**
-Returns array of ordered set elements.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([3,2,1,5], ~id=module(IntCmp))
-
-s0->Belt.Set.toArray /* [1,2,3,5] */
-```
-*/
-let toArray: t<'value, 'id> => array<'value>
-
-/**
-Returns list of ordered set elements.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([3,2,1,5], ~id=module(IntCmp))
-
-s0->Belt.Set.toList /* [1,2,3,5] */
-```
-*/
-let toList: t<'value, 'id> => list<'value>
-
-/**
-Returns minimum value of the collection. `None` if collection is empty.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.make(~id=module(IntCmp))
-let s1 = Belt.Set.fromArray([3,2,1,5], ~id=module(IntCmp))
-
-s0->Belt.Set.minimum /* None */
-s1->Belt.Set.minimum /* Some(1) */
-```
-*/
-let minimum: t<'value, 'id> => option<'value>
-
-/**
-Returns minimum value of the collection. `undefined` if collection is empty.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.make(~id=module(IntCmp))
-let s1 = Belt.Set.fromArray([3,2,1,5], ~id=module(IntCmp))
-
-s0->Belt.Set.minUndefined /* undefined */
-s1->Belt.Set.minUndefined /* 1 */
-```
-*/
-let minUndefined: t<'value, 'id> => Js.undefined<'value>
-
-/**
-Returns maximum value of the collection. `None` if collection is empty.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.make(~id=module(IntCmp))
-let s1 = Belt.Set.fromArray([3,2,1,5], ~id=module(IntCmp))
-
-s0->Belt.Set.maximum /* None */
-s1->Belt.Set.maximum /* Some(5) */
-```
-*/
-let maximum: t<'value, 'id> => option<'value>
-
-/**
-Returns maximum value of the collection. `undefined` if collection is empty.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.make(~id=module(IntCmp))
-let s1 = Belt.Set.fromArray([3,2,1,5], ~id=module(IntCmp))
-
-s0->Belt.Set.maxUndefined /* undefined */
-s1->Belt.Set.maxUndefined /* 5 */
-```
-*/
-let maxUndefined: t<'value, 'id> => Js.undefined<'value>
-
-/**
-Returns the reference of the value which is equivalent to value using the comparator specifiecd by this collection. Returns `None` if element does not exist.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([1,2,3,4,5], ~id=module(IntCmp))
-
-s0->Belt.Set.get(3) /* Some(3) */
-s0->Belt.Set.get(20) /* None */
-```
-*/
-let get: (t<'value, 'id>, 'value) => option<'value>
-
-/**
-Same as [get](#get) but returns `undefined` when element does not exist.
-*/
-let getUndefined: (t<'value, 'id>, 'value) => Js.undefined<'value>
-
-/**
-Same as [get](#get) but raise when element does not exist.
-*/
-let getExn: (t<'value, 'id>, 'value) => 'value
-
-/**
-Returns a tuple `((smaller, larger), present)`, `present` is true when element exist in set.
-
-## Examples
-
-```rescript
-let s0 = Belt.Set.fromArray([1,2,3,4,5], ~id=module(IntCmp))
-
-let ((smaller, larger), present) = s0->Belt.Set.split(3)
-
-present /* true */
-smaller->Belt.Set.toArray /* [1,2] */
-larger->Belt.Set.toArray /* [4,5] */
-
-```
-*/
-let split: (t<'value, 'id>, 'value) => ((t<'value, 'id>, t<'value, 'id>), bool)
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
-
-/* **************************************************************************
-  Below are operations only when better performance needed,
-  it is still safe API but more verbose.
-  More API will be exposed by needs
-*/
-
-/**
-**Advanced usage only**
-
-Returns the raw data (detached from comparator), but its type is still manifested,
-so that user can pass identity directly without boxing.
-*/
-let getData: t<'value, 'id> => Belt_SetDict.t<'value, 'id>
-
-/**
-**Advanced usage only**
-
-Returns the identity of set.
-*/
-let getId: t<'value, 'id> => id<'value, 'id>
-
-/**
-**Advanced usage only**
-
-Returns the packed collection.
-*/
-let packIdData: (~id: id<'value, 'id>, ~data: Belt_SetDict.t<'value, 'id>) => t<'value, 'id>
diff --git a/jscomp/others/belt_SetDict.res b/jscomp/others/belt_SetDict.res
deleted file mode 100644
index 0a9a59b..0000000
--- a/jscomp/others/belt_SetDict.res
+++ /dev/null
@@ -1,264 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-
-type t<'k, 'id> = N.t<'k>
-
-type cmp<'key, 'id> = Belt_Id.cmp<'key, 'id>
-
-/* here we relies on reference transparence
-   address equality means everything equal across time
-   no need to call `bal` again
-*/
-let rec add = (t: t<_>, x, ~cmp): t<_> =>
-  switch t {
-  | None => N.singleton(x)
-  | Some(nt) =>
-    let k = nt.value
-    let c = Belt_Id.getCmpInternal(cmp)(. x, k)
-    if c == 0 {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if c < 0 {
-        let ll = add(~cmp, l, x)
-        if ll === l {
-          t
-        } else {
-          N.bal(ll, k, r)
-        }
-      } else {
-        let rr = add(~cmp, r, x)
-        if rr === r {
-          t
-        } else {
-          N.bal(l, k, rr)
-        }
-      }
-    }
-  }
-
-let rec remove = (t: t<_>, x, ~cmp): t<_> =>
-  switch t {
-  | None => t
-  | Some(n) =>
-    let {N.left: l, value: v, right: r} = n
-    let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-    if c == 0 {
-      switch (l, r) {
-      | (None, _) => r
-      | (_, None) => l
-      | (_, Some(rn)) =>
-        let v = ref(rn.value)
-        let r = N.removeMinAuxWithRef(rn, v)
-        N.bal(l, v.contents, r)
-      }
-    } else if c < 0 {
-      let ll = remove(~cmp, l, x)
-      if ll === l {
-        t
-      } else {
-        N.bal(ll, v, r)
-      }
-    } else {
-      let rr = remove(~cmp, r, x)
-      if rr === r {
-        t
-      } else {
-        N.bal(l, v, rr)
-      }
-    }
-  }
-
-let mergeMany = (h, arr, ~cmp) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let key = A.getUnsafe(arr, i)
-    v.contents = add(v.contents, ~cmp, key)
-  }
-  v.contents
-}
-
-let removeMany = (h, arr, ~cmp) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let key = A.getUnsafe(arr, i)
-    v.contents = remove(v.contents, ~cmp, key)
-  }
-  v.contents
-}
-
-let rec splitAuxNoPivot = (~cmp, n: N.node<_>, x): (_, _) => {
-  let {N.left: l, value: v, right: r} = n
-  let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-  if c == 0 {
-    (l, r)
-  } else if c < 0 {
-    switch l {
-    | None => (None, Some(n))
-    | Some(l) =>
-      let (ll, rl) = splitAuxNoPivot(~cmp, l, x)
-      (ll, N.joinShared(rl, v, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None)
-    | Some(r) =>
-      let (lr, rr) = splitAuxNoPivot(~cmp, r, x)
-      (N.joinShared(l, v, lr), rr)
-    }
-  }
-}
-
-let rec splitAuxPivot = (~cmp, n: N.node<_>, x, pres): (_, _) => {
-  let {N.left: l, value: v, right: r} = n
-  let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-  if c == 0 {
-    pres.contents = true
-    (l, r)
-  } else if c < 0 {
-    switch l {
-    | None => (None, Some(n))
-    | Some(l) =>
-      let (ll, rl) = splitAuxPivot(~cmp, l, x, pres)
-      (ll, N.joinShared(rl, v, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None)
-    | Some(r) =>
-      let (lr, rr) = splitAuxPivot(~cmp, r, x, pres)
-      (N.joinShared(l, v, lr), rr)
-    }
-  }
-}
-
-let split = (t: t<_>, x, ~cmp) =>
-  switch t {
-  | None => ((None, None), false)
-  | Some(n) =>
-    let pres = ref(false)
-    let v = splitAuxPivot(~cmp, n, x, pres)
-    (v, pres.contents)
-  }
-
-/* `union s1 s2`
-   Use the pivot to split the smaller collection
-*/
-let rec union = (s1: t<_>, s2: t<_>, ~cmp): t<_> =>
-  switch (s1, s2) {
-  | (None, _) => s2
-  | (_, None) => s1
-  | (Some(n1), Some(n2)) =>
-    let (h1, h2) = (n1.height, n2.height)
-    if h1 >= h2 {
-      if h2 == 1 {
-        add(~cmp, s1, n2.value)
-      } else {
-        let {N.left: l1, value: v1, right: r1} = n1
-        let (l2, r2) = splitAuxNoPivot(~cmp, n2, v1)
-        N.joinShared(union(~cmp, l1, l2), v1, union(~cmp, r1, r2))
-      }
-    } else if h1 == 1 {
-      add(s2, ~cmp, n1.value)
-    } else {
-      let {N.left: l2, value: v2, right: r2} = n2
-      let (l1, r1) = splitAuxNoPivot(~cmp, n1, v2)
-      N.joinShared(union(~cmp, l1, l2), v2, union(~cmp, r1, r2))
-    }
-  }
-
-let rec intersect = (s1: t<_>, s2: t<_>, ~cmp) =>
-  switch (s1, s2) {
-  | (None, _)
-  | (_, None) =>
-    None
-  | (Some(n1), Some(n2)) =>
-    let {N.left: l1, value: v1, right: r1} = n1
-    let pres = ref(false)
-    let (l2, r2) = splitAuxPivot(~cmp, n2, v1, pres)
-    let ll = intersect(~cmp, l1, l2)
-    let rr = intersect(~cmp, r1, r2)
-    if pres.contents {
-      N.joinShared(ll, v1, rr)
-    } else {
-      N.concatShared(ll, rr)
-    }
-  }
-
-let rec diff = (s1, s2, ~cmp) =>
-  switch (s1, s2) {
-  | (None, _)
-  | (_, None) => s1
-  | (Some(n1), Some(n2)) =>
-    let {N.left: l1, value: v1, right: r1} = n1
-    let pres = ref(false)
-    let (l2, r2) = splitAuxPivot(~cmp, n2, v1, pres)
-    let ll = diff(~cmp, l1, l2)
-    let rr = diff(~cmp, r1, r2)
-    if pres.contents {
-      N.concatShared(ll, rr)
-    } else {
-      N.joinShared(ll, v1, rr)
-    }
-  }
-
-let empty = None
-let fromArray = N.fromArray
-let isEmpty = N.isEmpty
-
-let cmp = N.cmp
-let eq = N.eq
-let has = N.has
-let forEachU = N.forEachU
-let forEach = N.forEach
-let reduceU = N.reduceU
-let reduce = N.reduce
-let everyU = N.everyU
-let every = N.every
-let someU = N.someU
-let some = N.some
-let size = N.size
-let toList = N.toList
-let toArray = N.toArray
-let minimum = N.minimum
-let maximum = N.maximum
-let maxUndefined = N.maxUndefined
-let minUndefined = N.minUndefined
-let get = N.get
-let getExn = N.getExn
-let getUndefined = N.getUndefined
-
-let fromSortedArrayUnsafe = N.fromSortedArrayUnsafe
-let subset = N.subset
-let keep = N.keepShared
-let keepU = N.keepSharedU
-let partitionU = N.partitionSharedU
-let partition = N.partitionShared
-
-let checkInvariantInternal = N.checkInvariantInternal
diff --git a/jscomp/others/belt_SetDict.resi b/jscomp/others/belt_SetDict.resi
deleted file mode 100644
index 4f740a6..0000000
--- a/jscomp/others/belt_SetDict.resi
+++ /dev/null
@@ -1,633 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This module separates identity from data. It is a bit more verbose but slightly
-more efficient due to the fact that there is no need to pack identity and data
-back after each operation.
-*/
-
-/**
-`'value` is the element type
-
-`'identity` the identity of the collection
-*/
-type t<'value, 'identity>
-
-/**
-Type of compare function.
-*/
-type cmp<'value, 'id> = Belt_Id.cmp<'value, 'id>
-
-/**
-## Examples
-
-```rescript
-let s0 = Belt.Set.Dict.empty
-```
-*/
-let empty: t<'value, 'id>
-
-/**
-Creates new set from array of elements.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([1, 3, 2, 4], ~cmp=IntCmp.cmp)
-
-s0->Belt.Set.Dict.toArray /* [1, 2, 3, 4] */
-```
-*/
-let fromArray: (array<'value>, ~cmp: cmp<'value, 'id>) => t<'value, 'id>
-
-/**
-The same as [fromArray][#fromarray] except it is after assuming the input array
-is already sorted.
-*/
-let fromSortedArrayUnsafe: array<'value> => t<'value, 'id>
-
-/**
-Checks if set is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let empty = Belt.Set.Dict.fromArray([], ~cmp=IntCmp.cmp)
-let notEmpty = Belt.Set.Dict.fromArray([1], ~cmp=IntCmp.cmp)
-
-Belt.Set.Dict.isEmpty(empty) /* true */
-Belt.Set.Dict.isEmpty(notEmpty) /* false */
-```
-*/
-let isEmpty: t<_> => bool
-
-/**
-Checks if an element exists in the set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let set = Belt.Set.Dict.fromArray([1, 4, 2, 5], ~cmp=IntCmp.cmp)
-
-set->Belt.Set.Dict.has(3, ~cmp=IntCmp.cmp) /* false */
-set->Belt.Set.Dict.has(1, ~cmp=IntCmp.cmp) /* true */
-```
-*/
-let has: (t<'value, 'id>, 'value, ~cmp: cmp<'value, 'id>) => bool
-
-/**
-Adds element to set. If element existed in set, value is unchanged.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.empty
-let s1 = s0->Belt.Set.Dict.add(1, ~cmp=IntCmp.cmp)
-let s2 = s1->Belt.Set.Dict.add(2, ~cmp=IntCmp.cmp)
-let s3 = s2->Belt.Set.Dict.add(2, ~cmp=IntCmp.cmp)
-s0->Belt.Set.Dict.toArray /* [] */
-s1->Belt.Set.Dict.toArray /* [1] */
-s2->Belt.Set.Dict.toArray /* [1, 2] */
-s3->Belt.Set.Dict.toArray /* [1,2 ] */
-s2 == s3 /* true */
-```
-*/
-let add: (t<'value, 'id>, 'value, ~cmp: cmp<'value, 'id>) => t<'value, 'id>
-
-/**
-Adds each element of array to set. Unlike [add](#add), the reference of return value might be changed even if all values in array already exist in set
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let set = Belt.Set.Dict.empty
-
-let newSet = set->Belt.Set.Dict.mergeMany([5, 4, 3, 2, 1], ~cmp=IntCmp.cmp)
-newSet->Belt.Set.Dict.toArray /* [1, 2, 3, 4, 5] */
-```
-*/
-let mergeMany: (t<'value, 'id>, array<'value>, ~cmp: cmp<'value, 'id>) => t<'value, 'id>
-
-/**
-Removes element from set. If element did not exist in set, value is unchanged.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([2, 3, 1, 4, 5], ~cmp=IntCmp.cmp)
-let s1 = s0->Belt.Set.Dict.remove(1, ~cmp=IntCmp.cmp)
-let s2 = s1->Belt.Set.Dict.remove(3, ~cmp=IntCmp.cmp)
-let s3 = s2->Belt.Set.Dict.remove(3, ~cmp=IntCmp.cmp)
-
-s1->Belt.Set.Dict.toArray /* [2,3,4,5] */
-s2->Belt.Set.Dict.toArray /* [2,4,5] */
-s2 == s3 /* true */
-```
-*/
-let remove: (t<'value, 'id>, 'value, ~cmp: cmp<'value, 'id>) => t<'value, 'id>
-
-/**
-Removes each element of array from set. Unlike [remove](#remove), the reference of return value might be changed even if any values in array not existed in set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let set = Belt.Set.Dict.fromArray([1, 2, 3, 4], ~cmp=IntCmp.cmp)
-
-let newSet = set->Belt.Set.Dict.removeMany([5, 4, 3, 2, 1], ~cmp=IntCmp.cmp)
-newSet->Belt.Set.Dict.toArray /* [] */
-```
-*/
-let removeMany: (t<'value, 'id>, array<'value>, ~cmp: cmp<'value, 'id>) => t<'value, 'id>
-
-/**
-Returns union of two sets.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([5, 2, 3, 5, 6], ~cmp=IntCmp.cmp)
-let s1 = Belt.Set.Dict.fromArray([5, 2, 3, 1, 5, 4], ~cmp=IntCmp.cmp)
-let union = Belt.Set.Dict.union(s0, s1, ~cmp=IntCmp.cmp)
-union->Belt.Set.Dict.toArray /* [1,2,3,4,5,6] */
-```
-*/
-let union: (t<'value, 'id>, t<'value, 'id>, ~cmp: cmp<'value, 'id>) => t<'value, 'id>
-
-/**
-Returns intersection of two sets.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([5, 2, 3, 5, 6], ~cmp=IntCmp.cmp)
-let s1 = Belt.Set.Dict.fromArray([5, 2, 3, 1, 5, 4], ~cmp=IntCmp.cmp)
-let intersect = Belt.Set.Dict.intersect(s0, s1, ~cmp=IntCmp.cmp)
-intersect->Belt.Set.Dict.toArray /* [2,3,5] */
-```
-*/
-let intersect: (t<'value, 'id>, t<'value, 'id>, ~cmp: cmp<'value, 'id>) => t<'value, 'id>
-
-/**
-Returns elements from first set, not existing in second set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([5, 2, 3, 5, 6], ~cmp=IntCmp.cmp)
-let s1 = Belt.Set.Dict.fromArray([5, 2, 3, 1, 5, 4], ~cmp=IntCmp.cmp)
-
-let diff1 = Belt.Set.Dict.diff(s0, s1, ~cmp=IntCmp.cmp)
-let diff2 = Belt.Set.Dict.diff(s1, s0, ~cmp=IntCmp.cmp)
-
-diff1->Belt.Set.Dict.toArray /* [6] */
-diff2->Belt.Set.Dict.toArray /* [1,4] */
-```
-*/
-let diff: (t<'value, 'id>, t<'value, 'id>, ~cmp: cmp<'value, 'id>) => t<'value, 'id>
-
-/**
-Checks if second set is subset of first set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([5, 2, 3, 5, 6], ~cmp=IntCmp.cmp)
-let s1 = Belt.Set.Dict.fromArray([5, 2, 3, 1, 5, 4], ~cmp=IntCmp.cmp)
-let s2 = Belt.Set.Dict.intersect(s0, s1, ~cmp=IntCmp.cmp)
-Belt.Set.Dict.subset(s2, s0, ~cmp=IntCmp.cmp) /* true */
-Belt.Set.Dict.subset(s2, s1, ~cmp=IntCmp.cmp) /* true */
-Belt.Set.Dict.subset(s1, s0, ~cmp=IntCmp.cmp) /* false */
-```
-*/
-let subset: (t<'value, 'id>, t<'value, 'id>, ~cmp: cmp<'value, 'id>) => bool
-
-/**
-Total ordering between sets. Can be used as the ordering function for doing sets
-of sets. It compares size first and then iterates over each element following the
-order of elements.
-*/
-let cmp: (t<'value, 'id>, t<'value, 'id>, ~cmp: cmp<'value, 'id>) => int
-
-/**
-Checks if two sets are equal.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([5, 2, 3], ~cmp=IntCmp.cmp)
-let s1 = Belt.Set.Dict.fromArray([3, 2, 5], ~cmp=IntCmp.cmp)
-
-Belt.Set.Dict.eq(s0, s1, ~cmp=IntCmp.cmp) /* true */
-```
-*/
-let eq: (t<'value, 'id>, t<'value, 'id>, ~cmp: cmp<'value, 'id>) => bool
-
-/**
-Same as [forEach](##forEach) but takes uncurried functon.
-*/
-let forEachU: (t<'value, 'id>, (. 'value) => unit) => unit
-
-/**
-Applies function `f` in turn to all elements of set in increasing order.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([5, 2, 3, 5, 6], ~cmp=IntCmp.cmp)
-let acc = ref(list{})
-s0->Belt.Set.Dict.forEach(x => acc := Belt.List.add(acc.contents, x))
-acc /* [6,5,3,2] */
-```
-*/
-let forEach: (t<'value, 'id>, 'value => unit) => unit
-
-let reduceU: (t<'value, 'id>, 'a, (. 'a, 'value) => 'a) => 'a
-
-/**
-Applies function `f` to each element of set in increasing order. Function `f` has two parameters: the item from the set and an “accumulator”, which starts with a value of `initialValue`. `reduce` returns the final value of the accumulator.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([5, 2, 3, 5, 6], ~cmp=IntCmp.cmp)
-s0->Belt.Set.Dict.reduce(list{}, (acc, element) => acc->Belt.List.add(element)) /* [6,5,3,2] */
-```
-*/
-let reduce: (t<'value, 'id>, 'a, ('a, 'value) => 'a) => 'a
-
-let everyU: (t<'value, 'id>, (. 'value) => bool) => bool
-
-/**
-Checks if all elements of the set satisfy the predicate. Order unspecified.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let isEven = x => mod(x, 2) == 0
-
-let s0 = Belt.Set.Dict.fromArray([2, 4, 6, 8], ~cmp=IntCmp.cmp)
-s0->Belt.Set.Dict.every(isEven) /* true */
-```
-*/
-let every: (t<'value, 'id>, 'value => bool) => bool
-
-let someU: (t<'value, 'id>, (. 'value) => bool) => bool
-
-/**
-Checks if at least one element of the set satisfies the predicate.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let isOdd = x => mod(x, 2) != 0
-
-let s0 = Belt.Set.Dict.fromArray([1, 2, 4, 6, 8], ~cmp=IntCmp.cmp)
-s0->Belt.Set.Dict.some(isOdd) /* true */
-```
-*/
-let some: (t<'value, 'id>, 'value => bool) => bool
-
-let keepU: (t<'value, 'id>, (. 'value) => bool) => t<'value, 'id>
-
-/**
-Returns the set of all elements that satisfy the predicate.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let isEven = x => mod(x, 2) == 0
-
-let s0 = Belt.Set.Dict.fromArray([1, 2, 3, 4, 5], ~cmp=IntCmp.cmp)
-let s1 = s0->Belt.Set.Dict.keep(isEven)
-
-s1->Belt.Set.Dict.toArray /* [2,4] */
-```
-*/
-let keep: (t<'value, 'id>, 'value => bool) => t<'value, 'id>
-
-let partitionU: (t<'value, 'id>, (. 'value) => bool) => (t<'value, 'id>, t<'value, 'id>)
-
-/**
-Returns a pair of sets, where first is the set of all the elements of set that satisfy the predicate, and second is the set of all the elements of set that do not satisfy the predicate.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let isOdd = x => mod(x, 2) != 0
-
-let s0 = Belt.Set.Dict.fromArray([1, 2, 3, 4, 5], ~cmp=IntCmp.cmp)
-let (s1, s2) = s0->Belt.Set.Dict.partition(isOdd)
-
-s1->Belt.Set.Dict.toArray /* [1,3,5] */
-s2->Belt.Set.Dict.toArray /* [2,4] */
-```
-*/
-let partition: (t<'value, 'id>, 'value => bool) => (t<'value, 'id>, t<'value, 'id>)
-
-/**
-Returns size of the set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([1, 2, 3, 4], ~cmp=IntCmp.cmp)
-
-s0->Belt.Set.Dict.size /* 4 */
-```
-*/
-let size: t<'value, 'id> => int
-
-/**
-Returns list of ordered set elements.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([3, 2, 1, 5], ~cmp=IntCmp.cmp)
-
-s0->Belt.Set.Dict.toList /* [1,2,3,5] */
-```
-*/
-let toList: t<'value, 'id> => list<'value>
-
-/**
-Returns array of ordered set elements.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([3, 2, 1, 5], ~cmp=IntCmp.cmp)
-
-s0->Belt.Set.Dict.toArray /* [1,2,3,5] */
-```
-*/
-let toArray: t<'value, 'id> => array<'value>
-
-/**
-Returns minimum value of the collection. `None` if collection is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.empty
-let s1 = Belt.Set.Dict.fromArray([3, 2, 1, 5], ~cmp=IntCmp.cmp)
-
-s0->Belt.Set.Dict.minimum /* None */
-s1->Belt.Set.Dict.minimum /* Some(1) */
-```
-*/
-let minimum: t<'value, 'id> => option<'value>
-
-/**
-Returns minimum value of the collection. `undefined` if collection is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.empty
-let s1 = Belt.Set.Dict.fromArray([3, 2, 1, 5], ~cmp=IntCmp.cmp)
-
-s0->Belt.Set.Dict.minUndefined /* undefined */
-s1->Belt.Set.Dict.minUndefined /* 1 */
-```
-*/
-let minUndefined: t<'value, 'id> => Js.undefined<'value>
-
-/**
-Returns maximum value of the collection. `None` if collection is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.empty
-let s1 = Belt.Set.Dict.fromArray([3, 2, 1, 5], ~cmp=IntCmp.cmp)
-
-s0->Belt.Set.Dict.maximum /* None */
-s1->Belt.Set.Dict.maximum /* Some(5) */
-```
-*/
-let maximum: t<'value, 'id> => option<'value>
-
-/**
-Returns maximum value of the collection. `undefined` if collection is empty.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.empty
-let s1 = Belt.Set.Dict.fromArray([3, 2, 1, 5], ~cmp=IntCmp.cmp)
-
-s0->Belt.Set.Dict.maxUndefined /* undefined */
-s1->Belt.Set.Dict.maxUndefined /* 5 */
-```
-*/
-let maxUndefined: t<'value, 'id> => Js.undefined<'value>
-
-/**
-Returns the reference of the value which is equivalent to value using the comparator
-specifiecd by this collection. Returns `None` if element does not exist.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([1, 2, 3, 4, 5], ~cmp=IntCmp.cmp)
-
-s0->Belt.Set.Dict.get(3, ~cmp=IntCmp.cmp) /* Some(3) */
-s0->Belt.Set.Dict.get(20, ~cmp=IntCmp.cmp) /* None */
-```
-*/
-let get: (t<'value, 'id>, 'value, ~cmp: cmp<'value, 'id>) => option<'value>
-
-/**
-Same as [get](#get) but returns `undefined` when element does not exist.
-*/
-let getUndefined: (t<'value, 'id>, 'value, ~cmp: cmp<'value, 'id>) => Js.undefined<'value>
-
-/**
-Same as [get](#get) but raise when element does not exist.
-*/
-let getExn: (t<'value, 'id>, 'value, ~cmp: cmp<'value, 'id>) => 'value
-
-/**
-Returns a tuple `((smaller, larger), present)`, `present` is true when element exist in set.
-
-## Examples
-
-```rescript
-module IntCmp = Belt.Id.MakeComparable({
-  type t = int
-  let cmp = Pervasives.compare
-})
-
-let s0 = Belt.Set.Dict.fromArray([1, 2, 3, 4, 5], ~cmp=IntCmp.cmp)
-
-let ((smaller, larger), present) = s0->Belt.Set.Dict.split(3, ~cmp=IntCmp.cmp)
-
-present /* true */
-smaller->Belt.Set.Dict.toArray /* [1,2] */
-larger->Belt.Set.Dict.toArray /* [4,5] */
-```
-*/
-let split: (
-  t<'value, 'id>,
-  'value,
-  ~cmp: cmp<'value, 'id>,
-) => ((t<'value, 'id>, t<'value, 'id>), bool)
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
diff --git a/jscomp/others/belt_SetInt.res b/jscomp/others/belt_SetInt.res
deleted file mode 100644
index 8d75c14..0000000
--- a/jscomp/others/belt_SetInt.res
+++ /dev/null
@@ -1,227 +0,0 @@
-module I = Belt_internalSetInt
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-
-type value = I.value
-type t = I.t
-
-let empty = None
-let isEmpty = N.isEmpty
-let minimum = N.minimum
-let minUndefined = N.minUndefined
-let maximum = N.maximum
-let maxUndefined = N.maxUndefined
-
-let forEach = N.forEach
-let forEachU = N.forEachU
-let reduce = N.reduce
-let reduceU = N.reduceU
-let every = N.every
-let everyU = N.everyU
-let some = N.some
-let someU = N.someU
-let keep = N.keepShared
-let keepU = N.keepSharedU
-let partition = N.partitionShared
-let partitionU = N.partitionSharedU
-
-let size = N.size
-let toList = N.toList
-let toArray = N.toArray
-let fromSortedArrayUnsafe = N.fromSortedArrayUnsafe
-let checkInvariantInternal = N.checkInvariantInternal
-
-let rec add = (t: t, x: value): t =>
-  switch t {
-  | None => N.singleton(x)
-  | Some(nt) =>
-    let v = nt.value
-    if x == v {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < v {
-        let ll = add(l, x)
-        if ll === l {
-          t
-        } else {
-          N.bal(ll, v, r)
-        }
-      } else {
-        let rr = add(r, x)
-        if rr === r {
-          t
-        } else {
-          N.bal(l, v, rr)
-        }
-      }
-    }
-  }
-
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let key = A.getUnsafe(arr, i)
-    v.contents = add(v.contents, key)
-  }
-  v.contents
-}
-
-let rec remove = (t: t, x: value): t =>
-  switch t {
-  | None => t
-  | Some(n) =>
-    let {N.left: l, value: v, right: r} = n
-    if x == v {
-      switch (l, r) {
-      | (None, _) => r
-      | (_, None) => l
-      | (_, Some(rn)) =>
-        let v = ref(rn.value)
-        let r = N.removeMinAuxWithRef(rn, v)
-        N.bal(l, v.contents, r)
-      }
-    } else if x < v {
-      let ll = remove(l, x)
-      if ll === l {
-        t
-      } else {
-        N.bal(ll, v, r)
-      }
-    } else {
-      let rr = remove(r, x)
-      if rr === r {
-        t
-      } else {
-        N.bal(l, v, rr)
-      }
-    }
-  }
-
-let removeMany = (h, arr) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let key = A.getUnsafe(arr, i)
-    v.contents = remove(v.contents, key)
-  }
-  v.contents
-}
-
-let fromArray = I.fromArray
-let cmp = I.cmp
-let eq = I.eq
-let get = I.get
-let getUndefined = I.getUndefined
-let getExn = I.getExn
-let subset = I.subset
-let has = I.has
-
-let rec splitAuxNoPivot = (n: N.node<_>, x: value): (t, t) => {
-  let {N.left: l, value: v, right: r} = n
-  if x == v {
-    (l, r)
-  } else if x < v {
-    switch l {
-    | None => (None, Some(n))
-    | Some(l) =>
-      let (ll, rl) = splitAuxNoPivot(l, x)
-      (ll, N.joinShared(rl, v, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None)
-    | Some(r) =>
-      let (lr, rr) = splitAuxNoPivot(r, x)
-      (N.joinShared(l, v, lr), rr)
-    }
-  }
-}
-
-let rec splitAuxPivot = (n: N.node<_>, x: value, pres): (t, t) => {
-  let {N.left: l, value: v, right: r} = n
-  if x == v {
-    pres.contents = true
-    (l, r)
-  } else if x < v {
-    switch l {
-    | None => (None, Some(n))
-    | Some(l) =>
-      let (ll, rl) = splitAuxPivot(l, x, pres)
-      (ll, N.joinShared(rl, v, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None)
-    | Some(r) =>
-      let (lr, rr) = splitAuxPivot(r, x, pres)
-      (N.joinShared(l, v, lr), rr)
-    }
-  }
-}
-
-let split = (t: t, x: value) =>
-  switch t {
-  | None => ((None, None), false)
-  | Some(n) =>
-    let pres = ref(false)
-    let v = splitAuxPivot(n, x, pres)
-    (v, pres.contents)
-  }
-
-let rec union = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) => s2
-  | (_, None) => s1
-  | (Some(n1), Some(n2)) /* (Node(l1, v1, r1, h1), Node(l2, v2, r2, h2)) */ =>
-    let (h1, h2) = (n1.height, n2.height)
-    if h1 >= h2 {
-      if h2 == 1 {
-        add(s1, n2.value)
-      } else {
-        let {N.left: l1, value: v1, right: r1} = n1
-        let (l2, r2) = splitAuxNoPivot(n2, v1)
-        N.joinShared(union(l1, l2), v1, union(r1, r2))
-      }
-    } else if h1 == 1 {
-      add(s2, n1.value)
-    } else {
-      let {N.left: l2, value: v2, right: r2} = n2
-      let (l1, r1) = splitAuxNoPivot(n1, v2)
-      N.joinShared(union(l1, l2), v2, union(r1, r2))
-    }
-  }
-
-let rec intersect = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) | (_, None) => None
-  | (Some(n1), Some(n2)) /* (Node(l1, v1, r1, _), t2) */ =>
-    let {N.left: l1, value: v1, right: r1} = n1
-    let pres = ref(false)
-    let (l2, r2) = splitAuxPivot(n2, v1, pres)
-    let ll = intersect(l1, l2)
-    let rr = intersect(r1, r2)
-    if pres.contents {
-      N.joinShared(ll, v1, rr)
-    } else {
-      N.concatShared(ll, rr)
-    }
-  }
-
-let rec diff = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) | (_, None) => s1
-  | (Some(n1), Some(n2)) /* (Node(l1, v1, r1, _), t2) */ =>
-    let {N.left: l1, value: v1, right: r1} = n1
-    let pres = ref(false)
-    let (l2, r2) = splitAuxPivot(n2, v1, pres)
-    let ll = diff(l1, l2)
-    let rr = diff(r1, r2)
-    if pres.contents {
-      N.concatShared(ll, rr)
-    } else {
-      N.joinShared(ll, v1, rr)
-    }
-  }
diff --git a/jscomp/others/belt_SetInt.resi b/jscomp/others/belt_SetInt.resi
deleted file mode 100644
index 7805e9e..0000000
--- a/jscomp/others/belt_SetInt.resi
+++ /dev/null
@@ -1,162 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-  This module is [`Belt.Set`]() specialized with value type to be a primitive type.
-  It is more efficient in general, the  API is the same with [`Belt_Set`]() except its value type is fixed,
-  and identity is not needed(using the built-in one)
-
-  **See** [`Belt.Set`]()
-*/
-
-/** The type of the set elements. */
-type value = int
-
-/** The type of sets. */
-type t
-
-let empty: t
-
-let fromArray: array<value> => t
-
-let fromSortedArrayUnsafe: array<value> => t
-
-let isEmpty: t => bool
-
-let has: (t, value) => bool
-
-/**
-`add(s, x)` If `x` was already in `s`, `s` is returned unchanged.
-*/
-let add: (t, value) => t
-
-let mergeMany: (t, array<value>) => t
-
-/**
-`remove(m, x)` If `x` was not in `m`, `m` is returned reference unchanged.
-*/
-let remove: (t, value) => t
-
-let removeMany: (t, array<value>) => t
-
-let union: (t, t) => t
-
-let intersect: (t, t) => t
-
-let diff: (t, t) => t
-
-/**
-`subset(s1, s2)` tests whether the set `s1` is a subset of the set `s2`.
-*/
-let subset: (t, t) => bool
-
-/**
-Total ordering between sets. Can be used as the ordering function for doing sets
-of sets.
-*/
-let cmp: (t, t) => int
-
-/** 
-`eq(s1, s2)` tests whether the sets `s1` and `s2` are equal, that is, contain
-equal elements.
-*/
-let eq: (t, t) => bool
-
-let forEachU: (t, (. value) => unit) => unit
-
-/**
-`forEach(s, f)` applies `f` in turn to all elements of `s`. In increasing order
-*/
-let forEach: (t, value => unit) => unit
-
-let reduceU: (t, 'a, (. 'a, value) => 'a) => 'a
-
-/** Iterate in increasing order. */
-let reduce: (t, 'a, ('a, value) => 'a) => 'a
-
-let everyU: (t, (. value) => bool) => bool
-
-/**
-`every(p, s)` checks if all elements of the set satisfy the predicate `p`. Order
-unspecified.
-*/
-let every: (t, value => bool) => bool
-
-let someU: (t, (. value) => bool) => bool
-
-/** 
-`some(p, s)` checks if at least one element of the set satisfies the predicate
-`p`. Oder unspecified.
-*/
-let some: (t, value => bool) => bool
-
-let keepU: (t, (. value) => bool) => t
-
-/**
-`keep(p, s)` returns the set of all elements in `s` that satisfy predicate `p`.
-*/
-let keep: (t, value => bool) => t
-
-let partitionU: (t, (. value) => bool) => (t, t)
-
-/**
-`partition(p, s)` returns a pair of sets `(s1, s2)`, where `s1` is the set of
-all the elements of `s` that satisfy the predicate `p`, and `s2` is the set of
-all the elements of `s` that do not satisfy `p`.
-*/
-let partition: (t, value => bool) => (t, t)
-
-let size: t => int
-
-/** In increasing order */
-let toList: t => list<value>
-
-let toArray: t => array<value>
-
-let minimum: t => option<value>
-
-let minUndefined: t => Js.undefined<value>
-
-let maximum: t => option<value>
-
-let maxUndefined: t => Js.undefined<value>
-
-let get: (t, value) => option<value>
-
-let getUndefined: (t, value) => Js.undefined<value>
-
-let getExn: (t, value) => value
-
-/**
-`split(x, s)` returns a triple `(l, present, r)`, where `l` is the set of
-elements of `s` that are strictly less than `x`;`r` is the set of elements of
-`s` that are strictly greater than `x`; `present` is `false` if `s` contains no
-element equal to `x`, or `true` if `s` contains an element equal to `x`.
-*/
-let split: (t, value) => ((t, t), bool)
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t => unit
diff --git a/jscomp/others/belt_SetString.res b/jscomp/others/belt_SetString.res
deleted file mode 100644
index 972aa53..0000000
--- a/jscomp/others/belt_SetString.res
+++ /dev/null
@@ -1,227 +0,0 @@
-module I = Belt_internalSetString
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-
-type value = I.value
-type t = I.t
-
-let empty = None
-let isEmpty = N.isEmpty
-let minimum = N.minimum
-let minUndefined = N.minUndefined
-let maximum = N.maximum
-let maxUndefined = N.maxUndefined
-
-let forEach = N.forEach
-let forEachU = N.forEachU
-let reduce = N.reduce
-let reduceU = N.reduceU
-let every = N.every
-let everyU = N.everyU
-let some = N.some
-let someU = N.someU
-let keep = N.keepShared
-let keepU = N.keepSharedU
-let partition = N.partitionShared
-let partitionU = N.partitionSharedU
-
-let size = N.size
-let toList = N.toList
-let toArray = N.toArray
-let fromSortedArrayUnsafe = N.fromSortedArrayUnsafe
-let checkInvariantInternal = N.checkInvariantInternal
-
-let rec add = (t: t, x: value): t =>
-  switch t {
-  | None => N.singleton(x)
-  | Some(nt) =>
-    let v = nt.value
-    if x == v {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < v {
-        let ll = add(l, x)
-        if ll === l {
-          t
-        } else {
-          N.bal(ll, v, r)
-        }
-      } else {
-        let rr = add(r, x)
-        if rr === r {
-          t
-        } else {
-          N.bal(l, v, rr)
-        }
-      }
-    }
-  }
-
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let key = A.getUnsafe(arr, i)
-    v.contents = add(v.contents, key)
-  }
-  v.contents
-}
-
-let rec remove = (t: t, x: value): t =>
-  switch t {
-  | None => t
-  | Some(n) =>
-    let {N.left: l, value: v, right: r} = n
-    if x == v {
-      switch (l, r) {
-      | (None, _) => r
-      | (_, None) => l
-      | (_, Some(rn)) =>
-        let v = ref(rn.value)
-        let r = N.removeMinAuxWithRef(rn, v)
-        N.bal(l, v.contents, r)
-      }
-    } else if x < v {
-      let ll = remove(l, x)
-      if ll === l {
-        t
-      } else {
-        N.bal(ll, v, r)
-      }
-    } else {
-      let rr = remove(r, x)
-      if rr === r {
-        t
-      } else {
-        N.bal(l, v, rr)
-      }
-    }
-  }
-
-let removeMany = (h, arr) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let key = A.getUnsafe(arr, i)
-    v.contents = remove(v.contents, key)
-  }
-  v.contents
-}
-
-let fromArray = I.fromArray
-let cmp = I.cmp
-let eq = I.eq
-let get = I.get
-let getUndefined = I.getUndefined
-let getExn = I.getExn
-let subset = I.subset
-let has = I.has
-
-let rec splitAuxNoPivot = (n: N.node<_>, x: value): (t, t) => {
-  let {N.left: l, value: v, right: r} = n
-  if x == v {
-    (l, r)
-  } else if x < v {
-    switch l {
-    | None => (None, Some(n))
-    | Some(l) =>
-      let (ll, rl) = splitAuxNoPivot(l, x)
-      (ll, N.joinShared(rl, v, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None)
-    | Some(r) =>
-      let (lr, rr) = splitAuxNoPivot(r, x)
-      (N.joinShared(l, v, lr), rr)
-    }
-  }
-}
-
-let rec splitAuxPivot = (n: N.node<_>, x: value, pres): (t, t) => {
-  let {N.left: l, value: v, right: r} = n
-  if x == v {
-    pres.contents = true
-    (l, r)
-  } else if x < v {
-    switch l {
-    | None => (None, Some(n))
-    | Some(l) =>
-      let (ll, rl) = splitAuxPivot(l, x, pres)
-      (ll, N.joinShared(rl, v, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None)
-    | Some(r) =>
-      let (lr, rr) = splitAuxPivot(r, x, pres)
-      (N.joinShared(l, v, lr), rr)
-    }
-  }
-}
-
-let split = (t: t, x: value) =>
-  switch t {
-  | None => ((None, None), false)
-  | Some(n) =>
-    let pres = ref(false)
-    let v = splitAuxPivot(n, x, pres)
-    (v, pres.contents)
-  }
-
-let rec union = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) => s2
-  | (_, None) => s1
-  | (Some(n1), Some(n2)) /* (Node(l1, v1, r1, h1), Node(l2, v2, r2, h2)) */ =>
-    let (h1, h2) = (n1.height, n2.height)
-    if h1 >= h2 {
-      if h2 == 1 {
-        add(s1, n2.value)
-      } else {
-        let {N.left: l1, value: v1, right: r1} = n1
-        let (l2, r2) = splitAuxNoPivot(n2, v1)
-        N.joinShared(union(l1, l2), v1, union(r1, r2))
-      }
-    } else if h1 == 1 {
-      add(s2, n1.value)
-    } else {
-      let {N.left: l2, value: v2, right: r2} = n2
-      let (l1, r1) = splitAuxNoPivot(n1, v2)
-      N.joinShared(union(l1, l2), v2, union(r1, r2))
-    }
-  }
-
-let rec intersect = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) | (_, None) => None
-  | (Some(n1), Some(n2)) /* (Node(l1, v1, r1, _), t2) */ =>
-    let {N.left: l1, value: v1, right: r1} = n1
-    let pres = ref(false)
-    let (l2, r2) = splitAuxPivot(n2, v1, pres)
-    let ll = intersect(l1, l2)
-    let rr = intersect(r1, r2)
-    if pres.contents {
-      N.joinShared(ll, v1, rr)
-    } else {
-      N.concatShared(ll, rr)
-    }
-  }
-
-let rec diff = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) | (_, None) => s1
-  | (Some(n1), Some(n2)) /* (Node(l1, v1, r1, _), t2) */ =>
-    let {N.left: l1, value: v1, right: r1} = n1
-    let pres = ref(false)
-    let (l2, r2) = splitAuxPivot(n2, v1, pres)
-    let ll = diff(l1, l2)
-    let rr = diff(r1, r2)
-    if pres.contents {
-      N.concatShared(ll, rr)
-    } else {
-      N.joinShared(ll, v1, rr)
-    }
-  }
diff --git a/jscomp/others/belt_SetString.resi b/jscomp/others/belt_SetString.resi
deleted file mode 100644
index b169be5..0000000
--- a/jscomp/others/belt_SetString.resi
+++ /dev/null
@@ -1,162 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-  This module is [`Belt.Set`]() specialized with value type to be a primitive type.
-  It is more efficient in general, the  API is the same with [`Belt_Set`]() except its value type is fixed,
-  and identity is not needed(using the built-in one)
-
-  **See** [`Belt.Set`]()
-*/
-
-/** The type of the set elements. */
-type value = string
-
-/** The type of sets. */
-type t
-
-let empty: t
-
-let fromArray: array<value> => t
-
-let fromSortedArrayUnsafe: array<value> => t
-
-let isEmpty: t => bool
-
-let has: (t, value) => bool
-
-/**
-`add(s, x)` If `x` was already in `s`, `s` is returned unchanged.
-*/
-let add: (t, value) => t
-
-let mergeMany: (t, array<value>) => t
-
-/**
-`remove(m, x)` If `x` was not in `m`, `m` is returned reference unchanged.
-*/
-let remove: (t, value) => t
-
-let removeMany: (t, array<value>) => t
-
-let union: (t, t) => t
-
-let intersect: (t, t) => t
-
-let diff: (t, t) => t
-
-/**
-`subset(s1, s2)` tests whether the set `s1` is a subset of the set `s2`.
-*/
-let subset: (t, t) => bool
-
-/**
-Total ordering between sets. Can be used as the ordering function for doing sets
-of sets.
-*/
-let cmp: (t, t) => int
-
-/** 
-`eq(s1, s2)` tests whether the sets `s1` and `s2` are equal, that is, contain
-equal elements.
-*/
-let eq: (t, t) => bool
-
-let forEachU: (t, (. value) => unit) => unit
-
-/**
-`forEach(s, f)` applies `f` in turn to all elements of `s`. In increasing order
-*/
-let forEach: (t, value => unit) => unit
-
-let reduceU: (t, 'a, (. 'a, value) => 'a) => 'a
-
-/** Iterate in increasing order. */
-let reduce: (t, 'a, ('a, value) => 'a) => 'a
-
-let everyU: (t, (. value) => bool) => bool
-
-/**
-`every(p, s)` checks if all elements of the set satisfy the predicate `p`. Order
-unspecified.
-*/
-let every: (t, value => bool) => bool
-
-let someU: (t, (. value) => bool) => bool
-
-/** 
-`some(p, s)` checks if at least one element of the set satisfies the predicate
-`p`. Oder unspecified.
-*/
-let some: (t, value => bool) => bool
-
-let keepU: (t, (. value) => bool) => t
-
-/**
-`keep(p, s)` returns the set of all elements in `s` that satisfy predicate `p`.
-*/
-let keep: (t, value => bool) => t
-
-let partitionU: (t, (. value) => bool) => (t, t)
-
-/**
-`partition(p, s)` returns a pair of sets `(s1, s2)`, where `s1` is the set of
-all the elements of `s` that satisfy the predicate `p`, and `s2` is the set of
-all the elements of `s` that do not satisfy `p`.
-*/
-let partition: (t, value => bool) => (t, t)
-
-let size: t => int
-
-/** In increasing order */
-let toList: t => list<value>
-
-let toArray: t => array<value>
-
-let minimum: t => option<value>
-
-let minUndefined: t => Js.undefined<value>
-
-let maximum: t => option<value>
-
-let maxUndefined: t => Js.undefined<value>
-
-let get: (t, value) => option<value>
-
-let getUndefined: (t, value) => Js.undefined<value>
-
-let getExn: (t, value) => value
-
-/**
-`split(x, s)` returns a triple `(l, present, r)`, where `l` is the set of
-elements of `s` that are strictly less than `x`;`r` is the set of elements of
-`s` that are strictly greater than `x`; `present` is `false` if `s` contains no
-element equal to `x`, or `true` if `s` contains an element equal to `x`.
-*/
-let split: (t, value) => ((t, t), bool)
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t => unit
diff --git a/jscomp/others/belt_SortArray.res b/jscomp/others/belt_SortArray.res
deleted file mode 100644
index 462b468..0000000
--- a/jscomp/others/belt_SortArray.res
+++ /dev/null
@@ -1,354 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module Int = Belt_SortArrayInt
-
-module String = Belt_SortArrayString
-
-module A = Belt_Array
-
-let rec sortedLengthAuxMore = (xs, prec, acc, len, lt) =>
-  if acc >= len {
-    acc
-  } else {
-    let v = A.getUnsafe(xs, acc)
-    if lt(. v, prec) {
-      sortedLengthAuxMore(xs, v, acc + 1, len, lt)
-    } else {
-      acc
-    }
-  }
-
-let rec sortedLengthAuxLess = (xs, prec, acc, len, lt) =>
-  if acc >= len {
-    acc
-  } else {
-    let v = A.getUnsafe(xs, acc)
-    if lt(. prec, v) {
-      sortedLengthAuxLess(xs, v, acc + 1, len, lt)
-    } else {
-      acc
-    }
-  }
-
-let strictlySortedLengthU = (xs, lt) => {
-  let len = A.length(xs)
-  switch len {
-  | 0 | 1 => len
-  | _ =>
-    let (x0, x1) = (A.getUnsafe(xs, 0), A.getUnsafe(xs, 1))
-
-    /* let c = cmp x0 x1 [@bs]  in */
-    if lt(. x0, x1) {
-      sortedLengthAuxLess(xs, x1, 2, len, lt)
-    } else if lt(. x1, x0) {
-      -sortedLengthAuxMore(xs, x1, 2, len, lt)
-    } else {
-      1
-    }
-  }
-}
-
-let strictlySortedLength = (xs, lt) => strictlySortedLengthU(xs, (. x, y) => lt(x, y))
-
-let rec isSortedAux = (a, i, cmp, last_bound) =>
-  /* when `i = len - 1`, it reaches the last element */
-  if i == last_bound {
-    true
-  } else if cmp(. A.getUnsafe(a, i), A.getUnsafe(a, i + 1)) <= 0 {
-    isSortedAux(a, i + 1, cmp, last_bound)
-  } else {
-    false
-  }
-
-let isSortedU = (a, cmp) => {
-  let len = A.length(a)
-  if len == 0 {
-    true
-  } else {
-    isSortedAux(a, 0, cmp, len - 1)
-  }
-}
-
-let isSorted = (a, cmp) => isSortedU(a, (. x, y) => cmp(x, y))
-
-let cutoff = 5
-
-let merge = (src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) => {
-  let src1r = src1ofs + src1len and src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    if cmp(. s1, s2) <= 0 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d + 1)
-      } else {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d + 1, ~len=src2r - i2)
-      }
-    } else {
-      A.setUnsafe(dst, d, s2)
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d + 1)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d + 1, ~len=src1r - i1)
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let unionU = (src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) => {
-    let c = cmp(. s1, s2)
-    if c < 0 {
-      /* `s1` is larger than all elements in `d` */
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let d = d + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d, ~len=src2r - i2)
-        d + src2r - i2
-      }
-    } else if c == 0 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      let d = d + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else if i1 == src1r {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d, ~len=src2r - i2)
-        d + src2r - i2
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    } else {
-      A.setUnsafe(dst, d, s2)
-      let i2 = i2 + 1
-      let d = d + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    }
-  }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let union = (src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) =>
-  unionU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (. x, y) => cmp(x, y))
-
-let intersectU = (src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) => {
-    let c = cmp(. s1, s2)
-    if c < 0 {
-      /* A.setUnsafe dst d s1; */
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        d
-      }
-    } else if c == 0 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      let d = d + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else {
-        d
-      }
-    } else {
-      /* A.setUnsafe dst d s2; */
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        d
-      }
-    }
-  }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let intersect = (src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) =>
-  intersectU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (. x, y) => cmp(x, y))
-
-let diffU = (src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) => {
-    let c = cmp(. s1, s2)
-    if c < 0 {
-      A.setUnsafe(dst, d, s1)
-      let d = d + 1
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        d
-      }
-    } else if c == 0 {
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else if i1 == src1r {
-        d
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    } else {
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    }
-  }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let diff = (src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp) =>
-  diffU(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, (. x, y) => cmp(x, y))
-
-/* `<=` alone is not enough for stable sort */
-let insertionSort = (src, srcofs, dst, dstofs, len, cmp) =>
-  for i in 0 to len - 1 {
-    let e = A.getUnsafe(src, srcofs + i)
-    let j = ref(dstofs + i - 1)
-    while j.contents >= dstofs && cmp(. A.getUnsafe(dst, j.contents), e) > 0 {
-      A.setUnsafe(dst, j.contents + 1, A.getUnsafe(dst, j.contents))
-      j.contents = j.contents - 1
-    }
-    A.setUnsafe(dst, j.contents + 1, e)
-  }
-
-let rec sortTo = (src, srcofs, dst, dstofs, len, cmp) =>
-  if len <= cutoff {
-    insertionSort(src, srcofs, dst, dstofs, len, cmp)
-  } else {
-    let l1 = len / 2
-    let l2 = len - l1
-    sortTo(src, srcofs + l1, dst, dstofs + l1, l2, cmp)
-    sortTo(src, srcofs, src, srcofs + l2, l1, cmp)
-    merge(src, srcofs + l2, l1, dst, dstofs + l1, l2, dst, dstofs, cmp)
-  }
-
-let stableSortInPlaceByU = (a, cmp) => {
-  let l = A.length(a)
-  if l <= cutoff {
-    insertionSort(a, 0, a, 0, l, cmp)
-  } else {
-    let l1 = l / 2
-    let l2 = l - l1
-    let t = Belt_Array.makeUninitializedUnsafe(l2)
-    sortTo(a, l1, t, 0, l2, cmp)
-    sortTo(a, 0, a, l2, l1, cmp)
-    merge(a, l2, l1, t, 0, l2, a, 0, cmp)
-  }
-}
-
-let stableSortInPlaceBy = (a, cmp) => stableSortInPlaceByU(a, (. x, y) => cmp(x, y))
-
-let stableSortByU = (a, cmp) => {
-  let b = A.copy(a)
-  stableSortInPlaceByU(b, cmp)
-  b
-}
-
-let stableSortBy = (a, cmp) => stableSortByU(a, (. x, y) => cmp(x, y))
-/*
-  `binarySearchAux arr lo hi key cmp`
-  range [lo, hi]
-  input (lo <= hi)
-  `arr[lo] <= key <= arr[hi]` */
-let rec binarySearchAux = (arr, lo, hi, key, cmp) => {
-  let mid = (lo + hi) / 2
-  let midVal = A.getUnsafe(arr, mid)
-  let c = cmp(. key, midVal)
-  if c == 0 {
-    mid
-  } else if c < 0 {
-    /* a[lo] =< key < a[mid] <= a[hi] */
-    if hi == mid {
-      if cmp(. A.getUnsafe(arr, lo), key) == 0 {
-        lo
-      } else {
-        -(hi + 1)
-      }
-    } else {
-      binarySearchAux(arr, lo, mid, key, cmp)
-    }
-  } /* a[lo] =< a[mid] < key <= a[hi] */
-  else if lo == mid {
-    if cmp(. A.getUnsafe(arr, hi), key) == 0 {
-      hi
-    } else {
-      -(hi + 1)
-    }
-  } else {
-    binarySearchAux(arr, mid, hi, key, cmp)
-  }
-}
-
-let binarySearchByU = (sorted, key, cmp): int => {
-  let len = A.length(sorted)
-  if len == 0 {
-    -1
-  } else {
-    let lo = A.getUnsafe(sorted, 0)
-    let c = cmp(. key, lo)
-    if c < 0 {
-      -1
-    } else {
-      let hi = A.getUnsafe(sorted, len - 1)
-      let c2 = cmp(. key, hi)
-      if c2 > 0 {
-        -(len + 1)
-      } else {
-        binarySearchAux(sorted, 0, len - 1, key, cmp)
-      }
-    }
-  }
-}
-
-let binarySearchBy = (sorted, key, cmp) => binarySearchByU(sorted, key, (. x, y) => cmp(x, y))
diff --git a/jscomp/others/belt_SortArray.resi b/jscomp/others/belt_SortArray.resi
deleted file mode 100644
index ced18fc..0000000
--- a/jscomp/others/belt_SortArray.resi
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-A module for Array sort relevant utiliites
-*/
-
-/**
-Specalized when key type is `int`, more efficient than the generic type
-*/
-module Int = Belt_SortArrayInt
-
-/**
-Specalized when key type is `string`, more efficient than the generic type
-*/
-module String = Belt_SortArrayString
-
-let strictlySortedLengthU: (array<'a>, (. 'a, 'a) => bool) => int
-
-/**
-`strictlySortedLenght(xs, cmp);` return `+n` means increasing order `-n` means negative order
-
-## Examples
-
-```rescript
-Belt.SortArray.strictlySortedLength([1, 2, 3, 4, 3], (x, y) => x < y) == 4
-
-Belt.SortArray.strictlySortedLength([], (x, y) => x < y) == 0
-
-Belt.SortArray.strictlySortedLength([1], (x, y) => x < y) == 1
-
-Belt.SortArray.strictlySortedLength([4, 3, 2, 1], (x, y) => x < y) == -4
-```
-*/
-let strictlySortedLength: (array<'a>, ('a, 'a) => bool) => int
-
-let isSortedU: (array<'a>, (. 'a, 'a) => int) => bool
-/**
-`isSorted(arr, cmp)`: Returns true if array is increasingly sorted (equal is okay)
-*/
-let isSorted: (array<'a>, ('a, 'a) => int) => bool
-
-let stableSortInPlaceByU: (array<'a>, (. 'a, 'a) => int) => unit
-let stableSortInPlaceBy: (array<'a>, ('a, 'a) => int) => unit
-
-let stableSortByU: (array<'a>, (. 'a, 'a) => int) => array<'a>
-/**
-`stableSortBy(xs, cmp)`: Returns a fresh array Sort `xs` in place using
-comparator `cmp`, the stable means if the elements are equal, their order will
-be preserved
-*/
-let stableSortBy: (array<'a>, ('a, 'a) => int) => array<'a>
-
-let binarySearchByU: (array<'a>, 'a, (. 'a, 'a) => int) => int
-
-/**
-If value is not found and value is less than one or more elements in array, the
-negative number returned is the bitwise complement of the index of the first
-element that is larger than value.
-
-If value is not found and value is greater
-than all elements in array, the negative number returned is the bitwise
-complement of (the index of the last element plus 1)for example, if `key` is
-smaller than all elements return `-1` since `lnot(-1) == 0` if `key` is larger
-than all elements return `lnot(-1) == 0` since `lnot(- (len + 1)) == len`
-
-## Examples
-
-```rescript
-Belt.SortArray.binarySearchBy([1, 2, 3, 4, 33, 35, 36], 33, Pervasives.compare) == 4
-
-lnot(Belt.SortArray.binarySearchBy([1, 3, 5, 7], 4, Pervasives.compare)) == 2
-```
-*/
-let binarySearchBy: (array<'a>, 'a, ('a, 'a) => int) => int
-
-let unionU: (array<'a>, int, int, array<'a>, int, int, array<'a>, int, (. 'a, 'a) => int) => int
-/**
-`union src src1ofs src1len src2 src2ofs src2len dst dstofs cmp` assume `src` and
-`src2` is strictly sorted. for equivalent elements, it is picked from `src`
-also assume that `dst` is large enough to store all elements
-*/
-let union: (array<'a>, int, int, array<'a>, int, int, array<'a>, int, ('a, 'a) => int) => int
-
-let intersectU: (array<'a>, int, int, array<'a>, int, int, array<'a>, int, (. 'a, 'a) => int) => int
-/**
-`union src src1ofs src1len src2 src2ofs src2len dst dstofs cmp`
-
-**return** the `offset` in the output array
-*/
-let intersect: (array<'a>, int, int, array<'a>, int, int, array<'a>, int, ('a, 'a) => int) => int
-
-let diffU: (array<'a>, int, int, array<'a>, int, int, array<'a>, int, (. 'a, 'a) => int) => int
-let diff: (array<'a>, int, int, array<'a>, int, int, array<'a>, int, ('a, 'a) => int) => int
diff --git a/jscomp/others/belt_SortArrayInt.res b/jscomp/others/belt_SortArrayInt.res
deleted file mode 100644
index 40215df..0000000
--- a/jscomp/others/belt_SortArrayInt.res
+++ /dev/null
@@ -1,304 +0,0 @@
-type element = int
-
-module A = Belt_Array
-
-let rec sortedLengthAuxMore = (xs: array<element>, prec, acc, len) =>
-  if acc >= len {
-    acc
-  } else {
-    let v = A.getUnsafe(xs, acc)
-    if prec > v {
-      sortedLengthAuxMore(xs, v, acc + 1, len)
-    } else {
-      acc
-    }
-  }
-
-let rec sortedLengthAuxLess = (xs: array<element>, prec, acc, len) =>
-  if acc >= len {
-    acc
-  } else {
-    let v = A.getUnsafe(xs, acc)
-    if prec < v {
-      sortedLengthAuxLess(xs, v, acc + 1, len)
-    } else {
-      acc
-    }
-  }
-
-let strictlySortedLength = (xs: array<element>) => {
-  let len = A.length(xs)
-  switch len {
-  | 0 | 1 => len
-  | _ =>
-    let (x0, x1) = (A.getUnsafe(xs, 0), A.getUnsafe(xs, 1))
-
-    /* let c = cmp x0 x1 [@bs]  in */
-    if x0 < x1 {
-      sortedLengthAuxLess(xs, x1, 2, len)
-    } else if x0 > x1 {
-      -sortedLengthAuxMore(xs, x1, 2, len)
-    } else {
-      1
-    }
-  }
-}
-
-let rec isSortedAux = (a: array<element>, i, last_bound) =>
-  /* when `i = len - 1`, it reaches the last element */
-  if i == last_bound {
-    true
-  } else if A.getUnsafe(a, i) <= A.getUnsafe(a, i + 1) {
-    isSortedAux(a, i + 1, last_bound)
-  } else {
-    false
-  }
-
-let isSorted = a => {
-  let len = A.length(a)
-  if len == 0 {
-    true
-  } else {
-    isSortedAux(a, 0, len - 1)
-  }
-}
-
-let cutoff = 5
-
-let merge = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len and src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    if s1 <= s2 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d + 1)
-      } else {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d + 1, ~len=src2r - i2)
-      }
-    } else {
-      A.setUnsafe(dst, d, s2)
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d + 1)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d + 1, ~len=src1r - i1)
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let union = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    /* let c = cmp s1 s2 [@bs] in */
-    if s1 < s2 {
-      /* `s1` is larger than all elements in `d` */
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let d = d + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d, ~len=src2r - i2)
-        d + src2r - i2
-      }
-    } else if s1 == s2 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      let d = d + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else if i1 == src1r {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d, ~len=src2r - i2)
-        d + src2r - i2
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    } else {
-      A.setUnsafe(dst, d, s2)
-      let i2 = i2 + 1
-      let d = d + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let intersect = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    /* let c = cmp s1 s2 [@bs] in */
-    if s1 < s2 {
-      /* A.setUnsafe dst d s1; */
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        d
-      }
-    } else if s1 == s2 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      let d = d + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else {
-        d
-      }
-    } else {
-      /* A.setUnsafe dst d s2; */
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        d
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let diff = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    /* let c = cmp s1 s2 [@bs] in */
-    if s1 < s2 {
-      A.setUnsafe(dst, d, s1)
-      let d = d + 1
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        d
-      }
-    } else if s1 == s2 {
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else if i1 == src1r {
-        d
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    } else {
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let insertionSort = (src: array<element>, srcofs, dst, dstofs, len) =>
-  for i in 0 to len - 1 {
-    let e = A.getUnsafe(src, srcofs + i)
-    let j = ref(dstofs + i - 1)
-    while j.contents >= dstofs && A.getUnsafe(dst, j.contents) > e {
-      A.setUnsafe(dst, j.contents + 1, A.getUnsafe(dst, j.contents))
-      j.contents = j.contents - 1
-    }
-    A.setUnsafe(dst, j.contents + 1, e)
-  }
-
-let rec sortTo = (src: array<element>, srcofs, dst, dstofs, len) =>
-  if len <= cutoff {
-    insertionSort(src, srcofs, dst, dstofs, len)
-  } else {
-    let l1 = len / 2
-    let l2 = len - l1
-    sortTo(src, srcofs + l1, dst, dstofs + l1, l2)
-    sortTo(src, srcofs, src, srcofs + l2, l1)
-    merge(src, srcofs + l2, l1, dst, dstofs + l1, l2, dst, dstofs)
-  }
-
-let stableSortInPlace = (a: array<element>) => {
-  let l = A.length(a)
-  if l <= cutoff {
-    insertionSort(a, 0, a, 0, l)
-  } else {
-    let l1 = l / 2
-    let l2 = l - l1
-    let t = Belt_Array.makeUninitializedUnsafe(l2)
-    sortTo(a, l1, t, 0, l2)
-    sortTo(a, 0, a, l2, l1)
-    merge(a, l2, l1, t, 0, l2, a, 0)
-  }
-}
-
-let stableSort = a => {
-  let b = A.copy(a)
-  stableSortInPlace(b)
-  b
-}
-
-let rec binarySearchAux = (arr: array<element>, lo, hi, key) => {
-  let mid = (lo + hi) / 2
-  let midVal = A.getUnsafe(arr, mid)
-
-  /* let c = cmp key midVal [@bs] in */
-  if key == midVal {
-    mid
-  } else if key < midVal {
-    /* a[lo] =< key < a[mid] <= a[hi] */
-    if hi == mid {
-      if A.getUnsafe(arr, lo) == key {
-        lo
-      } else {
-        -(hi + 1)
-      }
-    } else {
-      binarySearchAux(arr, lo, mid, key)
-    }
-  } /* a[lo] =< a[mid] < key <= a[hi] */
-  else if lo == mid {
-    if A.getUnsafe(arr, hi) == key {
-      hi
-    } else {
-      -(hi + 1)
-    }
-  } else {
-    binarySearchAux(arr, mid, hi, key)
-  }
-}
-
-let binarySearch = (sorted: array<element>, key): int => {
-  let len = A.length(sorted)
-  if len == 0 {
-    -1
-  } else {
-    let lo = A.getUnsafe(sorted, 0)
-
-    /* let c = cmp key lo [@bs] in */
-    if key < lo {
-      -1
-    } else {
-      let hi = A.getUnsafe(sorted, len - 1)
-
-      /* let c2 = cmp key hi [@bs]in */
-      if key > hi {
-        -(len + 1)
-      } else {
-        binarySearchAux(sorted, 0, len - 1, key)
-      }
-    }
-  }
-}
diff --git a/jscomp/others/belt_SortArrayInt.resi b/jscomp/others/belt_SortArrayInt.resi
deleted file mode 100644
index ce1c48c..0000000
--- a/jscomp/others/belt_SortArrayInt.resi
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This is a specialized module for [`Belt_SortArray`](), the docs in that module also
-applies here, except the comparator is fixed and inlined
-*/
-
-type element = int
-
-/**
-The same as [`Belt_SortArray.strictlySortedLength`]() except the comparator is fixed
-
-**return** `+n` means increasing order  `-n` means negative order
-*/
-let strictlySortedLength: array<element> => int
-
-/** `sorted(xs)` return true if `xs` is in non strict increasing order */
-let isSorted: array<element> => bool
-
-/**
-The same as [`Belt_SortArray.stableSortInPlaceBy`]() except the comparator is fixed
-*/
-let stableSortInPlace: array<element> => unit
-
-/**
-The same as [`Belt_SortArray.stableSortBy`]() except the comparator is fixed
-*/
-let stableSort: array<element> => array<element>
-
-/**
-If value is not found and value is less than one or more elements in array,
-the negative number returned is the bitwise complement of the index of the first element
-that is larger than value.
-
-If value is not found and value is greater than all elements in array,
-the negative number returned is the bitwise complement of
-(the index of the last element plus 1)
-
-for example, if `key` is smaller than all elements return `-1` since `lnot (-1) = 0`
-if `key` is larger than all elements return `- (len + 1)` since `lnot (-(len+1)) = len`
-*/
-let binarySearch: (array<element>, element) => int
-
-/**
-`union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp)` assume
-`src` and `src2` is strictly sorted. for equivalent elements, it is picked from
-`src` also assume that `dst` is large enough to store all elements
-*/
-let union: (array<element>, int, int, array<element>, int, int, array<element>, int) => int
-
-let intersect: (array<element>, int, int, array<element>, int, int, array<element>, int) => int
-
-let diff: (array<element>, int, int, array<element>, int, int, array<element>, int) => int
diff --git a/jscomp/others/belt_SortArrayString.res b/jscomp/others/belt_SortArrayString.res
deleted file mode 100644
index 08f55e1..0000000
--- a/jscomp/others/belt_SortArrayString.res
+++ /dev/null
@@ -1,304 +0,0 @@
-type element = string
-
-module A = Belt_Array
-
-let rec sortedLengthAuxMore = (xs: array<element>, prec, acc, len) =>
-  if acc >= len {
-    acc
-  } else {
-    let v = A.getUnsafe(xs, acc)
-    if prec > v {
-      sortedLengthAuxMore(xs, v, acc + 1, len)
-    } else {
-      acc
-    }
-  }
-
-let rec sortedLengthAuxLess = (xs: array<element>, prec, acc, len) =>
-  if acc >= len {
-    acc
-  } else {
-    let v = A.getUnsafe(xs, acc)
-    if prec < v {
-      sortedLengthAuxLess(xs, v, acc + 1, len)
-    } else {
-      acc
-    }
-  }
-
-let strictlySortedLength = (xs: array<element>) => {
-  let len = A.length(xs)
-  switch len {
-  | 0 | 1 => len
-  | _ =>
-    let (x0, x1) = (A.getUnsafe(xs, 0), A.getUnsafe(xs, 1))
-
-    /* let c = cmp x0 x1 [@bs]  in */
-    if x0 < x1 {
-      sortedLengthAuxLess(xs, x1, 2, len)
-    } else if x0 > x1 {
-      -sortedLengthAuxMore(xs, x1, 2, len)
-    } else {
-      1
-    }
-  }
-}
-
-let rec isSortedAux = (a: array<element>, i, last_bound) =>
-  /* when `i = len - 1`, it reaches the last element */
-  if i == last_bound {
-    true
-  } else if A.getUnsafe(a, i) <= A.getUnsafe(a, i + 1) {
-    isSortedAux(a, i + 1, last_bound)
-  } else {
-    false
-  }
-
-let isSorted = a => {
-  let len = A.length(a)
-  if len == 0 {
-    true
-  } else {
-    isSortedAux(a, 0, len - 1)
-  }
-}
-
-let cutoff = 5
-
-let merge = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len and src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    if s1 <= s2 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d + 1)
-      } else {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d + 1, ~len=src2r - i2)
-      }
-    } else {
-      A.setUnsafe(dst, d, s2)
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d + 1)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d + 1, ~len=src1r - i1)
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let union = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    /* let c = cmp s1 s2 [@bs] in */
-    if s1 < s2 {
-      /* `s1` is larger than all elements in `d` */
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let d = d + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d, ~len=src2r - i2)
-        d + src2r - i2
-      }
-    } else if s1 == s2 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      let d = d + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else if i1 == src1r {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d, ~len=src2r - i2)
-        d + src2r - i2
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    } else {
-      A.setUnsafe(dst, d, s2)
-      let i2 = i2 + 1
-      let d = d + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let intersect = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    /* let c = cmp s1 s2 [@bs] in */
-    if s1 < s2 {
-      /* A.setUnsafe dst d s1; */
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        d
-      }
-    } else if s1 == s2 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      let d = d + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else {
-        d
-      }
-    } else {
-      /* A.setUnsafe dst d s2; */
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        d
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let diff = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    /* let c = cmp s1 s2 [@bs] in */
-    if s1 < s2 {
-      A.setUnsafe(dst, d, s1)
-      let d = d + 1
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        d
-      }
-    } else if s1 == s2 {
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else if i1 == src1r {
-        d
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    } else {
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let insertionSort = (src: array<element>, srcofs, dst, dstofs, len) =>
-  for i in 0 to len - 1 {
-    let e = A.getUnsafe(src, srcofs + i)
-    let j = ref(dstofs + i - 1)
-    while j.contents >= dstofs && A.getUnsafe(dst, j.contents) > e {
-      A.setUnsafe(dst, j.contents + 1, A.getUnsafe(dst, j.contents))
-      j.contents = j.contents - 1
-    }
-    A.setUnsafe(dst, j.contents + 1, e)
-  }
-
-let rec sortTo = (src: array<element>, srcofs, dst, dstofs, len) =>
-  if len <= cutoff {
-    insertionSort(src, srcofs, dst, dstofs, len)
-  } else {
-    let l1 = len / 2
-    let l2 = len - l1
-    sortTo(src, srcofs + l1, dst, dstofs + l1, l2)
-    sortTo(src, srcofs, src, srcofs + l2, l1)
-    merge(src, srcofs + l2, l1, dst, dstofs + l1, l2, dst, dstofs)
-  }
-
-let stableSortInPlace = (a: array<element>) => {
-  let l = A.length(a)
-  if l <= cutoff {
-    insertionSort(a, 0, a, 0, l)
-  } else {
-    let l1 = l / 2
-    let l2 = l - l1
-    let t = Belt_Array.makeUninitializedUnsafe(l2)
-    sortTo(a, l1, t, 0, l2)
-    sortTo(a, 0, a, l2, l1)
-    merge(a, l2, l1, t, 0, l2, a, 0)
-  }
-}
-
-let stableSort = a => {
-  let b = A.copy(a)
-  stableSortInPlace(b)
-  b
-}
-
-let rec binarySearchAux = (arr: array<element>, lo, hi, key) => {
-  let mid = (lo + hi) / 2
-  let midVal = A.getUnsafe(arr, mid)
-
-  /* let c = cmp key midVal [@bs] in */
-  if key == midVal {
-    mid
-  } else if key < midVal {
-    /* a[lo] =< key < a[mid] <= a[hi] */
-    if hi == mid {
-      if A.getUnsafe(arr, lo) == key {
-        lo
-      } else {
-        -(hi + 1)
-      }
-    } else {
-      binarySearchAux(arr, lo, mid, key)
-    }
-  } /* a[lo] =< a[mid] < key <= a[hi] */
-  else if lo == mid {
-    if A.getUnsafe(arr, hi) == key {
-      hi
-    } else {
-      -(hi + 1)
-    }
-  } else {
-    binarySearchAux(arr, mid, hi, key)
-  }
-}
-
-let binarySearch = (sorted: array<element>, key): int => {
-  let len = A.length(sorted)
-  if len == 0 {
-    -1
-  } else {
-    let lo = A.getUnsafe(sorted, 0)
-
-    /* let c = cmp key lo [@bs] in */
-    if key < lo {
-      -1
-    } else {
-      let hi = A.getUnsafe(sorted, len - 1)
-
-      /* let c2 = cmp key hi [@bs]in */
-      if key > hi {
-        -(len + 1)
-      } else {
-        binarySearchAux(sorted, 0, len - 1, key)
-      }
-    }
-  }
-}
diff --git a/jscomp/others/belt_SortArrayString.resi b/jscomp/others/belt_SortArrayString.resi
deleted file mode 100644
index 3742ce2..0000000
--- a/jscomp/others/belt_SortArrayString.resi
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This is a specialized module for [`Belt_SortArray`](), the docs in that module also
-applies here, except the comparator is fixed and inlined
-*/
-
-type element = string
-
-/**
-The same as [`Belt_SortArray.strictlySortedLength`]() except the comparator is fixed
-
-**return** `+n` means increasing order  `-n` means negative order
-*/
-let strictlySortedLength: array<element> => int
-
-/** `sorted(xs)` return true if `xs` is in non strict increasing order */
-let isSorted: array<element> => bool
-
-/**
-The same as [`Belt_SortArray.stableSortInPlaceBy`]() except the comparator is fixed
-*/
-let stableSortInPlace: array<element> => unit
-
-/**
-The same as [`Belt_SortArray.stableSortBy`]() except the comparator is fixed
-*/
-let stableSort: array<element> => array<element>
-
-/**
-If value is not found and value is less than one or more elements in array,
-the negative number returned is the bitwise complement of the index of the first element
-that is larger than value.
-
-If value is not found and value is greater than all elements in array,
-the negative number returned is the bitwise complement of
-(the index of the last element plus 1)
-
-for example, if `key` is smaller than all elements return `-1` since `lnot (-1) = 0`
-if `key` is larger than all elements return `- (len + 1)` since `lnot (-(len+1)) = len`
-*/
-let binarySearch: (array<element>, element) => int
-
-/**
-`union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp)` assume
-`src` and `src2` is strictly sorted. for equivalent elements, it is picked from
-`src` also assume that `dst` is large enough to store all elements
-*/
-let union: (array<element>, int, int, array<element>, int, int, array<element>, int) => int
-
-let intersect: (array<element>, int, int, array<element>, int, int, array<element>, int) => int
-
-let diff: (array<element>, int, int, array<element>, int, int, array<element>, int) => int
diff --git a/jscomp/others/belt_internalAVLset.res b/jscomp/others/belt_internalAVLset.res
deleted file mode 100644
index 1fedc4f..0000000
--- a/jscomp/others/belt_internalAVLset.res
+++ /dev/null
@@ -1,765 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-@@bs.config({flags: ["-bs-noassertfalse"]})
-type rec node<'value> = {
-  @as("v") mutable value: 'value,
-  @as("h") mutable height: int,
-  @as("l") mutable left: t<'value>,
-  @as("r") mutable right: t<'value>,
-}
-and t<'value> = option<node<'value>>
-
-module A = Belt_Array
-module S = Belt_SortArray
-
-type cmp<'a, 'b> = Belt_Id.cmp<'a, 'b>
-
-/* Sets are represented by balanced binary trees (the heights of the
- children differ by at most 2 */
-
-@inline
-let height = (n: t<_>) =>
-  switch n {
-  | None => 0
-  | Some(n) => n.height
-  }
-
-let rec copy = n =>
-  switch n {
-  | None => n
-  | Some(n) =>
-    Some({
-      left: copy(n.left),
-      right: copy(n.right),
-      value: n.value,
-      height: n.height,
-    })
-  }
-
-/* Creates a new node with leftGet son l, value v and right son r.
-   We must have all elements of l < v < all elements of r.
-   l and r must be balanced and | treeHeight l - treeHeight r | <= 2.
-   Inline expansion of treeHeight for better speed. */
-
-@inline
-let calcHeight = (hl: int, hr) =>
-  if hl >= hr {
-    hl
-  } else {
-    hr
-  } + 1
-
-let create = (l: t<_>, v, r: t<_>) => {
-  let hl = height(l)
-  let hr = height(r)
-  Some({left: l, value: v, right: r, height: calcHeight(hl, hr)})
-}
-
-let singleton = x => Some({left: None, value: x, right: None, height: 1})
-
-let heightGe = (l, r) =>
-  switch (l, r) {
-  | (_, None) => true
-  | (Some(hl), Some(hr)) => hl.height >= hr.height
-  | (None, Some(_)) => false
-  }
-/* Same as create, but performs one step of rebalancing if necessary.
-   Assumes l and r balanced and | treeHeight l - treeHeight r | <= 3.
-   Inline expansion of create for better speed in the most frequent case
-   where no rebalancing is required. */
-/* TODO: inline all `create` operation, save duplicated `heightGet` calcuation */
-let bal = (l, v, r) => {
-  let (hl, hr) = (height(l), height(r))
-  if hl > hr + 2 {
-    switch l {
-    | None => assert(false)
-    | Some({left: ll, right: lr} as l) =>
-      if heightGe(ll, lr) {
-        create(ll, l.value, create(lr, v, r))
-      } else {
-        switch lr {
-        | None => assert(false)
-        | Some(lr) => create(create(ll, l.value, lr.left), lr.value, create(lr.right, v, r))
-        }
-      }
-    }
-  } else if hr > hl + 2 {
-    switch r {
-    | None => assert(false)
-    | Some({left: rl, right: rr} as r) =>
-      if heightGe(rr, rl) {
-        create(create(l, v, rl), r.value, rr)
-      } else {
-        switch rl {
-        | None => assert(false)
-        | Some(rl) => create(create(l, v, rl.left), rl.value, create(rl.right, r.value, rr))
-        }
-      }
-    }
-  } else {
-    Some({left: l, value: v, right: r, height: calcHeight(hl, hr)})
-  }
-}
-
-let rec min0Aux = n =>
-  switch n.left {
-  | None => n.value
-  | Some(n) => min0Aux(n)
-  }
-
-let minimum = n =>
-  switch n {
-  | None => None
-  | Some(n) => Some(min0Aux(n))
-  }
-
-let minUndefined = n =>
-  switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(min0Aux(n))
-  }
-
-let rec max0Aux = n =>
-  switch n.right {
-  | None => n.value
-  | Some(n) => max0Aux(n)
-  }
-
-let maximum = n =>
-  switch n {
-  | None => None
-  | Some(n) => Some(max0Aux(n))
-  }
-
-let maxUndefined = n =>
-  switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(max0Aux(n))
-  }
-
-let rec removeMinAuxWithRef = (n, v) =>
-  switch n.left {
-  | None =>
-    v.contents = n.value
-    n.right
-  | Some(ln) => bal(removeMinAuxWithRef(ln, v), n.value, n.right)
-  }
-
-/* Implementation of the set operations */
-
-let isEmpty = n =>
-  switch n {
-  | Some(_) => false
-  | None => true
-  }
-
-let rec stackAllLeft = (v, s) =>
-  switch v {
-  | None => s
-  | Some(x) => stackAllLeft(x.left, list{x, ...s})
-  }
-
-let rec forEachU = (n, f) =>
-  switch n {
-  | None => ()
-  | Some(n) =>
-    forEachU(n.left, f)
-    f(. n.value)
-    forEachU(n.right, f)
-  }
-
-let forEach = (n, f) => forEachU(n, (. a) => f(a))
-
-let rec reduceU = (s, accu, f) =>
-  switch s {
-  | None => accu
-  | Some(n) => reduceU(n.right, f(. reduceU(n.left, accu, f), n.value), f)
-  }
-
-let reduce = (s, accu, f) => reduceU(s, accu, (. a, b) => f(a, b))
-
-let rec everyU = (n, p) =>
-  switch n {
-  | None => true
-  | Some(n) => p(. n.value) && (n.left->everyU(p) && n.right->everyU(p))
-  }
-
-let every = (n, p) => everyU(n, (. a) => p(a))
-
-let rec someU = (n, p) =>
-  switch n {
-  | None => false
-  | Some(n) => p(. n.value) || (someU(n.left, p) || someU(n.right, p))
-  }
-
-let some = (n, p) => someU(n, (. a) => p(a))
-/* `addMinElement v n` and `addMaxElement v n`
-   assume that the added v is *strictly*
-   smaller (or bigger) than all the present elements in the tree.
-   They are only used during the "join" operation which
-   respects this precondition.
-*/
-
-let rec addMinElement = (n, v) =>
-  switch n {
-  | None => singleton(v)
-  | Some(n) => bal(addMinElement(n.left, v), n.value, n.right)
-  }
-
-let rec addMaxElement = (n, v) =>
-  switch n {
-  | None => singleton(v)
-  | Some(n) => bal(n.left, n.value, addMaxElement(n.right, v))
-  }
-
-/* `join ln v rn` Some a balanced tree simliar to `create ln v rn`
-   bal, but no assumptions are made on the
-   relative heights of `ln` and `rn`. */
-
-let rec joinShared = (ln, v, rn) =>
-  switch (ln, rn) {
-  | (None, _) => addMinElement(rn, v)
-  | (_, None) => addMaxElement(ln, v)
-  | (Some(l), Some(r)) =>
-    let lh = l.height
-    let rh = r.height
-    if lh > rh + 2 {
-      bal(l.left, l.value, joinShared(l.right, v, rn))
-    } else if rh > lh + 2 {
-      bal(joinShared(ln, v, r.left), r.value, r.right)
-    } else {
-      create(ln, v, rn)
-    }
-  }
-
-/* `concat l r`
- No assumption on the heights of l and r. */
-
-let concatShared = (t1, t2) =>
-  switch (t1, t2) {
-  | (None, _) => t2
-  | (_, None) => t1
-  | (_, Some(t2n)) =>
-    let v = ref(t2n.value)
-    let t2r = removeMinAuxWithRef(t2n, v)
-    joinShared(t1, v.contents, t2r)
-  }
-
-let rec partitionSharedU = (n, p) =>
-  switch n {
-  | None => (None, None)
-  | Some(n) =>
-    let value = n.value
-    let (lt, lf) = partitionSharedU(n.left, p)
-    let pv = p(. value)
-    let (rt, rf) = partitionSharedU(n.right, p)
-    if pv {
-      (joinShared(lt, value, rt), concatShared(lf, rf))
-    } else {
-      (concatShared(lt, rt), joinShared(lf, value, rf))
-    }
-  }
-
-let partitionShared = (n, p) => partitionSharedU(n, (. a) => p(a))
-
-let rec lengthNode = n => {
-  let {left: l, right: r} = n
-  let sizeL = switch l {
-  | None => 0
-  | Some(l) => lengthNode(l)
-  }
-  let sizeR = switch r {
-  | None => 0
-  | Some(r) => lengthNode(r)
-  }
-  1 + sizeL + sizeR
-}
-
-let size = n =>
-  switch n {
-  | None => 0
-  | Some(n) => lengthNode(n)
-  }
-
-let rec toListAux = (n, accu) =>
-  switch n {
-  | None => accu
-  | Some(n) => toListAux(n.left, list{n.value, ...toListAux(n.right, accu)})
-  }
-
-let toList = s => toListAux(s, list{})
-
-let rec checkInvariantInternal = (v: t<_>) =>
-  switch v {
-  | None => ()
-  | Some(n) =>
-    let {left: l, right: r} = n
-    let diff = height(l) - height(r)
-    assert(diff <= 2 && diff >= -2)
-    checkInvariantInternal(l)
-    checkInvariantInternal(r)
-  }
-
-let rec fillArray = (n, i, arr) => {
-  let {left: l, value: v, right: r} = n
-  let next = switch l {
-  | None => i
-  | Some(l) => fillArray(l, i, arr)
-  }
-  A.setUnsafe(arr, next, v)
-  let rnext = next + 1
-  switch r {
-  | None => rnext
-  | Some(r) => fillArray(r, rnext, arr)
-  }
-}
-
-type cursor = {mutable forward: int, mutable backward: int}
-
-let rec fillArrayWithPartition = (n, cursor, arr, p) => {
-  let {left: l, value: v, right: r} = n
-  switch l {
-  | None => ()
-  | Some(l) => fillArrayWithPartition(l, cursor, arr, p)
-  }
-  if p(. v) {
-    let c = cursor.forward
-    A.setUnsafe(arr, c, v)
-    cursor.forward = c + 1
-  } else {
-    let c = cursor.backward
-    A.setUnsafe(arr, c, v)
-    cursor.backward = c - 1
-  }
-  switch r {
-  | None => ()
-  | Some(r) => fillArrayWithPartition(r, cursor, arr, p)
-  }
-}
-
-let rec fillArrayWithFilter = (n, i, arr, p) => {
-  let {left: l, value: v, right: r} = n
-  let next = switch l {
-  | None => i
-  | Some(l) => fillArrayWithFilter(l, i, arr, p)
-  }
-  let rnext = if p(. v) {
-    A.setUnsafe(arr, next, v)
-    next + 1
-  } else {
-    next
-  }
-  switch r {
-  | None => rnext
-  | Some(r) => fillArrayWithFilter(r, rnext, arr, p)
-  }
-}
-
-let toArray = n =>
-  switch n {
-  | None => []
-  | Some(n) =>
-    let size = lengthNode(n)
-    let v = A.makeUninitializedUnsafe(size)
-    ignore((fillArray(n, 0, v): int)) /* may add assertion */
-    v
-  }
-
-let rec fromSortedArrayRevAux = (arr, off, len) =>
-  switch len {
-  | 0 => None
-  | 1 => singleton(A.getUnsafe(arr, off))
-  | 2 =>
-    let (x0, x1) = {
-      open A
-      (getUnsafe(arr, off), getUnsafe(arr, off - 1))
-    }
-
-    Some({left: singleton(x0), value: x1, height: 2, right: None})
-  | 3 =>
-    let (x0, x1, x2) = {
-      open A
-      (getUnsafe(arr, off), getUnsafe(arr, off - 1), getUnsafe(arr, off - 2))
-    }
-    Some({
-      left: singleton(x0),
-      right: singleton(x2),
-      value: x1,
-      height: 2,
-    })
-  | _ =>
-    let nl = len / 2
-    let left = fromSortedArrayRevAux(arr, off, nl)
-    let mid = A.getUnsafe(arr, off - nl)
-    let right = fromSortedArrayRevAux(arr, off - nl - 1, len - nl - 1)
-    create(left, mid, right)
-  }
-
-let rec fromSortedArrayAux = (arr, off, len) =>
-  switch len {
-  | 0 => None
-  | 1 => singleton(A.getUnsafe(arr, off))
-  | 2 =>
-    let (x0, x1) = {
-      open A
-      (getUnsafe(arr, off), getUnsafe(arr, off + 1))
-    }
-
-    Some({left: singleton(x0), value: x1, height: 2, right: None})
-  | 3 =>
-    let (x0, x1, x2) = {
-      open A
-      (getUnsafe(arr, off), getUnsafe(arr, off + 1), getUnsafe(arr, off + 2))
-    }
-    Some({
-      left: singleton(x0),
-      right: singleton(x2),
-      value: x1,
-      height: 2,
-    })
-  | _ =>
-    let nl = len / 2
-    let left = fromSortedArrayAux(arr, off, nl)
-    let mid = A.getUnsafe(arr, off + nl)
-    let right = fromSortedArrayAux(arr, off + nl + 1, len - nl - 1)
-    create(left, mid, right)
-  }
-
-let fromSortedArrayUnsafe = arr => fromSortedArrayAux(arr, 0, A.length(arr))
-
-let rec keepSharedU = (n, p) =>
-  switch n {
-  | None => None
-  | Some(n) =>
-    let {left: l, value: v, right: r} = n
-    let newL = keepSharedU(l, p)
-    let pv = p(. v)
-    let newR = keepSharedU(r, p)
-    if pv {
-      if l === newL && r === newR {
-        Some(n)
-      } else {
-        joinShared(newL, v, newR)
-      }
-    } else {
-      concatShared(newL, newR)
-    }
-  }
-
-let keepShared = (n, p) => keepSharedU(n, (. a) => p(a))
-/* ATT: functional methods in general can be shared with
-    imperative methods, however, it does not apply when functional
-    methods makes use of referential equality
-*/
-
-let keepCopyU = (n, p): t<_> =>
-  switch n {
-  | None => None
-  | Some(n) =>
-    let size = lengthNode(n)
-    let v = A.makeUninitializedUnsafe(size)
-    let last = fillArrayWithFilter(n, 0, v, p)
-    fromSortedArrayAux(v, 0, last)
-  }
-
-let keepCopy = (n, p) => keepCopyU(n, (. x) => p(x))
-
-let partitionCopyU = (n, p) =>
-  switch n {
-  | None => (None, None)
-  | Some(n) =>
-    let size = lengthNode(n)
-    let v = A.makeUninitializedUnsafe(size)
-    let backward = size - 1
-    let cursor = {forward: 0, backward}
-    fillArrayWithPartition(n, cursor, v, p)
-    let forwardLen = cursor.forward
-    (fromSortedArrayAux(v, 0, forwardLen), fromSortedArrayRevAux(v, backward, size - forwardLen))
-  }
-
-let partitionCopy = (n, p) => partitionCopyU(n, (. a) => p(a))
-
-let rec has = (t: t<_>, x, ~cmp) =>
-  switch t {
-  | None => false
-  | Some(n) =>
-    let v = n.value
-    let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-    c == 0 ||
-      has(
-        ~cmp,
-        if c < 0 {
-          n.left
-        } else {
-          n.right
-        },
-        x,
-      )
-  }
-
-let rec compareAux = (e1, e2, ~cmp) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    let c = Belt_Id.getCmpInternal(cmp)(. h1.value, h2.value)
-    if c == 0 {
-      compareAux(~cmp, h1.right->stackAllLeft(t1), h2.right->stackAllLeft(t2))
-    } else {
-      c
-    }
-  | (_, _) => 0
-  }
-
-let cmp = (s1, s2, ~cmp) => {
-  let (len1, len2) = (size(s1), size(s2))
-  if len1 == len2 {
-    compareAux(~cmp, stackAllLeft(s1, list{}), stackAllLeft(s2, list{}))
-  } else if len1 < len2 {
-    -1
-  } else {
-    1
-  }
-}
-
-let eq = (s1, s2, ~cmp as c) => cmp(~cmp=c, s1, s2) == 0
-
-let rec subset = (s1: t<_>, s2: t<_>, ~cmp) =>
-  switch (s1, s2) {
-  | (None, _) => true
-  | (_, None) => false
-  | (Some(t1), Some(t2)) =>
-    let {left: l1, value: v1, right: r1} = t1
-    let {left: l2, value: v2, right: r2} = t2
-    let c = Belt_Id.getCmpInternal(cmp)(. v1, v2)
-    if c == 0 {
-      subset(~cmp, l1, l2) && subset(~cmp, r1, r2)
-    } else if c < 0 {
-      subset(~cmp, create(l1, v1, None), l2) && subset(~cmp, r1, s2)
-    } else {
-      subset(~cmp, create(None, v1, r1), r2) && subset(~cmp, l1, s2)
-    }
-  }
-
-let rec get = (n: t<_>, x, ~cmp) =>
-  switch n {
-  | None => None
-  | Some(t) /* Node(l, v, r, _) */ =>
-    let v = t.value
-    let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-    if c == 0 {
-      Some(v)
-    } else {
-      get(
-        ~cmp,
-        if c < 0 {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getUndefined = (n: t<_>, x, ~cmp) =>
-  switch n {
-  | None => Js.Undefined.empty
-  | Some(t) /* Node(l, v, r, _) */ =>
-    let v = t.value
-    let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-    if c == 0 {
-      Js.Undefined.return(v)
-    } else {
-      getUndefined(
-        ~cmp,
-        if c < 0 {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getExn = (n: t<_>, x, ~cmp) =>
-  switch n {
-  | None => raise(Not_found)
-  | Some(t) /* Node(l, v, r, _) */ =>
-    let v = t.value
-    let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-    if c == 0 {
-      v
-    } else {
-      getExn(
-        ~cmp,
-        if c < 0 {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-/* **************************************************************** */
-
-/*
-  L rotation, Some root node
-*/
-let rotateWithLeftChild = k2 =>
-  switch k2.left {
-  | None => assert(false)
-  | Some(k1) =>
-    k2.left = k1.right
-    k1.right = Some(k2)
-    let (hlk2, hrk2) = (k2.left->height, k2.right->height)
-    k2.height = Pervasives.max(hlk2, hrk2) + 1
-    let (hlk1, hk2) = (k1.left->height, k2.height)
-    k1.height = Pervasives.max(hlk1, hk2) + 1
-    k1
-  }
-/* right rotation */
-let rotateWithRightChild = k1 =>
-  switch k1.right {
-  | None => assert(false)
-  | Some(k2) =>
-    k1.right = k2.left
-    k2.left = Some(k1)
-    let (hlk1, hrk1) = (k1.left->height, k1.right->height)
-    k1.height = Pervasives.max(hlk1, hrk1) + 1
-    let (hrk2, hk1) = (k2.right->height, k1.height)
-    k2.height = Pervasives.max(hrk2, hk1) + 1
-    k2
-  }
-
-/*
-  double l rotation
-*/
-/** */
-let doubleWithLeftChild = k3 =>
-  switch k3.left {
-  | None => assert(false)
-  | Some(k3l) =>
-    let v = k3l->rotateWithRightChild->Some
-    k3.left = v
-    k3->rotateWithLeftChild
-  }
-
-let doubleWithRightChild = k2 =>
-  switch k2.right {
-  | None => assert(false)
-  | Some(k2r) =>
-    let v = k2r->rotateWithLeftChild->Some
-    k2.right = v
-    rotateWithRightChild(k2)
-  }
-
-let heightUpdateMutate = t => {
-  let (hlt, hrt) = (t.left->height, t.right->height)
-  t.height = Pervasives.max(hlt, hrt) + 1
-  t
-}
-
-let balMutate = nt => {
-  let {left: l, right: r} = nt
-  let (hl, hr) = (height(l), height(r))
-  if hl > 2 + hr {
-    switch l {
-    | None => assert(false)
-    | Some({left: ll, right: lr}) =>
-      if heightGe(ll, lr) {
-        heightUpdateMutate(rotateWithLeftChild(nt))
-      } else {
-        heightUpdateMutate(doubleWithLeftChild(nt))
-      }
-    }
-  } else if hr > 2 + hl {
-    switch r {
-    | None => assert(false)
-    | Some({left: rl, right: rr}) =>
-      if heightGe(rr, rl) {
-        heightUpdateMutate(rotateWithRightChild(nt))
-      } else {
-        heightUpdateMutate(doubleWithRightChild(nt))
-      }
-    }
-  } else {
-    nt.height = Pervasives.max(hl, hr) + 1
-    nt
-  }
-}
-
-let rec addMutate = (~cmp, t: t<_>, x) =>
-  switch t {
-  | None => singleton(x)
-  | Some(nt) =>
-    let k = nt.value
-    let c = Belt_Id.getCmpInternal(cmp)(. x, k)
-    if c == 0 {
-      t
-    } else {
-      let {left: l, right: r} = nt
-      if c < 0 {
-        let ll = addMutate(~cmp, l, x)
-        nt.left = ll
-      } else {
-        nt.right = addMutate(~cmp, r, x)
-      }
-      Some(balMutate(nt))
-    }
-  }
-
-let fromArray = (xs: array<_>, ~cmp) => {
-  let len = A.length(xs)
-  if len == 0 {
-    None
-  } else {
-    let next = ref(S.strictlySortedLengthU(xs, (. x, y) => Belt_Id.getCmpInternal(cmp)(. x, y) < 0))
-    let result = ref(
-      if next.contents >= 0 {
-        fromSortedArrayAux(xs, 0, next.contents)
-      } else {
-        next.contents = -next.contents
-        fromSortedArrayRevAux(xs, next.contents - 1, next.contents)
-      },
-    )
-    for i in next.contents to len - 1 {
-      result.contents = addMutate(~cmp, result.contents, A.getUnsafe(xs, i))
-    }
-    result.contents
-  }
-}
-
-let rec removeMinAuxWithRootMutate = (nt, n) => {
-  let {right: rn, left: ln} = n
-  switch ln {
-  | None =>
-    nt.value = n.value
-    rn
-  | Some(ln) =>
-    n.left = removeMinAuxWithRootMutate(nt, ln)
-    Some(balMutate(n))
-  }
-}
diff --git a/jscomp/others/belt_internalAVLset.resi b/jscomp/others/belt_internalAVLset.resi
deleted file mode 100644
index 0f7ccf5..0000000
--- a/jscomp/others/belt_internalAVLset.resi
+++ /dev/null
@@ -1,116 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*
-This internal module contains methods which does not rely on ordering.
-Such methods could be shared between `generic set/specalized set` whether mutable
-or immutable depends on use cases
-*/
-type rec t<'value> = option<node<'value>>
-and node<'value> = {
-  @as("v") mutable value: 'value,
-  @as("h") mutable height: int,
-  @as("l") mutable left: t<'value>,
-  @as("r") mutable right: t<'value>,
-}
-
-type cmp<'a, 'b> = Belt_Id.cmp<'a, 'b>
-
-let copy: t<'a> => t<'a>
-let create: (t<'a>, 'a, t<'a>) => t<'a>
-let bal: (t<'a>, 'a, t<'a>) => t<'a>
-let singleton: 'a => t<'a>
-
-let minimum: t<'a> => option<'a>
-let minUndefined: t<'a> => Js.undefined<'a>
-let maximum: t<'a> => option<'a>
-let maxUndefined: t<'a> => Js.undefined<'a>
-
-let removeMinAuxWithRef: (node<'a>, ref<'a>) => t<'a>
-/* `removeMinAuxWithRef n cell` return a new node with
- minimum removed and stored in cell */
-
-let isEmpty: t<'a> => bool
-
-let stackAllLeft: (t<'a>, list<node<'a>>) => list<node<'a>>
-
-let forEachU: (t<'a>, (. 'a) => unit) => unit
-let forEach: (t<'a>, 'a => unit) => unit
-
-let reduceU: (t<'a>, 'b, (. 'b, 'a) => 'b) => 'b
-let reduce: (t<'a>, 'b, ('b, 'a) => 'b) => 'b
-
-let everyU: (t<'a>, (. 'a) => bool) => bool
-let every: (t<'a>, 'a => bool) => bool
-
-let someU: (t<'a>, (. 'a) => bool) => bool
-let some: (t<'a>, 'a => bool) => bool
-
-let joinShared: (t<'a>, 'a, t<'a>) => t<'a>
-let concatShared: (t<'a>, t<'a>) => t<'a>
-
-let keepSharedU: (t<'a>, (. 'a) => bool) => t<'a>
-let keepShared: (t<'a>, 'a => bool) => t<'a>
-
-let keepCopyU: (t<'a>, (. 'a) => bool) => t<'a>
-let keepCopy: (t<'a>, 'a => bool) => t<'a>
-
-let partitionSharedU: (t<'a>, (. 'a) => bool) => (t<'a>, t<'a>)
-let partitionShared: (t<'a>, 'a => bool) => (t<'a>, t<'a>)
-
-let partitionCopyU: (t<'a>, (. 'a) => bool) => (t<'a>, t<'a>)
-let partitionCopy: (t<'a>, 'a => bool) => (t<'a>, t<'a>)
-
-let lengthNode: node<'a> => int
-let size: t<'a> => int
-
-let toList: t<'a> => list<'a>
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
-
-let fillArray: (node<'a>, int, array<'a>) => int
-let toArray: t<'a> => array<'a>
-let fromSortedArrayAux: (array<'a>, int, int) => t<'a>
-let fromSortedArrayRevAux: (array<'a>, int, int) => t<'a>
-let fromSortedArrayUnsafe: array<'a> => t<'a>
-let has: (t<'a>, 'a, ~cmp: cmp<'a, 'b>) => bool
-let cmp: (t<'a>, t<'a>, ~cmp: cmp<'a, 'b>) => int
-let eq: (t<'a>, t<'a>, ~cmp: cmp<'a, 'b>) => bool
-let subset: (t<'a>, t<'a>, ~cmp: cmp<'a, 'b>) => bool
-let get: (t<'a>, 'a, ~cmp: cmp<'a, 'b>) => option<'a>
-let getUndefined: (t<'a>, 'a, ~cmp: cmp<'a, 'b>) => Js.undefined<'a>
-let getExn: (t<'a>, 'a, ~cmp: cmp<'a, 'b>) => 'a
-
-let fromArray: (array<'a>, ~cmp: cmp<'a, 'b>) => t<'a>
-
-let addMutate: (~cmp: cmp<'a, 'b>, t<'a>, 'a) => t<'a>
-let balMutate: node<'a> => node<'a>
-/**
-`removeMinAuxWithRootMutate(root, n)` remove the minimum of n in place and store
-its value in the `key root`
-*/
-let removeMinAuxWithRootMutate: (node<'a>, node<'a>) => t<'a>
diff --git a/jscomp/others/belt_internalAVLtree.res b/jscomp/others/belt_internalAVLtree.res
deleted file mode 100644
index ff557ba..0000000
--- a/jscomp/others/belt_internalAVLtree.res
+++ /dev/null
@@ -1,945 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-/* Almost rewritten  by authors of ReScript */
-
-@@bs.config({flags: ["-bs-noassertfalse"]})
-type rec node<'k, 'v> = {
-  @as("k") mutable key: 'k,
-  @as("v") mutable value: 'v,
-  @as("h") mutable height: int,
-  @as("l") mutable left: t<'k, 'v>,
-  @as("r") mutable right: t<'k, 'v>,
-}
-and t<'key, 'a> = option<node<'key, 'a>>
-
-type cmp<'k, 'id> = Belt_Id.cmp<'k, 'id>
-
-module A = Belt_Array
-module S = Belt_SortArray
-
-let treeHeight = (n: t<_>) =>
-  switch n {
-  | None => 0
-  | Some(n) => n.height
-  }
-
-let rec copy = n =>
-  switch n {
-  | None => n
-  | Some(n) => Some({...n, left: copy(n.left), right: copy(n.right)})
-  }
-
-let create = (l, x, d, r) => {
-  let (hl, hr) = (treeHeight(l), treeHeight(r))
-  Some({
-    left: l,
-    key: x,
-    value: d,
-    right: r,
-    height: if hl >= hr {
-      hl + 1
-    } else {
-      hr + 1
-    },
-  })
-}
-
-let singleton = (x, d) => Some({left: None, key: x, value: d, right: None, height: 1})
-
-let heightGe = (l, r) =>
-  switch (l, r) {
-  | (_, None) => true
-  | (Some(hl), Some(hr)) => hl.height >= hr.height
-  | (None, Some(_)) => false
-  }
-
-let updateValue = (n, newValue) =>
-  if n.value === newValue {
-    n
-  } else {
-    {
-      left: n.left,
-      right: n.right,
-      key: n.key,
-      value: newValue,
-      height: n.height,
-    }
-  }
-
-let bal = (l, x, d, r) => {
-  let hl = switch l {
-  | None => 0
-  | Some(n) => n.height
-  }
-  let hr = switch r {
-  | None => 0
-  | Some(n) => n.height
-  }
-  if hl > hr + 2 {
-    switch l {
-    | None => assert(false)
-    | Some({left: ll, right: lr} as l) =>
-      if treeHeight(ll) >= treeHeight(lr) {
-        create(ll, l.key, l.value, create(lr, x, d, r))
-      } else {
-        switch lr {
-        | None => assert(false)
-        | Some(lr) =>
-          create(create(ll, l.key, l.value, lr.left), lr.key, lr.value, create(lr.right, x, d, r))
-        }
-      }
-    }
-  } else if hr > hl + 2 {
-    switch r {
-    | None => assert(false)
-    | Some({left: rl, right: rr} as r) =>
-      if treeHeight(rr) >= treeHeight(rl) {
-        create(create(l, x, d, rl), r.key, r.value, rr)
-      } else {
-        switch rl {
-        | None => assert(false)
-        | Some(rl) =>
-          create(create(l, x, d, rl.left), rl.key, rl.value, create(rl.right, r.key, r.value, rr))
-        }
-      }
-    }
-  } else {
-    Some({
-      left: l,
-      key: x,
-      value: d,
-      right: r,
-      height: if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    })
-  }
-}
-
-let rec minKey0Aux = n =>
-  switch n.left {
-  | None => n.key
-  | Some(n) => minKey0Aux(n)
-  }
-
-let minKey = n =>
-  switch n {
-  | None => None
-  | Some(n) => Some(minKey0Aux(n))
-  }
-
-let minKeyUndefined = n =>
-  switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(minKey0Aux(n))
-  }
-
-let rec maxKey0Aux = n =>
-  switch n.right {
-  | None => n.key
-  | Some(n) => maxKey0Aux(n)
-  }
-
-let maxKey = n =>
-  switch n {
-  | None => None
-  | Some(n) => Some(maxKey0Aux(n))
-  }
-
-let maxKeyUndefined = n =>
-  switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(maxKey0Aux(n))
-  }
-
-let rec minKV0Aux = n =>
-  switch n.left {
-  | None => (n.key, n.value)
-  | Some(n) => minKV0Aux(n)
-  }
-
-let minimum = n =>
-  switch n {
-  | None => None
-  | Some(n) => Some(minKV0Aux(n))
-  }
-
-let minUndefined = n =>
-  switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(minKV0Aux(n))
-  }
-
-let rec maxKV0Aux = n =>
-  switch n.right {
-  | None => (n.key, n.value)
-  | Some(n) => maxKV0Aux(n)
-  }
-
-let maximum = n =>
-  switch n {
-  | None => None
-  | Some(n) => Some(maxKV0Aux(n))
-  }
-
-let maxUndefined = n =>
-  switch n {
-  | None => Js.undefined
-  | Some(n) => Js.Undefined.return(maxKV0Aux(n))
-  }
-
-/* TODO: use kv ref */
-let rec removeMinAuxWithRef = (n, kr, vr) =>
-  switch n.left {
-  | None =>
-    kr.contents = n.key
-    vr.contents = n.value
-    n.right
-  | Some(ln) => bal(removeMinAuxWithRef(ln, kr, vr), n.key, n.value, n.right)
-  }
-
-let isEmpty = x =>
-  switch x {
-  | None => true
-  | Some(_) => false
-  }
-
-let rec stackAllLeft = (v, s) =>
-  switch v {
-  | None => s
-  | Some(x) => stackAllLeft(x.left, list{x, ...s})
-  }
-
-let rec findFirstByU = (n, p) =>
-  switch n {
-  | None => None
-  | Some(n) =>
-    let left = findFirstByU(n.left, p)
-    if left != None {
-      left
-    } else {
-      let {key: v, value: d} = n
-      let pvd = p(. v, d)
-      if pvd {
-        Some(v, d)
-      } else {
-        let right = findFirstByU(n.right, p)
-        if right != None {
-          right
-        } else {
-          None
-        }
-      }
-    }
-  }
-
-let findFirstBy = (n, p) => findFirstByU(n, (. a, b) => p(a, b))
-
-let rec forEachU = (n, f) =>
-  switch n {
-  | None => ()
-  | Some(n) =>
-    forEachU(n.left, f)
-    f(. n.key, n.value)
-    forEachU(n.right, f)
-  }
-
-let forEach = (n, f) => forEachU(n, (. a, b) => f(a, b))
-
-let rec mapU = (n, f) =>
-  switch n {
-  | None => None
-  | Some(n) =>
-    let newLeft = mapU(n.left, f)
-    let newD = f(. n.value)
-    let newRight = mapU(n.right, f)
-    Some({left: newLeft, key: n.key, value: newD, right: newRight, height: n.height})
-  }
-
-let map = (n, f) => mapU(n, (. a) => f(a))
-
-let rec mapWithKeyU = (n, f) =>
-  switch n {
-  | None => None
-  | Some(n) =>
-    let key = n.key
-    let newLeft = mapWithKeyU(n.left, f)
-    let newD = f(. key, n.value)
-    let newRight = mapWithKeyU(n.right, f)
-    Some({left: newLeft, key, value: newD, right: newRight, height: n.height})
-  }
-
-let mapWithKey = (n, f) => mapWithKeyU(n, (. a, b) => f(a, b))
-
-let rec reduceU = (m, accu, f) =>
-  switch m {
-  | None => accu
-  | Some(n) =>
-    let {left: l, key: v, value: d, right: r} = n
-    reduceU(r, f(. reduceU(l, accu, f), v, d), f)
-  }
-
-let reduce = (m, accu, f) => reduceU(m, accu, (. a, b, c) => f(a, b, c))
-
-let rec everyU = (n, p) =>
-  switch n {
-  | None => true
-  | Some(n) => p(. n.key, n.value) && (everyU(n.left, p) && everyU(n.right, p))
-  }
-let every = (n, p) => everyU(n, (. a, b) => p(a, b))
-
-let rec someU = (n, p) =>
-  switch n {
-  | None => false
-  | Some(n) => p(. n.key, n.value) || (someU(n.left, p) || someU(n.right, p))
-  }
-let some = (n, p) => someU(n, (. a, b) => p(a, b))
-/* Beware: those two functions assume that the added k is *strictly*
-   smaller (or bigger) than all the present keys in the tree; it
-   does not test for equality with the current min (or max) key.
-
-   Indeed, they are only used during the "join" operation which
-   respects this precondition.
-*/
-
-let rec addMinElement = (n, k, v) =>
-  switch n {
-  | None => singleton(k, v)
-  | Some(n) => bal(addMinElement(n.left, k, v), n.key, n.value, n.right)
-  }
-
-let rec addMaxElement = (n, k, v) =>
-  switch n {
-  | None => singleton(k, v)
-  | Some(n) => bal(n.left, n.key, n.value, addMaxElement(n.right, k, v))
-  }
-
-/* Same as create and bal, but no assumptions are made on the
- relative heights of l and r. */
-
-let rec join = (ln, v, d, rn) =>
-  switch (ln, rn) {
-  | (None, _) => addMinElement(rn, v, d)
-  | (_, None) => addMaxElement(ln, v, d)
-  | (Some(l), Some(r)) =>
-    let {left: ll, key: lv, value: ld, right: lr, height: lh} = l
-    let {left: rl, key: rv, value: rd, right: rr, height: rh} = r
-    if lh > rh + 2 {
-      bal(ll, lv, ld, join(lr, v, d, rn))
-    } else if rh > lh + 2 {
-      bal(join(ln, v, d, rl), rv, rd, rr)
-    } else {
-      create(ln, v, d, rn)
-    }
-  }
-
-/* Merge two trees l and r into one.
-   All elements of l must precede the elements of r.
-   No assumption on the heights of l and r. */
-
-let concat = (t1, t2) =>
-  switch (t1, t2) {
-  | (None, _) => t2
-  | (_, None) => t1
-  | (_, Some(t2n)) =>
-    let (kr, vr) = (ref(t2n.key), ref(t2n.value))
-    let t2r = removeMinAuxWithRef(t2n, kr, vr)
-    join(t1, kr.contents, vr.contents, t2r)
-  }
-
-let concatOrJoin = (t1, v, d, t2) =>
-  switch d {
-  | Some(d) => join(t1, v, d, t2)
-  | None => concat(t1, t2)
-  }
-
-let rec keepSharedU = (n, p) =>
-  switch n {
-  | None => None
-  | Some(n) =>
-    /* call `p` in the expected left-to-right order */
-    let {key: v, value: d} = n
-    let newLeft = keepSharedU(n.left, p)
-    let pvd = p(. v, d)
-    let newRight = keepSharedU(n.right, p)
-    if pvd {
-      join(newLeft, v, d, newRight)
-    } else {
-      concat(newLeft, newRight)
-    }
-  }
-
-let keepShared = (n, p) => keepSharedU(n, (. a, b) => p(a, b))
-
-let rec keepMapU = (n, p) =>
-  switch n {
-  | None => None
-  | Some(n) =>
-    /* call `p` in the expected left-to-right order */
-    let {key: v, value: d} = n
-    let newLeft = keepMapU(n.left, p)
-    let pvd = p(. v, d)
-    let newRight = keepMapU(n.right, p)
-    switch pvd {
-    | None => concat(newLeft, newRight)
-    | Some(d) => join(newLeft, v, d, newRight)
-    }
-  }
-
-let keepMap = (n, p) => keepMapU(n, (. a, b) => p(a, b))
-
-let rec partitionSharedU = (n, p) =>
-  switch n {
-  | None => (None, None)
-  | Some(n) =>
-    let {key, value} = n
-    /* call `p` in the expected left-to-right order */
-    let (lt, lf) = partitionSharedU(n.left, p)
-    let pvd = p(. key, value)
-    let (rt, rf) = partitionSharedU(n.right, p)
-    if pvd {
-      (join(lt, key, value, rt), concat(lf, rf))
-    } else {
-      (concat(lt, rt), join(lf, key, value, rf))
-    }
-  }
-
-let partitionShared = (n, p) => partitionSharedU(n, (. a, b) => p(a, b))
-
-let rec lengthNode = n => {
-  let {left: l, right: r} = n
-  let sizeL = switch l {
-  | None => 0
-  | Some(l) => lengthNode(l)
-  }
-  let sizeR = switch r {
-  | None => 0
-  | Some(r) => lengthNode(r)
-  }
-  1 + sizeL + sizeR
-}
-
-let size = n =>
-  switch n {
-  | None => 0
-  | Some(n) => lengthNode(n)
-  }
-
-let rec toListAux = (n, accu) =>
-  switch n {
-  | None => accu
-  | Some(n) =>
-    let {left: l, right: r, key: k, value: v} = n
-    toListAux(l, list{(k, v), ...toListAux(r, accu)})
-  }
-
-let toList = s => toListAux(s, list{})
-
-let rec checkInvariantInternal = (v: t<_>) =>
-  switch v {
-  | None => ()
-  | Some(n) =>
-    let (l, r) = (n.left, n.right)
-    let diff = treeHeight(l) - treeHeight(r)
-    assert(diff <= 2 && diff >= -2)
-    checkInvariantInternal(l)
-    checkInvariantInternal(r)
-  }
-
-let rec fillArrayKey = (n, i, arr) => {
-  let {left: l, key: v, right: r} = n
-  let next = switch l {
-  | None => i
-  | Some(l) => fillArrayKey(l, i, arr)
-  }
-  A.setUnsafe(arr, next, v)
-  let rnext = next + 1
-  switch r {
-  | None => rnext
-  | Some(r) => fillArrayKey(r, rnext, arr)
-  }
-}
-
-let rec fillArrayValue = (n, i, arr) => {
-  let (l, r) = (n.left, n.right)
-  let next = switch l {
-  | None => i
-  | Some(l) => fillArrayValue(l, i, arr)
-  }
-  A.setUnsafe(arr, next, n.value)
-  let rnext = next + 1
-  switch r {
-  | None => rnext
-  | Some(r) => fillArrayValue(r, rnext, arr)
-  }
-}
-
-let rec fillArray = (n, i, arr) => {
-  let (l, v, r) = (n.left, n.key, n.right)
-  let next = switch l {
-  | None => i
-  | Some(l) => fillArray(l, i, arr)
-  }
-  A.setUnsafe(arr, next, (v, n.value))
-  let rnext = next + 1
-  switch r {
-  | None => rnext
-  | Some(r) => fillArray(r, rnext, arr)
-  }
-}
-
-/* let rec fillArrayWithPartition n cursor arr p =
-  let l,v,r = n.left, n.key , n.right in
-  (match  l with
-   | None -> ()
-   | Some l ->
-     fillArrayWithPartition l cursor arr p);
-  (if p v [@bs] then begin
-      let c = forwardGet cursor in
-      A.setUnsafe arr c (v,n.value);
-      forwardSet cursor (c + 1)
-    end
-   else begin
-     let c = backwardGet cursor in
-     A.setUnsafe arr c (v, n.value);
-     backwardSet cursor (c - 1)
-   end);
-  match  r with
-  | None -> ()
-  | Some r ->
-    fillArrayWithPartition r cursor arr  p
-
-let rec fillArrayWithFilter n i arr p =
-  let l,v,r = n.left, n.key , n.right in
-  let next =
-    match  l with
-    | None -> i
-    | Some l ->
-      fillArrayWithFilter l i arr p in
-  let rnext =
-    if p v [@bs] then
-      (A.setUnsafe arr next (v, n.value);
-       next + 1
-      )
-    else next in
-  match  r with
-  | None -> rnext
-  | Some r ->
-    fillArrayWithFilter r rnext arr  p
- */
-
-let toArray = n =>
-  switch n {
-  | None => []
-  | Some(n) =>
-    let size = lengthNode(n)
-    let v = A.makeUninitializedUnsafe(size)
-    ignore((fillArray(n, 0, v): int)) /* may add assertion */
-    v
-  }
-
-let keysToArray = n =>
-  switch n {
-  | None => []
-  | Some(n) =>
-    let size = lengthNode(n)
-    let v = A.makeUninitializedUnsafe(size)
-    ignore((fillArrayKey(n, 0, v): int)) /* may add assertion */
-    v
-  }
-
-let valuesToArray = n =>
-  switch n {
-  | None => []
-  | Some(n) =>
-    let size = lengthNode(n)
-    let v = A.makeUninitializedUnsafe(size)
-    ignore((fillArrayValue(n, 0, v): int)) /* may add assertion */
-    v
-  }
-
-let rec fromSortedArrayRevAux = (arr, off, len) =>
-  switch len {
-  | 0 => None
-  | 1 =>
-    let (k, v) = A.getUnsafe(arr, off)
-    singleton(k, v)
-  | 2 =>
-    let ((x0, y0), (x1, y1)) = {
-      open A
-      (getUnsafe(arr, off), getUnsafe(arr, off - 1))
-    }
-
-    Some({left: singleton(x0, y0), key: x1, value: y1, height: 2, right: None})
-  | 3 =>
-    let ((x0, y0), (x1, y1), (x2, y2)) = {
-      open A
-      (getUnsafe(arr, off), getUnsafe(arr, off - 1), getUnsafe(arr, off - 2))
-    }
-    Some({
-      left: singleton(x0, y0),
-      right: singleton(x2, y2),
-      key: x1,
-      value: y1,
-      height: 2,
-    })
-  | _ =>
-    let nl = len / 2
-    let left = fromSortedArrayRevAux(arr, off, nl)
-    let (midK, midV) = A.getUnsafe(arr, off - nl)
-    let right = fromSortedArrayRevAux(arr, off - nl - 1, len - nl - 1)
-    create(left, midK, midV, right)
-  }
-
-let rec fromSortedArrayAux = (arr, off, len) =>
-  switch len {
-  | 0 => None
-  | 1 =>
-    let (k, v) = A.getUnsafe(arr, off)
-    singleton(k, v)
-  | 2 =>
-    let ((x0, y0), (x1, y1)) = {
-      open A
-      (getUnsafe(arr, off), getUnsafe(arr, off + 1))
-    }
-
-    Some({left: singleton(x0, y0), key: x1, value: y1, height: 2, right: None})
-  | 3 =>
-    let ((x0, y0), (x1, y1), (x2, y2)) = {
-      open A
-      (getUnsafe(arr, off), getUnsafe(arr, off + 1), getUnsafe(arr, off + 2))
-    }
-    Some({
-      left: singleton(x0, y0),
-      right: singleton(x2, y2),
-      key: x1,
-      value: y1,
-      height: 2,
-    })
-  | _ =>
-    let nl = len / 2
-    let left = fromSortedArrayAux(arr, off, nl)
-    let (midK, midV) = A.getUnsafe(arr, off + nl)
-    let right = fromSortedArrayAux(arr, off + nl + 1, len - nl - 1)
-    create(left, midK, midV, right)
-  }
-
-let fromSortedArrayUnsafe = arr => fromSortedArrayAux(arr, 0, A.length(arr))
-
-let rec compareAux = (e1, e2, ~kcmp, ~vcmp) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    let c = Belt_Id.getCmpInternal(kcmp)(. h1.key, h2.key)
-    if c == 0 {
-      let cx = vcmp(. h1.value, h2.value)
-      if cx == 0 {
-        compareAux(~kcmp, ~vcmp, stackAllLeft(h1.right, t1), stackAllLeft(h2.right, t2))
-      } else {
-        cx
-      }
-    } else {
-      c
-    }
-  | (_, _) => 0
-  }
-
-let rec eqAux = (e1, e2, ~kcmp, ~veq) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    if Belt_Id.getCmpInternal(kcmp)(. h1.key, h2.key) == 0 && veq(. h1.value, h2.value) {
-      eqAux(~kcmp, ~veq, stackAllLeft(h1.right, t1), stackAllLeft(h2.right, t2))
-    } else {
-      false
-    }
-  | (_, _) => true
-  }
-
-let cmpU = (s1, s2, ~kcmp, ~vcmp) => {
-  let (len1, len2) = (size(s1), size(s2))
-  if len1 == len2 {
-    compareAux(stackAllLeft(s1, list{}), stackAllLeft(s2, list{}), ~kcmp, ~vcmp)
-  } else if len1 < len2 {
-    -1
-  } else {
-    1
-  }
-}
-
-let cmp = (s1, s2, ~kcmp, ~vcmp) => cmpU(s1, s2, ~kcmp, ~vcmp=(. a, b) => vcmp(a, b))
-
-let eqU = (s1, s2, ~kcmp, ~veq) => {
-  let (len1, len2) = (size(s1), size(s2))
-  if len1 == len2 {
-    eqAux(stackAllLeft(s1, list{}), stackAllLeft(s2, list{}), ~kcmp, ~veq)
-  } else {
-    false
-  }
-}
-
-let eq = (s1, s2, ~kcmp, ~veq) => eqU(s1, s2, ~kcmp, ~veq=(. a, b) => veq(a, b))
-
-let rec get = (n, x, ~cmp) =>
-  switch n {
-  | None => None
-  | Some(n) /* Node(l, v, d, r, _) */ =>
-    let v = n.key
-    let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-    if c == 0 {
-      Some(n.value)
-    } else {
-      get(
-        ~cmp,
-        if c < 0 {
-          n.left
-        } else {
-          n.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getUndefined = (n, x, ~cmp) =>
-  switch n {
-  | None => Js.undefined
-  | Some(n) =>
-    let v = n.key
-    let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-    if c == 0 {
-      Js.Undefined.return(n.value)
-    } else {
-      getUndefined(
-        ~cmp,
-        if c < 0 {
-          n.left
-        } else {
-          n.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getExn = (n, x, ~cmp) =>
-  switch n {
-  | None => raise(Not_found)
-  | Some(n) /* Node(l, v, d, r, _) */ =>
-    let v = n.key
-    let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-    if c == 0 {
-      n.value
-    } else {
-      getExn(
-        ~cmp,
-        if c < 0 {
-          n.left
-        } else {
-          n.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getWithDefault = (n, x, def, ~cmp) =>
-  switch n {
-  | None => def
-  | Some(n) /* Node(l, v, d, r, _) */ =>
-    let v = n.key
-    let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-    if c == 0 {
-      n.value
-    } else {
-      getWithDefault(
-        ~cmp,
-        if c < 0 {
-          n.left
-        } else {
-          n.right
-        },
-        x,
-        def,
-      )
-    }
-  }
-
-let rec has = (n, x, ~cmp) =>
-  switch n {
-  | None => false
-  | Some(n) /* Node(l, v, d, r, _) */ =>
-    let v = n.key
-    let c = Belt_Id.getCmpInternal(cmp)(. x, v)
-    c == 0 ||
-      has(
-        ~cmp,
-        if c < 0 {
-          n.left
-        } else {
-          n.right
-        },
-        x,
-      )
-  }
-
-/* **************************************************************** */
-
-/*
-  L rotation, Some root node
-*/
-let rotateWithLeftChild = k2 =>
-  switch k2.left {
-  | None => assert(false)
-  | Some(k1) =>
-    k2.left = k1.right
-    k1.right = Some(k2)
-    let (hlk2, hrk2) = (treeHeight(k2.left), treeHeight(k2.right))
-    k2.height = Pervasives.max(hlk2, hrk2) + 1
-    let (hlk1, hk2) = (treeHeight(k1.left), k2.height)
-    k1.height = Pervasives.max(hlk1, hk2) + 1
-    k1
-  }
-/* right rotation */
-let rotateWithRightChild = k1 =>
-  switch k1.right {
-  | None => assert(false)
-  | Some(k2) =>
-    k1.right = k2.left
-    k2.left = Some(k1)
-    let (hlk1, hrk1) = (treeHeight(k1.left), treeHeight(k1.right))
-    k1.height = Pervasives.max(hlk1, hrk1) + 1
-    let (hrk2, hk1) = (treeHeight(k2.right), k1.height)
-    k2.height = Pervasives.max(hrk2, hk1) + 1
-    k2
-  }
-
-/*
-  double l rotation
-*/
-let doubleWithLeftChild = k3 => {
-  let k3l = switch k3.left {
-  | None => assert(false)
-  | Some(x) => x
-  }
-  let v = rotateWithRightChild(k3l)
-  k3.left = Some(v)
-  rotateWithLeftChild(k3)
-}
-
-let doubleWithRightChild = k2 => {
-  let k2r = switch k2.right {
-  | None => assert(false)
-  | Some(x) => x
-  }
-  let v = rotateWithLeftChild(k2r)
-  k2.right = Some(v)
-  rotateWithRightChild(k2)
-}
-
-let heightUpdateMutate = t => {
-  let (hlt, hrt) = (treeHeight(t.left), treeHeight(t.right))
-  t.height = Pervasives.max(hlt, hrt) + 1
-  t
-}
-
-let balMutate = nt => {
-  let (l, r) = (nt.left, nt.right)
-  let (hl, hr) = (treeHeight(l), treeHeight(r))
-  if hl > 2 + hr {
-    switch l {
-    | None => assert(false)
-    | Some({left: ll, right: lr}) =>
-      if heightGe(ll, lr) {
-        heightUpdateMutate(rotateWithLeftChild(nt))
-      } else {
-        heightUpdateMutate(doubleWithLeftChild(nt))
-      }
-    }
-  } else if hr > 2 + hl {
-    switch r {
-    | None => assert(false)
-    | Some({left: rl, right: rr}) =>
-      if heightGe(rr, rl) {
-        heightUpdateMutate(rotateWithRightChild(nt))
-      } else {
-        heightUpdateMutate(doubleWithRightChild(nt))
-      }
-    }
-  } else {
-    nt.height = Pervasives.max(hl, hr) + 1
-    nt
-  }
-}
-
-let rec updateMutate = (t: t<_>, x, data, ~cmp) =>
-  switch t {
-  | None => singleton(x, data)
-  | Some(nt) =>
-    let k = nt.key
-    let c = Belt_Id.getCmpInternal(cmp)(. x, k)
-    if c == 0 {
-      nt.value = data
-      Some(nt)
-    } else {
-      let (l, r) = (nt.left, nt.right)
-      if c < 0 {
-        let ll = updateMutate(~cmp, l, x, data)
-        nt.left = ll
-      } else {
-        nt.right = updateMutate(~cmp, r, x, data)
-      }
-      Some(balMutate(nt))
-    }
-  }
-
-let fromArray = (xs: array<_>, ~cmp) => {
-  let len = A.length(xs)
-  if len == 0 {
-    None
-  } else {
-    let next = ref(
-      S.strictlySortedLengthU(xs, (. (x0, _), (y0, _)) =>
-        Belt_Id.getCmpInternal(cmp)(. x0, y0) < 0
-      ),
-    )
-
-    let result = ref(
-      if next.contents >= 0 {
-        fromSortedArrayAux(xs, 0, next.contents)
-      } else {
-        next.contents = -next.contents
-        fromSortedArrayRevAux(xs, next.contents - 1, next.contents)
-      },
-    )
-    for i in next.contents to len - 1 {
-      let (k, v) = A.getUnsafe(xs, i)
-      result.contents = updateMutate(~cmp, result.contents, k, v)
-    }
-    result.contents
-  }
-}
-
-let rec removeMinAuxWithRootMutate = (nt, n) => {
-  let (rn, ln) = (n.right, n.left)
-  switch ln {
-  | None =>
-    nt.key = n.key
-    nt.value = n.value
-    rn
-  | Some(ln) =>
-    n.left = removeMinAuxWithRootMutate(nt, ln)
-    Some(balMutate(n))
-  }
-}
diff --git a/jscomp/others/belt_internalAVLtree.resi b/jscomp/others/belt_internalAVLtree.resi
deleted file mode 100644
index a1b58f3..0000000
--- a/jscomp/others/belt_internalAVLtree.resi
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright (C) 2018 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 rec t<'key, 'a> = option<node<'key, 'a>>
-
-and node<'k, 'v> = {
-  @as("k") mutable key: 'k,
-  @as("v") mutable value: 'v,
-  @as("h") mutable height: int,
-  @as("l") mutable left: t<'k, 'v>,
-  @as("r") mutable right: t<'k, 'v>,
-}
-
-type cmp<'k, 'id> = Belt_Id.cmp<'k, 'id>
-
-let copy: t<'k, 'v> => t<'k, 'v>
-let create: (t<'a, 'b>, 'a, 'b, t<'a, 'b>) => t<'a, 'b>
-let bal: (t<'a, 'b>, 'a, 'b, t<'a, 'b>) => t<'a, 'b>
-
-let singleton: ('a, 'b) => t<'a, 'b>
-
-let updateValue: (node<'k, 'v>, 'v) => node<'k, 'v>
-
-let minKey: t<'a, 'b> => option<'a>
-let minKeyUndefined: t<'a, 'b> => Js.undefined<'a>
-
-let maxKey: t<'a, 'b> => option<'a>
-let maxKeyUndefined: t<'a, 'b> => Js.undefined<'a>
-
-let minimum: t<'a, 'b> => option<('a, 'b)>
-let minUndefined: t<'a, 'b> => Js.undefined<('a, 'b)>
-
-let maximum: t<'a, 'b> => option<('a, 'b)>
-let maxUndefined: t<'a, 'b> => Js.undefined<('a, 'b)>
-
-let removeMinAuxWithRef: (node<'a, 'b>, ref<'a>, ref<'b>) => t<'a, 'b>
-
-let isEmpty: t<_> => bool
-
-let stackAllLeft: (t<'a, 'b>, list<node<'a, 'b>>) => list<node<'a, 'b>>
-
-let findFirstByU: (t<'a, 'b>, (. 'a, 'b) => bool) => option<('a, 'b)>
-let findFirstBy: (t<'a, 'b>, ('a, 'b) => bool) => option<('a, 'b)>
-
-let forEachU: (t<'a, 'b>, (. 'a, 'b) => unit) => unit
-let forEach: (t<'a, 'b>, ('a, 'b) => unit) => unit
-
-let mapU: (t<'c, 'a>, (. 'a) => 'b) => t<'c, 'b>
-let map: (t<'c, 'a>, 'a => 'b) => t<'c, 'b>
-
-let mapWithKeyU: (t<'a, 'b>, (. 'a, 'b) => 'c) => t<'a, 'c>
-let mapWithKey: (t<'a, 'b>, ('a, 'b) => 'c) => t<'a, 'c>
-
-let reduceU: (t<'a, 'b>, 'c, (. 'c, 'a, 'b) => 'c) => 'c
-let reduce: (t<'a, 'b>, 'c, ('c, 'a, 'b) => 'c) => 'c
-
-let everyU: (t<'a, 'b>, (. 'a, 'b) => bool) => bool
-let every: (t<'a, 'b>, ('a, 'b) => bool) => bool
-
-let someU: (t<'a, 'b>, (. 'a, 'b) => bool) => bool
-let some: (t<'a, 'b>, ('a, 'b) => bool) => bool
-
-let join: (t<'a, 'b>, 'a, 'b, t<'a, 'b>) => t<'a, 'b>
-
-let concat: (t<'a, 'b>, t<'a, 'b>) => t<'a, 'b>
-
-let concatOrJoin: (t<'a, 'b>, 'a, option<'b>, t<'a, 'b>) => t<'a, 'b>
-
-let keepSharedU: (t<'a, 'b>, (. 'a, 'b) => bool) => t<'a, 'b>
-let keepShared: (t<'a, 'b>, ('a, 'b) => bool) => t<'a, 'b>
-
-let keepMapU: (t<'a, 'b>, (. 'a, 'b) => option<'c>) => t<'a, 'c>
-let keepMap: (t<'a, 'b>, ('a, 'b) => option<'c>) => t<'a, 'c>
-
-/* seems no sharing, could be shared with mutation */
-let partitionSharedU: (t<'a, 'b>, (. 'a, 'b) => bool) => (t<'a, 'b>, t<'a, 'b>)
-let partitionShared: (t<'a, 'b>, ('a, 'b) => bool) => (t<'a, 'b>, t<'a, 'b>)
-
-let lengthNode: node<'a, 'b> => int
-let size: t<'a, 'b> => int
-
-let toList: t<'a, 'b> => list<('a, 'b)>
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t<'a, 'b> => unit
-
-let fillArray: (node<'a, 'b>, int, array<('a, 'b)>) => int
-
-let toArray: t<'a, 'b> => array<('a, 'b)>
-let keysToArray: t<'a, 'b> => array<'a>
-let valuesToArray: t<'a, 'b> => array<'b>
-let fromSortedArrayAux: (array<('a, 'b)>, int, int) => t<'a, 'b>
-let fromSortedArrayRevAux: (array<('a, 'b)>, int, int) => t<'a, 'b>
-let fromSortedArrayUnsafe: array<('a, 'b)> => t<'a, 'b>
-
-let cmpU: (t<'a, 'b>, t<'a, 'c>, ~kcmp: cmp<'a, _>, ~vcmp: (. 'b, 'c) => int) => int
-let cmp: (t<'a, 'b>, t<'a, 'c>, ~kcmp: cmp<'a, _>, ~vcmp: ('b, 'c) => int) => int
-
-let eqU: (t<'a, 'b>, t<'a, 'c>, ~kcmp: cmp<'a, _>, ~veq: (. 'b, 'c) => bool) => bool
-let eq: (t<'a, 'b>, t<'a, 'c>, ~kcmp: cmp<'a, _>, ~veq: ('b, 'c) => bool) => bool
-
-let get: (t<'a, 'b>, 'a, ~cmp: cmp<'a, _>) => option<'b>
-
-let getUndefined: (t<'a, 'b>, 'a, ~cmp: cmp<'a, _>) => Js.undefined<'b>
-
-let getWithDefault: (t<'a, 'b>, 'a, 'b, ~cmp: cmp<'a, _>) => 'b
-let getExn: (t<'a, 'b>, 'a, ~cmp: cmp<'a, _>) => 'b
-
-let has: (t<'a, 'b>, 'a, ~cmp: cmp<'a, _>) => bool
-
-let fromArray: (array<('a, 'b)>, ~cmp: cmp<'a, 'id>) => t<'a, 'b>
-
-let updateMutate: (t<'a, 'b>, 'a, 'b, ~cmp: cmp<'a, 'id>) => t<'a, 'b>
-
-let balMutate: node<'a, 'b> => node<'a, 'b>
-
-let removeMinAuxWithRootMutate: (node<'a, 'b>, node<'a, 'b>) => t<'a, 'b>
diff --git a/jscomp/others/belt_internalBuckets.res b/jscomp/others/belt_internalBuckets.res
deleted file mode 100644
index d9eeb7e..0000000
--- a/jscomp/others/belt_internalBuckets.res
+++ /dev/null
@@ -1,225 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-/* Adapted by Hongbo Zhang, Authors of ReScript 2017 */
-
-/* For JS backends, we use `undefined` as default value, so that buckets
-   could be allocated lazily
-*/
-
-/* We do dynamic hashing, and resize the table and rehash the elements
- when buckets become too long. */
-module C = Belt_internalBucketsType
-/* TODO:
-   the current implementation relies on the fact that bucket 
-   empty value is `undefined` in both places,
-   in theory, it can be different 
-
-*/
-type rec bucket<'a, 'b> = {
-  mutable key: 'a,
-  mutable value: 'b,
-  mutable next: C.opt<bucket<'a, 'b>>,
-}
-and t<'hash, 'eq, 'a, 'b> = C.container<'hash, 'eq, bucket<'a, 'b>>
-
-module A = Belt_Array
-
-let rec copy = (x: t<_>): t<_> => {
-  hash: x.hash,
-  eq: x.eq,
-  size: x.size,
-  buckets: copyBuckets(x.buckets),
-}
-and copyBuckets = (buckets: array<C.opt<bucket<_>>>) => {
-  let len = A.length(buckets)
-  let newBuckets = A.makeUninitializedUnsafe(len)
-  for i in 0 to len - 1 {
-    A.setUnsafe(newBuckets, i, copyBucket(A.getUnsafe(buckets, i)))
-  }
-  newBuckets
-}
-and copyBucket = c =>
-  switch C.toOpt(c) {
-  | None => c
-  | Some(c) =>
-    let head = {
-      key: c.key,
-      value: c.value,
-      next: C.emptyOpt,
-    }
-    copyAuxCont(c.next, head)
-    C.return(head)
-  }
-and copyAuxCont = (c, prec) =>
-  switch C.toOpt(c) {
-  | None => ()
-  | Some(nc) =>
-    let ncopy = {key: nc.key, value: nc.value, next: C.emptyOpt}
-    prec.next = C.return(ncopy)
-    copyAuxCont(nc.next, ncopy)
-  }
-
-let rec bucketLength = (accu, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => accu
-  | Some(cell) => bucketLength(accu + 1, cell.next)
-  }
-
-let rec do_bucket_iter = (~f, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => ()
-  | Some(cell) =>
-    f(. cell.key, cell.value)->ignore
-    do_bucket_iter(~f, cell.next)
-  }
-
-let forEachU = (h, f) => {
-  let d = h.C.buckets
-  for i in 0 to A.length(d) - 1 {
-    do_bucket_iter(~f, A.getUnsafe(d, i))
-  }
-}
-
-let forEach = (h, f) => forEachU(h, (. a, b) => f(a, b))
-
-let rec do_bucket_fold = (~f, b, accu) =>
-  switch C.toOpt(b) {
-  | None => accu
-  | Some(cell) => do_bucket_fold(~f, cell.next, f(. accu, cell.key, cell.value))
-  }
-
-let reduceU = (h, init, f) => {
-  let d = h.C.buckets
-  let accu = ref(init)
-  for i in 0 to A.length(d) - 1 {
-    accu.contents = do_bucket_fold(~f, A.getUnsafe(d, i), accu.contents)
-  }
-  accu.contents
-}
-
-let reduce = (h, init, f) => reduceU(h, init, (. a, b, c) => f(a, b, c))
-
-let getMaxBucketLength = h =>
-  A.reduceU(h.C.buckets, 0, (. m, b) => {
-    let len = bucketLength(0, b)
-    Pervasives.max(m, len)
-  })
-
-let getBucketHistogram = h => {
-  let mbl = getMaxBucketLength(h)
-  let histo = A.makeByU(mbl + 1, (. _) => 0)
-  A.forEachU(h.C.buckets, (. b) => {
-    let l = bucketLength(0, b)
-    A.setUnsafe(histo, l, A.getUnsafe(histo, l) + 1)
-  })
-  histo
-}
-
-let logStats = h => {
-  let histogram = getBucketHistogram(h)
-  Js.log({
-    "bindings": h.C.size,
-    "buckets": A.length(h.C.buckets),
-    "histogram": histogram,
-  })
-}
-
-/** iterate the Buckets, in place remove the elements */
-let rec filterMapInplaceBucket = (f, h, i, prec, cell) => {
-  let n = cell.next
-  switch f(. cell.key, cell.value) {
-  | None =>
-    h.C.size = h.C.size - 1 /* delete */
-    switch C.toOpt(n) {
-    | Some(nextCell) => filterMapInplaceBucket(f, h, i, prec, nextCell)
-    | None =>
-      switch C.toOpt(prec) {
-      | None => A.setUnsafe(h.C.buckets, i, prec)
-      | Some(cell) => cell.next = n
-      }
-    }
-  | Some(data) =>
-    /* replace */
-    let bucket = C.return(cell)
-    switch C.toOpt(prec) {
-    | None => A.setUnsafe(h.C.buckets, i, bucket)
-    | Some(_) => cell.next = bucket
-    }
-    cell.value = data
-    switch C.toOpt(n) {
-    | None => cell.next = n
-    | Some(nextCell) => filterMapInplaceBucket(f, h, i, bucket, nextCell)
-    }
-  }
-}
-
-let keepMapInPlaceU = (h, f) => {
-  let h_buckets = h.C.buckets
-  for i in 0 to A.length(h_buckets) - 1 {
-    let v = A.getUnsafe(h_buckets, i)
-    switch C.toOpt(v) {
-    | None => ()
-    | Some(v) => filterMapInplaceBucket(f, h, i, C.emptyOpt, v)
-    }
-  }
-}
-
-let keepMapInPlace = (h, f) => keepMapInPlaceU(h, (. a, b) => f(a, b))
-
-let rec fillArray = (i, arr, cell) => {
-  A.setUnsafe(arr, i, (cell.key, cell.value))
-  switch C.toOpt(cell.next) {
-  | None => i + 1
-  | Some(v) => fillArray(i + 1, arr, v)
-  }
-}
-
-/* let toArray h = 
-  let d =h.bucketsin 
-  let current = ref 0 in 
-  let arr = A.makeUninitializedUnsafe (C.sizeGet h) in 
-  for i = 0 to A.length d - 1 do  
-    let cell = A.getUnsafe d i in 
-    match C.toOpt cell with 
-    | None -> ()
-    | Some cell -> 
-      current .contents<- fillArray current.contents arr cell
-  done;
-  arr */
-
-let rec fillArrayMap = (i, arr, cell, f) => {
-  A.setUnsafe(arr, i, f(. cell))
-  switch C.toOpt(cell.next) {
-  | None => i + 1
-  | Some(v) => fillArrayMap(i + 1, arr, v, f)
-  }
-}
-
-let linear = (h, f) => {
-  let d = h.C.buckets
-  let current = ref(0)
-  let arr = A.makeUninitializedUnsafe(h.C.size)
-  for i in 0 to A.length(d) - 1 {
-    let cell = A.getUnsafe(d, i)
-    switch C.toOpt(cell) {
-    | None => ()
-    | Some(cell) => current.contents = fillArrayMap(current.contents, arr, cell, f)
-    }
-  }
-  arr
-}
-
-let keysToArray = h => linear(h, (. x) => x.key)
-let valuesToArray = h => linear(h, (. x) => x.value)
-let toArray = h => linear(h, (. x) => (x.key, x.value))
diff --git a/jscomp/others/belt_internalBuckets.resi b/jscomp/others/belt_internalBuckets.resi
deleted file mode 100644
index 149309b..0000000
--- a/jscomp/others/belt_internalBuckets.resi
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module C = Belt_internalBucketsType
-
-type rec bucket<'a, 'b> = {
-  mutable key: 'a,
-  mutable value: 'b,
-  mutable next: C.opt<bucket<'a, 'b>>,
-}
-and t<'hash, 'eq, 'a, 'b> = C.container<'hash, 'eq, bucket<'a, 'b>>
-
-let copy: t<'hash, 'eq, 'a, 'b> => t<'hash, 'eq, 'a, 'b>
-
-let forEachU: (t<_, _, 'a, 'b>, (. 'a, 'b) => 'c) => unit
-let forEach: (t<_, _, 'a, 'b>, ('a, 'b) => 'c) => unit
-
-let reduceU: (t<_, _, 'a, 'b>, 'c, (. 'c, 'a, 'b) => 'c) => 'c
-let reduce: (t<_, _, 'a, 'b>, 'c, ('c, 'a, 'b) => 'c) => 'c
-
-let logStats: t<_> => unit
-
-let keepMapInPlaceU: (t<_, _, 'a, 'b>, (. 'a, 'b) => option<'b>) => unit
-let keepMapInPlace: (t<_, _, 'a, 'b>, ('a, 'b) => option<'b>) => unit
-
-let fillArray: (int, array<('a, 'b)>, bucket<'a, 'b>) => int
-
-let keysToArray: t<_, _, 'a, _> => array<'a>
-
-let valuesToArray: t<_, _, _, 'b> => array<'b>
-
-let toArray: t<_, _, 'a, 'b> => array<('a, 'b)>
-
-let getBucketHistogram: t<_> => array<int>
diff --git a/jscomp/others/belt_internalBucketsType.res b/jscomp/others/belt_internalBucketsType.res
deleted file mode 100644
index d7d0c68..0000000
--- a/jscomp/others/belt_internalBucketsType.res
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 opt<'a> = Js.undefined<'a>
-
-type container<'hash, 'eq, 'c> = {
-  mutable size: int /* number of entries */,
-  mutable buckets: array<opt<'c>> /* the buckets */,
-  hash: 'hash,
-  eq: 'eq,
-}
-
-module A = Belt_Array
-external toOpt: opt<'a> => option<'a> = "#undefined_to_opt"
-external return: 'a => opt<'a> = "%identity"
-
-let emptyOpt = Js.undefined
-let rec power_2_above = (x, n) =>
-  if x >= n {
-    x
-  } else if x * 2 < x {
-    x /* overflow */
-  } else {
-    power_2_above(x * 2, n)
-  }
-
-let make = (~hash, ~eq, ~hintSize) => {
-  let s = power_2_above(16, hintSize)
-  {
-    size: 0,
-    buckets: A.makeUninitialized(s),
-    hash,
-    eq,
-  }
-}
-
-let clear = h => {
-  h.size = 0
-  let h_buckets = h.buckets
-  let len = A.length(h_buckets)
-  for i in 0 to len - 1 {
-    A.setUnsafe(h_buckets, i, emptyOpt)
-  }
-}
-
-let isEmpty = h => h.size == 0
diff --git a/jscomp/others/belt_internalBucketsType.resi b/jscomp/others/belt_internalBucketsType.resi
deleted file mode 100644
index cab76a7..0000000
--- a/jscomp/others/belt_internalBucketsType.resi
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright (C) 2018 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 opt<'a> = Js.undefined<'a>
-type container<'hash, 'eq, 'c> = {
-  mutable size: int /* number of entries */,
-  mutable buckets: array<opt<'c>> /* the buckets */,
-  hash: 'hash,
-  eq: 'eq,
-}
-
-external toOpt: opt<'a> => option<'a> = "#undefined_to_opt"
-external return: 'a => opt<'a> = "%identity"
-
-let emptyOpt: Js.undefined<'a>
-let make: (~hash: 'hash, ~eq: 'eq, ~hintSize: int) => container<'hash, 'eq, _>
-
-let clear: container<_> => unit
-
-let isEmpty: container<_> => bool
diff --git a/jscomp/others/belt_internalMapInt.res b/jscomp/others/belt_internalMapInt.res
deleted file mode 100644
index 86d18f7..0000000
--- a/jscomp/others/belt_internalMapInt.res
+++ /dev/null
@@ -1,288 +0,0 @@
-@@bs.config({flags: ["-bs-noassertfalse"]})
-
-type key = int
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-module S = Belt_SortArray
-
-type t<'a> = N.t<key, 'a>
-
-let rec add = (t, x: key, data: _) =>
-  switch t {
-  | None => N.singleton(x, data)
-  | Some(n) =>
-    let k = n.N.key
-    if x == k {
-      Some(N.updateValue(n, data))
-    } else {
-      let v = n.N.value
-      if x < k {
-        N.bal(add(n.N.left, x, data), k, v, n.N.right)
-      } else {
-        N.bal(n.N.left, k, v, add(n.N.right, x, data))
-      }
-    }
-  }
-
-let rec get = (n, x: key) =>
-  switch n {
-  | None => None
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      Some(n.N.value)
-    } else {
-      get(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getUndefined = (n, x: key) =>
-  switch n {
-  | None => Js.undefined
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      Js.Undefined.return(n.N.value)
-    } else {
-      getUndefined(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getExn = (n, x: key) =>
-  switch n {
-  | None => raise(Not_found)
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      n.N.value
-    } else {
-      getExn(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getWithDefault = (n, x: key, def) =>
-  switch n {
-  | None => def
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      n.N.value
-    } else {
-      getWithDefault(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-        def,
-      )
-    }
-  }
-
-let rec has = (n, x: key) =>
-  switch n {
-  | None => false
-  | Some(n) /* Node(l, v, d, r, _) */ =>
-    let v = n.N.key
-    x == v ||
-      has(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-  }
-
-let rec remove = (n, x: key) =>
-  switch n {
-  | None => n
-  | Some(n) =>
-    let {N.left: l, key: v, right: r} = n
-    if x == v {
-      switch (l, r) {
-      | (None, _) => r
-      | (_, None) => l
-      | (_, Some(rn)) =>
-        let (kr, vr) = (ref(rn.key), ref(rn.value))
-        let r = N.removeMinAuxWithRef(rn, kr, vr)
-        N.bal(l, kr.contents, vr.contents, r)
-      }
-    } else if x < v {
-      open N
-      bal(remove(l, x), v, n.value, r)
-    } else {
-      open N
-      bal(l, v, n.value, remove(r, x))
-    }
-  }
-
-let rec splitAux = (x: key, n: N.node<_>): (t<_>, option<_>, t<_>) => {
-  let {N.left: l, key: v, value: d, right: r} = n
-  if x == v {
-    (l, Some(d), r)
-  } else if x < v {
-    switch l {
-    | None => (None, None, Some(n))
-    | Some(l) =>
-      let (ll, pres, rl) = splitAux(x, l)
-      (ll, pres, N.join(rl, v, d, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None, None)
-    | Some(r) =>
-      let (lr, pres, rr) = splitAux(x, r)
-      (N.join(l, v, d, lr), pres, rr)
-    }
-  }
-}
-
-let split = (x: key, n) =>
-  switch n {
-  | None => (None, None, None)
-  | Some(n) => splitAux(x, n)
-  }
-
-let rec mergeU = (s1, s2, f) =>
-  switch (s1, s2) {
-  | (None, None) => None
-  | (Some(n) /* (Node (l1, v1, d1, r1, h1), _) */, _)
-    if n.N.height >=
-    switch s2 {
-    | None => 0
-    | Some(n) => n.N.height
-    } =>
-    let {N.left: l1, key: v1, value: d1, right: r1} = n
-    let (l2, d2, r2) = split(v1, s2)
-    N.concatOrJoin(mergeU(l1, l2, f), v1, f(. v1, Some(d1), d2), mergeU(r1, r2, f))
-  | (_, Some(n)) /* Node (l2, v2, d2, r2, h2) */ =>
-    let {N.left: l2, key: v2, value: d2, right: r2} = n
-    let (l1, d1, r1) = split(v2, s1)
-    N.concatOrJoin(mergeU(l1, l2, f), v2, f(. v2, d1, Some(d2)), mergeU(r1, r2, f))
-  | _ => assert(false)
-  }
-
-let merge = (s1, s2, f) => mergeU(s1, s2, (. a, b, c) => f(a, b, c))
-
-let rec compareAux = (e1, e2, vcmp) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    let c = Pervasives.compare((h1.N.key: key), h2.N.key)
-    if c == 0 {
-      let cx = vcmp(. h1.N.value, h2.N.value)
-      if cx == 0 {
-        compareAux(N.stackAllLeft(h1.N.right, t1), N.stackAllLeft(h2.N.right, t2), vcmp)
-      } else {
-        cx
-      }
-    } else {
-      c
-    }
-  | (_, _) => 0
-  }
-
-let cmpU = (s1, s2, cmp) => {
-  let (len1, len2) = (N.size(s1), N.size(s2))
-  if len1 == len2 {
-    compareAux(N.stackAllLeft(s1, list{}), N.stackAllLeft(s2, list{}), cmp)
-  } else if len1 < len2 {
-    -1
-  } else {
-    1
-  }
-}
-
-let cmp = (s1, s2, f) => cmpU(s1, s2, (. a, b) => f(a, b))
-
-let rec eqAux = (e1, e2, eq) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    if (h1.N.key: key) == h2.N.key && eq(. h1.N.value, h2.N.value) {
-      eqAux(N.stackAllLeft(h1.N.right, t1), N.stackAllLeft(h2.N.right, t2), eq)
-    } else {
-      false
-    }
-  | (_, _) => true
-  } /* end */
-
-let eqU = (s1, s2, eq) => {
-  let (len1, len2) = (N.size(s1), N.size(s2))
-  if len1 == len2 {
-    eqAux(N.stackAllLeft(s1, list{}), N.stackAllLeft(s2, list{}), eq)
-  } else {
-    false
-  }
-}
-
-let eq = (s1, s2, f) => eqU(s1, s2, (. a, b) => f(a, b))
-
-let rec addMutate = (t: t<_>, x, data): t<_> =>
-  switch t {
-  | None => N.singleton(x, data)
-  | Some(nt) =>
-    let k = nt.N.key
-
-    /* let  c = (Belt_Cmp.getCmpInternal cmp) x k [@bs] in */
-    if x == k {
-      nt.N.key = x
-      nt.value = data
-      Some(nt)
-    } else {
-      let (l, r) = (nt.N.left, nt.N.right)
-      if x < k {
-        let ll = addMutate(l, x, data)
-        nt.left = ll
-      } else {
-        nt.right = addMutate(r, x, data)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let fromArray = (xs: array<(key, _)>) => {
-  let len = A.length(xs)
-  if len == 0 {
-    None
-  } else {
-    let next = ref(S.strictlySortedLengthU(xs, (. (x0, _), (y0, _)) => x0 < y0))
-
-    let result = ref(
-      if next.contents >= 0 {
-        N.fromSortedArrayAux(xs, 0, next.contents)
-      } else {
-        next.contents = -next.contents
-        N.fromSortedArrayRevAux(xs, next.contents - 1, next.contents)
-      },
-    )
-    for i in next.contents to len - 1 {
-      let (k, v) = A.getUnsafe(xs, i)
-      result.contents = addMutate(result.contents, k, v)
-    }
-    result.contents
-  }
-}
diff --git a/jscomp/others/belt_internalMapString.res b/jscomp/others/belt_internalMapString.res
deleted file mode 100644
index e088f69..0000000
--- a/jscomp/others/belt_internalMapString.res
+++ /dev/null
@@ -1,288 +0,0 @@
-@@bs.config({flags: ["-bs-noassertfalse"]})
-
-type key = string
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-module S = Belt_SortArray
-
-type t<'a> = N.t<key, 'a>
-
-let rec add = (t, x: key, data: _) =>
-  switch t {
-  | None => N.singleton(x, data)
-  | Some(n) =>
-    let k = n.N.key
-    if x == k {
-      Some(N.updateValue(n, data))
-    } else {
-      let v = n.N.value
-      if x < k {
-        N.bal(add(n.N.left, x, data), k, v, n.N.right)
-      } else {
-        N.bal(n.N.left, k, v, add(n.N.right, x, data))
-      }
-    }
-  }
-
-let rec get = (n, x: key) =>
-  switch n {
-  | None => None
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      Some(n.N.value)
-    } else {
-      get(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getUndefined = (n, x: key) =>
-  switch n {
-  | None => Js.undefined
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      Js.Undefined.return(n.N.value)
-    } else {
-      getUndefined(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getExn = (n, x: key) =>
-  switch n {
-  | None => raise(Not_found)
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      n.N.value
-    } else {
-      getExn(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getWithDefault = (n, x: key, def) =>
-  switch n {
-  | None => def
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      n.N.value
-    } else {
-      getWithDefault(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-        def,
-      )
-    }
-  }
-
-let rec has = (n, x: key) =>
-  switch n {
-  | None => false
-  | Some(n) /* Node(l, v, d, r, _) */ =>
-    let v = n.N.key
-    x == v ||
-      has(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-  }
-
-let rec remove = (n, x: key) =>
-  switch n {
-  | None => n
-  | Some(n) =>
-    let {N.left: l, key: v, right: r} = n
-    if x == v {
-      switch (l, r) {
-      | (None, _) => r
-      | (_, None) => l
-      | (_, Some(rn)) =>
-        let (kr, vr) = (ref(rn.key), ref(rn.value))
-        let r = N.removeMinAuxWithRef(rn, kr, vr)
-        N.bal(l, kr.contents, vr.contents, r)
-      }
-    } else if x < v {
-      open N
-      bal(remove(l, x), v, n.value, r)
-    } else {
-      open N
-      bal(l, v, n.value, remove(r, x))
-    }
-  }
-
-let rec splitAux = (x: key, n: N.node<_>): (t<_>, option<_>, t<_>) => {
-  let {N.left: l, key: v, value: d, right: r} = n
-  if x == v {
-    (l, Some(d), r)
-  } else if x < v {
-    switch l {
-    | None => (None, None, Some(n))
-    | Some(l) =>
-      let (ll, pres, rl) = splitAux(x, l)
-      (ll, pres, N.join(rl, v, d, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None, None)
-    | Some(r) =>
-      let (lr, pres, rr) = splitAux(x, r)
-      (N.join(l, v, d, lr), pres, rr)
-    }
-  }
-}
-
-let split = (x: key, n) =>
-  switch n {
-  | None => (None, None, None)
-  | Some(n) => splitAux(x, n)
-  }
-
-let rec mergeU = (s1, s2, f) =>
-  switch (s1, s2) {
-  | (None, None) => None
-  | (Some(n) /* (Node (l1, v1, d1, r1, h1), _) */, _)
-    if n.N.height >=
-    switch s2 {
-    | None => 0
-    | Some(n) => n.N.height
-    } =>
-    let {N.left: l1, key: v1, value: d1, right: r1} = n
-    let (l2, d2, r2) = split(v1, s2)
-    N.concatOrJoin(mergeU(l1, l2, f), v1, f(. v1, Some(d1), d2), mergeU(r1, r2, f))
-  | (_, Some(n)) /* Node (l2, v2, d2, r2, h2) */ =>
-    let {N.left: l2, key: v2, value: d2, right: r2} = n
-    let (l1, d1, r1) = split(v2, s1)
-    N.concatOrJoin(mergeU(l1, l2, f), v2, f(. v2, d1, Some(d2)), mergeU(r1, r2, f))
-  | _ => assert(false)
-  }
-
-let merge = (s1, s2, f) => mergeU(s1, s2, (. a, b, c) => f(a, b, c))
-
-let rec compareAux = (e1, e2, vcmp) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    let c = Pervasives.compare((h1.N.key: key), h2.N.key)
-    if c == 0 {
-      let cx = vcmp(. h1.N.value, h2.N.value)
-      if cx == 0 {
-        compareAux(N.stackAllLeft(h1.N.right, t1), N.stackAllLeft(h2.N.right, t2), vcmp)
-      } else {
-        cx
-      }
-    } else {
-      c
-    }
-  | (_, _) => 0
-  }
-
-let cmpU = (s1, s2, cmp) => {
-  let (len1, len2) = (N.size(s1), N.size(s2))
-  if len1 == len2 {
-    compareAux(N.stackAllLeft(s1, list{}), N.stackAllLeft(s2, list{}), cmp)
-  } else if len1 < len2 {
-    -1
-  } else {
-    1
-  }
-}
-
-let cmp = (s1, s2, f) => cmpU(s1, s2, (. a, b) => f(a, b))
-
-let rec eqAux = (e1, e2, eq) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    if (h1.N.key: key) == h2.N.key && eq(. h1.N.value, h2.N.value) {
-      eqAux(N.stackAllLeft(h1.N.right, t1), N.stackAllLeft(h2.N.right, t2), eq)
-    } else {
-      false
-    }
-  | (_, _) => true
-  } /* end */
-
-let eqU = (s1, s2, eq) => {
-  let (len1, len2) = (N.size(s1), N.size(s2))
-  if len1 == len2 {
-    eqAux(N.stackAllLeft(s1, list{}), N.stackAllLeft(s2, list{}), eq)
-  } else {
-    false
-  }
-}
-
-let eq = (s1, s2, f) => eqU(s1, s2, (. a, b) => f(a, b))
-
-let rec addMutate = (t: t<_>, x, data): t<_> =>
-  switch t {
-  | None => N.singleton(x, data)
-  | Some(nt) =>
-    let k = nt.N.key
-
-    /* let  c = (Belt_Cmp.getCmpInternal cmp) x k [@bs] in */
-    if x == k {
-      nt.N.key = x
-      nt.value = data
-      Some(nt)
-    } else {
-      let (l, r) = (nt.N.left, nt.N.right)
-      if x < k {
-        let ll = addMutate(l, x, data)
-        nt.left = ll
-      } else {
-        nt.right = addMutate(r, x, data)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let fromArray = (xs: array<(key, _)>) => {
-  let len = A.length(xs)
-  if len == 0 {
-    None
-  } else {
-    let next = ref(S.strictlySortedLengthU(xs, (. (x0, _), (y0, _)) => x0 < y0))
-
-    let result = ref(
-      if next.contents >= 0 {
-        N.fromSortedArrayAux(xs, 0, next.contents)
-      } else {
-        next.contents = -next.contents
-        N.fromSortedArrayRevAux(xs, next.contents - 1, next.contents)
-      },
-    )
-    for i in next.contents to len - 1 {
-      let (k, v) = A.getUnsafe(xs, i)
-      result.contents = addMutate(result.contents, k, v)
-    }
-    result.contents
-  }
-}
diff --git a/jscomp/others/belt_internalSetBuckets.res b/jscomp/others/belt_internalSetBuckets.res
deleted file mode 100644
index 56fcb8c..0000000
--- a/jscomp/others/belt_internalSetBuckets.res
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/* We do dynamic hashing, and resize the table and rehash the elements
- when buckets become too long. */
-module C = Belt_internalBucketsType
-/* TODO:
-   the current implementation relies on the fact that bucket 
-   empty value is `undefined` in both places,
-   in theory, it can be different 
-
-*/
-type rec bucket<'a> = {
-  mutable key: 'a,
-  mutable next: C.opt<bucket<'a>>,
-}
-and t<'hash, 'eq, 'a> = C.container<'hash, 'eq, bucket<'a>>
-
-module A = Belt_Array
-
-let rec copy = (x: t<_>): t<_> => {
-  hash: x.hash,
-  eq: x.eq,
-  size: x.size,
-  buckets: copyBuckets(x.buckets),
-}
-and copyBuckets = (buckets: array<C.opt<bucket<_>>>) => {
-  let len = A.length(buckets)
-  let newBuckets = A.makeUninitializedUnsafe(len)
-  for i in 0 to len - 1 {
-    A.setUnsafe(newBuckets, i, copyBucket(A.getUnsafe(buckets, i)))
-  }
-  newBuckets
-}
-and copyBucket = c =>
-  switch C.toOpt(c) {
-  | None => c
-  | Some(c) =>
-    let head = {
-      key: c.key,
-      next: C.emptyOpt,
-    }
-    copyAuxCont(c.next, head)
-    C.return(head)
-  }
-and copyAuxCont = (c, prec) =>
-  switch C.toOpt(c) {
-  | None => ()
-  | Some(nc) =>
-    let ncopy = {key: nc.key, next: C.emptyOpt}
-    prec.next = C.return(ncopy)
-    copyAuxCont(nc.next, ncopy)
-  }
-
-let rec bucketLength = (accu, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => accu
-  | Some(cell) => bucketLength(accu + 1, cell.next)
-  }
-
-let rec doBucketIter = (~f, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => ()
-  | Some(cell) =>
-    f(. cell.key)
-    doBucketIter(~f, cell.next)
-  }
-
-let forEachU = (h, f) => {
-  let d = h.C.buckets
-  for i in 0 to A.length(d) - 1 {
-    doBucketIter(~f, A.getUnsafe(d, i))
-  }
-}
-
-let forEach = (h, f) => forEachU(h, (. a) => f(a))
-
-let rec fillArray = (i, arr, cell) => {
-  A.setUnsafe(arr, i, cell.key)
-  switch C.toOpt(cell.next) {
-  | None => i + 1
-  | Some(v) => fillArray(i + 1, arr, v)
-  }
-}
-
-let toArray = h => {
-  let d = h.C.buckets
-  let current = ref(0)
-  let arr = A.makeUninitializedUnsafe(h.C.size)
-  for i in 0 to A.length(d) - 1 {
-    let cell = A.getUnsafe(d, i)
-    switch C.toOpt(cell) {
-    | None => ()
-    | Some(cell) => current.contents = fillArray(current.contents, arr, cell)
-    }
-  }
-  arr
-}
-
-let rec doBucketFold = (~f, b, accu) =>
-  switch C.toOpt(b) {
-  | None => accu
-  | Some(cell) => doBucketFold(~f, cell.next, f(. accu, cell.key))
-  }
-
-let reduceU = (h, init, f) => {
-  let d = h.C.buckets
-  let accu = ref(init)
-  for i in 0 to A.length(d) - 1 {
-    accu.contents = doBucketFold(~f, A.getUnsafe(d, i), accu.contents)
-  }
-  accu.contents
-}
-
-let reduce = (h, init, f) => reduceU(h, init, (. a, b) => f(a, b))
-
-let getMaxBucketLength = h =>
-  A.reduceU(h.C.buckets, 0, (. m, b) => {
-    let len = bucketLength(0, b)
-    Pervasives.max(m, len)
-  })
-
-let getBucketHistogram = h => {
-  let mbl = getMaxBucketLength(h)
-  let histo = A.makeByU(mbl + 1, (. _) => 0)
-  A.forEachU(h.C.buckets, (. b) => {
-    let l = bucketLength(0, b)
-    A.setUnsafe(histo, l, A.getUnsafe(histo, l) + 1)
-  })
-  histo
-}
-
-let logStats = h => {
-  let histogram = getBucketHistogram(h)
-  Js.log({
-    "bindings": h.C.size,
-    "buckets": A.length(h.C.buckets),
-    "histogram": histogram,
-  })
-}
diff --git a/jscomp/others/belt_internalSetBuckets.resi b/jscomp/others/belt_internalSetBuckets.resi
deleted file mode 100644
index bd71b16..0000000
--- a/jscomp/others/belt_internalSetBuckets.resi
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (C) 2018 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module C = Belt_internalBucketsType
-
-type rec bucket<'a> = {
-  mutable key: 'a,
-  mutable next: C.opt<bucket<'a>>,
-}
-and t<'hash, 'eq, 'a> = C.container<'hash, 'eq, bucket<'a>>
-
-let copy: t<'hash, 'eq, 'a> => t<'hash, 'eq, 'a>
-
-let forEachU: (t<'hash, 'eq, 'a>, (. 'a) => unit) => unit
-let forEach: (t<'hash, 'eq, 'a>, 'a => unit) => unit
-let fillArray: (int, array<'a>, bucket<'a>) => int
-
-let toArray: t<_, _, 'a> => array<'a>
-
-let reduceU: (t<_, _, 'a>, 'b, (. 'b, 'a) => 'b) => 'b
-let reduce: (t<_, _, 'a>, 'b, ('b, 'a) => 'b) => 'b
-
-let logStats: t<_> => unit
-
-let getBucketHistogram: t<_> => array<int>
diff --git a/jscomp/others/belt_internalSetInt.res b/jscomp/others/belt_internalSetInt.res
deleted file mode 100644
index 676e955..0000000
--- a/jscomp/others/belt_internalSetInt.res
+++ /dev/null
@@ -1,164 +0,0 @@
-type value = int
-module S = Belt_SortArrayInt
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-
-type t = N.t<value>
-
-let rec has = (t: t, x: value) =>
-  switch t {
-  | None => false
-  | Some(n) =>
-    let v = n.value
-    x == v ||
-      has(
-        if x < v {
-          n.left
-        } else {
-          n.right
-        },
-        x,
-      )
-  }
-
-let rec compareAux = (e1, e2) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    let (k1: value, k2) = (h1.N.value, h2.N.value)
-    if k1 == k2 {
-      compareAux(N.stackAllLeft(h1.right, t1), N.stackAllLeft(h2.right, t2))
-    } else if k1 < k2 {
-      -1
-    } else {
-      1
-    }
-  | (_, _) => 0
-  }
-
-let cmp = (s1, s2) => {
-  let (len1, len2) = (N.size(s1), N.size(s2))
-  if len1 == len2 {
-    compareAux(N.stackAllLeft(s1, list{}), N.stackAllLeft(s2, list{}))
-  } else if len1 < len2 {
-    -1
-  } else {
-    1
-  }
-}
-
-let eq = (s1: t, s2) => cmp(s1, s2) == 0
-
-/* This algorithm applies to BST, it does not need to be balanced tree */
-let rec subset = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) => true
-  | (_, None) => false
-  | (Some(t1), Some(t2)) /* Node (l1, v1, r1, _), (Node (l2, v2, r2, _) as t2) */ =>
-    let {N.left: l1, value: v1, right: r1} = t1
-    let {N.left: l2, value: v2, right: r2} = t2
-    if v1 == v2 {
-      subset(l1, l2) && subset(r1, r2)
-    } else if v1 < v2 {
-      subset(N.create(l1, v1, None), l2) && subset(r1, s2)
-    } else {
-      subset(N.create(None, v1, r1), r2) && subset(l1, s2)
-    }
-  }
-
-let rec get = (n: t, x: value) =>
-  switch n {
-  | None => None
-  | Some(t) =>
-    let v = t.value
-    if x == v {
-      Some(v)
-    } else {
-      get(
-        if x < v {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getUndefined = (n: t, x: value) =>
-  switch n {
-  | None => Js.undefined
-  | Some(t) =>
-    let v = t.value
-    if x == v {
-      Js.Undefined.return(v)
-    } else {
-      getUndefined(
-        if x < v {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getExn = (n: t, x: value) =>
-  switch n {
-  | None => raise(Not_found)
-  | Some(t) =>
-    let v = t.value
-    if x == v {
-      v
-    } else {
-      getExn(
-        if x < v {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-/* ************************************************************************** */
-let rec addMutate = (t, x: value) =>
-  switch t {
-  | None => N.singleton(x)
-  | Some(nt) =>
-    let k = nt.N.value
-    if x == k {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < k {
-        nt.left = addMutate(l, x)
-      } else {
-        nt.right = addMutate(r, x)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let fromArray = (xs: array<value>) => {
-  let len = A.length(xs)
-  if len == 0 {
-    None
-  } else {
-    let next = ref(S.strictlySortedLength(xs))
-    let result = ref(
-      if next.contents >= 0 {
-        N.fromSortedArrayAux(xs, 0, next.contents)
-      } else {
-        next.contents = -next.contents
-        N.fromSortedArrayRevAux(xs, next.contents - 1, next.contents)
-      },
-    )
-    for i in next.contents to len - 1 {
-      result.contents = addMutate(result.contents, A.getUnsafe(xs, i))
-    }
-    result.contents
-  }
-}
diff --git a/jscomp/others/belt_internalSetString.res b/jscomp/others/belt_internalSetString.res
deleted file mode 100644
index ef38792..0000000
--- a/jscomp/others/belt_internalSetString.res
+++ /dev/null
@@ -1,164 +0,0 @@
-type value = string
-module S = Belt_SortArrayString
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-
-type t = N.t<value>
-
-let rec has = (t: t, x: value) =>
-  switch t {
-  | None => false
-  | Some(n) =>
-    let v = n.value
-    x == v ||
-      has(
-        if x < v {
-          n.left
-        } else {
-          n.right
-        },
-        x,
-      )
-  }
-
-let rec compareAux = (e1, e2) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    let (k1: value, k2) = (h1.N.value, h2.N.value)
-    if k1 == k2 {
-      compareAux(N.stackAllLeft(h1.right, t1), N.stackAllLeft(h2.right, t2))
-    } else if k1 < k2 {
-      -1
-    } else {
-      1
-    }
-  | (_, _) => 0
-  }
-
-let cmp = (s1, s2) => {
-  let (len1, len2) = (N.size(s1), N.size(s2))
-  if len1 == len2 {
-    compareAux(N.stackAllLeft(s1, list{}), N.stackAllLeft(s2, list{}))
-  } else if len1 < len2 {
-    -1
-  } else {
-    1
-  }
-}
-
-let eq = (s1: t, s2) => cmp(s1, s2) == 0
-
-/* This algorithm applies to BST, it does not need to be balanced tree */
-let rec subset = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) => true
-  | (_, None) => false
-  | (Some(t1), Some(t2)) /* Node (l1, v1, r1, _), (Node (l2, v2, r2, _) as t2) */ =>
-    let {N.left: l1, value: v1, right: r1} = t1
-    let {N.left: l2, value: v2, right: r2} = t2
-    if v1 == v2 {
-      subset(l1, l2) && subset(r1, r2)
-    } else if v1 < v2 {
-      subset(N.create(l1, v1, None), l2) && subset(r1, s2)
-    } else {
-      subset(N.create(None, v1, r1), r2) && subset(l1, s2)
-    }
-  }
-
-let rec get = (n: t, x: value) =>
-  switch n {
-  | None => None
-  | Some(t) =>
-    let v = t.value
-    if x == v {
-      Some(v)
-    } else {
-      get(
-        if x < v {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getUndefined = (n: t, x: value) =>
-  switch n {
-  | None => Js.undefined
-  | Some(t) =>
-    let v = t.value
-    if x == v {
-      Js.Undefined.return(v)
-    } else {
-      getUndefined(
-        if x < v {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getExn = (n: t, x: value) =>
-  switch n {
-  | None => raise(Not_found)
-  | Some(t) =>
-    let v = t.value
-    if x == v {
-      v
-    } else {
-      getExn(
-        if x < v {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-/* ************************************************************************** */
-let rec addMutate = (t, x: value) =>
-  switch t {
-  | None => N.singleton(x)
-  | Some(nt) =>
-    let k = nt.N.value
-    if x == k {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < k {
-        nt.left = addMutate(l, x)
-      } else {
-        nt.right = addMutate(r, x)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let fromArray = (xs: array<value>) => {
-  let len = A.length(xs)
-  if len == 0 {
-    None
-  } else {
-    let next = ref(S.strictlySortedLength(xs))
-    let result = ref(
-      if next.contents >= 0 {
-        N.fromSortedArrayAux(xs, 0, next.contents)
-      } else {
-        next.contents = -next.contents
-        N.fromSortedArrayRevAux(xs, next.contents - 1, next.contents)
-      },
-    )
-    for i in next.contents to len - 1 {
-      result.contents = addMutate(result.contents, A.getUnsafe(xs, i))
-    }
-    result.contents
-  }
-}
diff --git a/jscomp/others/belt_internals.resi b/jscomp/others/belt_internals.resi
deleted file mode 100644
index 2325c1e..0000000
--- a/jscomp/others/belt_internals.resi
+++ /dev/null
@@ -1,68 +0,0 @@
-// Since [others] depend on this file, its public mli files **should not
-// export types** introduced here, otherwise it would cause
-// conflicts here.
-//
-// If the type exported here is also exported in modules from others,
-// you will get a type not equivalent.
-//
-// Types defined here but should not export:
-// - ref (make sure not exported in public others/*.mli)
-
-external \"^": (string, string) => string = "#string_append"
-external \"=": ('a, 'a) => bool = "%equal"
-external \"<>": ('a, 'a) => bool = "%notequal"
-external \"==": ('a, 'a) => bool = "%eq"
-external \"!=": ('a, 'a) => bool = "%noteq"
-external \"<": ('a, 'a) => bool = "%lessthan"
-external \">": ('a, 'a) => bool = "%greaterthan"
-external \"<=": ('a, 'a) => bool = "%lessequal"
-external \">=": ('a, 'a) => bool = "%greaterequal"
-external \"+": (int, int) => int = "%addint"
-external \"-": (int, int) => int = "%subint"
-external \"~-": int => int = "%negint"
-external \"*": (int, int) => int = "%mulint"
-external \"/": (int, int) => int = "%divint"
-external lsl: (int, int) => int = "%lslint"
-external lor: (int, int) => int = "%orint"
-external land: (int, int) => int = "%andint"
-external mod: (int, int) => int = "%modint"
-external lsr: (int, int) => int = "%lsrint"
-external lxor: (int, int) => int = "%xorint"
-external asr: (int, int) => int = "%asrint"
-type ref<'a> = {mutable contents: 'a}
-external ref: 'a => ref<'a> = "%makemutable"
-
-external \"||": (bool, bool) => bool = "%sequor"
-external \"&&": (bool, bool) => bool = "%sequand"
-external not: bool => bool = "%boolnot"
-
-external raise: exn => 'a = "%raise"
-external ignore: 'a => unit = "%ignore"
-external \"|>": ('a, 'a => 'b) => 'b = "%revapply"
-external \"@@": ('a => 'b, 'a) => 'b = "%apply"
-
-@val @scope("Math") external \"**": (float, float) => float = "pow"
-external \"~-.": float => float = "%negfloat"
-external \"+.": (float, float) => float = "%addfloat"
-external \"-.": (float, float) => float = "%subfloat"
-external \"*.": (float, float) => float = "%mulfloat"
-external \"/.": (float, float) => float = "%divfloat"
-
-module Obj: {
-  type t
-  external field: (t, int) => t = "%obj_field"
-  external set_field: (t, int, t) => unit = "%obj_set_field"
-  external tag: t => int = "?obj_tag"
-  external repr: 'a => t = "%identity"
-  external obj: t => 'a = "%identity"
-  external magic: 'a => 'b = "%identity"
-  external size: t => int = "#obj_length"
-}
-
-module Pervasives: {
-  external compare: ('a, 'a) => int = "%compare"
-  external not: bool => bool = "%boolnot"
-  external min: ('a, 'a) => 'a = "%bs_min"
-  external max: ('a, 'a) => 'a = "%bs_max"
-  external \"=": ('a, 'a) => bool = "%equal"
-}
diff --git a/jscomp/others/dom.res b/jscomp/others/dom.res
deleted file mode 100644
index 3667459..0000000
--- a/jscomp/others/dom.res
+++ /dev/null
@@ -1,295 +0,0 @@
-type _baseClass
-
-type animation /* Web Animations API */
-
-/* TODO: Should we bother with this indirection?
-(* core *)
-type domString = string
-type domTimestamp = float
-*/
-
-/* css */
-type cssStyleDeclaration
-type cssStyleSheet
-
-/* events (early) */
-type eventTarget_like<'a>
-type eventTarget = eventTarget_like<_baseClass>
-
-/* nodes */
-type _node<'a>
-type node_like<'a> = eventTarget_like<_node<'a>>
-type node = node_like<_baseClass>
-type _attr
-type attr = node_like<_attr>
-type _characterData<'a>
-type characterData_like<'a> = node_like<_characterData<'a>>
-type characterData = characterData_like<_baseClass>
-type _cdataSection
-type cdataSection = characterData_like<_cdataSection>
-type _comment
-type comment = characterData_like<_comment>
-type _document<'a>
-type document_like<'a> = node_like<_document<'a>>
-type document = document_like<_baseClass>
-type _documentFragment
-type documentFragment = node_like<_documentFragment>
-type _documentType
-type documentType = node_like<_documentType>
-type domImplementation
-type _element<'a>
-type element_like<'a> = node_like<_element<'a>>
-type element = element_like<_baseClass>
-type htmlCollection
-type htmlFormControlsCollection
-type htmlOptionsCollection
-type intersectionObserver
-type intersectionObserverEntry
-type mutationObserver
-type mutationRecord
-type performanceObserver
-type performanceObserverEntryList
-type reportingObserver
-type reportingObserverOptions
-type resizeObserver
-type resizeObserverEntry
-type namedNodeMap
-type nodeList
-type radioNodeList
-type processingInstruction
-type _shadowRoot
-type shadowRoot = node_like<_shadowRoot>
-type _text
-type text = characterData_like<_text>
-
-/* geometry */
-type domRect
-
-/* html */
-type dataTransfer /* Drag and Drop API */
-type domStringMap
-type history
-type _htmlDocument
-type htmlDocument = document_like<_htmlDocument>
-type _htmlElement<'a>
-type htmlElement_like<'a> = element_like<_htmlElement<'a>>
-type htmlElement = htmlElement_like<_baseClass>
-type _htmlAnchorElement
-type htmlAnchorElement = htmlElement_like<_htmlAnchorElement>
-type _htmlAreaElement
-type htmlAreaElement = htmlElement_like<_htmlAreaElement>
-type _htmlAudioElement
-type htmlAudioElement = htmlElement_like<_htmlAudioElement>
-type _htmlBaseElement
-type htmlBaseElement = htmlElement_like<_htmlBaseElement>
-type _htmlBodyElement
-type htmlBodyElement = htmlElement_like<_htmlBodyElement>
-type _htmlBrElement
-type htmlBrElement = htmlElement_like<_htmlBrElement>
-type _htmlButtonElement
-type htmlButtonElement = htmlElement_like<_htmlButtonElement>
-type _htmlCanvasElement
-type htmlCanvasElement = htmlElement_like<_htmlCanvasElement>
-type _htmlDataElement
-type htmlDataElement = htmlElement_like<_htmlDataElement>
-type _htmlDataListElement
-type htmlDataListElement = htmlElement_like<_htmlDataListElement>
-type _htmlDialogElement
-type htmlDialogElement = htmlElement_like<_htmlDialogElement>
-type _htmlDivElement
-type htmlDivElement = htmlElement_like<_htmlDivElement>
-type _htmlDlistElement
-type htmlDlistElement = htmlElement_like<_htmlDlistElement>
-type _htmlEmbedElement
-type htmlEmbedElement = htmlElement_like<_htmlEmbedElement>
-type _htmlFieldSetElement
-type htmlFieldSetElement = htmlElement_like<_htmlFieldSetElement>
-type _htmlFormElement
-type htmlFormElement = htmlElement_like<_htmlFormElement>
-type _htmlHeadElement
-type htmlHeadElement = htmlElement_like<_htmlHeadElement>
-type _htmlHeadingElement
-type htmlHeadingElement = htmlElement_like<_htmlHeadingElement>
-type _htmlHrElement
-type htmlHrElement = htmlElement_like<_htmlHrElement>
-type _htmlHtmlElement
-type htmlHtmlElement = htmlElement_like<_htmlHtmlElement>
-type _htmlIframeElement
-type htmlIframeElement = htmlElement_like<_htmlIframeElement>
-type _htmlImageElement
-type htmlImageElement = htmlElement_like<_htmlImageElement>
-type _htmlInputElement
-type htmlInputElement = htmlElement_like<_htmlInputElement>
-type _htmlLabelElement
-type htmlLabelElement = htmlElement_like<_htmlLabelElement>
-type _htmlLegendElement
-type htmlLegendElement = htmlElement_like<_htmlLegendElement>
-type _htmlLiElement
-type htmlLiElement = htmlElement_like<_htmlLiElement>
-type _htmlLinkElement
-type htmlLinkElement = htmlElement_like<_htmlLinkElement>
-type _htmlMapElement
-type htmlMapElement = htmlElement_like<_htmlMapElement>
-type _htmlMediaElement
-type htmlMediaElement = htmlElement_like<_htmlMediaElement>
-type _htmlMenuElement
-type htmlMenuElement = htmlElement_like<_htmlMenuElement>
-type _htmlMetaElement
-type htmlMetaElement = htmlElement_like<_htmlMetaElement>
-type _htmlMeterElement
-type htmlMeterElement = htmlElement_like<_htmlMeterElement>
-type _htmlModElement
-type htmlModElement = htmlElement_like<_htmlModElement>
-type _htmlOListElement
-type htmlOListElement = htmlElement_like<_htmlOListElement>
-type _htmlObjectElement
-type htmlObjectElement = htmlElement_like<_htmlObjectElement>
-type _htmlOptGroupElement
-type htmlOptGroupElement = htmlElement_like<_htmlOptGroupElement>
-type _htmlOptionElement
-type htmlOptionElement = htmlElement_like<_htmlOptionElement>
-type _htmlOutputElement
-type htmlOutputElement = htmlElement_like<_htmlOutputElement>
-type _htmlParagraphElement
-type htmlParagraphElement = htmlElement_like<_htmlParagraphElement>
-type _htmlParamElement
-type htmlParamElement = htmlElement_like<_htmlParamElement>
-type _htmlPreElement
-type htmlPreElement = htmlElement_like<_htmlPreElement>
-type _htmlProgressElement
-type htmlProgressElement = htmlElement_like<_htmlProgressElement>
-type _htmlQuoteElement
-type htmlQuoteElement = htmlElement_like<_htmlQuoteElement>
-type _htmlScriptElement
-type htmlScriptElement = htmlElement_like<_htmlScriptElement>
-type _htmlSelectElement
-type htmlSelectElement = htmlElement_like<_htmlSelectElement>
-type _htmlSlotElement
-type htmlSlotElement = htmlElement_like<_htmlSlotElement>
-type _htmlSourceElement
-type htmlSourceElement = htmlElement_like<_htmlSourceElement>
-type _htmlSpanElement
-type htmlSpanElement = htmlElement_like<_htmlSpanElement>
-type _htmlStyleElement
-type htmlStyleElement = htmlElement_like<_htmlStyleElement>
-type _htmlTableCaptionElement
-type htmlTableCaptionElement = htmlElement_like<_htmlTableCaptionElement>
-type _htmlTableCellElement
-type htmlTableCellElement = htmlElement_like<_htmlTableCellElement>
-type _htmlTableColElement
-type htmlTableColElement = htmlElement_like<_htmlTableColElement>
-type _htmlTableDataCellElement
-type htmlTableDataCellElement = htmlElement_like<_htmlTableDataCellElement>
-type _htmlTableElement
-type htmlTableElement = htmlElement_like<_htmlTableElement>
-type _htmlTableHeaderCellElement
-type htmlTableHeaderCellElement = htmlElement_like<_htmlTableHeaderCellElement>
-type _htmlTableRowElement
-type htmlTableRowElement = htmlElement_like<_htmlTableRowElement>
-type _htmlTableSectionElement
-type htmlTableSectionElement = htmlElement_like<_htmlTableSectionElement>
-type _htmlTextAreaElement
-type htmlTextAreaElement = htmlElement_like<_htmlTextAreaElement>
-type _htmlTimeElement
-type htmlTimeElement = htmlElement_like<_htmlTimeElement>
-type _htmlTitleElement
-type htmlTitleElement = htmlElement_like<_htmlTitleElement>
-type _htmlTrackElement
-type htmlTrackElement = htmlElement_like<_htmlTrackElement>
-type _htmlUlistElement
-type htmlUlistElement = htmlElement_like<_htmlUlistElement>
-type _htmlUnknownElement
-type htmlUnknownElement = htmlElement_like<_htmlUnknownElement>
-type _htmlVideoElement
-type htmlVideoElement = htmlElement_like<_htmlVideoElement>
-type location
-type window
-type _xmlDocument
-type xmlDocument = document_like<_xmlDocument>
-
-/* events */
-type event_like<'a>
-type event = event_like<_baseClass>
-type _uiEvent<'a>
-type uiEvent_like<'a> = event_like<_uiEvent<'a>>
-type uiEvent = uiEvent_like<_baseClass>
-type _animationEvent
-type animationEvent = event_like<_animationEvent>
-type _beforeUnloadEvent
-type beforeUnloadEvent = event_like<_beforeUnloadEvent>
-type _clipboardEvent
-type clipboardEvent = event_like<_clipboardEvent>
-type _closeEvent
-type closeEvent = event_like<_closeEvent>
-type _compositionEvent
-type compositionEvent = uiEvent_like<_compositionEvent>
-type _customEvent
-type customEvent = event_like<_customEvent>
-type _dragEvent
-type dragEvent = event_like<_dragEvent>
-type _errorEvent
-type errorEvent = event_like<_errorEvent>
-type _focusEvent
-type focusEvent = uiEvent_like<_focusEvent>
-type _idbVersionChangeEvent
-type idbVersionChangeEvent = event_like<_idbVersionChangeEvent>
-type _inputEvent
-type inputEvent = uiEvent_like<_inputEvent>
-type _keyboardEvent
-type keyboardEvent = uiEvent_like<_keyboardEvent>
-type _mouseEvent<'a>
-type mouseEvent_like<'a> = uiEvent_like<_mouseEvent<'a>>
-type mouseEvent = mouseEvent_like<_baseClass>
-type _pageTransitionEvent
-type pageTransitionEvent = event_like<_pageTransitionEvent>
-type _pointerEvent
-type pointerEvent = mouseEvent_like<_pointerEvent>
-type _popStateEvent
-type popStateEvent = event_like<_popStateEvent>
-type _progressEvent
-type progressEvent = event_like<_progressEvent>
-type _relatedEvent
-type relatedEvent = event_like<_relatedEvent>
-type _storageEvent
-type storageEvent = event_like<_storageEvent>
-type _svgZoomEvent
-type svgZoomEvent = event_like<_svgZoomEvent>
-type _timeEvent
-type timeEvent = event_like<_timeEvent>
-type _touchEvent
-type touchEvent = uiEvent_like<_touchEvent>
-type _trackEvent
-type trackEvent = event_like<_trackEvent>
-type _transitionEvent
-type transitionEvent = event_like<_transitionEvent>
-type _webGlContextEvent
-type webGlContextEvent = event_like<_webGlContextEvent>
-type _wheelEvent
-type wheelEvent = uiEvent_like<_wheelEvent>
-
-/* ranges */
-type range
-
-/* selection (TODO: move out of dom?) */
-type selection
-
-/* sets */
-type domTokenList
-type domSettableTokenList
-
-/* traversal */
-type nodeFilter = {
-  acceptNode: element => int /* return type should be NodeFilter.action, but that would create a cycle */,
-}
-type nodeIterator
-type treeWalker
-
-/* SVG */
-type svgRect
-type svgPoint
-
-/* special */
-type eventPointerId
-
-module Storage = Dom_storage
-module Storage2 = Dom_storage2
diff --git a/jscomp/others/dom_storage.res b/jscomp/others/dom_storage.res
deleted file mode 100644
index 7f1f0bc..0000000
--- a/jscomp/others/dom_storage.res
+++ /dev/null
@@ -1,22 +0,0 @@
-type t = Dom_storage2.t
-
-@send @return(null_to_opt) external getItem: (t, string) => option<string> = "getItem"
-let getItem = (s, obj) => obj->getItem(s)
-/* https://developer.mozilla.org/en-US/docs/Web/API/Storage/getItem 
-  If the key does not exist, `null` is returned
-*/
-
-@send external setItem: (t, string, string) => unit = "setItem"
-let setItem = (k, v, obj): unit => obj->setItem(k, v)
-@send external removeItem: (t, string) => unit = "removeItem"
-let removeItem = (s, obj): unit => obj->removeItem(s)
-@send external clear: t => unit = "clear"
-@send @return(null_to_opt) external key: (t, int) => option<string> = "key"
-/* A DOMString containing the name of the key. If the index does not exist, null is returned.
-  If the key does not exist, `null` is returned
-*/
-let key = (i, obj): option<string> => obj->key(i)
-@get external length: t => int = "length"
-
-@val external localStorage: t = "localStorage"
-@val external sessionStorage: t = "sessionStorage"
diff --git a/jscomp/others/dom_storage2.res b/jscomp/others/dom_storage2.res
deleted file mode 100644
index 33a0fc4..0000000
--- a/jscomp/others/dom_storage2.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type t
-
-@send @return(null_to_opt) external getItem: (t, string) => option<string> = "getItem"
-@send external setItem: (t, string, string) => unit = "setItem"
-@send external removeItem: (t, string) => unit = "removeItem"
-@send external clear: t => unit = "clear"
-@send @return(null_to_opt) external key: (t, int) => option<string> = "key"
-@get external length: t => int = "length"
-
-@val external localStorage: t = "localStorage"
-@val external sessionStorage: t = "sessionStorage"
diff --git a/jscomp/others/hashmap.cppo.res b/jscomp/others/hashmap.cppo.res
deleted file mode 100644
index e5de8ed..0000000
--- a/jscomp/others/hashmap.cppo.res
+++ /dev/null
@@ -1,225 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-/* Adapted by Hongbo Zhang, Authors of ReScript 2017 */
-
-#ifdef TYPE_STRING
-type key = string
-type seed = int
-external caml_hash_mix_string: (seed, string) => seed = "?hash_mix_string"
-external final_mix: seed => seed = "?hash_final_mix"
-let hash = (s: key) => final_mix(caml_hash_mix_string(0, s))
-#elif defined TYPE_INT
-type key = int
-type seed = int
-external caml_hash_mix_int: (seed, int) => seed = "?hash_mix_int"
-external final_mix: seed => seed = "?hash_final_mix"
-let hash = (s: key) => final_mix(caml_hash_mix_int(0, s))
-#else
-[%error "unknown type"]
-#endif
-
-module N = Belt_internalBuckets
-module C = Belt_internalBucketsType
-module A = Belt_Array
-
-type t<'b> = N.t<unit, unit, key, 'b>
-
-let rec copyBucketReHash = (~h_buckets, ~ndata_tail, old_bucket: C.opt<N.bucket<_>>) =>
-  switch C.toOpt(old_bucket) {
-  | None => ()
-  | Some(cell) =>
-    let nidx = land(hash(cell.key), A.length(h_buckets) - 1)
-    let v = C.return(cell)
-    switch C.toOpt(A.getUnsafe(ndata_tail, nidx)) {
-    | None => A.setUnsafe(h_buckets, nidx, v)
-    | Some(tail) => tail.N.next = v /* cell put at the end */
-    }
-    A.setUnsafe(ndata_tail, nidx, v)
-    copyBucketReHash(~h_buckets, ~ndata_tail, cell.next)
-  }
-
-let resize = h => {
-  let odata = h.C.buckets
-  let osize = A.length(odata)
-  let nsize = osize * 2
-  if nsize >= osize {
-    /* no overflow */
-    let h_buckets = A.makeUninitialized(nsize)
-    let ndata_tail = A.makeUninitialized(nsize) /* keep track of tail */
-    h.C.buckets = h_buckets /* so that indexfun sees the new bucket count */
-    for i in 0 to osize - 1 {
-      copyBucketReHash(~h_buckets, ~ndata_tail, A.getUnsafe(odata, i))
-    }
-    for i in 0 to nsize - 1 {
-      switch C.toOpt(A.getUnsafe(ndata_tail, i)) {
-      | None => ()
-      | Some(tail) => tail.next = C.emptyOpt
-      }
-    }
-  }
-}
-
-let rec replaceInBucket = (key: key, info, cell) =>
-  if cell.N.key == key {
-    cell.N.value = info
-    false
-  } else {
-    switch C.toOpt(cell.next) {
-    | None => true
-    | Some(cell) => replaceInBucket(key, info, cell)
-    }
-  }
-
-let set = (h, key: key, value) => {
-  let h_buckets = h.C.buckets
-  let buckets_len = A.length(h_buckets)
-  let i = land(hash(key), buckets_len - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None =>
-    A.setUnsafe(h_buckets, i, C.return({N.key, value, next: C.emptyOpt}))
-    h.C.size = h.C.size + 1
-  | Some(bucket) =>
-    if replaceInBucket(key, value, bucket) {
-      A.setUnsafe(h_buckets, i, C.return({N.key, value, next: l}))
-      h.C.size = h.C.size + 1
-    }
-  }
-  if h.C.size > lsl(buckets_len, 1) {
-    resize(h)
-  }
-}
-
-let rec removeInBucket = (h, h_buckets, i, key: key, prec, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => ()
-  | Some(cell) =>
-    let cell_next = cell.N.next
-    if cell.N.key == key {
-      prec.N.next = cell_next
-      h.C.size = h.C.size - 1
-    } else {
-      removeInBucket(h, h_buckets, i, key, cell, cell_next)
-    }
-  }
-
-let remove = (h, key) => {
-  let h_buckets = h.C.buckets
-  let i = land(hash(key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(bucket) {
-  | None => ()
-  | Some(cell) =>
-    if cell.N.key == key {
-      A.setUnsafe(h_buckets, i, cell.next)
-      h.C.size = h.C.size - 1
-    } else {
-      removeInBucket(h, h_buckets, i, key, cell, cell.next)
-    }
-  }
-}
-
-let rec getAux = (key: key, buckets) =>
-  switch C.toOpt(buckets) {
-  | None => None
-  | Some(cell) =>
-    if key == cell.N.key {
-      Some(cell.N.value)
-    } else {
-      getAux(key, cell.next)
-    }
-  }
-
-let get = (h, key: key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(hash(key), A.length(h_buckets) - 1)
-  switch C.toOpt(A.getUnsafe(h_buckets, nid)) {
-  | None => None
-  | Some(cell1) =>
-    if key == cell1.N.key {
-      Some(cell1.N.value)
-    } else {
-      switch C.toOpt(cell1.N.next) {
-      | None => None
-      | Some(cell2) =>
-        if key == cell2.N.key {
-          Some(cell2.N.value)
-        } else {
-          switch C.toOpt(cell2.N.next) {
-          | None => None
-          | Some(cell3) =>
-            if key == cell3.N.key {
-              Some(cell3.N.value)
-            } else {
-              getAux(key, cell3.N.next)
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-let rec memInBucket = (key: key, cell) =>
-  cell.N.key == key ||
-    switch C.toOpt(cell.next) {
-    | None => false
-    | Some(nextCell) => memInBucket(key, nextCell)
-    }
-
-let has = (h, key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(hash(key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, nid)
-  switch C.toOpt(bucket) {
-  | None => false
-  | Some(bucket) => memInBucket(key, bucket)
-  }
-}
-
-let make = (~hintSize) => C.make(~hintSize, ~hash=(), ~eq=())
-let clear = C.clear
-let size = h => h.C.size
-let forEachU = N.forEachU
-let forEach = N.forEach
-let reduceU = N.reduceU
-let reduce = N.reduce
-let logStats = N.logStats
-let keepMapInPlaceU = N.keepMapInPlaceU
-let keepMapInPlace = N.keepMapInPlace
-let toArray = N.toArray
-let copy = N.copy
-let keysToArray = N.keysToArray
-let valuesToArray = N.valuesToArray
-let getBucketHistogram = N.getBucketHistogram
-let isEmpty = C.isEmpty
-
-let fromArray = arr => {
-  let len = A.length(arr)
-  let v = make(~hintSize=len)
-  for i in 0 to len - 1 {
-    let (k, value) = A.getUnsafe(arr, i)
-    set(v, k, value)
-  }
-  v
-}
-
-/* TOOD: optimize heuristics for resizing */
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  for i in 0 to len - 1 {
-    let (k, v) = A.getUnsafe(arr, i)
-    set(h, k, v)
-  }
-}
diff --git a/jscomp/others/hashmap.cppo.resi b/jscomp/others/hashmap.cppo.resi
deleted file mode 100644
index a6ce4e6..0000000
--- a/jscomp/others/hashmap.cppo.resi
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifdef TYPE_STRING
-type key = string
-#elif defined TYPE_INT
-type key = int
-#else
-[%error "unknown type"]
-#endif
-
-type t<'b>
-
-let make: (~hintSize: int) => t<'b>
-
-let clear: t<'b> => unit
-
-let isEmpty: t<_> => bool
-
-/**
-`setDone(tbl, k, v)` if `k` does not exist, add the binding `k,v`, otherwise,
-update the old value with the new `v`
-*/
-let set: (t<'a>, key, 'a) => unit
-
-let copy: t<'a> => t<'a>
-let get: (t<'a>, key) => option<'a>
-
-let has: (t<'b>, key) => bool
-
-let remove: (t<'a>, key) => unit
-
-let forEachU: (t<'b>, (. key, 'b) => unit) => unit
-let forEach: (t<'b>, (key, 'b) => unit) => unit
-
-let reduceU: (t<'b>, 'c, (. 'c, key, 'b) => 'c) => 'c
-let reduce: (t<'b>, 'c, ('c, key, 'b) => 'c) => 'c
-
-let keepMapInPlaceU: (t<'a>, (. key, 'a) => option<'a>) => unit
-let keepMapInPlace: (t<'a>, (key, 'a) => option<'a>) => unit
-
-let size: t<_> => int
-
-let toArray: t<'a> => array<(key, 'a)>
-let keysToArray: t<'a> => array<key>
-let valuesToArray: t<'a> => array<'a>
-let fromArray: array<(key, 'a)> => t<'a>
-let mergeMany: (t<'a>, array<(key, 'a)>) => unit
-let getBucketHistogram: t<_> => array<int>
-let logStats: t<_> => unit
diff --git a/jscomp/others/hashset.cppo.res b/jscomp/others/hashset.cppo.res
deleted file mode 100644
index af73488..0000000
--- a/jscomp/others/hashset.cppo.res
+++ /dev/null
@@ -1,164 +0,0 @@
-#ifdef TYPE_STRING
-type key = string
-type seed = int
-external caml_hash_mix_string: (seed, string) => seed = "?hash_mix_string"
-external final_mix: seed => seed = "?hash_final_mix"
-let hash = (s: key) => final_mix(caml_hash_mix_string(0, s))
-#elif defined TYPE_INT
-type key = int
-type seed = int
-external caml_hash_mix_int: (seed, int) => seed = "?hash_mix_int"
-external final_mix: seed => seed = "?hash_final_mix"
-let hash = (s: key) => final_mix(caml_hash_mix_int(0, s))
-#else
-[%error "unknown type"]
-#endif
-
-module N = Belt_internalSetBuckets
-module C = Belt_internalBucketsType
-module A = Belt_Array
-
-type t = N.t<unit, unit, key>
-
-let rec copyBucket = (~h_buckets, ~ndata_tail, old_bucket) =>
-  switch C.toOpt(old_bucket) {
-  | None => ()
-  | Some(cell) =>
-    let nidx = land(hash(cell.N.key), A.length(h_buckets) - 1)
-    let v = C.return(cell)
-    switch C.toOpt(A.getUnsafe(ndata_tail, nidx)) {
-    | None => A.setUnsafe(h_buckets, nidx, v)
-    | Some(tail) => tail.N.next = v /* cell put at the end */
-    }
-    A.setUnsafe(ndata_tail, nidx, v)
-    copyBucket(~h_buckets, ~ndata_tail, cell.N.next)
-  }
-
-let tryDoubleResize = h => {
-  let odata = h.C.buckets
-  let osize = A.length(odata)
-  let nsize = osize * 2
-  if nsize >= osize {
-    /* no overflow */
-    let h_buckets = A.makeUninitialized(nsize)
-    let ndata_tail = A.makeUninitialized(nsize) /* keep track of tail */
-    h.C.buckets = h_buckets /* so that indexfun sees the new bucket count */
-    for i in 0 to osize - 1 {
-      copyBucket(~h_buckets, ~ndata_tail, A.getUnsafe(odata, i))
-    }
-    for i in 0 to nsize - 1 {
-      switch C.toOpt(A.getUnsafe(ndata_tail, i)) {
-      | None => ()
-      | Some(tail) => tail.N.next = C.emptyOpt
-      }
-    }
-  }
-}
-
-let rec removeBucket = (h, h_buckets, i, key: key, prec, cell) => {
-  let cell_next = cell.N.next
-  if cell.N.key == key {
-    prec.N.next = cell_next
-    h.C.size = h.C.size - 1
-  } else {
-    switch C.toOpt(cell_next) {
-    | None => ()
-    | Some(cell_next) => removeBucket(h, h_buckets, i, key, cell, cell_next)
-    }
-  }
-}
-
-let remove = (h, key: key) => {
-  let h_buckets = h.C.buckets
-  let i = land(hash(key), A.length(h_buckets) - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None => ()
-  | Some(cell) =>
-    let next_cell = cell.N.next
-    if cell.N.key == key {
-      h.C.size = h.C.size - 1
-      A.setUnsafe(h_buckets, i, next_cell)
-    } else {
-      switch C.toOpt(next_cell) {
-      | None => ()
-      | Some(next_cell) => removeBucket(h, h_buckets, i, key, cell, next_cell)
-      }
-    }
-  }
-}
-
-let rec addBucket = (h, key: key, cell) =>
-  if cell.N.key != key {
-    let n = cell.N.next
-    switch C.toOpt(n) {
-    | None =>
-      h.C.size = h.C.size + 1
-      cell.N.next = C.return({N.key, next: C.emptyOpt})
-    | Some(n) => addBucket(h, key, n)
-    }
-  }
-
-let add = (h, key: key) => {
-  let h_buckets = h.C.buckets
-  let buckets_len = A.length(h_buckets)
-  let i = land(hash(key), buckets_len - 1)
-  let l = A.getUnsafe(h_buckets, i)
-  switch C.toOpt(l) {
-  | None =>
-    A.setUnsafe(h_buckets, i, C.return({N.key, next: C.emptyOpt}))
-    h.C.size = h.C.size + 1
-  | Some(cell) => addBucket(h, key, cell)
-  }
-  if h.C.size > lsl(buckets_len, 1) {
-    tryDoubleResize(h)
-  }
-}
-
-let rec memInBucket = (key: key, cell) =>
-  cell.N.key == key ||
-    switch C.toOpt(cell.N.next) {
-    | None => false
-    | Some(nextCell) => memInBucket(key, nextCell)
-    }
-
-let has = (h, key) => {
-  let h_buckets = h.C.buckets
-  let nid = land(hash(key), A.length(h_buckets) - 1)
-  let bucket = A.getUnsafe(h_buckets, nid)
-  switch C.toOpt(bucket) {
-  | None => false
-  | Some(bucket) => memInBucket(key, bucket)
-  }
-}
-
-let make = (~hintSize) => C.make(~hintSize, ~hash=(), ~eq=())
-
-let clear = C.clear
-let size = h => h.C.size
-let forEachU = N.forEachU
-let forEach = N.forEach
-let reduceU = N.reduceU
-let reduce = N.reduce
-let logStats = N.logStats
-let toArray = N.toArray
-let copy = N.copy
-let getBucketHistogram = N.getBucketHistogram
-let isEmpty = C.isEmpty
-
-let fromArray = arr => {
-  let len = A.length(arr)
-  let v = C.make(~hintSize=len, ~hash=(), ~eq=())
-  for i in 0 to len - 1 {
-    add(v, A.getUnsafe(arr, i))
-  }
-  v
-}
-
-/* TOOD: optimize heuristics for resizing */
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  for i in 0 to len - 1 {
-    add(h, A.getUnsafe(arr, i))
-  }
-}
diff --git a/jscomp/others/hashset.cppo.resi b/jscomp/others/hashset.cppo.resi
deleted file mode 100644
index a410122..0000000
--- a/jscomp/others/hashset.cppo.resi
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-  This module is [`Belt.HashSet`]() specialized with key type to be a primitive type.
-
-  It is more efficient in general, the  API is the same with [`Belt.HashSet`]() except its key type is fixed,
-  and identity is not needed(using the built-in one)
-
-  **See** [`Belt.HashSet`]()
-*/
-
-#ifdef TYPE_STRING
-type key = string
-#elif defined TYPE_INT
-type key = int
-#else
-[%error "unknown type"]
-#endif
-
-type t
-
-let make: (~hintSize: int) => t
-
-let clear: t => unit
-
-let isEmpty: t => bool
-
-let add: (t, key) => unit
-
-let copy: t => t
-
-let has: (t, key) => bool
-
-let remove: (t, key) => unit
-
-let forEachU: (t, (. key) => unit) => unit
-let forEach: (t, key => unit) => unit
-
-let reduceU: (t, 'c, (. 'c, key) => 'c) => 'c
-let reduce: (t, 'c, ('c, key) => 'c) => 'c
-
-let size: t => int
-
-let logStats: t => unit
-
-let toArray: t => array<key>
-
-let fromArray: array<key> => t
-
-let mergeMany: (t, array<key>) => unit
-
-let getBucketHistogram: t => array<int>
diff --git a/jscomp/others/internal_map.cppo.res b/jscomp/others/internal_map.cppo.res
deleted file mode 100644
index 0afe893..0000000
--- a/jscomp/others/internal_map.cppo.res
+++ /dev/null
@@ -1,294 +0,0 @@
-@@bs.config({flags: ["-bs-noassertfalse"]})
-
-#ifdef TYPE_STRING
-type key = string
-#elif defined TYPE_INT
-type key = int
-#else
-[%error "unknown type"]
-#endif
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-module S = Belt_SortArray
-
-type t<'a> = N.t<key, 'a>
-
-let rec add = (t, x: key, data: _) =>
-  switch t {
-  | None => N.singleton(x, data)
-  | Some(n) =>
-    let k = n.N.key
-    if x == k {
-      Some(N.updateValue(n, data))
-    } else {
-      let v = n.N.value
-      if x < k {
-        N.bal(add(n.N.left, x, data), k, v, n.N.right)
-      } else {
-        N.bal(n.N.left, k, v, add(n.N.right, x, data))
-      }
-    }
-  }
-
-let rec get = (n, x: key) =>
-  switch n {
-  | None => None
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      Some(n.N.value)
-    } else {
-      get(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getUndefined = (n, x: key) =>
-  switch n {
-  | None => Js.undefined
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      Js.Undefined.return(n.N.value)
-    } else {
-      getUndefined(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getExn = (n, x: key) =>
-  switch n {
-  | None => raise(Not_found)
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      n.N.value
-    } else {
-      getExn(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getWithDefault = (n, x: key, def) =>
-  switch n {
-  | None => def
-  | Some(n) =>
-    let v = n.N.key
-    if x == v {
-      n.N.value
-    } else {
-      getWithDefault(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-        def,
-      )
-    }
-  }
-
-let rec has = (n, x: key) =>
-  switch n {
-  | None => false
-  | Some(n) /* Node(l, v, d, r, _) */ =>
-    let v = n.N.key
-    x == v ||
-      has(
-        if x < v {
-          n.N.left
-        } else {
-          n.N.right
-        },
-        x,
-      )
-  }
-
-let rec remove = (n, x: key) =>
-  switch n {
-  | None => n
-  | Some(n) =>
-    let {N.left: l, key: v, right: r} = n
-    if x == v {
-      switch (l, r) {
-      | (None, _) => r
-      | (_, None) => l
-      | (_, Some(rn)) =>
-        let (kr, vr) = (ref(rn.key), ref(rn.value))
-        let r = N.removeMinAuxWithRef(rn, kr, vr)
-        N.bal(l, kr.contents, vr.contents, r)
-      }
-    } else if x < v {
-      open N
-      bal(remove(l, x), v, n.value, r)
-    } else {
-      open N
-      bal(l, v, n.value, remove(r, x))
-    }
-  }
-
-let rec splitAux = (x: key, n: N.node<_>): (t<_>, option<_>, t<_>) => {
-  let {N.left: l, key: v, value: d, right: r} = n
-  if x == v {
-    (l, Some(d), r)
-  } else if x < v {
-    switch l {
-    | None => (None, None, Some(n))
-    | Some(l) =>
-      let (ll, pres, rl) = splitAux(x, l)
-      (ll, pres, N.join(rl, v, d, r))
-    }
-  } else {
-    switch r {
-    | None => (Some(n), None, None)
-    | Some(r) =>
-      let (lr, pres, rr) = splitAux(x, r)
-      (N.join(l, v, d, lr), pres, rr)
-    }
-  }
-}
-
-let split = (x: key, n) =>
-  switch n {
-  | None => (None, None, None)
-  | Some(n) => splitAux(x, n)
-  }
-
-let rec mergeU = (s1, s2, f) =>
-  switch (s1, s2) {
-  | (None, None) => None
-  | (Some(n) /* (Node (l1, v1, d1, r1, h1), _) */, _)
-    if n.N.height >=
-    switch s2 {
-    | None => 0
-    | Some(n) => n.N.height
-    } =>
-    let {N.left: l1, key: v1, value: d1, right: r1} = n
-    let (l2, d2, r2) = split(v1, s2)
-    N.concatOrJoin(mergeU(l1, l2, f), v1, f(. v1, Some(d1), d2), mergeU(r1, r2, f))
-  | (_, Some(n)) /* Node (l2, v2, d2, r2, h2) */ =>
-    let {N.left: l2, key: v2, value: d2, right: r2} = n
-    let (l1, d1, r1) = split(v2, s1)
-    N.concatOrJoin(mergeU(l1, l2, f), v2, f(. v2, d1, Some(d2)), mergeU(r1, r2, f))
-  | _ => assert(false)
-  }
-
-let merge = (s1, s2, f) => mergeU(s1, s2, (. a, b, c) => f(a, b, c))
-
-let rec compareAux = (e1, e2, vcmp) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    let c = Pervasives.compare((h1.N.key: key), h2.N.key)
-    if c == 0 {
-      let cx = vcmp(. h1.N.value, h2.N.value)
-      if cx == 0 {
-        compareAux(N.stackAllLeft(h1.N.right, t1), N.stackAllLeft(h2.N.right, t2), vcmp)
-      } else {
-        cx
-      }
-    } else {
-      c
-    }
-  | (_, _) => 0
-  }
-
-let cmpU = (s1, s2, cmp) => {
-  let (len1, len2) = (N.size(s1), N.size(s2))
-  if len1 == len2 {
-    compareAux(N.stackAllLeft(s1, list{}), N.stackAllLeft(s2, list{}), cmp)
-  } else if len1 < len2 {
-    -1
-  } else {
-    1
-  }
-}
-
-let cmp = (s1, s2, f) => cmpU(s1, s2, (. a, b) => f(a, b))
-
-let rec eqAux = (e1, e2, eq) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    if (h1.N.key: key) == h2.N.key && eq(. h1.N.value, h2.N.value) {
-      eqAux(N.stackAllLeft(h1.N.right, t1), N.stackAllLeft(h2.N.right, t2), eq)
-    } else {
-      false
-    }
-  | (_, _) => true
-  } /* end */
-
-let eqU = (s1, s2, eq) => {
-  let (len1, len2) = (N.size(s1), N.size(s2))
-  if len1 == len2 {
-    eqAux(N.stackAllLeft(s1, list{}), N.stackAllLeft(s2, list{}), eq)
-  } else {
-    false
-  }
-}
-
-let eq = (s1, s2, f) => eqU(s1, s2, (. a, b) => f(a, b))
-
-let rec addMutate = (t: t<_>, x, data): t<_> =>
-  switch t {
-  | None => N.singleton(x, data)
-  | Some(nt) =>
-    let k = nt.N.key
-
-    /* let  c = (Belt_Cmp.getCmpInternal cmp) x k [@bs] in */
-    if x == k {
-      nt.N.key = x
-      nt.value = data
-      Some(nt)
-    } else {
-      let (l, r) = (nt.N.left, nt.N.right)
-      if x < k {
-        let ll = addMutate(l, x, data)
-        nt.left = ll
-      } else {
-        nt.right = addMutate(r, x, data)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let fromArray = (xs: array<(key, _)>) => {
-  let len = A.length(xs)
-  if len == 0 {
-    None
-  } else {
-    let next = ref(S.strictlySortedLengthU(xs, (. (x0, _), (y0, _)) => x0 < y0))
-
-    let result = ref(
-      if next.contents >= 0 {
-        N.fromSortedArrayAux(xs, 0, next.contents)
-      } else {
-        next.contents = -next.contents
-        N.fromSortedArrayRevAux(xs, next.contents - 1, next.contents)
-      },
-    )
-    for i in next.contents to len - 1 {
-      let (k, v) = A.getUnsafe(xs, i)
-      result.contents = addMutate(result.contents, k, v)
-    }
-    result.contents
-  }
-}
diff --git a/jscomp/others/internal_set.cppo.res b/jscomp/others/internal_set.cppo.res
deleted file mode 100644
index 944ec29..0000000
--- a/jscomp/others/internal_set.cppo.res
+++ /dev/null
@@ -1,171 +0,0 @@
-#ifdef TYPE_STRING
-type value = string
-module S = Belt_SortArrayString
-#elif defined TYPE_INT
-type value = int
-module S = Belt_SortArrayInt
-#else
-[%error "unknown type"]
-#endif
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-
-type t = N.t<value>
-
-let rec has = (t: t, x: value) =>
-  switch t {
-  | None => false
-  | Some(n) =>
-    let v = n.value
-    x == v ||
-      has(
-        if x < v {
-          n.left
-        } else {
-          n.right
-        },
-        x,
-      )
-  }
-
-let rec compareAux = (e1, e2) =>
-  switch (e1, e2) {
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    let (k1: value, k2) = (h1.N.value, h2.N.value)
-    if k1 == k2 {
-      compareAux(N.stackAllLeft(h1.right, t1), N.stackAllLeft(h2.right, t2))
-    } else if k1 < k2 {
-      -1
-    } else {
-      1
-    }
-  | (_, _) => 0
-  }
-
-let cmp = (s1, s2) => {
-  let (len1, len2) = (N.size(s1), N.size(s2))
-  if len1 == len2 {
-    compareAux(N.stackAllLeft(s1, list{}), N.stackAllLeft(s2, list{}))
-  } else if len1 < len2 {
-    -1
-  } else {
-    1
-  }
-}
-
-let eq = (s1: t, s2) => cmp(s1, s2) == 0
-
-/* This algorithm applies to BST, it does not need to be balanced tree */
-let rec subset = (s1: t, s2: t) =>
-  switch (s1, s2) {
-  | (None, _) => true
-  | (_, None) => false
-  | (Some(t1), Some(t2)) /* Node (l1, v1, r1, _), (Node (l2, v2, r2, _) as t2) */ =>
-    let {N.left: l1, value: v1, right: r1} = t1
-    let {N.left: l2, value: v2, right: r2} = t2
-    if v1 == v2 {
-      subset(l1, l2) && subset(r1, r2)
-    } else if v1 < v2 {
-      subset(N.create(l1, v1, None), l2) && subset(r1, s2)
-    } else {
-      subset(N.create(None, v1, r1), r2) && subset(l1, s2)
-    }
-  }
-
-let rec get = (n: t, x: value) =>
-  switch n {
-  | None => None
-  | Some(t) =>
-    let v = t.value
-    if x == v {
-      Some(v)
-    } else {
-      get(
-        if x < v {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getUndefined = (n: t, x: value) =>
-  switch n {
-  | None => Js.undefined
-  | Some(t) =>
-    let v = t.value
-    if x == v {
-      Js.Undefined.return(v)
-    } else {
-      getUndefined(
-        if x < v {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-let rec getExn = (n: t, x: value) =>
-  switch n {
-  | None => raise(Not_found)
-  | Some(t) =>
-    let v = t.value
-    if x == v {
-      v
-    } else {
-      getExn(
-        if x < v {
-          t.left
-        } else {
-          t.right
-        },
-        x,
-      )
-    }
-  }
-
-/* ************************************************************************** */
-let rec addMutate = (t, x: value) =>
-  switch t {
-  | None => N.singleton(x)
-  | Some(nt) =>
-    let k = nt.N.value
-    if x == k {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < k {
-        nt.left = addMutate(l, x)
-      } else {
-        nt.right = addMutate(r, x)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let fromArray = (xs: array<value>) => {
-  let len = A.length(xs)
-  if len == 0 {
-    None
-  } else {
-    let next = ref(S.strictlySortedLength(xs))
-    let result = ref(
-      if next.contents >= 0 {
-        N.fromSortedArrayAux(xs, 0, next.contents)
-      } else {
-        next.contents = -next.contents
-        N.fromSortedArrayRevAux(xs, next.contents - 1, next.contents)
-      },
-    )
-    for i in next.contents to len - 1 {
-      result.contents = addMutate(result.contents, A.getUnsafe(xs, i))
-    }
-    result.contents
-  }
-}
diff --git a/jscomp/others/intro.txt b/jscomp/others/intro.txt
deleted file mode 100644
index 768a12b..0000000
--- a/jscomp/others/intro.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-{!indexlist}
-
-{1 Libraries shipped with ReScript}
-
-ReScript is mostly a compiler, but it does ship some libraries for users' convenience
-
-{2 4 libraries}
-
-{!Js} 
-
-This library are mostly {i bindings} to JS, it should work with both NodeJS and Browser.
-It is strongly recommended to use qualified name instead of flatten module name. 
-For example
-{[
-    [| 1; 2 ; 3 |] 
-    |> Js.Array.map (fun x -> x + 1 )
-    |> Js.log 
-]}
-
-{!Belt}
-
-The ReScript standard library ({b beta}).
-
-ReScript also ships the vanilla OCaml standard library.
-@see <https://caml.inria.fr/pub/docs/manual-ocaml-4.02/stdlib.html> OCaml standard library
-
-{!Node}
-
-This library contains bindings to NodeJS, it is still work in progress, use it with care, 
-and we may break API backward compatiblity in the future.
-
-{!Dom}
-
-This library are for DOM API, currently it only defines some 
-types for diferent packages to talk to each other
-
-
diff --git a/jscomp/others/js.ml b/jscomp/others/js.ml
deleted file mode 100644
index d3224d1..0000000
--- a/jscomp/others/js.ml
+++ /dev/null
@@ -1,296 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-[@@@bs.config { flags = [| "-unboxed-types"; "-w"; "-49" |] }]
-(* DESIGN:
-   - It does not have any code, all its code will be inlined so that
-       there will never be
-   {[ require('js')]}
-   - Its interface should be minimal
-*)
-
-(**
-The Js module mostly contains ReScript bindings to _standard JavaScript APIs_
-like [console.log](https://developer.mozilla.org/en-US/docs/Web/API/Console/log),
-or the JavaScript
-[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String),
-[Date](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date), and
-[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
-classes.
-
-It is meant as a zero-abstraction interop layer and directly exposes JavaScript functions as they are. If you can find your API in this module, prefer this over an equivalent Belt helper. For example, prefer [Js.Array2](js/array2) over [Belt.Array](belt/array)
-
-## Argument Order
-
-For historical reasons, some APIs in the Js namespace (e.g. [Js.String](js/string)) are
-using the data-last argument order whereas others (e.g. [Js.Date](js/date)) are using data-first.
-
-For more information about these argument orders and the trade-offs between them, see
-[this blog post](https://www.javierchavarri.com/data-first-and-data-last-a-comparison/).
-
-_Eventually, all modules in the Js namespace are going to be migrated to data-first though._
-
-In the meantime, there are several options for dealing with the data-last APIs:
-
-## Examples
-
-```rescript
-/* Js.String (data-last API used with pipe last operator) */
-Js.log("2019-11-10" |> Js.String.split("-"))
-Js.log("ReScript" |> Js.String.startsWith("Re"))
-
-/* Js.String (data-last API used with pipe first operator) */
-Js.log("2019-11-10"->Js.String.split("-", _))
-Js.log("ReScript"->Js.String.startsWith("Re", _))
-
-/* Js.String (data-last API used without any piping) */
-Js.log(Js.String.split("-", "2019-11-10"))
-Js.log(Js.String.startsWith("Re", "ReScript"))
-```
-## Js.Xxx2 Modules
-
-Prefer `Js.Array2` over `Js.Array`, `Js.String2` over `Js.String`, etc. The latters are old modules.
-*)
-
-type 'a t = < .. > as 'a
-(** JS object type *)
-
-module MapperRt = Js_mapperRt
-
-module Internal = struct
-  external opaqueFullApply : 'a -> 'a = "%uncurried_apply"
-
-  (* Use opaque instead of [._n] to prevent some optimizations happening *)
-  external run : (unit -> 'a [@bs]) -> 'a = "#run"
-  external opaque : 'a -> 'a = "%opaque"
-end
-
-(**/**)
-
-type +'a null =
-  | Value of 'a
-  | Null [@as null]
-[@@unboxed]
-(**
-  Nullable value of this type can be either null or 'a. This type is equivalent to Js.Null.t.
-*)
-
-type +'a undefined
-(**
-  A value of this type can be either undefined or 'a. This type is equivalent to Js.Undefined.t.
-*)
-
-type +'a nullable =
-  | Value of 'a
-  | Null [@as null]
-  | Undefined [@as undefined]
-[@@unboxed]
-
-(**
-  A value of this type can be undefined, null or 'a. This type is equivalent to Js.Null_undefined.t.
-*)
-
-type +'a null_undefined = 'a nullable
-
-external toOption : 'a nullable -> 'a option = "#nullable_to_opt"
-external undefinedToOption : 'a undefined -> 'a option = "#undefined_to_opt"
-external nullToOption : 'a null -> 'a option = "#null_to_opt"
-external isNullable : 'a nullable -> bool = "#is_nullable"
-external import : 'a -> 'a promise = "#import"
-
-external testAny : 'a -> bool = "#is_nullable"
-(** The same as {!test} except that it is more permissive on the types of input *)
-
-type (+'a, +'e) promise
-(**
-  The promise type, defined here for interoperation across packages.
-*)
-
-external null : 'a null = "#null"
-(**
-  The same as empty in `Js.Null`. Compiles to `null`.
-*)
-
-external undefined : 'a undefined = "#undefined"
-(**
-  The same as empty `Js.Undefined`. Compiles to `undefined`.
-*)
-
-external typeof : 'a -> string = "#typeof"
-(**
-`typeof x` will be compiled as `typeof x` in JS. Please consider functions in
-`Js.Types` for a type safe way of reflection.
-*)
-
-external log : 'a -> unit = "log"
-  [@@val] [@@scope "console"]
-(** Equivalent to console.log any value. *)
-
-external log2 : 'a -> 'b -> unit = "log" [@@bs.val] [@@bs.scope "console"]
-external log3 : 'a -> 'b -> 'c -> unit = "log" [@@bs.val] [@@bs.scope "console"]
-
-external log4 : 'a -> 'b -> 'c -> 'd -> unit = "log"
-  [@@bs.val] [@@bs.scope "console"]
-
-external logMany : 'a array -> unit = "log"
-  [@@bs.val] [@@bs.scope "console"] [@@bs.splice]
-(** A convenience function to console.log more than 4 arguments *)
-
-external eqNull : 'a -> 'a null -> bool = "%bs_equal_null"
-external eqUndefined : 'a -> 'a undefined -> bool = "%bs_equal_undefined"
-external eqNullable : 'a -> 'a nullable -> bool = "%bs_equal_nullable"
-
-(** ## Operators *)
-
-external unsafe_lt : 'a -> 'a -> bool = "#unsafe_lt"
-(**
-   `unsafe_lt(a, b)` will be compiled as `a < b`.
-    It is marked as unsafe, since it is impossible
-    to give a proper semantics for comparision which applies to any type
-*)
-
-external unsafe_le : 'a -> 'a -> bool = "#unsafe_le"
-(**
-   `unsafe_le(a, b)` will be compiled as `a <= b`.
-   See also `Js.unsafe_lt`.
-*)
-
-external unsafe_gt : 'a -> 'a -> bool = "#unsafe_gt"
-(**
-   `unsafe_gt(a, b)` will be compiled as `a > b`.
-    See also `Js.unsafe_lt`.
-*)
-
-external unsafe_ge : 'a -> 'a -> bool = "#unsafe_ge"
-(**
-   `unsafe_ge(a, b)` will be compiled as `a >= b`.
-   See also `Js.unsafe_lt`.
-*)
-
-(** ## Nested Modules *)
-
-module Null = Js_null
-(** Provide utilities for `Js.null<'a>` *)
-
-module Undefined = Js_undefined
-(** Provide utilities for `Js.undefined<'a>` *)
-
-module Nullable = Js_null_undefined
-(** Provide utilities for `Js.null_undefined` *)
-
-module Null_undefined = Js_null_undefined
-[@deprecated "Please use `Js.Nullable`"]
-
-module Exn = Js_exn
-(** Provide utilities for dealing with Js exceptions *)
-
-module Array = Js_array
-(** Provide bindings to JS array*)
-
-module Array2 = Js_array2
-(** Provide bindings to JS array*)
-
-module String = Js_string
-(** Provide bindings to JS string *)
-
-module String2 = Js_string2
-(** Provide bindings to JS string *)
-
-module Re = Js_re
-(** Provide bindings to JS regex expression *)
-
-module Promise = Js_promise
-(** Provide bindings to JS Promise *)
-
-module Promise2 = Js_promise2
-(** Provide bindings to JS Promise *)
-
-module Date = Js_date
-(** Provide bindings for JS Date *)
-
-module Dict = Js_dict
-(** Provide utilities for JS dictionary object *)
-
-module Global = Js_global
-(** Provide bindings to JS global functions in global namespace*)
-
-module Json = Js_json
-(** Provide utilities for json *)
-
-module Math = Js_math
-(** Provide bindings for JS `Math` object *)
-
-module Obj = Js_obj
-(** Provide utilities for `Js.t` *)
-
-module Typed_array = Js_typed_array
-(** Provide bindings for JS typed array *)
-
-module TypedArray2 = Js_typed_array2
-(** Provide bindings for JS typed array *)
-
-module Types = Js_types
-(** Provide utilities for manipulating JS types  *)
-
-module Float = Js_float
-(** Provide utilities for JS float *)
-
-module Int = Js_int
-(** Provide utilities for int *)
-
-module BigInt = Js_bigint
-(** Provide utilities for bigint *)
-
-module File = Js_file
-(** Provide utilities for File *)
-
-module Blob = Js_blob
-(** Provide utilities for Blob *)
-
-module Option = Js_option
-(** Provide utilities for option *)
-
-module Result = Js_result
-(** Define the interface for result *)
-
-module List = Js_list
-(** Provide utilities for list *)
-
-module Vector = Js_vector
-(** Provides bindings for JS Vector *)
-
-module Console = Js_console
-(** Provides bindings for console *)
-
-module Set = Js_set
-(** Provides bindings for ES6 Set *)
-
-module WeakSet = Js_weakset
-(** Provides bindings for ES6 WeakSet *)
-
-module Map = Js_map
-(** Provides bindings for ES6 Map *)
-
-module WeakMap = Js_weakmap
-(** Provides bindings for ES6 WeakMap *)
diff --git a/jscomp/others/js_OO.res b/jscomp/others/js_OO.res
deleted file mode 100644
index e568c95..0000000
--- a/jscomp/others/js_OO.res
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 2020- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@@bs.config({flags: ["-unboxed-types"]})
-
-external unsafe_to_method: 'a => 'a = "#fn_method"
-
-module Callback = {
-  type arity1<'a> = {@internal i1: 'a}
-  type arity2<'a> = {@internal i2: 'a}
-  type arity3<'a> = {@internal i3: 'a}
-  type arity4<'a> = {@internal i4: 'a}
-  type arity5<'a> = {@internal i5: 'a}
-  type arity6<'a> = {@internal i6: 'a}
-  type arity7<'a> = {@internal i7: 'a}
-  type arity8<'a> = {@internal i8: 'a}
-  type arity9<'a> = {@internal i9: 'a}
-  type arity10<'a> = {@internal i10: 'a}
-  type arity11<'a> = {@internal i11: 'a}
-  type arity12<'a> = {@internal i12: 'a}
-  type arity13<'a> = {@internal i13: 'a}
-  type arity14<'a> = {@internal i14: 'a}
-  type arity15<'a> = {@internal i15: 'a}
-  type arity16<'a> = {@internal i16: 'a}
-  type arity17<'a> = {@internal i17: 'a}
-  type arity18<'a> = {@internal i18: 'a}
-  type arity19<'a> = {@internal i19: 'a}
-  type arity20<'a> = {@internal i20: 'a}
-  type arity21<'a> = {@internal i21: 'a}
-  type arity22<'a> = {@internal i22: 'a}
-}
diff --git a/jscomp/others/js_array.res b/jscomp/others/js_array.res
deleted file mode 100644
index caf332f..0000000
--- a/jscomp/others/js_array.res
+++ /dev/null
@@ -1,1087 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Provides bindings to JavaScript’s `Array` functions. These bindings are
-optimized for pipe-last (`|>`), where the array to be processed is the last
-parameter in the function.
-
-Here is an example to find the sum of squares of all even numbers in an array.
-Without pipe last, we must call the functions in reverse order:
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-let square = x => x * x
-let result = {
-  open Js.Array
-  reduce(\"+", 0, map(square, filter(isEven, [5, 2, 3, 4, 1])))
-}
-```
-
-With pipe last, we call the functions in the “natural” order:
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-let square = x => x * x
-let result = {
-  open Js.Array
-  [5, 2, 3, 4, 1] |> filter(isEven) |> map(square) |> reduce("+", 0)
-}
-```
-*/
-
-@@warning("-103")
-
-/**
-The type used to describe a JavaScript array.
-*/
-type t<'a> = array<'a>
-
-/**
-A type used to describe JavaScript objects that are like an array or are iterable.
-*/
-type array_like<'a> = Js_array2.array_like<'a>
-
-/* commented out until bs has a plan for iterators
-   type 'a array_iter = 'a array_like
-*/
-
-@val
-/**
-Creates a shallow copy of an array from an array-like object. See [`Array.from`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from) on MDN.
-
-## Examples
-
-```rescript
-let strArr = Js.String.castToArrayLike("abcd")
-Js.Array.from(strArr) == ["a", "b", "c", "d"]
-```
-*/
-external from: array_like<'a> => array<'a> = "Array.from"
-
-/* ES2015 */
-
-@val
-/**
-Creates a new array by applying a function (the second argument) to each item
-in the `array_like` first argument.  See
-[`Array.from`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from)
-on MDN.
-
-## Examples
-
-```rescript
-let strArr = Js.String.castToArrayLike("abcd")
-let code = s => Js.String.charCodeAt(0, s)
-Js.Array.fromMap(strArr, code) == [97.0, 98.0, 99.0, 100.0]
-```
-*/
-external fromMap: (array_like<'a>, @uncurry ('a => 'b)) => array<'b> = "Array.from"
-
-/* ES2015 */
-
-@val external isArray: 'a => bool = "Array.isArray"
-/* ES2015 */
-/*
-Returns `true` if its argument is an array; `false` otherwise. This is a
-runtime check, which is why the second example returns `true` — a list is
-internally represented as a nested JavaScript array.
-
-## Examples
-
-```rescript
-Js.Array.isArray([5, 2, 3, 1, 4]) == true
-Js.Array.isArray(list{5, 2, 3, 1, 4}) == true
-Js.Array.isArray("abcd") == false
-```
-*/
-
-@get
-/**
-Returns the number of elements in the array. See [`Array.length`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/length) on MDN.
-*/
-external length: array<'a> => int = "length"
-
-/* Mutator functions */
-
-@bs.send.pipe(: t<'a> as 'this)
-/** 
-Copies from the first element in the given array to the designated `~to_` position, returning the resulting array. *This function modifies the original array.* See [`Array.copyWithin`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin) on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array.copyWithin(~to_=2, arr) == [100, 101, 100, 101, 102]
-arr == [100, 101, 100, 101, 102]
-```
-*/
-external copyWithin: (~to_: int) => 'this = "copyWithin"
-
-/* ES2015 */
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Copies starting at element `~from` in the given array to the designated `~to_` position, returning the resulting array. *This function modifies the original array.* See [`Array.copyWithin`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin) on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array.copyWithinFrom(~from=2, ~to_=0, arr) == [102, 103, 104, 103, 104]
-arr == [102, 103, 104, 103, 104]
-```
-*/
-external copyWithinFrom: (~to_: int, ~from: int) => 'this = "copyWithin"
-
-/* ES2015 */
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Copies starting at element `~start` in the given array up to but not including `~end_` to the designated `~to_` position, returning the resulting array. *This function modifies the original array.* See [`Array.copyWithin`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin) on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104, 105]
-Js.Array.copyWithinFromRange(~start=2, ~end_=5, ~to_=1, arr) == [100, 102, 103, 104, 104, 105]
-arr == [100, 102, 103, 104, 104, 105]
-```
-*/
-external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => 'this = "copyWithin"
-
-/* ES2015 */
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Sets all elements of the given array (the second arumgent) to the designated value (the first argument), returning the resulting array. *This function modifies the original array.* See [`Array.fill`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill) on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array.fillInPlace(99, arr) == [99, 99, 99, 99, 99]
-arr == [99, 99, 99, 99, 99]
-```
-*/
-external fillInPlace: 'a => 'this = "fill"
-
-/* ES2015 */
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Sets all elements of the given array (the last arumgent) from position `~from` to the end to the designated value (the first argument), returning the resulting array. *This function modifies the original array.* See [`Array.fill`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill) on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array.fillFromInPlace(99, ~from=2, arr) == [100, 101, 99, 99, 99]
-arr == [100, 101, 99, 99, 99]
-```
-*/
-external fillFromInPlace: ('a, ~from: int) => 'this = "fill"
-
-/* ES2015 */
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Sets the elements of the given array (the last arumgent) from position `~start` up to but not including position `~end_` to the designated value (the first argument), returning the resulting array. *This function modifies the original array.* See [`Array.fill`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill) on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array.fillRangeInPlace(99, ~start=1, ~end_=4, arr) == [100, 99, 99, 99, 104]
-arr == [100, 99, 99, 99, 104]
-```
-*/
-external fillRangeInPlace: ('a, ~start: int, ~end_: int) => 'this = "fill"
-
-/* ES2015 */
-
-@bs.send.pipe(: t<'a> as 'this)
-@return(undefined_to_opt)
-/**
-If the array is not empty, removes the last element and returns it as `Some(value)`; returns `None` if the array is empty. *This function modifies the original array.* See [`Array.pop`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/pop) on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array.pop(arr) == Some(104)
-arr == [100, 101, 102, 103]
-
-let empty: array<int> = []
-Js.Array.pop(empty) == None
-```
-*/
-external pop: option<'a> = "pop"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Appends the given value to the array, returning the number of elements in the updated array. *This function modifies the original array.* See [`Array.push`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/push) on MDN.
-
-## Examples
-
-```rescript
-let arr = ["ant", "bee", "cat"]
-Js.Array.push("dog", arr) == 4
-arr == ["ant", "bee", "cat", "dog"]
-```
-*/
-external push: 'a => int = "push"
-
-@bs.send.pipe(: t<'a> as 'this)
-@variadic
-/**
-Appends the values from one array (the first argument) to another (the second argument), returning the number of elements in the updated array. *This function modifies the original array.* See [`Array.push`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/push) on MDN.
-
-## Examples
-
-```rescript
-let arr = ["ant", "bee", "cat"]
-Js.Array.pushMany(["dog", "elk"], arr) == 5
-arr == ["ant", "bee", "cat", "dog", "elk"]
-```
-*/
-external pushMany: array<'a> => int = "push"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns an array with the elements of the input array in reverse order. *This function modifies the original array.* See [`Array.reverse`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse) on MDN.
-
-## Examples
-
-```rescript
-let arr = ["ant", "bee", "cat"]
-Js.Array.reverseInPlace(arr) == ["cat", "bee", "ant"]
-arr == ["cat", "bee", "ant"]
-```
-*/
-external reverseInPlace: 'this = "reverse"
-
-@bs.send.pipe(: t<'a> as 'this)
-@return({undefined_to_opt: undefined_to_opt})
-/**
-If the array is not empty, removes the first element and returns it as `Some(value)`; returns `None` if the array is empty. *This function modifies the original array.* See [`Array.shift`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/shift) on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array.shift(arr) == Some(100)
-arr == [101, 102, 103, 104]
-
-let empty: array<int> = []
-Js.Array.shift(empty) == None
-```
-*/
-external shift: option<'a> = "shift"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Sorts the given array in place and returns the sorted array. JavaScript sorts the array by converting the arguments to UTF-16 strings and sorting them. See the second example with sorting numbers, which does not do a numeric sort. *This function modifies the original array.* See [`Array.sort`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort) on MDN.
-
-## Examples
-
-```rescript
-let words = ["bee", "dog", "ant", "cat"]
-Js.Array.sortInPlace(words) == ["ant", "bee", "cat", "dog"]
-words == ["ant", "bee", "cat", "dog"]
-
-let numbers = [3, 30, 10, 1, 20, 2]
-Js.Array.sortInPlace(numbers) == [1, 10, 2, 20, 3, 30]
-numbers == [1, 10, 2, 20, 3, 30]
-```
-*/
-external sortInPlace: 'this = "sort"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Sorts the given array in place and returns the sorted array. *This function modifies the original array.*
-
-The first argument to `sortInPlaceWith()` is a function that compares two items from the array and returns:
-
-* an integer less than zero if the first item is less than the second item
-* zero if the items are equal
-* an integer greater than zero if the first item is greater than the second item
-
-See [`Array.sort`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort) on MDN.
-
-## Examples
-
-```rescript
-// sort by word length
-let words = ["horse", "aardvark", "dog", "camel"]
-let byLength = (s1, s2) => Js.String.length(s1) - Js.String.length(s2)
-
-Js.Array.sortInPlaceWith(byLength, words) == ["dog", "horse", "camel", "aardvark"]
-
-// sort in reverse numeric order
-let numbers = [3, 30, 10, 1, 20, 2]
-let reverseNumeric = (n1, n2) => n2 - n1
-Js.Array.sortInPlaceWith(reverseNumeric, numbers) == [30, 20, 10, 3, 2, 1]
-```
-*/
-external sortInPlaceWith: (@uncurry ('a, 'a) => int) => 'this = "sort"
-
-@bs.send.pipe(: t<'a> as 'this)
-@variadic
-/**
-Starting at position `~pos`, remove `~remove` elements and then add the
-elements from the `~add` array. Returns an array consisting of the removed
-items. *This function modifies the original array.* See
-[`Array.splice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["a", "b", "c", "d", "e", "f"]
-Js.Array.spliceInPlace(~pos=2, ~remove=2, ~add=["x", "y", "z"], arr) == ["c", "d"]
-arr == ["a", "b", "x", "y", "z", "e", "f"]
-
-let arr2 = ["a", "b", "c", "d"]
-Js.Array.spliceInPlace(~pos=3, ~remove=0, ~add=["x", "y"], arr2) == []
-arr2 == ["a", "b", "c", "x", "y", "d"]
-
-let arr3 = ["a", "b", "c", "d", "e", "f"]
-Js.Array.spliceInPlace(~pos=9, ~remove=2, ~add=["x", "y", "z"], arr3) == []
-arr3 == ["a", "b", "c", "d", "e", "f", "x", "y", "z"]
-```
-*/
-external spliceInPlace: (~pos: int, ~remove: int, ~add: array<'a>) => 'this = "splice"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Removes elements from the given array starting at position `~pos` to the end
-of the array, returning the removed elements. *This function modifies the
-original array.* See
-[`Array.splice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["a", "b", "c", "d", "e", "f"]
-Js.Array.removeFromInPlace(~pos=4, arr) == ["e", "f"]
-arr == ["a", "b", "c", "d"]
-```
-*/
-external removeFromInPlace: (~pos: int) => 'this = "splice"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Removes `~count` elements from the given array starting at position `~pos`,
-returning the removed elements. *This function modifies the original array.*
-See
-[`Array.splice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["a", "b", "c", "d", "e", "f"]
-Js.Array.removeCountInPlace(~pos=2, ~count=3, arr) == ["c", "d", "e"]
-arr == ["a", "b", "f"]
-```
-*/
-external removeCountInPlace: (~pos: int, ~count: int) => 'this = "splice"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Adds the given element to the array, returning the new number of elements in
-the array. *This function modifies the original array.* See
-[`Array.unshift`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/unshift)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["b", "c", "d"]
-Js.Array.unshift("a", arr) == 4
-arr == ["a", "b", "c", "d"]
-```
-*/
-external unshift: 'a => int = "unshift"
-
-@bs.send.pipe(: t<'a> as 'this)
-@variadic
-/**
-Adds the elements in the first array argument at the beginning of the second
-array argument, returning the new number of elements in the array. *This
-function modifies the original array.* See
-[`Array.unshift`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/unshift)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["d", "e"]
-Js.Array.unshiftMany(["a", "b", "c"], arr) == 5
-arr == ["a", "b", "c", "d", "e"]
-```
-*/
-external unshiftMany: array<'a> => int = "unshift"
-
-/* Accessor functions
- */
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Concatenates the first array argument to the second array argument, returning
-a new array. The original arrays are not modified. See
-[`Array.concat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/concat)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.concat(["c", "d", "e"], ["a", "b"]) == ["a", "b", "c", "d", "e"]
-```
-*/
-external concat: 'this => 'this = "concat"
-
-@bs.send.pipe(: t<'a> as 'this)
-@variadic
-/**
-The first argument to `concatMany()` is an array of arrays; these are added
-at the end of the second argument, returning a new array. See
-[`Array.concat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/concat)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.concatMany([["d", "e"], ["f", "g", "h"]], ["a", "b", "c"]) == [
-    "a",
-    "b",
-    "c",
-    "d",
-    "e",
-    "f",
-    "g",
-    "h",
-  ]
-```
-*/
-external concatMany: array<'this> => 'this = "concat"
-
-/* ES2016 */
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns true if the given value is in the array, `false` otherwise. See
-[`Array.includes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.includes("b", ["a", "b", "c"]) == true
-Js.Array.includes("x", ["a", "b", "c"]) == false
-```
-*/
-external includes: 'a => bool = "includes"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns the index of the first element in the array that has the given value.
-If the value is not in the array, returns -1. See
-[`Array.indexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.indexOf(102, [100, 101, 102, 103]) == 2
-Js.Array.indexOf(999, [100, 101, 102, 103]) == -1
-```
-*/
-external indexOf: 'a => int = "indexOf"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns the index of the first element in the array with the given value. The
-search starts at position `~from`. See
-[`Array.indexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.indexOfFrom("a", ~from=2, ["a", "b", "a", "c", "a"]) == 2
-Js.Array.indexOfFrom("a", ~from=3, ["a", "b", "a", "c", "a"]) == 4
-Js.Array.indexOfFrom("b", ~from=2, ["a", "b", "a", "c", "a"]) == -1
-```
-*/
-external indexOfFrom: ('a, ~from: int) => int = "indexOf"
-
-@send @deprecated("please use joinWith instead")
-external join: t<'a> => string = "join"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-This function converts each element of the array to a string (via JavaScript)
-and concatenates them, separated by the string given in the first argument,
-into a single string. See
-[`Array.join`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.joinWith("--", ["ant", "bee", "cat"]) == "ant--bee--cat"
-Js.Array.joinWith("", ["door", "bell"]) == "doorbell"
-Js.Array.joinWith("/", [2020, 9, 4]) == "2020/9/4"
-Js.Array.joinWith(";", [2.5, 3.6, 3e-2]) == "2.5;3.6;0.03"
-```
-*/
-external joinWith: string => string = "join"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns the index of the last element in the array that has the given value.
-If the value is not in the array, returns -1. See
-[`Array.lastIndexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.lastIndexOf("a", ["a", "b", "a", "c"]) == 2
-Js.Array.lastIndexOf("x", ["a", "b", "a", "c"]) == -1
-```
-*/
-external lastIndexOf: 'a => int = "lastIndexOf"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns the index of the last element in the array that has the given value,
-searching from position `~from` down to the start of the array. If the value
-is not in the array, returns -1. See
-[`Array.lastIndexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.lastIndexOfFrom("a", ~from=3, ["a", "b", "a", "c", "a", "d"]) == 2
-Js.Array.lastIndexOfFrom("c", ~from=2, ["a", "b", "a", "c", "a", "d"]) == -1
-```
-*/
-external lastIndexOfFrom: ('a, ~from: int) => int = "lastIndexOf"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns a shallow copy of the given array from the `~start` index up to but
-not including the `~end_` position. Negative numbers indicate an offset from
-the end of the array. See
-[`Array.slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104, 105, 106]
-Js.Array.slice(~start=2, ~end_=5, arr) == [102, 103, 104]
-Js.Array.slice(~start=-3, ~end_=-1, arr) == [104, 105]
-Js.Array.slice(~start=9, ~end_=10, arr) == []
-```
-*/
-external slice: (~start: int, ~end_: int) => 'this = "slice"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns a copy of the entire array. Same as `Js.Array.Slice(~start=0,
-~end_=Js.Array.length(arr), arr)`. See
-[`Array.slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice)
-on MDN.
-*/
-external copy: 'this = "slice"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns a shallow copy of the given array from the given index to the end. 
-See [`Array.slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice) on MDN.
-
-## Examples
-
-```rescript
-Js.Array.sliceFrom(2, [100, 101, 102, 103, 104]) == [102, 103, 104]
-```
-*/
-external sliceFrom: int => 'this = "slice"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Converts the array to a string. Each element is converted to a string using
-JavaScript. Unlike the JavaScript `Array.toString()`, all elements in a
-ReasonML array must have the same type. See
-[`Array.toString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.toString([3.5, 4.6, 7.8]) == "3.5,4.6,7.8"
-Js.Array.toString(["a", "b", "c"]) == "a,b,c"
-```
-*/
-external toString: string = "toString"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Converts the array to a string using the conventions of the current locale.
-Each element is converted to a string using JavaScript. Unlike the JavaScript
-`Array.toLocaleString()`, all elements in a ReasonML array must have the same
-type. See
-[`Array.toLocaleString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toLocaleString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.toLocaleString([Js.Date.make()])
-// returns "3/19/2020, 10:52:11 AM" for locale en_US.utf8
-// returns "2020-3-19 10:52:11" for locale de_DE.utf8
-```
-*/
-external toLocaleString: string = "toLocaleString"
-
-/* Iteration functions
- */
-/* commented out until bs has a plan for iterators
-   external entries : (int * 'a) array_iter = "" [@@bs.send.pipe: 'a t as 'this] (* ES2015 *)
-*/
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-The first argument to `every()` is a predicate function that returns a boolean. The `every()` function returns `true` if the predicate function is true for all items in the given array. If given an empty array, returns `true`. See [`Array.every`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every) on MDN.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-Js.Array.every(isEven, [6, 22, 8, 4]) == true
-Js.Array.every(isEven, [6, 22, 7, 4]) == false
-```
-*/
-external every: (@uncurry ('a => bool)) => bool = "every"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-The first argument to `everyi()` is a predicate function with two arguments: an array element and that element’s index; it returns a boolean. The `everyi()` function returns `true` if the predicate function is true for all items in the given array. If given an empty array, returns `true`. See [`Array.every`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every) on MDN.
-
-## Examples
-
-```rescript
-// determine if all even-index items are positive
-let evenIndexPositive = (item, index) => mod(index, 2) == 0 ? item > 0 : true
-
-Js.Array.everyi(evenIndexPositive, [6, -3, 5, 8]) == true
-Js.Array.everyi(evenIndexPositive, [6, 3, -5, 8]) == false
-```
-*/
-external everyi: (@uncurry ('a, int) => bool) => bool = "every"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Applies the given predicate function to each element in the array; the result is an array of those elements for which the predicate function returned `true`. See [`Array.filter`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter) on MDN.
-
-## Examples
-
-```rescript
-let nonEmpty = s => s != ""
-Js.Array.filter(nonEmpty, ["abc", "", "", "def", "ghi"]) == ["abc", "def", "ghi"]
-```
-*/
-external filter: (@uncurry ('a => bool)) => 'this = "filter"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Each element of the given array are passed to the predicate function. The
-return value is an array of all those elements for which the predicate
-function returned `true`.  See
-[`Array.filter`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter)
-on MDN.
-
-## Examples
-
-```rescript
-// keep only positive elements at odd indices
-let positiveOddElement = (item, index) => mod(index, 2) == 1 && item > 0
-
-Js.Array.filteri(positiveOddElement, [6, 3, 5, 8, 7, -4, 1]) == [3, 8]
-```
-*/
-external filteri: (@uncurry ('a, int) => bool) => 'this = "filter"
-
-@bs.send.pipe(: t<'a> as 'this)
-@return({undefined_to_opt: undefined_to_opt})
-/**
-Returns `Some(value)` for the first element in the array that satisifies the
-given predicate function, or `None` if no element satisifies the predicate.
-See
-[`Array.find`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find)
-on MDN.
-
-## Examples
-
-```rescript
-// find first negative element
-Js.Array.find(x => x < 0, [33, 22, -55, 77, -44]) == Some(-55)
-Js.Array.find(x => x < 0, [33, 22, 55, 77, 44]) == None
-```
-*/
-external find: (@uncurry ('a => bool)) => option<'a> = "find"
-
-@bs.send.pipe(: t<'a> as 'this)
-@return({undefined_to_opt: undefined_to_opt})
-/**
-Returns `Some(value)` for the first element in the array that satisifies the given predicate function, or `None` if no element satisifies the predicate. The predicate function takes an array element and an index as its parameters. See [`Array.find`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find) on MDN.
-
-## Examples
-
-```rescript
-// find first positive item at an odd index
-let positiveOddElement = (item, index) => mod(index, 2) == 1 && item > 0
-
-Js.Array.findi(positiveOddElement, [66, -33, 55, 88, 22]) == Some(88)
-Js.Array.findi(positiveOddElement, [66, -33, 55, -88, 22]) == None
-```
-*/
-external findi: (@uncurry ('a, int) => bool) => option<'a> = "find"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns the index of the first element in the array that satisifies the given predicate function, or -1 if no element satisifies the predicate. See [`Array.find`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find) on MDN.
-
-## Examples
-
-```rescript
-Js.Array.findIndex(x => x < 0, [33, 22, -55, 77, -44]) == 2
-Js.Array.findIndex(x => x < 0, [33, 22, 55, 77, 44]) == -1
-```
-*/
-external findIndex: (@uncurry ('a => bool)) => int = "findIndex"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns `Some(value)` for the first element in the array that satisifies the given predicate function, or `None` if no element satisifies the predicate. The predicate function takes an array element and an index as its parameters. See [`Array.find`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find) on MDN.
-
-## Examples
-
-```rescript
-// find index of first positive item at an odd index
-let positiveOddElement = (item, index) => mod(index, 2) == 1 && item > 0
-
-Js.Array.findIndexi(positiveOddElement, [66, -33, 55, 88, 22]) == 3
-Js.Array.findIndexi(positiveOddElement, [66, -33, 55, -88, 22]) == -1
-```
-*/
-external findIndexi: (@uncurry ('a, int) => bool) => int = "findIndex"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-The `forEach()` function applies the function given as the first argument to each element in the array. The function you provide returns `unit`, and the `forEach()` function also returns `unit`. You use `forEach()` when you need to process each element in the array but not return any new array or value; for example, to print the items in an array. See [`Array.forEach`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach) on MDN.
-
-## Examples
-
-```rescript
-// display all elements in an array
-Js.Array.forEach(x => Js.log(x), ["a", "b", "c"]) == ()
-```
-*/
-external forEach: (@uncurry ('a => unit)) => unit = "forEach"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-The `forEachi()` function applies the function given as the first argument to each element in the array. The function you provide takes an item in the array and its index number, and returns `unit`. The `forEachi()` function also returns `unit`. You use `forEachi()` when you need to process each element in the array but not return any new array or value; for example, to print the items in an array. See [`Array.forEach`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach) on MDN.
-
-## Examples
-
-```rescript
-// display all elements in an array as a numbered list
-Js.Array.forEachi((item, index) => Js.log2(index + 1, item), ["a", "b", "c"]) == ()
-```
-*/
-external forEachi: (@uncurry ('a, int) => unit) => unit = "forEach"
-
-/* commented out until bs has a plan for iterators
-   external keys : int array_iter = "" [@@bs.send.pipe: 'a t as 'this] (* ES2015 *)
-*/
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Applies the function (given as the first argument) to each item in the array,
-returning a new array. The result array does not have to have elements of the
-same type as the input array. See
-[`Array.map`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array.map(x => x * x, [12, 4, 8]) == [144, 16, 64]
-Js.Array.map(Js.String.length, ["animal", "vegetable", "mineral"]) == [6, 9, 7]
-```
-*/
-external map: (@uncurry ('a => 'b)) => t<'b> = "map"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Applies the function (given as the first argument) to each item in the array,
-returning a new array. The function acceps two arguments: an item from the
-array and its index number. The result array does not have to have elements
-of the same type as the input array. See
-[`Array.map`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map)
-on MDN.
-
-## Examples
-
-```rescript
-// multiply each item in array by its position
-let product = (item, index) => item * index
-Js.Array.mapi(product, [10, 11, 12]) == [0, 11, 24]
-```
-*/
-external mapi: (@uncurry ('a, int) => 'b) => t<'b> = "map"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-The `reduce()` function takes three parameters: a *reducer function*, a
-beginning accumulator value, and an array. The reducer function has two
-parameters: an accumulated value and an element of the array.
-
-`reduce()` first calls the reducer function with the beginning value and the
-first element in the array. The result becomes the new accumulator value, which
-is passed in to the reducer function along with the second element in the
-array. `reduce()` proceeds through the array, passing in the result of each
-stage as the accumulator to the reducer function.
-
-When all array elements are processed, the final value of the accumulator
-becomes the return value of `reduce()`. See
-[`Array.reduce`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce)
-on MDN.
-
-## Examples
-
-```rescript
-let sumOfSquares = (accumulator, item) => accumulator + item * item
-
-Js.Array.reduce(sumOfSquares, 0, [10, 2, 4]) == 120
-Js.Array.reduce(\"*", 1, [10, 2, 4]) == 80
-Js.Array.reduce(
-  (acc, item) => acc + Js.String.length(item),
-  0,
-  ["animal", "vegetable", "mineral"],
-) == 22 // 6 + 9 + 7
-Js.Array.reduce((acc, item) => item /. acc, 1.0, [2.0, 4.0]) == 2.0 // 4.0 / (2.0 / 1.0)
-```
-*/
-external reduce: (@uncurry ('b, 'a) => 'b, 'b) => 'b = "reduce"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-The `reducei()` function takes three parameters: a *reducer function*, a
-beginning accumulator value, and an array. The reducer function has three
-parameters: an accumulated value, an element of the array, and the index of
-that element.
-
-`reducei()` first calls the reducer function with the beginning value, the
-first element in the array, and zero (its index). The result becomes the new
-accumulator value, which is passed to the reducer function along with the
-second element in the array and one (its index). `reducei()` proceeds from left
-to right through the array, passing in the result of each stage as the
-accumulator to the reducer function.
-
-When all array elements are processed, the final value of the accumulator
-becomes the return value of `reducei()`. See
-[`Array.reduce`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce)
-on MDN.
-
-## Examples
-
-```rescript
-// find sum of even-index elements in array
-let sumOfEvens = (accumulator, item, index) =>
-  if mod(index, 2) == 0 {
-    accumulator + item
-  } else {
-    accumulator
-  }
-
-Js.Array.reducei(sumOfEvens, 0, [2, 5, 1, 4, 3]) == 6
-```
-*/
-external reducei: (@uncurry ('b, 'a, int) => 'b, 'b) => 'b = "reduce"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-The `reduceRight()` function takes three parameters: a *reducer function*, a
-beginning accumulator value, and an array. The reducer function has two
-parameters: an accumulated value and an element of the array.
-
-`reduceRight()` first calls the reducer function with the beginning value and
-the last element in the array. The result becomes the new accumulator value,
-which is passed in to the reducer function along with the next-to-last element
-in the array. `reduceRight()` proceeds from right to left through the array,
-passing in the result of each stage as the accumulator to the reducer function.
-
-When all array elements are processed, the final value of the accumulator
-becomes the return value of `reduceRight()`.  See
-[`Array.reduceRight`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight)
-on MDN.
-
-**NOTE:** In many cases, `reduce()` and `reduceRight()` give the same result. However, see the last example here and compare it to the example from `reduce()`, where order makes a difference.
-
-## Examples
-
-```rescript
-let sumOfSquares = (accumulator, item) => accumulator + item * item
-
-Js.Array.reduceRight(sumOfSquares, 0, [10, 2, 4]) == 120
-Js.Array.reduceRight((acc, item) => item /. acc, 1.0, [2.0, 4.0]) == 0.5 // 2.0 / (4.0 / 1.0)
-```
-*/
-external reduceRight: (@uncurry ('b, 'a) => 'b, 'b) => 'b = "reduceRight"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-The `reduceRighti()` function takes three parameters: a *reducer function*, a
-beginning accumulator value, and an array. The reducer function has three
-parameters: an accumulated value, an element of the array, and the index of
-that element. `reduceRighti()` first calls the reducer function with the
-beginning value, the last element in the array, and its index (length of array
-minus one). The result becomes the new accumulator value, which is passed in to
-the reducer function along with the second element in the array and one (its
-index). `reduceRighti()` proceeds from right to left through the array, passing
-in the result of each stage as the accumulator to the reducer function.
-
-When all array elements are processed, the final value of the accumulator
-becomes the return value of `reduceRighti()`. See
-[`Array.reduceRight`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight)
-on MDN.
-
-**NOTE:** In many cases, `reducei()` and `reduceRighti()` give the same result.
-However, there are cases where the order in which items are processed makes a
-difference.
-
-## Examples
-
-```rescript
-// find sum of even-index elements in array
-let sumOfEvens = (accumulator, item, index) =>
-  if mod(index, 2) == 0 {
-    accumulator + item
-  } else {
-    accumulator
-  }
-
-Js.Array.reduceRighti(sumOfEvens, 0, [2, 5, 1, 4, 3]) == 6
-```
-*/
-external reduceRighti: (@uncurry ('b, 'a, int) => 'b, 'b) => 'b = "reduceRight"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns `true` if the predicate function given as the first argument to
-`some()` returns `true` for any element in the array; `false` otherwise.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-
-Js.Array.some(isEven, [3, 7, 5, 2, 9]) == true
-Js.Array.some(isEven, [3, 7, 5, 1, 9]) == false
-```
-*/
-external some: (@uncurry ('a => bool)) => bool = "some"
-
-@bs.send.pipe(: t<'a> as 'this)
-/**
-Returns `true` if the predicate function given as the first argument to
-`somei()` returns `true` for any element in the array; `false` otherwise. The
-predicate function has two arguments: an item from the array and the index
-value
-
-## Examples
-
-```rescript
-// Does any string in the array
-// have the same length as its index?
-
-let sameLength = (str, index) => Js.String.length(str) == index
-
-// "ef" has length 2 and is it at index 2
-Js.Array.somei(sameLength, ["ab", "cd", "ef", "gh"]) == true
-// no item has the same length as its index
-Js.Array.somei(sameLength, ["a", "bc", "def", "gh"]) == false
-```
-*/
-external somei: (@uncurry ('a, int) => bool) => bool = "some"
-
-/* commented out until bs has a plan for iterators
-   external values : 'a array_iter = "" [@@bs.send.pipe: 'a t as 'this] (* ES2015 *)
-*/
-/**
-Returns the value at the given position in the array if the position is in
-bounds; returns the JavaScript value `undefined` otherwise.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103]
-Js.Array.unsafe_get(arr, 3) == 103
-Js.Array.unsafe_get(arr, 4) // returns undefined
-```
-*/
-external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
-
-/**
-Sets the value at the given position in the array if the position is in bounds.
-If the index is out of bounds, well, “here there be dragons.“ *This function
-  modifies the original array.*
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103]
-Js.Array.unsafe_set(arr, 3, 99)
-// result is [100, 101, 102, 99]
-
-Js.Array.unsafe_set(arr, 4, 88)
-// result is [100, 101, 102, 99, 88]
-
-Js.Array.unsafe_set(arr, 6, 77)
-// result is [100, 101, 102, 99, 88, <1 empty item>, 77]
-
-Js.Array.unsafe_set(arr, -1, 66)
-// you don't want to know.
-```
-*/
-external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
diff --git a/jscomp/others/js_array2.res b/jscomp/others/js_array2.res
deleted file mode 100644
index 7c270f0..0000000
--- a/jscomp/others/js_array2.res
+++ /dev/null
@@ -1,1185 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Provides bindings to JavaScript’s `Array` functions. These bindings are optimized for pipe-first (`->`), where the array to be processed is the first parameter in the function.
-
-Here is an example to find the sum of squares of all even numbers in an array.
-Without pipe first, we must call the functions in reverse order:
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-let square = x => x * x
-let result = {
-  open Js.Array2
-  reduce(map(filter([5, 2, 3, 4, 1], isEven), square), "+", 0)
-}
-```
-
-With pipe first, we call the functions in the “natural” order:
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-let square = x => x * x
-let result = {
-  open Js.Array2
-  [5, 2, 3, 4, 1]->filter(isEven)->map(square)->reduce("+", 0)
-}
-```
-*/
-
-/**
-The type used to describe a JavaScript array.
-*/
-type t<'a> = array<'a>
-
-/**
-A type used to describe JavaScript objects that are like an array or are iterable.
-*/
-type array_like<'a>
-
-/* commented out until bs has a plan for iterators
-   type 'a array_iter = 'a array_like
-*/
-
-@val
-/**
-Creates a shallow copy of an array from an array-like object. See
-[`Array.from`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from)
-on MDN.
-
-## Examples
-
-```rescript
-let strArr = Js.String.castToArrayLike("abcd")
-Js.Array2.from(strArr) == ["a", "b", "c", "d"]
-```
-*/
-external from: array_like<'a> => array<'a> = "Array.from"
-
-/* ES2015 */
-
-@val
-/**
-Creates a new array by applying a function (the second argument) to each item
-in the `array_like` first argument.  See
-[`Array.from`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from)
-on MDN.
-
-## Examples
-
-```rescript
-let strArr = Js.String.castToArrayLike("abcd")
-let code = s => Js.String.charCodeAt(0, s)
-Js.Array2.fromMap(strArr, code) == [97.0, 98.0, 99.0, 100.0]
-```
-*/
-external fromMap: (array_like<'a>, @uncurry ('a => 'b)) => array<'b> = "Array.from"
-
-/* ES2015 */
-
-@val
-/**
-Returns `true` if its argument is an array; `false` otherwise. This is a runtime check, which is why the second example returns `true`---a list is internally represented as a nested JavaScript array.
-
-## Examples
-
-```rescript
-Js.Array2.isArray([5, 2, 3, 1, 4]) == true
-Js.Array2.isArray(list{5, 2, 3, 1, 4}) == true
-Js.Array2.isArray("abcd") == false
-```
-*/
-external isArray: 'a => bool = "Array.isArray"
-
-@get
-/**
-Returns the number of elements in the array. See
-[`Array.length`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/length)
-on MDN.
-*/
-external length: array<'a> => int = "length"
-
-/* Mutator functions */
-
-@send
-/**
-Copies from the first element in the given array to the designated `~to_`
-position, returning the resulting array. *This function modifies the original
-array.* See
-[`Array.copyWithin`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array2.copyWithin(arr, ~to_=2) == [100, 101, 100, 101, 102]
-arr == [100, 101, 100, 101, 102]
-```
-*/
-external copyWithin: (t<'a>, ~to_: int) => t<'a> = "copyWithin"
-
-/* ES2015 */
-
-@send
-/**
-Copies starting at element `~from` in the given array to the designated `~to_`
-position, returning the resulting array. *This function modifies the original
-array.* See
-[`Array.copyWithin`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array2.copyWithinFrom(arr, ~from=2, ~to_=0) == [102, 103, 104, 103, 104]
-arr == [102, 103, 104, 103, 104]
-```
-*/
-external copyWithinFrom: (t<'a>, ~to_: int, ~from: int) => t<'a> = "copyWithin"
-
-/* ES2015 */
-
-@send
-/**
-Copies starting at element `~start` in the given array up to but not including
-`~end_` to the designated `~to_` position, returning the resulting array. *This
-function modifies the original array.* See
-[`Array.copyWithin`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/copyWithin)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104, 105]
-Js.Array2.copyWithinFromRange(arr, ~start=2, ~end_=5, ~to_=1) == [100, 102, 103, 104, 104, 105]
-arr == [100, 102, 103, 104, 104, 105]
-```
-*/
-external copyWithinFromRange: (t<'a>, ~to_: int, ~start: int, ~end_: int) => t<'a> = "copyWithin"
-
-/* ES2015 */
-
-@send
-/**
-Sets all elements of the given array (the first arumgent) to the designated
-value (the secon argument), returning the resulting array. *This function
-  modifies the original array.*
-
-See
-[`Array.fill`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array2.fillInPlace(arr, 99) == [99, 99, 99, 99, 99]
-arr == [99, 99, 99, 99, 99]
-```
-*/
-external fillInPlace: (t<'a>, 'a) => t<'a> = "fill"
-
-/* ES2015 */
-
-@send
-/**
-Sets all elements of the given array (the first arumgent) from position `~from`
-to the end to the designated value (the second argument), returning the
-resulting array. *This function modifies the original array.* See
-[`Array.fill`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array2.fillFromInPlace(arr, 99, ~from=2) == [100, 101, 99, 99, 99]
-arr == [100, 101, 99, 99, 99]
-```
-*/
-external fillFromInPlace: (t<'a>, 'a, ~from: int) => t<'a> = "fill"
-
-/* ES2015 */
-
-@send
-/**
-Sets the elements of the given array (the first arumgent) from position
-`~start` up to but not including position `~end_` to the designated value (the
-second argument), returning the resulting array. *This function modifies the
-original array.* See
-[`Array.fill`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/fill)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array2.fillRangeInPlace(arr, 99, ~start=1, ~end_=4) == [100, 99, 99, 99, 104]
-arr == [100, 99, 99, 99, 104]
-```
-*/
-external fillRangeInPlace: (t<'a>, 'a, ~start: int, ~end_: int) => t<'a> = "fill"
-
-/* ES2015 */
-
-@send
-@return(undefined_to_opt)
-/**
-If the array is not empty, removes the last element and returns it as
-`Some(value)`; returns `None` if the array is empty. *This function modifies
-the original array.* See
-[`Array.pop`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/pop)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array2.pop(arr) == Some(104)
-arr == [100, 101, 102, 103]
-
-let empty: array<int> = []
-Js.Array2.pop(empty) == None
-```
-*/
-external pop: t<'a> => option<'a> = "pop"
-
-@send
-/**
-Appends the given value to the array, returning the number of elements in the
-updated array. *This function modifies the original array.* See
-[`Array.push`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/push)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["ant", "bee", "cat"]
-Js.Array2.push(arr, "dog") == 4
-arr == ["ant", "bee", "cat", "dog"]
-```
-*/
-external push: (t<'a>, 'a) => int = "push"
-
-@send
-@variadic
-/**
-Appends the values from one array (the second argument) to another (the first
-argument), returning the number of elements in the updated array. *This
-function modifies the original array.* See
-[`Array.push`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/push)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["ant", "bee", "cat"]
-Js.Array2.pushMany(arr, ["dog", "elk"]) == 5
-arr == ["ant", "bee", "cat", "dog", "elk"]
-```
-*/
-external pushMany: (t<'a>, array<'a>) => int = "push"
-
-@send
-/**
-Returns an array with the elements of the input array in reverse order. *This
-function modifies the original array.* See
-[`Array.reverse`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["ant", "bee", "cat"]
-Js.Array2.reverseInPlace(arr) == ["cat", "bee", "ant"]
-arr == ["cat", "bee", "ant"]
-```
-*/
-external reverseInPlace: t<'a> => t<'a> = "reverse"
-
-@send
-@return(undefined_to_opt)
-/**
-If the array is not empty, removes the first element and returns it as
-`Some(value)`; returns `None` if the array is empty. *This function modifies
-the original array.* See
-[`Array.shift`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/shift)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104]
-Js.Array2.shift(arr) == Some(100)
-arr == [101, 102, 103, 104]
-
-let empty: array<int> = []
-Js.Array2.shift(empty) == None
-```
-*/
-external shift: t<'a> => option<'a> = "shift"
-
-@send
-/**
-Sorts the given array in place and returns the sorted array. JavaScript sorts
-the array by converting the arguments to UTF-16 strings and sorting them. See
-the second example with sorting numbers, which does not do a numeric sort.
-*This function modifies the original array.* See
-[`Array.sort`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort)
-on MDN.
-
-## Examples
-
-```rescript
-let words = ["bee", "dog", "ant", "cat"]
-Js.Array2.sortInPlace(words) == ["ant", "bee", "cat", "dog"]
-words == ["ant", "bee", "cat", "dog"]
-
-let numbers = [3, 30, 10, 1, 20, 2]
-Js.Array2.sortInPlace(numbers) == [1, 10, 2, 20, 3, 30]
-numbers == [1, 10, 2, 20, 3, 30]
-```
-*/
-external sortInPlace: t<'a> => t<'a> = "sort"
-
-@send
-/**
-Sorts the given array in place and returns the sorted array. *This function
-  modifies the original array.*
-
-The first argument to `sortInPlaceWith()` is a function that compares two items
-from the array and returns:
-
-* an integer less than zero if the first item is less than the second item *
-zero if the items are equal * an integer greater than zero if the first item is
-greater than the second item
-
-See
-[`Array.sort`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort)
-on MDN.
-
-## Examples
-
-```rescript
-// sort by word length
-let words = ["horse", "aardvark", "dog", "camel"]
-let byLength = (s1, s2) => Js.String.length(s1) - Js.String.length(s2)
-
-Js.Array2.sortInPlaceWith(words, byLength) == ["dog", "horse", "camel", "aardvark"]
-
-// sort in reverse numeric order
-let numbers = [3, 30, 10, 1, 20, 2]
-let reverseNumeric = (n1, n2) => n2 - n1
-Js.Array2.sortInPlaceWith(numbers, reverseNumeric) == [30, 20, 10, 3, 2, 1]
-```
-*/
-external sortInPlaceWith: (t<'a>, @uncurry ('a, 'a) => int) => t<'a> = "sort"
-
-@send
-@variadic
-/**
-Starting at position `~pos`, remove `~remove` elements and then add the
-elements from the `~add` array. Returns an array consisting of the removed
-items. *This function modifies the original array.* See
-[`Array.splice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["a", "b", "c", "d", "e", "f"]
-Js.Array2.spliceInPlace(arr, ~pos=2, ~remove=2, ~add=["x", "y", "z"]) == ["c", "d"]
-arr == ["a", "b", "x", "y", "z", "e", "f"]
-
-let arr2 = ["a", "b", "c", "d"]
-Js.Array2.spliceInPlace(arr2, ~pos=3, ~remove=0, ~add=["x", "y"]) == []
-arr2 == ["a", "b", "c", "x", "y", "d"]
-
-let arr3 = ["a", "b", "c", "d", "e", "f"]
-Js.Array2.spliceInPlace(arr3, ~pos=9, ~remove=2, ~add=["x", "y", "z"]) == []
-arr3 == ["a", "b", "c", "d", "e", "f", "x", "y", "z"]
-```
-*/
-external spliceInPlace: (t<'a>, ~pos: int, ~remove: int, ~add: array<'a>) => t<'a> = "splice"
-
-@send
-/**
-Removes elements from the given array starting at position `~pos` to the end of
-the array, returning the removed elements. *This function modifies the original
-array.* See
-[`Array.splice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["a", "b", "c", "d", "e", "f"]
-Js.Array2.removeFromInPlace(arr, ~pos=4) == ["e", "f"]
-arr == ["a", "b", "c", "d"]
-```
-*/
-external removeFromInPlace: (t<'a>, ~pos: int) => t<'a> = "splice"
-
-@send
-/**
-Removes `~count` elements from the given array starting at position `~pos`,
-returning the removed elements. *This function modifies the original array.*
-See
-[`Array.splice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["a", "b", "c", "d", "e", "f"]
-Js.Array2.removeCountInPlace(arr, ~pos=2, ~count=3) == ["c", "d", "e"]
-arr == ["a", "b", "f"]
-```
-*/
-external removeCountInPlace: (t<'a>, ~pos: int, ~count: int) => t<'a> = "splice"
-
-@send
-/**
-Adds the given element to the array, returning the new number of elements in
-the array. *This function modifies the original array.* See
-[`Array.unshift`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/unshift)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["b", "c", "d"]
-Js.Array2.unshift(arr, "a") == 4
-arr == ["a", "b", "c", "d"]
-```
-*/
-external unshift: (t<'a>, 'a) => int = "unshift"
-
-@send
-@variadic
-/**
-Adds the elements in the second array argument at the beginning of the first
-array argument, returning the new number of elements in the array. *This
-function modifies the original array.* See
-[`Array.unshift`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/unshift)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = ["d", "e"]
-Js.Array2.unshiftMany(arr, ["a", "b", "c"]) == 5
-arr == ["a", "b", "c", "d", "e"]
-```
-*/
-external unshiftMany: (t<'a>, array<'a>) => int = "unshift"
-
-/* Accessor functions
- */
-@send @deprecated("`append` is not type-safe. Use `concat` instead.")
-external append: (t<'a>, 'a) => t<'a> = "concat"
-
-@send
-/**
-Concatenates the second array argument to the first array argument, returning a
-new array. The original arrays are not modified. See
-[`Array.concat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/concat)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.concat(["a", "b"], ["c", "d", "e"]) == ["a", "b", "c", "d", "e"]
-```
-*/
-external concat: (t<'a>, t<'a>) => t<'a> = "concat"
-
-@send
-@variadic
-/**
-The second argument to `concatMany()` is an array of arrays; these are added at
-the end of the first argument, returning a new array. See
-[`Array.concat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/concat)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.concatMany(["a", "b", "c"], [["d", "e"], ["f", "g", "h"]]) == [
-    "a",
-    "b",
-    "c",
-    "d",
-    "e",
-    "f",
-    "g",
-    "h",
-  ]
-```
-*/
-external concatMany: (t<'a>, array<t<'a>>) => t<'a> = "concat"
-
-@send
-/**
-Returns true if the given value is in the array, `false` otherwise. See
-[`Array.includes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.includes(["a", "b", "c"], "b") == true
-Js.Array2.includes(["a", "b", "c"], "x") == false
-```
-*/
-external includes: (t<'a>, 'a) => bool = "includes"
-
-@send
-/**
-Returns the index of the first element in the array that has the given value.
-If the value is not in the array, returns -1. See
-[`Array.indexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.indexOf([100, 101, 102, 103], 102) == 2
-Js.Array2.indexOf([100, 101, 102, 103], 999) == -1
-```
-*/
-external indexOf: (t<'a>, 'a) => int = "indexOf"
-
-@send
-/**
-Returns the index of the first element in the array with the given value. The
-search starts at position `~from`. See
-[`Array.indexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.indexOfFrom(["a", "b", "a", "c", "a"], "a", ~from=2) == 2
-Js.Array2.indexOfFrom(["a", "b", "a", "c", "a"], "a", ~from=3) == 4
-Js.Array2.indexOfFrom(["a", "b", "a", "c", "a"], "b", ~from=2) == -1
-```
-*/
-external indexOfFrom: (t<'a>, 'a, ~from: int) => int = "indexOf"
-
-@send
-/**
-This function converts each element of the array to a string (via JavaScript)
-and concatenates them, separated by the string given in the first argument,
-into a single string. See
-[`Array.join`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.joinWith(["ant", "bee", "cat"], "--") == "ant--bee--cat"
-Js.Array2.joinWith(["door", "bell"], "") == "doorbell"
-Js.Array2.joinWith([2020, 9, 4], "/") == "2020/9/4"
-Js.Array2.joinWith([2.5, 3.6, 3e-2], ";") == "2.5;3.6;0.03"
-```
-*/
-external joinWith: (t<'a>, string) => string = "join"
-
-@send
-/**
-Returns the index of the last element in the array that has the given value. If
-the value is not in the array, returns -1. See
-[`Array.lastIndexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.lastIndexOf(["a", "b", "a", "c"], "a") == 2
-Js.Array2.lastIndexOf(["a", "b", "a", "c"], "x") == -1
-```
-*/
-external lastIndexOf: (t<'a>, 'a) => int = "lastIndexOf"
-
-@send
-/**
-Returns the index of the last element in the array that has the given value,
-searching from position `~from` down to the start of the array. If the value is
-not in the array, returns -1. See
-[`Array.lastIndexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/lastIndexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.lastIndexOfFrom(["a", "b", "a", "c", "a", "d"], "a", ~from=3) == 2
-Js.Array2.lastIndexOfFrom(["a", "b", "a", "c", "a", "d"], "c", ~from=2) == -1
-```
-*/
-external lastIndexOfFrom: (t<'a>, 'a, ~from: int) => int = "lastIndexOf"
-
-@send
-/**
-Returns a shallow copy of the given array from the `~start` index up to but not
-including the `~end_` position. Negative numbers indicate an offset from the
-end of the array. See
-[`Array.slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice)
-on MDN.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103, 104, 105, 106]
-Js.Array2.slice(arr, ~start=2, ~end_=5) == [102, 103, 104]
-Js.Array2.slice(arr, ~start=-3, ~end_=-1) == [104, 105]
-Js.Array2.slice(arr, ~start=9, ~end_=10) == []
-```
-*/
-external slice: (t<'a>, ~start: int, ~end_: int) => t<'a> = "slice"
-
-@send
-/**
-Returns a copy of the entire array. Same as `Js.Array2.Slice(arr, ~start=0,
-~end_=Js.Array2.length(arr))`. See
-[`Array.slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice)
-on MDN.
-*/
-external copy: t<'a> => t<'a> = "slice"
-
-@send
-/**
-Returns a shallow copy of the given array from the given index to the end. See
-[`Array.slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice)
-on MDN.
-*/
-external sliceFrom: (t<'a>, int) => t<'a> = "slice"
-
-@send
-/**
-Converts the array to a string. Each element is converted to a string using
-JavaScript. Unlike the JavaScript `Array.toString()`, all elements in a
-ReasonML array must have the same type. See
-[`Array.toString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.toString([3.5, 4.6, 7.8]) == "3.5,4.6,7.8"
-Js.Array2.toString(["a", "b", "c"]) == "a,b,c"
-```
-*/
-external toString: t<'a> => string = "toString"
-
-@send
-/**
-Converts the array to a string using the conventions of the current locale.
-Each element is converted to a string using JavaScript. Unlike the JavaScript
-`Array.toLocaleString()`, all elements in a ReasonML array must have the same
-type. See
-[`Array.toLocaleString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toLocaleString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.toLocaleString([Js.Date.make()])
-// returns "3/19/2020, 10:52:11 AM" for locale en_US.utf8
-// returns "2020-3-19 10:52:11" for locale de_DE.utf8
-```
-*/
-external toLocaleString: t<'a> => string = "toLocaleString"
-
-/* Iteration functions
- */
-/* commented out until bs has a plan for iterators
-   external entries : 'a t -> (int * 'a) array_iter = "" [@@bs.send] (* ES2015 *)
-*/
-
-@send
-/**
-The first argument to `every()` is an array. The second argument is a predicate
-function that returns a boolean. The `every()` function returns `true` if the
-predicate function is true for all items in the given array. If given an empty
-array, returns `true`. See
-[`Array.every`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every)
-on MDN.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-Js.Array2.every([6, 22, 8, 4], isEven) == true
-Js.Array2.every([6, 22, 7, 4], isEven) == false
-```
-*/
-external every: (t<'a>, @uncurry ('a => bool)) => bool = "every"
-
-@send
-/**
-The first argument to `everyi()` is an array. The second argument is a
-predicate function with two arguments: an array element and that element’s
-index; it returns a boolean. The `everyi()` function returns `true` if the
-predicate function is true for all items in the given array. If given an empty
-array, returns `true`. See
-[`Array.every`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every)
-on MDN.
-
-## Examples
-
-```rescript
-// determine if all even-index items are positive
-let evenIndexPositive = (item, index) => mod(index, 2) == 0 ? item > 0 : true
-
-Js.Array2.everyi([6, -3, 5, 8], evenIndexPositive) == true
-Js.Array2.everyi([6, 3, -5, 8], evenIndexPositive) == false
-```
-*/
-external everyi: (t<'a>, @uncurry ('a, int) => bool) => bool = "every"
-
-@send
-/**
-Applies the given predicate function (the second argument) to each element in
-the array; the result is an array of those elements for which the predicate
-function returned `true`. See
-[`Array.filter`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter)
-on MDN.
-
-## Examples
-
-```rescript
-let nonEmpty = s => s != ""
-Js.Array2.filter(["abc", "", "", "def", "ghi"], nonEmpty) == ["abc", "def", "ghi"]
-```
-*/
-external filter: (t<'a>, @uncurry ('a => bool)) => t<'a> = "filter"
-
-@send
-/**
-Each element of the given array are passed to the predicate function. The
-return value is an array of all those elements for which the predicate function
-returned `true`.
-
-See
-[`Array.filter`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter)
-on MDN.
-
-## Examples
-
-```rescript
-// keep only positive elements at odd indices
-let positiveOddElement = (item, index) => mod(index, 2) == 1 && item > 0
-
-Js.Array2.filteri([6, 3, 5, 8, 7, -4, 1], positiveOddElement) == [3, 8]
-```
-*/
-external filteri: (t<'a>, @uncurry ('a, int) => bool) => t<'a> = "filter"
-
-@send
-@return({undefined_to_opt: undefined_to_opt})
-/**
-Returns `Some(value)` for the first element in the array that satisifies the
-given predicate function, or `None` if no element satisifies the predicate. See
-[`Array.find`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find)
-on MDN.
-
-## Examples
-
-```rescript
-// find first negative element
-Js.Array2.find([33, 22, -55, 77, -44], x => x < 0) == Some(-55)
-Js.Array2.find([33, 22, 55, 77, 44], x => x < 0) == None
-```
-*/
-external find: (t<'a>, @uncurry ('a => bool)) => option<'a> = "find"
-
-/* ES2015 */
-
-@send
-@return({undefined_to_opt: undefined_to_opt})
-/**
-Returns `Some(value)` for the first element in the array that satisifies the
-given predicate function, or `None` if no element satisifies the predicate. The
-predicate function takes an array element and an index as its parameters. See
-[`Array.find`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find)
-on MDN.
-
-## Examples
-
-```rescript
-// find first positive item at an odd index
-let positiveOddElement = (item, index) => mod(index, 2) == 1 && item > 0
-
-Js.Array2.findi([66, -33, 55, 88, 22], positiveOddElement) == Some(88)
-Js.Array2.findi([66, -33, 55, -88, 22], positiveOddElement) == None
-```
-*/
-external findi: (t<'a>, @uncurry ('a, int) => bool) => option<'a> = "find"
-
-/* ES2015 */
-
-@send
-/**
-Returns the index of the first element in the array that satisifies the given
-predicate function, or -1 if no element satisifies the predicate. See
-[`Array.find`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.findIndex([33, 22, -55, 77, -44], x => x < 0) == 2
-Js.Array2.findIndex([33, 22, 55, 77, 44], x => x < 0) == -1
-```
-*/
-external findIndex: (t<'a>, @uncurry ('a => bool)) => int = "findIndex"
-
-/* ES2015 */
-
-@send
-/**
-Returns `Some(value)` for the first element in the array that satisifies the
-given predicate function, or `None` if no element satisifies the predicate. The
-predicate function takes an array element and an index as its parameters. See
-[`Array.find`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find)
-on MDN.
-
-## Examples
-
-```rescript
-// find index of first positive item at an odd index
-let positiveOddElement = (item, index) => mod(index, 2) == 1 && item > 0
-
-Js.Array2.findIndexi([66, -33, 55, 88, 22], positiveOddElement) == 3
-Js.Array2.findIndexi([66, -33, 55, -88, 22], positiveOddElement) == -1
-```
-*/
-external findIndexi: (t<'a>, @uncurry ('a, int) => bool) => int = "findIndex"
-
-/* ES2015 */
-
-@send
-/**
-The `forEach()` function applies the function given as the second argument to
-each element in the array. The function you provide returns `unit`, and the
-`forEach()` function also returns `unit`. You use `forEach()` when you need to
-process each element in the array but not return any new array or value; for
-example, to print the items in an array. See
-[`Array.forEach`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach)
-on MDN.
-
-## Examples
-
-```rescript
-// display all elements in an array
-Js.Array2.forEach(["a", "b", "c"], x => Js.log(x)) == ()
-```
-*/
-external forEach: (t<'a>, @uncurry ('a => unit)) => unit = "forEach"
-
-@send
-/**
-The `forEachi()` function applies the function given as the second argument to
-each element in the array. The function you provide takes an item in the array
-and its index number, and returns `unit`. The `forEachi()` function also
-returns `unit`. You use `forEachi()` when you need to process each element in
-the array but not return any new array or value; for example, to print the
-items in an array. See
-[`Array.forEach`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach)
-on MDN.
-
-## Examples
-
-```rescript
-// display all elements in an array as a numbered list
-Js.Array2.forEachi(["a", "b", "c"], (item, index) => Js.log2(index + 1, item)) == ()
-```
-*/
-external forEachi: (t<'a>, @uncurry ('a, int) => unit) => unit = "forEach"
-
-/* commented out until bs has a plan for iterators
-   external keys : 'a t -> int array_iter = "" [@@bs.send] (* ES2015 *)
-*/
-
-@send
-/**
-Applies the function (the second argument) to each item in the array, returning
-a new array. The result array does not have to have elements of the same type
-as the input array. See
-[`Array.map`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Array2.map([12, 4, 8], x => x * x) == [144, 16, 64]
-Js.Array2.map(["animal", "vegetable", "mineral"], Js.String.length) == [6, 9, 7]
-```
-*/
-external map: (t<'a>, @uncurry ('a => 'b)) => t<'b> = "map"
-
-@send
-/**
-Applies the function (the second argument) to each item in the array, returning
-a new array. The function acceps two arguments: an item from the array and its
-index number. The result array does not have to have elements of the same type
-as the input array. See
-[`Array.map`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map)
-on MDN.
-
-## Examples
-
-```rescript
-// multiply each item in array by its position
-let product = (item, index) => item * index
-Js.Array2.mapi([10, 11, 12], product) == [0, 11, 24]
-```
-*/
-external mapi: (t<'a>, @uncurry ('a, int) => 'b) => t<'b> = "map"
-
-@send
-/**
-The `reduce()` function takes three parameters: an array, a *reducer function*,
-and a beginning accumulator value. The reducer function has two parameters: an
-accumulated value and an element of the array.
-
-`reduce()` first calls the reducer function with the beginning value and the
-first element in the array. The result becomes the new accumulator value, which
-is passed in to the reducer function along with the second element in the
-array. `reduce()` proceeds through the array, passing in the result of each
-stage as the accumulator to the reducer function.
-
-When all array elements are processed, the final value of the accumulator
-becomes the return value of `reduce()`. See
-[`Array.reduce`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce)
-on MDN.
-
-## Examples
-
-```rescript
-let sumOfSquares = (accumulator, item) => accumulator + item * item
-
-Js.Array2.reduce([10, 2, 4], sumOfSquares, 0) == 120
-Js.Array2.reduce([10, 2, 4], "*", 1) == 80
-Js.Array2.reduce(
-  ["animal", "vegetable", "mineral"],
-  (acc, item) => acc + Js.String.length(item),
-  0,
-) == 22 // 6 + 9 + 7
-Js.Array2.reduce([2.0, 4.0], (acc, item) => item /. acc, 1.0) == 2.0 // 4.0 / (2.0 / 1.0)
-```
-*/
-external reduce: (t<'a>, @uncurry ('b, 'a) => 'b, 'b) => 'b = "reduce"
-
-@send
-/**
-The `reducei()` function takes three parameters: an array, a *reducer
-function*, and a beginning accumulator value. The reducer function has three
-parameters: an accumulated value, an element of the array, and the index of
-that element.
-
-`reducei()` first calls the reducer function with the beginning value, the
-first element in the array, and zero (its index). The result becomes the new
-accumulator value, which is passed to the reducer function along with the
-second element in the array and one (its index). `reducei()` proceeds from left
-to right through the array, passing in the result of each stage as the
-accumulator to the reducer function.
-
-When all array elements are processed, the final value of the accumulator
-becomes the return value of `reducei()`. See
-[`Array.reduce`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce)
-on MDN.
-
-## Examples
-
-```rescript
-// find sum of even-index elements in array
-let sumOfEvens = (accumulator, item, index) =>
-  if mod(index, 2) == 0 {
-    accumulator + item
-  } else {
-    accumulator
-  }
-
-Js.Array2.reducei([2, 5, 1, 4, 3], sumOfEvens, 0) == 6
-```
-*/
-external reducei: (t<'a>, @uncurry ('b, 'a, int) => 'b, 'b) => 'b = "reduce"
-
-@send
-/**
-The `reduceRight()` function takes three parameters: an array, a *reducer
-function*, and a beginning accumulator value. The reducer function has two
-parameters: an accumulated value and an element of the array.
-
-`reduceRight()` first calls the reducer function with the beginning value and
-the last element in the array. The result becomes the new accumulator value,
-which is passed in to the reducer function along with the next-to-last element
-in the array. `reduceRight()` proceeds from right to left through the array,
-passing in the result of each stage as the accumulator to the reducer function.
-
-When all array elements are processed, the final value of the accumulator
-becomes the return value of `reduceRight()`.  See
-[`Array.reduceRight`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight)
-on MDN.
-
-**NOTE:** In many cases, `reduce()` and `reduceRight()` give the same result.
-However, see the last example here and compare it to the example from
-`reduce()`, where order makes a difference.
-
-## Examples
-
-```rescript
-let sumOfSquares = (accumulator, item) => accumulator + item * item
-
-Js.Array2.reduceRight([10, 2, 4], sumOfSquares, 0) == 120
-Js.Array2.reduceRight([2.0, 4.0], (acc, item) => item /. acc, 1.0) == 0.5 // 2.0 / (4.0 / 1.0)
-```
-*/
-external reduceRight: (t<'a>, @uncurry ('b, 'a) => 'b, 'b) => 'b = "reduceRight"
-
-@send
-/**
-The `reduceRighti()` function takes three parameters: an array, a *reducer
-function*, and a beginning accumulator value. The reducer function has three
-parameters: an accumulated value, an element of the array, and the index of
-that element. `reduceRighti()` first calls the reducer function with the
-beginning value, the last element in the array, and its index (length of array
-minus one). The result becomes the new accumulator value, which is passed in to
-the reducer function along with the second element in the array and one (its
-index). `reduceRighti()` proceeds from right to left through the array, passing
-in the result of each stage as the accumulator to the reducer function.
-
-When all array elements are processed, the final value of the accumulator
-becomes the return value of `reduceRighti()`. See
-[`Array.reduceRight`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduceRight)
-on MDN.
-
-**NOTE:** In many cases, `reducei()` and `reduceRighti()` give the same result.
-However, there are cases where the order in which items are processed makes a
-difference.
-
-## Examples
-
-```rescript
-// find sum of even-index elements in array
-let sumOfEvens = (accumulator, item, index) =>
-  if mod(index, 2) == 0 {
-    accumulator + item
-  } else {
-    accumulator
-  }
-
-Js.Array2.reduceRighti([2, 5, 1, 4, 3], sumOfEvens, 0) == 6
-```
-*/
-external reduceRighti: (t<'a>, @uncurry ('b, 'a, int) => 'b, 'b) => 'b = "reduceRight"
-
-@send
-/**
-Returns `true` if the predicate function given as the second argument to
-`some()` returns `true` for any element in the array; `false` otherwise.
-
-## Examples
-
-```rescript
-let isEven = x => mod(x, 2) == 0
-
-Js.Array2.some([3, 7, 5, 2, 9], isEven) == true
-Js.Array2.some([3, 7, 5, 1, 9], isEven) == false
-```
-*/
-external some: (t<'a>, @uncurry ('a => bool)) => bool = "some"
-
-@send
-/**
-Returns `true` if the predicate function given as the second argument to
-`somei()` returns `true` for any element in the array; `false` otherwise. The
-predicate function has two arguments: an item from the array and the index
-value
-
-## Examples
-
-```rescript
-// Does any string in the array
-// have the same length as its index?
-
-let sameLength = (str, index) => Js.String.length(str) == index
-
-// "ef" has length 2 and is it at index 2
-Js.Array2.somei(["ab", "cd", "ef", "gh"], sameLength) == true
-// no item has the same length as its index
-Js.Array2.somei(["a", "bc", "def", "gh"], sameLength) == false
-```
-*/
-external somei: (t<'a>, @uncurry ('a, int) => bool) => bool = "some"
-
-/* commented out until bs has a plan for iterators
-   external values : 'a t -> 'a array_iter = "" [@@bs.send] (* ES2015 *)
-*/
-
-/**
-Returns the value at the given position in the array if the position is in
-bounds; returns the JavaScript value `undefined` otherwise.
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103]
-Js.Array2.unsafe_get(arr, 3) == 103
-Js.Array2.unsafe_get(arr, 4) // returns undefined
-```
-*/
-external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
-
-/**
-Sets the value at the given position in the array if the position is in bounds.
-If the index is out of bounds, well, “here there be dragons.“
-
-*This function modifies the original array.*
-
-## Examples
-
-```rescript
-let arr = [100, 101, 102, 103]
-Js.Array2.unsafe_set(arr, 3, 99)
-// result is [100, 101, 102, 99];
-
-Js.Array2.unsafe_set(arr, 4, 88)
-// result is [100, 101, 102, 99, 88]
-
-Js.Array2.unsafe_set(arr, 6, 77)
-// result is [100, 101, 102, 99, 88, <1 empty item>, 77]
-
-Js.Array2.unsafe_set(arr, -1, 66)
-// you don't want to know.
-```
-*/
-external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
diff --git a/jscomp/others/js_bigint.res b/jscomp/others/js_bigint.res
deleted file mode 100644
index 4288f1a..0000000
--- a/jscomp/others/js_bigint.res
+++ /dev/null
@@ -1,81 +0,0 @@
-/*** JavaScript BigInt API */
-
-@val
-/**
-Parses the given `string` into a `bigint` using JavaScript semantics. Return the
-number as a `bigint` if successfully parsed. Uncaught syntax exception otherwise.
-
-## Examples
-
-```rescript
-/* returns 123n */
-Js.BigInt.fromStringExn("123")
-
-/* returns 0n */
-Js.BigInt.fromStringExn("")
-
-/* returns 17n */
-Js.BigInt.fromStringExn("0x11")
-
-/* returns 3n */
-Js.BigInt.fromStringExn("0b11")
-
-/* returns 9n */
-Js.BigInt.fromStringExn("0o11")
-
-/* catch exception */
-try {
-  Js.BigInt.fromStringExn("a")
-} catch {
-| _ => ...
-}
-```
-*/
-external fromStringExn: string => bigint = "BigInt"
-
-// Operations
-
-external \"~-": bigint => bigint = "%negbigint"
-external \"~+": bigint => bigint = "%identity"
-external \"+": (bigint, bigint) => bigint = "%addbigint"
-external \"-": (bigint, bigint) => bigint = "%subbigint"
-external \"*": (bigint, bigint) => bigint = "%mulbigint"
-external \"/": (bigint, bigint) => bigint = "%divbigint"
-external mod: (bigint, bigint) => bigint = "%modbigint"
-external \"**": (bigint, bigint) => bigint = "%powbigint"
-
-external land: (bigint, bigint) => bigint = "%andbigint"
-external lor: (bigint, bigint) => bigint = "%orbigint"
-external lxor: (bigint, bigint) => bigint = "%xorbigint"
-
-let lnot = x => lxor(x, -1n)
-
-external lsl: (bigint, bigint) => bigint = "%lslbigint"
-external asr: (bigint, bigint) => bigint = "%asrbigint"
-
-@send
-/**
-Formats a `bigint` as a string. Return a `string` representing the given value.
-See [`toString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toString) on MDN.
-
-## Examples
-
-```rescript
-/* prints "123" */
-Js.BigInt.toString(123n)->Js.log
-```
-*/
-external toString: bigint => string = "toString"
-
-@send
-/**
-Returns a string with a language-sensitive representation of this BigInt value.
-
-## Examples
-
-```rescript
-/* prints "123" */
-Js.BigInt.toString(123n)->Js.log
-```
-*/
-external toLocaleString: bigint => string = "toLocaleString"
diff --git a/jscomp/others/js_blob.res b/jscomp/others/js_blob.res
deleted file mode 100644
index 969208c..0000000
--- a/jscomp/others/js_blob.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/*** JavaScript Blob API */
-
-type t
diff --git a/jscomp/others/js_cast.res b/jscomp/others/js_cast.res
deleted file mode 100644
index 0713541..0000000
--- a/jscomp/others/js_cast.res
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-external intOfBool: bool => int = "%identity"
-
-external floatOfInt: int => float = "%identity"
diff --git a/jscomp/others/js_cast.resi b/jscomp/others/js_cast.resi
deleted file mode 100644
index 8ef323b..0000000
--- a/jscomp/others/js_cast.resi
+++ /dev/null
@@ -1,48 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Safe cast between OCaml values which share the same
-runtime representation
-
-Different OCaml types might share the same represention in the
-ReScript runtime; while this is a compiler internal knowledge,
-applications might benefit from having a safe and zero cost
-conversion between those types.
-
-This modules acts as the **single place** for such conversion.
-
-If for any reason, the runtime representation changes, those function
-will be modified accordingly.
-*/
-
-/**
-`intOfBool(b)` returns `1` for when `b` is `true` and `0` when `b` is `false`
-*/
-external intOfBool: bool => int = "%identity"
-
-/**
-`floatOfInt(i)` returns the float value of `i`
-*/
-external floatOfInt: int => float = "%identity"
diff --git a/jscomp/others/js_console.res b/jscomp/others/js_console.res
deleted file mode 100644
index 9e0eda9..0000000
--- a/jscomp/others/js_console.res
+++ /dev/null
@@ -1,29 +0,0 @@
-@val @scope("console") external log: 'a => unit = "log"
-@val @scope("console") external log2: ('a, 'b) => unit = "log"
-@val @scope("console") external log3: ('a, 'b, 'c) => unit = "log"
-@val @scope("console") external log4: ('a, 'b, 'c, 'd) => unit = "log"
-@val @scope("console") @variadic external logMany: array<'a> => unit = "log"
-
-@val @scope("console") external info: 'a => unit = "info"
-@val @scope("console") external info2: ('a, 'b) => unit = "info"
-@val @scope("console") external info3: ('a, 'b, 'c) => unit = "info"
-@val @scope("console") external info4: ('a, 'b, 'c, 'd) => unit = "info"
-@val @scope("console") @variadic external infoMany: array<'a> => unit = "info"
-
-@val @scope("console") external warn: 'a => unit = "warn"
-@val @scope("console") external warn2: ('a, 'b) => unit = "warn"
-@val @scope("console") external warn3: ('a, 'b, 'c) => unit = "warn"
-@val @scope("console") external warn4: ('a, 'b, 'c, 'd) => unit = "warn"
-@val @scope("console") @variadic external warnMany: array<'a> => unit = "warn"
-
-@val @scope("console") external error: 'a => unit = "error"
-@val @scope("console") external error2: ('a, 'b) => unit = "error"
-@val @scope("console") external error3: ('a, 'b, 'c) => unit = "error"
-@val @scope("console") external error4: ('a, 'b, 'c, 'd) => unit = "error"
-@val @scope("console") @variadic external errorMany: array<'a> => unit = "error"
-
-@val @scope("console") external trace: unit => unit = "trace"
-
-@val @scope("console") external timeStart: string => unit = "time"
-
-@val @scope("console") external timeEnd: string => unit = "timeEnd"
diff --git a/jscomp/others/js_date.res b/jscomp/others/js_date.res
deleted file mode 100644
index 2a7b6be..0000000
--- a/jscomp/others/js_date.res
+++ /dev/null
@@ -1,1382 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Provide bindings to JS date. (See
-[`Date`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date)
-on MDN.) JavaScript stores dates as the number of milliseconds since the UNIX
-*epoch*, midnight 1 January 1970, UTC.
-*/
-
-type t
-
-@send
-/**
-Returns the primitive value of this date, equivalent to `getTime()`. (See
-[`Date.valueOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/valueOf)
-on MDN.)
-
-## Examples
-
-```rescript
-Js.Date.valueOf(exampleDate) == 123456654321.0
-```
-*/
-external valueOf: t => float = "valueOf"
-
-@new
-/**
-Returns a date representing the current time. See [`Date()`
-Constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date)
-on MDN.
-
-## Examples
-
-```rescript
-let now = Js.Date.make()
-```
-*/
-external make: unit => t = "Date"
-
-@new
-/**
-Returns a date representing the given argument, which is a number of
-milliseconds since the epoch. See [`Date()`
-Constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.fromFloat(123456654321.0) == exampleDate
-```
-*/
-external fromFloat: float => t = "Date"
-
-@new
-/**
-Returns a `Js.Date.t` represented by the given string. The string can be in
-“IETF-compliant RFC 2822 timestamps, and also strings in a version of ISO8601.”
-Returns `NaN` if given an invalid date string. According to the [`Date()`
-Constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date)
-documentation on MDN, its use is discouraged.
-
-## Examples
-
-```rescript
-Js.Date.fromString("Thu, 29 Nov 1973 21:30:54.321 GMT") == exampleDate
-Js.Date.fromString("1973-11-29T21:30:54.321Z00:00") == exampleDate
-Js.Date.fromString("Thor, 32 Lok -19 60:70:80 XYZ") // returns NaN
-```
-*/
-external fromString: string => t = "Date"
-
-@new
-/**
-Returns a date representing midnight of the first day of the given month and
-year in the current time zone. Fractional parts of arguments are ignored. See
-[`Date()`
-Constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date)
-on MDN.
-
-## Examples
-
-```rescript
-let november1 = Js.Date.makeWithYM(~year=2020.0, ~month=10.0, ())
-```
-*/
-external makeWithYM: (~year: float, ~month: float, unit) => t = "Date"
-
-@new
-/**
-Returns a date representing midnight of the given date of the given month and
-year in the current time zone. Fractional parts of arguments are ignored. See
-[`Date()`
-Constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date)
-on MDN.
-*/
-external makeWithYMD: (~year: float, ~month: float, ~date: float, unit) => t = "Date"
-
-@new
-/**
-Returns a date representing the given date of the given month and year, at zero
-minutes and zero seconds past the given `hours`, in the current time zone.
-Fractional parts of arguments are ignored. See [`Date()`
-Constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date)
-on MDN. Fractional parts of the arguments are ignored.
-*/
-external makeWithYMDH: (~year: float, ~month: float, ~date: float, ~hours: float, unit) => t =
-  "Date"
-
-@new
-/**
-Returns a date representing the given date of the given month and year, at zero
-seconds past the given time in hours and minutes in the current time zone.
-Fractional parts of arguments are ignored. See [`Date()`
-Constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date)
-on MDN.
-*/
-external makeWithYMDHM: (
-  ~year: float,
-  ~month: float,
-  ~date: float,
-  ~hours: float,
-  ~minutes: float,
-  unit,
-) => t = "Date"
-
-@new
-/**
-Returns a date representing the given date of the given month and year, at the
-given time in hours, minutes, and seconds in the current time zone. Fractional
-parts of arguments are ignored. See [`Date()`
-Constructor](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/Date)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.makeWithYMDHMS(
-  ~year=1973.0,
-  ~month=11.0,
-  ~date=29.0,
-  ~hours=21.0,
-  ~minutes=30.0,
-  ~seconds=54.321,
-  (),
-) == exampleDate
-```
-*/
-external makeWithYMDHMS: (
-  ~year: float,
-  ~month: float,
-  ~date: float,
-  ~hours: float,
-  ~minutes: float,
-  ~seconds: float,
-  unit,
-) => t = "Date"
-
-@val("Date.UTC")
-/**
-Returns a float representing the number of milliseconds past the epoch for
-midnight of the first day of the given month and year in UTC. Fractional parts
-of arguments are ignored. See
-[`Date.UTC`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/UTC)
-on MDN.
-
-## Examples
-
-```rescript
-let november1 = Js.Date.utcWithYM(~year=2020.0, ~month=10.0, ())
-```
-*/
-external utcWithYM: (~year: float, ~month: float, unit) => float = ""
-
-@val("Date.UTC")
-/**
-Returns a float representing the number of milliseconds past the epoch for
-midnight of the given date of the given month and year in UTC. Fractional parts
-of arguments are ignored. See
-[`Date.UTC`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/UTC)
-on MDN.
-*/
-external utcWithYMD: (~year: float, ~month: float, ~date: float, unit) => float = ""
-
-@val("Date.UTC")
-/**
-Returns a float representing the number of milliseconds past the epoch for
-midnight of the given date of the given month and year, at zero minutes and
-seconds past the given hours in UTC. Fractional parts of arguments are ignored.
-See
-[`Date.UTC`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/UTC)
-on MDN.
-*/
-external utcWithYMDH: (~year: float, ~month: float, ~date: float, ~hours: float, unit) => float = ""
-
-@val("Date.UTC")
-/**
-Returns a float representing the number of milliseconds past the epoch for
-midnight of the given date of the given month and year, at zero seconds past
-the given number of minutes past the given hours in UTC. Fractional parts of
-arguments are ignored. See
-[`Date.UTC`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/UTC)
-on MDN.
-*/
-external utcWithYMDHM: (
-  ~year: float,
-  ~month: float,
-  ~date: float,
-  ~hours: float,
-  ~minutes: float,
-  unit,
-) => float = ""
-
-@val("Date.UTC")
-/**
-Returns a float representing the number of milliseconds past the epoch for
-midnight of the given date of the given month and year, at the given time in
-hours, minutes and seconds in UTC. Fractional parts of arguments are ignored.
-
-See
-[`Date.UTC`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/UTC)
-on MDN.
-*/
-external utcWithYMDHMS: (
-  ~year: float,
-  ~month: float,
-  ~date: float,
-  ~hours: float,
-  ~minutes: float,
-  ~seconds: float,
-  unit,
-) => float = ""
-
-@val("Date.now") /** Returns the current time as number of milliseconds since Unix epoch. */
-external now: unit => float = ""
-
-@new @deprecated("Please use `fromString` instead") external parse: string => t = "Date"
-
-@val("parse")
-@scope("Date")
-/**
-Returns a float with the number of milliseconds past the epoch represented by
-the given string. The string can be in “IETF-compliant RFC 2822 timestamps, and
-also strings in a version of ISO8601.” Returns `NaN` if given an invalid date
-string. According to the
-[`Date.parse`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse)
-documentation on MDN, its use is discouraged. Returns `NaN` if passed invalid
-date string.
-*/
-external parseAsFloat: string => float = ""
-
-@send
-/**
-Returns the day of the month for its argument. The argument is evaluated in the
-current time zone. See
-[`Date.getDate`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getDate)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getDate(exampleDate) == 29.0
-```
-*/
-external getDate: t => float = "getDate"
-
-@send
-/**
-Returns the day of the week (0.0-6.0) for its argument, where 0.0 represents
-Sunday. The argument is evaluated in the current time zone.  See
-[`Date.getDay`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getDay)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getDay(exampleDate) == 4.0
-```
-*/
-external getDay: t => float = "getDay"
-
-@send
-/**
-Returns the full year (as opposed to the range 0-99) for its argument. The
-argument is evaluated in the current time zone. See
-[`Date.getFullYear`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getFullYear)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getFullYear(exampleDate) == 1973.0
-```
-*/
-external getFullYear: t => float = "getFullYear"
-
-@send
-/**
-Returns the hours for its argument, evaluated in the current time zone. See
-[`Date.getHours`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getHours)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getHours(exampleDate) == 22.0 // Vienna is in GMT+01:00
-```
-*/
-external getHours: t => float = "getHours"
-
-@send
-/**
-Returns the number of milliseconds for its argument, evaluated in the current
-time zone. See
-[`Date.getMilliseconds`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getMilliseconds)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getMilliseconds(exampleDate) == 321.0
-```
-*/
-external getMilliseconds: t => float = "getMilliseconds"
-
-@send
-/**
-Returns the number of minutes for its argument, evaluated in the current time
-zone. See
-[`Date.getMinutes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getMinutes)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getMinutes(exampleDate) == 30.0
-```
-*/
-external getMinutes: t => float = "getMinutes"
-
-@send
-/**
-Returns the month (0.0-11.0) for its argument, evaluated in the current time
-zone. January is month zero.  See
-[`Date.getMonth`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getMonth)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getMonth(exampleDate) == 10.0
-```
-*/
-external getMonth: t => float = "getMonth"
-
-@send
-/**
-Returns the seconds for its argument, evaluated in the current time zone. See
-[`Date.getSeconds`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getSeconds)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getSeconds(exampleDate) == 54.0
-```
-*/
-external getSeconds: t => float = "getSeconds"
-
-@send
-/**
-Returns the number of milliseconds since Unix epoch, evaluated in UTC.  See
-[`Date.getTime`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTime)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getTime(exampleDate) == 123456654321.0
-```
-*/
-external getTime: t => float = "getTime"
-
-@send
-/**
-Returns the time zone offset in minutes from the current time zone to UTC. See
-[`Date.getTimezoneOffset`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTimezoneOffset)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getTimezoneOffset(exampleDate) == -60.0
-```
-*/
-external getTimezoneOffset: t => float = "getTimezoneOffset"
-
-@send
-/**
-Returns the day of the month of the argument, evaluated in UTC. See
-[`Date.getUTCDate`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getUTCDate)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getUTCDate(exampleDate) == 29.0
-```
-*/
-external getUTCDate: t => float = "getUTCDate"
-
-@send
-/**
-Returns the day of the week of the argument, evaluated in UTC. The range of the
-return value is 0.0-6.0, where Sunday is zero. See
-[`Date.getUTCDay`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getUTCDay)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getUTCDay(exampleDate) == 4.0
-```
-*/
-external getUTCDay: t => float = "getUTCDay"
-
-@send
-/**
-Returns the full year (as opposed to the range 0-99) for its argument. The
-argument is evaluated in UTC.  See
-[`Date.getUTCFullYear`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getUTCFullYear)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getUTCFullYear(exampleDate) == 1973.0
-```
-*/
-external getUTCFullYear: t => float = "getUTCFullYear"
-
-@send
-/**
-Returns the hours for its argument, evaluated in the current time zone. See
-[`Date.getUTCHours`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getUTCHours)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getUTCHours(exampleDate) == 21.0
-```
-*/
-external getUTCHours: t => float = "getUTCHours"
-
-@send
-/**
-Returns the number of milliseconds for its argument, evaluated in UTC. See
-[`Date.getUTCMilliseconds`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getUTCMilliseconds)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getUTCMilliseconds(exampleDate) == 321.0
-```
-*/
-external getUTCMilliseconds: t => float = "getUTCMilliseconds"
-
-@send
-/**
-Returns the number of minutes for its argument, evaluated in UTC. See
-[`Date.getUTCMinutes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getUTCMinutes)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getUTCMinutes(exampleDate) == 30.0
-```
-*/
-external getUTCMinutes: t => float = "getUTCMinutes"
-
-@send
-/**
-Returns the month (0.0-11.0) for its argument, evaluated in UTC. January is
-month zero. See
-[`Date.getUTCMonth`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getUTCMonth)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getUTCMonth(exampleDate) == 10.0
-```
-*/
-external getUTCMonth: t => float = "getUTCMonth"
-
-@send
-/**
-Returns the seconds for its argument, evaluated in UTC. See
-[`Date.getUTCSeconds`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getUTCSeconds)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.getUTCSeconds(exampleDate) == 54.0
-```
-*/
-external getUTCSeconds: t => float = "getUTCSeconds"
-
-@send @deprecated("Use `getFullYear` instead.") external getYear: t => float = "getYear"
-
-@send
-/**
-Sets the given `Date`’s day of month to the value in the second argument
-according to the current time zone. Returns the number of milliseconds since
-the epoch of the updated `Date`. *This function modifies the original `Date`.*
-See
-[`Date.setDate`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setDate)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let twoWeeksBefore = Js.Date.setDate(date1, 15.0)
-date1 == Js.Date.fromString("1973-11-15T21:30:54.321Z00:00")
-twoWeeksBefore == Js.Date.getTime(date1)
-```
-*/
-external setDate: (t, float) => float = "setDate"
-
-@send
-/**
-Sets the given `Date`’s year to the value in the second argument according to
-the current time zone. Returns the number of milliseconds since the epoch of
-the updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setFullYear`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setFullYear)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let nextYear = Js.Date.setFullYear(date1, 1974.0)
-date1 == Js.Date.fromString("1974-11-15T21:30:54.321Z00:00")
-nextYear == Js.Date.getTime(date1)
-```
-*/
-external setFullYear: (t, float) => float = "setFullYear"
-
-@send
-/**
-Sets the given `Date`’s year and month to the values in the labeled arguments
-according to the current time zone. Returns the number of milliseconds since
-the epoch of the updated `Date`. *This function modifies the original `Date`.*
-See
-[`Date.setFullYear`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setFullYear)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let future = Js.Date.setFullYearM(date1, ~year=1974.0, ~month=0.0, ())
-date1 == Js.Date.fromString("1974-01-22T21:30:54.321Z00:00")
-future == Js.Date.getTime(date1)
-```
-*/
-external setFullYearM: (t, ~year: float, ~month: float, unit) => float = "setFullYear"
-
-@send
-/**
-Sets the given `Date`’s year, month, and day of month to the values in the
-labeled arguments according to the current time zone. Returns the number of
-milliseconds since the epoch of the updated `Date`. *This function modifies the
-original `Date`.* See
-[`Date.setFullYear`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setFullYear)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let future = Js.Date.setFullYearMD(date1, ~year=1974.0, ~month=0.0, ~date=7.0, ())
-date1 == Js.Date.fromString("1974-01-07T21:30:54.321Z00:00")
-future == Js.Date.getTime(date1)
-```
-*/
-external setFullYearMD: (t, ~year: float, ~month: float, ~date: float, unit) => float =
-  "setFullYear"
-
-@send
-/**
-Sets the given `Date`’s hours to the value in the second argument according to
-the current time zone. Returns the number of milliseconds since the epoch of
-the updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setHours`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setHours)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let nextHour = Js.Date.setHours(date1, 22.0)
-date1 == Js.Date.fromString("1973-11-29T22:30:54.321Z00:00")
-nextHour == Js.Date.getTime(date1)
-```
-*/
-external setHours: (t, float) => float = "setHours"
-
-@send
-/**
-Sets the given `Date`’s hours and minutes to the values in the labeled
-arguments according to the current time zone. Returns the number of
-milliseconds since the epoch of the updated `Date`. *This function modifies the
-original `Date`.* See
-[`Date.setHours`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setHours)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setHoursM(date1, ~hours=22.0, ~minutes=46.0, ())
-date1 == Js.Date.fromString("1973-11-29T22:46:54.321Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setHoursM: (t, ~hours: float, ~minutes: float, unit) => float = "setHours"
-
-@send
-/**
-Sets the given `Date`’s hours, minutes, and seconds to the values in the
-labeled arguments according to the current time zone. Returns the number of
-milliseconds since the epoch of the updated `Date`. *This function modifies the
-original `Date`.* See
-[`Date.setHours`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setHours)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setHoursMS(date1, ~hours=22.0, ~minutes=46.0, ~seconds=37.0, ())
-date1 == Js.Date.fromString("1973-11-29T22:46:37.321Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setHoursMS: (t, ~hours: float, ~minutes: float, ~seconds: float, unit) => float =
-  "setHours"
-
-@send
-/**
-Sets the given `Date`’s hours, minutes, seconds, and milliseconds to the values
-in the labeled arguments according to the current time zone. Returns the number
-of milliseconds since the epoch of the updated `Date`. *This function modifies
-the original `Date`.* See
-[`Date.setHours`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setHours)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setHoursMSMs(
-  date1,
-  ~hours=22.0,
-  ~minutes=46.0,
-  ~seconds=37.0,
-  ~milliseconds=494.0,
-  (),
-)
-date1 == Js.Date.fromString("1973-11-29T22:46:37.494Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setHoursMSMs: (
-  t,
-  ~hours: float,
-  ~minutes: float,
-  ~seconds: float,
-  ~milliseconds: float,
-  unit,
-) => float = "setHours"
-
-@send
-/**
-Sets the given `Date`’s milliseconds to the value in the second argument
-according to the current time zone. Returns the number of milliseconds since
-the epoch of the updated `Date`. *This function modifies the original `Date`.*
-See
-[`Date.setMilliseconds`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setMilliseconds)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setMilliseconds(date1, 494.0)
-date1 == Js.Date.fromString("1973-11-29T21:30:54.494Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setMilliseconds: (t, float) => float = "setMilliseconds"
-
-@send
-/**
-Sets the given `Date`’s minutes to the value in the second argument according
-to the current time zone. Returns the number of milliseconds since the epoch of
-the updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setMinutes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setMinutes)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setMinutes(date1, 34.0)
-date1 == Js.Date.fromString("1973-11-29T21:34:54.494Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setMinutes: (t, float) => float = "setMinutes"
-
-@send
-/**
-Sets the given `Date`’s minutes and seconds to the values in the labeled
-arguments according to the current time zone. Returns the number of
-milliseconds since the epoch of the updated `Date`. *This function modifies the
-original `Date`.* See
-[`Date.setMinutes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setMinutes)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setMinutesS(date1, ~minutes=34.0, ~seconds=56.0, ())
-date1 == Js.Date.fromString("1973-11-29T21:34:56.494Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setMinutesS: (t, ~minutes: float, ~seconds: float, unit) => float = "setMinutes"
-
-@send
-/**
-Sets the given `Date`’s minutes, seconds, and milliseconds to the values in the
-labeled arguments according to the current time zone. Returns the number of
-milliseconds since the epoch of the updated `Date`. *This function modifies the
-original `Date`.* See
-[`Date.setMinutes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setMinutes)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setMinutesSMs(
-  date1,
-  ~minutes=34.0,
-  ~seconds=56.0,
-  ~milliseconds=789.0,
-  (),
-)
-date1 == Js.Date.fromString("1973-11-29T21:34:56.789Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setMinutesSMs: (t, ~minutes: float, ~seconds: float, ~milliseconds: float, unit) => float =
-  "setMinutes"
-
-@send
-/**
-Sets the given `Date`’s month to the value in the second argument according to
-the current time zone. Returns the number of milliseconds since the epoch of
-the updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setMonth`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setMonth)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setMonth(date1, 11.0)
-date1 == Js.Date.fromString("1973-12-29T21:34:56.789Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setMonth: (t, float) => float = "setMonth"
-
-@send
-/**
-Sets the given `Date`’s month and day of month to the values in the labeled
-arguments according to the current time zone. Returns the number of
-milliseconds since the epoch of the updated `Date`. *This function modifies the
-original `Date`.* See
-[`Date.setMonth`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setMonth)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setMonthD(date1, ~month=11.0, ~date=8.0, ())
-date1 == Js.Date.fromString("1973-12-08T21:34:56.789Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setMonthD: (t, ~month: float, ~date: float, unit) => float = "setMonth"
-
-@send
-/**
-Sets the given `Date`’s seconds to the value in the second argument according
-to the current time zone. Returns the number of milliseconds since the epoch of
-the updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setSeconds`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setSeconds)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setSeconds(date1, 56.0)
-date1 == Js.Date.fromString("1973-12-29T21:30:56.321Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setSeconds: (t, float) => float = "setSeconds"
-
-@send
-/**
-Sets the given `Date`’s seconds and milliseconds to the values in the labeled
-arguments according to the current time zone. Returns the number of
-milliseconds since the epoch of the updated `Date`. *This function modifies the
-original `Date`.* See
-[`Date.setSeconds`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setSeconds)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setSecondsMs(date1, ~seconds=56.0, ~milliseconds=789.0, ())
-date1 == Js.Date.fromString("1973-12-29T21:30:56.789Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setSecondsMs: (t, ~seconds: float, ~milliseconds: float, unit) => float = "setSeconds"
-
-@send
-/**
-Sets the given `Date`’s value in terms of milliseconds since the epoch. Returns
-the number of milliseconds since the epoch of the updated `Date`. *This
-function modifies the original `Date`.* See
-[`Date.setTime`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setTime)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setTime(date1, 198765432101.0)
-
-date1 == Js.Date.fromString("1976-04-19T12:37:12.101Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setTime: (t, float) => float = "setTime"
-
-@send
-/**
-Sets the given `Date`’s day of month to the value in the second argument
-according to UTC. Returns the number of milliseconds since the epoch of the
-updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setUTCDate`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCDate)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let twoWeeksBefore = Js.Date.setUTCDate(date1, 15.0)
-date1 == Js.Date.fromString("1973-11-15T21:30:54.321Z00:00")
-twoWeeksBefore == Js.Date.getTime(date1)
-```
-*/
-external setUTCDate: (t, float) => float = "setUTCDate"
-
-@send
-/**
-Sets the given `Date`’s year to the value in the second argument according to
-UTC. Returns the number of milliseconds since the epoch of the updated `Date`.
-*This function modifies the original `Date`.* See
-[`Date.setUTCFullYear`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCFullYear)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let nextYear = Js.Date.setUTCFullYear(date1, 1974.0)
-date1 == Js.Date.fromString("1974-11-15T21:30:54.321Z00:00")
-nextYear == Js.Date.getTime(date1)
-```
-*/
-external setUTCFullYear: (t, float) => float = "setUTCFullYear"
-
-@send
-/**
-Sets the given `Date`’s year and month to the values in the labeled arguments
-according to UTC. Returns the number of milliseconds since the epoch of the
-updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setUTCFullYear`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCFullYear)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let future = Js.Date.setUTCFullYearM(date1, ~year=1974.0, ~month=0.0, ())
-date1 == Js.Date.fromString("1974-01-22T21:30:54.321Z00:00")
-future == Js.Date.getTime(date1)
-```
-*/
-external setUTCFullYearM: (t, ~year: float, ~month: float, unit) => float = "setUTCFullYear"
-
-@send
-/**
-Sets the given `Date`’s year, month, and day of month to the values in the
-labeled arguments according to UTC. Returns the number of milliseconds since
-the epoch of the updated `Date`. *This function modifies the original `Date`.*
-See
-[`Date.setUTCFullYear`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCFullYear)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let future = Js.Date.setUTCFullYearMD(date1, ~year=1974.0, ~month=0.0, ~date=7.0, ())
-date1 == Js.Date.fromString("1974-01-07T21:30:54.321Z00:00")
-future == Js.Date.getTime(date1)
-```
-*/
-external setUTCFullYearMD: (t, ~year: float, ~month: float, ~date: float, unit) => float =
-  "setUTCFullYear"
-
-@send
-/**
-Sets the given `Date`’s hours to the value in the second argument according to
-UTC. Returns the number of milliseconds since the epoch of the updated `Date`.
-*This function modifies the original `Date`.* See
-[`Date.setUTCHours`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCHours)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let nextHour = Js.Date.setUTCHours(date1, 22.0)
-date1 == Js.Date.fromString("1973-11-29T22:30:54.321Z00:00")
-nextHour == Js.Date.getTime(date1)
-```
-*/
-external setUTCHours: (t, float) => float = "setUTCHours"
-
-@send
-/**
-Sets the given `Date`’s hours and minutes to the values in the labeled
-arguments according to UTC. Returns the number of milliseconds since the epoch
-of the updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setUTCHours`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCHours)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCHoursM(date1, ~hours=22.0, ~minutes=46.0, ())
-date1 == Js.Date.fromString("1973-11-29T22:46:54.321Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCHoursM: (t, ~hours: float, ~minutes: float, unit) => float = "setUTCHours"
-
-@send
-/**
-Sets the given `Date`’s hours, minutes, and seconds to the values in the
-labeled arguments according to UTC. Returns the number of milliseconds since
-the epoch of the updated `Date`. *This function modifies the original `Date`.*
-
-See
-[`Date.setUTCHours`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCHours)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCHoursMS(date1, ~hours=22.0, ~minutes=46.0, ~seconds=37.0, ())
-date1 == Js.Date.fromString("1973-11-29T22:46:37.321Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCHoursMS: (t, ~hours: float, ~minutes: float, ~seconds: float, unit) => float =
-  "setUTCHours"
-
-@send
-/**
-Sets the given `Date`’s hours, minutes, seconds, and milliseconds to the values
-in the labeled arguments according to UTC. Returns the number of milliseconds
-since the epoch of the updated `Date`. *This function modifies the original
-`Date`.* See
-[`Date.setUTCHours`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCHours)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCHoursMSMs(
-  date1,
-  ~hours=22.0,
-  ~minutes=46.0,
-  ~seconds=37.0,
-  ~milliseconds=494.0,
-  (),
-)
-date1 == Js.Date.fromString("1973-11-29T22:46:37.494Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCHoursMSMs: (
-  t,
-  ~hours: float,
-  ~minutes: float,
-  ~seconds: float,
-  ~milliseconds: float,
-  unit,
-) => float = "setUTCHours"
-
-@send
-/**
-Sets the given `Date`’s milliseconds to the value in the second argument
-according to UTC. Returns the number of milliseconds since the epoch of the
-updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setUTCMilliseconds`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCMilliseconds)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCMilliseconds(date1, 494.0)
-date1 == Js.Date.fromString("1973-11-29T21:30:54.494Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCMilliseconds: (t, float) => float = "setUTCMilliseconds"
-
-@send
-/**
-Sets the given `Date`’s minutes to the value in the second argument according
-to the current time zone. Returns the number of milliseconds since the epoch of
-the updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setUTCMinutes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCMinutes)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCMinutes(date1, 34.0)
-date1 == Js.Date.fromString("1973-11-29T21:34:54.494Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCMinutes: (t, float) => float = "setUTCMinutes"
-
-@send
-/**
-Sets the given `Date`’s minutes and seconds to the values in the labeled
-arguments according to UTC. Returns the number of milliseconds since the epoch
-of the updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setUTCMinutes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCMinutes)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCMinutesS(date1, ~minutes=34.0, ~seconds=56.0, ())
-date1 == Js.Date.fromString("1973-11-29T21:34:56.494Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCMinutesS: (t, ~minutes: float, ~seconds: float, unit) => float = "setUTCMinutes"
-
-@send
-/**
-Sets the given `Date`’s minutes, seconds, and milliseconds to the values in the
-labeled arguments according to UTC. Returns the number of milliseconds since
-the epoch of the updated `Date`. *This function modifies the original `Date`.*
-See
-[`Date.setUTCMinutes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCMinutes)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCMinutesSMs(
-  date1,
-  ~minutes=34.0,
-  ~seconds=56.0,
-  ~milliseconds=789.0,
-  (),
-)
-date1 == Js.Date.fromString("1973-11-29T21:34:56.789Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCMinutesSMs: (
-  t,
-  ~minutes: float,
-  ~seconds: float,
-  ~milliseconds: float,
-  unit,
-) => float = "setUTCMinutes"
-
-@send
-/**
-Sets the given `Date`’s month to the value in the second argument according to
-UTC. Returns the number of milliseconds since the epoch of the updated `Date`.
-*This function modifies the original `Date`.* See
-[`Date.setUTCMonth`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCMonth)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCMonth(date1, 11.0)
-date1 == Js.Date.fromString("1973-12-29T21:34:56.789Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCMonth: (t, float) => float = "setUTCMonth"
-
-@send
-/**
-Sets the given `Date`’s month and day of month to the values in the labeled
-arguments according to UTC. Returns the number of milliseconds since the epoch
-of the updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setUTCMonth`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCMonth)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCMonthD(date1, ~month=11.0, ~date=8.0, ())
-date1 == Js.Date.fromString("1973-12-08T21:34:56.789Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCMonthD: (t, ~month: float, ~date: float, unit) => float = "setUTCMonth"
-
-@send
-/**
-Sets the given `Date`’s seconds to the value in the second argument according
-to UTC. Returns the number of milliseconds since the epoch of the updated
-`Date`. *This function modifies the original `Date`.* See
-[`Date.setUTCSeconds`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCSeconds)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCSeconds(date1, 56.0)
-date1 == Js.Date.fromString("1973-12-29T21:30:56.321Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCSeconds: (t, float) => float = "setUTCSeconds"
-
-@send
-/**
-Sets the given `Date`’s seconds and milliseconds to the values in the labeled
-arguments according to UTC. Returns the number of milliseconds since the epoch
-of the updated `Date`. *This function modifies the original `Date`.* See
-[`Date.setUTCSeconds`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/setUTCSeconds)
-on MDN.
-
-## Examples
-
-```rescript
-let date1 = Js.Date.fromFloat(123456654321.0) // 29 November 1973 21:30:54.321 GMT
-let futureTime = Js.Date.setUTCSecondsMs(date1, ~seconds=56.0, ~milliseconds=789.0, ())
-date1 == Js.Date.fromString("1973-12-29T21:30:56.789Z00:00")
-futureTime == Js.Date.getTime(date1)
-```
-*/
-external setUTCSecondsMs: (t, ~seconds: float, ~milliseconds: float, unit) => float =
-  "setUTCSeconds"
-
-@send /** Same as [`setTime()`](#settime). */
-external setUTCTime: (t, float) => float = "setTime"
-
-@send @deprecated("Use `setFullYear` instead") external setYear: (t, float) => float = "setYear"
-
-@send
-/**
-Returns the date (day of week, year, month, and day of month) portion of a
-`Date` in English. See
-[`Date.toDateString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toDateString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.toDateString(exampleDate) == "Thu Nov 29 1973"
-```
-*/
-external toDateString: t => string = "toDateString"
-
-@send @deprecated("Use `toUTCString` instead") external toGMTString: t => string = "toGMTString"
-
-@send
-/**
-Returns a simplified version of the ISO 8601 format for the date. See
-[`Date.toISOString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.toISOString(exampleDate) == "1973-11-29T21:30:54.321Z"
-```
-*/
-external toISOString: t => string = "toISOString"
-
-@send
-@deprecated(
-  "This method is unsafe. It will be changed to return option in a future \
-     release. Please use toJSONUnsafe instead."
-)
-external toJSON: t => string = "toJSON"
-
-@send
-/**
-Returns a string representation of the given date. See
-[`Date.toJSON`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toJSON)
-on MDN.
-*/
-external toJSONUnsafe: t => string = "toJSON"
-
-@send
-/**
-Returns the year, month, and day for the given `Date` in the current locale
-format. See
-[`Date.toLocaleDateString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleDateString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.toLocaleDateString(exampleDate) == "11/29/1973" // for en_US.utf8
-Js.Date.toLocaleDateString(exampleDate) == "29.11.73" // for de_DE.utf8
-```
-*/
-external toLocaleDateString: t => string = "toLocaleDateString"
-
-/* TODO: has overloads with somewhat poor browser support */
-
-@send
-/**
-Returns the time and date for the given `Date` in the current locale format.
-See
-[`Date.toLocaleString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.toLocaleString(exampleDate) == "11/29/1973, 10:30:54 PM" // for en_US.utf8
-Js.Date.toLocaleString(exampleDate) == "29.11.1973, 22:30:54" // for de_DE.utf8
-```
-*/
-external toLocaleString: t => string = "toLocaleString"
-
-/* TODO: has overloads with somewhat poor browser support */
-
-@send
-/**
-Returns the time of day for the given `Date` in the current locale format. See
-[`Date.toLocaleTimeString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleTimeString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.toLocaleString(exampleDate) == "10:30:54 PM" // for en_US.utf8
-Js.Date.toLocaleString(exampleDate) == "22:30:54" // for de_DE.utf8
-```
-*/
-external toLocaleTimeString: t => string = "toLocaleTimeString"
-
-/* TODO: has overloads with somewhat poor browser support */
-
-@send
-/**
-Returns a string representing the date and time of day for the given `Date` in
-the current locale and time zone. See
-[`Date.toString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.toString(
-  exampleDate,
-) == "Thu Nov 29 1973 22:30:54 GMT+0100 (Central European Standard Time)"
-```
-*/
-external toString: t => string = "toString"
-
-@send
-/**
-Returns a string representing the time of day for the given `Date` in the
-current locale and time zone.  See
-[`Date.toTimeString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toTimeString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.toTimeString(exampleDate) == "22:30:54 GMT+0100 (Central European Standard Time)"
-```
-*/
-external toTimeString: t => string = "toTimeString"
-
-@send
-/**
-Returns a string representing the date and time of day for the given `Date` in
-the current locale and UTC (GMT time zone). See
-[`Date.toUTCString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toUTCString)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Date.toUTCString(exampleDate) == "Thu, 29 Nov 1973 21:30:54 GMT"
-```
-*/
-external toUTCString: t => string = "toUTCString"
diff --git a/jscomp/others/js_dict.res b/jscomp/others/js_dict.res
deleted file mode 100644
index 5daef59..0000000
--- a/jscomp/others/js_dict.res
+++ /dev/null
@@ -1,124 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Provides a simple key-value dictionary abstraction over native JavaScript objects */
-
-/** The dict type */
-type t<'a> = dict<'a>
-
-/** The key type, an alias of string */
-type key = string
-
-/**
-  `unsafeGet dict key` returns the value associated with `key` in `dict`
-
-  This function will return an invalid value (`undefined`) if `key` does not exist in `dict`. It
-  will not throw an error.
-*/
-@get_index
-external unsafeGet: (t<'a>, key) => 'a = ""
-let \".!()" = unsafeGet
-
-/** `get dict key` returns the value associated with `key` in `dict` */
-let get = (type u, dict: t<u>, k: key): option<u> =>
-  if %raw(`k in dict`) {
-    Some(\".!()"(dict, k))
-  } else {
-    None
-  }
-
-/** `set dict key value` sets the value of `key` in `dict` to `value` */
-@set_index
-external set: (t<'a>, key, 'a) => unit = ""
-
-/** `keys dict` returns an array of all the keys in `dict` */
-@val
-external keys: t<'a> => array<key> = "Object.keys"
-
-/** `empty ()` creates an empty dictionary */
-@obj
-external empty: unit => t<'a> = ""
-
-let unsafeDeleteKey: (. t<string>, string) => unit = %raw(` function (dict,key){
-      delete dict[key];
-     }
-  `)
-
-@new external unsafeCreate: int => array<'a> = "Array"
-/* external entries : 'a t -> (key * 'a) array = "Object.entries" [@@bs.val] (* ES2017 *) */
-let entries = dict => {
-  let keys = keys(dict)
-  let l = Js_array2.length(keys)
-  let values = unsafeCreate(l)
-  for i in 0 to l - 1 {
-    let key = Js_array2.unsafe_get(keys, i)
-    Js_array2.unsafe_set(values, i, (key, \".!()"(dict, key)))
-  }
-  values
-}
-
-/* external values : 'a t -> 'a array = "Object.values" [@@bs.val] (* ES2017 *) */
-let values = dict => {
-  let keys = keys(dict)
-  let l = Js_array2.length(keys)
-  let values = unsafeCreate(l)
-  for i in 0 to l - 1 {
-    Js_array2.unsafe_set(values, i, \".!()"(dict, Js_array2.unsafe_get(keys, i)))
-  }
-  values
-}
-
-let fromList = entries => {
-  let dict = empty()
-  let rec loop = x =>
-    switch x {
-    | list{} => dict
-    | list{(key, value), ...rest} =>
-      set(dict, key, value)
-      loop(rest)
-    }
-
-  loop(entries)
-}
-
-let fromArray = entries => {
-  let dict = empty()
-  let l = Js_array2.length(entries)
-  for i in 0 to l - 1 {
-    let (key, value) = Js_array2.unsafe_get(entries, i)
-    set(dict, key, value)
-  }
-  dict
-}
-
-let map = (f, source) => {
-  let target = empty()
-  let keys = keys(source)
-  let l = Js_array2.length(keys)
-  for i in 0 to l - 1 {
-    let key = Js_array2.unsafe_get(keys, i)
-    set(target, key, f(. unsafeGet(source, key)))
-  }
-  target
-}
diff --git a/jscomp/others/js_dict.resi b/jscomp/others/js_dict.resi
deleted file mode 100644
index 5f6a30f..0000000
--- a/jscomp/others/js_dict.resi
+++ /dev/null
@@ -1,173 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Provide utilities for JS dictionary object.
-
-**Note:** This module's examples will assume this predeclared dictionary:
-
-## Examples
-
-```rescript
-let ages = Js.Dict.fromList(list{("Maria", 30), ("Vinh", 22), ("Fred", 49)})
-```
-*/
-
-/*
-Dictionary type (ie an '{ }' JS object). However it is restricted to hold a
-single type; therefore values must have the same type. This Dictionary type is
-mostly used with the Js_json.t type.
-*/
-type t<'a> = dict<'a>
-
-/**
-  The type for dictionary keys. This means that dictionaries *must* use `string`s as their keys.
-*/
-type key = string
-
-/**
-`Js.Dict.get(key)` returns `None` if the key is not found in the dictionary,
-`Some(value)` otherwise.
-
-## Examples
-
-```rescript
-Js.Dict.get(ages, "Vinh") == Some(22)
-Js.Dict.get(ages, "Paul") == None
-```
-*/
-let get: (t<'a>, key) => option<'a>
-
-@get_index
-/**
-`Js.Dict.unsafeGet(key)` returns the value if the key exists, otherwise an `undefined` value is returned. Use this only when you are sure the key exists (i.e. when having used the `keys()` function to check that the key is valid).
-
-## Examples
-
-```rescript
-Js.Dict.unsafeGet(ages, "Fred") == 49
-Js.Dict.unsafeGet(ages, "Paul") // returns undefined
-```
-*/
-external unsafeGet: (t<'a>, key) => 'a = ""
-
-@set_index
-/**
-`Js.Dict.set(dict, key, value)` sets the key/value in the dictionary `dict`. If
-the key does not exist, and entry will be created for it.
-
-*This function modifies the original dictionary.*
-
-## Examples
-
-```rescript
-Js.Dict.set(ages, "Maria", 31)
-Js.log(ages == Js.Dict.fromList(list{("Maria", 31), ("Vinh", 22), ("Fred", 49)}))
-
-Js.Dict.set(ages, "David", 66)
-Js.log(ages == Js.Dict.fromList(list{("Maria", 31), ("Vinh", 22), ("Fred", 49), ("David", 66)}))
-```
-*/
-external set: (t<'a>, key, 'a) => unit = ""
-
-@val
-/**
-Returns all the keys in the dictionary `dict`.
-
-## Examples
-
-```rescript
-Js.Dict.keys(ages) == ["Maria", "Vinh", "Fred"]
-```
-*/
-external keys: t<'a> => array<string> = "Object.keys"
-
-@obj /** Returns an empty dictionary. */
-external empty: unit => t<'a> = ""
-
-/** Experimental internal function */
-let unsafeDeleteKey: (. t<string>, string) => unit
-
-/**
-Returns an array of key/value pairs in the given dictionary (ES2017).
-
-## Examples
-
-```rescript
-Js.Dict.entries(ages) == [("Maria", 30), ("Vinh", 22), ("Fred", 49)]
-```
-*/
-let entries: t<'a> => array<(key, 'a)>
-
-/**
-Returns the values in the given dictionary (ES2017).
-
-## Examples
-
-```rescript
-Js.Dict.values(ages) == [30, 22, 49]
-```
-*/
-let values: t<'a> => array<'a>
-
-/**
-Creates a new dictionary containing each (key, value) pair in its list
-argument.
-
-## Examples
-
-```rescript
-let capitals = Js.Dict.fromList(list{("Japan", "Tokyo"), ("France", "Paris"), ("Egypt", "Cairo")})
-```
-*/
-let fromList: list<(key, 'a)> => t<'a>
-
-/**
-Creates a new dictionary containing each (key, value) pair in its array
-argument.
-
-## Examples
-
-```rescript
-let capitals2 = Js.Dict.fromArray([("Germany", "Berlin"), ("Burkina Faso", "Ouagadougou")])
-```
-*/
-let fromArray: array<(key, 'a)> => t<'a>
-
-/**
-`map(f, dict)` maps `dict` to a new dictionary with the same keys, using the
-function `f` to map each value.
-
-## Examples
-
-```rescript
-let prices = Js.Dict.fromList(list{("pen", 1.00), ("book", 5.00), ("stapler", 7.00)})
-
-let discount = (. price) => price *. 0.90
-let salePrices = Js.Dict.map(discount, prices)
-
-salePrices == Js.Dict.fromList(list{("pen", 0.90), ("book", 4.50), ("stapler", 6.30)})
-```
-*/
-let map: ((. 'a) => 'b, t<'a>) => t<'b>
diff --git a/jscomp/others/js_exn.res b/jscomp/others/js_exn.res
deleted file mode 100644
index 9cd37bc..0000000
--- a/jscomp/others/js_exn.res
+++ /dev/null
@@ -1,87 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = unknown
-
-@@warning("-38") /* unused extension constructor */
-exception Error = JsError
-
-external asJsExn: exn => option<t> = "?as_js_exn"
-
-@get external stack: t => option<string> = "stack"
-@get external message: t => option<string> = "message"
-@get external name: t => option<string> = "name"
-@get external fileName: t => option<string> = "fileName"
-
-type error
-@new external makeError: string => error = "Error"
-external isCamlExceptionOrOpenVariant: 'a => bool = "?is_extension"
-
-external anyToExnInternal: 'a => exn = "#wrap_exn"
-
-let raiseError = str => raise((Obj.magic((makeError(str): error)): exn))
-
-type eval_error
-@new external makeEvalError: string => eval_error = "EvalError"
-
-let raiseEvalError = str => raise((Obj.magic((makeEvalError(str): eval_error)): exn))
-
-type range_error
-@new external makeRangeError: string => range_error = "RangeError"
-
-let raiseRangeError = str => raise((Obj.magic((makeRangeError(str): range_error)): exn))
-
-type reference_error
-
-@new external makeReferenceError: string => reference_error = "ReferenceError"
-
-let raiseReferenceError = str => raise(Obj.magic(makeReferenceError(str)))
-
-type syntax_error
-@new external makeSyntaxError: string => syntax_error = "SyntaxError"
-
-let raiseSyntaxError = str => raise(Obj.magic(makeSyntaxError(str)))
-
-type type_error
-@new external makeTypeError: string => type_error = "TypeError"
-
-let raiseTypeError = str => raise(Obj.magic(makeTypeError(str)))
-
-type uri_error
-@new external makeURIError: string => uri_error = "URIError"
-
-let raiseUriError = str => raise(Obj.magic(makeURIError(str)))
-
-/* TODO add predicate to tell which error is which " */
-
-/*
-exception EvalError of error
-exception RangeError of error
-exception ReferenceError of error
-exception SyntaxError of error
-exception TypeError of error
-
- The URIError object represents an error when a global URI handling function was used in a wrong way. 
-exception URIError of error    
-*/
diff --git a/jscomp/others/js_exn.resi b/jscomp/others/js_exn.resi
deleted file mode 100644
index 87ce8ca..0000000
--- a/jscomp/others/js_exn.resi
+++ /dev/null
@@ -1,76 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Provide utilities for dealing with JS exceptions.
-*/
-
-/** Represents a JS exception */
-type t
-
-type exn += private Error(t)
-
-external asJsExn: exn => option<t> = "?as_js_exn"
-
-@get external stack: t => option<string> = "stack"
-@get external message: t => option<string> = "message"
-@get external name: t => option<string> = "name"
-@get external fileName: t => option<string> = "fileName"
-
-/** internal use only */
-external isCamlExceptionOrOpenVariant: 'a => bool = "?is_extension"
-
-/**
-`anyToExnInternal(obj)` will take any value `obj` and wrap it
-in a Js.Exn.Error if given value is not an exn already. If
-`obj` is an exn, it will return `obj` without any changes.
-
-This function is mostly useful for cases where you want to unify a type of a value
-that potentially is either exn, a JS error, or any other JS value really (e.g. for
-a value passed to a Promise.catch callback)
-
-**IMPORTANT**: This is an internal API and may be changed / removed any time in the future.
-
-## Examples
-
-```rescript
-switch (Js.Exn.unsafeAnyToExn("test")) {
-| Js.Exn.Error(v) =>
-  switch(Js.Exn.message(v)) {
-  | Some(str) => Js.log("We won't end up here")
-  | None => Js.log2("We will land here: ", v)
-  }
-}
-```
-*/
-external anyToExnInternal: 'a => exn = "#wrap_exn"
-
-/** Raise Js exception Error object with stacktrace */
-let raiseError: string => 'a
-let raiseEvalError: string => 'a
-let raiseRangeError: string => 'a
-let raiseReferenceError: string => 'a
-let raiseSyntaxError: string => 'a
-let raiseTypeError: string => 'a
-let raiseUriError: string => 'a
diff --git a/jscomp/others/js_file.res b/jscomp/others/js_file.res
deleted file mode 100644
index 9836eff..0000000
--- a/jscomp/others/js_file.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/*** JavaScript File API */
-
-type t
diff --git a/jscomp/others/js_float.res b/jscomp/others/js_float.res
deleted file mode 100644
index 0b63205..0000000
--- a/jscomp/others/js_float.res
+++ /dev/null
@@ -1,274 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Provide utilities for JS float.
-*/
-
-@val
-/**
-The special value "Not a Number". See [`NaN`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NaN) on MDN.
-*/
-external _NaN: float = "NaN"
-
-@val
-@scope("Number")
-/**
-Tests if the given value is `_NaN`
-
-Note that both `_NaN = _NaN` and `_NaN == _NaN` will return `false`. `isNaN` is
-therefore necessary to test for `_NaN`. Return `true` if the given value is
-`_NaN`, `false` otherwise. See [`isNaN`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isNaN) on MDN.
-*/
-external isNaN: float => bool = "isNaN"
-
-@val
-@scope("Number")
-/**
-Tests if the given value is finite. Return `true` if the given value is a finite
-number, `false` otherwise. See [`isFinite`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isFinite) on MDN.
-
-## Examples
-
-```rescript
-/* returns [false] */
-Js.Float.isFinite(infinity)
-
-/* returns [false] */
-Js.Float.isFinite(neg_infinity)
-
-/* returns [false] */
-Js.Float.isFinite(Js.Float._NaN)
-
-/* returns [true] */
-Js.Float.isFinite(1234.)
-```
-*/
-external isFinite: float => bool = "isFinite"
-
-@send
-/**
-Formats a `float` using exponential (scientific) notation. Return a
-`string` representing the given value in exponential notation. Raise
-RangeError if digits is not in the range [0, 20] (inclusive). See [`toExponential`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toExponential) on MDN.
-
-## Examples
-
-```rescript
-/* prints "7.71234e+1" */
-Js.Float.toExponential(77.1234)->Js.log
-
-/* prints "7.7e+1" */
-Js.Float.toExponential(77.)->Js.log
-```
-*/
-external toExponential: float => string = "toExponential"
-
-@send
-/**
-Formats a `float` using exponential (scientific) notation. `digits` specifies
-how many digits should appear after the decimal point. The value must be in
-the range [0, 20] (inclusive). Return a `string` representing the given value
-in exponential notation. The output will be rounded or padded with zeroes if
-necessary. Raise RangeError if `digits` is not in the range [0, 20] (inclusive).
-See [`toExponential`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toExponential) on MDN.
-
-## Examples
-
-```rescript
-/* prints "7.71e+1" */
-Js.Float.toExponentialWithPrecision(77.1234, ~digits=2)->Js.log
-```
-*/
-external toExponentialWithPrecision: (float, ~digits: int) => string = "toExponential"
-
-@send
-/**
-Formats a `float` using fixed point notation. Return a `string` representing the
-given value in fixed-point notation (usually). Raise RangeError if digits is not
-in the range [0, 20] (inclusive). See [`toFixed`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toFixed) on MDN.
-
-## Examples
-
-```rescript
-/* prints "12346" (note the rounding) */
-Js.Float.toFixed(12345.6789)->Js.log
-
-/* print "1.2e+21" */
-Js.Float.toFixed(1.2e21)->Js.log
-```
-*/
-external toFixed: float => string = "toFixed"
-
-@send
-/**
-Formats a `float` using fixed point notation. `digits` specifies how many digits
-should appear after the decimal point. The value must be in the range [0, 20]
-(inclusive). Defaults to `0`. Return a `string` representing the given value in
-fixed-point notation (usually). See [`toFixed`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toFixed) on MDN.
-
-The output will be rounded or padded with zeroes if necessary.
-
-Raise RangeError if digits is not in the range [0, 20] (inclusive)
-
-## Examples
-
-```rescript
-/* prints "12345.7" (note the rounding) */
-Js.Float.toFixedWithPrecision(12345.6789, ~digits=1)->Js.log
-
-/* prints "0.00" (note the added zeroes) */
-Js.Float.toFixedWithPrecision(0., ~digits=2)->Js.log
-```
-*/
-external toFixedWithPrecision: (float, ~digits: int) => string = "toFixed"
-
-@send
-/**
-Formats a `float` using some fairly arbitrary rules. Return a `string`
-representing the given value in fixed-point (usually). `toPrecision` differs
-from `Js.Float.toFixed` in that the former will format the number with full
-precision, while the latter will not output any digits after the decimal point.
-See [`toPrecision`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toPrecision) on MDN.
-
-Raise RangeError if digits is not in the range accepted by this function (what do you mean "vague"?)
-
-## Examples
-
-```rescript
-/* prints "12345.6789" */
-Js.Float.toPrecision(12345.6789)->Js.log
-
-/* print "1.2e+21" */
-Js.Float.toPrecision(1.2e21)->Js.log
-```
-*/
-external toPrecision: float => string = "toPrecision"
-
-/* equivalent to `toString` I think */
-
-@send
-/**
-Formats a `float` using some fairly arbitrary rules. `digits` specifies how many
-digits should appear in total. The value must between 0 and some arbitrary number
-that's hopefully at least larger than 20 (for Node it's 21. Why? Who knows).
-See [`toPrecision`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toPrecision) on MDN.
-
-Return a `string` representing the given value in fixed-point or scientific
-notation. The output will be rounded or padded with zeroes if necessary.
-
-`toPrecisionWithPrecision` differs from `toFixedWithPrecision` in that the former
-will count all digits against the precision, while the latter will count only
-the digits after the decimal point. `toPrecisionWithPrecision` will also use
-scientific notation if the specified precision is less than the number for digits
-before the decimal point.
-
-Raise RangeError if digits is not in the range accepted by this function (what do you mean "vague"?)
-
-## Examples
-
-```rescript
-/* prints "1e+4" */
-Js.Float.toPrecisionWithPrecision(12345.6789, ~digits=1)->Js.log
-
-/* prints "0.0" */
-Js.Float.toPrecisionWithPrecision(0., ~digits=2)->Js.log
-```
-*/
-external toPrecisionWithPrecision: (float, ~digits: int) => string = "toPrecision"
-
-@send
-/**
-Formats a `float` as a string. Return a `string` representing the given value in
-fixed-point (usually). See [`toString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toString) on MDN.
-
-## Examples
-
-```rescript
-/* prints "12345.6789" */
-Js.Float.toString(12345.6789)->Js.log
-```
-*/
-external toString: float => string = "toString"
-
-@send
-/**
-Formats a `float` as a string. `radix` specifies the radix base to use for the
-formatted number. The value must be in the range [2, 36] (inclusive). Return a
-`string` representing the given value in fixed-point (usually). See [`toString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toString) on MDN.
-
-Raise RangeError if radix is not in the range [2, 36] (inclusive)
-
-## Examples
-
-```rescript
-/* prints "110" */
-Js.Float.toStringWithRadix(6., ~radix=2)->Js.log
-
-/* prints "11.001000111101011100001010001111010111000010100011111" */
-Js.Float.toStringWithRadix(3.14, ~radix=2)->Js.log
-
-/* prints "deadbeef" */
-Js.Float.toStringWithRadix(3735928559., ~radix=16)->Js.log
-
-/* prints "3f.gez4w97ry0a18ymf6qadcxr" */
-Js.Float.toStringWithRadix(123.456, ~radix=36)->Js.log
-```
-*/
-external toStringWithRadix: (float, ~radix: int) => string = "toString"
-
-@val
-/**
-Parses the given `string` into a `float` using JavaScript semantics. Return the
-number as a `float` if successfully parsed, `_NaN` otherwise.
-
-## Examples
-
-```rescript
-/* returns 123 */
-Js.Float.fromString("123")
-
-/* returns 12.3 */
-Js.Float.fromString("12.3")
-
-/* returns 0 */
-Js.Float.fromString("")
-
-/* returns 17 */
-Js.Float.fromString("0x11")
-
-/* returns 3 */
-Js.Float.fromString("0b11")
-
-/* returns 9 */
-Js.Float.fromString("0o11")
-
-/* returns [_NaN] */
-Js.Float.fromString("hello")
-
-/* returns [_NaN] */
-Js.Float.fromString("100a")
-```
-*/
-external fromString: string => float = "Number"
diff --git a/jscomp/others/js_global.res b/jscomp/others/js_global.res
deleted file mode 100644
index 901a64d..0000000
--- a/jscomp/others/js_global.res
+++ /dev/null
@@ -1,197 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Contains functions available in the global scope (`window` in a browser context)
-*/
-
-/** Identify an interval started by `Js.Global.setInterval`. */
-type intervalId
-
-/** Identify timeout started by `Js.Global.setTimeout`. */
-type timeoutId
-
-@val
-/**
-Clear an interval started by `Js.Global.setInterval`
-
-## Examples
-
-```rescript
-/* API for a somewhat aggressive snoozing alarm clock */
-
-let punchSleepyGuy = () => Js.log("Punch")
-
-let interval = ref(Js.Nullable.null)
-
-let remind = () => {
-  Js.log("Wake Up!")
-  punchSleepyGuy()
-}
-
-let snooze = mins =>
-  interval := Js.Nullable.return(Js.Global.setInterval(remind, mins * 60 * 1000))
-
-let cancel = () =>
-  Js.Nullable.iter(interval.contents, (. intervalId) => Js.Global.clearInterval(intervalId))
-```
-*/
-external clearInterval: intervalId => unit = "clearInterval"
-
-@val
-/**
-Clear a timeout started by `Js.Global.setTimeout`.
-
-## Examples
-
-```rescript
-/* A simple model of a code monkey's brain */
-
-let closeHackerNewsTab = () => Js.log("close")
-
-let timer = ref(Js.Nullable.null)
-
-let work = () => closeHackerNewsTab()
-
-let procrastinate = mins => {
-  Js.Nullable.iter(timer.contents, (. timer) => Js.Global.clearTimeout(timer))
-  timer := Js.Nullable.return(Js.Global.setTimeout(work, mins * 60 * 1000))
-}
-```
-*/
-external clearTimeout: timeoutId => unit = "clearTimeout"
-
-@val
-/**
-Repeatedly executes a callback with a specified interval (in milliseconds)
-between calls. Returns a `Js.Global.intervalId` that can be passed to
-`Js.Global.clearInterval` to cancel the timeout.
-
-## Examples
-
-```rescript
-/* Will count up and print the count to the console every second */
-
-let count = ref(0)
-
-let tick = () => {
-  count := count.contents + 1
-  Js.log(Belt.Int.toString(count.contents))
-}
-
-Js.Global.setInterval(tick, 1000)
-```
-*/
-external setInterval: (unit => unit, int) => intervalId = "setInterval"
-
-@val
-/**
-Repeatedly executes a callback with a specified interval (in milliseconds)
-between calls. Returns a `Js.Global.intervalId` that can be passed to
-`Js.Global.clearInterval` to cancel the timeout.
-
-## Examples
-
-```rescript
-/* Will count up and print the count to the console every second */
-
-let count = ref(0)
-
-let tick = () => {
-  count := count.contents + 1
-  Js.log(Belt.Int.toString(count.contents))
-}
-
-Js.Global.setIntervalFloat(tick, 1000.0)
-```
-*/
-external setIntervalFloat: (unit => unit, float) => intervalId = "setInterval"
-
-@val
-/**
-Execute a callback after a specified delay (in milliseconds). Returns a
-`Js.Global.timeoutId` that can be passed to `Js.Global.clearTimeout` to cancel
-the timeout.
-
-## Examples
-
-```rescript
-/* Prints "Timed out!" in the console after one second */
-
-let message = "Timed out!"
-
-Js.Global.setTimeout(() => Js.log(message), 1000)
-```
-*/
-external setTimeout: (unit => unit, int) => timeoutId = "setTimeout"
-
-@val
-/**
-Execute a callback after a specified delay (in milliseconds). Returns a
-`Js.Global.timeoutId` that can be passed to `Js.Global.clearTimeout` to cancel
-the timeout.
-
-## Examples
-
-```rescript
-/* Prints "Timed out!" in the console after one second */
-
-let message = "Timed out!"
-
-Js.Global.setTimeoutFloat(() => Js.log(message), 1000.0)
-```
-*/
-external setTimeoutFloat: (unit => unit, float) => timeoutId = "setTimeout"
-
-@val
-/**
-URL-encodes a string.
-
-See [`encodeURI`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURI) on MDN.
-*/
-external encodeURI: string => string = "encodeURI"
-
-@val
-/**
-Decodes a URL-enmcoded string produced by `encodeURI`
-
-See [`decodeURI`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURI) on MDN.
-*/
-external decodeURI: string => string = "decodeURI"
-
-@val
-/**
-URL-encodes a string, including characters with special meaning in a URI.
-
-See [`encodeURIComponent`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent) on MDN.
-*/
-external encodeURIComponent: string => string = "encodeURIComponent"
-
-@val
-/**
-Decodes a URL-enmcoded string produced by `encodeURIComponent`
-
-See [`decodeURIComponent`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent) on MDN.
-*/
-external decodeURIComponent: string => string = "decodeURIComponent"
diff --git a/jscomp/others/js_int.res b/jscomp/others/js_int.res
deleted file mode 100644
index f375b05..0000000
--- a/jscomp/others/js_int.res
+++ /dev/null
@@ -1,171 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Provide utilities for handling `int`.
-*/
-
-/*
-If we use number, we need coerce to int32 by adding `|0`,
-otherwise `+0` can be wrong.
-Most JS API is float oriented, it may overflow int32 or
-comes with `NAN`
-*/
-
-/* + conversion */
-
-@send
-/**
-Formats an `int` using exponential (scientific) notation.
-Returns a `string` representing the given value in exponential notation.
-Raises `RangeError` if digits is not in the range \[0, 20\] (inclusive).
-
-See [`toExponential`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toExponential) on MDN.
-
-## Examples
-
-```rescript
-/* prints "7.7e+1" */
-Js.log(Js.Int.toExponential(77))
-```
-*/
-external toExponential: int => string = "toExponential"
-
-@send
-/**
-Formats an `int` using exponential (scientific) notation.
-`digits` specifies how many digits should appear after the decimal point. The value must be in the range \[0, 20\] (inclusive).
-
-Returns a `string` representing the given value in exponential notation.
-
-The output will be rounded or padded with zeroes if necessary.
-Raises `RangeError` if `digits` is not in the range \[0, 20\] (inclusive).
-
-See [`toExponential`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toExponential) on MDN.
-
-## Examples
-
-```rescript
-/* prints "7.70e+1" */
-Js.log(Js.Int.toExponentialWithPrecision(77, ~digits=2))
-
-/* prints "5.68e+3" */
-Js.log(Js.Int.toExponentialWithPrecision(5678, ~digits=2))
-```
-*/
-external toExponentialWithPrecision: (int, ~digits: int) => string = "toExponential"
-
-@send
-/**
-Formats an `int` using some fairly arbitrary rules.
-Returns a `string` representing the given value in fixed-point (usually).
-
-`toPrecision` differs from `toFixed` in that the former will format the number with full precision, while the latter will not output any digits after the decimal point.
-Raises `RangeError` if `digits` is not in the range accepted by this function.
-
-See [`toPrecision`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toPrecision) on MDN.
-
-## Examples
-
-```rescript
-/* prints "123456789" */
-Js.log(Js.Int.toPrecision(123456789))
-```
-*/
-external toPrecision: int => string = "toPrecision"
-
-@send
-/**
-Formats an `int` using some fairly arbitrary rules.
-`digits` specifies how many digits should appear in total. The value must between 0 and some arbitrary number that's hopefully at least larger than 20 (for Node it's 21. Why? Who knows).
-
-Returns a `string` representing the given value in fixed-point or scientific notation.
-
-The output will be rounded or padded with zeroes if necessary.
-
-`toPrecisionWithPrecision` differs from `toFixedWithPrecision` in that the former will count all digits against the precision, while the latter will count only the digits after the decimal point.
-`toPrecisionWithPrecision` will also use scientific notation if the specified precision is less than the number of digits before the decimal point.
-Raises `RangeError` if `digits` is not in the range accepted by this function.
-
-
-See [`toPrecision`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toPrecision) on MDN.
-
-## Examples
-
-```rescript
-/* prints "1.2e+8" */
-Js.log(Js.Int.toPrecisionWithPrecision(123456789, ~digits=2))
-
-/* prints "0.0" */
-Js.log(Js.Int.toPrecisionWithPrecision(0, ~digits=2))
-```
-*/
-external toPrecisionWithPrecision: (int, ~digits: int) => string = "toPrecision"
-
-@send
-/**
-Formats an `int` as a `string`. Returns a `string` representing the given value
-in fixed-point (usually).
-
-See [`toString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toString) on MDN.
-
-## Examples
-
-```rescript
-/* prints "123456789" */
-Js.log(Js.Int.toString(123456789))
-```
-*/
-external toString: int => string = "toString"
-
-@send
-/**
-Formats an `int` as a `string`. `radix` specifies the radix base to use for the
-formatted number. The value must be in the range \[2, 36\] (inclusive). Returns
-a `string` representing the given value in fixed-point (usually). Raises
-`RangeError` if `radix` is not in the range \[2, 36\] (inclusive).
-
-
-See [`toString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toString) on MDN.
-
-## Examples
-
-```rescript
-/* prints "110" */
-Js.log(Js.Int.toStringWithRadix(6, ~radix=2))
-
-/* prints "deadbeef" */
-Js.log(Js.Int.toStringWithRadix(3735928559, ~radix=16))
-
-/* prints "2n9c" */
-Js.log(Js.Int.toStringWithRadix(123456, ~radix=36))
-```
-*/
-external toStringWithRadix: (int, ~radix: int) => string = "toString"
-
-external toFloat: int => float = "%floatofint"
-
-let equal = (x: int, y) => x == y
-let max: int = 2147483647
-let min: int = -2147483648
diff --git a/jscomp/others/js_json.res b/jscomp/others/js_json.res
deleted file mode 100644
index ccfa6de..0000000
--- a/jscomp/others/js_json.res
+++ /dev/null
@@ -1,216 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Efficient JSON encoding using JavaScript API */
-
-@unboxed
-type rec t =
-  | Boolean(bool)
-  | @as(null) Null
-  | String(string)
-  | Number(float)
-  | Object(Js.Dict.t<t>)
-  | Array(array<t>)
-
-module Kind = {
-  type json = t
-  type rec t<_> =
-    | String: t<Js_string.t>
-    | Number: t<float>
-    | Object: t<Js_dict.t<json>>
-    | Array: t<array<json>>
-    | Boolean: t<bool>
-    | Null: t<Js_types.null_val>
-}
-
-type tagged_t =
-  | JSONFalse
-  | JSONTrue
-  | JSONNull
-  | JSONString(string)
-  | JSONNumber(float)
-  | JSONObject(Js_dict.t<t>)
-  | JSONArray(array<t>)
-
-let classify = (x: t): tagged_t => {
-  let ty = Js.typeof(x)
-  if ty == "string" {
-    JSONString(Obj.magic(x))
-  } else if ty == "number" {
-    JSONNumber(Obj.magic(x))
-  } else if ty == "boolean" {
-    if Obj.magic(x) == true {
-      JSONTrue
-    } else {
-      JSONFalse
-    }
-  } else if Obj.magic(x) === Js.null {
-    JSONNull
-  } else if Js_array2.isArray(x) {
-    JSONArray(Obj.magic(x))
-  } else {
-    JSONObject(Obj.magic(x))
-  }
-}
-
-let test = (type a, x: 'a, v: Kind.t<a>): bool =>
-  switch v {
-  | Kind.Number => Js.typeof(x) == "number"
-  | Kind.Boolean => Js.typeof(x) == "boolean"
-  | Kind.String => Js.typeof(x) == "string"
-  | Kind.Null => Obj.magic(x) === Js.null
-  | Kind.Array => Js_array2.isArray(x)
-  | Kind.Object => Obj.magic(x) !== Js.null && (Js.typeof(x) == "object" && !Js_array2.isArray(x))
-  }
-
-let decodeString = json =>
-  if Js.typeof(json) == "string" {
-    Some((Obj.magic((json: t)): string))
-  } else {
-    None
-  }
-
-let decodeNumber = json =>
-  if Js.typeof(json) == "number" {
-    Some((Obj.magic((json: t)): float))
-  } else {
-    None
-  }
-
-let decodeObject = json =>
-  if (
-    Js.typeof(json) == "object" &&
-      (!Js_array2.isArray(json) &&
-      !((Obj.magic(json): Js.null<'a>) === Js.null))
-  ) {
-    Some((Obj.magic((json: t)): Js_dict.t<t>))
-  } else {
-    None
-  }
-
-let decodeArray = json =>
-  if Js_array2.isArray(json) {
-    Some((Obj.magic((json: t)): array<t>))
-  } else {
-    None
-  }
-
-let decodeBoolean = (json: t) =>
-  if Js.typeof(json) == "boolean" {
-    Some((Obj.magic((json: t)): bool))
-  } else {
-    None
-  }
-
-let decodeNull = (json): option<Js.null<_>> =>
-  if (Obj.magic(json): Js.null<'a>) === Js.null {
-    Some(Js.null)
-  } else {
-    None
-  }
-
-/* external parse : string -> t = "parse"
- [@@bs.val][@@bs.scope "JSON"] */
-
-@val @scope("JSON") external parseExn: string => t = "parse"
-
-@val @scope("JSON") external stringifyAny: 'a => option<string> = "stringify"
-/* TODO: more docs when parse error happens or stringify non-stringfy value */
-
-@val external null: t = "null"
-external string: string => t = "%identity"
-external number: float => t = "%identity"
-external boolean: bool => t = "%identity"
-external object_: Js_dict.t<t> => t = "%identity"
-
-/* external array_ : t array -> t = "%identity" */
-
-external array: array<t> => t = "%identity"
-external stringArray: array<string> => t = "%identity"
-external numberArray: array<float> => t = "%identity"
-external booleanArray: array<bool> => t = "%identity"
-external objectArray: array<Js_dict.t<t>> => t = "%identity"
-@val @scope("JSON") external stringify: t => string = "stringify"
-@val @scope("JSON") external stringifyWithSpace: (t, @as(json`null`) _, int) => string = "stringify"
-
-/* in memory modification does not work until your root is
-   actually None, so we need wrap it as ``v`` and
-   return the first element instead */
-
-let patch: _ => _ = %raw(`function (json) {
-  var x = [json];
-  var q = [{ kind: 0, i: 0, parent: x }];
-  while (q.length !== 0) {
-    // begin pop the stack
-    var cur = q[q.length - 1];
-    if (cur.kind === 0) {
-      cur.val = cur.parent[cur.i]; // patch the undefined value for array
-      if (++cur.i === cur.parent.length) {
-        q.pop();
-      }
-    } else {
-      q.pop();
-    }
-    // finish
-    var task = cur.val;
-    if (typeof task === "object") {
-      if (Array.isArray(task) && task.length !== 0) {
-        q.push({ kind: 0, i: 0, parent: task, val: undefined });
-      } else {
-        for (var k in task) {
-          if (k === "RE_PRIVATE_NONE") {
-            if (cur.kind === 0) {
-              cur.parent[cur.i - 1] = undefined;
-            } else {
-              cur.parent[cur.i] = undefined;
-            }
-            continue;
-          }
-          q.push({ kind: 1, i: k, parent: task, val: task[k] });
-        }
-      }
-    }
-  }
-  return x[0];
-}
-`)
-
-let serializeExn = (type t, x: t): string =>
-  %raw(` function(obj){
-  var output= JSON.stringify(obj,function(_,value){
-      if(value===undefined){
-          return {RE_PRIVATE_NONE : true}
-      }
-    return value
-  });
-  
- if(output === undefined){
-   // JSON.stringify will raise TypeError when it detects cylic objects
-   throw new TypeError("output is undefined")
- }
- return output 
- }
-`)(x)
-
-let deserializeUnsafe = (s: string): 'a => patch(parseExn(s))
diff --git a/jscomp/others/js_json.resi b/jscomp/others/js_json.resi
deleted file mode 100644
index 218d5f5..0000000
--- a/jscomp/others/js_json.resi
+++ /dev/null
@@ -1,277 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Efficient JSON encoding using JavaScript API
-
-**see** [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON)
-*/
-
-/* ## Types */
-
-@unboxed /** The JSON data structure */
-type rec t =
-  | Boolean(bool)
-  | @as(null) Null
-  | String(string)
-  | Number(float)
-  | Object(Js.Dict.t<t>)
-  | Array(array<t>)
-
-module Kind: {
-  type json = t
-  /** Underlying type of a JSON value */
-  type rec t<_> =
-    | String: t<Js_string.t>
-    | Number: t<float>
-    | Object: t<Js_dict.t<json>>
-    | Array: t<array<json>>
-    | Boolean: t<bool>
-    | Null: t<Js_types.null_val>
-}
-
-type tagged_t =
-  | JSONFalse
-  | JSONTrue
-  | JSONNull
-  | JSONString(string)
-  | JSONNumber(float)
-  | JSONObject(Js_dict.t<t>)
-  | JSONArray(array<t>)
-
-/* ## Accessors */
-
-let classify: t => tagged_t
-
-/**
-`test(v, kind)` returns `true` if `v` is of `kind`.
-*/
-let test: ('a, Kind.t<'b>) => bool
-
-/**
-`decodeString(json)` returns `Some(s)` if `json` is a `string`, `None` otherwise.
-*/
-let decodeString: t => option<Js_string.t>
-
-/**
-`decodeNumber(json)` returns `Some(n)` if `json` is a `number`, `None` otherwise.
-*/
-let decodeNumber: t => option<float>
-
-/**
-`decodeObject(json)` returns `Some(o)` if `json` is an `object`, `None` otherwise.
-*/
-let decodeObject: t => option<Js_dict.t<t>>
-
-/**
-`decodeArray(json)` returns `Some(a)` if `json` is an `array`, `None` otherwise.
-*/
-let decodeArray: t => option<array<t>>
-
-/**
-`decodeBoolean(json)` returns `Some(b)` if `json` is a `boolean`, `None` otherwise.
-*/
-let decodeBoolean: t => option<bool>
-
-/**
-`decodeNull(json)` returns `Some(null)` if `json` is a `null`, `None` otherwise.
-*/
-let decodeNull: t => option<Js_null.t<'a>>
-
-/* ## Constructors */
-
-/*
-   Those functions allows the construction of an arbitrary complex
-   JSON values.
-*/
-
-@val /** `null` is the singleton null JSON value. */
-external null: t = "null"
-
-/** `string(s)` makes a JSON string of the `string` `s`. */
-external string: string => t = "%identity"
-
-/** `number(n)` makes a JSON number of the `float` `n`. */
-external number: float => t = "%identity"
-
-/** `boolean(b)` makes a JSON boolean of the `bool` `b`. */
-external boolean: bool => t = "%identity"
-
-/** `object_(dict)` makes a JSON object of the `Js.Dict.t` `dict`. */
-external object_: Js_dict.t<t> => t = "%identity"
-
-/** `array_(a)` makes a JSON array of the `Js.Json.t` array `a`. */
-external array: array<t> => t = "%identity"
-
-/*
-  The functions below are specialized for specific array type which
-  happened to be already JSON object in the ReScript runtime. Therefore
-  they are more efficient (constant time rather than linear conversion).
-*/
-
-/** `stringArray(a)` makes a JSON array of the `string` array `a`. */
-external stringArray: array<string> => t = "%identity"
-
-/** `numberArray(a)` makes a JSON array of the `float` array `a`. */
-external numberArray: array<float> => t = "%identity"
-
-/** `booleanArray(a)` makes a JSON array of the `bool` array `a`. */
-external booleanArray: array<bool> => t = "%identity"
-
-/** `objectArray(a) makes a JSON array of the `JsDict.t` array `a`. */
-external objectArray: array<Js_dict.t<t>> => t = "%identity"
-
-/* ## String conversion */
-
-@val
-@scope("JSON")
-/**
-`parseExn(s)` parses the `string` `s` into a JSON data structure.
-Returns a JSON data structure.
-Raises `SyntaxError` if the given string is not a valid JSON. Note: `SyntaxError` is a JavaScript exception.
-
-See [`parse`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse) on MDN.
-
-## Examples
-
-```rescript
-/* parse a simple JSON string */
-
-let json = try Js.Json.parseExn(` "hello" `) catch {
-| _ => failwith("Error parsing JSON string")
-}
-
-switch Js.Json.classify(json) {
-| Js.Json.JSONString(value) => Js.log(value)
-| _ => failwith("Expected a string")
-}
-```
-
-```rescript
-/* parse a complex JSON string */
-
-let getIds = s => {
-  let json = try Js.Json.parseExn(s) catch {
-  | _ => failwith("Error parsing JSON string")
-  }
-
-  switch Js.Json.classify(json) {
-  | Js.Json.JSONObject(value) =>
-    /* In this branch, compiler infer value : Js.Json.t Js.Dict.t */
-    switch Js.Dict.get(value, "ids") {
-    | Some(ids) =>
-      switch Js.Json.classify(ids) {
-      | Js.Json.JSONArray(ids) => /* In this branch compiler infer ids : Js.Json.t array */
-        ids
-      | _ => failwith("Expected an array")
-      }
-    | None => failwith("Expected an `ids` property")
-    }
-  | _ => failwith("Expected an object")
-  }
-}
-
-/* prints `1, 2, 3` */
-Js.log(getIds(` { "ids" : [1, 2, 3 ] } `))
-```
-*/
-external parseExn: string => t = "parse"
-
-@val
-@scope("JSON")
-/**
-`stringify(json)` formats the JSON data structure as a `string`.
-Returns the string representation of a given JSON data structure.
-
-See [`stringify`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify) on MDN.
-
-## Examples
-
-```rescript
-/* Creates and stringifies a simple JS object */
-
-let dict = Js.Dict.empty()
-Js.Dict.set(dict, "name", Js.Json.string("John Doe"))
-Js.Dict.set(dict, "age", Js.Json.number(30.0))
-Js.Dict.set(dict, "likes", Js.Json.stringArray(["ReScript", "ocaml", "js"]))
-
-Js.log(Js.Json.stringify(Js.Json.object_(dict)))
-```
-*/
-external stringify: t => string = "stringify"
-
-@val
-@scope("JSON")
-/**
-`stringifyWithSpace(json)` formats the JSON data structure as a `string`.
-Returns the string representation of a given JSON data structure with spacing.
-
-See [`stringify`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify) on MDN.
-
-## Examples
-
-```rescript
-/* Creates and stringifies a simple JS object with spacing */
-
-let dict = Js.Dict.empty()
-Js.Dict.set(dict, "name", Js.Json.string("John Doe"))
-Js.Dict.set(dict, "age", Js.Json.number(30.0))
-Js.Dict.set(dict, "likes", Js.Json.stringArray(["ReScript", "ocaml", "js"]))
-
-Js.log(Js.Json.stringifyWithSpace(Js.Json.object_(dict), 2))
-```
-*/
-external stringifyWithSpace: (t, @as(json`null`) _, int) => string = "stringify"
-
-@val
-@scope("JSON")
-/**
-`stringifyAny(value)` formats any value into a JSON string.
-
-## Examples
-
-```rescript
-/* prints `["hello", "world"]` */
-Js.log(Js.Json.stringifyAny(["hello", "world"]))
-```
-*/
-external stringifyAny: 'a => option<string> = "stringify"
-
-/**
-Best-effort serialization, it tries to seralize as
-many objects as possible and deserialize it back
-
-It is unsafe in two aspects
-- It may throw during  parsing
-- when you cast it to a specific type, it may have a type mismatch
-*/
-let deserializeUnsafe: string => 'a
-
-/**
-It will raise in such situations:
-- The object can not be serlialized to a JSON
-- There are cycles
-- Some JS engines can not stringify deeply nested json objects
-*/
-let serializeExn: 'a => string
diff --git a/jscomp/others/js_list.res b/jscomp/others/js_list.res
deleted file mode 100644
index 72c66b5..0000000
--- a/jscomp/others/js_list.res
+++ /dev/null
@@ -1,213 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@@warning("-3")
-
-type t<'a> = list<'a>
-
-let rec lengthAux = (len, x) =>
-  switch x {
-  | list{} => len
-  | list{_, ...l} => lengthAux(len + 1, l)
-  }
-
-let length = l => lengthAux(0, l)
-
-let cons = (x, xs) => list{x, ...xs}
-
-let isEmpty = x => x == list{}
-
-let hd = x =>
-  switch x {
-  | list{} => None
-  | list{a, ..._} => Some(a)
-  }
-
-let tl = x =>
-  switch x {
-  | list{} => None
-  | list{_, ...l} => Some(l)
-  }
-
-let nth = (l, n) =>
-  if n < 0 {
-    None
-  } else {
-    let rec nth_aux = (l, n) =>
-      switch l {
-      | list{} => None
-      | list{a, ...l} =>
-        if n == 0 {
-          Some(a)
-        } else {
-          nth_aux(l, n - 1)
-        }
-      }
-    nth_aux(l, n)
-  }
-
-let rec revAppend = (l1, l2) =>
-  switch l1 {
-  | list{} => l2
-  | list{a, ...l} => revAppend(l, list{a, ...l2})
-  }
-
-let rev = l => revAppend(l, list{})
-
-let rec mapRevAux = (f, acc, ls) =>
-  switch ls {
-  | list{} => acc
-  | list{a, ...l} => mapRevAux(f, list{f(. a), ...acc}, l)
-  }
-
-let mapRev = (f, ls) => mapRevAux(f, list{}, ls)
-
-let map = (f, ls) => rev(mapRevAux(f, list{}, ls))
-
-let rec iter = (f, x) =>
-  switch x {
-  | list{} => ()
-  | list{a, ...l} =>
-    f(. a)
-    iter(f, l)
-  }
-
-let rec iteri = (i, f, x) =>
-  switch x {
-  | list{} => ()
-  | list{a, ...l} =>
-    f(. i, a)
-    iteri(i + 1, f, l)
-  }
-
-let iteri = (f, l) => iteri(0, f, l)
-
-let rec foldLeft = (f, accu, l) =>
-  switch l {
-  | list{} => accu
-  | list{a, ...l} => foldLeft(f, f(. accu, a), l)
-  }
-
-let foldRightMaxStack = 1000
-
-let rec tailLoop = (f, acc, x) =>
-  switch x {
-  | list{} => acc
-  | list{h, ...t} => tailLoop(f, f(. h, acc), t)
-  }
-
-let foldRight = (f, l, init) => {
-  let rec loop = (n, x) =>
-    switch x {
-    | list{} => init
-    | list{h, ...t} =>
-      if n < foldRightMaxStack {
-        f(. h, loop(n + 1, t))
-      } else {
-        f(. h, tailLoop(f, init, rev(t)))
-      }
-    }
-
-  loop(0, l)
-}
-
-let rec flattenAux = (acc, lx) =>
-  switch lx {
-  | list{} => rev(acc)
-  | list{y, ...ys} => flattenAux(revAppend(y, acc), ys)
-  }
-
-let flatten = lx => flattenAux(list{}, lx)
-
-let rec filterRevAux = (f, acc, xs) =>
-  switch xs {
-  | list{} => acc
-  | list{y, ...ys} =>
-    switch f(. y) {
-    | false => filterRevAux(f, acc, ys)
-    | true => filterRevAux(f, list{y, ...acc}, ys)
-    }
-  }
-
-let filter = (f, xs) => rev(filterRevAux(f, list{}, xs))
-
-let rec filterMapRevAux = (f: (. 'a) => option<'b>, acc, xs) =>
-  switch xs {
-  | list{} => acc
-  | list{y, ...ys} =>
-    switch f(. y) {
-    | None => filterMapRevAux(f, acc, ys)
-    | Some(z) => filterMapRevAux(f, list{z, ...acc}, ys)
-    }
-  }
-
-let filterMap = (f, xs) => rev(filterMapRevAux(f, list{}, xs))
-
-let rec countByAux = (f, acc, xs) =>
-  switch xs {
-  | list{} => acc
-  | list{y, ...ys} =>
-    countByAux(
-      f,
-      if f(. y) {
-        acc + 1
-      } else {
-        acc
-      },
-      ys,
-    )
-  }
-
-let countBy = (f, xs) => countByAux(f, 0, xs)
-
-let init = (n, f) => Js_vector.toList(Js_vector.init(n, f))
-
-@new external createUnsafe: int => array<'a> = "Array"
-
-let toVector = xs =>
-  switch xs {
-  | list{} => []
-  | l =>
-    let a = createUnsafe(length(l))
-    let rec fill = (i, x) =>
-      switch x {
-      | list{} => a
-      | list{hd, ...tl} =>
-        Js_array2.unsafe_set(a, i, hd)
-        fill(i + 1, tl)
-      }
-    fill(0, l)
-  }
-
-let rec equal = (cmp, xs, ys) =>
-  switch (xs, ys) {
-  | (list{}, list{}) => true
-  | (list{x, ...xs}, list{y, ...ys}) =>
-    if cmp(. x, y) {
-      equal(cmp, xs, ys)
-    } else {
-      false
-    }
-  | (_, _) => false
-  }
diff --git a/jscomp/others/js_list.resi b/jscomp/others/js_list.resi
deleted file mode 100644
index d4c9efa..0000000
--- a/jscomp/others/js_list.resi
+++ /dev/null
@@ -1,71 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@@deprecated("Use Belt.List instead")
-
-type t<'a> = list<'a>
-
-let length: t<'a> => int
-
-let cons: ('a, t<'a>) => t<'a>
-
-let isEmpty: t<'a> => bool
-
-let hd: t<'a> => option<'a>
-
-let tl: t<'a> => option<t<'a>>
-
-let nth: (t<'a>, int) => option<'a>
-
-let revAppend: (t<'a>, t<'a>) => t<'a>
-
-let rev: t<'a> => t<'a>
-
-let mapRev: ((. 'a) => 'b, t<'a>) => t<'b>
-
-let map: ((. 'a) => 'b, t<'a>) => t<'b>
-
-let iter: ((. 'a) => unit, t<'a>) => unit
-
-let iteri: ((. int, 'a) => unit, t<'a>) => unit
-
-/** Application order is left to right, tail recurisve */
-let foldLeft: ((. 'a, 'b) => 'a, 'a, list<'b>) => 'a
-
-/** Application order is right to left tail-recursive. */
-let foldRight: ((. 'a, 'b) => 'b, list<'a>, 'b) => 'b
-
-let flatten: t<t<'a>> => t<'a>
-
-let filter: ((. 'a) => bool, t<'a>) => t<'a>
-
-let filterMap: ((. 'a) => option<'b>, t<'a>) => t<'b>
-
-let countBy: ((. 'a) => bool, list<'a>) => int
-
-let init: (int, (. int) => 'a) => t<'a>
-
-let toVector: t<'a> => array<'a>
-
-let equal: ((. 'a, 'a) => bool, list<'a>, list<'a>) => bool
diff --git a/jscomp/others/js_map.res b/jscomp/others/js_map.res
deleted file mode 100644
index e5e1c8e..0000000
--- a/jscomp/others/js_map.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/*** ES6 Map API */
-
-type t<'k, 'v>
diff --git a/jscomp/others/js_mapperRt.res b/jscomp/others/js_mapperRt.res
deleted file mode 100644
index 4c68f13..0000000
--- a/jscomp/others/js_mapperRt.res
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@get_index external unsafeGet: (array<int>, int) => int = ""
-
-let raiseWhenNotFound = x =>
-  if Js.testAny(x) {
-    raise(Not_found)
-  } else {
-    x
-  }
-
-let rec fromIntAux = (enum: int, i, len, xs) =>
-  if i == len {
-    None
-  } else {
-    let k = unsafeGet(xs, i)
-    if k == enum {
-      Some(i)
-    } else {
-      fromIntAux(enum, i + 1, len, xs)
-    }
-  }
-
-let fromInt = (len, xs: array<int>, enum: int): option<'variant> => fromIntAux(enum, 0, len, xs)
-
-let rec fromIntAssertAux = (len, enum: int, i, xs) =>
-  if i == len {
-    raise(Not_found)
-  } else {
-    let k = unsafeGet(xs, i)
-    if k == enum {
-      i
-    } else {
-      fromIntAssertAux(len, enum, i + 1, xs)
-    }
-  }
-
-/** `length` is not relevant any more */
-let fromIntAssert = (len, xs: array<int>, enum: int) => fromIntAssertAux(len, enum, 0, xs)
diff --git a/jscomp/others/js_mapperRt.resi b/jscomp/others/js_mapperRt.resi
deleted file mode 100644
index 6b9dbdd..0000000
--- a/jscomp/others/js_mapperRt.resi
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let raiseWhenNotFound: 'a => 'a
-
-/**
-`fromInt(len, array, int)` return the mapped `enum`
-*/
-let fromInt: (int, array<int>, int) => option<int>
-
-let fromIntAssert: (int /* len */, array<int>, int) => int
diff --git a/jscomp/others/js_math.ml b/jscomp/others/js_math.ml
deleted file mode 100644
index c03ffcb..0000000
--- a/jscomp/others/js_math.ml
+++ /dev/null
@@ -1,656 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-(**
-Provide utilities for JS Math. Note: The constants `_E`, `_LN10`, `_LN2`,
-`_LOG10E`, `_LOG2E`, `_PI`, `_SQRT1_2`, and `_SQRT2` begin with an underscore
-because ReScript variable names cannot begin with a capital letter. (Module
-names begin with upper case.)
-*)
-
-(**
-Euler's number; ≈ 2.718281828459045. See
-[`Math.E`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/E)
-on MDN.
-*)
-external _E : float = "E" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Natural logarithm of 2; ≈ 0.6931471805599453. See
-[`Math.LN2`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/LN2)
-on MDN.
-*)
-external _LN2 : float = "LN2" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Natural logarithm of 10; ≈ 2.302585092994046. See
-[`Math.LN10`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/LN10)
-on MDN.
-*)
-external _LN10 : float = "LN10" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Base 2 logarithm of E; ≈ 1.4426950408889634. See
-[`Math.LOG2E`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/LOG2E)
-on MDN.
-*)
-external _LOG2E : float = "LOG2E" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Base 10 logarithm of E; ≈ 0.4342944819032518. See
-[`Math.LOG10E`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/LOG10E)
-on MDN.
-*)
-external _LOG10E : float = "LOG10E" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Pi - ratio of the circumference to the diameter of a circle; ≈ 3.141592653589793. See
-[`Math.PI`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/PI)
-on MDN.
-*)
-external _PI : float = "PI" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Square root of 1/2; ≈ 0.7071067811865476. See
-[`Math.SQRT1_2`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/SQRT1_2)
-on MDN.
-*)
-external _SQRT1_2 : float = "SQRT1_2" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Square root of 2; ≈ 1.4142135623730951. See
-[`Math.SQRT2`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/SQRT2)
-on MDN.
-*)
-external _SQRT2 : float = "SQRT2" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Absolute value for integer argument. See
-[`Math.abs`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/abs)
-on MDN.
-*)
-external abs_int : int -> int = "abs" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Absolute value for float argument. See
-[`Math.abs`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/abs)
-on MDN.
-*)
-external abs_float : float -> float = "abs" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Arccosine (in radians) of argument; returns `NaN` if the argument is outside
-the range [-1.0, 1.0]. See
-[`Math.acos`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/acos)
-on MDN.
-*)
-external acos : float -> float = "acos" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Hyperbolic arccosine (in radians) of argument; returns `NaN` if the argument
-is less than 1.0. See
-[`Math.acosh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/acosh)
-on MDN.
-*)
-external acosh : float -> float = "acosh" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Arcsine (in radians) of argument; returns `NaN` if the argument is outside
-the range [-1.0, 1.0]. See
-[`Math.asin`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/asin)
-on MDN.
-*)
-external asin : float -> float = "asin" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Hyperbolic arcsine (in radians) of argument. See
-[`Math.asinh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/asinh)
-on MDN.
-*)
-external asinh : float -> float = "asinh" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Arctangent (in radians) of argument. See
-[`Math.atan`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/atan)
-on MDN.
-*)
-external atan : float -> float = "atan" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Hyperbolic arctangent (in radians) of argument; returns `NaN` if the argument
-is is outside the range [-1.0, 1.0]. Returns `-Infinity` and `Infinity` for
-arguments -1.0 and 1.0. See
-[`Math.atanh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/atanh)
-on MDN.
-*)
-external atanh : float -> float = "atanh" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the angle (in radians) of the quotient `y /. x`. It is also the angle
-between the *x*-axis and point (*x*, *y*). See
-[`Math.atan2`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/atan2)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.atan2(~y=0.0, ~x=10.0, ()) == 0.0
-Js.Math.atan2(~x=5.0, ~y=5.0, ()) == Js.Math._PI /. 4.0
-Js.Math.atan2(~x=-5.0, ~y=5.0, ())
-Js.Math.atan2(~x=-5.0, ~y=5.0, ()) == 3.0 *. Js.Math._PI /. 4.0
-Js.Math.atan2(~x=-0.0, ~y=-5.0, ()) == -.Js.Math._PI /. 2.0
-```
-*)
-external atan2 : y:float -> x:float -> unit -> float = "atan2" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Cube root. See
-[`Math.cbrt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/cbrt)
-on MDN
-*)
-external cbrt : float -> float = "cbrt" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the smallest integer greater than or equal to the argument. This
-function may return values not representable by `int`, whose range is
--2147483648 to 2147483647. This is because, in JavaScript, there are only
-64-bit floating point numbers, which can represent integers in the range
-±(2<sup>53</sup>-1) exactly. See
-[`Math.ceil`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/ceil)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.unsafe_ceil_int(3.1) == 4
-Js.Math.unsafe_ceil_int(3.0) == 3
-Js.Math.unsafe_ceil_int(-3.1) == -3
-Js.Math.unsafe_ceil_int(1.0e15) // result is outside range of int datatype
-```
-*)
-external unsafe_ceil_int : float -> int = "ceil" [@@bs.val] [@@bs.scope "Math"]
-
-let unsafe_ceil = unsafe_ceil_int
-[@@deprecated "Please use `unsafe_ceil_int` instead"]
-
-(**
-Returns the smallest `int` greater than or equal to the argument; the result
-is pinned to the range of the `int` data type: -2147483648 to 2147483647. See
-[`Math.ceil`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/ceil)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.ceil_int(3.1) == 4
-Js.Math.ceil_int(3.0) == 3
-Js.Math.ceil_int(-3.1) == -3
-Js.Math.ceil_int(-1.0e15) == -2147483648
-Js.Math.ceil_int(1.0e15) == 2147483647
-```
-*)
-let ceil_int (f : float) : int =
-  if f > Js_int.toFloat Js_int.max then Js_int.max
-  else if f < Js_int.toFloat Js_int.min then Js_int.min
-  else unsafe_ceil_int f
-
-let ceil = ceil_int
-[@@deprecated "Please use `ceil_int` instead"]
-
-(**
-Returns the smallest integral value greater than or equal to the argument.
-The result is a `float` and is not restricted to the `int` data type range.
-See
-[`Math.ceil`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/ceil)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.ceil_float(3.1) == 4.0
-Js.Math.ceil_float(3.0) == 3.0
-Js.Math.ceil_float(-3.1) == -3.0
-Js.Math.ceil_float(2_150_000_000.3) == 2_150_000_001.0
-```
-*)
-external ceil_float : float -> float = "ceil" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Number of leading zero bits of the argument's 32 bit int representation. See
-[`Math.clz32`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/clz32)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.clz32(0) == 32
-Js.Math.clz32(-1) == 0
-Js.Math.clz32(255) == 24
-```
-*)
-external clz32 : int -> int = "clz32" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Cosine of argument, which must be specified in radians. See
-[`Math.cos`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/cos)
-on MDN.
-*)
-external cos : float -> float = "cos" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Hyperbolic cosine of argument, which must be specified in radians. See
-[`Math.cosh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/cosh)
-on MDN.
-*)
-external cosh : float -> float = "cosh" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Natural exponentional; returns *e* (the base of natural logarithms) to the
-power of the given argument. See
-[`Math.exp`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/exp)
-on MDN.
-*)
-external exp : float -> float = "exp" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns *e* (the base of natural logarithms) to the power of the given
-argument minus 1. See
-[`Math.expm1`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/expm1)
-on MDN.
-*)
-external expm1 : float -> float = "expm1" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the largest integer less than or equal to the argument. This function
-may return values not representable by `int`, whose range is -2147483648 to
-2147483647. This is because, in JavaScript, there are only 64-bit floating
-point numbers, which can represent integers in the range
-±(2<sup>53</sup>-1) exactly. See
-[`Math.floor`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/floor)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.unsafe_floor_int(3.7) == 3
-Js.Math.unsafe_floor_int(3.0) == 3
-Js.Math.unsafe_floor_int(-3.7) == -4
-Js.Math.unsafe_floor_int(1.0e15) // result is outside range of int datatype
-```
-*)
-external unsafe_floor_int : float -> int = "floor" [@@bs.val] [@@bs.scope "Math"]
-
-let unsafe_floor = unsafe_floor_int
-[@@deprecated "Please use `unsafe_floor_int` instead"]
-
-(**
-Returns the largest `int` less than or equal to the argument; the result is
-pinned to the range of the `int` data type: -2147483648 to 2147483647. See
-[`Math.floor`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/floor)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.floor_int(3.7) == 3
-Js.Math.floor_int(3.0) == 3
-Js.Math.floor_int(-3.1) == -4
-Js.Math.floor_int(-1.0e15) == -2147483648
-Js.Math.floor_int(1.0e15) == 2147483647
-```
-*)
-let floor_int f =
-  if f > Js_int.toFloat Js_int.max then Js_int.max
-  else if f < Js_int.toFloat Js_int.min then Js_int.min
-  else unsafe_floor f
-
-let floor = floor_int
-[@@deprecated "Please use `floor_int` instead"]
-
-(**
-Returns the largest integral value less than or equal to the argument. The
-result is a `float` and is not restricted to the `int` data type range. See
-[`Math.floor`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/floor)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.floor_float(3.7) == 3.0
-Js.Math.floor_float(3.0) == 3.0
-Js.Math.floor_float(-3.1) == -4.0
-Js.Math.floor_float(2_150_000_000.3) == 2_150_000_000.0
-```
-*)
-external floor_float : float -> float = "floor" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Round to nearest single precision float. See
-[`Math.fround`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/fround)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.fround(5.5) == 5.5
-Js.Math.fround(5.05) == 5.050000190734863
-```
-*)
-external fround : float -> float = "fround" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the square root of the sum of squares of its two arguments (the
-Pythagorean formula). See
-[`Math.hypot`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/hypot)
-on MDN.
-*)
-external hypot : float -> float -> float = "hypot" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the square root of the sum of squares of the numbers in the array
-argument (generalized Pythagorean equation). Using an array allows you to
-have more than two items. See
-[`Math.hypot`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/hypot)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.hypotMany([3.0, 4.0, 12.0]) == 13.0
-```
-*)
-external hypotMany : float array -> float = "hypot" [@@bs.val] [@@bs.splice] [@@bs.scope "Math"]
-
-(**
-32-bit integer multiplication. Use this only when you need to optimize
-performance of multiplication of numbers stored as 32-bit integers. See
-[`Math.imul`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/imul)
-on MDN.
-*)
-external imul : int -> int -> int = "imul" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the natural logarithm of its argument; this is the number *x* such
-that *e*<sup>*x*</sup> equals the argument. Returns `NaN` for negative
-arguments. See
-[`Math.log`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/log)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.log(Js.Math._E) == 1.0
-Js.Math.log(100.0) == 4.605170185988092
-```
-*)
-external log : float -> float = "log" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the natural logarithm of one plus the argument. Returns `NaN` for
-arguments less than -1. See
-[`Math.log1p`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/log1p)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.log1p(Js.Math._E -. 1.0) == 1.0
-Js.Math.log1p(99.0) == 4.605170185988092
-```
-*)
-external log1p : float -> float = "log1p" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the base 10 logarithm of its argument. Returns `NaN` for negative
-arguments. See
-[`Math.log10`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/log10)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.log10(1000.0) == 3.0
-Js.Math.log10(0.01) == -2.0
-Js.Math.log10(Js.Math.sqrt(10.0)) == 0.5
-```
-*)
-external log10 : float -> float = "log10" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the base 2 logarithm of its argument. Returns `NaN` for negative
-arguments. See
-[`Math.log2`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/log2)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.log2(512.0) == 9.0
-Js.Math.log2(0.125) == -3.0
-Js.Math.log2(Js.Math._SQRT2) == 0.5000000000000001 // due to precision
-```
-*)
-external log2 : float -> float = "log2" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the maximum of its two integer arguments.  See
-[`Math.max`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/max)
-on MDN.
-*)
-external max_int : int -> int -> int = "max" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the maximum of the integers in the given array.  See
-[`Math.max`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/max)
-on MDN.
-*)
-external maxMany_int : int array -> int = "max" [@@bs.val] [@@bs.splice] [@@bs.scope "Math"]
-
-(**
-Returns the maximum of its two floating point arguments. See
-[`Math.max`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/max)
-on MDN.
-*)
-external max_float : float -> float -> float = "max" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the maximum of the floating point values in the given array. See
-[`Math.max`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/max)
-on MDN.
-*)
-external maxMany_float : float array -> float = "max" [@@bs.val] [@@bs.splice] [@@bs.scope "Math"]
-
-(**
-Returns the minimum of its two integer arguments. See
-[`Math.min`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/min)
-on MDN.
-*)
-external min_int : int -> int -> int = "min" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the minimum of the integers in the given array. See
-[`Math.min`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/min)
-on MDN.
-*)
-external minMany_int : int array -> int = "min" [@@bs.val] [@@bs.splice] [@@bs.scope "Math"]
-
-(**
-Returns the minimum of its two floating point arguments. See
-[`Math.min`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/min)
-on MDN.
-*)
-external min_float : float -> float -> float = "min" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the minimum of the floating point values in the given array. See
-[`Math.min`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/min)
-on MDN.
-*)
-external minMany_float : float array -> float = "min" [@@bs.val] [@@bs.splice] [@@bs.scope "Math"]
-
-(**
-Raises the given base to the given exponent. (Arguments and result are
-integers.) See
-[`Math.pow`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/pow)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.pow_int(~base=3, ~exp=4) == 81
-```
-*)
-external pow_int : base:int -> exp:int -> int = "pow" [@@bs.val] [@@bs.scope "Math"]
-[@@deprecated "use `pow_float` instead, the return type may be not int"]
-
-(**
-Raises the given base to the given exponent. (Arguments and result are
-floats.) Returns `NaN` if the result would be imaginary. See
-[`Math.pow`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/pow)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.pow_float(~base=3.0, ~exp=4.0) == 81.0
-Js.Math.pow_float(~base=4.0, ~exp=-2.0) == 0.0625
-Js.Math.pow_float(~base=625.0, ~exp=0.5) == 25.0
-Js.Math.pow_float(~base=625.0, ~exp=-0.5) == 0.04
-Js.Float.isNaN(Js.Math.pow_float(~base=-2.0, ~exp=0.5)) == true
-```
-*)
-external pow_float : base:float -> exp:float -> float = "pow" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns a random number in the half-closed interval [0,1). See
-[`Math.random`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/random)
-on MDN.
-*)
-external random : unit -> float = "random" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-A call to `random_int(minVal, maxVal)` returns a random number in the
-half-closed interval [minVal, maxVal). See
-[`Math.random`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/random)
-on MDN.
-*)
-let random_int min max =
-  floor ((random ()) *. (Js_int.toFloat (max - min))) + min
-
-(**
-Rounds its argument to nearest integer. For numbers with a fractional portion
-of exactly 0.5, the argument is rounded to the next integer in the direction
-of positive infinity. This function may return values not representable by
-`int`, whose range is -2147483648 to 2147483647. This is because, in
-JavaScript, there are only 64-bit floating point numbers, which can represent
-integers in the range ±(2<sup>53</sup>-1) exactly. See
-[`Math.round`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round)
-on MDN.
-
-## Examples
-
-```rescript
-Js.Math.unsafe_round(3.7) == 4
-Js.Math.unsafe_round(-3.5) == -3
-Js.Math.unsafe_round(2_150_000_000_000.3) // out of range for int
-```
-*)
-external unsafe_round : float -> int = "round" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Rounds to nearest integral value (expressed as a float). See
-[`Math.round`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round)
-on MDN.
-*)
-external round : float -> float = "round" [@@bs.val] [@@bs.scope "Math"]
-
-(**
-Returns the sign of its integer argument: -1 if negative, 0 if zero, 1 if
-positive. See
-[`Math.sign`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sign)
-on MDN.
-*)
-external sign_int : int -> int = "sign" [@@bs.val][@@bs.scope "Math"]
-
-(**
-Returns the sign of its float argument: -1.0 if negative, 0.0 if zero, 1.0 if
-positive. See
-[`Math.sign`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sign)
-on MDN.
-*)
-external sign_float : float -> float = "sign" [@@bs.val][@@bs.scope "Math"]
-
-(**
-Sine of argument, which must be specified in radians. See
-[`Math.sin`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sin)
-on MDN.
-*)
-external sin : float -> float = "sin" [@@bs.val][@@bs.scope "Math"]
-
-(**
-Hyperbolic sine of argument, which must be specified in radians. See
-[`Math.sinh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sinh)
-on MDN.
-*)
-external sinh : float -> float = "sinh" [@@bs.val][@@bs.scope "Math"]
-
-(**
-Square root. If the argument is negative, this function returns `NaN`. See
-[`Math.sqrt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/sqrt)
-on MDN.
-*)
-external sqrt : float -> float = "sqrt" [@@bs.val][@@bs.scope "Math"]
-
-(**
-Tangent of argument, which must be specified in radians. Returns `NaN` if the
-argument is positive infinity or negative infinity. See
-[`Math.cos`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/cos)
-on MDN.
-*)
-external tan : float -> float = "tan" [@@bs.val][@@bs.scope "Math"]
-
-(**
-Hyperbolic tangent of argument, which must be specified in radians. See
-[`Math.tanh`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/tanh)
-on MDN.
-*)
-external tanh : float -> float = "tanh" [@@bs.val][@@bs.scope "Math"]
-
-(**
-Truncates its argument; i.e., removes fractional digits. This function may
-return values not representable by `int`, whose range is -2147483648 to
-2147483647. This is because, in JavaScript, there are only 64-bit floating
-point numbers, which can represent integers in the range ±(2<sup>53</sup>-1)
-exactly. See
-[`Math.trunc`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/trunc)
-on MDN.
-*)
-external unsafe_trunc : float -> int = "trunc" [@@bs.val][@@bs.scope "Math"]
-
-(**
-Truncates its argument; i.e., removes fractional digits. See
-[`Math.trunc`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/trunc)
-on MDN.
-*)
-external trunc : float -> float = "trunc" [@@bs.val][@@bs.scope "Math"]
diff --git a/jscomp/others/js_null.res b/jscomp/others/js_null.res
deleted file mode 100644
index 6c3adbc..0000000
--- a/jscomp/others/js_null.res
+++ /dev/null
@@ -1,63 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Provides functionality for dealing with the `'a Js.null` type */
-
-@unboxed
-type t<+'a> = Js.null<'a> =
-  | Value('a)
-  | @as(null) Null
-
-external to_opt: t<'a> => option<'a> = "#null_to_opt"
-external toOption: t<'a> => option<'a> = "#null_to_opt"
-external return: 'a => t<'a> = "%identity"
-let test: t<'a> => bool = x => x == Js.null
-external empty: t<'a> = "#null"
-external getUnsafe: t<'a> => 'a = "%identity"
-
-let getExn = f =>
-  switch toOption(f) {
-  | None => Js_exn.raiseError("Js.Null.getExn")
-  | Some(x) => x
-  }
-
-let bind = (x, f) =>
-  switch toOption(x) {
-  | None => empty
-  | Some(x) => return(f(. x))
-  }
-
-let iter = (x, f) =>
-  switch toOption(x) {
-  | None => ()
-  | Some(x) => f(. x)
-  }
-
-let fromOption = x =>
-  switch x {
-  | None => empty
-  | Some(x) => return(x)
-  }
-
-let from_opt = fromOption
diff --git a/jscomp/others/js_null.resi b/jscomp/others/js_null.resi
deleted file mode 100644
index 4c99635..0000000
--- a/jscomp/others/js_null.resi
+++ /dev/null
@@ -1,90 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Provides functionality for dealing with the `Js.null<'a>` type */
-
-@unboxed /** Local alias for `Js.null<'a>` */
-type t<+'a> = Js.null<'a> =
-  | Value('a)
-  | @as(null) Null
-
-/** Constructs a value of `Js.null<'a>` containing a value of `'a`. */
-external return: 'a => t<'a> = "%identity"
-
-@deprecated("Use = Js.null directly ")
-/** Returns `true` if the given value is empty (`null`), `false` otherwise. */
-let test: t<'a> => bool
-
-/** The empty value, `null` */
-external empty: t<'a> = "#null"
-
-external getUnsafe: t<'a> => 'a = "%identity"
-let getExn: t<'a> => 'a
-
-/**
-Maps the contained value using the given function.
-
-If `Js.null<'a>` contains a value, that value is unwrapped, mapped to a `'b`
-using the given function `'a => 'b`, then wrapped back up and returned as
-`Js.null<'b>`.
-
-## Examples
-
-```rescript
-let maybeGreetWorld = (maybeGreeting: Js.null<string>) =>
-  Js.Null.bind(maybeGreeting, (. greeting) => greeting ++ " world!")
-```
-*/
-let bind: (t<'a>, (. 'a) => 'b) => t<'b>
-
-/**
-Iterates over the contained value with the given function.
-If `Js.null<'a>` contains a value, that value is unwrapped and applied to the given function.
-
-## Examples
-
-```rescript
-let maybeSay = (maybeMessage: Js.null<string>) =>
-  Js.Null.iter(maybeMessage, (. message) => Js.log(message))
-```
-*/
-let iter: (t<'a>, (. 'a) => unit) => unit
-
-/**
-Maps `option<'a>` to `Js.null<'a>`.
-`Some(a)` => `a`
-`None` => `empty`
-*/
-let fromOption: option<'a> => t<'a>
-
-@deprecated("Use fromOption instead") let from_opt: option<'a> => t<'a>
-
-/**
-Maps `Js.null<'a>` to `option<'a>`.
-`a` => `Some(a)`
-`empty` => `None`
-*/
-external toOption: t<'a> => option<'a> = "#null_to_opt"
-
-@deprecated("Use toOption instead") external to_opt: t<'a> => option<'a> = "#null_to_opt"
diff --git a/jscomp/others/js_null_undefined.res b/jscomp/others/js_null_undefined.res
deleted file mode 100644
index 7c5ab1b..0000000
--- a/jscomp/others/js_null_undefined.res
+++ /dev/null
@@ -1,58 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Contains functionality for dealing with values that can be both `null` and `undefined` */
-
-@unboxed
-type t<+'a> = Js.nullable<'a> =
-  | Value('a)
-  | @as(null) Null
-  | @as(undefined) Undefined
-
-external toOption: t<'a> => option<'a> = "#nullable_to_opt"
-external to_opt: t<'a> => option<'a> = "#nullable_to_opt"
-external return: 'a => t<'a> = "%identity"
-external isNullable: t<'a> => bool = "#is_nullable"
-external null: t<'a> = "#null"
-external undefined: t<'a> = "#undefined"
-
-let bind = (x, f) =>
-  switch to_opt(x) {
-  | None => (Obj.magic((x: t<'a>)): t<'b>)
-  | Some(x) => return(f(. x))
-  }
-
-let iter = (x, f) =>
-  switch to_opt(x) {
-  | None => ()
-  | Some(x) => f(. x)
-  }
-
-let fromOption = x =>
-  switch x {
-  | None => undefined
-  | Some(x) => return(x)
-  }
-
-let from_opt = fromOption
diff --git a/jscomp/others/js_null_undefined.resi b/jscomp/others/js_null_undefined.resi
deleted file mode 100644
index e183e73..0000000
--- a/jscomp/others/js_null_undefined.resi
+++ /dev/null
@@ -1,94 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Contains functionality for dealing with values that can be both `null` and `undefined`
-*/
-
-/** Local alias for `Js.null_undefined<'a>`. */
-@unboxed
-type t<+'a> = Js.nullable<'a> =
-  | Value('a)
-  | @as(null) Null
-  | @as(undefined) Undefined
-
-/** Constructs a value of `Js.null_undefined<'a>` containing a value of `'a`. */
-external return: 'a => t<'a> = "%identity"
-
-/** Returns `true` if the given value is null or undefined, `false` otherwise. */
-external isNullable: t<'a> => bool = "#is_nullable"
-
-/** The null value of type `Js.null_undefined<'a>`. */
-external null: t<'a> = "#null"
-
-/** The undefined value of type `Js.null_undefined<'a>`. */
-external undefined: t<'a> = "#undefined"
-
-/**
-Maps the contained value using the given function.
-
-If `Js.null_undefined<'a>` contains a value, that value is unwrapped, mapped to
-a `'b` using the given function `a' => 'b`, then wrapped back up and returned
-as `Js.null_undefined<'b>`.
-
-## Examples
-
-```rescript
-let maybeGreetWorld = (maybeGreeting: Js.null_undefined<string>) =>
-  Js.Null_undefined.bind(maybeGreeting, (. greeting) => greeting ++ " world!")
-```
-*/
-let bind: (t<'a>, (. 'a) => 'b) => t<'b>
-
-/**
-Iterates over the contained value with the given function.
-If `Js.null_undefined<'a>` contains a value, that value is unwrapped and applied to the given function.
-
-## Examples
-
-```rescript
-let maybeSay = (maybeMessage: Js.null_undefined<string>) =>
-  Js.Null_undefined.iter(maybeMessage, (. message) => Js.log(message))
-```
-*/
-let iter: (t<'a>, (. 'a) => unit) => unit
-
-/**
-Maps `option<'a>` to `Js.null_undefined<'a>`.
-`Some(a)` => `a`
-`None` => `undefined`
-*/
-let fromOption: option<'a> => t<'a>
-
-@deprecated("Use fromOption instead") let from_opt: option<'a> => t<'a>
-
-/**
-Maps `Js.null_undefined<'a>` to `option<'a>`.
-`a` => `Some(a)`
-`undefined` => `None`
-`null` => `None`
-*/
-external toOption: t<'a> => option<'a> = "#nullable_to_opt"
-
-@deprecated("Use toOption instead") external to_opt: t<'a> => option<'a> = "#nullable_to_opt"
diff --git a/jscomp/others/js_obj.res b/jscomp/others/js_obj.res
deleted file mode 100644
index eb3fb14..0000000
--- a/jscomp/others/js_obj.res
+++ /dev/null
@@ -1,103 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Provides functions for inspecting and manipulating native JavaScript objects
-*/
-
-@obj /** `empty()` returns the empty object `{}` */
-external empty: unit => {..} = ""
-
-@val
-/**
-`assign(target, source)` copies properties from source to target.
-Properties in `target` will be overwritten by properties in `source` if they have the same key.
-Returns `target`.
-
-**See** [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign)
-
-## Examples
-
-```rescript
-/* Copy an object */
-
-let obj = {"a": 1}
-
-let copy = Js.Obj.assign(Js.Obj.empty(), obj)
-
-/* prints "{ a: 1 }" */
-Js.log(copy)
-
-/* Merge objects with same properties */
-
-let target = {"a": 1, "b": 1}
-let source = {"b": 2}
-
-let obj = Js.Obj.assign(target, source)
-
-/* prints "{ a: 1, b: 2 }" */
-Js.log(obj)
-
-/* prints "{ a: 1, b: 2 }", target is modified */
-Js.log(target)
-```
-*/
-external assign: ({..}, {..}) => {..} = "Object.assign"
-
-/* TODO:
-
-   Should we map this API as directly as possible, provide some abstractions, or deliberately nerf it?
-
-   "static":
-   - Object.create
-   - Object.defineProperty
-   - Object.defineProperties
-   - Object.entries - experimental
-   - Object.getOwnPropertyDescriptor
-   - Object.getOwnPropertyDescriptors
-   - Object.getOwnPropertyNames
-   - Object.getOwnPropertySymbols
-   - Object.getPrototypeOf
-   - Object.isExtensible
-   - Object.isFrozen
-   - Object.isSealed
-   - Object.preventExtension
-   - Object.seal
-   - Object.setPrototypeOf
-   - Object.values - experimental
-
-   bs.send:
-   - hasOwnProperty
-   - isPrototypeOf
-   - propertyIsEnumerable
-   - toLocaleString
-   - toString
-
-   Put directly on Js?
-   - Object.is
-*/
-
-/** `keys(obj)` returns an `array` of the keys of `obj`'s own enumerable properties. */
-@val
-external keys: {..} => array<string> = "Object.keys"
diff --git a/jscomp/others/js_option.res b/jscomp/others/js_option.res
deleted file mode 100644
index d18e815..0000000
--- a/jscomp/others/js_option.res
+++ /dev/null
@@ -1,232 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Provide utilities for handling `option`. */
-
-/**
-`Js.Option.t` is an alias for `option`
-*/
-type t<'a> = option<'a>
-
-/**
-Wraps the given value in `Some()`
-
-## Examples
-
-```rescript
-Js.Option.some(1066) == Some(1066)
-```
-*/
-let some = x => Some(x)
-
-/**
-Returns `true` if the argument is `Some(value)`; `false` if the argument is
-`None`.
-*/
-let isSome = x =>
-  switch x {
-  | None => false
-  | Some(_) => true
-  }
-
-/**
-The first argument to `isSomeValue` is an uncurried function `eq()` that
-takes two arguments and returns `true` if they are considered to be equal. It
-is used to compare a plain value `v1`(the second argument) with an `option`
-value. If the `option` value is `None`, `isSomeValue()` returns `false`; if
-the third argument is `Some(v2)`, `isSomeValue()` returns the result of
-calling `eq(v1, v2)`.
-
-## Examples
-
-```rescript
-let clockEqual = (. a, b) => mod(a, 12) == mod(b, 12)
-Js.Option.isSomeValue(clockEqual, 3, Some(15)) == true
-Js.Option.isSomeValue(clockEqual, 3, Some(4)) == false
-Js.Option.isSomeValue(clockEqual, 3, None) == false
-```
-*/
-let isSomeValue = (eq, v, x) =>
-  switch x {
-  | None => false
-  | Some(x) => eq(. v, x)
-  }
-
-/** Returns `true` if the argument is `None`; `false` otherwise. */
-let isNone = x =>
-  switch x {
-  | None => true
-  | Some(_) => false
-  }
-
-/**
-If the argument to `getExn()` is of the form `Some(value)`, returns `value`.
-If given `None`, it throws a `getExn` exception.
-*/
-let getExn = x =>
-  switch x {
-  | None => Js_exn.raiseError("getExn")
-  | Some(x) => x
-  }
-
-/**
-The first argument to `equal` is an uncurried function `eq()` that takes two
-arguments and returns `true` if they are considered to be equal. The second
-and third arguments are `option` values.
-
-If the second and third arguments are of the form:
-
-* `Some(v1)` and `Some(v2)`: returns `eq(v1, v2)`
-* `Some(v1)` and `None`: returns `false`
-* `None` and `Some(v2)`: returns `false`
-* `None` and `None`: returns `true`
-
-## Examples
-
-```rescript
-let clockEqual = (. a, b) => mod(a, 12) == mod(b, 12)
-Js.Option.equal(clockEqual, Some(3), Some(15)) == true
-Js.Option.equal(clockEqual, Some(3), Some(16)) == false
-Js.Option.equal(clockEqual, Some(3), None) == false
-Js.Option.equal(clockEqual, None, Some(15)) == false
-Js.Option.equal(clockEqual, None, None) == true
-```
-*/
-let equal = (eq, a, b) =>
-  switch a {
-  | None => b == None
-  | Some(x) =>
-    switch b {
-    | None => false
-    | Some(y) => eq(. x, y)
-    }
-  }
-
-/**
-The first argument to `andThen()` is an uncurried function `f()` that takes a
-plain value and returns an `option` result. The second argument is an
-`option` value. If the second argument is `None`, the return value is `None`.
-If the second argument is `Some(v)`, the return value is `f(v)`.
-
-## Examples
-
-```rescript
-let reciprocal = (. x) => x == 0 ? None : Some(1.0 /. Belt.Int.toFloat(x))
-Js.Option.andThen(reciprocal, Some(5)) == Some(0.2)
-Js.Option.andThen(reciprocal, Some(0)) == None
-Js.Option.andThen(reciprocal, None) == None
-```
-*/
-let andThen = (f, x) =>
-  switch x {
-  | None => None
-  | Some(x) => f(. x)
-  }
-
-/**
-The first argument to `map()` is an uncurried function `f()` that takes a
-plain value and returns a plain result. The second argument is an `option`
-value. If it is of the form `Some(v)`, `map()` returns `Some(f(v))`; if it is
-`None`, the return value is `None`, and function `f()` is not called.
-
-## Examples
-
-```rescript
-let square = (. x) => x * x
-Js.Option.map(square, Some(3)) == Some(9)
-Js.Option.map(square, None) == None
-```
-*/
-let map = (f, x) =>
-  switch x {
-  | None => None
-  | Some(x) => Some(f(. x))
-  }
-
-/**
-The first argument to `getWithDefault()` is a default value. If the second
-argument is of the form `Some(v)`, `getWithDefault()` returns `v`; if the
-second argument is `None`, the return value is the default value.
-
-## Examples
-
-```rescript
-Js.Option.getWithDefault(1066, Some(15)) == 15
-Js.Option.getWithDefault(1066, None) == 1066
-```
-*/
-let getWithDefault = (a, x) =>
-  switch x {
-  | None => a
-  | Some(x) => x
-  }
-
-/** **See:** [getWithDefault](#getWithDefault) */
-let default = getWithDefault
-
-/**
-The first argument to `filter()` is an uncurried function that takes a plain
-value and returns a boolean. The second argument is an `option` value.
-
-If the second argument is of the form `Some(v)` and `f(v)` is `true`,
-the return value is `Some(v)`. Otherwise, the return value is `None`.
-
-## Examples
-
-```rescript
-let isEven = (. x) => mod(x, 2) == 0
-Js.Option.filter(isEven, Some(2)) == Some(2)
-Js.Option.filter(isEven, Some(3)) == None
-Js.Option.filter(isEven, None) == None
-```
-*/
-let filter = (f, x) =>
-  switch x {
-  | None => None
-  | Some(x) =>
-    if f(. x) {
-      Some(x)
-    } else {
-      None
-    }
-  }
-
-/**
-The `firstSome()` function takes two `option` values; if the first is of the form `Some(v1)`, that is the return value. Otherwise, `firstSome()` returns the second value.
-
-## Examples
-
-```rescript
-Js.Option.firstSome(Some("one"), Some("two")) == Some("one")
-Js.Option.firstSome(Some("one"), None) == Some("one")
-Js.Option.firstSome(None, Some("two")) == Some("two")
-Js.Option.firstSome(None, None) == None
-```
-*/
-let firstSome = (a, b) =>
-  switch (a, b) {
-  | (Some(_), _) => a
-  | (None, Some(_)) => b
-  | (None, None) => None
-  }
diff --git a/jscomp/others/js_option.resi b/jscomp/others/js_option.resi
deleted file mode 100644
index dca50e3..0000000
--- a/jscomp/others/js_option.resi
+++ /dev/null
@@ -1,50 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t<'a> = option<'a>
-
-let some: 'a => option<'a>
-
-let isSome: option<'a> => bool
-
-let isSomeValue: ((. 'a, 'a) => bool, 'a, option<'a>) => bool
-
-let isNone: option<'a> => bool
-
-let getExn: option<'a> => 'a
-
-let equal: ((. 'a, 'b) => bool, option<'a>, option<'b>) => bool
-
-let andThen: ((. 'a) => option<'b>, option<'a>) => option<'b>
-
-let map: ((. 'a) => 'b, option<'a>) => option<'b>
-
-let getWithDefault: ('a, option<'a>) => 'a
-
-@deprecated("Use `getWithDefault` instead since default has special meaning in ES module")
-let default: ('a, option<'a>) => 'a
-
-let filter: ((. 'a) => bool, option<'a>) => option<'a>
-
-let firstSome: (option<'a>, option<'a>) => option<'a>
diff --git a/jscomp/others/js_promise.res b/jscomp/others/js_promise.res
deleted file mode 100644
index 7268e1e..0000000
--- a/jscomp/others/js_promise.res
+++ /dev/null
@@ -1,106 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Deprecation note: These bindings are pretty outdated and cannot be used properly
-with the `->` operator.
-
-More details on proper Promise usage can be found here:
-https://rescript-lang.org/docs/manual/latest/promise#promise-legacy
-*/
-
-@@warning("-103")
-
-type t<+'a> = promise<'a>
-type error = Js_promise2.error
-
-/*
-## Examples
-
-```rescript
-type error
-```
-*/
-
-@new
-external make: ((@uncurry ~resolve: (. 'a) => unit, ~reject: (. exn) => unit) => unit) => promise<
-  'a,
-> = "Promise"
-
-/* `make (fun resolve reject -> .. )` */
-@val @scope("Promise") external resolve: 'a => promise<'a> = "resolve"
-@val @scope("Promise") external reject: exn => promise<'a> = "reject"
-
-@val @scope("Promise") external all: array<promise<'a>> => promise<array<'a>> = "all"
-
-@val @scope("Promise") external all2: ((promise<'a0>, promise<'a1>)) => promise<('a0, 'a1)> = "all"
-
-@val @scope("Promise")
-external all3: ((promise<'a0>, promise<'a1>, promise<'a2>)) => promise<('a0, 'a1, 'a2)> = "all"
-
-@val @scope("Promise")
-external all4: ((promise<'a0>, promise<'a1>, promise<'a2>, promise<'a3>)) => promise<(
-  'a0,
-  'a1,
-  'a2,
-  'a3,
-)> = "all"
-
-@val @scope("Promise")
-external all5: ((promise<'a0>, promise<'a1>, promise<'a2>, promise<'a3>, promise<'a4>)) => promise<(
-  'a0,
-  'a1,
-  'a2,
-  'a3,
-  'a4,
-)> = "all"
-
-@val @scope("Promise")
-external all6: (
-  (promise<'a0>, promise<'a1>, promise<'a2>, promise<'a3>, promise<'a4>, promise<'a5>)
-) => promise<('a0, 'a1, 'a2, 'a3, 'a4, 'a5)> = "all"
-
-@val @scope("Promise") external race: array<promise<'a>> => promise<'a> = "race"
-
-@bs.send.pipe(: promise<'a>) external then_: (@uncurry ('a => promise<'b>)) => promise<'b> = "then"
-
-@bs.send.pipe(: promise<'a>)
-external catch: (@uncurry (error => promise<'a>)) => promise<'a> = "catch"
-/* ` p|> catch handler`
-    Note in JS the returned promise type is actually runtime dependent,
-    if promise is rejected, it will pick the `handler` otherwise the original promise,
-    to make it strict we enforce reject handler
-    https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/catch
-*/
-
-external unsafe_async: 'a => promise<'a> = "%identity"
-external unsafe_await: promise<'a> => 'a = "?await"
-
-/*
-let errorAsExn (x :  error) (e  : (exn ->'a option))=
-  if Caml_exceptions.isCamlExceptionOrOpenVariant (Obj.magic x ) then
-     e (Obj.magic x)
-  else None
-[%bs.error?  ]
-*/
diff --git a/jscomp/others/js_promise2.res b/jscomp/others/js_promise2.res
deleted file mode 100644
index 4fa6778..0000000
--- a/jscomp/others/js_promise2.res
+++ /dev/null
@@ -1,58 +0,0 @@
-type t<+'a> = promise<'a>
-type error
-
-/** Type-safe t-first then */
-let then: (promise<'a>, 'a => promise<'b>) => promise<'b> = %raw(`
-  function(p, cont) {
-    return Promise.resolve(p).then(cont)
-  }
-  `)
-
-/** Type-safe t-first catch */
-let catch: (promise<'a>, error => promise<'a>) => promise<'a> = %raw(`
-    function(p, cont) {
-      return Promise.resolve(p).catch(cont)
-    }
-    `)
-
-@new
-external make: ((@uncurry ~resolve: (. 'a) => unit, ~reject: (. exn) => unit) => unit) => promise<
-  'a,
-> = "Promise"
-
-@val @scope("Promise") external resolve: 'a => promise<'a> = "resolve"
-@val @scope("Promise") external reject: exn => promise<'a> = "reject"
-
-@val @scope("Promise") external all: array<promise<'a>> => promise<array<'a>> = "all"
-
-@val @scope("Promise") external all2: ((promise<'a0>, promise<'a1>)) => promise<('a0, 'a1)> = "all"
-
-@val @scope("Promise")
-external all3: ((promise<'a0>, promise<'a1>, promise<'a2>)) => promise<('a0, 'a1, 'a2)> = "all"
-
-@val @scope("Promise")
-external all4: ((promise<'a0>, promise<'a1>, promise<'a2>, promise<'a3>)) => promise<(
-  'a0,
-  'a1,
-  'a2,
-  'a3,
-)> = "all"
-
-@val @scope("Promise")
-external all5: ((promise<'a0>, promise<'a1>, promise<'a2>, promise<'a3>, promise<'a4>)) => promise<(
-  'a0,
-  'a1,
-  'a2,
-  'a3,
-  'a4,
-)> = "all"
-
-@val @scope("Promise")
-external all6: (
-  (promise<'a0>, promise<'a1>, promise<'a2>, promise<'a3>, promise<'a4>, promise<'a5>)
-) => promise<('a0, 'a1, 'a2, 'a3, 'a4, 'a5)> = "all"
-
-@val @scope("Promise") external race: array<promise<'a>> => promise<'a> = "race"
-
-external unsafe_async: 'a => promise<'a> = "%identity"
-external unsafe_await: promise<'a> => 'a = "?await"
diff --git a/jscomp/others/js_re.res b/jscomp/others/js_re.res
deleted file mode 100644
index 5ba7b60..0000000
--- a/jscomp/others/js_re.res
+++ /dev/null
@@ -1,201 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-Provide bindings to JS regular expressions (RegExp).
-
-**Note:** This is not an immutable API. A RegExp object with the `global` ("g")
-flag set will modify the [`lastIndex`]() property when the RegExp object is used,
-and subsequent uses will continue the search from the previous [`lastIndex`]().
-*/
-
-/** The RegExp object. */
-type t
-
-/** The result of a executing a RegExp on a string. */
-type result
-
-/**
-An `array` of the match and captures, the first is the full match and the
-remaining are the substring captures.
-*/
-external captures: result => array<Js.nullable<string>> = "%identity"
-
-@deprecated("Use Js.Re.captures instead")
-external matches: result => array<string> = "%identity"
-
-/** 0-based index of the match in the input string. */
-@get
-external index: result => int = "index"
-
-/** The original input string. */
-@get
-external input: result => string = "input"
-
-/**
-Constructs a RegExp object (Js.Re.t) from a `string`.
-Regex literals `%re("/.../")` should generally be preferred, but `fromString`
-is useful when you need to dynamically construct a regex using strings,
-exactly like when you do so in JavaScript.
-
-## Examples
-
-```rescript
-let firstReScriptFileExtension = (filename, content) => {
-  let result = Js.Re.fromString(filename ++ "\.(res|resi)")->Js.Re.exec_(content)
-  switch result {
-  | Some(r) => Js.Nullable.toOption(Js.Re.captures(r)[1])
-  | None => None
-  }
-}
-
-// outputs "res"
-firstReScriptFileExtension("School", "School.res School.resi Main.js School.bs.js")
-```
-*/
-@new
-external fromString: string => t = "RegExp"
-
-/**
-Constructs a RegExp object (`Js.Re.t`) from a string with the given flags.
-See `Js.Re.fromString`.
-
-Valid flags:
-
-- **g** global
-- **i** ignore case
-- **m** multiline
-- **u** unicode (es2015)
-- **y** sticky (es2015)
-*/
-@new
-external fromStringWithFlags: (string, ~flags: string) => t = "RegExp"
-
-/** Returns the enabled flags as a string. */
-@get
-external flags: t => string = "flags"
-
-/** Returns a `bool` indicating whether the global flag is set. */
-@get
-external global: t => bool = "global"
-
-/** Returns a `bool` indicating whether the ignoreCase flag is set. */
-@get
-external ignoreCase: t => bool = "ignoreCase"
-
-/**
-Returns the index where the next match will start its search. This property
-will be modified when the RegExp object is used, if the global ("g") flag is
-set.
-
-## Examples
-
-```rescript
-let re = %re("/ab*TODO/g")
-let str = "abbcdefabh"
-
-let break = ref(false)
-while !break.contents {
-  switch Js.Re.exec_(re, str) {
-  | Some(result) => Js.Nullable.iter(Js.Re.captures(result)[0], (. match_) => {
-      let next = Belt.Int.toString(Js.Re.lastIndex(re))
-      Js.log("Found " ++ (match_ ++ (". Next match starts at " ++ next)))
-    })
-  | None => break := true
-  }
-}
-```
-
-See
-[`RegExp: lastIndex`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/lastIndex)
-on MDN.
-*/
-@get
-external lastIndex: t => int = "lastIndex"
-
-/** Sets the index at which the next match will start its search from. */
-@set
-external setLastIndex: (t, int) => unit = "lastIndex"
-
-/** Returns a `bool` indicating whether the multiline flag is set. */
-@get
-external multiline: t => bool = "multiline"
-
-/** Returns the pattern as a `string`. */
-@get
-external source: t => string = "source"
-
-/** Returns a `bool` indicating whether the sticky flag is set. */
-@get
-external sticky: t => bool = "sticky"
-
-/** Returns a `bool` indicating whether the unicode flag is set. */
-@get
-external unicode: t => bool = "unicode"
-
-/**
-Executes a search on a given string using the given RegExp object.
-Returns `Some(Js.Re.result)` if a match is found, `None` otherwise.
-
-## Examples
-
-```rescript
-/* Match "quick brown" followed by "jumps", ignoring characters in between
- * Remember "brown" and "jumps"
-  * Ignore case
-  */
-
-let re = %re("/quick\s(brown).+?(jumps)/ig")
-let result = Js.Re.exec_(re, "The Quick Brown Fox Jumps Over The Lazy Dog")
-```
-
-See [`RegExp.prototype.exec()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/exec)
-on MDN.
-*/
-@send
-@return(null_to_opt)
-external exec_: (t, string) => option<result> = "exec"
-
-/**
-Tests whether the given RegExp object will match a given `string`.
-Returns true if a match is found, false otherwise.
-
-## Examples
-
-```rescript
-/* A simple implementation of Js.String.startsWith */
-
-let str = "hello world!"
-
-let startsWith = (target, substring) =>
-  Js.Re.fromString("^" ++ substring)->Js.Re.test_(target)
-
-Js.log(str->startsWith("hello")) /* prints "true" */
-```
-
-See [`RegExp.prototype.test()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/RegExp/test)
-on MDN.
-*/
-@send
-external test_: (t, string) => bool = "test"
diff --git a/jscomp/others/js_result.res b/jscomp/others/js_result.res
deleted file mode 100644
index 8cb2ab1..0000000
--- a/jscomp/others/js_result.res
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@deprecated("Please use `Belt.Result.t` instead")
-type t<+'good, +'bad> =
-  | Ok('good)
-  | Error('bad)
diff --git a/jscomp/others/js_result.resi b/jscomp/others/js_result.resi
deleted file mode 100644
index 8cb2ab1..0000000
--- a/jscomp/others/js_result.resi
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@deprecated("Please use `Belt.Result.t` instead")
-type t<+'good, +'bad> =
-  | Ok('good)
-  | Error('bad)
diff --git a/jscomp/others/js_set.res b/jscomp/others/js_set.res
deleted file mode 100644
index 8e0d51d..0000000
--- a/jscomp/others/js_set.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/*** ES6 Set API */
-
-type t<'a>
diff --git a/jscomp/others/js_string.res b/jscomp/others/js_string.res
deleted file mode 100644
index 811d1b2..0000000
--- a/jscomp/others/js_string.res
+++ /dev/null
@@ -1,1006 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** JavaScript String API */
-
-@@warning("-103")
-
-type t = string
-
-@val
-/**
-`make(value)` converts the given value to a `string`.
-
-## Examples
-
-```rescript
-Js.String2.make(3.5) == "3.5"
-Js.String2.make([1, 2, 3]) == "1,2,3"
-```
-*/
-external make: 'a => t = "String"
-
-@val
-/**
-`fromCharCode(n)` creates a `string` containing the character corresponding to that number; `n` ranges from 0 to 65535.
-If out of range, the lower 16 bits of the value are used. Thus, `fromCharCode(0x1F63A)` gives the same result as `fromCharCode(0xF63A)`. See [`String.fromCharCode`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCharCode) on MDN.
-
-## Examples
-
-```rescript
-Js.String2.fromCharCode(65) == "A"
-Js.String2.fromCharCode(0x3c8) == `ψ`
-Js.String2.fromCharCode(0xd55c) == `한`
-Js.String2.fromCharCode(-64568) == `ψ`
-```
-*/
-external fromCharCode: int => t = "String.fromCharCode"
-
-@val
-@variadic
-/**
-`fromCharCodeMany([n1, n2, n3])` creates a `string` from the characters
-corresponding to the given numbers, using the same rules as `fromCharCode`. See
-[`String.fromCharCode`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCharCode)
-on MDN.
-*/
-external fromCharCodeMany: array<int> => t = "String.fromCharCode"
-
-@val
-/**
-`fromCodePoint(n)` creates a `string` containing the character corresponding to
-that numeric code point. If the number is not a valid code point, it raises
-`RangeError`.Thus, `fromCodePoint(0x1F63A)` will produce a correct value,
-unlike `fromCharCode(0x1F63A)`, and `fromCodePoint(-5)` will raise a
-`RangeError`.
-
-See [`String.fromCodePoint`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCodePoint)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.fromCodePoint(65) == "A"
-Js.String2.fromCodePoint(0x3c8) == `ψ`
-Js.String2.fromCodePoint(0xd55c) == `한`
-Js.String2.fromCodePoint(0x1f63a) == `😺`
-```
-*/
-external fromCodePoint: int => t = "String.fromCodePoint"
-
-@val
-@variadic
-/**
-`fromCodePointMany([n1, n2, n3])` creates a `string` from the characters
-corresponding to the given code point numbers, using the same rules as
-`fromCodePoint`.
-
-See [`String.fromCodePoint`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCodePoint)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.fromCodePointMany([0xd55c, 0xae00, 0x1f63a]) == `한글😺`
-```
-*/
-external fromCodePointMany: array<int> => t = "String.fromCodePoint"
-
-/* String.raw: ES2015, meant to be used with template strings, not directly */
-
-@get
-/**
-`length(s)` returns the length of the given `string`. See
-[`String.length`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/length)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.length("abcd") == 4
-```
-*/
-external length: t => int = "length"
-
-@get_index
-/**
-`get(s, n)` returns as a `string` the character at the given index number. If
-`n` is out of range, this function returns `undefined`, so at some point this
-function may be modified to return `option<string>`.
-
-## Examples
-
-```rescript
-Js.String2.get("Reason", 0) == "R"
-Js.String2.get("Reason", 4) == "o"
-Js.String2.get(`Rẽasöń`, 5) == `ń`
-```
-*/
-external get: (t, int) => t = ""
-
-@bs.send.pipe(: t)
-/**
-`charAt(n, s)` gets the character at index `n` within string `s`. If `n` is
-negative or greater than the length of `s`, it returns the empty string. If the
-string contains characters outside the range \u0000-\uffff, it will return the
-first 16-bit value at that position in the string.
-
-See [`String.charAt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/charAt)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.charAt(0, "Reason") == "R"
-Js.String.charAt(12, "Reason") == ""
-Js.String.charAt(5, `Rẽasöń`) == `ń`
-```
-*/
-external charAt: int => t = "charAt"
-
-@bs.send.pipe(: t)
-/**
-`charCodeAt(n, s)` returns the character code at position `n` in string `s`;
-the result is in the range 0-65535, unlke `codePointAt`, so it will not work
-correctly for characters with code points greater than or equal to 0x10000. The
-return type is `float` because this function returns NaN if `n` is less than
-zero or greater than the length of the string.
-
-See [`String.charCodeAt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/charCodeAt)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.charCodeAt(0, `😺`) == 0xd83d->Belt.Int.toFloat
-Js.String.codePointAt(0, `😺`) == Some(0x1f63a)
-```
-*/
-external charCodeAt: int => float = "charCodeAt"
-
-@bs.send.pipe(: t)
-/**
-`codePointAt(n, s)` returns the code point at position `n` within string `s` as
-a `Some(value)`. The return value handles code points greater than or equal to
-0x10000. If there is no code point at the given position, the function returns
-`None`.
-
-See [`String.codePointAt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/codePointAt)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.codePointAt(1, `¿😺?`) == Some(0x1f63a)
-Js.String.codePointAt(5, "abc") == None
-```
-*/
-external codePointAt: int => option<int> = "codePointAt"
-
-@bs.send.pipe(: t)
-/**
-`concat(append, original)` returns a new `string` with `append` added after
-`original`.
-
-See [`String.concat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/concat)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.concat("bell", "cow") == "cowbell"
-```
-*/
-external concat: t => t = "concat"
-
-@bs.send.pipe(: t)
-@variadic
-/**
-`concat(arr, original)` returns a new `string` consisting of each item of an
-array of strings added to the `original` string.
-
-See [`String.concat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/concat)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.concatMany(["2nd", "3rd", "4th"], "1st") == "1st2nd3rd4th"
-```
-*/
-external concatMany: array<t> => t = "concat"
-
-@bs.send.pipe(: t)
-/**
-ES2015: `endsWith(substr, str)` returns `true` if the `str` ends with `substr`,
-`false` otherwise.
-
-See [`String.endsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.endsWith("Script", "ReScript") == true
-Js.String.endsWith("Script", "C++") == false
-```
-*/
-external endsWith: t => bool = "endsWith"
-
-@bs.send.pipe(: t)
-/**
-`endsWithFrom(ending, len, str)` returns `true` if the first len characters of
-`str` end with `ending`, `false` otherwise. If `len` is greater than or equal
-to the length of `str`, then it works like `endsWith`. (Honestly, this should
-have been named endsWithAt, but oh well.)
-
-See [`String.endsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.endsWithFrom("cd", 4, "abcd") == true
-Js.String.endsWithFrom("cd", 3, "abcde") == false
-Js.String.endsWithFrom("cde", 99, "abcde") == true
-Js.String.endsWithFrom("ple", 7, "example.dat") == true
-```
-*/
-external endsWithFrom: (t, int) => bool = "endsWith"
-
-@bs.send.pipe(: t)
-/**
-ES2015: `includes(searchValue, str)` returns `true` if `searchValue` is found
-anywhere within `str`, false otherwise.
-
-See [`String.includes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/includes)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.includes("gram", "programmer") == true
-Js.String.includes("er", "programmer") == true
-Js.String.includes("pro", "programmer") == true
-Js.String.includes("xyz", "programmer.dat") == false
-```
-*/
-external includes: t => bool = "includes"
-
-@bs.send.pipe(: t)
-/**
-ES2015: `includes(searchValue start, str)` returns `true` if `searchValue` is
-found anywhere within `str` starting at character number `start` (where 0 is
-the first character), `false` otherwise.
-
-See [`String.includes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/includes)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.includesFrom("gram", 1, "programmer") == true
-Js.String.includesFrom("gram", 4, "programmer") == false
-Js.String.includesFrom(`한`, 1, `대한민국`) == true
-```
-*/
-external includesFrom: (t, int) => bool = "includes"
-
-@bs.send.pipe(: t)
-/**
-ES2015: `indexOf(searchValue, str)` returns the position at which `searchValue`
-was first found within `str`, or -1 if `searchValue` is not in `str`.
-
-See [`String.indexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.indexOf("ok", "bookseller") == 2
-Js.String.indexOf("sell", "bookseller") == 4
-Js.String.indexOf("ee", "beekeeper") == 1
-Js.String.indexOf("xyz", "bookseller") == -1
-```
-*/
-external indexOf: t => int = "indexOf"
-
-@bs.send.pipe(: t)
-/**
-`indexOfFrom(searchValue, start, str)` returns the position at which
-`searchValue` was found within `str` starting at character position `start`, or
--1 if `searchValue` is not found in that portion of `str`. The return value is
-relative to the beginning of the string, no matter where the search started
-from.
-
-See [`String.indexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.indexOfFrom("ok", 1, "bookseller") == 2
-Js.String.indexOfFrom("sell", 2, "bookseller") == 4
-Js.String.indexOfFrom("sell", 5, "bookseller") == -1
-```
-*/
-external indexOfFrom: (t, int) => int = "indexOf"
-
-@bs.send.pipe(: t)
-/**
-`lastIndexOf(searchValue, str)` returns the position of the last occurrence of
-`searchValue` within `str`, searching backwards from the end of the string.
-Returns -1 if `searchValue` is not in `str`. The return value is always
-relative to the beginning of the string.
-
-See [`String.lastIndexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/lastIndexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.lastIndexOf("ok", "bookseller") == 2
-Js.String.lastIndexOf("ee", "beekeeper") == 4
-Js.String.lastIndexOf("xyz", "abcdefg") == -1
-```
-*/
-external lastIndexOf: t => int = "lastIndexOf"
-
-@bs.send.pipe(: t)
-/**
-`lastIndexOfFrom(searchValue, start, str)` returns the position of the last
-occurrence of `searchValue` within `str`, searching backwards from the given
-start position. Returns -1 if `searchValue` is not in `str`. The return value
-is always relative to the beginning of the string.
-
-See [`String.lastIndexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/lastIndexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.lastIndexOfFrom("ok", 6, "bookseller") == 2
-Js.String.lastIndexOfFrom("ee", 8, "beekeeper") == 4
-Js.String.lastIndexOfFrom("ee", 3, "beekeeper") == 1
-Js.String.lastIndexOfFrom("xyz", 4, "abcdefg") == -1
-```
-*/
-external lastIndexOfFrom: (t, int) => int = "lastIndexOf"
-
-/* extended by ECMA-402 */
-
-@bs.send.pipe(: t)
-/**
-`localeCompare(comparison, reference)` returns
-- a negative value if reference comes before comparison in sort order
-- zero if reference and comparison have the same sort order
-- a positive value if reference comes after comparison in sort order
-
-See [`String.localeCompare`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare) on MDN.
-
-## Examples
-
-```rescript
-Js.String.localeCompare("ant", "zebra") > 0.0
-Js.String.localeCompare("zebra", "ant") < 0.0
-Js.String.localeCompare("cat", "cat") == 0.0
-Js.String.localeCompare("cat", "CAT") > 0.0
-```
-*/
-external localeCompare: t => float = "localeCompare"
-
-@bs.send.pipe(: t)
-@return({null_to_opt: null_to_opt})
-/**
-`match(regexp, str)` matches a `string` against the given `regexp`. If there is
-no match, it returns `None`. For regular expressions without the g modifier, if
-  there is a match, the return value is `Some(array)` where the array contains:
-- The entire matched string
-- Any capture groups if the regexp had parentheses
-
-For regular expressions with the g modifier, a matched expression returns
-`Some(array)` with all the matched substrings and no capture groups.
-
-See [`String.match`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/match)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.match_(%re("/b[aeiou]t/"), "The better bats") == Some(["bet"])
-Js.String.match_(%re("/b[aeiou]t/g"), "The better bats") == Some(["bet", "bat"])
-Js.String.match_(%re("/(\d+)-(\d+)-(\d+)/"), "Today is 2018-04-05.") ==
-  Some(["2018-04-05", "2018", "04", "05"])
-Js.String.match_(%re("/b[aeiou]g/"), "The large container.") == None
-```
-*/
-external match_: Js_re.t => option<array<option<t>>> = "match"
-
-@bs.send.pipe(: t)
-/**
-`normalize(str)` returns the normalized Unicode string using Normalization Form
-Canonical (NFC) Composition. Consider the character ã, which can be represented
-as the single codepoint \u00e3 or the combination of a lower case letter A
-\u0061 and a combining tilde \u0303. Normalization ensures that both can be
-stored in an equivalent binary representation.
-
-See [`String.normalize`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize)
-on MDN.
-
-See also [Unicode technical report #15](https://unicode.org/reports/tr15/) for
-details.
-*/
-external normalize: t = "normalize"
-
-@bs.send.pipe(: t)
-/**
-ES2015: `normalize(form, str)` returns the normalized Unicode string using the specified form of normalization, which may be one of:
-- "NFC" — Normalization Form Canonical Composition.
-- "NFD" — Normalization Form Canonical Decomposition.
-- "NFKC" — Normalization Form Compatibility Composition.
-- "NFKD" — Normalization Form Compatibility Decomposition.
-
-See [`String.normalize`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize) on MDN.
-
-See also [Unicode technical report #15](https://unicode.org/reports/tr15/) for details.
-*/
-external normalizeByForm: t => t = "normalize"
-
-@bs.send.pipe(: t)
-/**
-`repeat(n, str)` returns a `string` that consists of `n` repetitions of `str`.
-Raises `RangeError` if `n` is negative.
-
-See [`String.repeat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.repeat(3, "ha") == "hahaha"
-Js.String.repeat(0, "empty") == ""
-```
-*/
-external repeat: int => t = "repeat"
-
-@bs.send.pipe(: t)
-/**
-ES2015: `replace(substr, newSubstr, str)` returns a new `string` which is
-identical to `str` except with the first matching instance of `substr` replaced
-by `newSubstr`. `substr` is treated as a verbatim string to match, not a
-regular expression.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.replace("old", "new", "old string") == "new string"
-Js.String.replace("the", "this", "the cat and the dog") == "this cat and the dog"
-```
-*/
-external replace: (t, t) => t = "replace"
-
-@bs.send.pipe(: t)
-/**
-`replaceByRe(regex, replacement, str)` returns a new `string` where occurrences
-matching regex have been replaced by `replacement`.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.replaceByRe(%re("/[aeiou]/g"), "x", "vowels be gone") == "vxwxls bx gxnx"
-Js.String.replaceByRe(%re("/(\w+) (\w+)/"), "$2, $1", "Juan Fulano") == "Fulano, Juan"
-```
-*/
-external replaceByRe: (Js_re.t, t) => t = "replace"
-
-@bs.send.pipe(: t)
-/**
-Returns a new `string` with some or all matches of a pattern with no capturing
-parentheses replaced by the value returned from the given function. The
-function receives as its parameters the matched string, the offset at which the
-match begins, and the whole string being matched.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-
-## Examples
-
-```rescript
-let str = "beautiful vowels"
-let re = %re("/[aeiou]/g")
-let matchFn = (matchPart, _offset, _wholeString) => Js.String.toUpperCase(matchPart)
-
-Js.String.unsafeReplaceBy0(re, matchFn, str) == "bEAUtIfUl vOwEls"
-```
-*/
-external unsafeReplaceBy0: (Js_re.t, @uncurry (t, int, t) => t) => t = "replace"
-
-@bs.send.pipe(: t)
-/**
-Returns a new `string` with some or all matches of a pattern with one set of
-capturing parentheses replaced by the value returned from the given function.
-The function receives as its parameters the matched string, the captured
-string, the offset at which the match begins, and the whole string being
-matched.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-
-## Examples
-
-```rescript
-let str = "Jony is 40"
-let re = %re("/(Jony is )\d+/g")
-let matchFn = (_match, part1, _offset, _wholeString) => {
-  part1 ++ "41"
-}
-
-Js.String.unsafeReplaceBy1(re, matchFn, str) == "Jony is 41"
-```
-*/
-external unsafeReplaceBy1: (Js_re.t, @uncurry (t, t, int, t) => t) => t = "replace"
-
-@bs.send.pipe(: t)
-/**
-Returns a new `string` with some or all matches of a pattern with two sets of
-capturing parentheses replaced by the value returned from the given function.
-The function receives as its parameters the matched string, the captured
-strings, the offset at which the match begins, and the whole string being
-matched.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-
-## Examples
-
-```rescript
-let str = "7 times 6"
-let re = %re("/(\d+) times (\d+)/")
-let matchFn = (_match, p1, p2, _offset, _wholeString) => {
-  switch (Belt.Int.fromString(p1), Belt.Int.fromString(p2)) {
-  | (Some(x), Some(y)) => Belt.Int.toString(x * y)
-  | _ => "???"
-  }
-}
-
-Js.String.unsafeReplaceBy2(re, matchFn, str) == "42"
-```
-*/
-external unsafeReplaceBy2: (Js_re.t, @uncurry (t, t, t, int, t) => t) => t = "replace"
-
-@bs.send.pipe(: t)
-/**
-Returns a new `string` with some or all matches of a pattern with three sets of
-capturing parentheses replaced by the value returned from the given function.
-The function receives as its parameters the matched string, the captured
-strings, the offset at which the match begins, and the whole string being
-matched.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-*/
-external unsafeReplaceBy3: (Js_re.t, @uncurry (t, t, t, t, int, t) => t) => t = "replace"
-
-@bs.send.pipe(: t)
-/**
-`search(regexp, str)` returns the starting position of the first match of
-`regexp` in the given `str`, or -1 if there is no match.
-
-See [`String.search`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/search)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.search(%re("/\d+/"), "testing 1 2 3") == 8
-Js.String.search(%re("/\d+/"), "no numbers") == -1
-```
-*/
-external search: Js_re.t => int = "search"
-
-@bs.send.pipe(: t)
-/**
-`slice(from:n1, to_:n2, str)` returns the substring of `str` starting at
-character `n1` up to but not including `n2`.
-- If either `n1` or `n2` is negative, then it is evaluated as `length(str - n1)` or `length(str - n2)`.
-- If `n2` is greater than the length of `str`, then it is treated as `length(str)`.
-- If `n1` is greater than `n2`, slice returns the empty string.
-
-See [`String.slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/slice) on MDN.
-
-## Examples
-
-```rescript
-Js.String.slice(~from=2, ~to_=5, "abcdefg") == "cde"
-Js.String.slice(~from=2, ~to_=9, "abcdefg") == "cdefg"
-Js.String.slice(~from=-4, ~to_=-2, "abcdefg") == "de"
-Js.String.slice(~from=5, ~to_=1, "abcdefg") == ""
-```
-*/
-external slice: (~from: int, ~to_: int) => t = "slice"
-
-@bs.send.pipe(: t)
-/**
-`sliceToEnd(str, from:n)` returns the substring of `str` starting at character
-`n` to the end of the string.
-- If `n` is negative, then it is evaluated as `length(str - n)`.
-- If `n` is greater than the length of `str`, then sliceToEnd returns the empty string.
-
-See [`String.slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/slice) on MDN.
-
-## Examples
-
-```rescript
-Js.String.sliceToEnd(~from=4, "abcdefg") == "efg"
-Js.String.sliceToEnd(~from=-2, "abcdefg") == "fg"
-Js.String.sliceToEnd(~from=7, "abcdefg") == ""
-```
-*/
-external sliceToEnd: (~from: int) => t = "slice"
-
-@bs.send.pipe(: t)
-/**
-`split(delimiter, str)` splits the given `str` at every occurrence of
-`delimiter` and returns an array of the resulting substrings.
-
-See [`String.split`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.split("-", "2018-01-02") == ["2018", "01", "02"]
-Js.String.split(",", "a,b,,c") == ["a", "b", "", "c"]
-Js.String.split("::", "good::bad as great::awful") == ["good", "bad as great", "awful"]
-Js.String.split(";", "has-no-delimiter") == ["has-no-delimiter"]
-```
-*/
-external split: t => array<t> = "split"
-
-@bs.send.pipe(: t)
-/**
-`splitAtMost(delimiter, ~limit:n, str)` splits the given `str` at every
-occurrence of `delimiter` and returns an array of the first `n` resulting
-substrings. If `n` is negative or greater than the number of substrings, the
-array will contain all the substrings.
-
-See [`String.split`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.splitAtMost("/", ~limit=3, "ant/bee/cat/dog/elk") == ["ant", "bee", "cat"]
-Js.String.splitAtMost("/", ~limit=0, "ant/bee/cat/dog/elk") == []
-Js.String.splitAtMost("/", ~limit=9, "ant/bee/cat/dog/elk") == ["ant", "bee", "cat", "dog", "elk"]
-```
-*/
-external splitAtMost: (t, ~limit: int) => array<t> = "split"
-
-@bs.send.pipe(: t)
-@ocaml.doc("
-`splitByRe(regex, str)` splits the given `str` at every occurrence of `regex`
-and returns an array of the resulting substrings.
-
-See [`String.split`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.splitByRe(%re(\"/\s*[,;]\s*/\"), \"art; bed , cog ;dad\") == [
-    Some(\"art\"),
-    Some(\"bed\"),
-    Some(\"cog\"),
-    Some(\"dad\"),
-  ]
-```
-")
-external splitByRe: Js_re.t => array<option<t>> = "split"
-
-@bs.send.pipe(: t)
-@ocaml.doc("
-`splitByReAtMost(regex, ~limit:n, str)` splits the given `str` at every
-occurrence of `regex` and returns an array of the first `n` resulting
-substrings. If `n` is negative or greater than the number of substrings, the
-array will contain all the substrings.
-
-See [`String.split`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.splitByReAtMost(%re(\"/\s*:\s*/\"), ~limit=3, \"one: two: three: four\") == [
-    Some(\"one\"),
-    Some(\"two\"),
-    Some(\"three\"),
-  ]
-
-Js.String.splitByReAtMost(%re(\"/\s*:\s*/\"), ~limit=0, \"one: two: three: four\") == []
-
-Js.String.splitByReAtMost(%re(\"/\s*:\s*/\"), ~limit=8, \"one: two: three: four\") == [
-    Some(\"one\"),
-    Some(\"two\"),
-    Some(\"three\"),
-    Some(\"four\"),
-  ]
-```
-")
-external splitByReAtMost: (Js_re.t, ~limit: int) => array<option<t>> = "split"
-
-@bs.send.pipe(: t)
-/**
-ES2015: `startsWith(substr, str)` returns `true` if the `str` starts with
-`substr`, `false` otherwise.
-
-See [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.startsWith("Re", "ReScript") == true
-Js.String.startsWith("", "ReScript") == true
-Js.String.startsWith("Re", "JavaScript") == false
-```
-*/
-external startsWith: t => bool = "startsWith"
-
-@bs.send.pipe(: t)
-/**
-ES2015: `startsWithFrom(substr, n, str)` returns `true` if the `str` starts
-with `substr` starting at position `n`, false otherwise. If `n` is negative,
-the search starts at the beginning of `str`.
-
-See [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.startsWithFrom("Scri", 2, "ReScript") == true
-Js.String.startsWithFrom("", 2, "ReScript") == true
-Js.String.startsWithFrom("Scri", 2, "JavaScript") == false
-```
-*/
-external startsWithFrom: (t, int) => bool = "startsWith"
-
-@bs.send.pipe(: t)
-/**
-`substr(~from:n, str)` returns the substring of `str` from position `n` to the
-end of the string.
-- If `n` is less than zero, the starting position is the length of `str - n`.
-- If `n` is greater than or equal to the length of `str`, returns the empty string.
-
-JavaScript’s `String.substr()` is a legacy function. When possible, use
-`substring()` instead.
-
-See [`String.substr`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.substr(~from=3, "abcdefghij") == "defghij"
-Js.String.substr(~from=-3, "abcdefghij") == "hij"
-Js.String.substr(~from=12, "abcdefghij") == ""
-```
-*/
-external substr: (~from: int) => t = "substr"
-
-@bs.send.pipe(: t)
-/**
-`substrAtMost(~from: pos, ~length: n, str)` returns the substring of `str` of
-length `n` starting at position `pos`.
-- If `pos` is less than zero, the starting position is the length of `str - pos`.
-- If `pos` is greater than or equal to the length of `str`, returns the empty string.
-- If `n` is less than or equal to zero, returns the empty string.
-
-JavaScript’s `String.substr()` is a legacy function. When possible, use
-`substring()` instead.
-
-See [`String.substr`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.substrAtMost(~from=3, ~length=4, "abcdefghij") == "defg"
-Js.String.substrAtMost(~from=-3, ~length=4, "abcdefghij") == "hij"
-Js.String.substrAtMost(~from=12, ~length=2, "abcdefghij") == ""
-```
-*/
-external substrAtMost: (~from: int, ~length: int) => t = "substr"
-
-@bs.send.pipe(: t)
-/**
-`substring(~from: start, ~to_: finish, str)` returns characters `start` up to
-but not including finish from `str`.
-- If `start` is less than zero, it is treated as zero.
-- If `finish` is zero or negative, the empty string is returned.
-- If `start` is greater than `finish`, the `start` and `finish` points are swapped.
-
-See [`String.substring`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substring) on MDN.
-
-## Examples
-
-```rescript
-Js.String.substring(~from=3, ~to_=6, "playground") == "ygr"
-Js.String.substring(~from=6, ~to_=3, "playground") == "ygr"
-Js.String.substring(~from=4, ~to_=12, "playground") == "ground"
-```
-*/
-external substring: (~from: int, ~to_: int) => t = "substring"
-
-@bs.send.pipe(: t)
-/**
-`substringToEnd(~from: start, str)` returns the substring of `str` from
-position `start` to the end.
-- If `start` is less than or equal to zero, the entire string is returned.
-- If `start` is greater than or equal to the length of `str`, the empty string is returned.
-
-See [`String.substring`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substring) on MDN.
-
-## Examples
-
-```rescript
-Js.String.substringToEnd(~from=4, "playground") == "ground"
-Js.String.substringToEnd(~from=-3, "playground") == "playground"
-Js.String.substringToEnd(~from=12, "playground") == ""
-```
-*/
-external substringToEnd: (~from: int) => t = "substring"
-
-@bs.send.pipe(: t)
-/**
-`toLowerCase(str)` converts `str` to lower case using the locale-insensitive
-case mappings in the Unicode Character Database. Notice that the conversion can
-give different results depending upon context, for example with the Greek
-letter sigma, which has two different lower case forms; one when it is the last
-character in a string and another when it is not.
-
-See [`String.toLowerCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toLowerCase)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.toLowerCase("ABC") == "abc"
-Js.String.toLowerCase(`ΣΠ`) == `σπ`
-Js.String.toLowerCase(`ΠΣ`) == `πς`
-```
-*/
-external toLowerCase: t = "toLowerCase"
-
-@bs.send.pipe(: t)
-/**
-`toLocaleLowerCase(str)` converts `str` to lower case using the current locale.
-
-See [`String.toLocaleLowerCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toLocaleLowerCase)
-on MDN.
-*/
-external toLocaleLowerCase: t = "toLocaleLowerCase"
-
-@bs.send.pipe(: t)
-/**
-`toUpperCase(str)` converts `str` to upper case using the locale-insensitive
-case mappings in the Unicode Character Database. Notice that the conversion can
-expand the number of letters in the result; for example the German ß
-capitalizes to two Ses in a row.
-
-See [`String.toUpperCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.toUpperCase("abc") == "ABC"
-Js.String.toUpperCase(`Straße`) == `STRASSE`
-Js.String.toUpperCase(`πς`) == `ΠΣ`
-```
-*/
-external toUpperCase: t = "toUpperCase"
-
-@bs.send.pipe(: t)
-/**
-`toLocaleUpperCase(str)` converts `str` to upper case using the current locale.
-
-See [`String.to:LocaleUpperCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toLocaleUpperCase)
-on MDN.
-*/
-external toLocaleUpperCase: t = "toLocaleUpperCase"
-
-@bs.send.pipe(: t)
-/**
-`trim(str)` returns a string that is `str` with whitespace stripped from both
-ends. Internal whitespace is not removed.
-
-See [`String.trim`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/trim)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.trim("   abc def   ") == "abc def"
-Js.String.trim("\n\r\t abc def \n\n\t\r ") == "abc def"
-```
-*/
-external trim: t = "trim"
-
-/* HTML wrappers */
-
-@bs.send.pipe(: t)
-/**
-`anchor(anchorName, anchorText)` creates a string with an HTML `<a>` element
-with name attribute of `anchorName` and `anchorText` as its content. Please do
-not use this method, as it has been removed from the relevant web standards.
-
-See [`String.anchor`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/anchor)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.anchor("page1", "Page One") == "<a name="page1">Page One</a>"
-```
-*/
-external anchor: t => t = "anchor"
-
-@bs.send.pipe(: t)
-/**
-ES2015: `link(urlText, linkText)` creates a string with an HTML `<a>` element
-with href attribute of `urlText` and `linkText` as its content. Please do not
-use this method, as it has been removed from the relevant web standards.
-
-See [`String.link`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/link)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String.link("page2.html", "Go to page two") == "<a href="page2.html">Go to page two</a>"
-```
-*/
-external link: t => t = "link"
-
-/**
-Casts its argument to an `array_like` entity that can be processed by functions
-such as `Js.Array2.fromMap()`
-
-## Examples
-
-```rescript
-let s = "abcde"
-let arr = Js.Array2.fromMap(Js.String.castToArrayLike(s), x => x)
-arr == ["a", "b", "c", "d", "e"]
-```
-*/
-external castToArrayLike: t => Js_array2.array_like<t> = "%identity"
diff --git a/jscomp/others/js_string2.res b/jscomp/others/js_string2.res
deleted file mode 100644
index 998b60c..0000000
--- a/jscomp/others/js_string2.res
+++ /dev/null
@@ -1,1001 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Provide bindings to JS string. Optimized for pipe-first. */
-
-type t = string
-
-@val
-/**
-`make(value)` converts the given value to a `string`.
-
-## Examples
-
-```rescript
-Js.String2.make(3.5) == "3.5"
-Js.String2.make([1, 2, 3]) == "1,2,3"
-```
-*/
-external make: 'a => t = "String"
-
-@val
-/**
-`fromCharCode(n)` creates a `string` containing the character corresponding to
-that number; `n` ranges from 0 to 65535.If out of range, the lower 16 bits of
-the value are used. Thus, `fromCharCode(0x1F63A)` gives the same result as
-`fromCharCode(0xF63A)`.
-
-See [`String.fromCharCode`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCharCode)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.fromCharCode(65) == "A"
-Js.String2.fromCharCode(0x3c8) == `ψ`
-Js.String2.fromCharCode(0xd55c) == `한`
-Js.String2.fromCharCode(-64568) == `ψ`
-```
-*/
-external fromCharCode: int => t = "String.fromCharCode"
-
-@val
-@variadic
-/**
-`fromCharCodeMany([n1, n2, n3])` creates a `string` from the characters
-corresponding to the given numbers, using the same rules as `fromCharCode`.
-
-See [`String.fromCharCode`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCharCode)
-on MDN.
-*/
-external fromCharCodeMany: array<int> => t = "String.fromCharCode"
-
-@val
-/**
-`fromCodePoint(n)` creates a `string` containing the character corresponding to
-that numeric code point. If the number is not a valid code point, it raises
-`RangeError`. Thus, `fromCodePoint(0x1F63A)` will produce a correct value,
-unlike `fromCharCode(0x1F63A)`, and `fromCodePoint(-5)` will raise a
-`RangeError`.
-
-See [`String.fromCodePoint`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCodePoint)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.fromCodePoint(65) == "A"
-Js.String2.fromCodePoint(0x3c8) == `ψ`
-Js.String2.fromCodePoint(0xd55c) == `한`
-Js.String2.fromCodePoint(0x1f63a) == `😺`
-```
-*/
-external fromCodePoint: int => t = "String.fromCodePoint"
-
-@val
-@variadic
-/**
-`fromCodePointMany([n1, n2, n3])` creates a `string` from the characters
-corresponding to the given code point numbers, using the same rules as
-`fromCodePoint`.
-
-See [`String.fromCodePoint`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCodePoint)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.fromCodePointMany([0xd55c, 0xae00, 0x1f63a]) == `한글😺`
-```
-*/
-external fromCodePointMany: array<int> => t = "String.fromCodePoint"
-
-/* String.raw: ES2015, meant to be used with template strings, not directly */
-
-@get
-/**
-`length(s)` returns the length of the given `string`.
-
-See [`String.length`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/length)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.length("abcd") == 4
-```
-*/
-external length: t => int = "length"
-
-@get_index
-/**
-`get(s, n)` returns as a `string` the character at the given index number. If
-`n` is out of range, this function returns `undefined`,so at some point this
-function may be modified to return `option<string>`.
-
-## Examples
-
-```rescript
-Js.String2.get("Reason", 0) == "R"
-Js.String2.get("Reason", 4) == "o"
-Js.String2.get(`Rẽasöń`, 5) == `ń`
-```
-*/
-external get: (t, int) => t = ""
-
-@send
-/**
-`charAt(s, n)` gets the character at index `n` within string `s`. If `n` is
-negative or greater than the length of `s`, it returns the empty string. If the
-string contains characters outside the range \u0000-\uffff, it will return the
-first 16-bit value at that position in the string.
-
-See [`String.charAt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/charAt)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.charAt("Reason", 0) == "R"
-Js.String2.charAt("Reason", 12) == ""
-Js.String2.charAt(`Rẽasöń`, 5) == `ń`
-```
-*/
-external charAt: (t, int) => t = "charAt"
-
-@send
-/**
-`charCodeAt(s, n)` returns the character code at position `n` in string `s`;
-the result is in the range 0-65535, unlke `codePointAt`, so it will not work
-correctly for characters with code points greater than or equal to 0x10000. The
-return type is `float` because this function returns NaN if `n` is less than
-zero or greater than the length of the string.
-
-See [`String.charCodeAt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/charCodeAt)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.charCodeAt(`😺`, 0) == 0xd83d->Belt.Int.toFloat
-Js.String2.codePointAt(`😺`, 0) == Some(0x1f63a)
-```
-*/
-external charCodeAt: (t, int) => float = "charCodeAt"
-
-@send
-/**
-`codePointAt(s, n)` returns the code point at position `n` within string `s` as
-a `Some(value)`. The return value handles code points greater than or equal to
-0x10000. If there is no code point at the given position, the function returns
-`None`.
-
-See [`String.codePointAt`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/codePointAt)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.codePointAt(`¿😺?`, 1) == Some(0x1f63a)
-Js.String2.codePointAt("abc", 5) == None
-```
-*/
-external codePointAt: (t, int) => option<int> = "codePointAt"
-
-@send
-/**
-`concat(original, append)` returns a new `string` with `append` added after
-`original`.
-
-See [`String.concat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/concat)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.concat("cow", "bell") == "cowbell"
-```
-*/
-external concat: (t, t) => t = "concat"
-
-@send
-@variadic
-/**
-`concatMany(original, arr)` returns a new `string` consisting of each item of an
-array of strings added to the `original` string.
-
-See [`String.concat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/concat)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.concatMany("1st", ["2nd", "3rd", "4th"]) == "1st2nd3rd4th"
-```
-*/
-external concatMany: (t, array<t>) => t = "concat"
-
-@send
-/**
-ES2015: `endsWith(str, substr)` returns `true` if the `str` ends with `substr`,
-`false` otherwise.
-
-See [`String.endsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.endsWith("ReScript", "Script") == true
-Js.String2.endsWith("C++", "Script") == false
-```
-*/
-external endsWith: (t, t) => bool = "endsWith"
-
-@send
-/**
-`endsWithFrom(str, ending, len)` returns `true` if the first len characters of
-`str` end with `ending`, `false` otherwise. If `len` is greater than or equal
-to the length of `str`, then it works like `endsWith`. (Honestly, this should
-have been named endsWithAt, but oh well).
-
-See [`String.endsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.endsWithFrom("abcd", "cd", 4) == true
-Js.String2.endsWithFrom("abcde", "cd", 3) == false
-Js.String2.endsWithFrom("abcde", "cde", 99) == true
-Js.String2.endsWithFrom("example.dat", "ple", 7) == true
-```
-*/
-external endsWithFrom: (t, t, int) => bool = "endsWith"
-
-@send
-/**
-ES2015: `includes(str, searchValue)` returns `true` if `searchValue` is found
-anywhere within `str`, false otherwise.
-
-See [`String.includes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/includes)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.includes("programmer", "gram") == true
-Js.String2.includes("programmer", "er") == true
-Js.String2.includes("programmer", "pro") == true
-Js.String2.includes("programmer.dat", "xyz") == false
-```
-*/
-external includes: (t, t) => bool = "includes"
-
-@send
-/**
-ES2015: `includes(str, searchValue start)` returns `true` if `searchValue` is
-found anywhere within `str` starting at character number `start` (where 0 is
-the first character), `false` otherwise.
-
-See [`String.includes`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/includes)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.includesFrom("programmer", "gram", 1) == true
-Js.String2.includesFrom("programmer", "gram", 4) == false
-Js.String2.includesFrom(`대한민국`, `한`, 1) == true
-```
-*/
-external includesFrom: (t, t, int) => bool = "includes"
-
-@send
-/**
-ES2015: `indexOf(str, searchValue)` returns the position at which `searchValue`
-was first found within `str`, or -1 if `searchValue` is not in `str`.
-
-See [`String.indexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.indexOf("bookseller", "ok") == 2
-Js.String2.indexOf("bookseller", "sell") == 4
-Js.String2.indexOf("beekeeper", "ee") == 1
-Js.String2.indexOf("bookseller", "xyz") == -1
-```
-*/
-external indexOf: (t, t) => int = "indexOf"
-
-@send
-/**
-`indexOfFrom(str, searchValue, start)` returns the position at which
-`searchValue` was found within `str` starting at character position `start`, or
--1 if `searchValue` is not found in that portion of `str`. The return value is
-relative to the beginning of the string, no matter where the search started
-from.
-
-See [`String.indexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.indexOfFrom("bookseller", "ok", 1) == 2
-Js.String2.indexOfFrom("bookseller", "sell", 2) == 4
-Js.String2.indexOfFrom("bookseller", "sell", 5) == -1
-```
-*/
-external indexOfFrom: (t, t, int) => int = "indexOf"
-
-@send
-/**
-`lastIndexOf(str, searchValue)` returns the position of the last occurrence of
-`searchValue` within `str`, searching backwards from the end of the string.
-Returns -1 if `searchValue` is not in `str`. The return value is always
-relative to the beginning of the string.
-
-See [`String.lastIndexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/lastIndexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.lastIndexOf("bookseller", "ok") == 2
-Js.String2.lastIndexOf("beekeeper", "ee") == 4
-Js.String2.lastIndexOf("abcdefg", "xyz") == -1
-```
-*/
-external lastIndexOf: (t, t) => int = "lastIndexOf"
-
-@send
-/**
-`lastIndexOfFrom(str, searchValue, start)` returns the position of the last
-occurrence of `searchValue` within `str`, searching backwards from the given
-start position. Returns -1 if `searchValue` is not in `str`. The return value
-is always relative to the beginning of the string.
-
-See [`String.lastIndexOf`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/lastIndexOf)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.lastIndexOfFrom("bookseller", "ok", 6) == 2
-Js.String2.lastIndexOfFrom("beekeeper", "ee", 8) == 4
-Js.String2.lastIndexOfFrom("beekeeper", "ee", 3) == 1
-Js.String2.lastIndexOfFrom("abcdefg", "xyz", 4) == -1
-```
-*/
-external lastIndexOfFrom: (t, t, int) => int = "lastIndexOf"
-
-/* extended by ECMA-402 */
-
-@send
-/**
-`localeCompare(reference, comparison)` returns
-- a negative value if reference comes before comparison in sort order
-- zero if reference and comparison have the same sort order
-- a positive value if reference comes after comparison in sort order
-
-See [`String.localeCompare`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/localeCompare) on MDN.
-
-## Examples
-
-```rescript
-Js.String2.localeCompare("zebra", "ant") > 0.0
-Js.String2.localeCompare("ant", "zebra") < 0.0
-Js.String2.localeCompare("cat", "cat") == 0.0
-Js.String2.localeCompare("CAT", "cat") > 0.0
-```
-*/
-external localeCompare: (t, t) => float = "localeCompare"
-
-@send
-@return({null_to_opt: null_to_opt})
-/**
-`match(str, regexp)` matches a `string` against the given `regexp`. If there is
-no match, it returns `None`. For regular expressions without the g modifier, if
-  there is a match, the return value is `Some(array)` where the array contains:
-- The entire matched string
-- Any capture groups if the regexp had parentheses
-For regular expressions with the g modifier, a matched expression returns
-`Some(array)` with all the matched substrings and no capture groups.
-
-See [`String.match`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/match)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.match_("The better bats", %re("/b[aeiou]t/")) == Some(["bet"])
-Js.String2.match_("The better bats", %re("/b[aeiou]t/g")) == Some(["bet", "bat"])
-Js.String2.match_("Today is 2018-04-05.", %re("/(\d+)-(\d+)-(\d+)/")) ==
-  Some(["2018-04-05", "2018", "04", "05"])
-Js.String2.match_("The large container.", %re("/b[aeiou]g/")) == None
-```
-*/
-external match_: (t, Js_re.t) => option<array<option<t>>> = "match"
-
-@send
-/**
-`normalize(str)` returns the normalized Unicode string using Normalization Form
-Canonical (NFC) Composition. Consider the character ã, which can be represented
-as the single codepoint \u00e3 or the combination of a lower case letter A
-\u0061 and a combining tilde \u0303. Normalization ensures that both can be
-stored in an equivalent binary representation.
-
-See [`String.normalize`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize)
-on MDN. See also [Unicode technical report
-#15](https://unicode.org/reports/tr15/) for details.
-*/
-external normalize: t => t = "normalize"
-
-@send
-/**
-ES2015: `normalize(str, form)` returns the normalized Unicode string using the
-specified form of normalization, which may be one of:
-- "NFC" — Normalization Form Canonical Composition.
-- "NFD" — Normalization Form Canonical Decomposition.
-- "NFKC" — Normalization Form Compatibility Composition.
-- "NFKD" — Normalization Form Compatibility Decomposition.
-
-See [`String.normalize`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize) on MDN.
-See also [Unicode technical report #15](https://unicode.org/reports/tr15/) for details.
-*/
-external normalizeByForm: (t, t) => t = "normalize"
-
-@send
-/**
-`repeat(str, n)` returns a `string` that consists of `n` repetitions of `str`.
-Raises `RangeError` if `n` is negative.
-
-See [`String.repeat`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.repeat("ha", 3) == "hahaha"
-Js.String2.repeat("empty", 0) == ""
-```
-*/
-external repeat: (t, int) => t = "repeat"
-
-@send
-/**
-ES2015: `replace(str, substr, newSubstr)` returns a new `string` which is
-identical to `str` except with the first matching instance of `substr` replaced
-by `newSubstr`. `substr` is treated as a verbatim string to match, not a
-regular expression.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.replace("old string", "old", "new") == "new string"
-Js.String2.replace("the cat and the dog", "the", "this") == "this cat and the dog"
-```
-*/
-external replace: (t, t, t) => t = "replace"
-
-@send
-/**
-`replaceByRe(str, regex, replacement)` returns a new `string` where occurrences
-matching regex have been replaced by `replacement`.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.replaceByRe("vowels be gone", %re("/[aeiou]/g"), "x") == "vxwxls bx gxnx"
-Js.String2.replaceByRe("Juan Fulano", %re("/(\w+) (\w+)/"), "$2, $1") == "Fulano, Juan"
-```
-*/
-external replaceByRe: (t, Js_re.t, t) => t = "replace"
-
-@send
-/**
-Returns a new `string` with some or all matches of a pattern with no capturing
-parentheses replaced by the value returned from the given function. The
-function receives as its parameters the matched string, the offset at which the
-match begins, and the whole string being matched.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-
-## Examples
-
-```rescript
-let str = "beautiful vowels"
-let re = %re("/[aeiou]/g")
-let matchFn = (matchPart, _offset, _wholeString) => Js.String2.toUpperCase(matchPart)
-
-Js.String2.unsafeReplaceBy0(str, re, matchFn) == "bEAUtIfUl vOwEls"
-```
-*/
-external unsafeReplaceBy0: (t, Js_re.t, @uncurry (t, int, t) => t) => t = "replace"
-
-@send
-/**
-Returns a new `string` with some or all matches of a pattern with one set of
-capturing parentheses replaced by the value returned from the given function.
-The function receives as its parameters the matched string, the captured
-string, the offset at which the match begins, and the whole string being
-matched.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-
-## Examples
-
-```rescript
-let str = "Jony is 40"
-let re = %re("/(Jony is )\d+/g")
-let matchFn = (_match, part1, _offset, _wholeString) => {
-  part1 ++ "41"
-}
-
-Js.String2.unsafeReplaceBy1(str, re, matchFn) == "Jony is 41"
-```
-*/
-external unsafeReplaceBy1: (t, Js_re.t, @uncurry (t, t, int, t) => t) => t = "replace"
-
-@send
-/**
-Returns a new `string` with some or all matches of a pattern with two sets of
-capturing parentheses replaced by the value returned from the given function.
-The function receives as its parameters the matched string, the captured
-strings, the offset at which the match begins, and the whole string being
-matched.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-
-## Examples
-
-```rescript
-let str = "7 times 6"
-let re = %re("/(\d+) times (\d+)/")
-let matchFn = (_match, p1, p2, _offset, _wholeString) => {
-  switch (Belt.Int.fromString(p1), Belt.Int.fromString(p2)) {
-  | (Some(x), Some(y)) => Belt.Int.toString(x * y)
-  | _ => "???"
-  }
-}
-
-Js.String2.unsafeReplaceBy2(str, re, matchFn) == "42"
-```
-*/
-external unsafeReplaceBy2: (t, Js_re.t, @uncurry (t, t, t, int, t) => t) => t = "replace"
-
-@send
-/**
-Returns a new `string` with some or all matches of a pattern with three sets of
-capturing parentheses replaced by the value returned from the given function.
-The function receives as its parameters the matched string, the captured
-strings, the offset at which the match begins, and the whole string being
-matched.
-
-See [`String.replace`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace)
-on MDN.
-*/
-external unsafeReplaceBy3: (t, Js_re.t, @uncurry (t, t, t, t, int, t) => t) => t = "replace"
-
-@send
-/**
-`search(str, regexp)` returns the starting position of the first match of
-`regexp` in the given `str`, or -1 if there is no match.
-
-See [`String.search`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/search)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.search("testing 1 2 3", %re("/\d+/")) == 8
-Js.String2.search("no numbers", %re("/\d+/")) == -1
-```
-*/
-external search: (t, Js_re.t) => int = "search"
-
-@send
-/**
-`slice(str, from:n1, to_:n2)` returns the substring of `str` starting at
-character `n1` up to but not including `n2`.
-- If either `n1` or `n2` is negative, then it is evaluated as `length(str - n1)` or `length(str - n2)`.
-- If `n2` is greater than the length of `str`, then it is treated as `length(str)`.
-- If `n1` is greater than `n2`, slice returns the empty string.
-
-See [`String.slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/slice) on MDN.
-
-## Examples
-
-```rescript
-Js.String2.slice("abcdefg", ~from=2, ~to_=5) == "cde"
-Js.String2.slice("abcdefg", ~from=2, ~to_=9) == "cdefg"
-Js.String2.slice("abcdefg", ~from=-4, ~to_=-2) == "de"
-Js.String2.slice("abcdefg", ~from=5, ~to_=1) == ""
-```
-*/
-external slice: (t, ~from: int, ~to_: int) => t = "slice"
-
-@send
-/**
-`sliceToEnd(str, from:n)` returns the substring of `str` starting at character
-`n` to the end of the string.
-- If `n` is negative, then it is evaluated as `length(str - n)`.
-- If `n` is greater than the length of `str`, then sliceToEnd returns the empty string.
-
-See [`String.slice`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/slice) on MDN.
-
-## Examples
-
-```rescript
-Js.String2.sliceToEnd("abcdefg", ~from=4) == "efg"
-Js.String2.sliceToEnd("abcdefg", ~from=-2) == "fg"
-Js.String2.sliceToEnd("abcdefg", ~from=7) == ""
-```
-*/
-external sliceToEnd: (t, ~from: int) => t = "slice"
-
-@send
-/**
-`split(str, delimiter)` splits the given `str` at every occurrence of
-`delimiter` and returns an array of the resulting substrings.
-
-See [`String.split`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.split("2018-01-02", "-") == ["2018", "01", "02"]
-Js.String2.split("a,b,,c", ",") == ["a", "b", "", "c"]
-Js.String2.split("good::bad as great::awful", "::") == ["good", "bad as great", "awful"]
-Js.String2.split("has-no-delimiter", ";") == ["has-no-delimiter"]
-```
-*/
-external split: (t, t) => array<t> = "split"
-
-@send
-/**
-`splitAtMost delimiter ~limit: n str` splits the given `str` at every occurrence of `delimiter` and returns an array of the first `n` resulting substrings. If `n` is negative or greater than the number of substrings, the array will contain all the substrings.
-
-```
-splitAtMost "ant/bee/cat/dog/elk" "/" ~limit: 3 = [|"ant"; "bee"; "cat"|];;
-splitAtMost "ant/bee/cat/dog/elk" "/" ~limit: 0 = [| |];;
-splitAtMost "ant/bee/cat/dog/elk" "/" ~limit: 9 = [|"ant"; "bee"; "cat"; "dog"; "elk"|];;
-```
-*/
-external splitAtMost: (t, t, ~limit: int) => array<t> = "split"
-
-@send
-/**
-`splitByRe(str, regex)` splits the given `str` at every occurrence of `regex`
-and returns an array of the resulting substrings.
-
-See [`String.split`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.splitByRe("art; bed , cog ;dad", %re("/\s*[,;]\s*TODO/")) == [
-    Some("art"),
-    Some("bed"),
-    Some("cog"),
-    Some("dad"),
-  ]
-```
-*/
-external splitByRe: (t, Js_re.t) => array<option<t>> = "split"
-
-@send
-/**
-`splitByReAtMost(str, regex, ~limit:n)` splits the given `str` at every
-occurrence of `regex` and returns an array of the first `n` resulting
-substrings. If `n` is negative or greater than the number of substrings, the
-array will contain all the substrings.
-
-See [`String.split`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.splitByReAtMost("one: two: three: four", %re("/\s*:\s*TODO/"), ~limit=3) == [
-    Some("one"),
-    Some("two"),
-    Some("three"),
-  ]
-
-Js.String2.splitByReAtMost("one: two: three: four", %re("/\s*:\s*TODO/"), ~limit=0) == []
-
-Js.String2.splitByReAtMost("one: two: three: four", %re("/\s*:\s*TODO/"), ~limit=8) == [
-    Some("one"),
-    Some("two"),
-    Some("three"),
-    Some("four"),
-  ]
-```
-*/
-external splitByReAtMost: (t, Js_re.t, ~limit: int) => array<option<t>> = "split"
-
-@send
-/**
-ES2015: `startsWith(str, substr)` returns `true` if the `str` starts with
-`substr`, `false` otherwise.
-
-See [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.startsWith("ReScript", "Re") == true
-Js.String2.startsWith("ReScript", "") == true
-Js.String2.startsWith("JavaScript", "Re") == false
-```
-*/
-external startsWith: (t, t) => bool = "startsWith"
-
-@send
-/**
-ES2015: `startsWithFrom(str, substr, n)` returns `true` if the `str` starts
-with `substr` starting at position `n`, false otherwise. If `n` is negative,
-the search starts at the beginning of `str`.
-
-See [`String.startsWith`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.startsWithFrom("ReScript", "Scri", 2) == true
-Js.String2.startsWithFrom("ReScript", "", 2) == true
-Js.String2.startsWithFrom("JavaScript", "Scri", 2) == false
-```
-*/
-external startsWithFrom: (t, t, int) => bool = "startsWith"
-
-@send
-/**
-`substr(str, ~from:n)` returns the substring of `str` from position `n` to the
-end of the string.
-- If `n` is less than zero, the starting position is the length of `str - n`.
-- If `n` is greater than or equal to the length of `str`, returns the empty string.
-
-JavaScript’s `String.substr()` is a legacy function. When possible, use
-`substring()` instead.
-
-See [`String.substr`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.substr("abcdefghij", ~from=3) == "defghij"
-Js.String2.substr("abcdefghij", ~from=-3) == "hij"
-Js.String2.substr("abcdefghij", ~from=12) == ""
-```
-*/
-external substr: (t, ~from: int) => t = "substr"
-
-@send
-/**
-`substrAtMost(str, ~from: pos, ~length: n)` returns the substring of `str` of
-length `n` starting at position `pos`.
-- If `pos` is less than zero, the starting position is the length of `str - pos`.
-- If `pos` is greater than or equal to the length of `str`, returns the empty string.
-- If `n` is less than or equal to zero, returns the empty string.
-
-JavaScript’s `String.substr()` is a legacy function. When possible, use
-`substring()` instead.
-
-See [`String.substr`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.substrAtMost("abcdefghij", ~from=3, ~length=4) == "defg"
-Js.String2.substrAtMost("abcdefghij", ~from=-3, ~length=4) == "hij"
-Js.String2.substrAtMost("abcdefghij", ~from=12, ~length=2) == ""
-```
-*/
-external substrAtMost: (t, ~from: int, ~length: int) => t = "substr"
-
-@send
-/**
-`substring(str, ~from: start, ~to_: finish)` returns characters `start` up to
-but not including finish from `str`.
-- If `start` is less than zero, it is treated as zero.
-- If `finish` is zero or negative, the empty string is returned.
-- If `start` is greater than `finish`, the `start` and `finish` points are swapped.
-
-See [`String.substring`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substring) on MDN.
-
-## Examples
-
-```rescript
-Js.String2.substring("playground", ~from=3, ~to_=6) == "ygr"
-Js.String2.substring("playground", ~from=6, ~to_=3) == "ygr"
-Js.String2.substring("playground", ~from=4, ~to_=12) == "ground"
-```
-*/
-external substring: (t, ~from: int, ~to_: int) => t = "substring"
-
-@send
-/**
-`substringToEnd(str, ~from: start)` returns the substring of `str` from
-position `start` to the end.
-- If `start` is less than or equal to zero, the entire string is returned.
-- If `start` is greater than or equal to the length of `str`, the empty string is returned.
-
-See [`String.substring`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substring) on MDN.
-
-## Examples
-
-```rescript
-Js.String2.substringToEnd("playground", ~from=4) == "ground"
-Js.String2.substringToEnd("playground", ~from=-3) == "playground"
-Js.String2.substringToEnd("playground", ~from=12) == ""
-```
-*/
-external substringToEnd: (t, ~from: int) => t = "substring"
-
-@send
-/**
-`toLowerCase(str)` converts `str` to lower case using the locale-insensitive
-case mappings in the Unicode Character Database. Notice that the conversion can
-give different results depending upon context, for example with the Greek
-letter sigma, which has two different lower case forms; one when it is the last
-character in a string and another when it is not.
-
-See [`String.toLowerCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toLowerCase)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.toLowerCase("ABC") == "abc"
-Js.String2.toLowerCase(`ΣΠ`) == `σπ`
-Js.String2.toLowerCase(`ΠΣ`) == `πς`
-```
-*/
-external toLowerCase: t => t = "toLowerCase"
-
-@send
-/**
-`toLocaleLowerCase(str)` converts `str` to lower case using the current locale.
-See [`String.toLocaleLowerCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toLocaleLowerCase)
-on MDN.
-*/
-external toLocaleLowerCase: t => t = "toLocaleLowerCase"
-
-@send
-/**
-`toUpperCase(str)` converts `str` to upper case using the locale-insensitive
-case mappings in the Unicode Character Database. Notice that the conversion can
-expand the number of letters in the result; for example the German ß
-capitalizes to two Ses in a row.
-
-See [`String.toUpperCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.toUpperCase("abc") == "ABC"
-Js.String2.toUpperCase(`Straße`) == `STRASSE`
-Js.String2.toUpperCase(`πς`) == `ΠΣ`
-```
-*/
-external toUpperCase: t => t = "toUpperCase"
-
-@send
-/**
-`toLocaleUpperCase(str)` converts `str` to upper case using the current locale.
-See [`String.to:LocaleUpperCase`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toLocaleUpperCase)
-on MDN.
-*/
-external toLocaleUpperCase: t => t = "toLocaleUpperCase"
-
-@send
-/**
-`trim(str)` returns a string that is `str` with whitespace stripped from both
-ends. Internal whitespace is not removed.
-
-See [`String.trim`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/trim)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.trim("   abc def   ") == "abc def"
-Js.String2.trim("\n\r\t abc def \n\n\t\r ") == "abc def"
-```
-*/
-external trim: t => t = "trim"
-
-/* HTML wrappers */
-
-@send
-/**
-`anchor(anchorText, anchorName)` creates a string with an HTML `<a>` element
-with name attribute of `anchorName` and `anchorText` as its content. Please do
-not use this method, as it has been removed from the relevant web standards.
-
-See [`String.anchor`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/anchor)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.anchor("Page One", "page1") == "<a name="page1">Page One</a>"
-```
-*/
-external anchor: (t, t) => t = "anchor"
-
-@send
-/**
-ES2015: `link(linkText, urlText)` creates a string with an HTML `<a>` element
-with href attribute of `urlText` and `linkText` as its content. Please do not
-use this method, as it has been removed from the relevant web standards. See
-[`String.link`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/link)
-on MDN.
-
-## Examples
-
-```rescript
-Js.String2.link("Go to page two", "page2.html") == "<a href="page2.html">Go to page two</a>"
-```
-*/
-external link: (t, t) => t = "link"
-
-/* FIXME: we should not encourage people to use [%identity], better
-    to provide something using [@@bs.val] so that we can track such
-    casting
-*/
-/**
-Casts its argument to an `array_like` entity that can be processed by functions
-such as `Js.Array2.fromMap()`
-
-## Examples
-
-```rescript
-let s = "abcde"
-let arr = Js.Array2.fromMap(Js.String2.castToArrayLike(s), x => x)
-arr == ["a", "b", "c", "d", "e"]
-```
-*/
-external castToArrayLike: t => Js_array2.array_like<t> = "%identity"
diff --git a/jscomp/others/js_typed_array.res b/jscomp/others/js_typed_array.res
deleted file mode 100644
index 21b010b..0000000
--- a/jscomp/others/js_typed_array.res
+++ /dev/null
@@ -1,1353 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-JavaScript Typed Array API
-
-**see** [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray)
-*/
-
-@@warning("-103")
-
-type array_buffer = Js_typed_array2.array_buffer
-type array_like<'a> = Js_typed_array2.array_like<'a>
-
-module type Type = {
-  type t
-}
-module ArrayBuffer = {
-  /***
-  The underlying buffer that the typed arrays provide views of
-
-  **see** [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer)
-  */
-
-  type t = array_buffer
-
-  @new /** takes length. initializes elements to 0 */
-  external make: int => t = "ArrayBuffer"
-
-  /* ArrayBuffer.isView: seems pointless with a type system */
-  /* experimental
-  external transfer : array_buffer -> t = "ArrayBuffer.transfer" [@@bs.val]
-  external transferWithLength : array_buffer -> int -> t = "ArrayBuffer.transfer" [@@bs.val]
- */
-
-  @get external byteLength: t => int = "byteLength"
-
-  @bs.send.pipe(: t) external slice: (~start: int, ~end_: int) => array_buffer = "slice" /* FIXME */
-  @bs.send.pipe(: t) external sliceFrom: int => array_buffer = "slice"
-}
-module type S = {
-  /*** Implements functionality common to all the typed arrays */
-
-  type elt
-  type typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @bs.send.pipe(: t) external setArray: array<elt> => unit = "set"
-  @bs.send.pipe(: t) external setArrayOffset: (array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish)
-   * ---
-   */
-  @get external length: t => int = "length"
-
-  /* Mutator functions
-   */
-  @bs.send.pipe(: t) external copyWithin: (~to_: int) => t = "copyWithin"
-  @bs.send.pipe(: t) external copyWithinFrom: (~to_: int, ~from: int) => t = "copyWithin"
-  @bs.send.pipe(: t)
-  external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @bs.send.pipe(: t) external fillInPlace: elt => t = "fill"
-  @bs.send.pipe(: t) external fillFromInPlace: (elt, ~from: int) => t = "fill"
-  @bs.send.pipe(: t) external fillRangeInPlace: (elt, ~start: int, ~end_: int) => t = "fill"
-
-  @bs.send.pipe(: t) external reverseInPlace: t = "reverse"
-
-  @bs.send.pipe(: t) external sortInPlace: t = "sort"
-  @bs.send.pipe(: t) external sortInPlaceWith: ((. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions
-   */
-  @bs.send.pipe(: t) /** ES2016 */
-  external includes: elt => bool = "includes"
-
-  @bs.send.pipe(: t) external indexOf: elt => int = "indexOf"
-  @bs.send.pipe(: t) external indexOfFrom: (elt, ~from: int) => int = "indexOf"
-
-  @bs.send.pipe(: t) external join: string = "join"
-  @bs.send.pipe(: t) external joinWith: string => string = "join"
-
-  @bs.send.pipe(: t) external lastIndexOf: elt => int = "lastIndexOf"
-  @bs.send.pipe(: t) external lastIndexOfFrom: (elt, ~from: int) => int = "lastIndexOf"
-
-  @bs.send.pipe(: t) external slice: (~start: int, ~end_: int) => t = "slice"
-  @bs.send.pipe(: t) external copy: t = "slice"
-  @bs.send.pipe(: t) external sliceFrom: int => t = "slice"
-
-  @bs.send.pipe(: t) external subarray: (~start: int, ~end_: int) => t = "subarray"
-  @bs.send.pipe(: t) external subarrayFrom: int => t = "subarray"
-
-  @bs.send.pipe(: t) external toString: string = "toString"
-  @bs.send.pipe(: t) external toLocaleString: string = "toLocaleString"
-
-  /* Iteration functions
-   */
-  /* commented out until bs has a plan for iterators
-  external entries : (int * elt) array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external every: ((. elt) => bool) => bool = "every"
-  @bs.send.pipe(: t) external everyi: ((. elt, int) => bool) => bool = "every"
-
-  /** should we use `bool` or `boolean` seems they are intechangeable here */
-  @bs.send.pipe(: t)
-  external filter: ((. elt) => bool) => t = "filter"
-  @bs.send.pipe(: t) external filteri: ((. elt, int) => bool) => t = "filter"
-
-  @bs.send.pipe(: t) external find: ((. elt) => bool) => Js.undefined<elt> = "find"
-  @bs.send.pipe(: t) external findi: ((. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @bs.send.pipe(: t) external findIndex: ((. elt) => bool) => int = "findIndex"
-  @bs.send.pipe(: t) external findIndexi: ((. elt, int) => bool) => int = "findIndex"
-
-  @bs.send.pipe(: t) external forEach: ((. elt) => unit) => unit = "forEach"
-  @bs.send.pipe(: t) external forEachi: ((. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : int array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external map: ((. elt) => 'b) => typed_array<'b> = "map"
-  @bs.send.pipe(: t) external mapi: ((. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @bs.send.pipe(: t) external reduce: ((. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @bs.send.pipe(: t) external reducei: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @bs.send.pipe(: t) external reduceRight: ((. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @bs.send.pipe(: t) external reduceRighti: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @bs.send.pipe(: t) external some: ((. elt) => bool) => bool = "some"
-  @bs.send.pipe(: t) external somei: ((. elt, int) => bool) => bool = "some"
-
-  /* commented out until bs has a plan for iterators
-  external values : elt array_iter = "" [@@bs.send.pipe: t]
- */
-}
-
-/* commented out until bs has a plan for iterators
-  external values : elt array_iter = "" [@@bs.send.pipe: t]
- */
-
-module Int8Array = {
-  /** */
-  type elt = int
-  type typed_array<'a> = Js_typed_array2.Int8Array.typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @bs.send.pipe(: t) external setArray: array<elt> => unit = "set"
-  @bs.send.pipe(: t) external setArrayOffset: (array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @bs.send.pipe(: t) external copyWithin: (~to_: int) => t = "copyWithin"
-  @bs.send.pipe(: t) external copyWithinFrom: (~to_: int, ~from: int) => t = "copyWithin"
-  @bs.send.pipe(: t)
-  external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @bs.send.pipe(: t) external fillInPlace: elt => t = "fill"
-  @bs.send.pipe(: t) external fillFromInPlace: (elt, ~from: int) => t = "fill"
-  @bs.send.pipe(: t) external fillRangeInPlace: (elt, ~start: int, ~end_: int) => t = "fill"
-
-  @bs.send.pipe(: t) external reverseInPlace: t = "reverse"
-
-  @bs.send.pipe(: t) external sortInPlace: t = "sort"
-  @bs.send.pipe(: t) external sortInPlaceWith: ((. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @bs.send.pipe(: t) external includes: elt => bool = "includes" /* ES2016 */
-
-  @bs.send.pipe(: t) external indexOf: elt => int = "indexOf"
-  @bs.send.pipe(: t) external indexOfFrom: (elt, ~from: int) => int = "indexOf"
-
-  @bs.send.pipe(: t) external join: string = "join"
-  @bs.send.pipe(: t) external joinWith: string => string = "join"
-
-  @bs.send.pipe(: t) external lastIndexOf: elt => int = "lastIndexOf"
-  @bs.send.pipe(: t) external lastIndexOfFrom: (elt, ~from: int) => int = "lastIndexOf"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external slice: (~start: int, ~end_: int) => t = "slice"
-
-  @bs.send.pipe(: t) external copy: t = "slice"
-  @bs.send.pipe(: t) external sliceFrom: int => t = "slice"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external subarray: (~start: int, ~end_: int) => t = "subarray"
-
-  @bs.send.pipe(: t) external subarrayFrom: int => t = "subarray"
-
-  @bs.send.pipe(: t) external toString: string = "toString"
-  @bs.send.pipe(: t) external toLocaleString: string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : (int * elt) array_iter = "" [@@bs.send.pipe: t]
- */
-  @bs.send.pipe(: t) external every: ((. elt) => bool) => bool = "every"
-  @bs.send.pipe(: t) external everyi: ((. elt, int) => bool) => bool = "every"
-
-  @bs.send.pipe(: t) external filter: ((. elt) => bool) => t = "filter"
-  @bs.send.pipe(: t) external filteri: ((. elt, int) => bool) => t = "filter"
-
-  @bs.send.pipe(: t) external find: ((. elt) => bool) => Js.undefined<elt> = "find"
-  @bs.send.pipe(: t) external findi: ((. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @bs.send.pipe(: t) external findIndex: ((. elt) => bool) => int = "findIndex"
-  @bs.send.pipe(: t) external findIndexi: ((. elt, int) => bool) => int = "findIndex"
-
-  @bs.send.pipe(: t) external forEach: ((. elt) => unit) => unit = "forEach"
-  @bs.send.pipe(: t) external forEachi: ((. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : int array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external map: ((. elt) => 'b) => typed_array<'b> = "map"
-  @bs.send.pipe(: t) external mapi: ((. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @bs.send.pipe(: t) external reduce: ((. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @bs.send.pipe(: t) external reducei: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @bs.send.pipe(: t) external reduceRight: ((. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @bs.send.pipe(: t) external reduceRighti: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @bs.send.pipe(: t) external some: ((. elt) => bool) => bool = "some"
-  @bs.send.pipe(: t) external somei: ((. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Int8Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Int8Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Int8Array"
-
-  /**
-  raise Js.Exn.Error raise Js exception
-
-  param offset is in bytes
-  */
-  @new
-  external fromBufferOffset: (array_buffer, int) => t = "Int8Array"
-
-  @new
-  /**
-  raise Js.Exn.Error raises Js exception
-
-  param offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Int8Array"
-
-  @new external fromLength: int => t = "Int8Array"
-  @val external from: array_like<elt> => t = "Int8Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Uint8Array = {
-  /** */
-  type elt = int
-  type typed_array<'a> = Js_typed_array2.Uint8Array.typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @bs.send.pipe(: t) external setArray: array<elt> => unit = "set"
-  @bs.send.pipe(: t) external setArrayOffset: (array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @bs.send.pipe(: t) external copyWithin: (~to_: int) => t = "copyWithin"
-  @bs.send.pipe(: t) external copyWithinFrom: (~to_: int, ~from: int) => t = "copyWithin"
-  @bs.send.pipe(: t)
-  external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @bs.send.pipe(: t) external fillInPlace: elt => t = "fill"
-  @bs.send.pipe(: t) external fillFromInPlace: (elt, ~from: int) => t = "fill"
-  @bs.send.pipe(: t) external fillRangeInPlace: (elt, ~start: int, ~end_: int) => t = "fill"
-
-  @bs.send.pipe(: t) external reverseInPlace: t = "reverse"
-
-  @bs.send.pipe(: t) external sortInPlace: t = "sort"
-  @bs.send.pipe(: t) external sortInPlaceWith: ((. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @bs.send.pipe(: t) external includes: elt => bool = "includes" /* ES2016 */
-
-  @bs.send.pipe(: t) external indexOf: elt => int = "indexOf"
-  @bs.send.pipe(: t) external indexOfFrom: (elt, ~from: int) => int = "indexOf"
-
-  @bs.send.pipe(: t) external join: string = "join"
-  @bs.send.pipe(: t) external joinWith: string => string = "join"
-
-  @bs.send.pipe(: t) external lastIndexOf: elt => int = "lastIndexOf"
-  @bs.send.pipe(: t) external lastIndexOfFrom: (elt, ~from: int) => int = "lastIndexOf"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external slice: (~start: int, ~end_: int) => t = "slice"
-
-  @bs.send.pipe(: t) external copy: t = "slice"
-  @bs.send.pipe(: t) external sliceFrom: int => t = "slice"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external subarray: (~start: int, ~end_: int) => t = "subarray"
-
-  @bs.send.pipe(: t) external subarrayFrom: int => t = "subarray"
-
-  @bs.send.pipe(: t) external toString: string = "toString"
-  @bs.send.pipe(: t) external toLocaleString: string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : (int * elt) array_iter = "" [@@bs.send.pipe: t]
- */
-  @bs.send.pipe(: t) external every: ((. elt) => bool) => bool = "every"
-  @bs.send.pipe(: t) external everyi: ((. elt, int) => bool) => bool = "every"
-
-  @bs.send.pipe(: t) external filter: ((. elt) => bool) => t = "filter"
-  @bs.send.pipe(: t) external filteri: ((. elt, int) => bool) => t = "filter"
-
-  @bs.send.pipe(: t) external find: ((. elt) => bool) => Js.undefined<elt> = "find"
-  @bs.send.pipe(: t) external findi: ((. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @bs.send.pipe(: t) external findIndex: ((. elt) => bool) => int = "findIndex"
-  @bs.send.pipe(: t) external findIndexi: ((. elt, int) => bool) => int = "findIndex"
-
-  @bs.send.pipe(: t) external forEach: ((. elt) => unit) => unit = "forEach"
-  @bs.send.pipe(: t) external forEachi: ((. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : int array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external map: ((. elt) => 'b) => typed_array<'b> = "map"
-  @bs.send.pipe(: t) external mapi: ((. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @bs.send.pipe(: t) external reduce: ((. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @bs.send.pipe(: t) external reducei: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @bs.send.pipe(: t) external reduceRight: ((. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @bs.send.pipe(: t) external reduceRighti: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @bs.send.pipe(: t) external some: ((. elt) => bool) => bool = "some"
-  @bs.send.pipe(: t) external somei: ((. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Uint8Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Uint8Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Uint8Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Uint8Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Uint8Array"
-
-  @new external fromLength: int => t = "Uint8Array"
-  @val external from: array_like<elt> => t = "Uint8Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Uint8ClampedArray = {
-  /** */
-  type elt = int
-  type typed_array<'a> = Js_typed_array2.Uint8ClampedArray.typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @bs.send.pipe(: t) external setArray: array<elt> => unit = "set"
-  @bs.send.pipe(: t) external setArrayOffset: (array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @bs.send.pipe(: t) external copyWithin: (~to_: int) => t = "copyWithin"
-  @bs.send.pipe(: t) external copyWithinFrom: (~to_: int, ~from: int) => t = "copyWithin"
-  @bs.send.pipe(: t)
-  external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @bs.send.pipe(: t) external fillInPlace: elt => t = "fill"
-  @bs.send.pipe(: t) external fillFromInPlace: (elt, ~from: int) => t = "fill"
-  @bs.send.pipe(: t) external fillRangeInPlace: (elt, ~start: int, ~end_: int) => t = "fill"
-
-  @bs.send.pipe(: t) external reverseInPlace: t = "reverse"
-
-  @bs.send.pipe(: t) external sortInPlace: t = "sort"
-  @bs.send.pipe(: t) external sortInPlaceWith: ((. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @bs.send.pipe(: t) external includes: elt => bool = "includes" /* ES2016 */
-
-  @bs.send.pipe(: t) external indexOf: elt => int = "indexOf"
-  @bs.send.pipe(: t) external indexOfFrom: (elt, ~from: int) => int = "indexOf"
-
-  @bs.send.pipe(: t) external join: string = "join"
-  @bs.send.pipe(: t) external joinWith: string => string = "join"
-
-  @bs.send.pipe(: t) external lastIndexOf: elt => int = "lastIndexOf"
-  @bs.send.pipe(: t) external lastIndexOfFrom: (elt, ~from: int) => int = "lastIndexOf"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external slice: (~start: int, ~end_: int) => t = "slice"
-
-  @bs.send.pipe(: t) external copy: t = "slice"
-  @bs.send.pipe(: t) external sliceFrom: int => t = "slice"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external subarray: (~start: int, ~end_: int) => t = "subarray"
-
-  @bs.send.pipe(: t) external subarrayFrom: int => t = "subarray"
-
-  @bs.send.pipe(: t) external toString: string = "toString"
-  @bs.send.pipe(: t) external toLocaleString: string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : (int * elt) array_iter = "" [@@bs.send.pipe: t]
- */
-  @bs.send.pipe(: t) external every: ((. elt) => bool) => bool = "every"
-  @bs.send.pipe(: t) external everyi: ((. elt, int) => bool) => bool = "every"
-
-  @bs.send.pipe(: t) external filter: ((. elt) => bool) => t = "filter"
-  @bs.send.pipe(: t) external filteri: ((. elt, int) => bool) => t = "filter"
-
-  @bs.send.pipe(: t) external find: ((. elt) => bool) => Js.undefined<elt> = "find"
-  @bs.send.pipe(: t) external findi: ((. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @bs.send.pipe(: t) external findIndex: ((. elt) => bool) => int = "findIndex"
-  @bs.send.pipe(: t) external findIndexi: ((. elt, int) => bool) => int = "findIndex"
-
-  @bs.send.pipe(: t) external forEach: ((. elt) => unit) => unit = "forEach"
-  @bs.send.pipe(: t) external forEachi: ((. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : int array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external map: ((. elt) => 'b) => typed_array<'b> = "map"
-  @bs.send.pipe(: t) external mapi: ((. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @bs.send.pipe(: t) external reduce: ((. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @bs.send.pipe(: t) external reducei: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @bs.send.pipe(: t) external reduceRight: ((. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @bs.send.pipe(: t) external reduceRighti: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @bs.send.pipe(: t) external some: ((. elt) => bool) => bool = "some"
-  @bs.send.pipe(: t) external somei: ((. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Uint8ClampedArray.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Uint8ClampedArray"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Uint8ClampedArray"
-
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  @new
-  external fromBufferOffset: (array_buffer, int) => t = "Uint8ClampedArray"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Uint8ClampedArray"
-
-  @new external fromLength: int => t = "Uint8ClampedArray"
-  @val external from: array_like<elt> => t = "Uint8ClampedArray.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Int16Array = {
-  /** */
-  type elt = int
-  type typed_array<'a> = Js_typed_array2.Int16Array.typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @bs.send.pipe(: t) external setArray: array<elt> => unit = "set"
-  @bs.send.pipe(: t) external setArrayOffset: (array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @bs.send.pipe(: t) external copyWithin: (~to_: int) => t = "copyWithin"
-  @bs.send.pipe(: t) external copyWithinFrom: (~to_: int, ~from: int) => t = "copyWithin"
-  @bs.send.pipe(: t)
-  external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @bs.send.pipe(: t) external fillInPlace: elt => t = "fill"
-  @bs.send.pipe(: t) external fillFromInPlace: (elt, ~from: int) => t = "fill"
-  @bs.send.pipe(: t) external fillRangeInPlace: (elt, ~start: int, ~end_: int) => t = "fill"
-
-  @bs.send.pipe(: t) external reverseInPlace: t = "reverse"
-
-  @bs.send.pipe(: t) external sortInPlace: t = "sort"
-  @bs.send.pipe(: t) external sortInPlaceWith: ((. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @bs.send.pipe(: t) external includes: elt => bool = "includes" /* ES2016 */
-
-  @bs.send.pipe(: t) external indexOf: elt => int = "indexOf"
-  @bs.send.pipe(: t) external indexOfFrom: (elt, ~from: int) => int = "indexOf"
-
-  @bs.send.pipe(: t) external join: string = "join"
-  @bs.send.pipe(: t) external joinWith: string => string = "join"
-
-  @bs.send.pipe(: t) external lastIndexOf: elt => int = "lastIndexOf"
-  @bs.send.pipe(: t) external lastIndexOfFrom: (elt, ~from: int) => int = "lastIndexOf"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external slice: (~start: int, ~end_: int) => t = "slice"
-
-  @bs.send.pipe(: t) external copy: t = "slice"
-  @bs.send.pipe(: t) external sliceFrom: int => t = "slice"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external subarray: (~start: int, ~end_: int) => t = "subarray"
-
-  @bs.send.pipe(: t) external subarrayFrom: int => t = "subarray"
-
-  @bs.send.pipe(: t) external toString: string = "toString"
-  @bs.send.pipe(: t) external toLocaleString: string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : (int * elt) array_iter = "" [@@bs.send.pipe: t]
- */
-  @bs.send.pipe(: t) external every: ((. elt) => bool) => bool = "every"
-  @bs.send.pipe(: t) external everyi: ((. elt, int) => bool) => bool = "every"
-
-  @bs.send.pipe(: t) external filter: ((. elt) => bool) => t = "filter"
-  @bs.send.pipe(: t) external filteri: ((. elt, int) => bool) => t = "filter"
-
-  @bs.send.pipe(: t) external find: ((. elt) => bool) => Js.undefined<elt> = "find"
-  @bs.send.pipe(: t) external findi: ((. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @bs.send.pipe(: t) external findIndex: ((. elt) => bool) => int = "findIndex"
-  @bs.send.pipe(: t) external findIndexi: ((. elt, int) => bool) => int = "findIndex"
-
-  @bs.send.pipe(: t) external forEach: ((. elt) => unit) => unit = "forEach"
-  @bs.send.pipe(: t) external forEachi: ((. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : int array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external map: ((. elt) => 'b) => typed_array<'b> = "map"
-  @bs.send.pipe(: t) external mapi: ((. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @bs.send.pipe(: t) external reduce: ((. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @bs.send.pipe(: t) external reducei: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @bs.send.pipe(: t) external reduceRight: ((. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @bs.send.pipe(: t) external reduceRighti: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @bs.send.pipe(: t) external some: ((. elt) => bool) => bool = "some"
-  @bs.send.pipe(: t) external somei: ((. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Int16Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Int16Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Int16Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Int16Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Int16Array"
-
-  @new external fromLength: int => t = "Int16Array"
-  @val external from: array_like<elt> => t = "Int16Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Uint16Array = {
-  /** */
-  type elt = int
-  type typed_array<'a> = Js_typed_array2.Uint16Array.typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @bs.send.pipe(: t) external setArray: array<elt> => unit = "set"
-  @bs.send.pipe(: t) external setArrayOffset: (array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @bs.send.pipe(: t) external copyWithin: (~to_: int) => t = "copyWithin"
-  @bs.send.pipe(: t) external copyWithinFrom: (~to_: int, ~from: int) => t = "copyWithin"
-  @bs.send.pipe(: t)
-  external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @bs.send.pipe(: t) external fillInPlace: elt => t = "fill"
-  @bs.send.pipe(: t) external fillFromInPlace: (elt, ~from: int) => t = "fill"
-  @bs.send.pipe(: t) external fillRangeInPlace: (elt, ~start: int, ~end_: int) => t = "fill"
-
-  @bs.send.pipe(: t) external reverseInPlace: t = "reverse"
-
-  @bs.send.pipe(: t) external sortInPlace: t = "sort"
-  @bs.send.pipe(: t) external sortInPlaceWith: ((. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @bs.send.pipe(: t) external includes: elt => bool = "includes" /* ES2016 */
-
-  @bs.send.pipe(: t) external indexOf: elt => int = "indexOf"
-  @bs.send.pipe(: t) external indexOfFrom: (elt, ~from: int) => int = "indexOf"
-
-  @bs.send.pipe(: t) external join: string = "join"
-  @bs.send.pipe(: t) external joinWith: string => string = "join"
-
-  @bs.send.pipe(: t) external lastIndexOf: elt => int = "lastIndexOf"
-  @bs.send.pipe(: t) external lastIndexOfFrom: (elt, ~from: int) => int = "lastIndexOf"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external slice: (~start: int, ~end_: int) => t = "slice"
-
-  @bs.send.pipe(: t) external copy: t = "slice"
-  @bs.send.pipe(: t) external sliceFrom: int => t = "slice"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external subarray: (~start: int, ~end_: int) => t = "subarray"
-
-  @bs.send.pipe(: t) external subarrayFrom: int => t = "subarray"
-
-  @bs.send.pipe(: t) external toString: string = "toString"
-  @bs.send.pipe(: t) external toLocaleString: string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : (int * elt) array_iter = "" [@@bs.send.pipe: t]
- */
-  @bs.send.pipe(: t) external every: ((. elt) => bool) => bool = "every"
-  @bs.send.pipe(: t) external everyi: ((. elt, int) => bool) => bool = "every"
-
-  @bs.send.pipe(: t) external filter: ((. elt) => bool) => t = "filter"
-  @bs.send.pipe(: t) external filteri: ((. elt, int) => bool) => t = "filter"
-
-  @bs.send.pipe(: t) external find: ((. elt) => bool) => Js.undefined<elt> = "find"
-  @bs.send.pipe(: t) external findi: ((. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @bs.send.pipe(: t) external findIndex: ((. elt) => bool) => int = "findIndex"
-  @bs.send.pipe(: t) external findIndexi: ((. elt, int) => bool) => int = "findIndex"
-
-  @bs.send.pipe(: t) external forEach: ((. elt) => unit) => unit = "forEach"
-  @bs.send.pipe(: t) external forEachi: ((. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : int array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external map: ((. elt) => 'b) => typed_array<'b> = "map"
-  @bs.send.pipe(: t) external mapi: ((. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @bs.send.pipe(: t) external reduce: ((. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @bs.send.pipe(: t) external reducei: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @bs.send.pipe(: t) external reduceRight: ((. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @bs.send.pipe(: t) external reduceRighti: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @bs.send.pipe(: t) external some: ((. elt) => bool) => bool = "some"
-  @bs.send.pipe(: t) external somei: ((. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Uint16Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Uint16Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Uint16Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Uint16Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Uint16Array"
-
-  @new external fromLength: int => t = "Uint16Array"
-  @val external from: array_like<elt> => t = "Uint16Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Int32Array = {
-  /** */
-  type elt = int
-  type typed_array<'a> = Js_typed_array2.Int32Array.typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @bs.send.pipe(: t) external setArray: array<elt> => unit = "set"
-  @bs.send.pipe(: t) external setArrayOffset: (array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @bs.send.pipe(: t) external copyWithin: (~to_: int) => t = "copyWithin"
-  @bs.send.pipe(: t) external copyWithinFrom: (~to_: int, ~from: int) => t = "copyWithin"
-  @bs.send.pipe(: t)
-  external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @bs.send.pipe(: t) external fillInPlace: elt => t = "fill"
-  @bs.send.pipe(: t) external fillFromInPlace: (elt, ~from: int) => t = "fill"
-  @bs.send.pipe(: t) external fillRangeInPlace: (elt, ~start: int, ~end_: int) => t = "fill"
-
-  @bs.send.pipe(: t) external reverseInPlace: t = "reverse"
-
-  @bs.send.pipe(: t) external sortInPlace: t = "sort"
-  @bs.send.pipe(: t) external sortInPlaceWith: ((. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @bs.send.pipe(: t) external includes: elt => bool = "includes" /* ES2016 */
-
-  @bs.send.pipe(: t) external indexOf: elt => int = "indexOf"
-  @bs.send.pipe(: t) external indexOfFrom: (elt, ~from: int) => int = "indexOf"
-
-  @bs.send.pipe(: t) external join: string = "join"
-  @bs.send.pipe(: t) external joinWith: string => string = "join"
-
-  @bs.send.pipe(: t) external lastIndexOf: elt => int = "lastIndexOf"
-  @bs.send.pipe(: t) external lastIndexOfFrom: (elt, ~from: int) => int = "lastIndexOf"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external slice: (~start: int, ~end_: int) => t = "slice"
-
-  @bs.send.pipe(: t) external copy: t = "slice"
-  @bs.send.pipe(: t) external sliceFrom: int => t = "slice"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external subarray: (~start: int, ~end_: int) => t = "subarray"
-
-  @bs.send.pipe(: t) external subarrayFrom: int => t = "subarray"
-
-  @bs.send.pipe(: t) external toString: string = "toString"
-  @bs.send.pipe(: t) external toLocaleString: string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : (int * elt) array_iter = "" [@@bs.send.pipe: t]
- */
-  @bs.send.pipe(: t) external every: ((. elt) => bool) => bool = "every"
-  @bs.send.pipe(: t) external everyi: ((. elt, int) => bool) => bool = "every"
-
-  @bs.send.pipe(: t) external filter: ((. elt) => bool) => t = "filter"
-  @bs.send.pipe(: t) external filteri: ((. elt, int) => bool) => t = "filter"
-
-  @bs.send.pipe(: t) external find: ((. elt) => bool) => Js.undefined<elt> = "find"
-  @bs.send.pipe(: t) external findi: ((. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @bs.send.pipe(: t) external findIndex: ((. elt) => bool) => int = "findIndex"
-  @bs.send.pipe(: t) external findIndexi: ((. elt, int) => bool) => int = "findIndex"
-
-  @bs.send.pipe(: t) external forEach: ((. elt) => unit) => unit = "forEach"
-  @bs.send.pipe(: t) external forEachi: ((. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : int array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external map: ((. elt) => 'b) => typed_array<'b> = "map"
-  @bs.send.pipe(: t) external mapi: ((. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @bs.send.pipe(: t) external reduce: ((. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @bs.send.pipe(: t) external reducei: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @bs.send.pipe(: t) external reduceRight: ((. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @bs.send.pipe(: t) external reduceRighti: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @bs.send.pipe(: t) external some: ((. elt) => bool) => bool = "some"
-  @bs.send.pipe(: t) external somei: ((. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Int32Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Int32Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Int32Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Int32Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Int32Array"
-
-  @new external fromLength: int => t = "Int32Array"
-  @val external from: array_like<elt> => t = "Int32Array.from"
-  /* *Array.of is redundant, use make */
-  @new @deprecated("use `make` instead") external create: array<int> => t = "Int32Array"
-  @new @deprecated("use `fromBuffer` instead") external of_buffer: array_buffer => t = "Int32Array"
-}
-module Int32_array = Int32Array
-
-module Uint32Array = {
-  /** */
-  type elt = int
-  type typed_array<'a> = Js_typed_array2.Uint32Array.typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @bs.send.pipe(: t) external setArray: array<elt> => unit = "set"
-  @bs.send.pipe(: t) external setArrayOffset: (array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @bs.send.pipe(: t) external copyWithin: (~to_: int) => t = "copyWithin"
-  @bs.send.pipe(: t) external copyWithinFrom: (~to_: int, ~from: int) => t = "copyWithin"
-  @bs.send.pipe(: t)
-  external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @bs.send.pipe(: t) external fillInPlace: elt => t = "fill"
-  @bs.send.pipe(: t) external fillFromInPlace: (elt, ~from: int) => t = "fill"
-  @bs.send.pipe(: t) external fillRangeInPlace: (elt, ~start: int, ~end_: int) => t = "fill"
-
-  @bs.send.pipe(: t) external reverseInPlace: t = "reverse"
-
-  @bs.send.pipe(: t) external sortInPlace: t = "sort"
-  @bs.send.pipe(: t) external sortInPlaceWith: ((. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @bs.send.pipe(: t) external includes: elt => bool = "includes" /* ES2016 */
-
-  @bs.send.pipe(: t) external indexOf: elt => int = "indexOf"
-  @bs.send.pipe(: t) external indexOfFrom: (elt, ~from: int) => int = "indexOf"
-
-  @bs.send.pipe(: t) external join: string = "join"
-  @bs.send.pipe(: t) external joinWith: string => string = "join"
-
-  @bs.send.pipe(: t) external lastIndexOf: elt => int = "lastIndexOf"
-  @bs.send.pipe(: t) external lastIndexOfFrom: (elt, ~from: int) => int = "lastIndexOf"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external slice: (~start: int, ~end_: int) => t = "slice"
-
-  @bs.send.pipe(: t) external copy: t = "slice"
-  @bs.send.pipe(: t) external sliceFrom: int => t = "slice"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external subarray: (~start: int, ~end_: int) => t = "subarray"
-
-  @bs.send.pipe(: t) external subarrayFrom: int => t = "subarray"
-
-  @bs.send.pipe(: t) external toString: string = "toString"
-  @bs.send.pipe(: t) external toLocaleString: string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : (int * elt) array_iter = "" [@@bs.send.pipe: t]
- */
-  @bs.send.pipe(: t) external every: ((. elt) => bool) => bool = "every"
-  @bs.send.pipe(: t) external everyi: ((. elt, int) => bool) => bool = "every"
-
-  @bs.send.pipe(: t) external filter: ((. elt) => bool) => t = "filter"
-  @bs.send.pipe(: t) external filteri: ((. elt, int) => bool) => t = "filter"
-
-  @bs.send.pipe(: t) external find: ((. elt) => bool) => Js.undefined<elt> = "find"
-  @bs.send.pipe(: t) external findi: ((. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @bs.send.pipe(: t) external findIndex: ((. elt) => bool) => int = "findIndex"
-  @bs.send.pipe(: t) external findIndexi: ((. elt, int) => bool) => int = "findIndex"
-
-  @bs.send.pipe(: t) external forEach: ((. elt) => unit) => unit = "forEach"
-  @bs.send.pipe(: t) external forEachi: ((. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : int array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external map: ((. elt) => 'b) => typed_array<'b> = "map"
-  @bs.send.pipe(: t) external mapi: ((. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @bs.send.pipe(: t) external reduce: ((. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @bs.send.pipe(: t) external reducei: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @bs.send.pipe(: t) external reduceRight: ((. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @bs.send.pipe(: t) external reduceRighti: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @bs.send.pipe(: t) external some: ((. elt) => bool) => bool = "some"
-  @bs.send.pipe(: t) external somei: ((. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Uint32Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Uint32Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Uint32Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Uint32Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Uint32Array"
-
-  @new external fromLength: int => t = "Uint32Array"
-  @val external from: array_like<elt> => t = "Uint32Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-/*
- it still return number, `float` in this case
-*/
-module Float32Array = {
-  /** */
-  type elt = float
-  type typed_array<'a> = Js_typed_array2.Float32Array.typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @bs.send.pipe(: t) external setArray: array<elt> => unit = "set"
-  @bs.send.pipe(: t) external setArrayOffset: (array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @bs.send.pipe(: t) external copyWithin: (~to_: int) => t = "copyWithin"
-  @bs.send.pipe(: t) external copyWithinFrom: (~to_: int, ~from: int) => t = "copyWithin"
-  @bs.send.pipe(: t)
-  external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @bs.send.pipe(: t) external fillInPlace: elt => t = "fill"
-  @bs.send.pipe(: t) external fillFromInPlace: (elt, ~from: int) => t = "fill"
-  @bs.send.pipe(: t) external fillRangeInPlace: (elt, ~start: int, ~end_: int) => t = "fill"
-
-  @bs.send.pipe(: t) external reverseInPlace: t = "reverse"
-
-  @bs.send.pipe(: t) external sortInPlace: t = "sort"
-  @bs.send.pipe(: t) external sortInPlaceWith: ((. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @bs.send.pipe(: t) external includes: elt => bool = "includes" /* ES2016 */
-
-  @bs.send.pipe(: t) external indexOf: elt => int = "indexOf"
-  @bs.send.pipe(: t) external indexOfFrom: (elt, ~from: int) => int = "indexOf"
-
-  @bs.send.pipe(: t) external join: string = "join"
-  @bs.send.pipe(: t) external joinWith: string => string = "join"
-
-  @bs.send.pipe(: t) external lastIndexOf: elt => int = "lastIndexOf"
-  @bs.send.pipe(: t) external lastIndexOfFrom: (elt, ~from: int) => int = "lastIndexOf"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external slice: (~start: int, ~end_: int) => t = "slice"
-
-  @bs.send.pipe(: t) external copy: t = "slice"
-  @bs.send.pipe(: t) external sliceFrom: int => t = "slice"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external subarray: (~start: int, ~end_: int) => t = "subarray"
-
-  @bs.send.pipe(: t) external subarrayFrom: int => t = "subarray"
-
-  @bs.send.pipe(: t) external toString: string = "toString"
-  @bs.send.pipe(: t) external toLocaleString: string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : (int * elt) array_iter = "" [@@bs.send.pipe: t]
- */
-  @bs.send.pipe(: t) external every: ((. elt) => bool) => bool = "every"
-  @bs.send.pipe(: t) external everyi: ((. elt, int) => bool) => bool = "every"
-
-  @bs.send.pipe(: t) external filter: ((. elt) => bool) => t = "filter"
-  @bs.send.pipe(: t) external filteri: ((. elt, int) => bool) => t = "filter"
-
-  @bs.send.pipe(: t) external find: ((. elt) => bool) => Js.undefined<elt> = "find"
-  @bs.send.pipe(: t) external findi: ((. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @bs.send.pipe(: t) external findIndex: ((. elt) => bool) => int = "findIndex"
-  @bs.send.pipe(: t) external findIndexi: ((. elt, int) => bool) => int = "findIndex"
-
-  @bs.send.pipe(: t) external forEach: ((. elt) => unit) => unit = "forEach"
-  @bs.send.pipe(: t) external forEachi: ((. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : int array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external map: ((. elt) => 'b) => typed_array<'b> = "map"
-  @bs.send.pipe(: t) external mapi: ((. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @bs.send.pipe(: t) external reduce: ((. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @bs.send.pipe(: t) external reducei: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @bs.send.pipe(: t) external reduceRight: ((. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @bs.send.pipe(: t) external reduceRighti: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @bs.send.pipe(: t) external some: ((. elt) => bool) => bool = "some"
-  @bs.send.pipe(: t) external somei: ((. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Float32Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Float32Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Float32Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Float32Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Float32Array"
-
-  @new external fromLength: int => t = "Float32Array"
-  @val external from: array_like<elt> => t = "Float32Array.from"
-  /* *Array.of is redundant, use make */
-  @new @deprecated("use `make` instead") external create: array<float> => t = "Float32Array"
-  @new @deprecated("use `fromBuffer` instead")
-  external of_buffer: array_buffer => t = "Float32Array"
-}
-module Float32_array = Float32Array
-
-module Float64Array = {
-  /** */
-  type elt = float
-  type typed_array<'a> = Js_typed_array2.Float64Array.typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @bs.send.pipe(: t) external setArray: array<elt> => unit = "set"
-  @bs.send.pipe(: t) external setArrayOffset: (array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @bs.send.pipe(: t) external copyWithin: (~to_: int) => t = "copyWithin"
-  @bs.send.pipe(: t) external copyWithinFrom: (~to_: int, ~from: int) => t = "copyWithin"
-  @bs.send.pipe(: t)
-  external copyWithinFromRange: (~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @bs.send.pipe(: t) external fillInPlace: elt => t = "fill"
-  @bs.send.pipe(: t) external fillFromInPlace: (elt, ~from: int) => t = "fill"
-  @bs.send.pipe(: t) external fillRangeInPlace: (elt, ~start: int, ~end_: int) => t = "fill"
-
-  @bs.send.pipe(: t) external reverseInPlace: t = "reverse"
-
-  @bs.send.pipe(: t) external sortInPlace: t = "sort"
-  @bs.send.pipe(: t) external sortInPlaceWith: ((. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @bs.send.pipe(: t) external includes: elt => bool = "includes" /* ES2016 */
-
-  @bs.send.pipe(: t) external indexOf: elt => int = "indexOf"
-  @bs.send.pipe(: t) external indexOfFrom: (elt, ~from: int) => int = "indexOf"
-
-  @bs.send.pipe(: t) external join: string = "join"
-  @bs.send.pipe(: t) external joinWith: string => string = "join"
-
-  @bs.send.pipe(: t) external lastIndexOf: elt => int = "lastIndexOf"
-  @bs.send.pipe(: t) external lastIndexOfFrom: (elt, ~from: int) => int = "lastIndexOf"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external slice: (~start: int, ~end_: int) => t = "slice"
-
-  @bs.send.pipe(: t) external copy: t = "slice"
-  @bs.send.pipe(: t) external sliceFrom: int => t = "slice"
-
-  @bs.send.pipe(: t) /** `start` is inclusive, `end_` exclusive */
-  external subarray: (~start: int, ~end_: int) => t = "subarray"
-
-  @bs.send.pipe(: t) external subarrayFrom: int => t = "subarray"
-
-  @bs.send.pipe(: t) external toString: string = "toString"
-  @bs.send.pipe(: t) external toLocaleString: string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : (int * elt) array_iter = "" [@@bs.send.pipe: t]
- */
-  @bs.send.pipe(: t) external every: ((. elt) => bool) => bool = "every"
-  @bs.send.pipe(: t) external everyi: ((. elt, int) => bool) => bool = "every"
-
-  @bs.send.pipe(: t) external filter: ((. elt) => bool) => t = "filter"
-  @bs.send.pipe(: t) external filteri: ((. elt, int) => bool) => t = "filter"
-
-  @bs.send.pipe(: t) external find: ((. elt) => bool) => Js.undefined<elt> = "find"
-  @bs.send.pipe(: t) external findi: ((. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @bs.send.pipe(: t) external findIndex: ((. elt) => bool) => int = "findIndex"
-  @bs.send.pipe(: t) external findIndexi: ((. elt, int) => bool) => int = "findIndex"
-
-  @bs.send.pipe(: t) external forEach: ((. elt) => unit) => unit = "forEach"
-  @bs.send.pipe(: t) external forEachi: ((. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : int array_iter = "" [@@bs.send.pipe: t]
- */
-
-  @bs.send.pipe(: t) external map: ((. elt) => 'b) => typed_array<'b> = "map"
-  @bs.send.pipe(: t) external mapi: ((. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @bs.send.pipe(: t) external reduce: ((. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @bs.send.pipe(: t) external reducei: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @bs.send.pipe(: t) external reduceRight: ((. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @bs.send.pipe(: t) external reduceRighti: ((. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @bs.send.pipe(: t) external some: ((. elt) => bool) => bool = "some"
-  @bs.send.pipe(: t) external somei: ((. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Float64Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Float64Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Float64Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Float64Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Float64Array"
-
-  @new external fromLength: int => t = "Float64Array"
-  @val external from: array_like<elt> => t = "Float64Array.from"
-  /* *Array.of is redundant, use make */
-  @new @deprecated("use `make` instead") external create: array<float> => t = "Float64Array"
-  @new @deprecated("use `fromBuffer` instead")
-  external of_buffer: array_buffer => t = "Float64Array"
-}
-module Float64_array = Float64Array
-
-/**
-The DataView view provides a low-level interface for reading and writing
-multiple number types in an ArrayBuffer irrespective of the platform's endianness.
-
-**see** [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DataView)
-*/
-module DataView = {
-  type t = Js_typed_array2.DataView.t
-
-  @new external make: array_buffer => t = "DataView"
-  @new external fromBuffer: array_buffer => t = "DataView"
-  @new external fromBufferOffset: (array_buffer, int) => t = "DataView"
-  @new external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "DataView"
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external getInt8: (t, int) => int = "getInt8"
-  @send external getUint8: (t, int) => int = "getUint8"
-
-  @send external getInt16: (t, int) => int = "getInt16"
-  @send external getInt16LittleEndian: (t, int, @as(1) _) => int = "getInt16"
-
-  @send external getUint16: (t, int) => int = "getUint16"
-  @send external getUint16LittleEndian: (t, int, @as(1) _) => int = "getUint16"
-
-  @send external getInt32: (t, int) => int = "getInt32"
-  @send external getInt32LittleEndian: (t, int, @as(1) _) => int = "getInt32"
-
-  @send external getUint32: (t, int) => int = "getUint32"
-  @send external getUint32LittleEndian: (t, int, @as(1) _) => int = "getUint32"
-
-  @send external getFloat32: (t, int) => float = "getFloat32"
-  @send external getFloat32LittleEndian: (t, int, @as(1) _) => float = "getFloat32"
-
-  @send external getFloat64: (t, int) => float = "getFloat64"
-  @send external getFloat64LittleEndian: (t, int, @as(1) _) => float = "getFloat64"
-
-  @send external setInt8: (t, int, int) => unit = "setInt8"
-  @send external setUint8: (t, int, int) => unit = "setUint8"
-
-  @send external setInt16: (t, int, int) => unit = "setInt16"
-  @send external setInt16LittleEndian: (t, int, int, @as(1) _) => unit = "setInt16"
-
-  @send external setUint16: (t, int, int) => unit = "setUint16"
-  @send external setUint16LittleEndian: (t, int, int, @as(1) _) => unit = "setUint16"
-
-  @send external setInt32: (t, int, int) => unit = "setInt32"
-  @send external setInt32LittleEndian: (t, int, int, @as(1) _) => unit = "setInt32"
-
-  @send external setUint32: (t, int, int) => unit = "setUint32"
-  @send external setUint32LittleEndian: (t, int, int, @as(1) _) => unit = "setUint32"
-
-  @send external setFloat32: (t, int, float) => unit = "setFloat32"
-  @send external setFloat32LittleEndian: (t, int, float, @as(1) _) => unit = "setFloat32"
-
-  @send external setFloat64: (t, int, float) => unit = "setFloat64"
-  @send external setFloat64LittleEndian: (t, int, float, @as(1) _) => unit = "setFloat64"
-}
diff --git a/jscomp/others/js_typed_array2.res b/jscomp/others/js_typed_array2.res
deleted file mode 100644
index 93bae0e..0000000
--- a/jscomp/others/js_typed_array2.res
+++ /dev/null
@@ -1,1222 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-JavaScript Typed Array API
-
-**see** [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray)
-*/
-
-type array_buffer
-type array_like<'a> /* should be shared with js_array */
-
-module ArrayBuffer = {
-  /***
-  The underlying buffer that the typed arrays provide views of
-
-  **see** [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer)
-  */
-
-  type t = array_buffer
-
-  @new /** takes length. initializes elements to 0 */
-  external make: int => t = "ArrayBuffer"
-
-  /* ArrayBuffer.isView: seems pointless with a type system */
-  /* experimental
-  external transfer : array_buffer -> t = "ArrayBuffer.transfer" [@@bs.val]
-  external transferWithLength : array_buffer -> int -> t = "ArrayBuffer.transfer" [@@bs.val]
- */
-
-  @get external byteLength: t => int = "byteLength"
-
-  @send external slice: (t, ~start: int, ~end_: int) => array_buffer = "slice"
-  @send external sliceFrom: (t, int) => array_buffer = "slice"
-}
-
-/* commented out until bs has a plan for iterators
-  external values : t -> elt array_iter = "" [@@bs.send]
- */
-
-module Int8Array = {
-  /** */
-  type elt = int
-  type typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external setArray: (t, array<elt>) => unit = "set"
-  @send external setArrayOffset: (t, array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @send external copyWithin: (t, ~to_: int) => t = "copyWithin"
-  @send external copyWithinFrom: (t, ~to_: int, ~from: int) => t = "copyWithin"
-  @send external copyWithinFromRange: (t, ~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @send external fillInPlace: (t, elt) => t = "fill"
-  @send external fillFromInPlace: (t, elt, ~from: int) => t = "fill"
-  @send external fillRangeInPlace: (t, elt, ~start: int, ~end_: int) => t = "fill"
-
-  @send external reverseInPlace: t => t = "reverse"
-
-  @send external sortInPlace: t => t = "sort"
-  @send external sortInPlaceWith: (t, (. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @send external includes: (t, elt) => bool = "includes" /* ES2016 */
-
-  @send external indexOf: (t, elt) => int = "indexOf"
-  @send external indexOfFrom: (t, elt, ~from: int) => int = "indexOf"
-
-  @send external join: t => string = "join"
-  @send external joinWith: (t, string) => string = "join"
-
-  @send external lastIndexOf: (t, elt) => int = "lastIndexOf"
-  @send external lastIndexOfFrom: (t, elt, ~from: int) => int = "lastIndexOf"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external slice: (t, ~start: int, ~end_: int) => t = "slice"
-
-  @send external copy: t => t = "slice"
-  @send external sliceFrom: (t, int) => t = "slice"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external subarray: (t, ~start: int, ~end_: int) => t = "subarray"
-
-  @send external subarrayFrom: (t, int) => t = "subarray"
-
-  @send external toString: t => string = "toString"
-  @send external toLocaleString: t => string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : t -> (int * elt) array_iter = "" [@@bs.send]
- */
-  @send external every: (t, (. elt) => bool) => bool = "every"
-  @send external everyi: (t, (. elt, int) => bool) => bool = "every"
-
-  @send external filter: (t, (. elt) => bool) => t = "filter"
-  @send external filteri: (t, (. elt, int) => bool) => t = "filter"
-
-  @send external find: (t, (. elt) => bool) => Js.undefined<elt> = "find"
-  @send external findi: (t, (. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @send external findIndex: (t, (. elt) => bool) => int = "findIndex"
-  @send external findIndexi: (t, (. elt, int) => bool) => int = "findIndex"
-
-  @send external forEach: (t, (. elt) => unit) => unit = "forEach"
-  @send external forEachi: (t, (. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : t -> int array_iter = "" [@@bs.send]
- */
-
-  @send external map: (t, (. elt) => 'b) => typed_array<'b> = "map"
-  @send external mapi: (t, (. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @send external reduce: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @send external reducei: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @send external reduceRight: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @send external reduceRighti: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @send external some: (t, (. elt) => bool) => bool = "some"
-  @send external somei: (t, (. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Int8Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Int8Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Int8Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Int8Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Int8Array"
-
-  @new external fromLength: int => t = "Int8Array"
-  @val external from: array_like<elt> => t = "Int8Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Uint8Array = {
-  /** */
-  type elt = int
-  type typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external setArray: (t, array<elt>) => unit = "set"
-  @send external setArrayOffset: (t, array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @send external copyWithin: (t, ~to_: int) => t = "copyWithin"
-  @send external copyWithinFrom: (t, ~to_: int, ~from: int) => t = "copyWithin"
-  @send external copyWithinFromRange: (t, ~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @send external fillInPlace: (t, elt) => t = "fill"
-  @send external fillFromInPlace: (t, elt, ~from: int) => t = "fill"
-  @send external fillRangeInPlace: (t, elt, ~start: int, ~end_: int) => t = "fill"
-
-  @send external reverseInPlace: t => t = "reverse"
-
-  @send external sortInPlace: t => t = "sort"
-  @send external sortInPlaceWith: (t, (. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @send external includes: (t, elt) => bool = "includes" /* ES2016 */
-
-  @send external indexOf: (t, elt) => int = "indexOf"
-  @send external indexOfFrom: (t, elt, ~from: int) => int = "indexOf"
-
-  @send external join: t => string = "join"
-  @send external joinWith: (t, string) => string = "join"
-
-  @send external lastIndexOf: (t, elt) => int = "lastIndexOf"
-  @send external lastIndexOfFrom: (t, elt, ~from: int) => int = "lastIndexOf"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external slice: (t, ~start: int, ~end_: int) => t = "slice"
-
-  @send external copy: t => t = "slice"
-  @send external sliceFrom: (t, int) => t = "slice"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external subarray: (t, ~start: int, ~end_: int) => t = "subarray"
-
-  @send external subarrayFrom: (t, int) => t = "subarray"
-
-  @send external toString: t => string = "toString"
-  @send external toLocaleString: t => string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : t -> (int * elt) array_iter = "" [@@bs.send]
- */
-  @send external every: (t, (. elt) => bool) => bool = "every"
-  @send external everyi: (t, (. elt, int) => bool) => bool = "every"
-
-  @send external filter: (t, (. elt) => bool) => t = "filter"
-  @send external filteri: (t, (. elt, int) => bool) => t = "filter"
-
-  @send external find: (t, (. elt) => bool) => Js.undefined<elt> = "find"
-  @send external findi: (t, (. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @send external findIndex: (t, (. elt) => bool) => int = "findIndex"
-  @send external findIndexi: (t, (. elt, int) => bool) => int = "findIndex"
-
-  @send external forEach: (t, (. elt) => unit) => unit = "forEach"
-  @send external forEachi: (t, (. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : t -> int array_iter = "" [@@bs.send]
- */
-
-  @send external map: (t, (. elt) => 'b) => typed_array<'b> = "map"
-  @send external mapi: (t, (. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @send external reduce: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @send external reducei: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @send external reduceRight: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @send external reduceRighti: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @send external some: (t, (. elt) => bool) => bool = "some"
-  @send external somei: (t, (. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Uint8Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Uint8Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Uint8Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Uint8Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Uint8Array"
-
-  @new external fromLength: int => t = "Uint8Array"
-  @val external from: array_like<elt> => t = "Uint8Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Uint8ClampedArray = {
-  /** */
-  type elt = int
-  type typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external setArray: (t, array<elt>) => unit = "set"
-  @send external setArrayOffset: (t, array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @send external copyWithin: (t, ~to_: int) => t = "copyWithin"
-  @send external copyWithinFrom: (t, ~to_: int, ~from: int) => t = "copyWithin"
-  @send external copyWithinFromRange: (t, ~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @send external fillInPlace: (t, elt) => t = "fill"
-  @send external fillFromInPlace: (t, elt, ~from: int) => t = "fill"
-  @send external fillRangeInPlace: (t, elt, ~start: int, ~end_: int) => t = "fill"
-
-  @send external reverseInPlace: t => t = "reverse"
-
-  @send external sortInPlace: t => t = "sort"
-  @send external sortInPlaceWith: (t, (. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @send external includes: (t, elt) => bool = "includes" /* ES2016 */
-
-  @send external indexOf: (t, elt) => int = "indexOf"
-  @send external indexOfFrom: (t, elt, ~from: int) => int = "indexOf"
-
-  @send external join: t => string = "join"
-  @send external joinWith: (t, string) => string = "join"
-
-  @send external lastIndexOf: (t, elt) => int = "lastIndexOf"
-  @send external lastIndexOfFrom: (t, elt, ~from: int) => int = "lastIndexOf"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external slice: (t, ~start: int, ~end_: int) => t = "slice"
-
-  @send external copy: t => t = "slice"
-  @send external sliceFrom: (t, int) => t = "slice"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external subarray: (t, ~start: int, ~end_: int) => t = "subarray"
-
-  @send external subarrayFrom: (t, int) => t = "subarray"
-
-  @send external toString: t => string = "toString"
-  @send external toLocaleString: t => string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : t -> (int * elt) array_iter = "" [@@bs.send]
- */
-  @send external every: (t, (. elt) => bool) => bool = "every"
-  @send external everyi: (t, (. elt, int) => bool) => bool = "every"
-
-  @send external filter: (t, (. elt) => bool) => t = "filter"
-  @send external filteri: (t, (. elt, int) => bool) => t = "filter"
-
-  @send external find: (t, (. elt) => bool) => Js.undefined<elt> = "find"
-  @send external findi: (t, (. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @send external findIndex: (t, (. elt) => bool) => int = "findIndex"
-  @send external findIndexi: (t, (. elt, int) => bool) => int = "findIndex"
-
-  @send external forEach: (t, (. elt) => unit) => unit = "forEach"
-  @send external forEachi: (t, (. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : t -> int array_iter = "" [@@bs.send]
- */
-
-  @send external map: (t, (. elt) => 'b) => typed_array<'b> = "map"
-  @send external mapi: (t, (. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @send external reduce: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @send external reducei: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @send external reduceRight: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @send external reduceRighti: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @send external some: (t, (. elt) => bool) => bool = "some"
-  @send external somei: (t, (. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Uint8ClampedArray.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Uint8ClampedArray"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Uint8ClampedArray"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Uint8ClampedArray"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Uint8ClampedArray"
-
-  @new external fromLength: int => t = "Uint8ClampedArray"
-  @val external from: array_like<elt> => t = "Uint8ClampedArray.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Int16Array = {
-  /** */
-  type elt = int
-  type typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external setArray: (t, array<elt>) => unit = "set"
-  @send external setArrayOffset: (t, array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @send external copyWithin: (t, ~to_: int) => t = "copyWithin"
-  @send external copyWithinFrom: (t, ~to_: int, ~from: int) => t = "copyWithin"
-  @send external copyWithinFromRange: (t, ~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @send external fillInPlace: (t, elt) => t = "fill"
-  @send external fillFromInPlace: (t, elt, ~from: int) => t = "fill"
-  @send external fillRangeInPlace: (t, elt, ~start: int, ~end_: int) => t = "fill"
-
-  @send external reverseInPlace: t => t = "reverse"
-
-  @send external sortInPlace: t => t = "sort"
-  @send external sortInPlaceWith: (t, (. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @send external includes: (t, elt) => bool = "includes" /* ES2016 */
-
-  @send external indexOf: (t, elt) => int = "indexOf"
-  @send external indexOfFrom: (t, elt, ~from: int) => int = "indexOf"
-
-  @send external join: t => string = "join"
-  @send external joinWith: (t, string) => string = "join"
-
-  @send external lastIndexOf: (t, elt) => int = "lastIndexOf"
-  @send external lastIndexOfFrom: (t, elt, ~from: int) => int = "lastIndexOf"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external slice: (t, ~start: int, ~end_: int) => t = "slice"
-
-  @send external copy: t => t = "slice"
-  @send external sliceFrom: (t, int) => t = "slice"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external subarray: (t, ~start: int, ~end_: int) => t = "subarray"
-
-  @send external subarrayFrom: (t, int) => t = "subarray"
-
-  @send external toString: t => string = "toString"
-  @send external toLocaleString: t => string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : t -> (int * elt) array_iter = "" [@@bs.send]
- */
-  @send external every: (t, (. elt) => bool) => bool = "every"
-  @send external everyi: (t, (. elt, int) => bool) => bool = "every"
-
-  @send external filter: (t, (. elt) => bool) => t = "filter"
-  @send external filteri: (t, (. elt, int) => bool) => t = "filter"
-
-  @send external find: (t, (. elt) => bool) => Js.undefined<elt> = "find"
-  @send external findi: (t, (. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @send external findIndex: (t, (. elt) => bool) => int = "findIndex"
-  @send external findIndexi: (t, (. elt, int) => bool) => int = "findIndex"
-
-  @send external forEach: (t, (. elt) => unit) => unit = "forEach"
-  @send external forEachi: (t, (. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : t -> int array_iter = "" [@@bs.send]
- */
-
-  @send external map: (t, (. elt) => 'b) => typed_array<'b> = "map"
-  @send external mapi: (t, (. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @send external reduce: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @send external reducei: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @send external reduceRight: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @send external reduceRighti: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @send external some: (t, (. elt) => bool) => bool = "some"
-  @send external somei: (t, (. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Int16Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Int16Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Int16Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Int16Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Int16Array"
-
-  @new external fromLength: int => t = "Int16Array"
-  @val external from: array_like<elt> => t = "Int16Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Uint16Array = {
-  /** */
-  type elt = int
-  type typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external setArray: (t, array<elt>) => unit = "set"
-  @send external setArrayOffset: (t, array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @send external copyWithin: (t, ~to_: int) => t = "copyWithin"
-  @send external copyWithinFrom: (t, ~to_: int, ~from: int) => t = "copyWithin"
-  @send external copyWithinFromRange: (t, ~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @send external fillInPlace: (t, elt) => t = "fill"
-  @send external fillFromInPlace: (t, elt, ~from: int) => t = "fill"
-  @send external fillRangeInPlace: (t, elt, ~start: int, ~end_: int) => t = "fill"
-
-  @send external reverseInPlace: t => t = "reverse"
-
-  @send external sortInPlace: t => t = "sort"
-  @send external sortInPlaceWith: (t, (. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @send external includes: (t, elt) => bool = "includes" /* ES2016 */
-
-  @send external indexOf: (t, elt) => int = "indexOf"
-  @send external indexOfFrom: (t, elt, ~from: int) => int = "indexOf"
-
-  @send external join: t => string = "join"
-  @send external joinWith: (t, string) => string = "join"
-
-  @send external lastIndexOf: (t, elt) => int = "lastIndexOf"
-  @send external lastIndexOfFrom: (t, elt, ~from: int) => int = "lastIndexOf"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external slice: (t, ~start: int, ~end_: int) => t = "slice"
-
-  @send external copy: t => t = "slice"
-  @send external sliceFrom: (t, int) => t = "slice"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external subarray: (t, ~start: int, ~end_: int) => t = "subarray"
-
-  @send external subarrayFrom: (t, int) => t = "subarray"
-
-  @send external toString: t => string = "toString"
-  @send external toLocaleString: t => string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : t -> (int * elt) array_iter = "" [@@bs.send]
- */
-  @send external every: (t, (. elt) => bool) => bool = "every"
-  @send external everyi: (t, (. elt, int) => bool) => bool = "every"
-
-  @send external filter: (t, (. elt) => bool) => t = "filter"
-  @send external filteri: (t, (. elt, int) => bool) => t = "filter"
-
-  @send external find: (t, (. elt) => bool) => Js.undefined<elt> = "find"
-  @send external findi: (t, (. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @send external findIndex: (t, (. elt) => bool) => int = "findIndex"
-  @send external findIndexi: (t, (. elt, int) => bool) => int = "findIndex"
-
-  @send external forEach: (t, (. elt) => unit) => unit = "forEach"
-  @send external forEachi: (t, (. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : t -> int array_iter = "" [@@bs.send]
- */
-
-  @send external map: (t, (. elt) => 'b) => typed_array<'b> = "map"
-  @send external mapi: (t, (. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @send external reduce: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @send external reducei: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @send external reduceRight: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @send external reduceRighti: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @send external some: (t, (. elt) => bool) => bool = "some"
-  @send external somei: (t, (. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Uint16Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Uint16Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Uint16Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Uint16Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Uint16Array"
-
-  @new external fromLength: int => t = "Uint16Array"
-  @val external from: array_like<elt> => t = "Uint16Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Int32Array = {
-  /** */
-  type elt = int
-  type typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external setArray: (t, array<elt>) => unit = "set"
-  @send external setArrayOffset: (t, array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @send external copyWithin: (t, ~to_: int) => t = "copyWithin"
-  @send external copyWithinFrom: (t, ~to_: int, ~from: int) => t = "copyWithin"
-  @send external copyWithinFromRange: (t, ~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @send external fillInPlace: (t, elt) => t = "fill"
-  @send external fillFromInPlace: (t, elt, ~from: int) => t = "fill"
-  @send external fillRangeInPlace: (t, elt, ~start: int, ~end_: int) => t = "fill"
-
-  @send external reverseInPlace: t => t = "reverse"
-
-  @send external sortInPlace: t => t = "sort"
-  @send external sortInPlaceWith: (t, (. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @send external includes: (t, elt) => bool = "includes" /* ES2016 */
-
-  @send external indexOf: (t, elt) => int = "indexOf"
-  @send external indexOfFrom: (t, elt, ~from: int) => int = "indexOf"
-
-  @send external join: t => string = "join"
-  @send external joinWith: (t, string) => string = "join"
-
-  @send external lastIndexOf: (t, elt) => int = "lastIndexOf"
-  @send external lastIndexOfFrom: (t, elt, ~from: int) => int = "lastIndexOf"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external slice: (t, ~start: int, ~end_: int) => t = "slice"
-
-  @send external copy: t => t = "slice"
-  @send external sliceFrom: (t, int) => t = "slice"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external subarray: (t, ~start: int, ~end_: int) => t = "subarray"
-
-  @send external subarrayFrom: (t, int) => t = "subarray"
-
-  @send external toString: t => string = "toString"
-  @send external toLocaleString: t => string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : t -> (int * elt) array_iter = "" [@@bs.send]
- */
-  @send external every: (t, (. elt) => bool) => bool = "every"
-  @send external everyi: (t, (. elt, int) => bool) => bool = "every"
-
-  @send external filter: (t, (. elt) => bool) => t = "filter"
-  @send external filteri: (t, (. elt, int) => bool) => t = "filter"
-
-  @send external find: (t, (. elt) => bool) => Js.undefined<elt> = "find"
-  @send external findi: (t, (. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @send external findIndex: (t, (. elt) => bool) => int = "findIndex"
-  @send external findIndexi: (t, (. elt, int) => bool) => int = "findIndex"
-
-  @send external forEach: (t, (. elt) => unit) => unit = "forEach"
-  @send external forEachi: (t, (. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : t -> int array_iter = "" [@@bs.send]
- */
-
-  @send external map: (t, (. elt) => 'b) => typed_array<'b> = "map"
-  @send external mapi: (t, (. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @send external reduce: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @send external reducei: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @send external reduceRight: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @send external reduceRighti: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @send external some: (t, (. elt) => bool) => bool = "some"
-  @send external somei: (t, (. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Int32Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Int32Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Int32Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Int32Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Int32Array"
-
-  @new external fromLength: int => t = "Int32Array"
-  @val external from: array_like<elt> => t = "Int32Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Uint32Array = {
-  /** */
-  type elt = int
-  type typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external setArray: (t, array<elt>) => unit = "set"
-  @send external setArrayOffset: (t, array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @send external copyWithin: (t, ~to_: int) => t = "copyWithin"
-  @send external copyWithinFrom: (t, ~to_: int, ~from: int) => t = "copyWithin"
-  @send external copyWithinFromRange: (t, ~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @send external fillInPlace: (t, elt) => t = "fill"
-  @send external fillFromInPlace: (t, elt, ~from: int) => t = "fill"
-  @send external fillRangeInPlace: (t, elt, ~start: int, ~end_: int) => t = "fill"
-
-  @send external reverseInPlace: t => t = "reverse"
-
-  @send external sortInPlace: t => t = "sort"
-  @send external sortInPlaceWith: (t, (. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @send external includes: (t, elt) => bool = "includes" /* ES2016 */
-
-  @send external indexOf: (t, elt) => int = "indexOf"
-  @send external indexOfFrom: (t, elt, ~from: int) => int = "indexOf"
-
-  @send external join: t => string = "join"
-  @send external joinWith: (t, string) => string = "join"
-
-  @send external lastIndexOf: (t, elt) => int = "lastIndexOf"
-  @send external lastIndexOfFrom: (t, elt, ~from: int) => int = "lastIndexOf"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external slice: (t, ~start: int, ~end_: int) => t = "slice"
-
-  @send external copy: t => t = "slice"
-  @send external sliceFrom: (t, int) => t = "slice"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external subarray: (t, ~start: int, ~end_: int) => t = "subarray"
-
-  @send external subarrayFrom: (t, int) => t = "subarray"
-
-  @send external toString: t => string = "toString"
-  @send external toLocaleString: t => string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : t -> (int * elt) array_iter = "" [@@bs.send]
- */
-  @send external every: (t, (. elt) => bool) => bool = "every"
-  @send external everyi: (t, (. elt, int) => bool) => bool = "every"
-
-  @send external filter: (t, (. elt) => bool) => t = "filter"
-  @send external filteri: (t, (. elt, int) => bool) => t = "filter"
-
-  @send external find: (t, (. elt) => bool) => Js.undefined<elt> = "find"
-  @send external findi: (t, (. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @send external findIndex: (t, (. elt) => bool) => int = "findIndex"
-  @send external findIndexi: (t, (. elt, int) => bool) => int = "findIndex"
-
-  @send external forEach: (t, (. elt) => unit) => unit = "forEach"
-  @send external forEachi: (t, (. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : t -> int array_iter = "" [@@bs.send]
- */
-
-  @send external map: (t, (. elt) => 'b) => typed_array<'b> = "map"
-  @send external mapi: (t, (. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @send external reduce: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @send external reducei: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @send external reduceRight: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @send external reduceRighti: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @send external some: (t, (. elt) => bool) => bool = "some"
-  @send external somei: (t, (. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Uint32Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Uint32Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Uint32Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Uint32Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Uint32Array"
-
-  @new external fromLength: int => t = "Uint32Array"
-  @val external from: array_like<elt> => t = "Uint32Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-/*
- it still return number, `float` in this case
-*/
-module Float32Array = {
-  /** */
-  type elt = float
-  type typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external setArray: (t, array<elt>) => unit = "set"
-  @send external setArrayOffset: (t, array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @send external copyWithin: (t, ~to_: int) => t = "copyWithin"
-  @send external copyWithinFrom: (t, ~to_: int, ~from: int) => t = "copyWithin"
-  @send external copyWithinFromRange: (t, ~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @send external fillInPlace: (t, elt) => t = "fill"
-  @send external fillFromInPlace: (t, elt, ~from: int) => t = "fill"
-  @send external fillRangeInPlace: (t, elt, ~start: int, ~end_: int) => t = "fill"
-
-  @send external reverseInPlace: t => t = "reverse"
-
-  @send external sortInPlace: t => t = "sort"
-  @send external sortInPlaceWith: (t, (. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @send external includes: (t, elt) => bool = "includes" /* ES2016 */
-
-  @send external indexOf: (t, elt) => int = "indexOf"
-  @send external indexOfFrom: (t, elt, ~from: int) => int = "indexOf"
-
-  @send external join: t => string = "join"
-  @send external joinWith: (t, string) => string = "join"
-
-  @send external lastIndexOf: (t, elt) => int = "lastIndexOf"
-  @send external lastIndexOfFrom: (t, elt, ~from: int) => int = "lastIndexOf"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external slice: (t, ~start: int, ~end_: int) => t = "slice"
-
-  @send external copy: t => t = "slice"
-  @send external sliceFrom: (t, int) => t = "slice"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external subarray: (t, ~start: int, ~end_: int) => t = "subarray"
-
-  @send external subarrayFrom: (t, int) => t = "subarray"
-
-  @send external toString: t => string = "toString"
-  @send external toLocaleString: t => string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : t -> (int * elt) array_iter = "" [@@bs.send]
- */
-  @send external every: (t, (. elt) => bool) => bool = "every"
-  @send external everyi: (t, (. elt, int) => bool) => bool = "every"
-
-  @send external filter: (t, (. elt) => bool) => t = "filter"
-  @send external filteri: (t, (. elt, int) => bool) => t = "filter"
-
-  @send external find: (t, (. elt) => bool) => Js.undefined<elt> = "find"
-  @send external findi: (t, (. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @send external findIndex: (t, (. elt) => bool) => int = "findIndex"
-  @send external findIndexi: (t, (. elt, int) => bool) => int = "findIndex"
-
-  @send external forEach: (t, (. elt) => unit) => unit = "forEach"
-  @send external forEachi: (t, (. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : t -> int array_iter = "" [@@bs.send]
- */
-
-  @send external map: (t, (. elt) => 'b) => typed_array<'b> = "map"
-  @send external mapi: (t, (. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @send external reduce: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @send external reducei: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @send external reduceRight: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @send external reduceRighti: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @send external some: (t, (. elt) => bool) => bool = "some"
-  @send external somei: (t, (. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Float32Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Float32Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Float32Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Float32Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Float32Array"
-
-  @new external fromLength: int => t = "Float32Array"
-  @val external from: array_like<elt> => t = "Float32Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-module Float64Array = {
-  /** */
-  type elt = float
-  type typed_array<'a>
-  type t = typed_array<elt>
-
-  @get_index external unsafe_get: (t, int) => elt = ""
-  @set_index external unsafe_set: (t, int, elt) => unit = ""
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external setArray: (t, array<elt>) => unit = "set"
-  @send external setArrayOffset: (t, array<elt>, int) => unit = "set"
-  /* There's also an overload for typed arrays, but don't know how to model that without subtyping */
-
-  /* Array interface(-ish) */
-  @get external length: t => int = "length"
-
-  /* Mutator functions */
-  @send external copyWithin: (t, ~to_: int) => t = "copyWithin"
-  @send external copyWithinFrom: (t, ~to_: int, ~from: int) => t = "copyWithin"
-  @send external copyWithinFromRange: (t, ~to_: int, ~start: int, ~end_: int) => t = "copyWithin"
-
-  @send external fillInPlace: (t, elt) => t = "fill"
-  @send external fillFromInPlace: (t, elt, ~from: int) => t = "fill"
-  @send external fillRangeInPlace: (t, elt, ~start: int, ~end_: int) => t = "fill"
-
-  @send external reverseInPlace: t => t = "reverse"
-
-  @send external sortInPlace: t => t = "sort"
-  @send external sortInPlaceWith: (t, (. elt, elt) => int) => t = "sort"
-
-  /* Accessor functions */
-  @send external includes: (t, elt) => bool = "includes" /* ES2016 */
-
-  @send external indexOf: (t, elt) => int = "indexOf"
-  @send external indexOfFrom: (t, elt, ~from: int) => int = "indexOf"
-
-  @send external join: t => string = "join"
-  @send external joinWith: (t, string) => string = "join"
-
-  @send external lastIndexOf: (t, elt) => int = "lastIndexOf"
-  @send external lastIndexOfFrom: (t, elt, ~from: int) => int = "lastIndexOf"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external slice: (t, ~start: int, ~end_: int) => t = "slice"
-
-  @send external copy: t => t = "slice"
-  @send external sliceFrom: (t, int) => t = "slice"
-
-  @send /** `start` is inclusive, `end_` exclusive */
-  external subarray: (t, ~start: int, ~end_: int) => t = "subarray"
-
-  @send external subarrayFrom: (t, int) => t = "subarray"
-
-  @send external toString: t => string = "toString"
-  @send external toLocaleString: t => string = "toLocaleString"
-
-  /* Iteration functions */
-  /* commented out until bs has a plan for iterators
-  external entries : t -> (int * elt) array_iter = "" [@@bs.send]
- */
-  @send external every: (t, (. elt) => bool) => bool = "every"
-  @send external everyi: (t, (. elt, int) => bool) => bool = "every"
-
-  @send external filter: (t, (. elt) => bool) => t = "filter"
-  @send external filteri: (t, (. elt, int) => bool) => t = "filter"
-
-  @send external find: (t, (. elt) => bool) => Js.undefined<elt> = "find"
-  @send external findi: (t, (. elt, int) => bool) => Js.undefined<elt> = "find"
-
-  @send external findIndex: (t, (. elt) => bool) => int = "findIndex"
-  @send external findIndexi: (t, (. elt, int) => bool) => int = "findIndex"
-
-  @send external forEach: (t, (. elt) => unit) => unit = "forEach"
-  @send external forEachi: (t, (. elt, int) => unit) => unit = "forEach"
-
-  /* commented out until bs has a plan for iterators
-  external keys : t -> int array_iter = "" [@@bs.send]
- */
-
-  @send external map: (t, (. elt) => 'b) => typed_array<'b> = "map"
-  @send external mapi: (t, (. elt, int) => 'b) => typed_array<'b> = "map"
-
-  @send external reduce: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduce"
-  @send external reducei: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduce"
-
-  @send external reduceRight: (t, (. 'b, elt) => 'b, 'b) => 'b = "reduceRight"
-  @send external reduceRighti: (t, (. 'b, elt, int) => 'b, 'b) => 'b = "reduceRight"
-
-  @send external some: (t, (. elt) => bool) => bool = "some"
-  @send external somei: (t, (. elt, int) => bool) => bool = "some"
-
-  @val external _BYTES_PER_ELEMENT: int = "Float64Array.BYTES_PER_ELEMENT"
-
-  @new external make: array<elt> => t = "Float64Array"
-  @new /** can throw */
-  external fromBuffer: array_buffer => t = "Float64Array"
-
-  @new 
-  /**
-  **raise** Js.Exn.Error raise Js exception
-
-  **param** offset is in bytes
-  */
-  external fromBufferOffset: (array_buffer, int) => t = "Float64Array"
-
-  @new
-  /**
-  **raise** Js.Exn.Error raises Js exception
-
-  **param** offset is in bytes, length in elements
-  */
-  external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "Float64Array"
-
-  @new external fromLength: int => t = "Float64Array"
-  @val external from: array_like<elt> => t = "Float64Array.from"
-  /* *Array.of is redundant, use make */
-}
-
-/**
-The DataView view provides a low-level interface for reading and writing
-multiple number types in an ArrayBuffer irrespective of the platform's endianness.
-
-**see** [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DataView)
-*/
-module DataView = {
-  type t
-
-  @new external make: array_buffer => t = "DataView"
-  @new external fromBuffer: array_buffer => t = "DataView"
-  @new external fromBufferOffset: (array_buffer, int) => t = "DataView"
-  @new external fromBufferRange: (array_buffer, ~offset: int, ~length: int) => t = "DataView"
-
-  @get external buffer: t => array_buffer = "buffer"
-  @get external byteLength: t => int = "byteLength"
-  @get external byteOffset: t => int = "byteOffset"
-
-  @send external getInt8: (t, int) => int = "getInt8"
-  @send external getUint8: (t, int) => int = "getUint8"
-
-  @send external getInt16: (t, int) => int = "getInt16"
-  @send external getInt16LittleEndian: (t, int, @as(1) _) => int = "getInt16"
-
-  @send external getUint16: (t, int) => int = "getUint16"
-  @send external getUint16LittleEndian: (t, int, @as(1) _) => int = "getUint16"
-
-  @send external getInt32: (t, int) => int = "getInt32"
-  @send external getInt32LittleEndian: (t, int, @as(1) _) => int = "getInt32"
-
-  @send external getUint32: (t, int) => int = "getUint32"
-  @send external getUint32LittleEndian: (t, int, @as(1) _) => int = "getUint32"
-
-  @send external getFloat32: (t, int) => float = "getFloat32"
-  @send external getFloat32LittleEndian: (t, int, @as(1) _) => float = "getFloat32"
-
-  @send external getFloat64: (t, int) => float = "getFloat64"
-  @send external getFloat64LittleEndian: (t, int, @as(1) _) => float = "getFloat64"
-
-  @send external setInt8: (t, int, int) => unit = "setInt8"
-  @send external setUint8: (t, int, int) => unit = "setUint8"
-
-  @send external setInt16: (t, int, int) => unit = "setInt16"
-  @send external setInt16LittleEndian: (t, int, int, @as(1) _) => unit = "setInt16"
-
-  @send external setUint16: (t, int, int) => unit = "setUint16"
-  @send external setUint16LittleEndian: (t, int, int, @as(1) _) => unit = "setUint16"
-
-  @send external setInt32: (t, int, int) => unit = "setInt32"
-  @send external setInt32LittleEndian: (t, int, int, @as(1) _) => unit = "setInt32"
-
-  @send external setUint32: (t, int, int) => unit = "setUint32"
-  @send external setUint32LittleEndian: (t, int, int, @as(1) _) => unit = "setUint32"
-
-  @send external setFloat32: (t, int, float) => unit = "setFloat32"
-  @send external setFloat32LittleEndian: (t, int, float, @as(1) _) => unit = "setFloat32"
-
-  @send external setFloat64: (t, int, float) => unit = "setFloat64"
-  @send external setFloat64LittleEndian: (t, int, float, @as(1) _) => unit = "setFloat64"
-}
diff --git a/jscomp/others/js_types.res b/jscomp/others/js_types.res
deleted file mode 100644
index 9048765..0000000
--- a/jscomp/others/js_types.res
+++ /dev/null
@@ -1,101 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/** Js symbol type only available in ES6 */
-type symbol
-
-/** Js bigint type only available in ES2020 */
-type bigint_val = bigint
-
-type obj_val
-/** This type has only one value `undefined` */
-type undefined_val
-
-/** This type has only one value `null` */
-type null_val
-
-type function_val
-
-type rec t<_> =
-  | Undefined: t<undefined_val>
-  | Null: t<null_val>
-  | Boolean: t<bool>
-  | Number: t<float>
-  | String: t<string>
-  | Function: t<function_val>
-  | Object: t<obj_val>
-  | Symbol: t<symbol>
-  | BigInt: t<bigint_val>
-
-type tagged_t =
-  | JSFalse
-  | JSTrue
-  | JSNull
-  | JSUndefined
-  | JSNumber(float)
-  | JSString(string)
-  | JSFunction(function_val)
-  | JSObject(obj_val)
-  | JSSymbol(symbol)
-  | JSBigInt(bigint_val)
-
-let classify = (x: 'a): tagged_t => {
-  let ty = Js.typeof(x)
-  if ty == "undefined" {
-    JSUndefined
-  } else if x === Obj.magic(Js_null.empty) {
-    JSNull
-  } else if ty == "number" {
-    JSNumber(Obj.magic(x))
-  } else if ty == "bigint" {
-    JSBigInt(Obj.magic(x))
-  } else if ty == "string" {
-    JSString(Obj.magic(x))
-  } else if ty == "boolean" {
-    if Obj.magic(x) == true {
-      JSTrue
-    } else {
-      JSFalse
-    }
-  } else if ty == "symbol" {
-    JSSymbol(Obj.magic(x))
-  } else if ty == "function" {
-    JSFunction(Obj.magic(x))
-  } else {
-    JSObject(Obj.magic(x))
-  }
-}
-
-let test = (type a, x: 'a, v: t<a>): bool =>
-  switch v {
-  | Number => Js.typeof(x) == "number"
-  | Boolean => Js.typeof(x) == "boolean"
-  | Undefined => Js.typeof(x) == "undefined"
-  | Null => x === Obj.magic(Js_null.empty)
-  | String => Js.typeof(x) == "string"
-  | Function => Js.typeof(x) == "function"
-  | Object => Js.typeof(x) == "object"
-  | Symbol => Js.typeof(x) == "symbol"
-  | BigInt => Js.typeof(x) == "bigint"
-  }
diff --git a/jscomp/others/js_types.resi b/jscomp/others/js_types.resi
deleted file mode 100644
index f267cd2..0000000
--- a/jscomp/others/js_types.resi
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Provide utilities for manipulating JS types. */
-
-/** Js symbol type (only available in ES6) */
-type symbol
-
-/** Js bigint type only available in ES2020 */
-type bigint_val
-
-type obj_val
-
-/** This type has only one value `undefined` */
-type undefined_val
-
-/** This type has only one value `null` */
-type null_val
-
-type function_val
-
-type rec t<_> =
-  | Undefined: t<undefined_val>
-  | Null: t<null_val>
-  | Boolean: t<bool>
-  | Number: t<float>
-  | String: t<string>
-  | Function: t<function_val>
-  | Object: t<obj_val>
-  | Symbol: t<symbol>
-  | BigInt: t<bigint_val>
-
-/**
-`test(value, t)` returns `true` if `value` is `typeof t`, otherwise `false`.
-This is useful for doing runtime reflection on any given value.
-
-## Examples
-
-```rescript
-test("test", String) == true
-test(() => true, Function) == true
-test("test", Boolean) == false
-```
-*/
-let test: ('a, t<'b>) => bool
-
-type tagged_t =
-  | JSFalse
-  | JSTrue
-  | JSNull
-  | JSUndefined
-  | JSNumber(float)
-  | JSString(string)
-  | JSFunction(function_val)
-  | JSObject(obj_val)
-  | JSSymbol(symbol)
-  | JSBigInt(bigint_val)
-
-let classify: 'a => tagged_t
diff --git a/jscomp/others/js_undefined.res b/jscomp/others/js_undefined.res
deleted file mode 100644
index c35340c..0000000
--- a/jscomp/others/js_undefined.res
+++ /dev/null
@@ -1,61 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Provides functionality for dealing with the `'a Js.undefined` type */
-
-type t<+'a> = Js.undefined<'a>
-external to_opt: t<'a> => option<'a> = "#undefined_to_opt"
-external toOption: t<'a> => option<'a> = "#undefined_to_opt"
-external return: 'a => t<'a> = "%identity"
-
-external empty: t<'a> = "#undefined"
-let test: t<'a> => bool = x => x == empty
-let testAny: 'a => bool = x => Obj.magic(x) == empty
-external getUnsafe: t<'a> => 'a = "%identity"
-
-let getExn = f =>
-  switch toOption(f) {
-  | None => Js_exn.raiseError("Js.Undefined.getExn")
-  | Some(x) => x
-  }
-
-let bind = (x, f) =>
-  switch to_opt(x) {
-  | None => empty
-  | Some(x) => return(f(. x))
-  }
-
-let iter = (x, f) =>
-  switch to_opt(x) {
-  | None => ()
-  | Some(x) => f(. x)
-  }
-
-let fromOption = x =>
-  switch x {
-  | None => empty
-  | Some(x) => return(x)
-  }
-
-let from_opt = fromOption
diff --git a/jscomp/others/js_undefined.resi b/jscomp/others/js_undefined.resi
deleted file mode 100644
index cfa08b6..0000000
--- a/jscomp/others/js_undefined.resi
+++ /dev/null
@@ -1,95 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Provides functionality for dealing with the `Js.undefined<'a>` type */
-
-/** Local alias for `Js.undefined<'a>` */
-type t<+'a> = Js.undefined<'a>
-
-/** Constructs a value of `Js.undefined<'a>` containing a value of `'a`. */
-external return: 'a => t<'a> = "%identity"
-
-@deprecated("Use = Js.undefined directly")
-/** Returns `true` if the given value is empty (undefined), `false` otherwise. */
-let test: t<'a> => bool
-
-/**
-Returns `true` if the given value is empty (undefined).
-
-**since 1.6.1**
-*/
-let testAny: 'a => bool
-
-/** The empty value, `undefined` */
-external empty: t<'a> = "#undefined"
-
-external getUnsafe: t<'a> => 'a = "%identity"
-let getExn: t<'a> => 'a
-
-/**
-Maps the contained value using the given function.
-If `Js.undefined<'a>` contains a value, that value is unwrapped, mapped to a
-`'b` using the given function `a' => 'b`, then wrapped back up and returned as
-`Js.undefined<'b>`.
-
-## Examples
-
-```rescript
-let maybeGreetWorld = (maybeGreeting: Js.undefined<string>) =>
-  Js.Undefined.bind(maybeGreeting, (. greeting) => greeting ++ " world!")
-```
-*/
-let bind: (t<'a>, (. 'a) => 'b) => t<'b>
-
-/**
-Iterates over the contained value with the given function. If
-`Js.undefined<'a>` contains a value, that value is unwrapped and applied to the
-given function.
-
-## Examples
-
-```rescript
-let maybeSay = (maybeMessage: Js.undefined<string>) =>
-  Js.Undefined.iter(maybeMessage, (. message) => Js.log(message))
-```
-*/
-let iter: (t<'a>, (. 'a) => unit) => unit
-
-/**
-Maps `option<'a>` to `Js.undefined<'a>`.
-`Some(a)` => `a`
-`None` => `empty`
-*/
-let fromOption: option<'a> => t<'a>
-
-@deprecated("Use fromOption instead") let from_opt: option<'a> => t<'a>
-
-/**
-Maps `Js.undefined<'a>` to `option<'a>`
-`a` => `Some(a)`
-`empty` => `None`
-*/
-external toOption: t<'a> => option<'a> = "#undefined_to_opt"
-
-@deprecated("use toOption instead") external to_opt: t<'a> => option<'a> = "#undefined_to_opt"
diff --git a/jscomp/others/js_vector.res b/jscomp/others/js_vector.res
deleted file mode 100644
index 15b1ff0..0000000
--- a/jscomp/others/js_vector.res
+++ /dev/null
@@ -1,149 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t<'a> = array<'a>
-
-external length: array<'a> => int = "%array_length"
-external get: (array<'a>, int) => 'a = "%array_safe_get"
-external set: (array<'a>, int, 'a) => unit = "%array_safe_set"
-external make: (int, 'a) => array<'a> = "?make_vect"
-external unsafe_get: (t<'a>, int) => 'a = "%array_unsafe_get"
-external unsafe_set: (t<'a>, int, 'a) => unit = "%array_unsafe_set"
-
-/** 
-**param** a array
-
-**param** p predicate
-*/
-let filterInPlace = (p, a) => {
-  let i = ref(0)
-  let j = ref(0)
-  while i.contents < Js_array2.length(a) {
-    let v = Js_array2.unsafe_get(a, i.contents)
-    if p(. v) {
-      Js_array2.unsafe_set(a, j.contents, v)
-      j.contents = j.contents + 1
-    }
-    i.contents = i.contents + 1
-  }
-  Js_array2.removeFromInPlace(a, ~pos=j.contents)->ignore
-}
-
-let empty = a => Js_array2.removeFromInPlace(a, ~pos=0)->ignore
-
-let pushBack = (x, xs) => Js_array2.push(xs, x)->ignore
-
-/** Find by JS (===)  equality */
-let memByRef = (x, xs) => Js_array2.indexOf(xs, x) >= 0
-
-let iter = (f, xs) =>
-  for i in 0 to Js_array2.length(xs) - 1 {
-    f(. Js_array2.unsafe_get(xs, i))
-  }
-
-let iteri = (f, a) =>
-  for i in 0 to length(a) - 1 {
-    f(. i, unsafe_get(a, i))
-  }
-
-@new external createUnsafe: int => t<'a> = "Array"
-
-/* let ofList xs = */
-/* match xs with */
-/* | [] -> [||] */
-/* | l -> */
-/* let a = createUnsafe (Js_list.length l) in */
-/* let rec fill i = function */
-/* | [] -> a */
-/* | hd::tl -> Array.unsafe_set a i hd; fill (i+1) tl in */
-/* fill 0 l */
-
-let toList = a => {
-  let rec tolist = (i, res) =>
-    if i < 0 {
-      res
-    } else {
-      tolist(i - 1, list{unsafe_get(a, i), ...res})
-    }
-  tolist(length(a) - 1, list{})
-}
-
-let init = (n, f) => {
-  let v = createUnsafe(n)
-  for i in 0 to n - 1 {
-    unsafe_set(v, i, f(. i))
-  }
-  v
-}
-
-let copy = x => {
-  let len = length(x)
-  let b = createUnsafe(len)
-  for i in 0 to len - 1 {
-    unsafe_set(b, i, unsafe_get(x, i))
-  }
-  b
-}
-
-let map = (f, a) => {
-  let l = Js_array2.length(a)
-  let r = createUnsafe(l)
-  for i in 0 to l - 1 {
-    unsafe_set(r, i, f(. unsafe_get(a, i)))
-  }
-  r
-}
-
-let foldLeft = (f, x, a) => {
-  let r = ref(x)
-  for i in 0 to length(a) - 1 {
-    r.contents = f(. r.contents, unsafe_get(a, i))
-  }
-  r.contents
-}
-
-let foldRight = (f, a, x) => {
-  let r = ref(x)
-  for i in length(a) - 1 downto 0 {
-    r.contents = f(. unsafe_get(a, i), r.contents)
-  }
-  r.contents
-}
-
-let mapi = (f, a) => {
-  let l = length(a)
-  if l == 0 {
-    []
-  } else {
-    let r = createUnsafe(l)
-    for i in 0 to l - 1 {
-      unsafe_set(r, i, f(. i, unsafe_get(a, i)))
-    }
-    r
-  }
-}
-
-let append = (x, a) => Js_array2.concat(a, [x])
-
-/* TODO: add `append` */
diff --git a/jscomp/others/js_vector.resi b/jscomp/others/js_vector.resi
deleted file mode 100644
index 6218e9a..0000000
--- a/jscomp/others/js_vector.resi
+++ /dev/null
@@ -1,92 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@@deprecated("Use Belt.Array instead")
-
-type t<'a> = array<'a>
-
-let filterInPlace: ((. 'a) => bool, t<'a>) => unit
-let empty: t<'a> => unit
-let pushBack: ('a, t<'a>) => unit
-
-/** shallow copy */
-let copy: t<'a> => t<'a>
-
-let memByRef: ('a, t<'a>) => bool
-let iter: ((. 'a) => unit, t<'a>) => unit
-let iteri: ((. int, 'a) => unit, t<'a>) => unit
-
-/* [@@deprecated "Use Js.List.toVector instead"] */
-/* val ofList : 'a list -> 'a t */
-/* removed, we choose that [`Js.List`]() depends on Vector to avoid cylic dependency
- */
-
-let toList: t<'a> => list<'a>
-let map: ((. 'a) => 'b, t<'a>) => t<'b>
-let mapi: ((. int, 'a) => 'b, t<'a>) => t<'b>
-let foldLeft: ((. 'a, 'b) => 'a, 'a, t<'b>) => 'a
-let foldRight: ((. 'b, 'a) => 'a, t<'b>, 'a) => 'a
-
-/** Return the length (number of elements) of the given array. */
-external length: t<'a> => int = "%array_length"
-
-/**
-`Vector.get(a, n)` returns the element number `n` of vector `a`. The first
-element has number 0. The last element has number `Vector.length(a) - 1`. You
-can also write `a[n]` instead of `Vector.get(a, n)`. Raise `Invalid_argument
-"index out of bounds"` if `n` is outside the range 0 to (`Array.length(a) -
-1`).
-*/
-external get: (t<'a>, int) => 'a = "%array_safe_get"
-
-/**
-`Vector.set(a, n, x)` modifies vector `a` in place, replacing element number
-`n` with `x`. Raise `Invalid_argument "index out of bounds"` if `n` is outside
-the range 0 to `Array.length(a) - 1`.
-*/
-external set: (t<'a>, int, 'a) => unit = "%array_safe_set"
-
-/**
-`Vector.make(n, x)` returns a fresh vector of length `n`, initialized with `x`.
-All the elements of this new vector are initially physically equal to `x` (in
-the sense of the `==` predicate). Consequently, if `x` is mutable, it is shared
-among all elements of the array, and modifying `x` through one of the array
-entries will modify all other entries at the same time. Raise
-`Invalid_argument` if `n < 0` or `n > Sys.max_array_length`. If the value of
-`x` is a floating-point number, then the maximum size is only
-`Sys.max_array_length / 2`.
-*/
-external make: (int, 'a) => t<'a> = "?make_vect"
-
-/**
-Raises `RangeError` when n is negative.
-n : size
-*/
-let init: (int, (. int) => 'a) => t<'a>
-
-/** `append(x, a)` returns a fresh vector with `x` appended to `a`. */
-let append: ('a, t<'a>) => t<'a>
-
-external unsafe_get: (t<'a>, int) => 'a = "%array_unsafe_get"
-external unsafe_set: (t<'a>, int, 'a) => unit = "%array_unsafe_set"
diff --git a/jscomp/others/js_weakmap.res b/jscomp/others/js_weakmap.res
deleted file mode 100644
index 926ceaf..0000000
--- a/jscomp/others/js_weakmap.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/*** ES6 WeakMap API */
-
-type t<'k, 'v>
diff --git a/jscomp/others/js_weakset.res b/jscomp/others/js_weakset.res
deleted file mode 100644
index e9652c4..0000000
--- a/jscomp/others/js_weakset.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/*** ES6 WeakSet API */
-
-type t<'a>
diff --git a/jscomp/others/jsxC.res b/jscomp/others/jsxC.res
deleted file mode 100644
index d7e08eb..0000000
--- a/jscomp/others/jsxC.res
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 2022- Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Internal: use Jsx directly. */
-
-type element
-type ref
-
-@val external null: element = "null"
-
-external float: float => element = "%identity"
-external int: int => element = "%identity"
-external string: string => element = "%identity"
-
-external array: array<element> => element = "%identity"
-
-type componentLike<'props, 'return> = 'props => 'return
-type component<'props> = componentLike<'props, element>
-
-/* this function exists to prepare for making `component` abstract */
-external component: componentLike<'props, element> => component<'props> = "%identity"
diff --git a/jscomp/others/jsxDOMC.res b/jscomp/others/jsxDOMC.res
deleted file mode 100644
index c1d7098..0000000
--- a/jscomp/others/jsxDOMC.res
+++ /dev/null
@@ -1,622 +0,0 @@
-/* Copyright (C) 2022- Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Internal: use JsxDOM directly. */
-
-type style = JsxDOMStyle.t
-type domRef
-
-/*
-  This list isn't exhaustive. We'll add more as we go.
-*/
-type domProps = {
-  key?: string,
-  children?: JsxC.element,
-  ref?: domRef,
-  /* accessibility */
-  /* https://www.w3.org/TR/wai-aria-1.1/ */
-  /* https://accessibilityresources.org/<aria-tag> is a great resource for these */
-  @as("aria-current")
-  ariaCurrent?: [#page | #step | #location | #date | #time | #"true" | #"false"],
-  @as("aria-details")
-  ariaDetails?: string,
-  @as("aria-disabled")
-  ariaDisabled?: bool,
-  @as("aria-hidden")
-  ariaHidden?: bool,
-  @as("aria-invalid") ariaInvalid?: [#grammar | #"false" | #spelling | #"true"],
-  @as("aria-keyshortcuts")
-  ariaKeyshortcuts?: string,
-  @as("aria-label")
-  ariaLabel?: string,
-  @as("aria-roledescription")
-  ariaRoledescription?: string,
-  /* Widget Attributes */
-  @as("aria-autocomplete") ariaAutocomplete?: [#inline | #list | #both | #none],
-  /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */
-  @as("aria-checked")
-  ariaChecked?: [#"true" | #"false" | #mixed],
-  @as("aria-expanded")
-  ariaExpanded?: bool,
-  @as("aria-haspopup")
-  ariaHaspopup?: [#menu | #listbox | #tree | #grid | #dialog | #"true" | #"false"],
-  @as("aria-level")
-  ariaLevel?: int,
-  @as("aria-modal")
-  ariaModal?: bool,
-  @as("aria-multiline")
-  ariaMultiline?: bool,
-  @as("aria-multiselectable")
-  ariaMultiselectable?: bool,
-  @as("aria-orientation") ariaOrientation?: [#horizontal | #vertical | #undefined],
-  @as("aria-placeholder")
-  ariaPlaceholder?: string,
-  /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */
-  @as("aria-pressed") ariaPressed?: [#"true" | #"false" | #mixed],
-  @as("aria-readonly")
-  ariaReadonly?: bool,
-  @as("aria-required")
-  ariaRequired?: bool,
-  @as("aria-selected")
-  ariaSelected?: bool,
-  @as("aria-sort")
-  ariaSort?: string,
-  @as("aria-valuemax")
-  ariaValuemax?: float,
-  @as("aria-valuemin")
-  ariaValuemin?: float,
-  @as("aria-valuenow")
-  ariaValuenow?: float,
-  @as("aria-valuetext")
-  ariaValuetext?: string,
-  /* Live Region Attributes */
-  @as("aria-atomic")
-  ariaAtomic?: bool,
-  @as("aria-busy")
-  ariaBusy?: bool,
-  @as("aria-live") ariaLive?: [#off | #polite | #assertive | #rude],
-  @as("aria-relevant")
-  ariaRelevant?: string,
-  /* Drag-and-Drop Attributes */
-  @as("aria-dropeffect") ariaDropeffect?: [#copy | #move | #link | #execute | #popup | #none],
-  @as("aria-grabbed")
-  ariaGrabbed?: bool,
-  /* Relationship Attributes */
-  @as("aria-activedescendant")
-  ariaActivedescendant?: string,
-  @as("aria-colcount")
-  ariaColcount?: int,
-  @as("aria-colindex")
-  ariaColindex?: int,
-  @as("aria-colspan")
-  ariaColspan?: int,
-  @as("aria-controls")
-  ariaControls?: string,
-  @as("aria-describedby")
-  ariaDescribedby?: string,
-  @as("aria-errormessage")
-  ariaErrormessage?: string,
-  @as("aria-flowto")
-  ariaFlowto?: string,
-  @as("aria-labelledby")
-  ariaLabelledby?: string,
-  @as("aria-owns")
-  ariaOwns?: string,
-  @as("aria-posinset")
-  ariaPosinset?: int,
-  @as("aria-rowcount")
-  ariaRowcount?: int,
-  @as("aria-rowindex")
-  ariaRowindex?: int,
-  @as("aria-rowspan")
-  ariaRowspan?: int,
-  @as("aria-setsize")
-  ariaSetsize?: int,
-  /* react textarea/input */
-  defaultChecked?: bool,
-  defaultValue?: string,
-  /* global html attributes */
-  accessKey?: string,
-  className?: string /* substitute for "class" */,
-  contentEditable?: bool,
-  contextMenu?: string,
-  @as("data-testid") dataTestId?: string,
-  dir?: string /* "ltr", "rtl" or "auto" */,
-  draggable?: bool,
-  hidden?: bool,
-  id?: string,
-  lang?: string,
-  role?: string /* ARIA role */,
-  style?: style,
-  spellCheck?: bool,
-  tabIndex?: int,
-  title?: string,
-  /* html5 microdata */
-  itemID?: string,
-  itemProp?: string,
-  itemRef?: string,
-  itemScope?: bool,
-  itemType?: string /* uri */,
-  /* tag-specific html attributes */
-  accept?: string,
-  acceptCharset?: string,
-  action?: string /* uri */,
-  allowFullScreen?: bool,
-  alt?: string,
-  @as("as")
-  as_?: string,
-  async?: bool,
-  autoComplete?: string /* has a fixed, but large-ish, set of possible values */,
-  autoCapitalize?: string /* Mobile Safari specific */,
-  autoFocus?: bool,
-  autoPlay?: bool,
-  challenge?: string,
-  charSet?: string,
-  checked?: bool,
-  cite?: string /* uri */,
-  crossOrigin?: string /* anonymous, use-credentials */,
-  cols?: int,
-  colSpan?: int,
-  content?: string,
-  controls?: bool,
-  coords?: string /* set of values specifying the coordinates of a region */,
-  data?: string /* uri */,
-  dateTime?: string /* "valid date string with optional time" */,
-  default?: bool,
-  defer?: bool,
-  disabled?: bool,
-  download?: string /* should really be either a boolean, signifying presence, or a string */,
-  encType?: string /* "application/x-www-form-urlencoded", "multipart/form-data" or "text/plain" */,
-  form?: string,
-  formAction?: string /* uri */,
-  formTarget?: string /* "_blank", "_self", etc. */,
-  formMethod?: string /* "post", "get", "put" */,
-  headers?: string,
-  height?: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  high?: int,
-  href?: string /* uri */,
-  hrefLang?: string,
-  htmlFor?: string /* substitute for "for" */,
-  httpEquiv?: string /* has a fixed set of possible values */,
-  icon?: string /* uri? */,
-  inputMode?: string /* "verbatim", "latin", "numeric", etc. */,
-  integrity?: string,
-  keyType?: string,
-  kind?: string /* has a fixed set of possible values */,
-  label?: string,
-  list?: string,
-  loading?: [#"lazy" | #eager],
-  loop?: bool,
-  low?: int,
-  manifest?: string /* uri */,
-  max?: string /* should be int or Js.Date.t */,
-  maxLength?: int,
-  media?: string /* a valid media query */,
-  mediaGroup?: string,
-  method?: string /* "post" or "get" */,
-  min?: string,
-  minLength?: int,
-  multiple?: bool,
-  muted?: bool,
-  name?: string,
-  nonce?: string,
-  noValidate?: bool,
-  @as("open")
-  open_?: bool /* use this one. Previous one is deprecated */,
-  optimum?: int,
-  pattern?: string /* valid Js RegExp */,
-  placeholder?: string,
-  playsInline?: bool,
-  poster?: string /* uri */,
-  preload?: string /* "none", "metadata" or "auto" (and "" as a synonym for "auto") */,
-  radioGroup?: string,
-  readOnly?: bool,
-  rel?: string /* a space- or comma-separated (depending on the element) list of a fixed set of "link types" */,
-  required?: bool,
-  reversed?: bool,
-  rows?: int,
-  rowSpan?: int,
-  sandbox?: string /* has a fixed set of possible values */,
-  scope?: string /* has a fixed set of possible values */,
-  scoped?: bool,
-  scrolling?: string /* html4 only, "auto", "yes" or "no" */,
-  /* seamless - supported by React, but removed from the html5 spec */
-  selected?: bool,
-  shape?: string,
-  size?: int,
-  sizes?: string,
-  span?: int,
-  src?: string /* uri */,
-  srcDoc?: string,
-  srcLang?: string,
-  srcSet?: string,
-  start?: int,
-  step?: float,
-  summary?: string /* deprecated */,
-  target?: string,
-  @as("type")
-  type_?: string /* has a fixed but large-ish set of possible values */ /* use this one. Previous one is deprecated */,
-  useMap?: string,
-  value?: string,
-  width?: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  wrap?: string /* "hard" or "soft" */,
-  /* Clipboard events */
-  onCopy?: JsxEventC.Clipboard.t => unit,
-  onCut?: JsxEventC.Clipboard.t => unit,
-  onPaste?: JsxEventC.Clipboard.t => unit,
-  /* Composition events */
-  onCompositionEnd?: JsxEventC.Composition.t => unit,
-  onCompositionStart?: JsxEventC.Composition.t => unit,
-  onCompositionUpdate?: JsxEventC.Composition.t => unit,
-  /* Keyboard events */
-  onKeyDown?: JsxEventC.Keyboard.t => unit,
-  onKeyPress?: JsxEventC.Keyboard.t => unit,
-  onKeyUp?: JsxEventC.Keyboard.t => unit,
-  /* Focus events */
-  onFocus?: JsxEventC.Focus.t => unit,
-  onBlur?: JsxEventC.Focus.t => unit,
-  /* Form events */
-  onBeforeInput?: JsxEventC.Form.t => unit,
-  onChange?: JsxEventC.Form.t => unit,
-  onInput?: JsxEventC.Form.t => unit,
-  onReset?: JsxEventC.Form.t => unit,
-  onSubmit?: JsxEventC.Form.t => unit,
-  onInvalid?: JsxEventC.Form.t => unit,
-  /* Mouse events */
-  onClick?: JsxEventC.Mouse.t => unit,
-  onContextMenu?: JsxEventC.Mouse.t => unit,
-  onDoubleClick?: JsxEventC.Mouse.t => unit,
-  onDrag?: JsxEventC.Mouse.t => unit,
-  onDragEnd?: JsxEventC.Mouse.t => unit,
-  onDragEnter?: JsxEventC.Mouse.t => unit,
-  onDragExit?: JsxEventC.Mouse.t => unit,
-  onDragLeave?: JsxEventC.Mouse.t => unit,
-  onDragOver?: JsxEventC.Mouse.t => unit,
-  onDragStart?: JsxEventC.Mouse.t => unit,
-  onDrop?: JsxEventC.Mouse.t => unit,
-  onMouseDown?: JsxEventC.Mouse.t => unit,
-  onMouseEnter?: JsxEventC.Mouse.t => unit,
-  onMouseLeave?: JsxEventC.Mouse.t => unit,
-  onMouseMove?: JsxEventC.Mouse.t => unit,
-  onMouseOut?: JsxEventC.Mouse.t => unit,
-  onMouseOver?: JsxEventC.Mouse.t => unit,
-  onMouseUp?: JsxEventC.Mouse.t => unit,
-  /* Selection events */
-  onSelect?: JsxEventC.Selection.t => unit,
-  /* Touch events */
-  onTouchCancel?: JsxEventC.Touch.t => unit,
-  onTouchEnd?: JsxEventC.Touch.t => unit,
-  onTouchMove?: JsxEventC.Touch.t => unit,
-  onTouchStart?: JsxEventC.Touch.t => unit,
-  // Pointer events
-  onPointerOver?: JsxEventC.Pointer.t => unit,
-  onPointerEnter?: JsxEventC.Pointer.t => unit,
-  onPointerDown?: JsxEventC.Pointer.t => unit,
-  onPointerMove?: JsxEventC.Pointer.t => unit,
-  onPointerUp?: JsxEventC.Pointer.t => unit,
-  onPointerCancel?: JsxEventC.Pointer.t => unit,
-  onPointerOut?: JsxEventC.Pointer.t => unit,
-  onPointerLeave?: JsxEventC.Pointer.t => unit,
-  onGotPointerCapture?: JsxEventC.Pointer.t => unit,
-  onLostPointerCapture?: JsxEventC.Pointer.t => unit,
-  /* UI events */
-  onScroll?: JsxEventC.UI.t => unit,
-  /* Wheel events */
-  onWheel?: JsxEventC.Wheel.t => unit,
-  /* Media events */
-  onAbort?: JsxEventC.Media.t => unit,
-  onCanPlay?: JsxEventC.Media.t => unit,
-  onCanPlayThrough?: JsxEventC.Media.t => unit,
-  onDurationChange?: JsxEventC.Media.t => unit,
-  onEmptied?: JsxEventC.Media.t => unit,
-  onEncrypted?: JsxEventC.Media.t => unit,
-  onEnded?: JsxEventC.Media.t => unit,
-  onError?: JsxEventC.Media.t => unit,
-  onLoadedData?: JsxEventC.Media.t => unit,
-  onLoadedMetadata?: JsxEventC.Media.t => unit,
-  onLoadStart?: JsxEventC.Media.t => unit,
-  onPause?: JsxEventC.Media.t => unit,
-  onPlay?: JsxEventC.Media.t => unit,
-  onPlaying?: JsxEventC.Media.t => unit,
-  onProgress?: JsxEventC.Media.t => unit,
-  onRateChange?: JsxEventC.Media.t => unit,
-  onSeeked?: JsxEventC.Media.t => unit,
-  onSeeking?: JsxEventC.Media.t => unit,
-  onStalled?: JsxEventC.Media.t => unit,
-  onSuspend?: JsxEventC.Media.t => unit,
-  onTimeUpdate?: JsxEventC.Media.t => unit,
-  onVolumeChange?: JsxEventC.Media.t => unit,
-  onWaiting?: JsxEventC.Media.t => unit,
-  /* Image events */
-  onLoad?: JsxEventC.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */,
-  /* Animation events */
-  onAnimationStart?: JsxEventC.Animation.t => unit,
-  onAnimationEnd?: JsxEventC.Animation.t => unit,
-  onAnimationIteration?: JsxEventC.Animation.t => unit,
-  /* Transition events */
-  onTransitionEnd?: JsxEventC.Transition.t => unit,
-  /* svg */
-  accentHeight?: string,
-  accumulate?: string,
-  additive?: string,
-  alignmentBaseline?: string,
-  allowReorder?: string,
-  alphabetic?: string,
-  amplitude?: string,
-  arabicForm?: string,
-  ascent?: string,
-  attributeName?: string,
-  attributeType?: string,
-  autoReverse?: string,
-  azimuth?: string,
-  baseFrequency?: string,
-  baseProfile?: string,
-  baselineShift?: string,
-  bbox?: string,
-  begin?: string,
-  @deprecated("Please use begin")
-  begin_?: string,
-  bias?: string,
-  by?: string,
-  calcMode?: string,
-  capHeight?: string,
-  clip?: string,
-  clipPath?: string,
-  clipPathUnits?: string,
-  clipRule?: string,
-  colorInterpolation?: string,
-  colorInterpolationFilters?: string,
-  colorProfile?: string,
-  colorRendering?: string,
-  contentScriptType?: string,
-  contentStyleType?: string,
-  cursor?: string,
-  cx?: string,
-  cy?: string,
-  d?: string,
-  decelerate?: string,
-  descent?: string,
-  diffuseConstant?: string,
-  direction?: string,
-  display?: string,
-  divisor?: string,
-  dominantBaseline?: string,
-  dur?: string,
-  dx?: string,
-  dy?: string,
-  edgeMode?: string,
-  elevation?: string,
-  enableBackground?: string,
-  end?: string,
-  @deprecated("Please use end")
-  end_?: string,
-  exponent?: string,
-  externalResourcesRequired?: string,
-  fill?: string,
-  fillOpacity?: string,
-  fillRule?: string,
-  filter?: string,
-  filterRes?: string,
-  filterUnits?: string,
-  floodColor?: string,
-  floodOpacity?: string,
-  focusable?: string,
-  fontFamily?: string,
-  fontSize?: string,
-  fontSizeAdjust?: string,
-  fontStretch?: string,
-  fontStyle?: string,
-  fontVariant?: string,
-  fontWeight?: string,
-  fomat?: string,
-  from?: string,
-  fx?: string,
-  fy?: string,
-  g1?: string,
-  g2?: string,
-  glyphName?: string,
-  glyphOrientationHorizontal?: string,
-  glyphOrientationVertical?: string,
-  glyphRef?: string,
-  gradientTransform?: string,
-  gradientUnits?: string,
-  hanging?: string,
-  horizAdvX?: string,
-  horizOriginX?: string,
-  ideographic?: string,
-  imageRendering?: string,
-  @as("in")
-  in_?: string /* use this one. Previous one is deprecated */,
-  in2?: string,
-  intercept?: string,
-  k?: string,
-  k1?: string,
-  k2?: string,
-  k3?: string,
-  k4?: string,
-  kernelMatrix?: string,
-  kernelUnitLength?: string,
-  kerning?: string,
-  keyPoints?: string,
-  keySplines?: string,
-  keyTimes?: string,
-  lengthAdjust?: string,
-  letterSpacing?: string,
-  lightingColor?: string,
-  limitingConeAngle?: string,
-  local?: string,
-  markerEnd?: string,
-  markerHeight?: string,
-  markerMid?: string,
-  markerStart?: string,
-  markerUnits?: string,
-  markerWidth?: string,
-  mask?: string,
-  maskContentUnits?: string,
-  maskUnits?: string,
-  mathematical?: string,
-  mode?: string,
-  numOctaves?: string,
-  offset?: string,
-  opacity?: string,
-  operator?: string,
-  order?: string,
-  orient?: string,
-  orientation?: string,
-  origin?: string,
-  overflow?: string,
-  overflowX?: string,
-  overflowY?: string,
-  overlinePosition?: string,
-  overlineThickness?: string,
-  paintOrder?: string,
-  panose1?: string,
-  pathLength?: string,
-  patternContentUnits?: string,
-  patternTransform?: string,
-  patternUnits?: string,
-  pointerEvents?: string,
-  points?: string,
-  pointsAtX?: string,
-  pointsAtY?: string,
-  pointsAtZ?: string,
-  preserveAlpha?: string,
-  preserveAspectRatio?: string,
-  primitiveUnits?: string,
-  r?: string,
-  radius?: string,
-  refX?: string,
-  refY?: string,
-  renderingIntent?: string,
-  repeatCount?: string,
-  repeatDur?: string,
-  requiredExtensions?: string,
-  requiredFeatures?: string,
-  restart?: string,
-  result?: string,
-  rotate?: string,
-  rx?: string,
-  ry?: string,
-  scale?: string,
-  seed?: string,
-  shapeRendering?: string,
-  slope?: string,
-  spacing?: string,
-  specularConstant?: string,
-  specularExponent?: string,
-  speed?: string,
-  spreadMethod?: string,
-  startOffset?: string,
-  stdDeviation?: string,
-  stemh?: string,
-  stemv?: string,
-  stitchTiles?: string,
-  stopColor?: string,
-  stopOpacity?: string,
-  strikethroughPosition?: string,
-  strikethroughThickness?: string,
-  string?: string,
-  stroke?: string,
-  strokeDasharray?: string,
-  strokeDashoffset?: string,
-  strokeLinecap?: string,
-  strokeLinejoin?: string,
-  strokeMiterlimit?: string,
-  strokeOpacity?: string,
-  strokeWidth?: string,
-  surfaceScale?: string,
-  systemLanguage?: string,
-  tableValues?: string,
-  targetX?: string,
-  targetY?: string,
-  textAnchor?: string,
-  textDecoration?: string,
-  textLength?: string,
-  textRendering?: string,
-  to?: string,
-  @deprecated("Please use to")
-  to_?: string,
-  transform?: string,
-  u1?: string,
-  u2?: string,
-  underlinePosition?: string,
-  underlineThickness?: string,
-  unicode?: string,
-  unicodeBidi?: string,
-  unicodeRange?: string,
-  unitsPerEm?: string,
-  vAlphabetic?: string,
-  vHanging?: string,
-  vIdeographic?: string,
-  vMathematical?: string,
-  values?: string,
-  vectorEffect?: string,
-  version?: string,
-  vertAdvX?: string,
-  vertAdvY?: string,
-  vertOriginX?: string,
-  vertOriginY?: string,
-  viewBox?: string,
-  viewTarget?: string,
-  visibility?: string,
-  /* width::string? => */
-  widths?: string,
-  wordSpacing?: string,
-  writingMode?: string,
-  x?: string,
-  x1?: string,
-  x2?: string,
-  xChannelSelector?: string,
-  xHeight?: string,
-  xlinkActuate?: string,
-  xlinkArcrole?: string,
-  xlinkHref?: string,
-  xlinkRole?: string,
-  xlinkShow?: string,
-  xlinkTitle?: string,
-  xlinkType?: string,
-  xmlns?: string,
-  xmlnsXlink?: string,
-  xmlBase?: string,
-  xmlLang?: string,
-  xmlSpace?: string,
-  y?: string,
-  y1?: string,
-  y2?: string,
-  yChannelSelector?: string,
-  z?: string,
-  zoomAndPan?: string,
-  /* RDFa */
-  about?: string,
-  datatype?: string,
-  inlist?: string,
-  prefix?: string,
-  property?: string,
-  resource?: string,
-  typeof?: string,
-  vocab?: string,
-  /* react-specific */
-  dangerouslySetInnerHTML?: {"__html": string},
-  suppressContentEditableWarning?: bool,
-}
diff --git a/jscomp/others/jsxDOMStyle.res b/jscomp/others/jsxDOMStyle.res
deleted file mode 100644
index 283607e..0000000
--- a/jscomp/others/jsxDOMStyle.res
+++ /dev/null
@@ -1,437 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = {
-  azimuth?: string,
-  backdropFilter?: string,
-  background?: string,
-  backgroundAttachment?: string,
-  backgroundColor?: string,
-  backgroundImage?: string,
-  backgroundPosition?: string,
-  backgroundRepeat?: string,
-  border?: string,
-  borderCollapse?: string,
-  borderColor?: string,
-  borderSpacing?: string,
-  borderStyle?: string,
-  borderTop?: string,
-  borderRight?: string,
-  borderBottom?: string,
-  borderLeft?: string,
-  borderTopColor?: string,
-  borderRightColor?: string,
-  borderBottomColor?: string,
-  borderLeftColor?: string,
-  borderTopStyle?: string,
-  borderRightStyle?: string,
-  borderBottomStyle?: string,
-  borderLeftStyle?: string,
-  borderTopWidth?: string,
-  borderRightWidth?: string,
-  borderBottomWidth?: string,
-  borderLeftWidth?: string,
-  borderWidth?: string,
-  bottom?: string,
-  captionSide?: string,
-  clear?: string,
-  clip?: string,
-  color?: string,
-  content?: string,
-  counterIncrement?: string,
-  counterReset?: string,
-  cue?: string,
-  cueAfter?: string,
-  cueBefore?: string,
-  cursor?: string,
-  direction?: string,
-  display?: string,
-  elevation?: string,
-  emptyCells?: string,
-  float?: string,
-  font?: string,
-  fontFamily?: string,
-  fontSize?: string,
-  fontSizeAdjust?: string,
-  fontStretch?: string,
-  fontStyle?: string,
-  fontVariant?: string,
-  fontWeight?: string,
-  height?: string,
-  left?: string,
-  letterSpacing?: string,
-  lineHeight?: string,
-  listStyle?: string,
-  listStyleImage?: string,
-  listStylePosition?: string,
-  listStyleType?: string,
-  margin?: string,
-  marginTop?: string,
-  marginRight?: string,
-  marginBottom?: string,
-  marginLeft?: string,
-  markerOffset?: string,
-  marks?: string,
-  maxHeight?: string,
-  maxWidth?: string,
-  minHeight?: string,
-  minWidth?: string,
-  orphans?: string,
-  outline?: string,
-  outlineColor?: string,
-  outlineStyle?: string,
-  outlineWidth?: string,
-  overflow?: string,
-  overflowX?: string,
-  overflowY?: string,
-  padding?: string,
-  paddingTop?: string,
-  paddingRight?: string,
-  paddingBottom?: string,
-  paddingLeft?: string,
-  page?: string,
-  pageBreakAfter?: string,
-  pageBreakBefore?: string,
-  pageBreakInside?: string,
-  pause?: string,
-  pauseAfter?: string,
-  pauseBefore?: string,
-  pitch?: string,
-  pitchRange?: string,
-  playDuring?: string,
-  position?: string,
-  quotes?: string,
-  richness?: string,
-  right?: string,
-  size?: string,
-  speak?: string,
-  speakHeader?: string,
-  speakNumeral?: string,
-  speakPunctuation?: string,
-  speechRate?: string,
-  stress?: string,
-  tableLayout?: string,
-  textAlign?: string,
-  textDecoration?: string,
-  textIndent?: string,
-  textShadow?: string,
-  textTransform?: string,
-  top?: string,
-  unicodeBidi?: string,
-  verticalAlign?: string,
-  visibility?: string,
-  voiceFamily?: string,
-  volume?: string,
-  whiteSpace?: string,
-  widows?: string,
-  width?: string,
-  wordSpacing?: string,
-  zIndex?: string,
-  /* Below properties based on https://www.w3.org/Style/CSS/all-properties */
-  /* Color Level 3 - REC */
-  opacity?: string,
-  /* Backgrounds and Borders Level 3 - CR */
-  /* backgroundRepeat - already defined by CSS2Properties */
-  /* backgroundAttachment - already defined by CSS2Properties */
-  backgroundOrigin?: string,
-  backgroundSize?: string,
-  backgroundClip?: string,
-  borderRadius?: string,
-  borderTopLeftRadius?: string,
-  borderTopRightRadius?: string,
-  borderBottomLeftRadius?: string,
-  borderBottomRightRadius?: string,
-  borderImage?: string,
-  borderImageSource?: string,
-  borderImageSlice?: string,
-  borderImageWidth?: string,
-  borderImageOutset?: string,
-  borderImageRepeat?: string,
-  boxShadow?: string,
-  columns?: string,
-  /* Multi-column Layout - CR */
-  columnCount?: string,
-  columnFill?: string,
-  columnGap?: string,
-  columnRule?: string,
-  columnRuleColor?: string,
-  columnRuleStyle?: string,
-  columnRuleWidth?: string,
-  columnSpan?: string,
-  columnWidth?: string,
-  breakAfter?: string,
-  breakBefore?: string,
-  breakInside?: string,
-  rest?: string,
-  /* Speech - CR */
-  restAfter?: string,
-  restBefore?: string,
-  speakAs?: string,
-  voiceBalance?: string,
-  voiceDuration?: string,
-  voicePitch?: string,
-  voiceRange?: string,
-  voiceRate?: string,
-  voiceStress?: string,
-  voiceVolume?: string,
-  objectFit?: string,
-  /* Image Values and Replaced Content Level 3 - CR */
-  objectPosition?: string,
-  imageResolution?: string,
-  imageOrientation?: string,
-  alignContent?: string,
-  /* Flexible Box Layout - CR */
-  alignItems?: string,
-  alignSelf?: string,
-  flex?: string,
-  flexBasis?: string,
-  flexDirection?: string,
-  flexFlow?: string,
-  flexGrow?: string,
-  flexShrink?: string,
-  flexWrap?: string,
-  justifyContent?: string,
-  order?: string,
-  gap?: string,
-  textDecorationColor?: string,
-  /* Text Decoration Level 3 - CR */
-  /* textDecoration - already defined by CSS2Properties */
-  textDecorationLine?: string,
-  textDecorationSkip?: string,
-  textDecorationStyle?: string,
-  textEmphasis?: string,
-  textEmphasisColor?: string,
-  textEmphasisPosition?: string,
-  textEmphasisStyle?: string,
-  textUnderlinePosition?: string,
-  /* textShadow - already defined by CSS2Properties */
-  fontFeatureSettings?: string,
-  /* Fonts Level 3 - CR */
-  fontKerning?: string,
-  fontLanguageOverride?: string,
-  fontSynthesis?: string,
-  /* fontSizeAdjust - already defined by CSS2Properties */
-  /* fontStretch - already defined by CSS2Properties */
-  forntVariantAlternates?: string,
-  fontVariantCaps?: string,
-  fontVariantEastAsian?: string,
-  fontVariantLigatures?: string,
-  fontVariantNumeric?: string,
-  fontVariantPosition?: string,
-  all?: string,
-  /* Cascading and Inheritance Level 3 - CR */
-  glyphOrientationVertical?: string,
-  /* Writing Modes Level 3 - CR */
-  textCombineUpright?: string,
-  textOrientation?: string,
-  writingMode?: string,
-  shapeImageThreshold?: string,
-  /* Shapes Level 1 - CR */
-  shapeMargin?: string,
-  shapeOutside?: string,
-  clipPath?: string,
-  /* Masking Level 1 - CR */
-  clipRule?: string,
-  mask?: string,
-  maskBorder?: string,
-  maskBorderMode?: string,
-  maskBorderOutset?: string,
-  maskBorderRepeat?: string,
-  maskBorderSlice?: string,
-  maskBorderSource?: string,
-  maskBorderWidth?: string,
-  maskClip?: string,
-  maskComposite?: string,
-  maskImage?: string,
-  maskMode?: string,
-  maskOrigin?: string,
-  maskPosition?: string,
-  maskRepeat?: string,
-  maskSize?: string,
-  maskType?: string,
-  backgroundBlendMode?: string,
-  /* Compositing and Blending Level 1 - CR */
-  isolation?: string,
-  mixBlendMode?: string,
-  boxDecorationBreak?: string,
-  /* Fragmentation Level 3 - CR */
-  boxSizing?: string,
-  /* breakAfter - already defined by Multi-column Layout */
-  /* breakBefore - already defined by Multi-column Layout */
-  /* breakInside - already defined by Multi-column Layout */
-  /* Basic User Interface Level 3 - CR */
-  caretColor?: string,
-  navDown?: string,
-  navLeft?: string,
-  navRight?: string,
-  navUp?: string,
-  outlineOffset?: string,
-  resize?: string,
-  textOverflow?: string,
-  grid?: string,
-  /* Grid Layout Level 1 - CR */
-  gridArea?: string,
-  gridAutoColumns?: string,
-  gridAutoFlow?: string,
-  gridAutoRows?: string,
-  gridColumn?: string,
-  gridColumnEnd?: string,
-  gridColumnGap?: string,
-  gridColumnStart?: string,
-  gridGap?: string,
-  gridRow?: string,
-  gridRowEnd?: string,
-  gridRowGap?: string,
-  gridRowStart?: string,
-  gridTemplate?: string,
-  gridTemplateAreas?: string,
-  gridTemplateColumns?: string,
-  gridTemplateRows?: string,
-  willChange?: string,
-  /* Will Change Level 1 - CR */
-  hangingPunctuation?: string,
-  /* Text Level 3 - LC */
-  hyphens?: string,
-  lineBreak?: string,
-  /* letterSpacing - already defined by CSS2Properties */
-  overflowWrap?: string,
-  tabSize?: string,
-  textAlignLast?: string,
-  /* textAlign - already defined by CSS2Properties */
-  textJustify?: string,
-  wordBreak?: string,
-  wordWrap?: string,
-  animation?: string,
-  /* Animations - WD */
-  animationDelay?: string,
-  animationDirection?: string,
-  animationDuration?: string,
-  animationFillMode?: string,
-  animationIterationCount?: string,
-  animationName?: string,
-  animationPlayState?: string,
-  animationTimingFunction?: string,
-  transition?: string,
-  /* Transitions - WD */
-  transitionDelay?: string,
-  transitionDuration?: string,
-  transitionProperty?: string,
-  transitionTimingFunction?: string,
-  backfaceVisibility?: string,
-  /* Transforms Level 1 - WD */
-  perspective?: string,
-  perspectiveOrigin?: string,
-  transform?: string,
-  transformOrigin?: string,
-  transformStyle?: string,
-  justifyItems?: string,
-  /* Box Alignment Level 3 - WD */
-  /* alignContent - already defined by Flexible Box Layout */
-  /* alignItems - already defined by Flexible Box Layout */
-  justifySelf?: string,
-  placeContent?: string,
-  placeItems?: string,
-  placeSelf?: string,
-  appearance?: string,
-  /* Basic User Interface Level 4 - FPWD */
-  caret?: string,
-  caretAnimation?: string,
-  caretShape?: string,
-  userSelect?: string,
-  maxLines?: string,
-  /* Overflow Level 3 - WD */
-  marqueeDirection?: string,
-  /* Basix Box Model - WD */
-  marqueeLoop?: string,
-  marqueeSpeed?: string,
-  marqueeStyle?: string,
-  overflowStyle?: string,
-  rotation?: string,
-  rotationPoint?: string,
-  alignmentBaseline?: string,
-  /* SVG 1.1 - REC */
-  baselineShift?: string,
-  colorInterpolation?: string,
-  colorInterpolationFilters?: string,
-  colorProfile?: string,
-  colorRendering?: string,
-  dominantBaseline?: string,
-  fill?: string,
-  fillOpacity?: string,
-  fillRule?: string,
-  filter?: string,
-  floodColor?: string,
-  floodOpacity?: string,
-  glyphOrientationHorizontal?: string,
-  imageRendering?: string,
-  kerning?: string,
-  lightingColor?: string,
-  markerEnd?: string,
-  markerMid?: string,
-  markerStart?: string,
-  pointerEvents?: string,
-  shapeRendering?: string,
-  stopColor?: string,
-  stopOpacity?: string,
-  stroke?: string,
-  strokeDasharray?: string,
-  strokeDashoffset?: string,
-  strokeLinecap?: string,
-  strokeLinejoin?: string,
-  strokeMiterlimit?: string,
-  strokeOpacity?: string,
-  strokeWidth?: string,
-  textAnchor?: string,
-  textRendering?: string,
-  rubyAlign?: string,
-  /* Ruby Layout Level 1 - WD */
-  rubyMerge?: string,
-  rubyPosition?: string,
-  /* Lists and Counters Level 3 - WD */
-  /* listStyle - already defined by CSS2Properties */
-  /* listStyleImage - already defined by CSS2Properties */
-  /* listStylePosition - already defined by CSS2Properties */
-  /* listStyleType - already defined by CSS2Properties */
-  /* counterIncrement - already defined by CSS2Properties */
-  /* counterReset - already defined by CSS2Properties */
-  /* Not added yet
-   * -------------
-   * Generated Content for Paged Media - WD
-   * Generated Content Level 3 - WD
-   * Line Grid Level 1 - WD
-   * Regions - WD
-   * Inline Layout Level 3 - WD
-   * Round Display Level 1 - WD
-   * Image Values and Replaced Content Level 4 - WD
-   * Positioned Layout Level 3 - WD
-   * Filter Effects Level 1 -  -WD
-   * Exclusions Level 1 - WD
-   * Text Level 4 - FPWD
-   * SVG Markers - FPWD
-   * Motion Path Level 1 - FPWD
-   * Color Level 4 - FPWD
-   * SVG Strokes - FPWD
-   * Table Level 3 - FPWD
-   */
-}
diff --git a/jscomp/others/jsxDOMU.res b/jscomp/others/jsxDOMU.res
deleted file mode 100644
index a427376..0000000
--- a/jscomp/others/jsxDOMU.res
+++ /dev/null
@@ -1,624 +0,0 @@
-/* Copyright (C) 2022- Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Internal: use JsxDOM directly. */
-
-@@uncurried
-
-type style = JsxDOMStyle.t
-type domRef
-
-/*
-  This list isn't exhaustive. We'll add more as we go.
-*/
-type domProps = {
-  key?: string,
-  children?: JsxU.element,
-  ref?: domRef,
-  /* accessibility */
-  /* https://www.w3.org/TR/wai-aria-1.1/ */
-  /* https://accessibilityresources.org/<aria-tag> is a great resource for these */
-  @as("aria-current")
-  ariaCurrent?: [#page | #step | #location | #date | #time | #"true" | #"false"],
-  @as("aria-details")
-  ariaDetails?: string,
-  @as("aria-disabled")
-  ariaDisabled?: bool,
-  @as("aria-hidden")
-  ariaHidden?: bool,
-  @as("aria-invalid") ariaInvalid?: [#grammar | #"false" | #spelling | #"true"],
-  @as("aria-keyshortcuts")
-  ariaKeyshortcuts?: string,
-  @as("aria-label")
-  ariaLabel?: string,
-  @as("aria-roledescription")
-  ariaRoledescription?: string,
-  /* Widget Attributes */
-  @as("aria-autocomplete") ariaAutocomplete?: [#inline | #list | #both | #none],
-  /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */
-  @as("aria-checked")
-  ariaChecked?: [#"true" | #"false" | #mixed],
-  @as("aria-expanded")
-  ariaExpanded?: bool,
-  @as("aria-haspopup")
-  ariaHaspopup?: [#menu | #listbox | #tree | #grid | #dialog | #"true" | #"false"],
-  @as("aria-level")
-  ariaLevel?: int,
-  @as("aria-modal")
-  ariaModal?: bool,
-  @as("aria-multiline")
-  ariaMultiline?: bool,
-  @as("aria-multiselectable")
-  ariaMultiselectable?: bool,
-  @as("aria-orientation") ariaOrientation?: [#horizontal | #vertical | #undefined],
-  @as("aria-placeholder")
-  ariaPlaceholder?: string,
-  /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */
-  @as("aria-pressed") ariaPressed?: [#"true" | #"false" | #mixed],
-  @as("aria-readonly")
-  ariaReadonly?: bool,
-  @as("aria-required")
-  ariaRequired?: bool,
-  @as("aria-selected")
-  ariaSelected?: bool,
-  @as("aria-sort")
-  ariaSort?: string,
-  @as("aria-valuemax")
-  ariaValuemax?: float,
-  @as("aria-valuemin")
-  ariaValuemin?: float,
-  @as("aria-valuenow")
-  ariaValuenow?: float,
-  @as("aria-valuetext")
-  ariaValuetext?: string,
-  /* Live Region Attributes */
-  @as("aria-atomic")
-  ariaAtomic?: bool,
-  @as("aria-busy")
-  ariaBusy?: bool,
-  @as("aria-live") ariaLive?: [#off | #polite | #assertive | #rude],
-  @as("aria-relevant")
-  ariaRelevant?: string,
-  /* Drag-and-Drop Attributes */
-  @as("aria-dropeffect") ariaDropeffect?: [#copy | #move | #link | #execute | #popup | #none],
-  @as("aria-grabbed")
-  ariaGrabbed?: bool,
-  /* Relationship Attributes */
-  @as("aria-activedescendant")
-  ariaActivedescendant?: string,
-  @as("aria-colcount")
-  ariaColcount?: int,
-  @as("aria-colindex")
-  ariaColindex?: int,
-  @as("aria-colspan")
-  ariaColspan?: int,
-  @as("aria-controls")
-  ariaControls?: string,
-  @as("aria-describedby")
-  ariaDescribedby?: string,
-  @as("aria-errormessage")
-  ariaErrormessage?: string,
-  @as("aria-flowto")
-  ariaFlowto?: string,
-  @as("aria-labelledby")
-  ariaLabelledby?: string,
-  @as("aria-owns")
-  ariaOwns?: string,
-  @as("aria-posinset")
-  ariaPosinset?: int,
-  @as("aria-rowcount")
-  ariaRowcount?: int,
-  @as("aria-rowindex")
-  ariaRowindex?: int,
-  @as("aria-rowspan")
-  ariaRowspan?: int,
-  @as("aria-setsize")
-  ariaSetsize?: int,
-  /* react textarea/input */
-  defaultChecked?: bool,
-  defaultValue?: string,
-  /* global html attributes */
-  accessKey?: string,
-  className?: string /* substitute for "class" */,
-  contentEditable?: bool,
-  contextMenu?: string,
-  @as("data-testid") dataTestId?: string,
-  dir?: string /* "ltr", "rtl" or "auto" */,
-  draggable?: bool,
-  hidden?: bool,
-  id?: string,
-  lang?: string,
-  role?: string /* ARIA role */,
-  style?: style,
-  spellCheck?: bool,
-  tabIndex?: int,
-  title?: string,
-  /* html5 microdata */
-  itemID?: string,
-  itemProp?: string,
-  itemRef?: string,
-  itemScope?: bool,
-  itemType?: string /* uri */,
-  /* tag-specific html attributes */
-  accept?: string,
-  acceptCharset?: string,
-  action?: string /* uri */,
-  allowFullScreen?: bool,
-  alt?: string,
-  @as("as")
-  as_?: string,
-  async?: bool,
-  autoComplete?: string /* has a fixed, but large-ish, set of possible values */,
-  autoCapitalize?: string /* Mobile Safari specific */,
-  autoFocus?: bool,
-  autoPlay?: bool,
-  challenge?: string,
-  charSet?: string,
-  checked?: bool,
-  cite?: string /* uri */,
-  crossOrigin?: string /* anonymous, use-credentials */,
-  cols?: int,
-  colSpan?: int,
-  content?: string,
-  controls?: bool,
-  coords?: string /* set of values specifying the coordinates of a region */,
-  data?: string /* uri */,
-  dateTime?: string /* "valid date string with optional time" */,
-  default?: bool,
-  defer?: bool,
-  disabled?: bool,
-  download?: string /* should really be either a boolean, signifying presence, or a string */,
-  encType?: string /* "application/x-www-form-urlencoded", "multipart/form-data" or "text/plain" */,
-  form?: string,
-  formAction?: string /* uri */,
-  formTarget?: string /* "_blank", "_self", etc. */,
-  formMethod?: string /* "post", "get", "put" */,
-  headers?: string,
-  height?: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  high?: int,
-  href?: string /* uri */,
-  hrefLang?: string,
-  htmlFor?: string /* substitute for "for" */,
-  httpEquiv?: string /* has a fixed set of possible values */,
-  icon?: string /* uri? */,
-  inputMode?: string /* "verbatim", "latin", "numeric", etc. */,
-  integrity?: string,
-  keyType?: string,
-  kind?: string /* has a fixed set of possible values */,
-  label?: string,
-  list?: string,
-  loading?: [#"lazy" | #eager],
-  loop?: bool,
-  low?: int,
-  manifest?: string /* uri */,
-  max?: string /* should be int or Js.Date.t */,
-  maxLength?: int,
-  media?: string /* a valid media query */,
-  mediaGroup?: string,
-  method?: string /* "post" or "get" */,
-  min?: string,
-  minLength?: int,
-  multiple?: bool,
-  muted?: bool,
-  name?: string,
-  nonce?: string,
-  noValidate?: bool,
-  @as("open")
-  open_?: bool /* use this one. Previous one is deprecated */,
-  optimum?: int,
-  pattern?: string /* valid Js RegExp */,
-  placeholder?: string,
-  playsInline?: bool,
-  poster?: string /* uri */,
-  preload?: string /* "none", "metadata" or "auto" (and "" as a synonym for "auto") */,
-  radioGroup?: string,
-  readOnly?: bool,
-  rel?: string /* a space- or comma-separated (depending on the element) list of a fixed set of "link types" */,
-  required?: bool,
-  reversed?: bool,
-  rows?: int,
-  rowSpan?: int,
-  sandbox?: string /* has a fixed set of possible values */,
-  scope?: string /* has a fixed set of possible values */,
-  scoped?: bool,
-  scrolling?: string /* html4 only, "auto", "yes" or "no" */,
-  /* seamless - supported by React, but removed from the html5 spec */
-  selected?: bool,
-  shape?: string,
-  size?: int,
-  sizes?: string,
-  span?: int,
-  src?: string /* uri */,
-  srcDoc?: string,
-  srcLang?: string,
-  srcSet?: string,
-  start?: int,
-  step?: float,
-  summary?: string /* deprecated */,
-  target?: string,
-  @as("type")
-  type_?: string /* has a fixed but large-ish set of possible values */ /* use this one. Previous one is deprecated */,
-  useMap?: string,
-  value?: string,
-  width?: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  wrap?: string /* "hard" or "soft" */,
-  /* Clipboard events */
-  onCopy?: JsxEventU.Clipboard.t => unit,
-  onCut?: JsxEventU.Clipboard.t => unit,
-  onPaste?: JsxEventU.Clipboard.t => unit,
-  /* Composition events */
-  onCompositionEnd?: JsxEventU.Composition.t => unit,
-  onCompositionStart?: JsxEventU.Composition.t => unit,
-  onCompositionUpdate?: JsxEventU.Composition.t => unit,
-  /* Keyboard events */
-  onKeyDown?: JsxEventU.Keyboard.t => unit,
-  onKeyPress?: JsxEventU.Keyboard.t => unit,
-  onKeyUp?: JsxEventU.Keyboard.t => unit,
-  /* Focus events */
-  onFocus?: JsxEventU.Focus.t => unit,
-  onBlur?: JsxEventU.Focus.t => unit,
-  /* Form events */
-  onBeforeInput?: JsxEventU.Form.t => unit,
-  onChange?: JsxEventU.Form.t => unit,
-  onInput?: JsxEventU.Form.t => unit,
-  onReset?: JsxEventU.Form.t => unit,
-  onSubmit?: JsxEventU.Form.t => unit,
-  onInvalid?: JsxEventU.Form.t => unit,
-  /* Mouse events */
-  onClick?: JsxEventU.Mouse.t => unit,
-  onContextMenu?: JsxEventU.Mouse.t => unit,
-  onDoubleClick?: JsxEventU.Mouse.t => unit,
-  onDrag?: JsxEventU.Mouse.t => unit,
-  onDragEnd?: JsxEventU.Mouse.t => unit,
-  onDragEnter?: JsxEventU.Mouse.t => unit,
-  onDragExit?: JsxEventU.Mouse.t => unit,
-  onDragLeave?: JsxEventU.Mouse.t => unit,
-  onDragOver?: JsxEventU.Mouse.t => unit,
-  onDragStart?: JsxEventU.Mouse.t => unit,
-  onDrop?: JsxEventU.Mouse.t => unit,
-  onMouseDown?: JsxEventU.Mouse.t => unit,
-  onMouseEnter?: JsxEventU.Mouse.t => unit,
-  onMouseLeave?: JsxEventU.Mouse.t => unit,
-  onMouseMove?: JsxEventU.Mouse.t => unit,
-  onMouseOut?: JsxEventU.Mouse.t => unit,
-  onMouseOver?: JsxEventU.Mouse.t => unit,
-  onMouseUp?: JsxEventU.Mouse.t => unit,
-  /* Selection events */
-  onSelect?: JsxEventU.Selection.t => unit,
-  /* Touch events */
-  onTouchCancel?: JsxEventU.Touch.t => unit,
-  onTouchEnd?: JsxEventU.Touch.t => unit,
-  onTouchMove?: JsxEventU.Touch.t => unit,
-  onTouchStart?: JsxEventU.Touch.t => unit,
-  // Pointer events
-  onPointerOver?: JsxEventU.Pointer.t => unit,
-  onPointerEnter?: JsxEventU.Pointer.t => unit,
-  onPointerDown?: JsxEventU.Pointer.t => unit,
-  onPointerMove?: JsxEventU.Pointer.t => unit,
-  onPointerUp?: JsxEventU.Pointer.t => unit,
-  onPointerCancel?: JsxEventU.Pointer.t => unit,
-  onPointerOut?: JsxEventU.Pointer.t => unit,
-  onPointerLeave?: JsxEventU.Pointer.t => unit,
-  onGotPointerCapture?: JsxEventU.Pointer.t => unit,
-  onLostPointerCapture?: JsxEventU.Pointer.t => unit,
-  /* UI events */
-  onScroll?: JsxEventU.UI.t => unit,
-  /* Wheel events */
-  onWheel?: JsxEventU.Wheel.t => unit,
-  /* Media events */
-  onAbort?: JsxEventU.Media.t => unit,
-  onCanPlay?: JsxEventU.Media.t => unit,
-  onCanPlayThrough?: JsxEventU.Media.t => unit,
-  onDurationChange?: JsxEventU.Media.t => unit,
-  onEmptied?: JsxEventU.Media.t => unit,
-  onEncrypted?: JsxEventU.Media.t => unit,
-  onEnded?: JsxEventU.Media.t => unit,
-  onError?: JsxEventU.Media.t => unit,
-  onLoadedData?: JsxEventU.Media.t => unit,
-  onLoadedMetadata?: JsxEventU.Media.t => unit,
-  onLoadStart?: JsxEventU.Media.t => unit,
-  onPause?: JsxEventU.Media.t => unit,
-  onPlay?: JsxEventU.Media.t => unit,
-  onPlaying?: JsxEventU.Media.t => unit,
-  onProgress?: JsxEventU.Media.t => unit,
-  onRateChange?: JsxEventU.Media.t => unit,
-  onSeeked?: JsxEventU.Media.t => unit,
-  onSeeking?: JsxEventU.Media.t => unit,
-  onStalled?: JsxEventU.Media.t => unit,
-  onSuspend?: JsxEventU.Media.t => unit,
-  onTimeUpdate?: JsxEventU.Media.t => unit,
-  onVolumeChange?: JsxEventU.Media.t => unit,
-  onWaiting?: JsxEventU.Media.t => unit,
-  /* Image events */
-  onLoad?: JsxEventU.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */,
-  /* Animation events */
-  onAnimationStart?: JsxEventU.Animation.t => unit,
-  onAnimationEnd?: JsxEventU.Animation.t => unit,
-  onAnimationIteration?: JsxEventU.Animation.t => unit,
-  /* Transition events */
-  onTransitionEnd?: JsxEventU.Transition.t => unit,
-  /* svg */
-  accentHeight?: string,
-  accumulate?: string,
-  additive?: string,
-  alignmentBaseline?: string,
-  allowReorder?: string,
-  alphabetic?: string,
-  amplitude?: string,
-  arabicForm?: string,
-  ascent?: string,
-  attributeName?: string,
-  attributeType?: string,
-  autoReverse?: string,
-  azimuth?: string,
-  baseFrequency?: string,
-  baseProfile?: string,
-  baselineShift?: string,
-  bbox?: string,
-  begin?: string,
-  @deprecated("Please use begin")
-  begin_?: string,
-  bias?: string,
-  by?: string,
-  calcMode?: string,
-  capHeight?: string,
-  clip?: string,
-  clipPath?: string,
-  clipPathUnits?: string,
-  clipRule?: string,
-  colorInterpolation?: string,
-  colorInterpolationFilters?: string,
-  colorProfile?: string,
-  colorRendering?: string,
-  contentScriptType?: string,
-  contentStyleType?: string,
-  cursor?: string,
-  cx?: string,
-  cy?: string,
-  d?: string,
-  decelerate?: string,
-  descent?: string,
-  diffuseConstant?: string,
-  direction?: string,
-  display?: string,
-  divisor?: string,
-  dominantBaseline?: string,
-  dur?: string,
-  dx?: string,
-  dy?: string,
-  edgeMode?: string,
-  elevation?: string,
-  enableBackground?: string,
-  end?: string,
-  @deprecated("Please use end")
-  end_?: string,
-  exponent?: string,
-  externalResourcesRequired?: string,
-  fill?: string,
-  fillOpacity?: string,
-  fillRule?: string,
-  filter?: string,
-  filterRes?: string,
-  filterUnits?: string,
-  floodColor?: string,
-  floodOpacity?: string,
-  focusable?: string,
-  fontFamily?: string,
-  fontSize?: string,
-  fontSizeAdjust?: string,
-  fontStretch?: string,
-  fontStyle?: string,
-  fontVariant?: string,
-  fontWeight?: string,
-  fomat?: string,
-  from?: string,
-  fx?: string,
-  fy?: string,
-  g1?: string,
-  g2?: string,
-  glyphName?: string,
-  glyphOrientationHorizontal?: string,
-  glyphOrientationVertical?: string,
-  glyphRef?: string,
-  gradientTransform?: string,
-  gradientUnits?: string,
-  hanging?: string,
-  horizAdvX?: string,
-  horizOriginX?: string,
-  ideographic?: string,
-  imageRendering?: string,
-  @as("in")
-  in_?: string /* use this one. Previous one is deprecated */,
-  in2?: string,
-  intercept?: string,
-  k?: string,
-  k1?: string,
-  k2?: string,
-  k3?: string,
-  k4?: string,
-  kernelMatrix?: string,
-  kernelUnitLength?: string,
-  kerning?: string,
-  keyPoints?: string,
-  keySplines?: string,
-  keyTimes?: string,
-  lengthAdjust?: string,
-  letterSpacing?: string,
-  lightingColor?: string,
-  limitingConeAngle?: string,
-  local?: string,
-  markerEnd?: string,
-  markerHeight?: string,
-  markerMid?: string,
-  markerStart?: string,
-  markerUnits?: string,
-  markerWidth?: string,
-  mask?: string,
-  maskContentUnits?: string,
-  maskUnits?: string,
-  mathematical?: string,
-  mode?: string,
-  numOctaves?: string,
-  offset?: string,
-  opacity?: string,
-  operator?: string,
-  order?: string,
-  orient?: string,
-  orientation?: string,
-  origin?: string,
-  overflow?: string,
-  overflowX?: string,
-  overflowY?: string,
-  overlinePosition?: string,
-  overlineThickness?: string,
-  paintOrder?: string,
-  panose1?: string,
-  pathLength?: string,
-  patternContentUnits?: string,
-  patternTransform?: string,
-  patternUnits?: string,
-  pointerEvents?: string,
-  points?: string,
-  pointsAtX?: string,
-  pointsAtY?: string,
-  pointsAtZ?: string,
-  preserveAlpha?: string,
-  preserveAspectRatio?: string,
-  primitiveUnits?: string,
-  r?: string,
-  radius?: string,
-  refX?: string,
-  refY?: string,
-  renderingIntent?: string,
-  repeatCount?: string,
-  repeatDur?: string,
-  requiredExtensions?: string,
-  requiredFeatures?: string,
-  restart?: string,
-  result?: string,
-  rotate?: string,
-  rx?: string,
-  ry?: string,
-  scale?: string,
-  seed?: string,
-  shapeRendering?: string,
-  slope?: string,
-  spacing?: string,
-  specularConstant?: string,
-  specularExponent?: string,
-  speed?: string,
-  spreadMethod?: string,
-  startOffset?: string,
-  stdDeviation?: string,
-  stemh?: string,
-  stemv?: string,
-  stitchTiles?: string,
-  stopColor?: string,
-  stopOpacity?: string,
-  strikethroughPosition?: string,
-  strikethroughThickness?: string,
-  string?: string,
-  stroke?: string,
-  strokeDasharray?: string,
-  strokeDashoffset?: string,
-  strokeLinecap?: string,
-  strokeLinejoin?: string,
-  strokeMiterlimit?: string,
-  strokeOpacity?: string,
-  strokeWidth?: string,
-  surfaceScale?: string,
-  systemLanguage?: string,
-  tableValues?: string,
-  targetX?: string,
-  targetY?: string,
-  textAnchor?: string,
-  textDecoration?: string,
-  textLength?: string,
-  textRendering?: string,
-  to?: string,
-  @deprecated("Please use to")
-  to_?: string,
-  transform?: string,
-  u1?: string,
-  u2?: string,
-  underlinePosition?: string,
-  underlineThickness?: string,
-  unicode?: string,
-  unicodeBidi?: string,
-  unicodeRange?: string,
-  unitsPerEm?: string,
-  vAlphabetic?: string,
-  vHanging?: string,
-  vIdeographic?: string,
-  vMathematical?: string,
-  values?: string,
-  vectorEffect?: string,
-  version?: string,
-  vertAdvX?: string,
-  vertAdvY?: string,
-  vertOriginX?: string,
-  vertOriginY?: string,
-  viewBox?: string,
-  viewTarget?: string,
-  visibility?: string,
-  /* width::string? => */
-  widths?: string,
-  wordSpacing?: string,
-  writingMode?: string,
-  x?: string,
-  x1?: string,
-  x2?: string,
-  xChannelSelector?: string,
-  xHeight?: string,
-  xlinkActuate?: string,
-  xlinkArcrole?: string,
-  xlinkHref?: string,
-  xlinkRole?: string,
-  xlinkShow?: string,
-  xlinkTitle?: string,
-  xlinkType?: string,
-  xmlns?: string,
-  xmlnsXlink?: string,
-  xmlBase?: string,
-  xmlLang?: string,
-  xmlSpace?: string,
-  y?: string,
-  y1?: string,
-  y2?: string,
-  yChannelSelector?: string,
-  z?: string,
-  zoomAndPan?: string,
-  /* RDFa */
-  about?: string,
-  datatype?: string,
-  inlist?: string,
-  prefix?: string,
-  property?: string,
-  resource?: string,
-  typeof?: string,
-  vocab?: string,
-  /* react-specific */
-  dangerouslySetInnerHTML?: {"__html": string},
-  suppressContentEditableWarning?: bool,
-}
diff --git a/jscomp/others/jsxEventC.res b/jscomp/others/jsxEventC.res
deleted file mode 100644
index 89fe51d..0000000
--- a/jscomp/others/jsxEventC.res
+++ /dev/null
@@ -1,348 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Internal: use JsxEvent directly. */
-
-type synthetic<'a>
-
-module MakeEventWithType = (
-  Type: {
-    type t
-  },
-) => {
-  @get external bubbles: Type.t => bool = "bubbles"
-  @get external cancelable: Type.t => bool = "cancelable"
-  @get external currentTarget: Type.t => {..} = "currentTarget"
-
-  /* Should return Dom.eventTarget */
-  @get external defaultPrevented: Type.t => bool = "defaultPrevented"
-  @get external eventPhase: Type.t => int = "eventPhase"
-  @get external isTrusted: Type.t => bool = "isTrusted"
-  @get external nativeEvent: Type.t => {..} = "nativeEvent"
-
-  /* Should return Dom.event */
-  @send external preventDefault: Type.t => unit = "preventDefault"
-
-  @send external isDefaultPrevented: Type.t => bool = "isDefaultPrevented"
-
-  @send external stopPropagation: Type.t => unit = "stopPropagation"
-
-  @send external isPropagationStopped: Type.t => bool = "isPropagationStopped"
-
-  @get external target: Type.t => {..} = "target"
-
-  /* Should return Dom.eventTarget */
-  @get external timeStamp: Type.t => float = "timeStamp"
-  @get external type_: Type.t => string = "type"
-  @send external persist: Type.t => unit = "persist"
-}
-
-module Synthetic = {
-  type tag
-  type t = synthetic<tag>
-
-  @get external bubbles: synthetic<'a> => bool = "bubbles"
-  @get external cancelable: synthetic<'a> => bool = "cancelable"
-  @get external currentTarget: synthetic<'a> => {..} = "currentTarget"
-  /* Should return Dom.eventTarget */
-
-  @get external defaultPrevented: synthetic<'a> => bool = "defaultPrevented"
-
-  @get external eventPhase: synthetic<'a> => int = "eventPhase"
-  @get external isTrusted: synthetic<'a> => bool = "isTrusted"
-  @get external nativeEvent: synthetic<'a> => {..} = "nativeEvent"
-
-  /* Should return Dom.event */
-  @send external preventDefault: synthetic<'a> => unit = "preventDefault"
-
-  @send external isDefaultPrevented: synthetic<'a> => bool = "isDefaultPrevented"
-
-  @send external stopPropagation: synthetic<'a> => unit = "stopPropagation"
-
-  @send external isPropagationStopped: synthetic<'a> => bool = "isPropagationStopped"
-
-  @get external target: synthetic<'a> => {..} = "target"
-
-  /* Should return Dom.eventTarget */
-  @get external timeStamp: synthetic<'a> => float = "timeStamp"
-  @get external type_: synthetic<'a> => string = "type"
-  @send external persist: synthetic<'a> => unit = "persist"
-}
-
-/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */
-external toSyntheticEvent: synthetic<'a> => Synthetic.t = "%identity"
-
-module Clipboard = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external clipboardData: t => {..} = "clipboardData"
-  /* Should return Dom.dataTransfer */
-}
-
-module Composition = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external data: t => string = "data"
-}
-
-module Keyboard = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external altKey: t => bool = "altKey"
-  @get external charCode: t => int = "charCode"
-  @get external ctrlKey: t => bool = "ctrlKey"
-
-  @send external getModifierState: (t, string) => bool = "getModifierState"
-
-  @get external key: t => string = "key"
-  @get external keyCode: t => int = "keyCode"
-  @get external locale: t => string = "locale"
-  @get external location: t => int = "location"
-  @get external metaKey: t => bool = "metaKey"
-  @get external repeat: t => bool = "repeat"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external which: t => int = "which"
-}
-
-module Focus = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget"
-  /* Should return Dom.eventTarget */
-}
-
-module Form = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Mouse = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external altKey: t => bool = "altKey"
-  @get external button: t => int = "button"
-  @get external buttons: t => int = "buttons"
-  @get external clientX: t => int = "clientX"
-  @get external clientY: t => int = "clientY"
-  @get external ctrlKey: t => bool = "ctrlKey"
-
-  @get external getModifierState: (t => string) => bool = "getModifierState"
-
-  @get external metaKey: t => bool = "metaKey"
-  @get external movementX: t => int = "movementX"
-  @get external movementY: t => int = "movementY"
-  @get external pageX: t => int = "pageX"
-  @get external pageY: t => int = "pageY"
-
-  @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget"
-
-  /* Should return Dom.eventTarget */
-  @get external screenX: t => int = "screenX"
-  @get external screenY: t => int = "screenY"
-  @get external shiftKey: t => bool = "shiftKey"
-}
-
-module Pointer = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  /* UIEvent */
-  @get @get
-  external detail: t => int = "detail"
-
-  /* external view : t -> Dom.window = "view" */
-  /* Should return DOMAbstractView/WindowProxy */
-
-  /* MouseEvent */
-  @get external screenX: t => int = "screenX"
-  @get external screenY: t => int = "screenY"
-  @get external clientX: t => int = "clientX"
-  @get external clientY: t => int = "clientY"
-  @get external pageX: t => int = "pageX"
-  @get external pageY: t => int = "pageY"
-  @get external movementX: t => int = "movementX"
-  @get external movementY: t => int = "movementY"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external altKey: t => bool = "altKey"
-  @get external metaKey: t => bool = "metaKey"
-
-  @get external getModifierState: (t => string) => bool = "getModifierState"
-
-  @get external button: t => int = "button"
-  @get external buttons: t => int = "buttons"
-
-  @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget"
-  /* Should return Dom.eventTarget */
-
-  /* PointerEvent */
-  /* external pointerId : t -> Dom.eventPointerId = "pointerId" [@@bs.get] */
-  @get external width: t => float = "width"
-  @get external height: t => float = "height"
-  @get external pressure: t => float = "pressure"
-  @get external tangentialPressure: t => float = "tangentialPressure"
-  @get external tiltX: t => int = "tiltX"
-  @get external tiltY: t => int = "tiltY"
-  @get external twist: t => int = "twist"
-  @get external pointerType: t => string = "pointerType"
-  @get external isPrimary: t => bool = "isPrimary"
-}
-
-module Selection = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Touch = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external altKey: t => bool = "altKey"
-  @get external changedTouches: t => {..} = "changedTouches"
-  /* Should return Dom.touchList */
-
-  @get external ctrlKey: t => bool = "ctrlKey"
-
-  @send external getModifierState: (t => string) => bool = "getModifierState"
-
-  @get external metaKey: t => bool = "metaKey"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external targetTouches: t => {..} = "targetTouches"
-  /* Should return Dom.touchList */
-
-  @get external touches: t => {..} = "touches"
-  /* Should return Dom.touchList */
-}
-
-module UI = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external detail: t => int = "detail"
-  /* external view : t -> Dom.window = "view" [@@bs.get] */
-  /* Should return DOMAbstractView/WindowProxy */
-}
-
-module Wheel = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external deltaMode: t => int = "deltaMode"
-  @get external deltaX: t => float = "deltaX"
-  @get external deltaY: t => float = "deltaY"
-  @get external deltaZ: t => float = "deltaZ"
-}
-
-module Media = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Image = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Animation = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external animationName: t => string = "animationName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
-
-module Transition = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external propertyName: t => string = "propertyName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
diff --git a/jscomp/others/jsxEventU.res b/jscomp/others/jsxEventU.res
deleted file mode 100644
index 449032f..0000000
--- a/jscomp/others/jsxEventU.res
+++ /dev/null
@@ -1,350 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Internal: use JsxEvent directly. */
-
-@@uncurried
-
-type synthetic<'a>
-
-module MakeEventWithType = (
-  Type: {
-    type t
-  },
-) => {
-  @get external bubbles: Type.t => bool = "bubbles"
-  @get external cancelable: Type.t => bool = "cancelable"
-  @get external currentTarget: Type.t => {..} = "currentTarget"
-
-  /* Should return Dom.eventTarget */
-  @get external defaultPrevented: Type.t => bool = "defaultPrevented"
-  @get external eventPhase: Type.t => int = "eventPhase"
-  @get external isTrusted: Type.t => bool = "isTrusted"
-  @get external nativeEvent: Type.t => {..} = "nativeEvent"
-
-  /* Should return Dom.event */
-  @send external preventDefault: Type.t => unit = "preventDefault"
-
-  @send external isDefaultPrevented: Type.t => bool = "isDefaultPrevented"
-
-  @send external stopPropagation: Type.t => unit = "stopPropagation"
-
-  @send external isPropagationStopped: Type.t => bool = "isPropagationStopped"
-
-  @get external target: Type.t => {..} = "target"
-
-  /* Should return Dom.eventTarget */
-  @get external timeStamp: Type.t => float = "timeStamp"
-  @get external type_: Type.t => string = "type"
-  @send external persist: Type.t => unit = "persist"
-}
-
-module Synthetic = {
-  type tag
-  type t = synthetic<tag>
-
-  @get external bubbles: synthetic<'a> => bool = "bubbles"
-  @get external cancelable: synthetic<'a> => bool = "cancelable"
-  @get external currentTarget: synthetic<'a> => {..} = "currentTarget"
-  /* Should return Dom.eventTarget */
-
-  @get external defaultPrevented: synthetic<'a> => bool = "defaultPrevented"
-
-  @get external eventPhase: synthetic<'a> => int = "eventPhase"
-  @get external isTrusted: synthetic<'a> => bool = "isTrusted"
-  @get external nativeEvent: synthetic<'a> => {..} = "nativeEvent"
-
-  /* Should return Dom.event */
-  @send external preventDefault: synthetic<'a> => unit = "preventDefault"
-
-  @send external isDefaultPrevented: synthetic<'a> => bool = "isDefaultPrevented"
-
-  @send external stopPropagation: synthetic<'a> => unit = "stopPropagation"
-
-  @send external isPropagationStopped: synthetic<'a> => bool = "isPropagationStopped"
-
-  @get external target: synthetic<'a> => {..} = "target"
-
-  /* Should return Dom.eventTarget */
-  @get external timeStamp: synthetic<'a> => float = "timeStamp"
-  @get external type_: synthetic<'a> => string = "type"
-  @send external persist: synthetic<'a> => unit = "persist"
-}
-
-/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */
-external toSyntheticEvent: synthetic<'a> => Synthetic.t = "%identity"
-
-module Clipboard = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external clipboardData: t => {..} = "clipboardData"
-  /* Should return Dom.dataTransfer */
-}
-
-module Composition = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external data: t => string = "data"
-}
-
-module Keyboard = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external altKey: t => bool = "altKey"
-  @get external charCode: t => int = "charCode"
-  @get external ctrlKey: t => bool = "ctrlKey"
-
-  @send external getModifierState: (t, string) => bool = "getModifierState"
-
-  @get external key: t => string = "key"
-  @get external keyCode: t => int = "keyCode"
-  @get external locale: t => string = "locale"
-  @get external location: t => int = "location"
-  @get external metaKey: t => bool = "metaKey"
-  @get external repeat: t => bool = "repeat"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external which: t => int = "which"
-}
-
-module Focus = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget"
-  /* Should return Dom.eventTarget */
-}
-
-module Form = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Mouse = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external altKey: t => bool = "altKey"
-  @get external button: t => int = "button"
-  @get external buttons: t => int = "buttons"
-  @get external clientX: t => int = "clientX"
-  @get external clientY: t => int = "clientY"
-  @get external ctrlKey: t => bool = "ctrlKey"
-
-  @get external getModifierState: (t => string) => bool = "getModifierState"
-
-  @get external metaKey: t => bool = "metaKey"
-  @get external movementX: t => int = "movementX"
-  @get external movementY: t => int = "movementY"
-  @get external pageX: t => int = "pageX"
-  @get external pageY: t => int = "pageY"
-
-  @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget"
-
-  /* Should return Dom.eventTarget */
-  @get external screenX: t => int = "screenX"
-  @get external screenY: t => int = "screenY"
-  @get external shiftKey: t => bool = "shiftKey"
-}
-
-module Pointer = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  /* UIEvent */
-  @get @get
-  external detail: t => int = "detail"
-
-  /* external view : t -> Dom.window = "view" */
-  /* Should return DOMAbstractView/WindowProxy */
-
-  /* MouseEvent */
-  @get external screenX: t => int = "screenX"
-  @get external screenY: t => int = "screenY"
-  @get external clientX: t => int = "clientX"
-  @get external clientY: t => int = "clientY"
-  @get external pageX: t => int = "pageX"
-  @get external pageY: t => int = "pageY"
-  @get external movementX: t => int = "movementX"
-  @get external movementY: t => int = "movementY"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external altKey: t => bool = "altKey"
-  @get external metaKey: t => bool = "metaKey"
-
-  @get external getModifierState: (t => string) => bool = "getModifierState"
-
-  @get external button: t => int = "button"
-  @get external buttons: t => int = "buttons"
-
-  @get @return(nullable) external relatedTarget: t => option<{..}> = "relatedTarget"
-  /* Should return Dom.eventTarget */
-
-  /* PointerEvent */
-  /* external pointerId : t -> Dom.eventPointerId = "pointerId" [@@bs.get] */
-  @get external width: t => float = "width"
-  @get external height: t => float = "height"
-  @get external pressure: t => float = "pressure"
-  @get external tangentialPressure: t => float = "tangentialPressure"
-  @get external tiltX: t => int = "tiltX"
-  @get external tiltY: t => int = "tiltY"
-  @get external twist: t => int = "twist"
-  @get external pointerType: t => string = "pointerType"
-  @get external isPrimary: t => bool = "isPrimary"
-}
-
-module Selection = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Touch = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external altKey: t => bool = "altKey"
-  @get external changedTouches: t => {..} = "changedTouches"
-  /* Should return Dom.touchList */
-
-  @get external ctrlKey: t => bool = "ctrlKey"
-
-  @send external getModifierState: (t => string) => bool = "getModifierState"
-
-  @get external metaKey: t => bool = "metaKey"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external targetTouches: t => {..} = "targetTouches"
-  /* Should return Dom.touchList */
-
-  @get external touches: t => {..} = "touches"
-  /* Should return Dom.touchList */
-}
-
-module UI = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external detail: t => int = "detail"
-  /* external view : t -> Dom.window = "view" [@@bs.get] */
-  /* Should return DOMAbstractView/WindowProxy */
-}
-
-module Wheel = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external deltaMode: t => int = "deltaMode"
-  @get external deltaX: t => float = "deltaX"
-  @get external deltaY: t => float = "deltaY"
-  @get external deltaZ: t => float = "deltaZ"
-}
-
-module Media = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Image = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Animation = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external animationName: t => string = "animationName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
-
-module Transition = {
-  type tag
-  type t = synthetic<tag>
-
-  include MakeEventWithType({
-    type t = t
-  })
-
-  @get external propertyName: t => string = "propertyName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
diff --git a/jscomp/others/jsxPPXReactSupportC.res b/jscomp/others/jsxPPXReactSupportC.res
deleted file mode 100644
index a024d44..0000000
--- a/jscomp/others/jsxPPXReactSupportC.res
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (C) 2022- Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module Jsx = JsxC
-
-%%private(
-  @val
-  external propsWithKey: ({"key": string}, 'props) => 'props = "Object.assign"
-
-  @inline
-  let addKeyProp = (~key: option<string>=?, p: 'props): 'props =>
-    switch key {
-    | Some(key) => propsWithKey({"key": key}, p)
-    | None => p
-    }
-)
-
-@module("react")
-external createElement: (Jsx.component<'props>, 'props) => Jsx.element = "createElement"
-
-@variadic @module("react")
-external createElementVariadic: (Jsx.component<'props>, 'props, array<Jsx.element>) => Jsx.element =
-  "createElement"
-
-let createElementWithKey = (~key=?, component, props) =>
-  createElement(component, addKeyProp(~key?, props))
-
-let createElementVariadicWithKey = (~key=?, component, props, elements) =>
-  createElementVariadic(component, addKeyProp(~key?, props), elements)
-
-external asyncComponent: promise<Jsx.element> => Jsx.element = "%identity"
diff --git a/jscomp/others/jsxPPXReactSupportU.res b/jscomp/others/jsxPPXReactSupportU.res
deleted file mode 100644
index a850efc..0000000
--- a/jscomp/others/jsxPPXReactSupportU.res
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright (C) 2022- Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module Jsx = JsxU
-
-%%private(
-  @val
-  external propsWithKey: ({"key": string}, 'props) => 'props = "Object.assign"
-
-  @inline
-  let addKeyProp = (~key: option<string>=?, p: 'props): 'props =>
-    switch key {
-    | Some(key) => propsWithKey({"key": key}, p)
-    | None => p
-    }
-)
-
-@@uncurried // Can't move this up as @inline not working with uncurried
-
-@module("react")
-external createElement: (Jsx.component<'props>, 'props) => Jsx.element = "createElement"
-
-@variadic @module("react")
-external createElementVariadic: (Jsx.component<'props>, 'props, array<Jsx.element>) => Jsx.element =
-  "createElement"
-
-let createElementWithKey = (~key=?, component, props) =>
-  createElement(component, addKeyProp(~key?, props))
-
-let createElementVariadicWithKey = (~key=?, component, props, elements) =>
-  createElementVariadic(component, addKeyProp(~key?, props), elements)
-
-external asyncComponent: promise<Jsx.element> => Jsx.element = "%identity"
diff --git a/jscomp/others/jsxU.res b/jscomp/others/jsxU.res
deleted file mode 100644
index 70f3c67..0000000
--- a/jscomp/others/jsxU.res
+++ /dev/null
@@ -1,20 +0,0 @@
-/*** Internal: use Jsx directly. */
-
-@@uncurried
-
-type element
-type ref
-
-@val external null: element = "null"
-
-external float: float => element = "%identity"
-external int: int => element = "%identity"
-external string: string => element = "%identity"
-
-external array: array<element> => element = "%identity"
-
-type componentLike<'props, 'return> = 'props => 'return
-type component<'props> = componentLike<'props, element>
-
-/* this function exists to prepare for making `component` abstract */
-external component: componentLike<'props, element> => component<'props> = "%identity"
diff --git a/jscomp/others/map.cppo.res b/jscomp/others/map.cppo.res
deleted file mode 100644
index d19d0e6..0000000
--- a/jscomp/others/map.cppo.res
+++ /dev/null
@@ -1,199 +0,0 @@
-#ifdef TYPE_STRING
-type key = string
-module I = Belt_internalMapString
-#elif defined TYPE_INT
-type key = int
-module I = Belt_internalMapInt
-#else 
-[%error "unknown type"]
-#endif
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-
-type t<'a> = N.t<key, 'a>
-
-let empty = None
-let isEmpty = N.isEmpty
-/* let singleton = N.singleton */
-
-let minKey = N.minKey
-let minKeyUndefined = N.minKeyUndefined
-let maxKey = N.maxKey
-let maxKeyUndefined = N.maxKeyUndefined
-let minimum = N.minimum
-let minUndefined = N.minUndefined
-let maximum = N.maximum
-let maxUndefined = N.maxUndefined
-let forEachU = N.forEachU
-let forEach = N.forEach
-let mapU = N.mapU
-let map = N.map
-let mapWithKeyU = N.mapWithKeyU
-let mapWithKey = N.mapWithKey
-let reduceU = N.reduceU
-let reduce = N.reduce
-let everyU = N.everyU
-let every = N.every
-let someU = N.someU
-let some = N.some
-let keepU = N.keepSharedU
-let keep = N.keepShared
-let partitionU = N.partitionSharedU
-let partition = N.partitionShared
-let size = N.size
-let toList = N.toList
-let toArray = N.toArray
-let keysToArray = N.keysToArray
-let valuesToArray = N.valuesToArray
-let checkInvariantInternal = N.checkInvariantInternal
-
-let rec set = (t, newK: key, newD: _) =>
-  switch t {
-  | None => N.singleton(newK, newD)
-  | Some(n) =>
-    let k = n.N.key
-    if newK == k {
-      Some(N.updateValue(n, newD))
-    } else {
-      let v = n.N.value
-      if newK < k {
-        N.bal(set(n.N.left, newK, newD), k, v, n.N.right)
-      } else {
-        N.bal(n.N.left, k, v, set(n.N.right, newK, newD))
-      }
-    }
-  }
-
-let rec updateU = (t, x: key, f) =>
-  switch t {
-  | None =>
-    switch f(. None) {
-    | None => t
-    | Some(data) => N.singleton(x, data)
-    }
-  | Some(n) =>
-    let k = n.N.key
-    if x == k {
-      switch f(. Some(n.N.value)) {
-      | None =>
-        let {N.left: l, right: r} = n
-        switch (l, r) {
-        | (None, _) => r
-        | (_, None) => l
-        | (_, Some(rn)) =>
-          let (kr, vr) = (ref(rn.N.key), ref(rn.N.value))
-          let r = N.removeMinAuxWithRef(rn, kr, vr)
-          N.bal(l, kr.contents, vr.contents, r)
-        }
-      | Some(data) => Some(N.updateValue(n, data))
-      }
-    } else {
-      let {N.left: l, right: r, value: v} = n
-      if x < k {
-        let ll = updateU(l, x, f)
-        if l === ll {
-          t
-        } else {
-          N.bal(ll, k, v, r)
-        }
-      } else {
-        let rr = updateU(r, x, f)
-        if r === rr {
-          t
-        } else {
-          N.bal(l, k, v, rr)
-        }
-      }
-    }
-  }
-
-let update = (t, x, f) => updateU(t, x, (. a) => f(a))
-
-let rec removeAux = (n, x: key) => {
-  let {N.left: l, key: v, right: r} = n
-  if x == v {
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (_, Some(rn)) =>
-      let (kr, vr) = (ref(rn.N.key), ref(rn.N.value))
-      let r = N.removeMinAuxWithRef(rn, kr, vr)
-      N.bal(l, kr.contents, vr.contents, r)
-    }
-  } else if x < v {
-    switch l {
-    | None => Some(n)
-    | Some(left) =>
-      let ll = removeAux(left, x)
-      if ll === l {
-        Some(n)
-      } else {
-        open N
-        bal(ll, v, n.value, r)
-      }
-    }
-  } else {
-    switch r {
-    | None => Some(n)
-    | Some(right) =>
-      let rr = removeAux(right, x)
-      N.bal(l, v, n.N.value, rr)
-    }
-  }
-}
-
-let remove = (n, x) =>
-  switch n {
-  | None => None
-  | Some(n) => removeAux(n, x)
-  }
-
-let rec removeMany0 = (t, xs, i, len) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = removeAux(t, ele)
-    switch u {
-    | None => u
-    | Some(t) => removeMany0(t, xs, i + 1, len)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (t, keys) => {
-  let len = A.length(keys)
-  switch t {
-  | None => None
-  | Some(t) => removeMany0(t, keys, 0, len)
-  }
-}
-
-let findFirstByU = N.findFirstByU
-let findFirstBy = N.findFirstBy
-
-let mergeMany = (h, arr) => {
-  let len = A.length(arr)
-  let v = ref(h)
-  for i in 0 to len - 1 {
-    let (key, value) = A.getUnsafe(arr, i)
-    v.contents = set(v.contents, key, value)
-  }
-  v.contents
-}
-
-/* let mergeArray = mergeMany */
-
-let has = I.has
-let cmpU = I.cmpU
-let cmp = I.cmp
-let eqU = I.eqU
-let eq = I.eq
-let get = I.get
-let getUndefined = I.getUndefined
-let getWithDefault = I.getWithDefault
-let getExn = I.getExn
-let split = I.split
-let mergeU = I.mergeU
-let merge = I.merge
-let fromArray = I.fromArray
diff --git a/jscomp/others/map.cppo.resi b/jscomp/others/map.cppo.resi
deleted file mode 100644
index 61cfec2..0000000
--- a/jscomp/others/map.cppo.resi
+++ /dev/null
@@ -1,181 +0,0 @@
-#ifdef TYPE_STRING
-type key = string
-#elif defined TYPE_INT
-type key = int
-#else
-[%error "unknown type"]
-#endif
-
-/** The type of maps from type `key` to type `'value`. */
-type t<'value>
-
-let empty: t<'v>
-
-let isEmpty: t<'v> => bool
-
-let has: (t<'v>, key) => bool
-
-let cmpU: (t<'v>, t<'v>, (. 'v, 'v) => int) => int
-let cmp: (t<'v>, t<'v>, ('v, 'v) => int) => int
-
-let eqU: (t<'v>, t<'v>, (. 'v, 'v) => bool) => bool
-
-/**
-`eq(m1, m2)` tests whether the maps `m1` and `m2` are
-equal, that is, contain equal keys and associate them with
-equal data.
-*/
-let eq: (t<'v>, t<'v>, ('v, 'v) => bool) => bool
-
-let findFirstByU: (t<'v>, (. key, 'v) => bool) => option<(key, 'v)>
-
-/**
-`findFirstBy(m, p)` uses funcion `f` to find the first key value pair
-to match predicate `p`.
-
-```rescript
-let s0 = fromArray(~id=module(IntCmp), [(4, "4"), (1, "1"), (2, "2,"(3, ""))])
-findFirstBy(s0, (k, v) => k == 4) == option((4, "4"))
-```
-*/
-let findFirstBy: (t<'v>, (key, 'v) => bool) => option<(key, 'v)>
-
-let forEachU: (t<'v>, (. key, 'v) => unit) => unit
-
-/**
-`forEach(m, f)` applies `f` to all bindings in map `m`.
-`f` receives the key as first argument, and the associated value
-as second argument. The bindings are passed to `f` in increasing
-order with respect to the ordering over the type of the keys.
-*/
-let forEach: (t<'v>, (key, 'v) => unit) => unit
-
-let reduceU: (t<'v>, 'v2, (. 'v2, key, 'v) => 'v2) => 'v2
-
-/**
-`reduce(m, a, f)` computes `(f kN dN ... (f k1 d1 a)...)`,
-where `k1 ... kN` are the keys of all bindings in `m`
-(in increasing order), and `d1 ... dN` are the associated data.
-*/
-let reduce: (t<'v>, 'v2, ('v2, key, 'v) => 'v2) => 'v2
-
-let everyU: (t<'v>, (. key, 'v) => bool) => bool
-
-/** 
-`every(m, p)` checks if all the bindings of the map satisfy the predicate `p`.
-Order unspecified */
-let every: (t<'v>, (key, 'v) => bool) => bool
-
-let someU: (t<'v>, (. key, 'v) => bool) => bool
-
-/** 
-`some(m, p)` checks if at least one binding of the map satisfy the predicate
-`p`. Order unspecified */
-let some: (t<'v>, (key, 'v) => bool) => bool
-
-let size: t<'v> => int
-
-/** In increasing order. */
-let toList: t<'v> => list<(key, 'v)>
-
-let toArray: t<'v> => array<(key, 'v)>
-
-let fromArray: array<(key, 'v)> => t<'v>
-
-let keysToArray: t<'v> => array<key>
-
-let valuesToArray: t<'v> => array<'v>
-
-let minKey: t<_> => option<key>
-
-let minKeyUndefined: t<_> => Js.undefined<key>
-
-let maxKey: t<_> => option<key>
-
-let maxKeyUndefined: t<_> => Js.undefined<key>
-
-let minimum: t<'v> => option<(key, 'v)>
-
-let minUndefined: t<'v> => Js.undefined<(key, 'v)>
-
-let maximum: t<'v> => option<(key, 'v)>
-
-let maxUndefined: t<'v> => Js.undefined<(key, 'v)>
-
-let get: (t<'v>, key) => option<'v>
-
-let getUndefined: (t<'v>, key) => Js.undefined<'v>
-
-let getWithDefault: (t<'v>, key, 'v) => 'v
-
-let getExn: (t<'v>, key) => 'v
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
-
-/** `remove m x` returns a map containing the same bindings as
-    `m`, except for `x` which is unbound in the returned map. */
-let remove: (t<'v>, key) => t<'v>
-
-let removeMany: (t<'v>, array<key>) => t<'v>
-
-/**
-`set(m, x, y)` returns a map containing the same bindings as
-`m`, plus a binding of `x` to `y`. If `x` was already bound
-in `m`, its previous binding disappears.
-*/
-let set: (t<'v>, key, 'v) => t<'v>
-
-let updateU: (t<'v>, key, (. option<'v>) => option<'v>) => t<'v>
-let update: (t<'v>, key, option<'v> => option<'v>) => t<'v>
-
-let mergeU: (t<'v>, t<'v2>, (. key, option<'v>, option<'v2>) => option<'c>) => t<'c>
-
-/**
-`merge(m1, m2, f)` computes a map whose keys is a subset of keys of `m1`
-and of `m2`. The presence of each such binding, and the corresponding
-value, is determined with the function `f`.
-*/
-let merge: (t<'v>, t<'v2>, (key, option<'v>, option<'v2>) => option<'c>) => t<'c>
-
-let mergeMany: (t<'v>, array<(key, 'v)>) => t<'v>
-
-let keepU: (t<'v>, (. key, 'v) => bool) => t<'v>
-
-/** 
-`keep(m, p)` returns the map with all the bindings in `m` that satisfy predicate
-`p`.
-*/
-let keep: (t<'v>, (key, 'v) => bool) => t<'v>
-
-let partitionU: (t<'v>, (. key, 'v) => bool) => (t<'v>, t<'v>)
-
-/**
-`partition(m, p)` returns a pair of maps `(m1, m2)`, where `m1` contains all the
-bindings of `s` that satisfy the predicate `p`, and `m2` is the map with all the
-bindings of `s` that do not satisfy `p`.
-*/
-let partition: (t<'v>, (key, 'v) => bool) => (t<'v>, t<'v>)
-
-/**
-`split(x, m)` returns a triple `(l, data, r)`, where `l` is the map with all the
-bindings of `m` whose key is strictly less than `x`; `r` is the map with all the
-bindings of `m` whose key is strictly greater than `x`; `data` is `None` if `m`
-contains no binding for `x`, or `Some(v)` if `m` binds `v` to `x`.
-*/
-let split: (key, t<'v>) => (t<'v>, option<'v>, t<'v>)
-
-let mapU: (t<'v>, (. 'v) => 'v2) => t<'v2>
-
-/**
-`map(m, f)` returns a map with same domain as `m`, where the associated value `a`
-of all bindings of `m` has been replaced by the result of the application of `f`
-to `a`. The bindings are passed to `f` in increasing order with respect to the
-ordering over the type of the keys.
-*/
-let map: (t<'v>, 'v => 'v2) => t<'v2>
-
-let mapWithKeyU: (t<'v>, (. key, 'v) => 'v2) => t<'v2>
-let mapWithKey: (t<'v>, (key, 'v) => 'v2) => t<'v2>
diff --git a/jscomp/others/mapm.cppo.res b/jscomp/others/mapm.cppo.res
deleted file mode 100644
index 3ac8ad3..0000000
--- a/jscomp/others/mapm.cppo.res
+++ /dev/null
@@ -1,183 +0,0 @@
-#ifdef TYPE_INT
-module I = Belt_internalMapInt
-type key = int
-#elif defined TYPE_STRING
-module I = Belt_internalMapString
-type key = string
-#else
-[%error "unknown type"]
-#endif
-
-module N = Belt_internalAVLtree
-module A = Belt_Array
-
-type t<'a> = {mutable data: I.t<'a>}
-
-let make = () => {data: None}
-let isEmpty = m => N.isEmpty(m.data)
-let clear = m => m.data = None
-/* let singleton k v = t ~data:(N.singleton k v) */
-
-let minKeyUndefined = m => N.minKeyUndefined(m.data)
-let minKey = m => N.minKey(m.data)
-let maxKeyUndefined = m => N.maxKeyUndefined(m.data)
-let maxKey = m => N.maxKey(m.data)
-let minimum = m => N.minimum(m.data)
-let minUndefined = m => N.minUndefined(m.data)
-let maximum = m => N.maximum(m.data)
-let maxUndefined = m => N.maxUndefined(m.data)
-
-let set = (m: t<_>, k, v) => {
-  let old_data = m.data
-  let v = I.addMutate(old_data, k, v)
-  if v !== old_data {
-    m.data = v
-  }
-}
-
-let forEachU = (d, f) => N.forEachU(d.data, f)
-let forEach = (d, f) => forEachU(d, (. a, b) => f(a, b))
-let mapU = (d, f) => {data: N.mapU(d.data, f)}
-let map = (d, f) => mapU(d, (. a) => f(a))
-let mapWithKeyU = (d, f) => {data: N.mapWithKeyU(d.data, f)}
-let mapWithKey = (d, f) => mapWithKeyU(d, (. a, b) => f(a, b))
-let reduceU = (d, acc, f) => N.reduceU(d.data, acc, f)
-let reduce = (d, acc, f) => reduceU(d, acc, (. a, b, c) => f(a, b, c))
-let everyU = (d, f) => N.everyU(d.data, f)
-let every = (d, f) => everyU(d, (. a, b) => f(a, b))
-let someU = (d, f) => N.someU(d.data, f)
-let some = (d, f) => someU(d, (. a, b) => f(a, b))
-let size = d => N.size(d.data)
-let toList = d => N.toList(d.data)
-let toArray = d => N.toArray(d.data)
-let keysToArray = d => N.keysToArray(d.data)
-let valuesToArray = d => N.valuesToArray(d.data)
-let checkInvariantInternal = d => N.checkInvariantInternal(d.data)
-let has = (d, v) => I.has(d.data, v)
-
-let rec removeMutateAux = (nt, x: key) => {
-  let k = nt.N.key
-  if x == k {
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (_, Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if x < k {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = removeMutateAux(l, x)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = removeMutateAux(r, x)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let remove = (d, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(root) =>
-    let newRoot = removeMutateAux(root, v)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-let rec updateDone = (t, x: key, f) =>
-  switch t {
-  | None =>
-    switch f(. None) {
-    | Some(data) => N.singleton(x, data)
-    | None => t
-    }
-  | Some(nt) =>
-    let k = nt.N.key
-
-    /* let  c = (Belt_Cmp.getCmpInternal cmp) x k [@bs] in */
-    if k == x {
-      switch f(. Some(nt.value)) {
-      | None =>
-        let {N.left: l, right: r} = nt
-        switch (l, r) {
-        | (None, _) => r
-        | (_, None) => l
-        | (_, Some(nr)) =>
-          nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-          Some(N.balMutate(nt))
-        }
-      | Some(data) =>
-        nt.value = data
-        Some(nt)
-      }
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < k {
-        let ll = updateDone(l, x, f)
-        nt.left = ll
-      } else {
-        nt.right = updateDone(r, x, f)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let updateU = (t, x, f) => {
-  let oldRoot = t.data
-  let newRoot = updateDone(oldRoot, x, f)
-  if newRoot !== oldRoot {
-    t.data = newRoot
-  }
-}
-let update = (t, x, f) => updateU(t, x, (. a) => f(a))
-let rec removeArrayMutateAux = (t, xs, i, len) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = removeMutateAux(t, ele)
-    switch u {
-    | None => None
-    | Some(t) => removeArrayMutateAux(t, xs, i + 1, len)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (d: t<_>, xs) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(nt) =>
-    let len = A.length(xs)
-    let newRoot = removeArrayMutateAux(nt, xs, 0, len)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-/* let split = I.split */
-/* let merge = I.merge */
-
-let fromArray = xs => {data: I.fromArray(xs)}
-
-let cmpU = (d0, d1, f) => I.cmpU(d0.data, d1.data, f)
-let cmp = (d0, d1, f) => cmpU(d0, d1, (. a, b) => f(a, b))
-
-let eqU = (d0, d1, f) => I.eqU(d0.data, d1.data, f)
-let eq = (d0, d1, f) => eqU(d0, d1, (. a, b) => f(a, b))
-
-let get = (d, x) => I.get(d.data, x)
-let getUndefined = (d, x) => I.getUndefined(d.data, x)
-let getWithDefault = (d, x, def) => I.getWithDefault(d.data, x, def)
-let getExn = (d, x) => I.getExn(d.data, x)
diff --git a/jscomp/others/mapm.cppo.resi b/jscomp/others/mapm.cppo.resi
deleted file mode 100644
index c4f1556..0000000
--- a/jscomp/others/mapm.cppo.resi
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-#ifdef TYPE_STRING
-type key = string
-#elif defined TYPE_INT
-type key = int
-#else
-[%error "unknown type"]
-#endif
-
-type t<'a>
-
-let make: unit => t<'a>
-let clear: t<'a> => unit
-let isEmpty: t<'a> => bool
-
-let has: (t<'a>, key) => bool
-
-let cmpU: (t<'a>, t<'a>, (. 'a, 'a) => int) => int
-
-/** 
-`cmp(m1, m2, cmp)`. First compare by size, if size is the same, compare by key,
-value pair
-*/
-let cmp: (t<'a>, t<'a>, ('a, 'a) => int) => int
-
-let eqU: (t<'a>, t<'a>, (. 'a, 'a) => bool) => bool
-
-/** `eq(m1, m2, cmp)` */
-let eq: (t<'a>, t<'a>, ('a, 'a) => bool) => bool
-
-let forEachU: (t<'a>, (. key, 'a) => unit) => unit
-
-/** 
-`forEach(m, f)` applies `f` to all bindings in map `m`. `f` receives the key as
-first argument, and the associated value as second argument. The application 
-order of `f` is in increasing order. */
-let forEach: (t<'a>, (key, 'a) => unit) => unit
-
-let reduceU: (t<'a>, 'b, (. 'b, key, 'a) => 'b) => 'b
-
-/** 
-`reduce(m, a, f)` computes `(f kN dN ... (f k1 d1 a)...)`, where `k1 ... kN` are
-the keys of all bindings in `m` (in increasing order), and `d1 ... dN` are the
-associated data. */
-let reduce: (t<'a>, 'b, ('b, key, 'a) => 'b) => 'b
-
-let everyU: (t<'a>, (. key, 'a) => bool) => bool
-
-/** 
-`every(m, p)` checks if all the bindings of the map satisfy the predicate `p`.
-The application order of `p` is unspecified.
-*/
-let every: (t<'a>, (key, 'a) => bool) => bool
-
-let someU: (t<'a>, (. key, 'a) => bool) => bool
-
-/** 
-`some(m, p)` checks if at least one binding of the map satisfy the predicate `p`.
-The application order of `p` is unspecified.
-*/
-let some: (t<'a>, (key, 'a) => bool) => bool
-
-let size: t<'a> => int
-
-/** In increasing order */
-let toList: t<'a> => list<(key, 'a)>
-
-/** In increasing order */
-let toArray: t<'a> => array<(key, 'a)>
-
-let fromArray: array<(key, 'a)> => t<'a>
-let keysToArray: t<'a> => array<key>
-let valuesToArray: t<'a> => array<'a>
-let minKey: t<_> => option<key>
-let minKeyUndefined: t<_> => Js.undefined<key>
-let maxKey: t<_> => option<key>
-let maxKeyUndefined: t<_> => Js.undefined<key>
-let minimum: t<'a> => option<(key, 'a)>
-let minUndefined: t<'a> => Js.undefined<(key, 'a)>
-let maximum: t<'a> => option<(key, 'a)>
-let maxUndefined: t<'a> => Js.undefined<(key, 'a)>
-let get: (t<'a>, key) => option<'a>
-let getUndefined: (t<'a>, key) => Js.undefined<'a>
-let getWithDefault: (t<'a>, key, 'a) => 'a
-let getExn: (t<'a>, key) => 'a
-
-/**
-  **raise** when invariant is not held
-*/
-let checkInvariantInternal: t<_> => unit
-
-/* ************************************************************************** */
-
-/* TODO: add functional `merge, partition, keep, split` */
-
-/** `remove(m, x)` do the in-place modification */
-let remove: (t<'a>, key) => unit
-
-let removeMany: (t<'a>, array<key>) => unit
-
-/** 
-`set(m, x, y)` do the in-place modification, return `m` for chaining. If `x` was
-already bound in `m`, its previous binding disappears.
-*/
-let set: (t<'a>, key, 'a) => unit
-
-let updateU: (t<'a>, key, (. option<'a>) => option<'a>) => unit
-let update: (t<'a>, key, option<'a> => option<'a>) => unit
-
-let mapU: (t<'a>, (. 'a) => 'b) => t<'b>
-
-/** 
-`map(m, f)` returns a map with same domain as `m`, where the associated value `a`
-of all bindings of `m` has been replaced by the result of the application of `f`
-to `a`. The bindings are passed to `f` in increasing order with respect to the
-ordering over the type of the keys. */
-let map: (t<'a>, 'a => 'b) => t<'b>
-
-let mapWithKeyU: (t<'a>, (. key, 'a) => 'b) => t<'b>
-let mapWithKey: (t<'a>, (key, 'a) => 'b) => t<'b>
diff --git a/jscomp/others/release.ninja b/jscomp/others/release.ninja
deleted file mode 100644
index 21b03b8..0000000
--- a/jscomp/others/release.ninja
+++ /dev/null
@@ -1,161 +0,0 @@
-
-bsc_primitive_flags =  -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -make-runtime   -nopervasives  -unsafe  -w +50 -warn-error A
-bsc_flags = $bsc_primitive_flags -open Belt_internals
-
-rule cc
-    command = $bsc -bs-cmi -bs-cmj $bsc_flags   -I others  $in
-    description = $in -> $out
-rule cc_cmi
-    command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags  -I others  $in
-    description = $in -> $out    
-
-o others/belt.cmj others/belt.cmi : cc others/belt.res | $bsc
-    bsc_flags = $bsc_primitive_flags
-o others/js.cmj others/js.cmi : cc others/js.ml | $bsc
-    bsc_flags = $bsc_primitive_flags
-o others/belt_internals.cmi : cc others/belt_internals.resi | $bsc
-    bsc_flags = $bsc_primitive_flags
-o others/js_OO.cmi others/js_OO.cmj : cc others/js_OO.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_array.cmi others/js_array.cmj : cc others/js_array.res | others/belt_internals.cmi others/js.cmi others/js_array2.cmj $bsc
-o others/js_array2.cmi others/js_array2.cmj : cc others/js_array2.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_bigint.cmi others/js_bigint.cmj : cc others/js_bigint.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_blob.cmi others/js_blob.cmj : cc others/js_blob.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_cast.cmj : cc_cmi others/js_cast.res | others/belt_internals.cmi others/js.cmi others/js_cast.cmi $bsc
-o others/js_cast.cmi : cc others/js_cast.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_console.cmi others/js_console.cmj : cc others/js_console.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_date.cmi others/js_date.cmj : cc others/js_date.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_dict.cmj : cc_cmi others/js_dict.res | others/belt_internals.cmi others/js.cmi others/js_array2.cmj others/js_dict.cmi $bsc
-o others/js_dict.cmi : cc others/js_dict.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_exn.cmj : cc_cmi others/js_exn.res | others/belt_internals.cmi others/js.cmi others/js_exn.cmi $bsc
-o others/js_exn.cmi : cc others/js_exn.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_file.cmi others/js_file.cmj : cc others/js_file.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_float.cmi others/js_float.cmj : cc others/js_float.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_global.cmi others/js_global.cmj : cc others/js_global.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_int.cmi others/js_int.cmj : cc others/js_int.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_json.cmj : cc_cmi others/js_json.res | others/belt_internals.cmi others/js.cmi others/js.cmj others/js_array2.cmj others/js_dict.cmj others/js_json.cmi others/js_string.cmj others/js_types.cmj $bsc
-o others/js_json.cmi : cc others/js_json.resi | others/belt_internals.cmi others/js.cmi others/js.cmj others/js_dict.cmi others/js_null.cmi others/js_string.cmj others/js_types.cmi $bsc
-o others/js_list.cmj : cc_cmi others/js_list.res | others/belt_internals.cmi others/js.cmi others/js_array2.cmj others/js_list.cmi others/js_vector.cmj $bsc
-o others/js_list.cmi : cc others/js_list.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_map.cmi others/js_map.cmj : cc others/js_map.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_mapperRt.cmj : cc_cmi others/js_mapperRt.res | others/belt_internals.cmi others/js.cmi others/js.cmj others/js_mapperRt.cmi $bsc
-o others/js_mapperRt.cmi : cc others/js_mapperRt.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_math.cmi others/js_math.cmj : cc others/js_math.ml | others/belt_internals.cmi others/js.cmi others/js_int.cmj $bsc
-o others/js_null.cmj : cc_cmi others/js_null.res | others/belt_internals.cmi others/js.cmi others/js.cmj others/js_exn.cmj others/js_null.cmi $bsc
-o others/js_null.cmi : cc others/js_null.resi | others/belt_internals.cmi others/js.cmi others/js.cmj $bsc
-o others/js_null_undefined.cmj : cc_cmi others/js_null_undefined.res | others/belt_internals.cmi others/js.cmi others/js.cmj others/js_null_undefined.cmi $bsc
-o others/js_null_undefined.cmi : cc others/js_null_undefined.resi | others/belt_internals.cmi others/js.cmi others/js.cmj $bsc
-o others/js_obj.cmi others/js_obj.cmj : cc others/js_obj.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_option.cmj : cc_cmi others/js_option.res | others/belt_internals.cmi others/js.cmi others/js_exn.cmj others/js_option.cmi $bsc
-o others/js_option.cmi : cc others/js_option.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_promise.cmi others/js_promise.cmj : cc others/js_promise.res | others/belt_internals.cmi others/js.cmi others/js_promise2.cmj $bsc
-o others/js_promise2.cmi others/js_promise2.cmj : cc others/js_promise2.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_re.cmi others/js_re.cmj : cc others/js_re.res | others/belt_internals.cmi others/js.cmi others/js.cmj $bsc
-o others/js_result.cmj : cc_cmi others/js_result.res | others/belt_internals.cmi others/js.cmi others/js_result.cmi $bsc
-o others/js_result.cmi : cc others/js_result.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_set.cmi others/js_set.cmj : cc others/js_set.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_string.cmi others/js_string.cmj : cc others/js_string.res | others/belt_internals.cmi others/js.cmi others/js_array2.cmj others/js_re.cmj $bsc
-o others/js_string2.cmi others/js_string2.cmj : cc others/js_string2.res | others/belt_internals.cmi others/js.cmi others/js_array2.cmj others/js_re.cmj $bsc
-o others/js_typed_array.cmi others/js_typed_array.cmj : cc others/js_typed_array.res | others/belt_internals.cmi others/js.cmi others/js.cmj others/js_typed_array2.cmj $bsc
-o others/js_typed_array2.cmi others/js_typed_array2.cmj : cc others/js_typed_array2.res | others/belt_internals.cmi others/js.cmi others/js.cmj $bsc
-o others/js_types.cmj : cc_cmi others/js_types.res | others/belt_internals.cmi others/js.cmi others/js.cmj others/js_null.cmj others/js_types.cmi $bsc
-o others/js_types.cmi : cc others/js_types.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_undefined.cmj : cc_cmi others/js_undefined.res | others/belt_internals.cmi others/js.cmi others/js.cmj others/js_exn.cmj others/js_undefined.cmi $bsc
-o others/js_undefined.cmi : cc others/js_undefined.resi | others/belt_internals.cmi others/js.cmi others/js.cmj $bsc
-o others/js_vector.cmj : cc_cmi others/js_vector.res | others/belt_internals.cmi others/js.cmi others/js_array2.cmj others/js_vector.cmi $bsc
-o others/js_vector.cmi : cc others/js_vector.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_weakmap.cmi others/js_weakmap.cmj : cc others/js_weakmap.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/js_weakset.cmi others/js_weakset.cmj : cc others/js_weakset.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/jsxC.cmi others/jsxC.cmj : cc others/jsxC.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/jsxDOMC.cmi others/jsxDOMC.cmj : cc others/jsxDOMC.res | others/belt_internals.cmi others/js.cmi others/jsxC.cmj others/jsxDOMStyle.cmj others/jsxEventC.cmj $bsc
-o others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj : cc others/jsxDOMStyle.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/jsxDOMU.cmi others/jsxDOMU.cmj : cc others/jsxDOMU.res | others/belt_internals.cmi others/js.cmi others/jsxDOMStyle.cmj others/jsxEventU.cmj others/jsxU.cmj $bsc
-o others/jsxEventC.cmi others/jsxEventC.cmj : cc others/jsxEventC.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/jsxEventU.cmi others/jsxEventU.cmj : cc others/jsxEventU.res | others/belt_internals.cmi others/js.cmi $bsc
-o others/jsxPPXReactSupportC.cmi others/jsxPPXReactSupportC.cmj : cc others/jsxPPXReactSupportC.res | others/belt_internals.cmi others/js.cmi others/jsxC.cmj $bsc
-o others/jsxPPXReactSupportU.cmi others/jsxPPXReactSupportU.cmj : cc others/jsxPPXReactSupportU.res | others/belt_internals.cmi others/js.cmi others/jsxU.cmj $bsc
-o others/jsxU.cmi others/jsxU.cmj : cc others/jsxU.res | others/belt_internals.cmi others/js.cmi $bsc
-o js_pkg : phony others/js_OO.cmi others/js_OO.cmj others/js_array.cmi others/js_array.cmj others/js_array2.cmi others/js_array2.cmj others/js_bigint.cmi others/js_bigint.cmj others/js_blob.cmi others/js_blob.cmj others/js_cast.cmi others/js_cast.cmj others/js_console.cmi others/js_console.cmj others/js_date.cmi others/js_date.cmj others/js_dict.cmi others/js_dict.cmj others/js_exn.cmi others/js_exn.cmj others/js_file.cmi others/js_file.cmj others/js_float.cmi others/js_float.cmj others/js_global.cmi others/js_global.cmj others/js_int.cmi others/js_int.cmj others/js_json.cmi others/js_json.cmj others/js_list.cmi others/js_list.cmj others/js_map.cmi others/js_map.cmj others/js_mapperRt.cmi others/js_mapperRt.cmj others/js_math.cmi others/js_math.cmj others/js_null.cmi others/js_null.cmj others/js_null_undefined.cmi others/js_null_undefined.cmj others/js_obj.cmi others/js_obj.cmj others/js_option.cmi others/js_option.cmj others/js_promise.cmi others/js_promise.cmj others/js_promise2.cmi others/js_promise2.cmj others/js_re.cmi others/js_re.cmj others/js_result.cmi others/js_result.cmj others/js_set.cmi others/js_set.cmj others/js_string.cmi others/js_string.cmj others/js_string2.cmi others/js_string2.cmj others/js_typed_array.cmi others/js_typed_array.cmj others/js_typed_array2.cmi others/js_typed_array2.cmj others/js_types.cmi others/js_types.cmj others/js_undefined.cmi others/js_undefined.cmj others/js_vector.cmi others/js_vector.cmj others/js_weakmap.cmi others/js_weakmap.cmj others/js_weakset.cmi others/js_weakset.cmj others/jsxC.cmi others/jsxC.cmj others/jsxDOMC.cmi others/jsxDOMC.cmj others/jsxDOMStyle.cmi others/jsxDOMStyle.cmj others/jsxDOMU.cmi others/jsxDOMU.cmj others/jsxEventC.cmi others/jsxEventC.cmj others/jsxEventU.cmi others/jsxEventU.cmj others/jsxPPXReactSupportC.cmi others/jsxPPXReactSupportC.cmj others/jsxPPXReactSupportU.cmi others/jsxPPXReactSupportU.cmj others/jsxU.cmi others/jsxU.cmj
-o others/belt_Array.cmj : cc_cmi others/belt_Array.res | others/belt.cmi others/belt_Array.cmi others/belt_internals.cmi others/js.cmi others/js.cmj others/js_math.cmj $bsc js_pkg
-o others/belt_Array.cmi : cc others/belt_Array.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_Float.cmj : cc_cmi others/belt_Float.res | others/belt.cmi others/belt_Float.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_Float.cmi : cc others/belt_Float.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_HashMap.cmj : cc_cmi others/belt_HashMap.res | others/belt.cmi others/belt_Array.cmj others/belt_HashMap.cmi others/belt_HashMapInt.cmj others/belt_HashMapString.cmj others/belt_Id.cmj others/belt_internalBuckets.cmj others/belt_internalBucketsType.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_HashMap.cmi : cc others/belt_HashMap.resi | others/belt.cmi others/belt_HashMapInt.cmi others/belt_HashMapString.cmi others/belt_Id.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_HashMapInt.cmj : cc_cmi others/belt_HashMapInt.res | others/belt.cmi others/belt_Array.cmj others/belt_HashMapInt.cmi others/belt_internalBuckets.cmj others/belt_internalBucketsType.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_HashMapInt.cmi : cc others/belt_HashMapInt.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_HashMapString.cmj : cc_cmi others/belt_HashMapString.res | others/belt.cmi others/belt_Array.cmj others/belt_HashMapString.cmi others/belt_internalBuckets.cmj others/belt_internalBucketsType.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_HashMapString.cmi : cc others/belt_HashMapString.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_HashSet.cmj : cc_cmi others/belt_HashSet.res | others/belt.cmi others/belt_Array.cmj others/belt_HashSet.cmi others/belt_HashSetInt.cmj others/belt_HashSetString.cmj others/belt_Id.cmj others/belt_internalBucketsType.cmj others/belt_internalSetBuckets.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_HashSet.cmi : cc others/belt_HashSet.resi | others/belt.cmi others/belt_HashSetInt.cmi others/belt_HashSetString.cmi others/belt_Id.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_HashSetInt.cmj : cc_cmi others/belt_HashSetInt.res | others/belt.cmi others/belt_Array.cmj others/belt_HashSetInt.cmi others/belt_internalBucketsType.cmj others/belt_internalSetBuckets.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_HashSetInt.cmi : cc others/belt_HashSetInt.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_HashSetString.cmj : cc_cmi others/belt_HashSetString.res | others/belt.cmi others/belt_Array.cmj others/belt_HashSetString.cmi others/belt_internalBucketsType.cmj others/belt_internalSetBuckets.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_HashSetString.cmi : cc others/belt_HashSetString.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_Id.cmj : cc_cmi others/belt_Id.res | others/belt.cmi others/belt_Id.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_Id.cmi : cc others/belt_Id.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_Int.cmj : cc_cmi others/belt_Int.res | others/belt.cmi others/belt_Int.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_Int.cmi : cc others/belt_Int.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_List.cmj : cc_cmi others/belt_List.res | others/belt.cmi others/belt_Array.cmj others/belt_List.cmi others/belt_SortArray.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_List.cmi : cc others/belt_List.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_Map.cmj : cc_cmi others/belt_Map.res | others/belt.cmi others/belt_Id.cmj others/belt_Map.cmi others/belt_MapDict.cmj others/belt_MapInt.cmj others/belt_MapString.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_Map.cmi : cc others/belt_Map.resi | others/belt.cmi others/belt_Id.cmi others/belt_MapDict.cmi others/belt_MapInt.cmi others/belt_MapString.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MapDict.cmj : cc_cmi others/belt_MapDict.res | others/belt.cmi others/belt_Array.cmj others/belt_Id.cmj others/belt_MapDict.cmi others/belt_internalAVLtree.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_MapDict.cmi : cc others/belt_MapDict.resi | others/belt.cmi others/belt_Id.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MapInt.cmj : cc_cmi others/belt_MapInt.res | others/belt.cmi others/belt_Array.cmj others/belt_MapInt.cmi others/belt_internalAVLtree.cmj others/belt_internalMapInt.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_MapInt.cmi : cc others/belt_MapInt.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MapString.cmj : cc_cmi others/belt_MapString.res | others/belt.cmi others/belt_Array.cmj others/belt_MapString.cmi others/belt_internalAVLtree.cmj others/belt_internalMapString.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_MapString.cmi : cc others/belt_MapString.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MutableMap.cmj : cc_cmi others/belt_MutableMap.res | others/belt.cmi others/belt_Array.cmj others/belt_Id.cmj others/belt_MutableMap.cmi others/belt_MutableMapInt.cmj others/belt_MutableMapString.cmj others/belt_internalAVLtree.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_MutableMap.cmi : cc others/belt_MutableMap.resi | others/belt.cmi others/belt_Id.cmi others/belt_MutableMapInt.cmi others/belt_MutableMapString.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MutableMapInt.cmj : cc_cmi others/belt_MutableMapInt.res | others/belt.cmi others/belt_Array.cmj others/belt_MutableMapInt.cmi others/belt_internalAVLtree.cmj others/belt_internalMapInt.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_MutableMapInt.cmi : cc others/belt_MutableMapInt.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MutableMapString.cmj : cc_cmi others/belt_MutableMapString.res | others/belt.cmi others/belt_Array.cmj others/belt_MutableMapString.cmi others/belt_internalAVLtree.cmj others/belt_internalMapString.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_MutableMapString.cmi : cc others/belt_MutableMapString.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MutableQueue.cmj : cc_cmi others/belt_MutableQueue.res | others/belt.cmi others/belt_Array.cmj others/belt_MutableQueue.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MutableQueue.cmi : cc others/belt_MutableQueue.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MutableSet.cmj : cc_cmi others/belt_MutableSet.res | others/belt.cmi others/belt_Array.cmj others/belt_Id.cmj others/belt_MutableSet.cmi others/belt_MutableSetInt.cmj others/belt_MutableSetString.cmj others/belt_SortArray.cmj others/belt_internalAVLset.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_MutableSet.cmi : cc others/belt_MutableSet.resi | others/belt.cmi others/belt_Id.cmi others/belt_MutableSetInt.cmi others/belt_MutableSetString.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MutableSetInt.cmj : cc_cmi others/belt_MutableSetInt.res | others/belt.cmi others/belt_Array.cmj others/belt_MutableSetInt.cmi others/belt_SortArrayInt.cmj others/belt_internalAVLset.cmj others/belt_internalSetInt.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_MutableSetInt.cmi : cc others/belt_MutableSetInt.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MutableSetString.cmj : cc_cmi others/belt_MutableSetString.res | others/belt.cmi others/belt_Array.cmj others/belt_MutableSetString.cmi others/belt_SortArrayString.cmj others/belt_internalAVLset.cmj others/belt_internalSetString.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_MutableSetString.cmi : cc others/belt_MutableSetString.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MutableStack.cmj : cc_cmi others/belt_MutableStack.res | others/belt.cmi others/belt_MutableStack.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_MutableStack.cmi : cc others/belt_MutableStack.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_Option.cmj : cc_cmi others/belt_Option.res | others/belt.cmi others/belt_Option.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_Option.cmi : cc others/belt_Option.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_Range.cmj : cc_cmi others/belt_Range.res | others/belt.cmi others/belt_Range.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_Range.cmi : cc others/belt_Range.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_Result.cmj : cc_cmi others/belt_Result.res | others/belt.cmi others/belt_Result.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_Result.cmi : cc others/belt_Result.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_Set.cmj : cc_cmi others/belt_Set.res | others/belt.cmi others/belt_Id.cmj others/belt_Set.cmi others/belt_SetDict.cmj others/belt_SetInt.cmj others/belt_SetString.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_Set.cmi : cc others/belt_Set.resi | others/belt.cmi others/belt_Id.cmi others/belt_SetDict.cmi others/belt_SetInt.cmi others/belt_SetString.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_SetDict.cmj : cc_cmi others/belt_SetDict.res | others/belt.cmi others/belt_Array.cmj others/belt_Id.cmj others/belt_SetDict.cmi others/belt_internalAVLset.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_SetDict.cmi : cc others/belt_SetDict.resi | others/belt.cmi others/belt_Id.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_SetInt.cmj : cc_cmi others/belt_SetInt.res | others/belt.cmi others/belt_Array.cmj others/belt_SetInt.cmi others/belt_internalAVLset.cmj others/belt_internalSetInt.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_SetInt.cmi : cc others/belt_SetInt.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_SetString.cmj : cc_cmi others/belt_SetString.res | others/belt.cmi others/belt_Array.cmj others/belt_SetString.cmi others/belt_internalAVLset.cmj others/belt_internalSetString.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_SetString.cmi : cc others/belt_SetString.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_SortArray.cmj : cc_cmi others/belt_SortArray.res | others/belt.cmi others/belt_Array.cmj others/belt_SortArray.cmi others/belt_SortArrayInt.cmj others/belt_SortArrayString.cmj others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_SortArray.cmi : cc others/belt_SortArray.resi | others/belt.cmi others/belt_SortArrayInt.cmi others/belt_SortArrayString.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_SortArrayInt.cmj : cc_cmi others/belt_SortArrayInt.res | others/belt.cmi others/belt_Array.cmj others/belt_SortArrayInt.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_SortArrayInt.cmi : cc others/belt_SortArrayInt.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_SortArrayString.cmj : cc_cmi others/belt_SortArrayString.res | others/belt.cmi others/belt_Array.cmj others/belt_SortArrayString.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_SortArrayString.cmi : cc others/belt_SortArrayString.resi | others/belt_internals.cmi others/js.cmi $bsc
-o others/belt_internalAVLset.cmj : cc_cmi others/belt_internalAVLset.res | others/belt.cmi others/belt_Array.cmj others/belt_Id.cmj others/belt_SortArray.cmj others/belt_internalAVLset.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalAVLset.cmi : cc others/belt_internalAVLset.resi | others/belt.cmi others/belt_Id.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalAVLtree.cmj : cc_cmi others/belt_internalAVLtree.res | others/belt.cmi others/belt_Array.cmj others/belt_Id.cmj others/belt_SortArray.cmj others/belt_internalAVLtree.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalAVLtree.cmi : cc others/belt_internalAVLtree.resi | others/belt.cmi others/belt_Id.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalBuckets.cmj : cc_cmi others/belt_internalBuckets.res | others/belt.cmi others/belt_Array.cmj others/belt_internalBuckets.cmi others/belt_internalBucketsType.cmj others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalBuckets.cmi : cc others/belt_internalBuckets.resi | others/belt.cmi others/belt_internalBucketsType.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_internalBucketsType.cmj : cc_cmi others/belt_internalBucketsType.res | others/belt.cmi others/belt_Array.cmj others/belt_internalBucketsType.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalBucketsType.cmi : cc others/belt_internalBucketsType.resi | others/belt.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalMapInt.cmi others/belt_internalMapInt.cmj : cc others/belt_internalMapInt.res | others/belt.cmi others/belt_Array.cmj others/belt_SortArray.cmj others/belt_internalAVLtree.cmj others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalMapString.cmi others/belt_internalMapString.cmj : cc others/belt_internalMapString.res | others/belt.cmi others/belt_Array.cmj others/belt_SortArray.cmj others/belt_internalAVLtree.cmj others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalSetBuckets.cmj : cc_cmi others/belt_internalSetBuckets.res | others/belt.cmi others/belt_Array.cmj others/belt_internalBucketsType.cmj others/belt_internalSetBuckets.cmi others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalSetBuckets.cmi : cc others/belt_internalSetBuckets.resi | others/belt.cmi others/belt_internalBucketsType.cmi others/belt_internals.cmi others/js.cmi $bsc js_pkg
-o others/belt_internalSetInt.cmi others/belt_internalSetInt.cmj : cc others/belt_internalSetInt.res | others/belt.cmi others/belt_Array.cmj others/belt_SortArrayInt.cmj others/belt_internalAVLset.cmj others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/belt_internalSetString.cmi others/belt_internalSetString.cmj : cc others/belt_internalSetString.res | others/belt.cmi others/belt_Array.cmj others/belt_SortArrayString.cmj others/belt_internalAVLset.cmj others/belt_internals.cmi others/js.cmi others/js.cmj $bsc js_pkg
-o others/dom.cmi others/dom.cmj : cc others/dom.res | others/belt_internals.cmi others/dom_storage.cmj others/dom_storage2.cmj others/js.cmi $bsc js_pkg
-o others/dom_storage.cmi others/dom_storage.cmj : cc others/dom_storage.res | others/belt_internals.cmi others/dom_storage2.cmj others/js.cmi $bsc js_pkg
-o others/dom_storage2.cmi others/dom_storage2.cmj : cc others/dom_storage2.res | others/belt_internals.cmi others/js.cmi $bsc
-o others : phony others/belt_Array.cmi others/belt_Array.cmj others/belt_Float.cmi others/belt_Float.cmj others/belt_HashMap.cmi others/belt_HashMap.cmj others/belt_HashMapInt.cmi others/belt_HashMapInt.cmj others/belt_HashMapString.cmi others/belt_HashMapString.cmj others/belt_HashSet.cmi others/belt_HashSet.cmj others/belt_HashSetInt.cmi others/belt_HashSetInt.cmj others/belt_HashSetString.cmi others/belt_HashSetString.cmj others/belt_Id.cmi others/belt_Id.cmj others/belt_Int.cmi others/belt_Int.cmj others/belt_List.cmi others/belt_List.cmj others/belt_Map.cmi others/belt_Map.cmj others/belt_MapDict.cmi others/belt_MapDict.cmj others/belt_MapInt.cmi others/belt_MapInt.cmj others/belt_MapString.cmi others/belt_MapString.cmj others/belt_MutableMap.cmi others/belt_MutableMap.cmj others/belt_MutableMapInt.cmi others/belt_MutableMapInt.cmj others/belt_MutableMapString.cmi others/belt_MutableMapString.cmj others/belt_MutableQueue.cmi others/belt_MutableQueue.cmj others/belt_MutableSet.cmi others/belt_MutableSet.cmj others/belt_MutableSetInt.cmi others/belt_MutableSetInt.cmj others/belt_MutableSetString.cmi others/belt_MutableSetString.cmj others/belt_MutableStack.cmi others/belt_MutableStack.cmj others/belt_Option.cmi others/belt_Option.cmj others/belt_Range.cmi others/belt_Range.cmj others/belt_Result.cmi others/belt_Result.cmj others/belt_Set.cmi others/belt_Set.cmj others/belt_SetDict.cmi others/belt_SetDict.cmj others/belt_SetInt.cmi others/belt_SetInt.cmj others/belt_SetString.cmi others/belt_SetString.cmj others/belt_SortArray.cmi others/belt_SortArray.cmj others/belt_SortArrayInt.cmi others/belt_SortArrayInt.cmj others/belt_SortArrayString.cmi others/belt_SortArrayString.cmj others/belt_internalAVLset.cmi others/belt_internalAVLset.cmj others/belt_internalAVLtree.cmi others/belt_internalAVLtree.cmj others/belt_internalBuckets.cmi others/belt_internalBuckets.cmj others/belt_internalBucketsType.cmi others/belt_internalBucketsType.cmj others/belt_internalMapInt.cmi others/belt_internalMapInt.cmj others/belt_internalMapString.cmi others/belt_internalMapString.cmj others/belt_internalSetBuckets.cmi others/belt_internalSetBuckets.cmj others/belt_internalSetInt.cmi others/belt_internalSetInt.cmj others/belt_internalSetString.cmi others/belt_internalSetString.cmj others/dom.cmi others/dom.cmj others/dom_storage.cmi others/dom_storage.cmj others/dom_storage2.cmi others/dom_storage2.cmj
diff --git a/jscomp/others/setm.cppo.res b/jscomp/others/setm.cppo.res
deleted file mode 100644
index b8c5f6f..0000000
--- a/jscomp/others/setm.cppo.res
+++ /dev/null
@@ -1,346 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** This module is [`Belt.MutableSet`]() specialized with key type to be a primitive type.
-    It is more efficient in general, the  API is the same with [`Belt_MutableSet`]() except its key type is fixed,
-    and identity is not needed(using the built-in one)
-*/
-
-#ifdef TYPE_INT
-module I = Belt_internalSetInt
-module S = Belt_SortArrayInt
-#elif defined TYPE_STRING
-module I = Belt_internalSetString
-module S = Belt_SortArrayString
-#else
-[%error "unknown type"]
-#endif
-
-module N = Belt_internalAVLset
-module A = Belt_Array
-
-/** The type of the set elements. */
-type value = I.value
-
-/** The type of sets. */
-type t = {mutable data: I.t}
-
-let rec remove0 = (nt, x: value) => {
-  let k = nt.N.value
-  if x == k {
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (Some(_), Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if x < k {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = remove0(l, x)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = remove0(r, x)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let remove = (d, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(oldRoot2) =>
-    let newRoot = remove0(oldRoot2, v)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-  }
-}
-
-let rec removeMany0 = (t, xs, i, len) =>
-  if i < len {
-    let ele = A.getUnsafe(xs, i)
-    let u = remove0(t, ele)
-    switch u {
-    | None => None
-    | Some(t) => removeMany0(t, xs, i + 1, len)
-    }
-  } else {
-    Some(t)
-  }
-
-let removeMany = (d: t, xs) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => ()
-  | Some(nt) =>
-    let len = A.length(xs)
-    d.data = removeMany0(nt, xs, 0, len)
-  }
-}
-
-let rec removeCheck0 = (nt, x: value, removed) => {
-  let k = nt.N.value
-  if x == k {
-    let () = removed.contents = true
-    let {N.left: l, right: r} = nt
-    switch (l, r) {
-    | (None, _) => r
-    | (_, None) => l
-    | (Some(_), Some(nr)) =>
-      nt.right = N.removeMinAuxWithRootMutate(nt, nr)
-      Some(N.balMutate(nt))
-    }
-  } else if x < k {
-    switch nt.left {
-    | None => Some(nt)
-    | Some(l) =>
-      nt.left = removeCheck0(l, x, removed)
-      Some(N.balMutate(nt))
-    }
-  } else {
-    switch nt.right {
-    | None => Some(nt)
-    | Some(r) =>
-      nt.right = removeCheck0(r, x, removed)
-      Some(N.balMutate(nt))
-    }
-  }
-}
-
-let removeCheck = (d: t, v) => {
-  let oldRoot = d.data
-  switch oldRoot {
-  | None => false
-  | Some(oldRoot2) =>
-    let removed = ref(false)
-    let newRoot = removeCheck0(oldRoot2, v, removed)
-    if newRoot !== oldRoot {
-      d.data = newRoot
-    }
-    removed.contents
-  }
-}
-
-let rec addCheck0 = (t, x: value, added) =>
-  switch t {
-  | None =>
-    added.contents = true
-    N.singleton(x)
-  | Some(nt) =>
-    let k = nt.N.value
-    if x == k {
-      t
-    } else {
-      let {N.left: l, right: r} = nt
-      if x < k {
-        let ll = addCheck0(l, x, added)
-        nt.left = ll
-      } else {
-        nt.right = addCheck0(r, x, added)
-      }
-      Some(N.balMutate(nt))
-    }
-  }
-
-let addCheck = (m: t, e) => {
-  let oldRoot = m.data
-  let added = ref(false)
-  let newRoot = addCheck0(oldRoot, e, added)
-  if newRoot !== oldRoot {
-    m.data = newRoot
-  }
-  added.contents
-}
-
-let add = (d, k) => {
-  let oldRoot = d.data
-  let v = I.addMutate(oldRoot, k)
-  if v !== oldRoot {
-    d.data = v
-  }
-}
-
-let addArrayMutate = (t, xs) => {
-  let v = ref(t)
-  for i in 0 to A.length(xs) - 1 {
-    v.contents = I.addMutate(v.contents, A.getUnsafe(xs, i))
-  }
-  v.contents
-}
-
-let mergeMany = (d, arr) => d.data = addArrayMutate(d.data, arr)
-
-let make = () => {data: None}
-
-let isEmpty = d => N.isEmpty(d.data)
-
-let minimum = d => N.minimum(d.data)
-
-let minUndefined = d => N.minUndefined(d.data)
-
-let maximum = d => N.maximum(d.data)
-
-let maxUndefined = d => N.maxUndefined(d.data)
-
-let forEachU = (d, f) => N.forEachU(d.data, f)
-let forEach = (d, f) => forEachU(d, (. a) => f(a))
-
-let reduceU = (d, acc, cb) => N.reduceU(d.data, acc, cb)
-let reduce = (d, acc, cb) => reduceU(d, acc, (. a, b) => cb(a, b))
-
-let everyU = (d, p) => N.everyU(d.data, p)
-let every = (d, p) => everyU(d, (. a) => p(a))
-let someU = (d, p) => N.someU(d.data, p)
-let some = (d, p) => someU(d, (. a) => p(a))
-let size = d => N.size(d.data)
-let toList = d => N.toList(d.data)
-let toArray = d => N.toArray(d.data)
-
-let fromSortedArrayUnsafe = xs => {data: N.fromSortedArrayUnsafe(xs)}
-
-let checkInvariantInternal = d => N.checkInvariantInternal(d.data)
-
-let fromArray = xs => {data: I.fromArray(xs)}
-
-let cmp = (d0, d1) => I.cmp(d0.data, d1.data)
-let eq = (d0, d1) => I.eq(d0.data, d1.data)
-let get = (d, x) => I.get(d.data, x)
-let getUndefined = (d, x) => I.getUndefined(d.data, x)
-let getExn = (d, x) => I.getExn(d.data, x)
-
-let split = (d, key) => {
-  let arr = N.toArray(d.data)
-  let i = S.binarySearch(arr, key)
-  let len = A.length(arr)
-  if i < 0 {
-    let next = -i - 1
-    (
-      (
-        {data: N.fromSortedArrayAux(arr, 0, next)},
-        {data: N.fromSortedArrayAux(arr, next, len - next)},
-      ),
-      false,
-    )
-  } else {
-    (
-      (
-        {data: N.fromSortedArrayAux(arr, 0, i)},
-        {data: N.fromSortedArrayAux(arr, i + 1, len - i - 1)},
-      ),
-      true,
-    )
-  }
-}
-
-let keepU = (d, p) => {data: N.keepCopyU(d.data, p)}
-let keep = (d, p) => keepU(d, (. a) => p(a))
-
-let partitionU = (d, p) => {
-  let (a, b) = N.partitionCopyU(d.data, p)
-  ({data: a}, {data: b})
-}
-let partition = (d, p) => partitionU(d, (. a) => p(a))
-
-let subset = (a, b) => I.subset(a.data, b.data)
-let intersect = (dataa, datab) => {
-  let (dataa, datab) = (dataa.data, datab.data)
-  switch (dataa, datab) {
-  | (None, _) => make()
-  | (_, None) => make()
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    if (
-      A.getUnsafe(tmp, sizea - 1) < A.getUnsafe(tmp, sizea) ||
-        A.getUnsafe(tmp, totalSize - 1) < A.getUnsafe(tmp, 0)
-    ) {
-      make()
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(Pervasives.min(sizea, sizeb))
-      let k = S.intersect(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0)
-      {data: N.fromSortedArrayAux(tmp2, 0, k)}
-    }
-  }
-}
-
-let diff = (dataa, datab): t => {
-  let (dataa, datab) = (dataa.data, datab.data)
-  switch (dataa, datab) {
-  | (None, _) => make()
-  | (_, None) => {data: N.copy(dataa)}
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    if (
-      A.getUnsafe(tmp, sizea - 1) < A.getUnsafe(tmp, sizea) ||
-        A.getUnsafe(tmp, totalSize - 1) < A.getUnsafe(tmp, 0)
-    ) {
-      {data: N.copy(dataa)}
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(sizea)
-      let k = S.diff(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0)
-      {data: N.fromSortedArrayAux(tmp2, 0, k)}
-    }
-  }
-}
-
-let union = (dataa: t, datab: t): t => {
-  let (dataa, datab) = (dataa.data, datab.data)
-  switch (dataa, datab) {
-  | (None, _) => {data: N.copy(datab)}
-  | (_, None) => {data: N.copy(dataa)}
-  | (Some(dataa0), Some(datab0)) =>
-    let (sizea, sizeb) = (N.lengthNode(dataa0), N.lengthNode(datab0))
-    let totalSize = sizea + sizeb
-    let tmp = A.makeUninitializedUnsafe(totalSize)
-    ignore(N.fillArray(dataa0, 0, tmp))
-    ignore(N.fillArray(datab0, sizea, tmp))
-    if A.getUnsafe(tmp, sizea - 1) < A.getUnsafe(tmp, sizea) {
-      {data: N.fromSortedArrayAux(tmp, 0, totalSize)}
-    } else {
-      let tmp2 = A.makeUninitializedUnsafe(totalSize)
-      let k = S.union(tmp, 0, sizea, tmp, sizea, sizeb, tmp2, 0)
-      {data: N.fromSortedArrayAux(tmp2, 0, k)}
-    }
-  }
-}
-
-let has = (d, x) => I.has(d.data, x)
-
-let copy = d => {data: N.copy(d.data)}
diff --git a/jscomp/others/setm.cppo.resi b/jscomp/others/setm.cppo.resi
deleted file mode 100644
index c51fd0a..0000000
--- a/jscomp/others/setm.cppo.resi
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This module is [`Belt.MutableSet`]() specialized with key type to be a primitive type.
-
-It is more efficient in general, the  API is the same with [`Belt.MutableSet`]() except its key type is fixed,
-and identity is not needed(using the built-in one)
-
-**See** [`Belt.MutableSet`]()
-*/
-
-#ifdef TYPE_STRING
-/** The type of the set elements. */
-type value = string
-#elif defined TYPE_INT
-/** The type of the set elements. */
-type value = int
-#else
-[%error "unknown type"]
-#endif
-
-/** The type of sets. */
-type t
-
-let make: unit => t
-
-let fromArray: array<value> => t
-let fromSortedArrayUnsafe: array<value> => t
-
-let copy: t => t
-let isEmpty: t => bool
-let has: (t, value) => bool
-
-let add: (t, value) => unit
-let addCheck: (t, value) => bool
-let mergeMany: (t, array<value>) => unit
-let remove: (t, value) => unit
-let removeCheck: (t, value) => bool
-let removeMany: (t, array<value>) => unit
-
-let union: (t, t) => t
-let intersect: (t, t) => t
-let diff: (t, t) => t
-let subset: (t, t) => bool
-
-let cmp: (t, t) => int
-let eq: (t, t) => bool
-
-let forEachU: (t, (. value) => unit) => unit
-
-/** In increasing order*/
-let forEach: (t, value => unit) => unit
-
-let reduceU: (t, 'a, (. 'a, value) => 'a) => 'a
-
-/** Iterate in increasing order. */
-let reduce: (t, 'a, ('a, value) => 'a) => 'a
-
-let everyU: (t, (. value) => bool) => bool
-
-/**
-`every(p, s)` checks if all elements of the set satisfy the predicate `p`.
-Order unspecified. */
-let every: (t, value => bool) => bool
-
-let someU: (t, (. value) => bool) => bool
-
-/**
-`some(p, s)` checks if at least one element of the set satisfies the predicate
-`p`. Oder unspecified.
-*/
-let some: (t, value => bool) => bool
-
-let keepU: (t, (. value) => bool) => t
-
-/** 
-`keep(s, p)` returns a fresh copy of the set of all elements in `s` that satisfy
-predicate `p`.
-*/
-let keep: (t, value => bool) => t
-
-let partitionU: (t, (. value) => bool) => (t, t)
-
-/** 
-`partition(s, p)` returns a fresh copy pair of sets `(s1, s2)`, where `s1` is
-the set of all the elements of `s` that satisfy the predicate `p`, and `s2` is
-the set of all the elements of `s` that do not satisfy `p`. 
-*/
-let partition: (t, value => bool) => (t, t)
-
-let size: t => int
-
-/** In increasing order with respect */
-let toList: t => list<value>
-
-/** In increasing order with respect */
-let toArray: t => array<value>
-
-let minimum: t => option<value>
-let minUndefined: t => Js.undefined<value>
-let maximum: t => option<value>
-let maxUndefined: t => Js.undefined<value>
-
-let get: (t, value) => option<value>
-let getUndefined: (t, value) => Js.undefined<value>
-let getExn: (t, value) => value
-
-/**
-`split(s, key)` return a fresh copy of each
-*/
-let split: (t, value) => ((t, t), bool)
-
-/**
-**raise** when invariant is not held
-*/
-let checkInvariantInternal: t => unit
diff --git a/jscomp/others/sort.cppo.res b/jscomp/others/sort.cppo.res
deleted file mode 100644
index 8c521c5..0000000
--- a/jscomp/others/sort.cppo.res
+++ /dev/null
@@ -1,310 +0,0 @@
-#ifdef TYPE_INT
-type element = int
-#elif defined TYPE_STRING
-type element = string
-#else
-[%error "unknown type"]
-#endif
-
-module A = Belt_Array
-
-let rec sortedLengthAuxMore = (xs: array<element>, prec, acc, len) =>
-  if acc >= len {
-    acc
-  } else {
-    let v = A.getUnsafe(xs, acc)
-    if prec > v {
-      sortedLengthAuxMore(xs, v, acc + 1, len)
-    } else {
-      acc
-    }
-  }
-
-let rec sortedLengthAuxLess = (xs: array<element>, prec, acc, len) =>
-  if acc >= len {
-    acc
-  } else {
-    let v = A.getUnsafe(xs, acc)
-    if prec < v {
-      sortedLengthAuxLess(xs, v, acc + 1, len)
-    } else {
-      acc
-    }
-  }
-
-let strictlySortedLength = (xs: array<element>) => {
-  let len = A.length(xs)
-  switch len {
-  | 0 | 1 => len
-  | _ =>
-    let (x0, x1) = (A.getUnsafe(xs, 0), A.getUnsafe(xs, 1))
-
-    /* let c = cmp x0 x1 [@bs]  in */
-    if x0 < x1 {
-      sortedLengthAuxLess(xs, x1, 2, len)
-    } else if x0 > x1 {
-      -sortedLengthAuxMore(xs, x1, 2, len)
-    } else {
-      1
-    }
-  }
-}
-
-let rec isSortedAux = (a: array<element>, i, last_bound) =>
-  /* when `i = len - 1`, it reaches the last element */
-  if i == last_bound {
-    true
-  } else if A.getUnsafe(a, i) <= A.getUnsafe(a, i + 1) {
-    isSortedAux(a, i + 1, last_bound)
-  } else {
-    false
-  }
-
-let isSorted = a => {
-  let len = A.length(a)
-  if len == 0 {
-    true
-  } else {
-    isSortedAux(a, 0, len - 1)
-  }
-}
-
-let cutoff = 5
-
-let merge = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len and src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    if s1 <= s2 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d + 1)
-      } else {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d + 1, ~len=src2r - i2)
-      }
-    } else {
-      A.setUnsafe(dst, d, s2)
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d + 1)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d + 1, ~len=src1r - i1)
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let union = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    /* let c = cmp s1 s2 [@bs] in */
-    if s1 < s2 {
-      /* `s1` is larger than all elements in `d` */
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let d = d + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d, ~len=src2r - i2)
-        d + src2r - i2
-      }
-    } else if s1 == s2 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      let d = d + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else if i1 == src1r {
-        A.blitUnsafe(~src=src2, ~srcOffset=i2, ~dst, ~dstOffset=d, ~len=src2r - i2)
-        d + src2r - i2
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    } else {
-      A.setUnsafe(dst, d, s2)
-      let i2 = i2 + 1
-      let d = d + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let intersect = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    /* let c = cmp s1 s2 [@bs] in */
-    if s1 < s2 {
-      /* A.setUnsafe dst d s1; */
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        d
-      }
-    } else if s1 == s2 {
-      A.setUnsafe(dst, d, s1)
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      let d = d + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else {
-        d
-      }
-    } else {
-      /* A.setUnsafe dst d s2; */
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        d
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let diff = (src: array<element>, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-  let src1r = src1ofs + src1len
-  let src2r = src2ofs + src2len
-  let rec loop = (i1, s1, i2, s2, d) =>
-    /* let c = cmp s1 s2 [@bs] in */
-    if s1 < s2 {
-      A.setUnsafe(dst, d, s1)
-      let d = d + 1
-      let i1 = i1 + 1
-      if i1 < src1r {
-        loop(i1, A.getUnsafe(src, i1), i2, s2, d)
-      } else {
-        d
-      }
-    } else if s1 == s2 {
-      let i1 = i1 + 1
-      let i2 = i2 + 1
-      if i1 < src1r && i2 < src2r {
-        loop(i1, A.getUnsafe(src, i1), i2, A.getUnsafe(src2, i2), d)
-      } else if i1 == src1r {
-        d
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    } else {
-      let i2 = i2 + 1
-      if i2 < src2r {
-        loop(i1, s1, i2, A.getUnsafe(src2, i2), d)
-      } else {
-        A.blitUnsafe(~src, ~srcOffset=i1, ~dst, ~dstOffset=d, ~len=src1r - i1)
-        d + src1r - i1
-      }
-    }
-
-  loop(src1ofs, A.getUnsafe(src, src1ofs), src2ofs, A.getUnsafe(src2, src2ofs), dstofs)
-}
-
-let insertionSort = (src: array<element>, srcofs, dst, dstofs, len) =>
-  for i in 0 to len - 1 {
-    let e = A.getUnsafe(src, srcofs + i)
-    let j = ref(dstofs + i - 1)
-    while j.contents >= dstofs && A.getUnsafe(dst, j.contents) > e {
-      A.setUnsafe(dst, j.contents + 1, A.getUnsafe(dst, j.contents))
-      j.contents = j.contents - 1
-    }
-    A.setUnsafe(dst, j.contents + 1, e)
-  }
-
-let rec sortTo = (src: array<element>, srcofs, dst, dstofs, len) =>
-  if len <= cutoff {
-    insertionSort(src, srcofs, dst, dstofs, len)
-  } else {
-    let l1 = len / 2
-    let l2 = len - l1
-    sortTo(src, srcofs + l1, dst, dstofs + l1, l2)
-    sortTo(src, srcofs, src, srcofs + l2, l1)
-    merge(src, srcofs + l2, l1, dst, dstofs + l1, l2, dst, dstofs)
-  }
-
-let stableSortInPlace = (a: array<element>) => {
-  let l = A.length(a)
-  if l <= cutoff {
-    insertionSort(a, 0, a, 0, l)
-  } else {
-    let l1 = l / 2
-    let l2 = l - l1
-    let t = Belt_Array.makeUninitializedUnsafe(l2)
-    sortTo(a, l1, t, 0, l2)
-    sortTo(a, 0, a, l2, l1)
-    merge(a, l2, l1, t, 0, l2, a, 0)
-  }
-}
-
-let stableSort = a => {
-  let b = A.copy(a)
-  stableSortInPlace(b)
-  b
-}
-
-let rec binarySearchAux = (arr: array<element>, lo, hi, key) => {
-  let mid = (lo + hi) / 2
-  let midVal = A.getUnsafe(arr, mid)
-
-  /* let c = cmp key midVal [@bs] in */
-  if key == midVal {
-    mid
-  } else if key < midVal {
-    /* a[lo] =< key < a[mid] <= a[hi] */
-    if hi == mid {
-      if A.getUnsafe(arr, lo) == key {
-        lo
-      } else {
-        -(hi + 1)
-      }
-    } else {
-      binarySearchAux(arr, lo, mid, key)
-    }
-  } /* a[lo] =< a[mid] < key <= a[hi] */
-  else if lo == mid {
-    if A.getUnsafe(arr, hi) == key {
-      hi
-    } else {
-      -(hi + 1)
-    }
-  } else {
-    binarySearchAux(arr, mid, hi, key)
-  }
-}
-
-let binarySearch = (sorted: array<element>, key): int => {
-  let len = A.length(sorted)
-  if len == 0 {
-    -1
-  } else {
-    let lo = A.getUnsafe(sorted, 0)
-
-    /* let c = cmp key lo [@bs] in */
-    if key < lo {
-      -1
-    } else {
-      let hi = A.getUnsafe(sorted, len - 1)
-
-      /* let c2 = cmp key hi [@bs]in */
-      if key > hi {
-        -(len + 1)
-      } else {
-        binarySearchAux(sorted, 0, len - 1, key)
-      }
-    }
-  }
-}
diff --git a/jscomp/others/sort.cppo.resi b/jscomp/others/sort.cppo.resi
deleted file mode 100644
index 8570da4..0000000
--- a/jscomp/others/sort.cppo.resi
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright (C) 2017 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/***
-This is a specialized module for [`Belt_SortArray`](), the docs in that module also
-applies here, except the comparator is fixed and inlined
-*/
-
-#ifdef TYPE_INT
-type element = int
-#elif defined TYPE_STRING
-type element = string
-#else
-[%error "unknown type"]
-#endif
-
-/**
-The same as [`Belt_SortArray.strictlySortedLength`]() except the comparator is fixed
-
-**return** `+n` means increasing order  `-n` means negative order
-*/
-let strictlySortedLength: array<element> => int
-
-/** `sorted(xs)` return true if `xs` is in non strict increasing order */
-let isSorted: array<element> => bool
-
-/**
-The same as [`Belt_SortArray.stableSortInPlaceBy`]() except the comparator is fixed
-*/
-let stableSortInPlace: array<element> => unit
-
-/**
-The same as [`Belt_SortArray.stableSortBy`]() except the comparator is fixed
-*/
-let stableSort: array<element> => array<element>
-
-/**
-If value is not found and value is less than one or more elements in array,
-the negative number returned is the bitwise complement of the index of the first element
-that is larger than value.
-
-If value is not found and value is greater than all elements in array,
-the negative number returned is the bitwise complement of
-(the index of the last element plus 1)
-
-for example, if `key` is smaller than all elements return `-1` since `lnot (-1) = 0`
-if `key` is larger than all elements return `- (len + 1)` since `lnot (-(len+1)) = len`
-*/
-let binarySearch: (array<element>, element) => int
-
-/**
-`union(src, src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs, cmp)` assume
-`src` and `src2` is strictly sorted. for equivalent elements, it is picked from
-`src` also assume that `dst` is large enough to store all elements
-*/
-let union: (array<element>, int, int, array<element>, int, int, array<element>, int) => int
-
-let intersect: (array<element>, int, int, array<element>, int, int, array<element>, int) => int
-
-let diff: (array<element>, int, int, array<element>, int, int, array<element>, int) => int
diff --git a/jscomp/ounit_tests/.ocamlformat b/jscomp/ounit_tests/.ocamlformat
deleted file mode 100644
index 593b6a1..0000000
--- a/jscomp/ounit_tests/.ocamlformat
+++ /dev/null
@@ -1 +0,0 @@
-disable
diff --git a/jscomp/ounit_tests/dune b/jscomp/ounit_tests/dune
deleted file mode 100644
index d4d7133..0000000
--- a/jscomp/ounit_tests/dune
+++ /dev/null
@@ -1,13 +0,0 @@
-(env
- (static
-  (flags
-   (:standard -ccopt -static))))
-
-(executable
- (name ounit_tests_main)
- (public_name ounit_tests)
- (enabled_if
-  (<> %{profile} browser))
- (flags
-  (:standard -w -A))
- (libraries bsb bsb_helper core ounit2))
diff --git a/jscomp/ounit_tests/ounit_array_tests.ml b/jscomp/ounit_tests/ounit_array_tests.ml
deleted file mode 100644
index dbf82d5..0000000
--- a/jscomp/ounit_tests/ounit_array_tests.ml
+++ /dev/null
@@ -1,89 +0,0 @@
-let ((>::),
-    (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-
-let printer_int_array = fun xs -> 
-    String.concat ","
-    (List.map string_of_int @@ Array.to_list xs )
-
-let suites = 
-    __FILE__
-    >:::
-    [
-     __LOC__ >:: begin fun _ ->
-        Ext_array.find_and_split 
-            [|"a"; "b";"c"|]
-            Ext_string.equal "--" =~ No_split
-     end;
-    __LOC__ >:: begin fun _ ->
-        Ext_array.find_and_split 
-            [|"a"; "b";"c";"--"|]
-            Ext_string.equal "--" =~ Split( [|"a";"b";"c"|], [||])
-     end;
-     __LOC__ >:: begin fun _ ->
-        Ext_array.find_and_split 
-            [|"--"; "a"; "b";"c";"--"|]
-            Ext_string.equal "--" =~ Split ([||], [|"a";"b";"c";"--"|])
-     end;
-    __LOC__ >:: begin fun _ ->
-        Ext_array.find_and_split 
-            [| "u"; "g"; "--"; "a"; "b";"c";"--"|]
-            Ext_string.equal "--" =~ Split ([|"u";"g"|], [|"a";"b";"c";"--"|])
-     end;
-    __LOC__ >:: begin fun _ ->
-        Ext_array.reverse [|1;2|] =~ [|2;1|];
-        Ext_array.reverse [||] =~ [||]  
-    end     ;
-    __LOC__ >:: begin fun _ -> 
-        let (=~) = OUnit.assert_equal ~printer:printer_int_array in 
-        let k x y = Ext_array.of_list_map y x in 
-        k succ [] =~ [||];
-        k succ [1]  =~ [|2|];
-        k succ [1;2;3]  =~ [|2;3;4|];
-        k succ [1;2;3;4]  =~ [|2;3;4;5|];
-        k succ [1;2;3;4;5]  =~ [|2;3;4;5;6|];
-        k succ [1;2;3;4;5;6]  =~ [|2;3;4;5;6;7|];
-        k succ [1;2;3;4;5;6;7]  =~ [|2;3;4;5;6;7;8|];
-    end; 
-    __LOC__ >:: begin fun _ -> 
-        Ext_array.to_list_map_acc
-        [|1;2;3;4;5;6|] [1;2;3]
-        (fun x -> if x mod 2 = 0 then Some x else None )
-        =~ [2;4;6;1;2;3]
-    end;
-    __LOC__ >:: begin fun _ -> 
-        Ext_array.to_list_map_acc
-        [|1;2;3;4;5;6|] []
-        (fun x -> if x mod 2 = 0 then Some x else None )
-        =~ [2;4;6]
-    end;
-
-    __LOC__ >:: begin fun _ -> 
-    OUnit.assert_bool __LOC__ 
-        (Ext_array.for_all2_no_exn        
-        [|1;2;3|]
-        [|1;2;3|]
-        (=)
-        )
-    end;
-    __LOC__ >:: begin fun _ -> 
-    OUnit.assert_bool __LOC__
-    (Ext_array.for_all2_no_exn
-    [||] [||] (=) 
-    );
-    OUnit.assert_bool __LOC__
-    (not @@ Ext_array.for_all2_no_exn
-    [||] [|1|] (=) 
-    )
-    end
-    ;
-    __LOC__ >:: begin fun _ -> 
-    OUnit.assert_bool __LOC__
-    (not (Ext_array.for_all2_no_exn        
-        [|1;2;3|]
-        [|1;2;33|]
-        (=)
-        ))
-    end
-    ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_bal_tree_tests.ml b/jscomp/ounit_tests/ounit_bal_tree_tests.ml
deleted file mode 100644
index 647da53..0000000
--- a/jscomp/ounit_tests/ounit_bal_tree_tests.ml
+++ /dev/null
@@ -1,155 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-
-module Set_poly =  struct 
-  include Set_int
-let of_sorted_list xs = Array.of_list xs |> of_sorted_array 
-let of_array l = 
-  Ext_array.fold_left l empty add
-end
-let suites = 
-  __FILE__ >:::
-  [
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_bool __LOC__
-        (Set_poly.invariant 
-           (Set_poly.of_array (Array.init 1000 (fun n -> n))))
-    end;
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_bool __LOC__
-        (Set_poly.invariant 
-           (Set_poly.of_array (Array.init 1000 (fun n -> 1000-n))))
-    end;
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_bool __LOC__
-        (Set_poly.invariant 
-           (Set_poly.of_array (Array.init 1000 (fun _ -> Random.int 1000))))
-    end;
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_bool __LOC__
-        (Set_poly.invariant 
-           (Set_poly.of_sorted_list (Array.to_list (Array.init 1000 (fun n -> n)))))
-    end;
-    __LOC__ >:: begin fun _ ->
-      let arr = Array.init 1000 (fun n -> n) in
-      let set = (Set_poly.of_sorted_array arr) in
-      OUnit.assert_bool __LOC__
-        (Set_poly.invariant set );
-      OUnit.assert_equal 1000 (Set_poly.cardinal set)    
-    end;
-    __LOC__ >:: begin fun _ ->
-      for i = 0 to 200 do 
-        let arr = Array.init i (fun n -> n) in
-        let set = (Set_poly.of_sorted_array arr) in
-        OUnit.assert_bool __LOC__
-          (Set_poly.invariant set );
-        OUnit.assert_equal i (Set_poly.cardinal set)
-      done    
-    end;
-    __LOC__ >:: begin fun _ ->
-      let arr_size = 200 in
-      let arr_sets = Array.make 200 Set_poly.empty in  
-      for i = 0 to arr_size - 1 do
-        let size = Random.int 1000 in  
-        let arr = Array.init size (fun n -> n) in
-        arr_sets.(i)<- (Set_poly.of_sorted_array arr)            
-      done;
-      let large = Array.fold_left Set_poly.union Set_poly.empty arr_sets in 
-      OUnit.assert_bool __LOC__ (Set_poly.invariant large)
-    end;
-
-     __LOC__ >:: begin fun _ ->
-      let arr_size = 1_00_000 in
-      let v = ref Set_int.empty in 
-      for _ = 0 to arr_size - 1 do
-        let size = Random.int 0x3FFFFFFF in  
-         v := Set_int.add !v size                       
-      done;       
-      OUnit.assert_bool __LOC__ (Set_int.invariant !v)
-    end;
-
-  ]
-
-
-type ident = { stamp : int ; name : string ; mutable flags : int}
-
-module Set_ident = Set.Make(struct type t = ident 
-    let compare = Stdlib.compare end)
-
-let compare_ident x y = 
-  let a =  compare (x.stamp : int) y.stamp in 
-  if a <> 0 then a 
-  else 
-    let b = compare (x.name : string) y.name in 
-    if b <> 0 then b 
-    else compare (x.flags : int) y.flags     
-
-
-let rec add (tree : _ Set_gen.t) x  =  match tree with 
-  | Empty -> Set_gen.singleton x
-  | Leaf v -> 
-    let c = compare_ident x v in
-    if c = 0 then tree else     
-    if c < 0 then 
-      Set_gen.unsafe_two_elements x v
-    else 
-      Set_gen.unsafe_two_elements v x
-  | Node {l; v; r} as t ->
-    let c = compare_ident x v in
-    if c = 0 then t else
-    if c < 0 then Set_gen.bal (add l x ) v r else Set_gen.bal l v (add r x )
-
-let rec mem (tree : _ Set_gen.t) x =  match tree with 
-    | Empty -> false
-    | Leaf v -> compare_ident x v = 0
-    | Node{l; v; r} ->
-      let c = compare_ident x v in
-      c = 0 || mem (if c < 0 then l else r) x
-  
-module Ident_set2 = Set.Make(struct type t = ident 
-    let compare  = compare_ident            
-  end)
-
-let bench () = 
-  let times = 1_000_000 in
-  Ounit_tests_util.time "functor set" begin fun _ -> 
-    let v = ref Set_ident.empty in  
-    for i = 0 to  times do
-      v := Set_ident.add   {stamp = i ; name = "name"; flags = -1 } !v 
-    done;
-    for i = 0 to times do
-      ignore @@ Set_ident.mem   {stamp = i; name = "name" ; flags = -1} !v 
-    done 
-  end ;
-  Ounit_tests_util.time "functor set (specialized)" begin fun _ -> 
-    let v = ref Ident_set2.empty in  
-    for i = 0 to  times do
-      v := Ident_set2.add   {stamp = i ; name = "name"; flags = -1 } !v 
-    done;
-    for i = 0 to times do
-      ignore @@ Ident_set2.mem   {stamp = i; name = "name" ; flags = -1} !v 
-    done 
-  end ;
-
-  Ounit_tests_util.time "poly set" begin fun _ -> 
-    let module Set_poly = Set_ident in 
-    let v = ref Set_poly.empty in  
-    for i = 0 to  times do
-      v := Set_poly.add   {stamp = i ; name = "name"; flags = -1 } !v 
-    done;
-    for i = 0 to times do
-      ignore @@ Set_poly.mem   {stamp = i; name = "name" ; flags = -1} !v 
-    done;
-  end;
-  Ounit_tests_util.time "poly set (specialized)" begin fun _ -> 
-    let v = ref Set_gen.empty in  
-    for i = 0 to  times do
-      v := add  !v {stamp = i ; name = "name"; flags = -1 }  
-    done;
-    for i = 0 to times do
-      ignore @@ mem  !v  {stamp = i; name = "name" ; flags = -1} 
-    done 
-
-  end ; 
diff --git a/jscomp/ounit_tests/ounit_bsb_pkg_tests.ml b/jscomp/ounit_tests/ounit_bsb_pkg_tests.ml
deleted file mode 100644
index c692fa7..0000000
--- a/jscomp/ounit_tests/ounit_bsb_pkg_tests.ml
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let printer_string = fun x -> x 
-let (=~) = OUnit.assert_equal  ~printer:printer_string  
-
-
-let scope_test s (a,b,c)= 
-  match Bsb_pkg_types.extract_pkg_name_and_file s with 
-  | Scope(a0,b0),c0 -> 
-    a =~ a0 ; b =~ b0 ; c =~ c0
-  | Global _,_ -> OUnit.assert_failure __LOC__
-
-let global_test s (a,b) = 
-  match Bsb_pkg_types.extract_pkg_name_and_file s with 
-  | Scope _, _ -> 
-    OUnit.assert_failure __LOC__
-  | Global a0, b0-> 
-    a=~a0; b=~b0
-
-let s_test0 s (a,b)=     
-  match Bsb_pkg_types.string_as_package s with 
-  | Scope(name,scope) -> 
-      a =~ name ; b =~scope 
-  | _ -> OUnit.assert_failure __LOC__     
-
-let s_test1 s a =     
-  match Bsb_pkg_types.string_as_package s with 
-  | Global x  -> 
-      a =~ x
-  | _ -> OUnit.assert_failure __LOC__       
-
-let group0 = Map_string.of_list [
-  "Liba", 
-  {Bsb_db.info = Impl_intf; dir= "a";syntax_kind=Ml;case = false;
-  name_sans_extension = "liba"}
-]
-let group1 =  Map_string.of_list [
-  "Ciba", 
-  {Bsb_db.info = Impl_intf; dir= "b";syntax_kind=Ml;case = false;
-  name_sans_extension = "liba"}
-] 
-
-let parse_db db : Bsb_db_decode.t =   
-  let buf = Ext_buffer.create 10_000 in   
-  Bsb_db_encode.encode db buf;
-  let s = Ext_buffer.contents buf in
-  Bsb_db_decode.decode s
-
-let suites = 
-  __FILE__ >::: [
-    __LOC__ >:: begin fun _ -> 
-      scope_test "@hello/hi"
-        ("hi", "@hello","");
-
-      scope_test "@hello/hi/x"
-        ("hi", "@hello","x");
-
-      
-      scope_test "@hello/hi/x/y"
-        ("hi", "@hello","x/y");  
-  end ;
-  __LOC__ >:: begin fun _ -> 
-    global_test "hello"
-      ("hello","");
-    global_test "hello/x"
-      ("hello","x");  
-    global_test "hello/x/y"
-      ("hello","x/y")    
-  end ;
-  __LOC__ >:: begin fun _ -> 
-    s_test0 "@x/y" ("y","@x");
-    s_test0 "@x/y/z" ("y/z","@x");
-    s_test1 "xx" "xx";
-    s_test1 "xx/yy/zz" "xx/yy/zz"
-  end;
-
-  __LOC__ >:: begin fun _ ->
-    match parse_db {lib= group0; dev = group1}with 
-    | {lib = Group {modules = [|"Liba"|]};
-       dev = Group {modules = [|"Ciba"|]}}
-        -> OUnit.assert_bool __LOC__ true
-    | _ ->
-      OUnit.assert_failure __LOC__    
-  end  ;
-  __LOC__ >:: begin fun _ -> 
-    match parse_db {lib = group0;dev = Map_string.empty } with
-    | {lib = Group {modules = [|"Liba"|]};
-      dev = Dummy}
-      -> OUnit.assert_bool __LOC__ true
-    | _ ->
-      OUnit.assert_failure __LOC__    
-  end  ;
-  __LOC__ >:: begin fun _ -> 
-    match parse_db {lib = Map_string.empty ; dev = group1} with
-    | {lib = Dummy;
-       dev = Group {modules = [|"Ciba"|]}
-       }
-      -> OUnit.assert_bool __LOC__ true
-    | _ ->
-      OUnit.assert_failure __LOC__    
-  end
-  (* __LOC__ >:: begin fun _ -> 
-  OUnit.assert_equal parse_data_one  data_one
-  end ;
-  __LOC__ >:: begin fun _ -> 
-  
-  OUnit.assert_equal parse_data_two data_two
-  end  *)
-  ]
-
-
-
diff --git a/jscomp/ounit_tests/ounit_bsb_regex_tests.ml b/jscomp/ounit_tests/ounit_bsb_regex_tests.ml
deleted file mode 100644
index 076c244..0000000
--- a/jscomp/ounit_tests/ounit_bsb_regex_tests.ml
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-
-
-let test_eq x y  = 
-    Bsb_regex.global_substitute ~reg:"\\${rescript:\\([-a-zA-Z0-9]+\\)}" x
-        (fun _ groups -> 
-            match groups with 
-            | x::_ -> x 
-            | _ -> assert false 
-        )  =~ y 
-
-
-let suites = 
-    __FILE__ 
-    >:::
-    [
-        __LOC__ >:: begin fun _ -> 
-        test_eq 
-        {| hi hi hi ${rescript:name}
-        ${rescript:x}
-        ${rescript:u}
-        |}        
-        {| hi hi hi name
-        x
-        u
-        |}
-    end;
-    __LOC__ >:: begin  fun _ ->
-    test_eq  "xx" "xx";
-    test_eq "${rescript:x}" "x";
-    test_eq "a${rescript:x}" "ax";
-    
-    end;
-
-    __LOC__ >:: begin fun _ ->
-        test_eq "${rescript:x}x" "xx"
-    end;
-
-    __LOC__ >:: begin fun _ -> 
-        test_eq {|
-{
-  "name": "${rescript:name}",
-  "version": "${rescript:proj-version}",
-  "sources": [
-    "src"
-  ],
-  "reason" : { "react-jsx" : true},
-  "bs-dependencies" : [
-      // add your bs-dependencies here 
-  ]
-}
-|} {|
-{
-  "name": "name",
-  "version": "proj-version",
-  "sources": [
-    "src"
-  ],
-  "reason" : { "react-jsx" : true},
-  "bs-dependencies" : [
-      // add your bs-dependencies here 
-  ]
-}
-|}
-    end
-
-    ;
-    __LOC__ >:: begin fun _ -> 
-    test_eq {|
-{
-  "name": "${rescript:name}",
-  "version": "${rescript:proj-version}",
-  "scripts": {
-    "clean": "bsb -clean",
-    "clean:all": "bsb -clean-world",
-    "build": "bsb",
-    "build:all": "bsb -make-world",
-    "watch": "bsb -w",
-  },
-  "keywords": [
-    "ReScript"
-  ],
-  "license": "MIT",
-  "devDependencies": {
-    "bs-platform": "${rescript:bs-version}"
-  }
-}
-|} {|
-{
-  "name": "name",
-  "version": "proj-version",
-  "scripts": {
-    "clean": "bsb -clean",
-    "clean:all": "bsb -clean-world",
-    "build": "bsb",
-    "build:all": "bsb -make-world",
-    "watch": "bsb -w",
-  },
-  "keywords": [
-    "ReScript"
-  ],
-  "license": "MIT",
-  "devDependencies": {
-    "bs-platform": "bs-version"
-  }
-}
-|}
-    end;
-    __LOC__ >:: begin fun _ -> 
-    test_eq {|
-{
-    "version": "0.1.0",
-    "command": "${rescript:bsb}",
-    "options": {
-        "cwd": "${workspaceRoot}"
-    },
-    "isShellCommand": true,
-    "args": [
-        "-w"
-    ],
-    "showOutput": "always",
-    "isWatching": true,
-    "problemMatcher": {
-        "fileLocation": "absolute",
-        "owner": "ocaml",
-        "watching": {
-            "activeOnStart": true,
-            "beginsPattern": ">>>> Start compiling",
-            "endsPattern": ">>>> Finish compiling"
-        },
-        "pattern": [
-            {
-                "regexp": "^File \"(.*)\", line (\\d+)(?:, characters (\\d+)-(\\d+))?:$",
-                "file": 1,
-                "line": 2,
-                "column": 3,
-                "endColumn": 4
-            },
-            {
-                "regexp": "^(?:(?:Parse\\s+)?(Warning|[Ee]rror)(?:\\s+\\d+)?:)?\\s+(.*)$",
-                "severity": 1,
-                "message": 2,
-                "loop": true
-            }
-        ]
-    }
-}
-|} {|
-{
-    "version": "0.1.0",
-    "command": "bsb",
-    "options": {
-        "cwd": "${workspaceRoot}"
-    },
-    "isShellCommand": true,
-    "args": [
-        "-w"
-    ],
-    "showOutput": "always",
-    "isWatching": true,
-    "problemMatcher": {
-        "fileLocation": "absolute",
-        "owner": "ocaml",
-        "watching": {
-            "activeOnStart": true,
-            "beginsPattern": ">>>> Start compiling",
-            "endsPattern": ">>>> Finish compiling"
-        },
-        "pattern": [
-            {
-                "regexp": "^File \"(.*)\", line (\\d+)(?:, characters (\\d+)-(\\d+))?:$",
-                "file": 1,
-                "line": 2,
-                "column": 3,
-                "endColumn": 4
-            },
-            {
-                "regexp": "^(?:(?:Parse\\s+)?(Warning|[Ee]rror)(?:\\s+\\d+)?:)?\\s+(.*)$",
-                "severity": 1,
-                "message": 2,
-                "loop": true
-            }
-        ]
-    }
-}
-|}
-    end
-    ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_cmd_tests.ml b/jscomp/ounit_tests/ounit_cmd_tests.ml
deleted file mode 100644
index c141f16..0000000
--- a/jscomp/ounit_tests/ounit_cmd_tests.ml
+++ /dev/null
@@ -1,280 +0,0 @@
-let (//) = Filename.concat
-
-
-
-
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-
-
-
-
-
-(* let output_of_exec_command command args =
-    let readme, writeme = Unix.pipe () in
-    let pid = Unix.create_process command args Unix.stdin writeme Unix.stderr in
-    let in_chan = Unix.in_channel_of_descr readme *)
-
-
-
-let perform_bsc = Ounit_cmd_util.perform_bsc
-let bsc_check_eval = Ounit_cmd_util.bsc_check_eval
-
-let ok b output = 
-  if not b then 
-    Ounit_cmd_util.debug_output output;
-  OUnit.assert_bool __LOC__ b  
-
-let suites =
-  __FILE__
-  >::: [
-    __LOC__ >:: begin fun _ ->
-      let v_output = perform_bsc  [| "-v" |] in
-      OUnit.assert_bool __LOC__ ((perform_bsc [| "-h" |]).exit_code  = 0  );
-      OUnit.assert_bool __LOC__ (v_output.exit_code = 0);
-      (* Printf.printf "\n*>%s" v_output.stdout; *)
-      (* Printf.printf "\n*>%s" v_output.stderr ; *)
-    end;
-    __LOC__ >:: begin fun _ ->
-      let v_output =
-        perform_bsc  [| "-bs-eval"; {|let str = "'a'" |}|] in
-      ok (v_output.exit_code = 0) v_output
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let v_output = perform_bsc [|"-bs-eval"; {|type 'a arra = 'a array
-    external
-      f : 
-      int -> int -> int arra -> unit
-      = ""
-      [@@bs.send.pipe:int]
-      [@@bs.splice]|}|] in  
-      OUnit.assert_bool __LOC__ (Ext_string.contain_substring v_output.stderr "variadic")
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let v_output = perform_bsc [|"-bs-eval"; {|external
-  f2 : 
-  int -> int -> ?y:int array -> unit  
-  = ""
-  [@@bs.send.pipe:int]
-  [@@bs.splice]  |}|] in  
-      OUnit.assert_bool __LOC__ (Ext_string.contain_substring v_output.stderr "variadic")
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      let should_be_warning =
-        bsc_check_eval  {| external mk : int -> ([`a|`b [@bs.string]]) = "mk" [@@bs.val] |} in
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring
-           should_be_warning.stderr "Unused")
-    end;
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-external ff :
-    resp -> (_ [@bs.as "x"]) -> int -> unit =
-    "x" [@@bs.set]
-      |} in
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring should_err.stderr
-           "Ill defined"
-        )
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      (* used in return value
-          This should fail, we did not
-          support uncurry return value yet
-      *)
-      let should_err = bsc_check_eval {|
-    external v3 :
-    int -> int -> (int -> int -> int [@bs.uncurry])
-    = "v3"[@@bs.val]
-
-    |} in
-      (* Ounit_cmd_util.debug_output should_err;*)
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring
-           should_err.stderr "bs.uncurry")
-    end ;
-
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-    external v4 :
-    (int -> int -> int [@bs.uncurry]) = ""
-    [@@bs.val]
-
-    |} in
-      (* Ounit_cmd_util.debug_output should_err ; *)
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring
-           should_err.stderr "uncurry")
-    end ;
-
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-      {js| \uFFF|js}
-      |} in
-      OUnit.assert_bool __LOC__ (not @@ Ext_string.is_empty should_err.stderr)
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-      external mk : int -> ([`a|`b] [@bs.string]) = "" [@@bs.val]
-      |} in
-      OUnit.assert_bool __LOC__ (not @@ Ext_string.is_empty should_err.stderr)
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-      external mk : int -> ([`a|`b] ) = "mk" [@@bs.val]
-      |} in
-      OUnit.assert_bool __LOC__ ( Ext_string.is_empty should_err.stderr)
-      (* give a warning or ?
-         ( [`a | `b ] [@bs.string] )
-         (* auto-convert to ocaml poly-variant *)
-      *)
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-      type t
-      external mk : int -> (_ [@bs.as {json| { x : 3 } |json}]) ->  t = "mk" [@@bs.val]
-      |} in
-      OUnit.assert_bool __LOC__ (Ext_string.is_empty should_err.stderr)
-    end
-    ;
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-      type t
-      external mk : int -> (_ [@bs.as {json| { "x" : 3 } |json}]) ->  t = "mk" [@@bs.val]
-      |} in
-      OUnit.assert_bool __LOC__ (Ext_string.is_empty should_err.stderr)
-    end
-    ;
-    (* #1510 *)
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-       let should_fail = fun [@bs.this] (Some x) y u -> y + u
-      |} in
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring  should_err.stderr "simple")
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-       let should_fail = fun [@bs.this] (Some x as v) y u -> y + u
-      |} in
-      (* Ounit_cmd_util.debug_output should_err; *)
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring  should_err.stderr "simple")
-    end;
-
-    (* __LOC__ >:: begin fun _ ->
-       let should_err = bsc_check_eval {|
-       external f : string -> unit -> unit = "x.y" [@@bs.send]
-       |} in
-       OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring should_err.stderr "Not a valid method name")
-       end; *)
-
-
-    __LOC__ >:: begin fun _ -> 
-      let should_err = bsc_check_eval {|
-      (* let rec must be rejected *)
-type t10 = A of t10 [@@ocaml.unboxed];;
-let rec x = A x;;
-      |} in 
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring should_err.stderr "This kind of expression is not allowed")
-    end;
-
-    __LOC__ >:: begin fun _ -> 
-      let should_err = bsc_check_eval {|
-      type t = {x: int64} [@@unboxed];;
-let rec x = {x = y} and y = 3L;;
-      |} in 
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring should_err.stderr "This kind of expression is not allowed")
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let should_err = bsc_check_eval {|
-      type r = A of r [@@unboxed];;
-let rec y = A y;;
-      |} in 
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring should_err.stderr "This kind of expression is not allowed")
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-          external f : int = "%identity"
-|} in
-      OUnit.assert_bool __LOC__
-        (not (Ext_string.is_empty should_err.stderr))
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-          external f : int -> int = "%identity"
-|} in
-      OUnit.assert_bool __LOC__
-        (Ext_string.is_empty should_err.stderr)
-    end;
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-          external f : int -> int -> int = "%identity"
-|} in
-      OUnit.assert_bool __LOC__
-        (not (Ext_string.is_empty should_err.stderr))
-    end;
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-          external f : (int -> int) -> int = "%identity"
-|} in
-      OUnit.assert_bool __LOC__
-        ( (Ext_string.is_empty should_err.stderr))
-
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-          external f : int -> (int-> int) = "%identity"
-|} in
-      OUnit.assert_bool __LOC__
-        (not (Ext_string.is_empty should_err.stderr))
-
-    end;
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-    external foo_bar :
-    (_ [@bs.as "foo"]) ->
-    string ->
-    string = "bar"
-  [@@bs.send]
-    |} in
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring should_err.stderr "Ill defined attribute")
-    end;
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-    external mk : int ->
-  (
-    [`a|`b]
-     [@bs.string]
-  ) = "mk" [@@bs.val]
-    |} in
-      (* Ounit_cmd_util.debug_output should_err ;  *)
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring should_err.stderr
-           "Unused")
-    end;
-    __LOC__ >:: begin fun _ ->
-      let should_err = bsc_check_eval {|
-    type -'a t = {k : 'a } [@@bs.deriving abstract]
-    |} in
-      OUnit.assert_bool __LOC__
-        (Ext_string.contain_substring should_err.stderr "contravariant")
-    end;
-  ]
-
diff --git a/jscomp/ounit_tests/ounit_cmd_util.ml b/jscomp/ounit_tests/ounit_cmd_util.ml
deleted file mode 100644
index 9c0faa2..0000000
--- a/jscomp/ounit_tests/ounit_cmd_util.ml
+++ /dev/null
@@ -1,112 +0,0 @@
-let (//) = Filename.concat
-
-(** may nonterminate when [cwd] is '.' *)
-let rec unsafe_root_dir_aux cwd  = 
-  if Sys.file_exists (cwd//Literals.bsconfig_json) then cwd 
-  else unsafe_root_dir_aux (Filename.dirname cwd)     
-
-let project_root = unsafe_root_dir_aux (Sys.getcwd ())
-let jscomp = project_root // "jscomp"
-
-let dune_bin_dir = project_root // "_build" // "install" // "default" // "bin"
-let bsc_exe = dune_bin_dir // "bsc"
-let runtime_dir = jscomp // "runtime"
-let others_dir = jscomp // "others"
-
-
-let stdlib_dir = jscomp // "stdlib-406"
-
-(* let rec safe_dup fd =
-  let new_fd = Unix.dup fd in
-  if (Obj.magic new_fd : int) >= 3 then
-    new_fd (* [dup] can not be 0, 1, 2*)
-  else begin
-    let res = safe_dup fd in
-    Unix.close new_fd;
-    res
-  end *)
-
-let safe_close fd =
-  try Unix.close fd with Unix.Unix_error(_,_,_) -> ()
-
-
-type output = {
-  stderr : string ; 
-  stdout : string ;
-  exit_code : int 
-}
-
-let perform command args = 
-  let new_fd_in, new_fd_out = Unix.pipe () in 
-  let err_fd_in, err_fd_out = Unix.pipe () in 
-  match Unix.fork () with 
-  | 0 -> 
-    begin try 
-        safe_close new_fd_in;  
-        safe_close err_fd_in;
-        Unix.dup2 err_fd_out Unix.stderr ; 
-        Unix.dup2 new_fd_out Unix.stdout; 
-        Unix.execv command args 
-      with _ -> 
-        exit 127
-    end
-  | pid ->
-    (* when all the descriptors on a pipe's input are closed and the pipe is 
-        empty, a call to [read] on its output returns zero: end of file.
-       when all the descriptiors on a pipe's output are closed, a call to 
-       [write] on its input kills the writing process (EPIPE).
-    *)
-    safe_close new_fd_out ; 
-    safe_close err_fd_out ; 
-    let in_chan = Unix.in_channel_of_descr new_fd_in in 
-    let err_in_chan = Unix.in_channel_of_descr err_fd_in in 
-    let buf = Buffer.create 1024 in 
-    let err_buf = Buffer.create 1024 in 
-    (try 
-       while true do 
-         Buffer.add_string buf (input_line in_chan );             
-         Buffer.add_char buf '\n'
-       done;
-     with
-       End_of_file -> ()) ; 
-    (try 
-       while true do 
-         Buffer.add_string err_buf (input_line err_in_chan );
-         Buffer.add_char err_buf '\n'
-       done;
-     with
-       End_of_file -> ()) ; 
-    let exit_code = match snd @@ Unix.waitpid [] pid with 
-      | Unix.WEXITED exit_code -> exit_code 
-      | Unix.WSIGNALED _signal_number 
-      | Unix.WSTOPPED _signal_number  -> 127 in 
-    {
-      stdout = Buffer.contents buf ; 
-      stderr = Buffer.contents err_buf;
-      exit_code 
-    }
-
-
-let perform_bsc args = 
-  perform bsc_exe 
-    (Array.append 
-       [|bsc_exe ; 
-         "-bs-package-name" ; "bs-platform"; 
-         "-bs-no-version-header"; 
-         "-bs-cross-module-opt";
-         "-w";
-         "-40";
-         "-I" ;
-         runtime_dir ; 
-         "-I"; 
-         others_dir ; 
-         "-I" ; 
-         stdlib_dir
-       |] args)
-
-let bsc_check_eval str = 
-  perform_bsc [|"-bs-eval"; str|]        
-
-  let debug_output o = 
-  Printf.printf "\nexit_code:%d\nstdout:%s\nstderr:%s\n"
-    o.exit_code o.stdout o.stderr
diff --git a/jscomp/ounit_tests/ounit_cmd_util.mli b/jscomp/ounit_tests/ounit_cmd_util.mli
deleted file mode 100644
index 5ee3d69..0000000
--- a/jscomp/ounit_tests/ounit_cmd_util.mli
+++ /dev/null
@@ -1,16 +0,0 @@
-type output = {
-  stderr : string ; 
-  stdout : string ;
-  exit_code : int 
-}
-
-
-val perform : string -> string array -> output 
-
-
-val perform_bsc : string array -> output 
-
-
-val bsc_check_eval : string -> output  
-
-val debug_output : output -> unit 
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_data_random.ml b/jscomp/ounit_tests/ounit_data_random.ml
deleted file mode 100644
index 87dbc49..0000000
--- a/jscomp/ounit_tests/ounit_data_random.ml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-let min_int x y = 
-    if x < y then x else y
-
-let random_string chars upper = 
-    let len = Array.length chars in 
-    let string_len = (Random.int (min_int upper len)) in
-    String.init string_len (fun _i -> chars.(Random.int len ))
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_depends_format_test.ml b/jscomp/ounit_tests/ounit_depends_format_test.ml
deleted file mode 100644
index bc7ed6f..0000000
--- a/jscomp/ounit_tests/ounit_depends_format_test.ml
+++ /dev/null
@@ -1,20 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) (xs : string list) (ys : string list) = 
-     OUnit.assert_equal xs ys 
-     ~printer:(fun xs -> String.concat "," xs )
-
-let f (x : string) = 
-     let stru = Parse.implementation (Lexing.from_string x)  in 
-     Ast_extract.Set_string.elements (Ast_extract.read_parse_and_extract Ml_binary.Ml stru)
-
-
-let suites = 
-  __FILE__
-  >::: [
-    __LOC__ >:: begin fun _ -> 
-      f {|module X = List|} =~ ["List"];
-      f {|module X = List module X0 = List1|} =~ ["List";"List1"]
-    end 
-  ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_ffi_error_debug_test.ml b/jscomp/ounit_tests/ounit_ffi_error_debug_test.ml
deleted file mode 100644
index ceb1b37..0000000
--- a/jscomp/ounit_tests/ounit_ffi_error_debug_test.ml
+++ /dev/null
@@ -1,78 +0,0 @@
-let (//) = Filename.concat
-
-
-
-
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-
-
-
-
-let bsc_eval = Ounit_cmd_util.bsc_check_eval
-
-let debug_output = Ounit_cmd_util.debug_output
-
-
-let suites = 
-    __FILE__ 
-    >::: [
-        __LOC__ >:: begin fun _ -> 
-        let output = bsc_eval {|
-external err : 
-   hi_should_error:([`a of int | `b of string ] [@bs.string]) ->         
-   unit -> _ = "" [@@bs.obj]
-        |} in
-        OUnit.assert_bool __LOC__
-            (Ext_string.contain_substring output.stderr "hi_should_error")
-        end;
-        __LOC__ >:: begin fun _ -> 
-let output = bsc_eval {|
-    external err : 
-   ?hi_should_error:([`a of int | `b of string ] [@bs.string]) ->         
-   unit -> _ = "" [@@bs.obj]
-        |} in
-        OUnit.assert_bool __LOC__
-            (Ext_string.contain_substring output.stderr "hi_should_error")        
-        end;
-        __LOC__ >:: begin fun _ -> 
-        let output = bsc_eval {|
-    external err : 
-   ?hi_should_error:([`a of int | `b of string ] [@bs.string]) ->         
-   unit -> unit = "err" [@@bs.val]
-        |} in
-        OUnit.assert_bool __LOC__
-            (Ext_string.contain_substring output.stderr "hi_should_error")        
-        end;
-
-        __LOC__ >:: begin fun _ ->
-          (*
-             Each [@bs.unwrap] variant constructor requires an argument
-          *)
-          let output =
-            bsc_eval {|
-              external err :
-              ?hi_should_error:([`a of int | `b] [@bs.unwrap]) -> unit -> unit = "err" [@@bs.val]
-            |}
-          in
-          OUnit.assert_bool __LOC__
-            (Ext_string.contain_substring output.stderr "unwrap")
-        end;
-
-        __LOC__ >:: begin fun _ ->
-          (*
-             [@bs.unwrap] args are not supported in [@@bs.obj] functions
-          *)
-          let output =
-            bsc_eval {|
-              external err :
-              ?hi_should_error:([`a of int] [@bs.unwrap]) -> unit -> _ = "" [@@bs.obj]
-            |}
-          in
-          OUnit.assert_bool __LOC__
-            (Ext_string.contain_substring output.stderr "hi_should_error")
-        end
-
-    ]
diff --git a/jscomp/ounit_tests/ounit_hash_set_tests.ml b/jscomp/ounit_tests/ounit_hash_set_tests.ml
deleted file mode 100644
index 5d418ea..0000000
--- a/jscomp/ounit_tests/ounit_hash_set_tests.ml
+++ /dev/null
@@ -1,121 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-
-type id = { name : string ; stamp : int }
-
-module Id_hash_set = Hash_set.Make(struct 
-    type t = id 
-    let equal x y = x.stamp = y.stamp && x.name = y.name 
-    let hash x = Hashtbl.hash x.stamp
-  end
-  )
-
-let const_tbl = [|"0"; "1"; "2"; "3"; "4"; "5"; "6"; "7"; "8"; "9"; "10"; "100"; "99"; "98";
-          "97"; "96"; "95"; "94"; "93"; "92"; "91"; "90"; "89"; "88"; "87"; "86"; "85";
-          "84"; "83"; "82"; "81"; "80"; "79"; "78"; "77"; "76"; "75"; "74"; "73"; "72";
-          "71"; "70"; "69"; "68"; "67"; "66"; "65"; "64"; "63"; "62"; "61"; "60"; "59";
-          "58"; "57"; "56"; "55"; "54"; "53"; "52"; "51"; "50"; "49"; "48"; "47"; "46";
-          "45"; "44"; "43"; "42"; "41"; "40"; "39"; "38"; "37"; "36"; "35"; "34"; "33";
-          "32"; "31"; "30"; "29"; "28"; "27"; "26"; "25"; "24"; "23"; "22"; "21"; "20";
-          "19"; "18"; "17"; "16"; "15"; "14"; "13"; "12"; "11"|]
-let suites = 
-  __FILE__
-  >:::
-  [
-    __LOC__ >:: begin fun _ ->
-      let v = Hash_set_poly.create 31 in
-      for i = 0 to 1000 do
-        Hash_set_poly.add v i  
-      done  ;
-      OUnit.assert_equal (Hash_set_poly.length v) 1001
-    end ;
-    __LOC__ >:: begin fun _ ->
-      let v = Hash_set_poly.create 31 in
-      for _ = 0 to 1_0_000 do
-        Hash_set_poly.add v 0
-      done  ;
-      OUnit.assert_equal (Hash_set_poly.length v) 1
-    end ;
-    __LOC__ >:: begin fun _ -> 
-      let v = Hash_set_poly.create 30 in 
-      for i = 0 to 2_000 do 
-        Hash_set_poly.add v {name = "x" ; stamp = i}
-      done ;
-      for i = 0 to 2_000 do 
-        Hash_set_poly.add v {name = "x" ; stamp = i}
-      done  ; 
-      for i = 0 to 2_000 do 
-        assert (Hash_set_poly.mem v {name = "x"; stamp = i})
-      done;  
-      OUnit.assert_equal (Hash_set_poly.length v)  2_001;
-      for i =  1990 to 3_000 do 
-        Hash_set_poly.remove v {name = "x"; stamp = i}
-      done ;
-      OUnit.assert_equal (Hash_set_poly.length v) 1990;
-      (* OUnit.assert_equal (Hash_set.stats v) *)
-      (*   {Hashtbl.num_bindings = 1990; num_buckets = 1024; max_bucket_length = 7; *)
-      (*    bucket_histogram = [|139; 303; 264; 178; 93; 32; 12; 3|]} *)
-    end ;
-    __LOC__ >:: begin fun _ -> 
-      let v = Id_hash_set.create 30 in 
-      for i = 0 to 2_000 do 
-        Id_hash_set.add v {name = "x" ; stamp = i}
-      done ;
-      for i = 0 to 2_000 do 
-        Id_hash_set.add v {name = "x" ; stamp = i}
-      done  ; 
-      for i = 0 to 2_000 do 
-        assert (Id_hash_set.mem v {name = "x"; stamp = i})
-      done;  
-      OUnit.assert_equal (Id_hash_set.length v)  2_001;
-      for i =  1990 to 3_000 do 
-        Id_hash_set.remove v {name = "x"; stamp = i}
-      done ;
-      OUnit.assert_equal (Id_hash_set.length v) 1990;
-      for i = 1000 to 3990 do 
-        Id_hash_set.remove v { name = "x"; stamp = i }
-      done;
-      OUnit.assert_equal (Id_hash_set.length v) 1000;
-      for i = 1000 to 1100 do 
-        Id_hash_set.add v { name = "x"; stamp = i};
-      done;
-      OUnit.assert_equal (Id_hash_set.length v ) 1101;
-      for i = 0 to 1100 do 
-        OUnit.assert_bool "exist" (Id_hash_set.mem v {name = "x"; stamp = i})
-      done  
-      (* OUnit.assert_equal (Hash_set.stats v) *)
-      (*   {num_bindings = 1990; num_buckets = 1024; max_bucket_length = 8; *)
-      (*    bucket_histogram = [|148; 275; 285; 182; 95; 21; 14; 2; 2|]} *)
-
-    end 
-    ;
-    __LOC__ >:: begin fun _ -> 
-      let duplicate arr = 
-        let len = Array.length arr in 
-        let rec aux tbl off = 
-          if off >= len  then None
-          else 
-            let curr = (Array.unsafe_get arr off) in
-            if Hash_set_string.check_add tbl curr then 
-              aux tbl (off + 1)
-            else   Some curr in 
-        aux (Hash_set_string.create len) 0 in 
-      let v = [| "if"; "a"; "b"; "c" |] in 
-      OUnit.assert_equal (duplicate v) None;
-      OUnit.assert_equal (duplicate [|"if"; "a"; "b"; "b"; "c"|]) (Some "b")
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let of_array lst =
-        let len = Array.length lst in 
-        let tbl = Hash_set_string.create len in 
-        Ext_array.iter lst (Hash_set_string.add tbl) ; tbl  in 
-      let hash = of_array const_tbl  in 
-      let len = Hash_set_string.length hash in 
-      Hash_set_string.remove hash "x";
-      OUnit.assert_equal len (Hash_set_string.length hash);
-      Hash_set_string.remove hash "0";
-      OUnit.assert_equal (len - 1 ) (Hash_set_string.length hash)
-    end
-  ]
diff --git a/jscomp/ounit_tests/ounit_hash_stubs_test.ml b/jscomp/ounit_tests/ounit_hash_stubs_test.ml
deleted file mode 100644
index 859d01c..0000000
--- a/jscomp/ounit_tests/ounit_hash_stubs_test.ml
+++ /dev/null
@@ -1,74 +0,0 @@
-let ((>::),
-    (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-
-let count = 2_000_000
-
-let bench () = 
-  Ounit_tests_util.time "int hash set" begin fun _ -> 
-    let v = Hash_set_int.create 2_000_000 in 
-    for i = 0 to  count do 
-      Hash_set_int.add  v i
-    done ;
-    for _ = 0 to 3 do 
-      for i = 0 to count do 
-        assert (Hash_set_int.mem v i)
-      done
-    done
-  end;
-  Ounit_tests_util.time "int hash set" begin fun _ -> 
-    let v = Hash_set_poly.create 2_000_000 in 
-    for i = 0 to  count do 
-      Hash_set_poly.add  v i
-    done ;
-    for _ = 0 to 3 do 
-      for i = 0 to count do 
-        assert (Hash_set_poly.mem v i)
-     done
-    done
-  end
-
-
-type id (* = Ident.t *) = { stamp : int; name : string; mutable flags : int; }
-let hash id = Bs_hash_stubs.hash_stamp_and_name id.stamp id.name 
-let suites = 
-    __FILE__
-    >:::
-    [
-      __LOC__ >:: begin fun _ -> 
-        Bs_hash_stubs.hash_int 0 =~ Hashtbl.hash 0
-      end;
-      __LOC__ >:: begin fun _ -> 
-        Bs_hash_stubs.hash_int max_int =~ Hashtbl.hash max_int
-      end;
-      __LOC__ >:: begin fun _ -> 
-        Bs_hash_stubs.hash_int max_int =~ Hashtbl.hash max_int
-      end;
-      __LOC__ >:: begin fun _ -> 
-        Bs_hash_stubs.hash_string "The quick brown fox jumps over the lazy dog"  =~ 
-        Hashtbl.hash "The quick brown fox jumps over the lazy dog"
-      end;
-      __LOC__ >:: begin fun _ ->
-        Array.init 100 (fun i -> String.make i 'a' )
-        |> Array.iter (fun x -> 
-          Bs_hash_stubs.hash_string x =~ Hashtbl.hash x) 
-      end;
-      __LOC__ >:: begin fun _ ->
-        (* only stamp matters here *)
-        hash {stamp = 1 ; name = "xx"; flags = 0} =~ Bs_hash_stubs.hash_small_int 1 ;
-        hash {stamp = 11 ; name = "xx"; flags = 0} =~ Bs_hash_stubs.hash_small_int 11;
-      end;
-      __LOC__ >:: begin fun _ ->
-        (* only string matters here *)
-        hash {stamp = 0 ; name = "Pervasives"; flags = 0} =~ Bs_hash_stubs.hash_string "Pervasives";
-        hash {stamp = 0 ; name = "UU"; flags = 0} =~ Bs_hash_stubs.hash_string "UU";
-      end;
-      __LOC__ >:: begin fun _ -> 
-        let v = Array.init 20 (fun i -> i) in 
-        let u = Array.init 30 (fun i ->   (0-i)  ) in  
-        Bs_hash_stubs.int_unsafe_blit 
-         v 0 u 10 20 ; 
-        OUnit.assert_equal u (Array.init 30 (fun i -> if i < 10 then -i else i - 10)) 
-      end
-    ]
diff --git a/jscomp/ounit_tests/ounit_hashtbl_tests.ml b/jscomp/ounit_tests/ounit_hashtbl_tests.ml
deleted file mode 100644
index 96980b8..0000000
--- a/jscomp/ounit_tests/ounit_hashtbl_tests.ml
+++ /dev/null
@@ -1,53 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal ~printer:Ext_obj.dump
-
-
-let suites = 
-  __FILE__
-  >:::[
-    (* __LOC__ >:: begin fun _ ->  *)
-    (*   let h = Hash_string.create 0 in  *)
-    (*   let accu key = *)
-    (*     Hash_string.replace_or_init h key   succ 1 in  *)
-    (*   let count = 1000 in  *)
-    (*   for i = 0 to count - 1 do      *)
-    (*     Array.iter accu  [|"a";"b";"c";"d";"e";"f"|]     *)
-    (*   done; *)
-    (*   Hash_string.length h =~ 6; *)
-    (*   Hash_string.iter (fun _ v -> v =~ count ) h *)
-    (* end; *)
-
-    "add semantics " >:: begin fun _ -> 
-      let h = Hash_string.create 0 in 
-      let count = 1000 in 
-      for _ = 0 to 1 do  
-        for i = 0 to count - 1 do                 
-          Hash_string.add h (string_of_int i) i 
-        done
-      done ;
-      Hash_string.length h =~ 2 * count 
-    end; 
-    "replace semantics" >:: begin fun _ -> 
-      let h = Hash_string.create 0 in 
-      let count = 1000 in 
-      for _ = 0 to 1 do  
-        for i = 0 to count - 1 do                 
-          Hash_string.replace h (string_of_int i) i 
-        done
-      done ;
-      Hash_string.length h =~  count 
-    end; 
-    
-    __LOC__ >:: begin fun _ ->
-      let h = Hash_string.create 0 in 
-      let count = 10 in 
-      for i = 0 to count - 1 do 
-        Hash_string.replace h (string_of_int i) i
-      done; 
-      let xs = Hash_string.to_list h (fun k _ -> k) in 
-      let ys = List.sort compare xs  in 
-      ys =~ ["0";"1";"2";"3";"4";"5";"6";"7";"8";"9"]
-    end
-  ]
diff --git a/jscomp/ounit_tests/ounit_ident_mask_tests.ml b/jscomp/ounit_tests/ounit_ident_mask_tests.ml
deleted file mode 100644
index 10a2b46..0000000
--- a/jscomp/ounit_tests/ounit_ident_mask_tests.ml
+++ /dev/null
@@ -1,53 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-let suites = 
-  __FILE__
-  >:::
-  [
-    __LOC__ >:: begin fun _ -> 
-      let set = Hash_set_ident_mask.create 0  in
-      let a,b,_,_ = 
-        Ident.create "a", 
-        Ident.create "b", 
-        Ident.create "c",
-        Ident.create "d" in 
-      Hash_set_ident_mask.add_unmask set a ;     
-      Hash_set_ident_mask.add_unmask set a ;     
-      Hash_set_ident_mask.add_unmask set b ;     
-      OUnit.assert_bool __LOC__ (not @@ Hash_set_ident_mask.mask_and_check_all_hit set  a);
-      OUnit.assert_bool __LOC__ (Hash_set_ident_mask.mask_and_check_all_hit set  b );
-      Hash_set_ident_mask.iter_and_unmask set (fun id mask -> 
-          if id.Ident.name = "a" then
-            OUnit.assert_bool __LOC__ mask 
-          else if id.Ident.name = "b" then 
-            OUnit.assert_bool __LOC__ mask 
-          else ()        
-        ) ;
-      OUnit.assert_bool __LOC__ (not @@ Hash_set_ident_mask.mask_and_check_all_hit set a );
-      OUnit.assert_bool __LOC__ (Hash_set_ident_mask.mask_and_check_all_hit set  b );
-    end;
-    __LOC__ >:: begin fun _ -> 
-        let len = 1000 in 
-        let idents = Array.init len (fun i -> Ident.create (string_of_int i)) in 
-        let set = Hash_set_ident_mask.create 0 in 
-        Array.iter (fun i -> Hash_set_ident_mask.add_unmask set i) idents;
-        for i = 0 to len - 2 do 
-                OUnit.assert_bool __LOC__ (not @@ Hash_set_ident_mask.mask_and_check_all_hit set idents.(i));
-        done ;
-         for i = 0 to len - 2 do 
-                OUnit.assert_bool __LOC__ (not @@ Hash_set_ident_mask.mask_and_check_all_hit set idents.(i) );
-        done ; 
-         OUnit.assert_bool __LOC__ (Hash_set_ident_mask.mask_and_check_all_hit  set idents.(len - 1)) ;
-         Hash_set_ident_mask.iter_and_unmask set(fun _ _ -> ()) ;
-        for i = 0 to len - 2 do 
-                OUnit.assert_bool __LOC__ (not @@ Hash_set_ident_mask.mask_and_check_all_hit set idents.(i) );
-        done ;
-         for i = 0 to len - 2 do 
-                OUnit.assert_bool __LOC__ (not @@ Hash_set_ident_mask.mask_and_check_all_hit set idents.(i));
-        done ; 
-         OUnit.assert_bool __LOC__ (Hash_set_ident_mask.mask_and_check_all_hit  set idents.(len - 1)) ;
-         
-    end
-  ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_int_vec_tests.ml b/jscomp/ounit_tests/ounit_int_vec_tests.ml
deleted file mode 100644
index dc29ba9..0000000
--- a/jscomp/ounit_tests/ounit_int_vec_tests.ml
+++ /dev/null
@@ -1,33 +0,0 @@
-let ((>::),
-    (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-let suites = 
-    __FILE__
-    >:::
-    [
-        __LOC__ >:: begin fun _ -> 
-            OUnit.assert_bool __LOC__
-             (Int_vec_util.mem 3 (Vec_int.of_list [1;2;3]))
-             ;
-            OUnit.assert_bool __LOC__ 
-             (not @@ Int_vec_util.mem 0 (Vec_int.of_list [1;2]) ); 
-            
-            let v = Vec_int.make 100 in 
-            OUnit.assert_bool __LOC__ 
-                (not @@ Int_vec_util.mem 0 v) ;
-            Vec_int.push v 0;
-            OUnit.assert_bool __LOC__ 
-                (Int_vec_util.mem 0 v )
-        end;
-
-        __LOC__ >:: begin fun _ -> 
-            let u = Vec_int.make 100 in 
-            Vec_int.push u 1;
-            OUnit.assert_bool __LOC__
-            (not @@ Int_vec_util.mem 0 u );
-            Vec_int.push u 0; 
-            OUnit.assert_bool __LOC__
-            (Int_vec_util.mem 0 u)
-        end
-    ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_js_regex_checker_tests.ml b/jscomp/ounit_tests/ounit_js_regex_checker_tests.ml
deleted file mode 100644
index 0b1e1c3..0000000
--- a/jscomp/ounit_tests/ounit_js_regex_checker_tests.ml
+++ /dev/null
@@ -1,46 +0,0 @@
-let ((>::),
-    (>:::)) = OUnit.((>::),(>:::))
-
-open Ext_js_regex
-
-let suites =
-    __FILE__
-    >:::
-    [
-        "test_empty_string" >:: begin fun _ ->
-        let b = js_regex_checker "" in
-        OUnit.assert_equal b false
-        end;
-        "test_normal_regex" >:: begin fun _ ->
-        let b = js_regex_checker "/abc/" in
-        OUnit.assert_equal b true
-        end;
-        "test_wrong_regex_last" >:: begin fun _ ->
-        let b = js_regex_checker "/abc" in 
-        OUnit.assert_equal b false
-        end;
-        "test_regex_with_flag" >:: begin fun _ ->
-        let b = js_regex_checker "/ss/ig" in
-        OUnit.assert_equal b true
-        end;
-        "test_regex_with_invalid_flag" >:: begin fun _ ->
-        let b = js_regex_checker "/ss/j" in
-        OUnit.assert_equal b false
-        end;
-        "test_regex_invalid_regex" >:: begin fun _ ->
-        let b = js_regex_checker "abc/i" in 
-        OUnit.assert_equal b false
-        end;
-        "test_regex_empty_pattern" >:: begin fun _  ->
-        let b = js_regex_checker "//" in 
-        OUnit.assert_equal b true
-        end;
-        "test_regex_with_utf8" >:: begin fun _ ->
-        let b = js_regex_checker "/😃/" in
-        OUnit.assert_equal b true
-        end;
-        "test_regex_repeated_flags" >:: begin fun _ ->
-        let b = js_regex_checker "/abc/gg" in
-        OUnit.assert_equal b false
-        end;
-    ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_json_tests.ml b/jscomp/ounit_tests/ounit_json_tests.ml
deleted file mode 100644
index 7990049..0000000
--- a/jscomp/ounit_tests/ounit_json_tests.ml
+++ /dev/null
@@ -1,185 +0,0 @@
-
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-type t = Ext_json_noloc.t     
-let rec equal 
-    (x : t)
-    (y : t) = 
-  match x with 
-  | Null  -> (* [%p? Null _ ] *)
-    begin match y with
-      | Null  -> true
-      | _ -> false end
-  | Str str  -> 
-    begin match y with 
-      | Str str2 -> str = str2
-      | _ -> false end
-  | Flo flo 
-    ->
-    begin match y with
-      |  Flo flo2 -> 
-        flo = flo2 
-      | _ -> false
-    end
-  | True  -> 
-    begin match y with 
-      | True  -> true 
-      | _ -> false 
-    end
-  | False  -> 
-    begin match y with 
-      | False  -> true 
-      | _ -> false 
-    end     
-  | Arr content 
-    -> 
-    begin match y with 
-      | Arr content2
-        ->
-        Ext_array.for_all2_no_exn content content2 equal 
-      | _ -> false 
-    end
-
-  | Obj map -> 
-    begin match y with 
-      | Obj map2 -> 
-        let xs = Map_string.bindings map 
-                 |> List.sort (fun (a,_) (b,_) -> compare a b) in 
-        let ys = Map_string.bindings map2 
-                 |> List.sort (fun (a,_) (b,_) -> compare a b) in 
-        Ext_list.for_all2_no_exn xs ys (fun (k0,v0) (k1,v1) -> k0=k1 && equal v0 v1)
-      | _ -> false 
-    end 
-
-
-open Ext_json_parse
-let (|?)  m (key, cb) =
-  m  |> Ext_json.test key cb 
-
-let rec strip (x : Ext_json_types.t) : Ext_json_noloc.t = 
-  let open Ext_json_noloc in 
-  match x with 
-  | True _ -> true_
-  | False _ -> false_
-  | Null _ -> null
-  | Flo {flo = s} -> flo s 
-  | Str {str = s} -> str s 
-  | Arr {content } -> arr (Array.map strip content)
-  | Obj {map} -> 
-    obj (Map_string.map map strip)
-
-let id_parsing_serializing x = 
-  let normal_s = 
-    Ext_json_noloc.to_string 
-      @@ strip 
-      @@ Ext_json_parse.parse_json_from_string x  
-  in 
-  let normal_ss = 
-    Ext_json_noloc.to_string 
-    @@ strip 
-    @@ Ext_json_parse.parse_json_from_string normal_s
-  in 
-  if normal_s <> normal_ss then 
-    begin 
-      prerr_endline "ERROR";
-      prerr_endline normal_s ;
-      prerr_endline normal_ss ;
-    end;
-  OUnit.assert_equal ~cmp:(fun (x:string) y -> x = y) normal_s normal_ss
-
-let id_parsing_x2 x = 
-  let stru = Ext_json_parse.parse_json_from_string x |> strip in 
-  let normal_s = Ext_json_noloc.to_string stru in 
-  let normal_ss = strip (Ext_json_parse.parse_json_from_string normal_s) in 
-  if equal stru normal_ss then 
-    true
-  else begin 
-    prerr_endline "ERROR";
-    prerr_endline normal_s;
-    Format.fprintf Format.err_formatter 
-    "%a@.%a@." Ext_obj.pp_any stru Ext_obj.pp_any normal_ss; 
-    
-    prerr_endline (Ext_json_noloc.to_string normal_ss);
-    false
-  end  
-
-let test_data = 
-  [{|
-      {}
-      |};
-   {| [] |};
-   {| [1,2,3]|};
-   {| ["x", "y", 1,2,3 ]|};
-   {| { "x" :  3, "y" : "x", "z" : [1,2,3, "x"] }|};
-   {| {"x " : true , "y" : false , "z\"" : 1} |}
-  ] 
-exception Parse_error 
-let suites = 
-  __FILE__ 
-  >:::
-  [
-
-    __LOC__ >:: begin fun _ -> 
-      List.iter id_parsing_serializing test_data
-    end;
-
-    __LOC__ >:: begin fun _ -> 
-      List.iteri (fun i x -> OUnit.assert_bool (__LOC__ ^ string_of_int i ) (id_parsing_x2 x)) test_data
-    end;
-    "empty_json" >:: begin fun _ -> 
-      let v =parse_json_from_string "{}" in
-      match v with 
-      | Obj {map = v} -> OUnit.assert_equal (Map_string.is_empty v ) true
-      | _ -> OUnit.assert_failure "should be empty"
-    end
-    ;
-    "empty_arr" >:: begin fun _ -> 
-      let v =parse_json_from_string "[]" in
-      match v with 
-      | Arr {content = [||]} -> ()
-      | _ -> OUnit.assert_failure "should be empty"
-    end
-    ;
-    "empty trails" >:: begin fun _ -> 
-      (OUnit.assert_raises Parse_error @@ fun _ -> 
-       try parse_json_from_string {| [,]|} with _ -> raise Parse_error);
-      OUnit.assert_raises Parse_error @@ fun _ -> 
-      try parse_json_from_string {| {,}|} with _ -> raise Parse_error
-    end;
-    "two trails" >:: begin fun _ -> 
-      (OUnit.assert_raises Parse_error @@ fun _ -> 
-       try parse_json_from_string {| [1,2,,]|} with _ -> raise Parse_error);
-      (OUnit.assert_raises Parse_error @@ fun _ -> 
-       try parse_json_from_string {| { "x": 3, ,}|} with _ -> raise Parse_error)
-    end;
-
-    "two trails fail" >:: begin fun _ -> 
-      (OUnit.assert_raises Parse_error @@ fun _ -> 
-       try parse_json_from_string {| { "x": 3, 2 ,}|} with _ -> raise Parse_error)
-    end;
-
-    "trail comma obj" >:: begin fun _ -> 
-      let v =  parse_json_from_string {| { "x" : 3 , }|} in 
-      let v1 =  parse_json_from_string {| { "x" : 3 , }|} in 
-      let test (v : Ext_json_types.t)  = 
-        match v with 
-        | Obj {map = v} -> 
-          v
-          |? ("x" , `Flo (fun x -> OUnit.assert_equal x "3"))
-          |> ignore 
-        | _ -> OUnit.assert_failure "trail comma" in 
-      test v ;
-      test v1 
-    end
-    ;
-    "trail comma arr" >:: begin fun _ -> 
-      let v = parse_json_from_string {| [ 1, 3, ]|} in
-      let v1 = parse_json_from_string {| [ 1, 3 ]|} in
-      let test (v : Ext_json_types.t) = 
-        match v with 
-        | Arr { content = [| Flo {flo = "1"} ; Flo { flo = "3"} |] } -> ()
-        | _ -> OUnit.assert_failure "trailing comma array" in 
-      test v ;
-      test v1
-    end
-  ]
diff --git a/jscomp/ounit_tests/ounit_list_test.ml b/jscomp/ounit_tests/ounit_list_test.ml
deleted file mode 100644
index 2fe732e..0000000
--- a/jscomp/ounit_tests/ounit_list_test.ml
+++ /dev/null
@@ -1,145 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-let printer_int_list = fun xs -> Format.asprintf "%a" 
-      (Format.pp_print_list  Format.pp_print_int
-      ~pp_sep:Format.pp_print_space 
-      ) xs 
-let suites = 
-  __FILE__
-  >:::
-  [
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_equal
-        (Ext_list.flat_map [1;2] (fun x -> [x;x]) ) [1;1;2;2] 
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_equal
-        (Ext_list.flat_map_append 
-           [1;2] [3;4] (fun x -> [x;x]) ) [1;1;2;2;3;4] 
-    end;
-    __LOC__ >:: begin fun _ -> 
-    
-     let (=~)  = OUnit.assert_equal ~printer:printer_int_list in 
-     (Ext_list.flat_map  [] (fun x -> [succ x ])) =~ [];
-     (Ext_list.flat_map [1] (fun x -> [x;succ x ]) ) =~ [1;2];
-     (Ext_list.flat_map [1;2] (fun x -> [x;succ x ])) =~ [1;2;2;3];
-     (Ext_list.flat_map [1;2;3] (fun x -> [x;succ x ]) ) =~ [1;2;2;3;3;4]
-    end
-    ;
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_equal 
-      (Ext_list.stable_group 
-        [1;2;3;4;3] (=)
-      )
-      ([[1];[2];[4];[3;3]])
-    end
-    ;
-    __LOC__ >:: begin fun _ -> 
-      let (=~)  = OUnit.assert_equal ~printer:printer_int_list in 
-      let f b _v = if b then 1 else 0 in 
-      Ext_list.map_last  []  f =~ [];
-      Ext_list.map_last [0] f =~ [1];
-      Ext_list.map_last [0;0] f =~ [0;1];
-      Ext_list.map_last [0;0;0] f =~ [0;0;1];
-      Ext_list.map_last [0;0;0;0] f =~ [0;0;0;1];
-      Ext_list.map_last [0;0;0;0;0] f =~ [0;0;0;0;1];
-      Ext_list.map_last [0;0;0;0;0;0] f =~ [0;0;0;0;0;1];
-      Ext_list.map_last [0;0;0;0;0;0;0] f =~ [0;0;0;0;0;0;1];
-    end
-    ;
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_equal (
-        Ext_list.flat_map_append           
-          [1;2] [false;false] 
-          (fun x -> if x mod 2 = 0 then [true] else [])
-      )  [true;false;false]
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_equal (
-        Ext_list.map_append  
-          [0;1;2] 
-          ["1";"2";"3"]
-          (fun x -> string_of_int x) 
-      )
-        ["0";"1";"2"; "1";"2";"3"]
-    end;
-
-    __LOC__ >:: begin fun _ -> 
-      let (a,b) = Ext_list.split_at [1;2;3;4;5;6]  3 in 
-      OUnit.assert_equal (a,b)
-        ([1;2;3],[4;5;6]);
-      OUnit.assert_equal (Ext_list.split_at  [1] 1)
-        ([1],[])  ;
-      OUnit.assert_equal (Ext_list.split_at [1;2;3]  2 )
-        ([1;2],[3])  
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let printer = fun (a,b) -> 
-        Format.asprintf "([%a],%d)"
-          (Format.pp_print_list Format.pp_print_int ) a  
-          b 
-      in 
-      let (=~) = OUnit.assert_equal ~printer in 
-      (Ext_list.split_at_last [1;2;3])
-      =~ ([1;2],3);
-      (Ext_list.split_at_last [1;2;3;4;5;6;7;8])
-      =~
-      ([1;2;3;4;5;6;7],8);
-      (Ext_list.split_at_last [1;2;3;4;5;6;7;])
-      =~
-      ([1;2;3;4;5;6],7)
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_equal (Ext_list.assoc_by_int  [2,"x"; 3,"y"; 1, "z"] 1 None) "z"
-    end;
-    __LOC__ >:: begin fun _ -> 
-      Ounit_tests_util.assert_raise_any
-        (fun _ -> Ext_list.assoc_by_int [2,"x"; 3,"y"; 1, "z"] 11 None )
-    end ;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_equal
-        (Ext_list.length_compare [0;0;0] 3) `Eq ;
-      OUnit.assert_equal
-        (Ext_list.length_compare [0;0;0] 1) `Gt ;   
-      OUnit.assert_equal
-        (Ext_list.length_compare [0;0;0] 4) `Lt ;   
-      OUnit.assert_equal
-        (Ext_list.length_compare [] (-1)) `Gt ;   
-      OUnit.assert_equal
-        (Ext_list.length_compare [] (0)) `Eq ;          
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ 
-        (Ext_list.length_larger_than_n [1;2] [1] 1 );
-      OUnit.assert_bool __LOC__ 
-        (Ext_list.length_larger_than_n [1;2] [1;2] 0);
-      OUnit.assert_bool __LOC__ 
-        (Ext_list.length_larger_than_n [1;2] [] 2)
-
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_bool __LOC__
-        (Ext_list.length_ge [1;2;3] 3 );
-      OUnit.assert_bool __LOC__
-        (Ext_list.length_ge [] 0 );
-      OUnit.assert_bool __LOC__
-        (not (Ext_list.length_ge [] 1 ));
-
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      let (=~) = OUnit.assert_equal in 
-
-      let f p x = Ext_list.exclude_with_val x p  in 
-      f  (fun x -> x = 1) [1;2;3] =~ (Some [2;3]);
-      f (fun x -> x = 4) [1;2;3] =~ (None);
-      f (fun x -> x = 2) [1;2;3;2] =~ (Some [1;3]);
-      f (fun x -> x = 2) [1;2;2;3;2] =~ (Some [1;3]);
-      f (fun x -> x = 2) [2;2;2] =~ (Some []);
-      f (fun x -> x = 3) [2;2;2] =~ (None)
-    end ;
-
-  ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_map_tests.ml b/jscomp/ounit_tests/ounit_map_tests.ml
deleted file mode 100644
index d75beb0..0000000
--- a/jscomp/ounit_tests/ounit_map_tests.ml
+++ /dev/null
@@ -1,59 +0,0 @@
-let ((>::),
-    (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal 
-
-let test_sorted_strict arr = 
-  let v = Map_int.of_array arr |> Map_int.to_sorted_array in 
-  let arr_copy = Array.copy arr in 
-  Array.sort (fun ((a:int),_) (b,_) -> compare a b ) arr_copy;
-  v =~ arr_copy 
-
-let suites = 
-  __MODULE__ >:::
-  [
-    __LOC__ >:: begin fun _ -> 
-      [1,"1"; 2,"2"; 12,"12"; 3, "3"]
-      |> Map_int.of_list 
-      |> Map_int.keys 
-      |> OUnit.assert_equal [1;2;3;12]
-    end
-    ;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_equal (Map_int.cardinal Map_int.empty) 0 ;
-      OUnit.assert_equal ([1,"1"; 2,"2"; 12,"12"; 3, "3"]
-      |> Map_int.of_list|>Map_int.cardinal )  4      
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let v = 
-      [1,"1"; 2,"2"; 12,"12"; 3, "3"]
-      |> Map_int.of_list 
-      |> Map_int.to_sorted_array in 
-      Array.length v =~ 4 ; 
-      v =~ [|1,"1"; 2,"2"; 3, "3"; 12,"12"; |]
-    end;
-    __LOC__ >:: begin fun _ -> 
-        test_sorted_strict [||];
-        test_sorted_strict [|1,""|];
-        test_sorted_strict [|2,""; 1,""|];
-        test_sorted_strict [|2,""; 1,""; 3, ""|];
-        test_sorted_strict [|2,""; 1,""; 3, ""; 4,""|]
-    end;
-    __LOC__ >:: begin fun _ ->
-      Map_int.cardinal (Map_int.of_array (Array.init 1000 (fun i -> (i,i))))
-      =~ 1000
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let count = 1000 in 
-      let a = Array.init count (fun x -> x ) in 
-      let v = Map_int.empty in
-      let u = 
-        begin 
-          let v = Array.fold_left (fun acc key -> Map_int.adjust acc key (fun v ->  match v with None -> 1 | Some v -> succ v)  ) v a   in 
-          Array.fold_left (fun acc key -> Map_int.adjust acc key (fun v -> match v with None ->  1 | Some v -> succ v)   ) v a  
-          end
-        in  
-       Map_int.iter u (fun _ v -> v =~ 2 ) ;
-       Map_int.cardinal u =~ count
-    end
-  ]
diff --git a/jscomp/ounit_tests/ounit_path_tests.ml b/jscomp/ounit_tests/ounit_path_tests.ml
deleted file mode 100644
index 6cb5ad8..0000000
--- a/jscomp/ounit_tests/ounit_path_tests.ml
+++ /dev/null
@@ -1,145 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-
-let normalize = Ext_path.normalize_absolute_path
-let (=~) x y = 
-  OUnit.assert_equal 
-  ~printer:(fun x -> x)
-  ~cmp:(fun x y ->   Ext_string.equal x y ) x y
-
-let suites = 
-  __FILE__ 
-  >:::
-  [
-    "linux path tests" >:: begin fun _ -> 
-      let norm = 
-        Array.map normalize
-          [|
-            "/gsho/./..";
-            "/a/b/../c../d/e/f";
-            "/a/b/../c/../d/e/f";
-            "/gsho/./../..";
-            "/a/b/c/d";
-            "/a/b/c/d/";
-            "/a/";
-            "/a";
-            "/a.txt/";
-            "/a.txt"
-          |] in 
-      OUnit.assert_equal norm 
-        [|
-          "/";
-          "/a/c../d/e/f";
-          "/a/d/e/f";
-          "/";
-          "/a/b/c/d" ;
-          "/a/b/c/d";
-          "/a";
-          "/a";
-          "/a.txt";
-          "/a.txt"
-        |]
-    end;
-    __LOC__ >:: begin fun _ ->
-      normalize "/./a/.////////j/k//../////..///././b/./c/d/./." =~ "/a/b/c/d"
-    end;
-    __LOC__ >:: begin fun _ -> 
-      normalize "/./a/.////////j/k//../////..///././b/./c/d/././../" =~ "/a/b/c"
-    end;
-
-    __LOC__ >:: begin fun _ -> 
-      let aux a b result = 
-
-        Ext_path.rel_normalized_absolute_path
-          ~from:a b =~ result ; 
-
-        Ext_path.rel_normalized_absolute_path
-          ~from:(String.sub a 0 (String.length a - 1)) 
-          b  =~ result ;
-
-        Ext_path.rel_normalized_absolute_path
-          ~from:a
-          (String.sub b 0 (String.length b - 1))  =~ result
-        ;
-
-
-        Ext_path.rel_normalized_absolute_path
-          ~from:(String.sub a 0 (String.length a - 1 ))
-          (String.sub b 0 (String.length b - 1))
-        =~ result  
-      in   
-      aux
-        "/a/b/c/"
-        "/a/b/c/d/"  "./d";
-      aux
-        "/a/b/c/"
-        "/a/b/c/d/e/f/" "./d/e/f" ;
-      aux
-        "/a/b/c/d/"
-        "/a/b/c/"  ".."  ;
-      aux
-        "/a/b/c/d/"
-        "/a/b/"  "../.."  ;  
-      aux
-        "/a/b/c/d/"
-        "/a/"  "../../.."  ;  
-      aux
-        "/a/b/c/d/"
-        "//"  "../../../.."  ;  
-
-
-    end;
-    (* This is still correct just not optimal depends 
-       on user's perspective *)
-    __LOC__ >:: begin fun _ -> 
-      Ext_path.rel_normalized_absolute_path 
-        ~from:"/a/b/c/d"
-        "/x/y" =~ "../../../../x/y"  
-
-    end;
-
-    (* used in module system: [es6-global] and [amdjs-global] *)    
-    __LOC__ >:: begin fun _ -> 
-      Ext_path.rel_normalized_absolute_path
-        ~from:"/usr/local/lib/node_modules/"
-        "//" =~ "../../../..";
-      Ext_path.rel_normalized_absolute_path
-        ~from:"/usr/local/lib/node_modules/"
-        "/" =~ "../../../..";
-      Ext_path.rel_normalized_absolute_path
-        ~from:"./"
-        "./node_modules/xx/./xx.js" =~ "./node_modules/xx/xx.js";
-      Ext_path.rel_normalized_absolute_path
-        ~from:"././"
-        "./node_modules/xx/./xx.js" =~ "./node_modules/xx/xx.js"        
-    end;
-
-     __LOC__ >:: begin fun _ -> 
-      Ext_path.node_rebase_file
-        ~to_:( "lib/js/src/a")
-        ~from:( "lib/js/src") "b" =~ "./a/b" ;
-      Ext_path.node_rebase_file
-        ~to_:( "lib/js/src/")
-        ~from:( "lib/js/src") "b" =~ "./b" ;          
-      Ext_path.node_rebase_file
-        ~to_:( "lib/js/src")
-        ~from:("lib/js/src/a") "b" =~ "../b";
-      Ext_path.node_rebase_file
-        ~to_:( "lib/js/src/a")
-        ~from:("lib/js/") "b" =~ "./src/a/b" ;
-      Ext_path.node_rebase_file
-        ~to_:("lib/js/./src/a") 
-        ~from:("lib/js/src/a/") "b"
-        =~ "./b";
-
-      Ext_path.node_rebase_file
-        ~to_:"lib/js/src/a"
-        ~from: "lib/js/src/a/" "b"
-      =~ "./b";
-      Ext_path.node_rebase_file
-        ~to_:"lib/js/src/a/"
-        ~from:"lib/js/src/a/" "b"
-      =~ "./b"
-    end     
-  ]
diff --git a/jscomp/ounit_tests/ounit_scc_tests.ml b/jscomp/ounit_tests/ounit_scc_tests.ml
deleted file mode 100644
index f20c087..0000000
--- a/jscomp/ounit_tests/ounit_scc_tests.ml
+++ /dev/null
@@ -1,392 +0,0 @@
-let ((>::),
-    (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-
-let tiny_test_cases = {|
-13
-22
- 4  2
- 2  3
- 3  2
- 6  0
- 0  1
- 2  0
-11 12
-12  9
- 9 10
- 9 11
- 7  9
-10 12
-11  4
- 4  3
- 3  5
- 6  8
- 8  6
- 5  4
- 0  5
- 6  4
- 6  9
- 7  6
-|}     
-
-let medium_test_cases = {|
-50
-147
- 0  7
- 0 34
- 1 14
- 1 45
- 1 21
- 1 22
- 1 22
- 1 49
- 2 19
- 2 25
- 2 33
- 3  4
- 3 17
- 3 27
- 3 36
- 3 42
- 4 17
- 4 17
- 4 27
- 5 43
- 6 13
- 6 13
- 6 28
- 6 28
- 7 41
- 7 44
- 8 19
- 8 48
- 9  9
- 9 11
- 9 30
- 9 46
-10  0
-10  7
-10 28
-10 28
-10 28
-10 29
-10 29
-10 34
-10 41
-11 21
-11 30
-12  9
-12 11
-12 21
-12 21
-12 26
-13 22
-13 23
-13 47
-14  8
-14 21
-14 48
-15  8
-15 34
-15 49
-16  9
-17 20
-17 24
-17 38
-18  6
-18 28
-18 32
-18 42
-19 15
-19 40
-20  3
-20 35
-20 38
-20 46
-22  6
-23 11
-23 21
-23 22
-24  4
-24  5
-24 38
-24 43
-25  2
-25 34
-26  9
-26 12
-26 16
-27  5
-27 24
-27 32
-27 31
-27 42
-28 22
-28 29
-28 39
-28 44
-29 22
-29 49
-30 23
-30 37
-31 18
-31 32
-32  5
-32  6
-32 13
-32 37
-32 47
-33  2
-33  8
-33 19
-34  2 
-34 19
-34 40
-35  9
-35 37
-35 46
-36 20
-36 42
-37  5
-37  9
-37 35
-37 47
-37 47
-38 35
-38 37
-38 38
-39 18
-39 42
-40 15
-41 28
-41 44
-42 31
-43 37
-43 38
-44 39
-45  8
-45 14
-45 14
-45 15
-45 49
-46 16
-47 23
-47 30
-48 12
-48 21
-48 33
-48 33
-49 34
-49 22
-49 49
-|}
-(* 
-reference output: 
-http://algs4.cs.princeton.edu/42digraph/KosarajuSharirSCC.java.html 
-*)
-
-let handle_lines tiny_test_cases = 
-  match Ext_string.split  tiny_test_cases '\n' with 
-  | nodes :: _edges :: rest -> 
-    let nodes_num = int_of_string nodes in 
-    let node_array = 
-      Array.init nodes_num
-        (fun _ -> Vec_int.empty () )
-    in 
-    begin 
-    Ext_list.iter rest (fun x ->
-          match Ext_string.split x ' ' with 
-          | [ a ; b] -> 
-            let a , b = int_of_string a , int_of_string b in 
-            Vec_int.push node_array.(a) b  
-          | _ -> assert false 
-        );
-      node_array 
-    end
-  | _ -> assert false
-
-let read_file file = 
-  let in_chan = open_in_bin file in 
-  let nodes_sum = int_of_string (input_line in_chan) in 
-  let node_array = Array.init nodes_sum (fun _ -> Vec_int.empty () ) in 
-  let rec aux () = 
-    match input_line in_chan with 
-    | exception End_of_file -> ()
-    | x -> 
-      begin match Ext_string.split x ' ' with 
-      | [ a ; b] -> 
-        let a , b = int_of_string a , int_of_string b in 
-        Vec_int.push node_array.(a) b 
-      | _ -> (* assert false  *) ()
-      end; 
-      aux () in 
-  print_endline "read data into memory";
-  aux ();
-   (fst (Ext_scc.graph_check node_array)) (* 25 *)
-
-
-let test  (input : (string * string list) list) = 
-  (* string -> int mapping 
-  *)
-  let tbl = Hash_string.create 32 in
-  let idx = ref 0 in 
-  let add x =
-    if not (Hash_string.mem tbl x ) then 
-      begin 
-        Hash_string.add  tbl x !idx ;
-        incr idx 
-      end in
-  input |> List.iter 
-    (fun (x,others) -> List.iter add (x::others));
-  let nodes_num = Hash_string.length tbl in
-  let node_array = 
-      Array.init nodes_num
-        (fun _ -> Vec_int.empty () ) in 
-  input |> 
-  List.iter (fun (x,others) -> 
-      let idx = Hash_string.find_exn tbl  x  in 
-      others |> 
-      List.iter (fun y -> Vec_int.push node_array.(idx) (Hash_string.find_exn tbl y ) )
-    ) ; 
-  Ext_scc.graph_check node_array 
-
-let test2  (input : (string * string list) list) = 
-  (* string -> int mapping 
-  *)
-  let tbl = Hash_string.create 32 in
-  let idx = ref 0 in 
-  let add x =
-    if not (Hash_string.mem tbl x ) then 
-      begin 
-        Hash_string.add  tbl x !idx ;
-        incr idx 
-      end in
-  input |> List.iter 
-    (fun (x,others) -> List.iter add (x::others));
-  let nodes_num = Hash_string.length tbl in
-  let other_mapping = Array.make nodes_num "" in 
-  Hash_string.iter tbl (fun k v  -> other_mapping.(v) <- k ) ;
-  
-  let node_array = 
-      Array.init nodes_num
-        (fun _ -> Vec_int.empty () ) in 
-  input |> 
-  List.iter (fun (x,others) -> 
-      let idx = Hash_string.find_exn tbl  x  in 
-      others |> 
-      List.iter (fun y -> Vec_int.push node_array.(idx) (Hash_string.find_exn tbl y ) )
-    )  ;
-  let output = Ext_scc.graph node_array in 
-  output |> Int_vec_vec.map_into_array (fun int_vec -> Vec_int.map_into_array (fun i -> other_mapping.(i)) int_vec )
-
-
-let suites = 
-    __FILE__
-    >::: [
-      __LOC__ >:: begin fun _ -> 
-        OUnit.assert_equal (fst @@ Ext_scc.graph_check (handle_lines tiny_test_cases))  5
-      end       ;
-      __LOC__ >:: begin fun _ -> 
-        OUnit.assert_equal (fst @@ Ext_scc.graph_check (handle_lines medium_test_cases))  10
-      end       ;
-      __LOC__ >:: begin fun _ ->
-        OUnit.assert_equal (test [
-            "a", ["b" ; "c"];
-            "b" , ["c" ; "d"];
-            "c", [ "b"];
-            "d", [];
-          ]) (3 , [1;2;1])
-      end ; 
-      __LOC__ >:: begin fun _ ->
-        OUnit.assert_equal (test [
-            "a", ["b" ; "c"];
-            "b" , ["c" ; "d"];
-            "c", [ "b"];
-            "d", [];
-            "e", []
-          ])  (4, [1;1;2;1])
-          (*  {[
-              a -> b
-              a -> c 
-              b -> c 
-              b -> d 
-              c -> b 
-              d 
-              e
-              ]}
-              {[
-              [d ; e ; [b;c] [a] ]
-              ]}  
-          *)
-      end ;
-      __LOC__ >:: begin fun _ ->
-        OUnit.assert_equal (test [
-            "a", ["b" ; "c"];
-            "b" , ["c" ; "d"];
-            "c", [ "b"];
-            "d", ["e"];
-            "e", []
-          ]) (4 , [1;2;1;1])
-      end ; 
-      __LOC__ >:: begin fun _ ->
-        OUnit.assert_equal (test [
-            "a", ["b" ; "c"];
-            "b" , ["c" ; "d"];
-            "c", [ "b"];
-            "d", ["e"];
-            "e", ["c"]
-          ]) (2, [1;4])
-      end ;
-      __LOC__ >:: begin fun _ ->
-        OUnit.assert_equal (test [
-            "a", ["b" ; "c"];
-            "b" , ["c" ; "d"];
-            "c", [ "b"];
-            "d", ["e"];
-            "e", ["a"]
-          ]) (1, [5])
-      end ; 
-      __LOC__ >:: begin fun _ ->
-        OUnit.assert_equal (test [
-            "a", ["b"];
-            "b" , ["c" ];
-            "c", [ ];
-            "d", [];
-            "e", []
-          ]) (5, [1;1;1;1;1])
-      end ; 
-      __LOC__ >:: begin fun _ ->
-        OUnit.assert_equal (test [
-            "1", ["0"];
-            "0" , ["2" ];
-            "2", ["1" ];
-            "0", ["3"];
-            "3", [ "4"]
-          ]) (3, [3;1;1])
-      end ; 
-      (* http://algs4.cs.princeton.edu/42digraph/largeDG.txt *)
-      (* __LOC__ >:: begin fun _ -> *)
-      (*   OUnit.assert_equal (read_file "largeDG.txt") 25 *)
-      (* end *)
-      (* ; *)
-      __LOC__ >:: begin fun _ ->
-        OUnit.assert_equal (test2 [
-            "a", ["b" ; "c"];
-            "b" , ["c" ; "d"];
-            "c", [ "b"];
-            "d", [];
-          ]) [|[|"d"|]; [|"b"; "c"|]; [|"a"|]|]
-      end ;
-
-      __LOC__ >:: begin fun _ ->
-        OUnit.assert_equal (test2 [
-            "a", ["b"];
-            "b" , ["c" ];
-            "c", ["d" ];
-            "d", ["e"];
-            "e", []
-          ]) [|[|"e"|]; [|"d"|]; [|"c"|]; [|"b"|]; [|"a"|]|] 
-      end ;
-
-    ]
diff --git a/jscomp/ounit_tests/ounit_sexp_tests.ml b/jscomp/ounit_tests/ounit_sexp_tests.ml
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/ounit_tests/ounit_string_tests.ml b/jscomp/ounit_tests/ounit_string_tests.ml
deleted file mode 100644
index 4b7a64f..0000000
--- a/jscomp/ounit_tests/ounit_string_tests.ml
+++ /dev/null
@@ -1,534 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal  ~printer:Ext_obj.dump  
-
-let printer_string = fun x -> x 
-
-let string_eq = OUnit.assert_equal ~printer:(fun id -> id)
-
-let suites = 
-  __FILE__ >::: 
-  [
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_bool "not found " (Ext_string.rindex_neg "hello" 'x' < 0 )
-    end;
-
-    __LOC__ >:: begin fun _ -> 
-      Ext_string.rindex_neg "hello" 'h' =~ 0 ;
-      Ext_string.rindex_neg "hello" 'e' =~ 1 ;
-      Ext_string.rindex_neg "hello" 'l' =~ 3 ;
-      Ext_string.rindex_neg "hello" 'l' =~ 3 ;
-      Ext_string.rindex_neg "hello" 'o' =~ 4 ;
-    end;
-    (* __LOC__ >:: begin 
-      fun _ -> 
-      let nl cur s = Ext_string.extract_until s cur '\n' in 
-      nl (ref 0) "hello\n" =~ "hello";
-      nl (ref 0) "\nhell" =~ "";
-      nl (ref 0) "hello" =~ "hello";
-      let cur = ref 0 in 
-      let b = "a\nb\nc\nd" in 
-      nl cur b =~ "a";
-      nl cur b =~ "b";
-      nl cur b =~ "c";
-      nl cur b =~ "d";
-      nl cur b =~ "" ;
-      nl cur b =~ "" ;
-      cur := 0 ;
-      let b = "a\nb\nc\nd\n" in 
-      nl cur b =~ "a";
-      nl cur b =~ "b";
-      nl cur b =~ "c";
-      nl cur b =~ "d";
-      nl cur b =~ "" ;
-      nl cur b =~ "" ;
-    end ; *)
-    __LOC__ >:: begin fun _ -> 
-      let b = "a\nb\nc\nd\n" in
-      let a = Ext_string.index_count in 
-      a b 0 '\n' 1 =~ 1 ;
-      a b 0 '\n' 2 =~ 3;
-      a b 0 '\n' 3 =~ 5;
-      a b 0 '\n' 4 =~ 7; 
-      a b 0 '\n' 5 =~ -1; 
-    end ;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool "empty string" (Ext_string.rindex_neg "" 'x' < 0 )
-    end;
-
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__
-        (not (Ext_string.for_all_from "xABc"1
-                (function 'A' .. 'Z' -> true | _ -> false)));
-      OUnit.assert_bool __LOC__
-        ( (Ext_string.for_all_from "xABC" 1
-             (function 'A' .. 'Z' -> true | _ -> false)));
-      OUnit.assert_bool __LOC__
-        ( (Ext_string.for_all_from "xABC" 1_000
-             (function 'A' .. 'Z' -> true | _ -> false)));             
-    end; 
-
-    (* __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ @@
-      List.for_all (fun x -> Ext_string.is_valid_source_name x = Good)
-        ["x.ml"; "x.mli"; "x.res"; "x.resi"; 
-         "A_x.ml"; "ab.ml"; "a_.ml"; "a__.ml";
-         "ax.ml"];
-      OUnit.assert_bool __LOC__ @@ not @@
-      List.exists (fun x -> Ext_string.is_valid_source_name x = Good)
-        [".res"; ".resi";"..res"; "..resi"; "..ml"; ".mll~"; 
-         "...ml"; "_.mli"; "_x.ml"; "__.ml"; "__.rei"; 
-         ".#hello.ml"; ".#hello.rei"; "a-.ml"; "a-b.ml"; "-a-.ml"
-        ; "-.ml"
-        ]
-    end; *)
-    __LOC__ >:: begin fun _ -> 
-      Ext_filename.module_name "a/hello.ml" =~ "Hello";
-      Ext_filename.as_module ~basename:"a.ml" =~ Some {module_name = "A"; case = false};
-      Ext_filename.as_module ~basename:"Aa.ml" =~ Some {module_name = "Aa"; case = true};
-      (* Ext_filename.as_module ~basename:"_Aa.ml" =~ None; *)
-      Ext_filename.as_module ~basename:"A_a" =~ Some {module_name = "A_a"; case = true};
-      Ext_filename.as_module ~basename:"" =~ None;
-      Ext_filename.as_module ~basename:"a/hello.ml" =~ 
-        None
-
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ @@
-      List.for_all Ext_namespace.is_valid_npm_package_name
-        ["x"; "@angualr"; "test"; "hi-x"; "hi-"]
-      ;
-      OUnit.assert_bool __LOC__ @@
-      List.for_all 
-        (fun x -> not (Ext_namespace.is_valid_npm_package_name x))
-        ["x "; "x'"; "Test"; "hI"]
-      ;
-    end;
-    __LOC__ >:: begin fun _ -> 
-      Ext_string.find ~sub:"hello" "xx hello xx" =~ 3 ;
-      Ext_string.rfind ~sub:"hello" "xx hello xx" =~ 3 ;
-      Ext_string.find ~sub:"hello" "xx hello hello xx" =~ 3 ;
-      Ext_string.rfind ~sub:"hello" "xx hello hello xx" =~ 9 ;
-    end;
-    __LOC__ >:: begin fun _ -> 
-      Ext_string.non_overlap_count ~sub:"0" "1000,000" =~ 6;
-      Ext_string.non_overlap_count ~sub:"0" "000000" =~ 6;
-      Ext_string.non_overlap_count ~sub:"00" "000000" =~ 3;
-      Ext_string.non_overlap_count ~sub:"00" "00000" =~ 2
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ (Ext_string.contain_substring "abc" "abc");
-      OUnit.assert_bool __LOC__ (Ext_string.contain_substring "abc" "a");
-      OUnit.assert_bool __LOC__ (Ext_string.contain_substring "abc" "b");
-      OUnit.assert_bool __LOC__ (Ext_string.contain_substring "abc" "c");
-      OUnit.assert_bool __LOC__ (Ext_string.contain_substring "abc" "");
-      OUnit.assert_bool __LOC__ (not @@ Ext_string.contain_substring "abc" "abcc");
-    end;
-    __LOC__ >:: begin fun _ -> 
-      Ext_string.trim " \t\n" =~ "";
-      Ext_string.trim " \t\nb" =~ "b";
-      Ext_string.trim "b \t\n" =~ "b";
-      Ext_string.trim "\t\n b \t\n" =~ "b";            
-    end;
-    __LOC__ >:: begin fun _ -> 
-      Ext_string.starts_with "ab" "a" =~ true;
-      Ext_string.starts_with "ab" "" =~ true;
-      Ext_string.starts_with "abb" "abb" =~ true;
-      Ext_string.starts_with "abb" "abbc" =~ false;
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let (=~) = OUnit.assert_equal ~printer:(fun x -> string_of_bool x ) in 
-      let k = Ext_string.ends_with in 
-      k "xx.ml" ".ml" =~ true;
-      k "xx.bs.js" ".js" =~ true ;
-      k "xx" ".x" =~false;
-      k "xx" "" =~true
-    end;  
-    __LOC__ >:: begin fun _ -> 
-      Ext_string.ends_with_then_chop "xx.ml"  ".ml" =~ Some "xx";
-      Ext_string.ends_with_then_chop "xx.ml" ".mll" =~ None
-    end;
-    (* __LOC__ >:: begin fun _ -> 
-       Ext_string.starts_with_and_number "js_fn_mk_01" ~offset:0 "js_fn_mk_" =~ 1 ;
-       Ext_string.starts_with_and_number "js_fn_run_02" ~offset:0 "js_fn_mk_" =~ -1 ;
-       Ext_string.starts_with_and_number "js_fn_mk_03" ~offset:6 "mk_" =~ 3 ;
-       Ext_string.starts_with_and_number "js_fn_mk_04" ~offset:6 "run_" =~ -1;
-       Ext_string.starts_with_and_number "js_fn_run_04" ~offset:6 "run_" =~ 4;
-       Ext_string.(starts_with_and_number "js_fn_run_04" ~offset:6 "run_" = 3) =~ false 
-       end; *)
-    __LOC__ >:: begin fun _ -> 
-      Ext_string.for_all "____" (function '_' -> true | _ -> false)
-        =~ true;
-      Ext_string.for_all "___-" (function '_' -> true | _ -> false)
-        =~ false;
-      Ext_string.for_all ""  (function '_' -> true | _ -> false)        
-        =~ true
-    end;
-    __LOC__ >:: begin fun _ -> 
-      Ext_string.tail_from "ghsogh" 1 =~ "hsogh";
-      Ext_string.tail_from "ghsogh" 0 =~ "ghsogh"
-    end;
-    (* __LOC__ >:: begin fun _ -> 
-       Ext_string.digits_of_str "11_js" ~offset:0 2 =~ 11 
-       end; *)
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.replace_backward_slash "a:\\b\\d" = 
-         "a:/b/d"
-        ) ;
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.replace_backward_slash "a:\\b\\d\\" = 
-         "a:/b/d/"
-        ) ;
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.replace_slash_backward "a:/b/d/"= 
-         "a:\\b\\d\\" 
-        ) ;  
-      OUnit.assert_bool __LOC__ 
-        (let old = "a:bd" in 
-         Ext_string.replace_backward_slash old == 
-         old
-        ) ;
-      OUnit.assert_bool __LOC__ 
-        (let old = "a:bd" in 
-         Ext_string.replace_backward_slash old == 
-         old
-        ) ;
-
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash "ahgoh" );
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash "" );            
-      OUnit.assert_bool __LOC__ 
-        (not (Ext_string.no_slash "ahgoh/" ));
-      OUnit.assert_bool __LOC__ 
-        (not (Ext_string.no_slash "/ahgoh" ));
-      OUnit.assert_bool __LOC__ 
-        (not (Ext_string.no_slash "/ahgoh/" ));            
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ (Ext_string.compare "" ""  = 0);
-      OUnit.assert_bool __LOC__ (Ext_string.compare "0" "0"  = 0);
-      OUnit.assert_bool __LOC__ (Ext_string.compare "" "acd" < 0);
-      OUnit.assert_bool __LOC__ (Ext_string.compare  "acd" "" > 0);
-      for i = 0 to 256 do 
-        let a = String.init i (fun _ -> '0') in 
-        let b = String.init i (fun _ -> '0') in 
-        OUnit.assert_bool __LOC__ (Ext_string.compare  b a = 0);
-        OUnit.assert_bool __LOC__ (Ext_string.compare a b = 0)
-      done ;
-      for i = 0 to 256 do 
-        let a = String.init i (fun _ -> '0') in 
-        let b = String.init i (fun _ -> '0') ^ "\000"in 
-        OUnit.assert_bool __LOC__ (Ext_string.compare a b < 0);
-        OUnit.assert_bool __LOC__ (Ext_string.compare  b a  > 0)
-      done ;
-
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let slow_compare x y  = 
-        let x_len = String.length x  in 
-        let y_len = String.length y in 
-        if x_len = y_len then 
-          String.compare x y 
-        else 
-          Stdlib.compare x_len y_len  in 
-      let same_sign x y =
-        if x = 0 then y = 0 
-        else if x < 0 then y < 0 
-        else y > 0 in 
-      for _ = 0 to 3000 do
-        let chars = [|'a';'b';'c';'d'|] in 
-        let x = Ounit_data_random.random_string chars 129 in 
-        let y = Ounit_data_random.random_string chars 129 in 
-        let a = Ext_string.compare  x y  in 
-        let b = slow_compare x y in 
-        if same_sign a b then OUnit.assert_bool __LOC__ true 
-        else failwith ("incosistent " ^ x ^ " " ^ y ^ " " ^ string_of_int a ^ " " ^ string_of_int b)
-      done 
-    end ;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.equal
-           (Ext_string.concat3 "a0" "a1" "a2") "a0a1a2"
-        );
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.equal
-           (Ext_string.concat3 "a0" "a11" "") "a0a11"
-        );
-
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.equal
-           (Ext_string.concat4 "a0" "a1" "a2" "a3") "a0a1a2a3"
-        );
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.equal
-           (Ext_string.concat4 "a0" "a11" "" "a33") "a0a11a33"
-        );   
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.equal
-           (Ext_string.inter2 "a0" "a1") "a0 a1"
-        );
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.equal
-           (Ext_string.inter3 "a0" "a1" "a2") "a0 a1 a2"
-        );
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.equal
-           (Ext_string.inter4 "a0" "a1" "a2" "a3") "a0 a1 a2 a3"
-        );
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash_idx "" < 0);
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash_idx "xxx" < 0);
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash_idx "xxx/" = 3);
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash_idx "xxx/g/" = 3);
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash_idx "/xxx/g/" = 0)
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash_idx_from "xxx" 0 < 0);
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash_idx_from "xxx/" 1 = 3);
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash_idx_from "xxx/g/" 4 = 5);
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash_idx_from "xxx/g/" 3 = 3);  
-      OUnit.assert_bool __LOC__ 
-        (Ext_string.no_slash_idx_from "/xxx/g/" 0 = 0)
-    end;
-    __LOC__ >:: begin fun _ -> 
-      OUnit.assert_bool __LOC__
-        (Ext_string.equal 
-           (Ext_string.concat_array Ext_string.single_space [||])
-           Ext_string.empty
-        );
-      OUnit.assert_bool __LOC__
-        (Ext_string.equal 
-           (Ext_string.concat_array Ext_string.single_space [|"a0"|])
-           "a0"
-        );
-      OUnit.assert_bool __LOC__
-        (Ext_string.equal 
-           (Ext_string.concat_array Ext_string.single_space [|"a0";"a1"|])
-           "a0 a1"
-        );   
-      OUnit.assert_bool __LOC__
-        (Ext_string.equal 
-           (Ext_string.concat_array Ext_string.single_space [|"a0";"a1"; "a2"|])
-           "a0 a1 a2"
-        );   
-      OUnit.assert_bool __LOC__
-        (Ext_string.equal 
-           (Ext_string.concat_array Ext_string.single_space [|"a0";"a1"; "a2";"a3"|])
-           "a0 a1 a2 a3"
-        );    
-      OUnit.assert_bool __LOC__
-        (Ext_string.equal 
-           (Ext_string.concat_array Ext_string.single_space [|"a0";"a1"; "a2";"a3";""; "a4"|])
-           "a0 a1 a2 a3  a4"
-        );      
-      OUnit.assert_bool __LOC__
-        (Ext_string.equal 
-           (Ext_string.concat_array Ext_string.single_space [|"0";"a1"; "2";"a3";""; "a4"|])
-           "0 a1 2 a3  a4"
-        );        
-      OUnit.assert_bool __LOC__
-        (Ext_string.equal 
-           (Ext_string.concat_array Ext_string.single_space [|"0";"a1"; "2";"3";"d"; ""; "e"|])
-           "0 a1 2 3 d  e"
-        );        
-
-    end;
-
-    __LOC__ >:: begin fun _ ->
-      Ext_namespace.namespace_of_package_name "bs-json"
-      =~ "BsJson"
-    end;
-    __LOC__ >:: begin fun _ -> 
-      Ext_namespace.namespace_of_package_name "xx"
-      =~ "Xx"
-    end;
-    __LOC__ >:: begin fun _ ->
-      let (=~) = OUnit.assert_equal ~printer:(fun x -> x) in
-      Ext_namespace.namespace_of_package_name
-        "reason-react"
-      =~ "ReasonReact";
-      Ext_namespace.namespace_of_package_name
-          "Foo_bar"
-        =~ "Foo_bar";
-      Ext_namespace.namespace_of_package_name
-        "reason"
-      =~ "Reason";
-      Ext_namespace.namespace_of_package_name 
-        "@aa/bb"
-        =~"AaBb";
-      Ext_namespace.namespace_of_package_name 
-        "@A/bb"
-        =~"ABb"        
-    end;
-    __LOC__ >:: begin fun _ -> 
-      Ext_namespace.change_ext_ns_suffix  "a-b" Literals.suffix_js
-      =~ "a.js";
-      Ext_namespace.change_ext_ns_suffix  "a-" Literals.suffix_js
-      =~ "a.js";
-      Ext_namespace.change_ext_ns_suffix  "a--" Literals.suffix_js
-      =~ "a-.js";
-      Ext_namespace.change_ext_ns_suffix  "AA-b" Literals.suffix_js
-      =~ "AA.js";
-      Ext_namespace.js_name_of_modulename "AA-b" Little Literals.suffix_js
-      =~ "aA.js";
-      Ext_namespace.js_name_of_modulename "AA-b" Upper Literals.suffix_js
-      =~ "AA.js";
-      Ext_namespace.js_name_of_modulename "AA-b" Upper ".bs.js"
-      =~ "AA.bs.js";
-    end;
-    __LOC__ >:: begin   fun _ -> 
-      let (=~) = OUnit.assert_equal ~printer:(fun x -> 
-          match x with 
-          | None -> ""
-          | Some (a,b) -> a ^","^ b
-        ) in  
-      Ext_namespace.try_split_module_name "Js-X" =~ Some ("X","Js");
-      Ext_namespace.try_split_module_name "Js_X" =~ None
-    end;
-    __LOC__ >:: begin fun _ ->
-      let (=~) = OUnit.assert_equal ~printer:(fun x -> x) in  
-      let f = Ext_string.capitalize_ascii in
-      f "x" =~ "X";
-      f "X" =~ "X";
-      f "" =~ "";
-      f "abc" =~ "Abc";
-      f "_bc" =~ "_bc";
-      let v = "bc" in
-      f v =~ "Bc";
-      v =~ "bc"
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let (=~) = OUnit.assert_equal ~printer:printer_string in 
-      Ext_filename.chop_all_extensions_maybe "a.bs.js" =~ "a" ; 
-      Ext_filename.chop_all_extensions_maybe "a.js" =~ "a";
-      Ext_filename.chop_all_extensions_maybe "a" =~ "a";
-      Ext_filename.chop_all_extensions_maybe "a.x.bs.js" =~ "a"
-    end;
-    (* let (=~) = OUnit.assert_equal ~printer:(fun x -> x) in  *)
-    __LOC__ >:: begin fun _ ->
-      let k = Ext_modulename.js_id_name_of_hint_name in 
-      k "xx" =~ "Xx";
-      k "react-dom" =~ "ReactDom";
-      k "a/b/react-dom" =~ "ReactDom";
-      k "a/b" =~ "B";
-      k "a/" =~ "A/" ; (*TODO: warning?*)
-      k "#moduleid" =~ "Moduleid";
-      k "@bundle" =~ "Bundle";
-      k "xx#bc" =~ "Xxbc";
-      k "hi@myproj" =~ "Himyproj";
-      k "ab/c/xx.b.js" =~ "XxBJs"; (* improve it in the future*)
-      k "c/d/a--b"=~ "AB";
-      k "c/d/ac--" =~ "Ac"
-    end ;
-    __LOC__ >:: begin fun _ -> 
-      Ext_string.capitalize_sub "ab-Ns.cmi" 2 =~ "Ab";
-      Ext_string.capitalize_sub "Ab-Ns.cmi" 2 =~ "Ab";
-      Ext_string.capitalize_sub "Ab-Ns.cmi" 3 =~ "Ab-"
-    end ;
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_equal 
-        (String.length (Digest.string "")) 
-         Ext_digest.length
-    end;
-
-    __LOC__ >:: begin fun _ -> 
-      let bench = String.concat 
-        ";" (Ext_list.init 11 (fun i -> string_of_int i)) in
-      let buf = Ext_buffer.create 10 in 
-      OUnit.assert_bool
-        __LOC__ (Ext_buffer.not_equal buf bench); 
-      for i = 0 to 9 do   
-        Ext_buffer.add_string buf (string_of_int i);
-        Ext_buffer.add_string buf ";"
-      done ;
-      OUnit.assert_bool
-        __LOC__ (Ext_buffer.not_equal buf bench); 
-      Ext_buffer.add_string buf "10"  ;
-      (* print_endline (Ext_buffer.contents buf);
-      print_endline bench; *)
-      OUnit.assert_bool
-      __LOC__ (not (Ext_buffer.not_equal buf bench))
-    end ;
-
-    __LOC__ >:: begin fun _ -> 
-        string_eq (Ext_filename.new_extension "a.c" ".xx")  "a.xx";
-        string_eq (Ext_filename.new_extension "abb.c" ".xx")  "abb.xx";
-        string_eq (Ext_filename.new_extension ".c" ".xx")  ".xx";
-        string_eq (Ext_filename.new_extension "a/b" ".xx")  "a/b.xx";
-        string_eq (Ext_filename.new_extension "a/b." ".xx")  "a/b.xx";
-        string_eq (Ext_filename.chop_all_extensions_maybe "a.b.x") "a";
-        string_eq (Ext_filename.chop_all_extensions_maybe "a.b") "a";
-        string_eq (Ext_filename.chop_all_extensions_maybe ".a.b.x") "";
-        string_eq (Ext_filename.chop_all_extensions_maybe "abx") "abx";
-    end;
-    __LOC__ >:: begin fun _ ->
-        string_eq 
-          (Ext_filename.module_name "a/b/c.d")
-          "C";
-        string_eq 
-          (Ext_filename.module_name "a/b/xc.res")
-          "Xc";
-        string_eq 
-          (Ext_filename.module_name "a/b/xc.resi")
-          "Xc";
-        string_eq 
-          (Ext_filename.module_name "a/b/xc.ml")
-          "Xc"  ;
-        string_eq 
-          (Ext_filename.module_name "a/b/xc.mli")
-          "Xc"  ;
-        string_eq 
-          (Ext_filename.module_name "a/b/xc.cppo.mli")
-          "Xc.cppo";
-        string_eq 
-          (Ext_filename.module_name "a/b/xc.cppo.")
-          "Xc.cppo"  ;
-        string_eq 
-          (Ext_filename.module_name "a/b/xc..")
-          "Xc."  ;
-        string_eq 
-          (Ext_filename.module_name "a/b/Xc..")
-          "Xc."  ;
-        string_eq 
-          (Ext_filename.module_name "a/b/.")
-          ""  ;  
-    end;
-    __LOC__ >:: begin fun _ -> 
-      Ext_string.split "" ':' =~ [];
-      Ext_string.split "a:b:" ':' =~ ["a";"b"];
-      Ext_string.split "a:b:" ':' ~keep_empty:true =~ ["a";"b";""]
-    end;
-    __LOC__ >:: begin fun _ ->    
-        let cmp0 = Ext_string.compare in 
-        let cmp1 = Map_string.compare_key in 
-        let f a b = 
-          cmp0 a b =~ cmp1 a b ;
-          cmp0 b a =~ cmp1 b a
-          in
-        (* This is needed since deserialization/serialization
-          needs to be synced up for .bsbuild decoding
-         *)
-        f "a" "A";
-        f "bcdef" "abcdef";
-        f "" "A";
-        f "Abcdef" "abcdef";
-    end
-  ]
-
diff --git a/jscomp/ounit_tests/ounit_tests_main.ml b/jscomp/ounit_tests/ounit_tests_main.ml
deleted file mode 100644
index b3f4543..0000000
--- a/jscomp/ounit_tests/ounit_tests_main.ml
+++ /dev/null
@@ -1,52 +0,0 @@
-[@@@warning "-32"]
-
-module Int_array = Vec.Make (struct
-  type t = int
-
-  let null = 0
-end)
-
-let v = Int_array.init 10 (fun i -> i)
-
-let ( >:: ), ( >::: ) = OUnit.(( >:: ), ( >::: ))
-
-let ( =~ ) x y =
-  OUnit.assert_equal ~cmp:(Int_array.equal (fun (x : int) y -> x = y)) x y
-
-let ( =~~ ) x y =
-  OUnit.assert_equal
-    ~cmp:(Int_array.equal (fun (x : int) y -> x = y))
-    x (Int_array.of_array y)
-
-let suites =
-  __FILE__
-  >::: [
-         Ounit_vec_test.suites;
-         Ounit_json_tests.suites;
-         Ounit_path_tests.suites;
-         Ounit_array_tests.suites;
-         Ounit_scc_tests.suites;
-         Ounit_list_test.suites;
-         Ounit_hash_set_tests.suites;
-         Ounit_union_find_tests.suites;
-         Ounit_bal_tree_tests.suites;
-         Ounit_hash_stubs_test.suites;
-         Ounit_map_tests.suites;
-         Ounit_hashtbl_tests.suites;
-         Ounit_string_tests.suites;
-         Ounit_topsort_tests.suites;
-         (* Ounit_sexp_tests.suites; *)
-         Ounit_int_vec_tests.suites;
-         Ounit_ident_mask_tests.suites;
-         Ounit_cmd_tests.suites;
-         Ounit_ffi_error_debug_test.suites;
-         Ounit_js_regex_checker_tests.suites;
-         Ounit_utf8_test.suites;
-         Ounit_unicode_tests.suites;
-         Ounit_bsb_regex_tests.suites;
-         Ounit_bsb_pkg_tests.suites;
-         Ounit_depends_format_test.suites;
-         Ounit_util_tests.suites;
-       ]
-
-let _ = OUnit.run_test_tt_main suites
diff --git a/jscomp/ounit_tests/ounit_tests_main.mli b/jscomp/ounit_tests/ounit_tests_main.mli
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/ounit_tests/ounit_tests_util.ml b/jscomp/ounit_tests/ounit_tests_util.ml
deleted file mode 100644
index d183634..0000000
--- a/jscomp/ounit_tests/ounit_tests_util.ml
+++ /dev/null
@@ -1,46 +0,0 @@
-let raises f =
-  try
-    ignore (f ());
-    None
-  with e -> 
-    Some e
-
-let assert_raise_any ?msg (f: unit -> 'a) = 
-  let get_error_string () =
-    let str = 
-      Format.sprintf 
-        "expected exception, but no exception was raised." 
-    in
-      match msg with
-        | None -> 
-            OUnit.assert_failure str              
-        | Some s -> 
-            OUnit.assert_failure (s^"\n"^str)
-  in
-  match raises f with
-    | None -> 
-        OUnit.assert_failure (get_error_string ())
-    | Some exn -> 
-        OUnit.assert_bool (Printexc.to_string exn) true
-
-let time ?nums description  f  =
-  match nums with 
-  | None -> 
-    begin 
-      let start = Unix.gettimeofday () in 
-      ignore @@ f ();
-      let finish = Unix.gettimeofday () in
-      Printf.printf "\n%s elapsed %f\n" description (finish -. start) ;
-      flush stdout; 
-    end
-
-  | Some nums -> 
-    begin 
-        let start = Unix.gettimeofday () in 
-        for _i = 0 to nums - 1 do 
-          ignore @@ f ();
-        done  ;
-      let finish = Unix.gettimeofday () in
-      Printf.printf "\n%s elapsed %f\n" description (finish -. start)  ;
-      flush stdout;
-    end
diff --git a/jscomp/ounit_tests/ounit_topsort_tests.ml b/jscomp/ounit_tests/ounit_topsort_tests.ml
deleted file mode 100644
index 0a94176..0000000
--- a/jscomp/ounit_tests/ounit_topsort_tests.ml
+++ /dev/null
@@ -1,70 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let handle graph = 
-  let len = List.length graph in 
-  let result = Ext_topsort.Edge_vec.make len in 
-  List.iter (fun (id,deps) -> 
-      Ext_topsort.Edge_vec.push result {id ; deps = Vec_int.of_list deps } 
-    ) graph; 
-  result 
-
-
-let graph1 = 
-  [ 
-    0, [1;2];
-    1, [2;3];
-    2, [4];
-    3, [];
-    4, []
-  ], [[0]; [1]; [2] ; [3;4]]
-
-
-let graph2 = 
-  [ 
-    0, [1;2];
-    1, [2;3];
-    2, [4];
-    3, [5];
-    4, [5];
-    5, []
-  ],  
-  [[0]; [1]; [2] ; [3;4]; [5]]
-
-let graph3 = 
-    [ 0,[1;2;3;4;5];
-      1, [6;7;8] ;
-      2, [6;7;8];
-      3, [6;7;8];
-      4, [6;7;8];
-      5, [6;7;8];
-      6, [];
-      7, [] ;
-      8, []
-     ],
-     [[0]; [1;2;3;4;5]; [6; 7; 8]]
-
-
-let expect loc (graph1, v) = 
-  let graph = handle graph1  in 
-  let queue = Ext_topsort.layered_dfs graph  in 
-  OUnit.assert_bool loc
-    (Queue.fold (fun acc x -> Set_int.elements x::acc) [] queue =
-     v)
-
-
-
-
-
-let (=~) = OUnit.assert_equal
-let suites = 
-  __FILE__
-  >:::
-  [
-    __LOC__ >:: begin fun _ -> 
-      expect __LOC__ graph1;
-      expect __LOC__ graph2 ;
-      expect __LOC__ graph3
-    end
-
-  ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_unicode_tests.ml b/jscomp/ounit_tests/ounit_unicode_tests.ml
deleted file mode 100644
index 0c289da..0000000
--- a/jscomp/ounit_tests/ounit_unicode_tests.ml
+++ /dev/null
@@ -1,246 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) a b = 
-    OUnit.assert_equal ~cmp:Ext_string.equal a b 
-
-(** Test for single line *)
-let (==~) a b =
-  OUnit.assert_equal
-    (
-     Ext_list.map (Ast_utf8_string_interp.transform_test a
-     |> List.filter (fun x -> not @@ Ast_utf8_string_interp.empty_segment x))
-     (fun 
-      ({start = {offset = a}; finish = {offset = b}; kind ; content }
-       : Ast_utf8_string_interp.segment) -> 
-      a,b,kind,content
-      )
-    )
-    b 
-
-let (==*) a b =
-  let segments =     
-     Ext_list.map (
-       Ast_utf8_string_interp.transform_test a
-     |> List.filter (fun x -> not @@ Ast_utf8_string_interp.empty_segment x)
-     )(fun 
-      ({start = {lnum=la; offset = a}; finish = {lnum = lb; offset = b}; kind ; content } 
-        : Ast_utf8_string_interp.segment) -> 
-      la,a,lb,b,kind,content
-      )
-   in 
-   OUnit.assert_equal segments b 
-
-let varParen : Ast_utf8_string_interp.kind = Var (2,-1)   
-let var : Ast_utf8_string_interp.kind = Var (1,0)
-let suites = 
-    __FILE__
-    >:::
-    [
-        __LOC__ >:: begin fun _ ->
-            Ast_utf8_string.transform_test {|x|} =~ {|x|}
-        end;
-        __LOC__ >:: begin fun _ ->
-            Ast_utf8_string.transform_test "a\nb" =~ {|a\nb|}
-        end;
-        __LOC__ >:: begin fun _ ->
-            Ast_utf8_string.transform_test
-            "\\n" =~ "\\n"
-        end;
-        __LOC__ >:: begin fun _ ->
-            Ast_utf8_string.transform_test {|\h\e\l\lo \"world\"!|} =~ {|\h\e\l\lo \"world\"!|}
-        end;
-        __LOC__ >:: begin fun _ ->
-            Ast_utf8_string.transform_test "\\u{1d306}" =~ "\\u{1d306}"
-        end;
-        __LOC__ >:: begin fun _ ->
-            Ast_utf8_string.transform_test "unicode escape: \\u{1d306}" =~ "unicode escape: \\u{1d306}"
-        end;
-        __LOC__ >:: begin fun _ ->
-            Ast_utf8_string.transform_test "unicode escape: \\u{1d306} with suffix text" =~ "unicode escape: \\u{1d306} with suffix text"
-        end;
-        __LOC__ >:: begin fun _ ->
-          Ast_utf8_string.transform_test
-            "\\\\\\b\\t\\n\\v\\f\\r\\0\\$" =~
-          "\\\\\\b\\t\\n\\v\\f\\r\\0\\$"
-        end;
-
-        __LOC__ >:: begin fun _ ->
-           match Ast_utf8_string.transform_test
-             {|\|} with
-           | exception Ast_utf8_string.Error(offset,_) ->
-            OUnit.assert_equal offset 1
-           | _ -> OUnit.assert_failure __LOC__
-        end ;
-         __LOC__ >:: begin fun _ ->
-           match Ast_utf8_string.transform_test
-             {|你\|} with
-           | exception Ast_utf8_string.Error(offset,_) ->
-            OUnit.assert_equal offset 2
-           | _ -> OUnit.assert_failure __LOC__
-        end ;
-         __LOC__ >:: begin fun _ ->
-           match Ast_utf8_string.transform_test
-             {|你BuckleScript,好啊\uffff\|} with
-           | exception Ast_utf8_string.Error(offset,_) ->
-            OUnit.assert_equal offset 23
-           | _ -> OUnit.assert_failure __LOC__
-        end ;
-         __LOC__ >:: begin fun _ ->
-           match Ast_utf8_string.transform_test
-             {js|\u{110000}|js} with (* bigger than max valid unicode codepoint *)
-           | exception Ast_utf8_string.Error(offset,_) ->
-            OUnit.assert_equal offset 3
-           | _ -> OUnit.assert_failure __LOC__
-        end ;
-        __LOC__ >:: begin fun _ ->
-           match Ast_utf8_string.transform_test
-             {js|\u{FFFFFFFFFFFFFFFFFFFFFFFFFFFFF}|js} with (* overflow *)
-           | exception Ast_utf8_string.Error(offset,_) ->
-            OUnit.assert_equal offset 3
-           | _ -> OUnit.assert_failure __LOC__
-        end ;
-
-        __LOC__ >:: begin fun _ ->
-          "hie $x hi 你好" ==~
-            [
-              0,4, String, "hie ";
-              4,6, var, "x";
-              6,12,String, " hi 你好"
-            ]
-        end;
-        __LOC__ >:: begin fun _ ->
-          "x" ==~
-          [0,1, String, "x"]
-        end;
-
-        __LOC__ >:: begin fun _ ->
-          "" ==~
-          []
-        end;
-        __LOC__ >:: begin fun _ ->
-          "你好" ==~
-          [0,2,String, "你好"]
-        end;
-        __LOC__ >:: begin fun _ ->
-          "你好$x" ==~
-          [0,2,String, "你好";
-           2,4,var, "x";
-
-          ]
-        end
-        ;
-        __LOC__ >:: begin fun _ ->
-          "你好$this" ==~
-          [
-            0,2,String, "你好";
-            2,7,var, "this";
-          ]
-        end
-        ;
-        __LOC__ >:: begin fun _ ->
-          "你好$(this)" ==~
-          [
-            0,2,String, "你好";
-            2,9,varParen, "this"
-          ];
-
-          "你好$this)" ==~
-          [
-             0,2,String, "你好";
-             2,7,var, "this";
-             7,8,String,")"
-          ];
-          {|\xff\xff你好 $x |} ==~
-          [
-            0,11,String, {|\xff\xff你好 |};
-            11,13, var, "x";
-            13,14, String, " "
-          ];
-          {|\xff\xff你好 $x 不吃亏了buckle $y $z = $sum|}
-          ==~
-          [(0, 11, String,{|\xff\xff你好 |} );
-           (11, 13, var, "x");
-           (13, 25, String,{| 不吃亏了buckle |} );
-           (25, 27, var, "y");
-           (27, 28, String, " ");
-           (28, 30, var, "z");
-           (30, 33, String, " = ");
-           (33, 37, var, "sum");
-           ]
-        end
-        ;
-        __LOC__ >:: begin fun _ ->
-          "你好 $(this_is_a_var)  x" ==~
-          [
-            0,3,String, "你好 ";
-            3,19,varParen, "this_is_a_var";
-            19,22, String, "  x"
-          ]
-        end
-        ;
-
-        __LOC__ >:: begin fun _ ->
-        "hi\n$x\n" ==*
-        [
-          0,0,1,0,String, "hi\\n";
-          1,0,1,2,var, "x" ;
-          1,2,2,0,String,"\\n"
-        ];
-        "$x" ==*
-        [0,0,0,2,var,"x"];
-        
-
-        "\n$x\n" ==*
-        [
-          0,0,1,0,String,"\\n";
-          1,0,1,2,var,"x";
-          1,2,2,0,String,"\\n"
-        ]
-        end;
-
-        __LOC__ >:: begin fun _ -> 
-        "\n$(x_this_is_cool) " ==*
-        [
-          0,0,1,0,String, "\\n";
-          1,0,1,17,varParen, "x_this_is_cool";
-          1,17,1,18,String, " "
-        ]
-        end;
-        __LOC__ >:: begin fun _ -> 
-        " $x + $y = $sum " ==*
-        [
-          0,0,0,1,String , " ";
-          0,1,0,3,var, "x";
-          0,3,0,6,String, " + ";
-          0,6,0,8,var, "y";
-          0,8,0,11,String, " = ";
-          0,11,0,15,var, "sum";
-          0,15,0,16,String, " "
-        ]
-        end;
-        __LOC__ >:: begin fun _ -> 
-        "中文 | $a " ==*
-        [
-          0,0,0,5,String, "中文 | ";
-          0,5,0,7,var, "a";
-          0,7,0,8,String, " "
-        ]
-        end
-        ;
-        __LOC__ >:: begin fun _ ->
-          {|Hello \\$world|} ==*
-          [
-            0,0,0,8,String,"Hello \\\\";
-            0,8,0,14,var, "world"
-          ]
-        end
-        ;
-        __LOC__ >:: begin fun _ -> 
-          {|$x)|} ==*
-          [
-            0,0,0,2,var,"x";
-            0,2,0,3,String,")"
-          ]
-        end;
-    ]
diff --git a/jscomp/ounit_tests/ounit_union_find_tests.ml b/jscomp/ounit_tests/ounit_union_find_tests.ml
deleted file mode 100644
index 1c8b406..0000000
--- a/jscomp/ounit_tests/ounit_union_find_tests.ml
+++ /dev/null
@@ -1,984 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-let tinyUF = {|10
-               4 3
-               3 8
-               6 5
-               9 4
-               2 1
-               8 9
-               5 0
-               7 2
-               6 1
-               1 0
-               6 7
-             |}
-let mediumUF = {|625
-                 528 503
-                 548 523
-                 389 414
-                 446 421
-                 552 553
-                 154 155
-                 173 174
-                 373 348
-                 567 542
-                 44 43
-                 370 345
-                 546 547
-                 204 229
-                 404 429
-                 240 215
-                 364 389
-                 612 611
-                 513 512
-                 377 376
-                 468 443
-                 410 435
-                 243 218
-                 347 322
-                 580 581
-                 188 163
-                 61 36
-                 545 546
-                 93 68
-                 84 83
-                 94 69
-                 7 8
-                 619 618
-                 314 339
-                 155 156
-                 150 175
-                 605 580
-                 118 93
-                 385 360
-                 459 458
-                 167 168
-                 107 108
-                 44 69
-                 335 334
-                 251 276
-                 196 197
-                 501 502
-                 212 187
-                 251 250
-                 269 270
-                 332 331
-                 125 150
-                 391 416
-                 366 367
-                 65 40
-                 515 540
-                 248 273
-                 34 9
-                 480 479
-                 198 173
-                 463 488
-                 111 86
-                 524 499
-                 28 27
-                 323 324
-                 198 199
-                 146 147
-                 133 158
-                 416 415
-                 103 102
-                 457 482
-                 57 82
-                 88 113
-                 535 560
-                 181 180
-                 605 606
-                 481 456
-                 127 102
-                 470 445
-                 229 254
-                 169 170
-                 386 385
-                 383 384
-                 153 152
-                 541 542
-                 36 37
-                 474 473
-                 126 125
-                 534 509
-                 154 129
-                 591 592
-                 161 186
-                 209 234
-                 88 87
-                 61 60
-                 161 136
-                 472 447
-                 239 240
-                 102 101
-                 342 343
-                 566 565
-                 567 568
-                 41 42
-                 154 153
-                 471 496
-                 358 383
-                 423 448
-                 241 242
-                 292 293
-                 363 364
-                 361 362
-                 258 283
-                 75 100
-                 61 86
-                 81 106
-                 52 27
-                 230 255
-                 309 334
-                 378 379
-                 136 111
-                 439 464
-                 532 533
-                 166 191
-                 523 522
-                 210 211
-                 115 140
-                 347 346
-                 218 217
-                 561 560
-                 526 501
-                 174 149
-                 258 259
-                 77 52
-                 36 11
-                 307 306
-                 577 552
-                 62 61
-                 450 425
-                 569 570
-                 268 293
-                 79 78
-                 233 208
-                 571 570
-                 534 535
-                 527 552
-                 224 199
-                 409 408
-                 521 520
-                 621 622
-                 493 518
-                 107 106
-                 511 510
-                 298 299
-                 37 62
-                 224 249
-                 405 380
-                 236 237
-                 120 121
-                 393 418
-                 206 231
-                 287 288
-                 593 568
-                 34 59
-                 483 484
-                 226 227
-                 73 74
-                 276 277
-                 588 587
-                 288 313
-                 410 385
-                 506 505
-                 597 598
-                 337 312
-                 55 56
-                 300 325
-                 135 134
-                 4 29
-                 501 500
-                 438 437
-                 311 312
-                 598 599
-                 320 345
-                 211 236
-                 587 562
-                 74 99
-                 473 498
-                 278 279
-                 394 369
-                 123 148
-                 233 232
-                 252 277
-                 177 202
-                 160 185
-                 331 356
-                 192 191
-                 119 118
-                 576 601
-                 317 316
-                 462 487
-                 42 43
-                 336 311
-                 515 490
-                 13 14
-                 210 235
-                 473 448
-                 342 341
-                 340 315
-                 413 388
-                 514 515
-                 144 143
-                 146 145
-                 541 566
-                 128 103
-                 184 159
-                 488 489
-                 454 455
-                 82 83
-                 70 45
-                 221 222
-                 241 240
-                 412 411
-                 591 590
-                 592 593
-                 276 301
-                 452 453
-                 256 255
-                 397 372
-                 201 200
-                 232 207
-                 466 465
-                 561 586
-                 417 442
-                 409 434
-                 238 239
-                 389 390
-                 26 1
-                 510 485
-                 283 282
-                 281 306
-                 449 474
-                 324 349
-                 121 146
-                 111 112
-                 434 435
-                 507 508
-                 103 104
-                 319 294
-                 455 480
-                 558 557
-                 291 292
-                 553 578
-                 392 391
-                 552 551
-                 55 80
-                 538 539
-                 367 392
-                 340 365
-                 272 297
-                 266 265
-                 401 376
-                 279 280
-                 516 515
-                 178 177
-                 572 571
-                 154 179
-                 263 262
-                 6 31
-                 323 348
-                 481 506
-                 178 179
-                 526 527
-                 444 469
-                 273 274
-                 132 133
-                 275 300
-                 261 236
-                 344 369
-                 63 38
-                 5 30
-                 301 300
-                 86 87
-                 9 10
-                 344 319
-                 428 427
-                 400 375
-                 350 375
-                 235 236
-                 337 336
-                 616 615
-                 381 380
-                 58 59
-                 492 493
-                 555 556
-                 459 434
-                 368 369
-                 407 382
-                 166 141
-                 70 95
-                 380 355
-                 34 35
-                 49 24
-                 126 127
-                 403 378
-                 509 484
-                 613 588
-                 208 207
-                 143 168
-                 406 431
-                 263 238
-                 595 596
-                 218 193
-                 183 182
-                 195 220
-                 381 406
-                 64 65
-                 371 372
-                 531 506
-                 218 219
-                 144 145
-                 475 450
-                 547 548
-                 363 362
-                 337 362
-                 214 239
-                 110 111
-                 600 575
-                 105 106
-                 147 148
-                 599 574
-                 622 623
-                 319 320
-                 36 35
-                 258 233
-                 266 267
-                 481 480
-                 414 439
-                 169 168
-                 479 478
-                 224 223
-                 181 182
-                 351 326
-                 466 441
-                 85 60
-                 140 165
-                 91 90
-                 263 264
-                 188 187
-                 446 447
-                 607 606
-                 341 316
-                 143 142
-                 443 442
-                 354 353
-                 162 137
-                 281 256
-                 549 574
-                 407 408
-                 575 550
-                 171 170
-                 389 388
-                 390 391
-                 250 225
-                 536 537
-                 227 228
-                 84 59
-                 139 140
-                 485 484
-                 573 598
-                 356 381
-                 314 315
-                 299 324
-                 370 395
-                 166 165
-                 63 62
-                 507 506
-                 426 425
-                 479 454
-                 545 570
-                 376 375
-                 572 597
-                 606 581
-                 278 277
-                 303 302
-                 190 165
-                 230 205
-                 175 200
-                 529 528
-                 18 17
-                 458 457
-                 514 513
-                 617 616
-                 298 323
-                 162 161
-                 471 472
-                 81 56
-                 182 207
-                 539 564
-                 573 572
-                 596 621
-                 64 39
-                 571 546
-                 554 555
-                 388 363
-                 351 376
-                 304 329
-                 123 122
-                 135 160
-                 157 132
-                 599 624
-                 451 426
-                 162 187
-                 502 477
-                 508 483
-                 141 140
-                 303 328
-                 551 576
-                 471 446
-                 161 160
-                 465 490
-                 3 2
-                 138 113
-                 309 284
-                 452 451
-                 414 413
-                 540 565
-                 210 185
-                 350 325
-                 383 382
-                 2 1
-                 598 623
-                 97 72
-                 485 460
-                 315 316
-                 19 20
-                 31 32
-                 546 521
-                 320 321
-                 29 54
-                 330 331
-                 92 67
-                 480 505
-                 274 249
-                 22 47
-                 304 279
-                 493 468
-                 424 423
-                 39 40
-                 164 165
-                 269 268
-                 445 446
-                 228 203
-                 384 409
-                 390 365
-                 283 308
-                 374 399
-                 361 386
-                 94 119
-                 237 262
-                 43 68
-                 295 270
-                 400 425
-                 360 335
-                 122 121
-                 469 468
-                 189 188
-                 377 352
-                 367 342
-                 67 42
-                 616 591
-                 442 467
-                 558 533
-                 395 394
-                 3 28
-                 476 477
-                 257 258
-                 280 281
-                 517 542
-                 505 504
-                 302 301
-                 14 15
-                 523 498
-                 393 368
-                 46 71
-                 141 142
-                 477 452
-                 535 510
-                 237 238
-                 232 231
-                 5 6
-                 75 50
-                 278 253
-                 68 69
-                 584 559
-                 503 504
-                 281 282
-                 19 44
-                 411 410
-                 290 265
-                 579 554
-                 85 84
-                 65 66
-                 9 8
-                 484 459
-                 427 402
-                 195 196
-                 617 618
-                 418 443
-                 101 126
-                 268 243
-                 92 117
-                 290 315
-                 562 561
-                 255 280
-                 488 487
-                 578 603
-                 80 79
-                 57 58
-                 77 78
-                 417 418
-                 246 271
-                 95 96
-                 234 233
-                 530 555
-                 543 568
-                 396 397
-                 22 23
-                 29 28
-                 502 527
-                 12 13
-                 217 216
-                 522 547
-                 357 332
-                 543 518
-                 151 176
-                 69 70
-                 556 557
-                 247 248
-                 513 538
-                 204 205
-                 604 605
-                 528 527
-                 455 456
-                 624 623
-                 284 285
-                 27 26
-                 94 95
-                 486 511
-                 192 167
-                 372 347
-                 129 104
-                 349 374
-                 313 314
-                 354 329
-                 294 293
-                 377 378
-                 291 290
-                 433 408
-                 57 56
-                 215 190
-                 467 492
-                 383 408
-                 569 594
-                 209 208
-                 2 27
-                 466 491
-                 147 122
-                 112 113
-                 21 46
-                 284 259
-                 563 538
-                 392 417
-                 458 433
-                 464 465
-                 297 298
-                 336 361
-                 607 582
-                 553 554
-                 225 200
-                 186 211
-                 33 34
-                 237 212
-                 52 51
-                 620 595
-                 492 517
-                 585 610
-                 257 282
-                 520 545
-                 541 540
-                 269 244
-                 609 584
-                 109 84
-                 247 246
-                 562 537
-                 172 197
-                 166 167
-                 264 265
-                 129 130
-                 89 114
-                 204 179
-                 51 76
-                 415 390
-                 54 53
-                 219 244
-                 491 490
-                 494 493
-                 87 62
-                 158 183
-                 517 518
-                 358 359
-                 105 104
-                 285 260
-                 343 318
-                 348 347
-                 615 614
-                 169 144
-                 53 78
-                 494 495
-                 576 577
-                 23 24
-                 22 21
-                 41 40
-                 467 466
-                 112 87
-                 245 220
-                 442 441
-                 411 436
-                 256 257
-                 469 494
-                 441 416
-                 132 107
-                 468 467
-                 345 344
-                 608 609
-                 358 333
-                 418 419
-                 430 429
-                 130 131
-                 127 128
-                 115 90
-                 364 365
-                 296 271
-                 260 235
-                 229 228
-                 232 257
-                 189 190
-                 234 235
-                 195 170
-                 117 118
-                 487 486
-                 203 204
-                 142 117
-                 582 583
-                 561 536
-                 7 32
-                 387 388
-                 333 334
-                 420 421
-                 317 292
-                 327 352
-                 564 563
-                 39 14
-                 177 152
-                 144 119
-                 426 401
-                 248 223
-                 566 567
-                 53 28
-                 106 131
-                 473 472
-                 525 526
-                 327 302
-                 382 381
-                 222 197
-                 610 609
-                 522 521
-                 291 316
-                 339 338
-                 328 329
-                 31 56
-                 247 222
-                 185 186
-                 554 529
-                 393 392
-                 108 83
-                 514 489
-                 48 23
-                 37 12
-                 46 45
-                 25 0
-                 463 462
-                 101 76
-                 11 10
-                 548 573
-                 137 112
-                 123 124
-                 359 360
-                 489 490
-                 368 367
-                 71 96
-                 229 230
-                 496 495
-                 366 365
-                 86 85
-                 496 497
-                 482 481
-                 326 301
-                 278 303
-                 139 114
-                 71 70
-                 275 276
-                 223 198
-                 590 565
-                 496 521
-                 16 41
-                 501 476
-                 371 370
-                 511 536
-                 577 602
-                 37 38
-                 423 422
-                 71 72
-                 399 424
-                 171 146
-                 32 33
-                 157 182
-                 608 583
-                 474 499
-                 205 206
-                 539 514
-                 601 600
-                 419 420
-                 208 183
-                 537 538
-                 110 85
-                 105 130
-                 288 289
-                 455 430
-                 531 532
-                 337 338
-                 227 202
-                 120 145
-                 559 534
-                 261 262
-                 241 216
-                 379 354
-                 430 405
-                 241 266
-                 396 421
-                 317 318
-                 139 164
-                 310 285
-                 478 477
-                 532 557
-                 238 213
-                 195 194
-                 359 384
-                 243 242
-                 432 457
-                 422 447
-                 519 518
-                 271 272
-                 12 11
-                 478 453
-                 453 428
-                 614 613
-                 138 139
-                 96 97
-                 399 398
-                 55 54
-                 199 174
-                 566 591
-                 213 188
-                 488 513
-                 169 194
-                 603 602
-                 293 318
-                 432 431
-                 524 523
-                 30 31
-                 88 63
-                 172 173
-                 510 509
-                 272 273
-                 559 558
-                 494 519
-                 374 373
-                 547 572
-                 263 288
-                 17 16
-                 78 103
-                 542 543
-                 131 132
-                 519 544
-                 504 529
-                 60 59
-                 356 355
-                 341 340
-                 415 414
-                 285 286
-                 439 438
-                 588 563
-                 25 50
-                 463 438
-                 581 556
-                 244 245
-                 500 475
-                 93 92
-                 274 299
-                 351 350
-                 152 127
-                 472 497
-                 440 415
-                 214 215
-                 231 230
-                 80 81
-                 550 525
-                 511 512
-                 483 458
-                 67 68
-                 255 254
-                 589 588
-                 147 172
-                 454 453
-                 587 612
-                 343 368
-                 508 509
-                 240 265
-                 49 48
-                 184 183
-                 583 558
-                 164 189
-                 461 436
-                 109 134
-                 196 171
-                 156 181
-                 124 99
-                 531 530
-                 116 91
-                 431 430
-                 326 325
-                 44 45
-                 507 482
-                 557 582
-                 519 520
-                 167 142
-                 469 470
-                 563 562
-                 507 532
-                 94 93
-                 3 4
-                 366 391
-                 456 431
-                 524 549
-                 489 464
-                 397 398
-                 98 97
-                 377 402
-                 413 412
-                 148 149
-                 91 66
-                 308 333
-                 16 15
-                 312 287
-                 212 211
-                 486 461
-                 571 596
-                 226 251
-                 356 357
-                 145 170
-                 295 294
-                 308 309
-                 163 138
-                 364 339
-                 416 417
-                 402 401
-                 302 277
-                 349 348
-                 582 581
-                 176 175
-                 254 279
-                 589 614
-                 322 297
-                 587 586
-                 221 246
-                 526 551
-                 159 158
-                 460 461
-                 452 427
-                 329 330
-                 321 322
-                 82 107
-                 462 461
-                 495 520
-                 303 304
-                 90 65
-                 295 320
-                 160 159
-                 463 464
-                 10 35
-                 619 594
-                 403 402
-               |}
-
-
-let process_str tinyUF = 
-  match Ext_string.split tinyUF '\n' with 
-  | number :: rest ->
-    let n = int_of_string number in
-    let store = Union_find.init n in
-    List.iter (fun x ->
-        match Ext_string.quick_split_by_ws x with 
-        | [a;b] ->
-          let a,b = int_of_string a , int_of_string b in 
-          Union_find.union store a b 
-        | _ -> ()) rest;
-    Union_find.count store
-  | _ -> assert false
-;;        
-
-let process_file file = 
-  let ichan = open_in_bin file in
-  let n = int_of_string (input_line ichan) in
-  let store = Union_find.init n in
-  let edges = Int_vec_vec.make n in   
-  let rec aux i =  
-    match input_line ichan with 
-    | exception _ -> ()
-    | v ->
-      begin 
-        (* if i = 0 then 
-          print_endline "processing 100 nodes start";
-    *)
-        begin match Ext_string.quick_split_by_ws v with
-          | [a;b] ->
-            let a,b = int_of_string a , int_of_string b in
-            Int_vec_vec.push  edges (Vec_int.of_array [|a;b|]); 
-          | _ -> ()
-        end;
-        aux ((i+1) mod 10000);
-      end
-  in aux 0;
-  (* indeed, [unsafe_internal_array] is necessary for real performnace *)
-  let internal = Int_vec_vec.unsafe_internal_array edges in
-  for i = 0 to Array.length internal - 1 do
-     let i = Vec_int.unsafe_internal_array (Array.unsafe_get internal i) in 
-     Union_find.union store (Array.unsafe_get i 0) (Array.unsafe_get i 1) 
-  done;  
-              (* Union_find.union store a b *)
-  Union_find.count store 
-;;                
-let suites = 
-  __FILE__
-  >:::
-  [
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_equal (process_str tinyUF) 2
-    end;
-    __LOC__ >:: begin fun _ ->
-      OUnit.assert_equal (process_str mediumUF) 3
-    end;
-(*
-   __LOC__ >:: begin fun _ ->
-      OUnit.assert_equal (process_file "largeUF.txt") 6
-    end;
-  *)  
-
-  ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_utf8_test.ml b/jscomp/ounit_tests/ounit_utf8_test.ml
deleted file mode 100644
index 7eb0a66..0000000
--- a/jscomp/ounit_tests/ounit_utf8_test.ml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-(* https://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
-*)
-
-let ((>::),
-    (>:::)) = OUnit.((>::),(>:::))
-
-let (=~) = OUnit.assert_equal
-let suites = 
-    __FILE__
-    >:::
-    [
-        __LOC__ >:: begin fun _ -> 
-            Ext_utf8.decode_utf8_string
-            "hello 你好，中华民族 hei" =~
-            [104; 101; 108; 108; 111; 32; 20320; 22909; 65292; 20013; 21326; 27665; 26063; 32; 104; 101; 105]
-        end ;
-        __LOC__ >:: begin fun _ -> 
-            Ext_utf8.decode_utf8_string
-            "" =~ []
-        end
-    ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_util_tests.ml b/jscomp/ounit_tests/ounit_util_tests.ml
deleted file mode 100644
index 0360ffc..0000000
--- a/jscomp/ounit_tests/ounit_util_tests.ml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-
-let (=~) = 
-  OUnit.assert_equal
-  ~printer:Ext_obj.dump
-let suites = 
-  __FILE__ >:::
-  [
-    __LOC__ >:: begin fun _ -> 
-      Ext_pervasives.nat_of_string_exn "003" =~ 3;
-      (try Ext_pervasives.nat_of_string_exn "0a" |> ignore ; 2 with _ -> -1)  =~ -1;
-    end;
-    __LOC__ >:: begin fun _ -> 
-      let cursor = ref 0 in 
-      let v = Ext_pervasives.parse_nat_of_string "123a" cursor in 
-      (v, !cursor) =~ (123,3);
-      cursor := 0;
-      let v = Ext_pervasives.parse_nat_of_string "a" cursor in 
-      (v,!cursor) =~ (0,0)
-    end;
-
-    (* __LOC__ >:: begin fun _ -> 
-      for i = 0 to 0xff do 
-        let buf = Ext_buffer.create 0 in 
-        Ext_buffer.add_int_1 buf i;
-        let s = Ext_buffer.contents buf in 
-        s =~ String.make 1 (Char.chr i);
-        Ext_string.get_int_1 s 0 =~ i
-      done 
-    end; *)
-
-    (* __LOC__ >:: begin fun _ -> 
-      for i = 0x100 to 0xff_ff do 
-        let buf = Ext_buffer.create 0 in 
-        Ext_buffer.add_int_2 buf i;
-        let s = Ext_buffer.contents buf in         
-        Ext_string.get_int_2 s 0 =~ i
-      done ;
-      let buf = Ext_buffer.create 0 in 
-      Ext_buffer.add_int_3 buf 0x1_ff_ff;
-      Ext_string.get_int_3 (Ext_buffer.contents buf) 0 =~ 0x1_ff_ff
-      ;
-      let buf = Ext_buffer.create 0 in 
-      Ext_buffer.add_int_4 buf 0x1_ff_ff_ff;
-      Ext_string.get_int_4 (Ext_buffer.contents buf) 0 =~ 0x1_ff_ff_ff
-    end; *)
-    __LOC__ >:: begin fun _ -> 
-        let buf = Ext_buffer.create 0 in 
-        Ext_buffer.add_string_char buf "hello" 'v';
-        Ext_buffer.contents buf =~ "hellov";
-        Ext_buffer.length buf =~ 6
-    end;
-    __LOC__ >:: begin fun _ -> 
-        let buf = Ext_buffer.create 0 in 
-        Ext_buffer.add_char_string buf 'h' "ellov";
-        Ext_buffer.contents buf =~ "hellov";
-        Ext_buffer.length buf =~ 6
-    end;
-    __LOC__ >:: begin fun _ -> 
-        String.length 
-        (Digest.to_hex(Digest.string "")) =~ 32
-    end
-
-  ]
\ No newline at end of file
diff --git a/jscomp/ounit_tests/ounit_vec_test.ml b/jscomp/ounit_tests/ounit_vec_test.ml
deleted file mode 100644
index a834b83..0000000
--- a/jscomp/ounit_tests/ounit_vec_test.ml
+++ /dev/null
@@ -1,153 +0,0 @@
-let ((>::),
-     (>:::)) = OUnit.((>::),(>:::))
-
-(* open Ext_json *)
-
-let v = Vec_int.init 10 (fun i -> i);;
-let (=~) x y = OUnit.assert_equal ~cmp:(Vec_int.equal  (fun (x: int) y -> x=y)) x y
-let (=~~) x y 
-  = 
-  OUnit.assert_equal ~cmp:(Vec_int.equal  (fun (x: int) y -> x=y)) 
-  x (Vec_int.of_array y) 
-
-let suites = 
-  __FILE__ 
-  >:::
-  [
-    (* idea 
-      [%loc "inplace filter" ] --> __LOC__ ^ "inplace filter" 
-      or "inplace filter" [@bs.loc]
-    *)
-    "inplace_filter " ^ __LOC__ >:: begin fun _ -> 
-      v =~~ [|0; 1; 2; 3; 4; 5; 6; 7; 8; 9|];
-      
-      ignore @@ Vec_int.push v 32;
-      let capacity = Vec_int.capacity v  in 
-      v =~~ [|0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 32|];
-      Vec_int.inplace_filter (fun x -> x mod 2 = 0) v ;
-      v =~~ [|0; 2; 4; 6; 8; 32|];
-      Vec_int.inplace_filter (fun x -> x mod 3 = 0) v ;
-      v =~~ [|0;6|];
-      Vec_int.inplace_filter (fun x -> x mod 3 <> 0) v ;
-      v =~~ [||];
-      OUnit.assert_equal (Vec_int.capacity v ) capacity ;
-      Vec_int.compact v ; 
-      OUnit.assert_equal (Vec_int.capacity v ) 0 
-    end
-    ;
-    "inplace_filter_from " ^ __LOC__ >:: begin fun _ -> 
-      let v = Vec_int.of_array (Array.init 10 (fun i -> i)) in 
-      v =~~ [|0; 1; 2; 3; 4; 5; 6; 7; 8; 9|]; 
-      Vec_int.push v 96  ;      
-      Vec_int.inplace_filter_from 2 (fun x -> x mod 2 = 0) v ;
-      v =~~ [|0; 1; 2; 4; 6; 8; 96|];
-      Vec_int.inplace_filter_from 2 (fun x -> x mod 3 = 0) v ;
-      v =~~ [|0; 1; 6; 96|];
-      Vec_int.inplace_filter (fun x -> x mod 3 <> 0) v ;
-      v =~~ [|1|];      
-      Vec_int.compact v ; 
-      OUnit.assert_equal (Vec_int.capacity v ) 1
-    end
-    ;
-    "map " ^ __LOC__ >:: begin fun _ -> 
-      let v = Vec_int.of_array (Array.init 1000 (fun i -> i )) in 
-      Vec_int.map succ v =~~ (Array.init 1000 succ) ;
-      OUnit.assert_bool __LOC__ (Vec_int.exists (fun x -> x >= 999) v );
-      OUnit.assert_bool __LOC__ (not (Vec_int.exists (fun x -> x > 1000) v ));
-      OUnit.assert_equal (Vec_int.last v ) 999
-    end ;  
-    __LOC__ >:: begin fun _ -> 
-      let count = 1000 in 
-      let init_array = (Array.init count (fun i -> i)) in 
-      let u = Vec_int.of_array  init_array in 
-      let v = Vec_int.inplace_filter_with (fun x -> x mod 2 = 0) ~cb_no:(fun a b -> Set_int.add b a)Set_int.empty u  in
-      let (even,odd) = init_array |> Array.to_list |> List.partition (fun x -> x mod 2 = 0) in 
-      OUnit.assert_equal 
-      (Set_int.elements v) odd ;
-      u =~~ Array.of_list even 
-    end ;
-    "filter" ^ __LOC__ >:: begin fun _ -> 
-      let v = Vec_int.of_array [|1;2;3;4;5;6|] in 
-      v |> Vec_int.filter (fun x -> x mod 3 = 0) |> (fun x -> x =~~ [|3;6|]);
-      v =~~ [|1;2;3;4;5;6|];
-      Vec_int.pop v ; 
-      v =~~ [|1;2;3;4;5|];
-      let count = ref 0 in 
-      let len = Vec_int.length v  in 
-      while not (Vec_int.is_empty v ) do 
-        Vec_int.pop v ;
-        incr count
-      done;
-      OUnit.assert_equal len !count
-    end
-    ;
-    __LOC__ >:: begin fun _ -> 
-      let count = 100 in 
-      let v = Vec_int.of_array (Array.init count (fun i -> i)) in 
-      OUnit.assert_bool __LOC__ 
-        (try Vec_int.delete v count; false with _ -> true );
-      for i = count - 1 downto 10 do 
-        Vec_int.delete v i ;
-      done ;
-      v =~~ [|0;1;2;3;4;5;6;7;8;9|] 
-    end; 
-    "sub" ^ __LOC__ >:: begin fun _ -> 
-      let v = Vec_int.make 5 in 
-      OUnit.assert_bool __LOC__
-        (try ignore @@ Vec_int.sub v 0 2 ; false with Invalid_argument _  -> true);
-      Vec_int.push v 1;
-      OUnit.assert_bool __LOC__
-        (try ignore @@ Vec_int.sub v 0 2 ; false with Invalid_argument _  -> true);
-      Vec_int.push v 2;  
-      ( Vec_int.sub v 0 2 =~~ [|1;2|])
-    end;
-    "reserve" ^ __LOC__ >:: begin fun _ -> 
-      let v = Vec_int.empty () in 
-      Vec_int.reserve v  1000 ;
-      for i = 0 to 900 do
-        Vec_int.push v i
-      done ;
-      OUnit.assert_equal (Vec_int.length v) 901 ;
-      OUnit.assert_equal (Vec_int.capacity v) 1000
-    end ; 
-    "capacity"  ^ __LOC__ >:: begin fun _ -> 
-      let v = Vec_int.of_array [|3|] in 
-      Vec_int.reserve v 10 ;
-      v =~~ [|3 |];
-      Vec_int.push v 1 ;
-      Vec_int.push v 2 ;
-      Vec_int.push v 5;
-      v=~~ [|3;1;2;5|];
-      OUnit.assert_equal (Vec_int.capacity v  ) 10 ;
-      for i = 0 to 5 do
-        Vec_int.push v i
-      done;
-      v=~~ [|3;1;2;5;0;1;2;3;4;5|];
-      Vec_int.push v 100;
-      v=~~[|3;1;2;5;0;1;2;3;4;5;100|];
-      OUnit.assert_equal (Vec_int.capacity v ) 20
-    end
-    ;
-    __LOC__  >:: begin fun _ -> 
-      let empty = Vec_int.empty () in 
-      Vec_int.push empty 3;
-      empty =~~ [|3|];
-
-    end
-    ;
-    __LOC__ >:: begin fun _ ->
-      let lst = [1;2;3;4] in 
-      let v = Vec_int.of_list lst in 
-      OUnit.assert_equal 
-        (Vec_int.map_into_list (fun x -> x + 1) v)
-        (Ext_list.map lst (fun x -> x + 1) )  
-    end;
-    __LOC__ >:: begin fun _ ->
-      let v = Vec_int.make 4 in 
-      Vec_int.push v  1 ;
-      Vec_int.push v 2;
-      Vec_int.reverse_in_place v;
-      v =~~ [|2;1|]
-    end
-    ;
-  ]
diff --git a/jscomp/runtime/Readme.md b/jscomp/runtime/Readme.md
deleted file mode 100644
index 243d075..0000000
--- a/jscomp/runtime/Readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Runtime support 
-
-The build deps are manually maintained.
\ No newline at end of file
diff --git a/jscomp/runtime/bs_stdlib_mini.resi b/jscomp/runtime/bs_stdlib_mini.resi
deleted file mode 100644
index c7f6c29..0000000
--- a/jscomp/runtime/bs_stdlib_mini.resi
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
-   Since [others] depend on this file, its public mli files **should not
-   export types** introduced here, otherwise it would cause 
-   conflicts here.
-
-   If the type exported here is also exported in modules from others,
-   you will get a type not equivalent.
-
-
-   Types defined here but should not export:
-   - ref (make sure not exported in *.mli in others folder)
-*/
-external \"^": (string, string) => string = "#string_append"
-external \"=": ('a, 'a) => bool = "%equal"
-external \"<>": ('a, 'a) => bool = "%notequal"
-external \"==": ('a, 'a) => bool = "%eq"
-external \"!=": ('a, 'a) => bool = "%noteq"
-external \"<": ('a, 'a) => bool = "%lessthan"
-external \">": ('a, 'a) => bool = "%greaterthan"
-external \"<=": ('a, 'a) => bool = "%lessequal"
-external \">=": ('a, 'a) => bool = "%greaterequal"
-external \"+": (int, int) => int = "%addint"
-external \"-": (int, int) => int = "%subint"
-external \"~-": int => int = "%negint"
-external \"*": (int, int) => int = "%mulint"
-external \"/": (int, int) => int = "%divint"
-external lsl: (int, int) => int = "%lslint"
-external lor: (int, int) => int = "%orint"
-external land: (int, int) => int = "%andint"
-external mod: (int, int) => int = "%modint"
-external lsr: (int, int) => int = "%lsrint"
-external lxor: (int, int) => int = "%xorint"
-external asr: (int, int) => int = "%asrint"
-type ref<'a> = {mutable contents: 'a}
-external ref: 'a => ref<'a> = "%makemutable"
-
-external \"||": (bool, bool) => bool = "%sequor"
-external \"&&": (bool, bool) => bool = "%sequand"
-external not: bool => bool = "%boolnot"
-
-external raise: exn => 'a = "%raise"
-external ignore: 'a => unit = "%ignore"
-external \"|>": ('a, 'a => 'b) => 'b = "%revapply"
-external \"@@": ('a => 'b, 'a) => 'b = "%apply"
-
-@val @scope("Math") external \"**": (float, float) => float = "pow"
-external \"~-.": float => float = "%negfloat"
-external \"+.": (float, float) => float = "%addfloat"
-external \"-.": (float, float) => float = "%subfloat"
-external \"*.": (float, float) => float = "%mulfloat"
-external \"/.": (float, float) => float = "%divfloat"
-
-module Obj: {
-  type t
-  external field: (t, int) => t = "%obj_field"
-  external set_field: (t, int, t) => unit = "%obj_set_field"
-  external tag: t => int = "?obj_tag"
-  external repr: 'a => t = "%identity"
-  external obj: t => 'a = "%identity"
-  external magic: 'a => 'b = "%identity"
-  external size: t => int = "#obj_length"
-}
-
-module Pervasives: {
-  external compare: ('a, 'a) => int = "%compare"
-  external not: bool => bool = "%boolnot"
-  external min: ('a, 'a) => 'a = "%bs_min"
-  external max: ('a, 'a) => 'a = "%bs_max"
-  external \"=": ('a, 'a) => bool = "%equal"
-}
diff --git a/jscomp/runtime/caml.res b/jscomp/runtime/caml.res
deleted file mode 100644
index 15a7057..0000000
--- a/jscomp/runtime/caml.res
+++ /dev/null
@@ -1,162 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let int_compare = (x: int, y: int): int =>
-  if x < y {
-    -1
-  } else if x == y {
-    0
-  } else {
-    1
-  }
-let bool_compare = (x: bool, y: bool): int =>
-  switch (x, y) {
-  | (true, true) | (false, false) => 0
-  | (true, false) => 1
-  | (false, true) => -1
-  }
-
-let float_compare = (x: float, y: float) =>
-  if x == y {
-    0
-  } else if x < y {
-    -1
-  } else if x > y {
-    1
-  } else if x == x {
-    1
-  } else if y == y {
-    -1
-  } else {
-    0
-  }
-
-let bigint_compare = (x: bigint, y: bigint) =>
-  if x < y {
-    -1
-  } else if x == y {
-    0
-  } else {
-    1
-  }
-
-/* Lexical order */
-let string_compare = (s1: string, s2: string): int =>
-  if s1 == s2 {
-    0
-  } else if s1 < s2 {
-    -1
-  } else {
-    1
-  }
-
-type selector<'a> = ('a, 'a) => 'a
-
-/* could be replaced by [Math.min], but it seems those built-ins are slower */
-let bool_min = (x: bool, y): bool =>
-  if x {
-    y
-  } else {
-    x
-  }
-let int_min = (x: int, y: int): int =>
-  if x < y {
-    x
-  } else {
-    y
-  }
-let float_min = (x: float, y) =>
-  if x < y {
-    x
-  } else {
-    y
-  }
-let string_min = (x: string, y) =>
-  if x < y {
-    x
-  } else {
-    y
-  }
-
-let bool_max = (x: bool, y): bool =>
-  if x {
-    x
-  } else {
-    y
-  }
-let int_max = (x: int, y: int): int =>
-  if x > y {
-    x
-  } else {
-    y
-  }
-let float_max = (x: float, y) =>
-  if x > y {
-    x
-  } else {
-    y
-  }
-let string_max = (x: string, y) =>
-  if x > y {
-    x
-  } else {
-    y
-  }
-type i64 = Caml_int64_extern.t
-let i64_eq = (x: i64, y: i64) => x.lo == y.lo && x.hi == y.hi
-
-let i64_ge = ({hi, lo}: i64, {hi: other_hi, lo: other_lo}: i64): bool =>
-  if hi > other_hi {
-    true
-  } else if hi < other_hi {
-    false
-  } else {
-    lo >= other_lo
-  }
-
-let i64_neq = (x, y) => Pervasives.not(i64_eq(x, y))
-let i64_lt = (x, y) => Pervasives.not(i64_ge(x, y))
-let i64_gt = (x: i64, y: i64) =>
-  if x.hi > y.hi {
-    true
-  } else if x.hi < y.hi {
-    false
-  } else {
-    x.lo > y.lo
-  }
-
-let i64_le = (x, y) => Pervasives.not(i64_gt(x, y))
-
-let i64_min = (x, y) =>
-  if i64_lt(x, y) {
-    x
-  } else {
-    y
-  }
-let i64_max = (x, y) =>
-  if i64_gt(x, y) {
-    x
-  } else {
-    y
-  }
diff --git a/jscomp/runtime/caml.resi b/jscomp/runtime/caml.resi
deleted file mode 100644
index fe4d629..0000000
--- a/jscomp/runtime/caml.resi
+++ /dev/null
@@ -1,51 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 selector<'a> = ('a, 'a) => 'a
-
-let int_compare: (int, int) => int
-let bool_compare: (bool, bool) => int
-let float_compare: (float, float) => int
-let bigint_compare: (bigint, bigint) => int
-let string_compare: (string, string) => int
-
-let bool_min: selector<bool>
-let int_min: selector<int>
-let float_min: selector<float>
-let string_min: selector<string>
-
-let bool_max: selector<bool>
-let int_max: selector<int>
-let float_max: selector<float>
-let string_max: selector<string>
-
-let i64_eq: (Caml_int64_extern.t, Caml_int64_extern.t) => bool
-let i64_neq: (Caml_int64_extern.t, Caml_int64_extern.t) => bool
-let i64_lt: (Caml_int64_extern.t, Caml_int64_extern.t) => bool
-let i64_gt: (Caml_int64_extern.t, Caml_int64_extern.t) => bool
-let i64_le: (Caml_int64_extern.t, Caml_int64_extern.t) => bool
-let i64_ge: (Caml_int64_extern.t, Caml_int64_extern.t) => bool
-
-let i64_min: (Caml_int64_extern.t, Caml_int64_extern.t) => Caml_int64_extern.t
-let i64_max: (Caml_int64_extern.t, Caml_int64_extern.t) => Caml_int64_extern.t
diff --git a/jscomp/runtime/caml_array.res b/jscomp/runtime/caml_array.res
deleted file mode 100644
index bcd996a..0000000
--- a/jscomp/runtime/caml_array.res
+++ /dev/null
@@ -1,107 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@send external dup: (array<'a>, @as(0) _) => array<'a> = "slice"
-
-%%private(let {unsafe_get, unsafe_set} = module(Caml_array_extern))
-
-let sub = (x: array<'a>, offset: int, len: int) => {
-  let result = Caml_array_extern.new_uninitialized(len)
-  let j = {contents: 0} and i = {contents: offset}
-  while j.contents < len {
-    result->unsafe_set(j.contents, x->unsafe_get(i.contents))
-    j.contents = j.contents + 1
-    i.contents = i.contents + 1
-  }
-  result
-}
-
-let rec len = (acc, l) =>
-  switch l {
-  | list{} => acc
-  | list{x, ...xs} => len(Caml_array_extern.length(x) + acc, xs)
-  }
-
-let rec fill = (arr, i, l) =>
-  switch l {
-  | list{} => ()
-  | list{x, ...xs} =>
-    let l = Caml_array_extern.length(x)
-    let k = {contents: i}
-    let j = {contents: 0}
-    while j.contents < l {
-      arr->unsafe_set(k.contents, x->unsafe_get(j.contents))
-      k.contents = k.contents + 1
-      j.contents = j.contents + 1
-    }
-    fill(arr, k.contents, xs)
-  }
-
-let concat = (l: list<array<'a>>): array<'a> => {
-  let v = len(0, l)
-  let result = Caml_array_extern.new_uninitialized(v)
-  fill(result, 0, l)
-  result
-}
-
-let set = (xs, index, newval) =>
-  if index < 0 || index >= Caml_array_extern.length(xs) {
-    raise(Invalid_argument("index out of bounds"))
-  } else {
-    xs->unsafe_set(index, newval)
-  }
-
-let get = (xs, index) =>
-  if index < 0 || index >= Caml_array_extern.length(xs) {
-    raise(Invalid_argument("index out of bounds"))
-  } else {
-    xs->unsafe_get(index)
-  }
-
-let make = (len, init) => {
-  let b = Caml_array_extern.new_uninitialized(len)
-  for i in 0 to len - 1 {
-    b->unsafe_set(i, init)
-  }
-  b
-}
-
-let make_float = len => {
-  let b = Caml_array_extern.new_uninitialized(len)
-  for i in 0 to len - 1 {
-    b->unsafe_set(i, 0.)
-  }
-  b
-}
-
-let blit = (a1, i1, a2, i2, len) =>
-  if i2 <= i1 {
-    for j in 0 to len - 1 {
-      a2->unsafe_set(j + i2, a1->unsafe_get(j + i1))
-    }
-  } else {
-    for j in len - 1 downto 0 {
-      a2->unsafe_set(j + i2, a1->unsafe_get(j + i1))
-    }
-  }
diff --git a/jscomp/runtime/caml_array.resi b/jscomp/runtime/caml_array.resi
deleted file mode 100644
index af94891..0000000
--- a/jscomp/runtime/caml_array.resi
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let dup: array<'a> => array<'a>
-
-let sub: (array<'a>, int, int) => array<'a>
-
-let concat: list<array<'a>> => array<'a>
-
-let make: (int, 'a) => array<'a>
-
-let make_float: int => array<float>
-
-let blit: (array<'a>, int, array<'a>, int, int) => unit
-
-let get: (array<'a>, int) => 'a
-
-let set: (array<'a>, int, 'a) => unit
diff --git a/jscomp/runtime/caml_array_extern.res b/jscomp/runtime/caml_array_extern.res
deleted file mode 100644
index 84b2ac3..0000000
--- a/jscomp/runtime/caml_array_extern.res
+++ /dev/null
@@ -1,11 +0,0 @@
-@new external new_uninitialized: int => array<'a> = "Array"
-@send external append: (array<'a>, array<'a>) => array<'a> = "concat"
-external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
-external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
-external length: array<'a> => int = "%array_length"
-
-/*
-  Could be replaced by {!Caml_array.caml_make_vect}
-  Leave here temporarily since we have marked it side effect free internally
-*/
-external make: (int, 'a) => array<'a> = "?make_vect"
diff --git a/jscomp/runtime/caml_bigint.res b/jscomp/runtime/caml_bigint.res
deleted file mode 100644
index bf78dce..0000000
--- a/jscomp/runtime/caml_bigint.res
+++ /dev/null
@@ -1,37 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let div = (x: bigint, y: bigint) =>
-  if y == 0n {
-    raise(Division_by_zero)
-  } else {
-    Caml_bigint_extern.div(x, y)
-  }
-
-let mod_ = (x: bigint, y: bigint) =>
-  if y == 0n {
-    raise(Division_by_zero)
-  } else {
-    Caml_bigint_extern.rem(x, y)
-  }
diff --git a/jscomp/runtime/caml_bigint.resi b/jscomp/runtime/caml_bigint.resi
deleted file mode 100644
index 386a1ab..0000000
--- a/jscomp/runtime/caml_bigint.resi
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let div: (bigint, bigint) => bigint
-
-let mod_: (bigint, bigint) => bigint
diff --git a/jscomp/runtime/caml_bigint_extern.res b/jscomp/runtime/caml_bigint_extern.res
deleted file mode 100644
index 33f0c43..0000000
--- a/jscomp/runtime/caml_bigint_extern.res
+++ /dev/null
@@ -1,2 +0,0 @@
-external div: (bigint, bigint) => bigint = "?bigint_div"
-external rem: (bigint, bigint) => bigint = "?bigint_mod"
diff --git a/jscomp/runtime/caml_bytes.res b/jscomp/runtime/caml_bytes.res
deleted file mode 100644
index afab096..0000000
Binary files a/jscomp/runtime/caml_bytes.res and /dev/null differ
diff --git a/jscomp/runtime/caml_bytes.resi b/jscomp/runtime/caml_bytes.resi
deleted file mode 100644
index a76db5d..0000000
--- a/jscomp/runtime/caml_bytes.resi
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let create: int => bytes
-
-let get: (bytes, int) => char
-let set: (bytes, int, char) => unit
-
-let bytes_compare: (bytes, bytes) => int
-
-let bytes_greaterthan: (bytes, bytes) => bool
-
-let bytes_greaterequal: (bytes, bytes) => bool
-
-let bytes_lessthan: (bytes, bytes) => bool
-
-let bytes_lessequal: (bytes, bytes) => bool
-
-let bytes_equal: (bytes, bytes) => bool
diff --git a/jscomp/runtime/caml_exceptions.res b/jscomp/runtime/caml_exceptions.res
deleted file mode 100644
index 796e817..0000000
--- a/jscomp/runtime/caml_exceptions.res
+++ /dev/null
@@ -1,102 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-module Map = {
-  type t<'k, 'v>
-  
-  @new external make: unit => t<'k, 'v> = "Map"
-
-  @send external set: (t<'k, 'v>, 'k, 'v) => unit = "set"
-
-  @send external get: (t<'k, 'v>, 'k) => option<'v> = "get"
-}
-
-type t = {@as("RE_EXN_ID") id: string}
-
-/**
-   Could be exported for better inlining
-   It's common that we have 
-   {[ a = caml_set_oo_id([248,"string",0]) ]}
-   This can be inlined as 
-   {[ a = caml_set_oo_id([248,"string", caml_oo_last_id++]) ]}
-*/
-let idMap: Map.t<string, int> = Map.make()
-
-let create = (str: string): string => {
-  let id = switch idMap->Map.get(str) {
-    | Some(v) => {
-      let id = v + 1
-      idMap->Map.set(str, id)
-      id
-    }
-    | None => {
-      let id = 1
-      idMap->Map.set(str, id)
-      id
-    }
-  }
-
-  str ++ ("/" ++ (Obj.magic((id: int)): string))
-}
-
-/**
-   This function should never throw
-   It could be either customized exception or built in exception 
-   Note due to that in OCaml extensible variants have the same 
-   runtime representation as exception, so we can not 
-   really tell the difference. 
-
-   However, if we make a false alarm, classified extensible variant 
-   as exception, it will be OKAY for nested pattern match
-
-   {[
-     match toExn x : exn option with 
-     | Some _ 
-       -> Js.log "Could be an OCaml exception or an open variant"
-     (* If it is an Open variant, it will never pattern match, 
-        This is Okay, since exception could never have exhaustive pattern match
-
-     *)
-     | None -> Js.log "Not an OCaml exception for sure"
-   ]}
-
-   However, there is still something wrong, since if user write such code
-   {[
-     match toExn x with 
-     | Some _ -> (* assert it is indeed an exception *)
-       (* This assertion is wrong, since it could be an open variant *)
-     | None -> (* assert it is not an exception *)
-   ]}
-
-   This is not a problem in `try .. with` since the logic above is not expressible, see more design in [destruct_exn.md]
-*/
-let is_extension = (type a, e: a): bool =>
-  if Js.testAny(e) {
-    false
-  } else {
-    Js.typeof((Obj.magic(e): t).id) == "string"
-  }
-
-/** FIXME: remove the trailing `/` */
-let exn_slot_name = (x: t): string => x.id
diff --git a/jscomp/runtime/caml_exceptions.resi b/jscomp/runtime/caml_exceptions.resi
deleted file mode 100644
index da55d4d..0000000
--- a/jscomp/runtime/caml_exceptions.resi
+++ /dev/null
@@ -1,31 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = {@as("RE_EXN_ID") id: string}
-
-let create: string => string
-
-let is_extension: 'a => bool
-
-let exn_slot_name: t => string
diff --git a/jscomp/runtime/caml_external_polyfill.res b/jscomp/runtime/caml_external_polyfill.res
deleted file mode 100644
index 38382a9..0000000
--- a/jscomp/runtime/caml_external_polyfill.res
+++ /dev/null
@@ -1,51 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 global
-let getGlobalThis: (. unit) => global = %raw(` function(){
-  if (typeof globalThis !== 'undefined') return globalThis;
-	if (typeof self !== 'undefined') return self;
-	if (typeof window !== 'undefined') return window;
-	if (typeof global !== 'undefined') return global;
-	if (typeof this !== 'undefined') return this;
-	throw new Error('Unable to locate global this');
-}`)
-
-type dyn
-let resolve: (. string) => dyn = %raw(`function(s){
-  var myGlobal = getGlobalThis();
-  if (myGlobal[s] === undefined){
-    throw new Error(s + " not polyfilled by ReScript yet\n")
-  }
-  return myGlobal[s]
-}`)
-
-/* FIXME: it does not have to global states */
-type fn
-
-let register: (string, fn) => unit = %raw(` function(s,fn){
-  var myGlobal = getGlobalThis();
-  myGlobal[s] = fn 
-  return 0
-}`)
diff --git a/jscomp/runtime/caml_float.res b/jscomp/runtime/caml_float.res
deleted file mode 100644
index 95ac08b..0000000
--- a/jscomp/runtime/caml_float.res
+++ /dev/null
@@ -1,157 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/* borrowed from others/js_math.ml */
-@val external _LOG2E: float = "Math.LOG2E"
-@val external _LOG10E: float = "Math.LOG10E"
-@val external abs_float: float => float = "Math.abs"
-@val external floor: float => float = "Math.floor"
-@val @scope("Math") external exp: float => float = "exp"
-@val external log: float => float = "Math.log"
-@val @scope("Math") external sqrt: float => float = "sqrt"
-@val external pow_float: (~base: float, ~exp: float) => float = "Math.pow"
-external int_of_float: float => int = "%intoffloat"
-external float_of_int: int => float = "%floatofint"
-
-let int_float_of_bits: int => float = %raw(`function(x){
-    return new Float32Array(new Int32Array([x]).buffer)[0] 
-    }`)
-/* let int = Int32_array.make [| x |] in
-   let float32 = Float32_array.fromBuffer ( Int32_array.buffer int) in
-   Float32_array.unsafe_get float32 0 */
-
-let int_bits_of_float: float => int = %raw(`function(x){
-  return new Int32Array(new Float32Array([x]).buffer)[0] 
-}`)
-/* let float32 = Float32_array.make [|x|] in
- Int32_array.unsafe_get (Int32_array.fromBuffer (Float32_array.buffer float32)) 0 */
-
-let modf_float = (x: float): (float, float) =>
-  if Caml_float_extern.isFinite(x) {
-    let neg = 1. /. x < 0.
-    let x = abs_float(x)
-    let i = floor(x)
-    let f = x -. i
-    if neg {
-      (-.f, -.i)
-    } else {
-      (f, i)
-    }
-  } else if Caml_float_extern.isNaN(x) {
-    (Caml_float_extern._NaN, Caml_float_extern._NaN)
-  } else {
-    (1. /. x, x)
-  }
-
-let ldexp_float = (x: float, exp: int): float => {
-  let (x', exp') = (ref(x), ref(float_of_int(exp)))
-  if exp'.contents > 1023. {
-    exp'.contents = exp'.contents -. 1023.
-    x'.contents = x'.contents *. pow_float(~base=2., ~exp=1023.)
-    if exp'.contents > 1023. {
-      /* in case x is subnormal */
-      exp'.contents = exp'.contents -. 1023.
-      x'.contents = x'.contents *. pow_float(~base=2., ~exp=1023.)
-    }
-  } else if exp'.contents < -1023. {
-    exp'.contents = exp'.contents +. 1023.
-    x'.contents = x'.contents *. pow_float(~base=2., ~exp=-1023.)
-  }
-  x'.contents *. pow_float(~base=2., ~exp=exp'.contents)
-}
-
-let frexp_float = (x: float): (float, int) =>
-  if x == 0. || !Caml_float_extern.isFinite(x) {
-    (x, 0)
-  } else {
-    let neg = x < 0.
-    let x' = ref(abs_float(x))
-    let exp = ref(floor(_LOG2E *. log(x'.contents)) +. 1.)
-
-    x'.contents = x'.contents *. pow_float(~base=2., ~exp=-.exp.contents)
-    if x'.contents < 0.5 {
-      x'.contents = x'.contents *. 2.
-      exp.contents = exp.contents -. 1.
-    }
-    if neg {
-      x'.contents = -.x'.contents
-    }
-    (x'.contents, int_of_float(exp.contents))
-  }
-
-let copysign_float = (x: float, y: float): float => {
-  let x = abs_float(x)
-  let y = if y == 0. {
-    1. /. y
-  } else {
-    y
-  }
-  if y < 0. {
-    -.x
-  } else {
-    x
-  }
-}
-
-/* http://www.johndcook.com/blog/cpp_expm1/ */
-let expm1_float: float => float = x =>
-  switch x {
-  | x =>
-    let y = exp(x)
-    let z = y -. 1.
-    if abs_float(x) > 1. {
-      z
-    } else if z == 0. {
-      x
-    } else {
-      x *. z /. log(y)
-    }
-  }
-
-/*
-(* http://blog.csdn.net/liyuanbhu/article/details/8544644 *)
-let log1p_float : float -> float = function x ->
-  let y = 1. +.  x  in
-  let z =  y -. 1. in
-  if z = 0. then x else x *. log y /. z */
-
-let hypot_float = (x: float, y: float): float => {
-  let (x0, y0) = (abs_float(x), abs_float(y))
-  let a = Pervasives.max(x0, y0)
-  let b =
-    Pervasives.min(x0, y0) /. if a != 0. {
-      a
-    } else {
-      1.
-    }
-  a *. sqrt(1. +. b *. b)
-}
-
-/*
-let caml_cosh_float x = exp x +. exp (-. x) /. 2.
-let caml_sin_float x = exp x -. exp (-. x) /. 2.
-let caml_tan_float x =
-  let y = exp x in
-  let z = exp (-. x) in
-  (y +. z) /. (y -. z   ) */
diff --git a/jscomp/runtime/caml_float.resi b/jscomp/runtime/caml_float.resi
deleted file mode 100644
index 4cb4559..0000000
--- a/jscomp/runtime/caml_float.resi
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@val external floor: float => float = "Math.floor"
-external int_of_float: float => int = "%intoffloat"
-external float_of_int: int => float = "%floatofint"
-let int_float_of_bits: int => float
-let int_bits_of_float: float => int
-
-let modf_float: float => (float, float)
-
-let ldexp_float: (float, int) => float
-let frexp_float: float => (float, int)
-
-let copysign_float: (float, float) => float
-let expm1_float: float => float
-
-let hypot_float: (float, float) => float
diff --git a/jscomp/runtime/caml_float_extern.res b/jscomp/runtime/caml_float_extern.res
deleted file mode 100644
index 065c5a5..0000000
--- a/jscomp/runtime/caml_float_extern.res
+++ /dev/null
@@ -1,7 +0,0 @@
-@val external _NaN: float = "NaN"
-@val external isNaN: float => bool = "isNaN"
-@val external isFinite: float => bool = "isFinite"
-@send external toExponentialWithPrecision: (float, ~digits: int) => string = "toExponential"
-@send external toFixed: float => string = "toFixed"
-@send external toFixedWithPrecision: (float, ~digits: int) => string = "toFixed"
-@val external fromString: string => float = "Number"
diff --git a/jscomp/runtime/caml_format.ml b/jscomp/runtime/caml_format.ml
deleted file mode 100644
index 6a4a5a8..0000000
--- a/jscomp/runtime/caml_format.ml
+++ /dev/null
@@ -1,683 +0,0 @@
-
-
-(*
- * Js_of_ocaml runtime support
- * http://www.ocsigen.org/js_of_ocaml/
- * Copyright (C) 2010 Jérôme Vouillon
- * Laboratoire PPS - CNRS Université Paris Diderot
- * 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, with linking exception;
- * either version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * 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.
- *)
-
-
-
-external (.![]) : string -> int -> int = "%string_unsafe_get" 
-external (.!()) : string -> int -> char = "%string_unsafe_get" 
-
-let code_0 = "0".![0]
-let code_a = "a".![0]
-let code_A = "A".![0]
-
-module Caml_char = struct 
-  external code : char -> int = "%identity"  
-  external unsafe_chr : int -> char = "%identity"
-end  
-
-let failwith s = raise (Failure  s)
-(* let invalid_argument s= raise (Invalid_argument s ) *)
-
-let (>>>) = Caml_nativeint_extern.shift_right_logical
-
-
-
-let (+~) = Caml_nativeint_extern.add 
-let ( *~ ) = Caml_nativeint_extern.mul  
-
-let parse_digit c = 
-  match c with 
-  | '0' .. '9' 
-    -> Caml_char.code c - code_0
-  | 'A' .. 'Z'
-    -> Caml_char.code c - (code_A - 10)
-  | 'a' .. 'z'
-    -> Caml_char.code c - (code_a - 10 )
-  | _ -> -1
-
-type of_string_base =
-  | Oct
-  | Hex
-  | Dec
-  | Bin
-
-let int_of_string_base = function
-  | Oct -> 8
-  | Hex -> 16
-  | Dec -> 10
-  | Bin -> 2
-
-let parse_sign_and_base (s : string) = 
-  let sign = ref 1 in
-  let base = ref Dec in
-  let i  = ref 0 in
-  (match s.!(i.contents) with 
-   | '-' -> 
-     sign .contents<-  -1;
-     i.contents <- i.contents + 1
-   | '+' -> 
-     i.contents <- i.contents + 1
-   | _ -> ());
-  if s.!(i.contents) = '0' then 
-    (match  s.!(i.contents + 1) with 
-     |  ('x' | 'X')
-       -> base .contents<- Hex; i.contents<- i.contents + 2 
-     |  ( 'o' | 'O')
-       -> base .contents<- Oct; i .contents<- i.contents + 2
-     |  ('b' | 'B' )
-       -> base .contents<- Bin; i .contents<- i.contents + 2 
-     |  ('u' | 'U')  
-       -> i .contents<- i.contents + 2 
-     |  _ -> ()); 
-  (i.contents, sign.contents, base.contents)
-
-
-let int_of_string (s : string) : int = 
-  let i, sign, hbase = parse_sign_and_base s in
-  let base = int_of_string_base hbase in
-  let threshold = (-1 >>> 0) in 
-  let len =Caml_string_extern.length s in  
-  let c = if i < len then s.!(i) else '\000' in
-  let d = parse_digit c in
-  let () =
-    if d < 0 || d >=  base then
-      failwith "int_of_string" in
-  (* let () = [%bs.debugger]  in *)
-  let rec aux acc k = 
-    if k = len then acc 
-    else 
-      let a = s.!(k) in
-      if a  = '_' then aux acc ( k +  1) 
-      else 
-        let v = parse_digit a in  
-        if v < 0 || v >=  base then 
-          failwith "int_of_string"
-        else 
-          let acc = base *~ acc +~  v in 
-          if acc > threshold then 
-            failwith "int_of_string"
-          else aux acc  ( k +   1)
-  in 
-  let res = sign *~ aux d (i + 1) in 
-  let or_res =  res lor 0 in 
-  (if base = 10 && res <> or_res then 
-     failwith "int_of_string");
-  or_res
-
-let hex_threshold, 
-    dec_threshold, 
-    oct_threshold,
-    bin_threshold = 
-  1152921504606846975L,
-  1844674407370955161L,
-  2305843009213693951L,
-  9223372036854775807L
-
-let int64_of_string s = 
-  let i, sign, hbase = parse_sign_and_base s in
-  let base  = Caml_int64_extern.of_int (int_of_string_base hbase) in
-  let sign = Caml_int64_extern.of_int sign in
-  let threshold =
-    match hbase with
-    | Hex -> (* 2 ^ 64 - 1 / 16*)
-      hex_threshold
-    | Dec ->
-      dec_threshold
-    | Oct ->
-      oct_threshold
-    | Bin ->
-      bin_threshold
-  in 
-  let len =Caml_string_extern.length s in  
-  let c = if i < len then s.!(i) else '\000' in
-  let d = Caml_int64_extern.of_int (parse_digit c) in
-  let () =
-    if d < 0L || d >=  base then
-      failwith "int64_of_string" in
-  let (+~) = Caml_int64_extern.add  in
-  let ( *~ ) = Caml_int64_extern.mul  in
-
-  let rec aux acc k = 
-    if k = len then acc 
-    else             
-      let a = s.!(k) in
-      if a  = '_' then aux acc ( k +  1) 
-      else     
-        let v = Caml_int64_extern.of_int (parse_digit a) in  
-        if v < 0L || v >=  base || acc > threshold then 
-          failwith "int64_of_string"
-        else 
-          let acc = base *~ acc +~  v in 
-          aux acc  ( k +   1)
-  in 
-  let res = sign *~ aux d (i + 1) in 
-  let or_res = Caml_int64_extern.logor res 0L in 
-  (if base = 10L && res <> or_res then 
-     failwith "int64_of_string");
-  or_res
-
-type base = 
-  | Oct | Hex | Dec
-let int_of_base = function
-  | Oct -> 8
-  | Hex -> 16
-  | Dec -> 10
-
-type fmt = {
-  mutable justify : string; 
-  mutable signstyle : string;
-  mutable filter : string ;
-  mutable alternate : bool;
-  mutable base : base;
-  mutable signedconv : bool;
-  mutable width :int;
-  mutable uppercase : bool;
-  mutable sign : int;
-  mutable prec : int;
-  mutable conv : string
-}
-
-let lowercase (c : char) : char =
-  if (c >= 'A' && c <= 'Z')
-  || (c >= '\192' && c <= '\214')
-  || (c >= '\216' && c <= '\222')
-  then Caml_char.unsafe_chr(Caml_char.code c + 32)
-  else c
-
-let parse_format fmt = 
-  let module String = Caml_string_extern in 
-  let len =Caml_string_extern.length fmt in 
-  if len > 31 then 
-    raise  (Invalid_argument "format_int: format too long") ;
-  let rec aux (f : fmt) i : fmt = 
-    if i >= len then  f
-    else
-      let c = fmt.[i] in  
-      match c with
-      | '-' -> 
-        f.justify <- "-";
-        aux f (i + 1)
-      | '+'|' ' 
-        ->
-        f.signstyle <- Caml_string_extern.of_char c ; 
-        aux f (i + 1)
-      | '#' -> 
-        f.alternate <- true;
-        aux f (i + 1)
-      | '0' -> 
-        f.filter <- "0";
-        aux f (i + 1)
-      | '1' .. '9' 
-        -> 
-        begin 
-          f.width <- 0;
-          let j = ref i in 
-
-          while (let w = fmt.![j.contents] - code_0  in w >=0 && w <= 9  ) do 
-            f.width <- f.width * 10 + fmt.![j.contents] - code_0;
-            j.contents <- j.contents + 1
-          done;
-          aux f j.contents
-        end
-      | '.' 
-        -> 
-        f.prec <- 0;
-        let j = ref (i + 1 ) in 
-        while (let w = fmt.![j.contents] - code_0 in w >=0 && w <= 9  ) do 
-          f.prec <- f.prec * 10 + fmt.![j.contents] - code_0;
-          j.contents <- j.contents + 1;
-        done;
-        aux f j.contents 
-      | 'd' 
-      | 'i' -> 
-        f.signedconv <- true;
-        f.base <- Dec;
-        aux f (i + 1)
-      | 'u' -> 
-        f.base <- Dec;
-        aux f (i + 1)
-      | 'x' -> 
-        f.base <- Hex;
-        aux f (i + 1)
-      | 'X' -> 
-        f.base <- Hex;
-        f.uppercase <- true;
-        aux f (i + 1)
-      | 'o' -> 
-        f.base <- Oct;
-        aux f (i + 1)
-      (* | 'O' -> base .contents<- 8; uppercase .contents<- true no uppercase for oct *)
-      | 'e' | 'f' | 'g' 
-        -> 
-        f.signedconv <- true;
-        f.conv <- Caml_string_extern.of_char c ;
-        aux  f (i + 1)
-      | 'E' | 'F' | 'G' 
-        -> 
-        f.signedconv <- true;
-        f.uppercase <- true;
-        f.conv <- Caml_string_extern.of_char (lowercase c);
-        aux f (i + 1)
-      | _ -> 
-        aux f (i + 1) 
-  in 
-  aux   { justify =  "+" ;
-          signstyle =   "-";
-          filter =  " " ;
-          alternate =  false ;
-          base=  Dec ;
-          signedconv=  false ;
-          width =  0 ;
-          uppercase=   false ;
-          sign =  1 ;
-          prec =  (-1); 
-          conv =  "f"} 0 
-
-
-
-let finish_formatting (config : fmt) rawbuffer =  
-  let {
-    justify; 
-    signstyle;
-    filter ;
-    alternate;
-    base;
-    signedconv;
-    width;
-    uppercase;
-    sign;
-    prec = _ ;
-    conv = _ ; 
-  } = config in  
-  let len = ref (Caml_string_extern.length rawbuffer) in 
-  if signedconv && (sign < 0 || signstyle <> "-") then 
-    len.contents <- len.contents + 1;
-  if alternate then 
-    begin 
-      if base = Oct then
-        len.contents <- len.contents + 1
-      else
-      if base = Hex then 
-        len.contents<- len.contents + 2
-      else ()
-    end ; 
-  let buffer = ref "" in 
-  (* let (+=) buffer s = buffer .contents<- buffer.contents ^ s in 
-     FIXME: should get inlined
-  *)
-  (* let (+:) s = buffer .contents<- buffer.contents ^ s in *)
-  if justify = "+" && filter = " " then
-    for _ = len.contents to width - 1 do 
-      buffer.contents<- buffer.contents ^ filter
-    done;
-  if signedconv then 
-    if sign < 0 then 
-      buffer .contents<- buffer.contents ^ "-"
-    else if signstyle <> "-" then 
-      buffer .contents<- buffer.contents ^ signstyle
-    else ()  ;
-  if alternate && base = Oct then 
-    buffer .contents<- buffer.contents ^ "0";
-  if alternate && base == Hex then
-    buffer .contents<- buffer.contents ^ "0x";
-
-  if justify = "+" && filter = "0" then 
-    for _ = len.contents to width - 1 do 
-      buffer .contents<- buffer.contents ^ filter;
-    done;
-  begin 
-    if uppercase then 
-      buffer .contents<- buffer.contents ^ Caml_string_extern.toUpperCase rawbuffer
-    else
-      buffer .contents<- buffer.contents ^ rawbuffer
-  end;
-  if justify = "-" then 
-    for _ = len.contents to width - 1 do 
-      buffer .contents<- buffer.contents ^ " ";
-    done;
-  buffer.contents
-
-
-
-let aux f (i : int) : string = 
-  let i = 
-    if i < 0 then 
-      if f.signedconv then 
-        begin 
-          f.sign <- -1;
-          (-i)>>>0
-          (* when i is min_int, [-i] could overflow *)
-        end
-      else 
-        i >>> 0 
-    else  i  in
-  let s = ref (Caml_string_extern.of_int i ~base:(int_of_base f.base)) in 
-  if f.prec >= 0 then 
-    begin 
-      f.filter <- " ";
-      let n = f.prec -Caml_string_extern.length s.contents in 
-      if n > 0 then
-        s .contents<-  Caml_string_extern.repeat "0" n   ^ s.contents
-    end ;
-  finish_formatting f s.contents
-
-let format_int fmt i = 
-  if fmt = "%d" then Caml_nativeint_extern.to_string i 
-  else 
-    let f = parse_format fmt in 
-    aux f i 
-
-(* This can handle unsigned integer (-1L) and print it as "%Lu" which 
-   will overflow signed integer in general
-*)
-let dec_of_pos_int64 x = 
-
-
-  (if  x < 0L then
-
-     let wbase  =  10L  in
-     let  cvtbl = "0123456789" in
-     let y  = Caml_int64.discard_sign x in
-     (* 2 ^  63 + y `div_mod` 10 *)        
-
-     let quotient_l  = 922337203685477580L (* 2 ^ 63 / 10 *)
-     (* {lo =   -858993460n; hi =  214748364n} *)
-     (* TODO:  int64 constant folding so that we can do idiomatic code
-        2 ^ 63 / 10 *)in 
-     let modulus_l  =  8L  in
-     (* let c, d = Caml_int64.div_mod (Caml_int64.add y modulus_l) wbase in
-        we can not do the code above, it can overflow when y is really large           
-     *)
-     let c, d = Caml_int64.div_mod  y  wbase in
-     let e ,f = Caml_int64.div_mod (Caml_int64_extern.add modulus_l d) wbase in        
-     let quotient =
-       (Caml_int64_extern.add (Caml_int64_extern.add quotient_l c )
-          e)  in
-     Caml_int64.to_string quotient ^ 
-     (Caml_string_extern.get_string_unsafe 
-        cvtbl (Caml_int64_extern.to_int f))     
-   else
-     Caml_int64.to_string x)
-
-let oct_of_int64 x =   
-  let s = ref "" in  
-  let wbase  = 8L  in
-  let  cvtbl = "01234567" in
-  (if  x < 0L then
-     begin         
-       let y = Caml_int64.discard_sign  x in
-       (* 2 ^  63 + y `div_mod` 8 *)        
-       let quotient_l  = 1152921504606846976L 
-       (* {lo =   0n; hi =  268435456n } *) (* 2 ^ 31 / 8 *)
-       in 
-
-       (* let c, d = Caml_int64.div_mod (Caml_int64.add y modulus_l) wbase in
-          we can not do the code above, it can overflow when y is really large           
-       *)
-       let c, d = Caml_int64.div_mod  y  wbase in
-
-       let quotient =
-         ref (Caml_int64_extern.add quotient_l c )  in
-       let modulus = ref d in
-       s .contents<-
-         Caml_string_extern.get_string_unsafe 
-           cvtbl (Caml_int64_extern.to_int modulus.contents) ^ s.contents ;
-
-       while  quotient.contents <> 0L do
-         let a, b = Caml_int64.div_mod quotient.contents wbase in
-         quotient .contents<- a;
-         modulus .contents<- b;
-         s .contents<- Caml_string_extern.get_string_unsafe cvtbl (Caml_int64_extern.to_int modulus.contents) ^ s.contents ;
-       done;
-     end
-   else
-     let a, b =  Caml_int64.div_mod x wbase  in
-     let quotient = ref a  in
-     let modulus = ref b in
-     s .contents<-
-       Caml_string_extern.get_string_unsafe 
-         cvtbl (Caml_int64_extern.to_int modulus.contents) ^ s.contents ;
-
-     while  quotient.contents <> 0L do
-       let a, b = Caml_int64.div_mod (quotient.contents) wbase in
-       quotient .contents<- a;
-       modulus .contents<- b;
-       s .contents<- Caml_string_extern.get_string_unsafe cvtbl (Caml_int64_extern.to_int modulus.contents) ^ s.contents ;
-     done); s.contents   
-
-
-(* FIXME: improve codegen for such cases
-   let div_mod (x : int64) (y : int64) : int64 * int64 =  
-   let a, b = Caml_int64.(div_mod (unsafe_of_int64 x) (unsafe_of_int64 y)) in   
-   Caml_int64.unsafe_to_int64 a , Caml_int64.unsafe_to_int64 b 
-*)
-let int64_format fmt x =
-  if fmt = "%d" then Caml_int64.to_string  x
-  else
-    let f = parse_format fmt in
-    let x =
-      if f.signedconv &&  x < 0L then
-        begin
-          f.sign <- -1;
-          Caml_int64_extern.neg x
-        end
-      else x in
-    let s = 
-
-      begin match f.base with
-        | Hex ->
-          Caml_int64.to_hex x 
-        | Oct ->
-          oct_of_int64 x 
-        | Dec ->
-          dec_of_pos_int64 x
-      end in 
-    let fill_s = 
-      if f.prec >= 0 then
-        begin
-          f.filter <- " ";
-          let n = f.prec -Caml_string_extern.length s in
-          if n > 0 then
-            ("0" |. Caml_string_extern.repeat n)  ^ s else s 
-        end  else s in 
-
-    finish_formatting f fill_s
-
-let format_float fmt x = 
-  let module String = Caml_string_extern in 
-  let f = parse_format fmt in 
-  let prec = if f.prec < 0 then 6 else f.prec in 
-  let x = if x < 0. then (f.sign <- (-1); -. x) else x in 
-  let s = ref "" in 
-  if Caml_float_extern.isNaN x then 
-    begin 
-      s .contents<- "nan";
-      f.filter <- " "
-    end
-  else if not (Caml_float_extern.isFinite x) then
-    begin 
-      s .contents<- "inf";
-      f.filter <- " " 
-    end
-  else 
-    begin 
-      match f.conv with 
-      | "e"
-        -> 
-        s .contents<- Caml_float_extern.toExponentialWithPrecision x ~digits:prec;
-        (* exponent should be at least two digits
-           {[
-             (3.3).toExponential()
-               "3.3e+0"
-               3.3e+00
-           ]}
-        *)
-        let  i =Caml_string_extern.length s.contents in 
-        if s.contents.[i-3] = 'e' then
-          begin 
-            s .contents<- Caml_string_extern.slice s.contents 0 (i - 1) ^ "0" ^ Caml_string_extern.slice_rest s.contents (i - 1)
-          end
-      | "f"
-        -> 
-        (*  this will not work large numbers *)
-        (* ("%3.10f", 3e+56, "300000000000000005792779041490073052596128503513888063488.0000000000") *)
-        s .contents<- Caml_float_extern.toFixedWithPrecision x ~digits:prec 
-      | "g" -> 
-        let prec = if prec <> 0 then prec else 1 in
-        s .contents<- Caml_float_extern.toExponentialWithPrecision x ~digits:(prec - 1);
-        let j = Caml_string_extern.index_of s.contents "e" in 
-        let  exp = Caml_float.int_of_float (Caml_float_extern.fromString (Caml_string_extern.slice_rest s.contents (j + 1)))  in 
-        if exp < -4 || x >= 1e21 ||Caml_string_extern.length (Caml_float_extern.toFixed x) > prec then 
-          let i = ref (j - 1)  in
-          while s.contents.[i.contents] = '0' do 
-            i.contents <- i.contents - 1 
-          done;
-          if s.contents.[i.contents] = '.' then 
-            i.contents <- i.contents - 1 ;
-          s .contents<- Caml_string_extern.slice s.contents 0 (i.contents+1) ^ Caml_string_extern.slice_rest s.contents j ;
-          let i =Caml_string_extern.length s.contents in 
-          if s.contents.[i - 3] = 'e' then 
-            s .contents<- Caml_string_extern.slice s.contents 0 (i - 1) ^ "0" ^ Caml_string_extern.slice_rest s.contents (i - 1) 
-          else ()
-        else 
-          let p = ref prec in 
-          if exp < 0 then 
-            begin 
-              p.contents<- p.contents - (exp + 1);
-              s.contents<- Caml_float_extern.toFixedWithPrecision x ~digits:p.contents 
-            end
-          else 
-            while (s .contents<- Caml_float_extern.toFixedWithPrecision x ~digits:p.contents;Caml_string_extern.length s.contents > prec + 1) do 
-              p.contents <- p.contents - 1
-            done ;
-          if p.contents <> 0 then 
-            let k = ref (Caml_string_extern.length s.contents - 1) in 
-            while s.contents.[k.contents] = '0' do 
-              k.contents <- k.contents - 1
-            done ;
-            if s.contents.[k.contents] = '.' then 
-              k.contents <- k.contents - 1 ;
-            s .contents<- Caml_string_extern.slice s.contents 0 (k.contents + 1) 
-
-      | _ -> ()
-    end;
-  finish_formatting f s.contents
-
-
-
-
-let hexstring_of_float : float -> int -> char -> string =    
-  [%raw{|function(x,prec,style){
-  if (!isFinite(x)) {
-    if (isNaN(x)) return "nan";
-    return x > 0 ? "infinity":"-infinity";
-  }
-  var sign = (x==0 && 1/x == -Infinity)?1:(x>=0)?0:1;
-  if(sign) x = -x;
-  var exp = 0;
-  if (x == 0) { }
-  else if (x < 1) {
-    while (x < 1 && exp > -1022)  { x *= 2; exp-- }
-  } else {
-    while (x >= 2) { x /= 2; exp++ }
-  }
-  var exp_sign = exp < 0 ? '' : '+';
-  var sign_str = '';
-  if (sign) sign_str = '-'
-  else {
-    switch(style){
-    case 43 /* '+' */: sign_str = '+'; break;
-    case 32 /* ' ' */: sign_str = ' '; break;
-    default: break;
-    }
-  }
-  if (prec >= 0 && prec < 13) {
-    /* If a precision is given, and is small, round mantissa accordingly */
-      var cst = Math.pow(2,prec * 4);
-      x = Math.round(x * cst) / cst;
-  }
-  var x_str = x.toString(16);
-  if(prec >= 0){
-      var idx = x_str.indexOf('.');
-    if(idx<0) {
-      x_str += '.' +  '0'.repeat(prec);
-    }
-    else {
-      var size = idx+1+prec;
-      if(x_str.length < size)
-        x_str += '0'.repeat(size - x_str.length);
-      else
-        x_str = x_str.substr(0,size);
-    }
-  }
-  return  (sign_str + '0x' + x_str + 'p' + exp_sign + exp.toString(10));
-}|}]  
-
-
-let float_of_string : string -> exn ->  float  = 
-  [%raw{|function(s,exn){
-
-    var res = +s;
-    if ((s.length > 0) && (res === res))
-        return res;
-    s = s.replace(/_/g, "");
-    res = +s;
-    if (((s.length > 0) && (res === res)) || /^[+-]?nan$/i.test(s)) {
-        return res;
-    };
-    var m = /^ *([+-]?)0x([0-9a-f]+)\.?([0-9a-f]*)p([+-]?[0-9]+)/i.exec(s);
-    //            1        2             3           4
-    if(m){
-        var m3 = m[3].replace(/0+$/,'');
-        var mantissa = parseInt(m[1] + m[2] + m3, 16);
-        var exponent = (m[4]|0) - 4*m3.length;
-        res = mantissa * Math.pow(2, exponent);
-        return res;
-    }
-    if (/^\+?inf(inity)?$/i.test(s))
-        return Infinity;
-    if (/^-inf(inity)?$/i.test(s))
-        return -Infinity;
-    throw exn;
-}
-|}]
-
-
-
-(**
-   Pervasives.float_of_string : string -> float = "?float_of_string"
-   Semantics is slightly different from javascript :
-   console.assert(float_of_string('infinity')===Infinity)
-   console.assert(float_of_string('Infinity')===Infinity
-   parseFloat('Infinity') === Infinity
-   parseFloat('infinity') === Nan
-*)
-let float_of_string (s : string) : float  = 
-  float_of_string s (Failure "float_of_string") 
-
-
-
-
-
-
diff --git a/jscomp/runtime/caml_format.mli b/jscomp/runtime/caml_format.mli
deleted file mode 100644
index 5dbe9d9..0000000
--- a/jscomp/runtime/caml_format.mli
+++ /dev/null
@@ -1,46 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-
-
-
-
-
-
-(** *)
-
-val format_float : string -> float -> string
-
-val hexstring_of_float : float -> int -> char -> string
-
-val format_int : string -> int -> string
-
-
-
-val float_of_string : string -> float 
-val int64_format : string -> int64 -> string
-val int_of_string : string -> int
-
-val int64_of_string : string -> int64
-
diff --git a/jscomp/runtime/caml_hash.res b/jscomp/runtime/caml_hash.res
deleted file mode 100644
index 60542c5..0000000
--- a/jscomp/runtime/caml_hash.res
+++ /dev/null
@@ -1,151 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-@@bs.config({flags: ["-bs-noassertfalse"]})
-type rec cell<'a> = {
-  content: 'a,
-  mutable next: option<cell<'a>>,
-}
-and t<'a> = {
-  mutable length: int,
-  mutable first: option<cell<'a>>,
-  mutable last: option<cell<'a>>,
-}
-
-let create_queue = () => {
-  length: 0,
-  first: None,
-  last: None,
-}
-
-/* Added to tail */
-let push_back = (q: t<'a>, v: 'a) => {
-  let cell = Some({content: v, next: None})
-
-  switch q.last {
-  | None =>
-    q.length = 1
-    q.first = cell
-    q.last = cell
-  | Some(last) =>
-    q.length = q.length + 1
-    last.next = cell
-    q.last = cell
-  }
-}
-
-let is_empty_queue = q => q.length == 0
-
-/* pop from front */
-
-let unsafe_pop = (q: t<'a>) =>
-  switch q.first {
-  | None => assert(false)
-  | Some(cell) =>
-    let next = cell.next
-    if next == None {
-      q.length = 0
-      q.first = None
-      q.last = None
-    } else {
-      q.length = q.length - 1
-      q.first = next
-    }
-    cell.content
-  }
-
-let {hash_mix_int, hash_final_mix, hash_mix_string} = module(Caml_hash_primitive)
-
-let hash = (count: int, _limit, seed: int, obj: Obj.t): int => {
-  let s = ref(seed)
-  if Js.typeof(obj) == "number" {
-    let u = Caml_nativeint_extern.of_float(Obj.magic(obj))
-    s.contents = hash_mix_int(s.contents, u + u + 1)
-    hash_final_mix(s.contents)
-  } else if Js.typeof(obj) == "string" {
-    s.contents = hash_mix_string(s.contents, (Obj.magic(obj): string))
-    hash_final_mix(s.contents)
-  } else {
-    /* TODO: hash [null] [undefined] as well */
-
-    let queue = create_queue()
-    let num = ref(count)
-    let () = {
-      push_back(queue, obj)
-      num.contents = num.contents - 1
-    }
-
-    while !is_empty_queue(queue) && num.contents > 0 {
-      let obj = unsafe_pop(queue)
-      if Js.typeof(obj) == "number" {
-        let u = Caml_nativeint_extern.of_float(Obj.magic(obj))
-        s.contents = hash_mix_int(s.contents, u + u + 1)
-        num.contents = num.contents - 1
-      } else if Js.typeof(obj) == "string" {
-        s.contents = hash_mix_string(s.contents, (Obj.magic(obj): string))
-        num.contents = num.contents - 1
-      } else if Js.typeof(obj) == "boolean" {
-        ()
-      } else if Js.typeof(obj) == "undefined" {
-        ()
-      } else if Js.typeof(obj) == "symbol" {
-        ()
-      } else if Js.typeof(obj) == "function" {
-        ()
-      } else {
-        let size = Obj.size(obj)
-        if size != 0 {
-          let obj_tag = Obj.tag(obj)
-          let tag = lor(lsl(size, 10), obj_tag)
-          if obj_tag == 248 /* Obj.object_tag */ {
-            s.contents = hash_mix_int(s.contents, (Obj.obj(Obj.field(obj, 1)): int))
-          } else {
-            s.contents = hash_mix_int(s.contents, tag)
-            let block = {
-              let v = size - 1
-              if v < num.contents {
-                v
-              } else {
-                num.contents
-              }
-            }
-            for i in 0 to block {
-              push_back(queue, Obj.field(obj, i))
-            }
-          }
-        } else {
-          let size: int = %raw(`function(obj,cb){
-            var size = 0  
-            for(var k in obj){
-              cb(obj[k])
-              ++ size
-            }
-            return size
-          }`)(.obj, (. v) => push_back(queue, v))
-          s.contents = hash_mix_int(s.contents, lor(lsl(size, 10), 0)) /* tag */
-        }
-      }
-    }
-    hash_final_mix(s.contents)
-  }
-}
diff --git a/jscomp/runtime/caml_hash.resi b/jscomp/runtime/caml_hash.resi
deleted file mode 100644
index da8fd9e..0000000
--- a/jscomp/runtime/caml_hash.resi
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let hash: (int, 'a, int, Obj.t) => int
diff --git a/jscomp/runtime/caml_hash_primitive.res b/jscomp/runtime/caml_hash_primitive.res
deleted file mode 100644
index 281b623..0000000
--- a/jscomp/runtime/caml_hash_primitive.res
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright (C) 2018 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let rotl32 = (x: int, n) => lor(lsl(x, n), lsr(x, 32 - n))
-
-@send external charCodeAt: (string, int) => int = "charCodeAt"
-
-let hash_mix_int = (h, d) => {
-  let d = ref(d)
-  d.contents = d.contents * 0xcc9e2d51
-  d.contents = rotl32(d.contents, 15)
-  d.contents = d.contents * 0x1b873593
-  let h = ref(lxor(h, d.contents))
-  h.contents = rotl32(h.contents, 13)
-  h.contents + lsl(h.contents, 2) + 0xe6546b64
-}
-
-let hash_final_mix = h => {
-  let h = ref(lxor(h, lsr(h, 16)))
-  h.contents = h.contents * 0x85ebca6b
-  h.contents = lxor(h.contents, lsr(h.contents, 13))
-  h.contents = h.contents * 0xc2b2ae35
-  lxor(h.contents, lsr(h.contents, 16))
-}
-/* Caml_nativeint_extern.logand  (h.contents ^ (h.contents >>> 16)) 0x3FFFFFFFn */
-
-let hash_mix_string = (h, s) => {
-  let len = Caml_string_extern.length(s)
-  let block = len / 4 - 1
-  let hash = ref(h)
-  for i in 0 to block {
-    let j = 4 * i
-    let w = lor(
-      lor(lor(s->charCodeAt(j), lsl(s->charCodeAt(j + 1), 8)), lsl(s->charCodeAt(j + 2), 16)),
-      lsl(s->charCodeAt(j + 3), 24),
-    )
-
-    hash.contents = hash_mix_int(hash.contents, w)
-  }
-  let modulo = land(len, 0b11)
-  if modulo != 0 {
-    let w = if modulo == 3 {
-      lor(
-        lor(lsl(s->charCodeAt(len - 1), 16), lsl(s->charCodeAt(len - 2), 8)),
-        s->charCodeAt(len - 3),
-      )
-    } else if modulo == 2 {
-      lor(lsl(s->charCodeAt(len - 1), 8), s->charCodeAt(len - 2))
-    } else {
-      s->charCodeAt(len - 1)
-    }
-
-    hash.contents = hash_mix_int(hash.contents, w)
-  }
-  hash.contents = lxor(hash.contents, len)
-  hash.contents
-}
diff --git a/jscomp/runtime/caml_hash_primitive.resi b/jscomp/runtime/caml_hash_primitive.resi
deleted file mode 100644
index 7066bf4..0000000
--- a/jscomp/runtime/caml_hash_primitive.resi
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright (C) 2018 Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let hash_mix_int: (int, int) => int
-let hash_mix_string: (int, string) => int
-let hash_final_mix: int => int
diff --git a/jscomp/runtime/caml_int32.res b/jscomp/runtime/caml_int32.res
deleted file mode 100644
index bba66cf..0000000
--- a/jscomp/runtime/caml_int32.res
+++ /dev/null
@@ -1,37 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let div = (x: int, y: int) =>
-  if y == 0 {
-    raise(Division_by_zero)
-  } else {
-    Caml_nativeint_extern.div(x, y)
-  }
-
-let mod_ = (x: int, y: int) =>
-  if y == 0 {
-    raise(Division_by_zero)
-  } else {
-    Caml_nativeint_extern.rem(x, y)
-  }
diff --git a/jscomp/runtime/caml_int32.resi b/jscomp/runtime/caml_int32.resi
deleted file mode 100644
index 56ef485..0000000
--- a/jscomp/runtime/caml_int32.resi
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let div: (int, int) => int
-
-let mod_: (int, int) => int
diff --git a/jscomp/runtime/caml_int64.res b/jscomp/runtime/caml_int64.res
deleted file mode 100644
index 7958282..0000000
--- a/jscomp/runtime/caml_int64.res
+++ /dev/null
@@ -1,564 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/* This module would  only work with js backend, since it requires
-   [int] behaves as js  numbers
-*/
-
-/* TODO: see GPR#333
- the encoding of int is platform dependent */
-
-%%private(
-  let {shift_right_logical: \">>>~", add: \"+~", mul: \"*~"} = module(Caml_nativeint_extern)
-)
-
-let {i64_eq: eq, i64_ge: ge, i64_gt: gt} = module(Caml)
-
-let lognot = x => lxor(x, -1)
-
-/* [hi] is signed 
-   [lo] is unsigned
-
-   signedness does not matter when they are doing int32 bits operation   
-   however, they are different when doing comparison
-*/
-type t = Caml_int64_extern.t = {@as("0") hi: int, @as("1") lo: int}
-
-external unsafe_to_int64: t => int64 = "%identity"
-external unsafe_of_int64: int64 => t = "%identity"
-
-@inline let mk = (~lo, ~hi) => {lo: \">>>~"(lo, 0), hi}
-let min_int = mk(~lo=0, ~hi=0x80000000)
-/* The high bits are signed 0x80000000 |~ 0 */
-
-let max_int = mk(~lo=0xffff_ffff, ~hi=0x7fff_ffff)
-
-let one = mk(~lo=1, ~hi=0)
-let zero = mk(~lo=0, ~hi=0)
-let neg_one = mk(~lo=-1, ~hi=-1)
-
-let neg_signed = x => land(x, 0x8000_0000) != 0
-let non_neg_signed = x => land(x, 0x8000_0000) == 0
-let succ_aux = (~x_lo, ~x_hi) => {
-  let lo = lor(\"+~"(x_lo, 1), 0)
-  mk(
-    ~lo,
-    ~hi=lor(
-      \"+~"(
-        x_hi,
-        if lo == 0 {
-          1
-        } else {
-          0
-        },
-      ),
-      0,
-    ),
-  )
-}
-let succ = ({lo: x_lo, hi: x_hi}: t) => succ_aux(~x_lo, ~x_hi)
-
-let neg = ({lo, hi}) => {
-  let other_lo = lor(\"+~"(lognot(lo), 1), 0)
-  mk(
-    ~lo=other_lo,
-    ~hi=lor(
-      \"+~"(
-        lognot(hi),
-        if other_lo == 0 {
-          1
-        } else {
-          0
-        },
-      ),
-      0,
-    ),
-  )
-}
-
-let add_aux = ({lo: x_lo, hi: x_hi}: t, ~y_lo, ~y_hi) => {
-  let lo = lor(\"+~"(x_lo, y_lo), 0)
-  let overflow = if (
-    (neg_signed(x_lo) && (neg_signed(y_lo) || non_neg_signed(lo))) ||
-      (neg_signed(y_lo) && non_neg_signed(lo))
-  ) {
-    /* we can make it symmetric by adding (neg_signed x_lo) but it will make it 
-          verbose and slow
-          a (b+c) + b (a+c)
-          --> bc + ac + ab 
-          --> a (b+c) + bc
- */
-    1
-  } else {
-    0
-  }
-
-  mk(~lo, ~hi=lor(\"+~"(\"+~"(x_hi, y_hi), overflow), 0))
-}
-
-let add = (self: t, {lo: y_lo, hi: y_hi}: t) => add_aux(self, ~y_lo, ~y_hi)
-
-/* let not ( {lo; hi })  = mk ~lo:(lognot lo) ~hi:(lognot hi) */
-
-let equal = (x, y) => x.lo == y.lo && x.hi == y.hi
-let equal_null = (x, y) =>
-  switch Js.nullToOption(y) {
-  | None => false
-  | Some(y) => eq(x, y)
-  }
-let equal_undefined = (x, y) =>
-  switch Js.undefinedToOption(y) {
-  | None => false
-  | Some(y) => eq(x, y)
-  }
-let equal_nullable = (x, y) =>
-  switch Js.toOption(y) {
-  | None => false
-  | Some(y) => eq(x, y)
-  }
-
-/* when [lo] is unsigned integer, [lognot lo] is still an unsigned integer */
-let sub_aux = (x, ~lo, ~hi) => {
-  let y_lo = \">>>~"(\"+~"(lognot(lo), 1), 0)
-  let y_hi = lor(
-    \"+~"(
-      lognot(hi),
-      if y_lo == 0 {
-        1
-      } else {
-        0
-      },
-    ),
-    0,
-  )
-  add_aux(x, ~y_lo, ~y_hi)
-}
-
-let sub = (self, {lo, hi}) => sub_aux(self, ~lo, ~hi)
-
-let lsl_ = ({lo, hi} as x, numBits) =>
-  if numBits == 0 {
-    x
-  } else if numBits >= 32 {
-    mk(~lo=0, ~hi=lsl(lo, numBits - 32))
-  } else {
-    mk(~lo=lsl(lo, numBits), ~hi=lor(\">>>~"(lo, 32 - numBits), lsl(hi, numBits)))
-  }
-
-let lsr_ = ({lo, hi} as x, numBits) =>
-  if numBits == 0 {
-    x
-  } else {
-    let offset = numBits - 32
-    if offset == 0 {
-      mk(~lo=hi, ~hi=0)
-    } else if offset > 0 {
-      mk(~lo=\">>>~"(hi, offset), ~hi=0)
-    } else {
-      mk(~hi=\">>>~"(hi, numBits), ~lo=lor(lsl(hi, -offset), \">>>~"(lo, numBits)))
-    }
-  }
-
-let asr_ = ({lo, hi} as x, numBits) =>
-  if numBits == 0 {
-    x
-  } else if numBits < 32 {
-    mk(
-      ~hi=asr(hi, numBits),
-      ~lo=/* zero filled */
-      lor(lsl(hi, 32 - numBits), \">>>~"(lo, numBits)),
-    )
-  } else {
-    mk(
-      ~hi=if hi >= 0 {
-        0
-      } else {
-        -1
-      },
-      ~lo=asr(hi, numBits - 32),
-    )
-  }
-
-let is_zero = x =>
-  switch x {
-  | {lo: 0, hi: 0} => true
-  | _ => false
-  }
-
-let rec mul = (this, other) =>
-  switch (this, other) {
-  | ({lo: 0, hi: 0}, _)
-  | (_, {lo: 0, hi: 0}) => zero
-  | ({lo: 0, hi: -0x80000000}, {lo, _})
-  | ({lo, _}, {lo: 0, hi: -0x80000000}) =>
-    if land(lo, 0x1) == 0 {
-      zero
-    } else {
-      min_int
-    }
-  | ({lo: this_lo, hi: this_hi}, {lo: other_lo, hi: other_hi}) =>
-    if this_hi < 0 {
-      if other_hi < 0 {
-        mul(neg(this), neg(other))
-      } else {
-        neg(mul(neg(this), other))
-      }
-    } else if other_hi < 0 {
-      neg(mul(this, neg(other)))
-    } else {
-      /* TODO: when both are small, use float multiplication */
-      let a48 = \">>>~"(this_hi, 16)
-      let a32 = land(this_hi, 0xffff)
-      let a16 = \">>>~"(this_lo, 16)
-      let a00 = land(this_lo, 0xffff)
-
-      let b48 = \">>>~"(other_hi, 16)
-      let b32 = land(other_hi, 0xffff)
-      let b16 = \">>>~"(other_lo, 16)
-      let b00 = land(other_lo, 0xffff)
-
-      let c48 = ref(0)
-      let c32 = ref(0)
-      let c16 = ref(0)
-
-      let c00 = \"*~"(a00, b00)
-      c16.contents = \"+~"(\">>>~"(c00, 16), \"*~"(a16, b00))
-      c32.contents = \">>>~"(c16.contents, 16)
-      c16.contents = \"+~"(land(c16.contents, 0xffff), \"*~"(a00, b16))
-      c32.contents = \"+~"(\"+~"(c32.contents, \">>>~"(c16.contents, 16)), \"*~"(a32, b00))
-      c48.contents = \">>>~"(c32.contents, 16)
-      c32.contents = \"+~"(land(c32.contents, 0xffff), \"*~"(a16, b16))
-      c48.contents = \"+~"(c48.contents, \">>>~"(c32.contents, 16))
-      c32.contents = \"+~"(land(c32.contents, 0xffff), \"*~"(a00, b32))
-      c48.contents = \"+~"(c48.contents, \">>>~"(c32.contents, 16))
-      c32.contents = land(c32.contents, 0xffff)
-      c48.contents = land(
-        \"+~"(
-          c48.contents,
-          \"+~"(\"+~"(\"+~"(\"*~"(a48, b00), \"*~"(a32, b16)), \"*~"(a16, b32)), \"*~"(a00, b48)),
-        ),
-        0xffff,
-      )
-      mk(
-        ~lo=lor(land(c00, 0xffff), lsl(land(c16.contents, 0xffff), 16)),
-        ~hi=lor(c32.contents, lsl(c48.contents, 16)),
-      )
-    }
-  }
-
-/* Dispatched by the compiler, idea: should we do maximum sharing
- */
-let xor = ({lo: this_lo, hi: this_hi}, {lo: other_lo, hi: other_hi}) =>
-  mk(~lo=lxor(this_lo, other_lo), ~hi=lxor(this_hi, other_hi))
-
-let or_ = ({lo: this_lo, hi: this_hi}, {lo: other_lo, hi: other_hi}) =>
-  mk(~lo=lor(this_lo, other_lo), ~hi=lor(this_hi, other_hi))
-
-let and_ = ({lo: this_lo, hi: this_hi}, {lo: other_lo, hi: other_hi}) =>
-  mk(~lo=land(this_lo, other_lo), ~hi=land(this_hi, other_hi))
-
-/* TODO: if we encode lo int32 bit as unsigned then
-   this is not necessary,
-   however (x>>>0 >>>0) is not that bad
-*/
-
-let to_float = ({hi, lo}: t) =>
-  Caml_nativeint_extern.to_float(\"+~"(\"*~"(hi, %raw(`0x100000000`)), lo))
-
-/** sign: Positive  
-    -FIXME: hex notation
-*/
-let two_ptr_32_dbl = 4294967296. /* 2. ** 32 */
-let two_ptr_63_dbl = 9.22337203685477581e+18 /* 2. ** 63. */
-let neg_two_ptr_63 = -9.22337203685477581e+18 /* -. (2. ** 63.) */
-
-external mod_float: (float, float) => float = "?fmod_float"
-/* note that we make sure the const number can acutally be represented
-   {[
-     (2. ** 63. -. 1. = 2. ** 63.) ;;
-   ]}
-*/
-
-let rec of_float = (x: float): t =>
-  if Caml_float_extern.isNaN(x) || Pervasives.not(Caml_float_extern.isFinite(x)) {
-    zero
-  } else if x <= neg_two_ptr_63 {
-    min_int
-  } else if x +. 1. >= two_ptr_63_dbl {
-    max_int /* Undefined behavior */
-  } else if x < 0. {
-    neg(of_float(-.x))
-  } else {
-    mk(
-      ~lo=Caml_nativeint_extern.of_float(mod_float(x, two_ptr_32_dbl)),
-      ~hi=Caml_nativeint_extern.of_float(x /. two_ptr_32_dbl),
-    )
-  }
-
-@val @scope("Math") external log2: float = "LN2"
-@val @scope("Math") external log: float => float = "log"
-@val @scope("Math") external ceil: float => float = "ceil"
-@val @scope("Math") external floor: float => float = "floor"
-/* external maxFloat : float -> float -> float = "Math.max" [@@bs.val] */
-
-/* either top 11 bits are all 0 or all 1 
-   when it is all 1, we need exclude -2^53
-*/
-let isSafeInteger = ({hi, lo}) => {
-  let top11Bits = asr(hi, 21)
-  top11Bits == 0 || (top11Bits == -1 && Pervasives.not(lo == 0 && hi == 0xff_e0_00_00))
-}
-
-@val external string_of_float: float => string = "String"
-let rec to_string = (self: int64) => {
-  let {hi: self_hi, _} as self = unsafe_of_int64(self)
-  if isSafeInteger(self) {
-    string_of_float(to_float(self))
-  } else if self_hi < 0 {
-    if eq(self, min_int) {
-      "-9223372036854775808"
-    } else {
-      "-" ++ to_string(unsafe_to_int64(neg(self)))
-    }
-  } else {
-    /* large positive number */
-    let {lo, hi} as approx_div1 = of_float(floor(to_float(self) /. 10.))
-    let {lo: rem_lo, hi: rem_hi} =
-      /* rem should be a pretty small number */
-      self
-      ->sub_aux(~lo=lsl(lo, 3), ~hi=lor(\">>>~"(lo, 29), lsl(hi, 3)))
-      ->sub_aux(~lo=lsl(lo, 1), ~hi=lor(\">>>~"(lo, 31), lsl(hi, 1)))
-
-    if rem_lo == 0 && rem_hi == 0 {
-      to_string(unsafe_to_int64(approx_div1)) ++ "0"
-    } else if rem_hi < 0 {
-      /* let ( {lo = rem_lo}) = neg rem in */
-      let rem_lo = \">>>~"(\"+~"(lognot(rem_lo), 1), 0)->Caml_nativeint_extern.to_float
-      let delta = ceil(rem_lo /. 10.)
-      let remainder = 10. *. delta -. rem_lo
-      approx_div1
-      ->sub_aux(~lo=Caml_nativeint_extern.of_float(delta), ~hi=0)
-      ->unsafe_to_int64
-      ->to_string ++ Caml_nativeint_extern.to_string(Caml_nativeint_extern.of_float(remainder))
-    } else {
-      let rem_lo = Caml_nativeint_extern.to_float(rem_lo)
-      let delta = floor(rem_lo /. 10.)
-      let remainder = rem_lo -. 10. *. delta
-      approx_div1
-      ->add_aux(~y_lo=Caml_nativeint_extern.of_float(delta), ~y_hi=0)
-      ->unsafe_to_int64
-      ->to_string ++ Caml_nativeint_extern.to_string(Caml_nativeint_extern.of_float(remainder))
-    }
-  }
-}
-
-@inline
-let float_max = (a: float, b) =>
-  if a > b {
-    a
-  } else {
-    b
-  }
-let rec div = (self, other) =>
-  switch (self, other) {
-  | (_, {lo: 0, hi: 0}) => raise(Division_by_zero)
-  | ({lo: 0, hi: 0}, _) => zero
-  | ({lo: 0, hi: -0x8000_0000}, _) =>
-    if eq(other, one) || eq(other, neg_one) {
-      self
-    } else if eq(other, min_int) {
-      one
-    } else {
-      let {hi: other_hi, _} = other
-      /* now |other| >= 2, so |this/other| < |MIN_VALUE| */
-      let half_this = asr_(self, 1)
-      let approx = lsl_(div(half_this, other), 1)
-      switch approx {
-      | {lo: 0, hi: 0} =>
-        if other_hi < 0 {
-          one
-        } else {
-          neg(one)
-        }
-      | _ =>
-        let rem = sub(self, mul(other, approx))
-        add(approx, div(rem, other))
-      }
-    }
-  | (_, {lo: 0, hi: -0x8000_0000}) => zero
-  | ({lo: _, hi: self_hi}, {lo: _, hi: other_hi}) =>
-    if self_hi < 0 {
-      if other_hi < 0 {
-        div(neg(self), neg(other))
-      } else {
-        neg(div(neg(self), other))
-      }
-    } else if other_hi < 0 {
-      neg(div(self, neg(other)))
-    } else {
-      let res = ref(zero)
-      let rem = ref(self)
-      /* assert false */
-      while ge(rem.contents, other) {
-        let approx = ref(float_max(1., Caml_float.floor(to_float(rem.contents) /. to_float(other))))
-        let log2 = ceil(log(approx.contents) /. log2)
-        let delta = if log2 <= 48. {
-          1.
-        } else {
-          2. ** (log2 -. 48.)
-        }
-        let approxRes = ref(of_float(approx.contents))
-        let approxRem = ref(mul(approxRes.contents, other))
-        while (
-          switch approxRem.contents {
-          | {hi, _} => hi
-          } < 0 || gt(approxRem.contents, rem.contents)
-        ) {
-          approx.contents = approx.contents -. delta
-          approxRes.contents = of_float(approx.contents)
-          approxRem.contents = mul(approxRes.contents, other)
-        }
-        if is_zero(approxRes.contents) {
-          approxRes.contents = one
-        }
-        res.contents = add(res.contents, approxRes.contents)
-        rem.contents = sub(rem.contents, approxRem.contents)
-      }
-      res.contents
-    }
-  }
-
-let mod_ = (self, other) => sub(self, mul(div(self, other), other))
-
-let div_mod = (self: int64, other: int64): (int64, int64) => {
-  let quotient = div(unsafe_of_int64(self), unsafe_of_int64(other))
-  (
-    unsafe_to_int64(quotient),
-    unsafe_to_int64(sub(unsafe_of_int64(self), mul(quotient, unsafe_of_int64(other)))),
-  )
-}
-
-/** Note this function is unasfe here, but when combined it is actually safe
-    In theory, we need do an uint_compare for [lo] components
-    The thing is [uint_compare] and [int_compare] are specialised 
-    to the same code when translted into js
-*/
-@inline
-let int_compare = (x: int, y) =>
-  if x < y {
-    -1
-  } else if x == y {
-    0
-  } else {
-    1
-  }
-
-let compare = (self, other) => {
-  let v = int_compare(self.hi, other.hi)
-  if v == 0 {
-    int_compare(self.lo, other.lo)
-  } else {
-    v
-  }
-}
-
-let of_int32 = (lo: int) =>
-  mk(
-    ~lo,
-    ~hi=if lo < 0 {
-      -1
-    } else {
-      0
-    },
-  )
-
-let to_int32 = x => lor(x.lo, 0) /* signed integer */
-
-/* width does matter, will it be relevant to endian order? */
-
-let to_hex = (x: int64) => {
-  let {hi: x_hi, lo: x_lo} = unsafe_of_int64(x)
-  let aux = (v): string =>
-    Caml_string_extern.of_int(Caml_nativeint_extern.shift_right_logical(v, 0), ~base=16)
-
-  switch (x_hi, x_lo) {
-  | (0, 0) => "0"
-  | (_, 0) => aux(x_hi) ++ "00000000"
-  | (0, _) => aux(x_lo)
-  | (_, _) =>
-    let lo = aux(x_lo)
-    let pad = 8 - Caml_string_extern.length(lo)
-    if pad <= 0 {
-      aux(x_hi) ++ lo
-    } else {
-      aux(x_hi) ++ (Caml_string_extern.repeat("0", pad) ++ lo)
-    }
-  }
-}
-
-let discard_sign = (x: int64): int64 => {
-  let v = unsafe_of_int64(x)
-  unsafe_to_int64(
-    switch v {
-    | v => {...v, hi: land(0x7fff_ffff, v.hi)}
-    },
-  )
-}
-
-/* >>> 0 does not change its bit representation
-      it simply makes sure it is an unsigned integer
-      -1 >>> 0 -> 4294967295
-      Which is still (-1) if you interpret it as a signed integer
-      When we do the call (new Int32Array(x[1], x[0]), it will
-      convert x[0] from an unsigned integer to signed integer
-   {[
-     new Int32Array([-1 >>> 0])
-       Int32Array(1)[-1]
-   ]}
-*/
-
-let float_of_bits = (x: t): float =>
-  (
-    %raw(`function(lo,hi){ return (new Float64Array(new Int32Array([lo,hi]).buffer))[0]}`): (
-      _,
-      _,
-    ) => _
-  )(x.lo, x.hi)
-
-/* let to_int32 (x : nativeint) = x |> Caml_nativeint_extern.to_int32
-   in
-   (*TODO:
-   This should get inlined, we should apply a simple inliner in the js layer,
-   the thing is its lambda representation is complex but after js layer,
-   it's qutie simple
- *)
-   let int32 = Int32_array.make  [| to_int32 x.lo; to_int32 x.hi |] in
-   Float64_array.unsafe_get (Float64_array.fromBuffer (Int32_array.buffer int32)) 0 */
-
-let bits_of_float: float => t = x => {
-  let (lo, hi) = (%raw(`function(x){return new Int32Array(new Float64Array([x]).buffer)}`): _ => _)(
-    x,
-  )
-  mk(~lo, ~hi)
-}
diff --git a/jscomp/runtime/caml_int64.resi b/jscomp/runtime/caml_int64.resi
deleted file mode 100644
index 63f054a..0000000
--- a/jscomp/runtime/caml_int64.resi
+++ /dev/null
@@ -1,73 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t
-let mk: (~lo: int, ~hi: int) => t
-let succ: t => t
-let min_int: t
-let max_int: t
-let one: t
-let zero: t
-let neg_one: t
-/* val not : t -> t */
-let of_int32: int => t
-let to_int32: t => int
-
-let add: (t, t) => t
-let neg: t => t
-let sub: (t, t) => t
-let lsl_: (t, int) => t
-let lsr_: (t, int) => t
-let asr_: (t, int) => t
-let is_zero: t => bool
-let mul: (t, t) => t
-let xor: (t, t) => t
-let or_: (t, t) => t
-let and_: (t, t) => t
-
-let equal: (t, t) => bool
-let equal_null: (t, Js.null<t>) => bool
-let equal_undefined: (t, Js.undefined<t>) => bool
-let equal_nullable: (t, Js.nullable<t>) => bool
-
-let to_float: t => float
-let of_float: float => t
-let div: (t, t) => t
-let mod_: (t, t) => t
-
-let compare: (t, t) => int
-
-let float_of_bits: t => float
-
-/** [bits_of_float fl] it is undefined behaivor when [f] is NaN*/
-let bits_of_float: float => t
-
-/* val get64 : string -> int -> t */
-
-external unsafe_to_int64: t => int64 = "%identity"
-external unsafe_of_int64: int64 => t = "%identity"
-let div_mod: (int64, int64) => (int64, int64)
-let to_hex: int64 => string
-let discard_sign: int64 => int64
-let to_string: int64 => string
diff --git a/jscomp/runtime/caml_int64_extern.res b/jscomp/runtime/caml_int64_extern.res
deleted file mode 100644
index 0dbe54e..0000000
--- a/jscomp/runtime/caml_int64_extern.res
+++ /dev/null
@@ -1,10 +0,0 @@
-external of_int: int => int64 = "%int64_of_int"
-external add: (int64, int64) => int64 = "%int64_add"
-external sub: (int64, int64) => int64 = "%int64_sub"
-external mul: (int64, int64) => int64 = "%int64_mul"
-external div: (int64, int64) => int64 = "%int64_div"
-external logor: (int64, int64) => int64 = "%int64_or"
-external neg: int64 => int64 = "%int64_neg"
-external to_int: int64 => int = "%int64_to_int"
-
-type t = {@as("0") hi: int, @as("1") lo: int}
diff --git a/jscomp/runtime/caml_js_exceptions.res b/jscomp/runtime/caml_js_exceptions.res
deleted file mode 100644
index ddf35cc..0000000
--- a/jscomp/runtime/caml_js_exceptions.res
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (C) 2015- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-exception Error = JsError
-
-/**   
-   This function has to be in this module Since 
-   [Error] is defined here 
-*/
-let internalToOCamlException = (e: unknown) =>
-  if Caml_exceptions.is_extension(e) {
-    (Obj.magic(e): exn)
-  } else {
-    JsError(e)
-  }
-
-let as_js_exn = exn =>
-  switch exn {
-  | Error(t) => Some(t)
-  | _ => None
-  }
diff --git a/jscomp/runtime/caml_lexer.res b/jscomp/runtime/caml_lexer.res
deleted file mode 100644
index 69f228b..0000000
--- a/jscomp/runtime/caml_lexer.res
+++ /dev/null
@@ -1,335 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 lex_tables
-type lexbuf
-
-/* caml_lex_array("abcd") */
-/* [25185, 25699] */
-/* @param s */
-/* @returns {any[]} */
-
-%%raw(` 
-
-/***********************************************************************/
-/*                                                                     */
-/*                           Objective Caml                            */
-/*                                                                     */
-/*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         */
-/*                                                                     */
-/*  Copyright 1996 Institut National de Recherche en Informatique et   */
-/*  en Automatique.  All rights reserved.  This file is distributed    */
-/*  under the terms of the GNU Library General Public License, with    */
-/*  the special exception on linking described in file ../LICENSE.     */
-/*                                                                     */
-/***********************************************************************/
-
-/* $Id: lexing.c 6045 2004-01-01 16:42:43Z doligez $ */
-
-/* The table-driven automaton for lexers generated by camllex. */
-
-function caml_lex_array(s) {
-    var l = s.length / 2;
-    var a = new Array(l);
-    // when s.charCodeAt(2 * i + 1 ) > 128 (0x80)
-    // a[i] < 0  
-    // for(var i = 0 ; i <= 0xffff; ++i) { if (i << 16 >> 16 !==i){console.log(i<<16>>16, 'vs',i)}}
-    // 
-    for (var i = 0; i < l; i++)
-        a[i] = (s.charCodeAt(2 * i) | (s.charCodeAt(2 * i + 1) << 8)) << 16 >> 16;
-    return a;
-}
-`)
-
-/*
- * external c_engine  : lex_tables -> int -> lexbuf -> int
- * lexing.ml
- * type lex_tables = {
- *   lex_base : string;
- *   lex_backtrk : string;
- *   lex_default : string;
- *   lex_trans : string;
- *   lex_check : string;
- *   lex_base_code : string;
- *   lex_backtrk_code : string;
- *   lex_default_code : string;
- *   lex_trans_code : string;
- *   lex_check_code : string;
- *   lex_code : string;
- * }
- *
- * type lexbuf = {
- *   refill_buff : lexbuf -> unit ;
- *   mutable lex_buffer : bytes;
- *   mutable lex_buffer_len : int;
- *   mutable lex_abs_pos : int;
- *   mutable lex_start_pos : int;
- *   mutable lex_curr_pos : int;
- *   mutable lex_last_pos : int;
- *   mutable lex_last_action : int;
- *   mutable lex_eof_reached : bool;
- *   mutable lex_mem : int array;
- *   mutable lex_start_p : position;
- *   mutable lex_curr_p;
- * }
- * @param tbl
- * @param start_state
- * @param lexbuf
- * @returns {any}
- */
-
-let caml_lex_engine_aux: (
-  lex_tables,
-  int,
-  lexbuf,
-  exn,
-) => int = %raw(`function (tbl, start_state, lexbuf, exn){
-
-    if (!Array.isArray(tbl.lex_default)) {
-        tbl.lex_base = caml_lex_array(tbl.lex_base);
-        tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
-        tbl.lex_check = caml_lex_array(tbl.lex_check);
-        tbl.lex_trans = caml_lex_array(tbl.lex_trans);
-        tbl.lex_default = caml_lex_array(tbl.lex_default);  
-    }
-    var c;
-    var state = start_state;
-    //var buffer = bytes_of_string(lexbuf.lex_buffer);
-    var buffer = lexbuf.lex_buffer;
-    if (state >= 0) {
-        /* First entry */
-        lexbuf.lex_last_pos = lexbuf.lex_start_pos = lexbuf.lex_curr_pos;
-        lexbuf.lex_last_action = -1;
-    }
-    else {
-        /* Reentry after refill */
-        state = -state - 1;
-    }
-    for (;;) {
-        /* Lookup base address or action number for current state */
-        var base = tbl.lex_base[state];
-        if (base < 0)
-            return -base - 1;
-        /* See if it's a backtrack point */
-        var backtrk = tbl.lex_backtrk[state];
-        if (backtrk >= 0) {
-            lexbuf.lex_last_pos = lexbuf.lex_curr_pos;
-            lexbuf.lex_last_action = backtrk;
-        }
-        /* See if we need a refill */
-        if (lexbuf.lex_curr_pos >= lexbuf.lex_buffer_len) {
-            if (lexbuf.lex_eof_reached === 0)
-                return -state - 1;
-            else
-                c = 256;
-        }
-        else {
-            /* Read next input char */
-            c = buffer[lexbuf.lex_curr_pos];
-            lexbuf.lex_curr_pos++;
-        }
-        /* Determine next state */
-        if (tbl.lex_check[base + c] === state) {
-            state = tbl.lex_trans[base + c];
-        }
-        else {
-            state = tbl.lex_default[state];
-        }
-        /* If no transition on this char, return to last backtrack point */
-        if (state < 0) {
-            lexbuf.lex_curr_pos = lexbuf.lex_last_pos;
-            if (lexbuf.lex_last_action == -1)
-                throw exn
-            else
-                return lexbuf.lex_last_action;
-        }
-        else {
-            /* Erase the EOF condition only if the EOF pseudo-character was
-             consumed by the automaton (i.e. there was no backtrack above)
-             */
-            if (c == 256)
-                lexbuf.lex_eof_reached = 0;
-        }
-    }
-}    
-`)
-
-let empty_token_lit = "lexing: empty token"
-
-let lex_engine: (lex_tables, int, lexbuf) => int = (tbls, i, buf) =>
-  caml_lex_engine_aux(tbls, i, buf, Failure(empty_token_lit))
-
-%%raw(`
-
-
-/***********************************************/
-/* New lexer engine, with memory of positions  */
-/***********************************************/
-
-/**
- * s -> Lexing.lex_tables.lex_code
- * mem -> Lexing.lexbuf.lex_mem (* int array *)
- */          
-          
-function caml_lex_run_mem(s, i, mem, curr_pos) {
-    for (;;) {
-        var dst = s.charCodeAt(i);
-        i++;
-        if (dst == 0xff)
-            return;
-        var src = s.charCodeAt(i);
-        i++;
-        if (src == 0xff)
-            mem[dst] = curr_pos;
-        else
-            mem[dst] = mem[src];
-    }
-}
-
-
-/**
- * s -> Lexing.lex_tables.lex_code
- * mem -> Lexing.lexbuf.lex_mem (* int array *)
- */
-  
-function caml_lex_run_tag(s, i, mem) {
-    for (;;) {
-        var dst = s.charCodeAt(i);
-        i++;
-        if (dst == 0xff)
-            return;
-        var src = s.charCodeAt(i);
-        i++;
-        if (src == 0xff)
-            mem[dst] = -1;
-        else
-            mem[dst] = mem[src];
-    }
-}
-`)
-
-/*
- * external c_new_engine : lex_tables -> int -> lexbuf -> int = "?new_lex_engine"
- * @param tbl
- * @param start_state
- * @param lexbuf
- * @returns {any}
- */
-
-let caml_new_lex_engine_aux: (
-  lex_tables,
-  int,
-  lexbuf,
-  exn,
-) => int = %raw(`function (tbl, start_state, lexbuf, exn) {
-
-    if (!Array.isArray(tbl.lex_default)) {
-        tbl.lex_base = caml_lex_array(tbl.lex_base);
-        tbl.lex_backtrk = caml_lex_array(tbl.lex_backtrk);
-        tbl.lex_check = caml_lex_array(tbl.lex_check);
-        tbl.lex_trans = caml_lex_array(tbl.lex_trans);
-        tbl.lex_default = caml_lex_array(tbl.lex_default);
-    }
-    if(!Array.isArray(tbl.lex_default_code)){    
-        tbl.lex_base_code = caml_lex_array(tbl.lex_base_code);
-        tbl.lex_backtrk_code = caml_lex_array(tbl.lex_backtrk_code);
-        tbl.lex_check_code = caml_lex_array(tbl.lex_check_code);
-        tbl.lex_trans_code = caml_lex_array(tbl.lex_trans_code);
-        tbl.lex_default_code = caml_lex_array(tbl.lex_default_code);
-    }
-    var c, state = start_state;
-    //var buffer = caml_bytes_of_string(lexbuf.lex_buffer);
-    var buffer = lexbuf.lex_buffer;
-    if (state >= 0) {
-        /* First entry */
-        lexbuf.lex_last_pos = lexbuf.lex_start_pos = lexbuf.lex_curr_pos;
-        lexbuf.lex_last_action = -1;
-    }
-    else {
-        /* Reentry after refill */
-        state = -state - 1;
-    }
-    for (;;) {
-        /* Lookup base address or action number for current state */
-        var base = tbl.lex_base[state];
-        if (base < 0) {
-            var pc_off = tbl.lex_base_code[state];
-            caml_lex_run_tag(tbl.lex_code, pc_off, lexbuf.lex_mem);
-            return -base - 1;
-        }
-        /* See if it's a backtrack point */
-        var backtrk = tbl.lex_backtrk[state];
-        if (backtrk >= 0) {
-            var pc_off = tbl.lex_backtrk_code[state];
-            caml_lex_run_tag(tbl.lex_code, pc_off, lexbuf.lex_mem);
-            lexbuf.lex_last_pos = lexbuf.lex_curr_pos;
-            lexbuf.lex_last_action = backtrk;
-        }
-        /* See if we need a refill */
-        if (lexbuf.lex_curr_pos >= lexbuf.lex_buffer_len) {
-            if (lexbuf.lex_eof_reached == 0)
-                return -state - 1;
-            else
-                c = 256;
-        }
-        else {
-            /* Read next input char */
-            c = buffer[lexbuf.lex_curr_pos];
-            lexbuf.lex_curr_pos++;
-        }
-        /* Determine next state */
-        var pstate = state;
-        if (tbl.lex_check[base + c] == state)
-            state = tbl.lex_trans[base + c];
-        else
-            state = tbl.lex_default[state];
-        /* If no transition on this char, return to last backtrack point */
-        if (state < 0) {
-            lexbuf.lex_curr_pos = lexbuf.lex_last_pos;
-            if (lexbuf.lex_last_action == -1)
-                throw exn;
-            else
-                return lexbuf.lex_last_action;
-        }
-        else {
-            /* If some transition, get and perform memory moves */
-            var base_code = tbl.lex_base_code[pstate], pc_off;
-            if (tbl.lex_check_code[base_code + c] == pstate)
-                pc_off = tbl.lex_trans_code[base_code + c];
-            else
-                pc_off = tbl.lex_default_code[pstate];
-            if (pc_off > 0)
-                caml_lex_run_mem(tbl.lex_code, pc_off, lexbuf.lex_mem, lexbuf.lex_curr_pos);
-            /* Erase the EOF condition only if the EOF pseudo-character was
-             consumed by the automaton (i.e. there was no backtrack above)
-             */
-            if (c == 256)
-                lexbuf.lex_eof_reached = 0;
-        }
-    }
-    }
-`)
-
-let new_lex_engine: (lex_tables, int, lexbuf) => int = (tbl, i, buf) =>
-  caml_new_lex_engine_aux(tbl, i, buf, Failure(empty_token_lit))
diff --git a/jscomp/runtime/caml_lexer.resi b/jscomp/runtime/caml_lexer.resi
deleted file mode 100644
index cd01e89..0000000
--- a/jscomp/runtime/caml_lexer.resi
+++ /dev/null
@@ -1,31 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/* the same as Lexing */
-type lex_tables
-type lexbuf
-
-let lex_engine: (lex_tables, int, lexbuf) => int
-
-let new_lex_engine: (lex_tables, int, lexbuf) => int
diff --git a/jscomp/runtime/caml_md5.res b/jscomp/runtime/caml_md5.res
deleted file mode 100644
index b6b22d6..0000000
--- a/jscomp/runtime/caml_md5.res
+++ /dev/null
@@ -1,201 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let lognot = n => lxor(n, -1l)
-let cmn = (q, a, b, x, s, t) => {
-  let a = a + q + x + t
-  lor(lsl(a, s), lsr(a, 32 - s)) + b
-}
-
-let f = (a, b, c, d, x, s, t) => cmn(lor(land(b, c), land(lognot(b), d)), a, b, x, s, t)
-
-let g = (a, b, c, d, x, s, t) => cmn(lor(land(b, d), land(c, lognot(d))), a, b, x, s, t)
-
-let h = (a, b, c, d, x, s, t) => cmn(lxor(lxor(b, c), d), a, b, x, s, t)
-
-let i = (a, b, c, d, x, s, t) => cmn(lxor(c, lor(b, lognot(d))), a, b, x, s, t)
-
-let {unsafe_get, unsafe_set} = module(Caml_array_extern)
-
-let cycle = (x: array<int>, k: array<int>) => {
-  let a = ref(x->unsafe_get(0))
-  let b = ref(x->unsafe_get(1))
-  let c = ref(x->unsafe_get(2))
-  let d = ref(x->unsafe_get(3))
-
-  a.contents = f(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(0), 7, 0xd76aa478l)
-  d.contents = f(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(1), 12, 0xe8c7b756l)
-  c.contents = f(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(2), 17, 0x242070dbl)
-  b.contents = f(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(3), 22, 0xc1bdceeel)
-
-  a.contents = f(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(4), 7, 0xf57c0fafl)
-  d.contents = f(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(5), 12, 0x4787c62al)
-  c.contents = f(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(6), 17, 0xa8304613l)
-  b.contents = f(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(7), 22, 0xfd469501l)
-
-  a.contents = f(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(8), 7, 0x698098d8l)
-  d.contents = f(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(9), 12, 0x8b44f7afl)
-  c.contents = f(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(10), 17, 0xffff5bb1l)
-  b.contents = f(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(11), 22, 0x895cd7bel)
-  a.contents = f(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(12), 7, 0x6b901122l)
-  d.contents = f(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(13), 12, 0xfd987193l)
-  c.contents = f(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(14), 17, 0xa679438el)
-  b.contents = f(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(15), 22, 0x49b40821l)
-
-  a.contents = g(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(1), 5, 0xf61e2562l)
-  d.contents = g(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(6), 9, 0xc040b340l)
-  c.contents = g(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(11), 14, 0x265e5a51l)
-  b.contents = g(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(0), 20, 0xe9b6c7aal)
-  a.contents = g(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(5), 5, 0xd62f105dl)
-  d.contents = g(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(10), 9, 0x2441453l)
-  c.contents = g(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(15), 14, 0xd8a1e681l)
-  b.contents = g(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(4), 20, 0xe7d3fbc8l)
-  a.contents = g(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(9), 5, 0x21e1cde6l)
-  d.contents = g(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(14), 9, 0xc33707d6l)
-  c.contents = g(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(3), 14, 0xf4d50d87l)
-  b.contents = g(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(8), 20, 0x455a14edl)
-  a.contents = g(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(13), 5, 0xa9e3e905l)
-  d.contents = g(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(2), 9, 0xfcefa3f8l)
-  c.contents = g(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(7), 14, 0x676f02d9l)
-  b.contents = g(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(12), 20, 0x8d2a4c8al)
-
-  a.contents = h(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(5), 4, 0xfffa3942l)
-  d.contents = h(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(8), 11, 0x8771f681l)
-  c.contents = h(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(11), 16, 0x6d9d6122l)
-  b.contents = h(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(14), 23, 0xfde5380cl)
-  a.contents = h(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(1), 4, 0xa4beea44l)
-  d.contents = h(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(4), 11, 0x4bdecfa9l)
-  c.contents = h(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(7), 16, 0xf6bb4b60l)
-  b.contents = h(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(10), 23, 0xbebfbc70l)
-  a.contents = h(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(13), 4, 0x289b7ec6l)
-  d.contents = h(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(0), 11, 0xeaa127fal)
-  c.contents = h(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(3), 16, 0xd4ef3085l)
-  b.contents = h(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(6), 23, 0x4881d05l)
-  a.contents = h(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(9), 4, 0xd9d4d039l)
-  d.contents = h(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(12), 11, 0xe6db99e5l)
-  c.contents = h(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(15), 16, 0x1fa27cf8l)
-  b.contents = h(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(2), 23, 0xc4ac5665l)
-
-  a.contents = i(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(0), 6, 0xf4292244l)
-  d.contents = i(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(7), 10, 0x432aff97l)
-  c.contents = i(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(14), 15, 0xab9423a7l)
-  b.contents = i(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(5), 21, 0xfc93a039l)
-  a.contents = i(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(12), 6, 0x655b59c3l)
-  d.contents = i(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(3), 10, 0x8f0ccc92l)
-  c.contents = i(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(10), 15, 0xffeff47dl)
-  b.contents = i(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(1), 21, 0x85845dd1l)
-  a.contents = i(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(8), 6, 0x6fa87e4fl)
-  d.contents = i(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(15), 10, 0xfe2ce6e0l)
-  c.contents = i(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(6), 15, 0xa3014314l)
-  b.contents = i(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(13), 21, 0x4e0811a1l)
-  a.contents = i(a.contents, b.contents, c.contents, d.contents, k->unsafe_get(4), 6, 0xf7537e82l)
-  d.contents = i(d.contents, a.contents, b.contents, c.contents, k->unsafe_get(11), 10, 0xbd3af235l)
-  c.contents = i(c.contents, d.contents, a.contents, b.contents, k->unsafe_get(2), 15, 0x2ad7d2bbl)
-  b.contents = i(b.contents, c.contents, d.contents, a.contents, k->unsafe_get(9), 21, 0xeb86d391l)
-
-  unsafe_set(x, 0, a.contents + x->unsafe_get(0))
-  unsafe_set(x, 1, b.contents + x->unsafe_get(1))
-  unsafe_set(x, 2, c.contents + x->unsafe_get(2))
-  unsafe_set(x, 3, d.contents + x->unsafe_get(3))
-}
-
-let seed_a = 0x67452301l
-let seed_b = 0xefcdab89l
-let seed_c = 0x98badcfel
-let seed_d = 0x10325476l
-
-let state = [seed_a, seed_b, seed_c, seed_d]
-
-let md5blk = [0l, 0l, 0l, 0l, 0l, 0l, 0l, 0l, 0l, 0l, 0l, 0l, 0l, 0l, 0l, 0l]
-
-@send external charCodeAt: (string, int) => int = "charCodeAt"
-
-let md5_string = (s: string, start: int, len: int): string => {
-  let s = Caml_string_extern.slice(s, start, len)
-  let n = Caml_string_extern.length(s)
-  let () = {
-    state->unsafe_set(0, seed_a)
-    state->unsafe_set(1, seed_b)
-    state->unsafe_set(2, seed_c)
-    state->unsafe_set(3, seed_d)
-    for i in 0 to 15 {
-      md5blk->unsafe_set(i, 0l)
-    }
-  }
-
-  let i_end = n / 64
-  for i in 1 to i_end {
-    for j in 0 to 16 - 1 {
-      let k = i * 64 - 64 + j * 4
-      md5blk->unsafe_set(
-        j,
-        charCodeAt(s, k) +
-        lsl(s->charCodeAt(k + 1), 8) +
-        lsl(s->charCodeAt(k + 2), 16) +
-        lsl(s->charCodeAt(k + 3), 24),
-      )
-    }
-    cycle(state, md5blk)
-  }
-
-  let s_tail = Caml_string_extern.slice_rest(s, i_end * 64)
-  for kk in 0 to 15 {
-    md5blk->unsafe_set(kk, 0l)
-  }
-  let i_end = Caml_string_extern.length(s_tail) - 1
-  for i in 0 to i_end {
-    md5blk->unsafe_set(
-      i / 4,
-      lor(unsafe_get(md5blk, i / 4), lsl(charCodeAt(s_tail, i), lsl(mod(i, 4), 3))),
-    )
-  }
-  let i = i_end + 1
-  md5blk->unsafe_set(i / 4, lor(unsafe_get(md5blk, i / 4), lsl(0x80l, lsl(mod(i, 4), 3))))
-  if i > 55 {
-    cycle(state, md5blk)
-    for i in 0 to 15 {
-      md5blk->unsafe_set(i, 0)
-    }
-  }
-  unsafe_set(md5blk, 14, n * 8)
-  cycle(state, md5blk)
-  Caml_string_extern.of_small_int32_array([
-    land(state->unsafe_get(0), 0xff),
-    land(asr(state->unsafe_get(0), 8), 0xff),
-    land(asr(state->unsafe_get(0), 16), 0xff),
-    land(asr(state->unsafe_get(0), 24), 0xff),
-    land(state->unsafe_get(1), 0xff),
-    land(asr(state->unsafe_get(1), 8), 0xff),
-    land(asr(state->unsafe_get(1), 16), 0xff),
-    land(asr(state->unsafe_get(1), 24), 0xff),
-    land(state->unsafe_get(2), 0xff),
-    land(asr(state->unsafe_get(2), 8), 0xff),
-    land(asr(state->unsafe_get(2), 16), 0xff),
-    land(asr(state->unsafe_get(2), 24), 0xff),
-    land(state->unsafe_get(3), 0xff),
-    land(asr(state->unsafe_get(3), 8), 0xff),
-    land(asr(state->unsafe_get(3), 16), 0xff),
-    land(asr(state->unsafe_get(3), 24), 0xff),
-  ])
-}
diff --git a/jscomp/runtime/caml_md5.resi b/jscomp/runtime/caml_md5.resi
deleted file mode 100644
index c7bb429..0000000
--- a/jscomp/runtime/caml_md5.resi
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let md5_string: (string, int, int) => string
diff --git a/jscomp/runtime/caml_module.res b/jscomp/runtime/caml_module.res
deleted file mode 100644
index a510385..0000000
--- a/jscomp/runtime/caml_module.res
+++ /dev/null
@@ -1,111 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** This module replaced camlinternalMod completely. 
-    Note we can replace {!CamlinternalMod} completely, but it is not replaced 
-    due to we believe this is an even low level dependency
-*/
-
-@@warning("-37") /* `Function` may be used in runtime */
-
-type rec shape =
-  | Function
-  | Lazy
-  | Class
-  | Module(array<(shape, string)>)
-  | Value(Obj.t)
-/* ATTENTION: check across versions */
-module Array = Caml_array_extern
-
-@set_index external set_field: (Obj.t, string, Obj.t) => unit = ""
-
-@get_index external get_field: (Obj.t, string) => Obj.t = ""
-
-module type Empty = {}
-
-/** Note that we have to provide a drop in replacement, since compiler internally will
-    spit out ("CamlinternalMod".[init_mod|update_mod] unless we intercept it 
-    in the lambda layer
-*/
-let init_mod = (loc: (string, int, int), shape: shape) => {
-  let undef_module = _ => raise(Undefined_recursive_module(loc))
-  let rec loop = (shape: shape, struct_: Obj.t, idx) =>
-    switch shape {
-    | Function => set_field(struct_, idx, Obj.magic(undef_module))
-    | Lazy => set_field(struct_, idx, Obj.magic(lazy undef_module))
-    | Class =>
-      set_field(
-        struct_,
-        idx,
-        Obj.magic /* ref {!CamlinternalOO.dummy_class loc} */((
-          undef_module,
-          undef_module,
-          undef_module,
-          0,
-        )),
-        /* depends on dummy class representation */
-      )
-    | Module(comps) =>
-      let v = Obj.repr(module({}: Empty))
-      set_field(struct_, idx, v)
-      let len = Array.length(comps)
-      for i in 0 to len - 1 {
-        let (shape, name) = Caml_array_extern.unsafe_get(comps, i)
-        loop(shape, v, name)
-      }
-    | Value(v) => set_field(struct_, idx, v)
-    }
-  let res = Obj.repr(module({}: Empty))
-  let dummy_name = "dummy"
-  loop(shape, res, dummy_name)
-  get_field(res, dummy_name)
-}
-
-/* Note the [shape] passed between [init_mod] and [update_mod] is always the same 
-   and we assume [module] is encoded as an array
-*/
-let update_mod = (shape: shape, o: Obj.t, n: Obj.t): unit => {
-  let rec aux = (shape: shape, o, n, parent, i) =>
-    switch shape {
-    | Function => set_field(parent, i, n)
-
-    | Lazy
-    | Class =>
-      Caml_obj.update_dummy(o, n)
-    | Module(comps) =>
-      for i in 0 to Array.length(comps) - 1 {
-        let (shape, name) = Caml_array_extern.unsafe_get(comps, i)
-        aux(shape, get_field(o, name), get_field(n, name), o, name)
-      }
-    | Value(_) => ()
-    }
-  switch shape {
-  | Module(comps) =>
-    for i in 0 to Array.length(comps) - 1 {
-      let (shape, name) = Caml_array_extern.unsafe_get(comps, i)
-      aux(shape, get_field(o, name), get_field(n, name), o, name)
-    }
-  | _ => assert(false)
-  }
-}
diff --git a/jscomp/runtime/caml_module.resi b/jscomp/runtime/caml_module.resi
deleted file mode 100644
index 9cb284e..0000000
--- a/jscomp/runtime/caml_module.resi
+++ /dev/null
@@ -1,5 +0,0 @@
-type shape
-
-let init_mod: ((string, int, int), shape) => Obj.t
-
-let update_mod: (shape, Obj.t, Obj.t) => unit
diff --git a/jscomp/runtime/caml_nativeint_extern.res b/jscomp/runtime/caml_nativeint_extern.res
deleted file mode 100644
index ca19ae8..0000000
--- a/jscomp/runtime/caml_nativeint_extern.res
+++ /dev/null
@@ -1,10 +0,0 @@
-external add: (int, int) => int = "?nativeint_add"
-external div: (int, int) => int = "?nativeint_div"
-external rem: (int, int) => int = "?nativeint_mod"
-external shift_right_logical: (int, int) => int = "?nativeint_lsr"
-external mul: (int, int) => int = "?nativeint_mul"
-
-external to_float: int => float = "%identity"
-external of_float: float => int = "?int_of_float"
-/* TODO: this could be promoted to `#int_of_float` */
-@val external to_string: int => string = "String"
diff --git a/jscomp/runtime/caml_obj.res b/jscomp/runtime/caml_obj.res
deleted file mode 100644
index cd45d64..0000000
--- a/jscomp/runtime/caml_obj.res
+++ /dev/null
@@ -1,456 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Obj.t
-
-module O = {
-  @val external isArray: 'a => bool = "Array.isArray"
-  type key = string
-  let for_in: (Obj.t, key => unit) => unit = %raw(`function(o,foo){
-        for (var x in o) { foo(x) }}
-      `)
-
-  @scope(("Object", "prototype", "hasOwnProperty"))
-  @val
-  /**
-     JS objects are not guaranteed to have `Object` in their prototype
-     chain so calling `some_obj.hasOwnProperty(key)` can sometimes throw
-     an exception when dealing with JS interop. This mainly occurs when
-     objects are created via `Object.create(null)`. The only safe way
-     to call this function is directly, e.g. `Object.prototype.hasOwnProperty.call(some_obj, key)`.
-  */
-  external hasOwnProperty: (t, key) => bool = "call"
-
-  @get_index external get_value: (Obj.t, key) => Obj.t = ""
-}
-
-/**
-   Since now we change it back to use
-   Array representation
-   this function is higly dependent
-   on how objects are encoded in buckle.
-
-   There are potentially some issues with wrong implementation of
-   `obj_dup`, for example, people call `Obj.dup` for a record,
-   and new record, since currently, `new record` will generate a
-   `slice` function (which assume the record is an array), and the
-   output is no longer an array. (it might be  something like { 0 : x , 1 : y} )
-
-   {[
-     let u : record = Obj.dup x in
-     let h = {u with x = 3}
-   ]}
-
-   ==>
-
-   {[
-     var u = obj_dup (x)
-       var new_record = u.slice ()
-
-   ]}
-   `obj_dup` is a superset of `array_dup`
-*/
-let obj_dup: Obj.t => Obj.t = %raw(`function(x){
-  if(Array.isArray(x)){
-    var len = x.length  
-    var v = new Array(len)
-    for(var i = 0 ; i < len ; ++i){
-      v[i] = x[i]
-    }
-    if(x.TAG !== undefined){
-      v.TAG = x.TAG // TODO this can be removed eventually
-    }  
-    return v 
-  } 
-  return Object.assign({},x)    
-}`)
-
-/** 
-   For the empty dummy object, whether it's 
-   [[]] or [{}] depends on how 
-   runtime encoding works, and will affect 
-   js polymorphic comparison(Js.(=)) (fine with caml polymoprhic comparison (Pervasives.equal))
-   In most cases, rec value comes from record/modules, 
-   whose tag is 0, we optimize that case
-*/
-let update_dummy: (_, _) => unit = %raw(`function(x,y){
-  var k  
-  if(Array.isArray(y)){
-    for(k = 0; k < y.length ; ++k){
-      x[k] = y[k]
-    }
-    if(y.TAG !== undefined){
-      x.TAG = y.TAG
-    }
-  } else {
-    for (var k in y){
-      x[k] = y[k]
-    }
-  }
-}
-`)
-
-/** TODO: investigate total
-    [compare x y] returns [0] if [x] is equal to [y],
-    a negative integer if [x] is less than [y],
-    and a positive integer if [x] is greater than [y].
-    The ordering implemented by compare is compatible with the comparison
-    predicates [=], [<] and [>] defined above, with one difference on the treatment of the float value
-    [nan].
-
-    Namely, the comparison predicates treat nan as different from any other float value,
-    including itself; while compare treats [nan] as equal to itself and less than any other float value.
-    This treatment of [nan] ensures that compare defines a total ordering relation.
-    compare applied to functional values may raise Invalid_argument. compare applied to cyclic structures
-    may not terminate.
-
-    The compare function can be used as the comparison function required by the [Set.Make] and [Map.Make] functors,
-    as well as the [List.sort] and [Array.sort] functions.
-*/
-let rec compare = (a: Obj.t, b: Obj.t): int =>
-  if a === b {
-    0
-  } else {
-    /* front and formoest, we do not compare function values */
-    let a_type = Js.typeof(a)
-    let b_type = Js.typeof(b)
-    switch (a_type, b_type) {
-    | ("undefined", _) => -1
-    | (_, "undefined") => 1
-    /* [a] is of type string, b can not be None,
-        [a] could be (Some (Some x)) in that case [b] could be [Some None] or [null]
-         so [b] has to be of type string or null */
-    | ("string", "string") => Pervasives.compare((Obj.magic(a): string), Obj.magic(b))
-    | ("string", _) => /* [b] could be [Some None] or [null] */
-      1
-    | (_, "string") => -1
-    | ("boolean", "boolean") => Pervasives.compare((Obj.magic(a): bool), Obj.magic(b))
-    | ("boolean", _) => 1
-    | (_, "boolean") => -1
-    | ("function", "function") => raise(Invalid_argument("compare: functional value"))
-    | ("function", _) => 1
-    | (_, "function") => -1
-    | ("bigint", "bigint")
-    | ("number", "number") =>
-      Pervasives.compare((Obj.magic(a): float), (Obj.magic(b): float))
-    | ("number", _) =>
-      if b === Obj.repr(Js.null) || Caml_option.isNested(b) {
-        1
-      } else {
-        /* Some (Some ..) < x */
-        -1
-      } /* Integer < Block in OCaml runtime GPR #1195, except Some.. */
-    | (_, "number") =>
-      if a === Obj.repr(Js.null) || Caml_option.isNested(a) {
-        -1
-      } else {
-        1
-      }
-    | _ =>
-      if a === Obj.repr(Js.null) {
-        /* [b] could not be null otherwise would equal */
-        if Caml_option.isNested(b) {
-          1
-        } else {
-          -1
-        }
-      } else if b === Obj.repr(Js.null) {
-        if Caml_option.isNested(a) {
-          -1
-        } else {
-          1
-        }
-      } else if (
-        /* double_array_tag: 254
-         */
-        Caml_option.isNested(a)
-      ) {
-        if Caml_option.isNested(b) {
-          aux_obj_compare(a, b)
-        } else {
-          /* Some None < Some (Some None)) */
-
-          /* b could not be undefined/None */
-          /* Some None < Some .. */
-          -1
-        }
-      } else {
-        let tag_a = Obj.tag(a)
-        let tag_b = Obj.tag(b)
-        if tag_a == 248 /* object/exception */ {
-          Pervasives.compare((Obj.magic(Obj.field(a, 1)): int), Obj.magic(Obj.field(b, 1)))
-        } else if tag_a == 251 /* abstract_tag */ {
-          raise(Invalid_argument("equal: abstract value"))
-        } else if tag_a != tag_b {
-          if tag_a < tag_b {
-            -1
-          } else {
-            1
-          }
-        } else {
-          let len_a = Obj.size(a)
-          let len_b = Obj.size(b)
-          if len_a == len_b {
-            if O.isArray(a) {
-              aux_same_length((Obj.magic(a): array<Obj.t>), (Obj.magic(b): array<Obj.t>), 0, len_a)
-            } else if %raw(`a instanceof Date && b instanceof Date`) {
-              %raw(`a - b`)
-            } else {
-              aux_obj_compare(a, b)
-            }
-          } else if len_a < len_b {
-            /* at least one is not zero, so it is an array block */
-            aux_length_a_short((Obj.magic(a): array<Obj.t>), (Obj.magic(b): array<Obj.t>), 0, len_a)
-          } else {
-            aux_length_b_short((Obj.magic(a): array<Obj.t>), (Obj.magic(b): array<Obj.t>), 0, len_b)
-          }
-        }
-      }
-    }
-  }
-
-and aux_same_length = (a: array<Obj.t>, b: array<Obj.t>, i, same_length) =>
-  if i == same_length {
-    0
-  } else {
-    let res = compare(Caml_array_extern.unsafe_get(a, i), Caml_array_extern.unsafe_get(b, i))
-
-    if res != 0 {
-      res
-    } else {
-      aux_same_length(a, b, i + 1, same_length)
-    }
-  }
-
-and aux_length_a_short = (a: array<Obj.t>, b: array<Obj.t>, i, short_length) =>
-  if i == short_length {
-    -1
-  } else {
-    let res = compare(Caml_array_extern.unsafe_get(a, i), Caml_array_extern.unsafe_get(b, i))
-
-    if res != 0 {
-      res
-    } else {
-      aux_length_a_short(a, b, i + 1, short_length)
-    }
-  }
-
-and aux_length_b_short = (a: array<Obj.t>, b: array<Obj.t>, i, short_length) =>
-  if i == short_length {
-    1
-  } else {
-    let res = compare(Caml_array_extern.unsafe_get(a, i), Caml_array_extern.unsafe_get(b, i))
-
-    if res != 0 {
-      res
-    } else {
-      aux_length_b_short(a, b, i + 1, short_length)
-    }
-  }
-
-and aux_obj_compare = (a: Obj.t, b: Obj.t) => {
-  let min_key_lhs = ref(None)
-  let min_key_rhs = ref(None)
-  let do_key = ((a, b, min_key), key) =>
-    if !O.hasOwnProperty(b, key) || compare(O.get_value(a, key), O.get_value(b, key)) > 0 {
-      switch min_key.contents {
-      | None => min_key.contents = Some(key)
-      | Some(mk) =>
-        if key < mk {
-          min_key.contents = Some(key)
-        }
-      }
-    }
-
-  let do_key_a = do_key((a, b, min_key_rhs))
-  let do_key_b = do_key((b, a, min_key_lhs))
-  O.for_in(a, do_key_a)
-  O.for_in(b, do_key_b)
-  let res = switch (min_key_lhs.contents, min_key_rhs.contents) {
-  | (None, None) => 0
-  | (Some(_), None) => -1
-  | (None, Some(_)) => 1
-  | (Some(x), Some(y)) => Pervasives.compare(x, y)
-  }
-
-  res
-}
-
-type eq = (Obj.t, Obj.t) => bool
-
-/** It is easier to do equality check than comparision, since as long as its
-    basic type is not the same, it will not equal 
-*/
-let rec equal = (a: Obj.t, b: Obj.t): bool =>
-  /* front and formoest, we do not compare function values */
-  if a === b {
-    true
-  } else {
-    let a_type = Js.typeof(a)
-    if (
-      a_type == "string" ||
-        (a_type == "number" ||
-        (a_type == "bigint" ||
-          (a_type == "boolean" ||
-          (a_type == "undefined" || a === %raw(`null`)))))
-    ) {
-      false
-    } else {
-      let b_type = Js.typeof(b)
-      if a_type == "function" || b_type == "function" {
-        raise(Invalid_argument("equal: functional value"))
-      } /* first, check using reference equality */
-      else if (
-        /* a_type = "object" || "symbol" */
-        b_type == "number" || (b_type == "bigint" || (b_type == "undefined" || b === %raw(`null`)))
-      ) {
-        false
-      } else {
-        /* [a] [b] could not be null, so it can not raise */
-        let tag_a = Obj.tag(a)
-        let tag_b = Obj.tag(b)
-        if tag_a == 248 /* object/exception */ {
-          Obj.magic(Obj.field(a, 1)) === Obj.magic(Obj.field(b, 1))
-        } else if tag_a == 251 /* abstract_tag */ {
-          raise(Invalid_argument("equal: abstract value"))
-        } else if tag_a != tag_b {
-          false
-        } else {
-          let len_a = Obj.size(a)
-          let len_b = Obj.size(b)
-          if len_a == len_b {
-            if O.isArray(a) {
-              aux_equal_length((Obj.magic(a): array<Obj.t>), (Obj.magic(b): array<Obj.t>), 0, len_a)
-            } else if %raw(`a instanceof Date && b instanceof Date`) {
-              !(Js.unsafe_gt(a, b) || Js.unsafe_lt(a, b))
-            } else {
-              aux_obj_equal(a, b)
-            }
-          } else {
-            false
-          }
-        }
-      }
-    }
-  }
-
-and aux_equal_length = (a: array<Obj.t>, b: array<Obj.t>, i, same_length) =>
-  if i == same_length {
-    true
-  } else {
-    equal(Caml_array_extern.unsafe_get(a, i), Caml_array_extern.unsafe_get(b, i)) &&
-    aux_equal_length(a, b, i + 1, same_length)
-  }
-
-and aux_obj_equal = (a: Obj.t, b: Obj.t) => {
-  let result = ref(true)
-  let do_key_a = key =>
-    if !O.hasOwnProperty(b, key) {
-      result.contents = false
-    }
-
-  let do_key_b = key =>
-    if !O.hasOwnProperty(a, key) || !equal(O.get_value(b, key), O.get_value(a, key)) {
-      result.contents = false
-    }
-
-  O.for_in(a, do_key_a)
-  if result.contents {
-    O.for_in(b, do_key_b)
-  }
-  result.contents
-}
-
-let equal_null = (x: Obj.t, y: Js.null<Obj.t>) =>
-  switch Js.nullToOption(y) {
-  | None => x === Obj.magic(y)
-  | Some(y) => equal(x, y)
-  }
-
-let equal_undefined = (x: Obj.t, y: Js.undefined<Obj.t>) =>
-  switch Js.undefinedToOption(y) {
-  | None => x === Obj.magic(y)
-  | Some(y) => equal(x, y)
-  }
-
-let equal_nullable = (x: Obj.t, y: Js.nullable<Obj.t>) =>
-  switch Js.toOption(y) {
-  | None => x === Obj.magic(y)
-  | Some(y) => equal(x, y)
-  }
-
-@inline
-let isNumberOrBigInt = a => Js.typeof(a) == "number" || Js.typeof(a) == "bigint"
-
-@inline
-let canNumericCompare = (a, b) => isNumberOrBigInt(a) && isNumberOrBigInt(b)
-
-let notequal = (a, b) =>
-  if canNumericCompare(a, b) {
-    (Obj.magic(a): float) != (Obj.magic(b): float)
-  } else {
-    !equal(a, b)
-  }
-
-let greaterequal = (a, b) =>
-  if canNumericCompare(a, b) {
-    (Obj.magic(a): float) >= (Obj.magic(b): float)
-  } else {
-    compare(a, b) >= 0
-  }
-
-let greaterthan = (a, b) =>
-  if canNumericCompare(a, b) {
-    (Obj.magic(a): float) > (Obj.magic(b): float)
-  } else {
-    compare(a, b) > 0
-  }
-
-let lessequal = (a, b) =>
-  if canNumericCompare(a, b) {
-    (Obj.magic(a): float) <= (Obj.magic(b): float)
-  } else {
-    compare(a, b) <= 0
-  }
-
-let lessthan = (a, b) =>
-  if canNumericCompare(a, b) {
-    (Obj.magic(a): float) < (Obj.magic(b): float)
-  } else {
-    compare(a, b) < 0
-  }
-
-let min = (x: Obj.t, y) =>
-  if compare(x, y) <= 0 {
-    x
-  } else {
-    y
-  }
-
-let max = (x: Obj.t, y) =>
-  if compare(x, y) >= 0 {
-    x
-  } else {
-    y
-  }
diff --git a/jscomp/runtime/caml_obj.resi b/jscomp/runtime/caml_obj.resi
deleted file mode 100644
index d239655..0000000
--- a/jscomp/runtime/caml_obj.resi
+++ /dev/null
@@ -1,48 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 t = Obj.t
-
-let obj_dup: Obj.t => Obj.t
-
-let update_dummy: (Obj.t, Obj.t) => unit
-
-let compare: (Obj.t, Obj.t) => int
-
-type eq = (Obj.t, Obj.t) => bool
-
-let equal: eq
-
-let equal_null: (Obj.t, Js.null<Obj.t>) => bool
-let equal_undefined: (Obj.t, Js.undefined<Obj.t>) => bool
-let equal_nullable: (Obj.t, Js.nullable<Obj.t>) => bool
-
-let notequal: eq
-let greaterequal: eq
-let greaterthan: eq
-let lessthan: eq
-let lessequal: eq
-
-let min: (t, t) => t
-let max: (t, t) => t
diff --git a/jscomp/runtime/caml_option.res b/jscomp/runtime/caml_option.res
deleted file mode 100644
index 3462056..0000000
--- a/jscomp/runtime/caml_option.res
+++ /dev/null
@@ -1,95 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 nested = {@as("BS_PRIVATE_NESTED_SOME_NONE") depth: int}
-
-/* INPUT: [x] should not be nullable */
-let isNested = (x: Obj.t): bool => Obj.repr((Obj.magic(x): nested).depth) !== Obj.repr(Js.undefined)
-
-let some = (x: Obj.t): Obj.t =>
-  if Obj.magic(x) == None {
-    Obj.repr({depth: 0})
-  } /* [x] is neither None nor null so it is safe to do property access */
-  else if x !== Obj.repr(Js.null) && isNested(x) {
-    Obj.repr({depth: (Obj.magic(x): nested).depth + 1})
-  } else {
-    x
-  }
-
-let nullable_to_opt = (type t, x: Js.nullable<t>): option<t> =>
-  if Js.isNullable(x) {
-    None
-  } else {
-    Obj.magic(some((Obj.magic(x): 'a)))
-  }
-
-let undefined_to_opt = (type t, x: Js.undefined<t>): option<t> =>
-  if Obj.magic(x) === Js.undefined {
-    None
-  } else {
-    Obj.magic(some((Obj.magic(x): 'a)))
-  }
-
-let null_to_opt = (type t, x: Js.null<t>): option<t> =>
-  if Obj.magic(x) === Js.null {
-    None
-  } else {
-    Obj.magic(some((Obj.magic(x): 'a)))
-  }
-
-/* external valFromOption : 'a option -> 'a =
- "#val_from_option" */
-
-/** The input is already of [Some] form, [x] is not None, 
-    make sure [x[0]] will not throw */
-let valFromOption = (x: Obj.t): Obj.t =>
-  if x !== Obj.repr(Js.null) && isNested(x) {
-    let {depth}: nested = Obj.magic(x)
-    if depth == 0 {
-      Obj.magic(None)
-    } else {
-      Obj.repr({depth: depth - 1})
-    }
-  } else {
-    Obj.magic(x)
-  }
-
-let option_get = (x: option<'a>) =>
-  if x == None {
-    Caml_undefined_extern.empty
-  } else {
-    Obj.magic(valFromOption(Obj.repr(x)))
-  }
-
-type poly = {
-  @as("HASH") hash: int /* Literals.polyvar_hash */,
-  @as("VAL") value: Obj.t,
-}
-
-/** [input] is optional polymorphic variant */
-let option_unwrap = (x: option<poly>) =>
-  switch x {
-  | None => Obj.repr(x)
-  | Some(x) => x.value
-  }
diff --git a/jscomp/runtime/caml_option.resi b/jscomp/runtime/caml_option.resi
deleted file mode 100644
index 8755bf7..0000000
--- a/jscomp/runtime/caml_option.resi
+++ /dev/null
@@ -1,46 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 nested = {@as("BS_PRIVATE_NESTED_SOME_NONE") depth: int}
-
-let nullable_to_opt: Js.null_undefined<'a> => option<'a>
-
-let undefined_to_opt: Js.undefined<'a> => option<'a>
-
-let null_to_opt: Js.null<'a> => option<'a>
-
-let valFromOption: Obj.t => Obj.t
-
-let some: Obj.t => Obj.t
-
-let isNested: Obj.t => bool
-
-let option_get: option<Obj.t> => Caml_undefined_extern.t<Obj.t>
-
-type poly
-
-/** When it is None, return none
-    When it is (Some (`a 3)) return 3
-*/
-let option_unwrap: option<poly> => Obj.t
diff --git a/jscomp/runtime/caml_parser.res b/jscomp/runtime/caml_parser.res
deleted file mode 100644
index 82add8c..0000000
--- a/jscomp/runtime/caml_parser.res
+++ /dev/null
@@ -1,390 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-%%raw(`
-
-/***********************************************************************/
-/*                                                                     */
-/*                           Objective Caml                            */
-/*                                                                     */
-/*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         */
-/*                                                                     */
-/*  Copyright 1996 Institut National de Recherche en Informatique et   */
-/*  en Automatique.  All rights reserved.  This file is distributed    */
-/*  under the terms of the GNU Library General Public License, with    */
-/*  the special exception on linking described in file ../LICENSE.     */
-/*                                                                     */
-/***********************************************************************/
-
-/* $Id: parsing.c 8983 2008-08-06 09:38:25Z xleroy $ */
-
-/* The PDA automaton for parsers generated by camlyacc */
-
-/* The pushdown automata */
-
-/**
- * caml_lex_array("abcd")
- * [25185, 25699]
- * @param s
- * @returns {any[]}
- * TODO: duplicated with module {!Caml_lex}
- */
-function caml_lex_array(s) {
-    var l = s.length / 2;
-    var a = new Array(l);
-    for (var i = 0; i < l; i++)
-        a[i] = (s.charCodeAt(2 * i) | (s.charCodeAt(2 * i + 1) << 8)) << 16 >> 16;
-    return a;
-}
-/**
- * Note that TS enum is not friendly to Closure compiler
- * @enum{number}
- */
-var Automata = {
-    START: 0,
-    LOOP: 6,
-    TOKEN_READ: 1,
-    TEST_SHIFT: 7,
-    ERROR_DETECTED: 5,
-    SHIFT: 8,
-    SHIFT_RECOVER: 9,
-    STACK_GROWN_1: 2,
-    REDUCE: 10,
-    STACK_GROWN_2: 3,
-    SEMANTIC_ACTION_COMPUTED: 4
-};
-/**
- * @enum{number}
- */
-var Result = {
-    READ_TOKEN: 0,
-    RAISE_PARSE_ERROR: 1,
-    GROW_STACKS_1: 2,
-    GROW_STACKS_2: 3,
-    COMPUTE_SEMANTIC_ACTION: 4,
-    CALL_ERROR_FUNCTION: 5
-};
-var PARSER_TRACE = false;
-`)
-
-/*
- * external parse_engine : parse_tables -> parser_env -> parser_input -> Obj.t -> parser_output
- * parsing.ml
- *
- * type parse_tables = {
- *   actions : (parser_env -> Obj.t) array
- *   transl_const : int array;
- *   transl_block : int array;
- *   lhs : string;
- *   len : string;
- *   defred : string;
- *   dgoto : string;
- *   sindex : string;
- *   rindex : string;
- *   gindex : string;
- *   tablesize : int;
- *   table : string;
- *   check : string;
- *   error_function : string -> unit;
- *   names_const : string;
- *   names_block : string
- * }
- *
- * type parser_env =
- * { mutable s_stack : int array;        (* States *)
- *  mutable v_stack : Obj.t array;      (* Semantic attributes *)
- *  mutable symb_start_stack : position array; (* Start positions *)
- *  mutable symb_end_stack : position array;   (* End positions *)
- *  mutable stacksize : int;            (* Size of the stacks *)
- *  mutable stackbase : int;            (* Base sp for current parse *)
- *  mutable curr_char : int;            (* Last token read *)
- *  mutable lval : Obj.t;               (* Its semantic attribute *)
- *  mutable symb_start : position;      (* Start pos. of the current symbol*)
- *  mutable symb_end : position;        (* End pos. of the current symbol *)
- *  mutable asp : int;                  (* The stack pointer for attributes *)
- *  mutable rule_len : int;             (* Number of rhs items in the rule *)
- *  mutable rule_number : int;          (* Rule number to reduce by *)
- *  mutable sp : int;                   (* Saved sp for parse_engine *)
- *  mutable state : int;                (* Saved state for parse_engine *)
- *  mutable errflag : int }             (* Saved error flag for parse_engine *)
- *
- *  type parser_input =
- *   | Start
- *   | Token_read
- *   | Stacks_grown_1
- *   | Stacks_grown_2
- *   | Semantic_action_computed
- *   | Error_detected
-
- * @param tables
- * @param env
- * @param cmd
- * @param arg
- * @returns {number}
-*/
-
-type parse_tables
-type parser_env
-
-let parse_engine: (
-  parse_tables,
-  parser_env,
-  /* Parsing.parser_input */ Obj.t,
-  Obj.t,
-) => Obj.t = %raw(`function (tables /* parser_table */, env /* parser_env */, cmd /* parser_input*/, arg /* Obj.t*/) {
-    var ERRCODE = 256;
-    //var START = 0;
-    //var TOKEN_READ = 1;
-    //var STACKS_GROWN_1 = 2;
-    //var STACKS_GROWN_2 = 3;
-    //var SEMANTIC_ACTION_COMPUTED = 4;
-    //var ERROR_DETECTED = 5;
-    //var loop = 6;
-    //var testshift = 7;
-    //var shift = 8;
-    //var shift_recover = 9;
-    //var reduce = 10;
-    // Parsing.parser_env
-    var env_s_stack = 's_stack'; // array
-    var env_v_stack = 'v_stack'; // array
-    var env_symb_start_stack = 'symb_start_stack'; // array
-    var env_symb_end_stack = 'symb_end_stack'; // array
-    var env_stacksize = 'stacksize';
-    var env_stackbase = 'stackbase';
-    var env_curr_char = 'curr_char';
-    var env_lval = 'lval'; // Obj.t
-    var env_symb_start = 'symb_start'; // position
-    var env_symb_end = 'symb_end'; // position
-    var env_asp = 'asp';
-    var env_rule_len = 'rule_len';
-    var env_rule_number = 'rule_number';
-    var env_sp = 'sp';
-    var env_state = 'state';
-    var env_errflag = 'errflag';
-    // Parsing.parse_tables
-    // var _tbl_actions = 1;
-    var tbl_transl_const = 'transl_const'; // array
-    var tbl_transl_block = 'transl_block'; // array
-    var tbl_lhs = 'lhs';
-    var tbl_len = 'len';
-    var tbl_defred = 'defred';
-    var tbl_dgoto = 'dgoto';
-    var tbl_sindex = 'sindex';
-    var tbl_rindex = 'rindex';
-    var tbl_gindex = 'gindex';
-    var tbl_tablesize = 'tablesize';
-    var tbl_table = 'table';
-    var tbl_check = 'check';
-    // var _tbl_error_function = 14;
-    // var _tbl_names_const = 15;
-    // var _tbl_names_block = 16;
-    if (!tables.preprocessed) {
-        tables.defred = caml_lex_array(tables[tbl_defred]);
-        tables.sindex = caml_lex_array(tables[tbl_sindex]);
-        tables.check = caml_lex_array(tables[tbl_check]);
-        tables.rindex = caml_lex_array(tables[tbl_rindex]);
-        tables.table = caml_lex_array(tables[tbl_table]);
-        tables.len = caml_lex_array(tables[tbl_len]);
-        tables.lhs = caml_lex_array(tables[tbl_lhs]);
-        tables.gindex = caml_lex_array(tables[tbl_gindex]);
-        tables.dgoto = caml_lex_array(tables[tbl_dgoto]);
-        tables.preprocessed = true;
-    }
-    var res;
-    var n, n1, n2, state1;
-    // RESTORE
-    var sp = env[env_sp];
-    var state = env[env_state];
-    var errflag = env[env_errflag];
-    exit: for (;;) {
-        //console.error("State", Automata[cmd]);
-        switch (cmd) {
-            case Automata.START:
-                state = 0;
-                errflag = 0;
-            // Fall through
-            case Automata.LOOP:
-                n = tables.defred[state];
-                if (n != 0) {
-                    cmd = Automata.REDUCE;
-                    break;
-                }
-                if (env[env_curr_char] >= 0) {
-                    cmd = Automata.TEST_SHIFT;
-                    break;
-                }
-                res = Result.READ_TOKEN;
-                break exit;
-            /* The ML code calls the lexer and updates */
-            /* symb_start and symb_end */
-            case Automata.TOKEN_READ:
-                if (typeof arg !== 'number') {
-                    env[env_curr_char] = tables[tbl_transl_block][arg.TAG | 0 /* + 1 */];
-                    env[env_lval] = arg._0; // token carries payload
-                }
-                else {
-                    env[env_curr_char] = tables[tbl_transl_const][arg /* + 1 */];
-                    env[env_lval] = 0; // const token
-                }
-                if (PARSER_TRACE) {
-                    console.error("State %d, read token", state, arg);
-                }
-            // Fall through
-            case Automata.TEST_SHIFT:
-                n1 = tables.sindex[state];
-                n2 = n1 + env[env_curr_char];
-                if (n1 != 0 && n2 >= 0 && n2 <= tables[tbl_tablesize] &&
-                    tables.check[n2] == env[env_curr_char]) {
-                    cmd = Automata.SHIFT;
-                    break;
-                }
-                n1 = tables.rindex[state];
-                n2 = n1 + env[env_curr_char];
-                if (n1 != 0 && n2 >= 0 && n2 <= tables[tbl_tablesize] &&
-                    tables.check[n2] == env[env_curr_char]) {
-                    n = tables.table[n2];
-                    cmd = Automata.REDUCE;
-                    break;
-                }
-                if (errflag <= 0) {
-                    res = Result.CALL_ERROR_FUNCTION;
-                    break exit;
-                }
-            // Fall through
-            /* The ML code calls the error function */
-            case Automata.ERROR_DETECTED:
-                if (errflag < 3) {
-                    errflag = 3;
-                    for (;;) {
-                        state1 = env[env_s_stack][sp /* + 1*/];
-                        n1 = tables.sindex[state1];
-                        n2 = n1 + ERRCODE;
-                        if (n1 != 0 && n2 >= 0 && n2 <= tables[tbl_tablesize] &&
-                            tables.check[n2] == ERRCODE) {
-                            cmd = Automata.SHIFT_RECOVER;
-                            break;
-                        }
-                        else {
-                            if (sp <= env[env_stackbase])
-                                return Result.RAISE_PARSE_ERROR;
-                            /* The ML code raises Parse_error */
-                            sp--;
-                        }
-                    }
-                }
-                else {
-                    if (env[env_curr_char] == 0)
-                        return Result.RAISE_PARSE_ERROR;
-                    /* The ML code raises Parse_error */
-                    env[env_curr_char] = -1;
-                    cmd = Automata.LOOP;
-                    break;
-                }
-            // Fall through
-            case Automata.SHIFT:
-                env[env_curr_char] = -1;
-                if (errflag > 0)
-                    errflag--;
-            // Fall through
-            case Automata.SHIFT_RECOVER:
-                if (PARSER_TRACE) {
-                    console.error("State %d: shift to state %d", state, tables.table[n2]);
-                }
-                state = tables.table[n2];
-                sp++;
-                if (sp >= env[env_stacksize]) {
-                    res = Result.GROW_STACKS_1;
-                    break exit;
-                }
-            // Fall through
-            /* The ML code resizes the stacks */
-            case Automata.STACK_GROWN_1:
-                env[env_s_stack][sp /* + 1 */] = state;
-                env[env_v_stack][sp /* + 1 */] = env[env_lval];
-                env[env_symb_start_stack][sp /* + 1 */] = env[env_symb_start];
-                env[env_symb_end_stack][sp /* + 1 */] = env[env_symb_end];
-                cmd = Automata.LOOP;
-                break;
-            case Automata.REDUCE:
-                if (PARSER_TRACE) {
-                    console.error("State %d : reduce by rule %d", state, n);
-                }
-                var m = tables.len[n];
-                env[env_asp] = sp;
-                env[env_rule_number] = n;
-                env[env_rule_len] = m;
-                sp = sp - m + 1;
-                m = tables.lhs[n];
-                state1 = env[env_s_stack][sp - 1]; //
-                n1 = tables.gindex[m];
-                n2 = n1 + state1;
-                if (n1 != 0 && n2 >= 0 && n2 <= tables[tbl_tablesize] &&
-                    tables.check[n2] == state1)
-                    state = tables.table[n2];
-                else
-                    state = tables.dgoto[m];
-                if (sp >= env[env_stacksize]) {
-                    res = Result.GROW_STACKS_2;
-                    break exit;
-                }
-            // Fall through
-            /* The ML code resizes the stacks */
-            case Automata.STACK_GROWN_2:
-                res = Result.COMPUTE_SEMANTIC_ACTION;
-                break exit;
-            /* The ML code calls the semantic action */
-            case Automata.SEMANTIC_ACTION_COMPUTED:
-                env[env_s_stack][sp /* + 1 */] = state;
-                env[env_v_stack][sp /* + 1*/] = arg;
-                var asp = env[env_asp];
-                env[env_symb_end_stack][sp /* + 1*/] = env[env_symb_end_stack][asp /* + 1*/];
-                if (sp > asp) {
-                    /* This is an epsilon production. Take symb_start equal to symb_end. */
-                    env[env_symb_start_stack][sp /* + 1*/] = env[env_symb_end_stack][asp /*+ 1*/];
-                }
-                cmd = Automata.LOOP;
-                break;
-            /* Should not happen */
-            default:
-                return Result.RAISE_PARSE_ERROR;
-        }
-    }
-    // SAVE
-    env[env_sp] = sp;
-    env[env_state] = state;
-    env[env_errflag] = errflag;
-    return res;
-}`)
-
-/**
- * external set_trace: bool -> bool = "?set_parser_trace"
- * parsing.ml
- * @param {boolean}
- * @returns {boolean}
- */
-let set_parser_trace: bool => bool = %raw(`function (v) {
-    var old = PARSER_TRACE;
-    PARSER_TRACE = v;
-    return old;
-}`)
diff --git a/jscomp/runtime/caml_parser.resi b/jscomp/runtime/caml_parser.resi
deleted file mode 100644
index 57d493c..0000000
--- a/jscomp/runtime/caml_parser.resi
+++ /dev/null
@@ -1,35 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 parse_tables
-type parser_env
-
-let parse_engine: (
-  parse_tables,
-  parser_env,
-  Obj.t /* Parsing.parser_input */,
-  Obj.t,
-) => /* parser_output */ Obj.t
-
-let set_parser_trace: bool => bool
diff --git a/jscomp/runtime/caml_splice_call.res b/jscomp/runtime/caml_splice_call.res
deleted file mode 100644
index 7c2334c..0000000
--- a/jscomp/runtime/caml_splice_call.res
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Copyright (C) 2019- Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 obj = Obj.t
-
-let spliceApply: (obj, obj) => obj = %raw(`function(fn,args){
-  var i, argLen; 
-  argLen = args.length
-  var applied = []
-  for(i = 0; i < argLen - 1; ++i){
-    applied.push(args[i])
-  }
-  var lastOne = args[argLen - 1]
-  for(i = 0; i < lastOne.length; ++i ){
-    applied.push(lastOne[i])
-  }
-  return fn.apply(null,applied)
-}`)
-
-let spliceNewApply: (obj, obj) => obj = %raw(`function (ctor,args){
-  var i, argLen;
-  argLen = args.length
-  var applied = [null] // Function.prototype.bind.apply(fn, args) requires the first element in \`args\` to be \`null\`
-  for(i = 0; i < argLen - 1; ++i){
-    applied.push(args[i])
-  }
-  var lastOne = args[argLen - 1]
-  for(i = 0; i < lastOne.length; ++i ){
-    applied.push(lastOne[i])
-  }
-  var C = Function.prototype.bind.apply(ctor, applied)
-  return new C()
-}`)
-
-let spliceObjApply: (obj, obj, obj) => obj = %raw(`function(obj,name,args){
-  var i, argLen; 
-  argLen = args.length
-  var applied = []
-  for(i = 0; i < argLen - 1; ++i){
-    applied.push(args[i])
-  }
-  var lastOne = args[argLen - 1]
-  for(i = 0; i < lastOne.length; ++i ){
-    applied.push(lastOne[i])
-  }
-  return (obj[name]).apply(obj,applied)
-}`)
diff --git a/jscomp/runtime/caml_splice_call.resi b/jscomp/runtime/caml_splice_call.resi
deleted file mode 100644
index 1648089..0000000
--- a/jscomp/runtime/caml_splice_call.resi
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (C) 2019- Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 obj = Obj.t
-
-let spliceApply: (obj, obj) => obj
-
-let spliceNewApply: (obj, obj) => obj
-
-let spliceObjApply: (obj, obj, obj) => obj
diff --git a/jscomp/runtime/caml_string.res b/jscomp/runtime/caml_string.res
deleted file mode 100644
index c70e95c..0000000
--- a/jscomp/runtime/caml_string.res
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/* ********************* */
-/* replaced primitives */
-/* Note that we explicitly define [unsafe_set] instead of 
-   using {!Bytes.unsafe_set} since for some standard libraries, 
-   it might point to ["%string_unsafe_set"]
-*/
-
-let get = (s, i) =>
-  if i >= Caml_string_extern.length(s) || i < 0 {
-    raise(Invalid_argument("index out of bounds"))
-  } else {
-    Caml_string_extern.unsafe_get(s, i)
-  }
-
-let make = (n, ch: char): string => Caml_string_extern.of_char(ch)->Caml_string_extern.repeat(n)
diff --git a/jscomp/runtime/caml_string.resi b/jscomp/runtime/caml_string.resi
deleted file mode 100644
index 162eab1..0000000
--- a/jscomp/runtime/caml_string.resi
+++ /dev/null
@@ -1,27 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let get: (string, int) => char
-
-let make: (int, char) => string
diff --git a/jscomp/runtime/caml_string_extern.res b/jscomp/runtime/caml_string_extern.res
deleted file mode 100644
index 57942ca..0000000
--- a/jscomp/runtime/caml_string_extern.res
+++ /dev/null
@@ -1,54 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** TODO: check with {!String.of_char} 
-    it's quite common that we have
-    {[ Caml_string_extern.of_char x.[0] ]}
-    It would be nice to generate code as below    
-    {[ x[0]
-    ]}
-*/
-
-/* ATT: this relies on we encode `char' as int */
-@val external of_char: char => string = "String.fromCharCode"
-@get_index external get_string_unsafe: (string, int) => string = ""
-
-@send external toUpperCase: string => string = "toUpperCase"
-@send external of_int: (int, ~base: int) => string = "toString"
-@send external slice: (string, int, int) => string = "slice"
-@send external slice_rest: (string, int) => string = "slice"
-@send external index_of: (string, string) => int = "indexOf"
-
-@val
-external of_small_int_array: (@as(json`null`) _, array<int>) => string = "String.fromCharCode.apply"
-
-@val @variadic external of_small_int32_array: array<int> => string = "String.fromCharCode"
-
-@send external lastIndexOf: (string, string) => int = "lastIndexOf" /* used in {!Caml_io} */
-
-external length: string => int = "%string_length"
-external unsafe_get: (string, int) => char = "%string_unsafe_get"
-external unsafe_set: (bytes, int, char) => unit = "%bytes_unsafe_set"
-
-@send external repeat: (string, int) => string = "repeat"
diff --git a/jscomp/runtime/caml_sys.res b/jscomp/runtime/caml_sys.res
deleted file mode 100644
index 01850a8..0000000
--- a/jscomp/runtime/caml_sys.res
+++ /dev/null
@@ -1,111 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@get_index external getEnv: ('a, string) => option<string> = ""
-let sys_getenv = s =>
-  if (
-    Js.typeof(%raw(`process`)) == "undefined" || %raw(`process.env`) == Caml_undefined_extern.empty
-  ) {
-    raise(Not_found)
-  } else {
-    switch getEnv(%raw(`process.env`), s) {
-    | None => raise(Not_found)
-    | Some(x) => x
-    }
-  }
-
-/* https://nodejs.org/dist/latest-v12.x/docs/api/os.html#os_os_platform 
-   The value is set at compile time. Possible values are 'aix', 'darwin','freebsd', 'linux', 'openbsd', 'sunos', and 'win32'.
-   The return value is equivalent to process.platform. 
-   NodeJS does not support Cygwin very well
-*/
-let os_type: unit => string = %raw(`function(_){
-  if(typeof process !== 'undefined' && process.platform === 'win32'){
-        return "Win32"    
-  }
-  else {
-    return "Unix"
-  }
-}`)
-/* TODO: improve [js_pass_scope] to avoid remove unused n here */
-
-/* let initial_time = now ()  *. 0.001 */
-
-type process
-@send external uptime: (process, unit) => float = "uptime"
-@send external exit: (process, int) => 'a = "exit"
-
-let sys_time = () =>
-  if (
-    Js.typeof(%raw(`process`)) == "undefined" ||
-      %raw(`process.uptime`) == Caml_undefined_extern.empty
-  ) {
-    -1.
-  } else {
-    uptime(%raw(`process`), ())
-  }
-
-/*
-type spawnResult
-external spawnSync : string -> spawnResult = "spawnSync" [@@bs.module "child_process"]
-
-external readAs : spawnResult -> 
-  < 
-    status : int Js.null;
-  > Js.t = 
-  "%identity"
-*/
-
-let sys_getcwd: unit => string = %raw(`function(param){
-    if (typeof process === "undefined" || process.cwd === undefined){
-      return "/"  
-    }
-    return process.cwd()
-  }`)
-
-/* Called by {!Sys} in the toplevel, should never fail */
-let sys_get_argv = (): (string, array<string>) =>
-  if Js.typeof(%raw(`process`)) == "undefined" {
-    ("", [""])
-  } else {
-    let argv = %raw(`process.argv`)
-    if Js.testAny(argv) {
-      ("", [""])
-    } else {
-      (Caml_array_extern.unsafe_get(argv, 0), argv)
-    }
-  }
-
-/** {!Pervasives.sys_exit} */
-let sys_exit: int => 'a = exit_code =>
-  if Js.typeof(%raw(`process`)) != "undefined" {
-    exit(%raw(`process`), exit_code)
-  }
-
-let sys_is_directory = _s => raise(Failure("sys_is_directory not implemented"))
-
-/** Need polyfill to make cmdliner work 
-    {!Sys.is_directory} or {!Sys.file_exists} {!Sys.command} 
-*/
-let sys_file_exists = _s => raise(Failure("sys_file_exists not implemented"))
diff --git a/jscomp/runtime/caml_sys.resi b/jscomp/runtime/caml_sys.resi
deleted file mode 100644
index 8ebc0c1..0000000
--- a/jscomp/runtime/caml_sys.resi
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let sys_getenv: string => string
-
-let sys_time: unit => float
-
-let os_type: unit => string
-
-let sys_getcwd: unit => string
-
-let sys_get_argv: unit => (string, array<string>)
-
-let sys_exit: int => unit
-
-let sys_is_directory: string => bool
-let sys_file_exists: string => bool
diff --git a/jscomp/runtime/caml_undefined_extern.res b/jscomp/runtime/caml_undefined_extern.res
deleted file mode 100644
index a34355e..0000000
--- a/jscomp/runtime/caml_undefined_extern.res
+++ /dev/null
@@ -1,4 +0,0 @@
-type t<+'a>
-external empty: t<'a> = "#undefined"
-external return: 'a => t<'a> = "%identity"
-external toOption: t<'a> => option<'a> = "#undefined_to_opt"
diff --git a/jscomp/runtime/curry.res b/jscomp/runtime/curry.res
deleted file mode 100644
index 7d2fff6..0000000
--- a/jscomp/runtime/curry.res
+++ /dev/null
@@ -1,358 +0,0 @@
-/* Copyright (C) 2015 -  Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/* Generated by scripts/curry_gen.ml */
-external function_length: 'a => int = "#function_length"
-external apply_args: ('a => 'b, array<_>) => 'b = "#apply"
-
-let _ = Caml_array.sub /* make the build dependency on Caml_array explicit */
-%%private(let sub = Caml_array.sub)
-/* Public */
-let rec app = (f, args) => {
-  let init_arity = function_length(f)
-  let arity = if init_arity == 0 {
-    1
-  } else {
-    init_arity
-  } /* arity fixing */
-  let len = Caml_array_extern.length(args)
-  let d = arity - len
-  if d == 0 {
-    apply_args(f, args) /* f.apply (null,args) */
-  } else if d < 0 {
-    /* TODO: could avoid copy by tracking the index */
-    app(Obj.magic(apply_args(f, sub(args, 0, arity))), sub(args, arity, -d))
-  } else {
-    Obj.magic(x => app(f, Caml_array_extern.append(args, [x])))
-  }
-}
-
-/* Internal use */
-external apply1: ('a0 => 'a1, 'a0) => 'a1 = "#apply1"
-/* Internal use */
-external apply2: (('a0, 'a1) => 'a2, 'a0, 'a1) => 'a2 = "#apply2"
-/* Internal use */
-external apply3: (('a0, 'a1, 'a2) => 'a3, 'a0, 'a1, 'a2) => 'a3 = "#apply3"
-/* Internal use */
-external apply4: (('a0, 'a1, 'a2, 'a3) => 'a4, 'a0, 'a1, 'a2, 'a3) => 'a4 = "#apply4"
-/* Internal use */
-external apply5: (('a0, 'a1, 'a2, 'a3, 'a4) => 'a5, 'a0, 'a1, 'a2, 'a3, 'a4) => 'a5 = "#apply5"
-/* Internal use */
-external apply6: (('a0, 'a1, 'a2, 'a3, 'a4, 'a5) => 'a6, 'a0, 'a1, 'a2, 'a3, 'a4, 'a5) => 'a6 =
-  "#apply6"
-/* Internal use */
-external apply7: (
-  ('a0, 'a1, 'a2, 'a3, 'a4, 'a5, 'a6) => 'a7,
-  'a0,
-  'a1,
-  'a2,
-  'a3,
-  'a4,
-  'a5,
-  'a6,
-) => 'a7 = "#apply7"
-/* Internal use */
-external apply8: (
-  ('a0, 'a1, 'a2, 'a3, 'a4, 'a5, 'a6, 'a7) => 'a8,
-  'a0,
-  'a1,
-  'a2,
-  'a3,
-  'a4,
-  'a5,
-  'a6,
-  'a7,
-) => 'a8 = "#apply8"
-
-%%private(
-  let curry_1 = (o, a0, arity) =>
-    switch arity {
-    | 1 => apply1(Obj.magic(o), a0)
-    | 2 => apply2(Obj.magic(o), a0)
-    | 3 => apply3(Obj.magic(o), a0)
-    | 4 => apply4(Obj.magic(o), a0)
-    | 5 => apply5(Obj.magic(o), a0)
-    | 6 => apply6(Obj.magic(o), a0)
-    | 7 => apply7(Obj.magic(o), a0)
-    | _ => Obj.magic(app(o, [a0]))
-    }
-)
-
-/* Public */
-let _1 = (o, a0) => {
-  let arity = function_length(o)
-  if arity == 1 {
-    apply1(o, a0)
-  } else {
-    curry_1(o, a0, arity)
-  }
-}
-
-/* Public */
-let __1 = o => {
-  let arity = function_length(o)
-  if arity == 1 {
-    o
-  } else {
-    a0 => _1(o, a0)
-  }
-}
-
-%%private(
-  let curry_2 = (o, a0, a1, arity) =>
-    switch arity {
-    | 1 => app(apply1(Obj.magic(o), a0), [a1])
-    | 2 => apply2(Obj.magic(o), a0, a1)
-    | 3 => apply3(Obj.magic(o), a0, a1)
-    | 4 => apply4(Obj.magic(o), a0, a1)
-    | 5 => apply5(Obj.magic(o), a0, a1)
-    | 6 => apply6(Obj.magic(o), a0, a1)
-    | 7 => apply7(Obj.magic(o), a0, a1)
-    | _ => Obj.magic(app(o, [a0, a1]))
-    }
-)
-
-/* Public */
-let _2 = (o, a0, a1) => {
-  let arity = function_length(o)
-  if arity == 2 {
-    apply2(o, a0, a1)
-  } else {
-    curry_2(o, a0, a1, arity)
-  }
-}
-
-/* Public */
-let __2 = o => {
-  let arity = function_length(o)
-  if arity == 2 {
-    o
-  } else {
-    (a0, a1) => _2(o, a0, a1)
-  }
-}
-
-%%private(
-  let curry_3 = (o, a0, a1, a2, arity) =>
-    switch arity {
-    | 1 => app(apply1(Obj.magic(o), a0), [a1, a2])
-    | 2 => app(apply2(Obj.magic(o), a0, a1), [a2])
-    | 3 => apply3(Obj.magic(o), a0, a1, a2)
-    | 4 => apply4(Obj.magic(o), a0, a1, a2)
-    | 5 => apply5(Obj.magic(o), a0, a1, a2)
-    | 6 => apply6(Obj.magic(o), a0, a1, a2)
-    | 7 => apply7(Obj.magic(o), a0, a1, a2)
-    | _ => Obj.magic(app(o, [a0, a1, a2]))
-    }
-)
-
-/* Public */
-let _3 = (o, a0, a1, a2) => {
-  let arity = function_length(o)
-  if arity == 3 {
-    apply3(o, a0, a1, a2)
-  } else {
-    curry_3(o, a0, a1, a2, arity)
-  }
-}
-
-/* Public */
-let __3 = o => {
-  let arity = function_length(o)
-  if arity == 3 {
-    o
-  } else {
-    (a0, a1, a2) => _3(o, a0, a1, a2)
-  }
-}
-
-%%private(
-  let curry_4 = (o, a0, a1, a2, a3, arity) =>
-    switch arity {
-    | 1 => app(apply1(Obj.magic(o), a0), [a1, a2, a3])
-    | 2 => app(apply2(Obj.magic(o), a0, a1), [a2, a3])
-    | 3 => app(apply3(Obj.magic(o), a0, a1, a2), [a3])
-    | 4 => apply4(Obj.magic(o), a0, a1, a2, a3)
-    | 5 => apply5(Obj.magic(o), a0, a1, a2, a3)
-    | 6 => apply6(Obj.magic(o), a0, a1, a2, a3)
-    | 7 => apply7(Obj.magic(o), a0, a1, a2, a3)
-    | _ => Obj.magic(app(o, [a0, a1, a2, a3]))
-    }
-)
-
-/* Public */
-let _4 = (o, a0, a1, a2, a3) => {
-  let arity = function_length(o)
-  if arity == 4 {
-    apply4(o, a0, a1, a2, a3)
-  } else {
-    curry_4(o, a0, a1, a2, a3, arity)
-  }
-}
-
-/* Public */
-let __4 = o => {
-  let arity = function_length(o)
-  if arity == 4 {
-    o
-  } else {
-    (a0, a1, a2, a3) => _4(o, a0, a1, a2, a3)
-  }
-}
-
-%%private(
-  let curry_5 = (o, a0, a1, a2, a3, a4, arity) =>
-    switch arity {
-    | 1 => app(apply1(Obj.magic(o), a0), [a1, a2, a3, a4])
-    | 2 => app(apply2(Obj.magic(o), a0, a1), [a2, a3, a4])
-    | 3 => app(apply3(Obj.magic(o), a0, a1, a2), [a3, a4])
-    | 4 => app(apply4(Obj.magic(o), a0, a1, a2, a3), [a4])
-    | 5 => apply5(Obj.magic(o), a0, a1, a2, a3, a4)
-    | 6 => apply6(Obj.magic(o), a0, a1, a2, a3, a4)
-    | 7 => apply7(Obj.magic(o), a0, a1, a2, a3, a4)
-    | _ => Obj.magic(app(o, [a0, a1, a2, a3, a4]))
-    }
-)
-
-/* Public */
-let _5 = (o, a0, a1, a2, a3, a4) => {
-  let arity = function_length(o)
-  if arity == 5 {
-    apply5(o, a0, a1, a2, a3, a4)
-  } else {
-    curry_5(o, a0, a1, a2, a3, a4, arity)
-  }
-}
-
-/* Public */
-let __5 = o => {
-  let arity = function_length(o)
-  if arity == 5 {
-    o
-  } else {
-    (a0, a1, a2, a3, a4) => _5(o, a0, a1, a2, a3, a4)
-  }
-}
-
-%%private(
-  let curry_6 = (o, a0, a1, a2, a3, a4, a5, arity) =>
-    switch arity {
-    | 1 => app(apply1(Obj.magic(o), a0), [a1, a2, a3, a4, a5])
-    | 2 => app(apply2(Obj.magic(o), a0, a1), [a2, a3, a4, a5])
-    | 3 => app(apply3(Obj.magic(o), a0, a1, a2), [a3, a4, a5])
-    | 4 => app(apply4(Obj.magic(o), a0, a1, a2, a3), [a4, a5])
-    | 5 => app(apply5(Obj.magic(o), a0, a1, a2, a3, a4), [a5])
-    | 6 => apply6(Obj.magic(o), a0, a1, a2, a3, a4, a5)
-    | 7 => apply7(Obj.magic(o), a0, a1, a2, a3, a4, a5)
-    | _ => Obj.magic(app(o, [a0, a1, a2, a3, a4, a5]))
-    }
-)
-
-/* Public */
-let _6 = (o, a0, a1, a2, a3, a4, a5) => {
-  let arity = function_length(o)
-  if arity == 6 {
-    apply6(o, a0, a1, a2, a3, a4, a5)
-  } else {
-    curry_6(o, a0, a1, a2, a3, a4, a5, arity)
-  }
-}
-
-/* Public */
-let __6 = o => {
-  let arity = function_length(o)
-  if arity == 6 {
-    o
-  } else {
-    (a0, a1, a2, a3, a4, a5) => _6(o, a0, a1, a2, a3, a4, a5)
-  }
-}
-
-%%private(
-  let curry_7 = (o, a0, a1, a2, a3, a4, a5, a6, arity) =>
-    switch arity {
-    | 1 => app(apply1(Obj.magic(o), a0), [a1, a2, a3, a4, a5, a6])
-    | 2 => app(apply2(Obj.magic(o), a0, a1), [a2, a3, a4, a5, a6])
-    | 3 => app(apply3(Obj.magic(o), a0, a1, a2), [a3, a4, a5, a6])
-    | 4 => app(apply4(Obj.magic(o), a0, a1, a2, a3), [a4, a5, a6])
-    | 5 => app(apply5(Obj.magic(o), a0, a1, a2, a3, a4), [a5, a6])
-    | 6 => app(apply6(Obj.magic(o), a0, a1, a2, a3, a4, a5), [a6])
-    | 7 => apply7(Obj.magic(o), a0, a1, a2, a3, a4, a5, a6)
-    | _ => Obj.magic(app(o, [a0, a1, a2, a3, a4, a5, a6]))
-    }
-)
-
-/* Public */
-let _7 = (o, a0, a1, a2, a3, a4, a5, a6) => {
-  let arity = function_length(o)
-  if arity == 7 {
-    apply7(o, a0, a1, a2, a3, a4, a5, a6)
-  } else {
-    curry_7(o, a0, a1, a2, a3, a4, a5, a6, arity)
-  }
-}
-
-/* Public */
-let __7 = o => {
-  let arity = function_length(o)
-  if arity == 7 {
-    o
-  } else {
-    (a0, a1, a2, a3, a4, a5, a6) => _7(o, a0, a1, a2, a3, a4, a5, a6)
-  }
-}
-
-%%private(
-  let curry_8 = (o, a0, a1, a2, a3, a4, a5, a6, a7, arity) =>
-    switch arity {
-    | 1 => app(apply1(Obj.magic(o), a0), [a1, a2, a3, a4, a5, a6, a7])
-    | 2 => app(apply2(Obj.magic(o), a0, a1), [a2, a3, a4, a5, a6, a7])
-    | 3 => app(apply3(Obj.magic(o), a0, a1, a2), [a3, a4, a5, a6, a7])
-    | 4 => app(apply4(Obj.magic(o), a0, a1, a2, a3), [a4, a5, a6, a7])
-    | 5 => app(apply5(Obj.magic(o), a0, a1, a2, a3, a4), [a5, a6, a7])
-    | 6 => app(apply6(Obj.magic(o), a0, a1, a2, a3, a4, a5), [a6, a7])
-    | 7 => app(apply7(Obj.magic(o), a0, a1, a2, a3, a4, a5, a6), [a7])
-    | _ => Obj.magic(app(o, [a0, a1, a2, a3, a4, a5, a6, a7]))
-    }
-)
-
-/* Public */
-let _8 = (o, a0, a1, a2, a3, a4, a5, a6, a7) => {
-  let arity = function_length(o)
-  if arity == 8 {
-    apply8(o, a0, a1, a2, a3, a4, a5, a6, a7)
-  } else {
-    curry_8(o, a0, a1, a2, a3, a4, a5, a6, a7, arity)
-  }
-}
-
-/* Public */
-let __8 = o => {
-  let arity = function_length(o)
-  if arity == 8 {
-    o
-  } else {
-    (a0, a1, a2, a3, a4, a5, a6, a7) => _8(o, a0, a1, a2, a3, a4, a5, a6, a7)
-  }
-}
diff --git a/jscomp/runtime/js.ml b/jscomp/runtime/js.ml
deleted file mode 100644
index c018005..0000000
--- a/jscomp/runtime/js.ml
+++ /dev/null
@@ -1,260 +0,0 @@
-(* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. *)
-
-[@@@bs.config {flags = [|"-unboxed-types";"-w" ;"-49"|]}]
-(* DESIGN:
-   - It does not have any code, all its code will be inlined so that
-       there will never be
-   {[ require('js')]}
-   - Its interface should be minimal
-*)
-
-(** This library provides bindings and necessary support for JS FFI.
-    It contains all bindings into [Js] namespace.
-
-    @example {[
-      [| 1;2;3;4|]
-      |. Js.Array2.map (fun x -> x + 1 )
-      |. Js.Array2.reduce (+) 0
-      |. Js.log
-    ]}
-*)
-
-(**/**)
-(** Types for JS objects *)
-type 'a t = < .. > as 'a
-
-module MapperRt = Js_mapperRt
-module Internal = struct 
-  external opaqueFullApply : 'a -> 'a = "%uncurried_apply"
-
-  (* Use opaque instead of [._n] to prevent some optimizations happening *)
-  external run : (unit -> 'a [@bs]) -> 'a = "#run"
-  external opaque : 'a -> 'a = "%opaque"
-
-end    
-(**/**)
-
-
-type + 'a null =
-  | Value of 'a
-  | Null [@as null]
-[@@unboxed]
-(** nullable, value of this type can be either [null] or ['a]
-    this type is the same as type [t] in {!Null}
-*)
-
-type + 'a undefined
-(** value of this type can be either [undefined] or ['a]
-    this type is the same as type [t] in {!Undefined}  *)
-
-type + 'a nullable =
-  | Value of 'a
-  | Null [@as null]
-  | Undefined [@as undefined]
-[@@unboxed]
-(** value of this type can be [undefined], [null] or ['a]
-    this type is the same as type [t] n {!Null_undefined} *)
-
-type + 'a null_undefined = 'a nullable
-
-external toOption : 'a nullable  -> 'a option = "#nullable_to_opt"
-external undefinedToOption : 'a undefined -> 'a option = "#undefined_to_opt"
-external nullToOption : 'a null -> 'a option = "#null_to_opt"
-
-external isNullable : 'a nullable -> bool = "#is_nullable"
-
-external import : 'a -> 'a promise = "#import"
-
-(** The same as {!test} except that it is more permissive on the types of input *)
-external testAny : 'a -> bool = "#is_nullable"
-
-
-type (+'a, +'e) promise
-(** The promise type, defined here for interoperation across packages
-    @deprecated please use {!Js.Promise}
-*)
-
-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 typeof : 'a -> string = "#typeof"
-(** [typeof x] will be compiled as [typeof x] in JS
-    Please consider functions in {!Types} for a type safe way of reflection
-*)
-
-external log : 'a -> unit = "log"
-[@@val] [@@scope "console"]
-(** A convenience function to log everything *)
-
-external log2 : 'a -> 'b -> unit = "log"
-[@@bs.val] [@@bs.scope "console"]
-external log3 : 'a -> 'b -> 'c -> unit = "log"
-[@@bs.val] [@@bs.scope "console"]
-external log4 : 'a -> 'b -> 'c -> 'd -> unit = "log"
-[@@bs.val] [@@bs.scope "console"]
-
-external logMany : 'a array -> unit = "log"
-[@@bs.val] [@@bs.scope "console"] [@@bs.splice]
-(** A convenience function to log more than 4 arguments *)
-
-external eqNull : 'a -> 'a null -> bool = "%bs_equal_null"
-external eqUndefined : 'a -> 'a undefined -> bool = "%bs_equal_undefined"
-external eqNullable : 'a -> 'a nullable -> bool = "%bs_equal_nullable"
-
-(** {4 operators }*)
-
-external unsafe_lt : 'a -> 'a -> bool = "#unsafe_lt"
-(** [unsafe_lt a b] will be compiled as [a < b].
-    It is marked as unsafe, since it is impossible
-    to give a proper semantics for comparision which applies to any type
-*)
-
-
-external unsafe_le : 'a -> 'a -> bool = "#unsafe_le"
-(**  [unsafe_le a b] will be compiled as [a <= b].
-     See also {!unsafe_lt}
-*)
-
-
-external unsafe_gt : 'a -> 'a -> bool = "#unsafe_gt"
-(**  [unsafe_gt a b] will be compiled as [a > b].
-     See also {!unsafe_lt}
-*)
-
-external unsafe_ge : 'a -> 'a -> bool = "#unsafe_ge"
-(**  [unsafe_ge a b] will be compiled as [a >= b].
-     See also {!unsafe_lt}
-*)
-
-
-(** {12 nested modules}*)
-
-module Null = Js_null
-(** Provide utilities around ['a null] *)
-
-module Undefined = Js_undefined
-(** Provide utilities around {!undefined} *)
-
-module Nullable = Js_null_undefined
-(** Provide utilities around {!null_undefined} *)
-
-module Null_undefined = Js_null_undefined
-(** @deprecated please use {!Js.Nullable} *)
-
-module Exn = Js_exn
-(** Provide utilities for dealing with Js exceptions *)
-
-module Array = Js_array
-(** Provide bindings to Js array*)
-
-module Array2 = Js_array2
-(** Provide bindings to Js array*)
-
-module String = Js_string
-(** Provide bindings to JS string *)
-
-module String2 = Js_string2
-(** Provide bindings to JS string *)
-
-module Re = Js_re
-(** Provide bindings to Js regex expression *)
-
-module Promise = Js_promise
-(** Provide bindings to JS promise *)
-
-module Promise2 = Js_promise2
-(** Provide bindings to JS promise *)
-
-module Date = Js_date
-(** Provide bindings for JS Date *)
-
-module Dict = Js_dict
-(** Provide utilities for JS dictionary object *)
-
-module Global = Js_global
-(** Provide bindings to JS global functions in global namespace*)
-
-module Json = Js_json
-(** Provide utilities for json *)
-
-module Math = Js_math
-(** Provide bindings for JS [Math] object *)
-
-module Obj  = Js_obj
-(** Provide utilities for {!Js.t} *)
-
-module Typed_array = Js_typed_array
-(** Provide bindings for JS typed array *)
-
-module TypedArray2 = Js_typed_array2
-(** Provide bindings for JS typed array *)
-
-module Types = Js_types
-(** Provide utilities for manipulating JS types  *)
-
-module Float = Js_float
-(** Provide utilities for JS float *)
-
-module Int = Js_int
-(** Provide utilities for int *)
-
-module BigInt = Js_bigint
-(** Provide utilities for bigint *)
-
-module File = Js_file
-(** Provide utilities for File *)
-
-module Blob = Js_blob
-(** Provide utilities for Blob *)
-
-module Option = Js_option
-(** Provide utilities for option *)
-
-module Result = Js_result
-(** Define the interface for result *)
-
-module List = Js_list
-(** Provide utilities for list *)
-
-module Vector = Js_vector
-
-module Console = Js_console
-
-module Set = Js_set
-(** Provides bindings for ES6 Set *)
-
-module WeakSet = Js_weakset
-(** Provides bindings for ES6 WeakSet *)
-
-module Map = Js_map
-(** Provides bindings for ES6 Map *)
-
-module WeakMap = Js_weakmap
-(** Provides bindings for ES6 WeakMap *)
diff --git a/jscomp/runtime/release.ninja b/jscomp/runtime/release.ninja
deleted file mode 100644
index d21ca55..0000000
--- a/jscomp/runtime/release.ninja
+++ /dev/null
@@ -1,66 +0,0 @@
-
-bsc_no_open_flags =  -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -make-runtime  -nopervasives  -unsafe -w +50 -warn-error A
-bsc_flags = $bsc_no_open_flags -open Bs_stdlib_mini
-
-rule cc
-    command = $bsc -bs-cmi -bs-cmj $bsc_flags   -I runtime  $in
-    description = $in -> $out
-rule cc_cmi
-    command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags  -I runtime  $in
-    description = $in -> $out    
-
-o runtime/bs_stdlib_mini.cmi : cc runtime/bs_stdlib_mini.resi
-    bsc_flags = -nostdlib -nopervasives
-o runtime/js.cmj runtime/js.cmi : cc runtime/js.ml
-    bsc_flags = $bsc_no_open_flags
-o runtime/caml.cmj : cc_cmi runtime/caml.res | runtime/caml.cmi runtime/caml_int64_extern.cmj
-o runtime/caml.cmi : cc runtime/caml.resi | runtime/bs_stdlib_mini.cmi runtime/caml_int64_extern.cmj runtime/js.cmi runtime/js.cmj
-o runtime/caml_array.cmj : cc_cmi runtime/caml_array.res | runtime/caml_array.cmi runtime/caml_array_extern.cmj
-o runtime/caml_array.cmi : cc runtime/caml_array.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_bigint.cmj : cc_cmi runtime/caml_bigint.res | runtime/caml_bigint.cmi runtime/caml_bigint_extern.cmj
-o runtime/caml_bigint.cmi : cc runtime/caml_bigint.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_bytes.cmj : cc_cmi runtime/caml_bytes.res | runtime/caml_bytes.cmi
-o runtime/caml_bytes.cmi : cc runtime/caml_bytes.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_exceptions.cmj : cc_cmi runtime/caml_exceptions.res | runtime/caml_exceptions.cmi runtime/js.cmj
-o runtime/caml_exceptions.cmi : cc runtime/caml_exceptions.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_float.cmj : cc_cmi runtime/caml_float.res | runtime/caml_float.cmi runtime/caml_float_extern.cmj
-o runtime/caml_float.cmi : cc runtime/caml_float.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_format.cmj : cc_cmi runtime/caml_format.ml | runtime/caml.cmj runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_format.cmi runtime/caml_int64.cmj runtime/caml_int64_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj
-o runtime/caml_format.cmi : cc runtime/caml_format.mli | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_hash.cmj : cc_cmi runtime/caml_hash.res | runtime/caml_hash.cmi runtime/caml_hash_primitive.cmj runtime/caml_nativeint_extern.cmj runtime/js.cmj
-o runtime/caml_hash.cmi : cc runtime/caml_hash.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_hash_primitive.cmj : cc_cmi runtime/caml_hash_primitive.res | runtime/caml_hash_primitive.cmi runtime/caml_string_extern.cmj
-o runtime/caml_hash_primitive.cmi : cc runtime/caml_hash_primitive.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_int32.cmj : cc_cmi runtime/caml_int32.res | runtime/caml_int32.cmi runtime/caml_nativeint_extern.cmj
-o runtime/caml_int32.cmi : cc runtime/caml_int32.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_int64.cmj : cc_cmi runtime/caml_int64.res | runtime/caml.cmj runtime/caml_float.cmj runtime/caml_float_extern.cmj runtime/caml_int64.cmi runtime/caml_int64_extern.cmj runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmj runtime/js.cmj
-o runtime/caml_int64.cmi : cc runtime/caml_int64.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_lexer.cmj : cc_cmi runtime/caml_lexer.res | runtime/caml_lexer.cmi
-o runtime/caml_lexer.cmi : cc runtime/caml_lexer.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_md5.cmj : cc_cmi runtime/caml_md5.res | runtime/caml_array_extern.cmj runtime/caml_md5.cmi runtime/caml_string_extern.cmj
-o runtime/caml_md5.cmi : cc runtime/caml_md5.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_module.cmj : cc_cmi runtime/caml_module.res | runtime/caml_array_extern.cmj runtime/caml_module.cmi runtime/caml_obj.cmj
-o runtime/caml_module.cmi : cc runtime/caml_module.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_obj.cmj : cc_cmi runtime/caml_obj.res | runtime/caml.cmj runtime/caml_array_extern.cmj runtime/caml_obj.cmi runtime/caml_option.cmj runtime/js.cmj
-o runtime/caml_obj.cmi : cc runtime/caml_obj.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_option.cmj : cc_cmi runtime/caml_option.res | runtime/caml_option.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
-o runtime/caml_option.cmi : cc runtime/caml_option.resi | runtime/bs_stdlib_mini.cmi runtime/caml_undefined_extern.cmj runtime/js.cmi runtime/js.cmj
-o runtime/caml_parser.cmj : cc_cmi runtime/caml_parser.res | runtime/caml_parser.cmi
-o runtime/caml_parser.cmi : cc runtime/caml_parser.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_splice_call.cmj : cc_cmi runtime/caml_splice_call.res | runtime/caml_splice_call.cmi
-o runtime/caml_splice_call.cmi : cc runtime/caml_splice_call.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_string.cmj : cc_cmi runtime/caml_string.res | runtime/caml_string.cmi runtime/caml_string_extern.cmj
-o runtime/caml_string.cmi : cc runtime/caml_string.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_sys.cmj : cc_cmi runtime/caml_sys.res | runtime/caml_array_extern.cmj runtime/caml_sys.cmi runtime/caml_undefined_extern.cmj runtime/js.cmj
-o runtime/caml_sys.cmi : cc runtime/caml_sys.resi | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj : cc runtime/caml_array_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_bigint_extern.cmi runtime/caml_bigint_extern.cmj : cc runtime/caml_bigint_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj : cc runtime/caml_external_polyfill.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj : cc runtime/caml_float_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj : cc runtime/caml_int64_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj : cc runtime/caml_js_exceptions.res | runtime/bs_stdlib_mini.cmi runtime/caml_exceptions.cmj runtime/caml_option.cmj runtime/js.cmi runtime/js.cmj
-o runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj : cc runtime/caml_nativeint_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj : cc runtime/caml_string_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj : cc runtime/caml_undefined_extern.res | runtime/bs_stdlib_mini.cmi runtime/js.cmi runtime/js.cmj
-o runtime/curry.cmi runtime/curry.cmj : cc runtime/curry.res | runtime/bs_stdlib_mini.cmi runtime/caml_array.cmj runtime/caml_array_extern.cmj runtime/js.cmi runtime/js.cmj
-o runtime : phony runtime/bs_stdlib_mini.cmi runtime/js.cmj runtime/js.cmi runtime/caml.cmi runtime/caml.cmj runtime/caml_array.cmi runtime/caml_array.cmj runtime/caml_bigint.cmi runtime/caml_bigint.cmj runtime/caml_bytes.cmi runtime/caml_bytes.cmj runtime/caml_exceptions.cmi runtime/caml_exceptions.cmj runtime/caml_float.cmi runtime/caml_float.cmj runtime/caml_format.cmi runtime/caml_format.cmj runtime/caml_hash.cmi runtime/caml_hash.cmj runtime/caml_hash_primitive.cmi runtime/caml_hash_primitive.cmj runtime/caml_int32.cmi runtime/caml_int32.cmj runtime/caml_int64.cmi runtime/caml_int64.cmj runtime/caml_lexer.cmi runtime/caml_lexer.cmj runtime/caml_md5.cmi runtime/caml_md5.cmj runtime/caml_module.cmi runtime/caml_module.cmj runtime/caml_obj.cmi runtime/caml_obj.cmj runtime/caml_option.cmi runtime/caml_option.cmj runtime/caml_parser.cmi runtime/caml_parser.cmj runtime/caml_splice_call.cmi runtime/caml_splice_call.cmj runtime/caml_string.cmi runtime/caml_string.cmj runtime/caml_sys.cmi runtime/caml_sys.cmj runtime/caml_array_extern.cmi runtime/caml_array_extern.cmj runtime/caml_bigint_extern.cmi runtime/caml_bigint_extern.cmj runtime/caml_external_polyfill.cmi runtime/caml_external_polyfill.cmj runtime/caml_float_extern.cmi runtime/caml_float_extern.cmj runtime/caml_int64_extern.cmi runtime/caml_int64_extern.cmj runtime/caml_js_exceptions.cmi runtime/caml_js_exceptions.cmj runtime/caml_nativeint_extern.cmi runtime/caml_nativeint_extern.cmj runtime/caml_string_extern.cmi runtime/caml_string_extern.cmj runtime/caml_undefined_extern.cmi runtime/caml_undefined_extern.cmj runtime/curry.cmi runtime/curry.cmj
diff --git a/jscomp/stdlib-406/arg.res b/jscomp/stdlib-406/arg.res
deleted file mode 100644
index 7dadf08..0000000
--- a/jscomp/stdlib-406/arg.res
+++ /dev/null
@@ -1,427 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Damien Doligez, projet Para, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-type key = string
-type doc = string
-type usage_msg = string
-type anon_fun = string => unit
-
-type rec spec =
-  | Unit(unit => unit) /* Call the function with unit argument */
-  | Bool(bool => unit) /* Call the function with a bool argument */
-  | Set(ref<bool>) /* Set the reference to true */
-  | Clear(ref<bool>) /* Set the reference to false */
-  | String(string => unit) /* Call the function with a string argument */
-  | Set_string(ref<string>) /* Set the reference to the string argument */
-  | Int(int => unit) /* Call the function with an int argument */
-  | Set_int(ref<int>) /* Set the reference to the int argument */
-  | Float(float => unit) /* Call the function with a float argument */
-  | Set_float(ref<float>) /* Set the reference to the float argument */
-  | Tuple(list<spec>) /* Take several arguments according to the
-   spec list */
-
-  | Symbol(list<string>, string => unit)
-  /* Take one of the symbols as argument and
-   call the function with the symbol. */
-  | Rest(string => unit) /* Stop interpreting keywords and call the
-   function with each remaining argument */
-
-  | Expand(
-      string => array<string>,
-    ) /* If the remaining arguments to process
-        are of the form
-        [["-foo"; "arg"] @ rest] where "foo" is
-        registered as [Expand f], then the
-        arguments [f "arg" @ rest] are
-        processed. Only allowed in
-        [parse_and_expand_argv_dynamic]. */
-
-exception Bad(string)
-exception Help(string)
-
-type error =
-  | Unknown(string)
-  | Wrong(string, string, string) /* option, actual, expected */
-  | Missing(string)
-  | Message(string)
-
-exception Stop(error) /* used internally */
-
-let rec assoc3 = (x, l) =>
-  switch l {
-  | list{} => raise(Not_found)
-  | list{(y1, y2, _), ..._} if y1 == x => y2
-  | list{_, ...t} => assoc3(x, t)
-  }
-
-let split = s => {
-  let i = String.index(s, '=')
-  let len = String.length(s)
-  (String.sub(s, 0, i), String.sub(s, i + 1, len - (i + 1)))
-}
-
-let make_symlist = (prefix, sep, suffix, l) =>
-  switch l {
-  | list{} => "<none>"
-  | list{h, ...t} => List.fold_left((x, y) => x ++ (sep ++ y), prefix ++ h, t) ++ suffix
-  }
-
-let print_spec = (buf, (key, spec, doc)) =>
-  if String.length(doc) > 0 {
-    switch spec {
-    | Symbol(l, _) =>
-      let sym = make_symlist("{", "|", "}", l)
-      Buffer.add_string(buf, `  ${key} ${sym}${doc}\n`)
-    | _ => Buffer.add_string(buf, `  ${key} ${doc}\n`)
-    }
-  }
-
-let help_action = () => raise(Stop(Unknown("-help")))
-
-let add_help = speclist => {
-  let add1 = try {
-    ignore(assoc3("-help", speclist))
-    list{}
-  } catch {
-  | Not_found => list{("-help", Unit(help_action), " Display this list of options")}
-  }
-  and add2 = try {
-    ignore(assoc3("--help", speclist))
-    list{}
-  } catch {
-  | Not_found => list{("--help", Unit(help_action), " Display this list of options")}
-  }
-
-  \"@"(speclist, \"@"(add1, add2))
-}
-
-let usage_b = (buf, speclist, errmsg) => {
-  Buffer.add_string(buf, `${errmsg}\n`)
-  List.iter(print_spec(buf), add_help(speclist))
-}
-
-let usage_string = (speclist, errmsg) => {
-  let b = Buffer.create(200)
-  usage_b(b, speclist, errmsg)
-  Buffer.contents(b)
-}
-
-let usage = (speclist, errmsg) => Js.log(usage_string(speclist, errmsg))
-
-let current = ref(0)
-
-let bool_of_string_opt = x =>
-  try Some(bool_of_string(x)) catch {
-  | Invalid_argument(_) => None
-  }
-
-let int_of_string_opt = x =>
-  try Some(int_of_string(x)) catch {
-  | Failure(_) => None
-  }
-
-let float_of_string_opt = x =>
-  try Some(float_of_string(x)) catch {
-  | Failure(_) => None
-  }
-
-let parse_and_expand_argv_dynamic_aux = (
-  allow_expand,
-  current,
-  argv,
-  speclist,
-  anonfun,
-  errmsg,
-) => {
-  let initpos = current.contents
-  let convert_error = error => {
-    /* convert an internal error to a Bad/Help exception
-       *or* add the program name as a prefix and the usage message as a suffix
-       to an user-raised Bad exception.
- */
-    let b = Buffer.create(200)
-    let progname = if initpos < Array.length(argv.contents) {
-      argv.contents[initpos]
-    } else {
-      "(?)"
-    }
-    switch error {
-    | Unknown("-help") => ()
-    | Unknown("--help") => ()
-    | Unknown(s) => Buffer.add_string(b, `${progname}: unknown option '${s}'.\n`)
-    | Missing(s) => Buffer.add_string(b, `${progname}: option '${s}' needs an argument.\n`)
-    | Wrong(opt, arg, expected) =>
-      Buffer.add_string(
-        b,
-        `${progname}: wrong argument '${arg}'; option '${opt}' expects ${expected}.\n`,
-      )
-    | Message(s) =>
-      /* user error message */
-      Buffer.add_string(b, `${progname}: ${s}.\n`)
-    }
-    usage_b(b, speclist.contents, errmsg)
-    if error == Unknown("-help") || error == Unknown("--help") {
-      Help(Buffer.contents(b))
-    } else {
-      Bad(Buffer.contents(b))
-    }
-  }
-
-  incr(current)
-  while current.contents < Array.length(argv.contents) {
-    try {
-      let s = argv.contents[current.contents]
-      if String.length(s) >= 1 && String.get(s, 0) == '-' {
-        let (action, follow) = try (assoc3(s, speclist.contents), None) catch {
-        | Not_found =>
-          try {
-            let (keyword, arg) = split(s)
-            (assoc3(keyword, speclist.contents), Some(arg))
-          } catch {
-          | Not_found => raise(Stop(Unknown(s)))
-          }
-        }
-
-        let no_arg = () =>
-          switch follow {
-          | None => ()
-          | Some(arg) => raise(Stop(Wrong(s, arg, "no argument")))
-          }
-        let get_arg = () =>
-          switch follow {
-          | None =>
-            if current.contents + 1 < Array.length(argv.contents) {
-              argv.contents[current.contents + 1]
-            } else {
-              raise(Stop(Missing(s)))
-            }
-          | Some(arg) => arg
-          }
-
-        let consume_arg = () =>
-          switch follow {
-          | None => incr(current)
-          | Some(_) => ()
-          }
-
-        let rec treat_action = f =>
-          switch f {
-          | Unit(f) => f()
-          | Bool(f) =>
-            let arg = get_arg()
-            switch bool_of_string_opt(arg) {
-            | None => raise(Stop(Wrong(s, arg, "a boolean")))
-            | Some(s) => f(s)
-            }
-            consume_arg()
-          | Set(r) =>
-            no_arg()
-            r := true
-          | Clear(r) =>
-            no_arg()
-            r := false
-          | String(f) =>
-            let arg = get_arg()
-            f(arg)
-            consume_arg()
-          | Symbol(symb, f) =>
-            let arg = get_arg()
-            if List.mem(arg, symb) {
-              f(arg)
-              consume_arg()
-            } else {
-              raise(Stop(Wrong(s, arg, "one of: " ++ make_symlist("", " ", "", symb))))
-            }
-          | Set_string(r) =>
-            r := get_arg()
-            consume_arg()
-          | Int(f) =>
-            let arg = get_arg()
-            switch int_of_string_opt(arg) {
-            | None => raise(Stop(Wrong(s, arg, "an integer")))
-            | Some(x) => f(x)
-            }
-            consume_arg()
-          | Set_int(r) =>
-            let arg = get_arg()
-            switch int_of_string_opt(arg) {
-            | None => raise(Stop(Wrong(s, arg, "an integer")))
-            | Some(x) => r := x
-            }
-            consume_arg()
-          | Float(f) =>
-            let arg = get_arg()
-            switch float_of_string_opt(arg) {
-            | None => raise(Stop(Wrong(s, arg, "a float")))
-            | Some(x) => f(x)
-            }
-            consume_arg()
-          | Set_float(r) =>
-            let arg = get_arg()
-            switch float_of_string_opt(arg) {
-            | None => raise(Stop(Wrong(s, arg, "a float")))
-            | Some(x) => r := x
-            }
-            consume_arg()
-          | Tuple(specs) => List.iter(treat_action, specs)
-          | Rest(f) =>
-            while current.contents < Array.length(argv.contents) - 1 {
-              f(argv.contents[current.contents + 1])
-              consume_arg()
-            }
-          | Expand(f) =>
-            if !allow_expand {
-              raise(
-                Invalid_argument(
-                  "Arg.Expand is is only allowed with Arg.parse_and_expand_argv_dynamic",
-                ),
-              )
-            }
-            let arg = get_arg()
-            let newarg = f(arg)
-            consume_arg()
-            let before = Array.sub(argv.contents, 0, current.contents + 1)
-            and after = Array.sub(
-              argv.contents,
-              current.contents + 1,
-              Array.length(argv.contents) - current.contents - 1,
-            )
-            argv := Array.concat(list{before, newarg, after})
-          }
-
-        treat_action(action)
-      } else {
-        anonfun(s)
-      }
-    } catch {
-    | Bad(m) => raise(convert_error(Message(m)))
-    | Stop(e) => raise(convert_error(e))
-    }
-    incr(current)
-  }
-}
-
-let parse_and_expand_argv_dynamic = (current, argv, speclist, anonfun, errmsg) =>
-  parse_and_expand_argv_dynamic_aux(true, current, argv, speclist, anonfun, errmsg)
-
-let parse_argv_dynamic = (~current=current, argv, speclist, anonfun, errmsg) =>
-  parse_and_expand_argv_dynamic_aux(false, current, ref(argv), speclist, anonfun, errmsg)
-
-let parse_argv = (~current=current, argv, speclist, anonfun, errmsg) =>
-  parse_argv_dynamic(~current, argv, ref(speclist), anonfun, errmsg)
-
-let parse = (l, f, msg) =>
-  try parse_argv(Sys.argv, l, f, msg) catch {
-  | Bad(msg) =>
-    Js.log(msg)
-    exit(2)
-  | Help(msg) =>
-    Js.log(msg)
-    exit(0)
-  }
-
-let parse_dynamic = (l, f, msg) =>
-  try parse_argv_dynamic(Sys.argv, l, f, msg) catch {
-  | Bad(msg) =>
-    Js.log(msg)
-    exit(2)
-  | Help(msg) =>
-    Js.log(msg)
-    exit(0)
-  }
-
-let parse_expand = (l, f, msg) =>
-  try {
-    let argv = ref(Sys.argv)
-    let spec = ref(l)
-    let current = ref(current.contents)
-    parse_and_expand_argv_dynamic(current, argv, spec, f, msg)
-  } catch {
-  | Bad(msg) =>
-    Js.log(msg)
-    exit(2)
-  | Help(msg) =>
-    Js.log(msg)
-    exit(0)
-  }
-
-let second_word = s => {
-  let len = String.length(s)
-  let rec loop = n =>
-    if n >= len {
-      len
-    } else if String.get(s, n) == ' ' {
-      loop(n + 1)
-    } else {
-      n
-    }
-
-  switch String.index(s, '\t') {
-  | n => loop(n + 1)
-  | exception Not_found =>
-    switch String.index(s, ' ') {
-    | n => loop(n + 1)
-    | exception Not_found => len
-    }
-  }
-}
-
-let max_arg_len = (cur, (kwd, spec, doc)) =>
-  switch spec {
-  | Symbol(_) => max(cur, String.length(kwd))
-  | _ => max(cur, String.length(kwd) + second_word(doc))
-  }
-
-let replace_leading_tab = s => {
-  let seen = ref(false)
-  String.map(c =>
-    switch c {
-    | '\t' if !seen.contents =>
-      seen := true
-      ' '
-    | c => c
-    }
-  , s)
-}
-
-let add_padding = (len, ksd) =>
-  switch ksd {
-  | (_, _, "") => /* Do not pad undocumented options, so that they still don't show up when
-     * run through [usage] or [parse]. */
-    ksd
-  | (kwd, Symbol(_) as spec, msg) =>
-    let cutcol = second_word(msg)
-    let spaces = String.make(max(0, len - cutcol) + 3, ' ')
-    (kwd, spec, "\n" ++ (spaces ++ replace_leading_tab(msg)))
-  | (kwd, spec, msg) =>
-    let cutcol = second_word(msg)
-    let kwd_len = String.length(kwd)
-    let diff = len - kwd_len - cutcol
-    if diff <= 0 {
-      (kwd, spec, replace_leading_tab(msg))
-    } else {
-      let spaces = String.make(diff, ' ')
-      let prefix = String.sub(replace_leading_tab(msg), 0, cutcol)
-      let suffix = String.sub(msg, cutcol, String.length(msg) - cutcol)
-      (kwd, spec, prefix ++ (spaces ++ suffix))
-    }
-  }
-
-let align = (~limit=max_int, speclist) => {
-  let completed = add_help(speclist)
-  let len = List.fold_left(max_arg_len, 0, completed)
-  let len = min(len, limit)
-  List.map(add_padding(len), completed)
-}
diff --git a/jscomp/stdlib-406/arg.resi b/jscomp/stdlib-406/arg.resi
deleted file mode 100644
index e5b6916..0000000
--- a/jscomp/stdlib-406/arg.resi
+++ /dev/null
@@ -1,186 +0,0 @@
-/*** Parsing of command line arguments.
-
-   This module provides a general mechanism for extracting options and
-   arguments from the command line to the program.
-
-   Syntax of command lines:
-    A keyword is a character string starting with a [-].
-    An option is a keyword alone or followed by an argument.
-    The types of keywords are: [Unit], [Bool], [Set], [Clear],
-    [String], [Set_string], [Int], [Set_int], [Float], [Set_float],
-    [Tuple], [Symbol], and [Rest].
-    [Unit], [Set] and [Clear] keywords take no argument. A [Rest]
-    keyword takes the remaining of the command line as arguments.
-    Every other keyword takes the following word on the command line
-    as argument.  For compatibility with GNU getopt_long, [keyword=arg]
-    is also allowed.
-    Arguments not preceded by a keyword are called anonymous arguments.
-
-   Examples ([cmd] is assumed to be the command name):
--   [cmd -flag           ](a unit option)
--   [cmd -int 1          ](an int option with argument [1])
--   [cmd -string foobar  ](a string option with argument ["foobar"])
--   [cmd -float 12.34    ](a float option with argument [12.34])
--   [cmd a b c           ](three anonymous arguments: ["a"], ["b"], and ["c"])
--   [cmd a b -- c d      ](two anonymous arguments and a rest option with
-                           two arguments)
-*/
-
-/** The concrete type describing the behavior associated
-   with a keyword. */
-type rec spec =
-  | /** Call the function with unit argument */ Unit(unit => unit)
-  | /** Call the function with a bool argument */ Bool(bool => unit)
-  | /** Set the reference to true */ Set(ref<bool>)
-  | /** Set the reference to false */ Clear(ref<bool>)
-  | /** Call the function with a string argument */ String(string => unit)
-  | /** Set the reference to the string argument */ Set_string(ref<string>)
-  | /** Call the function with an int argument */ Int(int => unit)
-  | /** Set the reference to the int argument */ Set_int(ref<int>)
-  | /** Call the function with a float argument */ Float(float => unit)
-  | /** Set the reference to the float argument */ Set_float(ref<float>)
-  | /** Take several arguments according to the
-                                   spec list */
-  Tuple(list<spec>)
-
-  | /** Take one of the symbols as argument and
-                                   call the function with the symbol */
-  Symbol(list<string>, string => unit)
-
-  | /** Stop interpreting keywords and call the
-                                   function with each remaining argument */
-  Rest(string => unit)
-
-  | /** If the remaining arguments to process
-                                           are of the form
-                                           [["-foo"; "arg"] @ rest] where "foo" is
-                                           registered as [Expand f], then the
-                                           arguments [f "arg" @ rest] are
-                                           processed. Only allowed in
-                                           [parse_and_expand_argv_dynamic]. */
-  Expand(string => array<string>)
-
-type key = string
-type doc = string
-type usage_msg = string
-type anon_fun = string => unit
-
-/** [Arg.parse speclist anon_fun usage_msg] parses the command line.
-    [speclist] is a list of triples [(key, spec, doc)].
-    [key] is the option keyword, it must start with a ['-'] character.
-    [spec] gives the option type and the function to call when this option
-    is found on the command line.
-    [doc] is a one-line description of this option.
-    [anon_fun] is called on anonymous arguments.
-    The functions in [spec] and [anon_fun] are called in the same order
-    as their arguments appear on the command line.
-
-    If an error occurs, [Arg.parse] exits the program, after printing
-    to standard error an error message as follows:
--   The reason for the error: unknown option, invalid or missing argument, etc.
--   [usage_msg]
--   The list of options, each followed by the corresponding [doc] string.
-    Beware: options that have an empty [doc] string will not be included in the
-    list.
-
-    For the user to be able to specify anonymous arguments starting with a
-    [-], include for example [("-", String anon_fun, doc)] in [speclist].
-
-    By default, [parse] recognizes two unit options, [-help] and [--help],
-    which will print to standard output [usage_msg] and the list of
-    options, and exit the program.  You can override this behaviour
-    by specifying your own [-help] and [--help] options in [speclist].
-*/
-let parse: (list<(key, spec, doc)>, anon_fun, usage_msg) => unit
-
-/** Same as {!Arg.parse}, except that the [speclist] argument is a reference
-    and may be updated during the parsing. A typical use for this feature
-    is to parse command lines of the form:
--     command subcommand [options]
-    where the list of options depends on the value of the subcommand argument.
-    @since 4.01.0
-*/
-let parse_dynamic: (ref<list<(key, spec, doc)>>, anon_fun, usage_msg) => unit
-
-/** [Arg.parse_argv ~current args speclist anon_fun usage_msg] parses
-  the array [args] as if it were the command line.  It uses and updates
-  the value of [~current] (if given), or {!Arg.current}.  You must set
-  it before calling [parse_argv].  The initial value of [current]
-  is the index of the program name (argument 0) in the array.
-  If an error occurs, [Arg.parse_argv] raises {!Arg.Bad} with
-  the error message as argument.  If option [-help] or [--help] is
-  given, [Arg.parse_argv] raises {!Arg.Help} with the help message
-  as argument.
-*/
-let parse_argv: (
-  ~current: ref<int>=?,
-  array<string>,
-  list<(key, spec, doc)>,
-  anon_fun,
-  usage_msg,
-) => unit
-
-/** Same as {!Arg.parse_argv}, except that the [speclist] argument is a
-    reference and may be updated during the parsing.
-    See {!Arg.parse_dynamic}.
-    @since 4.01.0
-*/
-let parse_argv_dynamic: (
-  ~current: ref<int>=?,
-  array<string>,
-  ref<list<(key, spec, doc)>>,
-  anon_fun,
-  string,
-) => unit
-
-/** Same as {!Arg.parse_argv_dynamic}, except that the [argv] argument is a
-    reference and may be updated during the parsing of [Expand] arguments.
-    See {!Arg.parse_argv_dynamic}.
-    @since 4.05.0
-*/
-let parse_and_expand_argv_dynamic: (
-  ref<int>,
-  ref<array<string>>,
-  ref<list<(key, spec, doc)>>,
-  anon_fun,
-  string,
-) => unit
-
-/** Same as {!Arg.parse}, except that the [Expand] arguments are allowed and
-    the {!current} reference is not updated.
-    @since 4.05.0
-*/
-let parse_expand: (list<(key, spec, doc)>, anon_fun, usage_msg) => unit
-
-/** Raised by [Arg.parse_argv] when the user asks for help. */ exception Help(string)
-
-/** Functions in [spec] or [anon_fun] can raise [Arg.Bad] with an error
-    message to reject invalid arguments.
-    [Arg.Bad] is also raised by {!Arg.parse_argv} in case of an error. */
-exception Bad(string)
-
-/** [Arg.usage speclist usage_msg] prints to standard error
-    an error message that includes the list of valid options.  This is
-    the same message that {!Arg.parse} prints in case of error.
-    [speclist] and [usage_msg] are the same as for {!Arg.parse}. */
-let usage: (list<(key, spec, doc)>, usage_msg) => unit
-
-/** Returns the message that would have been printed by {!Arg.usage},
-    if provided with the same parameters. */
-let usage_string: (list<(key, spec, doc)>, usage_msg) => string
-
-/** Align the documentation strings by inserting spaces at the first alignment
-    separator (tab or, if tab is not found, space), according to the length of
-    the keyword.  Use a alignment separator as the first character in a doc
-    string if you want to align the whole string.  The doc strings corresponding
-    to [Symbol] arguments are aligned on the next line.
-    @param limit options with keyword and message longer than [limit] will not
-    be used to compute the alignment. */
-let align: (~limit: int=?, list<(key, spec, doc)>) => list<(key, spec, doc)>
-
-/** Position (in {!Sys.argv}) of the argument being processed.  You can
-    change this value, e.g. to force {!Arg.parse} to skip some arguments.
-    {!Arg.parse} uses the initial value of {!Arg.current} as the index of
-    argument 0 (the program name) and starts parsing arguments
-    at the next element. */
-let current: ref<int>
diff --git a/jscomp/stdlib-406/array.res b/jscomp/stdlib-406/array.res
deleted file mode 100644
index 486217b..0000000
--- a/jscomp/stdlib-406/array.res
+++ /dev/null
@@ -1,410 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Array operations */
-
-external length: array<'a> => int = "%array_length"
-external get: (array<'a>, int) => 'a = "%array_safe_get"
-external set: (array<'a>, int, 'a) => unit = "%array_safe_set"
-external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
-external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
-external make: (int, 'a) => array<'a> = "?make_vect"
-external create: (int, 'a) => array<'a> = "?make_vect"
-external unsafe_sub: (array<'a>, int, int) => array<'a> = "?array_sub"
-
-@send external append_prim: (array<'a>, array<'a>) => array<'a> = "concat"
-
-external concat: list<array<'a>> => array<'a> = "?array_concat"
-external unsafe_blit: (array<'a>, int, array<'a>, int, int) => unit = "?array_blit"
-external create_float: int => array<float> = "?make_float_vect"
-let make_float = create_float
-
-module Floatarray = {
-  external create: int => floatarray = "?floatarray_create"
-  external length: floatarray => int = "%floatarray_length"
-  external get: (floatarray, int) => float = "%floatarray_safe_get"
-  external set: (floatarray, int, float) => unit = "%floatarray_safe_set"
-  external unsafe_get: (floatarray, int) => float = "%floatarray_unsafe_get"
-  external unsafe_set: (floatarray, int, float) => unit = "%floatarray_unsafe_set"
-}
-
-let init = (l, f) =>
-  if l == 0 {
-    []
-  } else if l < 0 {
-    invalid_arg("Array.init")
-  } else {
-    /* See #6575. We could also check for maximum array size, but this depends
-     on whether we create a float array or a regular one... */
-
-    let res = create(l, f(0))
-    for i in 1 to pred(l) {
-      unsafe_set(res, i, f(i))
-    }
-    res
-  }
-
-let make_matrix = (sx, sy, init) => {
-  let res = create(sx, [])
-  for x in 0 to pred(sx) {
-    unsafe_set(res, x, create(sy, init))
-  }
-  res
-}
-
-let create_matrix = make_matrix
-
-let copy = a => {
-  let l = length(a)
-  if l == 0 {
-    []
-  } else {
-    unsafe_sub(a, 0, l)
-  }
-}
-
-let append = (a1, a2) => {
-  let l1 = length(a1)
-  if l1 == 0 {
-    copy(a2)
-  } else if length(a2) == 0 {
-    unsafe_sub(a1, 0, l1)
-  } else {
-    append_prim(a1, a2)
-  }
-}
-
-let sub = (a, ofs, len) =>
-  if ofs < 0 || (len < 0 || ofs > length(a) - len) {
-    invalid_arg("Array.sub")
-  } else {
-    unsafe_sub(a, ofs, len)
-  }
-
-let fill = (a, ofs, len, v) =>
-  if ofs < 0 || (len < 0 || ofs > length(a) - len) {
-    invalid_arg("Array.fill")
-  } else {
-    for i in ofs to ofs + len - 1 {
-      unsafe_set(a, i, v)
-    }
-  }
-
-let blit = (a1, ofs1, a2, ofs2, len) =>
-  if len < 0 || (ofs1 < 0 || (ofs1 > length(a1) - len || (ofs2 < 0 || ofs2 > length(a2) - len))) {
-    invalid_arg("Array.blit")
-  } else {
-    unsafe_blit(a1, ofs1, a2, ofs2, len)
-  }
-
-let iter = (f, a) =>
-  for i in 0 to length(a) - 1 {
-    f(unsafe_get(a, i))
-  }
-
-let iter2 = (f, a, b) =>
-  if length(a) != length(b) {
-    invalid_arg("Array.iter2: arrays must have the same length")
-  } else {
-    for i in 0 to length(a) - 1 {
-      f(unsafe_get(a, i), unsafe_get(b, i))
-    }
-  }
-
-let map = (f, a) => {
-  let l = length(a)
-  if l == 0 {
-    []
-  } else {
-    let r = create(l, f(unsafe_get(a, 0)))
-    for i in 1 to l - 1 {
-      unsafe_set(r, i, f(unsafe_get(a, i)))
-    }
-    r
-  }
-}
-
-let map2 = (f, a, b) => {
-  let la = length(a)
-  let lb = length(b)
-  if la != lb {
-    invalid_arg("Array.map2: arrays must have the same length")
-  } else if la == 0 {
-    []
-  } else {
-    let r = create(la, f(unsafe_get(a, 0), unsafe_get(b, 0)))
-    for i in 1 to la - 1 {
-      unsafe_set(r, i, f(unsafe_get(a, i), unsafe_get(b, i)))
-    }
-    r
-  }
-}
-
-let iteri = (f, a) =>
-  for i in 0 to length(a) - 1 {
-    f(i, unsafe_get(a, i))
-  }
-
-let mapi = (f, a) => {
-  let l = length(a)
-  if l == 0 {
-    []
-  } else {
-    let r = create(l, f(0, unsafe_get(a, 0)))
-    for i in 1 to l - 1 {
-      unsafe_set(r, i, f(i, unsafe_get(a, i)))
-    }
-    r
-  }
-}
-
-let to_list = a => {
-  let rec tolist = (i, res) =>
-    if i < 0 {
-      res
-    } else {
-      tolist(i - 1, list{unsafe_get(a, i), ...res})
-    }
-  tolist(length(a) - 1, list{})
-}
-
-/* Cannot use List.length here because the List module depends on Array. */
-let rec list_length = (accu, param) =>
-  switch param {
-  | list{} => accu
-  | list{_, ...t} => list_length(succ(accu), t)
-  }
-
-let of_list = param =>
-  switch param {
-  | list{} => []
-  | list{hd, ...tl} as l =>
-    let a = create(list_length(0, l), hd)
-    let rec fill = (i, param) =>
-      switch param {
-      | list{} => a
-      | list{hd, ...tl} =>
-        unsafe_set(a, i, hd)
-        fill(i + 1, tl)
-      }
-    fill(1, tl)
-  }
-
-let fold_left = (f, x, a) => {
-  let r = ref(x)
-  for i in 0 to length(a) - 1 {
-    r := f(r.contents, unsafe_get(a, i))
-  }
-  r.contents
-}
-
-let fold_right = (f, a, x) => {
-  let r = ref(x)
-  for i in length(a) - 1 downto 0 {
-    r := f(unsafe_get(a, i), r.contents)
-  }
-  r.contents
-}
-
-let exists = (p, a) => {
-  let n = length(a)
-  let rec loop = i =>
-    if i == n {
-      false
-    } else if p(unsafe_get(a, i)) {
-      true
-    } else {
-      loop(succ(i))
-    }
-  loop(0)
-}
-
-let for_all = (p, a) => {
-  let n = length(a)
-  let rec loop = i =>
-    if i == n {
-      true
-    } else if p(unsafe_get(a, i)) {
-      loop(succ(i))
-    } else {
-      false
-    }
-  loop(0)
-}
-
-let mem = (x, a) => {
-  let n = length(a)
-  let rec loop = i =>
-    if i == n {
-      false
-    } else if compare(unsafe_get(a, i), x) == 0 {
-      true
-    } else {
-      loop(succ(i))
-    }
-  loop(0)
-}
-
-let memq = (x, a) => {
-  let n = length(a)
-  let rec loop = i =>
-    if i == n {
-      false
-    } else if x === unsafe_get(a, i) {
-      true
-    } else {
-      loop(succ(i))
-    }
-  loop(0)
-}
-
-exception Bottom(int)
-let sort = (cmp, a) => {
-  let maxson = (l, i) => {
-    let i31 = i + i + i + 1
-    let x = ref(i31)
-    if i31 + 2 < l {
-      if cmp(get(a, i31), get(a, i31 + 1)) < 0 {
-        x := i31 + 1
-      }
-      if cmp(get(a, x.contents), get(a, i31 + 2)) < 0 {
-        x := i31 + 2
-      }
-      x.contents
-    } else if i31 + 1 < l && cmp(get(a, i31), get(a, i31 + 1)) < 0 {
-      i31 + 1
-    } else if i31 < l {
-      i31
-    } else {
-      raise(Bottom(i))
-    }
-  }
-
-  let rec trickledown = (l, i, e) => {
-    let j = maxson(l, i)
-    if cmp(get(a, j), e) > 0 {
-      set(a, i, get(a, j))
-      trickledown(l, j, e)
-    } else {
-      set(a, i, e)
-    }
-  }
-
-  let trickle = (l, i, e) =>
-    try trickledown(l, i, e) catch {
-    | Bottom(i) => set(a, i, e)
-    }
-  let rec bubbledown = (l, i) => {
-    let j = maxson(l, i)
-    set(a, i, get(a, j))
-    bubbledown(l, j)
-  }
-
-  let bubble = (l, i) =>
-    try bubbledown(l, i) catch {
-    | Bottom(i) => i
-    }
-  let rec trickleup = (i, e) => {
-    let father = (i - 1) / 3
-    assert(i != father)
-    if cmp(get(a, father), e) < 0 {
-      set(a, i, get(a, father))
-      if father > 0 {
-        trickleup(father, e)
-      } else {
-        set(a, 0, e)
-      }
-    } else {
-      set(a, i, e)
-    }
-  }
-
-  let l = length(a)
-  for i in (l + 1) / 3 - 1 downto 0 {
-    trickle(l, i, get(a, i))
-  }
-  for i in l - 1 downto 2 {
-    let e = get(a, i)
-    set(a, i, get(a, 0))
-    trickleup(bubble(i, 0), e)
-  }
-  if l > 1 {
-    let e = get(a, 1)
-    set(a, 1, get(a, 0))
-    set(a, 0, e)
-  }
-}
-
-let cutoff = 5
-let stable_sort = (cmp, a) => {
-  let merge = (src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-    let src1r = src1ofs + src1len and src2r = src2ofs + src2len
-    let rec loop = (i1, s1, i2, s2, d) =>
-      if cmp(s1, s2) <= 0 {
-        set(dst, d, s1)
-        let i1 = i1 + 1
-        if i1 < src1r {
-          loop(i1, get(a, i1), i2, s2, d + 1)
-        } else {
-          blit(src2, i2, dst, d + 1, src2r - i2)
-        }
-      } else {
-        set(dst, d, s2)
-        let i2 = i2 + 1
-        if i2 < src2r {
-          loop(i1, s1, i2, get(src2, i2), d + 1)
-        } else {
-          blit(a, i1, dst, d + 1, src1r - i1)
-        }
-      }
-    loop(src1ofs, get(a, src1ofs), src2ofs, get(src2, src2ofs), dstofs)
-  }
-
-  let isortto = (srcofs, dst, dstofs, len) =>
-    for i in 0 to len - 1 {
-      let e = get(a, srcofs + i)
-      let j = ref(dstofs + i - 1)
-      while j.contents >= dstofs && cmp(get(dst, j.contents), e) > 0 {
-        set(dst, j.contents + 1, get(dst, j.contents))
-        decr(j)
-      }
-      set(dst, j.contents + 1, e)
-    }
-
-  let rec sortto = (srcofs, dst, dstofs, len) =>
-    if len <= cutoff {
-      isortto(srcofs, dst, dstofs, len)
-    } else {
-      let l1 = len / 2
-      let l2 = len - l1
-      sortto(srcofs + l1, dst, dstofs + l1, l2)
-      sortto(srcofs, a, srcofs + l2, l1)
-      merge(srcofs + l2, l1, dst, dstofs + l1, l2, dst, dstofs)
-    }
-
-  let l = length(a)
-  if l <= cutoff {
-    isortto(0, a, 0, l)
-  } else {
-    let l1 = l / 2
-    let l2 = l - l1
-    let t = make(l2, get(a, 0))
-    sortto(l1, t, 0, l2)
-    sortto(0, a, l2, l1)
-    merge(l2, l1, t, 0, l2, a, 0)
-  }
-}
-
-let fast_sort = stable_sort
diff --git a/jscomp/stdlib-406/array.resi b/jscomp/stdlib-406/array.resi
deleted file mode 100644
index d16f7bb..0000000
--- a/jscomp/stdlib-406/array.resi
+++ /dev/null
@@ -1,264 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Array operations. */
-
-/** Return the length (number of elements) of the given array. */
-external length: array<'a> => int = "%array_length"
-
-/** [Array.get a n] returns the element number [n] of array [a].
-   The first element has number 0.
-   The last element has number [Array.length a - 1].
-   You can also write [a.(n)] instead of [Array.get a n].
-
-   Raise [Invalid_argument "index out of bounds"]
-   if [n] is outside the range 0 to [(Array.length a - 1)]. */
-external get: (array<'a>, int) => 'a = "%array_safe_get"
-
-/** [Array.set a n x] modifies array [a] in place, replacing
-   element number [n] with [x].
-   You can also write [a.(n) <- x] instead of [Array.set a n x].
-
-   Raise [Invalid_argument "index out of bounds"]
-   if [n] is outside the range 0 to [Array.length a - 1]. */
-external set: (array<'a>, int, 'a) => unit = "%array_safe_set"
-
-/** [Array.make n x] returns a fresh array of length [n],
-   initialized with [x].
-   All the elements of this new array are initially
-   physically equal to [x] (in the sense of the [==] predicate).
-   Consequently, if [x] is mutable, it is shared among all elements
-   of the array, and modifying [x] through one of the array entries
-   will modify all other entries at the same time.
-
-   Raise [Invalid_argument] if [n < 0] or [n > Sys.max_array_length].
-   If the value of [x] is a floating-point number, then the maximum
-   size is only [Sys.max_array_length / 2].*/
-external make: (int, 'a) => array<'a> = "?make_vect"
-
-@deprecated("Use Array.make instead.")
-/** @deprecated [Array.create] is an alias for {!Array.make}. */
-external create: (int, 'a) => array<'a> = "?make_vect"
-
-/** [Array.create_float n] returns a fresh float array of length [n],
-    with uninitialized data.
-    @since 4.03 */
-external create_float: int => array<float> = "?make_float_vect"
-
-@deprecated("Use Array.create_float instead.")
-/** @deprecated [Array.make_float] is an alias for {!Array.create_float}. */
-let make_float: int => array<float>
-
-/** [Array.init n f] returns a fresh array of length [n],
-   with element number [i] initialized to the result of [f i].
-   In other terms, [Array.init n f] tabulates the results of [f]
-   applied to the integers [0] to [n-1].
-
-   Raise [Invalid_argument] if [n < 0] or [n > Sys.max_array_length].
-   If the return type of [f] is [float], then the maximum
-   size is only [Sys.max_array_length / 2].*/
-let init: (int, int => 'a) => array<'a>
-
-/** [Array.make_matrix dimx dimy e] returns a two-dimensional array
-   (an array of arrays) with first dimension [dimx] and
-   second dimension [dimy]. All the elements of this new matrix
-   are initially physically equal to [e].
-   The element ([x,y]) of a matrix [m] is accessed
-   with the notation [m.(x).(y)].
-
-   Raise [Invalid_argument] if [dimx] or [dimy] is negative or
-   greater than {!Sys.max_array_length}.
-   If the value of [e] is a floating-point number, then the maximum
-   size is only [Sys.max_array_length / 2]. */
-let make_matrix: (int, int, 'a) => array<array<'a>>
-
-@deprecated("Use Array.make_matrix instead.")
-/** @deprecated [Array.create_matrix] is an alias for {!Array.make_matrix}. */
-let create_matrix: (int, int, 'a) => array<array<'a>>
-
-/** [Array.append v1 v2] returns a fresh array containing the
-   concatenation of the arrays [v1] and [v2]. */
-let append: (array<'a>, array<'a>) => array<'a>
-
-/** Same as {!Array.append}, but concatenates a list of arrays. */
-let concat: list<array<'a>> => array<'a>
-
-/** [Array.sub a start len] returns a fresh array of length [len],
-   containing the elements number [start] to [start + len - 1]
-   of array [a].
-
-   Raise [Invalid_argument "Array.sub"] if [start] and [len] do not
-   designate a valid subarray of [a]; that is, if
-   [start < 0], or [len < 0], or [start + len > Array.length a]. */
-let sub: (array<'a>, int, int) => array<'a>
-
-/** [Array.copy a] returns a copy of [a], that is, a fresh array
-   containing the same elements as [a]. */
-let copy: array<'a> => array<'a>
-
-/** [Array.fill a ofs len x] modifies the array [a] in place,
-   storing [x] in elements number [ofs] to [ofs + len - 1].
-
-   Raise [Invalid_argument "Array.fill"] if [ofs] and [len] do not
-   designate a valid subarray of [a]. */
-let fill: (array<'a>, int, int, 'a) => unit
-
-/** [Array.blit v1 o1 v2 o2 len] copies [len] elements
-   from array [v1], starting at element number [o1], to array [v2],
-   starting at element number [o2]. It works correctly even if
-   [v1] and [v2] are the same array, and the source and
-   destination chunks overlap.
-
-   Raise [Invalid_argument "Array.blit"] if [o1] and [len] do not
-   designate a valid subarray of [v1], or if [o2] and [len] do not
-   designate a valid subarray of [v2]. */
-let blit: (array<'a>, int, array<'a>, int, int) => unit
-
-/** [Array.to_list a] returns the list of all the elements of [a]. */
-let to_list: array<'a> => list<'a>
-
-/** [Array.of_list l] returns a fresh array containing the elements
-   of [l]. */
-let of_list: list<'a> => array<'a>
-
-/* {1 Iterators} */
-
-/** [Array.iter f a] applies function [f] in turn to all
-   the elements of [a].  It is equivalent to
-   [f a.(0); f a.(1); ...; f a.(Array.length a - 1); ()]. */
-let iter: ('a => unit, array<'a>) => unit
-
-/** Same as {!Array.iter}, but the
-   function is applied with the index of the element as first argument,
-   and the element itself as second argument. */
-let iteri: ((int, 'a) => unit, array<'a>) => unit
-
-/** [Array.map f a] applies function [f] to all the elements of [a],
-   and builds an array with the results returned by [f]:
-   [[| f a.(0); f a.(1); ...; f a.(Array.length a - 1) |]]. */
-let map: ('a => 'b, array<'a>) => array<'b>
-
-/** Same as {!Array.map}, but the
-   function is applied to the index of the element as first argument,
-   and the element itself as second argument. */
-let mapi: ((int, 'a) => 'b, array<'a>) => array<'b>
-
-/** [Array.fold_left f x a] computes
-   [f (... (f (f x a.(0)) a.(1)) ...) a.(n-1)],
-   where [n] is the length of the array [a]. */
-let fold_left: (('a, 'b) => 'a, 'a, array<'b>) => 'a
-
-/** [Array.fold_right f a x] computes
-   [f a.(0) (f a.(1) ( ... (f a.(n-1) x) ...))],
-   where [n] is the length of the array [a]. */
-let fold_right: (('b, 'a) => 'a, array<'b>, 'a) => 'a
-
-/* {1 Iterators on two arrays} */
-
-/** [Array.iter2 f a b] applies function [f] to all the elements of [a]
-   and [b].
-   Raise [Invalid_argument] if the arrays are not the same size.
-   @since 4.03.0 */
-let iter2: (('a, 'b) => unit, array<'a>, array<'b>) => unit
-
-/** [Array.map2 f a b] applies function [f] to all the elements of [a]
-   and [b], and builds an array with the results returned by [f]:
-   [[| f a.(0) b.(0); ...; f a.(Array.length a - 1) b.(Array.length b - 1)|]].
-   Raise [Invalid_argument] if the arrays are not the same size.
-   @since 4.03.0 */
-let map2: (('a, 'b) => 'c, array<'a>, array<'b>) => array<'c>
-
-/* {1 Array scanning} */
-
-/** [Array.for_all p [|a1; ...; an|]] checks if all elements of the array
-   satisfy the predicate [p]. That is, it returns
-   [(p a1) && (p a2) && ... && (p an)].
-   @since 4.03.0 */
-let for_all: ('a => bool, array<'a>) => bool
-
-/** [Array.exists p [|a1; ...; an|]] checks if at least one element of
-    the array satisfies the predicate [p]. That is, it returns
-    [(p a1) || (p a2) || ... || (p an)].
-    @since 4.03.0 */
-let exists: ('a => bool, array<'a>) => bool
-
-/** [mem a l] is true if and only if [a] is equal
-   to an element of [l].
-   @since 4.03.0 */
-let mem: ('a, array<'a>) => bool
-
-/** Same as {!Array.mem}, but uses physical equality instead of structural
-   equality to compare array elements.
-   @since 4.03.0 */
-let memq: ('a, array<'a>) => bool
-
-/* {1 Sorting} */
-
-/** Sort an array in increasing order according to a comparison
-   function.  The comparison function must return 0 if its arguments
-   compare as equal, a positive integer if the first is greater,
-   and a negative integer if the first is smaller (see below for a
-   complete specification).  For example, {!Pervasives.compare} is
-   a suitable comparison function, provided there are no floating-point
-   NaN values in the data.  After calling [Array.sort], the
-   array is sorted in place in increasing order.
-   [Array.sort] is guaranteed to run in constant heap space
-   and (at most) logarithmic stack space.
-
-   The current implementation uses Heap Sort.  It runs in constant
-   stack space.
-
-   Specification of the comparison function:
-   Let [a] be the array and [cmp] the comparison function.  The following
-   must be true for all x, y, z in a :
--   [cmp x y] > 0 if and only if [cmp y x] < 0
--   if [cmp x y] >= 0 and [cmp y z] >= 0 then [cmp x z] >= 0
-
-   When [Array.sort] returns, [a] contains the same elements as before,
-   reordered in such a way that for all i and j valid indices of [a] :
--   [cmp a.(i) a.(j)] >= 0 if and only if i >= j
-*/
-let sort: (('a, 'a) => int, array<'a>) => unit
-
-/** Same as {!Array.sort}, but the sorting algorithm is stable (i.e.
-   elements that compare equal are kept in their original order) and
-   not guaranteed to run in constant heap space.
-
-   The current implementation uses Merge Sort. It uses [n/2]
-   words of heap space, where [n] is the length of the array.
-   It is usually faster than the current implementation of {!Array.sort}.
-*/
-let stable_sort: (('a, 'a) => int, array<'a>) => unit
-
-/** Same as {!Array.sort} or {!Array.stable_sort}, whichever is faster
-    on typical input.
-*/
-let fast_sort: (('a, 'a) => int, array<'a>) => unit
-
-/* {1 Undocumented functions} */
-
-/* The following is for system use only. Do not call directly. */
-
-external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
-external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
-
-module Floatarray: {
-  external create: int => floatarray = "?floatarray_create"
-  external length: floatarray => int = "%floatarray_length"
-  external get: (floatarray, int) => float = "%floatarray_safe_get"
-  external set: (floatarray, int, float) => unit = "%floatarray_safe_set"
-  external unsafe_get: (floatarray, int) => float = "%floatarray_unsafe_get"
-  external unsafe_set: (floatarray, int, float) => unit = "%floatarray_unsafe_set"
-}
diff --git a/jscomp/stdlib-406/arrayLabels.res b/jscomp/stdlib-406/arrayLabels.res
deleted file mode 100644
index e677525..0000000
--- a/jscomp/stdlib-406/arrayLabels.res
+++ /dev/null
@@ -1,410 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Array operations */
-
-external length: array<'a> => int = "%array_length"
-external get: (array<'a>, int) => 'a = "%array_safe_get"
-external set: (array<'a>, int, 'a) => unit = "%array_safe_set"
-external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
-external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
-external make: (int, 'a) => array<'a> = "?make_vect"
-external create: (int, 'a) => array<'a> = "?make_vect"
-external unsafe_sub: (array<'a>, int, int) => array<'a> = "?array_sub"
-
-@send external append_prim: (array<'a>, array<'a>) => array<'a> = "concat"
-
-external concat: list<array<'a>> => array<'a> = "?array_concat"
-external unsafe_blit: (array<'a>, int, array<'a>, int, int) => unit = "?array_blit"
-external create_float: int => array<float> = "?make_float_vect"
-let make_float = create_float
-
-module Floatarray = {
-  external create: int => floatarray = "?floatarray_create"
-  external length: floatarray => int = "%floatarray_length"
-  external get: (floatarray, int) => float = "%floatarray_safe_get"
-  external set: (floatarray, int, float) => unit = "%floatarray_safe_set"
-  external unsafe_get: (floatarray, int) => float = "%floatarray_unsafe_get"
-  external unsafe_set: (floatarray, int, float) => unit = "%floatarray_unsafe_set"
-}
-
-let init = (l, ~f) =>
-  if l == 0 {
-    []
-  } else if l < 0 {
-    invalid_arg("Array.init")
-  } else {
-    /* See #6575. We could also check for maximum array size, but this depends
-     on whether we create a float array or a regular one... */
-
-    let res = create(l, f(0))
-    for i in 1 to pred(l) {
-      unsafe_set(res, i, f(i))
-    }
-    res
-  }
-
-let make_matrix = (~dimx as sx, ~dimy as sy, init) => {
-  let res = create(sx, [])
-  for x in 0 to pred(sx) {
-    unsafe_set(res, x, create(sy, init))
-  }
-  res
-}
-
-let create_matrix = make_matrix
-
-let copy = a => {
-  let l = length(a)
-  if l == 0 {
-    []
-  } else {
-    unsafe_sub(a, 0, l)
-  }
-}
-
-let append = (a1, a2) => {
-  let l1 = length(a1)
-  if l1 == 0 {
-    copy(a2)
-  } else if length(a2) == 0 {
-    unsafe_sub(a1, 0, l1)
-  } else {
-    append_prim(a1, a2)
-  }
-}
-
-let sub = (a, ~pos as ofs, ~len) =>
-  if ofs < 0 || (len < 0 || ofs > length(a) - len) {
-    invalid_arg("Array.sub")
-  } else {
-    unsafe_sub(a, ofs, len)
-  }
-
-let fill = (a, ~pos as ofs, ~len, v) =>
-  if ofs < 0 || (len < 0 || ofs > length(a) - len) {
-    invalid_arg("Array.fill")
-  } else {
-    for i in ofs to ofs + len - 1 {
-      unsafe_set(a, i, v)
-    }
-  }
-
-let blit = (~src as a1, ~src_pos as ofs1, ~dst as a2, ~dst_pos as ofs2, ~len) =>
-  if len < 0 || (ofs1 < 0 || (ofs1 > length(a1) - len || (ofs2 < 0 || ofs2 > length(a2) - len))) {
-    invalid_arg("Array.blit")
-  } else {
-    unsafe_blit(a1, ofs1, a2, ofs2, len)
-  }
-
-let iter = (~f, a) =>
-  for i in 0 to length(a) - 1 {
-    f(unsafe_get(a, i))
-  }
-
-let iter2 = (~f, a, b) =>
-  if length(a) != length(b) {
-    invalid_arg("Array.iter2: arrays must have the same length")
-  } else {
-    for i in 0 to length(a) - 1 {
-      f(unsafe_get(a, i), unsafe_get(b, i))
-    }
-  }
-
-let map = (~f, a) => {
-  let l = length(a)
-  if l == 0 {
-    []
-  } else {
-    let r = create(l, f(unsafe_get(a, 0)))
-    for i in 1 to l - 1 {
-      unsafe_set(r, i, f(unsafe_get(a, i)))
-    }
-    r
-  }
-}
-
-let map2 = (~f, a, b) => {
-  let la = length(a)
-  let lb = length(b)
-  if la != lb {
-    invalid_arg("Array.map2: arrays must have the same length")
-  } else if la == 0 {
-    []
-  } else {
-    let r = create(la, f(unsafe_get(a, 0), unsafe_get(b, 0)))
-    for i in 1 to la - 1 {
-      unsafe_set(r, i, f(unsafe_get(a, i), unsafe_get(b, i)))
-    }
-    r
-  }
-}
-
-let iteri = (~f, a) =>
-  for i in 0 to length(a) - 1 {
-    f(i, unsafe_get(a, i))
-  }
-
-let mapi = (~f, a) => {
-  let l = length(a)
-  if l == 0 {
-    []
-  } else {
-    let r = create(l, f(0, unsafe_get(a, 0)))
-    for i in 1 to l - 1 {
-      unsafe_set(r, i, f(i, unsafe_get(a, i)))
-    }
-    r
-  }
-}
-
-let to_list = a => {
-  let rec tolist = (i, res) =>
-    if i < 0 {
-      res
-    } else {
-      tolist(i - 1, list{unsafe_get(a, i), ...res})
-    }
-  tolist(length(a) - 1, list{})
-}
-
-/* Cannot use List.length here because the List module depends on Array. */
-let rec list_length = (accu, param) =>
-  switch param {
-  | list{} => accu
-  | list{_, ...t} => list_length(succ(accu), t)
-  }
-
-let of_list = param =>
-  switch param {
-  | list{} => []
-  | list{hd, ...tl} as l =>
-    let a = create(list_length(0, l), hd)
-    let rec fill = (i, param) =>
-      switch param {
-      | list{} => a
-      | list{hd, ...tl} =>
-        unsafe_set(a, i, hd)
-        fill(i + 1, tl)
-      }
-    fill(1, tl)
-  }
-
-let fold_left = (~f, ~init as x, a) => {
-  let r = ref(x)
-  for i in 0 to length(a) - 1 {
-    r := f(r.contents, unsafe_get(a, i))
-  }
-  r.contents
-}
-
-let fold_right = (~f, a, ~init as x) => {
-  let r = ref(x)
-  for i in length(a) - 1 downto 0 {
-    r := f(unsafe_get(a, i), r.contents)
-  }
-  r.contents
-}
-
-let exists = (~f as p, a) => {
-  let n = length(a)
-  let rec loop = i =>
-    if i == n {
-      false
-    } else if p(unsafe_get(a, i)) {
-      true
-    } else {
-      loop(succ(i))
-    }
-  loop(0)
-}
-
-let for_all = (~f as p, a) => {
-  let n = length(a)
-  let rec loop = i =>
-    if i == n {
-      true
-    } else if p(unsafe_get(a, i)) {
-      loop(succ(i))
-    } else {
-      false
-    }
-  loop(0)
-}
-
-let mem = (x, ~set as a) => {
-  let n = length(a)
-  let rec loop = i =>
-    if i == n {
-      false
-    } else if compare(unsafe_get(a, i), x) == 0 {
-      true
-    } else {
-      loop(succ(i))
-    }
-  loop(0)
-}
-
-let memq = (x, ~set as a) => {
-  let n = length(a)
-  let rec loop = i =>
-    if i == n {
-      false
-    } else if x === unsafe_get(a, i) {
-      true
-    } else {
-      loop(succ(i))
-    }
-  loop(0)
-}
-
-exception Bottom(int)
-let sort = (~cmp, a) => {
-  let maxson = (l, i) => {
-    let i31 = i + i + i + 1
-    let x = ref(i31)
-    if i31 + 2 < l {
-      if cmp(get(a, i31), get(a, i31 + 1)) < 0 {
-        x := i31 + 1
-      }
-      if cmp(get(a, x.contents), get(a, i31 + 2)) < 0 {
-        x := i31 + 2
-      }
-      x.contents
-    } else if i31 + 1 < l && cmp(get(a, i31), get(a, i31 + 1)) < 0 {
-      i31 + 1
-    } else if i31 < l {
-      i31
-    } else {
-      raise(Bottom(i))
-    }
-  }
-
-  let rec trickledown = (l, i, e) => {
-    let j = maxson(l, i)
-    if cmp(get(a, j), e) > 0 {
-      set(a, i, get(a, j))
-      trickledown(l, j, e)
-    } else {
-      set(a, i, e)
-    }
-  }
-
-  let trickle = (l, i, e) =>
-    try trickledown(l, i, e) catch {
-    | Bottom(i) => set(a, i, e)
-    }
-  let rec bubbledown = (l, i) => {
-    let j = maxson(l, i)
-    set(a, i, get(a, j))
-    bubbledown(l, j)
-  }
-
-  let bubble = (l, i) =>
-    try bubbledown(l, i) catch {
-    | Bottom(i) => i
-    }
-  let rec trickleup = (i, e) => {
-    let father = (i - 1) / 3
-    assert(i != father)
-    if cmp(get(a, father), e) < 0 {
-      set(a, i, get(a, father))
-      if father > 0 {
-        trickleup(father, e)
-      } else {
-        set(a, 0, e)
-      }
-    } else {
-      set(a, i, e)
-    }
-  }
-
-  let l = length(a)
-  for i in (l + 1) / 3 - 1 downto 0 {
-    trickle(l, i, get(a, i))
-  }
-  for i in l - 1 downto 2 {
-    let e = get(a, i)
-    set(a, i, get(a, 0))
-    trickleup(bubble(i, 0), e)
-  }
-  if l > 1 {
-    let e = get(a, 1)
-    set(a, 1, get(a, 0))
-    set(a, 0, e)
-  }
-}
-
-let cutoff = 5
-let stable_sort = (~cmp, a) => {
-  let merge = (src1ofs, src1len, src2, src2ofs, src2len, dst, dstofs) => {
-    let src1r = src1ofs + src1len and src2r = src2ofs + src2len
-    let rec loop = (i1, s1, i2, s2, d) =>
-      if cmp(s1, s2) <= 0 {
-        set(dst, d, s1)
-        let i1 = i1 + 1
-        if i1 < src1r {
-          loop(i1, get(a, i1), i2, s2, d + 1)
-        } else {
-          blit(~src=src2, ~src_pos=i2, ~dst, ~dst_pos=d + 1, ~len=src2r - i2)
-        }
-      } else {
-        set(dst, d, s2)
-        let i2 = i2 + 1
-        if i2 < src2r {
-          loop(i1, s1, i2, get(src2, i2), d + 1)
-        } else {
-          blit(~src=a, ~src_pos=i1, ~dst, ~dst_pos=d + 1, ~len=src1r - i1)
-        }
-      }
-    loop(src1ofs, get(a, src1ofs), src2ofs, get(src2, src2ofs), dstofs)
-  }
-
-  let isortto = (srcofs, dst, dstofs, len) =>
-    for i in 0 to len - 1 {
-      let e = get(a, srcofs + i)
-      let j = ref(dstofs + i - 1)
-      while j.contents >= dstofs && cmp(get(dst, j.contents), e) > 0 {
-        set(dst, j.contents + 1, get(dst, j.contents))
-        decr(j)
-      }
-      set(dst, j.contents + 1, e)
-    }
-
-  let rec sortto = (srcofs, dst, dstofs, len) =>
-    if len <= cutoff {
-      isortto(srcofs, dst, dstofs, len)
-    } else {
-      let l1 = len / 2
-      let l2 = len - l1
-      sortto(srcofs + l1, dst, dstofs + l1, l2)
-      sortto(srcofs, a, srcofs + l2, l1)
-      merge(srcofs + l2, l1, dst, dstofs + l1, l2, dst, dstofs)
-    }
-
-  let l = length(a)
-  if l <= cutoff {
-    isortto(0, a, 0, l)
-  } else {
-    let l1 = l / 2
-    let l2 = l - l1
-    let t = make(l2, get(a, 0))
-    sortto(l1, t, 0, l2)
-    sortto(0, a, l2, l1)
-    merge(l2, l1, t, 0, l2, a, 0)
-  }
-}
-
-let fast_sort = stable_sort
diff --git a/jscomp/stdlib-406/arrayLabels.resi b/jscomp/stdlib-406/arrayLabels.resi
deleted file mode 100644
index 1a21169..0000000
--- a/jscomp/stdlib-406/arrayLabels.resi
+++ /dev/null
@@ -1,264 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Array operations. */
-
-/** Return the length (number of elements) of the given array. */
-external length: array<'a> => int = "%array_length"
-
-/** [Array.get a n] returns the element number [n] of array [a].
-   The first element has number 0.
-   The last element has number [Array.length a - 1].
-   You can also write [a.(n)] instead of [Array.get a n].
-
-   Raise [Invalid_argument "index out of bounds"]
-   if [n] is outside the range 0 to [(Array.length a - 1)]. */
-external get: (array<'a>, int) => 'a = "%array_safe_get"
-
-/** [Array.set a n x] modifies array [a] in place, replacing
-   element number [n] with [x].
-   You can also write [a.(n) <- x] instead of [Array.set a n x].
-
-   Raise [Invalid_argument "index out of bounds"]
-   if [n] is outside the range 0 to [Array.length a - 1]. */
-external set: (array<'a>, int, 'a) => unit = "%array_safe_set"
-
-/** [Array.make n x] returns a fresh array of length [n],
-   initialized with [x].
-   All the elements of this new array are initially
-   physically equal to [x] (in the sense of the [==] predicate).
-   Consequently, if [x] is mutable, it is shared among all elements
-   of the array, and modifying [x] through one of the array entries
-   will modify all other entries at the same time.
-
-   Raise [Invalid_argument] if [n < 0] or [n > Sys.max_array_length].
-   If the value of [x] is a floating-point number, then the maximum
-   size is only [Sys.max_array_length / 2].*/
-external make: (int, 'a) => array<'a> = "?make_vect"
-
-@deprecated("Use Array.make instead.")
-/** @deprecated [Array.create] is an alias for {!Array.make}. */
-external create: (int, 'a) => array<'a> = "?make_vect"
-
-/** [Array.init n f] returns a fresh array of length [n],
-   with element number [i] initialized to the result of [f i].
-   In other terms, [Array.init n f] tabulates the results of [f]
-   applied to the integers [0] to [n-1].
-
-   Raise [Invalid_argument] if [n < 0] or [n > Sys.max_array_length].
-   If the return type of [f] is [float], then the maximum
-   size is only [Sys.max_array_length / 2].*/
-let init: (int, ~f: int => 'a) => array<'a>
-
-/** [Array.make_matrix dimx dimy e] returns a two-dimensional array
-   (an array of arrays) with first dimension [dimx] and
-   second dimension [dimy]. All the elements of this new matrix
-   are initially physically equal to [e].
-   The element ([x,y]) of a matrix [m] is accessed
-   with the notation [m.(x).(y)].
-
-   Raise [Invalid_argument] if [dimx] or [dimy] is negative or
-   greater than {!Sys.max_array_length}.
-   If the value of [e] is a floating-point number, then the maximum
-   size is only [Sys.max_array_length / 2]. */
-let make_matrix: (~dimx: int, ~dimy: int, 'a) => array<array<'a>>
-
-@deprecated("Use Array.make_matrix instead.")
-/** @deprecated [Array.create_matrix] is an alias for
-   {!Array.make_matrix}. */
-let create_matrix: (~dimx: int, ~dimy: int, 'a) => array<array<'a>>
-
-/** [Array.append v1 v2] returns a fresh array containing the
-   concatenation of the arrays [v1] and [v2]. */
-let append: (array<'a>, array<'a>) => array<'a>
-
-/** Same as {!Array.append}, but concatenates a list of arrays. */
-let concat: list<array<'a>> => array<'a>
-
-/** [Array.sub a start len] returns a fresh array of length [len],
-   containing the elements number [start] to [start + len - 1]
-   of array [a].
-
-   Raise [Invalid_argument "Array.sub"] if [start] and [len] do not
-   designate a valid subarray of [a]; that is, if
-   [start < 0], or [len < 0], or [start + len > Array.length a]. */
-let sub: (array<'a>, ~pos: int, ~len: int) => array<'a>
-
-/** [Array.copy a] returns a copy of [a], that is, a fresh array
-   containing the same elements as [a]. */
-let copy: array<'a> => array<'a>
-
-/** [Array.fill a ofs len x] modifies the array [a] in place,
-   storing [x] in elements number [ofs] to [ofs + len - 1].
-
-   Raise [Invalid_argument "Array.fill"] if [ofs] and [len] do not
-   designate a valid subarray of [a]. */
-let fill: (array<'a>, ~pos: int, ~len: int, 'a) => unit
-
-/** [Array.blit v1 o1 v2 o2 len] copies [len] elements
-   from array [v1], starting at element number [o1], to array [v2],
-   starting at element number [o2]. It works correctly even if
-   [v1] and [v2] are the same array, and the source and
-   destination chunks overlap.
-
-   Raise [Invalid_argument "Array.blit"] if [o1] and [len] do not
-   designate a valid subarray of [v1], or if [o2] and [len] do not
-   designate a valid subarray of [v2]. */
-let blit: (~src: array<'a>, ~src_pos: int, ~dst: array<'a>, ~dst_pos: int, ~len: int) => unit
-
-/** [Array.to_list a] returns the list of all the elements of [a]. */
-let to_list: array<'a> => list<'a>
-
-/** [Array.of_list l] returns a fresh array containing the elements
-   of [l]. */
-let of_list: list<'a> => array<'a>
-
-/** [Array.iter f a] applies function [f] in turn to all
-   the elements of [a].  It is equivalent to
-   [f a.(0); f a.(1); ...; f a.(Array.length a - 1); ()]. */
-let iter: (~f: 'a => unit, array<'a>) => unit
-
-/** [Array.map f a] applies function [f] to all the elements of [a],
-   and builds an array with the results returned by [f]:
-   [[| f a.(0); f a.(1); ...; f a.(Array.length a - 1) |]]. */
-let map: (~f: 'a => 'b, array<'a>) => array<'b>
-
-/** Same as {!Array.iter}, but the
-   function is applied to the index of the element as first argument,
-   and the element itself as second argument. */
-let iteri: (~f: (int, 'a) => unit, array<'a>) => unit
-
-/** Same as {!Array.map}, but the
-   function is applied to the index of the element as first argument,
-   and the element itself as second argument. */
-let mapi: (~f: (int, 'a) => 'b, array<'a>) => array<'b>
-
-/** [Array.fold_left f x a] computes
-   [f (... (f (f x a.(0)) a.(1)) ...) a.(n-1)],
-   where [n] is the length of the array [a]. */
-let fold_left: (~f: ('a, 'b) => 'a, ~init: 'a, array<'b>) => 'a
-
-/** [Array.fold_right f a x] computes
-   [f a.(0) (f a.(1) ( ... (f a.(n-1) x) ...))],
-   where [n] is the length of the array [a]. */
-let fold_right: (~f: ('b, 'a) => 'a, array<'b>, ~init: 'a) => 'a
-
-/* {6 Iterators on two arrays} */
-
-/** [Array.iter2 f a b] applies function [f] to all the elements of [a]
-   and [b].
-   Raise [Invalid_argument] if the arrays are not the same size.
-   @since 4.05.0 */
-let iter2: (~f: ('a, 'b) => unit, array<'a>, array<'b>) => unit
-
-/** [Array.map2 f a b] applies function [f] to all the elements of [a]
-   and [b], and builds an array with the results returned by [f]:
-   [[| f a.(0) b.(0); ...; f a.(Array.length a - 1) b.(Array.length b - 1)|]].
-   Raise [Invalid_argument] if the arrays are not the same size.
-   @since 4.05.0 */
-let map2: (~f: ('a, 'b) => 'c, array<'a>, array<'b>) => array<'c>
-
-/* {6 Array scanning} */
-
-/** [Array.exists p [|a1; ...; an|]] checks if at least one element of
-    the array satisfies the predicate [p]. That is, it returns
-    [(p a1) || (p a2) || ... || (p an)].
-    @since 4.03.0 */
-let exists: (~f: 'a => bool, array<'a>) => bool
-
-/** [Array.for_all p [|a1; ...; an|]] checks if all elements of the array
-   satisfy the predicate [p]. That is, it returns
-   [(p a1) && (p a2) && ... && (p an)].
-   @since 4.03.0 */
-let for_all: (~f: 'a => bool, array<'a>) => bool
-
-/** [mem x a] is true if and only if [x] is equal
-   to an element of [a].
-   @since 4.03.0 */
-let mem: ('a, ~set: array<'a>) => bool
-
-/** Same as {!Array.mem}, but uses physical equality instead of structural
-   equality to compare list elements.
-   @since 4.03.0 */
-let memq: ('a, ~set: array<'a>) => bool
-
-/** [Array.create_float n] returns a fresh float array of length [n],
-    with uninitialized data.
-    @since 4.03 */
-external create_float: int => array<float> = "?make_float_vect"
-
-@deprecated("Use Array.create_float instead.")
-/** @deprecated [Array.make_float] is an alias for
-    {!Array.create_float}. */
-let make_float: int => array<float>
-
-/* {1 Sorting} */
-
-/** Sort an array in increasing order according to a comparison
-   function.  The comparison function must return 0 if its arguments
-   compare as equal, a positive integer if the first is greater,
-   and a negative integer if the first is smaller (see below for a
-   complete specification).  For example, {!Pervasives.compare} is
-   a suitable comparison function, provided there are no floating-point
-   NaN values in the data.  After calling [Array.sort], the
-   array is sorted in place in increasing order.
-   [Array.sort] is guaranteed to run in constant heap space
-   and (at most) logarithmic stack space.
-
-   The current implementation uses Heap Sort.  It runs in constant
-   stack space.
-
-   Specification of the comparison function:
-   Let [a] be the array and [cmp] the comparison function.  The following
-   must be true for all x, y, z in a :
--   [cmp x y] > 0 if and only if [cmp y x] < 0
--   if [cmp x y] >= 0 and [cmp y z] >= 0 then [cmp x z] >= 0
-
-   When [Array.sort] returns, [a] contains the same elements as before,
-   reordered in such a way that for all i and j valid indices of [a] :
--   [cmp a.(i) a.(j)] >= 0 if and only if i >= j
-*/
-let sort: (~cmp: ('a, 'a) => int, array<'a>) => unit
-
-/** Same as {!Array.sort}, but the sorting algorithm is stable (i.e.
-   elements that compare equal are kept in their original order) and
-   not guaranteed to run in constant heap space.
-
-   The current implementation uses Merge Sort. It uses [n/2]
-   words of heap space, where [n] is the length of the array.
-   It is usually faster than the current implementation of {!Array.sort}.
-*/
-let stable_sort: (~cmp: ('a, 'a) => int, array<'a>) => unit
-
-/** Same as {!Array.sort} or {!Array.stable_sort}, whichever is
-    faster on typical input.
-*/
-let fast_sort: (~cmp: ('a, 'a) => int, array<'a>) => unit
-
-/* {1 Undocumented functions} */
-
-/* The following is for system use only. Do not call directly. */
-
-external unsafe_get: (array<'a>, int) => 'a = "%array_unsafe_get"
-external unsafe_set: (array<'a>, int, 'a) => unit = "%array_unsafe_set"
-
-module Floatarray: {
-  external create: int => floatarray = "?floatarray_create"
-  external length: floatarray => int = "%floatarray_length"
-  external get: (floatarray, int) => float = "%floatarray_safe_get"
-  external set: (floatarray, int, float) => unit = "%floatarray_safe_set"
-  external unsafe_get: (floatarray, int) => float = "%floatarray_unsafe_get"
-  external unsafe_set: (floatarray, int, float) => unit = "%floatarray_unsafe_set"
-}
diff --git a/jscomp/stdlib-406/buffer.res b/jscomp/stdlib-406/buffer.res
deleted file mode 100644
index 6d9db8c..0000000
--- a/jscomp/stdlib-406/buffer.res
+++ /dev/null
@@ -1,307 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Pierre Weis and Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1999 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Extensible buffers */
-
-type t = {
-  mutable buffer: bytes,
-  mutable position: int,
-  mutable length: int,
-  initial_buffer: bytes,
-}
-
-let create = n => {
-  let n = if n < 1 {
-    1
-  } else {
-    n
-  }
-  let s = Bytes.create(n)
-  {buffer: s, position: 0, length: n, initial_buffer: s}
-}
-
-let contents = b => Bytes.sub_string(b.buffer, 0, b.position)
-let to_bytes = b => Bytes.sub(b.buffer, 0, b.position)
-
-let sub = (b, ofs, len) =>
-  if ofs < 0 || (len < 0 || ofs > b.position - len) {
-    invalid_arg("Buffer.sub")
-  } else {
-    Bytes.sub_string(b.buffer, ofs, len)
-  }
-
-let blit = (src, srcoff, dst, dstoff, len) =>
-  if (
-    len < 0 ||
-      (srcoff < 0 ||
-      (srcoff > src.position - len || (dstoff < 0 || dstoff > Bytes.length(dst) - len)))
-  ) {
-    invalid_arg("Buffer.blit")
-  } else {
-    Bytes.blit(src.buffer, srcoff, dst, dstoff, len)
-  }
-
-let nth = (b, ofs) =>
-  if ofs < 0 || ofs >= b.position {
-    invalid_arg("Buffer.nth")
-  } else {
-    Bytes.unsafe_get(b.buffer, ofs)
-  }
-
-let length = b => b.position
-
-let clear = b => b.position = 0
-
-let reset = b => {
-  b.position = 0
-  b.buffer = b.initial_buffer
-  b.length = Bytes.length(b.buffer)
-}
-
-let resize = (b, more) => {
-  let len = b.length
-  let new_len = ref(len)
-  while b.position + more > new_len.contents {
-    new_len := 2 * new_len.contents
-  }
-  let new_buffer = Bytes.create(new_len.contents)
-  /* PR#6148: let's keep using [blit] rather than [unsafe_blit] in
-   this tricky function that is slow anyway. */
-  Bytes.blit(b.buffer, 0, new_buffer, 0, b.position)
-  b.buffer = new_buffer
-  b.length = new_len.contents
-}
-
-let add_char = (b, c) => {
-  let pos = b.position
-  if pos >= b.length {
-    resize(b, 1)
-  }
-  Bytes.unsafe_set(b.buffer, pos, c)
-  b.position = pos + 1
-}
-
-let add_utf_8_uchar = (b, u) =>
-  switch Uchar.to_int(u) {
-  | u if u < 0 => assert(false)
-  | u if u <= 0x007F => add_char(b, Char.unsafe_chr(u))
-  | u if u <= 0x07FF =>
-    let pos = b.position
-    if pos + 2 > b.length {
-      resize(b, 2)
-    }
-    Bytes.unsafe_set(b.buffer, pos, Char.unsafe_chr(lor(0xC0, lsr(u, 6))))
-    Bytes.unsafe_set(b.buffer, pos + 1, Char.unsafe_chr(lor(0x80, land(u, 0x3F))))
-    b.position = pos + 2
-  | u if u <= 0xFFFF =>
-    let pos = b.position
-    if pos + 3 > b.length {
-      resize(b, 3)
-    }
-    Bytes.unsafe_set(b.buffer, pos, Char.unsafe_chr(lor(0xE0, lsr(u, 12))))
-    Bytes.unsafe_set(b.buffer, pos + 1, Char.unsafe_chr(lor(0x80, land(lsr(u, 6), 0x3F))))
-    Bytes.unsafe_set(b.buffer, pos + 2, Char.unsafe_chr(lor(0x80, land(u, 0x3F))))
-    b.position = pos + 3
-  | u if u <= 0x10FFFF =>
-    let pos = b.position
-    if pos + 4 > b.length {
-      resize(b, 4)
-    }
-    Bytes.unsafe_set(b.buffer, pos, Char.unsafe_chr(lor(0xF0, lsr(u, 18))))
-    Bytes.unsafe_set(b.buffer, pos + 1, Char.unsafe_chr(lor(0x80, land(lsr(u, 12), 0x3F))))
-    Bytes.unsafe_set(b.buffer, pos + 2, Char.unsafe_chr(lor(0x80, land(lsr(u, 6), 0x3F))))
-    Bytes.unsafe_set(b.buffer, pos + 3, Char.unsafe_chr(lor(0x80, land(u, 0x3F))))
-    b.position = pos + 4
-  | _ => assert(false)
-  }
-
-let add_utf_16be_uchar = (b, u) =>
-  switch Uchar.to_int(u) {
-  | u if u < 0 => assert(false)
-  | u if u <= 0xFFFF =>
-    let pos = b.position
-    if pos + 2 > b.length {
-      resize(b, 2)
-    }
-    Bytes.unsafe_set(b.buffer, pos, Char.unsafe_chr(lsr(u, 8)))
-    Bytes.unsafe_set(b.buffer, pos + 1, Char.unsafe_chr(land(u, 0xFF)))
-    b.position = pos + 2
-  | u if u <= 0x10FFFF =>
-    let u' = u - 0x10000
-    let hi = lor(0xD800, lsr(u', 10))
-    let lo = lor(0xDC00, land(u', 0x3FF))
-    let pos = b.position
-    if pos + 4 > b.length {
-      resize(b, 4)
-    }
-    Bytes.unsafe_set(b.buffer, pos, Char.unsafe_chr(lsr(hi, 8)))
-    Bytes.unsafe_set(b.buffer, pos + 1, Char.unsafe_chr(land(hi, 0xFF)))
-    Bytes.unsafe_set(b.buffer, pos + 2, Char.unsafe_chr(lsr(lo, 8)))
-    Bytes.unsafe_set(b.buffer, pos + 3, Char.unsafe_chr(land(lo, 0xFF)))
-    b.position = pos + 4
-  | _ => assert(false)
-  }
-
-let add_utf_16le_uchar = (b, u) =>
-  switch Uchar.to_int(u) {
-  | u if u < 0 => assert(false)
-  | u if u <= 0xFFFF =>
-    let pos = b.position
-    if pos + 2 > b.length {
-      resize(b, 2)
-    }
-    Bytes.unsafe_set(b.buffer, pos, Char.unsafe_chr(land(u, 0xFF)))
-    Bytes.unsafe_set(b.buffer, pos + 1, Char.unsafe_chr(lsr(u, 8)))
-    b.position = pos + 2
-  | u if u <= 0x10FFFF =>
-    let u' = u - 0x10000
-    let hi = lor(0xD800, lsr(u', 10))
-    let lo = lor(0xDC00, land(u', 0x3FF))
-    let pos = b.position
-    if pos + 4 > b.length {
-      resize(b, 4)
-    }
-    Bytes.unsafe_set(b.buffer, pos, Char.unsafe_chr(land(hi, 0xFF)))
-    Bytes.unsafe_set(b.buffer, pos + 1, Char.unsafe_chr(lsr(hi, 8)))
-    Bytes.unsafe_set(b.buffer, pos + 2, Char.unsafe_chr(land(lo, 0xFF)))
-    Bytes.unsafe_set(b.buffer, pos + 3, Char.unsafe_chr(lsr(lo, 8)))
-    b.position = pos + 4
-  | _ => assert(false)
-  }
-
-let add_substring = (b, s, offset, len) => {
-  if offset < 0 || (len < 0 || offset > String.length(s) - len) {
-    invalid_arg("Buffer.add_substring/add_subbytes")
-  }
-  let new_position = b.position + len
-  if new_position > b.length {
-    resize(b, len)
-  }
-  Bytes.blit_string(s, offset, b.buffer, b.position, len)
-  b.position = new_position
-}
-
-let add_subbytes = (b, s, offset, len) => add_substring(b, Bytes.unsafe_to_string(s), offset, len)
-
-let add_string = (b, s) => {
-  let len = String.length(s)
-  let new_position = b.position + len
-  if new_position > b.length {
-    resize(b, len)
-  }
-  Bytes.blit_string(s, 0, b.buffer, b.position, len)
-  b.position = new_position
-}
-
-let add_bytes = (b, s) => add_string(b, Bytes.unsafe_to_string(s))
-
-let add_buffer = (b, bs) => add_subbytes(b, bs.buffer, 0, bs.position)
-
-let closing = param =>
-  switch param {
-  | '(' => ')'
-  | '{' => '}'
-  | _ => assert(false)
-  }
-
-/* opening and closing: open and close characters, typically ( and )
-   k: balance of opening and closing chars
-   s: the string where we are searching
-   start: the index where we start the search. */
-let advance_to_closing = (opening, closing, k, s, start) => {
-  let rec advance = (k, i, lim) =>
-    if i >= lim {
-      raise(Not_found)
-    } else if String.get(s, i) == opening {
-      advance(k + 1, i + 1, lim)
-    } else if String.get(s, i) == closing {
-      if k == 0 {
-        i
-      } else {
-        advance(k - 1, i + 1, lim)
-      }
-    } else {
-      advance(k, i + 1, lim)
-    }
-  advance(k, start, String.length(s))
-}
-
-let advance_to_non_alpha = (s, start) => {
-  let rec advance = (i, lim) =>
-    if i >= lim {
-      lim
-    } else {
-      switch String.get(s, i) {
-      | 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' => advance(i + 1, lim)
-      | _ => i
-      }
-    }
-  advance(start, String.length(s))
-}
-
-/* We are just at the beginning of an ident in s, starting at start. */
-let find_ident = (s, start, lim) =>
-  if start >= lim {
-    raise(Not_found)
-  } else {
-    switch String.get(s, start) {
-    /* Parenthesized ident ? */
-    | ('(' | '{') as c =>
-      let new_start = start + 1
-      let stop = advance_to_closing(c, closing(c), 0, s, new_start)
-      (String.sub(s, new_start, stop - start - 1), stop + 1)
-    /* Regular ident */
-    | _ =>
-      let stop = advance_to_non_alpha(s, start + 1)
-      (String.sub(s, start, stop - start), stop)
-    }
-  }
-
-/* Substitute $ident, $(ident), or ${ident} in s,
- according to the function mapping f. */
-let add_substitute = (b, f, s) => {
-  let lim = String.length(s)
-  let rec subst = (previous, i) =>
-    if i < lim {
-      switch String.get(s, i) {
-      | '$' as current if previous == '\\' =>
-        add_char(b, current)
-        subst(' ', i + 1)
-      | '$' =>
-        let j = i + 1
-        let (ident, next_i) = find_ident(s, j, lim)
-        add_string(b, f(ident))
-        subst(' ', next_i)
-      | current if previous === '\\' =>
-        add_char(b, '\\')
-        add_char(b, current)
-        subst(' ', i + 1)
-      | '\\' as current => subst(current, i + 1)
-      | current =>
-        add_char(b, current)
-        subst(current, i + 1)
-      }
-    } else if previous == '\\' {
-      add_char(b, previous)
-    }
-  subst(' ', 0)
-}
-
-let truncate = (b, len) =>
-  if len < 0 || len > length(b) {
-    invalid_arg("Buffer.truncate")
-  } else {
-    b.position = len
-  }
diff --git a/jscomp/stdlib-406/buffer.resi b/jscomp/stdlib-406/buffer.resi
deleted file mode 100644
index 9929a1d..0000000
--- a/jscomp/stdlib-406/buffer.resi
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Pierre Weis and Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1999 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Extensible buffers.
-
-   This module implements buffers that automatically expand
-   as necessary.  It provides accumulative concatenation of strings
-   in quasi-linear time (instead of quadratic time when strings are
-   concatenated pairwise).
-*/
-
-/** The abstract type of buffers. */
-type t
-
-/** [create n] returns a fresh buffer, initially empty.
-   The [n] parameter is the initial size of the internal byte sequence
-   that holds the buffer contents. That byte sequence is automatically
-   reallocated when more than [n] characters are stored in the buffer,
-   but shrinks back to [n] characters when [reset] is called.
-   For best performance, [n] should be of the same order of magnitude
-   as the number of characters that are expected to be stored in
-   the buffer (for instance, 80 for a buffer that holds one output
-   line).  Nothing bad will happen if the buffer grows beyond that
-   limit, however. In doubt, take [n = 16] for instance.
-   If [n] is not between 1 and {!Sys.max_string_length}, it will
-   be clipped to that interval. */
-let create: int => t
-
-/** Return a copy of the current contents of the buffer.
-    The buffer itself is unchanged. */
-let contents: t => string
-
-/** Return a copy of the current contents of the buffer.
-    The buffer itself is unchanged.
-    @since 4.02 */
-let to_bytes: t => bytes
-
-/** [Buffer.sub b off len] returns a copy of [len] bytes from the
-    current contents of the buffer [b], starting at offset [off].
-
-    Raise [Invalid_argument] if [srcoff] and [len] do not designate a valid
-    range of [b]. */
-let sub: (t, int, int) => string
-
-/** [Buffer.blit src srcoff dst dstoff len] copies [len] characters from
-   the current contents of the buffer [src], starting at offset [srcoff]
-   to [dst], starting at character [dstoff].
-
-   Raise [Invalid_argument] if [srcoff] and [len] do not designate a valid
-   range of [src], or if [dstoff] and [len] do not designate a valid
-   range of [dst].
-   @since 3.11.2
-*/
-let blit: (t, int, bytes, int, int) => unit
-
-/** Get the n-th character of the buffer. Raise [Invalid_argument] if
-    index out of bounds */
-let nth: (t, int) => char
-
-/** Return the number of characters currently contained in the buffer. */
-let length: t => int
-
-/** Empty the buffer. */
-let clear: t => unit
-
-/** Empty the buffer and deallocate the internal byte sequence holding the
-   buffer contents, replacing it with the initial internal byte sequence
-   of length [n] that was allocated by {!Buffer.create} [n].
-   For long-lived buffers that may have grown a lot, [reset] allows
-   faster reclamation of the space used by the buffer. */
-let reset: t => unit
-
-/** [add_char b c] appends the character [c] at the end of buffer [b]. */
-let add_char: (t, char) => unit
-
-/** [add_utf_8_uchar b u] appends the {{:https://tools.ietf.org/html/rfc3629}
-    UTF-8} encoding of [u] at the end of buffer [b].
-
-    @since 4.06.0 */
-let add_utf_8_uchar: (t, Uchar.t) => unit
-
-/** [add_utf_16le_uchar b u] appends the
-    {{:https://tools.ietf.org/html/rfc2781}UTF-16LE} encoding of [u]
-    at the end of buffer [b].
-
-    @since 4.06.0 */
-let add_utf_16le_uchar: (t, Uchar.t) => unit
-
-/** [add_utf_16be_uchar b u] appends the
-    {{:https://tools.ietf.org/html/rfc2781}UTF-16BE} encoding of [u]
-    at the end of buffer [b].
-
-    @since 4.06.0 */
-let add_utf_16be_uchar: (t, Uchar.t) => unit
-
-/** [add_string b s] appends the string [s] at the end of buffer [b]. */
-let add_string: (t, string) => unit
-
-/** [add_bytes b s] appends the byte sequence [s] at the end of buffer [b].
-    @since 4.02 */
-let add_bytes: (t, bytes) => unit
-
-/** [add_substring b s ofs len] takes [len] characters from offset
-   [ofs] in string [s] and appends them at the end of buffer [b]. */
-let add_substring: (t, string, int, int) => unit
-
-/** [add_subbytes b s ofs len] takes [len] characters from offset
-    [ofs] in byte sequence [s] and appends them at the end of buffer [b].
-    @since 4.02 */
-let add_subbytes: (t, bytes, int, int) => unit
-
-/** [add_substitute b f s] appends the string pattern [s] at the end
-   of buffer [b] with substitution.
-   The substitution process looks for variables into
-   the pattern and substitutes each variable name by its value, as
-   obtained by applying the mapping [f] to the variable name. Inside the
-   string pattern, a variable name immediately follows a non-escaped
-   [$] character and is one of the following:
-   - a non empty sequence of alphanumeric or [_] characters,
-   - an arbitrary sequence of characters enclosed by a pair of
-   matching parentheses or curly brackets.
-   An escaped [$] character is a [$] that immediately follows a backslash
-   character; it then stands for a plain [$].
-   Raise [Not_found] if the closing character of a parenthesized variable
-   cannot be found. */
-let add_substitute: (t, string => string, string) => unit
-
-/** [add_buffer b1 b2] appends the current contents of buffer [b2]
-   at the end of buffer [b1].  [b2] is not modified. */
-let add_buffer: (t, t) => unit
-
-/** [truncate b len] truncates the length of [b] to [len]
-  Note: the internal byte sequence is not shortened.
-  Raise [Invalid_argument] if [len < 0] or [len > length b].
-  @since 4.05.0 */
-let truncate: (t, int) => unit
diff --git a/jscomp/stdlib-406/bytes.res b/jscomp/stdlib-406/bytes.res
deleted file mode 100644
index d7f9c5c..0000000
Binary files a/jscomp/stdlib-406/bytes.res and /dev/null differ
diff --git a/jscomp/stdlib-406/bytes.resi b/jscomp/stdlib-406/bytes.resi
deleted file mode 100644
index 2b65cb4..0000000
--- a/jscomp/stdlib-406/bytes.resi
+++ /dev/null
@@ -1,427 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Byte sequence operations.
-
-   A byte sequence is a mutable data structure that contains a
-   fixed-length sequence of bytes. Each byte can be indexed in
-   constant time for reading or writing.
-
-   Given a byte sequence [s] of length [l], we can access each of the
-   [l] bytes of [s] via its index in the sequence. Indexes start at
-   [0], and we will call an index valid in [s] if it falls within the
-   range [[0...l-1]] (inclusive). A position is the point between two
-   bytes or at the beginning or end of the sequence.  We call a
-   position valid in [s] if it falls within the range [[0...l]]
-   (inclusive). Note that the byte at index [n] is between positions
-   [n] and [n+1].
-
-   Two parameters [start] and [len] are said to designate a valid
-   range of [s] if [len >= 0] and [start] and [start+len] are valid
-   positions in [s].
-
-   Byte sequences can be modified in place, for instance via the [set]
-   and [blit] functions described below.  See also strings (module
-   {!String}), which are almost the same data structure, but cannot be
-   modified in place.
-
-   Bytes are represented by the OCaml type [char].
-
-   @since 4.02.0
-*/
-
-/** Return the length (number of bytes) of the argument. */
-external length: bytes => int = "%bytes_length"
-
-/** [get s n] returns the byte at index [n] in argument [s].
-
-    Raise [Invalid_argument] if [n] is not a valid index in [s]. */
-external get: (bytes, int) => char = "%bytes_safe_get"
-
-/** [set s n c] modifies [s] in place, replacing the byte at index [n]
-    with [c].
-
-    Raise [Invalid_argument] if [n] is not a valid index in [s]. */
-external set: (bytes, int, char) => unit = "%bytes_safe_set"
-
-/** [create n] returns a new byte sequence of length [n]. The
-    sequence is uninitialized and contains arbitrary bytes.
-
-    Raise [Invalid_argument] if [n < 0] or [n > ]{!Sys.max_string_length}. */
-external create: int => bytes = "?create_bytes"
-
-/** [make n c] returns a new byte sequence of length [n], filled with
-    the byte [c].
-
-    Raise [Invalid_argument] if [n < 0] or [n > ]{!Sys.max_string_length}. */
-let make: (int, char) => bytes
-
-/** [Bytes.init n f] returns a fresh byte sequence of length [n], with
-    character [i] initialized to the result of [f i] (in increasing
-    index order).
-
-    Raise [Invalid_argument] if [n < 0] or [n > ]{!Sys.max_string_length}. */
-let init: (int, int => char) => bytes
-
-/** A byte sequence of size 0. */
-let empty: bytes
-
-/** Return a new byte sequence that contains the same bytes as the
-    argument. */
-let copy: bytes => bytes
-
-/** Return a new byte sequence that contains the same bytes as the
-    given string. */
-let of_string: string => bytes
-
-/** Return a new string that contains the same bytes as the given byte
-    sequence. */
-let to_string: bytes => string
-
-/** [sub s start len] returns a new byte sequence of length [len],
-    containing the subsequence of [s] that starts at position [start]
-    and has length [len].
-
-    Raise [Invalid_argument] if [start] and [len] do not designate a
-    valid range of [s]. */
-let sub: (bytes, int, int) => bytes
-
-/** Same as [sub] but return a string instead of a byte sequence. */
-let sub_string: (bytes, int, int) => string
-
-/** [extend s left right] returns a new byte sequence that contains
-    the bytes of [s], with [left] uninitialized bytes prepended and
-    [right] uninitialized bytes appended to it. If [left] or [right]
-    is negative, then bytes are removed (instead of appended) from
-    the corresponding side of [s].
-
-    Raise [Invalid_argument] if the result length is negative or
-    longer than {!Sys.max_string_length} bytes. */
-let extend: (bytes, int, int) => bytes
-
-/** [fill s start len c] modifies [s] in place, replacing [len]
-    characters with [c], starting at [start].
-
-    Raise [Invalid_argument] if [start] and [len] do not designate a
-    valid range of [s]. */
-let fill: (bytes, int, int, char) => unit
-
-/** [blit src srcoff dst dstoff len] copies [len] bytes from sequence
-    [src], starting at index [srcoff], to sequence [dst], starting at
-    index [dstoff]. It works correctly even if [src] and [dst] are the
-    same byte sequence, and the source and destination intervals
-    overlap.
-
-    Raise [Invalid_argument] if [srcoff] and [len] do not
-    designate a valid range of [src], or if [dstoff] and [len]
-    do not designate a valid range of [dst]. */
-let blit: (bytes, int, bytes, int, int) => unit
-
-/** [blit src srcoff dst dstoff len] copies [len] bytes from string
-    [src], starting at index [srcoff], to byte sequence [dst],
-    starting at index [dstoff].
-
-    Raise [Invalid_argument] if [srcoff] and [len] do not
-    designate a valid range of [src], or if [dstoff] and [len]
-    do not designate a valid range of [dst]. */
-let blit_string: (string, int, bytes, int, int) => unit
-
-/** [concat sep sl] concatenates the list of byte sequences [sl],
-    inserting the separator byte sequence [sep] between each, and
-    returns the result as a new byte sequence.
-
-    Raise [Invalid_argument] if the result is longer than
-    {!Sys.max_string_length} bytes. */
-let concat: (bytes, list<bytes>) => bytes
-
-/** [cat s1 s2] concatenates [s1] and [s2] and returns the result
-     as new byte sequence.
-
-    Raise [Invalid_argument] if the result is longer than
-    {!Sys.max_string_length} bytes. */
-let cat: (bytes, bytes) => bytes
-
-/** [iter f s] applies function [f] in turn to all the bytes of [s].
-    It is equivalent to [f (get s 0); f (get s 1); ...; f (get s
-    (length s - 1)); ()]. */
-let iter: (char => unit, bytes) => unit
-
-/** Same as {!Bytes.iter}, but the function is applied to the index of
-    the byte as first argument and the byte itself as second
-    argument. */
-let iteri: ((int, char) => unit, bytes) => unit
-
-/** [map f s] applies function [f] in turn to all the bytes of [s]
-    (in increasing index order) and stores the resulting bytes in
-    a new sequence that is returned as the result. */
-let map: (char => char, bytes) => bytes
-
-/** [mapi f s] calls [f] with each character of [s] and its
-    index (in increasing index order) and stores the resulting bytes
-    in a new sequence that is returned as the result. */
-let mapi: ((int, char) => char, bytes) => bytes
-
-/** Return a copy of the argument, without leading and trailing
-    whitespace. The bytes regarded as whitespace are the ASCII
-    characters [' '], ['\x0c'], ['\n'], ['\r'], and ['\t']. */
-let trim: bytes => bytes
-
-/** Return a copy of the argument, with special characters represented
-    by escape sequences, following the lexical conventions of OCaml.
-    All characters outside the ASCII printable range (32..126) are
-    escaped, as well as backslash and double-quote.
-
-    Raise [Invalid_argument] if the result is longer than
-    {!Sys.max_string_length} bytes. */
-let escaped: bytes => bytes
-
-/** [index s c] returns the index of the first occurrence of byte [c]
-    in [s].
-
-    Raise [Not_found] if [c] does not occur in [s]. */
-let index: (bytes, char) => int
-
-/** [index_opt s c] returns the index of the first occurrence of byte [c]
-    in [s] or [None] if [c] does not occur in [s].
-    @since 4.05 */
-let index_opt: (bytes, char) => option<int>
-
-/** [rindex s c] returns the index of the last occurrence of byte [c]
-    in [s].
-
-    Raise [Not_found] if [c] does not occur in [s]. */
-let rindex: (bytes, char) => int
-
-/** [rindex_opt s c] returns the index of the last occurrence of byte [c]
-    in [s] or [None] if [c] does not occur in [s].
-    @since 4.05 */
-let rindex_opt: (bytes, char) => option<int>
-
-/** [index_from s i c] returns the index of the first occurrence of
-    byte [c] in [s] after position [i].  [Bytes.index s c] is
-    equivalent to [Bytes.index_from s 0 c].
-
-    Raise [Invalid_argument] if [i] is not a valid position in [s].
-    Raise [Not_found] if [c] does not occur in [s] after position [i]. */
-let index_from: (bytes, int, char) => int
-
-/** [index_from _opts i c] returns the index of the first occurrence of
-    byte [c] in [s] after position [i] or [None] if [c] does not occur in [s] after position [i].
-    [Bytes.index_opt s c] is equivalent to [Bytes.index_from_opt s 0 c].
-
-    Raise [Invalid_argument] if [i] is not a valid position in [s].
-    @since 4.05 */
-let index_from_opt: (bytes, int, char) => option<int>
-
-/** [rindex_from s i c] returns the index of the last occurrence of
-    byte [c] in [s] before position [i+1].  [rindex s c] is equivalent
-    to [rindex_from s (Bytes.length s - 1) c].
-
-    Raise [Invalid_argument] if [i+1] is not a valid position in [s].
-    Raise [Not_found] if [c] does not occur in [s] before position [i+1]. */
-let rindex_from: (bytes, int, char) => int
-
-/** [rindex_from_opt s i c] returns the index of the last occurrence
-    of byte [c] in [s] before position [i+1] or [None] if [c] does not
-    occur in [s] before position [i+1].  [rindex_opt s c] is equivalent to
-    [rindex_from s (Bytes.length s - 1) c].
-
-    Raise [Invalid_argument] if [i+1] is not a valid position in [s].
-    @since 4.05 */
-let rindex_from_opt: (bytes, int, char) => option<int>
-
-/** [contains s c] tests if byte [c] appears in [s]. */
-let contains: (bytes, char) => bool
-
-/** [contains_from s start c] tests if byte [c] appears in [s] after
-    position [start].  [contains s c] is equivalent to [contains_from
-    s 0 c].
-
-    Raise [Invalid_argument] if [start] is not a valid position in [s]. */
-let contains_from: (bytes, int, char) => bool
-
-/** [rcontains_from s stop c] tests if byte [c] appears in [s] before
-    position [stop+1].
-
-    Raise [Invalid_argument] if [stop < 0] or [stop+1] is not a valid
-    position in [s]. */
-let rcontains_from: (bytes, int, char) => bool
-
-/** Return a copy of the argument, with all lowercase letters
-   translated to uppercase, using the US-ASCII character set.
-   @since 4.03.0 */
-let uppercase_ascii: bytes => bytes
-
-/** Return a copy of the argument, with all uppercase letters
-   translated to lowercase, using the US-ASCII character set.
-   @since 4.03.0 */
-let lowercase_ascii: bytes => bytes
-
-/** Return a copy of the argument, with the first character set to uppercase,
-   using the US-ASCII character set.
-   @since 4.03.0 */
-let capitalize_ascii: bytes => bytes
-
-/** Return a copy of the argument, with the first character set to lowercase,
-   using the US-ASCII character set.
-   @since 4.03.0 */
-let uncapitalize_ascii: bytes => bytes
-
-/** An alias for the type of byte sequences. */
-type t = bytes
-
-/** The comparison function for byte sequences, with the same
-    specification as {!Pervasives.compare}.  Along with the type [t],
-    this function [compare] allows the module [Bytes] to be passed as
-    argument to the functors {!Set.Make} and {!Map.Make}. */
-let compare: (t, t) => int
-
-/** The equality function for byte sequences.
-    @since 4.03.0 */
-let equal: (t, t) => bool
-
-/* {3 Unsafe conversions (for advanced users)}
-
-    This section describes unsafe, low-level conversion functions
-    between [bytes] and [string]. They do not copy the internal data;
-    used improperly, they can break the immutability invariant on
-    strings provided by the [-safe-string] option. They are available for
-    expert library authors, but for most purposes you should use the
-    always-correct {!Bytes.to_string} and {!Bytes.of_string} instead.
-*/
-
-/** Unsafely convert a byte sequence into a string.
-
-    To reason about the use of [unsafe_to_string], it is convenient to
-    consider an "ownership" discipline. A piece of code that
-    manipulates some data "owns" it; there are several disjoint ownership
-    modes, including:
-    - Unique ownership: the data may be accessed and mutated
-    - Shared ownership: the data has several owners, that may only
-      access it, not mutate it.
-
-    Unique ownership is linear: passing the data to another piece of
-    code means giving up ownership (we cannot write the
-    data again). A unique owner may decide to make the data shared
-    (giving up mutation rights on it), but shared data may not become
-    uniquely-owned again.
-
-   [unsafe_to_string s] can only be used when the caller owns the byte
-   sequence [s] -- either uniquely or as shared immutable data. The
-   caller gives up ownership of [s], and gains ownership of the
-   returned string.
-
-   There are two valid use-cases that respect this ownership
-   discipline:
-
-   1. Creating a string by initializing and mutating a byte sequence
-   that is never changed after initialization is performed.
-
-   {[
-let string_init len f : string =
-  let s = Bytes.create len in
-  for i = 0 to len - 1 do Bytes.set s i (f i) done;
-  Bytes.unsafe_to_string s
-   ]}
-
-   This function is safe because the byte sequence [s] will never be
-   accessed or mutated after [unsafe_to_string] is called. The
-   [string_init] code gives up ownership of [s], and returns the
-   ownership of the resulting string to its caller.
-
-   Note that it would be unsafe if [s] was passed as an additional
-   parameter to the function [f] as it could escape this way and be
-   mutated in the future -- [string_init] would give up ownership of
-   [s] to pass it to [f], and could not call [unsafe_to_string]
-   safely.
-
-   We have provided the {!String.init}, {!String.map} and
-   {!String.mapi} functions to cover most cases of building
-   new strings. You should prefer those over [to_string] or
-   [unsafe_to_string] whenever applicable.
-
-   2. Temporarily giving ownership of a byte sequence to a function
-   that expects a uniquely owned string and returns ownership back, so
-   that we can mutate the sequence again after the call ended.
-
-   {[
-let bytes_length (s : bytes) =
-  String.length (Bytes.unsafe_to_string s)
-   ]}
-
-   In this use-case, we do not promise that [s] will never be mutated
-   after the call to [bytes_length s]. The {!String.length} function
-   temporarily borrows unique ownership of the byte sequence
-   (and sees it as a [string]), but returns this ownership back to
-   the caller, which may assume that [s] is still a valid byte
-   sequence after the call. Note that this is only correct because we
-   know that {!String.length} does not capture its argument -- it could
-   escape by a side-channel such as a memoization combinator.
-
-   The caller may not mutate [s] while the string is borrowed (it has
-   temporarily given up ownership). This affects concurrent programs,
-   but also higher-order functions: if {!String.length} returned
-   a closure to be called later, [s] should not be mutated until this
-   closure is fully applied and returns ownership.
-*/
-let unsafe_to_string: bytes => string
-
-/** Unsafely convert a shared string to a byte sequence that should
-    not be mutated.
-
-    The same ownership discipline that makes [unsafe_to_string]
-    correct applies to [unsafe_of_string]: you may use it if you were
-    the owner of the [string] value, and you will own the return
-    [bytes] in the same mode.
-
-    In practice, unique ownership of string values is extremely
-    difficult to reason about correctly. You should always assume
-    strings are shared, never uniquely owned.
-
-    For example, string literals are implicitly shared by the
-    compiler, so you never uniquely own them.
-
-    {[
-let incorrect = Bytes.unsafe_of_string "hello"
-let s = Bytes.of_string "hello"
-    ]}
-
-    The first declaration is incorrect, because the string literal
-    ["hello"] could be shared by the compiler with other parts of the
-    program, and mutating [incorrect] is a bug. You must always use
-    the second version, which performs a copy and is thus correct.
-
-    Assuming unique ownership of strings that are not string
-    literals, but are (partly) built from string literals, is also
-    incorrect. For example, mutating [unsafe_of_string ("foo" ^ s)]
-    could mutate the shared string ["foo"] -- assuming a rope-like
-    representation of strings. More generally, functions operating on
-    strings will assume shared ownership, they do not preserve unique
-    ownership. It is thus incorrect to assume unique ownership of the
-    result of [unsafe_of_string].
-
-    The only case we have reasonable confidence is safe is if the
-    produced [bytes] is shared -- used as an immutable byte
-    sequence. This is possibly useful for incremental migration of
-    low-level programs that manipulate immutable sequences of bytes
-    (for example {!Marshal.from_bytes}) and previously used the
-    [string] type for this purpose.
-*/
-let unsafe_of_string: string => bytes
-
-/* The following is for system use only. Do not call directly. */
-
-external unsafe_get: (bytes, int) => char = "%bytes_unsafe_get"
-external unsafe_set: (bytes, int, char) => unit = "%bytes_unsafe_set"
diff --git a/jscomp/stdlib-406/bytesLabels.res b/jscomp/stdlib-406/bytesLabels.res
deleted file mode 100644
index 527d76a..0000000
Binary files a/jscomp/stdlib-406/bytesLabels.res and /dev/null differ
diff --git a/jscomp/stdlib-406/bytesLabels.resi b/jscomp/stdlib-406/bytesLabels.resi
deleted file mode 100644
index 411f939..0000000
--- a/jscomp/stdlib-406/bytesLabels.resi
+++ /dev/null
@@ -1,269 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Byte sequence operations.
-    @since 4.02.0
-*/
-
-/** Return the length (number of bytes) of the argument. */
-external length: bytes => int = "%bytes_length"
-
-/** [get s n] returns the byte at index [n] in argument [s].
-
-    Raise [Invalid_argument] if [n] is not a valid index in [s]. */
-external get: (bytes, int) => char = "%bytes_safe_get"
-
-/** [set s n c] modifies [s] in place, replacing the byte at index [n]
-    with [c].
-
-    Raise [Invalid_argument] if [n] is not a valid index in [s]. */
-external set: (bytes, int, char) => unit = "%bytes_safe_set"
-
-/** [create n] returns a new byte sequence of length [n]. The
-    sequence is uninitialized and contains arbitrary bytes.
-
-    Raise [Invalid_argument] if [n < 0] or [n > ]{!Sys.max_string_length}. */
-external create: int => bytes = "?create_bytes"
-
-/** [make n c] returns a new byte sequence of length [n], filled with
-    the byte [c].
-
-    Raise [Invalid_argument] if [n < 0] or [n > ]{!Sys.max_string_length}. */
-let make: (int, char) => bytes
-
-/** [init n f] returns a fresh byte sequence of length [n],
-    with character [i] initialized to the result of [f i].
-
-    Raise [Invalid_argument] if [n < 0] or [n > ]{!Sys.max_string_length}. */
-let init: (int, ~f: int => char) => bytes
-
-/** A byte sequence of size 0. */
-let empty: bytes
-
-/** Return a new byte sequence that contains the same bytes as the
-    argument. */
-let copy: bytes => bytes
-
-/** Return a new byte sequence that contains the same bytes as the
-    given string. */
-let of_string: string => bytes
-
-/** Return a new string that contains the same bytes as the given byte
-    sequence. */
-let to_string: bytes => string
-
-/** [sub s start len] returns a new byte sequence of length [len],
-    containing the subsequence of [s] that starts at position [start]
-    and has length [len].
-
-    Raise [Invalid_argument] if [start] and [len] do not designate a
-    valid range of [s]. */
-let sub: (bytes, ~pos: int, ~len: int) => bytes
-
-/** Same as [sub] but return a string instead of a byte sequence. */
-let sub_string: (bytes, ~pos: int, ~len: int) => string
-
-/** [extend s left right] returns a new byte sequence that contains
-    the bytes of [s], with [left] uninitialized bytes prepended and
-    [right] uninitialized bytes appended to it. If [left] or [right]
-    is negative, then bytes are removed (instead of appended) from
-    the corresponding side of [s].
-
-    Raise [Invalid_argument] if the result length is negative or
-    longer than {!Sys.max_string_length} bytes.
-    @since 4.05.0 */
-let extend: (bytes, ~left: int, ~right: int) => bytes
-
-/** [fill s start len c] modifies [s] in place, replacing [len]
-    characters with [c], starting at [start].
-
-    Raise [Invalid_argument] if [start] and [len] do not designate a
-    valid range of [s]. */
-let fill: (bytes, ~pos: int, ~len: int, char) => unit
-
-/** [blit src srcoff dst dstoff len] copies [len] bytes from sequence
-    [src], starting at index [srcoff], to sequence [dst], starting at
-    index [dstoff]. It works correctly even if [src] and [dst] are the
-    same byte sequence, and the source and destination intervals
-    overlap.
-
-    Raise [Invalid_argument] if [srcoff] and [len] do not
-    designate a valid range of [src], or if [dstoff] and [len]
-    do not designate a valid range of [dst]. */
-let blit: (~src: bytes, ~src_pos: int, ~dst: bytes, ~dst_pos: int, ~len: int) => unit
-
-/** [blit src srcoff dst dstoff len] copies [len] bytes from string
-    [src], starting at index [srcoff], to byte sequence [dst],
-    starting at index [dstoff].
-
-    Raise [Invalid_argument] if [srcoff] and [len] do not
-    designate a valid range of [src], or if [dstoff] and [len]
-    do not designate a valid range of [dst].
-    @since 4.05.0 */
-let blit_string: (~src: string, ~src_pos: int, ~dst: bytes, ~dst_pos: int, ~len: int) => unit
-
-/** [concat sep sl] concatenates the list of byte sequences [sl],
-    inserting the separator byte sequence [sep] between each, and
-    returns the result as a new byte sequence. */
-let concat: (~sep: bytes, list<bytes>) => bytes
-
-/** [cat s1 s2] concatenates [s1] and [s2] and returns the result
-     as new byte sequence.
-
-    Raise [Invalid_argument] if the result is longer than
-    {!Sys.max_string_length} bytes.
-    @since 4.05.0 */
-let cat: (bytes, bytes) => bytes
-
-/** [iter f s] applies function [f] in turn to all the bytes of [s].
-    It is equivalent to [f (get s 0); f (get s 1); ...; f (get s
-    (length s - 1)); ()]. */
-let iter: (~f: char => unit, bytes) => unit
-
-/** Same as {!Bytes.iter}, but the function is applied to the index of
-    the byte as first argument and the byte itself as second
-    argument. */
-let iteri: (~f: (int, char) => unit, bytes) => unit
-
-/** [map f s] applies function [f] in turn to all the bytes of [s] and
-    stores the resulting bytes in a new sequence that is returned as
-    the result. */
-let map: (~f: char => char, bytes) => bytes
-
-/** [mapi f s] calls [f] with each character of [s] and its
-    index (in increasing index order) and stores the resulting bytes
-    in a new sequence that is returned as the result. */
-let mapi: (~f: (int, char) => char, bytes) => bytes
-
-/** Return a copy of the argument, without leading and trailing
-    whitespace. The bytes regarded as whitespace are the ASCII
-    characters [' '], ['\x0c'], ['\n'], ['\r'], and ['\t']. */
-let trim: bytes => bytes
-
-/** Return a copy of the argument, with special characters represented
-    by escape sequences, following the lexical conventions of OCaml. */
-let escaped: bytes => bytes
-
-/** [index s c] returns the index of the first occurrence of byte [c]
-    in [s].
-
-    Raise [Not_found] if [c] does not occur in [s]. */
-let index: (bytes, char) => int
-
-/** [index_opt s c] returns the index of the first occurrence of byte [c]
-    in [s] or [None] if [c] does not occur in [s].
-    @since 4.05 */
-let index_opt: (bytes, char) => option<int>
-
-/** [rindex s c] returns the index of the last occurrence of byte [c]
-    in [s].
-
-    Raise [Not_found] if [c] does not occur in [s]. */
-let rindex: (bytes, char) => int
-
-/** [rindex_opt s c] returns the index of the last occurrence of byte [c]
-    in [s] or [None] if [c] does not occur in [s].
-    @since 4.05 */
-let rindex_opt: (bytes, char) => option<int>
-
-/** [index_from s i c] returns the index of the first occurrence of
-    byte [c] in [s] after position [i].  [Bytes.index s c] is
-    equivalent to [Bytes.index_from s 0 c].
-
-    Raise [Invalid_argument] if [i] is not a valid position in [s].
-    Raise [Not_found] if [c] does not occur in [s] after position [i]. */
-let index_from: (bytes, int, char) => int
-
-/** [index_from _opts i c] returns the index of the first occurrence of
-    byte [c] in [s] after position [i] or [None] if [c] does not occur in [s] after position [i].
-    [Bytes.index_opt s c] is equivalent to [Bytes.index_from_opt s 0 c].
-
-    Raise [Invalid_argument] if [i] is not a valid position in [s].
-    @since 4.05 */
-let index_from_opt: (bytes, int, char) => option<int>
-
-/** [rindex_from s i c] returns the index of the last occurrence of
-    byte [c] in [s] before position [i+1].  [rindex s c] is equivalent
-    to [rindex_from s (Bytes.length s - 1) c].
-
-    Raise [Invalid_argument] if [i+1] is not a valid position in [s].
-    Raise [Not_found] if [c] does not occur in [s] before position [i+1]. */
-let rindex_from: (bytes, int, char) => int
-
-/** [rindex_from_opt s i c] returns the index of the last occurrence
-    of byte [c] in [s] before position [i+1] or [None] if [c] does not
-    occur in [s] before position [i+1].  [rindex_opt s c] is equivalent to
-    [rindex_from s (Bytes.length s - 1) c].
-
-    Raise [Invalid_argument] if [i+1] is not a valid position in [s].
-    @since 4.05 */
-let rindex_from_opt: (bytes, int, char) => option<int>
-
-/** [contains s c] tests if byte [c] appears in [s]. */
-let contains: (bytes, char) => bool
-
-/** [contains_from s start c] tests if byte [c] appears in [s] after
-    position [start].  [contains s c] is equivalent to [contains_from
-    s 0 c].
-
-    Raise [Invalid_argument] if [start] is not a valid position in [s]. */
-let contains_from: (bytes, int, char) => bool
-
-/** [rcontains_from s stop c] tests if byte [c] appears in [s] before
-    position [stop+1].
-
-    Raise [Invalid_argument] if [stop < 0] or [stop+1] is not a valid
-    position in [s]. */
-let rcontains_from: (bytes, int, char) => bool
-
-/** Return a copy of the argument, with all lowercase letters
-   translated to uppercase, using the US-ASCII character set.
-   @since 4.05.0 */
-let uppercase_ascii: bytes => bytes
-
-/** Return a copy of the argument, with all uppercase letters
-   translated to lowercase, using the US-ASCII character set.
-   @since 4.05.0 */
-let lowercase_ascii: bytes => bytes
-
-/** Return a copy of the argument, with the first character set to uppercase,
-   using the US-ASCII character set.
-   @since 4.05.0 */
-let capitalize_ascii: bytes => bytes
-
-/** Return a copy of the argument, with the first character set to lowercase,
-   using the US-ASCII character set.
-   @since 4.05.0 */
-let uncapitalize_ascii: bytes => bytes
-
-/** An alias for the type of byte sequences. */
-type t = bytes
-
-/** The comparison function for byte sequences, with the same
-    specification as {!Pervasives.compare}.  Along with the type [t],
-    this function [compare] allows the module [Bytes] to be passed as
-    argument to the functors {!Set.Make} and {!Map.Make}. */
-let compare: (t, t) => int
-
-/** The equality function for byte sequences.
-    @since 4.05.0 */
-let equal: (t, t) => bool
-
-/* The following is for system use only. Do not call directly. */
-
-external unsafe_get: (bytes, int) => char = "%bytes_unsafe_get"
-external unsafe_set: (bytes, int, char) => unit = "%bytes_unsafe_set"
-let unsafe_to_string: bytes => string
-let unsafe_of_string: string => bytes
diff --git a/jscomp/stdlib-406/callback.res b/jscomp/stdlib-406/callback.res
deleted file mode 100644
index 6637889..0000000
--- a/jscomp/stdlib-406/callback.res
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-@@bs.config({flags: ["-bs-no-cross-module-opt"]})
-/* Registering OCaml values with the C runtime for later callbacks */
-
-let register = (_, _) => ()
-let register_exception = (_, _) => ()
diff --git a/jscomp/stdlib-406/callback.resi b/jscomp/stdlib-406/callback.resi
deleted file mode 100644
index bff7283..0000000
--- a/jscomp/stdlib-406/callback.resi
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Registering OCaml values with the C runtime.
-
-   This module allows OCaml values to be registered with the C runtime
-   under a symbolic name, so that C code can later call back registered
-   OCaml functions, or raise registered OCaml exceptions.
-*/
-
-/** [Callback.register n v] registers the value [v] under
-   the name [n]. C code can later retrieve a handle to [v]
-   by calling [caml_named_value(n)]. */
-let register: (string, 'a) => unit
-
-/** [Callback.register_exception n exn] registers the
-   exception contained in the exception value [exn]
-   under the name [n]. C code can later retrieve a handle to
-   the exception by calling [caml_named_value(n)]. The exception
-   value thus obtained is suitable for passing as first argument
-   to [raise_constant] or [raise_with_arg]. */
-let register_exception: (string, exn) => unit
diff --git a/jscomp/stdlib-406/camlinternalLazy.res b/jscomp/stdlib-406/camlinternalLazy.res
deleted file mode 100644
index e372785..0000000
--- a/jscomp/stdlib-406/camlinternalLazy.res
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Copyright (C) 2017 Hongbo Zhang, Authors of ReScript
- *
- * 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-@@bs.config({flags: ["-bs-no-cross-module-opt"]})
-
-/* Internals of forcing lazy values. */
-type t<'a> = {
-  @as("LAZY_DONE") mutable tag: bool,
-  /* Invariant: name */
-  @as("VAL") mutable value: 'a,
-  /* its type is ['a] or [unit -> 'a ] */
-}
-
-%%private(external fnToVal: ((. unit) => 'a) => 'a = "%identity")
-%%private(external valToFn: 'a => (. unit) => 'a = "%identity")
-%%private(external castToConcrete: lazy_t<'a> => t<'a> = "%identity")
-
-let is_val = (type a, l: lazy_t<a>): bool => castToConcrete(l).tag
-
-exception Undefined
-
-%%private(
-  let forward_with_closure = (type a, blk: t<a>, closure: (. unit) => a): a => {
-    let result = closure(.)
-    blk.value = result
-    blk.tag = true
-    result
-  }
-)
-
-%%private(let raise_undefined = (. ()) => raise(Undefined))
-
-/* Assume [blk] is a block with tag lazy */
-%%private(
-  let force_lazy_block = (type a, blk: t<a>): a => {
-    let closure = valToFn(blk.value)
-    blk.value = fnToVal(raise_undefined)
-    try forward_with_closure(blk, closure) catch {
-    | e =>
-      blk.value = fnToVal((. ()) => raise(e))
-      raise(e)
-    }
-  }
-)
-
-/* Assume [blk] is a block with tag lazy */
-%%private(
-  let force_val_lazy_block = (type a, blk: t<a>): a => {
-    let closure = valToFn(blk.value)
-    blk.value = fnToVal(raise_undefined)
-    forward_with_closure(blk, closure)
-  }
-)
-
-let force = (type a, lzv: lazy_t<a>): a => {
-  let lzv: t<_> = castToConcrete(lzv)
-  if lzv.tag {
-    lzv.value
-  } else {
-    force_lazy_block(lzv)
-  }
-}
-
-let force_val = (type a, lzv: lazy_t<a>): a => {
-  let lzv: t<_> = castToConcrete(lzv)
-  if lzv.tag {
-    lzv.value
-  } else {
-    force_val_lazy_block(lzv)
-  }
-}
diff --git a/jscomp/stdlib-406/camlinternalLazy.resi b/jscomp/stdlib-406/camlinternalLazy.resi
deleted file mode 100644
index 82e0be3..0000000
--- a/jscomp/stdlib-406/camlinternalLazy.resi
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Damien Doligez, projet Para, INRIA Rocquencourt */
-/*  */
-/* Copyright 1997 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Run-time support for lazy values.
-    All functions in this module are for system use only, not for the
-    casual user. */
-
-exception Undefined
-
-let force: lazy_t<'a> => 'a
-/* instrumented by {!Matching} */
-
-let force_val: lazy_t<'a> => 'a
-
-let is_val: lazy_t<'a> => bool
diff --git a/jscomp/stdlib-406/camlinternalMod.res b/jscomp/stdlib-406/camlinternalMod.res
deleted file mode 100644
index 3bf65c6..0000000
--- a/jscomp/stdlib-406/camlinternalMod.res
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 2004 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-type rec shape =
-  | Function
-  | Lazy
-  | Class
-  | Module(array<shape>)
-  | Value(Obj.t)
diff --git a/jscomp/stdlib-406/camlinternalMod.resi b/jscomp/stdlib-406/camlinternalMod.resi
deleted file mode 100644
index e5529a4..0000000
--- a/jscomp/stdlib-406/camlinternalMod.resi
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 2004 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Run-time support for recursive modules.
-    All functions in this module are for system use only, not for the
-    casual user. */
-
-type rec shape =
-  | Function
-  | Lazy
-  | Class
-  | Module(array<shape>)
-  | Value(Obj.t)
diff --git a/jscomp/stdlib-406/char.res b/jscomp/stdlib-406/char.res
deleted file mode 100644
index afc28ae..0000000
--- a/jscomp/stdlib-406/char.res
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Character operations */
-
-external code: char => int = "%identity"
-external unsafe_chr: int => char = "%identity"
-
-let chr = n =>
-  if n < 0 || n > 255 {
-    invalid_arg("Char.chr")
-  } else {
-    unsafe_chr(n)
-  }
-
-external bytes_create: int => bytes = "?create_bytes"
-external bytes_unsafe_set: (bytes, int, char) => unit = "%bytes_unsafe_set"
-external unsafe_to_string: bytes => string = "%bytes_to_string"
-
-let escaped = param =>
-  switch param {
-  | '\'' => "\\'"
-  | '\\' => "\\\\"
-  | '\n' => "\\n"
-  | '\t' => "\\t"
-  | '\r' => "\\r"
-  | '\b' => "\\b"
-  | ' ' .. '~' as c =>
-    let s = bytes_create(1)
-    bytes_unsafe_set(s, 0, c)
-    unsafe_to_string(s)
-  | c =>
-    let n = code(c)
-    let s = bytes_create(4)
-    bytes_unsafe_set(s, 0, '\\')
-    bytes_unsafe_set(s, 1, unsafe_chr(48 + n / 100))
-    bytes_unsafe_set(s, 2, unsafe_chr(48 + mod(n / 10, 10)))
-    bytes_unsafe_set(s, 3, unsafe_chr(48 + mod(n, 10)))
-    unsafe_to_string(s)
-  }
-
-let lowercase = c =>
-  if (c >= 'A' && c <= 'Z') || ((c >= 'À' && c <= 'Ö') || c >= 'Ø' && c <= 'Þ') {
-    unsafe_chr(code(c) + 32)
-  } else {
-    c
-  }
-
-let uppercase = c =>
-  if (c >= 'a' && c <= 'z') || ((c >= 'à' && c <= 'ö') || c >= 'ø' && c <= 'þ') {
-    unsafe_chr(code(c) - 32)
-  } else {
-    c
-  }
-
-let lowercase_ascii = c =>
-  if c >= 'A' && c <= 'Z' {
-    unsafe_chr(code(c) + 32)
-  } else {
-    c
-  }
-
-let uppercase_ascii = c =>
-  if c >= 'a' && c <= 'z' {
-    unsafe_chr(code(c) - 32)
-  } else {
-    c
-  }
-
-type t = char
-
-let compare = (c1, c2) => code(c1) - code(c2)
-let equal = (c1: t, c2: t) => compare(c1, c2) == 0
diff --git a/jscomp/stdlib-406/char.resi b/jscomp/stdlib-406/char.resi
deleted file mode 100644
index 78e07aa..0000000
--- a/jscomp/stdlib-406/char.resi
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Character operations. */
-
-/** Return the ASCII code of the argument. */
-external code: char => int = "%identity"
-
-/** Return the character with the given ASCII code.
-   Raise [Invalid_argument "Char.chr"] if the argument is
-   outside the range 0--255. */
-let chr: int => char
-
-/** Return a string representing the given character,
-    with special characters escaped following the lexical conventions
-    of OCaml.
-    All characters outside the ASCII printable range (32..126) are
-    escaped, as well as backslash, double-quote, and single-quote. */
-let escaped: char => string
-
-@deprecated("Use Char.lowercase_ascii instead.")
-/** Convert the given character to its equivalent lowercase character,
-   using the ISO Latin-1 (8859-1) character set.
-   @deprecated Functions operating on Latin-1 character set are deprecated. */
-let lowercase: char => char
-
-@deprecated("Use Char.uppercase_ascii instead.")
-/** Convert the given character to its equivalent uppercase character,
-   using the ISO Latin-1 (8859-1) character set.
-   @deprecated Functions operating on Latin-1 character set are deprecated. */
-let uppercase: char => char
-
-/** Convert the given character to its equivalent lowercase character,
-   using the US-ASCII character set.
-   @since 4.03.0 */
-let lowercase_ascii: char => char
-
-/** Convert the given character to its equivalent uppercase character,
-   using the US-ASCII character set.
-   @since 4.03.0 */
-let uppercase_ascii: char => char
-
-/** An alias for the type of characters. */
-type t = char
-
-/** The comparison function for characters, with the same specification as
-    {!Pervasives.compare}.  Along with the type [t], this function [compare]
-    allows the module [Char] to be passed as argument to the functors
-    {!Set.Make} and {!Map.Make}. */
-let compare: (t, t) => int
-
-/** The equal function for chars.
-    @since 4.03.0 */
-let equal: (t, t) => bool
-
-/* The following is for system use only. Do not call directly. */
-
-external unsafe_chr: int => char = "%identity"
diff --git a/jscomp/stdlib-406/complex.res b/jscomp/stdlib-406/complex.res
deleted file mode 100644
index 4b05610..0000000
--- a/jscomp/stdlib-406/complex.res
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 2002 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Complex numbers */
-
-type t = {re: float, im: float}
-
-let zero = {re: 0.0, im: 0.0}
-let one = {re: 1.0, im: 0.0}
-let i = {re: 0.0, im: 1.0}
-
-let add = (x, y) => {re: x.re +. y.re, im: x.im +. y.im}
-
-let sub = (x, y) => {re: x.re -. y.re, im: x.im -. y.im}
-
-let neg = x => {re: -.x.re, im: -.x.im}
-
-let conj = x => {re: x.re, im: -.x.im}
-
-let mul = (x, y) => {
-  re: x.re *. y.re -. x.im *. y.im,
-  im: x.re *. y.im +. x.im *. y.re,
-}
-
-let div = (x, y) =>
-  if abs_float(y.re) >= abs_float(y.im) {
-    let r = y.im /. y.re
-    let d = y.re +. r *. y.im
-    {
-      re: (x.re +. r *. x.im) /. d,
-      im: (x.im -. r *. x.re) /. d,
-    }
-  } else {
-    let r = y.re /. y.im
-    let d = y.im +. r *. y.re
-    {
-      re: (r *. x.re +. x.im) /. d,
-      im: (r *. x.im -. x.re) /. d,
-    }
-  }
-
-let inv = x => div(one, x)
-
-let norm2 = x => x.re *. x.re +. x.im *. x.im
-
-let norm = x => {
-  /* Watch out for overflow in computing re^2 + im^2 */
-  let r = abs_float(x.re)
-  and i = abs_float(x.im)
-  if r == 0.0 {
-    i
-  } else if i == 0.0 {
-    r
-  } else if r >= i {
-    let q = i /. r
-    r *. sqrt(1.0 +. q *. q)
-  } else {
-    let q = r /. i
-    i *. sqrt(1.0 +. q *. q)
-  }
-}
-
-let arg = x => atan2(x.im, x.re)
-
-let polar = (n, a) => {re: cos(a) *. n, im: sin(a) *. n}
-
-let sqrt = x =>
-  if x.re == 0.0 && x.im == 0.0 {
-    {re: 0.0, im: 0.0}
-  } else {
-    let r = abs_float(x.re) and i = abs_float(x.im)
-    let w = if r >= i {
-      let q = i /. r
-      sqrt(r) *. sqrt(0.5 *. (1.0 +. sqrt(1.0 +. q *. q)))
-    } else {
-      let q = r /. i
-      sqrt(i) *. sqrt(0.5 *. (q +. sqrt(1.0 +. q *. q)))
-    }
-    if x.re >= 0.0 {
-      {re: w, im: 0.5 *. x.im /. w}
-    } else {
-      {
-        re: 0.5 *. i /. w,
-        im: if x.im >= 0.0 {
-          w
-        } else {
-          -.w
-        },
-      }
-    }
-  }
-
-let exp = x => {
-  let e = exp(x.re)
-  {re: e *. cos(x.im), im: e *. sin(x.im)}
-}
-
-let log = x => {re: log(norm(x)), im: atan2(x.im, x.re)}
-
-let pow = (x, y) => exp(mul(y, log(x)))
diff --git a/jscomp/stdlib-406/complex.resi b/jscomp/stdlib-406/complex.resi
deleted file mode 100644
index bacdc47..0000000
--- a/jscomp/stdlib-406/complex.resi
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 2002 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Complex numbers.
-
-    This module provides arithmetic operations on complex numbers.
-    Complex numbers are represented by their real and imaginary parts
-    (cartesian representation).  Each part is represented by a
-    double-precision floating-point number (type [float]). */
-
-/** The type of complex numbers.  [re] is the real part and [im] the
-    imaginary part. */
-type t = {re: float, im: float}
-
-/** The complex number [0]. */
-let zero: t
-
-/** The complex number [1]. */
-let one: t
-
-/** The complex number [i]. */
-let i: t
-
-/** Unary negation. */
-let neg: t => t
-
-/** Conjugate: given the complex [x + i.y], returns [x - i.y]. */
-let conj: t => t
-
-/** Addition */
-let add: (t, t) => t
-
-/** Subtraction */
-let sub: (t, t) => t
-
-/** Multiplication */
-let mul: (t, t) => t
-
-/** Multiplicative inverse ([1/z]). */
-let inv: t => t
-
-/** Division */
-let div: (t, t) => t
-
-/** Square root.  The result [x + i.y] is such that [x > 0] or
-    [x = 0] and [y >= 0].
-    This function has a discontinuity along the negative real axis. */
-let sqrt: t => t
-
-/** Norm squared: given [x + i.y], returns [x^2 + y^2]. */
-let norm2: t => float
-
-/** Norm: given [x + i.y], returns [sqrt(x^2 + y^2)]. */
-let norm: t => float
-
-/** Argument.  The argument of a complex number is the angle
-    in the complex plane between the positive real axis and a line
-    passing through zero and the number.  This angle ranges from
-    [-pi] to [pi].  This function has a discontinuity along the
-    negative real axis. */
-let arg: t => float
-
-/** [polar norm arg] returns the complex having norm [norm]
-    and argument [arg]. */
-let polar: (float, float) => t
-
-/** Exponentiation.  [exp z] returns [e] to the [z] power. */
-let exp: t => t
-
-/** Natural logarithm (in base [e]). */
-let log: t => t
-
-/** Power function.  [pow z1 z2] returns [z1] to the [z2] power. */
-let pow: (t, t) => t
diff --git a/jscomp/stdlib-406/digest.res b/jscomp/stdlib-406/digest.res
deleted file mode 100644
index d922290..0000000
--- a/jscomp/stdlib-406/digest.res
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Message digest (MD5) */
-
-type t = string
-
-let compare = String.compare
-let equal = String.equal
-
-external unsafe_string: (string, int, int) => t = "?md5_string"
-
-let string = str => unsafe_string(str, 0, String.length(str))
-
-let bytes = b => string(Bytes.unsafe_to_string(b))
-
-let substring = (str, ofs, len) =>
-  if ofs < 0 || (len < 0 || ofs > String.length(str) - len) {
-    invalid_arg("Digest.substring")
-  } else {
-    unsafe_string(str, ofs, len)
-  }
-
-let subbytes = (b, ofs, len) => substring(Bytes.unsafe_to_string(b), ofs, len)
-
-let char_hex = n =>
-  Char.unsafe_chr(
-    n + if n < 10 {
-      Char.code('0')
-    } else {
-      Char.code('a') - 10
-    },
-  )
-
-let to_hex = d => {
-  if String.length(d) != 16 {
-    invalid_arg("Digest.to_hex")
-  }
-  let result = Bytes.create(32)
-  for i in 0 to 15 {
-    let x = Char.code(String.get(d, i))
-    Bytes.unsafe_set(result, i * 2, char_hex(lsr(x, 4)))
-    Bytes.unsafe_set(result, i * 2 + 1, char_hex(land(x, 0x0f)))
-  }
-  Bytes.unsafe_to_string(result)
-}
-
-let from_hex = s => {
-  if String.length(s) != 32 {
-    invalid_arg("Digest.from_hex")
-  }
-  let digit = c =>
-    switch c {
-    | '0' .. '9' => Char.code(c) - Char.code('0')
-    | 'A' .. 'F' => Char.code(c) - Char.code('A') + 10
-    | 'a' .. 'f' => Char.code(c) - Char.code('a') + 10
-    | _ => raise(Invalid_argument("Digest.from_hex"))
-    }
-
-  let byte = i => lsl(digit(String.get(s, i)), 4) + digit(String.get(s, i + 1))
-  let result = Bytes.create(16)
-  for i in 0 to 15 {
-    Bytes.set(result, i, Char.chr(byte(2 * i)))
-  }
-  Bytes.unsafe_to_string(result)
-}
diff --git a/jscomp/stdlib-406/digest.resi b/jscomp/stdlib-406/digest.resi
deleted file mode 100644
index bcedb52..0000000
--- a/jscomp/stdlib-406/digest.resi
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** MD5 message digest.
-
-   This module provides functions to compute 128-bit 'digests' of
-   arbitrary-length strings or files. The digests are of cryptographic
-   quality: it is very hard, given a digest, to forge a string having
-   that digest. The algorithm used is MD5. This module should not be
-   used for secure and sensitive cryptographic applications. For these
-   kind of applications more recent and stronger cryptographic
-   primitives should be used instead.
-*/
-
-/** The type of digests: 16-character strings. */
-type t = string
-
-/** The comparison function for 16-character digest, with the same
-    specification as {!Pervasives.compare} and the implementation
-    shared with {!String.compare}. Along with the type [t], this
-    function [compare] allows the module [Digest] to be passed as
-    argument to the functors {!Set.Make} and {!Map.Make}.
-    @since 4.00.0 */
-let compare: (t, t) => int
-
-/** The equal function for 16-character digest.
-    @since 4.03.0 */
-let equal: (t, t) => bool
-
-/** Return the digest of the given string. */
-let string: string => t
-
-/** Return the digest of the given byte sequence.
-    @since 4.02.0 */
-let bytes: bytes => t
-
-/** [Digest.substring s ofs len] returns the digest of the substring
-   of [s] starting at index [ofs] and containing [len] characters. */
-let substring: (string, int, int) => t
-
-/** [Digest.subbytes s ofs len] returns the digest of the subsequence
-    of [s] starting at index [ofs] and containing [len] bytes.
-    @since 4.02.0 */
-let subbytes: (bytes, int, int) => t
-
-/** Return the printable hexadecimal representation of the given digest.
-    Raise [Invalid_argument] if the argument is not exactly 16 bytes.
- */
-let to_hex: t => string
-
-/** Convert a hexadecimal representation back into the corresponding digest.
-   Raise [Invalid_argument] if the argument is not exactly 32 hexadecimal
-   characters.
-   @since 4.00.0 */
-let from_hex: string => t
diff --git a/jscomp/stdlib-406/filename.res b/jscomp/stdlib-406/filename.res
deleted file mode 100644
index 0dcb014..0000000
--- a/jscomp/stdlib-406/filename.res
+++ /dev/null
@@ -1,353 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy and Damien Doligez, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-let generic_quote = (quotequote, s) => {
-  let l = String.length(s)
-  let b = Buffer.create(l + 20)
-  Buffer.add_char(b, '\'')
-  for i in 0 to l - 1 {
-    if String.get(s, i) == '\'' {
-      Buffer.add_string(b, quotequote)
-    } else {
-      Buffer.add_char(b, String.get(s, i))
-    }
-  }
-  Buffer.add_char(b, '\'')
-  Buffer.contents(b)
-}
-
-/* This function implements the Open Group specification found here:
-  [[1]] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/basename.html
-  In step 1 of [[1]], we choose to return "." for empty input.
-    (for compatibility with previous versions of OCaml)
-  In step 2, we choose to process "//" normally.
-  Step 6 is not implemented: we consider that the [suffix] operand is
-    always absent.  Suffixes are handled by [chop_suffix] and [chop_extension].
-*/
-let generic_basename = (is_dir_sep, current_dir_name, name) => {
-  let rec find_end = n =>
-    if n < 0 {
-      String.sub(name, 0, 1)
-    } else if is_dir_sep(name, n) {
-      find_end(n - 1)
-    } else {
-      find_beg(n, n + 1)
-    }
-  and find_beg = (n, p) =>
-    if n < 0 {
-      String.sub(name, 0, p)
-    } else if is_dir_sep(name, n) {
-      String.sub(name, n + 1, p - n - 1)
-    } else {
-      find_beg(n - 1, p)
-    }
-
-  if name == "" {
-    current_dir_name
-  } else {
-    find_end(String.length(name) - 1)
-  }
-}
-
-/* This function implements the Open Group specification found here:
-  [[2]] http://pubs.opengroup.org/onlinepubs/9699919799/utilities/dirname.html
-  In step 6 of [[2]], we choose to process "//" normally.
-*/
-let generic_dirname = (is_dir_sep, current_dir_name, name) => {
-  let rec trailing_sep = n =>
-    if n < 0 {
-      String.sub(name, 0, 1)
-    } else if is_dir_sep(name, n) {
-      trailing_sep(n - 1)
-    } else {
-      base(n)
-    }
-  and base = n =>
-    if n < 0 {
-      current_dir_name
-    } else if is_dir_sep(name, n) {
-      intermediate_sep(n)
-    } else {
-      base(n - 1)
-    }
-  and intermediate_sep = n =>
-    if n < 0 {
-      String.sub(name, 0, 1)
-    } else if is_dir_sep(name, n) {
-      intermediate_sep(n - 1)
-    } else {
-      String.sub(name, 0, n + 1)
-    }
-
-  if name == "" {
-    current_dir_name
-  } else {
-    trailing_sep(String.length(name) - 1)
-  }
-}
-
-module Unix = {
-  let current_dir_name = "."
-  let parent_dir_name = ".."
-  let dir_sep = "/"
-  let is_dir_sep = (s, i) => String.get(s, i) == '/'
-  let is_relative = n => String.length(n) < 1 || String.get(n, 0) != '/'
-  let is_implicit = n =>
-    is_relative(n) &&
-    ((String.length(n) < 2 || String.sub(n, 0, 2) != "./") &&
-    (String.length(n) < 3 || String.sub(n, 0, 3) != "../"))
-  let check_suffix = (name, suff) =>
-    String.length(name) >= String.length(suff) &&
-      String.sub(name, String.length(name) - String.length(suff), String.length(suff)) == suff
-  let temp_dir_name = try Sys.getenv("TMPDIR") catch {
-  | Not_found => "/tmp"
-  }
-  let quote = generic_quote("'\\''")
-  let basename = generic_basename(is_dir_sep, current_dir_name)
-  let dirname = generic_dirname(is_dir_sep, current_dir_name)
-}
-
-module Win32 = {
-  let current_dir_name = "."
-  let parent_dir_name = ".."
-  let dir_sep = "\\"
-  let is_dir_sep = (s, i) => {
-    let c = String.get(s, i)
-    c == '/' || (c == '\\' || c == ':')
-  }
-  let is_relative = n =>
-    (String.length(n) < 1 || String.get(n, 0) != '/') &&
-      ((String.length(n) < 1 || String.get(n, 0) != '\\') &&
-      (String.length(n) < 2 || String.get(n, 1) != ':'))
-  let is_implicit = n =>
-    is_relative(n) &&
-    ((String.length(n) < 2 || String.sub(n, 0, 2) != "./") &&
-    ((String.length(n) < 2 || String.sub(n, 0, 2) != ".\\") &&
-      ((String.length(n) < 3 || String.sub(n, 0, 3) != "../") &&
-      (String.length(n) < 3 || String.sub(n, 0, 3) != "..\\"))))
-  let check_suffix = (name, suff) =>
-    String.length(name) >= String.length(suff) && {
-        let s = String.sub(name, String.length(name) - String.length(suff), String.length(suff))
-        String.lowercase_ascii(s) == String.lowercase_ascii(suff)
-      }
-  let temp_dir_name = try Sys.getenv("TEMP") catch {
-  | Not_found => "."
-  }
-  let quote = s => {
-    let l = String.length(s)
-    let b = Buffer.create(l + 20)
-    Buffer.add_char(b, '"')
-    let rec loop = i =>
-      if i == l {
-        Buffer.add_char(b, '"')
-      } else {
-        switch String.get(s, i) {
-        | '"' => loop_bs(0, i)
-        | '\\' => loop_bs(0, i)
-        | c =>
-          Buffer.add_char(b, c)
-          loop(i + 1)
-        }
-      }
-    and loop_bs = (n, i) =>
-      if i == l {
-        Buffer.add_char(b, '"')
-        add_bs(n)
-      } else {
-        switch String.get(s, i) {
-        | '"' =>
-          add_bs(2 * n + 1)
-          Buffer.add_char(b, '"')
-          loop(i + 1)
-        | '\\' => loop_bs(n + 1, i + 1)
-        | _ =>
-          add_bs(n)
-          loop(i)
-        }
-      }
-    and add_bs = n =>
-      for _j in 1 to n {
-        Buffer.add_char(b, '\\')
-      }
-
-    loop(0)
-    Buffer.contents(b)
-  }
-  let has_drive = s => {
-    let is_letter = param =>
-      switch param {
-      | 'A' .. 'Z' | 'a' .. 'z' => true
-      | _ => false
-      }
-
-    String.length(s) >= 2 && (is_letter(String.get(s, 0)) && String.get(s, 1) == ':')
-  }
-  let drive_and_path = s =>
-    if has_drive(s) {
-      (String.sub(s, 0, 2), String.sub(s, 2, String.length(s) - 2))
-    } else {
-      ("", s)
-    }
-  let dirname = s => {
-    let (drive, path) = drive_and_path(s)
-    let dir = generic_dirname(is_dir_sep, current_dir_name, path)
-    drive ++ dir
-  }
-  let basename = s => {
-    let (_drive, path) = drive_and_path(s)
-    generic_basename(is_dir_sep, current_dir_name, path)
-  }
-}
-
-module Cygwin = {
-  let current_dir_name = "."
-  let parent_dir_name = ".."
-  let dir_sep = "/"
-  let is_dir_sep = Win32.is_dir_sep
-  let is_relative = Win32.is_relative
-  let is_implicit = Win32.is_implicit
-  let check_suffix = Win32.check_suffix
-  let temp_dir_name = Unix.temp_dir_name
-  let quote = Unix.quote
-  let basename = generic_basename(is_dir_sep, current_dir_name)
-  let dirname = generic_dirname(is_dir_sep, current_dir_name)
-}
-
-let (
-  current_dir_name,
-  parent_dir_name,
-  dir_sep,
-  is_dir_sep,
-  is_relative,
-  is_implicit,
-  check_suffix,
-  temp_dir_name,
-  quote,
-  basename,
-  dirname,
-) = switch Sys.os_type {
-| "Win32" => (
-    Win32.current_dir_name,
-    Win32.parent_dir_name,
-    Win32.dir_sep,
-    Win32.is_dir_sep,
-    Win32.is_relative,
-    Win32.is_implicit,
-    Win32.check_suffix,
-    Win32.temp_dir_name,
-    Win32.quote,
-    Win32.basename,
-    Win32.dirname,
-  )
-| "Cygwin" => (
-    Cygwin.current_dir_name,
-    Cygwin.parent_dir_name,
-    Cygwin.dir_sep,
-    Cygwin.is_dir_sep,
-    Cygwin.is_relative,
-    Cygwin.is_implicit,
-    Cygwin.check_suffix,
-    Cygwin.temp_dir_name,
-    Cygwin.quote,
-    Cygwin.basename,
-    Cygwin.dirname,
-  )
-| _ => /* normally "Unix" */
-  (
-    Unix.current_dir_name,
-    Unix.parent_dir_name,
-    Unix.dir_sep,
-    Unix.is_dir_sep,
-    Unix.is_relative,
-    Unix.is_implicit,
-    Unix.check_suffix,
-    Unix.temp_dir_name,
-    Unix.quote,
-    Unix.basename,
-    Unix.dirname,
-  )
-}
-
-let concat = (dirname, filename) => {
-  let l = String.length(dirname)
-  if l == 0 || is_dir_sep(dirname, l - 1) {
-    dirname ++ filename
-  } else {
-    dirname ++ (dir_sep ++ filename)
-  }
-}
-
-let chop_suffix = (name, suff) => {
-  let n = String.length(name) - String.length(suff)
-  if n < 0 {
-    invalid_arg("Filename.chop_suffix")
-  } else {
-    String.sub(name, 0, n)
-  }
-}
-
-let extension_len = name => {
-  let rec check = (i0, i) =>
-    if i < 0 || is_dir_sep(name, i) {
-      0
-    } else if String.get(name, i) == '.' {
-      check(i0, i - 1)
-    } else {
-      String.length(name) - i0
-    }
-
-  let rec search_dot = i =>
-    if i < 0 || is_dir_sep(name, i) {
-      0
-    } else if String.get(name, i) == '.' {
-      check(i, i - 1)
-    } else {
-      search_dot(i - 1)
-    }
-
-  search_dot(String.length(name) - 1)
-}
-
-let extension = name => {
-  let l = extension_len(name)
-  if l == 0 {
-    ""
-  } else {
-    String.sub(name, String.length(name) - l, l)
-  }
-}
-
-let chop_extension = name => {
-  let l = extension_len(name)
-  if l == 0 {
-    invalid_arg("Filename.chop_extension")
-  } else {
-    String.sub(name, 0, String.length(name) - l)
-  }
-}
-
-let remove_extension = name => {
-  let l = extension_len(name)
-  if l == 0 {
-    name
-  } else {
-    String.sub(name, 0, String.length(name) - l)
-  }
-}
-
-let current_temp_dir_name = ref(temp_dir_name)
-
-let set_temp_dir_name = s => current_temp_dir_name := s
-let get_temp_dir_name = () => current_temp_dir_name.contents
diff --git a/jscomp/stdlib-406/filename.resi b/jscomp/stdlib-406/filename.resi
deleted file mode 100644
index e9da0f7..0000000
--- a/jscomp/stdlib-406/filename.resi
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Operations on file names. */
-
-/** The conventional name for the current directory (e.g. [.] in Unix). */
-let current_dir_name: string
-
-/** The conventional name for the parent of the current directory
-   (e.g. [..] in Unix). */
-let parent_dir_name: string
-
-/** The directory separator (e.g. [/] in Unix). @since 3.11.2 */
-let dir_sep: string
-
-/** [concat dir file] returns a file name that designates file
-   [file] in directory [dir]. */
-let concat: (string, string) => string
-
-/** Return [true] if the file name is relative to the current
-   directory, [false] if it is absolute (i.e. in Unix, starts
-   with [/]). */
-let is_relative: string => bool
-
-/** Return [true] if the file name is relative and does not start
-   with an explicit reference to the current directory ([./] or
-   [../] in Unix), [false] if it starts with an explicit reference
-   to the root directory or the current directory. */
-let is_implicit: string => bool
-
-/** [check_suffix name suff] returns [true] if the filename [name]
-   ends with the suffix [suff]. */
-let check_suffix: (string, string) => bool
-
-/** [chop_suffix name suff] removes the suffix [suff] from
-   the filename [name]. The behavior is undefined if [name] does not
-   end with the suffix [suff]. */
-let chop_suffix: (string, string) => string
-
-/** [extension name] is the shortest suffix [ext] of [name0] where:
-
-    - [name0] is the longest suffix of [name] that does not
-      contain a directory separator;
-    - [ext] starts with a period;
-    - [ext] is preceded by at least one non-period character
-      in [name0].
-
-    If such a suffix does not exist, [extension name] is the empty
-    string.
-
-    @since 4.04
-*/
-let extension: string => string
-
-/** Return the given file name without its extension, as defined
-    in {!Filename.extension}. If the extension is empty, the function
-    returns the given file name.
-
-    The following invariant holds for any file name [s]:
-
-    [remove_extension s ^ extension s = s]
-
-    @since 4.04
-*/
-let remove_extension: string => string
-
-/** Same as {!Filename.remove_extension}, but raise [Invalid_argument]
-    if the given name has an empty extension. */
-let chop_extension: string => string
-
-/** Split a file name into directory name / base file name.
-   If [name] is a valid file name, then [concat (dirname name) (basename name)]
-   returns a file name which is equivalent to [name]. Moreover,
-   after setting the current directory to [dirname name] (with {!Sys.chdir}),
-   references to [basename name] (which is a relative file name)
-   designate the same file as [name] before the call to {!Sys.chdir}.
-
-   This function conforms to the specification of POSIX.1-2008 for the
-   [basename] utility. */
-let basename: string => string
-
-/** See {!Filename.basename}.
-   This function conforms to the specification of POSIX.1-2008 for the
-   [dirname] utility. */
-let dirname: string => string
-
-/** The name of the temporary directory:
-    Under Unix, the value of the [TMPDIR] environment variable, or "/tmp"
-    if the variable is not set.
-    Under Windows, the value of the [TEMP] environment variable, or "."
-    if the variable is not set.
-    The temporary directory can be changed with {!Filename.set_temp_dir_name}.
-    @since 4.00.0
-*/
-let get_temp_dir_name: unit => string
-
-/** Change the temporary directory returned by {!Filename.get_temp_dir_name}
-    and used by {!Filename.temp_file} and {!Filename.open_temp_file}.
-    @since 4.00.0
-*/
-let set_temp_dir_name: string => unit
-
-@deprecated("Use Filename.get_temp_dir_name instead")
-/** The name of the initial temporary directory:
-    Under Unix, the value of the [TMPDIR] environment variable, or "/tmp"
-    if the variable is not set.
-    Under Windows, the value of the [TEMP] environment variable, or "."
-    if the variable is not set.
-    @deprecated You should use {!Filename.get_temp_dir_name} instead.
-    @since 3.09.1
-*/
-let temp_dir_name: string
-
-/** Return a quoted version of a file name, suitable for use as
-    one argument in a command line, escaping all meta-characters.
-    Warning: under Windows, the output is only suitable for use
-    with programs that follow the standard Windows quoting
-    conventions.
- */
-let quote: string => string
diff --git a/jscomp/stdlib-406/genlex.res b/jscomp/stdlib-406/genlex.res
deleted file mode 100644
index bb6ef24..0000000
--- a/jscomp/stdlib-406/genlex.res
+++ /dev/null
@@ -1,353 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-type token =
-  | Kwd(string)
-  | Ident(string)
-  | Int(int)
-  | Float(float)
-  | String(string)
-  | Char(char)
-
-/* The string buffering machinery */
-
-let initial_buffer = Bytes.create(32)
-
-let buffer = ref(initial_buffer)
-let bufpos = ref(0)
-
-let reset_buffer = () => {
-  buffer := initial_buffer
-  bufpos := 0
-}
-
-let store = c => {
-  if bufpos.contents >= Bytes.length(buffer.contents) {
-    let newbuffer = Bytes.create(2 * bufpos.contents)
-    Bytes.blit(buffer.contents, 0, newbuffer, 0, bufpos.contents)
-    buffer := newbuffer
-  }
-  Bytes.set(buffer.contents, bufpos.contents, c)
-  incr(bufpos)
-}
-
-let get_string = () => {
-  let s = Bytes.sub_string(buffer.contents, 0, bufpos.contents)
-  buffer := initial_buffer
-  s
-}
-
-/* The lexer */
-
-let make_lexer = keywords => {
-  let kwd_table = Hashtbl.create(17)
-  List.iter(s => Hashtbl.add(kwd_table, s, Kwd(s)), keywords)
-  let ident_or_keyword = id =>
-    try Hashtbl.find(kwd_table, id) catch {
-    | Not_found => Ident(id)
-    }
-  and keyword_or_error = c => {
-    let s = String.make(1, c)
-    try Hashtbl.find(kwd_table, s) catch {
-    | Not_found => raise(Stream.Error("Illegal character " ++ s))
-    }
-  }
-
-  let rec next_token = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some(' ' | '\n' | '\r' | '\t' | '' | '') =>
-      Stream.junk(strm__)
-      next_token(strm__)
-    | Some(('A' .. 'Z' | 'a' .. 'z' | '_' | 'À' .. 'ÿ') as c) =>
-      Stream.junk(strm__)
-      let s = strm__
-      reset_buffer()
-      store(c)
-      ident(s)
-    | Some(
-        ('!'
-        | '%'
-        | '&'
-        | '$'
-        | '#'
-        | '+'
-        | '/'
-        | ':'
-        | '<'
-        | '='
-        | '>'
-        | '?'
-        | '@'
-        | '\\'
-        | '~'
-        | '^'
-        | '|'
-        | '*') as c,
-      ) =>
-      Stream.junk(strm__)
-      let s = strm__
-      reset_buffer()
-      store(c)
-      ident2(s)
-    | Some('0' .. '9' as c) =>
-      Stream.junk(strm__)
-      let s = strm__
-      reset_buffer()
-      store(c)
-      number(s)
-    | Some('\'') =>
-      Stream.junk(strm__)
-      let c = try char(strm__) catch {
-      | Stream.Failure => raise(Stream.Error(""))
-      }
-
-      switch Stream.peek(strm__) {
-      | Some('\'') =>
-        Stream.junk(strm__)
-        Some(Char(c))
-      | _ => raise(Stream.Error(""))
-      }
-    | Some('"') =>
-      Stream.junk(strm__)
-      let s = strm__
-      reset_buffer()
-      Some(String(string(s)))
-    | Some('-') =>
-      Stream.junk(strm__)
-      neg_number(strm__)
-    | Some('(') =>
-      Stream.junk(strm__)
-      maybe_comment(strm__)
-    | Some(c) =>
-      Stream.junk(strm__)
-      Some(keyword_or_error(c))
-    | _ => None
-    }
-  and ident = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some(('A' .. 'Z' | 'a' .. 'z' | 'À' .. 'ÿ' | '0' .. '9' | '_' | '\'') as c) =>
-      Stream.junk(strm__)
-      let s = strm__
-      store(c)
-      ident(s)
-    | _ => Some(ident_or_keyword(get_string()))
-    }
-  and ident2 = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some(
-        ('!'
-        | '%'
-        | '&'
-        | '$'
-        | '#'
-        | '+'
-        | '-'
-        | '/'
-        | ':'
-        | '<'
-        | '='
-        | '>'
-        | '?'
-        | '@'
-        | '\\'
-        | '~'
-        | '^'
-        | '|'
-        | '*') as c,
-      ) =>
-      Stream.junk(strm__)
-      let s = strm__
-      store(c)
-      ident2(s)
-    | _ => Some(ident_or_keyword(get_string()))
-    }
-  and neg_number = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some('0' .. '9' as c) =>
-      Stream.junk(strm__)
-      let s = strm__
-      reset_buffer()
-      store('-')
-      store(c)
-      number(s)
-    | _ =>
-      let s = strm__
-      reset_buffer()
-      store('-')
-      ident2(s)
-    }
-  and number = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some('0' .. '9' as c) =>
-      Stream.junk(strm__)
-      let s = strm__
-      store(c)
-      number(s)
-    | Some('.') =>
-      Stream.junk(strm__)
-      let s = strm__
-      store('.')
-      decimal_part(s)
-    | Some('e' | 'E') =>
-      Stream.junk(strm__)
-      let s = strm__
-      store('E')
-      exponent_part(s)
-    | _ => Some(Int(int_of_string(get_string())))
-    }
-  and decimal_part = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some('0' .. '9' as c) =>
-      Stream.junk(strm__)
-      let s = strm__
-      store(c)
-      decimal_part(s)
-    | Some('e' | 'E') =>
-      Stream.junk(strm__)
-      let s = strm__
-      store('E')
-      exponent_part(s)
-    | _ => Some(Float(float_of_string(get_string())))
-    }
-  and exponent_part = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some(('+' | '-') as c) =>
-      Stream.junk(strm__)
-      let s = strm__
-      store(c)
-      end_exponent_part(s)
-    | _ => end_exponent_part(strm__)
-    }
-  and end_exponent_part = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some('0' .. '9' as c) =>
-      Stream.junk(strm__)
-      let s = strm__
-      store(c)
-      end_exponent_part(s)
-    | _ => Some(Float(float_of_string(get_string())))
-    }
-  and string = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some('"') =>
-      Stream.junk(strm__)
-      get_string()
-    | Some('\\') =>
-      Stream.junk(strm__)
-      let c = try escape(strm__) catch {
-      | Stream.Failure => raise(Stream.Error(""))
-      }
-
-      let s = strm__
-      store(c)
-      string(s)
-    | Some(c) =>
-      Stream.junk(strm__)
-      let s = strm__
-      store(c)
-      string(s)
-    | _ => raise(Stream.Failure)
-    }
-  and char = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some('\\') =>
-      Stream.junk(strm__)
-      try escape(strm__) catch {
-      | Stream.Failure => raise(Stream.Error(""))
-      }
-    | Some(c) =>
-      Stream.junk(strm__)
-      c
-    | _ => raise(Stream.Failure)
-    }
-  and escape = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some('n') =>
-      Stream.junk(strm__)
-      '\n'
-    | Some('r') =>
-      Stream.junk(strm__)
-      '\r'
-    | Some('t') =>
-      Stream.junk(strm__)
-      '\t'
-    | Some('0' .. '9' as c1) =>
-      Stream.junk(strm__)
-      switch Stream.peek(strm__) {
-      | Some('0' .. '9' as c2) =>
-        Stream.junk(strm__)
-        switch Stream.peek(strm__) {
-        | Some('0' .. '9' as c3) =>
-          Stream.junk(strm__)
-          Char.chr((Char.code(c1) - 48) * 100 + (Char.code(c2) - 48) * 10 + (Char.code(c3) - 48))
-        | _ => raise(Stream.Error(""))
-        }
-      | _ => raise(Stream.Error(""))
-      }
-    | Some(c) =>
-      Stream.junk(strm__)
-      c
-    | _ => raise(Stream.Failure)
-    }
-  and maybe_comment = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some('*') =>
-      Stream.junk(strm__)
-      let s = strm__
-      comment(s)
-      next_token(s)
-    | _ => Some(keyword_or_error('('))
-    }
-  and comment = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some('(') =>
-      Stream.junk(strm__)
-      maybe_nested_comment(strm__)
-    | Some('*') =>
-      Stream.junk(strm__)
-      maybe_end_comment(strm__)
-    | Some(_) =>
-      Stream.junk(strm__)
-      comment(strm__)
-    | _ => raise(Stream.Failure)
-    }
-  and maybe_nested_comment = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some('*') =>
-      Stream.junk(strm__)
-      let s = strm__
-      comment(s)
-      comment(s)
-    | Some(_) =>
-      Stream.junk(strm__)
-      comment(strm__)
-    | _ => raise(Stream.Failure)
-    }
-  and maybe_end_comment = (strm__: Stream.t<_>) =>
-    switch Stream.peek(strm__) {
-    | Some(')') =>
-      Stream.junk(strm__)
-      ()
-    | Some('*') =>
-      Stream.junk(strm__)
-      maybe_end_comment(strm__)
-    | Some(_) =>
-      Stream.junk(strm__)
-      comment(strm__)
-    | _ => raise(Stream.Failure)
-    }
-
-  input => Stream.from(_count => next_token(input))
-}
diff --git a/jscomp/stdlib-406/genlex.resi b/jscomp/stdlib-406/genlex.resi
deleted file mode 100644
index 48dc4f9..0000000
--- a/jscomp/stdlib-406/genlex.resi
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** A generic lexical analyzer.
-
-
-   This module implements a simple 'standard' lexical analyzer, presented
-   as a function from character streams to token streams. It implements
-   roughly the lexical conventions of OCaml, but is parameterized by the
-   set of keywords of your language.
-
-
-   Example: a lexer suitable for a desk calculator is obtained by
-   {[     let lexer = make_lexer ["+";"-";"*";"/";"let";"="; "("; ")"]  ]}
-
-   The associated parser would be a function from [token stream]
-   to, for instance, [int], and would have rules such as:
-
-   {[
-           let rec parse_expr = parser
-             | [< n1 = parse_atom; n2 = parse_remainder n1 >] -> n2
-           and parse_atom = parser
-             | [< 'Int n >] -> n
-             | [< 'Kwd "("; n = parse_expr; 'Kwd ")" >] -> n
-           and parse_remainder n1 = parser
-             | [< 'Kwd "+"; n2 = parse_expr >] -> n1+n2
-             | [< >] -> n1
-   ]}
-
-   One should notice that the use of the [parser] keyword and associated
-   notation for streams are only available through camlp4 extensions. This
-   means that one has to preprocess its sources {i e. g.} by using the
-   ["-pp"] command-line switch of the compilers.
-*/
-
-/** The type of tokens. The lexical classes are: [Int] and [Float]
-   for integer and floating-point numbers; [String] for
-   string literals, enclosed in double quotes; [Char] for
-   character literals, enclosed in single quotes; [Ident] for
-   identifiers (either sequences of letters, digits, underscores
-   and quotes, or sequences of 'operator characters' such as
-   [+], [*], etc); and [Kwd] for keywords (either identifiers or
-   single 'special characters' such as [(], [}], etc). */
-type token =
-  | Kwd(string)
-  | Ident(string)
-  | Int(int)
-  | Float(float)
-  | String(string)
-  | Char(char)
-
-/** Construct the lexer function. The first argument is the list of
-   keywords. An identifier [s] is returned as [Kwd s] if [s]
-   belongs to this list, and as [Ident s] otherwise.
-   A special character [s] is returned as [Kwd s] if [s]
-   belongs to this list, and cause a lexical error (exception
-   {!Stream.Error} with the offending lexeme as its parameter) otherwise.
-   Blanks and newlines are skipped. Comments delimited by [(*] and [*)]
-   are skipped as well, and can be nested. A {!Stream.Failure} exception
-   is raised if end of stream is unexpectedly reached.*/
-let make_lexer: (list<string>, Stream.t<char>) => Stream.t<token>
diff --git a/jscomp/stdlib-406/hashbang b/jscomp/stdlib-406/hashbang
deleted file mode 100644
index 04c9334..0000000
--- a/jscomp/stdlib-406/hashbang
+++ /dev/null
@@ -1 +0,0 @@
-#! 
\ No newline at end of file
diff --git a/jscomp/stdlib-406/hashtbl.res b/jscomp/stdlib-406/hashtbl.res
deleted file mode 100644
index b29afbc..0000000
--- a/jscomp/stdlib-406/hashtbl.res
+++ /dev/null
@@ -1,679 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Hash tables */
-
-@noalloc external seeded_hash_param: (int, int, int, 'a) => int = "?hash"
-/* external old_hash_param :
- int -> int -> 'a -> int = "caml_hash_univ_param" [@@noalloc] */
-
-let hash = x => seeded_hash_param(10, 100, 0, x)
-let hash_param = (n1, n2, x) => seeded_hash_param(n1, n2, 0, x)
-let seeded_hash = (seed, x) => seeded_hash_param(10, 100, seed, x)
-
-/* We do dynamic hashing, and resize the table and rehash the elements
- when buckets become too long. */
-
-type rec t<'a, 'b> = {
-  mutable size: int /* number of entries */,
-  mutable data: array<bucketlist<'a, 'b>> /* the buckets */,
-  mutable seed: int /* for randomization */,
-  mutable initial_size: int /* initial array size */,
-}
-
-and bucketlist<'a, 'b> =
-  | Empty
-  | Cons({mutable key: 'a, mutable data: 'b, mutable next: bucketlist<'a, 'b>})
-
-/* The sign of initial_size encodes the fact that a traversal is
-   ongoing or not.
-
-   This disables the efficient in place implementation of resizing.
-*/
-
-let ongoing_traversal = h => h.initial_size < 0
-
-let flip_ongoing_traversal = h => h.initial_size = -h.initial_size
-
-/* To pick random seeds if requested */
-
-let randomized_default = false
-
-let randomized = ref(randomized_default)
-
-let randomize = () => randomized := true
-let is_randomized = () => randomized.contents
-
-let prng = lazy Random.State.make_self_init()
-
-/* Creating a fresh, empty table */
-
-let rec power_2_above = (x, n) =>
-  if x >= n {
-    x
-  } else if x * 2 < x {
-    x /* overflow */
-  } else {
-    power_2_above(x * 2, n)
-  }
-
-let create = (~random=randomized.contents, initial_size) => {
-  let s = power_2_above(16, initial_size)
-  let seed = if random {
-    Random.State.bits(Lazy.force(prng))
-  } else {
-    0
-  }
-  {initial_size: s, size: 0, seed, data: Array.make(s, Empty)}
-}
-
-let clear = h => {
-  h.size = 0
-  let len = Array.length(h.data)
-  for i in 0 to len - 1 {
-    h.data[i] = Empty
-  }
-}
-
-let reset = h => {
-  let len = Array.length(h.data)
-  if len == abs(h.initial_size) {
-    clear(h)
-  } else {
-    h.size = 0
-    h.data = Array.make(abs(h.initial_size), Empty)
-  }
-}
-
-let copy_bucketlist = param =>
-  switch param {
-  | Empty => Empty
-  | Cons({key, data, next}) =>
-    let rec loop = (prec, param) =>
-      switch param {
-      | Empty => ()
-      | Cons({key, data, next}) =>
-        let r = Cons({key, data, next})
-        switch prec {
-        | Empty => assert(false)
-        | Cons(prec) => prec.next = r
-        }
-        loop(r, next)
-      }
-
-    let r = Cons({key, data, next})
-    loop(r, next)
-    r
-  }
-
-let copy = h => {...h, data: Array.map(copy_bucketlist, h.data)}
-
-let length = h => h.size
-
-let resize = (indexfun, h) => {
-  let odata = h.data
-  let osize = Array.length(odata)
-  let nsize = osize * 2
-  if nsize >= osize {
-    let ndata = Array.make(nsize, Empty)
-    let ndata_tail = Array.make(nsize, Empty)
-    let inplace = !ongoing_traversal(h)
-    h.data = ndata /* so that indexfun sees the new bucket count */
-    let rec insert_bucket = param =>
-      switch param {
-      | Empty => ()
-      | Cons({key, data, next}) as cell =>
-        let cell = if inplace {
-          cell
-        } else {
-          Cons({key, data, next: Empty})
-        }
-
-        let nidx = indexfun(h, key)
-        switch ndata_tail[nidx] {
-        | Empty => ndata[nidx] = cell
-        | Cons(tail) => tail.next = cell
-        }
-        ndata_tail[nidx] = cell
-        insert_bucket(next)
-      }
-
-    for i in 0 to osize - 1 {
-      insert_bucket(odata[i])
-    }
-    if inplace {
-      for i in 0 to nsize - 1 {
-        switch ndata_tail[i] {
-        | Empty => ()
-        | Cons(tail) => tail.next = Empty
-        }
-      }
-    }
-  }
-}
-
-let key_index = (h, key) =>
-  /* compatibility with old hash tables */
-  land(seeded_hash_param(10, 100, h.seed, key), Array.length(h.data) - 1)
-
-let add = (h, key, data) => {
-  let i = key_index(h, key)
-  let bucket = Cons({key, data, next: h.data[i]})
-  h.data[i] = bucket
-  h.size = h.size + 1
-  if h.size > lsl(Array.length(h.data), 1) {
-    resize(key_index, h)
-  }
-}
-
-let rec remove_bucket = (h, i, key, prec, param) =>
-  switch param {
-  | Empty => ()
-  | Cons({key: k, next}) as c =>
-    if compare(k, key) == 0 {
-      h.size = h.size - 1
-      switch prec {
-      | Empty => h.data[i] = next
-      | Cons(c) => c.next = next
-      }
-    } else {
-      remove_bucket(h, i, key, c, next)
-    }
-  }
-
-let remove = (h, key) => {
-  let i = key_index(h, key)
-  remove_bucket(h, i, key, Empty, h.data[i])
-}
-
-let rec find_rec = (key, param) =>
-  switch param {
-  | Empty => raise(Not_found)
-  | Cons({key: k, data, next}) =>
-    if compare(key, k) == 0 {
-      data
-    } else {
-      find_rec(key, next)
-    }
-  }
-
-let find = (h, key) =>
-  switch h.data[key_index(h, key)] {
-  | Empty => raise(Not_found)
-  | Cons({key: k1, data: d1, next: next1}) =>
-    if compare(key, k1) == 0 {
-      d1
-    } else {
-      switch next1 {
-      | Empty => raise(Not_found)
-      | Cons({key: k2, data: d2, next: next2}) =>
-        if compare(key, k2) == 0 {
-          d2
-        } else {
-          switch next2 {
-          | Empty => raise(Not_found)
-          | Cons({key: k3, data: d3, next: next3}) =>
-            if compare(key, k3) == 0 {
-              d3
-            } else {
-              find_rec(key, next3)
-            }
-          }
-        }
-      }
-    }
-  }
-
-let rec find_rec_opt = (key, param) =>
-  switch param {
-  | Empty => None
-  | Cons({key: k, data, next}) =>
-    if compare(key, k) == 0 {
-      Some(data)
-    } else {
-      find_rec_opt(key, next)
-    }
-  }
-
-let find_opt = (h, key) =>
-  switch h.data[key_index(h, key)] {
-  | Empty => None
-  | Cons({key: k1, data: d1, next: next1}) =>
-    if compare(key, k1) == 0 {
-      Some(d1)
-    } else {
-      switch next1 {
-      | Empty => None
-      | Cons({key: k2, data: d2, next: next2}) =>
-        if compare(key, k2) == 0 {
-          Some(d2)
-        } else {
-          switch next2 {
-          | Empty => None
-          | Cons({key: k3, data: d3, next: next3}) =>
-            if compare(key, k3) == 0 {
-              Some(d3)
-            } else {
-              find_rec_opt(key, next3)
-            }
-          }
-        }
-      }
-    }
-  }
-
-let find_all = (h, key) => {
-  let rec find_in_bucket = param =>
-    switch param {
-    | Empty => list{}
-    | Cons({key: k, data, next}) =>
-      if compare(k, key) == 0 {
-        list{data, ...find_in_bucket(next)}
-      } else {
-        find_in_bucket(next)
-      }
-    }
-  find_in_bucket(h.data[key_index(h, key)])
-}
-
-let rec replace_bucket = (key, data, param) =>
-  switch param {
-  | Empty => true
-  | Cons({key: k, next} as slot) =>
-    if compare(k, key) == 0 {
-      slot.key = key
-      slot.data = data
-      false
-    } else {
-      replace_bucket(key, data, next)
-    }
-  }
-
-let replace = (h, key, data) => {
-  let i = key_index(h, key)
-  let l = h.data[i]
-  if replace_bucket(key, data, l) {
-    h.data[i] = Cons({key, data, next: l})
-    h.size = h.size + 1
-    if h.size > lsl(Array.length(h.data), 1) {
-      resize(key_index, h)
-    }
-  }
-}
-
-let mem = (h, key) => {
-  let rec mem_in_bucket = param =>
-    switch param {
-    | Empty => false
-    | Cons({key: k, next}) => compare(k, key) == 0 || mem_in_bucket(next)
-    }
-  mem_in_bucket(h.data[key_index(h, key)])
-}
-
-let iter = (f, h) => {
-  let rec do_bucket = param =>
-    switch param {
-    | Empty => ()
-    | Cons({key, data, next}) =>
-      f(key, data)
-      do_bucket(next)
-    }
-  let old_trav = ongoing_traversal(h)
-  if !old_trav {
-    flip_ongoing_traversal(h)
-  }
-  try {
-    let d = h.data
-    for i in 0 to Array.length(d) - 1 {
-      do_bucket(d[i])
-    }
-    if !old_trav {
-      flip_ongoing_traversal(h)
-    }
-  } catch {
-  | exn if !old_trav =>
-    flip_ongoing_traversal(h)
-    raise(exn)
-  }
-}
-
-let rec filter_map_inplace_bucket = (f, h, i, prec, param) =>
-  switch param {
-  | Empty =>
-    switch prec {
-    | Empty => h.data[i] = Empty
-    | Cons(c) => c.next = Empty
-    }
-  | Cons({key, data, next} as c) as slot =>
-    switch f(key, data) {
-    | None =>
-      h.size = h.size - 1
-      filter_map_inplace_bucket(f, h, i, prec, next)
-    | Some(data) =>
-      switch prec {
-      | Empty => h.data[i] = slot
-      | Cons(c) => c.next = slot
-      }
-      c.data = data
-      filter_map_inplace_bucket(f, h, i, slot, next)
-    }
-  }
-
-let filter_map_inplace = (f, h) => {
-  let d = h.data
-  let old_trav = ongoing_traversal(h)
-  if !old_trav {
-    flip_ongoing_traversal(h)
-  }
-  try for i in 0 to Array.length(d) - 1 {
-    filter_map_inplace_bucket(f, h, i, Empty, h.data[i])
-  } catch {
-  | exn if !old_trav =>
-    flip_ongoing_traversal(h)
-    raise(exn)
-  }
-}
-
-let fold = (f, h, init) => {
-  let rec do_bucket = (b, accu) =>
-    switch b {
-    | Empty => accu
-    | Cons({key, data, next}) => do_bucket(next, f(key, data, accu))
-    }
-  let old_trav = ongoing_traversal(h)
-  if !old_trav {
-    flip_ongoing_traversal(h)
-  }
-  try {
-    let d = h.data
-    let accu = ref(init)
-    for i in 0 to Array.length(d) - 1 {
-      accu := do_bucket(d[i], accu.contents)
-    }
-    if !old_trav {
-      flip_ongoing_traversal(h)
-    }
-    accu.contents
-  } catch {
-  | exn if !old_trav =>
-    flip_ongoing_traversal(h)
-    raise(exn)
-  }
-}
-
-type statistics = {
-  num_bindings: int,
-  num_buckets: int,
-  max_bucket_length: int,
-  bucket_histogram: array<int>,
-}
-
-let rec bucket_length = (accu, param) =>
-  switch param {
-  | Empty => accu
-  | Cons({next}) => bucket_length(accu + 1, next)
-  }
-
-let stats = h => {
-  let mbl = Array.fold_left((m, b) => max(m, bucket_length(0, b)), 0, h.data)
-  let histo = Array.make(mbl + 1, 0)
-  Array.iter(b => {
-    let l = bucket_length(0, b)
-    histo[l] = histo[l] + 1
-  }, h.data)
-  {
-    num_bindings: h.size,
-    num_buckets: Array.length(h.data),
-    max_bucket_length: mbl,
-    bucket_histogram: histo,
-  }
-}
-
-/* Functorial interface */
-
-module type HashedType = {
-  type t
-  let equal: (t, t) => bool
-  let hash: t => int
-}
-
-module type SeededHashedType = {
-  type t
-  let equal: (t, t) => bool
-  let hash: (int, t) => int
-}
-
-module type S = {
-  type key
-  type t<'a>
-  let create: int => t<'a>
-  let clear: t<'a> => unit
-  let reset: t<'a> => unit
-  let copy: t<'a> => t<'a>
-  let add: (t<'a>, key, 'a) => unit
-  let remove: (t<'a>, key) => unit
-  let find: (t<'a>, key) => 'a
-  let find_opt: (t<'a>, key) => option<'a>
-  let find_all: (t<'a>, key) => list<'a>
-  let replace: (t<'a>, key, 'a) => unit
-  let mem: (t<'a>, key) => bool
-  let iter: ((key, 'a) => unit, t<'a>) => unit
-  let filter_map_inplace: ((key, 'a) => option<'a>, t<'a>) => unit
-  let fold: ((key, 'a, 'b) => 'b, t<'a>, 'b) => 'b
-  let length: t<'a> => int
-  let stats: t<'a> => statistics
-}
-
-module type SeededS = {
-  type key
-  type t<'a>
-  let create: (~random: bool=?, int) => t<'a>
-  let clear: t<'a> => unit
-  let reset: t<'a> => unit
-  let copy: t<'a> => t<'a>
-  let add: (t<'a>, key, 'a) => unit
-  let remove: (t<'a>, key) => unit
-  let find: (t<'a>, key) => 'a
-  let find_opt: (t<'a>, key) => option<'a>
-  let find_all: (t<'a>, key) => list<'a>
-  let replace: (t<'a>, key, 'a) => unit
-  let mem: (t<'a>, key) => bool
-  let iter: ((key, 'a) => unit, t<'a>) => unit
-  let filter_map_inplace: ((key, 'a) => option<'a>, t<'a>) => unit
-  let fold: ((key, 'a, 'b) => 'b, t<'a>, 'b) => 'b
-  let length: t<'a> => int
-  let stats: t<'a> => statistics
-}
-
-module MakeSeeded = (H: SeededHashedType): (SeededS with type key = H.t) => {
-  type key = H.t
-  type hashtbl<'a> = t<key, 'a>
-  type t<'a> = hashtbl<'a>
-  let create = create
-  let clear = clear
-  let reset = reset
-  let copy = copy
-
-  let key_index = (h, key) => land(H.hash(h.seed, key), Array.length(h.data) - 1)
-
-  let add = (h, key, data) => {
-    let i = key_index(h, key)
-    let bucket = Cons({key, data, next: h.data[i]})
-    h.data[i] = bucket
-    h.size = h.size + 1
-    if h.size > lsl(Array.length(h.data), 1) {
-      resize(key_index, h)
-    }
-  }
-
-  let rec remove_bucket = (h, i, key, prec, param) =>
-    switch param {
-    | Empty => ()
-    | Cons({key: k, next}) as c =>
-      if H.equal(k, key) {
-        h.size = h.size - 1
-        switch prec {
-        | Empty => h.data[i] = next
-        | Cons(c) => c.next = next
-        }
-      } else {
-        remove_bucket(h, i, key, c, next)
-      }
-    }
-
-  let remove = (h, key) => {
-    let i = key_index(h, key)
-    remove_bucket(h, i, key, Empty, h.data[i])
-  }
-
-  let rec find_rec = (key, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Cons({key: k, data, next}) =>
-      if H.equal(key, k) {
-        data
-      } else {
-        find_rec(key, next)
-      }
-    }
-
-  let find = (h, key) =>
-    switch h.data[key_index(h, key)] {
-    | Empty => raise(Not_found)
-    | Cons({key: k1, data: d1, next: next1}) =>
-      if H.equal(key, k1) {
-        d1
-      } else {
-        switch next1 {
-        | Empty => raise(Not_found)
-        | Cons({key: k2, data: d2, next: next2}) =>
-          if H.equal(key, k2) {
-            d2
-          } else {
-            switch next2 {
-            | Empty => raise(Not_found)
-            | Cons({key: k3, data: d3, next: next3}) =>
-              if H.equal(key, k3) {
-                d3
-              } else {
-                find_rec(key, next3)
-              }
-            }
-          }
-        }
-      }
-    }
-
-  let rec find_rec_opt = (key, param) =>
-    switch param {
-    | Empty => None
-    | Cons({key: k, data, next}) =>
-      if H.equal(key, k) {
-        Some(data)
-      } else {
-        find_rec_opt(key, next)
-      }
-    }
-
-  let find_opt = (h, key) =>
-    switch h.data[key_index(h, key)] {
-    | Empty => None
-    | Cons({key: k1, data: d1, next: next1}) =>
-      if H.equal(key, k1) {
-        Some(d1)
-      } else {
-        switch next1 {
-        | Empty => None
-        | Cons({key: k2, data: d2, next: next2}) =>
-          if H.equal(key, k2) {
-            Some(d2)
-          } else {
-            switch next2 {
-            | Empty => None
-            | Cons({key: k3, data: d3, next: next3}) =>
-              if H.equal(key, k3) {
-                Some(d3)
-              } else {
-                find_rec_opt(key, next3)
-              }
-            }
-          }
-        }
-      }
-    }
-
-  let find_all = (h, key) => {
-    let rec find_in_bucket = param =>
-      switch param {
-      | Empty => list{}
-      | Cons({key: k, data: d, next}) =>
-        if H.equal(k, key) {
-          list{d, ...find_in_bucket(next)}
-        } else {
-          find_in_bucket(next)
-        }
-      }
-    find_in_bucket(h.data[key_index(h, key)])
-  }
-
-  let rec replace_bucket = (key, data, param) =>
-    switch param {
-    | Empty => true
-    | Cons({key: k, next} as slot) =>
-      if H.equal(k, key) {
-        slot.key = key
-        slot.data = data
-        false
-      } else {
-        replace_bucket(key, data, next)
-      }
-    }
-
-  let replace = (h, key, data) => {
-    let i = key_index(h, key)
-    let l = h.data[i]
-    if replace_bucket(key, data, l) {
-      h.data[i] = Cons({key, data, next: l})
-      h.size = h.size + 1
-      if h.size > lsl(Array.length(h.data), 1) {
-        resize(key_index, h)
-      }
-    }
-  }
-
-  let mem = (h, key) => {
-    let rec mem_in_bucket = param =>
-      switch param {
-      | Empty => false
-      | Cons({key: k, next}) => H.equal(k, key) || mem_in_bucket(next)
-      }
-    mem_in_bucket(h.data[key_index(h, key)])
-  }
-
-  let iter = iter
-  let filter_map_inplace = filter_map_inplace
-  let fold = fold
-  let length = length
-  let stats = stats
-}
-
-module Make = (H: HashedType): (S with type key = H.t) => {
-  include MakeSeeded({
-    type t = H.t
-    let equal = H.equal
-    let hash = (_seed: int, x) => H.hash(x)
-  })
-  let create = sz => create(~random=false, sz)
-}
diff --git a/jscomp/stdlib-406/hashtbl.resi b/jscomp/stdlib-406/hashtbl.resi
deleted file mode 100644
index 5acfde2..0000000
--- a/jscomp/stdlib-406/hashtbl.resi
+++ /dev/null
@@ -1,406 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Hash tables and hash functions.
-
-   Hash tables are hashed association tables, with in-place modification.
-*/
-
-/* {1 Generic interface} */
-
-/** The type of hash tables from type ['a] to type ['b]. */
-type t<'a, 'b>
-
-/** [Hashtbl.create n] creates a new, empty hash table, with
-   initial size [n].  For best results, [n] should be on the
-   order of the expected number of elements that will be in
-   the table.  The table grows as needed, so [n] is just an
-   initial guess.
-
-   The optional [random] parameter (a boolean) controls whether
-   the internal organization of the hash table is randomized at each
-   execution of [Hashtbl.create] or deterministic over all executions.
-
-   A hash table that is created with [~random:false] uses a
-   fixed hash function ({!Hashtbl.hash}) to distribute keys among
-   buckets.  As a consequence, collisions between keys happen
-   deterministically.  In Web-facing applications or other
-   security-sensitive applications, the deterministic collision
-   patterns can be exploited by a malicious user to create a
-   denial-of-service attack: the attacker sends input crafted to
-   create many collisions in the table, slowing the application down.
-
-   A hash table that is created with [~random:true] uses the seeded
-   hash function {!Hashtbl.seeded_hash} with a seed that is randomly
-   chosen at hash table creation time.  In effect, the hash function
-   used is randomly selected among [2^{30}] different hash functions.
-   All these hash functions have different collision patterns,
-   rendering ineffective the denial-of-service attack described above.
-   However, because of randomization, enumerating all elements of the
-   hash table using {!Hashtbl.fold} or {!Hashtbl.iter} is no longer
-   deterministic: elements are enumerated in different orders at
-   different runs of the program.
-
-   If no [~random] parameter is given, hash tables are created
-   in non-random mode by default.  This default can be changed
-   either programmatically by calling {!Hashtbl.randomize} or by
-   setting the [R] flag in the [OCAMLRUNPARAM] environment variable.
-
-   @before 4.00.0 the [random] parameter was not present and all
-   hash tables were created in non-randomized mode. */
-let create: (~random: bool=?, int) => t<'a, 'b>
-
-/** Empty a hash table. Use [reset] instead of [clear] to shrink the
-    size of the bucket table to its initial size. */
-let clear: t<'a, 'b> => unit
-
-/** Empty a hash table and shrink the size of the bucket table
-    to its initial size.
-    @since 4.00.0 */
-let reset: t<'a, 'b> => unit
-
-/** Return a copy of the given hashtable. */
-let copy: t<'a, 'b> => t<'a, 'b>
-
-/** [Hashtbl.add tbl x y] adds a binding of [x] to [y] in table [tbl].
-   Previous bindings for [x] are not removed, but simply
-   hidden. That is, after performing {!Hashtbl.remove}[ tbl x],
-   the previous binding for [x], if any, is restored.
-   (Same behavior as with association lists.) */
-let add: (t<'a, 'b>, 'a, 'b) => unit
-
-/** [Hashtbl.find tbl x] returns the current binding of [x] in [tbl],
-   or raises [Not_found] if no such binding exists. */
-let find: (t<'a, 'b>, 'a) => 'b
-
-/** [Hashtbl.find_opt tbl x] returns the current binding of [x] in [tbl],
-    or [None] if no such binding exists.
-    @since 4.05 */
-let find_opt: (t<'a, 'b>, 'a) => option<'b>
-
-/** [Hashtbl.find_all tbl x] returns the list of all data
-   associated with [x] in [tbl].
-   The current binding is returned first, then the previous
-   bindings, in reverse order of introduction in the table. */
-let find_all: (t<'a, 'b>, 'a) => list<'b>
-
-/** [Hashtbl.mem tbl x] checks if [x] is bound in [tbl]. */
-let mem: (t<'a, 'b>, 'a) => bool
-
-/** [Hashtbl.remove tbl x] removes the current binding of [x] in [tbl],
-   restoring the previous binding if it exists.
-   It does nothing if [x] is not bound in [tbl]. */
-let remove: (t<'a, 'b>, 'a) => unit
-
-/** [Hashtbl.replace tbl x y] replaces the current binding of [x]
-   in [tbl] by a binding of [x] to [y].  If [x] is unbound in [tbl],
-   a binding of [x] to [y] is added to [tbl].
-   This is functionally equivalent to {!Hashtbl.remove}[ tbl x]
-   followed by {!Hashtbl.add}[ tbl x y]. */
-let replace: (t<'a, 'b>, 'a, 'b) => unit
-
-/** [Hashtbl.iter f tbl] applies [f] to all bindings in table [tbl].
-   [f] receives the key as first argument, and the associated value
-   as second argument. Each binding is presented exactly once to [f].
-
-   The order in which the bindings are passed to [f] is unspecified.
-   However, if the table contains several bindings for the same key,
-   they are passed to [f] in reverse order of introduction, that is,
-   the most recent binding is passed first.
-
-   If the hash table was created in non-randomized mode, the order
-   in which the bindings are enumerated is reproducible between
-   successive runs of the program, and even between minor versions
-   of OCaml.  For randomized hash tables, the order of enumeration
-   is entirely random.
-
-   The behavior is not defined if the hash table is modified
-   by [f] during the iteration.
-*/
-let iter: (('a, 'b) => unit, t<'a, 'b>) => unit
-
-/** [Hashtbl.filter_map_inplace f tbl] applies [f] to all bindings in
-    table [tbl] and update each binding depending on the result of
-    [f].  If [f] returns [None], the binding is discarded.  If it
-    returns [Some new_val], the binding is update to associate the key
-    to [new_val].
-
-    Other comments for {!Hashtbl.iter} apply as well.
-    @since 4.03.0 */
-let filter_map_inplace: (('a, 'b) => option<'b>, t<'a, 'b>) => unit
-
-/** [Hashtbl.fold f tbl init] computes
-   [(f kN dN ... (f k1 d1 init)...)],
-   where [k1 ... kN] are the keys of all bindings in [tbl],
-   and [d1 ... dN] are the associated values.
-   Each binding is presented exactly once to [f].
-
-   The order in which the bindings are passed to [f] is unspecified.
-   However, if the table contains several bindings for the same key,
-   they are passed to [f] in reverse order of introduction, that is,
-   the most recent binding is passed first.
-
-   If the hash table was created in non-randomized mode, the order
-   in which the bindings are enumerated is reproducible between
-   successive runs of the program, and even between minor versions
-   of OCaml.  For randomized hash tables, the order of enumeration
-   is entirely random.
-
-   The behavior is not defined if the hash table is modified
-   by [f] during the iteration.
-*/
-let fold: (('a, 'b, 'c) => 'c, t<'a, 'b>, 'c) => 'c
-
-/** [Hashtbl.length tbl] returns the number of bindings in [tbl].
-   It takes constant time.  Multiple bindings are counted once each, so
-   [Hashtbl.length] gives the number of times [Hashtbl.iter] calls its
-   first argument. */
-let length: t<'a, 'b> => int
-
-/** After a call to [Hashtbl.randomize()], hash tables are created in
-    randomized mode by default: {!Hashtbl.create} returns randomized
-    hash tables, unless the [~random:false] optional parameter is given.
-    The same effect can be achieved by setting the [R] parameter in
-    the [OCAMLRUNPARAM] environment variable.
-
-    It is recommended that applications or Web frameworks that need to
-    protect themselves against the denial-of-service attack described
-    in {!Hashtbl.create} call [Hashtbl.randomize()] at initialization
-    time.
-
-    Note that once [Hashtbl.randomize()] was called, there is no way
-    to revert to the non-randomized default behavior of {!Hashtbl.create}.
-    This is intentional.  Non-randomized hash tables can still be
-    created using [Hashtbl.create ~random:false].
-
-    @since 4.00.0 */
-let randomize: unit => unit
-
-/** return if the tables are currently created in randomized mode by default
-
-    @since 4.03.0 */
-let is_randomized: unit => bool
-
-/** @since 4.00.0 */
-type statistics = {
-  /** Number of bindings present in the table.
-        Same value as returned by {!Hashtbl.length}. */
-  num_bindings: int,
-  /** Number of buckets in the table. */
-  num_buckets: int,
-  /** Maximal number of bindings per bucket. */
-  max_bucket_length: int,
-  /** Histogram of bucket sizes.  This array [histo] has
-        length [max_bucket_length + 1].  The value of
-        [histo.(i)] is the number of buckets whose size is [i]. */
-  bucket_histogram: array<int>,
-}
-
-/** [Hashtbl.stats tbl] returns statistics about the table [tbl]:
-   number of buckets, size of the biggest bucket, distribution of
-   buckets by size.
-   @since 4.00.0 */
-let stats: t<'a, 'b> => statistics
-
-/* {1 Functorial interface}
-
-The functorial interface allows the use of specific comparison
-    and hash functions, either for performance/security concerns,
-    or because keys are not hashable/comparable with the polymorphic builtins.
-
-    For instance, one might want to specialize a table for integer keys:
-    {[
-      module IntHash =
-        struct
-          type t = int
-          let equal i j = i=j
-          let hash i = i land max_int
-        end
-
-      module IntHashtbl = Hashtbl.Make(IntHash)
-
-      let h = IntHashtbl.create 17 in
-      IntHashtbl.add h 12 "hello"
-    ]}
-
-    This creates a new module [IntHashtbl], with a new type ['a
-    IntHashtbl.t] of tables from [int] to ['a]. In this example, [h]
-    contains [string] values so its type is [string IntHashtbl.t].
-
-    Note that the new type ['a IntHashtbl.t] is not compatible with
-    the type [('a,'b) Hashtbl.t] of the generic interface. For
-    example, [Hashtbl.length h] would not type-check, you must use
-    [IntHashtbl.length].
-*/
-
-/** The input signature of the functor {!Hashtbl.Make}. */
-module type HashedType = {
-  /** The type of the hashtable keys. */
-  type t
-
-  /** The equality predicate used to compare keys. */
-  let equal: (t, t) => bool
-
-  /** A hashing function on keys. It must be such that if two keys are
-          equal according to [equal], then they have identical hash values
-          as computed by [hash].
-          Examples: suitable ([equal], [hash]) pairs for arbitrary key
-          types include
--         ([(=)], {!Hashtbl.hash}) for comparing objects by structure
-              (provided objects do not contain floats)
--         ([(fun x y -> compare x y = 0)], {!Hashtbl.hash})
-              for comparing objects by structure
-              and handling {!Pervasives.nan} correctly
--         ([(==)], {!Hashtbl.hash}) for comparing objects by physical
-              equality (e.g. for mutable or cyclic objects). */
-  let hash: t => int
-}
-
-/** The output signature of the functor {!Hashtbl.Make}. */
-module type S = {
-  type key
-  type t<'a>
-  let create: int => t<'a>
-  let clear: t<'a> => unit
-  /** @since 4.00.0 */
-  let reset: t<'a> => unit
-
-  let copy: t<'a> => t<'a>
-  let add: (t<'a>, key, 'a) => unit
-  let remove: (t<'a>, key) => unit
-  let find: (t<'a>, key) => 'a
-  /** @since 4.05.0 */
-  let find_opt: (t<'a>, key) => option<'a>
-
-  let find_all: (t<'a>, key) => list<'a>
-  let replace: (t<'a>, key, 'a) => unit
-  let mem: (t<'a>, key) => bool
-  let iter: ((key, 'a) => unit, t<'a>) => unit
-  /** @since 4.03.0 */
-  let filter_map_inplace: ((key, 'a) => option<'a>, t<'a>) => unit
-
-  let fold: ((key, 'a, 'b) => 'b, t<'a>, 'b) => 'b
-  let length: t<'a> => int
-  /** @since 4.00.0 */
-  let stats: t<'a> => statistics
-}
-
-/** Functor building an implementation of the hashtable structure.
-    The functor [Hashtbl.Make] returns a structure containing
-    a type [key] of keys and a type ['a t] of hash tables
-    associating data of type ['a] to keys of type [key].
-    The operations perform similarly to those of the generic
-    interface, but use the hashing and equality functions
-    specified in the functor argument [H] instead of generic
-    equality and hashing.  Since the hash function is not seeded,
-    the [create] operation of the result structure always returns
-    non-randomized hash tables. */
-module Make: (H: HashedType) => (S with type key = H.t)
-
-/** The input signature of the functor {!Hashtbl.MakeSeeded}.
-    @since 4.00.0 */
-module type SeededHashedType = {
-  /** The type of the hashtable keys. */
-  type t
-
-  /** The equality predicate used to compare keys. */
-  let equal: (t, t) => bool
-
-  /** A seeded hashing function on keys.  The first argument is
-          the seed.  It must be the case that if [equal x y] is true,
-          then [hash seed x = hash seed y] for any value of [seed].
-          A suitable choice for [hash] is the function {!Hashtbl.seeded_hash}
-          below. */
-  let hash: (int, t) => int
-}
-
-/** The output signature of the functor {!Hashtbl.MakeSeeded}.
-    @since 4.00.0 */
-module type SeededS = {
-  type key
-  type t<'a>
-  let create: (~random: bool=?, int) => t<'a>
-  let clear: t<'a> => unit
-  let reset: t<'a> => unit
-  let copy: t<'a> => t<'a>
-  let add: (t<'a>, key, 'a) => unit
-  let remove: (t<'a>, key) => unit
-  let find: (t<'a>, key) => 'a
-  /** @since 4.05.0 */
-  let find_opt: (t<'a>, key) => option<'a>
-
-  let find_all: (t<'a>, key) => list<'a>
-  let replace: (t<'a>, key, 'a) => unit
-  let mem: (t<'a>, key) => bool
-  let iter: ((key, 'a) => unit, t<'a>) => unit
-  /** @since 4.03.0 */
-  let filter_map_inplace: ((key, 'a) => option<'a>, t<'a>) => unit
-
-  let fold: ((key, 'a, 'b) => 'b, t<'a>, 'b) => 'b
-  let length: t<'a> => int
-  let stats: t<'a> => statistics
-}
-
-/** Functor building an implementation of the hashtable structure.
-    The functor [Hashtbl.MakeSeeded] returns a structure containing
-    a type [key] of keys and a type ['a t] of hash tables
-    associating data of type ['a] to keys of type [key].
-    The operations perform similarly to those of the generic
-    interface, but use the seeded hashing and equality functions
-    specified in the functor argument [H] instead of generic
-    equality and hashing.  The [create] operation of the
-    result structure supports the [~random] optional parameter
-    and returns randomized hash tables if [~random:true] is passed
-    or if randomization is globally on (see {!Hashtbl.randomize}).
-    @since 4.00.0 */
-module MakeSeeded: (H: SeededHashedType) => (SeededS with type key = H.t)
-
-/* {1 The polymorphic hash functions} */
-
-/** [Hashtbl.hash x] associates a nonnegative integer to any value of
-   any type. It is guaranteed that
-   if [x = y] or [Pervasives.compare x y = 0], then [hash x = hash y].
-   Moreover, [hash] always terminates, even on cyclic structures. */
-let hash: 'a => int
-
-/** A variant of {!Hashtbl.hash} that is further parameterized by
-   an integer seed.
-   @since 4.00.0 */
-let seeded_hash: (int, 'a) => int
-
-/** [Hashtbl.hash_param meaningful total x] computes a hash value for [x],
-   with the same properties as for [hash]. The two extra integer
-   parameters [meaningful] and [total] give more precise control over
-   hashing. Hashing performs a breadth-first, left-to-right traversal
-   of the structure [x], stopping after [meaningful] meaningful nodes
-   were encountered, or [total] nodes (meaningful or not) were
-   encountered.  If [total] as specified by the user exceeds a certain
-   value, currently 256, then it is capped to that value.
-   Meaningful nodes are: integers; floating-point
-   numbers; strings; characters; booleans; and constant
-   constructors. Larger values of [meaningful] and [total] means that
-   more nodes are taken into account to compute the final hash value,
-   and therefore collisions are less likely to happen.  However,
-   hashing takes longer. The parameters [meaningful] and [total]
-   govern the tradeoff between accuracy and speed.  As default
-   choices, {!Hashtbl.hash} and {!Hashtbl.seeded_hash} take
-   [meaningful = 10] and [total = 100]. */
-let hash_param: (int, int, 'a) => int
-
-/** A variant of {!Hashtbl.hash_param} that is further parameterized by
-   an integer seed.  Usage:
-   [Hashtbl.seeded_hash_param meaningful total seed x].
-   @since 4.00.0 */
-let seeded_hash_param: (int, int, int, 'a) => int
diff --git a/jscomp/stdlib-406/hashtblLabels.res b/jscomp/stdlib-406/hashtblLabels.res
deleted file mode 100644
index e9fe63a..0000000
--- a/jscomp/stdlib-406/hashtblLabels.res
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Hash tables */
-
-type t<'a, 'b> = Hashtbl.t<'a, 'b>
-
-let {
-  create,
-  clear,
-  reset,
-  copy,
-  add,
-  find,
-  find_opt,
-  find_all,
-  mem,
-  remove,
-  replace,
-  iter,
-  filter_map_inplace,
-  fold,
-  length,
-  randomize,
-  is_randomized,
-  stats,
-  hash,
-  seeded_hash,
-  hash_param,
-  seeded_hash_param,
-} = module(Hashtbl)
-
-let add = (tbl, ~key, ~data) => add(tbl, key, data)
-
-let replace = (tbl, ~key, ~data) => replace(tbl, key, data)
-
-let iter = (~f, tbl) => iter((key, data) => f(~key, ~data), tbl)
-
-let filter_map_inplace = (~f, tbl) => filter_map_inplace((key, data) => f(~key, ~data), tbl)
-
-let fold = (~f, tbl, ~init) => fold((key, data, acc) => f(~key, ~data, acc), tbl, init)
-
-type statistics = Hashtbl.statistics = {
-  num_bindings: int,
-  num_buckets: int,
-  max_bucket_length: int,
-  bucket_histogram: array<int>,
-}
-
-/* Functorial interface */
-
-module type HashedType = Hashtbl.HashedType
-
-module type SeededHashedType = Hashtbl.SeededHashedType
-
-module type S = {
-  type rec key
-  and t<'a>
-  let create: int => t<'a>
-  let clear: t<'a> => unit
-  let reset: t<'a> => unit
-  let copy: t<'a> => t<'a>
-  let add: (t<'a>, ~key: key, ~data: 'a) => unit
-  let remove: (t<'a>, key) => unit
-  let find: (t<'a>, key) => 'a
-  let find_opt: (t<'a>, key) => option<'a>
-  let find_all: (t<'a>, key) => list<'a>
-  let replace: (t<'a>, ~key: key, ~data: 'a) => unit
-  let mem: (t<'a>, key) => bool
-  let iter: (~f: (~key: key, ~data: 'a) => unit, t<'a>) => unit
-  let filter_map_inplace: (~f: (~key: key, ~data: 'a) => option<'a>, t<'a>) => unit
-  let fold: (~f: (~key: key, ~data: 'a, 'b) => 'b, t<'a>, ~init: 'b) => 'b
-  let length: t<'a> => int
-  let stats: t<'a> => statistics
-}
-
-module type SeededS = {
-  type rec key
-  and t<'a>
-  let create: (~random: bool=?, int) => t<'a>
-  let clear: t<'a> => unit
-  let reset: t<'a> => unit
-  let copy: t<'a> => t<'a>
-  let add: (t<'a>, ~key: key, ~data: 'a) => unit
-  let remove: (t<'a>, key) => unit
-  let find: (t<'a>, key) => 'a
-  let find_opt: (t<'a>, key) => option<'a>
-  let find_all: (t<'a>, key) => list<'a>
-  let replace: (t<'a>, ~key: key, ~data: 'a) => unit
-  let mem: (t<'a>, key) => bool
-  let iter: (~f: (~key: key, ~data: 'a) => unit, t<'a>) => unit
-  let filter_map_inplace: (~f: (~key: key, ~data: 'a) => option<'a>, t<'a>) => unit
-  let fold: (~f: (~key: key, ~data: 'a, 'b) => 'b, t<'a>, ~init: 'b) => 'b
-  let length: t<'a> => int
-  let stats: t<'a> => statistics
-}
-
-module MakeSeeded = (H: SeededHashedType): (SeededS with type key = H.t) => {
-  include Hashtbl.MakeSeeded(H)
-  let add = (tbl, ~key, ~data) => add(tbl, key, data)
-  let replace = (tbl, ~key, ~data) => replace(tbl, key, data)
-
-  let iter = (~f, tbl) => iter((key, data) => f(~key, ~data), tbl)
-
-  let filter_map_inplace = (~f, tbl) => filter_map_inplace((key, data) => f(~key, ~data), tbl)
-
-  let fold = (~f, tbl, ~init) => fold((key, data, acc) => f(~key, ~data, acc), tbl, init)
-}
-
-module Make = (H: HashedType): (S with type key = H.t) => {
-  include MakeSeeded({
-    type t = H.t
-    let equal = H.equal
-    let hash = (_seed: int, x) => H.hash(x)
-  })
-  let create = sz => create(~random=false, sz)
-}
diff --git a/jscomp/stdlib-406/int32.res b/jscomp/stdlib-406/int32.res
deleted file mode 100644
index d3a53db..0000000
--- a/jscomp/stdlib-406/int32.res
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-type t = int
-/* Module [t]: 32-bit integers */
-
-external neg: t => t = "%negint"
-external add: (t, t) => t = "%addint"
-external sub: (t, t) => t = "%subint"
-external mul: (t, t) => t = "%mulint"
-external div: (t, t) => t = "%divint"
-external rem: (t, t) => t = "%modint"
-external logand: (t, t) => t = "%andint"
-external logor: (t, t) => t = "%orint"
-external logxor: (t, t) => t = "%xorint"
-external shift_left: (t, int) => t = "%lslint"
-external shift_right: (t, int) => t = "%asrint"
-external shift_right_logical: (t, int) => t = "%lsrint"
-external of_int: int => t = "%identity"
-external to_int: t => int = "%identity"
-external of_float: float => t = "?int_of_float"
-external to_float: t => float = "?int_to_float"
-external bits_of_float: float => t = "?int_bits_of_float"
-external float_of_bits: t => float = "?int_float_of_bits"
-
-let zero = 0l
-let one = 1l
-let minus_one = -1l
-let succ = n => add(n, 1l)
-let pred = n => sub(n, 1l)
-let abs = n =>
-  if n >= 0l {
-    n
-  } else {
-    neg(n)
-  }
-let min_int = 0x80000000l
-let max_int = 0x7FFFFFFFl
-let lognot = n => logxor(n, -1l)
-
-external format: (string, t) => string = "?format_int"
-let to_string = n => format("%d", n)
-
-external of_string: string => t = "?int_of_string"
-
-let of_string_opt = s =>
-  /* TODO: expose a non-raising primitive directly. */
-  try Some(of_string(s)) catch {
-  | Failure(_) => None
-  }
-
-let compare = (x: t, y: t) => Pervasives.compare(x, y)
-let equal = (x: t, y: t) => compare(x, y) == 0
diff --git a/jscomp/stdlib-406/int32.resi b/jscomp/stdlib-406/int32.resi
deleted file mode 100644
index 174036f..0000000
--- a/jscomp/stdlib-406/int32.resi
+++ /dev/null
@@ -1,176 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/** 32-bit integers.
-
-   This module provides operations on the type [t]
-   of signed 32-bit integers.  Unlike the built-in [int] type,
-   the type [t] is guaranteed to be exactly 32-bit wide on all
-   platforms.  All arithmetic operations over [t] are taken
-   modulo 2{^32}.
-
-   Performance notice: values of type [t] occupy more memory
-   space than values of type [int], and arithmetic operations on
-   [t] are generally slower than those on [int].  Use [t]
-   only when the application requires exact 32-bit arithmetic. */
-/** An alias for the type of 32-bit integers. */
-type t = int
-
-/** The 32-bit integer 0. */
-let zero: t
-
-/** The 32-bit integer 1. */
-let one: t
-
-/** The 32-bit integer -1. */
-let minus_one: t
-
-/** Unary negation. */
-external neg: t => t = "%negint"
-
-/** Addition. */
-external add: (t, t) => t = "%addint"
-
-/** Subtraction. */
-external sub: (t, t) => t = "%subint"
-
-/** Multiplication. */
-external mul: (t, t) => t = "%mulint"
-
-/** Integer division.  Raise [Division_by_zero] if the second
-   argument is zero.  This division rounds the real quotient of
-   its arguments towards zero, as specified for {!Pervasives.(/)}. */
-external div: (t, t) => t = "%divint"
-
-/** Integer remainder.  If [y] is not zero, the result
-   of [Int32.rem x y] satisfies the following property:
-   [x = Int32.add (Int32.mul (Int32.div x y) y) (Int32.rem x y)].
-   If [y = 0], [Int32.rem x y] raises [Division_by_zero]. */
-external rem: (t, t) => t = "%modint"
-
-/** Successor.  [Int32.succ x] is [Int32.add x Int32.one]. */
-let succ: t => t
-
-/** Predecessor.  [Int32.pred x] is [Int32.sub x Int32.one]. */
-let pred: t => t
-
-/** Return the absolute value of its argument. */
-let abs: t => t
-
-/** The greatest representable 32-bit integer, 2{^31} - 1. */
-let max_int: t
-
-/** The smallest representable 32-bit integer, -2{^31}. */
-let min_int: t
-
-/** Bitwise logical and. */
-external logand: (t, t) => t = "%andint"
-
-/** Bitwise logical or. */
-external logor: (t, t) => t = "%orint"
-
-/** Bitwise logical exclusive or. */
-external logxor: (t, t) => t = "%xorint"
-
-/** Bitwise logical negation. */
-let lognot: t => t
-
-/** [Int32.shift_left x y] shifts [x] to the left by [y] bits.
-   The result is unspecified if [y < 0] or [y >= 32]. */
-external shift_left: (t, int) => t = "%lslint"
-
-/** [Int32.shift_right x y] shifts [x] to the right by [y] bits.
-   This is an arithmetic shift: the sign bit of [x] is replicated
-   and inserted in the vacated bits.
-   The result is unspecified if [y < 0] or [y >= 32]. */
-external shift_right: (t, int) => t = "%asrint"
-
-/** [Int32.shift_right_logical x y] shifts [x] to the right by [y] bits.
-   This is a logical shift: zeroes are inserted in the vacated bits
-   regardless of the sign of [x].
-   The result is unspecified if [y < 0] or [y >= 32]. */
-external shift_right_logical: (t, int) => t = "%lsrint"
-
-/** Convert the given integer (type [int]) to a 32-bit integer
-    (type [t]). */
-external of_int: int => t = "%identity"
-
-/** Convert the given 32-bit integer (type [t]) to an
-   integer (type [int]).  On 32-bit platforms, the 32-bit integer
-   is taken modulo 2{^31}, i.e. the high-order bit is lost
-   during the conversion.  On 64-bit platforms, the conversion
-   is exact. */
-external to_int: t => int = "%identity"
-
-/** Convert the given floating-point number to a 32-bit integer,
-   discarding the fractional part (truncate towards 0).
-   The result of the conversion is undefined if, after truncation,
-   the number is outside the range \[{!Int32.min_int}, {!Int32.max_int}\]. */
-external of_float: float => t = "?int_of_float"
-
-/** Convert the given 32-bit integer to a floating-point number. */
-external to_float: t => float = "?int_to_float"
-
-/** Convert the given string to a 32-bit integer.
-   The string is read in decimal (by default, or if the string 
-   begins with [0u]) or in hexadecimal, octal or binary if the
-   string begins with [0x], [0o] or [0b] respectively.
-
-   The [0u] prefix reads the input as an unsigned integer in the range
-   [[0, 2*Int32.max_int+1]].  If the input exceeds {!Int32.max_int}
-   it is converted to the signed integer
-   [Int32.min_int + input - Int32.max_int - 1].
-
-   The [_] (underscore) character can appear anywhere in the string
-   and is ignored.
-   Raise [Failure "Int32.of_string"] if the given string is not
-   a valid representation of an integer, or if the integer represented
-   exceeds the range of integers representable in type [t]. */
-external of_string: string => t = "?int_of_string"
-
-/** Same as [of_string], but return [None] instead of raising.
-    @since 4.05 */
-let of_string_opt: string => option<t>
-
-/** Return the string representation of its argument, in signed decimal. */
-let to_string: t => string
-
-/** Return the internal representation of the given float according
-   to the IEEE 754 floating-point 'single format' bit layout.
-   Bit 31 of the result represents the sign of the float;
-   bits 30 to 23 represent the (biased) exponent; bits 22 to 0
-   represent the mantissa. */
-external bits_of_float: float => t = "?int_bits_of_float"
-
-/** Return the floating-point number whose internal representation,
-   according to the IEEE 754 floating-point 'single format' bit layout,
-   is the given [t]. */
-external float_of_bits: t => float = "?int_float_of_bits"
-
-/** The comparison function for 32-bit integers, with the same specification as
-    {!Pervasives.compare}.  Along with the type [t], this function [compare]
-    allows the module [Int32] to be passed as argument to the functors
-    {!Set.Make} and {!Map.Make}. */
-let compare: (t, t) => int
-
-/** The equal function for int32s.
-    @since 4.03.0 */
-let equal: (t, t) => bool
-
-/* {1 Deprecated functions} */
-
-/** Do not use this deprecated function.  Instead,
-   used {!Printf.sprintf} with a [%l...] format. */
-external format: (string, t) => string = "?format_int"
diff --git a/jscomp/stdlib-406/int64.res b/jscomp/stdlib-406/int64.res
deleted file mode 100644
index 032a1c4..0000000
--- a/jscomp/stdlib-406/int64.res
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Module [Int64]: 64-bit integers */
-
-external neg: int64 => int64 = "%int64_neg"
-external add: (int64, int64) => int64 = "%int64_add"
-external sub: (int64, int64) => int64 = "%int64_sub"
-external mul: (int64, int64) => int64 = "%int64_mul"
-external div: (int64, int64) => int64 = "%int64_div"
-external rem: (int64, int64) => int64 = "%int64_mod"
-external logand: (int64, int64) => int64 = "%int64_and"
-external logor: (int64, int64) => int64 = "%int64_or"
-external logxor: (int64, int64) => int64 = "%int64_xor"
-external shift_left: (int64, int) => int64 = "%int64_lsl"
-external shift_right: (int64, int) => int64 = "%int64_asr"
-external shift_right_logical: (int64, int) => int64 = "%int64_lsr"
-external of_int: int => int64 = "%int64_of_int"
-external to_int: int64 => int = "%int64_to_int"
-external of_float: float => int64 = "?int64_of_float"
-external to_float: int64 => float = "?int64_to_float"
-external of_int32: int => int64 = "%int64_of_int32"
-external to_int32: int64 => int = "%int64_to_int32"
-
-let zero = 0L
-let one = 1L
-let minus_one = -1L
-/* let succ n = add n 1L */
-external succ: int64 => int64 = "?int64_succ"
-let pred = n => sub(n, 1L)
-let abs = n =>
-  if n >= 0L {
-    n
-  } else {
-    neg(n)
-  }
-let min_int = 0x8000000000000000L
-let max_int = 0x7FFFFFFFFFFFFFFFL
-let lognot = n => logxor(n, -1L)
-
-external format: (string, int64) => string = "?int64_format"
-external to_string: int64 => string = "?int64_to_string"
-
-external of_string: string => int64 = "?int64_of_string"
-
-let of_string_opt = s =>
-  /* TODO: expose a non-raising primitive directly. */
-  try Some(of_string(s)) catch {
-  | Failure(_) => None
-  }
-
-external bits_of_float: float => int64 = "?int64_bits_of_float"
-
-external float_of_bits: int64 => float = "?int64_float_of_bits"
-
-type t = int64
-
-let compare = (x: t, y: t) => Pervasives.compare(x, y)
-let equal = (x: t, y: t) => compare(x, y) == 0
diff --git a/jscomp/stdlib-406/int64.resi b/jscomp/stdlib-406/int64.resi
deleted file mode 100644
index aeb0588..0000000
--- a/jscomp/stdlib-406/int64.resi
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** 64-bit integers.
-
-   This module provides operations on the type [int64] of
-   signed 64-bit integers.  Unlike the built-in [int] type,
-   the type [int64] is guaranteed to be exactly 64-bit wide on all
-   platforms.  All arithmetic operations over [int64] are taken
-   modulo 2{^64}
-
-   Performance notice: values of type [int64] occupy more memory
-   space than values of type [int], and arithmetic operations on
-   [int64] are generally slower than those on [int].  Use [int64]
-   only when the application requires exact 64-bit arithmetic.
-*/
-
-/** The 64-bit integer 0. */
-let zero: int64
-
-/** The 64-bit integer 1. */
-let one: int64
-
-/** The 64-bit integer -1. */
-let minus_one: int64
-
-/** Unary negation. */
-external neg: int64 => int64 = "%int64_neg"
-
-/** Addition. */
-external add: (int64, int64) => int64 = "%int64_add"
-
-/** Subtraction. */
-external sub: (int64, int64) => int64 = "%int64_sub"
-
-/** Multiplication. */
-external mul: (int64, int64) => int64 = "%int64_mul"
-
-/** Integer division.  Raise [Division_by_zero] if the second
-   argument is zero.  This division rounds the real quotient of
-   its arguments towards zero, as specified for {!Pervasives.(/)}. */
-external div: (int64, int64) => int64 = "%int64_div"
-
-/** Integer remainder.  If [y] is not zero, the result
-   of [Int64.rem x y] satisfies the following property:
-   [x = Int64.add (Int64.mul (Int64.div x y) y) (Int64.rem x y)].
-   If [y = 0], [Int64.rem x y] raises [Division_by_zero]. */
-external rem: (int64, int64) => int64 = "%int64_mod"
-
-/** Successor.  [Int64.succ x] is [Int64.add x Int64.one]. */
-let succ: int64 => int64
-
-/** Predecessor.  [Int64.pred x] is [Int64.sub x Int64.one]. */
-let pred: int64 => int64
-
-/** Return the absolute value of its argument. */
-let abs: int64 => int64
-
-/** The greatest representable 64-bit integer, 2{^63} - 1. */
-let max_int: int64
-
-/** The smallest representable 64-bit integer, -2{^63}. */
-let min_int: int64
-
-/** Bitwise logical and. */
-external logand: (int64, int64) => int64 = "%int64_and"
-
-/** Bitwise logical or. */
-external logor: (int64, int64) => int64 = "%int64_or"
-
-/** Bitwise logical exclusive or. */
-external logxor: (int64, int64) => int64 = "%int64_xor"
-
-/** Bitwise logical negation. */
-let lognot: int64 => int64
-
-/** [Int64.shift_left x y] shifts [x] to the left by [y] bits.
-   The result is unspecified if [y < 0] or [y >= 64]. */
-external shift_left: (int64, int) => int64 = "%int64_lsl"
-
-/** [Int64.shift_right x y] shifts [x] to the right by [y] bits.
-   This is an arithmetic shift: the sign bit of [x] is replicated
-   and inserted in the vacated bits.
-   The result is unspecified if [y < 0] or [y >= 64]. */
-external shift_right: (int64, int) => int64 = "%int64_asr"
-
-/** [Int64.shift_right_logical x y] shifts [x] to the right by [y] bits.
-   This is a logical shift: zeroes are inserted in the vacated bits
-   regardless of the sign of [x].
-   The result is unspecified if [y < 0] or [y >= 64]. */
-external shift_right_logical: (int64, int) => int64 = "%int64_lsr"
-
-/** Convert the given integer (type [int]) to a 64-bit integer
-    (type [int64]). */
-external of_int: int => int64 = "%int64_of_int"
-
-/** Convert the given 64-bit integer (type [int64]) to an
-   integer (type [int]).  On 64-bit platforms, the 64-bit integer
-   is taken modulo 2{^63}, i.e. the high-order bit is lost
-   during the conversion.  On 32-bit platforms, the 64-bit integer
-   is taken modulo 2{^31}, i.e. the top 33 bits are lost
-   during the conversion. */
-external to_int: int64 => int = "%int64_to_int"
-
-/** Convert the given floating-point number to a 64-bit integer,
-   discarding the fractional part (truncate towards 0).
-   The result of the conversion is undefined if, after truncation,
-   the number is outside the range \[{!Int64.min_int}, {!Int64.max_int}\]. */
-external of_float: float => int64 = "?int64_of_float"
-
-/** Convert the given 64-bit integer to a floating-point number. */
-external to_float: int64 => float = "?int64_to_float"
-
-/** Convert the given 32-bit integer (type [int])
-   to a 64-bit integer (type [int64]). */
-external of_int32: int => int64 = "%int64_of_int32"
-
-/** Convert the given 64-bit integer (type [int64]) to a
-   32-bit integer (type [int]). The 64-bit integer
-   is taken modulo 2{^32}, i.e. the top 32 bits are lost
-   during the conversion.  */
-external to_int32: int64 => int = "%int64_to_int32"
-
-/** Convert the given string to a 64-bit integer.
-   The string is read in decimal (by default, or if the string 
-   begins with [0u]) or in hexadecimal, octal or binary if the
-   string begins with [0x], [0o] or [0b] respectively.
-
-   The [0u] prefix reads the input as an unsigned integer in the range
-   [[0, 2*Int64.max_int+1]].  If the input exceeds {!Int64.max_int}
-   it is converted to the signed integer
-   [Int64.min_int + input - Int64.max_int - 1].
-
-   The [_] (underscore) character can appear anywhere in the string
-   and is ignored.
-   Raise [Failure "Int64.of_string"] if the given string is not
-   a valid representation of an integer, or if the integer represented
-   exceeds the range of integers representable in type [int64]. */
-external of_string: string => int64 = "?int64_of_string"
-
-/** Same as [of_string], but return [None] instead of raising.
-    @since 4.05 */
-let of_string_opt: string => option<int64>
-
-/** Return the string representation of its argument, in decimal. */
-let to_string: int64 => string
-
-/** Return the internal representation of the given float according
-   to the IEEE 754 floating-point 'double format' bit layout.
-   Bit 63 of the result represents the sign of the float;
-   bits 62 to 52 represent the (biased) exponent; bits 51 to 0
-   represent the mantissa. */
-external bits_of_float: float => int64 = "?int64_bits_of_float"
-
-/** Return the floating-point number whose internal representation,
-   according to the IEEE 754 floating-point 'double format' bit layout,
-   is the given [int64]. */
-external float_of_bits: int64 => float = "?int64_float_of_bits"
-
-/** An alias for the type of 64-bit integers. */
-type t = int64
-
-/** The comparison function for 64-bit integers, with the same specification as
-    {!Pervasives.compare}.  Along with the type [t], this function [compare]
-    allows the module [Int64] to be passed as argument to the functors
-    {!Set.Make} and {!Map.Make}. */
-let compare: (t, t) => int
-
-/** The equal function for int64s.
-    @since 4.03.0 */
-let equal: (t, t) => bool
-
-/* {1 Deprecated functions} */
-
-/** Do not use this deprecated function.  Instead,
-   used {!Printf.sprintf} with a [%L...] format. */
-external format: (string, int64) => string = "?int64_format"
diff --git a/jscomp/stdlib-406/lazy.res b/jscomp/stdlib-406/lazy.res
deleted file mode 100644
index 967946d..0000000
--- a/jscomp/stdlib-406/lazy.res
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Damien Doligez, projet Para, INRIA Rocquencourt */
-/*  */
-/* Copyright 1997 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Module [Lazy]: deferred computations */
-
-/*
-   WARNING: some purple magic is going on here.  Do not take this file
-   as an example of how to program in OCaml.
-*/
-
-/* We make use of two special tags provided by the runtime:
-   [lazy_tag] and [forward_tag].
-
-   A value of type ['a Lazy.t] can be one of three things:
-   1. A block of size 1 with tag [lazy_tag].  Its field is a closure of
-      type [unit -> 'a] that computes the value.
-   2. A block of size 1 with tag [forward_tag].  Its field is the value
-      of type ['a] that was computed.
-   3. Anything else except a float.  This has type ['a] and is the value
-      that was computed.
-   Exceptions are stored in format (1).
-   The GC will magically change things from (2) to (3) according to its
-   fancy.
-
-   If OCaml was configured with the -flat-float-array option (which is
-   currently the default), the following is also true:
-   We cannot use representation (3) for a [float Lazy.t] because
-   [caml_make_array] assumes that only a [float] value can have tag
-   [Double_tag].
-
-   We have to use the built-in type constructor [lazy_t] to
-   let the compiler implement the special typing and compilation
-   rules for the [lazy] keyword.
-*/
-
-type t<'a> = lazy_t<'a>
-
-exception Undefined = CamlinternalLazy.Undefined
-
-external force: t<'a> => 'a = "%lazy_force"
-
-/* let force = force */
-
-let force_val = CamlinternalLazy.force_val
-
-let from_fun = f => lazy f()
-
-let from_val = v => lazy v
-
-let is_val = CamlinternalLazy.is_val
-
-let lazy_from_fun = from_fun
-
-let lazy_from_val = from_val
-
-let lazy_is_val = is_val
diff --git a/jscomp/stdlib-406/lazy.resi b/jscomp/stdlib-406/lazy.resi
deleted file mode 100644
index fee1eef..0000000
--- a/jscomp/stdlib-406/lazy.resi
+++ /dev/null
@@ -1,91 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Damien Doligez, projet Para, INRIA Rocquencourt */
-/*  */
-/* Copyright 1997 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Deferred computations. */
-
-/** A value of type ['a Lazy.t] is a deferred computation, called
-   a suspension, that has a result of type ['a].  The special
-   expression syntax [lazy (expr)] makes a suspension of the
-   computation of [expr], without computing [expr] itself yet.
-   "Forcing" the suspension will then compute [expr] and return its
-   result.
-
-   Note: [lazy_t] is the built-in type constructor used by the compiler
-   for the [lazy] keyword.  You should not use it directly.  Always use
-   [Lazy.t] instead.
-
-   Note: [Lazy.force] is not thread-safe.  If you use this module in
-   a multi-threaded program, you will need to add some locks.
-
-   Note: if the program is compiled with the [-rectypes] option,
-   ill-founded recursive definitions of the form [let rec x = lazy x]
-   or [let rec x = lazy(lazy(...(lazy x)))] are accepted by the type-checker
-   and lead, when forced, to ill-formed values that trigger infinite
-   loops in the garbage collector and other parts of the run-time system.
-   Without the [-rectypes] option, such ill-founded recursive definitions
-   are rejected by the type-checker.
-*/
-type t<'a> = lazy_t<'a>
-
-exception Undefined
-
-/* val force : 'a t -> 'a */
-/** [force x] forces the suspension [x] and returns its result.
-   If [x] has already been forced, [Lazy.force x] returns the
-   same value again without recomputing it.  If it raised an exception,
-   the same exception is raised again.
-   Raise {!Undefined} if the forcing of [x] tries to force [x] itself
-   recursively.
-*/
-external force: t<'a> => 'a = "%lazy_force"
-
-/** [force_val x] forces the suspension [x] and returns its
-    result.  If [x] has already been forced, [force_val x]
-    returns the same value again without recomputing it.
-    Raise {!Undefined} if the forcing of [x] tries to force [x] itself
-    recursively.
-    If the computation of [x] raises an exception, it is unspecified
-    whether [force_val x] raises the same exception or {!Undefined}.
-*/
-let force_val: t<'a> => 'a
-
-/** [from_fun f] is the same as [lazy (f ())] but slightly more efficient.
-
-    [from_fun] should only be used if the function [f] is already defined.
-    In particular it is always less efficient to write
-    [from_fun (fun () -> expr)] than [lazy expr].
-
-    @since 4.00.0 */
-let from_fun: (unit => 'a) => t<'a>
-
-/** [from_val v] returns an already-forced suspension of [v].
-    This is for special purposes only and should not be confused with
-    [lazy (v)].
-    @since 4.00.0 */
-let from_val: 'a => t<'a>
-
-/** [is_val x] returns [true] if [x] has already been forced and
-    did not raise an exception.
-    @since 4.00.0 */
-let is_val: t<'a> => bool
-
-@deprecated("Use Lazy.from_fun instead.") /** @deprecated synonym for [from_fun]. */
-let lazy_from_fun: (unit => 'a) => t<'a>
-
-@deprecated("Use Lazy.from_val instead.") /** @deprecated synonym for [from_val]. */
-let lazy_from_val: 'a => t<'a>
-
-@deprecated("Use Lazy.is_val instead.") /** @deprecated synonym for [is_val]. */
-let lazy_is_val: t<'a> => bool
diff --git a/jscomp/stdlib-406/lexing.res b/jscomp/stdlib-406/lexing.res
deleted file mode 100644
index 2773ecb..0000000
--- a/jscomp/stdlib-406/lexing.res
+++ /dev/null
@@ -1,245 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* The run-time library for lexers generated by camllex */
-
-type position = {
-  pos_fname: string,
-  pos_lnum: int,
-  pos_bol: int,
-  pos_cnum: int,
-}
-
-let dummy_pos = {
-  pos_fname: "",
-  pos_lnum: 0,
-  pos_bol: 0,
-  pos_cnum: -1,
-}
-
-type rec lexbuf = {
-  refill_buff: lexbuf => unit,
-  mutable lex_buffer: bytes,
-  mutable lex_buffer_len: int,
-  mutable lex_abs_pos: int,
-  mutable lex_start_pos: int,
-  mutable lex_curr_pos: int,
-  mutable lex_last_pos: int,
-  mutable lex_last_action: int,
-  mutable lex_eof_reached: bool,
-  mutable lex_mem: array<int>,
-  mutable lex_start_p: position,
-  mutable lex_curr_p: position,
-}
-
-type lex_tables = {
-  lex_base: string,
-  lex_backtrk: string,
-  lex_default: string,
-  lex_trans: string,
-  lex_check: string,
-  lex_base_code: string,
-  lex_backtrk_code: string,
-  lex_default_code: string,
-  lex_trans_code: string,
-  lex_check_code: string,
-  lex_code: string,
-}
-
-external c_engine: (lex_tables, int, lexbuf) => int = "?lex_engine"
-external c_new_engine: (lex_tables, int, lexbuf) => int = "?new_lex_engine"
-
-let engine = (tbl, state, buf) => {
-  let result = c_engine(tbl, state, buf)
-  if result >= 0 {
-    buf.lex_start_p = buf.lex_curr_p
-    buf.lex_curr_p = {
-      ...buf.lex_curr_p,
-      pos_cnum: buf.lex_abs_pos + buf.lex_curr_pos,
-    }
-  }
-  result
-}
-
-let new_engine = (tbl, state, buf) => {
-  let result = c_new_engine(tbl, state, buf)
-  if result >= 0 {
-    buf.lex_start_p = buf.lex_curr_p
-    buf.lex_curr_p = {
-      ...buf.lex_curr_p,
-      pos_cnum: buf.lex_abs_pos + buf.lex_curr_pos,
-    }
-  }
-  result
-}
-
-let lex_refill = (read_fun, aux_buffer, lexbuf) => {
-  let read = read_fun(aux_buffer, Bytes.length(aux_buffer))
-  let n = if read > 0 {
-    read
-  } else {
-    lexbuf.lex_eof_reached = true
-    0
-  }
-
-  /* Current state of the buffer:
-        <-------|---------------------|----------->
-        |  junk |      valid data     |   junk    |
-        ^       ^                     ^           ^
-        0    start_pos             buffer_end    Bytes.length buffer
- */
-  if lexbuf.lex_buffer_len + n > Bytes.length(lexbuf.lex_buffer) {
-    /* There is not enough space at the end of the buffer */
-    if lexbuf.lex_buffer_len - lexbuf.lex_start_pos + n <= Bytes.length(lexbuf.lex_buffer) {
-      /* But there is enough space if we reclaim the junk at the beginning
-       of the buffer */
-      Bytes.blit(
-        lexbuf.lex_buffer,
-        lexbuf.lex_start_pos,
-        lexbuf.lex_buffer,
-        0,
-        lexbuf.lex_buffer_len - lexbuf.lex_start_pos,
-      )
-    } else {
-      /* We must grow the buffer.  Doubling its size will provide enough
-         space since n <= String.length aux_buffer <= String.length buffer.
-         Watch out for string length overflow, though. */
-      let newlen = 2 * Bytes.length(lexbuf.lex_buffer)
-
-      if lexbuf.lex_buffer_len - lexbuf.lex_start_pos + n > newlen {
-        failwith("Lexing.lex_refill: cannot grow buffer")
-      }
-      let newbuf = Bytes.create(newlen)
-      /* Copy the valid data to the beginning of the new buffer */
-      Bytes.blit(
-        lexbuf.lex_buffer,
-        lexbuf.lex_start_pos,
-        newbuf,
-        0,
-        lexbuf.lex_buffer_len - lexbuf.lex_start_pos,
-      )
-      lexbuf.lex_buffer = newbuf
-    }
-    /* Reallocation or not, we have shifted the data left by
-     start_pos characters; update the positions */
-    let s = lexbuf.lex_start_pos
-    lexbuf.lex_abs_pos = lexbuf.lex_abs_pos + s
-    lexbuf.lex_curr_pos = lexbuf.lex_curr_pos - s
-    lexbuf.lex_start_pos = 0
-    lexbuf.lex_last_pos = lexbuf.lex_last_pos - s
-    lexbuf.lex_buffer_len = lexbuf.lex_buffer_len - s
-    let t = lexbuf.lex_mem
-    for i in 0 to Array.length(t) - 1 {
-      let v = t[i]
-      if v >= 0 {
-        t[i] = v - s
-      }
-    }
-  }
-  /* There is now enough space at the end of the buffer */
-  Bytes.blit(aux_buffer, 0, lexbuf.lex_buffer, lexbuf.lex_buffer_len, n)
-  lexbuf.lex_buffer_len = lexbuf.lex_buffer_len + n
-}
-
-let zero_pos = {
-  pos_fname: "",
-  pos_lnum: 1,
-  pos_bol: 0,
-  pos_cnum: 0,
-}
-
-let from_function = f => {
-  refill_buff: lex_refill(f, Bytes.create(512)),
-  lex_buffer: Bytes.create(1024),
-  lex_buffer_len: 0,
-  lex_abs_pos: 0,
-  lex_start_pos: 0,
-  lex_curr_pos: 0,
-  lex_last_pos: 0,
-  lex_last_action: 0,
-  lex_mem: [],
-  lex_eof_reached: false,
-  lex_start_p: zero_pos,
-  lex_curr_p: zero_pos,
-}
-
-let from_string = s => {
-  refill_buff: lexbuf => lexbuf.lex_eof_reached = true,
-  lex_buffer: Bytes.of_string(s) /* have to make a copy for compatibility
-   with unsafe-string mode */,
-  lex_buffer_len: String.length(s),
-  lex_abs_pos: 0,
-  lex_start_pos: 0,
-  lex_curr_pos: 0,
-  lex_last_pos: 0,
-  lex_last_action: 0,
-  lex_mem: [],
-  lex_eof_reached: true,
-  lex_start_p: zero_pos,
-  lex_curr_p: zero_pos,
-}
-
-let lexeme = lexbuf => {
-  let len = lexbuf.lex_curr_pos - lexbuf.lex_start_pos
-  Bytes.sub_string(lexbuf.lex_buffer, lexbuf.lex_start_pos, len)
-}
-
-let sub_lexeme = (lexbuf, i1, i2) => {
-  let len = i2 - i1
-  Bytes.sub_string(lexbuf.lex_buffer, i1, len)
-}
-
-let sub_lexeme_opt = (lexbuf, i1, i2) =>
-  if i1 >= 0 {
-    let len = i2 - i1
-    Some(Bytes.sub_string(lexbuf.lex_buffer, i1, len))
-  } else {
-    None
-  }
-
-let sub_lexeme_char = (lexbuf, i) => Bytes.get(lexbuf.lex_buffer, i)
-
-let sub_lexeme_char_opt = (lexbuf, i) =>
-  if i >= 0 {
-    Some(Bytes.get(lexbuf.lex_buffer, i))
-  } else {
-    None
-  }
-
-let lexeme_char = (lexbuf, i) => Bytes.get(lexbuf.lex_buffer, lexbuf.lex_start_pos + i)
-
-let lexeme_start = lexbuf => lexbuf.lex_start_p.pos_cnum
-let lexeme_end = lexbuf => lexbuf.lex_curr_p.pos_cnum
-
-let lexeme_start_p = lexbuf => lexbuf.lex_start_p
-let lexeme_end_p = lexbuf => lexbuf.lex_curr_p
-
-let new_line = lexbuf => {
-  let lcp = lexbuf.lex_curr_p
-  lexbuf.lex_curr_p = {
-    ...lcp,
-    pos_lnum: lcp.pos_lnum + 1,
-    pos_bol: lcp.pos_cnum,
-  }
-}
-
-/* Discard data left in lexer buffer. */
-
-let flush_input = lb => {
-  lb.lex_curr_pos = 0
-  lb.lex_abs_pos = 0
-  lb.lex_curr_p = {...lb.lex_curr_p, pos_cnum: 0}
-  lb.lex_buffer_len = 0
-}
diff --git a/jscomp/stdlib-406/lexing.resi b/jscomp/stdlib-406/lexing.resi
deleted file mode 100644
index 9a84781..0000000
--- a/jscomp/stdlib-406/lexing.resi
+++ /dev/null
@@ -1,164 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** The run-time library for lexers generated by [ocamllex]. */
-
-/* {1 Positions} */
-
-/** A value of type [position] describes a point in a source file.
-   [pos_fname] is the file name; [pos_lnum] is the line number;
-   [pos_bol] is the offset of the beginning of the line (number
-   of characters between the beginning of the lexbuf and the beginning
-   of the line); [pos_cnum] is the offset of the position (number of
-   characters between the beginning of the lexbuf and the position).
-   The difference between [pos_cnum] and [pos_bol] is the character
-   offset within the line (i.e. the column number, assuming each
-   character is one column wide).
-
-   See the documentation of type [lexbuf] for information about
-   how the lexing engine will manage positions.
- */
-type position = {
-  pos_fname: string,
-  pos_lnum: int,
-  pos_bol: int,
-  pos_cnum: int,
-}
-
-/** A value of type [position], guaranteed to be different from any
-   valid position.
- */
-let dummy_pos: position
-
-/* {1 Lexer buffers} */
-
-/** The type of lexer buffers. A lexer buffer is the argument passed
-   to the scanning functions defined by the generated scanners.
-   The lexer buffer holds the current state of the scanner, plus
-   a function to refill the buffer from the input.
-
-   At each token, the lexing engine will copy [lex_curr_p] to
-   [lex_start_p], then change the [pos_cnum] field
-   of [lex_curr_p] by updating it with the number of characters read
-   since the start of the [lexbuf].  The other fields are left
-   unchanged by the lexing engine.  In order to keep them
-   accurate, they must be initialised before the first use of the
-   lexbuf, and updated by the relevant lexer actions (i.e. at each
-   end of line -- see also [new_line]).
- */
-type rec lexbuf = {
-  refill_buff: lexbuf => unit,
-  mutable lex_buffer: bytes,
-  mutable lex_buffer_len: int,
-  mutable lex_abs_pos: int,
-  mutable lex_start_pos: int,
-  mutable lex_curr_pos: int,
-  mutable lex_last_pos: int,
-  mutable lex_last_action: int,
-  mutable lex_eof_reached: bool,
-  mutable lex_mem: array<int>,
-  mutable lex_start_p: position,
-  mutable lex_curr_p: position,
-}
-
-/** Create a lexer buffer which reads from
-   the given string. Reading starts from the first character in
-   the string. An end-of-input condition is generated when the
-   end of the string is reached. */
-let from_string: string => lexbuf
-
-/** Create a lexer buffer with the given function as its reading method.
-   When the scanner needs more characters, it will call the given
-   function, giving it a byte sequence [s] and a byte
-   count [n]. The function should put [n] bytes or fewer in [s],
-   starting at index 0, and return the number of bytes
-   provided. A return value of 0 means end of input. */
-let from_function: ((bytes, int) => int) => lexbuf
-
-/* {1 Functions for lexer semantic actions} */
-
-/* The following functions can be called from the semantic actions
-   of lexer definitions (the ML code enclosed in braces that
-   computes the value returned by lexing functions). They give
-   access to the character string matched by the regular expression
-   associated with the semantic action. These functions must be
-   applied to the argument [lexbuf], which, in the code generated by
-   [ocamllex], is bound to the lexer buffer passed to the parsing
-   function. */
-
-/** [Lexing.lexeme lexbuf] returns the string matched by
-           the regular expression. */
-let lexeme: lexbuf => string
-
-/** [Lexing.lexeme_char lexbuf i] returns character number [i] in
-   the matched string. */
-let lexeme_char: (lexbuf, int) => char
-
-/** [Lexing.lexeme_start lexbuf] returns the offset in the
-   input stream of the first character of the matched string.
-   The first character of the stream has offset 0. */
-let lexeme_start: lexbuf => int
-
-/** [Lexing.lexeme_end lexbuf] returns the offset in the input stream
-   of the character following the last character of the matched
-   string. The first character of the stream has offset 0. */
-let lexeme_end: lexbuf => int
-
-/** Like [lexeme_start], but return a complete [position] instead
-    of an offset. */
-let lexeme_start_p: lexbuf => position
-
-/** Like [lexeme_end], but return a complete [position] instead
-    of an offset. */
-let lexeme_end_p: lexbuf => position
-
-/** Update the [lex_curr_p] field of the lexbuf to reflect the start
-    of a new line.  You can call this function in the semantic action
-    of the rule that matches the end-of-line character.
-    @since 3.11.0
-*/
-let new_line: lexbuf => unit
-
-/* {1 Miscellaneous functions} */
-
-/** Discard the contents of the buffer and reset the current
-    position to 0.  The next use of the lexbuf will trigger a
-    refill. */
-let flush_input: lexbuf => unit
-
-/* The following definitions are used by the generated scanners only.
- They are not intended to be used directly by user programs. */
-
-let sub_lexeme: (lexbuf, int, int) => string
-let sub_lexeme_opt: (lexbuf, int, int) => option<string>
-let sub_lexeme_char: (lexbuf, int) => char
-let sub_lexeme_char_opt: (lexbuf, int) => option<char>
-
-type lex_tables = {
-  lex_base: string,
-  lex_backtrk: string,
-  lex_default: string,
-  lex_trans: string,
-  lex_check: string,
-  lex_base_code: string,
-  lex_backtrk_code: string,
-  lex_default_code: string,
-  lex_trans_code: string,
-  lex_check_code: string,
-  lex_code: string,
-}
-
-let engine: (lex_tables, int, lexbuf) => int
-let new_engine: (lex_tables, int, lexbuf) => int
diff --git a/jscomp/stdlib-406/list.res b/jscomp/stdlib-406/list.res
deleted file mode 100644
index c8ae708..0000000
--- a/jscomp/stdlib-406/list.res
+++ /dev/null
@@ -1,749 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* List operations */
-
-let rec length_aux = (len, param) =>
-  switch param {
-  | list{} => len
-  | list{_, ...l} => length_aux(len + 1, l)
-  }
-
-let length = l => length_aux(0, l)
-
-let cons = (a, l) => list{a, ...l}
-
-let hd = param =>
-  switch param {
-  | list{} => failwith("hd")
-  | list{a, ..._} => a
-  }
-
-let tl = param =>
-  switch param {
-  | list{} => failwith("tl")
-  | list{_, ...l} => l
-  }
-
-let nth = (l, n) =>
-  if n < 0 {
-    invalid_arg("List.nth")
-  } else {
-    let rec nth_aux = (l, n) =>
-      switch l {
-      | list{} => failwith("nth")
-      | list{a, ...l} =>
-        if n == 0 {
-          a
-        } else {
-          nth_aux(l, n - 1)
-        }
-      }
-    nth_aux(l, n)
-  }
-
-let nth_opt = (l, n) =>
-  if n < 0 {
-    invalid_arg("List.nth")
-  } else {
-    let rec nth_aux = (l, n) =>
-      switch l {
-      | list{} => None
-      | list{a, ...l} =>
-        if n == 0 {
-          Some(a)
-        } else {
-          nth_aux(l, n - 1)
-        }
-      }
-    nth_aux(l, n)
-  }
-
-let append = \"@"
-
-let rec rev_append = (l1, l2) =>
-  switch l1 {
-  | list{} => l2
-  | list{a, ...l} => rev_append(l, list{a, ...l2})
-  }
-
-let rev = l => rev_append(l, list{})
-
-let rec init_tailrec_aux = (acc, i, n, f) =>
-  if i >= n {
-    acc
-  } else {
-    init_tailrec_aux(list{f(i), ...acc}, i + 1, n, f)
-  }
-
-let rec init_aux = (i, n, f) =>
-  if i >= n {
-    list{}
-  } else {
-    let r = f(i)
-    list{r, ...init_aux(i + 1, n, f)}
-  }
-
-let init = (len, f) =>
-  if len < 0 {
-    invalid_arg("List.init")
-  } else if len > 10_000 {
-    rev(init_tailrec_aux(list{}, 0, len, f))
-  } else {
-    init_aux(0, len, f)
-  }
-
-let rec flatten = param =>
-  switch param {
-  | list{} => list{}
-  | list{l, ...r} => \"@"(l, flatten(r))
-  }
-
-let concat = flatten
-
-let rec map = (f, param) =>
-  switch param {
-  | list{} => list{}
-  | list{a, ...l} =>
-    let r = f(a)
-    list{r, ...map(f, l)}
-  }
-
-let rec mapi = (i, f, param) =>
-  switch param {
-  | list{} => list{}
-  | list{a, ...l} =>
-    let r = f(i, a)
-    list{r, ...mapi(i + 1, f, l)}
-  }
-
-let mapi = (f, l) => mapi(0, f, l)
-
-let rev_map = (f, l) => {
-  let rec rmap_f = (accu, param) =>
-    switch param {
-    | list{} => accu
-    | list{a, ...l} => rmap_f(list{f(a), ...accu}, l)
-    }
-
-  rmap_f(list{}, l)
-}
-
-let rec iter = (f, param) =>
-  switch param {
-  | list{} => ()
-  | list{a, ...l} =>
-    f(a)
-    iter(f, l)
-  }
-
-let rec iteri = (i, f, param) =>
-  switch param {
-  | list{} => ()
-  | list{a, ...l} =>
-    f(i, a)
-    iteri(i + 1, f, l)
-  }
-
-let iteri = (f, l) => iteri(0, f, l)
-
-let rec fold_left = (f, accu, l) =>
-  switch l {
-  | list{} => accu
-  | list{a, ...l} => fold_left(f, f(accu, a), l)
-  }
-
-let rec fold_right = (f, l, accu) =>
-  switch l {
-  | list{} => accu
-  | list{a, ...l} => f(a, fold_right(f, l, accu))
-  }
-
-let rec map2 = (f, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => list{}
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    let r = f(a1, a2)
-    list{r, ...map2(f, l1, l2)}
-  | (_, _) => invalid_arg("List.map2")
-  }
-
-let rev_map2 = (f, l1, l2) => {
-  let rec rmap2_f = (accu, l1, l2) =>
-    switch (l1, l2) {
-    | (list{}, list{}) => accu
-    | (list{a1, ...l1}, list{a2, ...l2}) => rmap2_f(list{f(a1, a2), ...accu}, l1, l2)
-    | (_, _) => invalid_arg("List.rev_map2")
-    }
-
-  rmap2_f(list{}, l1, l2)
-}
-
-let rec iter2 = (f, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => ()
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    f(a1, a2)
-    iter2(f, l1, l2)
-  | (_, _) => invalid_arg("List.iter2")
-  }
-
-let rec fold_left2 = (f, accu, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => accu
-  | (list{a1, ...l1}, list{a2, ...l2}) => fold_left2(f, f(accu, a1, a2), l1, l2)
-  | (_, _) => invalid_arg("List.fold_left2")
-  }
-
-let rec fold_right2 = (f, l1, l2, accu) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => accu
-  | (list{a1, ...l1}, list{a2, ...l2}) => f(a1, a2, fold_right2(f, l1, l2, accu))
-  | (_, _) => invalid_arg("List.fold_right2")
-  }
-
-let rec for_all = (p, param) =>
-  switch param {
-  | list{} => true
-  | list{a, ...l} => p(a) && for_all(p, l)
-  }
-
-let rec exists = (p, param) =>
-  switch param {
-  | list{} => false
-  | list{a, ...l} => p(a) || exists(p, l)
-  }
-
-let rec for_all2 = (p, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => true
-  | (list{a1, ...l1}, list{a2, ...l2}) => p(a1, a2) && for_all2(p, l1, l2)
-  | (_, _) => invalid_arg("List.for_all2")
-  }
-
-let rec exists2 = (p, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => false
-  | (list{a1, ...l1}, list{a2, ...l2}) => p(a1, a2) || exists2(p, l1, l2)
-  | (_, _) => invalid_arg("List.exists2")
-  }
-
-let rec mem = (x, param) =>
-  switch param {
-  | list{} => false
-  | list{a, ...l} => compare(a, x) == 0 || mem(x, l)
-  }
-
-let rec memq = (x, param) =>
-  switch param {
-  | list{} => false
-  | list{a, ...l} => a === x || memq(x, l)
-  }
-
-let rec assoc = (x, param) =>
-  switch param {
-  | list{} => raise(Not_found)
-  | list{(a, b), ...l} =>
-    if compare(a, x) == 0 {
-      b
-    } else {
-      assoc(x, l)
-    }
-  }
-
-let rec assoc_opt = (x, param) =>
-  switch param {
-  | list{} => None
-  | list{(a, b), ...l} =>
-    if compare(a, x) == 0 {
-      Some(b)
-    } else {
-      assoc_opt(x, l)
-    }
-  }
-
-let rec assq = (x, param) =>
-  switch param {
-  | list{} => raise(Not_found)
-  | list{(a, b), ...l} =>
-    if a === x {
-      b
-    } else {
-      assq(x, l)
-    }
-  }
-
-let rec assq_opt = (x, param) =>
-  switch param {
-  | list{} => None
-  | list{(a, b), ...l} =>
-    if a === x {
-      Some(b)
-    } else {
-      assq_opt(x, l)
-    }
-  }
-
-let rec mem_assoc = (x, param) =>
-  switch param {
-  | list{} => false
-  | list{(a, _), ...l} => compare(a, x) == 0 || mem_assoc(x, l)
-  }
-
-let rec mem_assq = (x, param) =>
-  switch param {
-  | list{} => false
-  | list{(a, _), ...l} => a === x || mem_assq(x, l)
-  }
-
-let rec remove_assoc = (x, param) =>
-  switch param {
-  | list{} => list{}
-  | list{(a, _) as pair, ...l} =>
-    if compare(a, x) == 0 {
-      l
-    } else {
-      list{pair, ...remove_assoc(x, l)}
-    }
-  }
-
-let rec remove_assq = (x, param) =>
-  switch param {
-  | list{} => list{}
-  | list{(a, _) as pair, ...l} =>
-    if a === x {
-      l
-    } else {
-      list{pair, ...remove_assq(x, l)}
-    }
-  }
-
-let rec find = (p, param) =>
-  switch param {
-  | list{} => raise(Not_found)
-  | list{x, ...l} =>
-    if p(x) {
-      x
-    } else {
-      find(p, l)
-    }
-  }
-
-let rec find_opt = (p, param) =>
-  switch param {
-  | list{} => None
-  | list{x, ...l} =>
-    if p(x) {
-      Some(x)
-    } else {
-      find_opt(p, l)
-    }
-  }
-
-let find_all = p => {
-  let rec find = (accu, param) =>
-    switch param {
-    | list{} => rev(accu)
-    | list{x, ...l} =>
-      if p(x) {
-        find(list{x, ...accu}, l)
-      } else {
-        find(accu, l)
-      }
-    }
-  find(list{})
-}
-
-let filter = find_all
-
-let partition = (p, l) => {
-  let rec part = (yes, no, param) =>
-    switch param {
-    | list{} => (rev(yes), rev(no))
-    | list{x, ...l} =>
-      if p(x) {
-        part(list{x, ...yes}, no, l)
-      } else {
-        part(yes, list{x, ...no}, l)
-      }
-    }
-  part(list{}, list{}, l)
-}
-
-let rec split = param =>
-  switch param {
-  | list{} => (list{}, list{})
-  | list{(x, y), ...l} =>
-    let (rx, ry) = split(l)
-    (list{x, ...rx}, list{y, ...ry})
-  }
-
-let rec combine = (l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => list{}
-  | (list{a1, ...l1}, list{a2, ...l2}) => list{(a1, a2), ...combine(l1, l2)}
-  | (_, _) => invalid_arg("List.combine")
-  }
-
-/* sorting */
-
-let rec merge = (cmp, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, l2) => l2
-  | (l1, list{}) => l1
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    if cmp(h1, h2) <= 0 {
-      list{h1, ...merge(cmp, t1, l2)}
-    } else {
-      list{h2, ...merge(cmp, l1, t2)}
-    }
-  }
-
-let rec chop = (k, l) =>
-  if k == 0 {
-    l
-  } else {
-    switch l {
-    | list{_, ...t} => chop(k - 1, t)
-    | _ => assert(false)
-    }
-  }
-
-let stable_sort = (cmp, l) => {
-  let rec rev_merge = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      if cmp(h1, h2) <= 0 {
-        rev_merge(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec rev_merge_rev = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      if cmp(h1, h2) > 0 {
-        rev_merge_rev(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge_rev(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      if cmp(x1, x2) <= 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      if cmp(x1, x2) <= 0 {
-        if cmp(x2, x3) <= 0 {
-          list{x1, x2, x3}
-        } else if cmp(x1, x3) <= 0 {
-          list{x1, x3, x2}
-        } else {
-          list{x3, x1, x2}
-        }
-      } else if cmp(x1, x3) <= 0 {
-        list{x2, x1, x3}
-      } else if cmp(x2, x3) <= 0 {
-        list{x2, x3, x1}
-      } else {
-        list{x3, x2, x1}
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = rev_sort(n1, l)
-      let s2 = rev_sort(n2, l2)
-      rev_merge_rev(s1, s2, list{})
-    }
-  and rev_sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      if cmp(x1, x2) > 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      if cmp(x1, x2) > 0 {
-        if cmp(x2, x3) > 0 {
-          list{x1, x2, x3}
-        } else if cmp(x1, x3) > 0 {
-          list{x1, x3, x2}
-        } else {
-          list{x3, x1, x2}
-        }
-      } else if cmp(x1, x3) > 0 {
-        list{x2, x1, x3}
-      } else if cmp(x2, x3) > 0 {
-        list{x2, x3, x1}
-      } else {
-        list{x3, x2, x1}
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = sort(n1, l)
-      let s2 = sort(n2, l2)
-      rev_merge(s1, s2, list{})
-    }
-
-  let len = length(l)
-  if len < 2 {
-    l
-  } else {
-    sort(len, l)
-  }
-}
-
-let sort = stable_sort
-let fast_sort = stable_sort
-
-/* Note: on a list of length between about 100000 (depending on the minor
-  heap size and the type of the list) and Sys.max_array_size, it is
-  actually faster to use the following, but it might also use more memory
-  because the argument list cannot be deallocated incrementally.
-
-  Also, there seems to be a bug in this code or in the
-  implementation of obj_truncate.
-
-external obj_truncate : 'a array -> int -> unit = "caml_obj_truncate"
-
-let array_to_list_in_place a =
-  let l = Array.length a in
-  let rec loop accu n p =
-    if p <= 0 then accu else begin
-      if p = n then begin
-        obj_truncate a p;
-        loop (a.(p-1) :: accu) (n-1000) (p-1)
-      end else begin
-        loop (a.(p-1) :: accu) n (p-1)
-      end
-    end
-  in
-  loop [] (l-1000) l
-
-
-let stable_sort cmp l =
-  let a = Array.of_list l in
-  Array.stable_sort cmp a;
-  array_to_list_in_place a
-
-*/
-
-/* sorting + removing duplicates */
-
-let sort_uniq = (cmp, l) => {
-  let rec rev_merge = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      let c = cmp(h1, h2)
-      if c == 0 {
-        rev_merge(t1, t2, list{h1, ...accu})
-      } else if c < 0 {
-        rev_merge(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec rev_merge_rev = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      let c = cmp(h1, h2)
-      if c == 0 {
-        rev_merge_rev(t1, t2, list{h1, ...accu})
-      } else if c > 0 {
-        rev_merge_rev(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge_rev(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        list{x1}
-      } else if c < 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x2}
-        } else if c < 0 {
-          list{x2, x3}
-        } else {
-          list{x3, x2}
-        }
-      } else if c < 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x1, x2}
-        } else if c < 0 {
-          list{x1, x2, x3}
-        } else {
-          let c = cmp(x1, x3)
-          if c == 0 {
-            list{x1, x2}
-          } else if c < 0 {
-            list{x1, x3, x2}
-          } else {
-            list{x3, x1, x2}
-          }
-        }
-      } else {
-        let c = cmp(x1, x3)
-        if c == 0 {
-          list{x2, x1}
-        } else if c < 0 {
-          list{x2, x1, x3}
-        } else {
-          let c = cmp(x2, x3)
-          if c == 0 {
-            list{x2, x1}
-          } else if c < 0 {
-            list{x2, x3, x1}
-          } else {
-            list{x3, x2, x1}
-          }
-        }
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = rev_sort(n1, l)
-      let s2 = rev_sort(n2, l2)
-      rev_merge_rev(s1, s2, list{})
-    }
-  and rev_sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        list{x1}
-      } else if c > 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x2}
-        } else if c > 0 {
-          list{x2, x3}
-        } else {
-          list{x3, x2}
-        }
-      } else if c > 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x1, x2}
-        } else if c > 0 {
-          list{x1, x2, x3}
-        } else {
-          let c = cmp(x1, x3)
-          if c == 0 {
-            list{x1, x2}
-          } else if c > 0 {
-            list{x1, x3, x2}
-          } else {
-            list{x3, x1, x2}
-          }
-        }
-      } else {
-        let c = cmp(x1, x3)
-        if c == 0 {
-          list{x2, x1}
-        } else if c > 0 {
-          list{x2, x1, x3}
-        } else {
-          let c = cmp(x2, x3)
-          if c == 0 {
-            list{x2, x1}
-          } else if c > 0 {
-            list{x2, x3, x1}
-          } else {
-            list{x3, x2, x1}
-          }
-        }
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = sort(n1, l)
-      let s2 = sort(n2, l2)
-      rev_merge(s1, s2, list{})
-    }
-
-  let len = length(l)
-  if len < 2 {
-    l
-  } else {
-    sort(len, l)
-  }
-}
-
-let rec compare_lengths = (l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => 0
-  | (list{}, _) => -1
-  | (_, list{}) => 1
-  | (list{_, ...l1}, list{_, ...l2}) => compare_lengths(l1, l2)
-  }
-
-let rec compare_length_with = (l, n) =>
-  switch l {
-  | list{} =>
-    if n == 0 {
-      0
-    } else if n > 0 {
-      -1
-    } else {
-      1
-    }
-  | list{_, ...l} =>
-    if n <= 0 {
-      1
-    } else {
-      compare_length_with(l, n - 1)
-    }
-  }
diff --git a/jscomp/stdlib-406/list.resi b/jscomp/stdlib-406/list.resi
deleted file mode 100644
index 27e82bb..0000000
--- a/jscomp/stdlib-406/list.resi
+++ /dev/null
@@ -1,333 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** List operations.
-
-   Some functions are flagged as not tail-recursive.  A tail-recursive
-   function uses constant stack space, while a non-tail-recursive function
-   uses stack space proportional to the length of its list argument, which
-   can be a problem with very long lists.  When the function takes several
-   list arguments, an approximate formula giving stack usage (in some
-   unspecified constant unit) is shown in parentheses.
-
-   The above considerations can usually be ignored if your lists are not
-   longer than about 10000 elements.
-*/
-
-/** Return the length (number of elements) of the given list. */
-let length: list<'a> => int
-
-/** Compare the lengths of two lists. [compare_lengths l1 l2] is
-   equivalent to [compare (length l1) (length l2)], except that
-   the computation stops after itering on the shortest list.
-   @since 4.05.0
- */
-let compare_lengths: (list<'a>, list<'b>) => int
-
-/** Compare the length of a list to an integer. [compare_length_with l n] is
-   equivalent to [compare (length l) n], except that
-   the computation stops after at most [n] iterations on the list.
-   @since 4.05.0
-*/
-let compare_length_with: (list<'a>, int) => int
-
-/** [cons x xs] is [x :: xs]
-    @since 4.03.0
-*/
-let cons: ('a, list<'a>) => list<'a>
-
-/** Return the first element of the given list. Raise
-   [Failure "hd"] if the list is empty. */
-let hd: list<'a> => 'a
-
-/** Return the given list without its first element. Raise
-    [Failure "tl"] if the list is empty. */
-let tl: list<'a> => list<'a>
-
-/** Return the [n]-th element of the given list.
-   The first element (head of the list) is at position 0.
-   Raise [Failure "nth"] if the list is too short.
-   Raise [Invalid_argument "List.nth"] if [n] is negative. */
-let nth: (list<'a>, int) => 'a
-
-/** Return the [n]-th element of the given list.
-    The first element (head of the list) is at position 0.
-    Return [None] if the list is too short.
-    Raise [Invalid_argument "List.nth"] if [n] is negative.
-    @since 4.05
-*/
-let nth_opt: (list<'a>, int) => option<'a>
-
-/** List reversal. */
-let rev: list<'a> => list<'a>
-
-/** [List.init len f] is [f 0; f 1; ...; f (len-1)], evaluated left to right.
-
-    @raise Invalid_argument if len < 0.
-    @since 4.06.0
-*/
-let init: (int, int => 'a) => list<'a>
-
-/** Concatenate two lists.  Same as the infix operator [@].
-   Not tail-recursive (length of the first argument).  */
-let append: (list<'a>, list<'a>) => list<'a>
-
-/** [List.rev_append l1 l2] reverses [l1] and concatenates it to [l2].
-   This is equivalent to {!List.rev}[ l1 @ l2], but [rev_append] is
-   tail-recursive and more efficient. */
-let rev_append: (list<'a>, list<'a>) => list<'a>
-
-/** Concatenate a list of lists.  The elements of the argument are all
-   concatenated together (in the same order) to give the result.
-   Not tail-recursive
-   (length of the argument + length of the longest sub-list). */
-let concat: list<list<'a>> => list<'a>
-
-/** An alias for [concat]. */
-let flatten: list<list<'a>> => list<'a>
-
-/* {1 Iterators} */
-
-/** [List.iter f [a1; ...; an]] applies function [f] in turn to
-   [a1; ...; an]. It is equivalent to
-   [begin f a1; f a2; ...; f an; () end]. */
-let iter: ('a => unit, list<'a>) => unit
-
-/** Same as {!List.iter}, but the function is applied to the index of
-   the element as first argument (counting from 0), and the element
-   itself as second argument.
-   @since 4.00.0
-*/
-let iteri: ((int, 'a) => unit, list<'a>) => unit
-
-/** [List.map f [a1; ...; an]] applies function [f] to [a1, ..., an],
-   and builds the list [[f a1; ...; f an]]
-   with the results returned by [f].  Not tail-recursive. */
-let map: ('a => 'b, list<'a>) => list<'b>
-
-/** Same as {!List.map}, but the function is applied to the index of
-   the element as first argument (counting from 0), and the element
-   itself as second argument.  Not tail-recursive.
-   @since 4.00.0
-*/
-let mapi: ((int, 'a) => 'b, list<'a>) => list<'b>
-
-/** [List.rev_map f l] gives the same result as
-   {!List.rev}[ (]{!List.map}[ f l)], but is tail-recursive and
-   more efficient. */
-let rev_map: ('a => 'b, list<'a>) => list<'b>
-
-/** [List.fold_left f a [b1; ...; bn]] is
-   [f (... (f (f a b1) b2) ...) bn]. */
-let fold_left: (('a, 'b) => 'a, 'a, list<'b>) => 'a
-
-/** [List.fold_right f [a1; ...; an] b] is
-   [f a1 (f a2 (... (f an b) ...))].  Not tail-recursive. */
-let fold_right: (('a, 'b) => 'b, list<'a>, 'b) => 'b
-
-/* {1 Iterators on two lists} */
-
-/** [List.iter2 f [a1; ...; an] [b1; ...; bn]] calls in turn
-   [f a1 b1; ...; f an bn].
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths. */
-let iter2: (('a, 'b) => unit, list<'a>, list<'b>) => unit
-
-/** [List.map2 f [a1; ...; an] [b1; ...; bn]] is
-   [[f a1 b1; ...; f an bn]].
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths.  Not tail-recursive. */
-let map2: (('a, 'b) => 'c, list<'a>, list<'b>) => list<'c>
-
-/** [List.rev_map2 f l1 l2] gives the same result as
-   {!List.rev}[ (]{!List.map2}[ f l1 l2)], but is tail-recursive and
-   more efficient. */
-let rev_map2: (('a, 'b) => 'c, list<'a>, list<'b>) => list<'c>
-
-/** [List.fold_left2 f a [b1; ...; bn] [c1; ...; cn]] is
-   [f (... (f (f a b1 c1) b2 c2) ...) bn cn].
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths. */
-let fold_left2: (('a, 'b, 'c) => 'a, 'a, list<'b>, list<'c>) => 'a
-
-/** [List.fold_right2 f [a1; ...; an] [b1; ...; bn] c] is
-   [f a1 b1 (f a2 b2 (... (f an bn c) ...))].
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths.  Not tail-recursive. */
-let fold_right2: (('a, 'b, 'c) => 'c, list<'a>, list<'b>, 'c) => 'c
-
-/* {1 List scanning} */
-
-/** [for_all p [a1; ...; an]] checks if all elements of the list
-   satisfy the predicate [p]. That is, it returns
-   [(p a1) && (p a2) && ... && (p an)]. */
-let for_all: ('a => bool, list<'a>) => bool
-
-/** [exists p [a1; ...; an]] checks if at least one element of
-   the list satisfies the predicate [p]. That is, it returns
-   [(p a1) || (p a2) || ... || (p an)]. */
-let exists: ('a => bool, list<'a>) => bool
-
-/** Same as {!List.for_all}, but for a two-argument predicate.
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths. */
-let for_all2: (('a, 'b) => bool, list<'a>, list<'b>) => bool
-
-/** Same as {!List.exists}, but for a two-argument predicate.
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths. */
-let exists2: (('a, 'b) => bool, list<'a>, list<'b>) => bool
-
-/** [mem a l] is true if and only if [a] is equal
-   to an element of [l]. */
-let mem: ('a, list<'a>) => bool
-
-/** Same as {!List.mem}, but uses physical equality instead of structural
-   equality to compare list elements. */
-let memq: ('a, list<'a>) => bool
-
-/* {1 List searching} */
-
-/** [find p l] returns the first element of the list [l]
-   that satisfies the predicate [p].
-   Raise [Not_found] if there is no value that satisfies [p] in the
-   list [l]. */
-let find: ('a => bool, list<'a>) => 'a
-
-/** [find_opt p l] returns the first element of the list [l] that
-    satisfies the predicate [p], or [None] if there is no value that
-    satisfies [p] in the list [l].
-    @since 4.05 */
-let find_opt: ('a => bool, list<'a>) => option<'a>
-
-/** [filter p l] returns all the elements of the list [l]
-   that satisfy the predicate [p].  The order of the elements
-   in the input list is preserved.  */
-let filter: ('a => bool, list<'a>) => list<'a>
-
-/** [find_all] is another name for {!List.filter}. */
-let find_all: ('a => bool, list<'a>) => list<'a>
-
-/** [partition p l] returns a pair of lists [(l1, l2)], where
-   [l1] is the list of all the elements of [l] that
-   satisfy the predicate [p], and [l2] is the list of all the
-   elements of [l] that do not satisfy [p].
-   The order of the elements in the input list is preserved. */
-let partition: ('a => bool, list<'a>) => (list<'a>, list<'a>)
-
-/* {1 Association lists} */
-
-/** [assoc a l] returns the value associated with key [a] in the list of
-   pairs [l]. That is,
-   [assoc a [ ...; (a,b); ...] = b]
-   if [(a,b)] is the leftmost binding of [a] in list [l].
-   Raise [Not_found] if there is no value associated with [a] in the
-   list [l]. */
-let assoc: ('a, list<('a, 'b)>) => 'b
-
-/** [assoc_opt a l] returns the value associated with key [a] in the list of
-   pairs [l]. That is,
-   [assoc_opt a [ ...; (a,b); ...] = b]
-   if [(a,b)] is the leftmost binding of [a] in list [l].
-   Returns [None] if there is no value associated with [a] in the
-   list [l].
-   @since 4.05 */
-let assoc_opt: ('a, list<('a, 'b)>) => option<'b>
-
-/** Same as {!List.assoc}, but uses physical equality instead of structural
-   equality to compare keys. */
-let assq: ('a, list<('a, 'b)>) => 'b
-
-/** Same as {!List.assoc_opt}, but uses physical equality instead of structural
-    equality to compare keys.
-    @since 4.05 */
-let assq_opt: ('a, list<('a, 'b)>) => option<'b>
-
-/** Same as {!List.assoc}, but simply return true if a binding exists,
-   and false if no bindings exist for the given key. */
-let mem_assoc: ('a, list<('a, 'b)>) => bool
-
-/** Same as {!List.mem_assoc}, but uses physical equality instead of
-   structural equality to compare keys. */
-let mem_assq: ('a, list<('a, 'b)>) => bool
-
-/** [remove_assoc a l] returns the list of
-   pairs [l] without the first pair with key [a], if any.
-   Not tail-recursive. */
-let remove_assoc: ('a, list<('a, 'b)>) => list<('a, 'b)>
-
-/** Same as {!List.remove_assoc}, but uses physical equality instead
-   of structural equality to compare keys.  Not tail-recursive. */
-let remove_assq: ('a, list<('a, 'b)>) => list<('a, 'b)>
-
-/* {1 Lists of pairs} */
-
-/** Transform a list of pairs into a pair of lists:
-   [split [(a1,b1); ...; (an,bn)]] is [([a1; ...; an], [b1; ...; bn])].
-   Not tail-recursive.
-*/
-let split: list<('a, 'b)> => (list<'a>, list<'b>)
-
-/** Transform a pair of lists into a list of pairs:
-   [combine [a1; ...; an] [b1; ...; bn]] is
-   [[(a1,b1); ...; (an,bn)]].
-   Raise [Invalid_argument] if the two lists
-   have different lengths.  Not tail-recursive. */
-let combine: (list<'a>, list<'b>) => list<('a, 'b)>
-
-/* {1 Sorting} */
-
-/** Sort a list in increasing order according to a comparison
-   function.  The comparison function must return 0 if its arguments
-   compare as equal, a positive integer if the first is greater,
-   and a negative integer if the first is smaller (see Array.sort for
-   a complete specification).  For example,
-   {!Pervasives.compare} is a suitable comparison function.
-   The resulting list is sorted in increasing order.
-   [List.sort] is guaranteed to run in constant heap space
-   (in addition to the size of the result list) and logarithmic
-   stack space.
-
-   The current implementation uses Merge Sort. It runs in constant
-   heap space and logarithmic stack space.
-*/
-let sort: (('a, 'a) => int, list<'a>) => list<'a>
-
-/** Same as {!List.sort}, but the sorting algorithm is guaranteed to
-   be stable (i.e. elements that compare equal are kept in their
-   original order) .
-
-   The current implementation uses Merge Sort. It runs in constant
-   heap space and logarithmic stack space.
-*/
-let stable_sort: (('a, 'a) => int, list<'a>) => list<'a>
-
-/** Same as {!List.sort} or {!List.stable_sort}, whichever is faster
-    on typical input. */
-let fast_sort: (('a, 'a) => int, list<'a>) => list<'a>
-
-/** Same as {!List.sort}, but also remove duplicates.
-    @since 4.02.0 */
-let sort_uniq: (('a, 'a) => int, list<'a>) => list<'a>
-
-/** Merge two lists:
-    Assuming that [l1] and [l2] are sorted according to the
-    comparison function [cmp], [merge cmp l1 l2] will return a
-    sorted list containing all the elements of [l1] and [l2].
-    If several elements compare equal, the elements of [l1] will be
-    before the elements of [l2].
-    Not tail-recursive (sum of the lengths of the arguments).
-*/
-let merge: (('a, 'a) => int, list<'a>, list<'a>) => list<'a>
diff --git a/jscomp/stdlib-406/listLabels.res b/jscomp/stdlib-406/listLabels.res
deleted file mode 100644
index 48d46d9..0000000
--- a/jscomp/stdlib-406/listLabels.res
+++ /dev/null
@@ -1,748 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* List operations */
-
-let rec length_aux = (len, param) =>
-  switch param {
-  | list{} => len
-  | list{_, ...l} => length_aux(len + 1, l)
-  }
-
-let length = l => length_aux(0, l)
-
-let cons = (a, l) => list{a, ...l}
-
-let hd = param =>
-  switch param {
-  | list{} => failwith("hd")
-  | list{a, ..._} => a
-  }
-
-let tl = param =>
-  switch param {
-  | list{} => failwith("tl")
-  | list{_, ...l} => l
-  }
-
-let nth = (l, n) =>
-  if n < 0 {
-    invalid_arg("List.nth")
-  } else {
-    let rec nth_aux = (l, n) =>
-      switch l {
-      | list{} => failwith("nth")
-      | list{a, ...l} =>
-        if n == 0 {
-          a
-        } else {
-          nth_aux(l, n - 1)
-        }
-      }
-    nth_aux(l, n)
-  }
-
-let nth_opt = (l, n) =>
-  if n < 0 {
-    invalid_arg("List.nth")
-  } else {
-    let rec nth_aux = (l, n) =>
-      switch l {
-      | list{} => None
-      | list{a, ...l} =>
-        if n == 0 {
-          Some(a)
-        } else {
-          nth_aux(l, n - 1)
-        }
-      }
-    nth_aux(l, n)
-  }
-
-let append = \"@"
-
-let rec rev_append = (l1, l2) =>
-  switch l1 {
-  | list{} => l2
-  | list{a, ...l} => rev_append(l, list{a, ...l2})
-  }
-
-let rev = l => rev_append(l, list{})
-
-let rec init_tailrec_aux = (acc, i, n, f) =>
-  if i >= n {
-    acc
-  } else {
-    init_tailrec_aux(list{f(i), ...acc}, i + 1, n, f)
-  }
-
-let rec init_aux = (i, n, f) =>
-  if i >= n {
-    list{}
-  } else {
-    let r = f(i)
-    list{r, ...init_aux(i + 1, n, f)}
-  }
-
-let init = (~len, ~f) =>
-  if len < 0 {
-    invalid_arg("List.init")
-  } else if len > 10_000 {
-    rev(init_tailrec_aux(list{}, 0, len, f))
-  } else {
-    init_aux(0, len, f)
-  }
-
-let rec flatten = param =>
-  switch param {
-  | list{} => list{}
-  | list{l, ...r} => \"@"(l, flatten(r))
-  }
-
-let concat = flatten
-
-let rec map = (~f, param) =>
-  switch param {
-  | list{} => list{}
-  | list{a, ...l} =>
-    let r = f(a)
-    list{r, ...map(~f, l)}
-  }
-
-let rec mapi = (i, f, param) =>
-  switch param {
-  | list{} => list{}
-  | list{a, ...l} =>
-    let r = f(i, a)
-    list{r, ...mapi(i + 1, f, l)}
-  }
-
-let mapi = (~f, l) => mapi(0, f, l)
-
-let rev_map = (~f, l) => {
-  let rec rmap_f = (accu, param) =>
-    switch param {
-    | list{} => accu
-    | list{a, ...l} => rmap_f(list{f(a), ...accu}, l)
-    }
-
-  rmap_f(list{}, l)
-}
-
-let rec iter = (~f, param) =>
-  switch param {
-  | list{} => ()
-  | list{a, ...l} =>
-    f(a)
-    iter(~f, l)
-  }
-
-let rec iteri = (i, f, param) =>
-  switch param {
-  | list{} => ()
-  | list{a, ...l} =>
-    f(i, a)
-    iteri(i + 1, f, l)
-  }
-
-let iteri = (~f, l) => iteri(0, f, l)
-
-let rec fold_left = (~f, ~init as accu, l) =>
-  switch l {
-  | list{} => accu
-  | list{a, ...l} => fold_left(~f, ~init=f(accu, a), l)
-  }
-
-let rec fold_right = (~f, l, ~init as accu) =>
-  switch l {
-  | list{} => accu
-  | list{a, ...l} => f(a, fold_right(~f, l, ~init=accu))
-  }
-
-let rec map2 = (~f, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => list{}
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    let r = f(a1, a2)
-    list{r, ...map2(~f, l1, l2)}
-  | (_, _) => invalid_arg("List.map2")
-  }
-
-let rev_map2 = (~f, l1, l2) => {
-  let rec rmap2_f = (accu, l1, l2) =>
-    switch (l1, l2) {
-    | (list{}, list{}) => accu
-    | (list{a1, ...l1}, list{a2, ...l2}) => rmap2_f(list{f(a1, a2), ...accu}, l1, l2)
-    | (_, _) => invalid_arg("List.rev_map2")
-    }
-
-  rmap2_f(list{}, l1, l2)
-}
-
-let rec iter2 = (~f, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => ()
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    f(a1, a2)
-    iter2(~f, l1, l2)
-  | (_, _) => invalid_arg("List.iter2")
-  }
-
-let rec fold_left2 = (~f, ~init as accu, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => accu
-  | (list{a1, ...l1}, list{a2, ...l2}) => fold_left2(~f, ~init=f(accu, a1, a2), l1, l2)
-  | (_, _) => invalid_arg("List.fold_left2")
-  }
-
-let rec fold_right2 = (~f, l1, l2, ~init as accu) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => accu
-  | (list{a1, ...l1}, list{a2, ...l2}) => f(a1, a2, fold_right2(~f, l1, l2, ~init=accu))
-  | (_, _) => invalid_arg("List.fold_right2")
-  }
-
-let rec for_all = (~f as p, param) =>
-  switch param {
-  | list{} => true
-  | list{a, ...l} => p(a) && for_all(~f=p, l)
-  }
-
-let rec exists = (~f as p, param) =>
-  switch param {
-  | list{} => false
-  | list{a, ...l} => p(a) || exists(~f=p, l)
-  }
-
-let rec for_all2 = (~f as p, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => true
-  | (list{a1, ...l1}, list{a2, ...l2}) => p(a1, a2) && for_all2(~f=p, l1, l2)
-  | (_, _) => invalid_arg("List.for_all2")
-  }
-
-let rec exists2 = (~f as p, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => false
-  | (list{a1, ...l1}, list{a2, ...l2}) => p(a1, a2) || exists2(~f=p, l1, l2)
-  | (_, _) => invalid_arg("List.exists2")
-  }
-
-let rec mem = (x, ~set) =>
-  switch set {
-  | list{} => false
-  | list{a, ...l} => compare(a, x) == 0 || mem(x, ~set=l)
-  }
-
-let rec memq = (x, ~set) =>
-  switch set {
-  | list{} => false
-  | list{a, ...l} => a === x || memq(x, ~set=l)
-  }
-
-let rec assoc = (x, param) =>
-  switch param {
-  | list{} => raise(Not_found)
-  | list{(a, b), ...l} =>
-    if compare(a, x) == 0 {
-      b
-    } else {
-      assoc(x, l)
-    }
-  }
-
-let rec assoc_opt = (x, param) =>
-  switch param {
-  | list{} => None
-  | list{(a, b), ...l} =>
-    if compare(a, x) == 0 {
-      Some(b)
-    } else {
-      assoc_opt(x, l)
-    }
-  }
-
-let rec assq = (x, param) =>
-  switch param {
-  | list{} => raise(Not_found)
-  | list{(a, b), ...l} =>
-    if a === x {
-      b
-    } else {
-      assq(x, l)
-    }
-  }
-
-let rec assq_opt = (x, param) =>
-  switch param {
-  | list{} => None
-  | list{(a, b), ...l} =>
-    if a === x {
-      Some(b)
-    } else {
-      assq_opt(x, l)
-    }
-  }
-
-let rec mem_assoc = (x, ~map) =>
-  switch map {
-  | list{} => false
-  | list{(a, _), ...l} => compare(a, x) == 0 || mem_assoc(x, ~map=l)
-  }
-
-let rec mem_assq = (x, ~map) =>
-  switch map {
-  | list{} => false
-  | list{(a, _), ...l} => a === x || mem_assq(x, ~map=l)
-  }
-
-let rec remove_assoc = (x, param) =>
-  switch param {
-  | list{} => list{}
-  | list{(a, _) as pair, ...l} =>
-    if compare(a, x) == 0 {
-      l
-    } else {
-      list{pair, ...remove_assoc(x, l)}
-    }
-  }
-
-let rec remove_assq = (x, param) =>
-  switch param {
-  | list{} => list{}
-  | list{(a, _) as pair, ...l} =>
-    if a === x {
-      l
-    } else {
-      list{pair, ...remove_assq(x, l)}
-    }
-  }
-
-let rec find = (~f as p, param) =>
-  switch param {
-  | list{} => raise(Not_found)
-  | list{x, ...l} =>
-    if p(x) {
-      x
-    } else {
-      find(~f=p, l)
-    }
-  }
-
-let rec find_opt = (~f as p, param) =>
-  switch param {
-  | list{} => None
-  | list{x, ...l} =>
-    if p(x) {
-      Some(x)
-    } else {
-      find_opt(~f=p, l)
-    }
-  }
-
-let find_all = (~f as p) => {
-  let rec find = (accu, param) =>
-    switch param {
-    | list{} => rev(accu)
-    | list{x, ...l} =>
-      if p(x) {
-        find(list{x, ...accu}, l)
-      } else {
-        find(accu, l)
-      }
-    }
-  find(list{})
-}
-
-let filter = find_all
-
-let partition = (~f as p, l) => {
-  let rec part = (yes, no, param) =>
-    switch param {
-    | list{} => (rev(yes), rev(no))
-    | list{x, ...l} =>
-      if p(x) {
-        part(list{x, ...yes}, no, l)
-      } else {
-        part(yes, list{x, ...no}, l)
-      }
-    }
-  part(list{}, list{}, l)
-}
-
-let rec split = param =>
-  switch param {
-  | list{} => (list{}, list{})
-  | list{(x, y), ...l} =>
-    let (rx, ry) = split(l)
-    (list{x, ...rx}, list{y, ...ry})
-  }
-
-let rec combine = (l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => list{}
-  | (list{a1, ...l1}, list{a2, ...l2}) => list{(a1, a2), ...combine(l1, l2)}
-  | (_, _) => invalid_arg("List.combine")
-  }
-
-/* sorting */
-
-let rec merge = (~cmp, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, l2) => l2
-  | (l1, list{}) => l1
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    if cmp(h1, h2) <= 0 {
-      list{h1, ...merge(~cmp, t1, l2)}
-    } else {
-      list{h2, ...merge(~cmp, l1, t2)}
-    }
-  }
-
-let rec chop = (k, l) =>
-  if k == 0 {
-    l
-  } else {
-    switch l {
-    | list{_, ...t} => chop(k - 1, t)
-    | _ => assert(false)
-    }
-  }
-
-let stable_sort = (~cmp, l) => {
-  let rec rev_merge = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      if cmp(h1, h2) <= 0 {
-        rev_merge(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec rev_merge_rev = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      if cmp(h1, h2) > 0 {
-        rev_merge_rev(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge_rev(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      if cmp(x1, x2) <= 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      if cmp(x1, x2) <= 0 {
-        if cmp(x2, x3) <= 0 {
-          list{x1, x2, x3}
-        } else if cmp(x1, x3) <= 0 {
-          list{x1, x3, x2}
-        } else {
-          list{x3, x1, x2}
-        }
-      } else if cmp(x1, x3) <= 0 {
-        list{x2, x1, x3}
-      } else if cmp(x2, x3) <= 0 {
-        list{x2, x3, x1}
-      } else {
-        list{x3, x2, x1}
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = rev_sort(n1, l)
-      let s2 = rev_sort(n2, l2)
-      rev_merge_rev(s1, s2, list{})
-    }
-  and rev_sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      if cmp(x1, x2) > 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      if cmp(x1, x2) > 0 {
-        if cmp(x2, x3) > 0 {
-          list{x1, x2, x3}
-        } else if cmp(x1, x3) > 0 {
-          list{x1, x3, x2}
-        } else {
-          list{x3, x1, x2}
-        }
-      } else if cmp(x1, x3) > 0 {
-        list{x2, x1, x3}
-      } else if cmp(x2, x3) > 0 {
-        list{x2, x3, x1}
-      } else {
-        list{x3, x2, x1}
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = sort(n1, l)
-      let s2 = sort(n2, l2)
-      rev_merge(s1, s2, list{})
-    }
-
-  let len = length(l)
-  if len < 2 {
-    l
-  } else {
-    sort(len, l)
-  }
-}
-
-let sort = stable_sort
-let fast_sort = stable_sort
-
-/* Note: on a list of length between about 100000 (depending on the minor
-  heap size and the type of the list) and Sys.max_array_size, it is
-  actually faster to use the following, but it might also use more memory
-  because the argument list cannot be deallocated incrementally.
-
-  Also, there seems to be a bug in this code or in the
-  implementation of obj_truncate.
-
-external obj_truncate : 'a array -> int -> unit = "caml_obj_truncate"
-
-let array_to_list_in_place a =
-  let l = Array.length a in
-  let rec loop accu n p =
-    if p <= 0 then accu else begin
-      if p = n then begin
-        obj_truncate a p;
-        loop (a.(p-1) :: accu) (n-1000) (p-1)
-      end else begin
-        loop (a.(p-1) :: accu) n (p-1)
-      end
-    end
-  in
-  loop [] (l-1000) l
-
-
-let stable_sort cmp l =
-  let a = Array.of_list l in
-  Array.stable_sort cmp a;
-  array_to_list_in_place a
-*/
-
-/* sorting + removing duplicates */
-
-let sort_uniq = (~cmp, l) => {
-  let rec rev_merge = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      let c = cmp(h1, h2)
-      if c == 0 {
-        rev_merge(t1, t2, list{h1, ...accu})
-      } else if c < 0 {
-        rev_merge(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec rev_merge_rev = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      let c = cmp(h1, h2)
-      if c == 0 {
-        rev_merge_rev(t1, t2, list{h1, ...accu})
-      } else if c > 0 {
-        rev_merge_rev(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge_rev(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        list{x1}
-      } else if c < 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x2}
-        } else if c < 0 {
-          list{x2, x3}
-        } else {
-          list{x3, x2}
-        }
-      } else if c < 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x1, x2}
-        } else if c < 0 {
-          list{x1, x2, x3}
-        } else {
-          let c = cmp(x1, x3)
-          if c == 0 {
-            list{x1, x2}
-          } else if c < 0 {
-            list{x1, x3, x2}
-          } else {
-            list{x3, x1, x2}
-          }
-        }
-      } else {
-        let c = cmp(x1, x3)
-        if c == 0 {
-          list{x2, x1}
-        } else if c < 0 {
-          list{x2, x1, x3}
-        } else {
-          let c = cmp(x2, x3)
-          if c == 0 {
-            list{x2, x1}
-          } else if c < 0 {
-            list{x2, x3, x1}
-          } else {
-            list{x3, x2, x1}
-          }
-        }
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = rev_sort(n1, l)
-      let s2 = rev_sort(n2, l2)
-      rev_merge_rev(s1, s2, list{})
-    }
-  and rev_sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        list{x1}
-      } else if c > 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x2}
-        } else if c > 0 {
-          list{x2, x3}
-        } else {
-          list{x3, x2}
-        }
-      } else if c > 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x1, x2}
-        } else if c > 0 {
-          list{x1, x2, x3}
-        } else {
-          let c = cmp(x1, x3)
-          if c == 0 {
-            list{x1, x2}
-          } else if c > 0 {
-            list{x1, x3, x2}
-          } else {
-            list{x3, x1, x2}
-          }
-        }
-      } else {
-        let c = cmp(x1, x3)
-        if c == 0 {
-          list{x2, x1}
-        } else if c > 0 {
-          list{x2, x1, x3}
-        } else {
-          let c = cmp(x2, x3)
-          if c == 0 {
-            list{x2, x1}
-          } else if c > 0 {
-            list{x2, x3, x1}
-          } else {
-            list{x3, x2, x1}
-          }
-        }
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = sort(n1, l)
-      let s2 = sort(n2, l2)
-      rev_merge(s1, s2, list{})
-    }
-
-  let len = length(l)
-  if len < 2 {
-    l
-  } else {
-    sort(len, l)
-  }
-}
-
-let rec compare_lengths = (l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => 0
-  | (list{}, _) => -1
-  | (_, list{}) => 1
-  | (list{_, ...l1}, list{_, ...l2}) => compare_lengths(l1, l2)
-  }
-
-let rec compare_length_with = (l, ~len as n) =>
-  switch l {
-  | list{} =>
-    if n == 0 {
-      0
-    } else if n > 0 {
-      -1
-    } else {
-      1
-    }
-  | list{_, ...l} =>
-    if n <= 0 {
-      1
-    } else {
-      compare_length_with(l, ~len=n - 1)
-    }
-  }
diff --git a/jscomp/stdlib-406/listLabels.resi b/jscomp/stdlib-406/listLabels.resi
deleted file mode 100644
index c48e830..0000000
--- a/jscomp/stdlib-406/listLabels.resi
+++ /dev/null
@@ -1,337 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** List operations.
-
-   Some functions are flagged as not tail-recursive.  A tail-recursive
-   function uses constant stack space, while a non-tail-recursive function
-   uses stack space proportional to the length of its list argument, which
-   can be a problem with very long lists.  When the function takes several
-   list arguments, an approximate formula giving stack usage (in some
-   unspecified constant unit) is shown in parentheses.
-
-   The above considerations can usually be ignored if your lists are not
-   longer than about 10000 elements.
-*/
-
-/** Return the length (number of elements) of the given list. */
-let length: list<'a> => int
-
-/** Return the first element of the given list. Raise
-   [Failure "hd"] if the list is empty. */
-let hd: list<'a> => 'a
-
-/** Compare the lengths of two lists. [compare_lengths l1 l2] is
-   equivalent to [compare (length l1) (length l2)], except that
-   the computation stops after itering on the shortest list.
-   @since 4.05.0
- */
-let compare_lengths: (list<'a>, list<'b>) => int
-
-/** Compare the length of a list to an integer. [compare_length_with l n] is
-   equivalent to [compare (length l) n], except that
-   the computation stops after at most [n] iterations on the list.
-   @since 4.05.0
-*/
-let compare_length_with: (list<'a>, ~len: int) => int
-
-/** [cons x xs] is [x :: xs]
-    @since 4.05.0
-*/
-let cons: ('a, list<'a>) => list<'a>
-
-/** Return the given list without its first element. Raise
-   [Failure "tl"] if the list is empty. */
-let tl: list<'a> => list<'a>
-
-/** Return the [n]-th element of the given list.
-   The first element (head of the list) is at position 0.
-   Raise [Failure "nth"] if the list is too short.
-   Raise [Invalid_argument "List.nth"] if [n] is negative. */
-let nth: (list<'a>, int) => 'a
-
-/** Return the [n]-th element of the given list.
-    The first element (head of the list) is at position 0.
-    Return [None] if the list is too short.
-    Raise [Invalid_argument "List.nth"] if [n] is negative.
-    @since 4.05
-*/
-let nth_opt: (list<'a>, int) => option<'a>
-
-/** List reversal. */
-let rev: list<'a> => list<'a>
-
-/** [List.init len f] is [f 0; f 1; ...; f (len-1)], evaluated left to right.
-
-    @raise Invalid_argument if [len < 0].
-    @since 4.06.0
-*/
-let init: (~len: int, ~f: int => 'a) => list<'a>
-
-/** Catenate two lists.  Same function as the infix operator [@].
-   Not tail-recursive (length of the first argument).  The [@]
-   operator is not tail-recursive either. */
-let append: (list<'a>, list<'a>) => list<'a>
-
-/** [List.rev_append l1 l2] reverses [l1] and concatenates it with [l2].
-   This is equivalent to [(]{!List.rev}[ l1) @ l2], but [rev_append] is
-   tail-recursive and more efficient. */
-let rev_append: (list<'a>, list<'a>) => list<'a>
-
-/** Concatenate a list of lists.  The elements of the argument are all
-   concatenated together (in the same order) to give the result.
-   Not tail-recursive
-   (length of the argument + length of the longest sub-list). */
-let concat: list<list<'a>> => list<'a>
-
-/** Same as [concat].  Not tail-recursive
-   (length of the argument + length of the longest sub-list). */
-let flatten: list<list<'a>> => list<'a>
-
-/* {1 Iterators} */
-
-/** [List.iter f [a1; ...; an]] applies function [f] in turn to
-   [a1; ...; an]. It is equivalent to
-   [begin f a1; f a2; ...; f an; () end]. */
-let iter: (~f: 'a => unit, list<'a>) => unit
-
-/** Same as {!List.iter}, but the function is applied to the index of
-   the element as first argument (counting from 0), and the element
-   itself as second argument.
-   @since 4.00.0
-*/
-let iteri: (~f: (int, 'a) => unit, list<'a>) => unit
-
-/** [List.map f [a1; ...; an]] applies function [f] to [a1, ..., an],
-   and builds the list [[f a1; ...; f an]]
-   with the results returned by [f].  Not tail-recursive. */
-let map: (~f: 'a => 'b, list<'a>) => list<'b>
-
-/** Same as {!List.map}, but the function is applied to the index of
-   the element as first argument (counting from 0), and the element
-   itself as second argument.
-   @since 4.00.0
-*/
-let mapi: (~f: (int, 'a) => 'b, list<'a>) => list<'b>
-
-/** [List.rev_map f l] gives the same result as
-   {!List.rev}[ (]{!List.map}[ f l)], but is tail-recursive and
-   more efficient. */
-let rev_map: (~f: 'a => 'b, list<'a>) => list<'b>
-
-/** [List.fold_left f a [b1; ...; bn]] is
-   [f (... (f (f a b1) b2) ...) bn]. */
-let fold_left: (~f: ('a, 'b) => 'a, ~init: 'a, list<'b>) => 'a
-
-/** [List.fold_right f [a1; ...; an] b] is
-   [f a1 (f a2 (... (f an b) ...))].  Not tail-recursive. */
-let fold_right: (~f: ('a, 'b) => 'b, list<'a>, ~init: 'b) => 'b
-
-/* {1 Iterators on two lists} */
-
-/** [List.iter2 f [a1; ...; an] [b1; ...; bn]] calls in turn
-   [f a1 b1; ...; f an bn].
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths. */
-let iter2: (~f: ('a, 'b) => unit, list<'a>, list<'b>) => unit
-
-/** [List.map2 f [a1; ...; an] [b1; ...; bn]] is
-   [[f a1 b1; ...; f an bn]].
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths.  Not tail-recursive. */
-let map2: (~f: ('a, 'b) => 'c, list<'a>, list<'b>) => list<'c>
-
-/** [List.rev_map2 f l1 l2] gives the same result as
-   {!List.rev}[ (]{!List.map2}[ f l1 l2)], but is tail-recursive and
-   more efficient. */
-let rev_map2: (~f: ('a, 'b) => 'c, list<'a>, list<'b>) => list<'c>
-
-/** [List.fold_left2 f a [b1; ...; bn] [c1; ...; cn]] is
-   [f (... (f (f a b1 c1) b2 c2) ...) bn cn].
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths. */
-let fold_left2: (~f: ('a, 'b, 'c) => 'a, ~init: 'a, list<'b>, list<'c>) => 'a
-
-/** [List.fold_right2 f [a1; ...; an] [b1; ...; bn] c] is
-   [f a1 b1 (f a2 b2 (... (f an bn c) ...))].
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths.  Not tail-recursive. */
-let fold_right2: (~f: ('a, 'b, 'c) => 'c, list<'a>, list<'b>, ~init: 'c) => 'c
-
-/* {1 List scanning} */
-
-/** [for_all p [a1; ...; an]] checks if all elements of the list
-   satisfy the predicate [p]. That is, it returns
-   [(p a1) && (p a2) && ... && (p an)]. */
-let for_all: (~f: 'a => bool, list<'a>) => bool
-
-/** [exists p [a1; ...; an]] checks if at least one element of
-   the list satisfies the predicate [p]. That is, it returns
-   [(p a1) || (p a2) || ... || (p an)]. */
-let exists: (~f: 'a => bool, list<'a>) => bool
-
-/** Same as {!List.for_all}, but for a two-argument predicate.
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths. */
-let for_all2: (~f: ('a, 'b) => bool, list<'a>, list<'b>) => bool
-
-/** Same as {!List.exists}, but for a two-argument predicate.
-   Raise [Invalid_argument] if the two lists are determined
-   to have different lengths. */
-let exists2: (~f: ('a, 'b) => bool, list<'a>, list<'b>) => bool
-
-/** [mem a l] is true if and only if [a] is equal
-   to an element of [l]. */
-let mem: ('a, ~set: list<'a>) => bool
-
-/** Same as {!List.mem}, but uses physical equality instead of structural
-   equality to compare list elements. */
-let memq: ('a, ~set: list<'a>) => bool
-
-/* {1 List searching} */
-
-/** [find p l] returns the first element of the list [l]
-   that satisfies the predicate [p].
-   Raise [Not_found] if there is no value that satisfies [p] in the
-   list [l]. */
-let find: (~f: 'a => bool, list<'a>) => 'a
-
-/** [find p l] returns the first element of the list [l]
-   that satisfies the predicate [p].
-   Returns [None] if there is no value that satisfies [p] in the
-   list [l].
-   @since 4.05 */
-let find_opt: (~f: 'a => bool, list<'a>) => option<'a>
-
-/** [filter p l] returns all the elements of the list [l]
-   that satisfy the predicate [p].  The order of the elements
-   in the input list is preserved.  */
-let filter: (~f: 'a => bool, list<'a>) => list<'a>
-
-/** [find_all] is another name for {!List.filter}. */
-let find_all: (~f: 'a => bool, list<'a>) => list<'a>
-
-/** [partition p l] returns a pair of lists [(l1, l2)], where
-   [l1] is the list of all the elements of [l] that
-   satisfy the predicate [p], and [l2] is the list of all the
-   elements of [l] that do not satisfy [p].
-   The order of the elements in the input list is preserved. */
-let partition: (~f: 'a => bool, list<'a>) => (list<'a>, list<'a>)
-
-/* {1 Association lists} */
-
-/** [assoc a l] returns the value associated with key [a] in the list of
-   pairs [l]. That is,
-   [assoc a [ ...; (a,b); ...] = b]
-   if [(a,b)] is the leftmost binding of [a] in list [l].
-   Raise [Not_found] if there is no value associated with [a] in the
-   list [l]. */
-let assoc: ('a, list<('a, 'b)>) => 'b
-
-/** [assoc_opt a l] returns the value associated with key [a] in the list of
-    pairs [l]. That is,
-    [assoc a [ ...; (a,b); ...] = b]
-    if [(a,b)] is the leftmost binding of [a] in list [l].
-    Returns [None] if there is no value associated with [a] in the
-    list [l].
-    @since 4.05
-*/
-let assoc_opt: ('a, list<('a, 'b)>) => option<'b>
-
-/** Same as {!List.assoc}, but uses physical equality instead of
-   structural equality to compare keys. */
-let assq: ('a, list<('a, 'b)>) => 'b
-
-/** Same as {!List.assoc_opt}, but uses physical equality instead of
-   structural equality to compare keys.
-   @since 4.05.0 */
-let assq_opt: ('a, list<('a, 'b)>) => option<'b>
-
-/** Same as {!List.assoc}, but simply return true if a binding exists,
-   and false if no bindings exist for the given key. */
-let mem_assoc: ('a, ~map: list<('a, 'b)>) => bool
-
-/** Same as {!List.mem_assoc}, but uses physical equality instead of
-   structural equality to compare keys. */
-let mem_assq: ('a, ~map: list<('a, 'b)>) => bool
-
-/** [remove_assoc a l] returns the list of
-   pairs [l] without the first pair with key [a], if any.
-   Not tail-recursive. */
-let remove_assoc: ('a, list<('a, 'b)>) => list<('a, 'b)>
-
-/** Same as {!List.remove_assoc}, but uses physical equality instead
-   of structural equality to compare keys.  Not tail-recursive. */
-let remove_assq: ('a, list<('a, 'b)>) => list<('a, 'b)>
-
-/* {1 Lists of pairs} */
-
-/** Transform a list of pairs into a pair of lists:
-   [split [(a1,b1); ...; (an,bn)]] is [([a1; ...; an], [b1; ...; bn])].
-   Not tail-recursive.
-*/
-let split: list<('a, 'b)> => (list<'a>, list<'b>)
-
-/** Transform a pair of lists into a list of pairs:
-   [combine [a1; ...; an] [b1; ...; bn]] is
-   [[(a1,b1); ...; (an,bn)]].
-   Raise [Invalid_argument] if the two lists
-   have different lengths.  Not tail-recursive. */
-let combine: (list<'a>, list<'b>) => list<('a, 'b)>
-
-/* {1 Sorting} */
-
-/** Sort a list in increasing order according to a comparison
-   function.  The comparison function must return 0 if its arguments
-   compare as equal, a positive integer if the first is greater,
-   and a negative integer if the first is smaller (see Array.sort for
-   a complete specification).  For example,
-   {!Pervasives.compare} is a suitable comparison function.
-   The resulting list is sorted in increasing order.
-   [List.sort] is guaranteed to run in constant heap space
-   (in addition to the size of the result list) and logarithmic
-   stack space.
-
-   The current implementation uses Merge Sort. It runs in constant
-   heap space and logarithmic stack space.
-*/
-let sort: (~cmp: ('a, 'a) => int, list<'a>) => list<'a>
-
-/** Same as {!List.sort}, but the sorting algorithm is guaranteed to
-   be stable (i.e. elements that compare equal are kept in their
-   original order) .
-
-   The current implementation uses Merge Sort. It runs in constant
-   heap space and logarithmic stack space.
-*/
-let stable_sort: (~cmp: ('a, 'a) => int, list<'a>) => list<'a>
-
-/** Same as {!List.sort} or {!List.stable_sort}, whichever is
-    faster on typical input. */
-let fast_sort: (~cmp: ('a, 'a) => int, list<'a>) => list<'a>
-
-/** Same as {!List.sort}, but also remove duplicates.
-    @since 4.03.0 */
-let sort_uniq: (~cmp: ('a, 'a) => int, list<'a>) => list<'a>
-
-/** Merge two lists:
-    Assuming that [l1] and [l2] are sorted according to the
-    comparison function [cmp], [merge cmp l1 l2] will return a
-    sorted list containing all the elements of [l1] and [l2].
-    If several elements compare equal, the elements of [l1] will be
-    before the elements of [l2].
-    Not tail-recursive (sum of the lengths of the arguments).
-*/
-let merge: (~cmp: ('a, 'a) => int, list<'a>, list<'a>) => list<'a>
diff --git a/jscomp/stdlib-406/map.res b/jscomp/stdlib-406/map.res
deleted file mode 100644
index f485f30..0000000
--- a/jscomp/stdlib-406/map.res
+++ /dev/null
@@ -1,669 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-module type OrderedType = {
-  type t
-  let compare: (t, t) => int
-}
-
-module type S = {
-  type key
-  type t<+'a>
-  let empty: t<'a>
-  let is_empty: t<'a> => bool
-  let mem: (key, t<'a>) => bool
-  let add: (key, 'a, t<'a>) => t<'a>
-  let update: (key, option<'a> => option<'a>, t<'a>) => t<'a>
-  let singleton: (key, 'a) => t<'a>
-  let remove: (key, t<'a>) => t<'a>
-  let merge: ((key, option<'a>, option<'b>) => option<'c>, t<'a>, t<'b>) => t<'c>
-  let union: ((key, 'a, 'a) => option<'a>, t<'a>, t<'a>) => t<'a>
-  let compare: (('a, 'a) => int, t<'a>, t<'a>) => int
-  let equal: (('a, 'a) => bool, t<'a>, t<'a>) => bool
-  let iter: ((key, 'a) => unit, t<'a>) => unit
-  let fold: ((key, 'a, 'b) => 'b, t<'a>, 'b) => 'b
-  let for_all: ((key, 'a) => bool, t<'a>) => bool
-  let exists: ((key, 'a) => bool, t<'a>) => bool
-  let filter: ((key, 'a) => bool, t<'a>) => t<'a>
-  let partition: ((key, 'a) => bool, t<'a>) => (t<'a>, t<'a>)
-  let cardinal: t<'a> => int
-  let bindings: t<'a> => list<(key, 'a)>
-  let min_binding: t<'a> => (key, 'a)
-  let min_binding_opt: t<'a> => option<(key, 'a)>
-  let max_binding: t<'a> => (key, 'a)
-  let max_binding_opt: t<'a> => option<(key, 'a)>
-  let choose: t<'a> => (key, 'a)
-  let choose_opt: t<'a> => option<(key, 'a)>
-  let split: (key, t<'a>) => (t<'a>, option<'a>, t<'a>)
-  let find: (key, t<'a>) => 'a
-  let find_opt: (key, t<'a>) => option<'a>
-  let find_first: (key => bool, t<'a>) => (key, 'a)
-  let find_first_opt: (key => bool, t<'a>) => option<(key, 'a)>
-  let find_last: (key => bool, t<'a>) => (key, 'a)
-  let find_last_opt: (key => bool, t<'a>) => option<(key, 'a)>
-  let map: ('a => 'b, t<'a>) => t<'b>
-  let mapi: ((key, 'a) => 'b, t<'a>) => t<'b>
-}
-
-module Make = (Ord: OrderedType) => {
-  type key = Ord.t
-
-  type rec t<'a> =
-    | Empty
-    | Node({l: t<'a>, v: key, d: 'a, r: t<'a>, h: int})
-
-  let height = param =>
-    switch param {
-    | Empty => 0
-    | Node({h}) => h
-    }
-
-  let create = (l, x, d, r) => {
-    let hl = height(l) and hr = height(r)
-    Node({
-      l,
-      v: x,
-      d,
-      r,
-      h: if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    })
-  }
-
-  let singleton = (x, d) => Node({l: Empty, v: x, d, r: Empty, h: 1})
-
-  let bal = (l, x, d, r) => {
-    let hl = switch l {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    let hr = switch r {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    if hl > hr + 2 {
-      switch l {
-      | Empty => invalid_arg("Map.bal")
-      | Node({l: ll, v: lv, d: ld, r: lr}) =>
-        if height(ll) >= height(lr) {
-          create(ll, lv, ld, create(lr, x, d, r))
-        } else {
-          switch lr {
-          | Empty => invalid_arg("Map.bal")
-          | Node({l: lrl, v: lrv, d: lrd, r: lrr}) =>
-            create(create(ll, lv, ld, lrl), lrv, lrd, create(lrr, x, d, r))
-          }
-        }
-      }
-    } else if hr > hl + 2 {
-      switch r {
-      | Empty => invalid_arg("Map.bal")
-      | Node({l: rl, v: rv, d: rd, r: rr}) =>
-        if height(rr) >= height(rl) {
-          create(create(l, x, d, rl), rv, rd, rr)
-        } else {
-          switch rl {
-          | Empty => invalid_arg("Map.bal")
-          | Node({l: rll, v: rlv, d: rld, r: rlr}) =>
-            create(create(l, x, d, rll), rlv, rld, create(rlr, rv, rd, rr))
-          }
-        }
-      }
-    } else {
-      Node({
-        l,
-        v: x,
-        d,
-        r,
-        h: if hl >= hr {
-          hl + 1
-        } else {
-          hr + 1
-        },
-      })
-    }
-  }
-
-  let empty = Empty
-
-  let is_empty = param =>
-    switch param {
-    | Empty => true
-    | _ => false
-    }
-
-  let rec add = (x, data, param) =>
-    switch param {
-    | Empty => Node({l: Empty, v: x, d: data, r: Empty, h: 1})
-    | Node({l, v, d, r, h}) as m =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        if d === data {
-          m
-        } else {
-          Node({l, v: x, d: data, r, h})
-        }
-      } else if c < 0 {
-        let ll = add(x, data, l)
-        if l === ll {
-          m
-        } else {
-          bal(ll, v, d, r)
-        }
-      } else {
-        let rr = add(x, data, r)
-        if r === rr {
-          m
-        } else {
-          bal(l, v, d, rr)
-        }
-      }
-    }
-
-  let rec find = (x, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, d, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        d
-      } else {
-        find(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-      }
-    }
-
-  let rec find_first_aux = (v0, d0, f, param) =>
-    switch param {
-    | Empty => (v0, d0)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_first_aux(v, d, f, l)
-      } else {
-        find_first_aux(v0, d0, f, r)
-      }
-    }
-
-  let rec find_first = (f, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_first_aux(v, d, f, l)
-      } else {
-        find_first(f, r)
-      }
-    }
-
-  let rec find_first_opt_aux = (v0, d0, f, param) =>
-    switch param {
-    | Empty => Some(v0, d0)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_first_opt_aux(v, d, f, l)
-      } else {
-        find_first_opt_aux(v0, d0, f, r)
-      }
-    }
-
-  let rec find_first_opt = (f, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_first_opt_aux(v, d, f, l)
-      } else {
-        find_first_opt(f, r)
-      }
-    }
-
-  let rec find_last_aux = (v0, d0, f, param) =>
-    switch param {
-    | Empty => (v0, d0)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_last_aux(v, d, f, r)
-      } else {
-        find_last_aux(v0, d0, f, l)
-      }
-    }
-
-  let rec find_last = (f, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_last_aux(v, d, f, r)
-      } else {
-        find_last(f, l)
-      }
-    }
-
-  let rec find_last_opt_aux = (v0, d0, f, param) =>
-    switch param {
-    | Empty => Some(v0, d0)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_last_opt_aux(v, d, f, r)
-      } else {
-        find_last_opt_aux(v0, d0, f, l)
-      }
-    }
-
-  let rec find_last_opt = (f, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_last_opt_aux(v, d, f, r)
-      } else {
-        find_last_opt(f, l)
-      }
-    }
-
-  let rec find_opt = (x, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, d, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        Some(d)
-      } else {
-        find_opt(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-      }
-    }
-
-  let rec mem = (x, param) =>
-    switch param {
-    | Empty => false
-    | Node({l, v, r}) =>
-      let c = Ord.compare(x, v)
-      c == 0 ||
-        mem(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-    }
-
-  let rec min_binding = param =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l: Empty, v, d}) => (v, d)
-    | Node({l}) => min_binding(l)
-    }
-
-  let rec min_binding_opt = param =>
-    switch param {
-    | Empty => None
-    | Node({l: Empty, v, d}) => Some(v, d)
-    | Node({l}) => min_binding_opt(l)
-    }
-
-  let rec max_binding = param =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({v, d, r: Empty}) => (v, d)
-    | Node({r}) => max_binding(r)
-    }
-
-  let rec max_binding_opt = param =>
-    switch param {
-    | Empty => None
-    | Node({v, d, r: Empty}) => Some(v, d)
-    | Node({r}) => max_binding_opt(r)
-    }
-
-  let rec remove_min_binding = param =>
-    switch param {
-    | Empty => invalid_arg("Map.remove_min_elt")
-    | Node({l: Empty, r}) => r
-    | Node({l, v, d, r}) => bal(remove_min_binding(l), v, d, r)
-    }
-
-  let merge = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) =>
-      let (x, d) = min_binding(t2)
-      bal(t1, x, d, remove_min_binding(t2))
-    }
-
-  let rec remove = (x, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, d, r}) as m =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        merge(l, r)
-      } else if c < 0 {
-        let ll = remove(x, l)
-        if l === ll {
-          m
-        } else {
-          bal(ll, v, d, r)
-        }
-      } else {
-        let rr = remove(x, r)
-        if r === rr {
-          m
-        } else {
-          bal(l, v, d, rr)
-        }
-      }
-    }
-
-  let rec update = (x, f, param) =>
-    switch param {
-    | Empty =>
-      switch f(None) {
-      | None => Empty
-      | Some(data) => Node({l: Empty, v: x, d: data, r: Empty, h: 1})
-      }
-    | Node({l, v, d, r, h}) as m =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        switch f(Some(d)) {
-        | None => merge(l, r)
-        | Some(data) =>
-          if d === data {
-            m
-          } else {
-            Node({l, v: x, d: data, r, h})
-          }
-        }
-      } else if c < 0 {
-        let ll = update(x, f, l)
-        if l === ll {
-          m
-        } else {
-          bal(ll, v, d, r)
-        }
-      } else {
-        let rr = update(x, f, r)
-        if r === rr {
-          m
-        } else {
-          bal(l, v, d, rr)
-        }
-      }
-    }
-
-  let rec iter = (f, param) =>
-    switch param {
-    | Empty => ()
-    | Node({l, v, d, r}) =>
-      iter(f, l)
-      f(v, d)
-      iter(f, r)
-    }
-
-  let rec map = (f, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, d, r, h}) =>
-      let l' = map(f, l)
-      let d' = f(d)
-      let r' = map(f, r)
-      Node({l: l', v, d: d', r: r', h})
-    }
-
-  let rec mapi = (f, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, d, r, h}) =>
-      let l' = mapi(f, l)
-      let d' = f(v, d)
-      let r' = mapi(f, r)
-      Node({l: l', v, d: d', r: r', h})
-    }
-
-  let rec fold = (f, m, accu) =>
-    switch m {
-    | Empty => accu
-    | Node({l, v, d, r}) => fold(f, r, f(v, d, fold(f, l, accu)))
-    }
-
-  let rec for_all = (p, param) =>
-    switch param {
-    | Empty => true
-    | Node({l, v, d, r}) => p(v, d) && (for_all(p, l) && for_all(p, r))
-    }
-
-  let rec exists = (p, param) =>
-    switch param {
-    | Empty => false
-    | Node({l, v, d, r}) => p(v, d) || (exists(p, l) || exists(p, r))
-    }
-
-  /* Beware: those two functions assume that the added k is *strictly*
-       smaller (or bigger) than all the present keys in the tree; it
-       does not test for equality with the current min (or max) key.
-
-       Indeed, they are only used during the "join" operation which
-       respects this precondition.
- */
-
-  let rec add_min_binding = (k, x, param) =>
-    switch param {
-    | Empty => singleton(k, x)
-    | Node({l, v, d, r}) => bal(add_min_binding(k, x, l), v, d, r)
-    }
-
-  let rec add_max_binding = (k, x, param) =>
-    switch param {
-    | Empty => singleton(k, x)
-    | Node({l, v, d, r}) => bal(l, v, d, add_max_binding(k, x, r))
-    }
-
-  /* Same as create and bal, but no assumptions are made on the
-   relative heights of l and r. */
-
-  let rec join = (l, v, d, r) =>
-    switch (l, r) {
-    | (Empty, _) => add_min_binding(v, d, r)
-    | (_, Empty) => add_max_binding(v, d, l)
-    | (Node({l: ll, v: lv, d: ld, r: lr, h: lh}), Node({l: rl, v: rv, d: rd, r: rr, h: rh})) =>
-      if lh > rh + 2 {
-        bal(ll, lv, ld, join(lr, v, d, r))
-      } else if rh > lh + 2 {
-        bal(join(l, v, d, rl), rv, rd, rr)
-      } else {
-        create(l, v, d, r)
-      }
-    }
-
-  /* Merge two trees l and r into one.
-       All elements of l must precede the elements of r.
-       No assumption on the heights of l and r. */
-
-  let concat = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) =>
-      let (x, d) = min_binding(t2)
-      join(t1, x, d, remove_min_binding(t2))
-    }
-
-  let concat_or_join = (t1, v, d, t2) =>
-    switch d {
-    | Some(d) => join(t1, v, d, t2)
-    | None => concat(t1, t2)
-    }
-
-  let rec split = (x, param) =>
-    switch param {
-    | Empty => (Empty, None, Empty)
-    | Node({l, v, d, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        (l, Some(d), r)
-      } else if c < 0 {
-        let (ll, pres, rl) = split(x, l)
-        (ll, pres, join(rl, v, d, r))
-      } else {
-        let (lr, pres, rr) = split(x, r)
-        (join(l, v, d, lr), pres, rr)
-      }
-    }
-
-  let rec merge = (f, s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, Empty) => Empty
-    | (Node({l: l1, v: v1, d: d1, r: r1, h: h1}), _) if h1 >= height(s2) =>
-      let (l2, d2, r2) = split(v1, s2)
-      concat_or_join(merge(f, l1, l2), v1, f(v1, Some(d1), d2), merge(f, r1, r2))
-    | (_, Node({l: l2, v: v2, d: d2, r: r2})) =>
-      let (l1, d1, r1) = split(v2, s1)
-      concat_or_join(merge(f, l1, l2), v2, f(v2, d1, Some(d2)), merge(f, r1, r2))
-    | _ => assert(false)
-    }
-
-  let rec union = (f, s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, s) | (s, Empty) => s
-    | (Node({l: l1, v: v1, d: d1, r: r1, h: h1}), Node({l: l2, v: v2, d: d2, r: r2, h: h2})) =>
-      if h1 >= h2 {
-        let (l2, d2, r2) = split(v1, s2)
-        let l = union(f, l1, l2) and r = union(f, r1, r2)
-        switch d2 {
-        | None => join(l, v1, d1, r)
-        | Some(d2) => concat_or_join(l, v1, f(v1, d1, d2), r)
-        }
-      } else {
-        let (l1, d1, r1) = split(v2, s1)
-        let l = union(f, l1, l2) and r = union(f, r1, r2)
-        switch d1 {
-        | None => join(l, v2, d2, r)
-        | Some(d1) => concat_or_join(l, v2, f(v2, d1, d2), r)
-        }
-      }
-    }
-
-  let rec filter = (p, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, d, r}) as m =>
-      /* call [p] in the expected left-to-right order */
-      let l' = filter(p, l)
-      let pvd = p(v, d)
-      let r' = filter(p, r)
-      if pvd {
-        if l === l' && r === r' {
-          m
-        } else {
-          join(l', v, d, r')
-        }
-      } else {
-        concat(l', r')
-      }
-    }
-
-  let rec partition = (p, param) =>
-    switch param {
-    | Empty => (Empty, Empty)
-    | Node({l, v, d, r}) =>
-      /* call [p] in the expected left-to-right order */
-      let (lt, lf) = partition(p, l)
-      let pvd = p(v, d)
-      let (rt, rf) = partition(p, r)
-      if pvd {
-        (join(lt, v, d, rt), concat(lf, rf))
-      } else {
-        (concat(lt, rt), join(lf, v, d, rf))
-      }
-    }
-
-  type rec enumeration<'a> = End | More(key, 'a, t<'a>, enumeration<'a>)
-
-  let rec cons_enum = (m, e) =>
-    switch m {
-    | Empty => e
-    | Node({l, v, d, r}) => cons_enum(l, More(v, d, r, e))
-    }
-
-  let compare = (cmp, m1, m2) => {
-    let rec compare_aux = (e1, e2) =>
-      switch (e1, e2) {
-      | (End, End) => 0
-      | (End, _) => -1
-      | (_, End) => 1
-      | (More(v1, d1, r1, e1), More(v2, d2, r2, e2)) =>
-        let c = Ord.compare(v1, v2)
-        if c != 0 {
-          c
-        } else {
-          let c = cmp(d1, d2)
-          if c != 0 {
-            c
-          } else {
-            compare_aux(cons_enum(r1, e1), cons_enum(r2, e2))
-          }
-        }
-      }
-    compare_aux(cons_enum(m1, End), cons_enum(m2, End))
-  }
-
-  let equal = (cmp, m1, m2) => {
-    let rec equal_aux = (e1, e2) =>
-      switch (e1, e2) {
-      | (End, End) => true
-      | (End, _) => false
-      | (_, End) => false
-      | (More(v1, d1, r1, e1), More(v2, d2, r2, e2)) =>
-        Ord.compare(v1, v2) == 0 && (cmp(d1, d2) && equal_aux(cons_enum(r1, e1), cons_enum(r2, e2)))
-      }
-    equal_aux(cons_enum(m1, End), cons_enum(m2, End))
-  }
-
-  let rec cardinal = param =>
-    switch param {
-    | Empty => 0
-    | Node({l, r}) => cardinal(l) + 1 + cardinal(r)
-    }
-
-  let rec bindings_aux = (accu, param) =>
-    switch param {
-    | Empty => accu
-    | Node({l, v, d, r}) => bindings_aux(list{(v, d), ...bindings_aux(accu, r)}, l)
-    }
-
-  let bindings = s => bindings_aux(list{}, s)
-
-  let choose = min_binding
-
-  let choose_opt = min_binding_opt
-}
diff --git a/jscomp/stdlib-406/map.resi b/jscomp/stdlib-406/map.resi
deleted file mode 100644
index 11458cb..0000000
--- a/jscomp/stdlib-406/map.resi
+++ /dev/null
@@ -1,310 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Association tables over ordered types.
-
-   This module implements applicative association tables, also known as
-   finite maps or dictionaries, given a total ordering function
-   over the keys.
-   All operations over maps are purely applicative (no side-effects).
-   The implementation uses balanced binary trees, and therefore searching
-   and insertion take time logarithmic in the size of the map.
-
-   For instance:
-   {[
-     module IntPairs =
-       struct
-         type t = int * int
-         let compare (x0,y0) (x1,y1) =
-           match Pervasives.compare x0 x1 with
-               0 -> Pervasives.compare y0 y1
-             | c -> c
-       end
-
-     module PairsMap = Map.Make(IntPairs)
-
-     let m = PairsMap.(empty |> add (0,1) \"hello\" |> add (1,0) \"world\")
-   ]}
-
-   This creates a new module [PairsMap], with a new type ['a PairsMap.t]
-   of maps from [int * int] to ['a]. In this example, [m] contains [string]
-   values so its type is [string PairsMap.t].
-*/
-
-/** Input signature of the functor {!Map.Make}. */
-module type OrderedType = {
-  /** The type of the map keys. */
-  type t
-
-  /** A total ordering function over the keys.
-          This is a two-argument function [f] such that
-          [f e1 e2] is zero if the keys [e1] and [e2] are equal,
-          [f e1 e2] is strictly negative if [e1] is smaller than [e2],
-          and [f e1 e2] is strictly positive if [e1] is greater than [e2].
-          Example: a suitable ordering function is the generic structural
-          comparison function {!Pervasives.compare}. */
-  let compare: (t, t) => int
-}
-
-/** Output signature of the functor {!Map.Make}. */
-module type S = {
-  /** The type of the map keys. */
-  type key
-
-  /** The type of maps from type [key] to type ['a]. */
-  type t<+'a>
-
-  /** The empty map. */
-  let empty: t<'a>
-
-  /** Test whether a map is empty or not. */
-  let is_empty: t<'a> => bool
-
-  /** [mem x m] returns [true] if [m] contains a binding for [x],
-       and [false] otherwise. */
-  let mem: (key, t<'a>) => bool
-
-  /** [add x y m] returns a map containing the same bindings as
-       [m], plus a binding of [x] to [y]. If [x] was already bound
-       in [m] to a value that is physically equal to [y],
-       [m] is returned unchanged (the result of the function is
-       then physically equal to [m]). Otherwise, the previous binding
-       of [x] in [m] disappears.
-       @before 4.03 Physical equality was not ensured. */
-  let add: (key, 'a, t<'a>) => t<'a>
-
-  /** [update x f m] returns a map containing the same bindings as
-        [m], except for the binding of [x]. Depending on the value of
-        [y] where [y] is [f (find_opt x m)], the binding of [x] is
-        added, removed or updated. If [y] is [None], the binding is
-        removed if it exists; otherwise, if [y] is [Some z] then [x]
-        is associated to [z] in the resulting map.  If [x] was already
-        bound in [m] to a value that is physically equal to [z], [m]
-        is returned unchanged (the result of the function is then
-        physically equal to [m]).
-        @since 4.06.0
-    */
-  let update: (key, option<'a> => option<'a>, t<'a>) => t<'a>
-
-  /** [singleton x y] returns the one-element map that contains a binding [y]
-        for [x].
-        @since 3.12.0
-     */
-  let singleton: (key, 'a) => t<'a>
-
-  /** [remove x m] returns a map containing the same bindings as
-       [m], except for [x] which is unbound in the returned map.
-       If [x] was not in [m], [m] is returned unchanged
-       (the result of the function is then physically equal to [m]).
-       @before 4.03 Physical equality was not ensured. */
-  let remove: (key, t<'a>) => t<'a>
-
-  /** [merge f m1 m2] computes a map whose keys is a subset of keys of [m1]
-        and of [m2]. The presence of each such binding, and the corresponding
-        value, is determined with the function [f].
-        In terms of the [find_opt] operation, we have
-        [find_opt x (merge f m1 m2) = f (find_opt x m1) (find_opt x m2)]
-        for any key [x], provided that [f None None = None].
-        @since 3.12.0
-     */
-  let merge: ((key, option<'a>, option<'b>) => option<'c>, t<'a>, t<'b>) => t<'c>
-
-  /** [union f m1 m2] computes a map whose keys is the union of keys
-        of [m1] and of [m2].  When the same binding is defined in both
-        arguments, the function [f] is used to combine them.
-        This is a special case of [merge]: [union f m1 m2] is equivalent
-        to [merge f' m1 m2], where
-        - [f' None None = None]
-        - [f' (Some v) None = Some v]
-        - [f' None (Some v) = Some v]
-        - [f' (Some v1) (Some v2) = f v1 v2]
-
-        @since 4.03.0
-    */
-  let union: ((key, 'a, 'a) => option<'a>, t<'a>, t<'a>) => t<'a>
-
-  /** Total ordering between maps.  The first argument is a total ordering
-        used to compare data associated with equal keys in the two maps. */
-  let compare: (('a, 'a) => int, t<'a>, t<'a>) => int
-
-  /** [equal cmp m1 m2] tests whether the maps [m1] and [m2] are
-       equal, that is, contain equal keys and associate them with
-       equal data.  [cmp] is the equality predicate used to compare
-       the data associated with the keys. */
-  let equal: (('a, 'a) => bool, t<'a>, t<'a>) => bool
-
-  /** [iter f m] applies [f] to all bindings in map [m].
-       [f] receives the key as first argument, and the associated value
-       as second argument.  The bindings are passed to [f] in increasing
-       order with respect to the ordering over the type of the keys. */
-  let iter: ((key, 'a) => unit, t<'a>) => unit
-
-  /** [fold f m a] computes [(f kN dN ... (f k1 d1 a)...)],
-       where [k1 ... kN] are the keys of all bindings in [m]
-       (in increasing order), and [d1 ... dN] are the associated data. */
-  let fold: ((key, 'a, 'b) => 'b, t<'a>, 'b) => 'b
-
-  /** [for_all p m] checks if all the bindings of the map
-        satisfy the predicate [p].
-        @since 3.12.0
-     */
-  let for_all: ((key, 'a) => bool, t<'a>) => bool
-
-  /** [exists p m] checks if at least one binding of the map
-        satisfies the predicate [p].
-        @since 3.12.0
-     */
-  let exists: ((key, 'a) => bool, t<'a>) => bool
-
-  /** [filter p m] returns the map with all the bindings in [m]
-        that satisfy predicate [p]. If [p] satisfies every binding in [m],
-        [m] is returned unchanged (the result of the function is then
-        physically equal to [m])
-        @since 3.12.0
-       @before 4.03 Physical equality was not ensured.
-     */
-  let filter: ((key, 'a) => bool, t<'a>) => t<'a>
-
-  /** [partition p m] returns a pair of maps [(m1, m2)], where
-        [m1] contains all the bindings of [s] that satisfy the
-        predicate [p], and [m2] is the map with all the bindings of
-        [s] that do not satisfy [p].
-        @since 3.12.0
-     */
-  let partition: ((key, 'a) => bool, t<'a>) => (t<'a>, t<'a>)
-
-  /** Return the number of bindings of a map.
-        @since 3.12.0
-     */
-  let cardinal: t<'a> => int
-
-  /** Return the list of all bindings of the given map.
-       The returned list is sorted in increasing order with respect
-       to the ordering [Ord.compare], where [Ord] is the argument
-       given to {!Map.Make}.
-        @since 3.12.0
-     */
-  let bindings: t<'a> => list<(key, 'a)>
-
-  /** Return the smallest binding of the given map
-       (with respect to the [Ord.compare] ordering), or raise
-       [Not_found] if the map is empty.
-        @since 3.12.0
-     */
-  let min_binding: t<'a> => (key, 'a)
-
-  /** Return the smallest binding of the given map
-       (with respect to the [Ord.compare] ordering), or [None]
-       if the map is empty.
-        @since 4.05
-     */
-  let min_binding_opt: t<'a> => option<(key, 'a)>
-
-  /** Same as {!Map.S.min_binding}, but returns the largest binding
-        of the given map.
-        @since 3.12.0
-     */
-  let max_binding: t<'a> => (key, 'a)
-
-  /** Same as {!Map.S.min_binding_opt}, but returns the largest binding
-        of the given map.
-        @since 4.05
-     */
-  let max_binding_opt: t<'a> => option<(key, 'a)>
-
-  /** Return one binding of the given map, or raise [Not_found] if
-       the map is empty. Which binding is chosen is unspecified,
-       but equal bindings will be chosen for equal maps.
-        @since 3.12.0
-     */
-  let choose: t<'a> => (key, 'a)
-
-  /** Return one binding of the given map, or [None] if
-       the map is empty. Which binding is chosen is unspecified,
-       but equal bindings will be chosen for equal maps.
-        @since 4.05
-     */
-  let choose_opt: t<'a> => option<(key, 'a)>
-
-  /** [split x m] returns a triple [(l, data, r)], where
-          [l] is the map with all the bindings of [m] whose key
-        is strictly less than [x];
-          [r] is the map with all the bindings of [m] whose key
-        is strictly greater than [x];
-          [data] is [None] if [m] contains no binding for [x],
-          or [Some v] if [m] binds [v] to [x].
-        @since 3.12.0
-     */
-  let split: (key, t<'a>) => (t<'a>, option<'a>, t<'a>)
-
-  /** [find x m] returns the current binding of [x] in [m],
-       or raises [Not_found] if no such binding exists. */
-  let find: (key, t<'a>) => 'a
-
-  /** [find_opt x m] returns [Some v] if the current binding of [x]
-        in [m] is [v], or [None] if no such binding exists.
-        @since 4.05
-    */
-  let find_opt: (key, t<'a>) => option<'a>
-
-  /** [find_first f m], where [f] is a monotonically increasing function,
-       returns the binding of [m] with the lowest key [k] such that [f k],
-       or raises [Not_found] if no such key exists.
-
-       For example, [find_first (fun k -> Ord.compare k x >= 0) m] will return
-       the first binding [k, v] of [m] where [Ord.compare k x >= 0]
-       (intuitively: [k >= x]), or raise [Not_found] if [x] is greater than any
-       element of [m].
-
-        @since 4.05
-       */
-  let find_first: (key => bool, t<'a>) => (key, 'a)
-
-  /** [find_first_opt f m], where [f] is a monotonically increasing function,
-       returns an option containing the binding of [m] with the lowest key [k]
-       such that [f k], or [None] if no such key exists.
-        @since 4.05
-       */
-  let find_first_opt: (key => bool, t<'a>) => option<(key, 'a)>
-
-  /** [find_last f m], where [f] is a monotonically decreasing function,
-       returns the binding of [m] with the highest key [k] such that [f k],
-       or raises [Not_found] if no such key exists.
-        @since 4.05
-       */
-  let find_last: (key => bool, t<'a>) => (key, 'a)
-
-  /** [find_last_opt f m], where [f] is a monotonically decreasing function,
-       returns an option containing the binding of [m] with the highest key [k]
-       such that [f k], or [None] if no such key exists.
-        @since 4.05
-       */
-  let find_last_opt: (key => bool, t<'a>) => option<(key, 'a)>
-
-  /** [map f m] returns a map with same domain as [m], where the
-       associated value [a] of all bindings of [m] has been
-       replaced by the result of the application of [f] to [a].
-       The bindings are passed to [f] in increasing order
-       with respect to the ordering over the type of the keys. */
-  let map: ('a => 'b, t<'a>) => t<'b>
-
-  /** Same as {!Map.S.map}, but the function receives as arguments both the
-       key and the associated value for each binding of the map. */
-  let mapi: ((key, 'a) => 'b, t<'a>) => t<'b>
-}
-
-/** Functor building an implementation of the map structure
-   given a totally ordered type. */
-module Make: (Ord: OrderedType) => (S with type key = Ord.t)
diff --git a/jscomp/stdlib-406/mapLabels.res b/jscomp/stdlib-406/mapLabels.res
deleted file mode 100644
index 7a1a395..0000000
--- a/jscomp/stdlib-406/mapLabels.res
+++ /dev/null
@@ -1,669 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-module type OrderedType = {
-  type t
-  let compare: (t, t) => int
-}
-
-module type S = {
-  type key
-  type t<+'a>
-  let empty: t<'a>
-  let is_empty: t<'a> => bool
-  let mem: (key, t<'a>) => bool
-  let add: (~key: key, ~data: 'a, t<'a>) => t<'a>
-  let update: (~key: key, ~f: option<'a> => option<'a>, t<'a>) => t<'a>
-  let singleton: (key, 'a) => t<'a>
-  let remove: (key, t<'a>) => t<'a>
-  let merge: (~f: (key, option<'a>, option<'b>) => option<'c>, t<'a>, t<'b>) => t<'c>
-  let union: (~f: (key, 'a, 'a) => option<'a>, t<'a>, t<'a>) => t<'a>
-  let compare: (~cmp: ('a, 'a) => int, t<'a>, t<'a>) => int
-  let equal: (~cmp: ('a, 'a) => bool, t<'a>, t<'a>) => bool
-  let iter: (~f: (~key: key, ~data: 'a) => unit, t<'a>) => unit
-  let fold: (~f: (~key: key, ~data: 'a, 'b) => 'b, t<'a>, ~init: 'b) => 'b
-  let for_all: (~f: (key, 'a) => bool, t<'a>) => bool
-  let exists: (~f: (key, 'a) => bool, t<'a>) => bool
-  let filter: (~f: (key, 'a) => bool, t<'a>) => t<'a>
-  let partition: (~f: (key, 'a) => bool, t<'a>) => (t<'a>, t<'a>)
-  let cardinal: t<'a> => int
-  let bindings: t<'a> => list<(key, 'a)>
-  let min_binding: t<'a> => (key, 'a)
-  let min_binding_opt: t<'a> => option<(key, 'a)>
-  let max_binding: t<'a> => (key, 'a)
-  let max_binding_opt: t<'a> => option<(key, 'a)>
-  let choose: t<'a> => (key, 'a)
-  let choose_opt: t<'a> => option<(key, 'a)>
-  let split: (key, t<'a>) => (t<'a>, option<'a>, t<'a>)
-  let find: (key, t<'a>) => 'a
-  let find_opt: (key, t<'a>) => option<'a>
-  let find_first: (~f: key => bool, t<'a>) => (key, 'a)
-  let find_first_opt: (~f: key => bool, t<'a>) => option<(key, 'a)>
-  let find_last: (~f: key => bool, t<'a>) => (key, 'a)
-  let find_last_opt: (~f: key => bool, t<'a>) => option<(key, 'a)>
-  let map: (~f: 'a => 'b, t<'a>) => t<'b>
-  let mapi: (~f: (key, 'a) => 'b, t<'a>) => t<'b>
-}
-
-module Make = (Ord: OrderedType) => {
-  type key = Ord.t
-
-  type rec t<'a> =
-    | Empty
-    | Node({l: t<'a>, v: key, d: 'a, r: t<'a>, h: int})
-
-  let height = param =>
-    switch param {
-    | Empty => 0
-    | Node({h}) => h
-    }
-
-  let create = (l, x, d, r) => {
-    let hl = height(l) and hr = height(r)
-    Node({
-      l,
-      v: x,
-      d,
-      r,
-      h: if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    })
-  }
-
-  let singleton = (x, d) => Node({l: Empty, v: x, d, r: Empty, h: 1})
-
-  let bal = (l, x, d, r) => {
-    let hl = switch l {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    let hr = switch r {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    if hl > hr + 2 {
-      switch l {
-      | Empty => invalid_arg("Map.bal")
-      | Node({l: ll, v: lv, d: ld, r: lr}) =>
-        if height(ll) >= height(lr) {
-          create(ll, lv, ld, create(lr, x, d, r))
-        } else {
-          switch lr {
-          | Empty => invalid_arg("Map.bal")
-          | Node({l: lrl, v: lrv, d: lrd, r: lrr}) =>
-            create(create(ll, lv, ld, lrl), lrv, lrd, create(lrr, x, d, r))
-          }
-        }
-      }
-    } else if hr > hl + 2 {
-      switch r {
-      | Empty => invalid_arg("Map.bal")
-      | Node({l: rl, v: rv, d: rd, r: rr}) =>
-        if height(rr) >= height(rl) {
-          create(create(l, x, d, rl), rv, rd, rr)
-        } else {
-          switch rl {
-          | Empty => invalid_arg("Map.bal")
-          | Node({l: rll, v: rlv, d: rld, r: rlr}) =>
-            create(create(l, x, d, rll), rlv, rld, create(rlr, rv, rd, rr))
-          }
-        }
-      }
-    } else {
-      Node({
-        l,
-        v: x,
-        d,
-        r,
-        h: if hl >= hr {
-          hl + 1
-        } else {
-          hr + 1
-        },
-      })
-    }
-  }
-
-  let empty = Empty
-
-  let is_empty = param =>
-    switch param {
-    | Empty => true
-    | _ => false
-    }
-
-  let rec add = (~key as x, ~data, param) =>
-    switch param {
-    | Empty => Node({l: Empty, v: x, d: data, r: Empty, h: 1})
-    | Node({l, v, d, r, h}) as m =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        if d === data {
-          m
-        } else {
-          Node({l, v: x, d: data, r, h})
-        }
-      } else if c < 0 {
-        let ll = add(~key=x, ~data, l)
-        if l === ll {
-          m
-        } else {
-          bal(ll, v, d, r)
-        }
-      } else {
-        let rr = add(~key=x, ~data, r)
-        if r === rr {
-          m
-        } else {
-          bal(l, v, d, rr)
-        }
-      }
-    }
-
-  let rec find = (x, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, d, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        d
-      } else {
-        find(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-      }
-    }
-
-  let rec find_first_aux = (v0, d0, f, param) =>
-    switch param {
-    | Empty => (v0, d0)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_first_aux(v, d, f, l)
-      } else {
-        find_first_aux(v0, d0, f, r)
-      }
-    }
-
-  let rec find_first = (~f, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_first_aux(v, d, f, l)
-      } else {
-        find_first(~f, r)
-      }
-    }
-
-  let rec find_first_opt_aux = (v0, d0, f, param) =>
-    switch param {
-    | Empty => Some(v0, d0)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_first_opt_aux(v, d, f, l)
-      } else {
-        find_first_opt_aux(v0, d0, f, r)
-      }
-    }
-
-  let rec find_first_opt = (~f, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_first_opt_aux(v, d, f, l)
-      } else {
-        find_first_opt(~f, r)
-      }
-    }
-
-  let rec find_last_aux = (v0, d0, f, param) =>
-    switch param {
-    | Empty => (v0, d0)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_last_aux(v, d, f, r)
-      } else {
-        find_last_aux(v0, d0, f, l)
-      }
-    }
-
-  let rec find_last = (~f, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_last_aux(v, d, f, r)
-      } else {
-        find_last(~f, l)
-      }
-    }
-
-  let rec find_last_opt_aux = (v0, d0, f, param) =>
-    switch param {
-    | Empty => Some(v0, d0)
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_last_opt_aux(v, d, f, r)
-      } else {
-        find_last_opt_aux(v0, d0, f, l)
-      }
-    }
-
-  let rec find_last_opt = (~f, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, d, r}) =>
-      if f(v) {
-        find_last_opt_aux(v, d, f, r)
-      } else {
-        find_last_opt(~f, l)
-      }
-    }
-
-  let rec find_opt = (x, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, d, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        Some(d)
-      } else {
-        find_opt(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-      }
-    }
-
-  let rec mem = (x, param) =>
-    switch param {
-    | Empty => false
-    | Node({l, v, r}) =>
-      let c = Ord.compare(x, v)
-      c == 0 ||
-        mem(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-    }
-
-  let rec min_binding = param =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l: Empty, v, d}) => (v, d)
-    | Node({l}) => min_binding(l)
-    }
-
-  let rec min_binding_opt = param =>
-    switch param {
-    | Empty => None
-    | Node({l: Empty, v, d}) => Some(v, d)
-    | Node({l}) => min_binding_opt(l)
-    }
-
-  let rec max_binding = param =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({v, d, r: Empty}) => (v, d)
-    | Node({r}) => max_binding(r)
-    }
-
-  let rec max_binding_opt = param =>
-    switch param {
-    | Empty => None
-    | Node({v, d, r: Empty}) => Some(v, d)
-    | Node({r}) => max_binding_opt(r)
-    }
-
-  let rec remove_min_binding = param =>
-    switch param {
-    | Empty => invalid_arg("Map.remove_min_elt")
-    | Node({l: Empty, r}) => r
-    | Node({l, v, d, r}) => bal(remove_min_binding(l), v, d, r)
-    }
-
-  let merge = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) =>
-      let (x, d) = min_binding(t2)
-      bal(t1, x, d, remove_min_binding(t2))
-    }
-
-  let rec remove = (x, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, d, r}) as m =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        merge(l, r)
-      } else if c < 0 {
-        let ll = remove(x, l)
-        if l === ll {
-          m
-        } else {
-          bal(ll, v, d, r)
-        }
-      } else {
-        let rr = remove(x, r)
-        if r === rr {
-          m
-        } else {
-          bal(l, v, d, rr)
-        }
-      }
-    }
-
-  let rec update = (~key as x, ~f, param) =>
-    switch param {
-    | Empty =>
-      switch f(None) {
-      | None => Empty
-      | Some(data) => Node({l: Empty, v: x, d: data, r: Empty, h: 1})
-      }
-    | Node({l, v, d, r, h}) as m =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        switch f(Some(d)) {
-        | None => merge(l, r)
-        | Some(data) =>
-          if d === data {
-            m
-          } else {
-            Node({l, v: x, d: data, r, h})
-          }
-        }
-      } else if c < 0 {
-        let ll = update(~key=x, ~f, l)
-        if l === ll {
-          m
-        } else {
-          bal(ll, v, d, r)
-        }
-      } else {
-        let rr = update(~key=x, ~f, r)
-        if r === rr {
-          m
-        } else {
-          bal(l, v, d, rr)
-        }
-      }
-    }
-
-  let rec iter = (~f, param) =>
-    switch param {
-    | Empty => ()
-    | Node({l, v, d, r}) =>
-      iter(~f, l)
-      f(~key=v, ~data=d)
-      iter(~f, r)
-    }
-
-  let rec map = (~f, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, d, r, h}) =>
-      let l' = map(~f, l)
-      let d' = f(d)
-      let r' = map(~f, r)
-      Node({l: l', v, d: d', r: r', h})
-    }
-
-  let rec mapi = (~f, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, d, r, h}) =>
-      let l' = mapi(~f, l)
-      let d' = f(v, d)
-      let r' = mapi(~f, r)
-      Node({l: l', v, d: d', r: r', h})
-    }
-
-  let rec fold = (~f, m, ~init as accu) =>
-    switch m {
-    | Empty => accu
-    | Node({l, v, d, r}) => fold(~f, r, ~init=f(~key=v, ~data=d, fold(~f, l, ~init=accu)))
-    }
-
-  let rec for_all = (~f as p, param) =>
-    switch param {
-    | Empty => true
-    | Node({l, v, d, r}) => p(v, d) && (for_all(~f=p, l) && for_all(~f=p, r))
-    }
-
-  let rec exists = (~f as p, param) =>
-    switch param {
-    | Empty => false
-    | Node({l, v, d, r}) => p(v, d) || (exists(~f=p, l) || exists(~f=p, r))
-    }
-
-  /* Beware: those two functions assume that the added k is *strictly*
-       smaller (or bigger) than all the present keys in the tree; it
-       does not test for equality with the current min (or max) key.
-
-       Indeed, they are only used during the "join" operation which
-       respects this precondition.
- */
-
-  let rec add_min_binding = (k, x, param) =>
-    switch param {
-    | Empty => singleton(k, x)
-    | Node({l, v, d, r}) => bal(add_min_binding(k, x, l), v, d, r)
-    }
-
-  let rec add_max_binding = (k, x, param) =>
-    switch param {
-    | Empty => singleton(k, x)
-    | Node({l, v, d, r}) => bal(l, v, d, add_max_binding(k, x, r))
-    }
-
-  /* Same as create and bal, but no assumptions are made on the
-   relative heights of l and r. */
-
-  let rec join = (l, v, d, r) =>
-    switch (l, r) {
-    | (Empty, _) => add_min_binding(v, d, r)
-    | (_, Empty) => add_max_binding(v, d, l)
-    | (Node({l: ll, v: lv, d: ld, r: lr, h: lh}), Node({l: rl, v: rv, d: rd, r: rr, h: rh})) =>
-      if lh > rh + 2 {
-        bal(ll, lv, ld, join(lr, v, d, r))
-      } else if rh > lh + 2 {
-        bal(join(l, v, d, rl), rv, rd, rr)
-      } else {
-        create(l, v, d, r)
-      }
-    }
-
-  /* Merge two trees l and r into one.
-       All elements of l must precede the elements of r.
-       No assumption on the heights of l and r. */
-
-  let concat = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) =>
-      let (x, d) = min_binding(t2)
-      join(t1, x, d, remove_min_binding(t2))
-    }
-
-  let concat_or_join = (t1, v, d, t2) =>
-    switch d {
-    | Some(d) => join(t1, v, d, t2)
-    | None => concat(t1, t2)
-    }
-
-  let rec split = (x, param) =>
-    switch param {
-    | Empty => (Empty, None, Empty)
-    | Node({l, v, d, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        (l, Some(d), r)
-      } else if c < 0 {
-        let (ll, pres, rl) = split(x, l)
-        (ll, pres, join(rl, v, d, r))
-      } else {
-        let (lr, pres, rr) = split(x, r)
-        (join(l, v, d, lr), pres, rr)
-      }
-    }
-
-  let rec merge = (~f, s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, Empty) => Empty
-    | (Node({l: l1, v: v1, d: d1, r: r1, h: h1}), _) if h1 >= height(s2) =>
-      let (l2, d2, r2) = split(v1, s2)
-      concat_or_join(merge(~f, l1, l2), v1, f(v1, Some(d1), d2), merge(~f, r1, r2))
-    | (_, Node({l: l2, v: v2, d: d2, r: r2})) =>
-      let (l1, d1, r1) = split(v2, s1)
-      concat_or_join(merge(~f, l1, l2), v2, f(v2, d1, Some(d2)), merge(~f, r1, r2))
-    | _ => assert(false)
-    }
-
-  let rec union = (~f, s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, s) | (s, Empty) => s
-    | (Node({l: l1, v: v1, d: d1, r: r1, h: h1}), Node({l: l2, v: v2, d: d2, r: r2, h: h2})) =>
-      if h1 >= h2 {
-        let (l2, d2, r2) = split(v1, s2)
-        let l = union(~f, l1, l2) and r = union(~f, r1, r2)
-        switch d2 {
-        | None => join(l, v1, d1, r)
-        | Some(d2) => concat_or_join(l, v1, f(v1, d1, d2), r)
-        }
-      } else {
-        let (l1, d1, r1) = split(v2, s1)
-        let l = union(~f, l1, l2) and r = union(~f, r1, r2)
-        switch d1 {
-        | None => join(l, v2, d2, r)
-        | Some(d1) => concat_or_join(l, v2, f(v2, d1, d2), r)
-        }
-      }
-    }
-
-  let rec filter = (~f as p, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, d, r}) as m =>
-      /* call [p] in the expected left-to-right order */
-      let l' = filter(~f=p, l)
-      let pvd = p(v, d)
-      let r' = filter(~f=p, r)
-      if pvd {
-        if l === l' && r === r' {
-          m
-        } else {
-          join(l', v, d, r')
-        }
-      } else {
-        concat(l', r')
-      }
-    }
-
-  let rec partition = (~f as p, param) =>
-    switch param {
-    | Empty => (Empty, Empty)
-    | Node({l, v, d, r}) =>
-      /* call [p] in the expected left-to-right order */
-      let (lt, lf) = partition(~f=p, l)
-      let pvd = p(v, d)
-      let (rt, rf) = partition(~f=p, r)
-      if pvd {
-        (join(lt, v, d, rt), concat(lf, rf))
-      } else {
-        (concat(lt, rt), join(lf, v, d, rf))
-      }
-    }
-
-  type rec enumeration<'a> = End | More(key, 'a, t<'a>, enumeration<'a>)
-
-  let rec cons_enum = (m, e) =>
-    switch m {
-    | Empty => e
-    | Node({l, v, d, r}) => cons_enum(l, More(v, d, r, e))
-    }
-
-  let compare = (~cmp, m1, m2) => {
-    let rec compare_aux = (e1, e2) =>
-      switch (e1, e2) {
-      | (End, End) => 0
-      | (End, _) => -1
-      | (_, End) => 1
-      | (More(v1, d1, r1, e1), More(v2, d2, r2, e2)) =>
-        let c = Ord.compare(v1, v2)
-        if c != 0 {
-          c
-        } else {
-          let c = cmp(d1, d2)
-          if c != 0 {
-            c
-          } else {
-            compare_aux(cons_enum(r1, e1), cons_enum(r2, e2))
-          }
-        }
-      }
-    compare_aux(cons_enum(m1, End), cons_enum(m2, End))
-  }
-
-  let equal = (~cmp, m1, m2) => {
-    let rec equal_aux = (e1, e2) =>
-      switch (e1, e2) {
-      | (End, End) => true
-      | (End, _) => false
-      | (_, End) => false
-      | (More(v1, d1, r1, e1), More(v2, d2, r2, e2)) =>
-        Ord.compare(v1, v2) == 0 && (cmp(d1, d2) && equal_aux(cons_enum(r1, e1), cons_enum(r2, e2)))
-      }
-    equal_aux(cons_enum(m1, End), cons_enum(m2, End))
-  }
-
-  let rec cardinal = param =>
-    switch param {
-    | Empty => 0
-    | Node({l, r}) => cardinal(l) + 1 + cardinal(r)
-    }
-
-  let rec bindings_aux = (accu, param) =>
-    switch param {
-    | Empty => accu
-    | Node({l, v, d, r}) => bindings_aux(list{(v, d), ...bindings_aux(accu, r)}, l)
-    }
-
-  let bindings = s => bindings_aux(list{}, s)
-
-  let choose = min_binding
-
-  let choose_opt = min_binding_opt
-}
diff --git a/jscomp/stdlib-406/moreLabels.res b/jscomp/stdlib-406/moreLabels.res
deleted file mode 100644
index 2fb9e46..0000000
--- a/jscomp/stdlib-406/moreLabels.res
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Jacques Garrigue, Kyoto University RIMS */
-/*  */
-/* Copyright 2001 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Module [MoreLabels]: meta-module for compatibility labelled libraries */
-
-module Hashtbl = HashtblLabels
-
-module Map = MapLabels
-
-module Set = SetLabels
diff --git a/jscomp/stdlib-406/moreLabels.resi b/jscomp/stdlib-406/moreLabels.resi
deleted file mode 100644
index 397641d..0000000
--- a/jscomp/stdlib-406/moreLabels.resi
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Jacques Garrigue, Kyoto University RIMS */
-/*  */
-/* Copyright 2001 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Extra labeled libraries.
-
-   This meta-module provides labelized version of the {!Hashtbl},
-   {!Map} and {!Set} modules.
-
-   They only differ by their labels. They are provided to help
-   porting from previous versions of OCaml.
-   The contents of this module are subject to change.
-*/
-
-module Hashtbl: {
-  type t<'a, 'b> = Hashtbl.t<'a, 'b>
-  let create: (~random: bool=?, int) => t<'a, 'b>
-  let clear: t<'a, 'b> => unit
-  let reset: t<'a, 'b> => unit
-  let copy: t<'a, 'b> => t<'a, 'b>
-  let add: (t<'a, 'b>, ~key: 'a, ~data: 'b) => unit
-  let find: (t<'a, 'b>, 'a) => 'b
-  let find_opt: (t<'a, 'b>, 'a) => option<'b>
-  let find_all: (t<'a, 'b>, 'a) => list<'b>
-  let mem: (t<'a, 'b>, 'a) => bool
-  let remove: (t<'a, 'b>, 'a) => unit
-  let replace: (t<'a, 'b>, ~key: 'a, ~data: 'b) => unit
-  let iter: (~f: (~key: 'a, ~data: 'b) => unit, t<'a, 'b>) => unit
-  let filter_map_inplace: (~f: (~key: 'a, ~data: 'b) => option<'b>, t<'a, 'b>) => unit
-  let fold: (~f: (~key: 'a, ~data: 'b, 'c) => 'c, t<'a, 'b>, ~init: 'c) => 'c
-  let length: t<'a, 'b> => int
-  let randomize: unit => unit
-  let is_randomized: unit => bool
-  type statistics = Hashtbl.statistics
-  let stats: t<'a, 'b> => statistics
-  module type HashedType = Hashtbl.HashedType
-  module type SeededHashedType = Hashtbl.SeededHashedType
-  module type S = {
-    type rec key
-    and t<'a>
-    let create: int => t<'a>
-    let clear: t<'a> => unit
-    let reset: t<'a> => unit
-    let copy: t<'a> => t<'a>
-    let add: (t<'a>, ~key: key, ~data: 'a) => unit
-    let remove: (t<'a>, key) => unit
-    let find: (t<'a>, key) => 'a
-    let find_opt: (t<'a>, key) => option<'a>
-    let find_all: (t<'a>, key) => list<'a>
-    let replace: (t<'a>, ~key: key, ~data: 'a) => unit
-    let mem: (t<'a>, key) => bool
-    let iter: (~f: (~key: key, ~data: 'a) => unit, t<'a>) => unit
-    let filter_map_inplace: (~f: (~key: key, ~data: 'a) => option<'a>, t<'a>) => unit
-    let fold: (~f: (~key: key, ~data: 'a, 'b) => 'b, t<'a>, ~init: 'b) => 'b
-    let length: t<'a> => int
-    let stats: t<'a> => statistics
-  }
-  module type SeededS = {
-    type rec key
-    and t<'a>
-    let create: (~random: bool=?, int) => t<'a>
-    let clear: t<'a> => unit
-    let reset: t<'a> => unit
-    let copy: t<'a> => t<'a>
-    let add: (t<'a>, ~key: key, ~data: 'a) => unit
-    let remove: (t<'a>, key) => unit
-    let find: (t<'a>, key) => 'a
-    let find_opt: (t<'a>, key) => option<'a>
-    let find_all: (t<'a>, key) => list<'a>
-    let replace: (t<'a>, ~key: key, ~data: 'a) => unit
-    let mem: (t<'a>, key) => bool
-    let iter: (~f: (~key: key, ~data: 'a) => unit, t<'a>) => unit
-    let filter_map_inplace: (~f: (~key: key, ~data: 'a) => option<'a>, t<'a>) => unit
-    let fold: (~f: (~key: key, ~data: 'a, 'b) => 'b, t<'a>, ~init: 'b) => 'b
-    let length: t<'a> => int
-    let stats: t<'a> => statistics
-  }
-  module Make: (H: HashedType) => (S with type key = H.t)
-  module MakeSeeded: (H: SeededHashedType) => (SeededS with type key = H.t)
-  let hash: 'a => int
-  let seeded_hash: (int, 'a) => int
-  let hash_param: (int, int, 'a) => int
-  let seeded_hash_param: (int, int, int, 'a) => int
-}
-
-module Map: {
-  module type OrderedType = Map.OrderedType
-  module type S = {
-    type rec key
-    and t<+'a>
-    let empty: t<'a>
-    let is_empty: t<'a> => bool
-    let mem: (key, t<'a>) => bool
-    let add: (~key: key, ~data: 'a, t<'a>) => t<'a>
-    let update: (~key: key, ~f: option<'a> => option<'a>, t<'a>) => t<'a>
-    let singleton: (key, 'a) => t<'a>
-    let remove: (key, t<'a>) => t<'a>
-    let merge: (~f: (key, option<'a>, option<'b>) => option<'c>, t<'a>, t<'b>) => t<'c>
-    let union: (~f: (key, 'a, 'a) => option<'a>, t<'a>, t<'a>) => t<'a>
-    let compare: (~cmp: ('a, 'a) => int, t<'a>, t<'a>) => int
-    let equal: (~cmp: ('a, 'a) => bool, t<'a>, t<'a>) => bool
-    let iter: (~f: (~key: key, ~data: 'a) => unit, t<'a>) => unit
-    let fold: (~f: (~key: key, ~data: 'a, 'b) => 'b, t<'a>, ~init: 'b) => 'b
-    let for_all: (~f: (key, 'a) => bool, t<'a>) => bool
-    let exists: (~f: (key, 'a) => bool, t<'a>) => bool
-    let filter: (~f: (key, 'a) => bool, t<'a>) => t<'a>
-    let partition: (~f: (key, 'a) => bool, t<'a>) => (t<'a>, t<'a>)
-    let cardinal: t<'a> => int
-    let bindings: t<'a> => list<(key, 'a)>
-    let min_binding: t<'a> => (key, 'a)
-    let min_binding_opt: t<'a> => option<(key, 'a)>
-    let max_binding: t<'a> => (key, 'a)
-    let max_binding_opt: t<'a> => option<(key, 'a)>
-    let choose: t<'a> => (key, 'a)
-    let choose_opt: t<'a> => option<(key, 'a)>
-    let split: (key, t<'a>) => (t<'a>, option<'a>, t<'a>)
-    let find: (key, t<'a>) => 'a
-    let find_opt: (key, t<'a>) => option<'a>
-    let find_first: (~f: key => bool, t<'a>) => (key, 'a)
-    let find_first_opt: (~f: key => bool, t<'a>) => option<(key, 'a)>
-    let find_last: (~f: key => bool, t<'a>) => (key, 'a)
-    let find_last_opt: (~f: key => bool, t<'a>) => option<(key, 'a)>
-    let map: (~f: 'a => 'b, t<'a>) => t<'b>
-    let mapi: (~f: (key, 'a) => 'b, t<'a>) => t<'b>
-  }
-  module Make: (Ord: OrderedType) => (S with type key = Ord.t)
-}
-
-module Set: {
-  module type OrderedType = Set.OrderedType
-  module type S = {
-    type rec elt
-    and t
-    let empty: t
-    let is_empty: t => bool
-    let mem: (elt, t) => bool
-    let add: (elt, t) => t
-    let singleton: elt => t
-    let remove: (elt, t) => t
-    let union: (t, t) => t
-    let inter: (t, t) => t
-    let diff: (t, t) => t
-    let compare: (t, t) => int
-    let equal: (t, t) => bool
-    let subset: (t, t) => bool
-    let iter: (~f: elt => unit, t) => unit
-    let map: (~f: elt => elt, t) => t
-    let fold: (~f: (elt, 'a) => 'a, t, ~init: 'a) => 'a
-    let for_all: (~f: elt => bool, t) => bool
-    let exists: (~f: elt => bool, t) => bool
-    let filter: (~f: elt => bool, t) => t
-    let partition: (~f: elt => bool, t) => (t, t)
-    let cardinal: t => int
-    let elements: t => list<elt>
-    let min_elt: t => elt
-    let min_elt_opt: t => option<elt>
-    let max_elt: t => elt
-    let max_elt_opt: t => option<elt>
-    let choose: t => elt
-    let choose_opt: t => option<elt>
-    let split: (elt, t) => (t, bool, t)
-    let find: (elt, t) => elt
-    let find_opt: (elt, t) => option<elt>
-    let find_first: (~f: elt => bool, t) => elt
-    let find_first_opt: (~f: elt => bool, t) => option<elt>
-    let find_last: (~f: elt => bool, t) => elt
-    let find_last_opt: (~f: elt => bool, t) => option<elt>
-    let of_list: list<elt> => t
-  }
-  module Make: (Ord: OrderedType) => (S with type elt = Ord.t)
-}
diff --git a/jscomp/stdlib-406/obj.res b/jscomp/stdlib-406/obj.res
deleted file mode 100644
index faa1e61..0000000
--- a/jscomp/stdlib-406/obj.res
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Operations on internal representations of values */
-
-type t
-
-external repr: 'a => t = "%identity"
-external obj: t => 'a = "%identity"
-external magic: 'a => 'b = "%identity"
-external is_int: t => bool = "%obj_is_int"
-@inline(always) let is_block = a => !is_int(a)
-external tag: t => int = "?obj_tag"
-external size: t => int = "#obj_length"
-external field: (t, int) => t = "%obj_field"
-external set_field: (t, int, t) => unit = "%obj_set_field"
-external dup: t => t = "?obj_dup"
diff --git a/jscomp/stdlib-406/obj.resi b/jscomp/stdlib-406/obj.resi
deleted file mode 100644
index 28bb954..0000000
--- a/jscomp/stdlib-406/obj.resi
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Operations on internal representations of values.
-
-   Not for the casual user.
-*/
-
-type t
-
-external repr: 'a => t = "%identity"
-external obj: t => 'a = "%identity"
-external magic: 'a => 'b = "%identity"
-@inline(always) let is_block: t => bool
-
-external tag: t => int = "?obj_tag"
-/**
-     Computes the total size (in words, including the headers) of all
-     heap blocks accessible from the argument.  Statically
-     allocated blocks are excluded.
-
-     @Since 4.04
-*/
-external size: t => int = "#obj_length"
-
-external field: (t, int) => t = "%obj_field"
-
-/** When using flambda:
-
-    [set_field] MUST NOT be called on immutable blocks.  (Blocks allocated
-    in C stubs, or with [new_block] below, are always considered mutable.)
-    
-    For experts only:
-    [set_field] et al can be made safe by first wrapping the block in
-    {!Sys.opaque_identity}, so any information about its contents will not
-    be propagated.
-*/
-external set_field: (t, int, t) => unit = "%obj_set_field"
-external dup: t => t = "?obj_dup"
diff --git a/jscomp/stdlib-406/parsing.res b/jscomp/stdlib-406/parsing.res
deleted file mode 100644
index 6614e94..0000000
--- a/jscomp/stdlib-406/parsing.res
+++ /dev/null
@@ -1,232 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* The parsing engine */
-
-open Lexing
-
-/* Internal interface to the parsing engine */
-
-type parser_env = {
-  mutable s_stack: array<int> /* States */,
-  mutable v_stack: array<Obj.t> /* Semantic attributes */,
-  mutable symb_start_stack: array<position> /* Start positions */,
-  mutable symb_end_stack: array<position> /* End positions */,
-  mutable stacksize: int /* Size of the stacks */,
-  mutable stackbase: int /* Base sp for current parse */,
-  mutable curr_char: int /* Last token read */,
-  mutable lval: Obj.t /* Its semantic attribute */,
-  mutable symb_start: position /* Start pos. of the current symbol */,
-  mutable symb_end: position /* End pos. of the current symbol */,
-  mutable asp: int /* The stack pointer for attributes */,
-  mutable rule_len: int /* Number of rhs items in the rule */,
-  mutable rule_number: int /* Rule number to reduce by */,
-  mutable sp: int /* Saved sp for parse_engine */,
-  mutable state: int /* Saved state for parse_engine */,
-  mutable errflag: int,
-} /* Saved error flag for parse_engine */
-
-type parse_tables = {
-  actions: array<parser_env => Obj.t>,
-  transl_const: array<int>,
-  transl_block: array<int>,
-  lhs: string,
-  len: string,
-  defred: string,
-  dgoto: string,
-  sindex: string,
-  rindex: string,
-  gindex: string,
-  tablesize: int,
-  table: string,
-  check: string,
-  error_function: string => unit,
-  names_const: string,
-  names_block: string,
-}
-
-exception YYexit(Obj.t)
-exception Parse_error
-
-type parser_input =
-  | Start
-  | Token_read
-  | Stacks_grown_1
-  | Stacks_grown_2
-  | Semantic_action_computed
-  | Error_detected
-
-type parser_output =
-  | Read_token
-  | Raise_parse_error
-  | Grow_stacks_1
-  | Grow_stacks_2
-  | Compute_semantic_action
-  | Call_error_function
-
-/* to avoid warnings */
-let _ = list{
-  Read_token,
-  Raise_parse_error,
-  Grow_stacks_1,
-  Grow_stacks_2,
-  Compute_semantic_action,
-  Call_error_function,
-}
-
-external parse_engine: (parse_tables, parser_env, parser_input, Obj.t) => parser_output =
-  "?parse_engine"
-
-external set_trace: bool => bool = "?set_parser_trace"
-
-let env = {
-  s_stack: Array.make(100, 0),
-  v_stack: Array.make(100, Obj.repr()),
-  symb_start_stack: Array.make(100, dummy_pos),
-  symb_end_stack: Array.make(100, dummy_pos),
-  stacksize: 100,
-  stackbase: 0,
-  curr_char: 0,
-  lval: Obj.repr(),
-  symb_start: dummy_pos,
-  symb_end: dummy_pos,
-  asp: 0,
-  rule_len: 0,
-  rule_number: 0,
-  sp: 0,
-  state: 0,
-  errflag: 0,
-}
-
-let grow_stacks = () => {
-  let oldsize = env.stacksize
-  let newsize = oldsize * 2
-  let new_s = Array.make(newsize, 0)
-  and new_v = Array.make(newsize, Obj.repr())
-  and new_start = Array.make(newsize, dummy_pos)
-  and new_end = Array.make(newsize, dummy_pos)
-  Array.blit(env.s_stack, 0, new_s, 0, oldsize)
-  env.s_stack = new_s
-  Array.blit(env.v_stack, 0, new_v, 0, oldsize)
-  env.v_stack = new_v
-  Array.blit(env.symb_start_stack, 0, new_start, 0, oldsize)
-  env.symb_start_stack = new_start
-  Array.blit(env.symb_end_stack, 0, new_end, 0, oldsize)
-  env.symb_end_stack = new_end
-  env.stacksize = newsize
-}
-
-let clear_parser = () => {
-  Array.fill(env.v_stack, 0, env.stacksize, Obj.repr())
-  env.lval = Obj.repr()
-}
-
-let current_lookahead_fun = ref((_: Obj.t) => false)
-
-let yyparse = (tables, start, lexer, lexbuf) => {
-  let rec loop = (cmd, arg) =>
-    switch parse_engine(tables, env, cmd, arg) {
-    | Read_token =>
-      let t = Obj.repr(lexer(lexbuf))
-      env.symb_start = lexbuf.lex_start_p
-      env.symb_end = lexbuf.lex_curr_p
-      loop(Token_read, t)
-    | Raise_parse_error => raise(Parse_error)
-    | Compute_semantic_action =>
-      let (action, value) = try (
-        Semantic_action_computed,
-        tables.actions[env.rule_number](env),
-      ) catch {
-      | Parse_error => (Error_detected, Obj.repr())
-      }
-      loop(action, value)
-    | Grow_stacks_1 =>
-      grow_stacks()
-      loop(Stacks_grown_1, Obj.repr())
-    | Grow_stacks_2 =>
-      grow_stacks()
-      loop(Stacks_grown_2, Obj.repr())
-    | Call_error_function =>
-      tables.error_function("syntax error")
-      loop(Error_detected, Obj.repr())
-    }
-  let init_asp = env.asp
-  and init_sp = env.sp
-  and init_stackbase = env.stackbase
-  and init_state = env.state
-  and init_curr_char = env.curr_char
-  and init_lval = env.lval
-  and init_errflag = env.errflag
-  env.stackbase = env.sp + 1
-  env.curr_char = start
-  env.symb_end = lexbuf.lex_curr_p
-  try loop(Start, Obj.repr()) catch {
-  | exn =>
-    let curr_char = env.curr_char
-    env.asp = init_asp
-    env.sp = init_sp
-    env.stackbase = init_stackbase
-    env.state = init_state
-    env.curr_char = init_curr_char
-    env.lval = init_lval
-    env.errflag = init_errflag
-    switch exn {
-    | YYexit(v) => Obj.magic(v)
-    | _ =>
-      current_lookahead_fun :=
-        (
-          tok =>
-            if Js.typeof(tok) != "number" {
-              tables.transl_block[Obj.tag(tok)] == curr_char
-            } else {
-              tables.transl_const[Obj.magic(tok)] == curr_char
-            }
-        )
-      raise(exn)
-    }
-  }
-}
-
-let peek_val = (env, n) => Obj.magic(env.v_stack[env.asp - n])
-
-let symbol_start_pos = () => {
-  let rec loop = i =>
-    if i <= 0 {
-      env.symb_end_stack[env.asp]
-    } else {
-      let st = env.symb_start_stack[env.asp - i + 1]
-      let en = env.symb_end_stack[env.asp - i + 1]
-      if st != en {
-        st
-      } else {
-        loop(i - 1)
-      }
-    }
-
-  loop(env.rule_len)
-}
-
-let symbol_end_pos = () => env.symb_end_stack[env.asp]
-let rhs_start_pos = n => env.symb_start_stack[env.asp - (env.rule_len - n)]
-let rhs_end_pos = n => env.symb_end_stack[env.asp - (env.rule_len - n)]
-
-let symbol_start = () => symbol_start_pos().pos_cnum
-let symbol_end = () => symbol_end_pos().pos_cnum
-let rhs_start = n => rhs_start_pos(n).pos_cnum
-let rhs_end = n => rhs_end_pos(n).pos_cnum
-
-let is_current_lookahead = tok => current_lookahead_fun.contents(Obj.repr(tok))
-
-let parse_error = (_: string) => ()
diff --git a/jscomp/stdlib-406/parsing.resi b/jscomp/stdlib-406/parsing.resi
deleted file mode 100644
index f93fd0f..0000000
--- a/jscomp/stdlib-406/parsing.resi
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* The run-time library for parsers generated by [ocamlyacc]. */
-
-/** [symbol_start] and {!Parsing.symbol_end} are to be called in the
-   action part of a grammar rule only. They return the offset of the
-   string that matches the left-hand side of the rule: [symbol_start()]
-   returns the offset of the first character; [symbol_end()] returns the
-   offset after the last character. The first character in a file is at
-   offset 0. */
-let symbol_start: unit => int
-
-/** See {!Parsing.symbol_start}. */
-let symbol_end: unit => int
-
-/** Same as {!Parsing.symbol_start} and {!Parsing.symbol_end}, but
-   return the offset of the string matching the [n]th item on the
-   right-hand side of the rule, where [n] is the integer parameter
-   to [rhs_start] and [rhs_end]. [n] is 1 for the leftmost item. */
-let rhs_start: int => int
-
-/** See {!Parsing.rhs_start}. */
-let rhs_end: int => int
-
-/** Same as [symbol_start], but return a [position] instead of an offset. */
-let symbol_start_pos: unit => Lexing.position
-
-/** Same as [symbol_end], but return a [position] instead of an offset. */
-let symbol_end_pos: unit => Lexing.position
-
-/** Same as [rhs_start], but return a [position] instead of an offset. */
-let rhs_start_pos: int => Lexing.position
-
-/** Same as [rhs_end], but return a [position] instead of an offset. */
-let rhs_end_pos: int => Lexing.position
-
-/** Empty the parser stack. Call it just after a parsing function
-   has returned, to remove all pointers from the parser stack
-   to structures that were built by semantic actions during parsing.
-   This is optional, but lowers the memory requirements of the
-   programs. */
-let clear_parser: unit => unit
-
-/** Raised when a parser encounters a syntax error.
-   Can also be raised from the action part of a grammar rule,
-   to initiate error recovery. */
-exception Parse_error
-
-/** Control debugging support for [ocamlyacc]-generated parsers.
-    After [Parsing.set_trace true], the pushdown automaton that
-    executes the parsers prints a trace of its actions (reading a token,
-    shifting a state, reducing by a rule) on standard output.
-    [Parsing.set_trace false] turns this debugging trace off.
-    The boolean returned is the previous state of the trace flag.
-    @since 3.11.0
-*/
-let set_trace: bool => bool
-
-/* The following definitions are used by the generated parsers only.
- They are not intended to be used directly by user programs. */
-
-type parser_env
-
-type parse_tables = {
-  actions: array<parser_env => Obj.t>,
-  transl_const: array<int>,
-  transl_block: array<int>,
-  lhs: string,
-  len: string,
-  defred: string,
-  dgoto: string,
-  sindex: string,
-  rindex: string,
-  gindex: string,
-  tablesize: int,
-  table: string,
-  check: string,
-  error_function: string => unit,
-  names_const: string,
-  names_block: string,
-}
-
-exception YYexit(Obj.t)
-
-let yyparse: (parse_tables, int, Lexing.lexbuf => 'a, Lexing.lexbuf) => 'b
-let peek_val: (parser_env, int) => 'a
-let is_current_lookahead: 'a => bool
-let parse_error: string => unit
diff --git a/jscomp/stdlib-406/pervasives.res b/jscomp/stdlib-406/pervasives.res
deleted file mode 100644
index 632d0b7..0000000
--- a/jscomp/stdlib-406/pervasives.res
+++ /dev/null
@@ -1,322 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-module Jsx = JsxC
-module JsxEvent = JsxEventC
-module JsxDOM = JsxDOMC
-module JsxPPXReactSupport = JsxPPXReactSupportC
-
-module JsxModules = {
-  module Jsx = JsxC
-  module JsxEvent = JsxEventC
-  module JsxDOM = JsxDOMC
-}
-
-/* Internal */
-external __unsafe_cast: 'a => 'b = "%identity"
-
-/* Exceptions */
-
-external raise: exn => 'a = "%raise"
-external raise_notrace: exn => 'a = "%raise_notrace"
-
-let failwith = s => raise(Failure(s))
-let invalid_arg = s => raise(Invalid_argument(s))
-
-exception Exit
-
-/* Composition operators */
-
-external \"|>": ('a, 'a => 'b) => 'b = "%revapply"
-external \"@@": ('a => 'b, 'a) => 'b = "%apply"
-
-/* Debugging */
-
-external __LOC__: string = "%loc_LOC"
-external __FILE__: string = "%loc_FILE"
-external __LINE__: int = "%loc_LINE"
-external __MODULE__: string = "%loc_MODULE"
-external __POS__: (string, int, int, int) = "%loc_POS"
-
-external __LOC_OF__: 'a => (string, 'a) = "%loc_LOC"
-external __LINE_OF__: 'a => (int, 'a) = "%loc_LINE"
-external __POS_OF__: 'a => ((string, int, int, int), 'a) = "%loc_POS"
-
-/* Comparisons */
-
-external \"=": ('a, 'a) => bool = "%equal"
-external \"<>": ('a, 'a) => bool = "%notequal"
-external \"<": ('a, 'a) => bool = "%lessthan"
-external \">": ('a, 'a) => bool = "%greaterthan"
-external \"<=": ('a, 'a) => bool = "%lessequal"
-external \">=": ('a, 'a) => bool = "%greaterequal"
-external compare: ('a, 'a) => int = "%compare"
-external min: ('a, 'a) => 'a = "%bs_min"
-external max: ('a, 'a) => 'a = "%bs_max"
-external \"==": ('a, 'a) => bool = "%eq"
-external \"!=": ('a, 'a) => bool = "%noteq"
-
-/* Boolean operations */
-
-external not: bool => bool = "%boolnot"
-
-external \"&&": (bool, bool) => bool = "%sequand"
-
-external \"||": (bool, bool) => bool = "%sequor"
-
-/* Integer operations */
-
-external \"~-": int => int = "%negint"
-external \"~+": int => int = "%identity"
-external succ: int => int = "%succint"
-external pred: int => int = "%predint"
-external \"+": (int, int) => int = "%addint"
-external \"-": (int, int) => int = "%subint"
-external \"*": (int, int) => int = "%mulint"
-external \"/": (int, int) => int = "%divint"
-external mod: (int, int) => int = "%modint"
-
-let abs = x =>
-  if x >= 0 {
-    x
-  } else {
-    -x
-  }
-
-external land: (int, int) => int = "%andint"
-external lor: (int, int) => int = "%orint"
-external lxor: (int, int) => int = "%xorint"
-
-let lnot = x => lxor(x, -1)
-
-external lsl: (int, int) => int = "%lslint"
-external lsr: (int, int) => int = "%lsrint"
-external asr: (int, int) => int = "%asrint"
-
-let max_int = lsr(-1, 1)
-let min_int = max_int + 1
-
-/* Floating-point operations */
-
-external \"~-.": float => float = "%negfloat"
-external \"~+.": float => float = "%identity"
-external \"+.": (float, float) => float = "%addfloat"
-external \"-.": (float, float) => float = "%subfloat"
-external \"*.": (float, float) => float = "%mulfloat"
-external \"/.": (float, float) => float = "%divfloat"
-
-@val @scope("Math") external \"**": (float, float) => float = "pow"
-@val @scope("Math") external exp: float => float = "exp"
-external expm1: float => float = "?expm1_float"
-
-@val @scope("Math") external acos: float => float = "acos"
-@val @scope("Math") external asin: float => float = "asin"
-@val @scope("Math") external atan: float => float = "atan"
-@val @scope("Math") external atan2: (float, float) => float = "atan2"
-external hypot: (float, float) => float = "?hypot_float"
-
-@val @scope("Math") external cos: float => float = "cos"
-@val @scope("Math") external cosh: float => float = "cosh"
-@val @scope("Math") external log: float => float = "log"
-@val @scope("Math") external log10: float => float = "log10"
-@val @scope("Math") external log1p: float => float = "log1p"
-@val @scope("Math") external sin: float => float = "sin"
-@val @scope("Math") external sinh: float => float = "sinh"
-@val @scope("Math") external sqrt: float => float = "sqrt"
-@val @scope("Math") external tan: float => float = "tan"
-@val @scope("Math") external tanh: float => float = "tanh"
-@val @scope("Math") external ceil: float => float = "ceil"
-@val @scope("Math") external floor: float => float = "floor"
-@val @scope("Math") external abs_float: float => float = "abs"
-external copysign: (float, float) => float = "?copysign_float"
-external mod_float: (float, float) => float = "?fmod_float"
-external frexp: float => (float, int) = "?frexp_float"
-external ldexp: (float, int) => float = "?ldexp_float"
-external modf: float => (float, float) = "?modf_float"
-external float: int => float = "%floatofint"
-external float_of_int: int => float = "%floatofint"
-external truncate: float => int = "%intoffloat"
-external int_of_float: float => int = "%intoffloat"
-
-let infinity = 0x1p2047
-let neg_infinity = -0x1p2047
-@val @scope("Number") external nan: float = "NaN"
-let max_float = 1.79769313486231571e+308 /* 0x1.ffff_ffff_ffff_fp+1023 */
-let min_float = 2.22507385850720138e-308 /* 0x1p-1022 */
-let epsilon_float = 2.22044604925031308e-16 /* 0x1p-52 */
-
-type fpclass =
-  | FP_normal
-  | FP_subnormal
-  | FP_zero
-  | FP_infinite
-  | FP_nan
-
-let classify_float = (x: float): fpclass =>
-  if (%raw(`isFinite`): (. _) => _)(. x) {
-    if abs_float(x) >= /* 0x1p-1022 */ /* 2.22507385850720138e-308 */ min_float {
-      FP_normal
-    } else if x != 0. {
-      FP_subnormal
-    } else {
-      FP_zero
-    }
-  } else if (%raw(`isNaN`): (. _) => _)(. x) {
-    FP_nan
-  } else {
-    FP_infinite
-  }
-
-/* String and byte sequence operations -- more in modules String and Bytes */
-
-external string_length: string => int = "%string_length"
-
-external \"^": (string, string) => string = "#string_append"
-/* Character operations -- more in module Char */
-
-external int_of_char: char => int = "%identity"
-external unsafe_char_of_int: int => char = "%identity"
-let char_of_int = n =>
-  if n < 0 || n > 255 {
-    invalid_arg("char_of_int")
-  } else {
-    unsafe_char_of_int(n)
-  }
-
-/* Unit operations */
-
-external ignore: 'a => unit = "%ignore"
-
-/* Pair operations */
-
-external fst: (('a, 'b)) => 'a = "%field0"
-external snd: (('a, 'b)) => 'b = "%field1"
-
-/* References */
-
-type ref<'a> = {mutable contents: 'a}
-external ref: 'a => ref<'a> = "%makemutable"
-external \"!": ref<'a> => 'a = "%bs_ref_field0"
-external \":=": (ref<'a>, 'a) => unit = "%bs_ref_setfield0"
-external incr: ref<int> => unit = "%incr"
-external decr: ref<int> => unit = "%decr"
-
-/* String conversion functions */
-external format_float: (string, float) => string = "?format_float"
-
-let string_of_bool = b =>
-  if b {
-    "true"
-  } else {
-    "false"
-  }
-let bool_of_string = param =>
-  switch param {
-  | "true" => true
-  | "false" => false
-  | _ => invalid_arg("bool_of_string")
-  }
-
-let bool_of_string_opt = param =>
-  switch param {
-  | "true" => Some(true)
-  | "false" => Some(false)
-  | _ => None
-  }
-
-@val external string_of_int: int => string = "String"
-
-external int_of_string: string => int = "?int_of_string"
-
-let int_of_string_opt = s =>
-  /* TODO: provide this directly as a non-raising primitive. */
-  try Some(int_of_string(s)) catch {
-  | Failure(_) => None
-  }
-
-external string_get: (string, int) => char = "%string_safe_get"
-
-let valid_float_lexem = s => {
-  let l = string_length(s)
-  let rec loop = i =>
-    if i >= l {
-      s ++ "."
-    } else {
-      switch string_get(s, i) {
-      | '0' .. '9' | '-' => loop(i + 1)
-      | _ => s
-      }
-    }
-
-  loop(0)
-}
-
-let string_of_float = f => valid_float_lexem(format_float("%.12g", f))
-
-external float_of_string: string => float = "?float_of_string"
-
-let float_of_string_opt = s =>
-  /* TODO: provide this directly as a non-raising primitive. */
-  try Some(float_of_string(s)) catch {
-  | Failure(_) => None
-  }
-
-/* List operations -- more in module List */
-
-let rec \"@" = (l1, l2) =>
-  switch l1 {
-  | list{} => l2
-  | list{hd, ...tl} => list{hd, ...\"@"(tl, l2)}
-  }
-
-/* Output functions on standard output */
-
-@val @scope("console") external print_endline: string => unit = "log"
-let print_newline = () => print_endline("")
-
-/* Output functions on standard error */
-
-@val @scope("console") external prerr_endline: string => unit = "error"
-let prerr_newline = () => prerr_endline("")
-
-let print_int = (i: int) => print_endline(string_of_int(i))
-let print_float = (i: float) => print_endline(string_of_float(i))
-let print_string = print_endline
-
-/* Miscellaneous */
-
-external sys_exit: int => 'a = "?sys_exit"
-
-let exit_function = ref(ignore)
-
-let at_exit = f => {
-  let g = exit_function.contents
-  exit_function :=
-    (
-      () => {
-        f()
-        g()
-      }
-    )
-}
-
-let do_at_exit = () => exit_function.contents()
-
-let exit = retcode => {
-  do_at_exit()
-  sys_exit(retcode)
-}
-
-type int32 = int
diff --git a/jscomp/stdlib-406/pervasives.resi b/jscomp/stdlib-406/pervasives.resi
deleted file mode 100644
index 43407ce..0000000
--- a/jscomp/stdlib-406/pervasives.resi
+++ /dev/null
@@ -1,760 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** The initially opened module.
-
-   This module provides the basic operations over the built-in types
-   (numbers, booleans, byte sequences, strings, exceptions, references,
-   lists, arrays, input-output channels, ...).
-
-   This module is automatically opened at the beginning of each compilation.
-   All components of this module can therefore be referred by their short
-   name, without prefixing them by [Pervasives].
-*/
-
-module Jsx = JsxC
-module JsxEvent = JsxEventC
-module JsxDOM = JsxDOMC
-module JsxPPXReactSupport = JsxPPXReactSupportC
-
-/* For autocomplete */
-module JsxModules: {
-  module Jsx = JsxC
-  module JsxEvent = JsxEventC
-  module JsxDOM = JsxDOMC
-  // skip JsxPPXReactSupport as it's not user-facing
-}
-
-/* Internal */
-external __unsafe_cast: 'a => 'b = "%identity"
-/* 1 Exceptions} */
-
-/** Raise the given exception value */
-external raise: exn => 'a = "%raise"
-
-/** A faster version [raise] which does not record the backtrace.
-    @since 4.02.0
-*/
-external raise_notrace: exn => 'a = "%raise_notrace"
-
-/** Raise exception [Invalid_argument] with the given string. */
-let invalid_arg: string => 'a
-
-/** Raise exception [Failure] with the given string. */
-let failwith: string => 'a
-
-/** The [Exit] exception is not raised by any library function.  It is
-    provided for use in your programs. */
-exception Exit
-
-/* {1 Comparisons} */
-
-/** [e1 = e2] tests for structural equality of [e1] and [e2].
-   Mutable structures (e.g. references and arrays) are equal
-   if and only if their current contents are structurally equal,
-   even if the two mutable objects are not the same physical object.
-   Equality between functional values raises [Invalid_argument].
-   Equality between cyclic data structures may not terminate.
-   Left-associative operator at precedence level 4/11. */
-external \"=": ('a, 'a) => bool = "%equal"
-
-/** Negation of {!Pervasives.( = )}.
-    Left-associative operator at precedence level 4/11. */
-external \"<>": ('a, 'a) => bool = "%notequal"
-
-/** See {!Pervasives.( >= )}.
-    Left-associative operator at precedence level 4/11. */
-external \"<": ('a, 'a) => bool = "%lessthan"
-
-/** See {!Pervasives.( >= )}.
-    Left-associative operator at precedence level 4/11. */
-external \">": ('a, 'a) => bool = "%greaterthan"
-
-/** See {!Pervasives.( >= )}.
-    Left-associative operator at precedence level 4/11. */
-external \"<=": ('a, 'a) => bool = "%lessequal"
-
-/** Structural ordering functions. These functions coincide with
-   the usual orderings over integers, characters, strings, byte sequences
-   and floating-point numbers, and extend them to a
-   total ordering over all types.
-   The ordering is compatible with [( = )]. As in the case
-   of [( = )], mutable structures are compared by contents.
-   Comparison between functional values raises [Invalid_argument].
-   Comparison between cyclic structures may not terminate.
-   Left-associative operator at precedence level 4/11. */
-external \">=": ('a, 'a) => bool = "%greaterequal"
-
-/** [compare x y] returns [0] if [x] is equal to [y],
-   a negative integer if [x] is less than [y], and a positive integer
-   if [x] is greater than [y].  The ordering implemented by [compare]
-   is compatible with the comparison predicates [=], [<] and [>]
-   defined above,  with one difference on the treatment of the float value
-   {!Pervasives.nan}.  Namely, the comparison predicates treat [nan]
-   as different from any other float value, including itself;
-   while [compare] treats [nan] as equal to itself and less than any
-   other float value.  This treatment of [nan] ensures that [compare]
-   defines a total ordering relation.
-
-   [compare] applied to functional values may raise [Invalid_argument].
-   [compare] applied to cyclic structures may not terminate.
-
-   The [compare] function can be used as the comparison function
-   required by the {!Set.Make} and {!Map.Make} functors, as well as
-   the {!List.sort} and {!Array.sort} functions. */
-external compare: ('a, 'a) => int = "%compare"
-
-/** Return the smaller of the two arguments.
-    The result is unspecified if one of the arguments contains
-    the float value [nan]. */
-external min: ('a, 'a) => 'a = "%bs_min"
-
-/** Return the greater of the two arguments.
-    The result is unspecified if one of the arguments contains
-    the float value [nan]. */
-external max: ('a, 'a) => 'a = "%bs_max"
-
-/** [e1 == e2] tests for physical equality of [e1] and [e2].
-   On mutable types such as references, arrays, byte sequences, records with
-   mutable fields and objects with mutable instance variables,
-   [e1 == e2] is true if and only if physical modification of [e1]
-   also affects [e2].
-   On non-mutable types, the behavior of [( == )] is
-   implementation-dependent; however, it is guaranteed that
-   [e1 == e2] implies [compare e1 e2 = 0].
-   Left-associative operator at precedence level 4/11. */
-external \"==": ('a, 'a) => bool = "%eq"
-
-/** Negation of {!Pervasives.( == )}.
-    Left-associative operator at precedence level 4/11. */
-external \"!=": ('a, 'a) => bool = "%noteq"
-
-/* {1 Boolean operations} */
-
-/** The boolean negation. */
-external not: bool => bool = "%boolnot"
-
-/** The boolean 'and'. Evaluation is sequential, left-to-right:
-   in [e1 && e2], [e1] is evaluated first, and if it returns [false],
-   [e2] is not evaluated at all.
-   Right-associative operator at precedence level 3/11. */
-external \"&&": (bool, bool) => bool = "%sequand"
-
-/** The boolean 'or'. Evaluation is sequential, left-to-right:
-   in [e1 || e2], [e1] is evaluated first, and if it returns [true],
-   [e2] is not evaluated at all.
-   Right-associative operator at precedence level 2/11.
-*/
-external \"||": (bool, bool) => bool = "%sequor"
-
-/* {1 Debugging} */
-
-/** [__LOC__] returns the location at which this expression appears in
-    the file currently being parsed by the compiler, with the standard
-    error format of OCaml: "File %S, line %d, characters %d-%d".
-    @since 4.02.0
-*/
-external __LOC__: string = "%loc_LOC"
-
-/** [__FILE__] returns the name of the file currently being
-    parsed by the compiler.
-    @since 4.02.0
-*/
-external __FILE__: string = "%loc_FILE"
-
-/** [__LINE__] returns the line number at which this expression
-    appears in the file currently being parsed by the compiler.
-    @since 4.02.0
-*/
-external __LINE__: int = "%loc_LINE"
-
-/** [__MODULE__] returns the module name of the file being
-    parsed by the compiler.
-    @since 4.02.0
-*/
-external __MODULE__: string = "%loc_MODULE"
-
-/** [__POS__] returns a tuple [(file,lnum,cnum,enum)], corresponding
-    to the location at which this expression appears in the file
-    currently being parsed by the compiler. [file] is the current
-    filename, [lnum] the line number, [cnum] the character position in
-    the line and [enum] the last character position in the line.
-    @since 4.02.0
- */
-external __POS__: (string, int, int, int) = "%loc_POS"
-
-/** [__LOC_OF__ expr] returns a pair [(loc, expr)] where [loc] is the
-    location of [expr] in the file currently being parsed by the
-    compiler, with the standard error format of OCaml: "File %S, line
-    %d, characters %d-%d".
-    @since 4.02.0
-*/
-external __LOC_OF__: 'a => (string, 'a) = "%loc_LOC"
-
-/** [__LINE__ expr] returns a pair [(line, expr)], where [line] is the
-    line number at which the expression [expr] appears in the file
-    currently being parsed by the compiler.
-    @since 4.02.0
- */
-external __LINE_OF__: 'a => (int, 'a) = "%loc_LINE"
-
-/** [__POS_OF__ expr] returns a pair [(loc,expr)], where [loc] is a
-    tuple [(file,lnum,cnum,enum)] corresponding to the location at
-    which the expression [expr] appears in the file currently being
-    parsed by the compiler. [file] is the current filename, [lnum] the
-    line number, [cnum] the character position in the line and [enum]
-    the last character position in the line.
-    @since 4.02.0
- */
-external __POS_OF__: 'a => ((string, int, int, int), 'a) = "%loc_POS"
-
-/* {1 Composition operators} */
-
-/** Reverse-application operator: [x |> f |> g] is exactly equivalent
- to [g (f (x))].
- Left-associative operator at precedence level 4/11.
-   @since 4.01
- */
-external \"|>": ('a, 'a => 'b) => 'b = "%revapply"
-
-/** Application operator: [g @@ f @@ x] is exactly equivalent to
- [g (f (x))].
- Right-associative operator at precedence level 5/11.
-   @since 4.01
-*/
-external \"@@": ('a => 'b, 'a) => 'b = "%apply"
-
-/* {1 Integer arithmetic} */
-
-/* Integers are 31 bits wide (or 63 bits on 64-bit processors).
-   All operations are taken modulo 2{^31} (or 2{^63}).
-   They do not fail on overflow. */
-
-/** Unary negation. You can also write [- e] instead of [~- e].
-    Unary operator at precedence level 9/11 for [- e]
-    and 11/11 for [~- e]. */
-external \"~-": int => int = "%negint"
-
-/** Unary addition. You can also write [+ e] instead of [~+ e].
-    Unary operator at precedence level 9/11 for [+ e]
-    and 11/11 for [~+ e].
-    @since 3.12.0
-*/
-external \"~+": int => int = "%identity"
-
-/** [succ x] is [x + 1]. */
-external succ: int => int = "%succint"
-
-/** [pred x] is [x - 1]. */
-external pred: int => int = "%predint"
-
-/** Integer addition.
-    Left-associative operator at precedence level 6/11. */
-external \"+": (int, int) => int = "%addint"
-
-/** Integer subtraction.
-    Left-associative operator at precedence level 6/11. */
-external \"-": (int, int) => int = "%subint"
-
-/** Integer multiplication.
-    Left-associative operator at precedence level 7/11. */
-external \"*": (int, int) => int = "%mulint"
-
-/** Integer division.
-   Raise [Division_by_zero] if the second argument is 0.
-   Integer division rounds the real quotient of its arguments towards zero.
-   More precisely, if [x >= 0] and [y > 0], [x / y] is the greatest integer
-   less than or equal to the real quotient of [x] by [y].  Moreover,
-   [(- x) / y = x / (- y) = - (x / y)].
-   Left-associative operator at precedence level 7/11. */
-external \"/": (int, int) => int = "%divint"
-
-/** Integer remainder.  If [y] is not zero, the result
-   of [x mod y] satisfies the following properties:
-   [x = (x / y) * y + x mod y] and
-   [abs(x mod y) <= abs(y) - 1].
-   If [y = 0], [x mod y] raises [Division_by_zero].
-   Note that [x mod y] is negative only if [x < 0].
-   Raise [Division_by_zero] if [y] is zero.
-   Left-associative operator at precedence level 7/11. */
-external mod: (int, int) => int = "%modint"
-
-/** Return the absolute value of the argument.  Note that this may be
-  negative if the argument is [min_int]. */
-let abs: int => int
-
-/** The greatest representable integer. */
-let max_int: int
-
-/** The smallest representable integer. */
-let min_int: int
-
-/* {2 Bitwise operations} */
-
-/** Bitwise logical and.
-    Left-associative operator at precedence level 7/11. */
-external land: (int, int) => int = "%andint"
-
-/** Bitwise logical or.
-    Left-associative operator at precedence level 7/11. */
-external lor: (int, int) => int = "%orint"
-
-/** Bitwise logical exclusive or.
-    Left-associative operator at precedence level 7/11. */
-external lxor: (int, int) => int = "%xorint"
-
-/** Bitwise logical negation. */
-let lnot: int => int
-
-/** [n lsl m] shifts [n] to the left by [m] bits.
-   The result is unspecified if [m < 0] or [m >= bitsize],
-   where [bitsize] is [32] on a 32-bit platform and
-   [64] on a 64-bit platform.
-   Right-associative operator at precedence level 8/11. */
-external lsl: (int, int) => int = "%lslint"
-
-/** [n lsr m] shifts [n] to the right by [m] bits.
-   This is a logical shift: zeroes are inserted regardless of
-   the sign of [n].
-   The result is unspecified if [m < 0] or [m >= bitsize].
-   Right-associative operator at precedence level 8/11. */
-external lsr: (int, int) => int = "%lsrint"
-
-/** [n asr m] shifts [n] to the right by [m] bits.
-   This is an arithmetic shift: the sign bit of [n] is replicated.
-   The result is unspecified if [m < 0] or [m >= bitsize].
-   Right-associative operator at precedence level 8/11. */
-external asr: (int, int) => int = "%asrint"
-
-/* {1 Floating-point arithmetic}
-
-   OCaml's floating-point numbers follow the
-   IEEE 754 standard, using double precision (64 bits) numbers.
-   Floating-point operations never raise an exception on overflow,
-   underflow, division by zero, etc.  Instead, special IEEE numbers
-   are returned as appropriate, such as [infinity] for [1.0 /. 0.0],
-   [neg_infinity] for [-1.0 /. 0.0], and [nan] ('not a number')
-   for [0.0 /. 0.0].  These special numbers then propagate through
-   floating-point computations as expected: for instance,
-   [1.0 /. infinity] is [0.0], and any arithmetic operation with [nan]
-   as argument returns [nan] as result.
-*/
-
-/** Unary negation. You can also write [-. e] instead of [~-. e].
-    Unary operator at precedence level 9/11 for [-. e]
-    and 11/11 for [~-. e]. */
-external \"~-.": float => float = "%negfloat"
-
-/** Unary addition. You can also write [+. e] instead of [~+. e].
-    Unary operator at precedence level 9/11 for [+. e]
-    and 11/11 for [~+. e].
-    @since 3.12.0
-*/
-external \"~+.": float => float = "%identity"
-
-/** Floating-point addition.
-    Left-associative operator at precedence level 6/11. */
-external \"+.": (float, float) => float = "%addfloat"
-
-/** Floating-point subtraction.
-    Left-associative operator at precedence level 6/11. */
-external \"-.": (float, float) => float = "%subfloat"
-
-/** Floating-point multiplication.
-    Left-associative operator at precedence level 7/11. */
-external \"*.": (float, float) => float = "%mulfloat"
-
-/** Floating-point division.
-    Left-associative operator at precedence level 7/11. */
-external \"/.": (float, float) => float = "%divfloat"
-
-@val @scope("Math") /** Exponentiation. */
-external \"**": (float, float) => float = "pow"
-
-@val @scope("Math") /** Square root. */
-external sqrt: float => float = "sqrt"
-
-@val @scope("Math") /** Exponential. */
-external exp: float => float = "exp"
-
-@val @scope("Math") /** Natural logarithm. */
-external log: float => float = "log"
-
-@val @scope("Math") /** Base 10 logarithm. */
-external log10: float => float = "log10"
-
-/** [expm1 x] computes [exp x -. 1.0], giving numerically-accurate results
-    even if [x] is close to [0.0].
-    @since 3.12.0
-*/
-external expm1: float => float = "?expm1_float"
-
-@val
-@scope("Math")
-/** [log1p x] computes [log(1.0 +. x)] (natural logarithm),
-    giving numerically-accurate results even if [x] is close to [0.0].
-    @since 3.12.0
-*/
-external log1p: float => float = "log1p"
-
-@val @scope("Math") /** Cosine.  Argument is in radians. */
-external cos: float => float = "cos"
-
-@val @scope("Math") /** Sine.  Argument is in radians. */
-external sin: float => float = "sin"
-
-@val @scope("Math") /** Tangent.  Argument is in radians. */
-external tan: float => float = "tan"
-
-@val
-@scope("Math")
-/** Arc cosine.  The argument must fall within the range [[-1.0, 1.0]].
-    Result is in radians and is between [0.0] and [pi]. */
-external acos: float => float = "acos"
-
-@val
-@scope("Math")
-/** Arc sine.  The argument must fall within the range [[-1.0, 1.0]].
-    Result is in radians and is between [-pi/2] and [pi/2]. */
-external asin: float => float = "asin"
-
-@val @scope("Math") /** Arc tangent.
-    Result is in radians and is between [-pi/2] and [pi/2]. */
-external atan: float => float = "atan"
-
-@val
-@scope("Math")
-/** [atan2 y x] returns the arc tangent of [y /. x].  The signs of [x]
-    and [y] are used to determine the quadrant of the result.
-    Result is in radians and is between [-pi] and [pi]. */
-external atan2: (float, float) => float = "atan2"
-
-/** [hypot x y] returns [sqrt(x *. x + y *. y)], that is, the length
-  of the hypotenuse of a right-angled triangle with sides of length
-  [x] and [y], or, equivalently, the distance of the point [(x,y)]
-  to origin.
-  @since 4.00.0  */
-external hypot: (float, float) => float = "?hypot_float"
-
-@val @scope("Math") /** Hyperbolic cosine.  Argument is in radians. */
-external cosh: float => float = "cosh"
-
-@val @scope("Math") /** Hyperbolic sine.  Argument is in radians. */
-external sinh: float => float = "sinh"
-
-@val @scope("Math") /** Hyperbolic tangent.  Argument is in radians. */
-external tanh: float => float = "tanh"
-
-@val
-@scope("Math")
-/** Round above to an integer value.
-    [ceil f] returns the least integer value greater than or equal to [f].
-    The result is returned as a float. */
-external ceil: float => float = "ceil"
-
-@val
-@scope("Math")
-/** Round below to an integer value.
-    [floor f] returns the greatest integer value less than or
-    equal to [f].
-    The result is returned as a float. */
-external floor: float => float = "floor"
-
-@val @scope("Math") /** [abs_float f] returns the absolute value of [f]. */
-external abs_float: float => float = "abs"
-
-/** [copysign x y] returns a float whose absolute value is that of [x]
-  and whose sign is that of [y].  If [x] is [nan], returns [nan].
-  If [y] is [nan], returns either [x] or [-. x], but it is not
-  specified which.
-  @since 4.00.0  */
-external copysign: (float, float) => float = "?copysign_float"
-
-/** [mod_float a b] returns the remainder of [a] with respect to
-   [b].  The returned value is [a -. n *. b], where [n]
-   is the quotient [a /. b] rounded towards zero to an integer. */
-external mod_float: (float, float) => float = "?fmod_float"
-
-/** [frexp f] returns the pair of the significant
-   and the exponent of [f].  When [f] is zero, the
-   significant [x] and the exponent [n] of [f] are equal to
-   zero.  When [f] is non-zero, they are defined by
-   [f = x *. 2 ** n] and [0.5 <= x < 1.0]. */
-external frexp: float => (float, int) = "?frexp_float"
-
-/** [ldexp x n] returns [x *. 2 ** n]. */
-external ldexp: (float, int) => float = "?ldexp_float"
-
-/** [modf f] returns the pair of the fractional and integral
-   part of [f]. */
-external modf: float => (float, float) = "?modf_float"
-
-/** Same as {!Pervasives.float_of_int}. */
-external float: int => float = "%floatofint"
-
-/** Convert an integer to floating-point. */
-external float_of_int: int => float = "%floatofint"
-
-/** Same as {!Pervasives.int_of_float}. */
-external truncate: float => int = "%intoffloat"
-
-/** Truncate the given floating-point number to an integer.
-   The result is unspecified if the argument is [nan] or falls outside the
-   range of representable integers. */
-external int_of_float: float => int = "%intoffloat"
-
-/** Positive infinity. */
-let infinity: float
-
-/** Negative infinity. */
-let neg_infinity: float
-
-@val
-@scope("Number")
-/** A special floating-point value denoting the result of an
-   undefined operation such as [0.0 /. 0.0].  Stands for
-   'not a number'.  Any floating-point operation with [nan] as
-   argument returns [nan] as result.  As for floating-point comparisons,
-   [=], [<], [<=], [>] and [>=] return [false] and [<>] returns [true]
-   if one or both of their arguments is [nan]. */
-external nan: float = "NaN"
-/* we could also use [0.  /. 0.] */
-
-/** The largest positive finite value of type [float]. */
-let max_float: float
-
-/** The smallest positive, non-zero, non-denormalized value of type [float]. */
-let min_float: float
-
-/** The difference between [1.0] and the smallest exactly representable
-    floating-point number greater than [1.0]. */
-let epsilon_float: float
-
-/** The five classes of floating-point numbers, as determined by
-   the {!Pervasives.classify_float} function. */
-type fpclass =
-  | /** Normal number, none of the below */ FP_normal
-  | /** Number very close to 0.0, has reduced precision */ FP_subnormal
-  | /** Number is 0.0 or -0.0 */ FP_zero
-  | /** Number is positive or negative infinity */ FP_infinite
-  | /** Not a number: result of an undefined operation */ FP_nan
-
-/** Return the class of the given floating-point number:
-   normal, subnormal, zero, infinite, or not a number. */
-let classify_float: float => fpclass
-
-/** {1 String operations}
-
-   More string operations are provided in module {!String}.
-*/
-/** String concatenation.
-    Right-associative operator at precedence level 5/11. */
-external \"^": (string, string) => string = "#string_append"
-
-/* {1 Character operations}
-
-   More character operations are provided in module {!Char}.
-*/
-
-/** Return the ASCII code of the argument. */
-external int_of_char: char => int = "%identity"
-
-/** Return the character with the given ASCII code.
-   Raise [Invalid_argument "char_of_int"] if the argument is
-   outside the range 0--255. */
-let char_of_int: int => char
-
-/* {1 Unit operations} */
-
-/** Discard the value of its argument and return [()].
-   For instance, [ignore(f x)] discards the result of
-   the side-effecting function [f].  It is equivalent to
-   [f x; ()], except that the latter may generate a
-   compiler warning; writing [ignore(f x)] instead
-   avoids the warning. */
-external ignore: 'a => unit = "%ignore"
-
-/* {1 String conversion functions} */
-
-/** Return the string representation of a boolean. As the returned values
-   may be shared, the user should not modify them directly.
-*/
-let string_of_bool: bool => string
-
-/** Convert the given string to a boolean.
-   Raise [Invalid_argument "bool_of_string"] if the string is not
-   ["true"] or ["false"]. */
-let bool_of_string: string => bool
-
-/** Convert the given string to a boolean.
-    Return [None] if the string is not
-    ["true"] or ["false"].
-    @since 4.05
-*/
-let bool_of_string_opt: string => option<bool>
-
-@val /** Return the string representation of an integer, in decimal. */
-external string_of_int: int => string = "String"
-
-/** Convert the given string to an integer.
-   The string is read in decimal (by default, or if the string 
-   begins with [0u]), in hexadecimal (if it begins with [0x] or
-   [0X]), in octal (if it begins with [0o] or [0O]), or in binary
-   (if it begins with [0b] or [0B]).
-
-   The [0u] prefix reads the input as an unsigned integer in the range
-   [[0, 2*max_int+1]].  If the input exceeds {!max_int}
-   it is converted to the signed integer
-   [min_int + input - max_int - 1].
-
-   The [_] (underscore) character can appear anywhere in the string
-   and is ignored.
-   Raise [Failure "int_of_string"] if the given string is not
-   a valid representation of an integer, or if the integer represented
-   exceeds the range of integers representable in type [int]. */
-external int_of_string: string => int = "?int_of_string"
-
-/** Same as [int_of_string], but returns [None] instead of raising.
-    @since 4.05
-*/
-let int_of_string_opt: string => option<int>
-
-@deprecated("Please use Js.Float.toString instead, string_of_float generates unparseable floats")
-/** Return the string representation of a floating-point number. */
-let string_of_float: float => string
-
-/** Convert the given string to a float.  The string is read in decimal
-   (by default) or in hexadecimal (marked by [0x] or [0X]).
-   The format of decimal floating-point numbers is
-   [ [-] dd.ddd (e|E) [+|-] dd ], where [d] stands for a decimal digit.
-   The format of hexadecimal floating-point numbers is
-   [ [-] 0(x|X) hh.hhh (p|P) [+|-] dd ], where [h] stands for an
-   hexadecimal digit and [d] for a decimal digit.
-   In both cases, at least one of the integer and fractional parts must be
-   given; the exponent part is optional.
-   The [_] (underscore) character can appear anywhere in the string
-   and is ignored.
-   Depending on the execution platforms, other representations of
-   floating-point numbers can be accepted, but should not be relied upon.
-   Raise [Failure "float_of_string"] if the given string is not a valid
-   representation of a float. */
-external float_of_string: string => float = "?float_of_string"
-
-/** Same as [float_of_string], but returns [None] instead of raising.
-    @since 4.05
-*/
-let float_of_string_opt: string => option<float>
-
-/* {1 Pair operations} */
-
-/** Return the first component of a pair. */
-external fst: (('a, 'b)) => 'a = "%field0"
-
-/** Return the second component of a pair. */
-external snd: (('a, 'b)) => 'b = "%field1"
-
-/* {1 List operations}
-
-   More list operations are provided in module {!List}.
-*/
-
-@deprecated("Use Belt.List.concat instead")
-/** List concatenation.  Tail-recursive (length of the first argument).
-    Right-associative operator at precedence level 5/11. */
-let \"@": (list<'a>, list<'a>) => list<'a>
-
-type int32 = int
-
-/** Print a string on standard output. */
-let print_string: string => unit
-
-/** Print an integer, in decimal, on standard output. */
-let print_int: int => unit
-
-/** Print a floating-point number, in decimal, on standard output. */
-let print_float: float => unit
-
-/** Print a floating-point number, in decimal, on standard output. */
-@val
-@scope("console")
-/** Print a string, followed by a newline character, on
-   standard output and flush standard output. */
-external print_endline: string => unit = "log"
-
-/** Print a newline character on standard output, and flush
-   standard output. This can be used to simulate line
-   buffering of standard output. */
-let print_newline: unit => unit
-
-@val
-@scope("console")
-/** Print a string, followed by a newline character on standard
-   error and flush standard error. */
-external prerr_endline: string => unit = "error"
-
-/** Print a newline character on standard error, and flush
-   standard error. */
-let prerr_newline: unit => unit
-
-/* {1 References} */
-
-/** The type of references (mutable indirection cells) containing
-   a value of type ['a]. */
-type ref<'a> = {mutable contents: 'a}
-
-/** Return a fresh reference containing the given value. */
-external ref: 'a => ref<'a> = "%makemutable"
-
-/** [!r] returns the current contents of reference [r].
-   Equivalent to [fun r -> r.contents].
-   Unary operator at precedence level 11/11.*/
-external \"!": ref<'a> => 'a = "%bs_ref_field0"
-
-/** [r := a] stores the value of [a] in reference [r].
-   Equivalent to [fun r v -> r.contents <- v].
-   Right-associative operator at precedence level 1/11. */
-external \":=": (ref<'a>, 'a) => unit = "%bs_ref_setfield0"
-
-/** Increment the integer contained in the given reference.
-   Equivalent to [fun r -> r := succ !r]. */
-external incr: ref<int> => unit = "%incr"
-
-/** Decrement the integer contained in the given reference.
-   Equivalent to [fun r -> r := pred !r]. */
-external decr: ref<int> => unit = "%decr"
-
-/* {1 Program termination} */
-
-/** Terminate the process, returning the given status code
-   to the operating system: usually 0 to indicate no errors,
-   and a small positive integer to indicate failure.
-   All open output channels are flushed with [flush_all].
-   An implicit [exit 0] is performed each time a program
-   terminates normally.  An implicit [exit 2] is performed if the program
-   terminates early because of an uncaught exception. */
-let exit: int => 'a
-
-/** Register the given function to be called at program termination
-   time. The functions registered with [at_exit] will be called when
-   the program does any of the following:
-   - executes {!Pervasives.exit}
-   - terminates, either normally or because of an uncaught
-     exception
-   - executes the C function [caml_shutdown].
-   The functions are called in 'last in, first out' order: the
-   function most recently added with [at_exit] is called first. */
-let at_exit: (unit => unit) => unit
-
-let valid_float_lexem: string => string
diff --git a/jscomp/stdlib-406/pervasivesU.res b/jscomp/stdlib-406/pervasivesU.res
deleted file mode 100644
index c044504..0000000
--- a/jscomp/stdlib-406/pervasivesU.res
+++ /dev/null
@@ -1,321 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-@@uncurried
-
-module Jsx = JsxU
-module JsxEvent = JsxEventU
-module JsxDOM = JsxDOMU
-module JsxPPXReactSupport = JsxPPXReactSupportU
-module JsxModules = {
-  module Jsx = JsxU
-  module JsxEvent = JsxEventU
-  module JsxDOM = JsxDOMU
-}
-
-/* Internal */
-external __unsafe_cast: 'a => 'b = "%identity"
-
-/* Exceptions */
-
-external raise: exn => 'a = "%raise"
-external raise_notrace: exn => 'a = "%raise_notrace"
-
-let failwith = s => raise(Failure(s))
-let invalid_arg = s => raise(Invalid_argument(s))
-
-exception Exit
-
-/* Composition operators */
-
-external \"|>": ('a, 'a => 'b) => 'b = "%revapply"
-external \"@@": ('a => 'b, 'a) => 'b = "%apply"
-
-/* Debugging */
-
-external __LOC__: string = "%loc_LOC"
-external __FILE__: string = "%loc_FILE"
-external __LINE__: int = "%loc_LINE"
-external __MODULE__: string = "%loc_MODULE"
-external __POS__: (string, int, int, int) = "%loc_POS"
-
-external __LOC_OF__: 'a => (string, 'a) = "%loc_LOC"
-external __LINE_OF__: 'a => (int, 'a) = "%loc_LINE"
-external __POS_OF__: 'a => ((string, int, int, int), 'a) = "%loc_POS"
-
-/* Comparisons */
-
-external \"=": ('a, 'a) => bool = "%equal"
-external \"<>": ('a, 'a) => bool = "%notequal"
-external \"<": ('a, 'a) => bool = "%lessthan"
-external \">": ('a, 'a) => bool = "%greaterthan"
-external \"<=": ('a, 'a) => bool = "%lessequal"
-external \">=": ('a, 'a) => bool = "%greaterequal"
-external compare: ('a, 'a) => int = "%compare"
-external min: ('a, 'a) => 'a = "%bs_min"
-external max: ('a, 'a) => 'a = "%bs_max"
-external \"==": ('a, 'a) => bool = "%eq"
-external \"!=": ('a, 'a) => bool = "%noteq"
-
-/* Boolean operations */
-
-external not: bool => bool = "%boolnot"
-
-external \"&&": (bool, bool) => bool = "%sequand"
-
-external \"||": (bool, bool) => bool = "%sequor"
-
-/* Integer operations */
-
-external \"~-": int => int = "%negint"
-external \"~+": int => int = "%identity"
-external succ: int => int = "%succint"
-external pred: int => int = "%predint"
-external \"+": (int, int) => int = "%addint"
-external \"-": (int, int) => int = "%subint"
-external \"*": (int, int) => int = "%mulint"
-external \"/": (int, int) => int = "%divint"
-external mod: (int, int) => int = "%modint"
-
-let abs = x =>
-  if x >= 0 {
-    x
-  } else {
-    -x
-  }
-
-external land: (int, int) => int = "%andint"
-external lor: (int, int) => int = "%orint"
-external lxor: (int, int) => int = "%xorint"
-
-let lnot = x => lxor(x, -1)
-
-external lsl: (int, int) => int = "%lslint"
-external lsr: (int, int) => int = "%lsrint"
-external asr: (int, int) => int = "%asrint"
-
-let max_int = lsr(-1, 1)
-let min_int = max_int + 1
-
-/* Floating-point operations */
-
-external \"~-.": float => float = "%negfloat"
-external \"~+.": float => float = "%identity"
-external \"+.": (float, float) => float = "%addfloat"
-external \"-.": (float, float) => float = "%subfloat"
-external \"*.": (float, float) => float = "%mulfloat"
-external \"/.": (float, float) => float = "%divfloat"
-
-@val @scope("Math") external \"**": (float, float) => float = "pow"
-@val @scope("Math") external exp: float => float = "exp"
-external expm1: float => float = "?expm1_float"
-
-@val @scope("Math") external acos: float => float = "acos"
-@val @scope("Math") external asin: float => float = "asin"
-@val @scope("Math") external atan: float => float = "atan"
-@val @scope("Math") external atan2: (float, float) => float = "atan2"
-external hypot: (float, float) => float = "?hypot_float"
-
-@val @scope("Math") external cos: float => float = "cos"
-@val @scope("Math") external cosh: float => float = "cosh"
-@val @scope("Math") external log: float => float = "log"
-@val @scope("Math") external log10: float => float = "log10"
-@val @scope("Math") external log1p: float => float = "log1p"
-@val @scope("Math") external sin: float => float = "sin"
-@val @scope("Math") external sinh: float => float = "sinh"
-@val @scope("Math") external sqrt: float => float = "sqrt"
-@val @scope("Math") external tan: float => float = "tan"
-@val @scope("Math") external tanh: float => float = "tanh"
-@val @scope("Math") external ceil: float => float = "ceil"
-@val @scope("Math") external floor: float => float = "floor"
-@val @scope("Math") external abs_float: float => float = "abs"
-external copysign: (float, float) => float = "?copysign_float"
-external mod_float: (float, float) => float = "?fmod_float"
-external frexp: float => (float, int) = "?frexp_float"
-external ldexp: (float, int) => float = "?ldexp_float"
-external modf: float => (float, float) = "?modf_float"
-external float: int => float = "%floatofint"
-external float_of_int: int => float = "%floatofint"
-external truncate: float => int = "%intoffloat"
-external int_of_float: float => int = "%intoffloat"
-
-let infinity = 0x1p2047
-let neg_infinity = -0x1p2047
-@val @scope("Number") external nan: float = "NaN"
-let max_float = 1.79769313486231571e+308 /* 0x1.ffff_ffff_ffff_fp+1023 */
-let min_float = 2.22507385850720138e-308 /* 0x1p-1022 */
-let epsilon_float = 2.22044604925031308e-16 /* 0x1p-52 */
-
-type fpclass =
-  | FP_normal
-  | FP_subnormal
-  | FP_zero
-  | FP_infinite
-  | FP_nan
-
-let classify_float = (x: float): fpclass =>
-  if (%raw(`isFinite`): _ => _)(x) {
-    if abs_float(x) >= /* 0x1p-1022 */ /* 2.22507385850720138e-308 */ min_float {
-      FP_normal
-    } else if x != 0. {
-      FP_subnormal
-    } else {
-      FP_zero
-    }
-  } else if (%raw(`isNaN`): _ => _)(x) {
-    FP_nan
-  } else {
-    FP_infinite
-  }
-
-/* String and byte sequence operations -- more in modules String and Bytes */
-
-external string_length: string => int = "%string_length"
-
-external \"^": (string, string) => string = "#string_append"
-/* Character operations -- more in module Char */
-
-external int_of_char: char => int = "%identity"
-external unsafe_char_of_int: int => char = "%identity"
-let char_of_int = n =>
-  if n < 0 || n > 255 {
-    invalid_arg("char_of_int")
-  } else {
-    unsafe_char_of_int(n)
-  }
-
-/* Unit operations */
-
-external ignore: 'a => unit = "%ignore"
-
-/* Pair operations */
-
-external fst: (('a, 'b)) => 'a = "%field0"
-external snd: (('a, 'b)) => 'b = "%field1"
-
-/* References */
-
-type ref<'a> = {mutable contents: 'a}
-external ref: 'a => ref<'a> = "%makemutable"
-external \"!": ref<'a> => 'a = "%bs_ref_field0"
-external \":=": (ref<'a>, 'a) => unit = "%bs_ref_setfield0"
-external incr: ref<int> => unit = "%incr"
-external decr: ref<int> => unit = "%decr"
-
-/* String conversion functions */
-external format_float: (string, float) => string = "?format_float"
-
-let string_of_bool = b =>
-  if b {
-    "true"
-  } else {
-    "false"
-  }
-let bool_of_string = param =>
-  switch param {
-  | "true" => true
-  | "false" => false
-  | _ => invalid_arg("bool_of_string")
-  }
-
-let bool_of_string_opt = param =>
-  switch param {
-  | "true" => Some(true)
-  | "false" => Some(false)
-  | _ => None
-  }
-
-@val external string_of_int: int => string = "String"
-
-external int_of_string: string => int = "?int_of_string"
-
-let int_of_string_opt = s =>
-  /* TODO: provide this directly as a non-raising primitive. */
-  try Some(int_of_string(s)) catch {
-  | Failure(_) => None
-  }
-
-external string_get: (string, int) => char = "%string_safe_get"
-
-let valid_float_lexem = s => {
-  let l = string_length(s)
-  let rec loop = i =>
-    if i >= l {
-      s ++ "."
-    } else {
-      switch string_get(s, i) {
-      | '0' .. '9' | '-' => loop(i + 1)
-      | _ => s
-      }
-    }
-
-  loop(0)
-}
-
-let string_of_float = f => valid_float_lexem(format_float("%.12g", f))
-
-external float_of_string: string => float = "?float_of_string"
-
-let float_of_string_opt = s =>
-  /* TODO: provide this directly as a non-raising primitive. */
-  try Some(float_of_string(s)) catch {
-  | Failure(_) => None
-  }
-
-/* List operations -- more in module List */
-
-let rec \"@" = (l1, l2) =>
-  switch l1 {
-  | list{} => l2
-  | list{hd, ...tl} => list{hd, ...\"@"(tl, l2)}
-  }
-
-/* Output functions on standard output */
-
-@val @scope("console") external print_endline: string => unit = "log"
-let print_newline = () => print_endline("")
-
-/* Output functions on standard error */
-
-@val @scope("console") external prerr_endline: string => unit = "error"
-let prerr_newline = () => prerr_endline("")
-
-let print_int = (i: int) => print_endline(string_of_int(i))
-let print_float = (i: float) => print_endline(string_of_float(i))
-let print_string = print_endline
-
-/* Miscellaneous */
-
-external sys_exit: int => 'a = "?sys_exit"
-
-let exit_function = ref(ignore)
-
-let at_exit = f => {
-  let g = exit_function.contents
-  exit_function :=
-    () => {
-      f()
-      g()
-    }
-}
-
-let do_at_exit = () => exit_function.contents()
-
-let exit = retcode => {
-  do_at_exit()
-  sys_exit(retcode)
-}
-
-type int32 = int
diff --git a/jscomp/stdlib-406/pervasivesU.resi b/jscomp/stdlib-406/pervasivesU.resi
deleted file mode 100644
index 4b0f059..0000000
--- a/jscomp/stdlib-406/pervasivesU.resi
+++ /dev/null
@@ -1,763 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** The initially opened module.
-
-   This module provides the basic operations over the built-in types
-   (numbers, booleans, byte sequences, strings, exceptions, references,
-   lists, arrays, input-output channels, ...).
-
-   This module is automatically opened at the beginning of each compilation.
-   All components of this module can therefore be referred by their short
-   name, without prefixing them by [Pervasives].
-*/
-
-@@uncurried
-
-module Jsx = JsxU
-module JsxEvent = JsxEventU
-module JsxDOM = JsxDOMU
-module JsxPPXReactSupport = JsxPPXReactSupportU
-
-/* For autocomplete */
-module JsxModules: {
-  module Jsx = JsxU
-  module JsxEvent = JsxEventU
-  module JsxDOM = JsxDOMU
-  // skip JsxPPXReactSupport as it's not user-facing
-}
-
-/* Internal */
-external __unsafe_cast: 'a => 'b = "%identity"
-
-/*** {1 Exceptions} */
-
-/** Raise the given exception value */
-external raise: exn => 'a = "%raise"
-
-/** A faster version [raise] which does not record the backtrace.
-    @since 4.02.0
-*/
-external raise_notrace: exn => 'a = "%raise_notrace"
-
-/** Raise exception [Invalid_argument] with the given string. */
-let invalid_arg: string => 'a
-
-/** Raise exception [Failure] with the given string. */
-let failwith: string => 'a
-
-/** The [Exit] exception is not raised by any library function.  It is
-    provided for use in your programs. */
-exception Exit
-
-/*** {1 Comparisons} */
-
-/** [e1 = e2] tests for structural equality of [e1] and [e2].
-   Mutable structures (e.g. references and arrays) are equal
-   if and only if their current contents are structurally equal,
-   even if the two mutable objects are not the same physical object.
-   Equality between functional values raises [Invalid_argument].
-   Equality between cyclic data structures may not terminate.
-   Left-associative operator at precedence level 4/11. */
-external \"=": ('a, 'a) => bool = "%equal"
-
-/** Negation of {!Pervasives.( = )}.
-    Left-associative operator at precedence level 4/11. */
-external \"<>": ('a, 'a) => bool = "%notequal"
-
-/** See {!Pervasives.( >= )}.
-    Left-associative operator at precedence level 4/11. */
-external \"<": ('a, 'a) => bool = "%lessthan"
-
-/** See {!Pervasives.( >= )}.
-    Left-associative operator at precedence level 4/11. */
-external \">": ('a, 'a) => bool = "%greaterthan"
-
-/** See {!Pervasives.( >= )}.
-    Left-associative operator at precedence level 4/11. */
-external \"<=": ('a, 'a) => bool = "%lessequal"
-
-/** Structural ordering functions. These functions coincide with
-   the usual orderings over integers, characters, strings, byte sequences
-   and floating-point numbers, and extend them to a
-   total ordering over all types.
-   The ordering is compatible with [( = )]. As in the case
-   of [( = )], mutable structures are compared by contents.
-   Comparison between functional values raises [Invalid_argument].
-   Comparison between cyclic structures may not terminate.
-   Left-associative operator at precedence level 4/11. */
-external \">=": ('a, 'a) => bool = "%greaterequal"
-
-/** [compare x y] returns [0] if [x] is equal to [y],
-   a negative integer if [x] is less than [y], and a positive integer
-   if [x] is greater than [y].  The ordering implemented by [compare]
-   is compatible with the comparison predicates [=], [<] and [>]
-   defined above,  with one difference on the treatment of the float value
-   {!Pervasives.nan}.  Namely, the comparison predicates treat [nan]
-   as different from any other float value, including itself;
-   while [compare] treats [nan] as equal to itself and less than any
-   other float value.  This treatment of [nan] ensures that [compare]
-   defines a total ordering relation.
-
-   [compare] applied to functional values may raise [Invalid_argument].
-   [compare] applied to cyclic structures may not terminate.
-
-   The [compare] function can be used as the comparison function
-   required by the {!Set.Make} and {!Map.Make} functors, as well as
-   the {!List.sort} and {!Array.sort} functions. */
-external compare: ('a, 'a) => int = "%compare"
-
-/** Return the smaller of the two arguments.
-    The result is unspecified if one of the arguments contains
-    the float value [nan]. */
-external min: ('a, 'a) => 'a = "%bs_min"
-
-/** Return the greater of the two arguments.
-    The result is unspecified if one of the arguments contains
-    the float value [nan]. */
-external max: ('a, 'a) => 'a = "%bs_max"
-
-/** [e1 == e2] tests for physical equality of [e1] and [e2].
-   On mutable types such as references, arrays, byte sequences, records with
-   mutable fields and objects with mutable instance variables,
-   [e1 == e2] is true if and only if physical modification of [e1]
-   also affects [e2].
-   On non-mutable types, the behavior of [( == )] is
-   implementation-dependent; however, it is guaranteed that
-   [e1 == e2] implies [compare e1 e2 = 0].
-   Left-associative operator at precedence level 4/11. */
-external \"==": ('a, 'a) => bool = "%eq"
-
-/** Negation of {!Pervasives.( == )}.
-    Left-associative operator at precedence level 4/11. */
-external \"!=": ('a, 'a) => bool = "%noteq"
-
-/*** {1 Boolean operations} */
-
-/** The boolean negation. */
-external not: bool => bool = "%boolnot"
-
-/** The boolean 'and'. Evaluation is sequential, left-to-right:
-   in [e1 && e2], [e1] is evaluated first, and if it returns [false],
-   [e2] is not evaluated at all.
-   Right-associative operator at precedence level 3/11. */
-external \"&&": (bool, bool) => bool = "%sequand"
-
-/** The boolean 'or'. Evaluation is sequential, left-to-right:
-   in [e1 || e2], [e1] is evaluated first, and if it returns [true],
-   [e2] is not evaluated at all.
-   Right-associative operator at precedence level 2/11.
-*/
-external \"||": (bool, bool) => bool = "%sequor"
-
-/*** {1 Debugging} */
-
-/** [__LOC__] returns the location at which this expression appears in
-    the file currently being parsed by the compiler, with the standard
-    error format of OCaml: "File %S, line %d, characters %d-%d".
-    @since 4.02.0
-*/
-external __LOC__: string = "%loc_LOC"
-
-/** [__FILE__] returns the name of the file currently being
-    parsed by the compiler.
-    @since 4.02.0
-*/
-external __FILE__: string = "%loc_FILE"
-
-/** [__LINE__] returns the line number at which this expression
-    appears in the file currently being parsed by the compiler.
-    @since 4.02.0
-*/
-external __LINE__: int = "%loc_LINE"
-
-/** [__MODULE__] returns the module name of the file being
-    parsed by the compiler.
-    @since 4.02.0
-*/
-external __MODULE__: string = "%loc_MODULE"
-
-/** [__POS__] returns a tuple [(file,lnum,cnum,enum)], corresponding
-    to the location at which this expression appears in the file
-    currently being parsed by the compiler. [file] is the current
-    filename, [lnum] the line number, [cnum] the character position in
-    the line and [enum] the last character position in the line.
-    @since 4.02.0
- */
-external __POS__: (string, int, int, int) = "%loc_POS"
-
-/** [__LOC_OF__ expr] returns a pair [(loc, expr)] where [loc] is the
-    location of [expr] in the file currently being parsed by the
-    compiler, with the standard error format of OCaml: "File %S, line
-    %d, characters %d-%d".
-    @since 4.02.0
-*/
-external __LOC_OF__: 'a => (string, 'a) = "%loc_LOC"
-
-/** [__LINE__ expr] returns a pair [(line, expr)], where [line] is the
-    line number at which the expression [expr] appears in the file
-    currently being parsed by the compiler.
-    @since 4.02.0
- */
-external __LINE_OF__: 'a => (int, 'a) = "%loc_LINE"
-
-/** [__POS_OF__ expr] returns a pair [(loc,expr)], where [loc] is a
-    tuple [(file,lnum,cnum,enum)] corresponding to the location at
-    which the expression [expr] appears in the file currently being
-    parsed by the compiler. [file] is the current filename, [lnum] the
-    line number, [cnum] the character position in the line and [enum]
-    the last character position in the line.
-    @since 4.02.0
- */
-external __POS_OF__: 'a => ((string, int, int, int), 'a) = "%loc_POS"
-
-/*** {1 Composition operators} */
-
-/** Reverse-application operator: [x |> f |> g] is exactly equivalent
- to [g (f (x))].
- Left-associative operator at precedence level 4/11.
-   @since 4.01
- */
-external \"|>": ('a, 'a => 'b) => 'b = "%revapply"
-
-/** Application operator: [g @@ f @@ x] is exactly equivalent to
- [g (f (x))].
- Right-associative operator at precedence level 5/11.
-   @since 4.01
-*/
-external \"@@": ('a => 'b, 'a) => 'b = "%apply"
-
-/*** {1 Integer arithmetic} */
-
-/*** Integers are 31 bits wide (or 63 bits on 64-bit processors).
-   All operations are taken modulo 2{^31} (or 2{^63}).
-   They do not fail on overflow. */
-
-/** Unary negation. You can also write [- e] instead of [~- e].
-    Unary operator at precedence level 9/11 for [- e]
-    and 11/11 for [~- e]. */
-external \"~-": int => int = "%negint"
-
-/** Unary addition. You can also write [+ e] instead of [~+ e].
-    Unary operator at precedence level 9/11 for [+ e]
-    and 11/11 for [~+ e].
-    @since 3.12.0
-*/
-external \"~+": int => int = "%identity"
-
-/** [succ x] is [x + 1]. */
-external succ: int => int = "%succint"
-
-/** [pred x] is [x - 1]. */
-external pred: int => int = "%predint"
-
-/** Integer addition.
-    Left-associative operator at precedence level 6/11. */
-external \"+": (int, int) => int = "%addint"
-
-/** Integer subtraction.
-    Left-associative operator at precedence level 6/11. */
-external \"-": (int, int) => int = "%subint"
-
-/** Integer multiplication.
-    Left-associative operator at precedence level 7/11. */
-external \"*": (int, int) => int = "%mulint"
-
-/** Integer division.
-   Raise [Division_by_zero] if the second argument is 0.
-   Integer division rounds the real quotient of its arguments towards zero.
-   More precisely, if [x >= 0] and [y > 0], [x / y] is the greatest integer
-   less than or equal to the real quotient of [x] by [y].  Moreover,
-   [(- x) / y = x / (- y) = - (x / y)].
-   Left-associative operator at precedence level 7/11. */
-external \"/": (int, int) => int = "%divint"
-
-/** Integer remainder.  If [y] is not zero, the result
-   of [x mod y] satisfies the following properties:
-   [x = (x / y) * y + x mod y] and
-   [abs(x mod y) <= abs(y) - 1].
-   If [y = 0], [x mod y] raises [Division_by_zero].
-   Note that [x mod y] is negative only if [x < 0].
-   Raise [Division_by_zero] if [y] is zero.
-   Left-associative operator at precedence level 7/11. */
-external mod: (int, int) => int = "%modint"
-
-/** Return the absolute value of the argument.  Note that this may be
-  negative if the argument is [min_int]. */
-let abs: int => int
-
-/** The greatest representable integer. */
-let max_int: int
-
-/** The smallest representable integer. */
-let min_int: int
-
-/*** {2 Bitwise operations} */
-
-/** Bitwise logical and.
-    Left-associative operator at precedence level 7/11. */
-external land: (int, int) => int = "%andint"
-
-/** Bitwise logical or.
-    Left-associative operator at precedence level 7/11. */
-external lor: (int, int) => int = "%orint"
-
-/** Bitwise logical exclusive or.
-    Left-associative operator at precedence level 7/11. */
-external lxor: (int, int) => int = "%xorint"
-
-/** Bitwise logical negation. */
-let lnot: int => int
-
-/** [n lsl m] shifts [n] to the left by [m] bits.
-   The result is unspecified if [m < 0] or [m >= bitsize],
-   where [bitsize] is [32] on a 32-bit platform and
-   [64] on a 64-bit platform.
-   Right-associative operator at precedence level 8/11. */
-external lsl: (int, int) => int = "%lslint"
-
-/** [n lsr m] shifts [n] to the right by [m] bits.
-   This is a logical shift: zeroes are inserted regardless of
-   the sign of [n].
-   The result is unspecified if [m < 0] or [m >= bitsize].
-   Right-associative operator at precedence level 8/11. */
-external lsr: (int, int) => int = "%lsrint"
-
-/** [n asr m] shifts [n] to the right by [m] bits.
-   This is an arithmetic shift: the sign bit of [n] is replicated.
-   The result is unspecified if [m < 0] or [m >= bitsize].
-   Right-associative operator at precedence level 8/11. */
-external asr: (int, int) => int = "%asrint"
-
-/*** {1 Floating-point arithmetic}
-
-   OCaml's floating-point numbers follow the
-   IEEE 754 standard, using double precision (64 bits) numbers.
-   Floating-point operations never raise an exception on overflow,
-   underflow, division by zero, etc.  Instead, special IEEE numbers
-   are returned as appropriate, such as [infinity] for [1.0 /. 0.0],
-   [neg_infinity] for [-1.0 /. 0.0], and [nan] ('not a number')
-   for [0.0 /. 0.0].  These special numbers then propagate through
-   floating-point computations as expected: for instance,
-   [1.0 /. infinity] is [0.0], and any arithmetic operation with [nan]
-   as argument returns [nan] as result.
-*/
-
-/** Unary negation. You can also write [-. e] instead of [~-. e].
-    Unary operator at precedence level 9/11 for [-. e]
-    and 11/11 for [~-. e]. */
-external \"~-.": float => float = "%negfloat"
-
-/** Unary addition. You can also write [+. e] instead of [~+. e].
-    Unary operator at precedence level 9/11 for [+. e]
-    and 11/11 for [~+. e].
-    @since 3.12.0
-*/
-external \"~+.": float => float = "%identity"
-
-/** Floating-point addition.
-    Left-associative operator at precedence level 6/11. */
-external \"+.": (float, float) => float = "%addfloat"
-
-/** Floating-point subtraction.
-    Left-associative operator at precedence level 6/11. */
-external \"-.": (float, float) => float = "%subfloat"
-
-/** Floating-point multiplication.
-    Left-associative operator at precedence level 7/11. */
-external \"*.": (float, float) => float = "%mulfloat"
-
-/** Floating-point division.
-    Left-associative operator at precedence level 7/11. */
-external \"/.": (float, float) => float = "%divfloat"
-
-@val @scope("Math") /** Exponentiation. */
-external \"**": (float, float) => float = "pow"
-
-@val @scope("Math") /** Square root. */
-external sqrt: float => float = "sqrt"
-
-@val @scope("Math") /** Exponential. */
-external exp: float => float = "exp"
-
-@val @scope("Math") /** Natural logarithm. */
-external log: float => float = "log"
-
-@val @scope("Math") /** Base 10 logarithm. */
-external log10: float => float = "log10"
-
-/** [expm1 x] computes [exp x -. 1.0], giving numerically-accurate results
-    even if [x] is close to [0.0].
-    @since 3.12.0
-*/
-external expm1: float => float = "?expm1_float"
-
-@val
-@scope("Math")
-/** [log1p x] computes [log(1.0 +. x)] (natural logarithm),
-    giving numerically-accurate results even if [x] is close to [0.0].
-    @since 3.12.0
-*/
-external log1p: float => float = "log1p"
-
-@val @scope("Math") /** Cosine.  Argument is in radians. */
-external cos: float => float = "cos"
-
-@val @scope("Math") /** Sine.  Argument is in radians. */
-external sin: float => float = "sin"
-
-@val @scope("Math") /** Tangent.  Argument is in radians. */
-external tan: float => float = "tan"
-
-@val
-@scope("Math")
-/** Arc cosine.  The argument must fall within the range [[-1.0, 1.0]].
-    Result is in radians and is between [0.0] and [pi]. */
-external acos: float => float = "acos"
-
-@val
-@scope("Math")
-/** Arc sine.  The argument must fall within the range [[-1.0, 1.0]].
-    Result is in radians and is between [-pi/2] and [pi/2]. */
-external asin: float => float = "asin"
-
-@val @scope("Math") /** Arc tangent.
-    Result is in radians and is between [-pi/2] and [pi/2]. */
-external atan: float => float = "atan"
-
-@val
-@scope("Math")
-/** [atan2 y x] returns the arc tangent of [y /. x].  The signs of [x]
-    and [y] are used to determine the quadrant of the result.
-    Result is in radians and is between [-pi] and [pi]. */
-external atan2: (float, float) => float = "atan2"
-
-/** [hypot x y] returns [sqrt(x *. x + y *. y)], that is, the length
-  of the hypotenuse of a right-angled triangle with sides of length
-  [x] and [y], or, equivalently, the distance of the point [(x,y)]
-  to origin.
-  @since 4.00.0  */
-external hypot: (float, float) => float = "?hypot_float"
-
-@val @scope("Math") /** Hyperbolic cosine.  Argument is in radians. */
-external cosh: float => float = "cosh"
-
-@val @scope("Math") /** Hyperbolic sine.  Argument is in radians. */
-external sinh: float => float = "sinh"
-
-@val @scope("Math") /** Hyperbolic tangent.  Argument is in radians. */
-external tanh: float => float = "tanh"
-
-@val
-@scope("Math")
-/** Round above to an integer value.
-    [ceil f] returns the least integer value greater than or equal to [f].
-    The result is returned as a float. */
-external ceil: float => float = "ceil"
-
-@val
-@scope("Math")
-/** Round below to an integer value.
-    [floor f] returns the greatest integer value less than or
-    equal to [f].
-    The result is returned as a float. */
-external floor: float => float = "floor"
-
-@val @scope("Math") /** [abs_float f] returns the absolute value of [f]. */
-external abs_float: float => float = "abs"
-
-/** [copysign x y] returns a float whose absolute value is that of [x]
-  and whose sign is that of [y].  If [x] is [nan], returns [nan].
-  If [y] is [nan], returns either [x] or [-. x], but it is not
-  specified which.
-  @since 4.00.0  */
-external copysign: (float, float) => float = "?copysign_float"
-
-/** [mod_float a b] returns the remainder of [a] with respect to
-   [b].  The returned value is [a -. n *. b], where [n]
-   is the quotient [a /. b] rounded towards zero to an integer. */
-external mod_float: (float, float) => float = "?fmod_float"
-
-/** [frexp f] returns the pair of the significant
-   and the exponent of [f].  When [f] is zero, the
-   significant [x] and the exponent [n] of [f] are equal to
-   zero.  When [f] is non-zero, they are defined by
-   [f = x *. 2 ** n] and [0.5 <= x < 1.0]. */
-external frexp: float => (float, int) = "?frexp_float"
-
-/** [ldexp x n] returns [x *. 2 ** n]. */
-external ldexp: (float, int) => float = "?ldexp_float"
-
-/** [modf f] returns the pair of the fractional and integral
-   part of [f]. */
-external modf: float => (float, float) = "?modf_float"
-
-/** Same as {!Pervasives.float_of_int}. */
-external float: int => float = "%floatofint"
-
-/** Convert an integer to floating-point. */
-external float_of_int: int => float = "%floatofint"
-
-/** Same as {!Pervasives.int_of_float}. */
-external truncate: float => int = "%intoffloat"
-
-/** Truncate the given floating-point number to an integer.
-   The result is unspecified if the argument is [nan] or falls outside the
-   range of representable integers. */
-external int_of_float: float => int = "%intoffloat"
-
-/** Positive infinity. */
-let infinity: float
-
-/** Negative infinity. */
-let neg_infinity: float
-
-@val
-@scope("Number")
-/** A special floating-point value denoting the result of an
-   undefined operation such as [0.0 /. 0.0].  Stands for
-   'not a number'.  Any floating-point operation with [nan] as
-   argument returns [nan] as result.  As for floating-point comparisons,
-   [=], [<], [<=], [>] and [>=] return [false] and [<>] returns [true]
-   if one or both of their arguments is [nan]. */
-external nan: float = "NaN"
-/* we could also use [0.  /. 0.] */
-
-/** The largest positive finite value of type [float]. */
-let max_float: float
-
-/** The smallest positive, non-zero, non-denormalized value of type [float]. */
-let min_float: float
-
-/** The difference between [1.0] and the smallest exactly representable
-    floating-point number greater than [1.0]. */
-let epsilon_float: float
-
-/** The five classes of floating-point numbers, as determined by
-   the {!Pervasives.classify_float} function. */
-type fpclass =
-  | /** Normal number, none of the below */ FP_normal
-  | /** Number very close to 0.0, has reduced precision */ FP_subnormal
-  | /** Number is 0.0 or -0.0 */ FP_zero
-  | /** Number is positive or negative infinity */ FP_infinite
-  | /** Not a number: result of an undefined operation */ FP_nan
-
-/** Return the class of the given floating-point number:
-   normal, subnormal, zero, infinite, or not a number. */
-let classify_float: float => fpclass
-
-/** {1 String operations}
-
-   More string operations are provided in module {!String}.
-*/
-/** String concatenation.
-    Right-associative operator at precedence level 5/11. */
-external \"^": (string, string) => string = "#string_append"
-
-/*** {1 Character operations}
-
-   More character operations are provided in module {!Char}.
-*/
-
-/** Return the ASCII code of the argument. */
-external int_of_char: char => int = "%identity"
-
-/** Return the character with the given ASCII code.
-   Raise [Invalid_argument "char_of_int"] if the argument is
-   outside the range 0--255. */
-let char_of_int: int => char
-
-/*** {1 Unit operations} */
-
-/** Discard the value of its argument and return [()].
-   For instance, [ignore(f x)] discards the result of
-   the side-effecting function [f].  It is equivalent to
-   [f x; ()], except that the latter may generate a
-   compiler warning; writing [ignore(f x)] instead
-   avoids the warning. */
-external ignore: 'a => unit = "%ignore"
-
-/*** {1 String conversion functions} */
-
-/** Return the string representation of a boolean. As the returned values
-   may be shared, the user should not modify them directly.
-*/
-let string_of_bool: bool => string
-
-/** Convert the given string to a boolean.
-   Raise [Invalid_argument "bool_of_string"] if the string is not
-   ["true"] or ["false"]. */
-let bool_of_string: string => bool
-
-/** Convert the given string to a boolean.
-    Return [None] if the string is not
-    ["true"] or ["false"].
-    @since 4.05
-*/
-let bool_of_string_opt: string => option<bool>
-
-@val /** Return the string representation of an integer, in decimal. */
-external string_of_int: int => string = "String"
-
-/** Convert the given string to an integer.
-   The string is read in decimal (by default, or if the string 
-   begins with [0u]), in hexadecimal (if it begins with [0x] or
-   [0X]), in octal (if it begins with [0o] or [0O]), or in binary
-   (if it begins with [0b] or [0B]).
-
-   The [0u] prefix reads the input as an unsigned integer in the range
-   [[0, 2*max_int+1]].  If the input exceeds {!max_int}
-   it is converted to the signed integer
-   [min_int + input - max_int - 1].
-
-   The [_] (underscore) character can appear anywhere in the string
-   and is ignored.
-   Raise [Failure "int_of_string"] if the given string is not
-   a valid representation of an integer, or if the integer represented
-   exceeds the range of integers representable in type [int]. */
-external int_of_string: string => int = "?int_of_string"
-
-/** Same as [int_of_string], but returns [None] instead of raising.
-    @since 4.05
-*/
-let int_of_string_opt: string => option<int>
-
-@deprecated("Please use Js.Float.toString instead, string_of_float generates unparseable floats")
-/** Return the string representation of a floating-point number. */
-let string_of_float: float => string
-
-/** Convert the given string to a float.  The string is read in decimal
-   (by default) or in hexadecimal (marked by [0x] or [0X]).
-   The format of decimal floating-point numbers is
-   [ [-] dd.ddd (e|E) [+|-] dd ], where [d] stands for a decimal digit.
-   The format of hexadecimal floating-point numbers is
-   [ [-] 0(x|X) hh.hhh (p|P) [+|-] dd ], where [h] stands for an
-   hexadecimal digit and [d] for a decimal digit.
-   In both cases, at least one of the integer and fractional parts must be
-   given; the exponent part is optional.
-   The [_] (underscore) character can appear anywhere in the string
-   and is ignored.
-   Depending on the execution platforms, other representations of
-   floating-point numbers can be accepted, but should not be relied upon.
-   Raise [Failure "float_of_string"] if the given string is not a valid
-   representation of a float. */
-external float_of_string: string => float = "?float_of_string"
-
-/** Same as [float_of_string], but returns [None] instead of raising.
-    @since 4.05
-*/
-let float_of_string_opt: string => option<float>
-
-/*** {1 Pair operations} */
-
-/** Return the first component of a pair. */
-external fst: (('a, 'b)) => 'a = "%field0"
-
-/** Return the second component of a pair. */
-external snd: (('a, 'b)) => 'b = "%field1"
-
-/*** {1 List operations}
-
-   More list operations are provided in module {!List}.
-*/
-
-@deprecated("Use Belt.List.concat instead")
-/** List concatenation.  Tail-recursive (length of the first argument).
-    Right-associative operator at precedence level 5/11. */
-let \"@": (list<'a>, list<'a>) => list<'a>
-
-type int32 = int
-
-/** Print a string on standard output. */
-let print_string: string => unit
-
-/** Print an integer, in decimal, on standard output. */
-let print_int: int => unit
-
-/** Print a floating-point number, in decimal, on standard output. */
-let print_float: float => unit
-
-/** Print a floating-point number, in decimal, on standard output. */
-@val
-@scope("console")
-/** Print a string, followed by a newline character, on
-   standard output and flush standard output. */
-external print_endline: string => unit = "log"
-
-/** Print a newline character on standard output, and flush
-   standard output. This can be used to simulate line
-   buffering of standard output. */
-let print_newline: unit => unit
-
-@val
-@scope("console")
-/** Print a string, followed by a newline character on standard
-   error and flush standard error. */
-external prerr_endline: string => unit = "error"
-
-/** Print a newline character on standard error, and flush
-   standard error. */
-let prerr_newline: unit => unit
-
-/*** {1 References} */
-
-/** The type of references (mutable indirection cells) containing
-   a value of type ['a]. */
-type ref<'a> = {mutable contents: 'a}
-
-/** Return a fresh reference containing the given value. */
-external ref: 'a => ref<'a> = "%makemutable"
-
-/** [!r] returns the current contents of reference [r].
-   Equivalent to [fun r -> r.contents].
-   Unary operator at precedence level 11/11.*/
-external \"!": ref<'a> => 'a = "%bs_ref_field0"
-
-/** [r := a] stores the value of [a] in reference [r].
-   Equivalent to [fun r v -> r.contents <- v].
-   Right-associative operator at precedence level 1/11. */
-external \":=": (ref<'a>, 'a) => unit = "%bs_ref_setfield0"
-
-/** Increment the integer contained in the given reference.
-   Equivalent to [fun r -> r := succ !r]. */
-external incr: ref<int> => unit = "%incr"
-
-/** Decrement the integer contained in the given reference.
-   Equivalent to [fun r -> r := pred !r]. */
-external decr: ref<int> => unit = "%decr"
-
-/*** {1 Program termination} */
-
-/** Terminate the process, returning the given status code
-   to the operating system: usually 0 to indicate no errors,
-   and a small positive integer to indicate failure.
-   All open output channels are flushed with [flush_all].
-   An implicit [exit 0] is performed each time a program
-   terminates normally.  An implicit [exit 2] is performed if the program
-   terminates early because of an uncaught exception. */
-let exit: int => 'a
-
-/** Register the given function to be called at program termination
-   time. The functions registered with [at_exit] will be called when
-   the program does any of the following:
-   - executes {!Pervasives.exit}
-   - terminates, either normally or because of an uncaught
-     exception
-   - executes the C function [caml_shutdown].
-   The functions are called in 'last in, first out' order: the
-   function most recently added with [at_exit] is called first. */
-let at_exit: (unit => unit) => unit
-
-let valid_float_lexem: string => string
diff --git a/jscomp/stdlib-406/queue.res b/jscomp/stdlib-406/queue.res
deleted file mode 100644
index 89d9297..0000000
--- a/jscomp/stdlib-406/queue.res
+++ /dev/null
@@ -1,142 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Francois Pottier, projet Cristal, INRIA Rocquencourt */
-/* Jeremie Dimino, Jane Street Europe */
-/*  */
-/* Copyright 2002 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-exception Empty
-
-type rec cell<'a> =
-  | Nil
-  | Cons({content: 'a, mutable next: cell<'a>})
-
-type t<'a> = {
-  mutable length: int,
-  mutable first: cell<'a>,
-  mutable last: cell<'a>,
-}
-
-let create = () => {
-  length: 0,
-  first: Nil,
-  last: Nil,
-}
-
-let clear = q => {
-  q.length = 0
-  q.first = Nil
-  q.last = Nil
-}
-
-let add = (x, q) => {
-  let cell = Cons({
-    content: x,
-    next: Nil,
-  })
-  switch q.last {
-  | Nil =>
-    q.length = 1
-    q.first = cell
-    q.last = cell
-  | Cons(last) =>
-    q.length = q.length + 1
-    last.next = cell
-    q.last = cell
-  }
-}
-
-let push = add
-
-let peek = q =>
-  switch q.first {
-  | Nil => raise(Empty)
-  | Cons({content}) => content
-  }
-
-let top = peek
-
-let take = q =>
-  switch q.first {
-  | Nil => raise(Empty)
-  | Cons({content, next: Nil}) =>
-    clear(q)
-    content
-  | Cons({content, next}) =>
-    q.length = q.length - 1
-    q.first = next
-    content
-  }
-
-let pop = take
-
-let copy = {
-  let rec copy = (q_res, prev, cell) =>
-    switch cell {
-    | Nil =>
-      q_res.last = prev
-      q_res
-    | Cons({content, next}) =>
-      let res = Cons({content, next: Nil})
-      switch prev {
-      | Nil => q_res.first = res
-      | Cons(p) => p.next = res
-      }
-      copy(q_res, res, next)
-    }
-
-  q => copy({length: q.length, first: Nil, last: Nil}, Nil, q.first)
-}
-
-let is_empty = q => q.length == 0
-
-let length = q => q.length
-
-let iter = {
-  let rec iter = (f, cell) =>
-    switch cell {
-    | Nil => ()
-    | Cons({content, next}) =>
-      f(content)
-      iter(f, next)
-    }
-
-  (f, q) => iter(f, q.first)
-}
-
-let fold = {
-  let rec fold = (f, accu, cell) =>
-    switch cell {
-    | Nil => accu
-    | Cons({content, next}) =>
-      let accu = f(accu, content)
-      fold(f, accu, next)
-    }
-
-  (f, accu, q) => fold(f, accu, q.first)
-}
-
-let transfer = (q1, q2) =>
-  if q1.length > 0 {
-    switch q2.last {
-    | Nil =>
-      q2.length = q1.length
-      q2.first = q1.first
-      q2.last = q1.last
-      clear(q1)
-    | Cons(last) =>
-      q2.length = q2.length + q1.length
-      last.next = q1.first
-      q2.last = q1.last
-      clear(q1)
-    }
-  }
diff --git a/jscomp/stdlib-406/queue.resi b/jscomp/stdlib-406/queue.resi
deleted file mode 100644
index c5ed5ae..0000000
--- a/jscomp/stdlib-406/queue.resi
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** First-in first-out queues.
-
-   This module implements queues (FIFOs), with in-place modification.
-
-   {b Warning} This module is not thread-safe: each {!Queue.t} value
-   must be protected from concurrent access (e.g. with a [Mutex.t]).
-   Failure to do so can lead to a crash.
-*/
-
-/** The type of queues containing elements of type ['a]. */
-type t<'a>
-
-/** Raised when {!Queue.take} or {!Queue.peek} is applied to an empty queue. */ exception Empty
-
-/** Return a new queue, initially empty. */
-let create: unit => t<'a>
-
-/** [add x q] adds the element [x] at the end of the queue [q]. */
-let add: ('a, t<'a>) => unit
-
-/** [push] is a synonym for [add]. */
-let push: ('a, t<'a>) => unit
-
-/** [take q] removes and returns the first element in queue [q],
-   or raises {!Empty} if the queue is empty. */
-let take: t<'a> => 'a
-
-/** [pop] is a synonym for [take]. */
-let pop: t<'a> => 'a
-
-/** [peek q] returns the first element in queue [q], without removing
-   it from the queue, or raises {!Empty} if the queue is empty. */
-let peek: t<'a> => 'a
-
-/** [top] is a synonym for [peek]. */
-let top: t<'a> => 'a
-
-/** Discard all elements from a queue. */
-let clear: t<'a> => unit
-
-/** Return a copy of the given queue. */
-let copy: t<'a> => t<'a>
-
-/** Return [true] if the given queue is empty, [false] otherwise. */
-let is_empty: t<'a> => bool
-
-/** Return the number of elements in a queue. */
-let length: t<'a> => int
-
-/** [iter f q] applies [f] in turn to all elements of [q],
-   from the least recently entered to the most recently entered.
-   The queue itself is unchanged. */
-let iter: ('a => unit, t<'a>) => unit
-
-/** [fold f accu q] is equivalent to [List.fold_left f accu l],
-   where [l] is the list of [q]'s elements. The queue remains
-   unchanged. */
-let fold: (('b, 'a) => 'b, 'b, t<'a>) => 'b
-
-/** [transfer q1 q2] adds all of [q1]'s elements at the end of
-   the queue [q2], then clears [q1]. It is equivalent to the
-   sequence [iter (fun x -> add x q2) q1; clear q1], but runs
-   in constant time. */
-let transfer: (t<'a>, t<'a>) => unit
diff --git a/jscomp/stdlib-406/random.res b/jscomp/stdlib-406/random.res
deleted file mode 100644
index 11b4e42..0000000
--- a/jscomp/stdlib-406/random.res
+++ /dev/null
@@ -1,336 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Damien Doligez, projet Para, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Pseudo-random number generator
-   This is a lagged-Fibonacci F(55, 24, +) with a modified addition
-   function to enhance the mixing of bits.
-   If we use normal addition, the low-order bit fails tests 1 and 7
-   of the Diehard test suite, and bits 1 and 2 also fail test 7.
-   If we use multiplication as suggested by Marsaglia, it doesn't fare
-   much better.
-   By mixing the bits of one of the numbers before addition (XOR the
-   5 high-order bits into the low-order bits), we get a generator that
-   passes all the Diehard tests.
-*/
-
-let random_seed: unit => array<int> = _ => {
-  let seed: int = %raw("Math.floor(Math.random()*0x7fffffff)")
-  [seed]
-}
-
-module State = {
-  type t = {st: array<int>, mutable idx: int}
-
-  let new_state = () => {st: Array.make(55, 0), idx: 0}
-  let assign = (st1, st2) => {
-    Array.blit(st2.st, 0, st1.st, 0, 55)
-    st1.idx = st2.idx
-  }
-
-  let full_init = (s, seed) => {
-    let combine = (accu, x) => Digest.string(accu ++ string_of_int(x))
-    let extract = d =>
-      Char.code(String.get(d, 0)) +
-      lsl(Char.code(String.get(d, 1)), 8) +
-      lsl(Char.code(String.get(d, 2)), 16) +
-      lsl(Char.code(String.get(d, 3)), 24)
-
-    let seed = if Array.length(seed) == 0 {
-      [0]
-    } else {
-      seed
-    }
-    let l = Array.length(seed)
-    for i in 0 to 54 {
-      s.st[i] = i
-    }
-    let accu = ref("x")
-    for i in 0 to 54 + max(55, l) {
-      let j = mod(i, 55)
-      let k = mod(i, l)
-      accu := combine(accu.contents, seed[k])
-      s.st[j] = land(lxor(s.st[j], extract(accu.contents)), 0x3FFFFFFF) /* PR#5575 */
-    }
-    s.idx = 0
-  }
-
-  let make = seed => {
-    let result = new_state()
-    full_init(result, seed)
-    result
-  }
-
-  let make_self_init = () => make(random_seed())
-
-  let copy = s => {
-    let result = new_state()
-    assign(result, s)
-    result
-  }
-
-  /* Returns 30 random bits as an integer 0 <= x < 1073741824 */
-  let bits = s => {
-    s.idx = mod(s.idx + 1, 55)
-    let curval = s.st[s.idx]
-    let newval = s.st[mod(s.idx + 24, 55)] + lxor(curval, land(lsr(curval, 25), 0x1F))
-    let newval30 = land(newval, 0x3FFFFFFF) /* PR#5575 */
-    s.st[s.idx] = newval30
-    newval30
-  }
-
-  let rec intaux = (s, n) => {
-    let r = bits(s)
-    let v = mod(r, n)
-    if r - v > 0x3FFFFFFF - n + 1 {
-      intaux(s, n)
-    } else {
-      v
-    }
-  }
-
-  let int = (s, bound) =>
-    if bound > 0x3FFFFFFF || bound <= 0 {
-      invalid_arg("Random.int")
-    } else {
-      intaux(s, bound)
-    }
-
-  let rec int32aux = (s, n) => {
-    let b1 = Int32.of_int(bits(s))
-    let b2 = Int32.shift_left(Int32.of_int(land(bits(s), 1)), 30)
-    let r = Int32.logor(b1, b2)
-    let v = Int32.rem(r, n)
-    if Int32.sub(r, v) > Int32.add(Int32.sub(Int32.max_int, n), 1l) {
-      int32aux(s, n)
-    } else {
-      v
-    }
-  }
-
-  let int32 = (s, bound) =>
-    if bound <= 0l {
-      invalid_arg("Random.int32")
-    } else {
-      int32aux(s, bound)
-    }
-
-  let rec int64aux = (s, n) => {
-    let b1 = Int64.of_int(bits(s))
-    let b2 = Int64.shift_left(Int64.of_int(bits(s)), 30)
-    let b3 = Int64.shift_left(Int64.of_int(land(bits(s), 7)), 60)
-    let r = Int64.logor(b1, Int64.logor(b2, b3))
-    let v = Int64.rem(r, n)
-    if Int64.sub(r, v) > Int64.add(Int64.sub(Int64.max_int, n), 1L) {
-      int64aux(s, n)
-    } else {
-      v
-    }
-  }
-
-  let int64 = (s, bound) =>
-    if bound <= 0L {
-      invalid_arg("Random.int64")
-    } else {
-      int64aux(s, bound)
-    }
-
-  /* Returns a float 0 <= x <= 1 with at most 60 bits of precision. */
-  let rawfloat = s => {
-    let scale = 1073741824.0 /* 2^30 */
-    and r1 = Pervasives.float(bits(s))
-    and r2 = Pervasives.float(bits(s))
-    (r1 /. scale +. r2) /. scale
-  }
-
-  let float = (s, bound) => rawfloat(s) *. bound
-
-  let bool = s => land(bits(s), 1) == 0
-}
-
-/* This is the state you get with [init 27182818] and then applying
- the "land 0x3FFFFFFF" filter to them.  See #5575, #5793, #5977. */
-let default = {
-  State.st: [
-    0x3ae2522b,
-    0x1d8d4634,
-    0x15b4fad0,
-    0x18b14ace,
-    0x12f8a3c4,
-    0x3b086c47,
-    0x16d467d6,
-    0x101d91c7,
-    0x321df177,
-    0x0176c193,
-    0x1ff72bf1,
-    0x1e889109,
-    0x0b464b18,
-    0x2b86b97c,
-    0x0891da48,
-    0x03137463,
-    0x085ac5a1,
-    0x15d61f2f,
-    0x3bced359,
-    0x29c1c132,
-    0x3a86766e,
-    0x366d8c86,
-    0x1f5b6222,
-    0x3ce1b59f,
-    0x2ebf78e1,
-    0x27cd1b86,
-    0x258f3dc3,
-    0x389a8194,
-    0x02e4c44c,
-    0x18c43f7d,
-    0x0f6e534f,
-    0x1e7df359,
-    0x055d0b7e,
-    0x10e84e7e,
-    0x126198e4,
-    0x0e7722cb,
-    0x1cbede28,
-    0x3391b964,
-    0x3d40e92a,
-    0x0c59933d,
-    0x0b8cd0b7,
-    0x24efff1c,
-    0x2803fdaa,
-    0x08ebc72e,
-    0x0f522e32,
-    0x05398edc,
-    0x2144a04c,
-    0x0aef3cbd,
-    0x01ad4719,
-    0x35b93cd6,
-    0x2a559d4f,
-    0x1e6fd768,
-    0x26e27f36,
-    0x186f18c3,
-    0x2fbf967a,
-  ],
-  State.idx: 0,
-}
-
-let bits = () => State.bits(default)
-let int = bound => State.int(default, bound)
-let int32 = bound => State.int32(default, bound)
-
-let int64 = bound => State.int64(default, bound)
-let float = scale => State.float(default, scale)
-let bool = () => State.bool(default)
-
-let full_init = seed => State.full_init(default, seed)
-let init = seed => State.full_init(default, [seed])
-let self_init = () => full_init(random_seed())
-
-/* Manipulating the current state. */
-
-let get_state = () => State.copy(default)
-let set_state = s => State.assign(default, s)
-
-/* *******************
-
-(* Test functions.  Not included in the library.
-   The [chisquare] function should be called with n > 10r.
-   It returns a triple (low, actual, high).
-   If low <= actual <= high, the [g] function passed the test,
-   otherwise it failed.
-
-  Some results:
-
-init 27182818; chisquare int 100000 1000
-init 27182818; chisquare int 100000 100
-init 27182818; chisquare int 100000 5000
-init 27182818; chisquare int 1000000 1000
-init 27182818; chisquare int 100000 1024
-init 299792643; chisquare int 100000 1024
-init 14142136; chisquare int 100000 1024
-init 27182818; init_diff 1024; chisquare diff 100000 1024
-init 27182818; init_diff 100; chisquare diff 100000 100
-init 27182818; init_diff2 1024; chisquare diff2 100000 1024
-init 27182818; init_diff2 100; chisquare diff2 100000 100
-init 14142136; init_diff2 100; chisquare diff2 100000 100
-init 299792643; init_diff2 100; chisquare diff2 100000 100
-- : float * float * float = (936.754446796632465, 997.5, 1063.24555320336754)
-# - : float * float * float = (80., 89.7400000000052387, 120.)
-# - : float * float * float = (4858.57864376269, 5045.5, 5141.42135623731)
-# - : float * float * float =
-(936.754446796632465, 944.805999999982305, 1063.24555320336754)
-# - : float * float * float = (960., 1019.19744000000355, 1088.)
-# - : float * float * float = (960., 1059.31776000000536, 1088.)
-# - : float * float * float = (960., 1039.98463999999512, 1088.)
-# - : float * float * float = (960., 1054.38207999999577, 1088.)
-# - : float * float * float = (80., 90.096000000005, 120.)
-# - : float * float * float = (960., 1076.78720000000612, 1088.)
-# - : float * float * float = (80., 85.1760000000067521, 120.)
-# - : float * float * float = (80., 85.2160000000003492, 120.)
-# - : float * float * float = (80., 80.6220000000030268, 120.)
-
-*)
-
-(* Return the sum of the squares of v[i0,i1[ *)
-let rec sumsq v i0 i1 =
-  if i0 >= i1 then 0.0
-  else if i1 = i0 + 1 then Pervasives.float v.(i0) *. Pervasives.float v.(i0)
-  else sumsq v i0 ((i0+i1)/2) +. sumsq v ((i0+i1)/2) i1
-
-
-let chisquare g n r =
-  if n <= 10 * r then invalid_arg "chisquare";
-  let f = Array.make r 0 in
-  for i = 1 to n do
-    let t = g r in
-    f.(t) <- f.(t) + 1
-  done;
-  let t = sumsq f 0 r
-  and r = Pervasives.float r
-  and n = Pervasives.float n in
-  let sr = 2.0 *. sqrt r in
-  (r -. sr,   (r *. t /. n) -. n,   r +. sr)
-
-
-(* This is to test for linear dependencies between successive random numbers.
-*)
-let st = ref 0
-let init_diff r = st := int r
-let diff r =
-  let x1 = !st
-  and x2 = int r
-  in
-  st := x2;
-  if x1 >= x2 then
-    x1 - x2
-  else
-    r + x1 - x2
-
-
-let st1 = ref 0
-and st2 = ref 0
-
-
-(* This is to test for quadratic dependencies between successive random
-   numbers.
-*)
-let init_diff2 r = st1 := int r; st2 := int r
-let diff2 r =
-  let x1 = !st1
-  and x2 = !st2
-  and x3 = int r
-  in
-  st1 := x2;
-  st2 := x3;
-  (x3 - x2 - x2 + x1 + 2*r) mod r
-
-
-********************/
diff --git a/jscomp/stdlib-406/random.resi b/jscomp/stdlib-406/random.resi
deleted file mode 100644
index 05624c9..0000000
--- a/jscomp/stdlib-406/random.resi
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Damien Doligez, projet Para, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Pseudo-random number generators (PRNG). */
-
-/* {1 Basic functions} */
-
-/** Initialize the generator, using the argument as a seed.
-     The same seed will always yield the same sequence of numbers. */
-let init: int => unit
-
-/** Same as {!Random.init} but takes more data as seed. */
-let full_init: array<int> => unit
-
-/** Initialize the generator with a random seed chosen
-   in a system-dependent way.  If [/dev/urandom] is available on
-   the host machine, it is used to provide a highly random initial
-   seed.  Otherwise, a less random seed is computed from system
-   parameters (current time, process IDs). */
-let self_init: unit => unit
-
-/** Return 30 random bits in a nonnegative integer.
-    @before 3.12.0 used a different algorithm (affects all the following
-                   functions)
-*/
-let bits: unit => int
-
-/** [Random.int bound] returns a random integer between 0 (inclusive)
-     and [bound] (exclusive).  [bound] must be greater than 0 and less
-     than 2{^30}. */
-let int: int => int
-
-/** [Random.int32 bound] returns a random integer between 0 (inclusive)
-     and [bound] (exclusive).  [bound] must be greater than 0. */
-let int32: Int32.t => Int32.t
-
-/** [Random.int64 bound] returns a random integer between 0 (inclusive)
-     and [bound] (exclusive).  [bound] must be greater than 0. */
-let int64: Int64.t => Int64.t
-
-/** [Random.float bound] returns a random floating-point number
-   between 0 and [bound] (inclusive).  If [bound] is
-   negative, the result is negative or zero.  If [bound] is 0,
-   the result is 0. */
-let float: float => float
-
-/** [Random.bool ()] returns [true] or [false] with probability 0.5 each. */
-let bool: unit => bool
-
-/* {1 Advanced functions} */
-
-module State: {
-  /*** The functions from module {!State} manipulate the current state
-    of the random generator explicitly.
-    This allows using one or several deterministic PRNGs,
-    even in a multi-threaded program, without interference from
-    other parts of the program.
-  */
-
-  /** The type of PRNG states. */
-  type t
-
-  /** Create a new state and initialize it with the given seed. */
-  let make: array<int> => t
-
-  /** Create a new state and initialize it with a system-dependent
-      low-entropy seed. */
-  let make_self_init: unit => t
-
-  /** Return a copy of the given state. */
-  let copy: t => t
-
-  let bits: t => int
-  let int: (t, int) => int
-  let int32: (t, Int32.t) => Int32.t
-  let int64: (t, Int64.t) => Int64.t
-  let float: (t, float) => float
-  /** These functions are the same as the basic functions, except that they
-      use (and update) the given PRNG state instead of the default one.
-  */
-  let bool: t => bool
-}
-
-/** Return the current state of the generator used by the basic functions. */
-let get_state: unit => State.t
-
-/** Set the state of the generator used by the basic functions. */
-let set_state: State.t => unit
diff --git a/jscomp/stdlib-406/release.ninja b/jscomp/stdlib-406/release.ninja
deleted file mode 100644
index 992f90f..0000000
--- a/jscomp/stdlib-406/release.ninja
+++ /dev/null
@@ -1,92 +0,0 @@
-
-bsc_flags = -no-keep-locs -no-alias-deps -bs-no-version-header -bs-no-check-div-by-zero -nostdlib  -bs-cross-module-opt -make-runtime -w -9-3-106 -warn-error A -I others
-
-rule cc
-    command = $bsc -bs-cmi -bs-cmj $bsc_flags   -I stdlib-406  $in
-    description = $in -> $out
-rule cc_cmi
-    command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags  -I stdlib-406  $in
-    description = $in -> $out    
-
-o stdlib-406/pervasives.cmj : cc_cmi stdlib-406/pervasives.res | stdlib-406/pervasives.cmi $bsc others
-    bsc_flags = $bsc_flags -nopervasives
-o stdlib-406/pervasives.cmi : cc stdlib-406/pervasives.resi | $bsc others
-    bsc_flags = $bsc_flags -nopervasives
-o stdlib-406/arg.cmj : cc_cmi stdlib-406/arg.res | stdlib-406/arg.cmi stdlib-406/array.cmj stdlib-406/buffer.cmj stdlib-406/list.cmj stdlib-406/string.cmj stdlib-406/sys.cmj $bsc others
-o stdlib-406/arg.cmi : cc stdlib-406/arg.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/array.cmj : cc_cmi stdlib-406/array.res | stdlib-406/array.cmi $bsc others
-o stdlib-406/array.cmi : cc stdlib-406/array.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/arrayLabels.cmj : cc_cmi stdlib-406/arrayLabels.res | stdlib-406/arrayLabels.cmi $bsc others
-o stdlib-406/arrayLabels.cmi : cc stdlib-406/arrayLabels.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/buffer.cmj : cc_cmi stdlib-406/buffer.res | stdlib-406/buffer.cmi stdlib-406/bytes.cmj stdlib-406/char.cmj stdlib-406/string.cmj stdlib-406/uchar.cmj $bsc others
-o stdlib-406/buffer.cmi : cc stdlib-406/buffer.resi | stdlib-406/pervasives.cmj stdlib-406/uchar.cmi $bsc others
-o stdlib-406/bytes.cmj : cc_cmi stdlib-406/bytes.res | stdlib-406/bytes.cmi stdlib-406/char.cmj $bsc others
-o stdlib-406/bytes.cmi : cc stdlib-406/bytes.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/bytesLabels.cmj : cc_cmi stdlib-406/bytesLabels.res | stdlib-406/bytesLabels.cmi stdlib-406/char.cmj $bsc others
-o stdlib-406/bytesLabels.cmi : cc stdlib-406/bytesLabels.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/callback.cmj : cc_cmi stdlib-406/callback.res | stdlib-406/callback.cmi $bsc others
-o stdlib-406/callback.cmi : cc stdlib-406/callback.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/camlinternalLazy.cmj : cc_cmi stdlib-406/camlinternalLazy.res | stdlib-406/camlinternalLazy.cmi $bsc others
-o stdlib-406/camlinternalLazy.cmi : cc stdlib-406/camlinternalLazy.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/camlinternalMod.cmj : cc_cmi stdlib-406/camlinternalMod.res | stdlib-406/camlinternalMod.cmi stdlib-406/obj.cmj $bsc others
-o stdlib-406/camlinternalMod.cmi : cc stdlib-406/camlinternalMod.resi | stdlib-406/obj.cmi stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/char.cmj : cc_cmi stdlib-406/char.res | stdlib-406/char.cmi $bsc others
-o stdlib-406/char.cmi : cc stdlib-406/char.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/complex.cmj : cc_cmi stdlib-406/complex.res | stdlib-406/complex.cmi $bsc others
-o stdlib-406/complex.cmi : cc stdlib-406/complex.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/digest.cmj : cc_cmi stdlib-406/digest.res | stdlib-406/bytes.cmj stdlib-406/char.cmj stdlib-406/digest.cmi stdlib-406/string.cmj $bsc others
-o stdlib-406/digest.cmi : cc stdlib-406/digest.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/filename.cmj : cc_cmi stdlib-406/filename.res | stdlib-406/buffer.cmj stdlib-406/filename.cmi stdlib-406/string.cmj stdlib-406/sys.cmj $bsc others
-o stdlib-406/filename.cmi : cc stdlib-406/filename.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/genlex.cmj : cc_cmi stdlib-406/genlex.res | stdlib-406/bytes.cmj stdlib-406/char.cmj stdlib-406/genlex.cmi stdlib-406/hashtbl.cmj stdlib-406/list.cmj stdlib-406/stream.cmj stdlib-406/string.cmj $bsc others
-o stdlib-406/genlex.cmi : cc stdlib-406/genlex.resi | stdlib-406/pervasives.cmj stdlib-406/stream.cmi $bsc others
-o stdlib-406/hashtbl.cmj : cc_cmi stdlib-406/hashtbl.res | stdlib-406/array.cmj stdlib-406/hashtbl.cmi stdlib-406/lazy.cmj stdlib-406/random.cmj $bsc others
-o stdlib-406/hashtbl.cmi : cc stdlib-406/hashtbl.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/hashtblLabels.cmi stdlib-406/hashtblLabels.cmj : cc stdlib-406/hashtblLabels.res | stdlib-406/hashtbl.cmj stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/int32.cmj : cc_cmi stdlib-406/int32.res | stdlib-406/int32.cmi $bsc others
-o stdlib-406/int32.cmi : cc stdlib-406/int32.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/int64.cmj : cc_cmi stdlib-406/int64.res | stdlib-406/int64.cmi $bsc others
-o stdlib-406/int64.cmi : cc stdlib-406/int64.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/lazy.cmj : cc_cmi stdlib-406/lazy.res | stdlib-406/camlinternalLazy.cmj stdlib-406/lazy.cmi $bsc others
-o stdlib-406/lazy.cmi : cc stdlib-406/lazy.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/lexing.cmj : cc_cmi stdlib-406/lexing.res | stdlib-406/array.cmj stdlib-406/bytes.cmj stdlib-406/lexing.cmi stdlib-406/string.cmj $bsc others
-o stdlib-406/lexing.cmi : cc stdlib-406/lexing.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/list.cmj : cc_cmi stdlib-406/list.res | stdlib-406/list.cmi $bsc others
-o stdlib-406/list.cmi : cc stdlib-406/list.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/listLabels.cmj : cc_cmi stdlib-406/listLabels.res | stdlib-406/listLabels.cmi $bsc others
-o stdlib-406/listLabels.cmi : cc stdlib-406/listLabels.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/map.cmj : cc_cmi stdlib-406/map.res | stdlib-406/map.cmi $bsc others
-o stdlib-406/map.cmi : cc stdlib-406/map.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/mapLabels.cmi stdlib-406/mapLabels.cmj : cc stdlib-406/mapLabels.res | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/moreLabels.cmj : cc_cmi stdlib-406/moreLabels.res | stdlib-406/hashtblLabels.cmj stdlib-406/mapLabels.cmj stdlib-406/moreLabels.cmi stdlib-406/setLabels.cmj $bsc others
-o stdlib-406/moreLabels.cmi : cc stdlib-406/moreLabels.resi | stdlib-406/hashtbl.cmi stdlib-406/map.cmi stdlib-406/pervasives.cmj stdlib-406/set.cmi $bsc others
-o stdlib-406/obj.cmj : cc_cmi stdlib-406/obj.res | stdlib-406/obj.cmi $bsc others
-o stdlib-406/obj.cmi : cc stdlib-406/obj.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/parsing.cmj : cc_cmi stdlib-406/parsing.res | stdlib-406/array.cmj stdlib-406/lexing.cmj stdlib-406/obj.cmj stdlib-406/parsing.cmi $bsc others
-o stdlib-406/parsing.cmi : cc stdlib-406/parsing.resi | stdlib-406/lexing.cmi stdlib-406/obj.cmi stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/pervasivesU.cmj : cc_cmi stdlib-406/pervasivesU.res | stdlib-406/pervasivesU.cmi $bsc others
-o stdlib-406/pervasivesU.cmi : cc stdlib-406/pervasivesU.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/queue.cmj : cc_cmi stdlib-406/queue.res | stdlib-406/queue.cmi $bsc others
-o stdlib-406/queue.cmi : cc stdlib-406/queue.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/random.cmj : cc_cmi stdlib-406/random.res | stdlib-406/array.cmj stdlib-406/char.cmj stdlib-406/digest.cmj stdlib-406/int32.cmj stdlib-406/int64.cmj stdlib-406/random.cmi stdlib-406/string.cmj $bsc others
-o stdlib-406/random.cmi : cc stdlib-406/random.resi | stdlib-406/int32.cmi stdlib-406/int64.cmi stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/set.cmj : cc_cmi stdlib-406/set.res | stdlib-406/list.cmj stdlib-406/set.cmi $bsc others
-o stdlib-406/set.cmi : cc stdlib-406/set.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/setLabels.cmi stdlib-406/setLabels.cmj : cc stdlib-406/setLabels.res | stdlib-406/list.cmj stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/sort.cmj : cc_cmi stdlib-406/sort.res | stdlib-406/array.cmj stdlib-406/sort.cmi $bsc others
-o stdlib-406/sort.cmi : cc stdlib-406/sort.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/stack.cmj : cc_cmi stdlib-406/stack.res | stdlib-406/list.cmj stdlib-406/stack.cmi $bsc others
-o stdlib-406/stack.cmi : cc stdlib-406/stack.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/stdLabels.cmj : cc_cmi stdlib-406/stdLabels.res | stdlib-406/arrayLabels.cmj stdlib-406/bytesLabels.cmj stdlib-406/listLabels.cmj stdlib-406/stdLabels.cmi stdlib-406/stringLabels.cmj $bsc others
-o stdlib-406/stdLabels.cmi : cc stdlib-406/stdLabels.resi | stdlib-406/arrayLabels.cmi stdlib-406/bytesLabels.cmi stdlib-406/listLabels.cmi stdlib-406/pervasives.cmj stdlib-406/stringLabels.cmi $bsc others
-o stdlib-406/stream.cmj : cc_cmi stdlib-406/stream.res | stdlib-406/bytes.cmj stdlib-406/lazy.cmj stdlib-406/list.cmj stdlib-406/stream.cmi stdlib-406/string.cmj $bsc others
-o stdlib-406/stream.cmi : cc stdlib-406/stream.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/string.cmj : cc_cmi stdlib-406/string.res | stdlib-406/array.cmj stdlib-406/bytes.cmj stdlib-406/string.cmi $bsc others
-o stdlib-406/string.cmi : cc stdlib-406/string.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/stringLabels.cmj : cc_cmi stdlib-406/stringLabels.res | stdlib-406/array.cmj stdlib-406/bytes.cmj stdlib-406/stringLabels.cmi $bsc others
-o stdlib-406/stringLabels.cmi : cc stdlib-406/stringLabels.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/sys.cmj : cc_cmi stdlib-406/sys.res | stdlib-406/sys.cmi $bsc others
-o stdlib-406/sys.cmi : cc stdlib-406/sys.resi | stdlib-406/pervasives.cmj $bsc others
-o stdlib-406/uchar.cmj : cc_cmi stdlib-406/uchar.res | stdlib-406/char.cmj stdlib-406/uchar.cmi $bsc others
-o stdlib-406/uchar.cmi : cc stdlib-406/uchar.resi | stdlib-406/pervasives.cmj $bsc others
-o $stdlib : phony stdlib-406/pervasives.cmi stdlib-406/pervasives.cmj stdlib-406/arg.cmi stdlib-406/arg.cmj stdlib-406/array.cmi stdlib-406/array.cmj stdlib-406/arrayLabels.cmi stdlib-406/arrayLabels.cmj stdlib-406/buffer.cmi stdlib-406/buffer.cmj stdlib-406/bytes.cmi stdlib-406/bytes.cmj stdlib-406/bytesLabels.cmi stdlib-406/bytesLabels.cmj stdlib-406/callback.cmi stdlib-406/callback.cmj stdlib-406/camlinternalLazy.cmi stdlib-406/camlinternalLazy.cmj stdlib-406/camlinternalMod.cmi stdlib-406/camlinternalMod.cmj stdlib-406/char.cmi stdlib-406/char.cmj stdlib-406/complex.cmi stdlib-406/complex.cmj stdlib-406/digest.cmi stdlib-406/digest.cmj stdlib-406/filename.cmi stdlib-406/filename.cmj stdlib-406/genlex.cmi stdlib-406/genlex.cmj stdlib-406/hashtbl.cmi stdlib-406/hashtbl.cmj stdlib-406/hashtblLabels.cmi stdlib-406/hashtblLabels.cmj stdlib-406/int32.cmi stdlib-406/int32.cmj stdlib-406/int64.cmi stdlib-406/int64.cmj stdlib-406/lazy.cmi stdlib-406/lazy.cmj stdlib-406/lexing.cmi stdlib-406/lexing.cmj stdlib-406/list.cmi stdlib-406/list.cmj stdlib-406/listLabels.cmi stdlib-406/listLabels.cmj stdlib-406/map.cmi stdlib-406/map.cmj stdlib-406/mapLabels.cmi stdlib-406/mapLabels.cmj stdlib-406/moreLabels.cmi stdlib-406/moreLabels.cmj stdlib-406/obj.cmi stdlib-406/obj.cmj stdlib-406/parsing.cmi stdlib-406/parsing.cmj stdlib-406/pervasivesU.cmi stdlib-406/pervasivesU.cmj stdlib-406/queue.cmi stdlib-406/queue.cmj stdlib-406/random.cmi stdlib-406/random.cmj stdlib-406/set.cmi stdlib-406/set.cmj stdlib-406/setLabels.cmi stdlib-406/setLabels.cmj stdlib-406/sort.cmi stdlib-406/sort.cmj stdlib-406/stack.cmi stdlib-406/stack.cmj stdlib-406/stdLabels.cmi stdlib-406/stdLabels.cmj stdlib-406/stream.cmi stdlib-406/stream.cmj stdlib-406/string.cmi stdlib-406/string.cmj stdlib-406/stringLabels.cmi stdlib-406/stringLabels.cmj stdlib-406/sys.cmi stdlib-406/sys.cmj stdlib-406/uchar.cmi stdlib-406/uchar.cmj
diff --git a/jscomp/stdlib-406/set.res b/jscomp/stdlib-406/set.res
deleted file mode 100644
index 49d30ed..0000000
--- a/jscomp/stdlib-406/set.res
+++ /dev/null
@@ -1,711 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Sets over ordered types */
-
-module type OrderedType = {
-  type t
-  let compare: (t, t) => int
-}
-
-module type S = {
-  type elt
-  type t
-  let empty: t
-  let is_empty: t => bool
-  let mem: (elt, t) => bool
-  let add: (elt, t) => t
-  let singleton: elt => t
-  let remove: (elt, t) => t
-  let union: (t, t) => t
-  let inter: (t, t) => t
-  let diff: (t, t) => t
-  let compare: (t, t) => int
-  let equal: (t, t) => bool
-  let subset: (t, t) => bool
-  let iter: (elt => unit, t) => unit
-  let map: (elt => elt, t) => t
-  let fold: ((elt, 'a) => 'a, t, 'a) => 'a
-  let for_all: (elt => bool, t) => bool
-  let exists: (elt => bool, t) => bool
-  let filter: (elt => bool, t) => t
-  let partition: (elt => bool, t) => (t, t)
-  let cardinal: t => int
-  let elements: t => list<elt>
-  let min_elt: t => elt
-  let min_elt_opt: t => option<elt>
-  let max_elt: t => elt
-  let max_elt_opt: t => option<elt>
-  let choose: t => elt
-  let choose_opt: t => option<elt>
-  let split: (elt, t) => (t, bool, t)
-  let find: (elt, t) => elt
-  let find_opt: (elt, t) => option<elt>
-  let find_first: (elt => bool, t) => elt
-  let find_first_opt: (elt => bool, t) => option<elt>
-  let find_last: (elt => bool, t) => elt
-  let find_last_opt: (elt => bool, t) => option<elt>
-  let of_list: list<elt> => t
-}
-
-module Make = (Ord: OrderedType) => {
-  type elt = Ord.t
-  type rec t = Empty | Node({l: t, v: elt, r: t, h: int})
-
-  /* Sets are represented by balanced binary trees (the heights of the
-   children differ by at most 2 */
-
-  let height = param =>
-    switch param {
-    | Empty => 0
-    | Node({h}) => h
-    }
-
-  /* Creates a new node with left son l, value v and right son r.
-       We must have all elements of l < v < all elements of r.
-       l and r must be balanced and | height l - height r | <= 2.
-       Inline expansion of height for better speed. */
-
-  let create = (l, v, r) => {
-    let hl = switch l {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    let hr = switch r {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    Node({
-      l,
-      v,
-      r,
-      h: if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    })
-  }
-
-  /* Same as create, but performs one step of rebalancing if necessary.
-       Assumes l and r balanced and | height l - height r | <= 3.
-       Inline expansion of create for better speed in the most frequent case
-       where no rebalancing is required. */
-
-  let bal = (l, v, r) => {
-    let hl = switch l {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    let hr = switch r {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    if hl > hr + 2 {
-      switch l {
-      | Empty => invalid_arg("Set.bal")
-      | Node({l: ll, v: lv, r: lr}) =>
-        if height(ll) >= height(lr) {
-          create(ll, lv, create(lr, v, r))
-        } else {
-          switch lr {
-          | Empty => invalid_arg("Set.bal")
-          | Node({l: lrl, v: lrv, r: lrr}) => create(create(ll, lv, lrl), lrv, create(lrr, v, r))
-          }
-        }
-      }
-    } else if hr > hl + 2 {
-      switch r {
-      | Empty => invalid_arg("Set.bal")
-      | Node({l: rl, v: rv, r: rr}) =>
-        if height(rr) >= height(rl) {
-          create(create(l, v, rl), rv, rr)
-        } else {
-          switch rl {
-          | Empty => invalid_arg("Set.bal")
-          | Node({l: rll, v: rlv, r: rlr}) => create(create(l, v, rll), rlv, create(rlr, rv, rr))
-          }
-        }
-      }
-    } else {
-      Node({
-        l,
-        v,
-        r,
-        h: if hl >= hr {
-          hl + 1
-        } else {
-          hr + 1
-        },
-      })
-    }
-  }
-
-  /* Insertion of one element */
-
-  let rec add = (x, param) =>
-    switch param {
-    | Empty => Node({l: Empty, v: x, r: Empty, h: 1})
-    | Node({l, v, r}) as t =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        t
-      } else if c < 0 {
-        let ll = add(x, l)
-        if l === ll {
-          t
-        } else {
-          bal(ll, v, r)
-        }
-      } else {
-        let rr = add(x, r)
-        if r === rr {
-          t
-        } else {
-          bal(l, v, rr)
-        }
-      }
-    }
-
-  let singleton = x => Node({l: Empty, v: x, r: Empty, h: 1})
-
-  /* Beware: those two functions assume that the added v is *strictly*
-       smaller (or bigger) than all the present elements in the tree; it
-       does not test for equality with the current min (or max) element.
-       Indeed, they are only used during the "join" operation which
-       respects this precondition.
- */
-
-  let rec add_min_element = (x, param) =>
-    switch param {
-    | Empty => singleton(x)
-    | Node({l, v, r}) => bal(add_min_element(x, l), v, r)
-    }
-
-  let rec add_max_element = (x, param) =>
-    switch param {
-    | Empty => singleton(x)
-    | Node({l, v, r}) => bal(l, v, add_max_element(x, r))
-    }
-
-  /* Same as create and bal, but no assumptions are made on the
-   relative heights of l and r. */
-
-  let rec join = (l, v, r) =>
-    switch (l, r) {
-    | (Empty, _) => add_min_element(v, r)
-    | (_, Empty) => add_max_element(v, l)
-    | (Node({l: ll, v: lv, r: lr, h: lh}), Node({l: rl, v: rv, r: rr, h: rh})) =>
-      if lh > rh + 2 {
-        bal(ll, lv, join(lr, v, r))
-      } else if rh > lh + 2 {
-        bal(join(l, v, rl), rv, rr)
-      } else {
-        create(l, v, r)
-      }
-    }
-
-  /* Smallest and greatest element of a set */
-
-  let rec min_elt = param =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l: Empty, v}) => v
-    | Node({l}) => min_elt(l)
-    }
-
-  let rec min_elt_opt = param =>
-    switch param {
-    | Empty => None
-    | Node({l: Empty, v}) => Some(v)
-    | Node({l}) => min_elt_opt(l)
-    }
-
-  let rec max_elt = param =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({v, r: Empty}) => v
-    | Node({r}) => max_elt(r)
-    }
-
-  let rec max_elt_opt = param =>
-    switch param {
-    | Empty => None
-    | Node({v, r: Empty}) => Some(v)
-    | Node({r}) => max_elt_opt(r)
-    }
-
-  /* Remove the smallest element of the given set */
-
-  let rec remove_min_elt = param =>
-    switch param {
-    | Empty => invalid_arg("Set.remove_min_elt")
-    | Node({l: Empty, r}) => r
-    | Node({l, v, r}) => bal(remove_min_elt(l), v, r)
-    }
-
-  /* Merge two trees l and r into one.
-       All elements of l must precede the elements of r.
-       Assume | height l - height r | <= 2. */
-
-  let merge = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) => bal(t1, min_elt(t2), remove_min_elt(t2))
-    }
-
-  /* Merge two trees l and r into one.
-       All elements of l must precede the elements of r.
-       No assumption on the heights of l and r. */
-
-  let concat = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) => join(t1, min_elt(t2), remove_min_elt(t2))
-    }
-
-  /* Splitting.  split x s returns a triple (l, present, r) where
-        - l is the set of elements of s that are < x
-        - r is the set of elements of s that are > x
-        - present is false if s contains no element equal to x,
-          or true if s contains an element equal to x. */
-
-  let rec split = (x, param) =>
-    switch param {
-    | Empty => (Empty, false, Empty)
-    | Node({l, v, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        (l, true, r)
-      } else if c < 0 {
-        let (ll, pres, rl) = split(x, l)
-        (ll, pres, join(rl, v, r))
-      } else {
-        let (lr, pres, rr) = split(x, r)
-        (join(l, v, lr), pres, rr)
-      }
-    }
-
-  /* Implementation of the set operations */
-
-  let empty = Empty
-
-  let is_empty = param =>
-    switch param {
-    | Empty => true
-    | _ => false
-    }
-
-  let rec mem = (x, param) =>
-    switch param {
-    | Empty => false
-    | Node({l, v, r}) =>
-      let c = Ord.compare(x, v)
-      c == 0 ||
-        mem(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-    }
-
-  let rec remove = (x, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, r}) as t =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        merge(l, r)
-      } else if c < 0 {
-        let ll = remove(x, l)
-        if l === ll {
-          t
-        } else {
-          bal(ll, v, r)
-        }
-      } else {
-        let rr = remove(x, r)
-        if r === rr {
-          t
-        } else {
-          bal(l, v, rr)
-        }
-      }
-    }
-
-  let rec union = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, t2) => t2
-    | (t1, Empty) => t1
-    | (Node({l: l1, v: v1, r: r1, h: h1}), Node({l: l2, v: v2, r: r2, h: h2})) =>
-      if h1 >= h2 {
-        if h2 == 1 {
-          add(v2, s1)
-        } else {
-          let (l2, _, r2) = split(v1, s2)
-          join(union(l1, l2), v1, union(r1, r2))
-        }
-      } else if h1 == 1 {
-        add(v1, s2)
-      } else {
-        let (l1, _, r1) = split(v2, s1)
-        join(union(l1, l2), v2, union(r1, r2))
-      }
-    }
-
-  let rec inter = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, _) => Empty
-    | (_, Empty) => Empty
-    | (Node({l: l1, v: v1, r: r1}), t2) =>
-      switch split(v1, t2) {
-      | (l2, false, r2) => concat(inter(l1, l2), inter(r1, r2))
-      | (l2, true, r2) => join(inter(l1, l2), v1, inter(r1, r2))
-      }
-    }
-
-  let rec diff = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, _) => Empty
-    | (t1, Empty) => t1
-    | (Node({l: l1, v: v1, r: r1}), t2) =>
-      switch split(v1, t2) {
-      | (l2, false, r2) => join(diff(l1, l2), v1, diff(r1, r2))
-      | (l2, true, r2) => concat(diff(l1, l2), diff(r1, r2))
-      }
-    }
-
-  type rec enumeration = End | More(elt, t, enumeration)
-
-  let rec cons_enum = (s, e) =>
-    switch s {
-    | Empty => e
-    | Node({l, v, r}) => cons_enum(l, More(v, r, e))
-    }
-
-  let rec compare_aux = (e1, e2) =>
-    switch (e1, e2) {
-    | (End, End) => 0
-    | (End, _) => -1
-    | (_, End) => 1
-    | (More(v1, r1, e1), More(v2, r2, e2)) =>
-      let c = Ord.compare(v1, v2)
-      if c != 0 {
-        c
-      } else {
-        compare_aux(cons_enum(r1, e1), cons_enum(r2, e2))
-      }
-    }
-
-  let compare = (s1, s2) => compare_aux(cons_enum(s1, End), cons_enum(s2, End))
-
-  let equal = (s1, s2) => compare(s1, s2) == 0
-
-  let rec subset = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, _) => true
-    | (_, Empty) => false
-    | (Node({l: l1, v: v1, r: r1}), Node({l: l2, v: v2, r: r2}) as t2) =>
-      let c = Ord.compare(v1, v2)
-      if c == 0 {
-        subset(l1, l2) && subset(r1, r2)
-      } else if c < 0 {
-        subset(Node({l: l1, v: v1, r: Empty, h: 0}), l2) && subset(r1, t2)
-      } else {
-        subset(Node({l: Empty, v: v1, r: r1, h: 0}), r2) && subset(l1, t2)
-      }
-    }
-
-  let rec iter = (f, param) =>
-    switch param {
-    | Empty => ()
-    | Node({l, v, r}) =>
-      iter(f, l)
-      f(v)
-      iter(f, r)
-    }
-
-  let rec fold = (f, s, accu) =>
-    switch s {
-    | Empty => accu
-    | Node({l, v, r}) => fold(f, r, f(v, fold(f, l, accu)))
-    }
-
-  let rec for_all = (p, param) =>
-    switch param {
-    | Empty => true
-    | Node({l, v, r}) => p(v) && (for_all(p, l) && for_all(p, r))
-    }
-
-  let rec exists = (p, param) =>
-    switch param {
-    | Empty => false
-    | Node({l, v, r}) => p(v) || (exists(p, l) || exists(p, r))
-    }
-
-  let rec filter = (p, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, r}) as t =>
-      /* call [p] in the expected left-to-right order */
-      let l' = filter(p, l)
-      let pv = p(v)
-      let r' = filter(p, r)
-      if pv {
-        if l === l' && r === r' {
-          t
-        } else {
-          join(l', v, r')
-        }
-      } else {
-        concat(l', r')
-      }
-    }
-
-  let rec partition = (p, param) =>
-    switch param {
-    | Empty => (Empty, Empty)
-    | Node({l, v, r}) =>
-      /* call [p] in the expected left-to-right order */
-      let (lt, lf) = partition(p, l)
-      let pv = p(v)
-      let (rt, rf) = partition(p, r)
-      if pv {
-        (join(lt, v, rt), concat(lf, rf))
-      } else {
-        (concat(lt, rt), join(lf, v, rf))
-      }
-    }
-
-  let rec cardinal = param =>
-    switch param {
-    | Empty => 0
-    | Node({l, r}) => cardinal(l) + 1 + cardinal(r)
-    }
-
-  let rec elements_aux = (accu, param) =>
-    switch param {
-    | Empty => accu
-    | Node({l, v, r}) => elements_aux(list{v, ...elements_aux(accu, r)}, l)
-    }
-
-  let elements = s => elements_aux(list{}, s)
-
-  let choose = min_elt
-
-  let choose_opt = min_elt_opt
-
-  let rec find = (x, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        v
-      } else {
-        find(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-      }
-    }
-
-  let rec find_first_aux = (v0, f, param) =>
-    switch param {
-    | Empty => v0
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_first_aux(v, f, l)
-      } else {
-        find_first_aux(v0, f, r)
-      }
-    }
-
-  let rec find_first = (f, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_first_aux(v, f, l)
-      } else {
-        find_first(f, r)
-      }
-    }
-
-  let rec find_first_opt_aux = (v0, f, param) =>
-    switch param {
-    | Empty => Some(v0)
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_first_opt_aux(v, f, l)
-      } else {
-        find_first_opt_aux(v0, f, r)
-      }
-    }
-
-  let rec find_first_opt = (f, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_first_opt_aux(v, f, l)
-      } else {
-        find_first_opt(f, r)
-      }
-    }
-
-  let rec find_last_aux = (v0, f, param) =>
-    switch param {
-    | Empty => v0
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_last_aux(v, f, r)
-      } else {
-        find_last_aux(v0, f, l)
-      }
-    }
-
-  let rec find_last = (f, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_last_aux(v, f, r)
-      } else {
-        find_last(f, l)
-      }
-    }
-
-  let rec find_last_opt_aux = (v0, f, param) =>
-    switch param {
-    | Empty => Some(v0)
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_last_opt_aux(v, f, r)
-      } else {
-        find_last_opt_aux(v0, f, l)
-      }
-    }
-
-  let rec find_last_opt = (f, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_last_opt_aux(v, f, r)
-      } else {
-        find_last_opt(f, l)
-      }
-    }
-
-  let rec find_opt = (x, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        Some(v)
-      } else {
-        find_opt(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-      }
-    }
-
-  let try_join = (l, v, r) =>
-    /* [join l v r] can only be called when (elements of l < v <
-         elements of r); use [try_join l v r] when this property may
-         not hold, but you hope it does hold in the common case */
-    if (
-      (l == Empty || Ord.compare(max_elt(l), v) < 0) &&
-        (r == Empty || Ord.compare(v, min_elt(r)) < 0)
-    ) {
-      join(l, v, r)
-    } else {
-      union(l, add(v, r))
-    }
-
-  let rec map = (f, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, r}) as t =>
-      /* enforce left-to-right evaluation order */
-      let l' = map(f, l)
-      let v' = f(v)
-      let r' = map(f, r)
-      if l === l' && (v === v' && r === r') {
-        t
-      } else {
-        try_join(l', v', r')
-      }
-    }
-
-  let of_sorted_list = l => {
-    let rec sub = (n, l) =>
-      switch (n, l) {
-      | (0, l) => (Empty, l)
-      | (1, list{x0, ...l}) => (Node({l: Empty, v: x0, r: Empty, h: 1}), l)
-      | (2, list{x0, x1, ...l}) => (
-          Node({l: Node({l: Empty, v: x0, r: Empty, h: 1}), v: x1, r: Empty, h: 2}),
-          l,
-        )
-      | (3, list{x0, x1, x2, ...l}) => (
-          Node({
-            l: Node({l: Empty, v: x0, r: Empty, h: 1}),
-            v: x1,
-            r: Node({l: Empty, v: x2, r: Empty, h: 1}),
-            h: 2,
-          }),
-          l,
-        )
-      | (n, l) =>
-        let nl = n / 2
-        let (left, l) = sub(nl, l)
-        switch l {
-        | list{} => assert(false)
-        | list{mid, ...l} =>
-          let (right, l) = sub(n - nl - 1, l)
-          (create(left, mid, right), l)
-        }
-      }
-
-    fst(sub(List.length(l), l))
-  }
-
-  let of_list = l =>
-    switch l {
-    | list{} => empty
-    | list{x0} => singleton(x0)
-    | list{x0, x1} => add(x1, singleton(x0))
-    | list{x0, x1, x2} => add(x2, add(x1, singleton(x0)))
-    | list{x0, x1, x2, x3} => add(x3, add(x2, add(x1, singleton(x0))))
-    | list{x0, x1, x2, x3, x4} => add(x4, add(x3, add(x2, add(x1, singleton(x0)))))
-    | _ => of_sorted_list(List.sort_uniq(Ord.compare, l))
-    }
-}
diff --git a/jscomp/stdlib-406/set.resi b/jscomp/stdlib-406/set.resi
deleted file mode 100644
index 7d68f7b..0000000
--- a/jscomp/stdlib-406/set.resi
+++ /dev/null
@@ -1,264 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Sets over ordered types.
-
-   This module implements the set data structure, given a total ordering
-   function over the set elements. All operations over sets
-   are purely applicative (no side-effects).
-   The implementation uses balanced binary trees, and is therefore
-   reasonably efficient: insertion and membership take time
-   logarithmic in the size of the set, for instance.
-
-   The {!Make} functor constructs implementations for any type, given a
-   [compare] function.
-   For instance:
-   {[
-     module IntPairs =
-       struct
-         type t = int * int
-         let compare (x0,y0) (x1,y1) =
-           match Pervasives.compare x0 x1 with
-               0 -> Pervasives.compare y0 y1
-             | c -> c
-       end
-
-     module PairsSet = Set.Make(IntPairs)
-
-     let m = PairsSet.(empty |> add (2,3) |> add (5,7) |> add (11,13))
-   ]}
-
-   This creates a new module [PairsSet], with a new type [PairsSet.t]
-   of sets of [int * int].
-*/
-
-/** Input signature of the functor {!Set.Make}. */
-module type OrderedType = {
-  /** The type of the set elements. */
-  type t
-
-  /** A total ordering function over the set elements.
-          This is a two-argument function [f] such that
-          [f e1 e2] is zero if the elements [e1] and [e2] are equal,
-          [f e1 e2] is strictly negative if [e1] is smaller than [e2],
-          and [f e1 e2] is strictly positive if [e1] is greater than [e2].
-          Example: a suitable ordering function is the generic structural
-          comparison function {!Pervasives.compare}. */
-  let compare: (t, t) => int
-}
-
-/** Output signature of the functor {!Set.Make}. */
-module type S = {
-  /** The type of the set elements. */
-  type elt
-
-  /** The type of sets. */
-  type t
-
-  /** The empty set. */
-  let empty: t
-
-  /** Test whether a set is empty or not. */
-  let is_empty: t => bool
-
-  /** [mem x s] tests whether [x] belongs to the set [s]. */
-  let mem: (elt, t) => bool
-
-  /** [add x s] returns a set containing all elements of [s],
-       plus [x]. If [x] was already in [s], [s] is returned unchanged
-       (the result of the function is then physically equal to [s]).
-       @before 4.03 Physical equality was not ensured. */
-  let add: (elt, t) => t
-
-  /** [singleton x] returns the one-element set containing only [x]. */
-  let singleton: elt => t
-
-  /** [remove x s] returns a set containing all elements of [s],
-       except [x]. If [x] was not in [s], [s] is returned unchanged
-       (the result of the function is then physically equal to [s]).
-       @before 4.03 Physical equality was not ensured. */
-  let remove: (elt, t) => t
-
-  /** Set union. */
-  let union: (t, t) => t
-
-  /** Set intersection. */
-  let inter: (t, t) => t
-
-  /** Set difference. */
-  let diff: (t, t) => t
-
-  /** Total ordering between sets. Can be used as the ordering function
-       for doing sets of sets. */
-  let compare: (t, t) => int
-
-  /** [equal s1 s2] tests whether the sets [s1] and [s2] are
-       equal, that is, contain equal elements. */
-  let equal: (t, t) => bool
-
-  /** [subset s1 s2] tests whether the set [s1] is a subset of
-       the set [s2]. */
-  let subset: (t, t) => bool
-
-  /** [iter f s] applies [f] in turn to all elements of [s].
-       The elements of [s] are presented to [f] in increasing order
-       with respect to the ordering over the type of the elements. */
-  let iter: (elt => unit, t) => unit
-
-  /** [map f s] is the set whose elements are [f a0],[f a1]... [f
-        aN], where [a0],[a1]...[aN] are the elements of [s].
-
-       The elements are passed to [f] in increasing order
-       with respect to the ordering over the type of the elements.
-
-       If no element of [s] is changed by [f], [s] is returned
-       unchanged. (If each output of [f] is physically equal to its
-       input, the returned set is physically equal to [s].)
-       @since 4.04.0 */
-  let map: (elt => elt, t) => t
-
-  /** [fold f s a] computes [(f xN ... (f x2 (f x1 a))...)],
-       where [x1 ... xN] are the elements of [s], in increasing order. */
-  let fold: ((elt, 'a) => 'a, t, 'a) => 'a
-
-  /** [for_all p s] checks if all elements of the set
-       satisfy the predicate [p]. */
-  let for_all: (elt => bool, t) => bool
-
-  /** [exists p s] checks if at least one element of
-       the set satisfies the predicate [p]. */
-  let exists: (elt => bool, t) => bool
-
-  /** [filter p s] returns the set of all elements in [s]
-       that satisfy predicate [p]. If [p] satisfies every element in [s],
-       [s] is returned unchanged (the result of the function is then
-       physically equal to [s]).
-       @before 4.03 Physical equality was not ensured.*/
-  let filter: (elt => bool, t) => t
-
-  /** [partition p s] returns a pair of sets [(s1, s2)], where
-       [s1] is the set of all the elements of [s] that satisfy the
-       predicate [p], and [s2] is the set of all the elements of
-       [s] that do not satisfy [p]. */
-  let partition: (elt => bool, t) => (t, t)
-
-  /** Return the number of elements of a set. */
-  let cardinal: t => int
-
-  /** Return the list of all elements of the given set.
-       The returned list is sorted in increasing order with respect
-       to the ordering [Ord.compare], where [Ord] is the argument
-       given to {!Set.Make}. */
-  let elements: t => list<elt>
-
-  /** Return the smallest element of the given set
-       (with respect to the [Ord.compare] ordering), or raise
-       [Not_found] if the set is empty. */
-  let min_elt: t => elt
-
-  /** Return the smallest element of the given set
-       (with respect to the [Ord.compare] ordering), or [None]
-       if the set is empty.
-        @since 4.05
-    */
-  let min_elt_opt: t => option<elt>
-
-  /** Same as {!Set.S.min_elt}, but returns the largest element of the
-       given set. */
-  let max_elt: t => elt
-
-  /** Same as {!Set.S.min_elt_opt}, but returns the largest element of the
-        given set.
-        @since 4.05
-    */
-  let max_elt_opt: t => option<elt>
-
-  /** Return one element of the given set, or raise [Not_found] if
-       the set is empty. Which element is chosen is unspecified,
-       but equal elements will be chosen for equal sets. */
-  let choose: t => elt
-
-  /** Return one element of the given set, or [None] if
-        the set is empty. Which element is chosen is unspecified,
-        but equal elements will be chosen for equal sets.
-        @since 4.05
-    */
-  let choose_opt: t => option<elt>
-
-  /** [split x s] returns a triple [(l, present, r)], where
-          [l] is the set of elements of [s] that are
-          strictly less than [x];
-          [r] is the set of elements of [s] that are
-          strictly greater than [x];
-          [present] is [false] if [s] contains no element equal to [x],
-          or [true] if [s] contains an element equal to [x]. */
-  let split: (elt, t) => (t, bool, t)
-
-  /** [find x s] returns the element of [s] equal to [x] (according
-        to [Ord.compare]), or raise [Not_found] if no such element
-        exists.
-        @since 4.01.0 */
-  let find: (elt, t) => elt
-
-  /** [find_opt x s] returns the element of [s] equal to [x] (according
-        to [Ord.compare]), or [None] if no such element
-        exists.
-        @since 4.05 */
-  let find_opt: (elt, t) => option<elt>
-
-  /** [find_first f s], where [f] is a monotonically increasing function,
-       returns the lowest element [e] of [s] such that [f e],
-       or raises [Not_found] if no such element exists.
-
-       For example, [find_first (fun e -> Ord.compare e x >= 0) s] will return
-       the first element [e] of [s] where [Ord.compare e x >= 0] (intuitively:
-       [e >= x]), or raise [Not_found] if [x] is greater than any element of
-       [s].
-
-        @since 4.05
-       */
-  let find_first: (elt => bool, t) => elt
-
-  /** [find_first_opt f s], where [f] is a monotonically increasing function,
-       returns an option containing the lowest element [e] of [s] such that
-       [f e], or [None] if no such element exists.
-        @since 4.05
-       */
-  let find_first_opt: (elt => bool, t) => option<elt>
-
-  /** [find_last f s], where [f] is a monotonically decreasing function,
-       returns the highest element [e] of [s] such that [f e],
-       or raises [Not_found] if no such element exists.
-        @since 4.05
-       */
-  let find_last: (elt => bool, t) => elt
-
-  /** [find_last_opt f s], where [f] is a monotonically decreasing function,
-       returns an option containing the highest element [e] of [s] such that
-       [f e], or [None] if no such element exists.
-        @since 4.05
-       */
-  let find_last_opt: (elt => bool, t) => option<elt>
-
-  /** [of_list l] creates a set from a list of elements.
-        This is usually more efficient than folding [add] over the list,
-        except perhaps for lists with many duplicated elements.
-        @since 4.02.0 */
-  let of_list: list<elt> => t
-}
-
-/** Functor building an implementation of the set structure
-   given a totally ordered type. */
-module Make: (Ord: OrderedType) => (S with type elt = Ord.t)
diff --git a/jscomp/stdlib-406/setLabels.res b/jscomp/stdlib-406/setLabels.res
deleted file mode 100644
index 4e0ed5e..0000000
--- a/jscomp/stdlib-406/setLabels.res
+++ /dev/null
@@ -1,711 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Sets over ordered types */
-
-module type OrderedType = {
-  type t
-  let compare: (t, t) => int
-}
-
-module type S = {
-  type elt
-  type t
-  let empty: t
-  let is_empty: t => bool
-  let mem: (elt, t) => bool
-  let add: (elt, t) => t
-  let singleton: elt => t
-  let remove: (elt, t) => t
-  let union: (t, t) => t
-  let inter: (t, t) => t
-  let diff: (t, t) => t
-  let compare: (t, t) => int
-  let equal: (t, t) => bool
-  let subset: (t, t) => bool
-  let iter: (~f: elt => unit, t) => unit
-  let map: (~f: elt => elt, t) => t
-  let fold: (~f: (elt, 'a) => 'a, t, ~init: 'a) => 'a
-  let for_all: (~f: elt => bool, t) => bool
-  let exists: (~f: elt => bool, t) => bool
-  let filter: (~f: elt => bool, t) => t
-  let partition: (~f: elt => bool, t) => (t, t)
-  let cardinal: t => int
-  let elements: t => list<elt>
-  let min_elt: t => elt
-  let min_elt_opt: t => option<elt>
-  let max_elt: t => elt
-  let max_elt_opt: t => option<elt>
-  let choose: t => elt
-  let choose_opt: t => option<elt>
-  let split: (elt, t) => (t, bool, t)
-  let find: (elt, t) => elt
-  let find_opt: (elt, t) => option<elt>
-  let find_first: (~f: elt => bool, t) => elt
-  let find_first_opt: (~f: elt => bool, t) => option<elt>
-  let find_last: (~f: elt => bool, t) => elt
-  let find_last_opt: (~f: elt => bool, t) => option<elt>
-  let of_list: list<elt> => t
-}
-
-module Make = (Ord: OrderedType) => {
-  type elt = Ord.t
-  type rec t = Empty | Node({l: t, v: elt, r: t, h: int})
-
-  /* Sets are represented by balanced binary trees (the heights of the
-   children differ by at most 2 */
-
-  let height = param =>
-    switch param {
-    | Empty => 0
-    | Node({h}) => h
-    }
-
-  /* Creates a new node with left son l, value v and right son r.
-       We must have all elements of l < v < all elements of r.
-       l and r must be balanced and | height l - height r | <= 2.
-       Inline expansion of height for better speed. */
-
-  let create = (l, v, r) => {
-    let hl = switch l {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    let hr = switch r {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    Node({
-      l,
-      v,
-      r,
-      h: if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    })
-  }
-
-  /* Same as create, but performs one step of rebalancing if necessary.
-       Assumes l and r balanced and | height l - height r | <= 3.
-       Inline expansion of create for better speed in the most frequent case
-       where no rebalancing is required. */
-
-  let bal = (l, v, r) => {
-    let hl = switch l {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    let hr = switch r {
-    | Empty => 0
-    | Node({h}) => h
-    }
-    if hl > hr + 2 {
-      switch l {
-      | Empty => invalid_arg("Set.bal")
-      | Node({l: ll, v: lv, r: lr}) =>
-        if height(ll) >= height(lr) {
-          create(ll, lv, create(lr, v, r))
-        } else {
-          switch lr {
-          | Empty => invalid_arg("Set.bal")
-          | Node({l: lrl, v: lrv, r: lrr}) => create(create(ll, lv, lrl), lrv, create(lrr, v, r))
-          }
-        }
-      }
-    } else if hr > hl + 2 {
-      switch r {
-      | Empty => invalid_arg("Set.bal")
-      | Node({l: rl, v: rv, r: rr}) =>
-        if height(rr) >= height(rl) {
-          create(create(l, v, rl), rv, rr)
-        } else {
-          switch rl {
-          | Empty => invalid_arg("Set.bal")
-          | Node({l: rll, v: rlv, r: rlr}) => create(create(l, v, rll), rlv, create(rlr, rv, rr))
-          }
-        }
-      }
-    } else {
-      Node({
-        l,
-        v,
-        r,
-        h: if hl >= hr {
-          hl + 1
-        } else {
-          hr + 1
-        },
-      })
-    }
-  }
-
-  /* Insertion of one element */
-
-  let rec add = (x, param) =>
-    switch param {
-    | Empty => Node({l: Empty, v: x, r: Empty, h: 1})
-    | Node({l, v, r}) as t =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        t
-      } else if c < 0 {
-        let ll = add(x, l)
-        if l === ll {
-          t
-        } else {
-          bal(ll, v, r)
-        }
-      } else {
-        let rr = add(x, r)
-        if r === rr {
-          t
-        } else {
-          bal(l, v, rr)
-        }
-      }
-    }
-
-  let singleton = x => Node({l: Empty, v: x, r: Empty, h: 1})
-
-  /* Beware: those two functions assume that the added v is *strictly*
-       smaller (or bigger) than all the present elements in the tree; it
-       does not test for equality with the current min (or max) element.
-       Indeed, they are only used during the "join" operation which
-       respects this precondition.
- */
-
-  let rec add_min_element = (x, param) =>
-    switch param {
-    | Empty => singleton(x)
-    | Node({l, v, r}) => bal(add_min_element(x, l), v, r)
-    }
-
-  let rec add_max_element = (x, param) =>
-    switch param {
-    | Empty => singleton(x)
-    | Node({l, v, r}) => bal(l, v, add_max_element(x, r))
-    }
-
-  /* Same as create and bal, but no assumptions are made on the
-   relative heights of l and r. */
-
-  let rec join = (l, v, r) =>
-    switch (l, r) {
-    | (Empty, _) => add_min_element(v, r)
-    | (_, Empty) => add_max_element(v, l)
-    | (Node({l: ll, v: lv, r: lr, h: lh}), Node({l: rl, v: rv, r: rr, h: rh})) =>
-      if lh > rh + 2 {
-        bal(ll, lv, join(lr, v, r))
-      } else if rh > lh + 2 {
-        bal(join(l, v, rl), rv, rr)
-      } else {
-        create(l, v, r)
-      }
-    }
-
-  /* Smallest and greatest element of a set */
-
-  let rec min_elt = param =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l: Empty, v}) => v
-    | Node({l}) => min_elt(l)
-    }
-
-  let rec min_elt_opt = param =>
-    switch param {
-    | Empty => None
-    | Node({l: Empty, v}) => Some(v)
-    | Node({l}) => min_elt_opt(l)
-    }
-
-  let rec max_elt = param =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({v, r: Empty}) => v
-    | Node({r}) => max_elt(r)
-    }
-
-  let rec max_elt_opt = param =>
-    switch param {
-    | Empty => None
-    | Node({v, r: Empty}) => Some(v)
-    | Node({r}) => max_elt_opt(r)
-    }
-
-  /* Remove the smallest element of the given set */
-
-  let rec remove_min_elt = param =>
-    switch param {
-    | Empty => invalid_arg("Set.remove_min_elt")
-    | Node({l: Empty, r}) => r
-    | Node({l, v, r}) => bal(remove_min_elt(l), v, r)
-    }
-
-  /* Merge two trees l and r into one.
-       All elements of l must precede the elements of r.
-       Assume | height l - height r | <= 2. */
-
-  let merge = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) => bal(t1, min_elt(t2), remove_min_elt(t2))
-    }
-
-  /* Merge two trees l and r into one.
-       All elements of l must precede the elements of r.
-       No assumption on the heights of l and r. */
-
-  let concat = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) => join(t1, min_elt(t2), remove_min_elt(t2))
-    }
-
-  /* Splitting.  split x s returns a triple (l, present, r) where
-        - l is the set of elements of s that are < x
-        - r is the set of elements of s that are > x
-        - present is false if s contains no element equal to x,
-          or true if s contains an element equal to x. */
-
-  let rec split = (x, param) =>
-    switch param {
-    | Empty => (Empty, false, Empty)
-    | Node({l, v, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        (l, true, r)
-      } else if c < 0 {
-        let (ll, pres, rl) = split(x, l)
-        (ll, pres, join(rl, v, r))
-      } else {
-        let (lr, pres, rr) = split(x, r)
-        (join(l, v, lr), pres, rr)
-      }
-    }
-
-  /* Implementation of the set operations */
-
-  let empty = Empty
-
-  let is_empty = param =>
-    switch param {
-    | Empty => true
-    | _ => false
-    }
-
-  let rec mem = (x, param) =>
-    switch param {
-    | Empty => false
-    | Node({l, v, r}) =>
-      let c = Ord.compare(x, v)
-      c == 0 ||
-        mem(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-    }
-
-  let rec remove = (x, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, r}) as t =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        merge(l, r)
-      } else if c < 0 {
-        let ll = remove(x, l)
-        if l === ll {
-          t
-        } else {
-          bal(ll, v, r)
-        }
-      } else {
-        let rr = remove(x, r)
-        if r === rr {
-          t
-        } else {
-          bal(l, v, rr)
-        }
-      }
-    }
-
-  let rec union = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, t2) => t2
-    | (t1, Empty) => t1
-    | (Node({l: l1, v: v1, r: r1, h: h1}), Node({l: l2, v: v2, r: r2, h: h2})) =>
-      if h1 >= h2 {
-        if h2 == 1 {
-          add(v2, s1)
-        } else {
-          let (l2, _, r2) = split(v1, s2)
-          join(union(l1, l2), v1, union(r1, r2))
-        }
-      } else if h1 == 1 {
-        add(v1, s2)
-      } else {
-        let (l1, _, r1) = split(v2, s1)
-        join(union(l1, l2), v2, union(r1, r2))
-      }
-    }
-
-  let rec inter = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, _) => Empty
-    | (_, Empty) => Empty
-    | (Node({l: l1, v: v1, r: r1}), t2) =>
-      switch split(v1, t2) {
-      | (l2, false, r2) => concat(inter(l1, l2), inter(r1, r2))
-      | (l2, true, r2) => join(inter(l1, l2), v1, inter(r1, r2))
-      }
-    }
-
-  let rec diff = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, _) => Empty
-    | (t1, Empty) => t1
-    | (Node({l: l1, v: v1, r: r1}), t2) =>
-      switch split(v1, t2) {
-      | (l2, false, r2) => join(diff(l1, l2), v1, diff(r1, r2))
-      | (l2, true, r2) => concat(diff(l1, l2), diff(r1, r2))
-      }
-    }
-
-  type rec enumeration = End | More(elt, t, enumeration)
-
-  let rec cons_enum = (s, e) =>
-    switch s {
-    | Empty => e
-    | Node({l, v, r}) => cons_enum(l, More(v, r, e))
-    }
-
-  let rec compare_aux = (e1, e2) =>
-    switch (e1, e2) {
-    | (End, End) => 0
-    | (End, _) => -1
-    | (_, End) => 1
-    | (More(v1, r1, e1), More(v2, r2, e2)) =>
-      let c = Ord.compare(v1, v2)
-      if c != 0 {
-        c
-      } else {
-        compare_aux(cons_enum(r1, e1), cons_enum(r2, e2))
-      }
-    }
-
-  let compare = (s1, s2) => compare_aux(cons_enum(s1, End), cons_enum(s2, End))
-
-  let equal = (s1, s2) => compare(s1, s2) == 0
-
-  let rec subset = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, _) => true
-    | (_, Empty) => false
-    | (Node({l: l1, v: v1, r: r1}), Node({l: l2, v: v2, r: r2}) as t2) =>
-      let c = Ord.compare(v1, v2)
-      if c == 0 {
-        subset(l1, l2) && subset(r1, r2)
-      } else if c < 0 {
-        subset(Node({l: l1, v: v1, r: Empty, h: 0}), l2) && subset(r1, t2)
-      } else {
-        subset(Node({l: Empty, v: v1, r: r1, h: 0}), r2) && subset(l1, t2)
-      }
-    }
-
-  let rec iter = (~f, param) =>
-    switch param {
-    | Empty => ()
-    | Node({l, v, r}) =>
-      iter(~f, l)
-      f(v)
-      iter(~f, r)
-    }
-
-  let rec fold = (~f, s, ~init as accu) =>
-    switch s {
-    | Empty => accu
-    | Node({l, v, r}) => fold(~f, r, ~init=f(v, fold(~f, l, ~init=accu)))
-    }
-
-  let rec for_all = (~f as p, param) =>
-    switch param {
-    | Empty => true
-    | Node({l, v, r}) => p(v) && (for_all(~f=p, l) && for_all(~f=p, r))
-    }
-
-  let rec exists = (~f as p, param) =>
-    switch param {
-    | Empty => false
-    | Node({l, v, r}) => p(v) || (exists(~f=p, l) || exists(~f=p, r))
-    }
-
-  let rec filter = (~f as p, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, r}) as t =>
-      /* call [p] in the expected left-to-right order */
-      let l' = filter(~f=p, l)
-      let pv = p(v)
-      let r' = filter(~f=p, r)
-      if pv {
-        if l === l' && r === r' {
-          t
-        } else {
-          join(l', v, r')
-        }
-      } else {
-        concat(l', r')
-      }
-    }
-
-  let rec partition = (~f as p, param) =>
-    switch param {
-    | Empty => (Empty, Empty)
-    | Node({l, v, r}) =>
-      /* call [p] in the expected left-to-right order */
-      let (lt, lf) = partition(~f=p, l)
-      let pv = p(v)
-      let (rt, rf) = partition(~f=p, r)
-      if pv {
-        (join(lt, v, rt), concat(lf, rf))
-      } else {
-        (concat(lt, rt), join(lf, v, rf))
-      }
-    }
-
-  let rec cardinal = param =>
-    switch param {
-    | Empty => 0
-    | Node({l, r}) => cardinal(l) + 1 + cardinal(r)
-    }
-
-  let rec elements_aux = (accu, param) =>
-    switch param {
-    | Empty => accu
-    | Node({l, v, r}) => elements_aux(list{v, ...elements_aux(accu, r)}, l)
-    }
-
-  let elements = s => elements_aux(list{}, s)
-
-  let choose = min_elt
-
-  let choose_opt = min_elt_opt
-
-  let rec find = (x, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        v
-      } else {
-        find(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-      }
-    }
-
-  let rec find_first_aux = (v0, f, param) =>
-    switch param {
-    | Empty => v0
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_first_aux(v, f, l)
-      } else {
-        find_first_aux(v0, f, r)
-      }
-    }
-
-  let rec find_first = (~f, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_first_aux(v, f, l)
-      } else {
-        find_first(~f, r)
-      }
-    }
-
-  let rec find_first_opt_aux = (v0, f, param) =>
-    switch param {
-    | Empty => Some(v0)
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_first_opt_aux(v, f, l)
-      } else {
-        find_first_opt_aux(v0, f, r)
-      }
-    }
-
-  let rec find_first_opt = (~f, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_first_opt_aux(v, f, l)
-      } else {
-        find_first_opt(~f, r)
-      }
-    }
-
-  let rec find_last_aux = (v0, f, param) =>
-    switch param {
-    | Empty => v0
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_last_aux(v, f, r)
-      } else {
-        find_last_aux(v0, f, l)
-      }
-    }
-
-  let rec find_last = (~f, param) =>
-    switch param {
-    | Empty => raise(Not_found)
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_last_aux(v, f, r)
-      } else {
-        find_last(~f, l)
-      }
-    }
-
-  let rec find_last_opt_aux = (v0, f, param) =>
-    switch param {
-    | Empty => Some(v0)
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_last_opt_aux(v, f, r)
-      } else {
-        find_last_opt_aux(v0, f, l)
-      }
-    }
-
-  let rec find_last_opt = (~f, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, r}) =>
-      if f(v) {
-        find_last_opt_aux(v, f, r)
-      } else {
-        find_last_opt(~f, l)
-      }
-    }
-
-  let rec find_opt = (x, param) =>
-    switch param {
-    | Empty => None
-    | Node({l, v, r}) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        Some(v)
-      } else {
-        find_opt(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-      }
-    }
-
-  let try_join = (l, v, r) =>
-    /* [join l v r] can only be called when (elements of l < v <
-         elements of r); use [try_join l v r] when this property may
-         not hold, but you hope it does hold in the common case */
-    if (
-      (l == Empty || Ord.compare(max_elt(l), v) < 0) &&
-        (r == Empty || Ord.compare(v, min_elt(r)) < 0)
-    ) {
-      join(l, v, r)
-    } else {
-      union(l, add(v, r))
-    }
-
-  let rec map = (~f, param) =>
-    switch param {
-    | Empty => Empty
-    | Node({l, v, r}) as t =>
-      /* enforce left-to-right evaluation order */
-      let l' = map(~f, l)
-      let v' = f(v)
-      let r' = map(~f, r)
-      if l === l' && (v === v' && r === r') {
-        t
-      } else {
-        try_join(l', v', r')
-      }
-    }
-
-  let of_sorted_list = l => {
-    let rec sub = (n, l) =>
-      switch (n, l) {
-      | (0, l) => (Empty, l)
-      | (1, list{x0, ...l}) => (Node({l: Empty, v: x0, r: Empty, h: 1}), l)
-      | (2, list{x0, x1, ...l}) => (
-          Node({l: Node({l: Empty, v: x0, r: Empty, h: 1}), v: x1, r: Empty, h: 2}),
-          l,
-        )
-      | (3, list{x0, x1, x2, ...l}) => (
-          Node({
-            l: Node({l: Empty, v: x0, r: Empty, h: 1}),
-            v: x1,
-            r: Node({l: Empty, v: x2, r: Empty, h: 1}),
-            h: 2,
-          }),
-          l,
-        )
-      | (n, l) =>
-        let nl = n / 2
-        let (left, l) = sub(nl, l)
-        switch l {
-        | list{} => assert(false)
-        | list{mid, ...l} =>
-          let (right, l) = sub(n - nl - 1, l)
-          (create(left, mid, right), l)
-        }
-      }
-
-    fst(sub(List.length(l), l))
-  }
-
-  let of_list = l =>
-    switch l {
-    | list{} => empty
-    | list{x0} => singleton(x0)
-    | list{x0, x1} => add(x1, singleton(x0))
-    | list{x0, x1, x2} => add(x2, add(x1, singleton(x0)))
-    | list{x0, x1, x2, x3} => add(x3, add(x2, add(x1, singleton(x0))))
-    | list{x0, x1, x2, x3, x4} => add(x4, add(x3, add(x2, add(x1, singleton(x0)))))
-    | _ => of_sorted_list(List.sort_uniq(Ord.compare, l))
-    }
-}
diff --git a/jscomp/stdlib-406/sort.res b/jscomp/stdlib-406/sort.res
deleted file mode 100644
index ab1713a..0000000
--- a/jscomp/stdlib-406/sort.res
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Merging and sorting */
-
-open Array
-
-let rec merge = (order, l1, l2) =>
-  switch l1 {
-  | list{} => l2
-  | list{h1, ...t1} =>
-    switch l2 {
-    | list{} => l1
-    | list{h2, ...t2} =>
-      if order(h1, h2) {
-        list{h1, ...merge(order, t1, l2)}
-      } else {
-        list{h2, ...merge(order, l1, t2)}
-      }
-    }
-  }
-
-let list = (order, l) => {
-  let rec initlist = param =>
-    switch param {
-    | list{} => list{}
-    | list{e} => list{list{e}}
-    | list{e1, e2, ...rest} =>
-      list{
-        if order(e1, e2) {
-          list{e1, e2}
-        } else {
-          list{e2, e1}
-        },
-        ...initlist(rest),
-      }
-    }
-  let rec merge2 = param =>
-    switch param {
-    | list{l1, l2, ...rest} => list{merge(order, l1, l2), ...merge2(rest)}
-    | x => x
-    }
-  let rec mergeall = param =>
-    switch param {
-    | list{} => list{}
-    | list{l} => l
-    | llist => mergeall(merge2(llist))
-    }
-  mergeall(initlist(l))
-}
-
-let swap = (arr, i, j) => {
-  let tmp = unsafe_get(arr, i)
-  unsafe_set(arr, i, unsafe_get(arr, j))
-  unsafe_set(arr, j, tmp)
-}
-
-/* There is a known performance bug in the code below.  If you find
-   it, don't bother reporting it.  You're not supposed to use this
-   module anyway. */
-let array = (cmp, arr) => {
-  let rec qsort = (lo, hi) =>
-    if hi - lo >= 6 {
-      let mid = lsr(lo + hi, 1)
-
-      /* Select median value from among LO, MID, and HI. Rearrange
-         LO and HI so the three values are sorted. This lowers the
-         probability of picking a pathological pivot.  It also
-         avoids extra comparisons on i and j in the two tight "while"
-         loops below. */
-      if cmp(unsafe_get(arr, mid), unsafe_get(arr, lo)) {
-        swap(arr, mid, lo)
-      }
-      if cmp(unsafe_get(arr, hi), unsafe_get(arr, mid)) {
-        swap(arr, mid, hi)
-        if cmp(unsafe_get(arr, mid), unsafe_get(arr, lo)) {
-          swap(arr, mid, lo)
-        }
-      }
-      let pivot = unsafe_get(arr, mid)
-      let i = ref(lo + 1) and j = ref(hi - 1)
-      if !cmp(pivot, unsafe_get(arr, hi)) || !cmp(unsafe_get(arr, lo), pivot) {
-        raise(Invalid_argument("Sort.array"))
-      }
-      while i.contents < j.contents {
-        while !cmp(pivot, unsafe_get(arr, i.contents)) {
-          incr(i)
-        }
-        while !cmp(unsafe_get(arr, j.contents), pivot) {
-          decr(j)
-        }
-        if i.contents < j.contents {
-          swap(arr, i.contents, j.contents)
-        }
-        incr(i)
-        decr(j)
-      }
-
-      /* Recursion on smaller half, tail-call on larger half */
-      if j.contents - lo <= hi - i.contents {
-        qsort(lo, j.contents)
-        qsort(i.contents, hi)
-      } else {
-        qsort(i.contents, hi)
-        qsort(lo, j.contents)
-      }
-    }
-  qsort(0, Array.length(arr) - 1)
-  /* Finish sorting by insertion sort */
-  for i in 1 to Array.length(arr) - 1 {
-    let val_i = unsafe_get(arr, i)
-    if !cmp(unsafe_get(arr, i - 1), val_i) {
-      unsafe_set(arr, i, unsafe_get(arr, i - 1))
-      let j = ref(i - 1)
-      while j.contents >= 1 && !cmp(unsafe_get(arr, j.contents - 1), val_i) {
-        unsafe_set(arr, j.contents, unsafe_get(arr, j.contents - 1))
-        decr(j)
-      }
-      unsafe_set(arr, j.contents, val_i)
-    }
-  }
-}
diff --git a/jscomp/stdlib-406/sort.resi b/jscomp/stdlib-406/sort.resi
deleted file mode 100644
index b4de4f9..0000000
--- a/jscomp/stdlib-406/sort.resi
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Sorting and merging lists.
-
-   @deprecated This module is obsolete and exists only for backward
-   compatibility.
-   The sorting functions in {!Array} and {!List} should be used instead.
-   The new functions are faster and use less memory.
-*/
-
-@deprecated("Use List.sort instead.")
-/** Sort a list in increasing order according to an ordering predicate.
-   The predicate should return [true] if its first argument is
-   less than or equal to its second argument. */
-let list: (('a, 'a) => bool, list<'a>) => list<'a>
-
-@deprecated("Use Array.sort instead.")
-/** Sort an array in increasing order according to an
-   ordering predicate.
-   The predicate should return [true] if its first argument is
-   less than or equal to its second argument.
-   The array is sorted in place. */
-let array: (('a, 'a) => bool, array<'a>) => unit
-
-@deprecated("Use List.merge instead.")
-/** Merge two lists according to the given predicate.
-   Assuming the two argument lists are sorted according to the
-   predicate, [merge] returns a sorted list containing the elements
-   from the two lists. The behavior is undefined if the two
-   argument lists were not sorted. */
-let merge: (('a, 'a) => bool, list<'a>, list<'a>) => list<'a>
diff --git a/jscomp/stdlib-406/stack.res b/jscomp/stdlib-406/stack.res
deleted file mode 100644
index ee13834..0000000
--- a/jscomp/stdlib-406/stack.res
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-type t<'a> = {mutable c: list<'a>, mutable len: int}
-
-exception Empty
-
-let create = () => {c: list{}, len: 0}
-
-let clear = s => {
-  s.c = list{}
-  s.len = 0
-}
-
-let copy = s => {c: s.c, len: s.len}
-
-let push = (x, s) => {
-  s.c = list{x, ...s.c}
-  s.len = s.len + 1
-}
-
-let pop = s =>
-  switch s.c {
-  | list{hd, ...tl} =>
-    s.c = tl
-    s.len = s.len - 1
-    hd
-  | list{} => raise(Empty)
-  }
-
-let top = s =>
-  switch s.c {
-  | list{hd, ..._} => hd
-  | list{} => raise(Empty)
-  }
-
-let is_empty = s => s.c == list{}
-
-let length = s => s.len
-
-let iter = (f, s) => List.iter(f, s.c)
-
-let fold = (f, acc, s) => List.fold_left(f, acc, s.c)
diff --git a/jscomp/stdlib-406/stack.resi b/jscomp/stdlib-406/stack.resi
deleted file mode 100644
index 6acaaa7..0000000
--- a/jscomp/stdlib-406/stack.resi
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Last-in first-out stacks.
-
-   This module implements stacks (LIFOs), with in-place modification.
-*/
-
-/** The type of stacks containing elements of type ['a]. */
-type t<'a>
-
-/** Raised when {!Stack.pop} or {!Stack.top} is applied to an empty stack. */ exception Empty
-
-/** Return a new stack, initially empty. */
-let create: unit => t<'a>
-
-/** [push x s] adds the element [x] at the top of stack [s]. */
-let push: ('a, t<'a>) => unit
-
-/** [pop s] removes and returns the topmost element in stack [s],
-   or raises {!Empty} if the stack is empty. */
-let pop: t<'a> => 'a
-
-/** [top s] returns the topmost element in stack [s],
-   or raises {!Empty} if the stack is empty. */
-let top: t<'a> => 'a
-
-/** Discard all elements from a stack. */
-let clear: t<'a> => unit
-
-/** Return a copy of the given stack. */
-let copy: t<'a> => t<'a>
-
-/** Return [true] if the given stack is empty, [false] otherwise. */
-let is_empty: t<'a> => bool
-
-/** Return the number of elements in a stack. Time complexity O(1) */
-let length: t<'a> => int
-
-/** [iter f s] applies [f] in turn to all elements of [s],
-   from the element at the top of the stack to the element at the
-   bottom of the stack. The stack itself is unchanged. */
-let iter: ('a => unit, t<'a>) => unit
-
-/** [fold f accu s] is [(f (... (f (f accu x1) x2) ...) xn)]
-    where [x1] is the top of the stack, [x2] the second element,
-    and [xn] the bottom element. The stack is unchanged.
-    @since 4.03 */
-let fold: (('b, 'a) => 'b, 'b, t<'a>) => 'b
diff --git a/jscomp/stdlib-406/stdLabels.res b/jscomp/stdlib-406/stdLabels.res
deleted file mode 100644
index 8e35db9..0000000
--- a/jscomp/stdlib-406/stdLabels.res
+++ /dev/null
@@ -1,24 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Jacques Garrigue, Kyoto University RIMS */
-/*  */
-/* Copyright 2001 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* Module [StdLabels]: meta-module for labelled libraries */
-
-module Array = ArrayLabels
-
-module List = ListLabels
-
-module String = StringLabels
-
-module Bytes = BytesLabels
diff --git a/jscomp/stdlib-406/stdLabels.resi b/jscomp/stdlib-406/stdLabels.resi
deleted file mode 100644
index a36e9d3..0000000
--- a/jscomp/stdlib-406/stdLabels.resi
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Jacques Garrigue, Kyoto University RIMS */
-/*  */
-/* Copyright 2001 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Standard labeled libraries.
-
-   This meta-module provides labelized version of the {!Array},
-   {!Bytes}, {!List} and {!String} modules.
-
-   They only differ by their labels. Detailed interfaces can be found
-   in [arrayLabels.mli], [bytesLabels.mli], [listLabels.mli]
-   and [stringLabels.mli].
-*/
-
-module Array = ArrayLabels
-module Bytes = BytesLabels
-module List = ListLabels
-module String = StringLabels
diff --git a/jscomp/stdlib-406/stream.res b/jscomp/stdlib-406/stream.res
deleted file mode 100644
index d819559..0000000
--- a/jscomp/stdlib-406/stream.res
+++ /dev/null
@@ -1,260 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1997 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-type rec t<'a> = option<cell<'a>>
-and cell<'a> = {mutable count: int, mutable data: data<'a>}
-and data<'a> =
-  | Sempty
-  | Scons('a, data<'a>)
-  | Sapp(data<'a>, data<'a>)
-  | Slazy(Lazy.t<data<'a>>)
-  | Sgen(gen<'a>)
-and gen<'a> = {mutable curr: option<option<'a>>, func: int => option<'a>}
-
-exception Failure
-exception Error(string)
-
-let count = param =>
-  switch param {
-  | None => 0
-  | Some({count}) => count
-  }
-let data = param =>
-  switch param {
-  | None => Sempty
-  | Some({data}) => data
-  }
-
-let rec get_data:
-  type v. (int, data<v>) => data<v> =
-  (count, d) =>
-    switch d {
-    /* Returns either Sempty or Scons(a, _) even when d is a generator
-    or a buffer. In those cases, the item a is seen as extracted from
- the generator/buffer.
- The count parameter is used for calling `Sgen-functions'. */
-    | Sempty | Scons(_, _) => d
-    | Sapp(d1, d2) =>
-      switch get_data(count, d1) {
-      | Scons(a, d11) => Scons(a, Sapp(d11, d2))
-      | Sempty => get_data(count, d2)
-      | _ => assert(false)
-      }
-    | Sgen({curr: Some(None)}) => Sempty
-    | Sgen({curr: Some(Some(a))} as g) =>
-      g.curr = None
-      Scons(a, d)
-    | Sgen(g) =>
-      switch g.func(count) {
-      | None =>
-        g.curr = Some(None)
-        Sempty
-      | Some(a) => Scons(a, d)
-      /* Warning: anyone using g thinks that an item has been read */
-      }
-    | Slazy(f) => get_data(count, Lazy.force(f))
-    }
-
-let rec peek_data:
-  type v. cell<v> => option<v> =
-  s =>
-    /* consult the first item of s */
-    switch s.data {
-    | Sempty => None
-    | Scons(a, _) => Some(a)
-    | Sapp(_, _) =>
-      switch get_data(s.count, s.data) {
-      | Scons(a, _) as d =>
-        s.data = d
-        Some(a)
-      | Sempty => None
-      | _ => assert(false)
-      }
-    | Slazy(f) =>
-      s.data = Lazy.force(f)
-      peek_data(s)
-    | Sgen({curr: Some(a)}) => a
-    | Sgen(g) =>
-      let x = g.func(s.count)
-      g.curr = Some(x)
-      x
-    }
-
-let peek = param =>
-  switch param {
-  | None => None
-  | Some(s) => peek_data(s)
-  }
-
-let rec junk_data:
-  type v. cell<v> => unit =
-  s =>
-    switch s.data {
-    | Scons(_, d) =>
-      s.count = succ(s.count)
-      s.data = d
-    | Sgen({curr: Some(_)} as g) =>
-      s.count = succ(s.count)
-      g.curr = None
-    | _ =>
-      switch peek_data(s) {
-      | None => ()
-      | Some(_) => junk_data(s)
-      }
-    }
-
-let junk = param =>
-  switch param {
-  | None => ()
-  | Some(data) => junk_data(data)
-  }
-
-let rec nget_data = (n, s) =>
-  if n <= 0 {
-    (list{}, s.data, 0)
-  } else {
-    switch peek_data(s) {
-    | Some(a) =>
-      junk_data(s)
-      let (al, d, k) = nget_data(pred(n), s)
-      (list{a, ...al}, Scons(a, d), succ(k))
-    | None => (list{}, s.data, 0)
-    }
-  }
-
-let npeek_data = (n, s) => {
-  let (al, d, len) = nget_data(n, s)
-  s.count = s.count - len
-  s.data = d
-  al
-}
-
-let npeek = (n, param) =>
-  switch param {
-  | None => list{}
-  | Some(d) => npeek_data(n, d)
-  }
-
-let next = s =>
-  switch peek(s) {
-  | Some(a) =>
-    junk(s)
-    a
-  | None => raise(Failure)
-  }
-
-let empty = s =>
-  switch peek(s) {
-  | Some(_) => raise(Failure)
-  | None => ()
-  }
-
-let iter = (f, strm) => {
-  let rec do_rec = () =>
-    switch peek(strm) {
-    | Some(a) =>
-      junk(strm)
-      ignore(f(a))
-      do_rec()
-    | None => ()
-    }
-
-  do_rec()
-}
-
-/* Stream building functions */
-
-let from = f => Some({count: 0, data: Sgen({curr: None, func: f})})
-
-let of_list = l => Some({count: 0, data: List.fold_right((x, l) => Scons(x, l), l, Sempty)})
-
-let of_string = s => {
-  let count = ref(0)
-  from(_ => {
-    /* We cannot use the index passed by the [from] function directly
-       because it returns the current stream count, with absolutely no
-       guarantee that it will start from 0. For example, in the case
-       of [Stream.icons 'c' (Stream.from_string "ab")], the first
-       access to the string will be made with count [1] already.
- */
-    let c = count.contents
-    if c < String.length(s) {
-      incr(count)
-      Some(String.get(s, c))
-    } else {
-      None
-    }
-  })
-}
-
-let of_bytes = s => {
-  let count = ref(0)
-  from(_ => {
-    let c = count.contents
-    if c < Bytes.length(s) {
-      incr(count)
-      Some(Bytes.get(s, c))
-    } else {
-      None
-    }
-  })
-}
-
-/* Stream expressions builders */
-
-let iapp = (i, s) => Some({count: 0, data: Sapp(data(i), data(s))})
-let icons = (i, s) => Some({count: 0, data: Scons(i, data(s))})
-let ising = i => Some({count: 0, data: Scons(i, Sempty)})
-
-let lapp = (f, s) => Some({count: 0, data: Slazy(lazy Sapp(data(f()), data(s)))})
-
-let lcons = (f, s) => Some({count: 0, data: Slazy(lazy Scons(f(), data(s)))})
-let lsing = f => Some({count: 0, data: Slazy(lazy Scons(f(), Sempty))})
-
-let sempty = None
-let slazy = f => Some({count: 0, data: Slazy(lazy data(f()))})
-
-/* For debugging use */
-
-let rec dump:
-  type v. (v => unit, t<v>) => unit =
-  (f, s) => {
-    print_string("{count = ")
-    print_int(count(s))
-    print_string("; data = ")
-    dump_data(f, data(s))
-    print_string("}")
-    print_newline()
-  }
-and dump_data:
-  type v. (v => unit, data<v>) => unit =
-  (f, param) =>
-    switch param {
-    | Sempty => print_string("Sempty")
-    | Scons(a, d) =>
-      print_string("Scons (")
-      f(a)
-      print_string(", ")
-      dump_data(f, d)
-      print_string(")")
-    | Sapp(d1, d2) =>
-      print_string("Sapp (")
-      dump_data(f, d1)
-      print_string(", ")
-      dump_data(f, d2)
-      print_string(")")
-    | Slazy(_) => print_string("Slazy")
-    | Sgen(_) => print_string("Sgen")
-    }
diff --git a/jscomp/stdlib-406/stream.resi b/jscomp/stdlib-406/stream.resi
deleted file mode 100644
index 952e6b9..0000000
--- a/jscomp/stdlib-406/stream.resi
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Daniel de Rauglaudre, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1997 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Streams and parsers. */
-
-/** The type of streams holding values of type ['a]. */
-type t<'a>
-
-/** Raised by parsers when none of the first components of the stream
-   patterns is accepted. */
-exception Failure
-
-/** Raised by parsers when the first component of a stream pattern is
-   accepted, but one of the following components is rejected. */
-exception Error(string)
-
-/*** {1 Stream builders} */
-
-/** [Stream.from f] returns a stream built from the function [f].
-   To create a new stream element, the function [f] is called with
-   the current stream count. The user function [f] must return either
-   [Some <value>] for a value or [None] to specify the end of the
-   stream.
-
-   Do note that the indices passed to [f] may not start at [0] in the
-   general case. For example, [[< '0; '1; Stream.from f >]] would call
-   [f] the first time with count [2].
-*/
-let from: (int => option<'a>) => t<'a>
-
-/** Return the stream holding the elements of the list in the same
-   order. */
-let of_list: list<'a> => t<'a>
-
-/** Return the stream of the characters of the string parameter. */
-let of_string: string => t<char>
-
-/** Return the stream of the characters of the bytes parameter.
-    @since 4.02.0 */
-let of_bytes: bytes => t<char>
-
-/* {1 Stream iterator} */
-
-/** [Stream.iter f s] scans the whole stream s, applying function [f]
-   in turn to each stream element encountered. */
-let iter: ('a => unit, t<'a>) => unit
-
-/* {1 Predefined parsers} */
-
-/** Return the first element of the stream and remove it from the
-   stream. Raise {!Stream.Failure} if the stream is empty. */
-let next: t<'a> => 'a
-
-/** Return [()] if the stream is empty, else raise {!Stream.Failure}. */
-let empty: t<'a> => unit
-
-/* {1 Useful functions} */
-
-/** Return [Some] of "the first element" of the stream, or [None] if
-   the stream is empty. */
-let peek: t<'a> => option<'a>
-
-/** Remove the first element of the stream, possibly unfreezing
-   it before. */
-let junk: t<'a> => unit
-
-/** Return the current count of the stream elements, i.e. the number
-   of the stream elements discarded. */
-let count: t<'a> => int
-
-/** [npeek n] returns the list of the [n] first elements of
-   the stream, or all its remaining elements if less than [n]
-   elements are available. */
-let npeek: (int, t<'a>) => list<'a>
-
-/* The following is for system use only. Do not call directly. */
-
-let iapp: (t<'a>, t<'a>) => t<'a>
-let icons: ('a, t<'a>) => t<'a>
-let ising: 'a => t<'a>
-
-let lapp: (unit => t<'a>, t<'a>) => t<'a>
-let lcons: (unit => 'a, t<'a>) => t<'a>
-let lsing: (unit => 'a) => t<'a>
-
-let sempty: t<'a>
-let slazy: (unit => t<'a>) => t<'a>
-
-let dump: ('a => unit, t<'a>) => unit
diff --git a/jscomp/stdlib-406/string.res b/jscomp/stdlib-406/string.res
deleted file mode 100644
index a038bfd..0000000
--- a/jscomp/stdlib-406/string.res
+++ /dev/null
@@ -1,235 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Damien Doligez, projet Gallium, INRIA Rocquencourt */
-/*  */
-/* Copyright 2014 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* String operations, based on byte sequence operations */
-
-/* WARNING: Some functions in this file are duplicated in bytes.ml for
-   efficiency reasons. When you modify the one in this file you need to
-   modify its duplicate in bytes.ml.
-   These functions have a "duplicated" comment above their definition.
-*/
-
-external length: string => int = "%string_length"
-external get: (string, int) => char = "%string_safe_get"
-external unsafe_get: (string, int) => char = "%string_unsafe_get"
-
-module B = Bytes
-
-let bts = B.unsafe_to_string
-let bos = B.unsafe_of_string
-
-external make: (int, char) => string = "?string_repeat"
-
-let init = (n, f) => bts(B.init(n, f))
-let sub = (s, ofs, len) => bts(B.sub(bos(s), ofs, len))
-let blit = B.blit_string
-
-%%private(@send external join: (array<string>, string) => string = "join")
-
-let concat = (sep: string, xs: list<string>) => xs->Array.of_list->join(sep)
-
-/* duplicated in bytes.ml */
-let iter = (f, s) =>
-  for i in 0 to length(s) - 1 {
-    f(unsafe_get(s, i))
-  }
-
-/* duplicated in bytes.ml */
-let iteri = (f, s) =>
-  for i in 0 to length(s) - 1 {
-    f(i, unsafe_get(s, i))
-  }
-
-let map = (f, s) => bts(B.map(f, bos(s)))
-let mapi = (f, s) => bts(B.mapi(f, bos(s)))
-
-/* Beware: we cannot use B.trim or B.escape because they always make a
-   copy, but String.mli spells out some cases where we are not allowed
-   to make a copy. */
-
-let is_space = param =>
-  switch param {
-  | ' ' | '' | '\n' | '\r' | '\t' => true
-  | _ => false
-  }
-
-let trim = s =>
-  if s == "" {
-    s
-  } else if is_space(unsafe_get(s, 0)) || is_space(unsafe_get(s, length(s) - 1)) {
-    bts(B.trim(bos(s)))
-  } else {
-    s
-  }
-
-let escaped = s => {
-  let rec needs_escape = i =>
-    if i >= length(s) {
-      false
-    } else {
-      switch unsafe_get(s, i) {
-      | '"' | '\\' | '\n' | '\t' | '\r' | '\b' => true
-      | ' ' .. '~' => needs_escape(i + 1)
-      | _ => true
-      }
-    }
-
-  if needs_escape(0) {
-    bts(B.escaped(bos(s)))
-  } else {
-    s
-  }
-}
-
-/* duplicated in bytes.ml */
-let rec index_rec = (s, lim, i, c) =>
-  if i >= lim {
-    raise(Not_found)
-  } else if unsafe_get(s, i) == c {
-    i
-  } else {
-    index_rec(s, lim, i + 1, c)
-  }
-
-/* duplicated in bytes.ml */
-let index = (s, c) => index_rec(s, length(s), 0, c)
-
-/* duplicated in bytes.ml */
-let rec index_rec_opt = (s, lim, i, c) =>
-  if i >= lim {
-    None
-  } else if unsafe_get(s, i) == c {
-    Some(i)
-  } else {
-    index_rec_opt(s, lim, i + 1, c)
-  }
-
-/* duplicated in bytes.ml */
-let index_opt = (s, c) => index_rec_opt(s, length(s), 0, c)
-
-/* duplicated in bytes.ml */
-let index_from = (s, i, c) => {
-  let l = length(s)
-  if i < 0 || i > l {
-    invalid_arg("String.index_from / Bytes.index_from")
-  } else {
-    index_rec(s, l, i, c)
-  }
-}
-
-/* duplicated in bytes.ml */
-let index_from_opt = (s, i, c) => {
-  let l = length(s)
-  if i < 0 || i > l {
-    invalid_arg("String.index_from_opt / Bytes.index_from_opt")
-  } else {
-    index_rec_opt(s, l, i, c)
-  }
-}
-
-/* duplicated in bytes.ml */
-let rec rindex_rec = (s, i, c) =>
-  if i < 0 {
-    raise(Not_found)
-  } else if unsafe_get(s, i) == c {
-    i
-  } else {
-    rindex_rec(s, i - 1, c)
-  }
-
-/* duplicated in bytes.ml */
-let rindex = (s, c) => rindex_rec(s, length(s) - 1, c)
-
-/* duplicated in bytes.ml */
-let rindex_from = (s, i, c) =>
-  if i < -1 || i >= length(s) {
-    invalid_arg("String.rindex_from / Bytes.rindex_from")
-  } else {
-    rindex_rec(s, i, c)
-  }
-
-/* duplicated in bytes.ml */
-let rec rindex_rec_opt = (s, i, c) =>
-  if i < 0 {
-    None
-  } else if unsafe_get(s, i) == c {
-    Some(i)
-  } else {
-    rindex_rec_opt(s, i - 1, c)
-  }
-
-/* duplicated in bytes.ml */
-let rindex_opt = (s, c) => rindex_rec_opt(s, length(s) - 1, c)
-
-/* duplicated in bytes.ml */
-let rindex_from_opt = (s, i, c) =>
-  if i < -1 || i >= length(s) {
-    invalid_arg("String.rindex_from_opt / Bytes.rindex_from_opt")
-  } else {
-    rindex_rec_opt(s, i, c)
-  }
-
-/* duplicated in bytes.ml */
-let contains_from = (s, i, c) => {
-  let l = length(s)
-  if i < 0 || i > l {
-    invalid_arg("String.contains_from / Bytes.contains_from")
-  } else {
-    try {
-      ignore(index_rec(s, l, i, c))
-      true
-    } catch {
-    | Not_found => false
-    }
-  }
-}
-
-/* duplicated in bytes.ml */
-let contains = (s, c) => contains_from(s, 0, c)
-
-/* duplicated in bytes.ml */
-let rcontains_from = (s, i, c) =>
-  if i < 0 || i >= length(s) {
-    invalid_arg("String.rcontains_from / Bytes.rcontains_from")
-  } else {
-    try {
-      ignore(rindex_rec(s, i, c))
-      true
-    } catch {
-    | Not_found => false
-    }
-  }
-
-let uppercase_ascii = s => bts(B.uppercase_ascii(bos(s)))
-let lowercase_ascii = s => bts(B.lowercase_ascii(bos(s)))
-let capitalize_ascii = s => bts(B.capitalize_ascii(bos(s)))
-let uncapitalize_ascii = s => bts(B.uncapitalize_ascii(bos(s)))
-
-type t = string
-
-let compare = (x: t, y: t) => Pervasives.compare(x, y)
-let equal: (string, string) => bool = (a, b) => a == b
-
-let split_on_char = (sep, s) => {
-  let r = ref(list{})
-  let j = ref(length(s))
-  for i in length(s) - 1 downto 0 {
-    if unsafe_get(s, i) == sep {
-      r := list{sub(s, i + 1, j.contents - i - 1), ...r.contents}
-      j := i
-    }
-  }
-  list{sub(s, 0, j.contents), ...r.contents}
-}
diff --git a/jscomp/stdlib-406/string.resi b/jscomp/stdlib-406/string.resi
deleted file mode 100644
index 319e089..0000000
--- a/jscomp/stdlib-406/string.resi
+++ /dev/null
@@ -1,275 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** String operations.
-
-  A string is an immutable data structure that contains a
-  fixed-length sequence of (single-byte) characters. Each character
-  can be accessed in constant time through its index.
-
-  Given a string [s] of length [l], we can access each of the [l]
-  characters of [s] via its index in the sequence. Indexes start at
-  [0], and we will call an index valid in [s] if it falls within the
-  range [[0...l-1]] (inclusive). A position is the point between two
-  characters or at the beginning or end of the string.  We call a
-  position valid in [s] if it falls within the range [[0...l]]
-  (inclusive). Note that the character at index [n] is between
-  positions [n] and [n+1].
-
-  Two parameters [start] and [len] are said to designate a valid
-  substring of [s] if [len >= 0] and [start] and [start+len] are
-  valid positions in [s].
-
-  OCaml strings used to be modifiable in place, for instance via the
-  {!String.set} and {!String.blit} functions described below. This
-  usage is deprecated and only possible when the compiler is put in
-  "unsafe-string" mode by giving the [-unsafe-string] command-line
-  option (which is currently the default for reasons of backward
-  compatibility). This is done by making the types [string] and
-  [bytes] (see module {!Bytes}) interchangeable so that functions
-  expecting byte sequences can also accept strings as arguments and
-  modify them.
-
-  All new code should avoid this feature and be compiled with the
-  [-safe-string] command-line option to enforce the separation between
-  the types [string] and [bytes].
-*/
-
-/** Return the length (number of characters) of the given string. */
-external length: string => int = "%string_length"
-
-/** [String.get s n] returns the character at index [n] in string [s].
-   You can also write [s.[n]] instead of [String.get s n].
-
-   Raise [Invalid_argument] if [n] not a valid index in [s]. */
-external get: (string, int) => char = "%string_safe_get"
-
-/** [String.make n c] returns a fresh string of length [n],
-   filled with the character [c].
-
-   Raise [Invalid_argument] if [n < 0] or [n > ]{!Sys.max_string_length}. */
-let make: (int, char) => string
-
-/** [String.init n f] returns a string of length [n], with character
-    [i] initialized to the result of [f i] (called in increasing
-    index order).
-
-    Raise [Invalid_argument] if [n < 0] or [n > ]{!Sys.max_string_length}.
-
-    @since 4.02.0
-*/
-let init: (int, int => char) => string
-
-/** [String.sub s start len] returns a fresh string of length [len],
-   containing the substring of [s] that starts at position [start] and
-   has length [len].
-
-   Raise [Invalid_argument] if [start] and [len] do not
-   designate a valid substring of [s]. */
-let sub: (string, int, int) => string
-
-/** Same as {!Bytes.blit_string}. */
-let blit: (string, int, bytes, int, int) => unit
-
-/** [String.concat sep sl] concatenates the list of strings [sl],
-    inserting the separator string [sep] between each.
-
-    Raise [Invalid_argument] if the result is longer than
-    {!Sys.max_string_length} bytes. */
-let concat: (string, list<string>) => string
-
-/** [String.iter f s] applies function [f] in turn to all
-   the characters of [s].  It is equivalent to
-   [f s.[0]; f s.[1]; ...; f s.[String.length s - 1]; ()]. */
-let iter: (char => unit, string) => unit
-
-/** Same as {!String.iter}, but the
-   function is applied to the index of the element as first argument
-   (counting from 0), and the character itself as second argument.
-   @since 4.00.0 */
-let iteri: ((int, char) => unit, string) => unit
-
-/** [String.map f s] applies function [f] in turn to all the
-    characters of [s] (in increasing index order) and stores the
-    results in a new string that is returned.
-    @since 4.00.0 */
-let map: (char => char, string) => string
-
-/** [String.mapi f s] calls [f] with each character of [s] and its
-    index (in increasing index order) and stores the results in a new
-    string that is returned.
-    @since 4.02.0 */
-let mapi: ((int, char) => char, string) => string
-
-/** Return a copy of the argument, without leading and trailing
-   whitespace.  The characters regarded as whitespace are: [' '],
-   ['\x0c'], ['\n'], ['\r'], and ['\t'].  If there is neither leading nor
-   trailing whitespace character in the argument, return the original
-   string itself, not a copy.
-   @since 4.00.0 */
-let trim: string => string
-
-/** Return a copy of the argument, with special characters
-    represented by escape sequences, following the lexical
-    conventions of OCaml.
-    All characters outside the ASCII printable range (32..126) are
-    escaped, as well as backslash and double-quote.
-
-    If there is no special character in the argument that needs
-    escaping, return the original string itself, not a copy.
-
-    Raise [Invalid_argument] if the result is longer than
-    {!Sys.max_string_length} bytes.
-
-    The function {!Scanf.unescaped} is a left inverse of [escaped],
-    i.e. [Scanf.unescaped (escaped s) = s] for any string [s] (unless
-    [escape s] fails). */
-let escaped: string => string
-
-/** [String.index s c] returns the index of the first
-   occurrence of character [c] in string [s].
-
-   Raise [Not_found] if [c] does not occur in [s]. */
-let index: (string, char) => int
-
-/** [String.index_opt s c] returns the index of the first
-    occurrence of character [c] in string [s], or
-    [None] if [c] does not occur in [s].
-    @since 4.05 */
-let index_opt: (string, char) => option<int>
-
-/** [String.rindex s c] returns the index of the last
-   occurrence of character [c] in string [s].
-
-   Raise [Not_found] if [c] does not occur in [s]. */
-let rindex: (string, char) => int
-
-/** [String.rindex_opt s c] returns the index of the last occurrence
-    of character [c] in string [s], or [None] if [c] does not occur in
-    [s].
-    @since 4.05 */
-let rindex_opt: (string, char) => option<int>
-
-/** [String.index_from s i c] returns the index of the
-   first occurrence of character [c] in string [s] after position [i].
-   [String.index s c] is equivalent to [String.index_from s 0 c].
-
-   Raise [Invalid_argument] if [i] is not a valid position in [s].
-   Raise [Not_found] if [c] does not occur in [s] after position [i]. */
-let index_from: (string, int, char) => int
-
-/** [String.index_from_opt s i c] returns the index of the
-    first occurrence of character [c] in string [s] after position [i]
-    or [None] if [c] does not occur in [s] after position [i].
-
-    [String.index_opt s c] is equivalent to [String.index_from_opt s 0 c].
-    Raise [Invalid_argument] if [i] is not a valid position in [s].
-
-    @since 4.05
-*/
-let index_from_opt: (string, int, char) => option<int>
-
-/** [String.rindex_from s i c] returns the index of the
-   last occurrence of character [c] in string [s] before position [i+1].
-   [String.rindex s c] is equivalent to
-   [String.rindex_from s (String.length s - 1) c].
-
-   Raise [Invalid_argument] if [i+1] is not a valid position in [s].
-   Raise [Not_found] if [c] does not occur in [s] before position [i+1]. */
-let rindex_from: (string, int, char) => int
-
-/** [String.rindex_from_opt s i c] returns the index of the
-   last occurrence of character [c] in string [s] before position [i+1]
-   or [None] if [c] does not occur in [s] before position [i+1].
-
-   [String.rindex_opt s c] is equivalent to
-   [String.rindex_from_opt s (String.length s - 1) c].
-
-   Raise [Invalid_argument] if [i+1] is not a valid position in [s].
-
-    @since 4.05
-*/
-let rindex_from_opt: (string, int, char) => option<int>
-
-/** [String.contains s c] tests if character [c]
-   appears in the string [s]. */
-let contains: (string, char) => bool
-
-/** [String.contains_from s start c] tests if character [c]
-   appears in [s] after position [start].
-   [String.contains s c] is equivalent to
-   [String.contains_from s 0 c].
-
-   Raise [Invalid_argument] if [start] is not a valid position in [s]. */
-let contains_from: (string, int, char) => bool
-
-/** [String.rcontains_from s stop c] tests if character [c]
-   appears in [s] before position [stop+1].
-
-   Raise [Invalid_argument] if [stop < 0] or [stop+1] is not a valid
-   position in [s]. */
-let rcontains_from: (string, int, char) => bool
-
-/** Return a copy of the argument, with all lowercase letters
-   translated to uppercase, using the US-ASCII character set.
-   @since 4.03.0 */
-let uppercase_ascii: string => string
-
-/** Return a copy of the argument, with all uppercase letters
-   translated to lowercase, using the US-ASCII character set.
-   @since 4.03.0 */
-let lowercase_ascii: string => string
-
-/** Return a copy of the argument, with the first character set to uppercase,
-   using the US-ASCII character set.
-   @since 4.03.0 */
-let capitalize_ascii: string => string
-
-/** Return a copy of the argument, with the first character set to lowercase,
-   using the US-ASCII character set.
-   @since 4.03.0 */
-let uncapitalize_ascii: string => string
-
-/** An alias for the type of strings. */
-type t = string
-
-/** The comparison function for strings, with the same specification as
-    {!Pervasives.compare}.  Along with the type [t], this function [compare]
-    allows the module [String] to be passed as argument to the functors
-    {!Set.Make} and {!Map.Make}. */
-let compare: (t, t) => int
-
-/** The equal function for strings.
-    @since 4.03.0 */
-let equal: (t, t) => bool
-
-/** [String.split_on_char sep s] returns the list of all (possibly empty)
-    substrings of [s] that are delimited by the [sep] character.
-
-    The function's output is specified by the following invariants:
-
-    - The list is not empty.
-    - Concatenating its elements using [sep] as a separator returns a
-      string equal to the input ([String.concat (String.make 1 sep)
-      (String.split_on_char sep s) = s]).
-    - No string in the result contains the [sep] character.
-
-    @since 4.04.0
-*/
-let split_on_char: (char, string) => list<string>
-
-/* The following is for system use only. Do not call directly. */
-
-external unsafe_get: (string, int) => char = "%string_unsafe_get"
diff --git a/jscomp/stdlib-406/stringLabels.res b/jscomp/stdlib-406/stringLabels.res
deleted file mode 100644
index a9ea486..0000000
--- a/jscomp/stdlib-406/stringLabels.res
+++ /dev/null
@@ -1,235 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Damien Doligez, projet Gallium, INRIA Rocquencourt */
-/*  */
-/* Copyright 2014 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* String operations, based on byte sequence operations */
-
-/* WARNING: Some functions in this file are duplicated in bytes.ml for
-   efficiency reasons. When you modify the one in this file you need to
-   modify its duplicate in bytes.ml.
-   These functions have a "duplicated" comment above their definition.
-*/
-
-external length: string => int = "%string_length"
-external get: (string, int) => char = "%string_safe_get"
-external unsafe_get: (string, int) => char = "%string_unsafe_get"
-
-module B = Bytes
-
-let bts = B.unsafe_to_string
-let bos = B.unsafe_of_string
-
-external make: (int, char) => string = "?string_repeat"
-
-let init = (n, ~f) => bts(B.init(n, f))
-let sub = (s, ~pos as ofs, ~len) => bts(B.sub(bos(s), ofs, len))
-let blit = (~src, ~src_pos, ~dst, ~dst_pos, ~len) => B.blit_string(src, src_pos, dst, dst_pos, len)
-
-%%private(@send external join: (array<string>, string) => string = "join")
-
-let concat = (~sep: string, xs: list<string>) => xs->Array.of_list->join(sep)
-
-/* duplicated in bytes.ml */
-let iter = (~f, s) =>
-  for i in 0 to length(s) - 1 {
-    f(unsafe_get(s, i))
-  }
-
-/* duplicated in bytes.ml */
-let iteri = (~f, s) =>
-  for i in 0 to length(s) - 1 {
-    f(i, unsafe_get(s, i))
-  }
-
-let map = (~f, s) => bts(B.map(f, bos(s)))
-let mapi = (~f, s) => bts(B.mapi(f, bos(s)))
-
-/* Beware: we cannot use B.trim or B.escape because they always make a
-   copy, but String.mli spells out some cases where we are not allowed
-   to make a copy. */
-
-let is_space = param =>
-  switch param {
-  | ' ' | '' | '\n' | '\r' | '\t' => true
-  | _ => false
-  }
-
-let trim = s =>
-  if s == "" {
-    s
-  } else if is_space(unsafe_get(s, 0)) || is_space(unsafe_get(s, length(s) - 1)) {
-    bts(B.trim(bos(s)))
-  } else {
-    s
-  }
-
-let escaped = s => {
-  let rec needs_escape = i =>
-    if i >= length(s) {
-      false
-    } else {
-      switch unsafe_get(s, i) {
-      | '"' | '\\' | '\n' | '\t' | '\r' | '\b' => true
-      | ' ' .. '~' => needs_escape(i + 1)
-      | _ => true
-      }
-    }
-
-  if needs_escape(0) {
-    bts(B.escaped(bos(s)))
-  } else {
-    s
-  }
-}
-
-/* duplicated in bytes.ml */
-let rec index_rec = (s, lim, i, c) =>
-  if i >= lim {
-    raise(Not_found)
-  } else if unsafe_get(s, i) == c {
-    i
-  } else {
-    index_rec(s, lim, i + 1, c)
-  }
-
-/* duplicated in bytes.ml */
-let index = (s, c) => index_rec(s, length(s), 0, c)
-
-/* duplicated in bytes.ml */
-let rec index_rec_opt = (s, lim, i, c) =>
-  if i >= lim {
-    None
-  } else if unsafe_get(s, i) == c {
-    Some(i)
-  } else {
-    index_rec_opt(s, lim, i + 1, c)
-  }
-
-/* duplicated in bytes.ml */
-let index_opt = (s, c) => index_rec_opt(s, length(s), 0, c)
-
-/* duplicated in bytes.ml */
-let index_from = (s, i, c) => {
-  let l = length(s)
-  if i < 0 || i > l {
-    invalid_arg("String.index_from / Bytes.index_from")
-  } else {
-    index_rec(s, l, i, c)
-  }
-}
-
-/* duplicated in bytes.ml */
-let index_from_opt = (s, i, c) => {
-  let l = length(s)
-  if i < 0 || i > l {
-    invalid_arg("String.index_from_opt / Bytes.index_from_opt")
-  } else {
-    index_rec_opt(s, l, i, c)
-  }
-}
-
-/* duplicated in bytes.ml */
-let rec rindex_rec = (s, i, c) =>
-  if i < 0 {
-    raise(Not_found)
-  } else if unsafe_get(s, i) == c {
-    i
-  } else {
-    rindex_rec(s, i - 1, c)
-  }
-
-/* duplicated in bytes.ml */
-let rindex = (s, c) => rindex_rec(s, length(s) - 1, c)
-
-/* duplicated in bytes.ml */
-let rindex_from = (s, i, c) =>
-  if i < -1 || i >= length(s) {
-    invalid_arg("String.rindex_from / Bytes.rindex_from")
-  } else {
-    rindex_rec(s, i, c)
-  }
-
-/* duplicated in bytes.ml */
-let rec rindex_rec_opt = (s, i, c) =>
-  if i < 0 {
-    None
-  } else if unsafe_get(s, i) == c {
-    Some(i)
-  } else {
-    rindex_rec_opt(s, i - 1, c)
-  }
-
-/* duplicated in bytes.ml */
-let rindex_opt = (s, c) => rindex_rec_opt(s, length(s) - 1, c)
-
-/* duplicated in bytes.ml */
-let rindex_from_opt = (s, i, c) =>
-  if i < -1 || i >= length(s) {
-    invalid_arg("String.rindex_from_opt / Bytes.rindex_from_opt")
-  } else {
-    rindex_rec_opt(s, i, c)
-  }
-
-/* duplicated in bytes.ml */
-let contains_from = (s, i, c) => {
-  let l = length(s)
-  if i < 0 || i > l {
-    invalid_arg("String.contains_from / Bytes.contains_from")
-  } else {
-    try {
-      ignore(index_rec(s, l, i, c))
-      true
-    } catch {
-    | Not_found => false
-    }
-  }
-}
-
-/* duplicated in bytes.ml */
-let contains = (s, c) => contains_from(s, 0, c)
-
-/* duplicated in bytes.ml */
-let rcontains_from = (s, i, c) =>
-  if i < 0 || i >= length(s) {
-    invalid_arg("String.rcontains_from / Bytes.rcontains_from")
-  } else {
-    try {
-      ignore(rindex_rec(s, i, c))
-      true
-    } catch {
-    | Not_found => false
-    }
-  }
-
-let uppercase_ascii = s => bts(B.uppercase_ascii(bos(s)))
-let lowercase_ascii = s => bts(B.lowercase_ascii(bos(s)))
-let capitalize_ascii = s => bts(B.capitalize_ascii(bos(s)))
-let uncapitalize_ascii = s => bts(B.uncapitalize_ascii(bos(s)))
-
-type t = string
-
-let compare = (x: t, y: t) => Pervasives.compare(x, y)
-let equal: (string, string) => bool = (a, b) => a == b
-
-let split_on_char = (~sep, s) => {
-  let r = ref(list{})
-  let j = ref(length(s))
-  for i in length(s) - 1 downto 0 {
-    if unsafe_get(s, i) == sep {
-      r := list{sub(s, ~pos=i + 1, ~len=j.contents - i - 1), ...r.contents}
-      j := i
-    }
-  }
-  list{sub(s, ~pos=0, ~len=j.contents), ...r.contents}
-}
diff --git a/jscomp/stdlib-406/stringLabels.resi b/jscomp/stdlib-406/stringLabels.resi
deleted file mode 100644
index 2886ac2..0000000
--- a/jscomp/stdlib-406/stringLabels.resi
+++ /dev/null
@@ -1,233 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** String operations. */
-
-/** Return the length (number of characters) of the given string. */
-external length: string => int = "%string_length"
-
-/** [String.get s n] returns the character at index [n] in string [s].
-   You can also write [s.[n]] instead of [String.get s n].
-
-   Raise [Invalid_argument] if [n] not a valid index in [s]. */
-external get: (string, int) => char = "%string_safe_get"
-
-/** [String.make n c] returns a fresh string of length [n],
-   filled with the character [c].
-
-   Raise [Invalid_argument] if [n < 0] or [n > ]{!Sys.max_string_length}. */
-let make: (int, char) => string
-
-/** [init n f] returns a string of length [n],
-    with character [i] initialized to the result of [f i].
-
-   Raise [Invalid_argument] if [n < 0] or [n > ]{!Sys.max_string_length}.
-   @since 4.02.0 */
-let init: (int, ~f: int => char) => string
-
-/** [String.sub s start len] returns a fresh string of length [len],
-   containing the substring of [s] that starts at position [start] and
-   has length [len].
-
-   Raise [Invalid_argument] if [start] and [len] do not
-   designate a valid substring of [s]. */
-let sub: (string, ~pos: int, ~len: int) => string
-
-/** [String.blit src srcoff dst dstoff len] copies [len] bytes
-   from the string [src], starting at index [srcoff],
-   to byte sequence [dst], starting at character number [dstoff].
-
-   Raise [Invalid_argument] if [srcoff] and [len] do not
-   designate a valid range of [src], or if [dstoff] and [len]
-   do not designate a valid range of [dst]. */
-let blit: (~src: string, ~src_pos: int, ~dst: bytes, ~dst_pos: int, ~len: int) => unit
-
-/** [String.concat sep sl] concatenates the list of strings [sl],
-   inserting the separator string [sep] between each. */
-let concat: (~sep: string, list<string>) => string
-
-/** [String.iter f s] applies function [f] in turn to all
-   the characters of [s].  It is equivalent to
-   [f s.[0]; f s.[1]; ...; f s.[String.length s - 1]; ()]. */
-let iter: (~f: char => unit, string) => unit
-
-/** Same as {!String.iter}, but the
-   function is applied to the index of the element as first argument
-   (counting from 0), and the character itself as second argument.
-   @since 4.00.0 */
-let iteri: (~f: (int, char) => unit, string) => unit
-
-/** [String.map f s] applies function [f] in turn to all
-   the characters of [s] and stores the results in a new string that
-   is returned.
-   @since 4.00.0 */
-let map: (~f: char => char, string) => string
-
-/** [String.mapi f s] calls [f] with each character of [s] and its
-    index (in increasing index order) and stores the results in a new
-    string that is returned.
-    @since 4.02.0 */
-let mapi: (~f: (int, char) => char, string) => string
-
-/** Return a copy of the argument, without leading and trailing
-   whitespace.  The characters regarded as whitespace are: [' '],
-   ['\x0c'], ['\n'], ['\r'], and ['\t'].  If there is no leading nor
-   trailing whitespace character in the argument, return the original
-   string itself, not a copy.
-   @since 4.00.0 */
-let trim: string => string
-
-/** Return a copy of the argument, with special characters
-   represented by escape sequences, following the lexical
-   conventions of OCaml.  If there is no special
-   character in the argument, return the original string itself,
-   not a copy. Its inverse function is Scanf.unescaped. */
-let escaped: string => string
-
-/** [String.index s c] returns the index of the first
-   occurrence of character [c] in string [s].
-
-   Raise [Not_found] if [c] does not occur in [s]. */
-let index: (string, char) => int
-
-/** [String.index_opt s c] returns the index of the first
-    occurrence of character [c] in string [s], or
-    [None] if [c] does not occur in [s].
-    @since 4.05 */
-let index_opt: (string, char) => option<int>
-
-/** [String.rindex s c] returns the index of the last
-   occurrence of character [c] in string [s].
-
-   Raise [Not_found] if [c] does not occur in [s]. */
-let rindex: (string, char) => int
-
-/** [String.rindex_opt s c] returns the index of the last occurrence
-    of character [c] in string [s], or [None] if [c] does not occur in
-    [s].
-    @since 4.05 */
-let rindex_opt: (string, char) => option<int>
-
-/** [String.index_from s i c] returns the index of the
-   first occurrence of character [c] in string [s] after position [i].
-   [String.index s c] is equivalent to [String.index_from s 0 c].
-
-   Raise [Invalid_argument] if [i] is not a valid position in [s].
-   Raise [Not_found] if [c] does not occur in [s] after position [i]. */
-let index_from: (string, int, char) => int
-
-/** [String.index_from_opt s i c] returns the index of the
-    first occurrence of character [c] in string [s] after position [i]
-    or [None] if [c] does not occur in [s] after position [i].
-
-    [String.index_opt s c] is equivalent to [String.index_from_opt s 0 c].
-    Raise [Invalid_argument] if [i] is not a valid position in [s].
-
-    @since 4.05
-*/
-let index_from_opt: (string, int, char) => option<int>
-
-/** [String.rindex_from s i c] returns the index of the
-   last occurrence of character [c] in string [s] before position [i+1].
-   [String.rindex s c] is equivalent to
-   [String.rindex_from s (String.length s - 1) c].
-
-   Raise [Invalid_argument] if [i+1] is not a valid position in [s].
-   Raise [Not_found] if [c] does not occur in [s] before position [i+1]. */
-let rindex_from: (string, int, char) => int
-
-/** [String.rindex_from_opt s i c] returns the index of the
-   last occurrence of character [c] in string [s] before position [i+1]
-   or [None] if [c] does not occur in [s] before position [i+1].
-
-   [String.rindex_opt s c] is equivalent to
-   [String.rindex_from_opt s (String.length s - 1) c].
-
-   Raise [Invalid_argument] if [i+1] is not a valid position in [s].
-
-    @since 4.05
-*/
-let rindex_from_opt: (string, int, char) => option<int>
-
-/** [String.contains s c] tests if character [c]
-   appears in the string [s]. */
-let contains: (string, char) => bool
-
-/** [String.contains_from s start c] tests if character [c]
-   appears in [s] after position [start].
-   [String.contains s c] is equivalent to
-   [String.contains_from s 0 c].
-
-   Raise [Invalid_argument] if [start] is not a valid position in [s]. */
-let contains_from: (string, int, char) => bool
-
-/** [String.rcontains_from s stop c] tests if character [c]
-   appears in [s] before position [stop+1].
-
-   Raise [Invalid_argument] if [stop < 0] or [stop+1] is not a valid
-   position in [s]. */
-let rcontains_from: (string, int, char) => bool
-
-/** Return a copy of the argument, with all lowercase letters
-   translated to uppercase, using the US-ASCII character set.
-   @since 4.05.0 */
-let uppercase_ascii: string => string
-
-/** Return a copy of the argument, with all uppercase letters
-   translated to lowercase, using the US-ASCII character set.
-   @since 4.05.0 */
-let lowercase_ascii: string => string
-
-/** Return a copy of the argument, with the first character set to uppercase,
-   using the US-ASCII character set.
-   @since 4.05.0 */
-let capitalize_ascii: string => string
-
-/** Return a copy of the argument, with the first character set to lowercase,
-   using the US-ASCII character set.
-   @since 4.05.0 */
-let uncapitalize_ascii: string => string
-
-/** An alias for the type of strings. */
-type t = string
-
-/** The comparison function for strings, with the same specification as
-    {!Pervasives.compare}.  Along with the type [t], this function [compare]
-    allows the module [String] to be passed as argument to the functors
-    {!Set.Make} and {!Map.Make}. */
-let compare: (t, t) => int
-
-/** The equal function for strings.
-    @since 4.05.0 */
-let equal: (t, t) => bool
-
-/** [String.split_on_char sep s] returns the list of all (possibly empty)
-    substrings of [s] that are delimited by the [sep] character.
-
-    The function's output is specified by the following invariants:
-
-    - The list is not empty.
-    - Concatenating its elements using [sep] as a separator returns a
-      string equal to the input ([String.concat (String.make 1 sep)
-      (String.split_on_char sep s) = s]).
-    - No string in the result contains the [sep] character.
-
-    @since 4.05.0
-*/
-let split_on_char: (~sep: char, string) => list<string>
-
-/* The following is for system use only. Do not call directly. */
-
-external unsafe_get: (string, int) => char = "%string_unsafe_get"
diff --git a/jscomp/stdlib-406/sys.mlp b/jscomp/stdlib-406/sys.mlp
deleted file mode 100644
index ca35841..0000000
--- a/jscomp/stdlib-406/sys.mlp
+++ /dev/null
@@ -1,131 +0,0 @@
-#2 "stdlib/sys.mlp"
-(**************************************************************************)
-(*                                                                        *)
-(*                                 OCaml                                  *)
-(*                                                                        *)
-(*             Xavier Leroy, projet Cristal, INRIA Rocquencourt           *)
-(*                                                                        *)
-(*   Copyright 1996 Institut National de Recherche en Informatique et     *)
-(*     en Automatique.                                                    *)
-(*                                                                        *)
-(*   All rights reserved.  This file is distributed under the terms of    *)
-(*   the GNU Lesser General Public License version 2.1, with the          *)
-(*   special exception on linking described in the file LICENSE.          *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* WARNING: sys.ml is generated from sys.mlp.  DO NOT EDIT sys.ml or
-   your changes will be lost.
-*)
-
-type backend_type =
-  | Native
-  | Bytecode
-  | Other of string
-(* System interface *)
-
-external get_config: unit -> string * int * bool = "caml_sys_get_config"
-external get_argv: unit -> string * string array = "?sys_get_argv"
-external big_endian : unit -> bool = "%big_endian"
-external word_size : unit -> int = "%word_size"
-external int_size : unit -> int = "%int_size"
-external max_wosize : unit -> int = "%max_wosize"
-external unix : unit -> bool = "%ostype_unix"
-external win32 : unit -> bool = "%ostype_win32"
-external cygwin : unit -> bool = "%ostype_cygwin"
-external get_backend_type : unit -> backend_type = "%backend_type"
-
-let (executable_name, argv) = get_argv()
-let (os_type, _, _) = get_config()
-let backend_type = get_backend_type ()
-let big_endian = big_endian ()
-let word_size = word_size ()
-let int_size = int_size ()
-let unix = unix ()
-let win32 = win32 ()
-let cygwin = cygwin ()
-let max_array_length = max_wosize ()
-let max_string_length = word_size / 8 * max_array_length - 1
-external runtime_variant : unit -> string = "?runtime_variant"
-external runtime_parameters : unit -> string = "?runtime_parameters"
-
-external file_exists: string -> bool = "?sys_file_exists"
-external is_directory : string -> bool = "?sys_is_directory"
-external remove: string -> unit = "?sys_remove"
-external rename : string -> string -> unit = "?sys_rename"
-external getenv: string -> string = "?sys_getenv"
-
-let getenv_opt s =
-  (* TODO: expose a non-raising primitive directly. *)
-  try Some (getenv s)
-  with Not_found -> None
-
-external command: string -> int = "caml_sys_system_command"
-external time: unit -> (float [@unboxed]) =
-  "caml_sys_time" "caml_sys_time_unboxed" [@@noalloc]
-external chdir: string -> unit = "?sys_chdir"
-external getcwd: unit -> string = "?sys_getcwd"
-external readdir : string -> string array = "?sys_read_directory"
-
-let interactive = ref false
-
-type signal_behavior =
-    Signal_default
-  | Signal_ignore
-  | Signal_handle of (int -> unit)
-
-external signal : int -> signal_behavior -> signal_behavior
-                = "caml_install_signal_handler"
-
-let set_signal sig_num sig_beh = ignore(signal sig_num sig_beh)
-
-let sigabrt = -1
-let sigalrm = -2
-let sigfpe = -3
-let sighup = -4
-let sigill = -5
-let sigint = -6
-let sigkill = -7
-let sigpipe = -8
-let sigquit = -9
-let sigsegv = -10
-let sigterm = -11
-let sigusr1 = -12
-let sigusr2 = -13
-let sigchld = -14
-let sigcont = -15
-let sigstop = -16
-let sigtstp = -17
-let sigttin = -18
-let sigttou = -19
-let sigvtalrm = -20
-let sigprof = -21
-let sigbus = -22
-let sigpoll = -23
-let sigsys = -24
-let sigtrap = -25
-let sigurg = -26
-let sigxcpu = -27
-let sigxfsz = -28
-
-exception Break
-
-let catch_break on =
-  if on then
-    set_signal sigint (Signal_handle(fun _ -> raise Break))
-  else
-    set_signal sigint Signal_default
-
-
-external enable_runtime_warnings: bool -> unit =
-  "caml_ml_enable_runtime_warnings"
-external runtime_warnings_enabled: unit -> bool =
-  "caml_ml_runtime_warnings_enabled"
-
-(* The version string is found in file ../VERSION *)
-
-let ocaml_version = "%%VERSION%%"
-
-(* Optimization *)
-
-external opaque_identity : 'a -> 'a = "%opaque"
diff --git a/jscomp/stdlib-406/sys.res b/jscomp/stdlib-406/sys.res
deleted file mode 100644
index bffe3aa..0000000
--- a/jscomp/stdlib-406/sys.res
+++ /dev/null
@@ -1,131 +0,0 @@
-@@bs.config({flags: ["-bs-no-cross-module-opt"]})
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/* WARNING: sys.ml is generated from sys.mlp.  DO NOT EDIT sys.ml or
-   your changes will be lost.
-*/
-
-type backend_type =
-  | Native
-  | Bytecode
-  | Other(string)
-/* System interface */
-
-external get_argv: unit => (string, array<string>) = "?sys_get_argv"
-external big_endian: unit => bool = "%big_endian"
-external word_size: unit => int = "%word_size"
-external int_size: unit => int = "%int_size"
-/* external max_wosize : unit -> int = "%max_wosize" */
-external unix: unit => bool = "%ostype_unix"
-external win32: unit => bool = "%ostype_win32"
-external cygwin: unit => bool = "%ostype_cygwin"
-external get_backend_type: unit => backend_type = "%backend_type"
-
-let (executable_name, argv) = get_argv()
-
-external get_os_type: unit => string = "#os_type"
-let os_type = get_os_type()
-let backend_type = get_backend_type()
-let big_endian = big_endian()
-let word_size = word_size()
-let int_size = int_size()
-let unix = unix()
-let win32 = win32()
-let cygwin = cygwin()
-
-let max_array_length = 2147483647 /* 2^ 31 - 1 */
-let max_string_length = 2147483647
-
-external runtime_variant: unit => string = "?runtime_variant"
-external runtime_parameters: unit => string = "?runtime_parameters"
-
-external file_exists: string => bool = "?sys_file_exists"
-external is_directory: string => bool = "?sys_is_directory"
-external remove: string => unit = "?sys_remove"
-external rename: (string, string) => unit = "?sys_rename"
-external getenv: string => string = "?sys_getenv"
-
-@get_index external getEnv: ('a, string) => option<string> = ""
-let getenv_opt = s =>
-  switch %external(process) {
-  | None => None
-  | Some(x) => getEnv(x["env"], s)
-  }
-
-let command: string => int = _ => 127
-external time: unit => float = "?sys_time"
-external chdir: string => unit = "?sys_chdir"
-external getcwd: unit => string = "?sys_getcwd"
-external readdir: string => array<string> = "?sys_read_directory"
-
-let interactive = ref(false)
-
-type signal_behavior =
-  | Signal_default
-  | Signal_ignore
-  | Signal_handle(int => unit)
-
-let signal: (int, signal_behavior) => signal_behavior = (_, _) => Signal_default
-
-let set_signal = (sig_num, sig_beh) => ignore(signal(sig_num, sig_beh))
-
-let sigabrt = -1
-let sigalrm = -2
-let sigfpe = -3
-let sighup = -4
-let sigill = -5
-let sigint = -6
-let sigkill = -7
-let sigpipe = -8
-let sigquit = -9
-let sigsegv = -10
-let sigterm = -11
-let sigusr1 = -12
-let sigusr2 = -13
-let sigchld = -14
-let sigcont = -15
-let sigstop = -16
-let sigtstp = -17
-let sigttin = -18
-let sigttou = -19
-let sigvtalrm = -20
-let sigprof = -21
-let sigbus = -22
-let sigpoll = -23
-let sigsys = -24
-let sigtrap = -25
-let sigurg = -26
-let sigxcpu = -27
-let sigxfsz = -28
-
-exception Break
-
-let catch_break = on =>
-  if on {
-    set_signal(sigint, Signal_handle(_ => raise(Break)))
-  } else {
-    set_signal(sigint, Signal_default)
-  }
-
-let enable_runtime_warnings: bool => unit = _ => ()
-let runtime_warnings_enabled: unit => bool = _ => false
-/* The version string is found in file ../VERSION */
-
-let ocaml_version = "4.06.2+BS"
-
-/* Optimization */
-
-external opaque_identity: 'a => 'a = "%opaque"
diff --git a/jscomp/stdlib-406/sys.resi b/jscomp/stdlib-406/sys.resi
deleted file mode 100644
index 544b643..0000000
--- a/jscomp/stdlib-406/sys.resi
+++ /dev/null
@@ -1,323 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** System interface.
-
-  Every function in this module raises [Sys_error] with an
-  informative message when the underlying system call signal
-  an error.
-*/
-
-/** The command line arguments given to the process.
-   The first element is the command name used to invoke the program.
-   The following elements are the command-line arguments
-   given to the program. */
-let argv: array<string>
-
-/** The name of the file containing the executable currently running. */
-let executable_name: string
-
-/** Test if a file with the given name exists. */
-external file_exists: string => bool = "?sys_file_exists"
-
-/** Returns [true] if the given name refers to a directory,
-    [false] if it refers to another kind of file.
-    Raise [Sys_error] if no file exists with the given name.
-    @since 3.10.0
-*/
-external is_directory: string => bool = "?sys_is_directory"
-
-/** Remove the given file name from the file system. */
-external remove: string => unit = "?sys_remove"
-
-/** Rename a file.  [rename oldpath newpath] renames the file
-    called [oldpath], giving it [newpath] as its new name,
-    moving it between directories if needed.  If [newpath] already
-    exists, its contents will be replaced with those of [oldpath].
-    Depending on the operating system, the metadata (permissions,
-    owner, etc) of [newpath] can either be preserved or be replaced by
-    those of [oldpath].
-   @since 4.06 concerning the "replace existing file" behavior */
-external rename: (string, string) => unit = "?sys_rename"
-
-/** Return the value associated to a variable in the process
-   environment. Raise [Not_found] if the variable is unbound. */
-external getenv: string => string = "?sys_getenv"
-
-/** Return the value associated to a variable in the process
-    environment or [None] if the variable is unbound.
-    @since 4.05
-*/
-let getenv_opt: string => option<string>
-
-/** Execute the given shell command and return its exit code. */
-let command: string => int
-
-/** Return the processor time, in seconds, used by the program
-   since the beginning of execution. */
-external time: unit => float = "?sys_time"
-
-/** Change the current working directory of the process. */
-external chdir: string => unit = "?sys_chdir"
-
-/** Return the current working directory of the process. */
-external getcwd: unit => string = "?sys_getcwd"
-
-/** Return the names of all files present in the given directory.
-   Names denoting the current directory and the parent directory
-   (["."] and [".."] in Unix) are not returned.  Each string in the
-   result is a file name rather than a complete path.  There is no
-   guarantee that the name strings in the resulting array will appear
-   in any specific order; they are not, in particular, guaranteed to
-   appear in alphabetical order. */
-external readdir: string => array<string> = "?sys_read_directory"
-
-/** This reference is initially set to [false] in standalone
-   programs and to [true] if the code is being executed under
-   the interactive toplevel system [ocaml]. */
-let interactive: ref<bool>
-
-/** Operating system currently executing the OCaml program. One of
--  ["Unix"] (for all Unix versions, including Linux and Mac OS X),
--  ["Win32"] (for MS-Windows, OCaml compiled with MSVC++ or Mingw),
--  ["Cygwin"] (for MS-Windows, OCaml compiled with Cygwin). */
-let os_type: string
-
-/** Currently, the official distribution only supports [Native] and
-    [Bytecode], but it can be other backends with alternative
-    compilers, for example, javascript.
-
-    @since 4.04.0
-*/
-type backend_type =
-  | Native
-  | Bytecode
-  | Other(string)
-
-/** Backend type  currently executing the OCaml program.
-    @since 4.04.0
- */
-let backend_type: backend_type
-
-/** True if [Sys.os_type = "Unix"].
-    @since 4.01.0 */
-let unix: bool
-
-/** True if [Sys.os_type = "Win32"].
-    @since 4.01.0 */
-let win32: bool
-
-/** True if [Sys.os_type = "Cygwin"].
-    @since 4.01.0 */
-let cygwin: bool
-
-/** Size of one word on the machine currently executing the OCaml
-   program, in bits: 32 or 64. */
-let word_size: int
-
-/** Size of an int.  It is 31 bits (resp. 63 bits) when using the
-    OCaml compiler on a 32 bits (resp. 64 bits) platform.  It may
-    differ for other compilers, e.g. it is 32 bits when compiling to
-    JavaScript.
-    @since 4.03.0 */
-let int_size: int
-
-/** Whether the machine currently executing the Caml program is big-endian.
-    @since 4.00.0 */
-let big_endian: bool
-
-/** Maximum length of strings and byte sequences. */
-let max_string_length: int
-
-/** Maximum length of a normal array.  The maximum length of a float
-    array is [max_array_length/2] on 32-bit machines and
-    [max_array_length] on 64-bit machines. */
-let max_array_length: int
-
-/** Return the name of the runtime variant the program is running on.
-    This is normally the argument given to [-runtime-variant] at compile
-    time, but for byte-code it can be changed after compilation.
-    @since 4.03.0 */
-external runtime_variant: unit => string = "?runtime_variant"
-
-/** Return the value of the runtime parameters, in the same format
-    as the contents of the [OCAMLRUNPARAM] environment variable.
-    @since 4.03.0 */
-external runtime_parameters: unit => string = "?runtime_parameters"
-
-/* {1 Signal handling} */
-
-/** What to do when receiving a signal:
-   - [Signal_default]: take the default behavior
-     (usually: abort the program)
-   - [Signal_ignore]: ignore the signal
-   - [Signal_handle f]: call function [f], giving it the signal
-   number as argument. */
-type signal_behavior =
-  | Signal_default
-  | Signal_ignore
-  | /** */ Signal_handle(int => unit)
-
-/** Set the behavior of the system on receipt of a given signal.  The
-   first argument is the signal number.  Return the behavior
-   previously associated with the signal. If the signal number is
-   invalid (or not available on your system), an [Invalid_argument]
-   exception is raised. */
-let signal: (int, signal_behavior) => signal_behavior
-
-/** Same as {!Sys.signal} but return value is ignored. */
-let set_signal: (int, signal_behavior) => unit
-
-/* {2 Signal numbers for the standard POSIX signals.} */
-
-/** Abnormal termination */
-let sigabrt: int
-
-/** Timeout */
-let sigalrm: int
-
-/** Arithmetic exception */
-let sigfpe: int
-
-/** Hangup on controlling terminal */
-let sighup: int
-
-/** Invalid hardware instruction */
-let sigill: int
-
-/** Interactive interrupt (ctrl-C) */
-let sigint: int
-
-/** Termination (cannot be ignored) */
-let sigkill: int
-
-/** Broken pipe */
-let sigpipe: int
-
-/** Interactive termination */
-let sigquit: int
-
-/** Invalid memory reference */
-let sigsegv: int
-
-/** Termination */
-let sigterm: int
-
-/** Application-defined signal 1 */
-let sigusr1: int
-
-/** Application-defined signal 2 */
-let sigusr2: int
-
-/** Child process terminated */
-let sigchld: int
-
-/** Continue */
-let sigcont: int
-
-/** Stop */
-let sigstop: int
-
-/** Interactive stop */
-let sigtstp: int
-
-/** Terminal read from background process */
-let sigttin: int
-
-/** Terminal write from background process */
-let sigttou: int
-
-/** Timeout in virtual time */
-let sigvtalrm: int
-
-/** Profiling interrupt */
-let sigprof: int
-
-/** Bus error
-    @since 4.03 */
-let sigbus: int
-
-/** Pollable event
-    @since 4.03 */
-let sigpoll: int
-
-/** Bad argument to routine
-    @since 4.03 */
-let sigsys: int
-
-/** Trace/breakpoint trap
-    @since 4.03 */
-let sigtrap: int
-
-/** Urgent condition on socket
-    @since 4.03 */
-let sigurg: int
-
-/** Timeout in cpu time
-    @since 4.03 */
-let sigxcpu: int
-
-/** File size limit exceeded
-    @since 4.03 */
-let sigxfsz: int
-
-/** Exception raised on interactive interrupt if {!Sys.catch_break}
-   is on. */ exception Break
-
-/** [catch_break] governs whether interactive interrupt (ctrl-C)
-   terminates the program or raises the [Break] exception.
-   Call [catch_break true] to enable raising [Break],
-   and [catch_break false] to let the system
-   terminate the program on user interrupt. */
-let catch_break: bool => unit
-
-/** [ocaml_version] is the version of OCaml.
-    It is a string of the form ["major.minor[.patchlevel][+additional-info]"],
-    where [major], [minor], and [patchlevel] are integers, and
-    [additional-info] is an arbitrary string. The [[.patchlevel]] and
-    [[+additional-info]] parts may be absent. */
-let ocaml_version: string
-
-/** Control whether the OCaml runtime system can emit warnings
-    on stderr.  Currently, the only supported warning is triggered
-    when a channel created by [open_*] functions is finalized without
-    being closed.  Runtime warnings are enabled by default.
-
-    @since 4.03.0 */
-let enable_runtime_warnings: bool => unit
-
-/** Return whether runtime warnings are currently enabled.
-
-    @since 4.03.0 */
-let runtime_warnings_enabled: unit => bool
-
-/* {1 Optimization} */
-
-/** For the purposes of optimization, [opaque_identity] behaves like an
-    unknown (and thus possibly side-effecting) function.
-
-    At runtime, [opaque_identity] disappears altogether.
-
-    A typical use of this function is to prevent pure computations from being
-    optimized away in benchmarking loops.  For example:
-    {[
-      for _round = 1 to 100_000 do
-        ignore (Sys.opaque_identity (my_pure_computation ()))
-      done
-    ]}
-
-    @since 4.03.0
-*/
-external opaque_identity: 'a => 'a = "%opaque"
diff --git a/jscomp/stdlib-406/uchar.res b/jscomp/stdlib-406/uchar.res
deleted file mode 100644
index de27d35..0000000
--- a/jscomp/stdlib-406/uchar.res
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Daniel C. Buenzli */
-/*  */
-/* Copyright 2014 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-external format_int: (string, int) => string = "?format_int"
-
-let err_no_pred = "U+0000 has no predecessor"
-let err_no_succ = "U+10FFFF has no successor"
-let err_not_sv = i => format_int("%X", i) ++ " is not an Unicode scalar value"
-let err_not_latin1 = u => "U+" ++ (format_int("%04X", u) ++ " is not a latin1 character")
-
-type t = int
-
-let min = 0x0000
-let max = 0x10FFFF
-let lo_bound = 0xD7FF
-let hi_bound = 0xE000
-
-let bom = 0xFEFF
-let rep = 0xFFFD
-
-let succ = u =>
-  if u == lo_bound {
-    hi_bound
-  } else if u == max {
-    invalid_arg(err_no_succ)
-  } else {
-    u + 1
-  }
-
-let pred = u =>
-  if u == hi_bound {
-    lo_bound
-  } else if u == min {
-    invalid_arg(err_no_pred)
-  } else {
-    u - 1
-  }
-
-let is_valid = i => (min <= i && i <= lo_bound) || (hi_bound <= i && i <= max)
-let of_int = i =>
-  if is_valid(i) {
-    i
-  } else {
-    invalid_arg(err_not_sv(i))
-  }
-external unsafe_of_int: int => t = "%identity"
-external to_int: t => int = "%identity"
-
-let is_char = u => u < 256
-let of_char = c => Char.code(c)
-let to_char = u =>
-  if u > 255 {
-    invalid_arg(err_not_latin1(u))
-  } else {
-    Char.unsafe_chr(u)
-  }
-
-let unsafe_to_char = Char.unsafe_chr
-
-let equal: (int, int) => bool = \"="
-let compare: (int, int) => int = Pervasives.compare
-let hash = to_int
diff --git a/jscomp/stdlib-406/uchar.resi b/jscomp/stdlib-406/uchar.resi
deleted file mode 100644
index d837b86..0000000
--- a/jscomp/stdlib-406/uchar.resi
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Daniel C. Buenzli */
-/*  */
-/* Copyright 2014 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-/*** Unicode characters.
-
-    @since 4.03 */
-
-/** The type for Unicode characters.
-
-    A value of this type represents an Unicode
-    {{:http://unicode.org/glossary/#unicode_scalar_value}scalar
-    value} which is an integer in the ranges [0x0000]...[0xD7FF] or
-    [0xE000]...[0x10FFFF]. */
-type t
-
-/** [min] is U+0000. */
-let min: t
-
-/** [max] is U+10FFFF. */
-let max: t
-
-/** [bom] is U+FEFF, the
-    {{:http://unicode.org/glossary/#byte_order_mark}byte order mark} (BOM)
-    character.
-
-    @since 4.06.0 */
-let bom: t
-
-/** [rep] is U+FFFD, the
-    {{:http://unicode.org/glossary/#replacement_character}replacement}
-    character.
-
-    @since 4.06.0 */
-let rep: t
-
-/** [succ u] is the scalar value after [u] in the set of Unicode scalar
-    values.
-
-    @raise Invalid_argument if [u] is {!max}. */
-let succ: t => t
-
-/** [pred u] is the scalar value before [u] in the set of Unicode scalar
-    values.
-
-    @raise Invalid_argument if [u] is {!min}. */
-let pred: t => t
-
-/** [is_valid n] is [true] iff [n] is an Unicode scalar value
-    (i.e. in the ranges [0x0000]...[0xD7FF] or [0xE000]...[0x10FFFF]).*/
-let is_valid: int => bool
-
-/** [of_int i] is [i] as an Unicode character.
-
-    @raise Invalid_argument if [i] does not satisfy {!is_valid}. */
-let of_int: int => t
-
-let unsafe_of_int: int => t
-
-/** [to_int u] is [u] as an integer. */
-let to_int: t => int
-
-/** [is_char u] is [true] iff [u] is a latin1 OCaml character. */
-let is_char: t => bool
-
-/** [of_char c] is [c] as an Unicode character. */
-let of_char: char => t
-
-/** [to_char u] is [u] as an OCaml latin1 character.
-
-    @raise Invalid_argument if [u] does not satisfy {!is_char}. */
-let to_char: t => char
-
-let unsafe_to_char: t => char
-
-/** [equal u u'] is [u = u']. */
-let equal: (t, t) => bool
-
-/** [compare u u'] is [Pervasives.compare u u']. */
-let compare: (t, t) => int
-
-/** [hash u] associates a non-negative integer to [u]. */
-let hash: t => int
diff --git a/jscomp/syntax/.ocamlformat-ignore b/jscomp/syntax/.ocamlformat-ignore
deleted file mode 100644
index 0c4403d..0000000
--- a/jscomp/syntax/.ocamlformat-ignore
+++ /dev/null
@@ -1 +0,0 @@
-compiler-libs-406/*
diff --git a/jscomp/syntax/benchmarks/Benchmark.ml b/jscomp/syntax/benchmarks/Benchmark.ml
deleted file mode 100644
index 1a9f3cc..0000000
--- a/jscomp/syntax/benchmarks/Benchmark.ml
+++ /dev/null
@@ -1,255 +0,0 @@
-module ResParser = Res_core
-module Doc = Res_doc
-module CommentTable = Res_comments_table
-module Parser = Res_parser
-module Printer = Res_printer
-
-module IO : sig
-  val readFile : string -> string
-end = struct
-  (* random chunk size: 2^15, TODO: why do we guess randomly? *)
-  let chunkSize = 32768
-
-  let readFile filename =
-    let chan = open_in filename in
-    let buffer = Buffer.create chunkSize in
-    let chunk = (Bytes.create [@doesNotRaise]) chunkSize in
-    let rec loop () =
-      let len =
-        try input chan chunk 0 chunkSize with Invalid_argument _ -> 0
-      in
-      if len == 0 then (
-        close_in_noerr chan;
-        Buffer.contents buffer)
-      else (
-        Buffer.add_subbytes buffer chunk 0 len;
-        loop ())
-    in
-    loop ()
-end
-
-module Time : sig
-  type t
-
-  val now : unit -> t
-
-  val toUint64 : t -> int64 [@@live]
-
-  (* let of_uint64_ns ns = ns *)
-
-  val nanosecond : t [@@live]
-  val microsecond : t [@@live]
-  val millisecond : t [@@live]
-  val second : t [@@live]
-  val minute : t [@@live]
-  val hour : t [@@live]
-
-  val zero : t
-
-  val diff : t -> t -> t
-  val add : t -> t -> t
-  val print : t -> float
-end = struct
-  (* nanoseconds *)
-  type t = int64
-
-  let zero = 0L
-
-  let toUint64 s = s
-
-  let nanosecond = 1L
-  let microsecond = Int64.mul 1000L nanosecond
-  let millisecond = Int64.mul 1000L microsecond
-  let second = Int64.mul 1000L millisecond
-  let minute = Int64.mul 60L second
-  let hour = Int64.mul 60L minute
-
-  (* TODO: we could do this inside caml_absolute_time *)
-  external init : unit -> unit = "caml_mach_initialize"
-  let () = init ()
-  external now : unit -> t = "caml_mach_absolute_time"
-
-  let diff t1 t2 = Int64.sub t2 t1
-  let add t1 t2 = Int64.add t1 t2
-  let print t = Int64.to_float t *. 1e-6
-end
-
-module Benchmark : sig
-  type t
-
-  val make : name:string -> f:(t -> unit) -> unit -> t
-  val launch : t -> unit
-  val report : t -> unit
-end = struct
-  type t = {
-    name: string;
-    mutable start: Time.t;
-    mutable n: int; (* current iterations count *)
-    mutable duration: Time.t;
-    benchFunc: t -> unit;
-    mutable timerOn: bool;
-    (* mutable result: benchmarkResult; *)
-    (* The initial states *)
-    mutable startAllocs: float;
-    mutable startBytes: float;
-    (* The net total of this test after being run. *)
-    mutable netAllocs: float;
-    mutable netBytes: float;
-  }
-
-  let report b =
-    print_endline (Format.sprintf "Benchmark: %s" b.name);
-    print_endline (Format.sprintf "Nbr of iterations: %d" b.n);
-    print_endline
-      (Format.sprintf "Benchmark ran during: %fms" (Time.print b.duration));
-    print_endline
-      (Format.sprintf "Avg time/op: %fms"
-         (Time.print b.duration /. float_of_int b.n));
-    print_endline
-      (Format.sprintf "Allocs/op: %d"
-         (int_of_float (b.netAllocs /. float_of_int b.n)));
-    print_endline
-      (Format.sprintf "B/op: %d"
-         (int_of_float (b.netBytes /. float_of_int b.n)));
-
-    (* return (float64(r.Bytes) * float64(r.N) / 1e6) / r.T.Seconds() *)
-    print_newline ();
-    ()
-
-  let make ~name ~f () =
-    {
-      name;
-      start = Time.zero;
-      n = 0;
-      benchFunc = f;
-      duration = Time.zero;
-      timerOn = false;
-      startAllocs = 0.;
-      startBytes = 0.;
-      netAllocs = 0.;
-      netBytes = 0.;
-    }
-
-  (* total amount of memory allocated by the program since it started in words *)
-  let mallocs () =
-    let stats = Gc.quick_stat () in
-    stats.minor_words +. stats.major_words -. stats.promoted_words
-
-  let startTimer b =
-    if not b.timerOn then (
-      let allocatedWords = mallocs () in
-      b.startAllocs <- allocatedWords;
-      b.startBytes <- allocatedWords *. 8.;
-      b.start <- Time.now ();
-      b.timerOn <- true)
-
-  let stopTimer b =
-    if b.timerOn then (
-      let allocatedWords = mallocs () in
-      let diff = Time.diff b.start (Time.now ()) in
-      b.duration <- Time.add b.duration diff;
-      b.netAllocs <- b.netAllocs +. (allocatedWords -. b.startAllocs);
-      b.netBytes <- b.netBytes +. ((allocatedWords *. 8.) -. b.startBytes);
-      b.timerOn <- false)
-
-  let resetTimer b =
-    if b.timerOn then (
-      let allocatedWords = mallocs () in
-      b.startAllocs <- allocatedWords;
-      b.netAllocs <- allocatedWords *. 8.;
-      b.start <- Time.now ());
-    b.netAllocs <- 0.;
-    b.netBytes <- 0.
-
-  let runIteration b n =
-    Gc.full_major ();
-    b.n <- n;
-    resetTimer b;
-    startTimer b;
-    b.benchFunc b;
-    stopTimer b
-
-  let launch b =
-    (* 150 runs * all the benchmarks means around 1m of benchmark time *)
-    for n = 1 to 150 do
-      runIteration b n
-    done
-end
-
-module Benchmarks : sig
-  val run : unit -> unit
-end = struct
-  type action = Parse | Print
-  let string_of_action action =
-    match action with
-    | Parse -> "parser"
-    | Print -> "printer"
-
-  (* TODO: we could at Reason here *)
-  type lang = Ocaml | Rescript
-  let string_of_lang lang =
-    match lang with
-    | Ocaml -> "ocaml"
-    | Rescript -> "rescript"
-
-  let parseOcaml src filename =
-    let lexbuf = Lexing.from_string src in
-    Location.init lexbuf filename;
-    Parse.implementation lexbuf
-
-  let parseRescript src filename =
-    let p = Parser.make src filename in
-    let structure = ResParser.parseImplementation p in
-    assert (p.diagnostics == []);
-    structure
-
-  let benchmark filename lang action =
-    let src = IO.readFile filename in
-    let name =
-      filename ^ " " ^ string_of_lang lang ^ " " ^ string_of_action action
-    in
-    let benchmarkFn =
-      match (lang, action) with
-      | Rescript, Parse ->
-        fun _ ->
-          let _ = Sys.opaque_identity (parseRescript src filename) in
-          ()
-      | Ocaml, Parse ->
-        fun _ ->
-          let _ = Sys.opaque_identity (parseOcaml src filename) in
-          ()
-      | Rescript, Print ->
-        let p = Parser.make src filename in
-        let ast = ResParser.parseImplementation p in
-        fun _ ->
-          let _ =
-            Sys.opaque_identity
-              (let cmtTbl = CommentTable.make () in
-               let comments = List.rev p.Parser.comments in
-               let () = CommentTable.walkStructure ast cmtTbl comments in
-               Doc.toString ~width:80 (Printer.printStructure ast cmtTbl))
-          in
-          ()
-      | _ -> fun _ -> ()
-    in
-    let b = Benchmark.make ~name ~f:benchmarkFn () in
-    Benchmark.launch b;
-    Benchmark.report b
-
-  let run () =
-    let dataDir = "jscomp/syntax/benchmarks/data" in
-    benchmark (Filename.concat dataDir "RedBlackTree.res") Rescript Parse;
-    benchmark (Filename.concat dataDir "RedBlackTree.ml") Ocaml Parse;
-    benchmark (Filename.concat dataDir "RedBlackTree.res") Rescript Print;
-    benchmark
-      (Filename.concat dataDir "RedBlackTreeNoComments.res")
-      Rescript Print;
-    benchmark (Filename.concat dataDir "Napkinscript.res") Rescript Parse;
-    benchmark (Filename.concat dataDir "Napkinscript.ml") Ocaml Parse;
-    benchmark (Filename.concat dataDir "Napkinscript.res") Rescript Print;
-    benchmark (Filename.concat dataDir "HeroGraphic.res") Rescript Parse;
-    benchmark (Filename.concat dataDir "HeroGraphic.ml") Ocaml Parse;
-    benchmark (Filename.concat dataDir "HeroGraphic.res") Rescript Print
-end
-
-let () = Benchmarks.run ()
diff --git a/jscomp/syntax/benchmarks/data/HeroGraphic.ml b/jscomp/syntax/benchmarks/data/HeroGraphic.ml
deleted file mode 100644
index 08feb30..0000000
--- a/jscomp/syntax/benchmarks/data/HeroGraphic.ml
+++ /dev/null
@@ -1,8654 +0,0 @@
-;;[%bs.raw {|require('./HeroGraphic.css')|}]
-let make ?(width= "760")  ?(height= "380")  =
-  ((svg ~width:((width)) ~height:((height))
-      ~viewBox:(("0 0 758 381")) ~fill:(("none")
-      ) ~xmlns:(("http://www.w3.org/2000/svg")
-      )
-      ~children:[((path
-                     ~d:(("M78.8374 255.364H664.923C664.923 255.364 677.451 256.743 677.451 270.971C677.451 285.2 667.673 288.178 667.673 288.178H579.485C579.485 288.178 592.014 290.163 592.014 304.888C592.014 319.612 582.785 321.101 582.785 321.101H524.544C524.544 321.101 507.676 322.59 508.776 333.896C509.876 345.201 520.204 346.194 520.204 346.194H626.849C626.849 346.194 644.266 347.683 643.166 363.897C642.066 380.11 632.288 380.11 632.288 380.11H186.032C186.032 380.11 166.964 379.118 167.514 364.393C168.064 349.668 186.582 350.661 186.582 350.661H121.801C121.801 350.661 104.628 351.598 104.628 338.252C104.628 320.715 121.862 322.149 121.862 322.149H142.457C142.457 322.149 159.264 323.362 159.264 306.101C159.264 293.748 144.657 292.7 144.657 292.7H77.6151C77.6151 292.7 56.4084 290.439 56.4695 275.769C56.5918 260.879 66.3089 255.364 78.8374 255.364Z")
-                     ) ~fill:(("#0B1627"))
-                     ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.57"))
-                    ~d:(("M393.453 244.555C393.453 244.555 398.709 220.841 391.437 205.344C384.103 189.848 369.68 187.145 369.68 187.145C366.991 161.722 351.59 142.916 317.794 145.288C283.998 147.714 270.614 166.134 270.614 166.134C270.614 166.134 274.342 158.358 267.925 150.251C261.508 142.144 247.757 143.799 247.757 143.799C247.757 143.799 253.502 135.14 241.646 128.578C229.79 122.015 220.378 126.868 220.378 126.868C220.378 126.868 226.55 103.595 203.572 99.1834C180.593 94.7163 163.542 110.379 163.542 110.379C163.542 110.379 153.641 104.753 138.852 109.441C124.001 114.184 122.717 134.203 122.717 134.203C122.717 134.203 90.5713 118.541 55.675 137.457C31.5349 150.527 27.2569 178.377 26.9514 194.425C32.9406 207.495 40.152 215.547 40.152 215.547C31.5349 242.349 51.886 248.14 51.886 248.14H90.0824H358.496L393.453 244.555Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~className:(("HeroGraphic-cloudLeft")
-                    ) ~opacity:(("0.7"))
-                    ~d:(("M0.4885 96.7017H97.599C97.599 96.7017 99.0047 89.1463 88.6152 87.8779C88.6152 87.8779 87.393 74.4216 72.6644 69.6237C57.9359 64.8258 51.2133 72.2157 51.2133 72.2157C51.2133 72.2157 46.6909 67.3075 40.8239 68.0244C34.8958 68.7413 32.4513 75.5246 32.4513 75.5246C32.4513 75.5246 28.9677 73.3187 25.3009 75.1386C21.634 76.9585 21.8174 79.385 21.8174 79.385C21.8174 79.385 17.6005 78.4475 14.6059 78.282C11.6113 78.0615 -2.75056 78.999 0.4885 96.7017Z")
-                    ) ~fill:(("white"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M326.044 228.066H250.141V241.246H326.044V228.066Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.6"))
-                    ~d:(("M331.606 228.066H291.759V240.198H331.606V228.066Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M432.811 224.15H375.303V240.915H432.811V224.15Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M382.514 226.466H378.419V227.128H382.514V226.466Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M389.053 226.466H384.959V227.128H389.053V226.466Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M395.531 226.466H391.437V227.128H395.531V226.466Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M402.009 226.466H397.915V227.128H402.009V226.466Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M408.488 226.466H404.393V227.128H408.488V226.466Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M414.966 226.466H410.871V227.128H414.966V226.466Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M421.444 226.466H417.349V227.128H421.444V226.466Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M427.983 226.466H423.888V227.128H427.983V226.466Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M382.514 228.727H378.419V229.389H382.514V228.727Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M389.053 228.727H384.959V229.389H389.053V228.727Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M395.531 228.727H391.437V229.389H395.531V228.727Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M402.009 228.727H397.915V229.389H402.009V228.727Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M408.488 228.727H404.393V229.389H408.488V228.727Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M414.966 228.727H410.871V229.389H414.966V228.727Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M421.444 228.727H417.349V229.389H421.444V228.727Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M427.983 228.727H423.888V229.389H427.983V228.727Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M382.514 230.988H378.419V231.65H382.514V230.988Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M389.053 230.988H384.959V231.65H389.053V230.988Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M395.531 230.988H391.437V231.65H395.531V230.988Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M402.009 230.988H397.915V231.65H402.009V230.988Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M408.488 230.988H404.393V231.65H408.488V230.988Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M414.966 230.988H410.871V231.65H414.966V230.988Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M421.444 230.988H417.349V231.65H421.444V230.988Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M427.983 230.988H423.888V231.65H427.983V230.988Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M382.514 233.25H378.419V233.911H382.514V233.25Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M389.053 233.25H384.959V233.911H389.053V233.25Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M395.531 233.25H391.437V233.911H395.531V233.25Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M402.009 233.25H397.915V233.911H402.009V233.25Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M408.488 233.25H404.393V233.911H408.488V233.25Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M414.966 233.25H410.871V233.911H414.966V233.25Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M421.444 233.25H417.349V233.911H421.444V233.25Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M427.983 233.25H423.888V233.911H427.983V233.25Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M382.514 235.511H378.419V236.172H382.514V235.511Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M389.053 235.511H384.959V236.172H389.053V235.511Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M395.531 235.511H391.437V236.172H395.531V235.511Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M402.009 235.511H397.915V236.172H402.009V235.511Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M408.488 235.511H404.393V236.172H408.488V235.511Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M414.966 235.511H410.871V236.172H414.966V235.511Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M421.444 235.511H417.349V236.172H421.444V235.511Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M427.983 235.511H423.888V236.172H427.983V235.511Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M378.969 224.15H375.303V240.915H378.969V224.15Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M178.087 221.999H171.181V225.032H178.087V221.999Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M186.826 221.999H179.92V225.032H186.826V221.999Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M195.566 221.999H188.66V225.032H195.566V221.999Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M178.087 226.411H171.181V229.444H178.087V226.411Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M186.826 226.411H179.92V229.444H186.826V226.411Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M195.566 226.411H188.66V229.444H195.566V226.411Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M160.914 230.933H112.206V244.555H160.914V230.933Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 220.234H115.689V221.779H117.4V220.234Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 220.234H120.701V221.779H122.412V220.234Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 220.234H125.651V221.779H127.362V220.234Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 220.234H130.601V221.779H132.312V220.234Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 220.234H135.551V221.779H137.263V220.234Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 220.234H140.563V221.779H142.274V220.234Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 220.234H145.513V221.779H147.224V220.234Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 220.234H150.463V221.779H152.174V220.234Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 220.234H155.413V221.779H157.125V220.234Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 223.819H115.689V225.363H117.4V223.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 223.819H120.701V225.363H122.412V223.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 223.819H125.651V225.363H127.362V223.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 223.819H130.601V225.363H132.312V223.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 223.819H135.551V225.363H137.263V223.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 223.819H140.563V225.363H142.274V223.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 223.819H145.513V225.363H147.224V223.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 223.819H150.463V225.363H152.174V223.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 223.819H155.413V225.363H157.125V223.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 227.459H115.689V229.003H117.4V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 227.459H120.701V229.003H122.412V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 227.459H125.651V229.003H127.362V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 227.459H130.601V229.003H132.312V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 227.459H135.551V229.003H137.263V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 227.459H140.563V229.003H142.274V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 227.459H145.513V229.003H147.224V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 227.459H150.463V229.003H152.174V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 227.459H155.413V229.003H157.125V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~className:(("HeroGraphic-wave"))
-                    ~d:(("M81.5264 248.14H667.612C667.612 248.14 680.14 249.518 680.14 263.747C680.14 277.975 670.362 280.953 670.362 280.953H582.174C582.174 280.953 594.703 282.939 594.703 297.663C594.703 312.388 585.474 313.877 585.474 313.877H527.233C527.233 313.877 510.365 315.366 511.465 326.671C512.565 337.977 522.893 338.969 522.893 338.969H629.538C629.538 338.969 646.955 340.458 645.855 356.672C644.755 372.886 634.977 372.886 634.977 372.886H188.721C188.721 372.886 169.653 371.893 170.203 357.168C170.753 342.444 189.271 343.436 189.271 343.436H124.49C124.49 343.436 107.317 344.374 107.317 331.028C107.317 313.491 124.551 314.925 124.551 314.925H145.146C145.146 314.925 161.953 316.138 161.953 298.876C161.953 286.523 147.346 285.475 147.346 285.475H80.3041C80.3041 285.475 59.0975 283.214 59.1586 268.545C59.2808 253.655 68.998 248.14 81.5264 248.14Z")
-                    ) ~fill:(("url(#paint0_linear)")
-                    ) ~fillOpacity:(("0.7")
-                    ) ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.66"))
-                    ~d:(("M112.206 248.14V285.365H147.408C147.408 285.365 151.869 285.696 155.841 288.067H160.914V274.39L169.592 269.923V268.655H181.998H199.477V264.464H201.066V273.949L205.527 274.28V284.979V285.641H203.571V287.35H228.751H252.096V285.641H250.141V284.979V277.424L265.419 278.527H274.831V264.298H279.048V273.674H291.393V286.799H291.82V298.38V299.704H297.26V303.013H300.804V312.002H301.904V303.013H303.31V312.002H304.41V303.013H318.222V312.002H319.322V303.013H320.727V312.002H321.828V303.013H326.228V299.704H331.667V298.38V286.799H341.812V273.839H354.707V273.949H354.89V287.24H390.948V282.497H396.265V290.935H401.948V306.763L405.798 306.983L406.349 307.038L412.582 307.424H412.704L414.966 307.59L415.821 307.645L417.349 307.755L418.205 307.81L419.733 307.921L420.588 307.976L425.233 308.252V304.998H432.933V278.747H439.472L445.034 282.938V293.692H475.285V276.155H508.47V287.295H544.528V282.552H550.639V294.575V295.126H559.806V295.568V297.222H564.757V304.722H566.529V297.167H569.707V295.512V295.071H571.418V308.362H592.319C593.725 305.935 594.703 302.516 594.703 297.608C594.703 282.883 582.174 280.898 582.174 280.898H635.894V248.085H112.206V248.14Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.5"))
-                    ~d:(("M125.712 326.34V326.782H126.14V326.34H129.073L130.54 339.19V339.025L131.885 326.34H134.879L136.346 339.19L137.69 326.34H140.379V326.782H140.929V326.34H141.235V326.23H140.929V321.984H144.169V314.87H124.673C124.673 314.87 123.817 314.814 122.412 314.87V321.929H125.773V326.175V326.34H125.712ZM138.118 321.929H140.379V326.175H137.69L138.118 321.929ZM132.312 321.929H134.329L134.818 326.175H131.823L132.312 321.929ZM126.079 321.929H128.523L129.012 326.175H126.14V321.929H126.079Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M552.717 270.806C552.717 272.57 551.128 274.06 549.111 274.06H480.358C478.402 274.06 476.752 272.626 476.752 270.806C476.752 269.041 478.341 267.552 480.358 267.552H549.173C551.128 267.552 552.717 269.041 552.717 270.806Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M165.008 261.1C165.008 262.313 163.97 263.25 162.625 263.25H153.458C152.113 263.25 151.074 262.313 151.074 261.1C151.074 259.886 152.113 258.949 153.458 258.949H162.625C163.97 258.949 165.008 259.941 165.008 261.1Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M226.673 263.25C226.673 264.464 225.634 265.401 224.289 265.401H192.449C191.104 265.401 190.065 264.464 190.065 263.25C190.065 262.037 191.104 261.1 192.449 261.1H224.289C225.573 261.1 226.673 262.092 226.673 263.25Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M376.036 297.553C376.036 298.27 375.425 298.821 374.63 298.821H361.613C360.819 298.821 360.207 298.27 360.207 297.553C360.207 296.836 360.819 296.284 361.613 296.284H374.63C375.425 296.284 376.036 296.836 376.036 297.553Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~className:(("HeroGraphic-wave"))
-                    ~d:(("M391.681 296.836C391.681 295.733 392.659 294.85 393.881 294.85H479.747C480.969 294.85 481.947 295.733 481.947 296.836C481.947 297.939 480.969 298.821 479.747 298.821H393.881C392.659 298.766 391.681 297.884 391.681 296.836Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M208.4 296.174C208.4 296.891 207.727 297.498 206.933 297.498H194.343C193.549 297.498 192.877 296.891 192.877 296.174C192.877 295.457 193.549 294.85 194.343 294.85H206.872C207.727 294.85 208.4 295.457 208.4 296.174Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~className:(("HeroGraphic-wave"))
-                    ~d:(("M309.788 324.631C309.788 326.009 308.566 327.168 306.977 327.168H236.634C235.106 327.168 233.823 326.065 233.823 324.631C233.823 323.252 235.045 322.094 236.634 322.094H307.038C308.505 322.094 309.788 323.252 309.788 324.631Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M372.186 328.932C372.186 329.925 371.269 330.752 370.169 330.752H355.074C353.974 330.752 353.057 329.925 353.057 328.932C353.057 327.94 353.974 327.112 355.074 327.112H370.169C371.33 327.112 372.186 327.94 372.186 328.932Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M537.255 360.863C537.255 360.477 537.622 360.146 538.05 360.146H551.984C552.412 360.146 552.778 360.477 552.778 360.863C552.778 361.249 552.412 361.58 551.984 361.58H538.05C537.561 361.58 537.255 361.249 537.255 360.863Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M224.656 359.816C224.656 358.823 223.739 357.996 222.639 357.996H212.678C211.578 357.996 210.661 358.823 210.661 359.816C210.661 360.808 211.578 361.635 212.678 361.635H222.639C223.8 361.58 224.656 360.753 224.656 359.816Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M151.136 332.517C151.136 331.524 150.219 330.697 149.119 330.697H141.968C140.868 330.697 139.952 331.524 139.952 332.517C139.952 333.51 140.868 334.337 141.968 334.337H149.119C150.219 334.337 151.136 333.51 151.136 332.517Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.6"))
-                    ~d:(("M250.202 228.066H205.649V241.246H250.202V228.066Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M630.149 117.052H611.326V120.802H630.149V117.052Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M630.149 119.588H611.326V120.857H630.149V119.588Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.6"))
-                    ~d:(("M199.538 230.933H160.914V240.529H199.538V230.933Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M339.795 222.606H337.473V224.702H339.795V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M345.234 222.606H342.912V224.702H345.234V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M350.673 222.606H348.351V224.702H350.673V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M356.052 222.606H353.79V224.702H356.052V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M361.552 222.606H359.229V224.702H361.552V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M366.991 222.606H364.669V224.702H366.991V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M372.43 222.606H370.108V224.702H372.43V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 221.007H478.769V222.661H480.175V221.007Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 221.007H482.13V222.661H483.536V221.007Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 221.007H485.43V222.661H486.836V221.007Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 221.007H488.792V222.661H490.197V221.007Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.497 221.007H492.092V222.661H493.497V221.007Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 221.007H495.453V222.661H496.859V221.007Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 221.007H498.814V222.661H500.22V221.007Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 221.007H501.931V222.661H503.337V221.007Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 221.007H506.087V222.661H507.493V221.007Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 224.26H478.769V225.915H480.175V224.26Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M483.536 224.26H482.13V225.915H483.536V224.26Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M486.836 224.26H485.43V225.915H486.836V224.26Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 224.26H488.792V225.915H490.197V224.26Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.497 224.26H492.092V225.915H493.497V224.26Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 224.26H495.453V225.915H496.859V224.26Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M500.22 224.26H498.814V225.915H500.22V224.26Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 224.26H501.931V225.915H503.337V224.26Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 224.26H506.087V225.915H507.493V224.26Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 227.569H478.769V229.224H480.175V227.569Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 227.569H482.13V229.224H483.536V227.569Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 227.569H485.43V229.224H486.836V227.569Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 227.569H488.792V229.224H490.197V227.569Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.497 227.569H492.092V229.224H493.497V227.569Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 227.569H495.453V229.224H496.859V227.569Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 227.569H498.814V229.224H500.22V227.569Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 227.569H501.931V229.224H503.337V227.569Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 227.569H506.087V229.224H507.493V227.569Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 230.878H478.769V232.533H480.175V230.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 230.878H482.13V232.533H483.536V230.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 230.878H485.43V232.533H486.836V230.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 230.878H488.792V232.533H490.197V230.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.497 230.878H492.092V232.533H493.497V230.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 230.878H495.453V232.533H496.859V230.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 230.878H498.814V232.533H500.22V230.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 230.878H501.931V232.533H503.337V230.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 230.878H506.087V232.533H507.493V230.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 234.132H478.769V235.786H480.175V234.132Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 234.132H482.13V235.786H483.536V234.132Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 234.132H485.43V235.786H486.836V234.132Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 234.132H488.792V235.786H490.197V234.132Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.497 234.132H492.092V235.786H493.497V234.132Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 234.132H495.453V235.786H496.859V234.132Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 234.132H498.814V235.786H500.22V234.132Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 234.132H501.931V235.786H503.337V234.132Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 234.132H506.087V235.786H507.493V234.132Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M339.795 228.01H337.473V230.106H339.795V228.01Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M345.234 228.01H342.912V230.106H345.234V228.01Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M350.673 228.01H348.351V230.106H350.673V228.01Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M356.052 228.01H353.79V230.106H356.052V228.01Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M361.552 228.01H359.229V230.106H361.552V228.01Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M366.991 228.01H364.669V230.106H366.991V228.01Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M372.43 228.01H370.108V230.106H372.43V228.01Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M267.925 236.228H266.519V237.496H267.925V236.228Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M271.286 236.228H269.88V237.496H271.286V236.228Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M274.586 236.228H273.181V237.496H274.586V236.228Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M277.886 236.228H276.481V237.496H277.886V236.228Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M281.187 236.228H279.781V237.496H281.187V236.228Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M284.487 236.228H283.081V237.496H284.487V236.228Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M287.787 236.228H286.381V237.496H287.787V236.228Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.6"))
-                    ~d:(("M375.303 228.066H334.173V240.253H375.303V228.066Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.3"))
-                    ~d:(("M432.811 228.066H375.303V240.253H432.811V228.066Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M444.362 220.4H434.767V223.819H444.362V220.4Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M454.69 220.4H445.095V223.819H454.69V220.4Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M464.957 220.4H455.362V223.819H464.957V220.4Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M475.224 220.4H465.629V223.819H475.224V220.4Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M444.362 224.536H434.767V227.955H444.362V224.536Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M454.69 224.536H445.095V227.955H454.69V224.536Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M464.957 224.536H455.362V227.955H464.957V224.536Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M475.224 224.536H465.629V227.955H475.224V224.536Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M444.362 228.672H434.767V232.091H444.362V228.672Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M454.69 228.672H445.095V232.091H454.69V228.672Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M464.957 228.672H455.362V232.091H464.957V228.672Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M475.224 228.672H465.629V232.091H475.224V228.672Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M444.362 231.54H434.767V234.959H444.362V231.54Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M454.69 231.54H445.095V234.959H454.69V231.54Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M464.957 231.54H455.362V234.959H464.957V231.54Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M475.224 231.54H465.629V234.959H475.224V231.54Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.3"))
-                    ~d:(("M476.141 228.01H432.628V241.081H476.141V228.01Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.6"))
-                    ~d:(("M509.998 230.713H476.08V240.474H509.998V230.713Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.4"))
-                    ~d:(("M548.867 230.713H514.949V240.474H548.867V230.713Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.7"))
-                    ~d:(("M603.809 230.713H578.569V240.474H603.809V230.713Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M128.401 75.3592L130.479 36.0934L132.374 75.3592H128.401Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.477 36.4794V36.0934L128.461 75.3592H128.95C129.744 75.1386 130.539 74.8628 130.539 74.8628V36.4794H130.477Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.207 75.3592L136.285 36.0934L138.179 75.3592H134.207Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.283 36.4794V36.0934L134.266 75.3592H134.755C135.55 75.1386 136.344 74.8628 136.344 74.8628V36.4794H136.283Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.14 62.8405H125.712V73.7599H126.14V62.8405Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M140.868 62.8405H140.318V73.7599H140.868V62.8405Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M141.174 63.778H125.712V64.0538H141.174V63.778Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M144.107 73.3187H122.351V105.801H144.107V73.3187Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M125.284 75.3592H124.001V76.5173H125.284V75.3592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M128.157 75.3592H126.873V76.5173H128.157V75.3592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.968 75.3592H129.684V76.5173H130.968V75.3592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.84 75.3592H132.557V76.5173H133.84V75.3592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.713 75.3592H135.429V76.5173H136.713V75.3592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.585 75.3592H138.302V76.5173H139.585V75.3592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.457 75.3592H141.174V76.5173H142.457V75.3592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M125.284 77.2343H124.001V78.3924H125.284V77.2343Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M128.157 77.2343H126.873V78.3924H128.157V77.2343Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.968 77.2343H129.684V78.3924H130.968V77.2343Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.84 77.2343H132.557V78.3924H133.84V77.2343Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.713 77.2343H135.429V78.3924H136.713V77.2343Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.585 77.2343H138.302V78.3924H139.585V77.2343Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.457 77.2343H141.174V78.3924H142.457V77.2343Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 79.2747H124.001V79.8262H124.612V79.2747Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.118 79.2747H126.506V79.8262H127.118V79.2747Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M129.684 79.2747H129.073V79.8262H129.684V79.2747Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.251 79.2747H131.64V79.8262H132.251V79.2747Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.757 79.2747H134.146V79.8262H134.757V79.2747Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.324 79.2747H136.712V79.8262H137.324V79.2747Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.891 79.2747H139.279V79.8262H139.891V79.2747Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.396 79.2747H141.785V79.8262H142.396V79.2747Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 81.7564H124.001V82.3079H124.612V81.7564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.118 81.7564H126.506V82.3079H127.118V81.7564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M129.684 81.7564H129.073V82.3079H129.684V81.7564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.251 81.7564H131.64V82.3079H132.251V81.7564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.757 81.7564H134.146V82.3079H134.757V81.7564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.324 81.7564H136.712V82.3079H137.324V81.7564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.891 81.7564H139.279V82.3079H139.891V81.7564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.396 81.7564H141.785V82.3079H142.396V81.7564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 84.2381H124.001V84.7896H124.612V84.2381Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.118 84.2381H126.506V84.7896H127.118V84.2381Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M129.684 84.2381H129.073V84.7896H129.684V84.2381Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.251 84.2381H131.64V84.7896H132.251V84.2381Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.757 84.2381H134.146V84.7896H134.757V84.2381Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.324 84.2381H136.712V84.7896H137.324V84.2381Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.891 84.2381H139.279V84.7896H139.891V84.2381Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.396 84.2381H141.785V84.7896H142.396V84.2381Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 86.6647H124.001V87.2162H124.612V86.6647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.118 86.6647H126.506V87.2162H127.118V86.6647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M129.684 86.6647H129.073V87.2162H129.684V86.6647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.251 86.6647H131.64V87.2162H132.251V86.6647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.757 86.6647H134.146V87.2162H134.757V86.6647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.324 86.6647H136.712V87.2162H137.324V86.6647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.891 86.6647H139.279V87.2162H139.891V86.6647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.396 86.6647H141.785V87.2162H142.396V86.6647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 89.1464H124.001V89.6978H124.612V89.1464Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.118 89.1464H126.506V89.6978H127.118V89.1464Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M129.684 89.1464H129.073V89.6978H129.684V89.1464Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.251 89.1464H131.64V89.6978H132.251V89.1464Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.757 89.1464H134.146V89.6978H134.757V89.1464Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.324 89.1464H136.712V89.6978H137.324V89.1464Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.891 89.1464H139.279V89.6978H139.891V89.1464Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.396 89.1464H141.785V89.6978H142.396V89.1464Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 91.628H124.001V92.1795H124.612V91.628Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.118 91.628H126.506V92.1795H127.118V91.628Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M129.684 91.628H129.073V92.1795H129.684V91.628Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M132.251 91.628H131.64V92.1795H132.251V91.628Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.757 91.628H134.146V92.1795H134.757V91.628Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.324 91.628H136.712V92.1795H137.324V91.628Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.891 91.628H139.279V92.1795H139.891V91.628Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.396 91.628H141.785V92.1795H142.396V91.628Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 94.1097H124.001V94.6612H124.612V94.1097Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.118 94.1097H126.506V94.6612H127.118V94.1097Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M129.684 94.1097H129.073V94.6612H129.684V94.1097Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.251 94.1097H131.64V94.6612H132.251V94.1097Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.757 94.1097H134.146V94.6612H134.757V94.1097Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.324 94.1097H136.712V94.6612H137.324V94.1097Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.891 94.1097H139.279V94.6612H139.891V94.1097Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.396 94.1097H141.785V94.6612H142.396V94.1097Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 96.5914H124.001V97.1429H124.612V96.5914Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.118 96.5914H126.506V97.1429H127.118V96.5914Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M129.684 96.5914H129.073V97.1429H129.684V96.5914Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.251 96.5914H131.64V97.1429H132.251V96.5914Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.757 96.5914H134.146V97.1429H134.757V96.5914Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.324 96.5914H136.712V97.1429H137.324V96.5914Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.891 96.5914H139.279V97.1429H139.891V96.5914Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.396 96.5914H141.785V97.1429H142.396V96.5914Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 99.0731H124.001V99.6246H124.612V99.0731Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.118 99.0731H126.506V99.6246H127.118V99.0731Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M129.684 99.0731H129.073V99.6246H129.684V99.0731Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.251 99.0731H131.64V99.6246H132.251V99.0731Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.757 99.0731H134.146V99.6246H134.757V99.0731Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.324 99.0731H136.712V99.6246H137.324V99.0731Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.891 99.0731H139.279V99.6246H139.891V99.0731Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.396 99.0731H141.785V99.6246H142.396V99.0731Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 101.279H124.001V101.831H124.612V101.279Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.118 101.279H126.506V101.831H127.118V101.279Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M129.684 101.279H129.073V101.831H129.684V101.279Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.251 101.279H131.64V101.831H132.251V101.279Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.757 101.279H134.146V101.831H134.757V101.279Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.324 101.279H136.712V101.831H137.324V101.279Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.891 101.279H139.279V101.831H139.891V101.279Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.396 101.279H141.785V101.831H142.396V101.279Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M144.107 99.1833H122.351V105.746H144.107V99.1833Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M301.904 94.7715H300.804V115.618H301.904V94.7715Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M304.349 94.7715H303.249V115.618H304.349V94.7715Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M319.261 94.7715H318.161V115.618H319.261V94.7715Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M321.766 94.7715H320.666V115.618H321.766V94.7715Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M326.167 114.184H297.26V121.353H326.167V114.184Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M323.722 119.588H299.521V120.305H323.722V119.588Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.707 197.348H201.066V176.833L265.419 167.016H274.831V197.789H278.987V177.494H291.332V149.148H341.751V177.053H354.829V148.1H390.887V158.358H400.787L408.671 169.718V178.818H417.777V166.575H458.54V240.143H133.535L139.707 197.348Z")
-                    ) ~fill:(("#21477C"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M293.287 197.348H354.646V176.833L418.999 167.016H428.411V197.789H432.567V177.494L444.912 157.586V134.203H475.163V172.035H508.409V148.1H544.467V158.358H554.306L562.251 169.718V178.818H571.357V102.492H612.976V240.143H287.115L293.287 197.348Z")
-                    ) ~fill:(("#1B3B68"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M425.172 241.522H401.887V106.077L425.172 102.878V241.522Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M401.887 140.269H396.204V241.522H401.887V140.269Z")
-                    ) ~fill:(("#1073AA"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M432.872 109.937H425.172V241.522H432.872V109.937Z")
-                    ) ~fill:(("#1073AA"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.226 105.47L405.371 105.581V121.298H406.226V105.47Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M410.993 104.809L410.138 104.919V121.298H410.993V104.809Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M408.61 105.139L407.754 105.25V121.298H408.61V105.139Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.377 104.478L412.46 104.588V121.298H413.377V104.478Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M415.76 104.147L414.844 104.257V121.298H415.76V104.147Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M419.61 103.595V121.298H420.527V103.485L419.61 103.595Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M418.144 103.816L417.227 103.926V121.298H418.144V103.816Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 128.081H403.415V129.129H406.043V128.081Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 128.081H406.96V129.129H409.588V128.081Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 128.081H410.504V129.129H413.132V128.081Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 128.081H414.049V129.129H416.677V128.081Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 128.081H417.594V129.129H420.222V128.081Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 128.081H421.138V129.129H423.766V128.081Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 130.453H403.415V131.501H406.043V130.453Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 130.453H406.96V131.501H409.588V130.453Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 130.453H410.504V131.501H413.132V130.453Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 130.453H414.049V131.501H416.677V130.453Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 130.453H417.594V131.501H420.222V130.453Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 130.453H421.138V131.501H423.766V130.453Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 132.824H403.415V133.872H406.043V132.824Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 132.824H406.96V133.872H409.588V132.824Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 132.824H410.504V133.872H413.132V132.824Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 132.824H414.049V133.872H416.677V132.824Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 132.824H417.594V133.872H420.222V132.824Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 132.824H421.138V133.872H423.766V132.824Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 135.14H403.415V136.188H406.043V135.14Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M409.588 135.14H406.96V136.188H409.588V135.14Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 135.14H410.504V136.188H413.132V135.14Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 135.14H414.049V136.188H416.677V135.14Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 135.14H417.594V136.188H420.222V135.14Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 135.14H421.138V136.188H423.766V135.14Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 137.512H403.415V138.56H406.043V137.512Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 137.512H406.96V138.56H409.588V137.512Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 137.512H410.504V138.56H413.132V137.512Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 137.512H414.049V138.56H416.677V137.512Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 137.512H417.594V138.56H420.222V137.512Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 137.512H421.138V138.56H423.766V137.512Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 139.828H403.415V140.876H406.043V139.828Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 139.828H406.96V140.876H409.588V139.828Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 139.828H410.504V140.876H413.132V139.828Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 139.828H414.049V140.876H416.677V139.828Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 139.828H417.594V140.876H420.222V139.828Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 139.828H421.138V140.876H423.766V139.828Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 142.199H403.415V143.247H406.043V142.199Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 142.199H406.96V143.247H409.588V142.199Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 142.199H410.504V143.247H413.132V142.199Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 142.199H414.049V143.247H416.677V142.199Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 142.199H417.594V143.247H420.222V142.199Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 142.199H421.138V143.247H423.766V142.199Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 144.571H403.415V145.619H406.043V144.571Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 144.571H406.96V145.619H409.588V144.571Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 144.571H410.504V145.619H413.132V144.571Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 144.571H414.049V145.619H416.677V144.571Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 144.571H417.594V145.619H420.222V144.571Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 144.571H421.138V145.619H423.766V144.571Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 146.887H403.415V147.935H406.043V146.887Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 146.887H406.96V147.935H409.588V146.887Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 146.887H410.504V147.935H413.132V146.887Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 146.887H414.049V147.935H416.677V146.887Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 146.887H417.594V147.935H420.222V146.887Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 146.887H421.138V147.935H423.766V146.887Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 149.258H403.415V150.306H406.043V149.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 149.258H406.96V150.306H409.588V149.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 149.258H410.504V150.306H413.132V149.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 149.258H414.049V150.306H416.677V149.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 149.258H417.594V150.306H420.222V149.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 149.258H421.138V150.306H423.766V149.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 151.575H403.415V152.622H406.043V151.575Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 151.575H406.96V152.622H409.588V151.575Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 151.575H410.504V152.622H413.132V151.575Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 151.575H414.049V152.622H416.677V151.575Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 151.575H417.594V152.622H420.222V151.575Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 151.575H421.138V152.622H423.766V151.575Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 153.946H403.415V154.994H406.043V153.946Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 153.946H406.96V154.994H409.588V153.946Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 153.946H410.504V154.994H413.132V153.946Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 153.946H414.049V154.994H416.677V153.946Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 153.946H417.594V154.994H420.222V153.946Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 153.946H421.138V154.994H423.766V153.946Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 163.321H403.415V164.369H406.043V163.321Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 163.321H406.96V164.369H409.588V163.321Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 163.321H410.504V164.369H413.132V163.321Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 163.321H414.049V164.369H416.677V163.321Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 163.321H417.594V164.369H420.222V163.321Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 163.321H421.138V164.369H423.766V163.321Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 165.693H403.415V166.74H406.043V165.693Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 165.693H406.96V166.74H409.588V165.693Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 165.693H410.504V166.74H413.132V165.693Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 165.693H414.049V166.74H416.677V165.693Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 165.693H417.594V166.74H420.222V165.693Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 165.693H421.138V166.74H423.766V165.693Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 168.064H403.415V169.112H406.043V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 168.064H406.96V169.112H409.588V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 168.064H410.504V169.112H413.132V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 168.064H414.049V169.112H416.677V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 168.064H417.594V169.112H420.222V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 168.064H421.138V169.112H423.766V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 170.38H403.415V171.428H406.043V170.38Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M409.588 170.38H406.96V171.428H409.588V170.38Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 170.38H410.504V171.428H413.132V170.38Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 170.38H414.049V171.428H416.677V170.38Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 170.38H417.594V171.428H420.222V170.38Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 170.38H421.138V171.428H423.766V170.38Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 172.752H403.415V173.799H406.043V172.752Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 172.752H406.96V173.799H409.588V172.752Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 172.752H410.504V173.799H413.132V172.752Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 172.752H414.049V173.799H416.677V172.752Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 172.752H417.594V173.799H420.222V172.752Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 172.752H421.138V173.799H423.766V172.752Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 175.068H403.415V176.116H406.043V175.068Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 175.068H406.96V176.116H409.588V175.068Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 175.068H410.504V176.116H413.132V175.068Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 175.068H414.049V176.116H416.677V175.068Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 175.068H417.594V176.116H420.222V175.068Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 175.068H421.138V176.116H423.766V175.068Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 177.439H403.415V178.487H406.043V177.439Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 177.439H406.96V178.487H409.588V177.439Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 177.439H410.504V178.487H413.132V177.439Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 177.439H414.049V178.487H416.677V177.439Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 177.439H417.594V178.487H420.222V177.439Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 177.439H421.138V178.487H423.766V177.439Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 179.811H403.415V180.858H406.043V179.811Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 179.811H406.96V180.858H409.588V179.811Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 179.811H410.504V180.858H413.132V179.811Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 179.811H414.049V180.858H416.677V179.811Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 179.811H417.594V180.858H420.222V179.811Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 179.811H421.138V180.858H423.766V179.811Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 182.127H403.415V183.175H406.043V182.127Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 182.127H406.96V183.175H409.588V182.127Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 182.127H410.504V183.175H413.132V182.127Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 182.127H414.049V183.175H416.677V182.127Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 182.127H417.594V183.175H420.222V182.127Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 182.127H421.138V183.175H423.766V182.127Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 184.498H403.415V185.546H406.043V184.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 184.498H406.96V185.546H409.588V184.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 184.498H410.504V185.546H413.132V184.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 184.498H414.049V185.546H416.677V184.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 184.498H417.594V185.546H420.222V184.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 184.498H421.138V185.546H423.766V184.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 186.87H403.415V187.917H406.043V186.87Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M409.588 186.87H406.96V187.917H409.588V186.87Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 186.87H410.504V187.917H413.132V186.87Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 186.87H414.049V187.917H416.677V186.87Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 186.87H417.594V187.917H420.222V186.87Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 186.87H421.138V187.917H423.766V186.87Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 189.186H403.415V190.234H406.043V189.186Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 189.186H406.96V190.234H409.588V189.186Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 189.186H410.504V190.234H413.132V189.186Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 189.186H414.049V190.234H416.677V189.186Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 189.186H417.594V190.234H420.222V189.186Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 189.186H421.138V190.234H423.766V189.186Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 191.557H403.415V192.605H406.043V191.557Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 191.557H406.96V192.605H409.588V191.557Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 191.557H410.504V192.605H413.132V191.557Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 191.557H414.049V192.605H416.677V191.557Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 191.557H417.594V192.605H420.222V191.557Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 191.557H421.138V192.605H423.766V191.557Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 193.874H403.415V194.921H406.043V193.874Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 193.874H406.96V194.921H409.588V193.874Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 193.874H410.504V194.921H413.132V193.874Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 193.874H414.049V194.921H416.677V193.874Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 193.874H417.594V194.921H420.222V193.874Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 193.874H421.138V194.921H423.766V193.874Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 203.304H403.415V204.352H406.043V203.304Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 203.304H406.96V204.352H409.588V203.304Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 203.304H410.504V204.352H413.132V203.304Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 203.304H414.049V204.352H416.677V203.304Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 203.304H417.594V204.352H420.222V203.304Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 203.304H421.138V204.352H423.766V203.304Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 205.62H403.415V206.668H406.043V205.62Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M409.588 205.62H406.96V206.668H409.588V205.62Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 205.62H410.504V206.668H413.132V205.62Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 205.62H414.049V206.668H416.677V205.62Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 205.62H417.594V206.668H420.222V205.62Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 205.62H421.138V206.668H423.766V205.62Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 207.992H403.415V209.039H406.043V207.992Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 207.992H406.96V209.039H409.588V207.992Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 207.992H410.504V209.039H413.132V207.992Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 207.992H414.049V209.039H416.677V207.992Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 207.992H417.594V209.039H420.222V207.992Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 207.992H421.138V209.039H423.766V207.992Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 210.363H403.415V211.411H406.043V210.363Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 210.363H406.96V211.411H409.588V210.363Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 210.363H410.504V211.411H413.132V210.363Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 210.363H414.049V211.411H416.677V210.363Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 210.363H417.594V211.411H420.222V210.363Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 210.363H421.138V211.411H423.766V210.363Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 212.679H403.415V213.727H406.043V212.679Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 212.679H406.96V213.727H409.588V212.679Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 212.679H410.504V213.727H413.132V212.679Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 212.679H414.049V213.727H416.677V212.679Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 212.679H417.594V213.727H420.222V212.679Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 212.679H421.138V213.727H423.766V212.679Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 215.051H403.415V216.098H406.043V215.051Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 215.051H406.96V216.098H409.588V215.051Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 215.051H410.504V216.098H413.132V215.051Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 215.051H414.049V216.098H416.677V215.051Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 215.051H417.594V216.098H420.222V215.051Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 215.051H421.138V216.098H423.766V215.051Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 217.367H403.415V218.415H406.043V217.367Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 217.367H406.96V218.415H409.588V217.367Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 217.367H410.504V218.415H413.132V217.367Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 217.367H414.049V218.415H416.677V217.367Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 217.367H417.594V218.415H420.222V217.367Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 217.367H421.138V218.415H423.766V217.367Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 219.738H403.415V220.786H406.043V219.738Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 219.738H406.96V220.786H409.588V219.738Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 219.738H410.504V220.786H413.132V219.738Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 219.738H414.049V220.786H416.677V219.738Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 219.738H417.594V220.786H420.222V219.738Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 219.738H421.138V220.786H423.766V219.738Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 222.11H403.415V223.157H406.043V222.11Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M409.588 222.11H406.96V223.157H409.588V222.11Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 222.11H410.504V223.157H413.132V222.11Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 222.11H414.049V223.157H416.677V222.11Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 222.11H417.594V223.157H420.222V222.11Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 222.11H421.138V223.157H423.766V222.11Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 224.426H403.415V225.474H406.043V224.426Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 224.426H406.96V225.474H409.588V224.426Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 224.426H410.504V225.474H413.132V224.426Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 224.426H414.049V225.474H416.677V224.426Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 224.426H417.594V225.474H420.222V224.426Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 224.426H421.138V225.474H423.766V224.426Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 226.797H403.415V227.845H406.043V226.797Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 226.797H406.96V227.845H409.588V226.797Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 226.797H410.504V227.845H413.132V226.797Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 226.797H414.049V227.845H416.677V226.797Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 226.797H417.594V227.845H420.222V226.797Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 226.797H421.138V227.845H423.766V226.797Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 229.113H403.415V230.161H406.043V229.113Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 229.113H406.96V230.161H409.588V229.113Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 229.113H410.504V230.161H413.132V229.113Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 229.113H414.049V230.161H416.677V229.113Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 229.113H417.594V230.161H420.222V229.113Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 229.113H421.138V230.161H423.766V229.113Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 231.485H403.415V232.533H406.043V231.485Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 231.485H406.96V232.533H409.588V231.485Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 231.485H410.504V232.533H413.132V231.485Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 231.485H414.049V232.533H416.677V231.485Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 231.485H417.594V232.533H420.222V231.485Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 231.485H421.138V232.533H423.766V231.485Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M406.043 233.856H403.415V234.904H406.043V233.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M409.588 233.856H406.96V234.904H409.588V233.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M413.132 233.856H410.504V234.904H413.132V233.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M416.677 233.856H414.049V234.904H416.677V233.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M420.222 233.856H417.594V234.904H420.222V233.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M423.766 233.856H421.138V234.904H423.766V233.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.4"))
-                    ~d:(("M425.172 227.955H401.887V240.474H425.172V227.955Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M326.044 212.128H250.141V241.246H326.044V212.128Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M263.83 213.286H252.157V214.72H263.83V213.286Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M276.42 213.286H264.747V214.72H276.42V213.286Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M288.826 213.286H277.153V214.72H288.826V213.286Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M263.83 215.878H252.157V217.312H263.83V215.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M276.42 215.878H264.747V217.312H276.42V215.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M288.826 215.878H277.153V217.312H288.826V215.878Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M263.83 218.47H252.157V219.904H263.83V218.47Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M276.42 218.47H264.747V219.904H276.42V218.47Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M288.826 218.47H277.153V219.904H288.826V218.47Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M263.83 221.062H252.157V222.496H263.83V221.062Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M276.42 221.062H264.747V222.496H276.42V221.062Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M288.826 221.062H277.153V222.496H288.826V221.062Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M263.83 223.654H252.157V225.088H263.83V223.654Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M276.42 223.654H264.747V225.088H276.42V223.654Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M288.826 223.654H277.153V225.088H288.826V223.654Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M263.83 226.191H252.157V227.624H263.83V226.191Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M276.42 226.191H264.747V227.624H276.42V226.191Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M288.826 226.191H277.153V227.624H288.826V226.191Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M263.83 228.783H252.157V230.216H263.83V228.783Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M276.42 228.783H264.747V230.216H276.42V228.783Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M288.826 228.783H277.153V230.216H288.826V228.783Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M263.83 231.375H252.157V232.808H263.83V231.375Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M276.42 231.375H264.747V232.808H276.42V231.375Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M288.826 231.375H277.153V232.808H288.826V231.375Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M360.818 199.664H358.191V209.701H360.818V199.664Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M360.818 199.664H358.191V205.014H360.818V199.664Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M368.274 209.701H334.173V215.216H368.274V209.701Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M375.303 215.216H334.173V240.915H375.303V215.216Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M331.606 121.298H291.759V240.253H331.606V121.298Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M299.582 126.592H294.143V127.254H299.582V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M305.449 126.592H300.01V127.254H305.449V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M311.194 126.592H305.754V127.254H311.194V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M316.938 126.592H311.499V127.254H316.938V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.866 126.592H317.427V127.254H322.866V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M328.611 126.592H323.172V127.254H328.611V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M299.582 129.46H294.143V130.122H299.582V129.46Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M305.449 129.46H300.01V130.122H305.449V129.46Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M311.194 129.46H305.755V130.122H311.194V129.46Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M316.938 129.46H311.499V130.122H316.938V129.46Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.866 129.46H317.427V130.122H322.866V129.46Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M328.611 129.46H323.172V130.122H328.611V129.46Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M299.582 132.383H294.143V133.045H299.582V132.383Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M305.449 132.383H300.01V133.045H305.449V132.383Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M311.194 132.383H305.755V133.045H311.194V132.383Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M316.938 132.383H311.499V133.045H316.938V132.383Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.866 132.383H317.427V133.045H322.866V132.383Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M328.611 132.383H323.172V133.045H328.611V132.383Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M299.582 135.251H294.143V135.912H299.582V135.251Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M305.449 135.251H300.01V135.912H305.449V135.251Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M311.194 135.251H305.755V135.912H311.194V135.251Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M316.938 135.251H311.499V135.912H316.938V135.251Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.866 135.251H317.427V135.912H322.866V135.251Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M328.611 135.251H323.172V135.912H328.611V135.251Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M299.582 138.173H294.143V138.835H299.582V138.173Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M305.449 138.173H300.01V138.835H305.449V138.173Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M311.194 138.173H305.755V138.835H311.194V138.173Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M316.938 138.173H311.499V138.835H316.938V138.173Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.866 138.173H317.427V138.835H322.866V138.173Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M328.611 138.173H323.172V138.835H328.611V138.173Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M299.582 141.041H294.143V141.703H299.582V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M305.449 141.041H300.01V141.703H305.449V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M311.194 141.041H305.755V141.703H311.194V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M316.938 141.041H311.499V141.703H316.938V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.866 141.041H317.427V141.703H322.866V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M328.611 141.041H323.172V141.703H328.611V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 144.626H294.143V145.288H298.237V144.626Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 144.626H303.921V145.288H308.016V144.626Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 144.626H313.699V145.288H317.794V144.626Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 144.626H323.478V145.288H327.572V144.626Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 148.045H299.032V148.707H303.127V148.045Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 148.045H308.81V148.707H312.905V148.045Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 148.045H318.589V148.707H322.683V148.045Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 151.519H294.143V152.181H298.237V151.519Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 151.519H303.921V152.181H308.016V151.519Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 151.519H313.699V152.181H317.794V151.519Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 151.519H323.478V152.181H327.572V151.519Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 154.883H299.032V155.545H303.127V154.883Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 154.883H308.81V155.545H312.905V154.883Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 154.883H318.589V155.545H322.683V154.883Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 158.413H294.143V159.075H298.237V158.413Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 158.413H303.921V159.075H308.016V158.413Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 158.413H313.699V159.075H317.794V158.413Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 158.413H323.478V159.075H327.572V158.413Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 161.777H299.032V162.439H303.127V161.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 161.777H308.81V162.439H312.905V161.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 161.777H318.589V162.439H322.683V161.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 165.307H294.143V165.968H298.237V165.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 165.307H303.921V165.968H308.016V165.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 165.307H313.699V165.968H317.794V165.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 165.307H323.478V165.968H327.572V165.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 168.671H299.032V169.332H303.127V168.671Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 168.671H308.81V169.332H312.905V168.671Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 168.671H318.589V169.332H322.683V168.671Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M298.237 172.2H294.143V172.862H298.237V172.2Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M308.016 172.2H303.921V172.862H308.016V172.2Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M317.794 172.2H313.699V172.862H317.794V172.2Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M327.572 172.2H323.478V172.862H327.572V172.2Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 175.564H299.032V176.226H303.127V175.564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 175.564H308.81V176.226H312.905V175.564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 175.564H318.589V176.226H322.683V175.564Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 179.094H294.143V179.755H298.237V179.094Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 179.094H303.921V179.755H308.016V179.094Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 179.094H313.699V179.755H317.794V179.094Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 179.094H323.478V179.755H327.572V179.094Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 182.458H299.032V183.12H303.127V182.458Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 182.458H308.81V183.12H312.905V182.458Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 182.458H318.589V183.12H322.683V182.458Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 185.932H294.143V186.594H298.237V185.932Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 185.932H303.921V186.594H308.016V185.932Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 185.932H313.699V186.594H317.794V185.932Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 185.932H323.478V186.594H327.572V185.932Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 189.351H299.032V190.013H303.127V189.351Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 189.351H308.81V190.013H312.905V189.351Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 189.351H318.589V190.013H322.683V189.351Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 192.826H294.143V193.487H298.237V192.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 192.826H303.921V193.487H308.016V192.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 192.826H313.699V193.487H317.794V192.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 192.826H323.478V193.487H327.572V192.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 196.245H299.032V196.907H303.127V196.245Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 196.245H308.81V196.907H312.905V196.245Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 196.245H318.589V196.907H322.683V196.245Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 199.719H294.143V200.381H298.237V199.719Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 199.719H303.921V200.381H308.016V199.719Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 199.719H313.699V200.381H317.794V199.719Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 199.719H323.478V200.381H327.572V199.719Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 203.138H299.032V203.8H303.127V203.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M312.905 203.138H308.81V203.8H312.905V203.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 203.138H318.589V203.8H322.683V203.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 206.613H294.143V207.275H298.237V206.613Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 206.613H303.921V207.275H308.016V206.613Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 206.613H313.699V207.275H317.794V206.613Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 206.613H323.478V207.275H327.572V206.613Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 209.977H299.032V210.639H303.127V209.977Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 209.977H308.81V210.639H312.905V209.977Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 209.977H318.589V210.639H322.683V209.977Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 213.506H294.143V214.168H298.237V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 213.506H303.921V214.168H308.016V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 213.506H313.699V214.168H317.794V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 213.506H323.478V214.168H327.572V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 216.87H299.032V217.532H303.127V216.87Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M312.905 216.87H308.81V217.532H312.905V216.87Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 216.87H318.589V217.532H322.683V216.87Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M298.237 220.4H294.143V221.062H298.237V220.4Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M308.016 220.4H303.921V221.062H308.016V220.4Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M317.794 220.4H313.699V221.062H317.794V220.4Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M327.572 220.4H323.478V221.062H327.572V220.4Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 223.764H299.032V224.426H303.127V223.764Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 223.764H308.81V224.426H312.905V223.764Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 223.764H318.589V224.426H322.683V223.764Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M298.237 227.294H294.143V227.955H298.237V227.294Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M308.016 227.294H303.921V227.955H308.016V227.294Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M317.794 227.294H313.699V227.955H317.794V227.294Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M327.572 227.294H323.478V227.955H327.572V227.294Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M303.127 230.658H299.032V231.319H303.127V230.658Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M312.905 230.658H308.81V231.319H312.905V230.658Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M322.683 230.658H318.589V231.319H322.683V230.658Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M199.538 188.303H169.531V240.695H199.538V188.303Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M178.087 191.226H171.181V194.26H178.087V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M186.826 191.226H179.92V194.26H186.826V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M195.566 191.226H188.66V194.26H195.566V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M178.087 195.638H171.181V198.671H178.087V195.638Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M186.826 195.638H179.92V198.671H186.826V195.638Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M195.566 195.638H188.66V198.671H195.566V195.638Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M178.087 200.05H171.181V203.083H178.087V200.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M186.826 200.05H179.92V203.083H186.826V200.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M195.566 200.05H188.66V203.083H195.566V200.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M178.087 204.407H171.181V207.44H178.087V204.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M186.826 204.407H179.92V207.44H186.826V204.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M195.566 204.407H188.66V207.44H195.566V204.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M178.087 208.819H171.181V211.852H178.087V208.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M186.826 208.819H179.92V211.852H186.826V208.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M195.566 208.819H188.66V211.852H195.566V208.819Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M178.087 213.231H171.181V216.264H178.087V213.231Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M186.826 213.231H179.92V216.264H186.826V213.231Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M195.566 213.231H188.66V216.264H195.566V213.231Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M178.087 217.587H171.181V220.621H178.087V217.587Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M186.826 217.587H179.92V220.621H186.826V217.587Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M195.566 217.587H188.66V220.621H195.566V217.587Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M160.914 175.84L169.653 185.546V244.555H160.914V175.84Z")
-                    ) ~fill:(("#1474AA"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.6"))
-                    ~d:(("M163.542 242.57V178.763L160.914 175.895V241.963C162.014 242.349 163.542 242.57 163.542 242.57Z")
-                    ) ~fill:(("#1474AA"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M154.191 108.448H144.046V146.335H154.191V108.448Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M151.991 108.448H144.046V146.335H151.991V108.448Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M160.914 146.335H112.206V244.555H160.914V146.335Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.835 105.746H117.462V146.335H147.835V105.746Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M120.639 115.066H119.539V116.059H120.639V115.066Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M123.756 115.066H122.656V116.059H123.756V115.066Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.873 115.066H125.773V116.059H126.873V115.066Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.051 115.066H128.951V116.059H130.051V115.066Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.168 115.066H132.068V116.059H133.168V115.066Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.285 115.066H135.185V116.059H136.285V115.066Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.463 115.066H138.363V116.059H139.463V115.066Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.58 115.066H141.479V116.059H142.58V115.066Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 115.066H144.596V116.059H145.696V115.066Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M120.639 118.871H119.539V119.864H120.639V118.871Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M123.756 118.871H122.656V119.864H123.756V118.871Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.873 118.871H125.773V119.864H126.873V118.871Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.051 118.871H128.951V119.864H130.051V118.871Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.168 118.871H132.068V119.864H133.168V118.871Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.285 118.871H135.185V119.864H136.285V118.871Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.463 118.871H138.363V119.864H139.463V118.871Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.58 118.871H141.479V119.864H142.58V118.871Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 118.871H144.596V119.864H145.696V118.871Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M120.639 122.732H119.539V123.724H120.639V122.732Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M123.756 122.732H122.656V123.724H123.756V122.732Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.873 122.732H125.773V123.724H126.873V122.732Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.051 122.732H128.951V123.724H130.051V122.732Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.168 122.732H132.068V123.724H133.168V122.732Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.285 122.732H135.185V123.724H136.285V122.732Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.463 122.732H138.363V123.724H139.463V122.732Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.58 122.732H141.479V123.724H142.58V122.732Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 122.732H144.596V123.724H145.696V122.732Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M120.639 126.592H119.539V127.585H120.639V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M123.756 126.592H122.656V127.585H123.756V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.873 126.592H125.773V127.585H126.873V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.051 126.592H128.951V127.585H130.051V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.168 126.592H132.068V127.585H133.168V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.285 126.592H135.185V127.585H136.285V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.463 126.592H138.363V127.585H139.463V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.58 126.592H141.479V127.585H142.58V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 126.592H144.596V127.585H145.696V126.592Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M120.639 130.397H119.539V131.39H120.639V130.397Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M123.756 130.397H122.656V131.39H123.756V130.397Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.873 130.397H125.773V131.39H126.873V130.397Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.051 130.397H128.951V131.39H130.051V130.397Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.168 130.397H132.068V131.39H133.168V130.397Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.285 130.397H135.185V131.39H136.285V130.397Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.463 130.397H138.363V131.39H139.463V130.397Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M142.58 130.397H141.479V131.39H142.58V130.397Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 130.397H144.596V131.39H145.696V130.397Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M120.639 134.258H119.539V135.251H120.639V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M123.756 134.258H122.656V135.251H123.756V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.873 134.258H125.773V135.251H126.873V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.051 134.258H128.951V135.251H130.051V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.168 134.258H132.068V135.251H133.168V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.285 134.258H135.185V135.251H136.285V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.463 134.258H138.363V135.251H139.463V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.58 134.258H141.479V135.251H142.58V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 134.258H144.596V135.251H145.696V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M120.639 138.063H119.539V139.056H120.639V138.063Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M123.756 138.063H122.656V139.056H123.756V138.063Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.873 138.063H125.773V139.056H126.873V138.063Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.051 138.063H128.951V139.056H130.051V138.063Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.168 138.063H132.068V139.056H133.168V138.063Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.285 138.063H135.185V139.056H136.285V138.063Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.463 138.063H138.363V139.056H139.463V138.063Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.58 138.063H141.479V139.056H142.58V138.063Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 138.063H144.596V139.056H145.696V138.063Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M120.639 141.924H119.539V142.916H120.639V141.924Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M123.756 141.924H122.656V142.916H123.756V141.924Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.873 141.924H125.773V142.916H126.873V141.924Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.051 141.924H128.951V142.916H130.051V141.924Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.168 141.924H132.068V142.916H133.168V141.924Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.285 141.924H135.185V142.916H136.285V141.924Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M139.463 141.924H138.363V142.916H139.463V141.924Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.58 141.924H141.479V142.916H142.58V141.924Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 141.924H144.596V142.916H145.696V141.924Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M121.556 109.496H119.539V111.316H121.556V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M123.94 109.496H121.923V111.316H123.94V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.384 109.496H124.367V111.316H126.384V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M128.768 109.496H126.751V111.316H128.768V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M131.212 109.496H129.195V111.316H131.212V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.596 109.496H131.579V111.316H133.596V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.04 109.496H134.023V111.316H136.04V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M138.424 109.496H136.407V111.316H138.424V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M140.868 109.496H138.851V111.316H140.868V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M143.252 109.496H141.235V111.316H143.252V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 109.496H143.68V111.316H145.696V109.496Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M121.556 111.647H119.539V113.467H121.556V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M123.94 111.647H121.923V113.467H123.94V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.384 111.647H124.367V113.467H126.384V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M128.768 111.647H126.751V113.467H128.768V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M131.212 111.647H129.195V113.467H131.212V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M133.596 111.647H131.579V113.467H133.596V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M136.04 111.647H134.023V113.467H136.04V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M138.424 111.647H136.407V113.467H138.424V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M140.868 111.647H138.851V113.467H140.868V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M143.252 111.647H141.235V113.467H143.252V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 111.647H143.68V113.467H145.696V111.647Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M117.462 141.317V146.335H144.046H147.835H154.191V141.317H117.462Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M118.928 150.968H115.689V153.891H118.928V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.778 150.968H119.539V153.891H122.778V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.568 150.968H123.328V153.891H126.568V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.418 150.968H127.179V153.891H130.418V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.268 150.968H131.029V153.891H134.268V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M138.057 150.968H134.818V153.891H138.057V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M141.907 150.968H138.668V153.891H141.907V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 150.968H142.457V153.891H145.696V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M149.546 150.968H146.307V153.891H149.546V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M153.336 150.968H150.097V153.891H153.336V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.186 150.968H153.947V153.891H157.186V150.968Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M118.928 154.442H115.689V157.365H118.928V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 158.634H115.689V160.178H117.4V158.634Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 158.634H120.701V160.178H122.412V158.634Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 158.634H125.651V160.178H127.362V158.634Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 158.634H130.601V160.178H132.312V158.634Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 158.634H135.551V160.178H137.263V158.634Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 158.634H140.563V160.178H142.274V158.634Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 158.634H145.513V160.178H147.224V158.634Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 158.634H150.463V160.178H152.174V158.634Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 158.634H155.414V160.178H157.125V158.634Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 162.273H115.689V163.818H117.4V162.273Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 162.273H120.701V163.818H122.412V162.273Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 162.273H125.651V163.818H127.362V162.273Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 162.273H130.601V163.818H132.312V162.273Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 162.273H135.551V163.818H137.263V162.273Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 162.273H140.563V163.818H142.274V162.273Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 162.273H145.513V163.818H147.224V162.273Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 162.273H150.463V163.818H152.174V162.273Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 162.273H155.414V163.818H157.125V162.273Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 165.913H115.689V167.457H117.4V165.913Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 165.913H120.701V167.457H122.412V165.913Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 165.913H125.651V167.457H127.362V165.913Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 165.913H130.601V167.457H132.312V165.913Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 165.913H135.551V167.457H137.263V165.913Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 165.913H140.563V167.457H142.274V165.913Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 165.913H145.513V167.457H147.224V165.913Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 165.913H150.463V167.457H152.174V165.913Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 165.913H155.414V167.457H157.125V165.913Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 169.498H115.689V171.042H117.4V169.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 169.498H120.701V171.042H122.412V169.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 169.498H125.651V171.042H127.362V169.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 169.498H130.601V171.042H132.312V169.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 169.498H135.551V171.042H137.263V169.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 169.498H140.563V171.042H142.274V169.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 169.498H145.513V171.042H147.224V169.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 169.498H150.463V171.042H152.174V169.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 169.498H155.414V171.042H157.125V169.498Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 173.138H115.689V174.682H117.4V173.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 173.138H120.701V174.682H122.412V173.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 173.138H125.651V174.682H127.362V173.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 173.138H130.601V174.682H132.312V173.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 173.138H135.551V174.682H137.263V173.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 173.138H140.563V174.682H142.274V173.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 173.138H145.513V174.682H147.224V173.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 173.138H150.463V174.682H152.174V173.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 173.138H155.414V174.682H157.125V173.138Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 176.777H115.689V178.322H117.4V176.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 176.777H120.701V178.322H122.412V176.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 176.777H125.651V178.322H127.362V176.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 176.777H130.601V178.322H132.312V176.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 176.777H135.551V178.322H137.263V176.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 176.777H140.563V178.322H142.274V176.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 176.777H145.513V178.322H147.224V176.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 176.777H150.463V178.322H152.174V176.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 176.777H155.414V178.322H157.125V176.777Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 180.362H115.689V181.906H117.4V180.362Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 180.362H120.701V181.906H122.412V180.362Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 180.362H125.651V181.906H127.362V180.362Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 180.362H130.601V181.906H132.312V180.362Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 180.362H135.551V181.906H137.263V180.362Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 180.362H140.563V181.906H142.274V180.362Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 180.362H145.513V181.906H147.224V180.362Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 180.362H150.463V181.906H152.174V180.362Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 180.362H155.414V181.906H157.125V180.362Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 184.002H115.689V185.546H117.4V184.002Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 184.002H120.701V185.546H122.412V184.002Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 184.002H125.651V185.546H127.362V184.002Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 184.002H130.601V185.546H132.312V184.002Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 184.002H135.551V185.546H137.263V184.002Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 184.002H140.563V185.546H142.274V184.002Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 184.002H145.513V185.546H147.224V184.002Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 184.002H150.463V185.546H152.174V184.002Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 184.002H155.414V185.546H157.125V184.002Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 187.642H115.689V189.186H117.4V187.642Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 187.642H120.701V189.186H122.412V187.642Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 187.642H125.651V189.186H127.362V187.642Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 187.642H130.601V189.186H132.312V187.642Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 187.642H135.551V189.186H137.263V187.642Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 187.642H140.563V189.186H142.274V187.642Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 187.642H145.513V189.186H147.224V187.642Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 187.642H150.463V189.186H152.174V187.642Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 187.642H155.414V189.186H157.125V187.642Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 191.226H115.689V192.771H117.4V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 191.226H120.701V192.771H122.412V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 191.226H125.651V192.771H127.362V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 191.226H130.601V192.771H132.312V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 191.226H135.551V192.771H137.263V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 191.226H140.563V192.771H142.274V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 191.226H145.513V192.771H147.224V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 191.226H150.463V192.771H152.174V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 191.226H155.414V192.771H157.125V191.226Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 194.866H115.689V196.41H117.4V194.866Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 194.866H120.701V196.41H122.412V194.866Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 194.866H125.651V196.41H127.362V194.866Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 194.866H130.601V196.41H132.312V194.866Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 194.866H135.551V196.41H137.263V194.866Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 194.866H140.563V196.41H142.274V194.866Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 194.866H145.513V196.41H147.224V194.866Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 194.866H150.463V196.41H152.174V194.866Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 194.866H155.414V196.41H157.125V194.866Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 198.506H115.689V200.05H117.4V198.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 198.506H120.701V200.05H122.412V198.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 198.506H125.651V200.05H127.362V198.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 198.506H130.601V200.05H132.312V198.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 198.506H135.551V200.05H137.263V198.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 198.506H140.563V200.05H142.274V198.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 198.506H145.513V200.05H147.224V198.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 198.506H150.463V200.05H152.174V198.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 198.506H155.414V200.05H157.125V198.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 202.091H115.689V203.635H117.4V202.091Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 202.091H120.701V203.635H122.412V202.091Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 202.091H125.651V203.635H127.362V202.091Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 202.091H130.601V203.635H132.312V202.091Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 202.091H135.551V203.635H137.263V202.091Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 202.091H140.563V203.635H142.274V202.091Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 202.091H145.513V203.635H147.224V202.091Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 202.091H150.463V203.635H152.174V202.091Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 202.091H155.414V203.635H157.125V202.091Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 205.73H115.689V207.275H117.4V205.73Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 205.73H120.701V207.275H122.412V205.73Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 205.73H125.651V207.275H127.362V205.73Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 205.73H130.601V207.275H132.312V205.73Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 205.73H135.551V207.275H137.263V205.73Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 205.73H140.563V207.275H142.274V205.73Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 205.73H145.513V207.275H147.224V205.73Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 205.73H150.463V207.275H152.174V205.73Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 205.73H155.414V207.275H157.125V205.73Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 209.37H115.689V210.914H117.4V209.37Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 209.37H120.701V210.914H122.412V209.37Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 209.37H125.651V210.914H127.362V209.37Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 209.37H130.601V210.914H132.312V209.37Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 209.37H135.551V210.914H137.263V209.37Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 209.37H140.563V210.914H142.274V209.37Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 209.37H145.513V210.914H147.224V209.37Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 209.37H150.463V210.914H152.174V209.37Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 209.37H155.414V210.914H157.125V209.37Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 212.955H115.689V214.499H117.4V212.955Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 212.955H120.701V214.499H122.412V212.955Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 212.955H125.651V214.499H127.362V212.955Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 212.955H130.601V214.499H132.312V212.955Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 212.955H135.551V214.499H137.263V212.955Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 212.955H140.563V214.499H142.274V212.955Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 212.955H145.513V214.499H147.224V212.955Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 212.955H150.463V214.499H152.174V212.955Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 212.955H155.414V214.499H157.125V212.955Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M117.4 216.595H115.689V218.139H117.4V216.595Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.412 216.595H120.701V218.139H122.412V216.595Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M127.362 216.595H125.651V218.139H127.362V216.595Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M132.312 216.595H130.601V218.139H132.312V216.595Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M137.263 216.595H135.551V218.139H137.263V216.595Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M142.274 216.595H140.563V218.139H142.274V216.595Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M147.224 216.595H145.513V218.139H147.224V216.595Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M152.174 216.595H150.463V218.139H152.174V216.595Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.125 216.595H155.414V218.139H157.125V216.595Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M122.778 154.442H119.539V157.365H122.778V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M126.568 154.442H123.328V157.365H126.568V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M130.418 154.442H127.179V157.365H130.418V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M134.268 154.442H131.029V157.365H134.268V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M138.057 154.442H134.818V157.365H138.057V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M141.907 154.442H138.668V157.365H141.907V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M145.696 154.442H142.457V157.365H145.696V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M149.546 154.442H146.307V157.365H149.546V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M153.336 154.442H150.097V157.365H153.336V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M157.186 154.442H153.947V157.365H157.186V154.442Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M509.998 178.597H476.08V240.474H509.998V178.597Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M250.141 150.968H205.588V241.246H250.141V150.968Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 157.475H209.377V159.351H213.594V157.475Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 160.288H216.161V162.163H220.378V160.288Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 160.288H233.151V162.163H237.368V160.288Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 157.475H224.534V159.351H228.751V157.475Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 157.475H241.646V159.351H245.863V157.475Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 164.204H209.377V166.079H213.594V164.204Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 167.016H216.161V168.891H220.378V167.016Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 167.016H233.151V168.891H237.368V167.016Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 164.204H224.534V166.079H228.751V164.204Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 164.204H241.646V166.079H245.863V164.204Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 170.932H209.377V172.807H213.594V170.932Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 173.689H216.161V175.564H220.378V173.689Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 173.689H233.151V175.564H237.368V173.689Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 170.932H224.534V172.807H228.751V170.932Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 170.932H241.646V172.807H245.863V170.932Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 177.605H209.377V179.48H213.594V177.605Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 180.417H216.161V182.292H220.378V180.417Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 180.417H233.151V182.292H237.368V180.417Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 177.605H224.534V179.48H228.751V177.605Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 177.605H241.646V179.48H245.863V177.605Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 184.333H209.377V186.208H213.594V184.333Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 187.145H216.161V189.02H220.378V187.145Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 187.145H233.151V189.02H237.368V187.145Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 184.333H224.534V186.208H228.751V184.333Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 184.333H241.646V186.208H245.863V184.333Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 191.061H209.377V192.936H213.594V191.061Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 193.874H216.161V195.749H220.378V193.874Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 193.874H233.151V195.749H237.368V193.874Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 191.061H224.534V192.936H228.751V191.061Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 191.061H241.646V192.936H245.863V191.061Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 197.789H209.377V199.664H213.594V197.789Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 200.602H216.161V202.477H220.378V200.602Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 200.602H233.151V202.477H237.368V200.602Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 197.789H224.534V199.664H228.751V197.789Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 197.789H241.646V199.664H245.863V197.789Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 204.517H209.377V206.392H213.594V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 207.33H216.161V209.205H220.378V207.33Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 207.33H233.151V209.205H237.368V207.33Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 204.517H224.534V206.392H228.751V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 204.517H241.646V206.392H245.863V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 211.245H209.377V213.12H213.594V211.245Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 214.003H216.161V215.878H220.378V214.003Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 214.003H233.151V215.878H237.368V214.003Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 211.245H224.534V213.12H228.751V211.245Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 211.245H241.646V213.12H245.863V211.245Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 217.918H209.377V219.793H213.594V217.918Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 220.731H216.161V222.606H220.378V220.731Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 220.731H233.151V222.606H237.368V220.731Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 217.918H224.534V219.793H228.751V217.918Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 217.918H241.646V219.793H245.863V217.918Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M213.594 224.646H209.377V226.521H213.594V224.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M220.378 227.459H216.161V229.334H220.378V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M237.368 227.459H233.151V229.334H237.368V227.459Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M228.751 224.646H224.534V226.521H228.751V224.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 224.646H241.646V226.521H245.863V224.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M476.141 192.55H432.628V241.081H476.141V192.55Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M465.996 185.27H441.306V192.55H465.996V185.27Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M465.996 184.057H441.306V185.27H465.996V184.057Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M465.996 178.873H441.306V180.086H465.996V178.873Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M464.163 180.086H442.406V184.057H464.163V180.086Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M464.163 180.086H442.406V180.858H464.163V180.086Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M442.406 178.873L448.884 165.527H458.051L464.957 178.873H442.406Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M531.877 158.964L514.765 181.741V240.364H531.877H549.05V181.741L531.877 158.964Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 189.241H514.765V189.958H549.05V189.241Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 190.785H514.765V191.502H549.05V190.785Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 192.385H514.765V193.101H549.05V192.385Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 193.984H514.765V194.701H549.05V193.984Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 195.528H514.765V196.245H549.05V195.528Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 197.127H514.765V197.844H549.05V197.127Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 198.671H514.765V199.388H549.05V198.671Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 200.271H514.765V200.988H549.05V200.271Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M549.05 201.87H514.765V202.587H549.05V201.87Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 203.414H514.765V204.131H549.05V203.414Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M549.05 205.014H514.765V205.73H549.05V205.014Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M549.05 206.613H514.765V207.33H549.05V206.613Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 208.157H514.765V208.874H549.05V208.157Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 209.756H514.765V210.473H549.05V209.756Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M549.05 211.3H514.765V212.017H549.05V211.3Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M549.05 212.9H514.765V213.617H549.05V212.9Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 214.499H514.765V215.216H549.05V214.499Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M549.05 216.043H514.765V216.76H549.05V216.043Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M549.05 217.643H514.765V218.36H549.05V217.643Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 219.187H514.765V219.904H549.05V219.187Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 220.786H514.765V221.503H549.05V220.786Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 222.385H514.765V223.102H549.05V222.385Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M549.05 223.93H514.765V224.646H549.05V223.93Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 225.529H514.765V226.246H549.05V225.529Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 227.128H514.765V227.845H549.05V227.128Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 228.672H514.765V229.389H549.05V228.672Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 230.272H514.765V230.989H549.05V230.272Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 231.816H514.765V232.533H549.05V231.816Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 233.415H514.765V234.132H549.05V233.415Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 235.014H514.765V235.731H549.05V235.014Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 236.559H514.765V237.275H549.05V236.559Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M549.05 181.741L531.877 158.964L514.765 181.741L530.594 206.282L549.05 181.741Z")
-                    ) ~fill:(("#1073AA"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M578.568 240.75V162.218L590.975 141.593L603.747 160.84V240.75H578.568Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M587.552 161.832H594.825L591.036 143.026L587.552 161.832Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M635.894 120.802H605.581V241.081H635.894V120.802Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.6"))
-                    ~d:(("M182.059 188.303H169.531V240.695H182.059V188.303Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M250.141 150.968H205.588V153.064H250.141V150.968Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M252.096 147.99H203.572V151.74H252.096V147.99Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.4"))
-                    ~d:(("M228.751 241.246V147.99H203.572V151.685H205.588V241.246H228.751Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M331.606 121.298H291.759V124.166H331.606V121.298Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M336.801 199.664H334.173V209.701H336.801V199.664Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M336.801 199.664H334.173V205.014H336.801V199.664Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M338.94 211.962H337.106V213.672H338.94V211.962Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M343.34 211.962H341.506V213.672H343.34V211.962Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M347.801 211.962H345.968V213.672H347.801V211.962Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M352.201 211.962H350.368V213.672H352.201V211.962Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M356.602 211.962H354.768V213.672H356.602V211.962Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M361.002 211.962H359.168V213.672H361.002V211.962Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M365.402 211.962H363.569V213.672H365.402V211.962Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M339.795 217.146H337.473V219.242H339.795V217.146Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M345.234 217.146H342.912V219.242H345.234V217.146Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M350.673 217.146H348.351V219.242H350.673V217.146Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M356.052 217.146H353.79V219.242H356.052V217.146Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M361.552 217.146H359.229V219.242H361.552V217.146Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M366.991 217.146H364.669V219.242H366.991V217.146Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M372.43 217.146H370.108V219.242H372.43V217.146Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 181.52H478.769V183.175H480.175V181.52Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M483.536 181.52H482.13V183.175H483.536V181.52Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M486.836 181.52H485.43V183.175H486.836V181.52Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 181.52H488.792V183.175H490.197V181.52Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 181.52H492.092V183.175H493.498V181.52Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 181.52H495.453V183.175H496.859V181.52Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M500.22 181.52H498.814V183.175H500.22V181.52Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 181.52H501.931V183.175H503.337V181.52Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 181.52H506.087V183.175H507.493V181.52Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 184.774H478.769V186.428H480.175V184.774Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 184.774H482.13V186.428H483.536V184.774Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 184.774H485.43V186.428H486.836V184.774Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 184.774H488.792V186.428H490.197V184.774Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 184.774H492.092V186.428H493.498V184.774Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 184.774H495.453V186.428H496.859V184.774Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 184.774H498.814V186.428H500.22V184.774Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 184.774H501.931V186.428H503.337V184.774Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 184.774H506.087V186.428H507.493V184.774Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 188.083H478.769V189.737H480.175V188.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 188.083H482.13V189.737H483.536V188.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 188.083H485.43V189.737H486.836V188.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 188.083H488.792V189.737H490.197V188.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 188.083H492.092V189.737H493.498V188.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 188.083H495.453V189.737H496.859V188.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 188.083H498.814V189.737H500.22V188.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 188.083H501.931V189.737H503.337V188.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 188.083H506.087V189.737H507.493V188.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 191.392H478.769V193.046H480.175V191.392Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 191.392H482.13V193.046H483.536V191.392Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 191.392H485.43V193.046H486.836V191.392Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 191.392H488.792V193.046H490.197V191.392Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 191.392H492.092V193.046H493.498V191.392Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 191.392H495.453V193.046H496.859V191.392Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 191.392H498.814V193.046H500.22V191.392Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 191.392H501.931V193.046H503.337V191.392Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 191.392H506.087V193.046H507.493V191.392Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 194.646H478.769V196.3H480.175V194.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M483.536 194.646H482.13V196.3H483.536V194.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M486.836 194.646H485.43V196.3H486.836V194.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 194.646H488.792V196.3H490.197V194.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 194.646H492.092V196.3H493.498V194.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 194.646H495.453V196.3H496.859V194.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M500.22 194.646H498.814V196.3H500.22V194.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 194.646H501.931V196.3H503.337V194.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 194.646H506.087V196.3H507.493V194.646Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 197.954H478.769V199.609H480.175V197.954Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 197.954H482.13V199.609H483.536V197.954Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 197.954H485.43V199.609H486.836V197.954Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 197.954H488.792V199.609H490.197V197.954Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 197.954H492.092V199.609H493.498V197.954Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 197.954H495.453V199.609H496.859V197.954Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 197.954H498.814V199.609H500.22V197.954Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 197.954H501.931V199.609H503.337V197.954Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 197.954H506.087V199.609H507.493V197.954Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 201.263H478.769V202.918H480.175V201.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 201.263H482.13V202.918H483.536V201.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 201.263H485.43V202.918H486.836V201.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 201.263H488.792V202.918H490.197V201.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 201.263H492.092V202.918H493.498V201.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 201.263H495.453V202.918H496.859V201.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 201.263H498.814V202.918H500.22V201.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 201.263H501.931V202.918H503.337V201.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 201.263H506.087V202.918H507.493V201.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 204.517H478.769V206.172H480.175V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 204.517H482.13V206.172H483.536V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 204.517H485.43V206.172H486.836V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 204.517H488.792V206.172H490.197V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 204.517H492.092V206.172H493.498V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 204.517H495.453V206.172H496.859V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 204.517H498.814V206.172H500.22V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 204.517H501.931V206.172H503.337V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 204.517H506.087V206.172H507.493V204.517Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 207.826H478.769V209.481H480.175V207.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 207.826H482.13V209.481H483.536V207.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 207.826H485.43V209.481H486.836V207.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 207.826H488.792V209.481H490.197V207.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 207.826H492.092V209.481H493.498V207.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 207.826H495.453V209.481H496.859V207.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 207.826H498.814V209.481H500.22V207.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 207.826H501.931V209.481H503.337V207.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 207.826H506.087V209.481H507.493V207.826Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 211.135H478.769V212.789H480.175V211.135Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 211.135H482.13V212.789H483.536V211.135Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 211.135H485.43V212.789H486.836V211.135Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 211.135H488.792V212.789H490.197V211.135Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 211.135H492.092V212.789H493.498V211.135Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 211.135H495.453V212.789H496.859V211.135Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 211.135H498.814V212.789H500.22V211.135Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 211.135H501.931V212.789H503.337V211.135Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 211.135H506.087V212.789H507.493V211.135Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 214.389H478.769V216.043H480.175V214.389Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 214.389H482.13V216.043H483.536V214.389Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 214.389H485.43V216.043H486.836V214.389Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 214.389H488.792V216.043H490.197V214.389Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 214.389H492.092V216.043H493.498V214.389Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 214.389H495.453V216.043H496.859V214.389Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 214.389H498.814V216.043H500.22V214.389Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 214.389H501.931V216.043H503.337V214.389Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 214.389H506.087V216.043H507.493V214.389Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M480.175 217.698H478.769V219.352H480.175V217.698Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M483.536 217.698H482.13V219.352H483.536V217.698Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.836 217.698H485.43V219.352H486.836V217.698Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.197 217.698H488.792V219.352H490.197V217.698Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M493.498 217.698H492.092V219.352H493.498V217.698Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M496.859 217.698H495.453V219.352H496.859V217.698Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M500.22 217.698H498.814V219.352H500.22V217.698Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M503.337 217.698H501.931V219.352H503.337V217.698Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M507.493 217.698H506.087V219.352H507.493V217.698Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M360.88 197.844H334.173V203.911H360.88V197.844Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M337.84 199.333H336.312V200.712H337.84V199.333Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M341.384 199.333H339.856V200.712H341.384V199.333Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M344.929 199.333H343.401V200.712H344.929V199.333Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M348.473 199.333H346.946V200.712H348.473V199.333Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M352.079 199.333H350.551V200.712H352.079V199.333Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M355.624 199.333H354.096V200.712H355.624V199.333Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M359.168 199.333H357.641V200.712H359.168V199.333Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.5"))
-                    ~d:(("M368.274 212.459H334.173V215.216H368.274V212.459Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M446.317 186.594H443.811V188.028H446.317V186.594Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M449.617 186.594H447.112V188.028H449.617V186.594Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M452.918 186.594H450.412V188.028H452.918V186.594Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M456.157 186.594H453.651V188.028H456.157V186.594Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M459.457 186.594H456.951V188.028H459.457V186.594Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M462.757 186.594H460.251V188.028H462.757V186.594Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M446.317 188.524H443.811V189.958H446.317V188.524Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M449.617 188.524H447.112V189.958H449.617V188.524Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M452.918 188.524H450.412V189.958H452.918V188.524Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M456.157 188.524H453.651V189.958H456.157V188.524Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M459.457 188.524H456.951V189.958H459.457V188.524Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M462.757 188.524H460.251V189.958H462.757V188.524Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M446.317 190.454H443.811V191.888H446.317V190.454Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M449.617 190.454H447.112V191.888H449.617V190.454Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M452.918 190.454H450.412V191.888H452.918V190.454Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M456.157 190.454H453.651V191.888H456.157V190.454Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M459.457 190.454H456.951V191.888H459.457V190.454Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M462.757 190.454H460.251V191.888H462.757V190.454Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.5"))
-                    ~d:(("M465.996 190.454H441.306V192.55H465.996V190.454Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M444.362 195.473H434.767V198.892H444.362V195.473Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M454.69 195.473H445.095V198.892H454.69V195.473Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M464.957 195.473H455.362V198.892H464.957V195.473Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M475.224 195.473H465.629V198.892H475.224V195.473Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M444.362 199.609H434.767V203.028H444.362V199.609Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M454.69 199.609H445.095V203.028H454.69V199.609Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M464.957 199.609H455.362V203.028H464.957V199.609Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M475.224 199.609H465.629V203.028H475.224V199.609Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M444.362 203.8H434.767V207.219H444.362V203.8Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M454.69 203.8H445.095V207.219H454.69V203.8Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M464.957 203.8H455.362V207.219H464.957V203.8Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M475.224 203.8H465.629V207.219H475.224V203.8Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M444.362 207.936H434.767V211.356H444.362V207.936Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M454.69 207.936H445.095V211.356H454.69V207.936Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M464.957 207.936H455.362V211.356H464.957V207.936Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M475.224 207.936H465.629V211.356H475.224V207.936Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M444.362 212.073H434.767V215.492H444.362V212.073Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M454.69 212.073H445.095V215.492H454.69V212.073Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M464.957 212.073H455.362V215.492H464.957V212.073Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M475.224 212.073H465.629V215.492H475.224V212.073Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M444.362 216.209H434.767V219.628H444.362V216.209Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M454.69 216.209H445.095V219.628H454.69V216.209Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M464.957 216.209H455.362V219.628H464.957V216.209Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M475.224 216.209H465.629V219.628H475.224V216.209Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.6"))
-                    ~d:(("M476.141 192.55H467.402V240.474H476.141V192.55Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.646 126.647H559.745V134.313H569.646V126.647Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.646 130.287H559.745V133.431H569.646V130.287Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M566.468 110.379H564.695V128.853H566.468V110.379Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M573.863 132.383H550.578V240.474H573.863V132.383Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M573.863 131.17H550.578V239.261H573.863V131.17Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 140.765H551.678V142.034H553.023V140.765Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 140.765H554.917V142.034H556.262V140.765Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 140.765H558.156V142.034H559.501V140.765Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 140.765H561.396V142.034H562.74V140.765Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 140.765H564.634V142.034H565.979V140.765Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 140.765H567.812V142.034H569.157V140.765Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 140.765H571.052V142.034H572.396V140.765Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 143.743H551.678V145.012H553.023V143.743Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 143.743H554.917V145.012H556.262V143.743Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 143.743H558.156V145.012H559.501V143.743Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 143.743H561.396V145.012H562.74V143.743Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 143.743H564.634V145.012H565.979V143.743Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 143.743H567.812V145.012H569.157V143.743Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 143.743H571.052V145.012H572.396V143.743Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 149.865H551.678V151.133H553.023V149.865Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 149.865H554.917V151.133H556.262V149.865Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 149.865H558.156V151.133H559.501V149.865Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 149.865H561.396V151.133H562.74V149.865Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 149.865H564.634V151.133H565.979V149.865Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 149.865H567.812V151.133H569.157V149.865Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 149.865H571.052V151.133H572.396V149.865Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 152.843H551.678V154.111H553.023V152.843Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 152.843H554.917V154.111H556.262V152.843Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 152.843H558.156V154.111H559.501V152.843Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 152.843H561.396V154.111H562.74V152.843Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 152.843H564.634V154.111H565.979V152.843Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 152.843H567.812V154.111H569.157V152.843Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 152.843H571.052V154.111H572.396V152.843Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 158.964H551.678V160.233H553.023V158.964Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 158.964H554.917V160.233H556.262V158.964Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 158.964H558.156V160.233H559.501V158.964Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 158.964H561.396V160.233H562.74V158.964Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 158.964H564.634V160.233H565.979V158.964Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 158.964H567.812V160.233H569.157V158.964Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 158.964H571.052V160.233H572.396V158.964Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 161.942H551.678V163.211H553.023V161.942Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 161.942H554.917V163.211H556.262V161.942Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 161.942H558.156V163.211H559.501V161.942Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 161.942H561.396V163.211H562.74V161.942Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 161.942H564.634V163.211H565.979V161.942Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 161.942H567.812V163.211H569.157V161.942Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 161.942H571.052V163.211H572.396V161.942Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 168.064H551.678V169.332H553.023V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 168.064H554.917V169.332H556.262V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 168.064H558.156V169.332H559.501V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 168.064H561.396V169.332H562.74V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 168.064H564.634V169.332H565.979V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 168.064H567.812V169.332H569.157V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 168.064H571.052V169.332H572.396V168.064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 171.042H551.678V172.31H553.023V171.042Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 171.042H554.917V172.31H556.262V171.042Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 171.042H558.156V172.31H559.501V171.042Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M562.74 171.042H561.396V172.31H562.74V171.042Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 171.042H564.634V172.31H565.979V171.042Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 171.042H567.812V172.31H569.157V171.042Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 171.042H571.052V172.31H572.396V171.042Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 177.163H551.678V178.432H553.023V177.163Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 177.163H554.917V178.432H556.262V177.163Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 177.163H558.156V178.432H559.501V177.163Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 177.163H561.396V178.432H562.74V177.163Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 177.163H564.634V178.432H565.979V177.163Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 177.163H567.812V178.432H569.157V177.163Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 177.163H571.052V178.432H572.396V177.163Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 180.141H551.678V181.41H553.023V180.141Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 180.141H554.917V181.41H556.262V180.141Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 180.141H558.156V181.41H559.501V180.141Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M562.74 180.141H561.396V181.41H562.74V180.141Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 180.141H564.634V181.41H565.979V180.141Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 180.141H567.812V181.41H569.157V180.141Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 180.141H571.052V181.41H572.396V180.141Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 186.263H551.678V187.531H553.023V186.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 186.263H554.917V187.531H556.262V186.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 186.263H558.156V187.531H559.501V186.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 186.263H561.396V187.531H562.74V186.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 186.263H564.634V187.531H565.979V186.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 186.263H567.812V187.531H569.157V186.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 186.263H571.052V187.531H572.396V186.263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 189.241H551.678V190.509H553.023V189.241Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 189.241H554.917V190.509H556.262V189.241Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 189.241H558.156V190.509H559.501V189.241Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 189.241H561.396V190.509H562.74V189.241Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 189.241H564.634V190.509H565.979V189.241Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 189.241H567.812V190.509H569.157V189.241Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 189.241H571.052V190.509H572.396V189.241Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 195.307H551.678V196.576H553.023V195.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 195.307H554.917V196.576H556.262V195.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 195.307H558.156V196.576H559.501V195.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 195.307H561.396V196.576H562.74V195.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 195.307H564.634V196.576H565.979V195.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 195.307H567.812V196.576H569.157V195.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 195.307H571.052V196.576H572.396V195.307Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 198.341H551.678V199.609H553.023V198.341Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 198.341H554.917V199.609H556.262V198.341Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 198.341H558.156V199.609H559.501V198.341Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 198.341H561.396V199.609H562.74V198.341Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 198.341H564.634V199.609H565.979V198.341Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 198.341H567.812V199.609H569.157V198.341Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 198.341H571.052V199.609H572.396V198.341Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 204.407H551.678V205.675H553.023V204.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 204.407H554.917V205.675H556.262V204.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 204.407H558.156V205.675H559.501V204.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 204.407H561.396V205.675H562.74V204.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 204.407H564.634V205.675H565.979V204.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 204.407H567.812V205.675H569.157V204.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 204.407H571.052V205.675H572.396V204.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 207.44H551.678V208.708H553.023V207.44Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 207.44H554.917V208.708H556.262V207.44Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 207.44H558.156V208.708H559.501V207.44Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M562.74 207.44H561.396V208.708H562.74V207.44Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 207.44H564.634V208.708H565.979V207.44Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 207.44H567.812V208.708H569.157V207.44Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 207.44H571.052V208.708H572.396V207.44Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 213.506H551.678V214.775H553.023V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 213.506H554.917V214.775H556.262V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 213.506H558.156V214.775H559.501V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 213.506H561.396V214.775H562.74V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 213.506H564.634V214.775H565.979V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 213.506H567.812V214.775H569.157V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 213.506H571.052V214.775H572.396V213.506Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 216.484H551.678V217.753H553.023V216.484Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 216.484H554.917V217.753H556.262V216.484Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 216.484H558.156V217.753H559.501V216.484Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 216.484H561.396V217.753H562.74V216.484Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 216.484H564.634V217.753H565.979V216.484Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 216.484H567.812V217.753H569.157V216.484Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 216.484H571.052V217.753H572.396V216.484Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 222.606H551.678V223.874H553.023V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 222.606H554.917V223.874H556.262V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 222.606H558.156V223.874H559.501V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 222.606H561.396V223.874H562.74V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 222.606H564.634V223.874H565.979V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 222.606H567.812V223.874H569.157V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 222.606H571.052V223.874H572.396V222.606Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 225.584H551.678V226.852H553.023V225.584Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 225.584H554.917V226.852H556.262V225.584Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 225.584H558.156V226.852H559.501V225.584Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 225.584H561.396V226.852H562.74V225.584Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 225.584H564.634V226.852H565.979V225.584Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 225.584H567.812V226.852H569.157V225.584Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 225.584H571.052V226.852H572.396V225.584Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 231.705H551.678V232.974H553.023V231.705Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 231.705H554.917V232.974H556.262V231.705Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 231.705H558.156V232.974H559.501V231.705Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 231.705H561.396V232.974H562.74V231.705Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 231.705H564.634V232.974H565.979V231.705Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 231.705H567.812V232.974H569.157V231.705Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 231.705H571.052V232.974H572.396V231.705Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M553.023 234.683H551.678V235.952H553.023V234.683Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M556.262 234.683H554.917V235.952H556.262V234.683Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M559.501 234.683H558.156V235.952H559.501V234.683Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M562.74 234.683H561.396V235.952H562.74V234.683Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M565.979 234.683H564.634V235.952H565.979V234.683Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M569.157 234.683H567.812V235.952H569.157V234.683Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M572.396 234.683H571.052V235.952H572.396V234.683Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.3"))
-                    ~d:(("M573.863 230.988H550.578V240.474H573.863V230.988Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.6"))
-                    ~d:(("M562.068 131.17H550.578V240.364H562.068V131.17Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M531.877 158.964L549.05 181.741L530.594 206.282L514.765 181.741L531.877 158.964Z")
-                    ) ~stroke:(("#E37056"))
-                    ~strokeWidth:(("3"))
-                    ~strokeMiterlimit:(("10"))
-                    ~strokeLinecap:(("round"))
-                    ~strokeLinejoin:(("round")) ~children:[]
-                    ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M579.73 161.667H584.986L590.425 143.247L579.73 161.667Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M602.77 161.667H597.575L591.586 143.247L602.77 161.667Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M590.058 165.251H589.386V180.472H590.058V165.251Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M588.897 165.858H588.225V181.079H588.897V165.858Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M587.797 166.41H587.125V181.631H587.797V166.41Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M586.697 167.016H586.025V182.237H586.697V167.016Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M585.536 167.623H584.863V182.844H585.536V167.623Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M584.435 168.174H583.763V183.395H584.435V168.174Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M583.336 168.781H582.663V184.002H583.336V168.781Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M582.174 169.332H581.502V184.553H582.174V169.332Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M593.542 165.251H592.869V180.472H593.542V165.251Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M594.703 165.858H594.03V181.079H594.703V165.858Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M595.803 166.41H595.13V181.631H595.803V166.41Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M596.903 167.016H596.231V182.237H596.903V167.016Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M598.064 167.623H597.392V182.844H598.064V167.623Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M599.164 168.174H598.492V183.395H599.164V168.174Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M600.264 168.781H599.592V184.002H600.264V168.781Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M601.425 169.332H600.753V184.553H601.425V169.332Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M590.058 182.734H589.386V197.955H590.058V182.734Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M588.897 183.285H588.225V198.506H588.897V183.285Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M587.797 183.892H587.125V199.113H587.797V183.892Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M586.697 184.443H586.025V199.664H586.697V184.443Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M585.536 185.05H584.863V200.271H585.536V185.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M584.435 185.656H583.763V200.877H584.435V185.656Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M583.336 186.208H582.663V201.429H583.336V186.208Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M582.174 186.815H581.502V202.036H582.174V186.815Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M593.542 182.734H592.869V197.955H593.542V182.734Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M594.703 183.285H594.03V198.506H594.703V183.285Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M595.803 183.892H595.13V199.113H595.803V183.892Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M596.903 184.443H596.231V199.664H596.903V184.443Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M598.064 185.05H597.392V200.271H598.064V185.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M599.164 185.656H598.492V200.877H599.164V185.656Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M600.264 186.208H599.592V201.429H600.264V186.208Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M601.425 186.814H600.753V202.035H601.425V186.814Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M590.058 200.16H589.386V215.381H590.058V200.16Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M588.897 200.767H588.225V215.988H588.897V200.767Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M587.797 201.319H587.125V216.54H587.797V201.319Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M586.697 201.925H586.025V217.146H586.697V201.925Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M585.536 202.532H584.863V217.753H585.536V202.532Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M584.435 203.083H583.763V218.304H584.435V203.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M583.336 203.69H582.663V218.911H583.336V203.69Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M582.174 204.241H581.502V219.462H582.174V204.241Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M593.542 200.16H592.869V215.381H593.542V200.16Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M594.703 200.767H594.03V215.988H594.703V200.767Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M595.803 201.318H595.13V216.54H595.803V201.318Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M596.903 201.925H596.231V217.146H596.903V201.925Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M598.064 202.532H597.392V217.753H598.064V202.532Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M599.164 203.083H598.492V218.304H599.164V203.083Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M600.264 203.69H599.592V218.911H600.264V203.69Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M601.425 204.241H600.753V219.462H601.425V204.241Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M590.058 217.643H589.386V232.864H590.058V217.643Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M588.897 218.194H588.225V233.415H588.897V218.194Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M587.797 218.801H587.125V234.022H587.797V218.801Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M586.697 219.407H586.025V234.628H586.697V219.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M585.536 219.959H584.863V235.18H585.536V219.959Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M584.435 220.565H583.763V235.786H584.435V220.565Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M583.336 221.117H582.663V236.338H583.336V221.117Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M582.174 221.724H581.502V236.945H582.174V221.724Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M593.542 217.643H592.869V232.864H593.542V217.643Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M594.703 218.194H594.03V233.415H594.703V218.194Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M595.803 218.801H595.13V234.022H595.803V218.801Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M596.903 219.407H596.231V234.628H596.903V219.407Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M598.064 219.959H597.392V235.18H598.064V219.959Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M599.164 220.565H598.492V235.786H599.164V220.565Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M600.264 221.117H599.592V236.338H600.264V221.117Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M601.425 221.724H600.753V236.945H601.425V221.724Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 134.258H608.331V135.692H609.92V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 134.258H612.976V135.692H614.565V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 134.258H617.62V135.692H619.21V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 134.258H622.265V135.692H623.854V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 134.258H626.91V135.692H628.499V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 134.258H631.555V135.692H633.144V134.258Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 137.622H608.331V139.056H609.92V137.622Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 137.622H612.976V139.056H614.565V137.622Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 137.622H617.62V139.056H619.21V137.622Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 137.622H622.265V139.056H623.854V137.622Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 137.622H626.91V139.056H628.499V137.622Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 137.622H631.555V139.056H633.144V137.622Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 141.041H608.331V142.475H609.92V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 141.041H612.976V142.475H614.565V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 141.041H617.62V142.475H619.21V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 141.041H622.265V142.475H623.854V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 141.041H626.91V142.475H628.499V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 141.041H631.555V142.475H633.144V141.041Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 144.405H608.331V145.839H609.92V144.405Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 144.405H612.976V145.839H614.565V144.405Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 144.405H617.62V145.839H619.21V144.405Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 144.405H622.265V145.839H623.854V144.405Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 144.405H626.91V145.839H628.499V144.405Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 144.405H631.555V145.839H633.144V144.405Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 147.769H608.331V149.203H609.92V147.769Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 147.769H612.976V149.203H614.565V147.769Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 147.769H617.62V149.203H619.21V147.769Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 147.769H622.265V149.203H623.854V147.769Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 147.769H626.91V149.203H628.499V147.769Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 147.769H631.555V149.203H633.144V147.769Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 151.188H608.331V152.622H609.92V151.188Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 151.188H612.976V152.622H614.565V151.188Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 151.188H617.62V152.622H619.21V151.188Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 151.188H622.265V152.622H623.854V151.188Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 151.188H626.91V152.622H628.499V151.188Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 151.188H631.555V152.622H633.144V151.188Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 154.553H608.331V155.986H609.92V154.553Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 154.553H612.976V155.986H614.565V154.553Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 154.553H617.62V155.986H619.21V154.553Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 154.553H622.265V155.986H623.854V154.553Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 154.553H626.91V155.986H628.499V154.553Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 154.553H631.555V155.986H633.144V154.553Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 157.972H608.331V159.406H609.92V157.972Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 157.972H612.976V159.406H614.565V157.972Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 157.972H617.62V159.406H619.21V157.972Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 157.972H622.265V159.406H623.854V157.972Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 157.972H626.91V159.406H628.499V157.972Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 157.972H631.555V159.406H633.144V157.972Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M609.92 161.336H608.331V162.77H609.92V161.336Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 161.336H612.976V162.77H614.565V161.336Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 161.336H617.62V162.77H619.21V161.336Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 161.336H622.265V162.77H623.854V161.336Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 161.336H626.91V162.77H628.499V161.336Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 161.336H631.555V162.77H633.144V161.336Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M609.92 164.7H608.331V166.134H609.92V164.7Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M614.565 164.7H612.976V166.134H614.565V164.7Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 164.7H617.62V166.134H619.21V164.7Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M623.854 164.7H622.265V166.134H623.854V164.7Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M628.499 164.7H626.91V166.134H628.499V164.7Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M633.144 164.7H631.555V166.134H633.144V164.7Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 168.119H608.331V169.553H609.92V168.119Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 168.119H612.976V169.553H614.565V168.119Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 168.119H617.62V169.553H619.21V168.119Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 168.119H622.265V169.553H623.854V168.119Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 168.119H626.91V169.553H628.499V168.119Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 168.119H631.555V169.553H633.144V168.119Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 171.483H608.331V172.917H609.92V171.483Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 171.483H612.976V172.917H614.565V171.483Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 171.483H617.62V172.917H619.21V171.483Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 171.483H622.265V172.917H623.854V171.483Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 171.483H626.91V172.917H628.499V171.483Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 171.483H631.555V172.917H633.144V171.483Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 174.902H608.331V176.336H609.92V174.902Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 174.902H612.976V176.336H614.565V174.902Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 174.902H617.62V176.336H619.21V174.902Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 174.902H622.265V176.336H623.854V174.902Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 174.902H626.91V176.336H628.499V174.902Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 174.902H631.555V176.336H633.144V174.902Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M609.92 178.266H608.331V179.7H609.92V178.266Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 178.266H612.976V179.7H614.565V178.266Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 178.266H617.62V179.7H619.21V178.266Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 178.266H622.265V179.7H623.854V178.266Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M628.499 178.266H626.91V179.7H628.499V178.266Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 178.266H631.555V179.7H633.144V178.266Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M609.92 181.63H608.331V183.064H609.92V181.63Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 181.63H612.976V183.064H614.565V181.63Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 181.63H617.62V183.064H619.21V181.63Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 181.63H622.265V183.064H623.854V181.63Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M628.499 181.63H626.91V183.064H628.499V181.63Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 181.63H631.555V183.064H633.144V181.63Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M609.92 185.05H608.331V186.484H609.92V185.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 185.05H612.976V186.484H614.565V185.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 185.05H617.62V186.484H619.21V185.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 185.05H622.265V186.484H623.854V185.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M628.499 185.05H626.91V186.484H628.499V185.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 185.05H631.555V186.484H633.144V185.05Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 188.414H608.331V189.848H609.92V188.414Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 188.414H612.976V189.848H614.565V188.414Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 188.414H617.62V189.848H619.21V188.414Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 188.414H622.265V189.848H623.854V188.414Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 188.414H626.91V189.848H628.499V188.414Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 188.414H631.555V189.848H633.144V188.414Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 191.833H608.331V193.267H609.92V191.833Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 191.833H612.976V193.267H614.565V191.833Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 191.833H617.62V193.267H619.21V191.833Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 191.833H622.265V193.267H623.854V191.833Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 191.833H626.91V193.267H628.499V191.833Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 191.833H631.555V193.267H633.144V191.833Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 195.197H608.331V196.631H609.92V195.197Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 195.197H612.976V196.631H614.565V195.197Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 195.197H617.62V196.631H619.21V195.197Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 195.197H622.265V196.631H623.854V195.197Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 195.197H626.91V196.631H628.499V195.197Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 195.197H631.555V196.631H633.144V195.197Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M609.92 198.616H608.331V200.05H609.92V198.616Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 198.616H612.976V200.05H614.565V198.616Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 198.616H617.62V200.05H619.21V198.616Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 198.616H622.265V200.05H623.854V198.616Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 198.616H626.91V200.05H628.499V198.616Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 198.616H631.555V200.05H633.144V198.616Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 201.925H608.331V203.359H609.92V201.925Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 201.925H612.976V203.359H614.565V201.925Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 201.925H617.62V203.359H619.21V201.925Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 201.925H622.265V203.359H623.854V201.925Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 201.925H626.91V203.359H628.499V201.925Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 201.925H631.555V203.359H633.144V201.925Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 205.344H608.331V206.778H609.92V205.344Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 205.344H612.976V206.778H614.565V205.344Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 205.344H617.62V206.778H619.21V205.344Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 205.344H622.265V206.778H623.854V205.344Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 205.344H626.91V206.778H628.499V205.344Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 205.344H631.555V206.778H633.144V205.344Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 208.708H608.331V210.142H609.92V208.708Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 208.708H612.976V210.142H614.565V208.708Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 208.708H617.62V210.142H619.21V208.708Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 208.708H622.265V210.142H623.854V208.708Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 208.708H626.91V210.142H628.499V208.708Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 208.708H631.555V210.142H633.144V208.708Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 212.073H608.331V213.506H609.92V212.073Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 212.073H612.976V213.506H614.565V212.073Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 212.073H617.62V213.506H619.21V212.073Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 212.073H622.265V213.506H623.854V212.073Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 212.073H626.91V213.506H628.499V212.073Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 212.073H631.555V213.506H633.144V212.073Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 215.492H608.331V216.926H609.92V215.492Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 215.492H612.976V216.926H614.565V215.492Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 215.492H617.62V216.926H619.21V215.492Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 215.492H622.265V216.926H623.854V215.492Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 215.492H626.91V216.926H628.499V215.492Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 215.492H631.555V216.926H633.144V215.492Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M609.92 218.856H608.331V220.29H609.92V218.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 218.856H612.976V220.29H614.565V218.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 218.856H617.62V220.29H619.21V218.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 218.856H622.265V220.29H623.854V218.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 218.856H626.91V220.29H628.499V218.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 218.856H631.555V220.29H633.144V218.856Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 222.275H608.331V223.709H609.92V222.275Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 222.275H612.976V223.709H614.565V222.275Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 222.275H617.62V223.709H619.21V222.275Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 222.275H622.265V223.709H623.854V222.275Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 222.275H626.91V223.709H628.499V222.275Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 222.275H631.555V223.709H633.144V222.275Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 225.639H608.331V227.073H609.92V225.639Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 225.639H612.976V227.073H614.565V225.639Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 225.639H617.62V227.073H619.21V225.639Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 225.639H622.265V227.073H623.854V225.639Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 225.639H626.91V227.073H628.499V225.639Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 225.639H631.555V227.073H633.144V225.639Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 229.003H608.331V230.437H609.92V229.003Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 229.003H612.976V230.437H614.565V229.003Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 229.003H617.62V230.437H619.21V229.003Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 229.003H622.265V230.437H623.854V229.003Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 229.003H626.91V230.437H628.499V229.003Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 229.003H631.555V230.437H633.144V229.003Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M609.92 232.422H608.331V233.856H609.92V232.422Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M614.565 232.422H612.976V233.856H614.565V232.422Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~d:(("M619.21 232.422H617.62V233.856H619.21V232.422Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M623.854 232.422H622.265V233.856H623.854V232.422Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M628.499 232.422H626.91V233.856H628.499V232.422Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M633.144 232.422H631.555V233.856H633.144V232.422Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.7"))
-                    ~d:(("M635.894 230.713H605.581V240.474H635.894V230.713Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~className:(("HeroGraphic-cloudRight")
-                    ) ~opacity:(("0.7"))
-                    ~d:(("M609.126 61.903H757.878C757.878 61.903 760.078 50.3218 744.127 48.3364C744.127 48.3364 742.232 27.7108 719.742 20.3761C697.252 13.0413 686.924 24.3468 686.924 24.3468C686.924 24.3468 680.018 16.8466 670.973 17.8944C661.928 18.9422 658.139 29.4205 658.139 29.4205C658.139 29.4205 652.822 26.0564 647.2 28.869C641.577 31.6815 641.883 35.3765 641.883 35.3765C641.883 35.3765 635.405 33.9426 630.821 33.6669C626.238 33.3912 604.237 34.825 609.126 61.903Z")
-                    ) ~fill:(("white"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.5"))
-                    ~d:(("M406.715 74.3666H472.413C472.413 74.3666 472.169 68.2451 465.079 68.2451C465.079 68.2451 463.063 64.8258 452.918 62.7302C442.773 60.6897 432.139 65.4876 432.139 65.4876C432.139 65.4876 429.45 63.8883 426.455 63.8883C423.461 63.8883 422.422 67.3075 422.422 67.3075C422.422 67.3075 406.715 64.881 406.715 74.3666Z")
-                    ) ~fill:(("white"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~opacity:(("0.5"))
-                    ~d:(("M233.09 126.647H283.02C283.02 126.647 277.581 121.022 267.192 117.493C256.802 113.963 250.141 117.493 250.141 117.493C250.141 117.493 247.207 114.68 242.807 117.493C238.407 120.305 239.385 121.298 239.385 121.298C239.385 121.298 231.99 120.36 233.09 126.647Z")
-                    ) ~fill:(("white"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M173.992 45.193C173.992 39.0715 178.392 33.9427 184.504 32.1779C183.037 31.7367 181.509 31.5161 179.859 31.5161C171.487 31.5161 164.703 37.6376 164.703 45.193C164.703 52.7483 171.487 58.8698 179.859 58.8698C181.509 58.8698 183.037 58.6492 184.504 58.208C178.454 56.4433 173.992 51.3145 173.992 45.193Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M245.863 68.4656L246.474 69.5686L247.818 69.734L246.84 70.5613L247.085 71.7194L245.863 71.1679L244.701 71.7194L244.946 70.5613L243.968 69.734L245.313 69.5686L245.863 68.4656Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M334.173 43.2627L334.784 44.4208L336.189 44.5863L335.15 45.5238L335.395 46.7371L334.173 46.1856L332.889 46.7371L333.134 45.5238L332.156 44.5863L333.561 44.4208L334.173 43.2627Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M377.136 23.9056L377.686 24.9534L378.969 25.1188L378.053 25.8909L378.236 27.0491L377.136 26.4976L376.036 27.0491L376.219 25.8909L375.303 25.1188L376.586 24.9534L377.136 23.9056Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M498.815 134.644L499.365 135.692L500.587 135.857L499.67 136.629L499.915 137.732L498.815 137.236L497.653 137.732L497.898 136.629L496.981 135.857L498.203 135.692L498.815 134.644Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M354.096 0.90863L354.646 1.90131L355.868 2.06675L355.013 2.89398L355.196 3.99695L354.096 3.50061L352.935 3.99695L353.179 2.89398L352.263 2.06675L353.546 1.90131L354.096 0.90863Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M160.914 17.9495L161.464 18.9422L162.747 19.1076L161.831 19.9349L162.075 21.0378L160.914 20.4864L159.814 21.0378L159.997 19.9349L159.142 19.1076L160.364 18.9422L160.914 17.9495Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M40.8243 164.314L41.3743 165.362L42.6577 165.527L41.741 166.299L41.9244 167.457L40.8243 166.906L39.7243 167.457L39.9076 166.299L38.9909 165.527L40.2743 165.362L40.8243 164.314Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M380.497 53.9064L381.108 55.0093L382.453 55.1748L381.475 56.002L381.658 57.2153L380.497 56.6638L379.275 57.2153L379.519 56.002L378.542 55.1748L379.886 55.0093L380.497 53.9064Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M216.161 102.272L216.833 103.54L218.361 103.706L217.261 104.643L217.506 106.022L216.161 105.36L214.817 106.022L215.122 104.643L214.022 103.706L215.489 103.54L216.161 102.272Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M97.6606 109.993L98.1495 110.985L99.3718 111.151L98.5162 111.923L98.6995 112.971L97.6606 112.474L96.5605 112.971L96.7439 111.923L95.8883 111.151L97.1105 110.985L97.6606 109.993Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M90.9991 146.28L91.5491 147.273L92.7714 147.438L91.8547 148.21L92.0992 149.258L90.9991 148.762L89.9602 149.258L90.1435 148.21L89.2879 147.438L90.4491 147.273L90.9991 146.28Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M105.239 55.7263L105.728 56.6087L106.828 56.7741L106.033 57.4359L106.217 58.4286L105.239 57.9323L104.261 58.4286L104.444 57.4359L103.711 56.7741L104.75 56.6087L105.239 55.7263Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M115.689 19.4937L116.3 20.5415L117.584 20.7069L116.606 21.5342L116.85 22.6371L115.689 22.0856L114.589 22.6371L114.772 21.5342L113.856 20.7069L115.139 20.5415L115.689 19.4937Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M486.164 101.831L486.347 102.217L486.836 102.272L486.469 102.603L486.592 102.989L486.164 102.823L485.736 102.989L485.797 102.603L485.492 102.272L485.981 102.217L486.164 101.831Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M418.999 18.3907L419.305 18.887L419.977 18.9973L419.488 19.4385L419.61 19.99L418.999 19.7143L418.449 19.99L418.51 19.4385L418.082 18.9973L418.694 18.887L418.999 18.3907Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M558.156 67.9141L558.89 69.2377L560.418 69.4031L559.318 70.451L559.562 71.8848L558.156 71.1679L556.751 71.8848L556.995 70.451L555.834 69.4031L557.423 69.2377L558.156 67.9141Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~className:(("HeroGraphic-starCenterLeft")
-                    )
-                    ~d:(("M380.497 100.893L381.17 102.161L382.759 102.382L381.658 103.375L381.903 104.809L380.497 104.147L379.092 104.809L379.336 103.375L378.175 102.382L379.764 102.161L380.497 100.893Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~className:(("HeroGraphic-startRight")
-                    )
-                    ~d:(("M160.914 73.9805L161.647 75.2489L163.236 75.4695L162.075 76.4621L162.319 77.896L160.914 77.2342L159.508 77.896L159.814 76.4621L158.653 75.4695L160.242 75.2489L160.914 73.9805Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M348.473 94.3854L349.146 95.709L350.735 95.8744L349.635 96.9223L349.879 98.3561L348.473 97.6392L347.068 98.3561L347.312 96.9223L346.151 95.8744L347.74 95.709L348.473 94.3854Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M527.783 46.7922L528.271 47.7849L529.494 47.9504L528.638 48.7224L528.822 49.7703L527.783 49.2739L526.682 49.7703L526.866 48.7224L526.01 47.9504L527.233 47.7849L527.783 46.7922Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~className:(("HeroGraphic-starCenterLeft")
-                    )
-                    ~d:(("M531.877 90.9662L532.427 91.9589L533.649 92.1244L532.733 92.8964L532.977 93.9443L531.877 93.4479L530.838 93.9443L531.022 92.8964L530.166 92.1244L531.388 91.9589L531.877 90.9662Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M632.349 87.8779L632.716 88.4846L633.449 88.5949L632.899 89.0912L633.021 89.753L632.349 89.4221L631.677 89.753L631.799 89.0912L631.249 88.5949L632.043 88.4846L632.349 87.8779Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M683.196 143.357L683.991 144.846L685.824 145.067L684.48 146.225L684.785 147.824L683.196 147.052L681.607 147.824L681.913 146.225L680.629 145.067L682.402 144.846L683.196 143.357Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~className:(("HeroGraphic-starRight")
-                    )
-                    ~d:(("M669.873 94.3854L671.095 96.7017L673.907 97.0326L671.89 98.7973L672.379 101.334L669.873 100.121L667.368 101.334L667.856 98.7973L665.84 97.0326L668.59 96.7017L669.873 94.3854Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path ~className:(("HeroGraphic-starCenter")
-                    )
-                    ~d:(("M261.997 28.0417L263.28 30.3028L266.03 30.6888L264.014 32.4536L264.502 34.9904L261.997 33.7771L259.552 34.9904L259.98 32.4536L257.963 30.6888L260.774 30.3028L261.997 28.0417Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M608.331 26.0012L608.698 26.6079L609.431 26.7182L608.881 27.2145L609.003 27.8763L608.331 27.6005L607.659 27.8763L607.781 27.2145L607.231 26.7182L607.964 26.6079L608.331 26.0012Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M656.123 163.211L656.489 163.873L657.284 163.983L656.673 164.479L656.856 165.141L656.123 164.81L655.45 165.141L655.572 164.479L655.022 163.983L655.817 163.873L656.123 163.211Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M497.959 92.4553L498.326 93.117L499.12 93.2273L498.509 93.7237L498.692 94.3855L497.959 94.0546L497.287 94.3855L497.409 93.7237L496.859 93.2273L497.653 93.117L497.959 92.4553Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M506.087 78.8887L506.393 79.4953L507.187 79.6056L506.637 80.1019L506.759 80.8189L506.087 80.488L505.354 80.8189L505.476 80.1019L504.926 79.6056L505.72 79.4953L506.087 78.8887Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M546.239 110.048L546.973 111.426L548.745 111.647L547.461 112.75L547.767 114.294L546.239 113.577L544.711 114.294L544.956 112.75L543.733 111.647L545.445 111.426L546.239 110.048Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M481.947 38.52L482.436 39.4023L483.536 39.5678L482.742 40.2847L482.925 41.2222L481.947 40.7811L480.969 41.2222L481.153 40.2847L480.358 39.5678L481.458 39.4023L481.947 38.52Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M304.349 67.142L304.838 68.0244L305.938 68.1347L305.143 68.8516L305.327 69.8443L304.349 69.348L303.371 69.8443L303.554 68.8516L302.76 68.1347L303.86 68.0244L304.349 67.142Z")
-                    ) ~fill:(("#E37056"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M643.105 244.279C643.105 246.43 641.15 248.195 638.766 248.195H90.0824C87.699 248.195 85.7433 246.43 85.7433 244.279C85.7433 242.129 87.699 240.364 90.0824 240.364H638.766C641.211 240.364 643.105 242.129 643.105 244.279Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M643.105 244.22C643.105 246.371 641.15 248.135 638.766 248.135H90.0824C87.699 248.135 85.7433 246.371 85.7433 244.22C85.7433 242.069 87.699 240.304 90.0824 240.304H638.766C641.211 240.304 643.105 242.069 643.105 244.22Z")
-                    ) ~fill:(("#2484C6"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M124.612 231.485C124.612 231.485 123.817 225.86 127.118 223.985C130.418 222.165 131.64 222.165 131.64 222.165C131.64 222.165 130.54 218.911 133.351 217.477C136.163 216.043 137.446 217.477 137.446 217.477C137.446 217.477 137.752 212.128 141.541 210.97C145.269 209.867 146.246 210.97 146.246 210.97C146.246 210.97 147.958 203.58 153.458 202.697C158.958 201.815 158.958 203.635 158.958 203.635C158.958 203.635 159.569 202.532 162.686 202.422C165.803 202.311 165.681 204.021 165.681 204.021C165.681 204.021 167.697 203.028 170.387 203.58C173.076 204.131 173.076 206.558 173.076 206.558C173.076 206.558 174.298 204.738 179.676 208.543C184.993 212.348 184.198 218.856 184.198 218.856C184.198 218.856 188.293 219.021 188.721 220.676C189.21 222.385 188.11 223.929 188.11 223.929C188.11 223.929 192.938 223.488 193.427 226.025C193.916 228.562 192.815 229.83 192.815 229.83C192.815 229.83 194.527 230.823 194.71 232.919C194.893 235.014 194.71 236.007 194.71 236.007C194.71 236.007 196.299 236.448 196.605 239.371C196.91 242.349 195.504 244.445 195.504 244.445C195.504 244.445 195.504 247.643 191.899 248.195C188.293 248.801 119.112 248.195 119.112 248.195C119.112 248.195 117.095 245.272 118.317 243.728C119.539 242.184 120.334 242.184 120.334 242.184C120.334 242.184 120.028 240.198 120.028 239.757C120.028 239.316 122.351 238.489 122.351 238.489C122.351 238.489 120.762 237.386 121.556 236.393C122.351 235.4 123.451 234.959 123.451 234.959C123.451 234.959 120.578 232.367 124.612 231.485Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M191.654 238.599C191.654 238.599 191.776 232.919 195.443 232.367C199.11 231.816 199.416 232.367 199.416 232.367C199.416 232.367 199.721 230.327 201.433 229.996C203.144 229.61 203.572 229.996 203.572 229.996C203.572 229.996 204.61 226.852 207.85 226.08C211.089 225.308 212.739 229.389 212.739 229.389C212.739 229.389 214.694 228.562 216.283 229.113C217.872 229.665 217.261 231.209 217.261 231.209C217.261 231.209 218.545 230.823 218.85 231.761C219.156 232.698 218.85 233.139 218.85 233.139C218.85 233.139 220.5 232.422 221.417 234.132C222.334 235.897 222.028 236.889 222.028 236.889C222.028 236.889 223.556 235.897 224.045 237.441C224.534 238.985 224.534 239.537 224.534 239.537C224.534 239.537 227.773 238.709 228.017 239.978C228.262 241.246 226.062 242.459 226.062 242.459C226.062 242.459 227.467 243.452 227.467 244.665C227.467 245.879 226.734 246.044 226.734 246.32C226.734 246.596 227.223 247.588 227.162 248.36C227.039 249.077 189.271 248.36 189.271 248.36L191.654 238.599Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M247.329 238.599C247.329 238.599 247.452 232.919 251.118 232.367C254.785 231.816 255.091 232.367 255.091 232.367C255.091 232.367 255.396 230.327 257.108 229.996C258.819 229.61 259.247 229.996 259.247 229.996C259.247 229.996 260.286 226.852 263.525 226.08C266.764 225.308 268.414 229.389 268.414 229.389C268.414 229.389 270.369 228.562 271.958 229.113C273.547 229.665 272.936 231.209 272.936 231.209C272.936 231.209 274.22 230.823 274.525 231.761C274.831 232.698 274.525 233.139 274.525 233.139C274.525 233.139 276.175 232.422 277.092 234.132C278.009 235.897 277.703 236.889 277.703 236.889C277.703 236.889 279.231 235.897 279.72 237.441C280.209 238.985 280.209 239.537 280.209 239.537C280.209 239.537 283.448 238.709 283.692 239.978C283.937 241.246 281.737 242.459 281.737 242.459C281.737 242.459 283.142 243.452 283.142 244.665C283.142 245.879 282.409 246.044 282.409 246.32C282.409 246.596 282.898 247.588 282.837 248.36C282.714 249.077 244.946 248.36 244.946 248.36L247.329 238.599Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M222.089 241.687C222.089 241.687 219.828 233.967 220.989 232.202C222.089 230.437 222.089 230.437 222.089 230.437C222.089 230.437 220.989 228.617 222.089 227.955C223.189 227.294 223.189 227.294 223.189 227.294C223.189 227.294 223.189 224.702 224.839 224.095C226.489 223.433 226.978 224.095 226.978 224.095C226.978 224.095 227.101 220.124 228.69 219.959C230.34 219.793 230.523 220.676 230.523 220.676C230.523 220.676 230.34 218.029 232.54 217.091C234.801 216.154 236.512 218.47 236.512 218.47C236.512 218.47 239.14 218.58 239.568 220.29C239.996 222.054 239.568 223.047 239.568 223.047C239.568 223.047 241.707 223.654 241.401 225.915C241.096 228.176 241.096 228.176 241.096 228.176C241.096 228.176 244.946 226.687 245.985 228.176C247.024 229.665 245.985 230.547 245.985 230.547C245.985 230.547 247.696 230.382 247.696 231.926C247.696 233.47 247.696 234.297 247.696 234.297C247.696 234.297 249.713 233.856 249.957 235.566C250.141 237.331 249.041 238.489 249.041 238.489C249.041 238.489 250.08 239.867 249.957 241.081C249.835 242.294 249.102 242.901 249.102 242.901C249.102 242.901 251.057 242.625 251.546 244.445C252.035 246.265 251.057 246.926 251.057 246.926L251.73 248.526H223.8L222.089 241.687Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M488.547 236.889C488.547 236.889 487.997 233.029 490.258 231.761C492.52 230.492 493.375 230.492 493.375 230.492C493.375 230.492 492.642 228.286 494.536 227.294C496.492 226.301 497.348 227.294 497.348 227.294C497.348 227.294 497.592 223.599 500.159 222.827C502.726 222.054 503.398 222.827 503.398 222.827C503.398 222.827 504.559 217.753 508.348 217.146C512.137 216.54 512.137 217.808 512.137 217.808C512.137 217.808 512.565 217.036 514.704 216.981C516.843 216.926 516.721 218.084 516.721 218.084C516.721 218.084 518.127 217.422 519.96 217.808C521.793 218.194 521.793 219.849 521.793 219.849C521.793 219.849 522.649 218.58 526.316 221.227C529.983 223.819 529.433 228.286 529.433 228.286C529.433 228.286 532.244 228.397 532.55 229.555C532.855 230.713 532.122 231.761 532.122 231.761C532.122 231.761 535.483 231.485 535.789 233.194C536.094 234.959 535.361 235.786 535.361 235.786C535.361 235.786 536.522 236.448 536.644 237.937C536.766 239.371 536.644 240.088 536.644 240.088C536.644 240.088 537.744 240.364 537.928 242.404C538.172 244.445 537.194 245.879 537.194 245.879C537.194 245.879 537.194 248.085 534.75 248.471C532.305 248.912 484.758 248.471 484.758 248.471C484.758 248.471 483.352 246.485 484.208 245.382C485.064 244.334 485.614 244.334 485.614 244.334C485.614 244.334 485.369 242.956 485.369 242.68C485.369 242.404 486.958 241.798 486.958 241.798C486.958 241.798 485.858 241.026 486.408 240.364C486.958 239.702 487.692 239.371 487.692 239.371C487.692 239.371 485.797 237.441 488.547 236.889Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M533.038 238.599C533.038 238.599 533.161 232.919 536.827 232.367C540.494 231.816 540.8 232.367 540.8 232.367C540.8 232.367 541.105 230.327 542.817 229.996C544.528 229.61 544.956 229.996 544.956 229.996C544.956 229.996 545.995 226.852 549.234 226.08C552.473 225.308 554.123 229.389 554.123 229.389C554.123 229.389 556.078 228.562 557.667 229.113C559.318 229.665 558.645 231.209 558.645 231.209C558.645 231.209 559.929 230.823 560.234 231.761C560.54 232.698 560.234 233.139 560.234 233.139C560.234 233.139 561.884 232.422 562.801 234.132C563.718 235.897 563.412 236.889 563.412 236.889C563.412 236.889 564.94 235.897 565.429 237.441C565.918 238.985 565.918 239.537 565.918 239.537C565.918 239.537 569.157 238.709 569.401 239.978C569.585 241.246 567.446 242.459 567.446 242.459C567.446 242.459 568.851 243.452 568.851 244.665C568.851 245.879 568.118 246.044 568.118 246.32C568.118 246.596 568.607 247.588 568.546 248.36C568.424 249.077 530.655 248.36 530.655 248.36L533.038 238.599Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M588.713 238.599C588.713 238.599 588.836 232.919 592.503 232.367C596.169 231.816 596.475 232.367 596.475 232.367C596.475 232.367 596.781 230.327 598.492 229.996C600.203 229.61 600.631 229.996 600.631 229.996C600.631 229.996 601.67 226.852 604.909 226.08C608.148 225.308 609.798 229.389 609.798 229.389C609.798 229.389 611.754 228.562 613.343 229.113C614.993 229.665 614.32 231.209 614.32 231.209C614.32 231.209 615.604 230.823 615.909 231.761C616.215 232.698 615.909 233.139 615.909 233.139C615.909 233.139 617.559 232.422 618.476 234.132C619.393 235.897 619.087 236.889 619.087 236.889C619.087 236.889 620.615 235.897 621.104 237.441C621.593 238.985 621.593 239.537 621.593 239.537C621.593 239.537 624.832 238.709 625.077 239.978C625.26 241.246 623.121 242.459 623.121 242.459C623.121 242.459 624.527 243.452 624.527 244.665C624.527 245.879 623.793 246.044 623.793 246.32C623.793 246.596 624.282 247.588 624.221 248.36C624.099 249.077 586.33 248.36 586.33 248.36L588.713 238.599Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M490.808 240.805C490.808 240.805 490.747 236.338 487.875 235.897C485.003 235.456 484.758 235.897 484.758 235.897C484.758 235.897 484.514 234.297 483.169 234.022C481.825 233.746 481.519 234.022 481.519 234.022C481.519 234.022 480.725 231.54 478.158 230.933C475.591 230.327 474.308 233.525 474.308 233.525C474.308 233.525 472.78 232.864 471.496 233.305C470.213 233.746 470.702 234.959 470.702 234.959C470.702 234.959 469.724 234.684 469.48 235.4C469.235 236.117 469.48 236.503 469.48 236.503C469.48 236.503 468.196 235.952 467.463 237.276C466.729 238.654 466.974 239.426 466.974 239.426C466.974 239.426 465.752 238.654 465.385 239.868C464.957 241.081 464.957 241.522 464.957 241.522C464.957 241.522 462.39 240.86 462.268 241.908C462.085 242.901 463.796 243.838 463.796 243.838C463.796 243.838 462.696 244.61 462.696 245.548C462.696 246.485 463.246 246.651 463.246 246.816C463.246 246.982 462.818 247.809 462.94 248.416C463.001 248.967 492.581 248.416 492.581 248.416L490.808 240.805Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((path
-                    ~d:(("M563.473 241.687C563.473 241.687 561.212 233.967 562.373 232.202C563.473 230.437 563.473 230.437 563.473 230.437C563.473 230.437 562.373 228.617 563.473 227.955C564.573 227.294 564.573 227.294 564.573 227.294C564.573 227.294 564.573 224.702 566.223 224.095C567.874 223.433 568.362 224.095 568.362 224.095C568.362 224.095 568.485 220.124 570.074 219.959C571.724 219.793 571.907 220.676 571.907 220.676C571.907 220.676 571.724 218.029 573.924 217.091C576.185 216.154 577.896 218.47 577.896 218.47C577.896 218.47 580.524 218.58 580.952 220.29C581.38 222.054 580.952 223.047 580.952 223.047C580.952 223.047 583.091 223.654 582.785 225.915C582.48 228.176 582.48 228.176 582.48 228.176C582.48 228.176 586.33 226.687 587.369 228.176C588.408 229.665 587.369 230.547 587.369 230.547C587.369 230.547 589.08 230.382 589.08 231.926C589.08 233.47 589.08 234.297 589.08 234.297C589.08 234.297 591.097 233.856 591.341 235.566C591.525 237.331 590.425 238.489 590.425 238.489C590.425 238.489 591.464 239.867 591.341 241.081C591.219 242.294 590.486 242.901 590.486 242.901C590.486 242.901 592.442 242.625 592.93 244.445C593.419 246.265 592.442 246.926 592.442 246.926L593.114 248.526H565.184L563.473 241.687Z")
-                    ) ~fill:(("#0D1522"))
-                    ~children:[] ())
-                [@JSX ]);
-                ((defs
-                    ~children:[((linearGradient ~id:(("paint0_linear")
-                                   ) ~x1:(("374.5")
-                                   ) ~y1:(("180.64")
-                                   ) ~x2:(("362.765")
-                                   ) ~y2:(("435.722")
-                                   )
-                                   ~gradientUnits:(("userSpaceOnUse")
-                                   )
-                                   ~children:[((stop ~offset:(("0.0658436")
-                                                  )
-                                                  ~stopColor:(("#3A7DDD")
-                                                  )
-                                                  ~children:[] ())
-                                             [@JSX ]);
-                                             ((stop ~offset:(("0.4001")
-                                                 )
-                                                 ~stopColor:(("#265291")
-                                                 )
-                                                 ~children:[] ())
-                                             [@JSX ]);
-                                             ((stop ~offset:(("0.571")
-                                                 )
-                                                 ~stopColor:(("#1D3E6E")
-                                                 )
-                                                 ~children:[] ())
-                                             [@JSX ]);
-                                             ((stop ~offset:(("0.7224")
-                                                 )
-                                                 ~stopColor:(("#173156")
-                                                 )
-                                                 ~children:[] ())
-                                             [@JSX ]);
-                                             ((stop ~offset:(("0.8486")
-                                                 )
-                                                 ~stopColor:(("#10213A")
-                                                 )
-                                                 ~children:[] ())
-                                             [@JSX ]);
-                                             ((stop ~offset:(("0.9342")
-                                                 )
-                                                 ~stopColor:(("#091321")
-                                                 )
-                                                 ~children:[] ())
-                                             [@JSX ])] ())
-                              [@JSX ])] ())
-                [@JSX ])] ())
-  [@JSX ])[@@react.component ]
\ No newline at end of file
diff --git a/jscomp/syntax/benchmarks/data/HeroGraphic.res b/jscomp/syntax/benchmarks/data/HeroGraphic.res
deleted file mode 100644
index 53decfa..0000000
--- a/jscomp/syntax/benchmarks/data/HeroGraphic.res
+++ /dev/null
@@ -1,2009 +0,0 @@
-%bs.raw(`require('./HeroGraphic.css')`)
-
-@react.component
-let make = (~width="760", ~height="380") =>
-  <svg width height viewBox="0 0 758 381" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path
-      d="M78.8374 255.364H664.923C664.923 255.364 677.451 256.743 677.451 270.971C677.451 285.2 667.673 288.178 667.673 288.178H579.485C579.485 288.178 592.014 290.163 592.014 304.888C592.014 319.612 582.785 321.101 582.785 321.101H524.544C524.544 321.101 507.676 322.59 508.776 333.896C509.876 345.201 520.204 346.194 520.204 346.194H626.849C626.849 346.194 644.266 347.683 643.166 363.897C642.066 380.11 632.288 380.11 632.288 380.11H186.032C186.032 380.11 166.964 379.118 167.514 364.393C168.064 349.668 186.582 350.661 186.582 350.661H121.801C121.801 350.661 104.628 351.598 104.628 338.252C104.628 320.715 121.862 322.149 121.862 322.149H142.457C142.457 322.149 159.264 323.362 159.264 306.101C159.264 293.748 144.657 292.7 144.657 292.7H77.6151C77.6151 292.7 56.4084 290.439 56.4695 275.769C56.5918 260.879 66.3089 255.364 78.8374 255.364Z"
-      fill="#0B1627"
-    />
-    <path
-      opacity="0.57"
-      d="M393.453 244.555C393.453 244.555 398.709 220.841 391.437 205.344C384.103 189.848 369.68 187.145 369.68 187.145C366.991 161.722 351.59 142.916 317.794 145.288C283.998 147.714 270.614 166.134 270.614 166.134C270.614 166.134 274.342 158.358 267.925 150.251C261.508 142.144 247.757 143.799 247.757 143.799C247.757 143.799 253.502 135.14 241.646 128.578C229.79 122.015 220.378 126.868 220.378 126.868C220.378 126.868 226.55 103.595 203.572 99.1834C180.593 94.7163 163.542 110.379 163.542 110.379C163.542 110.379 153.641 104.753 138.852 109.441C124.001 114.184 122.717 134.203 122.717 134.203C122.717 134.203 90.5713 118.541 55.675 137.457C31.5349 150.527 27.2569 178.377 26.9514 194.425C32.9406 207.495 40.152 215.547 40.152 215.547C31.5349 242.349 51.886 248.14 51.886 248.14H90.0824H358.496L393.453 244.555Z"
-      fill="#0D1522"
-    />
-    <path
-      className="HeroGraphic-cloudLeft"
-      opacity="0.7"
-      d="M0.4885 96.7017H97.599C97.599 96.7017 99.0047 89.1463 88.6152 87.8779C88.6152 87.8779 87.393 74.4216 72.6644 69.6237C57.9359 64.8258 51.2133 72.2157 51.2133 72.2157C51.2133 72.2157 46.6909 67.3075 40.8239 68.0244C34.8958 68.7413 32.4513 75.5246 32.4513 75.5246C32.4513 75.5246 28.9677 73.3187 25.3009 75.1386C21.634 76.9585 21.8174 79.385 21.8174 79.385C21.8174 79.385 17.6005 78.4475 14.6059 78.282C11.6113 78.0615 -2.75056 78.999 0.4885 96.7017Z"
-      fill="white"
-    />
-    <path d="M326.044 228.066H250.141V241.246H326.044V228.066Z" fill="#2484C6" />
-    <path opacity="0.6" d="M331.606 228.066H291.759V240.198H331.606V228.066Z" fill="#2484C6" />
-    <path d="M432.811 224.15H375.303V240.915H432.811V224.15Z" fill="#2484C6" />
-    <path d="M382.514 226.466H378.419V227.128H382.514V226.466Z" fill="#E37056" />
-    <path d="M389.053 226.466H384.959V227.128H389.053V226.466Z" fill="#E37056" />
-    <path d="M395.531 226.466H391.437V227.128H395.531V226.466Z" fill="#E37056" />
-    <path d="M402.009 226.466H397.915V227.128H402.009V226.466Z" fill="#E37056" />
-    <path d="M408.488 226.466H404.393V227.128H408.488V226.466Z" fill="#E37056" />
-    <path d="M414.966 226.466H410.871V227.128H414.966V226.466Z" fill="#E37056" />
-    <path d="M421.444 226.466H417.349V227.128H421.444V226.466Z" fill="#E37056" />
-    <path d="M427.983 226.466H423.888V227.128H427.983V226.466Z" fill="#E37056" />
-    <path d="M382.514 228.727H378.419V229.389H382.514V228.727Z" fill="#E37056" />
-    <path d="M389.053 228.727H384.959V229.389H389.053V228.727Z" fill="#E37056" />
-    <path d="M395.531 228.727H391.437V229.389H395.531V228.727Z" fill="#E37056" />
-    <path d="M402.009 228.727H397.915V229.389H402.009V228.727Z" fill="#E37056" />
-    <path d="M408.488 228.727H404.393V229.389H408.488V228.727Z" fill="#E37056" />
-    <path d="M414.966 228.727H410.871V229.389H414.966V228.727Z" fill="#E37056" />
-    <path d="M421.444 228.727H417.349V229.389H421.444V228.727Z" fill="#E37056" />
-    <path d="M427.983 228.727H423.888V229.389H427.983V228.727Z" fill="#E37056" />
-    <path d="M382.514 230.988H378.419V231.65H382.514V230.988Z" fill="#E37056" />
-    <path d="M389.053 230.988H384.959V231.65H389.053V230.988Z" fill="#E37056" />
-    <path d="M395.531 230.988H391.437V231.65H395.531V230.988Z" fill="#E37056" />
-    <path d="M402.009 230.988H397.915V231.65H402.009V230.988Z" fill="#E37056" />
-    <path d="M408.488 230.988H404.393V231.65H408.488V230.988Z" fill="#E37056" />
-    <path d="M414.966 230.988H410.871V231.65H414.966V230.988Z" fill="#E37056" />
-    <path d="M421.444 230.988H417.349V231.65H421.444V230.988Z" fill="#E37056" />
-    <path d="M427.983 230.988H423.888V231.65H427.983V230.988Z" fill="#E37056" />
-    <path d="M382.514 233.25H378.419V233.911H382.514V233.25Z" fill="#E37056" />
-    <path d="M389.053 233.25H384.959V233.911H389.053V233.25Z" fill="#E37056" />
-    <path d="M395.531 233.25H391.437V233.911H395.531V233.25Z" fill="#E37056" />
-    <path d="M402.009 233.25H397.915V233.911H402.009V233.25Z" fill="#E37056" />
-    <path d="M408.488 233.25H404.393V233.911H408.488V233.25Z" fill="#E37056" />
-    <path d="M414.966 233.25H410.871V233.911H414.966V233.25Z" fill="#E37056" />
-    <path d="M421.444 233.25H417.349V233.911H421.444V233.25Z" fill="#E37056" />
-    <path d="M427.983 233.25H423.888V233.911H427.983V233.25Z" fill="#E37056" />
-    <path d="M382.514 235.511H378.419V236.172H382.514V235.511Z" fill="#E37056" />
-    <path d="M389.053 235.511H384.959V236.172H389.053V235.511Z" fill="#E37056" />
-    <path d="M395.531 235.511H391.437V236.172H395.531V235.511Z" fill="#E37056" />
-    <path d="M402.009 235.511H397.915V236.172H402.009V235.511Z" fill="#E37056" />
-    <path d="M408.488 235.511H404.393V236.172H408.488V235.511Z" fill="#E37056" />
-    <path d="M414.966 235.511H410.871V236.172H414.966V235.511Z" fill="#E37056" />
-    <path d="M421.444 235.511H417.349V236.172H421.444V235.511Z" fill="#E37056" />
-    <path d="M427.983 235.511H423.888V236.172H427.983V235.511Z" fill="#E37056" />
-    <path d="M378.969 224.15H375.303V240.915H378.969V224.15Z" fill="#2484C6" />
-    <path d="M178.087 221.999H171.181V225.032H178.087V221.999Z" fill="#E37056" />
-    <path d="M186.826 221.999H179.92V225.032H186.826V221.999Z" fill="#E37056" />
-    <path d="M195.566 221.999H188.66V225.032H195.566V221.999Z" fill="#E37056" />
-    <path d="M178.087 226.411H171.181V229.444H178.087V226.411Z" fill="#E37056" />
-    <path d="M186.826 226.411H179.92V229.444H186.826V226.411Z" fill="#E37056" />
-    <path d="M195.566 226.411H188.66V229.444H195.566V226.411Z" fill="#E37056" />
-    <path d="M160.914 230.933H112.206V244.555H160.914V230.933Z" fill="#2484C6" />
-    <path d="M117.4 220.234H115.689V221.779H117.4V220.234Z" fill="#E37056" />
-    <path d="M122.412 220.234H120.701V221.779H122.412V220.234Z" fill="#E37056" />
-    <path d="M127.362 220.234H125.651V221.779H127.362V220.234Z" fill="#E37056" />
-    <path d="M132.312 220.234H130.601V221.779H132.312V220.234Z" fill="#E37056" />
-    <path d="M137.263 220.234H135.551V221.779H137.263V220.234Z" fill="#E37056" />
-    <path d="M142.274 220.234H140.563V221.779H142.274V220.234Z" fill="#E37056" />
-    <path d="M147.224 220.234H145.513V221.779H147.224V220.234Z" fill="#E37056" />
-    <path d="M152.174 220.234H150.463V221.779H152.174V220.234Z" fill="#E37056" />
-    <path d="M157.125 220.234H155.413V221.779H157.125V220.234Z" fill="#E37056" />
-    <path d="M117.4 223.819H115.689V225.363H117.4V223.819Z" fill="#E37056" />
-    <path d="M122.412 223.819H120.701V225.363H122.412V223.819Z" fill="#E37056" />
-    <path d="M127.362 223.819H125.651V225.363H127.362V223.819Z" fill="#E37056" />
-    <path d="M132.312 223.819H130.601V225.363H132.312V223.819Z" fill="#E37056" />
-    <path d="M137.263 223.819H135.551V225.363H137.263V223.819Z" fill="#E37056" />
-    <path d="M142.274 223.819H140.563V225.363H142.274V223.819Z" fill="#E37056" />
-    <path d="M147.224 223.819H145.513V225.363H147.224V223.819Z" fill="#E37056" />
-    <path d="M152.174 223.819H150.463V225.363H152.174V223.819Z" fill="#E37056" />
-    <path d="M157.125 223.819H155.413V225.363H157.125V223.819Z" fill="#E37056" />
-    <path d="M117.4 227.459H115.689V229.003H117.4V227.459Z" fill="#E37056" />
-    <path d="M122.412 227.459H120.701V229.003H122.412V227.459Z" fill="#E37056" />
-    <path d="M127.362 227.459H125.651V229.003H127.362V227.459Z" fill="#E37056" />
-    <path d="M132.312 227.459H130.601V229.003H132.312V227.459Z" fill="#E37056" />
-    <path d="M137.263 227.459H135.551V229.003H137.263V227.459Z" fill="#E37056" />
-    <path d="M142.274 227.459H140.563V229.003H142.274V227.459Z" fill="#E37056" />
-    <path d="M147.224 227.459H145.513V229.003H147.224V227.459Z" fill="#E37056" />
-    <path d="M152.174 227.459H150.463V229.003H152.174V227.459Z" fill="#E37056" />
-    <path d="M157.125 227.459H155.413V229.003H157.125V227.459Z" fill="#E37056" />
-    <path
-      className="HeroGraphic-wave"
-      d="M81.5264 248.14H667.612C667.612 248.14 680.14 249.518 680.14 263.747C680.14 277.975 670.362 280.953 670.362 280.953H582.174C582.174 280.953 594.703 282.939 594.703 297.663C594.703 312.388 585.474 313.877 585.474 313.877H527.233C527.233 313.877 510.365 315.366 511.465 326.671C512.565 337.977 522.893 338.969 522.893 338.969H629.538C629.538 338.969 646.955 340.458 645.855 356.672C644.755 372.886 634.977 372.886 634.977 372.886H188.721C188.721 372.886 169.653 371.893 170.203 357.168C170.753 342.444 189.271 343.436 189.271 343.436H124.49C124.49 343.436 107.317 344.374 107.317 331.028C107.317 313.491 124.551 314.925 124.551 314.925H145.146C145.146 314.925 161.953 316.138 161.953 298.876C161.953 286.523 147.346 285.475 147.346 285.475H80.3041C80.3041 285.475 59.0975 283.214 59.1586 268.545C59.2808 253.655 68.998 248.14 81.5264 248.14Z"
-      fill="url(#paint0_linear)"
-      fillOpacity="0.7"
-    />
-    <path
-      opacity="0.66"
-      d="M112.206 248.14V285.365H147.408C147.408 285.365 151.869 285.696 155.841 288.067H160.914V274.39L169.592 269.923V268.655H181.998H199.477V264.464H201.066V273.949L205.527 274.28V284.979V285.641H203.571V287.35H228.751H252.096V285.641H250.141V284.979V277.424L265.419 278.527H274.831V264.298H279.048V273.674H291.393V286.799H291.82V298.38V299.704H297.26V303.013H300.804V312.002H301.904V303.013H303.31V312.002H304.41V303.013H318.222V312.002H319.322V303.013H320.727V312.002H321.828V303.013H326.228V299.704H331.667V298.38V286.799H341.812V273.839H354.707V273.949H354.89V287.24H390.948V282.497H396.265V290.935H401.948V306.763L405.798 306.983L406.349 307.038L412.582 307.424H412.704L414.966 307.59L415.821 307.645L417.349 307.755L418.205 307.81L419.733 307.921L420.588 307.976L425.233 308.252V304.998H432.933V278.747H439.472L445.034 282.938V293.692H475.285V276.155H508.47V287.295H544.528V282.552H550.639V294.575V295.126H559.806V295.568V297.222H564.757V304.722H566.529V297.167H569.707V295.512V295.071H571.418V308.362H592.319C593.725 305.935 594.703 302.516 594.703 297.608C594.703 282.883 582.174 280.898 582.174 280.898H635.894V248.085H112.206V248.14Z"
-      fill="#0D1522"
-    />
-    <path
-      opacity="0.5"
-      d="M125.712 326.34V326.782H126.14V326.34H129.073L130.54 339.19V339.025L131.885 326.34H134.879L136.346 339.19L137.69 326.34H140.379V326.782H140.929V326.34H141.235V326.23H140.929V321.984H144.169V314.87H124.673C124.673 314.87 123.817 314.814 122.412 314.87V321.929H125.773V326.175V326.34H125.712ZM138.118 321.929H140.379V326.175H137.69L138.118 321.929ZM132.312 321.929H134.329L134.818 326.175H131.823L132.312 321.929ZM126.079 321.929H128.523L129.012 326.175H126.14V321.929H126.079Z"
-      fill="#0D1522"
-    />
-    <path
-      d="M552.717 270.806C552.717 272.57 551.128 274.06 549.111 274.06H480.358C478.402 274.06 476.752 272.626 476.752 270.806C476.752 269.041 478.341 267.552 480.358 267.552H549.173C551.128 267.552 552.717 269.041 552.717 270.806Z"
-      fill="#2484C6"
-    />
-    <path
-      d="M165.008 261.1C165.008 262.313 163.97 263.25 162.625 263.25H153.458C152.113 263.25 151.074 262.313 151.074 261.1C151.074 259.886 152.113 258.949 153.458 258.949H162.625C163.97 258.949 165.008 259.941 165.008 261.1Z"
-      fill="#2484C6"
-    />
-    <path
-      d="M226.673 263.25C226.673 264.464 225.634 265.401 224.289 265.401H192.449C191.104 265.401 190.065 264.464 190.065 263.25C190.065 262.037 191.104 261.1 192.449 261.1H224.289C225.573 261.1 226.673 262.092 226.673 263.25Z"
-      fill="#2484C6"
-    />
-    <path
-      d="M376.036 297.553C376.036 298.27 375.425 298.821 374.63 298.821H361.613C360.819 298.821 360.207 298.27 360.207 297.553C360.207 296.836 360.819 296.284 361.613 296.284H374.63C375.425 296.284 376.036 296.836 376.036 297.553Z"
-      fill="#2484C6"
-    />
-    <path
-      className="HeroGraphic-wave"
-      d="M391.681 296.836C391.681 295.733 392.659 294.85 393.881 294.85H479.747C480.969 294.85 481.947 295.733 481.947 296.836C481.947 297.939 480.969 298.821 479.747 298.821H393.881C392.659 298.766 391.681 297.884 391.681 296.836Z"
-      fill="#2484C6"
-    />
-    <path
-      d="M208.4 296.174C208.4 296.891 207.727 297.498 206.933 297.498H194.343C193.549 297.498 192.877 296.891 192.877 296.174C192.877 295.457 193.549 294.85 194.343 294.85H206.872C207.727 294.85 208.4 295.457 208.4 296.174Z"
-      fill="#2484C6"
-    />
-    <path
-      className="HeroGraphic-wave"
-      d="M309.788 324.631C309.788 326.009 308.566 327.168 306.977 327.168H236.634C235.106 327.168 233.823 326.065 233.823 324.631C233.823 323.252 235.045 322.094 236.634 322.094H307.038C308.505 322.094 309.788 323.252 309.788 324.631Z"
-      fill="#2484C6"
-    />
-    <path
-      d="M372.186 328.932C372.186 329.925 371.269 330.752 370.169 330.752H355.074C353.974 330.752 353.057 329.925 353.057 328.932C353.057 327.94 353.974 327.112 355.074 327.112H370.169C371.33 327.112 372.186 327.94 372.186 328.932Z"
-      fill="#2484C6"
-    />
-    <path
-      d="M537.255 360.863C537.255 360.477 537.622 360.146 538.05 360.146H551.984C552.412 360.146 552.778 360.477 552.778 360.863C552.778 361.249 552.412 361.58 551.984 361.58H538.05C537.561 361.58 537.255 361.249 537.255 360.863Z"
-      fill="#2484C6"
-    />
-    <path
-      d="M224.656 359.816C224.656 358.823 223.739 357.996 222.639 357.996H212.678C211.578 357.996 210.661 358.823 210.661 359.816C210.661 360.808 211.578 361.635 212.678 361.635H222.639C223.8 361.58 224.656 360.753 224.656 359.816Z"
-      fill="#2484C6"
-    />
-    <path
-      d="M151.136 332.517C151.136 331.524 150.219 330.697 149.119 330.697H141.968C140.868 330.697 139.952 331.524 139.952 332.517C139.952 333.51 140.868 334.337 141.968 334.337H149.119C150.219 334.337 151.136 333.51 151.136 332.517Z"
-      fill="#2484C6"
-    />
-    <path opacity="0.6" d="M250.202 228.066H205.649V241.246H250.202V228.066Z" fill="#2484C6" />
-    <path d="M630.149 117.052H611.326V120.802H630.149V117.052Z" fill="#2484C6" />
-    <path d="M630.149 119.588H611.326V120.857H630.149V119.588Z" fill="#2484C6" />
-    <path opacity="0.6" d="M199.538 230.933H160.914V240.529H199.538V230.933Z" fill="#2484C6" />
-    <path d="M339.795 222.606H337.473V224.702H339.795V222.606Z" fill="#E37056" />
-    <path d="M345.234 222.606H342.912V224.702H345.234V222.606Z" fill="#E37056" />
-    <path d="M350.673 222.606H348.351V224.702H350.673V222.606Z" fill="#E37056" />
-    <path d="M356.052 222.606H353.79V224.702H356.052V222.606Z" fill="#E37056" />
-    <path d="M361.552 222.606H359.229V224.702H361.552V222.606Z" fill="#E37056" />
-    <path d="M366.991 222.606H364.669V224.702H366.991V222.606Z" fill="#E37056" />
-    <path d="M372.43 222.606H370.108V224.702H372.43V222.606Z" fill="#E37056" />
-    <path d="M480.175 221.007H478.769V222.661H480.175V221.007Z" fill="#E37056" />
-    <path d="M483.536 221.007H482.13V222.661H483.536V221.007Z" fill="#E37056" />
-    <path d="M486.836 221.007H485.43V222.661H486.836V221.007Z" fill="#E37056" />
-    <path d="M490.197 221.007H488.792V222.661H490.197V221.007Z" fill="#E37056" />
-    <path d="M493.497 221.007H492.092V222.661H493.497V221.007Z" fill="#E37056" />
-    <path d="M496.859 221.007H495.453V222.661H496.859V221.007Z" fill="#E37056" />
-    <path d="M500.22 221.007H498.814V222.661H500.22V221.007Z" fill="#E37056" />
-    <path d="M503.337 221.007H501.931V222.661H503.337V221.007Z" fill="#E37056" />
-    <path d="M507.493 221.007H506.087V222.661H507.493V221.007Z" fill="#E37056" />
-    <path d="M480.175 224.26H478.769V225.915H480.175V224.26Z" fill="#E37056" />
-    <path d="M483.536 224.26H482.13V225.915H483.536V224.26Z" fill="#E37056" />
-    <path d="M486.836 224.26H485.43V225.915H486.836V224.26Z" fill="#E37056" />
-    <path d="M490.197 224.26H488.792V225.915H490.197V224.26Z" fill="#E37056" />
-    <path d="M493.497 224.26H492.092V225.915H493.497V224.26Z" fill="#E37056" />
-    <path d="M496.859 224.26H495.453V225.915H496.859V224.26Z" fill="#E37056" />
-    <path d="M500.22 224.26H498.814V225.915H500.22V224.26Z" fill="#E37056" />
-    <path d="M503.337 224.26H501.931V225.915H503.337V224.26Z" fill="#E37056" />
-    <path d="M507.493 224.26H506.087V225.915H507.493V224.26Z" fill="#E37056" />
-    <path d="M480.175 227.569H478.769V229.224H480.175V227.569Z" fill="#E37056" />
-    <path d="M483.536 227.569H482.13V229.224H483.536V227.569Z" fill="#E37056" />
-    <path d="M486.836 227.569H485.43V229.224H486.836V227.569Z" fill="#E37056" />
-    <path d="M490.197 227.569H488.792V229.224H490.197V227.569Z" fill="#E37056" />
-    <path d="M493.497 227.569H492.092V229.224H493.497V227.569Z" fill="#E37056" />
-    <path d="M496.859 227.569H495.453V229.224H496.859V227.569Z" fill="#E37056" />
-    <path d="M500.22 227.569H498.814V229.224H500.22V227.569Z" fill="#E37056" />
-    <path d="M503.337 227.569H501.931V229.224H503.337V227.569Z" fill="#E37056" />
-    <path d="M507.493 227.569H506.087V229.224H507.493V227.569Z" fill="#E37056" />
-    <path d="M480.175 230.878H478.769V232.533H480.175V230.878Z" fill="#E37056" />
-    <path d="M483.536 230.878H482.13V232.533H483.536V230.878Z" fill="#E37056" />
-    <path d="M486.836 230.878H485.43V232.533H486.836V230.878Z" fill="#E37056" />
-    <path d="M490.197 230.878H488.792V232.533H490.197V230.878Z" fill="#E37056" />
-    <path d="M493.497 230.878H492.092V232.533H493.497V230.878Z" fill="#E37056" />
-    <path d="M496.859 230.878H495.453V232.533H496.859V230.878Z" fill="#E37056" />
-    <path d="M500.22 230.878H498.814V232.533H500.22V230.878Z" fill="#E37056" />
-    <path d="M503.337 230.878H501.931V232.533H503.337V230.878Z" fill="#E37056" />
-    <path d="M507.493 230.878H506.087V232.533H507.493V230.878Z" fill="#E37056" />
-    <path d="M480.175 234.132H478.769V235.786H480.175V234.132Z" fill="#E37056" />
-    <path d="M483.536 234.132H482.13V235.786H483.536V234.132Z" fill="#E37056" />
-    <path d="M486.836 234.132H485.43V235.786H486.836V234.132Z" fill="#E37056" />
-    <path d="M490.197 234.132H488.792V235.786H490.197V234.132Z" fill="#E37056" />
-    <path d="M493.497 234.132H492.092V235.786H493.497V234.132Z" fill="#E37056" />
-    <path d="M496.859 234.132H495.453V235.786H496.859V234.132Z" fill="#E37056" />
-    <path d="M500.22 234.132H498.814V235.786H500.22V234.132Z" fill="#E37056" />
-    <path d="M503.337 234.132H501.931V235.786H503.337V234.132Z" fill="#E37056" />
-    <path d="M507.493 234.132H506.087V235.786H507.493V234.132Z" fill="#E37056" />
-    <path d="M339.795 228.01H337.473V230.106H339.795V228.01Z" fill="#E37056" />
-    <path d="M345.234 228.01H342.912V230.106H345.234V228.01Z" fill="#E37056" />
-    <path d="M350.673 228.01H348.351V230.106H350.673V228.01Z" fill="#E37056" />
-    <path d="M356.052 228.01H353.79V230.106H356.052V228.01Z" fill="#E37056" />
-    <path d="M361.552 228.01H359.229V230.106H361.552V228.01Z" fill="#E37056" />
-    <path d="M366.991 228.01H364.669V230.106H366.991V228.01Z" fill="#E37056" />
-    <path d="M372.43 228.01H370.108V230.106H372.43V228.01Z" fill="#E37056" />
-    <path d="M267.925 236.228H266.519V237.496H267.925V236.228Z" fill="#E37056" />
-    <path d="M271.286 236.228H269.88V237.496H271.286V236.228Z" fill="#E37056" />
-    <path d="M274.586 236.228H273.181V237.496H274.586V236.228Z" fill="#E37056" />
-    <path d="M277.886 236.228H276.481V237.496H277.886V236.228Z" fill="#E37056" />
-    <path d="M281.187 236.228H279.781V237.496H281.187V236.228Z" fill="#E37056" />
-    <path d="M284.487 236.228H283.081V237.496H284.487V236.228Z" fill="#E37056" />
-    <path d="M287.787 236.228H286.381V237.496H287.787V236.228Z" fill="#E37056" />
-    <path opacity="0.6" d="M375.303 228.066H334.173V240.253H375.303V228.066Z" fill="#2484C6" />
-    <path opacity="0.3" d="M432.811 228.066H375.303V240.253H432.811V228.066Z" fill="#2484C6" />
-    <path d="M444.362 220.4H434.767V223.819H444.362V220.4Z" fill="#E37056" />
-    <path d="M454.69 220.4H445.095V223.819H454.69V220.4Z" fill="#E37056" />
-    <path d="M464.957 220.4H455.362V223.819H464.957V220.4Z" fill="#E37056" />
-    <path d="M475.224 220.4H465.629V223.819H475.224V220.4Z" fill="#E37056" />
-    <path d="M444.362 224.536H434.767V227.955H444.362V224.536Z" fill="#E37056" />
-    <path d="M454.69 224.536H445.095V227.955H454.69V224.536Z" fill="#E37056" />
-    <path d="M464.957 224.536H455.362V227.955H464.957V224.536Z" fill="#E37056" />
-    <path d="M475.224 224.536H465.629V227.955H475.224V224.536Z" fill="#E37056" />
-    <path d="M444.362 228.672H434.767V232.091H444.362V228.672Z" fill="#E37056" />
-    <path d="M454.69 228.672H445.095V232.091H454.69V228.672Z" fill="#E37056" />
-    <path d="M464.957 228.672H455.362V232.091H464.957V228.672Z" fill="#E37056" />
-    <path d="M475.224 228.672H465.629V232.091H475.224V228.672Z" fill="#E37056" />
-    <path d="M444.362 231.54H434.767V234.959H444.362V231.54Z" fill="#E37056" />
-    <path d="M454.69 231.54H445.095V234.959H454.69V231.54Z" fill="#E37056" />
-    <path d="M464.957 231.54H455.362V234.959H464.957V231.54Z" fill="#E37056" />
-    <path d="M475.224 231.54H465.629V234.959H475.224V231.54Z" fill="#E37056" />
-    <path opacity="0.3" d="M476.141 228.01H432.628V241.081H476.141V228.01Z" fill="#2484C6" />
-    <path opacity="0.6" d="M509.998 230.713H476.08V240.474H509.998V230.713Z" fill="#2484C6" />
-    <path opacity="0.4" d="M548.867 230.713H514.949V240.474H548.867V230.713Z" fill="#2484C6" />
-    <path opacity="0.7" d="M603.809 230.713H578.569V240.474H603.809V230.713Z" fill="#2484C6" />
-    <path d="M128.401 75.3592L130.479 36.0934L132.374 75.3592H128.401Z" fill="#E37056" />
-    <path
-      d="M130.477 36.4794V36.0934L128.461 75.3592H128.95C129.744 75.1386 130.539 74.8628 130.539 74.8628V36.4794H130.477Z"
-      fill="#E37056"
-    />
-    <path d="M134.207 75.3592L136.285 36.0934L138.179 75.3592H134.207Z" fill="#E37056" />
-    <path
-      d="M136.283 36.4794V36.0934L134.266 75.3592H134.755C135.55 75.1386 136.344 74.8628 136.344 74.8628V36.4794H136.283Z"
-      fill="#E37056"
-    />
-    <path d="M126.14 62.8405H125.712V73.7599H126.14V62.8405Z" fill="#E37056" />
-    <path d="M140.868 62.8405H140.318V73.7599H140.868V62.8405Z" fill="#E37056" />
-    <path d="M141.174 63.778H125.712V64.0538H141.174V63.778Z" fill="#E37056" />
-    <path d="M144.107 73.3187H122.351V105.801H144.107V73.3187Z" fill="#2484C6" />
-    <path d="M125.284 75.3592H124.001V76.5173H125.284V75.3592Z" fill="#E37056" />
-    <path d="M128.157 75.3592H126.873V76.5173H128.157V75.3592Z" fill="#E37056" />
-    <path d="M130.968 75.3592H129.684V76.5173H130.968V75.3592Z" fill="#E37056" />
-    <path d="M133.84 75.3592H132.557V76.5173H133.84V75.3592Z" fill="#E37056" />
-    <path d="M136.713 75.3592H135.429V76.5173H136.713V75.3592Z" fill="#E37056" />
-    <path d="M139.585 75.3592H138.302V76.5173H139.585V75.3592Z" fill="#E37056" />
-    <path d="M142.457 75.3592H141.174V76.5173H142.457V75.3592Z" fill="#E37056" />
-    <path d="M125.284 77.2343H124.001V78.3924H125.284V77.2343Z" fill="#E37056" />
-    <path d="M128.157 77.2343H126.873V78.3924H128.157V77.2343Z" fill="#E37056" />
-    <path d="M130.968 77.2343H129.684V78.3924H130.968V77.2343Z" fill="#E37056" />
-    <path d="M133.84 77.2343H132.557V78.3924H133.84V77.2343Z" fill="#E37056" />
-    <path d="M136.713 77.2343H135.429V78.3924H136.713V77.2343Z" fill="#E37056" />
-    <path d="M139.585 77.2343H138.302V78.3924H139.585V77.2343Z" fill="#E37056" />
-    <path d="M142.457 77.2343H141.174V78.3924H142.457V77.2343Z" fill="#E37056" />
-    <path d="M124.612 79.2747H124.001V79.8262H124.612V79.2747Z" fill="#E37056" />
-    <path d="M127.118 79.2747H126.506V79.8262H127.118V79.2747Z" fill="#E37056" />
-    <path d="M129.684 79.2747H129.073V79.8262H129.684V79.2747Z" fill="#E37056" />
-    <path d="M132.251 79.2747H131.64V79.8262H132.251V79.2747Z" fill="#E37056" />
-    <path d="M134.757 79.2747H134.146V79.8262H134.757V79.2747Z" fill="#E37056" />
-    <path d="M137.324 79.2747H136.712V79.8262H137.324V79.2747Z" fill="#E37056" />
-    <path d="M139.891 79.2747H139.279V79.8262H139.891V79.2747Z" fill="#E37056" />
-    <path d="M142.396 79.2747H141.785V79.8262H142.396V79.2747Z" fill="#E37056" />
-    <path d="M124.612 81.7564H124.001V82.3079H124.612V81.7564Z" fill="#E37056" />
-    <path d="M127.118 81.7564H126.506V82.3079H127.118V81.7564Z" fill="#E37056" />
-    <path d="M129.684 81.7564H129.073V82.3079H129.684V81.7564Z" fill="#E37056" />
-    <path d="M132.251 81.7564H131.64V82.3079H132.251V81.7564Z" fill="#E37056" />
-    <path d="M134.757 81.7564H134.146V82.3079H134.757V81.7564Z" fill="#E37056" />
-    <path d="M137.324 81.7564H136.712V82.3079H137.324V81.7564Z" fill="#E37056" />
-    <path d="M139.891 81.7564H139.279V82.3079H139.891V81.7564Z" fill="#E37056" />
-    <path d="M142.396 81.7564H141.785V82.3079H142.396V81.7564Z" fill="#E37056" />
-    <path d="M124.612 84.2381H124.001V84.7896H124.612V84.2381Z" fill="#E37056" />
-    <path d="M127.118 84.2381H126.506V84.7896H127.118V84.2381Z" fill="#E37056" />
-    <path d="M129.684 84.2381H129.073V84.7896H129.684V84.2381Z" fill="#E37056" />
-    <path d="M132.251 84.2381H131.64V84.7896H132.251V84.2381Z" fill="#E37056" />
-    <path d="M134.757 84.2381H134.146V84.7896H134.757V84.2381Z" fill="#E37056" />
-    <path d="M137.324 84.2381H136.712V84.7896H137.324V84.2381Z" fill="#E37056" />
-    <path d="M139.891 84.2381H139.279V84.7896H139.891V84.2381Z" fill="#E37056" />
-    <path d="M142.396 84.2381H141.785V84.7896H142.396V84.2381Z" fill="#E37056" />
-    <path d="M124.612 86.6647H124.001V87.2162H124.612V86.6647Z" fill="#E37056" />
-    <path d="M127.118 86.6647H126.506V87.2162H127.118V86.6647Z" fill="#E37056" />
-    <path d="M129.684 86.6647H129.073V87.2162H129.684V86.6647Z" fill="#E37056" />
-    <path d="M132.251 86.6647H131.64V87.2162H132.251V86.6647Z" fill="#E37056" />
-    <path d="M134.757 86.6647H134.146V87.2162H134.757V86.6647Z" fill="#E37056" />
-    <path d="M137.324 86.6647H136.712V87.2162H137.324V86.6647Z" fill="#E37056" />
-    <path d="M139.891 86.6647H139.279V87.2162H139.891V86.6647Z" fill="#E37056" />
-    <path d="M142.396 86.6647H141.785V87.2162H142.396V86.6647Z" fill="#E37056" />
-    <path d="M124.612 89.1464H124.001V89.6978H124.612V89.1464Z" fill="#E37056" />
-    <path d="M127.118 89.1464H126.506V89.6978H127.118V89.1464Z" fill="#E37056" />
-    <path d="M129.684 89.1464H129.073V89.6978H129.684V89.1464Z" fill="#E37056" />
-    <path d="M132.251 89.1464H131.64V89.6978H132.251V89.1464Z" fill="#E37056" />
-    <path d="M134.757 89.1464H134.146V89.6978H134.757V89.1464Z" fill="#E37056" />
-    <path d="M137.324 89.1464H136.712V89.6978H137.324V89.1464Z" fill="#E37056" />
-    <path d="M139.891 89.1464H139.279V89.6978H139.891V89.1464Z" fill="#E37056" />
-    <path d="M142.396 89.1464H141.785V89.6978H142.396V89.1464Z" fill="#E37056" />
-    <path d="M124.612 91.628H124.001V92.1795H124.612V91.628Z" fill="#E37056" />
-    <path d="M127.118 91.628H126.506V92.1795H127.118V91.628Z" fill="#E37056" />
-    <path d="M129.684 91.628H129.073V92.1795H129.684V91.628Z" fill="#E37056" />
-    <path d="M132.251 91.628H131.64V92.1795H132.251V91.628Z" fill="#E37056" />
-    <path d="M134.757 91.628H134.146V92.1795H134.757V91.628Z" fill="#E37056" />
-    <path d="M137.324 91.628H136.712V92.1795H137.324V91.628Z" fill="#E37056" />
-    <path d="M139.891 91.628H139.279V92.1795H139.891V91.628Z" fill="#E37056" />
-    <path d="M142.396 91.628H141.785V92.1795H142.396V91.628Z" fill="#E37056" />
-    <path d="M124.612 94.1097H124.001V94.6612H124.612V94.1097Z" fill="#E37056" />
-    <path d="M127.118 94.1097H126.506V94.6612H127.118V94.1097Z" fill="#E37056" />
-    <path d="M129.684 94.1097H129.073V94.6612H129.684V94.1097Z" fill="#E37056" />
-    <path d="M132.251 94.1097H131.64V94.6612H132.251V94.1097Z" fill="#E37056" />
-    <path d="M134.757 94.1097H134.146V94.6612H134.757V94.1097Z" fill="#E37056" />
-    <path d="M137.324 94.1097H136.712V94.6612H137.324V94.1097Z" fill="#E37056" />
-    <path d="M139.891 94.1097H139.279V94.6612H139.891V94.1097Z" fill="#E37056" />
-    <path d="M142.396 94.1097H141.785V94.6612H142.396V94.1097Z" fill="#E37056" />
-    <path d="M124.612 96.5914H124.001V97.1429H124.612V96.5914Z" fill="#E37056" />
-    <path d="M127.118 96.5914H126.506V97.1429H127.118V96.5914Z" fill="#E37056" />
-    <path d="M129.684 96.5914H129.073V97.1429H129.684V96.5914Z" fill="#E37056" />
-    <path d="M132.251 96.5914H131.64V97.1429H132.251V96.5914Z" fill="#E37056" />
-    <path d="M134.757 96.5914H134.146V97.1429H134.757V96.5914Z" fill="#E37056" />
-    <path d="M137.324 96.5914H136.712V97.1429H137.324V96.5914Z" fill="#E37056" />
-    <path d="M139.891 96.5914H139.279V97.1429H139.891V96.5914Z" fill="#E37056" />
-    <path d="M142.396 96.5914H141.785V97.1429H142.396V96.5914Z" fill="#E37056" />
-    <path d="M124.612 99.0731H124.001V99.6246H124.612V99.0731Z" fill="#E37056" />
-    <path d="M127.118 99.0731H126.506V99.6246H127.118V99.0731Z" fill="#E37056" />
-    <path d="M129.684 99.0731H129.073V99.6246H129.684V99.0731Z" fill="#E37056" />
-    <path d="M132.251 99.0731H131.64V99.6246H132.251V99.0731Z" fill="#E37056" />
-    <path d="M134.757 99.0731H134.146V99.6246H134.757V99.0731Z" fill="#E37056" />
-    <path d="M137.324 99.0731H136.712V99.6246H137.324V99.0731Z" fill="#E37056" />
-    <path d="M139.891 99.0731H139.279V99.6246H139.891V99.0731Z" fill="#E37056" />
-    <path d="M142.396 99.0731H141.785V99.6246H142.396V99.0731Z" fill="#E37056" />
-    <path d="M124.612 101.279H124.001V101.831H124.612V101.279Z" fill="#E37056" />
-    <path d="M127.118 101.279H126.506V101.831H127.118V101.279Z" fill="#E37056" />
-    <path d="M129.684 101.279H129.073V101.831H129.684V101.279Z" fill="#E37056" />
-    <path d="M132.251 101.279H131.64V101.831H132.251V101.279Z" fill="#E37056" />
-    <path d="M134.757 101.279H134.146V101.831H134.757V101.279Z" fill="#E37056" />
-    <path d="M137.324 101.279H136.712V101.831H137.324V101.279Z" fill="#E37056" />
-    <path d="M139.891 101.279H139.279V101.831H139.891V101.279Z" fill="#E37056" />
-    <path d="M142.396 101.279H141.785V101.831H142.396V101.279Z" fill="#E37056" />
-    <path d="M144.107 99.1833H122.351V105.746H144.107V99.1833Z" fill="#2484C6" />
-    <path d="M301.904 94.7715H300.804V115.618H301.904V94.7715Z" fill="#E37056" />
-    <path d="M304.349 94.7715H303.249V115.618H304.349V94.7715Z" fill="#E37056" />
-    <path d="M319.261 94.7715H318.161V115.618H319.261V94.7715Z" fill="#E37056" />
-    <path d="M321.766 94.7715H320.666V115.618H321.766V94.7715Z" fill="#E37056" />
-    <path d="M326.167 114.184H297.26V121.353H326.167V114.184Z" fill="#2484C6" />
-    <path d="M323.722 119.588H299.521V120.305H323.722V119.588Z" fill="#E37056" />
-    <path
-      d="M139.707 197.348H201.066V176.833L265.419 167.016H274.831V197.789H278.987V177.494H291.332V149.148H341.751V177.053H354.829V148.1H390.887V158.358H400.787L408.671 169.718V178.818H417.777V166.575H458.54V240.143H133.535L139.707 197.348Z"
-      fill="#21477C"
-    />
-    <path
-      d="M293.287 197.348H354.646V176.833L418.999 167.016H428.411V197.789H432.567V177.494L444.912 157.586V134.203H475.163V172.035H508.409V148.1H544.467V158.358H554.306L562.251 169.718V178.818H571.357V102.492H612.976V240.143H287.115L293.287 197.348Z"
-      fill="#1B3B68"
-    />
-    <path d="M425.172 241.522H401.887V106.077L425.172 102.878V241.522Z" fill="#2484C6" />
-    <path d="M401.887 140.269H396.204V241.522H401.887V140.269Z" fill="#1073AA" />
-    <path d="M432.872 109.937H425.172V241.522H432.872V109.937Z" fill="#1073AA" />
-    <path d="M406.226 105.47L405.371 105.581V121.298H406.226V105.47Z" fill="#E37056" />
-    <path d="M410.993 104.809L410.138 104.919V121.298H410.993V104.809Z" fill="#E37056" />
-    <path d="M408.61 105.139L407.754 105.25V121.298H408.61V105.139Z" fill="#E37056" />
-    <path d="M413.377 104.478L412.46 104.588V121.298H413.377V104.478Z" fill="#E37056" />
-    <path d="M415.76 104.147L414.844 104.257V121.298H415.76V104.147Z" fill="#E37056" />
-    <path d="M419.61 103.595V121.298H420.527V103.485L419.61 103.595Z" fill="#E37056" />
-    <path d="M418.144 103.816L417.227 103.926V121.298H418.144V103.816Z" fill="#E37056" />
-    <path d="M406.043 128.081H403.415V129.129H406.043V128.081Z" fill="#E37056" />
-    <path d="M409.588 128.081H406.96V129.129H409.588V128.081Z" fill="#E37056" />
-    <path d="M413.132 128.081H410.504V129.129H413.132V128.081Z" fill="#E37056" />
-    <path d="M416.677 128.081H414.049V129.129H416.677V128.081Z" fill="#E37056" />
-    <path d="M420.222 128.081H417.594V129.129H420.222V128.081Z" fill="#E37056" />
-    <path d="M423.766 128.081H421.138V129.129H423.766V128.081Z" fill="#E37056" />
-    <path d="M406.043 130.453H403.415V131.501H406.043V130.453Z" fill="#E37056" />
-    <path d="M409.588 130.453H406.96V131.501H409.588V130.453Z" fill="#E37056" />
-    <path d="M413.132 130.453H410.504V131.501H413.132V130.453Z" fill="#E37056" />
-    <path d="M416.677 130.453H414.049V131.501H416.677V130.453Z" fill="#E37056" />
-    <path d="M420.222 130.453H417.594V131.501H420.222V130.453Z" fill="#E37056" />
-    <path d="M423.766 130.453H421.138V131.501H423.766V130.453Z" fill="#E37056" />
-    <path d="M406.043 132.824H403.415V133.872H406.043V132.824Z" fill="#E37056" />
-    <path d="M409.588 132.824H406.96V133.872H409.588V132.824Z" fill="#E37056" />
-    <path d="M413.132 132.824H410.504V133.872H413.132V132.824Z" fill="#E37056" />
-    <path d="M416.677 132.824H414.049V133.872H416.677V132.824Z" fill="#E37056" />
-    <path d="M420.222 132.824H417.594V133.872H420.222V132.824Z" fill="#E37056" />
-    <path d="M423.766 132.824H421.138V133.872H423.766V132.824Z" fill="#E37056" />
-    <path d="M406.043 135.14H403.415V136.188H406.043V135.14Z" fill="#E37056" />
-    <path d="M409.588 135.14H406.96V136.188H409.588V135.14Z" fill="#E37056" />
-    <path d="M413.132 135.14H410.504V136.188H413.132V135.14Z" fill="#E37056" />
-    <path d="M416.677 135.14H414.049V136.188H416.677V135.14Z" fill="#E37056" />
-    <path d="M420.222 135.14H417.594V136.188H420.222V135.14Z" fill="#E37056" />
-    <path d="M423.766 135.14H421.138V136.188H423.766V135.14Z" fill="#E37056" />
-    <path d="M406.043 137.512H403.415V138.56H406.043V137.512Z" fill="#E37056" />
-    <path d="M409.588 137.512H406.96V138.56H409.588V137.512Z" fill="#E37056" />
-    <path d="M413.132 137.512H410.504V138.56H413.132V137.512Z" fill="#E37056" />
-    <path d="M416.677 137.512H414.049V138.56H416.677V137.512Z" fill="#E37056" />
-    <path d="M420.222 137.512H417.594V138.56H420.222V137.512Z" fill="#E37056" />
-    <path d="M423.766 137.512H421.138V138.56H423.766V137.512Z" fill="#E37056" />
-    <path d="M406.043 139.828H403.415V140.876H406.043V139.828Z" fill="#E37056" />
-    <path d="M409.588 139.828H406.96V140.876H409.588V139.828Z" fill="#E37056" />
-    <path d="M413.132 139.828H410.504V140.876H413.132V139.828Z" fill="#E37056" />
-    <path d="M416.677 139.828H414.049V140.876H416.677V139.828Z" fill="#E37056" />
-    <path d="M420.222 139.828H417.594V140.876H420.222V139.828Z" fill="#E37056" />
-    <path d="M423.766 139.828H421.138V140.876H423.766V139.828Z" fill="#E37056" />
-    <path d="M406.043 142.199H403.415V143.247H406.043V142.199Z" fill="#E37056" />
-    <path d="M409.588 142.199H406.96V143.247H409.588V142.199Z" fill="#E37056" />
-    <path d="M413.132 142.199H410.504V143.247H413.132V142.199Z" fill="#E37056" />
-    <path d="M416.677 142.199H414.049V143.247H416.677V142.199Z" fill="#E37056" />
-    <path d="M420.222 142.199H417.594V143.247H420.222V142.199Z" fill="#E37056" />
-    <path d="M423.766 142.199H421.138V143.247H423.766V142.199Z" fill="#E37056" />
-    <path d="M406.043 144.571H403.415V145.619H406.043V144.571Z" fill="#E37056" />
-    <path d="M409.588 144.571H406.96V145.619H409.588V144.571Z" fill="#E37056" />
-    <path d="M413.132 144.571H410.504V145.619H413.132V144.571Z" fill="#E37056" />
-    <path d="M416.677 144.571H414.049V145.619H416.677V144.571Z" fill="#E37056" />
-    <path d="M420.222 144.571H417.594V145.619H420.222V144.571Z" fill="#E37056" />
-    <path d="M423.766 144.571H421.138V145.619H423.766V144.571Z" fill="#E37056" />
-    <path d="M406.043 146.887H403.415V147.935H406.043V146.887Z" fill="#E37056" />
-    <path d="M409.588 146.887H406.96V147.935H409.588V146.887Z" fill="#E37056" />
-    <path d="M413.132 146.887H410.504V147.935H413.132V146.887Z" fill="#E37056" />
-    <path d="M416.677 146.887H414.049V147.935H416.677V146.887Z" fill="#E37056" />
-    <path d="M420.222 146.887H417.594V147.935H420.222V146.887Z" fill="#E37056" />
-    <path d="M423.766 146.887H421.138V147.935H423.766V146.887Z" fill="#E37056" />
-    <path d="M406.043 149.258H403.415V150.306H406.043V149.258Z" fill="#E37056" />
-    <path d="M409.588 149.258H406.96V150.306H409.588V149.258Z" fill="#E37056" />
-    <path d="M413.132 149.258H410.504V150.306H413.132V149.258Z" fill="#E37056" />
-    <path d="M416.677 149.258H414.049V150.306H416.677V149.258Z" fill="#E37056" />
-    <path d="M420.222 149.258H417.594V150.306H420.222V149.258Z" fill="#E37056" />
-    <path d="M423.766 149.258H421.138V150.306H423.766V149.258Z" fill="#E37056" />
-    <path d="M406.043 151.575H403.415V152.622H406.043V151.575Z" fill="#E37056" />
-    <path d="M409.588 151.575H406.96V152.622H409.588V151.575Z" fill="#E37056" />
-    <path d="M413.132 151.575H410.504V152.622H413.132V151.575Z" fill="#E37056" />
-    <path d="M416.677 151.575H414.049V152.622H416.677V151.575Z" fill="#E37056" />
-    <path d="M420.222 151.575H417.594V152.622H420.222V151.575Z" fill="#E37056" />
-    <path d="M423.766 151.575H421.138V152.622H423.766V151.575Z" fill="#E37056" />
-    <path d="M406.043 153.946H403.415V154.994H406.043V153.946Z" fill="#E37056" />
-    <path d="M409.588 153.946H406.96V154.994H409.588V153.946Z" fill="#E37056" />
-    <path d="M413.132 153.946H410.504V154.994H413.132V153.946Z" fill="#E37056" />
-    <path d="M416.677 153.946H414.049V154.994H416.677V153.946Z" fill="#E37056" />
-    <path d="M420.222 153.946H417.594V154.994H420.222V153.946Z" fill="#E37056" />
-    <path d="M423.766 153.946H421.138V154.994H423.766V153.946Z" fill="#E37056" />
-    <path d="M406.043 163.321H403.415V164.369H406.043V163.321Z" fill="#E37056" />
-    <path d="M409.588 163.321H406.96V164.369H409.588V163.321Z" fill="#E37056" />
-    <path d="M413.132 163.321H410.504V164.369H413.132V163.321Z" fill="#E37056" />
-    <path d="M416.677 163.321H414.049V164.369H416.677V163.321Z" fill="#E37056" />
-    <path d="M420.222 163.321H417.594V164.369H420.222V163.321Z" fill="#E37056" />
-    <path d="M423.766 163.321H421.138V164.369H423.766V163.321Z" fill="#E37056" />
-    <path d="M406.043 165.693H403.415V166.74H406.043V165.693Z" fill="#E37056" />
-    <path d="M409.588 165.693H406.96V166.74H409.588V165.693Z" fill="#E37056" />
-    <path d="M413.132 165.693H410.504V166.74H413.132V165.693Z" fill="#E37056" />
-    <path d="M416.677 165.693H414.049V166.74H416.677V165.693Z" fill="#E37056" />
-    <path d="M420.222 165.693H417.594V166.74H420.222V165.693Z" fill="#E37056" />
-    <path d="M423.766 165.693H421.138V166.74H423.766V165.693Z" fill="#E37056" />
-    <path d="M406.043 168.064H403.415V169.112H406.043V168.064Z" fill="#E37056" />
-    <path d="M409.588 168.064H406.96V169.112H409.588V168.064Z" fill="#E37056" />
-    <path d="M413.132 168.064H410.504V169.112H413.132V168.064Z" fill="#E37056" />
-    <path d="M416.677 168.064H414.049V169.112H416.677V168.064Z" fill="#E37056" />
-    <path d="M420.222 168.064H417.594V169.112H420.222V168.064Z" fill="#E37056" />
-    <path d="M423.766 168.064H421.138V169.112H423.766V168.064Z" fill="#E37056" />
-    <path d="M406.043 170.38H403.415V171.428H406.043V170.38Z" fill="#E37056" />
-    <path d="M409.588 170.38H406.96V171.428H409.588V170.38Z" fill="#E37056" />
-    <path d="M413.132 170.38H410.504V171.428H413.132V170.38Z" fill="#E37056" />
-    <path d="M416.677 170.38H414.049V171.428H416.677V170.38Z" fill="#E37056" />
-    <path d="M420.222 170.38H417.594V171.428H420.222V170.38Z" fill="#E37056" />
-    <path d="M423.766 170.38H421.138V171.428H423.766V170.38Z" fill="#E37056" />
-    <path d="M406.043 172.752H403.415V173.799H406.043V172.752Z" fill="#E37056" />
-    <path d="M409.588 172.752H406.96V173.799H409.588V172.752Z" fill="#E37056" />
-    <path d="M413.132 172.752H410.504V173.799H413.132V172.752Z" fill="#E37056" />
-    <path d="M416.677 172.752H414.049V173.799H416.677V172.752Z" fill="#E37056" />
-    <path d="M420.222 172.752H417.594V173.799H420.222V172.752Z" fill="#E37056" />
-    <path d="M423.766 172.752H421.138V173.799H423.766V172.752Z" fill="#E37056" />
-    <path d="M406.043 175.068H403.415V176.116H406.043V175.068Z" fill="#E37056" />
-    <path d="M409.588 175.068H406.96V176.116H409.588V175.068Z" fill="#E37056" />
-    <path d="M413.132 175.068H410.504V176.116H413.132V175.068Z" fill="#E37056" />
-    <path d="M416.677 175.068H414.049V176.116H416.677V175.068Z" fill="#E37056" />
-    <path d="M420.222 175.068H417.594V176.116H420.222V175.068Z" fill="#E37056" />
-    <path d="M423.766 175.068H421.138V176.116H423.766V175.068Z" fill="#E37056" />
-    <path d="M406.043 177.439H403.415V178.487H406.043V177.439Z" fill="#E37056" />
-    <path d="M409.588 177.439H406.96V178.487H409.588V177.439Z" fill="#E37056" />
-    <path d="M413.132 177.439H410.504V178.487H413.132V177.439Z" fill="#E37056" />
-    <path d="M416.677 177.439H414.049V178.487H416.677V177.439Z" fill="#E37056" />
-    <path d="M420.222 177.439H417.594V178.487H420.222V177.439Z" fill="#E37056" />
-    <path d="M423.766 177.439H421.138V178.487H423.766V177.439Z" fill="#E37056" />
-    <path d="M406.043 179.811H403.415V180.858H406.043V179.811Z" fill="#E37056" />
-    <path d="M409.588 179.811H406.96V180.858H409.588V179.811Z" fill="#E37056" />
-    <path d="M413.132 179.811H410.504V180.858H413.132V179.811Z" fill="#E37056" />
-    <path d="M416.677 179.811H414.049V180.858H416.677V179.811Z" fill="#E37056" />
-    <path d="M420.222 179.811H417.594V180.858H420.222V179.811Z" fill="#E37056" />
-    <path d="M423.766 179.811H421.138V180.858H423.766V179.811Z" fill="#E37056" />
-    <path d="M406.043 182.127H403.415V183.175H406.043V182.127Z" fill="#E37056" />
-    <path d="M409.588 182.127H406.96V183.175H409.588V182.127Z" fill="#E37056" />
-    <path d="M413.132 182.127H410.504V183.175H413.132V182.127Z" fill="#E37056" />
-    <path d="M416.677 182.127H414.049V183.175H416.677V182.127Z" fill="#E37056" />
-    <path d="M420.222 182.127H417.594V183.175H420.222V182.127Z" fill="#E37056" />
-    <path d="M423.766 182.127H421.138V183.175H423.766V182.127Z" fill="#E37056" />
-    <path d="M406.043 184.498H403.415V185.546H406.043V184.498Z" fill="#E37056" />
-    <path d="M409.588 184.498H406.96V185.546H409.588V184.498Z" fill="#E37056" />
-    <path d="M413.132 184.498H410.504V185.546H413.132V184.498Z" fill="#E37056" />
-    <path d="M416.677 184.498H414.049V185.546H416.677V184.498Z" fill="#E37056" />
-    <path d="M420.222 184.498H417.594V185.546H420.222V184.498Z" fill="#E37056" />
-    <path d="M423.766 184.498H421.138V185.546H423.766V184.498Z" fill="#E37056" />
-    <path d="M406.043 186.87H403.415V187.917H406.043V186.87Z" fill="#E37056" />
-    <path d="M409.588 186.87H406.96V187.917H409.588V186.87Z" fill="#E37056" />
-    <path d="M413.132 186.87H410.504V187.917H413.132V186.87Z" fill="#E37056" />
-    <path d="M416.677 186.87H414.049V187.917H416.677V186.87Z" fill="#E37056" />
-    <path d="M420.222 186.87H417.594V187.917H420.222V186.87Z" fill="#E37056" />
-    <path d="M423.766 186.87H421.138V187.917H423.766V186.87Z" fill="#E37056" />
-    <path d="M406.043 189.186H403.415V190.234H406.043V189.186Z" fill="#E37056" />
-    <path d="M409.588 189.186H406.96V190.234H409.588V189.186Z" fill="#E37056" />
-    <path d="M413.132 189.186H410.504V190.234H413.132V189.186Z" fill="#E37056" />
-    <path d="M416.677 189.186H414.049V190.234H416.677V189.186Z" fill="#E37056" />
-    <path d="M420.222 189.186H417.594V190.234H420.222V189.186Z" fill="#E37056" />
-    <path d="M423.766 189.186H421.138V190.234H423.766V189.186Z" fill="#E37056" />
-    <path d="M406.043 191.557H403.415V192.605H406.043V191.557Z" fill="#E37056" />
-    <path d="M409.588 191.557H406.96V192.605H409.588V191.557Z" fill="#E37056" />
-    <path d="M413.132 191.557H410.504V192.605H413.132V191.557Z" fill="#E37056" />
-    <path d="M416.677 191.557H414.049V192.605H416.677V191.557Z" fill="#E37056" />
-    <path d="M420.222 191.557H417.594V192.605H420.222V191.557Z" fill="#E37056" />
-    <path d="M423.766 191.557H421.138V192.605H423.766V191.557Z" fill="#E37056" />
-    <path d="M406.043 193.874H403.415V194.921H406.043V193.874Z" fill="#E37056" />
-    <path d="M409.588 193.874H406.96V194.921H409.588V193.874Z" fill="#E37056" />
-    <path d="M413.132 193.874H410.504V194.921H413.132V193.874Z" fill="#E37056" />
-    <path d="M416.677 193.874H414.049V194.921H416.677V193.874Z" fill="#E37056" />
-    <path d="M420.222 193.874H417.594V194.921H420.222V193.874Z" fill="#E37056" />
-    <path d="M423.766 193.874H421.138V194.921H423.766V193.874Z" fill="#E37056" />
-    <path d="M406.043 203.304H403.415V204.352H406.043V203.304Z" fill="#E37056" />
-    <path d="M409.588 203.304H406.96V204.352H409.588V203.304Z" fill="#E37056" />
-    <path d="M413.132 203.304H410.504V204.352H413.132V203.304Z" fill="#E37056" />
-    <path d="M416.677 203.304H414.049V204.352H416.677V203.304Z" fill="#E37056" />
-    <path d="M420.222 203.304H417.594V204.352H420.222V203.304Z" fill="#E37056" />
-    <path d="M423.766 203.304H421.138V204.352H423.766V203.304Z" fill="#E37056" />
-    <path d="M406.043 205.62H403.415V206.668H406.043V205.62Z" fill="#E37056" />
-    <path d="M409.588 205.62H406.96V206.668H409.588V205.62Z" fill="#E37056" />
-    <path d="M413.132 205.62H410.504V206.668H413.132V205.62Z" fill="#E37056" />
-    <path d="M416.677 205.62H414.049V206.668H416.677V205.62Z" fill="#E37056" />
-    <path d="M420.222 205.62H417.594V206.668H420.222V205.62Z" fill="#E37056" />
-    <path d="M423.766 205.62H421.138V206.668H423.766V205.62Z" fill="#E37056" />
-    <path d="M406.043 207.992H403.415V209.039H406.043V207.992Z" fill="#E37056" />
-    <path d="M409.588 207.992H406.96V209.039H409.588V207.992Z" fill="#E37056" />
-    <path d="M413.132 207.992H410.504V209.039H413.132V207.992Z" fill="#E37056" />
-    <path d="M416.677 207.992H414.049V209.039H416.677V207.992Z" fill="#E37056" />
-    <path d="M420.222 207.992H417.594V209.039H420.222V207.992Z" fill="#E37056" />
-    <path d="M423.766 207.992H421.138V209.039H423.766V207.992Z" fill="#E37056" />
-    <path d="M406.043 210.363H403.415V211.411H406.043V210.363Z" fill="#E37056" />
-    <path d="M409.588 210.363H406.96V211.411H409.588V210.363Z" fill="#E37056" />
-    <path d="M413.132 210.363H410.504V211.411H413.132V210.363Z" fill="#E37056" />
-    <path d="M416.677 210.363H414.049V211.411H416.677V210.363Z" fill="#E37056" />
-    <path d="M420.222 210.363H417.594V211.411H420.222V210.363Z" fill="#E37056" />
-    <path d="M423.766 210.363H421.138V211.411H423.766V210.363Z" fill="#E37056" />
-    <path d="M406.043 212.679H403.415V213.727H406.043V212.679Z" fill="#E37056" />
-    <path d="M409.588 212.679H406.96V213.727H409.588V212.679Z" fill="#E37056" />
-    <path d="M413.132 212.679H410.504V213.727H413.132V212.679Z" fill="#E37056" />
-    <path d="M416.677 212.679H414.049V213.727H416.677V212.679Z" fill="#E37056" />
-    <path d="M420.222 212.679H417.594V213.727H420.222V212.679Z" fill="#E37056" />
-    <path d="M423.766 212.679H421.138V213.727H423.766V212.679Z" fill="#E37056" />
-    <path d="M406.043 215.051H403.415V216.098H406.043V215.051Z" fill="#E37056" />
-    <path d="M409.588 215.051H406.96V216.098H409.588V215.051Z" fill="#E37056" />
-    <path d="M413.132 215.051H410.504V216.098H413.132V215.051Z" fill="#E37056" />
-    <path d="M416.677 215.051H414.049V216.098H416.677V215.051Z" fill="#E37056" />
-    <path d="M420.222 215.051H417.594V216.098H420.222V215.051Z" fill="#E37056" />
-    <path d="M423.766 215.051H421.138V216.098H423.766V215.051Z" fill="#E37056" />
-    <path d="M406.043 217.367H403.415V218.415H406.043V217.367Z" fill="#E37056" />
-    <path d="M409.588 217.367H406.96V218.415H409.588V217.367Z" fill="#E37056" />
-    <path d="M413.132 217.367H410.504V218.415H413.132V217.367Z" fill="#E37056" />
-    <path d="M416.677 217.367H414.049V218.415H416.677V217.367Z" fill="#E37056" />
-    <path d="M420.222 217.367H417.594V218.415H420.222V217.367Z" fill="#E37056" />
-    <path d="M423.766 217.367H421.138V218.415H423.766V217.367Z" fill="#E37056" />
-    <path d="M406.043 219.738H403.415V220.786H406.043V219.738Z" fill="#E37056" />
-    <path d="M409.588 219.738H406.96V220.786H409.588V219.738Z" fill="#E37056" />
-    <path d="M413.132 219.738H410.504V220.786H413.132V219.738Z" fill="#E37056" />
-    <path d="M416.677 219.738H414.049V220.786H416.677V219.738Z" fill="#E37056" />
-    <path d="M420.222 219.738H417.594V220.786H420.222V219.738Z" fill="#E37056" />
-    <path d="M423.766 219.738H421.138V220.786H423.766V219.738Z" fill="#E37056" />
-    <path d="M406.043 222.11H403.415V223.157H406.043V222.11Z" fill="#E37056" />
-    <path d="M409.588 222.11H406.96V223.157H409.588V222.11Z" fill="#E37056" />
-    <path d="M413.132 222.11H410.504V223.157H413.132V222.11Z" fill="#E37056" />
-    <path d="M416.677 222.11H414.049V223.157H416.677V222.11Z" fill="#E37056" />
-    <path d="M420.222 222.11H417.594V223.157H420.222V222.11Z" fill="#E37056" />
-    <path d="M423.766 222.11H421.138V223.157H423.766V222.11Z" fill="#E37056" />
-    <path d="M406.043 224.426H403.415V225.474H406.043V224.426Z" fill="#E37056" />
-    <path d="M409.588 224.426H406.96V225.474H409.588V224.426Z" fill="#E37056" />
-    <path d="M413.132 224.426H410.504V225.474H413.132V224.426Z" fill="#E37056" />
-    <path d="M416.677 224.426H414.049V225.474H416.677V224.426Z" fill="#E37056" />
-    <path d="M420.222 224.426H417.594V225.474H420.222V224.426Z" fill="#E37056" />
-    <path d="M423.766 224.426H421.138V225.474H423.766V224.426Z" fill="#E37056" />
-    <path d="M406.043 226.797H403.415V227.845H406.043V226.797Z" fill="#E37056" />
-    <path d="M409.588 226.797H406.96V227.845H409.588V226.797Z" fill="#E37056" />
-    <path d="M413.132 226.797H410.504V227.845H413.132V226.797Z" fill="#E37056" />
-    <path d="M416.677 226.797H414.049V227.845H416.677V226.797Z" fill="#E37056" />
-    <path d="M420.222 226.797H417.594V227.845H420.222V226.797Z" fill="#E37056" />
-    <path d="M423.766 226.797H421.138V227.845H423.766V226.797Z" fill="#E37056" />
-    <path d="M406.043 229.113H403.415V230.161H406.043V229.113Z" fill="#E37056" />
-    <path d="M409.588 229.113H406.96V230.161H409.588V229.113Z" fill="#E37056" />
-    <path d="M413.132 229.113H410.504V230.161H413.132V229.113Z" fill="#E37056" />
-    <path d="M416.677 229.113H414.049V230.161H416.677V229.113Z" fill="#E37056" />
-    <path d="M420.222 229.113H417.594V230.161H420.222V229.113Z" fill="#E37056" />
-    <path d="M423.766 229.113H421.138V230.161H423.766V229.113Z" fill="#E37056" />
-    <path d="M406.043 231.485H403.415V232.533H406.043V231.485Z" fill="#E37056" />
-    <path d="M409.588 231.485H406.96V232.533H409.588V231.485Z" fill="#E37056" />
-    <path d="M413.132 231.485H410.504V232.533H413.132V231.485Z" fill="#E37056" />
-    <path d="M416.677 231.485H414.049V232.533H416.677V231.485Z" fill="#E37056" />
-    <path d="M420.222 231.485H417.594V232.533H420.222V231.485Z" fill="#E37056" />
-    <path d="M423.766 231.485H421.138V232.533H423.766V231.485Z" fill="#E37056" />
-    <path d="M406.043 233.856H403.415V234.904H406.043V233.856Z" fill="#E37056" />
-    <path d="M409.588 233.856H406.96V234.904H409.588V233.856Z" fill="#E37056" />
-    <path d="M413.132 233.856H410.504V234.904H413.132V233.856Z" fill="#E37056" />
-    <path d="M416.677 233.856H414.049V234.904H416.677V233.856Z" fill="#E37056" />
-    <path d="M420.222 233.856H417.594V234.904H420.222V233.856Z" fill="#E37056" />
-    <path d="M423.766 233.856H421.138V234.904H423.766V233.856Z" fill="#E37056" />
-    <path opacity="0.4" d="M425.172 227.955H401.887V240.474H425.172V227.955Z" fill="#2484C6" />
-    <path d="M326.044 212.128H250.141V241.246H326.044V212.128Z" fill="#2484C6" />
-    <path d="M263.83 213.286H252.157V214.72H263.83V213.286Z" fill="#E37056" />
-    <path d="M276.42 213.286H264.747V214.72H276.42V213.286Z" fill="#E37056" />
-    <path d="M288.826 213.286H277.153V214.72H288.826V213.286Z" fill="#E37056" />
-    <path d="M263.83 215.878H252.157V217.312H263.83V215.878Z" fill="#E37056" />
-    <path d="M276.42 215.878H264.747V217.312H276.42V215.878Z" fill="#E37056" />
-    <path d="M288.826 215.878H277.153V217.312H288.826V215.878Z" fill="#E37056" />
-    <path d="M263.83 218.47H252.157V219.904H263.83V218.47Z" fill="#E37056" />
-    <path d="M276.42 218.47H264.747V219.904H276.42V218.47Z" fill="#E37056" />
-    <path d="M288.826 218.47H277.153V219.904H288.826V218.47Z" fill="#E37056" />
-    <path d="M263.83 221.062H252.157V222.496H263.83V221.062Z" fill="#E37056" />
-    <path d="M276.42 221.062H264.747V222.496H276.42V221.062Z" fill="#E37056" />
-    <path d="M288.826 221.062H277.153V222.496H288.826V221.062Z" fill="#E37056" />
-    <path d="M263.83 223.654H252.157V225.088H263.83V223.654Z" fill="#E37056" />
-    <path d="M276.42 223.654H264.747V225.088H276.42V223.654Z" fill="#E37056" />
-    <path d="M288.826 223.654H277.153V225.088H288.826V223.654Z" fill="#E37056" />
-    <path d="M263.83 226.191H252.157V227.624H263.83V226.191Z" fill="#E37056" />
-    <path d="M276.42 226.191H264.747V227.624H276.42V226.191Z" fill="#E37056" />
-    <path d="M288.826 226.191H277.153V227.624H288.826V226.191Z" fill="#E37056" />
-    <path d="M263.83 228.783H252.157V230.216H263.83V228.783Z" fill="#E37056" />
-    <path d="M276.42 228.783H264.747V230.216H276.42V228.783Z" fill="#E37056" />
-    <path d="M288.826 228.783H277.153V230.216H288.826V228.783Z" fill="#E37056" />
-    <path d="M263.83 231.375H252.157V232.808H263.83V231.375Z" fill="#E37056" />
-    <path d="M276.42 231.375H264.747V232.808H276.42V231.375Z" fill="#E37056" />
-    <path d="M288.826 231.375H277.153V232.808H288.826V231.375Z" fill="#E37056" />
-    <path d="M360.818 199.664H358.191V209.701H360.818V199.664Z" fill="#2484C6" />
-    <path d="M360.818 199.664H358.191V205.014H360.818V199.664Z" fill="#2484C6" />
-    <path d="M368.274 209.701H334.173V215.216H368.274V209.701Z" fill="#2484C6" />
-    <path d="M375.303 215.216H334.173V240.915H375.303V215.216Z" fill="#2484C6" />
-    <path d="M331.606 121.298H291.759V240.253H331.606V121.298Z" fill="#2484C6" />
-    <path d="M299.582 126.592H294.143V127.254H299.582V126.592Z" fill="#E37056" />
-    <path d="M305.449 126.592H300.01V127.254H305.449V126.592Z" fill="#E37056" />
-    <path d="M311.194 126.592H305.754V127.254H311.194V126.592Z" fill="#E37056" />
-    <path d="M316.938 126.592H311.499V127.254H316.938V126.592Z" fill="#E37056" />
-    <path d="M322.866 126.592H317.427V127.254H322.866V126.592Z" fill="#E37056" />
-    <path d="M328.611 126.592H323.172V127.254H328.611V126.592Z" fill="#E37056" />
-    <path d="M299.582 129.46H294.143V130.122H299.582V129.46Z" fill="#E37056" />
-    <path d="M305.449 129.46H300.01V130.122H305.449V129.46Z" fill="#E37056" />
-    <path d="M311.194 129.46H305.755V130.122H311.194V129.46Z" fill="#E37056" />
-    <path d="M316.938 129.46H311.499V130.122H316.938V129.46Z" fill="#E37056" />
-    <path d="M322.866 129.46H317.427V130.122H322.866V129.46Z" fill="#E37056" />
-    <path d="M328.611 129.46H323.172V130.122H328.611V129.46Z" fill="#E37056" />
-    <path d="M299.582 132.383H294.143V133.045H299.582V132.383Z" fill="#E37056" />
-    <path d="M305.449 132.383H300.01V133.045H305.449V132.383Z" fill="#E37056" />
-    <path d="M311.194 132.383H305.755V133.045H311.194V132.383Z" fill="#E37056" />
-    <path d="M316.938 132.383H311.499V133.045H316.938V132.383Z" fill="#E37056" />
-    <path d="M322.866 132.383H317.427V133.045H322.866V132.383Z" fill="#E37056" />
-    <path d="M328.611 132.383H323.172V133.045H328.611V132.383Z" fill="#E37056" />
-    <path d="M299.582 135.251H294.143V135.912H299.582V135.251Z" fill="#E37056" />
-    <path d="M305.449 135.251H300.01V135.912H305.449V135.251Z" fill="#E37056" />
-    <path d="M311.194 135.251H305.755V135.912H311.194V135.251Z" fill="#E37056" />
-    <path d="M316.938 135.251H311.499V135.912H316.938V135.251Z" fill="#E37056" />
-    <path d="M322.866 135.251H317.427V135.912H322.866V135.251Z" fill="#E37056" />
-    <path d="M328.611 135.251H323.172V135.912H328.611V135.251Z" fill="#E37056" />
-    <path d="M299.582 138.173H294.143V138.835H299.582V138.173Z" fill="#E37056" />
-    <path d="M305.449 138.173H300.01V138.835H305.449V138.173Z" fill="#E37056" />
-    <path d="M311.194 138.173H305.755V138.835H311.194V138.173Z" fill="#E37056" />
-    <path d="M316.938 138.173H311.499V138.835H316.938V138.173Z" fill="#E37056" />
-    <path d="M322.866 138.173H317.427V138.835H322.866V138.173Z" fill="#E37056" />
-    <path d="M328.611 138.173H323.172V138.835H328.611V138.173Z" fill="#E37056" />
-    <path d="M299.582 141.041H294.143V141.703H299.582V141.041Z" fill="#E37056" />
-    <path d="M305.449 141.041H300.01V141.703H305.449V141.041Z" fill="#E37056" />
-    <path d="M311.194 141.041H305.755V141.703H311.194V141.041Z" fill="#E37056" />
-    <path d="M316.938 141.041H311.499V141.703H316.938V141.041Z" fill="#E37056" />
-    <path d="M322.866 141.041H317.427V141.703H322.866V141.041Z" fill="#E37056" />
-    <path d="M328.611 141.041H323.172V141.703H328.611V141.041Z" fill="#E37056" />
-    <path d="M298.237 144.626H294.143V145.288H298.237V144.626Z" fill="#E37056" />
-    <path d="M308.016 144.626H303.921V145.288H308.016V144.626Z" fill="#E37056" />
-    <path d="M317.794 144.626H313.699V145.288H317.794V144.626Z" fill="#E37056" />
-    <path d="M327.572 144.626H323.478V145.288H327.572V144.626Z" fill="#E37056" />
-    <path d="M303.127 148.045H299.032V148.707H303.127V148.045Z" fill="#E37056" />
-    <path d="M312.905 148.045H308.81V148.707H312.905V148.045Z" fill="#E37056" />
-    <path d="M322.683 148.045H318.589V148.707H322.683V148.045Z" fill="#E37056" />
-    <path d="M298.237 151.519H294.143V152.181H298.237V151.519Z" fill="#E37056" />
-    <path d="M308.016 151.519H303.921V152.181H308.016V151.519Z" fill="#E37056" />
-    <path d="M317.794 151.519H313.699V152.181H317.794V151.519Z" fill="#E37056" />
-    <path d="M327.572 151.519H323.478V152.181H327.572V151.519Z" fill="#E37056" />
-    <path d="M303.127 154.883H299.032V155.545H303.127V154.883Z" fill="#E37056" />
-    <path d="M312.905 154.883H308.81V155.545H312.905V154.883Z" fill="#E37056" />
-    <path d="M322.683 154.883H318.589V155.545H322.683V154.883Z" fill="#E37056" />
-    <path d="M298.237 158.413H294.143V159.075H298.237V158.413Z" fill="#E37056" />
-    <path d="M308.016 158.413H303.921V159.075H308.016V158.413Z" fill="#E37056" />
-    <path d="M317.794 158.413H313.699V159.075H317.794V158.413Z" fill="#E37056" />
-    <path d="M327.572 158.413H323.478V159.075H327.572V158.413Z" fill="#E37056" />
-    <path d="M303.127 161.777H299.032V162.439H303.127V161.777Z" fill="#E37056" />
-    <path d="M312.905 161.777H308.81V162.439H312.905V161.777Z" fill="#E37056" />
-    <path d="M322.683 161.777H318.589V162.439H322.683V161.777Z" fill="#E37056" />
-    <path d="M298.237 165.307H294.143V165.968H298.237V165.307Z" fill="#E37056" />
-    <path d="M308.016 165.307H303.921V165.968H308.016V165.307Z" fill="#E37056" />
-    <path d="M317.794 165.307H313.699V165.968H317.794V165.307Z" fill="#E37056" />
-    <path d="M327.572 165.307H323.478V165.968H327.572V165.307Z" fill="#E37056" />
-    <path d="M303.127 168.671H299.032V169.332H303.127V168.671Z" fill="#E37056" />
-    <path d="M312.905 168.671H308.81V169.332H312.905V168.671Z" fill="#E37056" />
-    <path d="M322.683 168.671H318.589V169.332H322.683V168.671Z" fill="#E37056" />
-    <path d="M298.237 172.2H294.143V172.862H298.237V172.2Z" fill="#E37056" />
-    <path d="M308.016 172.2H303.921V172.862H308.016V172.2Z" fill="#E37056" />
-    <path d="M317.794 172.2H313.699V172.862H317.794V172.2Z" fill="#E37056" />
-    <path d="M327.572 172.2H323.478V172.862H327.572V172.2Z" fill="#E37056" />
-    <path d="M303.127 175.564H299.032V176.226H303.127V175.564Z" fill="#E37056" />
-    <path d="M312.905 175.564H308.81V176.226H312.905V175.564Z" fill="#E37056" />
-    <path d="M322.683 175.564H318.589V176.226H322.683V175.564Z" fill="#E37056" />
-    <path d="M298.237 179.094H294.143V179.755H298.237V179.094Z" fill="#E37056" />
-    <path d="M308.016 179.094H303.921V179.755H308.016V179.094Z" fill="#E37056" />
-    <path d="M317.794 179.094H313.699V179.755H317.794V179.094Z" fill="#E37056" />
-    <path d="M327.572 179.094H323.478V179.755H327.572V179.094Z" fill="#E37056" />
-    <path d="M303.127 182.458H299.032V183.12H303.127V182.458Z" fill="#E37056" />
-    <path d="M312.905 182.458H308.81V183.12H312.905V182.458Z" fill="#E37056" />
-    <path d="M322.683 182.458H318.589V183.12H322.683V182.458Z" fill="#E37056" />
-    <path d="M298.237 185.932H294.143V186.594H298.237V185.932Z" fill="#E37056" />
-    <path d="M308.016 185.932H303.921V186.594H308.016V185.932Z" fill="#E37056" />
-    <path d="M317.794 185.932H313.699V186.594H317.794V185.932Z" fill="#E37056" />
-    <path d="M327.572 185.932H323.478V186.594H327.572V185.932Z" fill="#E37056" />
-    <path d="M303.127 189.351H299.032V190.013H303.127V189.351Z" fill="#E37056" />
-    <path d="M312.905 189.351H308.81V190.013H312.905V189.351Z" fill="#E37056" />
-    <path d="M322.683 189.351H318.589V190.013H322.683V189.351Z" fill="#E37056" />
-    <path d="M298.237 192.826H294.143V193.487H298.237V192.826Z" fill="#E37056" />
-    <path d="M308.016 192.826H303.921V193.487H308.016V192.826Z" fill="#E37056" />
-    <path d="M317.794 192.826H313.699V193.487H317.794V192.826Z" fill="#E37056" />
-    <path d="M327.572 192.826H323.478V193.487H327.572V192.826Z" fill="#E37056" />
-    <path d="M303.127 196.245H299.032V196.907H303.127V196.245Z" fill="#E37056" />
-    <path d="M312.905 196.245H308.81V196.907H312.905V196.245Z" fill="#E37056" />
-    <path d="M322.683 196.245H318.589V196.907H322.683V196.245Z" fill="#E37056" />
-    <path d="M298.237 199.719H294.143V200.381H298.237V199.719Z" fill="#E37056" />
-    <path d="M308.016 199.719H303.921V200.381H308.016V199.719Z" fill="#E37056" />
-    <path d="M317.794 199.719H313.699V200.381H317.794V199.719Z" fill="#E37056" />
-    <path d="M327.572 199.719H323.478V200.381H327.572V199.719Z" fill="#E37056" />
-    <path d="M303.127 203.138H299.032V203.8H303.127V203.138Z" fill="#E37056" />
-    <path d="M312.905 203.138H308.81V203.8H312.905V203.138Z" fill="#E37056" />
-    <path d="M322.683 203.138H318.589V203.8H322.683V203.138Z" fill="#E37056" />
-    <path d="M298.237 206.613H294.143V207.275H298.237V206.613Z" fill="#E37056" />
-    <path d="M308.016 206.613H303.921V207.275H308.016V206.613Z" fill="#E37056" />
-    <path d="M317.794 206.613H313.699V207.275H317.794V206.613Z" fill="#E37056" />
-    <path d="M327.572 206.613H323.478V207.275H327.572V206.613Z" fill="#E37056" />
-    <path d="M303.127 209.977H299.032V210.639H303.127V209.977Z" fill="#E37056" />
-    <path d="M312.905 209.977H308.81V210.639H312.905V209.977Z" fill="#E37056" />
-    <path d="M322.683 209.977H318.589V210.639H322.683V209.977Z" fill="#E37056" />
-    <path d="M298.237 213.506H294.143V214.168H298.237V213.506Z" fill="#E37056" />
-    <path d="M308.016 213.506H303.921V214.168H308.016V213.506Z" fill="#E37056" />
-    <path d="M317.794 213.506H313.699V214.168H317.794V213.506Z" fill="#E37056" />
-    <path d="M327.572 213.506H323.478V214.168H327.572V213.506Z" fill="#E37056" />
-    <path d="M303.127 216.87H299.032V217.532H303.127V216.87Z" fill="#E37056" />
-    <path d="M312.905 216.87H308.81V217.532H312.905V216.87Z" fill="#E37056" />
-    <path d="M322.683 216.87H318.589V217.532H322.683V216.87Z" fill="#E37056" />
-    <path d="M298.237 220.4H294.143V221.062H298.237V220.4Z" fill="#E37056" />
-    <path d="M308.016 220.4H303.921V221.062H308.016V220.4Z" fill="#E37056" />
-    <path d="M317.794 220.4H313.699V221.062H317.794V220.4Z" fill="#E37056" />
-    <path d="M327.572 220.4H323.478V221.062H327.572V220.4Z" fill="#E37056" />
-    <path d="M303.127 223.764H299.032V224.426H303.127V223.764Z" fill="#E37056" />
-    <path d="M312.905 223.764H308.81V224.426H312.905V223.764Z" fill="#E37056" />
-    <path d="M322.683 223.764H318.589V224.426H322.683V223.764Z" fill="#E37056" />
-    <path d="M298.237 227.294H294.143V227.955H298.237V227.294Z" fill="#E37056" />
-    <path d="M308.016 227.294H303.921V227.955H308.016V227.294Z" fill="#E37056" />
-    <path d="M317.794 227.294H313.699V227.955H317.794V227.294Z" fill="#E37056" />
-    <path d="M327.572 227.294H323.478V227.955H327.572V227.294Z" fill="#E37056" />
-    <path d="M303.127 230.658H299.032V231.319H303.127V230.658Z" fill="#E37056" />
-    <path d="M312.905 230.658H308.81V231.319H312.905V230.658Z" fill="#E37056" />
-    <path d="M322.683 230.658H318.589V231.319H322.683V230.658Z" fill="#E37056" />
-    <path d="M199.538 188.303H169.531V240.695H199.538V188.303Z" fill="#2484C6" />
-    <path d="M178.087 191.226H171.181V194.26H178.087V191.226Z" fill="#E37056" />
-    <path d="M186.826 191.226H179.92V194.26H186.826V191.226Z" fill="#E37056" />
-    <path d="M195.566 191.226H188.66V194.26H195.566V191.226Z" fill="#E37056" />
-    <path d="M178.087 195.638H171.181V198.671H178.087V195.638Z" fill="#E37056" />
-    <path d="M186.826 195.638H179.92V198.671H186.826V195.638Z" fill="#E37056" />
-    <path d="M195.566 195.638H188.66V198.671H195.566V195.638Z" fill="#E37056" />
-    <path d="M178.087 200.05H171.181V203.083H178.087V200.05Z" fill="#E37056" />
-    <path d="M186.826 200.05H179.92V203.083H186.826V200.05Z" fill="#E37056" />
-    <path d="M195.566 200.05H188.66V203.083H195.566V200.05Z" fill="#E37056" />
-    <path d="M178.087 204.407H171.181V207.44H178.087V204.407Z" fill="#E37056" />
-    <path d="M186.826 204.407H179.92V207.44H186.826V204.407Z" fill="#E37056" />
-    <path d="M195.566 204.407H188.66V207.44H195.566V204.407Z" fill="#E37056" />
-    <path d="M178.087 208.819H171.181V211.852H178.087V208.819Z" fill="#E37056" />
-    <path d="M186.826 208.819H179.92V211.852H186.826V208.819Z" fill="#E37056" />
-    <path d="M195.566 208.819H188.66V211.852H195.566V208.819Z" fill="#E37056" />
-    <path d="M178.087 213.231H171.181V216.264H178.087V213.231Z" fill="#E37056" />
-    <path d="M186.826 213.231H179.92V216.264H186.826V213.231Z" fill="#E37056" />
-    <path d="M195.566 213.231H188.66V216.264H195.566V213.231Z" fill="#E37056" />
-    <path d="M178.087 217.587H171.181V220.621H178.087V217.587Z" fill="#E37056" />
-    <path d="M186.826 217.587H179.92V220.621H186.826V217.587Z" fill="#E37056" />
-    <path d="M195.566 217.587H188.66V220.621H195.566V217.587Z" fill="#E37056" />
-    <path d="M160.914 175.84L169.653 185.546V244.555H160.914V175.84Z" fill="#1474AA" />
-    <path
-      opacity="0.6"
-      d="M163.542 242.57V178.763L160.914 175.895V241.963C162.014 242.349 163.542 242.57 163.542 242.57Z"
-      fill="#1474AA"
-    />
-    <path d="M154.191 108.448H144.046V146.335H154.191V108.448Z" fill="#2484C6" />
-    <path d="M151.991 108.448H144.046V146.335H151.991V108.448Z" fill="#2484C6" />
-    <path d="M160.914 146.335H112.206V244.555H160.914V146.335Z" fill="#2484C6" />
-    <path d="M147.835 105.746H117.462V146.335H147.835V105.746Z" fill="#2484C6" />
-    <path d="M120.639 115.066H119.539V116.059H120.639V115.066Z" fill="#E37056" />
-    <path d="M123.756 115.066H122.656V116.059H123.756V115.066Z" fill="#E37056" />
-    <path d="M126.873 115.066H125.773V116.059H126.873V115.066Z" fill="#E37056" />
-    <path d="M130.051 115.066H128.951V116.059H130.051V115.066Z" fill="#E37056" />
-    <path d="M133.168 115.066H132.068V116.059H133.168V115.066Z" fill="#E37056" />
-    <path d="M136.285 115.066H135.185V116.059H136.285V115.066Z" fill="#E37056" />
-    <path d="M139.463 115.066H138.363V116.059H139.463V115.066Z" fill="#E37056" />
-    <path d="M142.58 115.066H141.479V116.059H142.58V115.066Z" fill="#E37056" />
-    <path d="M145.696 115.066H144.596V116.059H145.696V115.066Z" fill="#E37056" />
-    <path d="M120.639 118.871H119.539V119.864H120.639V118.871Z" fill="#E37056" />
-    <path d="M123.756 118.871H122.656V119.864H123.756V118.871Z" fill="#E37056" />
-    <path d="M126.873 118.871H125.773V119.864H126.873V118.871Z" fill="#E37056" />
-    <path d="M130.051 118.871H128.951V119.864H130.051V118.871Z" fill="#E37056" />
-    <path d="M133.168 118.871H132.068V119.864H133.168V118.871Z" fill="#E37056" />
-    <path d="M136.285 118.871H135.185V119.864H136.285V118.871Z" fill="#E37056" />
-    <path d="M139.463 118.871H138.363V119.864H139.463V118.871Z" fill="#E37056" />
-    <path d="M142.58 118.871H141.479V119.864H142.58V118.871Z" fill="#E37056" />
-    <path d="M145.696 118.871H144.596V119.864H145.696V118.871Z" fill="#E37056" />
-    <path d="M120.639 122.732H119.539V123.724H120.639V122.732Z" fill="#E37056" />
-    <path d="M123.756 122.732H122.656V123.724H123.756V122.732Z" fill="#E37056" />
-    <path d="M126.873 122.732H125.773V123.724H126.873V122.732Z" fill="#E37056" />
-    <path d="M130.051 122.732H128.951V123.724H130.051V122.732Z" fill="#E37056" />
-    <path d="M133.168 122.732H132.068V123.724H133.168V122.732Z" fill="#E37056" />
-    <path d="M136.285 122.732H135.185V123.724H136.285V122.732Z" fill="#E37056" />
-    <path d="M139.463 122.732H138.363V123.724H139.463V122.732Z" fill="#E37056" />
-    <path d="M142.58 122.732H141.479V123.724H142.58V122.732Z" fill="#E37056" />
-    <path d="M145.696 122.732H144.596V123.724H145.696V122.732Z" fill="#E37056" />
-    <path d="M120.639 126.592H119.539V127.585H120.639V126.592Z" fill="#E37056" />
-    <path d="M123.756 126.592H122.656V127.585H123.756V126.592Z" fill="#E37056" />
-    <path d="M126.873 126.592H125.773V127.585H126.873V126.592Z" fill="#E37056" />
-    <path d="M130.051 126.592H128.951V127.585H130.051V126.592Z" fill="#E37056" />
-    <path d="M133.168 126.592H132.068V127.585H133.168V126.592Z" fill="#E37056" />
-    <path d="M136.285 126.592H135.185V127.585H136.285V126.592Z" fill="#E37056" />
-    <path d="M139.463 126.592H138.363V127.585H139.463V126.592Z" fill="#E37056" />
-    <path d="M142.58 126.592H141.479V127.585H142.58V126.592Z" fill="#E37056" />
-    <path d="M145.696 126.592H144.596V127.585H145.696V126.592Z" fill="#E37056" />
-    <path d="M120.639 130.397H119.539V131.39H120.639V130.397Z" fill="#E37056" />
-    <path d="M123.756 130.397H122.656V131.39H123.756V130.397Z" fill="#E37056" />
-    <path d="M126.873 130.397H125.773V131.39H126.873V130.397Z" fill="#E37056" />
-    <path d="M130.051 130.397H128.951V131.39H130.051V130.397Z" fill="#E37056" />
-    <path d="M133.168 130.397H132.068V131.39H133.168V130.397Z" fill="#E37056" />
-    <path d="M136.285 130.397H135.185V131.39H136.285V130.397Z" fill="#E37056" />
-    <path d="M139.463 130.397H138.363V131.39H139.463V130.397Z" fill="#E37056" />
-    <path d="M142.58 130.397H141.479V131.39H142.58V130.397Z" fill="#E37056" />
-    <path d="M145.696 130.397H144.596V131.39H145.696V130.397Z" fill="#E37056" />
-    <path d="M120.639 134.258H119.539V135.251H120.639V134.258Z" fill="#E37056" />
-    <path d="M123.756 134.258H122.656V135.251H123.756V134.258Z" fill="#E37056" />
-    <path d="M126.873 134.258H125.773V135.251H126.873V134.258Z" fill="#E37056" />
-    <path d="M130.051 134.258H128.951V135.251H130.051V134.258Z" fill="#E37056" />
-    <path d="M133.168 134.258H132.068V135.251H133.168V134.258Z" fill="#E37056" />
-    <path d="M136.285 134.258H135.185V135.251H136.285V134.258Z" fill="#E37056" />
-    <path d="M139.463 134.258H138.363V135.251H139.463V134.258Z" fill="#E37056" />
-    <path d="M142.58 134.258H141.479V135.251H142.58V134.258Z" fill="#E37056" />
-    <path d="M145.696 134.258H144.596V135.251H145.696V134.258Z" fill="#E37056" />
-    <path d="M120.639 138.063H119.539V139.056H120.639V138.063Z" fill="#E37056" />
-    <path d="M123.756 138.063H122.656V139.056H123.756V138.063Z" fill="#E37056" />
-    <path d="M126.873 138.063H125.773V139.056H126.873V138.063Z" fill="#E37056" />
-    <path d="M130.051 138.063H128.951V139.056H130.051V138.063Z" fill="#E37056" />
-    <path d="M133.168 138.063H132.068V139.056H133.168V138.063Z" fill="#E37056" />
-    <path d="M136.285 138.063H135.185V139.056H136.285V138.063Z" fill="#E37056" />
-    <path d="M139.463 138.063H138.363V139.056H139.463V138.063Z" fill="#E37056" />
-    <path d="M142.58 138.063H141.479V139.056H142.58V138.063Z" fill="#E37056" />
-    <path d="M145.696 138.063H144.596V139.056H145.696V138.063Z" fill="#E37056" />
-    <path d="M120.639 141.924H119.539V142.916H120.639V141.924Z" fill="#E37056" />
-    <path d="M123.756 141.924H122.656V142.916H123.756V141.924Z" fill="#E37056" />
-    <path d="M126.873 141.924H125.773V142.916H126.873V141.924Z" fill="#E37056" />
-    <path d="M130.051 141.924H128.951V142.916H130.051V141.924Z" fill="#E37056" />
-    <path d="M133.168 141.924H132.068V142.916H133.168V141.924Z" fill="#E37056" />
-    <path d="M136.285 141.924H135.185V142.916H136.285V141.924Z" fill="#E37056" />
-    <path d="M139.463 141.924H138.363V142.916H139.463V141.924Z" fill="#E37056" />
-    <path d="M142.58 141.924H141.479V142.916H142.58V141.924Z" fill="#E37056" />
-    <path d="M145.696 141.924H144.596V142.916H145.696V141.924Z" fill="#E37056" />
-    <path d="M121.556 109.496H119.539V111.316H121.556V109.496Z" fill="#E37056" />
-    <path d="M123.94 109.496H121.923V111.316H123.94V109.496Z" fill="#E37056" />
-    <path d="M126.384 109.496H124.367V111.316H126.384V109.496Z" fill="#E37056" />
-    <path d="M128.768 109.496H126.751V111.316H128.768V109.496Z" fill="#E37056" />
-    <path d="M131.212 109.496H129.195V111.316H131.212V109.496Z" fill="#E37056" />
-    <path d="M133.596 109.496H131.579V111.316H133.596V109.496Z" fill="#E37056" />
-    <path d="M136.04 109.496H134.023V111.316H136.04V109.496Z" fill="#E37056" />
-    <path d="M138.424 109.496H136.407V111.316H138.424V109.496Z" fill="#E37056" />
-    <path d="M140.868 109.496H138.851V111.316H140.868V109.496Z" fill="#E37056" />
-    <path d="M143.252 109.496H141.235V111.316H143.252V109.496Z" fill="#E37056" />
-    <path d="M145.696 109.496H143.68V111.316H145.696V109.496Z" fill="#E37056" />
-    <path d="M121.556 111.647H119.539V113.467H121.556V111.647Z" fill="#E37056" />
-    <path d="M123.94 111.647H121.923V113.467H123.94V111.647Z" fill="#E37056" />
-    <path d="M126.384 111.647H124.367V113.467H126.384V111.647Z" fill="#E37056" />
-    <path d="M128.768 111.647H126.751V113.467H128.768V111.647Z" fill="#E37056" />
-    <path d="M131.212 111.647H129.195V113.467H131.212V111.647Z" fill="#E37056" />
-    <path d="M133.596 111.647H131.579V113.467H133.596V111.647Z" fill="#E37056" />
-    <path d="M136.04 111.647H134.023V113.467H136.04V111.647Z" fill="#E37056" />
-    <path d="M138.424 111.647H136.407V113.467H138.424V111.647Z" fill="#E37056" />
-    <path d="M140.868 111.647H138.851V113.467H140.868V111.647Z" fill="#E37056" />
-    <path d="M143.252 111.647H141.235V113.467H143.252V111.647Z" fill="#E37056" />
-    <path d="M145.696 111.647H143.68V113.467H145.696V111.647Z" fill="#E37056" />
-    <path d="M117.462 141.317V146.335H144.046H147.835H154.191V141.317H117.462Z" fill="#2484C6" />
-    <path d="M118.928 150.968H115.689V153.891H118.928V150.968Z" fill="#E37056" />
-    <path d="M122.778 150.968H119.539V153.891H122.778V150.968Z" fill="#E37056" />
-    <path d="M126.568 150.968H123.328V153.891H126.568V150.968Z" fill="#E37056" />
-    <path d="M130.418 150.968H127.179V153.891H130.418V150.968Z" fill="#E37056" />
-    <path d="M134.268 150.968H131.029V153.891H134.268V150.968Z" fill="#E37056" />
-    <path d="M138.057 150.968H134.818V153.891H138.057V150.968Z" fill="#E37056" />
-    <path d="M141.907 150.968H138.668V153.891H141.907V150.968Z" fill="#E37056" />
-    <path d="M145.696 150.968H142.457V153.891H145.696V150.968Z" fill="#E37056" />
-    <path d="M149.546 150.968H146.307V153.891H149.546V150.968Z" fill="#E37056" />
-    <path d="M153.336 150.968H150.097V153.891H153.336V150.968Z" fill="#E37056" />
-    <path d="M157.186 150.968H153.947V153.891H157.186V150.968Z" fill="#E37056" />
-    <path d="M118.928 154.442H115.689V157.365H118.928V154.442Z" fill="#E37056" />
-    <path d="M117.4 158.634H115.689V160.178H117.4V158.634Z" fill="#E37056" />
-    <path d="M122.412 158.634H120.701V160.178H122.412V158.634Z" fill="#E37056" />
-    <path d="M127.362 158.634H125.651V160.178H127.362V158.634Z" fill="#E37056" />
-    <path d="M132.312 158.634H130.601V160.178H132.312V158.634Z" fill="#E37056" />
-    <path d="M137.263 158.634H135.551V160.178H137.263V158.634Z" fill="#E37056" />
-    <path d="M142.274 158.634H140.563V160.178H142.274V158.634Z" fill="#E37056" />
-    <path d="M147.224 158.634H145.513V160.178H147.224V158.634Z" fill="#E37056" />
-    <path d="M152.174 158.634H150.463V160.178H152.174V158.634Z" fill="#E37056" />
-    <path d="M157.125 158.634H155.414V160.178H157.125V158.634Z" fill="#E37056" />
-    <path d="M117.4 162.273H115.689V163.818H117.4V162.273Z" fill="#E37056" />
-    <path d="M122.412 162.273H120.701V163.818H122.412V162.273Z" fill="#E37056" />
-    <path d="M127.362 162.273H125.651V163.818H127.362V162.273Z" fill="#E37056" />
-    <path d="M132.312 162.273H130.601V163.818H132.312V162.273Z" fill="#E37056" />
-    <path d="M137.263 162.273H135.551V163.818H137.263V162.273Z" fill="#E37056" />
-    <path d="M142.274 162.273H140.563V163.818H142.274V162.273Z" fill="#E37056" />
-    <path d="M147.224 162.273H145.513V163.818H147.224V162.273Z" fill="#E37056" />
-    <path d="M152.174 162.273H150.463V163.818H152.174V162.273Z" fill="#E37056" />
-    <path d="M157.125 162.273H155.414V163.818H157.125V162.273Z" fill="#E37056" />
-    <path d="M117.4 165.913H115.689V167.457H117.4V165.913Z" fill="#E37056" />
-    <path d="M122.412 165.913H120.701V167.457H122.412V165.913Z" fill="#E37056" />
-    <path d="M127.362 165.913H125.651V167.457H127.362V165.913Z" fill="#E37056" />
-    <path d="M132.312 165.913H130.601V167.457H132.312V165.913Z" fill="#E37056" />
-    <path d="M137.263 165.913H135.551V167.457H137.263V165.913Z" fill="#E37056" />
-    <path d="M142.274 165.913H140.563V167.457H142.274V165.913Z" fill="#E37056" />
-    <path d="M147.224 165.913H145.513V167.457H147.224V165.913Z" fill="#E37056" />
-    <path d="M152.174 165.913H150.463V167.457H152.174V165.913Z" fill="#E37056" />
-    <path d="M157.125 165.913H155.414V167.457H157.125V165.913Z" fill="#E37056" />
-    <path d="M117.4 169.498H115.689V171.042H117.4V169.498Z" fill="#E37056" />
-    <path d="M122.412 169.498H120.701V171.042H122.412V169.498Z" fill="#E37056" />
-    <path d="M127.362 169.498H125.651V171.042H127.362V169.498Z" fill="#E37056" />
-    <path d="M132.312 169.498H130.601V171.042H132.312V169.498Z" fill="#E37056" />
-    <path d="M137.263 169.498H135.551V171.042H137.263V169.498Z" fill="#E37056" />
-    <path d="M142.274 169.498H140.563V171.042H142.274V169.498Z" fill="#E37056" />
-    <path d="M147.224 169.498H145.513V171.042H147.224V169.498Z" fill="#E37056" />
-    <path d="M152.174 169.498H150.463V171.042H152.174V169.498Z" fill="#E37056" />
-    <path d="M157.125 169.498H155.414V171.042H157.125V169.498Z" fill="#E37056" />
-    <path d="M117.4 173.138H115.689V174.682H117.4V173.138Z" fill="#E37056" />
-    <path d="M122.412 173.138H120.701V174.682H122.412V173.138Z" fill="#E37056" />
-    <path d="M127.362 173.138H125.651V174.682H127.362V173.138Z" fill="#E37056" />
-    <path d="M132.312 173.138H130.601V174.682H132.312V173.138Z" fill="#E37056" />
-    <path d="M137.263 173.138H135.551V174.682H137.263V173.138Z" fill="#E37056" />
-    <path d="M142.274 173.138H140.563V174.682H142.274V173.138Z" fill="#E37056" />
-    <path d="M147.224 173.138H145.513V174.682H147.224V173.138Z" fill="#E37056" />
-    <path d="M152.174 173.138H150.463V174.682H152.174V173.138Z" fill="#E37056" />
-    <path d="M157.125 173.138H155.414V174.682H157.125V173.138Z" fill="#E37056" />
-    <path d="M117.4 176.777H115.689V178.322H117.4V176.777Z" fill="#E37056" />
-    <path d="M122.412 176.777H120.701V178.322H122.412V176.777Z" fill="#E37056" />
-    <path d="M127.362 176.777H125.651V178.322H127.362V176.777Z" fill="#E37056" />
-    <path d="M132.312 176.777H130.601V178.322H132.312V176.777Z" fill="#E37056" />
-    <path d="M137.263 176.777H135.551V178.322H137.263V176.777Z" fill="#E37056" />
-    <path d="M142.274 176.777H140.563V178.322H142.274V176.777Z" fill="#E37056" />
-    <path d="M147.224 176.777H145.513V178.322H147.224V176.777Z" fill="#E37056" />
-    <path d="M152.174 176.777H150.463V178.322H152.174V176.777Z" fill="#E37056" />
-    <path d="M157.125 176.777H155.414V178.322H157.125V176.777Z" fill="#E37056" />
-    <path d="M117.4 180.362H115.689V181.906H117.4V180.362Z" fill="#E37056" />
-    <path d="M122.412 180.362H120.701V181.906H122.412V180.362Z" fill="#E37056" />
-    <path d="M127.362 180.362H125.651V181.906H127.362V180.362Z" fill="#E37056" />
-    <path d="M132.312 180.362H130.601V181.906H132.312V180.362Z" fill="#E37056" />
-    <path d="M137.263 180.362H135.551V181.906H137.263V180.362Z" fill="#E37056" />
-    <path d="M142.274 180.362H140.563V181.906H142.274V180.362Z" fill="#E37056" />
-    <path d="M147.224 180.362H145.513V181.906H147.224V180.362Z" fill="#E37056" />
-    <path d="M152.174 180.362H150.463V181.906H152.174V180.362Z" fill="#E37056" />
-    <path d="M157.125 180.362H155.414V181.906H157.125V180.362Z" fill="#E37056" />
-    <path d="M117.4 184.002H115.689V185.546H117.4V184.002Z" fill="#E37056" />
-    <path d="M122.412 184.002H120.701V185.546H122.412V184.002Z" fill="#E37056" />
-    <path d="M127.362 184.002H125.651V185.546H127.362V184.002Z" fill="#E37056" />
-    <path d="M132.312 184.002H130.601V185.546H132.312V184.002Z" fill="#E37056" />
-    <path d="M137.263 184.002H135.551V185.546H137.263V184.002Z" fill="#E37056" />
-    <path d="M142.274 184.002H140.563V185.546H142.274V184.002Z" fill="#E37056" />
-    <path d="M147.224 184.002H145.513V185.546H147.224V184.002Z" fill="#E37056" />
-    <path d="M152.174 184.002H150.463V185.546H152.174V184.002Z" fill="#E37056" />
-    <path d="M157.125 184.002H155.414V185.546H157.125V184.002Z" fill="#E37056" />
-    <path d="M117.4 187.642H115.689V189.186H117.4V187.642Z" fill="#E37056" />
-    <path d="M122.412 187.642H120.701V189.186H122.412V187.642Z" fill="#E37056" />
-    <path d="M127.362 187.642H125.651V189.186H127.362V187.642Z" fill="#E37056" />
-    <path d="M132.312 187.642H130.601V189.186H132.312V187.642Z" fill="#E37056" />
-    <path d="M137.263 187.642H135.551V189.186H137.263V187.642Z" fill="#E37056" />
-    <path d="M142.274 187.642H140.563V189.186H142.274V187.642Z" fill="#E37056" />
-    <path d="M147.224 187.642H145.513V189.186H147.224V187.642Z" fill="#E37056" />
-    <path d="M152.174 187.642H150.463V189.186H152.174V187.642Z" fill="#E37056" />
-    <path d="M157.125 187.642H155.414V189.186H157.125V187.642Z" fill="#E37056" />
-    <path d="M117.4 191.226H115.689V192.771H117.4V191.226Z" fill="#E37056" />
-    <path d="M122.412 191.226H120.701V192.771H122.412V191.226Z" fill="#E37056" />
-    <path d="M127.362 191.226H125.651V192.771H127.362V191.226Z" fill="#E37056" />
-    <path d="M132.312 191.226H130.601V192.771H132.312V191.226Z" fill="#E37056" />
-    <path d="M137.263 191.226H135.551V192.771H137.263V191.226Z" fill="#E37056" />
-    <path d="M142.274 191.226H140.563V192.771H142.274V191.226Z" fill="#E37056" />
-    <path d="M147.224 191.226H145.513V192.771H147.224V191.226Z" fill="#E37056" />
-    <path d="M152.174 191.226H150.463V192.771H152.174V191.226Z" fill="#E37056" />
-    <path d="M157.125 191.226H155.414V192.771H157.125V191.226Z" fill="#E37056" />
-    <path d="M117.4 194.866H115.689V196.41H117.4V194.866Z" fill="#E37056" />
-    <path d="M122.412 194.866H120.701V196.41H122.412V194.866Z" fill="#E37056" />
-    <path d="M127.362 194.866H125.651V196.41H127.362V194.866Z" fill="#E37056" />
-    <path d="M132.312 194.866H130.601V196.41H132.312V194.866Z" fill="#E37056" />
-    <path d="M137.263 194.866H135.551V196.41H137.263V194.866Z" fill="#E37056" />
-    <path d="M142.274 194.866H140.563V196.41H142.274V194.866Z" fill="#E37056" />
-    <path d="M147.224 194.866H145.513V196.41H147.224V194.866Z" fill="#E37056" />
-    <path d="M152.174 194.866H150.463V196.41H152.174V194.866Z" fill="#E37056" />
-    <path d="M157.125 194.866H155.414V196.41H157.125V194.866Z" fill="#E37056" />
-    <path d="M117.4 198.506H115.689V200.05H117.4V198.506Z" fill="#E37056" />
-    <path d="M122.412 198.506H120.701V200.05H122.412V198.506Z" fill="#E37056" />
-    <path d="M127.362 198.506H125.651V200.05H127.362V198.506Z" fill="#E37056" />
-    <path d="M132.312 198.506H130.601V200.05H132.312V198.506Z" fill="#E37056" />
-    <path d="M137.263 198.506H135.551V200.05H137.263V198.506Z" fill="#E37056" />
-    <path d="M142.274 198.506H140.563V200.05H142.274V198.506Z" fill="#E37056" />
-    <path d="M147.224 198.506H145.513V200.05H147.224V198.506Z" fill="#E37056" />
-    <path d="M152.174 198.506H150.463V200.05H152.174V198.506Z" fill="#E37056" />
-    <path d="M157.125 198.506H155.414V200.05H157.125V198.506Z" fill="#E37056" />
-    <path d="M117.4 202.091H115.689V203.635H117.4V202.091Z" fill="#E37056" />
-    <path d="M122.412 202.091H120.701V203.635H122.412V202.091Z" fill="#E37056" />
-    <path d="M127.362 202.091H125.651V203.635H127.362V202.091Z" fill="#E37056" />
-    <path d="M132.312 202.091H130.601V203.635H132.312V202.091Z" fill="#E37056" />
-    <path d="M137.263 202.091H135.551V203.635H137.263V202.091Z" fill="#E37056" />
-    <path d="M142.274 202.091H140.563V203.635H142.274V202.091Z" fill="#E37056" />
-    <path d="M147.224 202.091H145.513V203.635H147.224V202.091Z" fill="#E37056" />
-    <path d="M152.174 202.091H150.463V203.635H152.174V202.091Z" fill="#E37056" />
-    <path d="M157.125 202.091H155.414V203.635H157.125V202.091Z" fill="#E37056" />
-    <path d="M117.4 205.73H115.689V207.275H117.4V205.73Z" fill="#E37056" />
-    <path d="M122.412 205.73H120.701V207.275H122.412V205.73Z" fill="#E37056" />
-    <path d="M127.362 205.73H125.651V207.275H127.362V205.73Z" fill="#E37056" />
-    <path d="M132.312 205.73H130.601V207.275H132.312V205.73Z" fill="#E37056" />
-    <path d="M137.263 205.73H135.551V207.275H137.263V205.73Z" fill="#E37056" />
-    <path d="M142.274 205.73H140.563V207.275H142.274V205.73Z" fill="#E37056" />
-    <path d="M147.224 205.73H145.513V207.275H147.224V205.73Z" fill="#E37056" />
-    <path d="M152.174 205.73H150.463V207.275H152.174V205.73Z" fill="#E37056" />
-    <path d="M157.125 205.73H155.414V207.275H157.125V205.73Z" fill="#E37056" />
-    <path d="M117.4 209.37H115.689V210.914H117.4V209.37Z" fill="#E37056" />
-    <path d="M122.412 209.37H120.701V210.914H122.412V209.37Z" fill="#E37056" />
-    <path d="M127.362 209.37H125.651V210.914H127.362V209.37Z" fill="#E37056" />
-    <path d="M132.312 209.37H130.601V210.914H132.312V209.37Z" fill="#E37056" />
-    <path d="M137.263 209.37H135.551V210.914H137.263V209.37Z" fill="#E37056" />
-    <path d="M142.274 209.37H140.563V210.914H142.274V209.37Z" fill="#E37056" />
-    <path d="M147.224 209.37H145.513V210.914H147.224V209.37Z" fill="#E37056" />
-    <path d="M152.174 209.37H150.463V210.914H152.174V209.37Z" fill="#E37056" />
-    <path d="M157.125 209.37H155.414V210.914H157.125V209.37Z" fill="#E37056" />
-    <path d="M117.4 212.955H115.689V214.499H117.4V212.955Z" fill="#E37056" />
-    <path d="M122.412 212.955H120.701V214.499H122.412V212.955Z" fill="#E37056" />
-    <path d="M127.362 212.955H125.651V214.499H127.362V212.955Z" fill="#E37056" />
-    <path d="M132.312 212.955H130.601V214.499H132.312V212.955Z" fill="#E37056" />
-    <path d="M137.263 212.955H135.551V214.499H137.263V212.955Z" fill="#E37056" />
-    <path d="M142.274 212.955H140.563V214.499H142.274V212.955Z" fill="#E37056" />
-    <path d="M147.224 212.955H145.513V214.499H147.224V212.955Z" fill="#E37056" />
-    <path d="M152.174 212.955H150.463V214.499H152.174V212.955Z" fill="#E37056" />
-    <path d="M157.125 212.955H155.414V214.499H157.125V212.955Z" fill="#E37056" />
-    <path d="M117.4 216.595H115.689V218.139H117.4V216.595Z" fill="#E37056" />
-    <path d="M122.412 216.595H120.701V218.139H122.412V216.595Z" fill="#E37056" />
-    <path d="M127.362 216.595H125.651V218.139H127.362V216.595Z" fill="#E37056" />
-    <path d="M132.312 216.595H130.601V218.139H132.312V216.595Z" fill="#E37056" />
-    <path d="M137.263 216.595H135.551V218.139H137.263V216.595Z" fill="#E37056" />
-    <path d="M142.274 216.595H140.563V218.139H142.274V216.595Z" fill="#E37056" />
-    <path d="M147.224 216.595H145.513V218.139H147.224V216.595Z" fill="#E37056" />
-    <path d="M152.174 216.595H150.463V218.139H152.174V216.595Z" fill="#E37056" />
-    <path d="M157.125 216.595H155.414V218.139H157.125V216.595Z" fill="#E37056" />
-    <path d="M122.778 154.442H119.539V157.365H122.778V154.442Z" fill="#E37056" />
-    <path d="M126.568 154.442H123.328V157.365H126.568V154.442Z" fill="#E37056" />
-    <path d="M130.418 154.442H127.179V157.365H130.418V154.442Z" fill="#E37056" />
-    <path d="M134.268 154.442H131.029V157.365H134.268V154.442Z" fill="#E37056" />
-    <path d="M138.057 154.442H134.818V157.365H138.057V154.442Z" fill="#E37056" />
-    <path d="M141.907 154.442H138.668V157.365H141.907V154.442Z" fill="#E37056" />
-    <path d="M145.696 154.442H142.457V157.365H145.696V154.442Z" fill="#E37056" />
-    <path d="M149.546 154.442H146.307V157.365H149.546V154.442Z" fill="#E37056" />
-    <path d="M153.336 154.442H150.097V157.365H153.336V154.442Z" fill="#E37056" />
-    <path d="M157.186 154.442H153.947V157.365H157.186V154.442Z" fill="#E37056" />
-    <path d="M509.998 178.597H476.08V240.474H509.998V178.597Z" fill="#2484C6" />
-    <path d="M250.141 150.968H205.588V241.246H250.141V150.968Z" fill="#2484C6" />
-    <path d="M213.594 157.475H209.377V159.351H213.594V157.475Z" fill="#E37056" />
-    <path d="M220.378 160.288H216.161V162.163H220.378V160.288Z" fill="#E37056" />
-    <path d="M237.368 160.288H233.151V162.163H237.368V160.288Z" fill="#E37056" />
-    <path d="M228.751 157.475H224.534V159.351H228.751V157.475Z" fill="#E37056" />
-    <path d="M245.863 157.475H241.646V159.351H245.863V157.475Z" fill="#E37056" />
-    <path d="M213.594 164.204H209.377V166.079H213.594V164.204Z" fill="#E37056" />
-    <path d="M220.378 167.016H216.161V168.891H220.378V167.016Z" fill="#E37056" />
-    <path d="M237.368 167.016H233.151V168.891H237.368V167.016Z" fill="#E37056" />
-    <path d="M228.751 164.204H224.534V166.079H228.751V164.204Z" fill="#E37056" />
-    <path d="M245.863 164.204H241.646V166.079H245.863V164.204Z" fill="#E37056" />
-    <path d="M213.594 170.932H209.377V172.807H213.594V170.932Z" fill="#E37056" />
-    <path d="M220.378 173.689H216.161V175.564H220.378V173.689Z" fill="#E37056" />
-    <path d="M237.368 173.689H233.151V175.564H237.368V173.689Z" fill="#E37056" />
-    <path d="M228.751 170.932H224.534V172.807H228.751V170.932Z" fill="#E37056" />
-    <path d="M245.863 170.932H241.646V172.807H245.863V170.932Z" fill="#E37056" />
-    <path d="M213.594 177.605H209.377V179.48H213.594V177.605Z" fill="#E37056" />
-    <path d="M220.378 180.417H216.161V182.292H220.378V180.417Z" fill="#E37056" />
-    <path d="M237.368 180.417H233.151V182.292H237.368V180.417Z" fill="#E37056" />
-    <path d="M228.751 177.605H224.534V179.48H228.751V177.605Z" fill="#E37056" />
-    <path d="M245.863 177.605H241.646V179.48H245.863V177.605Z" fill="#E37056" />
-    <path d="M213.594 184.333H209.377V186.208H213.594V184.333Z" fill="#E37056" />
-    <path d="M220.378 187.145H216.161V189.02H220.378V187.145Z" fill="#E37056" />
-    <path d="M237.368 187.145H233.151V189.02H237.368V187.145Z" fill="#E37056" />
-    <path d="M228.751 184.333H224.534V186.208H228.751V184.333Z" fill="#E37056" />
-    <path d="M245.863 184.333H241.646V186.208H245.863V184.333Z" fill="#E37056" />
-    <path d="M213.594 191.061H209.377V192.936H213.594V191.061Z" fill="#E37056" />
-    <path d="M220.378 193.874H216.161V195.749H220.378V193.874Z" fill="#E37056" />
-    <path d="M237.368 193.874H233.151V195.749H237.368V193.874Z" fill="#E37056" />
-    <path d="M228.751 191.061H224.534V192.936H228.751V191.061Z" fill="#E37056" />
-    <path d="M245.863 191.061H241.646V192.936H245.863V191.061Z" fill="#E37056" />
-    <path d="M213.594 197.789H209.377V199.664H213.594V197.789Z" fill="#E37056" />
-    <path d="M220.378 200.602H216.161V202.477H220.378V200.602Z" fill="#E37056" />
-    <path d="M237.368 200.602H233.151V202.477H237.368V200.602Z" fill="#E37056" />
-    <path d="M228.751 197.789H224.534V199.664H228.751V197.789Z" fill="#E37056" />
-    <path d="M245.863 197.789H241.646V199.664H245.863V197.789Z" fill="#E37056" />
-    <path d="M213.594 204.517H209.377V206.392H213.594V204.517Z" fill="#E37056" />
-    <path d="M220.378 207.33H216.161V209.205H220.378V207.33Z" fill="#E37056" />
-    <path d="M237.368 207.33H233.151V209.205H237.368V207.33Z" fill="#E37056" />
-    <path d="M228.751 204.517H224.534V206.392H228.751V204.517Z" fill="#E37056" />
-    <path d="M245.863 204.517H241.646V206.392H245.863V204.517Z" fill="#E37056" />
-    <path d="M213.594 211.245H209.377V213.12H213.594V211.245Z" fill="#E37056" />
-    <path d="M220.378 214.003H216.161V215.878H220.378V214.003Z" fill="#E37056" />
-    <path d="M237.368 214.003H233.151V215.878H237.368V214.003Z" fill="#E37056" />
-    <path d="M228.751 211.245H224.534V213.12H228.751V211.245Z" fill="#E37056" />
-    <path d="M245.863 211.245H241.646V213.12H245.863V211.245Z" fill="#E37056" />
-    <path d="M213.594 217.918H209.377V219.793H213.594V217.918Z" fill="#E37056" />
-    <path d="M220.378 220.731H216.161V222.606H220.378V220.731Z" fill="#E37056" />
-    <path d="M237.368 220.731H233.151V222.606H237.368V220.731Z" fill="#E37056" />
-    <path d="M228.751 217.918H224.534V219.793H228.751V217.918Z" fill="#E37056" />
-    <path d="M245.863 217.918H241.646V219.793H245.863V217.918Z" fill="#E37056" />
-    <path d="M213.594 224.646H209.377V226.521H213.594V224.646Z" fill="#E37056" />
-    <path d="M220.378 227.459H216.161V229.334H220.378V227.459Z" fill="#E37056" />
-    <path d="M237.368 227.459H233.151V229.334H237.368V227.459Z" fill="#E37056" />
-    <path d="M228.751 224.646H224.534V226.521H228.751V224.646Z" fill="#E37056" />
-    <path d="M245.863 224.646H241.646V226.521H245.863V224.646Z" fill="#E37056" />
-    <path d="M476.141 192.55H432.628V241.081H476.141V192.55Z" fill="#2484C6" />
-    <path d="M465.996 185.27H441.306V192.55H465.996V185.27Z" fill="#2484C6" />
-    <path d="M465.996 184.057H441.306V185.27H465.996V184.057Z" fill="#E37056" />
-    <path d="M465.996 178.873H441.306V180.086H465.996V178.873Z" fill="#E37056" />
-    <path d="M464.163 180.086H442.406V184.057H464.163V180.086Z" fill="#2484C6" />
-    <path d="M464.163 180.086H442.406V180.858H464.163V180.086Z" fill="#2484C6" />
-    <path d="M442.406 178.873L448.884 165.527H458.051L464.957 178.873H442.406Z" fill="#E37056" />
-    <path
-      d="M531.877 158.964L514.765 181.741V240.364H531.877H549.05V181.741L531.877 158.964Z"
-      fill="#2484C6"
-    />
-    <path d="M549.05 189.241H514.765V189.958H549.05V189.241Z" fill="#E37056" />
-    <path d="M549.05 190.785H514.765V191.502H549.05V190.785Z" fill="#E37056" />
-    <path d="M549.05 192.385H514.765V193.101H549.05V192.385Z" fill="#E37056" />
-    <path d="M549.05 193.984H514.765V194.701H549.05V193.984Z" fill="#E37056" />
-    <path d="M549.05 195.528H514.765V196.245H549.05V195.528Z" fill="#E37056" />
-    <path d="M549.05 197.127H514.765V197.844H549.05V197.127Z" fill="#E37056" />
-    <path d="M549.05 198.671H514.765V199.388H549.05V198.671Z" fill="#E37056" />
-    <path d="M549.05 200.271H514.765V200.988H549.05V200.271Z" fill="#E37056" />
-    <path d="M549.05 201.87H514.765V202.587H549.05V201.87Z" fill="#E37056" />
-    <path d="M549.05 203.414H514.765V204.131H549.05V203.414Z" fill="#E37056" />
-    <path d="M549.05 205.014H514.765V205.73H549.05V205.014Z" fill="#E37056" />
-    <path d="M549.05 206.613H514.765V207.33H549.05V206.613Z" fill="#E37056" />
-    <path d="M549.05 208.157H514.765V208.874H549.05V208.157Z" fill="#E37056" />
-    <path d="M549.05 209.756H514.765V210.473H549.05V209.756Z" fill="#E37056" />
-    <path d="M549.05 211.3H514.765V212.017H549.05V211.3Z" fill="#E37056" />
-    <path d="M549.05 212.9H514.765V213.617H549.05V212.9Z" fill="#E37056" />
-    <path d="M549.05 214.499H514.765V215.216H549.05V214.499Z" fill="#E37056" />
-    <path d="M549.05 216.043H514.765V216.76H549.05V216.043Z" fill="#E37056" />
-    <path d="M549.05 217.643H514.765V218.36H549.05V217.643Z" fill="#E37056" />
-    <path d="M549.05 219.187H514.765V219.904H549.05V219.187Z" fill="#E37056" />
-    <path d="M549.05 220.786H514.765V221.503H549.05V220.786Z" fill="#E37056" />
-    <path d="M549.05 222.385H514.765V223.102H549.05V222.385Z" fill="#E37056" />
-    <path d="M549.05 223.93H514.765V224.646H549.05V223.93Z" fill="#E37056" />
-    <path d="M549.05 225.529H514.765V226.246H549.05V225.529Z" fill="#E37056" />
-    <path d="M549.05 227.128H514.765V227.845H549.05V227.128Z" fill="#E37056" />
-    <path d="M549.05 228.672H514.765V229.389H549.05V228.672Z" fill="#E37056" />
-    <path d="M549.05 230.272H514.765V230.989H549.05V230.272Z" fill="#E37056" />
-    <path d="M549.05 231.816H514.765V232.533H549.05V231.816Z" fill="#E37056" />
-    <path d="M549.05 233.415H514.765V234.132H549.05V233.415Z" fill="#E37056" />
-    <path d="M549.05 235.014H514.765V235.731H549.05V235.014Z" fill="#E37056" />
-    <path d="M549.05 236.559H514.765V237.275H549.05V236.559Z" fill="#E37056" />
-    <path
-      d="M549.05 181.741L531.877 158.964L514.765 181.741L530.594 206.282L549.05 181.741Z"
-      fill="#1073AA"
-    />
-    <path
-      d="M578.568 240.75V162.218L590.975 141.593L603.747 160.84V240.75H578.568Z" fill="#2484C6"
-    />
-    <path d="M587.552 161.832H594.825L591.036 143.026L587.552 161.832Z" fill="#E37056" />
-    <path d="M635.894 120.802H605.581V241.081H635.894V120.802Z" fill="#2484C6" />
-    <path opacity="0.6" d="M182.059 188.303H169.531V240.695H182.059V188.303Z" fill="#2484C6" />
-    <path d="M250.141 150.968H205.588V153.064H250.141V150.968Z" fill="#2484C6" />
-    <path d="M252.096 147.99H203.572V151.74H252.096V147.99Z" fill="#2484C6" />
-    <path
-      opacity="0.4"
-      d="M228.751 241.246V147.99H203.572V151.685H205.588V241.246H228.751Z"
-      fill="#2484C6"
-    />
-    <path d="M331.606 121.298H291.759V124.166H331.606V121.298Z" fill="#2484C6" />
-    <path d="M336.801 199.664H334.173V209.701H336.801V199.664Z" fill="#2484C6" />
-    <path d="M336.801 199.664H334.173V205.014H336.801V199.664Z" fill="#2484C6" />
-    <path d="M338.94 211.962H337.106V213.672H338.94V211.962Z" fill="#E37056" />
-    <path d="M343.34 211.962H341.506V213.672H343.34V211.962Z" fill="#E37056" />
-    <path d="M347.801 211.962H345.968V213.672H347.801V211.962Z" fill="#E37056" />
-    <path d="M352.201 211.962H350.368V213.672H352.201V211.962Z" fill="#E37056" />
-    <path d="M356.602 211.962H354.768V213.672H356.602V211.962Z" fill="#E37056" />
-    <path d="M361.002 211.962H359.168V213.672H361.002V211.962Z" fill="#E37056" />
-    <path d="M365.402 211.962H363.569V213.672H365.402V211.962Z" fill="#E37056" />
-    <path d="M339.795 217.146H337.473V219.242H339.795V217.146Z" fill="#E37056" />
-    <path d="M345.234 217.146H342.912V219.242H345.234V217.146Z" fill="#E37056" />
-    <path d="M350.673 217.146H348.351V219.242H350.673V217.146Z" fill="#E37056" />
-    <path d="M356.052 217.146H353.79V219.242H356.052V217.146Z" fill="#E37056" />
-    <path d="M361.552 217.146H359.229V219.242H361.552V217.146Z" fill="#E37056" />
-    <path d="M366.991 217.146H364.669V219.242H366.991V217.146Z" fill="#E37056" />
-    <path d="M372.43 217.146H370.108V219.242H372.43V217.146Z" fill="#E37056" />
-    <path d="M480.175 181.52H478.769V183.175H480.175V181.52Z" fill="#E37056" />
-    <path d="M483.536 181.52H482.13V183.175H483.536V181.52Z" fill="#E37056" />
-    <path d="M486.836 181.52H485.43V183.175H486.836V181.52Z" fill="#E37056" />
-    <path d="M490.197 181.52H488.792V183.175H490.197V181.52Z" fill="#E37056" />
-    <path d="M493.498 181.52H492.092V183.175H493.498V181.52Z" fill="#E37056" />
-    <path d="M496.859 181.52H495.453V183.175H496.859V181.52Z" fill="#E37056" />
-    <path d="M500.22 181.52H498.814V183.175H500.22V181.52Z" fill="#E37056" />
-    <path d="M503.337 181.52H501.931V183.175H503.337V181.52Z" fill="#E37056" />
-    <path d="M507.493 181.52H506.087V183.175H507.493V181.52Z" fill="#E37056" />
-    <path d="M480.175 184.774H478.769V186.428H480.175V184.774Z" fill="#E37056" />
-    <path d="M483.536 184.774H482.13V186.428H483.536V184.774Z" fill="#E37056" />
-    <path d="M486.836 184.774H485.43V186.428H486.836V184.774Z" fill="#E37056" />
-    <path d="M490.197 184.774H488.792V186.428H490.197V184.774Z" fill="#E37056" />
-    <path d="M493.498 184.774H492.092V186.428H493.498V184.774Z" fill="#E37056" />
-    <path d="M496.859 184.774H495.453V186.428H496.859V184.774Z" fill="#E37056" />
-    <path d="M500.22 184.774H498.814V186.428H500.22V184.774Z" fill="#E37056" />
-    <path d="M503.337 184.774H501.931V186.428H503.337V184.774Z" fill="#E37056" />
-    <path d="M507.493 184.774H506.087V186.428H507.493V184.774Z" fill="#E37056" />
-    <path d="M480.175 188.083H478.769V189.737H480.175V188.083Z" fill="#E37056" />
-    <path d="M483.536 188.083H482.13V189.737H483.536V188.083Z" fill="#E37056" />
-    <path d="M486.836 188.083H485.43V189.737H486.836V188.083Z" fill="#E37056" />
-    <path d="M490.197 188.083H488.792V189.737H490.197V188.083Z" fill="#E37056" />
-    <path d="M493.498 188.083H492.092V189.737H493.498V188.083Z" fill="#E37056" />
-    <path d="M496.859 188.083H495.453V189.737H496.859V188.083Z" fill="#E37056" />
-    <path d="M500.22 188.083H498.814V189.737H500.22V188.083Z" fill="#E37056" />
-    <path d="M503.337 188.083H501.931V189.737H503.337V188.083Z" fill="#E37056" />
-    <path d="M507.493 188.083H506.087V189.737H507.493V188.083Z" fill="#E37056" />
-    <path d="M480.175 191.392H478.769V193.046H480.175V191.392Z" fill="#E37056" />
-    <path d="M483.536 191.392H482.13V193.046H483.536V191.392Z" fill="#E37056" />
-    <path d="M486.836 191.392H485.43V193.046H486.836V191.392Z" fill="#E37056" />
-    <path d="M490.197 191.392H488.792V193.046H490.197V191.392Z" fill="#E37056" />
-    <path d="M493.498 191.392H492.092V193.046H493.498V191.392Z" fill="#E37056" />
-    <path d="M496.859 191.392H495.453V193.046H496.859V191.392Z" fill="#E37056" />
-    <path d="M500.22 191.392H498.814V193.046H500.22V191.392Z" fill="#E37056" />
-    <path d="M503.337 191.392H501.931V193.046H503.337V191.392Z" fill="#E37056" />
-    <path d="M507.493 191.392H506.087V193.046H507.493V191.392Z" fill="#E37056" />
-    <path d="M480.175 194.646H478.769V196.3H480.175V194.646Z" fill="#E37056" />
-    <path d="M483.536 194.646H482.13V196.3H483.536V194.646Z" fill="#E37056" />
-    <path d="M486.836 194.646H485.43V196.3H486.836V194.646Z" fill="#E37056" />
-    <path d="M490.197 194.646H488.792V196.3H490.197V194.646Z" fill="#E37056" />
-    <path d="M493.498 194.646H492.092V196.3H493.498V194.646Z" fill="#E37056" />
-    <path d="M496.859 194.646H495.453V196.3H496.859V194.646Z" fill="#E37056" />
-    <path d="M500.22 194.646H498.814V196.3H500.22V194.646Z" fill="#E37056" />
-    <path d="M503.337 194.646H501.931V196.3H503.337V194.646Z" fill="#E37056" />
-    <path d="M507.493 194.646H506.087V196.3H507.493V194.646Z" fill="#E37056" />
-    <path d="M480.175 197.954H478.769V199.609H480.175V197.954Z" fill="#E37056" />
-    <path d="M483.536 197.954H482.13V199.609H483.536V197.954Z" fill="#E37056" />
-    <path d="M486.836 197.954H485.43V199.609H486.836V197.954Z" fill="#E37056" />
-    <path d="M490.197 197.954H488.792V199.609H490.197V197.954Z" fill="#E37056" />
-    <path d="M493.498 197.954H492.092V199.609H493.498V197.954Z" fill="#E37056" />
-    <path d="M496.859 197.954H495.453V199.609H496.859V197.954Z" fill="#E37056" />
-    <path d="M500.22 197.954H498.814V199.609H500.22V197.954Z" fill="#E37056" />
-    <path d="M503.337 197.954H501.931V199.609H503.337V197.954Z" fill="#E37056" />
-    <path d="M507.493 197.954H506.087V199.609H507.493V197.954Z" fill="#E37056" />
-    <path d="M480.175 201.263H478.769V202.918H480.175V201.263Z" fill="#E37056" />
-    <path d="M483.536 201.263H482.13V202.918H483.536V201.263Z" fill="#E37056" />
-    <path d="M486.836 201.263H485.43V202.918H486.836V201.263Z" fill="#E37056" />
-    <path d="M490.197 201.263H488.792V202.918H490.197V201.263Z" fill="#E37056" />
-    <path d="M493.498 201.263H492.092V202.918H493.498V201.263Z" fill="#E37056" />
-    <path d="M496.859 201.263H495.453V202.918H496.859V201.263Z" fill="#E37056" />
-    <path d="M500.22 201.263H498.814V202.918H500.22V201.263Z" fill="#E37056" />
-    <path d="M503.337 201.263H501.931V202.918H503.337V201.263Z" fill="#E37056" />
-    <path d="M507.493 201.263H506.087V202.918H507.493V201.263Z" fill="#E37056" />
-    <path d="M480.175 204.517H478.769V206.172H480.175V204.517Z" fill="#E37056" />
-    <path d="M483.536 204.517H482.13V206.172H483.536V204.517Z" fill="#E37056" />
-    <path d="M486.836 204.517H485.43V206.172H486.836V204.517Z" fill="#E37056" />
-    <path d="M490.197 204.517H488.792V206.172H490.197V204.517Z" fill="#E37056" />
-    <path d="M493.498 204.517H492.092V206.172H493.498V204.517Z" fill="#E37056" />
-    <path d="M496.859 204.517H495.453V206.172H496.859V204.517Z" fill="#E37056" />
-    <path d="M500.22 204.517H498.814V206.172H500.22V204.517Z" fill="#E37056" />
-    <path d="M503.337 204.517H501.931V206.172H503.337V204.517Z" fill="#E37056" />
-    <path d="M507.493 204.517H506.087V206.172H507.493V204.517Z" fill="#E37056" />
-    <path d="M480.175 207.826H478.769V209.481H480.175V207.826Z" fill="#E37056" />
-    <path d="M483.536 207.826H482.13V209.481H483.536V207.826Z" fill="#E37056" />
-    <path d="M486.836 207.826H485.43V209.481H486.836V207.826Z" fill="#E37056" />
-    <path d="M490.197 207.826H488.792V209.481H490.197V207.826Z" fill="#E37056" />
-    <path d="M493.498 207.826H492.092V209.481H493.498V207.826Z" fill="#E37056" />
-    <path d="M496.859 207.826H495.453V209.481H496.859V207.826Z" fill="#E37056" />
-    <path d="M500.22 207.826H498.814V209.481H500.22V207.826Z" fill="#E37056" />
-    <path d="M503.337 207.826H501.931V209.481H503.337V207.826Z" fill="#E37056" />
-    <path d="M507.493 207.826H506.087V209.481H507.493V207.826Z" fill="#E37056" />
-    <path d="M480.175 211.135H478.769V212.789H480.175V211.135Z" fill="#E37056" />
-    <path d="M483.536 211.135H482.13V212.789H483.536V211.135Z" fill="#E37056" />
-    <path d="M486.836 211.135H485.43V212.789H486.836V211.135Z" fill="#E37056" />
-    <path d="M490.197 211.135H488.792V212.789H490.197V211.135Z" fill="#E37056" />
-    <path d="M493.498 211.135H492.092V212.789H493.498V211.135Z" fill="#E37056" />
-    <path d="M496.859 211.135H495.453V212.789H496.859V211.135Z" fill="#E37056" />
-    <path d="M500.22 211.135H498.814V212.789H500.22V211.135Z" fill="#E37056" />
-    <path d="M503.337 211.135H501.931V212.789H503.337V211.135Z" fill="#E37056" />
-    <path d="M507.493 211.135H506.087V212.789H507.493V211.135Z" fill="#E37056" />
-    <path d="M480.175 214.389H478.769V216.043H480.175V214.389Z" fill="#E37056" />
-    <path d="M483.536 214.389H482.13V216.043H483.536V214.389Z" fill="#E37056" />
-    <path d="M486.836 214.389H485.43V216.043H486.836V214.389Z" fill="#E37056" />
-    <path d="M490.197 214.389H488.792V216.043H490.197V214.389Z" fill="#E37056" />
-    <path d="M493.498 214.389H492.092V216.043H493.498V214.389Z" fill="#E37056" />
-    <path d="M496.859 214.389H495.453V216.043H496.859V214.389Z" fill="#E37056" />
-    <path d="M500.22 214.389H498.814V216.043H500.22V214.389Z" fill="#E37056" />
-    <path d="M503.337 214.389H501.931V216.043H503.337V214.389Z" fill="#E37056" />
-    <path d="M507.493 214.389H506.087V216.043H507.493V214.389Z" fill="#E37056" />
-    <path d="M480.175 217.698H478.769V219.352H480.175V217.698Z" fill="#E37056" />
-    <path d="M483.536 217.698H482.13V219.352H483.536V217.698Z" fill="#E37056" />
-    <path d="M486.836 217.698H485.43V219.352H486.836V217.698Z" fill="#E37056" />
-    <path d="M490.197 217.698H488.792V219.352H490.197V217.698Z" fill="#E37056" />
-    <path d="M493.498 217.698H492.092V219.352H493.498V217.698Z" fill="#E37056" />
-    <path d="M496.859 217.698H495.453V219.352H496.859V217.698Z" fill="#E37056" />
-    <path d="M500.22 217.698H498.814V219.352H500.22V217.698Z" fill="#E37056" />
-    <path d="M503.337 217.698H501.931V219.352H503.337V217.698Z" fill="#E37056" />
-    <path d="M507.493 217.698H506.087V219.352H507.493V217.698Z" fill="#E37056" />
-    <path d="M360.88 197.844H334.173V203.911H360.88V197.844Z" fill="#2484C6" />
-    <path d="M337.84 199.333H336.312V200.712H337.84V199.333Z" fill="#E37056" />
-    <path d="M341.384 199.333H339.856V200.712H341.384V199.333Z" fill="#E37056" />
-    <path d="M344.929 199.333H343.401V200.712H344.929V199.333Z" fill="#E37056" />
-    <path d="M348.473 199.333H346.946V200.712H348.473V199.333Z" fill="#E37056" />
-    <path d="M352.079 199.333H350.551V200.712H352.079V199.333Z" fill="#E37056" />
-    <path d="M355.624 199.333H354.096V200.712H355.624V199.333Z" fill="#E37056" />
-    <path d="M359.168 199.333H357.641V200.712H359.168V199.333Z" fill="#E37056" />
-    <path opacity="0.5" d="M368.274 212.459H334.173V215.216H368.274V212.459Z" fill="#2484C6" />
-    <path d="M446.317 186.594H443.811V188.028H446.317V186.594Z" fill="#E37056" />
-    <path d="M449.617 186.594H447.112V188.028H449.617V186.594Z" fill="#E37056" />
-    <path d="M452.918 186.594H450.412V188.028H452.918V186.594Z" fill="#E37056" />
-    <path d="M456.157 186.594H453.651V188.028H456.157V186.594Z" fill="#E37056" />
-    <path d="M459.457 186.594H456.951V188.028H459.457V186.594Z" fill="#E37056" />
-    <path d="M462.757 186.594H460.251V188.028H462.757V186.594Z" fill="#E37056" />
-    <path d="M446.317 188.524H443.811V189.958H446.317V188.524Z" fill="#E37056" />
-    <path d="M449.617 188.524H447.112V189.958H449.617V188.524Z" fill="#E37056" />
-    <path d="M452.918 188.524H450.412V189.958H452.918V188.524Z" fill="#E37056" />
-    <path d="M456.157 188.524H453.651V189.958H456.157V188.524Z" fill="#E37056" />
-    <path d="M459.457 188.524H456.951V189.958H459.457V188.524Z" fill="#E37056" />
-    <path d="M462.757 188.524H460.251V189.958H462.757V188.524Z" fill="#E37056" />
-    <path d="M446.317 190.454H443.811V191.888H446.317V190.454Z" fill="#E37056" />
-    <path d="M449.617 190.454H447.112V191.888H449.617V190.454Z" fill="#E37056" />
-    <path d="M452.918 190.454H450.412V191.888H452.918V190.454Z" fill="#E37056" />
-    <path d="M456.157 190.454H453.651V191.888H456.157V190.454Z" fill="#E37056" />
-    <path d="M459.457 190.454H456.951V191.888H459.457V190.454Z" fill="#E37056" />
-    <path d="M462.757 190.454H460.251V191.888H462.757V190.454Z" fill="#E37056" />
-    <path opacity="0.5" d="M465.996 190.454H441.306V192.55H465.996V190.454Z" fill="#2484C6" />
-    <path d="M444.362 195.473H434.767V198.892H444.362V195.473Z" fill="#E37056" />
-    <path d="M454.69 195.473H445.095V198.892H454.69V195.473Z" fill="#E37056" />
-    <path d="M464.957 195.473H455.362V198.892H464.957V195.473Z" fill="#E37056" />
-    <path d="M475.224 195.473H465.629V198.892H475.224V195.473Z" fill="#E37056" />
-    <path d="M444.362 199.609H434.767V203.028H444.362V199.609Z" fill="#E37056" />
-    <path d="M454.69 199.609H445.095V203.028H454.69V199.609Z" fill="#E37056" />
-    <path d="M464.957 199.609H455.362V203.028H464.957V199.609Z" fill="#E37056" />
-    <path d="M475.224 199.609H465.629V203.028H475.224V199.609Z" fill="#E37056" />
-    <path d="M444.362 203.8H434.767V207.219H444.362V203.8Z" fill="#E37056" />
-    <path d="M454.69 203.8H445.095V207.219H454.69V203.8Z" fill="#E37056" />
-    <path d="M464.957 203.8H455.362V207.219H464.957V203.8Z" fill="#E37056" />
-    <path d="M475.224 203.8H465.629V207.219H475.224V203.8Z" fill="#E37056" />
-    <path d="M444.362 207.936H434.767V211.356H444.362V207.936Z" fill="#E37056" />
-    <path d="M454.69 207.936H445.095V211.356H454.69V207.936Z" fill="#E37056" />
-    <path d="M464.957 207.936H455.362V211.356H464.957V207.936Z" fill="#E37056" />
-    <path d="M475.224 207.936H465.629V211.356H475.224V207.936Z" fill="#E37056" />
-    <path d="M444.362 212.073H434.767V215.492H444.362V212.073Z" fill="#E37056" />
-    <path d="M454.69 212.073H445.095V215.492H454.69V212.073Z" fill="#E37056" />
-    <path d="M464.957 212.073H455.362V215.492H464.957V212.073Z" fill="#E37056" />
-    <path d="M475.224 212.073H465.629V215.492H475.224V212.073Z" fill="#E37056" />
-    <path d="M444.362 216.209H434.767V219.628H444.362V216.209Z" fill="#E37056" />
-    <path d="M454.69 216.209H445.095V219.628H454.69V216.209Z" fill="#E37056" />
-    <path d="M464.957 216.209H455.362V219.628H464.957V216.209Z" fill="#E37056" />
-    <path d="M475.224 216.209H465.629V219.628H475.224V216.209Z" fill="#E37056" />
-    <path opacity="0.6" d="M476.141 192.55H467.402V240.474H476.141V192.55Z" fill="#2484C6" />
-    <path d="M569.646 126.647H559.745V134.313H569.646V126.647Z" fill="#2484C6" />
-    <path d="M569.646 130.287H559.745V133.431H569.646V130.287Z" fill="#2484C6" />
-    <path d="M566.468 110.379H564.695V128.853H566.468V110.379Z" fill="#2484C6" />
-    <path d="M573.863 132.383H550.578V240.474H573.863V132.383Z" fill="#2484C6" />
-    <path d="M573.863 131.17H550.578V239.261H573.863V131.17Z" fill="#2484C6" />
-    <path d="M553.023 140.765H551.678V142.034H553.023V140.765Z" fill="#E37056" />
-    <path d="M556.262 140.765H554.917V142.034H556.262V140.765Z" fill="#E37056" />
-    <path d="M559.501 140.765H558.156V142.034H559.501V140.765Z" fill="#E37056" />
-    <path d="M562.74 140.765H561.396V142.034H562.74V140.765Z" fill="#E37056" />
-    <path d="M565.979 140.765H564.634V142.034H565.979V140.765Z" fill="#E37056" />
-    <path d="M569.157 140.765H567.812V142.034H569.157V140.765Z" fill="#E37056" />
-    <path d="M572.396 140.765H571.052V142.034H572.396V140.765Z" fill="#E37056" />
-    <path d="M553.023 143.743H551.678V145.012H553.023V143.743Z" fill="#E37056" />
-    <path d="M556.262 143.743H554.917V145.012H556.262V143.743Z" fill="#E37056" />
-    <path d="M559.501 143.743H558.156V145.012H559.501V143.743Z" fill="#E37056" />
-    <path d="M562.74 143.743H561.396V145.012H562.74V143.743Z" fill="#E37056" />
-    <path d="M565.979 143.743H564.634V145.012H565.979V143.743Z" fill="#E37056" />
-    <path d="M569.157 143.743H567.812V145.012H569.157V143.743Z" fill="#E37056" />
-    <path d="M572.396 143.743H571.052V145.012H572.396V143.743Z" fill="#E37056" />
-    <path d="M553.023 149.865H551.678V151.133H553.023V149.865Z" fill="#E37056" />
-    <path d="M556.262 149.865H554.917V151.133H556.262V149.865Z" fill="#E37056" />
-    <path d="M559.501 149.865H558.156V151.133H559.501V149.865Z" fill="#E37056" />
-    <path d="M562.74 149.865H561.396V151.133H562.74V149.865Z" fill="#E37056" />
-    <path d="M565.979 149.865H564.634V151.133H565.979V149.865Z" fill="#E37056" />
-    <path d="M569.157 149.865H567.812V151.133H569.157V149.865Z" fill="#E37056" />
-    <path d="M572.396 149.865H571.052V151.133H572.396V149.865Z" fill="#E37056" />
-    <path d="M553.023 152.843H551.678V154.111H553.023V152.843Z" fill="#E37056" />
-    <path d="M556.262 152.843H554.917V154.111H556.262V152.843Z" fill="#E37056" />
-    <path d="M559.501 152.843H558.156V154.111H559.501V152.843Z" fill="#E37056" />
-    <path d="M562.74 152.843H561.396V154.111H562.74V152.843Z" fill="#E37056" />
-    <path d="M565.979 152.843H564.634V154.111H565.979V152.843Z" fill="#E37056" />
-    <path d="M569.157 152.843H567.812V154.111H569.157V152.843Z" fill="#E37056" />
-    <path d="M572.396 152.843H571.052V154.111H572.396V152.843Z" fill="#E37056" />
-    <path d="M553.023 158.964H551.678V160.233H553.023V158.964Z" fill="#E37056" />
-    <path d="M556.262 158.964H554.917V160.233H556.262V158.964Z" fill="#E37056" />
-    <path d="M559.501 158.964H558.156V160.233H559.501V158.964Z" fill="#E37056" />
-    <path d="M562.74 158.964H561.396V160.233H562.74V158.964Z" fill="#E37056" />
-    <path d="M565.979 158.964H564.634V160.233H565.979V158.964Z" fill="#E37056" />
-    <path d="M569.157 158.964H567.812V160.233H569.157V158.964Z" fill="#E37056" />
-    <path d="M572.396 158.964H571.052V160.233H572.396V158.964Z" fill="#E37056" />
-    <path d="M553.023 161.942H551.678V163.211H553.023V161.942Z" fill="#E37056" />
-    <path d="M556.262 161.942H554.917V163.211H556.262V161.942Z" fill="#E37056" />
-    <path d="M559.501 161.942H558.156V163.211H559.501V161.942Z" fill="#E37056" />
-    <path d="M562.74 161.942H561.396V163.211H562.74V161.942Z" fill="#E37056" />
-    <path d="M565.979 161.942H564.634V163.211H565.979V161.942Z" fill="#E37056" />
-    <path d="M569.157 161.942H567.812V163.211H569.157V161.942Z" fill="#E37056" />
-    <path d="M572.396 161.942H571.052V163.211H572.396V161.942Z" fill="#E37056" />
-    <path d="M553.023 168.064H551.678V169.332H553.023V168.064Z" fill="#E37056" />
-    <path d="M556.262 168.064H554.917V169.332H556.262V168.064Z" fill="#E37056" />
-    <path d="M559.501 168.064H558.156V169.332H559.501V168.064Z" fill="#E37056" />
-    <path d="M562.74 168.064H561.396V169.332H562.74V168.064Z" fill="#E37056" />
-    <path d="M565.979 168.064H564.634V169.332H565.979V168.064Z" fill="#E37056" />
-    <path d="M569.157 168.064H567.812V169.332H569.157V168.064Z" fill="#E37056" />
-    <path d="M572.396 168.064H571.052V169.332H572.396V168.064Z" fill="#E37056" />
-    <path d="M553.023 171.042H551.678V172.31H553.023V171.042Z" fill="#E37056" />
-    <path d="M556.262 171.042H554.917V172.31H556.262V171.042Z" fill="#E37056" />
-    <path d="M559.501 171.042H558.156V172.31H559.501V171.042Z" fill="#E37056" />
-    <path d="M562.74 171.042H561.396V172.31H562.74V171.042Z" fill="#E37056" />
-    <path d="M565.979 171.042H564.634V172.31H565.979V171.042Z" fill="#E37056" />
-    <path d="M569.157 171.042H567.812V172.31H569.157V171.042Z" fill="#E37056" />
-    <path d="M572.396 171.042H571.052V172.31H572.396V171.042Z" fill="#E37056" />
-    <path d="M553.023 177.163H551.678V178.432H553.023V177.163Z" fill="#E37056" />
-    <path d="M556.262 177.163H554.917V178.432H556.262V177.163Z" fill="#E37056" />
-    <path d="M559.501 177.163H558.156V178.432H559.501V177.163Z" fill="#E37056" />
-    <path d="M562.74 177.163H561.396V178.432H562.74V177.163Z" fill="#E37056" />
-    <path d="M565.979 177.163H564.634V178.432H565.979V177.163Z" fill="#E37056" />
-    <path d="M569.157 177.163H567.812V178.432H569.157V177.163Z" fill="#E37056" />
-    <path d="M572.396 177.163H571.052V178.432H572.396V177.163Z" fill="#E37056" />
-    <path d="M553.023 180.141H551.678V181.41H553.023V180.141Z" fill="#E37056" />
-    <path d="M556.262 180.141H554.917V181.41H556.262V180.141Z" fill="#E37056" />
-    <path d="M559.501 180.141H558.156V181.41H559.501V180.141Z" fill="#E37056" />
-    <path d="M562.74 180.141H561.396V181.41H562.74V180.141Z" fill="#E37056" />
-    <path d="M565.979 180.141H564.634V181.41H565.979V180.141Z" fill="#E37056" />
-    <path d="M569.157 180.141H567.812V181.41H569.157V180.141Z" fill="#E37056" />
-    <path d="M572.396 180.141H571.052V181.41H572.396V180.141Z" fill="#E37056" />
-    <path d="M553.023 186.263H551.678V187.531H553.023V186.263Z" fill="#E37056" />
-    <path d="M556.262 186.263H554.917V187.531H556.262V186.263Z" fill="#E37056" />
-    <path d="M559.501 186.263H558.156V187.531H559.501V186.263Z" fill="#E37056" />
-    <path d="M562.74 186.263H561.396V187.531H562.74V186.263Z" fill="#E37056" />
-    <path d="M565.979 186.263H564.634V187.531H565.979V186.263Z" fill="#E37056" />
-    <path d="M569.157 186.263H567.812V187.531H569.157V186.263Z" fill="#E37056" />
-    <path d="M572.396 186.263H571.052V187.531H572.396V186.263Z" fill="#E37056" />
-    <path d="M553.023 189.241H551.678V190.509H553.023V189.241Z" fill="#E37056" />
-    <path d="M556.262 189.241H554.917V190.509H556.262V189.241Z" fill="#E37056" />
-    <path d="M559.501 189.241H558.156V190.509H559.501V189.241Z" fill="#E37056" />
-    <path d="M562.74 189.241H561.396V190.509H562.74V189.241Z" fill="#E37056" />
-    <path d="M565.979 189.241H564.634V190.509H565.979V189.241Z" fill="#E37056" />
-    <path d="M569.157 189.241H567.812V190.509H569.157V189.241Z" fill="#E37056" />
-    <path d="M572.396 189.241H571.052V190.509H572.396V189.241Z" fill="#E37056" />
-    <path d="M553.023 195.307H551.678V196.576H553.023V195.307Z" fill="#E37056" />
-    <path d="M556.262 195.307H554.917V196.576H556.262V195.307Z" fill="#E37056" />
-    <path d="M559.501 195.307H558.156V196.576H559.501V195.307Z" fill="#E37056" />
-    <path d="M562.74 195.307H561.396V196.576H562.74V195.307Z" fill="#E37056" />
-    <path d="M565.979 195.307H564.634V196.576H565.979V195.307Z" fill="#E37056" />
-    <path d="M569.157 195.307H567.812V196.576H569.157V195.307Z" fill="#E37056" />
-    <path d="M572.396 195.307H571.052V196.576H572.396V195.307Z" fill="#E37056" />
-    <path d="M553.023 198.341H551.678V199.609H553.023V198.341Z" fill="#E37056" />
-    <path d="M556.262 198.341H554.917V199.609H556.262V198.341Z" fill="#E37056" />
-    <path d="M559.501 198.341H558.156V199.609H559.501V198.341Z" fill="#E37056" />
-    <path d="M562.74 198.341H561.396V199.609H562.74V198.341Z" fill="#E37056" />
-    <path d="M565.979 198.341H564.634V199.609H565.979V198.341Z" fill="#E37056" />
-    <path d="M569.157 198.341H567.812V199.609H569.157V198.341Z" fill="#E37056" />
-    <path d="M572.396 198.341H571.052V199.609H572.396V198.341Z" fill="#E37056" />
-    <path d="M553.023 204.407H551.678V205.675H553.023V204.407Z" fill="#E37056" />
-    <path d="M556.262 204.407H554.917V205.675H556.262V204.407Z" fill="#E37056" />
-    <path d="M559.501 204.407H558.156V205.675H559.501V204.407Z" fill="#E37056" />
-    <path d="M562.74 204.407H561.396V205.675H562.74V204.407Z" fill="#E37056" />
-    <path d="M565.979 204.407H564.634V205.675H565.979V204.407Z" fill="#E37056" />
-    <path d="M569.157 204.407H567.812V205.675H569.157V204.407Z" fill="#E37056" />
-    <path d="M572.396 204.407H571.052V205.675H572.396V204.407Z" fill="#E37056" />
-    <path d="M553.023 207.44H551.678V208.708H553.023V207.44Z" fill="#E37056" />
-    <path d="M556.262 207.44H554.917V208.708H556.262V207.44Z" fill="#E37056" />
-    <path d="M559.501 207.44H558.156V208.708H559.501V207.44Z" fill="#E37056" />
-    <path d="M562.74 207.44H561.396V208.708H562.74V207.44Z" fill="#E37056" />
-    <path d="M565.979 207.44H564.634V208.708H565.979V207.44Z" fill="#E37056" />
-    <path d="M569.157 207.44H567.812V208.708H569.157V207.44Z" fill="#E37056" />
-    <path d="M572.396 207.44H571.052V208.708H572.396V207.44Z" fill="#E37056" />
-    <path d="M553.023 213.506H551.678V214.775H553.023V213.506Z" fill="#E37056" />
-    <path d="M556.262 213.506H554.917V214.775H556.262V213.506Z" fill="#E37056" />
-    <path d="M559.501 213.506H558.156V214.775H559.501V213.506Z" fill="#E37056" />
-    <path d="M562.74 213.506H561.396V214.775H562.74V213.506Z" fill="#E37056" />
-    <path d="M565.979 213.506H564.634V214.775H565.979V213.506Z" fill="#E37056" />
-    <path d="M569.157 213.506H567.812V214.775H569.157V213.506Z" fill="#E37056" />
-    <path d="M572.396 213.506H571.052V214.775H572.396V213.506Z" fill="#E37056" />
-    <path d="M553.023 216.484H551.678V217.753H553.023V216.484Z" fill="#E37056" />
-    <path d="M556.262 216.484H554.917V217.753H556.262V216.484Z" fill="#E37056" />
-    <path d="M559.501 216.484H558.156V217.753H559.501V216.484Z" fill="#E37056" />
-    <path d="M562.74 216.484H561.396V217.753H562.74V216.484Z" fill="#E37056" />
-    <path d="M565.979 216.484H564.634V217.753H565.979V216.484Z" fill="#E37056" />
-    <path d="M569.157 216.484H567.812V217.753H569.157V216.484Z" fill="#E37056" />
-    <path d="M572.396 216.484H571.052V217.753H572.396V216.484Z" fill="#E37056" />
-    <path d="M553.023 222.606H551.678V223.874H553.023V222.606Z" fill="#E37056" />
-    <path d="M556.262 222.606H554.917V223.874H556.262V222.606Z" fill="#E37056" />
-    <path d="M559.501 222.606H558.156V223.874H559.501V222.606Z" fill="#E37056" />
-    <path d="M562.74 222.606H561.396V223.874H562.74V222.606Z" fill="#E37056" />
-    <path d="M565.979 222.606H564.634V223.874H565.979V222.606Z" fill="#E37056" />
-    <path d="M569.157 222.606H567.812V223.874H569.157V222.606Z" fill="#E37056" />
-    <path d="M572.396 222.606H571.052V223.874H572.396V222.606Z" fill="#E37056" />
-    <path d="M553.023 225.584H551.678V226.852H553.023V225.584Z" fill="#E37056" />
-    <path d="M556.262 225.584H554.917V226.852H556.262V225.584Z" fill="#E37056" />
-    <path d="M559.501 225.584H558.156V226.852H559.501V225.584Z" fill="#E37056" />
-    <path d="M562.74 225.584H561.396V226.852H562.74V225.584Z" fill="#E37056" />
-    <path d="M565.979 225.584H564.634V226.852H565.979V225.584Z" fill="#E37056" />
-    <path d="M569.157 225.584H567.812V226.852H569.157V225.584Z" fill="#E37056" />
-    <path d="M572.396 225.584H571.052V226.852H572.396V225.584Z" fill="#E37056" />
-    <path d="M553.023 231.705H551.678V232.974H553.023V231.705Z" fill="#E37056" />
-    <path d="M556.262 231.705H554.917V232.974H556.262V231.705Z" fill="#E37056" />
-    <path d="M559.501 231.705H558.156V232.974H559.501V231.705Z" fill="#E37056" />
-    <path d="M562.74 231.705H561.396V232.974H562.74V231.705Z" fill="#E37056" />
-    <path d="M565.979 231.705H564.634V232.974H565.979V231.705Z" fill="#E37056" />
-    <path d="M569.157 231.705H567.812V232.974H569.157V231.705Z" fill="#E37056" />
-    <path d="M572.396 231.705H571.052V232.974H572.396V231.705Z" fill="#E37056" />
-    <path d="M553.023 234.683H551.678V235.952H553.023V234.683Z" fill="#E37056" />
-    <path d="M556.262 234.683H554.917V235.952H556.262V234.683Z" fill="#E37056" />
-    <path d="M559.501 234.683H558.156V235.952H559.501V234.683Z" fill="#E37056" />
-    <path d="M562.74 234.683H561.396V235.952H562.74V234.683Z" fill="#E37056" />
-    <path d="M565.979 234.683H564.634V235.952H565.979V234.683Z" fill="#E37056" />
-    <path d="M569.157 234.683H567.812V235.952H569.157V234.683Z" fill="#E37056" />
-    <path d="M572.396 234.683H571.052V235.952H572.396V234.683Z" fill="#E37056" />
-    <path opacity="0.3" d="M573.863 230.988H550.578V240.474H573.863V230.988Z" fill="#2484C6" />
-    <path opacity="0.6" d="M562.068 131.17H550.578V240.364H562.068V131.17Z" fill="#2484C6" />
-    <path
-      d="M531.877 158.964L549.05 181.741L530.594 206.282L514.765 181.741L531.877 158.964Z"
-      stroke="#E37056"
-      strokeWidth="3"
-      strokeMiterlimit="10"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    />
-    <path d="M579.73 161.667H584.986L590.425 143.247L579.73 161.667Z" fill="#E37056" />
-    <path d="M602.77 161.667H597.575L591.586 143.247L602.77 161.667Z" fill="#E37056" />
-    <path d="M590.058 165.251H589.386V180.472H590.058V165.251Z" fill="#E37056" />
-    <path d="M588.897 165.858H588.225V181.079H588.897V165.858Z" fill="#E37056" />
-    <path d="M587.797 166.41H587.125V181.631H587.797V166.41Z" fill="#E37056" />
-    <path d="M586.697 167.016H586.025V182.237H586.697V167.016Z" fill="#E37056" />
-    <path d="M585.536 167.623H584.863V182.844H585.536V167.623Z" fill="#E37056" />
-    <path d="M584.435 168.174H583.763V183.395H584.435V168.174Z" fill="#E37056" />
-    <path d="M583.336 168.781H582.663V184.002H583.336V168.781Z" fill="#E37056" />
-    <path d="M582.174 169.332H581.502V184.553H582.174V169.332Z" fill="#E37056" />
-    <path d="M593.542 165.251H592.869V180.472H593.542V165.251Z" fill="#E37056" />
-    <path d="M594.703 165.858H594.03V181.079H594.703V165.858Z" fill="#E37056" />
-    <path d="M595.803 166.41H595.13V181.631H595.803V166.41Z" fill="#E37056" />
-    <path d="M596.903 167.016H596.231V182.237H596.903V167.016Z" fill="#E37056" />
-    <path d="M598.064 167.623H597.392V182.844H598.064V167.623Z" fill="#E37056" />
-    <path d="M599.164 168.174H598.492V183.395H599.164V168.174Z" fill="#E37056" />
-    <path d="M600.264 168.781H599.592V184.002H600.264V168.781Z" fill="#E37056" />
-    <path d="M601.425 169.332H600.753V184.553H601.425V169.332Z" fill="#E37056" />
-    <path d="M590.058 182.734H589.386V197.955H590.058V182.734Z" fill="#E37056" />
-    <path d="M588.897 183.285H588.225V198.506H588.897V183.285Z" fill="#E37056" />
-    <path d="M587.797 183.892H587.125V199.113H587.797V183.892Z" fill="#E37056" />
-    <path d="M586.697 184.443H586.025V199.664H586.697V184.443Z" fill="#E37056" />
-    <path d="M585.536 185.05H584.863V200.271H585.536V185.05Z" fill="#E37056" />
-    <path d="M584.435 185.656H583.763V200.877H584.435V185.656Z" fill="#E37056" />
-    <path d="M583.336 186.208H582.663V201.429H583.336V186.208Z" fill="#E37056" />
-    <path d="M582.174 186.815H581.502V202.036H582.174V186.815Z" fill="#E37056" />
-    <path d="M593.542 182.734H592.869V197.955H593.542V182.734Z" fill="#E37056" />
-    <path d="M594.703 183.285H594.03V198.506H594.703V183.285Z" fill="#E37056" />
-    <path d="M595.803 183.892H595.13V199.113H595.803V183.892Z" fill="#E37056" />
-    <path d="M596.903 184.443H596.231V199.664H596.903V184.443Z" fill="#E37056" />
-    <path d="M598.064 185.05H597.392V200.271H598.064V185.05Z" fill="#E37056" />
-    <path d="M599.164 185.656H598.492V200.877H599.164V185.656Z" fill="#E37056" />
-    <path d="M600.264 186.208H599.592V201.429H600.264V186.208Z" fill="#E37056" />
-    <path d="M601.425 186.814H600.753V202.035H601.425V186.814Z" fill="#E37056" />
-    <path d="M590.058 200.16H589.386V215.381H590.058V200.16Z" fill="#E37056" />
-    <path d="M588.897 200.767H588.225V215.988H588.897V200.767Z" fill="#E37056" />
-    <path d="M587.797 201.319H587.125V216.54H587.797V201.319Z" fill="#E37056" />
-    <path d="M586.697 201.925H586.025V217.146H586.697V201.925Z" fill="#E37056" />
-    <path d="M585.536 202.532H584.863V217.753H585.536V202.532Z" fill="#E37056" />
-    <path d="M584.435 203.083H583.763V218.304H584.435V203.083Z" fill="#E37056" />
-    <path d="M583.336 203.69H582.663V218.911H583.336V203.69Z" fill="#E37056" />
-    <path d="M582.174 204.241H581.502V219.462H582.174V204.241Z" fill="#E37056" />
-    <path d="M593.542 200.16H592.869V215.381H593.542V200.16Z" fill="#E37056" />
-    <path d="M594.703 200.767H594.03V215.988H594.703V200.767Z" fill="#E37056" />
-    <path d="M595.803 201.318H595.13V216.54H595.803V201.318Z" fill="#E37056" />
-    <path d="M596.903 201.925H596.231V217.146H596.903V201.925Z" fill="#E37056" />
-    <path d="M598.064 202.532H597.392V217.753H598.064V202.532Z" fill="#E37056" />
-    <path d="M599.164 203.083H598.492V218.304H599.164V203.083Z" fill="#E37056" />
-    <path d="M600.264 203.69H599.592V218.911H600.264V203.69Z" fill="#E37056" />
-    <path d="M601.425 204.241H600.753V219.462H601.425V204.241Z" fill="#E37056" />
-    <path d="M590.058 217.643H589.386V232.864H590.058V217.643Z" fill="#E37056" />
-    <path d="M588.897 218.194H588.225V233.415H588.897V218.194Z" fill="#E37056" />
-    <path d="M587.797 218.801H587.125V234.022H587.797V218.801Z" fill="#E37056" />
-    <path d="M586.697 219.407H586.025V234.628H586.697V219.407Z" fill="#E37056" />
-    <path d="M585.536 219.959H584.863V235.18H585.536V219.959Z" fill="#E37056" />
-    <path d="M584.435 220.565H583.763V235.786H584.435V220.565Z" fill="#E37056" />
-    <path d="M583.336 221.117H582.663V236.338H583.336V221.117Z" fill="#E37056" />
-    <path d="M582.174 221.724H581.502V236.945H582.174V221.724Z" fill="#E37056" />
-    <path d="M593.542 217.643H592.869V232.864H593.542V217.643Z" fill="#E37056" />
-    <path d="M594.703 218.194H594.03V233.415H594.703V218.194Z" fill="#E37056" />
-    <path d="M595.803 218.801H595.13V234.022H595.803V218.801Z" fill="#E37056" />
-    <path d="M596.903 219.407H596.231V234.628H596.903V219.407Z" fill="#E37056" />
-    <path d="M598.064 219.959H597.392V235.18H598.064V219.959Z" fill="#E37056" />
-    <path d="M599.164 220.565H598.492V235.786H599.164V220.565Z" fill="#E37056" />
-    <path d="M600.264 221.117H599.592V236.338H600.264V221.117Z" fill="#E37056" />
-    <path d="M601.425 221.724H600.753V236.945H601.425V221.724Z" fill="#E37056" />
-    <path d="M609.92 134.258H608.331V135.692H609.92V134.258Z" fill="#E37056" />
-    <path d="M614.565 134.258H612.976V135.692H614.565V134.258Z" fill="#E37056" />
-    <path d="M619.21 134.258H617.62V135.692H619.21V134.258Z" fill="#E37056" />
-    <path d="M623.854 134.258H622.265V135.692H623.854V134.258Z" fill="#E37056" />
-    <path d="M628.499 134.258H626.91V135.692H628.499V134.258Z" fill="#E37056" />
-    <path d="M633.144 134.258H631.555V135.692H633.144V134.258Z" fill="#E37056" />
-    <path d="M609.92 137.622H608.331V139.056H609.92V137.622Z" fill="#E37056" />
-    <path d="M614.565 137.622H612.976V139.056H614.565V137.622Z" fill="#E37056" />
-    <path d="M619.21 137.622H617.62V139.056H619.21V137.622Z" fill="#E37056" />
-    <path d="M623.854 137.622H622.265V139.056H623.854V137.622Z" fill="#E37056" />
-    <path d="M628.499 137.622H626.91V139.056H628.499V137.622Z" fill="#E37056" />
-    <path d="M633.144 137.622H631.555V139.056H633.144V137.622Z" fill="#E37056" />
-    <path d="M609.92 141.041H608.331V142.475H609.92V141.041Z" fill="#E37056" />
-    <path d="M614.565 141.041H612.976V142.475H614.565V141.041Z" fill="#E37056" />
-    <path d="M619.21 141.041H617.62V142.475H619.21V141.041Z" fill="#E37056" />
-    <path d="M623.854 141.041H622.265V142.475H623.854V141.041Z" fill="#E37056" />
-    <path d="M628.499 141.041H626.91V142.475H628.499V141.041Z" fill="#E37056" />
-    <path d="M633.144 141.041H631.555V142.475H633.144V141.041Z" fill="#E37056" />
-    <path d="M609.92 144.405H608.331V145.839H609.92V144.405Z" fill="#E37056" />
-    <path d="M614.565 144.405H612.976V145.839H614.565V144.405Z" fill="#E37056" />
-    <path d="M619.21 144.405H617.62V145.839H619.21V144.405Z" fill="#E37056" />
-    <path d="M623.854 144.405H622.265V145.839H623.854V144.405Z" fill="#E37056" />
-    <path d="M628.499 144.405H626.91V145.839H628.499V144.405Z" fill="#E37056" />
-    <path d="M633.144 144.405H631.555V145.839H633.144V144.405Z" fill="#E37056" />
-    <path d="M609.92 147.769H608.331V149.203H609.92V147.769Z" fill="#E37056" />
-    <path d="M614.565 147.769H612.976V149.203H614.565V147.769Z" fill="#E37056" />
-    <path d="M619.21 147.769H617.62V149.203H619.21V147.769Z" fill="#E37056" />
-    <path d="M623.854 147.769H622.265V149.203H623.854V147.769Z" fill="#E37056" />
-    <path d="M628.499 147.769H626.91V149.203H628.499V147.769Z" fill="#E37056" />
-    <path d="M633.144 147.769H631.555V149.203H633.144V147.769Z" fill="#E37056" />
-    <path d="M609.92 151.188H608.331V152.622H609.92V151.188Z" fill="#E37056" />
-    <path d="M614.565 151.188H612.976V152.622H614.565V151.188Z" fill="#E37056" />
-    <path d="M619.21 151.188H617.62V152.622H619.21V151.188Z" fill="#E37056" />
-    <path d="M623.854 151.188H622.265V152.622H623.854V151.188Z" fill="#E37056" />
-    <path d="M628.499 151.188H626.91V152.622H628.499V151.188Z" fill="#E37056" />
-    <path d="M633.144 151.188H631.555V152.622H633.144V151.188Z" fill="#E37056" />
-    <path d="M609.92 154.553H608.331V155.986H609.92V154.553Z" fill="#E37056" />
-    <path d="M614.565 154.553H612.976V155.986H614.565V154.553Z" fill="#E37056" />
-    <path d="M619.21 154.553H617.62V155.986H619.21V154.553Z" fill="#E37056" />
-    <path d="M623.854 154.553H622.265V155.986H623.854V154.553Z" fill="#E37056" />
-    <path d="M628.499 154.553H626.91V155.986H628.499V154.553Z" fill="#E37056" />
-    <path d="M633.144 154.553H631.555V155.986H633.144V154.553Z" fill="#E37056" />
-    <path d="M609.92 157.972H608.331V159.406H609.92V157.972Z" fill="#E37056" />
-    <path d="M614.565 157.972H612.976V159.406H614.565V157.972Z" fill="#E37056" />
-    <path d="M619.21 157.972H617.62V159.406H619.21V157.972Z" fill="#E37056" />
-    <path d="M623.854 157.972H622.265V159.406H623.854V157.972Z" fill="#E37056" />
-    <path d="M628.499 157.972H626.91V159.406H628.499V157.972Z" fill="#E37056" />
-    <path d="M633.144 157.972H631.555V159.406H633.144V157.972Z" fill="#E37056" />
-    <path d="M609.92 161.336H608.331V162.77H609.92V161.336Z" fill="#E37056" />
-    <path d="M614.565 161.336H612.976V162.77H614.565V161.336Z" fill="#E37056" />
-    <path d="M619.21 161.336H617.62V162.77H619.21V161.336Z" fill="#E37056" />
-    <path d="M623.854 161.336H622.265V162.77H623.854V161.336Z" fill="#E37056" />
-    <path d="M628.499 161.336H626.91V162.77H628.499V161.336Z" fill="#E37056" />
-    <path d="M633.144 161.336H631.555V162.77H633.144V161.336Z" fill="#E37056" />
-    <path d="M609.92 164.7H608.331V166.134H609.92V164.7Z" fill="#E37056" />
-    <path d="M614.565 164.7H612.976V166.134H614.565V164.7Z" fill="#E37056" />
-    <path d="M619.21 164.7H617.62V166.134H619.21V164.7Z" fill="#E37056" />
-    <path d="M623.854 164.7H622.265V166.134H623.854V164.7Z" fill="#E37056" />
-    <path d="M628.499 164.7H626.91V166.134H628.499V164.7Z" fill="#E37056" />
-    <path d="M633.144 164.7H631.555V166.134H633.144V164.7Z" fill="#E37056" />
-    <path d="M609.92 168.119H608.331V169.553H609.92V168.119Z" fill="#E37056" />
-    <path d="M614.565 168.119H612.976V169.553H614.565V168.119Z" fill="#E37056" />
-    <path d="M619.21 168.119H617.62V169.553H619.21V168.119Z" fill="#E37056" />
-    <path d="M623.854 168.119H622.265V169.553H623.854V168.119Z" fill="#E37056" />
-    <path d="M628.499 168.119H626.91V169.553H628.499V168.119Z" fill="#E37056" />
-    <path d="M633.144 168.119H631.555V169.553H633.144V168.119Z" fill="#E37056" />
-    <path d="M609.92 171.483H608.331V172.917H609.92V171.483Z" fill="#E37056" />
-    <path d="M614.565 171.483H612.976V172.917H614.565V171.483Z" fill="#E37056" />
-    <path d="M619.21 171.483H617.62V172.917H619.21V171.483Z" fill="#E37056" />
-    <path d="M623.854 171.483H622.265V172.917H623.854V171.483Z" fill="#E37056" />
-    <path d="M628.499 171.483H626.91V172.917H628.499V171.483Z" fill="#E37056" />
-    <path d="M633.144 171.483H631.555V172.917H633.144V171.483Z" fill="#E37056" />
-    <path d="M609.92 174.902H608.331V176.336H609.92V174.902Z" fill="#E37056" />
-    <path d="M614.565 174.902H612.976V176.336H614.565V174.902Z" fill="#E37056" />
-    <path d="M619.21 174.902H617.62V176.336H619.21V174.902Z" fill="#E37056" />
-    <path d="M623.854 174.902H622.265V176.336H623.854V174.902Z" fill="#E37056" />
-    <path d="M628.499 174.902H626.91V176.336H628.499V174.902Z" fill="#E37056" />
-    <path d="M633.144 174.902H631.555V176.336H633.144V174.902Z" fill="#E37056" />
-    <path d="M609.92 178.266H608.331V179.7H609.92V178.266Z" fill="#E37056" />
-    <path d="M614.565 178.266H612.976V179.7H614.565V178.266Z" fill="#E37056" />
-    <path d="M619.21 178.266H617.62V179.7H619.21V178.266Z" fill="#E37056" />
-    <path d="M623.854 178.266H622.265V179.7H623.854V178.266Z" fill="#E37056" />
-    <path d="M628.499 178.266H626.91V179.7H628.499V178.266Z" fill="#E37056" />
-    <path d="M633.144 178.266H631.555V179.7H633.144V178.266Z" fill="#E37056" />
-    <path d="M609.92 181.63H608.331V183.064H609.92V181.63Z" fill="#E37056" />
-    <path d="M614.565 181.63H612.976V183.064H614.565V181.63Z" fill="#E37056" />
-    <path d="M619.21 181.63H617.62V183.064H619.21V181.63Z" fill="#E37056" />
-    <path d="M623.854 181.63H622.265V183.064H623.854V181.63Z" fill="#E37056" />
-    <path d="M628.499 181.63H626.91V183.064H628.499V181.63Z" fill="#E37056" />
-    <path d="M633.144 181.63H631.555V183.064H633.144V181.63Z" fill="#E37056" />
-    <path d="M609.92 185.05H608.331V186.484H609.92V185.05Z" fill="#E37056" />
-    <path d="M614.565 185.05H612.976V186.484H614.565V185.05Z" fill="#E37056" />
-    <path d="M619.21 185.05H617.62V186.484H619.21V185.05Z" fill="#E37056" />
-    <path d="M623.854 185.05H622.265V186.484H623.854V185.05Z" fill="#E37056" />
-    <path d="M628.499 185.05H626.91V186.484H628.499V185.05Z" fill="#E37056" />
-    <path d="M633.144 185.05H631.555V186.484H633.144V185.05Z" fill="#E37056" />
-    <path d="M609.92 188.414H608.331V189.848H609.92V188.414Z" fill="#E37056" />
-    <path d="M614.565 188.414H612.976V189.848H614.565V188.414Z" fill="#E37056" />
-    <path d="M619.21 188.414H617.62V189.848H619.21V188.414Z" fill="#E37056" />
-    <path d="M623.854 188.414H622.265V189.848H623.854V188.414Z" fill="#E37056" />
-    <path d="M628.499 188.414H626.91V189.848H628.499V188.414Z" fill="#E37056" />
-    <path d="M633.144 188.414H631.555V189.848H633.144V188.414Z" fill="#E37056" />
-    <path d="M609.92 191.833H608.331V193.267H609.92V191.833Z" fill="#E37056" />
-    <path d="M614.565 191.833H612.976V193.267H614.565V191.833Z" fill="#E37056" />
-    <path d="M619.21 191.833H617.62V193.267H619.21V191.833Z" fill="#E37056" />
-    <path d="M623.854 191.833H622.265V193.267H623.854V191.833Z" fill="#E37056" />
-    <path d="M628.499 191.833H626.91V193.267H628.499V191.833Z" fill="#E37056" />
-    <path d="M633.144 191.833H631.555V193.267H633.144V191.833Z" fill="#E37056" />
-    <path d="M609.92 195.197H608.331V196.631H609.92V195.197Z" fill="#E37056" />
-    <path d="M614.565 195.197H612.976V196.631H614.565V195.197Z" fill="#E37056" />
-    <path d="M619.21 195.197H617.62V196.631H619.21V195.197Z" fill="#E37056" />
-    <path d="M623.854 195.197H622.265V196.631H623.854V195.197Z" fill="#E37056" />
-    <path d="M628.499 195.197H626.91V196.631H628.499V195.197Z" fill="#E37056" />
-    <path d="M633.144 195.197H631.555V196.631H633.144V195.197Z" fill="#E37056" />
-    <path d="M609.92 198.616H608.331V200.05H609.92V198.616Z" fill="#E37056" />
-    <path d="M614.565 198.616H612.976V200.05H614.565V198.616Z" fill="#E37056" />
-    <path d="M619.21 198.616H617.62V200.05H619.21V198.616Z" fill="#E37056" />
-    <path d="M623.854 198.616H622.265V200.05H623.854V198.616Z" fill="#E37056" />
-    <path d="M628.499 198.616H626.91V200.05H628.499V198.616Z" fill="#E37056" />
-    <path d="M633.144 198.616H631.555V200.05H633.144V198.616Z" fill="#E37056" />
-    <path d="M609.92 201.925H608.331V203.359H609.92V201.925Z" fill="#E37056" />
-    <path d="M614.565 201.925H612.976V203.359H614.565V201.925Z" fill="#E37056" />
-    <path d="M619.21 201.925H617.62V203.359H619.21V201.925Z" fill="#E37056" />
-    <path d="M623.854 201.925H622.265V203.359H623.854V201.925Z" fill="#E37056" />
-    <path d="M628.499 201.925H626.91V203.359H628.499V201.925Z" fill="#E37056" />
-    <path d="M633.144 201.925H631.555V203.359H633.144V201.925Z" fill="#E37056" />
-    <path d="M609.92 205.344H608.331V206.778H609.92V205.344Z" fill="#E37056" />
-    <path d="M614.565 205.344H612.976V206.778H614.565V205.344Z" fill="#E37056" />
-    <path d="M619.21 205.344H617.62V206.778H619.21V205.344Z" fill="#E37056" />
-    <path d="M623.854 205.344H622.265V206.778H623.854V205.344Z" fill="#E37056" />
-    <path d="M628.499 205.344H626.91V206.778H628.499V205.344Z" fill="#E37056" />
-    <path d="M633.144 205.344H631.555V206.778H633.144V205.344Z" fill="#E37056" />
-    <path d="M609.92 208.708H608.331V210.142H609.92V208.708Z" fill="#E37056" />
-    <path d="M614.565 208.708H612.976V210.142H614.565V208.708Z" fill="#E37056" />
-    <path d="M619.21 208.708H617.62V210.142H619.21V208.708Z" fill="#E37056" />
-    <path d="M623.854 208.708H622.265V210.142H623.854V208.708Z" fill="#E37056" />
-    <path d="M628.499 208.708H626.91V210.142H628.499V208.708Z" fill="#E37056" />
-    <path d="M633.144 208.708H631.555V210.142H633.144V208.708Z" fill="#E37056" />
-    <path d="M609.92 212.073H608.331V213.506H609.92V212.073Z" fill="#E37056" />
-    <path d="M614.565 212.073H612.976V213.506H614.565V212.073Z" fill="#E37056" />
-    <path d="M619.21 212.073H617.62V213.506H619.21V212.073Z" fill="#E37056" />
-    <path d="M623.854 212.073H622.265V213.506H623.854V212.073Z" fill="#E37056" />
-    <path d="M628.499 212.073H626.91V213.506H628.499V212.073Z" fill="#E37056" />
-    <path d="M633.144 212.073H631.555V213.506H633.144V212.073Z" fill="#E37056" />
-    <path d="M609.92 215.492H608.331V216.926H609.92V215.492Z" fill="#E37056" />
-    <path d="M614.565 215.492H612.976V216.926H614.565V215.492Z" fill="#E37056" />
-    <path d="M619.21 215.492H617.62V216.926H619.21V215.492Z" fill="#E37056" />
-    <path d="M623.854 215.492H622.265V216.926H623.854V215.492Z" fill="#E37056" />
-    <path d="M628.499 215.492H626.91V216.926H628.499V215.492Z" fill="#E37056" />
-    <path d="M633.144 215.492H631.555V216.926H633.144V215.492Z" fill="#E37056" />
-    <path d="M609.92 218.856H608.331V220.29H609.92V218.856Z" fill="#E37056" />
-    <path d="M614.565 218.856H612.976V220.29H614.565V218.856Z" fill="#E37056" />
-    <path d="M619.21 218.856H617.62V220.29H619.21V218.856Z" fill="#E37056" />
-    <path d="M623.854 218.856H622.265V220.29H623.854V218.856Z" fill="#E37056" />
-    <path d="M628.499 218.856H626.91V220.29H628.499V218.856Z" fill="#E37056" />
-    <path d="M633.144 218.856H631.555V220.29H633.144V218.856Z" fill="#E37056" />
-    <path d="M609.92 222.275H608.331V223.709H609.92V222.275Z" fill="#E37056" />
-    <path d="M614.565 222.275H612.976V223.709H614.565V222.275Z" fill="#E37056" />
-    <path d="M619.21 222.275H617.62V223.709H619.21V222.275Z" fill="#E37056" />
-    <path d="M623.854 222.275H622.265V223.709H623.854V222.275Z" fill="#E37056" />
-    <path d="M628.499 222.275H626.91V223.709H628.499V222.275Z" fill="#E37056" />
-    <path d="M633.144 222.275H631.555V223.709H633.144V222.275Z" fill="#E37056" />
-    <path d="M609.92 225.639H608.331V227.073H609.92V225.639Z" fill="#E37056" />
-    <path d="M614.565 225.639H612.976V227.073H614.565V225.639Z" fill="#E37056" />
-    <path d="M619.21 225.639H617.62V227.073H619.21V225.639Z" fill="#E37056" />
-    <path d="M623.854 225.639H622.265V227.073H623.854V225.639Z" fill="#E37056" />
-    <path d="M628.499 225.639H626.91V227.073H628.499V225.639Z" fill="#E37056" />
-    <path d="M633.144 225.639H631.555V227.073H633.144V225.639Z" fill="#E37056" />
-    <path d="M609.92 229.003H608.331V230.437H609.92V229.003Z" fill="#E37056" />
-    <path d="M614.565 229.003H612.976V230.437H614.565V229.003Z" fill="#E37056" />
-    <path d="M619.21 229.003H617.62V230.437H619.21V229.003Z" fill="#E37056" />
-    <path d="M623.854 229.003H622.265V230.437H623.854V229.003Z" fill="#E37056" />
-    <path d="M628.499 229.003H626.91V230.437H628.499V229.003Z" fill="#E37056" />
-    <path d="M633.144 229.003H631.555V230.437H633.144V229.003Z" fill="#E37056" />
-    <path d="M609.92 232.422H608.331V233.856H609.92V232.422Z" fill="#E37056" />
-    <path d="M614.565 232.422H612.976V233.856H614.565V232.422Z" fill="#E37056" />
-    <path d="M619.21 232.422H617.62V233.856H619.21V232.422Z" fill="#E37056" />
-    <path d="M623.854 232.422H622.265V233.856H623.854V232.422Z" fill="#E37056" />
-    <path d="M628.499 232.422H626.91V233.856H628.499V232.422Z" fill="#E37056" />
-    <path d="M633.144 232.422H631.555V233.856H633.144V232.422Z" fill="#E37056" />
-    <path opacity="0.7" d="M635.894 230.713H605.581V240.474H635.894V230.713Z" fill="#2484C6" />
-    <path
-      className="HeroGraphic-cloudRight"
-      opacity="0.7"
-      d="M609.126 61.903H757.878C757.878 61.903 760.078 50.3218 744.127 48.3364C744.127 48.3364 742.232 27.7108 719.742 20.3761C697.252 13.0413 686.924 24.3468 686.924 24.3468C686.924 24.3468 680.018 16.8466 670.973 17.8944C661.928 18.9422 658.139 29.4205 658.139 29.4205C658.139 29.4205 652.822 26.0564 647.2 28.869C641.577 31.6815 641.883 35.3765 641.883 35.3765C641.883 35.3765 635.405 33.9426 630.821 33.6669C626.238 33.3912 604.237 34.825 609.126 61.903Z"
-      fill="white"
-    />
-    <path
-      opacity="0.5"
-      d="M406.715 74.3666H472.413C472.413 74.3666 472.169 68.2451 465.079 68.2451C465.079 68.2451 463.063 64.8258 452.918 62.7302C442.773 60.6897 432.139 65.4876 432.139 65.4876C432.139 65.4876 429.45 63.8883 426.455 63.8883C423.461 63.8883 422.422 67.3075 422.422 67.3075C422.422 67.3075 406.715 64.881 406.715 74.3666Z"
-      fill="white"
-    />
-    <path
-      opacity="0.5"
-      d="M233.09 126.647H283.02C283.02 126.647 277.581 121.022 267.192 117.493C256.802 113.963 250.141 117.493 250.141 117.493C250.141 117.493 247.207 114.68 242.807 117.493C238.407 120.305 239.385 121.298 239.385 121.298C239.385 121.298 231.99 120.36 233.09 126.647Z"
-      fill="white"
-    />
-    <path
-      d="M173.992 45.193C173.992 39.0715 178.392 33.9427 184.504 32.1779C183.037 31.7367 181.509 31.5161 179.859 31.5161C171.487 31.5161 164.703 37.6376 164.703 45.193C164.703 52.7483 171.487 58.8698 179.859 58.8698C181.509 58.8698 183.037 58.6492 184.504 58.208C178.454 56.4433 173.992 51.3145 173.992 45.193Z"
-      fill="#E37056"
-    />
-    <path
-      d="M245.863 68.4656L246.474 69.5686L247.818 69.734L246.84 70.5613L247.085 71.7194L245.863 71.1679L244.701 71.7194L244.946 70.5613L243.968 69.734L245.313 69.5686L245.863 68.4656Z"
-      fill="#E37056"
-    />
-    <path
-      d="M334.173 43.2627L334.784 44.4208L336.189 44.5863L335.15 45.5238L335.395 46.7371L334.173 46.1856L332.889 46.7371L333.134 45.5238L332.156 44.5863L333.561 44.4208L334.173 43.2627Z"
-      fill="#E37056"
-    />
-    <path
-      d="M377.136 23.9056L377.686 24.9534L378.969 25.1188L378.053 25.8909L378.236 27.0491L377.136 26.4976L376.036 27.0491L376.219 25.8909L375.303 25.1188L376.586 24.9534L377.136 23.9056Z"
-      fill="#E37056"
-    />
-    <path
-      d="M498.815 134.644L499.365 135.692L500.587 135.857L499.67 136.629L499.915 137.732L498.815 137.236L497.653 137.732L497.898 136.629L496.981 135.857L498.203 135.692L498.815 134.644Z"
-      fill="#E37056"
-    />
-    <path
-      d="M354.096 0.90863L354.646 1.90131L355.868 2.06675L355.013 2.89398L355.196 3.99695L354.096 3.50061L352.935 3.99695L353.179 2.89398L352.263 2.06675L353.546 1.90131L354.096 0.90863Z"
-      fill="#E37056"
-    />
-    <path
-      d="M160.914 17.9495L161.464 18.9422L162.747 19.1076L161.831 19.9349L162.075 21.0378L160.914 20.4864L159.814 21.0378L159.997 19.9349L159.142 19.1076L160.364 18.9422L160.914 17.9495Z"
-      fill="#E37056"
-    />
-    <path
-      d="M40.8243 164.314L41.3743 165.362L42.6577 165.527L41.741 166.299L41.9244 167.457L40.8243 166.906L39.7243 167.457L39.9076 166.299L38.9909 165.527L40.2743 165.362L40.8243 164.314Z"
-      fill="#E37056"
-    />
-    <path
-      d="M380.497 53.9064L381.108 55.0093L382.453 55.1748L381.475 56.002L381.658 57.2153L380.497 56.6638L379.275 57.2153L379.519 56.002L378.542 55.1748L379.886 55.0093L380.497 53.9064Z"
-      fill="#E37056"
-    />
-    <path
-      d="M216.161 102.272L216.833 103.54L218.361 103.706L217.261 104.643L217.506 106.022L216.161 105.36L214.817 106.022L215.122 104.643L214.022 103.706L215.489 103.54L216.161 102.272Z"
-      fill="#E37056"
-    />
-    <path
-      d="M97.6606 109.993L98.1495 110.985L99.3718 111.151L98.5162 111.923L98.6995 112.971L97.6606 112.474L96.5605 112.971L96.7439 111.923L95.8883 111.151L97.1105 110.985L97.6606 109.993Z"
-      fill="#E37056"
-    />
-    <path
-      d="M90.9991 146.28L91.5491 147.273L92.7714 147.438L91.8547 148.21L92.0992 149.258L90.9991 148.762L89.9602 149.258L90.1435 148.21L89.2879 147.438L90.4491 147.273L90.9991 146.28Z"
-      fill="#E37056"
-    />
-    <path
-      d="M105.239 55.7263L105.728 56.6087L106.828 56.7741L106.033 57.4359L106.217 58.4286L105.239 57.9323L104.261 58.4286L104.444 57.4359L103.711 56.7741L104.75 56.6087L105.239 55.7263Z"
-      fill="#E37056"
-    />
-    <path
-      d="M115.689 19.4937L116.3 20.5415L117.584 20.7069L116.606 21.5342L116.85 22.6371L115.689 22.0856L114.589 22.6371L114.772 21.5342L113.856 20.7069L115.139 20.5415L115.689 19.4937Z"
-      fill="#E37056"
-    />
-    <path
-      d="M486.164 101.831L486.347 102.217L486.836 102.272L486.469 102.603L486.592 102.989L486.164 102.823L485.736 102.989L485.797 102.603L485.492 102.272L485.981 102.217L486.164 101.831Z"
-      fill="#E37056"
-    />
-    <path
-      d="M418.999 18.3907L419.305 18.887L419.977 18.9973L419.488 19.4385L419.61 19.99L418.999 19.7143L418.449 19.99L418.51 19.4385L418.082 18.9973L418.694 18.887L418.999 18.3907Z"
-      fill="#E37056"
-    />
-    <path
-      d="M558.156 67.9141L558.89 69.2377L560.418 69.4031L559.318 70.451L559.562 71.8848L558.156 71.1679L556.751 71.8848L556.995 70.451L555.834 69.4031L557.423 69.2377L558.156 67.9141Z"
-      fill="#E37056"
-    />
-    <path
-      className="HeroGraphic-starCenterLeft"
-      d="M380.497 100.893L381.17 102.161L382.759 102.382L381.658 103.375L381.903 104.809L380.497 104.147L379.092 104.809L379.336 103.375L378.175 102.382L379.764 102.161L380.497 100.893Z"
-      fill="#E37056"
-    />
-    <path
-      className="HeroGraphic-startRight"
-      d="M160.914 73.9805L161.647 75.2489L163.236 75.4695L162.075 76.4621L162.319 77.896L160.914 77.2342L159.508 77.896L159.814 76.4621L158.653 75.4695L160.242 75.2489L160.914 73.9805Z"
-      fill="#E37056"
-    />
-    <path
-      d="M348.473 94.3854L349.146 95.709L350.735 95.8744L349.635 96.9223L349.879 98.3561L348.473 97.6392L347.068 98.3561L347.312 96.9223L346.151 95.8744L347.74 95.709L348.473 94.3854Z"
-      fill="#E37056"
-    />
-    <path
-      d="M527.783 46.7922L528.271 47.7849L529.494 47.9504L528.638 48.7224L528.822 49.7703L527.783 49.2739L526.682 49.7703L526.866 48.7224L526.01 47.9504L527.233 47.7849L527.783 46.7922Z"
-      fill="#E37056"
-    />
-    <path
-      className="HeroGraphic-starCenterLeft"
-      d="M531.877 90.9662L532.427 91.9589L533.649 92.1244L532.733 92.8964L532.977 93.9443L531.877 93.4479L530.838 93.9443L531.022 92.8964L530.166 92.1244L531.388 91.9589L531.877 90.9662Z"
-      fill="#E37056"
-    />
-    <path
-      d="M632.349 87.8779L632.716 88.4846L633.449 88.5949L632.899 89.0912L633.021 89.753L632.349 89.4221L631.677 89.753L631.799 89.0912L631.249 88.5949L632.043 88.4846L632.349 87.8779Z"
-      fill="#E37056"
-    />
-    <path
-      d="M683.196 143.357L683.991 144.846L685.824 145.067L684.48 146.225L684.785 147.824L683.196 147.052L681.607 147.824L681.913 146.225L680.629 145.067L682.402 144.846L683.196 143.357Z"
-      fill="#E37056"
-    />
-    <path
-      className="HeroGraphic-starRight"
-      d="M669.873 94.3854L671.095 96.7017L673.907 97.0326L671.89 98.7973L672.379 101.334L669.873 100.121L667.368 101.334L667.856 98.7973L665.84 97.0326L668.59 96.7017L669.873 94.3854Z"
-      fill="#E37056"
-    />
-    <path
-      className="HeroGraphic-starCenter"
-      d="M261.997 28.0417L263.28 30.3028L266.03 30.6888L264.014 32.4536L264.502 34.9904L261.997 33.7771L259.552 34.9904L259.98 32.4536L257.963 30.6888L260.774 30.3028L261.997 28.0417Z"
-      fill="#E37056"
-    />
-    <path
-      d="M608.331 26.0012L608.698 26.6079L609.431 26.7182L608.881 27.2145L609.003 27.8763L608.331 27.6005L607.659 27.8763L607.781 27.2145L607.231 26.7182L607.964 26.6079L608.331 26.0012Z"
-      fill="#E37056"
-    />
-    <path
-      d="M656.123 163.211L656.489 163.873L657.284 163.983L656.673 164.479L656.856 165.141L656.123 164.81L655.45 165.141L655.572 164.479L655.022 163.983L655.817 163.873L656.123 163.211Z"
-      fill="#E37056"
-    />
-    <path
-      d="M497.959 92.4553L498.326 93.117L499.12 93.2273L498.509 93.7237L498.692 94.3855L497.959 94.0546L497.287 94.3855L497.409 93.7237L496.859 93.2273L497.653 93.117L497.959 92.4553Z"
-      fill="#E37056"
-    />
-    <path
-      d="M506.087 78.8887L506.393 79.4953L507.187 79.6056L506.637 80.1019L506.759 80.8189L506.087 80.488L505.354 80.8189L505.476 80.1019L504.926 79.6056L505.72 79.4953L506.087 78.8887Z"
-      fill="#E37056"
-    />
-    <path
-      d="M546.239 110.048L546.973 111.426L548.745 111.647L547.461 112.75L547.767 114.294L546.239 113.577L544.711 114.294L544.956 112.75L543.733 111.647L545.445 111.426L546.239 110.048Z"
-      fill="#E37056"
-    />
-    <path
-      d="M481.947 38.52L482.436 39.4023L483.536 39.5678L482.742 40.2847L482.925 41.2222L481.947 40.7811L480.969 41.2222L481.153 40.2847L480.358 39.5678L481.458 39.4023L481.947 38.52Z"
-      fill="#E37056"
-    />
-    <path
-      d="M304.349 67.142L304.838 68.0244L305.938 68.1347L305.143 68.8516L305.327 69.8443L304.349 69.348L303.371 69.8443L303.554 68.8516L302.76 68.1347L303.86 68.0244L304.349 67.142Z"
-      fill="#E37056"
-    />
-    <path
-      d="M643.105 244.279C643.105 246.43 641.15 248.195 638.766 248.195H90.0824C87.699 248.195 85.7433 246.43 85.7433 244.279C85.7433 242.129 87.699 240.364 90.0824 240.364H638.766C641.211 240.364 643.105 242.129 643.105 244.279Z"
-      fill="#2484C6"
-    />
-    <path
-      d="M643.105 244.22C643.105 246.371 641.15 248.135 638.766 248.135H90.0824C87.699 248.135 85.7433 246.371 85.7433 244.22C85.7433 242.069 87.699 240.304 90.0824 240.304H638.766C641.211 240.304 643.105 242.069 643.105 244.22Z"
-      fill="#2484C6"
-    />
-    <path
-      d="M124.612 231.485C124.612 231.485 123.817 225.86 127.118 223.985C130.418 222.165 131.64 222.165 131.64 222.165C131.64 222.165 130.54 218.911 133.351 217.477C136.163 216.043 137.446 217.477 137.446 217.477C137.446 217.477 137.752 212.128 141.541 210.97C145.269 209.867 146.246 210.97 146.246 210.97C146.246 210.97 147.958 203.58 153.458 202.697C158.958 201.815 158.958 203.635 158.958 203.635C158.958 203.635 159.569 202.532 162.686 202.422C165.803 202.311 165.681 204.021 165.681 204.021C165.681 204.021 167.697 203.028 170.387 203.58C173.076 204.131 173.076 206.558 173.076 206.558C173.076 206.558 174.298 204.738 179.676 208.543C184.993 212.348 184.198 218.856 184.198 218.856C184.198 218.856 188.293 219.021 188.721 220.676C189.21 222.385 188.11 223.929 188.11 223.929C188.11 223.929 192.938 223.488 193.427 226.025C193.916 228.562 192.815 229.83 192.815 229.83C192.815 229.83 194.527 230.823 194.71 232.919C194.893 235.014 194.71 236.007 194.71 236.007C194.71 236.007 196.299 236.448 196.605 239.371C196.91 242.349 195.504 244.445 195.504 244.445C195.504 244.445 195.504 247.643 191.899 248.195C188.293 248.801 119.112 248.195 119.112 248.195C119.112 248.195 117.095 245.272 118.317 243.728C119.539 242.184 120.334 242.184 120.334 242.184C120.334 242.184 120.028 240.198 120.028 239.757C120.028 239.316 122.351 238.489 122.351 238.489C122.351 238.489 120.762 237.386 121.556 236.393C122.351 235.4 123.451 234.959 123.451 234.959C123.451 234.959 120.578 232.367 124.612 231.485Z"
-      fill="#0D1522"
-    />
-    <path
-      d="M191.654 238.599C191.654 238.599 191.776 232.919 195.443 232.367C199.11 231.816 199.416 232.367 199.416 232.367C199.416 232.367 199.721 230.327 201.433 229.996C203.144 229.61 203.572 229.996 203.572 229.996C203.572 229.996 204.61 226.852 207.85 226.08C211.089 225.308 212.739 229.389 212.739 229.389C212.739 229.389 214.694 228.562 216.283 229.113C217.872 229.665 217.261 231.209 217.261 231.209C217.261 231.209 218.545 230.823 218.85 231.761C219.156 232.698 218.85 233.139 218.85 233.139C218.85 233.139 220.5 232.422 221.417 234.132C222.334 235.897 222.028 236.889 222.028 236.889C222.028 236.889 223.556 235.897 224.045 237.441C224.534 238.985 224.534 239.537 224.534 239.537C224.534 239.537 227.773 238.709 228.017 239.978C228.262 241.246 226.062 242.459 226.062 242.459C226.062 242.459 227.467 243.452 227.467 244.665C227.467 245.879 226.734 246.044 226.734 246.32C226.734 246.596 227.223 247.588 227.162 248.36C227.039 249.077 189.271 248.36 189.271 248.36L191.654 238.599Z"
-      fill="#0D1522"
-    />
-    <path
-      d="M247.329 238.599C247.329 238.599 247.452 232.919 251.118 232.367C254.785 231.816 255.091 232.367 255.091 232.367C255.091 232.367 255.396 230.327 257.108 229.996C258.819 229.61 259.247 229.996 259.247 229.996C259.247 229.996 260.286 226.852 263.525 226.08C266.764 225.308 268.414 229.389 268.414 229.389C268.414 229.389 270.369 228.562 271.958 229.113C273.547 229.665 272.936 231.209 272.936 231.209C272.936 231.209 274.22 230.823 274.525 231.761C274.831 232.698 274.525 233.139 274.525 233.139C274.525 233.139 276.175 232.422 277.092 234.132C278.009 235.897 277.703 236.889 277.703 236.889C277.703 236.889 279.231 235.897 279.72 237.441C280.209 238.985 280.209 239.537 280.209 239.537C280.209 239.537 283.448 238.709 283.692 239.978C283.937 241.246 281.737 242.459 281.737 242.459C281.737 242.459 283.142 243.452 283.142 244.665C283.142 245.879 282.409 246.044 282.409 246.32C282.409 246.596 282.898 247.588 282.837 248.36C282.714 249.077 244.946 248.36 244.946 248.36L247.329 238.599Z"
-      fill="#0D1522"
-    />
-    <path
-      d="M222.089 241.687C222.089 241.687 219.828 233.967 220.989 232.202C222.089 230.437 222.089 230.437 222.089 230.437C222.089 230.437 220.989 228.617 222.089 227.955C223.189 227.294 223.189 227.294 223.189 227.294C223.189 227.294 223.189 224.702 224.839 224.095C226.489 223.433 226.978 224.095 226.978 224.095C226.978 224.095 227.101 220.124 228.69 219.959C230.34 219.793 230.523 220.676 230.523 220.676C230.523 220.676 230.34 218.029 232.54 217.091C234.801 216.154 236.512 218.47 236.512 218.47C236.512 218.47 239.14 218.58 239.568 220.29C239.996 222.054 239.568 223.047 239.568 223.047C239.568 223.047 241.707 223.654 241.401 225.915C241.096 228.176 241.096 228.176 241.096 228.176C241.096 228.176 244.946 226.687 245.985 228.176C247.024 229.665 245.985 230.547 245.985 230.547C245.985 230.547 247.696 230.382 247.696 231.926C247.696 233.47 247.696 234.297 247.696 234.297C247.696 234.297 249.713 233.856 249.957 235.566C250.141 237.331 249.041 238.489 249.041 238.489C249.041 238.489 250.08 239.867 249.957 241.081C249.835 242.294 249.102 242.901 249.102 242.901C249.102 242.901 251.057 242.625 251.546 244.445C252.035 246.265 251.057 246.926 251.057 246.926L251.73 248.526H223.8L222.089 241.687Z"
-      fill="#0D1522"
-    />
-    <path
-      d="M488.547 236.889C488.547 236.889 487.997 233.029 490.258 231.761C492.52 230.492 493.375 230.492 493.375 230.492C493.375 230.492 492.642 228.286 494.536 227.294C496.492 226.301 497.348 227.294 497.348 227.294C497.348 227.294 497.592 223.599 500.159 222.827C502.726 222.054 503.398 222.827 503.398 222.827C503.398 222.827 504.559 217.753 508.348 217.146C512.137 216.54 512.137 217.808 512.137 217.808C512.137 217.808 512.565 217.036 514.704 216.981C516.843 216.926 516.721 218.084 516.721 218.084C516.721 218.084 518.127 217.422 519.96 217.808C521.793 218.194 521.793 219.849 521.793 219.849C521.793 219.849 522.649 218.58 526.316 221.227C529.983 223.819 529.433 228.286 529.433 228.286C529.433 228.286 532.244 228.397 532.55 229.555C532.855 230.713 532.122 231.761 532.122 231.761C532.122 231.761 535.483 231.485 535.789 233.194C536.094 234.959 535.361 235.786 535.361 235.786C535.361 235.786 536.522 236.448 536.644 237.937C536.766 239.371 536.644 240.088 536.644 240.088C536.644 240.088 537.744 240.364 537.928 242.404C538.172 244.445 537.194 245.879 537.194 245.879C537.194 245.879 537.194 248.085 534.75 248.471C532.305 248.912 484.758 248.471 484.758 248.471C484.758 248.471 483.352 246.485 484.208 245.382C485.064 244.334 485.614 244.334 485.614 244.334C485.614 244.334 485.369 242.956 485.369 242.68C485.369 242.404 486.958 241.798 486.958 241.798C486.958 241.798 485.858 241.026 486.408 240.364C486.958 239.702 487.692 239.371 487.692 239.371C487.692 239.371 485.797 237.441 488.547 236.889Z"
-      fill="#0D1522"
-    />
-    <path
-      d="M533.038 238.599C533.038 238.599 533.161 232.919 536.827 232.367C540.494 231.816 540.8 232.367 540.8 232.367C540.8 232.367 541.105 230.327 542.817 229.996C544.528 229.61 544.956 229.996 544.956 229.996C544.956 229.996 545.995 226.852 549.234 226.08C552.473 225.308 554.123 229.389 554.123 229.389C554.123 229.389 556.078 228.562 557.667 229.113C559.318 229.665 558.645 231.209 558.645 231.209C558.645 231.209 559.929 230.823 560.234 231.761C560.54 232.698 560.234 233.139 560.234 233.139C560.234 233.139 561.884 232.422 562.801 234.132C563.718 235.897 563.412 236.889 563.412 236.889C563.412 236.889 564.94 235.897 565.429 237.441C565.918 238.985 565.918 239.537 565.918 239.537C565.918 239.537 569.157 238.709 569.401 239.978C569.585 241.246 567.446 242.459 567.446 242.459C567.446 242.459 568.851 243.452 568.851 244.665C568.851 245.879 568.118 246.044 568.118 246.32C568.118 246.596 568.607 247.588 568.546 248.36C568.424 249.077 530.655 248.36 530.655 248.36L533.038 238.599Z"
-      fill="#0D1522"
-    />
-    <path
-      d="M588.713 238.599C588.713 238.599 588.836 232.919 592.503 232.367C596.169 231.816 596.475 232.367 596.475 232.367C596.475 232.367 596.781 230.327 598.492 229.996C600.203 229.61 600.631 229.996 600.631 229.996C600.631 229.996 601.67 226.852 604.909 226.08C608.148 225.308 609.798 229.389 609.798 229.389C609.798 229.389 611.754 228.562 613.343 229.113C614.993 229.665 614.32 231.209 614.32 231.209C614.32 231.209 615.604 230.823 615.909 231.761C616.215 232.698 615.909 233.139 615.909 233.139C615.909 233.139 617.559 232.422 618.476 234.132C619.393 235.897 619.087 236.889 619.087 236.889C619.087 236.889 620.615 235.897 621.104 237.441C621.593 238.985 621.593 239.537 621.593 239.537C621.593 239.537 624.832 238.709 625.077 239.978C625.26 241.246 623.121 242.459 623.121 242.459C623.121 242.459 624.527 243.452 624.527 244.665C624.527 245.879 623.793 246.044 623.793 246.32C623.793 246.596 624.282 247.588 624.221 248.36C624.099 249.077 586.33 248.36 586.33 248.36L588.713 238.599Z"
-      fill="#0D1522"
-    />
-    <path
-      d="M490.808 240.805C490.808 240.805 490.747 236.338 487.875 235.897C485.003 235.456 484.758 235.897 484.758 235.897C484.758 235.897 484.514 234.297 483.169 234.022C481.825 233.746 481.519 234.022 481.519 234.022C481.519 234.022 480.725 231.54 478.158 230.933C475.591 230.327 474.308 233.525 474.308 233.525C474.308 233.525 472.78 232.864 471.496 233.305C470.213 233.746 470.702 234.959 470.702 234.959C470.702 234.959 469.724 234.684 469.48 235.4C469.235 236.117 469.48 236.503 469.48 236.503C469.48 236.503 468.196 235.952 467.463 237.276C466.729 238.654 466.974 239.426 466.974 239.426C466.974 239.426 465.752 238.654 465.385 239.868C464.957 241.081 464.957 241.522 464.957 241.522C464.957 241.522 462.39 240.86 462.268 241.908C462.085 242.901 463.796 243.838 463.796 243.838C463.796 243.838 462.696 244.61 462.696 245.548C462.696 246.485 463.246 246.651 463.246 246.816C463.246 246.982 462.818 247.809 462.94 248.416C463.001 248.967 492.581 248.416 492.581 248.416L490.808 240.805Z"
-      fill="#0D1522"
-    />
-    <path
-      d="M563.473 241.687C563.473 241.687 561.212 233.967 562.373 232.202C563.473 230.437 563.473 230.437 563.473 230.437C563.473 230.437 562.373 228.617 563.473 227.955C564.573 227.294 564.573 227.294 564.573 227.294C564.573 227.294 564.573 224.702 566.223 224.095C567.874 223.433 568.362 224.095 568.362 224.095C568.362 224.095 568.485 220.124 570.074 219.959C571.724 219.793 571.907 220.676 571.907 220.676C571.907 220.676 571.724 218.029 573.924 217.091C576.185 216.154 577.896 218.47 577.896 218.47C577.896 218.47 580.524 218.58 580.952 220.29C581.38 222.054 580.952 223.047 580.952 223.047C580.952 223.047 583.091 223.654 582.785 225.915C582.48 228.176 582.48 228.176 582.48 228.176C582.48 228.176 586.33 226.687 587.369 228.176C588.408 229.665 587.369 230.547 587.369 230.547C587.369 230.547 589.08 230.382 589.08 231.926C589.08 233.47 589.08 234.297 589.08 234.297C589.08 234.297 591.097 233.856 591.341 235.566C591.525 237.331 590.425 238.489 590.425 238.489C590.425 238.489 591.464 239.867 591.341 241.081C591.219 242.294 590.486 242.901 590.486 242.901C590.486 242.901 592.442 242.625 592.93 244.445C593.419 246.265 592.442 246.926 592.442 246.926L593.114 248.526H565.184L563.473 241.687Z"
-      fill="#0D1522"
-    />
-    <defs>
-      <linearGradient
-        id="paint0_linear"
-        x1="374.5"
-        y1="180.64"
-        x2="362.765"
-        y2="435.722"
-        gradientUnits="userSpaceOnUse">
-        <stop offset="0.0658436" stopColor="#3A7DDD" />
-        <stop offset="0.4001" stopColor="#265291" />
-        <stop offset="0.571" stopColor="#1D3E6E" />
-        <stop offset="0.7224" stopColor="#173156" />
-        <stop offset="0.8486" stopColor="#10213A" />
-        <stop offset="0.9342" stopColor="#091321" />
-      </linearGradient>
-    </defs>
-  </svg>
diff --git a/jscomp/syntax/benchmarks/data/Napkinscript.ml b/jscomp/syntax/benchmarks/data/Napkinscript.ml
deleted file mode 100644
index 9412f0b..0000000
--- a/jscomp/syntax/benchmarks/data/Napkinscript.ml
+++ /dev/null
@@ -1,19541 +0,0 @@
-module MiniBuffer : sig
-  type t
-  val add_char : t -> char -> unit
-  val add_string : t -> string -> unit
-  val contents : t -> string
-  val create : int -> t
-  val flush_newline : t -> unit
-  val length : t -> int
-  val unsafe_get : t -> int -> char
-end  = struct
-  type t = {
-    mutable buffer : bytes;
-    mutable position : int;
-    mutable length : int;
-  }
-
-  let create n =
-   let n = if n < 1 then 1 else n in
-   let s = (Bytes.create [@doesNotRaise]) n in
-   {buffer = s; position = 0; length = n}
-
-  let contents b = Bytes.sub_string b.buffer 0 b.position
-
-  let unsafe_get b ofs =
-    Bytes.unsafe_get b.buffer ofs
-
-  let length b = b.position
-
-  (* Can't be called directly, don't add to the interface *)
-  let resize_internal b more =
-    let len = b.length in
-    let new_len = ref len in
-    while b.position + more > !new_len do new_len := 2 * !new_len done;
-    if !new_len > Sys.max_string_length then begin
-      if b.position + more <= Sys.max_string_length
-      then new_len := Sys.max_string_length
-    end;
-    let new_buffer = (Bytes.create [@doesNotRaise]) !new_len in
-    (* PR#6148: let's keep using [blit] rather than [unsafe_blit] in
-       this tricky function that is slow anyway. *)
-    Bytes.blit b.buffer 0 new_buffer 0 b.position [@doesNotRaise];
-    b.buffer <- new_buffer;
-    b.length <- !new_len
-
-  let add_char b c =
-    let pos = b.position in
-    if pos >= b.length then resize_internal b 1;
-    Bytes.unsafe_set b.buffer pos c;
-    b.position <- pos + 1
-
-  let add_string b s =
-    let len = String.length s in
-    let new_position = b.position + len in
-    if new_position > b.length then resize_internal b len;
-    Bytes.blit_string s 0 b.buffer b.position len [@doesNotRaise];
-    b.position <- new_position
-
-  (* adds newline and trims all preceding whitespace *)
-  let flush_newline b =
-    let position = ref (b.position) in
-    while (Bytes.unsafe_get b.buffer (!position - 1)) = ' ' && !position >= 0 do
-      position := !position - 1;
-    done;
-    b.position <- !position;
-    add_char b '\n'
-end
-
-module Doc = struct
-  type mode = Break | Flat
-
-  type lineStyle =
-    | Classic (* fits? -> replace with space *)
-    | Soft (* fits? -> replaced with nothing *)
-    | Hard (* always included, forces breaks in parents *)
-
-  type t =
-    | Nil
-    | Text of string
-    | Concat of t list
-    | Indent of t
-    | IfBreaks of {yes: t; no: t}
-    | LineSuffix of t
-    | LineBreak of lineStyle
-    | Group of {shouldBreak: bool; doc: t}
-    | CustomLayout of t list
-    | BreakParent
-    (* | Cursor *)
-
-  let nil = Nil
-  let line = LineBreak Classic
-  let hardLine = LineBreak Hard
-  let softLine = LineBreak Soft
-  let text s = Text s
-  let concat l = Concat l
-  let indent d = Indent d
-  let ifBreaks t f = IfBreaks {yes = t; no = f}
-  let lineSuffix d = LineSuffix d
-  let group d = Group {shouldBreak = false; doc = d}
-  let breakableGroup ~forceBreak d = Group {shouldBreak = forceBreak; doc = d}
-  let customLayout gs = CustomLayout gs
-  let breakParent = BreakParent
-  (* let cursor = Cursor *)
-
-  let space = Text " "
-  let comma = Text ","
-  let dot = Text "."
-  let dotdot = Text ".."
-  let dotdotdot = Text "..."
-  let lessThan = Text "<"
-  let greaterThan = Text ">"
-  let lbrace = Text "{"
-  let rbrace = Text "}"
-  let lparen = Text "("
-  let rparen = Text ")"
-  let lbracket = Text "["
-  let rbracket = Text "]"
-  let question = Text "?"
-  let tilde = Text "~"
-  let equal = Text "="
-  let trailingComma = IfBreaks {yes = comma; no = nil}
-  let doubleQuote = Text "\""
-
-  let propagateForcedBreaks doc =
-    let rec walk doc = match doc with
-    | Text _ | Nil | LineSuffix _ ->
-      (false, doc)
-    | BreakParent ->
-      (true, Nil)
-    | LineBreak Hard ->
-      (true, doc)
-    | LineBreak (Classic | Soft) ->
-      (false, doc)
-    | Indent children ->
-      let (childForcesBreak, newChildren) = walk children in
-      (childForcesBreak, Indent newChildren)
-    | IfBreaks {yes = trueDoc; no = falseDoc} ->
-      let (falseForceBreak, falseDoc) = walk falseDoc in
-      if falseForceBreak then
-        let (_, trueDoc) = walk trueDoc in
-        (true, trueDoc)
-      else
-        let forceBreak, trueDoc = walk trueDoc in
-        (forceBreak, IfBreaks {yes = trueDoc; no = falseDoc})
-    | Group {shouldBreak = forceBreak; doc = children} ->
-      let (childForcesBreak, newChildren) = walk children in
-      let shouldBreak = forceBreak || childForcesBreak in
-      (shouldBreak, Group {shouldBreak; doc = newChildren})
-    | Concat children ->
-      let (forceBreak, newChildren) = List.fold_left (fun (forceBreak, newChildren) child ->
-        let (childForcesBreak, newChild) = walk child in
-        (forceBreak || childForcesBreak, newChild::newChildren)
-      ) (false, []) children
-      in
-      (forceBreak, Concat (List.rev newChildren))
-    | CustomLayout children ->
-      (* When using CustomLayout, we don't want to propagate forced breaks
-       * from the children up. By definition it picks the first layout that fits
-       * otherwise it takes the last of the list.
-       * However we do want to propagate forced breaks in the sublayouts. They
-       * might need to be broken. We just don't propagate them any higher here *)
-      let children = match walk (Concat children) with
-      | (_, Concat children) -> children
-      | _ -> assert false
-      in
-      (false, CustomLayout children)
-    in
-    let (_, processedDoc) = walk doc in
-    processedDoc
-
-  let join ~sep docs =
-    let rec loop acc sep docs =
-      match docs with
-      | [] -> List.rev acc
-      | [x] -> List.rev (x::acc)
-      | x::xs -> loop (sep::x::acc) sep xs
-    in
-    Concat(loop [] sep docs)
-
-  let rec fits w doc = match doc with
-    | _ when w < 0 -> false
-    | [] -> true
-    | (_ind, _mode, Text txt)::rest -> fits (w - String.length txt) rest
-    | (ind, mode, Indent doc)::rest -> fits w ((ind + 2, mode, doc)::rest)
-    | (_ind, Flat, LineBreak break)::rest ->
-        if break = Hard then true
-        else
-          let w = if break = Classic then w - 1 else w in
-          fits w rest
-    | (_ind, _mode, Nil)::rest -> fits w rest
-    | (_ind, Break, LineBreak _break)::_rest -> true
-    | (ind, mode, Group {shouldBreak = forceBreak; doc})::rest ->
-      let mode = if forceBreak then Break else mode in
-      fits w ((ind, mode, doc)::rest)
-    | (ind, mode, IfBreaks {yes = breakDoc; no = flatDoc})::rest ->
-        if mode = Break then
-          fits w ((ind, mode, breakDoc)::rest)
-        else
-          fits w ((ind, mode, flatDoc)::rest)
-    | (ind, mode, Concat docs)::rest ->
-      let ops = List.map (fun doc -> (ind, mode, doc)) docs in
-      fits w (List.append ops rest)
-    (* | (_ind, _mode, Cursor)::rest -> fits w rest *)
-    | (_ind, _mode, LineSuffix _)::rest -> fits w rest
-    | (_ind, _mode, BreakParent)::rest -> fits w rest
-    | (ind, mode, CustomLayout (hd::_))::rest ->
-      (* TODO: if we have nested custom layouts, what we should do here? *)
-      fits w ((ind, mode, hd)::rest)
-    | (_ind, _mode, CustomLayout _)::rest ->
-      fits w rest
-
-  let toString ~width doc =
-    let doc = propagateForcedBreaks doc in
-    let buffer = MiniBuffer.create 1000 in
-
-    let rec process ~pos lineSuffices stack =
-      match stack with
-      | ((ind, mode, doc) as cmd)::rest ->
-        begin match doc with
-        | Nil | BreakParent ->
-          process ~pos lineSuffices rest
-        | Text txt ->
-          MiniBuffer.add_string buffer txt;
-          process ~pos:(String.length txt + pos) lineSuffices rest
-        | LineSuffix doc ->
-          process ~pos ((ind, mode, doc)::lineSuffices) rest
-        | Concat docs ->
-          let ops = List.map (fun doc -> (ind, mode, doc)) docs in
-          process ~pos lineSuffices (List.append ops rest)
-        | Indent doc ->
-          process ~pos lineSuffices ((ind + 2, mode, doc)::rest)
-        | IfBreaks {yes = breakDoc; no = flatDoc} ->
-          if mode = Break then
-            process ~pos lineSuffices ((ind, mode, breakDoc)::rest)
-          else
-            process ~pos lineSuffices ((ind, mode, flatDoc)::rest)
-        | LineBreak lineStyle  ->
-          if mode = Break then (
-            begin match lineSuffices with
-            | [] ->
-              MiniBuffer.flush_newline buffer;
-              MiniBuffer.add_string buffer (String.make ind ' ' [@doesNotRaise]);
-              process ~pos:ind [] rest
-            | _docs ->
-              process ~pos:ind [] (List.concat [List.rev lineSuffices; cmd::rest])
-            end
-          ) else (* mode = Flat *) (
-            let pos = match lineStyle with
-            | Classic -> MiniBuffer.add_string buffer " "; pos + 1
-            | Hard -> MiniBuffer.flush_newline buffer; 0
-            | Soft -> pos
-            in
-            process ~pos lineSuffices rest
-          )
-        | Group {shouldBreak; doc} ->
-          if shouldBreak || not (fits (width - pos) ((ind, Flat, doc)::rest)) then
-            process ~pos lineSuffices ((ind, Break, doc)::rest)
-          else
-            process ~pos lineSuffices ((ind, Flat, doc)::rest)
-        | CustomLayout docs ->
-          let rec findGroupThatFits groups = match groups with
-          | [] -> Nil
-          | [lastGroup] -> lastGroup
-          | doc::docs ->
-            if (fits (width - pos) ((ind, Flat, doc)::rest)) then
-              doc
-            else
-              findGroupThatFits docs
-          in
-          let doc = findGroupThatFits docs in
-          process ~pos lineSuffices ((ind, Flat, doc)::rest)
-        end
-      | [] ->
-        begin match lineSuffices with
-        | [] -> ()
-        | suffices ->
-          process ~pos:0 [] (List.rev suffices)
-        end
-    in
-    process ~pos:0 [] [0, Flat, doc];
-
-    let len = MiniBuffer.length buffer in
-    if len > 0 && MiniBuffer.unsafe_get buffer (len - 1) != '\n' then
-      MiniBuffer.add_char buffer '\n';
-    MiniBuffer.contents buffer
-
-
-  let debug t =
-    let rec toDoc = function
-      | Nil -> text "nil"
-      | BreakParent -> text "breakparent"
-      | Text txt -> text ("text(" ^ txt ^ ")")
-      | LineSuffix doc -> group(
-          concat [
-            text "linesuffix(";
-            indent (
-              concat [line; toDoc doc]
-            );
-            line;
-            text ")"
-          ]
-        )
-      | Concat docs -> group(
-          concat [
-            text "concat(";
-            indent (
-              concat [
-                line;
-                join ~sep:(concat [text ","; line])
-                  (List.map toDoc docs) ;
-              ]
-            );
-            line;
-            text ")"
-          ]
-        )
-      | CustomLayout docs -> group(
-          concat [
-            text "customLayout(";
-            indent (
-              concat [
-                line;
-                join ~sep:(concat [text ","; line])
-                  (List.map toDoc docs) ;
-              ]
-            );
-            line;
-            text ")"
-          ]
-        )
-      | Indent doc ->
-          concat [
-            text "indent(";
-            softLine;
-            toDoc doc;
-            softLine;
-            text ")";
-          ]
-      | IfBreaks {yes = trueDoc; no = falseDoc} ->
-        group(
-          concat [
-            text "ifBreaks(";
-            indent (
-              concat [
-                line;
-                toDoc trueDoc;
-                concat [text ",";  line];
-                toDoc falseDoc;
-              ]
-            );
-            line;
-            text ")"
-          ]
-        )
-      | LineBreak break ->
-        let breakTxt = match break with
-          | Classic -> "Classic"
-          | Soft -> "Soft"
-          | Hard -> "Hard"
-        in
-        text ("LineBreak(" ^ breakTxt ^ ")")
-      | Group {shouldBreak; doc} ->
-        group(
-          concat [
-            text "Group(";
-            indent (
-              concat [
-                line;
-                text ("shouldBreak: " ^ (string_of_bool shouldBreak));
-                concat [text ",";  line];
-                toDoc doc;
-              ]
-            );
-            line;
-            text ")"
-          ]
-        )
-    in
-    let doc = toDoc t in
-    toString ~width:10 doc |> print_endline
-    [@@live]
-end
-
-module Sexp: sig
-  type t
-
-  val atom: string -> t
-  val list: t list -> t
-  val toString: t -> string
-end = struct
-  type t =
-    | Atom of string
-    | List of t list
-
-  let atom s = Atom s
-  let list l = List l
-
-  let rec toDoc t =
-    match t with
-    | Atom s -> Doc.text s
-    | List [] -> Doc.text "()"
-    | List [sexpr] -> Doc.concat [Doc.lparen; toDoc sexpr; Doc.rparen;]
-    | List (hd::tail) ->
-      Doc.group (
-        Doc.concat [
-          Doc.lparen;
-          toDoc hd;
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              Doc.join ~sep:Doc.line (List.map toDoc tail);
-            ]
-          );
-          Doc.rparen;
-        ]
-      )
-
-  let toString sexpr =
-    let doc = toDoc sexpr in
-    Doc.toString ~width:80 doc
-end
-
-module SexpAst: sig
-  val implementation: Parsetree.structure -> Sexp.t
-  val interface: Parsetree.signature -> Sexp.t
-end = struct
-  open Parsetree
-
-  let mapEmpty ~f items =
-    match items with
-    | [] -> [Sexp.list []]
-    | items -> List.map f items
-
-  let string txt =
-    Sexp.atom ("\"" ^ txt ^ "\"")
-
-  let char c =
-    Sexp.atom ("'" ^ (Char.escaped c) ^ "'")
-
-  let optChar oc =
-    match oc with
-    | None -> Sexp.atom "None"
-    | Some c ->
-      Sexp.list [
-        Sexp.atom "Some";
-        char c
-      ]
-
-  let longident l =
-    let rec loop l = match l with
-    | Longident.Lident ident -> Sexp.list [
-        Sexp.atom "Lident";
-        string ident;
-      ]
-    | Longident.Ldot (lident, txt) ->
-      Sexp.list [
-        Sexp.atom "Ldot";
-        loop lident;
-        string txt;
-      ]
-    | Longident.Lapply (l1, l2) ->
-      Sexp.list [
-        Sexp.atom "Lapply";
-        loop l1;
-        loop l2;
-      ]
-    in
-    Sexp.list [
-      Sexp.atom "longident";
-      loop l;
-    ]
-
-  let closedFlag flag = match flag with
-    | Asttypes.Closed -> Sexp.atom "Closed"
-    | Open -> Sexp.atom "Open"
-
-  let directionFlag flag = match flag with
-    | Asttypes.Upto -> Sexp.atom "Upto"
-    | Downto -> Sexp.atom "Downto"
-
-  let recFlag flag = match flag with
-    | Asttypes.Recursive -> Sexp.atom "Recursive"
-    | Nonrecursive -> Sexp.atom "Nonrecursive"
-
-  let overrideFlag flag = match flag with
-    | Asttypes.Override -> Sexp.atom "Override"
-    | Fresh -> Sexp.atom "Fresh"
-
-  let privateFlag flag = match flag with
-    | Asttypes.Public -> Sexp.atom "Public"
-    | Private -> Sexp.atom "Private"
-
-  let mutableFlag flag = match flag with
-    | Asttypes.Immutable -> Sexp.atom "Immutable"
-    | Mutable -> Sexp.atom "Mutable"
-
-   let variance v = match v with
-     | Asttypes.Covariant -> Sexp.atom "Covariant"
-     | Contravariant -> Sexp.atom "Contravariant"
-     | Invariant -> Sexp.atom "Invariant"
-
-  let argLabel lbl = match lbl with
-    | Asttypes.Nolabel -> Sexp.atom "Nolabel"
-    | Labelled txt -> Sexp.list [
-        Sexp.atom "Labelled";
-        string txt;
-      ]
-    | Optional txt -> Sexp.list [
-        Sexp.atom "Optional";
-        string txt;
-      ]
-
-  let constant c =
-    let sexpr = match c with
-    | Pconst_integer (txt, tag) ->
-      Sexp.list [
-        Sexp.atom "Pconst_integer";
-        string txt;
-        optChar tag;
-      ]
-    | Pconst_char c ->
-      Sexp.list [
-        Sexp.atom "Pconst_char";
-        Sexp.atom (Char.escaped c);
-      ]
-    | Pconst_string (txt, tag) ->
-      Sexp.list [
-        Sexp.atom "Pconst_string";
-        string txt;
-        match tag with
-        | Some txt -> Sexp.list [
-            Sexp.atom "Some";
-            string txt;
-          ]
-        | None -> Sexp.atom "None";
-      ]
-    | Pconst_float (txt, tag)  ->
-      Sexp.list [
-        Sexp.atom "Pconst_float";
-        string txt;
-        optChar tag;
-      ]
-    in
-      Sexp.list [
-        Sexp.atom "constant";
-        sexpr
-      ]
-
-  let rec structure s =
-    Sexp.list (
-      (Sexp.atom "structure")::(List.map structureItem s)
-    )
-
-  and structureItem si =
-    let desc = match si.pstr_desc with
-    | Pstr_eval (expr, attrs) ->
-      Sexp.list [
-        Sexp.atom "Pstr_eval";
-        expression expr;
-        attributes attrs;
-      ]
-    | Pstr_value (flag, vbs) ->
-      Sexp.list [
-        Sexp.atom "Pstr_value";
-        recFlag flag;
-        Sexp.list (mapEmpty ~f:valueBinding vbs)
-      ]
-    | Pstr_primitive (vd) ->
-      Sexp.list [
-        Sexp.atom "Pstr_primitive";
-        valueDescription vd;
-      ]
-    | Pstr_type (flag, tds) ->
-      Sexp.list [
-        Sexp.atom "Pstr_type";
-        recFlag flag;
-        Sexp.list (mapEmpty ~f:typeDeclaration tds)
-      ]
-    | Pstr_typext typext ->
-      Sexp.list [
-        Sexp.atom "Pstr_type";
-        typeExtension typext;
-      ]
-    | Pstr_exception ec ->
-      Sexp.list [
-        Sexp.atom "Pstr_exception";
-        extensionConstructor ec;
-      ]
-    | Pstr_module mb ->
-      Sexp.list [
-        Sexp.atom "Pstr_module";
-        moduleBinding mb;
-      ]
-    | Pstr_recmodule mbs ->
-      Sexp.list [
-        Sexp.atom "Pstr_recmodule";
-        Sexp.list (mapEmpty ~f:moduleBinding mbs);
-      ]
-    | Pstr_modtype modTypDecl ->
-      Sexp.list [
-        Sexp.atom "Pstr_modtype";
-        moduleTypeDeclaration modTypDecl;
-      ]
-    | Pstr_open openDesc ->
-      Sexp.list [
-        Sexp.atom "Pstr_open";
-        openDescription openDesc;
-      ]
-    | Pstr_class _ -> Sexp.atom "Pstr_class"
-    | Pstr_class_type _ -> Sexp.atom "Pstr_class_type"
-    | Pstr_include id ->
-      Sexp.list [
-        Sexp.atom "Pstr_include";
-        includeDeclaration id;
-      ]
-    | Pstr_attribute attr ->
-      Sexp.list [
-        Sexp.atom "Pstr_attribute";
-        attribute attr;
-      ]
-    | Pstr_extension (ext, attrs) ->
-      Sexp.list [
-        Sexp.atom "Pstr_extension";
-        extension ext;
-        attributes attrs;
-      ]
-    in
-    Sexp.list [
-      Sexp.atom "structure_item";
-      desc;
-    ]
-
-  and includeDeclaration id =
-    Sexp.list [
-      Sexp.atom "include_declaration";
-      moduleExpression id.pincl_mod;
-      attributes id.pincl_attributes;
-    ]
-
-  and openDescription od =
-    Sexp.list [
-      Sexp.atom "open_description";
-      longident od.popen_lid.Asttypes.txt;
-      attributes od.popen_attributes;
-    ]
-
-  and moduleTypeDeclaration mtd =
-    Sexp.list [
-      Sexp.atom "module_type_declaration";
-      string mtd.pmtd_name.Asttypes.txt;
-      (match mtd.pmtd_type with
-      | None -> Sexp.atom "None"
-      | Some modType -> Sexp.list [
-          Sexp.atom "Some";
-          moduleType modType;
-      ]);
-      attributes mtd.pmtd_attributes;
-    ]
-
-  and moduleBinding mb =
-    Sexp.list [
-      Sexp.atom "module_binding";
-      string mb.pmb_name.Asttypes.txt;
-      moduleExpression mb.pmb_expr;
-      attributes mb.pmb_attributes;
-    ]
-
-  and moduleExpression me =
-    let desc = match me.pmod_desc with
-    | Pmod_ident modName ->
-      Sexp.list [
-        Sexp.atom "Pmod_ident";
-        longident modName.Asttypes.txt;
-      ]
-    | Pmod_structure s ->
-      Sexp.list [
-        Sexp.atom "Pmod_structure";
-        structure s;
-      ]
-    | Pmod_functor (lbl, optModType, modExpr) ->
-      Sexp.list [
-        Sexp.atom "Pmod_functor";
-        string lbl.Asttypes.txt;
-        (match optModType with
-        | None -> Sexp.atom "None"
-        | Some modType -> Sexp.list [
-            Sexp.atom "Some";
-            moduleType modType;
-        ]);
-        moduleExpression modExpr;
-      ]
-    | Pmod_apply (callModExpr, modExprArg) ->
-      Sexp.list [
-        Sexp.atom "Pmod_apply";
-        moduleExpression callModExpr;
-        moduleExpression modExprArg;
-      ]
-    | Pmod_constraint (modExpr, modType) ->
-      Sexp.list [
-        Sexp.atom "Pmod_constraint";
-        moduleExpression modExpr;
-        moduleType modType;
-      ]
-    | Pmod_unpack expr ->
-      Sexp.list [
-        Sexp.atom "Pmod_unpack";
-        expression expr;
-      ]
-    | Pmod_extension ext ->
-      Sexp.list [
-        Sexp.atom "Pmod_extension";
-        extension ext;
-      ]
-    in
-    Sexp.list [
-      Sexp.atom "module_expr";
-      desc;
-      attributes me.pmod_attributes;
-    ]
-
-  and moduleType mt =
-    let desc = match mt.pmty_desc with
-    | Pmty_ident longidentLoc ->
-      Sexp.list [
-        Sexp.atom "Pmty_ident";
-        longident longidentLoc.Asttypes.txt;
-      ]
-    | Pmty_signature s ->
-      Sexp.list [
-        Sexp.atom "Pmty_signature";
-        signature s;
-      ]
-    | Pmty_functor (lbl, optModType, modType) ->
-      Sexp.list [
-        Sexp.atom "Pmty_functor";
-        string lbl.Asttypes.txt;
-        (match optModType with
-        | None -> Sexp.atom "None"
-        | Some modType -> Sexp.list [
-            Sexp.atom "Some";
-            moduleType modType;
-        ]);
-        moduleType modType;
-      ]
-    | Pmty_alias longidentLoc ->
-      Sexp.list [
-        Sexp.atom "Pmty_alias";
-        longident longidentLoc.Asttypes.txt;
-      ]
-    | Pmty_extension ext ->
-      Sexp.list [
-        Sexp.atom "Pmty_extension";
-        extension ext;
-      ]
-    | Pmty_typeof modExpr ->
-      Sexp.list [
-        Sexp.atom "Pmty_typeof";
-        moduleExpression modExpr;
-      ]
-    | Pmty_with (modType, withConstraints) ->
-      Sexp.list [
-        Sexp.atom "Pmty_with";
-        moduleType modType;
-        Sexp.list (mapEmpty ~f:withConstraint withConstraints);
-      ]
-    in
-    Sexp.list [
-      Sexp.atom "module_type";
-      desc;
-      attributes mt.pmty_attributes;
-    ]
-
-  and withConstraint wc = match wc with
-    | Pwith_type (longidentLoc, td) ->
-      Sexp.list [
-        Sexp.atom "Pmty_with";
-        longident longidentLoc.Asttypes.txt;
-        typeDeclaration td;
-      ]
-    | Pwith_module (l1, l2) ->
-      Sexp.list [
-        Sexp.atom "Pwith_module";
-        longident l1.Asttypes.txt;
-        longident l2.Asttypes.txt;
-      ]
-    | Pwith_typesubst (longidentLoc, td) ->
-      Sexp.list [
-        Sexp.atom "Pwith_typesubst";
-        longident longidentLoc.Asttypes.txt;
-        typeDeclaration td;
-      ]
-    | Pwith_modsubst (l1, l2) ->
-      Sexp.list [
-        Sexp.atom "Pwith_modsubst";
-        longident l1.Asttypes.txt;
-        longident l2.Asttypes.txt;
-      ]
-
-  and signature s =
-    Sexp.list (
-      (Sexp.atom "signature")::(List.map signatureItem s)
-    )
-
-  and signatureItem si =
-    let descr = match si.psig_desc with
-    | Psig_value vd ->
-      Sexp.list [
-        Sexp.atom "Psig_value";
-        valueDescription vd;
-      ]
-    | Psig_type (flag, typeDeclarations) ->
-      Sexp.list [
-        Sexp.atom "Psig_type";
-        recFlag flag;
-        Sexp.list (mapEmpty ~f:typeDeclaration typeDeclarations);
-      ]
-    | Psig_typext typExt ->
-      Sexp.list [
-        Sexp.atom "Psig_typext";
-        typeExtension typExt;
-      ]
-    | Psig_exception extConstr ->
-      Sexp.list [
-        Sexp.atom "Psig_exception";
-        extensionConstructor extConstr;
-      ]
-    | Psig_module modDecl ->
-      Sexp.list [
-        Sexp.atom "Psig_module";
-        moduleDeclaration modDecl;
-      ]
-    | Psig_recmodule modDecls ->
-      Sexp.list [
-        Sexp.atom "Psig_recmodule";
-        Sexp.list (mapEmpty ~f:moduleDeclaration modDecls);
-      ]
-    | Psig_modtype modTypDecl ->
-      Sexp.list [
-        Sexp.atom "Psig_modtype";
-        moduleTypeDeclaration modTypDecl;
-      ]
-    | Psig_open openDesc ->
-      Sexp.list [
-        Sexp.atom "Psig_open";
-        openDescription openDesc;
-      ]
-    | Psig_include inclDecl ->
-      Sexp.list [
-        Sexp.atom "Psig_include";
-        includeDescription inclDecl
-      ]
-    | Psig_class _ -> Sexp.list [Sexp.atom "Psig_class";]
-    | Psig_class_type _ -> Sexp.list [ Sexp.atom "Psig_class_type"; ]
-    | Psig_attribute attr ->
-      Sexp.list [
-        Sexp.atom "Psig_attribute";
-        attribute attr;
-      ]
-    | Psig_extension (ext, attrs) ->
-      Sexp.list [
-        Sexp.atom "Psig_extension";
-        extension ext;
-        attributes attrs;
-      ]
-    in
-    Sexp.list [
-      Sexp.atom "signature_item";
-      descr;
-    ]
-
-  and includeDescription id =
-    Sexp.list [
-      Sexp.atom "include_description";
-      moduleType id.pincl_mod;
-      attributes id.pincl_attributes;
-    ]
-
-  and moduleDeclaration md =
-    Sexp.list [
-      Sexp.atom "module_declaration";
-      string md.pmd_name.Asttypes.txt;
-      moduleType md.pmd_type;
-      attributes md.pmd_attributes;
-    ]
-
-  and valueBinding vb =
-    Sexp.list [
-      Sexp.atom "value_binding";
-      pattern vb.pvb_pat;
-      expression vb.pvb_expr;
-      attributes vb.pvb_attributes;
-    ]
-
-  and valueDescription vd =
-    Sexp.list [
-      Sexp.atom "value_description";
-      string vd.pval_name.Asttypes.txt;
-      coreType vd.pval_type;
-      Sexp.list (mapEmpty ~f:string vd.pval_prim);
-      attributes vd.pval_attributes;
-    ]
-
-  and typeDeclaration td =
-    Sexp.list [
-      Sexp.atom "type_declaration";
-      string td.ptype_name.Asttypes.txt;
-      Sexp.list [
-        Sexp.atom "ptype_params";
-        Sexp.list (mapEmpty ~f:(fun (typexpr, var) ->
-          Sexp.list [
-            coreType typexpr;
-            variance var;
-          ]) td.ptype_params)
-      ];
-      Sexp.list [
-        Sexp.atom "ptype_cstrs";
-        Sexp.list (mapEmpty ~f:(fun (typ1, typ2, _loc) ->
-          Sexp.list [
-            coreType typ1;
-            coreType typ2;
-          ]) td.ptype_cstrs)
-      ];
-      Sexp.list [
-        Sexp.atom "ptype_kind";
-        typeKind td.ptype_kind;
-      ];
-      Sexp.list [
-        Sexp.atom "ptype_manifest";
-        match td.ptype_manifest with
-        | None -> Sexp.atom "None"
-        | Some typ -> Sexp.list [
-            Sexp.atom "Some";
-            coreType typ;
-          ]
-      ];
-      Sexp.list [
-        Sexp.atom "ptype_private";
-        privateFlag td.ptype_private;
-      ];
-      attributes td.ptype_attributes;
-    ]
-
-  and extensionConstructor ec =
-    Sexp.list [
-      Sexp.atom "extension_constructor";
-      string ec.pext_name.Asttypes.txt;
-      extensionConstructorKind ec.pext_kind;
-      attributes ec.pext_attributes;
-    ]
-
-  and extensionConstructorKind kind = match kind with
-    | Pext_decl (args, optTypExpr) ->
-      Sexp.list [
-        Sexp.atom "Pext_decl";
-        constructorArguments args;
-        match optTypExpr with
-        | None -> Sexp.atom "None"
-        | Some typ -> Sexp.list [
-            Sexp.atom "Some";
-            coreType typ;
-          ]
-      ]
-  | Pext_rebind longidentLoc ->
-    Sexp.list [
-      Sexp.atom "Pext_rebind";
-      longident longidentLoc.Asttypes.txt;
-    ]
-
-  and typeExtension te =
-    Sexp.list [
-      Sexp.atom "type_extension";
-      Sexp.list [
-        Sexp.atom "ptyext_path";
-        longident te.ptyext_path.Asttypes.txt;
-      ];
-      Sexp.list [
-        Sexp.atom "ptyext_parms";
-        Sexp.list (mapEmpty ~f:(fun (typexpr, var) ->
-          Sexp.list [
-            coreType typexpr;
-            variance var;
-          ]) te.ptyext_params)
-      ];
-      Sexp.list [
-        Sexp.atom "ptyext_constructors";
-        Sexp.list (mapEmpty ~f:extensionConstructor te.ptyext_constructors);
-      ];
-      Sexp.list [
-        Sexp.atom "ptyext_private";
-        privateFlag te.ptyext_private;
-      ];
-      attributes te.ptyext_attributes;
-    ]
-
-  and typeKind kind = match kind with
-    | Ptype_abstract -> Sexp.atom "Ptype_abstract"
-    | Ptype_variant constrDecls ->
-      Sexp.list [
-        Sexp.atom "Ptype_variant";
-        Sexp.list (mapEmpty ~f:constructorDeclaration constrDecls);
-      ]
-    | Ptype_record lblDecls ->
-      Sexp.list [
-        Sexp.atom "Ptype_record";
-        Sexp.list (mapEmpty ~f:labelDeclaration lblDecls);
-      ]
-    | Ptype_open -> Sexp.atom "Ptype_open"
-
-  and constructorDeclaration cd =
-    Sexp.list [
-      Sexp.atom "constructor_declaration";
-      string cd.pcd_name.Asttypes.txt;
-      Sexp.list [
-        Sexp.atom "pcd_args";
-        constructorArguments cd.pcd_args;
-      ];
-      Sexp.list [
-        Sexp.atom "pcd_res";
-        match cd.pcd_res with
-        | None -> Sexp.atom "None"
-        | Some typ -> Sexp.list [
-            Sexp.atom "Some";
-            coreType typ;
-          ]
-      ];
-      attributes cd.pcd_attributes;
-    ]
-
-  and constructorArguments args = match args with
-    | Pcstr_tuple types ->
-      Sexp.list [
-        Sexp.atom "Pcstr_tuple";
-        Sexp.list (mapEmpty ~f:coreType types)
-      ]
-    | Pcstr_record lds ->
-      Sexp.list [
-        Sexp.atom "Pcstr_record";
-        Sexp.list (mapEmpty ~f:labelDeclaration lds)
-      ]
-
-  and labelDeclaration ld =
-    Sexp.list [
-      Sexp.atom "label_declaration";
-      string ld.pld_name.Asttypes.txt;
-      mutableFlag ld.pld_mutable;
-      coreType ld.pld_type;
-      attributes ld.pld_attributes;
-    ]
-
-  and expression expr =
-    let desc = match expr.pexp_desc with
-    | Pexp_ident longidentLoc ->
-      Sexp.list [
-        Sexp.atom "Pexp_ident";
-        longident longidentLoc.Asttypes.txt;
-      ]
-    | Pexp_constant c ->
-      Sexp.list [
-        Sexp.atom "Pexp_constant";
-        constant c
-      ]
-    | Pexp_let (flag, vbs, expr) ->
-      Sexp.list [
-        Sexp.atom "Pexp_let";
-        recFlag flag;
-        Sexp.list (mapEmpty ~f:valueBinding vbs);
-        expression expr;
-      ]
-    | Pexp_function cases ->
-      Sexp.list [
-        Sexp.atom "Pexp_function";
-        Sexp.list (mapEmpty ~f:case cases);
-      ]
-    | Pexp_fun (argLbl, exprOpt, pat, expr) ->
-      Sexp.list [
-        Sexp.atom "Pexp_fun";
-        argLabel argLbl;
-        (match exprOpt with
-        | None -> Sexp.atom "None"
-        | Some expr -> Sexp.list [
-            Sexp.atom "Some";
-            expression expr;
-        ]);
-        pattern pat;
-        expression expr;
-      ]
-    | Pexp_apply (expr, args) ->
-      Sexp.list [
-        Sexp.atom "Pexp_apply";
-        expression expr;
-        Sexp.list (mapEmpty ~f:(fun (argLbl, expr) -> Sexp.list [
-          argLabel argLbl;
-          expression expr
-        ]) args);
-      ]
-    | Pexp_match (expr, cases) ->
-      Sexp.list [
-        Sexp.atom "Pexp_match";
-        expression expr;
-        Sexp.list (mapEmpty ~f:case cases);
-      ]
-    | Pexp_try (expr, cases) ->
-      Sexp.list [
-        Sexp.atom "Pexp_try";
-        expression expr;
-        Sexp.list (mapEmpty ~f:case cases);
-      ]
-    | Pexp_tuple exprs ->
-      Sexp.list [
-        Sexp.atom "Pexp_tuple";
-        Sexp.list (mapEmpty ~f:expression exprs);
-      ]
-    | Pexp_construct (longidentLoc, exprOpt) ->
-      Sexp.list [
-        Sexp.atom "Pexp_construct";
-        longident longidentLoc.Asttypes.txt;
-        match exprOpt with
-        | None -> Sexp.atom "None"
-        | Some expr ->
-          Sexp.list [
-            Sexp.atom "Some";
-            expression expr;
-          ]
-      ]
-    | Pexp_variant (lbl, exprOpt) ->
-      Sexp.list [
-        Sexp.atom "Pexp_variant";
-        string lbl;
-        match exprOpt with
-        | None -> Sexp.atom "None"
-        | Some expr ->
-          Sexp.list [
-            Sexp.atom "Some";
-            expression expr;
-          ]
-      ]
-    | Pexp_record (rows, optExpr) ->
-      Sexp.list [
-        Sexp.atom "Pexp_record";
-        Sexp.list (mapEmpty ~f:(fun (longidentLoc, expr) -> Sexp.list [
-          longident longidentLoc.Asttypes.txt;
-          expression expr;
-        ]) rows);
-        (match optExpr with
-        | None -> Sexp.atom "None"
-        | Some expr ->
-          Sexp.list [
-            Sexp.atom "Some";
-            expression expr;
-          ]);
-      ]
-    | Pexp_field (expr, longidentLoc) ->
-      Sexp.list [
-        Sexp.atom "Pexp_field";
-        expression expr;
-        longident longidentLoc.Asttypes.txt;
-      ]
-    | Pexp_setfield (expr1, longidentLoc, expr2) ->
-      Sexp.list [
-        Sexp.atom "Pexp_setfield";
-        expression expr1;
-        longident longidentLoc.Asttypes.txt;
-        expression expr2;
-      ]
-    | Pexp_array exprs ->
-      Sexp.list [
-        Sexp.atom "Pexp_array";
-        Sexp.list (mapEmpty ~f:expression exprs);
-      ]
-    | Pexp_ifthenelse (expr1, expr2, optExpr) ->
-      Sexp.list [
-        Sexp.atom "Pexp_ifthenelse";
-        expression expr1;
-        expression expr2;
-        (match optExpr with
-        | None -> Sexp.atom "None"
-        | Some expr ->
-          Sexp.list [
-            Sexp.atom "Some";
-            expression expr;
-          ]);
-      ]
-    | Pexp_sequence (expr1, expr2) ->
-      Sexp.list [
-        Sexp.atom "Pexp_sequence";
-        expression expr1;
-        expression expr2;
-      ]
-    | Pexp_while (expr1, expr2) ->
-      Sexp.list [
-        Sexp.atom "Pexp_while";
-        expression expr1;
-        expression expr2;
-      ]
-    | Pexp_for (pat, e1, e2, flag, e3) ->
-      Sexp.list [
-        Sexp.atom "Pexp_for";
-        pattern pat;
-        expression e1;
-        expression e2;
-        directionFlag flag;
-        expression e3;
-      ]
-    | Pexp_constraint (expr, typexpr) ->
-      Sexp.list [
-        Sexp.atom "Pexp_constraint";
-        expression expr;
-        coreType typexpr;
-      ]
-    | Pexp_coerce (expr, optTyp, typexpr) ->
-      Sexp.list [
-        Sexp.atom "Pexp_coerce";
-        expression expr;
-        (match optTyp with
-        | None -> Sexp.atom "None"
-        | Some typ -> Sexp.list [
-            Sexp.atom "Some";
-            coreType typ;
-        ]);
-        coreType typexpr;
-      ]
-    | Pexp_send _ ->
-      Sexp.list [
-        Sexp.atom "Pexp_send";
-      ]
-    | Pexp_new _ ->
-      Sexp.list [
-        Sexp.atom "Pexp_new";
-      ]
-    | Pexp_setinstvar _ ->
-      Sexp.list [
-        Sexp.atom "Pexp_setinstvar";
-      ]
-    | Pexp_override _ ->
-      Sexp.list [
-        Sexp.atom "Pexp_override";
-      ]
-    | Pexp_letmodule (modName, modExpr, expr) ->
-      Sexp.list [
-        Sexp.atom "Pexp_letmodule";
-        string modName.Asttypes.txt;
-        moduleExpression modExpr;
-        expression expr;
-      ]
-    | Pexp_letexception (extConstr, expr) ->
-      Sexp.list [
-        Sexp.atom "Pexp_letexception";
-        extensionConstructor extConstr;
-        expression expr;
-      ]
-    | Pexp_assert expr ->
-      Sexp.list [
-        Sexp.atom "Pexp_assert";
-        expression expr;
-      ]
-    | Pexp_lazy expr ->
-      Sexp.list [
-        Sexp.atom "Pexp_lazy";
-        expression expr;
-      ]
-    | Pexp_poly _ ->
-      Sexp.list [
-        Sexp.atom "Pexp_poly";
-      ]
-    | Pexp_object _ ->
-      Sexp.list [
-        Sexp.atom "Pexp_object";
-      ]
-    | Pexp_newtype (lbl, expr) ->
-      Sexp.list [
-        Sexp.atom "Pexp_newtype";
-        string lbl.Asttypes.txt;
-        expression expr;
-      ]
-    | Pexp_pack modExpr ->
-      Sexp.list [
-        Sexp.atom "Pexp_pack";
-        moduleExpression modExpr;
-      ]
-    | Pexp_open (flag, longidentLoc, expr) ->
-      Sexp.list [
-        Sexp.atom "Pexp_open";
-        overrideFlag flag;
-        longident longidentLoc.Asttypes.txt;
-        expression expr;
-      ]
-    | Pexp_extension ext ->
-      Sexp.list [
-        Sexp.atom "Pexp_extension";
-        extension ext;
-      ]
-    | Pexp_unreachable -> Sexp.atom "Pexp_unreachable"
-    in
-    Sexp.list [
-      Sexp.atom "expression";
-      desc;
-    ]
-
-  and case c =
-    Sexp.list [
-      Sexp.atom "case";
-      Sexp.list [
-        Sexp.atom "pc_lhs";
-        pattern c.pc_lhs;
-      ];
-      Sexp.list [
-        Sexp.atom "pc_guard";
-        match c.pc_guard with
-        | None -> Sexp.atom "None"
-        | Some expr -> Sexp.list [
-            Sexp.atom "Some";
-            expression expr;
-          ]
-      ];
-      Sexp.list [
-        Sexp.atom "pc_rhs";
-        expression c.pc_rhs;
-      ]
-    ]
-
-  and pattern p =
-    let descr = match p.ppat_desc with
-    | Ppat_any ->
-      Sexp.atom "Ppat_any"
-    | Ppat_var var ->
-      Sexp.list [
-        Sexp.atom "Ppat_var";
-        string var.Location.txt;
-      ]
-    | Ppat_alias (p, alias) ->
-      Sexp.list [
-        Sexp.atom "Ppat_alias";
-        pattern p;
-        string alias.txt;
-      ]
-    | Ppat_constant c ->
-      Sexp.list [
-        Sexp.atom "Ppat_constant";
-        constant c;
-      ]
-    | Ppat_interval (lo, hi) ->
-      Sexp.list [
-        Sexp.atom "Ppat_interval";
-        constant lo;
-        constant hi;
-      ]
-    | Ppat_tuple (patterns) ->
-      Sexp.list [
-        Sexp.atom "Ppat_tuple";
-        Sexp.list (mapEmpty ~f:pattern patterns);
-      ]
-    | Ppat_construct (longidentLoc, optPattern) ->
-      Sexp.list [
-        Sexp.atom "Ppat_construct";
-        longident longidentLoc.Location.txt;
-        match optPattern with
-        | None -> Sexp.atom "None"
-        | Some p -> Sexp.list [
-            Sexp.atom "some";
-            pattern p;
-          ]
-      ]
-    | Ppat_variant (lbl, optPattern) ->
-      Sexp.list [
-        Sexp.atom "Ppat_variant";
-        string lbl;
-        match optPattern with
-        | None -> Sexp.atom "None"
-        | Some p -> Sexp.list [
-            Sexp.atom "Some";
-            pattern p;
-          ]
-      ]
-    | Ppat_record (rows, flag) ->
-      Sexp.list [
-        Sexp.atom "Ppat_record";
-        closedFlag flag;
-        Sexp.list (mapEmpty ~f:(fun (longidentLoc, p) ->
-          Sexp.list [
-            longident longidentLoc.Location.txt;
-            pattern p;
-          ]
-        ) rows)
-      ]
-    | Ppat_array patterns ->
-      Sexp.list [
-        Sexp.atom "Ppat_array";
-        Sexp.list (mapEmpty ~f:pattern patterns);
-      ]
-    | Ppat_or (p1, p2) ->
-      Sexp.list [
-        Sexp.atom "Ppat_or";
-        pattern p1;
-        pattern p2;
-      ]
-    | Ppat_constraint (p, typexpr) ->
-      Sexp.list [
-        Sexp.atom "Ppat_constraint";
-        pattern p;
-        coreType typexpr;
-      ]
-    | Ppat_type longidentLoc ->
-      Sexp.list [
-        Sexp.atom "Ppat_type";
-        longident longidentLoc.Location.txt
-      ]
-    | Ppat_lazy p ->
-      Sexp.list [
-        Sexp.atom "Ppat_lazy";
-        pattern p;
-      ]
-    | Ppat_unpack stringLoc ->
-      Sexp.list [
-        Sexp.atom "Ppat_unpack";
-        string stringLoc.Location.txt;
-      ]
-    | Ppat_exception p ->
-      Sexp.list [
-        Sexp.atom "Ppat_exception";
-        pattern p;
-      ]
-    | Ppat_extension ext ->
-      Sexp.list [
-        Sexp.atom "Ppat_extension";
-        extension ext;
-      ]
-    | Ppat_open (longidentLoc, p) ->
-      Sexp.list [
-        Sexp.atom "Ppat_open";
-        longident longidentLoc.Location.txt;
-        pattern p;
-      ]
-    in
-    Sexp.list [
-      Sexp.atom "pattern";
-      descr;
-    ]
-
-  and objectField field = match field with
-  | Otag (lblLoc, attrs, typexpr) ->
-    Sexp.list [
-      Sexp.atom "Otag";
-      string lblLoc.txt;
-      attributes attrs;
-      coreType typexpr;
-    ]
-  | Oinherit typexpr ->
-    Sexp.list [
-      Sexp.atom "Oinherit";
-      coreType typexpr;
-    ]
-
-  and rowField field = match field with
-    | Rtag (labelLoc, attrs, truth, types) ->
-      Sexp.list [
-        Sexp.atom "Rtag";
-        string labelLoc.txt;
-        attributes attrs;
-        Sexp.atom (if truth then "true" else "false");
-        Sexp.list (mapEmpty ~f:coreType types);
-      ]
-    | Rinherit typexpr ->
-      Sexp.list [
-        Sexp.atom "Rinherit";
-        coreType typexpr;
-      ]
-
-  and packageType (modNameLoc, packageConstraints) =
-    Sexp.list [
-      Sexp.atom "package_type";
-      longident modNameLoc.Asttypes.txt;
-      Sexp.list (mapEmpty ~f:(fun (modNameLoc, typexpr) ->
-        Sexp.list [
-          longident modNameLoc.Asttypes.txt;
-          coreType typexpr;
-        ]
-      ) packageConstraints)
-    ]
-
-  and coreType typexpr =
-    let desc = match typexpr.ptyp_desc with
-      | Ptyp_any -> Sexp.atom "Ptyp_any"
-      | Ptyp_var var -> Sexp.list [
-          Sexp.atom "Ptyp_var";
-          string  var
-        ]
-      | Ptyp_arrow (argLbl, typ1, typ2) ->
-        Sexp.list [
-          Sexp.atom "Ptyp_arrow";
-          argLabel argLbl;
-          coreType typ1;
-          coreType typ2;
-        ]
-      | Ptyp_tuple types ->
-        Sexp.list [
-          Sexp.atom "Ptyp_tuple";
-          Sexp.list (mapEmpty ~f:coreType types);
-        ]
-      | Ptyp_constr (longidentLoc, types) ->
-        Sexp.list [
-          Sexp.atom "Ptyp_constr";
-          longident longidentLoc.txt;
-          Sexp.list (mapEmpty ~f:coreType types);
-        ]
-      | Ptyp_alias (typexpr, alias) ->
-        Sexp.list [
-          Sexp.atom "Ptyp_alias";
-          coreType typexpr;
-          string alias;
-        ]
-      | Ptyp_object (fields, flag) ->
-        Sexp.list [
-          Sexp.atom "Ptyp_object";
-          closedFlag flag;
-          Sexp.list (mapEmpty ~f:objectField fields)
-        ]
-      | Ptyp_class (longidentLoc, types) ->
-        Sexp.list [
-          Sexp.atom "Ptyp_class";
-          longident longidentLoc.Location.txt;
-          Sexp.list (mapEmpty ~f:coreType types)
-        ]
-      | Ptyp_variant (fields, flag, optLabels) ->
-        Sexp.list [
-          Sexp.atom "Ptyp_variant";
-          Sexp.list (mapEmpty ~f:rowField fields);
-          closedFlag flag;
-          match optLabels with
-          | None -> Sexp.atom "None"
-          | Some lbls -> Sexp.list (mapEmpty ~f:string lbls);
-        ]
-      | Ptyp_poly (lbls, typexpr) ->
-        Sexp.list [
-          Sexp.atom "Ptyp_poly";
-          Sexp.list (mapEmpty ~f:(fun lbl -> string lbl.Asttypes.txt) lbls);
-          coreType typexpr;
-        ]
-      | Ptyp_package (package) ->
-        Sexp.list [
-          Sexp.atom "Ptyp_package";
-          packageType package;
-        ]
-      | Ptyp_extension (ext) ->
-        Sexp.list [
-          Sexp.atom "Ptyp_extension";
-          extension ext;
-        ]
-    in
-    Sexp.list [
-      Sexp.atom "core_type";
-      desc;
-    ]
-
-  and payload p =
-    match p with
-    | PStr s ->
-      Sexp.list (
-        (Sexp.atom "PStr")::(mapEmpty ~f:structureItem s)
-      )
-    | PSig s ->
-      Sexp.list [
-        Sexp.atom "PSig";
-        signature s;
-      ]
-    | PTyp ct ->
-      Sexp.list [
-        Sexp.atom "PTyp";
-        coreType ct
-      ]
-    | PPat (pat, optExpr) ->
-      Sexp.list [
-        Sexp.atom "PPat";
-        pattern pat;
-        match optExpr with
-        | Some expr -> Sexp.list [
-            Sexp.atom "Some";
-            expression expr;
-          ]
-        | None -> Sexp.atom "None";
-      ]
-
-  and attribute (stringLoc, p) =
-    Sexp.list [
-      Sexp.atom "attribute";
-      Sexp.atom stringLoc.Asttypes.txt;
-      payload p;
-    ]
-
-  and extension (stringLoc, p) =
-    Sexp.list [
-      Sexp.atom "extension";
-      Sexp.atom stringLoc.Asttypes.txt;
-      payload p;
-    ]
-
-  and attributes attrs =
-    let sexprs = mapEmpty ~f:attribute attrs in
-    Sexp.list ((Sexp.atom "attributes")::sexprs)
-
-  let implementation = structure
-  let interface = signature
-end
-
-module IO: sig
-  val readFile: string -> string
-  val readStdin: unit -> string
-end = struct
-  (* random chunk size: 2^15, TODO: why do we guess randomly? *)
-  let chunkSize = 32768
-
-  let readFile filename =
-    let chan = open_in filename in
-    let buffer = Buffer.create chunkSize in
-    let chunk = (Bytes.create [@doesNotRaise]) chunkSize in
-    let rec loop () =
-      let len = try input chan chunk 0 chunkSize with Invalid_argument _ -> 0 in
-      if len == 0 then (
-        close_in_noerr chan;
-        Buffer.contents buffer
-      ) else (
-        Buffer.add_subbytes buffer chunk 0 len;
-        loop ()
-      )
-    in
-    loop ()
-
-  let readStdin () =
-    let buffer = Buffer.create chunkSize in
-    let chunk = (Bytes.create [@doesNotRaise]) chunkSize in
-    let rec loop () =
-      let len = try input stdin chunk 0 chunkSize with Invalid_argument _ -> 0 in
-      if len == 0 then (
-        close_in_noerr stdin;
-        Buffer.contents buffer
-      ) else (
-        Buffer.add_subbytes buffer chunk 0 len;
-        loop ()
-      )
-    in
-    loop ()
-end
-
-module CharacterCodes = struct
-  let eof = -1
-
-  let space = 0x0020
-  let newline = 0x0A (* \n *) [@@live]
-  let lineFeed = 0x0A (* \n *)
-  let carriageReturn = 0x0D  (* \r *)
-  let lineSeparator = 0x2028
-  let paragraphSeparator = 0x2029
-
-  let tab = 0x09
-
-  let bang = 0x21
-  let dot = 0x2E
-  let colon = 0x3A
-  let comma = 0x2C
-  let backtick = 0x60
-  (* let question = 0x3F *)
-  let semicolon = 0x3B
-  let underscore = 0x5F
-  let singleQuote = 0x27
-  let doubleQuote = 0x22
-  let equal = 0x3D
-  let bar = 0x7C
-  let tilde = 0x7E
-  let question = 0x3F
-  let ampersand = 0x26
-  let at = 0x40
-  let dollar = 0x24
-  let percent = 0x25
-
-  let lparen = 0x28
-  let rparen = 0x29
-  let lbracket = 0x5B
-  let rbracket = 0x5D
-  let lbrace = 0x7B
-  let rbrace = 0x7D
-
-  let forwardslash = 0x2F (* / *)
-  let backslash = 0x5C (* \ *)
-
-  let greaterThan = 0x3E
-  let hash = 0x23
-  let lessThan = 0x3C
-
-  let minus = 0x2D
-  let plus = 0x2B
-  let asterisk = 0x2A
-
-  let _0 = 0x30
-  let _1 = 0x31 [@@live]
-  let _2 = 0x32 [@@live]
-  let _3 = 0x33 [@@live]
-  let _4 = 0x34 [@@live]
-  let _5 = 0x35 [@@live]
-  let _6 = 0x36 [@@live]
-  let _7 = 0x37 [@@live]
-  let _8 = 0x38 [@@live]
-  let _9 = 0x39
-
-  module Lower = struct
-    let a = 0x61
-    let b = 0x62
-    let c = 0x63 [@@live]
-    let d = 0x64 [@@live]
-    let e = 0x65
-    let f = 0x66
-    let g = 0x67
-    let h = 0x68 [@@live]
-    let i = 0x69 [@@live]
-    let j = 0x6A [@@live]
-    let k = 0x6B [@@live]
-    let l = 0x6C [@@live]
-    let m = 0x6D [@@live]
-    let n = 0x6E
-    let o = 0x6F
-    let p = 0x70
-    let q = 0x71 [@@live]
-    let r = 0x72
-    let s = 0x73 [@@live]
-    let t = 0x74
-    let u = 0x75 [@@live]
-    let v = 0x76 [@@live]
-    let w = 0x77 [@@live]
-    let x = 0x78
-    let y = 0x79 [@@live]
-    let z = 0x7A
-  end
-
-  module Upper = struct
-    let a = 0x41
-    (* let b = 0x42 *)
-    let c = 0x43 [@@live]
-    let d = 0x44 [@@live]
-    let e = 0x45 [@@live]
-    let f = 0x46 [@@live]
-    let g = 0x47
-    let h = 0x48 [@@live]
-    let i = 0x49 [@@live]
-    let j = 0x4A [@@live]
-    let k = 0x4B [@@live]
-    let l = 0x4C [@@live]
-    let m = 0x4D [@@live]
-    let b = 0x4E [@@live]
-    let o = 0x4F [@@live]
-    let p = 0x50 [@@live]
-    let q = 0x51 [@@live]
-    let r = 0x52 [@@live]
-    let s = 0x53 [@@live]
-    let t = 0x54 [@@live]
-    let u = 0x55 [@@live]
-    let v = 0x56 [@@live]
-    let w = 0x57 [@@live]
-    let x = 0x58 [@@live]
-    let y = 0x59 [@@live]
-    let z = 0x5a
-  end
-
-  (* returns lower-case ch, ch should be ascii *)
-  let lower ch =
-    (* if ch >= Lower.a && ch <= Lower.z then ch else ch + 32 *)
-    32 lor ch
-
-  let isLetter ch =
-    Lower.a <= ch && ch <= Lower.z ||
-    Upper.a <= ch && ch <= Upper.z
-
-  let isUpperCase ch =
-    Upper.a <= ch && ch <= Upper.z
-
-  let isDigit ch = _0 <= ch && ch <= _9
-
-  let isHex ch =
-    (_0 <= ch && ch <= _9) ||
-    (Lower.a <= (lower ch) && (lower ch) <= Lower.f)
-
-    (*
-      // ES5 7.3:
-      // The ECMAScript line terminator characters are listed in Table 3.
-      //     Table 3: Line Terminator Characters
-      //     Code Unit Value     Name                    Formal Name
-      //     \u000A              Line Feed               <LF>
-      //     \u000D              Carriage Return         <CR>
-      //     \u2028              Line separator          <LS>
-      //     \u2029              Paragraph separator     <PS>
-      // Only the characters in Table 3 are treated as line terminators. Other new line or line
-      // breaking characters are treated as white space but not as line terminators.
-  *)
-  let isLineBreak ch =
-       ch == lineFeed
-    || ch == carriageReturn
-    || ch == lineSeparator
-    || ch == paragraphSeparator
-
-  let digitValue ch =
-    if _0 <= ch && ch <= _9 then
-      ch - 48
-    else if Lower.a <= (lower ch) && (lower ch) <= Lower.f then
-      (lower ch) - Lower.a + 10
-    else
-      16 (* larger than any legal value *)
-end
-
-module Comment: sig
-  type t
-
-  val toString: t -> string
-
-  val loc: t -> Location.t
-  val txt: t -> string
-  val prevTokEndPos: t -> Lexing.position
-
-  val setPrevTokEndPos: t -> Lexing.position -> unit
-
-  val isSingleLineComment: t -> bool
-
-  val makeSingleLineComment: loc:Location.t -> string -> t
-  val makeMultiLineComment: loc:Location.t -> string -> t
-  val fromOcamlComment:
-    loc:Location.t -> txt:string -> prevTokEndPos:Lexing.position -> t
-  val trimSpaces: string -> string
-end = struct
-  type style =
-    | SingleLine
-    | MultiLine
-
-  let styleToString s = match s with
-    | SingleLine -> "SingleLine"
-    | MultiLine -> "MultiLine"
-
-  type t = {
-    txt: string;
-    style: style;
-    loc: Location.t;
-    mutable prevTokEndPos: Lexing.position;
-  }
-
-  let loc t = t.loc
-  let txt t = t.txt
-  let prevTokEndPos t = t.prevTokEndPos
-
-  let setPrevTokEndPos t pos =
-    t.prevTokEndPos <- pos
-
-  let isSingleLineComment t = match t.style with
-    | SingleLine -> true
-    | MultiLine -> false
-
-  let toString t =
-    Format.sprintf
-      "(txt: %s\nstyle: %s\nlines: %d-%d)"
-      t.txt
-      (styleToString t.style)
-      t.loc.loc_start.pos_lnum
-      t.loc.loc_end.pos_lnum
-
-  let makeSingleLineComment ~loc txt = {
-    txt;
-    loc;
-    style = SingleLine;
-    prevTokEndPos = Lexing.dummy_pos;
-  }
-
-  let makeMultiLineComment ~loc txt = {
-    txt;
-    loc;
-    style = MultiLine;
-    prevTokEndPos = Lexing.dummy_pos;
-  }
-
-  let fromOcamlComment ~loc ~txt ~prevTokEndPos = {
-    txt;
-    loc;
-    style = MultiLine;
-    prevTokEndPos = prevTokEndPos
-  }
-
-  let trimSpaces s =
-    let len = String.length s in
-    if len = 0 then s
-    else if String.unsafe_get s 0 = ' ' || String.unsafe_get s (len - 1) = ' ' then (
-      let b = Bytes.of_string s in
-      let i = ref 0 in
-      while !i < len && (Bytes.unsafe_get b !i) = ' ' do
-        incr i
-      done;
-      let j = ref (len - 1) in
-      while !j >= !i && (Bytes.unsafe_get b !j) = ' ' do
-        decr j
-      done;
-      if !j >= !i then
-        (Bytes.sub [@doesNotRaise]) b !i (!j - !i + 1) |> Bytes.to_string
-      else
-        ""
-    ) else s
-end
-
-module Token = struct
-  type t =
-    | Open
-    | True | False
-    | Character of char
-    | Int of {i: string; suffix: char option}
-    | Float of {f: string; suffix: char option}
-    | String of string
-    | Lident of string
-    | Uident of string
-    | As
-    | Dot | DotDot | DotDotDot
-    | Bang
-    | Semicolon
-    | Let
-    | And
-    | Rec
-    | Underscore
-    | SingleQuote
-    | Equal | EqualEqual | EqualEqualEqual
-    | Bar
-    | Lparen
-    | Rparen
-    | Lbracket
-    | Rbracket
-    | Lbrace
-    | Rbrace
-    | Colon
-    | Comma
-    | Eof
-    | Exception
-    | Backslash [@live]
-    | Forwardslash | ForwardslashDot
-    | Asterisk | AsteriskDot | Exponentiation
-    | Minus | MinusDot
-    | Plus | PlusDot | PlusPlus | PlusEqual
-    | ColonGreaterThan
-    | GreaterThan
-    | LessThan
-    | LessThanSlash
-    | Hash | HashEqual | HashHash
-    | Assert
-    | Lazy
-    | Tilde
-    | Question
-    | If | Else | For | In | To | Downto | While | Switch
-    | When
-    | EqualGreater | MinusGreater
-    | External
-    | Typ
-    | Private
-    | Mutable
-    | Constraint
-    | Include
-    | Module
-    | Of
-    | With
-    | Land | Lor
-    | Band (* Bitwise and: & *)
-    | BangEqual | BangEqualEqual
-    | LessEqual | GreaterEqual
-    | ColonEqual
-    | At | AtAt
-    | Percent | PercentPercent
-    | Comment of Comment.t
-    | List
-    | TemplateTail of string
-    | TemplatePart of string
-    | Backtick
-    | BarGreater
-    | Try | Catch
-    | Import
-    | Export
-
-  let precedence = function
-    | HashEqual | ColonEqual -> 1
-    | Lor -> 2
-    | Land -> 3
-    | Equal | EqualEqual | EqualEqualEqual | LessThan | GreaterThan
-    | BangEqual | BangEqualEqual | LessEqual | GreaterEqual | BarGreater -> 4
-    | Plus | PlusDot | Minus | MinusDot | PlusPlus -> 5
-    | Asterisk | AsteriskDot | Forwardslash | ForwardslashDot -> 6
-    | Exponentiation -> 7
-    | MinusGreater -> 8
-    | Dot -> 9
-    | _ -> 0
-
-  let toString = function
-    | Open -> "open"
-    | True -> "true" | False -> "false"
-    | Character c -> "'" ^ (Char.escaped c) ^ "'"
-    | String s -> s
-    | Lident str -> str
-    | Uident str -> str
-    | Dot -> "." | DotDot -> ".." | DotDotDot -> "..."
-    | Int {i} -> "int " ^ i
-    | Float {f} -> "Float: " ^ f
-    | Bang -> "!"
-    | Semicolon -> ";"
-    | Let -> "let"
-    | And -> "and"
-    | Rec -> "rec"
-    | Underscore -> "_"
-    | SingleQuote -> "'"
-    | Equal -> "=" | EqualEqual -> "==" | EqualEqualEqual -> "==="
-    | Eof -> "eof"
-    | Bar -> "|"
-    | As -> "as"
-    | Lparen -> "(" | Rparen -> ")"
-    | Lbracket -> "[" | Rbracket -> "]"
-    | Lbrace -> "{" | Rbrace -> "}"
-    | ColonGreaterThan -> ":>"
-    | Colon -> ":"
-    | Comma -> ","
-    | Minus -> "-" | MinusDot -> "-."
-    | Plus -> "+" | PlusDot -> "+." | PlusPlus -> "++" | PlusEqual -> "+="
-    | Backslash -> "\\"
-    | Forwardslash -> "/" | ForwardslashDot -> "/."
-    | Exception -> "exception"
-    | Hash -> "#" | HashHash -> "##" | HashEqual -> "#="
-    | GreaterThan -> ">"
-    | LessThan -> "<"
-    | LessThanSlash -> "</"
-    | Asterisk -> "*" | AsteriskDot -> "*." | Exponentiation -> "**"
-    | Assert -> "assert"
-    | Lazy -> "lazy"
-    | Tilde -> "tilde"
-    | Question -> "?"
-    | If -> "if"
-    | Else -> "else"
-    | For -> "for"
-    | In -> "in"
-    | To -> "to"
-    | Downto -> "downto"
-    | While -> "while"
-    | Switch -> "switch"
-    | When -> "when"
-    | EqualGreater -> "=>" | MinusGreater -> "->"
-    | External -> "external"
-    | Typ -> "type"
-    | Private -> "private"
-    | Constraint -> "constraint"
-    | Mutable -> "mutable"
-    | Include -> "include"
-    | Module -> "module"
-    | Of -> "of"
-    | With -> "with"
-    | Lor -> "||"
-    | Band -> "&" | Land -> "&&"
-    | BangEqual -> "!=" | BangEqualEqual -> "!=="
-    | GreaterEqual -> ">=" | LessEqual -> "<="
-    | ColonEqual -> ":="
-    | At -> "@" | AtAt -> "@@"
-    | Percent -> "%" | PercentPercent -> "%%"
-    | Comment c -> "Comment(" ^ (Comment.toString c) ^ ")"
-    | List -> "list"
-    | TemplatePart text -> text ^ "${"
-    | TemplateTail text -> "TemplateTail(" ^ text ^ ")"
-    | Backtick -> "`"
-    | BarGreater -> "|>"
-    | Try -> "try" | Catch -> "catch"
-    | Import -> "import"
-    | Export -> "export"
-
-  let keywordTable = function
-  | "true" -> True
-  | "false" -> False
-  | "open" -> Open
-  | "let" -> Let
-  | "rec" -> Rec
-  | "and" -> And
-  | "as" -> As
-  | "exception" -> Exception
-  | "assert" -> Assert
-  | "lazy" -> Lazy
-  | "if" -> If
-  | "else" -> Else
-  | "for" -> For
-  | "in" -> In
-  | "to" -> To
-  | "downto" -> Downto
-  | "while" -> While
-  | "switch" -> Switch
-  | "when" -> When
-  | "external" -> External
-  | "type" -> Typ
-  | "private" -> Private
-  | "mutable" -> Mutable
-  | "constraint" -> Constraint
-  | "include" -> Include
-  | "module" -> Module
-  | "of" -> Of
-  | "list" -> List
-  | "with" -> With
-  | "try" -> Try
-  | "catch" -> Catch
-  | "import" -> Import
-  | "export" -> Export
-  | _ -> raise Not_found
-  [@@raises Not_found]
-
-  let isKeyword = function
-    | True | False | Open | Let | Rec | And | As
-    | Exception | Assert | Lazy | If | Else | For | In | To
-    | Downto | While | Switch | When | External | Typ | Private
-    | Mutable | Constraint | Include | Module | Of
-    | Land | Lor | List | With
-    | Try | Catch | Import | Export -> true
-    | _ -> false
-
-  let lookupKeyword str =
-    try keywordTable str with
-    | Not_found ->
-      if CharacterCodes.isUpperCase (int_of_char (str.[0] [@doesNotRaise])) then
-        Uident str
-      else Lident str
-
-  let isKeywordTxt str =
-    try let _ = keywordTable str in true with
-    | Not_found -> false
-end
-
-module Grammar = struct
-  type t =
-    | OpenDescription (* open Belt *)
-    | ModuleLongIdent (* Foo or Foo.Bar *) [@live]
-    | Ternary (* condExpr ? trueExpr : falseExpr *)
-    | Es6ArrowExpr
-    | Jsx
-    | JsxAttribute
-    | JsxChild [@live]
-    | ExprOperand
-    | ExprUnary
-    | ExprSetField
-    | ExprBinaryAfterOp of Token.t
-    | ExprBlock
-    | ExprCall
-    | ExprList
-    | ExprArrayAccess
-    | ExprArrayMutation
-    | ExprIf
-    | IfCondition | IfBranch | ElseBranch
-    | TypeExpression
-    | External
-    | PatternMatching
-    | PatternMatchCase
-    | LetBinding
-    | PatternList
-    | PatternOcamlList
-    | PatternRecord
-
-    | TypeDef
-    | TypeConstrName
-    | TypeParams
-    | TypeParam [@live]
-    | PackageConstraint
-
-    | TypeRepresentation
-
-    | RecordDecl
-    | ConstructorDeclaration
-    | ParameterList
-    | StringFieldDeclarations
-    | FieldDeclarations
-    | TypExprList
-    | FunctorArgs
-    | ModExprList
-    | TypeParameters
-    | RecordRows
-    | RecordRowsStringKey
-    | ArgumentList
-    | Signature
-    | Specification
-    | Structure
-    | Implementation
-    | Attribute
-    | TypeConstraint
-    | Primitive
-    | AtomicTypExpr
-    | ListExpr
-    | JsFfiImport
-
-  let toString = function
-    | OpenDescription -> "an open description"
-    | ModuleLongIdent -> "a module identifier"
-    | Ternary -> "a ternary expression"
-    | Es6ArrowExpr -> "an es6 arrow function"
-    | Jsx -> "a jsx expression"
-    | JsxAttribute -> "a jsx attribute"
-    | ExprOperand -> "a basic expression"
-    | ExprUnary -> "a unary expression"
-    | ExprBinaryAfterOp op -> "an expression after the operator \"" ^ Token.toString op  ^ "\""
-    | ExprIf -> "an if expression"
-    | IfCondition -> "the condition of an if expression"
-    | IfBranch -> "the true-branch of an if expression"
-    | ElseBranch -> "the else-branch of an if expression"
-    | TypeExpression -> "a type"
-    | External -> "an external"
-    | PatternMatching -> "the cases of a pattern match"
-    | ExprBlock -> "a block with expressions"
-    | ExprSetField -> "a record field mutation"
-    | ExprCall -> "a function application"
-    | ExprArrayAccess -> "an array access expression"
-    | ExprArrayMutation -> "an array mutation"
-    | LetBinding -> "a let binding"
-    | TypeDef -> "a type definition"
-    | TypeParams -> "type parameters"
-    | TypeParam -> "a type parameter"
-    | TypeConstrName -> "a type-constructor name"
-    | TypeRepresentation -> "a type representation"
-    | RecordDecl -> "a record declaration"
-    | PatternMatchCase -> "a pattern match case"
-    | ConstructorDeclaration -> "a constructor declaration"
-    | ExprList -> "multiple expressions"
-    | PatternList -> "multiple patterns"
-    | PatternOcamlList -> "a list pattern"
-    | PatternRecord -> "a record pattern"
-    | ParameterList -> "parameters"
-    | StringFieldDeclarations -> "string field declarations"
-    | FieldDeclarations -> "field declarations"
-    | TypExprList -> "list of types"
-    | FunctorArgs -> "functor arguments"
-    | ModExprList -> "list of module expressions"
-    | TypeParameters -> "list of type parameters"
-    | RecordRows -> "rows of a record"
-    | RecordRowsStringKey -> "rows of a record with string keys"
-    | ArgumentList -> "arguments"
-    | Signature -> "signature"
-    | Specification -> "specification"
-    | Structure -> "structure"
-    | Implementation -> "implementation"
-    | Attribute -> "an attribute"
-    | TypeConstraint -> "constraints on a type"
-    | Primitive -> "an external primitive"
-    | AtomicTypExpr -> "a type"
-    | ListExpr -> "an ocaml list expr"
-    | PackageConstraint -> "a package constraint"
-    | JsFfiImport -> "js ffi import"
-    | JsxChild -> "jsx child"
-
-  let isSignatureItemStart = function
-    | Token.At
-    | Let
-    | Typ
-    | External
-    | Exception
-    | Open
-    | Include
-    | Module
-    | AtAt
-    | PercentPercent -> true
-    | _ -> false
-
-  let isAtomicPatternStart = function
-    | Token.Int _ | String _ | Character _
-    | Lparen | Lbracket | Lbrace
-    | Underscore
-    | Lident _ | Uident _ | List
-    | Exception | Lazy
-    | Percent -> true
-    | _ -> false
-
-  let isAtomicExprStart = function
-    | Token.True | False
-    | Int _ | String _ | Float _ | Character _
-    | Backtick
-    | Uident _ | Lident _ | Hash
-    | Lparen
-    | List
-    | Lbracket
-    | Lbrace
-    | LessThan
-    | Module
-    | Percent -> true
-    | _ -> false
-
-  let isAtomicTypExprStart = function
-    | Token.SingleQuote | Underscore
-    | Lparen | Lbrace
-    | Uident _ | Lident _ | List
-    | Percent -> true
-    | _ -> false
-
-  let isExprStart = function
-    | Token.True | False
-    | Int _ | String _ | Float _ | Character _ | Backtick
-    | Underscore (* _ => doThings() *)
-    | Uident _ | Lident _ | Hash
-    | Lparen | List | Module | Lbracket | Lbrace
-    | LessThan
-    | Minus | MinusDot | Plus | PlusDot | Bang
-    | Percent | At
-    | If | Switch | While | For | Assert | Lazy | Try -> true
-    | _ -> false
-
-  let isJsxAttributeStart = function
-    | Token.Lident _ | Question -> true
-    | _ -> false
-
- let isStructureItemStart = function
-    | Token.Open
-    | Let
-    | Typ
-    | External | Import | Export
-    | Exception
-    | Include
-    | Module
-    | AtAt
-    | PercentPercent
-    | At -> true
-    | t when isExprStart t -> true
-    | _ -> false
-
-  let isPatternStart = function
-    | Token.Int _ | Float _ | String _ | Character _ | True | False | Minus | Plus
-    | Lparen | Lbracket | Lbrace | List
-    | Underscore
-    | Lident _ | Uident _ | Hash | HashHash
-    | Exception | Lazy | Percent | Module
-    | At -> true
-    | _ -> false
-
-  let isParameterStart = function
-    | Token.Typ | Tilde | Dot -> true
-    | token when isPatternStart token -> true
-    | _ -> false
-
-  (* TODO: overparse Uident ? *)
-  let isStringFieldDeclStart = function
-    | Token.String _ | At -> true
-    | _ -> false
-
-  (* TODO: overparse Uident ? *)
-  let isFieldDeclStart = function
-    | Token.At | Mutable | Lident _ | List  -> true
-    (* recovery, TODO: this is not ideal… *)
-    | Uident _ -> true
-    | t when Token.isKeyword t -> true
-    | _ -> false
-
-  let isRecordDeclStart = function
-    | Token.At
-    | Mutable
-    | Lident _ | List -> true
-    | _ -> false
-
-  let isTypExprStart = function
-    | Token.At
-    | SingleQuote
-    | Underscore
-    | Lparen | Lbracket
-    | Uident _ | Lident _ | List
-    | Module
-    | Percent
-    | Lbrace -> true
-    | _ -> false
-
-  let isTypeParameterStart = function
-    | Token.Tilde | Dot -> true
-    | token when isTypExprStart token -> true
-    | _ -> false
-
-  let isTypeParamStart = function
-    | Token.Plus | Minus | SingleQuote | Underscore -> true
-    | _ -> false
-
-  let isFunctorArgStart = function
-    | Token.At | Uident _ | Underscore
-    | Percent
-    | Lbrace
-    | Lparen -> true
-    | _ -> false
-
-  let isModExprStart = function
-    | Token.At | Percent
-    | Uident _ | Lbrace | Lparen -> true
-    | _ -> false
-
-  let isRecordRowStart = function
-    | Token.DotDotDot -> true
-    | Token.Uident _ | Lident _ | List -> true
-    (* TODO *)
-    | t when Token.isKeyword t -> true
-    | _ -> false
-
-  let isRecordRowStringKeyStart = function
-    | Token.String _ -> true
-    | _ -> false
-
-  let isArgumentStart = function
-    | Token.Tilde | Dot | Underscore -> true
-    | t when isExprStart t -> true
-    | _ -> false
-
-  let isPatternMatchStart = function
-    | Token.Bar -> true
-    | t when isPatternStart t -> true
-    | _ -> false
-
-  let isPatternOcamlListStart = function
-    | Token.DotDotDot -> true
-    | t when isPatternStart t -> true
-    | _ -> false
-
-  let isPatternRecordItemStart = function
-    | Token.DotDotDot | Uident _ | Lident _ | List | Underscore -> true
-    | _ -> false
-
-  let isAttributeStart = function
-    | Token.At -> true
-    | _ -> false
-
-  let isJsFfiImportStart = function
-    | Token.Lident _ | At -> true
-    | _ -> false
-
-  let isJsxChildStart = isAtomicExprStart
-
-  let isBlockExprStart = function
-    | Token.At | Hash | Percent | Minus | MinusDot | Plus | PlusDot | Bang
-    | True | False | Int _ | String _ | Character _ | Lident _ | Uident _
-    | Lparen | List | Lbracket | Lbrace | Forwardslash | Assert
-    | Lazy | If | For | While | Switch | Open | Module | Exception | Let
-    | LessThan | Backtick | Try | Underscore -> true
-    | _ -> false
-
-  let isListElement grammar token =
-    match grammar with
-    | ExprList -> token = Token.DotDotDot || isExprStart token
-    | ListExpr -> token = DotDotDot || isExprStart token
-    | PatternList -> token = DotDotDot || isPatternStart token
-    | ParameterList -> isParameterStart token
-    | StringFieldDeclarations -> isStringFieldDeclStart token
-    | FieldDeclarations -> isFieldDeclStart token
-    | RecordDecl -> isRecordDeclStart token
-    | TypExprList -> isTypExprStart token || token = Token.LessThan
-    | TypeParams -> isTypeParamStart token
-    | FunctorArgs -> isFunctorArgStart token
-    | ModExprList -> isModExprStart token
-    | TypeParameters -> isTypeParameterStart token
-    | RecordRows -> isRecordRowStart token
-    | RecordRowsStringKey -> isRecordRowStringKeyStart token
-    | ArgumentList -> isArgumentStart token
-    | Signature | Specification -> isSignatureItemStart token
-    | Structure | Implementation -> isStructureItemStart token
-    | PatternMatching -> isPatternMatchStart token
-    | PatternOcamlList -> isPatternOcamlListStart token
-    | PatternRecord -> isPatternRecordItemStart token
-    | Attribute -> isAttributeStart token
-    | TypeConstraint -> token = Constraint
-    | PackageConstraint -> token = And
-    | ConstructorDeclaration -> token = Bar
-    | Primitive -> begin match token with Token.String _ -> true | _ -> false end
-    | JsxAttribute -> isJsxAttributeStart token
-    | JsFfiImport -> isJsFfiImportStart token
-    | _ -> false
-
-  let isListTerminator grammar token =
-    match grammar, token with
-    | _, Token.Eof
-    | ExprList, (Rparen | Forwardslash | Rbracket)
-    | ListExpr, Rparen
-    | ArgumentList, Rparen
-    | TypExprList, (Rparen | Forwardslash | GreaterThan | Equal)
-    | ModExprList, Rparen
-    | (PatternList | PatternOcamlList | PatternRecord),
-      (Forwardslash | Rbracket | Rparen | EqualGreater (* pattern matching => *) | In (* for expressions *) | Equal (* let {x} = foo *))
-    | ExprBlock, Rbrace
-    | (Structure | Signature), Rbrace
-    | TypeParams, Rparen
-    | ParameterList, (EqualGreater | Lbrace)
-    | JsxAttribute, (Forwardslash | GreaterThan)
-    | JsFfiImport, Rbrace
-    | StringFieldDeclarations, Rbrace -> true
-
-    | Attribute, token when token <> At -> true
-    | TypeConstraint, token when token <> Constraint -> true
-    | PackageConstraint, token when token <> And -> true
-    | ConstructorDeclaration, token when token <> Bar -> true
-    | Primitive, Semicolon -> true
-    | Primitive, token when isStructureItemStart token -> true
-
-    | _ -> false
-
-  let isPartOfList grammar token =
-    isListElement grammar token || isListTerminator grammar token
-end
-
-module Reporting = struct
-  module TerminalDoc = struct
-    type break =
-      | Never
-      | Always
-
-    type document =
-      | Nil
-      | Group of {break: break; doc: document}
-      | Text of string
-      | Indent of {amount: int; doc: document}
-      | Append of {doc1: document; doc2: document}
-
-    let group ~break doc = Group {break; doc}
-    let text txt = Text (txt)
-    let indent i d = Indent {amount = i; doc = d}
-    let append d1 d2 = Append {doc1 = d1; doc2 = d2}
-    let nil = Nil
-
-    type stack =
-      | Empty
-      | Cons of {doc: document; stack: stack}
-
-    let push stack doc = Cons {doc; stack}
-
-    type mode =
-      | Flat
-      | Break
-
-    let toString (* ~width *) (doc : document) =
-      let buffer = Buffer.create 100 in
-      let rec loop stack mode offset =
-        match stack with
-        | Empty  -> ()
-        | Cons {doc; stack = rest} ->
-          begin match doc with
-           | Nil -> loop rest mode offset
-           | Text txt ->
-             Buffer.add_string buffer txt;
-             loop rest mode (offset + (String.length txt))
-           | Indent {amount = i; doc} ->
-             let indentation = (String.make [@doesNotRaise]) i ' ' in
-             Buffer.add_string buffer indentation;
-             loop (push rest doc) mode (offset + i)
-           | Append {doc1; doc2} ->
-              let rest = push rest doc2 in
-              let rest = push rest
-                (match mode = Flat with
-                | true  -> Nil
-                | false  -> text "\n")
-              in
-              let rest = push rest doc1 in
-              loop rest mode offset
-           | Group {break; doc} ->
-             let rest = push rest doc in
-             begin match break with
-             | Always  -> loop rest Break offset
-             | Never  -> loop rest Flat offset
-             end
-            end
-      in
-      loop (push Empty doc) Flat 0;
-      Buffer.contents buffer
-  end
-
-  type color =
-    | NoColor [@live]
-    | Red [@live]
-
-  type style = {
-    underline: bool; [@live]
-    color: color; [@live]
-  }
-
-  let highlight ~from ~len txt =
-    if from < 0 || (String.length txt) == 0 || (from >= String.length txt) then txt else
-    let before = try String.sub txt 0 from with Invalid_argument _ -> "" in
-    let content =
-      "\027[31m" ^ (try String.sub txt from len with Invalid_argument _ -> "") ^ "\027[0m"
-    in
-    let after = try String.sub txt (from + len) (String.length txt - (from + len)) with Invalid_argument _ -> "" in
-    before ^ content ^ after
-
-  let underline ~from ~len txt =
-    let open TerminalDoc in
-    let indent = (String.make [@doesNotRaise]) from ' ' in
-    let underline = (String.make [@doesNotRaise]) len '^' in
-    let line = highlight ~from:0 ~len underline in
-    group ~break:Always
-      (append (text txt) (text (indent ^ line)))
-
-  let rec drop n l =
-    if n == 1 then l
-    else drop (n - 1) (match l with | _x::xs -> xs | _ -> l)
-
-  let rec take n l =
-    match l with
-    | _ when n == 0 -> []
-    | [] -> []
-    | x::xs -> x::(take (n -1) xs)
-
-  (* TODO: cleanup *)
-  let renderCodeContext ~missing (src : string) startPos endPos =
-    let open Lexing in
-    let startCol = (startPos.pos_cnum - startPos.pos_bol) in
-    let endCol = endPos.pos_cnum - startPos.pos_cnum + startCol in
-    let startLine = max 1 (startPos.pos_lnum - 2) in (* 2 lines before *)
-    let lines =  String.split_on_char '\n' src in
-    let endLine =
-      let len = List.length lines in
-      min len (startPos.pos_lnum + 3) (* 2 lines after *)
-    in
-    let lines =
-      lines
-      |> drop startLine
-      |> take (endLine - startLine)
-      |> Array.of_list
-    in
-
-    let renderLine x ix =
-      let x = if ix = startPos.pos_lnum then
-          begin match missing with
-          | Some _len -> x ^ (String.make 10 ' ' [@doesNotRaise])
-          | None -> x
-          end
-        else
-          x
-      in
-
-      let open TerminalDoc in
-      let rowNr =
-        let txt = string_of_int ix in
-        let len = String.length txt in
-        if ix = startPos.pos_lnum then
-          highlight ~from:0 ~len txt
-        else txt
-      in
-      let len =
-        let len = if endCol >= 0 then
-          endCol - startCol
-        else
-          1
-        in
-        if (startCol + len) > String.length x then String.length x - startCol - 1 else len
-      in
-      let line =
-        if ix = startPos.pos_lnum then
-          begin match missing with
-          | Some len ->
-            underline
-              ~from:(
-              startCol + String.length (String.length (string_of_int ix) |> string_of_int) + 5
-              ) ~len x
-          | None ->
-              let len = if startCol + len > String.length x then
-                (String.length x) - startCol
-              else
-                len
-              in
-            text (highlight ~from:startCol ~len x)
-          end
-        else text x
-      in
-      group ~break:Never
-        (append
-          (append (text rowNr) (text " │"))
-          (indent 2 line))
-    in
-
-    let reportDoc = ref TerminalDoc.nil in
-
-    let linesLen = Array.length lines in
-    for i = 0 to (linesLen - 1) do
-      let line = try (Array.get [@doesNotRaise]) lines i with Invalid_argument _ -> "" in
-      reportDoc :=
-        let open TerminalDoc in
-        let ix = startLine + i in
-        group ~break:Always (append !reportDoc (renderLine line ix))
-    done;
-
-    TerminalDoc.toString !reportDoc
-
-  type problem =
-    | Unexpected of Token.t [@live]
-    | Expected of {token: Token.t; pos: Lexing.position; context: Grammar.t option} [@live]
-    | Message of string [@live]
-    | Uident [@live]
-    | Lident [@live]
-    | Unbalanced of Token.t [@live]
-
-  type parseError = Lexing.position * problem
-end
-
-module Diagnostics: sig
-  type t
-  type category
-  type report
-
-  type reportStyle
-  val parseReportStyle: string -> reportStyle
-
-  val unexpected: Token.t -> (Grammar.t * Lexing.position) list -> category
-  val expected:  ?grammar:Grammar.t -> Lexing.position -> Token.t -> category
-  val uident: Token.t -> category
-  val lident: Token.t -> category
-  val unclosedString: category
-  val unclosedTemplate: category
-  val unclosedComment: category
-  val unknownUchar: int -> category
-  val message: string -> category
-
-  val make:
-    filename: string
-    -> startPos: Lexing.position
-    -> endPos: Lexing.position
-    -> category
-    -> t
-
-  val stringOfReport: style:reportStyle -> t list -> string -> string
-end = struct
-  type category =
-    | Unexpected of {token: Token.t; context: (Grammar.t * Lexing.position) list}
-    | Expected of {context: Grammar.t option; pos: Lexing.position (* prev token end*); token: Token.t}
-    | Message of string
-    | Uident of Token.t
-    | Lident of Token.t
-    | UnclosedString
-    | UnclosedTemplate
-    | UnclosedComment
-    | UnknownUchar of int
-
-  type t = {
-    filename: string;
-    startPos: Lexing.position;
-    endPos: Lexing.position;
-    category: category;
-  }
-
-  type report = t list
-
-  (* TODO: add json here *)
-  type reportStyle =
-    | Pretty
-    | Plain
-
-  let parseReportStyle txt = match (String.lowercase_ascii txt) with
-    | "plain" -> Plain
-    | _ -> Pretty
-
-  let defaultUnexpected token =
-    "I'm not sure what to parse here when looking at \"" ^ (Token.toString token) ^ "\"."
-
-  let explain t =
-    match t.category with
-    | Uident currentToken ->
-      begin match currentToken with
-      | Lident lident ->
-        let guess = String.capitalize_ascii lident in
-        "Did you mean `" ^ guess ^"` instead of `" ^ lident ^ "`?"
-      | t when Token.isKeyword t ->
-        let token = Token.toString t in
-        "`" ^ token ^ "` is a reserved keyword."
-      | _ ->
-        "At this point, I'm looking for an uppercased identifier like `Belt` or `Array`"
-      end
-    | Lident currentToken ->
-      begin match currentToken with
-      | Uident uident ->
-        let guess = String.uncapitalize_ascii uident in
-        "Did you mean `" ^ guess ^"` instead of `" ^ uident ^ "`?"
-      | t when Token.isKeyword t ->
-        let token = Token.toString t in
-        "`" ^ token ^ "` is a reserved keyword. Keywords need to be escaped: \\\"" ^ token ^ "\""
-      | Underscore ->
-        "`_` isn't a valid name."
-      | _ ->
-        "I'm expecting an lowercased identifier like `name` or `age`"
-      end
-    | Message txt -> txt
-    | UnclosedString ->
-      "This string is missing a double quote at the end"
-    | UnclosedTemplate ->
-      "Did you forget to close this template expression with a backtick?"
-    | UnclosedComment ->
-      "This comment seems to be missing a closing `*/`"
-    | UnknownUchar uchar ->
-      begin match uchar with
-      | 94 (* ^ *) ->
-        "Hmm, not sure what I should do here with this character.\nIf you're trying to deref an expression, use `foo.contents` instead."
-      | _ ->
-        "Hmm, I have no idea what this character means…"
-      end
-    | Expected {context; token = t} ->
-      let hint = match context with
-      | Some grammar -> "It signals the start of " ^ (Grammar.toString grammar)
-      | None -> ""
-      in
-      "Did you forget a `" ^ (Token.toString t) ^ "` here? " ^ hint
-    | Unexpected {token = t; context = breadcrumbs} ->
-      let name = (Token.toString t) in
-      begin match breadcrumbs with
-      | (AtomicTypExpr, _)::breadcrumbs ->
-          begin match breadcrumbs, t with
-          | ((StringFieldDeclarations | FieldDeclarations) , _) :: _, (String _ | At | Rbrace | Comma | Eof) ->
-              "I'm missing a type here"
-          | _, t when Grammar.isStructureItemStart t || t = Eof ->
-              "Missing a type here"
-          | _ ->
-            defaultUnexpected t
-          end
-      | (ExprOperand, _)::breadcrumbs ->
-          begin match breadcrumbs, t with
-          | (ExprBlock, _) :: _, Rbrace ->
-            "It seems that this expression block is empty"
-          | (ExprBlock, _) :: _, Bar -> (* Pattern matching *)
-            "Looks like there might be an expression missing here"
-          | (ExprSetField, _) :: _, _ ->
-            "It seems that this record field mutation misses an expression"
-          | (ExprArrayMutation, _) :: _, _ ->
-            "Seems that an expression is missing, with what do I mutate the array?"
-          | ((ExprBinaryAfterOp _ | ExprUnary), _) ::_, _ ->
-            "Did you forget to write an expression here?"
-          | (Grammar.LetBinding, _)::_, _ ->
-            "This let-binding misses an expression"
-          | _::_, (Rbracket | Rbrace) ->
-            "Missing expression"
-          | _ ->
-            "I'm not sure what to parse here when looking at \"" ^ name ^ "\"."
-          end
-      | (TypeParam, _)::_ ->
-          begin match t with
-          | Lident ident ->
-            "Did you mean '" ^ ident ^"? A Type parameter starts with a quote."
-          | _ ->
-            "I'm not sure what to parse here when looking at \"" ^ name ^ "\"."
-          end
-      | _ ->
-        (* TODO: match on circumstance to verify Lident needed ? *)
-        if Token.isKeyword t then
-          "`" ^ name ^ "` is a reserved keyword. Keywords need to be escaped: \\\"" ^ (Token.toString t) ^ "\""
-        else
-        "I'm not sure what to parse here when looking at \"" ^ name ^ "\"."
-      end
-
-  let toPlainString t buffer =
-    Buffer.add_string buffer t.filename;
-    Buffer.add_char buffer '(';
-    Buffer.add_string buffer (string_of_int t.startPos.pos_cnum);
-    Buffer.add_char buffer ',';
-    Buffer.add_string buffer (string_of_int t.endPos.pos_cnum);
-    Buffer.add_char buffer ')';
-    Buffer.add_char buffer ':';
-    Buffer.add_string buffer (explain t)
-
-  let toString t src =
-    let open Lexing in
-    let  startchar = t.startPos.pos_cnum - t.startPos.pos_bol in
-    let endchar = t.endPos.pos_cnum - t.startPos.pos_cnum + startchar in
-    let locationInfo =
-      Printf.sprintf (* ReasonLanguageServer requires the following format *)
-        "File \"%s\", line %d, characters %d-%d:"
-        t.filename
-        t.startPos.pos_lnum
-        startchar
-        endchar
-    in
-    let code =
-      let missing = match t.category with
-      | Expected {token = t} ->
-        Some (String.length (Token.toString t))
-      | _ -> None
-      in
-      Reporting.renderCodeContext ~missing src t.startPos t.endPos
-    in
-    let explanation = explain t in
-    Printf.sprintf "%s\n\n%s\n\n%s\n\n" locationInfo code explanation
-
-  let make ~filename ~startPos ~endPos category = {
-    filename;
-    startPos;
-    endPos;
-    category
-  }
-
-  let stringOfReport ~style diagnostics src =
-    match style with
-    | Pretty ->
-      List.fold_left (fun report diagnostic ->
-        report ^ (toString diagnostic src) ^ "\n"
-      ) "\n" (List.rev diagnostics)
-    | Plain ->
-      let buffer = Buffer.create 100 in
-      List.iter (fun diagnostic ->
-        toPlainString diagnostic buffer;
-        Buffer.add_char buffer '\n';
-      ) diagnostics;
-      Buffer.contents buffer
-
-  let unexpected token context =
-    Unexpected {token; context}
-
-  let expected ?grammar pos token =
-    Expected {context = grammar; pos; token}
-
-  let uident currentToken = Uident currentToken
-  let lident currentToken = Lident currentToken
-  let unclosedString = UnclosedString
-  let unclosedComment = UnclosedComment
-  let unclosedTemplate = UnclosedTemplate
-  let unknownUchar code = UnknownUchar code
-  let message txt = Message txt
-end
-
-(* Collection of utilities to view the ast in a more a convenient form,
- * allowing for easier processing.
- * Example: given a ptyp_arrow type, what are its arguments and what is the
- * returnType? *)
-module ParsetreeViewer : sig
-  (* Restructures a nested tree of arrow types into its args & returnType
-   * The parsetree contains: a => b => c => d, for printing purposes
-   * we restructure the tree into (a, b, c) and its returnType d *)
-  val arrowType: Parsetree.core_type ->
-      Parsetree.attributes *
-      (Parsetree.attributes * Asttypes.arg_label * Parsetree.core_type) list *
-      Parsetree.core_type
-
-  val functorType: Parsetree.module_type ->
-    (Parsetree.attributes * string Asttypes.loc * Parsetree.module_type option) list *
-    Parsetree.module_type
-
-  (* filters @bs out of the provided attributes *)
-  val processUncurriedAttribute: Parsetree.attributes -> bool * Parsetree.attributes
-
-  (* if ... else if ... else ... is represented as nested expressions: if ... else { if ... }
-   * The purpose of this function is to flatten nested ifs into one sequence.
-   * Basically compute: ([if, else if, else if, else if], else) *)
-  val collectIfExpressions:
-    Parsetree.expression ->
-      (Parsetree.expression * Parsetree.expression) list * Parsetree.expression option
-
-  val collectListExpressions:
-    Parsetree.expression -> (Parsetree.expression list * Parsetree.expression option)
-
-  type funParamKind =
-    | Parameter of {
-        attrs: Parsetree.attributes;
-        lbl: Asttypes.arg_label;
-        defaultExpr: Parsetree.expression option;
-        pat: Parsetree.pattern;
-      }
-    | NewTypes of {attrs: Parsetree.attributes; locs: string Asttypes.loc list}
-
-  val funExpr:
-    Parsetree.expression ->
-      Parsetree.attributes *
-      funParamKind list *
-      Parsetree.expression
-
-  (* example:
-   *  `makeCoordinate({
-   *    x: 1,
-   *    y: 2,
-   *  })`
-   *  Notice howe `({` and `})` "hug" or stick to each other *)
-  val isHuggableExpression: Parsetree.expression -> bool
-
-  val isHuggablePattern: Parsetree.pattern -> bool
-
-  val isHuggableRhs: Parsetree.expression -> bool
-
-  val operatorPrecedence: string -> int
-
-  val isUnaryExpression: Parsetree.expression -> bool
-  val isBinaryOperator: string -> bool
-  val isBinaryExpression: Parsetree.expression -> bool
-
-  val flattenableOperators: string -> string -> bool
-
-  val hasAttributes: Parsetree.attributes -> bool
-
-  val isArrayAccess: Parsetree.expression -> bool
-  val isTernaryExpr: Parsetree.expression -> bool
-
-  val collectTernaryParts: Parsetree.expression -> ((Parsetree.expression * Parsetree.expression) list * Parsetree.expression)
-
-  val parametersShouldHug:
-    funParamKind list -> bool
-
-  val filterTernaryAttributes: Parsetree.attributes -> Parsetree.attributes
-
-  val isJsxExpression: Parsetree.expression -> bool
-  val hasJsxAttribute: Parsetree.attributes -> bool
-
-  val shouldIndentBinaryExpr: Parsetree.expression -> bool
-  val shouldInlineRhsBinaryExpr: Parsetree.expression -> bool
-  val filterPrinteableAttributes: Parsetree.attributes -> Parsetree.attributes
-  val partitionPrinteableAttributes: Parsetree.attributes -> (Parsetree.attributes * Parsetree.attributes)
-
-  val requiresSpecialCallbackPrintingLastArg: (Asttypes.arg_label * Parsetree.expression) list -> bool
-  val requiresSpecialCallbackPrintingFirstArg: (Asttypes.arg_label * Parsetree.expression) list -> bool
-
-  val modExprApply : Parsetree.module_expr -> (
-    Parsetree.module_expr list * Parsetree.module_expr
-  )
-
-  val modExprFunctor : Parsetree.module_expr -> (
-    (Parsetree.attributes * string Asttypes.loc * Parsetree.module_type option) list *
-    Parsetree.module_expr
-  )
-
-  val splitGenTypeAttr : Parsetree.attributes -> (bool * Parsetree.attributes)
-
-  val collectPatternsFromListConstruct:
-    Parsetree.pattern list -> Parsetree.pattern ->
-      (Parsetree.pattern list * Parsetree.pattern)
-
-  val isBlockExpr : Parsetree.expression -> bool
-
-  val isTemplateLiteral: Parsetree.expression -> bool
-
-  val collectOrPatternChain:
-    Parsetree.pattern -> Parsetree.pattern list
-
-  val processBracesAttr : Parsetree.expression -> (Parsetree.attribute option * Parsetree.expression)
-
-  val filterParsingAttrs : Parsetree.attributes -> Parsetree.attributes
-
-  val isBracedExpr : Parsetree.expression -> bool
-
-  val isPipeExpr : Parsetree.expression -> bool
-
-  val extractValueDescriptionFromModExpr: Parsetree.module_expr -> Parsetree.value_description list
-
-  type jsImportScope =
-    | JsGlobalImport (* nothing *)
-    | JsModuleImport of string (* from "path" *)
-    | JsScopedImport of string list (* window.location *)
-
-  val classifyJsImport: Parsetree.value_description -> jsImportScope
-
-  (* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
-  val rewriteUnderscoreApply: Parsetree.expression -> Parsetree.expression
-
-  (* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
-  val isUnderscoreApplySugar: Parsetree.expression -> bool
-end = struct
-  open Parsetree
-
-  let arrowType ct =
-    let rec process attrsBefore acc typ = match typ with
-    | {ptyp_desc = Ptyp_arrow (Nolabel as lbl, typ1, typ2); ptyp_attributes = []} ->
-      let arg = ([], lbl, typ1) in
-      process attrsBefore (arg::acc) typ2
-    | {ptyp_desc = Ptyp_arrow (Nolabel as lbl, typ1, typ2); ptyp_attributes = [({txt ="bs"}, _) ] as attrs} ->
-      let arg = (attrs, lbl, typ1) in
-      process attrsBefore (arg::acc) typ2
-    | {ptyp_desc = Ptyp_arrow (Nolabel, _typ1, _typ2); ptyp_attributes = _attrs} as returnType ->
-      let args = List.rev acc in
-      (attrsBefore, args, returnType)
-    | {ptyp_desc = Ptyp_arrow ((Labelled _ | Optional _) as lbl, typ1, typ2); ptyp_attributes = attrs} ->
-      let arg = (attrs, lbl, typ1) in
-      process attrsBefore (arg::acc) typ2
-    | typ ->
-      (attrsBefore, List.rev acc, typ)
-    in
-    begin match ct with
-    | {ptyp_desc = Ptyp_arrow (Nolabel, _typ1, _typ2); ptyp_attributes = attrs} as typ ->
-      process attrs [] {typ with ptyp_attributes = []}
-    | typ -> process [] [] typ
-    end
-
-  let functorType modtype =
-    let rec process acc modtype = match modtype with
-    | {pmty_desc = Pmty_functor (lbl, argType, returnType); pmty_attributes = attrs} ->
-      let arg = (attrs, lbl, argType) in
-      process (arg::acc) returnType
-    | modType ->
-      (List.rev acc, modType)
-    in
-    process [] modtype
-
-  let processUncurriedAttribute attrs =
-    let rec process uncurriedSpotted acc attrs =
-      match attrs with
-      | [] -> (uncurriedSpotted, List.rev acc)
-      | ({Location.txt = "bs"}, _)::rest -> process true acc rest
-      | attr::rest -> process uncurriedSpotted (attr::acc) rest
-    in
-    process false [] attrs
-
-  let collectIfExpressions expr =
-    let rec collect acc expr = match expr.pexp_desc with
-    | Pexp_ifthenelse (ifExpr, thenExpr, Some elseExpr) ->
-      collect ((ifExpr, thenExpr)::acc) elseExpr
-    | Pexp_ifthenelse (ifExpr, thenExpr, (None as elseExpr)) ->
-      let ifs = List.rev ((ifExpr, thenExpr)::acc) in
-      (ifs, elseExpr)
-    | _ ->
-      (List.rev acc, Some expr)
-    in
-    collect [] expr
-
-  let collectListExpressions expr =
-    let rec collect acc expr = match expr.pexp_desc with
-    | Pexp_construct ({txt = Longident.Lident "[]"}, _) ->
-      (List.rev acc, None)
-    | Pexp_construct (
-        {txt = Longident.Lident "::"},
-        Some {pexp_desc = Pexp_tuple (hd::[tail])}
-      ) ->
-        collect (hd::acc) tail
-    | _ ->
-      (List.rev acc, Some expr)
-    in
-    collect [] expr
-
-  (* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
-  let rewriteUnderscoreApply expr =
-    match expr.pexp_desc with
-    | Pexp_fun (
-        Nolabel,
-        None,
-        {ppat_desc = Ppat_var {txt="__x"}},
-        ({pexp_desc = Pexp_apply (callExpr, args)} as e)
-      ) ->
-        let newArgs = List.map (fun arg ->
-          match arg with
-          | (
-              lbl,
-              ({pexp_desc = Pexp_ident ({txt = Longident.Lident "__x"} as lid)} as argExpr)
-            ) ->
-              (lbl, {argExpr with pexp_desc = Pexp_ident ({lid with txt = Longident.Lident "_"})})
-          | arg ->  arg
-        ) args in
-        {e with pexp_desc = Pexp_apply (callExpr, newArgs)}
-    | _ -> expr
-
-  type funParamKind =
-    | Parameter of {
-        attrs: Parsetree.attributes;
-        lbl: Asttypes.arg_label;
-        defaultExpr: Parsetree.expression option;
-        pat: Parsetree.pattern;
-      }
-    | NewTypes of {attrs: Parsetree.attributes; locs: string Asttypes.loc list}
-
-  let funExpr expr =
-    (* Turns (type t, type u, type z) into "type t u z" *)
-    let rec collectNewTypes acc returnExpr =
-      match returnExpr with
-      | {pexp_desc = Pexp_newtype (stringLoc, returnExpr); pexp_attributes = []} ->
-        collectNewTypes (stringLoc::acc) returnExpr
-      | returnExpr ->
-        (List.rev acc, returnExpr)
-    in
-    let rec collect attrsBefore acc expr = match expr with
-    | {pexp_desc = Pexp_fun (
-        Nolabel,
-        None,
-        {ppat_desc = Ppat_var {txt="__x"}},
-        {pexp_desc = Pexp_apply _}
-      )} ->
-      (attrsBefore, List.rev acc, rewriteUnderscoreApply expr)
-    | {pexp_desc = Pexp_fun (lbl, defaultExpr, pattern, returnExpr); pexp_attributes = []} ->
-      let parameter = Parameter {
-        attrs = [];
-        lbl = lbl;
-        defaultExpr = defaultExpr;
-        pat = pattern;
-      } in
-      collect attrsBefore (parameter::acc) returnExpr
-    | {pexp_desc = Pexp_newtype (stringLoc, rest); pexp_attributes = attrs} ->
-      let (stringLocs, returnExpr) = collectNewTypes [stringLoc] rest in
-      let param = NewTypes {attrs; locs = stringLocs} in
-      collect attrsBefore (param::acc) returnExpr
-    | {pexp_desc = Pexp_fun (lbl, defaultExpr, pattern, returnExpr); pexp_attributes = [({txt = "bs"}, _)] as attrs} ->
-      let parameter = Parameter {
-        attrs = attrs;
-        lbl = lbl;
-        defaultExpr = defaultExpr;
-        pat = pattern;
-      } in
-      collect attrsBefore (parameter::acc) returnExpr
-    | {
-        pexp_desc = Pexp_fun ((Labelled _ | Optional _) as lbl, defaultExpr, pattern, returnExpr);
-        pexp_attributes = attrs
-      } ->
-      let parameter = Parameter {
-        attrs = attrs;
-        lbl = lbl;
-        defaultExpr = defaultExpr;
-        pat = pattern;
-      } in
-      collect attrsBefore (parameter::acc) returnExpr
-    | expr ->
-      (attrsBefore, List.rev acc, expr)
-    in
-    begin match expr with
-    | {pexp_desc = Pexp_fun (Nolabel, _defaultExpr, _pattern, _returnExpr); pexp_attributes = attrs} as expr ->
-      collect attrs [] {expr with pexp_attributes = []}
-    | expr -> collect [] [] expr
-    end
-
-  let processBracesAttr expr =
-    match expr.pexp_attributes with
-    | (({txt = "res.braces"}, _) as attr)::attrs ->
-      (Some attr, {expr with pexp_attributes = attrs})
-    | _ ->
-      (None, expr)
-
-  let filterParsingAttrs attrs =
-    List.filter (fun attr ->
-      match attr with
-      | ({Location.txt = ("res.ternary" | "res.braces" | "bs" | "res.namedArgLoc")}, _) -> false
-      | _ -> true
-    ) attrs
-
-  let isBlockExpr expr =
-    match expr.pexp_desc with
-    | Pexp_letmodule _
-    | Pexp_letexception _
-    | Pexp_let _
-    | Pexp_open _
-    | Pexp_sequence _ -> true
-    | _ -> false
-
-  let isBracedExpr expr =
-    match processBracesAttr expr with
-    | (Some _, _) -> true
-    | _ -> false
-
-  let isHuggableExpression expr =
-    match expr.pexp_desc with
-    | Pexp_array _
-    | Pexp_tuple _
-    | Pexp_construct ({txt = Longident.Lident ("::" | "[]")}, _)
-    | Pexp_extension ({txt = "bs.obj"}, _)
-    | Pexp_record _ -> true
-    | _ when isBlockExpr expr -> true
-    | _ when isBracedExpr expr -> true
-    | _ -> false
-
-  let isHuggableRhs expr =
-    match expr.pexp_desc with
-    | Pexp_array _
-    | Pexp_tuple _
-    | Pexp_construct ({txt = Longident.Lident ("::" | "[]")}, _)
-    | Pexp_extension ({txt = "bs.obj"}, _)
-    | Pexp_record _ -> true
-    | _ when isBracedExpr expr -> true
-    | _ -> false
-
-  let isHuggablePattern pattern =
-    match pattern.ppat_desc with
-    | Ppat_array _
-    | Ppat_tuple _
-    | Ppat_record _
-    | Ppat_construct _ -> true
-    | _ -> false
-
-  let operatorPrecedence operator = match operator with
-    | ":=" -> 1
-    | "||" -> 2
-    | "&&" -> 3
-    | "=" | "==" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" | "|>" -> 4
-    | "+" | "+." | "-" | "-." | "^" -> 5
-    | "*" | "*." | "/" | "/." -> 6
-    | "**" -> 7
-    | "#" | "##" | "|." -> 8
-    | _ -> 0
-
-  let isUnaryOperator operator = match operator with
-    | "~+" | "~+." | "~-" | "~-." | "not" -> true
-    | _ -> false
-
-  let isUnaryExpression expr = match expr.pexp_desc with
-    | Pexp_apply(
-        {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [Nolabel, _arg]
-      ) when isUnaryOperator operator -> true
-    | _ -> false
-
-  let isBinaryOperator operator = match operator with
-    | ":="
-    | "||"
-    | "&&"
-    | "=" | "==" | "<" | ">" | "!=" | "!==" | "<=" | ">=" | "|>"
-    | "+" | "+." | "-" | "-." | "^"
-    | "*" | "*." | "/" | "/."
-    | "**"
-    | "|." | "<>" -> true
-    | _ -> false
-
-  let isBinaryExpression expr = match expr.pexp_desc with
-    | Pexp_apply(
-        {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [(Nolabel, _operand1); (Nolabel, _operand2)]
-      ) when isBinaryOperator operator -> true
-    | _ -> false
-
-  let isEqualityOperator operator = match operator with
-    | "=" | "==" | "<>" | "!=" -> true
-    | _ -> false
-
-  let flattenableOperators parentOperator childOperator =
-    let precParent = operatorPrecedence parentOperator in
-    let precChild =  operatorPrecedence childOperator in
-    if precParent == precChild then
-      not (
-        isEqualityOperator parentOperator &&
-        isEqualityOperator childOperator
-      )
-    else
-      false
-
-  let hasAttributes attrs =
-    List.exists (fun attr -> match attr with
-      | ({Location.txt = "bs" | "res.ternary" | "res.braces"}, _) -> false
-      | _ -> true
-    ) attrs
-
-  let isArrayAccess expr = match expr.pexp_desc with
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "get")}},
-        [Nolabel, _parentExpr; Nolabel, _memberExpr]
-      ) -> true
-    | _ -> false
-
-  let rec hasTernaryAttribute attrs =
-    match attrs with
-    | [] -> false
-    | ({Location.txt="res.ternary"},_)::_ -> true
-    | _::attrs -> hasTernaryAttribute attrs
-
-  let isTernaryExpr expr = match expr with
-    | {
-        pexp_attributes = attrs;
-        pexp_desc = Pexp_ifthenelse _
-      } when hasTernaryAttribute attrs -> true
-    | _ -> false
-
-  let collectTernaryParts expr =
-    let rec collect acc expr = match expr with
-    | {
-        pexp_attributes = attrs;
-        pexp_desc = Pexp_ifthenelse (condition, consequent, Some(alternate))
-      } when hasTernaryAttribute attrs -> collect ((condition, consequent)::acc) alternate
-    | alternate -> (List.rev acc, alternate)
-    in
-    collect [] expr
-
-  let parametersShouldHug parameters = match parameters with
-    | [Parameter {
-        attrs = [];
-        lbl = Asttypes.Nolabel;
-        defaultExpr = None;
-        pat = pat
-      }] when isHuggablePattern pat -> true
-    | _ -> false
-
-  let filterTernaryAttributes attrs =
-    List.filter (fun attr -> match attr with
-      |({Location.txt="res.ternary"},_) -> false
-      | _ -> true
-    ) attrs
-
-  let isJsxExpression expr =
-    let rec loop attrs =
-      match attrs with
-      | [] -> false
-      | ({Location.txt = "JSX"}, _)::_ -> true
-      | _::attrs -> loop attrs
-    in
-    match expr.pexp_desc with
-    | Pexp_apply _ ->
-      loop expr.Parsetree.pexp_attributes
-    | _ -> false
-
-  let hasJsxAttribute attributes = match attributes with
-    | ({Location.txt = "JSX"},_)::_ -> true
-    | _ -> false
-
-  let shouldIndentBinaryExpr expr =
-    let samePrecedenceSubExpression operator subExpression =
-      match subExpression with
-      | {pexp_desc = Pexp_apply (
-          {pexp_desc = Pexp_ident {txt = Longident.Lident subOperator}},
-          [Nolabel, _lhs; Nolabel, _rhs]
-        )} when isBinaryOperator subOperator ->
-        flattenableOperators operator subOperator
-      | _ -> true
-    in
-    match expr with
-    | {pexp_desc = Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [Nolabel, lhs; Nolabel, _rhs]
-      )} when isBinaryOperator operator ->
-      isEqualityOperator operator ||
-      not (samePrecedenceSubExpression operator lhs) ||
-      operator = ":="
-    | _ -> false
-
-  let shouldInlineRhsBinaryExpr rhs = match rhs.pexp_desc with
-    | Parsetree.Pexp_constant _
-    | Pexp_let _
-    | Pexp_letmodule _
-    | Pexp_letexception _
-    | Pexp_sequence _
-    | Pexp_open _
-    | Pexp_ifthenelse _
-    | Pexp_for _
-    | Pexp_while _
-    | Pexp_try _
-    | Pexp_array _
-    | Pexp_record _ -> true
-    | _ -> false
-
-  let filterPrinteableAttributes attrs =
-    List.filter (fun attr -> match attr with
-      | ({Location.txt="bs" | "res.ternary"}, _) -> false
-      | _ -> true
-    ) attrs
-
-  let partitionPrinteableAttributes attrs =
-    List.partition (fun attr -> match attr with
-      | ({Location.txt="bs" | "res.ternary"}, _) -> false
-      | _ -> true
-    ) attrs
-
-  let requiresSpecialCallbackPrintingLastArg args =
-    let rec loop args = match args with
-    | [] -> false
-    | [(_, {pexp_desc = Pexp_fun _ | Pexp_newtype _})] -> true
-    | (_, {pexp_desc = Pexp_fun _ | Pexp_newtype _})::_ -> false
-    | _::rest -> loop rest
-    in
-    loop args
-
-  let requiresSpecialCallbackPrintingFirstArg args =
-    let rec loop args = match args with
-      | [] -> true
-      | (_, {pexp_desc = Pexp_fun _ | Pexp_newtype _})::_ -> false
-      | _::rest -> loop rest
-    in
-    match args with
-    | [(_, {pexp_desc = Pexp_fun _ | Pexp_newtype _})] -> false
-    | (_, {pexp_desc = Pexp_fun _ | Pexp_newtype _})::rest -> loop rest
-    | _ -> false
-
-  let modExprApply modExpr =
-    let rec loop acc modExpr = match modExpr with
-    | {pmod_desc = Pmod_apply (next, arg)} ->
-      loop (arg::acc) next
-    | _ -> (acc, modExpr)
-    in
-    loop [] modExpr
-
-  let modExprFunctor modExpr =
-    let rec loop acc modExpr = match modExpr with
-    | {pmod_desc = Pmod_functor (lbl, modType, returnModExpr); pmod_attributes = attrs} ->
-      let param = (attrs, lbl, modType) in
-      loop (param::acc) returnModExpr
-    | returnModExpr ->
-      (List.rev acc, returnModExpr)
-    in
-    loop [] modExpr
-
-  let splitGenTypeAttr attrs =
-    match attrs with
-    | ({Location.txt = "genType"}, _)::attrs -> (true, attrs)
-    | attrs -> (false, attrs)
-
-  let rec collectPatternsFromListConstruct acc pattern =
-    let open Parsetree in
-    match pattern.ppat_desc with
-    | Ppat_construct(
-        {txt = Longident.Lident "::"},
-        Some {ppat_desc=Ppat_tuple (pat::rest::[])}
-      ) ->
-      collectPatternsFromListConstruct (pat::acc) rest
-    | _ -> List.rev acc, pattern
-
-  let rec isTemplateLiteral expr =
-    let isPexpConstantString expr = match expr.pexp_desc with
-    | Pexp_constant (Pconst_string (_, Some _)) -> true
-    | _ -> false
-    in
-    match expr.pexp_desc with
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident "^"}},
-        [Nolabel, arg1; Nolabel, arg2]
-      ) when not (isPexpConstantString arg1 && isPexpConstantString arg2) ->
-      isTemplateLiteral arg1 || isTemplateLiteral arg2
-    | Pexp_constant (Pconst_string (_, Some _)) -> true
-    | _ -> false
-
-  (* Blue | Red | Green -> [Blue; Red; Green] *)
-  let collectOrPatternChain pat =
-    let rec loop pattern chain =
-      match pattern.ppat_desc with
-      | Ppat_or (left, right) -> loop left (right::chain)
-      | _ -> pattern::chain
-    in
-    loop pat []
-
-  let isPipeExpr expr = match expr.pexp_desc with
-    | Pexp_apply(
-        {pexp_desc = Pexp_ident {txt = Longident.Lident ("|." | "|>") }},
-        [(Nolabel, _operand1); (Nolabel, _operand2)]
-      ) -> true
-    | _ -> false
-
-  let extractValueDescriptionFromModExpr modExpr =
-    let rec loop structure acc =
-      match structure with
-      | [] -> List.rev acc
-      | structureItem::structure ->
-        begin match structureItem.Parsetree.pstr_desc with
-        | Pstr_primitive vd -> loop structure (vd::acc)
-        | _ -> loop structure acc
-        end
-    in
-    match modExpr.pmod_desc with
-    | Pmod_structure structure -> loop structure []
-    | _ -> []
-
-  type jsImportScope =
-    | JsGlobalImport (* nothing *)
-    | JsModuleImport of string (* from "path" *)
-    | JsScopedImport of string list (* window.location *)
-
-  let classifyJsImport valueDescription =
-    let rec loop attrs =
-      let open Parsetree in
-      match attrs with
-      | [] -> JsGlobalImport
-      | ({Location.txt = "bs.scope"}, PStr [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string (s, _))}, _)}])::_ ->
-        JsScopedImport [s]
-      | ({Location.txt = "genType.import"}, PStr [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string (s, _))}, _)}])::_ ->
-        JsModuleImport s
-      | ({Location.txt = "bs.scope"}, PStr [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_tuple exprs}, _)}])::_ ->
-        let scopes = List.fold_left (fun acc curr ->
-          match curr.Parsetree.pexp_desc with
-          | Pexp_constant (Pconst_string (s, _)) -> s::acc
-          | _ -> acc
-        ) [] exprs
-        in
-        JsScopedImport (List.rev scopes)
-      | _::attrs ->
-       loop attrs
-    in
-    loop valueDescription.pval_attributes
-
-  let isUnderscoreApplySugar expr =
-    match expr.pexp_desc with
-    | Pexp_fun (
-        Nolabel,
-        None,
-        {ppat_desc = Ppat_var {txt="__x"}},
-        {pexp_desc = Pexp_apply _}
-      ) -> true
-    | _ -> false
-end
-
-module Parens: sig
-  type kind = Parenthesized | Braced of Location.t | Nothing
-
-  val expr: Parsetree.expression -> kind
-  val structureExpr: Parsetree.expression -> kind
-
-  val unaryExprOperand: Parsetree.expression -> kind
-
-  val binaryExprOperand: isLhs:bool -> Parsetree.expression -> kind
-  val subBinaryExprOperand: string -> string -> bool
-  val rhsBinaryExprOperand: string -> Parsetree.expression -> bool
-  val flattenOperandRhs: string -> Parsetree.expression -> bool
-
-  val lazyOrAssertExprRhs: Parsetree.expression -> kind
-
-  val fieldExpr: Parsetree.expression -> kind
-
-  val setFieldExprRhs: Parsetree.expression -> kind
-
-  val ternaryOperand: Parsetree.expression -> kind
-
-  val jsxPropExpr: Parsetree.expression -> kind
-  val jsxChildExpr: Parsetree.expression -> kind
-
-  val binaryExpr: Parsetree.expression -> kind
-  val modTypeFunctorReturn: Parsetree.module_type -> bool
-  val modTypeWithOperand: Parsetree.module_type -> bool
-  val modExprFunctorConstraint: Parsetree.module_type -> bool
-
-  val bracedExpr: Parsetree.expression -> bool
-  val callExpr: Parsetree.expression -> kind
-
-  val includeModExpr : Parsetree.module_expr -> bool
-end = struct
-  type kind = Parenthesized | Braced of Location.t | Nothing
-
-  let expr expr =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-    | _ ->
-      begin match expr with
-      | {Parsetree.pexp_desc = Pexp_constraint (
-          {pexp_desc = Pexp_pack _},
-          {ptyp_desc = Ptyp_package _}
-        )} -> Nothing
-      | {pexp_desc = Pexp_constraint _ } -> Parenthesized
-      |  _ -> Nothing
-      end
-
-  let callExpr expr =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-    | _ ->
-      begin match expr with
-      | {Parsetree.pexp_attributes = attrs} when
-          begin match ParsetreeViewer.filterParsingAttrs attrs with
-          | _::_ -> true
-          | [] -> false
-          end
-          -> Parenthesized
-      | _ when ParsetreeViewer.isUnaryExpression expr || ParsetreeViewer.isBinaryExpression expr -> Parenthesized
-      | {Parsetree.pexp_desc = Pexp_constraint (
-          {pexp_desc = Pexp_pack _},
-          {ptyp_desc = Ptyp_package _}
-        )} -> Nothing
-      | {pexp_desc = Pexp_fun _}
-        when ParsetreeViewer.isUnderscoreApplySugar expr -> Nothing
-      | {pexp_desc =
-            Pexp_lazy _
-          | Pexp_assert _
-          | Pexp_fun _
-          | Pexp_newtype _
-          | Pexp_function _
-          | Pexp_constraint _
-          | Pexp_setfield _
-          | Pexp_match _
-          | Pexp_try _
-          | Pexp_while _
-          | Pexp_for _
-          | Pexp_ifthenelse _
-        } -> Parenthesized
-      |  _ -> Nothing
-      end
-
-  let structureExpr expr =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-    | None ->
-      begin match expr with
-      | _ when ParsetreeViewer.hasAttributes expr.pexp_attributes &&
-        not (ParsetreeViewer.isJsxExpression expr) -> Parenthesized
-      | {Parsetree.pexp_desc = Pexp_constraint (
-          {pexp_desc = Pexp_pack _},
-          {ptyp_desc = Ptyp_package _}
-        )} -> Nothing
-      | {pexp_desc = Pexp_constraint _ } -> Parenthesized
-      |  _ -> Nothing
-      end
-
-  let unaryExprOperand expr =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-    | None ->
-      begin match expr with
-      | {Parsetree.pexp_attributes = attrs} when
-          begin match ParsetreeViewer.filterParsingAttrs attrs with
-          | _::_ -> true
-          | [] -> false
-          end
-          -> Parenthesized
-      | expr when
-          ParsetreeViewer.isUnaryExpression expr ||
-          ParsetreeViewer.isBinaryExpression expr
-        -> Parenthesized
-      | {pexp_desc = Pexp_constraint (
-          {pexp_desc = Pexp_pack _},
-          {ptyp_desc = Ptyp_package _}
-        )} -> Nothing
-      | {pexp_desc = Pexp_fun _}
-        when ParsetreeViewer.isUnderscoreApplySugar expr -> Nothing
-      | {pexp_desc =
-            Pexp_lazy _
-          | Pexp_assert _
-          | Pexp_fun _
-          | Pexp_newtype _
-          | Pexp_function _
-          | Pexp_constraint _
-          | Pexp_setfield _
-          | Pexp_extension _ (* readability? maybe remove *)
-          | Pexp_match _
-          | Pexp_try _
-          | Pexp_while _
-          | Pexp_for _
-          | Pexp_ifthenelse _
-        } -> Parenthesized
-      | _ -> Nothing
-      end
-
-  let binaryExprOperand ~isLhs expr =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-    | None ->
-      begin match expr with
-      | {Parsetree.pexp_desc = Pexp_constraint (
-          {pexp_desc = Pexp_pack _},
-          {ptyp_desc = Ptyp_package _}
-        )} -> Nothing
-      | {pexp_desc = Pexp_fun _}
-        when ParsetreeViewer.isUnderscoreApplySugar expr -> Nothing
-      | {pexp_desc = Pexp_constraint _ | Pexp_fun _ | Pexp_function _ | Pexp_newtype _} -> Parenthesized
-      | expr when ParsetreeViewer.isBinaryExpression expr -> Parenthesized
-      | expr when ParsetreeViewer.isTernaryExpr expr -> Parenthesized
-      | {pexp_desc =
-            Pexp_lazy _
-          | Pexp_assert _
-        } when isLhs -> Parenthesized
-      | _ -> Nothing
-      end
-
-  let subBinaryExprOperand parentOperator childOperator =
-    let precParent = ParsetreeViewer.operatorPrecedence parentOperator in
-    let precChild =  ParsetreeViewer.operatorPrecedence childOperator in
-    precParent > precChild ||
-    (precParent == precChild &&
-    not (ParsetreeViewer.flattenableOperators parentOperator childOperator)) ||
-    (* a && b || c, add parens to (a && b) for readability, who knows the difference by heart… *)
-    (parentOperator = "||" && childOperator = "&&")
-
-  let rhsBinaryExprOperand parentOperator rhs =
-    match rhs.Parsetree.pexp_desc with
-    | Parsetree.Pexp_apply(
-      {pexp_attributes = [];
-        pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [_, _left; _, _right]
-      ) when ParsetreeViewer.isBinaryOperator operator ->
-    let precParent = ParsetreeViewer.operatorPrecedence parentOperator in
-    let precChild =  ParsetreeViewer.operatorPrecedence operator in
-    precParent == precChild
-    | _ -> false
-
-  let flattenOperandRhs parentOperator rhs =
-    match rhs.Parsetree.pexp_desc with
-    | Parsetree.Pexp_apply(
-        {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [_, _left; _, _right]
-      ) when ParsetreeViewer.isBinaryOperator operator ->
-      let precParent = ParsetreeViewer.operatorPrecedence parentOperator in
-      let precChild =  ParsetreeViewer.operatorPrecedence operator in
-      precParent >= precChild || rhs.pexp_attributes <> []
-    | Pexp_constraint (
-        {pexp_desc = Pexp_pack _},
-        {ptyp_desc = Ptyp_package _}
-      ) -> false
-    | Pexp_fun _ when ParsetreeViewer.isUnderscoreApplySugar rhs -> false
-    | Pexp_fun _
-    | Pexp_newtype _
-    | Pexp_setfield _
-    | Pexp_constraint _ -> true
-    | _ when ParsetreeViewer.isTernaryExpr rhs -> true
-    | _ -> false
-
-  let lazyOrAssertExprRhs expr =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-    | None ->
-      begin match expr with
-      | {Parsetree.pexp_attributes = attrs} when
-          begin match ParsetreeViewer.filterParsingAttrs attrs with
-          | _::_ -> true
-          | [] -> false
-          end
-          -> Parenthesized
-      | expr when ParsetreeViewer.isBinaryExpression expr -> Parenthesized
-      | {pexp_desc = Pexp_constraint (
-          {pexp_desc = Pexp_pack _},
-          {ptyp_desc = Ptyp_package _}
-        )} -> Nothing
-      | {pexp_desc = Pexp_fun _}
-        when ParsetreeViewer.isUnderscoreApplySugar expr -> Nothing
-      | {pexp_desc =
-            Pexp_lazy _
-          | Pexp_assert _
-          | Pexp_fun _
-          | Pexp_newtype _
-          | Pexp_function _
-          | Pexp_constraint _
-          | Pexp_setfield _
-          | Pexp_match _
-          | Pexp_try _
-          | Pexp_while _
-          | Pexp_for _
-          | Pexp_ifthenelse _
-        } -> Parenthesized
-      | _ -> Nothing
-      end
-
-  let isNegativeConstant constant =
-    let isNeg txt =
-      let len = String.length txt in
-      len > 0 && (String.get [@doesNotRaise]) txt 0 = '-'
-    in
-    match constant with
-    | Parsetree.Pconst_integer (i, _) | Pconst_float (i, _) when isNeg i -> true
-    | _ -> false
-
-  let fieldExpr expr =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-    | None ->
-      begin match expr with
-      | {Parsetree.pexp_attributes = attrs} when
-          begin match ParsetreeViewer.filterParsingAttrs attrs with
-          | _::_ -> true
-          | [] -> false
-          end
-          -> Parenthesized
-      | expr when
-          ParsetreeViewer.isBinaryExpression expr ||
-          ParsetreeViewer.isUnaryExpression expr
-        -> Parenthesized
-      | {pexp_desc = Pexp_constraint (
-          {pexp_desc = Pexp_pack _},
-          {ptyp_desc = Ptyp_package _}
-        )} -> Nothing
-      | {pexp_desc = Pexp_constant c } when isNegativeConstant c -> Parenthesized
-      | {pexp_desc = Pexp_fun _}
-        when ParsetreeViewer.isUnderscoreApplySugar expr -> Nothing
-      | {pexp_desc =
-            Pexp_lazy _
-          | Pexp_assert _
-          | Pexp_extension _ (* %extension.x vs (%extension).x *)
-          | Pexp_fun _
-          | Pexp_newtype _
-          | Pexp_function _
-          | Pexp_constraint _
-          | Pexp_setfield _
-          | Pexp_match _
-          | Pexp_try _
-          | Pexp_while _
-          | Pexp_for _
-          | Pexp_ifthenelse _
-        } -> Parenthesized
-      | _ -> Nothing
-      end
-
-  let setFieldExprRhs expr =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-    | None ->
-      begin match expr with
-      | {Parsetree.pexp_desc = Pexp_constraint (
-          {pexp_desc = Pexp_pack _},
-          {ptyp_desc = Ptyp_package _}
-        )} -> Nothing
-      | {pexp_desc = Pexp_constraint _ } -> Parenthesized
-      | _ -> Nothing
-      end
-
-  let ternaryOperand expr =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-    | None ->
-      begin match expr with
-      | {Parsetree.pexp_desc = Pexp_constraint (
-          {pexp_desc = Pexp_pack _},
-          {ptyp_desc = Ptyp_package _}
-        )} -> Nothing
-      | {pexp_desc = Pexp_constraint _ } -> Parenthesized
-      | {pexp_desc = Pexp_fun _ | Pexp_newtype _} ->
-        let (_attrsOnArrow, _parameters, returnExpr) = ParsetreeViewer.funExpr expr in
-        begin match returnExpr.pexp_desc with
-        | Pexp_constraint _ -> Parenthesized
-        | _ -> Nothing
-        end
-      | _ -> Nothing
-      end
-
-  let startsWithMinus txt =
-    let len = String.length txt in
-    if len == 0 then
-      false
-    else
-      let s = (String.get [@doesNotRaise]) txt 0 in
-      s = '-'
-
-  let jsxPropExpr expr =
-    match expr.Parsetree.pexp_desc with
-    | Parsetree.Pexp_let _
-    | Pexp_sequence _
-    | Pexp_letexception _
-    | Pexp_letmodule _
-    | Pexp_open _ -> Nothing
-    | _ ->
-      let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-      begin match optBraces with
-      | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-      | None ->
-        begin match expr with
-        | {Parsetree.pexp_desc =
-            Pexp_constant (Pconst_integer (x, _) | Pconst_float (x, _));
-            pexp_attributes = []}
-          when startsWithMinus x -> Parenthesized
-        | {Parsetree.pexp_desc =
-            Pexp_ident _ | Pexp_constant _ | Pexp_field _ | Pexp_construct _ | Pexp_variant _ |
-            Pexp_array _ | Pexp_pack _ | Pexp_record _ | Pexp_extension _ |
-            Pexp_letmodule _ | Pexp_letexception _ | Pexp_open _ | Pexp_sequence _ |
-            Pexp_let _ | Pexp_tuple _;
-           pexp_attributes = []
-          } -> Nothing
-        | {Parsetree.pexp_desc = Pexp_constraint (
-            {pexp_desc = Pexp_pack _},
-            {ptyp_desc = Ptyp_package _}
-          ); pexp_attributes = []} -> Nothing
-        | _ -> Parenthesized
-        end
-      end
-
-  let jsxChildExpr expr =
-    match expr.Parsetree.pexp_desc with
-    | Parsetree.Pexp_let _
-    | Pexp_sequence _
-    | Pexp_letexception _
-    | Pexp_letmodule _
-    | Pexp_open _ -> Nothing
-    | _ ->
-      let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-      begin match optBraces with
-      | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-      | _ ->
-        begin match expr with
-        | {Parsetree.pexp_desc = Pexp_constant (Pconst_integer (x, _) | Pconst_float (x, _));
-           pexp_attributes = []
-          } when startsWithMinus x -> Parenthesized
-        | {Parsetree.pexp_desc =
-            Pexp_ident _ | Pexp_constant _ | Pexp_field _ | Pexp_construct _ | Pexp_variant _ |
-            Pexp_array _ | Pexp_pack _ | Pexp_record _ | Pexp_extension _ |
-            Pexp_letmodule _ | Pexp_letexception _ | Pexp_open _ | Pexp_sequence _ |
-            Pexp_let _;
-            pexp_attributes = []
-          } -> Nothing
-        | {Parsetree.pexp_desc = Pexp_constraint (
-            {pexp_desc = Pexp_pack _},
-            {ptyp_desc = Ptyp_package _}
-           ); pexp_attributes = []} -> Nothing
-        | expr when ParsetreeViewer.isJsxExpression expr -> Nothing
-        | _ -> Parenthesized
-        end
-      end
-
-  let binaryExpr expr =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced(bracesLoc)
-    | None ->
-      begin match expr with
-      | {Parsetree.pexp_attributes = _::_} as expr
-        when ParsetreeViewer.isBinaryExpression expr -> Parenthesized
-      | _ -> Nothing
-      end
-
-  let modTypeFunctorReturn modType = match modType with
-    | {Parsetree.pmty_desc = Pmty_with _} -> true
-    | _ -> false
-
-  (* Add parens for readability:
-       module type Functor = SetLike => Set with type t = A.t
-     This is actually:
-       module type Functor = (SetLike => Set) with type t = A.t
-  *)
-  let modTypeWithOperand modType = match modType with
-    | {Parsetree.pmty_desc = Pmty_functor _} -> true
-    | _ -> false
-
-  let modExprFunctorConstraint modType = match modType with
-    | {Parsetree.pmty_desc = Pmty_functor _ | Pmty_with _} -> true
-    | _ -> false
-
-  let bracedExpr expr = match expr.Parsetree.pexp_desc with
-    | Pexp_constraint (
-        {pexp_desc = Pexp_pack _},
-        {ptyp_desc = Ptyp_package _}
-      ) -> false
-    | Pexp_constraint _ -> true
-    | _ -> false
-
-  let includeModExpr modExpr = match modExpr.Parsetree.pmod_desc with
-  | Parsetree.Pmod_constraint _ -> true
-  | _ -> false
-end
-
-module CommentTable = struct
-  type t = {
-    leading: (Location.t, Comment.t list) Hashtbl.t;
-    inside: (Location.t, Comment.t list) Hashtbl.t;
-    trailing: (Location.t, Comment.t list) Hashtbl.t;
-  }
-
-  let make () = {
-    leading = Hashtbl.create 100;
-    inside = Hashtbl.create 100;
-    trailing = Hashtbl.create 100;
-  }
-
-  let empty = make ()
-
-  let log t =
-    let open Location in
-    let leadingStuff = Hashtbl.fold (fun (k : Location.t) (v : Comment.t list) acc ->
-      let loc = Doc.concat [
-        Doc.lbracket;
-        Doc.text (string_of_int k.loc_start.pos_lnum);
-        Doc.text ":";
-        Doc.text (string_of_int (k.loc_start.pos_cnum  - k.loc_start.pos_bol));
-        Doc.text "-";
-        Doc.text (string_of_int k.loc_end.pos_lnum);
-        Doc.text ":";
-        Doc.text (string_of_int (k.loc_end.pos_cnum  - k.loc_end.pos_bol));
-        Doc.rbracket;
-      ] in
-      let doc = Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          loc;
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              Doc.join ~sep:Doc.comma (List.map (fun c -> Doc.text (Comment.txt c)) v)
-            ]
-          );
-          Doc.line;
-        ]
-      ) in
-      doc::acc
-    ) t.leading []
-    in
-    let trailingStuff = Hashtbl.fold (fun (k : Location.t) (v : Comment.t list) acc ->
-      let loc = Doc.concat [
-        Doc.lbracket;
-        Doc.text (string_of_int k.loc_start.pos_lnum);
-        Doc.text ":";
-        Doc.text (string_of_int (k.loc_start.pos_cnum  - k.loc_start.pos_bol));
-        Doc.text "-";
-        Doc.text (string_of_int k.loc_end.pos_lnum);
-        Doc.text ":";
-        Doc.text (string_of_int (k.loc_end.pos_cnum  - k.loc_end.pos_bol));
-        Doc.rbracket;
-      ] in
-      let doc = Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          loc;
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (List.map (fun c -> Doc.text (Comment.txt c)) v)
-            ]
-          );
-          Doc.line;
-        ]
-      ) in
-      doc::acc
-    ) t.trailing []
-    in
-    Doc.breakableGroup ~forceBreak:true (
-      Doc.concat [
-        Doc.text "leading comments:";
-        Doc.line;
-        Doc.indent (Doc.concat leadingStuff);
-        Doc.line;
-        Doc.line;
-        Doc.text "trailing comments:";
-        Doc.indent (Doc.concat trailingStuff);
-        Doc.line;
-        Doc.line;
-      ]
-    ) |> Doc.toString ~width:80 |> print_endline
-    [@@live]
-  let attach tbl loc comments =
-    match comments with
-    | [] -> ()
-    | comments -> Hashtbl.replace tbl loc comments
-
-  let partitionByLoc comments loc =
-    let rec loop (leading, inside, trailing)  comments =
-      let open Location in
-      match comments with
-      | comment::rest ->
-        let cmtLoc = Comment.loc comment in
-        if cmtLoc.loc_end.pos_cnum <= loc.loc_start.pos_cnum then
-          loop (comment::leading, inside, trailing) rest
-        else if cmtLoc.loc_start.pos_cnum >= loc.loc_end.pos_cnum then
-          loop (leading, inside, comment::trailing) rest
-        else
-          loop (leading, comment::inside, trailing) rest
-      | [] -> (List.rev leading, List.rev inside, List.rev trailing)
-    in
-    loop ([], [], []) comments
-
-  let partitionLeadingTrailing comments loc =
-    let rec loop (leading, trailing)  comments =
-      let open Location in
-      match comments with
-      | comment::rest ->
-        let cmtLoc = Comment.loc comment in
-        if cmtLoc.loc_end.pos_cnum <= loc.loc_start.pos_cnum then
-          loop (comment::leading, trailing) rest
-        else
-          loop (leading, comment::trailing) rest
-      | [] -> (List.rev leading, List.rev trailing)
-    in
-    loop ([], []) comments
-
-  let partitionByOnSameLine loc comments =
-    let rec loop (onSameLine, onOtherLine) comments =
-      let open Location in
-      match comments with
-      | [] -> (List.rev onSameLine, List.rev onOtherLine)
-      | comment::rest ->
-        let cmtLoc = Comment.loc comment in
-        if cmtLoc.loc_start.pos_lnum == loc.loc_end.pos_lnum then
-          loop (comment::onSameLine, onOtherLine) rest
-        else
-          loop (onSameLine, comment::onOtherLine) rest
-    in
-    loop ([], []) comments
-
-  let partitionAdjacentTrailing loc1 comments =
-    let open Location in
-    let open Lexing in
-    let rec loop ~prevEndPos afterLoc1 comments =
-      match comments with
-      | [] -> (List.rev afterLoc1, [])
-      | (comment::rest) as comments ->
-        let cmtPrevEndPos = Comment.prevTokEndPos comment in
-        if prevEndPos.Lexing.pos_cnum == cmtPrevEndPos.pos_cnum then
-          let commentEnd = (Comment.loc comment).loc_end in
-          loop ~prevEndPos:commentEnd (comment::afterLoc1) rest
-        else
-          (List.rev afterLoc1, comments)
-    in
-    loop ~prevEndPos:loc1.loc_end [] comments
-
-  let rec collectListPatterns acc pattern =
-    let open Parsetree in
-    match pattern.ppat_desc with
-    | Ppat_construct(
-        {txt = Longident.Lident "::"},
-        Some {ppat_desc=Ppat_tuple (pat::rest::[])}
-      ) ->
-      collectListPatterns (pat::acc) rest
-    | Ppat_construct ({txt = Longident.Lident "[]"}, None) ->
-      List.rev acc
-    | _ -> List.rev (pattern::acc)
-
-  let rec collectListExprs acc expr =
-    let open Parsetree in
-    match expr.pexp_desc with
-    | Pexp_construct(
-        {txt = Longident.Lident "::"},
-        Some {pexp_desc=Pexp_tuple (expr::rest::[])}
-      ) ->
-      collectListExprs (expr::acc) rest
-    | Pexp_construct ({txt = Longident.Lident "[]"}, _) ->
-      List.rev acc
-    | _ -> List.rev (expr::acc)
-
-  (* TODO: use ParsetreeViewer *)
-  let arrowType ct =
-    let open Parsetree in
-    let rec process attrsBefore acc typ = match typ with
-    | {ptyp_desc = Ptyp_arrow (Nolabel as lbl, typ1, typ2); ptyp_attributes = []} ->
-      let arg = ([], lbl, typ1) in
-      process attrsBefore (arg::acc) typ2
-    | {ptyp_desc = Ptyp_arrow (Nolabel as lbl, typ1, typ2); ptyp_attributes = [({txt ="bs"}, _) ] as attrs} ->
-      let arg = (attrs, lbl, typ1) in
-      process attrsBefore (arg::acc) typ2
-    | {ptyp_desc = Ptyp_arrow (Nolabel, _typ1, _typ2); ptyp_attributes = _attrs} as returnType ->
-      let args = List.rev acc in
-      (attrsBefore, args, returnType)
-    | {ptyp_desc = Ptyp_arrow ((Labelled _ | Optional _) as lbl, typ1, typ2); ptyp_attributes = attrs} ->
-      let arg = (attrs, lbl, typ1) in
-      process attrsBefore (arg::acc) typ2
-    | typ ->
-      (attrsBefore, List.rev acc, typ)
-    in
-    begin match ct with
-    | {ptyp_desc = Ptyp_arrow (Nolabel, _typ1, _typ2); ptyp_attributes = attrs} as typ ->
-      process attrs [] {typ with ptyp_attributes = []}
-    | typ -> process [] [] typ
-    end
-
-  (* TODO: avoiding the dependency on ParsetreeViewer here, is this a good idea? *)
-  let modExprApply modExpr =
-    let rec loop acc modExpr = match modExpr with
-    | {Parsetree.pmod_desc = Pmod_apply (next, arg)} ->
-      loop (arg::acc) next
-    | _ -> (modExpr::acc)
-    in
-    loop [] modExpr
-
-  (* TODO: avoiding the dependency on ParsetreeViewer here, is this a good idea? *)
-  let modExprFunctor modExpr =
-    let rec loop acc modExpr = match modExpr with
-    | {Parsetree.pmod_desc = Pmod_functor (lbl, modType, returnModExpr); pmod_attributes = attrs} ->
-      let param = (attrs, lbl, modType) in
-      loop (param::acc) returnModExpr
-    | returnModExpr ->
-      (List.rev acc, returnModExpr)
-    in
-    loop [] modExpr
-
-  let functorType modtype =
-    let rec process acc modtype = match modtype with
-    | {Parsetree.pmty_desc = Pmty_functor (lbl, argType, returnType); pmty_attributes = attrs} ->
-      let arg = (attrs, lbl, argType) in
-      process (arg::acc) returnType
-    | modType ->
-      (List.rev acc, modType)
-    in
-    process [] modtype
-
-  let funExpr expr =
-    let open Parsetree in
-    (* Turns (type t, type u, type z) into "type t u z" *)
-    let rec collectNewTypes acc returnExpr =
-      match returnExpr with
-      | {pexp_desc = Pexp_newtype (stringLoc, returnExpr); pexp_attributes = []} ->
-        collectNewTypes (stringLoc::acc) returnExpr
-      | returnExpr ->
-        let loc = match (acc, List.rev acc) with
-        | (_startLoc::_, endLoc::_) -> { endLoc.loc with loc_end = endLoc.loc.loc_end }
-        | _ -> Location.none
-        in
-        let txt = List.fold_right (fun curr acc -> acc ^ " " ^ curr.Location.txt) acc "type" in
-        (Location.mkloc txt loc, returnExpr)
-    in
-    (* For simplicity reason Pexp_newtype gets converted to a Nolabel parameter,
-     * otherwise this function would need to return a variant:
-     * | NormalParamater(...)
-     * | NewType(...)
-     * This complicates printing with an extra variant/boxing/allocation for a code-path
-     * that is not often used. Lets just keep it simple for now *)
-    let rec collect attrsBefore acc expr = match expr with
-    | {pexp_desc = Pexp_fun (lbl, defaultExpr, pattern, returnExpr); pexp_attributes = []} ->
-      let parameter = ([], lbl, defaultExpr, pattern) in
-      collect attrsBefore (parameter::acc) returnExpr
-    | {pexp_desc = Pexp_newtype (stringLoc, rest); pexp_attributes = attrs} ->
-      let (var, returnExpr) = collectNewTypes [stringLoc] rest in
-      let parameter = (
-        attrs,
-        Asttypes.Nolabel,
-        None,
-        Ast_helper.Pat.var ~loc:stringLoc.loc var
-      ) in
-      collect attrsBefore (parameter::acc) returnExpr
-    | {pexp_desc = Pexp_fun (lbl, defaultExpr, pattern, returnExpr); pexp_attributes = [({txt = "bs"}, _)] as attrs} ->
-      let parameter = (attrs, lbl, defaultExpr, pattern) in
-      collect attrsBefore (parameter::acc) returnExpr
-    | {
-        pexp_desc = Pexp_fun ((Labelled _ | Optional _) as lbl, defaultExpr, pattern, returnExpr);
-        pexp_attributes = attrs
-      } ->
-      let parameter = (attrs, lbl, defaultExpr, pattern) in
-      collect attrsBefore (parameter::acc) returnExpr
-    | expr ->
-      (attrsBefore, List.rev acc, expr)
-    in
-    begin match expr with
-    | {pexp_desc = Pexp_fun (Nolabel, _defaultExpr, _pattern, _returnExpr); pexp_attributes = attrs} as expr ->
-      collect attrs [] {expr with pexp_attributes = []}
-    | expr -> collect [] [] expr
-    end
-
-  let rec isBlockExpr expr =
-    let open Parsetree in
-    match expr.pexp_desc with
-    | Pexp_letmodule _
-    | Pexp_letexception _
-    | Pexp_let _
-    | Pexp_open _
-    | Pexp_sequence _ -> true
-    | Pexp_apply (callExpr, _) when isBlockExpr callExpr -> true
-    | Pexp_constraint (expr, _) when isBlockExpr expr -> true
-    | Pexp_field (expr, _) when isBlockExpr expr -> true
-    | Pexp_setfield (expr, _, _) when isBlockExpr expr -> true
-    | _ -> false
-
-  let rec walkStructure s t comments =
-    match s with
-    | _ when comments = [] -> ()
-    | [] -> attach t.inside Location.none comments
-    | s ->
-      walkList
-        ~getLoc:(fun n -> n.Parsetree.pstr_loc)
-        ~walkNode:walkStructureItem
-        s
-        t
-        comments
-
-    and walkStructureItem si t comments =
-      match si.Parsetree.pstr_desc with
-      | _ when comments = [] -> ()
-      | Pstr_primitive valueDescription ->
-        walkValueDescription valueDescription t comments
-      | Pstr_open openDescription ->
-        walkOpenDescription openDescription t comments
-      | Pstr_value (_, valueBindings) ->
-        walkValueBindings valueBindings t comments
-      | Pstr_type (_, typeDeclarations) ->
-        walkTypeDeclarations typeDeclarations t comments
-      | Pstr_eval (expr, _) ->
-        walkExpr expr t comments
-      | Pstr_module moduleBinding ->
-        walkModuleBinding moduleBinding t comments
-      | Pstr_recmodule moduleBindings ->
-        walkList
-          ~getLoc:(fun mb -> mb.Parsetree.pmb_loc)
-          ~walkNode:walkModuleBinding
-          moduleBindings
-          t
-          comments
-      | Pstr_modtype modTypDecl ->
-        walkModuleTypeDeclaration modTypDecl t comments
-      | Pstr_attribute attribute ->
-        walkAttribute attribute t comments
-      | Pstr_extension (extension, _) ->
-        walkExtension extension t comments
-      | Pstr_include includeDeclaration ->
-        walkIncludeDeclaration includeDeclaration t comments
-      | Pstr_exception extensionConstructor ->
-        walkExtConstr extensionConstructor t comments
-      | Pstr_typext typeExtension ->
-        walkTypeExtension typeExtension t comments
-      | Pstr_class_type _  | Pstr_class _ -> ()
-
-    and walkValueDescription vd t comments =
-      let (leading, trailing) =
-        partitionLeadingTrailing comments vd.pval_name.loc in
-      attach t.leading vd.pval_name.loc leading;
-      let (afterName, rest) =
-        partitionAdjacentTrailing vd.pval_name.loc trailing in
-      attach t.trailing vd.pval_name.loc afterName;
-      let (before, inside, after) =
-        partitionByLoc rest vd.pval_type.ptyp_loc
-      in
-      attach t.leading vd.pval_type.ptyp_loc before;
-      walkTypExpr vd.pval_type t inside;
-      attach t.trailing vd.pval_type.ptyp_loc after
-
-    and walkTypeExtension te t comments =
-      let (leading, trailing) =
-        partitionLeadingTrailing comments te.ptyext_path.loc in
-      attach t.leading te.ptyext_path.loc leading;
-      let (afterPath, rest) =
-        partitionAdjacentTrailing te.ptyext_path.loc trailing in
-      attach t.trailing te.ptyext_path.loc afterPath;
-
-      (* type params *)
-      let rest = match te.ptyext_params with
-      | [] -> rest
-      | typeParams ->
-        visitListButContinueWithRemainingComments
-          ~getLoc:(fun (typexpr, _variance) -> typexpr.Parsetree.ptyp_loc)
-          ~walkNode:walkTypeParam
-          ~newlineDelimited:false
-          typeParams
-          t
-          rest
-      in
-      walkList
-        ~getLoc:(fun n -> n.Parsetree.pext_loc)
-        ~walkNode:walkExtConstr
-        te.ptyext_constructors
-        t
-        rest
-
-    and walkIncludeDeclaration inclDecl t comments =
-      let (before, inside, after) =
-        partitionByLoc comments inclDecl.pincl_mod.pmod_loc in
-      attach t.leading inclDecl.pincl_mod.pmod_loc before;
-      walkModExpr inclDecl.pincl_mod t inside;
-      attach t.trailing inclDecl.pincl_mod.pmod_loc after
-
-    and walkModuleTypeDeclaration mtd t comments =
-      let (leading, trailing) =
-        partitionLeadingTrailing comments mtd.pmtd_name.loc in
-      attach t.leading mtd.pmtd_name.loc leading;
-      begin match mtd.pmtd_type with
-      | None ->
-        attach t.trailing mtd.pmtd_name.loc trailing
-      | Some modType ->
-        let (afterName, rest) = partitionAdjacentTrailing mtd.pmtd_name.loc trailing in
-        attach t.trailing mtd.pmtd_name.loc afterName;
-        let (before, inside, after) = partitionByLoc rest modType.pmty_loc in
-        attach t.leading modType.pmty_loc before;
-        walkModType modType t inside;
-        attach t.trailing modType.pmty_loc after
-      end
-
-    and walkModuleBinding mb t comments =
-      let (leading, trailing) = partitionLeadingTrailing comments mb.pmb_name.loc in
-      attach t.leading mb.pmb_name.loc leading;
-      let (afterName, rest) = partitionAdjacentTrailing mb.pmb_name.loc trailing in
-      attach t.trailing mb.pmb_name.loc afterName;
-      let (leading, inside, trailing) = partitionByLoc rest mb.pmb_expr.pmod_loc in
-      begin match mb.pmb_expr.pmod_desc with
-      | Pmod_constraint _ ->
-        walkModExpr mb.pmb_expr t (List.concat [leading; inside]);
-      | _ ->
-        attach t.leading mb.pmb_expr.pmod_loc leading;
-        walkModExpr mb.pmb_expr t inside;
-      end;
-      attach t.trailing mb.pmb_expr.pmod_loc trailing
-
-   and walkSignature signature t comments =
-      match signature with
-      | _ when comments = [] -> ()
-      | [] -> attach t.inside Location.none comments
-      | _s ->
-        walkList
-          ~getLoc:(fun n -> n.Parsetree.psig_loc)
-          ~walkNode:walkSignatureItem
-          signature
-          t
-          comments
-
-    and walkSignatureItem si t comments =
-      match si.psig_desc with
-      | _ when comments = [] -> ()
-      | Psig_value valueDescription ->
-        walkValueDescription valueDescription t comments
-      | Psig_type (_, typeDeclarations) ->
-        walkTypeDeclarations typeDeclarations t comments
-      | Psig_typext typeExtension ->
-        walkTypeExtension typeExtension t comments
-      | Psig_exception extensionConstructor ->
-        walkExtConstr extensionConstructor t comments
-      | Psig_module moduleDeclaration ->
-        walkModuleDeclaration moduleDeclaration t comments
-      | Psig_recmodule moduleDeclarations ->
-        walkList
-          ~getLoc:(fun n -> n.Parsetree.pmd_loc)
-          ~walkNode:walkModuleDeclaration
-          moduleDeclarations
-          t
-          comments
-      | Psig_modtype moduleTypeDeclaration ->
-        walkModuleTypeDeclaration moduleTypeDeclaration t comments
-      | Psig_open openDescription ->
-        walkOpenDescription openDescription t comments
-      | Psig_include includeDescription ->
-        walkIncludeDescription includeDescription t comments
-      | Psig_attribute attribute ->
-        walkAttribute attribute t comments
-      | Psig_extension (extension, _) ->
-        walkExtension extension t comments
-      | Psig_class _ | Psig_class_type _ -> ()
-
-    and walkIncludeDescription id t comments =
-      let (before, inside, after) =
-        partitionByLoc comments id.pincl_mod.pmty_loc in
-      attach t.leading id.pincl_mod.pmty_loc before;
-      walkModType id.pincl_mod t inside;
-      attach t.trailing id.pincl_mod.pmty_loc after
-
-    and walkModuleDeclaration md t comments =
-      let (leading, trailing) = partitionLeadingTrailing comments md.pmd_name.loc in
-      attach t.leading md.pmd_name.loc leading;
-      let (afterName, rest) = partitionAdjacentTrailing md.pmd_name.loc trailing in
-      attach t.trailing md.pmd_name.loc afterName;
-      let (leading, inside, trailing) = partitionByLoc rest md.pmd_type.pmty_loc in
-      attach t.leading md.pmd_type.pmty_loc leading;
-      walkModType md.pmd_type t inside;
-      attach t.trailing md.pmd_type.pmty_loc trailing
-
-    and walkList:
-      'node.
-      ?prevLoc:Location.t ->
-      getLoc:('node -> Location.t) ->
-      walkNode:('node -> t -> Comment.t list -> unit) ->
-      'node list -> t -> Comment.t list -> unit
-      = fun ?prevLoc ~getLoc ~walkNode l t comments ->
-      let open Location in
-      match l with
-      | _ when comments = [] -> ()
-      | [] ->
-        begin match prevLoc with
-        | Some loc ->
-          attach t.trailing loc comments
-        | None -> ()
-        end
-      | node::rest ->
-        let currLoc = getLoc node in
-        let (leading, inside, trailing) = partitionByLoc comments currLoc in
-        begin match prevLoc with
-        | None -> (* first node, all leading comments attach here *)
-          attach t.leading currLoc leading
-        | Some prevLoc ->
-          (* Same line *)
-          if prevLoc.loc_end.pos_lnum == currLoc.loc_start.pos_lnum then
-            let (afterPrev, beforeCurr) = partitionAdjacentTrailing prevLoc leading in
-            let () = attach t.trailing prevLoc afterPrev in
-            attach t.leading currLoc beforeCurr
-          else
-            let (onSameLineAsPrev, afterPrev) = partitionByOnSameLine prevLoc leading in
-            let () = attach t.trailing prevLoc onSameLineAsPrev in
-            let (leading, _inside, _trailing) = partitionByLoc afterPrev currLoc in
-            attach t.leading currLoc leading
-        end;
-        walkNode node t inside;
-        walkList ~prevLoc:currLoc ~getLoc ~walkNode rest t trailing
-
-    (* The parsetree doesn't always contain location info about the opening or
-     * closing token of a "list-of-things". This routine visits the whole list,
-     * but returns any remaining comments that likely fall after the whole list. *)
-    and visitListButContinueWithRemainingComments:
-      'node.
-      ?prevLoc:Location.t ->
-      newlineDelimited:bool ->
-      getLoc:('node -> Location.t) ->
-      walkNode:('node -> t -> Comment.t list -> unit) ->
-      'node list -> t -> Comment.t list -> Comment.t list
-      = fun ?prevLoc ~newlineDelimited ~getLoc ~walkNode l t comments ->
-      let open Location in
-      match l with
-      | _ when comments = [] -> []
-      | [] ->
-        begin match prevLoc with
-        | Some loc ->
-          let (afterPrev, rest) =
-            if newlineDelimited then
-              partitionByOnSameLine loc comments
-            else
-              partitionAdjacentTrailing loc comments
-          in
-          attach t.trailing loc afterPrev;
-          rest
-        | None -> comments
-        end
-      | node::rest ->
-        let currLoc = getLoc node in
-        let (leading, inside, trailing) = partitionByLoc comments currLoc in
-        let () = match prevLoc with
-        | None -> (* first node, all leading comments attach here *)
-          attach t.leading currLoc leading;
-          ()
-        | Some prevLoc ->
-          (* Same line *)
-          if prevLoc.loc_end.pos_lnum == currLoc.loc_start.pos_lnum then
-            let (afterPrev, beforeCurr) = partitionAdjacentTrailing prevLoc leading in
-            let () = attach t.trailing prevLoc afterPrev in
-            let () = attach t.leading currLoc beforeCurr in
-            ()
-          else
-            let (onSameLineAsPrev, afterPrev) = partitionByOnSameLine prevLoc leading in
-            let () = attach t.trailing prevLoc onSameLineAsPrev in
-            let (leading, _inside, _trailing) = partitionByLoc afterPrev currLoc in
-            let () = attach t.leading currLoc leading in
-            ()
-        in
-        walkNode node t inside;
-        visitListButContinueWithRemainingComments
-          ~prevLoc:currLoc ~getLoc ~walkNode ~newlineDelimited
-          rest t trailing
-
-    and walkValueBindings vbs t comments =
-      walkList
-        ~getLoc:(fun n -> n.Parsetree.pvb_loc)
-        ~walkNode:walkValueBinding
-        vbs
-        t
-        comments
-
-    and walkOpenDescription openDescription t comments =
-      let loc = openDescription.popen_lid.loc in
-      let (leading, trailing) = partitionLeadingTrailing comments loc in
-      attach t.leading loc leading;
-      attach t.trailing loc trailing;
-
-    and walkTypeDeclarations typeDeclarations t comments =
-      walkList
-        ~getLoc:(fun n -> n.Parsetree.ptype_loc)
-        ~walkNode:walkTypeDeclaration
-        typeDeclarations
-        t
-        comments
-
-    and walkTypeParam (typexpr, _variance) t comments =
-      walkTypExpr typexpr t comments
-
-    and walkTypeDeclaration td t comments =
-      let (beforeName, rest) =
-        partitionLeadingTrailing comments td.ptype_name.loc in
-      attach t.leading td.ptype_name.loc beforeName;
-
-      let (afterName, rest) =
-        partitionAdjacentTrailing td.ptype_name.loc rest in
-      attach t.trailing td.ptype_name.loc afterName;
-
-      (* type params *)
-      let rest = match td.ptype_params with
-      | [] -> rest
-      | typeParams ->
-        visitListButContinueWithRemainingComments
-          ~getLoc:(fun (typexpr, _variance) -> typexpr.Parsetree.ptyp_loc)
-          ~walkNode:walkTypeParam
-          ~newlineDelimited:false
-          typeParams
-          t
-          rest
-      in
-
-      (* manifest:  = typexpr *)
-      let rest = match td.ptype_manifest with
-      | Some typexpr ->
-        let (beforeTyp, insideTyp, afterTyp) =
-          partitionByLoc rest typexpr.ptyp_loc in
-        attach t.leading typexpr.ptyp_loc beforeTyp;
-        walkTypExpr typexpr t insideTyp;
-        let (afterTyp, rest) =
-          partitionAdjacentTrailing typexpr.Parsetree.ptyp_loc afterTyp in
-        attach t.trailing typexpr.ptyp_loc afterTyp;
-        rest
-      | None -> rest
-      in
-
-      let rest = match td.ptype_kind with
-      | Ptype_abstract | Ptype_open -> rest
-      | Ptype_record labelDeclarations ->
-        let () = walkList
-          ~getLoc:(fun ld -> ld.Parsetree.pld_loc)
-          ~walkNode:walkLabelDeclaration
-          labelDeclarations
-          t
-          rest
-        in
-        []
-      | Ptype_variant constructorDeclarations ->
-        walkConstructorDeclarations constructorDeclarations t rest
-      in
-      attach t.trailing td.ptype_loc rest
-
-    and walkLabelDeclarations lds t comments =
-      visitListButContinueWithRemainingComments
-        ~getLoc:(fun ld -> ld.Parsetree.pld_loc)
-        ~walkNode:walkLabelDeclaration
-        ~newlineDelimited:false
-        lds
-        t
-        comments
-
-    and walkLabelDeclaration ld t comments =
-      let (beforeName, rest) =
-        partitionLeadingTrailing comments ld.pld_name.loc  in
-      attach t.leading ld.pld_name.loc beforeName;
-      let (afterName, rest) = partitionAdjacentTrailing ld.pld_name.loc rest in
-      attach t.trailing ld.pld_name.loc afterName;
-      let (beforeTyp, insideTyp, afterTyp) =
-        partitionByLoc rest ld.pld_type.ptyp_loc in
-      attach t.leading ld.pld_type.ptyp_loc beforeTyp;
-      walkTypExpr ld.pld_type t insideTyp;
-      attach t.trailing ld.pld_type.ptyp_loc afterTyp
-
-    and walkConstructorDeclarations cds t comments =
-      visitListButContinueWithRemainingComments
-        ~getLoc:(fun cd -> cd.Parsetree.pcd_loc)
-        ~walkNode:walkConstructorDeclaration
-        ~newlineDelimited:false
-        cds
-        t
-        comments
-
-    and walkConstructorDeclaration cd t comments =
-      let (beforeName, rest) =
-        partitionLeadingTrailing comments cd.pcd_name.loc  in
-      attach t.leading cd.pcd_name.loc beforeName;
-      let (afterName, rest) =
-        partitionAdjacentTrailing cd.pcd_name.loc rest in
-      attach t.trailing cd.pcd_name.loc afterName;
-      let rest = walkConstructorArguments cd.pcd_args t rest in
-
-      let rest = match cd.pcd_res with
-      | Some typexpr ->
-        let (beforeTyp, insideTyp, afterTyp) =
-          partitionByLoc rest typexpr.ptyp_loc in
-        attach t.leading typexpr.ptyp_loc beforeTyp;
-        walkTypExpr typexpr t insideTyp;
-        let (afterTyp, rest) =
-          partitionAdjacentTrailing typexpr.Parsetree.ptyp_loc afterTyp in
-        attach t.trailing typexpr.ptyp_loc afterTyp;
-        rest
-      | None -> rest
-      in
-      attach t.trailing cd.pcd_loc rest
-
-    and walkConstructorArguments args t comments =
-      match args with
-      | Pcstr_tuple typexprs ->
-        visitListButContinueWithRemainingComments
-          ~getLoc:(fun n -> n.Parsetree.ptyp_loc)
-          ~walkNode:walkTypExpr
-          ~newlineDelimited:false
-          typexprs
-          t
-          comments
-      | Pcstr_record labelDeclarations ->
-        walkLabelDeclarations labelDeclarations t comments
-
-    and walkValueBinding vb t comments =
-      let open Location in
-
-      let vb =
-        let open Parsetree in
-        match (vb.pvb_pat, vb.pvb_expr) with
-        | {ppat_desc = Ppat_constraint (pat, {ptyp_desc = Ptyp_poly ([], t)})},
-          {pexp_desc = Pexp_constraint (expr, _typ)} ->
-          {vb with
-            pvb_pat = Ast_helper.Pat.constraint_
-              ~loc:{pat.ppat_loc with loc_end = t.Parsetree.ptyp_loc.loc_end} pat t;
-            pvb_expr = expr;
-          }
-        | {ppat_desc = Ppat_constraint (pat, {ptyp_desc = Ptyp_poly (_::_, t)})},
-          {pexp_desc = Pexp_fun _} ->
-          {vb with
-            pvb_pat = {vb.pvb_pat with
-              ppat_loc = {pat.ppat_loc with loc_end = t.ptyp_loc.loc_end}}}
-        | _ -> vb
-      in
-      let patternLoc = vb.Parsetree.pvb_pat.ppat_loc in
-      let exprLoc = vb.Parsetree.pvb_expr.pexp_loc in
-
-      let (leading, inside, trailing) =
-        partitionByLoc comments patternLoc in
-
-      (* everything before start of pattern can only be leading on the pattern:
-       *   let |* before *| a = 1 *)
-      attach t.leading patternLoc leading;
-      walkPattern vb.Parsetree.pvb_pat t inside;
-      (* let pattern = expr     -> pattern and expr on the same line *)
-      (* if patternLoc.loc_end.pos_lnum == exprLoc.loc_start.pos_lnum then ( *)
-        let (afterPat, surroundingExpr) =
-          partitionAdjacentTrailing patternLoc trailing
-        in
-        attach t.trailing patternLoc afterPat;
-        let (beforeExpr, insideExpr, afterExpr) =
-          partitionByLoc surroundingExpr exprLoc in
-        if isBlockExpr vb.pvb_expr then (
-          walkExpr vb.pvb_expr t (List.concat [beforeExpr; insideExpr; afterExpr])
-        ) else (
-          attach t.leading exprLoc beforeExpr;
-          walkExpr vb.Parsetree.pvb_expr t insideExpr;
-          attach t.trailing exprLoc afterExpr
-        )
-
-    and walkExpr expr t comments =
-      let open Location in
-      match expr.Parsetree.pexp_desc with
-      | _ when comments = [] -> ()
-      | Pexp_constant _ ->
-        let (leading, trailing) =
-          partitionLeadingTrailing comments expr.pexp_loc in
-        attach t.leading expr.pexp_loc leading;
-        attach t.trailing expr.pexp_loc trailing;
-      | Pexp_ident longident ->
-        let (leading, trailing) =
-          partitionLeadingTrailing comments longident.loc in
-        attach t.leading longident.loc leading;
-        attach t.trailing longident.loc trailing;
-      | Pexp_let (_recFlag, valueBindings, expr2) ->
-        let comments = visitListButContinueWithRemainingComments
-          ~getLoc:(fun n ->
-            if n.Parsetree.pvb_pat.ppat_loc.loc_ghost then
-              n.pvb_expr.pexp_loc
-            else
-             n.Parsetree.pvb_loc
-          )
-          ~walkNode:walkValueBinding
-          ~newlineDelimited:true
-          valueBindings
-          t
-          comments
-        in
-        if isBlockExpr expr2 then (
-          walkExpr expr2 t comments;
-        ) else (
-          let (leading, inside, trailing) = partitionByLoc comments expr2.pexp_loc in
-          attach t.leading expr2.pexp_loc leading;
-          walkExpr expr2 t inside;
-          attach t.trailing expr2.pexp_loc trailing
-        )
-      | Pexp_sequence (expr1, expr2) ->
-        let (leading, inside, trailing) = partitionByLoc comments expr1.pexp_loc in
-        let comments = if isBlockExpr expr1 then (
-          let (afterExpr, comments) = partitionByOnSameLine expr1.pexp_loc trailing in
-          walkExpr expr1 t (List.concat [leading; inside; afterExpr]);
-          comments
-        ) else (
-          attach t.leading expr1.pexp_loc leading;
-          walkExpr expr1 t inside;
-          let (afterExpr, comments) = partitionByOnSameLine expr1.pexp_loc trailing in
-          attach t.trailing expr1.pexp_loc afterExpr;
-          comments
-        ) in
-        if isBlockExpr expr2 then (
-          walkExpr expr2 t comments
-        ) else (
-          let (leading, inside, trailing) = partitionByLoc comments expr2.pexp_loc in
-          attach t.leading expr2.pexp_loc leading;
-          walkExpr expr2 t inside;
-          attach t.trailing expr2.pexp_loc trailing
-        )
-      | Pexp_open (_override, longident, expr2) ->
-        let (leading, comments) =
-          partitionLeadingTrailing comments expr.pexp_loc in
-        attach
-          t.leading
-          {expr.pexp_loc with loc_end = longident.loc.loc_end}
-          leading;
-        let (leading, trailing) =
-          partitionLeadingTrailing comments longident.loc in
-        attach t.leading longident.loc leading;
-        let (afterLongident, rest) =
-          partitionByOnSameLine longident.loc trailing in
-        attach t.trailing longident.loc afterLongident;
-        if isBlockExpr expr2 then (
-          walkExpr expr2 t rest
-        ) else (
-          let (leading, inside, trailing) = partitionByLoc rest expr2.pexp_loc in
-          attach t.leading expr2.pexp_loc leading;
-          walkExpr expr2 t inside;
-          attach t.trailing expr2.pexp_loc trailing
-        )
-      | Pexp_extension (
-          {txt = "bs.obj"},
-          PStr [{
-            pstr_desc = Pstr_eval({pexp_desc = Pexp_record (rows, _)}, [])
-          }]
-        ) ->
-        walkList
-          ~getLoc:(fun (
-              (longident, expr): (Longident.t Asttypes.loc * Parsetree.expression)
-            ) -> {
-            longident.loc with loc_end = expr.pexp_loc.loc_end
-          })
-          ~walkNode:walkExprRecordRow
-          rows
-          t
-          comments
-      | Pexp_extension extension ->
-        walkExtension extension t comments
-      | Pexp_letexception (extensionConstructor, expr2) ->
-        let (leading, comments) =
-          partitionLeadingTrailing comments expr.pexp_loc in
-        attach
-          t.leading
-          {expr.pexp_loc with loc_end = extensionConstructor.pext_loc.loc_end}
-          leading;
-        let (leading, inside, trailing) =
-          partitionByLoc comments extensionConstructor.pext_loc in
-        attach t.leading extensionConstructor.pext_loc leading;
-        walkExtConstr extensionConstructor t inside;
-        let (afterExtConstr, rest) =
-          partitionByOnSameLine extensionConstructor.pext_loc trailing in
-        attach t.trailing extensionConstructor.pext_loc afterExtConstr;
-        if isBlockExpr expr2 then (
-          walkExpr expr2 t rest
-        ) else (
-          let (leading, inside, trailing) = partitionByLoc rest expr2.pexp_loc in
-          attach t.leading expr2.pexp_loc leading;
-          walkExpr expr2 t inside;
-          attach t.trailing expr2.pexp_loc trailing
-        )
-      | Pexp_letmodule (stringLoc, modExpr, expr2) ->
-        let (leading, comments) =
-          partitionLeadingTrailing comments expr.pexp_loc in
-        attach t.leading {expr.pexp_loc with loc_end = modExpr.pmod_loc.loc_end} leading;
-        let (leading, trailing) = partitionLeadingTrailing comments stringLoc.loc in
-        attach t.leading stringLoc.loc leading;
-        let (afterString, rest) =
-          partitionAdjacentTrailing stringLoc.loc trailing in
-        attach t.trailing stringLoc.loc afterString;
-        let (beforeModExpr, insideModExpr, afterModExpr) =
-          partitionByLoc rest modExpr.pmod_loc in
-        attach t.leading modExpr.pmod_loc beforeModExpr;
-        walkModExpr modExpr t insideModExpr;
-        let (afterModExpr, rest) =
-          partitionByOnSameLine modExpr.pmod_loc afterModExpr in
-        attach t.trailing modExpr.pmod_loc afterModExpr;
-        if isBlockExpr expr2 then (
-          walkExpr expr2 t rest;
-        ) else (
-          let (leading, inside, trailing) = partitionByLoc rest expr2.pexp_loc in
-          attach t.leading expr2.pexp_loc leading;
-          walkExpr expr2 t inside;
-          attach t.trailing expr2.pexp_loc trailing
-        )
-      | Pexp_assert expr
-      | Pexp_lazy expr ->
-        if isBlockExpr expr then (
-          walkExpr expr t comments
-        ) else (
-          let (leading, inside, trailing) = partitionByLoc comments expr.pexp_loc in
-          attach t.leading expr.pexp_loc leading;
-          walkExpr expr t inside;
-          attach t.trailing expr.pexp_loc trailing
-        )
-      | Pexp_coerce (expr, optTypexpr, typexpr) ->
-        let (leading, inside, trailing) = partitionByLoc comments expr.pexp_loc in
-        attach t.leading expr.pexp_loc leading;
-        walkExpr expr t inside;
-        let (afterExpr, rest) =
-          partitionAdjacentTrailing expr.pexp_loc trailing in
-        attach t.trailing expr.pexp_loc afterExpr;
-        let rest = match optTypexpr with
-        | Some typexpr ->
-          let (leading, inside, trailing) = partitionByLoc comments typexpr.ptyp_loc in
-          attach t.leading typexpr.ptyp_loc leading;
-          walkTypExpr typexpr t inside;
-          let (afterTyp, rest) =
-            partitionAdjacentTrailing typexpr.ptyp_loc trailing in
-          attach t.trailing typexpr.ptyp_loc afterTyp;
-          rest
-        | None -> rest
-        in
-        let (leading, inside, trailing) = partitionByLoc rest typexpr.ptyp_loc in
-        attach t.leading typexpr.ptyp_loc leading;
-        walkTypExpr typexpr t inside;
-        attach t.trailing typexpr.ptyp_loc trailing
-      | Pexp_constraint (expr, typexpr) ->
-        let (leading, inside, trailing) = partitionByLoc comments expr.pexp_loc in
-        attach t.leading expr.pexp_loc leading;
-        walkExpr expr t inside;
-        let (afterExpr, rest) =
-          partitionAdjacentTrailing expr.pexp_loc trailing in
-        attach t.trailing expr.pexp_loc afterExpr;
-        let (leading, inside, trailing) = partitionByLoc rest typexpr.ptyp_loc in
-        attach t.leading typexpr.ptyp_loc leading;
-        walkTypExpr typexpr t inside;
-        attach t.trailing typexpr.ptyp_loc trailing
-      | Pexp_tuple []
-      | Pexp_array []
-      | Pexp_construct({txt = Longident.Lident "[]"}, _) ->
-        attach t.inside expr.pexp_loc comments
-      | Pexp_construct({txt = Longident.Lident "::"}, _) ->
-        walkList
-          ~getLoc:(fun n -> n.Parsetree.pexp_loc)
-          ~walkNode:walkExpr
-          (collectListExprs [] expr)
-          t
-          comments
-      | Pexp_construct (longident, args) ->
-        let (leading, trailing) =
-          partitionLeadingTrailing comments longident.loc in
-        attach t.leading longident.loc leading;
-        begin match args with
-        | Some expr ->
-          let (afterLongident, rest) =
-            partitionAdjacentTrailing longident.loc trailing in
-          attach t.trailing longident.loc afterLongident;
-          walkExpr expr t rest
-        | None ->
-          attach t.trailing longident.loc trailing
-        end
-      | Pexp_variant (_label, None) ->
-        ()
-      | Pexp_variant (_label, Some expr) ->
-        walkExpr expr t comments
-      | Pexp_array exprs | Pexp_tuple exprs ->
-        walkList
-          ~getLoc:(fun n -> n.Parsetree.pexp_loc)
-          ~walkNode:walkExpr
-          exprs
-          t
-          comments
-      | Pexp_record (rows, spreadExpr) ->
-        let comments = match spreadExpr with
-        | None -> comments
-        | Some expr ->
-          let (leading, inside, trailing) = partitionByLoc comments expr.pexp_loc in
-          attach t.leading expr.pexp_loc leading;
-          walkExpr expr t inside;
-          let (afterExpr, rest) = partitionAdjacentTrailing expr.pexp_loc trailing in
-          attach t.trailing expr.pexp_loc afterExpr;
-          rest
-        in
-        walkList
-          ~getLoc:(fun (
-              (longident, expr): (Longident.t Asttypes.loc * Parsetree.expression)
-            ) -> {
-            longident.loc with loc_end = expr.pexp_loc.loc_end
-          })
-          ~walkNode:walkExprRecordRow
-          rows
-          t
-          comments
-      | Pexp_field (expr, longident) ->
-        let (leading, inside, trailing) = partitionByLoc comments expr.pexp_loc in
-        let trailing = if isBlockExpr expr then (
-          let (afterExpr, rest) =
-            partitionAdjacentTrailing expr.pexp_loc trailing in
-          walkExpr expr t (List.concat [leading; inside; afterExpr]);
-          rest
-        ) else (
-          attach t.leading expr.pexp_loc leading;
-          walkExpr expr t inside;
-          trailing
-        ) in
-        let (afterExpr, rest) = partitionAdjacentTrailing expr.pexp_loc trailing in
-        attach t.trailing expr.pexp_loc afterExpr;
-        let (leading, trailing) = partitionLeadingTrailing rest longident.loc in
-        attach t.leading longident.loc leading;
-        attach t.trailing longident.loc trailing
-      | Pexp_setfield (expr1, longident, expr2) ->
-        let (leading, inside, trailing) = partitionByLoc comments expr1.pexp_loc in
-        let rest = if isBlockExpr expr1 then (
-          let (afterExpr, rest) =
-            partitionAdjacentTrailing expr1.pexp_loc trailing in
-          walkExpr expr1 t (List.concat [leading; inside; afterExpr]);
-          rest
-        ) else (
-          let (afterExpr, rest) =
-            partitionAdjacentTrailing expr1.pexp_loc trailing in
-          attach t.leading expr1.pexp_loc leading;
-          walkExpr expr1 t inside;
-          attach t.trailing expr1.pexp_loc afterExpr;
-          rest
-        ) in
-        let (beforeLongident, afterLongident) = partitionLeadingTrailing rest longident.loc in
-        attach t.leading longident.loc beforeLongident;
-        let (afterLongident, rest) = partitionAdjacentTrailing longident.loc afterLongident in
-        attach t.trailing longident.loc afterLongident;
-        if isBlockExpr expr2 then
-          walkExpr expr2 t rest
-        else (
-          let (leading, inside, trailing) = partitionByLoc rest expr2.pexp_loc in
-          attach t.leading expr2.pexp_loc leading;
-          walkExpr expr2 t inside;
-          attach t.trailing expr2.pexp_loc trailing
-        )
-      | Pexp_ifthenelse (ifExpr, thenExpr, elseExpr) ->
-        let (leading, inside, trailing) = partitionByLoc comments ifExpr.pexp_loc in
-        let comments = if isBlockExpr ifExpr then (
-          let (afterExpr, comments) = partitionAdjacentTrailing ifExpr.pexp_loc trailing in
-          walkExpr ifExpr t (List.concat [leading; inside; afterExpr]);
-          comments
-        ) else (
-          attach t.leading ifExpr.pexp_loc leading;
-          walkExpr ifExpr t inside;
-          let (afterExpr, comments) = partitionAdjacentTrailing ifExpr.pexp_loc trailing in
-          attach t.trailing ifExpr.pexp_loc afterExpr;
-          comments
-        ) in
-        let (leading, inside, trailing) = partitionByLoc comments thenExpr.pexp_loc in
-        let comments = if isBlockExpr thenExpr then (
-          let (afterExpr, trailing) = partitionAdjacentTrailing thenExpr.pexp_loc trailing in
-          walkExpr thenExpr t (List.concat [leading; inside; afterExpr]);
-          trailing
-        ) else (
-          attach t.leading thenExpr.pexp_loc leading;
-          walkExpr thenExpr t inside;
-          let (afterExpr, comments) = partitionAdjacentTrailing thenExpr.pexp_loc trailing in
-          attach t.trailing thenExpr.pexp_loc afterExpr;
-          comments
-        ) in
-        begin match elseExpr with
-        | None -> ()
-        | Some expr ->
-          if isBlockExpr expr then
-            walkExpr expr t comments
-          else (
-            let (leading, inside, trailing) = partitionByLoc comments expr.pexp_loc in
-            attach t.leading expr.pexp_loc leading;
-            walkExpr expr t inside;
-            attach t.trailing expr.pexp_loc trailing
-          )
-        end
-      | Pexp_while (expr1, expr2) ->
-        let (leading, inside, trailing) = partitionByLoc comments expr1.pexp_loc in
-        let rest = if isBlockExpr expr1 then
-          let (afterExpr, rest) = partitionAdjacentTrailing expr1.pexp_loc trailing in
-          walkExpr expr1 t (List.concat [leading; inside; afterExpr]);
-          rest
-        else (
-          attach t.leading expr1.pexp_loc leading;
-          walkExpr expr1 t inside;
-          let (afterExpr, rest) = partitionAdjacentTrailing expr1.pexp_loc trailing in
-          attach t.trailing expr1.pexp_loc afterExpr;
-          rest
-        ) in
-        if isBlockExpr expr2 then (
-          walkExpr expr2 t rest
-        ) else (
-          let (leading, inside, trailing) = partitionByLoc rest expr2.pexp_loc in
-          attach t.leading expr2.pexp_loc leading;
-          walkExpr expr2 t inside;
-          attach t.trailing expr2.pexp_loc trailing
-        )
-      | Pexp_for (pat, expr1, expr2, _, expr3) ->
-        let (leading, inside, trailing) = partitionByLoc comments pat.ppat_loc in
-        attach t.leading pat.ppat_loc leading;
-        walkPattern pat t inside;
-        let (afterPat, rest) = partitionAdjacentTrailing pat.ppat_loc trailing in
-        attach t.trailing pat.ppat_loc afterPat;
-        let (leading, inside, trailing) = partitionByLoc rest expr1.pexp_loc in
-        attach t.leading expr1.pexp_loc leading;
-        walkExpr expr1 t inside;
-        let (afterExpr, rest) = partitionAdjacentTrailing expr1.pexp_loc trailing in
-        attach t.trailing expr1.pexp_loc afterExpr;
-        let (leading, inside, trailing) = partitionByLoc rest expr2.pexp_loc in
-        attach t.leading expr2.pexp_loc leading;
-        walkExpr expr2 t inside;
-        let (afterExpr, rest) = partitionAdjacentTrailing expr2.pexp_loc trailing in
-        attach t.trailing expr2.pexp_loc afterExpr;
-        if isBlockExpr expr3 then (
-          walkExpr expr3 t rest
-        ) else (
-          let (leading, inside, trailing) = partitionByLoc rest expr3.pexp_loc in
-          attach t.leading expr3.pexp_loc leading;
-          walkExpr expr3 t inside;
-          attach t.trailing expr3.pexp_loc trailing
-        )
-      | Pexp_pack modExpr ->
-        let (before, inside, after) = partitionByLoc comments modExpr.pmod_loc in
-        attach t.leading modExpr.pmod_loc before;
-        walkModExpr modExpr t inside;
-        attach t.trailing modExpr.pmod_loc after
-      | Pexp_match (expr, cases) | Pexp_try (expr, cases) ->
-        let (before, inside, after) = partitionByLoc comments expr.pexp_loc in
-        let after = if isBlockExpr expr then (
-          let (afterExpr, rest) =
-            partitionAdjacentTrailing expr.pexp_loc after in
-          walkExpr expr t (List.concat [before; inside; afterExpr]);
-          rest
-        ) else (
-          attach t.leading expr.pexp_loc before;
-          walkExpr expr t inside;
-          after
-        ) in
-        let (afterExpr, rest) = partitionAdjacentTrailing expr.pexp_loc after in
-        attach t.trailing expr.pexp_loc afterExpr;
-        walkList
-          ~getLoc:(fun n -> {n.Parsetree.pc_lhs.ppat_loc with
-            loc_end = n.pc_rhs.pexp_loc.loc_end})
-          ~walkNode:walkCase
-          cases
-          t
-          rest
-        (* unary expression: todo use parsetreeviewer *)
-      | Pexp_apply (
-          {pexp_desc = Pexp_ident {txt = Longident.Lident
-           ("~+" | "~+." | "~-" | "~-." | "not" | "!")
-          }},
-          [Nolabel, argExpr]
-        ) ->
-        let (before, inside, after) = partitionByLoc comments argExpr.pexp_loc in
-        attach t.leading argExpr.pexp_loc before;
-        walkExpr argExpr t inside;
-        attach t.trailing argExpr.pexp_loc after
-      (* binary expression *)
-      | Pexp_apply(
-          {pexp_desc = Pexp_ident {txt = Longident.Lident
-           (":=" | "||" | "&&" | "=" | "==" | "<" | ">"
-            | "!=" | "!==" | "<=" | ">=" | "|>" | "+" | "+."
-            | "-" | "-." | "++" | "^" | "*" | "*." | "/"
-            | "/." | "**" | "|." | "<>") }},
-          [(Nolabel, operand1); (Nolabel, operand2)]
-        ) ->
-        let (before, inside, after) = partitionByLoc comments operand1.pexp_loc in
-        attach t.leading operand1.pexp_loc before;
-        walkExpr operand1 t inside;
-        let (afterOperand1, rest) =
-          partitionAdjacentTrailing operand1.pexp_loc after in
-        attach t.trailing operand1.pexp_loc afterOperand1;
-        let (before, inside, after) = partitionByLoc rest operand2.pexp_loc in
-        attach t.leading operand2.pexp_loc before;
-        walkExpr operand2 t inside; (* (List.concat [inside; after]); *)
-        attach t.trailing operand2.pexp_loc after;
-      | Pexp_apply (callExpr, arguments) ->
-        let (before, inside, after) = partitionByLoc comments callExpr.pexp_loc in
-        let after = if isBlockExpr callExpr then (
-          let (afterExpr, rest) =
-            partitionAdjacentTrailing callExpr.pexp_loc after in
-          walkExpr callExpr t (List.concat [before; inside; afterExpr]);
-          rest
-        ) else (
-          attach t.leading callExpr.pexp_loc before;
-          walkExpr callExpr t inside;
-          after
-        ) in
-        let (afterExpr, rest) = partitionAdjacentTrailing callExpr.pexp_loc after in
-        attach t.trailing callExpr.pexp_loc afterExpr;
-        walkList
-          ~getLoc:(fun (_argLabel, expr) ->
-            let loc = match expr.Parsetree.pexp_attributes with
-            | ({Location.txt = "res.namedArgLoc"; loc}, _)::_attrs ->
-                {loc with loc_end = expr.pexp_loc.loc_end}
-            | _ ->
-               expr.pexp_loc
-            in
-            loc)
-          ~walkNode:walkExprArgument
-          arguments
-          t
-          rest
-    | Pexp_fun (_, _, _, _) | Pexp_newtype _ ->
-      let (_, parameters, returnExpr) = funExpr expr in
-      let comments = visitListButContinueWithRemainingComments
-        ~newlineDelimited:false
-        ~walkNode:walkExprPararameter
-        ~getLoc:(fun (_attrs, _argLbl, exprOpt, pattern) ->
-          let open Parsetree in
-          let startPos = match pattern.ppat_attributes with
-          | ({Location.txt = "res.namedArgLoc"; loc}, _)::_attrs ->
-              loc.loc_start
-          | _ ->
-             pattern.ppat_loc.loc_start
-          in
-          match exprOpt with
-          | None -> {pattern.ppat_loc with loc_start = startPos}
-          | Some expr -> {
-            pattern.ppat_loc with
-            loc_start = startPos;
-            loc_end = expr.pexp_loc.loc_end
-          }
-        )
-        parameters
-        t
-        comments
-      in
-      begin match returnExpr.pexp_desc with
-      | Pexp_constraint (expr, typ)
-        when expr.pexp_loc.loc_start.pos_cnum >= typ.ptyp_loc.loc_end.pos_cnum
-        ->
-        let (leading, inside, trailing) = partitionByLoc comments typ.ptyp_loc in
-        attach t.leading typ.ptyp_loc leading;
-        walkTypExpr typ t inside;
-        let (afterTyp, comments) =
-          partitionAdjacentTrailing typ.ptyp_loc trailing in
-        attach t.trailing typ.ptyp_loc afterTyp;
-        if isBlockExpr expr then
-          walkExpr expr t comments
-        else (
-          let (leading, inside, trailing) =
-            partitionByLoc comments expr.pexp_loc  in
-          attach t.leading expr.pexp_loc leading;
-          walkExpr expr t inside;
-          attach t.trailing expr.pexp_loc trailing
-        )
-      | _ ->
-        if isBlockExpr returnExpr then
-          walkExpr returnExpr t comments
-        else (
-          let (leading, inside, trailing) =
-            partitionByLoc comments returnExpr.pexp_loc  in
-          attach t.leading returnExpr.pexp_loc leading;
-          walkExpr returnExpr t inside;
-          attach t.trailing returnExpr.pexp_loc trailing
-        )
-      end
-    | _ -> ()
-
-  and walkExprPararameter (_attrs, _argLbl, exprOpt, pattern) t comments =
-    let (leading, inside, trailing) = partitionByLoc comments pattern.ppat_loc in
-    attach t.leading pattern.ppat_loc leading;
-    walkPattern pattern t inside;
-    begin match exprOpt with
-    | Some expr ->
-      let (_afterPat, rest) =
-        partitionAdjacentTrailing pattern.ppat_loc trailing in
-      attach t.trailing pattern.ppat_loc trailing;
-      if isBlockExpr expr then
-        walkExpr expr t rest
-      else (
-        let (leading, inside, trailing) = partitionByLoc rest expr.pexp_loc in
-        attach t.leading expr.pexp_loc leading;
-        walkExpr expr t inside;
-        attach t.trailing expr.pexp_loc trailing
-      )
-    | None ->
-      attach t.trailing pattern.ppat_loc trailing
-    end
-
-  and walkExprArgument (_argLabel, expr) t comments =
-    match expr.Parsetree.pexp_attributes with
-    | ({Location.txt = "res.namedArgLoc"; loc}, _)::_attrs ->
-      let (leading, trailing) = partitionLeadingTrailing comments loc in
-      attach t.leading loc leading;
-      let (afterLabel, rest) = partitionAdjacentTrailing loc trailing in
-      attach t.trailing loc afterLabel;
-      let (before, inside, after) = partitionByLoc rest expr.pexp_loc in
-      attach t.leading expr.pexp_loc before;
-      walkExpr expr t inside;
-      attach t.trailing expr.pexp_loc after
-    | _ ->
-      let (before, inside, after) = partitionByLoc comments expr.pexp_loc in
-      attach t.leading expr.pexp_loc before;
-      walkExpr expr t inside;
-      attach t.trailing expr.pexp_loc after
-
-    and walkCase case t comments =
-      let (before, inside, after) = partitionByLoc comments case.pc_lhs.ppat_loc in
-      (* cases don't have a location on their own, leading comments should go
-       * after the bar on the pattern *)
-      walkPattern case.pc_lhs t (List.concat [before; inside]);
-      let (afterPat, rest) = partitionAdjacentTrailing case.pc_lhs.ppat_loc after in
-      attach t.trailing case.pc_lhs.ppat_loc afterPat;
-      let comments = match case.pc_guard with
-      | Some expr ->
-        let (before, inside, after) = partitionByLoc rest expr.pexp_loc in
-        let (afterExpr, rest) = partitionAdjacentTrailing expr.pexp_loc after in
-        if isBlockExpr expr then (
-          walkExpr expr t (List.concat [before; inside; afterExpr])
-        ) else (
-          attach t.leading expr.pexp_loc before;
-          walkExpr expr t inside;
-          attach t.trailing expr.pexp_loc afterExpr;
-        );
-        rest
-      | None -> rest
-      in
-      if isBlockExpr case.pc_rhs then (
-        walkExpr case.pc_rhs t comments
-      ) else (
-        let (before, inside, after) = partitionByLoc comments case.pc_rhs.pexp_loc in
-        attach t.leading case.pc_rhs.pexp_loc before;
-        walkExpr case.pc_rhs t inside;
-        attach t.trailing case.pc_rhs.pexp_loc after
-      )
-
-    and walkExprRecordRow (longident, expr) t comments =
-      let (beforeLongident, afterLongident) =
-        partitionLeadingTrailing comments longident.loc
-      in
-      attach t.leading longident.loc beforeLongident;
-      let (afterLongident, rest) =
-        partitionAdjacentTrailing longident.loc afterLongident in
-      attach t.trailing longident.loc afterLongident;
-      let (leading, inside, trailing) = partitionByLoc rest expr.pexp_loc in
-      attach t.leading expr.pexp_loc leading;
-      walkExpr expr t inside;
-      attach t.trailing expr.pexp_loc trailing
-
-    and walkExtConstr extConstr t comments =
-      let (leading, trailing) =
-        partitionLeadingTrailing comments extConstr.pext_name.loc in
-      attach t.leading extConstr.pext_name.loc leading;
-      let (afterName, rest) =
-        partitionAdjacentTrailing extConstr.pext_name.loc trailing in
-      attach t.trailing extConstr.pext_name.loc afterName;
-      walkExtensionConstructorKind extConstr.pext_kind t rest
-
-    and walkExtensionConstructorKind kind t comments =
-      match kind with
-      | Pext_rebind longident ->
-        let (leading, trailing) =
-          partitionLeadingTrailing comments longident.loc in
-        attach t.leading longident.loc leading;
-        attach t.trailing longident.loc trailing
-      | Pext_decl (constructorArguments, maybeTypExpr) ->
-        let rest = walkConstructorArguments constructorArguments t comments in
-        begin match maybeTypExpr with
-        | None -> ()
-        | Some typexpr ->
-          let (before, inside, after) = partitionByLoc rest typexpr.ptyp_loc in
-          attach t.leading typexpr.ptyp_loc before;
-          walkTypExpr typexpr t inside;
-          attach t.trailing typexpr.ptyp_loc after
-        end
-
-    and walkModExpr modExpr t comments =
-      match modExpr.pmod_desc with
-      | Pmod_ident longident ->
-        let (before, after) = partitionLeadingTrailing comments longident.loc in
-        attach t.leading longident.loc before;
-        attach t.trailing longident.loc after
-      | Pmod_structure structure ->
-        walkStructure structure t comments
-      | Pmod_extension extension ->
-        walkExtension extension t comments
-      | Pmod_unpack expr ->
-        let (before, inside, after) = partitionByLoc comments expr.pexp_loc in
-        attach t.leading expr.pexp_loc before;
-        walkExpr expr t inside;
-        attach t.trailing expr.pexp_loc after
-      | Pmod_constraint (modexpr, modtype) ->
-        if modtype.pmty_loc.loc_start >= modexpr.pmod_loc.loc_end then (
-          let (before, inside, after) = partitionByLoc comments modexpr.pmod_loc in
-          attach t.leading modexpr.pmod_loc before;
-          walkModExpr modexpr t inside;
-          let (after, rest) = partitionAdjacentTrailing modexpr.pmod_loc after in
-          attach t.trailing modexpr.pmod_loc after;
-          let (before, inside, after) = partitionByLoc rest modtype.pmty_loc in
-          attach t.leading modtype.pmty_loc before;
-          walkModType modtype t inside;
-          attach t.trailing modtype.pmty_loc after
-        ) else (
-          let (before, inside, after) = partitionByLoc comments modtype.pmty_loc in
-          attach t.leading modtype.pmty_loc before;
-          walkModType modtype t inside;
-          let (after, rest) = partitionAdjacentTrailing modtype.pmty_loc after in
-          attach t.trailing modtype.pmty_loc after;
-          let (before, inside, after) = partitionByLoc rest modexpr.pmod_loc in
-          attach t.leading modexpr.pmod_loc before;
-          walkModExpr modexpr t inside;
-          attach t.trailing modexpr.pmod_loc after;
-        )
-      | Pmod_apply (_callModExpr, _argModExpr) ->
-        let modExprs = modExprApply modExpr in
-        walkList
-          ~getLoc:(fun n -> n.Parsetree.pmod_loc)
-          ~walkNode:walkModExpr
-          modExprs
-          t
-          comments
-      | Pmod_functor _ ->
-        let (parameters, returnModExpr) = modExprFunctor modExpr in
-        let comments = visitListButContinueWithRemainingComments
-          ~getLoc:(fun
-            (_, lbl, modTypeOption) -> match modTypeOption with
-            | None -> lbl.Asttypes.loc
-            | Some modType -> {lbl.loc with loc_end = modType.Parsetree.pmty_loc.loc_end}
-          )
-          ~walkNode:walkModExprParameter
-          ~newlineDelimited:false
-          parameters
-          t
-          comments
-        in
-        begin match returnModExpr.pmod_desc with
-        | Pmod_constraint (modExpr, modType)
-          when modType.pmty_loc.loc_end.pos_cnum <= modExpr.pmod_loc.loc_start.pos_cnum ->
-          let (before, inside, after) = partitionByLoc comments modType.pmty_loc in
-          attach t.leading modType.pmty_loc before;
-          walkModType modType t inside;
-          let (after, rest) = partitionAdjacentTrailing modType.pmty_loc after in
-          attach t.trailing modType.pmty_loc after;
-          let (before, inside, after) = partitionByLoc rest modExpr.pmod_loc in
-          attach t.leading modExpr.pmod_loc before;
-          walkModExpr modExpr t inside;
-          attach t.trailing modExpr.pmod_loc after
-        | _ ->
-          let (before, inside, after) = partitionByLoc comments returnModExpr.pmod_loc in
-          attach t.leading returnModExpr.pmod_loc before;
-          walkModExpr returnModExpr t inside;
-          attach t.trailing returnModExpr.pmod_loc after
-        end
-
-    and walkModExprParameter parameter t comments =
-      let (_attrs, lbl, modTypeOption) = parameter in
-      let (leading, trailing) = partitionLeadingTrailing comments lbl.loc in
-      attach t.leading lbl.loc leading;
-      begin match modTypeOption with
-      | None -> attach t.trailing lbl.loc trailing
-      | Some modType ->
-        let (afterLbl, rest) = partitionAdjacentTrailing lbl.loc trailing in
-        attach t.trailing lbl.loc afterLbl;
-        let (before, inside, after) = partitionByLoc rest modType.pmty_loc in
-        attach t.leading modType.pmty_loc before;
-        walkModType modType t inside;
-        attach t.trailing modType.pmty_loc after;
-      end
-
-    and walkModType modType t comments =
-      match modType.pmty_desc with
-      | Pmty_ident longident | Pmty_alias longident ->
-        let (leading, trailing) = partitionLeadingTrailing comments longident.loc in
-        attach t.leading longident.loc leading;
-        attach t.trailing longident.loc trailing;
-      | Pmty_signature signature ->
-        walkSignature signature t comments
-      | Pmty_extension extension ->
-        walkExtension extension t comments
-      | Pmty_typeof modExpr ->
-        let (before, inside, after) = partitionByLoc comments modExpr.pmod_loc in
-        attach t.leading modExpr.pmod_loc before;
-        walkModExpr modExpr t inside;
-        attach t.trailing modExpr.pmod_loc after;
-      | Pmty_with (modType, _withConstraints) ->
-        let (before, inside, after) = partitionByLoc comments modType.pmty_loc in
-        attach t.leading modType.pmty_loc before;
-        walkModType modType t inside;
-        attach t.trailing modType.pmty_loc after
-        (* TODO: withConstraints*)
-      | Pmty_functor _ ->
-        let (parameters, returnModType) = functorType modType in
-        let comments = visitListButContinueWithRemainingComments
-          ~getLoc:(fun
-            (_, lbl, modTypeOption) -> match modTypeOption with
-            | None -> lbl.Asttypes.loc
-            | Some modType ->
-              if lbl.txt = "_" then modType.Parsetree.pmty_loc
-              else {lbl.loc with loc_end = modType.Parsetree.pmty_loc.loc_end}
-          )
-          ~walkNode:walkModTypeParameter
-          ~newlineDelimited:false
-          parameters
-          t
-          comments
-        in
-        let (before, inside, after) = partitionByLoc comments returnModType.pmty_loc in
-        attach t.leading returnModType.pmty_loc before;
-        walkModType returnModType t inside;
-        attach t.trailing returnModType.pmty_loc after
-
-    and walkModTypeParameter (_, lbl, modTypeOption) t comments =
-      let (leading, trailing) = partitionLeadingTrailing comments lbl.loc in
-      attach t.leading lbl.loc leading;
-      begin match modTypeOption with
-      | None -> attach t.trailing lbl.loc trailing
-      | Some modType ->
-        let (afterLbl, rest) = partitionAdjacentTrailing lbl.loc trailing in
-        attach t.trailing lbl.loc afterLbl;
-        let (before, inside, after) = partitionByLoc rest modType.pmty_loc in
-        attach t.leading modType.pmty_loc before;
-        walkModType modType t inside;
-        attach t.trailing modType.pmty_loc after;
-      end
-
-    and walkPattern pat t comments =
-      let open Location in
-      match pat.Parsetree.ppat_desc with
-      | _ when comments = [] -> ()
-      | Ppat_alias (pat, alias) ->
-        let (leading, inside, trailing) = partitionByLoc comments pat.ppat_loc in
-        attach t.leading pat.ppat_loc leading;
-        walkPattern pat t inside;
-        let (afterPat, rest) = partitionAdjacentTrailing pat.ppat_loc trailing in
-        attach t.leading pat.ppat_loc leading;
-        attach t.trailing pat.ppat_loc afterPat;
-        let (beforeAlias, afterAlias) = partitionLeadingTrailing rest alias.loc in
-        attach t.leading alias.loc beforeAlias;
-        attach t.trailing alias.loc afterAlias
-      | Ppat_tuple []
-      | Ppat_array []
-      | Ppat_construct({txt = Longident.Lident "()"}, _)
-      | Ppat_construct({txt = Longident.Lident "[]"}, _) ->
-        attach t.inside pat.ppat_loc comments;
-      | Ppat_array patterns ->
-        walkList
-          ~getLoc:(fun n -> n.Parsetree.ppat_loc)
-          ~walkNode:walkPattern
-          patterns
-          t
-          comments
-      | Ppat_tuple patterns ->
-        walkList
-          ~getLoc:(fun n -> n.Parsetree.ppat_loc)
-          ~walkNode:walkPattern
-          patterns
-          t
-          comments
-      | Ppat_construct({txt = Longident.Lident "::"}, _) ->
-        walkList
-          ~getLoc:(fun n -> n.Parsetree.ppat_loc)
-          ~walkNode:walkPattern
-          (collectListPatterns [] pat)
-          t
-          comments
-      | Ppat_construct (constr, None) ->
-        let (beforeConstr, afterConstr) =
-          partitionLeadingTrailing comments constr.loc
-        in
-        attach t.leading constr.loc beforeConstr;
-        attach t.trailing constr.loc afterConstr
-      | Ppat_construct (constr, Some pat) ->
-        let (leading, trailing) = partitionLeadingTrailing comments constr.loc in
-        attach t.leading constr.loc leading;
-        let (leading, inside, trailing) = partitionByLoc trailing pat.ppat_loc in
-        attach t.leading pat.ppat_loc leading;
-        walkPattern pat t inside;
-        attach t.trailing pat.ppat_loc trailing
-      | Ppat_variant (_label, None) ->
-        ()
-      | Ppat_variant (_label, Some pat) ->
-        walkPattern pat t comments
-      | Ppat_type _ ->
-        ()
-      | Ppat_record (recordRows, _) ->
-        walkList
-          ~getLoc:(fun (
-            (longidentLoc, pattern): (Longident.t Asttypes.loc * Parsetree.pattern)
-          ) -> {
-            longidentLoc.loc with
-            loc_end = pattern.Parsetree.ppat_loc.loc_end
-          })
-          ~walkNode:walkPatternRecordRow
-          recordRows
-          t
-          comments
-      | Ppat_or (pattern1, pattern2) ->
-        let (beforePattern1, insidePattern1, afterPattern1) =
-          partitionByLoc comments pattern1.ppat_loc
-        in
-        attach t.leading pattern1.ppat_loc beforePattern1;
-        walkPattern pattern1 t insidePattern1;
-        let (afterPattern1, rest) =
-          partitionAdjacentTrailing pattern1.ppat_loc afterPattern1
-        in
-        attach t.trailing pattern1.ppat_loc afterPattern1;
-        let (beforePattern2, insidePattern2, afterPattern2) =
-          partitionByLoc rest pattern2.ppat_loc
-        in
-        attach t.leading pattern2.ppat_loc beforePattern2;
-        walkPattern pattern2 t insidePattern2;
-        attach t.trailing pattern2.ppat_loc afterPattern2
-      | Ppat_constraint (pattern, typ) ->
-        let (beforePattern, insidePattern, afterPattern) =
-          partitionByLoc comments pattern.ppat_loc
-        in
-        attach t.leading pattern.ppat_loc beforePattern;
-        walkPattern pattern t insidePattern;
-        let (afterPattern, rest) =
-          partitionAdjacentTrailing pattern.ppat_loc afterPattern
-        in
-        attach t.trailing pattern.ppat_loc afterPattern;
-        let (beforeTyp, insideTyp, afterTyp) =
-          partitionByLoc rest typ.ptyp_loc
-        in
-        attach t.leading typ.ptyp_loc beforeTyp;
-        walkTypExpr typ t insideTyp;
-        attach t.trailing typ.ptyp_loc afterTyp
-      | Ppat_lazy pattern | Ppat_exception pattern ->
-        let (leading, inside, trailing) = partitionByLoc comments pattern.ppat_loc in
-        attach t.leading pattern.ppat_loc leading;
-        walkPattern pattern t inside;
-        attach t.trailing pattern.ppat_loc trailing
-      | Ppat_unpack stringLoc ->
-        let (leading, trailing) = partitionLeadingTrailing comments stringLoc.loc in
-        attach t.leading stringLoc.loc leading;
-        attach t.trailing stringLoc.loc trailing
-      | Ppat_extension extension ->
-        walkExtension extension t comments
-      | _ -> ()
-
-    (* name: firstName *)
-    and walkPatternRecordRow row t comments =
-     match row with
-      (* punned {x}*)
-      | ({Location.txt=Longident.Lident ident; loc = longidentLoc},
-         {Parsetree.ppat_desc=Ppat_var {txt;_}}) when ident = txt ->
-        let (beforeLbl, afterLbl) =
-          partitionLeadingTrailing comments longidentLoc
-        in
-        attach t.leading longidentLoc beforeLbl;
-        attach t.trailing longidentLoc afterLbl
-      | (longident, pattern) ->
-        let (beforeLbl, afterLbl) =
-          partitionLeadingTrailing comments longident.loc
-        in
-        attach t.leading longident.loc beforeLbl;
-        let (afterLbl, rest) = partitionAdjacentTrailing longident.loc afterLbl in
-        attach t.trailing longident.loc afterLbl;
-        let (leading, inside, trailing) = partitionByLoc rest pattern.ppat_loc in
-        attach t.leading pattern.ppat_loc leading;
-        walkPattern pattern t inside;
-        attach t.trailing pattern.ppat_loc trailing
-
-    and walkTypExpr typ t comments =
-      match typ.Parsetree.ptyp_desc with
-      | _ when comments = [] -> ()
-      | Ptyp_tuple typexprs ->
-        walkList
-          ~getLoc:(fun n -> n.Parsetree.ptyp_loc)
-          ~walkNode:walkTypExpr
-          typexprs
-          t
-          comments
-      | Ptyp_extension extension ->
-        walkExtension extension t comments
-      | Ptyp_package packageType ->
-        walkPackageType packageType t comments
-      | Ptyp_alias (typexpr, _alias) ->
-        let (beforeTyp, insideTyp, afterTyp) =
-          partitionByLoc comments typexpr.ptyp_loc in
-        attach t.leading typexpr.ptyp_loc beforeTyp;
-        walkTypExpr typexpr t insideTyp;
-        attach t.trailing typexpr.ptyp_loc afterTyp;
-      | Ptyp_poly (strings, typexpr) ->
-        let comments = visitListButContinueWithRemainingComments
-          ~getLoc:(fun n -> n.Asttypes.loc)
-          ~walkNode:(fun longident t comments ->
-            let (beforeLongident, afterLongident) =
-            partitionLeadingTrailing comments longident.loc in
-            attach t.leading longident.loc beforeLongident;
-            attach t.trailing longident.loc afterLongident
-          )
-          ~newlineDelimited:false
-          strings
-          t
-          comments
-        in
-        let (beforeTyp, insideTyp, afterTyp) =
-          partitionByLoc comments typexpr.ptyp_loc in
-        attach t.leading typexpr.ptyp_loc beforeTyp;
-        walkTypExpr typexpr t insideTyp;
-        attach t.trailing typexpr.ptyp_loc afterTyp
-      | Ptyp_constr (longident, typexprs) ->
-        let (beforeLongident, _afterLongident) =
-          partitionLeadingTrailing comments longident.loc in
-        let (afterLongident, rest) =
-          partitionAdjacentTrailing longident.loc comments in
-        attach t.leading longident.loc beforeLongident;
-        attach t.trailing longident.loc afterLongident;
-        walkList
-          ~getLoc:(fun n -> n.Parsetree.ptyp_loc)
-          ~walkNode:walkTypExpr
-          typexprs
-          t
-          rest
-      | Ptyp_arrow _ ->
-        let (_, parameters, typexpr) = arrowType typ in
-        let comments = walkTypeParameters parameters t comments in
-        let (beforeTyp, insideTyp, afterTyp) =
-          partitionByLoc comments typexpr.ptyp_loc in
-        attach t.leading typexpr.ptyp_loc beforeTyp;
-        walkTypExpr typexpr t insideTyp;
-        attach t.trailing typexpr.ptyp_loc afterTyp
-      | Ptyp_object (fields, _) ->
-        walkTypObjectFields fields t comments
-      | _ -> ()
-
-    and walkTypObjectFields fields t comments =
-      walkList
-        ~getLoc:(fun field ->
-          match field with
-          | Parsetree.Otag (lbl, _, typ) ->
-            {lbl.loc with loc_end = typ.ptyp_loc.loc_end}
-          | _ -> Location.none
-        )
-        ~walkNode:walkTypObjectField
-        fields
-        t
-        comments
-
-    and walkTypObjectField field t comments =
-      match field with
-      | Otag (lbl, _, typexpr) ->
-        let (beforeLbl, afterLbl) = partitionLeadingTrailing comments lbl.loc in
-        attach t.leading lbl.loc beforeLbl;
-        let (afterLbl, rest) = partitionAdjacentTrailing lbl.loc afterLbl in
-        attach t.trailing lbl.loc afterLbl;
-        let (beforeTyp, insideTyp, afterTyp) =
-          partitionByLoc rest typexpr.ptyp_loc in
-        attach t.leading typexpr.ptyp_loc beforeTyp;
-        walkTypExpr typexpr t insideTyp;
-        attach t.trailing typexpr.ptyp_loc afterTyp
-      | _ -> ()
-
-    and walkTypeParameters typeParameters t comments =
-      visitListButContinueWithRemainingComments
-        ~getLoc:(fun (_, _, typexpr) -> typexpr.Parsetree.ptyp_loc)
-        ~walkNode:walkTypeParameter
-        ~newlineDelimited:false
-        typeParameters
-        t
-        comments
-
-    and walkTypeParameter (_attrs, _lbl, typexpr) t comments =
-      let (beforeTyp, insideTyp, afterTyp) =
-        partitionByLoc comments typexpr.ptyp_loc in
-      attach t.leading typexpr.ptyp_loc beforeTyp;
-      walkTypExpr typexpr t insideTyp;
-      attach t.trailing typexpr.ptyp_loc afterTyp
-
-    and walkPackageType packageType t comments =
-      let (longident, packageConstraints) = packageType in
-      let (beforeLongident, afterLongident) =
-        partitionLeadingTrailing comments longident.loc in
-      attach t.leading longident.loc beforeLongident;
-      let (afterLongident, rest) =
-        partitionAdjacentTrailing longident.loc afterLongident in
-      attach t.trailing longident.loc afterLongident;
-      walkPackageConstraints packageConstraints t rest
-
-    and walkPackageConstraints packageConstraints t comments =
-      walkList
-        ~getLoc:(fun (longident, typexpr) -> {longident.Asttypes.loc with
-          loc_end = typexpr.Parsetree.ptyp_loc.loc_end
-        })
-        ~walkNode:walkPackageConstraint
-        packageConstraints
-        t
-        comments
-
-    and walkPackageConstraint packageConstraint t comments =
-      let (longident, typexpr) = packageConstraint in
-      let (beforeLongident, afterLongident) =
-        partitionLeadingTrailing comments longident.loc in
-      attach t.leading longident.loc beforeLongident;
-      let (afterLongident, rest) =
-        partitionAdjacentTrailing longident.loc afterLongident in
-      attach t.trailing longident.loc afterLongident;
-      let (beforeTyp, insideTyp, afterTyp) =
-        partitionByLoc rest typexpr.ptyp_loc in
-      attach t.leading typexpr.ptyp_loc beforeTyp;
-      walkTypExpr typexpr t insideTyp;
-      attach t.trailing typexpr.ptyp_loc afterTyp;
-
-    and walkExtension extension t comments =
-      let (id, payload) = extension in
-      let (beforeId, afterId) = partitionLeadingTrailing comments id.loc in
-      attach t.leading id.loc beforeId;
-      let (afterId, rest) = partitionAdjacentTrailing id.loc afterId in
-      attach t.trailing id.loc afterId;
-      walkPayload payload t rest
-
-    and walkAttribute (id, payload) t comments =
-      let (beforeId, afterId) = partitionLeadingTrailing comments id.loc in
-      attach t.leading id.loc beforeId;
-      let (afterId, rest) = partitionAdjacentTrailing id.loc afterId in
-      attach t.trailing id.loc afterId;
-      walkPayload payload t rest
-
-    and walkPayload payload t comments =
-      match payload with
-      | PStr s -> walkStructure s t comments
-      | _ -> ()
-
-end
-
-module Printer = struct
-  let addParens doc =
-    Doc.group (
-      Doc.concat [
-        Doc.lparen;
-        Doc.indent (
-          Doc.concat [
-            Doc.softLine;
-            doc
-          ]
-        );
-        Doc.softLine;
-        Doc.rparen;
-      ]
-    )
-
-  let addBraces doc =
-    Doc.group (
-      Doc.concat [
-        Doc.lbrace;
-        doc;
-        Doc.rbrace;
-      ]
-    )
-
-  let getFirstLeadingComment tbl loc =
-    match Hashtbl.find tbl.CommentTable.leading loc with
-    | comment::_ -> Some comment
-    | [] -> None
-    | exception Not_found -> None
-
-  let printMultilineCommentContent txt =
-    (* Turns
-     *         |* first line
-     *  * second line
-     *      * third line *|
-     * Into
-     * |* first line
-     *  * second line
-     *  * third line *|
-     *
-     * What makes a comment suitable for this kind of indentation?
-     *  ->  multiple lines + every line starts with a star
-     *)
-    let rec indentStars lines acc =
-      match lines with
-      | [] -> Doc.nil
-      | [lastLine] ->
-        let line = String.trim lastLine in
-        let doc = Doc.text (" " ^ line) in
-        let trailingSpace = if String.length line > 0 then Doc.space else Doc.nil in
-        List.rev (trailingSpace::doc::acc) |> Doc.concat
-      | line::lines ->
-        let line = String.trim line in
-        let len = String.length line in
-        if len > 0 && (String.get [@doesNotRaise]) line 0 == '*' then
-          let doc = Doc.text (" " ^ (String.trim line)) in
-          indentStars lines (Doc.hardLine::doc::acc)
-        else
-          let trailingSpace =
-            let len = String.length txt in
-            if len > 0 && (String.unsafe_get txt (len - 1) = ' ') then
-              Doc.space
-            else Doc.nil
-          in
-          let content = Comment.trimSpaces txt in
-          Doc.concat [Doc.text content; trailingSpace]
-    in
-    let lines = String.split_on_char '\n' txt in
-    match lines with
-    | [] -> Doc.text "/* */"
-    | [line] -> Doc.concat [
-        Doc.text "/* ";
-        Doc.text (Comment.trimSpaces line);
-        Doc.text " */";
-      ]
-    | first::rest ->
-      let firstLine = Comment.trimSpaces first in
-      Doc.concat [
-        Doc.text "/*";
-        if String.length firstLine > 0 && not (String.equal firstLine "*") then
-          Doc.space else Doc.nil;
-        indentStars rest [Doc.hardLine; Doc.text firstLine];
-        Doc.text "*/";
-      ]
-
-  let printTrailingComment (nodeLoc : Location.t) comment =
-    let singleLine = Comment.isSingleLineComment comment in
-    let content =
-      let txt = Comment.txt comment in
-      if singleLine then
-         Doc.text ("// " ^ String.trim txt)
-      else
-        printMultilineCommentContent txt
-    in
-    let diff =
-      let cmtStart = (Comment.loc comment).loc_start in
-      let prevTokEndPos = Comment.prevTokEndPos comment in
-      cmtStart.pos_lnum - prevTokEndPos.pos_lnum
-    in
-    let isBelow =
-      (Comment.loc comment).loc_start.pos_lnum > nodeLoc.loc_end.pos_lnum in
-    if diff > 0 || isBelow then
-      Doc.concat [
-        Doc.breakParent;
-        Doc.lineSuffix(
-          (Doc.concat [Doc.hardLine; if diff > 1 then Doc.hardLine else Doc.nil; content])
-        )
-      ]
-    else if not singleLine then
-      Doc.concat [Doc.space; content]
-    else
-      Doc.lineSuffix (Doc.concat [Doc.space; content])
-
-  let printLeadingComment ?nextComment comment =
-    let singleLine = Comment.isSingleLineComment comment in
-    let content =
-      let txt = Comment.txt comment in
-      if singleLine then
-         Doc.text ("// " ^ String.trim txt)
-      else
-        printMultilineCommentContent txt
-    in
-    let separator = Doc.concat  [
-      if singleLine then Doc.concat [
-        Doc.hardLine;
-        Doc.breakParent;
-      ] else Doc.nil;
-      (match nextComment with
-      | Some next ->
-        let nextLoc = Comment.loc next in
-        let currLoc = Comment.loc comment in
-        let diff =
-          nextLoc.Location.loc_start.pos_lnum -
-          currLoc.Location.loc_end.pos_lnum
-        in
-        let nextSingleLine = Comment.isSingleLineComment next in
-        if singleLine && nextSingleLine then
-          if diff > 1 then Doc.hardLine else Doc.nil
-        else if singleLine && not nextSingleLine then
-          if diff > 1 then Doc.hardLine else Doc.nil
-        else
-          if diff > 1 then Doc.concat [Doc.hardLine; Doc.hardLine]
-          else if diff == 1 then Doc.hardLine
-          else
-            Doc.space
-      | None -> Doc.nil)
-    ]
-    in
-    Doc.concat [
-      content;
-      separator;
-    ]
-
-  let printCommentsInside cmtTbl loc =
-    let rec loop acc comments =
-      match comments with
-      | [] -> Doc.nil
-      | [comment] ->
-        let cmtDoc = printLeadingComment comment in
-        let doc = Doc.group (
-          Doc.concat [
-            Doc.concat (List.rev (cmtDoc::acc));
-          ]
-        )
-        in
-        doc
-      | comment::((nextComment::_comments) as rest) ->
-        let cmtDoc = printLeadingComment ~nextComment comment in
-        loop (cmtDoc::acc) rest
-    in
-    match Hashtbl.find cmtTbl.CommentTable.inside loc with
-    | exception Not_found -> Doc.nil
-    | comments ->
-      Hashtbl.remove cmtTbl.inside loc;
-      Doc.group (
-        loop [] comments
-      )
-
-  let printLeadingComments node tbl loc =
-    let rec loop acc comments =
-      match comments with
-      | [] -> node
-      | [comment] ->
-        let cmtDoc = printLeadingComment comment in
-        let diff =
-          loc.Location.loc_start.pos_lnum -
-          (Comment.loc comment).Location.loc_end.pos_lnum
-        in
-        let separator =
-          if Comment.isSingleLineComment comment then
-            if diff > 1 then Doc.hardLine else Doc.nil
-          else if diff == 0 then
-           Doc.space
-          else if diff > 1 then Doc.concat [Doc.hardLine; Doc.hardLine]
-          else
-           Doc.hardLine
-        in
-        let doc = Doc.group (
-          Doc.concat [
-            Doc.concat (List.rev (cmtDoc::acc));
-            separator;
-            node
-          ]
-        )
-        in
-        doc
-      | comment::((nextComment::_comments) as rest) ->
-        let cmtDoc = printLeadingComment ~nextComment comment in
-        loop (cmtDoc::acc) rest
-    in
-    match Hashtbl.find tbl loc with
-    | exception Not_found -> node
-    | comments ->
-     (* Remove comments from tbl: Some ast nodes have the same location.
-      * We only want to print comments once *)
-      Hashtbl.remove tbl loc;
-      loop [] comments
-
-  let printTrailingComments node tbl loc =
-    let rec loop acc comments =
-      match comments with
-      | [] -> Doc.concat (List.rev acc)
-      | comment::comments ->
-        let cmtDoc = printTrailingComment loc comment in
-        loop (cmtDoc::acc) comments
-    in
-    match Hashtbl.find tbl loc with
-    | exception Not_found -> node
-    | [] -> node
-    | (_first::_) as comments ->
-     (* Remove comments from tbl: Some ast nodes have the same location.
-      * We only want to print comments once *)
-      Hashtbl.remove tbl loc;
-      let cmtsDoc = loop [] comments in
-      Doc.concat [
-        node;
-        cmtsDoc;
-      ]
-
-  let printComments doc (tbl: CommentTable.t) loc =
-    let docWithLeadingComments = printLeadingComments doc tbl.leading loc in
-    printTrailingComments docWithLeadingComments tbl.trailing loc
-
-  let printList ~getLoc ~nodes ~print ?(forceBreak=false) t =
-    let rec loop (prevLoc: Location.t) acc nodes =
-      match nodes with
-      | [] -> (prevLoc, Doc.concat (List.rev acc))
-      | node::nodes ->
-        let loc = getLoc node in
-        let startPos = match getFirstLeadingComment t loc with
-        | None -> loc.loc_start
-        | Some comment -> (Comment.loc comment).loc_start
-        in
-        let sep = if startPos.pos_lnum - prevLoc.loc_end.pos_lnum > 1 then
-          Doc.concat [Doc.hardLine; Doc.hardLine]
-        else
-          Doc.hardLine
-        in
-        let doc = printComments (print node t) t loc in
-        loop loc (doc::sep::acc) nodes
-    in
-    match nodes with
-    | [] -> Doc.nil
-    | node::nodes ->
-      let firstLoc = getLoc node in
-      let doc = printComments (print node t) t firstLoc in
-      let (lastLoc, docs) = loop firstLoc [doc] nodes in
-      let forceBreak =
-        forceBreak ||
-        firstLoc.loc_start.pos_lnum != lastLoc.loc_end.pos_lnum
-      in
-      Doc.breakableGroup ~forceBreak docs
-
-  let printListi ~getLoc ~nodes ~print ?(forceBreak=false) t =
-    let rec loop i (prevLoc: Location.t) acc nodes =
-      match nodes with
-      | [] -> (prevLoc, Doc.concat (List.rev acc))
-      | node::nodes ->
-        let loc = getLoc node in
-        let startPos = match getFirstLeadingComment t loc with
-        | None -> loc.loc_start
-        | Some comment -> (Comment.loc comment).loc_start
-        in
-        let sep = if startPos.pos_lnum - prevLoc.loc_end.pos_lnum > 1 then
-          Doc.concat [Doc.hardLine; Doc.hardLine]
-        else
-          Doc.line
-        in
-        let doc = printComments (print node t i) t loc in
-        loop (i + 1) loc (doc::sep::acc) nodes
-    in
-    match nodes with
-    | [] -> Doc.nil
-    | node::nodes ->
-      let firstLoc = getLoc node in
-      let doc = printComments (print node t 0) t firstLoc in
-      let (lastLoc, docs) = loop 1 firstLoc [doc] nodes in
-      let forceBreak =
-        forceBreak ||
-        firstLoc.loc_start.pos_lnum != lastLoc.loc_end.pos_lnum
-      in
-      Doc.breakableGroup ~forceBreak docs
-
-  let rec printLongidentAux accu = function
-  | Longident.Lident s -> (Doc.text s) :: accu
-  | Ldot(lid, s) -> printLongidentAux ((Doc.text s) :: accu) lid
-  | Lapply(lid1, lid2) ->
-    let d1 = Doc.join ~sep:Doc.dot (printLongidentAux [] lid1) in
-    let d2 = Doc.join ~sep:Doc.dot (printLongidentAux [] lid2) in
-    (Doc.concat [d1; Doc.lparen; d2; Doc.rparen]) :: accu
-
-  let printLongident = function
-  | Longident.Lident txt -> Doc.text txt
-  | lid -> Doc.join ~sep:Doc.dot (printLongidentAux [] lid)
-
-  type identifierStyle =
-    | ExoticIdent
-    | NormalIdent
-
-  let classifyIdentContent ?(allowUident=false) txt =
-    let len = String.length txt in
-    let rec go i =
-      if i == len then NormalIdent
-      else
-        let c = String.unsafe_get txt i in
-        if i == 0 && not (
-          (allowUident && (c >= 'A' && c <= 'Z')) ||
-          (c >= 'a' && c <= 'z') || c = '_' || (c >= '0' && c <= '9')) then
-          ExoticIdent
-        else if not (
-             (c >= 'a' && c <= 'z')
-          || (c >= 'A' && c <= 'Z')
-          || c = '\''
-          || c = '_'
-          || (c >= '0' && c <= '9'))
-        then
-          ExoticIdent
-        else
-          go (i + 1)
-    in
-    if Token.isKeywordTxt txt && txt <> "list" then
-      ExoticIdent
-    else
-      go 0
-
-  let printIdentLike ?allowUident txt =
-    match classifyIdentContent ?allowUident txt with
-    | ExoticIdent -> Doc.concat [
-        Doc.text "\\\"";
-        Doc.text txt;
-        Doc.text"\""
-      ]
-    | NormalIdent -> Doc.text txt
-
-  let printLident l = match l with
-    | Longident.Lident txt -> printIdentLike txt
-    | Longident.Ldot (path, txt) ->
-      let txts = Longident.flatten path in
-      Doc.concat [
-        Doc.join ~sep:Doc.dot (List.map Doc.text txts);
-        Doc.dot;
-        printIdentLike txt;
-      ]
-    | _ -> Doc.text("printLident: Longident.Lapply is not supported")
-
-  let printLongidentLocation l cmtTbl =
-    let doc = printLongident l.Location.txt in
-    printComments doc cmtTbl l.loc
-
-  (* Module.SubModule.x *)
-  let printLidentPath path cmtTbl =
-    let doc = printLident path.Location.txt in
-    printComments doc cmtTbl path.loc
-
-  (* Module.SubModule.x or Module.SubModule.X *)
-  let printIdentPath path cmtTbl =
-    let doc = printLident path.Location.txt in
-    printComments doc cmtTbl path.loc
-
-  let printStringLoc sloc cmtTbl =
-    let doc = printIdentLike sloc.Location.txt in
-    printComments doc cmtTbl sloc.loc
-
-  let printConstant c = match c with
-    | Parsetree.Pconst_integer (s, suffix) ->
-      begin match suffix with
-      | Some c -> Doc.text (s ^ (Char.escaped c))
-      | None -> Doc.text s
-      end
-    | Pconst_string (txt, None) ->
-      Doc.text ("\"" ^ txt ^ "\"")
-    | Pconst_string (txt, Some prefix) ->
-      Doc.concat [
-        if prefix = "" then Doc.nil else Doc.text prefix;
-        Doc.text ("`" ^ txt ^ "`")
-      ]
-    | Pconst_float (s, _) -> Doc.text s
-    | Pconst_char c -> Doc.text ("'" ^ (Char.escaped c) ^ "'")
-
-  let rec printStructure (s : Parsetree.structure) t =
-    match s with
-    | [] -> printCommentsInside t Location.none
-    | structure ->
-      printList
-        ~getLoc:(fun s -> s.Parsetree.pstr_loc)
-        ~nodes:structure
-        ~print:printStructureItem
-        t
-
-  and printStructureItem (si: Parsetree.structure_item) cmtTbl =
-    match si.pstr_desc with
-    | Pstr_value(rec_flag, valueBindings) ->
-			let recFlag = match rec_flag with
-			| Asttypes.Nonrecursive -> Doc.nil
-			| Asttypes.Recursive -> Doc.text "rec "
-			in
-      printValueBindings ~recFlag valueBindings cmtTbl
-    | Pstr_type(recFlag, typeDeclarations) ->
-      let recFlag = match recFlag with
-      | Asttypes.Nonrecursive -> Doc.nil
-      | Asttypes.Recursive -> Doc.text "rec "
-      in
-      printTypeDeclarations ~recFlag typeDeclarations cmtTbl
-    | Pstr_primitive valueDescription ->
-      printValueDescription valueDescription cmtTbl
-    | Pstr_eval (expr, attrs) ->
-      let exprDoc =
-        let doc = printExpressionWithComments expr cmtTbl in
-        match Parens.structureExpr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.concat [
-        printAttributes attrs;
-        exprDoc;
-      ]
-    | Pstr_attribute attr -> Doc.concat [
-        Doc.text "@";
-        printAttributeWithComments attr cmtTbl
-      ]
-    | Pstr_extension (extension, attrs) -> Doc.concat [
-        printAttributes attrs;
-        Doc.concat [printExtensionWithComments ~atModuleLvl:true extension cmtTbl];
-      ]
-    | Pstr_include includeDeclaration ->
-      printIncludeDeclaration includeDeclaration cmtTbl
-    | Pstr_open openDescription ->
-      printOpenDescription openDescription cmtTbl
-    | Pstr_modtype modTypeDecl ->
-      printModuleTypeDeclaration modTypeDecl cmtTbl
-    | Pstr_module moduleBinding ->
-      printModuleBinding ~isRec:false moduleBinding cmtTbl 0
-    | Pstr_recmodule moduleBindings ->
-      printListi
-        ~getLoc:(fun mb -> mb.Parsetree.pmb_loc)
-        ~nodes:moduleBindings
-        ~print:(printModuleBinding ~isRec:true)
-        cmtTbl
-    | Pstr_exception extensionConstructor ->
-      printExceptionDef extensionConstructor cmtTbl
-    | Pstr_typext typeExtension ->
-      printTypeExtension typeExtension cmtTbl
-    | Pstr_class _ | Pstr_class_type _ -> Doc.nil
-
-  and printTypeExtension (te : Parsetree.type_extension) cmtTbl =
-    let prefix = Doc.text "type " in
-    let name = printLidentPath te.ptyext_path cmtTbl in
-    let typeParams = printTypeParams te.ptyext_params cmtTbl in
-    let extensionConstructors =
-      let ecs = te.ptyext_constructors in
-      let forceBreak =
-        match (ecs, List.rev ecs) with
-        | (first::_, last::_) ->
-          first.pext_loc.loc_start.pos_lnum > te.ptyext_path.loc.loc_end.pos_lnum ||
-          first.pext_loc.loc_start.pos_lnum < last.pext_loc.loc_end.pos_lnum
-        | _ -> false
-        in
-      let privateFlag = match te.ptyext_private with
-      | Asttypes.Private -> Doc.concat [
-          Doc.text "private";
-          Doc.line;
-        ]
-      | Public -> Doc.nil
-      in
-      let rows =
-        printListi
-         ~getLoc:(fun n -> n.Parsetree.pext_loc)
-         ~print:printExtensionConstructor
-         ~nodes: ecs
-         ~forceBreak
-         cmtTbl
-      in
-      Doc.breakableGroup ~forceBreak (
-        Doc.indent (
-          Doc.concat [
-            Doc.line;
-            privateFlag;
-            rows;
-            (* Doc.join ~sep:Doc.line ( *)
-              (* List.mapi printExtensionConstructor ecs *)
-            (* ) *)
-          ]
-        )
-      )
-    in
-    Doc.group (
-      Doc.concat [
-        printAttributes ~loc: te.ptyext_path.loc te.ptyext_attributes;
-        prefix;
-        name;
-        typeParams;
-        Doc.text " +=";
-        extensionConstructors;
-      ]
-    )
-
-  and printModuleBinding ~isRec moduleBinding cmtTbl i =
-    let prefix = if i = 0 then
-      Doc.concat [
-        Doc.text "module ";
-        if isRec then Doc.text "rec " else Doc.nil;
-      ]
-    else
-      Doc.text "and "
-    in
-    let (modExprDoc, modConstraintDoc) =
-      match moduleBinding.pmb_expr with
-      | {pmod_desc = Pmod_constraint (modExpr, modType)} ->
-        (
-          printModExpr modExpr cmtTbl,
-          Doc.concat [
-            Doc.text ": ";
-            printModType modType cmtTbl
-          ]
-        )
-      | modExpr ->
-        (printModExpr modExpr cmtTbl, Doc.nil)
-    in
-    let modName =
-      let doc = Doc.text moduleBinding.pmb_name.Location.txt in
-      printComments doc cmtTbl moduleBinding.pmb_name.loc
-    in
-    let doc = Doc.concat [
-      printAttributes ~loc:moduleBinding.pmb_name.loc moduleBinding.pmb_attributes;
-      prefix;
-      modName;
-      modConstraintDoc;
-      Doc.text " = ";
-      modExprDoc;
-    ] in
-    printComments doc cmtTbl moduleBinding.pmb_loc
-
-  and printModuleTypeDeclaration (modTypeDecl : Parsetree.module_type_declaration) cmtTbl =
-    let modName =
-      let doc = Doc.text modTypeDecl.pmtd_name.txt in
-      printComments doc cmtTbl modTypeDecl.pmtd_name.loc
-    in
-    Doc.concat [
-      printAttributes modTypeDecl.pmtd_attributes;
-      Doc.text "module type ";
-      modName;
-      (match modTypeDecl.pmtd_type with
-      | None -> Doc.nil
-      | Some modType -> Doc.concat [
-          Doc.text " = ";
-          printModType modType cmtTbl;
-        ]);
-    ]
-
-  and printModType modType cmtTbl =
-    let modTypeDoc = match modType.pmty_desc with
-    | Parsetree.Pmty_ident longident ->
-      Doc.concat [
-        printAttributes ~loc:longident.loc modType.pmty_attributes;
-        printLongidentLocation longident cmtTbl
-      ]
-    | Pmty_signature signature ->
-      let signatureDoc = Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printSignature signature cmtTbl;
-            ]
-          );
-          Doc.line;
-          Doc.rbrace;
-        ]
-      ) in
-      Doc.concat [
-        printAttributes modType.pmty_attributes;
-        signatureDoc
-      ]
-    | Pmty_functor _ ->
-      let (parameters, returnType) = ParsetreeViewer.functorType modType in
-      let parametersDoc = match parameters with
-      | [] -> Doc.nil
-      | [attrs, {Location.txt = "_"; loc}, Some modType] ->
-        let cmtLoc =
-          {loc with loc_end = modType.Parsetree.pmty_loc.loc_end}
-        in
-        let attrs = match attrs with
-        | [] -> Doc.nil
-        | attrs -> Doc.concat [
-          Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-          Doc.line;
-        ] in
-        let doc = Doc.concat [
-          attrs;
-          printModType modType cmtTbl
-        ] in
-        printComments doc cmtTbl cmtLoc
-      | params ->
-        Doc.group (
-          Doc.concat [
-            Doc.lparen;
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                  List.map (fun (attrs, lbl, modType) ->
-                    let cmtLoc = match modType with
-                    | None -> lbl.Asttypes.loc
-                    | Some modType ->
-                      {lbl.Asttypes.loc with loc_end = modType.Parsetree.pmty_loc.loc_end}
-                    in
-                    let attrs = match attrs with
-                    | [] -> Doc.nil
-                    | attrs -> Doc.concat [
-                      Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-                      Doc.line;
-                    ] in
-                    let lblDoc = if lbl.Location.txt = "_" then Doc.nil
-                      else
-                        let doc = Doc.text lbl.txt in
-                        printComments doc cmtTbl lbl.loc
-                    in
-                    let doc = Doc.concat [
-                      attrs;
-                      lblDoc;
-                      (match modType with
-                      | None -> Doc.nil
-                      | Some modType -> Doc.concat [
-                        if lbl.txt = "_" then Doc.nil else Doc.text ": ";
-                        printModType modType cmtTbl;
-                      ]);
-                    ] in
-                    printComments doc cmtTbl cmtLoc
-                  ) params
-                );
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-            Doc.rparen;
-          ]
-        )
-      in
-      let returnDoc =
-        let doc = printModType returnType cmtTbl in
-        if Parens.modTypeFunctorReturn returnType then addParens doc else doc
-      in
-      Doc.group (
-        Doc.concat [
-          parametersDoc;
-          Doc.group (
-            Doc.concat [
-            Doc.text " =>";
-            Doc.line;
-            returnDoc;
-            ]
-          )
-        ]
-      )
-    | Pmty_typeof modExpr -> Doc.concat [
-        Doc.text "module type of ";
-        printModExpr modExpr cmtTbl
-      ]
-    | Pmty_extension extension -> printExtensionWithComments ~atModuleLvl:false extension cmtTbl
-    | Pmty_alias longident -> Doc.concat [
-        Doc.text "module ";
-        printLongidentLocation longident cmtTbl;
-      ]
-    | Pmty_with (modType, withConstraints) ->
-      let operand =
-        let doc = printModType modType cmtTbl in
-        if Parens.modTypeWithOperand modType then addParens doc else doc
-      in
-      Doc.group (
-        Doc.concat [
-          operand;
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printWithConstraints withConstraints cmtTbl;
-            ]
-          )
-        ]
-      )
-    in
-    let attrsAlreadyPrinted = match modType.pmty_desc with
-    | Pmty_functor _ | Pmty_signature _ | Pmty_ident _ -> true
-    | _ -> false
-    in
-    let doc =Doc.concat [
-      if attrsAlreadyPrinted then Doc.nil else printAttributes modType.pmty_attributes;
-      modTypeDoc;
-    ] in
-    printComments doc cmtTbl modType.pmty_loc
-
-  and printWithConstraints withConstraints cmtTbl =
-    let rows = List.mapi (fun i withConstraint ->
-      Doc.group (
-        Doc.concat [
-          if i == 0 then Doc.text "with " else Doc.text "and ";
-          printWithConstraint withConstraint cmtTbl;
-        ]
-      )
-    ) withConstraints
-    in
-    Doc.join ~sep:Doc.line rows
-
-  and printWithConstraint (withConstraint : Parsetree.with_constraint) cmtTbl =
-    match withConstraint with
-    (* with type X.t = ... *)
-    | Pwith_type (longident, typeDeclaration) ->
-      Doc.group (printTypeDeclaration
-        ~name:(printLidentPath longident cmtTbl)
-        ~equalSign:"="
-        ~recFlag:Doc.nil
-        0
-        typeDeclaration
-        CommentTable.empty)
-    (* with module X.Y = Z *)
-    | Pwith_module ({txt = longident1}, {txt = longident2}) ->
-        Doc.concat [
-          Doc.text "module ";
-          printLongident longident1;
-          Doc.text " =";
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printLongident longident2;
-            ]
-          )
-        ]
-    (* with type X.t := ..., same format as [Pwith_type] *)
-    | Pwith_typesubst (longident, typeDeclaration) ->
-      Doc.group(printTypeDeclaration
-        ~name:(printLidentPath longident cmtTbl)
-        ~equalSign:":="
-        ~recFlag:Doc.nil
-        0
-        typeDeclaration
-        CommentTable.empty)
-    | Pwith_modsubst ({txt = longident1}, {txt = longident2}) ->
-      Doc.concat [
-        Doc.text "module ";
-        printLongident longident1;
-        Doc.text " :=";
-        Doc.indent (
-          Doc.concat [
-            Doc.line;
-            printLongident longident2;
-          ]
-        )
-      ]
-
-  and printSignature signature cmtTbl =
-    match signature with
-    | [] -> printCommentsInside cmtTbl Location.none
-    | signature ->
-      printList
-        ~getLoc:(fun s -> s.Parsetree.psig_loc)
-        ~nodes:signature
-        ~print:printSignatureItem
-        cmtTbl
-
-  and printSignatureItem (si : Parsetree.signature_item) cmtTbl =
-    match si.psig_desc with
-    | Parsetree.Psig_value valueDescription ->
-      printValueDescription valueDescription cmtTbl
-    | Psig_type (recFlag, typeDeclarations) ->
-      let recFlag = match recFlag with
-      | Asttypes.Nonrecursive -> Doc.nil
-      | Asttypes.Recursive -> Doc.text "rec "
-      in
-      printTypeDeclarations ~recFlag typeDeclarations cmtTbl
-    | Psig_typext typeExtension ->
-      printTypeExtension typeExtension cmtTbl
-    | Psig_exception extensionConstructor ->
-      printExceptionDef extensionConstructor cmtTbl
-    | Psig_module moduleDeclaration ->
-      printModuleDeclaration moduleDeclaration cmtTbl
-    | Psig_recmodule moduleDeclarations ->
-      printRecModuleDeclarations moduleDeclarations cmtTbl
-    | Psig_modtype modTypeDecl ->
-      printModuleTypeDeclaration modTypeDecl cmtTbl
-    | Psig_open openDescription ->
-      printOpenDescription openDescription cmtTbl
-    | Psig_include includeDescription ->
-      printIncludeDescription includeDescription cmtTbl
-    | Psig_attribute attr -> Doc.concat [
-        Doc.text "@";
-        printAttributeWithComments attr cmtTbl
-      ]
-    | Psig_extension (extension, attrs) -> Doc.concat [
-        printAttributes attrs;
-        Doc.concat [printExtensionWithComments ~atModuleLvl:true extension cmtTbl];
-      ]
-    | Psig_class _ | Psig_class_type _ -> Doc.nil
-
-  and printRecModuleDeclarations moduleDeclarations cmtTbl =
-      printListi
-        ~getLoc:(fun n -> n.Parsetree.pmd_loc)
-        ~nodes:moduleDeclarations
-        ~print:printRecModuleDeclaration
-        cmtTbl
-
- and printRecModuleDeclaration md cmtTbl i =
-    let body = match md.pmd_type.pmty_desc with
-    | Parsetree.Pmty_alias longident ->
-      Doc.concat [Doc.text " = "; printLongidentLocation longident cmtTbl]
-    | _ ->
-      let needsParens = match md.pmd_type.pmty_desc with
-      | Pmty_with _ -> true
-      | _ -> false
-      in
-      let modTypeDoc =
-        let doc = printModType md.pmd_type cmtTbl in
-        if needsParens then addParens doc else doc
-      in
-      Doc.concat [Doc.text ": "; modTypeDoc]
-    in
-    let prefix = if i < 1 then "module rec " else "and " in
-    Doc.concat [
-      printAttributes ~loc:md.pmd_name.loc md.pmd_attributes;
-      Doc.text prefix;
-      printComments (Doc.text md.pmd_name.txt) cmtTbl md.pmd_name.loc;
-      body
-    ]
-
-  and printModuleDeclaration (md: Parsetree.module_declaration) cmtTbl =
-    let body = match md.pmd_type.pmty_desc with
-    | Parsetree.Pmty_alias longident ->
-      Doc.concat [Doc.text " = "; printLongidentLocation longident cmtTbl]
-    | _ -> Doc.concat [Doc.text ": "; printModType md.pmd_type cmtTbl]
-    in
-    Doc.concat [
-      printAttributes ~loc:md.pmd_name.loc md.pmd_attributes;
-      Doc.text "module ";
-      printComments (Doc.text md.pmd_name.txt) cmtTbl md.pmd_name.loc;
-      body
-    ]
-
-  and printOpenDescription (openDescription : Parsetree.open_description) p =
-    Doc.concat [
-      printAttributes openDescription.popen_attributes;
-      Doc.text "open";
-      (match openDescription.popen_override with
-      | Asttypes.Fresh -> Doc.space
-      | Asttypes.Override -> Doc.text "! ");
-      printLongidentLocation openDescription.popen_lid p
-    ]
-
-  and printIncludeDescription (includeDescription: Parsetree.include_description) cmtTbl =
-    Doc.concat [
-      printAttributes includeDescription.pincl_attributes;
-      Doc.text "include ";
-      printModType includeDescription.pincl_mod cmtTbl;
-    ]
-
-  and printIncludeDeclaration (includeDeclaration : Parsetree.include_declaration)  cmtTbl =
-    let isJsFfiImport = List.exists (fun attr ->
-      match attr with
-      | ({Location.txt = "ns.jsFfi"}, _) -> true
-      | _ -> false
-    ) includeDeclaration.pincl_attributes
-    in
-    if isJsFfiImport then
-      printJsFfiImportDeclaration includeDeclaration cmtTbl
-    else
-      Doc.concat [
-        printAttributes includeDeclaration.pincl_attributes;
-        Doc.text "include ";
-        let includeDoc =
-          printModExpr includeDeclaration.pincl_mod cmtTbl
-        in
-        if Parens.includeModExpr includeDeclaration.pincl_mod then
-          addParens includeDoc
-        else includeDoc;
-      ]
-
-  and printJsFfiImport (valueDescription: Parsetree.value_description) cmtTbl =
-    let attrs = List.filter (fun attr ->
-      match attr with
-      | ({Location.txt = "bs.val" | "genType.import" | "bs.scope" }, _) -> false
-      | _ -> true
-    ) valueDescription.pval_attributes in
-    let (ident, alias) = match valueDescription.pval_prim with
-    | primitive::_ ->
-      if primitive <> valueDescription.pval_name.txt then
-        (
-          printIdentLike primitive,
-          Doc.concat [
-            Doc.text " as ";
-            printIdentLike valueDescription.pval_name.txt;
-          ]
-        )
-      else
-        (printIdentLike primitive, Doc.nil)
-    | _ ->
-      (printIdentLike valueDescription.pval_name.txt, Doc.nil)
-    in
-    Doc.concat [
-      printAttributes ~loc:valueDescription.pval_name.loc attrs;
-      ident;
-      alias;
-      Doc.text ": ";
-      printTypExpr valueDescription.pval_type cmtTbl;
-    ]
-
-  and printJsFfiImportScope (scope: ParsetreeViewer.jsImportScope) =
-    match scope with
-    | JsGlobalImport -> Doc.nil
-    | JsModuleImport modName ->
-      Doc.concat [
-        Doc.text " from ";
-        Doc.doubleQuote;
-        Doc.text modName;
-        Doc.doubleQuote;
-      ]
-    | JsScopedImport idents ->
-      Doc.concat [
-        Doc.text " from ";
-        Doc.join ~sep:Doc.dot (List.map Doc.text idents)
-      ]
-
-  and printJsFfiImportDeclaration (includeDeclaration: Parsetree.include_declaration) cmtTbl =
-    let attrs = List.filter (fun attr ->
-      match attr with
-      | ({Location.txt = "ns.jsFfi"}, _) -> false
-      | _ -> true
-    ) includeDeclaration.pincl_attributes
-    in
-    let imports = ParsetreeViewer.extractValueDescriptionFromModExpr includeDeclaration.pincl_mod in
-    let scope = match imports with
-    | vd::_ -> ParsetreeViewer.classifyJsImport vd
-    | [] -> ParsetreeViewer.JsGlobalImport
-    in
-    let scopeDoc = printJsFfiImportScope scope in
-    Doc.group (
-      Doc.concat [
-        printAttributes attrs;
-        Doc.text "import ";
-        Doc.group (
-          Doc.concat [
-            Doc.lbrace;
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                  List.map (fun vd -> printJsFfiImport vd cmtTbl) imports
-                )
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-            Doc.rbrace;
-          ]
-        );
-        scopeDoc;
-      ]
-    )
-
-  and printValueBindings ~recFlag (vbs: Parsetree.value_binding list) cmtTbl =
-    printListi
-      ~getLoc:(fun vb -> vb.Parsetree.pvb_loc)
-      ~nodes:vbs
-      ~print:(printValueBinding ~recFlag)
-      cmtTbl
-
-  and printValueDescription valueDescription cmtTbl =
-    let isExternal =
-      match valueDescription.pval_prim with | [] -> false | _ -> true
-    in
-    Doc.group (
-      Doc.concat [
-        printAttributes valueDescription.pval_attributes;
-        Doc.text (if isExternal then "external " else "let ");
-        printComments
-          (printIdentLike valueDescription.pval_name.txt)
-          cmtTbl
-          valueDescription.pval_name.loc;
-        Doc.text ": ";
-        printTypExpr valueDescription.pval_type cmtTbl;
-        if isExternal then
-          Doc.group (
-            Doc.concat [
-              Doc.text " =";
-              Doc.indent(
-                Doc.concat [
-                  Doc.line;
-                  Doc.join ~sep:Doc.line (
-                    List.map(fun s -> Doc.concat [
-                      Doc.text "\"";
-                      Doc.text s;
-                      Doc.text "\"";
-                    ])
-                    valueDescription.pval_prim
-                  );
-                ]
-              )
-            ]
-          )
-        else Doc.nil
-      ]
-    )
-
-  and printTypeDeclarations ~recFlag typeDeclarations cmtTbl =
-    printListi
-      ~getLoc:(fun n -> n.Parsetree.ptype_loc)
-      ~nodes:typeDeclarations
-      ~print:(printTypeDeclaration2 ~recFlag)
-      cmtTbl
-
-  (*
-   * type_declaration = {
-   *    ptype_name: string loc;
-   *    ptype_params: (core_type * variance) list;
-   *          (* ('a1,...'an) t; None represents  _*)
-   *    ptype_cstrs: (core_type * core_type * Location.t) list;
-   *          (* ... constraint T1=T1'  ... constraint Tn=Tn' *)
-   *    ptype_kind: type_kind;
-   *    ptype_private: private_flag;   (* = private ... *)
-   *    ptype_manifest: core_type option;  (* = T *)
-   *    ptype_attributes: attributes;   (* ... [@@id1] [@@id2] *)
-   *    ptype_loc: Location.t;
-   * }
-   *
-   *
-   *  type t                     (abstract, no manifest)
-   *  type t = T0                (abstract, manifest=T0)
-   *  type t = C of T | ...      (variant,  no manifest)
-   *  type t = T0 = C of T | ... (variant,  manifest=T0)
-   *  type t = {l: T; ...}       (record,   no manifest)
-   *  type t = T0 = {l : T; ...} (record,   manifest=T0)
-   *  type t = ..                (open,     no manifest)
-   *
-   *
-   * and type_kind =
-   *  | Ptype_abstract
-   *  | Ptype_variant of constructor_declaration list
-   *        (* Invariant: non-empty list *)
-   *  | Ptype_record of label_declaration list
-   *        (* Invariant: non-empty list *)
-   *  | Ptype_open
-   *)
-  and printTypeDeclaration ~name ~equalSign ~recFlag i (td: Parsetree.type_declaration) cmtTbl =
-    let (hasGenType, attrs) = ParsetreeViewer.splitGenTypeAttr td.ptype_attributes in
-    let attrs = printAttributes ~loc:td.ptype_loc attrs in
-    let prefix = if i > 0 then
-      Doc.concat [
-        Doc.text "and ";
-        if hasGenType then Doc.text "export " else Doc.nil
-      ]
-    else
-      Doc.concat [
-        Doc.text (if hasGenType then "export type " else "type ");
-        recFlag
-      ]
-    in
-    let typeName = name in
-    let typeParams = printTypeParams td.ptype_params cmtTbl in
-    let manifestAndKind = match td.ptype_kind with
-    | Ptype_abstract ->
-      begin match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some(typ) ->
-        Doc.concat [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printPrivateFlag td.ptype_private;
-          printTypExpr typ cmtTbl;
-        ]
-      end
-    | Ptype_open -> Doc.concat [
-        Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-        printPrivateFlag td.ptype_private;
-        Doc.text "..";
-      ]
-    | Ptype_record(lds) ->
-      let manifest = match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some(typ) -> Doc.concat [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printTypExpr typ cmtTbl;
-        ]
-      in
-      Doc.concat [
-        manifest;
-        Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-        printPrivateFlag td.ptype_private;
-        printRecordDeclaration lds cmtTbl;
-      ]
-    | Ptype_variant(cds) ->
-      let manifest = match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some(typ) -> Doc.concat [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printTypExpr typ cmtTbl;
-        ]
-      in
-      Doc.concat [
-        manifest;
-        Doc.concat [Doc.space; Doc.text equalSign];
-        printConstructorDeclarations ~privateFlag:td.ptype_private cds cmtTbl;
-      ]
-    in
-    let constraints = printTypeDefinitionConstraints td.ptype_cstrs in
-    Doc.group (
-      Doc.concat [
-        attrs;
-        prefix;
-        typeName;
-        typeParams;
-        manifestAndKind;
-        constraints;
-      ]
-    )
-
-  and printTypeDeclaration2 ~recFlag (td: Parsetree.type_declaration) cmtTbl i =
-    let name =
-      let doc = printIdentLike td.Parsetree.ptype_name.txt in
-      printComments doc cmtTbl td.ptype_name.loc
-    in
-    let equalSign = "=" in
-    let (hasGenType, attrs) = ParsetreeViewer.splitGenTypeAttr td.ptype_attributes in
-    let attrs = printAttributes ~loc:td.ptype_loc attrs in
-    let prefix = if i > 0 then
-      Doc.concat [
-        Doc.text "and ";
-        if hasGenType then Doc.text "export " else Doc.nil
-      ]
-    else
-      Doc.concat [
-        Doc.text (if hasGenType then "export type " else "type ");
-        recFlag
-      ]
-    in
-    let typeName = name in
-    let typeParams = printTypeParams td.ptype_params cmtTbl in
-    let manifestAndKind = match td.ptype_kind with
-    | Ptype_abstract ->
-      begin match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some(typ) ->
-        Doc.concat [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printPrivateFlag td.ptype_private;
-          printTypExpr typ cmtTbl;
-        ]
-      end
-    | Ptype_open -> Doc.concat [
-        Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-        printPrivateFlag td.ptype_private;
-        Doc.text "..";
-      ]
-    | Ptype_record(lds) ->
-      let manifest = match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some(typ) -> Doc.concat [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printTypExpr typ cmtTbl;
-        ]
-      in
-      Doc.concat [
-        manifest;
-        Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-        printPrivateFlag td.ptype_private;
-        printRecordDeclaration lds cmtTbl;
-      ]
-    | Ptype_variant(cds) ->
-      let manifest = match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some(typ) -> Doc.concat [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printTypExpr typ cmtTbl;
-        ]
-      in
-      Doc.concat [
-        manifest;
-        Doc.concat [Doc.space; Doc.text equalSign];
-        printConstructorDeclarations ~privateFlag:td.ptype_private cds cmtTbl;
-      ]
-    in
-    let constraints = printTypeDefinitionConstraints td.ptype_cstrs in
-    Doc.group (
-      Doc.concat [
-        attrs;
-        prefix;
-        typeName;
-        typeParams;
-        manifestAndKind;
-        constraints;
-      ]
-    )
-
-  and printTypeDefinitionConstraints cstrs =
-    match cstrs with
-    | [] -> Doc.nil
-    | cstrs -> Doc.indent (
-        Doc.group (
-          Doc.concat [
-            Doc.line;
-            Doc.group(
-              Doc.join ~sep:Doc.line (
-                List.map printTypeDefinitionConstraint cstrs
-              )
-            )
-          ]
-        )
-      )
-
-  and printTypeDefinitionConstraint ((typ1, typ2, _loc ): Parsetree.core_type * Parsetree.core_type * Location.t) =
-    Doc.concat [
-      Doc.text "constraint ";
-      printTypExpr typ1 CommentTable.empty;
-      Doc.text " = ";
-      printTypExpr typ2 CommentTable.empty;
-    ]
-
-  and printPrivateFlag (flag : Asttypes.private_flag) = match flag with
-    | Private -> Doc.text "private "
-    | Public -> Doc.nil
-
-  and printTypeParams typeParams cmtTbl =
-    match typeParams with
-    | [] -> Doc.nil
-    | typeParams ->
-      Doc.group (
-        Doc.concat [
-          Doc.lessThan;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map (fun typeParam ->
-                  let doc = printTypeParam typeParam cmtTbl in
-                  printComments doc cmtTbl (fst typeParam).Parsetree.ptyp_loc
-                ) typeParams
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.greaterThan;
-        ]
-      )
-
-  and printTypeParam (param : (Parsetree.core_type * Asttypes.variance)) cmtTbl =
-    let (typ, variance) = param in
-    let printedVariance = match variance with
-    | Covariant -> Doc.text "+"
-    | Contravariant -> Doc.text "-"
-    | Invariant -> Doc.nil
-    in
-    Doc.concat [
-      printedVariance;
-      printTypExpr typ cmtTbl
-    ]
-
-  and printRecordDeclaration (lds: Parsetree.label_declaration list) cmtTbl =
-    let forceBreak = match (lds, List.rev lds) with
-    | (first::_, last::_) ->
-       first.pld_loc.loc_start.pos_lnum < last.pld_loc.loc_end.pos_lnum
-    | _ -> false
-    in
-    Doc.breakableGroup ~forceBreak (
-      Doc.concat [
-        Doc.lbrace;
-        Doc.indent (
-          Doc.concat [
-            Doc.softLine;
-            Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line])
-              (List.map (fun ld ->
-                let doc = printLabelDeclaration ld cmtTbl in
-                printComments doc cmtTbl ld.Parsetree.pld_loc
-              ) lds)
-          ]
-        );
-        Doc.trailingComma;
-        Doc.softLine;
-        Doc.rbrace;
-      ]
-    )
-
-  and printConstructorDeclarations
-    ~privateFlag (cds: Parsetree.constructor_declaration list) cmtTbl
-  =
-    let forceBreak = match (cds, List.rev cds) with
-    | (first::_, last::_) ->
-       first.pcd_loc.loc_start.pos_lnum < last.pcd_loc.loc_end.pos_lnum
-    | _ -> false
-    in
-    let privateFlag = match privateFlag with
-    | Asttypes.Private -> Doc.concat [
-        Doc.text "private";
-        Doc.line;
-      ]
-    | Public -> Doc.nil
-    in
-    let rows =
-      printListi
-        ~getLoc:(fun cd -> cd.Parsetree.pcd_loc)
-        ~nodes:cds
-        ~print:(fun cd cmtTbl i ->
-          let doc = printConstructorDeclaration2 i cd cmtTbl in
-          printComments doc cmtTbl cd.Parsetree.pcd_loc
-        )
-        ~forceBreak
-        cmtTbl
-    in
-    Doc.breakableGroup ~forceBreak (
-      Doc.indent (
-        Doc.concat [
-          Doc.line;
-          privateFlag;
-          rows;
-        ]
-      )
-    )
-
-  and printConstructorDeclaration2 i (cd : Parsetree.constructor_declaration) cmtTbl =
-    let attrs = printAttributes cd.pcd_attributes in
-    let bar = if i > 0 then Doc.text "| "
-    else Doc.ifBreaks (Doc.text "| ") Doc.nil
-    in
-    let constrName =
-      let doc = Doc.text cd.pcd_name.txt in
-      printComments doc cmtTbl cd.pcd_name.loc
-    in
-    let constrArgs = printConstructorArguments ~indent:true cd.pcd_args cmtTbl in
-    let gadt = match cd.pcd_res with
-    | None -> Doc.nil
-    | Some(typ) -> Doc.indent (
-        Doc.concat [
-          Doc.text ": ";
-          printTypExpr typ cmtTbl;
-        ]
-      )
-    in
-    Doc.concat [
-      bar;
-      Doc.group (
-        Doc.concat [
-          attrs; (* TODO: fix parsing of attributes, so when can print them above the bar? *)
-          constrName;
-          constrArgs;
-          gadt;
-        ]
-      )
-    ]
-
-  and printConstructorArguments ~indent (cdArgs : Parsetree.constructor_arguments) cmtTbl =
-    match cdArgs with
-    | Pcstr_tuple [] -> Doc.nil
-    | Pcstr_tuple types ->
-      let args = Doc.concat [
-        Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-            Doc.softLine;
-            Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-              List.map (fun typexpr ->
-                printTypExpr typexpr cmtTbl
-              ) types
-            )
-          ]
-        );
-        Doc.trailingComma;
-        Doc.softLine;
-        Doc.rparen;
-      ] in
-      Doc.group (
-        if indent then Doc.indent args else args
-      )
-    | Pcstr_record lds ->
-      let args = Doc.concat [
-        Doc.lparen;
-        (* manually inline the printRecordDeclaration, gives better layout *)
-        Doc.lbrace;
-        Doc.indent (
-          Doc.concat [
-            Doc.softLine;
-            Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line])
-              (List.map (fun ld ->
-                let doc = printLabelDeclaration ld cmtTbl in
-                printComments doc cmtTbl ld.Parsetree.pld_loc
-              ) lds)
-          ]
-        );
-        Doc.trailingComma;
-        Doc.softLine;
-        Doc.rbrace;
-        Doc.rparen;
-      ] in
-      if indent then Doc.indent args else args
-
-  and printLabelDeclaration (ld : Parsetree.label_declaration) cmtTbl =
-    let attrs = printAttributes ~loc:ld.pld_name.loc ld.pld_attributes in
-    let mutableFlag = match ld.pld_mutable with
-    | Mutable -> Doc.text "mutable "
-    | Immutable -> Doc.nil
-    in
-    let name =
-      let doc = printIdentLike ld.pld_name.txt in
-      printComments doc cmtTbl ld.pld_name.loc
-    in
-    Doc.group (
-      Doc.concat [
-        attrs;
-        mutableFlag;
-        name;
-        Doc.text ": ";
-        printTypExpr ld.pld_type cmtTbl;
-      ]
-    )
-
-  and printTypExpr (typExpr : Parsetree.core_type) cmtTbl =
-    let renderedType = match typExpr.ptyp_desc with
-    | Ptyp_any -> Doc.text "_"
-    | Ptyp_var var -> Doc.concat [
-        Doc.text "'";
-        printIdentLike var;
-      ]
-    | Ptyp_extension(extension) ->
-      printExtensionWithComments ~atModuleLvl:false extension cmtTbl
-    | Ptyp_alias(typ, alias) ->
-      let typ =
-        (* Technically type t = (string, float) => unit as 'x, doesn't require
-         * parens around the arrow expression. This is very confusing though.
-         * Is the "as" part of "unit" or "(string, float) => unit". By printing
-         * parens we guide the user towards its meaning.*)
-        let needsParens = match typ.ptyp_desc with
-        | Ptyp_arrow _ -> true
-        | _ -> false
-        in
-        let doc = printTypExpr typ cmtTbl in
-        if needsParens then
-          Doc.concat [Doc.lparen; doc; Doc.rparen]
-        else
-          doc
-      in
-      Doc.concat [typ; Doc.text " as "; Doc.concat [Doc.text "'"; printIdentLike alias]]
-    | Ptyp_constr({txt = Longident.Ldot(Longident.Lident "Js", "t")}, [{ptyp_desc = Ptyp_object (_fields, _openFlag)} as typ]) ->
-      let bsObject = printTypExpr typ cmtTbl in
-      begin match typExpr.ptyp_attributes with
-      | [] -> bsObject
-      | attrs ->
-        Doc.concat [
-          Doc.group (
-            Doc.join ~sep:Doc.line (List.map printAttribute attrs)
-          );
-          Doc.space;
-          printTypExpr typ cmtTbl;
-        ]
-      end
-    | Ptyp_constr(longidentLoc, [{ ptyp_desc = Parsetree.Ptyp_tuple tuple }]) ->
-      let constrName = printLidentPath longidentLoc cmtTbl in
-      Doc.group(
-        Doc.concat([
-          constrName;
-          Doc.lessThan;
-          printTupleType ~inline:true tuple cmtTbl;
-          Doc.greaterThan;
-        ])
-      )
-    | Ptyp_constr(longidentLoc, constrArgs) ->
-      let constrName = printLidentPath longidentLoc cmtTbl in
-      begin match constrArgs with
-      | [] -> constrName
-      | [{
-          Parsetree.ptyp_desc =
-            Ptyp_constr({txt = Longident.Ldot(Longident.Lident "Js", "t")},
-          [{ptyp_desc = Ptyp_object (fields, openFlag)}])
-        }] ->
-        Doc.concat([
-          constrName;
-          Doc.lessThan;
-          printBsObjectSugar ~inline:true fields openFlag cmtTbl;
-          Doc.greaterThan;
-        ])
-      | _args -> Doc.group(
-        Doc.concat([
-          constrName;
-          Doc.lessThan;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map
-                  (fun typexpr -> printTypExpr typexpr cmtTbl)
-                  constrArgs
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.greaterThan;
-        ])
-      )
-      end
-    | Ptyp_arrow _ ->
-      let (attrsBefore, args, returnType) = ParsetreeViewer.arrowType typExpr in
-      let returnTypeNeedsParens = match returnType.ptyp_desc with
-      | Ptyp_alias _ -> true
-      | _ -> false
-      in
-      let returnDoc =
-        let doc = printTypExpr returnType cmtTbl in
-        if returnTypeNeedsParens then
-          Doc.concat [Doc.lparen; doc; Doc.rparen]
-        else doc
-      in
-      let (isUncurried, attrs) =
-        ParsetreeViewer.processUncurriedAttribute attrsBefore
-      in
-      begin match args with
-      | [] -> Doc.nil
-      | [([], Nolabel, n)] when not isUncurried ->
-          let hasAttrsBefore = not (attrs = []) in
-          let attrs = if hasAttrsBefore then
-            Doc.concat [
-              Doc.join ~sep:Doc.line (List.map printAttribute attrsBefore);
-              Doc.space;
-            ]
-          else Doc.nil
-          in
-          let typDoc =
-            let doc = printTypExpr n cmtTbl in
-            match n.ptyp_desc with
-            | Ptyp_arrow _ | Ptyp_tuple _ -> addParens doc
-            | _ -> doc
-          in
-          Doc.group (
-            Doc.concat [
-              Doc.group attrs;
-              Doc.group (
-                if hasAttrsBefore then
-                  Doc.concat [
-                    Doc.lparen;
-                    Doc.indent (
-                      Doc.concat [
-                        Doc.softLine;
-                        typDoc;
-                        Doc.text " => ";
-                        returnDoc;
-                      ]
-                    );
-                    Doc.softLine;
-                    Doc.rparen
-                  ]
-                else
-                Doc.concat [
-                  typDoc;
-                  Doc.text " => ";
-                  returnDoc;
-                ]
-              )
-            ]
-          )
-      | args ->
-        let attrs = match attrs with
-        | [] -> Doc.nil
-        | attrs -> Doc.concat [
-            Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-            Doc.space;
-          ]
-        in
-        let renderedArgs = Doc.concat [
-          attrs;
-          Doc.text "(";
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              if isUncurried then Doc.concat [Doc.dot; Doc.space] else Doc.nil;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map (fun tp -> printTypeParameter tp cmtTbl) args
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.text ")";
-        ] in
-        Doc.group (
-          Doc.concat [
-            renderedArgs;
-            Doc.text " => ";
-            returnDoc;
-          ]
-        )
-      end
-    | Ptyp_tuple types -> printTupleType ~inline:false types cmtTbl
-    | Ptyp_object (fields, openFlag) ->
-      printBsObjectSugar ~inline:false fields openFlag cmtTbl
-    | Ptyp_poly([], typ) ->
-      printTypExpr typ cmtTbl
-    | Ptyp_poly(stringLocs, typ) ->
-      Doc.concat [
-        Doc.join ~sep:Doc.space (List.map (fun {Location.txt; loc} ->
-          let doc = Doc.concat [Doc.text "'"; Doc.text txt] in
-          printComments doc cmtTbl loc
-          ) stringLocs);
-        Doc.dot;
-        Doc.space;
-        printTypExpr typ cmtTbl
-      ]
-    | Ptyp_package packageType ->
-      printPackageType ~printModuleKeywordAndParens:true packageType cmtTbl
-    | Ptyp_class _ ->
-      Doc.text "classes are not supported in types"
-    | Ptyp_variant (rowFields, closedFlag, labelsOpt) ->
-      let printRowField = function
-      | Parsetree.Rtag ({txt}, attrs, true, []) ->
-        Doc.concat [
-          printAttributes attrs;
-          Doc.concat [Doc.text "#"; printIdentLike ~allowUident:true txt]
-        ]
-      | Rtag ({txt}, attrs, truth, types) ->
-        let doType t = match t.Parsetree.ptyp_desc with
-        | Ptyp_tuple _ -> printTypExpr t cmtTbl
-        | _ -> Doc.concat [ Doc.lparen; printTypExpr t cmtTbl; Doc.rparen ]
-        in
-        let printedTypes = List.map doType types in
-        let cases = Doc.join ~sep:(Doc.concat [Doc.line; Doc.text "& "]) printedTypes in
-        let cases = if truth then Doc.concat [Doc.line; Doc.text "& "; cases] else cases in
-        Doc.group (Doc.concat [
-          printAttributes attrs;
-          Doc.concat [Doc.text "#"; printIdentLike ~allowUident:true txt];
-          cases
-        ])
-      | Rinherit coreType ->
-        printTypExpr coreType cmtTbl
-      in
-      let docs = List.map printRowField rowFields in
-      let cases = Doc.join ~sep:(Doc.concat [Doc.line; Doc.text "| "]) docs in
-      let cases = if docs = [] then cases else Doc.concat [Doc.text "| "; cases] in
-      let openingSymbol =
-        if closedFlag = Open
-        then Doc.greaterThan
-        else if labelsOpt = None
-        then Doc.nil
-        else Doc.lessThan in
-      let hasLabels = labelsOpt <> None && labelsOpt <> Some [] in
-      let labels = match labelsOpt with
-      | None
-      | Some([]) ->
-        Doc.nil
-      | Some(labels) ->
-        Doc.concat (List.map (fun label -> Doc.concat [Doc.line; Doc.text "#" ; printIdentLike ~allowUident:true label] ) labels)
-      in
-      let closingSymbol = if hasLabels then Doc.text " >" else Doc.nil in
-      Doc.group (Doc.concat [Doc.lbracket; openingSymbol; Doc.line; cases; closingSymbol; labels; Doc.line; Doc.rbracket])
-    in
-    let shouldPrintItsOwnAttributes = match typExpr.ptyp_desc with
-    | Ptyp_arrow _ (* es6 arrow types print their own attributes *)
-    | Ptyp_constr({txt = Longident.Ldot(Longident.Lident "Js", "t")}, _) -> true
-    | _ -> false
-    in
-    let doc = begin match typExpr.ptyp_attributes with
-    | _::_ as attrs when not shouldPrintItsOwnAttributes ->
-      Doc.group (
-        Doc.concat [
-          printAttributes attrs;
-          renderedType;
-        ]
-      )
-    | _ -> renderedType
-    end
-    in
-    printComments doc cmtTbl typExpr.ptyp_loc
-
-  and printBsObjectSugar ~inline fields openFlag cmtTbl =
-    let doc = match fields with
-    | [] -> Doc.concat [
-        Doc.lbrace;
-        (match openFlag with
-        | Asttypes.Closed -> Doc.dot
-        | Open -> Doc.dotdot);
-        Doc.rbrace
-      ]
-    | fields ->
-      Doc.concat [
-        Doc.lbrace;
-        (match openFlag with
-        | Asttypes.Closed -> Doc.nil
-        | Open -> Doc.dotdot);
-        Doc.indent (
-          Doc.concat [
-            Doc.softLine;
-            Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-              List.map (fun field -> printObjectField field cmtTbl) fields
-            )
-          ]
-        );
-        Doc.trailingComma;
-        Doc.softLine;
-        Doc.rbrace;
-      ]
-    in
-    if inline then doc else Doc.group doc
-
-  and printTupleType ~inline (types: Parsetree.core_type list) cmtTbl =
-    let tuple = Doc.concat([
-      Doc.lparen;
-      Doc.indent (
-        Doc.concat([
-          Doc.softLine;
-          Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-            List.map (fun typexpr -> printTypExpr typexpr cmtTbl) types
-          )
-        ])
-      );
-      Doc.trailingComma;
-      Doc.softLine;
-      Doc.rparen;
-    ])
-    in
-    if inline == false then Doc.group(tuple) else tuple
-
-  and printObjectField (field : Parsetree.object_field) cmtTbl =
-    match field with
-    | Otag (labelLoc, attrs, typ) ->
-      let lbl =
-        let doc = Doc.text ("\"" ^ labelLoc.txt ^ "\"") in
-        printComments doc cmtTbl labelLoc.loc
-      in
-      let doc = Doc.concat [
-        printAttributes ~loc:labelLoc.loc attrs;
-        lbl;
-        Doc.text ": ";
-        printTypExpr typ cmtTbl;
-      ] in
-      let cmtLoc = {labelLoc.loc with loc_end = typ.ptyp_loc.loc_end} in
-      printComments doc cmtTbl cmtLoc
-    | _ -> Doc.nil
-
-  (* es6 arrow type arg
-   * type t = (~foo: string, ~bar: float=?, unit) => unit
-   * i.e. ~foo: string, ~bar: float *)
-  and printTypeParameter (attrs, lbl, typ) cmtTbl =
-    let (isUncurried, attrs) = ParsetreeViewer.processUncurriedAttribute attrs in
-    let uncurried = if isUncurried then Doc.concat [Doc.dot; Doc.space] else Doc.nil in
-    let attrs = match attrs with
-    | [] -> Doc.nil
-    | attrs -> Doc.concat [
-      Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-      Doc.line;
-    ] in
-    let label = match lbl with
-    | Asttypes.Nolabel -> Doc.nil
-    | Labelled lbl -> Doc.concat [
-        Doc.text "~";
-        printIdentLike lbl;
-        Doc.text ": ";
-      ]
-    | Optional lbl -> Doc.concat [
-        Doc.text "~";
-        printIdentLike lbl;
-        Doc.text ": ";
-      ]
-    in
-    let optionalIndicator = match lbl with
-    | Asttypes.Nolabel
-    | Labelled _ -> Doc.nil
-    | Optional _lbl -> Doc.text "=?"
-    in
-    let doc = Doc.group (
-      Doc.concat [
-        uncurried;
-        attrs;
-        label;
-        printTypExpr typ cmtTbl;
-        optionalIndicator;
-      ]
-    ) in
-    printComments doc cmtTbl typ.ptyp_loc
-
-  and printValueBinding ~recFlag vb cmtTbl i =
-    let (hasGenType, attrs) = ParsetreeViewer.splitGenTypeAttr vb.pvb_attributes in
-    let attrs = printAttributes ~loc:vb.pvb_pat.ppat_loc attrs in
-		let header =
-      if i == 0 then
-        Doc.concat [
-          if hasGenType then Doc.text "export " else Doc.text "let ";
-          recFlag
-      ] else
-        Doc.concat [
-          Doc.text "and ";
-          if hasGenType then Doc.text "export " else Doc.nil
-        ]
-		in
-    match vb with
-    | {pvb_pat =
-        {ppat_desc = Ppat_constraint (pattern, {ptyp_desc = Ptyp_poly _})};
-       pvb_expr =
-         {pexp_desc = Pexp_newtype _} as expr
-      }   ->
-      let (_attrs, parameters, returnExpr) = ParsetreeViewer.funExpr expr in
-      let abstractType = match parameters with
-      | [NewTypes {locs = vars}] ->
-        Doc.concat [
-          Doc.text "type ";
-          Doc.join ~sep:Doc.space (List.map (fun var -> Doc.text var.Asttypes.txt) vars);
-          Doc.dot;
-        ]
-      | _ -> Doc.nil
-      in
-      begin match returnExpr.pexp_desc with
-      | Pexp_constraint (expr, typ) ->
-        Doc.group (
-          Doc.concat [
-            attrs;
-            header;
-            printPattern pattern cmtTbl;
-            Doc.text ":";
-            Doc.indent (
-              Doc.concat [
-                Doc.line;
-                abstractType;
-                Doc.space;
-                printTypExpr typ cmtTbl;
-                Doc.text " =";
-                Doc.concat [
-                  Doc.line;
-                  printExpressionWithComments expr cmtTbl;
-                ]
-              ]
-            )
-          ]
-        )
-      | _ -> Doc.nil
-      end
-    | _ ->
-    let (optBraces, expr) = ParsetreeViewer.processBracesAttr vb.pvb_expr in
-    let printedExpr =
-      let doc = printExpressionWithComments vb.pvb_expr cmtTbl in
-      match Parens.expr vb.pvb_expr with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces  -> printBraces doc expr braces
-      | Nothing -> doc
-    in
-    if ParsetreeViewer.isPipeExpr vb.pvb_expr then
-      Doc.customLayout [
-        Doc.group (
-          Doc.concat [
-            attrs;
-            header;
-            printPattern vb.pvb_pat cmtTbl;
-            Doc.text " =";
-            Doc.space;
-            printedExpr;
-          ]
-        );
-        Doc.group (
-          Doc.concat [
-            attrs;
-            header;
-            printPattern vb.pvb_pat cmtTbl;
-            Doc.text " =";
-            Doc.indent (
-              Doc.concat [
-                Doc.line;
-                printedExpr;
-              ]
-            )
-          ]
-        );
-      ]
-		else
-      let shouldIndent =
-        match optBraces with
-        | Some _ -> false
-        | _ ->
-          ParsetreeViewer.isBinaryExpression expr ||
-          (match vb.pvb_expr with
-          | {
-              pexp_attributes = [({Location.txt="res.ternary"}, _)];
-              pexp_desc = Pexp_ifthenelse (ifExpr, _, _)
-            }  ->
-            ParsetreeViewer.isBinaryExpression ifExpr || ParsetreeViewer.hasAttributes ifExpr.pexp_attributes
-        | { pexp_desc = Pexp_newtype _} -> false
-        | e ->
-            ParsetreeViewer.hasAttributes e.pexp_attributes ||
-            ParsetreeViewer.isArrayAccess e
-          )
-      in
-      Doc.group (
-        Doc.concat [
-          attrs;
-          header;
-          printPattern vb.pvb_pat cmtTbl;
-          Doc.text " =";
-          if shouldIndent then
-            Doc.indent (
-              Doc.concat [
-                Doc.line;
-                printedExpr;
-              ]
-            )
-          else
-            Doc.concat [
-              Doc.space;
-              printedExpr;
-            ]
-        ]
-      )
-
-  and printPackageType ~printModuleKeywordAndParens (packageType: Parsetree.package_type) cmtTbl =
-    let doc = match packageType with
-    | (longidentLoc, []) -> Doc.group(
-        Doc.concat [
-          printLongidentLocation longidentLoc cmtTbl;
-        ]
-      )
-    | (longidentLoc, packageConstraints) -> Doc.group(
-        Doc.concat [
-          printLongidentLocation longidentLoc cmtTbl;
-          printPackageConstraints packageConstraints cmtTbl;
-          Doc.softLine;
-        ]
-      )
-    in
-    if printModuleKeywordAndParens then
-      Doc.concat[
-        Doc.text "module(";
-        doc;
-        Doc.rparen
-      ]
-    else
-      doc
-
-  and printPackageConstraints packageConstraints cmtTbl  =
-    Doc.concat [
-      Doc.text " with";
-      Doc.indent (
-        Doc.concat [
-          Doc.line;
-          Doc.join ~sep:Doc.line (
-            List.mapi (fun i pc ->
-              let (longident, typexpr) = pc in
-              let cmtLoc = {longident.Asttypes.loc with
-                loc_end = typexpr.Parsetree.ptyp_loc.loc_end
-              } in
-              let doc = printPackageConstraint i cmtTbl pc in
-              printComments doc cmtTbl cmtLoc
-            ) packageConstraints
-          )
-        ]
-      )
-    ]
-
-  and printPackageConstraint i cmtTbl (longidentLoc, typ) =
-    let prefix = if i == 0 then Doc.text "type " else Doc.text "and type " in
-    Doc.concat [
-      prefix;
-      printLongidentLocation longidentLoc cmtTbl;
-      Doc.text " = ";
-      printTypExpr typ cmtTbl;
-    ]
-
-  and printExtensionWithComments ~atModuleLvl (stringLoc, payload) cmtTbl =
-    let extName =
-      let doc = Doc.concat [
-        Doc.text "%";
-        if atModuleLvl then Doc.text "%" else Doc.nil;
-        Doc.text stringLoc.Location.txt;
-      ] in
-      printComments doc cmtTbl stringLoc.Location.loc
-    in
-    match payload with
-    | Parsetree.PStr [{pstr_desc = Pstr_eval (expr, attrs)}] ->
-      let exprDoc = printExpressionWithComments expr cmtTbl in
-      let needsParens = match attrs with | [] -> false | _ -> true in
-      Doc.group (
-        Doc.concat [
-          extName;
-          addParens (
-            Doc.concat [
-              printAttributes attrs;
-              if needsParens then addParens exprDoc else exprDoc;
-            ]
-          )
-        ]
-      )
-    | _ -> extName
-
-  and printPattern (p : Parsetree.pattern) cmtTbl =
-    let patternWithoutAttributes = match p.ppat_desc with
-    | Ppat_any -> Doc.text "_"
-    | Ppat_var var -> printIdentLike var.txt
-    | Ppat_constant c -> printConstant c
-    | Ppat_tuple patterns ->
-      Doc.group(
-        Doc.concat([
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat([
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map (fun pat ->
-                  printPattern pat cmtTbl) patterns)
-            ])
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen
-        ])
-      )
-    | Ppat_array [] ->
-      Doc.concat [
-        Doc.lbracket;
-        printCommentsInside cmtTbl p.ppat_loc;
-        Doc.rbracket;
-      ]
-    | Ppat_array patterns ->
-      Doc.group(
-        Doc.concat([
-          Doc.text "[";
-          Doc.indent (
-            Doc.concat([
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map (fun pat ->
-                  printPattern pat cmtTbl) patterns)
-            ])
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.text "]";
-        ])
-      )
-    | Ppat_construct({txt = Longident.Lident "()"}, _) ->
-      Doc.concat [
-        Doc.lparen;
-        printCommentsInside cmtTbl p.ppat_loc;
-        Doc.rparen;
-      ]
-    | Ppat_construct({txt = Longident.Lident "[]"}, _) ->
-      Doc.concat [
-        Doc.text "list[";
-        printCommentsInside cmtTbl p.ppat_loc;
-        Doc.rbracket;
-      ]
-    | Ppat_construct({txt = Longident.Lident "::"}, _) ->
-      let (patterns, tail) = ParsetreeViewer.collectPatternsFromListConstruct [] p in
-      let shouldHug = match (patterns, tail) with
-      | ([pat],
-        {ppat_desc = Ppat_construct({txt = Longident.Lident "[]"}, _)}) when ParsetreeViewer.isHuggablePattern pat -> true
-      | _ -> false
-      in
-      let children = Doc.concat([
-        if shouldHug then Doc.nil else Doc.softLine;
-        Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-          (List.map (fun pat ->
-            printPattern pat cmtTbl) patterns);
-        begin match tail.Parsetree.ppat_desc with
-        | Ppat_construct({txt = Longident.Lident "[]"}, _) -> Doc.nil
-        | _ ->
-          let doc = Doc.concat [Doc.text "..."; printPattern tail cmtTbl] in
-          let tail = printComments doc cmtTbl tail.ppat_loc in
-          Doc.concat([Doc.text ","; Doc.line; tail])
-        end;
-      ]) in
-      Doc.group(
-        Doc.concat([
-          Doc.text "list[";
-          if shouldHug then children else Doc.concat [
-            Doc.indent children;
-            Doc.ifBreaks (Doc.text ",") Doc.nil;
-            Doc.softLine;
-          ];
-          Doc.rbracket;
-        ])
-      )
-    | Ppat_construct(constrName, constructorArgs) ->
-      let constrName = printLongident constrName.txt in
-      let argsDoc = match constructorArgs with
-      | None -> Doc.nil
-      | Some({ppat_loc; ppat_desc = Ppat_construct ({txt = Longident.Lident "()"}, _)}) ->
-        Doc.concat [
-          Doc.lparen;
-          printCommentsInside cmtTbl ppat_loc;
-          Doc.rparen;
-        ]
-      | Some({ppat_desc = Ppat_tuple []; ppat_loc = loc}) ->
-        Doc.concat [
-          Doc.lparen;
-          Doc.softLine;
-          printCommentsInside cmtTbl loc;
-          Doc.rparen;
-        ]
-      (* Some((1, 2) *)
-      | Some({ppat_desc = Ppat_tuple [{ppat_desc = Ppat_tuple _} as arg]}) ->
-        Doc.concat [
-          Doc.lparen;
-          printPattern arg cmtTbl;
-          Doc.rparen;
-        ]
-      | Some({ppat_desc = Ppat_tuple patterns}) ->
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map (fun pat -> printPattern pat cmtTbl) patterns
-              );
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      | Some(arg) ->
-        let argDoc = printPattern arg cmtTbl in
-        let shouldHug = ParsetreeViewer.isHuggablePattern arg in
-        Doc.concat [
-          Doc.lparen;
-          if shouldHug then argDoc
-          else Doc.concat [
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                argDoc;
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-          ];
-          Doc.rparen;
-
-        ]
-      in
-      Doc.group(Doc.concat [constrName; argsDoc])
-    | Ppat_variant (label, None) ->
-      Doc.concat [Doc.text "#"; printIdentLike ~allowUident:true label]
-    | Ppat_variant (label, variantArgs) ->
-      let variantName =
-        Doc.concat [Doc.text "#"; printIdentLike ~allowUident:true label] in
-      let argsDoc = match variantArgs with
-      | None -> Doc.nil
-      | Some({ppat_desc = Ppat_construct ({txt = Longident.Lident "()"}, _)}) ->
-        Doc.text "()"
-      | Some({ppat_desc = Ppat_tuple []; ppat_loc = loc}) ->
-        Doc.concat [
-          Doc.lparen;
-          Doc.softLine;
-          printCommentsInside cmtTbl loc;
-          Doc.rparen;
-        ]
-      (* Some((1, 2) *)
-      | Some({ppat_desc = Ppat_tuple [{ppat_desc = Ppat_tuple _} as arg]}) ->
-        Doc.concat [
-          Doc.lparen;
-          printPattern arg cmtTbl;
-          Doc.rparen;
-        ]
-      | Some({ppat_desc = Ppat_tuple patterns}) ->
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map (fun pat -> printPattern pat cmtTbl) patterns
-              );
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      | Some(arg) ->
-        let argDoc = printPattern arg cmtTbl in
-        let shouldHug = ParsetreeViewer.isHuggablePattern arg in
-        Doc.concat [
-          Doc.lparen;
-          if shouldHug then argDoc
-          else Doc.concat [
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                argDoc;
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-          ];
-          Doc.rparen;
-
-        ]
-      in
-      Doc.group(Doc.concat [variantName; argsDoc])
-    | Ppat_type ident ->
-      Doc.concat [Doc.text "##"; printIdentPath ident cmtTbl]
-    | Ppat_record(rows, openFlag) ->
-        Doc.group(
-          Doc.concat([
-            Doc.lbrace;
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                  (List.map (fun row -> printPatternRecordRow row cmtTbl) rows);
-                begin match openFlag with
-                | Open -> Doc.concat [Doc.text ","; Doc.line; Doc.text "_"]
-                | Closed -> Doc.nil
-                end;
-              ]
-            );
-            Doc.ifBreaks (Doc.text ",") Doc.nil;
-            Doc.softLine;
-            Doc.rbrace;
-          ])
-        )
-
-    | Ppat_exception p ->
-        let needsParens = match p.ppat_desc with
-        | Ppat_or (_, _) | Ppat_alias (_, _) -> true
-        | _ -> false
-        in
-        let pat =
-          let p = printPattern p cmtTbl in
-          if needsParens then
-            Doc.concat [Doc.text "("; p; Doc.text ")"]
-          else
-            p
-        in
-        Doc.group (
-          Doc.concat [Doc.text "exception"; Doc.line; pat]
-        )
-    | Ppat_or _ ->
-      (* Blue | Red | Green -> [Blue; Red; Green] *)
-      let orChain = ParsetreeViewer.collectOrPatternChain p in
-      let docs = List.mapi (fun i pat ->
-        let patternDoc = printPattern pat cmtTbl in
-        Doc.concat [
-          if i == 0 then Doc.nil else Doc.concat [Doc.line; Doc.text "| "];
-          match pat.ppat_desc with
-          (* (Blue | Red) | (Green | Black) | White *)
-          | Ppat_or _ -> addParens patternDoc
-          | _ -> patternDoc
-        ]
-      ) orChain in
-      Doc.group (Doc.concat docs)
-    | Ppat_extension ext ->
-      printExtensionWithComments ~atModuleLvl:false ext cmtTbl
-    | Ppat_lazy p ->
-      let needsParens = match p.ppat_desc with
-      | Ppat_or (_, _) | Ppat_alias (_, _) -> true
-      | _ -> false
-      in
-      let pat =
-        let p = printPattern p cmtTbl in
-        if needsParens then
-          Doc.concat [Doc.text "("; p; Doc.text ")"]
-        else
-          p
-      in
-      Doc.concat [Doc.text "lazy "; pat]
-    | Ppat_alias (p, aliasLoc) ->
-      let needsParens = match p.ppat_desc with
-      | Ppat_or (_, _) | Ppat_alias (_, _) -> true
-      | _ -> false
-      in
-      let renderedPattern =
-        let p = printPattern p cmtTbl in
-        if needsParens then
-          Doc.concat [Doc.text "("; p; Doc.text ")"]
-        else
-          p
-      in
-      Doc.concat([
-        renderedPattern;
-        Doc.text " as ";
-        printStringLoc aliasLoc cmtTbl;
-      ])
-
-     (* Note: module(P : S) is represented as *)
-     (* Ppat_constraint(Ppat_unpack, Ptyp_package) *)
-    | Ppat_constraint ({ppat_desc = Ppat_unpack stringLoc}, {ptyp_desc = Ptyp_package packageType; ptyp_loc}) ->
-        Doc.concat [
-          Doc.text "module(";
-          printComments (Doc.text stringLoc.txt) cmtTbl stringLoc.loc;
-          Doc.text ": ";
-          printComments
-            (printPackageType ~printModuleKeywordAndParens:false packageType cmtTbl)
-            cmtTbl
-            ptyp_loc;
-          Doc.rparen;
-        ]
-    | Ppat_constraint (pattern, typ) ->
-      Doc.concat [
-        printPattern pattern cmtTbl;
-        Doc.text ": ";
-        printTypExpr typ cmtTbl;
-      ]
-
-     (* Note: module(P : S) is represented as *)
-     (* Ppat_constraint(Ppat_unpack, Ptyp_package) *)
-    | Ppat_unpack stringLoc ->
-      Doc.concat [
-        Doc.text "module(";
-        printComments (Doc.text stringLoc.txt) cmtTbl stringLoc.loc;
-        Doc.rparen;
-      ]
-    | Ppat_interval (a, b) ->
-      Doc.concat [
-        printConstant a;
-        Doc.text " .. ";
-        printConstant b;
-      ]
-    | Ppat_open _ -> Doc.nil
-    in
-    let doc = match p.ppat_attributes with
-    | [] -> patternWithoutAttributes
-    | attrs ->
-      Doc.group (
-        Doc.concat [
-          printAttributes attrs;
-          patternWithoutAttributes;
-        ]
-      )
-    in
-    printComments doc cmtTbl p.ppat_loc
-
-  and printPatternRecordRow row cmtTbl =
-    match row with
-    (* punned {x}*)
-    | ({Location.txt=Longident.Lident ident} as longident,
-       {Parsetree.ppat_desc=Ppat_var {txt;_}}) when ident = txt ->
-        printLidentPath longident cmtTbl
-    | (longident, pattern) ->
-      let locForComments = {
-        longident.loc with
-        loc_end = pattern.Parsetree.ppat_loc.loc_end
-      } in
-      let doc = Doc.group (
-        Doc.concat([
-          printLidentPath longident cmtTbl;
-          Doc.text ": ";
-          Doc.indent(
-            Doc.concat [
-              Doc.softLine;
-              printPattern pattern cmtTbl;
-            ]
-          )
-        ])
-      ) in
-      printComments doc cmtTbl locForComments
-
-  and printExpressionWithComments expr cmtTbl =
-    let doc = printExpression expr cmtTbl in
-    printComments doc cmtTbl expr.Parsetree.pexp_loc
-
-  and printExpression (e : Parsetree.expression) cmtTbl =
-    let printedExpression = match e.pexp_desc with
-    | Parsetree.Pexp_constant c -> printConstant c
-    | Pexp_construct _ when ParsetreeViewer.hasJsxAttribute e.pexp_attributes ->
-      printJsxFragment e cmtTbl
-    | Pexp_construct ({txt = Longident.Lident "()"}, _) -> Doc.text "()"
-    | Pexp_construct ({txt = Longident.Lident "[]"}, _) ->
-      Doc.concat [
-        Doc.text "list[";
-        printCommentsInside cmtTbl e.pexp_loc;
-        Doc.rbracket;
-      ]
-    | Pexp_construct ({txt = Longident.Lident "::"}, _) ->
-      let (expressions, spread) = ParsetreeViewer.collectListExpressions e in
-      let spreadDoc = match spread with
-      | Some(expr) -> Doc.concat [
-          Doc.text ",";
-          Doc.line;
-          Doc.dotdotdot;
-          let doc = printExpressionWithComments expr cmtTbl in
-          match Parens.expr expr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces -> printBraces doc expr braces
-          | Nothing -> doc
-        ]
-      | None -> Doc.nil
-      in
-      Doc.group(
-        Doc.concat([
-          Doc.text "list[";
-          Doc.indent (
-            Doc.concat([
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map
-                  (fun expr ->
-                    let doc = printExpressionWithComments expr cmtTbl in
-                    match Parens.expr expr with
-                    | Parens.Parenthesized -> addParens doc
-                    | Braced braces -> printBraces doc expr braces
-                    | Nothing -> doc
-                  )
-                  expressions);
-              spreadDoc;
-            ])
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rbracket;
-        ])
-      )
-    | Pexp_construct (longidentLoc, args) ->
-      let constr = printLongidentLocation longidentLoc cmtTbl in
-      let args = match args with
-      | None -> Doc.nil
-      | Some({pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)}) ->
-        Doc.text "()"
-      (* Some((1, 2)) *)
-      | Some({pexp_desc = Pexp_tuple [{pexp_desc = Pexp_tuple _} as arg]}) ->
-        Doc.concat [
-          Doc.lparen;
-          (let doc = printExpressionWithComments arg cmtTbl in
-          match Parens.expr arg with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces -> printBraces doc arg braces
-          | Nothing -> doc);
-          Doc.rparen;
-        ]
-      | Some({pexp_desc = Pexp_tuple args }) ->
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map
-                  (fun expr ->
-                    let doc = printExpressionWithComments expr cmtTbl in
-                    match Parens.expr expr with
-                    | Parens.Parenthesized -> addParens doc
-                    | Braced braces -> printBraces doc expr braces
-                    | Nothing -> doc)
-                  args
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      | Some(arg) ->
-        let argDoc =
-          let doc = printExpressionWithComments arg cmtTbl in
-          match Parens.expr arg with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces -> printBraces doc arg braces
-          | Nothing -> doc
-        in
-        let shouldHug = ParsetreeViewer.isHuggableExpression arg in
-        Doc.concat [
-          Doc.lparen;
-          if shouldHug then argDoc
-          else Doc.concat [
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                argDoc;
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-          ];
-          Doc.rparen;
-        ]
-      in
-      Doc.group(Doc.concat [constr; args])
-    | Pexp_ident path ->
-      printLidentPath path cmtTbl
-    | Pexp_tuple exprs ->
-      Doc.group(
-        Doc.concat([
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat([
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map (fun expr ->
-                  let doc = printExpressionWithComments expr cmtTbl in
-                  match Parens.expr expr with
-                  | Parens.Parenthesized -> addParens doc
-                  | Braced braces -> printBraces doc expr braces
-                  | Nothing -> doc)
-                 exprs)
-            ])
-          );
-          Doc.ifBreaks (Doc.text ",") Doc.nil;
-          Doc.softLine;
-          Doc.rparen;
-        ])
-      )
-    | Pexp_array [] ->
-      Doc.concat [
-        Doc.lbracket;
-        printCommentsInside cmtTbl e.pexp_loc;
-        Doc.rbracket;
-      ]
-    | Pexp_array exprs ->
-      Doc.group(
-        Doc.concat([
-          Doc.lbracket;
-          Doc.indent (
-            Doc.concat([
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map (fun expr ->
-                  let doc = printExpressionWithComments expr cmtTbl in
-                  match Parens.expr expr with
-                  | Parens.Parenthesized -> addParens doc
-                  | Braced braces -> printBraces doc expr braces
-                  | Nothing -> doc
-                  ) exprs)
-            ])
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rbracket;
-        ])
-      )
-    | Pexp_variant (label, args) ->
-      let variantName =
-        Doc.concat [Doc.text "#"; printIdentLike ~allowUident:true label] in
-      let args = match args with
-      | None -> Doc.nil
-      | Some({pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)}) ->
-        Doc.text "()"
-      (* #poly((1, 2) *)
-      | Some({pexp_desc = Pexp_tuple [{pexp_desc = Pexp_tuple _} as arg]}) ->
-        Doc.concat [
-          Doc.lparen;
-          (let doc = printExpressionWithComments arg cmtTbl in
-          match Parens.expr arg with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces -> printBraces doc arg braces
-          | Nothing -> doc);
-          Doc.rparen;
-        ]
-      | Some({pexp_desc = Pexp_tuple args }) ->
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map
-                  (fun expr ->
-                    let doc = printExpressionWithComments expr cmtTbl in
-                    match Parens.expr expr with
-                    | Parens.Parenthesized -> addParens doc
-                    | Braced braces -> printBraces doc expr braces
-                    | Nothing -> doc)
-                  args
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      | Some(arg) ->
-        let argDoc =
-          let doc = printExpressionWithComments arg cmtTbl in
-          match Parens.expr arg with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces -> printBraces doc arg braces
-          | Nothing -> doc
-        in
-        let shouldHug = ParsetreeViewer.isHuggableExpression arg in
-        Doc.concat [
-          Doc.lparen;
-          if shouldHug then argDoc
-          else Doc.concat [
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                argDoc;
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-          ];
-          Doc.rparen;
-        ]
-      in
-      Doc.group(Doc.concat [variantName; args])
-    | Pexp_record (rows, spreadExpr) ->
-      let spread = match spreadExpr with
-      | None -> Doc.nil
-      | Some expr -> Doc.concat [
-          Doc.dotdotdot;
-          (let doc = printExpressionWithComments expr cmtTbl in
-          match Parens.expr expr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces -> printBraces doc expr braces
-          | Nothing -> doc);
-          Doc.comma;
-          Doc.line;
-        ]
-      in
-      (* If the record is written over multiple lines, break automatically
-       * `let x = {a: 1, b: 3}` -> same line, break when line-width exceeded
-       * `let x = {
-       *   a: 1,
-       *   b: 2,
-       *  }` -> record is written on multiple lines, break the group *)
-      let forceBreak =
-        e.pexp_loc.loc_start.pos_lnum < e.pexp_loc.loc_end.pos_lnum
-      in
-      Doc.breakableGroup ~forceBreak (
-        Doc.concat([
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              spread;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map (fun row -> printRecordRow row cmtTbl) rows)
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rbrace;
-        ])
-      )
-    | Pexp_extension extension ->
-      begin match extension with
-      | (
-          {txt = "bs.obj"},
-          PStr [{
-            pstr_loc = loc;
-            pstr_desc = Pstr_eval({pexp_desc = Pexp_record (rows, _)}, [])
-          }]
-        ) ->
-        (* If the object is written over multiple lines, break automatically
-         * `let x = {"a": 1, "b": 3}` -> same line, break when line-width exceeded
-         * `let x = {
-         *   "a": 1,
-         *   "b": 2,
-         *  }` -> object is written on multiple lines, break the group *)
-        let forceBreak =
-          loc.loc_start.pos_lnum < loc.loc_end.pos_lnum
-        in
-        Doc.breakableGroup ~forceBreak (
-          Doc.concat([
-            Doc.lbrace;
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                  (List.map (fun row -> printBsObjectRow row cmtTbl) rows)
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-            Doc.rbrace;
-          ])
-        )
-      | extension ->
-        printExtensionWithComments ~atModuleLvl:false extension cmtTbl
-      end
-    | Pexp_apply _ ->
-      if ParsetreeViewer.isUnaryExpression e then
-        printUnaryExpression e cmtTbl
-      else if ParsetreeViewer.isTemplateLiteral e then
-        printTemplateLiteral e cmtTbl
-      else if ParsetreeViewer.isBinaryExpression e then
-        printBinaryExpression e cmtTbl
-      else
-        printPexpApply e cmtTbl
-    | Pexp_unreachable -> Doc.dot
-    | Pexp_field (expr, longidentLoc) ->
-      let lhs =
-        let doc = printExpressionWithComments expr cmtTbl in
-        match Parens.fieldExpr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.concat [
-        lhs;
-        Doc.dot;
-        printLidentPath longidentLoc cmtTbl;
-      ]
-    | Pexp_setfield (expr1, longidentLoc, expr2) ->
-      printSetFieldExpr e.pexp_attributes expr1 longidentLoc expr2 e.pexp_loc cmtTbl
-    | Pexp_ifthenelse (_ifExpr, _thenExpr, _elseExpr) ->
-      if ParsetreeViewer.isTernaryExpr e then
-        let (parts, alternate) = ParsetreeViewer.collectTernaryParts e in
-        let ternaryDoc = match parts with
-        | (condition1, consequent1)::rest ->
-          Doc.group (Doc.concat [
-            printTernaryOperand condition1 cmtTbl;
-            Doc.indent (
-              Doc.concat [
-                Doc.line;
-                Doc.indent (
-                  Doc.concat [
-                    Doc.text "? ";
-                    printTernaryOperand consequent1 cmtTbl
-                  ]
-                );
-                Doc.concat (
-                  List.map (fun (condition, consequent) ->
-                    Doc.concat [
-                      Doc.line;
-                      Doc.text ": ";
-                      printTernaryOperand condition cmtTbl;
-                      Doc.line;
-                      Doc.text "? ";
-                      printTernaryOperand consequent cmtTbl;
-                    ]
-                  ) rest
-                );
-                Doc.line;
-                Doc.text ": ";
-                Doc.indent (printTernaryOperand alternate cmtTbl);
-              ]
-            )
-          ])
-        | _ -> Doc.nil
-        in
-        let attrs = ParsetreeViewer.filterTernaryAttributes e.pexp_attributes in
-        let needsParens = match ParsetreeViewer.filterParsingAttrs attrs with
-        | [] -> false | _ -> true
-        in
-        Doc.concat [
-          printAttributes attrs;
-          if needsParens then addParens ternaryDoc else ternaryDoc;
-        ]
-      else
-      let (ifs, elseExpr) = ParsetreeViewer.collectIfExpressions e in
-      let ifDocs = Doc.join ~sep:Doc.space (
-        List.mapi (fun i (ifExpr, thenExpr) ->
-          let ifTxt = if i > 0 then Doc.text "else if " else  Doc.text "if " in
-          let condition =
-            if ParsetreeViewer.isBlockExpr ifExpr then
-              printExpressionBlock ~braces:true ifExpr cmtTbl
-            else
-              let doc = printExpressionWithComments ifExpr cmtTbl in
-              match Parens.expr ifExpr with
-              | Parens.Parenthesized -> addParens doc
-              | Braced braces -> printBraces doc ifExpr braces
-              | Nothing -> Doc.ifBreaks (addParens doc) doc
-          in
-          Doc.concat [
-            ifTxt;
-            Doc.group (condition);
-            Doc.space;
-            let thenExpr = match ParsetreeViewer.processBracesAttr thenExpr with
-            (* This case only happens when coming from Reason, we strip braces *)
-            | (Some _, expr) -> expr
-            | _ -> thenExpr
-            in
-            printExpressionBlock ~braces:true thenExpr cmtTbl;
-          ]
-        ) ifs
-      ) in
-      let elseDoc = match elseExpr with
-      | None -> Doc.nil
-      | Some expr -> Doc.concat [
-          Doc.text " else ";
-          printExpressionBlock ~braces:true expr cmtTbl;
-        ]
-      in
-      Doc.concat [
-        printAttributes e.pexp_attributes;
-        ifDocs;
-        elseDoc;
-      ]
-    | Pexp_while (expr1, expr2) ->
-      let condition =
-        let doc = printExpressionWithComments expr1 cmtTbl in
-        match Parens.expr expr1 with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr1 braces
-        | Nothing -> doc
-      in
-      Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          Doc.text "while ";
-          if ParsetreeViewer.isBlockExpr expr1 then
-            condition
-          else
-            Doc.group (
-              Doc.ifBreaks (addParens condition) condition
-            );
-          Doc.space;
-          printExpressionBlock ~braces:true expr2 cmtTbl;
-        ]
-      )
-    | Pexp_for (pattern, fromExpr, toExpr, directionFlag, body) ->
-      Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          Doc.text "for ";
-          printPattern pattern cmtTbl;
-          Doc.text " in ";
-          (let doc = printExpressionWithComments fromExpr cmtTbl in
-          match Parens.expr fromExpr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces -> printBraces doc fromExpr braces
-          | Nothing -> doc);
-          printDirectionFlag directionFlag;
-          (let doc = printExpressionWithComments toExpr cmtTbl in
-          match Parens.expr toExpr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces -> printBraces doc toExpr braces
-          | Nothing -> doc);
-          Doc.space;
-          printExpressionBlock ~braces:true body cmtTbl;
-        ]
-      )
-    | Pexp_constraint(
-        {pexp_desc = Pexp_pack modExpr},
-        {ptyp_desc = Ptyp_package packageType; ptyp_loc}
-      ) ->
-      Doc.group (
-        Doc.concat [
-          Doc.text "module(";
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              printModExpr modExpr cmtTbl;
-              Doc.text ": ";
-              printComments
-                (printPackageType ~printModuleKeywordAndParens:false packageType cmtTbl)
-                cmtTbl
-                ptyp_loc
-            ]
-          );
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      )
-
-    | Pexp_constraint (expr, typ) ->
-      let exprDoc =
-        let doc = printExpressionWithComments expr cmtTbl in
-        match Parens.expr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.concat [
-        exprDoc;
-        Doc.text ": ";
-        printTypExpr typ cmtTbl;
-      ]
-    | Pexp_letmodule ({txt = _modName}, _modExpr, _expr) ->
-      printExpressionBlock ~braces:true e cmtTbl
-    | Pexp_letexception (_extensionConstructor, _expr) ->
-      printExpressionBlock ~braces:true e cmtTbl
-    | Pexp_assert expr ->
-      let rhs =
-        let doc = printExpressionWithComments expr cmtTbl in
-        match Parens.lazyOrAssertExprRhs expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.concat [
-        Doc.text "assert ";
-        rhs;
-      ]
-    | Pexp_lazy expr ->
-      let rhs =
-        let doc = printExpressionWithComments expr cmtTbl in
-        match Parens.lazyOrAssertExprRhs expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.group (
-        Doc.concat [
-          Doc.text "lazy ";
-          rhs;
-        ]
-      )
-    | Pexp_open (_overrideFlag, _longidentLoc, _expr) ->
-      printExpressionBlock ~braces:true e cmtTbl
-    | Pexp_pack (modExpr) ->
-      Doc.group (Doc.concat [
-        Doc.text "module(";
-        Doc.indent (
-          Doc.concat [
-            Doc.softLine;
-            printModExpr modExpr cmtTbl;
-          ]
-        );
-        Doc.softLine;
-        Doc.rparen;
-      ])
-    | Pexp_sequence _ ->
-      printExpressionBlock ~braces:true e cmtTbl
-    | Pexp_let _ ->
-      printExpressionBlock ~braces:true e cmtTbl
-    | Pexp_fun (Nolabel, None, {ppat_desc = Ppat_var {txt="__x"}}, ({pexp_desc = Pexp_apply _})) ->
-
-      (* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
-      printExpressionWithComments (ParsetreeViewer.rewriteUnderscoreApply e) cmtTbl
-    | Pexp_fun _ | Pexp_newtype _ ->
-      let (attrsOnArrow, parameters, returnExpr) = ParsetreeViewer.funExpr e in
-      let (uncurried, attrs) =
-        ParsetreeViewer.processUncurriedAttribute attrsOnArrow
-      in
-      let (returnExpr, typConstraint) = match returnExpr.pexp_desc with
-      | Pexp_constraint (expr, typ) -> (
-          {expr with pexp_attributes = List.concat [
-            expr.pexp_attributes;
-            returnExpr.pexp_attributes;
-          ]},
-          Some typ
-        )
-      | _ -> (returnExpr, None)
-      in
-      let hasConstraint = match typConstraint with | Some _ -> true | None -> false in
-      let parametersDoc = printExprFunParameters
-        ~inCallback:false
-        ~uncurried
-        ~hasConstraint
-        parameters
-        cmtTbl
-      in
-      let returnExprDoc =
-        let (optBraces, _) = ParsetreeViewer.processBracesAttr returnExpr in
-        let shouldInline = match (returnExpr.pexp_desc, optBraces) with
-        | (_, Some _ ) -> true
-        | ((Pexp_array _
-        | Pexp_tuple _
-        | Pexp_construct (_, Some _)
-        | Pexp_record _), _) -> true
-        | _ -> false
-        in
-        let shouldIndent = match returnExpr.pexp_desc with
-        | Pexp_sequence _
-        | Pexp_let _
-        | Pexp_letmodule _
-        | Pexp_letexception _
-        | Pexp_open _ -> false
-        | _ -> true
-        in
-        let returnDoc =
-          let doc = printExpressionWithComments returnExpr cmtTbl in
-          match Parens.expr returnExpr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces  -> printBraces doc returnExpr braces
-          | Nothing -> doc
-        in
-        if shouldInline then Doc.concat [
-          Doc.space;
-          returnDoc;
-        ] else
-          Doc.group (
-            if shouldIndent then
-              Doc.indent (
-                Doc.concat [
-                  Doc.line;
-                  returnDoc;
-                ]
-              )
-            else
-              Doc.concat [
-                Doc.space;
-                returnDoc
-              ]
-          )
-      in
-      let typConstraintDoc = match typConstraint with
-      | Some(typ) -> Doc.concat [Doc.text ": "; printTypExpr typ cmtTbl]
-      | _ -> Doc.nil
-      in
-      let attrs = printAttributes attrs in
-      Doc.group (
-        Doc.concat [
-          attrs;
-          parametersDoc;
-          typConstraintDoc;
-          Doc.text " =>";
-          returnExprDoc;
-        ]
-      )
-    | Pexp_try (expr, cases) ->
-      let exprDoc =
-        let doc = printExpressionWithComments expr cmtTbl in
-        match Parens.expr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.concat [
-        Doc.text "try ";
-        exprDoc;
-        Doc.text " catch ";
-        printCases cases cmtTbl;
-      ]
-    | Pexp_match (expr, cases) ->
-      let exprDoc =
-        let doc = printExpressionWithComments expr cmtTbl in
-        match Parens.expr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.concat [
-        Doc.text "switch ";
-        exprDoc;
-        Doc.space;
-        printCases cases cmtTbl;
-      ]
-    | Pexp_function cases ->
-      Doc.concat [
-        Doc.text "x => switch x ";
-        printCases cases cmtTbl;
-      ]
-    | Pexp_coerce (expr, typOpt, typ) ->
-      let docExpr = printExpressionWithComments expr cmtTbl in
-      let docTyp = printTypExpr typ cmtTbl in
-      let ofType = match typOpt with
-      | None -> Doc.nil
-      | Some(typ1) ->
-        Doc.concat [Doc.text ": "; printTypExpr typ1 cmtTbl]
-      in
-      Doc.concat [Doc.lparen; docExpr; ofType; Doc.text " :> "; docTyp; Doc.rparen]
-    | Pexp_send _ ->
-      Doc.text "Pexp_send not implemented in printer"
-    | Pexp_new _ ->
-      Doc.text "Pexp_new not implemented in printer"
-    | Pexp_setinstvar _ ->
-      Doc.text "Pexp_setinstvar not implemented in printer"
-    | Pexp_override _ ->
-      Doc.text "Pexp_override not implemented in printer"
-    | Pexp_poly _ ->
-      Doc.text "Pexp_poly not implemented in printer"
-    | Pexp_object _ ->
-      Doc.text "Pexp_object not implemented in printer"
-    in
-    let shouldPrintItsOwnAttributes = match e.pexp_desc with
-    | Pexp_apply _
-    | Pexp_fun _
-    | Pexp_newtype _
-    | Pexp_setfield _
-    | Pexp_ifthenelse _ -> true
-    | Pexp_construct _ when ParsetreeViewer.hasJsxAttribute e.pexp_attributes -> true
-    | _ -> false
-    in
-    match e.pexp_attributes with
-    | [] -> printedExpression
-    | attrs when not shouldPrintItsOwnAttributes ->
-      Doc.group (
-        Doc.concat [
-          printAttributes attrs;
-          printedExpression;
-        ]
-      )
-    | _ -> printedExpression
-
-  and printPexpFun ~inCallback e cmtTbl =
-      let (attrsOnArrow, parameters, returnExpr) = ParsetreeViewer.funExpr e in
-      let (uncurried, attrs) =
-        ParsetreeViewer.processUncurriedAttribute attrsOnArrow
-      in
-      let (returnExpr, typConstraint) = match returnExpr.pexp_desc with
-      | Pexp_constraint (expr, typ) -> (
-          {expr with pexp_attributes = List.concat [
-            expr.pexp_attributes;
-            returnExpr.pexp_attributes;
-          ]},
-          Some typ
-        )
-      | _ -> (returnExpr, None)
-      in
-      let parametersDoc = printExprFunParameters
-        ~inCallback
-        ~uncurried
-        ~hasConstraint:(match typConstraint with | Some _ -> true | None -> false)
-        parameters cmtTbl in
-      let returnShouldIndent = match returnExpr.pexp_desc with
-      | Pexp_sequence _ | Pexp_let _ | Pexp_letmodule _ | Pexp_letexception _ | Pexp_open _ -> false
-      | _ -> true
-      in
-      let returnExprDoc =
-        let (optBraces, _) = ParsetreeViewer.processBracesAttr returnExpr in
-        let shouldInline = match (returnExpr.pexp_desc, optBraces) with
-        | (_, Some _) -> true
-        | ((Pexp_array _
-        | Pexp_tuple _
-        | Pexp_construct (_, Some _)
-        | Pexp_record _), _) -> true
-        | _ -> false
-        in
-        let returnDoc =
-          let doc = printExpressionWithComments returnExpr cmtTbl in
-          match Parens.expr returnExpr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces  -> printBraces doc returnExpr braces
-          | Nothing -> doc
-        in
-        if shouldInline then Doc.concat [
-          Doc.space;
-          returnDoc;
-        ] else
-          Doc.group (
-            if returnShouldIndent then
-              Doc.concat [
-                Doc.indent (
-                  Doc.concat [
-                    Doc.line;
-                    returnDoc;
-                  ]
-                );
-                if inCallback then Doc.softLine else Doc.nil;
-              ]
-            else
-              Doc.concat [
-                Doc.space;
-                returnDoc;
-              ]
-          )
-      in
-      let typConstraintDoc = match typConstraint with
-      | Some(typ) -> Doc.concat [
-          Doc.text ": ";
-          printTypExpr typ cmtTbl
-        ]
-      | _ -> Doc.nil
-      in
-      Doc.group (
-        Doc.concat [
-          printAttributes attrs;
-          parametersDoc;
-          typConstraintDoc;
-          Doc.text " =>";
-          returnExprDoc;
-        ]
-      )
-
-  and printTernaryOperand expr cmtTbl =
-    let doc = printExpressionWithComments expr cmtTbl in
-    match Parens.ternaryOperand expr with
-    | Parens.Parenthesized -> addParens doc
-    | Braced braces  -> printBraces doc expr braces
-    | Nothing -> doc
-
-  and printSetFieldExpr attrs lhs longidentLoc rhs loc cmtTbl =
-    let rhsDoc =
-      let doc = printExpressionWithComments rhs cmtTbl in
-      match Parens.setFieldExprRhs rhs with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces  -> printBraces doc rhs braces
-      | Nothing -> doc
-    in
-    let lhsDoc =
-      let doc = printExpressionWithComments lhs cmtTbl in
-      match Parens.fieldExpr lhs with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces  -> printBraces doc lhs braces
-      | Nothing -> doc
-    in
-    let shouldIndent = ParsetreeViewer.isBinaryExpression rhs in
-    let doc = Doc.group (Doc.concat [
-      lhsDoc;
-      Doc.dot;
-      printLidentPath longidentLoc cmtTbl;
-      Doc.text " =";
-      if shouldIndent then Doc.group (
-        Doc.indent (
-          (Doc.concat [Doc.line; rhsDoc])
-        )
-      ) else
-        Doc.concat [Doc.space; rhsDoc]
-    ]) in
-    let doc = match attrs with
-    | [] -> doc
-    | attrs ->
-      Doc.group (
-        Doc.concat [
-          printAttributes attrs;
-          doc
-        ]
-      )
-    in
-    printComments doc cmtTbl loc
-
-  and printTemplateLiteral expr cmtTbl =
-    let tag = ref "j" in
-    let rec walkExpr expr =
-      let open Parsetree in
-      match expr.pexp_desc with
-      | Pexp_apply (
-          {pexp_desc = Pexp_ident {txt = Longident.Lident "^"}},
-          [Nolabel, arg1; Nolabel, arg2]
-        ) ->
-          let lhs = walkExpr arg1 in
-          let rhs = walkExpr arg2 in
-          Doc.concat [lhs; rhs]
-      | Pexp_constant (Pconst_string (txt, Some prefix)) ->
-        tag := prefix;
-        Doc.text txt
-      | _ ->
-        let doc = printExpressionWithComments expr cmtTbl in
-        Doc.concat [Doc.text "${"; doc; Doc.rbrace]
-    in
-    let content = walkExpr expr in
-    Doc.concat [
-      if !tag = "j" then Doc.nil else Doc.text !tag;
-      Doc.text "`";
-      content;
-      Doc.text "`"
-    ]
-
-  and printUnaryExpression expr cmtTbl =
-    let printUnaryOperator op = Doc.text (
-      match op with
-      | "~+" -> "+"
-      | "~+." -> "+."
-      | "~-" -> "-"
-      | "~-." ->  "-."
-      | "not" -> "!"
-      | _ -> assert false
-    ) in
-    match expr.pexp_desc with
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [Nolabel, operand]
-      ) ->
-      let printedOperand =
-        let doc = printExpressionWithComments operand cmtTbl in
-        match Parens.unaryExprOperand operand with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc operand braces
-        | Nothing -> doc
-      in
-      let doc = Doc.concat [
-        printUnaryOperator operator;
-        printedOperand;
-      ] in
-      printComments doc cmtTbl expr.pexp_loc
-    | _ -> assert false
-
-  and printBinaryExpression (expr : Parsetree.expression) cmtTbl =
-    let printBinaryOperator ~inlineRhs operator =
-      let operatorTxt = match operator with
-      | "|." -> "->"
-      | "^" -> "++"
-      | "=" -> "=="
-      | "==" -> "==="
-      | "<>" -> "!="
-      | "!=" -> "!=="
-      | txt -> txt
-      in
-      let spacingBeforeOperator =
-        if operator = "|." then Doc.softLine
-        else if operator = "|>" then Doc.line
-        else Doc.space;
-      in
-      let spacingAfterOperator =
-        if operator = "|." then Doc.nil
-        else if operator = "|>" then Doc.space
-        else if inlineRhs then Doc.space else Doc.line
-      in
-      Doc.concat [
-        spacingBeforeOperator;
-        Doc.text operatorTxt;
-        spacingAfterOperator;
-      ]
-    in
-    let printOperand ~isLhs expr parentOperator =
-      let rec flatten ~isLhs expr parentOperator =
-        if ParsetreeViewer.isBinaryExpression expr then
-          begin match expr with
-          | {pexp_desc = Pexp_apply (
-              {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-              [_, left; _, right]
-            )} ->
-            if ParsetreeViewer.flattenableOperators parentOperator operator &&
-               not (ParsetreeViewer.hasAttributes expr.pexp_attributes)
-            then
-              let leftPrinted = flatten ~isLhs:true left operator in
-              let rightPrinted =
-                let (_, rightAttrs) =
-                  ParsetreeViewer.partitionPrinteableAttributes right.pexp_attributes
-                in
-                let doc =
-                  printExpressionWithComments
-                    {right with pexp_attributes = rightAttrs}
-                    cmtTbl
-                in
-                let doc = if Parens.flattenOperandRhs parentOperator right then
-                  Doc.concat [Doc.lparen; doc; Doc.rparen]
-                else
-                  doc
-                in
-                let printeableAttrs =
-                  ParsetreeViewer.filterPrinteableAttributes right.pexp_attributes
-                in
-                Doc.concat [printAttributes printeableAttrs; doc]
-              in
-              let doc = Doc.concat [
-                leftPrinted;
-                printBinaryOperator ~inlineRhs:false operator;
-                rightPrinted;
-              ] in
-              let doc =
-                if not isLhs && (Parens.rhsBinaryExprOperand operator expr) then
-                  Doc.concat [Doc.lparen; doc; Doc.rparen]
-                else doc
-              in
-              printComments doc cmtTbl expr.pexp_loc
-            else (
-              let doc = printExpressionWithComments {expr with pexp_attributes = []} cmtTbl in
-              let doc = if Parens.subBinaryExprOperand parentOperator operator ||
-                (expr.pexp_attributes <> [] &&
-                  (ParsetreeViewer.isBinaryExpression expr ||
-                ParsetreeViewer.isTernaryExpr expr))
-              then
-                Doc.concat [Doc.lparen; doc; Doc.rparen]
-              else doc
-              in Doc.concat [
-                printAttributes expr.pexp_attributes;
-                doc
-              ]
-            )
-          | _ -> assert false
-          end
-        else
-          begin match expr.pexp_desc with
-          | Pexp_setfield (lhs, field, rhs) ->
-            let doc = printSetFieldExpr expr.pexp_attributes lhs field rhs expr.pexp_loc cmtTbl  in
-            if isLhs then addParens doc else doc
-          | Pexp_apply(
-              {pexp_desc = Pexp_ident {txt = Longident.Lident "#="}},
-              [(Nolabel, lhs); (Nolabel, rhs)]
-            ) ->
-            let rhsDoc = printExpressionWithComments rhs cmtTbl in
-            let lhsDoc = printExpressionWithComments lhs cmtTbl in
-            (* TODO: unify indentation of "=" *)
-            let shouldIndent = ParsetreeViewer.isBinaryExpression rhs in
-            let doc = Doc.group (
-              Doc.concat [
-                lhsDoc;
-                Doc.text " =";
-                if shouldIndent then Doc.group (
-                  Doc.indent (Doc.concat [Doc.line; rhsDoc])
-                ) else
-                  Doc.concat [Doc.space; rhsDoc]
-              ]
-            ) in
-            let doc = match expr.pexp_attributes with
-            | [] -> doc
-            | attrs ->
-              Doc.group (
-                Doc.concat [
-                  printAttributes attrs;
-                  doc
-                ]
-              )
-            in
-            if isLhs then addParens doc else doc
-          | _ ->
-            let doc = printExpressionWithComments expr cmtTbl in
-            begin match Parens.binaryExprOperand ~isLhs expr with
-            | Parens.Parenthesized -> addParens doc
-            | Braced braces  -> printBraces doc expr braces
-            | Nothing -> doc
-            end
-          end
-      in
-      flatten ~isLhs expr parentOperator
-    in
-    match expr.pexp_desc with
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident (("|." | "|>") as op)}},
-        [Nolabel, lhs; Nolabel, rhs]
-      ) when not (
-          ParsetreeViewer.isBinaryExpression lhs ||
-          ParsetreeViewer.isBinaryExpression rhs
-      ) ->
-      let lhsDoc = printOperand ~isLhs:true lhs op in
-      let rhsDoc = printOperand ~isLhs:false rhs op in
-      Doc.group (
-        Doc.concat [
-          lhsDoc;
-          (match op with
-          | "|." -> Doc.text "->"
-          | "|>" -> Doc.text " |> "
-          | _ -> assert false);
-          rhsDoc;
-        ]
-      )
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [Nolabel, lhs; Nolabel, rhs]
-      ) ->
-      let right =
-        let operatorWithRhs =
-          let rhsDoc = printOperand ~isLhs:false rhs operator in
-          Doc.concat [
-            printBinaryOperator
-              ~inlineRhs:(ParsetreeViewer.shouldInlineRhsBinaryExpr rhs) operator;
-            rhsDoc;
-        ] in
-        if ParsetreeViewer.shouldIndentBinaryExpr expr then
-          Doc.group (Doc.indent operatorWithRhs)
-        else operatorWithRhs
-      in
-      let doc = Doc.group (
-        Doc.concat [
-          printOperand ~isLhs:true lhs operator;
-          right
-        ]
-      ) in
-      Doc.group (
-        Doc.concat [
-          printAttributes expr.pexp_attributes;
-          match Parens.binaryExpr {expr with
-            pexp_attributes = List.filter (fun attr ->
-              match attr with
-              | ({Location.txt = ("res.braces")}, _) -> false
-              | _ -> true
-            ) expr.pexp_attributes
-          } with
-          | Braced(bracesLoc) -> printBraces doc expr bracesLoc
-          | Parenthesized -> addParens doc
-          | Nothing -> doc;
-        ]
-      )
-    | _ -> Doc.nil
-
-  (* callExpr(arg1, arg2) *)
-  and printPexpApply expr cmtTbl =
-    match expr.pexp_desc with
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident "##"}},
-        [Nolabel, parentExpr; Nolabel, memberExpr]
-      ) ->
-        let parentDoc =
-          let doc = printExpressionWithComments parentExpr cmtTbl in
-          match Parens.unaryExprOperand parentExpr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces  -> printBraces doc parentExpr braces
-          | Nothing -> doc
-        in
-        let member =
-          let memberDoc = match memberExpr.pexp_desc with
-          | Pexp_ident lident ->
-            printComments (printLongident lident.txt) cmtTbl memberExpr.pexp_loc
-          | _ -> printExpressionWithComments memberExpr cmtTbl
-          in
-          Doc.concat [Doc.text "\""; memberDoc; Doc.text "\""]
-        in
-        Doc.group (Doc.concat [
-          printAttributes expr.pexp_attributes;
-          parentDoc;
-          Doc.lbracket;
-          member;
-          Doc.rbracket;
-        ])
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident "#="}},
-        [Nolabel, lhs; Nolabel, rhs]
-      ) ->
-        let rhsDoc =
-          let doc = printExpressionWithComments rhs cmtTbl in
-          match Parens.expr rhs with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces  -> printBraces doc rhs braces
-          | Nothing -> doc
-        in
-        (* TODO: unify indentation of "=" *)
-        let shouldIndent = not (ParsetreeViewer.isBracedExpr rhs) && ParsetreeViewer.isBinaryExpression rhs in
-        let doc = Doc.group(
-          Doc.concat [
-            printExpressionWithComments lhs cmtTbl;
-            Doc.text " =";
-            if shouldIndent then Doc.group (
-              Doc.indent (
-                (Doc.concat [Doc.line; rhsDoc])
-              )
-            ) else
-              Doc.concat [Doc.space; rhsDoc]
-          ]
-        ) in
-        begin match expr.pexp_attributes with
-        | [] -> doc
-        | attrs ->
-          Doc.group (
-            Doc.concat [
-              printAttributes attrs;
-              doc
-            ]
-          )
-        end
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "get")}},
-        [Nolabel, parentExpr; Nolabel, memberExpr]
-      ) ->
-        let member =
-          let memberDoc =
-            let doc = printExpressionWithComments memberExpr cmtTbl in
-            match Parens.expr memberExpr with
-            | Parens.Parenthesized -> addParens doc
-            | Braced braces  -> printBraces doc memberExpr braces
-            | Nothing -> doc
-          in
-          let shouldInline = match memberExpr.pexp_desc with
-          | Pexp_constant _ | Pexp_ident _ -> true
-          | _ -> false
-          in
-          if shouldInline then memberDoc else (
-            Doc.concat [
-              Doc.indent (
-                Doc.concat [
-                  Doc.softLine;
-                  memberDoc;
-                ]
-              );
-              Doc.softLine
-            ]
-          )
-        in
-        let parentDoc =
-          let doc = printExpressionWithComments parentExpr cmtTbl in
-          match Parens.unaryExprOperand parentExpr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces  -> printBraces doc parentExpr braces
-          | Nothing -> doc
-        in
-        Doc.group (Doc.concat [
-          printAttributes expr.pexp_attributes;
-          parentDoc;
-          Doc.lbracket;
-          member;
-          Doc.rbracket;
-        ])
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "set")}},
-        [Nolabel, parentExpr; Nolabel, memberExpr; Nolabel, targetExpr]
-      ) ->
-        let member =
-          let memberDoc =
-            let doc = printExpressionWithComments memberExpr cmtTbl in
-            match Parens.expr memberExpr with
-            | Parens.Parenthesized -> addParens doc
-            | Braced braces  -> printBraces doc memberExpr braces
-            | Nothing -> doc
-          in
-          let shouldInline = match memberExpr.pexp_desc with
-          | Pexp_constant _ | Pexp_ident _ -> true
-          | _ -> false
-          in
-          if shouldInline then memberDoc else (
-            Doc.concat [
-              Doc.indent (
-                Doc.concat [
-                  Doc.softLine;
-                  memberDoc;
-                ]
-              );
-              Doc.softLine
-            ]
-          )
-        in
-        let shouldIndentTargetExpr =
-          if ParsetreeViewer.isBracedExpr targetExpr then
-            false
-          else
-          ParsetreeViewer.isBinaryExpression targetExpr ||
-          (match targetExpr with
-          | {
-              pexp_attributes = [({Location.txt="res.ternary"}, _)];
-              pexp_desc = Pexp_ifthenelse (ifExpr, _, _)
-            }  ->
-            ParsetreeViewer.isBinaryExpression ifExpr || ParsetreeViewer.hasAttributes ifExpr.pexp_attributes
-        | { pexp_desc = Pexp_newtype _} -> false
-        | e ->
-            ParsetreeViewer.hasAttributes e.pexp_attributes ||
-            ParsetreeViewer.isArrayAccess e
-          )
-        in
-        let targetExpr =
-          let doc = printExpressionWithComments targetExpr cmtTbl in
-          match Parens.expr targetExpr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces  -> printBraces doc targetExpr braces
-          | Nothing -> doc
-        in
-        let parentDoc =
-          let doc = printExpressionWithComments parentExpr cmtTbl in
-          match Parens.unaryExprOperand parentExpr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces  -> printBraces doc parentExpr braces
-          | Nothing -> doc
-        in
-        Doc.group (
-          Doc.concat [
-          printAttributes expr.pexp_attributes;
-          parentDoc;
-          Doc.lbracket;
-          member;
-          Doc.rbracket;
-          Doc.text " =";
-          if shouldIndentTargetExpr then
-            Doc.indent (
-              Doc.concat [
-                Doc.line;
-                targetExpr;
-              ]
-            )
-          else
-            Doc.concat [
-              Doc.space;
-              targetExpr;
-            ]
-          ]
-        )
-    (* TODO: cleanup, are those branches even remotely performant? *)
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident lident},
-        args
-      ) when ParsetreeViewer.isJsxExpression expr ->
-      printJsxExpression lident args cmtTbl
-    | Pexp_apply (callExpr, args) ->
-      let args = List.map (fun (lbl, arg) ->
-        (lbl, ParsetreeViewer.rewriteUnderscoreApply arg)
-      ) args
-      in
-      let (uncurried, attrs) =
-        ParsetreeViewer.processUncurriedAttribute expr.pexp_attributes
-      in
-      let callExprDoc =
-        let doc = printExpressionWithComments callExpr cmtTbl in
-        match Parens.callExpr callExpr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc callExpr braces
-        | Nothing -> doc
-      in
-      if ParsetreeViewer.requiresSpecialCallbackPrintingFirstArg args then
-        let argsDoc =
-          printArgumentsWithCallbackInFirstPosition ~uncurried args cmtTbl
-        in
-        Doc.concat [
-          printAttributes attrs;
-          callExprDoc;
-          argsDoc;
-        ]
-      else if ParsetreeViewer.requiresSpecialCallbackPrintingLastArg args then
-        let argsDoc =
-          printArgumentsWithCallbackInLastPosition ~uncurried args cmtTbl
-        in
-        Doc.concat [
-          printAttributes attrs;
-          callExprDoc;
-          argsDoc;
-        ]
-      else
-        let argsDoc = printArguments ~uncurried args cmtTbl in
-        Doc.concat [
-          printAttributes attrs;
-          callExprDoc;
-          argsDoc;
-        ]
-    | _ -> assert false
-
-  and printJsxExpression lident args cmtTbl =
-    let name = printJsxName lident in
-    let (formattedProps, children) = printJsxProps args cmtTbl in
-    (* <div className="test" /> *)
-    let isSelfClosing = match children with | [] -> true | _ -> false in
-    Doc.group (
-      Doc.concat [
-        Doc.group (
-          Doc.concat [
-            printComments (Doc.concat [Doc.lessThan; name]) cmtTbl lident.Asttypes.loc;
-            formattedProps;
-            if isSelfClosing then Doc.concat [Doc.line; Doc.text "/>"] else Doc.nil
-          ]
-        );
-        if isSelfClosing then Doc.nil
-        else
-          Doc.concat [
-            Doc.greaterThan;
-            Doc.indent (
-              Doc.concat [
-                Doc.line;
-                printJsxChildren children cmtTbl;
-              ]
-            );
-            Doc.line;
-            Doc.text "</";
-            name;
-            Doc.greaterThan;
-          ]
-      ]
-    )
-
-  and printJsxFragment expr cmtTbl =
-    let opening = Doc.text "<>" in
-    let closing = Doc.text "</>" in
-    let (children, _) = ParsetreeViewer.collectListExpressions expr in
-    Doc.group (
-      Doc.concat [
-        opening;
-        begin match children with
-        | [] -> Doc.nil
-        | children ->
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printJsxChildren children cmtTbl;
-            ]
-          )
-        end;
-        Doc.line;
-        closing;
-      ]
-    )
-
-  and printJsxChildren (children: Parsetree.expression list) cmtTbl =
-    Doc.group (
-      Doc.join ~sep:Doc.line (
-        List.map (fun expr ->
-          let exprDoc = printExpressionWithComments expr cmtTbl in
-          match Parens.jsxChildExpr expr with
-          | Parenthesized | Braced _ ->
-            (* {(20: int)} make sure that we also protect the expression inside *)
-            addBraces (if Parens.bracedExpr expr then addParens exprDoc else exprDoc)
-          | Nothing -> exprDoc
-        ) children
-      )
-    )
-
-  and printJsxProps args cmtTbl =
-    let rec loop props args =
-      match args with
-      | [] -> (Doc.nil, [])
-      | [
-          (Asttypes.Labelled "children", children);
-          (
-            Asttypes.Nolabel,
-            {Parsetree.pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, None)}
-          )
-        ] ->
-        let formattedProps = Doc.indent (
-          match props with
-          | [] -> Doc.nil
-          | props ->
-            Doc.concat [
-              Doc.line;
-              Doc.group (
-                Doc.join ~sep:Doc.line (props |> List.rev)
-              )
-            ]
-        ) in
-        let (children, _) = ParsetreeViewer.collectListExpressions children in
-        (formattedProps, children)
-      | arg::args ->
-        let propDoc = printJsxProp arg cmtTbl in
-        loop (propDoc::props) args
-    in
-    loop [] args
-
-  and printJsxProp arg cmtTbl =
-    match arg with
-    | (
-        (Asttypes.Labelled lblTxt | Optional lblTxt) as lbl,
-        {
-          Parsetree.pexp_attributes = [({Location.txt = "res.namedArgLoc"; loc = argLoc}, _)];
-          pexp_desc = Pexp_ident {txt = Longident.Lident ident}
-        }
-      ) when lblTxt = ident (* jsx punning *) ->
-      begin match lbl with
-      | Nolabel -> Doc.nil
-      | Labelled _lbl ->
-        printComments (printIdentLike ident) cmtTbl argLoc
-      | Optional _lbl ->
-        let doc = Doc.concat [
-          Doc.question;
-          printIdentLike ident;
-        ] in
-        printComments doc cmtTbl argLoc
-      end
-    | (
-        (Asttypes.Labelled lblTxt | Optional lblTxt) as lbl,
-        {
-          Parsetree.pexp_attributes = [];
-          pexp_desc = Pexp_ident {txt = Longident.Lident ident}
-        }
-      ) when lblTxt = ident (* jsx punning when printing from Reason *) ->
-      begin match lbl with
-      | Nolabel -> Doc.nil
-      | Labelled _lbl -> printIdentLike ident
-      | Optional _lbl -> Doc.concat [
-          Doc.question;
-          printIdentLike ident;
-        ]
-      end
-    | (lbl, expr) ->
-      let (argLoc, expr) = match expr.pexp_attributes with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _)::attrs ->
-          (loc, {expr with pexp_attributes = attrs})
-      | _ ->
-        Location.none, expr
-      in
-      let lblDoc = match lbl with
-      | Asttypes.Labelled lbl ->
-        let lbl = printComments (printIdentLike lbl) cmtTbl argLoc in
-        Doc.concat [lbl; Doc.equal]
-      | Asttypes.Optional lbl ->
-        let lbl = printComments (printIdentLike lbl) cmtTbl argLoc in
-        Doc.concat [lbl; Doc.equal; Doc.question]
-      | Nolabel -> Doc.nil
-      in
-      let exprDoc =
-        let doc = printExpression expr cmtTbl in
-        match Parens.jsxPropExpr expr with
-        | Parenthesized | Braced(_) ->
-          (* {(20: int)} make sure that we also protect the expression inside *)
-          addBraces (if Parens.bracedExpr expr then addParens doc else doc)
-        | _ -> doc
-      in
-      let fullLoc = {argLoc with loc_end = expr.pexp_loc.loc_end} in
-      printComments
-        (Doc.concat [
-          lblDoc;
-          exprDoc;
-        ])
-        cmtTbl
-        fullLoc
-
-  (* div -> div.
-   * Navabar.createElement -> Navbar
-   * Staff.Users.createElement -> Staff.Users *)
-  and printJsxName {txt = lident} =
-    let rec flatten acc lident = match lident with
-    | Longident.Lident txt -> txt::acc
-    | Ldot (lident, txt) ->
-      let acc = if txt = "createElement" then acc else txt::acc in
-      flatten acc lident
-    | _ -> acc
-    in
-    match lident with
-    | Longident.Lident txt -> Doc.text txt
-    | _ as lident ->
-      let segments = flatten [] lident in
-      Doc.join ~sep:Doc.dot (List.map Doc.text segments)
-
-  and printArgumentsWithCallbackInFirstPosition ~uncurried args cmtTbl =
-    let (callback, printedArgs) = match args with
-    | (lbl, expr)::args ->
-      let lblDoc = match lbl with
-      | Asttypes.Nolabel -> Doc.nil
-      | Asttypes.Labelled txt ->
-        Doc.concat [
-          Doc.tilde; printIdentLike txt; Doc.equal;
-        ]
-      | Asttypes.Optional txt ->
-        Doc.concat [
-          Doc.tilde; printIdentLike txt; Doc.equal; Doc.question;
-        ]
-      in
-      let callback = Doc.concat [
-        lblDoc;
-        printPexpFun ~inCallback:true expr cmtTbl
-      ] in
-      let printedArgs = List.map (fun arg ->
-        printArgument arg cmtTbl
-      ) args |> Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line])
-      in
-      (callback, printedArgs)
-    | _ -> assert false
-    in
-    (* Thing.map((arg1, arg2) => MyModuleBlah.toList(argument), foo) *)
-    (* Thing.map((arg1, arg2) => {
-     *   MyModuleBlah.toList(argument)
-     * }, longArgumet, veryLooooongArgument)
-     *)
-    let fitsOnOneLine = Doc.concat [
-      if uncurried then Doc.text "(. " else Doc.lparen;
-      callback;
-      Doc.comma;
-      Doc.line;
-      printedArgs;
-      Doc.rparen;
-    ] in
-
-    (* Thing.map(
-     *   (param1, parm2) => doStuff(param1, parm2),
-     *   arg1,
-     *   arg2,
-     *   arg3,
-     * )
-     *)
-    let breakAllArgs = printArguments ~uncurried args cmtTbl in
-    Doc.customLayout [
-      fitsOnOneLine;
-      breakAllArgs;
-    ]
-
-  and printArgumentsWithCallbackInLastPosition ~uncurried args cmtTbl =
-    let rec loop acc args = match args with
-    | [] -> (Doc.nil, Doc.nil)
-    | [lbl, expr] ->
-      let lblDoc = match lbl with
-      | Asttypes.Nolabel -> Doc.nil
-      | Asttypes.Labelled txt ->
-        Doc.concat [
-          Doc.tilde; printIdentLike txt; Doc.equal;
-        ]
-      | Asttypes.Optional txt ->
-        Doc.concat [
-          Doc.tilde; printIdentLike txt; Doc.equal; Doc.question;
-        ]
-      in
-      let callback = printPexpFun ~inCallback:true expr cmtTbl in
-      (Doc.concat (List.rev acc), Doc.concat [lblDoc; callback])
-    | arg::args ->
-      let argDoc = printArgument arg cmtTbl in
-      loop (Doc.line::Doc.comma::argDoc::acc) args
-    in
-    let (printedArgs, callback) = loop [] args in
-
-    (* Thing.map(foo, (arg1, arg2) => MyModuleBlah.toList(argument)) *)
-    let fitsOnOneLine = Doc.concat [
-      if uncurried then Doc.text "(." else Doc.lparen;
-      printedArgs;
-      callback;
-      Doc.rparen;
-    ] in
-
-    (* Thing.map(longArgumet, veryLooooongArgument, (arg1, arg2) =>
-     *   MyModuleBlah.toList(argument)
-     * )
-     *)
-    let arugmentsFitOnOneLine =
-      Doc.concat [
-        if uncurried then Doc.text "(." else Doc.lparen;
-        Doc.softLine;
-        printedArgs;
-        Doc.breakableGroup ~forceBreak:true callback;
-        Doc.softLine;
-        Doc.rparen;
-      ]
-    in
-
-    (* Thing.map(
-     *   arg1,
-     *   arg2,
-     *   arg3,
-     *   (param1, parm2) => doStuff(param1, parm2)
-     * )
-     *)
-    let breakAllArgs = printArguments ~uncurried args cmtTbl in
-    Doc.customLayout [
-      fitsOnOneLine;
-      arugmentsFitOnOneLine;
-      breakAllArgs;
-    ]
-
-	and printArguments ~uncurried (args : (Asttypes.arg_label * Parsetree.expression) list) cmtTbl =
-		match args with
-		| [Nolabel, {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)}] ->
-      if uncurried then Doc.text "(.)" else Doc.text "()"
-    | [(Nolabel, arg)] when ParsetreeViewer.isHuggableExpression arg ->
-      let argDoc =
-        let doc = printExpressionWithComments arg cmtTbl in
-        match Parens.expr arg with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc arg braces
-        | Nothing -> doc
-      in
-      Doc.concat [
-        if uncurried then Doc.text "(." else Doc.lparen;
-        argDoc;
-        Doc.rparen;
-      ]
-		| args -> Doc.group (
-				Doc.concat [
-          if uncurried then Doc.text "(." else Doc.lparen;
-					Doc.indent (
-						Doc.concat [
-              if uncurried then Doc.line else Doc.softLine;
-							Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-								List.map (fun arg -> printArgument arg cmtTbl) args
-							)
-						]
-					);
-					Doc.trailingComma;
-					Doc.softLine;
-					Doc.rparen;
-				]
-			)
-
-(*
-   * argument ::=
-   *   | _                            (* syntax sugar *)
-   *   | expr
-   *   | expr : type
-   *   | ~ label-name
-   *   | ~ label-name
-   *   | ~ label-name ?
-   *   | ~ label-name =   expr
-   *   | ~ label-name =   _           (* syntax sugar *)
-   *   | ~ label-name =   expr : type
-   *   | ~ label-name = ? expr
-   *   | ~ label-name = ? _           (* syntax sugar *)
-   *   | ~ label-name = ? expr : type *)
-	and printArgument (argLbl, arg) cmtTbl =
-		match (argLbl, arg) with
-		(* ~a (punned)*)
-		| (
-				(Asttypes.Labelled lbl),
-        ({pexp_desc=Pexp_ident {txt = Longident.Lident name};
-          pexp_attributes = ([] | [({Location.txt = "res.namedArgLoc";}, _)])
-         } as argExpr)
-			) when lbl = name && not (ParsetreeViewer.isBracedExpr argExpr) ->
-      let loc = match arg.pexp_attributes with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _)::_ -> loc
-      | _ -> arg.pexp_loc
-      in
-      let doc = Doc.concat [
-        Doc.tilde;
-        printIdentLike lbl
-      ] in
-      printComments doc cmtTbl loc
-
-		(* ~a: int (punned)*)
-		| (
-				(Asttypes.Labelled lbl),
-        {pexp_desc = Pexp_constraint (
-            {pexp_desc = Pexp_ident {txt = Longident.Lident name}} as argExpr,
-            typ
-         );
-         pexp_loc;
-         pexp_attributes = ([] | [({Location.txt = "res.namedArgLoc";}, _)]) as attrs
-        }
-			) when lbl = name && not (ParsetreeViewer.isBracedExpr argExpr) ->
-      let loc = match attrs with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _)::_ ->
-        {loc with loc_end = pexp_loc.loc_end}
-      | _ -> arg.pexp_loc
-      in
-      let doc = Doc.concat [
-        Doc.tilde;
-        printIdentLike lbl;
-        Doc.text ": ";
-        printTypExpr typ cmtTbl;
-      ] in
-      printComments doc cmtTbl loc
-		(* ~a? (optional lbl punned)*)
-		| (
-				(Asttypes.Optional lbl),
-        {pexp_desc=Pexp_ident {txt = Longident.Lident name};
-         pexp_attributes = ([] | [({Location.txt = "res.namedArgLoc";}, _)])
-        }
-			) when lbl = name ->
-      let loc = match arg.pexp_attributes with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _)::_ -> loc
-      | _ -> arg.pexp_loc
-      in
-      let doc = Doc.concat [
-        Doc.tilde;
-        printIdentLike lbl;
-        Doc.question;
-      ] in
-      printComments doc cmtTbl loc
-		| (_lbl, expr) ->
-      let (argLoc, expr) = match expr.pexp_attributes with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _)::attrs ->
-          (loc, {expr with pexp_attributes = attrs})
-      | _ ->
-        expr.pexp_loc, expr
-      in
-			let printedLbl = match argLbl with
-			| Asttypes.Nolabel -> Doc.nil
-			| Asttypes.Labelled lbl ->
-        let doc = Doc.concat [Doc.tilde; printIdentLike lbl; Doc.equal] in
-        printComments doc cmtTbl argLoc
-			| Asttypes.Optional lbl ->
-        let doc = Doc.concat [Doc.tilde; printIdentLike lbl; Doc.equal; Doc.question] in
-        printComments doc cmtTbl argLoc
-			in
-			let printedExpr =
-        let doc = printExpressionWithComments expr cmtTbl in
-        match Parens.expr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      let loc = {argLoc with loc_end = expr.pexp_loc.loc_end} in
-      let doc = Doc.concat [
-        printedLbl;
-        printedExpr;
-      ] in
-      printComments doc cmtTbl loc
-
-  and printCases (cases: Parsetree.case list) cmtTbl =
-    Doc.breakableGroup ~forceBreak:true (
-      Doc.concat [
-        Doc.lbrace;
-          Doc.concat [
-            Doc.line;
-            printList
-              ~getLoc:(fun n -> {n.Parsetree.pc_lhs.ppat_loc with
-                loc_end =
-                  match ParsetreeViewer.processBracesAttr n.Parsetree.pc_rhs with
-                  | (None, _) -> n.pc_rhs.pexp_loc.loc_end
-                  | (Some ({loc}, _), _) -> loc.Location.loc_end
-              })
-              ~print:printCase
-              ~nodes:cases
-              cmtTbl
-          ];
-        Doc.line;
-        Doc.rbrace;
-      ]
-    )
-
-  and printCase (case: Parsetree.case) cmtTbl =
-    let rhs = match case.pc_rhs.pexp_desc with
-    | Pexp_let _
-    | Pexp_letmodule _
-    | Pexp_letexception _
-    | Pexp_open _
-    | Pexp_sequence _ ->
-      printExpressionBlock ~braces:(ParsetreeViewer.isBracedExpr case.pc_rhs) case.pc_rhs cmtTbl
-    | _ ->
-      let doc = printExpressionWithComments case.pc_rhs cmtTbl in
-      begin match Parens.expr case.pc_rhs with
-      | Parenthesized -> addParens doc
-      | _ -> doc
-      end
-
-    in
-    let guard = match case.pc_guard with
-    | None -> Doc.nil
-    | Some expr -> Doc.group (
-        Doc.concat [
-          Doc.line;
-          Doc.text "when ";
-          printExpressionWithComments expr cmtTbl;
-        ]
-      )
-    in
-    let shouldInlineRhs = match case.pc_rhs.pexp_desc with
-    | Pexp_construct ({txt = Longident.Lident ("()" | "true" | "false")}, _)
-    | Pexp_constant _
-    | Pexp_ident _ -> true
-    | _ when ParsetreeViewer.isHuggableRhs case.pc_rhs -> true
-    | _ -> false
-    in
-    let shouldIndentPattern = match case.pc_lhs.ppat_desc with
-    | Ppat_or _ -> false
-    | _ -> true
-    in
-    let patternDoc =
-      let doc = printPattern case.pc_lhs cmtTbl in
-      match case.pc_lhs.ppat_desc with
-      | Ppat_constraint _ -> addParens doc
-      | _ -> doc
-    in
-    let content = Doc.concat [
-      if shouldIndentPattern then Doc.indent patternDoc else patternDoc;
-      Doc.indent guard;
-      Doc.text " =>";
-      Doc.indent (
-        Doc.concat [
-          if shouldInlineRhs then Doc.space else Doc.line;
-          rhs;
-        ]
-      )
-    ] in
-    Doc.group (
-      Doc.concat [
-        Doc.text "| ";
-        content;
-      ]
-    )
-
-  and printExprFunParameters ~inCallback ~uncurried ~hasConstraint parameters cmtTbl =
-    match parameters with
-    (* let f = _ => () *)
-    | [ParsetreeViewer.Parameter {
-      attrs = [];
-      lbl = Asttypes.Nolabel;
-      defaultExpr = None;
-      pat = {Parsetree.ppat_desc = Ppat_any}
-      }] when not uncurried ->
-      if hasConstraint then Doc.text "(_)" else Doc.text "_"
-    (* let f = a => () *)
-    | [ParsetreeViewer.Parameter {
-      attrs = [];
-      lbl = Asttypes.Nolabel;
-      defaultExpr = None;
-      pat = {Parsetree.ppat_desc = Ppat_var stringLoc}
-    }] when not uncurried ->
-      let txtDoc =
-        let var = printIdentLike stringLoc.txt in
-        if hasConstraint then addParens var else var
-      in
-      printComments txtDoc cmtTbl stringLoc.loc
-    (* let f = () => () *)
-    | [ParsetreeViewer.Parameter {
-        attrs = [];
-        lbl = Asttypes.Nolabel;
-        defaultExpr = None;
-        pat = {ppat_desc = Ppat_construct({txt = Longident.Lident "()"}, None)}
-    }] when not uncurried ->
-      Doc.text "()"
-    (* let f = (~greeting, ~from as hometown, ~x=?) => () *)
-    | parameters ->
-      let lparen = if uncurried then Doc.text "(. " else Doc.lparen in
-      let shouldHug = ParsetreeViewer.parametersShouldHug parameters in
-      let printedParamaters = Doc.concat [
-        if shouldHug || inCallback then Doc.nil else Doc.softLine;
-        Doc.join ~sep:(Doc.concat [Doc.comma; if inCallback then Doc.space else Doc.line])
-          (List.map (fun p -> printExpFunParameter p cmtTbl) parameters)
-      ] in
-      Doc.group (
-        Doc.concat [
-          lparen;
-          if shouldHug || inCallback then
-            printedParamaters
-          else Doc.indent printedParamaters;
-          if shouldHug || inCallback then
-            Doc.nil
-          else
-            Doc.concat [Doc.trailingComma; Doc.softLine];
-          Doc.rparen;
-        ]
-      )
-
-  and printExpFunParameter parameter cmtTbl =
-    match parameter with
-    | ParsetreeViewer.NewTypes {attrs; locs = lbls} ->
-      Doc.group (
-        Doc.concat [
-          printAttributes attrs;
-          Doc.text "type ";
-          Doc.join ~sep:Doc.space (List.map (fun lbl ->
-            printComments (printIdentLike lbl.Asttypes.txt) cmtTbl lbl.Asttypes.loc
-          ) lbls)
-        ]
-      )
-    | Parameter {attrs; lbl; defaultExpr; pat = pattern} ->
-      let (isUncurried, attrs) = ParsetreeViewer.processUncurriedAttribute attrs in
-      let uncurried = if isUncurried then Doc.concat [Doc.dot; Doc.space] else Doc.nil in
-      let attrs = printAttributes attrs in
-      (* =defaultValue *)
-      let defaultExprDoc = match defaultExpr with
-      | Some expr -> Doc.concat [
-          Doc.text "=";
-          printExpressionWithComments expr cmtTbl
-        ]
-      | None -> Doc.nil
-      in
-      (* ~from as hometown
-       * ~from                   ->  punning *)
-      let labelWithPattern = match (lbl, pattern) with
-      | (Asttypes.Nolabel, pattern) -> printPattern pattern cmtTbl
-      | (
-          (Asttypes.Labelled lbl | Optional lbl),
-          {ppat_desc = Ppat_var stringLoc;
-           ppat_attributes = ([] | [({Location.txt = "res.namedArgLoc";}, _)])
-          }
-        ) when lbl = stringLoc.txt ->
-          (* ~d *)
-          Doc.concat [
-            Doc.text "~";
-            printIdentLike lbl;
-          ]
-      | (
-          (Asttypes.Labelled lbl | Optional lbl),
-           ({ppat_desc = Ppat_constraint ({ ppat_desc = Ppat_var { txt } }, typ);
-             ppat_attributes = ([] | [({Location.txt = "res.namedArgLoc";}, _)])
-            })
-        ) when lbl = txt ->
-          (* ~d: e *)
-          Doc.concat [
-            Doc.text "~";
-            printIdentLike lbl;
-            Doc.text ": ";
-            printTypExpr typ cmtTbl;
-          ]
-      | ((Asttypes.Labelled lbl | Optional lbl), pattern) ->
-          (* ~b as c *)
-        Doc.concat [
-          Doc.text "~";
-          printIdentLike lbl;
-          Doc.text " as ";
-          printPattern pattern cmtTbl
-        ]
-      in
-      let optionalLabelSuffix = match (lbl, defaultExpr) with
-      | (Asttypes.Optional _, None) -> Doc.text "=?"
-      | _ -> Doc.nil
-      in
-      let doc = Doc.group (
-        Doc.concat [
-          uncurried;
-          attrs;
-          labelWithPattern;
-          defaultExprDoc;
-          optionalLabelSuffix;
-        ]
-      ) in
-      let cmtLoc = match defaultExpr with
-      | None ->
-        begin match pattern.ppat_attributes with
-        | ({Location.txt = "res.namedArgLoc"; loc}, _)::_ ->
-          {loc with loc_end = pattern.ppat_loc.loc_end}
-        | _ -> pattern.ppat_loc
-        end
-      | Some expr ->
-        let startPos =  match pattern.ppat_attributes with
-        | ({Location.txt = "res.namedArgLoc"; loc}, _)::_ ->
-            loc.loc_start
-        | _ -> pattern.ppat_loc.loc_start
-        in {
-          pattern.ppat_loc with
-          loc_start = startPos;
-          loc_end = expr.pexp_loc.loc_end
-        }
-      in
-      printComments doc cmtTbl cmtLoc
-
-  and printExpressionBlock ~braces expr cmtTbl =
-    let rec collectRows acc expr = match expr.Parsetree.pexp_desc with
-    | Parsetree.Pexp_letmodule (modName, modExpr, expr2) ->
-      let name =
-        let doc = Doc.text modName.txt in
-        printComments doc cmtTbl modName.loc
-      in
-      let letModuleDoc = Doc.concat [
-        Doc.text "module ";
-        name;
-        Doc.text " = ";
-        printModExpr modExpr cmtTbl;
-      ] in
-      let loc = {expr.pexp_loc with loc_end = modExpr.pmod_loc.loc_end} in
-      collectRows ((loc, letModuleDoc)::acc) expr2
-    | Pexp_letexception (extensionConstructor, expr2) ->
-      let loc =
-        let loc = {expr.pexp_loc with loc_end = extensionConstructor.pext_loc.loc_end} in
-        match getFirstLeadingComment cmtTbl loc with
-        | None -> loc
-        | Some comment ->
-          let cmtLoc = Comment.loc comment in
-          {cmtLoc with loc_end = loc.loc_end}
-      in
-      let letExceptionDoc = printExceptionDef extensionConstructor cmtTbl in
-      collectRows ((loc, letExceptionDoc)::acc) expr2
-    | Pexp_open (overrideFlag, longidentLoc, expr2) ->
-      let openDoc = Doc.concat [
-        Doc.text "open";
-        printOverrideFlag overrideFlag;
-        Doc.space;
-        printLongidentLocation longidentLoc cmtTbl;
-      ] in
-      let loc = {expr.pexp_loc with loc_end = longidentLoc.loc.loc_end} in
-      collectRows ((loc, openDoc)::acc) expr2
-    | Pexp_sequence (expr1, expr2) ->
-      let exprDoc =
-        let doc = printExpression expr1 cmtTbl in
-        match Parens.expr expr1 with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr1 braces
-        | Nothing -> doc
-      in
-      let loc = expr1.pexp_loc in
-      collectRows ((loc, exprDoc)::acc) expr2
-    | Pexp_let (recFlag, valueBindings, expr2) ->
-      let loc =
-        let loc = match (valueBindings, List.rev valueBindings) with
-        | (vb::_, lastVb::_) -> {vb.pvb_loc with loc_end = lastVb.pvb_loc.loc_end}
-        | _ -> Location.none
-        in
-        match getFirstLeadingComment cmtTbl loc with
-        | None -> loc
-        | Some comment ->
-          let cmtLoc = Comment.loc comment in
-          {cmtLoc with loc_end = loc.loc_end}
-      in
-			let recFlag = match recFlag with
-			| Asttypes.Nonrecursive -> Doc.nil
-			| Asttypes.Recursive -> Doc.text "rec "
-			in
-      let letDoc = printValueBindings ~recFlag valueBindings cmtTbl in
-      (* let () = {
-       *   let () = foo()
-       *   ()
-       * }
-       * We don't need to print the () on the last line of the block
-       *)
-      begin match expr2.pexp_desc with
-      | Pexp_construct ({txt = Longident.Lident "()"}, _) ->
-        List.rev ((loc, letDoc)::acc)
-      | _ ->
-        collectRows ((loc, letDoc)::acc) expr2
-      end
-    | _ ->
-      let exprDoc =
-        let doc = printExpression expr cmtTbl in
-        match Parens.expr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces  -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      List.rev ((expr.pexp_loc, exprDoc)::acc)
-    in
-    let rows = collectRows [] expr in
-    let block =
-      printList
-        ~getLoc:fst
-        ~nodes:rows
-        ~print:(fun (_, doc) _ -> doc)
-        ~forceBreak:true
-        cmtTbl
-    in
-    Doc.breakableGroup ~forceBreak:true (
-      if braces then
-        Doc.concat [
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              block;
-            ]
-          );
-          Doc.line;
-          Doc.rbrace;
-        ]
-      else block
-    )
-
-  (*
-   * // user types:
-   * let f = (a, b) => { a + b }
-   *
-   * // printer: everything is on one line
-   * let f = (a, b) => { a + b }
-   *
-   * // user types: over multiple lines
-   * let f = (a, b) => {
-   *   a + b
-   * }
-   *
-   * // printer: over multiple lines
-   * let f = (a, b) => {
-   *   a + b
-   * }
-   *)
-  and printBraces doc expr bracesLoc =
-    let overMultipleLines =
-      let open Location in
-      bracesLoc.loc_end.pos_lnum > bracesLoc.loc_start.pos_lnum
-    in
-    match expr.Parsetree.pexp_desc with
-    | Pexp_letmodule _
-    | Pexp_letexception _
-    | Pexp_let _
-    | Pexp_open _
-    | Pexp_sequence _ ->
-      (* already has braces *)
-      doc
-    | _ ->
-      Doc.breakableGroup ~forceBreak:overMultipleLines (
-        Doc.concat [
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              if Parens.bracedExpr expr then addParens doc else doc;
-            ]
-          );
-          Doc.softLine;
-          Doc.rbrace;
-        ]
-      )
-
-  and printOverrideFlag overrideFlag = match overrideFlag with
-    | Asttypes.Override -> Doc.text "!"
-    | Fresh -> Doc.nil
-
-  and printDirectionFlag flag = match flag with
-    | Asttypes.Downto -> Doc.text " downto "
-    | Asttypes.Upto -> Doc.text " to "
-
-  and printRecordRow (lbl, expr) cmtTbl =
-    let cmtLoc = {lbl.loc with loc_end = expr.pexp_loc.loc_end} in
-    let doc = Doc.group (Doc.concat [
-      printLidentPath lbl cmtTbl;
-      Doc.text ": ";
-      (let doc = printExpressionWithComments expr cmtTbl in
-      match Parens.expr expr with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc expr braces
-      | Nothing -> doc);
-    ]) in
-    printComments doc cmtTbl cmtLoc
-
-  and printBsObjectRow (lbl, expr) cmtTbl =
-    let cmtLoc = {lbl.loc with loc_end = expr.pexp_loc.loc_end} in
-    let lblDoc =
-      let doc = Doc.concat [
-        Doc.text "\"";
-        printLongident lbl.txt;
-        Doc.text "\"";
-      ] in
-      printComments doc cmtTbl lbl.loc
-    in
-    let doc = Doc.concat [
-      lblDoc;
-      Doc.text ": ";
-      printExpressionWithComments expr cmtTbl
-    ] in
-    printComments doc cmtTbl cmtLoc
-
-  (* The optional loc indicates whether we need to print the attributes in
-   * relation to some location. In practise this means the following:
-   *  `@attr type t = string` -> on the same line, print on the same line
-   *  `@attr
-   *   type t = string` -> attr is on prev line, print the attributes
-   *   with a line break between, we respect the users' original layout *)
-  and printAttributes ?loc (attrs: Parsetree.attributes) =
-    match ParsetreeViewer.filterParsingAttrs attrs with
-    | [] -> Doc.nil
-    | attrs ->
-      let lineBreak = match loc with
-      | None -> Doc.line
-      | Some loc -> begin match List.rev attrs with
-        | ({loc = firstLoc}, _)::_ when loc.loc_start.pos_lnum > firstLoc.loc_end.pos_lnum ->
-          Doc.hardLine;
-        | _ -> Doc.line
-        end
-      in
-      Doc.concat [
-        Doc.group (Doc.join ~sep:Doc.line (List.map printAttribute attrs));
-        lineBreak;
-      ]
-
-  and printAttribute ((id, payload) : Parsetree.attribute) =
-      let attrName = Doc.concat [
-        Doc.text "@";
-        Doc.text id.txt
-      ] in
-        match payload with
-      | PStr [{pstr_desc = Pstr_eval (expr, attrs)}] ->
-        let exprDoc = printExpression expr CommentTable.empty in
-        let needsParens = match attrs with | [] -> false | _ -> true in
-        Doc.group (
-          Doc.concat [
-            attrName;
-            addParens (
-              Doc.concat [
-                printAttributes attrs;
-                if needsParens then addParens exprDoc else exprDoc;
-              ]
-            )
-          ]
-        )
-      | PTyp typ ->
-        Doc.group (
-          Doc.concat [
-            attrName;
-            Doc.lparen;
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.text ": ";
-                printTypExpr typ CommentTable.empty;
-              ]
-            );
-            Doc.softLine;
-            Doc.rparen;
-          ]
-        )
-      | _ -> attrName
-
-  and printAttributeWithComments ((id, payload) : Parsetree.attribute) cmtTbl =
-      let attrName = Doc.text ("@" ^ id.txt) in
-      match payload with
-      | PStr [{pstr_desc = Pstr_eval (expr, attrs)}] ->
-        let exprDoc = printExpressionWithComments expr cmtTbl in
-        let needsParens = match attrs with | [] -> false | _ -> true in
-        Doc.group (
-          Doc.concat [
-            attrName;
-            addParens (
-              Doc.concat [
-                printAttributes attrs;
-                if needsParens then addParens exprDoc else exprDoc;
-              ]
-            )
-          ]
-        )
-      | _ -> attrName
-
-  and printModExpr modExpr cmtTbl =
-    let doc = match modExpr.pmod_desc with
-    | Pmod_ident longidentLoc ->
-      printLongidentLocation longidentLoc cmtTbl
-    | Pmod_structure structure ->
-      Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              printStructure structure cmtTbl;
-            ];
-          );
-          Doc.softLine;
-          Doc.rbrace;
-        ]
-      )
-    | Pmod_unpack expr ->
-      let shouldHug = match expr.pexp_desc with
-      | Pexp_let _ -> true
-      | Pexp_constraint (
-          {pexp_desc = Pexp_let _ },
-          {ptyp_desc = Ptyp_package _packageType}
-        ) -> true
-      | _ -> false
-      in
-      let (expr, moduleConstraint) = match expr.pexp_desc with
-      | Pexp_constraint (
-          expr,
-          {ptyp_desc = Ptyp_package packageType; ptyp_loc}
-      ) ->
-        let packageDoc =
-          let doc = printPackageType ~printModuleKeywordAndParens:false packageType cmtTbl in
-          printComments doc cmtTbl ptyp_loc
-        in
-        let typeDoc = Doc.group (Doc.concat [
-          Doc.text ":";
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              packageDoc
-            ]
-          )
-        ]) in
-        (expr, typeDoc)
-      | _ -> (expr, Doc.nil)
-      in
-      let unpackDoc = Doc.group(Doc.concat [
-        printExpressionWithComments expr cmtTbl;
-        moduleConstraint;
-      ]) in
-      Doc.group (
-        Doc.concat [
-          Doc.text "unpack(";
-          if shouldHug then unpackDoc
-          else
-            Doc.concat [
-              Doc.indent (
-                Doc.concat [
-                  Doc.softLine;
-                  unpackDoc;
-                ]
-              );
-             Doc.softLine;
-            ];
-          Doc.rparen;
-        ]
-      )
-    | Pmod_extension extension ->
-      printExtensionWithComments ~atModuleLvl:false extension cmtTbl
-    | Pmod_apply _ ->
-      let (args, callExpr) = ParsetreeViewer.modExprApply modExpr in
-      let isUnitSugar = match args with
-      | [{pmod_desc = Pmod_structure []}] -> true
-      | _ -> false
-      in
-      let shouldHug = match args with
-      | [{pmod_desc = Pmod_structure _}] -> true
-      | _ -> false
-      in
-      Doc.group (
-        Doc.concat [
-          printModExpr callExpr cmtTbl;
-          if isUnitSugar then
-            printModApplyArg (List.hd args [@doesNotRaise]) cmtTbl
-          else
-            Doc.concat [
-              Doc.lparen;
-              if shouldHug then
-                printModApplyArg (List.hd args [@doesNotRaise]) cmtTbl
-              else
-                Doc.indent (
-                  Doc.concat [
-                    Doc.softLine;
-                    Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                      List.map (fun modArg -> printModApplyArg modArg cmtTbl) args
-                    )
-                  ]
-                );
-              if not shouldHug then
-                Doc.concat [
-                  Doc.trailingComma;
-                  Doc.softLine;
-                ]
-              else Doc.nil;
-              Doc.rparen;
-            ]
-        ]
-      )
-    | Pmod_constraint (modExpr, modType) ->
-      Doc.concat [
-        printModExpr modExpr cmtTbl;
-        Doc.text ": ";
-        printModType modType cmtTbl;
-      ]
-    | Pmod_functor _ ->
-      printModFunctor modExpr cmtTbl
-    in
-    printComments doc cmtTbl modExpr.pmod_loc
-
-  and printModFunctor modExpr cmtTbl =
-    let (parameters, returnModExpr) = ParsetreeViewer.modExprFunctor modExpr in
-    (* let shouldInline = match returnModExpr.pmod_desc with *)
-    (* | Pmod_structure _ | Pmod_ident _ -> true *)
-    (* | Pmod_constraint ({pmod_desc = Pmod_structure _}, _) -> true *)
-    (* | _ -> false *)
-    (* in *)
-    let (returnConstraint, returnModExpr) = match returnModExpr.pmod_desc with
-    | Pmod_constraint (modExpr, modType) ->
-      let constraintDoc =
-        let doc = printModType modType cmtTbl in
-        if Parens.modExprFunctorConstraint modType then addParens doc else doc
-      in
-      let modConstraint = Doc.concat [
-        Doc.text ": ";
-        constraintDoc;
-      ] in
-      (modConstraint, printModExpr modExpr cmtTbl)
-    | _ -> (Doc.nil, printModExpr returnModExpr cmtTbl)
-    in
-    let parametersDoc = match parameters with
-    | [(attrs, {txt = "*"}, None)] ->
-        let attrs = match attrs with
-        | [] -> Doc.nil
-        | attrs -> Doc.concat [
-          Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-          Doc.line;
-        ] in
-        Doc.group (Doc.concat [
-          attrs;
-          Doc.text "()"
-        ])
-    | [([], {txt = lbl}, None)] -> Doc.text lbl
-    | parameters ->
-      Doc.group (
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map (fun param -> printModFunctorParam param cmtTbl) parameters
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      )
-    in
-    Doc.group (
-      Doc.concat [
-        parametersDoc;
-        returnConstraint;
-        Doc.text " => ";
-        returnModExpr
-      ]
-    )
-
-  and printModFunctorParam (attrs, lbl, optModType) cmtTbl =
-    let cmtLoc = match optModType with
-    | None -> lbl.Asttypes.loc
-    | Some modType -> {lbl.loc with loc_end =
-        modType.Parsetree.pmty_loc.loc_end
-      }
-    in
-    let attrs = match attrs with
-    | [] -> Doc.nil
-    | attrs -> Doc.concat [
-      Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-      Doc.line;
-    ] in
-    let lblDoc =
-      let doc = Doc.text lbl.txt in
-      printComments doc cmtTbl lbl.loc
-    in
-    let doc = Doc.group (
-      Doc.concat [
-        attrs;
-        lblDoc;
-        (match optModType with
-        | None -> Doc.nil
-        | Some modType ->
-          Doc.concat [
-            Doc.text ": ";
-            printModType modType cmtTbl
-          ]);
-      ]
-    ) in
-    printComments doc cmtTbl cmtLoc
-
-  and printModApplyArg modExpr cmtTbl =
-    match modExpr.pmod_desc with
-    | Pmod_structure [] -> Doc.text "()"
-    | _ -> printModExpr modExpr cmtTbl
-
-
-  and printExceptionDef (constr : Parsetree.extension_constructor) cmtTbl =
-    let kind = match constr.pext_kind with
-    | Pext_rebind longident -> Doc.indent (
-        Doc.concat [
-          Doc.text " =";
-          Doc.line;
-          printLongidentLocation longident cmtTbl;
-        ]
-     )
-    | Pext_decl (Pcstr_tuple [], None) -> Doc.nil
-    | Pext_decl (args, gadt) ->
-      let gadtDoc = match gadt with
-      | Some typ -> Doc.concat [
-          Doc.text ": ";
-          printTypExpr typ cmtTbl
-        ]
-      | None -> Doc.nil
-      in
-      Doc.concat [
-        printConstructorArguments ~indent:false args cmtTbl;
-        gadtDoc
-      ]
-    in
-    let name =
-      printComments
-        (Doc.text constr.pext_name.txt)
-        cmtTbl
-        constr.pext_name.loc
-    in
-    let doc = Doc.group (
-      Doc.concat [
-        printAttributes constr.pext_attributes;
-        Doc.text "exception ";
-        name;
-        kind
-      ]
-    ) in
-    printComments doc cmtTbl constr.pext_loc
-
-  and printExtensionConstructor (constr : Parsetree.extension_constructor) cmtTbl i =
-    let attrs = printAttributes constr.pext_attributes in
-    let bar = if i > 0 then Doc.text "| "
-      else Doc.ifBreaks (Doc.text "| ") Doc.nil
-    in
-    let kind = match constr.pext_kind with
-    | Pext_rebind longident -> Doc.indent (
-        Doc.concat [
-          Doc.text " =";
-          Doc.line;
-          printLongidentLocation longident cmtTbl;
-        ]
-     )
-    | Pext_decl (Pcstr_tuple [], None) -> Doc.nil
-    | Pext_decl (args, gadt) ->
-      let gadtDoc = match gadt with
-      | Some typ -> Doc.concat [
-          Doc.text ": ";
-          printTypExpr typ cmtTbl;
-        ]
-      | None -> Doc.nil
-      in
-      Doc.concat [
-        printConstructorArguments ~indent:false args cmtTbl;
-        gadtDoc
-      ]
-    in
-    let name =
-      printComments (Doc.text constr.pext_name.txt) cmtTbl constr.pext_name.loc
-    in
-    Doc.concat [
-      bar;
-      Doc.group (
-        Doc.concat [
-          attrs;
-          name;
-          kind;
-        ]
-      )
-    ]
-
-  let printImplementation ~width (s: Parsetree.structure) comments =
-    let cmtTbl = CommentTable.make () in
-    CommentTable.walkStructure s cmtTbl comments;
-    (* CommentTable.log cmtTbl; *)
-    let doc = printStructure s cmtTbl in
-    (* Doc.debug doc; *)
-    let stringDoc = Doc.toString ~width doc in
-    print_string stringDoc
-
-  let printInterface ~width (s: Parsetree.signature) comments =
-    let cmtTbl = CommentTable.make () in
-    CommentTable.walkSignature s cmtTbl comments;
-    let stringDoc = Doc.toString ~width (printSignature s cmtTbl) in
-    print_string stringDoc
-
-end
-
-module Scanner = struct
-  type mode = Template | Jsx | Diamond
-
-  type t = {
-    filename: string;
-    src: bytes;
-    mutable err:
-      startPos: Lexing.position
-      -> endPos: Lexing.position
-      -> Diagnostics.category
-      -> unit;
-    mutable ch: int; (* current character *)
-    mutable offset: int; (* character offset *)
-    mutable rdOffset: int; (* reading offset (position after current character) *)
-    mutable lineOffset: int; (* current line offset *)
-    mutable lnum: int; (* current line number *)
-    mutable mode: mode list;
-  }
-
-  let setDiamondMode scanner =
-    scanner.mode <- Diamond::scanner.mode
-
-  let setTemplateMode scanner =
-    scanner.mode <- Template::scanner.mode
-
-  let setJsxMode scanner =
-    scanner.mode <- Jsx::scanner.mode
-
-  let popMode scanner mode =
-    match scanner.mode with
-    | m::ms when m = mode ->
-      scanner.mode <- ms
-    | _ -> ()
-
-  let inDiamondMode scanner = match scanner.mode with
-    | Diamond::_ -> true
-    | _ -> false
-
-  let inJsxMode scanner = match scanner.mode with
-    | Jsx::_ -> true
-    | _ -> false
-
-  let inTemplateMode scanner = match scanner.mode with
-    | Template::_ -> true
-    | _ -> false
-
-  let position scanner = Lexing.{
-    pos_fname = scanner.filename;
-    (* line number *)
-    pos_lnum = scanner.lnum;
-    (* offset of the beginning of the line (number
-       of characters between the beginning of the scanner and the beginning
-       of the line) *)
-    pos_bol = scanner.lineOffset;
-    (* [pos_cnum] is the offset of the position (number of
-       characters between the beginning of the scanner and the position). *)
-    pos_cnum = scanner.offset;
-  }
-
-  let next scanner =
-    if scanner.rdOffset < (Bytes.length scanner.src) then (
-      scanner.offset <- scanner.rdOffset;
-      let ch = (Bytes.get [@doesNotRaise]) scanner.src scanner.rdOffset in
-      scanner.rdOffset <- scanner.rdOffset + 1;
-      scanner.ch <- int_of_char ch
-    ) else (
-      scanner.offset <- Bytes.length scanner.src;
-      scanner.ch <- -1
-    )
-
-  let peek scanner =
-    if scanner.rdOffset < (Bytes.length scanner.src) then
-      int_of_char (Bytes.unsafe_get scanner.src scanner.rdOffset)
-    else
-      -1
-
-  let make b filename =
-    let scanner = {
-      filename;
-      src = b;
-      err = (fun ~startPos:_ ~endPos:_ _ -> ());
-      ch = CharacterCodes.space;
-      offset = 0;
-      rdOffset = 0;
-      lineOffset = 0;
-      lnum = 1;
-      mode = [];
-    } in
-    next scanner;
-    scanner
-
-  let skipWhitespace scanner =
-    let rec scan () =
-      if scanner.ch == CharacterCodes.space || scanner.ch == CharacterCodes.tab then (
-        next scanner;
-        scan()
-      ) else if CharacterCodes.isLineBreak scanner.ch then (
-        scanner.lineOffset <- scanner.offset + 1;
-        scanner.lnum <- scanner.lnum + 1;
-        next scanner;
-        scan()
-      ) else (
-        ()
-      )
-    in
-    scan()
-
-  let scanIdentifier scanner =
-    let startOff = scanner.offset in
-    while (
-      CharacterCodes.isLetter scanner.ch ||
-      CharacterCodes.isDigit scanner.ch ||
-      CharacterCodes.underscore == scanner.ch ||
-      CharacterCodes.singleQuote == scanner.ch
-    ) do
-      next scanner
-    done;
-    let str = Bytes.sub_string scanner.src startOff (scanner.offset - startOff) in
-    Token.lookupKeyword str
-
-  let scanDigits scanner ~base =
-    if base <= 10 then (
-      while CharacterCodes.isDigit scanner.ch || scanner.ch == CharacterCodes.underscore do
-        next scanner
-      done;
-    ) else (
-      while CharacterCodes.isHex scanner.ch || scanner.ch == CharacterCodes.underscore do
-        next scanner
-      done;
-    )
-
-  (* float: (0…9) { 0…9∣ _ } [. { 0…9∣ _ }] [(e∣ E) [+∣ -] (0…9) { 0…9∣ _ }]   *)
-  let scanNumber scanner =
-    let startOff = scanner.offset in
-
-    (* integer part *)
-    let base, _prefix = if scanner.ch != CharacterCodes.dot then (
-      if scanner.ch == CharacterCodes._0 then (
-        next scanner;
-        let ch = CharacterCodes.lower scanner.ch in
-        if ch == CharacterCodes.Lower.x then (
-          next scanner;
-          16, 'x'
-        ) else if ch == CharacterCodes.Lower.o then (
-          next scanner;
-          8, 'o'
-        ) else if ch == CharacterCodes.Lower.b then (
-          next scanner;
-          2, 'b'
-        ) else (
-          8, '0'
-        )
-      ) else (
-        10, ' '
-      )
-    ) else (10, ' ')
-    in
-    scanDigits scanner ~base;
-
-    (*  *)
-    let isFloat = if CharacterCodes.dot == scanner.ch then (
-      next scanner;
-      scanDigits scanner ~base;
-      true
-    ) else (
-      false
-    ) in
-
-    (* exponent part *)
-    let isFloat =
-      if let exp = CharacterCodes.lower scanner.ch in
-        exp == CharacterCodes.Lower.e || exp == CharacterCodes.Lower.p
-      then (
-        next scanner;
-        if scanner.ch == CharacterCodes.plus || scanner.ch == CharacterCodes.minus then
-          next scanner;
-        scanDigits scanner ~base;
-        true
-      ) else
-        isFloat
-    in
-    let literal =
-      Bytes.sub_string scanner.src startOff (scanner.offset - startOff)
-    in
-
-    (* suffix *)
-    let suffix =
-      if scanner.ch >= CharacterCodes.Lower.g && scanner.ch <= CharacterCodes.Lower.z
-         || scanner.ch >= CharacterCodes.Upper.g && scanner.ch <= CharacterCodes.Upper.z
-      then (
-        let ch = scanner.ch in
-        next scanner;
-        Some (Char.unsafe_chr ch)
-      ) else
-        None
-    in
-    if isFloat then
-      Token.Float {f = literal; suffix}
-    else
-      Token.Int {i = literal; suffix}
-
-  let scanExoticIdentifier scanner =
-    next scanner;
-    let buffer = Buffer.create 20 in
-    let startPos = position scanner in
-
-    let rec scan () =
-      if scanner.ch == CharacterCodes.eof then
-        let endPos = position scanner in
-        scanner.err ~startPos ~endPos (Diagnostics.message "Did you forget a \" here?")
-      else if scanner.ch == CharacterCodes.doubleQuote then (
-        next scanner
-      ) else if CharacterCodes.isLineBreak scanner.ch then (
-        scanner.lineOffset <- scanner.offset + 1;
-        scanner.lnum <- scanner.lnum + 1;
-        let endPos = position scanner in
-        scanner.err ~startPos ~endPos (Diagnostics.message "Did you forget a \" here?");
-        next scanner
-      ) else (
-        Buffer.add_char buffer ((Char.chr [@doesNotRaise]) scanner.ch);
-        next scanner;
-        scan()
-      )
-    in
-    scan();
-    Token.Lident (Buffer.contents buffer)
-
-  let scanStringEscapeSequence ~startPos scanner =
-    (* \ already consumed *)
-    if CharacterCodes.Lower.n == scanner.ch
-      || CharacterCodes.Lower.t == scanner.ch
-      || CharacterCodes.Lower.b == scanner.ch
-      || CharacterCodes.Lower.r == scanner.ch
-      || CharacterCodes.backslash == scanner.ch
-      || CharacterCodes.space == scanner.ch
-      || CharacterCodes.singleQuote == scanner.ch
-      || CharacterCodes.doubleQuote == scanner.ch
-    then
-      next scanner
-    else
-      let (n, base, max) =
-        if CharacterCodes.isDigit scanner.ch then
-          (* decimal *)
-          (3, 10, 255)
-        else if scanner.ch == CharacterCodes.Lower.o then
-          (* octal *)
-          let () = next scanner in
-          (3, 8, 255)
-        else if scanner.ch == CharacterCodes.Lower.x then
-          (* hex *)
-          let () = next scanner in
-          (2, 16, 255)
-        else
-          (* unknown escape sequence
-           * TODO: we should warn the user here. Let's not make it a hard error for now, for reason compat *)
-          (* let pos = position scanner in *)
-          (* let () = *)
-            (* let msg = if scanner.ch == -1 then *)
-              (* "unclosed escape sequence" *)
-            (* else "unknown escape sequence" *)
-            (* in *)
-            (* scanner.err ~startPos ~endPos:pos (Diagnostics.message msg) *)
-          (* in *)
-          (-1, -1, -1)
-        in
-        if n < 0 then ()
-        else
-          let rec while_ n x =
-            if n == 0 then x
-            else
-              let d = CharacterCodes.digitValue scanner.ch in
-              if d >= base then
-                let pos = position scanner in
-                let msg = if scanner.ch == -1 then
-                  "unclosed escape sequence"
-                else "unknown escape sequence"
-                in
-                scanner.err ~startPos ~endPos:pos (Diagnostics.message msg);
-                -1
-              else
-                let () = next scanner in
-                while_ (n - 1) (x * base + d)
-          in
-          let x = while_ n 0 in
-          if x > max then
-            let pos = position scanner in
-            let msg = "invalid escape sequence (value too high)" in
-            scanner.err ~startPos ~endPos:pos (Diagnostics.message msg);
-          ()
-
-  let scanString scanner =
-    let offs = scanner.offset in
-
-    let startPos = position scanner in
-    let rec scan () =
-      if scanner.ch == CharacterCodes.eof then
-        let endPos = position scanner in
-        scanner.err ~startPos ~endPos Diagnostics.unclosedString
-      else if scanner.ch == CharacterCodes.doubleQuote then (
-        next scanner;
-      ) else if scanner.ch == CharacterCodes.backslash then (
-        let startPos = position scanner in
-        next scanner;
-        scanStringEscapeSequence ~startPos scanner;
-        scan ()
-      ) else if CharacterCodes.isLineBreak scanner.ch then (
-        scanner.lineOffset <- scanner.offset + 1;
-        scanner.lnum <- scanner.lnum + 1;
-        next scanner;
-        scan ()
-      ) else (
-        next scanner;
-        scan ()
-      )
-    in
-    scan ();
-    Token.String (Bytes.sub_string scanner.src offs (scanner.offset - offs - 1))
-
-  (* I wonder if this gets inlined *)
-  let convertNumber scanner ~n ~base =
-    let x = ref 0 in
-    for _ = n downto 1 do
-      let d = CharacterCodes.digitValue scanner.ch in
-      x := (!x * base) + d;
-      next scanner
-    done;
-    !x
-
-  let scanEscape scanner =
-    (* let offset = scanner.offset in *)
-    let c = match scanner.ch with
-    | 98 (* b *)  -> next scanner; '\008'
-    | 110 (* n *) -> next scanner; '\010'
-    | 114 (* r *) -> next scanner; '\013'
-    | 116 (* t *) -> next scanner; '\009'
-    | ch when CharacterCodes.isDigit ch ->
-      let x = convertNumber scanner ~n:3 ~base:10 in
-      (Char.chr [@doesNotRaise]) x
-    | ch when ch == CharacterCodes.Lower.x ->
-      next scanner;
-      let x = convertNumber scanner ~n:2 ~base:16 in
-      (Char.chr [@doesNotRaise]) x
-    | ch when ch == CharacterCodes.Lower.o ->
-      next scanner;
-      let x = convertNumber scanner ~n:3 ~base:8 in
-      (Char.chr [@doesNotRaise]) x
-    | ch ->
-      next scanner;
-      (Char.chr [@doesNotRaise]) ch
-    in
-    next scanner; (* Consume \' *)
-    Token.Character c
-
-  let scanSingleLineComment scanner =
-    let startOff = scanner.offset in
-    let startPos = position scanner in
-    while not (CharacterCodes.isLineBreak scanner.ch) && scanner.ch >= 0 do
-      next scanner
-    done;
-    let endPos = position scanner in
-    Token.Comment (
-      Comment.makeSingleLineComment
-        ~loc:(Location.{loc_start = startPos; loc_end = endPos; loc_ghost = false})
-        (Bytes.sub_string scanner.src startOff (scanner.offset - startOff))
-    )
-
-  let scanMultiLineComment scanner =
-    let startOff = scanner.offset in
-    let startPos = position scanner in
-    let rec scan ~depth () =
-      if scanner.ch == CharacterCodes.asterisk &&
-         peek scanner == CharacterCodes.forwardslash then (
-        next scanner;
-        next scanner;
-        if depth > 0 then scan ~depth:(depth - 1) () else ()
-      ) else if scanner.ch == CharacterCodes.eof then (
-        let endPos = position scanner in
-        scanner.err ~startPos ~endPos Diagnostics.unclosedComment
-      ) else if scanner.ch == CharacterCodes.forwardslash
-        && peek scanner == CharacterCodes. asterisk then (
-        next scanner;
-        next scanner;
-        scan ~depth:(depth + 1) ()
-      ) else (
-        if CharacterCodes.isLineBreak scanner.ch then (
-          scanner.lineOffset <- scanner.offset + 1;
-          scanner.lnum <- scanner.lnum + 1;
-        );
-        next scanner;
-        scan ~depth ()
-      )
-    in
-    scan ~depth:0 ();
-    Token.Comment (
-      Comment.makeMultiLineComment
-        ~loc:(Location.{loc_start = startPos; loc_end = (position scanner); loc_ghost = false})
-        (Bytes.sub_string scanner.src startOff (scanner.offset - 2 - startOff))
-    )
-
-  let scanTemplate scanner =
-    let startOff = scanner.offset in
-    let startPos = position scanner in
-
-    let rec scan () =
-      if scanner.ch == CharacterCodes.eof then (
-        let endPos = position scanner in
-        scanner.err ~startPos ~endPos Diagnostics.unclosedTemplate;
-        popMode scanner Template;
-        Token.TemplateTail(
-          Bytes.sub_string scanner.src startOff (scanner.offset - 2 - startOff)
-        )
-      )
-      else if scanner.ch == CharacterCodes.backslash then (
-        next scanner;
-        if   scanner.ch == CharacterCodes.backtick
-          || scanner.ch == CharacterCodes.backslash
-          || scanner.ch == CharacterCodes.dollar
-        then next scanner;
-        scan()
-      ) else if scanner.ch == CharacterCodes.backtick then (
-        next scanner;
-        let contents =
-          Bytes.sub_string scanner.src startOff (scanner.offset - 1 - startOff)
-        in
-        popMode scanner Template;
-        Token.TemplateTail contents
-      ) else if scanner.ch == CharacterCodes.dollar &&
-                peek scanner == CharacterCodes.lbrace
-        then (
-          next scanner; (* consume $ *)
-          next scanner; (* consume { *)
-          let contents =
-            Bytes.sub_string scanner.src startOff (scanner.offset - 2 - startOff)
-          in
-          popMode scanner Template;
-          Token.TemplatePart contents
-      ) else (
-        if CharacterCodes.isLineBreak scanner.ch then (
-          scanner.lineOffset <- scanner.offset + 1;
-          scanner.lnum <- scanner.lnum + 1;
-        );
-        next scanner;
-        scan()
-      )
-    in
-    scan()
-
-  let rec scan scanner =
-    if not (inTemplateMode scanner) then skipWhitespace scanner;
-    let startPos = position scanner in
-    let ch = scanner.ch in
-    let token = if inTemplateMode scanner then
-      scanTemplate scanner
-    else if ch == CharacterCodes.underscore then (
-      let nextCh = peek scanner in
-      if nextCh == CharacterCodes.underscore || CharacterCodes.isDigit nextCh || CharacterCodes.isLetter nextCh then
-        scanIdentifier scanner
-      else (
-        next scanner;
-        Token.Underscore
-      )
-    ) else if CharacterCodes.isLetter ch then
-      scanIdentifier scanner
-    else if CharacterCodes.isDigit ch then
-      scanNumber scanner
-    else begin
-      next scanner;
-      if ch == CharacterCodes.dot then
-        if scanner.ch == CharacterCodes.dot then (
-          next scanner;
-          if scanner.ch == CharacterCodes.dot then (
-            next scanner;
-            Token.DotDotDot
-          ) else (
-            Token.DotDot
-          )
-        ) else (
-          Token.Dot
-        )
-      else if ch == CharacterCodes.doubleQuote then
-        scanString scanner
-      else if ch == CharacterCodes.singleQuote then (
-        if scanner.ch == CharacterCodes.backslash
-          && not ((peek scanner) == CharacterCodes.doubleQuote) (* start of exotic ident *)
-        then (
-          next scanner;
-          scanEscape scanner
-        ) else if (peek scanner) == CharacterCodes.singleQuote then (
-          let ch = scanner.ch in
-          next scanner;
-          next scanner;
-          Token.Character ((Char.chr [@doesNotRaise]) ch)
-        ) else (
-          SingleQuote
-        )
-      ) else if ch == CharacterCodes.bang then
-        if scanner.ch == CharacterCodes.equal then (
-          next scanner;
-          if scanner.ch == CharacterCodes.equal then (
-            next scanner;
-            Token.BangEqualEqual
-          ) else (
-            Token.BangEqual
-          )
-        ) else (
-          Token.Bang
-        )
-      else if ch == CharacterCodes.semicolon then
-        Token.Semicolon
-      else if ch == CharacterCodes.equal then (
-        if scanner.ch == CharacterCodes.greaterThan then (
-          next scanner;
-          Token.EqualGreater
-        ) else if scanner.ch == CharacterCodes.equal then (
-          next scanner;
-          if scanner.ch == CharacterCodes.equal then (
-            next scanner;
-            Token.EqualEqualEqual
-          ) else (
-            Token.EqualEqual
-          )
-        ) else (
-          Token.Equal
-        )
-      ) else if ch == CharacterCodes.bar then
-        if scanner.ch == CharacterCodes.bar then (
-          next scanner;
-          Token.Lor
-        ) else if scanner.ch == CharacterCodes.greaterThan then (
-          next scanner;
-          Token.BarGreater
-        ) else (
-          Token.Bar
-        )
-      else if ch == CharacterCodes.ampersand then
-        if scanner.ch == CharacterCodes.ampersand then (
-          next scanner;
-          Token.Land
-        ) else (
-          Token.Band
-        )
-      else if ch == CharacterCodes.lparen then
-        Token.Lparen
-      else if ch == CharacterCodes.rparen then
-        Token.Rparen
-      else if ch == CharacterCodes.lbracket then
-        Token.Lbracket
-      else if ch == CharacterCodes.rbracket then
-        Token.Rbracket
-      else if ch == CharacterCodes.lbrace then
-        Token.Lbrace
-      else if ch == CharacterCodes.rbrace then
-        Token.Rbrace
-      else if ch == CharacterCodes.comma then
-        Token.Comma
-      else if ch == CharacterCodes.colon then
-       if scanner.ch == CharacterCodes.equal then(
-          next scanner;
-          Token.ColonEqual
-        ) else if (scanner.ch == CharacterCodes.greaterThan) then (
-          next scanner;
-          Token.ColonGreaterThan
-        ) else (
-          Token.Colon
-        )
-      else if ch == CharacterCodes.backslash then
-        scanExoticIdentifier scanner
-      else if ch == CharacterCodes.forwardslash then
-        if scanner.ch == CharacterCodes.forwardslash then (
-          next scanner;
-          scanSingleLineComment scanner
-        ) else if (scanner.ch == CharacterCodes.asterisk) then (
-          next scanner;
-          scanMultiLineComment scanner
-        ) else if scanner.ch == CharacterCodes.dot then (
-          next scanner;
-          Token.ForwardslashDot
-        ) else (
-          Token.Forwardslash
-        )
-      else if ch == CharacterCodes.minus then
-        if scanner.ch == CharacterCodes.dot then (
-          next scanner;
-          Token.MinusDot
-        ) else if scanner.ch == CharacterCodes.greaterThan then (
-          next scanner;
-          Token.MinusGreater;
-        ) else (
-          Token.Minus
-        )
-      else if ch == CharacterCodes.plus then
-        if scanner.ch == CharacterCodes.dot then (
-          next scanner;
-          Token.PlusDot
-        ) else if scanner.ch == CharacterCodes.plus then (
-          next scanner;
-          Token.PlusPlus
-        ) else if scanner.ch == CharacterCodes.equal then (
-          next scanner;
-          Token.PlusEqual
-        ) else (
-          Token.Plus
-        )
-      else if ch == CharacterCodes.greaterThan then
-        if scanner.ch == CharacterCodes.equal && not (inDiamondMode scanner) then (
-          next scanner;
-          Token.GreaterEqual
-        ) else (
-          Token.GreaterThan
-        )
-      else if ch == CharacterCodes.lessThan then
-        (* Imagine the following: <div><
-         * < indicates the start of a new jsx-element, the parser expects
-         * the name of a new element after the <
-         * Example: <div> <div
-         * But what if we have a / here: example </ in  <div></div>
-         * This signals a closing element. To simulate the two-token lookahead,
-         * the </ is emitted as a single new token LessThanSlash *)
-        if inJsxMode scanner then (
-          skipWhitespace scanner;
-          if scanner.ch == CharacterCodes.forwardslash then
-            let () = next scanner in
-            Token.LessThanSlash
-          else
-            Token.LessThan
-        ) else if scanner.ch == CharacterCodes.equal then (
-          next scanner;
-          Token.LessEqual
-        ) else (
-          Token.LessThan
-        )
-      else if ch == CharacterCodes.hash then
-        if scanner.ch == CharacterCodes.hash then(
-          next scanner;
-          Token.HashHash
-        ) else if scanner.ch == CharacterCodes.equal then(
-          next scanner;
-          Token.HashEqual
-        ) else (
-          Token.Hash
-        )
-      else if ch == CharacterCodes.asterisk then
-        if scanner.ch == CharacterCodes.asterisk then (
-          next scanner;
-          Token.Exponentiation;
-        ) else if scanner.ch == CharacterCodes.dot then (
-          next scanner;
-          Token.AsteriskDot
-        ) else (
-          Token.Asterisk
-        )
-      else if ch == CharacterCodes.tilde then
-        Token.Tilde
-      else if ch == CharacterCodes.question then
-        Token.Question
-      else if ch == CharacterCodes.at then
-        if scanner.ch == CharacterCodes.at then (
-          next scanner;
-          Token.AtAt
-        ) else (
-          Token.At
-        )
-    else if ch == CharacterCodes.percent then
-      if scanner.ch == CharacterCodes.percent then (
-        next scanner;
-        Token.PercentPercent
-      ) else (
-        Token.Percent
-      )
-      else if ch == CharacterCodes.backtick  then
-        Token.Backtick
-      else if ch == -1 then
-        Token.Eof
-      else (
-        (* if we arrive here, we're dealing with an unkown character,
-         * report the error and continue scanning… *)
-        let endPos = position scanner in
-        scanner.err ~startPos ~endPos (Diagnostics.unknownUchar ch);
-        let (_, _, token) = scan scanner in
-        token
-      )
-    end in
-    let endPos = position scanner in
-    (startPos, endPos, token)
-
-  (* Imagine: <div> <Navbar /> <
-   * is `<` the start of a jsx-child? <div …
-   * or is it the start of a closing tag?  </div>
-   * reconsiderLessThan peeks at the next token and
-   * determines the correct token to disambiguate *)
-  let reconsiderLessThan scanner =
-    (* < consumed *)
-    skipWhitespace scanner;
-    if scanner.ch == CharacterCodes.forwardslash then
-      let () = next scanner in
-      Token.LessThanSlash
-    else
-      Token.LessThan
-
-  (* If an operator has whitespace around both sides, it's a binary operator *)
-  let isBinaryOp src startCnum endCnum =
-    if startCnum == 0 then false
-    else
-      let leftOk =
-        let c =
-          (startCnum - 1)
-          |> (Bytes.get [@doesNotRaise]) src
-          |> Char.code
-        in
-        c == CharacterCodes.space ||
-        c == CharacterCodes.tab ||
-        CharacterCodes.isLineBreak c
-      in
-      let rightOk =
-        let c =
-          if endCnum == Bytes.length src then -1
-          else endCnum |> (Bytes.get [@doesNotRaise]) src |> Char.code
-        in
-        c == CharacterCodes.space ||
-        c == CharacterCodes.tab ||
-        CharacterCodes.isLineBreak c ||
-        c == CharacterCodes.eof
-      in
-      leftOk && rightOk
-end
-
-(* AST for js externals *)
-module JsFfi = struct
-  type scope =
-    | Global
-    | Module of string (* bs.module("path") *)
-    | Scope of Longident.t (* bs.scope(/"window", "location"/) *)
-
-  type label_declaration = {
-    jld_attributes: Parsetree.attributes; [@live]
-    jld_name: string;
-    jld_alias: string;
-    jld_type: Parsetree.core_type;
-    jld_loc:  Location.t
-  }
-
-  type importSpec =
-    | Default of label_declaration
-    | Spec of label_declaration list
-
-  type import_description = {
-    jid_loc: Location.t;
-    jid_spec: importSpec;
-    jid_scope: scope;
-    jid_attributes:  Parsetree.attributes;
-  }
-
-  let decl ~attrs ~loc ~name ~alias ~typ = {
-    jld_loc = loc;
-    jld_attributes = attrs;
-    jld_name = name;
-    jld_alias = alias;
-    jld_type = typ
-  }
-
-  let importDescr ~attrs ~scope ~importSpec ~loc = {
-    jid_loc = loc;
-    jid_spec = importSpec;
-    jid_scope = scope;
-    jid_attributes = attrs;
-  }
-
-  let toParsetree importDescr =
-    let bsVal = (Location.mknoloc "bs.val", Parsetree.PStr []) in
-    let attrs = match importDescr.jid_scope with
-    | Global -> [bsVal]
-    (* @genType.import("./MyMath"),
-     * @genType.import(/"./MyMath", "default"/) *)
-    | Module s ->
-      let structure = [
-        Parsetree.Pconst_string (s, None)
-        |> Ast_helper.Exp.constant
-        |> Ast_helper.Str.eval
-      ] in
-      let genType = (Location.mknoloc "genType.import", Parsetree.PStr structure) in
-      [genType]
-    | Scope longident ->
-      let structureItem =
-        let expr = match Longident.flatten longident |> List.map (fun s ->
-          Ast_helper.Exp.constant (Parsetree.Pconst_string (s, None))
-        ) with
-        | [expr] -> expr
-        | [] as exprs | (_ as exprs) -> exprs |> Ast_helper.Exp.tuple
-        in
-        Ast_helper.Str.eval expr
-      in
-      let bsScope = (
-        Location.mknoloc "bs.scope",
-        Parsetree. PStr [structureItem]
-      ) in
-      [bsVal; bsScope]
-    in
-    let valueDescrs = match importDescr.jid_spec with
-    | Default decl ->
-      let prim = [decl.jld_name] in
-      let allAttrs =
-        List.concat [attrs; importDescr.jid_attributes]
-        |> List.map (fun attr -> match attr with
-          | (
-              {Location.txt = "genType.import"} as id,
-              Parsetree.PStr [{pstr_desc = Parsetree.Pstr_eval (moduleName, _) }]
-            ) ->
-            let default =
-              Parsetree.Pconst_string ("default", None) |> Ast_helper.Exp.constant
-            in
-            let structureItem =
-              [moduleName; default]
-              |> Ast_helper.Exp.tuple
-              |> Ast_helper.Str.eval
-            in
-            (id, Parsetree.PStr [structureItem])
-          | attr -> attr
-        )
-      in
-      [Ast_helper.Val.mk
-        ~loc:importDescr.jid_loc
-        ~prim
-        ~attrs:allAttrs
-        (Location.mknoloc decl.jld_alias)
-        decl.jld_type
-      |> Ast_helper.Str.primitive]
-    | Spec decls ->
-      List.map (fun decl ->
-        let prim = [decl.jld_name] in
-        let allAttrs = List.concat [attrs; decl.jld_attributes] in
-        Ast_helper.Val.mk
-          ~loc:importDescr.jid_loc
-          ~prim
-          ~attrs:allAttrs
-          (Location.mknoloc decl.jld_alias)
-          decl.jld_type
-        |> Ast_helper.Str.primitive ~loc:decl.jld_loc
-      ) decls
-    in
-    let jsFfiAttr = (Location.mknoloc "ns.jsFfi", Parsetree.PStr []) in
-    Ast_helper.Mod.structure ~loc:importDescr.jid_loc valueDescrs
-    |> Ast_helper.Incl.mk ~attrs:[jsFfiAttr] ~loc:importDescr.jid_loc
-    |> Ast_helper.Str.include_ ~loc:importDescr.jid_loc
-end
-
-module ParsetreeCompatibility = struct
-  let concatLongidents l1 l2 =
-    let parts1 = Longident.flatten l1 in
-    let parts2 = Longident.flatten l2 in
-    match List.concat [parts1; parts2] |> Longident.unflatten with
-    | Some longident -> longident
-    | None -> l2
-
-  (* TODO: support nested open's ? *)
-  let rec rewritePpatOpen longidentOpen pat =
-    let open Parsetree in
-    match pat.ppat_desc with
-    | Ppat_array (first::rest) ->
-      (* Color.[Red, Blue, Green] -> [Color.Red, Blue, Green] *)
-      {pat with ppat_desc = Ppat_array ((rewritePpatOpen longidentOpen first)::rest)}
-    | Ppat_tuple (first::rest) ->
-      (* Color.(Red, Blue, Green) -> (Color.Red, Blue, Green) *)
-      {pat with ppat_desc = Ppat_tuple ((rewritePpatOpen longidentOpen first)::rest)}
-    | Ppat_construct(
-        {txt = Longident.Lident "::"} as listConstructor,
-        Some ({ppat_desc=Ppat_tuple (pat::rest)} as element)
-      ) ->
-      (* Color.(list[Red, Blue, Green]) -> list[Color.Red, Blue, Green] *)
-      {pat with ppat_desc =
-        Ppat_construct (
-          listConstructor,
-          Some {element with ppat_desc = Ppat_tuple ((rewritePpatOpen longidentOpen pat)::rest)}
-        )
-      }
-    | Ppat_construct ({txt = constructor} as longidentLoc, optPattern) ->
-      (* Foo.(Bar(a)) -> Foo.Bar(a) *)
-      {pat with ppat_desc =
-        Ppat_construct (
-          {longidentLoc with txt = concatLongidents longidentOpen constructor},
-          optPattern
-        )
-      }
-    | Ppat_record (({txt = lbl} as longidentLoc, firstPat)::rest, flag) ->
-      (* Foo.{x} -> {Foo.x: x} *)
-      let firstRow = (
-        {longidentLoc with txt = concatLongidents longidentOpen lbl},
-        firstPat
-      ) in
-      {pat with ppat_desc = Ppat_record (firstRow::rest, flag)}
-    | Ppat_or (pat1, pat2) ->
-      {pat with ppat_desc = Ppat_or (
-        rewritePpatOpen longidentOpen pat1,
-        rewritePpatOpen longidentOpen pat2
-      )}
-    | Ppat_constraint (pattern, typ) ->
-      {pat with ppat_desc = Ppat_constraint (
-        rewritePpatOpen longidentOpen pattern,
-        typ
-      )}
-    | Ppat_type ({txt = constructor} as longidentLoc) ->
-      {pat with ppat_desc = Ppat_type (
-        {longidentLoc with txt = concatLongidents longidentOpen constructor}
-      )}
-    | Ppat_lazy p ->
-      {pat with ppat_desc = Ppat_lazy (rewritePpatOpen longidentOpen p)}
-    | Ppat_exception p ->
-      {pat with ppat_desc = Ppat_exception (rewritePpatOpen longidentOpen p)}
-    | _ -> pat
-
-  let rec rewriteReasonFastPipe expr =
-    let open Parsetree in
-    match expr.pexp_desc with
-    | Pexp_apply (
-        {pexp_desc = Pexp_apply (
-          {pexp_desc = Pexp_ident {txt = Longident.Lident "|."}} as op,
-          [Asttypes.Nolabel, lhs; Nolabel, rhs]
-        ); pexp_attributes = subAttrs},
-        args
-      ) ->
-      let rhsLoc = {rhs.pexp_loc with loc_end = expr.pexp_loc.loc_end} in
-      let newLhs =
-        let expr = rewriteReasonFastPipe lhs in
-        {expr with pexp_attributes = subAttrs}
-      in
-      let allArgs =
-        (Asttypes.Nolabel, newLhs)::[
-          Asttypes.Nolabel, Ast_helper.Exp.apply ~loc:rhsLoc rhs args
-        ]
-      in
-      Ast_helper.Exp.apply ~attrs:expr.pexp_attributes ~loc:expr.pexp_loc op allArgs
-    | _ -> expr
-
-  let makeReasonArityMapper ~forPrinter =
-    let open Ast_mapper in
-    { default_mapper with
-      expr = begin fun mapper expr ->
-        match expr with
-        (* Don't mind this case, Reason doesn't handle this. *)
-        (* | {pexp_desc = Pexp_variant (lbl, args); pexp_loc; pexp_attributes} -> *)
-          (* let newArgs = match args with *)
-          (* | (Some {pexp_desc = Pexp_tuple [{pexp_desc = Pexp_tuple _ } as sp]}) as args-> *)
-            (* if forPrinter then args else Some sp *)
-          (* | Some {pexp_desc = Pexp_tuple [sp]} -> Some sp *)
-          (* | _ -> args *)
-          (* in *)
-          (* default_mapper.expr mapper {pexp_desc=Pexp_variant(lbl, newArgs); pexp_loc; pexp_attributes} *)
-        | {pexp_desc=Pexp_construct(lid, args); pexp_loc; pexp_attributes} ->
-          let newArgs = match args with
-          | (Some {pexp_desc = Pexp_tuple [{pexp_desc = Pexp_tuple _ } as sp]}) as args ->
-            if forPrinter then args else Some sp
-          | Some {pexp_desc = Pexp_tuple [sp]} -> Some sp
-          | _ -> args
-          in
-          default_mapper.expr mapper { pexp_desc=Pexp_construct(lid, newArgs); pexp_loc; pexp_attributes}
-        | expr ->
-          default_mapper.expr mapper (rewriteReasonFastPipe expr)
-      end;
-      pat = begin fun mapper pattern ->
-        match pattern with
-        (* Don't mind this case, Reason doesn't handle this. *)
-        (* | {ppat_desc = Ppat_variant (lbl, args); ppat_loc; ppat_attributes} -> *)
-          (* let newArgs = match args with *)
-          (* | (Some {ppat_desc = Ppat_tuple [{ppat_desc = Ppat_tuple _} as sp]}) as args -> *)
-            (* if forPrinter then args else Some sp *)
-          (* | Some {ppat_desc = Ppat_tuple [sp]} -> Some sp *)
-          (* | _ -> args *)
-          (* in *)
-          (* default_mapper.pat mapper {ppat_desc = Ppat_variant (lbl, newArgs); ppat_loc; ppat_attributes;} *)
-        | {ppat_desc=Ppat_construct(lid, args);
-           ppat_loc;
-           ppat_attributes} ->
-           let new_args = match args with
-           | (Some {ppat_desc = Ppat_tuple [{ppat_desc = Ppat_tuple _} as sp]}) as args ->
-            if forPrinter then args else Some sp
-           | Some {ppat_desc = Ppat_tuple [sp]} -> Some sp
-           | _ -> args in
-           default_mapper.pat mapper { ppat_desc=Ppat_construct(lid, new_args); ppat_loc; ppat_attributes;}
-          | x -> default_mapper.pat mapper x
-      end;
-    }
-
-  let escapeTemplateLiteral s =
-    let len = String.length s in
-    let b = Buffer.create len in
-    let i = ref 0 in
-    while !i < len do
-      let c = (String.get [@doesNotRaise]) s !i in
-      if c = '`' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b '`';
-        incr i;
-      ) else if c = '$' then (
-        if !i + 1 < len then (
-          let c2 = (String.get [@doesNotRaise]) s (!i + 1) in
-          if c2 = '{' then (
-            Buffer.add_char b '\\';
-            Buffer.add_char b '$';
-            Buffer.add_char b '{';
-          ) else (
-            Buffer.add_char b c;
-            Buffer.add_char b c2;
-          );
-          i := !i + 2;
-        ) else (
-          Buffer.add_char b c;
-          incr i
-        )
-      ) else if c = '\\' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b '\\';
-        incr i;
-      ) else (
-        Buffer.add_char b c;
-        incr i
-      )
-    done;
-    Buffer.contents b
-
-  let escapeStringContents s =
-    let len = String.length s in
-    let b = Buffer.create len in
-
-    let i = ref 0 in
-
-    while !i < len do
-      let c = String.unsafe_get s !i in
-      if c = '\\' then (
-        incr i;
-        Buffer.add_char b c;
-        let c = String.unsafe_get s !i in
-        if !i < len then
-          let () = Buffer.add_char b c in
-          incr i
-        else
-          ()
-      ) else if c = '"' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b c;
-        incr i;
-      ) else (
-        Buffer.add_char b c;
-        incr i;
-      )
-    done;
-    Buffer.contents b
-
-  let looksLikeRecursiveTypeDeclaration typeDeclaration =
-    let open Parsetree in
-    let name = typeDeclaration.ptype_name.txt in
-    let rec checkKind kind =
-      match kind with
-      | Ptype_abstract | Ptype_open -> false
-      | Ptype_variant constructorDeclarations ->
-        List.exists checkConstructorDeclaration constructorDeclarations
-      | Ptype_record labelDeclarations ->
-        List.exists checkLabelDeclaration labelDeclarations
-
-    and checkConstructorDeclaration constrDecl =
-      checkConstructorArguments constrDecl.pcd_args
-      || (match constrDecl.pcd_res with
-      | Some typexpr ->
-        checkTypExpr typexpr
-      | None -> false
-      )
-
-    and checkLabelDeclaration labelDeclaration =
-      checkTypExpr labelDeclaration.pld_type
-
-    and checkConstructorArguments constrArg =
-      match constrArg with
-      | Pcstr_tuple types ->
-        List.exists checkTypExpr types
-      | Pcstr_record labelDeclarations ->
-        List.exists checkLabelDeclaration labelDeclarations
-
-    and checkTypExpr typ =
-      match typ.ptyp_desc with
-      | Ptyp_any -> false
-      | Ptyp_var _ -> false
-      | Ptyp_object _ -> false
-      | Ptyp_class _ -> false
-      | Ptyp_package _ -> false
-      | Ptyp_extension _ -> false
-      | Ptyp_arrow (_lbl, typ1, typ2) ->
-        checkTypExpr typ1 || checkTypExpr typ2
-      | Ptyp_tuple types ->
-        List.exists checkTypExpr types
-      | Ptyp_constr ({txt = longident}, types) ->
-        (match longident with
-        | Lident ident -> ident = name
-        | _ -> false
-        ) ||
-        List.exists checkTypExpr types
-      | Ptyp_alias (typ, _) -> checkTypExpr typ
-      | Ptyp_variant (rowFields, _, _) ->
-        List.exists checkRowFields rowFields
-      | Ptyp_poly (_, typ) ->
-        checkTypExpr typ
-
-    and checkRowFields rowField =
-      match rowField with
-      | Rtag (_, _, _, types) ->
-        List.exists checkTypExpr types
-      | Rinherit typexpr ->
-        checkTypExpr typexpr
-    in
-    checkKind typeDeclaration.ptype_kind
-
-
-  let filterReasonRawLiteral attrs =
-    List.filter (fun attr ->
-      match attr with
-      | ({Location.txt = ("reason.raw_literal")}, _) -> false
-      | _ -> true
-    ) attrs
-
-  let stringLiteralMapper stringData =
-    let isSameLocation l1 l2 =
-      let open Location in
-      l1.loc_start.pos_cnum == l2.loc_start.pos_cnum
-    in
-    let remainingStringData = stringData in
-    let open Ast_mapper in
-    { default_mapper with
-      expr = (fun mapper expr ->
-        match expr.pexp_desc with
-        | Pexp_constant (Pconst_string (_txt, None)) ->
-          begin match
-            List.find_opt (fun (_stringData, stringLoc) ->
-              isSameLocation stringLoc expr.pexp_loc
-            ) remainingStringData
-          with
-          | Some(stringData, _) ->
-            let stringData =
-              let attr = List.find_opt (fun attr -> match attr with
-              | ({Location.txt = ("reason.raw_literal")}, _) -> true
-              | _ -> false
-              ) expr.pexp_attributes in
-              match attr with
-              | Some (_, PStr [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string (raw, _))}, _)}]) ->
-                raw
-              | _ -> (String.sub [@doesNotRaise]) stringData 1 (String.length stringData - 2)
-              in
-            {expr with
-              pexp_attributes = filterReasonRawLiteral expr.pexp_attributes;
-              pexp_desc = Pexp_constant (Pconst_string (stringData, None))
-            }
-          | None ->
-            default_mapper.expr mapper expr
-          end
-        | _ -> default_mapper.expr mapper expr
-      )
-    }
-
-  let normalize =
-    let open Ast_mapper in
-    { default_mapper with
-      attributes = (fun mapper attrs ->
-        attrs
-        |> List.filter (fun attr ->
-          match attr with
-          | ({Location.txt = (
-                "reason.preserve_braces"
-              | "explicit_arity"
-              | "implicity_arity"
-            )}, _) -> false
-          | _ ->true
-        )
-        |> default_mapper.attributes mapper
-      );
-      pat = begin fun mapper p ->
-        match p.ppat_desc with
-        | Ppat_open ({txt = longidentOpen}, pattern) ->
-          let p = rewritePpatOpen longidentOpen pattern in
-          default_mapper.pat mapper p
-        | _ ->
-          default_mapper.pat mapper p
-      end;
-      expr = (fun mapper expr ->
-        match expr.pexp_desc with
-        | Pexp_constant (Pconst_string (txt, None)) ->
-          let raw = escapeStringContents txt in
-          let s = Parsetree.Pconst_string (raw, None) in
-          let expr = Ast_helper.Exp.constant
-            ~attrs:expr.pexp_attributes
-            ~loc:expr.pexp_loc s
-          in
-          expr
-        | Pexp_constant (Pconst_string (txt, tag)) ->
-          let s = Parsetree.Pconst_string ((escapeTemplateLiteral txt), tag) in
-          Ast_helper.Exp.constant
-            ~attrs:(mapper.attributes mapper expr.pexp_attributes)
-            ~loc:expr.pexp_loc
-            s
-        | Pexp_function cases ->
-          let loc = match (cases, List.rev cases) with
-          | (first::_), (last::_) ->
-            {first.pc_lhs.ppat_loc with loc_end = last.pc_rhs.pexp_loc.loc_end}
-          | _ -> Location.none
-          in
-          Ast_helper.Exp.fun_ ~loc
-            Asttypes.Nolabel None (Ast_helper.Pat.var (Location.mknoloc "x"))
-            (Ast_helper.Exp.match_ ~loc
-              (Ast_helper.Exp.ident (Location.mknoloc (Longident.Lident "x")))
-              (default_mapper.cases mapper cases)
-            )
-        | Pexp_apply (
-            {pexp_desc = Pexp_ident {txt = Longident.Lident "!"}},
-            [Asttypes.Nolabel, operand]
-          ) ->
-          (* turn `!foo` into `foo.contents` *)
-          Ast_helper.Exp.field ~loc:expr.pexp_loc ~attrs:expr.pexp_attributes
-            operand
-            (Location.mknoloc (Longident.Lident "contents"))
-        | Pexp_apply (
-            {pexp_desc = Pexp_ident {txt = Longident.Lident "##"}} as op,
-            [Asttypes.Nolabel, lhs; Nolabel, ({pexp_desc = Pexp_constant (Pconst_string (txt, None))} as stringExpr)]
-          ) ->
-          let ident = Ast_helper.Exp.ident ~loc:stringExpr.pexp_loc
-            (Location.mkloc (Longident.Lident txt) stringExpr.pexp_loc)
-          in
-          Ast_helper.Exp.apply ~loc:expr.pexp_loc ~attrs:expr.pexp_attributes
-            op [Asttypes.Nolabel, lhs; Nolabel, ident]
-        | Pexp_apply (
-            {pexp_desc = Pexp_ident {txt = Longident.Lident "@@"}},
-            [Asttypes.Nolabel, callExpr; Nolabel, argExpr]
-          ) ->
-          Ast_helper.Exp.apply (mapper.expr mapper callExpr) [
-            Asttypes.Nolabel, mapper.expr mapper argExpr
-          ]
-        | Pexp_apply (
-            {pexp_desc = Pexp_ident {txt = Longident.Lident "@"}},
-            [Nolabel, arg1; Nolabel, arg2]
-          ) ->
-          let listConcat = Longident.Ldot (Longident.Lident "List", "append") in
-          Ast_helper.Exp.apply
-            (Ast_helper.Exp.ident (Location.mknoloc listConcat))
-            [Nolabel, mapper.expr mapper arg1; Nolabel, mapper.expr mapper arg2]
-        | Pexp_match (
-            condition,
-            [
-              {pc_lhs = {ppat_desc = Ppat_construct ({txt = Longident.Lident "true"}, None)}; pc_rhs = thenExpr };
-              {pc_lhs = {ppat_desc = Ppat_construct ({txt = Longident.Lident "false"}, None)}; pc_rhs = elseExpr };
-            ]
-          ) ->
-          let ternaryMarker = (Location.mknoloc "res.ternary", Parsetree.PStr []) in
-          Ast_helper.Exp.ifthenelse
-            ~loc:expr.pexp_loc
-            ~attrs:(ternaryMarker::expr.pexp_attributes)
-            (default_mapper.expr mapper condition)
-            (default_mapper.expr mapper thenExpr)
-            (Some (default_mapper.expr mapper elseExpr))
-        | _ -> default_mapper.expr mapper expr
-      );
-      structure_item = begin fun mapper structureItem ->
-        match structureItem.pstr_desc with
-        (* heuristic: if we have multiple type declarations, mark them recursive *)
-        | Pstr_type (recFlag, typeDeclarations) ->
-          let flag = match typeDeclarations with
-          | [td] ->
-            if looksLikeRecursiveTypeDeclaration td then Asttypes.Recursive
-            else Asttypes.Nonrecursive
-          | _ -> recFlag
-          in
-          {structureItem with pstr_desc = Pstr_type (
-            flag,
-            List.map (fun typeDeclaration ->
-              default_mapper.type_declaration mapper typeDeclaration
-            ) typeDeclarations
-          )}
-        | _ -> default_mapper.structure_item mapper structureItem
-      end;
-      signature_item = begin fun mapper signatureItem ->
-        match signatureItem.psig_desc with
-        (* heuristic: if we have multiple type declarations, mark them recursive *)
-        | Psig_type (recFlag, typeDeclarations) ->
-          let flag = match typeDeclarations with
-          | [td] ->
-            if looksLikeRecursiveTypeDeclaration td then Asttypes.Recursive
-            else Asttypes.Nonrecursive
-          | _ -> recFlag
-          in
-          {signatureItem with psig_desc = Psig_type (
-            flag,
-            List.map (fun typeDeclaration ->
-              default_mapper.type_declaration mapper typeDeclaration
-            ) typeDeclarations
-          )}
-        | _ -> default_mapper.signature_item mapper signatureItem
-      end;
-      value_binding = begin fun mapper vb ->
-       match vb with
-       | {
-           pvb_pat = {ppat_desc = Ppat_var _} as pat;
-           pvb_expr = {pexp_loc = expr_loc; pexp_desc = Pexp_constraint (expr, typ) }
-         } when expr_loc.loc_ghost ->
-        (* let t: t = (expr : t) -> let t: t = expr *)
-        let typ = default_mapper.typ mapper typ in
-        let pat =  default_mapper.pat mapper pat in
-        let expr = mapper.expr mapper expr in
-        let newPattern = Ast_helper.Pat.constraint_
-          ~loc:{pat.ppat_loc with loc_end = typ.ptyp_loc.loc_end}
-          pat typ in
-        {vb with
-          pvb_pat = newPattern;
-          pvb_expr = expr;
-          pvb_attributes = default_mapper.attributes mapper vb.pvb_attributes}
-       | {
-           pvb_pat = {ppat_desc = Ppat_constraint (pat, {ptyp_desc = Ptyp_poly ([], _)})} ;
-           pvb_expr = {pexp_loc = expr_loc; pexp_desc = Pexp_constraint (expr, typ) }
-         } when expr_loc.loc_ghost ->
-        (* let t: . t = (expr : t) -> let t: t = expr *)
-        let typ = default_mapper.typ mapper typ in
-        let pat =  default_mapper.pat mapper pat in
-        let expr = mapper.expr mapper expr in
-        let newPattern = Ast_helper.Pat.constraint_
-          ~loc:{pat.ppat_loc with loc_end = typ.ptyp_loc.loc_end}
-          pat typ in
-        {vb with
-          pvb_pat = newPattern;
-          pvb_expr = expr;
-          pvb_attributes = default_mapper.attributes mapper vb.pvb_attributes}
-      | _ -> default_mapper.value_binding mapper vb
-      end;
-    }
-
-  let normalizeReasonArityStructure ~forPrinter s =
-    let mapper = makeReasonArityMapper ~forPrinter in
-    mapper.Ast_mapper.structure mapper s
-
-  let normalizeReasonAritySignature ~forPrinter s =
-    let mapper = makeReasonArityMapper ~forPrinter in
-    mapper.Ast_mapper.signature mapper s
-
-  let structure s = normalize.Ast_mapper.structure normalize s
-  let signature s = normalize.Ast_mapper.signature normalize s
-
-  let replaceStringLiteralStructure stringData structure =
-    let mapper = stringLiteralMapper stringData in
-    mapper.Ast_mapper.structure mapper structure
-
-  let replaceStringLiteralSignature stringData signature =
-    let mapper = stringLiteralMapper stringData in
-    mapper.Ast_mapper.signature mapper signature
-end
-
-module OcamlParser = Parser
-
-module Parser = struct
-  type mode = ParseForTypeChecker | Default
-
-  type regionStatus = Report | Silent
-
-  type t = {
-    mode: mode;
-    mutable scanner: Scanner.t;
-    mutable token: Token.t;
-    mutable startPos: Lexing.position;
-    mutable endPos: Lexing.position;
-    mutable prevEndPos: Lexing.position;
-    mutable breadcrumbs: (Grammar.t * Lexing.position) list;
-    mutable errors: Reporting.parseError list;
-    mutable diagnostics: Diagnostics.t list;
-    mutable comments: Comment.t list;
-    mutable regions: regionStatus ref list;
-  }
-
-  let err ?startPos ?endPos p error =
-    let d = Diagnostics.make
-      ~filename:p.scanner.filename
-      ~startPos:(match startPos with | Some pos -> pos | None -> p.startPos)
-      ~endPos:(match endPos with | Some pos -> pos | None -> p.endPos)
-      error
-    in
-    try
-      if (!(List.hd p.regions) = Report) then (
-        p.diagnostics <- d::p.diagnostics;
-        List.hd p.regions := Silent
-      )
-    with Failure _ -> ()
-
-  let beginRegion p =
-    p.regions <- ref Report :: p.regions
-  let endRegion p =
-    try p.regions <- List.tl p.regions with Failure _ -> ()
-
-   (* Advance to the next non-comment token and store any encountered comment
-    * in the parser's state. Every comment contains the end position of it's
-    * previous token to facilite comment interleaving *)
-   let rec next ?prevEndPos p =
-     let prevEndPos = match prevEndPos with Some pos -> pos | None -> p.endPos in
-     let (startPos, endPos, token) = Scanner.scan p.scanner in
-     match token with
-     | Comment c ->
-       Comment.setPrevTokEndPos c p.endPos;
-       p.comments <- c::p.comments;
-       p.prevEndPos <- p.endPos;
-       p.endPos <- endPos;
-       next ~prevEndPos p
-     | _ ->
-       p.token <- token;
-       (* p.prevEndPos <- prevEndPos; *)
-       p.prevEndPos <- prevEndPos;
-       p.startPos <- startPos;
-       p.endPos <- endPos
-
-  let checkProgress ~prevEndPos ~result p =
-    if p.endPos == prevEndPos
-    then None
-    else Some result
-
-  let make ?(mode=ParseForTypeChecker) src filename =
-    let scanner = Scanner.make (Bytes.of_string src) filename in
-    let parserState = {
-      mode;
-      scanner;
-      token = Token.Eof;
-      startPos = Lexing.dummy_pos;
-      prevEndPos = Lexing.dummy_pos;
-      endPos = Lexing.dummy_pos;
-      breadcrumbs = [];
-      errors = [];
-      diagnostics = [];
-      comments = [];
-      regions = [ref Report];
-    } in
-    parserState.scanner.err <- (fun ~startPos ~endPos error ->
-      let diagnostic = Diagnostics.make
-        ~filename
-        ~startPos
-        ~endPos
-        error
-      in
-      parserState.diagnostics <- diagnostic::parserState.diagnostics
-    );
-    next parserState;
-    parserState
-
-  let leaveBreadcrumb p circumstance =
-    let crumb = (circumstance, p.startPos) in
-    p.breadcrumbs <- crumb::p.breadcrumbs
-
-  let eatBreadcrumb p =
-    match p.breadcrumbs with
-    | [] -> ()
-    | _::crumbs -> p.breadcrumbs <- crumbs
-
-  let optional p token =
-    if p.token = token then
-      let () = next p in true
-    else
-      false
-
-  let expect ?grammar token p =
-    if p.token = token then
-      next p
-    else
-      let error = Diagnostics.expected ?grammar p.prevEndPos token in
-      err ~startPos:p.prevEndPos p error
-
-  (* Don't use immutable copies here, it trashes certain heuristics
-   * in the ocaml compiler, resulting in massive slowdowns of the parser *)
-  let lookahead p callback =
-    let err = p.scanner.err in
-    let ch = p.scanner.ch in
-    let offset = p.scanner.offset in
-    let rdOffset = p.scanner.rdOffset in
-    let lineOffset = p.scanner.lineOffset in
-    let lnum = p.scanner.lnum in
-    let mode = p.scanner.mode in
-    let token = p.token in
-    let startPos = p.startPos in
-    let endPos = p.endPos in
-    let prevEndPos = p.prevEndPos in
-    let breadcrumbs = p.breadcrumbs in
-    let errors = p.errors in
-    let diagnostics = p.diagnostics in
-    let comments = p.comments in
-
-    let res = callback p in
-
-    p.scanner.err <- err;
-    p.scanner.ch <- ch;
-    p.scanner.offset <- offset;
-    p.scanner.rdOffset <- rdOffset;
-    p.scanner.lineOffset <- lineOffset;
-    p.scanner.lnum <- lnum;
-    p.scanner.mode <- mode;
-    p.token <- token;
-    p.startPos <- startPos;
-    p.endPos <- endPos;
-    p.prevEndPos <- prevEndPos;
-    p.breadcrumbs <- breadcrumbs;
-    p.errors <- errors;
-    p.diagnostics <- diagnostics;
-    p.comments <- comments;
-
-    res
-end
-
-module NapkinScript = struct
-  let mkLoc startLoc endLoc = Location.{
-    loc_start = startLoc;
-    loc_end = endLoc;
-    loc_ghost = false;
-  }
-
-
-  module Recover = struct
-    type action = unit option (* None is abort, Some () is retry *)
-
-    let defaultExpr () =
-      let id = Location.mknoloc "napkinscript.exprhole" in
-      Ast_helper.Exp.mk (Pexp_extension (id, PStr []))
-
-    let defaultType () =
-      let id = Location.mknoloc "napkinscript.typehole" in
-      Ast_helper.Typ.extension (id, PStr [])
-
-    let defaultPattern () =
-      let id = Location.mknoloc "napkinscript.patternhole" in
-      Ast_helper.Pat.extension (id, PStr [])
-      (* Ast_helper.Pat.any  () *)
-
-    let defaultModuleExpr () = Ast_helper.Mod.structure []
-    let defaultModuleType () = Ast_helper.Mty.signature []
-
-    let recoverEqualGreater p =
-      Parser.expect EqualGreater p;
-      match p.Parser.token with
-      | MinusGreater -> Parser.next p
-      | _ -> ()
-
-    let shouldAbortListParse p =
-      let rec check breadcrumbs =
-        match breadcrumbs with
-        | [] -> false
-        | (grammar, _)::rest ->
-          if Grammar.isPartOfList grammar p.Parser.token then
-            true
-          else
-            check rest
-      in
-      check p.breadcrumbs
-  end
-
-  module ErrorMessages = struct
-    let listPatternSpread = "List pattern matches only supports one `...` spread, at the end.
-Explanation: a list spread at the tail is efficient, but a spread in the middle would create new list[s]; out of performance concern, our pattern matching currently guarantees to never create new intermediate data."
-
-    let recordPatternSpread = "Record's `...` spread is not supported in pattern matches.
-Explanation: you can't collect a subset of a record's field into its own record, since a record needs an explicit declaration and that subset wouldn't have one.
-Solution: you need to pull out each field you want explicitly."
-
-    let recordPatternUnderscore = "Record patterns only support one `_`, at the end."
-    [@@live]
-
-    let arrayPatternSpread = "Array's `...` spread is not supported in pattern matches.
-Explanation: such spread would create a subarray; out of performance concern, our pattern matching currently guarantees to never create new intermediate data.
-Solution: if it's to validate the first few elements, use a `when` clause + Array size check + `get` checks on the current pattern. If it's to obtain a subarray, use `Array.sub` or `Belt.Array.slice`."
-
-    let arrayExprSpread = "Arrays can't use the `...` spread currently. Please use `concat` or other Array helpers."
-
-    let recordExprSpread = "Records can only have one `...` spread, at the beginning.
-Explanation: since records have a known, fixed shape, a spread like `{a, ...b}` wouldn't make sense, as `b` would override every field of `a` anyway."
-
-    let listExprSpread =  "Lists can only have one `...` spread, and at the end.
-Explanation: lists are singly-linked list, where a node contains a value and points to the next node. `list[a, ...bc]` efficiently creates a new item and links `bc` as its next nodes. `[...bc, a]` would be expensive, as it'd need to traverse `bc` and prepend each item to `a` one by one. We therefore disallow such syntax sugar.
-Solution: directly use `concat`."
-
-    let variantIdent = "A polymorphic variant (e.g. #id) must start with an alphabetical letter."
-end
-
-
-  let jsxAttr = (Location.mknoloc "JSX", Parsetree.PStr [])
-  let uncurryAttr = (Location.mknoloc "bs", Parsetree.PStr [])
-  let ternaryAttr = (Location.mknoloc "res.ternary", Parsetree.PStr [])
-  let makeBracesAttr loc = (Location.mkloc "res.braces" loc, Parsetree.PStr [])
-
-  type typDefOrExt =
-    | TypeDef of {recFlag: Asttypes.rec_flag; types: Parsetree.type_declaration list}
-    | TypeExt of Parsetree.type_extension
-
-  type labelledParameter =
-    | TermParameter of
-        {uncurried: bool; attrs: Parsetree.attributes; label: Asttypes.arg_label; expr: Parsetree.expression option;
-        pat: Parsetree.pattern; pos: Lexing.position}
-    | TypeParameter of {uncurried: bool; attrs: Parsetree.attributes; locs: string Location.loc list; pos: Lexing.position}
-
-  type recordPatternItem =
-    | PatUnderscore
-    | PatField of (Ast_helper.lid * Parsetree.pattern)
-
-  type context =
-    | OrdinaryExpr
-    | TernaryTrueBranchExpr
-    | WhenExpr
-
-  let getClosingToken = function
-    | Token.Lparen -> Token.Rparen
-    | Lbrace -> Rbrace
-    | Lbracket -> Rbracket
-    | _ -> assert false
-
-  let rec goToClosing closingToken state =
-    match (state.Parser.token, closingToken) with
-    | (Rparen, Token.Rparen) | (Rbrace, Rbrace) | (Rbracket, Rbracket) ->
-      Parser.next state;
-      ()
-    | (Token.Lbracket | Lparen | Lbrace) as t, _ ->
-      Parser.next state;
-      goToClosing (getClosingToken t) state;
-      goToClosing closingToken state
-    | ((Rparen | Token.Rbrace | Rbracket | Eof), _)  ->
-      () (* TODO: how do report errors here? *)
-    | _ ->
-      Parser.next state;
-      goToClosing closingToken state
-
-  (* Madness *)
-  let isEs6ArrowExpression ~inTernary p =
-    Parser.lookahead p (fun state ->
-      match state.Parser.token with
-      | Lident _ | List | Underscore ->
-        Parser.next state;
-        begin match state.Parser.token with
-        (* Don't think that this valid
-         * Imagine: let x = (a: int)
-         * This is a parenthesized expression with a type constraint, wait for
-         * the arrow *)
-        (* | Colon when not inTernary -> true *)
-        | EqualGreater -> true
-        | _ -> false
-        end
-      | Lparen ->
-        let prevEndPos = state.prevEndPos in
-        Parser.next state;
-        begin match state.token with
-        | Rparen ->
-          Parser.next state;
-          begin match state.Parser.token with
-          | Colon when not inTernary -> true
-          | EqualGreater -> true
-          | _ -> false
-          end
-        | Dot (* uncurried *) -> true
-        | Tilde -> true
-        | Backtick -> false (* (` always indicates the start of an expr, can't be es6 parameter *)
-        | _ ->
-          goToClosing Rparen state;
-          begin match state.Parser.token with
-          | EqualGreater -> true
-          (* | Lbrace TODO: detect missing =>, is this possible? *)
-          | Colon when not inTernary -> true
-          | Rparen ->
-            (* imagine having something as :
-             * switch colour {
-             * | Red
-             *    when l == l'
-             *    || (&Clflags.classic && (l == Nolabel && !is_optional(l'))) => (t1, t2)
-             * We'll arrive at the outer rparen just before the =>.
-             * This is not an es6 arrow.
-             * *)
-            false
-          | _ ->
-            Parser.next state;
-            (* error recovery, peek at the next token,
-             * (elements, providerId] => {
-             *  in the example above, we have an unbalanced ] here
-             *)
-            begin match state.Parser.token with
-            | EqualGreater when state.startPos.pos_lnum == prevEndPos.pos_lnum -> true
-            | _ -> false
-            end
-          end
-        end
-      | _ -> false)
-
-
-  let isEs6ArrowFunctor p =
-    Parser.lookahead p (fun state ->
-      match state.Parser.token with
-      (* | Uident _ | Underscore -> *)
-        (* Parser.next state; *)
-        (* begin match state.Parser.token with *)
-        (* | EqualGreater -> true *)
-        (* | _ -> false *)
-        (* end *)
-      | Lparen ->
-        Parser.next state;
-        begin match state.token with
-        | Rparen ->
-          Parser.next state;
-          begin match state.token with
-          | Colon | EqualGreater -> true
-          | _ -> false
-          end
-        | _ ->
-          goToClosing Rparen state;
-          begin match state.Parser.token with
-          | EqualGreater | Lbrace -> true
-          | Colon -> true
-          | _ -> false
-          end
-        end
-      | _ -> false
-    )
-
-  let isEs6ArrowType p =
-    Parser.lookahead p (fun state ->
-      match state.Parser.token with
-      | Lparen ->
-        Parser.next state;
-        begin match state.Parser.token with
-        | Rparen ->
-          Parser.next state;
-          begin match state.Parser.token with
-          | EqualGreater -> true
-          | _ -> false
-          end
-        | Tilde | Dot -> true
-        | _ ->
-          goToClosing Rparen state;
-          begin match state.Parser.token with
-          | EqualGreater  -> true
-          | _ -> false
-          end
-        end
-      | Tilde -> true
-      | _ -> false
-    )
-
-  let buildLongident words = match List.rev words with
-    | [] -> assert false
-    | hd::tl -> List.fold_left (fun p s -> Longident.Ldot (p, s)) (Lident hd) tl
-
-  let makeInfixOperator p token startPos endPos =
-    let stringifiedToken =
-      if token = Token.MinusGreater then "|."
-      else if token = Token.PlusPlus then "^"
-      else if token = Token.BangEqual then "<>"
-      else if token = Token.BangEqualEqual then "!="
-      else if token = Token.Equal then (
-        (* TODO: could have a totally different meaning like x->fooSet(y)*)
-        Parser.err ~startPos ~endPos p (
-          Diagnostics.message "Did you mean `==` here?"
-        );
-        "="
-      ) else if token = Token.EqualEqual then "="
-      else if token = Token.EqualEqualEqual then "=="
-      else Token.toString token
-    in
-    let loc = mkLoc startPos endPos in
-    let operator = Location.mkloc
-      (Longident.Lident stringifiedToken) loc
-    in
-    Ast_helper.Exp.ident ~loc operator
-
-  let negateString s =
-    if String.length s > 0 && (s.[0] [@doesNotRaise]) = '-'
-    then (String.sub [@doesNotRaise]) s 1 (String.length s - 1)
-    else "-" ^ s
-
-  let makeUnaryExpr startPos tokenEnd token operand =
-    match token, operand.Parsetree.pexp_desc with
-    | (Token.Plus | PlusDot), Pexp_constant((Pconst_integer _ | Pconst_float _)) ->
-      operand
-    | Minus, Pexp_constant(Pconst_integer (n,m)) ->
-      {operand with pexp_desc = Pexp_constant(Pconst_integer (negateString n,m))}
-    | (Minus | MinusDot), Pexp_constant(Pconst_float (n,m)) ->
-      {operand with pexp_desc = Pexp_constant(Pconst_float (negateString n,m))}
-    | (Token.Plus | PlusDot | Minus | MinusDot ), _ ->
-      let tokenLoc = mkLoc startPos tokenEnd in
-      let operator = "~" ^ Token.toString token in
-      Ast_helper.Exp.apply
-        ~loc:(mkLoc startPos operand.Parsetree.pexp_loc.loc_end)
-        (Ast_helper.Exp.ident ~loc:tokenLoc
-          (Location.mkloc (Longident.Lident operator) tokenLoc))
-        [Nolabel, operand]
-    | Token.Bang, _ ->
-      let tokenLoc = mkLoc startPos tokenEnd in
-      Ast_helper.Exp.apply
-        ~loc:(mkLoc startPos operand.Parsetree.pexp_loc.loc_end)
-        (Ast_helper.Exp.ident ~loc:tokenLoc
-          (Location.mkloc (Longident.Lident "not") tokenLoc))
-        [Nolabel, operand]
-    | _ ->
-      operand
-
-  let makeListExpression loc seq extOpt =
-    let rec handleSeq = function
-      | [] ->
-        begin match extOpt with
-        | Some ext -> ext
-        | None ->
-          let loc = {loc with Location.loc_ghost = true} in
-          let nil = Location.mkloc (Longident.Lident "[]") loc in
-          Ast_helper.Exp.construct ~loc nil None
-        end
-      | e1 :: el ->
-        let exp_el = handleSeq el in
-        let loc = mkLoc
-          e1.Parsetree.pexp_loc.Location.loc_start
-          exp_el.pexp_loc.loc_end
-        in
-        let arg = Ast_helper.Exp.tuple ~loc [e1; exp_el] in
-        Ast_helper.Exp.construct ~loc
-          (Location.mkloc (Longident.Lident "::") loc)
-          (Some arg)
-    in
-    let expr = handleSeq seq in
-    {expr with pexp_loc = loc}
-
-  let makeListPattern loc seq ext_opt =
-    let rec handle_seq = function
-      [] ->
-        let base_case = match ext_opt with
-          | Some ext ->
-            ext
-          | None ->
-            let loc = { loc with Location.loc_ghost = true} in
-            let nil = { Location.txt = Longident.Lident "[]"; loc } in
-            Ast_helper.Pat.construct ~loc nil None
-        in
-        base_case
-    | p1 :: pl ->
-        let pat_pl = handle_seq pl in
-        let loc =
-          mkLoc p1.Parsetree.ppat_loc.loc_start pat_pl.ppat_loc.loc_end in
-        let arg = Ast_helper.Pat.mk ~loc (Ppat_tuple [p1; pat_pl]) in
-        Ast_helper.Pat.mk ~loc (Ppat_construct(Location.mkloc (Longident.Lident "::") loc, Some arg))
-    in
-    handle_seq seq
-
-
-  (* {"foo": bar} -> Js.t({. foo: bar})
-   * {.. "foo": bar} -> Js.t({.. foo: bar})
-   * {..} -> Js.t({..}) *)
-  let makeBsObjType ~attrs ~loc ~closed rows =
-    let obj = Ast_helper.Typ.object_ ~loc rows closed in
-    let jsDotTCtor =
-      Location.mkloc (Longident.Ldot (Longident.Lident "Js", "t")) loc
-    in
-    Ast_helper.Typ.constr ~loc ~attrs jsDotTCtor [obj]
-
-  (* TODO: diagnostic reporting *)
-  let lidentOfPath longident =
-    match Longident.flatten longident |> List.rev with
-    | [] -> ""
-    | ident::_ -> ident
-
-  let makeNewtypes ~attrs ~loc newtypes exp =
-    let expr = List.fold_right (fun newtype exp ->
-      Ast_helper.Exp.mk ~loc (Pexp_newtype (newtype, exp))
-    ) newtypes exp
-    in {expr with pexp_attributes = attrs}
-
-  (* locally abstract types syntax sugar
-   * Transforms
-   *  let f: type t u v. = (foo : list</t, u, v/>) => ...
-   * into
-   *  let f = (type t u v. foo : list</t, u, v/>) => ...
-   *)
-  let wrapTypeAnnotation ~loc newtypes core_type body =
-    let exp = makeNewtypes ~attrs:[] ~loc newtypes
-      (Ast_helper.Exp.constraint_ ~loc body core_type)
-    in
-    let typ = Ast_helper.Typ.poly ~loc newtypes
-      (Ast_helper.Typ.varify_constructors newtypes core_type)
-    in
-    (exp, typ)
-
-  (**
-    * process the occurrence of _ in the arguments of a function application
-    * replace _ with a new variable, currently __x, in the arguments
-    * return a wrapping function that wraps ((__x) => ...) around an expression
-    * e.g. foo(_, 3) becomes (__x) => foo(__x, 3)
-    *)
-  let processUnderscoreApplication args =
-    let open Parsetree in
-    let exp_question = ref None in
-    let hidden_var = "__x" in
-    let check_arg ((lab, exp) as arg) =
-      match exp.pexp_desc with
-      | Pexp_ident ({ txt = Lident "_"} as id) ->
-        let new_id = Location.mkloc (Longident.Lident hidden_var) id.loc in
-        let new_exp = Ast_helper.Exp.mk (Pexp_ident new_id) ~loc:exp.pexp_loc in
-        exp_question := Some new_exp;
-        (lab, new_exp)
-      | _ ->
-        arg
-    in
-    let args = List.map check_arg args in
-    let wrap exp_apply =
-      match !exp_question with
-      | Some {pexp_loc=loc} ->
-        let pattern = Ast_helper.Pat.mk (Ppat_var (Location.mkloc hidden_var loc)) ~loc in
-        Ast_helper.Exp.mk (Pexp_fun (Nolabel, None, pattern, exp_apply)) ~loc
-      | None ->
-        exp_apply
-    in
-    (args, wrap)
-
-  let rec parseLident p =
-    let recoverLident p =
-      if (
-        Token.isKeyword p.Parser.token &&
-        p.Parser.prevEndPos.pos_lnum == p.startPos.pos_lnum
-      )
-      then (
-        Parser.err p (Diagnostics.lident p.Parser.token);
-        Parser.next p;
-        None
-      ) else (
-        let rec loop p =
-          if not (Recover.shouldAbortListParse p)
-          then begin
-            Parser.next p;
-            loop p
-          end
-        in
-        Parser.next p;
-        loop p;
-        match p.Parser.token with
-        | Lident _ -> Some ()
-        | _ -> None
-      )
-    in
-    let startPos = p.Parser.startPos in
-    match p.Parser.token with
-    | Lident ident ->
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      (ident, loc)
-    | List ->
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      ("list", loc)
-    | _ ->
-      begin match recoverLident p with
-      | Some () ->
-        parseLident p
-      | None ->
-        ("_", mkLoc startPos p.prevEndPos)
-      end
-
-  let parseIdent ~msg ~startPos p =
-    match p.Parser.token with
-    | Lident ident
-    | Uident ident ->
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      (ident, loc)
-    | List ->
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      ("list", loc)
-    | _token ->
-      Parser.err p (Diagnostics.message msg);
-      Parser.next p;
-      ("_", mkLoc startPos p.prevEndPos)
-
-  let parseHashIdent ~startPos p =
-    Parser.expect Hash p;
-    parseIdent ~startPos ~msg:ErrorMessages.variantIdent p
-
-  (* Ldot (Ldot (Lident "Foo", "Bar"), "baz") *)
-  let parseValuePath p =
-    let startPos = p.Parser.startPos in
-    let rec aux p path =
-      match p.Parser.token with
-      | List -> Longident.Ldot(path, "list")
-      | Lident ident -> Longident.Ldot(path, ident)
-      | Uident uident ->
-        Parser.next p;
-        Parser.expect Dot p;
-        aux p (Ldot (path, uident))
-      | token ->
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        Longident.Lident "_"
-    in
-    let ident = match p.Parser.token with
-    | List -> Longident.Lident "list"
-    | Lident ident -> Longident.Lident ident
-    | Uident ident ->
-      Parser.next p;
-      Parser.expect Dot p;
-      aux p (Lident ident)
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Longident.Lident "_"
-    in
-    Parser.next p;
-    Location.mkloc ident (mkLoc startPos p.prevEndPos)
-
- let parseValuePathTail p startPos ident =
-    let rec loop p path =
-      match p.Parser.token with
-      | Lident ident ->
-        Parser.next p;
-        Location.mkloc (Longident.Ldot(path, ident)) (mkLoc startPos p.prevEndPos)
-      | List ->
-        Parser.next p;
-        Location.mkloc (Longident.Ldot(path, "list")) (mkLoc startPos p.prevEndPos)
-      | Uident ident ->
-        Parser.next p;
-        Parser.expect Dot p;
-        loop p (Longident.Ldot (path, ident))
-      | token ->
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        Location.mknoloc path
-    in
-    loop p ident
-
-  let parseModuleLongIdentTail ~lowercase p startPos ident =
-    let rec loop p acc =
-      match p.Parser.token with
-      | List when lowercase ->
-        Parser.next p;
-        let lident = (Longident.Ldot (acc, "list")) in
-        Location.mkloc lident (mkLoc startPos p.prevEndPos)
-      | Lident ident when lowercase ->
-        Parser.next p;
-        let lident = (Longident.Ldot (acc, ident)) in
-        Location.mkloc lident (mkLoc startPos p.prevEndPos)
-      | Uident ident ->
-        Parser.next p;
-        let endPos = p.prevEndPos in
-        let lident = (Longident.Ldot (acc, ident)) in
-        begin match p.Parser.token with
-        | Dot ->
-          Parser.next p;
-          loop p lident
-        | _ -> Location.mkloc lident (mkLoc startPos endPos)
-        end
-      | t ->
-        Parser.err p (Diagnostics.uident t);
-        Location.mkloc acc (mkLoc startPos p.prevEndPos)
-    in
-    loop p ident
-
-  (* Parses module identifiers:
-       Foo
-       Foo.Bar *)
-  let parseModuleLongIdent ~lowercase p =
-    (* Parser.leaveBreadcrumb p Reporting.ModuleLongIdent; *)
-    let startPos = p.Parser.startPos in
-    let moduleIdent = match p.Parser.token with
-    | List when lowercase ->
-      let loc = mkLoc startPos p.endPos in
-      Parser.next p;
-      Location.mkloc (Longident.Lident "list") loc
-    | Lident ident when lowercase ->
-      let loc = mkLoc startPos p.endPos in
-      let lident = Longident.Lident ident in
-      Parser.next p;
-      Location.mkloc lident loc
-    | Uident ident ->
-      let lident = Longident.Lident ident in
-      let endPos = p.endPos in
-      Parser.next p;
-      begin match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        parseModuleLongIdentTail ~lowercase p startPos lident
-      | _ -> Location.mkloc lident (mkLoc startPos endPos)
-      end
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mkloc (Longident.Lident "_") (mkLoc startPos p.prevEndPos)
-    in
-    (* Parser.eatBreadcrumb p; *)
-    moduleIdent
-
-  (* `window.location` or `Math` or `Foo.Bar` *)
-  let parseIdentPath p =
-    let rec loop p acc =
-      match p.Parser.token with
-      | Uident ident | Lident ident ->
-        Parser.next p;
-        let lident = (Longident.Ldot (acc, ident)) in
-        begin match p.Parser.token with
-        | Dot ->
-          Parser.next p;
-          loop p lident
-        | _ -> lident
-        end
-      | _t -> acc
-    in
-    match p.Parser.token with
-    | Lident ident | Uident ident ->
-      Parser.next p;
-      begin match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        loop p (Longident.Lident ident)
-      | _ -> Longident.Lident ident
-      end
-    | _ ->
-      Longident.Lident "_"
-
-  let verifyJsxOpeningClosingName p nameExpr =
-    let closing = match p.Parser.token with
-    | Lident lident -> Parser.next p; Longident.Lident lident
-    | Uident _ ->
-      (parseModuleLongIdent ~lowercase:false p).txt
-    | _ -> Longident.Lident ""
-    in
-    match nameExpr.Parsetree.pexp_desc with
-    | Pexp_ident openingIdent ->
-      let opening =
-        let withoutCreateElement =
-          Longident.flatten openingIdent.txt
-          |> List.filter (fun s -> s <> "createElement")
-        in
-        match (Longident.unflatten withoutCreateElement) with
-        | Some li -> li
-        | None -> Longident.Lident ""
-      in
-      opening = closing
-    | _ -> assert false
-
-  let string_of_pexp_ident nameExpr =
-    match nameExpr.Parsetree.pexp_desc with
-    | Pexp_ident openingIdent ->
-      Longident.flatten openingIdent.txt
-      |> List.filter (fun s -> s <> "createElement")
-      |> String.concat "."
-    | _ -> ""
-
-  (* open-def ::=
-   *   | open module-path
-   *   | open! module-path *)
-  let parseOpenDescription ~attrs p =
-    Parser.leaveBreadcrumb p Grammar.OpenDescription;
-    let startPos = p.Parser.startPos in
-    Parser.expect Open p;
-    let override = if Parser.optional p Token.Bang then
-      Asttypes.Override
-    else
-      Asttypes.Fresh
-    in
-    let modident = parseModuleLongIdent ~lowercase:false p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Parser.eatBreadcrumb p;
-    Ast_helper.Opn.mk ~loc ~attrs ~override modident
-
-  let hexValue x =
-    match x with
-    | '0' .. '9' ->
-      (Char.code x) - 48
-    | 'A' .. 'Z' ->
-      (Char.code x) - 55
-    | 'a' .. 'z' ->
-      (Char.code x) - 97
-    | _ -> 16
-
-  let parseStringLiteral s =
-    let len = String.length s in
-    let b = Buffer.create (String.length s) in
-
-    let rec loop i =
-      if i = len then
-        ()
-      else
-        let c = String.unsafe_get s i in
-        match c with
-        | '\\' as c ->
-          let nextIx = i + 1 in
-          if nextIx < len then
-            let nextChar = String.unsafe_get s nextIx in
-            begin match nextChar with
-            | 'n' ->
-              Buffer.add_char b '\010';
-              loop (nextIx + 1)
-            | 'r' ->
-              Buffer.add_char b '\013';
-              loop (nextIx + 1)
-            | 'b' ->
-              Buffer.add_char b '\008';
-              loop (nextIx + 1)
-            | 't' ->
-              Buffer.add_char b '\009';
-              loop (nextIx + 1)
-            | '\\' as c ->
-              Buffer.add_char b c;
-              loop (nextIx + 1)
-            | ' ' as c ->
-                Buffer.add_char b c;
-              loop (nextIx + 1)
-            | '\'' as c ->
-                Buffer.add_char b c;
-              loop (nextIx + 1)
-            | '\"' as c ->
-              Buffer.add_char b c;
-              loop (nextIx + 1)
-            | '0' .. '9' ->
-              if nextIx + 2 < len then
-                let c0 = nextChar in
-                let c1 = (String.unsafe_get s (nextIx + 1)) in
-                let c2 = (String.unsafe_get s (nextIx + 2)) in
-                let c =
-                  100 * (Char.code c0 - 48) +
-                  10 * (Char.code c1  - 48) +
-                  (Char.code c2 - 48)
-                in
-                if (c < 0 || c > 255) then (
-                  Buffer.add_char b '\\';
-                  Buffer.add_char b c0;
-                  Buffer.add_char b c1;
-                  Buffer.add_char b c2;
-                  loop (nextIx + 3)
-                ) else (
-                  Buffer.add_char b (Char.unsafe_chr c);
-                  loop (nextIx + 3)
-                )
-              else (
-                Buffer.add_char b '\\';
-                Buffer.add_char b nextChar;
-                loop (nextIx + 1)
-              )
-            | 'o' ->
-              if nextIx + 3 < len then
-                let c0 = (String.unsafe_get s (nextIx + 1)) in
-                let c1 = (String.unsafe_get s (nextIx + 2)) in
-                let c2 = (String.unsafe_get s (nextIx + 3)) in
-                let c =
-                  64 * (Char.code c0 - 48) +
-                  8 * (Char.code c1  - 48) +
-                  (Char.code c2 - 48)
-                in
-                if (c < 0 || c > 255) then (
-                  Buffer.add_char b '\\';
-                  Buffer.add_char b '0';
-                  Buffer.add_char b c0;
-                  Buffer.add_char b c1;
-                  Buffer.add_char b c2;
-                  loop (nextIx + 4)
-                ) else (
-                  Buffer.add_char b (Char.unsafe_chr c);
-                  loop (nextIx + 4)
-                )
-              else (
-                Buffer.add_char b '\\';
-                Buffer.add_char b nextChar;
-                loop (nextIx + 1)
-              )
-            | 'x' as c ->
-              if nextIx + 2 < len then
-                let c0 = (String.unsafe_get s (nextIx + 1)) in
-                let c1 = (String.unsafe_get s (nextIx + 2)) in
-                let c = (16 * (hexValue c0)) + (hexValue c1) in
-                if (c < 0 || c > 255) then (
-                  Buffer.add_char b '\\';
-                  Buffer.add_char b 'x';
-                  Buffer.add_char b c0;
-                  Buffer.add_char b c1;
-                  loop (nextIx + 3)
-                ) else (
-                  Buffer.add_char b (Char.unsafe_chr c);
-                  loop (nextIx + 3)
-                )
-              else (
-                Buffer.add_char b '\\';
-                Buffer.add_char b c;
-                loop (nextIx + 2)
-              )
-            | _ ->
-              Buffer.add_char b c;
-              Buffer.add_char b nextChar;
-              loop (nextIx + 1)
-            end
-          else (
-            Buffer.add_char b c;
-            ()
-          )
-        | c ->
-          Buffer.add_char b c;
-          loop (i + 1)
-      in
-      loop 0;
-      Buffer.contents b
-
-  let parseTemplateStringLiteral s =
-    let len = String.length s in
-    let b = Buffer.create len in
-
-    let rec loop i =
-      if i < len then
-        let c = String.unsafe_get s i in
-        match c with
-        | '\\' as c ->
-          if i + 1 < len then
-            let nextChar = String.unsafe_get s (i + 1) in
-            begin match nextChar with
-            | '\\' as c ->
-              Buffer.add_char b c;
-              loop (i + 2)
-            | '$' as c ->
-              Buffer.add_char b c;
-              loop (i + 2)
-            | '`' as c ->
-              Buffer.add_char b c;
-              loop (i + 2)
-            | c ->
-              Buffer.add_char b '\\';
-              Buffer.add_char b c;
-              loop (i + 2)
-            end
-          else (
-            Buffer.add_char b c
-          )
-
-        | c ->
-          Buffer.add_char b c;
-          loop (i + 1)
-
-      else
-        ()
-    in
-    loop 0;
-    Buffer.contents b
-
-  (* constant	::=	integer-literal   *)
-   (* ∣	 float-literal   *)
-   (* ∣	 string-literal   *)
-  let parseConstant p =
-    let isNegative = match p.Parser.token with
-    | Token.Minus -> Parser.next p; true
-    | Plus -> Parser.next p; false
-    | _ -> false
-    in
-    let constant = match p.Parser.token with
-    | Int {i; suffix} ->
-      let intTxt = if isNegative then "-" ^ i else i in
-      Parsetree.Pconst_integer (intTxt, suffix)
-    | Float {f; suffix} ->
-      let floatTxt = if isNegative then "-" ^ f else f in
-      Parsetree.Pconst_float (floatTxt, suffix)
-    | String s ->
-      let txt = if p.mode = ParseForTypeChecker then
-        parseStringLiteral s
-      else
-        s
-      in
-      Pconst_string(txt, None)
-    | Character c -> Pconst_char c
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Pconst_string("", None)
-    in
-    Parser.next p;
-    constant
-
-  let parseCommaDelimitedRegion p ~grammar ~closing ~f =
-    Parser.leaveBreadcrumb p grammar;
-    let rec loop nodes =
-      match f p with
-      | Some node ->
-        begin match p.Parser.token with
-        | Comma ->
-          Parser.next p;
-          loop (node::nodes)
-        | token when token = closing || token = Eof ->
-          List.rev (node::nodes)
-        | _ ->
-          if not (p.token = Eof || p.token = closing || Recover.shouldAbortListParse p) then
-            Parser.expect Comma p;
-          if p.token = Semicolon then Parser.next p;
-          loop (node::nodes)
-        end
-      | None ->
-        if p.token = Eof || p.token = closing || Recover.shouldAbortListParse p then
-          List.rev nodes
-        else (
-          Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
-          Parser.next p;
-          loop nodes
-        );
-    in
-    let nodes = loop [] in
-    Parser.eatBreadcrumb p;
-    nodes
-
-  let parseCommaDelimitedReversedList p ~grammar ~closing ~f =
-    Parser.leaveBreadcrumb p grammar;
-    let rec loop nodes =
-      match f p with
-      | Some node ->
-        begin match p.Parser.token with
-        | Comma ->
-          Parser.next p;
-          loop (node::nodes)
-        | token when token = closing || token = Eof ->
-          (node::nodes)
-        | _ ->
-          if not (p.token = Eof || p.token = closing || Recover.shouldAbortListParse p) then
-            Parser.expect Comma p;
-          if p.token = Semicolon then Parser.next p;
-          loop (node::nodes)
-        end
-      | None ->
-        if p.token = Eof || p.token = closing || Recover.shouldAbortListParse p then
-          nodes
-        else (
-          Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
-          Parser.next p;
-          loop nodes
-        );
-    in
-    let nodes = loop [] in
-    Parser.eatBreadcrumb p;
-    nodes
-
-  let parseDelimitedRegion p ~grammar ~closing ~f =
-    Parser.leaveBreadcrumb p grammar;
-    let rec loop nodes =
-      match f p with
-      | Some node ->
-        loop (node::nodes)
-      | None ->
-        if (
-          p.Parser.token = Token.Eof ||
-          p.token = closing ||
-          Recover.shouldAbortListParse p
-        ) then
-          List.rev nodes
-        else (
-          Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
-          Parser.next p;
-          loop nodes
-        )
-      in
-      let nodes = loop [] in
-      Parser.eatBreadcrumb p;
-      nodes
-
-  let parseRegion p ~grammar ~f =
-    Parser.leaveBreadcrumb p grammar;
-    let rec loop nodes =
-      match f p with
-      | Some node ->
-        loop (node::nodes)
-      | None ->
-        if p.Parser.token = Token.Eof || Recover.shouldAbortListParse p then
-          List.rev nodes
-        else (
-          Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
-          Parser.next p;
-          loop nodes
-        )
-    in
-    let nodes = loop [] in
-    Parser.eatBreadcrumb p;
-    nodes
-
-  (* let-binding	::=	pattern =  expr   *)
-     (* ∣	 value-name  { parameter }  [: typexpr]  [:> typexpr] =  expr   *)
-     (* ∣	 value-name :  poly-typexpr =  expr   *)
-
-   (* pattern	::=	value-name   *)
-     (* ∣	 _   *)
-     (* ∣	 constant   *)
-     (* ∣	 pattern as  value-name   *)
-     (* ∣	 ( pattern )   *)
-     (* ∣	 ( pattern :  typexpr )   *)
-     (* ∣	 pattern |  pattern   *)
-     (* ∣	 constr  pattern   *)
-     (* ∣	 #variant variant-pattern *)
-     (* ∣	 ##type  *)
-     (* ∣	 / pattern  { , pattern }+  /   *)
-     (* ∣	 { field  [: typexpr]  [= pattern] { ; field  [: typexpr]  [= pattern] }  [; _ ] [ ; ] }   *)
-     (* ∣	 [ pattern  { ; pattern }  [ ; ] ]   *)
-     (* ∣	 pattern ::  pattern   *)
-     (* ∣	 [| pattern  { ; pattern }  [ ; ] |]   *)
-     (* ∣	 char-literal ..  char-literal *)
-     (*	∣	 exception pattern  *)
-  let rec parsePattern ?(alias=true) ?(or_=true) p =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributes p in
-    let pat = match p.Parser.token with
-    | (True | False) as token ->
-      let endPos = p.endPos in
-      Parser.next p;
-      let loc = mkLoc startPos endPos in
-      Ast_helper.Pat.construct ~loc
-        (Location.mkloc (Longident.Lident (Token.toString token)) loc) None
-    | Int _ | String _ | Float _ | Character _ | Minus | Plus ->
-      let c = parseConstant p in
-       begin match p.token with
-        | DotDot ->
-          Parser.next p;
-          let c2 = parseConstant p in
-          Ast_helper.Pat.interval ~loc:(mkLoc startPos p.prevEndPos) c c2
-        | _ ->
-          Ast_helper.Pat.constant ~loc:(mkLoc startPos p.prevEndPos) c
-      end
-    | Lparen ->
-      Parser.next p;
-      begin match p.token with
-      | Rparen ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let lid = Location.mkloc (Longident.Lident "()") loc in
-        Ast_helper.Pat.construct ~loc lid None
-      | _ ->
-        let pat = parseConstrainedPattern p in
-        begin match p.token with
-        | Comma ->
-          Parser.next p;
-          parseTuplePattern ~attrs ~first:pat ~startPos p
-        | _ ->
-          Parser.expect Rparen p;
-          let loc = mkLoc startPos p.prevEndPos in
-          {pat with ppat_loc = loc}
-        end
-      end
-    | Lbracket ->
-      parseArrayPattern ~attrs p
-    | Lbrace ->
-      parseRecordPattern ~attrs p
-    | Underscore ->
-      let endPos = p.endPos in
-      let loc = mkLoc startPos endPos in
-      Parser.next p;
-      Ast_helper.Pat.any ~loc ~attrs ()
-    | Lident ident ->
-      let endPos = p.endPos in
-      let loc = mkLoc startPos endPos in
-      Parser.next p;
-      Ast_helper.Pat.var ~loc ~attrs (Location.mkloc ident loc)
-    | Uident _ ->
-      let constr = parseModuleLongIdent ~lowercase:false p in
-      begin match p.Parser.token with
-      | Lparen ->
-        parseConstructorPatternArgs p constr startPos attrs
-      | _ ->
-        Ast_helper.Pat.construct ~loc:constr.loc ~attrs constr None
-      end
-    | Hash ->
-      let (ident, loc) = parseHashIdent ~startPos p in
-      begin match p.Parser.token with
-      | Lparen ->
-        parseVariantPatternArgs p ident startPos attrs
-      | _ ->
-        Ast_helper.Pat.variant ~loc ~attrs ident None
-      end
-    | HashHash ->
-      Parser.next p;
-      let ident = parseValuePath p in
-      let loc = mkLoc startPos ident.loc.loc_end in
-      Ast_helper.Pat.type_ ~loc ~attrs ident
-    | Exception ->
-      Parser.next p;
-      let pat = parsePattern ~alias:false ~or_:false p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Pat.exception_ ~loc ~attrs pat
-    | Lazy ->
-      Parser.next p;
-      let pat = parsePattern ~alias:false ~or_:false p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Pat.lazy_ ~loc ~attrs pat
-    | List ->
-      Parser.next p;
-      begin match p.token with
-      | Lbracket ->
-        parseListPattern ~startPos ~attrs p
-      | _ ->
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Pat.var ~loc ~attrs (Location.mkloc "list" loc)
-      end
-    | Module ->
-      parseModulePattern ~attrs p
-    | Percent ->
-      let extension = parseExtension p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Pat.extension ~loc ~attrs extension
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      begin match skipTokensAndMaybeRetry p ~isStartOfGrammar:Grammar.isAtomicPatternStart with
-      | None ->
-        Recover.defaultPattern()
-      | Some () ->
-        parsePattern p
-      end
-    in
-    let pat = if alias then parseAliasPattern ~attrs pat p else pat in
-    if or_ then parseOrPattern pat p else pat
-
-  and skipTokensAndMaybeRetry p ~isStartOfGrammar =
-    if Token.isKeyword p.Parser.token
-        && p.Parser.prevEndPos.pos_lnum == p.startPos.pos_lnum
-    then (
-      Parser.next p;
-      None
-    ) else (
-      if Recover.shouldAbortListParse p then
-        begin
-          if isStartOfGrammar p.Parser.token then
-            begin
-              Parser.next p;
-              Some ()
-            end
-          else
-            None
-        end
-      else
-        begin
-          Parser.next p;
-          let rec loop p =
-            if not (Recover.shouldAbortListParse p)
-            then begin
-              Parser.next p;
-              loop p
-            end in
-          loop p;
-          if isStartOfGrammar p.Parser.token then
-            Some ()
-          else
-            None
-        end
-    )
-
-  (* alias ::= pattern as lident *)
-  and parseAliasPattern ~attrs pattern p =
-    match p.Parser.token with
-    | As ->
-      Parser.next p;
-      let (name, loc) = parseLident p in
-      let name = Location.mkloc name loc in
-      Ast_helper.Pat.alias
-        ~loc:({pattern.ppat_loc with loc_end = p.prevEndPos})
-        ~attrs
-         pattern
-         name
-    | _ -> pattern
-
-  (* or ::= pattern | pattern
-   * precedence: Red | Blue | Green is interpreted as (Red | Blue) | Green *)
-  and parseOrPattern pattern1 p =
-    let rec loop pattern1 =
-      match p.Parser.token with
-      | Bar ->
-        Parser.next p;
-        let pattern2 = parsePattern ~or_:false p in
-        let loc = { pattern1.Parsetree.ppat_loc with
-          loc_end = pattern2.ppat_loc.loc_end
-        } in
-        loop (Ast_helper.Pat.or_ ~loc pattern1 pattern2)
-      | _ -> pattern1
-    in
-    loop pattern1
-
-  and parseNonSpreadPattern ~msg p =
-    let () = match p.Parser.token with
-    | DotDotDot ->
-      Parser.err p (Diagnostics.message msg);
-      Parser.next p;
-    | _ -> ()
-    in
-    match p.Parser.token with
-    | token when Grammar.isPatternStart token ->
-      let pat = parsePattern p in
-      begin match p.Parser.token with
-      | Colon ->
-        Parser.next p;
-        let typ = parseTypExpr p in
-        let loc = mkLoc pat.ppat_loc.loc_start typ.Parsetree.ptyp_loc.loc_end in
-        Some (Ast_helper.Pat.constraint_ ~loc pat typ)
-      | _ -> Some pat
-      end
-    | _ -> None
-
-  and parseConstrainedPattern p =
-    let pat = parsePattern p in
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      let typ = parseTypExpr p in
-      let loc = mkLoc pat.ppat_loc.loc_start typ.Parsetree.ptyp_loc.loc_end in
-      Ast_helper.Pat.constraint_ ~loc pat typ
-    | _ -> pat
-
-  and parseConstrainedPatternRegion p =
-    match p.Parser.token with
-    | token when Grammar.isPatternStart token ->
-      Some (parseConstrainedPattern p)
-    | _ -> None
-
-	(* field ::=
-	 *   | longident
-	 *   | longident : pattern
-	 *   | longident as lident
-   *
-	 *  row ::=
-	 *	 | field ,
-	 *	 | field , _
-	 *	 | field , _,
-	 *)
-  and parseRecordPatternField p =
-    let startPos = p.Parser.startPos in
-    let label = parseValuePath p in
-    let pattern = match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      parsePattern p
-    | _ ->
-      Ast_helper.Pat.var
-        ~loc:label.loc
-        (Location.mkloc (Longident.last label.txt) label.loc)
-    in
-		match p.token with
-		| As ->
-			Parser.next p;
-      let (name, loc) = parseLident p in
-      let name = Location.mkloc name loc in
-      let aliasPattern = Ast_helper.Pat.alias
-        ~loc:(mkLoc startPos p.prevEndPos)
-        pattern
-        name
-      in
-      (Location.mkloc label.txt (mkLoc startPos aliasPattern.ppat_loc.loc_end), aliasPattern)
-		| _ ->
-      (label, pattern)
-
-   (* TODO: there are better representations than PatField|Underscore ? *)
-  and parseRecordPatternItem p =
-    match p.Parser.token with
-    | DotDotDot ->
-      Parser.next p;
-      Some (true, PatField (parseRecordPatternField p))
-    | Uident _ | Lident _ ->
-      Some (false, PatField (parseRecordPatternField p))
-    | Underscore ->
-      Parser.next p;
-      Some (false, PatUnderscore)
-    | _ ->
-      None
-
-  and parseRecordPattern ~attrs p =
-    let startPos = p.startPos in
-    Parser.expect Lbrace p;
-    let rawFields =
-      parseCommaDelimitedReversedList p
-       ~grammar:PatternRecord
-       ~closing:Rbrace
-       ~f:parseRecordPatternItem
-    in
-    Parser.expect Rbrace p;
-    let (fields, closedFlag) =
-      let (rawFields, flag) = match rawFields with
-      | (_hasSpread, PatUnderscore)::rest ->
-        (rest, Asttypes.Open)
-      | rawFields ->
-        (rawFields, Asttypes.Closed)
-      in
-      List.fold_left (fun (fields, flag) curr ->
-        let (hasSpread, field) = curr in
-        match field with
-        | PatField field ->
-          if hasSpread then (
-            let (_, pattern) = field in
-            Parser.err ~startPos:pattern.Parsetree.ppat_loc.loc_start p (Diagnostics.message ErrorMessages.recordPatternSpread)
-          );
-          (field::fields, flag)
-        | PatUnderscore ->
-          (fields, flag)
-      ) ([], flag) rawFields
-    in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Pat.record ~loc ~attrs fields closedFlag
-
-  and parseTuplePattern ~attrs ~first ~startPos p =
-    let patterns =
-      parseCommaDelimitedRegion p
-        ~grammar:Grammar.PatternList
-        ~closing:Rparen
-        ~f:parseConstrainedPatternRegion
-    in
-    Parser.expect Rparen p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Pat.tuple ~loc ~attrs (first::patterns)
-
-  and parsePatternRegion p =
-    match p.Parser.token with
-    | DotDotDot ->
-      Parser.next p;
-      Some (true, parseConstrainedPattern p)
-    | token when Grammar.isPatternStart token ->
-      Some (false, parseConstrainedPattern p)
-    | _ -> None
-
-  and parseModulePattern ~attrs p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Module p;
-    Parser.expect Lparen p;
-    let uident = match p.token with
-    | Uident uident ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc uident loc
-    | _ -> (* TODO: error recovery *)
-      Location.mknoloc "_"
-    in
-    begin match p.token with
-    | Colon ->
-      let colonStart = p.Parser.startPos in
-      Parser.next p;
-      let packageTypAttrs = parseAttributes p in
-      let packageType = parsePackageType ~startPos:colonStart ~attrs:packageTypAttrs p in
-      Parser.expect Rparen p;
-      let loc = mkLoc startPos p.prevEndPos in
-      let unpack = Ast_helper.Pat.unpack ~loc:uident.loc uident in
-      Ast_helper.Pat.constraint_
-        ~loc
-        ~attrs
-        unpack
-        packageType
-    | _ ->
-      Parser.expect Rparen p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Pat.unpack ~loc ~attrs uident
-    end
-
-  and parseListPattern ~startPos ~attrs p =
-    Parser.expect Lbracket p;
-    let listPatterns =
-      parseCommaDelimitedReversedList p
-        ~grammar:Grammar.PatternOcamlList
-        ~closing:Rbracket
-        ~f:parsePatternRegion
-    in
-    Parser.expect Rbracket p;
-    let loc = mkLoc startPos p.prevEndPos in
-    let filterSpread (hasSpread, pattern) =
-      if hasSpread then (
-        Parser.err
-          ~startPos:pattern.Parsetree.ppat_loc.loc_start
-          p
-          (Diagnostics.message ErrorMessages.listPatternSpread);
-        pattern
-      ) else
-        pattern
-    in
-    match listPatterns with
-    | (true, pattern)::patterns ->
-      let patterns = patterns |> List.map filterSpread |> List.rev in
-      let pat = makeListPattern loc patterns (Some pattern) in
-      {pat with ppat_loc = loc; ppat_attributes = attrs;}
-    | patterns ->
-      let patterns = patterns |> List.map filterSpread |> List.rev in
-      let pat = makeListPattern loc patterns None in
-      {pat with ppat_loc = loc; ppat_attributes = attrs;}
-
-  and parseArrayPattern ~attrs p =
-    let startPos = p.startPos in
-    Parser.expect Lbracket p;
-    let patterns =
-      parseCommaDelimitedRegion
-        p
-        ~grammar:Grammar.PatternList
-        ~closing:Rbracket
-        ~f:(parseNonSpreadPattern ~msg:ErrorMessages.arrayPatternSpread)
-    in
-    Parser.expect Rbracket p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Pat.array ~loc ~attrs patterns
-
-  and parseConstructorPatternArgs p constr startPos attrs =
-    let lparen = p.startPos in
-    Parser.expect Lparen p;
-    let args = parseCommaDelimitedRegion
-      p ~grammar:Grammar.PatternList ~closing:Rparen ~f:parseConstrainedPatternRegion
-    in
-    Parser.expect Rparen p;
-    let args = match args with
-    | [] ->
-      let loc = mkLoc lparen p.prevEndPos in
-      Some (
-        Ast_helper.Pat.construct ~loc (Location.mkloc (Longident.Lident "()") loc) None
-      )
-    | [{ppat_desc = Ppat_tuple _} as pat] as patterns ->
-      if p.mode = ParseForTypeChecker then
-        (* Some(1, 2) for type-checker *)
-        Some pat
-      else
-      (* Some((1, 2)) for printer *)
-        Some (Ast_helper.Pat.tuple ~loc:(mkLoc lparen p.endPos) patterns)
-    | [pattern] -> Some pattern
-    | patterns ->
-      Some (Ast_helper.Pat.tuple ~loc:(mkLoc lparen p.endPos) patterns)
-    in
-    Ast_helper.Pat.construct ~loc:(mkLoc startPos p.prevEndPos) ~attrs constr args
-
-  and parseVariantPatternArgs p ident startPos attrs =
-    let lparen = p.startPos in
-    Parser.expect Lparen p;
-    let patterns =
-      parseCommaDelimitedRegion
-        p ~grammar:Grammar.PatternList ~closing:Rparen ~f:parseConstrainedPatternRegion in
-    let args =
-      match patterns with
-      | [{ppat_desc = Ppat_tuple _} as pat] as patterns ->
-        if p.mode = ParseForTypeChecker then
-          (* #ident(1, 2) for type-checker *)
-          Some pat
-        else
-          (* #ident((1, 2)) for printer *)
-          Some (Ast_helper.Pat.tuple ~loc:(mkLoc lparen p.endPos) patterns)
-      | [pattern] -> Some pattern
-      | patterns ->
-        Some (Ast_helper.Pat.tuple ~loc:(mkLoc lparen p.endPos) patterns)
-    in
-    Parser.expect Rparen p;
-    Ast_helper.Pat.variant ~loc:(mkLoc startPos p.prevEndPos) ~attrs ident args
-
-  and parseExpr ?(context=OrdinaryExpr) p =
-    let expr = parseOperandExpr ~context p in
-    let expr = parseBinaryExpr ~context ~a:expr p 1 in
-    parseTernaryExpr expr p
-
-  (* expr ? expr : expr *)
-  and parseTernaryExpr leftOperand p =
-    match p.Parser.token with
-    | Question ->
-      Parser.leaveBreadcrumb p Grammar.Ternary;
-      Parser.next p;
-      let trueBranch = parseExpr ~context:TernaryTrueBranchExpr p in
-      Parser.expect Colon p;
-      let falseBranch = parseExpr p in
-      Parser.eatBreadcrumb p;
-      let loc = {leftOperand.Parsetree.pexp_loc with
-        loc_start = leftOperand.pexp_loc.loc_start;
-        loc_end = falseBranch.Parsetree.pexp_loc.loc_end;
-      } in
-      Ast_helper.Exp.ifthenelse
-        ~attrs:[ternaryAttr] ~loc
-        leftOperand trueBranch (Some falseBranch)
-    | _ ->
-      leftOperand
-
-  and parseEs6ArrowExpression ?parameters p =
-    let startPos = p.Parser.startPos in
-    Parser.leaveBreadcrumb p Grammar.Es6ArrowExpr;
-    let parameters = match parameters with
-    | Some params -> params
-    | None -> parseParameters p
-    in
-    let returnType = match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      Some (parseTypExpr ~es6Arrow:false p)
-    | _ ->
-      None
-    in
-    Parser.expect EqualGreater p;
-    let body =
-      let expr = parseExpr p in
-      match returnType with
-      | Some typ ->
-        Ast_helper.Exp.constraint_
-          ~loc:(mkLoc expr.pexp_loc.loc_start typ.Parsetree.ptyp_loc.loc_end) expr typ
-      | None -> expr
-    in
-    Parser.eatBreadcrumb p;
-    let endPos = p.prevEndPos in
-    let arrowExpr =
-      List.fold_right (fun parameter expr ->
-        match parameter with
-        | TermParameter {uncurried; attrs; label = lbl; expr = defaultExpr; pat; pos = startPos} ->
-          let attrs = if uncurried then uncurryAttr::attrs else attrs in
-          Ast_helper.Exp.fun_ ~loc:(mkLoc startPos endPos) ~attrs lbl defaultExpr pat expr
-        | TypeParameter {uncurried; attrs; locs = newtypes; pos = startPos} ->
-          let attrs = if uncurried then uncurryAttr::attrs else attrs in
-          makeNewtypes ~attrs ~loc:(mkLoc startPos endPos) newtypes expr
-      ) parameters body
-    in
-    {arrowExpr with pexp_loc = {arrowExpr.pexp_loc with loc_start = startPos}}
-
-	(*
-   * uncurried_parameter ::=
-   *   | . parameter
-   *
-	 * parameter ::=
-	 *   | pattern
-   *   | pattern : type
-	 *   | ~ labelName
-	 *   | ~ labelName as pattern
-	 *   | ~ labelName as pattern : type
-	 *   | ~ labelName = expr
-	 *   | ~ labelName as pattern = expr
-	 *   | ~ labelName as pattern : type = expr
-	 *   | ~ labelName = ?
-	 *   | ~ labelName as pattern = ?
-	 *   | ~ labelName as pattern : type = ?
-   *
-	 * labelName ::= lident
-   *)
-  and parseParameter p =
-    if (
-      p.Parser.token = Token.Typ ||
-      p.token = Tilde ||
-      p.token = Dot ||
-      Grammar.isPatternStart p.token
-    ) then (
-      let startPos = p.Parser.startPos in
-      let uncurried = Parser.optional p Token.Dot in
-      (* two scenarios:
-       *   attrs ~lbl ...
-       *   attrs pattern
-       * Attributes before a labelled arg, indicate that it's on the whole arrow expr
-       * Otherwise it's part of the pattern
-       *  *)
-      let attrs = parseAttributes p in
-      if p.Parser.token = Typ then (
-        Parser.next p;
-        let lidents = parseLidentList p in
-        Some (TypeParameter {uncurried; attrs; locs = lidents; pos = startPos})
-      ) else (
-      let (attrs, lbl, pat) = match p.Parser.token with
-      | Tilde ->
-        Parser.next p;
-        let (lblName, loc) = parseLident p in
-        let propLocAttr = (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr []) in
-        begin match p.Parser.token with
-        | Comma | Equal | Rparen ->
-          let loc = mkLoc startPos p.prevEndPos in
-          (
-            attrs,
-            Asttypes.Labelled lblName,
-            Ast_helper.Pat.var ~attrs:[propLocAttr] ~loc (Location.mkloc lblName loc)
-          )
-        | Colon ->
-          let lblEnd = p.prevEndPos in
-          Parser.next p;
-          let typ = parseTypExpr p in
-          let loc = mkLoc startPos lblEnd in
-          let pat =
-            let pat = Ast_helper.Pat.var ~loc (Location.mkloc lblName loc) in
-            let loc = mkLoc startPos p.prevEndPos in
-            Ast_helper.Pat.constraint_ ~attrs:[propLocAttr] ~loc pat typ in
-          (attrs, Asttypes.Labelled lblName, pat)
-        | As ->
-          Parser.next p;
-          let pat =
-            let pat = parseConstrainedPattern p in
-            {pat with ppat_attributes = propLocAttr::pat.ppat_attributes}
-          in
-          (attrs, Asttypes.Labelled lblName, pat)
-        | t ->
-          Parser.err p (Diagnostics.unexpected t p.breadcrumbs);
-          let loc = mkLoc startPos p.prevEndPos in
-          (
-            attrs,
-            Asttypes.Labelled lblName,
-            Ast_helper.Pat.var ~loc (Location.mkloc lblName loc)
-          )
-        end
-      | _ ->
-        let pattern = parseConstrainedPattern p in
-        let attrs = List.concat [attrs; pattern.ppat_attributes] in
-        ([], Asttypes.Nolabel, {pattern with ppat_attributes = attrs})
-      in
-      match p.Parser.token with
-      | Equal ->
-        Parser.next p;
-        let lbl = match lbl with
-        | Asttypes.Labelled lblName -> Asttypes.Optional lblName
-        | Asttypes.Optional _ as lbl -> lbl
-        | Asttypes.Nolabel -> Asttypes.Nolabel
-        in
-        begin match p.Parser.token with
-        | Question ->
-          Parser.next p;
-          Some (TermParameter {uncurried; attrs; label = lbl; expr = None; pat; pos = startPos})
-        | _ ->
-          let expr = parseConstrainedOrCoercedExpr p in
-          Some (TermParameter {uncurried; attrs; label = lbl; expr = Some expr; pat; pos = startPos})
-        end
-      | _ ->
-        Some (TermParameter {uncurried; attrs; label = lbl; expr = None; pat; pos = startPos})
-    )
-    ) else None
-
-  and parseParameterList p =
-    let parameters =
-      parseCommaDelimitedRegion
-        ~grammar:Grammar.ParameterList
-        ~f:parseParameter
-        ~closing:Rparen
-        p
-    in
-    Parser.expect Rparen p;
-    parameters
-
-  (* parameters ::=
-   *   | _
-   *   | lident
-   *   | ()
-   *   | (.)
-   *   | ( parameter {, parameter} [,] )
-   *)
-  and parseParameters p =
-    let startPos = p.Parser.startPos in
-    match p.Parser.token with
-    | Lident ident ->
-      Parser.next p;
-      let loc = mkLoc startPos p.Parser.prevEndPos in
-      [TermParameter {
-        uncurried = false;
-        attrs = [];
-        label = Asttypes.Nolabel;
-        expr = None;
-        pat = Ast_helper.Pat.var ~loc (Location.mkloc ident loc);
-        pos = startPos;
-      }]
-    | List ->
-      Parser.next p;
-      let loc = mkLoc startPos p.Parser.prevEndPos in
-      [TermParameter {
-        uncurried = false;
-        attrs = [];
-        label = Asttypes.Nolabel;
-        expr = None;
-        pat = Ast_helper.Pat.var ~loc (Location.mkloc "list" loc);
-        pos = startPos;
-      }]
-    | Underscore ->
-      Parser.next p;
-      let loc = mkLoc startPos p.Parser.prevEndPos in
-      [TermParameter {uncurried = false; attrs = []; label = Asttypes.Nolabel; expr = None; pat = Ast_helper.Pat.any ~loc (); pos = startPos}]
-    | Lparen ->
-      Parser.next p;
-      begin match p.Parser.token with
-      | Rparen ->
-        Parser.next p;
-        let loc = mkLoc startPos p.Parser.prevEndPos in
-        let unitPattern = Ast_helper.Pat.construct
-          ~loc (Location.mkloc (Longident.Lident "()") loc) None
-        in
-        [TermParameter {uncurried = false; attrs = []; label = Asttypes.Nolabel; expr = None; pat = unitPattern; pos = startPos}]
-      | Dot ->
-        Parser.next p;
-        begin match p.token with
-        | Rparen ->
-          Parser.next p;
-          let loc = mkLoc startPos p.Parser.prevEndPos in
-          let unitPattern = Ast_helper.Pat.construct
-            ~loc (Location.mkloc (Longident.Lident "()") loc) None
-          in
-          [TermParameter {uncurried = true; attrs = []; label = Asttypes.Nolabel; expr = None; pat = unitPattern; pos = startPos}]
-        | _ ->
-          begin match parseParameterList p with
-          | (TermParameter {attrs; label = lbl; expr = defaultExpr; pat = pattern; pos = startPos})::rest ->
-            (TermParameter {uncurried = true; attrs; label = lbl; expr = defaultExpr; pat = pattern; pos = startPos})::rest
-          | parameters -> parameters
-          end
-        end
-      | _ -> parseParameterList p
-      end
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      []
-
-  and parseCoercedExpr ~(expr: Parsetree.expression) p =
-    Parser.expect ColonGreaterThan p;
-    let typ = parseTypExpr p in
-    let loc = mkLoc expr.pexp_loc.loc_start p.prevEndPos in
-    Ast_helper.Exp.coerce ~loc expr None typ
-
-  and parseConstrainedOrCoercedExpr p =
-    let expr = parseExpr p in
-    match p.Parser.token with
-    | ColonGreaterThan ->
-      parseCoercedExpr ~expr p
-    | Colon ->
-      Parser.next p;
-      begin match p.token with
-      | _ ->
-        let typ = parseTypExpr p in
-        let loc = mkLoc expr.pexp_loc.loc_start typ.ptyp_loc.loc_end in
-        let expr = Ast_helper.Exp.constraint_ ~loc expr typ in
-        begin match p.token with
-          | ColonGreaterThan ->
-            parseCoercedExpr ~expr p
-          | _ ->
-            expr
-        end
-      end
-    | _ -> expr
-
-
-  and parseConstrainedExprRegion p =
-    match p.Parser.token with
-    | token when Grammar.isExprStart token ->
-      let expr = parseExpr p in
-      begin match p.Parser.token with
-      | Colon ->
-        Parser.next p;
-        let typ = parseTypExpr p in
-        let loc = mkLoc expr.pexp_loc.loc_start typ.ptyp_loc.loc_end in
-        Some (Ast_helper.Exp.constraint_ ~loc expr typ)
-      | _ -> Some expr
-      end
-    | _ -> None
-
-  (* Atomic expressions represent unambiguous expressions.
-   * This means that regardless of the context, these expressions
-   * are always interpreted correctly. *)
-  and parseAtomicExpr p =
-    Parser.leaveBreadcrumb p Grammar.ExprOperand;
-    let startPos = p.Parser.startPos in
-    let expr = match p.Parser.token with
-      | (True | False) as token ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Exp.construct ~loc
-          (Location.mkloc (Longident.Lident (Token.toString token)) loc) None
-      | Int _ | String _ | Float _ | Character _ ->
-        let c = parseConstant p in
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Exp.constant ~loc c
-      | Backtick ->
-        let expr = parseTemplateExpr p in
-        {expr with pexp_loc = mkLoc startPos p.prevEndPos}
-      | Uident _ | Lident _ ->
-        parseValueOrConstructor p
-      | Hash ->
-        parsePolyVariantExpr p
-      | Lparen ->
-        Parser.next p;
-        begin match p.Parser.token with
-        | Rparen ->
-          Parser.next p;
-          let loc = mkLoc startPos p.prevEndPos in
-          Ast_helper.Exp.construct
-            ~loc (Location.mkloc (Longident.Lident "()") loc) None
-        | _t ->
-          let expr = parseConstrainedOrCoercedExpr p in
-          begin match p.token with
-          | Comma ->
-            Parser.next p;
-            parseTupleExpr ~startPos ~first:expr p
-          | _ ->
-            Parser.expect Rparen p;
-            expr
-            (* {expr with pexp_loc = mkLoc startPos p.prevEndPos}
-             * What does this location mean here? It means that when there's
-             * a parenthesized we keep the location here for whitespace interleaving.
-             * Without the closing paren in the location there will always be an extra
-             * line. For now we don't include it, because it does weird things
-             * with for comments. *)
-          end
-        end
-      | List ->
-        Parser.next p;
-        begin match p.token with
-        | Lbracket ->
-          parseListExpr ~startPos  p
-        | _ ->
-          let loc = mkLoc startPos p.prevEndPos in
-          Ast_helper.Exp.ident ~loc (Location.mkloc (Longident.Lident "list") loc)
-        end
-      | Module ->
-        Parser.next p;
-        parseFirstClassModuleExpr ~startPos p
-      | Lbracket ->
-        parseArrayExp p
-      | Lbrace ->
-        parseBracedOrRecordExpr  p
-      | LessThan ->
-        parseJsx p
-      | Percent ->
-        let extension = parseExtension p in
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Exp.extension ~loc extension
-      | Underscore as token ->
-        (* This case is for error recovery. Not sure if it's the correct place *)
-        Parser.err p (Diagnostics.lident token);
-        Parser.next p;
-        Recover.defaultExpr ()
-      | token ->
-        let errPos = p.prevEndPos in
-        begin match skipTokensAndMaybeRetry p ~isStartOfGrammar:Grammar.isAtomicExprStart with
-        | None ->
-          Parser.err ~startPos:errPos p (Diagnostics.unexpected token p.breadcrumbs);
-          Recover.defaultExpr ()
-        | Some () -> parseAtomicExpr p
-        end
-    in
-    Parser.eatBreadcrumb p;
-    expr
-
-  (* module(module-expr)
-   * module(module-expr : package-type) *)
-  and parseFirstClassModuleExpr ~startPos p =
-    Parser.expect Lparen p;
-
-    let modExpr = parseModuleExpr p in
-    let modEndLoc = p.prevEndPos in
-    begin match p.Parser.token with
-    | Colon ->
-      let colonStart = p.Parser.startPos in
-      Parser.next p;
-      let attrs = parseAttributes p in
-      let packageType = parsePackageType ~startPos:colonStart ~attrs p in
-      Parser.expect Rparen p;
-      let loc = mkLoc startPos modEndLoc in
-      let firstClassModule = Ast_helper.Exp.pack ~loc modExpr in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.constraint_ ~loc firstClassModule packageType
-    | _ ->
-      Parser.expect Rparen p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.pack ~loc modExpr
-    end
-
-  and parseBracketAccess p expr startPos =
-    Parser.leaveBreadcrumb p Grammar.ExprArrayAccess;
-    let lbracket = p.startPos in
-    Parser.next p;
-    let stringStart = p.startPos in
-    match p.Parser.token with
-    | String s ->
-      Parser.next p;
-      let stringEnd = p.prevEndPos in
-      Parser.expect Rbracket p;
-      let rbracket = p.prevEndPos in
-      let e =
-        let identLoc = mkLoc stringStart stringEnd in
-        let loc = mkLoc lbracket rbracket in
-        Ast_helper.Exp.apply ~loc
-        (Ast_helper.Exp.ident ~loc (Location.mkloc (Longident.Lident "##") loc))
-        [Nolabel, expr; Nolabel, (Ast_helper.Exp.ident ~loc:identLoc (Location.mkloc (Longident.Lident s) identLoc))]
-      in
-      let e = parsePrimaryExpr ~operand:e p in
-      let equalStart = p.startPos in
-      begin match p.token with
-      | Equal ->
-        Parser.next p;
-        let equalEnd = p.prevEndPos in
-        let rhsExpr = parseExpr p in
-        let loc = mkLoc startPos rhsExpr.pexp_loc.loc_end in
-        let operatorLoc = mkLoc equalStart equalEnd in
-        Ast_helper.Exp.apply ~loc
-          (Ast_helper.Exp.ident ~loc:operatorLoc (Location.mkloc (Longident.Lident "#=") operatorLoc))
-          [Nolabel, e; Nolabel, rhsExpr]
-      | _ -> e
-      end
-    | _ ->
-      let accessExpr = parseConstrainedOrCoercedExpr p in
-      Parser.expect Rbracket p;
-      let rbracket = p.prevEndPos in
-      let arrayLoc = mkLoc lbracket rbracket in
-      begin match p.token with
-      | Equal ->
-        Parser.leaveBreadcrumb p ExprArrayMutation;
-        Parser.next p;
-        let rhsExpr = parseExpr p in
-        let arraySet = Location.mkloc
-          (Longident.Ldot(Lident "Array", "set"))
-          arrayLoc
-        in
-        let endPos = p.prevEndPos in
-        let arraySet = Ast_helper.Exp.apply
-          ~loc:(mkLoc startPos endPos)
-          (Ast_helper.Exp.ident ~loc:arrayLoc arraySet)
-          [Nolabel, expr; Nolabel, accessExpr; Nolabel, rhsExpr]
-        in
-        Parser.eatBreadcrumb p;
-        arraySet
-      | _ ->
-        let endPos = p.prevEndPos in
-        let e =
-          Ast_helper.Exp.apply
-            ~loc:(mkLoc startPos endPos)
-            (Ast_helper.Exp.ident
-              ~loc:arrayLoc
-              (Location.mkloc (Longident.Ldot(Lident "Array", "get")) arrayLoc)
-              )
-            [Nolabel, expr; Nolabel, accessExpr]
-        in
-        Parser.eatBreadcrumb p;
-        parsePrimaryExpr ~operand:e p
-      end
-
-  (* * A primary expression represents
-   *  - atomic-expr
-   *  - john.age
-   *  - array[0]
-   *  - applyFunctionTo(arg1, arg2)
-   *
-   *  The "operand" represents the expression that is operated on
-   *)
-  and parsePrimaryExpr ~operand ?(noCall=false) p =
-    let startPos = operand.pexp_loc.loc_start in
-    let rec loop p expr =
-      match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        let lident = parseValuePath p in
-        begin match p.Parser.token with
-        | Equal when noCall = false ->
-          Parser.leaveBreadcrumb p Grammar.ExprSetField;
-          Parser.next p;
-          let targetExpr = parseExpr p in
-          let loc = mkLoc startPos p.prevEndPos in
-          let setfield = Ast_helper.Exp.setfield ~loc expr lident targetExpr  in
-          Parser.eatBreadcrumb p;
-          setfield
-        | _ ->
-          let endPos = p.prevEndPos in
-          let loc = mkLoc startPos endPos in
-          loop p (Ast_helper.Exp.field ~loc expr lident)
-        end
-      | Lbracket when noCall = false && p.prevEndPos.pos_lnum == p.startPos.pos_lnum ->
-        parseBracketAccess p expr startPos
-      | Lparen when noCall = false && p.prevEndPos.pos_lnum == p.startPos.pos_lnum ->
-        loop p (parseCallExpr p expr)
-      | Backtick when noCall = false && p.prevEndPos.pos_lnum == p.startPos.pos_lnum ->
-        begin match expr.pexp_desc with
-        | Pexp_ident {txt = Longident.Lident ident} ->
-          parseTemplateExpr ~prefix:ident p
-        | _ ->
-          Parser.err
-            ~startPos:expr.pexp_loc.loc_start
-            ~endPos:expr.pexp_loc.loc_end
-            p
-            (Diagnostics.message "Tagged template literals are currently restricted to identifiers like: json`null`.");
-          parseTemplateExpr p
-        end
-      | _ -> expr
-    in
-    loop p operand
-
-  (* a unary expression is an expression with only one operand and
-   * unary operator. Examples:
-   *   -1
-   *   !condition
-   *   -. 1.6
-   *)
-  and parseUnaryExpr p =
-    let startPos = p.Parser.startPos in
-    match p.Parser.token with
-    | (Minus | MinusDot | Plus | PlusDot | Bang) as token ->
-      Parser.leaveBreadcrumb p Grammar.ExprUnary;
-      let tokenEnd = p.endPos in
-      Parser.next p;
-      let operand = parseUnaryExpr p in
-      let unaryExpr = makeUnaryExpr startPos tokenEnd token operand  in
-      Parser.eatBreadcrumb p;
-      unaryExpr
-    | _ ->
-      parsePrimaryExpr ~operand:(parseAtomicExpr p) p
-
-  (* Represents an "operand" in a binary expression.
-   * If you have `a + b`, `a` and `b` both represent
-   * the operands of the binary expression with opeartor `+` *)
-  and parseOperandExpr ~context p =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributes p in
-    let expr = match p.Parser.token with
-    | Assert ->
-      Parser.next p;
-      let expr = parseUnaryExpr p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.assert_ ~loc expr
-    | Lazy ->
-      Parser.next p;
-      let expr = parseUnaryExpr p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.lazy_ ~loc expr
-    | Try ->
-      parseTryExpression p
-    | If ->
-      parseIfExpression p
-    | For ->
-      parseForExpression p
-    | While ->
-      parseWhileExpression p
-    | Switch ->
-      parseSwitchExpression p
-    | _ ->
-      if (context != WhenExpr) &&
-         isEs6ArrowExpression ~inTernary:(context=TernaryTrueBranchExpr) p
-      then
-        parseEs6ArrowExpression p
-      else
-        parseUnaryExpr p
-    in
-    (* let endPos = p.Parser.prevEndPos in *)
-    {expr with
-      pexp_attributes = List.concat[expr.Parsetree.pexp_attributes; attrs];
-      (* pexp_loc = mkLoc startPos endPos *)
-    }
-
-  (* a binary expression is an expression that combines two expressions with an
-   * operator. Examples:
-   *    a + b
-   *    f(x) |> g(y)
-   *)
-  and parseBinaryExpr ?(context=OrdinaryExpr) ?a p prec =
-    let a = match a with
-    | Some e -> e
-    | None -> parseOperandExpr ~context p
-    in
-    let rec loop a =
-      let token = p.Parser.token in
-      let tokenPrec =
-        match token with
-        (* Can the minus be interpreted as a binary operator? Or is it a unary?
-         * let w = {
-         *   x
-         *   -10
-         * }
-         * vs
-         * let w = {
-         *   width
-         *   - gap
-         * }
-         *
-         * First case is unary, second is a binary operator.
-         * See Scanner.isBinaryOp *)
-        | Minus | MinusDot | LessThan when not (
-            Scanner.isBinaryOp p.scanner.src p.startPos.pos_cnum p.endPos.pos_cnum
-          ) && p.startPos.pos_lnum > p.prevEndPos.pos_lnum -> -1
-        | token -> Token.precedence token
-      in
-      if tokenPrec < prec then a
-      else begin
-        Parser.leaveBreadcrumb p (Grammar.ExprBinaryAfterOp token);
-        let startPos = p.startPos in
-        Parser.next p;
-        let endPos = p.prevEndPos in
-        let b = parseBinaryExpr ~context p (tokenPrec + 1) in
-        let loc = mkLoc a.Parsetree.pexp_loc.loc_start b.pexp_loc.loc_end in
-        let expr = Ast_helper.Exp.apply
-          ~loc
-          (makeInfixOperator p token startPos endPos)
-          [Nolabel, a; Nolabel, b]
-        in
-        loop expr
-      end
-    in
-    loop a
-
-  (* If we even need this, determines if < might be the start of jsx. Not 100% complete *)
-  (* and isStartOfJsx p = *)
-    (* Parser.lookahead p (fun p -> *)
-      (* match p.Parser.token with *)
-      (* | LessThan -> *)
-        (* Parser.next p; *)
-        (* begin match p.token with *)
-        (* | GreaterThan (* <> *) -> true *)
-        (* | Lident _ | Uident _ | List -> *)
-          (* ignore (parseJsxName p); *)
-          (* begin match p.token with *)
-          (* | GreaterThan (* <div> *) -> true *)
-          (* | Question (*<Component ? *) -> true *)
-          (* | Lident _ | List -> *)
-            (* Parser.next p; *)
-            (* begin match p.token with *)
-            (* | Equal (* <Component handleClick= *) -> true *)
-            (* | _ -> false (* TODO *) *)
-            (* end *)
-          (* | Forwardslash (* <Component / *)-> *)
-            (* Parser.next p; *)
-            (* begin match p.token with *)
-            (* | GreaterThan (* <Component /> *) -> true *)
-            (* | _ -> false *)
-            (* end *)
-          (* | _ -> *)
-            (* false *)
-          (* end *)
-        (* | _ -> false *)
-        (* end *)
-      (* | _ -> false *)
-    (* ) *)
-
-  and parseTemplateExpr ?(prefix="") p =
-    let hiddenOperator =
-      let op = Location.mknoloc (Longident.Lident "^") in
-      Ast_helper.Exp.ident op
-    in
-    let rec loop acc p =
-      let startPos = p.Parser.startPos in
-      match p.Parser.token with
-      | TemplateTail txt ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        if String.length txt > 0 then
-          let txt = if p.mode = ParseForTypeChecker then parseTemplateStringLiteral txt else txt in
-          let str = Ast_helper.Exp.constant ~loc (Pconst_string(txt, Some prefix)) in
-          Ast_helper.Exp.apply ~loc hiddenOperator
-            [Nolabel, acc; Nolabel, str]
-        else
-          acc
-      | TemplatePart txt ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let expr = parseExprBlock p in
-        let fullLoc = mkLoc startPos p.prevEndPos in
-        Scanner.setTemplateMode p.scanner;
-        Parser.expect Rbrace p;
-        let txt = if p.mode = ParseForTypeChecker then parseTemplateStringLiteral txt else txt in
-        let str = Ast_helper.Exp.constant ~loc (Pconst_string(txt, Some prefix)) in
-        let next =
-          let a = if String.length txt > 0 then
-              Ast_helper.Exp.apply ~loc:fullLoc hiddenOperator [Nolabel, acc; Nolabel, str]
-            else acc
-          in
-          Ast_helper.Exp.apply ~loc:fullLoc hiddenOperator
-            [Nolabel, a; Nolabel, expr]
-        in
-        loop next p
-      | token ->
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        acc
-    in
-    Scanner.setTemplateMode p.scanner;
-    Parser.expect Backtick p;
-    let startPos = p.Parser.startPos in
-    match p.Parser.token with
-    | TemplateTail txt ->
-      let loc = mkLoc startPos p.endPos in
-      Parser.next p;
-      let txt = if p.mode = ParseForTypeChecker then parseTemplateStringLiteral txt else txt in
-      Ast_helper.Exp.constant ~loc (Pconst_string(txt, Some prefix))
-    | TemplatePart txt ->
-      let constantLoc = mkLoc startPos p.endPos in
-      Parser.next p;
-      let expr = parseExprBlock p in
-      let fullLoc = mkLoc startPos p.prevEndPos in
-      Scanner.setTemplateMode p.scanner;
-      Parser.expect Rbrace p;
-      let txt = if p.mode = ParseForTypeChecker then parseTemplateStringLiteral txt else txt in
-      let str = Ast_helper.Exp.constant ~loc:constantLoc (Pconst_string(txt, Some prefix)) in
-      let next =
-        if String.length txt > 0 then
-          Ast_helper.Exp.apply ~loc:fullLoc hiddenOperator [Nolabel, str; Nolabel, expr]
-        else
-          expr
-      in
-      loop next p
-   | token ->
-     Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-     Ast_helper.Exp.constant (Pconst_string("", None))
-
-  (* Overparse: let f = a : int => a + 1, is it (a : int) => or (a): int =>
-   * Also overparse constraints:
-   *  let x = {
-   *    let a = 1
-   *    a + pi: int
-   *  }
-   *
-   *  We want to give a nice error message in these cases
-   *  *)
-  and overParseConstrainedOrCoercedOrArrowExpression p expr =
-    match p.Parser.token with
-    | ColonGreaterThan ->
-      parseCoercedExpr ~expr p
-    | Colon ->
-      Parser.next p;
-      let typ = parseTypExpr ~es6Arrow:false p in
-      begin match p.Parser.token with
-      | EqualGreater ->
-        Parser.next p;
-        let body = parseExpr p in
-        let pat = match expr.pexp_desc with
-        | Pexp_ident longident ->
-          Ast_helper.Pat.var ~loc:expr.pexp_loc
-            (Location.mkloc
-              (Longident.flatten longident.txt |> String.concat ".")
-              longident.loc)
-        (* TODO: can we convert more expressions to patterns?*)
-        | _ ->
-          Ast_helper.Pat.var ~loc:expr.pexp_loc (Location.mkloc "pattern" expr.pexp_loc)
-        in
-        let arrow1 = Ast_helper.Exp.fun_
-          ~loc:(mkLoc expr.pexp_loc.loc_start body.pexp_loc.loc_end)
-          Asttypes.Nolabel
-          None
-          pat
-          (Ast_helper.Exp.constraint_ body typ)
-        in
-        let arrow2 = Ast_helper.Exp.fun_
-          ~loc:(mkLoc expr.pexp_loc.loc_start body.pexp_loc.loc_end)
-          Asttypes.Nolabel
-          None
-          (Ast_helper.Pat.constraint_ pat typ)
-          body
-        in
-        let msg =
-          Doc.breakableGroup ~forceBreak:true (
-            Doc.concat [
-              Doc.text "Did you mean to annotate the parameter type or the return type?";
-              Doc.indent (
-                Doc.concat [
-                  Doc.line;
-                  Doc.text "1) ";
-                  Printer.printExpression arrow1 CommentTable.empty;
-                  Doc.line;
-                  Doc.text "2) ";
-                  Printer.printExpression arrow2 CommentTable.empty;
-                ]
-              )
-            ]
-          ) |> Doc.toString ~width:80
-        in
-        Parser.err
-          ~startPos:expr.pexp_loc.loc_start
-          ~endPos:body.pexp_loc.loc_end
-          p
-          (Diagnostics.message msg);
-        arrow1
-      | _ ->
-        let open Parsetree in
-        let loc = mkLoc expr.pexp_loc.loc_start typ.ptyp_loc.loc_end in
-        let expr = Ast_helper.Exp.constraint_ ~loc expr typ in
-        let () = Parser.err
-          ~startPos:expr.pexp_loc.loc_start
-          ~endPos:typ.ptyp_loc.loc_end
-          p
-          (Diagnostics.message
-            (Doc.breakableGroup ~forceBreak:true (Doc.concat [
-              Doc.text "Expressions with type constraints need to be wrapped in parens:";
-              Doc.indent (
-                Doc.concat [
-                Doc.line;
-                Printer.addParens (Printer.printExpression expr CommentTable.empty);
-                ]
-              )
-            ]) |> Doc.toString ~width:80
-          ))
-        in
-        expr
-      end
-    | _ -> expr
-
-  and parseLetBindingBody ~startPos ~attrs p =
-    Parser.beginRegion p;
-    Parser.leaveBreadcrumb p Grammar.LetBinding;
-    let pat, exp =
-      let pat = parsePattern p in
-      match p.Parser.token with
-      | Colon ->
-        Parser.next p;
-        begin match p.token with
-        | Typ -> (* locally abstract types *)
-          Parser.next p;
-          let newtypes = parseLidentList p in
-          Parser.expect Dot p;
-          let typ = parseTypExpr p in
-          Parser.expect Equal p;
-          let expr = parseExpr p in
-          let loc = mkLoc startPos p.prevEndPos in
-          let exp, poly = wrapTypeAnnotation ~loc newtypes typ expr in
-          let pat = Ast_helper.Pat.constraint_ ~loc pat poly in
-          (pat, exp)
-        | _ ->
-          let polyType = parsePolyTypeExpr p in
-          let loc = {pat.ppat_loc with loc_end = polyType.Parsetree.ptyp_loc.loc_end} in
-          let pat = Ast_helper.Pat.constraint_ ~loc pat polyType in
-          Parser.expect Token.Equal p;
-          let exp = parseExpr p in
-          let exp = overParseConstrainedOrCoercedOrArrowExpression p exp in
-          (pat, exp)
-        end
-      | _ ->
-        Parser.expect Token.Equal p;
-        let exp = overParseConstrainedOrCoercedOrArrowExpression p (parseExpr p) in
-        (pat, exp)
-    in
-    let loc = mkLoc startPos p.prevEndPos in
-    let vb = Ast_helper.Vb.mk ~loc ~attrs pat exp in
-    Parser.eatBreadcrumb p;
-    Parser.endRegion p;
-    vb
-
-  (* TODO: find a better way? Is it possible?
-   * let a = 1
-   * @attr
-   * and b = 2
-   *
-   * The problem is that without semi we need a lookahead to determine
-   * if the attr is on the letbinding or the start of a new thing
-   *
-   * let a = 1
-   * @attr
-   * let b = 1
-   *
-   * Here @attr should attach to something "new": `let b = 1`
-   * The parser state is forked, which is quite expensive…
-   *)
-  and parseAttributesAndBinding (p : Parser.t) =
-    let err = p.scanner.err in
-    let ch = p.scanner.ch in
-    let offset = p.scanner.offset in
-    let rdOffset = p.scanner.rdOffset in
-    let lineOffset = p.scanner.lineOffset in
-    let lnum = p.scanner.lnum in
-    let mode = p.scanner.mode in
-    let token = p.token in
-    let startPos = p.startPos in
-    let endPos = p.endPos in
-    let prevEndPos = p.prevEndPos in
-    let breadcrumbs = p.breadcrumbs in
-    let errors = p.errors in
-    let diagnostics = p.diagnostics in
-    let comments = p.comments in
-
-    match p.Parser.token with
-    | At ->
-      let attrs = parseAttributes p in
-      begin match p.Parser.token with
-      | And ->
-        attrs
-      | _ ->
-        p.scanner.err <- err;
-        p.scanner.ch <- ch;
-        p.scanner.offset <- offset;
-        p.scanner.rdOffset <- rdOffset;
-        p.scanner.lineOffset <- lineOffset;
-        p.scanner.lnum <- lnum;
-        p.scanner.mode <- mode;
-        p.token <- token;
-        p.startPos <- startPos;
-        p.endPos <- endPos;
-        p.prevEndPos <- prevEndPos;
-        p.breadcrumbs <- breadcrumbs;
-        p.errors <- errors;
-        p.diagnostics <- diagnostics;
-        p.comments <- comments;
-        []
-      end
-    | _ -> []
-
-  (* definition	::=	let [rec] let-binding  { and let-binding }   *)
-  and parseLetBindings ~attrs p =
-    let startPos = p.Parser.startPos in
-    Parser.optional p Let |> ignore;
-    let recFlag = if Parser.optional p Token.Rec then
-      Asttypes.Recursive
-    else
-      Asttypes.Nonrecursive
-    in
-    let first = parseLetBindingBody ~startPos ~attrs p in
-
-    let rec loop p bindings =
-      let startPos = p.Parser.startPos in
-      let attrs = parseAttributesAndBinding p in
-      match p.Parser.token with
-      | And ->
-        Parser.next p;
-        let attrs = match p.token with
-        | Export ->
-          let exportLoc = mkLoc p.startPos p.endPos in
-          Parser.next p;
-          let genTypeAttr = (Location.mkloc "genType" exportLoc, Parsetree.PStr []) in
-          genTypeAttr::attrs
-        | _ -> attrs
-        in
-        ignore(Parser.optional p Let); (* overparse for fault tolerance *)
-        let letBinding = parseLetBindingBody ~startPos ~attrs p in
-        loop p (letBinding::bindings)
-      | _ ->
-        List.rev bindings
-    in
-    (recFlag, loop p [first])
-
-  (*
-   * div -> div
-   * Foo -> Foo.createElement
-   * Foo.Bar -> Foo.Bar.createElement
-   *)
-  and parseJsxName p =
-    let longident = match p.Parser.token with
-    | Lident ident ->
-      let identStart = p.startPos in
-      let identEnd = p.endPos in
-      Parser.next p;
-      let loc = mkLoc identStart identEnd in
-      Location.mkloc (Longident.Lident ident) loc
-    | Uident _ ->
-      let longident = parseModuleLongIdent ~lowercase:false p in
-      Location.mkloc (Longident.Ldot (longident.txt, "createElement")) longident.loc
-    | _ ->
-      let msg = "A jsx name should start with a lowercase or uppercase identifier, like: div in <div /> or Navbar in <Navbar />"
-      in
-      Parser.err p (Diagnostics.message msg);
-      Location.mknoloc (Longident.Lident "_")
-    in
-    Ast_helper.Exp.ident ~loc:longident.loc longident
-
-  and parseJsxOpeningOrSelfClosingElement ~startPos p =
-    let jsxStartPos = p.Parser.startPos in
-    let name = parseJsxName p in
-    let jsxProps = parseJsxProps p in
-    let children = match p.Parser.token with
-    | Forwardslash -> (* <foo a=b /> *)
-      let childrenStartPos = p.Parser.startPos in
-      Parser.next p;
-      let childrenEndPos = p.Parser.startPos in
-      Parser.expect GreaterThan p;
-      let loc = mkLoc childrenStartPos childrenEndPos in
-      makeListExpression loc [] None (* no children *)
-    | GreaterThan -> (* <foo a=b> bar </foo> *)
-      let childrenStartPos = p.Parser.startPos in
-      Scanner.setJsxMode p.scanner;
-      Parser.next p;
-      let (spread, children) = parseJsxChildren p in
-      let childrenEndPos = p.Parser.startPos in
-      let () = match p.token with
-      | LessThanSlash -> Parser.next p
-      | LessThan -> Parser.next p; Parser.expect Forwardslash p
-      | token when Grammar.isStructureItemStart token -> ()
-      | _ -> Parser.expect LessThanSlash p
-      in
-      begin match p.Parser.token with
-      | Lident _ | Uident _ when verifyJsxOpeningClosingName p name ->
-        Parser.expect GreaterThan p;
-        let loc = mkLoc childrenStartPos childrenEndPos in
-        ( match spread, children with
-          | true, child :: _ ->
-            child
-          | _ ->
-            makeListExpression loc children None
-        )
-      | token ->
-        let () = if Grammar.isStructureItemStart token then (
-          let closing = "</" ^ (string_of_pexp_ident name) ^ ">" in
-          let msg = Diagnostics.message ("Missing " ^ closing) in
-          Parser.err ~startPos ~endPos:p.prevEndPos p msg;
-        ) else (
-          let opening = "</" ^ (string_of_pexp_ident name) ^ ">" in
-          let msg = "Closing jsx name should be the same as the opening name. Did you mean " ^ opening ^ " ?" in
-          Parser.err ~startPos ~endPos:p.prevEndPos p (Diagnostics.message msg);
-          Parser.expect GreaterThan p
-        )
-        in
-        let loc = mkLoc childrenStartPos childrenEndPos in
-        ( match spread, children with
-          | true, child :: _ ->
-            child
-          | _ ->
-            makeListExpression loc children None
-        )
-      end
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      makeListExpression Location.none [] None
-    in
-    let jsxEndPos = p.prevEndPos in
-    let loc = mkLoc jsxStartPos jsxEndPos in
-    Ast_helper.Exp.apply
-      ~loc
-      name
-      (List.concat [jsxProps; [
-        (Asttypes.Labelled "children", children);
-        (Asttypes.Nolabel, Ast_helper.Exp.construct (Location.mknoloc (Longident.Lident "()")) None)
-      ]])
-
-  (*
-   *  jsx ::=
-   *    | <> jsx-children </>
-   *    | <element-name {jsx-prop} />
-   *    | <element-name {jsx-prop}> jsx-children </element-name>
-   *
-   *  jsx-children ::= primary-expr*          * => 0 or more
-   *)
-  and parseJsx p =
-    Parser.leaveBreadcrumb p Grammar.Jsx;
-    let startPos = p.Parser.startPos in
-    Parser.expect LessThan p;
-    let jsxExpr = match p.Parser.token with
-    | Lident _ | Uident _ ->
-      parseJsxOpeningOrSelfClosingElement ~startPos p
-    | GreaterThan -> (* fragment: <> foo </> *)
-      parseJsxFragment p
-    | _ ->
-      parseJsxName p
-    in
-    {jsxExpr with pexp_attributes = [jsxAttr]}
-
-  (*
-   * jsx-fragment ::=
-   *  | <> </>
-   *  | <> jsx-children </>
-   *)
-  and parseJsxFragment p =
-    let childrenStartPos = p.Parser.startPos in
-    Scanner.setJsxMode p.scanner;
-    Parser.expect GreaterThan p;
-    let (_spread, children) = parseJsxChildren p in
-    let childrenEndPos = p.Parser.startPos in
-    Parser.expect LessThanSlash p;
-    Parser.expect GreaterThan p;
-    let loc = mkLoc childrenStartPos childrenEndPos in
-    makeListExpression loc children None
-
-
-  (*
-   * jsx-prop ::=
-   *   |  lident
-   *   | ?lident
-   *   |  lident =  jsx_expr
-   *   |  lident = ?jsx_expr
-   *)
-  and parseJsxProp p =
-    Parser.leaveBreadcrumb p Grammar.JsxAttribute;
-    match p.Parser.token with
-    | Question | Lident _ ->
-      let optional = Parser.optional p Question in
-      let (name, loc) = parseLident p in
-      let propLocAttr = (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr []) in
-      (* optional punning: <foo ?a /> *)
-      if optional then
-        Some (
-          Asttypes.Optional name,
-          Ast_helper.Exp.ident ~attrs:[propLocAttr]
-            ~loc (Location.mkloc (Longident.Lident name) loc)
-        )
-      else begin
-        match p.Parser.token with
-        | Equal ->
-          Parser.next p;
-          (* no punning *)
-          let optional = Parser.optional p Question in
-          let attrExpr =
-            let e = parsePrimaryExpr ~operand:(parseAtomicExpr p) p in
-            {e with pexp_attributes = propLocAttr::e.pexp_attributes}
-          in
-          let label =
-            if optional then Asttypes.Optional name else Asttypes.Labelled name
-          in
-          Some (label, attrExpr)
-        | _ ->
-          let attrExpr =
-            Ast_helper.Exp.ident ~loc ~attrs:[propLocAttr]
-              (Location.mknoloc (Longident.Lident name)) in
-          let label =
-            if optional then Asttypes.Optional name else Asttypes.Labelled name
-          in
-          Some (label, attrExpr)
-      end
-    | _ ->
-      None
-
-  and parseJsxProps p =
-    parseRegion
-      ~grammar:Grammar.JsxAttribute
-      ~f:parseJsxProp
-      p
-
-  and parseJsxChildren p =
-    let rec loop p children =
-      match p.Parser.token  with
-      | Token.Eof | LessThanSlash ->
-        Scanner.popMode p.scanner Jsx;
-        List.rev children
-      | LessThan ->
-        (* Imagine: <div> <Navbar /> <
-         * is `<` the start of a jsx-child? <div …
-         * or is it the start of a closing tag?  </div>
-         * reconsiderLessThan peeks at the next token and
-         * determines the correct token to disambiguate *)
-        let token = Scanner.reconsiderLessThan p.scanner in
-        if token = LessThan then
-          let child = parsePrimaryExpr ~operand:(parseAtomicExpr p) ~noCall:true p in
-          loop p (child::children)
-        else (* LessThanSlash *)
-          let () = p.token <- token in
-          let () = Scanner.popMode p.scanner Jsx in
-          List.rev children
-      | token when Grammar.isJsxChildStart token ->
-        let () = Scanner.popMode p.scanner Jsx in
-        let child = parsePrimaryExpr ~operand:(parseAtomicExpr p) ~noCall:true p in
-        loop p (child::children)
-      | _ ->
-        Scanner.popMode p.scanner Jsx;
-        List.rev children
-    in
-    match p.Parser.token with
-    | DotDotDot ->
-      Parser.next p;
-      (true, [parsePrimaryExpr ~operand:(parseAtomicExpr p) ~noCall:true p])
-    | _ -> (false, loop p [])
-
-  and parseBracedOrRecordExpr  p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Lbrace p;
-    match p.Parser.token with
-    | Rbrace ->
-      Parser.err p (Diagnostics.unexpected Rbrace p.breadcrumbs);
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      let braces = makeBracesAttr loc in
-      Ast_helper.Exp.construct ~attrs:[braces] ~loc
-        (Location.mkloc (Longident.Lident "()") loc) None
-    | DotDotDot ->
-      (* beginning of record spread, parse record *)
-      Parser.next p;
-      let spreadExpr = parseConstrainedOrCoercedExpr p in
-      Parser.expect Comma p;
-      let expr = parseRecordExpr ~startPos ~spread:(Some spreadExpr) [] p in
-      Parser.expect Rbrace p;
-      expr
-    | String s ->
-      let field =
-        let loc = mkLoc p.startPos p.endPos in
-        Parser.next p;
-        Location.mkloc (Longident.Lident s) loc
-      in
-      begin match p.Parser.token with
-      | Colon ->
-        Parser.next p;
-        let fieldExpr = parseExpr p in
-        Parser.optional p Comma |> ignore;
-        let expr = parseRecordExprWithStringKeys ~startPos (field, fieldExpr) p in
-        Parser.expect Rbrace p;
-        expr
-      | _ ->
-        let constant = Ast_helper.Exp.constant ~loc:field.loc (Parsetree.Pconst_string(s, None)) in
-        let a = parsePrimaryExpr ~operand:constant p in
-        let e = parseBinaryExpr ~a p 1 in
-        let e = parseTernaryExpr e p in
-        begin match p.Parser.token with
-        | Semicolon ->
-          Parser.next p;
-          let expr = parseExprBlock ~first:e p in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {expr with pexp_attributes = braces::expr.pexp_attributes}
-        | Rbrace ->
-          Parser.next p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {e with pexp_attributes = braces::e.pexp_attributes}
-        | _ ->
-          let expr = parseExprBlock ~first:e p in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {expr with pexp_attributes = braces::expr.pexp_attributes}
-        end
-      end
-    | Uident _ | Lident _ ->
-      let valueOrConstructor = parseValueOrConstructor p in
-      begin match valueOrConstructor.pexp_desc with
-      | Pexp_ident pathIdent ->
-        let identEndPos = p.prevEndPos in
-        begin match p.Parser.token with
-        | Comma ->
-          Parser.next p;
-          let expr = parseRecordExpr ~startPos [(pathIdent, valueOrConstructor)] p in
-          Parser.expect Rbrace p;
-          expr
-        | Colon ->
-          Parser.next p;
-          let fieldExpr = parseExpr p in
-          begin match p.token with
-          | Rbrace ->
-            Parser.next p;
-            let loc = mkLoc startPos p.prevEndPos in
-            Ast_helper.Exp.record ~loc [(pathIdent, fieldExpr)] None
-          | _ ->
-            Parser.expect Comma p;
-            let expr = parseRecordExpr ~startPos [(pathIdent, fieldExpr)] p in
-            Parser.expect Rbrace p;
-            expr
-          end
-        (* error case *)
-        | Lident _ ->
-          if p.prevEndPos.pos_lnum < p.startPos.pos_lnum then (
-            Parser.expect Comma p;
-            let expr = parseRecordExpr ~startPos [(pathIdent, valueOrConstructor)] p in
-            Parser.expect Rbrace p;
-            expr
-          ) else (
-            Parser.expect Colon p;
-            let expr = parseRecordExpr ~startPos [(pathIdent, valueOrConstructor)] p in
-            Parser.expect Rbrace p;
-            expr
-          )
-        | Semicolon ->
-          Parser.next p;
-          let expr = parseExprBlock ~first:(Ast_helper.Exp.ident pathIdent) p in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {expr with pexp_attributes = braces::expr.pexp_attributes}
-        | Rbrace ->
-          Parser.next p;
-          let expr = Ast_helper.Exp.ident ~loc:pathIdent.loc pathIdent in
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {expr with pexp_attributes = braces::expr.pexp_attributes}
-        | EqualGreater ->
-          let loc = mkLoc startPos identEndPos in
-          let ident = Location.mkloc (Longident.last pathIdent.txt) loc in
-          let a = parseEs6ArrowExpression
-            ~parameters:[TermParameter {
-              uncurried = false;
-              attrs = [];
-              label = Asttypes.Nolabel;
-              expr = None;
-              pat = Ast_helper.Pat.var ident;
-              pos = startPos;
-            }]
-            p
-          in
-          let e = parseBinaryExpr ~a p 1 in
-          let e = parseTernaryExpr e p in
-          begin match p.Parser.token with
-          | Semicolon ->
-            Parser.next p;
-            let expr = parseExprBlock ~first:e p in
-            Parser.expect Rbrace p;
-            let loc = mkLoc startPos p.prevEndPos in
-            let braces = makeBracesAttr loc in
-            {expr with pexp_attributes = braces::expr.pexp_attributes}
-          | Rbrace ->
-            Parser.next p;
-            let loc = mkLoc startPos p.prevEndPos in
-            let braces = makeBracesAttr loc in
-            {e with pexp_attributes = braces::e.pexp_attributes}
-          | _ ->
-            let expr = parseExprBlock ~first:e p in
-            Parser.expect Rbrace p;
-            let loc = mkLoc startPos p.prevEndPos in
-            let braces = makeBracesAttr loc in
-            {expr with pexp_attributes = braces::expr.pexp_attributes}
-          end
-        | _ ->
-          Parser.leaveBreadcrumb p Grammar.ExprBlock;
-          let a = parsePrimaryExpr ~operand:(Ast_helper.Exp.ident ~loc:pathIdent.loc pathIdent) p in
-          let e = parseBinaryExpr ~a p 1 in
-          let e = parseTernaryExpr e p in
-          Parser.eatBreadcrumb p;
-          begin match p.Parser.token with
-          | Semicolon ->
-            Parser.next p;
-            let expr = parseExprBlock ~first:e p in
-            Parser.expect Rbrace p;
-            let loc = mkLoc startPos p.prevEndPos in
-            let braces = makeBracesAttr loc in
-            {expr with pexp_attributes = braces::expr.pexp_attributes}
-          | Rbrace ->
-            Parser.next p;
-            let loc = mkLoc startPos p.prevEndPos in
-            let braces = makeBracesAttr loc in
-            {e with pexp_attributes = braces::e.pexp_attributes}
-          | _ ->
-            let expr = parseExprBlock ~first:e p in
-            Parser.expect Rbrace p;
-            let loc = mkLoc startPos p.prevEndPos in
-            let braces = makeBracesAttr loc in
-            {expr with pexp_attributes = braces::expr.pexp_attributes}
-          end
-         end
-      | _ ->
-        Parser.leaveBreadcrumb p Grammar.ExprBlock;
-        let a = parsePrimaryExpr ~operand:valueOrConstructor p in
-        let e = parseBinaryExpr ~a p 1 in
-        let e = parseTernaryExpr e p in
-        Parser.eatBreadcrumb p;
-        begin match p.Parser.token with
-        | Semicolon ->
-          Parser.next p;
-          let expr = parseExprBlock ~first:e p in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {expr with pexp_attributes = braces::expr.pexp_attributes}
-        | Rbrace ->
-          Parser.next p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {e with pexp_attributes = braces::e.pexp_attributes}
-        | _ ->
-          let expr = parseExprBlock ~first:e p in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {expr with pexp_attributes = braces::expr.pexp_attributes}
-        end
-         end
-    | _ ->
-      let expr = parseExprBlock p in
-      Parser.expect Rbrace p;
-      let loc = mkLoc startPos p.prevEndPos in
-      let braces = makeBracesAttr loc in
-      {expr with pexp_attributes = braces::expr.pexp_attributes}
-
-  and parseRecordRowWithStringKey p =
-    match p.Parser.token with
-    | String s ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      let field = Location.mkloc (Longident.Lident s) loc in
-      begin match p.Parser.token with
-      | Colon ->
-        Parser.next p;
-        let fieldExpr = parseExpr p in
-        Some (field, fieldExpr)
-      | _ ->
-        Some (field, Ast_helper.Exp.ident ~loc:field.loc field)
-      end
-    | _ -> None
-
-  and parseRecordRow p =
-    let () = match p.Parser.token with
-    | Token.DotDotDot ->
-      Parser.err p (Diagnostics.message ErrorMessages.recordExprSpread);
-      Parser.next p;
-    | _ -> ()
-    in
-    match p.Parser.token with
-    | Lident _ | Uident _ | List ->
-      let field = parseValuePath p in
-      begin match p.Parser.token with
-      | Colon ->
-        Parser.next p;
-        let fieldExpr = parseExpr p in
-        Some (field, fieldExpr)
-      | _ ->
-        Some (field, Ast_helper.Exp.ident ~loc:field.loc  field)
-      end
-    | _ -> None
-
-  and parseRecordExprWithStringKeys ~startPos firstRow p =
-    let rows = firstRow::(
-      parseCommaDelimitedRegion ~grammar:Grammar.RecordRowsStringKey ~closing:Rbrace ~f:parseRecordRowWithStringKey p
-    ) in
-    let loc = mkLoc startPos p.endPos in
-    let recordStrExpr = Ast_helper.Str.eval ~loc (
-      Ast_helper.Exp.record ~loc rows None
-    ) in
-    Ast_helper.Exp.extension ~loc
-      (Location.mkloc "bs.obj" loc, Parsetree.PStr [recordStrExpr])
-
-  and parseRecordExpr ~startPos ?(spread=None) rows p =
-    let exprs =
-      parseCommaDelimitedRegion
-        ~grammar:Grammar.RecordRows
-        ~closing:Rbrace
-        ~f:parseRecordRow p
-    in
-    let rows = List.concat [rows; exprs] in
-    let () = match rows with
-    | [] ->
-      let msg = "Record spread needs at least one field that's updated" in
-      Parser.err p (Diagnostics.message msg);
-    | _rows -> ()
-    in
-    let loc = mkLoc startPos p.endPos in
-    Ast_helper.Exp.record ~loc rows spread
-
-  and parseExprBlockItem p =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | Module ->
-      Parser.next p;
-      begin match p.token with
-      | Lparen ->
-        parseFirstClassModuleExpr ~startPos p
-      | _ ->
-        let name = match p.Parser.token with
-        | Uident ident ->
-          let loc = mkLoc p.startPos p.endPos in
-          Parser.next p;
-          Location.mkloc ident loc
-        | t ->
-          Parser.err p (Diagnostics.uident t);
-          Location.mknoloc "_"
-        in
-        let body = parseModuleBindingBody p in
-        Parser.optional p Semicolon |> ignore;
-        let expr = parseExprBlock p in
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Exp.letmodule ~loc name body expr
-      end
-    | Exception ->
-      let extensionConstructor = parseExceptionDef ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let blockExpr = parseExprBlock  p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.letexception ~loc extensionConstructor blockExpr
-    | Open ->
-      let od = parseOpenDescription ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let blockExpr = parseExprBlock p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.open_ ~loc od.popen_override od.popen_lid blockExpr
-    | Let ->
-      let (recFlag, letBindings) = parseLetBindings ~attrs p in
-      let next = match p.Parser.token with
-      | Semicolon ->
-        Parser.next p;
-        if Grammar.isBlockExprStart p.Parser.token then
-          parseExprBlock p
-        else
-          let loc = mkLoc p.startPos p.endPos in
-          Ast_helper.Exp.construct ~loc
-            (Location.mkloc (Longident.Lident "()") loc) None
-      | token when Grammar.isBlockExprStart token ->
-        parseExprBlock p
-      | _ ->
-        let loc = mkLoc p.startPos p.endPos in
-        Ast_helper.Exp.construct ~loc (Location.mkloc (Longident.Lident "()") loc) None
-      in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.let_ ~loc recFlag letBindings next
-    | _ ->
-      let e1 =
-        let expr = parseExpr p in
-        {expr with pexp_attributes = List.concat [attrs; expr.pexp_attributes]}
-      in
-      ignore (Parser.optional p Semicolon);
-      if Grammar.isBlockExprStart p.Parser.token then
-        let e2 = parseExprBlock p in
-        let loc = {e1.pexp_loc with loc_end = e2.pexp_loc.loc_end} in
-        Ast_helper.Exp.sequence ~loc e1 e2
-      else e1
-
-  (* blockExpr ::= expr
-   *            |  expr          ;
-   *            |  expr          ; blockExpr
-   *            |  module    ... ; blockExpr
-   *            |  open      ... ; blockExpr
-   *            |  exception ... ; blockExpr
-   *            |  let       ...
-   *            |  let       ... ;
-   *            |  let       ... ; blockExpr
-   *
-   *  note: semi should be made optional
-   *  a block of expression is always
-   *)
-  and parseExprBlock ?first p =
-    Parser.leaveBreadcrumb p Grammar.ExprBlock;
-    let item = match first with
-    | Some e -> e
-    | None -> parseExprBlockItem p
-    in
-    let blockExpr = match p.Parser.token with
-    | Semicolon ->
-      Parser.next p;
-      if Grammar.isBlockExprStart p.Parser.token then
-        let next = parseExprBlockItem p in
-        ignore(Parser.optional p Semicolon);
-        let loc = {item.pexp_loc with loc_end = next.pexp_loc.loc_end} in
-        Ast_helper.Exp.sequence ~loc item next
-      else
-        item
-    | token when Grammar.isBlockExprStart token ->
-      let next = parseExprBlockItem p in
-      ignore(Parser.optional p Semicolon);
-      let loc = {item.pexp_loc with loc_end = next.pexp_loc.loc_end} in
-      Ast_helper.Exp.sequence ~loc item next
-    | _ ->
-      item
-    in
-    Parser.eatBreadcrumb p;
-    overParseConstrainedOrCoercedOrArrowExpression p blockExpr
-
-  and parseTryExpression p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Try p;
-    let expr = parseExpr ~context:WhenExpr p in
-    Parser.expect Catch p;
-    Parser.expect Lbrace p;
-    let cases = parsePatternMatching p in
-    Parser.expect Rbrace p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.try_ ~loc expr cases
-
-  and parseIfExpression p =
-    Parser.beginRegion p;
-    Parser.leaveBreadcrumb p Grammar.ExprIf;
-    let startPos = p.Parser.startPos in
-    Parser.expect If p;
-    Parser.leaveBreadcrumb p Grammar.IfCondition;
-    (* doesn't make sense to try es6 arrow here? *)
-    let conditionExpr = parseExpr ~context:WhenExpr p in
-    Parser.eatBreadcrumb p;
-    Parser.leaveBreadcrumb p IfBranch;
-    Parser.expect Lbrace p;
-    let thenExpr = parseExprBlock p in
-    Parser.expect Rbrace p;
-    Parser.eatBreadcrumb p;
-    let elseExpr = match p.Parser.token with
-    | Else ->
-      Parser.endRegion p;
-      Parser.leaveBreadcrumb p Grammar.ElseBranch;
-      Parser.next p;
-      Parser.beginRegion p;
-      let elseExpr = match p.token with
-      | If ->
-        parseIfExpression p
-      | _ ->
-        Parser.expect  Lbrace p;
-        let blockExpr = parseExprBlock p in
-        Parser.expect Rbrace p;
-        blockExpr
-      in
-      Parser.eatBreadcrumb p;
-      Parser.endRegion p;
-      Some elseExpr
-    | _ ->
-      Parser.endRegion p;
-      None
-    in
-    let loc = mkLoc startPos p.prevEndPos in
-    Parser.eatBreadcrumb p;
-    Ast_helper.Exp.ifthenelse ~loc conditionExpr thenExpr elseExpr
-
-  and parseForRest hasOpeningParen pattern startPos p =
-    Parser.expect In p;
-    let e1 = parseExpr p in
-    let direction = match p.Parser.token with
-    | To -> Asttypes.Upto
-    | Downto -> Asttypes.Downto
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Asttypes.Upto
-    in
-    Parser.next p;
-    let e2 = parseExpr ~context:WhenExpr p in
-    if hasOpeningParen then Parser.expect Rparen p;
-    Parser.expect Lbrace p;
-    let bodyExpr = parseExprBlock p in
-    Parser.expect Rbrace p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.for_ ~loc pattern e1 e2 direction bodyExpr
-
-  and parseForExpression p =
-    let startPos = p.Parser.startPos in
-    Parser.expect For p;
-		match p.token with
-		| Lparen ->
-			let lparen = p.startPos in
-			Parser.next p;
-			begin match p.token with
-			| Rparen ->
-				Parser.next p;
-				let unitPattern =
-					let loc = mkLoc lparen p.prevEndPos in
-					let lid = Location.mkloc (Longident.Lident "()") loc in
-					Ast_helper.Pat.construct lid None
-				in
-        parseForRest false (parseAliasPattern ~attrs:[] unitPattern p) startPos p
-			| _ ->
-        let pat = parsePattern p in
-        begin match p.token with
-        | Comma ->
-          Parser.next p;
-          let tuplePattern =
-            parseTuplePattern ~attrs:[] ~startPos:lparen ~first:pat p
-          in
-          let pattern = parseAliasPattern ~attrs:[] tuplePattern p in
-          parseForRest false pattern startPos p
-        | _ ->
-          parseForRest true pat startPos p
-        end
-			end
-		| _ ->
-      parseForRest false (parsePattern p) startPos p
-
-  and parseWhileExpression p =
-    let startPos = p.Parser.startPos in
-    Parser.expect While p;
-    let expr1 = parseExpr ~context:WhenExpr p in
-    Parser.expect Lbrace p;
-    let expr2 = parseExprBlock p in
-    Parser.expect Rbrace p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.while_ ~loc expr1 expr2
-
-  and parsePatternMatchCase p =
-    Parser.beginRegion p;
-    Parser.leaveBreadcrumb p Grammar.PatternMatchCase;
-    match p.Parser.token with
-    | Token.Bar ->
-      Parser.next p;
-      let lhs = parsePattern p in
-      let guard = match p.Parser.token with
-      | When ->
-        Parser.next p;
-        Some (parseExpr ~context:WhenExpr p)
-      | _ ->
-        None
-      in
-      let () = match p.token with
-      | EqualGreater -> Parser.next p
-      | _ -> Recover.recoverEqualGreater p
-      in
-      let rhs = parseExprBlock p in
-      Parser.endRegion p;
-      Parser.eatBreadcrumb p;
-      Some (Ast_helper.Exp.case lhs ?guard rhs)
-    | _ ->
-      Parser.endRegion p;
-      None
-
-  and parsePatternMatching p =
-    Parser.leaveBreadcrumb p Grammar.PatternMatching;
-    let cases =
-      parseDelimitedRegion
-        ~grammar:Grammar.PatternMatching
-        ~closing:Rbrace
-        ~f:parsePatternMatchCase
-        p
-    in
-    let () = match cases with
-    | [] -> Parser.err ~startPos:p.prevEndPos p (
-        Diagnostics.message "Pattern matching needs at least one case"
-      )
-    | _ -> ()
-    in
-    cases
-
-  and parseSwitchExpression p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Switch p;
-    let switchExpr = parseExpr ~context:WhenExpr p in
-    Parser.expect Lbrace p;
-    let cases = parsePatternMatching p in
-    Parser.expect Rbrace p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.match_ ~loc switchExpr cases
-
-  (*
-   * argument ::=
-   *   | _                            (* syntax sugar *)
-   *   | expr
-   *   | expr : type
-   *   | ~ label-name
-   *   | ~ label-name
-   *   | ~ label-name ?
-   *   | ~ label-name =   expr
-   *   | ~ label-name =   _           (* syntax sugar *)
-   *   | ~ label-name =   expr : type
-   *   | ~ label-name = ? expr
-   *   | ~ label-name = ? _           (* syntax sugar *)
-   *   | ~ label-name = ? expr : type
-   *
-   *  uncurried_argument ::=
-   *   | . argument
-   *)
-  and parseArgument p =
-    if (
-      p.Parser.token = Token.Tilde ||
-      p.token = Dot ||
-      p.token = Underscore ||
-      Grammar.isExprStart p.token
-    ) then (
-      match p.Parser.token with
-      | Dot ->
-        let uncurried = true in
-        let startPos = p.Parser.startPos in
-        Parser.next(p);
-        begin match p.token with
-          (* apply(.) *)
-          | Rparen ->
-            let loc = mkLoc startPos p.prevEndPos in
-            let unitExpr = Ast_helper.Exp.construct ~loc
-              (Location.mkloc (Longident.Lident "()") loc) None
-            in
-            Some (uncurried, Asttypes.Nolabel, unitExpr)
-          | _ ->
-            parseArgument2 p ~uncurried
-        end
-      | _ ->
-        parseArgument2 p ~uncurried:false
-    ) else
-      None
-
-  and parseArgument2 p ~uncurried =
-    match p.Parser.token with
-    (* foo(_), do not confuse with foo(_ => x), TODO: performance *)
-    | Underscore when not (isEs6ArrowExpression ~inTernary:false p) ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      let exp = Ast_helper.Exp.ident ~loc (
-        Location.mkloc (Longident.Lident "_") loc
-      ) in
-      Some (uncurried, Asttypes.Nolabel, exp)
-    | Tilde ->
-      Parser.next p;
-      (* TODO: nesting of pattern matches not intuitive for error recovery *)
-      begin match p.Parser.token with
-      | Lident ident ->
-        let startPos = p.startPos in
-        Parser.next p;
-        let endPos = p.prevEndPos in
-        let loc = mkLoc startPos endPos in
-        let propLocAttr = (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr []) in
-        let identExpr = Ast_helper.Exp.ident ~attrs:[propLocAttr] ~loc (
-          Location.mkloc (Longident.Lident ident) loc
-        ) in
-        begin match p.Parser.token with
-        | Question ->
-          Parser.next p;
-          Some (uncurried, Asttypes.Optional ident, identExpr)
-        | Equal ->
-          Parser.next p;
-          let label = match p.Parser.token with
-          | Question ->
-            Parser.next p;
-            Asttypes.Optional ident
-          | _ ->
-            Labelled ident
-          in
-          let expr = match p.Parser.token with
-          | Underscore when not (isEs6ArrowExpression ~inTernary:false p) ->
-            let loc = mkLoc p.startPos p.endPos in
-            Parser.next p;
-            Ast_helper.Exp.ident ~loc (
-              Location.mkloc (Longident.Lident "_") loc
-            )
-          | _ ->
-           let expr = parseConstrainedOrCoercedExpr p in
-           {expr with pexp_attributes = propLocAttr::expr.pexp_attributes}
-          in
-          Some (uncurried, label, expr)
-        | Colon ->
-          Parser.next p;
-          let typ = parseTypExpr p in
-          let loc = mkLoc startPos p.prevEndPos in
-          let expr = Ast_helper.Exp.constraint_ ~attrs:[propLocAttr] ~loc identExpr typ in
-          Some (uncurried, Labelled ident, expr)
-        | _ ->
-          Some (uncurried, Labelled ident, identExpr)
-        end
-      | t ->
-        Parser.err p (Diagnostics.lident t);
-        Some (uncurried, Nolabel, Recover.defaultExpr ())
-      end
-    | _ -> Some (uncurried, Nolabel, parseConstrainedOrCoercedExpr p)
-
-  and parseCallExpr p funExpr =
-    Parser.expect Lparen p;
-    let startPos = p.Parser.startPos in
-    Parser.leaveBreadcrumb p Grammar.ExprCall;
-    let args =
-      parseCommaDelimitedRegion
-        ~grammar:Grammar.ArgumentList
-        ~closing:Rparen
-        ~f:parseArgument p
-    in
-    Parser.expect Rparen p;
-    let args = match args with
-    | [] ->
-      let loc = mkLoc startPos p.prevEndPos in
-     (* No args -> unit sugar: `foo()` *)
-      [ false,
-        Asttypes.Nolabel,
-        Ast_helper.Exp.construct
-          ~loc (Location.mkloc (Longident.Lident "()") loc) None
-      ]
-    | args -> args
-    in
-    let loc = {funExpr.pexp_loc with loc_end = p.prevEndPos} in
-    let args = match args with
-    | (u, lbl, expr)::args ->
-      let group (grp, acc) (uncurried, lbl, expr) =
-        let (_u, grp) = grp in
-        if uncurried == true then
-          ((true, [lbl, expr]), ((_u, (List.rev grp))::acc))
-        else
-          ((_u, ((lbl, expr)::grp)), acc)
-      in
-      let ((_u, grp), acc) = List.fold_left group((u, [lbl, expr]), []) args in
-      List.rev ((_u, (List.rev grp))::acc)
-    | [] -> []
-    in
-    let apply = List.fold_left (fun callBody group ->
-      let (uncurried, args) = group in
-      let (args, wrap) = processUnderscoreApplication args in
-      let exp = if uncurried then
-        let attrs = [uncurryAttr] in
-        Ast_helper.Exp.apply ~loc ~attrs callBody args
-      else
-        Ast_helper.Exp.apply ~loc callBody args
-      in
-      wrap exp
-    ) funExpr args
-    in
-    Parser.eatBreadcrumb p;
-    apply
-
-  and parseValueOrConstructor p =
-    let startPos = p.Parser.startPos in
-    let rec aux p acc =
-      match p.Parser.token with
-      | Uident ident ->
-        let endPosLident = p.endPos in
-        Parser.next p;
-        begin match p.Parser.token with
-        | Dot ->
-          Parser.next p;
-          aux p (ident::acc)
-        | Lparen when p.prevEndPos.pos_lnum == p.startPos.pos_lnum ->
-          let lparen = p.startPos in
-          let args = parseConstructorArgs p in
-          let rparen = p.prevEndPos in
-          let lident = buildLongident (ident::acc) in
-          let tail = match args with
-          | [] -> None
-          | [{Parsetree.pexp_desc = Pexp_tuple _} as arg] as args ->
-            let loc = mkLoc lparen rparen in
-            if p.mode = ParseForTypeChecker then
-              (* Some(1, 2) for type-checker *)
-              Some arg
-            else
-              (* Some((1, 2)) for printer *)
-              Some (Ast_helper.Exp.tuple ~loc args)
-          | [arg] ->
-            Some arg
-          | args ->
-            let loc = mkLoc lparen rparen in
-            Some (Ast_helper.Exp.tuple ~loc args)
-          in
-          let loc = mkLoc startPos p.prevEndPos in
-          let identLoc = mkLoc startPos endPosLident in
-          Ast_helper.Exp.construct ~loc (Location.mkloc lident identLoc) tail
-        | _ ->
-          let loc = mkLoc startPos p.prevEndPos in
-          let lident = buildLongident (ident::acc) in
-          Ast_helper.Exp.construct ~loc (Location.mkloc lident loc) None
-        end
-      | Lident ident ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let lident = buildLongident (ident::acc) in
-        Ast_helper.Exp.ident ~loc (Location.mkloc lident loc)
-      | List ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let lident = buildLongident ("list"::acc) in
-        Ast_helper.Exp.ident ~loc (Location.mkloc lident loc)
-      | token ->
-        Parser.next p;
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        Recover.defaultExpr()
-    in
-    aux p []
-
-  and parsePolyVariantExpr p =
-    let startPos = p.startPos in
-    let (ident, _loc) = parseHashIdent ~startPos p in
-    begin match p.Parser.token with
-    | Lparen when p.prevEndPos.pos_lnum == p.startPos.pos_lnum ->
-      let lparen = p.startPos in
-      let args = parseConstructorArgs p in
-      let rparen = p.prevEndPos in
-      let loc_paren = mkLoc lparen rparen in
-      let tail = match args with
-      | [] -> None
-      | [{Parsetree.pexp_desc = Pexp_tuple _} as expr ] as args ->
-        if p.mode = ParseForTypeChecker then
-          (* #a(1, 2) for type-checker *)
-          Some expr
-        else
-          (* #a((1, 2)) for type-checker *)
-          Some (Ast_helper.Exp.tuple ~loc:loc_paren args)
-      | [arg] -> Some arg
-      | args ->
-        (* #a((1, 2)) for printer *)
-        Some (Ast_helper.Exp.tuple ~loc:loc_paren args)
-      in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.variant ~loc ident tail
-    | _ ->
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.variant ~loc ident None
-    end
-
-  and parseConstructorArgs p =
-    let lparen = p.Parser.startPos in
-    Parser.expect Lparen p;
-    let args =
-      parseCommaDelimitedRegion
-        ~grammar:Grammar.ExprList ~f:parseConstrainedExprRegion ~closing:Rparen p
-    in
-    Parser.expect Rparen p;
-    match args with
-    | [] ->
-      let loc = mkLoc lparen p.prevEndPos in
-      [Ast_helper.Exp.construct
-        ~loc (Location.mkloc (Longident.Lident "()") loc) None]
-    | args -> args
-
-  and parseTupleExpr ~first ~startPos p =
-    let exprs =
-      parseCommaDelimitedRegion
-        p ~grammar:Grammar.ExprList ~closing:Rparen ~f:parseConstrainedExprRegion
-    in
-    Parser.expect Rparen p;
-    Ast_helper.Exp.tuple ~loc:(mkLoc startPos p.prevEndPos) (first::exprs)
-
-  and parseSpreadExprRegion p =
-    match p.Parser.token with
-    | DotDotDot ->
-      Parser.next p;
-      let expr = parseConstrainedOrCoercedExpr p in
-      Some (true, expr)
-    | token when Grammar.isExprStart token ->
-      Some (false, parseConstrainedOrCoercedExpr p)
-    | _ -> None
-
-  and parseListExpr ~startPos p =
-    Parser.expect Lbracket p;
-    let listExprs =
-      parseCommaDelimitedReversedList
-      p ~grammar:Grammar.ListExpr ~closing:Rbracket ~f:parseSpreadExprRegion
-    in
-    Parser.expect Rbracket p;
-    let loc = mkLoc startPos p.prevEndPos in
-    match listExprs with
-    | (true, expr)::exprs ->
-      let exprs = exprs |> List.map snd |> List.rev in
-      makeListExpression loc exprs (Some expr)
-    | exprs ->
-     let exprs =
-        exprs
-        |> List.map (fun (spread, expr) ->
-            if spread then
-              Parser.err p (Diagnostics.message ErrorMessages.listExprSpread);
-            expr)
-        |> List.rev
-      in
-      makeListExpression loc exprs None
-
-  (* Overparse ... and give a nice error message *)
-  and parseNonSpreadExp ~msg p =
-    let () = match p.Parser.token with
-    | DotDotDot ->
-      Parser.err p (Diagnostics.message msg);
-      Parser.next p;
-    | _ -> ()
-    in
-    match p.Parser.token with
-    | token when Grammar.isExprStart token ->
-      let expr = parseExpr p in
-      begin match p.Parser.token with
-      | Colon ->
-        Parser.next p;
-        let typ = parseTypExpr p in
-        let loc = mkLoc expr.pexp_loc.loc_start typ.ptyp_loc.loc_end in
-        Some (Ast_helper.Exp.constraint_ ~loc expr typ)
-      | _ -> Some expr
-      end
-    | _ -> None
-
-  and parseArrayExp p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Lbracket p;
-    let exprs =
-      parseCommaDelimitedRegion
-        p
-        ~grammar:Grammar.ExprList
-        ~closing:Rbracket
-        ~f:(parseNonSpreadExp ~msg:ErrorMessages.arrayExprSpread)
-    in
-    Parser.expect Rbracket p;
-    Ast_helper.Exp.array ~loc:(mkLoc startPos p.prevEndPos) exprs
-
-  (* TODO: check attributes in the case of poly type vars,
-   * might be context dependend: parseFieldDeclaration (see ocaml) *)
-  and parsePolyTypeExpr p =
-    let startPos = p.Parser.startPos in
-    match p.Parser.token with
-    | SingleQuote ->
-      let vars = parseTypeVarList p in
-      begin match vars with
-      | _v1::_v2::_ ->
-        Parser.expect Dot p;
-        let typ = parseTypExpr p in
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Typ.poly ~loc vars typ
-      | [var] ->
-        begin match p.Parser.token with
-        | Dot ->
-          Parser.next p;
-          let typ = parseTypExpr p in
-          let loc = mkLoc startPos p.prevEndPos in
-          Ast_helper.Typ.poly ~loc vars typ
-        | EqualGreater ->
-          Parser.next p;
-          let typ = Ast_helper.Typ.var ~loc:var.loc var.txt in
-          let returnType = parseTypExpr ~alias:false p in
-          let loc = mkLoc typ.Parsetree.ptyp_loc.loc_start p.prevEndPos in
-          Ast_helper.Typ.arrow ~loc Asttypes.Nolabel typ returnType
-        | _ ->
-          Ast_helper.Typ.var ~loc:var.loc var.txt
-        end
-      | _ -> assert false
-      end
-    | _ ->
-      parseTypExpr p
-
-  (* 'a 'b 'c *)
-  and parseTypeVarList p =
-    let rec loop p vars =
-      match p.Parser.token with
-      | SingleQuote ->
-        Parser.next p;
-        let (lident, loc) = parseLident p in
-        let var = Location.mkloc lident loc in
-        loop p (var::vars)
-      | _ ->
-        List.rev vars
-    in
-    loop p []
-
-  and parseLidentList p =
-    let rec loop p ls =
-      match p.Parser.token with
-      | Lident lident ->
-        let loc = mkLoc p.startPos p.endPos in
-        Parser.next p;
-        loop p ((Location.mkloc lident loc)::ls)
-      | _ ->
-        List.rev ls
-    in
-    loop p []
-
-  and parseAtomicTypExpr ~attrs p =
-    Parser.leaveBreadcrumb p Grammar.AtomicTypExpr;
-    let startPos = p.Parser.startPos in
-    let typ = match p.Parser.token with
-    | SingleQuote ->
-      Parser.next p;
-      let (ident, loc) = parseLident p in
-      Ast_helper.Typ.var ~loc ~attrs ident
-    | Underscore ->
-      let endPos = p.endPos in
-      Parser.next p;
-      Ast_helper.Typ.any ~loc:(mkLoc startPos endPos) ~attrs ()
-    | Lparen ->
-      Parser.next p;
-      begin match p.Parser.token with
-      | Rparen ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let unitConstr = Location.mkloc (Longident.Lident "unit") loc in
-        Ast_helper.Typ.constr ~attrs unitConstr []
-      | _ ->
-        let t = parseTypExpr p in
-        begin match p.token with
-        | Comma ->
-          Parser.next p;
-          parseTupleType ~attrs ~first:t ~startPos p
-        | _ ->
-          Parser.expect Rparen p;
-          {t with
-            ptyp_loc = mkLoc startPos p.prevEndPos;
-            ptyp_attributes = List.concat [attrs; t.ptyp_attributes]}
-        end
-      end
-    | Lbracket ->
-      parsePolymorphicVariantType ~attrs p
-    | Uident _ | Lident _ | List ->
-      let constr = parseValuePath p in
-      let args =  parseTypeConstructorArgs ~constrName:constr p in
-      Ast_helper.Typ.constr ~loc:(mkLoc startPos p.prevEndPos) ~attrs constr args
-    | Module ->
-      Parser.next p;
-      Parser.expect Lparen p;
-      let packageType = parsePackageType ~startPos ~attrs p in
-      Parser.expect Rparen p;
-      {packageType with ptyp_loc = mkLoc startPos p.prevEndPos}
-    | Percent ->
-      let extension = parseExtension p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Typ.extension ~attrs ~loc extension
-    | Lbrace ->
-      parseBsObjectType ~attrs p
-    | token ->
-      begin match skipTokensAndMaybeRetry p ~isStartOfGrammar:Grammar.isAtomicTypExprStart with
-      | Some () ->
-        parseAtomicTypExpr ~attrs p
-      | None ->
-        Parser.err ~startPos:p.prevEndPos p (Diagnostics.unexpected token p.breadcrumbs);
-        Recover.defaultType()
-      end
-    in
-    Parser.eatBreadcrumb p;
-    typ
-
-  (* package-type	::=
-      | modtype-path
-      ∣ modtype-path with package-constraint  { and package-constraint }
-   *)
-  and parsePackageType ~startPos ~attrs p =
-    let modTypePath = parseModuleLongIdent ~lowercase:true p in
-    begin match p.Parser.token with
-    | With ->
-      Parser.next p;
-      let constraints = parsePackageConstraints p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Typ.package ~loc ~attrs modTypePath constraints
-    | _ ->
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Typ.package ~loc ~attrs modTypePath []
-    end
-
-  (* package-constraint  { and package-constraint } *)
-  and parsePackageConstraints p =
-    let first =
-      Parser.expect Typ p;
-      let typeConstr = parseValuePath p in
-      Parser.expect Equal p;
-      let typ = parseTypExpr p in
-      (typeConstr, typ)
-    in
-    let rest = parseRegion
-      ~grammar:Grammar.PackageConstraint
-      ~f:parsePackageConstraint
-      p
-    in
-    first::rest
-
-  (* and type typeconstr = typexpr *)
-  and parsePackageConstraint p =
-    match p.Parser.token with
-    | And ->
-      Parser.next p;
-      Parser.expect Typ p;
-      let typeConstr = parseValuePath p in
-      Parser.expect Equal p;
-      let typ = parseTypExpr p in
-      Some (typeConstr, typ)
-    | _ -> None
-
-  and parseBsObjectType ~attrs p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Lbrace p;
-    let closedFlag = match p.token with
-    | DotDot -> Parser.next p; Asttypes.Open
-    | Dot -> Parser.next p; Asttypes.Closed
-    | _ -> Asttypes.Closed
-    in
-    let fields =
-      parseCommaDelimitedRegion
-        ~grammar:Grammar.StringFieldDeclarations
-        ~closing:Rbrace
-        ~f:parseStringFieldDeclaration
-        p
-    in
-    Parser.expect Rbrace p;
-    let loc = mkLoc startPos p.prevEndPos in
-    makeBsObjType ~attrs ~loc ~closed:closedFlag fields
-
-  (* TODO: check associativity in combination with attributes *)
-  and parseTypeAlias p typ =
-    match p.Parser.token with
-    | As ->
-      Parser.next p;
-      Parser.expect SingleQuote p;
-      let (ident, _loc) = parseLident p in
-      (* TODO: how do we parse attributes here? *)
-      Ast_helper.Typ.alias ~loc:(mkLoc typ.Parsetree.ptyp_loc.loc_start p.prevEndPos) typ ident
-    | _ -> typ
-
-
-  (* type_parameter ::=
-    *  | type_expr
-    *  | ~ident: type_expr
-    *  | ~ident: type_expr=?
-    *
-    * note:
-    *  | attrs ~ident: type_expr    -> attrs are on the arrow
-    *  | attrs type_expr            -> attrs are here part of the type_expr
-    *
-    * uncurried_type_parameter ::=
-    *  | . type_parameter
-    *)
-  and parseTypeParameter p =
-    if (
-      p.Parser.token = Token.Tilde ||
-      p.token = Dot ||
-      Grammar.isTypExprStart p.token
-    ) then (
-      let startPos = p.Parser.startPos in
-      let uncurried = Parser.optional p Dot in
-      let attrs = parseAttributes p in
-      match p.Parser.token with
-      | Tilde ->
-        Parser.next p;
-        let (name, _loc) = parseLident p in
-        Parser.expect ~grammar:Grammar.TypeExpression Colon p;
-        let typ = parseTypExpr p in
-        begin match p.Parser.token with
-        | Equal ->
-          Parser.next p;
-          Parser.expect Question p;
-          Some (uncurried, attrs, Asttypes.Optional name, typ, startPos)
-        | _ ->
-          Some (uncurried, attrs, Asttypes.Labelled name, typ, startPos)
-        end
-      | Lident _ | List ->
-        let (name, loc) = parseLident p in
-        begin match p.token with
-        | Colon ->
-          let () =
-            let error = Diagnostics.message
-              ("Parameter names start with a `~`, like: ~" ^ name)
-            in
-            Parser.err ~startPos:loc.loc_start ~endPos:loc.loc_end p error
-          in
-          Parser.next p;
-          let typ = parseTypExpr p in
-          begin match p.Parser.token with
-          | Equal ->
-            Parser.next p;
-            Parser.expect Question p;
-            Some (uncurried, attrs, Asttypes.Optional name, typ, startPos)
-          | _ ->
-            Some (uncurried, attrs, Asttypes.Labelled name, typ, startPos)
-          end
-        | _ ->
-          let constr = Location.mkloc (Longident.Lident name) loc in
-          let args =  parseTypeConstructorArgs ~constrName:constr p in
-          let typ = Ast_helper.Typ.constr ~loc:(mkLoc startPos p.prevEndPos) ~attrs constr args
-          in
-
-          let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
-          let typ = parseTypeAlias p typ in
-          Some (uncurried, [], Asttypes.Nolabel, typ, startPos)
-        end
-      | _ ->
-        let typ = parseTypExpr p in
-        let typWithAttributes = {typ with ptyp_attributes = List.concat[attrs; typ.ptyp_attributes]} in
-        Some (uncurried, [], Asttypes.Nolabel, typWithAttributes, startPos)
-    ) else
-      None
-
-  (* (int, ~x:string, float) *)
-  and parseTypeParameters p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Lparen p;
-    match p.Parser.token with
-    | Rparen ->
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      let unitConstr = Location.mkloc (Longident.Lident "unit") loc in
-      let typ = Ast_helper.Typ.constr unitConstr [] in
-      [(false, [], Asttypes.Nolabel, typ, startPos)]
-    | _ ->
-      let params =
-        parseCommaDelimitedRegion ~grammar:Grammar.TypeParameters ~closing:Rparen ~f:parseTypeParameter p
-      in
-      Parser.expect Rparen p;
-      params
-
-  and parseEs6ArrowType ~attrs p =
-    let startPos = p.Parser.startPos in
-    match p.Parser.token with
-    | Tilde ->
-      Parser.next p;
-      let (name, _loc) = parseLident p in
-      Parser.expect ~grammar:Grammar.TypeExpression Colon p;
-      let typ = parseTypExpr ~alias:false ~es6Arrow:false p in
-      let arg = match p.Parser.token with
-      | Equal ->
-        Parser.next p;
-        Parser.expect Question p;
-        Asttypes.Optional name
-      | _ ->
-        Asttypes.Labelled name
-      in
-      Parser.expect EqualGreater p;
-      let returnType = parseTypExpr ~alias:false p in
-      Ast_helper.Typ.arrow ~attrs arg typ returnType
-    | _ ->
-      let parameters = parseTypeParameters p in
-      Parser.expect EqualGreater p;
-      let returnType = parseTypExpr ~alias:false p in
-      let endPos = p.prevEndPos in
-      let typ = List.fold_right (fun (uncurried, attrs, argLbl, typ, startPos) t ->
-        let attrs = if uncurried then uncurryAttr::attrs else attrs in
-        Ast_helper.Typ.arrow ~loc:(mkLoc startPos endPos) ~attrs argLbl typ t
-      ) parameters returnType
-      in
-      {typ with
-        ptyp_attributes = List.concat [typ.ptyp_attributes; attrs];
-        ptyp_loc = mkLoc startPos p.prevEndPos}
-
-  (*
-   * typexpr ::=
-   *  | 'ident
-   *  | _
-   *  | (typexpr)
-   *  | typexpr => typexpr            --> es6 arrow
-   *  | (typexpr, typexpr) => typexpr --> es6 arrow
-   *  | /typexpr, typexpr, typexpr/  --> tuple
-   *  | typeconstr
-   *  | typeconstr<typexpr>
-   *  | typeconstr<typexpr, typexpr,>
-   *  | typexpr as 'ident
-   *  | %attr-id                      --> extension
-   *  | %attr-id(payload)             --> extension
-   *
-   * typeconstr ::=
-   *  | lident
-   *  | uident.lident
-   *  | uident.uident.lident     --> long module path
-   *)
-  and parseTypExpr ?attrs ?(es6Arrow=true) ?(alias=true) p =
-    (* Parser.leaveBreadcrumb p Grammar.TypeExpression; *)
-    let startPos = p.Parser.startPos in
-    let attrs = match attrs with
-      | Some attrs ->
-        attrs
-      | None ->
-        parseAttributes p in
-    let typ = if es6Arrow && isEs6ArrowType p then
-      parseEs6ArrowType ~attrs p
-    else
-      let typ = parseAtomicTypExpr ~attrs p in
-      parseArrowTypeRest ~es6Arrow ~startPos typ p
-    in
-    let typ = if alias then parseTypeAlias p typ else typ in
-    (* Parser.eatBreadcrumb p; *)
-    typ
-
-  and parseArrowTypeRest ~es6Arrow ~startPos typ p =
-    match p.Parser.token with
-    | (EqualGreater | MinusGreater) as token when es6Arrow == true ->
-      (* error recovery *)
-      if token = MinusGreater then (
-        Parser.expect EqualGreater p;
-      );
-      Parser.next p;
-      let returnType = parseTypExpr ~alias:false p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Typ.arrow ~loc Asttypes.Nolabel typ returnType
-    | _ -> typ
-
-  and parseTypExprRegion p =
-    if Grammar.isTypExprStart p.Parser.token then
-      Some (parseTypExpr p)
-    else
-      None
-
-  and parseTupleType ~attrs ~first ~startPos p =
-    let typexprs =
-      parseCommaDelimitedRegion
-        ~grammar:Grammar.TypExprList
-        ~closing:Rparen
-        ~f:parseTypExprRegion
-        p
-    in
-    Parser.expect Rparen p;
-    let tupleLoc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Typ.tuple ~attrs ~loc:tupleLoc (first::typexprs)
-
-  and parseTypeConstructorArgRegion p =
-    if Grammar.isTypExprStart p.Parser.token then
-      Some (parseTypExpr p)
-    else if p.token = LessThan then (
-      Parser.next p;
-      parseTypeConstructorArgRegion p
-    ) else
-      None
-
-  (* Js.Nullable.value<'a> *)
-  and parseTypeConstructorArgs ~constrName p =
-    let opening = p.Parser.token in
-    let openingStartPos = p.startPos in
-    match opening with
-    | LessThan | Lparen ->
-      Scanner.setDiamondMode p.scanner;
-      Parser.next p;
-      let typeArgs =
-        (* TODO: change Grammar.TypExprList to TypArgList!!! Why did I wrote this? *)
-        parseCommaDelimitedRegion
-          ~grammar:Grammar.TypExprList
-          ~closing:GreaterThan
-          ~f:parseTypeConstructorArgRegion
-          p
-      in
-      let () = match p.token with
-      | Rparen when opening = Token.Lparen ->
-        let typ = Ast_helper.Typ.constr constrName typeArgs in
-        let msg =
-          Doc.breakableGroup ~forceBreak:true (
-            Doc.concat [
-              Doc.text "Type parameters require angle brackets:";
-              Doc.indent (
-                Doc.concat [
-                  Doc.line;
-                  Printer.printTypExpr typ CommentTable.empty;
-                ]
-              )
-            ]
-          ) |> Doc.toString ~width:80
-        in
-        Parser.err ~startPos:openingStartPos p (Diagnostics.message msg);
-        Parser.next p
-      | _ ->
-        Parser.expect GreaterThan p
-      in
-      Scanner.popMode p.scanner Diamond;
-      typeArgs
-    | _ -> []
-
-  (* string-field-decl ::=
-   *  | string: poly-typexpr
-   *  | attributes string-field-decl *)
-  and parseStringFieldDeclaration p =
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | String name ->
-      let nameStartPos = p.startPos in
-      let nameEndPos = p.endPos in
-      Parser.next p;
-      let fieldName = Location.mkloc name (mkLoc nameStartPos nameEndPos) in
-      Parser.expect ~grammar:Grammar.TypeExpression Colon p;
-      let typ = parsePolyTypeExpr p in
-      Some(Parsetree.Otag (fieldName, attrs, typ))
-    | _token ->
-      None
-
-  (* field-decl	::=
-   *  | [mutable] field-name : poly-typexpr
-   *  | attributes field-decl *)
-  and parseFieldDeclaration p =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributes p in
-    let mut = if Parser.optional p Token.Mutable then
-      Asttypes.Mutable
-    else
-      Asttypes.Immutable
-    in
-    let (lident, loc) = match p.token with
-    | List ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      ("list", loc)
-    | _ -> parseLident p
-    in
-    let name = Location.mkloc lident loc in
-    let typ = match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      parsePolyTypeExpr p
-    | _ ->
-      Ast_helper.Typ.constr ~loc:name.loc {name with txt = Lident name.txt} []
-    in
-    let loc = mkLoc startPos typ.ptyp_loc.loc_end in
-    Ast_helper.Type.field ~attrs ~loc ~mut name typ
-
-
-  and parseFieldDeclarationRegion p =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributes p in
-    let mut = if Parser.optional p Token.Mutable then
-      Asttypes.Mutable
-    else
-      Asttypes.Immutable
-    in
-    match p.token with
-    | Lident _ | List ->
-      let (lident, loc) =  match p.token with
-      | List ->
-        let loc = mkLoc p.startPos p.endPos in
-        Parser.next p;
-        ("list", loc)
-      | _ -> parseLident p
-      in
-      let name = Location.mkloc lident loc in
-      let typ = match p.Parser.token with
-      | Colon ->
-        Parser.next p;
-        parsePolyTypeExpr p
-      | _ ->
-        Ast_helper.Typ.constr ~loc:name.loc {name with txt = Lident name.txt} []
-      in
-      let loc = mkLoc startPos typ.ptyp_loc.loc_end in
-      Some(Ast_helper.Type.field ~attrs ~loc ~mut name typ)
-    | _ ->
-      None
-
-  (* record-decl ::=
-   *  | { field-decl }
-   *  | { field-decl, field-decl }
-   *  | { field-decl, field-decl, field-decl, }
-   *)
-  and parseRecordDeclaration p =
-    Parser.leaveBreadcrumb p Grammar.RecordDecl;
-    Parser.expect Lbrace p;
-    let rows =
-      parseCommaDelimitedRegion
-        ~grammar:Grammar.RecordDecl
-        ~closing:Rbrace
-        ~f:parseFieldDeclarationRegion
-        p
-    in
-    Parser.expect Rbrace p;
-    Parser.eatBreadcrumb p;
-    rows
-
-  (* constr-args ::=
-   *  | (typexpr)
-   *  | (typexpr, typexpr)
-   *  | (typexpr, typexpr, typexpr,)
-   *  | (record-decl)
-   *
-   * TODO: should we overparse inline-records in every position?
-   * Give a good error message afterwards?
-   *)
-  and parseConstrDeclArgs p =
-    let constrArgs = match p.Parser.token with
-    | Lparen ->
-      Parser.next p;
-      (* TODO: this could use some cleanup/stratification *)
-      begin match p.Parser.token with
-      | Lbrace ->
-        let lbrace = p.startPos in
-        Parser.next p;
-        let startPos = p.Parser.startPos in
-        begin match p.Parser.token with
-        | DotDot | Dot ->
-          let closedFlag = match p.token with
-          | DotDot -> Parser.next p; Asttypes.Open
-          | Dot -> Parser.next p; Asttypes.Closed
-          | _ -> Asttypes.Closed
-          in
-          let fields =
-            parseCommaDelimitedRegion
-              ~grammar:Grammar.StringFieldDeclarations
-              ~closing:Rbrace
-              ~f:parseStringFieldDeclaration
-              p
-          in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let typ = makeBsObjType ~attrs:[] ~loc ~closed:closedFlag fields in
-          Parser.optional p Comma |> ignore;
-          let moreArgs =
-            parseCommaDelimitedRegion
-            ~grammar:Grammar.TypExprList
-            ~closing:Rparen
-            ~f:parseTypExprRegion
-            p
-          in
-          Parser.expect Rparen p;
-          Parsetree.Pcstr_tuple (typ::moreArgs)
-        | _ ->
-          let attrs = parseAttributes p in
-          begin match p.Parser.token with
-          | String _  ->
-            let closedFlag = Asttypes.Closed in
-            let fields = match attrs with
-            | [] ->
-              parseCommaDelimitedRegion
-                ~grammar:Grammar.StringFieldDeclarations
-                ~closing:Rbrace
-                ~f:parseStringFieldDeclaration
-                p
-            | attrs ->
-              let first =
-                Parser.leaveBreadcrumb p Grammar.StringFieldDeclarations;
-                let field = match parseStringFieldDeclaration p with
-                | Some field -> field
-                | None -> assert false
-                in
-                (* parse comma after first *)
-                let () = match p.Parser.token with
-                | Rbrace | Eof -> ()
-                | Comma -> Parser.next p
-                | _ -> Parser.expect Comma p
-                in
-                Parser.eatBreadcrumb p;
-                begin match field with
-                | Parsetree.Otag (label, _, ct) -> Parsetree.Otag (label, attrs, ct)
-                | Oinherit ct -> Oinherit ct
-                end
-              in
-              first::(
-                parseCommaDelimitedRegion
-                  ~grammar:Grammar.StringFieldDeclarations
-                  ~closing:Rbrace
-                  ~f:parseStringFieldDeclaration
-                  p
-              ) in
-              Parser.expect Rbrace p;
-              let loc = mkLoc startPos p.prevEndPos in
-              let typ = makeBsObjType ~attrs:[]  ~loc ~closed:closedFlag fields in
-              Parser.optional p Comma |> ignore;
-              let moreArgs =
-                parseCommaDelimitedRegion
-                  ~grammar:Grammar.TypExprList
-                  ~closing:Rparen
-                  ~f:parseTypExprRegion p
-              in
-              Parser.expect Rparen p;
-              Parsetree.Pcstr_tuple (typ::moreArgs)
-            | _ ->
-              let fields = match attrs with
-              | [] ->
-                parseCommaDelimitedRegion
-                  ~grammar:Grammar.FieldDeclarations
-                  ~closing:Rbrace
-                  ~f:parseFieldDeclarationRegion
-                  p
-              | attrs ->
-                let first =
-                  let field = parseFieldDeclaration p in
-                  Parser.expect Comma p;
-                  {field with Parsetree.pld_attributes = attrs}
-                in
-                first::(
-                  parseCommaDelimitedRegion
-                    ~grammar:Grammar.FieldDeclarations
-                    ~closing:Rbrace
-                    ~f:parseFieldDeclarationRegion
-                    p
-                )
-              in
-              let () = match fields with
-              | [] -> Parser.err ~startPos:lbrace p (
-                  Diagnostics.message "An inline record declaration needs at least one field"
-                )
-              | _ -> ()
-              in
-              Parser.expect Rbrace p;
-              Parser.optional p Comma |> ignore;
-              Parser.expect Rparen p;
-              Parsetree.Pcstr_record fields
-            end
-        end
-        | _ ->
-          let args =
-            parseCommaDelimitedRegion
-              ~grammar:Grammar.TypExprList
-              ~closing:Rparen
-              ~f:parseTypExprRegion
-              p
-          in
-          Parser.expect Rparen p;
-          Parsetree.Pcstr_tuple args
-       end
-    | _ -> Pcstr_tuple []
-    in
-    let res = match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      Some (parseTypExpr p)
-    | _ -> None
-    in
-    (constrArgs, res)
-
-  (* constr-decl ::=
-   *  | constr-name
-   *  | attrs constr-name
-   *  | constr-name const-args
-   *  | attrs constr-name const-args *)
-   and parseTypeConstructorDeclarationWithBar p =
-    match p.Parser.token with
-    | Bar ->
-      let startPos = p.Parser.startPos in
-      Parser.next p;
-      Some (parseTypeConstructorDeclaration ~startPos p)
-    | _ -> None
-
-   and parseTypeConstructorDeclaration ~startPos p =
-     Parser.leaveBreadcrumb p Grammar.ConstructorDeclaration;
-     let attrs = parseAttributes p in
-     match p.Parser.token with
-     | Uident uident ->
-       let uidentLoc = mkLoc p.startPos p.endPos in
-       Parser.next p;
-       let (args, res) = parseConstrDeclArgs p in
-       Parser.eatBreadcrumb p;
-       let loc = mkLoc startPos p.prevEndPos in
-       Ast_helper.Type.constructor ~loc ~attrs ?res ~args (Location.mkloc uident uidentLoc)
-     | t ->
-      Parser.err p (Diagnostics.uident t);
-      Ast_helper.Type.constructor (Location.mknoloc "_")
-
-   (* [|] constr-decl  { | constr-decl }   *)
-   and parseTypeConstructorDeclarations ?first p =
-    let firstConstrDecl = match first with
-    | None ->
-      let startPos = p.Parser.startPos in
-      ignore (Parser.optional p Token.Bar);
-      parseTypeConstructorDeclaration ~startPos p
-    | Some firstConstrDecl ->
-      firstConstrDecl
-    in
-    firstConstrDecl::(
-      parseRegion
-        ~grammar:Grammar.ConstructorDeclaration
-        ~f:parseTypeConstructorDeclarationWithBar
-        p
-    )
-
-  (*
-   * type-representation ::=
-   *  ∣	 = [ | ] constr-decl  { | constr-decl }
-   *  ∣	 = private [ | ] constr-decl  { | constr-decl }
-   *  |  = |
-   *  ∣	 = private |
-   *  ∣	 = record-decl
-   *  ∣	 = private record-decl
-   *  |  = ..
-   *)
-  and parseTypeRepresentation p =
-    Parser.leaveBreadcrumb p Grammar.TypeRepresentation;
-    (* = consumed *)
-    let privateFlag =
-      if Parser.optional p Token.Private
-      then Asttypes.Private
-      else Asttypes.Public
-    in
-    let kind = match p.Parser.token with
-    | Bar | Uident _ ->
-      Parsetree.Ptype_variant (parseTypeConstructorDeclarations p)
-    | Lbrace ->
-      Parsetree.Ptype_record (parseRecordDeclaration p)
-    | DotDot ->
-      Parser.next p;
-      Ptype_open
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      (* TODO: I have no idea if this is even remotely a good idea *)
-      Parsetree.Ptype_variant []
-    in
-    Parser.eatBreadcrumb p;
-    (privateFlag, kind)
-
-  (* type-param	::=
-   *  | variance 'lident
-   *  | variance _
-   *
-   * variance ::=
-   *   | +
-   *   | -
-   *   | (* empty *)
-   *)
-  and parseTypeParam p =
-    let variance = match p.Parser.token with
-    | Plus -> Parser.next p; Asttypes.Covariant
-    | Minus -> Parser.next p; Contravariant
-    | _ -> Invariant
-    in
-    match p.Parser.token with
-    | SingleQuote ->
-      Parser.next p;
-      let (ident, loc) = parseLident p in
-      Some (Ast_helper.Typ.var ~loc ident, variance)
-    | Underscore ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Some (Ast_helper.Typ.any ~loc (), variance)
-    (* TODO: should we try parsing lident as 'ident ? *)
-    | _token ->
-      None
-
-  (* type-params	::=
-   *  | <type-param>
- 	 *  ∣	<type-param, type-param>
- 	 *  ∣	<type-param, type-param, type-param>
- 	 *  ∣	<type-param, type-param, type-param,>
-   *
-   *  TODO: when we have pretty-printer show an error
-   *  with the actual code corrected. *)
-  and parseTypeParams ~parent p =
-    let opening = p.Parser.token in
-    match opening with
-    | LessThan | Lparen when p.startPos.pos_lnum == p.prevEndPos.pos_lnum ->
-      Scanner.setDiamondMode p.scanner;
-      let openingStartPos = p.startPos in
-      Parser.leaveBreadcrumb p Grammar.TypeParams;
-      Parser.next p;
-      let params =
-        parseCommaDelimitedRegion
-          ~grammar:Grammar.TypeParams
-          ~closing:GreaterThan
-          ~f:parseTypeParam
-          p
-      in
-      let () = match p.token with
-      | Rparen when opening = Token.Lparen ->
-        let msg =
-          Doc.breakableGroup ~forceBreak:true (
-            Doc.concat [
-              Doc.text "Type parameters require angle brackets:";
-              Doc.indent (
-                Doc.concat [
-                  Doc.line;
-                  Doc.concat [
-                    Printer.printLongident parent.Location.txt;
-                    Printer.printTypeParams params CommentTable.empty;
-                  ]
-                ]
-              )
-            ]
-          ) |> Doc.toString ~width:80
-        in
-        Parser.err ~startPos:openingStartPos p (Diagnostics.message msg);
-        Parser.next p
-      | _ ->
-        Parser.expect GreaterThan p
-      in
-      Scanner.popMode p.scanner Diamond;
-      Parser.eatBreadcrumb p;
-      params
-    | _ -> []
-
-  (* type-constraint	::=	constraint ' ident =  typexpr *)
-  and parseTypeConstraint p =
-    let startPos = p.Parser.startPos in
-    match p.Parser.token with
-    | Token.Constraint ->
-      Parser.next p;
-      Parser.expect SingleQuote p;
-      begin match p.Parser.token with
-      | Lident ident ->
-        let identLoc = mkLoc startPos p.endPos in
-        Parser.next p;
-        Parser.expect Equal p;
-        let typ = parseTypExpr p in
-        let loc = mkLoc startPos p.prevEndPos in
-        Some (Ast_helper.Typ.var ~loc:identLoc ident, typ, loc)
-      | t ->
-        Parser.err p (Diagnostics.lident t);
-        let loc = mkLoc startPos p.prevEndPos in
-        Some (Ast_helper.Typ.any (), parseTypExpr p, loc)
-      end
-    | _ -> None
-
-  (* type-constraints ::=
-   *  | (* empty *)
-   *  | type-constraint
-   *  | type-constraint type-constraint
-   *  | type-constraint type-constraint type-constraint (* 0 or more *)
-   *)
-  and parseTypeConstraints p =
-    parseRegion
-      ~grammar:Grammar.TypeConstraint
-      ~f:parseTypeConstraint
-      p
-
-  and parseTypeEquationOrConstrDecl p =
-    let uidentStartPos = p.Parser.startPos in
-    match p.Parser.token with
-    | Uident uident ->
-      Parser.next p;
-      begin match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        let typeConstr =
-          parseValuePathTail p uidentStartPos (Longident.Lident uident)
-        in
-        let loc = mkLoc uidentStartPos p.prevEndPos in
-        let typ = parseTypeAlias p (
-          Ast_helper.Typ.constr ~loc typeConstr (parseTypeConstructorArgs ~constrName:typeConstr p)
-        ) in
-        begin match p.token with
-        | Equal ->
-          Parser.next p;
-          let (priv, kind) = parseTypeRepresentation p in
-          (Some typ, priv, kind)
-        | EqualGreater ->
-          Parser.next p;
-          let returnType = parseTypExpr ~alias:false p in
-          let loc = mkLoc uidentStartPos p.prevEndPos in
-          let arrowType = Ast_helper.Typ.arrow ~loc Asttypes.Nolabel typ returnType in
-          let typ = parseTypeAlias p arrowType in
-          (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
-        | _ -> (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
-        end
-      | _ ->
-        let uidentEndPos = p.endPos in
-        let (args, res) = parseConstrDeclArgs p in
-        let first = Some (
-          let uidentLoc = mkLoc uidentStartPos uidentEndPos in
-          Ast_helper.Type.constructor
-            ~loc:(mkLoc uidentStartPos p.prevEndPos)
-            ?res
-            ~args
-            (Location.mkloc uident uidentLoc)
-        ) in
-        (None, Asttypes.Public, Parsetree.Ptype_variant (parseTypeConstructorDeclarations p ?first))
-      end
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      (* TODO: is this a good idea? *)
-      (None, Asttypes.Public, Parsetree.Ptype_abstract)
-
-  and parseRecordOrBsObjectDecl p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Lbrace p;
-    match p.Parser.token with
-    | DotDot | Dot ->
-      let closedFlag = match p.token with
-      | DotDot -> Parser.next p; Asttypes.Open
-      | Dot -> Parser.next p; Asttypes.Closed
-      | _ -> Asttypes.Closed
-      in
-      let fields =
-        parseCommaDelimitedRegion
-          ~grammar:Grammar.StringFieldDeclarations
-          ~closing:Rbrace
-          ~f:parseStringFieldDeclaration
-          p
-      in
-      Parser.expect Rbrace p;
-      let loc = mkLoc startPos p.prevEndPos in
-      let typ =
-        makeBsObjType ~attrs:[] ~loc ~closed:closedFlag fields
-        |> parseTypeAlias p
-      in
-      let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
-      (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
-    | _ ->
-      let attrs = parseAttributes p in
-      begin match p.Parser.token with
-      | String _  ->
-        let closedFlag = Asttypes.Closed in
-        let fields = match attrs with
-        | [] ->
-          parseCommaDelimitedRegion
-            ~grammar:Grammar.StringFieldDeclarations
-            ~closing:Rbrace
-            ~f:parseStringFieldDeclaration
-            p
-        | attrs ->
-          let first =
-            Parser.leaveBreadcrumb p Grammar.StringFieldDeclarations;
-            let field = match parseStringFieldDeclaration p with
-            | Some field -> field
-            | None -> assert false
-            in
-            (* parse comma after first *)
-            let () = match p.Parser.token with
-            | Rbrace | Eof -> ()
-            | Comma -> Parser.next p
-            | _ -> Parser.expect Comma p
-            in
-            Parser.eatBreadcrumb p;
-            begin match field with
-            | Parsetree.Otag (label, _, ct) -> Parsetree.Otag (label, attrs, ct)
-            | Oinherit ct -> Oinherit ct
-            end
-          in
-          first::(
-            parseCommaDelimitedRegion
-              ~grammar:Grammar.StringFieldDeclarations
-              ~closing:Rbrace
-              ~f:parseStringFieldDeclaration
-              p
-          )
-          in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let typ =
-            makeBsObjType ~attrs:[] ~loc ~closed:closedFlag fields |> parseTypeAlias p
-          in
-          let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
-          (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
-      | _ ->
-        Parser.leaveBreadcrumb p Grammar.RecordDecl;
-        let fields = match attrs with
-        | [] ->
-          parseCommaDelimitedRegion
-            ~grammar:Grammar.FieldDeclarations
-            ~closing:Rbrace
-            ~f:parseFieldDeclarationRegion
-            p
-        | attr::_ as attrs ->
-          let first =
-            let field = parseFieldDeclaration p in
-            Parser.optional p Comma |> ignore;
-            {field with
-              Parsetree.pld_attributes = attrs;
-              pld_loc = {
-                field.Parsetree.pld_loc with loc_start =
-                  (attr |> fst).loc.loc_start
-              }
-            }
-          in
-          first::(
-            parseCommaDelimitedRegion
-              ~grammar:Grammar.FieldDeclarations
-              ~closing:Rbrace
-              ~f:parseFieldDeclarationRegion
-              p
-          )
-        in
-        let () = match fields with
-        | [] -> Parser.err ~startPos p (
-            Diagnostics.message "A record needs at least one field"
-          )
-        | _ -> ()
-        in
-        Parser.expect Rbrace p;
-        Parser.eatBreadcrumb p;
-        (None, Asttypes.Public, Parsetree.Ptype_record fields)
-      end
-
-  and parsePrivateEqOrRepr p =
-    Parser.expect Private p;
-    match p.Parser.token with
-    | Lbrace ->
-      let (manifest, _ ,kind) = parseRecordOrBsObjectDecl p in
-      (manifest, Asttypes.Private, kind)
-    | Uident _ ->
-      let (manifest, _, kind) = parseTypeEquationOrConstrDecl p in
-      (manifest, Asttypes.Private, kind)
-    | Bar | DotDot ->
-      let (_, kind) = parseTypeRepresentation p in
-      (None, Asttypes.Private, kind)
-    | t when Grammar.isTypExprStart t ->
-      (Some (parseTypExpr p), Asttypes.Private, Parsetree.Ptype_abstract)
-    | _ ->
-      let (_, kind) = parseTypeRepresentation p in
-      (None, Asttypes.Private, kind)
-
-  (*
-    polymorphic-variant-type	::=
-                              | [ tag-spec-first  { | tag-spec } ]
-                              | [> [ tag-spec ]  { | tag-spec } ]
-                              | [< [|] tag-spec-full  { | tag-spec-full }  [ > { `tag-name }+ ] ]
-
-              tag-spec-first	::=	`tag-name  [ of typexpr ]
- 	                            |	[ typexpr ] |  tag-spec
-
-                    tag-spec	::=	`tag-name  [ of typexpr ]
- 	                            |	typexpr
-
-                tag-spec-full	::=	`tag-name  [ of [&] typexpr  { & typexpr } ]
-                               |	typexpr
-  *)
-  and parsePolymorphicVariantType ~attrs p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Lbracket p;
-    match p.token with
-    | GreaterThan ->
-      Parser.next p;
-      let rowFields =
-        begin match p.token with
-        | Rbracket ->
-          []
-        | Bar ->
-          parseTagSpecs p
-        | _ ->
-          let rowField = parseTagSpec p in
-          rowField :: parseTagSpecs p
-        end
-      in
-      let variant =
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Typ.variant ~attrs ~loc rowFields Open None in
-      Parser.expect Rbracket p;
-      variant
-    | LessThan ->
-      Parser.next p;
-      Parser.optional p Bar |> ignore;
-      let rowField = parseTagSpecFull p in
-      let rowFields = parseTagSpecFulls p in
-      let tagNames =
-        if p.token == GreaterThan
-        then begin
-          Parser.next p;
-          let rec loop p = match p.Parser.token with
-            | Rbracket -> []
-            | _ ->
-              let (ident, _loc) = parseHashIdent ~startPos:p.startPos p in
-              ident :: loop p
-          in
-          loop p
-        end
-        else [] in
-      let variant =
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Typ.variant ~attrs ~loc (rowField :: rowFields) Closed (Some tagNames) in
-      Parser.expect Rbracket p;
-      variant
-    | _ ->
-      let rowFields1 = parseTagSpecFirst p in
-      let rowFields2 = parseTagSpecs p in
-      let variant =
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Typ.variant ~attrs ~loc (rowFields1 @ rowFields2) Closed None in
-      Parser.expect Rbracket p;
-      variant
-
-  and parseTagSpecFulls p =
-    match p.Parser.token with
-    | Rbracket ->
-      []
-    | GreaterThan ->
-      []
-    | Bar ->
-      Parser.next p;
-      let rowField = parseTagSpecFull p in
-      rowField ::parseTagSpecFulls p
-    | _ ->
-      []
-
-  and parseTagSpecFull p =
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | Hash ->
-      parsePolymorphicVariantTypeSpecHash ~attrs ~full:true p
-    | _ ->
-      let typ = parseTypExpr ~attrs p in
-      Parsetree.Rinherit typ
-
-  and parseTagSpecs p =
-    match p.Parser.token with
-    | Bar ->
-      Parser.next p;
-      let rowField = parseTagSpec p in
-      rowField :: parseTagSpecs p
-    | _ ->
-      []
-
-  and parseTagSpec p =
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | Hash ->
-      parsePolymorphicVariantTypeSpecHash ~attrs ~full:false p
-    | _ ->
-      let typ = parseTypExpr ~attrs p in
-      Parsetree.Rinherit typ
-
-  and parseTagSpecFirst p =
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | Bar ->
-      Parser.next p;
-      [parseTagSpec p]
-    | Hash ->
-      [parsePolymorphicVariantTypeSpecHash ~attrs ~full:false p]
-    | _ ->
-      let typ = parseTypExpr ~attrs p in
-      Parser.expect Bar p;
-      [Parsetree.Rinherit typ; parseTagSpec p]
-
-  and parsePolymorphicVariantTypeSpecHash ~attrs ~full p : Parsetree.row_field =
-    let startPos = p.Parser.startPos in
-    let (ident, loc) = parseHashIdent ~startPos p in
-    let rec loop p =
-      match p.Parser.token with
-      | Band when full ->
-        Parser.next p;
-        let rowField = parsePolymorphicVariantTypeArgs p in
-        rowField :: loop p
-      | _ ->
-        []
-    in
-    let firstTuple, tagContainsAConstantEmptyConstructor =
-      match p.Parser.token with
-      | Band when full ->
-        Parser.next p;
-        [parsePolymorphicVariantTypeArgs p], true
-      | Lparen ->
-        [parsePolymorphicVariantTypeArgs p], false
-      | _ ->
-        [], true
-    in
-    let tuples = firstTuple @ loop p in
-    Parsetree.Rtag (
-      Location.mkloc ident loc,
-      attrs,
-      tagContainsAConstantEmptyConstructor,
-      tuples
-    )
-
-  and parsePolymorphicVariantTypeArgs p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Lparen p;
-    let args = parseCommaDelimitedRegion
-      ~grammar:Grammar.TypExprList
-      ~closing:Rparen
-      ~f:parseTypExprRegion
-      p
-    in
-    Parser.expect Rparen p;
-    let attrs = [] in
-    let loc = mkLoc startPos p.prevEndPos in
-    match args with
-    | [{ptyp_desc = Ptyp_tuple _} as typ] as types ->
-      if p.mode = ParseForTypeChecker then
-        typ
-      else
-        Ast_helper.Typ.tuple ~loc ~attrs types
-    | [typ] -> typ
-    | types -> Ast_helper.Typ.tuple ~loc ~attrs types
-
-  and parseTypeEquationAndRepresentation p =
-    match p.Parser.token with
-    | Equal | Bar as token ->
-      if token = Bar then Parser.expect Equal p;
-      Parser.next p;
-      begin match p.Parser.token with
-      | Uident _ ->
-        parseTypeEquationOrConstrDecl p
-      | Lbrace ->
-        parseRecordOrBsObjectDecl p
-      | Private ->
-        parsePrivateEqOrRepr p
-      | Bar | DotDot ->
-        let (priv, kind) = parseTypeRepresentation p in
-        (None, priv, kind)
-      | _ ->
-        let manifest = Some (parseTypExpr p) in
-        begin match p.Parser.token with
-        | Equal ->
-          Parser.next p;
-          let (priv, kind) = parseTypeRepresentation p in
-          (manifest, priv, kind)
-        | _ ->
-          (manifest, Public, Parsetree.Ptype_abstract)
-        end
-      end
-    | _ -> (None, Public, Parsetree.Ptype_abstract)
-
-  (* type-definition	::=	type [rec] typedef  { and typedef }
-   * typedef	::=	typeconstr-name [type-params] type-information
-   * type-information	::=	[type-equation]  [type-representation]  { type-constraint }
-   * type-equation	::=	= typexpr *)
-  and parseTypeDef ~attrs ~startPos p =
-    Parser.leaveBreadcrumb p Grammar.TypeDef;
-    (* let attrs = match attrs with | Some attrs -> attrs | None -> parseAttributes p in *)
-    Parser.leaveBreadcrumb p Grammar.TypeConstrName;
-    let (name, loc) = parseLident p in
-    let typeConstrName = Location.mkloc name loc in
-    Parser.eatBreadcrumb p;
-    let params =
-      let constrName = Location.mkloc (Longident.Lident name) loc in
-      parseTypeParams ~parent:constrName p in
-    let typeDef =
-      let (manifest, priv, kind) = parseTypeEquationAndRepresentation p in
-      let cstrs = parseTypeConstraints p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Type.mk
-        ~loc ~attrs ~priv ~kind ~params ~cstrs ?manifest typeConstrName
-    in
-    Parser.eatBreadcrumb p;
-    typeDef
-
-  and parseTypeExtension ~params ~attrs ~name p =
-    Parser.expect PlusEqual p;
-    let priv =
-      if Parser.optional p Token.Private
-      then Asttypes.Private
-      else Asttypes.Public
-    in
-    let constrStart = p.Parser.startPos in
-    Parser.optional p Bar |> ignore;
-    let first =
-      let (attrs, name, kind) = match p.Parser.token with
-      | Bar ->
-        Parser.next p;
-        parseConstrDef ~parseAttrs:true p
-      | _ ->
-        parseConstrDef ~parseAttrs:true p
-      in
-      let loc = mkLoc constrStart p.prevEndPos in
-      Ast_helper.Te.constructor ~loc ~attrs name kind
-    in
-    let rec loop p cs =
-      match p.Parser.token with
-      | Bar ->
-        let startPos = p.Parser.startPos in
-        Parser.next p;
-        let (attrs, name, kind) = parseConstrDef ~parseAttrs:true p in
-        let extConstr =
-          Ast_helper.Te.constructor ~attrs ~loc:(mkLoc startPos p.prevEndPos) name kind
-        in
-        loop p (extConstr::cs)
-      | _ ->
-        List.rev cs
-    in
-    let constructors = loop p [first] in
-    Ast_helper.Te.mk ~attrs ~params ~priv name constructors
-
-  and parseTypeDefinitions ~attrs ~name ~params ~startPos p =
-      let typeDef =
-        let (manifest, priv, kind) = parseTypeEquationAndRepresentation p in
-        let cstrs = parseTypeConstraints p in
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Type.mk
-          ~loc ~attrs ~priv ~kind ~params ~cstrs ?manifest
-          {name with txt = lidentOfPath name.Location.txt}
-      in
-      let rec loop p defs =
-        let startPos = p.Parser.startPos in
-        let attrs = parseAttributesAndBinding p in
-        match p.Parser.token with
-        | And ->
-          Parser.next p;
-          let attrs = match p.token with
-          | Export ->
-            let exportLoc = mkLoc p.startPos p.endPos in
-            Parser.next p;
-            let genTypeAttr = (Location.mkloc "genType" exportLoc, Parsetree.PStr []) in
-            genTypeAttr::attrs
-          | _ -> attrs
-          in
-          let typeDef = parseTypeDef ~attrs ~startPos p in
-          loop p (typeDef::defs)
-        | _ ->
-          List.rev defs
-      in
-      loop p [typeDef]
-
-  (* TODO: decide if we really want type extensions (eg. type x += Blue)
-   * It adds quite a bit of complexity that can be avoided,
-   * implemented for now. Needed to get a feel for the complexities of
-   * this territory of the grammar *)
-  and parseTypeDefinitionOrExtension ~attrs p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Token.Typ p;
-    let recFlag = match p.token with
-      | Rec -> Parser.next p; Asttypes.Recursive
-      | Lident "nonrec" ->
-        Parser.next p;
-        Asttypes.Nonrecursive
-      | _ -> Asttypes.Nonrecursive
-    in
-    let name = parseValuePath p in
-    let params = parseTypeParams ~parent:name p in
-    match p.Parser.token with
-    | PlusEqual ->
-      TypeExt(parseTypeExtension ~params ~attrs ~name p)
-    | _ ->
-      let typeDefs = parseTypeDefinitions ~attrs ~name ~params ~startPos p in
-      TypeDef {recFlag; types = typeDefs}
-
-  and parsePrimitive p =
-    match p.Parser.token with
-    | String s -> Parser.next p; Some s
-    | _ -> None
-
-  and parsePrimitives p =
-    match (parseRegion ~grammar:Grammar.Primitive ~f:parsePrimitive p) with
-    | [] ->
-      let msg = "An external definition should have at least one primitive. Example: \"setTimeout\"" in
-      Parser.err p (Diagnostics.message msg);
-      []
-    | primitives -> primitives
-
-  (* external value-name : typexp = external-declaration *)
-  and parseExternalDef ~attrs p =
-    let startPos = p.Parser.startPos in
-    Parser.leaveBreadcrumb p Grammar.External;
-    Parser.expect Token.External p;
-    let (name, loc) = parseLident p in
-    let name = Location.mkloc name loc in
-    Parser.expect ~grammar:(Grammar.TypeExpression) Colon p;
-    let typExpr = parseTypExpr p in
-    Parser.expect Equal p;
-    let prim = parsePrimitives p in
-    let loc = mkLoc startPos p.prevEndPos in
-    let vb = Ast_helper.Val.mk ~loc ~attrs ~prim name typExpr in
-    Parser.eatBreadcrumb p;
-    vb
-
-  (* constr-def ::=
-   *  | constr-decl
-   *  | constr-name = constr
-   *
-   *  constr-decl ::= constr-name constr-args
-   *  constr-name ::= uident
-   *  constr      ::= path-uident *)
-  and parseConstrDef ~parseAttrs p =
-    let attrs = if parseAttrs then parseAttributes p else [] in
-    let name = match p.Parser.token with
-    | Uident name ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc name loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-    in
-    let kind = match p.Parser.token with
-    | Lparen ->
-      let (args, res) = parseConstrDeclArgs p in
-      Parsetree.Pext_decl (args, res)
-    | Equal ->
-      Parser.next p;
-      let longident = parseModuleLongIdent ~lowercase:false p in
-      Parsetree.Pext_rebind longident
-    | _ ->
-      Parsetree.Pext_decl (Pcstr_tuple [], None)
-    in
-    (attrs, name, kind)
-
-  (*
-   * exception-definition	::=
-   *  | exception constr-decl
-   *  ∣	exception constr-name = constr
-   *
-   *  constr-name ::= uident
-   *  constr ::= long_uident *)
-  and parseExceptionDef ~attrs p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Token.Exception p;
-    let (_, name, kind) = parseConstrDef ~parseAttrs:false p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Te.constructor ~loc ~attrs name kind
-
-  (* module structure on the file level *)
-  and parseImplementation p : Parsetree.structure =
-    parseRegion p ~grammar:Grammar.Implementation ~f:parseStructureItemRegion
-    [@@progress (Parser.next, Parser.expect, Parser.checkProgress)]
-
-  and parseStructureItemRegion p =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | Open ->
-      let openDescription = parseOpenDescription ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Str.open_ ~loc openDescription)
-    | Let ->
-      let (recFlag, letBindings) = parseLetBindings ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Str.value ~loc recFlag letBindings)
-    | Typ ->
-      Parser.beginRegion p;
-      begin match parseTypeDefinitionOrExtension ~attrs p with
-      | TypeDef {recFlag; types} ->
-        Parser.optional p Semicolon |> ignore;
-        let loc = mkLoc startPos p.prevEndPos in
-        Parser.endRegion p;
-        Some (Ast_helper.Str.type_ ~loc recFlag types)
-      | TypeExt(ext) ->
-        Parser.optional p Semicolon |> ignore;
-        let loc = mkLoc startPos p.prevEndPos in
-        Parser.endRegion p;
-        Some (Ast_helper.Str.type_extension ~loc ext)
-      end
-    | External ->
-      let externalDef = parseExternalDef ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Str.primitive ~loc externalDef)
-    | Import ->
-      let importDescr = parseJsImport ~startPos ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      let structureItem = JsFfi.toParsetree importDescr in
-      Some {structureItem with pstr_loc = loc}
-    | Exception ->
-      let exceptionDef = parseExceptionDef ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Str.exception_ ~loc exceptionDef)
-    | Include ->
-      let includeStatement = parseIncludeStatement ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Str.include_ ~loc includeStatement)
-    | Export ->
-      let structureItem = parseJsExport ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some {structureItem with pstr_loc = loc}
-    | Module ->
-      let structureItem = parseModuleOrModuleTypeImplOrPackExpr ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some {structureItem with pstr_loc = loc}
-    | AtAt ->
-      let attr = parseStandaloneAttribute p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Str.attribute ~loc attr)
-    | PercentPercent ->
-      let extension = parseExtension ~moduleLanguage:true p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Str.extension ~attrs ~loc extension)
-    | token when Grammar.isExprStart token ->
-      let prevEndPos = p.Parser.endPos in
-      let exp = parseExpr p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Parser.checkProgress ~prevEndPos ~result:(Ast_helper.Str.eval ~loc ~attrs exp) p
-    | _ -> None
-
-  and parseJsImport ~startPos ~attrs p =
-    Parser.expect Token.Import p;
-    let importSpec = match p.Parser.token with
-    | Token.Lident _ | Token.At ->
-      let decl = match parseJsFfiDeclaration p with
-      | Some decl -> decl
-      | None -> assert false
-      in
-      JsFfi.Default decl
-    | _ -> JsFfi.Spec(parseJsFfiDeclarations p)
-    in
-    let scope = parseJsFfiScope p in
-    let loc = mkLoc startPos p.prevEndPos in
-    JsFfi.importDescr ~attrs ~importSpec ~scope ~loc
-
-  and parseJsExport ~attrs p =
-    let exportStart = p.Parser.startPos in
-    Parser.expect Token.Export p;
-    let exportLoc = mkLoc exportStart p.prevEndPos in
-    let genTypeAttr = (Location.mkloc "genType" exportLoc, Parsetree.PStr []) in
-    let attrs = genTypeAttr::attrs in
-    match p.Parser.token with
-    | Typ ->
-      begin match parseTypeDefinitionOrExtension ~attrs p with
-      | TypeDef {recFlag; types} ->
-        Ast_helper.Str.type_ recFlag types
-      | TypeExt(ext) ->
-        Ast_helper.Str.type_extension ext
-      end
-    | (* Let *) _ ->
-      let (recFlag, letBindings) = parseLetBindings ~attrs p in
-      Ast_helper.Str.value recFlag letBindings
-
-  and parseJsFfiScope p =
-    match p.Parser.token with
-    | Token.Lident "from" ->
-      Parser.next p;
-      begin match p.token with
-      | String s -> Parser.next p; JsFfi.Module s
-      | Uident _ | Lident _ ->
-        let value = parseIdentPath p in
-        JsFfi.Scope value
-      | _ -> JsFfi.Global
-      end
-    | _ -> JsFfi.Global
-
-  and parseJsFfiDeclarations p =
-    Parser.expect Token.Lbrace p;
-    let decls = parseCommaDelimitedRegion
-      ~grammar:Grammar.JsFfiImport
-      ~closing:Rbrace
-      ~f:parseJsFfiDeclaration
-      p
-    in
-    Parser.expect Rbrace p;
-    decls
-
-  and parseJsFfiDeclaration p =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | Lident _ ->
-      let (ident, _) = parseLident p in
-      let alias = match p.token with
-      | As ->
-        Parser.next p;
-        let (ident, _) = parseLident p in
-        ident
-      | _ ->
-        ident
-      in
-      Parser.expect Token.Colon p;
-      let typ = parseTypExpr p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (JsFfi.decl ~loc ~alias ~attrs ~name:ident ~typ)
-    | _ -> None
-
-  (* include-statement ::= include module-expr *)
-  and parseIncludeStatement ~attrs p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Token.Include p;
-    let modExpr = parseModuleExpr p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Incl.mk ~loc ~attrs modExpr
-
-  and parseAtomicModuleExpr p =
-    let startPos = p.Parser.startPos in
-    match p.Parser.token with
-    | Uident _ident ->
-      let longident = parseModuleLongIdent ~lowercase:false p in
-      Ast_helper.Mod.ident ~loc:longident.loc longident
-    | Lbrace ->
-      Parser.next p;
-      let structure = Ast_helper.Mod.structure (
-        parseDelimitedRegion
-          ~grammar:Grammar.Structure
-          ~closing:Rbrace
-          ~f:parseStructureItemRegion
-          p
-      ) in
-      Parser.expect Rbrace p;
-      let endPos = p.prevEndPos in
-      {structure with pmod_loc = mkLoc startPos endPos}
-    | Lparen ->
-      Parser.next p;
-      let modExpr = match p.token with
-      | Rparen ->
-        Ast_helper.Mod.structure ~loc:(mkLoc startPos p.prevEndPos) []
-      | _ ->
-        parseConstrainedModExpr p
-      in
-      Parser.expect Rparen p;
-      modExpr
-    | Lident "unpack" -> (* TODO: should this be made a keyword?? *)
-      Parser.next p;
-      Parser.expect Lparen p;
-      let expr = parseExpr p in
-      begin match p.Parser.token with
-      | Colon ->
-        let colonStart = p.Parser.startPos in
-        Parser.next p;
-        let attrs = parseAttributes p in
-        let packageType = parsePackageType ~startPos:colonStart ~attrs p in
-        Parser.expect Rparen p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let constraintExpr = Ast_helper.Exp.constraint_
-          ~loc
-          expr packageType
-        in
-        Ast_helper.Mod.unpack ~loc constraintExpr
-      | _ ->
-        Parser.expect Rparen p;
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Mod.unpack ~loc expr
-      end
-    | Percent ->
-      let extension = parseExtension p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Mod.extension ~loc extension
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Recover.defaultModuleExpr()
-
-  and parsePrimaryModExpr p =
-    let startPos = p.Parser.startPos in
-    let modExpr = parseAtomicModuleExpr p in
-    let rec loop p modExpr =
-      match p.Parser.token with
-      | Lparen when p.prevEndPos.pos_lnum == p.startPos.pos_lnum ->
-        loop p (parseModuleApplication p modExpr)
-      | _ -> modExpr
-    in
-    let modExpr = loop p modExpr in
-    {modExpr with pmod_loc = mkLoc startPos p.prevEndPos}
-
-  (*
-   * functor-arg ::=
-   *  | uident : modtype
-   *  | _ : modtype
-   *  | modtype           --> "punning" for _ : modtype
-   *  | attributes functor-arg
-   *)
-  and parseFunctorArg p =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | Uident ident ->
-      Parser.next p;
-      let uidentEndPos = p.prevEndPos in
-      begin match p.Parser.token with
-      | Colon ->
-        Parser.next p;
-        let moduleType = parseModuleType p in
-        let loc = mkLoc startPos uidentEndPos in
-        let argName = Location.mkloc ident loc in
-        Some (attrs, argName, Some moduleType, startPos)
-      | Dot ->
-        Parser.next p;
-        let moduleType =
-          let moduleLongIdent =
-            parseModuleLongIdentTail ~lowercase:false p startPos (Longident.Lident ident) in
-          Ast_helper.Mty.ident ~loc:moduleLongIdent.loc moduleLongIdent
-        in
-        let argName = Location.mknoloc "_" in
-        Some (attrs, argName, Some moduleType, startPos)
-      | _ ->
-        let loc = mkLoc startPos uidentEndPos in
-        let modIdent = Location.mkloc (Longident.Lident ident) loc in
-        let moduleType = Ast_helper.Mty.ident ~loc modIdent in
-        let argName = Location.mknoloc "_" in
-        Some (attrs, argName, Some moduleType, startPos)
-      end
-    | Underscore ->
-      Parser.next p;
-      let argName = Location.mkloc "_" (mkLoc startPos p.prevEndPos) in
-      Parser.expect Colon p;
-      let moduleType = parseModuleType p in
-      Some (attrs, argName, Some moduleType, startPos)
-    | _ ->
-      None
-
-  and parseFunctorArgs p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Lparen p;
-    let args =
-      parseCommaDelimitedRegion
-        ~grammar:Grammar.FunctorArgs
-        ~closing:Rparen
-        ~f:parseFunctorArg
-        p
-    in
-    Parser.expect Rparen p;
-    match args with
-    | [] ->
-      [[], Location.mkloc "*" (mkLoc startPos p.prevEndPos), None, startPos]
-    | args -> args
-
-  and parseFunctorModuleExpr p =
-    let startPos = p.Parser.startPos in
-    let args = parseFunctorArgs p in
-    let returnType = match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      Some (parseModuleType ~es6Arrow:false p)
-    | _ -> None
-    in
-    Parser.expect EqualGreater p;
-    let rhsModuleExpr =
-      let modExpr = parseModuleExpr p in
-      match returnType with
-      | Some modType ->
-        Ast_helper.Mod.constraint_
-          ~loc:(mkLoc modExpr.pmod_loc.loc_start modType.Parsetree.pmty_loc.loc_end)
-          modExpr modType
-      | None -> modExpr
-    in
-    let endPos = p.prevEndPos in
-    let modExpr = List.fold_right (fun (attrs, name, moduleType, startPos) acc ->
-      Ast_helper.Mod.functor_
-        ~loc:(mkLoc startPos endPos)
-        ~attrs
-        name moduleType acc
-    ) args rhsModuleExpr
-    in
-    {modExpr with pmod_loc = mkLoc startPos endPos}
-
-  (* module-expr	::=
-   *  | module-path
-   *  ∣	{ structure-items }
-   *  ∣	functorArgs =>  module-expr
-   *  ∣	module-expr(module-expr)
-   *  ∣	( module-expr )
-   *  ∣	( module-expr : module-type )
-   *  | extension
-   *  | attributes module-expr *)
-  and parseModuleExpr p =
-    let attrs = parseAttributes p in
-    let modExpr = if isEs6ArrowFunctor p then
-        parseFunctorModuleExpr p
-      else
-        parsePrimaryModExpr p
-    in
-    {modExpr with pmod_attributes = List.concat [modExpr.pmod_attributes; attrs]}
-
-  and parseConstrainedModExpr p =
-    let modExpr = parseModuleExpr p in
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      let modType = parseModuleType p in
-      let loc = mkLoc modExpr.pmod_loc.loc_start modType.pmty_loc.loc_end in
-      Ast_helper.Mod.constraint_ ~loc modExpr modType
-    | _ -> modExpr
-
-  and parseConstrainedModExprRegion p =
-    if Grammar.isModExprStart p.Parser.token then
-      Some (parseConstrainedModExpr p)
-    else
-      None
-
-  and parseModuleApplication p modExpr =
-    let startPos = p.Parser.startPos in
-    Parser.expect Lparen p;
-    let args =
-      parseCommaDelimitedRegion
-        ~grammar:Grammar.ModExprList
-        ~closing:Rparen
-        ~f:parseConstrainedModExprRegion
-        p
-    in
-    Parser.expect Rparen p;
-    let args = match args with
-    | [] ->
-      let loc = mkLoc startPos p.prevEndPos in
-      [Ast_helper.Mod.structure ~loc []]
-    | args -> args
-    in
-    List.fold_left (fun modExpr arg ->
-      Ast_helper.Mod.apply
-        ~loc:(mkLoc modExpr.Parsetree.pmod_loc.loc_start arg.Parsetree.pmod_loc.loc_end)
-        modExpr arg
-    ) modExpr args
-
-  and parseModuleOrModuleTypeImplOrPackExpr ~attrs p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Module p;
-    match p.Parser.token with
-    | Typ -> parseModuleTypeImpl ~attrs startPos p
-    | Lparen ->
-      let expr = parseFirstClassModuleExpr ~startPos p in
-      Ast_helper.Str.eval ~attrs expr
-    | _ -> parseMaybeRecModuleBinding ~attrs ~startPos p
-
-  and parseModuleTypeImpl ~attrs startPos p =
-    Parser.expect Typ p;
-    let nameStart = p.Parser.startPos in
-    let name = match p.Parser.token with
-    | List ->
-      Parser.next p;
-      let loc = mkLoc nameStart p.prevEndPos in
-      Location.mkloc "list" loc
-    | Lident ident ->
-      Parser.next p;
-      let loc = mkLoc nameStart p.prevEndPos in
-      Location.mkloc ident loc
-    | Uident ident ->
-      Parser.next p;
-      let loc = mkLoc nameStart p.prevEndPos in
-      Location.mkloc ident loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-    in
-    Parser.expect Equal p;
-    let moduleType = parseModuleType p in
-    let moduleTypeDeclaration =
-      Ast_helper.Mtd.mk
-        ~attrs
-        ~loc:(mkLoc nameStart p.prevEndPos)
-        ~typ:moduleType
-        name
-    in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Str.modtype ~loc moduleTypeDeclaration
-
-  (* definition	::=
-    ∣	 module rec module-name :  module-type =  module-expr   { and module-name
-    :  module-type =  module-expr } *)
-  and parseMaybeRecModuleBinding ~attrs ~startPos p =
-    match p.Parser.token with
-    | Token.Rec ->
-      Parser.next p;
-      Ast_helper.Str.rec_module (parseModuleBindings ~startPos ~attrs p)
-    | _ ->
-      Ast_helper.Str.module_ (parseModuleBinding ~attrs ~startPos:p.Parser.startPos p)
-
-  and parseModuleBinding ~attrs ~startPos p =
-    let name = match p.Parser.token with
-    | Uident ident ->
-      let startPos = p.Parser.startPos in
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Location.mkloc ident loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-    in
-    let body = parseModuleBindingBody p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Mb.mk ~attrs ~loc name body
-
-  and parseModuleBindingBody p =
-    (* TODO: make required with good error message when rec module binding *)
-    let returnModType = match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      Some (parseModuleType p)
-    | _ -> None
-    in
-    Parser.expect Equal p;
-    let modExpr = parseModuleExpr p in
-    match returnModType with
-    | Some modType ->
-      Ast_helper.Mod.constraint_
-        ~loc:(mkLoc modType.pmty_loc.loc_start modExpr.pmod_loc.loc_end)
-        modExpr modType
-    | None -> modExpr
-
-
-  (* module-name :  module-type =  module-expr
-   * { and module-name :  module-type =  module-expr } *)
-  and parseModuleBindings ~attrs ~startPos p =
-    let rec loop p acc =
-      let startPos = p.Parser.startPos in
-      let attrs = parseAttributesAndBinding p in
-      match p.Parser.token with
-      | And ->
-        Parser.next p;
-        ignore(Parser.optional p Module); (* over-parse for fault-tolerance *)
-        let modBinding = parseModuleBinding ~attrs ~startPos p in
-        loop p (modBinding::acc)
-      | _ -> List.rev acc
-    in
-    let first = parseModuleBinding ~attrs ~startPos p in
-    loop p [first]
-
-  and parseAtomicModuleType p =
-    let startPos = p.Parser.startPos in
-    let moduleType = match p.Parser.token with
-    | Uident _ | Lident _ | List ->
-      (* Ocaml allows module types to end with lowercase: module Foo : bar = { ... }
-       * lets go with uppercase terminal for now *)
-      let moduleLongIdent = parseModuleLongIdent ~lowercase:true p in
-      Ast_helper.Mty.ident ~loc:moduleLongIdent.loc moduleLongIdent
-    | Lparen ->
-      Parser.next p;
-      let mty = parseModuleType p in
-      Parser.expect Rparen p;
-      {mty with pmty_loc = mkLoc startPos p.prevEndPos}
-    | Lbrace ->
-      Parser.next p;
-      let spec =
-        parseDelimitedRegion
-          ~grammar:Grammar.Signature
-          ~closing:Rbrace
-          ~f:parseSignatureItemRegion
-          p
-      in
-      Parser.expect Rbrace p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Mty.signature ~loc spec
-    | Module -> (* TODO: check if this is still atomic when implementing first class modules*)
-      parseModuleTypeOf p
-    | Percent ->
-      let extension = parseExtension p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Mty.extension ~loc extension
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Recover.defaultModuleType()
-    in
-    let moduleTypeLoc = mkLoc startPos p.prevEndPos in
-    {moduleType with pmty_loc = moduleTypeLoc}
-
-  and parseFunctorModuleType p =
-    let startPos = p.Parser.startPos in
-    let args = parseFunctorArgs p in
-    Parser.expect EqualGreater p;
-    let rhs = parseModuleType p in
-    let endPos = p.prevEndPos in
-    let modType = List.fold_right (fun (attrs, name, moduleType, startPos) acc ->
-      Ast_helper.Mty.functor_
-        ~loc:(mkLoc startPos endPos)
-        ~attrs
-        name moduleType acc
-    ) args rhs
-    in
-    {modType with pmty_loc = mkLoc startPos endPos}
-
-  (* Module types are the module-level equivalent of type expressions: they
-   * specify the general shape and type properties of modules.
-   *
-   * module-type ::=
-   *  | modtype-path
-   *  | { signature }
-   *  | ( module-type )               --> parenthesized module-type
-   *  | functor-args => module-type   --> functor
-   *  | module-type => module-type    --> functor
-   *  | module type of module-expr
-   *  | attributes module-type
-   *  | module-type with-mod-constraints
-   *  | extension
-   *)
-   and parseModuleType ?(es6Arrow=true) ?(with_=true) p =
-    let attrs = parseAttributes p in
-    let modty = if es6Arrow && isEs6ArrowFunctor p then
-      parseFunctorModuleType p
-    else
-      let modty = parseAtomicModuleType p in
-      match p.Parser.token with
-      | EqualGreater when es6Arrow == true ->
-        Parser.next p;
-        let rhs = parseModuleType ~with_:false p in
-        let str = Location.mknoloc "_" in
-        let loc = mkLoc modty.pmty_loc.loc_start p.prevEndPos in
-        Ast_helper.Mty.functor_ ~loc str (Some modty) rhs
-      | _ -> modty
-    in
-    let moduleType = { modty with
-      pmty_attributes = List.concat [modty.pmty_attributes; attrs]
-    } in
-    if with_ then
-      parseWithConstraints moduleType p
-    else moduleType
-
-
-  and parseWithConstraints moduleType p =
-    match p.Parser.token with
-    | With ->
-      Parser.next p;
-      let first = parseWithConstraint p in
-      let rec loop p acc =
-        match p.Parser.token with
-        | And ->
-          Parser.next p;
-          loop p ((parseWithConstraint p)::acc)
-        | _ ->
-          List.rev acc
-      in
-      let constraints = loop p [first] in
-      let loc = mkLoc moduleType.pmty_loc.loc_start p.prevEndPos in
-      Ast_helper.Mty.with_ ~loc moduleType constraints
-    | _ ->
-      moduleType
-
-  (* mod-constraint	::=
-   *  |  type typeconstr<type-params> type-equation type-constraints?
-   *  ∣	 type typeconstr-name<type-params> := typexpr
-   *  ∣	 module module-path = extended-module-path
-   *  ∣	 module module-path :=  extended-module-path
-   *
-   *  TODO: split this up into multiple functions, better errors *)
-  and parseWithConstraint p =
-    match p.Parser.token with
-    | Module ->
-      Parser.next p;
-      let modulePath = parseModuleLongIdent ~lowercase:false p in
-      begin match p.Parser.token with
-      | ColonEqual ->
-        Parser.next p;
-        let lident = parseModuleLongIdent ~lowercase:false p in
-        Parsetree.Pwith_modsubst (modulePath, lident)
-      | Equal ->
-        Parser.next p;
-        let lident = parseModuleLongIdent ~lowercase:false p in
-        Parsetree.Pwith_module (modulePath, lident)
-      | token ->
-        (* TODO: revisit *)
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        let lident = parseModuleLongIdent ~lowercase:false p in
-        Parsetree.Pwith_modsubst (modulePath, lident)
-      end
-    | Typ ->
-      Parser.next p;
-      let typeConstr = parseValuePath p in
-      let params = parseTypeParams ~parent:typeConstr p in
-      begin match p.Parser.token with
-      | ColonEqual ->
-        Parser.next p;
-        let typExpr = parseTypExpr p in
-        Parsetree.Pwith_typesubst (
-          typeConstr,
-          Ast_helper.Type.mk
-            ~loc:typeConstr.loc
-            ~params
-            ~manifest:typExpr
-            (Location.mkloc (Longident.last typeConstr.txt) typeConstr.loc)
-        )
-      | Equal ->
-        Parser.next p;
-        let typExpr = parseTypExpr p in
-        let typeConstraints = parseTypeConstraints p in
-        Parsetree.Pwith_type (
-          typeConstr,
-          Ast_helper.Type.mk
-            ~loc:typeConstr.loc
-            ~params
-            ~manifest:typExpr
-            ~cstrs:typeConstraints
-            (Location.mkloc (Longident.last typeConstr.txt) typeConstr.loc)
-        )
-      | token ->
-        (* TODO: revisit *)
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        let typExpr = parseTypExpr p in
-        let typeConstraints = parseTypeConstraints p in
-        Parsetree.Pwith_type (
-          typeConstr,
-          Ast_helper.Type.mk
-            ~loc:typeConstr.loc
-            ~params
-            ~manifest:typExpr
-            ~cstrs:typeConstraints
-            (Location.mkloc (Longident.last typeConstr.txt) typeConstr.loc)
-        )
-      end
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      exit (-1) (* TODO: handle this case *)
-
-  and parseModuleTypeOf p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Module p;
-    Parser.expect Typ p;
-    Parser.expect Of p;
-    let moduleExpr = parseModuleExpr p in
-    Ast_helper.Mty.typeof_ ~loc:(mkLoc startPos p.prevEndPos) moduleExpr
-
-  (* module signature on the file level *)
-  and parseSpecification p =
-    parseRegion ~grammar:Grammar.Specification ~f:parseSignatureItemRegion p
-    [@@progress (Parser.next, Parser.expect, Parser.checkProgress)]
-
-  and parseSignatureItemRegion p =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | Let ->
-      Parser.beginRegion p;
-      let valueDesc = parseSignLetDesc ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Parser.endRegion p;
-      Some (Ast_helper.Sig.value ~loc valueDesc)
-    | Typ ->
-      Parser.beginRegion p;
-      begin match parseTypeDefinitionOrExtension ~attrs p with
-      | TypeDef {recFlag; types} ->
-        Parser.optional p Semicolon |> ignore;
-        let loc = mkLoc startPos p.prevEndPos in
-        Parser.endRegion p;
-        Some (Ast_helper.Sig.type_ ~loc recFlag types)
-      | TypeExt(ext) ->
-        Parser.optional p Semicolon |> ignore;
-        let loc = mkLoc startPos p.prevEndPos in
-        Parser.endRegion p;
-        Some (Ast_helper.Sig.type_extension ~loc ext)
-      end
-    | External ->
-      let externalDef = parseExternalDef ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Sig.value ~loc externalDef)
-    | Exception ->
-      let exceptionDef = parseExceptionDef ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Sig.exception_ ~loc exceptionDef)
-    | Open ->
-      let openDescription = parseOpenDescription ~attrs p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Sig.open_ ~loc openDescription)
-    | Include ->
-      Parser.next p;
-      let moduleType = parseModuleType p in
-      let includeDescription = Ast_helper.Incl.mk
-        ~loc:(mkLoc startPos p.prevEndPos)
-        ~attrs
-        moduleType
-      in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Sig.include_ ~loc includeDescription)
-    | Module ->
-      Parser.next p;
-      begin match p.Parser.token with
-      | Uident _ ->
-        let modDecl = parseModuleDeclarationOrAlias ~attrs p in
-        Parser.optional p Semicolon |> ignore;
-        let loc = mkLoc startPos p.prevEndPos in
-        Some (Ast_helper.Sig.module_ ~loc modDecl)
-      | Rec ->
-        let recModule = parseRecModuleSpec ~attrs ~startPos p in
-        Parser.optional p Semicolon |> ignore;
-        let loc = mkLoc startPos p.prevEndPos in
-        Some (Ast_helper.Sig.rec_module ~loc recModule)
-      | Typ ->
-        Some (parseModuleTypeDeclaration ~attrs ~startPos p)
-      | _t ->
-        let modDecl = parseModuleDeclarationOrAlias ~attrs p in
-        Parser.optional p Semicolon |> ignore;
-        let loc = mkLoc startPos p.prevEndPos in
-        Some (Ast_helper.Sig.module_ ~loc modDecl)
-      end
-    | AtAt ->
-      let attr = parseStandaloneAttribute p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Sig.attribute ~loc attr)
-    | PercentPercent ->
-      let extension = parseExtension ~moduleLanguage:true p in
-      Parser.optional p Semicolon |> ignore;
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Sig.extension ~attrs ~loc extension)
-    | Import ->
-      Parser.next p;
-      parseSignatureItemRegion p
-    | _ ->
-      None
-
-  (* module rec module-name :  module-type  { and module-name:  module-type } *)
-  and parseRecModuleSpec ~attrs ~startPos p =
-    Parser.expect Rec p;
-    let rec loop p spec =
-      let startPos = p.Parser.startPos in
-      let attrs = parseAttributesAndBinding p in
-      match p.Parser.token with
-      | And ->
-        (* TODO: give a good error message when with constraint, no parens
-         * and ASet: (Set.S with type elt = A.t)
-         * and BTree: (Btree.S with type elt = A.t)
-         * Without parens, the `and` signals the start of another
-         * `with-constraint`
-         *)
-        Parser.expect And p;
-        let decl = parseRecModuleDeclaration ~attrs ~startPos p in
-        loop p (decl::spec)
-      | _ ->
-        List.rev spec
-    in
-    let first = parseRecModuleDeclaration ~attrs ~startPos p in
-    loop p [first]
-
-  (* module-name : module-type *)
-  and parseRecModuleDeclaration ~attrs ~startPos p =
-    let name = match p.Parser.token with
-    | Uident modName ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc modName loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-    in
-    Parser.expect Colon p;
-    let modType = parseModuleType p in
-    Ast_helper.Md.mk ~loc:(mkLoc startPos p.prevEndPos) ~attrs name modType
-
-  and parseModuleDeclarationOrAlias ~attrs p =
-    let startPos = p.Parser.startPos in
-    let moduleName = match p.Parser.token with
-    | Uident ident ->
-      let loc = mkLoc p.Parser.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc ident loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-    in
-    let body = match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      parseModuleType p
-    | Equal ->
-      Parser.next p;
-      let lident = parseModuleLongIdent ~lowercase:false p in
-      Ast_helper.Mty.alias lident
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Recover.defaultModuleType()
-    in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Md.mk ~loc ~attrs moduleName body
-
-  and parseModuleTypeDeclaration ~attrs ~startPos p =
-    Parser.expect Typ p;
-    let moduleName = match p.Parser.token with
-    | Uident ident ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc ident loc
-    | Lident ident ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc ident loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-    in
-    let typ = match p.Parser.token with
-    | Equal ->
-      Parser.next p;
-      Some (parseModuleType p)
-    | _ -> None
-    in
-    let moduleDecl = Ast_helper.Mtd.mk ~attrs ?typ moduleName in
-    Ast_helper.Sig.modtype ~loc:(mkLoc startPos p.prevEndPos) moduleDecl
-
-  and parseSignLetDesc ~attrs p =
-    let startPos = p.Parser.startPos in
-    Parser.expect Let p;
-    let (name, loc) = parseLident p in
-    let name = Location.mkloc name loc in
-    Parser.expect Colon p;
-    let typExpr = parsePolyTypeExpr p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Val.mk ~loc ~attrs name typExpr
-
-(*    attr-id	::=	lowercase-ident
- 	∣	  capitalized-ident
- 	∣	  attr-id .  attr-id   *)
-  and parseAttributeId p =
-    let startPos = p.Parser.startPos in
-    let rec loop p acc =
-      match p.Parser.token with
-      | Lident ident | Uident ident ->
-        Parser.next p;
-        let id = acc ^ ident in
-        begin match p.Parser.token with
-        | Dot -> Parser.next p; loop p (id ^ ".")
-        | _ -> id
-        end
-      | token when Token.isKeyword token ->
-        Parser.next p;
-        let id = acc ^ (Token.toString token) in
-        begin match p.Parser.token with
-        | Dot -> Parser.next p; loop p (id ^ ".")
-        | _ -> id
-        end
-      | token ->
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        acc
-    in
-    let id = loop p "" in
-    let endPos = p.prevEndPos in
-    Location.mkloc id (mkLoc startPos endPos)
-
-  (*
-   * payload ::=  empty
-   *          |  ( structure-item )
-   *
-   * TODO: what about multiple structure items?
-   * @attr({let x = 1; let x = 2})
-   *
-   * Also what about type-expressions and specifications?
-   * @attr(:myType) ???
-   *)
-  and parsePayload p =
-    match p.Parser.token with
-    | Lparen when p.startPos.pos_cnum = p.prevEndPos.pos_cnum  ->
-      Parser.next p;
-      begin match p.token with
-      | Colon ->
-        Parser.next p;
-        let typ = parseTypExpr p in
-        Parser.expect Rparen p;
-        Parsetree.PTyp typ
-      | _ ->
-        let items = parseDelimitedRegion
-          ~grammar:Grammar.Structure
-          ~closing:Rparen
-          ~f:parseStructureItemRegion
-          p
-        in
-        Parser.expect Rparen p;
-        Parsetree.PStr items
-      end
-    | _ -> Parsetree.PStr []
-
-  (* type attribute = string loc * payload *)
-  and parseAttribute p =
-    match p.Parser.token with
-    | At ->
-      Parser.next p;
-      let attrId = parseAttributeId p in
-      let payload = parsePayload p in
-      Some(attrId, payload)
-    | _ -> None
-
-  and parseAttributes p =
-    parseRegion p
-      ~grammar:Grammar.Attribute
-      ~f:parseAttribute
-
-  (*
-   * standalone-attribute ::=
-   *  | @@ atribute-id
-   *  | @@ attribute-id ( structure-item )
-   *)
-  and parseStandaloneAttribute p =
-    Parser.expect AtAt p;
-    let attrId = parseAttributeId p in
-    let payload = parsePayload p in
-    (attrId, payload)
-
-  (* extension	::=	% attr-id  attr-payload
-   *              | %% attr-id(
-   *  expr	::=	 ...
-   *    ∣	 extension
-   *
-   *  typexpr	::=	 ...
-   *    ∣	 extension
-   *
-   *  pattern	::=	 ...
-   *    ∣	 extension
-   *
-   *  module-expr	::=	 ...
-   *    ∣	 extension
-   *
-   *  module-type	::=	 ...
-   *    ∣	 extension
-   *
-   *  class-expr	::=	 ...
-   *    ∣	 extension
-   *
-   *  class-type	::=	 ...
-   *    ∣	 extension
-   *
-   *
-   * item extension nodes usable in structures and signature
-   *
-   * item-extension ::= %% attr-id
-   *                  | %% attr-id(structure-item)
-   *
-   *  attr-payload ::= structure-item
-   *
-   *  ~moduleLanguage represents whether we're on the module level or not
-   *)
-  and parseExtension ?(moduleLanguage=false) p =
-    if moduleLanguage then
-      Parser.expect PercentPercent p
-    else
-      Parser.expect Percent p;
-    let attrId = parseAttributeId p in
-    let payload = parsePayload p in
-    (attrId, payload)
-end
-
-module OutcomePrinter: sig
-  open Format
-  open Outcometree
-
-  val out_value : (formatter -> out_value -> unit) ref [@@live]
-  val out_type : (formatter -> out_type -> unit) ref [@@live]
-  val out_class_type : (formatter -> out_class_type -> unit) ref [@@live]
-  val out_module_type : (formatter -> out_module_type -> unit) ref [@@live]
-  val out_sig_item : (formatter -> out_sig_item -> unit) ref [@@live]
-  val out_signature : (formatter -> out_sig_item list -> unit) ref [@@live]
-  val out_type_extension : (formatter -> out_type_extension -> unit) ref [@@live]
-  val out_phrase : (formatter -> out_phrase -> unit) ref [@@live]
-
-  val parenthesized_ident : string -> bool [@@live]
-end = struct
-  (* Napkin doesn't have parenthesized identifiers.
-   * We don't support custom operators. *)
-  let parenthesized_ident _name = true
-
-  (* TODO: better allocation strategy for the buffer *)
-  let escapeStringContents s =
-    let len = String.length s in
-    let b = Buffer.create len in
-    for i = 0 to len - 1 do
-      let c = (String.get [@doesNotRaise]) s i in
-      if c = '\008'  then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b 'b';
-      ) else if c = '\009'  then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b 't';
-      ) else if c = '\010' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b 'n';
-      ) else if c = '\013' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b 'r';
-      ) else if c = '\034' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b '"';
-      ) else if c = '\092' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b '\\';
-      ) else (
-        Buffer.add_char b c;
-      );
-    done;
-    Buffer.contents b
-
-  (* let rec print_ident fmt ident = match ident with
-    | Outcometree.Oide_ident s -> Format.pp_print_string fmt s
-    | Oide_dot (id, s) ->
-      print_ident fmt id;
-      Format.pp_print_char fmt '.';
-      Format.pp_print_string fmt s
-    | Oide_apply (id1, id2) ->
-      print_ident fmt id1;
-      Format.pp_print_char fmt '(';
-      print_ident fmt id2;
-      Format.pp_print_char fmt ')' *)
-
-    let rec printOutIdentDoc (ident : Outcometree.out_ident) =
-      match ident with
-      | Oide_ident s -> Doc.text s
-      | Oide_dot (ident, s) -> Doc.concat [
-          printOutIdentDoc ident;
-          Doc.dot;
-          Doc.text s;
-        ]
-      | Oide_apply (call, arg) ->Doc.concat [
-          printOutIdentDoc call;
-          Doc.lparen;
-          printOutIdentDoc arg;
-          Doc.rparen;
-        ]
-
-  let printOutAttributeDoc (outAttribute: Outcometree.out_attribute) =
-    Doc.concat [
-      Doc.text "@";
-      Doc.text outAttribute.oattr_name;
-    ]
-
-  let printOutAttributesDoc (attrs: Outcometree.out_attribute list) =
-    match attrs with
-    | [] -> Doc.nil
-    | attrs ->
-      Doc.concat [
-        Doc.group (
-          Doc.join ~sep:Doc.line (List.map printOutAttributeDoc attrs)
-        );
-        Doc.line;
-      ]
-
-  let rec collectArrowArgs (outType: Outcometree.out_type) args =
-    match outType with
-    | Otyp_arrow (label, argType, returnType) ->
-      let arg = (label, argType) in
-      collectArrowArgs returnType (arg::args)
-    | _ as returnType ->
-      (List.rev args, returnType)
-
-  let rec collectFunctorArgs (outModuleType: Outcometree.out_module_type) args =
-    match outModuleType with
-    | Omty_functor (lbl, optModType, returnModType) ->
-      let arg = (lbl, optModType) in
-      collectFunctorArgs returnModType (arg::args)
-    | _ ->
-      (List.rev args, outModuleType)
-
-  let rec printOutTypeDoc (outType: Outcometree.out_type) =
-    match outType with
-    | Otyp_abstract | Otyp_variant _ (* don't support poly-variants atm *) | Otyp_open -> Doc.nil
-    | Otyp_alias (typ, aliasTxt) ->
-      Doc.concat [
-        printOutTypeDoc typ;
-        Doc.text " as '";
-        Doc.text aliasTxt
-      ]
-    | Otyp_constr (outIdent, []) ->
-      printOutIdentDoc outIdent
-    | Otyp_manifest (typ1, typ2) ->
-        Doc.concat [
-          printOutTypeDoc typ1;
-          Doc.text " = ";
-          printOutTypeDoc typ2;
-        ]
-    | Otyp_record record ->
-      printRecordDeclarationDoc ~inline:true record
-    | Otyp_stuff txt -> Doc.text txt
-    | Otyp_var (ng, s) -> Doc.concat [
-        Doc.text ("'" ^ (if ng then "_" else ""));
-        Doc.text s
-      ]
-    | Otyp_object (fields, rest) -> printObjectFields fields rest
-    | Otyp_class _ -> Doc.nil
-    | Otyp_attribute (typ, attribute) ->
-      Doc.group (
-        Doc.concat [
-          printOutAttributeDoc attribute;
-          Doc.line;
-          printOutTypeDoc typ;
-        ]
-      )
-    (* example: Red | Blue | Green | CustomColour(float, float, float) *)
-    | Otyp_sum constructors ->
-      printOutConstructorsDoc constructors
-
-    (* example: {"name": string, "age": int} *)
-    | Otyp_constr (
-        (Oide_dot ((Oide_ident "Js"), "t")),
-        [Otyp_object (fields, rest)]
-      ) -> printObjectFields fields rest
-
-    (* example: node<root, 'value> *)
-    | Otyp_constr (outIdent, args) ->
-      let argsDoc = match args with
-      | [] -> Doc.nil
-      | args ->
-        Doc.concat [
-          Doc.lessThan;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printOutTypeDoc args
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.greaterThan;
-        ]
-      in
-      Doc.group (
-        Doc.concat [
-          printOutIdentDoc outIdent;
-          argsDoc;
-        ]
-      )
-    | Otyp_tuple tupleArgs ->
-      Doc.group (
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printOutTypeDoc tupleArgs
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      )
-    | Otyp_poly (vars, outType) ->
-      Doc.group (
-        Doc.concat [
-          Doc.join ~sep:Doc.space (
-            List.map (fun var -> Doc.text ("'" ^ var)) vars
-          );
-          printOutTypeDoc outType;
-        ]
-      )
-    | Otyp_arrow _ as typ ->
-      let (typArgs, typ) = collectArrowArgs typ [] in
-      let args = Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-        List.map (fun (lbl, typ) ->
-          if lbl = "" then
-            printOutTypeDoc typ
-          else
-            Doc.group (
-              Doc.concat [
-                Doc.text ("~" ^ lbl ^ ": ");
-                printOutTypeDoc typ
-              ]
-            )
-        ) typArgs
-      ) in
-      let argsDoc =
-        let needsParens = match typArgs with
-        | [_, (Otyp_tuple _ | Otyp_arrow _)] -> true
-        (* single argument should not be wrapped *)
-        | ["", _] -> false
-        | _ -> true
-        in
-        if needsParens then
-          Doc.group (
-            Doc.concat [
-              Doc.lparen;
-              Doc.indent (
-                Doc.concat [
-                  Doc.softLine;
-                  args;
-                ]
-              );
-              Doc.trailingComma;
-              Doc.softLine;
-              Doc.rparen;
-            ]
-          )
-        else args
-      in
-      Doc.concat [
-        argsDoc;
-        Doc.text " => ";
-        printOutTypeDoc typ;
-      ]
-    | Otyp_module (_modName, _stringList, _outTypes) ->
-        Doc.nil
-
-  and printObjectFields fields rest =
-    let dots = match rest with
-    | Some non_gen -> Doc.text ((if non_gen then "_" else "") ^ "..")
-    | None -> Doc.nil
-    in
-    Doc.group (
-      Doc.concat [
-        Doc.lbrace;
-        dots;
-        Doc.indent (
-          Doc.concat [
-            Doc.softLine;
-            Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-              List.map (fun (lbl, outType) -> Doc.group (
-                Doc.concat [
-                  Doc.text ("\"" ^ lbl ^ "\": ");
-                  printOutTypeDoc outType;
-                ]
-              )) fields
-            )
-          ]
-        );
-        Doc.softLine;
-        Doc.trailingComma;
-        Doc.rbrace;
-      ]
-    )
-
-
-  and printOutConstructorsDoc constructors =
-    Doc.group (
-      Doc.indent (
-        Doc.concat [
-          Doc.line;
-          Doc.join ~sep:Doc.line (
-            List.mapi (fun i constructor ->
-              Doc.concat [
-                if i > 0 then Doc.text "| " else Doc.ifBreaks (Doc.text "| ") Doc.nil;
-                printOutConstructorDoc constructor;
-              ]
-            ) constructors
-          )
-        ]
-      )
-    )
-
-  and printOutConstructorDoc (name, args, gadt) =
-      let gadtDoc = match gadt with
-      | Some outType ->
-        Doc.concat [
-          Doc.text ": ";
-          printOutTypeDoc outType
-        ]
-      | None -> Doc.nil
-      in
-      let argsDoc = match args with
-      | [] -> Doc.nil
-      | [Otyp_record record] ->
-        (* inline records
-         *   | Root({
-         *      mutable value: 'value,
-         *      mutable updatedTime: float,
-         *    })
-         *)
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            printRecordDeclarationDoc ~inline:true record;
-          );
-          Doc.rparen;
-        ]
-      | _types ->
-        Doc.indent (
-          Doc.concat [
-            Doc.lparen;
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                  List.map printOutTypeDoc args
-                )
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-            Doc.rparen;
-          ]
-        )
-      in
-      Doc.group (
-        Doc.concat [
-          Doc.text name;
-          argsDoc;
-          gadtDoc
-        ]
-      )
-
-  and printRecordDeclRowDoc (name, mut, arg) =
-    Doc.group (
-      Doc.concat [
-        if mut then Doc.text "mutable " else Doc.nil;
-        Doc.text name;
-        Doc.text ": ";
-        printOutTypeDoc arg;
-      ]
-    )
-
-  and printRecordDeclarationDoc ~inline rows =
-    let content = Doc.concat [
-      Doc.lbrace;
-      Doc.indent (
-        Doc.concat [
-          Doc.softLine;
-          Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-            List.map printRecordDeclRowDoc rows
-          )
-        ]
-      );
-      Doc.trailingComma;
-      Doc.softLine;
-      Doc.rbrace;
-    ] in
-    if not inline then
-      Doc.group content
-    else content
-
-  let printOutType fmt outType =
-    Format.pp_print_string fmt
-      (Doc.toString ~width:80 (printOutTypeDoc outType))
-
-  let printTypeParameterDoc (typ, (co, cn)) =
-    Doc.concat [
-      if not cn then Doc.text "+" else if not co then Doc.text "-" else Doc.nil;
-      if typ = "_" then Doc.text "_" else Doc.text ("'" ^ typ)
-    ]
-
-
-  let rec printOutSigItemDoc (outSigItem : Outcometree.out_sig_item) =
-    match outSigItem with
-    | Osig_class _ | Osig_class_type _ -> Doc.nil
-    | Osig_ellipsis -> Doc.dotdotdot
-    | Osig_value valueDecl ->
-      Doc.group (
-        Doc.concat [
-          printOutAttributesDoc valueDecl.oval_attributes;
-          Doc.text (
-            match valueDecl.oval_prims with | [] -> "let " | _ -> "external "
-          );
-          Doc.text valueDecl.oval_name;
-          Doc.text ":";
-          Doc.space;
-          printOutTypeDoc valueDecl.oval_type;
-          match valueDecl.oval_prims with
-          | [] -> Doc.nil
-          | primitives -> Doc.indent (
-              Doc.concat [
-                Doc.text " =";
-                Doc.line;
-                Doc.group (
-                  Doc.join ~sep:Doc.line (List.map (fun prim -> Doc.text ("\"" ^ prim ^ "\"")) primitives)
-                )
-              ]
-            )
-        ]
-      )
-  | Osig_typext (outExtensionConstructor, _outExtStatus) ->
-    printOutExtensionConstructorDoc outExtensionConstructor
-  | Osig_modtype (modName, Omty_signature []) ->
-    Doc.concat [
-      Doc.text "module type ";
-      Doc.text modName;
-    ]
-  | Osig_modtype (modName, outModuleType) ->
-    Doc.group (
-      Doc.concat [
-        Doc.text "module type ";
-        Doc.text modName;
-        Doc.text " = ";
-        printOutModuleTypeDoc outModuleType;
-      ]
-    )
-  | Osig_module (modName, Omty_alias ident, _) ->
-    Doc.group (
-      Doc.concat [
-        Doc.text "module ";
-        Doc.text modName;
-        Doc.text " =";
-        Doc.line;
-        printOutIdentDoc ident;
-      ]
-    )
-  | Osig_module (modName, outModType, outRecStatus) ->
-     Doc.group (
-      Doc.concat [
-        Doc.text (
-          match outRecStatus with
-          | Orec_not -> "module "
-          | Orec_first -> "module rec "
-          | Orec_next -> "and"
-        );
-        Doc.text modName;
-        Doc.text " = ";
-        printOutModuleTypeDoc outModType;
-      ]
-    )
-  | Osig_type (outTypeDecl, outRecStatus) ->
-    (* TODO: manifest ? *)
-    let attrs = match outTypeDecl.otype_immediate, outTypeDecl.otype_unboxed with
-    | false, false -> Doc.nil
-    | true, false ->
-      Doc.concat [Doc.text "@immediate"; Doc.line]
-    | false, true ->
-      Doc.concat [Doc.text "@unboxed"; Doc.line]
-    | true, true ->
-      Doc.concat [Doc.text "@immediate @unboxed"; Doc.line]
-    in
-    let kw = Doc.text (
-      match outRecStatus with
-      | Orec_not -> "type "
-      | Orec_first -> "type rec "
-      | Orec_next -> "and "
-    ) in
-    let typeParams = match outTypeDecl.otype_params with
-    | [] -> Doc.nil
-    | _params -> Doc.group (
-        Doc.concat [
-          Doc.lessThan;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printTypeParameterDoc outTypeDecl.otype_params
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.greaterThan;
-        ]
-      )
-    in
-    let privateDoc = match outTypeDecl.otype_private with
-    | Asttypes.Private -> Doc.text "private "
-    | Public -> Doc.nil
-    in
-    let kind = match outTypeDecl.otype_type with
-    | Otyp_open -> Doc.concat [
-        Doc.text " = ";
-        privateDoc;
-        Doc.text "..";
-      ]
-    | Otyp_abstract -> Doc.nil
-    | Otyp_record record -> Doc.concat [
-        Doc.text " = ";
-        privateDoc;
-        printRecordDeclarationDoc ~inline:false record;
-      ]
-    | typ -> Doc.concat [
-        Doc.text " = ";
-        printOutTypeDoc typ
-      ]
-    in
-    let constraints =  match outTypeDecl.otype_cstrs with
-    | [] -> Doc.nil
-    | _ -> Doc.group (
-      Doc.concat [
-        Doc.line;
-        Doc.indent (
-          Doc.concat [
-            Doc.hardLine;
-            Doc.join ~sep:Doc.line (List.map (fun (typ1, typ2) ->
-              Doc.group (
-                Doc.concat [
-                  Doc.text "constraint ";
-                  printOutTypeDoc typ1;
-                  Doc.text " =";
-                  Doc.indent (
-                    Doc.concat [
-                      Doc.line;
-                      printOutTypeDoc typ2;
-                    ]
-                  )
-                ]
-              )
-            ) outTypeDecl.otype_cstrs)
-          ]
-        )
-      ]
-    ) in
-    Doc.group (
-      Doc.concat [
-        attrs;
-        Doc.group (
-          Doc.concat [
-            attrs;
-            kw;
-            Doc.text outTypeDecl.otype_name;
-            typeParams;
-            kind
-          ]
-        );
-        constraints
-      ]
-    )
-
-  and printOutModuleTypeDoc (outModType : Outcometree.out_module_type) =
-    match outModType with
-    | Omty_abstract -> Doc.nil
-    | Omty_ident ident -> printOutIdentDoc ident
-    (* example: module Increment = (M: X_int) => X_int *)
-    | Omty_functor _ ->
-      let (args, returnModType) = collectFunctorArgs outModType [] in
-      let argsDoc = match args with
-      | [_, None] -> Doc.text "()"
-      | args ->
-        Doc.group (
-          Doc.concat [
-            Doc.lparen;
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                  List.map (fun (lbl, optModType) -> Doc.group (
-                    Doc.concat [
-                      Doc.text lbl;
-                      match optModType with
-                      | None -> Doc.nil
-                      | Some modType -> Doc.concat [
-                          Doc.text ": ";
-                          printOutModuleTypeDoc modType;
-                        ]
-                    ]
-                  )) args
-                )
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-            Doc.rparen;
-          ]
-        )
-      in
-      Doc.group (
-        Doc.concat [
-          argsDoc;
-          Doc.text " => ";
-          printOutModuleTypeDoc returnModType
-        ]
-      )
-    | Omty_signature [] -> Doc.nil
-    | Omty_signature signature ->
-      Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printOutSignatureDoc signature;
-            ]
-          );
-          Doc.softLine;
-          Doc.rbrace;
-        ]
-      )
-    | Omty_alias _ident -> Doc.nil
-
-  and printOutSignatureDoc (signature : Outcometree.out_sig_item list) =
-    let rec loop signature acc =
-      match signature with
-      | [] -> List.rev acc
-      | Outcometree.Osig_typext(ext, Oext_first) :: items ->
-        (* Gather together the extension constructors *)
-        let rec gather_extensions acc items =
-          match items with
-              Outcometree.Osig_typext(ext, Oext_next) :: items ->
-                gather_extensions
-                  ((ext.oext_name, ext.oext_args, ext.oext_ret_type) :: acc)
-                  items
-            | _ -> (List.rev acc, items)
-        in
-        let exts, items =
-          gather_extensions
-            [(ext.oext_name, ext.oext_args, ext.oext_ret_type)]
-            items
-        in
-        let te =
-          { Outcometree.otyext_name = ext.oext_type_name;
-            otyext_params = ext.oext_type_params;
-            otyext_constructors = exts;
-            otyext_private = ext.oext_private }
-        in
-        let doc = printOutTypeExtensionDoc te in
-        loop items (doc::acc)
-      | item::items ->
-        let doc = printOutSigItemDoc item in
-        loop items (doc::acc)
-    in
-    match loop signature [] with
-    | [doc] -> doc
-    | docs ->
-      Doc.breakableGroup ~forceBreak:true (
-        Doc.join ~sep:Doc.line docs
-      )
-
-  and printOutExtensionConstructorDoc (outExt : Outcometree.out_extension_constructor) =
-    let typeParams = match outExt.oext_type_params with
-    | [] -> Doc.nil
-    | params ->
-      Doc.group(
-        Doc.concat [
-          Doc.lessThan;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (List.map
-                (fun ty -> Doc.text (if ty = "_" then ty else "'" ^ ty))
-                params
-
-              )
-            ]
-          );
-          Doc.softLine;
-          Doc.greaterThan;
-        ]
-      )
-
-    in
-    Doc.group (
-      Doc.concat [
-        Doc.text "type ";
-        Doc.text outExt.oext_type_name;
-        typeParams;
-        Doc.text " +=";
-        Doc.line;
-        if outExt.oext_private = Asttypes.Private then
-          Doc.text "private "
-        else
-          Doc.nil;
-        printOutConstructorDoc
-          (outExt.oext_name, outExt.oext_args, outExt.oext_ret_type)
-      ]
-    )
-
-  and printOutTypeExtensionDoc (typeExtension : Outcometree.out_type_extension) =
-    let typeParams = match typeExtension.otyext_params with
-    | [] -> Doc.nil
-    | params ->
-      Doc.group(
-        Doc.concat [
-          Doc.lessThan;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (List.map
-                (fun ty -> Doc.text (if ty = "_" then ty else "'" ^ ty))
-                params
-
-              )
-            ]
-          );
-          Doc.softLine;
-          Doc.greaterThan;
-        ]
-      )
-
-    in
-    Doc.group (
-      Doc.concat [
-        Doc.text "type ";
-        Doc.text typeExtension.otyext_name;
-        typeParams;
-        Doc.text " +=";
-        if typeExtension.otyext_private = Asttypes.Private then
-          Doc.text "private "
-        else
-          Doc.nil;
-        printOutConstructorsDoc typeExtension.otyext_constructors;
-      ]
-    )
-
-  let printOutSigItem fmt outSigItem =
-    Format.pp_print_string fmt
-      (Doc.toString ~width:80 (printOutSigItemDoc outSigItem))
-
-  let printOutSignature fmt signature =
-    Format.pp_print_string fmt
-      (Doc.toString ~width:80 (printOutSignatureDoc signature))
-
-  let validFloatLexeme s =
-    let l = String.length s in
-    let rec loop i =
-      if i >= l then s ^ "." else
-      match (s.[i] [@doesNotRaise]) with
-      | '0' .. '9' | '-' -> loop (i+1)
-      | _ -> s
-    in loop 0
-
-  let floatRepres f =
-    match classify_float f with
-    | FP_nan -> "nan"
-    | FP_infinite ->
-      if f < 0.0 then "neg_infinity" else "infinity"
-    | _ ->
-      let float_val =
-        let s1 = Printf.sprintf "%.12g" f in
-        if f = (float_of_string [@doesNotRaise]) s1 then s1 else
-        let s2 = Printf.sprintf "%.15g" f in
-        if f = (float_of_string [@doesNotRaise]) s2 then s2 else
-        Printf.sprintf "%.18g" f
-      in validFloatLexeme float_val
-
-  let rec printOutValueDoc (outValue : Outcometree.out_value) =
-    match outValue with
-    | Oval_array outValues ->
-      Doc.group (
-        Doc.concat [
-          Doc.lbracket;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printOutValueDoc outValues
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rbracket;
-        ]
-      )
-    | Oval_char c -> Doc.text ("'" ^ (Char.escaped c) ^ "'")
-    | Oval_constr (outIdent, outValues) ->
-      Doc.group (
-        Doc.concat [
-          printOutIdentDoc outIdent;
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printOutValueDoc outValues
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      )
-    | Oval_ellipsis -> Doc.text "..."
-    | Oval_int i -> Doc.text (Format.sprintf "%i" i)
-    | Oval_int32 i -> Doc.text (Format.sprintf "%lil" i)
-    | Oval_int64 i -> Doc.text (Format.sprintf "%LiL" i)
-    | Oval_nativeint i -> Doc.text (Format.sprintf "%nin" i)
-    | Oval_float f -> Doc.text (floatRepres f)
-    | Oval_list outValues ->
-      Doc.group (
-        Doc.concat [
-          Doc.text "list[";
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printOutValueDoc outValues
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rbracket;
-        ]
-      )
-    | Oval_printer fn ->
-      let fmt = Format.str_formatter in
-      fn fmt;
-      let str = Format.flush_str_formatter () in
-      Doc.text str
-    | Oval_record rows ->
-      Doc.group (
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map (fun (outIdent, outValue) -> Doc.group (
-                    Doc.concat [
-                      printOutIdentDoc outIdent;
-                      Doc.text ": ";
-                      printOutValueDoc outValue;
-                    ]
-                  )
-                ) rows
-              );
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      )
-    | Oval_string (txt, _sizeToPrint, _kind) ->
-      Doc.text (escapeStringContents txt)
-    | Oval_stuff txt -> Doc.text txt
-    | Oval_tuple outValues ->
-      Doc.group (
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printOutValueDoc outValues
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      )
-    (* Not supported by NapkinScript *)
-    | Oval_variant _ -> Doc.nil
-
-  let printOutExceptionDoc exc outValue =
-    match exc with
-    | Sys.Break -> Doc.text "Interrupted."
-    | Out_of_memory -> Doc.text "Out of memory during evaluation."
-    | Stack_overflow ->
-      Doc.text "Stack overflow during evaluation (looping recursion?)."
-    | _ ->
-      Doc.group (
-        Doc.indent(
-          Doc.concat [
-            Doc.text "Exception:";
-            Doc.line;
-            printOutValueDoc outValue;
-          ]
-        )
-      )
-
-  let printOutPhraseSignature signature =
-    let rec loop signature acc =
-     match signature with
-     | [] -> List.rev acc
-     | (Outcometree.Osig_typext(ext, Oext_first), None)::signature ->
-        (* Gather together extension constructors *)
-        let rec gather_extensions acc items =
-          match items with
-          |  (Outcometree.Osig_typext(ext, Oext_next), None)::items ->
-              gather_extensions
-                ((ext.oext_name, ext.oext_args, ext.oext_ret_type)::acc)
-                items
-          | _ -> (List.rev acc, items)
-        in
-        let exts, signature =
-          gather_extensions
-            [(ext.oext_name, ext.oext_args, ext.oext_ret_type)]
-            signature
-        in
-        let te =
-          { Outcometree.otyext_name = ext.oext_type_name;
-            otyext_params = ext.oext_type_params;
-            otyext_constructors = exts;
-            otyext_private = ext.oext_private }
-        in
-        let doc = printOutTypeExtensionDoc te in
-        loop signature (doc::acc)
-     | (sigItem, optOutValue)::signature ->
-       let doc = match optOutValue with
-        | None ->
-          printOutSigItemDoc sigItem
-        | Some outValue ->
-          Doc.group (
-            Doc.concat [
-              printOutSigItemDoc sigItem;
-              Doc.text " = ";
-              printOutValueDoc outValue;
-            ]
-          )
-       in
-       loop signature (doc::acc)
-     in
-     Doc.breakableGroup ~forceBreak:true (
-       Doc.join ~sep:Doc.line (loop signature [])
-     )
-
-  let printOutPhraseDoc (outPhrase : Outcometree.out_phrase) =
-    match outPhrase with
-    | Ophr_eval (outValue, outType) ->
-      Doc.group (
-        Doc.concat [
-          Doc.text "- : ";
-          printOutTypeDoc outType;
-          Doc.text " =";
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printOutValueDoc outValue;
-            ]
-          )
-        ]
-      )
-    | Ophr_signature [] -> Doc.nil
-    | Ophr_signature signature -> printOutPhraseSignature signature
-    | Ophr_exception (exc, outValue) ->
-      printOutExceptionDoc exc outValue
-
-  let printOutPhase fmt outPhrase =
-    Format.pp_print_string fmt
-      (Doc.toString ~width:80 (printOutPhraseDoc outPhrase))
-
-  let printOutModuleType fmt outModuleType =
-    Format.pp_print_string fmt
-      (Doc.toString ~width:80 (printOutModuleTypeDoc outModuleType))
-
-  let printOutTypeExtension fmt typeExtension =
-    Format.pp_print_string fmt
-      (Doc.toString ~width:80 (printOutTypeExtensionDoc typeExtension))
-
-  let printOutValue fmt outValue =
-    Format.pp_print_string fmt
-      (Doc.toString ~width:80 (printOutValueDoc outValue))
-
-  (* Not supported in Napkin *)
-  let printOutClassType _fmt _ = ()
-
-  let out_value = ref printOutValue
-  let out_type = ref printOutType
-  let out_module_type = ref printOutModuleType
-  let out_sig_item = ref printOutSigItem
-  let out_signature = ref printOutSignature
-  let out_type_extension = ref printOutTypeExtension
-  let out_phrase = ref printOutPhase [@live]
-  let out_class_type =  ref printOutClassType
-end
-
-module Repl = struct
-  let parseToplevelPhrase filename =
-    let src = IO.readFile filename in
-    let p = Parser.make src filename in
-    Parsetree.Ptop_def (NapkinScript.parseImplementation p)
-
-  let typeAndPrintOutcome filename =
-    Compmisc.init_path false;
-    let env = Compmisc.initial_env () in
-    try
-      let sstr = match parseToplevelPhrase filename with
-      | Parsetree.Ptop_def sstr -> sstr
-      | _ -> assert false
-      in
-      let (_str, signature, _newenv) = Typemod.type_toplevel_phrase env sstr in
-      let outSigItems = Printtyp.tree_of_signature signature in
-      let fmt = Format.str_formatter in
-      !OutcomePrinter.out_signature fmt outSigItems;
-      let result = Format.flush_str_formatter () in
-      print_string result
-    with
-    | Typetexp.Error (_, _, err) ->
-      let fmt = Format.str_formatter in
-      Typetexp.report_error env fmt err;
-      let result = Format.flush_str_formatter () in
-      let () = print_endline result in
-      ()
-    | _ -> print_endline "catch all"
-end
-
-(* command line flags *)
-module Clflags: sig
-  val recover: bool ref
-  val print: string ref
-  val width: int ref
-  val origin: string ref
-  val files: string list ref
-  val interface: bool ref
-  val report: string ref
-
-  val parse: unit -> unit
-  val outcome: bool ref
-end = struct
-  let recover = ref false
-  let width = ref 100
-
-  let files = ref []
-  let addFilename filename = files := filename::(!files)
-
-  let print = ref ""
-  let outcome = ref false
-  let origin = ref ""
-  let interface = ref false
-  let report = ref "pretty"
-
-  let usage = "Usage: napkinscript <options> <file>\nOptions are:"
-
-  let spec = [
-    ("-recover", Arg.Unit (fun () -> recover := true), "Emit partial ast");
-    ("-print", Arg.String (fun txt -> print := txt), "Print either binary, ocaml or ast");
-    ("-parse", Arg.String (fun txt -> origin := txt), "Parse ocaml or napkinscript");
-    ("-outcome", Arg.Bool (fun printOutcomeTree -> outcome := printOutcomeTree), "print outcometree");
-    ("-width", Arg.Int (fun w -> width := w), "Specify the line length that the printer will wrap on" );
-    ("-interface", Arg.Unit (fun () -> interface := true), "Parse as interface");
-    ("-report", Arg.String (fun txt -> report := txt), "Stylize errors and messages using color and context. Accepts `Pretty` and `Plain`. Default `Plain`")
-  ]
-
-  let parse () = Arg.parse spec addFilename usage
-end
-
-module Driver: sig
-  val processFile:
-       isInterface: bool
-    -> width: int
-    -> recover: bool
-    -> origin:string
-    -> target:string
-    -> report:string
-    -> string
-    -> unit
-end = struct
-  type 'a file_kind =
-    | Structure: Parsetree.structure file_kind
-    | Signature: Parsetree.signature file_kind
-
-  let parseNapkin (type a) (kind : a file_kind) p : a =
-    match kind with
-    | Structure -> NapkinScript.parseImplementation p
-    | Signature -> NapkinScript.parseSpecification p
-
-  let extractOcamlStringData filename =
-    let lexbuf = if String.length filename > 0 then
-      IO.readFile filename |> Lexing.from_string
-    else
-      Lexing.from_channel stdin
-    in
-    let stringLocs = ref [] in
-    let rec next () =
-      let token = Lexer.token_with_comments lexbuf in
-      match token with
-      | OcamlParser.STRING (_txt, None) ->
-        let open Location in
-        let loc = {
-          loc_start = lexbuf.lex_start_p;
-          loc_end = lexbuf.Lexing.lex_curr_p;
-          loc_ghost = false;
-        } in
-        let len = loc.loc_end.pos_cnum - loc.loc_start.pos_cnum in
-        let txt = Bytes.to_string (
-          (Bytes.sub [@doesNotRaise]) lexbuf.Lexing.lex_buffer loc.loc_start.pos_cnum len
-        ) in
-        stringLocs := (txt, loc)::(!stringLocs);
-        next();
-      | OcamlParser.EOF -> ()
-      | _ -> next()
-    in
-    next();
-    List.rev !stringLocs
-
-  let parseOcaml (type a) (kind : a file_kind) filename : a =
-    let lexbuf = if String.length filename > 0 then
-      IO.readFile filename |> Lexing.from_string
-    else
-      Lexing.from_channel stdin
-    in
-    let stringData = extractOcamlStringData filename in
-    match kind with
-    | Structure ->
-      Parse.implementation lexbuf
-      |> ParsetreeCompatibility.replaceStringLiteralStructure stringData
-      |> ParsetreeCompatibility.structure
-    | Signature ->
-      Parse.interface lexbuf
-      |> ParsetreeCompatibility.replaceStringLiteralSignature stringData
-      |> ParsetreeCompatibility.signature
-
-  let parseNapkinFile ~destination kind filename =
-    let src = if String.length filename > 0 then
-      IO.readFile filename
-    else
-      IO.readStdin ()
-    in
-    let p =
-      let mode = match destination with
-      | "napkinscript" | "ns" | "sexp" -> Parser.Default
-      | _ -> Parser.ParseForTypeChecker
-      in
-      Parser.make ~mode src filename in
-    let ast = parseNapkin kind p in
-    let report = match p.diagnostics with
-    | [] -> None
-    | diagnostics -> Some(diagnostics)
-    in
-    (ast, report, p)
-
-  let parseOcamlFile kind filename =
-    let ast = parseOcaml kind filename in
-    let lexbuf2 = if String.length filename > 0 then
-      IO.readFile filename |> Lexing.from_string
-    else
-      Lexing.from_channel stdin
-    in
-    let comments =
-      let rec next (prevTokEndPos : Lexing.position) comments lb =
-        let token = Lexer.token_with_comments lb in
-        match token with
-        | OcamlParser.EOF -> comments
-        | OcamlParser.COMMENT (txt, loc) ->
-          let comment = Comment.fromOcamlComment
-            ~loc
-            ~prevTokEndPos
-            ~txt
-          in
-          next loc.Location.loc_end (comment::comments) lb
-        | _ ->
-          next lb.Lexing.lex_curr_p comments lb
-      in
-      let cmts = next lexbuf2.Lexing.lex_start_p [] lexbuf2 in
-      cmts
-    in
-    let p = Parser.make "" filename in
-    p.comments <- comments;
-    (ast, None, p)
-
-  let reasonFilename = ref ""
-  let commentData = ref []
-  let stringData = ref []
-
-  let parseReasonBinaryFromStdin (type a) (kind : a file_kind) filename  :a  =
-    let chan, close =
-      match String.length filename == 0 with
-      | true -> stdin, (fun _ -> ())
-      | false ->
-          let file_chan = open_in_bin filename in
-          seek_in file_chan 0;
-          file_chan, close_in_noerr
-    in
-    let ic = chan in
-    let magic = match kind with
-    | Structure -> Config.ast_impl_magic_number
-    | Signature -> Config.ast_intf_magic_number
-    in
-    let buffer = (really_input_string [@doesNotRaise]) ic (String.length magic) in
-    assert(buffer = magic);
-    let filename = input_value ic in
-    reasonFilename := filename;
-    let ast = input_value ic in
-    close chan;
-
-    let src =
-      if String.length filename > 0 then IO.readFile filename
-      else IO.readStdin ()
-    in
-
-    let scanner = Scanner.make (Bytes.of_string src) filename in
-
-    let rec next prevEndPos scanner =
-      let (startPos, endPos, token) = Scanner.scan scanner in
-      match token with
-      | Eof -> ()
-      | Comment c ->
-        Comment.setPrevTokEndPos c prevEndPos;
-        commentData := c::(!commentData);
-        next endPos scanner
-      | String _ ->
-        let loc = {Location.loc_start = startPos; loc_end = endPos; loc_ghost = false} in
-        let len = endPos.pos_cnum - startPos.pos_cnum in
-        let txt = (String.sub [@doesNotRaise]) src startPos.pos_cnum len in
-        stringData := (txt, loc)::(!stringData);
-        next endPos scanner
-      | _ ->
-        next endPos scanner
-    in
-
-    next Lexing.dummy_pos scanner;
-
-    match kind with
-    | Structure ->
-      ast
-      |> ParsetreeCompatibility.replaceStringLiteralStructure !stringData
-      |> ParsetreeCompatibility.normalizeReasonArityStructure ~forPrinter:true
-      |> ParsetreeCompatibility.structure
-    | Signature ->
-      ast
-      |> ParsetreeCompatibility.replaceStringLiteralSignature !stringData
-      |> ParsetreeCompatibility.normalizeReasonAritySignature ~forPrinter:true
-      |> ParsetreeCompatibility.signature
-
-  let isReasonDocComment (comment: Comment.t) =
-    let content = Comment.txt comment in
-    let len = String.length content in
-    if len = 0 then true
-    else if len >= 2 && (String.unsafe_get content 0 = '*' && String.unsafe_get content 1 = '*') then false
-    else if len >= 1 && (String.unsafe_get content 0 = '*') then true
-    else false
-
-
-  let parseReasonBinary kind filename =
-    let ast = parseReasonBinaryFromStdin kind filename in
-    let p = Parser.make "" !reasonFilename in
-    p.comments <- List.filter (fun c -> not (isReasonDocComment c)) !commentData;
-    (ast, None, p)
-
-  let parseImplementation ~origin ~destination filename =
-    match origin with
-    | "ml" | "ocaml" ->
-      parseOcamlFile Structure filename
-    | "reasonBinary" ->
-      parseReasonBinary Structure filename
-    | _ ->
-      parseNapkinFile ~destination Structure filename
-
-  let parseInterface ~destination ~origin filename =
-    match origin with
-    | "ml" | "ocaml" ->
-      parseOcamlFile Signature filename
-    | "reasonBinary" ->
-      parseReasonBinary Signature filename
-    | _ ->
-      parseNapkinFile ~destination Signature filename
-
-  let process ~reportStyle parseFn printFn recover filename =
-    let (ast, report, parserState) = parseFn filename in
-    match report with
-    | Some report when recover = true ->
-      printFn ast parserState;
-      prerr_string (
-        Diagnostics.stringOfReport
-          ~style:(Diagnostics.parseReportStyle reportStyle)
-          report (Bytes.to_string parserState.Parser.scanner.src)
-      );
-    | Some report ->
-      prerr_string (
-        Diagnostics.stringOfReport
-          ~style:(Diagnostics.parseReportStyle reportStyle)
-          report (Bytes.to_string parserState.Parser.scanner.src)
-      );
-      exit 1
-    | None ->
-      printFn ast parserState
-
-  type action =
-    | ProcessImplementation
-    | ProcessInterface
-
-  let printImplementation ~target ~width filename ast _parserState =
-    match target with
-    | "ml" | "ocaml" ->
-      Pprintast.structure Format.std_formatter ast
-    | "ns" | "napkinscript" ->
-      Printer.printImplementation ~width ast (List.rev _parserState.Parser.comments)
-    | "ast" ->
-      Printast.implementation Format.std_formatter ast
-    | "sexp" ->
-      ast |> SexpAst.implementation |> Sexp.toString |> print_string
-    | _ -> (* default binary *)
-      output_string stdout Config.ast_impl_magic_number;
-      output_value stdout filename;
-      output_value stdout ast
-
-  let printInterface ~target ~width filename ast _parserState =
-    match target with
-    | "ml" | "ocaml" -> Pprintast.signature Format.std_formatter ast
-    | "ns" | "napkinscript" ->
-      Printer.printInterface ~width ast (List.rev _parserState.Parser.comments)
-    | "ast" -> Printast.interface Format.std_formatter ast
-    | "sexp" ->
-      ast |> SexpAst.interface |> Sexp.toString |> print_string
-    | _ -> (* default binary *)
-      output_string stdout Config.ast_intf_magic_number;
-      output_value stdout filename;
-      output_value stdout ast
-
-  let processFile ~isInterface ~width ~recover ~origin ~target ~report filename =
-    try
-      let len = String.length filename in
-      let action =
-        if isInterface || len > 0 && (String.get [@doesNotRaise]) filename (len - 1) = 'i' then
-          ProcessInterface
-        else ProcessImplementation
-      in
-      match action with
-      | ProcessImplementation ->
-        process
-          ~reportStyle:report
-          (parseImplementation ~origin ~destination:target)
-          (printImplementation ~target ~width filename) recover filename
-      | ProcessInterface ->
-        process
-          ~reportStyle:report
-          (parseInterface ~origin ~destination:target)
-          (printInterface ~target ~width filename) recover filename
-    with
-    | Failure txt ->
-      prerr_string txt;
-      prerr_newline();
-      exit 1
-    | _ -> exit 1
-end
-
-let () =
-  Clflags.parse ();
-  if !Clflags.outcome then (
-    Repl.typeAndPrintOutcome (List.hd !Clflags.files)
-  ) else (
-    let () = match !Clflags.files with
-    | (_file::_) as files ->
-      List.iter (fun filename ->
-        Driver.processFile
-          ~isInterface:!Clflags.interface
-          ~width:!Clflags.width
-          ~recover:!Clflags.recover
-          ~target:!Clflags.print
-          ~origin:!Clflags.origin
-          ~report:!Clflags.report
-          filename
-      ) files;
-    | [] ->
-      Driver.processFile
-        ~isInterface:!Clflags.interface
-        ~width:!Clflags.width
-        ~recover:!Clflags.recover
-        ~target:!Clflags.print
-        ~origin:!Clflags.origin
-        ~report:!Clflags.report
-        ""
-    in
-    exit 0
-  )
diff --git a/jscomp/syntax/benchmarks/data/Napkinscript.res b/jscomp/syntax/benchmarks/data/Napkinscript.res
deleted file mode 100644
index f69bff3..0000000
--- a/jscomp/syntax/benchmarks/data/Napkinscript.res
+++ /dev/null
@@ -1,20680 +0,0 @@
-module MiniBuffer: {
-  type t
-  let add_char: (t, char) => unit
-  let add_string: (t, string) => unit
-  let contents: t => string
-  let create: int => t
-  let flush_newline: t => unit
-  let length: t => int
-  let unsafe_get: (t, int) => char
-} = {
-  type t = {
-    mutable buffer: bytes,
-    mutable position: int,
-    mutable length: int,
-  }
-
-  let create = n => {
-    let n = if n < 1 {
-      1
-    } else {
-      n
-    }
-    let s = (@doesNotRaise Bytes.create)(n)
-    {buffer: s, position: 0, length: n}
-  }
-
-  let contents = b => Bytes.sub_string(b.buffer, 0, b.position)
-
-  let unsafe_get = (b, ofs) => Bytes.unsafe_get(b.buffer, ofs)
-
-  let length = b => b.position
-
-  /* Can't be called directly, don't add to the interface */
-  let resize_internal = (b, more) => {
-    let len = b.length
-    let new_len = ref(len)
-    while b.position + more > new_len.contents {
-      new_len := 2 * new_len.contents
-    }
-    if new_len.contents > Sys.max_string_length {
-      if b.position + more <= Sys.max_string_length {
-        new_len := Sys.max_string_length
-      }
-    }
-    let new_buffer = (@doesNotRaise Bytes.create)(new_len.contents)
-    /* PR#6148: let's keep using [blit] rather than [unsafe_blit] in
-     this tricky function that is slow anyway. */
-    @doesNotRaise
-    Bytes.blit(b.buffer, 0, new_buffer, 0, b.position)
-    b.buffer = new_buffer
-    b.length = new_len.contents
-  }
-
-  let add_char = (b, c) => {
-    let pos = b.position
-    if pos >= b.length {
-      resize_internal(b, 1)
-    }
-    Bytes.unsafe_set(b.buffer, pos, c)
-    b.position = pos + 1
-  }
-
-  let add_string = (b, s) => {
-    let len = String.length(s)
-    let new_position = b.position + len
-    if new_position > b.length {
-      resize_internal(b, len)
-    }
-    @doesNotRaise
-    Bytes.blit_string(s, 0, b.buffer, b.position, len)
-    b.position = new_position
-  }
-
-  /* adds newline and trims all preceding whitespace */
-  let flush_newline = b => {
-    let position = ref(b.position)
-    while Bytes.unsafe_get(b.buffer, position.contents - 1) == ' ' && position.contents >= 0 {
-      position := position.contents - 1
-    }
-    b.position = position.contents
-    add_char(b, '\n')
-  }
-}
-
-module Doc = {
-  type mode = Break | Flat
-
-  type lineStyle =
-    | Classic /* fits? -> replace with space */
-    | Soft /* fits? -> replaced with nothing */
-    | Hard /* always included, forces breaks in parents */
-
-  type rec t =
-    | Nil
-    | Text(string)
-    | Concat(list<t>)
-    | Indent(t)
-    | IfBreaks({yes: t, no: t})
-    | LineSuffix(t)
-    | LineBreak(lineStyle)
-    | Group({shouldBreak: bool, doc: t})
-    | CustomLayout(list<t>)
-    | BreakParent
-  /* | Cursor */
-
-  let nil = Nil
-  let line = LineBreak(Classic)
-  let hardLine = LineBreak(Hard)
-  let softLine = LineBreak(Soft)
-  let text = s => Text(s)
-  let concat = l => Concat(l)
-  let indent = d => Indent(d)
-  let ifBreaks = (t, f) => IfBreaks({yes: t, no: f})
-  let lineSuffix = d => LineSuffix(d)
-  let group = d => Group({shouldBreak: false, doc: d})
-  let breakableGroup = (~forceBreak, d) => Group({shouldBreak: forceBreak, doc: d})
-  let customLayout = gs => CustomLayout(gs)
-  let breakParent = BreakParent
-  /* let cursor = Cursor */
-
-  let space = Text(" ")
-  let comma = Text(",")
-  let dot = Text(".")
-  let dotdot = Text("..")
-  let dotdotdot = Text("...")
-  let lessThan = Text("<")
-  let greaterThan = Text(">")
-  let lbrace = Text("{")
-  let rbrace = Text("}")
-  let lparen = Text("(")
-  let rparen = Text(")")
-  let lbracket = Text("[")
-  let rbracket = Text("]")
-  let question = Text("?")
-  let tilde = Text("~")
-  let equal = Text("=")
-  let trailingComma = IfBreaks({yes: comma, no: nil})
-  let doubleQuote = Text("\"")
-
-  let propagateForcedBreaks = doc => {
-    let rec walk = doc =>
-      switch doc {
-      | Text(_) | Nil | LineSuffix(_) => (false, doc)
-      | BreakParent => (true, Nil)
-      | LineBreak(Hard) => (true, doc)
-      | LineBreak(Classic | Soft) => (false, doc)
-      | Indent(children) =>
-        let (childForcesBreak, newChildren) = walk(children)
-        (childForcesBreak, Indent(newChildren))
-      | IfBreaks({yes: trueDoc, no: falseDoc}) =>
-        let (falseForceBreak, falseDoc) = walk(falseDoc)
-        if falseForceBreak {
-          let (_, trueDoc) = walk(trueDoc)
-          (true, trueDoc)
-        } else {
-          let (forceBreak, trueDoc) = walk(trueDoc)
-          (forceBreak, IfBreaks({yes: trueDoc, no: falseDoc}))
-        }
-      | Group({shouldBreak: forceBreak, doc: children}) =>
-        let (childForcesBreak, newChildren) = walk(children)
-        let shouldBreak = forceBreak || childForcesBreak
-        (shouldBreak, Group({shouldBreak: shouldBreak, doc: newChildren}))
-      | Concat(children) =>
-        let (forceBreak, newChildren) = List.fold_left(((forceBreak, newChildren), child) => {
-          let (childForcesBreak, newChild) = walk(child)
-          (forceBreak || childForcesBreak, list{newChild, ...newChildren})
-        }, (false, list{}), children)
-
-        (forceBreak, Concat(List.rev(newChildren)))
-      | CustomLayout(children) =>
-        /* When using CustomLayout, we don't want to propagate forced breaks
-         * from the children up. By definition it picks the first layout that fits
-         * otherwise it takes the last of the list.
-         * However we do want to propagate forced breaks in the sublayouts. They
-         * might need to be broken. We just don't propagate them any higher here */
-        let children = switch walk(Concat(children)) {
-        | (_, Concat(children)) => children
-        | _ => assert false
-        }
-
-        (false, CustomLayout(children))
-      }
-
-    let (_, processedDoc) = walk(doc)
-    processedDoc
-  }
-
-  let join = (~sep, docs) => {
-    let rec loop = (acc, sep, docs) =>
-      switch docs {
-      | list{} => List.rev(acc)
-      | list{x} => List.rev(list{x, ...acc})
-      | list{x, ...xs} => loop(list{sep, x, ...acc}, sep, xs)
-      }
-
-    Concat(loop(list{}, sep, docs))
-  }
-
-  let rec fits = (w, doc) =>
-    switch doc {
-    | _ when w < 0 => false
-    | list{} => true
-    | list{(_ind, _mode, Text(txt)), ...rest} => fits(w - String.length(txt), rest)
-    | list{(ind, mode, Indent(doc)), ...rest} => fits(w, list{(ind + 2, mode, doc), ...rest})
-    | list{(_ind, Flat, LineBreak(break)), ...rest} =>
-      if break == Hard {
-        true
-      } else {
-        let w = if break == Classic {
-          w - 1
-        } else {
-          w
-        }
-        fits(w, rest)
-      }
-    | list{(_ind, _mode, Nil), ...rest} => fits(w, rest)
-    | list{(_ind, Break, LineBreak(_break)), ..._rest} => true
-    | list{(ind, mode, Group({shouldBreak: forceBreak, doc})), ...rest} =>
-      let mode = if forceBreak {
-        Break
-      } else {
-        mode
-      }
-      fits(w, list{(ind, mode, doc), ...rest})
-    | list{(ind, mode, IfBreaks({yes: breakDoc, no: flatDoc})), ...rest} =>
-      if mode == Break {
-        fits(w, list{(ind, mode, breakDoc), ...rest})
-      } else {
-        fits(w, list{(ind, mode, flatDoc), ...rest})
-      }
-    | list{(ind, mode, Concat(docs)), ...rest} =>
-      let ops = List.map(doc => (ind, mode, doc), docs)
-      fits(w, List.append(ops, rest))
-    /* | (_ind, _mode, Cursor)::rest -> fits w rest */
-    | list{(_ind, _mode, LineSuffix(_)), ...rest} => fits(w, rest)
-    | list{(_ind, _mode, BreakParent), ...rest} => fits(w, rest)
-    | list{(ind, mode, CustomLayout(list{hd, ..._})), ...rest} =>
-      /* TODO: if we have nested custom layouts, what we should do here? */
-      fits(w, list{(ind, mode, hd), ...rest})
-    | list{(_ind, _mode, CustomLayout(_)), ...rest} => fits(w, rest)
-    }
-
-  let toString = (~width, doc) => {
-    let doc = propagateForcedBreaks(doc)
-    let buffer = MiniBuffer.create(1000)
-
-    let rec process = (~pos, lineSuffices, stack) =>
-      switch stack {
-      | list{(ind, mode, doc) as cmd, ...rest} =>
-        switch doc {
-        | Nil | BreakParent => process(~pos, lineSuffices, rest)
-        | Text(txt) =>
-          MiniBuffer.add_string(buffer, txt)
-          process(~pos=String.length(txt) + pos, lineSuffices, rest)
-        | LineSuffix(doc) => process(~pos, list{(ind, mode, doc), ...lineSuffices}, rest)
-        | Concat(docs) =>
-          let ops = List.map(doc => (ind, mode, doc), docs)
-          process(~pos, lineSuffices, List.append(ops, rest))
-        | Indent(doc) => process(~pos, lineSuffices, list{(ind + 2, mode, doc), ...rest})
-        | IfBreaks({yes: breakDoc, no: flatDoc}) =>
-          if mode == Break {
-            process(~pos, lineSuffices, list{(ind, mode, breakDoc), ...rest})
-          } else {
-            process(~pos, lineSuffices, list{(ind, mode, flatDoc), ...rest})
-          }
-        | LineBreak(lineStyle) =>
-          if mode == Break {
-            switch lineSuffices {
-            | list{} =>
-              MiniBuffer.flush_newline(buffer)
-              MiniBuffer.add_string(buffer, @doesNotRaise String.make(ind, ' '))
-              process(~pos=ind, list{}, rest)
-            | _docs =>
-              process(
-                ~pos=ind,
-                list{},
-                List.concat(list{List.rev(lineSuffices), list{cmd, ...rest}}),
-              )
-            }
-          } else {
-            /* mode = Flat */
-            let pos = switch lineStyle {
-            | Classic =>
-              MiniBuffer.add_string(buffer, " ")
-              pos + 1
-            | Hard =>
-              MiniBuffer.flush_newline(buffer)
-              0
-            | Soft => pos
-            }
-
-            process(~pos, lineSuffices, rest)
-          }
-        | Group({shouldBreak, doc}) =>
-          if shouldBreak || !fits(width - pos, list{(ind, Flat, doc), ...rest}) {
-            process(~pos, lineSuffices, list{(ind, Break, doc), ...rest})
-          } else {
-            process(~pos, lineSuffices, list{(ind, Flat, doc), ...rest})
-          }
-        | CustomLayout(docs) =>
-          let rec findGroupThatFits = groups =>
-            switch groups {
-            | list{} => Nil
-            | list{lastGroup} => lastGroup
-            | list{doc, ...docs} =>
-              if fits(width - pos, list{(ind, Flat, doc), ...rest}) {
-                doc
-              } else {
-                findGroupThatFits(docs)
-              }
-            }
-
-          let doc = findGroupThatFits(docs)
-          process(~pos, lineSuffices, list{(ind, Flat, doc), ...rest})
-        }
-      | list{} =>
-        switch lineSuffices {
-        | list{} => ()
-        | suffices => process(~pos=0, list{}, List.rev(suffices))
-        }
-      }
-
-    process(~pos=0, list{}, list{(0, Flat, doc)})
-
-    let len = MiniBuffer.length(buffer)
-    if len > 0 && MiniBuffer.unsafe_get(buffer, len - 1) !== '\n' {
-      MiniBuffer.add_char(buffer, '\n')
-    }
-    MiniBuffer.contents(buffer)
-  }
-
-  @live
-  let debug = t => {
-    let rec toDoc = x =>
-      switch x {
-      | Nil => text("nil")
-      | BreakParent => text("breakparent")
-      | Text(txt) => text("text(" ++ (txt ++ ")"))
-      | LineSuffix(doc) =>
-        group(
-          concat(list{
-            text("linesuffix("),
-            indent(concat(list{line, toDoc(doc)})),
-            line,
-            text(")"),
-          }),
-        )
-      | Concat(docs) =>
-        group(
-          concat(list{
-            text("concat("),
-            indent(
-              concat(list{line, join(~sep=concat(list{text(","), line}), List.map(toDoc, docs))}),
-            ),
-            line,
-            text(")"),
-          }),
-        )
-      | CustomLayout(docs) =>
-        group(
-          concat(list{
-            text("customLayout("),
-            indent(
-              concat(list{line, join(~sep=concat(list{text(","), line}), List.map(toDoc, docs))}),
-            ),
-            line,
-            text(")"),
-          }),
-        )
-      | Indent(doc) => concat(list{text("indent("), softLine, toDoc(doc), softLine, text(")")})
-      | IfBreaks({yes: trueDoc, no: falseDoc}) =>
-        group(
-          concat(list{
-            text("ifBreaks("),
-            indent(
-              concat(list{line, toDoc(trueDoc), concat(list{text(","), line}), toDoc(falseDoc)}),
-            ),
-            line,
-            text(")"),
-          }),
-        )
-      | LineBreak(break) =>
-        let breakTxt = switch break {
-        | Classic => "Classic"
-        | Soft => "Soft"
-        | Hard => "Hard"
-        }
-
-        text("LineBreak(" ++ (breakTxt ++ ")"))
-      | Group({shouldBreak, doc}) =>
-        group(
-          concat(list{
-            text("Group("),
-            indent(
-              concat(list{
-                line,
-                text("shouldBreak: " ++ string_of_bool(shouldBreak)),
-                concat(list{text(","), line}),
-                toDoc(doc),
-              }),
-            ),
-            line,
-            text(")"),
-          }),
-        )
-      }
-
-    let doc = toDoc(t)
-    toString(~width=10, doc) |> print_endline
-  }
-}
-
-module Sexp: {
-  type t
-
-  let atom: string => t
-  let list: list<t> => t
-  let toString: t => string
-} = {
-  type rec t =
-    | Atom(string)
-    | List(list<t>)
-
-  let atom = s => Atom(s)
-  let list = l => List(l)
-
-  let rec toDoc = t =>
-    switch t {
-    | Atom(s) => Doc.text(s)
-    | List(list{}) => Doc.text("()")
-    | List(list{sexpr}) => Doc.concat(list{Doc.lparen, toDoc(sexpr), Doc.rparen})
-    | List(list{hd, ...tail}) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lparen,
-          toDoc(hd),
-          Doc.indent(Doc.concat(list{Doc.line, Doc.join(~sep=Doc.line, List.map(toDoc, tail))})),
-          Doc.rparen,
-        }),
-      )
-    }
-
-  let toString = sexpr => {
-    let doc = toDoc(sexpr)
-    Doc.toString(~width=80, doc)
-  }
-}
-
-module SexpAst: {
-  let implementation: Parsetree.structure => Sexp.t
-  let interface: Parsetree.signature => Sexp.t
-} = {
-  open Parsetree
-
-  let mapEmpty = (~f, items) =>
-    switch items {
-    | list{} => list{Sexp.list(list{})}
-    | items => List.map(f, items)
-    }
-
-  let string = txt => Sexp.atom("\"" ++ (txt ++ "\""))
-
-  let char = c => Sexp.atom("'" ++ (Char.escaped(c) ++ "'"))
-
-  let optChar = oc =>
-    switch oc {
-    | None => Sexp.atom("None")
-    | Some(c) => Sexp.list(list{Sexp.atom("Some"), char(c)})
-    }
-
-  let longident = l => {
-    let rec loop = l =>
-      switch l {
-      | Longident.Lident(ident) => Sexp.list(list{Sexp.atom("Lident"), string(ident)})
-      | Longident.Ldot(lident, txt) => Sexp.list(list{Sexp.atom("Ldot"), loop(lident), string(txt)})
-      | Longident.Lapply(l1, l2) => Sexp.list(list{Sexp.atom("Lapply"), loop(l1), loop(l2)})
-      }
-
-    Sexp.list(list{Sexp.atom("longident"), loop(l)})
-  }
-
-  let closedFlag = flag =>
-    switch flag {
-    | Asttypes.Closed => Sexp.atom("Closed")
-    | Open => Sexp.atom("Open")
-    }
-
-  let directionFlag = flag =>
-    switch flag {
-    | Asttypes.Upto => Sexp.atom("Upto")
-    | Downto => Sexp.atom("Downto")
-    }
-
-  let recFlag = flag =>
-    switch flag {
-    | Asttypes.Recursive => Sexp.atom("Recursive")
-    | Nonrecursive => Sexp.atom("Nonrecursive")
-    }
-
-  let overrideFlag = flag =>
-    switch flag {
-    | Asttypes.Override => Sexp.atom("Override")
-    | Fresh => Sexp.atom("Fresh")
-    }
-
-  let privateFlag = flag =>
-    switch flag {
-    | Asttypes.Public => Sexp.atom("Public")
-    | Private => Sexp.atom("Private")
-    }
-
-  let mutableFlag = flag =>
-    switch flag {
-    | Asttypes.Immutable => Sexp.atom("Immutable")
-    | Mutable => Sexp.atom("Mutable")
-    }
-
-  let variance = v =>
-    switch v {
-    | Asttypes.Covariant => Sexp.atom("Covariant")
-    | Contravariant => Sexp.atom("Contravariant")
-    | Invariant => Sexp.atom("Invariant")
-    }
-
-  let argLabel = lbl =>
-    switch lbl {
-    | Asttypes.Nolabel => Sexp.atom("Nolabel")
-    | Labelled(txt) => Sexp.list(list{Sexp.atom("Labelled"), string(txt)})
-    | Optional(txt) => Sexp.list(list{Sexp.atom("Optional"), string(txt)})
-    }
-
-  let constant = c => {
-    let sexpr = switch c {
-    | Pconst_integer(txt, tag) =>
-      Sexp.list(list{Sexp.atom("Pconst_integer"), string(txt), optChar(tag)})
-    | Pconst_char(c) => Sexp.list(list{Sexp.atom("Pconst_char"), Sexp.atom(Char.escaped(c))})
-    | Pconst_string(txt, tag) =>
-      Sexp.list(list{
-        Sexp.atom("Pconst_string"),
-        string(txt),
-        switch tag {
-        | Some(txt) => Sexp.list(list{Sexp.atom("Some"), string(txt)})
-        | None => Sexp.atom("None")
-        },
-      })
-    | Pconst_float(txt, tag) =>
-      Sexp.list(list{Sexp.atom("Pconst_float"), string(txt), optChar(tag)})
-    }
-
-    Sexp.list(list{Sexp.atom("constant"), sexpr})
-  }
-
-  let rec structure = s => Sexp.list(list{Sexp.atom("structure"), ...List.map(structureItem, s)})
-
-  and structureItem = si => {
-    let desc = switch si.pstr_desc {
-    | Pstr_eval(expr, attrs) =>
-      Sexp.list(list{Sexp.atom("Pstr_eval"), expression(expr), attributes(attrs)})
-    | Pstr_value(flag, vbs) =>
-      Sexp.list(list{
-        Sexp.atom("Pstr_value"),
-        recFlag(flag),
-        Sexp.list(mapEmpty(~f=valueBinding, vbs)),
-      })
-    | Pstr_primitive(vd) => Sexp.list(list{Sexp.atom("Pstr_primitive"), valueDescription(vd)})
-    | Pstr_type(flag, tds) =>
-      Sexp.list(list{
-        Sexp.atom("Pstr_type"),
-        recFlag(flag),
-        Sexp.list(mapEmpty(~f=typeDeclaration, tds)),
-      })
-    | Pstr_typext(typext) => Sexp.list(list{Sexp.atom("Pstr_type"), typeExtension(typext)})
-    | Pstr_exception(ec) => Sexp.list(list{Sexp.atom("Pstr_exception"), extensionConstructor(ec)})
-    | Pstr_module(mb) => Sexp.list(list{Sexp.atom("Pstr_module"), moduleBinding(mb)})
-    | Pstr_recmodule(mbs) =>
-      Sexp.list(list{Sexp.atom("Pstr_recmodule"), Sexp.list(mapEmpty(~f=moduleBinding, mbs))})
-    | Pstr_modtype(modTypDecl) =>
-      Sexp.list(list{Sexp.atom("Pstr_modtype"), moduleTypeDeclaration(modTypDecl)})
-    | Pstr_open(openDesc) => Sexp.list(list{Sexp.atom("Pstr_open"), openDescription(openDesc)})
-    | Pstr_class(_) => Sexp.atom("Pstr_class")
-    | Pstr_class_type(_) => Sexp.atom("Pstr_class_type")
-    | Pstr_include(id) => Sexp.list(list{Sexp.atom("Pstr_include"), includeDeclaration(id)})
-    | Pstr_attribute(attr) => Sexp.list(list{Sexp.atom("Pstr_attribute"), attribute(attr)})
-    | Pstr_extension(ext, attrs) =>
-      Sexp.list(list{Sexp.atom("Pstr_extension"), extension(ext), attributes(attrs)})
-    }
-
-    Sexp.list(list{Sexp.atom("structure_item"), desc})
-  }
-
-  and includeDeclaration = id =>
-    Sexp.list(list{
-      Sexp.atom("include_declaration"),
-      moduleExpression(id.pincl_mod),
-      attributes(id.pincl_attributes),
-    })
-
-  and openDescription = od =>
-    Sexp.list(list{
-      Sexp.atom("open_description"),
-      longident(od.popen_lid.Asttypes.txt),
-      attributes(od.popen_attributes),
-    })
-
-  and moduleTypeDeclaration = mtd =>
-    Sexp.list(list{
-      Sexp.atom("module_type_declaration"),
-      string(mtd.pmtd_name.Asttypes.txt),
-      switch mtd.pmtd_type {
-      | None => Sexp.atom("None")
-      | Some(modType) => Sexp.list(list{Sexp.atom("Some"), moduleType(modType)})
-      },
-      attributes(mtd.pmtd_attributes),
-    })
-
-  and moduleBinding = mb =>
-    Sexp.list(list{
-      Sexp.atom("module_binding"),
-      string(mb.pmb_name.Asttypes.txt),
-      moduleExpression(mb.pmb_expr),
-      attributes(mb.pmb_attributes),
-    })
-
-  and moduleExpression = me => {
-    let desc = switch me.pmod_desc {
-    | Pmod_ident(modName) =>
-      Sexp.list(list{Sexp.atom("Pmod_ident"), longident(modName.Asttypes.txt)})
-    | Pmod_structure(s) => Sexp.list(list{Sexp.atom("Pmod_structure"), structure(s)})
-    | Pmod_functor(lbl, optModType, modExpr) =>
-      Sexp.list(list{
-        Sexp.atom("Pmod_functor"),
-        string(lbl.Asttypes.txt),
-        switch optModType {
-        | None => Sexp.atom("None")
-        | Some(modType) => Sexp.list(list{Sexp.atom("Some"), moduleType(modType)})
-        },
-        moduleExpression(modExpr),
-      })
-    | Pmod_apply(callModExpr, modExprArg) =>
-      Sexp.list(list{
-        Sexp.atom("Pmod_apply"),
-        moduleExpression(callModExpr),
-        moduleExpression(modExprArg),
-      })
-    | Pmod_constraint(modExpr, modType) =>
-      Sexp.list(list{Sexp.atom("Pmod_constraint"), moduleExpression(modExpr), moduleType(modType)})
-    | Pmod_unpack(expr) => Sexp.list(list{Sexp.atom("Pmod_unpack"), expression(expr)})
-    | Pmod_extension(ext) => Sexp.list(list{Sexp.atom("Pmod_extension"), extension(ext)})
-    }
-
-    Sexp.list(list{Sexp.atom("module_expr"), desc, attributes(me.pmod_attributes)})
-  }
-
-  and moduleType = mt => {
-    let desc = switch mt.pmty_desc {
-    | Pmty_ident(longidentLoc) =>
-      Sexp.list(list{Sexp.atom("Pmty_ident"), longident(longidentLoc.Asttypes.txt)})
-    | Pmty_signature(s) => Sexp.list(list{Sexp.atom("Pmty_signature"), signature(s)})
-    | Pmty_functor(lbl, optModType, modType) =>
-      Sexp.list(list{
-        Sexp.atom("Pmty_functor"),
-        string(lbl.Asttypes.txt),
-        switch optModType {
-        | None => Sexp.atom("None")
-        | Some(modType) => Sexp.list(list{Sexp.atom("Some"), moduleType(modType)})
-        },
-        moduleType(modType),
-      })
-    | Pmty_alias(longidentLoc) =>
-      Sexp.list(list{Sexp.atom("Pmty_alias"), longident(longidentLoc.Asttypes.txt)})
-    | Pmty_extension(ext) => Sexp.list(list{Sexp.atom("Pmty_extension"), extension(ext)})
-    | Pmty_typeof(modExpr) => Sexp.list(list{Sexp.atom("Pmty_typeof"), moduleExpression(modExpr)})
-    | Pmty_with(modType, withConstraints) =>
-      Sexp.list(list{
-        Sexp.atom("Pmty_with"),
-        moduleType(modType),
-        Sexp.list(mapEmpty(~f=withConstraint, withConstraints)),
-      })
-    }
-
-    Sexp.list(list{Sexp.atom("module_type"), desc, attributes(mt.pmty_attributes)})
-  }
-
-  and withConstraint = wc =>
-    switch wc {
-    | Pwith_type(longidentLoc, td) =>
-      Sexp.list(list{
-        Sexp.atom("Pmty_with"),
-        longident(longidentLoc.Asttypes.txt),
-        typeDeclaration(td),
-      })
-    | Pwith_module(l1, l2) =>
-      Sexp.list(list{
-        Sexp.atom("Pwith_module"),
-        longident(l1.Asttypes.txt),
-        longident(l2.Asttypes.txt),
-      })
-    | Pwith_typesubst(longidentLoc, td) =>
-      Sexp.list(list{
-        Sexp.atom("Pwith_typesubst"),
-        longident(longidentLoc.Asttypes.txt),
-        typeDeclaration(td),
-      })
-    | Pwith_modsubst(l1, l2) =>
-      Sexp.list(list{
-        Sexp.atom("Pwith_modsubst"),
-        longident(l1.Asttypes.txt),
-        longident(l2.Asttypes.txt),
-      })
-    }
-
-  and signature = s => Sexp.list(list{Sexp.atom("signature"), ...List.map(signatureItem, s)})
-
-  and signatureItem = si => {
-    let descr = switch si.psig_desc {
-    | Psig_value(vd) => Sexp.list(list{Sexp.atom("Psig_value"), valueDescription(vd)})
-    | Psig_type(flag, typeDeclarations) =>
-      Sexp.list(list{
-        Sexp.atom("Psig_type"),
-        recFlag(flag),
-        Sexp.list(mapEmpty(~f=typeDeclaration, typeDeclarations)),
-      })
-    | Psig_typext(typExt) => Sexp.list(list{Sexp.atom("Psig_typext"), typeExtension(typExt)})
-    | Psig_exception(extConstr) =>
-      Sexp.list(list{Sexp.atom("Psig_exception"), extensionConstructor(extConstr)})
-    | Psig_module(modDecl) => Sexp.list(list{Sexp.atom("Psig_module"), moduleDeclaration(modDecl)})
-    | Psig_recmodule(modDecls) =>
-      Sexp.list(list{
-        Sexp.atom("Psig_recmodule"),
-        Sexp.list(mapEmpty(~f=moduleDeclaration, modDecls)),
-      })
-    | Psig_modtype(modTypDecl) =>
-      Sexp.list(list{Sexp.atom("Psig_modtype"), moduleTypeDeclaration(modTypDecl)})
-    | Psig_open(openDesc) => Sexp.list(list{Sexp.atom("Psig_open"), openDescription(openDesc)})
-    | Psig_include(inclDecl) =>
-      Sexp.list(list{Sexp.atom("Psig_include"), includeDescription(inclDecl)})
-    | Psig_class(_) => Sexp.list(list{Sexp.atom("Psig_class")})
-    | Psig_class_type(_) => Sexp.list(list{Sexp.atom("Psig_class_type")})
-    | Psig_attribute(attr) => Sexp.list(list{Sexp.atom("Psig_attribute"), attribute(attr)})
-    | Psig_extension(ext, attrs) =>
-      Sexp.list(list{Sexp.atom("Psig_extension"), extension(ext), attributes(attrs)})
-    }
-
-    Sexp.list(list{Sexp.atom("signature_item"), descr})
-  }
-
-  and includeDescription = id =>
-    Sexp.list(list{
-      Sexp.atom("include_description"),
-      moduleType(id.pincl_mod),
-      attributes(id.pincl_attributes),
-    })
-
-  and moduleDeclaration = md =>
-    Sexp.list(list{
-      Sexp.atom("module_declaration"),
-      string(md.pmd_name.Asttypes.txt),
-      moduleType(md.pmd_type),
-      attributes(md.pmd_attributes),
-    })
-
-  and valueBinding = vb =>
-    Sexp.list(list{
-      Sexp.atom("value_binding"),
-      pattern(vb.pvb_pat),
-      expression(vb.pvb_expr),
-      attributes(vb.pvb_attributes),
-    })
-
-  and valueDescription = vd =>
-    Sexp.list(list{
-      Sexp.atom("value_description"),
-      string(vd.pval_name.Asttypes.txt),
-      coreType(vd.pval_type),
-      Sexp.list(mapEmpty(~f=string, vd.pval_prim)),
-      attributes(vd.pval_attributes),
-    })
-
-  and typeDeclaration = td =>
-    Sexp.list(list{
-      Sexp.atom("type_declaration"),
-      string(td.ptype_name.Asttypes.txt),
-      Sexp.list(list{
-        Sexp.atom("ptype_params"),
-        Sexp.list(
-          mapEmpty(
-            ~f=((typexpr, var)) => Sexp.list(list{coreType(typexpr), variance(var)}),
-            td.ptype_params,
-          ),
-        ),
-      }),
-      Sexp.list(list{
-        Sexp.atom("ptype_cstrs"),
-        Sexp.list(
-          mapEmpty(
-            ~f=((typ1, typ2, _loc)) => Sexp.list(list{coreType(typ1), coreType(typ2)}),
-            td.ptype_cstrs,
-          ),
-        ),
-      }),
-      Sexp.list(list{Sexp.atom("ptype_kind"), typeKind(td.ptype_kind)}),
-      Sexp.list(list{
-        Sexp.atom("ptype_manifest"),
-        switch td.ptype_manifest {
-        | None => Sexp.atom("None")
-        | Some(typ) => Sexp.list(list{Sexp.atom("Some"), coreType(typ)})
-        },
-      }),
-      Sexp.list(list{Sexp.atom("ptype_private"), privateFlag(td.ptype_private)}),
-      attributes(td.ptype_attributes),
-    })
-
-  and extensionConstructor = ec =>
-    Sexp.list(list{
-      Sexp.atom("extension_constructor"),
-      string(ec.pext_name.Asttypes.txt),
-      extensionConstructorKind(ec.pext_kind),
-      attributes(ec.pext_attributes),
-    })
-
-  and extensionConstructorKind = kind =>
-    switch kind {
-    | Pext_decl(args, optTypExpr) =>
-      Sexp.list(list{
-        Sexp.atom("Pext_decl"),
-        constructorArguments(args),
-        switch optTypExpr {
-        | None => Sexp.atom("None")
-        | Some(typ) => Sexp.list(list{Sexp.atom("Some"), coreType(typ)})
-        },
-      })
-    | Pext_rebind(longidentLoc) =>
-      Sexp.list(list{Sexp.atom("Pext_rebind"), longident(longidentLoc.Asttypes.txt)})
-    }
-
-  and typeExtension = te =>
-    Sexp.list(list{
-      Sexp.atom("type_extension"),
-      Sexp.list(list{Sexp.atom("ptyext_path"), longident(te.ptyext_path.Asttypes.txt)}),
-      Sexp.list(list{
-        Sexp.atom("ptyext_parms"),
-        Sexp.list(
-          mapEmpty(
-            ~f=((typexpr, var)) => Sexp.list(list{coreType(typexpr), variance(var)}),
-            te.ptyext_params,
-          ),
-        ),
-      }),
-      Sexp.list(list{
-        Sexp.atom("ptyext_constructors"),
-        Sexp.list(mapEmpty(~f=extensionConstructor, te.ptyext_constructors)),
-      }),
-      Sexp.list(list{Sexp.atom("ptyext_private"), privateFlag(te.ptyext_private)}),
-      attributes(te.ptyext_attributes),
-    })
-
-  and typeKind = kind =>
-    switch kind {
-    | Ptype_abstract => Sexp.atom("Ptype_abstract")
-    | Ptype_variant(constrDecls) =>
-      Sexp.list(list{
-        Sexp.atom("Ptype_variant"),
-        Sexp.list(mapEmpty(~f=constructorDeclaration, constrDecls)),
-      })
-    | Ptype_record(lblDecls) =>
-      Sexp.list(list{Sexp.atom("Ptype_record"), Sexp.list(mapEmpty(~f=labelDeclaration, lblDecls))})
-    | Ptype_open => Sexp.atom("Ptype_open")
-    }
-
-  and constructorDeclaration = cd =>
-    Sexp.list(list{
-      Sexp.atom("constructor_declaration"),
-      string(cd.pcd_name.Asttypes.txt),
-      Sexp.list(list{Sexp.atom("pcd_args"), constructorArguments(cd.pcd_args)}),
-      Sexp.list(list{
-        Sexp.atom("pcd_res"),
-        switch cd.pcd_res {
-        | None => Sexp.atom("None")
-        | Some(typ) => Sexp.list(list{Sexp.atom("Some"), coreType(typ)})
-        },
-      }),
-      attributes(cd.pcd_attributes),
-    })
-
-  and constructorArguments = args =>
-    switch args {
-    | Pcstr_tuple(types) =>
-      Sexp.list(list{Sexp.atom("Pcstr_tuple"), Sexp.list(mapEmpty(~f=coreType, types))})
-    | Pcstr_record(lds) =>
-      Sexp.list(list{Sexp.atom("Pcstr_record"), Sexp.list(mapEmpty(~f=labelDeclaration, lds))})
-    }
-
-  and labelDeclaration = ld =>
-    Sexp.list(list{
-      Sexp.atom("label_declaration"),
-      string(ld.pld_name.Asttypes.txt),
-      mutableFlag(ld.pld_mutable),
-      coreType(ld.pld_type),
-      attributes(ld.pld_attributes),
-    })
-
-  and expression = expr => {
-    let desc = switch expr.pexp_desc {
-    | Pexp_ident(longidentLoc) =>
-      Sexp.list(list{Sexp.atom("Pexp_ident"), longident(longidentLoc.Asttypes.txt)})
-    | Pexp_constant(c) => Sexp.list(list{Sexp.atom("Pexp_constant"), constant(c)})
-    | Pexp_let(flag, vbs, expr) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_let"),
-        recFlag(flag),
-        Sexp.list(mapEmpty(~f=valueBinding, vbs)),
-        expression(expr),
-      })
-    | Pexp_function(cases) =>
-      Sexp.list(list{Sexp.atom("Pexp_function"), Sexp.list(mapEmpty(~f=case, cases))})
-    | Pexp_fun(argLbl, exprOpt, pat, expr) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_fun"),
-        argLabel(argLbl),
-        switch exprOpt {
-        | None => Sexp.atom("None")
-        | Some(expr) => Sexp.list(list{Sexp.atom("Some"), expression(expr)})
-        },
-        pattern(pat),
-        expression(expr),
-      })
-    | Pexp_apply(expr, args) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_apply"),
-        expression(expr),
-        Sexp.list(
-          mapEmpty(
-            ~f=((argLbl, expr)) => Sexp.list(list{argLabel(argLbl), expression(expr)}),
-            args,
-          ),
-        ),
-      })
-    | Pexp_match(expr, cases) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_match"),
-        expression(expr),
-        Sexp.list(mapEmpty(~f=case, cases)),
-      })
-    | Pexp_try(expr, cases) =>
-      Sexp.list(list{Sexp.atom("Pexp_try"), expression(expr), Sexp.list(mapEmpty(~f=case, cases))})
-    | Pexp_tuple(exprs) =>
-      Sexp.list(list{Sexp.atom("Pexp_tuple"), Sexp.list(mapEmpty(~f=expression, exprs))})
-    | Pexp_construct(longidentLoc, exprOpt) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_construct"),
-        longident(longidentLoc.Asttypes.txt),
-        switch exprOpt {
-        | None => Sexp.atom("None")
-        | Some(expr) => Sexp.list(list{Sexp.atom("Some"), expression(expr)})
-        },
-      })
-    | Pexp_variant(lbl, exprOpt) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_variant"),
-        string(lbl),
-        switch exprOpt {
-        | None => Sexp.atom("None")
-        | Some(expr) => Sexp.list(list{Sexp.atom("Some"), expression(expr)})
-        },
-      })
-    | Pexp_record(rows, optExpr) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_record"),
-        Sexp.list(
-          mapEmpty(
-            ~f=((longidentLoc, expr)) =>
-              Sexp.list(list{longident(longidentLoc.Asttypes.txt), expression(expr)}),
-            rows,
-          ),
-        ),
-        switch optExpr {
-        | None => Sexp.atom("None")
-        | Some(expr) => Sexp.list(list{Sexp.atom("Some"), expression(expr)})
-        },
-      })
-    | Pexp_field(expr, longidentLoc) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_field"),
-        expression(expr),
-        longident(longidentLoc.Asttypes.txt),
-      })
-    | Pexp_setfield(expr1, longidentLoc, expr2) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_setfield"),
-        expression(expr1),
-        longident(longidentLoc.Asttypes.txt),
-        expression(expr2),
-      })
-    | Pexp_array(exprs) =>
-      Sexp.list(list{Sexp.atom("Pexp_array"), Sexp.list(mapEmpty(~f=expression, exprs))})
-    | Pexp_ifthenelse(expr1, expr2, optExpr) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_ifthenelse"),
-        expression(expr1),
-        expression(expr2),
-        switch optExpr {
-        | None => Sexp.atom("None")
-        | Some(expr) => Sexp.list(list{Sexp.atom("Some"), expression(expr)})
-        },
-      })
-    | Pexp_sequence(expr1, expr2) =>
-      Sexp.list(list{Sexp.atom("Pexp_sequence"), expression(expr1), expression(expr2)})
-    | Pexp_while(expr1, expr2) =>
-      Sexp.list(list{Sexp.atom("Pexp_while"), expression(expr1), expression(expr2)})
-    | Pexp_for(pat, e1, e2, flag, e3) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_for"),
-        pattern(pat),
-        expression(e1),
-        expression(e2),
-        directionFlag(flag),
-        expression(e3),
-      })
-    | Pexp_constraint(expr, typexpr) =>
-      Sexp.list(list{Sexp.atom("Pexp_constraint"), expression(expr), coreType(typexpr)})
-    | Pexp_coerce(expr, optTyp, typexpr) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_coerce"),
-        expression(expr),
-        switch optTyp {
-        | None => Sexp.atom("None")
-        | Some(typ) => Sexp.list(list{Sexp.atom("Some"), coreType(typ)})
-        },
-        coreType(typexpr),
-      })
-    | Pexp_send(_) => Sexp.list(list{Sexp.atom("Pexp_send")})
-    | Pexp_new(_) => Sexp.list(list{Sexp.atom("Pexp_new")})
-    | Pexp_setinstvar(_) => Sexp.list(list{Sexp.atom("Pexp_setinstvar")})
-    | Pexp_override(_) => Sexp.list(list{Sexp.atom("Pexp_override")})
-    | Pexp_letmodule(modName, modExpr, expr) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_letmodule"),
-        string(modName.Asttypes.txt),
-        moduleExpression(modExpr),
-        expression(expr),
-      })
-    | Pexp_letexception(extConstr, expr) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_letexception"),
-        extensionConstructor(extConstr),
-        expression(expr),
-      })
-    | Pexp_assert(expr) => Sexp.list(list{Sexp.atom("Pexp_assert"), expression(expr)})
-    | Pexp_lazy(expr) => Sexp.list(list{Sexp.atom("Pexp_lazy"), expression(expr)})
-    | Pexp_poly(_) => Sexp.list(list{Sexp.atom("Pexp_poly")})
-    | Pexp_object(_) => Sexp.list(list{Sexp.atom("Pexp_object")})
-    | Pexp_newtype(lbl, expr) =>
-      Sexp.list(list{Sexp.atom("Pexp_newtype"), string(lbl.Asttypes.txt), expression(expr)})
-    | Pexp_pack(modExpr) => Sexp.list(list{Sexp.atom("Pexp_pack"), moduleExpression(modExpr)})
-    | Pexp_open(flag, longidentLoc, expr) =>
-      Sexp.list(list{
-        Sexp.atom("Pexp_open"),
-        overrideFlag(flag),
-        longident(longidentLoc.Asttypes.txt),
-        expression(expr),
-      })
-    | Pexp_extension(ext) => Sexp.list(list{Sexp.atom("Pexp_extension"), extension(ext)})
-    | Pexp_unreachable => Sexp.atom("Pexp_unreachable")
-    }
-
-    Sexp.list(list{Sexp.atom("expression"), desc})
-  }
-
-  and case = c =>
-    Sexp.list(list{
-      Sexp.atom("case"),
-      Sexp.list(list{Sexp.atom("pc_lhs"), pattern(c.pc_lhs)}),
-      Sexp.list(list{
-        Sexp.atom("pc_guard"),
-        switch c.pc_guard {
-        | None => Sexp.atom("None")
-        | Some(expr) => Sexp.list(list{Sexp.atom("Some"), expression(expr)})
-        },
-      }),
-      Sexp.list(list{Sexp.atom("pc_rhs"), expression(c.pc_rhs)}),
-    })
-
-  and pattern = p => {
-    let descr = switch p.ppat_desc {
-    | Ppat_any => Sexp.atom("Ppat_any")
-    | Ppat_var(var) => Sexp.list(list{Sexp.atom("Ppat_var"), string(var.Location.txt)})
-    | Ppat_alias(p, alias) =>
-      Sexp.list(list{Sexp.atom("Ppat_alias"), pattern(p), string(alias.txt)})
-    | Ppat_constant(c) => Sexp.list(list{Sexp.atom("Ppat_constant"), constant(c)})
-    | Ppat_interval(lo, hi) =>
-      Sexp.list(list{Sexp.atom("Ppat_interval"), constant(lo), constant(hi)})
-    | Ppat_tuple(patterns) =>
-      Sexp.list(list{Sexp.atom("Ppat_tuple"), Sexp.list(mapEmpty(~f=pattern, patterns))})
-    | Ppat_construct(longidentLoc, optPattern) =>
-      Sexp.list(list{
-        Sexp.atom("Ppat_construct"),
-        longident(longidentLoc.Location.txt),
-        switch optPattern {
-        | None => Sexp.atom("None")
-        | Some(p) => Sexp.list(list{Sexp.atom("some"), pattern(p)})
-        },
-      })
-    | Ppat_variant(lbl, optPattern) =>
-      Sexp.list(list{
-        Sexp.atom("Ppat_variant"),
-        string(lbl),
-        switch optPattern {
-        | None => Sexp.atom("None")
-        | Some(p) => Sexp.list(list{Sexp.atom("Some"), pattern(p)})
-        },
-      })
-    | Ppat_record(rows, flag) =>
-      Sexp.list(list{
-        Sexp.atom("Ppat_record"),
-        closedFlag(flag),
-        Sexp.list(
-          mapEmpty(
-            ~f=((longidentLoc, p)) =>
-              Sexp.list(list{longident(longidentLoc.Location.txt), pattern(p)}),
-            rows,
-          ),
-        ),
-      })
-    | Ppat_array(patterns) =>
-      Sexp.list(list{Sexp.atom("Ppat_array"), Sexp.list(mapEmpty(~f=pattern, patterns))})
-    | Ppat_or(p1, p2) => Sexp.list(list{Sexp.atom("Ppat_or"), pattern(p1), pattern(p2)})
-    | Ppat_constraint(p, typexpr) =>
-      Sexp.list(list{Sexp.atom("Ppat_constraint"), pattern(p), coreType(typexpr)})
-    | Ppat_type(longidentLoc) =>
-      Sexp.list(list{Sexp.atom("Ppat_type"), longident(longidentLoc.Location.txt)})
-    | Ppat_lazy(p) => Sexp.list(list{Sexp.atom("Ppat_lazy"), pattern(p)})
-    | Ppat_unpack(stringLoc) =>
-      Sexp.list(list{Sexp.atom("Ppat_unpack"), string(stringLoc.Location.txt)})
-    | Ppat_exception(p) => Sexp.list(list{Sexp.atom("Ppat_exception"), pattern(p)})
-    | Ppat_extension(ext) => Sexp.list(list{Sexp.atom("Ppat_extension"), extension(ext)})
-    | Ppat_open(longidentLoc, p) =>
-      Sexp.list(list{Sexp.atom("Ppat_open"), longident(longidentLoc.Location.txt), pattern(p)})
-    }
-
-    Sexp.list(list{Sexp.atom("pattern"), descr})
-  }
-
-  and objectField = field =>
-    switch field {
-    | Otag(lblLoc, attrs, typexpr) =>
-      Sexp.list(list{Sexp.atom("Otag"), string(lblLoc.txt), attributes(attrs), coreType(typexpr)})
-    | Oinherit(typexpr) => Sexp.list(list{Sexp.atom("Oinherit"), coreType(typexpr)})
-    }
-
-  and rowField = field =>
-    switch field {
-    | Rtag(labelLoc, attrs, truth, types) =>
-      Sexp.list(list{
-        Sexp.atom("Rtag"),
-        string(labelLoc.txt),
-        attributes(attrs),
-        Sexp.atom(
-          if truth {
-            "true"
-          } else {
-            "false"
-          },
-        ),
-        Sexp.list(mapEmpty(~f=coreType, types)),
-      })
-    | Rinherit(typexpr) => Sexp.list(list{Sexp.atom("Rinherit"), coreType(typexpr)})
-    }
-
-  and packageType = ((modNameLoc, packageConstraints)) =>
-    Sexp.list(list{
-      Sexp.atom("package_type"),
-      longident(modNameLoc.Asttypes.txt),
-      Sexp.list(
-        mapEmpty(
-          ~f=((modNameLoc, typexpr)) =>
-            Sexp.list(list{longident(modNameLoc.Asttypes.txt), coreType(typexpr)}),
-          packageConstraints,
-        ),
-      ),
-    })
-
-  and coreType = typexpr => {
-    let desc = switch typexpr.ptyp_desc {
-    | Ptyp_any => Sexp.atom("Ptyp_any")
-    | Ptyp_var(var) => Sexp.list(list{Sexp.atom("Ptyp_var"), string(var)})
-    | Ptyp_arrow(argLbl, typ1, typ2) =>
-      Sexp.list(list{Sexp.atom("Ptyp_arrow"), argLabel(argLbl), coreType(typ1), coreType(typ2)})
-    | Ptyp_tuple(types) =>
-      Sexp.list(list{Sexp.atom("Ptyp_tuple"), Sexp.list(mapEmpty(~f=coreType, types))})
-    | Ptyp_constr(longidentLoc, types) =>
-      Sexp.list(list{
-        Sexp.atom("Ptyp_constr"),
-        longident(longidentLoc.txt),
-        Sexp.list(mapEmpty(~f=coreType, types)),
-      })
-    | Ptyp_alias(typexpr, alias) =>
-      Sexp.list(list{Sexp.atom("Ptyp_alias"), coreType(typexpr), string(alias)})
-    | Ptyp_object(fields, flag) =>
-      Sexp.list(list{
-        Sexp.atom("Ptyp_object"),
-        closedFlag(flag),
-        Sexp.list(mapEmpty(~f=objectField, fields)),
-      })
-    | Ptyp_class(longidentLoc, types) =>
-      Sexp.list(list{
-        Sexp.atom("Ptyp_class"),
-        longident(longidentLoc.Location.txt),
-        Sexp.list(mapEmpty(~f=coreType, types)),
-      })
-    | Ptyp_variant(fields, flag, optLabels) =>
-      Sexp.list(list{
-        Sexp.atom("Ptyp_variant"),
-        Sexp.list(mapEmpty(~f=rowField, fields)),
-        closedFlag(flag),
-        switch optLabels {
-        | None => Sexp.atom("None")
-        | Some(lbls) => Sexp.list(mapEmpty(~f=string, lbls))
-        },
-      })
-    | Ptyp_poly(lbls, typexpr) =>
-      Sexp.list(list{
-        Sexp.atom("Ptyp_poly"),
-        Sexp.list(mapEmpty(~f=lbl => string(lbl.Asttypes.txt), lbls)),
-        coreType(typexpr),
-      })
-    | Ptyp_package(package) => Sexp.list(list{Sexp.atom("Ptyp_package"), packageType(package)})
-    | Ptyp_extension(ext) => Sexp.list(list{Sexp.atom("Ptyp_extension"), extension(ext)})
-    }
-
-    Sexp.list(list{Sexp.atom("core_type"), desc})
-  }
-
-  and payload = p =>
-    switch p {
-    | PStr(s) => Sexp.list(list{Sexp.atom("PStr"), ...mapEmpty(~f=structureItem, s)})
-    | PSig(s) => Sexp.list(list{Sexp.atom("PSig"), signature(s)})
-    | PTyp(ct) => Sexp.list(list{Sexp.atom("PTyp"), coreType(ct)})
-    | PPat(pat, optExpr) =>
-      Sexp.list(list{
-        Sexp.atom("PPat"),
-        pattern(pat),
-        switch optExpr {
-        | Some(expr) => Sexp.list(list{Sexp.atom("Some"), expression(expr)})
-        | None => Sexp.atom("None")
-        },
-      })
-    }
-
-  and attribute = ((stringLoc, p)) =>
-    Sexp.list(list{Sexp.atom("attribute"), Sexp.atom(stringLoc.Asttypes.txt), payload(p)})
-
-  and extension = ((stringLoc, p)) =>
-    Sexp.list(list{Sexp.atom("extension"), Sexp.atom(stringLoc.Asttypes.txt), payload(p)})
-
-  and attributes = attrs => {
-    let sexprs = mapEmpty(~f=attribute, attrs)
-    Sexp.list(list{Sexp.atom("attributes"), ...sexprs})
-  }
-
-  let implementation = structure
-  let interface = signature
-}
-
-module IO: {
-  let readFile: string => string
-  let readStdin: unit => string
-} = {
-  /* random chunk size: 2^15, TODO: why do we guess randomly? */
-  let chunkSize = 32768
-
-  let readFile = filename => {
-    let chan = open_in(filename)
-    let buffer = Buffer.create(chunkSize)
-    let chunk = (@doesNotRaise Bytes.create)(chunkSize)
-    let rec loop = () => {
-      let len = try input(chan, chunk, 0, chunkSize) catch {
-      | Invalid_argument(_) => 0
-      }
-      if len === 0 {
-        close_in_noerr(chan)
-        Buffer.contents(buffer)
-      } else {
-        Buffer.add_subbytes(buffer, chunk, 0, len)
-        loop()
-      }
-    }
-
-    loop()
-  }
-
-  let readStdin = () => {
-    let buffer = Buffer.create(chunkSize)
-    let chunk = (@doesNotRaise Bytes.create)(chunkSize)
-    let rec loop = () => {
-      let len = try input(stdin, chunk, 0, chunkSize) catch {
-      | Invalid_argument(_) => 0
-      }
-      if len === 0 {
-        close_in_noerr(stdin)
-        Buffer.contents(buffer)
-      } else {
-        Buffer.add_subbytes(buffer, chunk, 0, len)
-        loop()
-      }
-    }
-
-    loop()
-  }
-}
-
-module CharacterCodes = {
-  let eof = -1
-
-  let space = 0x0020
-  @live let newline = 0x0A /* \n */
-  let lineFeed = 0x0A /* \n */
-  let carriageReturn = 0x0D /* \r */
-  let lineSeparator = 0x2028
-  let paragraphSeparator = 0x2029
-
-  let tab = 0x09
-
-  let bang = 0x21
-  let dot = 0x2E
-  let colon = 0x3A
-  let comma = 0x2C
-  let backtick = 0x60
-  /* let question = 0x3F */
-  let semicolon = 0x3B
-  let underscore = 0x5F
-  let singleQuote = 0x27
-  let doubleQuote = 0x22
-  let equal = 0x3D
-  let bar = 0x7C
-  let tilde = 0x7E
-  let question = 0x3F
-  let ampersand = 0x26
-  let at = 0x40
-  let dollar = 0x24
-  let percent = 0x25
-
-  let lparen = 0x28
-  let rparen = 0x29
-  let lbracket = 0x5B
-  let rbracket = 0x5D
-  let lbrace = 0x7B
-  let rbrace = 0x7D
-
-  let forwardslash = 0x2F /* / */
-  let backslash = 0x5C /* \ */
-
-  let greaterThan = 0x3E
-  let hash = 0x23
-  let lessThan = 0x3C
-
-  let minus = 0x2D
-  let plus = 0x2B
-  let asterisk = 0x2A
-
-  let _0 = 0x30
-  @live let _1 = 0x31
-  @live let _2 = 0x32
-  @live let _3 = 0x33
-  @live let _4 = 0x34
-  @live let _5 = 0x35
-  @live let _6 = 0x36
-  @live let _7 = 0x37
-  @live let _8 = 0x38
-  let _9 = 0x39
-
-  module Lower = {
-    let a = 0x61
-    let b = 0x62
-    @live let c = 0x63
-    @live let d = 0x64
-    let e = 0x65
-    let f = 0x66
-    let g = 0x67
-    @live let h = 0x68
-    @live let i = 0x69
-    @live let j = 0x6A
-    @live let k = 0x6B
-    @live let l = 0x6C
-    @live let m = 0x6D
-    let n = 0x6E
-    let o = 0x6F
-    let p = 0x70
-    @live let q = 0x71
-    let r = 0x72
-    @live let s = 0x73
-    let t = 0x74
-    @live let u = 0x75
-    @live let v = 0x76
-    @live let w = 0x77
-    let x = 0x78
-    @live let y = 0x79
-    let z = 0x7A
-  }
-
-  module Upper = {
-    let a = 0x41
-    /* let b = 0x42 */
-    @live let c = 0x43
-    @live let d = 0x44
-    @live let e = 0x45
-    @live let f = 0x46
-    let g = 0x47
-    @live let h = 0x48
-    @live let i = 0x49
-    @live let j = 0x4A
-    @live let k = 0x4B
-    @live let l = 0x4C
-    @live let m = 0x4D
-    @live let b = 0x4E
-    @live let o = 0x4F
-    @live let p = 0x50
-    @live let q = 0x51
-    @live let r = 0x52
-    @live let s = 0x53
-    @live let t = 0x54
-    @live let u = 0x55
-    @live let v = 0x56
-    @live let w = 0x57
-    @live let x = 0x58
-    @live let y = 0x59
-    let z = 0x5a
-  }
-
-  /* returns lower-case ch, ch should be ascii */
-  let lower = ch =>
-    /* if ch >= Lower.a && ch <= Lower.z then ch else ch + 32 */
-    lor(32, ch)
-
-  let isLetter = ch => (Lower.a <= ch && ch <= Lower.z) || (Upper.a <= ch && ch <= Upper.z)
-
-  let isUpperCase = ch => Upper.a <= ch && ch <= Upper.z
-
-  let isDigit = ch => _0 <= ch && ch <= _9
-
-  let isHex = ch => (_0 <= ch && ch <= _9) || (Lower.a <= lower(ch) && lower(ch) <= Lower.f)
-
-  /*
-      // ES5 7.3:
-      // The ECMAScript line terminator characters are listed in Table 3.
-      //     Table 3: Line Terminator Characters
-      //     Code Unit Value     Name                    Formal Name
-      //     \u000A              Line Feed               <LF>
-      //     \u000D              Carriage Return         <CR>
-      //     \u2028              Line separator          <LS>
-      //     \u2029              Paragraph separator     <PS>
-      // Only the characters in Table 3 are treated as line terminators. Other new line or line
-      // breaking characters are treated as white space but not as line terminators.
- */
-  let isLineBreak = ch =>
-    ch === lineFeed ||
-      (ch === carriageReturn ||
-      (ch === lineSeparator || ch === paragraphSeparator))
-
-  let digitValue = ch =>
-    if _0 <= ch && ch <= _9 {
-      ch - 48
-    } else if Lower.a <= lower(ch) && lower(ch) <= Lower.f {
-      lower(ch) - Lower.a + 10
-    } else {
-      16
-    } /* larger than any legal value */
-}
-
-module Comment: {
-  type t
-
-  let toString: t => string
-
-  let loc: t => Location.t
-  let txt: t => string
-  let prevTokEndPos: t => Lexing.position
-
-  let setPrevTokEndPos: (t, Lexing.position) => unit
-
-  let isSingleLineComment: t => bool
-
-  let makeSingleLineComment: (~loc: Location.t, string) => t
-  let makeMultiLineComment: (~loc: Location.t, string) => t
-  let fromOcamlComment: (~loc: Location.t, ~txt: string, ~prevTokEndPos: Lexing.position) => t
-  let trimSpaces: string => string
-} = {
-  type style =
-    | SingleLine
-    | MultiLine
-
-  let styleToString = s =>
-    switch s {
-    | SingleLine => "SingleLine"
-    | MultiLine => "MultiLine"
-    }
-
-  type t = {
-    txt: string,
-    style: style,
-    loc: Location.t,
-    mutable prevTokEndPos: Lexing.position,
-  }
-
-  let loc = t => t.loc
-  let txt = t => t.txt
-  let prevTokEndPos = t => t.prevTokEndPos
-
-  let setPrevTokEndPos = (t, pos) => t.prevTokEndPos = pos
-
-  let isSingleLineComment = t =>
-    switch t.style {
-    | SingleLine => true
-    | MultiLine => false
-    }
-
-  let toString = t =>
-    Format.sprintf(
-      "(txt: %s\nstyle: %s\nlines: %d-%d)",
-      t.txt,
-      styleToString(t.style),
-      t.loc.loc_start.pos_lnum,
-      t.loc.loc_end.pos_lnum,
-    )
-
-  let makeSingleLineComment = (~loc, txt) => {
-    txt: txt,
-    loc: loc,
-    style: SingleLine,
-    prevTokEndPos: Lexing.dummy_pos,
-  }
-
-  let makeMultiLineComment = (~loc, txt) => {
-    txt: txt,
-    loc: loc,
-    style: MultiLine,
-    prevTokEndPos: Lexing.dummy_pos,
-  }
-
-  let fromOcamlComment = (~loc, ~txt, ~prevTokEndPos) => {
-    txt: txt,
-    loc: loc,
-    style: MultiLine,
-    prevTokEndPos: prevTokEndPos,
-  }
-
-  let trimSpaces = s => {
-    let len = String.length(s)
-    if len == 0 {
-      s
-    } else if String.unsafe_get(s, 0) == ' ' || String.unsafe_get(s, len - 1) == ' ' {
-      let b = Bytes.of_string(s)
-      let i = ref(0)
-      while i.contents < len && Bytes.unsafe_get(b, i.contents) == ' ' {
-        incr(i)
-      }
-      let j = ref(len - 1)
-      while j.contents >= i.contents && Bytes.unsafe_get(b, j.contents) == ' ' {
-        decr(j)
-      }
-      if j.contents >= i.contents {
-        (@doesNotRaise Bytes.sub)(b, i.contents, j.contents - i.contents + 1) |> Bytes.to_string
-      } else {
-        ""
-      }
-    } else {
-      s
-    }
-  }
-}
-
-module Token = {
-  type t =
-    | Open
-    | True
-    | False
-    | Character(char)
-    | Int({i: string, suffix: option<char>})
-    | Float({f: string, suffix: option<char>})
-    | String(string)
-    | Lident(string)
-    | Uident(string)
-    | As
-    | Dot
-    | DotDot
-    | DotDotDot
-    | Bang
-    | Semicolon
-    | Let
-    | And
-    | Rec
-    | Underscore
-    | SingleQuote
-    | Equal
-    | EqualEqual
-    | EqualEqualEqual
-    | Bar
-    | Lparen
-    | Rparen
-    | Lbracket
-    | Rbracket
-    | Lbrace
-    | Rbrace
-    | Colon
-    | Comma
-    | Eof
-    | Exception
-    | @live Backslash
-    | Forwardslash
-    | ForwardslashDot
-    | Asterisk
-    | AsteriskDot
-    | Exponentiation
-    | Minus
-    | MinusDot
-    | Plus
-    | PlusDot
-    | PlusPlus
-    | PlusEqual
-    | ColonGreaterThan
-    | GreaterThan
-    | LessThan
-    | LessThanSlash
-    | Hash
-    | HashEqual
-    | HashHash
-    | Assert
-    | Lazy
-    | Tilde
-    | Question
-    | If
-    | Else
-    | For
-    | In
-    | To
-    | Downto
-    | While
-    | Switch
-    | When
-    | EqualGreater
-    | MinusGreater
-    | External
-    | Typ
-    | Private
-    | Mutable
-    | Constraint
-    | Include
-    | Module
-    | Of
-    | With
-    | Land
-    | Lor
-    | Band /* Bitwise and: & */
-    | BangEqual
-    | BangEqualEqual
-    | LessEqual
-    | GreaterEqual
-    | ColonEqual
-    | At
-    | AtAt
-    | Percent
-    | PercentPercent
-    | Comment(Comment.t)
-    | List
-    | TemplateTail(string)
-    | TemplatePart(string)
-    | Backtick
-    | BarGreater
-    | Try
-    | Catch
-    | Import
-    | Export
-
-  let precedence = x =>
-    switch x {
-    | HashEqual | ColonEqual => 1
-    | Lor => 2
-    | Land => 3
-    | Equal
-    | EqualEqual
-    | EqualEqualEqual
-    | LessThan
-    | GreaterThan
-    | BangEqual
-    | BangEqualEqual
-    | LessEqual
-    | GreaterEqual
-    | BarGreater => 4
-    | Plus | PlusDot | Minus | MinusDot | PlusPlus => 5
-    | Asterisk | AsteriskDot | Forwardslash | ForwardslashDot => 6
-    | Exponentiation => 7
-    | MinusGreater => 8
-    | Dot => 9
-    | _ => 0
-    }
-
-  let toString = x =>
-    switch x {
-    | Open => "open"
-    | True => "true"
-    | False => "false"
-    | Character(c) => "'" ++ (Char.escaped(c) ++ "'")
-    | String(s) => s
-    | Lident(str) => str
-    | Uident(str) => str
-    | Dot => "."
-    | DotDot => ".."
-    | DotDotDot => "..."
-    | Int({i}) => "int " ++ i
-    | Float({f}) => "Float: " ++ f
-    | Bang => "!"
-    | Semicolon => ";"
-    | Let => "let"
-    | And => "and"
-    | Rec => "rec"
-    | Underscore => "_"
-    | SingleQuote => "'"
-    | Equal => "="
-    | EqualEqual => "=="
-    | EqualEqualEqual => "==="
-    | Eof => "eof"
-    | Bar => "|"
-    | As => "as"
-    | Lparen => "("
-    | Rparen => ")"
-    | Lbracket => "["
-    | Rbracket => "]"
-    | Lbrace => "{"
-    | Rbrace => "}"
-    | ColonGreaterThan => ":>"
-    | Colon => ":"
-    | Comma => ","
-    | Minus => "-"
-    | MinusDot => "-."
-    | Plus => "+"
-    | PlusDot => "+."
-    | PlusPlus => "++"
-    | PlusEqual => "+="
-    | Backslash => "\\"
-    | Forwardslash => "/"
-    | ForwardslashDot => "/."
-    | Exception => "exception"
-    | Hash => "#"
-    | HashHash => "##"
-    | HashEqual => "#="
-    | GreaterThan => ">"
-    | LessThan => "<"
-    | LessThanSlash => "</"
-    | Asterisk => "*"
-    | AsteriskDot => "*."
-    | Exponentiation => "**"
-    | Assert => "assert"
-    | Lazy => "lazy"
-    | Tilde => "tilde"
-    | Question => "?"
-    | If => "if"
-    | Else => "else"
-    | For => "for"
-    | In => "in"
-    | To => "to"
-    | Downto => "downto"
-    | While => "while"
-    | Switch => "switch"
-    | When => "when"
-    | EqualGreater => "=>"
-    | MinusGreater => "->"
-    | External => "external"
-    | Typ => "type"
-    | Private => "private"
-    | Constraint => "constraint"
-    | Mutable => "mutable"
-    | Include => "include"
-    | Module => "module"
-    | Of => "of"
-    | With => "with"
-    | Lor => "||"
-    | Band => "&"
-    | Land => "&&"
-    | BangEqual => "!="
-    | BangEqualEqual => "!=="
-    | GreaterEqual => ">="
-    | LessEqual => "<="
-    | ColonEqual => ":="
-    | At => "@"
-    | AtAt => "@@"
-    | Percent => "%"
-    | PercentPercent => "%%"
-    | Comment(c) => "Comment(" ++ (Comment.toString(c) ++ ")")
-    | List => "list"
-    | TemplatePart(text) => text ++ "${"
-    | TemplateTail(text) => "TemplateTail(" ++ (text ++ ")")
-    | Backtick => "`"
-    | BarGreater => "|>"
-    | Try => "try"
-    | Catch => "catch"
-    | Import => "import"
-    | Export => "export"
-    }
-
-  @raises(Not_found)
-  let keywordTable = x =>
-    switch x {
-    | "true" => True
-    | "false" => False
-    | "open" => Open
-    | "let" => Let
-    | "rec" => Rec
-    | "and" => And
-    | "as" => As
-    | "exception" => Exception
-    | "assert" => Assert
-    | "lazy" => Lazy
-    | "if" => If
-    | "else" => Else
-    | "for" => For
-    | "in" => In
-    | "to" => To
-    | "downto" => Downto
-    | "while" => While
-    | "switch" => Switch
-    | "when" => When
-    | "external" => External
-    | "type" => Typ
-    | "private" => Private
-    | "mutable" => Mutable
-    | "constraint" => Constraint
-    | "include" => Include
-    | "module" => Module
-    | "of" => Of
-    | "list" => List
-    | "with" => With
-    | "try" => Try
-    | "catch" => Catch
-    | "import" => Import
-    | "export" => Export
-    | _ => raise(Not_found)
-    }
-
-  let isKeyword = x =>
-    switch x {
-    | True
-    | False
-    | Open
-    | Let
-    | Rec
-    | And
-    | As
-    | Exception
-    | Assert
-    | Lazy
-    | If
-    | Else
-    | For
-    | In
-    | To
-    | Downto
-    | While
-    | Switch
-    | When
-    | External
-    | Typ
-    | Private
-    | Mutable
-    | Constraint
-    | Include
-    | Module
-    | Of
-    | Land
-    | Lor
-    | List
-    | With
-    | Try
-    | Catch
-    | Import
-    | Export => true
-    | _ => false
-    }
-
-  let lookupKeyword = str =>
-    try keywordTable(str) catch {
-    | Not_found =>
-      if CharacterCodes.isUpperCase(int_of_char(@doesNotRaise String.get(str, 0))) {
-        Uident(str)
-      } else {
-        Lident(str)
-      }
-    }
-
-  let isKeywordTxt = str =>
-    try {
-      let _ = keywordTable(str)
-      true
-    } catch {
-    | Not_found => false
-    }
-}
-
-module Grammar = {
-  type t =
-    | OpenDescription /* open Belt */
-    | @live ModuleLongIdent /* Foo or Foo.Bar */
-    | Ternary /* condExpr ? trueExpr : falseExpr */
-    | Es6ArrowExpr
-    | Jsx
-    | JsxAttribute
-    | @live JsxChild
-    | ExprOperand
-    | ExprUnary
-    | ExprSetField
-    | ExprBinaryAfterOp(Token.t)
-    | ExprBlock
-    | ExprCall
-    | ExprList
-    | ExprArrayAccess
-    | ExprArrayMutation
-    | ExprIf
-    | IfCondition
-    | IfBranch
-    | ElseBranch
-    | TypeExpression
-    | External
-    | PatternMatching
-    | PatternMatchCase
-    | LetBinding
-    | PatternList
-    | PatternOcamlList
-    | PatternRecord
-
-    | TypeDef
-    | TypeConstrName
-    | TypeParams
-    | @live TypeParam
-    | PackageConstraint
-
-    | TypeRepresentation
-
-    | RecordDecl
-    | ConstructorDeclaration
-    | ParameterList
-    | StringFieldDeclarations
-    | FieldDeclarations
-    | TypExprList
-    | FunctorArgs
-    | ModExprList
-    | TypeParameters
-    | RecordRows
-    | RecordRowsStringKey
-    | ArgumentList
-    | Signature
-    | Specification
-    | Structure
-    | Implementation
-    | Attribute
-    | TypeConstraint
-    | Primitive
-    | AtomicTypExpr
-    | ListExpr
-    | JsFfiImport
-
-  let toString = x =>
-    switch x {
-    | OpenDescription => "an open description"
-    | ModuleLongIdent => "a module identifier"
-    | Ternary => "a ternary expression"
-    | Es6ArrowExpr => "an es6 arrow function"
-    | Jsx => "a jsx expression"
-    | JsxAttribute => "a jsx attribute"
-    | ExprOperand => "a basic expression"
-    | ExprUnary => "a unary expression"
-    | ExprBinaryAfterOp(op) => "an expression after the operator \"" ++ (Token.toString(op) ++ "\"")
-    | ExprIf => "an if expression"
-    | IfCondition => "the condition of an if expression"
-    | IfBranch => "the true-branch of an if expression"
-    | ElseBranch => "the else-branch of an if expression"
-    | TypeExpression => "a type"
-    | External => "an external"
-    | PatternMatching => "the cases of a pattern match"
-    | ExprBlock => "a block with expressions"
-    | ExprSetField => "a record field mutation"
-    | ExprCall => "a function application"
-    | ExprArrayAccess => "an array access expression"
-    | ExprArrayMutation => "an array mutation"
-    | LetBinding => "a let binding"
-    | TypeDef => "a type definition"
-    | TypeParams => "type parameters"
-    | TypeParam => "a type parameter"
-    | TypeConstrName => "a type-constructor name"
-    | TypeRepresentation => "a type representation"
-    | RecordDecl => "a record declaration"
-    | PatternMatchCase => "a pattern match case"
-    | ConstructorDeclaration => "a constructor declaration"
-    | ExprList => "multiple expressions"
-    | PatternList => "multiple patterns"
-    | PatternOcamlList => "a list pattern"
-    | PatternRecord => "a record pattern"
-    | ParameterList => "parameters"
-    | StringFieldDeclarations => "string field declarations"
-    | FieldDeclarations => "field declarations"
-    | TypExprList => "list of types"
-    | FunctorArgs => "functor arguments"
-    | ModExprList => "list of module expressions"
-    | TypeParameters => "list of type parameters"
-    | RecordRows => "rows of a record"
-    | RecordRowsStringKey => "rows of a record with string keys"
-    | ArgumentList => "arguments"
-    | Signature => "signature"
-    | Specification => "specification"
-    | Structure => "structure"
-    | Implementation => "implementation"
-    | Attribute => "an attribute"
-    | TypeConstraint => "constraints on a type"
-    | Primitive => "an external primitive"
-    | AtomicTypExpr => "a type"
-    | ListExpr => "an ocaml list expr"
-    | PackageConstraint => "a package constraint"
-    | JsFfiImport => "js ffi import"
-    | JsxChild => "jsx child"
-    }
-
-  let isSignatureItemStart = x =>
-    switch x {
-    | Token.At
-    | Let
-    | Typ
-    | External
-    | Exception
-    | Open
-    | Include
-    | Module
-    | AtAt
-    | PercentPercent => true
-    | _ => false
-    }
-
-  let isAtomicPatternStart = x =>
-    switch x {
-    | Token.Int(_)
-    | String(_)
-    | Character(_)
-    | Lparen
-    | Lbracket
-    | Lbrace
-    | Underscore
-    | Lident(_)
-    | Uident(_)
-    | List
-    | Exception
-    | Lazy
-    | Percent => true
-    | _ => false
-    }
-
-  let isAtomicExprStart = x =>
-    switch x {
-    | Token.True
-    | False
-    | Int(_)
-    | String(_)
-    | Float(_)
-    | Character(_)
-    | Backtick
-    | Uident(_)
-    | Lident(_)
-    | Hash
-    | Lparen
-    | List
-    | Lbracket
-    | Lbrace
-    | LessThan
-    | Module
-    | Percent => true
-    | _ => false
-    }
-
-  let isAtomicTypExprStart = x =>
-    switch x {
-    | Token.SingleQuote
-    | Underscore
-    | Lparen
-    | Lbrace
-    | Uident(_)
-    | Lident(_)
-    | List
-    | Percent => true
-    | _ => false
-    }
-
-  let isExprStart = x =>
-    switch x {
-    | Token.True
-    | False
-    | Int(_)
-    | String(_)
-    | Float(_)
-    | Character(_)
-    | Backtick
-    | Underscore
-    | Uident(_)
-    | Lident(_)
-    | Hash
-    | Lparen
-    | List
-    | Module
-    | Lbracket
-    | Lbrace
-    | LessThan
-    | Minus
-    | MinusDot
-    | Plus
-    | PlusDot
-    | Bang
-    | Percent
-    | At
-    | If
-    | Switch
-    | While
-    | For
-    | Assert
-    | Lazy
-    | Try => true
-    | _ => false
-    }
-
-  let isJsxAttributeStart = x =>
-    switch x {
-    | Token.Lident(_) | Question => true
-    | _ => false
-    }
-
-  let isStructureItemStart = x =>
-    switch x {
-    | Token.Open
-    | Let
-    | Typ
-    | External
-    | Import
-    | Export
-    | Exception
-    | Include
-    | Module
-    | AtAt
-    | PercentPercent
-    | At => true
-    | t when isExprStart(t) => true
-    | _ => false
-    }
-
-  let isPatternStart = x =>
-    switch x {
-    | Token.Int(_)
-    | Float(_)
-    | String(_)
-    | Character(_)
-    | True
-    | False
-    | Minus
-    | Plus
-    | Lparen
-    | Lbracket
-    | Lbrace
-    | List
-    | Underscore
-    | Lident(_)
-    | Uident(_)
-    | Hash
-    | HashHash
-    | Exception
-    | Lazy
-    | Percent
-    | Module
-    | At => true
-    | _ => false
-    }
-
-  let isParameterStart = x =>
-    switch x {
-    | Token.Typ | Tilde | Dot => true
-    | token when isPatternStart(token) => true
-    | _ => false
-    }
-
-  /* TODO: overparse Uident ? */
-  let isStringFieldDeclStart = x =>
-    switch x {
-    | Token.String(_) | At => true
-    | _ => false
-    }
-
-  /* TODO: overparse Uident ? */
-  let isFieldDeclStart = x =>
-    switch x {
-    | Token.At | Mutable | Lident(_) | List => true
-    /* recovery, TODO: this is not ideal… */
-    | Uident(_) => true
-    | t when Token.isKeyword(t) => true
-    | _ => false
-    }
-
-  let isRecordDeclStart = x =>
-    switch x {
-    | Token.At | Mutable | Lident(_) | List => true
-    | _ => false
-    }
-
-  let isTypExprStart = x =>
-    switch x {
-    | Token.At
-    | SingleQuote
-    | Underscore
-    | Lparen
-    | Lbracket
-    | Uident(_)
-    | Lident(_)
-    | List
-    | Module
-    | Percent
-    | Lbrace => true
-    | _ => false
-    }
-
-  let isTypeParameterStart = x =>
-    switch x {
-    | Token.Tilde | Dot => true
-    | token when isTypExprStart(token) => true
-    | _ => false
-    }
-
-  let isTypeParamStart = x =>
-    switch x {
-    | Token.Plus | Minus | SingleQuote | Underscore => true
-    | _ => false
-    }
-
-  let isFunctorArgStart = x =>
-    switch x {
-    | Token.At | Uident(_) | Underscore | Percent | Lbrace | Lparen => true
-    | _ => false
-    }
-
-  let isModExprStart = x =>
-    switch x {
-    | Token.At | Percent | Uident(_) | Lbrace | Lparen => true
-    | _ => false
-    }
-
-  let isRecordRowStart = x =>
-    switch x {
-    | Token.DotDotDot => true
-    | Token.Uident(_) | Lident(_) | List => true
-    /* TODO */
-    | t when Token.isKeyword(t) => true
-    | _ => false
-    }
-
-  let isRecordRowStringKeyStart = x =>
-    switch x {
-    | Token.String(_) => true
-    | _ => false
-    }
-
-  let isArgumentStart = x =>
-    switch x {
-    | Token.Tilde | Dot | Underscore => true
-    | t when isExprStart(t) => true
-    | _ => false
-    }
-
-  let isPatternMatchStart = x =>
-    switch x {
-    | Token.Bar => true
-    | t when isPatternStart(t) => true
-    | _ => false
-    }
-
-  let isPatternOcamlListStart = x =>
-    switch x {
-    | Token.DotDotDot => true
-    | t when isPatternStart(t) => true
-    | _ => false
-    }
-
-  let isPatternRecordItemStart = x =>
-    switch x {
-    | Token.DotDotDot | Uident(_) | Lident(_) | List | Underscore => true
-    | _ => false
-    }
-
-  let isAttributeStart = x =>
-    switch x {
-    | Token.At => true
-    | _ => false
-    }
-
-  let isJsFfiImportStart = x =>
-    switch x {
-    | Token.Lident(_) | At => true
-    | _ => false
-    }
-
-  let isJsxChildStart = isAtomicExprStart
-
-  let isBlockExprStart = x =>
-    switch x {
-    | Token.At
-    | Hash
-    | Percent
-    | Minus
-    | MinusDot
-    | Plus
-    | PlusDot
-    | Bang
-    | True
-    | False
-    | Int(_)
-    | String(_)
-    | Character(_)
-    | Lident(_)
-    | Uident(_)
-    | Lparen
-    | List
-    | Lbracket
-    | Lbrace
-    | Forwardslash
-    | Assert
-    | Lazy
-    | If
-    | For
-    | While
-    | Switch
-    | Open
-    | Module
-    | Exception
-    | Let
-    | LessThan
-    | Backtick
-    | Try
-    | Underscore => true
-    | _ => false
-    }
-
-  let isListElement = (grammar, token) =>
-    switch grammar {
-    | ExprList => token == Token.DotDotDot || isExprStart(token)
-    | ListExpr => token == DotDotDot || isExprStart(token)
-    | PatternList => token == DotDotDot || isPatternStart(token)
-    | ParameterList => isParameterStart(token)
-    | StringFieldDeclarations => isStringFieldDeclStart(token)
-    | FieldDeclarations => isFieldDeclStart(token)
-    | RecordDecl => isRecordDeclStart(token)
-    | TypExprList => isTypExprStart(token) || token == Token.LessThan
-    | TypeParams => isTypeParamStart(token)
-    | FunctorArgs => isFunctorArgStart(token)
-    | ModExprList => isModExprStart(token)
-    | TypeParameters => isTypeParameterStart(token)
-    | RecordRows => isRecordRowStart(token)
-    | RecordRowsStringKey => isRecordRowStringKeyStart(token)
-    | ArgumentList => isArgumentStart(token)
-    | Signature | Specification => isSignatureItemStart(token)
-    | Structure | Implementation => isStructureItemStart(token)
-    | PatternMatching => isPatternMatchStart(token)
-    | PatternOcamlList => isPatternOcamlListStart(token)
-    | PatternRecord => isPatternRecordItemStart(token)
-    | Attribute => isAttributeStart(token)
-    | TypeConstraint => token == Constraint
-    | PackageConstraint => token == And
-    | ConstructorDeclaration => token == Bar
-    | Primitive =>
-      switch token {
-      | Token.String(_) => true
-      | _ => false
-      }
-    | JsxAttribute => isJsxAttributeStart(token)
-    | JsFfiImport => isJsFfiImportStart(token)
-    | _ => false
-    }
-
-  let isListTerminator = (grammar, token) =>
-    switch (grammar, token) {
-    | (_, Token.Eof)
-    | (ExprList, Rparen | Forwardslash | Rbracket)
-    | (ListExpr, Rparen)
-    | (ArgumentList, Rparen)
-    | (TypExprList, Rparen | Forwardslash | GreaterThan | Equal)
-    | (ModExprList, Rparen)
-    | (
-      PatternList | PatternOcamlList | PatternRecord,
-      Forwardslash | Rbracket | Rparen | EqualGreater | In | Equal /* let {x} = foo */,
-    )
-    | (ExprBlock, Rbrace)
-    | (Structure | Signature, Rbrace)
-    | (TypeParams, Rparen)
-    | (ParameterList, EqualGreater | Lbrace)
-    | (JsxAttribute, Forwardslash | GreaterThan)
-    | (JsFfiImport, Rbrace)
-    | (StringFieldDeclarations, Rbrace) => true
-
-    | (Attribute, token) when token != At => true
-    | (TypeConstraint, token) when token != Constraint => true
-    | (PackageConstraint, token) when token != And => true
-    | (ConstructorDeclaration, token) when token != Bar => true
-    | (Primitive, Semicolon) => true
-    | (Primitive, token) when isStructureItemStart(token) => true
-
-    | _ => false
-    }
-
-  let isPartOfList = (grammar, token) =>
-    isListElement(grammar, token) || isListTerminator(grammar, token)
-}
-
-module Reporting = {
-  module TerminalDoc = {
-    type break =
-      | Never
-      | Always
-
-    type rec document =
-      | Nil
-      | Group({break: break, doc: document})
-      | Text(string)
-      | Indent({amount: int, doc: document})
-      | Append({doc1: document, doc2: document})
-
-    let group = (~break, doc) => Group({break: break, doc: doc})
-    let text = txt => Text(txt)
-    let indent = (i, d) => Indent({amount: i, doc: d})
-    let append = (d1, d2) => Append({doc1: d1, doc2: d2})
-    let nil = Nil
-
-    type rec stack =
-      | Empty
-      | Cons({doc: document, stack: stack})
-
-    let push = (stack, doc) => Cons({doc: doc, stack: stack})
-
-    type mode =
-      | Flat
-      | Break
-
-    let toString /* ~width */ = (doc: document) => {
-      let buffer = Buffer.create(100)
-      let rec loop = (stack, mode, offset) =>
-        switch stack {
-        | Empty => ()
-        | Cons({doc, stack: rest}) =>
-          switch doc {
-          | Nil => loop(rest, mode, offset)
-          | Text(txt) =>
-            Buffer.add_string(buffer, txt)
-            loop(rest, mode, offset + String.length(txt))
-          | Indent({amount: i, doc}) =>
-            let indentation = (@doesNotRaise String.make)(i, ' ')
-            Buffer.add_string(buffer, indentation)
-            loop(push(rest, doc), mode, offset + i)
-          | Append({doc1, doc2}) =>
-            let rest = push(rest, doc2)
-            let rest = push(rest, mode == Flat ? Nil : text("\n"))
-
-            let rest = push(rest, doc1)
-            loop(rest, mode, offset)
-          | Group({break, doc}) =>
-            let rest = push(rest, doc)
-            switch break {
-            | Always => loop(rest, Break, offset)
-            | Never => loop(rest, Flat, offset)
-            }
-          }
-        }
-
-      loop(push(Empty, doc), Flat, 0)
-      Buffer.contents(buffer)
-    }
-  }
-
-  type color =
-    | @live NoColor
-    | @live Red
-
-  type style = {
-    @live underline: bool,
-    @live color: color,
-  }
-
-  let highlight = (~from, ~len, txt) =>
-    if from < 0 || (String.length(txt) === 0 || from >= String.length(txt)) {
-      txt
-    } else {
-      let before = try String.sub(txt, 0, from) catch {
-      | Invalid_argument(_) => ""
-      }
-      let content =
-        "\027[31m" ++
-        (try String.sub(txt, from, len) catch {
-        | Invalid_argument(_) => ""
-        } ++
-        "\027[0m")
-
-      let after = try String.sub(txt, from + len, String.length(txt) - (from + len)) catch {
-      | Invalid_argument(_) => ""
-      }
-      before ++ (content ++ after)
-    }
-
-  let underline = (~from, ~len, txt) => {
-    open TerminalDoc
-    let indent = (@doesNotRaise String.make)(from, ' ')
-    let underline = (@doesNotRaise String.make)(len, '^')
-    let line = highlight(~from=0, ~len, underline)
-    group(~break=Always, append(text(txt), text(indent ++ line)))
-  }
-
-  let rec drop = (n, l) =>
-    if n === 1 {
-      l
-    } else {
-      drop(
-        n - 1,
-        switch l {
-        | list{_x, ...xs} => xs
-        | _ => l
-        },
-      )
-    }
-
-  let rec take = (n, l) =>
-    switch l {
-    | _ when n === 0 => list{}
-    | list{} => list{}
-    | list{x, ...xs} => list{x, ...take(n - 1, xs)}
-    }
-
-  /* TODO: cleanup */
-  let renderCodeContext = (~missing, src: string, startPos, endPos) => {
-    open Lexing
-    let startCol = startPos.pos_cnum - startPos.pos_bol
-    let endCol = endPos.pos_cnum - startPos.pos_cnum + startCol
-    let startLine = max(1, startPos.pos_lnum - 2) /* 2 lines before */
-    let lines = String.split_on_char('\n', src)
-    let endLine = {
-      let len = List.length(lines)
-      min(len, startPos.pos_lnum + 3)
-    } /* 2 lines after */
-
-    let lines = lines |> drop(startLine) |> take(endLine - startLine) |> Array.of_list
-
-    let renderLine = (x, ix) => {
-      let x = if ix == startPos.pos_lnum {
-        switch missing {
-        | Some(_len) => x ++ @doesNotRaise String.make(10, ' ')
-        | None => x
-        }
-      } else {
-        x
-      }
-
-      open TerminalDoc
-      let rowNr = {
-        let txt = string_of_int(ix)
-        let len = String.length(txt)
-        if ix == startPos.pos_lnum {
-          highlight(~from=0, ~len, txt)
-        } else {
-          txt
-        }
-      }
-
-      let len = {
-        let len = if endCol >= 0 {
-          endCol - startCol
-        } else {
-          1
-        }
-
-        if startCol + len > String.length(x) {
-          String.length(x) - startCol - 1
-        } else {
-          len
-        }
-      }
-
-      let line = if ix == startPos.pos_lnum {
-        switch missing {
-        | Some(len) =>
-          underline(
-            ~from=startCol + String.length(String.length(string_of_int(ix)) |> string_of_int) + 5,
-            ~len,
-            x,
-          )
-        | None =>
-          let len = if startCol + len > String.length(x) {
-            String.length(x) - startCol
-          } else {
-            len
-          }
-
-          text(highlight(~from=startCol, ~len, x))
-        }
-      } else {
-        text(x)
-      }
-
-      group(~break=Never, append(append(text(rowNr), text(" │")), indent(2, line)))
-    }
-
-    let reportDoc = ref(TerminalDoc.nil)
-
-    let linesLen = Array.length(lines)
-    for i in 0 to linesLen - 1 {
-      let line = try lines[i] catch {
-      | Invalid_argument(_) => ""
-      }
-      reportDoc := {
-          open TerminalDoc
-          let ix = startLine + i
-          group(~break=Always, append(reportDoc.contents, renderLine(line, ix)))
-        }
-    }
-
-    TerminalDoc.toString(reportDoc.contents)
-  }
-
-  type problem =
-    | @live Unexpected(Token.t)
-    | @live Expected({token: Token.t, pos: Lexing.position, context: option<Grammar.t>})
-    | @live Message(string)
-    | @live Uident
-    | @live Lident
-    | @live Unbalanced(Token.t)
-
-  type parseError = (Lexing.position, problem)
-}
-
-module Diagnostics: {
-  type t
-  type category
-  type report
-
-  type reportStyle
-  let parseReportStyle: string => reportStyle
-
-  let unexpected: (Token.t, list<(Grammar.t, Lexing.position)>) => category
-  let expected: (~grammar: Grammar.t=?, Lexing.position, Token.t) => category
-  let uident: Token.t => category
-  let lident: Token.t => category
-  let unclosedString: category
-  let unclosedTemplate: category
-  let unclosedComment: category
-  let unknownUchar: int => category
-  let message: string => category
-
-  let make: (~filename: string, ~startPos: Lexing.position, ~endPos: Lexing.position, category) => t
-
-  let stringOfReport: (~style: reportStyle, list<t>, string) => string
-} = {
-  type category =
-    | Unexpected({token: Token.t, context: list<(Grammar.t, Lexing.position)>})
-    | Expected({
-        context: option<Grammar.t>,
-        pos: Lexing.position /* prev token end */,
-        token: Token.t,
-      })
-    | Message(string)
-    | Uident(Token.t)
-    | Lident(Token.t)
-    | UnclosedString
-    | UnclosedTemplate
-    | UnclosedComment
-    | UnknownUchar(int)
-
-  type t = {
-    filename: string,
-    startPos: Lexing.position,
-    endPos: Lexing.position,
-    category: category,
-  }
-
-  type report = list<t>
-
-  /* TODO: add json here */
-  type reportStyle =
-    | Pretty
-    | Plain
-
-  let parseReportStyle = txt =>
-    switch String.lowercase_ascii(txt) {
-    | "plain" => Plain
-    | _ => Pretty
-    }
-
-  let defaultUnexpected = token =>
-    "I'm not sure what to parse here when looking at \"" ++ (Token.toString(token) ++ "\".")
-
-  let explain = t =>
-    switch t.category {
-    | Uident(currentToken) =>
-      switch currentToken {
-      | Lident(lident) =>
-        let guess = String.capitalize_ascii(lident)
-        "Did you mean `" ++ (guess ++ ("` instead of `" ++ (lident ++ "`?")))
-      | t when Token.isKeyword(t) =>
-        let token = Token.toString(t)
-        "`" ++ (token ++ "` is a reserved keyword.")
-      | _ => "At this point, I'm looking for an uppercased identifier like `Belt` or `Array`"
-      }
-    | Lident(currentToken) =>
-      switch currentToken {
-      | Uident(uident) =>
-        let guess = String.uncapitalize_ascii(uident)
-        "Did you mean `" ++ (guess ++ ("` instead of `" ++ (uident ++ "`?")))
-      | t when Token.isKeyword(t) =>
-        let token = Token.toString(t)
-        "`" ++
-        (token ++
-        ("` is a reserved keyword. Keywords need to be escaped: \\\"" ++ (token ++ "\"")))
-      | Underscore => "`_` isn't a valid name."
-      | _ => "I'm expecting an lowercased identifier like `name` or `age`"
-      }
-    | Message(txt) => txt
-    | UnclosedString => "This string is missing a double quote at the end"
-    | UnclosedTemplate => "Did you forget to close this template expression with a backtick?"
-    | UnclosedComment => "This comment seems to be missing a closing `*/`"
-    | UnknownUchar(uchar) =>
-      switch uchar {
-      | 94 /* ^ */ => "Hmm, not sure what I should do here with this character.\nIf you're trying to deref an expression, use `foo.contents` instead."
-      | _ => "Hmm, I have no idea what this character means…"
-      }
-    | Expected({context, token: t}) =>
-      let hint = switch context {
-      | Some(grammar) => "It signals the start of " ++ Grammar.toString(grammar)
-      | None => ""
-      }
-
-      "Did you forget a `" ++ (Token.toString(t) ++ ("` here? " ++ hint))
-    | Unexpected({token: t, context: breadcrumbs}) =>
-      let name = Token.toString(t)
-      switch breadcrumbs {
-      | list{(AtomicTypExpr, _), ...breadcrumbs} =>
-        switch (breadcrumbs, t) {
-        | (
-            list{(StringFieldDeclarations | FieldDeclarations, _), ..._},
-            String(_) | At | Rbrace | Comma | Eof,
-          ) => "I'm missing a type here"
-        | (_, t) when Grammar.isStructureItemStart(t) || t == Eof => "Missing a type here"
-        | _ => defaultUnexpected(t)
-        }
-      | list{(ExprOperand, _), ...breadcrumbs} =>
-        switch (breadcrumbs, t) {
-        | (list{(ExprBlock, _), ..._}, Rbrace) => "It seems that this expression block is empty"
-        | (list{(ExprBlock, _), ..._}, Bar) => /* Pattern matching */
-          "Looks like there might be an expression missing here"
-        | (
-            list{(ExprSetField, _), ..._},
-            _,
-          ) => "It seems that this record field mutation misses an expression"
-        | (
-            list{(ExprArrayMutation, _), ..._},
-            _,
-          ) => "Seems that an expression is missing, with what do I mutate the array?"
-        | (
-            list{(ExprBinaryAfterOp(_) | ExprUnary, _), ..._},
-            _,
-          ) => "Did you forget to write an expression here?"
-        | (list{(Grammar.LetBinding, _), ..._}, _) => "This let-binding misses an expression"
-        | (list{_, ..._}, Rbracket | Rbrace) => "Missing expression"
-        | _ => "I'm not sure what to parse here when looking at \"" ++ (name ++ "\".")
-        }
-      | list{(TypeParam, _), ..._} =>
-        switch t {
-        | Lident(ident) => "Did you mean '" ++ (ident ++ "? A Type parameter starts with a quote.")
-        | _ => "I'm not sure what to parse here when looking at \"" ++ (name ++ "\".")
-        }
-      | _ =>
-        /* TODO: match on circumstance to verify Lident needed ? */
-        if Token.isKeyword(t) {
-          "`" ++
-          (name ++
-          ("` is a reserved keyword. Keywords need to be escaped: \\\"" ++
-          (Token.toString(t) ++
-          "\"")))
-        } else {
-          "I'm not sure what to parse here when looking at \"" ++ (name ++ "\".")
-        }
-      }
-    }
-
-  let toPlainString = (t, buffer) => {
-    Buffer.add_string(buffer, t.filename)
-    Buffer.add_char(buffer, '(')
-    Buffer.add_string(buffer, string_of_int(t.startPos.pos_cnum))
-    Buffer.add_char(buffer, ',')
-    Buffer.add_string(buffer, string_of_int(t.endPos.pos_cnum))
-    Buffer.add_char(buffer, ')')
-    Buffer.add_char(buffer, ':')
-    Buffer.add_string(buffer, explain(t))
-  }
-
-  let toString = (t, src) => {
-    open Lexing
-    let startchar = t.startPos.pos_cnum - t.startPos.pos_bol
-    let endchar = t.endPos.pos_cnum - t.startPos.pos_cnum + startchar
-    let locationInfo = Printf.sprintf /* ReasonLanguageServer requires the following format */(
-      "File \"%s\", line %d, characters %d-%d:",
-      t.filename,
-      t.startPos.pos_lnum,
-      startchar,
-      endchar,
-    )
-
-    let code = {
-      let missing = switch t.category {
-      | Expected({token: t}) => Some(String.length(Token.toString(t)))
-      | _ => None
-      }
-
-      Reporting.renderCodeContext(~missing, src, t.startPos, t.endPos)
-    }
-
-    let explanation = explain(t)
-    Printf.sprintf("%s\n\n%s\n\n%s\n\n", locationInfo, code, explanation)
-  }
-
-  let make = (~filename, ~startPos, ~endPos, category) => {
-    filename: filename,
-    startPos: startPos,
-    endPos: endPos,
-    category: category,
-  }
-
-  let stringOfReport = (~style, diagnostics, src) =>
-    switch style {
-    | Pretty =>
-      List.fold_left(
-        (report, diagnostic) => report ++ (toString(diagnostic, src) ++ "\n"),
-        "\n",
-        List.rev(diagnostics),
-      )
-    | Plain =>
-      let buffer = Buffer.create(100)
-      List.iter(diagnostic => {
-        toPlainString(diagnostic, buffer)
-        Buffer.add_char(buffer, '\n')
-      }, diagnostics)
-      Buffer.contents(buffer)
-    }
-
-  let unexpected = (token, context) => Unexpected({token: token, context: context})
-
-  let expected = (~grammar=?, pos, token) => Expected({context: grammar, pos: pos, token: token})
-
-  let uident = currentToken => Uident(currentToken)
-  let lident = currentToken => Lident(currentToken)
-  let unclosedString = UnclosedString
-  let unclosedComment = UnclosedComment
-  let unclosedTemplate = UnclosedTemplate
-  let unknownUchar = code => UnknownUchar(code)
-  let message = txt => Message(txt)
-}
-
-/* Collection of utilities to view the ast in a more a convenient form,
- * allowing for easier processing.
- * Example: given a ptyp_arrow type, what are its arguments and what is the
- * returnType? */
-module ParsetreeViewer: {
-  /* Restructures a nested tree of arrow types into its args & returnType
-   * The parsetree contains: a => b => c => d, for printing purposes
-   * we restructure the tree into (a, b, c) and its returnType d */
-  let arrowType: Parsetree.core_type => (
-    Parsetree.attributes,
-    list<(Parsetree.attributes, Asttypes.arg_label, Parsetree.core_type)>,
-    Parsetree.core_type,
-  )
-
-  let functorType: Parsetree.module_type => (
-    list<(Parsetree.attributes, Asttypes.loc<string>, option<Parsetree.module_type>)>,
-    Parsetree.module_type,
-  )
-
-  /* filters @bs out of the provided attributes */
-  let processUncurriedAttribute: Parsetree.attributes => (bool, Parsetree.attributes)
-
-  /* if ... else if ... else ... is represented as nested expressions: if ... else { if ... }
-   * The purpose of this function is to flatten nested ifs into one sequence.
-   * Basically compute: ([if, else if, else if, else if], else) */
-  let collectIfExpressions: Parsetree.expression => (
-    list<(Parsetree.expression, Parsetree.expression)>,
-    option<Parsetree.expression>,
-  )
-
-  let collectListExpressions: Parsetree.expression => (
-    list<Parsetree.expression>,
-    option<Parsetree.expression>,
-  )
-
-  type funParamKind =
-    | Parameter({
-        attrs: Parsetree.attributes,
-        lbl: Asttypes.arg_label,
-        defaultExpr: option<Parsetree.expression>,
-        pat: Parsetree.pattern,
-      })
-    | NewTypes({attrs: Parsetree.attributes, locs: list<Asttypes.loc<string>>})
-
-  let funExpr: Parsetree.expression => (
-    Parsetree.attributes,
-    list<funParamKind>,
-    Parsetree.expression,
-  )
-
-  /* example:
-   *  `makeCoordinate({
-   *    x: 1,
-   *    y: 2,
-   *  })`
-   *  Notice howe `({` and `})` "hug" or stick to each other */
-  let isHuggableExpression: Parsetree.expression => bool
-
-  let isHuggablePattern: Parsetree.pattern => bool
-
-  let isHuggableRhs: Parsetree.expression => bool
-
-  let operatorPrecedence: string => int
-
-  let isUnaryExpression: Parsetree.expression => bool
-  let isBinaryOperator: string => bool
-  let isBinaryExpression: Parsetree.expression => bool
-
-  let flattenableOperators: (string, string) => bool
-
-  let hasAttributes: Parsetree.attributes => bool
-
-  let isArrayAccess: Parsetree.expression => bool
-  let isTernaryExpr: Parsetree.expression => bool
-
-  let collectTernaryParts: Parsetree.expression => (
-    list<(Parsetree.expression, Parsetree.expression)>,
-    Parsetree.expression,
-  )
-
-  let parametersShouldHug: list<funParamKind> => bool
-
-  let filterTernaryAttributes: Parsetree.attributes => Parsetree.attributes
-
-  let isJsxExpression: Parsetree.expression => bool
-  let hasJsxAttribute: Parsetree.attributes => bool
-
-  let shouldIndentBinaryExpr: Parsetree.expression => bool
-  let shouldInlineRhsBinaryExpr: Parsetree.expression => bool
-  let filterPrinteableAttributes: Parsetree.attributes => Parsetree.attributes
-  let partitionPrinteableAttributes: Parsetree.attributes => (
-    Parsetree.attributes,
-    Parsetree.attributes,
-  )
-
-  let requiresSpecialCallbackPrintingLastArg: list<(
-    Asttypes.arg_label,
-    Parsetree.expression,
-  )> => bool
-  let requiresSpecialCallbackPrintingFirstArg: list<(
-    Asttypes.arg_label,
-    Parsetree.expression,
-  )> => bool
-
-  let modExprApply: Parsetree.module_expr => (list<Parsetree.module_expr>, Parsetree.module_expr)
-
-  let modExprFunctor: Parsetree.module_expr => (
-    list<(Parsetree.attributes, Asttypes.loc<string>, option<Parsetree.module_type>)>,
-    Parsetree.module_expr,
-  )
-
-  let splitGenTypeAttr: Parsetree.attributes => (bool, Parsetree.attributes)
-
-  let collectPatternsFromListConstruct: (
-    list<Parsetree.pattern>,
-    Parsetree.pattern,
-  ) => (list<Parsetree.pattern>, Parsetree.pattern)
-
-  let isBlockExpr: Parsetree.expression => bool
-
-  let isTemplateLiteral: Parsetree.expression => bool
-
-  let collectOrPatternChain: Parsetree.pattern => list<Parsetree.pattern>
-
-  let processBracesAttr: Parsetree.expression => (option<Parsetree.attribute>, Parsetree.expression)
-
-  let filterParsingAttrs: Parsetree.attributes => Parsetree.attributes
-
-  let isBracedExpr: Parsetree.expression => bool
-
-  let isPipeExpr: Parsetree.expression => bool
-
-  let extractValueDescriptionFromModExpr: Parsetree.module_expr => list<Parsetree.value_description>
-
-  type jsImportScope =
-    | JsGlobalImport /* nothing */
-    | JsModuleImport(string) /* from "path" */
-    | JsScopedImport(list<string>) /* window.location */
-
-  let classifyJsImport: Parsetree.value_description => jsImportScope
-
-  /* (__x) => f(a, __x, c) -----> f(a, _, c) */
-  let rewriteUnderscoreApply: Parsetree.expression => Parsetree.expression
-
-  /* (__x) => f(a, __x, c) -----> f(a, _, c) */
-  let isUnderscoreApplySugar: Parsetree.expression => bool
-} = {
-  open Parsetree
-
-  let arrowType = ct => {
-    let rec process = (attrsBefore, acc, typ) =>
-      switch typ {
-      | {ptyp_desc: Ptyp_arrow(Nolabel as lbl, typ1, typ2), ptyp_attributes: list{}} =>
-        let arg = (list{}, lbl, typ1)
-        process(attrsBefore, list{arg, ...acc}, typ2)
-      | {
-          ptyp_desc: Ptyp_arrow(Nolabel as lbl, typ1, typ2),
-          ptyp_attributes: list{({txt: "bs"}, _)} as attrs,
-        } =>
-        let arg = (attrs, lbl, typ1)
-        process(attrsBefore, list{arg, ...acc}, typ2)
-      | {ptyp_desc: Ptyp_arrow(Nolabel, _typ1, _typ2), ptyp_attributes: _attrs} as returnType =>
-        let args = List.rev(acc)
-        (attrsBefore, args, returnType)
-      | {
-          ptyp_desc: Ptyp_arrow((Labelled(_) | Optional(_)) as lbl, typ1, typ2),
-          ptyp_attributes: attrs,
-        } =>
-        let arg = (attrs, lbl, typ1)
-        process(attrsBefore, list{arg, ...acc}, typ2)
-      | typ => (attrsBefore, List.rev(acc), typ)
-      }
-
-    switch ct {
-    | {ptyp_desc: Ptyp_arrow(Nolabel, _typ1, _typ2), ptyp_attributes: attrs} as typ =>
-      process(attrs, list{}, {...typ, ptyp_attributes: list{}})
-    | typ => process(list{}, list{}, typ)
-    }
-  }
-
-  let functorType = modtype => {
-    let rec process = (acc, modtype) =>
-      switch modtype {
-      | {pmty_desc: Pmty_functor(lbl, argType, returnType), pmty_attributes: attrs} =>
-        let arg = (attrs, lbl, argType)
-        process(list{arg, ...acc}, returnType)
-      | modType => (List.rev(acc), modType)
-      }
-
-    process(list{}, modtype)
-  }
-
-  let processUncurriedAttribute = attrs => {
-    let rec process = (uncurriedSpotted, acc, attrs) =>
-      switch attrs {
-      | list{} => (uncurriedSpotted, List.rev(acc))
-      | list{({Location.txt: "bs"}, _), ...rest} => process(true, acc, rest)
-      | list{attr, ...rest} => process(uncurriedSpotted, list{attr, ...acc}, rest)
-      }
-
-    process(false, list{}, attrs)
-  }
-
-  let collectIfExpressions = expr => {
-    let rec collect = (acc, expr) =>
-      switch expr.pexp_desc {
-      | Pexp_ifthenelse(ifExpr, thenExpr, Some(elseExpr)) =>
-        collect(list{(ifExpr, thenExpr), ...acc}, elseExpr)
-      | Pexp_ifthenelse(ifExpr, thenExpr, None as elseExpr) =>
-        let ifs = List.rev(list{(ifExpr, thenExpr), ...acc})
-        (ifs, elseExpr)
-      | _ => (List.rev(acc), Some(expr))
-      }
-
-    collect(list{}, expr)
-  }
-
-  let collectListExpressions = expr => {
-    let rec collect = (acc, expr) =>
-      switch expr.pexp_desc {
-      | Pexp_construct({txt: Longident.Lident("[]")}, _) => (List.rev(acc), None)
-      | Pexp_construct(
-          {txt: Longident.Lident("::")},
-          Some({pexp_desc: Pexp_tuple(list{hd, tail})}),
-        ) =>
-        collect(list{hd, ...acc}, tail)
-      | _ => (List.rev(acc), Some(expr))
-      }
-
-    collect(list{}, expr)
-  }
-
-  /* (__x) => f(a, __x, c) -----> f(a, _, c) */
-  let rewriteUnderscoreApply = expr =>
-    switch expr.pexp_desc {
-    | Pexp_fun(
-        Nolabel,
-        None,
-        {ppat_desc: Ppat_var({txt: "__x"})},
-        {pexp_desc: Pexp_apply(callExpr, args)} as e,
-      ) =>
-      let newArgs = List.map(arg =>
-        switch arg {
-        | (lbl, {pexp_desc: Pexp_ident({txt: Longident.Lident("__x")} as lid)} as argExpr) => (
-            lbl,
-            {...argExpr, pexp_desc: Pexp_ident({...lid, txt: Longident.Lident("_")})},
-          )
-        | arg => arg
-        }
-      , args)
-      {...e, pexp_desc: Pexp_apply(callExpr, newArgs)}
-    | _ => expr
-    }
-
-  type funParamKind =
-    | Parameter({
-        attrs: Parsetree.attributes,
-        lbl: Asttypes.arg_label,
-        defaultExpr: option<Parsetree.expression>,
-        pat: Parsetree.pattern,
-      })
-    | NewTypes({attrs: Parsetree.attributes, locs: list<Asttypes.loc<string>>})
-
-  let funExpr = expr => {
-    /* Turns (type t, type u, type z) into "type t u z" */
-    let rec collectNewTypes = (acc, returnExpr) =>
-      switch returnExpr {
-      | {pexp_desc: Pexp_newtype(stringLoc, returnExpr), pexp_attributes: list{}} =>
-        collectNewTypes(list{stringLoc, ...acc}, returnExpr)
-      | returnExpr => (List.rev(acc), returnExpr)
-      }
-
-    let rec collect = (attrsBefore, acc, expr) =>
-      switch expr {
-      | {
-          pexp_desc:
-            Pexp_fun(
-              Nolabel,
-              None,
-              {ppat_desc: Ppat_var({txt: "__x"})},
-              {pexp_desc: Pexp_apply(_)},
-            ),
-        } => (attrsBefore, List.rev(acc), rewriteUnderscoreApply(expr))
-      | {pexp_desc: Pexp_fun(lbl, defaultExpr, pattern, returnExpr), pexp_attributes: list{}} =>
-        let parameter = Parameter({
-          attrs: list{},
-          lbl: lbl,
-          defaultExpr: defaultExpr,
-          pat: pattern,
-        })
-        collect(attrsBefore, list{parameter, ...acc}, returnExpr)
-      | {pexp_desc: Pexp_newtype(stringLoc, rest), pexp_attributes: attrs} =>
-        let (stringLocs, returnExpr) = collectNewTypes(list{stringLoc}, rest)
-        let param = NewTypes({attrs: attrs, locs: stringLocs})
-        collect(attrsBefore, list{param, ...acc}, returnExpr)
-      | {
-          pexp_desc: Pexp_fun(lbl, defaultExpr, pattern, returnExpr),
-          pexp_attributes: list{({txt: "bs"}, _)} as attrs,
-        } =>
-        let parameter = Parameter({
-          attrs: attrs,
-          lbl: lbl,
-          defaultExpr: defaultExpr,
-          pat: pattern,
-        })
-        collect(attrsBefore, list{parameter, ...acc}, returnExpr)
-      | {
-          pexp_desc: Pexp_fun((Labelled(_) | Optional(_)) as lbl, defaultExpr, pattern, returnExpr),
-          pexp_attributes: attrs,
-        } =>
-        let parameter = Parameter({
-          attrs: attrs,
-          lbl: lbl,
-          defaultExpr: defaultExpr,
-          pat: pattern,
-        })
-        collect(attrsBefore, list{parameter, ...acc}, returnExpr)
-      | expr => (attrsBefore, List.rev(acc), expr)
-      }
-
-    switch expr {
-    | {
-        pexp_desc: Pexp_fun(Nolabel, _defaultExpr, _pattern, _returnExpr),
-        pexp_attributes: attrs,
-      } as expr =>
-      collect(attrs, list{}, {...expr, pexp_attributes: list{}})
-    | expr => collect(list{}, list{}, expr)
-    }
-  }
-
-  let processBracesAttr = expr =>
-    switch expr.pexp_attributes {
-    | list{({txt: "res.braces"}, _) as attr, ...attrs} => (
-        Some(attr),
-        {...expr, pexp_attributes: attrs},
-      )
-    | _ => (None, expr)
-    }
-
-  let filterParsingAttrs = attrs => List.filter(attr =>
-      switch attr {
-      | ({Location.txt: "res.ternary" | "res.braces" | "bs" | "res.namedArgLoc"}, _) => false
-      | _ => true
-      }
-    , attrs)
-
-  let isBlockExpr = expr =>
-    switch expr.pexp_desc {
-    | Pexp_letmodule(_)
-    | Pexp_letexception(_)
-    | Pexp_let(_)
-    | Pexp_open(_)
-    | Pexp_sequence(_) => true
-    | _ => false
-    }
-
-  let isBracedExpr = expr =>
-    switch processBracesAttr(expr) {
-    | (Some(_), _) => true
-    | _ => false
-    }
-
-  let isHuggableExpression = expr =>
-    switch expr.pexp_desc {
-    | Pexp_array(_)
-    | Pexp_tuple(_)
-    | Pexp_construct({txt: Longident.Lident("::" | "[]")}, _)
-    | Pexp_extension({txt: "bs.obj"}, _)
-    | Pexp_record(_) => true
-    | _ when isBlockExpr(expr) => true
-    | _ when isBracedExpr(expr) => true
-    | _ => false
-    }
-
-  let isHuggableRhs = expr =>
-    switch expr.pexp_desc {
-    | Pexp_array(_)
-    | Pexp_tuple(_)
-    | Pexp_construct({txt: Longident.Lident("::" | "[]")}, _)
-    | Pexp_extension({txt: "bs.obj"}, _)
-    | Pexp_record(_) => true
-    | _ when isBracedExpr(expr) => true
-    | _ => false
-    }
-
-  let isHuggablePattern = pattern =>
-    switch pattern.ppat_desc {
-    | Ppat_array(_) | Ppat_tuple(_) | Ppat_record(_) | Ppat_construct(_) => true
-    | _ => false
-    }
-
-  let operatorPrecedence = operator =>
-    switch operator {
-    | ":=" => 1
-    | "||" => 2
-    | "&&" => 3
-    | "=" | "==" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" | "|>" => 4
-    | "+" | "+." | "-" | "-." | "^" => 5
-    | "*" | "*." | "/" | "/." => 6
-    | "**" => 7
-    | "#" | "##" | "|." => 8
-    | _ => 0
-    }
-
-  let isUnaryOperator = operator =>
-    switch operator {
-    | "~+" | "~+." | "~-" | "~-." | "not" => true
-    | _ => false
-    }
-
-  let isUnaryExpression = expr =>
-    switch expr.pexp_desc {
-    | Pexp_apply({pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})}, list{(Nolabel, _arg)})
-      when isUnaryOperator(operator) => true
-    | _ => false
-    }
-
-  let isBinaryOperator = operator =>
-    switch operator {
-    | ":="
-    | "||"
-    | "&&"
-    | "="
-    | "=="
-    | "<"
-    | ">"
-    | "!="
-    | "!=="
-    | "<="
-    | ">="
-    | "|>"
-    | "+"
-    | "+."
-    | "-"
-    | "-."
-    | "^"
-    | "*"
-    | "*."
-    | "/"
-    | "/."
-    | "**"
-    | "|."
-    | "<>" => true
-    | _ => false
-    }
-
-  let isBinaryExpression = expr =>
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})},
-        list{(Nolabel, _operand1), (Nolabel, _operand2)},
-      ) when isBinaryOperator(operator) => true
-    | _ => false
-    }
-
-  let isEqualityOperator = operator =>
-    switch operator {
-    | "=" | "==" | "<>" | "!=" => true
-    | _ => false
-    }
-
-  let flattenableOperators = (parentOperator, childOperator) => {
-    let precParent = operatorPrecedence(parentOperator)
-    let precChild = operatorPrecedence(childOperator)
-    if precParent === precChild {
-      !(isEqualityOperator(parentOperator) && isEqualityOperator(childOperator))
-    } else {
-      false
-    }
-  }
-
-  let hasAttributes = attrs => List.exists(attr =>
-      switch attr {
-      | ({Location.txt: "bs" | "res.ternary" | "res.braces"}, _) => false
-      | _ => true
-      }
-    , attrs)
-
-  let isArrayAccess = expr =>
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Ldot(Lident("Array"), "get")})},
-        list{(Nolabel, _parentExpr), (Nolabel, _memberExpr)},
-      ) => true
-    | _ => false
-    }
-
-  let rec hasTernaryAttribute = attrs =>
-    switch attrs {
-    | list{} => false
-    | list{({Location.txt: "res.ternary"}, _), ..._} => true
-    | list{_, ...attrs} => hasTernaryAttribute(attrs)
-    }
-
-  let isTernaryExpr = expr =>
-    switch expr {
-    | {pexp_attributes: attrs, pexp_desc: Pexp_ifthenelse(_)}
-      when hasTernaryAttribute(attrs) => true
-    | _ => false
-    }
-
-  let collectTernaryParts = expr => {
-    let rec collect = (acc, expr) =>
-      switch expr {
-      | {pexp_attributes: attrs, pexp_desc: Pexp_ifthenelse(condition, consequent, Some(alternate))}
-        when hasTernaryAttribute(attrs) =>
-        collect(list{(condition, consequent), ...acc}, alternate)
-      | alternate => (List.rev(acc), alternate)
-      }
-
-    collect(list{}, expr)
-  }
-
-  let parametersShouldHug = parameters =>
-    switch parameters {
-    | list{Parameter({attrs: list{}, lbl: Asttypes.Nolabel, defaultExpr: None, pat})}
-      when isHuggablePattern(pat) => true
-    | _ => false
-    }
-
-  let filterTernaryAttributes = attrs => List.filter(attr =>
-      switch attr {
-      | ({Location.txt: "res.ternary"}, _) => false
-      | _ => true
-      }
-    , attrs)
-
-  let isJsxExpression = expr => {
-    let rec loop = attrs =>
-      switch attrs {
-      | list{} => false
-      | list{({Location.txt: "JSX"}, _), ..._} => true
-      | list{_, ...attrs} => loop(attrs)
-      }
-
-    switch expr.pexp_desc {
-    | Pexp_apply(_) => loop(expr.Parsetree.pexp_attributes)
-    | _ => false
-    }
-  }
-
-  let hasJsxAttribute = attributes =>
-    switch attributes {
-    | list{({Location.txt: "JSX"}, _), ..._} => true
-    | _ => false
-    }
-
-  let shouldIndentBinaryExpr = expr => {
-    let samePrecedenceSubExpression = (operator, subExpression) =>
-      switch subExpression {
-      | {
-          pexp_desc:
-            Pexp_apply(
-              {pexp_desc: Pexp_ident({txt: Longident.Lident(subOperator)})},
-              list{(Nolabel, _lhs), (Nolabel, _rhs)},
-            ),
-        } when isBinaryOperator(subOperator) =>
-        flattenableOperators(operator, subOperator)
-      | _ => true
-      }
-
-    switch expr {
-    | {
-        pexp_desc:
-          Pexp_apply(
-            {pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})},
-            list{(Nolabel, lhs), (Nolabel, _rhs)},
-          ),
-      } when isBinaryOperator(operator) =>
-      isEqualityOperator(operator) ||
-      (!samePrecedenceSubExpression(operator, lhs) ||
-      operator == ":=")
-    | _ => false
-    }
-  }
-
-  let shouldInlineRhsBinaryExpr = rhs =>
-    switch rhs.pexp_desc {
-    | Parsetree.Pexp_constant(_)
-    | Pexp_let(_)
-    | Pexp_letmodule(_)
-    | Pexp_letexception(_)
-    | Pexp_sequence(_)
-    | Pexp_open(_)
-    | Pexp_ifthenelse(_)
-    | Pexp_for(_)
-    | Pexp_while(_)
-    | Pexp_try(_)
-    | Pexp_array(_)
-    | Pexp_record(_) => true
-    | _ => false
-    }
-
-  let filterPrinteableAttributes = attrs => List.filter(attr =>
-      switch attr {
-      | ({Location.txt: "bs" | "res.ternary"}, _) => false
-      | _ => true
-      }
-    , attrs)
-
-  let partitionPrinteableAttributes = attrs => List.partition(attr =>
-      switch attr {
-      | ({Location.txt: "bs" | "res.ternary"}, _) => false
-      | _ => true
-      }
-    , attrs)
-
-  let requiresSpecialCallbackPrintingLastArg = args => {
-    let rec loop = args =>
-      switch args {
-      | list{} => false
-      | list{(_, {pexp_desc: Pexp_fun(_) | Pexp_newtype(_)})} => true
-      | list{(_, {pexp_desc: Pexp_fun(_) | Pexp_newtype(_)}), ..._} => false
-      | list{_, ...rest} => loop(rest)
-      }
-
-    loop(args)
-  }
-
-  let requiresSpecialCallbackPrintingFirstArg = args => {
-    let rec loop = args =>
-      switch args {
-      | list{} => true
-      | list{(_, {pexp_desc: Pexp_fun(_) | Pexp_newtype(_)}), ..._} => false
-      | list{_, ...rest} => loop(rest)
-      }
-
-    switch args {
-    | list{(_, {pexp_desc: Pexp_fun(_) | Pexp_newtype(_)})} => false
-    | list{(_, {pexp_desc: Pexp_fun(_) | Pexp_newtype(_)}), ...rest} => loop(rest)
-    | _ => false
-    }
-  }
-
-  let modExprApply = modExpr => {
-    let rec loop = (acc, modExpr) =>
-      switch modExpr {
-      | {pmod_desc: Pmod_apply(next, arg)} => loop(list{arg, ...acc}, next)
-      | _ => (acc, modExpr)
-      }
-
-    loop(list{}, modExpr)
-  }
-
-  let modExprFunctor = modExpr => {
-    let rec loop = (acc, modExpr) =>
-      switch modExpr {
-      | {pmod_desc: Pmod_functor(lbl, modType, returnModExpr), pmod_attributes: attrs} =>
-        let param = (attrs, lbl, modType)
-        loop(list{param, ...acc}, returnModExpr)
-      | returnModExpr => (List.rev(acc), returnModExpr)
-      }
-
-    loop(list{}, modExpr)
-  }
-
-  let splitGenTypeAttr = attrs =>
-    switch attrs {
-    | list{({Location.txt: "genType"}, _), ...attrs} => (true, attrs)
-    | attrs => (false, attrs)
-    }
-
-  let rec collectPatternsFromListConstruct = (acc, pattern) => {
-    open Parsetree
-    switch pattern.ppat_desc {
-    | Ppat_construct(
-        {txt: Longident.Lident("::")},
-        Some({ppat_desc: Ppat_tuple(list{pat, rest})}),
-      ) =>
-      collectPatternsFromListConstruct(list{pat, ...acc}, rest)
-    | _ => (List.rev(acc), pattern)
-    }
-  }
-
-  let rec isTemplateLiteral = expr => {
-    let isPexpConstantString = expr =>
-      switch expr.pexp_desc {
-      | Pexp_constant(Pconst_string(_, Some(_))) => true
-      | _ => false
-      }
-
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident("^")})},
-        list{(Nolabel, arg1), (Nolabel, arg2)},
-      ) when !(isPexpConstantString(arg1) && isPexpConstantString(arg2)) =>
-      isTemplateLiteral(arg1) || isTemplateLiteral(arg2)
-    | Pexp_constant(Pconst_string(_, Some(_))) => true
-    | _ => false
-    }
-  }
-
-  /* Blue | Red | Green -> [Blue; Red; Green] */
-  let collectOrPatternChain = pat => {
-    let rec loop = (pattern, chain) =>
-      switch pattern.ppat_desc {
-      | Ppat_or(left, right) => loop(left, list{right, ...chain})
-      | _ => list{pattern, ...chain}
-      }
-
-    loop(pat, list{})
-  }
-
-  let isPipeExpr = expr =>
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident("|." | "|>")})},
-        list{(Nolabel, _operand1), (Nolabel, _operand2)},
-      ) => true
-    | _ => false
-    }
-
-  let extractValueDescriptionFromModExpr = modExpr => {
-    let rec loop = (structure, acc) =>
-      switch structure {
-      | list{} => List.rev(acc)
-      | list{structureItem, ...structure} =>
-        switch structureItem.Parsetree.pstr_desc {
-        | Pstr_primitive(vd) => loop(structure, list{vd, ...acc})
-        | _ => loop(structure, acc)
-        }
-      }
-
-    switch modExpr.pmod_desc {
-    | Pmod_structure(structure) => loop(structure, list{})
-    | _ => list{}
-    }
-  }
-
-  type jsImportScope =
-    | JsGlobalImport /* nothing */
-    | JsModuleImport(string) /* from "path" */
-    | JsScopedImport(list<string>) /* window.location */
-
-  let classifyJsImport = valueDescription => {
-    let rec loop = attrs => {
-      open Parsetree
-      switch attrs {
-      | list{} => JsGlobalImport
-      | list{
-          (
-            {Location.txt: "bs.scope"},
-            PStr(list{{pstr_desc: Pstr_eval({pexp_desc: Pexp_constant(Pconst_string(s, _))}, _)}}),
-          ),
-          ..._,
-        } =>
-        JsScopedImport(list{s})
-      | list{
-          (
-            {Location.txt: "genType.import"},
-            PStr(list{{pstr_desc: Pstr_eval({pexp_desc: Pexp_constant(Pconst_string(s, _))}, _)}}),
-          ),
-          ..._,
-        } =>
-        JsModuleImport(s)
-      | list{
-          (
-            {Location.txt: "bs.scope"},
-            PStr(list{{pstr_desc: Pstr_eval({pexp_desc: Pexp_tuple(exprs)}, _)}}),
-          ),
-          ..._,
-        } =>
-        let scopes = List.fold_left((acc, curr) =>
-          switch curr.Parsetree.pexp_desc {
-          | Pexp_constant(Pconst_string(s, _)) => list{s, ...acc}
-          | _ => acc
-          }
-        , list{}, exprs)
-
-        JsScopedImport(List.rev(scopes))
-      | list{_, ...attrs} => loop(attrs)
-      }
-    }
-
-    loop(valueDescription.pval_attributes)
-  }
-
-  let isUnderscoreApplySugar = expr =>
-    switch expr.pexp_desc {
-    | Pexp_fun(
-        Nolabel,
-        None,
-        {ppat_desc: Ppat_var({txt: "__x"})},
-        {pexp_desc: Pexp_apply(_)},
-      ) => true
-    | _ => false
-    }
-}
-
-module Parens: {
-  type kind = Parenthesized | Braced(Location.t) | Nothing
-
-  let expr: Parsetree.expression => kind
-  let structureExpr: Parsetree.expression => kind
-
-  let unaryExprOperand: Parsetree.expression => kind
-
-  let binaryExprOperand: (~isLhs: bool, Parsetree.expression) => kind
-  let subBinaryExprOperand: (string, string) => bool
-  let rhsBinaryExprOperand: (string, Parsetree.expression) => bool
-  let flattenOperandRhs: (string, Parsetree.expression) => bool
-
-  let lazyOrAssertExprRhs: Parsetree.expression => kind
-
-  let fieldExpr: Parsetree.expression => kind
-
-  let setFieldExprRhs: Parsetree.expression => kind
-
-  let ternaryOperand: Parsetree.expression => kind
-
-  let jsxPropExpr: Parsetree.expression => kind
-  let jsxChildExpr: Parsetree.expression => kind
-
-  let binaryExpr: Parsetree.expression => kind
-  let modTypeFunctorReturn: Parsetree.module_type => bool
-  let modTypeWithOperand: Parsetree.module_type => bool
-  let modExprFunctorConstraint: Parsetree.module_type => bool
-
-  let bracedExpr: Parsetree.expression => bool
-  let callExpr: Parsetree.expression => kind
-
-  let includeModExpr: Parsetree.module_expr => bool
-} = {
-  type kind = Parenthesized | Braced(Location.t) | Nothing
-
-  let expr = expr => {
-    let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-    switch optBraces {
-    | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-    | _ =>
-      switch expr {
-      | {
-          Parsetree.pexp_desc:
-            Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)}),
-        } =>
-        Nothing
-      | {pexp_desc: Pexp_constraint(_)} => Parenthesized
-      | _ => Nothing
-      }
-    }
-  }
-
-  let callExpr = expr => {
-    let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-    switch optBraces {
-    | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-    | _ =>
-      switch expr {
-      | {Parsetree.pexp_attributes: attrs}
-        when switch ParsetreeViewer.filterParsingAttrs(attrs) {
-        | list{_, ..._} => true
-        | list{} => false
-        } =>
-        Parenthesized
-      | _
-        when ParsetreeViewer.isUnaryExpression(expr) || ParsetreeViewer.isBinaryExpression(expr) =>
-        Parenthesized
-      | {
-          Parsetree.pexp_desc:
-            Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)}),
-        } =>
-        Nothing
-      | {pexp_desc: Pexp_fun(_)} when ParsetreeViewer.isUnderscoreApplySugar(expr) => Nothing
-      | {
-          pexp_desc:
-            Pexp_lazy(_)
-            | Pexp_assert(_)
-            | Pexp_fun(_)
-            | Pexp_newtype(_)
-            | Pexp_function(_)
-            | Pexp_constraint(_)
-            | Pexp_setfield(_)
-            | Pexp_match(_)
-            | Pexp_try(_)
-            | Pexp_while(_)
-            | Pexp_for(_)
-            | Pexp_ifthenelse(_),
-        } =>
-        Parenthesized
-      | _ => Nothing
-      }
-    }
-  }
-
-  let structureExpr = expr => {
-    let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-    switch optBraces {
-    | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-    | None =>
-      switch expr {
-      | _
-        when ParsetreeViewer.hasAttributes(expr.pexp_attributes) &&
-        !ParsetreeViewer.isJsxExpression(expr) =>
-        Parenthesized
-      | {
-          Parsetree.pexp_desc:
-            Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)}),
-        } =>
-        Nothing
-      | {pexp_desc: Pexp_constraint(_)} => Parenthesized
-      | _ => Nothing
-      }
-    }
-  }
-
-  let unaryExprOperand = expr => {
-    let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-    switch optBraces {
-    | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-    | None =>
-      switch expr {
-      | {Parsetree.pexp_attributes: attrs}
-        when switch ParsetreeViewer.filterParsingAttrs(attrs) {
-        | list{_, ..._} => true
-        | list{} => false
-        } =>
-        Parenthesized
-      | expr
-        when ParsetreeViewer.isUnaryExpression(expr) || ParsetreeViewer.isBinaryExpression(expr) =>
-        Parenthesized
-      | {pexp_desc: Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)})} =>
-        Nothing
-      | {pexp_desc: Pexp_fun(_)} when ParsetreeViewer.isUnderscoreApplySugar(expr) => Nothing
-      | {
-          pexp_desc:
-            Pexp_lazy(_)
-            | Pexp_assert(_)
-            | Pexp_fun(_)
-            | Pexp_newtype(_)
-            | Pexp_function(_)
-            | Pexp_constraint(_)
-            | Pexp_setfield(_)
-            | Pexp_extension(_)
-            | Pexp_match(_)
-            | Pexp_try(_)
-            | Pexp_while(_)
-            | Pexp_for(_)
-            | Pexp_ifthenelse(_),
-        } =>
-        Parenthesized
-      | _ => Nothing
-      }
-    }
-  }
-
-  let binaryExprOperand = (~isLhs, expr) => {
-    let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-    switch optBraces {
-    | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-    | None =>
-      switch expr {
-      | {
-          Parsetree.pexp_desc:
-            Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)}),
-        } =>
-        Nothing
-      | {pexp_desc: Pexp_fun(_)} when ParsetreeViewer.isUnderscoreApplySugar(expr) => Nothing
-      | {pexp_desc: Pexp_constraint(_) | Pexp_fun(_) | Pexp_function(_) | Pexp_newtype(_)} =>
-        Parenthesized
-      | expr when ParsetreeViewer.isBinaryExpression(expr) => Parenthesized
-      | expr when ParsetreeViewer.isTernaryExpr(expr) => Parenthesized
-      | {pexp_desc: Pexp_lazy(_) | Pexp_assert(_)} when isLhs => Parenthesized
-      | _ => Nothing
-      }
-    }
-  }
-
-  let subBinaryExprOperand = (parentOperator, childOperator) => {
-    let precParent = ParsetreeViewer.operatorPrecedence(parentOperator)
-    let precChild = ParsetreeViewer.operatorPrecedence(childOperator)
-    precParent > precChild ||
-      ((precParent === precChild &&
-        !ParsetreeViewer.flattenableOperators(parentOperator, childOperator)) ||
-      /* a && b || c, add parens to (a && b) for readability, who knows the difference by heart… */
-      parentOperator == "||" && childOperator == "&&")
-  }
-
-  let rhsBinaryExprOperand = (parentOperator, rhs) =>
-    switch rhs.Parsetree.pexp_desc {
-    | Parsetree.Pexp_apply(
-        {pexp_attributes: list{}, pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})},
-        list{(_, _left), (_, _right)},
-      ) when ParsetreeViewer.isBinaryOperator(operator) =>
-      let precParent = ParsetreeViewer.operatorPrecedence(parentOperator)
-      let precChild = ParsetreeViewer.operatorPrecedence(operator)
-      precParent === precChild
-    | _ => false
-    }
-
-  let flattenOperandRhs = (parentOperator, rhs) =>
-    switch rhs.Parsetree.pexp_desc {
-    | Parsetree.Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})},
-        list{(_, _left), (_, _right)},
-      ) when ParsetreeViewer.isBinaryOperator(operator) =>
-      let precParent = ParsetreeViewer.operatorPrecedence(parentOperator)
-      let precChild = ParsetreeViewer.operatorPrecedence(operator)
-      precParent >= precChild || rhs.pexp_attributes != list{}
-    | Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)}) => false
-    | Pexp_fun(_) when ParsetreeViewer.isUnderscoreApplySugar(rhs) => false
-    | Pexp_fun(_) | Pexp_newtype(_) | Pexp_setfield(_) | Pexp_constraint(_) => true
-    | _ when ParsetreeViewer.isTernaryExpr(rhs) => true
-    | _ => false
-    }
-
-  let lazyOrAssertExprRhs = expr => {
-    let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-    switch optBraces {
-    | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-    | None =>
-      switch expr {
-      | {Parsetree.pexp_attributes: attrs}
-        when switch ParsetreeViewer.filterParsingAttrs(attrs) {
-        | list{_, ..._} => true
-        | list{} => false
-        } =>
-        Parenthesized
-      | expr when ParsetreeViewer.isBinaryExpression(expr) => Parenthesized
-      | {pexp_desc: Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)})} =>
-        Nothing
-      | {pexp_desc: Pexp_fun(_)} when ParsetreeViewer.isUnderscoreApplySugar(expr) => Nothing
-      | {
-          pexp_desc:
-            Pexp_lazy(_)
-            | Pexp_assert(_)
-            | Pexp_fun(_)
-            | Pexp_newtype(_)
-            | Pexp_function(_)
-            | Pexp_constraint(_)
-            | Pexp_setfield(_)
-            | Pexp_match(_)
-            | Pexp_try(_)
-            | Pexp_while(_)
-            | Pexp_for(_)
-            | Pexp_ifthenelse(_),
-        } =>
-        Parenthesized
-      | _ => Nothing
-      }
-    }
-  }
-
-  let isNegativeConstant = constant => {
-    let isNeg = txt => {
-      let len = String.length(txt)
-      len > 0 && (@doesNotRaise String.get)(txt, 0) == '-'
-    }
-
-    switch constant {
-    | Parsetree.Pconst_integer(i, _) | Pconst_float(i, _) when isNeg(i) => true
-    | _ => false
-    }
-  }
-
-  let fieldExpr = expr => {
-    let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-    switch optBraces {
-    | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-    | None =>
-      switch expr {
-      | {Parsetree.pexp_attributes: attrs}
-        when switch ParsetreeViewer.filterParsingAttrs(attrs) {
-        | list{_, ..._} => true
-        | list{} => false
-        } =>
-        Parenthesized
-      | expr
-        when ParsetreeViewer.isBinaryExpression(expr) || ParsetreeViewer.isUnaryExpression(expr) =>
-        Parenthesized
-      | {pexp_desc: Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)})} =>
-        Nothing
-      | {pexp_desc: Pexp_constant(c)} when isNegativeConstant(c) => Parenthesized
-      | {pexp_desc: Pexp_fun(_)} when ParsetreeViewer.isUnderscoreApplySugar(expr) => Nothing
-      | {
-          pexp_desc:
-            Pexp_lazy(_)
-            | Pexp_assert(_)
-            | Pexp_extension(_)
-            | Pexp_fun(_)
-            | Pexp_newtype(_)
-            | Pexp_function(_)
-            | Pexp_constraint(_)
-            | Pexp_setfield(_)
-            | Pexp_match(_)
-            | Pexp_try(_)
-            | Pexp_while(_)
-            | Pexp_for(_)
-            | Pexp_ifthenelse(_),
-        } =>
-        Parenthesized
-      | _ => Nothing
-      }
-    }
-  }
-
-  let setFieldExprRhs = expr => {
-    let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-    switch optBraces {
-    | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-    | None =>
-      switch expr {
-      | {
-          Parsetree.pexp_desc:
-            Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)}),
-        } =>
-        Nothing
-      | {pexp_desc: Pexp_constraint(_)} => Parenthesized
-      | _ => Nothing
-      }
-    }
-  }
-
-  let ternaryOperand = expr => {
-    let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-    switch optBraces {
-    | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-    | None =>
-      switch expr {
-      | {
-          Parsetree.pexp_desc:
-            Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)}),
-        } =>
-        Nothing
-      | {pexp_desc: Pexp_constraint(_)} => Parenthesized
-      | {pexp_desc: Pexp_fun(_) | Pexp_newtype(_)} =>
-        let (_attrsOnArrow, _parameters, returnExpr) = ParsetreeViewer.funExpr(expr)
-        switch returnExpr.pexp_desc {
-        | Pexp_constraint(_) => Parenthesized
-        | _ => Nothing
-        }
-      | _ => Nothing
-      }
-    }
-  }
-
-  let startsWithMinus = txt => {
-    let len = String.length(txt)
-    if len === 0 {
-      false
-    } else {
-      let s = (@doesNotRaise String.get)(txt, 0)
-      s == '-'
-    }
-  }
-
-  let jsxPropExpr = expr =>
-    switch expr.Parsetree.pexp_desc {
-    | Parsetree.Pexp_let(_)
-    | Pexp_sequence(_)
-    | Pexp_letexception(_)
-    | Pexp_letmodule(_)
-    | Pexp_open(_) =>
-      Nothing
-    | _ =>
-      let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-      switch optBraces {
-      | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-      | None =>
-        switch expr {
-        | {
-            Parsetree.pexp_desc: Pexp_constant(Pconst_integer(x, _) | Pconst_float(x, _)),
-            pexp_attributes: list{},
-          } when startsWithMinus(x) =>
-          Parenthesized
-        | {
-            Parsetree.pexp_desc:
-              Pexp_ident(_)
-              | Pexp_constant(_)
-              | Pexp_field(_)
-              | Pexp_construct(_)
-              | Pexp_variant(_)
-              | Pexp_array(_)
-              | Pexp_pack(_)
-              | Pexp_record(_)
-              | Pexp_extension(_)
-              | Pexp_letmodule(_)
-              | Pexp_letexception(_)
-              | Pexp_open(_)
-              | Pexp_sequence(_)
-              | Pexp_let(_)
-              | Pexp_tuple(_),
-            pexp_attributes: list{},
-          } =>
-          Nothing
-        | {
-            Parsetree.pexp_desc:
-              Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)}),
-            pexp_attributes: list{},
-          } =>
-          Nothing
-        | _ => Parenthesized
-        }
-      }
-    }
-
-  let jsxChildExpr = expr =>
-    switch expr.Parsetree.pexp_desc {
-    | Parsetree.Pexp_let(_)
-    | Pexp_sequence(_)
-    | Pexp_letexception(_)
-    | Pexp_letmodule(_)
-    | Pexp_open(_) =>
-      Nothing
-    | _ =>
-      let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-      switch optBraces {
-      | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-      | _ =>
-        switch expr {
-        | {
-            Parsetree.pexp_desc: Pexp_constant(Pconst_integer(x, _) | Pconst_float(x, _)),
-            pexp_attributes: list{},
-          } when startsWithMinus(x) =>
-          Parenthesized
-        | {
-            Parsetree.pexp_desc:
-              Pexp_ident(_)
-              | Pexp_constant(_)
-              | Pexp_field(_)
-              | Pexp_construct(_)
-              | Pexp_variant(_)
-              | Pexp_array(_)
-              | Pexp_pack(_)
-              | Pexp_record(_)
-              | Pexp_extension(_)
-              | Pexp_letmodule(_)
-              | Pexp_letexception(_)
-              | Pexp_open(_)
-              | Pexp_sequence(_)
-              | Pexp_let(_),
-            pexp_attributes: list{},
-          } =>
-          Nothing
-        | {
-            Parsetree.pexp_desc:
-              Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)}),
-            pexp_attributes: list{},
-          } =>
-          Nothing
-        | expr when ParsetreeViewer.isJsxExpression(expr) => Nothing
-        | _ => Parenthesized
-        }
-      }
-    }
-
-  let binaryExpr = expr => {
-    let (optBraces, _) = ParsetreeViewer.processBracesAttr(expr)
-    switch optBraces {
-    | Some({Location.loc: bracesLoc}, _) => Braced(bracesLoc)
-    | None =>
-      switch expr {
-      | {Parsetree.pexp_attributes: list{_, ..._}} as expr
-        when ParsetreeViewer.isBinaryExpression(expr) =>
-        Parenthesized
-      | _ => Nothing
-      }
-    }
-  }
-
-  let modTypeFunctorReturn = modType =>
-    switch modType {
-    | {Parsetree.pmty_desc: Pmty_with(_)} => true
-    | _ => false
-    }
-
-  /* Add parens for readability:
-       module type Functor = SetLike => Set with type t = A.t
-     This is actually:
-       module type Functor = (SetLike => Set) with type t = A.t
- */
-  let modTypeWithOperand = modType =>
-    switch modType {
-    | {Parsetree.pmty_desc: Pmty_functor(_)} => true
-    | _ => false
-    }
-
-  let modExprFunctorConstraint = modType =>
-    switch modType {
-    | {Parsetree.pmty_desc: Pmty_functor(_) | Pmty_with(_)} => true
-    | _ => false
-    }
-
-  let bracedExpr = expr =>
-    switch expr.Parsetree.pexp_desc {
-    | Pexp_constraint({pexp_desc: Pexp_pack(_)}, {ptyp_desc: Ptyp_package(_)}) => false
-    | Pexp_constraint(_) => true
-    | _ => false
-    }
-
-  let includeModExpr = modExpr =>
-    switch modExpr.Parsetree.pmod_desc {
-    | Parsetree.Pmod_constraint(_) => true
-    | _ => false
-    }
-}
-
-module CommentTable = {
-  type t = {
-    leading: Hashtbl.t<Location.t, list<Comment.t>>,
-    inside: Hashtbl.t<Location.t, list<Comment.t>>,
-    trailing: Hashtbl.t<Location.t, list<Comment.t>>,
-  }
-
-  let make = () => {
-    leading: Hashtbl.create(100),
-    inside: Hashtbl.create(100),
-    trailing: Hashtbl.create(100),
-  }
-
-  let empty = make()
-
-  @live
-  let log = t => {
-    open Location
-    let leadingStuff = Hashtbl.fold((k: Location.t, v: list<Comment.t>, acc) => {
-      let loc = Doc.concat(list{
-        Doc.lbracket,
-        Doc.text(string_of_int(k.loc_start.pos_lnum)),
-        Doc.text(":"),
-        Doc.text(string_of_int(k.loc_start.pos_cnum - k.loc_start.pos_bol)),
-        Doc.text("-"),
-        Doc.text(string_of_int(k.loc_end.pos_lnum)),
-        Doc.text(":"),
-        Doc.text(string_of_int(k.loc_end.pos_cnum - k.loc_end.pos_bol)),
-        Doc.rbracket,
-      })
-      let doc = Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list{
-          loc,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.line,
-              Doc.join(~sep=Doc.comma, List.map(c => Doc.text(Comment.txt(c)), v)),
-            }),
-          ),
-          Doc.line,
-        }),
-      )
-      list{doc, ...acc}
-    }, t.leading, list{})
-
-    let trailingStuff = Hashtbl.fold((k: Location.t, v: list<Comment.t>, acc) => {
-      let loc = Doc.concat(list{
-        Doc.lbracket,
-        Doc.text(string_of_int(k.loc_start.pos_lnum)),
-        Doc.text(":"),
-        Doc.text(string_of_int(k.loc_start.pos_cnum - k.loc_start.pos_bol)),
-        Doc.text("-"),
-        Doc.text(string_of_int(k.loc_end.pos_lnum)),
-        Doc.text(":"),
-        Doc.text(string_of_int(k.loc_end.pos_cnum - k.loc_end.pos_bol)),
-        Doc.rbracket,
-      })
-      let doc = Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list{
-          loc,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.line,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(c => Doc.text(Comment.txt(c)), v),
-              ),
-            }),
-          ),
-          Doc.line,
-        }),
-      )
-      list{doc, ...acc}
-    }, t.trailing, list{})
-
-    Doc.breakableGroup(
-      ~forceBreak=true,
-      Doc.concat(list{
-        Doc.text("leading comments:"),
-        Doc.line,
-        Doc.indent(Doc.concat(leadingStuff)),
-        Doc.line,
-        Doc.line,
-        Doc.text("trailing comments:"),
-        Doc.indent(Doc.concat(trailingStuff)),
-        Doc.line,
-        Doc.line,
-      }),
-    )
-    |> Doc.toString(~width=80)
-    |> print_endline
-  }
-  let attach = (tbl, loc, comments) =>
-    switch comments {
-    | list{} => ()
-    | comments => Hashtbl.replace(tbl, loc, comments)
-    }
-
-  let partitionByLoc = (comments, loc) => {
-    let rec loop = ((leading, inside, trailing), comments) => {
-      open Location
-      switch comments {
-      | list{comment, ...rest} =>
-        let cmtLoc = Comment.loc(comment)
-        if cmtLoc.loc_end.pos_cnum <= loc.loc_start.pos_cnum {
-          loop((list{comment, ...leading}, inside, trailing), rest)
-        } else if cmtLoc.loc_start.pos_cnum >= loc.loc_end.pos_cnum {
-          loop((leading, inside, list{comment, ...trailing}), rest)
-        } else {
-          loop((leading, list{comment, ...inside}, trailing), rest)
-        }
-      | list{} => (List.rev(leading), List.rev(inside), List.rev(trailing))
-      }
-    }
-
-    loop((list{}, list{}, list{}), comments)
-  }
-
-  let partitionLeadingTrailing = (comments, loc) => {
-    let rec loop = ((leading, trailing), comments) => {
-      open Location
-      switch comments {
-      | list{comment, ...rest} =>
-        let cmtLoc = Comment.loc(comment)
-        if cmtLoc.loc_end.pos_cnum <= loc.loc_start.pos_cnum {
-          loop((list{comment, ...leading}, trailing), rest)
-        } else {
-          loop((leading, list{comment, ...trailing}), rest)
-        }
-      | list{} => (List.rev(leading), List.rev(trailing))
-      }
-    }
-
-    loop((list{}, list{}), comments)
-  }
-
-  let partitionByOnSameLine = (loc, comments) => {
-    let rec loop = ((onSameLine, onOtherLine), comments) => {
-      open Location
-      switch comments {
-      | list{} => (List.rev(onSameLine), List.rev(onOtherLine))
-      | list{comment, ...rest} =>
-        let cmtLoc = Comment.loc(comment)
-        if cmtLoc.loc_start.pos_lnum === loc.loc_end.pos_lnum {
-          loop((list{comment, ...onSameLine}, onOtherLine), rest)
-        } else {
-          loop((onSameLine, list{comment, ...onOtherLine}), rest)
-        }
-      }
-    }
-
-    loop((list{}, list{}), comments)
-  }
-
-  let partitionAdjacentTrailing = (loc1, comments) => {
-    open Location
-    open Lexing
-    let rec loop = (~prevEndPos, afterLoc1, comments) =>
-      switch comments {
-      | list{} => (List.rev(afterLoc1), list{})
-      | list{comment, ...rest} as comments =>
-        let cmtPrevEndPos = Comment.prevTokEndPos(comment)
-        if prevEndPos.Lexing.pos_cnum === cmtPrevEndPos.pos_cnum {
-          let commentEnd = Comment.loc(comment).loc_end
-          loop(~prevEndPos=commentEnd, list{comment, ...afterLoc1}, rest)
-        } else {
-          (List.rev(afterLoc1), comments)
-        }
-      }
-
-    loop(~prevEndPos=loc1.loc_end, list{}, comments)
-  }
-
-  let rec collectListPatterns = (acc, pattern) => {
-    open Parsetree
-    switch pattern.ppat_desc {
-    | Ppat_construct(
-        {txt: Longident.Lident("::")},
-        Some({ppat_desc: Ppat_tuple(list{pat, rest})}),
-      ) =>
-      collectListPatterns(list{pat, ...acc}, rest)
-    | Ppat_construct({txt: Longident.Lident("[]")}, None) => List.rev(acc)
-    | _ => List.rev(list{pattern, ...acc})
-    }
-  }
-
-  let rec collectListExprs = (acc, expr) => {
-    open Parsetree
-    switch expr.pexp_desc {
-    | Pexp_construct(
-        {txt: Longident.Lident("::")},
-        Some({pexp_desc: Pexp_tuple(list{expr, rest})}),
-      ) =>
-      collectListExprs(list{expr, ...acc}, rest)
-    | Pexp_construct({txt: Longident.Lident("[]")}, _) => List.rev(acc)
-    | _ => List.rev(list{expr, ...acc})
-    }
-  }
-
-  /* TODO: use ParsetreeViewer */
-  let arrowType = ct => {
-    open Parsetree
-    let rec process = (attrsBefore, acc, typ) =>
-      switch typ {
-      | {ptyp_desc: Ptyp_arrow(Nolabel as lbl, typ1, typ2), ptyp_attributes: list{}} =>
-        let arg = (list{}, lbl, typ1)
-        process(attrsBefore, list{arg, ...acc}, typ2)
-      | {
-          ptyp_desc: Ptyp_arrow(Nolabel as lbl, typ1, typ2),
-          ptyp_attributes: list{({txt: "bs"}, _)} as attrs,
-        } =>
-        let arg = (attrs, lbl, typ1)
-        process(attrsBefore, list{arg, ...acc}, typ2)
-      | {ptyp_desc: Ptyp_arrow(Nolabel, _typ1, _typ2), ptyp_attributes: _attrs} as returnType =>
-        let args = List.rev(acc)
-        (attrsBefore, args, returnType)
-      | {
-          ptyp_desc: Ptyp_arrow((Labelled(_) | Optional(_)) as lbl, typ1, typ2),
-          ptyp_attributes: attrs,
-        } =>
-        let arg = (attrs, lbl, typ1)
-        process(attrsBefore, list{arg, ...acc}, typ2)
-      | typ => (attrsBefore, List.rev(acc), typ)
-      }
-
-    switch ct {
-    | {ptyp_desc: Ptyp_arrow(Nolabel, _typ1, _typ2), ptyp_attributes: attrs} as typ =>
-      process(attrs, list{}, {...typ, ptyp_attributes: list{}})
-    | typ => process(list{}, list{}, typ)
-    }
-  }
-
-  /* TODO: avoiding the dependency on ParsetreeViewer here, is this a good idea? */
-  let modExprApply = modExpr => {
-    let rec loop = (acc, modExpr) =>
-      switch modExpr {
-      | {Parsetree.pmod_desc: Pmod_apply(next, arg)} => loop(list{arg, ...acc}, next)
-      | _ => list{modExpr, ...acc}
-      }
-
-    loop(list{}, modExpr)
-  }
-
-  /* TODO: avoiding the dependency on ParsetreeViewer here, is this a good idea? */
-  let modExprFunctor = modExpr => {
-    let rec loop = (acc, modExpr) =>
-      switch modExpr {
-      | {Parsetree.pmod_desc: Pmod_functor(lbl, modType, returnModExpr), pmod_attributes: attrs} =>
-        let param = (attrs, lbl, modType)
-        loop(list{param, ...acc}, returnModExpr)
-      | returnModExpr => (List.rev(acc), returnModExpr)
-      }
-
-    loop(list{}, modExpr)
-  }
-
-  let functorType = modtype => {
-    let rec process = (acc, modtype) =>
-      switch modtype {
-      | {Parsetree.pmty_desc: Pmty_functor(lbl, argType, returnType), pmty_attributes: attrs} =>
-        let arg = (attrs, lbl, argType)
-        process(list{arg, ...acc}, returnType)
-      | modType => (List.rev(acc), modType)
-      }
-
-    process(list{}, modtype)
-  }
-
-  let funExpr = expr => {
-    open Parsetree
-    /* Turns (type t, type u, type z) into "type t u z" */
-    let rec collectNewTypes = (acc, returnExpr) =>
-      switch returnExpr {
-      | {pexp_desc: Pexp_newtype(stringLoc, returnExpr), pexp_attributes: list{}} =>
-        collectNewTypes(list{stringLoc, ...acc}, returnExpr)
-      | returnExpr =>
-        let loc = switch (acc, List.rev(acc)) {
-        | (list{_startLoc, ..._}, list{endLoc, ..._}) => {
-            ...endLoc.loc,
-            loc_end: endLoc.loc.loc_end,
-          }
-        | _ => Location.none
-        }
-
-        let txt = List.fold_right((curr, acc) => acc ++ (" " ++ curr.Location.txt), acc, "type")
-        (Location.mkloc(txt, loc), returnExpr)
-      }
-
-    /* For simplicity reason Pexp_newtype gets converted to a Nolabel parameter,
-     * otherwise this function would need to return a variant:
-     * | NormalParamater(...)
-     * | NewType(...)
-     * This complicates printing with an extra variant/boxing/allocation for a code-path
-     * that is not often used. Lets just keep it simple for now */
-    let rec collect = (attrsBefore, acc, expr) =>
-      switch expr {
-      | {pexp_desc: Pexp_fun(lbl, defaultExpr, pattern, returnExpr), pexp_attributes: list{}} =>
-        let parameter = (list{}, lbl, defaultExpr, pattern)
-        collect(attrsBefore, list{parameter, ...acc}, returnExpr)
-      | {pexp_desc: Pexp_newtype(stringLoc, rest), pexp_attributes: attrs} =>
-        let (var, returnExpr) = collectNewTypes(list{stringLoc}, rest)
-        let parameter = (attrs, Asttypes.Nolabel, None, Ast_helper.Pat.var(~loc=stringLoc.loc, var))
-        collect(attrsBefore, list{parameter, ...acc}, returnExpr)
-      | {
-          pexp_desc: Pexp_fun(lbl, defaultExpr, pattern, returnExpr),
-          pexp_attributes: list{({txt: "bs"}, _)} as attrs,
-        } =>
-        let parameter = (attrs, lbl, defaultExpr, pattern)
-        collect(attrsBefore, list{parameter, ...acc}, returnExpr)
-      | {
-          pexp_desc: Pexp_fun((Labelled(_) | Optional(_)) as lbl, defaultExpr, pattern, returnExpr),
-          pexp_attributes: attrs,
-        } =>
-        let parameter = (attrs, lbl, defaultExpr, pattern)
-        collect(attrsBefore, list{parameter, ...acc}, returnExpr)
-      | expr => (attrsBefore, List.rev(acc), expr)
-      }
-
-    switch expr {
-    | {
-        pexp_desc: Pexp_fun(Nolabel, _defaultExpr, _pattern, _returnExpr),
-        pexp_attributes: attrs,
-      } as expr =>
-      collect(attrs, list{}, {...expr, pexp_attributes: list{}})
-    | expr => collect(list{}, list{}, expr)
-    }
-  }
-
-  let rec isBlockExpr = expr => {
-    open Parsetree
-    switch expr.pexp_desc {
-    | Pexp_letmodule(_)
-    | Pexp_letexception(_)
-    | Pexp_let(_)
-    | Pexp_open(_)
-    | Pexp_sequence(_) => true
-    | Pexp_apply(callExpr, _) when isBlockExpr(callExpr) => true
-    | Pexp_constraint(expr, _) when isBlockExpr(expr) => true
-    | Pexp_field(expr, _) when isBlockExpr(expr) => true
-    | Pexp_setfield(expr, _, _) when isBlockExpr(expr) => true
-    | _ => false
-    }
-  }
-
-  let rec walkStructure = (s, t, comments) =>
-    switch s {
-    | _ when comments == list{} => ()
-    | list{} => attach(t.inside, Location.none, comments)
-    | s => walkList(~getLoc=n => n.Parsetree.pstr_loc, ~walkNode=walkStructureItem, s, t, comments)
-    }
-
-  and walkStructureItem = (si, t, comments) =>
-    switch si.Parsetree.pstr_desc {
-    | _ when comments == list{} => ()
-    | Pstr_primitive(valueDescription) => walkValueDescription(valueDescription, t, comments)
-    | Pstr_open(openDescription) => walkOpenDescription(openDescription, t, comments)
-    | Pstr_value(_, valueBindings) => walkValueBindings(valueBindings, t, comments)
-    | Pstr_type(_, typeDeclarations) => walkTypeDeclarations(typeDeclarations, t, comments)
-    | Pstr_eval(expr, _) => walkExpr(expr, t, comments)
-    | Pstr_module(moduleBinding) => walkModuleBinding(moduleBinding, t, comments)
-    | Pstr_recmodule(moduleBindings) =>
-      walkList(
-        ~getLoc=mb => mb.Parsetree.pmb_loc,
-        ~walkNode=walkModuleBinding,
-        moduleBindings,
-        t,
-        comments,
-      )
-    | Pstr_modtype(modTypDecl) => walkModuleTypeDeclaration(modTypDecl, t, comments)
-    | Pstr_attribute(attribute) => walkAttribute(attribute, t, comments)
-    | Pstr_extension(extension, _) => walkExtension(extension, t, comments)
-    | Pstr_include(includeDeclaration) => walkIncludeDeclaration(includeDeclaration, t, comments)
-    | Pstr_exception(extensionConstructor) => walkExtConstr(extensionConstructor, t, comments)
-    | Pstr_typext(typeExtension) => walkTypeExtension(typeExtension, t, comments)
-    | Pstr_class_type(_) | Pstr_class(_) => ()
-    }
-
-  and walkValueDescription = (vd, t, comments) => {
-    let (leading, trailing) = partitionLeadingTrailing(comments, vd.pval_name.loc)
-    attach(t.leading, vd.pval_name.loc, leading)
-    let (afterName, rest) = partitionAdjacentTrailing(vd.pval_name.loc, trailing)
-    attach(t.trailing, vd.pval_name.loc, afterName)
-    let (before, inside, after) = partitionByLoc(rest, vd.pval_type.ptyp_loc)
-
-    attach(t.leading, vd.pval_type.ptyp_loc, before)
-    walkTypExpr(vd.pval_type, t, inside)
-    attach(t.trailing, vd.pval_type.ptyp_loc, after)
-  }
-
-  and walkTypeExtension = (te, t, comments) => {
-    let (leading, trailing) = partitionLeadingTrailing(comments, te.ptyext_path.loc)
-    attach(t.leading, te.ptyext_path.loc, leading)
-    let (afterPath, rest) = partitionAdjacentTrailing(te.ptyext_path.loc, trailing)
-    attach(t.trailing, te.ptyext_path.loc, afterPath)
-
-    /* type params */
-    let rest = switch te.ptyext_params {
-    | list{} => rest
-    | typeParams =>
-      visitListButContinueWithRemainingComments(
-        ~getLoc=((typexpr, _variance)) => typexpr.Parsetree.ptyp_loc,
-        ~walkNode=walkTypeParam,
-        ~newlineDelimited=false,
-        typeParams,
-        t,
-        rest,
-      )
-    }
-
-    walkList(
-      ~getLoc=n => n.Parsetree.pext_loc,
-      ~walkNode=walkExtConstr,
-      te.ptyext_constructors,
-      t,
-      rest,
-    )
-  }
-
-  and walkIncludeDeclaration = (inclDecl, t, comments) => {
-    let (before, inside, after) = partitionByLoc(comments, inclDecl.pincl_mod.pmod_loc)
-    attach(t.leading, inclDecl.pincl_mod.pmod_loc, before)
-    walkModExpr(inclDecl.pincl_mod, t, inside)
-    attach(t.trailing, inclDecl.pincl_mod.pmod_loc, after)
-  }
-
-  and walkModuleTypeDeclaration = (mtd, t, comments) => {
-    let (leading, trailing) = partitionLeadingTrailing(comments, mtd.pmtd_name.loc)
-    attach(t.leading, mtd.pmtd_name.loc, leading)
-    switch mtd.pmtd_type {
-    | None => attach(t.trailing, mtd.pmtd_name.loc, trailing)
-    | Some(modType) =>
-      let (afterName, rest) = partitionAdjacentTrailing(mtd.pmtd_name.loc, trailing)
-      attach(t.trailing, mtd.pmtd_name.loc, afterName)
-      let (before, inside, after) = partitionByLoc(rest, modType.pmty_loc)
-      attach(t.leading, modType.pmty_loc, before)
-      walkModType(modType, t, inside)
-      attach(t.trailing, modType.pmty_loc, after)
-    }
-  }
-
-  and walkModuleBinding = (mb, t, comments) => {
-    let (leading, trailing) = partitionLeadingTrailing(comments, mb.pmb_name.loc)
-    attach(t.leading, mb.pmb_name.loc, leading)
-    let (afterName, rest) = partitionAdjacentTrailing(mb.pmb_name.loc, trailing)
-    attach(t.trailing, mb.pmb_name.loc, afterName)
-    let (leading, inside, trailing) = partitionByLoc(rest, mb.pmb_expr.pmod_loc)
-    switch mb.pmb_expr.pmod_desc {
-    | Pmod_constraint(_) => walkModExpr(mb.pmb_expr, t, List.concat(list{leading, inside}))
-    | _ =>
-      attach(t.leading, mb.pmb_expr.pmod_loc, leading)
-      walkModExpr(mb.pmb_expr, t, inside)
-    }
-    attach(t.trailing, mb.pmb_expr.pmod_loc, trailing)
-  }
-
-  and walkSignature = (signature, t, comments) =>
-    switch signature {
-    | _ when comments == list{} => ()
-    | list{} => attach(t.inside, Location.none, comments)
-    | _s =>
-      walkList(
-        ~getLoc=n => n.Parsetree.psig_loc,
-        ~walkNode=walkSignatureItem,
-        signature,
-        t,
-        comments,
-      )
-    }
-
-  and walkSignatureItem = (si, t, comments) =>
-    switch si.psig_desc {
-    | _ when comments == list{} => ()
-    | Psig_value(valueDescription) => walkValueDescription(valueDescription, t, comments)
-    | Psig_type(_, typeDeclarations) => walkTypeDeclarations(typeDeclarations, t, comments)
-    | Psig_typext(typeExtension) => walkTypeExtension(typeExtension, t, comments)
-    | Psig_exception(extensionConstructor) => walkExtConstr(extensionConstructor, t, comments)
-    | Psig_module(moduleDeclaration) => walkModuleDeclaration(moduleDeclaration, t, comments)
-    | Psig_recmodule(moduleDeclarations) =>
-      walkList(
-        ~getLoc=n => n.Parsetree.pmd_loc,
-        ~walkNode=walkModuleDeclaration,
-        moduleDeclarations,
-        t,
-        comments,
-      )
-    | Psig_modtype(moduleTypeDeclaration) =>
-      walkModuleTypeDeclaration(moduleTypeDeclaration, t, comments)
-    | Psig_open(openDescription) => walkOpenDescription(openDescription, t, comments)
-    | Psig_include(includeDescription) => walkIncludeDescription(includeDescription, t, comments)
-    | Psig_attribute(attribute) => walkAttribute(attribute, t, comments)
-    | Psig_extension(extension, _) => walkExtension(extension, t, comments)
-    | Psig_class(_) | Psig_class_type(_) => ()
-    }
-
-  and walkIncludeDescription = (id, t, comments) => {
-    let (before, inside, after) = partitionByLoc(comments, id.pincl_mod.pmty_loc)
-    attach(t.leading, id.pincl_mod.pmty_loc, before)
-    walkModType(id.pincl_mod, t, inside)
-    attach(t.trailing, id.pincl_mod.pmty_loc, after)
-  }
-
-  and walkModuleDeclaration = (md, t, comments) => {
-    let (leading, trailing) = partitionLeadingTrailing(comments, md.pmd_name.loc)
-    attach(t.leading, md.pmd_name.loc, leading)
-    let (afterName, rest) = partitionAdjacentTrailing(md.pmd_name.loc, trailing)
-    attach(t.trailing, md.pmd_name.loc, afterName)
-    let (leading, inside, trailing) = partitionByLoc(rest, md.pmd_type.pmty_loc)
-    attach(t.leading, md.pmd_type.pmty_loc, leading)
-    walkModType(md.pmd_type, t, inside)
-    attach(t.trailing, md.pmd_type.pmty_loc, trailing)
-  }
-
-  and walkList: 'node. (
-    ~prevLoc: Location.t=?,
-    ~getLoc: 'node => Location.t,
-    ~walkNode: ('node, t, list<Comment.t>) => unit,
-    list<'node>,
-    t,
-    list<Comment.t>,
-  ) => unit = (~prevLoc=?, ~getLoc, ~walkNode, l, t, comments) => {
-    open Location
-    switch l {
-    | _ when comments == list{} => ()
-    | list{} =>
-      switch prevLoc {
-      | Some(loc) => attach(t.trailing, loc, comments)
-      | None => ()
-      }
-    | list{node, ...rest} =>
-      let currLoc = getLoc(node)
-      let (leading, inside, trailing) = partitionByLoc(comments, currLoc)
-      switch prevLoc {
-      | None =>
-        /* first node, all leading comments attach here */
-        attach(t.leading, currLoc, leading)
-      | Some(prevLoc) =>
-        /* Same line */
-        if prevLoc.loc_end.pos_lnum === currLoc.loc_start.pos_lnum {
-          let (afterPrev, beforeCurr) = partitionAdjacentTrailing(prevLoc, leading)
-          let () = attach(t.trailing, prevLoc, afterPrev)
-          attach(t.leading, currLoc, beforeCurr)
-        } else {
-          let (onSameLineAsPrev, afterPrev) = partitionByOnSameLine(prevLoc, leading)
-          let () = attach(t.trailing, prevLoc, onSameLineAsPrev)
-          let (leading, _inside, _trailing) = partitionByLoc(afterPrev, currLoc)
-          attach(t.leading, currLoc, leading)
-        }
-      }
-      walkNode(node, t, inside)
-      walkList(~prevLoc=currLoc, ~getLoc, ~walkNode, rest, t, trailing)
-    }
-  }
-
-  /* The parsetree doesn't always contain location info about the opening or
-   * closing token of a "list-of-things". This routine visits the whole list,
-   * but returns any remaining comments that likely fall after the whole list. */
-  and visitListButContinueWithRemainingComments: 'node. (
-    ~prevLoc: Location.t=?,
-    ~newlineDelimited: bool,
-    ~getLoc: 'node => Location.t,
-    ~walkNode: ('node, t, list<Comment.t>) => unit,
-    list<'node>,
-    t,
-    list<Comment.t>,
-  ) => list<Comment.t> = (~prevLoc=?, ~newlineDelimited, ~getLoc, ~walkNode, l, t, comments) => {
-    open Location
-    switch l {
-    | _ when comments == list{} => list{}
-    | list{} =>
-      switch prevLoc {
-      | Some(loc) =>
-        let (afterPrev, rest) = if newlineDelimited {
-          partitionByOnSameLine(loc, comments)
-        } else {
-          partitionAdjacentTrailing(loc, comments)
-        }
-
-        attach(t.trailing, loc, afterPrev)
-        rest
-      | None => comments
-      }
-    | list{node, ...rest} =>
-      let currLoc = getLoc(node)
-      let (leading, inside, trailing) = partitionByLoc(comments, currLoc)
-      let () = switch prevLoc {
-      | None =>
-        /* first node, all leading comments attach here */
-        attach(t.leading, currLoc, leading)
-        ()
-      | Some(prevLoc) =>
-        /* Same line */
-        if prevLoc.loc_end.pos_lnum === currLoc.loc_start.pos_lnum {
-          let (afterPrev, beforeCurr) = partitionAdjacentTrailing(prevLoc, leading)
-          let () = attach(t.trailing, prevLoc, afterPrev)
-          let () = attach(t.leading, currLoc, beforeCurr)
-        } else {
-          let (onSameLineAsPrev, afterPrev) = partitionByOnSameLine(prevLoc, leading)
-          let () = attach(t.trailing, prevLoc, onSameLineAsPrev)
-          let (leading, _inside, _trailing) = partitionByLoc(afterPrev, currLoc)
-          let () = attach(t.leading, currLoc, leading)
-        }
-      }
-
-      walkNode(node, t, inside)
-      visitListButContinueWithRemainingComments(
-        ~prevLoc=currLoc,
-        ~getLoc,
-        ~walkNode,
-        ~newlineDelimited,
-        rest,
-        t,
-        trailing,
-      )
-    }
-  }
-
-  and walkValueBindings = (vbs, t, comments) =>
-    walkList(~getLoc=n => n.Parsetree.pvb_loc, ~walkNode=walkValueBinding, vbs, t, comments)
-
-  and walkOpenDescription = (openDescription, t, comments) => {
-    let loc = openDescription.popen_lid.loc
-    let (leading, trailing) = partitionLeadingTrailing(comments, loc)
-    attach(t.leading, loc, leading)
-    attach(t.trailing, loc, trailing)
-  }
-
-  and walkTypeDeclarations = (typeDeclarations, t, comments) =>
-    walkList(
-      ~getLoc=n => n.Parsetree.ptype_loc,
-      ~walkNode=walkTypeDeclaration,
-      typeDeclarations,
-      t,
-      comments,
-    )
-
-  and walkTypeParam = ((typexpr, _variance), t, comments) => walkTypExpr(typexpr, t, comments)
-
-  and walkTypeDeclaration = (td, t, comments) => {
-    let (beforeName, rest) = partitionLeadingTrailing(comments, td.ptype_name.loc)
-    attach(t.leading, td.ptype_name.loc, beforeName)
-
-    let (afterName, rest) = partitionAdjacentTrailing(td.ptype_name.loc, rest)
-    attach(t.trailing, td.ptype_name.loc, afterName)
-
-    /* type params */
-    let rest = switch td.ptype_params {
-    | list{} => rest
-    | typeParams =>
-      visitListButContinueWithRemainingComments(
-        ~getLoc=((typexpr, _variance)) => typexpr.Parsetree.ptyp_loc,
-        ~walkNode=walkTypeParam,
-        ~newlineDelimited=false,
-        typeParams,
-        t,
-        rest,
-      )
-    }
-
-    /* manifest:  = typexpr */
-    let rest = switch td.ptype_manifest {
-    | Some(typexpr) =>
-      let (beforeTyp, insideTyp, afterTyp) = partitionByLoc(rest, typexpr.ptyp_loc)
-      attach(t.leading, typexpr.ptyp_loc, beforeTyp)
-      walkTypExpr(typexpr, t, insideTyp)
-      let (afterTyp, rest) = partitionAdjacentTrailing(typexpr.Parsetree.ptyp_loc, afterTyp)
-      attach(t.trailing, typexpr.ptyp_loc, afterTyp)
-      rest
-    | None => rest
-    }
-
-    let rest = switch td.ptype_kind {
-    | Ptype_abstract | Ptype_open => rest
-    | Ptype_record(labelDeclarations) =>
-      let () = walkList(
-        ~getLoc=ld => ld.Parsetree.pld_loc,
-        ~walkNode=walkLabelDeclaration,
-        labelDeclarations,
-        t,
-        rest,
-      )
-
-      list{}
-    | Ptype_variant(constructorDeclarations) =>
-      walkConstructorDeclarations(constructorDeclarations, t, rest)
-    }
-
-    attach(t.trailing, td.ptype_loc, rest)
-  }
-
-  and walkLabelDeclarations = (lds, t, comments) =>
-    visitListButContinueWithRemainingComments(
-      ~getLoc=ld => ld.Parsetree.pld_loc,
-      ~walkNode=walkLabelDeclaration,
-      ~newlineDelimited=false,
-      lds,
-      t,
-      comments,
-    )
-
-  and walkLabelDeclaration = (ld, t, comments) => {
-    let (beforeName, rest) = partitionLeadingTrailing(comments, ld.pld_name.loc)
-    attach(t.leading, ld.pld_name.loc, beforeName)
-    let (afterName, rest) = partitionAdjacentTrailing(ld.pld_name.loc, rest)
-    attach(t.trailing, ld.pld_name.loc, afterName)
-    let (beforeTyp, insideTyp, afterTyp) = partitionByLoc(rest, ld.pld_type.ptyp_loc)
-    attach(t.leading, ld.pld_type.ptyp_loc, beforeTyp)
-    walkTypExpr(ld.pld_type, t, insideTyp)
-    attach(t.trailing, ld.pld_type.ptyp_loc, afterTyp)
-  }
-
-  and walkConstructorDeclarations = (cds, t, comments) =>
-    visitListButContinueWithRemainingComments(
-      ~getLoc=cd => cd.Parsetree.pcd_loc,
-      ~walkNode=walkConstructorDeclaration,
-      ~newlineDelimited=false,
-      cds,
-      t,
-      comments,
-    )
-
-  and walkConstructorDeclaration = (cd, t, comments) => {
-    let (beforeName, rest) = partitionLeadingTrailing(comments, cd.pcd_name.loc)
-    attach(t.leading, cd.pcd_name.loc, beforeName)
-    let (afterName, rest) = partitionAdjacentTrailing(cd.pcd_name.loc, rest)
-    attach(t.trailing, cd.pcd_name.loc, afterName)
-    let rest = walkConstructorArguments(cd.pcd_args, t, rest)
-
-    let rest = switch cd.pcd_res {
-    | Some(typexpr) =>
-      let (beforeTyp, insideTyp, afterTyp) = partitionByLoc(rest, typexpr.ptyp_loc)
-      attach(t.leading, typexpr.ptyp_loc, beforeTyp)
-      walkTypExpr(typexpr, t, insideTyp)
-      let (afterTyp, rest) = partitionAdjacentTrailing(typexpr.Parsetree.ptyp_loc, afterTyp)
-      attach(t.trailing, typexpr.ptyp_loc, afterTyp)
-      rest
-    | None => rest
-    }
-
-    attach(t.trailing, cd.pcd_loc, rest)
-  }
-
-  and walkConstructorArguments = (args, t, comments) =>
-    switch args {
-    | Pcstr_tuple(typexprs) =>
-      visitListButContinueWithRemainingComments(
-        ~getLoc=n => n.Parsetree.ptyp_loc,
-        ~walkNode=walkTypExpr,
-        ~newlineDelimited=false,
-        typexprs,
-        t,
-        comments,
-      )
-    | Pcstr_record(labelDeclarations) => walkLabelDeclarations(labelDeclarations, t, comments)
-    }
-
-  and walkValueBinding = (vb, t, comments) => {
-    open Location
-
-    let vb = {
-      open Parsetree
-      switch (vb.pvb_pat, vb.pvb_expr) {
-      | (
-          {ppat_desc: Ppat_constraint(pat, {ptyp_desc: Ptyp_poly(list{}, t)})},
-          {pexp_desc: Pexp_constraint(expr, _typ)},
-        ) => {
-          ...vb,
-          pvb_pat: Ast_helper.Pat.constraint_(
-            ~loc={...pat.ppat_loc, loc_end: t.Parsetree.ptyp_loc.loc_end},
-            pat,
-            t,
-          ),
-          pvb_expr: expr,
-        }
-      | (
-          {ppat_desc: Ppat_constraint(pat, {ptyp_desc: Ptyp_poly(list{_, ..._}, t)})},
-          {pexp_desc: Pexp_fun(_)},
-        ) => {
-          ...vb,
-          pvb_pat: {
-            ...vb.pvb_pat,
-            ppat_loc: {...pat.ppat_loc, loc_end: t.ptyp_loc.loc_end},
-          },
-        }
-      | _ => vb
-      }
-    }
-
-    let patternLoc = vb.Parsetree.pvb_pat.ppat_loc
-    let exprLoc = vb.Parsetree.pvb_expr.pexp_loc
-
-    let (leading, inside, trailing) = partitionByLoc(comments, patternLoc)
-
-    /* everything before start of pattern can only be leading on the pattern:
-     *   let |* before *| a = 1 */
-    attach(t.leading, patternLoc, leading)
-    walkPattern(vb.Parsetree.pvb_pat, t, inside)
-    /* let pattern = expr     -> pattern and expr on the same line */
-    /* if patternLoc.loc_end.pos_lnum == exprLoc.loc_start.pos_lnum then ( */
-    let (afterPat, surroundingExpr) = partitionAdjacentTrailing(patternLoc, trailing)
-
-    attach(t.trailing, patternLoc, afterPat)
-    let (beforeExpr, insideExpr, afterExpr) = partitionByLoc(surroundingExpr, exprLoc)
-    if isBlockExpr(vb.pvb_expr) {
-      walkExpr(vb.pvb_expr, t, List.concat(list{beforeExpr, insideExpr, afterExpr}))
-    } else {
-      attach(t.leading, exprLoc, beforeExpr)
-      walkExpr(vb.Parsetree.pvb_expr, t, insideExpr)
-      attach(t.trailing, exprLoc, afterExpr)
-    }
-  }
-
-  and walkExpr = (expr, t, comments) => {
-    open Location
-    switch expr.Parsetree.pexp_desc {
-    | _ when comments == list{} => ()
-    | Pexp_constant(_) =>
-      let (leading, trailing) = partitionLeadingTrailing(comments, expr.pexp_loc)
-      attach(t.leading, expr.pexp_loc, leading)
-      attach(t.trailing, expr.pexp_loc, trailing)
-    | Pexp_ident(longident) =>
-      let (leading, trailing) = partitionLeadingTrailing(comments, longident.loc)
-      attach(t.leading, longident.loc, leading)
-      attach(t.trailing, longident.loc, trailing)
-    | Pexp_let(_recFlag, valueBindings, expr2) =>
-      let comments = visitListButContinueWithRemainingComments(~getLoc=n =>
-        if n.Parsetree.pvb_pat.ppat_loc.loc_ghost {
-          n.pvb_expr.pexp_loc
-        } else {
-          n.Parsetree.pvb_loc
-        }
-      , ~walkNode=walkValueBinding, ~newlineDelimited=true, valueBindings, t, comments)
-
-      if isBlockExpr(expr2) {
-        walkExpr(expr2, t, comments)
-      } else {
-        let (leading, inside, trailing) = partitionByLoc(comments, expr2.pexp_loc)
-        attach(t.leading, expr2.pexp_loc, leading)
-        walkExpr(expr2, t, inside)
-        attach(t.trailing, expr2.pexp_loc, trailing)
-      }
-    | Pexp_sequence(expr1, expr2) =>
-      let (leading, inside, trailing) = partitionByLoc(comments, expr1.pexp_loc)
-      let comments = if isBlockExpr(expr1) {
-        let (afterExpr, comments) = partitionByOnSameLine(expr1.pexp_loc, trailing)
-        walkExpr(expr1, t, List.concat(list{leading, inside, afterExpr}))
-        comments
-      } else {
-        attach(t.leading, expr1.pexp_loc, leading)
-        walkExpr(expr1, t, inside)
-        let (afterExpr, comments) = partitionByOnSameLine(expr1.pexp_loc, trailing)
-        attach(t.trailing, expr1.pexp_loc, afterExpr)
-        comments
-      }
-      if isBlockExpr(expr2) {
-        walkExpr(expr2, t, comments)
-      } else {
-        let (leading, inside, trailing) = partitionByLoc(comments, expr2.pexp_loc)
-        attach(t.leading, expr2.pexp_loc, leading)
-        walkExpr(expr2, t, inside)
-        attach(t.trailing, expr2.pexp_loc, trailing)
-      }
-    | Pexp_open(_override, longident, expr2) =>
-      let (leading, comments) = partitionLeadingTrailing(comments, expr.pexp_loc)
-      attach(t.leading, {...expr.pexp_loc, loc_end: longident.loc.loc_end}, leading)
-      let (leading, trailing) = partitionLeadingTrailing(comments, longident.loc)
-      attach(t.leading, longident.loc, leading)
-      let (afterLongident, rest) = partitionByOnSameLine(longident.loc, trailing)
-      attach(t.trailing, longident.loc, afterLongident)
-      if isBlockExpr(expr2) {
-        walkExpr(expr2, t, rest)
-      } else {
-        let (leading, inside, trailing) = partitionByLoc(rest, expr2.pexp_loc)
-        attach(t.leading, expr2.pexp_loc, leading)
-        walkExpr(expr2, t, inside)
-        attach(t.trailing, expr2.pexp_loc, trailing)
-      }
-    | Pexp_extension(
-        {txt: "bs.obj"},
-        PStr(list{{pstr_desc: Pstr_eval({pexp_desc: Pexp_record(rows, _)}, list{})}}),
-      ) =>
-      walkList(~getLoc=((longident, expr): (Asttypes.loc<Longident.t>, Parsetree.expression)) => {
-        ...longident.loc,
-        loc_end: expr.pexp_loc.loc_end,
-      }, ~walkNode=walkExprRecordRow, rows, t, comments)
-    | Pexp_extension(extension) => walkExtension(extension, t, comments)
-    | Pexp_letexception(extensionConstructor, expr2) =>
-      let (leading, comments) = partitionLeadingTrailing(comments, expr.pexp_loc)
-      attach(t.leading, {...expr.pexp_loc, loc_end: extensionConstructor.pext_loc.loc_end}, leading)
-      let (leading, inside, trailing) = partitionByLoc(comments, extensionConstructor.pext_loc)
-      attach(t.leading, extensionConstructor.pext_loc, leading)
-      walkExtConstr(extensionConstructor, t, inside)
-      let (afterExtConstr, rest) = partitionByOnSameLine(extensionConstructor.pext_loc, trailing)
-      attach(t.trailing, extensionConstructor.pext_loc, afterExtConstr)
-      if isBlockExpr(expr2) {
-        walkExpr(expr2, t, rest)
-      } else {
-        let (leading, inside, trailing) = partitionByLoc(rest, expr2.pexp_loc)
-        attach(t.leading, expr2.pexp_loc, leading)
-        walkExpr(expr2, t, inside)
-        attach(t.trailing, expr2.pexp_loc, trailing)
-      }
-    | Pexp_letmodule(stringLoc, modExpr, expr2) =>
-      let (leading, comments) = partitionLeadingTrailing(comments, expr.pexp_loc)
-      attach(t.leading, {...expr.pexp_loc, loc_end: modExpr.pmod_loc.loc_end}, leading)
-      let (leading, trailing) = partitionLeadingTrailing(comments, stringLoc.loc)
-      attach(t.leading, stringLoc.loc, leading)
-      let (afterString, rest) = partitionAdjacentTrailing(stringLoc.loc, trailing)
-      attach(t.trailing, stringLoc.loc, afterString)
-      let (beforeModExpr, insideModExpr, afterModExpr) = partitionByLoc(rest, modExpr.pmod_loc)
-      attach(t.leading, modExpr.pmod_loc, beforeModExpr)
-      walkModExpr(modExpr, t, insideModExpr)
-      let (afterModExpr, rest) = partitionByOnSameLine(modExpr.pmod_loc, afterModExpr)
-      attach(t.trailing, modExpr.pmod_loc, afterModExpr)
-      if isBlockExpr(expr2) {
-        walkExpr(expr2, t, rest)
-      } else {
-        let (leading, inside, trailing) = partitionByLoc(rest, expr2.pexp_loc)
-        attach(t.leading, expr2.pexp_loc, leading)
-        walkExpr(expr2, t, inside)
-        attach(t.trailing, expr2.pexp_loc, trailing)
-      }
-    | Pexp_assert(expr) | Pexp_lazy(expr) =>
-      if isBlockExpr(expr) {
-        walkExpr(expr, t, comments)
-      } else {
-        let (leading, inside, trailing) = partitionByLoc(comments, expr.pexp_loc)
-        attach(t.leading, expr.pexp_loc, leading)
-        walkExpr(expr, t, inside)
-        attach(t.trailing, expr.pexp_loc, trailing)
-      }
-    | Pexp_coerce(expr, optTypexpr, typexpr) =>
-      let (leading, inside, trailing) = partitionByLoc(comments, expr.pexp_loc)
-      attach(t.leading, expr.pexp_loc, leading)
-      walkExpr(expr, t, inside)
-      let (afterExpr, rest) = partitionAdjacentTrailing(expr.pexp_loc, trailing)
-      attach(t.trailing, expr.pexp_loc, afterExpr)
-      let rest = switch optTypexpr {
-      | Some(typexpr) =>
-        let (leading, inside, trailing) = partitionByLoc(comments, typexpr.ptyp_loc)
-        attach(t.leading, typexpr.ptyp_loc, leading)
-        walkTypExpr(typexpr, t, inside)
-        let (afterTyp, rest) = partitionAdjacentTrailing(typexpr.ptyp_loc, trailing)
-        attach(t.trailing, typexpr.ptyp_loc, afterTyp)
-        rest
-      | None => rest
-      }
-
-      let (leading, inside, trailing) = partitionByLoc(rest, typexpr.ptyp_loc)
-      attach(t.leading, typexpr.ptyp_loc, leading)
-      walkTypExpr(typexpr, t, inside)
-      attach(t.trailing, typexpr.ptyp_loc, trailing)
-    | Pexp_constraint(expr, typexpr) =>
-      let (leading, inside, trailing) = partitionByLoc(comments, expr.pexp_loc)
-      attach(t.leading, expr.pexp_loc, leading)
-      walkExpr(expr, t, inside)
-      let (afterExpr, rest) = partitionAdjacentTrailing(expr.pexp_loc, trailing)
-      attach(t.trailing, expr.pexp_loc, afterExpr)
-      let (leading, inside, trailing) = partitionByLoc(rest, typexpr.ptyp_loc)
-      attach(t.leading, typexpr.ptyp_loc, leading)
-      walkTypExpr(typexpr, t, inside)
-      attach(t.trailing, typexpr.ptyp_loc, trailing)
-    | Pexp_tuple(list{}) | Pexp_array(list{}) | Pexp_construct({txt: Longident.Lident("[]")}, _) =>
-      attach(t.inside, expr.pexp_loc, comments)
-    | Pexp_construct({txt: Longident.Lident("::")}, _) =>
-      walkList(
-        ~getLoc=n => n.Parsetree.pexp_loc,
-        ~walkNode=walkExpr,
-        collectListExprs(list{}, expr),
-        t,
-        comments,
-      )
-    | Pexp_construct(longident, args) =>
-      let (leading, trailing) = partitionLeadingTrailing(comments, longident.loc)
-      attach(t.leading, longident.loc, leading)
-      switch args {
-      | Some(expr) =>
-        let (afterLongident, rest) = partitionAdjacentTrailing(longident.loc, trailing)
-        attach(t.trailing, longident.loc, afterLongident)
-        walkExpr(expr, t, rest)
-      | None => attach(t.trailing, longident.loc, trailing)
-      }
-    | Pexp_variant(_label, None) => ()
-    | Pexp_variant(_label, Some(expr)) => walkExpr(expr, t, comments)
-    | Pexp_array(exprs) | Pexp_tuple(exprs) =>
-      walkList(~getLoc=n => n.Parsetree.pexp_loc, ~walkNode=walkExpr, exprs, t, comments)
-    | Pexp_record(rows, spreadExpr) =>
-      let comments = switch spreadExpr {
-      | None => comments
-      | Some(expr) =>
-        let (leading, inside, trailing) = partitionByLoc(comments, expr.pexp_loc)
-        attach(t.leading, expr.pexp_loc, leading)
-        walkExpr(expr, t, inside)
-        let (afterExpr, rest) = partitionAdjacentTrailing(expr.pexp_loc, trailing)
-        attach(t.trailing, expr.pexp_loc, afterExpr)
-        rest
-      }
-
-      walkList(~getLoc=((longident, expr): (Asttypes.loc<Longident.t>, Parsetree.expression)) => {
-        ...longident.loc,
-        loc_end: expr.pexp_loc.loc_end,
-      }, ~walkNode=walkExprRecordRow, rows, t, comments)
-    | Pexp_field(expr, longident) =>
-      let (leading, inside, trailing) = partitionByLoc(comments, expr.pexp_loc)
-      let trailing = if isBlockExpr(expr) {
-        let (afterExpr, rest) = partitionAdjacentTrailing(expr.pexp_loc, trailing)
-        walkExpr(expr, t, List.concat(list{leading, inside, afterExpr}))
-        rest
-      } else {
-        attach(t.leading, expr.pexp_loc, leading)
-        walkExpr(expr, t, inside)
-        trailing
-      }
-      let (afterExpr, rest) = partitionAdjacentTrailing(expr.pexp_loc, trailing)
-      attach(t.trailing, expr.pexp_loc, afterExpr)
-      let (leading, trailing) = partitionLeadingTrailing(rest, longident.loc)
-      attach(t.leading, longident.loc, leading)
-      attach(t.trailing, longident.loc, trailing)
-    | Pexp_setfield(expr1, longident, expr2) =>
-      let (leading, inside, trailing) = partitionByLoc(comments, expr1.pexp_loc)
-      let rest = if isBlockExpr(expr1) {
-        let (afterExpr, rest) = partitionAdjacentTrailing(expr1.pexp_loc, trailing)
-        walkExpr(expr1, t, List.concat(list{leading, inside, afterExpr}))
-        rest
-      } else {
-        let (afterExpr, rest) = partitionAdjacentTrailing(expr1.pexp_loc, trailing)
-        attach(t.leading, expr1.pexp_loc, leading)
-        walkExpr(expr1, t, inside)
-        attach(t.trailing, expr1.pexp_loc, afterExpr)
-        rest
-      }
-      let (beforeLongident, afterLongident) = partitionLeadingTrailing(rest, longident.loc)
-      attach(t.leading, longident.loc, beforeLongident)
-      let (afterLongident, rest) = partitionAdjacentTrailing(longident.loc, afterLongident)
-      attach(t.trailing, longident.loc, afterLongident)
-      if isBlockExpr(expr2) {
-        walkExpr(expr2, t, rest)
-      } else {
-        let (leading, inside, trailing) = partitionByLoc(rest, expr2.pexp_loc)
-        attach(t.leading, expr2.pexp_loc, leading)
-        walkExpr(expr2, t, inside)
-        attach(t.trailing, expr2.pexp_loc, trailing)
-      }
-    | Pexp_ifthenelse(ifExpr, thenExpr, elseExpr) =>
-      let (leading, inside, trailing) = partitionByLoc(comments, ifExpr.pexp_loc)
-      let comments = if isBlockExpr(ifExpr) {
-        let (afterExpr, comments) = partitionAdjacentTrailing(ifExpr.pexp_loc, trailing)
-        walkExpr(ifExpr, t, List.concat(list{leading, inside, afterExpr}))
-        comments
-      } else {
-        attach(t.leading, ifExpr.pexp_loc, leading)
-        walkExpr(ifExpr, t, inside)
-        let (afterExpr, comments) = partitionAdjacentTrailing(ifExpr.pexp_loc, trailing)
-        attach(t.trailing, ifExpr.pexp_loc, afterExpr)
-        comments
-      }
-      let (leading, inside, trailing) = partitionByLoc(comments, thenExpr.pexp_loc)
-      let comments = if isBlockExpr(thenExpr) {
-        let (afterExpr, trailing) = partitionAdjacentTrailing(thenExpr.pexp_loc, trailing)
-        walkExpr(thenExpr, t, List.concat(list{leading, inside, afterExpr}))
-        trailing
-      } else {
-        attach(t.leading, thenExpr.pexp_loc, leading)
-        walkExpr(thenExpr, t, inside)
-        let (afterExpr, comments) = partitionAdjacentTrailing(thenExpr.pexp_loc, trailing)
-        attach(t.trailing, thenExpr.pexp_loc, afterExpr)
-        comments
-      }
-      switch elseExpr {
-      | None => ()
-      | Some(expr) =>
-        if isBlockExpr(expr) {
-          walkExpr(expr, t, comments)
-        } else {
-          let (leading, inside, trailing) = partitionByLoc(comments, expr.pexp_loc)
-          attach(t.leading, expr.pexp_loc, leading)
-          walkExpr(expr, t, inside)
-          attach(t.trailing, expr.pexp_loc, trailing)
-        }
-      }
-    | Pexp_while(expr1, expr2) =>
-      let (leading, inside, trailing) = partitionByLoc(comments, expr1.pexp_loc)
-      let rest = if isBlockExpr(expr1) {
-        let (afterExpr, rest) = partitionAdjacentTrailing(expr1.pexp_loc, trailing)
-        walkExpr(expr1, t, List.concat(list{leading, inside, afterExpr}))
-        rest
-      } else {
-        attach(t.leading, expr1.pexp_loc, leading)
-        walkExpr(expr1, t, inside)
-        let (afterExpr, rest) = partitionAdjacentTrailing(expr1.pexp_loc, trailing)
-        attach(t.trailing, expr1.pexp_loc, afterExpr)
-        rest
-      }
-      if isBlockExpr(expr2) {
-        walkExpr(expr2, t, rest)
-      } else {
-        let (leading, inside, trailing) = partitionByLoc(rest, expr2.pexp_loc)
-        attach(t.leading, expr2.pexp_loc, leading)
-        walkExpr(expr2, t, inside)
-        attach(t.trailing, expr2.pexp_loc, trailing)
-      }
-    | Pexp_for(pat, expr1, expr2, _, expr3) =>
-      let (leading, inside, trailing) = partitionByLoc(comments, pat.ppat_loc)
-      attach(t.leading, pat.ppat_loc, leading)
-      walkPattern(pat, t, inside)
-      let (afterPat, rest) = partitionAdjacentTrailing(pat.ppat_loc, trailing)
-      attach(t.trailing, pat.ppat_loc, afterPat)
-      let (leading, inside, trailing) = partitionByLoc(rest, expr1.pexp_loc)
-      attach(t.leading, expr1.pexp_loc, leading)
-      walkExpr(expr1, t, inside)
-      let (afterExpr, rest) = partitionAdjacentTrailing(expr1.pexp_loc, trailing)
-      attach(t.trailing, expr1.pexp_loc, afterExpr)
-      let (leading, inside, trailing) = partitionByLoc(rest, expr2.pexp_loc)
-      attach(t.leading, expr2.pexp_loc, leading)
-      walkExpr(expr2, t, inside)
-      let (afterExpr, rest) = partitionAdjacentTrailing(expr2.pexp_loc, trailing)
-      attach(t.trailing, expr2.pexp_loc, afterExpr)
-      if isBlockExpr(expr3) {
-        walkExpr(expr3, t, rest)
-      } else {
-        let (leading, inside, trailing) = partitionByLoc(rest, expr3.pexp_loc)
-        attach(t.leading, expr3.pexp_loc, leading)
-        walkExpr(expr3, t, inside)
-        attach(t.trailing, expr3.pexp_loc, trailing)
-      }
-    | Pexp_pack(modExpr) =>
-      let (before, inside, after) = partitionByLoc(comments, modExpr.pmod_loc)
-      attach(t.leading, modExpr.pmod_loc, before)
-      walkModExpr(modExpr, t, inside)
-      attach(t.trailing, modExpr.pmod_loc, after)
-    | Pexp_match(expr, cases) | Pexp_try(expr, cases) =>
-      let (before, inside, after) = partitionByLoc(comments, expr.pexp_loc)
-      let after = if isBlockExpr(expr) {
-        let (afterExpr, rest) = partitionAdjacentTrailing(expr.pexp_loc, after)
-        walkExpr(expr, t, List.concat(list{before, inside, afterExpr}))
-        rest
-      } else {
-        attach(t.leading, expr.pexp_loc, before)
-        walkExpr(expr, t, inside)
-        after
-      }
-      let (afterExpr, rest) = partitionAdjacentTrailing(expr.pexp_loc, after)
-      attach(t.trailing, expr.pexp_loc, afterExpr)
-      walkList(~getLoc=n => {
-        ...n.Parsetree.pc_lhs.ppat_loc,
-        loc_end: n.pc_rhs.pexp_loc.loc_end,
-      }, ~walkNode=walkCase, cases, t, rest)
-    /* unary expression: todo use parsetreeviewer */
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident("~+" | "~+." | "~-" | "~-." | "not" | "!")})},
-        list{(Nolabel, argExpr)},
-      ) =>
-      let (before, inside, after) = partitionByLoc(comments, argExpr.pexp_loc)
-      attach(t.leading, argExpr.pexp_loc, before)
-      walkExpr(argExpr, t, inside)
-      attach(t.trailing, argExpr.pexp_loc, after)
-    /* binary expression */
-    | Pexp_apply(
-        {
-          pexp_desc:
-            Pexp_ident({
-              txt:
-                Longident.Lident(
-                  ":="
-                  | "||"
-                  | "&&"
-                  | "="
-                  | "=="
-                  | "<"
-                  | ">"
-                  | "!="
-                  | "!=="
-                  | "<="
-                  | ">="
-                  | "|>"
-                  | "+"
-                  | "+."
-                  | "-"
-                  | "-."
-                  | "++"
-                  | "^"
-                  | "*"
-                  | "*."
-                  | "/"
-                  | "/."
-                  | "**"
-                  | "|."
-                  | "<>",
-                ),
-            }),
-        },
-        list{(Nolabel, operand1), (Nolabel, operand2)},
-      ) =>
-      let (before, inside, after) = partitionByLoc(comments, operand1.pexp_loc)
-      attach(t.leading, operand1.pexp_loc, before)
-      walkExpr(operand1, t, inside)
-      let (afterOperand1, rest) = partitionAdjacentTrailing(operand1.pexp_loc, after)
-      attach(t.trailing, operand1.pexp_loc, afterOperand1)
-      let (before, inside, after) = partitionByLoc(rest, operand2.pexp_loc)
-      attach(t.leading, operand2.pexp_loc, before)
-      walkExpr(operand2, t, inside) /* (List.concat [inside; after]); */
-      attach(t.trailing, operand2.pexp_loc, after)
-    | Pexp_apply(callExpr, arguments) =>
-      let (before, inside, after) = partitionByLoc(comments, callExpr.pexp_loc)
-      let after = if isBlockExpr(callExpr) {
-        let (afterExpr, rest) = partitionAdjacentTrailing(callExpr.pexp_loc, after)
-        walkExpr(callExpr, t, List.concat(list{before, inside, afterExpr}))
-        rest
-      } else {
-        attach(t.leading, callExpr.pexp_loc, before)
-        walkExpr(callExpr, t, inside)
-        after
-      }
-      let (afterExpr, rest) = partitionAdjacentTrailing(callExpr.pexp_loc, after)
-      attach(t.trailing, callExpr.pexp_loc, afterExpr)
-      walkList(~getLoc=((_argLabel, expr)) => {
-        let loc = switch expr.Parsetree.pexp_attributes {
-        | list{({Location.txt: "res.namedArgLoc", loc}, _), ..._attrs} => {
-            ...loc,
-            loc_end: expr.pexp_loc.loc_end,
-          }
-        | _ => expr.pexp_loc
-        }
-
-        loc
-      }, ~walkNode=walkExprArgument, arguments, t, rest)
-    | Pexp_fun(_, _, _, _) | Pexp_newtype(_) =>
-      let (_, parameters, returnExpr) = funExpr(expr)
-      let comments = visitListButContinueWithRemainingComments(
-        ~newlineDelimited=false,
-        ~walkNode=walkExprPararameter,
-        ~getLoc=((_attrs, _argLbl, exprOpt, pattern)) => {
-          open Parsetree
-          let startPos = switch pattern.ppat_attributes {
-          | list{({Location.txt: "res.namedArgLoc", loc}, _), ..._attrs} => loc.loc_start
-          | _ => pattern.ppat_loc.loc_start
-          }
-
-          switch exprOpt {
-          | None => {...pattern.ppat_loc, loc_start: startPos}
-          | Some(expr) => {
-              ...pattern.ppat_loc,
-              loc_start: startPos,
-              loc_end: expr.pexp_loc.loc_end,
-            }
-          }
-        },
-        parameters,
-        t,
-        comments,
-      )
-
-      switch returnExpr.pexp_desc {
-      | Pexp_constraint(expr, typ)
-        when expr.pexp_loc.loc_start.pos_cnum >= typ.ptyp_loc.loc_end.pos_cnum =>
-        let (leading, inside, trailing) = partitionByLoc(comments, typ.ptyp_loc)
-        attach(t.leading, typ.ptyp_loc, leading)
-        walkTypExpr(typ, t, inside)
-        let (afterTyp, comments) = partitionAdjacentTrailing(typ.ptyp_loc, trailing)
-        attach(t.trailing, typ.ptyp_loc, afterTyp)
-        if isBlockExpr(expr) {
-          walkExpr(expr, t, comments)
-        } else {
-          let (leading, inside, trailing) = partitionByLoc(comments, expr.pexp_loc)
-          attach(t.leading, expr.pexp_loc, leading)
-          walkExpr(expr, t, inside)
-          attach(t.trailing, expr.pexp_loc, trailing)
-        }
-      | _ =>
-        if isBlockExpr(returnExpr) {
-          walkExpr(returnExpr, t, comments)
-        } else {
-          let (leading, inside, trailing) = partitionByLoc(comments, returnExpr.pexp_loc)
-          attach(t.leading, returnExpr.pexp_loc, leading)
-          walkExpr(returnExpr, t, inside)
-          attach(t.trailing, returnExpr.pexp_loc, trailing)
-        }
-      }
-    | _ => ()
-    }
-  }
-
-  and walkExprPararameter = ((_attrs, _argLbl, exprOpt, pattern), t, comments) => {
-    let (leading, inside, trailing) = partitionByLoc(comments, pattern.ppat_loc)
-    attach(t.leading, pattern.ppat_loc, leading)
-    walkPattern(pattern, t, inside)
-    switch exprOpt {
-    | Some(expr) =>
-      let (_afterPat, rest) = partitionAdjacentTrailing(pattern.ppat_loc, trailing)
-      attach(t.trailing, pattern.ppat_loc, trailing)
-      if isBlockExpr(expr) {
-        walkExpr(expr, t, rest)
-      } else {
-        let (leading, inside, trailing) = partitionByLoc(rest, expr.pexp_loc)
-        attach(t.leading, expr.pexp_loc, leading)
-        walkExpr(expr, t, inside)
-        attach(t.trailing, expr.pexp_loc, trailing)
-      }
-    | None => attach(t.trailing, pattern.ppat_loc, trailing)
-    }
-  }
-
-  and walkExprArgument = ((_argLabel, expr), t, comments) =>
-    switch expr.Parsetree.pexp_attributes {
-    | list{({Location.txt: "res.namedArgLoc", loc}, _), ..._attrs} =>
-      let (leading, trailing) = partitionLeadingTrailing(comments, loc)
-      attach(t.leading, loc, leading)
-      let (afterLabel, rest) = partitionAdjacentTrailing(loc, trailing)
-      attach(t.trailing, loc, afterLabel)
-      let (before, inside, after) = partitionByLoc(rest, expr.pexp_loc)
-      attach(t.leading, expr.pexp_loc, before)
-      walkExpr(expr, t, inside)
-      attach(t.trailing, expr.pexp_loc, after)
-    | _ =>
-      let (before, inside, after) = partitionByLoc(comments, expr.pexp_loc)
-      attach(t.leading, expr.pexp_loc, before)
-      walkExpr(expr, t, inside)
-      attach(t.trailing, expr.pexp_loc, after)
-    }
-
-  and walkCase = (case, t, comments) => {
-    let (before, inside, after) = partitionByLoc(comments, case.pc_lhs.ppat_loc)
-    /* cases don't have a location on their own, leading comments should go
-     * after the bar on the pattern */
-    walkPattern(case.pc_lhs, t, List.concat(list{before, inside}))
-    let (afterPat, rest) = partitionAdjacentTrailing(case.pc_lhs.ppat_loc, after)
-    attach(t.trailing, case.pc_lhs.ppat_loc, afterPat)
-    let comments = switch case.pc_guard {
-    | Some(expr) =>
-      let (before, inside, after) = partitionByLoc(rest, expr.pexp_loc)
-      let (afterExpr, rest) = partitionAdjacentTrailing(expr.pexp_loc, after)
-      if isBlockExpr(expr) {
-        walkExpr(expr, t, List.concat(list{before, inside, afterExpr}))
-      } else {
-        attach(t.leading, expr.pexp_loc, before)
-        walkExpr(expr, t, inside)
-        attach(t.trailing, expr.pexp_loc, afterExpr)
-      }
-      rest
-    | None => rest
-    }
-
-    if isBlockExpr(case.pc_rhs) {
-      walkExpr(case.pc_rhs, t, comments)
-    } else {
-      let (before, inside, after) = partitionByLoc(comments, case.pc_rhs.pexp_loc)
-      attach(t.leading, case.pc_rhs.pexp_loc, before)
-      walkExpr(case.pc_rhs, t, inside)
-      attach(t.trailing, case.pc_rhs.pexp_loc, after)
-    }
-  }
-
-  and walkExprRecordRow = ((longident, expr), t, comments) => {
-    let (beforeLongident, afterLongident) = partitionLeadingTrailing(comments, longident.loc)
-
-    attach(t.leading, longident.loc, beforeLongident)
-    let (afterLongident, rest) = partitionAdjacentTrailing(longident.loc, afterLongident)
-    attach(t.trailing, longident.loc, afterLongident)
-    let (leading, inside, trailing) = partitionByLoc(rest, expr.pexp_loc)
-    attach(t.leading, expr.pexp_loc, leading)
-    walkExpr(expr, t, inside)
-    attach(t.trailing, expr.pexp_loc, trailing)
-  }
-
-  and walkExtConstr = (extConstr, t, comments) => {
-    let (leading, trailing) = partitionLeadingTrailing(comments, extConstr.pext_name.loc)
-    attach(t.leading, extConstr.pext_name.loc, leading)
-    let (afterName, rest) = partitionAdjacentTrailing(extConstr.pext_name.loc, trailing)
-    attach(t.trailing, extConstr.pext_name.loc, afterName)
-    walkExtensionConstructorKind(extConstr.pext_kind, t, rest)
-  }
-
-  and walkExtensionConstructorKind = (kind, t, comments) =>
-    switch kind {
-    | Pext_rebind(longident) =>
-      let (leading, trailing) = partitionLeadingTrailing(comments, longident.loc)
-      attach(t.leading, longident.loc, leading)
-      attach(t.trailing, longident.loc, trailing)
-    | Pext_decl(constructorArguments, maybeTypExpr) =>
-      let rest = walkConstructorArguments(constructorArguments, t, comments)
-      switch maybeTypExpr {
-      | None => ()
-      | Some(typexpr) =>
-        let (before, inside, after) = partitionByLoc(rest, typexpr.ptyp_loc)
-        attach(t.leading, typexpr.ptyp_loc, before)
-        walkTypExpr(typexpr, t, inside)
-        attach(t.trailing, typexpr.ptyp_loc, after)
-      }
-    }
-
-  and walkModExpr = (modExpr, t, comments) =>
-    switch modExpr.pmod_desc {
-    | Pmod_ident(longident) =>
-      let (before, after) = partitionLeadingTrailing(comments, longident.loc)
-      attach(t.leading, longident.loc, before)
-      attach(t.trailing, longident.loc, after)
-    | Pmod_structure(structure) => walkStructure(structure, t, comments)
-    | Pmod_extension(extension) => walkExtension(extension, t, comments)
-    | Pmod_unpack(expr) =>
-      let (before, inside, after) = partitionByLoc(comments, expr.pexp_loc)
-      attach(t.leading, expr.pexp_loc, before)
-      walkExpr(expr, t, inside)
-      attach(t.trailing, expr.pexp_loc, after)
-    | Pmod_constraint(modexpr, modtype) =>
-      if modtype.pmty_loc.loc_start >= modexpr.pmod_loc.loc_end {
-        let (before, inside, after) = partitionByLoc(comments, modexpr.pmod_loc)
-        attach(t.leading, modexpr.pmod_loc, before)
-        walkModExpr(modexpr, t, inside)
-        let (after, rest) = partitionAdjacentTrailing(modexpr.pmod_loc, after)
-        attach(t.trailing, modexpr.pmod_loc, after)
-        let (before, inside, after) = partitionByLoc(rest, modtype.pmty_loc)
-        attach(t.leading, modtype.pmty_loc, before)
-        walkModType(modtype, t, inside)
-        attach(t.trailing, modtype.pmty_loc, after)
-      } else {
-        let (before, inside, after) = partitionByLoc(comments, modtype.pmty_loc)
-        attach(t.leading, modtype.pmty_loc, before)
-        walkModType(modtype, t, inside)
-        let (after, rest) = partitionAdjacentTrailing(modtype.pmty_loc, after)
-        attach(t.trailing, modtype.pmty_loc, after)
-        let (before, inside, after) = partitionByLoc(rest, modexpr.pmod_loc)
-        attach(t.leading, modexpr.pmod_loc, before)
-        walkModExpr(modexpr, t, inside)
-        attach(t.trailing, modexpr.pmod_loc, after)
-      }
-    | Pmod_apply(_callModExpr, _argModExpr) =>
-      let modExprs = modExprApply(modExpr)
-      walkList(~getLoc=n => n.Parsetree.pmod_loc, ~walkNode=walkModExpr, modExprs, t, comments)
-    | Pmod_functor(_) =>
-      let (parameters, returnModExpr) = modExprFunctor(modExpr)
-      let comments = visitListButContinueWithRemainingComments(~getLoc=((_, lbl, modTypeOption)) =>
-        switch modTypeOption {
-        | None => lbl.Asttypes.loc
-        | Some(modType) => {...lbl.loc, loc_end: modType.Parsetree.pmty_loc.loc_end}
-        }
-      , ~walkNode=walkModExprParameter, ~newlineDelimited=false, parameters, t, comments)
-
-      switch returnModExpr.pmod_desc {
-      | Pmod_constraint(modExpr, modType)
-        when modType.pmty_loc.loc_end.pos_cnum <= modExpr.pmod_loc.loc_start.pos_cnum =>
-        let (before, inside, after) = partitionByLoc(comments, modType.pmty_loc)
-        attach(t.leading, modType.pmty_loc, before)
-        walkModType(modType, t, inside)
-        let (after, rest) = partitionAdjacentTrailing(modType.pmty_loc, after)
-        attach(t.trailing, modType.pmty_loc, after)
-        let (before, inside, after) = partitionByLoc(rest, modExpr.pmod_loc)
-        attach(t.leading, modExpr.pmod_loc, before)
-        walkModExpr(modExpr, t, inside)
-        attach(t.trailing, modExpr.pmod_loc, after)
-      | _ =>
-        let (before, inside, after) = partitionByLoc(comments, returnModExpr.pmod_loc)
-        attach(t.leading, returnModExpr.pmod_loc, before)
-        walkModExpr(returnModExpr, t, inside)
-        attach(t.trailing, returnModExpr.pmod_loc, after)
-      }
-    }
-
-  and walkModExprParameter = (parameter, t, comments) => {
-    let (_attrs, lbl, modTypeOption) = parameter
-    let (leading, trailing) = partitionLeadingTrailing(comments, lbl.loc)
-    attach(t.leading, lbl.loc, leading)
-    switch modTypeOption {
-    | None => attach(t.trailing, lbl.loc, trailing)
-    | Some(modType) =>
-      let (afterLbl, rest) = partitionAdjacentTrailing(lbl.loc, trailing)
-      attach(t.trailing, lbl.loc, afterLbl)
-      let (before, inside, after) = partitionByLoc(rest, modType.pmty_loc)
-      attach(t.leading, modType.pmty_loc, before)
-      walkModType(modType, t, inside)
-      attach(t.trailing, modType.pmty_loc, after)
-    }
-  }
-
-  and walkModType = (modType, t, comments) =>
-    switch modType.pmty_desc {
-    | Pmty_ident(longident) | Pmty_alias(longident) =>
-      let (leading, trailing) = partitionLeadingTrailing(comments, longident.loc)
-      attach(t.leading, longident.loc, leading)
-      attach(t.trailing, longident.loc, trailing)
-    | Pmty_signature(signature) => walkSignature(signature, t, comments)
-    | Pmty_extension(extension) => walkExtension(extension, t, comments)
-    | Pmty_typeof(modExpr) =>
-      let (before, inside, after) = partitionByLoc(comments, modExpr.pmod_loc)
-      attach(t.leading, modExpr.pmod_loc, before)
-      walkModExpr(modExpr, t, inside)
-      attach(t.trailing, modExpr.pmod_loc, after)
-    | Pmty_with(modType, _withConstraints) =>
-      let (before, inside, after) = partitionByLoc(comments, modType.pmty_loc)
-      attach(t.leading, modType.pmty_loc, before)
-      walkModType(modType, t, inside)
-      attach(t.trailing, modType.pmty_loc, after)
-    /* TODO: withConstraints */
-    | Pmty_functor(_) =>
-      let (parameters, returnModType) = functorType(modType)
-      let comments = visitListButContinueWithRemainingComments(~getLoc=((_, lbl, modTypeOption)) =>
-        switch modTypeOption {
-        | None => lbl.Asttypes.loc
-        | Some(modType) =>
-          if lbl.txt == "_" {
-            modType.Parsetree.pmty_loc
-          } else {
-            {...lbl.loc, loc_end: modType.Parsetree.pmty_loc.loc_end}
-          }
-        }
-      , ~walkNode=walkModTypeParameter, ~newlineDelimited=false, parameters, t, comments)
-
-      let (before, inside, after) = partitionByLoc(comments, returnModType.pmty_loc)
-      attach(t.leading, returnModType.pmty_loc, before)
-      walkModType(returnModType, t, inside)
-      attach(t.trailing, returnModType.pmty_loc, after)
-    }
-
-  and walkModTypeParameter = ((_, lbl, modTypeOption), t, comments) => {
-    let (leading, trailing) = partitionLeadingTrailing(comments, lbl.loc)
-    attach(t.leading, lbl.loc, leading)
-    switch modTypeOption {
-    | None => attach(t.trailing, lbl.loc, trailing)
-    | Some(modType) =>
-      let (afterLbl, rest) = partitionAdjacentTrailing(lbl.loc, trailing)
-      attach(t.trailing, lbl.loc, afterLbl)
-      let (before, inside, after) = partitionByLoc(rest, modType.pmty_loc)
-      attach(t.leading, modType.pmty_loc, before)
-      walkModType(modType, t, inside)
-      attach(t.trailing, modType.pmty_loc, after)
-    }
-  }
-
-  and walkPattern = (pat, t, comments) => {
-    open Location
-    switch pat.Parsetree.ppat_desc {
-    | _ when comments == list{} => ()
-    | Ppat_alias(pat, alias) =>
-      let (leading, inside, trailing) = partitionByLoc(comments, pat.ppat_loc)
-      attach(t.leading, pat.ppat_loc, leading)
-      walkPattern(pat, t, inside)
-      let (afterPat, rest) = partitionAdjacentTrailing(pat.ppat_loc, trailing)
-      attach(t.leading, pat.ppat_loc, leading)
-      attach(t.trailing, pat.ppat_loc, afterPat)
-      let (beforeAlias, afterAlias) = partitionLeadingTrailing(rest, alias.loc)
-      attach(t.leading, alias.loc, beforeAlias)
-      attach(t.trailing, alias.loc, afterAlias)
-    | Ppat_tuple(list{})
-    | Ppat_array(list{})
-    | Ppat_construct({txt: Longident.Lident("()")}, _)
-    | Ppat_construct({txt: Longident.Lident("[]")}, _) =>
-      attach(t.inside, pat.ppat_loc, comments)
-    | Ppat_array(patterns) =>
-      walkList(~getLoc=n => n.Parsetree.ppat_loc, ~walkNode=walkPattern, patterns, t, comments)
-    | Ppat_tuple(patterns) =>
-      walkList(~getLoc=n => n.Parsetree.ppat_loc, ~walkNode=walkPattern, patterns, t, comments)
-    | Ppat_construct({txt: Longident.Lident("::")}, _) =>
-      walkList(
-        ~getLoc=n => n.Parsetree.ppat_loc,
-        ~walkNode=walkPattern,
-        collectListPatterns(list{}, pat),
-        t,
-        comments,
-      )
-    | Ppat_construct(constr, None) =>
-      let (beforeConstr, afterConstr) = partitionLeadingTrailing(comments, constr.loc)
-
-      attach(t.leading, constr.loc, beforeConstr)
-      attach(t.trailing, constr.loc, afterConstr)
-    | Ppat_construct(constr, Some(pat)) =>
-      let (leading, trailing) = partitionLeadingTrailing(comments, constr.loc)
-      attach(t.leading, constr.loc, leading)
-      let (leading, inside, trailing) = partitionByLoc(trailing, pat.ppat_loc)
-      attach(t.leading, pat.ppat_loc, leading)
-      walkPattern(pat, t, inside)
-      attach(t.trailing, pat.ppat_loc, trailing)
-    | Ppat_variant(_label, None) => ()
-    | Ppat_variant(_label, Some(pat)) => walkPattern(pat, t, comments)
-    | Ppat_type(_) => ()
-    | Ppat_record(recordRows, _) => walkList(~getLoc=((longidentLoc, pattern): (
-        Asttypes.loc<Longident.t>,
-        Parsetree.pattern,
-      )) => {
-        ...longidentLoc.loc,
-        loc_end: pattern.Parsetree.ppat_loc.loc_end,
-      }, ~walkNode=walkPatternRecordRow, recordRows, t, comments)
-    | Ppat_or(pattern1, pattern2) =>
-      let (beforePattern1, insidePattern1, afterPattern1) = partitionByLoc(
-        comments,
-        pattern1.ppat_loc,
-      )
-
-      attach(t.leading, pattern1.ppat_loc, beforePattern1)
-      walkPattern(pattern1, t, insidePattern1)
-      let (afterPattern1, rest) = partitionAdjacentTrailing(pattern1.ppat_loc, afterPattern1)
-
-      attach(t.trailing, pattern1.ppat_loc, afterPattern1)
-      let (beforePattern2, insidePattern2, afterPattern2) = partitionByLoc(rest, pattern2.ppat_loc)
-
-      attach(t.leading, pattern2.ppat_loc, beforePattern2)
-      walkPattern(pattern2, t, insidePattern2)
-      attach(t.trailing, pattern2.ppat_loc, afterPattern2)
-    | Ppat_constraint(pattern, typ) =>
-      let (beforePattern, insidePattern, afterPattern) = partitionByLoc(comments, pattern.ppat_loc)
-
-      attach(t.leading, pattern.ppat_loc, beforePattern)
-      walkPattern(pattern, t, insidePattern)
-      let (afterPattern, rest) = partitionAdjacentTrailing(pattern.ppat_loc, afterPattern)
-
-      attach(t.trailing, pattern.ppat_loc, afterPattern)
-      let (beforeTyp, insideTyp, afterTyp) = partitionByLoc(rest, typ.ptyp_loc)
-
-      attach(t.leading, typ.ptyp_loc, beforeTyp)
-      walkTypExpr(typ, t, insideTyp)
-      attach(t.trailing, typ.ptyp_loc, afterTyp)
-    | Ppat_lazy(pattern) | Ppat_exception(pattern) =>
-      let (leading, inside, trailing) = partitionByLoc(comments, pattern.ppat_loc)
-      attach(t.leading, pattern.ppat_loc, leading)
-      walkPattern(pattern, t, inside)
-      attach(t.trailing, pattern.ppat_loc, trailing)
-    | Ppat_unpack(stringLoc) =>
-      let (leading, trailing) = partitionLeadingTrailing(comments, stringLoc.loc)
-      attach(t.leading, stringLoc.loc, leading)
-      attach(t.trailing, stringLoc.loc, trailing)
-    | Ppat_extension(extension) => walkExtension(extension, t, comments)
-    | _ => ()
-    }
-  }
-
-  /* name: firstName */
-  and walkPatternRecordRow = (row, t, comments) =>
-    switch row {
-    /* punned {x} */
-    | (
-        {Location.txt: Longident.Lident(ident), loc: longidentLoc},
-        {Parsetree.ppat_desc: Ppat_var({txt, _})},
-      ) when ident == txt =>
-      let (beforeLbl, afterLbl) = partitionLeadingTrailing(comments, longidentLoc)
-
-      attach(t.leading, longidentLoc, beforeLbl)
-      attach(t.trailing, longidentLoc, afterLbl)
-    | (longident, pattern) =>
-      let (beforeLbl, afterLbl) = partitionLeadingTrailing(comments, longident.loc)
-
-      attach(t.leading, longident.loc, beforeLbl)
-      let (afterLbl, rest) = partitionAdjacentTrailing(longident.loc, afterLbl)
-      attach(t.trailing, longident.loc, afterLbl)
-      let (leading, inside, trailing) = partitionByLoc(rest, pattern.ppat_loc)
-      attach(t.leading, pattern.ppat_loc, leading)
-      walkPattern(pattern, t, inside)
-      attach(t.trailing, pattern.ppat_loc, trailing)
-    }
-
-  and walkTypExpr = (typ, t, comments) =>
-    switch typ.Parsetree.ptyp_desc {
-    | _ when comments == list{} => ()
-    | Ptyp_tuple(typexprs) =>
-      walkList(~getLoc=n => n.Parsetree.ptyp_loc, ~walkNode=walkTypExpr, typexprs, t, comments)
-    | Ptyp_extension(extension) => walkExtension(extension, t, comments)
-    | Ptyp_package(packageType) => walkPackageType(packageType, t, comments)
-    | Ptyp_alias(typexpr, _alias) =>
-      let (beforeTyp, insideTyp, afterTyp) = partitionByLoc(comments, typexpr.ptyp_loc)
-      attach(t.leading, typexpr.ptyp_loc, beforeTyp)
-      walkTypExpr(typexpr, t, insideTyp)
-      attach(t.trailing, typexpr.ptyp_loc, afterTyp)
-    | Ptyp_poly(strings, typexpr) =>
-      let comments = visitListButContinueWithRemainingComments(
-        ~getLoc=n => n.Asttypes.loc,
-        ~walkNode=(longident, t, comments) => {
-          let (beforeLongident, afterLongident) = partitionLeadingTrailing(comments, longident.loc)
-          attach(t.leading, longident.loc, beforeLongident)
-          attach(t.trailing, longident.loc, afterLongident)
-        },
-        ~newlineDelimited=false,
-        strings,
-        t,
-        comments,
-      )
-
-      let (beforeTyp, insideTyp, afterTyp) = partitionByLoc(comments, typexpr.ptyp_loc)
-      attach(t.leading, typexpr.ptyp_loc, beforeTyp)
-      walkTypExpr(typexpr, t, insideTyp)
-      attach(t.trailing, typexpr.ptyp_loc, afterTyp)
-    | Ptyp_constr(longident, typexprs) =>
-      let (beforeLongident, _afterLongident) = partitionLeadingTrailing(comments, longident.loc)
-      let (afterLongident, rest) = partitionAdjacentTrailing(longident.loc, comments)
-      attach(t.leading, longident.loc, beforeLongident)
-      attach(t.trailing, longident.loc, afterLongident)
-      walkList(~getLoc=n => n.Parsetree.ptyp_loc, ~walkNode=walkTypExpr, typexprs, t, rest)
-    | Ptyp_arrow(_) =>
-      let (_, parameters, typexpr) = arrowType(typ)
-      let comments = walkTypeParameters(parameters, t, comments)
-      let (beforeTyp, insideTyp, afterTyp) = partitionByLoc(comments, typexpr.ptyp_loc)
-      attach(t.leading, typexpr.ptyp_loc, beforeTyp)
-      walkTypExpr(typexpr, t, insideTyp)
-      attach(t.trailing, typexpr.ptyp_loc, afterTyp)
-    | Ptyp_object(fields, _) => walkTypObjectFields(fields, t, comments)
-    | _ => ()
-    }
-
-  and walkTypObjectFields = (fields, t, comments) => walkList(~getLoc=field =>
-      switch field {
-      | Parsetree.Otag(lbl, _, typ) => {...lbl.loc, loc_end: typ.ptyp_loc.loc_end}
-      | _ => Location.none
-      }
-    , ~walkNode=walkTypObjectField, fields, t, comments)
-
-  and walkTypObjectField = (field, t, comments) =>
-    switch field {
-    | Otag(lbl, _, typexpr) =>
-      let (beforeLbl, afterLbl) = partitionLeadingTrailing(comments, lbl.loc)
-      attach(t.leading, lbl.loc, beforeLbl)
-      let (afterLbl, rest) = partitionAdjacentTrailing(lbl.loc, afterLbl)
-      attach(t.trailing, lbl.loc, afterLbl)
-      let (beforeTyp, insideTyp, afterTyp) = partitionByLoc(rest, typexpr.ptyp_loc)
-      attach(t.leading, typexpr.ptyp_loc, beforeTyp)
-      walkTypExpr(typexpr, t, insideTyp)
-      attach(t.trailing, typexpr.ptyp_loc, afterTyp)
-    | _ => ()
-    }
-
-  and walkTypeParameters = (typeParameters, t, comments) =>
-    visitListButContinueWithRemainingComments(
-      ~getLoc=((_, _, typexpr)) => typexpr.Parsetree.ptyp_loc,
-      ~walkNode=walkTypeParameter,
-      ~newlineDelimited=false,
-      typeParameters,
-      t,
-      comments,
-    )
-
-  and walkTypeParameter = ((_attrs, _lbl, typexpr), t, comments) => {
-    let (beforeTyp, insideTyp, afterTyp) = partitionByLoc(comments, typexpr.ptyp_loc)
-    attach(t.leading, typexpr.ptyp_loc, beforeTyp)
-    walkTypExpr(typexpr, t, insideTyp)
-    attach(t.trailing, typexpr.ptyp_loc, afterTyp)
-  }
-
-  and walkPackageType = (packageType, t, comments) => {
-    let (longident, packageConstraints) = packageType
-    let (beforeLongident, afterLongident) = partitionLeadingTrailing(comments, longident.loc)
-    attach(t.leading, longident.loc, beforeLongident)
-    let (afterLongident, rest) = partitionAdjacentTrailing(longident.loc, afterLongident)
-    attach(t.trailing, longident.loc, afterLongident)
-    walkPackageConstraints(packageConstraints, t, rest)
-  }
-
-  and walkPackageConstraints = (packageConstraints, t, comments) => walkList(~getLoc=((
-      longident,
-      typexpr,
-    )) => {
-      ...longident.Asttypes.loc,
-      loc_end: typexpr.Parsetree.ptyp_loc.loc_end,
-    }, ~walkNode=walkPackageConstraint, packageConstraints, t, comments)
-
-  and walkPackageConstraint = (packageConstraint, t, comments) => {
-    let (longident, typexpr) = packageConstraint
-    let (beforeLongident, afterLongident) = partitionLeadingTrailing(comments, longident.loc)
-    attach(t.leading, longident.loc, beforeLongident)
-    let (afterLongident, rest) = partitionAdjacentTrailing(longident.loc, afterLongident)
-    attach(t.trailing, longident.loc, afterLongident)
-    let (beforeTyp, insideTyp, afterTyp) = partitionByLoc(rest, typexpr.ptyp_loc)
-    attach(t.leading, typexpr.ptyp_loc, beforeTyp)
-    walkTypExpr(typexpr, t, insideTyp)
-    attach(t.trailing, typexpr.ptyp_loc, afterTyp)
-  }
-
-  and walkExtension = (extension, t, comments) => {
-    let (id, payload) = extension
-    let (beforeId, afterId) = partitionLeadingTrailing(comments, id.loc)
-    attach(t.leading, id.loc, beforeId)
-    let (afterId, rest) = partitionAdjacentTrailing(id.loc, afterId)
-    attach(t.trailing, id.loc, afterId)
-    walkPayload(payload, t, rest)
-  }
-
-  and walkAttribute = ((id, payload), t, comments) => {
-    let (beforeId, afterId) = partitionLeadingTrailing(comments, id.loc)
-    attach(t.leading, id.loc, beforeId)
-    let (afterId, rest) = partitionAdjacentTrailing(id.loc, afterId)
-    attach(t.trailing, id.loc, afterId)
-    walkPayload(payload, t, rest)
-  }
-
-  and walkPayload = (payload, t, comments) =>
-    switch payload {
-    | PStr(s) => walkStructure(s, t, comments)
-    | _ => ()
-    }
-}
-
-module Printer = {
-  let addParens = doc =>
-    Doc.group(
-      Doc.concat(list{
-        Doc.lparen,
-        Doc.indent(Doc.concat(list{Doc.softLine, doc})),
-        Doc.softLine,
-        Doc.rparen,
-      }),
-    )
-
-  let addBraces = doc => Doc.group(Doc.concat(list{Doc.lbrace, doc, Doc.rbrace}))
-
-  let getFirstLeadingComment = (tbl, loc) =>
-    switch Hashtbl.find(tbl.CommentTable.leading, loc) {
-    | list{comment, ..._} => Some(comment)
-    | list{} => None
-    | exception Not_found => None
-    }
-
-  let printMultilineCommentContent = txt => {
-    /* Turns
-     *         |* first line
-     *  * second line
-     *      * third line *|
-     * Into
-     * |* first line
-     *  * second line
-     *  * third line *|
-     *
-     * What makes a comment suitable for this kind of indentation?
-     *  ->  multiple lines + every line starts with a star
-     */
-    let rec indentStars = (lines, acc) =>
-      switch lines {
-      | list{} => Doc.nil
-      | list{lastLine} =>
-        let line = String.trim(lastLine)
-        let doc = Doc.text(" " ++ line)
-        let trailingSpace = if String.length(line) > 0 {
-          Doc.space
-        } else {
-          Doc.nil
-        }
-        List.rev(list{trailingSpace, doc, ...acc}) |> Doc.concat
-      | list{line, ...lines} =>
-        let line = String.trim(line)
-        let len = String.length(line)
-        if len > 0 && (@doesNotRaise String.get)(line, 0) === '*' {
-          let doc = Doc.text(" " ++ String.trim(line))
-          indentStars(lines, list{Doc.hardLine, doc, ...acc})
-        } else {
-          let trailingSpace = {
-            let len = String.length(txt)
-            if len > 0 && String.unsafe_get(txt, len - 1) == ' ' {
-              Doc.space
-            } else {
-              Doc.nil
-            }
-          }
-
-          let content = Comment.trimSpaces(txt)
-          Doc.concat(list{Doc.text(content), trailingSpace})
-        }
-      }
-
-    let lines = String.split_on_char('\n', txt)
-    switch lines {
-    | list{} => Doc.text("/* */")
-    | list{line} =>
-      Doc.concat(list{Doc.text("/* "), Doc.text(Comment.trimSpaces(line)), Doc.text(" */")})
-    | list{first, ...rest} =>
-      let firstLine = Comment.trimSpaces(first)
-      Doc.concat(list{
-        Doc.text("/*"),
-        if String.length(firstLine) > 0 && !String.equal(firstLine, "*") {
-          Doc.space
-        } else {
-          Doc.nil
-        },
-        indentStars(rest, list{Doc.hardLine, Doc.text(firstLine)}),
-        Doc.text("*/"),
-      })
-    }
-  }
-
-  let printTrailingComment = (nodeLoc: Location.t, comment) => {
-    let singleLine = Comment.isSingleLineComment(comment)
-    let content = {
-      let txt = Comment.txt(comment)
-      if singleLine {
-        Doc.text("// " ++ String.trim(txt))
-      } else {
-        printMultilineCommentContent(txt)
-      }
-    }
-
-    let diff = {
-      let cmtStart = Comment.loc(comment).loc_start
-      let prevTokEndPos = Comment.prevTokEndPos(comment)
-      cmtStart.pos_lnum - prevTokEndPos.pos_lnum
-    }
-
-    let isBelow = Comment.loc(comment).loc_start.pos_lnum > nodeLoc.loc_end.pos_lnum
-    if diff > 0 || isBelow {
-      Doc.concat(list{
-        Doc.breakParent,
-        Doc.lineSuffix(
-          Doc.concat(list{
-            Doc.hardLine,
-            if diff > 1 {
-              Doc.hardLine
-            } else {
-              Doc.nil
-            },
-            content,
-          }),
-        ),
-      })
-    } else if !singleLine {
-      Doc.concat(list{Doc.space, content})
-    } else {
-      Doc.lineSuffix(Doc.concat(list{Doc.space, content}))
-    }
-  }
-
-  let printLeadingComment = (~nextComment=?, comment) => {
-    let singleLine = Comment.isSingleLineComment(comment)
-    let content = {
-      let txt = Comment.txt(comment)
-      if singleLine {
-        Doc.text("// " ++ String.trim(txt))
-      } else {
-        printMultilineCommentContent(txt)
-      }
-    }
-
-    let separator = Doc.concat(list{
-      if singleLine {
-        Doc.concat(list{Doc.hardLine, Doc.breakParent})
-      } else {
-        Doc.nil
-      },
-      switch nextComment {
-      | Some(next) =>
-        let nextLoc = Comment.loc(next)
-        let currLoc = Comment.loc(comment)
-        let diff = nextLoc.Location.loc_start.pos_lnum - currLoc.Location.loc_end.pos_lnum
-
-        let nextSingleLine = Comment.isSingleLineComment(next)
-        if singleLine && nextSingleLine {
-          if diff > 1 {
-            Doc.hardLine
-          } else {
-            Doc.nil
-          }
-        } else if singleLine && !nextSingleLine {
-          if diff > 1 {
-            Doc.hardLine
-          } else {
-            Doc.nil
-          }
-        } else if diff > 1 {
-          Doc.concat(list{Doc.hardLine, Doc.hardLine})
-        } else if diff === 1 {
-          Doc.hardLine
-        } else {
-          Doc.space
-        }
-      | None => Doc.nil
-      },
-    })
-
-    Doc.concat(list{content, separator})
-  }
-
-  let printCommentsInside = (cmtTbl, loc) => {
-    let rec loop = (acc, comments) =>
-      switch comments {
-      | list{} => Doc.nil
-      | list{comment} =>
-        let cmtDoc = printLeadingComment(comment)
-        let doc = Doc.group(Doc.concat(list{Doc.concat(List.rev(list{cmtDoc, ...acc}))}))
-
-        doc
-      | list{comment, ...list{nextComment, ..._comments} as rest} =>
-        let cmtDoc = printLeadingComment(~nextComment, comment)
-        loop(list{cmtDoc, ...acc}, rest)
-      }
-
-    switch Hashtbl.find(cmtTbl.CommentTable.inside, loc) {
-    | exception Not_found => Doc.nil
-    | comments =>
-      Hashtbl.remove(cmtTbl.inside, loc)
-      Doc.group(loop(list{}, comments))
-    }
-  }
-
-  let printLeadingComments = (node, tbl, loc) => {
-    let rec loop = (acc, comments) =>
-      switch comments {
-      | list{} => node
-      | list{comment} =>
-        let cmtDoc = printLeadingComment(comment)
-        let diff = loc.Location.loc_start.pos_lnum - Comment.loc(comment).Location.loc_end.pos_lnum
-
-        let separator = if Comment.isSingleLineComment(comment) {
-          if diff > 1 {
-            Doc.hardLine
-          } else {
-            Doc.nil
-          }
-        } else if diff === 0 {
-          Doc.space
-        } else if diff > 1 {
-          Doc.concat(list{Doc.hardLine, Doc.hardLine})
-        } else {
-          Doc.hardLine
-        }
-
-        let doc = Doc.group(
-          Doc.concat(list{Doc.concat(List.rev(list{cmtDoc, ...acc})), separator, node}),
-        )
-
-        doc
-      | list{comment, ...list{nextComment, ..._comments} as rest} =>
-        let cmtDoc = printLeadingComment(~nextComment, comment)
-        loop(list{cmtDoc, ...acc}, rest)
-      }
-
-    switch Hashtbl.find(tbl, loc) {
-    | exception Not_found => node
-    | comments =>
-      /* Remove comments from tbl: Some ast nodes have the same location.
-       * We only want to print comments once */
-      Hashtbl.remove(tbl, loc)
-      loop(list{}, comments)
-    }
-  }
-
-  let printTrailingComments = (node, tbl, loc) => {
-    let rec loop = (acc, comments) =>
-      switch comments {
-      | list{} => Doc.concat(List.rev(acc))
-      | list{comment, ...comments} =>
-        let cmtDoc = printTrailingComment(loc, comment)
-        loop(list{cmtDoc, ...acc}, comments)
-      }
-
-    switch Hashtbl.find(tbl, loc) {
-    | exception Not_found => node
-    | list{} => node
-    | list{_first, ..._} as comments =>
-      /* Remove comments from tbl: Some ast nodes have the same location.
-       * We only want to print comments once */
-      Hashtbl.remove(tbl, loc)
-      let cmtsDoc = loop(list{}, comments)
-      Doc.concat(list{node, cmtsDoc})
-    }
-  }
-
-  let printComments = (doc, tbl: CommentTable.t, loc) => {
-    let docWithLeadingComments = printLeadingComments(doc, tbl.leading, loc)
-    printTrailingComments(docWithLeadingComments, tbl.trailing, loc)
-  }
-
-  let printList = (~getLoc, ~nodes, ~print, ~forceBreak=false, t) => {
-    let rec loop = (prevLoc: Location.t, acc, nodes) =>
-      switch nodes {
-      | list{} => (prevLoc, Doc.concat(List.rev(acc)))
-      | list{node, ...nodes} =>
-        let loc = getLoc(node)
-        let startPos = switch getFirstLeadingComment(t, loc) {
-        | None => loc.loc_start
-        | Some(comment) => Comment.loc(comment).loc_start
-        }
-
-        let sep = if startPos.pos_lnum - prevLoc.loc_end.pos_lnum > 1 {
-          Doc.concat(list{Doc.hardLine, Doc.hardLine})
-        } else {
-          Doc.hardLine
-        }
-
-        let doc = printComments(print(node, t), t, loc)
-        loop(loc, list{doc, sep, ...acc}, nodes)
-      }
-
-    switch nodes {
-    | list{} => Doc.nil
-    | list{node, ...nodes} =>
-      let firstLoc = getLoc(node)
-      let doc = printComments(print(node, t), t, firstLoc)
-      let (lastLoc, docs) = loop(firstLoc, list{doc}, nodes)
-      let forceBreak = forceBreak || firstLoc.loc_start.pos_lnum !== lastLoc.loc_end.pos_lnum
-
-      Doc.breakableGroup(~forceBreak, docs)
-    }
-  }
-
-  let printListi = (~getLoc, ~nodes, ~print, ~forceBreak=false, t) => {
-    let rec loop = (i, prevLoc: Location.t, acc, nodes) =>
-      switch nodes {
-      | list{} => (prevLoc, Doc.concat(List.rev(acc)))
-      | list{node, ...nodes} =>
-        let loc = getLoc(node)
-        let startPos = switch getFirstLeadingComment(t, loc) {
-        | None => loc.loc_start
-        | Some(comment) => Comment.loc(comment).loc_start
-        }
-
-        let sep = if startPos.pos_lnum - prevLoc.loc_end.pos_lnum > 1 {
-          Doc.concat(list{Doc.hardLine, Doc.hardLine})
-        } else {
-          Doc.line
-        }
-
-        let doc = printComments(print(node, t, i), t, loc)
-        loop(i + 1, loc, list{doc, sep, ...acc}, nodes)
-      }
-
-    switch nodes {
-    | list{} => Doc.nil
-    | list{node, ...nodes} =>
-      let firstLoc = getLoc(node)
-      let doc = printComments(print(node, t, 0), t, firstLoc)
-      let (lastLoc, docs) = loop(1, firstLoc, list{doc}, nodes)
-      let forceBreak = forceBreak || firstLoc.loc_start.pos_lnum !== lastLoc.loc_end.pos_lnum
-
-      Doc.breakableGroup(~forceBreak, docs)
-    }
-  }
-
-  let rec printLongidentAux = (accu, x) =>
-    switch x {
-    | Longident.Lident(s) => list{Doc.text(s), ...accu}
-    | Ldot(lid, s) => printLongidentAux(list{Doc.text(s), ...accu}, lid)
-    | Lapply(lid1, lid2) =>
-      let d1 = Doc.join(~sep=Doc.dot, printLongidentAux(list{}, lid1))
-      let d2 = Doc.join(~sep=Doc.dot, printLongidentAux(list{}, lid2))
-      list{Doc.concat(list{d1, Doc.lparen, d2, Doc.rparen}), ...accu}
-    }
-
-  let printLongident = x =>
-    switch x {
-    | Longident.Lident(txt) => Doc.text(txt)
-    | lid => Doc.join(~sep=Doc.dot, printLongidentAux(list{}, lid))
-    }
-
-  type identifierStyle =
-    | ExoticIdent
-    | NormalIdent
-
-  let classifyIdentContent = (~allowUident=false, txt) => {
-    let len = String.length(txt)
-    let rec go = i =>
-      if i === len {
-        NormalIdent
-      } else {
-        let c = String.unsafe_get(txt, i)
-        if (
-          i === 0 &&
-            !(
-              (allowUident && (c >= 'A' && c <= 'Z')) ||
-                ((c >= 'a' && c <= 'z') ||
-                (c == '_' || (c >= '0' && c <= '9')))
-            )
-        ) {
-          ExoticIdent
-        } else if (
-          !(
-            (c >= 'a' && c <= 'z') ||
-              ((c >= 'A' && c <= 'Z') ||
-              (c == '\'' || (c == '_' || c >= '0' && c <= '9')))
-          )
-        ) {
-          ExoticIdent
-        } else {
-          go(i + 1)
-        }
-      }
-
-    if Token.isKeywordTxt(txt) && txt != "list" {
-      ExoticIdent
-    } else {
-      go(0)
-    }
-  }
-
-  let printIdentLike = (~allowUident=?, txt) =>
-    switch classifyIdentContent(~allowUident?, txt) {
-    | ExoticIdent => Doc.concat(list{Doc.text("\\\""), Doc.text(txt), Doc.text("\"")})
-    | NormalIdent => Doc.text(txt)
-    }
-
-  let printLident = l =>
-    switch l {
-    | Longident.Lident(txt) => printIdentLike(txt)
-    | Longident.Ldot(path, txt) =>
-      let txts = Longident.flatten(path)
-      Doc.concat(list{
-        Doc.join(~sep=Doc.dot, List.map(Doc.text, txts)),
-        Doc.dot,
-        printIdentLike(txt),
-      })
-    | _ => Doc.text("printLident: Longident.Lapply is not supported")
-    }
-
-  let printLongidentLocation = (l, cmtTbl) => {
-    let doc = printLongident(l.Location.txt)
-    printComments(doc, cmtTbl, l.loc)
-  }
-
-  /* Module.SubModule.x */
-  let printLidentPath = (path, cmtTbl) => {
-    let doc = printLident(path.Location.txt)
-    printComments(doc, cmtTbl, path.loc)
-  }
-
-  /* Module.SubModule.x or Module.SubModule.X */
-  let printIdentPath = (path, cmtTbl) => {
-    let doc = printLident(path.Location.txt)
-    printComments(doc, cmtTbl, path.loc)
-  }
-
-  let printStringLoc = (sloc, cmtTbl) => {
-    let doc = printIdentLike(sloc.Location.txt)
-    printComments(doc, cmtTbl, sloc.loc)
-  }
-
-  let printConstant = c =>
-    switch c {
-    | Parsetree.Pconst_integer(s, suffix) =>
-      switch suffix {
-      | Some(c) => Doc.text(s ++ Char.escaped(c))
-      | None => Doc.text(s)
-      }
-    | Pconst_string(txt, None) => Doc.text("\"" ++ (txt ++ "\""))
-    | Pconst_string(txt, Some(prefix)) =>
-      Doc.concat(list{
-        if prefix == "" {
-          Doc.nil
-        } else {
-          Doc.text(prefix)
-        },
-        Doc.text("`" ++ (txt ++ "`")),
-      })
-    | Pconst_float(s, _) => Doc.text(s)
-    | Pconst_char(c) => Doc.text("'" ++ (Char.escaped(c) ++ "'"))
-    }
-
-  let rec printStructure = (s: Parsetree.structure, t) =>
-    switch s {
-    | list{} => printCommentsInside(t, Location.none)
-    | structure =>
-      printList(~getLoc=s => s.Parsetree.pstr_loc, ~nodes=structure, ~print=printStructureItem, t)
-    }
-
-  and printStructureItem = (si: Parsetree.structure_item, cmtTbl) =>
-    switch si.pstr_desc {
-    | Pstr_value(rec_flag, valueBindings) =>
-      let recFlag = switch rec_flag {
-      | Asttypes.Nonrecursive => Doc.nil
-      | Asttypes.Recursive => Doc.text("rec ")
-      }
-
-      printValueBindings(~recFlag, valueBindings, cmtTbl)
-    | Pstr_type(recFlag, typeDeclarations) =>
-      let recFlag = switch recFlag {
-      | Asttypes.Nonrecursive => Doc.nil
-      | Asttypes.Recursive => Doc.text("rec ")
-      }
-
-      printTypeDeclarations(~recFlag, typeDeclarations, cmtTbl)
-    | Pstr_primitive(valueDescription) => printValueDescription(valueDescription, cmtTbl)
-    | Pstr_eval(expr, attrs) =>
-      let exprDoc = {
-        let doc = printExpressionWithComments(expr, cmtTbl)
-        switch Parens.structureExpr(expr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, expr, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.concat(list{printAttributes(attrs), exprDoc})
-    | Pstr_attribute(attr) =>
-      Doc.concat(list{Doc.text("@"), printAttributeWithComments(attr, cmtTbl)})
-    | Pstr_extension(extension, attrs) =>
-      Doc.concat(list{
-        printAttributes(attrs),
-        Doc.concat(list{printExtensionWithComments(~atModuleLvl=true, extension, cmtTbl)}),
-      })
-    | Pstr_include(includeDeclaration) => printIncludeDeclaration(includeDeclaration, cmtTbl)
-    | Pstr_open(openDescription) => printOpenDescription(openDescription, cmtTbl)
-    | Pstr_modtype(modTypeDecl) => printModuleTypeDeclaration(modTypeDecl, cmtTbl)
-    | Pstr_module(moduleBinding) => printModuleBinding(~isRec=false, moduleBinding, cmtTbl, 0)
-    | Pstr_recmodule(moduleBindings) =>
-      printListi(
-        ~getLoc=mb => mb.Parsetree.pmb_loc,
-        ~nodes=moduleBindings,
-        ~print=printModuleBinding(~isRec=true),
-        cmtTbl,
-      )
-    | Pstr_exception(extensionConstructor) => printExceptionDef(extensionConstructor, cmtTbl)
-    | Pstr_typext(typeExtension) => printTypeExtension(typeExtension, cmtTbl)
-    | Pstr_class(_) | Pstr_class_type(_) => Doc.nil
-    }
-
-  and printTypeExtension = (te: Parsetree.type_extension, cmtTbl) => {
-    let prefix = Doc.text("type ")
-    let name = printLidentPath(te.ptyext_path, cmtTbl)
-    let typeParams = printTypeParams(te.ptyext_params, cmtTbl)
-    let extensionConstructors = {
-      let ecs = te.ptyext_constructors
-      let forceBreak = switch (ecs, List.rev(ecs)) {
-      | (list{first, ..._}, list{last, ..._}) =>
-        first.pext_loc.loc_start.pos_lnum > te.ptyext_path.loc.loc_end.pos_lnum ||
-          first.pext_loc.loc_start.pos_lnum < last.pext_loc.loc_end.pos_lnum
-      | _ => false
-      }
-
-      let privateFlag = switch te.ptyext_private {
-      | Asttypes.Private => Doc.concat(list{Doc.text("private"), Doc.line})
-      | Public => Doc.nil
-      }
-
-      let rows = printListi(
-        ~getLoc=n => n.Parsetree.pext_loc,
-        ~print=printExtensionConstructor,
-        ~nodes=ecs,
-        ~forceBreak,
-        cmtTbl,
-      )
-
-      Doc.breakableGroup(
-        ~forceBreak,
-        Doc.indent(
-          Doc.concat(list{
-            Doc.line,
-            privateFlag,
-            rows,
-            /* Doc.join ~sep:Doc.line ( */
-            /* List.mapi printExtensionConstructor ecs */
-            /* ) */
-          }),
-        ),
-      )
-    }
-
-    Doc.group(
-      Doc.concat(list{
-        printAttributes(~loc=te.ptyext_path.loc, te.ptyext_attributes),
-        prefix,
-        name,
-        typeParams,
-        Doc.text(" +="),
-        extensionConstructors,
-      }),
-    )
-  }
-
-  and printModuleBinding = (~isRec, moduleBinding, cmtTbl, i) => {
-    let prefix = if i == 0 {
-      Doc.concat(list{
-        Doc.text("module "),
-        if isRec {
-          Doc.text("rec ")
-        } else {
-          Doc.nil
-        },
-      })
-    } else {
-      Doc.text("and ")
-    }
-
-    let (modExprDoc, modConstraintDoc) = switch moduleBinding.pmb_expr {
-    | {pmod_desc: Pmod_constraint(modExpr, modType)} => (
-        printModExpr(modExpr, cmtTbl),
-        Doc.concat(list{Doc.text(": "), printModType(modType, cmtTbl)}),
-      )
-    | modExpr => (printModExpr(modExpr, cmtTbl), Doc.nil)
-    }
-
-    let modName = {
-      let doc = Doc.text(moduleBinding.pmb_name.Location.txt)
-      printComments(doc, cmtTbl, moduleBinding.pmb_name.loc)
-    }
-
-    let doc = Doc.concat(list{
-      printAttributes(~loc=moduleBinding.pmb_name.loc, moduleBinding.pmb_attributes),
-      prefix,
-      modName,
-      modConstraintDoc,
-      Doc.text(" = "),
-      modExprDoc,
-    })
-    printComments(doc, cmtTbl, moduleBinding.pmb_loc)
-  }
-
-  and printModuleTypeDeclaration = (modTypeDecl: Parsetree.module_type_declaration, cmtTbl) => {
-    let modName = {
-      let doc = Doc.text(modTypeDecl.pmtd_name.txt)
-      printComments(doc, cmtTbl, modTypeDecl.pmtd_name.loc)
-    }
-
-    Doc.concat(list{
-      printAttributes(modTypeDecl.pmtd_attributes),
-      Doc.text("module type "),
-      modName,
-      switch modTypeDecl.pmtd_type {
-      | None => Doc.nil
-      | Some(modType) => Doc.concat(list{Doc.text(" = "), printModType(modType, cmtTbl)})
-      },
-    })
-  }
-
-  and printModType = (modType, cmtTbl) => {
-    let modTypeDoc = switch modType.pmty_desc {
-    | Parsetree.Pmty_ident(longident) =>
-      Doc.concat(list{
-        printAttributes(~loc=longident.loc, modType.pmty_attributes),
-        printLongidentLocation(longident, cmtTbl),
-      })
-    | Pmty_signature(signature) =>
-      let signatureDoc = Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list{
-          Doc.lbrace,
-          Doc.indent(Doc.concat(list{Doc.line, printSignature(signature, cmtTbl)})),
-          Doc.line,
-          Doc.rbrace,
-        }),
-      )
-      Doc.concat(list{printAttributes(modType.pmty_attributes), signatureDoc})
-    | Pmty_functor(_) =>
-      let (parameters, returnType) = ParsetreeViewer.functorType(modType)
-      let parametersDoc = switch parameters {
-      | list{} => Doc.nil
-      | list{(attrs, {Location.txt: "_", loc}, Some(modType))} =>
-        let cmtLoc = {...loc, loc_end: modType.Parsetree.pmty_loc.loc_end}
-
-        let attrs = switch attrs {
-        | list{} => Doc.nil
-        | attrs =>
-          Doc.concat(list{Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)), Doc.line})
-        }
-        let doc = Doc.concat(list{attrs, printModType(modType, cmtTbl)})
-        printComments(doc, cmtTbl, cmtLoc)
-      | params =>
-        Doc.group(
-          Doc.concat(list{
-            Doc.lparen,
-            Doc.indent(
-              Doc.concat(list{
-                Doc.softLine,
-                Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(((
-                    attrs,
-                    lbl,
-                    modType,
-                  )) => {
-                    let cmtLoc = switch modType {
-                    | None => lbl.Asttypes.loc
-                    | Some(modType) => {
-                        ...lbl.Asttypes.loc,
-                        loc_end: modType.Parsetree.pmty_loc.loc_end,
-                      }
-                    }
-
-                    let attrs = switch attrs {
-                    | list{} => Doc.nil
-                    | attrs =>
-                      Doc.concat(list{
-                        Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)),
-                        Doc.line,
-                      })
-                    }
-                    let lblDoc = if lbl.Location.txt == "_" {
-                      Doc.nil
-                    } else {
-                      let doc = Doc.text(lbl.txt)
-                      printComments(doc, cmtTbl, lbl.loc)
-                    }
-
-                    let doc = Doc.concat(list{
-                      attrs,
-                      lblDoc,
-                      switch modType {
-                      | None => Doc.nil
-                      | Some(modType) =>
-                        Doc.concat(list{
-                          if lbl.txt == "_" {
-                            Doc.nil
-                          } else {
-                            Doc.text(": ")
-                          },
-                          printModType(modType, cmtTbl),
-                        })
-                      },
-                    })
-                    printComments(doc, cmtTbl, cmtLoc)
-                  }, params)),
-              }),
-            ),
-            Doc.trailingComma,
-            Doc.softLine,
-            Doc.rparen,
-          }),
-        )
-      }
-
-      let returnDoc = {
-        let doc = printModType(returnType, cmtTbl)
-        if Parens.modTypeFunctorReturn(returnType) {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-
-      Doc.group(
-        Doc.concat(list{
-          parametersDoc,
-          Doc.group(Doc.concat(list{Doc.text(" =>"), Doc.line, returnDoc})),
-        }),
-      )
-    | Pmty_typeof(modExpr) =>
-      Doc.concat(list{Doc.text("module type of "), printModExpr(modExpr, cmtTbl)})
-    | Pmty_extension(extension) => printExtensionWithComments(~atModuleLvl=false, extension, cmtTbl)
-    | Pmty_alias(longident) =>
-      Doc.concat(list{Doc.text("module "), printLongidentLocation(longident, cmtTbl)})
-    | Pmty_with(modType, withConstraints) =>
-      let operand = {
-        let doc = printModType(modType, cmtTbl)
-        if Parens.modTypeWithOperand(modType) {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-
-      Doc.group(
-        Doc.concat(list{
-          operand,
-          Doc.indent(Doc.concat(list{Doc.line, printWithConstraints(withConstraints, cmtTbl)})),
-        }),
-      )
-    }
-
-    let attrsAlreadyPrinted = switch modType.pmty_desc {
-    | Pmty_functor(_) | Pmty_signature(_) | Pmty_ident(_) => true
-    | _ => false
-    }
-
-    let doc = Doc.concat(list{
-      if attrsAlreadyPrinted {
-        Doc.nil
-      } else {
-        printAttributes(modType.pmty_attributes)
-      },
-      modTypeDoc,
-    })
-    printComments(doc, cmtTbl, modType.pmty_loc)
-  }
-
-  and printWithConstraints = (withConstraints, cmtTbl) => {
-    let rows = List.mapi((i, withConstraint) =>
-      Doc.group(
-        Doc.concat(list{
-          if i === 0 {
-            Doc.text("with ")
-          } else {
-            Doc.text("and ")
-          },
-          printWithConstraint(withConstraint, cmtTbl),
-        }),
-      )
-    , withConstraints)
-
-    Doc.join(~sep=Doc.line, rows)
-  }
-
-  and printWithConstraint = (withConstraint: Parsetree.with_constraint, cmtTbl) =>
-    switch withConstraint {
-    /* with type X.t = ... */
-    | Pwith_type(longident, typeDeclaration) =>
-      Doc.group(
-        printTypeDeclaration(
-          ~name=printLidentPath(longident, cmtTbl),
-          ~equalSign="=",
-          ~recFlag=Doc.nil,
-          0,
-          typeDeclaration,
-          CommentTable.empty,
-        ),
-      )
-    /* with module X.Y = Z */
-    | Pwith_module({txt: longident1}, {txt: longident2}) =>
-      Doc.concat(list{
-        Doc.text("module "),
-        printLongident(longident1),
-        Doc.text(" ="),
-        Doc.indent(Doc.concat(list{Doc.line, printLongident(longident2)})),
-      })
-    /* with type X.t := ..., same format as [Pwith_type] */
-    | Pwith_typesubst(longident, typeDeclaration) =>
-      Doc.group(
-        printTypeDeclaration(
-          ~name=printLidentPath(longident, cmtTbl),
-          ~equalSign=":=",
-          ~recFlag=Doc.nil,
-          0,
-          typeDeclaration,
-          CommentTable.empty,
-        ),
-      )
-    | Pwith_modsubst({txt: longident1}, {txt: longident2}) =>
-      Doc.concat(list{
-        Doc.text("module "),
-        printLongident(longident1),
-        Doc.text(" :="),
-        Doc.indent(Doc.concat(list{Doc.line, printLongident(longident2)})),
-      })
-    }
-
-  and printSignature = (signature, cmtTbl) =>
-    switch signature {
-    | list{} => printCommentsInside(cmtTbl, Location.none)
-    | signature =>
-      printList(
-        ~getLoc=s => s.Parsetree.psig_loc,
-        ~nodes=signature,
-        ~print=printSignatureItem,
-        cmtTbl,
-      )
-    }
-
-  and printSignatureItem = (si: Parsetree.signature_item, cmtTbl) =>
-    switch si.psig_desc {
-    | Parsetree.Psig_value(valueDescription) => printValueDescription(valueDescription, cmtTbl)
-    | Psig_type(recFlag, typeDeclarations) =>
-      let recFlag = switch recFlag {
-      | Asttypes.Nonrecursive => Doc.nil
-      | Asttypes.Recursive => Doc.text("rec ")
-      }
-
-      printTypeDeclarations(~recFlag, typeDeclarations, cmtTbl)
-    | Psig_typext(typeExtension) => printTypeExtension(typeExtension, cmtTbl)
-    | Psig_exception(extensionConstructor) => printExceptionDef(extensionConstructor, cmtTbl)
-    | Psig_module(moduleDeclaration) => printModuleDeclaration(moduleDeclaration, cmtTbl)
-    | Psig_recmodule(moduleDeclarations) => printRecModuleDeclarations(moduleDeclarations, cmtTbl)
-    | Psig_modtype(modTypeDecl) => printModuleTypeDeclaration(modTypeDecl, cmtTbl)
-    | Psig_open(openDescription) => printOpenDescription(openDescription, cmtTbl)
-    | Psig_include(includeDescription) => printIncludeDescription(includeDescription, cmtTbl)
-    | Psig_attribute(attr) =>
-      Doc.concat(list{Doc.text("@"), printAttributeWithComments(attr, cmtTbl)})
-    | Psig_extension(extension, attrs) =>
-      Doc.concat(list{
-        printAttributes(attrs),
-        Doc.concat(list{printExtensionWithComments(~atModuleLvl=true, extension, cmtTbl)}),
-      })
-    | Psig_class(_) | Psig_class_type(_) => Doc.nil
-    }
-
-  and printRecModuleDeclarations = (moduleDeclarations, cmtTbl) =>
-    printListi(
-      ~getLoc=n => n.Parsetree.pmd_loc,
-      ~nodes=moduleDeclarations,
-      ~print=printRecModuleDeclaration,
-      cmtTbl,
-    )
-
-  and printRecModuleDeclaration = (md, cmtTbl, i) => {
-    let body = switch md.pmd_type.pmty_desc {
-    | Parsetree.Pmty_alias(longident) =>
-      Doc.concat(list{Doc.text(" = "), printLongidentLocation(longident, cmtTbl)})
-    | _ =>
-      let needsParens = switch md.pmd_type.pmty_desc {
-      | Pmty_with(_) => true
-      | _ => false
-      }
-
-      let modTypeDoc = {
-        let doc = printModType(md.pmd_type, cmtTbl)
-        if needsParens {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-
-      Doc.concat(list{Doc.text(": "), modTypeDoc})
-    }
-
-    let prefix = if i < 1 {
-      "module rec "
-    } else {
-      "and "
-    }
-    Doc.concat(list{
-      printAttributes(~loc=md.pmd_name.loc, md.pmd_attributes),
-      Doc.text(prefix),
-      printComments(Doc.text(md.pmd_name.txt), cmtTbl, md.pmd_name.loc),
-      body,
-    })
-  }
-
-  and printModuleDeclaration = (md: Parsetree.module_declaration, cmtTbl) => {
-    let body = switch md.pmd_type.pmty_desc {
-    | Parsetree.Pmty_alias(longident) =>
-      Doc.concat(list{Doc.text(" = "), printLongidentLocation(longident, cmtTbl)})
-    | _ => Doc.concat(list{Doc.text(": "), printModType(md.pmd_type, cmtTbl)})
-    }
-
-    Doc.concat(list{
-      printAttributes(~loc=md.pmd_name.loc, md.pmd_attributes),
-      Doc.text("module "),
-      printComments(Doc.text(md.pmd_name.txt), cmtTbl, md.pmd_name.loc),
-      body,
-    })
-  }
-
-  and printOpenDescription = (openDescription: Parsetree.open_description, p) =>
-    Doc.concat(list{
-      printAttributes(openDescription.popen_attributes),
-      Doc.text("open"),
-      switch openDescription.popen_override {
-      | Asttypes.Fresh => Doc.space
-      | Asttypes.Override => Doc.text("! ")
-      },
-      printLongidentLocation(openDescription.popen_lid, p),
-    })
-
-  and printIncludeDescription = (includeDescription: Parsetree.include_description, cmtTbl) =>
-    Doc.concat(list{
-      printAttributes(includeDescription.pincl_attributes),
-      Doc.text("include "),
-      printModType(includeDescription.pincl_mod, cmtTbl),
-    })
-
-  and printIncludeDeclaration = (includeDeclaration: Parsetree.include_declaration, cmtTbl) => {
-    let isJsFfiImport = List.exists(attr =>
-      switch attr {
-      | ({Location.txt: "ns.jsFfi"}, _) => true
-      | _ => false
-      }
-    , includeDeclaration.pincl_attributes)
-
-    if isJsFfiImport {
-      printJsFfiImportDeclaration(includeDeclaration, cmtTbl)
-    } else {
-      Doc.concat(list{
-        printAttributes(includeDeclaration.pincl_attributes),
-        Doc.text("include "),
-        {
-          let includeDoc = printModExpr(includeDeclaration.pincl_mod, cmtTbl)
-
-          if Parens.includeModExpr(includeDeclaration.pincl_mod) {
-            addParens(includeDoc)
-          } else {
-            includeDoc
-          }
-        },
-      })
-    }
-  }
-
-  and printJsFfiImport = (valueDescription: Parsetree.value_description, cmtTbl) => {
-    let attrs = List.filter(attr =>
-      switch attr {
-      | ({Location.txt: "bs.val" | "genType.import" | "bs.scope"}, _) => false
-      | _ => true
-      }
-    , valueDescription.pval_attributes)
-    let (ident, alias) = switch valueDescription.pval_prim {
-    | list{primitive, ..._} =>
-      if primitive != valueDescription.pval_name.txt {
-        (
-          printIdentLike(primitive),
-          Doc.concat(list{Doc.text(" as "), printIdentLike(valueDescription.pval_name.txt)}),
-        )
-      } else {
-        (printIdentLike(primitive), Doc.nil)
-      }
-    | _ => (printIdentLike(valueDescription.pval_name.txt), Doc.nil)
-    }
-
-    Doc.concat(list{
-      printAttributes(~loc=valueDescription.pval_name.loc, attrs),
-      ident,
-      alias,
-      Doc.text(": "),
-      printTypExpr(valueDescription.pval_type, cmtTbl),
-    })
-  }
-
-  and printJsFfiImportScope = (scope: ParsetreeViewer.jsImportScope) =>
-    switch scope {
-    | JsGlobalImport => Doc.nil
-    | JsModuleImport(modName) =>
-      Doc.concat(list{Doc.text(" from "), Doc.doubleQuote, Doc.text(modName), Doc.doubleQuote})
-    | JsScopedImport(idents) =>
-      Doc.concat(list{Doc.text(" from "), Doc.join(~sep=Doc.dot, List.map(Doc.text, idents))})
-    }
-
-  and printJsFfiImportDeclaration = (includeDeclaration: Parsetree.include_declaration, cmtTbl) => {
-    let attrs = List.filter(attr =>
-      switch attr {
-      | ({Location.txt: "ns.jsFfi"}, _) => false
-      | _ => true
-      }
-    , includeDeclaration.pincl_attributes)
-
-    let imports = ParsetreeViewer.extractValueDescriptionFromModExpr(includeDeclaration.pincl_mod)
-    let scope = switch imports {
-    | list{vd, ..._} => ParsetreeViewer.classifyJsImport(vd)
-    | list{} => ParsetreeViewer.JsGlobalImport
-    }
-
-    let scopeDoc = printJsFfiImportScope(scope)
-    Doc.group(
-      Doc.concat(list{
-        printAttributes(attrs),
-        Doc.text("import "),
-        Doc.group(
-          Doc.concat(list{
-            Doc.lbrace,
-            Doc.indent(
-              Doc.concat(list{
-                Doc.softLine,
-                Doc.join(
-                  ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                  List.map(vd => printJsFfiImport(vd, cmtTbl), imports),
-                ),
-              }),
-            ),
-            Doc.trailingComma,
-            Doc.softLine,
-            Doc.rbrace,
-          }),
-        ),
-        scopeDoc,
-      }),
-    )
-  }
-
-  and printValueBindings = (~recFlag, vbs: list<Parsetree.value_binding>, cmtTbl) =>
-    printListi(
-      ~getLoc=vb => vb.Parsetree.pvb_loc,
-      ~nodes=vbs,
-      ~print=printValueBinding(~recFlag),
-      cmtTbl,
-    )
-
-  and printValueDescription = (valueDescription, cmtTbl) => {
-    let isExternal = switch valueDescription.pval_prim {
-    | list{} => false
-    | _ => true
-    }
-
-    Doc.group(
-      Doc.concat(list{
-        printAttributes(valueDescription.pval_attributes),
-        Doc.text(
-          if isExternal {
-            "external "
-          } else {
-            "let "
-          },
-        ),
-        printComments(
-          printIdentLike(valueDescription.pval_name.txt),
-          cmtTbl,
-          valueDescription.pval_name.loc,
-        ),
-        Doc.text(": "),
-        printTypExpr(valueDescription.pval_type, cmtTbl),
-        if isExternal {
-          Doc.group(
-            Doc.concat(list{
-              Doc.text(" ="),
-              Doc.indent(
-                Doc.concat(list{
-                  Doc.line,
-                  Doc.join(
-                    ~sep=Doc.line,
-                    List.map(
-                      s => Doc.concat(list{Doc.text("\""), Doc.text(s), Doc.text("\"")}),
-                      valueDescription.pval_prim,
-                    ),
-                  ),
-                }),
-              ),
-            }),
-          )
-        } else {
-          Doc.nil
-        },
-      }),
-    )
-  }
-
-  and printTypeDeclarations = (~recFlag, typeDeclarations, cmtTbl) =>
-    printListi(
-      ~getLoc=n => n.Parsetree.ptype_loc,
-      ~nodes=typeDeclarations,
-      ~print=printTypeDeclaration2(~recFlag),
-      cmtTbl,
-    )
-
-  /*
-   * type_declaration = {
-   *    ptype_name: string loc;
-   *    ptype_params: (core_type * variance) list;
-   *          (* ('a1,...'an) t; None represents  _*)
-   *    ptype_cstrs: (core_type * core_type * Location.t) list;
-   *          (* ... constraint T1=T1'  ... constraint Tn=Tn' *)
-   *    ptype_kind: type_kind;
-   *    ptype_private: private_flag;   (* = private ... *)
-   *    ptype_manifest: core_type option;  (* = T *)
-   *    ptype_attributes: attributes;   (* ... [@@id1] [@@id2] *)
-   *    ptype_loc: Location.t;
-   * }
-   *
-   *
-   *  type t                     (abstract, no manifest)
-   *  type t = T0                (abstract, manifest=T0)
-   *  type t = C of T | ...      (variant,  no manifest)
-   *  type t = T0 = C of T | ... (variant,  manifest=T0)
-   *  type t = {l: T; ...}       (record,   no manifest)
-   *  type t = T0 = {l : T; ...} (record,   manifest=T0)
-   *  type t = ..                (open,     no manifest)
-   *
-   *
-   * and type_kind =
-   *  | Ptype_abstract
-   *  | Ptype_variant of constructor_declaration list
-   *        (* Invariant: non-empty list *)
-   *  | Ptype_record of label_declaration list
-   *        (* Invariant: non-empty list *)
-   *  | Ptype_open
-   */
-  and printTypeDeclaration = (
-    ~name,
-    ~equalSign,
-    ~recFlag,
-    i,
-    td: Parsetree.type_declaration,
-    cmtTbl,
-  ) => {
-    let (hasGenType, attrs) = ParsetreeViewer.splitGenTypeAttr(td.ptype_attributes)
-    let attrs = printAttributes(~loc=td.ptype_loc, attrs)
-    let prefix = if i > 0 {
-      Doc.concat(list{
-        Doc.text("and "),
-        if hasGenType {
-          Doc.text("export ")
-        } else {
-          Doc.nil
-        },
-      })
-    } else {
-      Doc.concat(list{
-        Doc.text(
-          if hasGenType {
-            "export type "
-          } else {
-            "type "
-          },
-        ),
-        recFlag,
-      })
-    }
-
-    let typeName = name
-    let typeParams = printTypeParams(td.ptype_params, cmtTbl)
-    let manifestAndKind = switch td.ptype_kind {
-    | Ptype_abstract =>
-      switch td.ptype_manifest {
-      | None => Doc.nil
-      | Some(typ) =>
-        Doc.concat(list{
-          Doc.concat(list{Doc.space, Doc.text(equalSign), Doc.space}),
-          printPrivateFlag(td.ptype_private),
-          printTypExpr(typ, cmtTbl),
-        })
-      }
-    | Ptype_open =>
-      Doc.concat(list{
-        Doc.concat(list{Doc.space, Doc.text(equalSign), Doc.space}),
-        printPrivateFlag(td.ptype_private),
-        Doc.text(".."),
-      })
-    | Ptype_record(lds) =>
-      let manifest = switch td.ptype_manifest {
-      | None => Doc.nil
-      | Some(typ) =>
-        Doc.concat(list{
-          Doc.concat(list{Doc.space, Doc.text(equalSign), Doc.space}),
-          printTypExpr(typ, cmtTbl),
-        })
-      }
-
-      Doc.concat(list{
-        manifest,
-        Doc.concat(list{Doc.space, Doc.text(equalSign), Doc.space}),
-        printPrivateFlag(td.ptype_private),
-        printRecordDeclaration(lds, cmtTbl),
-      })
-    | Ptype_variant(cds) =>
-      let manifest = switch td.ptype_manifest {
-      | None => Doc.nil
-      | Some(typ) =>
-        Doc.concat(list{
-          Doc.concat(list{Doc.space, Doc.text(equalSign), Doc.space}),
-          printTypExpr(typ, cmtTbl),
-        })
-      }
-
-      Doc.concat(list{
-        manifest,
-        Doc.concat(list{Doc.space, Doc.text(equalSign)}),
-        printConstructorDeclarations(~privateFlag=td.ptype_private, cds, cmtTbl),
-      })
-    }
-
-    let constraints = printTypeDefinitionConstraints(td.ptype_cstrs)
-    Doc.group(Doc.concat(list{attrs, prefix, typeName, typeParams, manifestAndKind, constraints}))
-  }
-
-  and printTypeDeclaration2 = (~recFlag, td: Parsetree.type_declaration, cmtTbl, i) => {
-    let name = {
-      let doc = printIdentLike(td.Parsetree.ptype_name.txt)
-      printComments(doc, cmtTbl, td.ptype_name.loc)
-    }
-
-    let equalSign = "="
-    let (hasGenType, attrs) = ParsetreeViewer.splitGenTypeAttr(td.ptype_attributes)
-    let attrs = printAttributes(~loc=td.ptype_loc, attrs)
-    let prefix = if i > 0 {
-      Doc.concat(list{
-        Doc.text("and "),
-        if hasGenType {
-          Doc.text("export ")
-        } else {
-          Doc.nil
-        },
-      })
-    } else {
-      Doc.concat(list{
-        Doc.text(
-          if hasGenType {
-            "export type "
-          } else {
-            "type "
-          },
-        ),
-        recFlag,
-      })
-    }
-
-    let typeName = name
-    let typeParams = printTypeParams(td.ptype_params, cmtTbl)
-    let manifestAndKind = switch td.ptype_kind {
-    | Ptype_abstract =>
-      switch td.ptype_manifest {
-      | None => Doc.nil
-      | Some(typ) =>
-        Doc.concat(list{
-          Doc.concat(list{Doc.space, Doc.text(equalSign), Doc.space}),
-          printPrivateFlag(td.ptype_private),
-          printTypExpr(typ, cmtTbl),
-        })
-      }
-    | Ptype_open =>
-      Doc.concat(list{
-        Doc.concat(list{Doc.space, Doc.text(equalSign), Doc.space}),
-        printPrivateFlag(td.ptype_private),
-        Doc.text(".."),
-      })
-    | Ptype_record(lds) =>
-      let manifest = switch td.ptype_manifest {
-      | None => Doc.nil
-      | Some(typ) =>
-        Doc.concat(list{
-          Doc.concat(list{Doc.space, Doc.text(equalSign), Doc.space}),
-          printTypExpr(typ, cmtTbl),
-        })
-      }
-
-      Doc.concat(list{
-        manifest,
-        Doc.concat(list{Doc.space, Doc.text(equalSign), Doc.space}),
-        printPrivateFlag(td.ptype_private),
-        printRecordDeclaration(lds, cmtTbl),
-      })
-    | Ptype_variant(cds) =>
-      let manifest = switch td.ptype_manifest {
-      | None => Doc.nil
-      | Some(typ) =>
-        Doc.concat(list{
-          Doc.concat(list{Doc.space, Doc.text(equalSign), Doc.space}),
-          printTypExpr(typ, cmtTbl),
-        })
-      }
-
-      Doc.concat(list{
-        manifest,
-        Doc.concat(list{Doc.space, Doc.text(equalSign)}),
-        printConstructorDeclarations(~privateFlag=td.ptype_private, cds, cmtTbl),
-      })
-    }
-
-    let constraints = printTypeDefinitionConstraints(td.ptype_cstrs)
-    Doc.group(Doc.concat(list{attrs, prefix, typeName, typeParams, manifestAndKind, constraints}))
-  }
-
-  and printTypeDefinitionConstraints = cstrs =>
-    switch cstrs {
-    | list{} => Doc.nil
-    | cstrs =>
-      Doc.indent(
-        Doc.group(
-          Doc.concat(list{
-            Doc.line,
-            Doc.group(Doc.join(~sep=Doc.line, List.map(printTypeDefinitionConstraint, cstrs))),
-          }),
-        ),
-      )
-    }
-
-  and printTypeDefinitionConstraint = (
-    (typ1, typ2, _loc): (Parsetree.core_type, Parsetree.core_type, Location.t),
-  ) =>
-    Doc.concat(list{
-      Doc.text("constraint "),
-      printTypExpr(typ1, CommentTable.empty),
-      Doc.text(" = "),
-      printTypExpr(typ2, CommentTable.empty),
-    })
-
-  and printPrivateFlag = (flag: Asttypes.private_flag) =>
-    switch flag {
-    | Private => Doc.text("private ")
-    | Public => Doc.nil
-    }
-
-  and printTypeParams = (typeParams, cmtTbl) =>
-    switch typeParams {
-    | list{} => Doc.nil
-    | typeParams =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lessThan,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(typeParam => {
-                  let doc = printTypeParam(typeParam, cmtTbl)
-                  printComments(doc, cmtTbl, fst(typeParam).Parsetree.ptyp_loc)
-                }, typeParams)),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.greaterThan,
-        }),
-      )
-    }
-
-  and printTypeParam = (param: (Parsetree.core_type, Asttypes.variance), cmtTbl) => {
-    let (typ, variance) = param
-    let printedVariance = switch variance {
-    | Covariant => Doc.text("+")
-    | Contravariant => Doc.text("-")
-    | Invariant => Doc.nil
-    }
-
-    Doc.concat(list{printedVariance, printTypExpr(typ, cmtTbl)})
-  }
-
-  and printRecordDeclaration = (lds: list<Parsetree.label_declaration>, cmtTbl) => {
-    let forceBreak = switch (lds, List.rev(lds)) {
-    | (list{first, ..._}, list{last, ..._}) =>
-      first.pld_loc.loc_start.pos_lnum < last.pld_loc.loc_end.pos_lnum
-    | _ => false
-    }
-
-    Doc.breakableGroup(
-      ~forceBreak,
-      Doc.concat(list{
-        Doc.lbrace,
-        Doc.indent(
-          Doc.concat(list{
-            Doc.softLine,
-            Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(ld => {
-                let doc = printLabelDeclaration(ld, cmtTbl)
-                printComments(doc, cmtTbl, ld.Parsetree.pld_loc)
-              }, lds)),
-          }),
-        ),
-        Doc.trailingComma,
-        Doc.softLine,
-        Doc.rbrace,
-      }),
-    )
-  }
-
-  and printConstructorDeclarations = (
-    ~privateFlag,
-    cds: list<Parsetree.constructor_declaration>,
-    cmtTbl,
-  ) => {
-    let forceBreak = switch (cds, List.rev(cds)) {
-    | (list{first, ..._}, list{last, ..._}) =>
-      first.pcd_loc.loc_start.pos_lnum < last.pcd_loc.loc_end.pos_lnum
-    | _ => false
-    }
-
-    let privateFlag = switch privateFlag {
-    | Asttypes.Private => Doc.concat(list{Doc.text("private"), Doc.line})
-    | Public => Doc.nil
-    }
-
-    let rows = printListi(
-      ~getLoc=cd => cd.Parsetree.pcd_loc,
-      ~nodes=cds,
-      ~print=(cd, cmtTbl, i) => {
-        let doc = printConstructorDeclaration2(i, cd, cmtTbl)
-        printComments(doc, cmtTbl, cd.Parsetree.pcd_loc)
-      },
-      ~forceBreak,
-      cmtTbl,
-    )
-
-    Doc.breakableGroup(~forceBreak, Doc.indent(Doc.concat(list{Doc.line, privateFlag, rows})))
-  }
-
-  and printConstructorDeclaration2 = (i, cd: Parsetree.constructor_declaration, cmtTbl) => {
-    let attrs = printAttributes(cd.pcd_attributes)
-    let bar = if i > 0 {
-      Doc.text("| ")
-    } else {
-      Doc.ifBreaks(Doc.text("| "), Doc.nil)
-    }
-
-    let constrName = {
-      let doc = Doc.text(cd.pcd_name.txt)
-      printComments(doc, cmtTbl, cd.pcd_name.loc)
-    }
-
-    let constrArgs = printConstructorArguments(~indent=true, cd.pcd_args, cmtTbl)
-    let gadt = switch cd.pcd_res {
-    | None => Doc.nil
-    | Some(typ) => Doc.indent(Doc.concat(list{Doc.text(": "), printTypExpr(typ, cmtTbl)}))
-    }
-
-    Doc.concat(list{
-      bar,
-      Doc.group(
-        Doc.concat(list{
-          attrs /* TODO: fix parsing of attributes, so when can print them above the bar? */,
-          constrName,
-          constrArgs,
-          gadt,
-        }),
-      ),
-    })
-  }
-
-  and printConstructorArguments = (~indent, cdArgs: Parsetree.constructor_arguments, cmtTbl) =>
-    switch cdArgs {
-    | Pcstr_tuple(list{}) => Doc.nil
-    | Pcstr_tuple(types) =>
-      let args = Doc.concat(list{
-        Doc.lparen,
-        Doc.indent(
-          Doc.concat(list{
-            Doc.softLine,
-            Doc.join(
-              ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-              List.map(typexpr => printTypExpr(typexpr, cmtTbl), types),
-            ),
-          }),
-        ),
-        Doc.trailingComma,
-        Doc.softLine,
-        Doc.rparen,
-      })
-      Doc.group(
-        if indent {
-          Doc.indent(args)
-        } else {
-          args
-        },
-      )
-    | Pcstr_record(lds) =>
-      let args = Doc.concat(list{
-        Doc.lparen,
-        /* manually inline the printRecordDeclaration, gives better layout */
-        Doc.lbrace,
-        Doc.indent(
-          Doc.concat(list{
-            Doc.softLine,
-            Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(ld => {
-                let doc = printLabelDeclaration(ld, cmtTbl)
-                printComments(doc, cmtTbl, ld.Parsetree.pld_loc)
-              }, lds)),
-          }),
-        ),
-        Doc.trailingComma,
-        Doc.softLine,
-        Doc.rbrace,
-        Doc.rparen,
-      })
-      if indent {
-        Doc.indent(args)
-      } else {
-        args
-      }
-    }
-
-  and printLabelDeclaration = (ld: Parsetree.label_declaration, cmtTbl) => {
-    let attrs = printAttributes(~loc=ld.pld_name.loc, ld.pld_attributes)
-    let mutableFlag = switch ld.pld_mutable {
-    | Mutable => Doc.text("mutable ")
-    | Immutable => Doc.nil
-    }
-
-    let name = {
-      let doc = printIdentLike(ld.pld_name.txt)
-      printComments(doc, cmtTbl, ld.pld_name.loc)
-    }
-
-    Doc.group(
-      Doc.concat(list{attrs, mutableFlag, name, Doc.text(": "), printTypExpr(ld.pld_type, cmtTbl)}),
-    )
-  }
-
-  and printTypExpr = (typExpr: Parsetree.core_type, cmtTbl) => {
-    let renderedType = switch typExpr.ptyp_desc {
-    | Ptyp_any => Doc.text("_")
-    | Ptyp_var(var) => Doc.concat(list{Doc.text("'"), printIdentLike(var)})
-    | Ptyp_extension(extension) => printExtensionWithComments(~atModuleLvl=false, extension, cmtTbl)
-    | Ptyp_alias(typ, alias) =>
-      let typ = {
-        /* Technically type t = (string, float) => unit as 'x, doesn't require
-         * parens around the arrow expression. This is very confusing though.
-         * Is the "as" part of "unit" or "(string, float) => unit". By printing
-         * parens we guide the user towards its meaning. */
-        let needsParens = switch typ.ptyp_desc {
-        | Ptyp_arrow(_) => true
-        | _ => false
-        }
-
-        let doc = printTypExpr(typ, cmtTbl)
-        if needsParens {
-          Doc.concat(list{Doc.lparen, doc, Doc.rparen})
-        } else {
-          doc
-        }
-      }
-
-      Doc.concat(list{
-        typ,
-        Doc.text(" as "),
-        Doc.concat(list{Doc.text("'"), printIdentLike(alias)}),
-      })
-    | Ptyp_constr(
-        {txt: Longident.Ldot(Longident.Lident("Js"), "t")},
-        list{{ptyp_desc: Ptyp_object(_fields, _openFlag)} as typ},
-      ) =>
-      let bsObject = printTypExpr(typ, cmtTbl)
-      switch typExpr.ptyp_attributes {
-      | list{} => bsObject
-      | attrs =>
-        Doc.concat(list{
-          Doc.group(Doc.join(~sep=Doc.line, List.map(printAttribute, attrs))),
-          Doc.space,
-          printTypExpr(typ, cmtTbl),
-        })
-      }
-    | Ptyp_constr(longidentLoc, list{{ptyp_desc: Parsetree.Ptyp_tuple(tuple)}}) =>
-      let constrName = printLidentPath(longidentLoc, cmtTbl)
-      Doc.group(
-        Doc.concat(list{
-          constrName,
-          Doc.lessThan,
-          printTupleType(~inline=true, tuple, cmtTbl),
-          Doc.greaterThan,
-        }),
-      )
-    | Ptyp_constr(longidentLoc, constrArgs) =>
-      let constrName = printLidentPath(longidentLoc, cmtTbl)
-      switch constrArgs {
-      | list{} => constrName
-      | list{{
-          Parsetree.ptyp_desc:
-            Ptyp_constr(
-              {txt: Longident.Ldot(Longident.Lident("Js"), "t")},
-              list{{ptyp_desc: Ptyp_object(fields, openFlag)}},
-            ),
-        }} =>
-        Doc.concat(list{
-          constrName,
-          Doc.lessThan,
-          printBsObjectSugar(~inline=true, fields, openFlag, cmtTbl),
-          Doc.greaterThan,
-        })
-      | _args =>
-        Doc.group(
-          Doc.concat(list{
-            constrName,
-            Doc.lessThan,
-            Doc.indent(
-              Doc.concat(list{
-                Doc.softLine,
-                Doc.join(
-                  ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                  List.map(typexpr => printTypExpr(typexpr, cmtTbl), constrArgs),
-                ),
-              }),
-            ),
-            Doc.trailingComma,
-            Doc.softLine,
-            Doc.greaterThan,
-          }),
-        )
-      }
-    | Ptyp_arrow(_) =>
-      let (attrsBefore, args, returnType) = ParsetreeViewer.arrowType(typExpr)
-      let returnTypeNeedsParens = switch returnType.ptyp_desc {
-      | Ptyp_alias(_) => true
-      | _ => false
-      }
-
-      let returnDoc = {
-        let doc = printTypExpr(returnType, cmtTbl)
-        if returnTypeNeedsParens {
-          Doc.concat(list{Doc.lparen, doc, Doc.rparen})
-        } else {
-          doc
-        }
-      }
-
-      let (isUncurried, attrs) = ParsetreeViewer.processUncurriedAttribute(attrsBefore)
-
-      switch args {
-      | list{} => Doc.nil
-      | list{(list{}, Nolabel, n)} when !isUncurried =>
-        let hasAttrsBefore = !(attrs == list{})
-        let attrs = if hasAttrsBefore {
-          Doc.concat(list{
-            Doc.join(~sep=Doc.line, List.map(printAttribute, attrsBefore)),
-            Doc.space,
-          })
-        } else {
-          Doc.nil
-        }
-
-        let typDoc = {
-          let doc = printTypExpr(n, cmtTbl)
-          switch n.ptyp_desc {
-          | Ptyp_arrow(_) | Ptyp_tuple(_) => addParens(doc)
-          | _ => doc
-          }
-        }
-
-        Doc.group(
-          Doc.concat(list{
-            Doc.group(attrs),
-            Doc.group(
-              if hasAttrsBefore {
-                Doc.concat(list{
-                  Doc.lparen,
-                  Doc.indent(Doc.concat(list{Doc.softLine, typDoc, Doc.text(" => "), returnDoc})),
-                  Doc.softLine,
-                  Doc.rparen,
-                })
-              } else {
-                Doc.concat(list{typDoc, Doc.text(" => "), returnDoc})
-              },
-            ),
-          }),
-        )
-      | args =>
-        let attrs = switch attrs {
-        | list{} => Doc.nil
-        | attrs =>
-          Doc.concat(list{Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)), Doc.space})
-        }
-
-        let renderedArgs = Doc.concat(list{
-          attrs,
-          Doc.text("("),
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              if isUncurried {
-                Doc.concat(list{Doc.dot, Doc.space})
-              } else {
-                Doc.nil
-              },
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(tp => printTypeParameter(tp, cmtTbl), args),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.text(")"),
-        })
-        Doc.group(Doc.concat(list{renderedArgs, Doc.text(" => "), returnDoc}))
-      }
-    | Ptyp_tuple(types) => printTupleType(~inline=false, types, cmtTbl)
-    | Ptyp_object(fields, openFlag) => printBsObjectSugar(~inline=false, fields, openFlag, cmtTbl)
-    | Ptyp_poly(list{}, typ) => printTypExpr(typ, cmtTbl)
-    | Ptyp_poly(stringLocs, typ) => Doc.concat(list{Doc.join(~sep=Doc.space, List.map(({
-            Location.txt: txt,
-            loc,
-          }) => {
-            let doc = Doc.concat(list{Doc.text("'"), Doc.text(txt)})
-            printComments(doc, cmtTbl, loc)
-          }, stringLocs)), Doc.dot, Doc.space, printTypExpr(typ, cmtTbl)})
-    | Ptyp_package(packageType) =>
-      printPackageType(~printModuleKeywordAndParens=true, packageType, cmtTbl)
-    | Ptyp_class(_) => Doc.text("classes are not supported in types")
-    | Ptyp_variant(rowFields, closedFlag, labelsOpt) =>
-      let printRowField = x =>
-        switch x {
-        | Parsetree.Rtag({txt}, attrs, true, list{}) =>
-          Doc.concat(list{
-            printAttributes(attrs),
-            Doc.concat(list{Doc.text("#"), printIdentLike(~allowUident=true, txt)}),
-          })
-        | Rtag({txt}, attrs, truth, types) =>
-          let doType = t =>
-            switch t.Parsetree.ptyp_desc {
-            | Ptyp_tuple(_) => printTypExpr(t, cmtTbl)
-            | _ => Doc.concat(list{Doc.lparen, printTypExpr(t, cmtTbl), Doc.rparen})
-            }
-
-          let printedTypes = List.map(doType, types)
-          let cases = Doc.join(~sep=Doc.concat(list{Doc.line, Doc.text("& ")}), printedTypes)
-          let cases = if truth {
-            Doc.concat(list{Doc.line, Doc.text("& "), cases})
-          } else {
-            cases
-          }
-          Doc.group(
-            Doc.concat(list{
-              printAttributes(attrs),
-              Doc.concat(list{Doc.text("#"), printIdentLike(~allowUident=true, txt)}),
-              cases,
-            }),
-          )
-        | Rinherit(coreType) => printTypExpr(coreType, cmtTbl)
-        }
-
-      let docs = List.map(printRowField, rowFields)
-      let cases = Doc.join(~sep=Doc.concat(list{Doc.line, Doc.text("| ")}), docs)
-      let cases = if docs == list{} {
-        cases
-      } else {
-        Doc.concat(list{Doc.text("| "), cases})
-      }
-      let openingSymbol = if closedFlag == Open {
-        Doc.greaterThan
-      } else if labelsOpt == None {
-        Doc.nil
-      } else {
-        Doc.lessThan
-      }
-      let hasLabels = labelsOpt != None && labelsOpt != Some(list{})
-      let labels = switch labelsOpt {
-      | None | Some(list{}) => Doc.nil
-      | Some(labels) =>
-        Doc.concat(
-          List.map(
-            label =>
-              Doc.concat(list{Doc.line, Doc.text("#"), printIdentLike(~allowUident=true, label)}),
-            labels,
-          ),
-        )
-      }
-
-      let closingSymbol = if hasLabels {
-        Doc.text(" >")
-      } else {
-        Doc.nil
-      }
-      Doc.group(
-        Doc.concat(list{
-          Doc.lbracket,
-          openingSymbol,
-          Doc.line,
-          cases,
-          closingSymbol,
-          labels,
-          Doc.line,
-          Doc.rbracket,
-        }),
-      )
-    }
-
-    let shouldPrintItsOwnAttributes = switch typExpr.ptyp_desc {
-    | Ptyp_arrow(_) /* es6 arrow types print their own attributes */
-    | Ptyp_constr({txt: Longident.Ldot(Longident.Lident("Js"), "t")}, _) => true
-    | _ => false
-    }
-
-    let doc = switch typExpr.ptyp_attributes {
-    | list{_, ..._} as attrs when !shouldPrintItsOwnAttributes =>
-      Doc.group(Doc.concat(list{printAttributes(attrs), renderedType}))
-    | _ => renderedType
-    }
-
-    printComments(doc, cmtTbl, typExpr.ptyp_loc)
-  }
-
-  and printBsObjectSugar = (~inline, fields, openFlag, cmtTbl) => {
-    let doc = switch fields {
-    | list{} =>
-      Doc.concat(list{
-        Doc.lbrace,
-        switch openFlag {
-        | Asttypes.Closed => Doc.dot
-        | Open => Doc.dotdot
-        },
-        Doc.rbrace,
-      })
-    | fields =>
-      Doc.concat(list{
-        Doc.lbrace,
-        switch openFlag {
-        | Asttypes.Closed => Doc.nil
-        | Open => Doc.dotdot
-        },
-        Doc.indent(
-          Doc.concat(list{
-            Doc.softLine,
-            Doc.join(
-              ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-              List.map(field => printObjectField(field, cmtTbl), fields),
-            ),
-          }),
-        ),
-        Doc.trailingComma,
-        Doc.softLine,
-        Doc.rbrace,
-      })
-    }
-
-    if inline {
-      doc
-    } else {
-      Doc.group(doc)
-    }
-  }
-
-  and printTupleType = (~inline, types: list<Parsetree.core_type>, cmtTbl) => {
-    let tuple = Doc.concat(list{
-      Doc.lparen,
-      Doc.indent(
-        Doc.concat(list{
-          Doc.softLine,
-          Doc.join(
-            ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-            List.map(typexpr => printTypExpr(typexpr, cmtTbl), types),
-          ),
-        }),
-      ),
-      Doc.trailingComma,
-      Doc.softLine,
-      Doc.rparen,
-    })
-
-    if inline === false {
-      Doc.group(tuple)
-    } else {
-      tuple
-    }
-  }
-
-  and printObjectField = (field: Parsetree.object_field, cmtTbl) =>
-    switch field {
-    | Otag(labelLoc, attrs, typ) =>
-      let lbl = {
-        let doc = Doc.text("\"" ++ (labelLoc.txt ++ "\""))
-        printComments(doc, cmtTbl, labelLoc.loc)
-      }
-
-      let doc = Doc.concat(list{
-        printAttributes(~loc=labelLoc.loc, attrs),
-        lbl,
-        Doc.text(": "),
-        printTypExpr(typ, cmtTbl),
-      })
-      let cmtLoc = {...labelLoc.loc, loc_end: typ.ptyp_loc.loc_end}
-      printComments(doc, cmtTbl, cmtLoc)
-    | _ => Doc.nil
-    }
-
-  /* es6 arrow type arg
-   * type t = (~foo: string, ~bar: float=?, unit) => unit
-   * i.e. ~foo: string, ~bar: float */
-  and printTypeParameter = ((attrs, lbl, typ), cmtTbl) => {
-    let (isUncurried, attrs) = ParsetreeViewer.processUncurriedAttribute(attrs)
-    let uncurried = if isUncurried {
-      Doc.concat(list{Doc.dot, Doc.space})
-    } else {
-      Doc.nil
-    }
-    let attrs = switch attrs {
-    | list{} => Doc.nil
-    | attrs => Doc.concat(list{Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)), Doc.line})
-    }
-    let label = switch lbl {
-    | Asttypes.Nolabel => Doc.nil
-    | Labelled(lbl) => Doc.concat(list{Doc.text("~"), printIdentLike(lbl), Doc.text(": ")})
-    | Optional(lbl) => Doc.concat(list{Doc.text("~"), printIdentLike(lbl), Doc.text(": ")})
-    }
-
-    let optionalIndicator = switch lbl {
-    | Asttypes.Nolabel | Labelled(_) => Doc.nil
-    | Optional(_lbl) => Doc.text("=?")
-    }
-
-    let doc = Doc.group(
-      Doc.concat(list{uncurried, attrs, label, printTypExpr(typ, cmtTbl), optionalIndicator}),
-    )
-    printComments(doc, cmtTbl, typ.ptyp_loc)
-  }
-
-  and printValueBinding = (~recFlag, vb, cmtTbl, i) => {
-    let (hasGenType, attrs) = ParsetreeViewer.splitGenTypeAttr(vb.pvb_attributes)
-    let attrs = printAttributes(~loc=vb.pvb_pat.ppat_loc, attrs)
-    let header = if i === 0 {
-      Doc.concat(list{
-        if hasGenType {
-          Doc.text("export ")
-        } else {
-          Doc.text("let ")
-        },
-        recFlag,
-      })
-    } else {
-      Doc.concat(list{
-        Doc.text("and "),
-        if hasGenType {
-          Doc.text("export ")
-        } else {
-          Doc.nil
-        },
-      })
-    }
-
-    switch vb {
-    | {
-        pvb_pat: {ppat_desc: Ppat_constraint(pattern, {ptyp_desc: Ptyp_poly(_)})},
-        pvb_expr: {pexp_desc: Pexp_newtype(_)} as expr,
-      } =>
-      let (_attrs, parameters, returnExpr) = ParsetreeViewer.funExpr(expr)
-      let abstractType = switch parameters {
-      | list{NewTypes({locs: vars})} =>
-        Doc.concat(list{
-          Doc.text("type "),
-          Doc.join(~sep=Doc.space, List.map(var => Doc.text(var.Asttypes.txt), vars)),
-          Doc.dot,
-        })
-      | _ => Doc.nil
-      }
-
-      switch returnExpr.pexp_desc {
-      | Pexp_constraint(expr, typ) =>
-        Doc.group(
-          Doc.concat(list{
-            attrs,
-            header,
-            printPattern(pattern, cmtTbl),
-            Doc.text(":"),
-            Doc.indent(
-              Doc.concat(list{
-                Doc.line,
-                abstractType,
-                Doc.space,
-                printTypExpr(typ, cmtTbl),
-                Doc.text(" ="),
-                Doc.concat(list{Doc.line, printExpressionWithComments(expr, cmtTbl)}),
-              }),
-            ),
-          }),
-        )
-      | _ => Doc.nil
-      }
-    | _ =>
-      let (optBraces, expr) = ParsetreeViewer.processBracesAttr(vb.pvb_expr)
-      let printedExpr = {
-        let doc = printExpressionWithComments(vb.pvb_expr, cmtTbl)
-        switch Parens.expr(vb.pvb_expr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, expr, braces)
-        | Nothing => doc
-        }
-      }
-
-      if ParsetreeViewer.isPipeExpr(vb.pvb_expr) {
-        Doc.customLayout(list{
-          Doc.group(
-            Doc.concat(list{
-              attrs,
-              header,
-              printPattern(vb.pvb_pat, cmtTbl),
-              Doc.text(" ="),
-              Doc.space,
-              printedExpr,
-            }),
-          ),
-          Doc.group(
-            Doc.concat(list{
-              attrs,
-              header,
-              printPattern(vb.pvb_pat, cmtTbl),
-              Doc.text(" ="),
-              Doc.indent(Doc.concat(list{Doc.line, printedExpr})),
-            }),
-          ),
-        })
-      } else {
-        let shouldIndent = switch optBraces {
-        | Some(_) => false
-        | _ =>
-          ParsetreeViewer.isBinaryExpression(expr) ||
-          switch vb.pvb_expr {
-          | {
-              pexp_attributes: list{({Location.txt: "res.ternary"}, _)},
-              pexp_desc: Pexp_ifthenelse(ifExpr, _, _),
-            } =>
-            ParsetreeViewer.isBinaryExpression(ifExpr) ||
-            ParsetreeViewer.hasAttributes(ifExpr.pexp_attributes)
-          | {pexp_desc: Pexp_newtype(_)} => false
-          | e =>
-            ParsetreeViewer.hasAttributes(e.pexp_attributes) || ParsetreeViewer.isArrayAccess(e)
-          }
-        }
-
-        Doc.group(
-          Doc.concat(list{
-            attrs,
-            header,
-            printPattern(vb.pvb_pat, cmtTbl),
-            Doc.text(" ="),
-            if shouldIndent {
-              Doc.indent(Doc.concat(list{Doc.line, printedExpr}))
-            } else {
-              Doc.concat(list{Doc.space, printedExpr})
-            },
-          }),
-        )
-      }
-    }
-  }
-
-  and printPackageType = (
-    ~printModuleKeywordAndParens,
-    packageType: Parsetree.package_type,
-    cmtTbl,
-  ) => {
-    let doc = switch packageType {
-    | (longidentLoc, list{}) =>
-      Doc.group(Doc.concat(list{printLongidentLocation(longidentLoc, cmtTbl)}))
-    | (longidentLoc, packageConstraints) =>
-      Doc.group(
-        Doc.concat(list{
-          printLongidentLocation(longidentLoc, cmtTbl),
-          printPackageConstraints(packageConstraints, cmtTbl),
-          Doc.softLine,
-        }),
-      )
-    }
-
-    if printModuleKeywordAndParens {
-      Doc.concat(list{Doc.text("module("), doc, Doc.rparen})
-    } else {
-      doc
-    }
-  }
-
-  and printPackageConstraints = (packageConstraints, cmtTbl) =>
-    Doc.concat(list{
-      Doc.text(" with"),
-      Doc.indent(Doc.concat(list{Doc.line, Doc.join(~sep=Doc.line, List.mapi((i, pc) => {
-              let (longident, typexpr) = pc
-              let cmtLoc = {
-                ...longident.Asttypes.loc,
-                loc_end: typexpr.Parsetree.ptyp_loc.loc_end,
-              }
-              let doc = printPackageConstraint(i, cmtTbl, pc)
-              printComments(doc, cmtTbl, cmtLoc)
-            }, packageConstraints))})),
-    })
-
-  and printPackageConstraint = (i, cmtTbl, (longidentLoc, typ)) => {
-    let prefix = if i === 0 {
-      Doc.text("type ")
-    } else {
-      Doc.text("and type ")
-    }
-    Doc.concat(list{
-      prefix,
-      printLongidentLocation(longidentLoc, cmtTbl),
-      Doc.text(" = "),
-      printTypExpr(typ, cmtTbl),
-    })
-  }
-
-  and printExtensionWithComments = (~atModuleLvl, (stringLoc, payload), cmtTbl) => {
-    let extName = {
-      let doc = Doc.concat(list{
-        Doc.text("%"),
-        if atModuleLvl {
-          Doc.text("%")
-        } else {
-          Doc.nil
-        },
-        Doc.text(stringLoc.Location.txt),
-      })
-      printComments(doc, cmtTbl, stringLoc.Location.loc)
-    }
-
-    switch payload {
-    | Parsetree.PStr(list{{pstr_desc: Pstr_eval(expr, attrs)}}) =>
-      let exprDoc = printExpressionWithComments(expr, cmtTbl)
-      let needsParens = switch attrs {
-      | list{} => false
-      | _ => true
-      }
-      Doc.group(
-        Doc.concat(list{
-          extName,
-          addParens(
-            Doc.concat(list{
-              printAttributes(attrs),
-              if needsParens {
-                addParens(exprDoc)
-              } else {
-                exprDoc
-              },
-            }),
-          ),
-        }),
-      )
-    | _ => extName
-    }
-  }
-
-  and printPattern = (p: Parsetree.pattern, cmtTbl) => {
-    let patternWithoutAttributes = switch p.ppat_desc {
-    | Ppat_any => Doc.text("_")
-    | Ppat_var(var) => printIdentLike(var.txt)
-    | Ppat_constant(c) => printConstant(c)
-    | Ppat_tuple(patterns) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.text(","), Doc.line}),
-                List.map(pat => printPattern(pat, cmtTbl), patterns),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    | Ppat_array(list{}) =>
-      Doc.concat(list{Doc.lbracket, printCommentsInside(cmtTbl, p.ppat_loc), Doc.rbracket})
-    | Ppat_array(patterns) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.text("["),
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.text(","), Doc.line}),
-                List.map(pat => printPattern(pat, cmtTbl), patterns),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.text("]"),
-        }),
-      )
-    | Ppat_construct({txt: Longident.Lident("()")}, _) =>
-      Doc.concat(list{Doc.lparen, printCommentsInside(cmtTbl, p.ppat_loc), Doc.rparen})
-    | Ppat_construct({txt: Longident.Lident("[]")}, _) =>
-      Doc.concat(list{Doc.text("list["), printCommentsInside(cmtTbl, p.ppat_loc), Doc.rbracket})
-    | Ppat_construct({txt: Longident.Lident("::")}, _) =>
-      let (patterns, tail) = ParsetreeViewer.collectPatternsFromListConstruct(list{}, p)
-      let shouldHug = switch (patterns, tail) {
-      | (list{pat}, {ppat_desc: Ppat_construct({txt: Longident.Lident("[]")}, _)})
-        when ParsetreeViewer.isHuggablePattern(pat) => true
-      | _ => false
-      }
-
-      let children = Doc.concat(list{
-        if shouldHug {
-          Doc.nil
-        } else {
-          Doc.softLine
-        },
-        Doc.join(
-          ~sep=Doc.concat(list{Doc.text(","), Doc.line}),
-          List.map(pat => printPattern(pat, cmtTbl), patterns),
-        ),
-        switch tail.Parsetree.ppat_desc {
-        | Ppat_construct({txt: Longident.Lident("[]")}, _) => Doc.nil
-        | _ =>
-          let doc = Doc.concat(list{Doc.text("..."), printPattern(tail, cmtTbl)})
-          let tail = printComments(doc, cmtTbl, tail.ppat_loc)
-          Doc.concat(list{Doc.text(","), Doc.line, tail})
-        },
-      })
-      Doc.group(
-        Doc.concat(list{
-          Doc.text("list["),
-          if shouldHug {
-            children
-          } else {
-            Doc.concat(list{
-              Doc.indent(children),
-              Doc.ifBreaks(Doc.text(","), Doc.nil),
-              Doc.softLine,
-            })
-          },
-          Doc.rbracket,
-        }),
-      )
-    | Ppat_construct(constrName, constructorArgs) =>
-      let constrName = printLongident(constrName.txt)
-      let argsDoc = switch constructorArgs {
-      | None => Doc.nil
-      | Some({ppat_loc, ppat_desc: Ppat_construct({txt: Longident.Lident("()")}, _)}) =>
-        Doc.concat(list{Doc.lparen, printCommentsInside(cmtTbl, ppat_loc), Doc.rparen})
-      | Some({ppat_desc: Ppat_tuple(list{}), ppat_loc: loc}) =>
-        Doc.concat(list{Doc.lparen, Doc.softLine, printCommentsInside(cmtTbl, loc), Doc.rparen})
-      /* Some((1, 2) */
-      | Some({ppat_desc: Ppat_tuple(list{{ppat_desc: Ppat_tuple(_)} as arg})}) =>
-        Doc.concat(list{Doc.lparen, printPattern(arg, cmtTbl), Doc.rparen})
-      | Some({ppat_desc: Ppat_tuple(patterns)}) =>
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(pat => printPattern(pat, cmtTbl), patterns),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        })
-      | Some(arg) =>
-        let argDoc = printPattern(arg, cmtTbl)
-        let shouldHug = ParsetreeViewer.isHuggablePattern(arg)
-        Doc.concat(list{
-          Doc.lparen,
-          if shouldHug {
-            argDoc
-          } else {
-            Doc.concat(list{
-              Doc.indent(Doc.concat(list{Doc.softLine, argDoc})),
-              Doc.trailingComma,
-              Doc.softLine,
-            })
-          },
-          Doc.rparen,
-        })
-      }
-
-      Doc.group(Doc.concat(list{constrName, argsDoc}))
-    | Ppat_variant(label, None) =>
-      Doc.concat(list{Doc.text("#"), printIdentLike(~allowUident=true, label)})
-    | Ppat_variant(label, variantArgs) =>
-      let variantName = Doc.concat(list{Doc.text("#"), printIdentLike(~allowUident=true, label)})
-      let argsDoc = switch variantArgs {
-      | None => Doc.nil
-      | Some({ppat_desc: Ppat_construct({txt: Longident.Lident("()")}, _)}) => Doc.text("()")
-      | Some({ppat_desc: Ppat_tuple(list{}), ppat_loc: loc}) =>
-        Doc.concat(list{Doc.lparen, Doc.softLine, printCommentsInside(cmtTbl, loc), Doc.rparen})
-      /* Some((1, 2) */
-      | Some({ppat_desc: Ppat_tuple(list{{ppat_desc: Ppat_tuple(_)} as arg})}) =>
-        Doc.concat(list{Doc.lparen, printPattern(arg, cmtTbl), Doc.rparen})
-      | Some({ppat_desc: Ppat_tuple(patterns)}) =>
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(pat => printPattern(pat, cmtTbl), patterns),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        })
-      | Some(arg) =>
-        let argDoc = printPattern(arg, cmtTbl)
-        let shouldHug = ParsetreeViewer.isHuggablePattern(arg)
-        Doc.concat(list{
-          Doc.lparen,
-          if shouldHug {
-            argDoc
-          } else {
-            Doc.concat(list{
-              Doc.indent(Doc.concat(list{Doc.softLine, argDoc})),
-              Doc.trailingComma,
-              Doc.softLine,
-            })
-          },
-          Doc.rparen,
-        })
-      }
-
-      Doc.group(Doc.concat(list{variantName, argsDoc}))
-    | Ppat_type(ident) => Doc.concat(list{Doc.text("##"), printIdentPath(ident, cmtTbl)})
-    | Ppat_record(rows, openFlag) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lbrace,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.text(","), Doc.line}),
-                List.map(row => printPatternRecordRow(row, cmtTbl), rows),
-              ),
-              switch openFlag {
-              | Open => Doc.concat(list{Doc.text(","), Doc.line, Doc.text("_")})
-              | Closed => Doc.nil
-              },
-            }),
-          ),
-          Doc.ifBreaks(Doc.text(","), Doc.nil),
-          Doc.softLine,
-          Doc.rbrace,
-        }),
-      )
-
-    | Ppat_exception(p) =>
-      let needsParens = switch p.ppat_desc {
-      | Ppat_or(_, _) | Ppat_alias(_, _) => true
-      | _ => false
-      }
-
-      let pat = {
-        let p = printPattern(p, cmtTbl)
-        if needsParens {
-          Doc.concat(list{Doc.text("("), p, Doc.text(")")})
-        } else {
-          p
-        }
-      }
-
-      Doc.group(Doc.concat(list{Doc.text("exception"), Doc.line, pat}))
-    | Ppat_or(_) =>
-      /* Blue | Red | Green -> [Blue; Red; Green] */
-      let orChain = ParsetreeViewer.collectOrPatternChain(p)
-      let docs = List.mapi((i, pat) => {
-        let patternDoc = printPattern(pat, cmtTbl)
-        Doc.concat(list{
-          if i === 0 {
-            Doc.nil
-          } else {
-            Doc.concat(list{Doc.line, Doc.text("| ")})
-          },
-          switch pat.ppat_desc {
-          /* (Blue | Red) | (Green | Black) | White */
-          | Ppat_or(_) => addParens(patternDoc)
-          | _ => patternDoc
-          },
-        })
-      }, orChain)
-      Doc.group(Doc.concat(docs))
-    | Ppat_extension(ext) => printExtensionWithComments(~atModuleLvl=false, ext, cmtTbl)
-    | Ppat_lazy(p) =>
-      let needsParens = switch p.ppat_desc {
-      | Ppat_or(_, _) | Ppat_alias(_, _) => true
-      | _ => false
-      }
-
-      let pat = {
-        let p = printPattern(p, cmtTbl)
-        if needsParens {
-          Doc.concat(list{Doc.text("("), p, Doc.text(")")})
-        } else {
-          p
-        }
-      }
-
-      Doc.concat(list{Doc.text("lazy "), pat})
-    | Ppat_alias(p, aliasLoc) =>
-      let needsParens = switch p.ppat_desc {
-      | Ppat_or(_, _) | Ppat_alias(_, _) => true
-      | _ => false
-      }
-
-      let renderedPattern = {
-        let p = printPattern(p, cmtTbl)
-        if needsParens {
-          Doc.concat(list{Doc.text("("), p, Doc.text(")")})
-        } else {
-          p
-        }
-      }
-
-      Doc.concat(list{renderedPattern, Doc.text(" as "), printStringLoc(aliasLoc, cmtTbl)})
-
-    /* Note: module(P : S) is represented as */
-    /* Ppat_constraint(Ppat_unpack, Ptyp_package) */
-    | Ppat_constraint(
-        {ppat_desc: Ppat_unpack(stringLoc)},
-        {ptyp_desc: Ptyp_package(packageType), ptyp_loc},
-      ) =>
-      Doc.concat(list{
-        Doc.text("module("),
-        printComments(Doc.text(stringLoc.txt), cmtTbl, stringLoc.loc),
-        Doc.text(": "),
-        printComments(
-          printPackageType(~printModuleKeywordAndParens=false, packageType, cmtTbl),
-          cmtTbl,
-          ptyp_loc,
-        ),
-        Doc.rparen,
-      })
-    | Ppat_constraint(pattern, typ) =>
-      Doc.concat(list{printPattern(pattern, cmtTbl), Doc.text(": "), printTypExpr(typ, cmtTbl)})
-
-    /* Note: module(P : S) is represented as */
-    /* Ppat_constraint(Ppat_unpack, Ptyp_package) */
-    | Ppat_unpack(stringLoc) =>
-      Doc.concat(list{
-        Doc.text("module("),
-        printComments(Doc.text(stringLoc.txt), cmtTbl, stringLoc.loc),
-        Doc.rparen,
-      })
-    | Ppat_interval(a, b) => Doc.concat(list{printConstant(a), Doc.text(" .. "), printConstant(b)})
-    | Ppat_open(_) => Doc.nil
-    }
-
-    let doc = switch p.ppat_attributes {
-    | list{} => patternWithoutAttributes
-    | attrs => Doc.group(Doc.concat(list{printAttributes(attrs), patternWithoutAttributes}))
-    }
-
-    printComments(doc, cmtTbl, p.ppat_loc)
-  }
-
-  and printPatternRecordRow = (row, cmtTbl) =>
-    switch row {
-    /* punned {x} */
-    | (
-        {Location.txt: Longident.Lident(ident)} as longident,
-        {Parsetree.ppat_desc: Ppat_var({txt, _})},
-      ) when ident == txt =>
-      printLidentPath(longident, cmtTbl)
-    | (longident, pattern) =>
-      let locForComments = {
-        ...longident.loc,
-        loc_end: pattern.Parsetree.ppat_loc.loc_end,
-      }
-      let doc = Doc.group(
-        Doc.concat(list{
-          printLidentPath(longident, cmtTbl),
-          Doc.text(": "),
-          Doc.indent(Doc.concat(list{Doc.softLine, printPattern(pattern, cmtTbl)})),
-        }),
-      )
-      printComments(doc, cmtTbl, locForComments)
-    }
-
-  and printExpressionWithComments = (expr, cmtTbl) => {
-    let doc = printExpression(expr, cmtTbl)
-    printComments(doc, cmtTbl, expr.Parsetree.pexp_loc)
-  }
-
-  and printExpression = (e: Parsetree.expression, cmtTbl) => {
-    let printedExpression = switch e.pexp_desc {
-    | Parsetree.Pexp_constant(c) => printConstant(c)
-    | Pexp_construct(_) when ParsetreeViewer.hasJsxAttribute(e.pexp_attributes) =>
-      printJsxFragment(e, cmtTbl)
-    | Pexp_construct({txt: Longident.Lident("()")}, _) => Doc.text("()")
-    | Pexp_construct({txt: Longident.Lident("[]")}, _) =>
-      Doc.concat(list{Doc.text("list["), printCommentsInside(cmtTbl, e.pexp_loc), Doc.rbracket})
-    | Pexp_construct({txt: Longident.Lident("::")}, _) =>
-      let (expressions, spread) = ParsetreeViewer.collectListExpressions(e)
-      let spreadDoc = switch spread {
-      | Some(expr) =>
-        Doc.concat(list{
-          Doc.text(","),
-          Doc.line,
-          Doc.dotdotdot,
-          {
-            let doc = printExpressionWithComments(expr, cmtTbl)
-            switch Parens.expr(expr) {
-            | Parens.Parenthesized => addParens(doc)
-            | Braced(braces) => printBraces(doc, expr, braces)
-            | Nothing => doc
-            }
-          },
-        })
-      | None => Doc.nil
-      }
-
-      Doc.group(
-        Doc.concat(list{
-          Doc.text("list["),
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(~sep=Doc.concat(list{Doc.text(","), Doc.line}), List.map(expr => {
-                  let doc = printExpressionWithComments(expr, cmtTbl)
-                  switch Parens.expr(expr) {
-                  | Parens.Parenthesized => addParens(doc)
-                  | Braced(braces) => printBraces(doc, expr, braces)
-                  | Nothing => doc
-                  }
-                }, expressions)),
-              spreadDoc,
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rbracket,
-        }),
-      )
-    | Pexp_construct(longidentLoc, args) =>
-      let constr = printLongidentLocation(longidentLoc, cmtTbl)
-      let args = switch args {
-      | None => Doc.nil
-      | Some({pexp_desc: Pexp_construct({txt: Longident.Lident("()")}, _)}) => Doc.text("()")
-      /* Some((1, 2)) */
-      | Some({pexp_desc: Pexp_tuple(list{{pexp_desc: Pexp_tuple(_)} as arg})}) =>
-        Doc.concat(list{
-          Doc.lparen,
-          {
-            let doc = printExpressionWithComments(arg, cmtTbl)
-            switch Parens.expr(arg) {
-            | Parens.Parenthesized => addParens(doc)
-            | Braced(braces) => printBraces(doc, arg, braces)
-            | Nothing => doc
-            }
-          },
-          Doc.rparen,
-        })
-      | Some({pexp_desc: Pexp_tuple(args)}) =>
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(expr => {
-                  let doc = printExpressionWithComments(expr, cmtTbl)
-                  switch Parens.expr(expr) {
-                  | Parens.Parenthesized => addParens(doc)
-                  | Braced(braces) => printBraces(doc, expr, braces)
-                  | Nothing => doc
-                  }
-                }, args)),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        })
-      | Some(arg) =>
-        let argDoc = {
-          let doc = printExpressionWithComments(arg, cmtTbl)
-          switch Parens.expr(arg) {
-          | Parens.Parenthesized => addParens(doc)
-          | Braced(braces) => printBraces(doc, arg, braces)
-          | Nothing => doc
-          }
-        }
-
-        let shouldHug = ParsetreeViewer.isHuggableExpression(arg)
-        Doc.concat(list{
-          Doc.lparen,
-          if shouldHug {
-            argDoc
-          } else {
-            Doc.concat(list{
-              Doc.indent(Doc.concat(list{Doc.softLine, argDoc})),
-              Doc.trailingComma,
-              Doc.softLine,
-            })
-          },
-          Doc.rparen,
-        })
-      }
-
-      Doc.group(Doc.concat(list{constr, args}))
-    | Pexp_ident(path) => printLidentPath(path, cmtTbl)
-    | Pexp_tuple(exprs) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(~sep=Doc.concat(list{Doc.text(","), Doc.line}), List.map(expr => {
-                  let doc = printExpressionWithComments(expr, cmtTbl)
-                  switch Parens.expr(expr) {
-                  | Parens.Parenthesized => addParens(doc)
-                  | Braced(braces) => printBraces(doc, expr, braces)
-                  | Nothing => doc
-                  }
-                }, exprs)),
-            }),
-          ),
-          Doc.ifBreaks(Doc.text(","), Doc.nil),
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    | Pexp_array(list{}) =>
-      Doc.concat(list{Doc.lbracket, printCommentsInside(cmtTbl, e.pexp_loc), Doc.rbracket})
-    | Pexp_array(exprs) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lbracket,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(~sep=Doc.concat(list{Doc.text(","), Doc.line}), List.map(expr => {
-                  let doc = printExpressionWithComments(expr, cmtTbl)
-                  switch Parens.expr(expr) {
-                  | Parens.Parenthesized => addParens(doc)
-                  | Braced(braces) => printBraces(doc, expr, braces)
-                  | Nothing => doc
-                  }
-                }, exprs)),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rbracket,
-        }),
-      )
-    | Pexp_variant(label, args) =>
-      let variantName = Doc.concat(list{Doc.text("#"), printIdentLike(~allowUident=true, label)})
-      let args = switch args {
-      | None => Doc.nil
-      | Some({pexp_desc: Pexp_construct({txt: Longident.Lident("()")}, _)}) => Doc.text("()")
-      /* #poly((1, 2) */
-      | Some({pexp_desc: Pexp_tuple(list{{pexp_desc: Pexp_tuple(_)} as arg})}) =>
-        Doc.concat(list{
-          Doc.lparen,
-          {
-            let doc = printExpressionWithComments(arg, cmtTbl)
-            switch Parens.expr(arg) {
-            | Parens.Parenthesized => addParens(doc)
-            | Braced(braces) => printBraces(doc, arg, braces)
-            | Nothing => doc
-            }
-          },
-          Doc.rparen,
-        })
-      | Some({pexp_desc: Pexp_tuple(args)}) =>
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(expr => {
-                  let doc = printExpressionWithComments(expr, cmtTbl)
-                  switch Parens.expr(expr) {
-                  | Parens.Parenthesized => addParens(doc)
-                  | Braced(braces) => printBraces(doc, expr, braces)
-                  | Nothing => doc
-                  }
-                }, args)),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        })
-      | Some(arg) =>
-        let argDoc = {
-          let doc = printExpressionWithComments(arg, cmtTbl)
-          switch Parens.expr(arg) {
-          | Parens.Parenthesized => addParens(doc)
-          | Braced(braces) => printBraces(doc, arg, braces)
-          | Nothing => doc
-          }
-        }
-
-        let shouldHug = ParsetreeViewer.isHuggableExpression(arg)
-        Doc.concat(list{
-          Doc.lparen,
-          if shouldHug {
-            argDoc
-          } else {
-            Doc.concat(list{
-              Doc.indent(Doc.concat(list{Doc.softLine, argDoc})),
-              Doc.trailingComma,
-              Doc.softLine,
-            })
-          },
-          Doc.rparen,
-        })
-      }
-
-      Doc.group(Doc.concat(list{variantName, args}))
-    | Pexp_record(rows, spreadExpr) =>
-      let spread = switch spreadExpr {
-      | None => Doc.nil
-      | Some(expr) =>
-        Doc.concat(list{
-          Doc.dotdotdot,
-          {
-            let doc = printExpressionWithComments(expr, cmtTbl)
-            switch Parens.expr(expr) {
-            | Parens.Parenthesized => addParens(doc)
-            | Braced(braces) => printBraces(doc, expr, braces)
-            | Nothing => doc
-            }
-          },
-          Doc.comma,
-          Doc.line,
-        })
-      }
-
-      /* If the record is written over multiple lines, break automatically
-       * `let x = {a: 1, b: 3}` -> same line, break when line-width exceeded
-       * `let x = {
-       *   a: 1,
-       *   b: 2,
-       *  }` -> record is written on multiple lines, break the group */
-      let forceBreak = e.pexp_loc.loc_start.pos_lnum < e.pexp_loc.loc_end.pos_lnum
-
-      Doc.breakableGroup(
-        ~forceBreak,
-        Doc.concat(list{
-          Doc.lbrace,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              spread,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.text(","), Doc.line}),
-                List.map(row => printRecordRow(row, cmtTbl), rows),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rbrace,
-        }),
-      )
-    | Pexp_extension(extension) =>
-      switch extension {
-      | (
-          {txt: "bs.obj"},
-          PStr(list{{
-            pstr_loc: loc,
-            pstr_desc: Pstr_eval({pexp_desc: Pexp_record(rows, _)}, list{}),
-          }}),
-        ) =>
-        /* If the object is written over multiple lines, break automatically
-         * `let x = {"a": 1, "b": 3}` -> same line, break when line-width exceeded
-         * `let x = {
-         *   "a": 1,
-         *   "b": 2,
-         *  }` -> object is written on multiple lines, break the group */
-        let forceBreak = loc.loc_start.pos_lnum < loc.loc_end.pos_lnum
-
-        Doc.breakableGroup(
-          ~forceBreak,
-          Doc.concat(list{
-            Doc.lbrace,
-            Doc.indent(
-              Doc.concat(list{
-                Doc.softLine,
-                Doc.join(
-                  ~sep=Doc.concat(list{Doc.text(","), Doc.line}),
-                  List.map(row => printBsObjectRow(row, cmtTbl), rows),
-                ),
-              }),
-            ),
-            Doc.trailingComma,
-            Doc.softLine,
-            Doc.rbrace,
-          }),
-        )
-      | extension => printExtensionWithComments(~atModuleLvl=false, extension, cmtTbl)
-      }
-    | Pexp_apply(_) =>
-      if ParsetreeViewer.isUnaryExpression(e) {
-        printUnaryExpression(e, cmtTbl)
-      } else if ParsetreeViewer.isTemplateLiteral(e) {
-        printTemplateLiteral(e, cmtTbl)
-      } else if ParsetreeViewer.isBinaryExpression(e) {
-        printBinaryExpression(e, cmtTbl)
-      } else {
-        printPexpApply(e, cmtTbl)
-      }
-    | Pexp_unreachable => Doc.dot
-    | Pexp_field(expr, longidentLoc) =>
-      let lhs = {
-        let doc = printExpressionWithComments(expr, cmtTbl)
-        switch Parens.fieldExpr(expr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, expr, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.concat(list{lhs, Doc.dot, printLidentPath(longidentLoc, cmtTbl)})
-    | Pexp_setfield(expr1, longidentLoc, expr2) =>
-      printSetFieldExpr(e.pexp_attributes, expr1, longidentLoc, expr2, e.pexp_loc, cmtTbl)
-    | Pexp_ifthenelse(_ifExpr, _thenExpr, _elseExpr) =>
-      if ParsetreeViewer.isTernaryExpr(e) {
-        let (parts, alternate) = ParsetreeViewer.collectTernaryParts(e)
-        let ternaryDoc = switch parts {
-        | list{(condition1, consequent1), ...rest} =>
-          Doc.group(
-            Doc.concat(list{
-              printTernaryOperand(condition1, cmtTbl),
-              Doc.indent(
-                Doc.concat(list{
-                  Doc.line,
-                  Doc.indent(
-                    Doc.concat(list{Doc.text("? "), printTernaryOperand(consequent1, cmtTbl)}),
-                  ),
-                  Doc.concat(
-                    List.map(
-                      ((condition, consequent)) =>
-                        Doc.concat(list{
-                          Doc.line,
-                          Doc.text(": "),
-                          printTernaryOperand(condition, cmtTbl),
-                          Doc.line,
-                          Doc.text("? "),
-                          printTernaryOperand(consequent, cmtTbl),
-                        }),
-                      rest,
-                    ),
-                  ),
-                  Doc.line,
-                  Doc.text(": "),
-                  Doc.indent(printTernaryOperand(alternate, cmtTbl)),
-                }),
-              ),
-            }),
-          )
-        | _ => Doc.nil
-        }
-
-        let attrs = ParsetreeViewer.filterTernaryAttributes(e.pexp_attributes)
-        let needsParens = switch ParsetreeViewer.filterParsingAttrs(attrs) {
-        | list{} => false
-        | _ => true
-        }
-
-        Doc.concat(list{
-          printAttributes(attrs),
-          if needsParens {
-            addParens(ternaryDoc)
-          } else {
-            ternaryDoc
-          },
-        })
-      } else {
-        let (ifs, elseExpr) = ParsetreeViewer.collectIfExpressions(e)
-        let ifDocs = Doc.join(~sep=Doc.space, List.mapi((i, (ifExpr, thenExpr)) => {
-            let ifTxt = if i > 0 {
-              Doc.text("else if ")
-            } else {
-              Doc.text("if ")
-            }
-            let condition = if ParsetreeViewer.isBlockExpr(ifExpr) {
-              printExpressionBlock(~braces=true, ifExpr, cmtTbl)
-            } else {
-              let doc = printExpressionWithComments(ifExpr, cmtTbl)
-              switch Parens.expr(ifExpr) {
-              | Parens.Parenthesized => addParens(doc)
-              | Braced(braces) => printBraces(doc, ifExpr, braces)
-              | Nothing => Doc.ifBreaks(addParens(doc), doc)
-              }
-            }
-
-            Doc.concat(list{
-              ifTxt,
-              Doc.group(condition),
-              Doc.space,
-              {
-                let thenExpr = switch ParsetreeViewer.processBracesAttr(thenExpr) {
-                /* This case only happens when coming from Reason, we strip braces */
-                | (Some(_), expr) => expr
-                | _ => thenExpr
-                }
-
-                printExpressionBlock(~braces=true, thenExpr, cmtTbl)
-              },
-            })
-          }, ifs))
-        let elseDoc = switch elseExpr {
-        | None => Doc.nil
-        | Some(expr) =>
-          Doc.concat(list{Doc.text(" else "), printExpressionBlock(~braces=true, expr, cmtTbl)})
-        }
-
-        Doc.concat(list{printAttributes(e.pexp_attributes), ifDocs, elseDoc})
-      }
-    | Pexp_while(expr1, expr2) =>
-      let condition = {
-        let doc = printExpressionWithComments(expr1, cmtTbl)
-        switch Parens.expr(expr1) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, expr1, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list{
-          Doc.text("while "),
-          if ParsetreeViewer.isBlockExpr(expr1) {
-            condition
-          } else {
-            Doc.group(Doc.ifBreaks(addParens(condition), condition))
-          },
-          Doc.space,
-          printExpressionBlock(~braces=true, expr2, cmtTbl),
-        }),
-      )
-    | Pexp_for(pattern, fromExpr, toExpr, directionFlag, body) =>
-      Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list{
-          Doc.text("for "),
-          printPattern(pattern, cmtTbl),
-          Doc.text(" in "),
-          {
-            let doc = printExpressionWithComments(fromExpr, cmtTbl)
-            switch Parens.expr(fromExpr) {
-            | Parens.Parenthesized => addParens(doc)
-            | Braced(braces) => printBraces(doc, fromExpr, braces)
-            | Nothing => doc
-            }
-          },
-          printDirectionFlag(directionFlag),
-          {
-            let doc = printExpressionWithComments(toExpr, cmtTbl)
-            switch Parens.expr(toExpr) {
-            | Parens.Parenthesized => addParens(doc)
-            | Braced(braces) => printBraces(doc, toExpr, braces)
-            | Nothing => doc
-            }
-          },
-          Doc.space,
-          printExpressionBlock(~braces=true, body, cmtTbl),
-        }),
-      )
-    | Pexp_constraint(
-        {pexp_desc: Pexp_pack(modExpr)},
-        {ptyp_desc: Ptyp_package(packageType), ptyp_loc},
-      ) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.text("module("),
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              printModExpr(modExpr, cmtTbl),
-              Doc.text(": "),
-              printComments(
-                printPackageType(~printModuleKeywordAndParens=false, packageType, cmtTbl),
-                cmtTbl,
-                ptyp_loc,
-              ),
-            }),
-          ),
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-
-    | Pexp_constraint(expr, typ) =>
-      let exprDoc = {
-        let doc = printExpressionWithComments(expr, cmtTbl)
-        switch Parens.expr(expr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, expr, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.concat(list{exprDoc, Doc.text(": "), printTypExpr(typ, cmtTbl)})
-    | Pexp_letmodule({txt: _modName}, _modExpr, _expr) =>
-      printExpressionBlock(~braces=true, e, cmtTbl)
-    | Pexp_letexception(_extensionConstructor, _expr) =>
-      printExpressionBlock(~braces=true, e, cmtTbl)
-    | Pexp_assert(expr) =>
-      let rhs = {
-        let doc = printExpressionWithComments(expr, cmtTbl)
-        switch Parens.lazyOrAssertExprRhs(expr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, expr, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.concat(list{Doc.text("assert "), rhs})
-    | Pexp_lazy(expr) =>
-      let rhs = {
-        let doc = printExpressionWithComments(expr, cmtTbl)
-        switch Parens.lazyOrAssertExprRhs(expr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, expr, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.group(Doc.concat(list{Doc.text("lazy "), rhs}))
-    | Pexp_open(_overrideFlag, _longidentLoc, _expr) =>
-      printExpressionBlock(~braces=true, e, cmtTbl)
-    | Pexp_pack(modExpr) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.text("module("),
-          Doc.indent(Doc.concat(list{Doc.softLine, printModExpr(modExpr, cmtTbl)})),
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    | Pexp_sequence(_) => printExpressionBlock(~braces=true, e, cmtTbl)
-    | Pexp_let(_) => printExpressionBlock(~braces=true, e, cmtTbl)
-    | Pexp_fun(Nolabel, None, {ppat_desc: Ppat_var({txt: "__x"})}, {pexp_desc: Pexp_apply(_)}) =>
-      /* (__x) => f(a, __x, c) -----> f(a, _, c) */
-      printExpressionWithComments(ParsetreeViewer.rewriteUnderscoreApply(e), cmtTbl)
-    | Pexp_fun(_) | Pexp_newtype(_) =>
-      let (attrsOnArrow, parameters, returnExpr) = ParsetreeViewer.funExpr(e)
-      let (uncurried, attrs) = ParsetreeViewer.processUncurriedAttribute(attrsOnArrow)
-
-      let (returnExpr, typConstraint) = switch returnExpr.pexp_desc {
-      | Pexp_constraint(expr, typ) => (
-          {
-            ...expr,
-            pexp_attributes: List.concat(list{expr.pexp_attributes, returnExpr.pexp_attributes}),
-          },
-          Some(typ),
-        )
-      | _ => (returnExpr, None)
-      }
-
-      let hasConstraint = switch typConstraint {
-      | Some(_) => true
-      | None => false
-      }
-      let parametersDoc = printExprFunParameters(
-        ~inCallback=false,
-        ~uncurried,
-        ~hasConstraint,
-        parameters,
-        cmtTbl,
-      )
-
-      let returnExprDoc = {
-        let (optBraces, _) = ParsetreeViewer.processBracesAttr(returnExpr)
-        let shouldInline = switch (returnExpr.pexp_desc, optBraces) {
-        | (_, Some(_)) => true
-        | (Pexp_array(_) | Pexp_tuple(_) | Pexp_construct(_, Some(_)) | Pexp_record(_), _) => true
-        | _ => false
-        }
-
-        let shouldIndent = switch returnExpr.pexp_desc {
-        | Pexp_sequence(_)
-        | Pexp_let(_)
-        | Pexp_letmodule(_)
-        | Pexp_letexception(_)
-        | Pexp_open(_) => false
-        | _ => true
-        }
-
-        let returnDoc = {
-          let doc = printExpressionWithComments(returnExpr, cmtTbl)
-          switch Parens.expr(returnExpr) {
-          | Parens.Parenthesized => addParens(doc)
-          | Braced(braces) => printBraces(doc, returnExpr, braces)
-          | Nothing => doc
-          }
-        }
-
-        if shouldInline {
-          Doc.concat(list{Doc.space, returnDoc})
-        } else {
-          Doc.group(
-            if shouldIndent {
-              Doc.indent(Doc.concat(list{Doc.line, returnDoc}))
-            } else {
-              Doc.concat(list{Doc.space, returnDoc})
-            },
-          )
-        }
-      }
-
-      let typConstraintDoc = switch typConstraint {
-      | Some(typ) => Doc.concat(list{Doc.text(": "), printTypExpr(typ, cmtTbl)})
-      | _ => Doc.nil
-      }
-
-      let attrs = printAttributes(attrs)
-      Doc.group(
-        Doc.concat(list{attrs, parametersDoc, typConstraintDoc, Doc.text(" =>"), returnExprDoc}),
-      )
-    | Pexp_try(expr, cases) =>
-      let exprDoc = {
-        let doc = printExpressionWithComments(expr, cmtTbl)
-        switch Parens.expr(expr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, expr, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.concat(list{Doc.text("try "), exprDoc, Doc.text(" catch "), printCases(cases, cmtTbl)})
-    | Pexp_match(expr, cases) =>
-      let exprDoc = {
-        let doc = printExpressionWithComments(expr, cmtTbl)
-        switch Parens.expr(expr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, expr, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.concat(list{Doc.text("switch "), exprDoc, Doc.space, printCases(cases, cmtTbl)})
-    | Pexp_function(cases) =>
-      Doc.concat(list{Doc.text("x => switch x "), printCases(cases, cmtTbl)})
-    | Pexp_coerce(expr, typOpt, typ) =>
-      let docExpr = printExpressionWithComments(expr, cmtTbl)
-      let docTyp = printTypExpr(typ, cmtTbl)
-      let ofType = switch typOpt {
-      | None => Doc.nil
-      | Some(typ1) => Doc.concat(list{Doc.text(": "), printTypExpr(typ1, cmtTbl)})
-      }
-
-      Doc.concat(list{Doc.lparen, docExpr, ofType, Doc.text(" :> "), docTyp, Doc.rparen})
-    | Pexp_send(_) => Doc.text("Pexp_send not implemented in printer")
-    | Pexp_new(_) => Doc.text("Pexp_new not implemented in printer")
-    | Pexp_setinstvar(_) => Doc.text("Pexp_setinstvar not implemented in printer")
-    | Pexp_override(_) => Doc.text("Pexp_override not implemented in printer")
-    | Pexp_poly(_) => Doc.text("Pexp_poly not implemented in printer")
-    | Pexp_object(_) => Doc.text("Pexp_object not implemented in printer")
-    }
-
-    let shouldPrintItsOwnAttributes = switch e.pexp_desc {
-    | Pexp_apply(_) | Pexp_fun(_) | Pexp_newtype(_) | Pexp_setfield(_) | Pexp_ifthenelse(_) => true
-    | Pexp_construct(_) when ParsetreeViewer.hasJsxAttribute(e.pexp_attributes) => true
-    | _ => false
-    }
-
-    switch e.pexp_attributes {
-    | list{} => printedExpression
-    | attrs when !shouldPrintItsOwnAttributes =>
-      Doc.group(Doc.concat(list{printAttributes(attrs), printedExpression}))
-    | _ => printedExpression
-    }
-  }
-
-  and printPexpFun = (~inCallback, e, cmtTbl) => {
-    let (attrsOnArrow, parameters, returnExpr) = ParsetreeViewer.funExpr(e)
-    let (uncurried, attrs) = ParsetreeViewer.processUncurriedAttribute(attrsOnArrow)
-
-    let (returnExpr, typConstraint) = switch returnExpr.pexp_desc {
-    | Pexp_constraint(expr, typ) => (
-        {
-          ...expr,
-          pexp_attributes: List.concat(list{expr.pexp_attributes, returnExpr.pexp_attributes}),
-        },
-        Some(typ),
-      )
-    | _ => (returnExpr, None)
-    }
-
-    let parametersDoc = printExprFunParameters(
-      ~inCallback,
-      ~uncurried,
-      ~hasConstraint=switch typConstraint {
-      | Some(_) => true
-      | None => false
-      },
-      parameters,
-      cmtTbl,
-    )
-    let returnShouldIndent = switch returnExpr.pexp_desc {
-    | Pexp_sequence(_)
-    | Pexp_let(_)
-    | Pexp_letmodule(_)
-    | Pexp_letexception(_)
-    | Pexp_open(_) => false
-    | _ => true
-    }
-
-    let returnExprDoc = {
-      let (optBraces, _) = ParsetreeViewer.processBracesAttr(returnExpr)
-      let shouldInline = switch (returnExpr.pexp_desc, optBraces) {
-      | (_, Some(_)) => true
-      | (Pexp_array(_) | Pexp_tuple(_) | Pexp_construct(_, Some(_)) | Pexp_record(_), _) => true
-      | _ => false
-      }
-
-      let returnDoc = {
-        let doc = printExpressionWithComments(returnExpr, cmtTbl)
-        switch Parens.expr(returnExpr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, returnExpr, braces)
-        | Nothing => doc
-        }
-      }
-
-      if shouldInline {
-        Doc.concat(list{Doc.space, returnDoc})
-      } else {
-        Doc.group(
-          if returnShouldIndent {
-            Doc.concat(list{
-              Doc.indent(Doc.concat(list{Doc.line, returnDoc})),
-              if inCallback {
-                Doc.softLine
-              } else {
-                Doc.nil
-              },
-            })
-          } else {
-            Doc.concat(list{Doc.space, returnDoc})
-          },
-        )
-      }
-    }
-
-    let typConstraintDoc = switch typConstraint {
-    | Some(typ) => Doc.concat(list{Doc.text(": "), printTypExpr(typ, cmtTbl)})
-    | _ => Doc.nil
-    }
-
-    Doc.group(
-      Doc.concat(list{
-        printAttributes(attrs),
-        parametersDoc,
-        typConstraintDoc,
-        Doc.text(" =>"),
-        returnExprDoc,
-      }),
-    )
-  }
-
-  and printTernaryOperand = (expr, cmtTbl) => {
-    let doc = printExpressionWithComments(expr, cmtTbl)
-    switch Parens.ternaryOperand(expr) {
-    | Parens.Parenthesized => addParens(doc)
-    | Braced(braces) => printBraces(doc, expr, braces)
-    | Nothing => doc
-    }
-  }
-
-  and printSetFieldExpr = (attrs, lhs, longidentLoc, rhs, loc, cmtTbl) => {
-    let rhsDoc = {
-      let doc = printExpressionWithComments(rhs, cmtTbl)
-      switch Parens.setFieldExprRhs(rhs) {
-      | Parens.Parenthesized => addParens(doc)
-      | Braced(braces) => printBraces(doc, rhs, braces)
-      | Nothing => doc
-      }
-    }
-
-    let lhsDoc = {
-      let doc = printExpressionWithComments(lhs, cmtTbl)
-      switch Parens.fieldExpr(lhs) {
-      | Parens.Parenthesized => addParens(doc)
-      | Braced(braces) => printBraces(doc, lhs, braces)
-      | Nothing => doc
-      }
-    }
-
-    let shouldIndent = ParsetreeViewer.isBinaryExpression(rhs)
-    let doc = Doc.group(
-      Doc.concat(list{
-        lhsDoc,
-        Doc.dot,
-        printLidentPath(longidentLoc, cmtTbl),
-        Doc.text(" ="),
-        if shouldIndent {
-          Doc.group(Doc.indent(Doc.concat(list{Doc.line, rhsDoc})))
-        } else {
-          Doc.concat(list{Doc.space, rhsDoc})
-        },
-      }),
-    )
-    let doc = switch attrs {
-    | list{} => doc
-    | attrs => Doc.group(Doc.concat(list{printAttributes(attrs), doc}))
-    }
-
-    printComments(doc, cmtTbl, loc)
-  }
-
-  and printTemplateLiteral = (expr, cmtTbl) => {
-    let tag = ref("j")
-    let rec walkExpr = expr => {
-      open Parsetree
-      switch expr.pexp_desc {
-      | Pexp_apply(
-          {pexp_desc: Pexp_ident({txt: Longident.Lident("^")})},
-          list{(Nolabel, arg1), (Nolabel, arg2)},
-        ) =>
-        let lhs = walkExpr(arg1)
-        let rhs = walkExpr(arg2)
-        Doc.concat(list{lhs, rhs})
-      | Pexp_constant(Pconst_string(txt, Some(prefix))) =>
-        tag := prefix
-        Doc.text(txt)
-      | _ =>
-        let doc = printExpressionWithComments(expr, cmtTbl)
-        Doc.concat(list{Doc.text("${"), doc, Doc.rbrace})
-      }
-    }
-
-    let content = walkExpr(expr)
-    Doc.concat(list{
-      if tag.contents == "j" {
-        Doc.nil
-      } else {
-        Doc.text(tag.contents)
-      },
-      Doc.text("`"),
-      content,
-      Doc.text("`"),
-    })
-  }
-
-  and printUnaryExpression = (expr, cmtTbl) => {
-    let printUnaryOperator = op =>
-      Doc.text(
-        switch op {
-        | "~+" => "+"
-        | "~+." => "+."
-        | "~-" => "-"
-        | "~-." => "-."
-        | "not" => "!"
-        | _ => assert false
-        },
-      )
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})},
-        list{(Nolabel, operand)},
-      ) =>
-      let printedOperand = {
-        let doc = printExpressionWithComments(operand, cmtTbl)
-        switch Parens.unaryExprOperand(operand) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, operand, braces)
-        | Nothing => doc
-        }
-      }
-
-      let doc = Doc.concat(list{printUnaryOperator(operator), printedOperand})
-      printComments(doc, cmtTbl, expr.pexp_loc)
-    | _ => assert false
-    }
-  }
-
-  and printBinaryExpression = (expr: Parsetree.expression, cmtTbl) => {
-    let printBinaryOperator = (~inlineRhs, operator) => {
-      let operatorTxt = switch operator {
-      | "|." => "->"
-      | "^" => "++"
-      | "=" => "=="
-      | "==" => "==="
-      | "<>" => "!="
-      | "!=" => "!=="
-      | txt => txt
-      }
-
-      let spacingBeforeOperator = if operator == "|." {
-        Doc.softLine
-      } else if operator == "|>" {
-        Doc.line
-      } else {
-        Doc.space
-      }
-
-      let spacingAfterOperator = if operator == "|." {
-        Doc.nil
-      } else if operator == "|>" {
-        Doc.space
-      } else if inlineRhs {
-        Doc.space
-      } else {
-        Doc.line
-      }
-
-      Doc.concat(list{spacingBeforeOperator, Doc.text(operatorTxt), spacingAfterOperator})
-    }
-
-    let printOperand = (~isLhs, expr, parentOperator) => {
-      let rec flatten = (~isLhs, expr, parentOperator) =>
-        if ParsetreeViewer.isBinaryExpression(expr) {
-          switch expr {
-          | {
-              pexp_desc:
-                Pexp_apply(
-                  {pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})},
-                  list{(_, left), (_, right)},
-                ),
-            } =>
-            if (
-              ParsetreeViewer.flattenableOperators(parentOperator, operator) &&
-              !ParsetreeViewer.hasAttributes(expr.pexp_attributes)
-            ) {
-              let leftPrinted = flatten(~isLhs=true, left, operator)
-              let rightPrinted = {
-                let (_, rightAttrs) = ParsetreeViewer.partitionPrinteableAttributes(
-                  right.pexp_attributes,
-                )
-
-                let doc = printExpressionWithComments(
-                  {...right, pexp_attributes: rightAttrs},
-                  cmtTbl,
-                )
-
-                let doc = if Parens.flattenOperandRhs(parentOperator, right) {
-                  Doc.concat(list{Doc.lparen, doc, Doc.rparen})
-                } else {
-                  doc
-                }
-
-                let printeableAttrs = ParsetreeViewer.filterPrinteableAttributes(
-                  right.pexp_attributes,
-                )
-
-                Doc.concat(list{printAttributes(printeableAttrs), doc})
-              }
-
-              let doc = Doc.concat(list{
-                leftPrinted,
-                printBinaryOperator(~inlineRhs=false, operator),
-                rightPrinted,
-              })
-              let doc = if !isLhs && Parens.rhsBinaryExprOperand(operator, expr) {
-                Doc.concat(list{Doc.lparen, doc, Doc.rparen})
-              } else {
-                doc
-              }
-
-              printComments(doc, cmtTbl, expr.pexp_loc)
-            } else {
-              let doc = printExpressionWithComments({...expr, pexp_attributes: list{}}, cmtTbl)
-              let doc = if (
-                Parens.subBinaryExprOperand(parentOperator, operator) ||
-                (expr.pexp_attributes != list{} &&
-                  (ParsetreeViewer.isBinaryExpression(expr) || ParsetreeViewer.isTernaryExpr(expr)))
-              ) {
-                Doc.concat(list{Doc.lparen, doc, Doc.rparen})
-              } else {
-                doc
-              }
-              Doc.concat(list{printAttributes(expr.pexp_attributes), doc})
-            }
-          | _ => assert false
-          }
-        } else {
-          switch expr.pexp_desc {
-          | Pexp_setfield(lhs, field, rhs) =>
-            let doc = printSetFieldExpr(
-              expr.pexp_attributes,
-              lhs,
-              field,
-              rhs,
-              expr.pexp_loc,
-              cmtTbl,
-            )
-            if isLhs {
-              addParens(doc)
-            } else {
-              doc
-            }
-          | Pexp_apply(
-              {pexp_desc: Pexp_ident({txt: Longident.Lident("#=")})},
-              list{(Nolabel, lhs), (Nolabel, rhs)},
-            ) =>
-            let rhsDoc = printExpressionWithComments(rhs, cmtTbl)
-            let lhsDoc = printExpressionWithComments(lhs, cmtTbl)
-            /* TODO: unify indentation of "=" */
-            let shouldIndent = ParsetreeViewer.isBinaryExpression(rhs)
-            let doc = Doc.group(
-              Doc.concat(list{
-                lhsDoc,
-                Doc.text(" ="),
-                if shouldIndent {
-                  Doc.group(Doc.indent(Doc.concat(list{Doc.line, rhsDoc})))
-                } else {
-                  Doc.concat(list{Doc.space, rhsDoc})
-                },
-              }),
-            )
-            let doc = switch expr.pexp_attributes {
-            | list{} => doc
-            | attrs => Doc.group(Doc.concat(list{printAttributes(attrs), doc}))
-            }
-
-            if isLhs {
-              addParens(doc)
-            } else {
-              doc
-            }
-          | _ =>
-            let doc = printExpressionWithComments(expr, cmtTbl)
-            switch Parens.binaryExprOperand(~isLhs, expr) {
-            | Parens.Parenthesized => addParens(doc)
-            | Braced(braces) => printBraces(doc, expr, braces)
-            | Nothing => doc
-            }
-          }
-        }
-
-      flatten(~isLhs, expr, parentOperator)
-    }
-
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident(("|." | "|>") as op)})},
-        list{(Nolabel, lhs), (Nolabel, rhs)},
-      )
-      when !(ParsetreeViewer.isBinaryExpression(lhs) || ParsetreeViewer.isBinaryExpression(rhs)) =>
-      let lhsDoc = printOperand(~isLhs=true, lhs, op)
-      let rhsDoc = printOperand(~isLhs=false, rhs, op)
-      Doc.group(
-        Doc.concat(list{
-          lhsDoc,
-          switch op {
-          | "|." => Doc.text("->")
-          | "|>" => Doc.text(" |> ")
-          | _ => assert false
-          },
-          rhsDoc,
-        }),
-      )
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})},
-        list{(Nolabel, lhs), (Nolabel, rhs)},
-      ) =>
-      let right = {
-        let operatorWithRhs = {
-          let rhsDoc = printOperand(~isLhs=false, rhs, operator)
-          Doc.concat(list{
-            printBinaryOperator(
-              ~inlineRhs=ParsetreeViewer.shouldInlineRhsBinaryExpr(rhs),
-              operator,
-            ),
-            rhsDoc,
-          })
-        }
-        if ParsetreeViewer.shouldIndentBinaryExpr(expr) {
-          Doc.group(Doc.indent(operatorWithRhs))
-        } else {
-          operatorWithRhs
-        }
-      }
-
-      let doc = Doc.group(Doc.concat(list{printOperand(~isLhs=true, lhs, operator), right}))
-      Doc.group(
-        Doc.concat(list{
-          printAttributes(expr.pexp_attributes),
-          switch Parens.binaryExpr({
-            ...expr,
-            pexp_attributes: List.filter(attr =>
-              switch attr {
-              | ({Location.txt: "res.braces"}, _) => false
-              | _ => true
-              }
-            , expr.pexp_attributes),
-          }) {
-          | Braced(bracesLoc) => printBraces(doc, expr, bracesLoc)
-          | Parenthesized => addParens(doc)
-          | Nothing => doc
-          },
-        }),
-      )
-    | _ => Doc.nil
-    }
-  }
-
-  /* callExpr(arg1, arg2) */
-  and printPexpApply = (expr, cmtTbl) =>
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident("##")})},
-        list{(Nolabel, parentExpr), (Nolabel, memberExpr)},
-      ) =>
-      let parentDoc = {
-        let doc = printExpressionWithComments(parentExpr, cmtTbl)
-        switch Parens.unaryExprOperand(parentExpr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, parentExpr, braces)
-        | Nothing => doc
-        }
-      }
-
-      let member = {
-        let memberDoc = switch memberExpr.pexp_desc {
-        | Pexp_ident(lident) =>
-          printComments(printLongident(lident.txt), cmtTbl, memberExpr.pexp_loc)
-        | _ => printExpressionWithComments(memberExpr, cmtTbl)
-        }
-
-        Doc.concat(list{Doc.text("\""), memberDoc, Doc.text("\"")})
-      }
-
-      Doc.group(
-        Doc.concat(list{
-          printAttributes(expr.pexp_attributes),
-          parentDoc,
-          Doc.lbracket,
-          member,
-          Doc.rbracket,
-        }),
-      )
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident("#=")})},
-        list{(Nolabel, lhs), (Nolabel, rhs)},
-      ) =>
-      let rhsDoc = {
-        let doc = printExpressionWithComments(rhs, cmtTbl)
-        switch Parens.expr(rhs) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, rhs, braces)
-        | Nothing => doc
-        }
-      }
-
-      /* TODO: unify indentation of "=" */
-      let shouldIndent =
-        !ParsetreeViewer.isBracedExpr(rhs) && ParsetreeViewer.isBinaryExpression(rhs)
-      let doc = Doc.group(
-        Doc.concat(list{
-          printExpressionWithComments(lhs, cmtTbl),
-          Doc.text(" ="),
-          if shouldIndent {
-            Doc.group(Doc.indent(Doc.concat(list{Doc.line, rhsDoc})))
-          } else {
-            Doc.concat(list{Doc.space, rhsDoc})
-          },
-        }),
-      )
-      switch expr.pexp_attributes {
-      | list{} => doc
-      | attrs => Doc.group(Doc.concat(list{printAttributes(attrs), doc}))
-      }
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Ldot(Lident("Array"), "get")})},
-        list{(Nolabel, parentExpr), (Nolabel, memberExpr)},
-      ) =>
-      let member = {
-        let memberDoc = {
-          let doc = printExpressionWithComments(memberExpr, cmtTbl)
-          switch Parens.expr(memberExpr) {
-          | Parens.Parenthesized => addParens(doc)
-          | Braced(braces) => printBraces(doc, memberExpr, braces)
-          | Nothing => doc
-          }
-        }
-
-        let shouldInline = switch memberExpr.pexp_desc {
-        | Pexp_constant(_) | Pexp_ident(_) => true
-        | _ => false
-        }
-
-        if shouldInline {
-          memberDoc
-        } else {
-          Doc.concat(list{Doc.indent(Doc.concat(list{Doc.softLine, memberDoc})), Doc.softLine})
-        }
-      }
-
-      let parentDoc = {
-        let doc = printExpressionWithComments(parentExpr, cmtTbl)
-        switch Parens.unaryExprOperand(parentExpr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, parentExpr, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.group(
-        Doc.concat(list{
-          printAttributes(expr.pexp_attributes),
-          parentDoc,
-          Doc.lbracket,
-          member,
-          Doc.rbracket,
-        }),
-      )
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Ldot(Lident("Array"), "set")})},
-        list{(Nolabel, parentExpr), (Nolabel, memberExpr), (Nolabel, targetExpr)},
-      ) =>
-      let member = {
-        let memberDoc = {
-          let doc = printExpressionWithComments(memberExpr, cmtTbl)
-          switch Parens.expr(memberExpr) {
-          | Parens.Parenthesized => addParens(doc)
-          | Braced(braces) => printBraces(doc, memberExpr, braces)
-          | Nothing => doc
-          }
-        }
-
-        let shouldInline = switch memberExpr.pexp_desc {
-        | Pexp_constant(_) | Pexp_ident(_) => true
-        | _ => false
-        }
-
-        if shouldInline {
-          memberDoc
-        } else {
-          Doc.concat(list{Doc.indent(Doc.concat(list{Doc.softLine, memberDoc})), Doc.softLine})
-        }
-      }
-
-      let shouldIndentTargetExpr = if ParsetreeViewer.isBracedExpr(targetExpr) {
-        false
-      } else {
-        ParsetreeViewer.isBinaryExpression(targetExpr) ||
-        switch targetExpr {
-        | {
-            pexp_attributes: list{({Location.txt: "res.ternary"}, _)},
-            pexp_desc: Pexp_ifthenelse(ifExpr, _, _),
-          } =>
-          ParsetreeViewer.isBinaryExpression(ifExpr) ||
-          ParsetreeViewer.hasAttributes(ifExpr.pexp_attributes)
-        | {pexp_desc: Pexp_newtype(_)} => false
-        | e => ParsetreeViewer.hasAttributes(e.pexp_attributes) || ParsetreeViewer.isArrayAccess(e)
-        }
-      }
-
-      let targetExpr = {
-        let doc = printExpressionWithComments(targetExpr, cmtTbl)
-        switch Parens.expr(targetExpr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, targetExpr, braces)
-        | Nothing => doc
-        }
-      }
-
-      let parentDoc = {
-        let doc = printExpressionWithComments(parentExpr, cmtTbl)
-        switch Parens.unaryExprOperand(parentExpr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, parentExpr, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.group(
-        Doc.concat(list{
-          printAttributes(expr.pexp_attributes),
-          parentDoc,
-          Doc.lbracket,
-          member,
-          Doc.rbracket,
-          Doc.text(" ="),
-          if shouldIndentTargetExpr {
-            Doc.indent(Doc.concat(list{Doc.line, targetExpr}))
-          } else {
-            Doc.concat(list{Doc.space, targetExpr})
-          },
-        }),
-      )
-    /* TODO: cleanup, are those branches even remotely performant? */
-    | Pexp_apply({pexp_desc: Pexp_ident(lident)}, args)
-      when ParsetreeViewer.isJsxExpression(expr) =>
-      printJsxExpression(lident, args, cmtTbl)
-    | Pexp_apply(callExpr, args) =>
-      let args = List.map(((lbl, arg)) => (lbl, ParsetreeViewer.rewriteUnderscoreApply(arg)), args)
-
-      let (uncurried, attrs) = ParsetreeViewer.processUncurriedAttribute(expr.pexp_attributes)
-
-      let callExprDoc = {
-        let doc = printExpressionWithComments(callExpr, cmtTbl)
-        switch Parens.callExpr(callExpr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, callExpr, braces)
-        | Nothing => doc
-        }
-      }
-
-      if ParsetreeViewer.requiresSpecialCallbackPrintingFirstArg(args) {
-        let argsDoc = printArgumentsWithCallbackInFirstPosition(~uncurried, args, cmtTbl)
-
-        Doc.concat(list{printAttributes(attrs), callExprDoc, argsDoc})
-      } else if ParsetreeViewer.requiresSpecialCallbackPrintingLastArg(args) {
-        let argsDoc = printArgumentsWithCallbackInLastPosition(~uncurried, args, cmtTbl)
-
-        Doc.concat(list{printAttributes(attrs), callExprDoc, argsDoc})
-      } else {
-        let argsDoc = printArguments(~uncurried, args, cmtTbl)
-        Doc.concat(list{printAttributes(attrs), callExprDoc, argsDoc})
-      }
-    | _ => assert false
-    }
-
-  and printJsxExpression = (lident, args, cmtTbl) => {
-    let name = printJsxName(lident)
-    let (formattedProps, children) = printJsxProps(args, cmtTbl)
-    /* <div className="test" /> */
-    let isSelfClosing = switch children {
-    | list{} => true
-    | _ => false
-    }
-    Doc.group(
-      Doc.concat(list{
-        Doc.group(
-          Doc.concat(list{
-            printComments(Doc.concat(list{Doc.lessThan, name}), cmtTbl, lident.Asttypes.loc),
-            formattedProps,
-            if isSelfClosing {
-              Doc.concat(list{Doc.line, Doc.text("/>")})
-            } else {
-              Doc.nil
-            },
-          }),
-        ),
-        if isSelfClosing {
-          Doc.nil
-        } else {
-          Doc.concat(list{
-            Doc.greaterThan,
-            Doc.indent(Doc.concat(list{Doc.line, printJsxChildren(children, cmtTbl)})),
-            Doc.line,
-            Doc.text("</"),
-            name,
-            Doc.greaterThan,
-          })
-        },
-      }),
-    )
-  }
-
-  and printJsxFragment = (expr, cmtTbl) => {
-    let opening = Doc.text("<>")
-    let closing = Doc.text("</>")
-    let (children, _) = ParsetreeViewer.collectListExpressions(expr)
-    Doc.group(
-      Doc.concat(list{
-        opening,
-        switch children {
-        | list{} => Doc.nil
-        | children => Doc.indent(Doc.concat(list{Doc.line, printJsxChildren(children, cmtTbl)}))
-        },
-        Doc.line,
-        closing,
-      }),
-    )
-  }
-
-  and printJsxChildren = (children: list<Parsetree.expression>, cmtTbl) =>
-    Doc.group(Doc.join(~sep=Doc.line, List.map(expr => {
-          let exprDoc = printExpressionWithComments(expr, cmtTbl)
-          switch Parens.jsxChildExpr(expr) {
-          | Parenthesized | Braced(_) =>
-            /* {(20: int)} make sure that we also protect the expression inside */
-            addBraces(
-              if Parens.bracedExpr(expr) {
-                addParens(exprDoc)
-              } else {
-                exprDoc
-              },
-            )
-          | Nothing => exprDoc
-          }
-        }, children)))
-
-  and printJsxProps = (args, cmtTbl) => {
-    let rec loop = (props, args) =>
-      switch args {
-      | list{} => (Doc.nil, list{})
-      | list{
-          (Asttypes.Labelled("children"), children),
-          (
-            Asttypes.Nolabel,
-            {Parsetree.pexp_desc: Pexp_construct({txt: Longident.Lident("()")}, None)},
-          ),
-        } =>
-        let formattedProps = Doc.indent(
-          switch props {
-          | list{} => Doc.nil
-          | props =>
-            Doc.concat(list{Doc.line, Doc.group(Doc.join(~sep=Doc.line, props |> List.rev))})
-          },
-        )
-        let (children, _) = ParsetreeViewer.collectListExpressions(children)
-        (formattedProps, children)
-      | list{arg, ...args} =>
-        let propDoc = printJsxProp(arg, cmtTbl)
-        loop(list{propDoc, ...props}, args)
-      }
-
-    loop(list{}, args)
-  }
-
-  and printJsxProp = (arg, cmtTbl) =>
-    switch arg {
-    | (
-        (Asttypes.Labelled(lblTxt) | Optional(lblTxt)) as lbl,
-        {
-          Parsetree.pexp_attributes: list{({Location.txt: "res.namedArgLoc", loc: argLoc}, _)},
-          pexp_desc: Pexp_ident({txt: Longident.Lident(ident)}),
-        },
-      ) when lblTxt == ident /* jsx punning */ =>
-      switch lbl {
-      | Nolabel => Doc.nil
-      | Labelled(_lbl) => printComments(printIdentLike(ident), cmtTbl, argLoc)
-      | Optional(_lbl) =>
-        let doc = Doc.concat(list{Doc.question, printIdentLike(ident)})
-        printComments(doc, cmtTbl, argLoc)
-      }
-    | (
-        (Asttypes.Labelled(lblTxt) | Optional(lblTxt)) as lbl,
-        {Parsetree.pexp_attributes: list{}, pexp_desc: Pexp_ident({txt: Longident.Lident(ident)})},
-      ) when lblTxt == ident /* jsx punning when printing from Reason */ =>
-      switch lbl {
-      | Nolabel => Doc.nil
-      | Labelled(_lbl) => printIdentLike(ident)
-      | Optional(_lbl) => Doc.concat(list{Doc.question, printIdentLike(ident)})
-      }
-    | (lbl, expr) =>
-      let (argLoc, expr) = switch expr.pexp_attributes {
-      | list{({Location.txt: "res.namedArgLoc", loc}, _), ...attrs} => (
-          loc,
-          {...expr, pexp_attributes: attrs},
-        )
-      | _ => (Location.none, expr)
-      }
-
-      let lblDoc = switch lbl {
-      | Asttypes.Labelled(lbl) =>
-        let lbl = printComments(printIdentLike(lbl), cmtTbl, argLoc)
-        Doc.concat(list{lbl, Doc.equal})
-      | Asttypes.Optional(lbl) =>
-        let lbl = printComments(printIdentLike(lbl), cmtTbl, argLoc)
-        Doc.concat(list{lbl, Doc.equal, Doc.question})
-      | Nolabel => Doc.nil
-      }
-
-      let exprDoc = {
-        let doc = printExpression(expr, cmtTbl)
-        switch Parens.jsxPropExpr(expr) {
-        | Parenthesized | Braced(_) =>
-          /* {(20: int)} make sure that we also protect the expression inside */
-          addBraces(
-            if Parens.bracedExpr(expr) {
-              addParens(doc)
-            } else {
-              doc
-            },
-          )
-        | _ => doc
-        }
-      }
-
-      let fullLoc = {...argLoc, loc_end: expr.pexp_loc.loc_end}
-      printComments(Doc.concat(list{lblDoc, exprDoc}), cmtTbl, fullLoc)
-    }
-
-  /* div -> div.
-   * Navabar.createElement -> Navbar
-   * Staff.Users.createElement -> Staff.Users */
-  and printJsxName = ({txt: lident}) => {
-    let rec flatten = (acc, lident) =>
-      switch lident {
-      | Longident.Lident(txt) => list{txt, ...acc}
-      | Ldot(lident, txt) =>
-        let acc = if txt == "createElement" {
-          acc
-        } else {
-          list{txt, ...acc}
-        }
-        flatten(acc, lident)
-      | _ => acc
-      }
-
-    switch lident {
-    | Longident.Lident(txt) => Doc.text(txt)
-    | _ as lident =>
-      let segments = flatten(list{}, lident)
-      Doc.join(~sep=Doc.dot, List.map(Doc.text, segments))
-    }
-  }
-
-  and printArgumentsWithCallbackInFirstPosition = (~uncurried, args, cmtTbl) => {
-    let (callback, printedArgs) = switch args {
-    | list{(lbl, expr), ...args} =>
-      let lblDoc = switch lbl {
-      | Asttypes.Nolabel => Doc.nil
-      | Asttypes.Labelled(txt) => Doc.concat(list{Doc.tilde, printIdentLike(txt), Doc.equal})
-      | Asttypes.Optional(txt) =>
-        Doc.concat(list{Doc.tilde, printIdentLike(txt), Doc.equal, Doc.question})
-      }
-
-      let callback = Doc.concat(list{lblDoc, printPexpFun(~inCallback=true, expr, cmtTbl)})
-      let printedArgs =
-        List.map(arg => printArgument(arg, cmtTbl), args) |> Doc.join(
-          ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-        )
-
-      (callback, printedArgs)
-    | _ => assert false
-    }
-
-    /* Thing.map((arg1, arg2) => MyModuleBlah.toList(argument), foo) */
-    /* Thing.map((arg1, arg2) => {
-     *   MyModuleBlah.toList(argument)
-     * }, longArgumet, veryLooooongArgument)
-     */
-    let fitsOnOneLine = Doc.concat(list{
-      if uncurried {
-        Doc.text("(. ")
-      } else {
-        Doc.lparen
-      },
-      callback,
-      Doc.comma,
-      Doc.line,
-      printedArgs,
-      Doc.rparen,
-    })
-
-    /* Thing.map(
-     *   (param1, parm2) => doStuff(param1, parm2),
-     *   arg1,
-     *   arg2,
-     *   arg3,
-     * )
-     */
-    let breakAllArgs = printArguments(~uncurried, args, cmtTbl)
-    Doc.customLayout(list{fitsOnOneLine, breakAllArgs})
-  }
-
-  and printArgumentsWithCallbackInLastPosition = (~uncurried, args, cmtTbl) => {
-    let rec loop = (acc, args) =>
-      switch args {
-      | list{} => (Doc.nil, Doc.nil)
-      | list{(lbl, expr)} =>
-        let lblDoc = switch lbl {
-        | Asttypes.Nolabel => Doc.nil
-        | Asttypes.Labelled(txt) => Doc.concat(list{Doc.tilde, printIdentLike(txt), Doc.equal})
-        | Asttypes.Optional(txt) =>
-          Doc.concat(list{Doc.tilde, printIdentLike(txt), Doc.equal, Doc.question})
-        }
-
-        let callback = printPexpFun(~inCallback=true, expr, cmtTbl)
-        (Doc.concat(List.rev(acc)), Doc.concat(list{lblDoc, callback}))
-      | list{arg, ...args} =>
-        let argDoc = printArgument(arg, cmtTbl)
-        loop(list{Doc.line, Doc.comma, argDoc, ...acc}, args)
-      }
-
-    let (printedArgs, callback) = loop(list{}, args)
-
-    /* Thing.map(foo, (arg1, arg2) => MyModuleBlah.toList(argument)) */
-    let fitsOnOneLine = Doc.concat(list{
-      if uncurried {
-        Doc.text("(.")
-      } else {
-        Doc.lparen
-      },
-      printedArgs,
-      callback,
-      Doc.rparen,
-    })
-
-    /* Thing.map(longArgumet, veryLooooongArgument, (arg1, arg2) =>
-     *   MyModuleBlah.toList(argument)
-     * )
-     */
-    let arugmentsFitOnOneLine = Doc.concat(list{
-      if uncurried {
-        Doc.text("(.")
-      } else {
-        Doc.lparen
-      },
-      Doc.softLine,
-      printedArgs,
-      Doc.breakableGroup(~forceBreak=true, callback),
-      Doc.softLine,
-      Doc.rparen,
-    })
-
-    /* Thing.map(
-     *   arg1,
-     *   arg2,
-     *   arg3,
-     *   (param1, parm2) => doStuff(param1, parm2)
-     * )
-     */
-    let breakAllArgs = printArguments(~uncurried, args, cmtTbl)
-    Doc.customLayout(list{fitsOnOneLine, arugmentsFitOnOneLine, breakAllArgs})
-  }
-
-  and printArguments = (
-    ~uncurried,
-    args: list<(Asttypes.arg_label, Parsetree.expression)>,
-    cmtTbl,
-  ) =>
-    switch args {
-    | list{(Nolabel, {pexp_desc: Pexp_construct({txt: Longident.Lident("()")}, _)})} =>
-      if uncurried {
-        Doc.text("(.)")
-      } else {
-        Doc.text("()")
-      }
-    | list{(Nolabel, arg)} when ParsetreeViewer.isHuggableExpression(arg) =>
-      let argDoc = {
-        let doc = printExpressionWithComments(arg, cmtTbl)
-        switch Parens.expr(arg) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, arg, braces)
-        | Nothing => doc
-        }
-      }
-
-      Doc.concat(list{
-        if uncurried {
-          Doc.text("(.")
-        } else {
-          Doc.lparen
-        },
-        argDoc,
-        Doc.rparen,
-      })
-    | args =>
-      Doc.group(
-        Doc.concat(list{
-          if uncurried {
-            Doc.text("(.")
-          } else {
-            Doc.lparen
-          },
-          Doc.indent(
-            Doc.concat(list{
-              if uncurried {
-                Doc.line
-              } else {
-                Doc.softLine
-              },
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(arg => printArgument(arg, cmtTbl), args),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    }
-
-  /*
-   * argument ::=
-   *   | _                            (* syntax sugar *)
-   *   | expr
-   *   | expr : type
-   *   | ~ label-name
-   *   | ~ label-name
-   *   | ~ label-name ?
-   *   | ~ label-name =   expr
-   *   | ~ label-name =   _           (* syntax sugar *)
-   *   | ~ label-name =   expr : type
-   *   | ~ label-name = ? expr
-   *   | ~ label-name = ? _           (* syntax sugar *)
-   *   | ~ label-name = ? expr : type */
-  and printArgument = ((argLbl, arg), cmtTbl) =>
-    switch (argLbl, arg) {
-    /* ~a (punned) */
-    | (
-        Asttypes.Labelled(lbl),
-        {
-          pexp_desc: Pexp_ident({txt: Longident.Lident(name)}),
-          pexp_attributes: list{} | list{({Location.txt: "res.namedArgLoc"}, _)},
-        } as argExpr,
-      ) when lbl == name && !ParsetreeViewer.isBracedExpr(argExpr) =>
-      let loc = switch arg.pexp_attributes {
-      | list{({Location.txt: "res.namedArgLoc", loc}, _), ..._} => loc
-      | _ => arg.pexp_loc
-      }
-
-      let doc = Doc.concat(list{Doc.tilde, printIdentLike(lbl)})
-      printComments(doc, cmtTbl, loc)
-
-    /* ~a: int (punned) */
-    | (
-        Asttypes.Labelled(lbl),
-        {
-          pexp_desc:
-            Pexp_constraint({pexp_desc: Pexp_ident({txt: Longident.Lident(name)})} as argExpr, typ),
-          pexp_loc,
-          pexp_attributes: (list{} | list{({Location.txt: "res.namedArgLoc"}, _)}) as attrs,
-        },
-      ) when lbl == name && !ParsetreeViewer.isBracedExpr(argExpr) =>
-      let loc = switch attrs {
-      | list{({Location.txt: "res.namedArgLoc", loc}, _), ..._} => {
-          ...loc,
-          loc_end: pexp_loc.loc_end,
-        }
-      | _ => arg.pexp_loc
-      }
-
-      let doc = Doc.concat(list{
-        Doc.tilde,
-        printIdentLike(lbl),
-        Doc.text(": "),
-        printTypExpr(typ, cmtTbl),
-      })
-      printComments(doc, cmtTbl, loc)
-    /* ~a? (optional lbl punned) */
-    | (
-        Asttypes.Optional(lbl),
-        {
-          pexp_desc: Pexp_ident({txt: Longident.Lident(name)}),
-          pexp_attributes: list{} | list{({Location.txt: "res.namedArgLoc"}, _)},
-        },
-      ) when lbl == name =>
-      let loc = switch arg.pexp_attributes {
-      | list{({Location.txt: "res.namedArgLoc", loc}, _), ..._} => loc
-      | _ => arg.pexp_loc
-      }
-
-      let doc = Doc.concat(list{Doc.tilde, printIdentLike(lbl), Doc.question})
-      printComments(doc, cmtTbl, loc)
-    | (_lbl, expr) =>
-      let (argLoc, expr) = switch expr.pexp_attributes {
-      | list{({Location.txt: "res.namedArgLoc", loc}, _), ...attrs} => (
-          loc,
-          {...expr, pexp_attributes: attrs},
-        )
-      | _ => (expr.pexp_loc, expr)
-      }
-
-      let printedLbl = switch argLbl {
-      | Asttypes.Nolabel => Doc.nil
-      | Asttypes.Labelled(lbl) =>
-        let doc = Doc.concat(list{Doc.tilde, printIdentLike(lbl), Doc.equal})
-        printComments(doc, cmtTbl, argLoc)
-      | Asttypes.Optional(lbl) =>
-        let doc = Doc.concat(list{Doc.tilde, printIdentLike(lbl), Doc.equal, Doc.question})
-        printComments(doc, cmtTbl, argLoc)
-      }
-
-      let printedExpr = {
-        let doc = printExpressionWithComments(expr, cmtTbl)
-        switch Parens.expr(expr) {
-        | Parens.Parenthesized => addParens(doc)
-        | Braced(braces) => printBraces(doc, expr, braces)
-        | Nothing => doc
-        }
-      }
-
-      let loc = {...argLoc, loc_end: expr.pexp_loc.loc_end}
-      let doc = Doc.concat(list{printedLbl, printedExpr})
-      printComments(doc, cmtTbl, loc)
-    }
-
-  and printCases = (cases: list<Parsetree.case>, cmtTbl) =>
-    Doc.breakableGroup(
-      ~forceBreak=true,
-      Doc.concat(list{Doc.lbrace, Doc.concat(list{Doc.line, printList(~getLoc=n => {
-            ...n.Parsetree.pc_lhs.ppat_loc,
-            loc_end: switch ParsetreeViewer.processBracesAttr(n.Parsetree.pc_rhs) {
-            | (None, _) => n.pc_rhs.pexp_loc.loc_end
-            | (Some({loc}, _), _) => loc.Location.loc_end
-            },
-          }, ~print=printCase, ~nodes=cases, cmtTbl)}), Doc.line, Doc.rbrace}),
-    )
-
-  and printCase = (case: Parsetree.case, cmtTbl) => {
-    let rhs = switch case.pc_rhs.pexp_desc {
-    | Pexp_let(_) | Pexp_letmodule(_) | Pexp_letexception(_) | Pexp_open(_) | Pexp_sequence(_) =>
-      printExpressionBlock(~braces=ParsetreeViewer.isBracedExpr(case.pc_rhs), case.pc_rhs, cmtTbl)
-    | _ =>
-      let doc = printExpressionWithComments(case.pc_rhs, cmtTbl)
-      switch Parens.expr(case.pc_rhs) {
-      | Parenthesized => addParens(doc)
-      | _ => doc
-      }
-    }
-
-    let guard = switch case.pc_guard {
-    | None => Doc.nil
-    | Some(expr) =>
-      Doc.group(
-        Doc.concat(list{Doc.line, Doc.text("when "), printExpressionWithComments(expr, cmtTbl)}),
-      )
-    }
-
-    let shouldInlineRhs = switch case.pc_rhs.pexp_desc {
-    | Pexp_construct({txt: Longident.Lident("()" | "true" | "false")}, _)
-    | Pexp_constant(_)
-    | Pexp_ident(_) => true
-    | _ when ParsetreeViewer.isHuggableRhs(case.pc_rhs) => true
-    | _ => false
-    }
-
-    let shouldIndentPattern = switch case.pc_lhs.ppat_desc {
-    | Ppat_or(_) => false
-    | _ => true
-    }
-
-    let patternDoc = {
-      let doc = printPattern(case.pc_lhs, cmtTbl)
-      switch case.pc_lhs.ppat_desc {
-      | Ppat_constraint(_) => addParens(doc)
-      | _ => doc
-      }
-    }
-
-    let content = Doc.concat(list{
-      if shouldIndentPattern {
-        Doc.indent(patternDoc)
-      } else {
-        patternDoc
-      },
-      Doc.indent(guard),
-      Doc.text(" =>"),
-      Doc.indent(
-        Doc.concat(list{
-          if shouldInlineRhs {
-            Doc.space
-          } else {
-            Doc.line
-          },
-          rhs,
-        }),
-      ),
-    })
-    Doc.group(Doc.concat(list{Doc.text("| "), content}))
-  }
-
-  and printExprFunParameters = (~inCallback, ~uncurried, ~hasConstraint, parameters, cmtTbl) =>
-    switch parameters {
-    /* let f = _ => () */
-    | list{ParsetreeViewer.Parameter({
-        attrs: list{},
-        lbl: Asttypes.Nolabel,
-        defaultExpr: None,
-        pat: {Parsetree.ppat_desc: Ppat_any},
-      })} when !uncurried =>
-      if hasConstraint {
-        Doc.text("(_)")
-      } else {
-        Doc.text("_")
-      }
-    /* let f = a => () */
-    | list{ParsetreeViewer.Parameter({
-        attrs: list{},
-        lbl: Asttypes.Nolabel,
-        defaultExpr: None,
-        pat: {Parsetree.ppat_desc: Ppat_var(stringLoc)},
-      })} when !uncurried =>
-      let txtDoc = {
-        let var = printIdentLike(stringLoc.txt)
-        if hasConstraint {
-          addParens(var)
-        } else {
-          var
-        }
-      }
-
-      printComments(txtDoc, cmtTbl, stringLoc.loc)
-    /* let f = () => () */
-    | list{ParsetreeViewer.Parameter({
-        attrs: list{},
-        lbl: Asttypes.Nolabel,
-        defaultExpr: None,
-        pat: {ppat_desc: Ppat_construct({txt: Longident.Lident("()")}, None)},
-      })} when !uncurried =>
-      Doc.text("()")
-    /* let f = (~greeting, ~from as hometown, ~x=?) => () */
-    | parameters =>
-      let lparen = if uncurried {
-        Doc.text("(. ")
-      } else {
-        Doc.lparen
-      }
-      let shouldHug = ParsetreeViewer.parametersShouldHug(parameters)
-      let printedParamaters = Doc.concat(list{
-        if shouldHug || inCallback {
-          Doc.nil
-        } else {
-          Doc.softLine
-        },
-        Doc.join(
-          ~sep=Doc.concat(list{
-            Doc.comma,
-            if inCallback {
-              Doc.space
-            } else {
-              Doc.line
-            },
-          }),
-          List.map(p => printExpFunParameter(p, cmtTbl), parameters),
-        ),
-      })
-      Doc.group(
-        Doc.concat(list{
-          lparen,
-          if shouldHug || inCallback {
-            printedParamaters
-          } else {
-            Doc.indent(printedParamaters)
-          },
-          if shouldHug || inCallback {
-            Doc.nil
-          } else {
-            Doc.concat(list{Doc.trailingComma, Doc.softLine})
-          },
-          Doc.rparen,
-        }),
-      )
-    }
-
-  and printExpFunParameter = (parameter, cmtTbl) =>
-    switch parameter {
-    | ParsetreeViewer.NewTypes({attrs, locs: lbls}) =>
-      Doc.group(
-        Doc.concat(list{
-          printAttributes(attrs),
-          Doc.text("type "),
-          Doc.join(
-            ~sep=Doc.space,
-            List.map(
-              lbl => printComments(printIdentLike(lbl.Asttypes.txt), cmtTbl, lbl.Asttypes.loc),
-              lbls,
-            ),
-          ),
-        }),
-      )
-    | Parameter({attrs, lbl, defaultExpr, pat: pattern}) =>
-      let (isUncurried, attrs) = ParsetreeViewer.processUncurriedAttribute(attrs)
-      let uncurried = if isUncurried {
-        Doc.concat(list{Doc.dot, Doc.space})
-      } else {
-        Doc.nil
-      }
-      let attrs = printAttributes(attrs)
-      /* =defaultValue */
-      let defaultExprDoc = switch defaultExpr {
-      | Some(expr) => Doc.concat(list{Doc.text("="), printExpressionWithComments(expr, cmtTbl)})
-      | None => Doc.nil
-      }
-
-      /* ~from as hometown
-       * ~from                   ->  punning */
-      let labelWithPattern = switch (lbl, pattern) {
-      | (Asttypes.Nolabel, pattern) => printPattern(pattern, cmtTbl)
-      | (
-          Asttypes.Labelled(lbl) | Optional(lbl),
-          {
-            ppat_desc: Ppat_var(stringLoc),
-            ppat_attributes: list{} | list{({Location.txt: "res.namedArgLoc"}, _)},
-          },
-        ) when lbl == stringLoc.txt =>
-        /* ~d */
-        Doc.concat(list{Doc.text("~"), printIdentLike(lbl)})
-      | (
-          Asttypes.Labelled(lbl) | Optional(lbl),
-          {
-            ppat_desc: Ppat_constraint({ppat_desc: Ppat_var({txt})}, typ),
-            ppat_attributes: list{} | list{({Location.txt: "res.namedArgLoc"}, _)},
-          },
-        ) when lbl == txt =>
-        /* ~d: e */
-        Doc.concat(list{
-          Doc.text("~"),
-          printIdentLike(lbl),
-          Doc.text(": "),
-          printTypExpr(typ, cmtTbl),
-        })
-      | (Asttypes.Labelled(lbl) | Optional(lbl), pattern) =>
-        /* ~b as c */
-        Doc.concat(list{
-          Doc.text("~"),
-          printIdentLike(lbl),
-          Doc.text(" as "),
-          printPattern(pattern, cmtTbl),
-        })
-      }
-
-      let optionalLabelSuffix = switch (lbl, defaultExpr) {
-      | (Asttypes.Optional(_), None) => Doc.text("=?")
-      | _ => Doc.nil
-      }
-
-      let doc = Doc.group(
-        Doc.concat(list{uncurried, attrs, labelWithPattern, defaultExprDoc, optionalLabelSuffix}),
-      )
-      let cmtLoc = switch defaultExpr {
-      | None =>
-        switch pattern.ppat_attributes {
-        | list{({Location.txt: "res.namedArgLoc", loc}, _), ..._} => {
-            ...loc,
-            loc_end: pattern.ppat_loc.loc_end,
-          }
-        | _ => pattern.ppat_loc
-        }
-      | Some(expr) =>
-        let startPos = switch pattern.ppat_attributes {
-        | list{({Location.txt: "res.namedArgLoc", loc}, _), ..._} => loc.loc_start
-        | _ => pattern.ppat_loc.loc_start
-        }
-        {
-          ...pattern.ppat_loc,
-          loc_start: startPos,
-          loc_end: expr.pexp_loc.loc_end,
-        }
-      }
-
-      printComments(doc, cmtTbl, cmtLoc)
-    }
-
-  and printExpressionBlock = (~braces, expr, cmtTbl) => {
-    let rec collectRows = (acc, expr) =>
-      switch expr.Parsetree.pexp_desc {
-      | Parsetree.Pexp_letmodule(modName, modExpr, expr2) =>
-        let name = {
-          let doc = Doc.text(modName.txt)
-          printComments(doc, cmtTbl, modName.loc)
-        }
-
-        let letModuleDoc = Doc.concat(list{
-          Doc.text("module "),
-          name,
-          Doc.text(" = "),
-          printModExpr(modExpr, cmtTbl),
-        })
-        let loc = {...expr.pexp_loc, loc_end: modExpr.pmod_loc.loc_end}
-        collectRows(list{(loc, letModuleDoc), ...acc}, expr2)
-      | Pexp_letexception(extensionConstructor, expr2) =>
-        let loc = {
-          let loc = {...expr.pexp_loc, loc_end: extensionConstructor.pext_loc.loc_end}
-          switch getFirstLeadingComment(cmtTbl, loc) {
-          | None => loc
-          | Some(comment) =>
-            let cmtLoc = Comment.loc(comment)
-            {...cmtLoc, loc_end: loc.loc_end}
-          }
-        }
-
-        let letExceptionDoc = printExceptionDef(extensionConstructor, cmtTbl)
-        collectRows(list{(loc, letExceptionDoc), ...acc}, expr2)
-      | Pexp_open(overrideFlag, longidentLoc, expr2) =>
-        let openDoc = Doc.concat(list{
-          Doc.text("open"),
-          printOverrideFlag(overrideFlag),
-          Doc.space,
-          printLongidentLocation(longidentLoc, cmtTbl),
-        })
-        let loc = {...expr.pexp_loc, loc_end: longidentLoc.loc.loc_end}
-        collectRows(list{(loc, openDoc), ...acc}, expr2)
-      | Pexp_sequence(expr1, expr2) =>
-        let exprDoc = {
-          let doc = printExpression(expr1, cmtTbl)
-          switch Parens.expr(expr1) {
-          | Parens.Parenthesized => addParens(doc)
-          | Braced(braces) => printBraces(doc, expr1, braces)
-          | Nothing => doc
-          }
-        }
-
-        let loc = expr1.pexp_loc
-        collectRows(list{(loc, exprDoc), ...acc}, expr2)
-      | Pexp_let(recFlag, valueBindings, expr2) =>
-        let loc = {
-          let loc = switch (valueBindings, List.rev(valueBindings)) {
-          | (list{vb, ..._}, list{lastVb, ..._}) => {...vb.pvb_loc, loc_end: lastVb.pvb_loc.loc_end}
-          | _ => Location.none
-          }
-
-          switch getFirstLeadingComment(cmtTbl, loc) {
-          | None => loc
-          | Some(comment) =>
-            let cmtLoc = Comment.loc(comment)
-            {...cmtLoc, loc_end: loc.loc_end}
-          }
-        }
-
-        let recFlag = switch recFlag {
-        | Asttypes.Nonrecursive => Doc.nil
-        | Asttypes.Recursive => Doc.text("rec ")
-        }
-
-        let letDoc = printValueBindings(~recFlag, valueBindings, cmtTbl)
-        /* let () = {
-         *   let () = foo()
-         *   ()
-         * }
-         * We don't need to print the () on the last line of the block
-         */
-        switch expr2.pexp_desc {
-        | Pexp_construct({txt: Longident.Lident("()")}, _) => List.rev(list{(loc, letDoc), ...acc})
-        | _ => collectRows(list{(loc, letDoc), ...acc}, expr2)
-        }
-      | _ =>
-        let exprDoc = {
-          let doc = printExpression(expr, cmtTbl)
-          switch Parens.expr(expr) {
-          | Parens.Parenthesized => addParens(doc)
-          | Braced(braces) => printBraces(doc, expr, braces)
-          | Nothing => doc
-          }
-        }
-
-        List.rev(list{(expr.pexp_loc, exprDoc), ...acc})
-      }
-
-    let rows = collectRows(list{}, expr)
-    let block = printList(
-      ~getLoc=fst,
-      ~nodes=rows,
-      ~print=((_, doc), _) => doc,
-      ~forceBreak=true,
-      cmtTbl,
-    )
-
-    Doc.breakableGroup(
-      ~forceBreak=true,
-      if braces {
-        Doc.concat(list{
-          Doc.lbrace,
-          Doc.indent(Doc.concat(list{Doc.line, block})),
-          Doc.line,
-          Doc.rbrace,
-        })
-      } else {
-        block
-      },
-    )
-  }
-
-  /*
-   * // user types:
-   * let f = (a, b) => { a + b }
-   *
-   * // printer: everything is on one line
-   * let f = (a, b) => { a + b }
-   *
-   * // user types: over multiple lines
-   * let f = (a, b) => {
-   *   a + b
-   * }
-   *
-   * // printer: over multiple lines
-   * let f = (a, b) => {
-   *   a + b
-   * }
-   */
-  and printBraces = (doc, expr, bracesLoc) => {
-    let overMultipleLines = {
-      open Location
-      bracesLoc.loc_end.pos_lnum > bracesLoc.loc_start.pos_lnum
-    }
-
-    switch expr.Parsetree.pexp_desc {
-    | Pexp_letmodule(_)
-    | Pexp_letexception(_)
-    | Pexp_let(_)
-    | Pexp_open(_)
-    | Pexp_sequence(_) => /* already has braces */
-      doc
-    | _ =>
-      Doc.breakableGroup(
-        ~forceBreak=overMultipleLines,
-        Doc.concat(list{
-          Doc.lbrace,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              if Parens.bracedExpr(expr) {
-                addParens(doc)
-              } else {
-                doc
-              },
-            }),
-          ),
-          Doc.softLine,
-          Doc.rbrace,
-        }),
-      )
-    }
-  }
-
-  and printOverrideFlag = overrideFlag =>
-    switch overrideFlag {
-    | Asttypes.Override => Doc.text("!")
-    | Fresh => Doc.nil
-    }
-
-  and printDirectionFlag = flag =>
-    switch flag {
-    | Asttypes.Downto => Doc.text(" downto ")
-    | Asttypes.Upto => Doc.text(" to ")
-    }
-
-  and printRecordRow = ((lbl, expr), cmtTbl) => {
-    let cmtLoc = {...lbl.loc, loc_end: expr.pexp_loc.loc_end}
-    let doc = Doc.group(
-      Doc.concat(list{
-        printLidentPath(lbl, cmtTbl),
-        Doc.text(": "),
-        {
-          let doc = printExpressionWithComments(expr, cmtTbl)
-          switch Parens.expr(expr) {
-          | Parens.Parenthesized => addParens(doc)
-          | Braced(braces) => printBraces(doc, expr, braces)
-          | Nothing => doc
-          }
-        },
-      }),
-    )
-    printComments(doc, cmtTbl, cmtLoc)
-  }
-
-  and printBsObjectRow = ((lbl, expr), cmtTbl) => {
-    let cmtLoc = {...lbl.loc, loc_end: expr.pexp_loc.loc_end}
-    let lblDoc = {
-      let doc = Doc.concat(list{Doc.text("\""), printLongident(lbl.txt), Doc.text("\"")})
-      printComments(doc, cmtTbl, lbl.loc)
-    }
-
-    let doc = Doc.concat(list{lblDoc, Doc.text(": "), printExpressionWithComments(expr, cmtTbl)})
-    printComments(doc, cmtTbl, cmtLoc)
-  }
-
-  /* The optional loc indicates whether we need to print the attributes in
-   * relation to some location. In practise this means the following:
-   *  `@attr type t = string` -> on the same line, print on the same line
-   *  `@attr
-   *   type t = string` -> attr is on prev line, print the attributes
-   *   with a line break between, we respect the users' original layout */
-  and printAttributes = (~loc=?, attrs: Parsetree.attributes) =>
-    switch ParsetreeViewer.filterParsingAttrs(attrs) {
-    | list{} => Doc.nil
-    | attrs =>
-      let lineBreak = switch loc {
-      | None => Doc.line
-      | Some(loc) =>
-        switch List.rev(attrs) {
-        | list{({loc: firstLoc}, _), ..._}
-          when loc.loc_start.pos_lnum > firstLoc.loc_end.pos_lnum => Doc.hardLine
-        | _ => Doc.line
-        }
-      }
-
-      Doc.concat(list{
-        Doc.group(Doc.join(~sep=Doc.line, List.map(printAttribute, attrs))),
-        lineBreak,
-      })
-    }
-
-  and printAttribute = ((id, payload): Parsetree.attribute) => {
-    let attrName = Doc.concat(list{Doc.text("@"), Doc.text(id.txt)})
-    switch payload {
-    | PStr(list{{pstr_desc: Pstr_eval(expr, attrs)}}) =>
-      let exprDoc = printExpression(expr, CommentTable.empty)
-      let needsParens = switch attrs {
-      | list{} => false
-      | _ => true
-      }
-      Doc.group(
-        Doc.concat(list{
-          attrName,
-          addParens(
-            Doc.concat(list{
-              printAttributes(attrs),
-              if needsParens {
-                addParens(exprDoc)
-              } else {
-                exprDoc
-              },
-            }),
-          ),
-        }),
-      )
-    | PTyp(typ) =>
-      Doc.group(
-        Doc.concat(list{
-          attrName,
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{Doc.softLine, Doc.text(": "), printTypExpr(typ, CommentTable.empty)}),
-          ),
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    | _ => attrName
-    }
-  }
-
-  and printAttributeWithComments = ((id, payload): Parsetree.attribute, cmtTbl) => {
-    let attrName = Doc.text("@" ++ id.txt)
-    switch payload {
-    | PStr(list{{pstr_desc: Pstr_eval(expr, attrs)}}) =>
-      let exprDoc = printExpressionWithComments(expr, cmtTbl)
-      let needsParens = switch attrs {
-      | list{} => false
-      | _ => true
-      }
-      Doc.group(
-        Doc.concat(list{
-          attrName,
-          addParens(
-            Doc.concat(list{
-              printAttributes(attrs),
-              if needsParens {
-                addParens(exprDoc)
-              } else {
-                exprDoc
-              },
-            }),
-          ),
-        }),
-      )
-    | _ => attrName
-    }
-  }
-
-  and printModExpr = (modExpr, cmtTbl) => {
-    let doc = switch modExpr.pmod_desc {
-    | Pmod_ident(longidentLoc) => printLongidentLocation(longidentLoc, cmtTbl)
-    | Pmod_structure(structure) =>
-      Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list{
-          Doc.lbrace,
-          Doc.indent(Doc.concat(list{Doc.softLine, printStructure(structure, cmtTbl)})),
-          Doc.softLine,
-          Doc.rbrace,
-        }),
-      )
-    | Pmod_unpack(expr) =>
-      let shouldHug = switch expr.pexp_desc {
-      | Pexp_let(_) => true
-      | Pexp_constraint({pexp_desc: Pexp_let(_)}, {ptyp_desc: Ptyp_package(_packageType)}) => true
-      | _ => false
-      }
-
-      let (expr, moduleConstraint) = switch expr.pexp_desc {
-      | Pexp_constraint(expr, {ptyp_desc: Ptyp_package(packageType), ptyp_loc}) =>
-        let packageDoc = {
-          let doc = printPackageType(~printModuleKeywordAndParens=false, packageType, cmtTbl)
-          printComments(doc, cmtTbl, ptyp_loc)
-        }
-
-        let typeDoc = Doc.group(
-          Doc.concat(list{Doc.text(":"), Doc.indent(Doc.concat(list{Doc.line, packageDoc}))}),
-        )
-        (expr, typeDoc)
-      | _ => (expr, Doc.nil)
-      }
-
-      let unpackDoc = Doc.group(
-        Doc.concat(list{printExpressionWithComments(expr, cmtTbl), moduleConstraint}),
-      )
-      Doc.group(
-        Doc.concat(list{
-          Doc.text("unpack("),
-          if shouldHug {
-            unpackDoc
-          } else {
-            Doc.concat(list{Doc.indent(Doc.concat(list{Doc.softLine, unpackDoc})), Doc.softLine})
-          },
-          Doc.rparen,
-        }),
-      )
-    | Pmod_extension(extension) => printExtensionWithComments(~atModuleLvl=false, extension, cmtTbl)
-    | Pmod_apply(_) =>
-      let (args, callExpr) = ParsetreeViewer.modExprApply(modExpr)
-      let isUnitSugar = switch args {
-      | list{{pmod_desc: Pmod_structure(list{})}} => true
-      | _ => false
-      }
-
-      let shouldHug = switch args {
-      | list{{pmod_desc: Pmod_structure(_)}} => true
-      | _ => false
-      }
-
-      Doc.group(
-        Doc.concat(list{
-          printModExpr(callExpr, cmtTbl),
-          if isUnitSugar {
-            printModApplyArg(@doesNotRaise List.hd(args), cmtTbl)
-          } else {
-            Doc.concat(list{
-              Doc.lparen,
-              if shouldHug {
-                printModApplyArg(@doesNotRaise List.hd(args), cmtTbl)
-              } else {
-                Doc.indent(
-                  Doc.concat(list{
-                    Doc.softLine,
-                    Doc.join(
-                      ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                      List.map(modArg => printModApplyArg(modArg, cmtTbl), args),
-                    ),
-                  }),
-                )
-              },
-              if !shouldHug {
-                Doc.concat(list{Doc.trailingComma, Doc.softLine})
-              } else {
-                Doc.nil
-              },
-              Doc.rparen,
-            })
-          },
-        }),
-      )
-    | Pmod_constraint(modExpr, modType) =>
-      Doc.concat(list{printModExpr(modExpr, cmtTbl), Doc.text(": "), printModType(modType, cmtTbl)})
-    | Pmod_functor(_) => printModFunctor(modExpr, cmtTbl)
-    }
-
-    printComments(doc, cmtTbl, modExpr.pmod_loc)
-  }
-
-  and printModFunctor = (modExpr, cmtTbl) => {
-    let (parameters, returnModExpr) = ParsetreeViewer.modExprFunctor(modExpr)
-    /* let shouldInline = match returnModExpr.pmod_desc with */
-    /* | Pmod_structure _ | Pmod_ident _ -> true */
-    /* | Pmod_constraint ({pmod_desc = Pmod_structure _}, _) -> true */
-    /* | _ -> false */
-    /* in */
-    let (returnConstraint, returnModExpr) = switch returnModExpr.pmod_desc {
-    | Pmod_constraint(modExpr, modType) =>
-      let constraintDoc = {
-        let doc = printModType(modType, cmtTbl)
-        if Parens.modExprFunctorConstraint(modType) {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-
-      let modConstraint = Doc.concat(list{Doc.text(": "), constraintDoc})
-      (modConstraint, printModExpr(modExpr, cmtTbl))
-    | _ => (Doc.nil, printModExpr(returnModExpr, cmtTbl))
-    }
-
-    let parametersDoc = switch parameters {
-    | list{(attrs, {txt: "*"}, None)} =>
-      let attrs = switch attrs {
-      | list{} => Doc.nil
-      | attrs =>
-        Doc.concat(list{Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)), Doc.line})
-      }
-      Doc.group(Doc.concat(list{attrs, Doc.text("()")}))
-    | list{(list{}, {txt: lbl}, None)} => Doc.text(lbl)
-    | parameters =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(param => printModFunctorParam(param, cmtTbl), parameters),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    }
-
-    Doc.group(Doc.concat(list{parametersDoc, returnConstraint, Doc.text(" => "), returnModExpr}))
-  }
-
-  and printModFunctorParam = ((attrs, lbl, optModType), cmtTbl) => {
-    let cmtLoc = switch optModType {
-    | None => lbl.Asttypes.loc
-    | Some(modType) => {
-        ...lbl.loc,
-        loc_end: modType.Parsetree.pmty_loc.loc_end,
-      }
-    }
-
-    let attrs = switch attrs {
-    | list{} => Doc.nil
-    | attrs => Doc.concat(list{Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)), Doc.line})
-    }
-    let lblDoc = {
-      let doc = Doc.text(lbl.txt)
-      printComments(doc, cmtTbl, lbl.loc)
-    }
-
-    let doc = Doc.group(
-      Doc.concat(list{
-        attrs,
-        lblDoc,
-        switch optModType {
-        | None => Doc.nil
-        | Some(modType) => Doc.concat(list{Doc.text(": "), printModType(modType, cmtTbl)})
-        },
-      }),
-    )
-    printComments(doc, cmtTbl, cmtLoc)
-  }
-
-  and printModApplyArg = (modExpr, cmtTbl) =>
-    switch modExpr.pmod_desc {
-    | Pmod_structure(list{}) => Doc.text("()")
-    | _ => printModExpr(modExpr, cmtTbl)
-    }
-
-  and printExceptionDef = (constr: Parsetree.extension_constructor, cmtTbl) => {
-    let kind = switch constr.pext_kind {
-    | Pext_rebind(longident) =>
-      Doc.indent(
-        Doc.concat(list{Doc.text(" ="), Doc.line, printLongidentLocation(longident, cmtTbl)}),
-      )
-    | Pext_decl(Pcstr_tuple(list{}), None) => Doc.nil
-    | Pext_decl(args, gadt) =>
-      let gadtDoc = switch gadt {
-      | Some(typ) => Doc.concat(list{Doc.text(": "), printTypExpr(typ, cmtTbl)})
-      | None => Doc.nil
-      }
-
-      Doc.concat(list{printConstructorArguments(~indent=false, args, cmtTbl), gadtDoc})
-    }
-
-    let name = printComments(Doc.text(constr.pext_name.txt), cmtTbl, constr.pext_name.loc)
-
-    let doc = Doc.group(
-      Doc.concat(list{printAttributes(constr.pext_attributes), Doc.text("exception "), name, kind}),
-    )
-    printComments(doc, cmtTbl, constr.pext_loc)
-  }
-
-  and printExtensionConstructor = (constr: Parsetree.extension_constructor, cmtTbl, i) => {
-    let attrs = printAttributes(constr.pext_attributes)
-    let bar = if i > 0 {
-      Doc.text("| ")
-    } else {
-      Doc.ifBreaks(Doc.text("| "), Doc.nil)
-    }
-
-    let kind = switch constr.pext_kind {
-    | Pext_rebind(longident) =>
-      Doc.indent(
-        Doc.concat(list{Doc.text(" ="), Doc.line, printLongidentLocation(longident, cmtTbl)}),
-      )
-    | Pext_decl(Pcstr_tuple(list{}), None) => Doc.nil
-    | Pext_decl(args, gadt) =>
-      let gadtDoc = switch gadt {
-      | Some(typ) => Doc.concat(list{Doc.text(": "), printTypExpr(typ, cmtTbl)})
-      | None => Doc.nil
-      }
-
-      Doc.concat(list{printConstructorArguments(~indent=false, args, cmtTbl), gadtDoc})
-    }
-
-    let name = printComments(Doc.text(constr.pext_name.txt), cmtTbl, constr.pext_name.loc)
-
-    Doc.concat(list{bar, Doc.group(Doc.concat(list{attrs, name, kind}))})
-  }
-
-  let printImplementation = (~width, s: Parsetree.structure, comments) => {
-    let cmtTbl = CommentTable.make()
-    CommentTable.walkStructure(s, cmtTbl, comments)
-    /* CommentTable.log cmtTbl; */
-    let doc = printStructure(s, cmtTbl)
-    /* Doc.debug doc; */
-    let stringDoc = Doc.toString(~width, doc)
-    print_string(stringDoc)
-  }
-
-  let printInterface = (~width, s: Parsetree.signature, comments) => {
-    let cmtTbl = CommentTable.make()
-    CommentTable.walkSignature(s, cmtTbl, comments)
-    let stringDoc = Doc.toString(~width, printSignature(s, cmtTbl))
-    print_string(stringDoc)
-  }
-}
-
-module Scanner = {
-  type mode = Template | Jsx | Diamond
-
-  type t = {
-    filename: string,
-    src: bytes,
-    mutable err: (
-      ~startPos: Lexing.position,
-      ~endPos: Lexing.position,
-      Diagnostics.category,
-    ) => unit,
-    mutable ch: int /* current character */,
-    mutable offset: int /* character offset */,
-    mutable rdOffset: int /* reading offset (position after current character) */,
-    mutable lineOffset: int /* current line offset */,
-    mutable lnum: int /* current line number */,
-    mutable mode: list<mode>,
-  }
-
-  let setDiamondMode = scanner => scanner.mode = list{Diamond, ...scanner.mode}
-
-  let setTemplateMode = scanner => scanner.mode = list{Template, ...scanner.mode}
-
-  let setJsxMode = scanner => scanner.mode = list{Jsx, ...scanner.mode}
-
-  let popMode = (scanner, mode) =>
-    switch scanner.mode {
-    | list{m, ...ms} when m == mode => scanner.mode = ms
-    | _ => ()
-    }
-
-  let inDiamondMode = scanner =>
-    switch scanner.mode {
-    | list{Diamond, ..._} => true
-    | _ => false
-    }
-
-  let inJsxMode = scanner =>
-    switch scanner.mode {
-    | list{Jsx, ..._} => true
-    | _ => false
-    }
-
-  let inTemplateMode = scanner =>
-    switch scanner.mode {
-    | list{Template, ..._} => true
-    | _ => false
-    }
-
-  let position = scanner => {
-    open Lexing
-    {
-      pos_fname: scanner.filename,
-      /* line number */
-      pos_lnum: scanner.lnum,
-      /* offset of the beginning of the line (number
-       of characters between the beginning of the scanner and the beginning
-       of the line) */
-      pos_bol: scanner.lineOffset,
-      /* [pos_cnum] is the offset of the position (number of
-       characters between the beginning of the scanner and the position). */
-      pos_cnum: scanner.offset,
-    }
-  }
-
-  let next = scanner =>
-    if scanner.rdOffset < Bytes.length(scanner.src) {
-      scanner.offset = scanner.rdOffset
-      let ch = (@doesNotRaise Bytes.get)(scanner.src, scanner.rdOffset)
-      scanner.rdOffset = scanner.rdOffset + 1
-      scanner.ch = int_of_char(ch)
-    } else {
-      scanner.offset = Bytes.length(scanner.src)
-      scanner.ch = -1
-    }
-
-  let peek = scanner =>
-    if scanner.rdOffset < Bytes.length(scanner.src) {
-      int_of_char(Bytes.unsafe_get(scanner.src, scanner.rdOffset))
-    } else {
-      -1
-    }
-
-  let make = (b, filename) => {
-    let scanner = {
-      filename: filename,
-      src: b,
-      err: (~startPos as _, ~endPos as _, _) => (),
-      ch: CharacterCodes.space,
-      offset: 0,
-      rdOffset: 0,
-      lineOffset: 0,
-      lnum: 1,
-      mode: list{},
-    }
-    next(scanner)
-    scanner
-  }
-
-  let skipWhitespace = scanner => {
-    let rec scan = () =>
-      if scanner.ch === CharacterCodes.space || scanner.ch === CharacterCodes.tab {
-        next(scanner)
-        scan()
-      } else if CharacterCodes.isLineBreak(scanner.ch) {
-        scanner.lineOffset = scanner.offset + 1
-        scanner.lnum = scanner.lnum + 1
-        next(scanner)
-        scan()
-      } else {
-        ()
-      }
-
-    scan()
-  }
-
-  let scanIdentifier = scanner => {
-    let startOff = scanner.offset
-    while (
-      CharacterCodes.isLetter(scanner.ch) ||
-      (CharacterCodes.isDigit(scanner.ch) ||
-      (CharacterCodes.underscore === scanner.ch || CharacterCodes.singleQuote === scanner.ch))
-    ) {
-      next(scanner)
-    }
-    let str = Bytes.sub_string(scanner.src, startOff, scanner.offset - startOff)
-    Token.lookupKeyword(str)
-  }
-
-  let scanDigits = (scanner, ~base) =>
-    if base <= 10 {
-      while CharacterCodes.isDigit(scanner.ch) || scanner.ch === CharacterCodes.underscore {
-        next(scanner)
-      }
-    } else {
-      while CharacterCodes.isHex(scanner.ch) || scanner.ch === CharacterCodes.underscore {
-        next(scanner)
-      }
-    }
-
-  /* float: (0…9) { 0…9∣ _ } [. { 0…9∣ _ }] [(e∣ E) [+∣ -] (0…9) { 0…9∣ _ }] */
-  let scanNumber = scanner => {
-    let startOff = scanner.offset
-
-    /* integer part */
-    let (base, _prefix) = if scanner.ch !== CharacterCodes.dot {
-      if scanner.ch === CharacterCodes._0 {
-        next(scanner)
-        let ch = CharacterCodes.lower(scanner.ch)
-        if ch === CharacterCodes.Lower.x {
-          next(scanner)
-          (16, 'x')
-        } else if ch === CharacterCodes.Lower.o {
-          next(scanner)
-          (8, 'o')
-        } else if ch === CharacterCodes.Lower.b {
-          next(scanner)
-          (2, 'b')
-        } else {
-          (8, '0')
-        }
-      } else {
-        (10, ' ')
-      }
-    } else {
-      (10, ' ')
-    }
-
-    scanDigits(scanner, ~base)
-
-    /*  */
-    let isFloat = if CharacterCodes.dot === scanner.ch {
-      next(scanner)
-      scanDigits(scanner, ~base)
-      true
-    } else {
-      false
-    }
-
-    /* exponent part */
-    let isFloat = if {
-      let exp = CharacterCodes.lower(scanner.ch)
-      exp === CharacterCodes.Lower.e || exp === CharacterCodes.Lower.p
-    } {
-      next(scanner)
-      if scanner.ch === CharacterCodes.plus || scanner.ch === CharacterCodes.minus {
-        next(scanner)
-      }
-      scanDigits(scanner, ~base)
-      true
-    } else {
-      isFloat
-    }
-
-    let literal = Bytes.sub_string(scanner.src, startOff, scanner.offset - startOff)
-
-    /* suffix */
-    let suffix = if (
-      (scanner.ch >= CharacterCodes.Lower.g && scanner.ch <= CharacterCodes.Lower.z) ||
-        (scanner.ch >= CharacterCodes.Upper.g && scanner.ch <= CharacterCodes.Upper.z)
-    ) {
-      let ch = scanner.ch
-      next(scanner)
-      Some(Char.unsafe_chr(ch))
-    } else {
-      None
-    }
-
-    if isFloat {
-      Token.Float({f: literal, suffix: suffix})
-    } else {
-      Token.Int({i: literal, suffix: suffix})
-    }
-  }
-
-  let scanExoticIdentifier = scanner => {
-    next(scanner)
-    let buffer = Buffer.create(20)
-    let startPos = position(scanner)
-
-    let rec scan = () =>
-      if scanner.ch === CharacterCodes.eof {
-        let endPos = position(scanner)
-        scanner.err(~startPos, ~endPos, Diagnostics.message("Did you forget a \" here?"))
-      } else if scanner.ch === CharacterCodes.doubleQuote {
-        next(scanner)
-      } else if CharacterCodes.isLineBreak(scanner.ch) {
-        scanner.lineOffset = scanner.offset + 1
-        scanner.lnum = scanner.lnum + 1
-        let endPos = position(scanner)
-        scanner.err(~startPos, ~endPos, Diagnostics.message("Did you forget a \" here?"))
-        next(scanner)
-      } else {
-        Buffer.add_char(buffer, (@doesNotRaise Char.chr)(scanner.ch))
-        next(scanner)
-        scan()
-      }
-
-    scan()
-    Token.Lident(Buffer.contents(buffer))
-  }
-
-  let scanStringEscapeSequence = (~startPos, scanner) =>
-    /* \ already consumed */
-    if (
-      CharacterCodes.Lower.n === scanner.ch ||
-        (CharacterCodes.Lower.t === scanner.ch ||
-        (CharacterCodes.Lower.b === scanner.ch ||
-          (CharacterCodes.Lower.r === scanner.ch ||
-          (CharacterCodes.backslash === scanner.ch ||
-            (CharacterCodes.space === scanner.ch ||
-            (CharacterCodes.singleQuote === scanner.ch ||
-              CharacterCodes.doubleQuote === scanner.ch))))))
-    ) {
-      next(scanner)
-    } else {
-      let (n, base, max) = if CharacterCodes.isDigit(scanner.ch) {
-        /* decimal */
-        (3, 10, 255)
-      } else if scanner.ch === CharacterCodes.Lower.o {
-        /* octal */
-        let () = next(scanner)
-        (3, 8, 255)
-      } else if scanner.ch === CharacterCodes.Lower.x {
-        /* hex */
-        let () = next(scanner)
-        (2, 16, 255)
-      } else {
-        /* unknown escape sequence
-         * TODO: we should warn the user here. Let's not make it a hard error for now, for reason compat */
-        /* let pos = position scanner in */
-        /* let () = */
-        /* let msg = if scanner.ch == -1 then */
-        /* "unclosed escape sequence" */
-        /* else "unknown escape sequence" */
-        /* in */
-        /* scanner.err ~startPos ~endPos:pos (Diagnostics.message msg) */
-        /* in */
-        (-1, -1, -1)
-      }
-
-      if n < 0 {
-        ()
-      } else {
-        let rec while_ = (n, x) =>
-          if n === 0 {
-            x
-          } else {
-            let d = CharacterCodes.digitValue(scanner.ch)
-            if d >= base {
-              let pos = position(scanner)
-              let msg = if scanner.ch === -1 {
-                "unclosed escape sequence"
-              } else {
-                "unknown escape sequence"
-              }
-
-              scanner.err(~startPos, ~endPos=pos, Diagnostics.message(msg))
-              -1
-            } else {
-              let () = next(scanner)
-              while_(n - 1, x * base + d)
-            }
-          }
-
-        let x = while_(n, 0)
-        if x > max {
-          let pos = position(scanner)
-          let msg = "invalid escape sequence (value too high)"
-          scanner.err(~startPos, ~endPos=pos, Diagnostics.message(msg))
-          ()
-        }
-      }
-    }
-
-  let scanString = scanner => {
-    let offs = scanner.offset
-
-    let startPos = position(scanner)
-    let rec scan = () =>
-      if scanner.ch === CharacterCodes.eof {
-        let endPos = position(scanner)
-        scanner.err(~startPos, ~endPos, Diagnostics.unclosedString)
-      } else if scanner.ch === CharacterCodes.doubleQuote {
-        next(scanner)
-      } else if scanner.ch === CharacterCodes.backslash {
-        let startPos = position(scanner)
-        next(scanner)
-        scanStringEscapeSequence(~startPos, scanner)
-        scan()
-      } else if CharacterCodes.isLineBreak(scanner.ch) {
-        scanner.lineOffset = scanner.offset + 1
-        scanner.lnum = scanner.lnum + 1
-        next(scanner)
-        scan()
-      } else {
-        next(scanner)
-        scan()
-      }
-
-    scan()
-    Token.String(Bytes.sub_string(scanner.src, offs, scanner.offset - offs - 1))
-  }
-
-  /* I wonder if this gets inlined */
-  let convertNumber = (scanner, ~n, ~base) => {
-    let x = ref(0)
-    for _ in n downto 1 {
-      let d = CharacterCodes.digitValue(scanner.ch)
-      x := x.contents * base + d
-      next(scanner)
-    }
-    x.contents
-  }
-
-  let scanEscape = scanner => {
-    /* let offset = scanner.offset in */
-    let c = switch scanner.ch {
-    | 98 /* b */ =>
-      next(scanner)
-      '\b'
-    | 110 /* n */ =>
-      next(scanner)
-      '\n'
-    | 114 /* r */ =>
-      next(scanner)
-      '\r'
-    | 116 /* t */ =>
-      next(scanner)
-      '\t'
-    | ch when CharacterCodes.isDigit(ch) =>
-      let x = convertNumber(scanner, ~n=3, ~base=10)
-      (@doesNotRaise Char.chr)(x)
-    | ch when ch === CharacterCodes.Lower.x =>
-      next(scanner)
-      let x = convertNumber(scanner, ~n=2, ~base=16)
-      (@doesNotRaise Char.chr)(x)
-    | ch when ch === CharacterCodes.Lower.o =>
-      next(scanner)
-      let x = convertNumber(scanner, ~n=3, ~base=8)
-      (@doesNotRaise Char.chr)(x)
-    | ch =>
-      next(scanner)
-      (@doesNotRaise Char.chr)(ch)
-    }
-
-    next(scanner) /* Consume \' */
-    Token.Character(c)
-  }
-
-  let scanSingleLineComment = scanner => {
-    let startOff = scanner.offset
-    let startPos = position(scanner)
-    while !CharacterCodes.isLineBreak(scanner.ch) && scanner.ch >= 0 {
-      next(scanner)
-    }
-    let endPos = position(scanner)
-    Token.Comment(
-      Comment.makeSingleLineComment(
-        ~loc={
-          open Location
-          {loc_start: startPos, loc_end: endPos, loc_ghost: false}
-        },
-        Bytes.sub_string(scanner.src, startOff, scanner.offset - startOff),
-      ),
-    )
-  }
-
-  let scanMultiLineComment = scanner => {
-    let startOff = scanner.offset
-    let startPos = position(scanner)
-    let rec scan = (~depth, ()) =>
-      if scanner.ch === CharacterCodes.asterisk && peek(scanner) === CharacterCodes.forwardslash {
-        next(scanner)
-        next(scanner)
-        if depth > 0 {
-          scan(~depth=depth - 1, ())
-        } else {
-          ()
-        }
-      } else if scanner.ch === CharacterCodes.eof {
-        let endPos = position(scanner)
-        scanner.err(~startPos, ~endPos, Diagnostics.unclosedComment)
-      } else if (
-        scanner.ch === CharacterCodes.forwardslash && peek(scanner) === CharacterCodes.asterisk
-      ) {
-        next(scanner)
-        next(scanner)
-        scan(~depth=depth + 1, ())
-      } else {
-        if CharacterCodes.isLineBreak(scanner.ch) {
-          scanner.lineOffset = scanner.offset + 1
-          scanner.lnum = scanner.lnum + 1
-        }
-        next(scanner)
-        scan(~depth, ())
-      }
-
-    scan(~depth=0, ())
-    Token.Comment(
-      Comment.makeMultiLineComment(
-        ~loc={
-          open Location
-          {loc_start: startPos, loc_end: position(scanner), loc_ghost: false}
-        },
-        Bytes.sub_string(scanner.src, startOff, scanner.offset - 2 - startOff),
-      ),
-    )
-  }
-
-  let scanTemplate = scanner => {
-    let startOff = scanner.offset
-    let startPos = position(scanner)
-
-    let rec scan = () =>
-      if scanner.ch === CharacterCodes.eof {
-        let endPos = position(scanner)
-        scanner.err(~startPos, ~endPos, Diagnostics.unclosedTemplate)
-        popMode(scanner, Template)
-        Token.TemplateTail(Bytes.sub_string(scanner.src, startOff, scanner.offset - 2 - startOff))
-      } else if scanner.ch === CharacterCodes.backslash {
-        next(scanner)
-        if (
-          scanner.ch === CharacterCodes.backtick ||
-            (scanner.ch === CharacterCodes.backslash ||
-            scanner.ch === CharacterCodes.dollar)
-        ) {
-          next(scanner)
-        }
-        scan()
-      } else if scanner.ch === CharacterCodes.backtick {
-        next(scanner)
-        let contents = Bytes.sub_string(scanner.src, startOff, scanner.offset - 1 - startOff)
-
-        popMode(scanner, Template)
-        Token.TemplateTail(contents)
-      } else if scanner.ch === CharacterCodes.dollar && peek(scanner) === CharacterCodes.lbrace {
-        next(scanner) /* consume $ */
-        next(scanner) /* consume { */
-        let contents = Bytes.sub_string(scanner.src, startOff, scanner.offset - 2 - startOff)
-
-        popMode(scanner, Template)
-        Token.TemplatePart(contents)
-      } else {
-        if CharacterCodes.isLineBreak(scanner.ch) {
-          scanner.lineOffset = scanner.offset + 1
-          scanner.lnum = scanner.lnum + 1
-        }
-        next(scanner)
-        scan()
-      }
-
-    scan()
-  }
-
-  let rec scan = scanner => {
-    if !inTemplateMode(scanner) {
-      skipWhitespace(scanner)
-    }
-    let startPos = position(scanner)
-    let ch = scanner.ch
-    let token = if inTemplateMode(scanner) {
-      scanTemplate(scanner)
-    } else if ch === CharacterCodes.underscore {
-      let nextCh = peek(scanner)
-      if (
-        nextCh === CharacterCodes.underscore ||
-          (CharacterCodes.isDigit(nextCh) ||
-          CharacterCodes.isLetter(nextCh))
-      ) {
-        scanIdentifier(scanner)
-      } else {
-        next(scanner)
-        Token.Underscore
-      }
-    } else if CharacterCodes.isLetter(ch) {
-      scanIdentifier(scanner)
-    } else if CharacterCodes.isDigit(ch) {
-      scanNumber(scanner)
-    } else {
-      next(scanner)
-      if ch === CharacterCodes.dot {
-        if scanner.ch === CharacterCodes.dot {
-          next(scanner)
-          if scanner.ch === CharacterCodes.dot {
-            next(scanner)
-            Token.DotDotDot
-          } else {
-            Token.DotDot
-          }
-        } else {
-          Token.Dot
-        }
-      } else if ch === CharacterCodes.doubleQuote {
-        scanString(scanner)
-      } else if ch === CharacterCodes.singleQuote {
-        if (
-          scanner.ch === CharacterCodes.backslash && !(peek(scanner) === CharacterCodes.doubleQuote)
-        ) {
-          /* start of exotic ident */
-
-          next(scanner)
-          scanEscape(scanner)
-        } else if peek(scanner) === CharacterCodes.singleQuote {
-          let ch = scanner.ch
-          next(scanner)
-          next(scanner)
-          Token.Character((@doesNotRaise Char.chr)(ch))
-        } else {
-          SingleQuote
-        }
-      } else if ch === CharacterCodes.bang {
-        if scanner.ch === CharacterCodes.equal {
-          next(scanner)
-          if scanner.ch === CharacterCodes.equal {
-            next(scanner)
-            Token.BangEqualEqual
-          } else {
-            Token.BangEqual
-          }
-        } else {
-          Token.Bang
-        }
-      } else if ch === CharacterCodes.semicolon {
-        Token.Semicolon
-      } else if ch === CharacterCodes.equal {
-        if scanner.ch === CharacterCodes.greaterThan {
-          next(scanner)
-          Token.EqualGreater
-        } else if scanner.ch === CharacterCodes.equal {
-          next(scanner)
-          if scanner.ch === CharacterCodes.equal {
-            next(scanner)
-            Token.EqualEqualEqual
-          } else {
-            Token.EqualEqual
-          }
-        } else {
-          Token.Equal
-        }
-      } else if ch === CharacterCodes.bar {
-        if scanner.ch === CharacterCodes.bar {
-          next(scanner)
-          Token.Lor
-        } else if scanner.ch === CharacterCodes.greaterThan {
-          next(scanner)
-          Token.BarGreater
-        } else {
-          Token.Bar
-        }
-      } else if ch === CharacterCodes.ampersand {
-        if scanner.ch === CharacterCodes.ampersand {
-          next(scanner)
-          Token.Land
-        } else {
-          Token.Band
-        }
-      } else if ch === CharacterCodes.lparen {
-        Token.Lparen
-      } else if ch === CharacterCodes.rparen {
-        Token.Rparen
-      } else if ch === CharacterCodes.lbracket {
-        Token.Lbracket
-      } else if ch === CharacterCodes.rbracket {
-        Token.Rbracket
-      } else if ch === CharacterCodes.lbrace {
-        Token.Lbrace
-      } else if ch === CharacterCodes.rbrace {
-        Token.Rbrace
-      } else if ch === CharacterCodes.comma {
-        Token.Comma
-      } else if ch === CharacterCodes.colon {
-        if scanner.ch === CharacterCodes.equal {
-          next(scanner)
-          Token.ColonEqual
-        } else if scanner.ch === CharacterCodes.greaterThan {
-          next(scanner)
-          Token.ColonGreaterThan
-        } else {
-          Token.Colon
-        }
-      } else if ch === CharacterCodes.backslash {
-        scanExoticIdentifier(scanner)
-      } else if ch === CharacterCodes.forwardslash {
-        if scanner.ch === CharacterCodes.forwardslash {
-          next(scanner)
-          scanSingleLineComment(scanner)
-        } else if scanner.ch === CharacterCodes.asterisk {
-          next(scanner)
-          scanMultiLineComment(scanner)
-        } else if scanner.ch === CharacterCodes.dot {
-          next(scanner)
-          Token.ForwardslashDot
-        } else {
-          Token.Forwardslash
-        }
-      } else if ch === CharacterCodes.minus {
-        if scanner.ch === CharacterCodes.dot {
-          next(scanner)
-          Token.MinusDot
-        } else if scanner.ch === CharacterCodes.greaterThan {
-          next(scanner)
-          Token.MinusGreater
-        } else {
-          Token.Minus
-        }
-      } else if ch === CharacterCodes.plus {
-        if scanner.ch === CharacterCodes.dot {
-          next(scanner)
-          Token.PlusDot
-        } else if scanner.ch === CharacterCodes.plus {
-          next(scanner)
-          Token.PlusPlus
-        } else if scanner.ch === CharacterCodes.equal {
-          next(scanner)
-          Token.PlusEqual
-        } else {
-          Token.Plus
-        }
-      } else if ch === CharacterCodes.greaterThan {
-        if scanner.ch === CharacterCodes.equal && !inDiamondMode(scanner) {
-          next(scanner)
-          Token.GreaterEqual
-        } else {
-          Token.GreaterThan
-        }
-      } else if ch === CharacterCodes.lessThan {
-        /* Imagine the following: <div><
-         * < indicates the start of a new jsx-element, the parser expects
-         * the name of a new element after the <
-         * Example: <div> <div
-         * But what if we have a / here: example </ in  <div></div>
-         * This signals a closing element. To simulate the two-token lookahead,
-         * the </ is emitted as a single new token LessThanSlash */
-        if inJsxMode(scanner) {
-          skipWhitespace(scanner)
-          if scanner.ch === CharacterCodes.forwardslash {
-            let () = next(scanner)
-            Token.LessThanSlash
-          } else {
-            Token.LessThan
-          }
-        } else if scanner.ch === CharacterCodes.equal {
-          next(scanner)
-          Token.LessEqual
-        } else {
-          Token.LessThan
-        }
-      } else if ch === CharacterCodes.hash {
-        if scanner.ch === CharacterCodes.hash {
-          next(scanner)
-          Token.HashHash
-        } else if scanner.ch === CharacterCodes.equal {
-          next(scanner)
-          Token.HashEqual
-        } else {
-          Token.Hash
-        }
-      } else if ch === CharacterCodes.asterisk {
-        if scanner.ch === CharacterCodes.asterisk {
-          next(scanner)
-          Token.Exponentiation
-        } else if scanner.ch === CharacterCodes.dot {
-          next(scanner)
-          Token.AsteriskDot
-        } else {
-          Token.Asterisk
-        }
-      } else if ch === CharacterCodes.tilde {
-        Token.Tilde
-      } else if ch === CharacterCodes.question {
-        Token.Question
-      } else if ch === CharacterCodes.at {
-        if scanner.ch === CharacterCodes.at {
-          next(scanner)
-          Token.AtAt
-        } else {
-          Token.At
-        }
-      } else if ch === CharacterCodes.percent {
-        if scanner.ch === CharacterCodes.percent {
-          next(scanner)
-          Token.PercentPercent
-        } else {
-          Token.Percent
-        }
-      } else if ch === CharacterCodes.backtick {
-        Token.Backtick
-      } else if ch === -1 {
-        Token.Eof
-      } else {
-        /* if we arrive here, we're dealing with an unkown character,
-         * report the error and continue scanning… */
-        let endPos = position(scanner)
-        scanner.err(~startPos, ~endPos, Diagnostics.unknownUchar(ch))
-        let (_, _, token) = scan(scanner)
-        token
-      }
-    }
-    let endPos = position(scanner)
-    (startPos, endPos, token)
-  }
-
-  /* Imagine: <div> <Navbar /> <
-   * is `<` the start of a jsx-child? <div …
-   * or is it the start of a closing tag?  </div>
-   * reconsiderLessThan peeks at the next token and
-   * determines the correct token to disambiguate */
-  let reconsiderLessThan = scanner => {
-    /* < consumed */
-    skipWhitespace(scanner)
-    if scanner.ch === CharacterCodes.forwardslash {
-      let () = next(scanner)
-      Token.LessThanSlash
-    } else {
-      Token.LessThan
-    }
-  }
-
-  /* If an operator has whitespace around both sides, it's a binary operator */
-  let isBinaryOp = (src, startCnum, endCnum) =>
-    if startCnum === 0 {
-      false
-    } else {
-      let leftOk = {
-        let c = startCnum - 1 |> (@doesNotRaise Bytes.get)(src) |> Char.code
-
-        c === CharacterCodes.space || (c === CharacterCodes.tab || CharacterCodes.isLineBreak(c))
-      }
-
-      let rightOk = {
-        let c = if endCnum === Bytes.length(src) {
-          -1
-        } else {
-          endCnum |> (@doesNotRaise Bytes.get)(src) |> Char.code
-        }
-
-        c === CharacterCodes.space ||
-          (c === CharacterCodes.tab ||
-          (CharacterCodes.isLineBreak(c) || c === CharacterCodes.eof))
-      }
-
-      leftOk && rightOk
-    }
-}
-
-/* AST for js externals */
-module JsFfi = {
-  type scope =
-    | Global
-    | Module(string) /* bs.module("path") */
-    | Scope(Longident.t) /* bs.scope(/"window", "location"/) */
-
-  type label_declaration = {
-    @live jld_attributes: Parsetree.attributes,
-    jld_name: string,
-    jld_alias: string,
-    jld_type: Parsetree.core_type,
-    jld_loc: Location.t,
-  }
-
-  type importSpec =
-    | Default(label_declaration)
-    | Spec(list<label_declaration>)
-
-  type import_description = {
-    jid_loc: Location.t,
-    jid_spec: importSpec,
-    jid_scope: scope,
-    jid_attributes: Parsetree.attributes,
-  }
-
-  let decl = (~attrs, ~loc, ~name, ~alias, ~typ) => {
-    jld_loc: loc,
-    jld_attributes: attrs,
-    jld_name: name,
-    jld_alias: alias,
-    jld_type: typ,
-  }
-
-  let importDescr = (~attrs, ~scope, ~importSpec, ~loc) => {
-    jid_loc: loc,
-    jid_spec: importSpec,
-    jid_scope: scope,
-    jid_attributes: attrs,
-  }
-
-  let toParsetree = importDescr => {
-    let bsVal = (Location.mknoloc("bs.val"), Parsetree.PStr(list{}))
-    let attrs = switch importDescr.jid_scope {
-    | Global => list{bsVal}
-    /* @genType.import("./MyMath"),
-     * @genType.import(/"./MyMath", "default"/) */
-    | Module(s) =>
-      let structure = list{
-        Parsetree.Pconst_string(s, None) |> Ast_helper.Exp.constant |> Ast_helper.Str.eval,
-      }
-      let genType = (Location.mknoloc("genType.import"), Parsetree.PStr(structure))
-      list{genType}
-    | Scope(longident) =>
-      let structureItem = {
-        let expr = switch Longident.flatten(longident) |> List.map(s =>
-          Ast_helper.Exp.constant(Parsetree.Pconst_string(s, None))
-        ) {
-        | list{expr} => expr
-        | list{} as exprs | _ as exprs => exprs |> Ast_helper.Exp.tuple
-        }
-
-        Ast_helper.Str.eval(expr)
-      }
-
-      let bsScope = (Location.mknoloc("bs.scope"), Parsetree.PStr(list{structureItem}))
-      list{bsVal, bsScope}
-    }
-
-    let valueDescrs = switch importDescr.jid_spec {
-    | Default(decl) =>
-      let prim = list{decl.jld_name}
-      let allAttrs = List.concat(list{attrs, importDescr.jid_attributes}) |> List.map(attr =>
-        switch attr {
-        | (
-            {Location.txt: "genType.import"} as id,
-            Parsetree.PStr(list{{pstr_desc: Parsetree.Pstr_eval(moduleName, _)}}),
-          ) =>
-          let default = Parsetree.Pconst_string("default", None) |> Ast_helper.Exp.constant
-
-          let structureItem =
-            list{moduleName, default} |> Ast_helper.Exp.tuple |> Ast_helper.Str.eval
-
-          (id, Parsetree.PStr(list{structureItem}))
-        | attr => attr
-        }
-      )
-
-      list{
-        Ast_helper.Val.mk(
-          ~loc=importDescr.jid_loc,
-          ~prim,
-          ~attrs=allAttrs,
-          Location.mknoloc(decl.jld_alias),
-          decl.jld_type,
-        ) |> Ast_helper.Str.primitive,
-      }
-    | Spec(decls) => List.map(decl => {
-        let prim = list{decl.jld_name}
-        let allAttrs = List.concat(list{attrs, decl.jld_attributes})
-        Ast_helper.Val.mk(
-          ~loc=importDescr.jid_loc,
-          ~prim,
-          ~attrs=allAttrs,
-          Location.mknoloc(decl.jld_alias),
-          decl.jld_type,
-        ) |> Ast_helper.Str.primitive(~loc=decl.jld_loc)
-      }, decls)
-    }
-
-    let jsFfiAttr = (Location.mknoloc("ns.jsFfi"), Parsetree.PStr(list{}))
-    Ast_helper.Mod.structure(~loc=importDescr.jid_loc, valueDescrs)
-    |> Ast_helper.Incl.mk(~attrs=list{jsFfiAttr}, ~loc=importDescr.jid_loc)
-    |> Ast_helper.Str.include_(~loc=importDescr.jid_loc)
-  }
-}
-
-module ParsetreeCompatibility = {
-  let concatLongidents = (l1, l2) => {
-    let parts1 = Longident.flatten(l1)
-    let parts2 = Longident.flatten(l2)
-    switch List.concat(list{parts1, parts2}) |> Longident.unflatten {
-    | Some(longident) => longident
-    | None => l2
-    }
-  }
-
-  /* TODO: support nested open's ? */
-  let rec rewritePpatOpen = (longidentOpen, pat) => {
-    open Parsetree
-    switch pat.ppat_desc {
-    | Ppat_array(list{first, ...rest}) => /* Color.[Red, Blue, Green] -> [Color.Red, Blue, Green] */
-      {...pat, ppat_desc: Ppat_array(list{rewritePpatOpen(longidentOpen, first), ...rest})}
-    | Ppat_tuple(list{first, ...rest}) => /* Color.(Red, Blue, Green) -> (Color.Red, Blue, Green) */
-      {...pat, ppat_desc: Ppat_tuple(list{rewritePpatOpen(longidentOpen, first), ...rest})}
-    | Ppat_construct(
-        {txt: Longident.Lident("::")} as listConstructor,
-        Some({ppat_desc: Ppat_tuple(list{pat, ...rest})} as element),
-      ) => /* Color.(list{Red, Blue, Green}) -> list{Color.Red, Blue, Green} */
-      {
-        ...pat,
-        ppat_desc: Ppat_construct(
-          listConstructor,
-          Some({
-            ...element,
-            ppat_desc: Ppat_tuple(list{rewritePpatOpen(longidentOpen, pat), ...rest}),
-          }),
-        ),
-      }
-    | Ppat_construct(
-        {txt: constructor} as longidentLoc,
-        optPattern,
-      ) => /* Foo.(Bar(a)) -> Foo.Bar(a) */
-      {
-        ...pat,
-        ppat_desc: Ppat_construct(
-          {...longidentLoc, txt: concatLongidents(longidentOpen, constructor)},
-          optPattern,
-        ),
-      }
-    | Ppat_record(list{({txt: lbl} as longidentLoc, firstPat), ...rest}, flag) =>
-      /* Foo.{x} -> {Foo.x: x} */
-      let firstRow = ({...longidentLoc, txt: concatLongidents(longidentOpen, lbl)}, firstPat)
-      {...pat, ppat_desc: Ppat_record(list{firstRow, ...rest}, flag)}
-    | Ppat_or(pat1, pat2) => {
-        ...pat,
-        ppat_desc: Ppat_or(
-          rewritePpatOpen(longidentOpen, pat1),
-          rewritePpatOpen(longidentOpen, pat2),
-        ),
-      }
-    | Ppat_constraint(pattern, typ) => {
-        ...pat,
-        ppat_desc: Ppat_constraint(rewritePpatOpen(longidentOpen, pattern), typ),
-      }
-    | Ppat_type({txt: constructor} as longidentLoc) => {
-        ...pat,
-        ppat_desc: Ppat_type({
-          ...longidentLoc,
-          txt: concatLongidents(longidentOpen, constructor),
-        }),
-      }
-    | Ppat_lazy(p) => {...pat, ppat_desc: Ppat_lazy(rewritePpatOpen(longidentOpen, p))}
-    | Ppat_exception(p) => {...pat, ppat_desc: Ppat_exception(rewritePpatOpen(longidentOpen, p))}
-    | _ => pat
-    }
-  }
-
-  let rec rewriteReasonFastPipe = expr => {
-    open Parsetree
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {
-          pexp_desc:
-            Pexp_apply(
-              {pexp_desc: Pexp_ident({txt: Longident.Lident("|.")})} as op,
-              list{(Asttypes.Nolabel, lhs), (Nolabel, rhs)},
-            ),
-          pexp_attributes: subAttrs,
-        },
-        args,
-      ) =>
-      let rhsLoc = {...rhs.pexp_loc, loc_end: expr.pexp_loc.loc_end}
-      let newLhs = {
-        let expr = rewriteReasonFastPipe(lhs)
-        {...expr, pexp_attributes: subAttrs}
-      }
-
-      let allArgs = list{
-        (Asttypes.Nolabel, newLhs),
-        (Asttypes.Nolabel, Ast_helper.Exp.apply(~loc=rhsLoc, rhs, args)),
-      }
-
-      Ast_helper.Exp.apply(~attrs=expr.pexp_attributes, ~loc=expr.pexp_loc, op, allArgs)
-    | _ => expr
-    }
-  }
-
-  let makeReasonArityMapper = (~forPrinter) => {
-    open Ast_mapper
-    {
-      ...default_mapper,
-      expr: (mapper, expr) =>
-        switch expr {
-        /* Don't mind this case, Reason doesn't handle this. */
-        /* | {pexp_desc = Pexp_variant (lbl, args); pexp_loc; pexp_attributes} -> */
-        /* let newArgs = match args with */
-        /* | (Some {pexp_desc = Pexp_tuple [{pexp_desc = Pexp_tuple _ } as sp]}) as args-> */
-        /* if forPrinter then args else Some sp */
-        /* | Some {pexp_desc = Pexp_tuple [sp]} -> Some sp */
-        /* | _ -> args */
-        /* in */
-        /* default_mapper.expr mapper {pexp_desc=Pexp_variant(lbl, newArgs); pexp_loc; pexp_attributes} */
-        | {pexp_desc: Pexp_construct(lid, args), pexp_loc, pexp_attributes} =>
-          let newArgs = switch args {
-          | Some({pexp_desc: Pexp_tuple(list{{pexp_desc: Pexp_tuple(_)} as sp})}) as args =>
-            if forPrinter {
-              args
-            } else {
-              Some(sp)
-            }
-          | Some({pexp_desc: Pexp_tuple(list{sp})}) => Some(sp)
-          | _ => args
-          }
-
-          default_mapper.expr(
-            mapper,
-            {
-              pexp_desc: Pexp_construct(lid, newArgs),
-              pexp_loc: pexp_loc,
-              pexp_attributes: pexp_attributes,
-            },
-          )
-        | expr => default_mapper.expr(mapper, rewriteReasonFastPipe(expr))
-        },
-      pat: (mapper, pattern) =>
-        switch pattern {
-        /* Don't mind this case, Reason doesn't handle this. */
-        /* | {ppat_desc = Ppat_variant (lbl, args); ppat_loc; ppat_attributes} -> */
-        /* let newArgs = match args with */
-        /* | (Some {ppat_desc = Ppat_tuple [{ppat_desc = Ppat_tuple _} as sp]}) as args -> */
-        /* if forPrinter then args else Some sp */
-        /* | Some {ppat_desc = Ppat_tuple [sp]} -> Some sp */
-        /* | _ -> args */
-        /* in */
-        /* default_mapper.pat mapper {ppat_desc = Ppat_variant (lbl, newArgs); ppat_loc; ppat_attributes;} */
-        | {ppat_desc: Ppat_construct(lid, args), ppat_loc, ppat_attributes} =>
-          let new_args = switch args {
-          | Some({ppat_desc: Ppat_tuple(list{{ppat_desc: Ppat_tuple(_)} as sp})}) as args =>
-            if forPrinter {
-              args
-            } else {
-              Some(sp)
-            }
-          | Some({ppat_desc: Ppat_tuple(list{sp})}) => Some(sp)
-          | _ => args
-          }
-          default_mapper.pat(
-            mapper,
-            {
-              ppat_desc: Ppat_construct(lid, new_args),
-              ppat_loc: ppat_loc,
-              ppat_attributes: ppat_attributes,
-            },
-          )
-        | x => default_mapper.pat(mapper, x)
-        },
-    }
-  }
-
-  let escapeTemplateLiteral = s => {
-    let len = String.length(s)
-    let b = Buffer.create(len)
-    let i = ref(0)
-    while i.contents < len {
-      let c = (@doesNotRaise String.get)(s, i.contents)
-      if c == '`' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, '`')
-        incr(i)
-      } else if c == '$' {
-        if i.contents + 1 < len {
-          let c2 = (@doesNotRaise String.get)(s, i.contents + 1)
-          if c2 == '{' {
-            Buffer.add_char(b, '\\')
-            Buffer.add_char(b, '$')
-            Buffer.add_char(b, '{')
-          } else {
-            Buffer.add_char(b, c)
-            Buffer.add_char(b, c2)
-          }
-          i := i.contents + 2
-        } else {
-          Buffer.add_char(b, c)
-          incr(i)
-        }
-      } else if c == '\\' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, '\\')
-        incr(i)
-      } else {
-        Buffer.add_char(b, c)
-        incr(i)
-      }
-    }
-    Buffer.contents(b)
-  }
-
-  let escapeStringContents = s => {
-    let len = String.length(s)
-    let b = Buffer.create(len)
-
-    let i = ref(0)
-
-    while i.contents < len {
-      let c = String.unsafe_get(s, i.contents)
-      if c == '\\' {
-        incr(i)
-        Buffer.add_char(b, c)
-        let c = String.unsafe_get(s, i.contents)
-        if i.contents < len {
-          let () = Buffer.add_char(b, c)
-          incr(i)
-        } else {
-          ()
-        }
-      } else if c == '"' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, c)
-        incr(i)
-      } else {
-        Buffer.add_char(b, c)
-        incr(i)
-      }
-    }
-    Buffer.contents(b)
-  }
-
-  let looksLikeRecursiveTypeDeclaration = typeDeclaration => {
-    open Parsetree
-    let name = typeDeclaration.ptype_name.txt
-    let rec checkKind = kind =>
-      switch kind {
-      | Ptype_abstract | Ptype_open => false
-      | Ptype_variant(constructorDeclarations) =>
-        List.exists(checkConstructorDeclaration, constructorDeclarations)
-      | Ptype_record(labelDeclarations) => List.exists(checkLabelDeclaration, labelDeclarations)
-      }
-
-    and checkConstructorDeclaration = constrDecl =>
-      checkConstructorArguments(constrDecl.pcd_args) ||
-      switch constrDecl.pcd_res {
-      | Some(typexpr) => checkTypExpr(typexpr)
-      | None => false
-      }
-
-    and checkLabelDeclaration = labelDeclaration => checkTypExpr(labelDeclaration.pld_type)
-
-    and checkConstructorArguments = constrArg =>
-      switch constrArg {
-      | Pcstr_tuple(types) => List.exists(checkTypExpr, types)
-      | Pcstr_record(labelDeclarations) => List.exists(checkLabelDeclaration, labelDeclarations)
-      }
-
-    and checkTypExpr = typ =>
-      switch typ.ptyp_desc {
-      | Ptyp_any => false
-      | Ptyp_var(_) => false
-      | Ptyp_object(_) => false
-      | Ptyp_class(_) => false
-      | Ptyp_package(_) => false
-      | Ptyp_extension(_) => false
-      | Ptyp_arrow(_lbl, typ1, typ2) => checkTypExpr(typ1) || checkTypExpr(typ2)
-      | Ptyp_tuple(types) => List.exists(checkTypExpr, types)
-      | Ptyp_constr({txt: longident}, types) =>
-        switch longident {
-        | Lident(ident) => ident == name
-        | _ => false
-        } ||
-        List.exists(checkTypExpr, types)
-      | Ptyp_alias(typ, _) => checkTypExpr(typ)
-      | Ptyp_variant(rowFields, _, _) => List.exists(checkRowFields, rowFields)
-      | Ptyp_poly(_, typ) => checkTypExpr(typ)
-      }
-
-    and checkRowFields = rowField =>
-      switch rowField {
-      | Rtag(_, _, _, types) => List.exists(checkTypExpr, types)
-      | Rinherit(typexpr) => checkTypExpr(typexpr)
-      }
-
-    checkKind(typeDeclaration.ptype_kind)
-  }
-
-  let filterReasonRawLiteral = attrs => List.filter(attr =>
-      switch attr {
-      | ({Location.txt: "reason.raw_literal"}, _) => false
-      | _ => true
-      }
-    , attrs)
-
-  let stringLiteralMapper = stringData => {
-    let isSameLocation = (l1, l2) => {
-      open Location
-      l1.loc_start.pos_cnum === l2.loc_start.pos_cnum
-    }
-
-    let remainingStringData = stringData
-    open Ast_mapper
-    {
-      ...default_mapper,
-      expr: (mapper, expr) =>
-        switch expr.pexp_desc {
-        | Pexp_constant(Pconst_string(_txt, None)) =>
-          switch List.find_opt(
-            ((_stringData, stringLoc)) => isSameLocation(stringLoc, expr.pexp_loc),
-            remainingStringData,
-          ) {
-          | Some(stringData, _) =>
-            let stringData = {
-              let attr = List.find_opt(attr =>
-                switch attr {
-                | ({Location.txt: "reason.raw_literal"}, _) => true
-                | _ => false
-                }
-              , expr.pexp_attributes)
-              switch attr {
-              | Some(
-                  _,
-                  PStr(list{{
-                    pstr_desc: Pstr_eval({pexp_desc: Pexp_constant(Pconst_string(raw, _))}, _),
-                  }}),
-                ) => raw
-              | _ => (@doesNotRaise String.sub)(stringData, 1, String.length(stringData) - 2)
-              }
-            }
-
-            {
-              ...expr,
-              pexp_attributes: filterReasonRawLiteral(expr.pexp_attributes),
-              pexp_desc: Pexp_constant(Pconst_string(stringData, None)),
-            }
-          | None => default_mapper.expr(mapper, expr)
-          }
-        | _ => default_mapper.expr(mapper, expr)
-        },
-    }
-  }
-
-  let normalize = {
-    open Ast_mapper
-    {
-      ...default_mapper,
-      attributes: (mapper, attrs) => attrs |> List.filter(attr =>
-          switch attr {
-          | (
-              {Location.txt: "reason.preserve_braces" | "explicit_arity" | "implicity_arity"},
-              _,
-            ) => false
-          | _ => true
-          }
-        ) |> default_mapper.attributes(mapper),
-      pat: (mapper, p) =>
-        switch p.ppat_desc {
-        | Ppat_open({txt: longidentOpen}, pattern) =>
-          let p = rewritePpatOpen(longidentOpen, pattern)
-          default_mapper.pat(mapper, p)
-        | _ => default_mapper.pat(mapper, p)
-        },
-      expr: (mapper, expr) =>
-        switch expr.pexp_desc {
-        | Pexp_constant(Pconst_string(txt, None)) =>
-          let raw = escapeStringContents(txt)
-          let s = Parsetree.Pconst_string(raw, None)
-          let expr = Ast_helper.Exp.constant(~attrs=expr.pexp_attributes, ~loc=expr.pexp_loc, s)
-
-          expr
-        | Pexp_constant(Pconst_string(txt, tag)) =>
-          let s = Parsetree.Pconst_string(escapeTemplateLiteral(txt), tag)
-          Ast_helper.Exp.constant(
-            ~attrs=mapper.attributes(mapper, expr.pexp_attributes),
-            ~loc=expr.pexp_loc,
-            s,
-          )
-        | Pexp_function(cases) =>
-          let loc = switch (cases, List.rev(cases)) {
-          | (list{first, ..._}, list{last, ..._}) => {
-              ...first.pc_lhs.ppat_loc,
-              loc_end: last.pc_rhs.pexp_loc.loc_end,
-            }
-          | _ => Location.none
-          }
-
-          Ast_helper.Exp.fun_(
-            ~loc,
-            Asttypes.Nolabel,
-            None,
-            Ast_helper.Pat.var(Location.mknoloc("x")),
-            Ast_helper.Exp.match_(
-              ~loc,
-              Ast_helper.Exp.ident(Location.mknoloc(Longident.Lident("x"))),
-              default_mapper.cases(mapper, cases),
-            ),
-          )
-        | Pexp_apply(
-            {pexp_desc: Pexp_ident({txt: Longident.Lident("!")})},
-            list{(Asttypes.Nolabel, operand)},
-          ) =>
-          /* turn `!foo` into `foo.contents` */
-          Ast_helper.Exp.field(
-            ~loc=expr.pexp_loc,
-            ~attrs=expr.pexp_attributes,
-            operand,
-            Location.mknoloc(Longident.Lident("contents")),
-          )
-        | Pexp_apply(
-            {pexp_desc: Pexp_ident({txt: Longident.Lident("##")})} as op,
-            list{
-              (Asttypes.Nolabel, lhs),
-              (Nolabel, {pexp_desc: Pexp_constant(Pconst_string(txt, None))} as stringExpr),
-            },
-          ) =>
-          let ident = Ast_helper.Exp.ident(
-            ~loc=stringExpr.pexp_loc,
-            Location.mkloc(Longident.Lident(txt), stringExpr.pexp_loc),
-          )
-
-          Ast_helper.Exp.apply(
-            ~loc=expr.pexp_loc,
-            ~attrs=expr.pexp_attributes,
-            op,
-            list{(Asttypes.Nolabel, lhs), (Nolabel, ident)},
-          )
-        | Pexp_apply(
-            {pexp_desc: Pexp_ident({txt: Longident.Lident("@@")})},
-            list{(Asttypes.Nolabel, callExpr), (Nolabel, argExpr)},
-          ) =>
-          Ast_helper.Exp.apply(
-            mapper.expr(mapper, callExpr),
-            list{(Asttypes.Nolabel, mapper.expr(mapper, argExpr))},
-          )
-        | Pexp_apply(
-            {pexp_desc: Pexp_ident({txt: Longident.Lident("@")})},
-            list{(Nolabel, arg1), (Nolabel, arg2)},
-          ) =>
-          let listConcat = Longident.Ldot(Longident.Lident("List"), "append")
-          Ast_helper.Exp.apply(
-            Ast_helper.Exp.ident(Location.mknoloc(listConcat)),
-            list{(Nolabel, mapper.expr(mapper, arg1)), (Nolabel, mapper.expr(mapper, arg2))},
-          )
-        | Pexp_match(
-            condition,
-            list{
-              {
-                pc_lhs: {ppat_desc: Ppat_construct({txt: Longident.Lident("true")}, None)},
-                pc_rhs: thenExpr,
-              },
-              {
-                pc_lhs: {ppat_desc: Ppat_construct({txt: Longident.Lident("false")}, None)},
-                pc_rhs: elseExpr,
-              },
-            },
-          ) =>
-          let ternaryMarker = (Location.mknoloc("res.ternary"), Parsetree.PStr(list{}))
-          Ast_helper.Exp.ifthenelse(
-            ~loc=expr.pexp_loc,
-            ~attrs=list{ternaryMarker, ...expr.pexp_attributes},
-            default_mapper.expr(mapper, condition),
-            default_mapper.expr(mapper, thenExpr),
-            Some(default_mapper.expr(mapper, elseExpr)),
-          )
-        | _ => default_mapper.expr(mapper, expr)
-        },
-      structure_item: (mapper, structureItem) =>
-        switch structureItem.pstr_desc {
-        /* heuristic: if we have multiple type declarations, mark them recursive */
-        | Pstr_type(recFlag, typeDeclarations) =>
-          let flag = switch typeDeclarations {
-          | list{td} =>
-            if looksLikeRecursiveTypeDeclaration(td) {
-              Asttypes.Recursive
-            } else {
-              Asttypes.Nonrecursive
-            }
-          | _ => recFlag
-          }
-
-          {
-            ...structureItem,
-            pstr_desc: Pstr_type(
-              flag,
-              List.map(
-                typeDeclaration => default_mapper.type_declaration(mapper, typeDeclaration),
-                typeDeclarations,
-              ),
-            ),
-          }
-        | _ => default_mapper.structure_item(mapper, structureItem)
-        },
-      signature_item: (mapper, signatureItem) =>
-        switch signatureItem.psig_desc {
-        /* heuristic: if we have multiple type declarations, mark them recursive */
-        | Psig_type(recFlag, typeDeclarations) =>
-          let flag = switch typeDeclarations {
-          | list{td} =>
-            if looksLikeRecursiveTypeDeclaration(td) {
-              Asttypes.Recursive
-            } else {
-              Asttypes.Nonrecursive
-            }
-          | _ => recFlag
-          }
-
-          {
-            ...signatureItem,
-            psig_desc: Psig_type(
-              flag,
-              List.map(
-                typeDeclaration => default_mapper.type_declaration(mapper, typeDeclaration),
-                typeDeclarations,
-              ),
-            ),
-          }
-        | _ => default_mapper.signature_item(mapper, signatureItem)
-        },
-      value_binding: (mapper, vb) =>
-        switch vb {
-        | {
-            pvb_pat: {ppat_desc: Ppat_var(_)} as pat,
-            pvb_expr: {pexp_loc: expr_loc, pexp_desc: Pexp_constraint(expr, typ)},
-          } when expr_loc.loc_ghost =>
-          /* let t: t = (expr : t) -> let t: t = expr */
-          let typ = default_mapper.typ(mapper, typ)
-          let pat = default_mapper.pat(mapper, pat)
-          let expr = mapper.expr(mapper, expr)
-          let newPattern = Ast_helper.Pat.constraint_(
-            ~loc={...pat.ppat_loc, loc_end: typ.ptyp_loc.loc_end},
-            pat,
-            typ,
-          )
-          {
-            ...vb,
-            pvb_pat: newPattern,
-            pvb_expr: expr,
-            pvb_attributes: default_mapper.attributes(mapper, vb.pvb_attributes),
-          }
-        | {
-            pvb_pat: {ppat_desc: Ppat_constraint(pat, {ptyp_desc: Ptyp_poly(list{}, _)})},
-            pvb_expr: {pexp_loc: expr_loc, pexp_desc: Pexp_constraint(expr, typ)},
-          } when expr_loc.loc_ghost =>
-          /* let t: . t = (expr : t) -> let t: t = expr */
-          let typ = default_mapper.typ(mapper, typ)
-          let pat = default_mapper.pat(mapper, pat)
-          let expr = mapper.expr(mapper, expr)
-          let newPattern = Ast_helper.Pat.constraint_(
-            ~loc={...pat.ppat_loc, loc_end: typ.ptyp_loc.loc_end},
-            pat,
-            typ,
-          )
-          {
-            ...vb,
-            pvb_pat: newPattern,
-            pvb_expr: expr,
-            pvb_attributes: default_mapper.attributes(mapper, vb.pvb_attributes),
-          }
-        | _ => default_mapper.value_binding(mapper, vb)
-        },
-    }
-  }
-
-  let normalizeReasonArityStructure = (~forPrinter, s) => {
-    let mapper = makeReasonArityMapper(~forPrinter)
-    mapper.Ast_mapper.structure(mapper, s)
-  }
-
-  let normalizeReasonAritySignature = (~forPrinter, s) => {
-    let mapper = makeReasonArityMapper(~forPrinter)
-    mapper.Ast_mapper.signature(mapper, s)
-  }
-
-  let structure = s => normalize.Ast_mapper.structure(normalize, s)
-  let signature = s => normalize.Ast_mapper.signature(normalize, s)
-
-  let replaceStringLiteralStructure = (stringData, structure) => {
-    let mapper = stringLiteralMapper(stringData)
-    mapper.Ast_mapper.structure(mapper, structure)
-  }
-
-  let replaceStringLiteralSignature = (stringData, signature) => {
-    let mapper = stringLiteralMapper(stringData)
-    mapper.Ast_mapper.signature(mapper, signature)
-  }
-}
-
-module OcamlParser = Parser
-
-module Parser = {
-  type mode = ParseForTypeChecker | Default
-
-  type regionStatus = Report | Silent
-
-  type t = {
-    mode: mode,
-    mutable scanner: Scanner.t,
-    mutable token: Token.t,
-    mutable startPos: Lexing.position,
-    mutable endPos: Lexing.position,
-    mutable prevEndPos: Lexing.position,
-    mutable breadcrumbs: list<(Grammar.t, Lexing.position)>,
-    mutable errors: list<Reporting.parseError>,
-    mutable diagnostics: list<Diagnostics.t>,
-    mutable comments: list<Comment.t>,
-    mutable regions: list<ref<regionStatus>>,
-  }
-
-  let err = (~startPos=?, ~endPos=?, p, error) => {
-    let d = Diagnostics.make(
-      ~filename=p.scanner.filename,
-      ~startPos=switch startPos {
-      | Some(pos) => pos
-      | None => p.startPos
-      },
-      ~endPos=switch endPos {
-      | Some(pos) => pos
-      | None => p.endPos
-      },
-      error,
-    )
-
-    try if List.hd(p.regions).contents == Report {
-      p.diagnostics = list{d, ...p.diagnostics}
-      List.hd(p.regions) := Silent
-    } catch {
-    | Failure(_) => ()
-    }
-  }
-
-  let beginRegion = p => p.regions = list{ref(Report), ...p.regions}
-  let endRegion = p =>
-    try p.regions = List.tl(p.regions) catch {
-    | Failure(_) => ()
-    }
-
-  /* Advance to the next non-comment token and store any encountered comment
-   * in the parser's state. Every comment contains the end position of it's
-   * previous token to facilite comment interleaving */
-  let rec next = (~prevEndPos=?, p) => {
-    let prevEndPos = switch prevEndPos {
-    | Some(pos) => pos
-    | None => p.endPos
-    }
-    let (startPos, endPos, token) = Scanner.scan(p.scanner)
-    switch token {
-    | Comment(c) =>
-      Comment.setPrevTokEndPos(c, p.endPos)
-      p.comments = list{c, ...p.comments}
-      p.prevEndPos = p.endPos
-      p.endPos = endPos
-      next(~prevEndPos, p)
-    | _ =>
-      p.token = token
-
-      /* p.prevEndPos <- prevEndPos; */
-      p.prevEndPos = prevEndPos
-      p.startPos = startPos
-      p.endPos = endPos
-    }
-  }
-
-  let checkProgress = (~prevEndPos, ~result, p) =>
-    if p.endPos === prevEndPos {
-      None
-    } else {
-      Some(result)
-    }
-
-  let make = (~mode=ParseForTypeChecker, src, filename) => {
-    let scanner = Scanner.make(Bytes.of_string(src), filename)
-    let parserState = {
-      mode: mode,
-      scanner: scanner,
-      token: Token.Eof,
-      startPos: Lexing.dummy_pos,
-      prevEndPos: Lexing.dummy_pos,
-      endPos: Lexing.dummy_pos,
-      breadcrumbs: list{},
-      errors: list{},
-      diagnostics: list{},
-      comments: list{},
-      regions: list{ref(Report)},
-    }
-    parserState.scanner.err = (~startPos, ~endPos, error) => {
-      let diagnostic = Diagnostics.make(~filename, ~startPos, ~endPos, error)
-
-      parserState.diagnostics = list{diagnostic, ...parserState.diagnostics}
-    }
-    next(parserState)
-    parserState
-  }
-
-  let leaveBreadcrumb = (p, circumstance) => {
-    let crumb = (circumstance, p.startPos)
-    p.breadcrumbs = list{crumb, ...p.breadcrumbs}
-  }
-
-  let eatBreadcrumb = p =>
-    switch p.breadcrumbs {
-    | list{} => ()
-    | list{_, ...crumbs} => p.breadcrumbs = crumbs
-    }
-
-  let optional = (p, token) =>
-    if p.token == token {
-      let () = next(p)
-      true
-    } else {
-      false
-    }
-
-  let expect = (~grammar=?, token, p) =>
-    if p.token == token {
-      next(p)
-    } else {
-      let error = Diagnostics.expected(~grammar?, p.prevEndPos, token)
-      err(~startPos=p.prevEndPos, p, error)
-    }
-
-  /* Don't use immutable copies here, it trashes certain heuristics
-   * in the ocaml compiler, resulting in massive slowdowns of the parser */
-  let lookahead = (p, callback) => {
-    let err = p.scanner.err
-    let ch = p.scanner.ch
-    let offset = p.scanner.offset
-    let rdOffset = p.scanner.rdOffset
-    let lineOffset = p.scanner.lineOffset
-    let lnum = p.scanner.lnum
-    let mode = p.scanner.mode
-    let token = p.token
-    let startPos = p.startPos
-    let endPos = p.endPos
-    let prevEndPos = p.prevEndPos
-    let breadcrumbs = p.breadcrumbs
-    let errors = p.errors
-    let diagnostics = p.diagnostics
-    let comments = p.comments
-
-    let res = callback(p)
-
-    p.scanner.err = err
-    p.scanner.ch = ch
-    p.scanner.offset = offset
-    p.scanner.rdOffset = rdOffset
-    p.scanner.lineOffset = lineOffset
-    p.scanner.lnum = lnum
-    p.scanner.mode = mode
-    p.token = token
-    p.startPos = startPos
-    p.endPos = endPos
-    p.prevEndPos = prevEndPos
-    p.breadcrumbs = breadcrumbs
-    p.errors = errors
-    p.diagnostics = diagnostics
-    p.comments = comments
-
-    res
-  }
-}
-
-module NapkinScript = {
-  let mkLoc = (startLoc, endLoc) => {
-    open Location
-    {
-      loc_start: startLoc,
-      loc_end: endLoc,
-      loc_ghost: false,
-    }
-  }
-
-  module Recover = {
-    type action = option<unit> /* None is abort, Some () is retry */
-
-    let defaultExpr = () => {
-      let id = Location.mknoloc("napkinscript.exprhole")
-      Ast_helper.Exp.mk(Pexp_extension(id, PStr(list{})))
-    }
-
-    let defaultType = () => {
-      let id = Location.mknoloc("napkinscript.typehole")
-      Ast_helper.Typ.extension((id, PStr(list{})))
-    }
-
-    let defaultPattern = () => {
-      let id = Location.mknoloc("napkinscript.patternhole")
-      Ast_helper.Pat.extension((id, PStr(list{})))
-    }
-    /* Ast_helper.Pat.any  () */
-
-    let defaultModuleExpr = () => Ast_helper.Mod.structure(list{})
-    let defaultModuleType = () => Ast_helper.Mty.signature(list{})
-
-    let recoverEqualGreater = p => {
-      Parser.expect(EqualGreater, p)
-      switch p.Parser.token {
-      | MinusGreater => Parser.next(p)
-      | _ => ()
-      }
-    }
-
-    let shouldAbortListParse = p => {
-      let rec check = breadcrumbs =>
-        switch breadcrumbs {
-        | list{} => false
-        | list{(grammar, _), ...rest} =>
-          if Grammar.isPartOfList(grammar, p.Parser.token) {
-            true
-          } else {
-            check(rest)
-          }
-        }
-
-      check(p.breadcrumbs)
-    }
-  }
-
-  module ErrorMessages = {
-    let listPatternSpread = "List pattern matches only supports one `...` spread, at the end.
-Explanation: a list spread at the tail is efficient, but a spread in the middle would create new list{s}; out of performance concern, our pattern matching currently guarantees to never create new intermediate data."
-
-    let recordPatternSpread = "Record's `...` spread is not supported in pattern matches.
-Explanation: you can't collect a subset of a record's field into its own record, since a record needs an explicit declaration and that subset wouldn't have one.
-Solution: you need to pull out each field you want explicitly."
-
-    @live let recordPatternUnderscore = "Record patterns only support one `_`, at the end."
-
-    let arrayPatternSpread = "Array's `...` spread is not supported in pattern matches.
-Explanation: such spread would create a subarray; out of performance concern, our pattern matching currently guarantees to never create new intermediate data.
-Solution: if it's to validate the first few elements, use a `when` clause + Array size check + `get` checks on the current pattern. If it's to obtain a subarray, use `Array.sub` or `Belt.Array.slice`."
-
-    let arrayExprSpread = "Arrays can't use the `...` spread currently. Please use `concat` or other Array helpers."
-
-    let recordExprSpread = "Records can only have one `...` spread, at the beginning.
-Explanation: since records have a known, fixed shape, a spread like `{a, ...b}` wouldn't make sense, as `b` would override every field of `a` anyway."
-
-    let listExprSpread = "Lists can only have one `...` spread, and at the end.
-Explanation: lists are singly-linked list, where a node contains a value and points to the next node. `list{a, ...bc}` efficiently creates a new item and links `bc` as its next nodes. `[...bc, a]` would be expensive, as it'd need to traverse `bc` and prepend each item to `a` one by one. We therefore disallow such syntax sugar.
-Solution: directly use `concat`."
-
-    let variantIdent = "A polymorphic variant (e.g. #id) must start with an alphabetical letter."
-  }
-
-  let jsxAttr = (Location.mknoloc("JSX"), Parsetree.PStr(list{}))
-  let uncurryAttr = (Location.mknoloc("bs"), Parsetree.PStr(list{}))
-  let ternaryAttr = (Location.mknoloc("res.ternary"), Parsetree.PStr(list{}))
-  let makeBracesAttr = loc => (Location.mkloc("res.braces", loc), Parsetree.PStr(list{}))
-
-  type typDefOrExt =
-    | TypeDef({recFlag: Asttypes.rec_flag, types: list<Parsetree.type_declaration>})
-    | TypeExt(Parsetree.type_extension)
-
-  type labelledParameter =
-    | TermParameter({
-        uncurried: bool,
-        attrs: Parsetree.attributes,
-        label: Asttypes.arg_label,
-        expr: option<Parsetree.expression>,
-        pat: Parsetree.pattern,
-        pos: Lexing.position,
-      })
-    | TypeParameter({
-        uncurried: bool,
-        attrs: Parsetree.attributes,
-        locs: list<Location.loc<string>>,
-        pos: Lexing.position,
-      })
-
-  type recordPatternItem =
-    | PatUnderscore
-    | PatField((Ast_helper.lid, Parsetree.pattern))
-
-  type context =
-    | OrdinaryExpr
-    | TernaryTrueBranchExpr
-    | WhenExpr
-
-  let getClosingToken = x =>
-    switch x {
-    | Token.Lparen => Token.Rparen
-    | Lbrace => Rbrace
-    | Lbracket => Rbracket
-    | _ => assert false
-    }
-
-  let rec goToClosing = (closingToken, state) =>
-    switch (state.Parser.token, closingToken) {
-    | (Rparen, Token.Rparen) | (Rbrace, Rbrace) | (Rbracket, Rbracket) =>
-      Parser.next(state)
-      ()
-    | ((Token.Lbracket | Lparen | Lbrace) as t, _) =>
-      Parser.next(state)
-      goToClosing(getClosingToken(t), state)
-      goToClosing(closingToken, state)
-    | (Rparen | Token.Rbrace | Rbracket | Eof, _) => () /* TODO: how do report errors here? */
-    | _ =>
-      Parser.next(state)
-      goToClosing(closingToken, state)
-    }
-
-  /* Madness */
-  let isEs6ArrowExpression = (~inTernary, p) => Parser.lookahead(p, state =>
-      switch state.Parser.token {
-      | Lident(_) | List | Underscore =>
-        Parser.next(state)
-        switch state.Parser.token {
-        /* Don't think that this valid
-         * Imagine: let x = (a: int)
-         * This is a parenthesized expression with a type constraint, wait for
-         * the arrow */
-        /* | Colon when not inTernary -> true */
-        | EqualGreater => true
-        | _ => false
-        }
-      | Lparen =>
-        let prevEndPos = state.prevEndPos
-        Parser.next(state)
-        switch state.token {
-        | Rparen =>
-          Parser.next(state)
-          switch state.Parser.token {
-          | Colon when !inTernary => true
-          | EqualGreater => true
-          | _ => false
-          }
-        | Dot /* uncurried */ => true
-        | Tilde => true
-        | Backtick => false /* (` always indicates the start of an expr, can't be es6 parameter */
-        | _ =>
-          goToClosing(Rparen, state)
-          switch state.Parser.token {
-          | EqualGreater => true
-          /* | Lbrace TODO: detect missing =>, is this possible? */
-          | Colon when !inTernary => true
-          | Rparen => /* imagine having something as :
-             * switch colour {
-             * | Red
-             *    when l == l'
-             *    || (&Clflags.classic && (l == Nolabel && !is_optional(l'))) => (t1, t2)
-             * We'll arrive at the outer rparen just before the =>.
-             * This is not an es6 arrow.
-             * */
-            false
-          | _ =>
-            Parser.next(state)
-            /* error recovery, peek at the next token,
-             * (elements, providerId] => {
-             *  in the example above, we have an unbalanced ] here
-             */
-            switch state.Parser.token {
-            | EqualGreater when state.startPos.pos_lnum === prevEndPos.pos_lnum => true
-            | _ => false
-            }
-          }
-        }
-      | _ => false
-      }
-    )
-
-  let isEs6ArrowFunctor = p => Parser.lookahead(p, state =>
-      switch state.Parser.token {
-      /* | Uident _ | Underscore -> */
-      /* Parser.next state; */
-      /* begin match state.Parser.token with */
-      /* | EqualGreater -> true */
-      /* | _ -> false */
-      /* end */
-      | Lparen =>
-        Parser.next(state)
-        switch state.token {
-        | Rparen =>
-          Parser.next(state)
-          switch state.token {
-          | Colon | EqualGreater => true
-          | _ => false
-          }
-        | _ =>
-          goToClosing(Rparen, state)
-          switch state.Parser.token {
-          | EqualGreater | Lbrace => true
-          | Colon => true
-          | _ => false
-          }
-        }
-      | _ => false
-      }
-    )
-
-  let isEs6ArrowType = p => Parser.lookahead(p, state =>
-      switch state.Parser.token {
-      | Lparen =>
-        Parser.next(state)
-        switch state.Parser.token {
-        | Rparen =>
-          Parser.next(state)
-          switch state.Parser.token {
-          | EqualGreater => true
-          | _ => false
-          }
-        | Tilde | Dot => true
-        | _ =>
-          goToClosing(Rparen, state)
-          switch state.Parser.token {
-          | EqualGreater => true
-          | _ => false
-          }
-        }
-      | Tilde => true
-      | _ => false
-      }
-    )
-
-  let buildLongident = words =>
-    switch List.rev(words) {
-    | list{} => assert false
-    | list{hd, ...tl} => List.fold_left((p, s) => Longident.Ldot(p, s), Lident(hd), tl)
-    }
-
-  let makeInfixOperator = (p, token, startPos, endPos) => {
-    let stringifiedToken = if token == Token.MinusGreater {
-      "|."
-    } else if token == Token.PlusPlus {
-      "^"
-    } else if token == Token.BangEqual {
-      "<>"
-    } else if token == Token.BangEqualEqual {
-      "!="
-    } else if token == Token.Equal {
-      /* TODO: could have a totally different meaning like x->fooSet(y) */
-      Parser.err(~startPos, ~endPos, p, Diagnostics.message("Did you mean `==` here?"))
-      "="
-    } else if token == Token.EqualEqual {
-      "="
-    } else if token == Token.EqualEqualEqual {
-      "=="
-    } else {
-      Token.toString(token)
-    }
-
-    let loc = mkLoc(startPos, endPos)
-    let operator = Location.mkloc(Longident.Lident(stringifiedToken), loc)
-
-    Ast_helper.Exp.ident(~loc, operator)
-  }
-
-  let negateString = s =>
-    if String.length(s) > 0 && @doesNotRaise String.get(s, 0) == '-' {
-      (@doesNotRaise String.sub)(s, 1, String.length(s) - 1)
-    } else {
-      "-" ++ s
-    }
-
-  let makeUnaryExpr = (startPos, tokenEnd, token, operand) =>
-    switch (token, operand.Parsetree.pexp_desc) {
-    | (Token.Plus | PlusDot, Pexp_constant(Pconst_integer(_) | Pconst_float(_))) => operand
-    | (Minus, Pexp_constant(Pconst_integer(n, m))) => {
-        ...operand,
-        pexp_desc: Pexp_constant(Pconst_integer(negateString(n), m)),
-      }
-    | (Minus | MinusDot, Pexp_constant(Pconst_float(n, m))) => {
-        ...operand,
-        pexp_desc: Pexp_constant(Pconst_float(negateString(n), m)),
-      }
-    | (Token.Plus | PlusDot | Minus | MinusDot, _) =>
-      let tokenLoc = mkLoc(startPos, tokenEnd)
-      let operator = "~" ++ Token.toString(token)
-      Ast_helper.Exp.apply(
-        ~loc=mkLoc(startPos, operand.Parsetree.pexp_loc.loc_end),
-        Ast_helper.Exp.ident(~loc=tokenLoc, Location.mkloc(Longident.Lident(operator), tokenLoc)),
-        list{(Nolabel, operand)},
-      )
-    | (Token.Bang, _) =>
-      let tokenLoc = mkLoc(startPos, tokenEnd)
-      Ast_helper.Exp.apply(
-        ~loc=mkLoc(startPos, operand.Parsetree.pexp_loc.loc_end),
-        Ast_helper.Exp.ident(~loc=tokenLoc, Location.mkloc(Longident.Lident("not"), tokenLoc)),
-        list{(Nolabel, operand)},
-      )
-    | _ => operand
-    }
-
-  let makeListExpression = (loc, seq, extOpt) => {
-    let rec handleSeq = x =>
-      switch x {
-      | list{} =>
-        switch extOpt {
-        | Some(ext) => ext
-        | None =>
-          let loc = {...loc, Location.loc_ghost: true}
-          let nil = Location.mkloc(Longident.Lident("[]"), loc)
-          Ast_helper.Exp.construct(~loc, nil, None)
-        }
-      | list{e1, ...el} =>
-        let exp_el = handleSeq(el)
-        let loc = mkLoc(e1.Parsetree.pexp_loc.Location.loc_start, exp_el.pexp_loc.loc_end)
-
-        let arg = Ast_helper.Exp.tuple(~loc, list{e1, exp_el})
-        Ast_helper.Exp.construct(~loc, Location.mkloc(Longident.Lident("::"), loc), Some(arg))
-      }
-
-    let expr = handleSeq(seq)
-    {...expr, pexp_loc: loc}
-  }
-
-  let makeListPattern = (loc, seq, ext_opt) => {
-    let rec handle_seq = x =>
-      switch x {
-      | list{} =>
-        let base_case = switch ext_opt {
-        | Some(ext) => ext
-        | None =>
-          let loc = {...loc, Location.loc_ghost: true}
-          let nil = {Location.txt: Longident.Lident("[]"), loc: loc}
-          Ast_helper.Pat.construct(~loc, nil, None)
-        }
-
-        base_case
-      | list{p1, ...pl} =>
-        let pat_pl = handle_seq(pl)
-        let loc = mkLoc(p1.Parsetree.ppat_loc.loc_start, pat_pl.ppat_loc.loc_end)
-        let arg = Ast_helper.Pat.mk(~loc, Ppat_tuple(list{p1, pat_pl}))
-        Ast_helper.Pat.mk(
-          ~loc,
-          Ppat_construct(Location.mkloc(Longident.Lident("::"), loc), Some(arg)),
-        )
-      }
-
-    handle_seq(seq)
-  }
-
-  /* {"foo": bar} -> Js.t({. foo: bar})
-   * {.. "foo": bar} -> Js.t({.. foo: bar})
-   * {..} -> Js.t({..}) */
-  let makeBsObjType = (~attrs, ~loc, ~closed, rows) => {
-    let obj = Ast_helper.Typ.object_(~loc, rows, closed)
-    let jsDotTCtor = Location.mkloc(Longident.Ldot(Longident.Lident("Js"), "t"), loc)
-
-    Ast_helper.Typ.constr(~loc, ~attrs, jsDotTCtor, list{obj})
-  }
-
-  /* TODO: diagnostic reporting */
-  let lidentOfPath = longident =>
-    switch Longident.flatten(longident) |> List.rev {
-    | list{} => ""
-    | list{ident, ..._} => ident
-    }
-
-  let makeNewtypes = (~attrs, ~loc, newtypes, exp) => {
-    let expr = List.fold_right(
-      (newtype, exp) => Ast_helper.Exp.mk(~loc, Pexp_newtype(newtype, exp)),
-      newtypes,
-      exp,
-    )
-    {...expr, pexp_attributes: attrs}
-  }
-
-  /* locally abstract types syntax sugar
-   * Transforms
-   *  let f: type t u v. = (foo : list</t, u, v/>) => ...
-   * into
-   *  let f = (type t u v. foo : list</t, u, v/>) => ...
-   */
-  let wrapTypeAnnotation = (~loc, newtypes, core_type, body) => {
-    let exp = makeNewtypes(
-      ~attrs=list{},
-      ~loc,
-      newtypes,
-      Ast_helper.Exp.constraint_(~loc, body, core_type),
-    )
-
-    let typ = Ast_helper.Typ.poly(
-      ~loc,
-      newtypes,
-      Ast_helper.Typ.varify_constructors(newtypes, core_type),
-    )
-
-    (exp, typ)
-  }
-
-  @ocaml.doc(
-    "
-    * process the occurrence of _ in the arguments of a function application
-    * replace _ with a new variable, currently __x, in the arguments
-    * return a wrapping function that wraps ((__x) => ...) around an expression
-    * e.g. foo(_, 3) becomes (__x) => foo(__x, 3)
-    "
-  )
-  let processUnderscoreApplication = args => {
-    open Parsetree
-    let exp_question = ref(None)
-    let hidden_var = "__x"
-    let check_arg = ((lab, exp) as arg) =>
-      switch exp.pexp_desc {
-      | Pexp_ident({txt: Lident("_")} as id) =>
-        let new_id = Location.mkloc(Longident.Lident(hidden_var), id.loc)
-        let new_exp = Ast_helper.Exp.mk(Pexp_ident(new_id), ~loc=exp.pexp_loc)
-        exp_question := Some(new_exp)
-        (lab, new_exp)
-      | _ => arg
-      }
-
-    let args = List.map(check_arg, args)
-    let wrap = exp_apply =>
-      switch exp_question.contents {
-      | Some({pexp_loc: loc}) =>
-        let pattern = Ast_helper.Pat.mk(Ppat_var(Location.mkloc(hidden_var, loc)), ~loc)
-        Ast_helper.Exp.mk(Pexp_fun(Nolabel, None, pattern, exp_apply), ~loc)
-      | None => exp_apply
-      }
-
-    (args, wrap)
-  }
-
-  let rec parseLident = p => {
-    let recoverLident = p =>
-      if Token.isKeyword(p.Parser.token) && p.Parser.prevEndPos.pos_lnum === p.startPos.pos_lnum {
-        Parser.err(p, Diagnostics.lident(p.Parser.token))
-        Parser.next(p)
-        None
-      } else {
-        let rec loop = p =>
-          if !Recover.shouldAbortListParse(p) {
-            Parser.next(p)
-            loop(p)
-          }
-
-        Parser.next(p)
-        loop(p)
-        switch p.Parser.token {
-        | Lident(_) => Some()
-        | _ => None
-        }
-      }
-
-    let startPos = p.Parser.startPos
-    switch p.Parser.token {
-    | Lident(ident) =>
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      (ident, loc)
-    | List =>
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      ("list", loc)
-    | _ =>
-      switch recoverLident(p) {
-      | Some() => parseLident(p)
-      | None => ("_", mkLoc(startPos, p.prevEndPos))
-      }
-    }
-  }
-
-  let parseIdent = (~msg, ~startPos, p) =>
-    switch p.Parser.token {
-    | Lident(ident) | Uident(ident) =>
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      (ident, loc)
-    | List =>
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      ("list", loc)
-    | _token =>
-      Parser.err(p, Diagnostics.message(msg))
-      Parser.next(p)
-      ("_", mkLoc(startPos, p.prevEndPos))
-    }
-
-  let parseHashIdent = (~startPos, p) => {
-    Parser.expect(Hash, p)
-    parseIdent(~startPos, ~msg=ErrorMessages.variantIdent, p)
-  }
-
-  /* Ldot (Ldot (Lident "Foo", "Bar"), "baz") */
-  let parseValuePath = p => {
-    let startPos = p.Parser.startPos
-    let rec aux = (p, path) =>
-      switch p.Parser.token {
-      | List => Longident.Ldot(path, "list")
-      | Lident(ident) => Longident.Ldot(path, ident)
-      | Uident(uident) =>
-        Parser.next(p)
-        Parser.expect(Dot, p)
-        aux(p, Ldot(path, uident))
-      | token =>
-        Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-        Longident.Lident("_")
-      }
-
-    let ident = switch p.Parser.token {
-    | List => Longident.Lident("list")
-    | Lident(ident) => Longident.Lident(ident)
-    | Uident(ident) =>
-      Parser.next(p)
-      Parser.expect(Dot, p)
-      aux(p, Lident(ident))
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      Longident.Lident("_")
-    }
-
-    Parser.next(p)
-    Location.mkloc(ident, mkLoc(startPos, p.prevEndPos))
-  }
-
-  let parseValuePathTail = (p, startPos, ident) => {
-    let rec loop = (p, path) =>
-      switch p.Parser.token {
-      | Lident(ident) =>
-        Parser.next(p)
-        Location.mkloc(Longident.Ldot(path, ident), mkLoc(startPos, p.prevEndPos))
-      | List =>
-        Parser.next(p)
-        Location.mkloc(Longident.Ldot(path, "list"), mkLoc(startPos, p.prevEndPos))
-      | Uident(ident) =>
-        Parser.next(p)
-        Parser.expect(Dot, p)
-        loop(p, Longident.Ldot(path, ident))
-      | token =>
-        Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-        Location.mknoloc(path)
-      }
-
-    loop(p, ident)
-  }
-
-  let parseModuleLongIdentTail = (~lowercase, p, startPos, ident) => {
-    let rec loop = (p, acc) =>
-      switch p.Parser.token {
-      | List when lowercase =>
-        Parser.next(p)
-        let lident = Longident.Ldot(acc, "list")
-        Location.mkloc(lident, mkLoc(startPos, p.prevEndPos))
-      | Lident(ident) when lowercase =>
-        Parser.next(p)
-        let lident = Longident.Ldot(acc, ident)
-        Location.mkloc(lident, mkLoc(startPos, p.prevEndPos))
-      | Uident(ident) =>
-        Parser.next(p)
-        let endPos = p.prevEndPos
-        let lident = Longident.Ldot(acc, ident)
-        switch p.Parser.token {
-        | Dot =>
-          Parser.next(p)
-          loop(p, lident)
-        | _ => Location.mkloc(lident, mkLoc(startPos, endPos))
-        }
-      | t =>
-        Parser.err(p, Diagnostics.uident(t))
-        Location.mkloc(acc, mkLoc(startPos, p.prevEndPos))
-      }
-
-    loop(p, ident)
-  }
-
-  /* Parses module identifiers:
-       Foo
-       Foo.Bar */
-  let parseModuleLongIdent = (~lowercase, p) => {
-    /* Parser.leaveBreadcrumb p Reporting.ModuleLongIdent; */
-    let startPos = p.Parser.startPos
-    let moduleIdent = switch p.Parser.token {
-    | List when lowercase =>
-      let loc = mkLoc(startPos, p.endPos)
-      Parser.next(p)
-      Location.mkloc(Longident.Lident("list"), loc)
-    | Lident(ident) when lowercase =>
-      let loc = mkLoc(startPos, p.endPos)
-      let lident = Longident.Lident(ident)
-      Parser.next(p)
-      Location.mkloc(lident, loc)
-    | Uident(ident) =>
-      let lident = Longident.Lident(ident)
-      let endPos = p.endPos
-      Parser.next(p)
-      switch p.Parser.token {
-      | Dot =>
-        Parser.next(p)
-        parseModuleLongIdentTail(~lowercase, p, startPos, lident)
-      | _ => Location.mkloc(lident, mkLoc(startPos, endPos))
-      }
-    | t =>
-      Parser.err(p, Diagnostics.uident(t))
-      Location.mkloc(Longident.Lident("_"), mkLoc(startPos, p.prevEndPos))
-    }
-
-    /* Parser.eatBreadcrumb p; */
-    moduleIdent
-  }
-
-  /* `window.location` or `Math` or `Foo.Bar` */
-  let parseIdentPath = p => {
-    let rec loop = (p, acc) =>
-      switch p.Parser.token {
-      | Uident(ident) | Lident(ident) =>
-        Parser.next(p)
-        let lident = Longident.Ldot(acc, ident)
-        switch p.Parser.token {
-        | Dot =>
-          Parser.next(p)
-          loop(p, lident)
-        | _ => lident
-        }
-      | _t => acc
-      }
-
-    switch p.Parser.token {
-    | Lident(ident) | Uident(ident) =>
-      Parser.next(p)
-      switch p.Parser.token {
-      | Dot =>
-        Parser.next(p)
-        loop(p, Longident.Lident(ident))
-      | _ => Longident.Lident(ident)
-      }
-    | _ => Longident.Lident("_")
-    }
-  }
-
-  let verifyJsxOpeningClosingName = (p, nameExpr) => {
-    let closing = switch p.Parser.token {
-    | Lident(lident) =>
-      Parser.next(p)
-      Longident.Lident(lident)
-    | Uident(_) => parseModuleLongIdent(~lowercase=false, p).txt
-    | _ => Longident.Lident("")
-    }
-
-    switch nameExpr.Parsetree.pexp_desc {
-    | Pexp_ident(openingIdent) =>
-      let opening = {
-        let withoutCreateElement =
-          Longident.flatten(openingIdent.txt) |> List.filter(s => s != "createElement")
-
-        switch Longident.unflatten(withoutCreateElement) {
-        | Some(li) => li
-        | None => Longident.Lident("")
-        }
-      }
-
-      opening == closing
-    | _ => assert false
-    }
-  }
-
-  let string_of_pexp_ident = nameExpr =>
-    switch nameExpr.Parsetree.pexp_desc {
-    | Pexp_ident(openingIdent) =>
-      Longident.flatten(openingIdent.txt)
-      |> List.filter(s => s != "createElement")
-      |> String.concat(".")
-    | _ => ""
-    }
-
-  /* open-def ::=
-   *   | open module-path
-   *   | open! module-path */
-  let parseOpenDescription = (~attrs, p) => {
-    Parser.leaveBreadcrumb(p, Grammar.OpenDescription)
-    let startPos = p.Parser.startPos
-    Parser.expect(Open, p)
-    let override = if Parser.optional(p, Token.Bang) {
-      Asttypes.Override
-    } else {
-      Asttypes.Fresh
-    }
-
-    let modident = parseModuleLongIdent(~lowercase=false, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Parser.eatBreadcrumb(p)
-    Ast_helper.Opn.mk(~loc, ~attrs, ~override, modident)
-  }
-
-  let hexValue = x =>
-    switch x {
-    | '0' .. '9' => Char.code(x) - 48
-    | 'A' .. 'Z' => Char.code(x) - 55
-    | 'a' .. 'z' => Char.code(x) - 97
-    | _ => 16
-    }
-
-  let parseStringLiteral = s => {
-    let len = String.length(s)
-    let b = Buffer.create(String.length(s))
-
-    let rec loop = i =>
-      if i == len {
-        ()
-      } else {
-        let c = String.unsafe_get(s, i)
-        switch c {
-        | '\\' as c =>
-          let nextIx = i + 1
-          if nextIx < len {
-            let nextChar = String.unsafe_get(s, nextIx)
-            switch nextChar {
-            | 'n' =>
-              Buffer.add_char(b, '\n')
-              loop(nextIx + 1)
-            | 'r' =>
-              Buffer.add_char(b, '\r')
-              loop(nextIx + 1)
-            | 'b' =>
-              Buffer.add_char(b, '\b')
-              loop(nextIx + 1)
-            | 't' =>
-              Buffer.add_char(b, '\t')
-              loop(nextIx + 1)
-            | '\\' as c =>
-              Buffer.add_char(b, c)
-              loop(nextIx + 1)
-            | ' ' as c =>
-              Buffer.add_char(b, c)
-              loop(nextIx + 1)
-            | '\'' as c =>
-              Buffer.add_char(b, c)
-              loop(nextIx + 1)
-            | '"' as c =>
-              Buffer.add_char(b, c)
-              loop(nextIx + 1)
-            | '0' .. '9' =>
-              if nextIx + 2 < len {
-                let c0 = nextChar
-                let c1 = String.unsafe_get(s, nextIx + 1)
-                let c2 = String.unsafe_get(s, nextIx + 2)
-                let c =
-                  100 * (Char.code(c0) - 48) + 10 * (Char.code(c1) - 48) + (Char.code(c2) - 48)
-
-                if c < 0 || c > 255 {
-                  Buffer.add_char(b, '\\')
-                  Buffer.add_char(b, c0)
-                  Buffer.add_char(b, c1)
-                  Buffer.add_char(b, c2)
-                  loop(nextIx + 3)
-                } else {
-                  Buffer.add_char(b, Char.unsafe_chr(c))
-                  loop(nextIx + 3)
-                }
-              } else {
-                Buffer.add_char(b, '\\')
-                Buffer.add_char(b, nextChar)
-                loop(nextIx + 1)
-              }
-            | 'o' =>
-              if nextIx + 3 < len {
-                let c0 = String.unsafe_get(s, nextIx + 1)
-                let c1 = String.unsafe_get(s, nextIx + 2)
-                let c2 = String.unsafe_get(s, nextIx + 3)
-                let c = 64 * (Char.code(c0) - 48) + 8 * (Char.code(c1) - 48) + (Char.code(c2) - 48)
-
-                if c < 0 || c > 255 {
-                  Buffer.add_char(b, '\\')
-                  Buffer.add_char(b, '0')
-                  Buffer.add_char(b, c0)
-                  Buffer.add_char(b, c1)
-                  Buffer.add_char(b, c2)
-                  loop(nextIx + 4)
-                } else {
-                  Buffer.add_char(b, Char.unsafe_chr(c))
-                  loop(nextIx + 4)
-                }
-              } else {
-                Buffer.add_char(b, '\\')
-                Buffer.add_char(b, nextChar)
-                loop(nextIx + 1)
-              }
-            | 'x' as c =>
-              if nextIx + 2 < len {
-                let c0 = String.unsafe_get(s, nextIx + 1)
-                let c1 = String.unsafe_get(s, nextIx + 2)
-                let c = 16 * hexValue(c0) + hexValue(c1)
-                if c < 0 || c > 255 {
-                  Buffer.add_char(b, '\\')
-                  Buffer.add_char(b, 'x')
-                  Buffer.add_char(b, c0)
-                  Buffer.add_char(b, c1)
-                  loop(nextIx + 3)
-                } else {
-                  Buffer.add_char(b, Char.unsafe_chr(c))
-                  loop(nextIx + 3)
-                }
-              } else {
-                Buffer.add_char(b, '\\')
-                Buffer.add_char(b, c)
-                loop(nextIx + 2)
-              }
-            | _ =>
-              Buffer.add_char(b, c)
-              Buffer.add_char(b, nextChar)
-              loop(nextIx + 1)
-            }
-          } else {
-            Buffer.add_char(b, c)
-            ()
-          }
-        | c =>
-          Buffer.add_char(b, c)
-          loop(i + 1)
-        }
-      }
-
-    loop(0)
-    Buffer.contents(b)
-  }
-
-  let parseTemplateStringLiteral = s => {
-    let len = String.length(s)
-    let b = Buffer.create(len)
-
-    let rec loop = i =>
-      if i < len {
-        let c = String.unsafe_get(s, i)
-        switch c {
-        | '\\' as c =>
-          if i + 1 < len {
-            let nextChar = String.unsafe_get(s, i + 1)
-            switch nextChar {
-            | '\\' as c =>
-              Buffer.add_char(b, c)
-              loop(i + 2)
-            | '$' as c =>
-              Buffer.add_char(b, c)
-              loop(i + 2)
-            | '`' as c =>
-              Buffer.add_char(b, c)
-              loop(i + 2)
-            | c =>
-              Buffer.add_char(b, '\\')
-              Buffer.add_char(b, c)
-              loop(i + 2)
-            }
-          } else {
-            Buffer.add_char(b, c)
-          }
-
-        | c =>
-          Buffer.add_char(b, c)
-          loop(i + 1)
-        }
-      } else {
-        ()
-      }
-
-    loop(0)
-    Buffer.contents(b)
-  }
-
-  /* constant	::=	integer-literal */
-  /* ∣	 float-literal */
-  /* ∣	 string-literal */
-  let parseConstant = p => {
-    let isNegative = switch p.Parser.token {
-    | Token.Minus =>
-      Parser.next(p)
-      true
-    | Plus =>
-      Parser.next(p)
-      false
-    | _ => false
-    }
-
-    let constant = switch p.Parser.token {
-    | Int({i, suffix}) =>
-      let intTxt = if isNegative {
-        "-" ++ i
-      } else {
-        i
-      }
-      Parsetree.Pconst_integer(intTxt, suffix)
-    | Float({f, suffix}) =>
-      let floatTxt = if isNegative {
-        "-" ++ f
-      } else {
-        f
-      }
-      Parsetree.Pconst_float(floatTxt, suffix)
-    | String(s) =>
-      let txt = if p.mode == ParseForTypeChecker {
-        parseStringLiteral(s)
-      } else {
-        s
-      }
-
-      Pconst_string(txt, None)
-    | Character(c) => Pconst_char(c)
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      Pconst_string("", None)
-    }
-
-    Parser.next(p)
-    constant
-  }
-
-  let parseCommaDelimitedRegion = (p, ~grammar, ~closing, ~f) => {
-    Parser.leaveBreadcrumb(p, grammar)
-    let rec loop = nodes =>
-      switch f(p) {
-      | Some(node) =>
-        switch p.Parser.token {
-        | Comma =>
-          Parser.next(p)
-          loop(list{node, ...nodes})
-        | token when token == closing || token == Eof => List.rev(list{node, ...nodes})
-        | _ =>
-          if !(p.token == Eof || (p.token == closing || Recover.shouldAbortListParse(p))) {
-            Parser.expect(Comma, p)
-          }
-          if p.token == Semicolon {
-            Parser.next(p)
-          }
-          loop(list{node, ...nodes})
-        }
-      | None =>
-        if p.token == Eof || (p.token == closing || Recover.shouldAbortListParse(p)) {
-          List.rev(nodes)
-        } else {
-          Parser.err(p, Diagnostics.unexpected(p.token, p.breadcrumbs))
-          Parser.next(p)
-          loop(nodes)
-        }
-      }
-
-    let nodes = loop(list{})
-    Parser.eatBreadcrumb(p)
-    nodes
-  }
-
-  let parseCommaDelimitedReversedList = (p, ~grammar, ~closing, ~f) => {
-    Parser.leaveBreadcrumb(p, grammar)
-    let rec loop = nodes =>
-      switch f(p) {
-      | Some(node) =>
-        switch p.Parser.token {
-        | Comma =>
-          Parser.next(p)
-          loop(list{node, ...nodes})
-        | token when token == closing || token == Eof => list{node, ...nodes}
-        | _ =>
-          if !(p.token == Eof || (p.token == closing || Recover.shouldAbortListParse(p))) {
-            Parser.expect(Comma, p)
-          }
-          if p.token == Semicolon {
-            Parser.next(p)
-          }
-          loop(list{node, ...nodes})
-        }
-      | None =>
-        if p.token == Eof || (p.token == closing || Recover.shouldAbortListParse(p)) {
-          nodes
-        } else {
-          Parser.err(p, Diagnostics.unexpected(p.token, p.breadcrumbs))
-          Parser.next(p)
-          loop(nodes)
-        }
-      }
-
-    let nodes = loop(list{})
-    Parser.eatBreadcrumb(p)
-    nodes
-  }
-
-  let parseDelimitedRegion = (p, ~grammar, ~closing, ~f) => {
-    Parser.leaveBreadcrumb(p, grammar)
-    let rec loop = nodes =>
-      switch f(p) {
-      | Some(node) => loop(list{node, ...nodes})
-      | None =>
-        if p.Parser.token == Token.Eof || (p.token == closing || Recover.shouldAbortListParse(p)) {
-          List.rev(nodes)
-        } else {
-          Parser.err(p, Diagnostics.unexpected(p.token, p.breadcrumbs))
-          Parser.next(p)
-          loop(nodes)
-        }
-      }
-
-    let nodes = loop(list{})
-    Parser.eatBreadcrumb(p)
-    nodes
-  }
-
-  let parseRegion = (p, ~grammar, ~f) => {
-    Parser.leaveBreadcrumb(p, grammar)
-    let rec loop = nodes =>
-      switch f(p) {
-      | Some(node) => loop(list{node, ...nodes})
-      | None =>
-        if p.Parser.token == Token.Eof || Recover.shouldAbortListParse(p) {
-          List.rev(nodes)
-        } else {
-          Parser.err(p, Diagnostics.unexpected(p.token, p.breadcrumbs))
-          Parser.next(p)
-          loop(nodes)
-        }
-      }
-
-    let nodes = loop(list{})
-    Parser.eatBreadcrumb(p)
-    nodes
-  }
-
-  /* let-binding	::=	pattern =  expr */
-  /* ∣	 value-name  { parameter }  [: typexpr]  [:> typexpr] =  expr */
-  /* ∣	 value-name :  poly-typexpr =  expr */
-
-  /* pattern	::=	value-name */
-  /* ∣	 _ */
-  /* ∣	 constant */
-  /* ∣	 pattern as  value-name */
-  /* ∣	 ( pattern ) */
-  /* ∣	 ( pattern :  typexpr ) */
-  /* ∣	 pattern |  pattern */
-  /* ∣	 constr  pattern */
-  /* ∣	 #variant variant-pattern */
-  /* ∣	 ##type */
-  /* ∣	 / pattern  { , pattern }+  / */
-  /* ∣	 { field  [: typexpr]  [= pattern] { ; field  [: typexpr]  [= pattern] }  [; _ ] [ ; ] } */
-  /* ∣	 [ pattern  { ; pattern }  [ ; ] ] */
-  /* ∣	 pattern ::  pattern */
-  /* ∣	 [| pattern  { ; pattern }  [ ; ] |] */
-  /* ∣	 char-literal ..  char-literal */
-  /* 	∣	 exception pattern */
-  let rec parsePattern = (~alias=true, ~or_=true, p) => {
-    let startPos = p.Parser.startPos
-    let attrs = parseAttributes(p)
-    let pat = switch p.Parser.token {
-    | (True | False) as token =>
-      let endPos = p.endPos
-      Parser.next(p)
-      let loc = mkLoc(startPos, endPos)
-      Ast_helper.Pat.construct(
-        ~loc,
-        Location.mkloc(Longident.Lident(Token.toString(token)), loc),
-        None,
-      )
-    | Int(_) | String(_) | Float(_) | Character(_) | Minus | Plus =>
-      let c = parseConstant(p)
-      switch p.token {
-      | DotDot =>
-        Parser.next(p)
-        let c2 = parseConstant(p)
-        Ast_helper.Pat.interval(~loc=mkLoc(startPos, p.prevEndPos), c, c2)
-      | _ => Ast_helper.Pat.constant(~loc=mkLoc(startPos, p.prevEndPos), c)
-      }
-    | Lparen =>
-      Parser.next(p)
-      switch p.token {
-      | Rparen =>
-        Parser.next(p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        let lid = Location.mkloc(Longident.Lident("()"), loc)
-        Ast_helper.Pat.construct(~loc, lid, None)
-      | _ =>
-        let pat = parseConstrainedPattern(p)
-        switch p.token {
-        | Comma =>
-          Parser.next(p)
-          parseTuplePattern(~attrs, ~first=pat, ~startPos, p)
-        | _ =>
-          Parser.expect(Rparen, p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          {...pat, ppat_loc: loc}
-        }
-      }
-    | Lbracket => parseArrayPattern(~attrs, p)
-    | Lbrace => parseRecordPattern(~attrs, p)
-    | Underscore =>
-      let endPos = p.endPos
-      let loc = mkLoc(startPos, endPos)
-      Parser.next(p)
-      Ast_helper.Pat.any(~loc, ~attrs, ())
-    | Lident(ident) =>
-      let endPos = p.endPos
-      let loc = mkLoc(startPos, endPos)
-      Parser.next(p)
-      Ast_helper.Pat.var(~loc, ~attrs, Location.mkloc(ident, loc))
-    | Uident(_) =>
-      let constr = parseModuleLongIdent(~lowercase=false, p)
-      switch p.Parser.token {
-      | Lparen => parseConstructorPatternArgs(p, constr, startPos, attrs)
-      | _ => Ast_helper.Pat.construct(~loc=constr.loc, ~attrs, constr, None)
-      }
-    | Hash =>
-      let (ident, loc) = parseHashIdent(~startPos, p)
-      switch p.Parser.token {
-      | Lparen => parseVariantPatternArgs(p, ident, startPos, attrs)
-      | _ => Ast_helper.Pat.variant(~loc, ~attrs, ident, None)
-      }
-    | HashHash =>
-      Parser.next(p)
-      let ident = parseValuePath(p)
-      let loc = mkLoc(startPos, ident.loc.loc_end)
-      Ast_helper.Pat.type_(~loc, ~attrs, ident)
-    | Exception =>
-      Parser.next(p)
-      let pat = parsePattern(~alias=false, ~or_=false, p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Pat.exception_(~loc, ~attrs, pat)
-    | Lazy =>
-      Parser.next(p)
-      let pat = parsePattern(~alias=false, ~or_=false, p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Pat.lazy_(~loc, ~attrs, pat)
-    | List =>
-      Parser.next(p)
-      switch p.token {
-      | Lbracket => parseListPattern(~startPos, ~attrs, p)
-      | _ =>
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Ast_helper.Pat.var(~loc, ~attrs, Location.mkloc("list", loc))
-      }
-    | Module => parseModulePattern(~attrs, p)
-    | Percent =>
-      let extension = parseExtension(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Pat.extension(~loc, ~attrs, extension)
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      switch skipTokensAndMaybeRetry(p, ~isStartOfGrammar=Grammar.isAtomicPatternStart) {
-      | None => Recover.defaultPattern()
-      | Some() => parsePattern(p)
-      }
-    }
-
-    let pat = if alias {
-      parseAliasPattern(~attrs, pat, p)
-    } else {
-      pat
-    }
-    if or_ {
-      parseOrPattern(pat, p)
-    } else {
-      pat
-    }
-  }
-
-  and skipTokensAndMaybeRetry = (p, ~isStartOfGrammar) =>
-    if Token.isKeyword(p.Parser.token) && p.Parser.prevEndPos.pos_lnum === p.startPos.pos_lnum {
-      Parser.next(p)
-      None
-    } else if Recover.shouldAbortListParse(p) {
-      if isStartOfGrammar(p.Parser.token) {
-        Parser.next(p)
-        Some()
-      } else {
-        None
-      }
-    } else {
-      Parser.next(p)
-      let rec loop = p =>
-        if !Recover.shouldAbortListParse(p) {
-          Parser.next(p)
-          loop(p)
-        }
-      loop(p)
-      if isStartOfGrammar(p.Parser.token) {
-        Some()
-      } else {
-        None
-      }
-    }
-
-  /* alias ::= pattern as lident */
-  and parseAliasPattern = (~attrs, pattern, p) =>
-    switch p.Parser.token {
-    | As =>
-      Parser.next(p)
-      let (name, loc) = parseLident(p)
-      let name = Location.mkloc(name, loc)
-      Ast_helper.Pat.alias(~loc={...pattern.ppat_loc, loc_end: p.prevEndPos}, ~attrs, pattern, name)
-    | _ => pattern
-    }
-
-  /* or ::= pattern | pattern
-   * precedence: Red | Blue | Green is interpreted as (Red | Blue) | Green */
-  and parseOrPattern = (pattern1, p) => {
-    let rec loop = pattern1 =>
-      switch p.Parser.token {
-      | Bar =>
-        Parser.next(p)
-        let pattern2 = parsePattern(~or_=false, p)
-        let loc = {
-          ...pattern1.Parsetree.ppat_loc,
-          loc_end: pattern2.ppat_loc.loc_end,
-        }
-        loop(Ast_helper.Pat.or_(~loc, pattern1, pattern2))
-      | _ => pattern1
-      }
-
-    loop(pattern1)
-  }
-
-  and parseNonSpreadPattern = (~msg, p) => {
-    let () = switch p.Parser.token {
-    | DotDotDot =>
-      Parser.err(p, Diagnostics.message(msg))
-      Parser.next(p)
-    | _ => ()
-    }
-
-    switch p.Parser.token {
-    | token when Grammar.isPatternStart(token) =>
-      let pat = parsePattern(p)
-      switch p.Parser.token {
-      | Colon =>
-        Parser.next(p)
-        let typ = parseTypExpr(p)
-        let loc = mkLoc(pat.ppat_loc.loc_start, typ.Parsetree.ptyp_loc.loc_end)
-        Some(Ast_helper.Pat.constraint_(~loc, pat, typ))
-      | _ => Some(pat)
-      }
-    | _ => None
-    }
-  }
-
-  and parseConstrainedPattern = p => {
-    let pat = parsePattern(p)
-    switch p.Parser.token {
-    | Colon =>
-      Parser.next(p)
-      let typ = parseTypExpr(p)
-      let loc = mkLoc(pat.ppat_loc.loc_start, typ.Parsetree.ptyp_loc.loc_end)
-      Ast_helper.Pat.constraint_(~loc, pat, typ)
-    | _ => pat
-    }
-  }
-
-  and parseConstrainedPatternRegion = p =>
-    switch p.Parser.token {
-    | token when Grammar.isPatternStart(token) => Some(parseConstrainedPattern(p))
-    | _ => None
-    }
-
-  /* field ::=
-   *   | longident
-   *   | longident : pattern
-   *   | longident as lident
-   *
-   *  row ::=
-   *	 | field ,
-   *	 | field , _
-   *	 | field , _,
-   */
-  and parseRecordPatternField = p => {
-    let startPos = p.Parser.startPos
-    let label = parseValuePath(p)
-    let pattern = switch p.Parser.token {
-    | Colon =>
-      Parser.next(p)
-      parsePattern(p)
-    | _ => Ast_helper.Pat.var(~loc=label.loc, Location.mkloc(Longident.last(label.txt), label.loc))
-    }
-
-    switch p.token {
-    | As =>
-      Parser.next(p)
-      let (name, loc) = parseLident(p)
-      let name = Location.mkloc(name, loc)
-      let aliasPattern = Ast_helper.Pat.alias(~loc=mkLoc(startPos, p.prevEndPos), pattern, name)
-
-      (Location.mkloc(label.txt, mkLoc(startPos, aliasPattern.ppat_loc.loc_end)), aliasPattern)
-    | _ => (label, pattern)
-    }
-  }
-
-  /* TODO: there are better representations than PatField|Underscore ? */
-  and parseRecordPatternItem = p =>
-    switch p.Parser.token {
-    | DotDotDot =>
-      Parser.next(p)
-      Some(true, PatField(parseRecordPatternField(p)))
-    | Uident(_) | Lident(_) => Some(false, PatField(parseRecordPatternField(p)))
-    | Underscore =>
-      Parser.next(p)
-      Some(false, PatUnderscore)
-    | _ => None
-    }
-
-  and parseRecordPattern = (~attrs, p) => {
-    let startPos = p.startPos
-    Parser.expect(Lbrace, p)
-    let rawFields = parseCommaDelimitedReversedList(
-      p,
-      ~grammar=PatternRecord,
-      ~closing=Rbrace,
-      ~f=parseRecordPatternItem,
-    )
-
-    Parser.expect(Rbrace, p)
-    let (fields, closedFlag) = {
-      let (rawFields, flag) = switch rawFields {
-      | list{(_hasSpread, PatUnderscore), ...rest} => (rest, Asttypes.Open)
-      | rawFields => (rawFields, Asttypes.Closed)
-      }
-
-      List.fold_left(((fields, flag), curr) => {
-        let (hasSpread, field) = curr
-        switch field {
-        | PatField(field) =>
-          if hasSpread {
-            let (_, pattern) = field
-            Parser.err(
-              ~startPos=pattern.Parsetree.ppat_loc.loc_start,
-              p,
-              Diagnostics.message(ErrorMessages.recordPatternSpread),
-            )
-          }
-          (list{field, ...fields}, flag)
-        | PatUnderscore => (fields, flag)
-        }
-      }, (list{}, flag), rawFields)
-    }
-
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Pat.record(~loc, ~attrs, fields, closedFlag)
-  }
-
-  and parseTuplePattern = (~attrs, ~first, ~startPos, p) => {
-    let patterns = parseCommaDelimitedRegion(
-      p,
-      ~grammar=Grammar.PatternList,
-      ~closing=Rparen,
-      ~f=parseConstrainedPatternRegion,
-    )
-
-    Parser.expect(Rparen, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Pat.tuple(~loc, ~attrs, list{first, ...patterns})
-  }
-
-  and parsePatternRegion = p =>
-    switch p.Parser.token {
-    | DotDotDot =>
-      Parser.next(p)
-      Some(true, parseConstrainedPattern(p))
-    | token when Grammar.isPatternStart(token) => Some(false, parseConstrainedPattern(p))
-    | _ => None
-    }
-
-  and parseModulePattern = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Module, p)
-    Parser.expect(Lparen, p)
-    let uident = switch p.token {
-    | Uident(uident) =>
-      let loc = mkLoc(p.startPos, p.endPos)
-      Parser.next(p)
-      Location.mkloc(uident, loc)
-    | _ =>
-      /* TODO: error recovery */
-      Location.mknoloc("_")
-    }
-
-    switch p.token {
-    | Colon =>
-      let colonStart = p.Parser.startPos
-      Parser.next(p)
-      let packageTypAttrs = parseAttributes(p)
-      let packageType = parsePackageType(~startPos=colonStart, ~attrs=packageTypAttrs, p)
-      Parser.expect(Rparen, p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      let unpack = Ast_helper.Pat.unpack(~loc=uident.loc, uident)
-      Ast_helper.Pat.constraint_(~loc, ~attrs, unpack, packageType)
-    | _ =>
-      Parser.expect(Rparen, p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Pat.unpack(~loc, ~attrs, uident)
-    }
-  }
-
-  and parseListPattern = (~startPos, ~attrs, p) => {
-    Parser.expect(Lbracket, p)
-    let listPatterns = parseCommaDelimitedReversedList(
-      p,
-      ~grammar=Grammar.PatternOcamlList,
-      ~closing=Rbracket,
-      ~f=parsePatternRegion,
-    )
-
-    Parser.expect(Rbracket, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    let filterSpread = ((hasSpread, pattern)) =>
-      if hasSpread {
-        Parser.err(
-          ~startPos=pattern.Parsetree.ppat_loc.loc_start,
-          p,
-          Diagnostics.message(ErrorMessages.listPatternSpread),
-        )
-        pattern
-      } else {
-        pattern
-      }
-
-    switch listPatterns {
-    | list{(true, pattern), ...patterns} =>
-      let patterns = patterns |> List.map(filterSpread) |> List.rev
-      let pat = makeListPattern(loc, patterns, Some(pattern))
-      {...pat, ppat_loc: loc, ppat_attributes: attrs}
-    | patterns =>
-      let patterns = patterns |> List.map(filterSpread) |> List.rev
-      let pat = makeListPattern(loc, patterns, None)
-      {...pat, ppat_loc: loc, ppat_attributes: attrs}
-    }
-  }
-
-  and parseArrayPattern = (~attrs, p) => {
-    let startPos = p.startPos
-    Parser.expect(Lbracket, p)
-    let patterns = parseCommaDelimitedRegion(
-      p,
-      ~grammar=Grammar.PatternList,
-      ~closing=Rbracket,
-      ~f=parseNonSpreadPattern(~msg=ErrorMessages.arrayPatternSpread),
-    )
-
-    Parser.expect(Rbracket, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Pat.array(~loc, ~attrs, patterns)
-  }
-
-  and parseConstructorPatternArgs = (p, constr, startPos, attrs) => {
-    let lparen = p.startPos
-    Parser.expect(Lparen, p)
-    let args = parseCommaDelimitedRegion(
-      p,
-      ~grammar=Grammar.PatternList,
-      ~closing=Rparen,
-      ~f=parseConstrainedPatternRegion,
-    )
-
-    Parser.expect(Rparen, p)
-    let args = switch args {
-    | list{} =>
-      let loc = mkLoc(lparen, p.prevEndPos)
-      Some(Ast_helper.Pat.construct(~loc, Location.mkloc(Longident.Lident("()"), loc), None))
-    | list{{ppat_desc: Ppat_tuple(_)} as pat} as patterns =>
-      if p.mode == ParseForTypeChecker {
-        /* Some(1, 2) for type-checker */
-        Some(pat)
-      } else {
-        /* Some((1, 2)) for printer */
-        Some(Ast_helper.Pat.tuple(~loc=mkLoc(lparen, p.endPos), patterns))
-      }
-    | list{pattern} => Some(pattern)
-    | patterns => Some(Ast_helper.Pat.tuple(~loc=mkLoc(lparen, p.endPos), patterns))
-    }
-
-    Ast_helper.Pat.construct(~loc=mkLoc(startPos, p.prevEndPos), ~attrs, constr, args)
-  }
-
-  and parseVariantPatternArgs = (p, ident, startPos, attrs) => {
-    let lparen = p.startPos
-    Parser.expect(Lparen, p)
-    let patterns = parseCommaDelimitedRegion(
-      p,
-      ~grammar=Grammar.PatternList,
-      ~closing=Rparen,
-      ~f=parseConstrainedPatternRegion,
-    )
-    let args = switch patterns {
-    | list{{ppat_desc: Ppat_tuple(_)} as pat} as patterns =>
-      if p.mode == ParseForTypeChecker {
-        /* #ident(1, 2) for type-checker */
-        Some(pat)
-      } else {
-        /* #ident((1, 2)) for printer */
-        Some(Ast_helper.Pat.tuple(~loc=mkLoc(lparen, p.endPos), patterns))
-      }
-    | list{pattern} => Some(pattern)
-    | patterns => Some(Ast_helper.Pat.tuple(~loc=mkLoc(lparen, p.endPos), patterns))
-    }
-
-    Parser.expect(Rparen, p)
-    Ast_helper.Pat.variant(~loc=mkLoc(startPos, p.prevEndPos), ~attrs, ident, args)
-  }
-
-  and parseExpr = (~context=OrdinaryExpr, p) => {
-    let expr = parseOperandExpr(~context, p)
-    let expr = parseBinaryExpr(~context, ~a=expr, p, 1)
-    parseTernaryExpr(expr, p)
-  }
-
-  /* expr ? expr : expr */
-  and parseTernaryExpr = (leftOperand, p) =>
-    switch p.Parser.token {
-    | Question =>
-      Parser.leaveBreadcrumb(p, Grammar.Ternary)
-      Parser.next(p)
-      let trueBranch = parseExpr(~context=TernaryTrueBranchExpr, p)
-      Parser.expect(Colon, p)
-      let falseBranch = parseExpr(p)
-      Parser.eatBreadcrumb(p)
-      let loc = {
-        ...leftOperand.Parsetree.pexp_loc,
-        loc_start: leftOperand.pexp_loc.loc_start,
-        loc_end: falseBranch.Parsetree.pexp_loc.loc_end,
-      }
-      Ast_helper.Exp.ifthenelse(
-        ~attrs=list{ternaryAttr},
-        ~loc,
-        leftOperand,
-        trueBranch,
-        Some(falseBranch),
-      )
-    | _ => leftOperand
-    }
-
-  and parseEs6ArrowExpression = (~parameters=?, p) => {
-    let startPos = p.Parser.startPos
-    Parser.leaveBreadcrumb(p, Grammar.Es6ArrowExpr)
-    let parameters = switch parameters {
-    | Some(params) => params
-    | None => parseParameters(p)
-    }
-
-    let returnType = switch p.Parser.token {
-    | Colon =>
-      Parser.next(p)
-      Some(parseTypExpr(~es6Arrow=false, p))
-    | _ => None
-    }
-
-    Parser.expect(EqualGreater, p)
-    let body = {
-      let expr = parseExpr(p)
-      switch returnType {
-      | Some(typ) =>
-        Ast_helper.Exp.constraint_(
-          ~loc=mkLoc(expr.pexp_loc.loc_start, typ.Parsetree.ptyp_loc.loc_end),
-          expr,
-          typ,
-        )
-      | None => expr
-      }
-    }
-
-    Parser.eatBreadcrumb(p)
-    let endPos = p.prevEndPos
-    let arrowExpr = List.fold_right((parameter, expr) =>
-      switch parameter {
-      | TermParameter({uncurried, attrs, label: lbl, expr: defaultExpr, pat, pos: startPos}) =>
-        let attrs = if uncurried {
-          list{uncurryAttr, ...attrs}
-        } else {
-          attrs
-        }
-        Ast_helper.Exp.fun_(~loc=mkLoc(startPos, endPos), ~attrs, lbl, defaultExpr, pat, expr)
-      | TypeParameter({uncurried, attrs, locs: newtypes, pos: startPos}) =>
-        let attrs = if uncurried {
-          list{uncurryAttr, ...attrs}
-        } else {
-          attrs
-        }
-        makeNewtypes(~attrs, ~loc=mkLoc(startPos, endPos), newtypes, expr)
-      }
-    , parameters, body)
-
-    {...arrowExpr, pexp_loc: {...arrowExpr.pexp_loc, loc_start: startPos}}
-  }
-
-  /*
-   * uncurried_parameter ::=
-   *   | . parameter
-   *
-   * parameter ::=
-   *   | pattern
-   *   | pattern : type
-   *   | ~ labelName
-   *   | ~ labelName as pattern
-   *   | ~ labelName as pattern : type
-   *   | ~ labelName = expr
-   *   | ~ labelName as pattern = expr
-   *   | ~ labelName as pattern : type = expr
-   *   | ~ labelName = ?
-   *   | ~ labelName as pattern = ?
-   *   | ~ labelName as pattern : type = ?
-   *
-   * labelName ::= lident
-   */
-  and parseParameter = p =>
-    if (
-      p.Parser.token == Token.Typ ||
-        (p.token == Tilde ||
-        (p.token == Dot || Grammar.isPatternStart(p.token)))
-    ) {
-      let startPos = p.Parser.startPos
-      let uncurried = Parser.optional(p, Token.Dot)
-      /* two scenarios:
-       *   attrs ~lbl ...
-       *   attrs pattern
-       * Attributes before a labelled arg, indicate that it's on the whole arrow expr
-       * Otherwise it's part of the pattern
-       * */
-      let attrs = parseAttributes(p)
-      if p.Parser.token == Typ {
-        Parser.next(p)
-        let lidents = parseLidentList(p)
-        Some(TypeParameter({uncurried: uncurried, attrs: attrs, locs: lidents, pos: startPos}))
-      } else {
-        let (attrs, lbl, pat) = switch p.Parser.token {
-        | Tilde =>
-          Parser.next(p)
-          let (lblName, loc) = parseLident(p)
-          let propLocAttr = (Location.mkloc("res.namedArgLoc", loc), Parsetree.PStr(list{}))
-          switch p.Parser.token {
-          | Comma | Equal | Rparen =>
-            let loc = mkLoc(startPos, p.prevEndPos)
-            (
-              attrs,
-              Asttypes.Labelled(lblName),
-              Ast_helper.Pat.var(~attrs=list{propLocAttr}, ~loc, Location.mkloc(lblName, loc)),
-            )
-          | Colon =>
-            let lblEnd = p.prevEndPos
-            Parser.next(p)
-            let typ = parseTypExpr(p)
-            let loc = mkLoc(startPos, lblEnd)
-            let pat = {
-              let pat = Ast_helper.Pat.var(~loc, Location.mkloc(lblName, loc))
-              let loc = mkLoc(startPos, p.prevEndPos)
-              Ast_helper.Pat.constraint_(~attrs=list{propLocAttr}, ~loc, pat, typ)
-            }
-            (attrs, Asttypes.Labelled(lblName), pat)
-          | As =>
-            Parser.next(p)
-            let pat = {
-              let pat = parseConstrainedPattern(p)
-              {...pat, ppat_attributes: list{propLocAttr, ...pat.ppat_attributes}}
-            }
-
-            (attrs, Asttypes.Labelled(lblName), pat)
-          | t =>
-            Parser.err(p, Diagnostics.unexpected(t, p.breadcrumbs))
-            let loc = mkLoc(startPos, p.prevEndPos)
-            (
-              attrs,
-              Asttypes.Labelled(lblName),
-              Ast_helper.Pat.var(~loc, Location.mkloc(lblName, loc)),
-            )
-          }
-        | _ =>
-          let pattern = parseConstrainedPattern(p)
-          let attrs = List.concat(list{attrs, pattern.ppat_attributes})
-          (list{}, Asttypes.Nolabel, {...pattern, ppat_attributes: attrs})
-        }
-
-        switch p.Parser.token {
-        | Equal =>
-          Parser.next(p)
-          let lbl = switch lbl {
-          | Asttypes.Labelled(lblName) => Asttypes.Optional(lblName)
-          | Asttypes.Optional(_) as lbl => lbl
-          | Asttypes.Nolabel => Asttypes.Nolabel
-          }
-
-          switch p.Parser.token {
-          | Question =>
-            Parser.next(p)
-            Some(
-              TermParameter({
-                uncurried: uncurried,
-                attrs: attrs,
-                label: lbl,
-                expr: None,
-                pat: pat,
-                pos: startPos,
-              }),
-            )
-          | _ =>
-            let expr = parseConstrainedOrCoercedExpr(p)
-            Some(
-              TermParameter({
-                uncurried: uncurried,
-                attrs: attrs,
-                label: lbl,
-                expr: Some(expr),
-                pat: pat,
-                pos: startPos,
-              }),
-            )
-          }
-        | _ =>
-          Some(
-            TermParameter({
-              uncurried: uncurried,
-              attrs: attrs,
-              label: lbl,
-              expr: None,
-              pat: pat,
-              pos: startPos,
-            }),
-          )
-        }
-      }
-    } else {
-      None
-    }
-
-  and parseParameterList = p => {
-    let parameters = parseCommaDelimitedRegion(
-      ~grammar=Grammar.ParameterList,
-      ~f=parseParameter,
-      ~closing=Rparen,
-      p,
-    )
-
-    Parser.expect(Rparen, p)
-    parameters
-  }
-
-  /* parameters ::=
-   *   | _
-   *   | lident
-   *   | ()
-   *   | (.)
-   *   | ( parameter {, parameter} [,] )
-   */
-  and parseParameters = p => {
-    let startPos = p.Parser.startPos
-    switch p.Parser.token {
-    | Lident(ident) =>
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.Parser.prevEndPos)
-      list{
-        TermParameter({
-          uncurried: false,
-          attrs: list{},
-          label: Asttypes.Nolabel,
-          expr: None,
-          pat: Ast_helper.Pat.var(~loc, Location.mkloc(ident, loc)),
-          pos: startPos,
-        }),
-      }
-    | List =>
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.Parser.prevEndPos)
-      list{
-        TermParameter({
-          uncurried: false,
-          attrs: list{},
-          label: Asttypes.Nolabel,
-          expr: None,
-          pat: Ast_helper.Pat.var(~loc, Location.mkloc("list", loc)),
-          pos: startPos,
-        }),
-      }
-    | Underscore =>
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.Parser.prevEndPos)
-      list{
-        TermParameter({
-          uncurried: false,
-          attrs: list{},
-          label: Asttypes.Nolabel,
-          expr: None,
-          pat: Ast_helper.Pat.any(~loc, ()),
-          pos: startPos,
-        }),
-      }
-    | Lparen =>
-      Parser.next(p)
-      switch p.Parser.token {
-      | Rparen =>
-        Parser.next(p)
-        let loc = mkLoc(startPos, p.Parser.prevEndPos)
-        let unitPattern = Ast_helper.Pat.construct(
-          ~loc,
-          Location.mkloc(Longident.Lident("()"), loc),
-          None,
-        )
-
-        list{
-          TermParameter({
-            uncurried: false,
-            attrs: list{},
-            label: Asttypes.Nolabel,
-            expr: None,
-            pat: unitPattern,
-            pos: startPos,
-          }),
-        }
-      | Dot =>
-        Parser.next(p)
-        switch p.token {
-        | Rparen =>
-          Parser.next(p)
-          let loc = mkLoc(startPos, p.Parser.prevEndPos)
-          let unitPattern = Ast_helper.Pat.construct(
-            ~loc,
-            Location.mkloc(Longident.Lident("()"), loc),
-            None,
-          )
-
-          list{
-            TermParameter({
-              uncurried: true,
-              attrs: list{},
-              label: Asttypes.Nolabel,
-              expr: None,
-              pat: unitPattern,
-              pos: startPos,
-            }),
-          }
-        | _ =>
-          switch parseParameterList(p) {
-          | list{
-              TermParameter({attrs, label: lbl, expr: defaultExpr, pat: pattern, pos: startPos}),
-              ...rest,
-            } => list{
-              TermParameter({
-                uncurried: true,
-                attrs: attrs,
-                label: lbl,
-                expr: defaultExpr,
-                pat: pattern,
-                pos: startPos,
-              }),
-              ...rest,
-            }
-          | parameters => parameters
-          }
-        }
-      | _ => parseParameterList(p)
-      }
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      list{}
-    }
-  }
-
-  and parseCoercedExpr = (~expr: Parsetree.expression, p) => {
-    Parser.expect(ColonGreaterThan, p)
-    let typ = parseTypExpr(p)
-    let loc = mkLoc(expr.pexp_loc.loc_start, p.prevEndPos)
-    Ast_helper.Exp.coerce(~loc, expr, None, typ)
-  }
-
-  and parseConstrainedOrCoercedExpr = p => {
-    let expr = parseExpr(p)
-    switch p.Parser.token {
-    | ColonGreaterThan => parseCoercedExpr(~expr, p)
-    | Colon =>
-      Parser.next(p)
-      switch p.token {
-      | _ =>
-        let typ = parseTypExpr(p)
-        let loc = mkLoc(expr.pexp_loc.loc_start, typ.ptyp_loc.loc_end)
-        let expr = Ast_helper.Exp.constraint_(~loc, expr, typ)
-        switch p.token {
-        | ColonGreaterThan => parseCoercedExpr(~expr, p)
-        | _ => expr
-        }
-      }
-    | _ => expr
-    }
-  }
-
-  and parseConstrainedExprRegion = p =>
-    switch p.Parser.token {
-    | token when Grammar.isExprStart(token) =>
-      let expr = parseExpr(p)
-      switch p.Parser.token {
-      | Colon =>
-        Parser.next(p)
-        let typ = parseTypExpr(p)
-        let loc = mkLoc(expr.pexp_loc.loc_start, typ.ptyp_loc.loc_end)
-        Some(Ast_helper.Exp.constraint_(~loc, expr, typ))
-      | _ => Some(expr)
-      }
-    | _ => None
-    }
-
-  /* Atomic expressions represent unambiguous expressions.
-   * This means that regardless of the context, these expressions
-   * are always interpreted correctly. */
-  and parseAtomicExpr = p => {
-    Parser.leaveBreadcrumb(p, Grammar.ExprOperand)
-    let startPos = p.Parser.startPos
-    let expr = switch p.Parser.token {
-    | (True | False) as token =>
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.construct(
-        ~loc,
-        Location.mkloc(Longident.Lident(Token.toString(token)), loc),
-        None,
-      )
-    | Int(_) | String(_) | Float(_) | Character(_) =>
-      let c = parseConstant(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.constant(~loc, c)
-    | Backtick =>
-      let expr = parseTemplateExpr(p)
-      {...expr, pexp_loc: mkLoc(startPos, p.prevEndPos)}
-    | Uident(_) | Lident(_) => parseValueOrConstructor(p)
-    | Hash => parsePolyVariantExpr(p)
-    | Lparen =>
-      Parser.next(p)
-      switch p.Parser.token {
-      | Rparen =>
-        Parser.next(p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Ast_helper.Exp.construct(~loc, Location.mkloc(Longident.Lident("()"), loc), None)
-      | _t =>
-        let expr = parseConstrainedOrCoercedExpr(p)
-        switch p.token {
-        | Comma =>
-          Parser.next(p)
-          parseTupleExpr(~startPos, ~first=expr, p)
-        | _ =>
-          Parser.expect(Rparen, p)
-          expr
-        /* {expr with pexp_loc = mkLoc startPos p.prevEndPos}
-         * What does this location mean here? It means that when there's
-         * a parenthesized we keep the location here for whitespace interleaving.
-         * Without the closing paren in the location there will always be an extra
-         * line. For now we don't include it, because it does weird things
-         * with for comments. */
-        }
-      }
-    | List =>
-      Parser.next(p)
-      switch p.token {
-      | Lbracket => parseListExpr(~startPos, p)
-      | _ =>
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Ast_helper.Exp.ident(~loc, Location.mkloc(Longident.Lident("list"), loc))
-      }
-    | Module =>
-      Parser.next(p)
-      parseFirstClassModuleExpr(~startPos, p)
-    | Lbracket => parseArrayExp(p)
-    | Lbrace => parseBracedOrRecordExpr(p)
-    | LessThan => parseJsx(p)
-    | Percent =>
-      let extension = parseExtension(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.extension(~loc, extension)
-    | Underscore as token =>
-      /* This case is for error recovery. Not sure if it's the correct place */
-      Parser.err(p, Diagnostics.lident(token))
-      Parser.next(p)
-      Recover.defaultExpr()
-    | token =>
-      let errPos = p.prevEndPos
-      switch skipTokensAndMaybeRetry(p, ~isStartOfGrammar=Grammar.isAtomicExprStart) {
-      | None =>
-        Parser.err(~startPos=errPos, p, Diagnostics.unexpected(token, p.breadcrumbs))
-        Recover.defaultExpr()
-      | Some() => parseAtomicExpr(p)
-      }
-    }
-
-    Parser.eatBreadcrumb(p)
-    expr
-  }
-
-  /* module(module-expr)
-   * module(module-expr : package-type) */
-  and parseFirstClassModuleExpr = (~startPos, p) => {
-    Parser.expect(Lparen, p)
-
-    let modExpr = parseModuleExpr(p)
-    let modEndLoc = p.prevEndPos
-    switch p.Parser.token {
-    | Colon =>
-      let colonStart = p.Parser.startPos
-      Parser.next(p)
-      let attrs = parseAttributes(p)
-      let packageType = parsePackageType(~startPos=colonStart, ~attrs, p)
-      Parser.expect(Rparen, p)
-      let loc = mkLoc(startPos, modEndLoc)
-      let firstClassModule = Ast_helper.Exp.pack(~loc, modExpr)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.constraint_(~loc, firstClassModule, packageType)
-    | _ =>
-      Parser.expect(Rparen, p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.pack(~loc, modExpr)
-    }
-  }
-
-  and parseBracketAccess = (p, expr, startPos) => {
-    Parser.leaveBreadcrumb(p, Grammar.ExprArrayAccess)
-    let lbracket = p.startPos
-    Parser.next(p)
-    let stringStart = p.startPos
-    switch p.Parser.token {
-    | String(s) =>
-      Parser.next(p)
-      let stringEnd = p.prevEndPos
-      Parser.expect(Rbracket, p)
-      let rbracket = p.prevEndPos
-      let e = {
-        let identLoc = mkLoc(stringStart, stringEnd)
-        let loc = mkLoc(lbracket, rbracket)
-        Ast_helper.Exp.apply(
-          ~loc,
-          Ast_helper.Exp.ident(~loc, Location.mkloc(Longident.Lident("##"), loc)),
-          list{
-            (Nolabel, expr),
-            (
-              Nolabel,
-              Ast_helper.Exp.ident(~loc=identLoc, Location.mkloc(Longident.Lident(s), identLoc)),
-            ),
-          },
-        )
-      }
-
-      let e = parsePrimaryExpr(~operand=e, p)
-      let equalStart = p.startPos
-      switch p.token {
-      | Equal =>
-        Parser.next(p)
-        let equalEnd = p.prevEndPos
-        let rhsExpr = parseExpr(p)
-        let loc = mkLoc(startPos, rhsExpr.pexp_loc.loc_end)
-        let operatorLoc = mkLoc(equalStart, equalEnd)
-        Ast_helper.Exp.apply(
-          ~loc,
-          Ast_helper.Exp.ident(
-            ~loc=operatorLoc,
-            Location.mkloc(Longident.Lident("#="), operatorLoc),
-          ),
-          list{(Nolabel, e), (Nolabel, rhsExpr)},
-        )
-      | _ => e
-      }
-    | _ =>
-      let accessExpr = parseConstrainedOrCoercedExpr(p)
-      Parser.expect(Rbracket, p)
-      let rbracket = p.prevEndPos
-      let arrayLoc = mkLoc(lbracket, rbracket)
-      switch p.token {
-      | Equal =>
-        Parser.leaveBreadcrumb(p, ExprArrayMutation)
-        Parser.next(p)
-        let rhsExpr = parseExpr(p)
-        let arraySet = Location.mkloc(Longident.Ldot(Lident("Array"), "set"), arrayLoc)
-
-        let endPos = p.prevEndPos
-        let arraySet = Ast_helper.Exp.apply(
-          ~loc=mkLoc(startPos, endPos),
-          Ast_helper.Exp.ident(~loc=arrayLoc, arraySet),
-          list{(Nolabel, expr), (Nolabel, accessExpr), (Nolabel, rhsExpr)},
-        )
-
-        Parser.eatBreadcrumb(p)
-        arraySet
-      | _ =>
-        let endPos = p.prevEndPos
-        let e = Ast_helper.Exp.apply(
-          ~loc=mkLoc(startPos, endPos),
-          Ast_helper.Exp.ident(
-            ~loc=arrayLoc,
-            Location.mkloc(Longident.Ldot(Lident("Array"), "get"), arrayLoc),
-          ),
-          list{(Nolabel, expr), (Nolabel, accessExpr)},
-        )
-
-        Parser.eatBreadcrumb(p)
-        parsePrimaryExpr(~operand=e, p)
-      }
-    }
-  }
-
-  /* * A primary expression represents
-   *  - atomic-expr
-   *  - john.age
-   *  - array[0]
-   *  - applyFunctionTo(arg1, arg2)
-   *
-   *  The "operand" represents the expression that is operated on
-   */
-  and parsePrimaryExpr = (~operand, ~noCall=false, p) => {
-    let startPos = operand.pexp_loc.loc_start
-    let rec loop = (p, expr) =>
-      switch p.Parser.token {
-      | Dot =>
-        Parser.next(p)
-        let lident = parseValuePath(p)
-        switch p.Parser.token {
-        | Equal when noCall == false =>
-          Parser.leaveBreadcrumb(p, Grammar.ExprSetField)
-          Parser.next(p)
-          let targetExpr = parseExpr(p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let setfield = Ast_helper.Exp.setfield(~loc, expr, lident, targetExpr)
-          Parser.eatBreadcrumb(p)
-          setfield
-        | _ =>
-          let endPos = p.prevEndPos
-          let loc = mkLoc(startPos, endPos)
-          loop(p, Ast_helper.Exp.field(~loc, expr, lident))
-        }
-      | Lbracket when noCall == false && p.prevEndPos.pos_lnum === p.startPos.pos_lnum =>
-        parseBracketAccess(p, expr, startPos)
-      | Lparen when noCall == false && p.prevEndPos.pos_lnum === p.startPos.pos_lnum =>
-        loop(p, parseCallExpr(p, expr))
-      | Backtick when noCall == false && p.prevEndPos.pos_lnum === p.startPos.pos_lnum =>
-        switch expr.pexp_desc {
-        | Pexp_ident({txt: Longident.Lident(ident)}) => parseTemplateExpr(~prefix=ident, p)
-        | _ =>
-          Parser.err(
-            ~startPos=expr.pexp_loc.loc_start,
-            ~endPos=expr.pexp_loc.loc_end,
-            p,
-            Diagnostics.message(
-              "Tagged template literals are currently restricted to identifiers like: json`null`.",
-            ),
-          )
-          parseTemplateExpr(p)
-        }
-      | _ => expr
-      }
-
-    loop(p, operand)
-  }
-
-  /* a unary expression is an expression with only one operand and
-   * unary operator. Examples:
-   *   -1
-   *   !condition
-   *   -. 1.6
-   */
-  and parseUnaryExpr = p => {
-    let startPos = p.Parser.startPos
-    switch p.Parser.token {
-    | (Minus | MinusDot | Plus | PlusDot | Bang) as token =>
-      Parser.leaveBreadcrumb(p, Grammar.ExprUnary)
-      let tokenEnd = p.endPos
-      Parser.next(p)
-      let operand = parseUnaryExpr(p)
-      let unaryExpr = makeUnaryExpr(startPos, tokenEnd, token, operand)
-      Parser.eatBreadcrumb(p)
-      unaryExpr
-    | _ => parsePrimaryExpr(~operand=parseAtomicExpr(p), p)
-    }
-  }
-
-  /* Represents an "operand" in a binary expression.
-   * If you have `a + b`, `a` and `b` both represent
-   * the operands of the binary expression with opeartor `+` */
-  and parseOperandExpr = (~context, p) => {
-    let startPos = p.Parser.startPos
-    let attrs = parseAttributes(p)
-    let expr = switch p.Parser.token {
-    | Assert =>
-      Parser.next(p)
-      let expr = parseUnaryExpr(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.assert_(~loc, expr)
-    | Lazy =>
-      Parser.next(p)
-      let expr = parseUnaryExpr(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.lazy_(~loc, expr)
-    | Try => parseTryExpression(p)
-    | If => parseIfExpression(p)
-    | For => parseForExpression(p)
-    | While => parseWhileExpression(p)
-    | Switch => parseSwitchExpression(p)
-    | _ =>
-      if (
-        context !== WhenExpr && isEs6ArrowExpression(~inTernary=context == TernaryTrueBranchExpr, p)
-      ) {
-        parseEs6ArrowExpression(p)
-      } else {
-        parseUnaryExpr(p)
-      }
-    }
-
-    /* let endPos = p.Parser.prevEndPos in */
-    {
-      ...expr,
-      pexp_attributes: List.concat(list{expr.Parsetree.pexp_attributes, attrs}),
-      /* pexp_loc = mkLoc startPos endPos */
-    }
-  }
-
-  /* a binary expression is an expression that combines two expressions with an
-   * operator. Examples:
-   *    a + b
-   *    f(x) |> g(y)
-   */
-  and parseBinaryExpr = (~context=OrdinaryExpr, ~a=?, p, prec) => {
-    let a = switch a {
-    | Some(e) => e
-    | None => parseOperandExpr(~context, p)
-    }
-
-    let rec loop = a => {
-      let token = p.Parser.token
-      let tokenPrec = switch token {
-      /* Can the minus be interpreted as a binary operator? Or is it a unary?
-       * let w = {
-       *   x
-       *   -10
-       * }
-       * vs
-       * let w = {
-       *   width
-       *   - gap
-       * }
-       *
-       * First case is unary, second is a binary operator.
-       * See Scanner.isBinaryOp */
-      | Minus | MinusDot | LessThan
-        when !Scanner.isBinaryOp(p.scanner.src, p.startPos.pos_cnum, p.endPos.pos_cnum) &&
-        p.startPos.pos_lnum > p.prevEndPos.pos_lnum => -1
-      | token => Token.precedence(token)
-      }
-
-      if tokenPrec < prec {
-        a
-      } else {
-        Parser.leaveBreadcrumb(p, Grammar.ExprBinaryAfterOp(token))
-        let startPos = p.startPos
-        Parser.next(p)
-        let endPos = p.prevEndPos
-        let b = parseBinaryExpr(~context, p, tokenPrec + 1)
-        let loc = mkLoc(a.Parsetree.pexp_loc.loc_start, b.pexp_loc.loc_end)
-        let expr = Ast_helper.Exp.apply(
-          ~loc,
-          makeInfixOperator(p, token, startPos, endPos),
-          list{(Nolabel, a), (Nolabel, b)},
-        )
-
-        loop(expr)
-      }
-    }
-
-    loop(a)
-  }
-
-  /* If we even need this, determines if < might be the start of jsx. Not 100% complete */
-  /* and isStartOfJsx p = */
-  /* Parser.lookahead p (fun p -> */
-  /* match p.Parser.token with */
-  /* | LessThan -> */
-  /* Parser.next p; */
-  /* begin match p.token with */
-  /* | GreaterThan (* <> *) -> true */
-  /* | Lident _ | Uident _ | List -> */
-  /* ignore (parseJsxName p); */
-  /* begin match p.token with */
-  /* | GreaterThan (* <div> *) -> true */
-  /* | Question (*<Component ? *) -> true */
-  /* | Lident _ | List -> */
-  /* Parser.next p; */
-  /* begin match p.token with */
-  /* | Equal (* <Component handleClick= *) -> true */
-  /* | _ -> false (* TODO *) */
-  /* end */
-  /* | Forwardslash (* <Component / *)-> */
-  /* Parser.next p; */
-  /* begin match p.token with */
-  /* | GreaterThan (* <Component /> *) -> true */
-  /* | _ -> false */
-  /* end */
-  /* | _ -> */
-  /* false */
-  /* end */
-  /* | _ -> false */
-  /* end */
-  /* | _ -> false */
-  /* ) */
-
-  and parseTemplateExpr = (~prefix="", p) => {
-    let hiddenOperator = {
-      let op = Location.mknoloc(Longident.Lident("^"))
-      Ast_helper.Exp.ident(op)
-    }
-
-    let rec loop = (acc, p) => {
-      let startPos = p.Parser.startPos
-      switch p.Parser.token {
-      | TemplateTail(txt) =>
-        Parser.next(p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        if String.length(txt) > 0 {
-          let txt = if p.mode == ParseForTypeChecker {
-            parseTemplateStringLiteral(txt)
-          } else {
-            txt
-          }
-          let str = Ast_helper.Exp.constant(~loc, Pconst_string(txt, Some(prefix)))
-          Ast_helper.Exp.apply(~loc, hiddenOperator, list{(Nolabel, acc), (Nolabel, str)})
-        } else {
-          acc
-        }
-      | TemplatePart(txt) =>
-        Parser.next(p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        let expr = parseExprBlock(p)
-        let fullLoc = mkLoc(startPos, p.prevEndPos)
-        Scanner.setTemplateMode(p.scanner)
-        Parser.expect(Rbrace, p)
-        let txt = if p.mode == ParseForTypeChecker {
-          parseTemplateStringLiteral(txt)
-        } else {
-          txt
-        }
-        let str = Ast_helper.Exp.constant(~loc, Pconst_string(txt, Some(prefix)))
-        let next = {
-          let a = if String.length(txt) > 0 {
-            Ast_helper.Exp.apply(~loc=fullLoc, hiddenOperator, list{(Nolabel, acc), (Nolabel, str)})
-          } else {
-            acc
-          }
-
-          Ast_helper.Exp.apply(~loc=fullLoc, hiddenOperator, list{(Nolabel, a), (Nolabel, expr)})
-        }
-
-        loop(next, p)
-      | token =>
-        Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-        acc
-      }
-    }
-
-    Scanner.setTemplateMode(p.scanner)
-    Parser.expect(Backtick, p)
-    let startPos = p.Parser.startPos
-    switch p.Parser.token {
-    | TemplateTail(txt) =>
-      let loc = mkLoc(startPos, p.endPos)
-      Parser.next(p)
-      let txt = if p.mode == ParseForTypeChecker {
-        parseTemplateStringLiteral(txt)
-      } else {
-        txt
-      }
-      Ast_helper.Exp.constant(~loc, Pconst_string(txt, Some(prefix)))
-    | TemplatePart(txt) =>
-      let constantLoc = mkLoc(startPos, p.endPos)
-      Parser.next(p)
-      let expr = parseExprBlock(p)
-      let fullLoc = mkLoc(startPos, p.prevEndPos)
-      Scanner.setTemplateMode(p.scanner)
-      Parser.expect(Rbrace, p)
-      let txt = if p.mode == ParseForTypeChecker {
-        parseTemplateStringLiteral(txt)
-      } else {
-        txt
-      }
-      let str = Ast_helper.Exp.constant(~loc=constantLoc, Pconst_string(txt, Some(prefix)))
-      let next = if String.length(txt) > 0 {
-        Ast_helper.Exp.apply(~loc=fullLoc, hiddenOperator, list{(Nolabel, str), (Nolabel, expr)})
-      } else {
-        expr
-      }
-
-      loop(next, p)
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      Ast_helper.Exp.constant(Pconst_string("", None))
-    }
-  }
-
-  /* Overparse: let f = a : int => a + 1, is it (a : int) => or (a): int =>
-   * Also overparse constraints:
-   *  let x = {
-   *    let a = 1
-   *    a + pi: int
-   *  }
-   *
-   *  We want to give a nice error message in these cases
-   * */
-  and overParseConstrainedOrCoercedOrArrowExpression = (p, expr) =>
-    switch p.Parser.token {
-    | ColonGreaterThan => parseCoercedExpr(~expr, p)
-    | Colon =>
-      Parser.next(p)
-      let typ = parseTypExpr(~es6Arrow=false, p)
-      switch p.Parser.token {
-      | EqualGreater =>
-        Parser.next(p)
-        let body = parseExpr(p)
-        let pat = switch expr.pexp_desc {
-        | Pexp_ident(longident) =>
-          Ast_helper.Pat.var(
-            ~loc=expr.pexp_loc,
-            Location.mkloc(Longident.flatten(longident.txt) |> String.concat("."), longident.loc),
-          )
-        /* TODO: can we convert more expressions to patterns? */
-        | _ => Ast_helper.Pat.var(~loc=expr.pexp_loc, Location.mkloc("pattern", expr.pexp_loc))
-        }
-
-        let arrow1 = Ast_helper.Exp.fun_(
-          ~loc=mkLoc(expr.pexp_loc.loc_start, body.pexp_loc.loc_end),
-          Asttypes.Nolabel,
-          None,
-          pat,
-          Ast_helper.Exp.constraint_(body, typ),
-        )
-
-        let arrow2 = Ast_helper.Exp.fun_(
-          ~loc=mkLoc(expr.pexp_loc.loc_start, body.pexp_loc.loc_end),
-          Asttypes.Nolabel,
-          None,
-          Ast_helper.Pat.constraint_(pat, typ),
-          body,
-        )
-
-        let msg =
-          Doc.breakableGroup(
-            ~forceBreak=true,
-            Doc.concat(list{
-              Doc.text("Did you mean to annotate the parameter type or the return type?"),
-              Doc.indent(
-                Doc.concat(list{
-                  Doc.line,
-                  Doc.text("1) "),
-                  Printer.printExpression(arrow1, CommentTable.empty),
-                  Doc.line,
-                  Doc.text("2) "),
-                  Printer.printExpression(arrow2, CommentTable.empty),
-                }),
-              ),
-            }),
-          ) |> Doc.toString(~width=80)
-
-        Parser.err(
-          ~startPos=expr.pexp_loc.loc_start,
-          ~endPos=body.pexp_loc.loc_end,
-          p,
-          Diagnostics.message(msg),
-        )
-        arrow1
-      | _ =>
-        open Parsetree
-        let loc = mkLoc(expr.pexp_loc.loc_start, typ.ptyp_loc.loc_end)
-        let expr = Ast_helper.Exp.constraint_(~loc, expr, typ)
-        let () = Parser.err(
-          ~startPos=expr.pexp_loc.loc_start,
-          ~endPos=typ.ptyp_loc.loc_end,
-          p,
-          Diagnostics.message(
-            Doc.breakableGroup(
-              ~forceBreak=true,
-              Doc.concat(list{
-                Doc.text("Expressions with type constraints need to be wrapped in parens:"),
-                Doc.indent(
-                  Doc.concat(list{
-                    Doc.line,
-                    Printer.addParens(Printer.printExpression(expr, CommentTable.empty)),
-                  }),
-                ),
-              }),
-            ) |> Doc.toString(~width=80),
-          ),
-        )
-
-        expr
-      }
-    | _ => expr
-    }
-
-  and parseLetBindingBody = (~startPos, ~attrs, p) => {
-    Parser.beginRegion(p)
-    Parser.leaveBreadcrumb(p, Grammar.LetBinding)
-    let (pat, exp) = {
-      let pat = parsePattern(p)
-      switch p.Parser.token {
-      | Colon =>
-        Parser.next(p)
-        switch p.token {
-        | Typ =>
-          /* locally abstract types */
-          Parser.next(p)
-          let newtypes = parseLidentList(p)
-          Parser.expect(Dot, p)
-          let typ = parseTypExpr(p)
-          Parser.expect(Equal, p)
-          let expr = parseExpr(p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let (exp, poly) = wrapTypeAnnotation(~loc, newtypes, typ, expr)
-          let pat = Ast_helper.Pat.constraint_(~loc, pat, poly)
-          (pat, exp)
-        | _ =>
-          let polyType = parsePolyTypeExpr(p)
-          let loc = {...pat.ppat_loc, loc_end: polyType.Parsetree.ptyp_loc.loc_end}
-          let pat = Ast_helper.Pat.constraint_(~loc, pat, polyType)
-          Parser.expect(Token.Equal, p)
-          let exp = parseExpr(p)
-          let exp = overParseConstrainedOrCoercedOrArrowExpression(p, exp)
-          (pat, exp)
-        }
-      | _ =>
-        Parser.expect(Token.Equal, p)
-        let exp = overParseConstrainedOrCoercedOrArrowExpression(p, parseExpr(p))
-        (pat, exp)
-      }
-    }
-
-    let loc = mkLoc(startPos, p.prevEndPos)
-    let vb = Ast_helper.Vb.mk(~loc, ~attrs, pat, exp)
-    Parser.eatBreadcrumb(p)
-    Parser.endRegion(p)
-    vb
-  }
-
-  /* TODO: find a better way? Is it possible?
-   * let a = 1
-   * @attr
-   * and b = 2
-   *
-   * The problem is that without semi we need a lookahead to determine
-   * if the attr is on the letbinding or the start of a new thing
-   *
-   * let a = 1
-   * @attr
-   * let b = 1
-   *
-   * Here @attr should attach to something "new": `let b = 1`
-   * The parser state is forked, which is quite expensive…
-   */
-  and parseAttributesAndBinding = (p: Parser.t) => {
-    let err = p.scanner.err
-    let ch = p.scanner.ch
-    let offset = p.scanner.offset
-    let rdOffset = p.scanner.rdOffset
-    let lineOffset = p.scanner.lineOffset
-    let lnum = p.scanner.lnum
-    let mode = p.scanner.mode
-    let token = p.token
-    let startPos = p.startPos
-    let endPos = p.endPos
-    let prevEndPos = p.prevEndPos
-    let breadcrumbs = p.breadcrumbs
-    let errors = p.errors
-    let diagnostics = p.diagnostics
-    let comments = p.comments
-
-    switch p.Parser.token {
-    | At =>
-      let attrs = parseAttributes(p)
-      switch p.Parser.token {
-      | And => attrs
-      | _ =>
-        p.scanner.err = err
-        p.scanner.ch = ch
-        p.scanner.offset = offset
-        p.scanner.rdOffset = rdOffset
-        p.scanner.lineOffset = lineOffset
-        p.scanner.lnum = lnum
-        p.scanner.mode = mode
-        p.token = token
-        p.startPos = startPos
-        p.endPos = endPos
-        p.prevEndPos = prevEndPos
-        p.breadcrumbs = breadcrumbs
-        p.errors = errors
-        p.diagnostics = diagnostics
-        p.comments = comments
-        list{}
-      }
-    | _ => list{}
-    }
-  }
-
-  /* definition	::=	let [rec] let-binding  { and let-binding } */
-  and parseLetBindings = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    Parser.optional(p, Let) |> ignore
-    let recFlag = if Parser.optional(p, Token.Rec) {
-      Asttypes.Recursive
-    } else {
-      Asttypes.Nonrecursive
-    }
-
-    let first = parseLetBindingBody(~startPos, ~attrs, p)
-
-    let rec loop = (p, bindings) => {
-      let startPos = p.Parser.startPos
-      let attrs = parseAttributesAndBinding(p)
-      switch p.Parser.token {
-      | And =>
-        Parser.next(p)
-        let attrs = switch p.token {
-        | Export =>
-          let exportLoc = mkLoc(p.startPos, p.endPos)
-          Parser.next(p)
-          let genTypeAttr = (Location.mkloc("genType", exportLoc), Parsetree.PStr(list{}))
-          list{genTypeAttr, ...attrs}
-        | _ => attrs
-        }
-
-        ignore(Parser.optional(p, Let)) /* overparse for fault tolerance */
-        let letBinding = parseLetBindingBody(~startPos, ~attrs, p)
-        loop(p, list{letBinding, ...bindings})
-      | _ => List.rev(bindings)
-      }
-    }
-
-    (recFlag, loop(p, list{first}))
-  }
-
-  /*
-   * div -> div
-   * Foo -> Foo.createElement
-   * Foo.Bar -> Foo.Bar.createElement
-   */
-  and parseJsxName = p => {
-    let longident = switch p.Parser.token {
-    | Lident(ident) =>
-      let identStart = p.startPos
-      let identEnd = p.endPos
-      Parser.next(p)
-      let loc = mkLoc(identStart, identEnd)
-      Location.mkloc(Longident.Lident(ident), loc)
-    | Uident(_) =>
-      let longident = parseModuleLongIdent(~lowercase=false, p)
-      Location.mkloc(Longident.Ldot(longident.txt, "createElement"), longident.loc)
-    | _ =>
-      let msg = "A jsx name should start with a lowercase or uppercase identifier, like: div in <div /> or Navbar in <Navbar />"
-
-      Parser.err(p, Diagnostics.message(msg))
-      Location.mknoloc(Longident.Lident("_"))
-    }
-
-    Ast_helper.Exp.ident(~loc=longident.loc, longident)
-  }
-
-  and parseJsxOpeningOrSelfClosingElement = (~startPos, p) => {
-    let jsxStartPos = p.Parser.startPos
-    let name = parseJsxName(p)
-    let jsxProps = parseJsxProps(p)
-    let children = switch p.Parser.token {
-    | Forwardslash =>
-      /* <foo a=b /> */
-      let childrenStartPos = p.Parser.startPos
-      Parser.next(p)
-      let childrenEndPos = p.Parser.startPos
-      Parser.expect(GreaterThan, p)
-      let loc = mkLoc(childrenStartPos, childrenEndPos)
-      makeListExpression(loc, list{}, None) /* no children */
-    | GreaterThan =>
-      /* <foo a=b> bar </foo> */
-      let childrenStartPos = p.Parser.startPos
-      Scanner.setJsxMode(p.scanner)
-      Parser.next(p)
-      let (spread, children) = parseJsxChildren(p)
-      let childrenEndPos = p.Parser.startPos
-      let () = switch p.token {
-      | LessThanSlash => Parser.next(p)
-      | LessThan =>
-        Parser.next(p)
-        Parser.expect(Forwardslash, p)
-      | token when Grammar.isStructureItemStart(token) => ()
-      | _ => Parser.expect(LessThanSlash, p)
-      }
-
-      switch p.Parser.token {
-      | Lident(_) | Uident(_) when verifyJsxOpeningClosingName(p, name) =>
-        Parser.expect(GreaterThan, p)
-        let loc = mkLoc(childrenStartPos, childrenEndPos)
-        switch (spread, children) {
-        | (true, list{child, ..._}) => child
-        | _ => makeListExpression(loc, children, None)
-        }
-      | token =>
-        let () = if Grammar.isStructureItemStart(token) {
-          let closing = "</" ++ (string_of_pexp_ident(name) ++ ">")
-          let msg = Diagnostics.message("Missing " ++ closing)
-          Parser.err(~startPos, ~endPos=p.prevEndPos, p, msg)
-        } else {
-          let opening = "</" ++ (string_of_pexp_ident(name) ++ ">")
-          let msg =
-            "Closing jsx name should be the same as the opening name. Did you mean " ++
-            (opening ++
-            " ?")
-          Parser.err(~startPos, ~endPos=p.prevEndPos, p, Diagnostics.message(msg))
-          Parser.expect(GreaterThan, p)
-        }
-
-        let loc = mkLoc(childrenStartPos, childrenEndPos)
-        switch (spread, children) {
-        | (true, list{child, ..._}) => child
-        | _ => makeListExpression(loc, children, None)
-        }
-      }
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      makeListExpression(Location.none, list{}, None)
-    }
-
-    let jsxEndPos = p.prevEndPos
-    let loc = mkLoc(jsxStartPos, jsxEndPos)
-    Ast_helper.Exp.apply(
-      ~loc,
-      name,
-      List.concat(list{
-        jsxProps,
-        list{
-          (Asttypes.Labelled("children"), children),
-          (
-            Asttypes.Nolabel,
-            Ast_helper.Exp.construct(Location.mknoloc(Longident.Lident("()")), None),
-          ),
-        },
-      }),
-    )
-  }
-
-  /*
-   *  jsx ::=
-   *    | <> jsx-children </>
-   *    | <element-name {jsx-prop} />
-   *    | <element-name {jsx-prop}> jsx-children </element-name>
-   *
-   *  jsx-children ::= primary-expr*          * => 0 or more
-   */
-  and parseJsx = p => {
-    Parser.leaveBreadcrumb(p, Grammar.Jsx)
-    let startPos = p.Parser.startPos
-    Parser.expect(LessThan, p)
-    let jsxExpr = switch p.Parser.token {
-    | Lident(_) | Uident(_) => parseJsxOpeningOrSelfClosingElement(~startPos, p)
-    | GreaterThan =>
-      /* fragment: <> foo </> */
-      parseJsxFragment(p)
-    | _ => parseJsxName(p)
-    }
-
-    {...jsxExpr, pexp_attributes: list{jsxAttr}}
-  }
-
-  /*
-   * jsx-fragment ::=
-   *  | <> </>
-   *  | <> jsx-children </>
-   */
-  and parseJsxFragment = p => {
-    let childrenStartPos = p.Parser.startPos
-    Scanner.setJsxMode(p.scanner)
-    Parser.expect(GreaterThan, p)
-    let (_spread, children) = parseJsxChildren(p)
-    let childrenEndPos = p.Parser.startPos
-    Parser.expect(LessThanSlash, p)
-    Parser.expect(GreaterThan, p)
-    let loc = mkLoc(childrenStartPos, childrenEndPos)
-    makeListExpression(loc, children, None)
-  }
-
-  /*
-   * jsx-prop ::=
-   *   |  lident
-   *   | ?lident
-   *   |  lident =  jsx_expr
-   *   |  lident = ?jsx_expr
-   */
-  and parseJsxProp = p => {
-    Parser.leaveBreadcrumb(p, Grammar.JsxAttribute)
-    switch p.Parser.token {
-    | Question | Lident(_) =>
-      let optional = Parser.optional(p, Question)
-      let (name, loc) = parseLident(p)
-      let propLocAttr = (Location.mkloc("res.namedArgLoc", loc), Parsetree.PStr(list{}))
-      /* optional punning: <foo ?a /> */
-      if optional {
-        Some(
-          Asttypes.Optional(name),
-          Ast_helper.Exp.ident(
-            ~attrs=list{propLocAttr},
-            ~loc,
-            Location.mkloc(Longident.Lident(name), loc),
-          ),
-        )
-      } else {
-        switch p.Parser.token {
-        | Equal =>
-          Parser.next(p)
-          /* no punning */
-          let optional = Parser.optional(p, Question)
-          let attrExpr = {
-            let e = parsePrimaryExpr(~operand=parseAtomicExpr(p), p)
-            {...e, pexp_attributes: list{propLocAttr, ...e.pexp_attributes}}
-          }
-
-          let label = if optional {
-            Asttypes.Optional(name)
-          } else {
-            Asttypes.Labelled(name)
-          }
-
-          Some(label, attrExpr)
-        | _ =>
-          let attrExpr = Ast_helper.Exp.ident(
-            ~loc,
-            ~attrs=list{propLocAttr},
-            Location.mknoloc(Longident.Lident(name)),
-          )
-          let label = if optional {
-            Asttypes.Optional(name)
-          } else {
-            Asttypes.Labelled(name)
-          }
-
-          Some(label, attrExpr)
-        }
-      }
-    | _ => None
-    }
-  }
-
-  and parseJsxProps = p => parseRegion(~grammar=Grammar.JsxAttribute, ~f=parseJsxProp, p)
-
-  and parseJsxChildren = p => {
-    let rec loop = (p, children) =>
-      switch p.Parser.token {
-      | Token.Eof | LessThanSlash =>
-        Scanner.popMode(p.scanner, Jsx)
-        List.rev(children)
-      | LessThan =>
-        /* Imagine: <div> <Navbar /> <
-         * is `<` the start of a jsx-child? <div …
-         * or is it the start of a closing tag?  </div>
-         * reconsiderLessThan peeks at the next token and
-         * determines the correct token to disambiguate */
-        let token = Scanner.reconsiderLessThan(p.scanner)
-        if token == LessThan {
-          let child = parsePrimaryExpr(~operand=parseAtomicExpr(p), ~noCall=true, p)
-          loop(p, list{child, ...children})
-        } else {
-          /* LessThanSlash */
-          let () = p.token = token
-          let () = Scanner.popMode(p.scanner, Jsx)
-          List.rev(children)
-        }
-      | token when Grammar.isJsxChildStart(token) =>
-        let () = Scanner.popMode(p.scanner, Jsx)
-        let child = parsePrimaryExpr(~operand=parseAtomicExpr(p), ~noCall=true, p)
-        loop(p, list{child, ...children})
-      | _ =>
-        Scanner.popMode(p.scanner, Jsx)
-        List.rev(children)
-      }
-
-    switch p.Parser.token {
-    | DotDotDot =>
-      Parser.next(p)
-      (true, list{parsePrimaryExpr(~operand=parseAtomicExpr(p), ~noCall=true, p)})
-    | _ => (false, loop(p, list{}))
-    }
-  }
-
-  and parseBracedOrRecordExpr = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Lbrace, p)
-    switch p.Parser.token {
-    | Rbrace =>
-      Parser.err(p, Diagnostics.unexpected(Rbrace, p.breadcrumbs))
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      let braces = makeBracesAttr(loc)
-      Ast_helper.Exp.construct(
-        ~attrs=list{braces},
-        ~loc,
-        Location.mkloc(Longident.Lident("()"), loc),
-        None,
-      )
-    | DotDotDot =>
-      /* beginning of record spread, parse record */
-      Parser.next(p)
-      let spreadExpr = parseConstrainedOrCoercedExpr(p)
-      Parser.expect(Comma, p)
-      let expr = parseRecordExpr(~startPos, ~spread=Some(spreadExpr), list{}, p)
-      Parser.expect(Rbrace, p)
-      expr
-    | String(s) =>
-      let field = {
-        let loc = mkLoc(p.startPos, p.endPos)
-        Parser.next(p)
-        Location.mkloc(Longident.Lident(s), loc)
-      }
-
-      switch p.Parser.token {
-      | Colon =>
-        Parser.next(p)
-        let fieldExpr = parseExpr(p)
-        Parser.optional(p, Comma) |> ignore
-        let expr = parseRecordExprWithStringKeys(~startPos, (field, fieldExpr), p)
-        Parser.expect(Rbrace, p)
-        expr
-      | _ =>
-        let constant = Ast_helper.Exp.constant(~loc=field.loc, Parsetree.Pconst_string(s, None))
-        let a = parsePrimaryExpr(~operand=constant, p)
-        let e = parseBinaryExpr(~a, p, 1)
-        let e = parseTernaryExpr(e, p)
-        switch p.Parser.token {
-        | Semicolon =>
-          Parser.next(p)
-          let expr = parseExprBlock(~first=e, p)
-          Parser.expect(Rbrace, p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let braces = makeBracesAttr(loc)
-          {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-        | Rbrace =>
-          Parser.next(p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let braces = makeBracesAttr(loc)
-          {...e, pexp_attributes: list{braces, ...e.pexp_attributes}}
-        | _ =>
-          let expr = parseExprBlock(~first=e, p)
-          Parser.expect(Rbrace, p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let braces = makeBracesAttr(loc)
-          {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-        }
-      }
-    | Uident(_) | Lident(_) =>
-      let valueOrConstructor = parseValueOrConstructor(p)
-      switch valueOrConstructor.pexp_desc {
-      | Pexp_ident(pathIdent) =>
-        let identEndPos = p.prevEndPos
-        switch p.Parser.token {
-        | Comma =>
-          Parser.next(p)
-          let expr = parseRecordExpr(~startPos, list{(pathIdent, valueOrConstructor)}, p)
-          Parser.expect(Rbrace, p)
-          expr
-        | Colon =>
-          Parser.next(p)
-          let fieldExpr = parseExpr(p)
-          switch p.token {
-          | Rbrace =>
-            Parser.next(p)
-            let loc = mkLoc(startPos, p.prevEndPos)
-            Ast_helper.Exp.record(~loc, list{(pathIdent, fieldExpr)}, None)
-          | _ =>
-            Parser.expect(Comma, p)
-            let expr = parseRecordExpr(~startPos, list{(pathIdent, fieldExpr)}, p)
-            Parser.expect(Rbrace, p)
-            expr
-          }
-        /* error case */
-        | Lident(_) =>
-          if p.prevEndPos.pos_lnum < p.startPos.pos_lnum {
-            Parser.expect(Comma, p)
-            let expr = parseRecordExpr(~startPos, list{(pathIdent, valueOrConstructor)}, p)
-            Parser.expect(Rbrace, p)
-            expr
-          } else {
-            Parser.expect(Colon, p)
-            let expr = parseRecordExpr(~startPos, list{(pathIdent, valueOrConstructor)}, p)
-            Parser.expect(Rbrace, p)
-            expr
-          }
-        | Semicolon =>
-          Parser.next(p)
-          let expr = parseExprBlock(~first=Ast_helper.Exp.ident(pathIdent), p)
-          Parser.expect(Rbrace, p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let braces = makeBracesAttr(loc)
-          {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-        | Rbrace =>
-          Parser.next(p)
-          let expr = Ast_helper.Exp.ident(~loc=pathIdent.loc, pathIdent)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let braces = makeBracesAttr(loc)
-          {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-        | EqualGreater =>
-          let loc = mkLoc(startPos, identEndPos)
-          let ident = Location.mkloc(Longident.last(pathIdent.txt), loc)
-          let a = parseEs6ArrowExpression(
-            ~parameters=list{
-              TermParameter({
-                uncurried: false,
-                attrs: list{},
-                label: Asttypes.Nolabel,
-                expr: None,
-                pat: Ast_helper.Pat.var(ident),
-                pos: startPos,
-              }),
-            },
-            p,
-          )
-
-          let e = parseBinaryExpr(~a, p, 1)
-          let e = parseTernaryExpr(e, p)
-          switch p.Parser.token {
-          | Semicolon =>
-            Parser.next(p)
-            let expr = parseExprBlock(~first=e, p)
-            Parser.expect(Rbrace, p)
-            let loc = mkLoc(startPos, p.prevEndPos)
-            let braces = makeBracesAttr(loc)
-            {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-          | Rbrace =>
-            Parser.next(p)
-            let loc = mkLoc(startPos, p.prevEndPos)
-            let braces = makeBracesAttr(loc)
-            {...e, pexp_attributes: list{braces, ...e.pexp_attributes}}
-          | _ =>
-            let expr = parseExprBlock(~first=e, p)
-            Parser.expect(Rbrace, p)
-            let loc = mkLoc(startPos, p.prevEndPos)
-            let braces = makeBracesAttr(loc)
-            {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-          }
-        | _ =>
-          Parser.leaveBreadcrumb(p, Grammar.ExprBlock)
-          let a = parsePrimaryExpr(~operand=Ast_helper.Exp.ident(~loc=pathIdent.loc, pathIdent), p)
-          let e = parseBinaryExpr(~a, p, 1)
-          let e = parseTernaryExpr(e, p)
-          Parser.eatBreadcrumb(p)
-          switch p.Parser.token {
-          | Semicolon =>
-            Parser.next(p)
-            let expr = parseExprBlock(~first=e, p)
-            Parser.expect(Rbrace, p)
-            let loc = mkLoc(startPos, p.prevEndPos)
-            let braces = makeBracesAttr(loc)
-            {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-          | Rbrace =>
-            Parser.next(p)
-            let loc = mkLoc(startPos, p.prevEndPos)
-            let braces = makeBracesAttr(loc)
-            {...e, pexp_attributes: list{braces, ...e.pexp_attributes}}
-          | _ =>
-            let expr = parseExprBlock(~first=e, p)
-            Parser.expect(Rbrace, p)
-            let loc = mkLoc(startPos, p.prevEndPos)
-            let braces = makeBracesAttr(loc)
-            {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-          }
-        }
-      | _ =>
-        Parser.leaveBreadcrumb(p, Grammar.ExprBlock)
-        let a = parsePrimaryExpr(~operand=valueOrConstructor, p)
-        let e = parseBinaryExpr(~a, p, 1)
-        let e = parseTernaryExpr(e, p)
-        Parser.eatBreadcrumb(p)
-        switch p.Parser.token {
-        | Semicolon =>
-          Parser.next(p)
-          let expr = parseExprBlock(~first=e, p)
-          Parser.expect(Rbrace, p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let braces = makeBracesAttr(loc)
-          {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-        | Rbrace =>
-          Parser.next(p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let braces = makeBracesAttr(loc)
-          {...e, pexp_attributes: list{braces, ...e.pexp_attributes}}
-        | _ =>
-          let expr = parseExprBlock(~first=e, p)
-          Parser.expect(Rbrace, p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let braces = makeBracesAttr(loc)
-          {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-        }
-      }
-    | _ =>
-      let expr = parseExprBlock(p)
-      Parser.expect(Rbrace, p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      let braces = makeBracesAttr(loc)
-      {...expr, pexp_attributes: list{braces, ...expr.pexp_attributes}}
-    }
-  }
-
-  and parseRecordRowWithStringKey = p =>
-    switch p.Parser.token {
-    | String(s) =>
-      let loc = mkLoc(p.startPos, p.endPos)
-      Parser.next(p)
-      let field = Location.mkloc(Longident.Lident(s), loc)
-      switch p.Parser.token {
-      | Colon =>
-        Parser.next(p)
-        let fieldExpr = parseExpr(p)
-        Some(field, fieldExpr)
-      | _ => Some(field, Ast_helper.Exp.ident(~loc=field.loc, field))
-      }
-    | _ => None
-    }
-
-  and parseRecordRow = p => {
-    let () = switch p.Parser.token {
-    | Token.DotDotDot =>
-      Parser.err(p, Diagnostics.message(ErrorMessages.recordExprSpread))
-      Parser.next(p)
-    | _ => ()
-    }
-
-    switch p.Parser.token {
-    | Lident(_) | Uident(_) | List =>
-      let field = parseValuePath(p)
-      switch p.Parser.token {
-      | Colon =>
-        Parser.next(p)
-        let fieldExpr = parseExpr(p)
-        Some(field, fieldExpr)
-      | _ => Some(field, Ast_helper.Exp.ident(~loc=field.loc, field))
-      }
-    | _ => None
-    }
-  }
-
-  and parseRecordExprWithStringKeys = (~startPos, firstRow, p) => {
-    let rows = list{
-      firstRow,
-      ...parseCommaDelimitedRegion(
-        ~grammar=Grammar.RecordRowsStringKey,
-        ~closing=Rbrace,
-        ~f=parseRecordRowWithStringKey,
-        p,
-      ),
-    }
-    let loc = mkLoc(startPos, p.endPos)
-    let recordStrExpr = Ast_helper.Str.eval(~loc, Ast_helper.Exp.record(~loc, rows, None))
-    Ast_helper.Exp.extension(
-      ~loc,
-      (Location.mkloc("bs.obj", loc), Parsetree.PStr(list{recordStrExpr})),
-    )
-  }
-
-  and parseRecordExpr = (~startPos, ~spread=None, rows, p) => {
-    let exprs = parseCommaDelimitedRegion(
-      ~grammar=Grammar.RecordRows,
-      ~closing=Rbrace,
-      ~f=parseRecordRow,
-      p,
-    )
-
-    let rows = List.concat(list{rows, exprs})
-    let () = switch rows {
-    | list{} =>
-      let msg = "Record spread needs at least one field that's updated"
-      Parser.err(p, Diagnostics.message(msg))
-    | _rows => ()
-    }
-
-    let loc = mkLoc(startPos, p.endPos)
-    Ast_helper.Exp.record(~loc, rows, spread)
-  }
-
-  and parseExprBlockItem = p => {
-    let startPos = p.Parser.startPos
-    let attrs = parseAttributes(p)
-    switch p.Parser.token {
-    | Module =>
-      Parser.next(p)
-      switch p.token {
-      | Lparen => parseFirstClassModuleExpr(~startPos, p)
-      | _ =>
-        let name = switch p.Parser.token {
-        | Uident(ident) =>
-          let loc = mkLoc(p.startPos, p.endPos)
-          Parser.next(p)
-          Location.mkloc(ident, loc)
-        | t =>
-          Parser.err(p, Diagnostics.uident(t))
-          Location.mknoloc("_")
-        }
-
-        let body = parseModuleBindingBody(p)
-        Parser.optional(p, Semicolon) |> ignore
-        let expr = parseExprBlock(p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Ast_helper.Exp.letmodule(~loc, name, body, expr)
-      }
-    | Exception =>
-      let extensionConstructor = parseExceptionDef(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let blockExpr = parseExprBlock(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.letexception(~loc, extensionConstructor, blockExpr)
-    | Open =>
-      let od = parseOpenDescription(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let blockExpr = parseExprBlock(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.open_(~loc, od.popen_override, od.popen_lid, blockExpr)
-    | Let =>
-      let (recFlag, letBindings) = parseLetBindings(~attrs, p)
-      let next = switch p.Parser.token {
-      | Semicolon =>
-        Parser.next(p)
-        if Grammar.isBlockExprStart(p.Parser.token) {
-          parseExprBlock(p)
-        } else {
-          let loc = mkLoc(p.startPos, p.endPos)
-          Ast_helper.Exp.construct(~loc, Location.mkloc(Longident.Lident("()"), loc), None)
-        }
-      | token when Grammar.isBlockExprStart(token) => parseExprBlock(p)
-      | _ =>
-        let loc = mkLoc(p.startPos, p.endPos)
-        Ast_helper.Exp.construct(~loc, Location.mkloc(Longident.Lident("()"), loc), None)
-      }
-
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.let_(~loc, recFlag, letBindings, next)
-    | _ =>
-      let e1 = {
-        let expr = parseExpr(p)
-        {...expr, pexp_attributes: List.concat(list{attrs, expr.pexp_attributes})}
-      }
-
-      ignore(Parser.optional(p, Semicolon))
-      if Grammar.isBlockExprStart(p.Parser.token) {
-        let e2 = parseExprBlock(p)
-        let loc = {...e1.pexp_loc, loc_end: e2.pexp_loc.loc_end}
-        Ast_helper.Exp.sequence(~loc, e1, e2)
-      } else {
-        e1
-      }
-    }
-  }
-
-  /* blockExpr ::= expr
-   *            |  expr          ;
-   *            |  expr          ; blockExpr
-   *            |  module    ... ; blockExpr
-   *            |  open      ... ; blockExpr
-   *            |  exception ... ; blockExpr
-   *            |  let       ...
-   *            |  let       ... ;
-   *            |  let       ... ; blockExpr
-   *
-   *  note: semi should be made optional
-   *  a block of expression is always
-   */
-  and parseExprBlock = (~first=?, p) => {
-    Parser.leaveBreadcrumb(p, Grammar.ExprBlock)
-    let item = switch first {
-    | Some(e) => e
-    | None => parseExprBlockItem(p)
-    }
-
-    let blockExpr = switch p.Parser.token {
-    | Semicolon =>
-      Parser.next(p)
-      if Grammar.isBlockExprStart(p.Parser.token) {
-        let next = parseExprBlockItem(p)
-        ignore(Parser.optional(p, Semicolon))
-        let loc = {...item.pexp_loc, loc_end: next.pexp_loc.loc_end}
-        Ast_helper.Exp.sequence(~loc, item, next)
-      } else {
-        item
-      }
-    | token when Grammar.isBlockExprStart(token) =>
-      let next = parseExprBlockItem(p)
-      ignore(Parser.optional(p, Semicolon))
-      let loc = {...item.pexp_loc, loc_end: next.pexp_loc.loc_end}
-      Ast_helper.Exp.sequence(~loc, item, next)
-    | _ => item
-    }
-
-    Parser.eatBreadcrumb(p)
-    overParseConstrainedOrCoercedOrArrowExpression(p, blockExpr)
-  }
-
-  and parseTryExpression = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Try, p)
-    let expr = parseExpr(~context=WhenExpr, p)
-    Parser.expect(Catch, p)
-    Parser.expect(Lbrace, p)
-    let cases = parsePatternMatching(p)
-    Parser.expect(Rbrace, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Exp.try_(~loc, expr, cases)
-  }
-
-  and parseIfExpression = p => {
-    Parser.beginRegion(p)
-    Parser.leaveBreadcrumb(p, Grammar.ExprIf)
-    let startPos = p.Parser.startPos
-    Parser.expect(If, p)
-    Parser.leaveBreadcrumb(p, Grammar.IfCondition)
-    /* doesn't make sense to try es6 arrow here? */
-    let conditionExpr = parseExpr(~context=WhenExpr, p)
-    Parser.eatBreadcrumb(p)
-    Parser.leaveBreadcrumb(p, IfBranch)
-    Parser.expect(Lbrace, p)
-    let thenExpr = parseExprBlock(p)
-    Parser.expect(Rbrace, p)
-    Parser.eatBreadcrumb(p)
-    let elseExpr = switch p.Parser.token {
-    | Else =>
-      Parser.endRegion(p)
-      Parser.leaveBreadcrumb(p, Grammar.ElseBranch)
-      Parser.next(p)
-      Parser.beginRegion(p)
-      let elseExpr = switch p.token {
-      | If => parseIfExpression(p)
-      | _ =>
-        Parser.expect(Lbrace, p)
-        let blockExpr = parseExprBlock(p)
-        Parser.expect(Rbrace, p)
-        blockExpr
-      }
-
-      Parser.eatBreadcrumb(p)
-      Parser.endRegion(p)
-      Some(elseExpr)
-    | _ =>
-      Parser.endRegion(p)
-      None
-    }
-
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Parser.eatBreadcrumb(p)
-    Ast_helper.Exp.ifthenelse(~loc, conditionExpr, thenExpr, elseExpr)
-  }
-
-  and parseForRest = (hasOpeningParen, pattern, startPos, p) => {
-    Parser.expect(In, p)
-    let e1 = parseExpr(p)
-    let direction = switch p.Parser.token {
-    | To => Asttypes.Upto
-    | Downto => Asttypes.Downto
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      Asttypes.Upto
-    }
-
-    Parser.next(p)
-    let e2 = parseExpr(~context=WhenExpr, p)
-    if hasOpeningParen {
-      Parser.expect(Rparen, p)
-    }
-    Parser.expect(Lbrace, p)
-    let bodyExpr = parseExprBlock(p)
-    Parser.expect(Rbrace, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Exp.for_(~loc, pattern, e1, e2, direction, bodyExpr)
-  }
-
-  and parseForExpression = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(For, p)
-    switch p.token {
-    | Lparen =>
-      let lparen = p.startPos
-      Parser.next(p)
-      switch p.token {
-      | Rparen =>
-        Parser.next(p)
-        let unitPattern = {
-          let loc = mkLoc(lparen, p.prevEndPos)
-          let lid = Location.mkloc(Longident.Lident("()"), loc)
-          Ast_helper.Pat.construct(lid, None)
-        }
-
-        parseForRest(false, parseAliasPattern(~attrs=list{}, unitPattern, p), startPos, p)
-      | _ =>
-        let pat = parsePattern(p)
-        switch p.token {
-        | Comma =>
-          Parser.next(p)
-          let tuplePattern = parseTuplePattern(~attrs=list{}, ~startPos=lparen, ~first=pat, p)
-
-          let pattern = parseAliasPattern(~attrs=list{}, tuplePattern, p)
-          parseForRest(false, pattern, startPos, p)
-        | _ => parseForRest(true, pat, startPos, p)
-        }
-      }
-    | _ => parseForRest(false, parsePattern(p), startPos, p)
-    }
-  }
-
-  and parseWhileExpression = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(While, p)
-    let expr1 = parseExpr(~context=WhenExpr, p)
-    Parser.expect(Lbrace, p)
-    let expr2 = parseExprBlock(p)
-    Parser.expect(Rbrace, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Exp.while_(~loc, expr1, expr2)
-  }
-
-  and parsePatternMatchCase = p => {
-    Parser.beginRegion(p)
-    Parser.leaveBreadcrumb(p, Grammar.PatternMatchCase)
-    switch p.Parser.token {
-    | Token.Bar =>
-      Parser.next(p)
-      let lhs = parsePattern(p)
-      let guard = switch p.Parser.token {
-      | When =>
-        Parser.next(p)
-        Some(parseExpr(~context=WhenExpr, p))
-      | _ => None
-      }
-
-      let () = switch p.token {
-      | EqualGreater => Parser.next(p)
-      | _ => Recover.recoverEqualGreater(p)
-      }
-
-      let rhs = parseExprBlock(p)
-      Parser.endRegion(p)
-      Parser.eatBreadcrumb(p)
-      Some(Ast_helper.Exp.case(lhs, ~guard?, rhs))
-    | _ =>
-      Parser.endRegion(p)
-      None
-    }
-  }
-
-  and parsePatternMatching = p => {
-    Parser.leaveBreadcrumb(p, Grammar.PatternMatching)
-    let cases = parseDelimitedRegion(
-      ~grammar=Grammar.PatternMatching,
-      ~closing=Rbrace,
-      ~f=parsePatternMatchCase,
-      p,
-    )
-
-    let () = switch cases {
-    | list{} =>
-      Parser.err(
-        ~startPos=p.prevEndPos,
-        p,
-        Diagnostics.message("Pattern matching needs at least one case"),
-      )
-    | _ => ()
-    }
-
-    cases
-  }
-
-  and parseSwitchExpression = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Switch, p)
-    let switchExpr = parseExpr(~context=WhenExpr, p)
-    Parser.expect(Lbrace, p)
-    let cases = parsePatternMatching(p)
-    Parser.expect(Rbrace, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Exp.match_(~loc, switchExpr, cases)
-  }
-
-  /*
-   * argument ::=
-   *   | _                            (* syntax sugar *)
-   *   | expr
-   *   | expr : type
-   *   | ~ label-name
-   *   | ~ label-name
-   *   | ~ label-name ?
-   *   | ~ label-name =   expr
-   *   | ~ label-name =   _           (* syntax sugar *)
-   *   | ~ label-name =   expr : type
-   *   | ~ label-name = ? expr
-   *   | ~ label-name = ? _           (* syntax sugar *)
-   *   | ~ label-name = ? expr : type
-   *
-   *  uncurried_argument ::=
-   *   | . argument
-   */
-  and parseArgument = p =>
-    if (
-      p.Parser.token == Token.Tilde ||
-        (p.token == Dot ||
-        (p.token == Underscore || Grammar.isExprStart(p.token)))
-    ) {
-      switch p.Parser.token {
-      | Dot =>
-        let uncurried = true
-        let startPos = p.Parser.startPos
-        Parser.next(p)
-        switch p.token {
-        /* apply(.) */
-        | Rparen =>
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let unitExpr = Ast_helper.Exp.construct(
-            ~loc,
-            Location.mkloc(Longident.Lident("()"), loc),
-            None,
-          )
-
-          Some(uncurried, Asttypes.Nolabel, unitExpr)
-        | _ => parseArgument2(p, ~uncurried)
-        }
-      | _ => parseArgument2(p, ~uncurried=false)
-      }
-    } else {
-      None
-    }
-
-  and parseArgument2 = (p, ~uncurried) =>
-    switch p.Parser.token {
-    /* foo(_), do not confuse with foo(_ => x), TODO: performance */
-    | Underscore when !isEs6ArrowExpression(~inTernary=false, p) =>
-      let loc = mkLoc(p.startPos, p.endPos)
-      Parser.next(p)
-      let exp = Ast_helper.Exp.ident(~loc, Location.mkloc(Longident.Lident("_"), loc))
-      Some(uncurried, Asttypes.Nolabel, exp)
-    | Tilde =>
-      Parser.next(p)
-      /* TODO: nesting of pattern matches not intuitive for error recovery */
-      switch p.Parser.token {
-      | Lident(ident) =>
-        let startPos = p.startPos
-        Parser.next(p)
-        let endPos = p.prevEndPos
-        let loc = mkLoc(startPos, endPos)
-        let propLocAttr = (Location.mkloc("res.namedArgLoc", loc), Parsetree.PStr(list{}))
-        let identExpr = Ast_helper.Exp.ident(
-          ~attrs=list{propLocAttr},
-          ~loc,
-          Location.mkloc(Longident.Lident(ident), loc),
-        )
-        switch p.Parser.token {
-        | Question =>
-          Parser.next(p)
-          Some(uncurried, Asttypes.Optional(ident), identExpr)
-        | Equal =>
-          Parser.next(p)
-          let label = switch p.Parser.token {
-          | Question =>
-            Parser.next(p)
-            Asttypes.Optional(ident)
-          | _ => Labelled(ident)
-          }
-
-          let expr = switch p.Parser.token {
-          | Underscore when !isEs6ArrowExpression(~inTernary=false, p) =>
-            let loc = mkLoc(p.startPos, p.endPos)
-            Parser.next(p)
-            Ast_helper.Exp.ident(~loc, Location.mkloc(Longident.Lident("_"), loc))
-          | _ =>
-            let expr = parseConstrainedOrCoercedExpr(p)
-            {...expr, pexp_attributes: list{propLocAttr, ...expr.pexp_attributes}}
-          }
-
-          Some(uncurried, label, expr)
-        | Colon =>
-          Parser.next(p)
-          let typ = parseTypExpr(p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let expr = Ast_helper.Exp.constraint_(~attrs=list{propLocAttr}, ~loc, identExpr, typ)
-          Some(uncurried, Labelled(ident), expr)
-        | _ => Some(uncurried, Labelled(ident), identExpr)
-        }
-      | t =>
-        Parser.err(p, Diagnostics.lident(t))
-        Some(uncurried, Nolabel, Recover.defaultExpr())
-      }
-    | _ => Some(uncurried, Nolabel, parseConstrainedOrCoercedExpr(p))
-    }
-
-  and parseCallExpr = (p, funExpr) => {
-    Parser.expect(Lparen, p)
-    let startPos = p.Parser.startPos
-    Parser.leaveBreadcrumb(p, Grammar.ExprCall)
-    let args = parseCommaDelimitedRegion(
-      ~grammar=Grammar.ArgumentList,
-      ~closing=Rparen,
-      ~f=parseArgument,
-      p,
-    )
-
-    Parser.expect(Rparen, p)
-    let args = switch args {
-    | list{} =>
-      let loc = mkLoc(startPos, p.prevEndPos)
-      /* No args -> unit sugar: `foo()` */
-      list{
-        (
-          false,
-          Asttypes.Nolabel,
-          Ast_helper.Exp.construct(~loc, Location.mkloc(Longident.Lident("()"), loc), None),
-        ),
-      }
-    | args => args
-    }
-
-    let loc = {...funExpr.pexp_loc, loc_end: p.prevEndPos}
-    let args = switch args {
-    | list{(u, lbl, expr), ...args} =>
-      let group = ((grp, acc), (uncurried, lbl, expr)) => {
-        let (_u, grp) = grp
-        if uncurried === true {
-          ((true, list{(lbl, expr)}), list{(_u, List.rev(grp)), ...acc})
-        } else {
-          ((_u, list{(lbl, expr), ...grp}), acc)
-        }
-      }
-
-      let ((_u, grp), acc) = List.fold_left(group, ((u, list{(lbl, expr)}), list{}), args)
-      List.rev(list{(_u, List.rev(grp)), ...acc})
-    | list{} => list{}
-    }
-
-    let apply = List.fold_left((callBody, group) => {
-      let (uncurried, args) = group
-      let (args, wrap) = processUnderscoreApplication(args)
-      let exp = if uncurried {
-        let attrs = list{uncurryAttr}
-        Ast_helper.Exp.apply(~loc, ~attrs, callBody, args)
-      } else {
-        Ast_helper.Exp.apply(~loc, callBody, args)
-      }
-
-      wrap(exp)
-    }, funExpr, args)
-
-    Parser.eatBreadcrumb(p)
-    apply
-  }
-
-  and parseValueOrConstructor = p => {
-    let startPos = p.Parser.startPos
-    let rec aux = (p, acc) =>
-      switch p.Parser.token {
-      | Uident(ident) =>
-        let endPosLident = p.endPos
-        Parser.next(p)
-        switch p.Parser.token {
-        | Dot =>
-          Parser.next(p)
-          aux(p, list{ident, ...acc})
-        | Lparen when p.prevEndPos.pos_lnum === p.startPos.pos_lnum =>
-          let lparen = p.startPos
-          let args = parseConstructorArgs(p)
-          let rparen = p.prevEndPos
-          let lident = buildLongident(list{ident, ...acc})
-          let tail = switch args {
-          | list{} => None
-          | list{{Parsetree.pexp_desc: Pexp_tuple(_)} as arg} as args =>
-            let loc = mkLoc(lparen, rparen)
-            if p.mode == ParseForTypeChecker {
-              /* Some(1, 2) for type-checker */
-              Some(arg)
-            } else {
-              /* Some((1, 2)) for printer */
-              Some(Ast_helper.Exp.tuple(~loc, args))
-            }
-          | list{arg} => Some(arg)
-          | args =>
-            let loc = mkLoc(lparen, rparen)
-            Some(Ast_helper.Exp.tuple(~loc, args))
-          }
-
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let identLoc = mkLoc(startPos, endPosLident)
-          Ast_helper.Exp.construct(~loc, Location.mkloc(lident, identLoc), tail)
-        | _ =>
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let lident = buildLongident(list{ident, ...acc})
-          Ast_helper.Exp.construct(~loc, Location.mkloc(lident, loc), None)
-        }
-      | Lident(ident) =>
-        Parser.next(p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        let lident = buildLongident(list{ident, ...acc})
-        Ast_helper.Exp.ident(~loc, Location.mkloc(lident, loc))
-      | List =>
-        Parser.next(p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        let lident = buildLongident(list{"list", ...acc})
-        Ast_helper.Exp.ident(~loc, Location.mkloc(lident, loc))
-      | token =>
-        Parser.next(p)
-        Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-        Recover.defaultExpr()
-      }
-
-    aux(p, list{})
-  }
-
-  and parsePolyVariantExpr = p => {
-    let startPos = p.startPos
-    let (ident, _loc) = parseHashIdent(~startPos, p)
-    switch p.Parser.token {
-    | Lparen when p.prevEndPos.pos_lnum === p.startPos.pos_lnum =>
-      let lparen = p.startPos
-      let args = parseConstructorArgs(p)
-      let rparen = p.prevEndPos
-      let loc_paren = mkLoc(lparen, rparen)
-      let tail = switch args {
-      | list{} => None
-      | list{{Parsetree.pexp_desc: Pexp_tuple(_)} as expr} as args =>
-        if p.mode == ParseForTypeChecker {
-          /* #a(1, 2) for type-checker */
-          Some(expr)
-        } else {
-          /* #a((1, 2)) for type-checker */
-          Some(Ast_helper.Exp.tuple(~loc=loc_paren, args))
-        }
-      | list{arg} => Some(arg)
-      | args =>
-        /* #a((1, 2)) for printer */
-        Some(Ast_helper.Exp.tuple(~loc=loc_paren, args))
-      }
-
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.variant(~loc, ident, tail)
-    | _ =>
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Exp.variant(~loc, ident, None)
-    }
-  }
-
-  and parseConstructorArgs = p => {
-    let lparen = p.Parser.startPos
-    Parser.expect(Lparen, p)
-    let args = parseCommaDelimitedRegion(
-      ~grammar=Grammar.ExprList,
-      ~f=parseConstrainedExprRegion,
-      ~closing=Rparen,
-      p,
-    )
-
-    Parser.expect(Rparen, p)
-    switch args {
-    | list{} =>
-      let loc = mkLoc(lparen, p.prevEndPos)
-      list{Ast_helper.Exp.construct(~loc, Location.mkloc(Longident.Lident("()"), loc), None)}
-    | args => args
-    }
-  }
-
-  and parseTupleExpr = (~first, ~startPos, p) => {
-    let exprs = parseCommaDelimitedRegion(
-      p,
-      ~grammar=Grammar.ExprList,
-      ~closing=Rparen,
-      ~f=parseConstrainedExprRegion,
-    )
-
-    Parser.expect(Rparen, p)
-    Ast_helper.Exp.tuple(~loc=mkLoc(startPos, p.prevEndPos), list{first, ...exprs})
-  }
-
-  and parseSpreadExprRegion = p =>
-    switch p.Parser.token {
-    | DotDotDot =>
-      Parser.next(p)
-      let expr = parseConstrainedOrCoercedExpr(p)
-      Some(true, expr)
-    | token when Grammar.isExprStart(token) => Some(false, parseConstrainedOrCoercedExpr(p))
-    | _ => None
-    }
-
-  and parseListExpr = (~startPos, p) => {
-    Parser.expect(Lbracket, p)
-    let listExprs = parseCommaDelimitedReversedList(
-      p,
-      ~grammar=Grammar.ListExpr,
-      ~closing=Rbracket,
-      ~f=parseSpreadExprRegion,
-    )
-
-    Parser.expect(Rbracket, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    switch listExprs {
-    | list{(true, expr), ...exprs} =>
-      let exprs = exprs |> List.map(snd) |> List.rev
-      makeListExpression(loc, exprs, Some(expr))
-    | exprs =>
-      let exprs = exprs |> List.map(((spread, expr)) => {
-        if spread {
-          Parser.err(p, Diagnostics.message(ErrorMessages.listExprSpread))
-        }
-        expr
-      }) |> List.rev
-
-      makeListExpression(loc, exprs, None)
-    }
-  }
-
-  /* Overparse ... and give a nice error message */
-  and parseNonSpreadExp = (~msg, p) => {
-    let () = switch p.Parser.token {
-    | DotDotDot =>
-      Parser.err(p, Diagnostics.message(msg))
-      Parser.next(p)
-    | _ => ()
-    }
-
-    switch p.Parser.token {
-    | token when Grammar.isExprStart(token) =>
-      let expr = parseExpr(p)
-      switch p.Parser.token {
-      | Colon =>
-        Parser.next(p)
-        let typ = parseTypExpr(p)
-        let loc = mkLoc(expr.pexp_loc.loc_start, typ.ptyp_loc.loc_end)
-        Some(Ast_helper.Exp.constraint_(~loc, expr, typ))
-      | _ => Some(expr)
-      }
-    | _ => None
-    }
-  }
-
-  and parseArrayExp = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Lbracket, p)
-    let exprs = parseCommaDelimitedRegion(
-      p,
-      ~grammar=Grammar.ExprList,
-      ~closing=Rbracket,
-      ~f=parseNonSpreadExp(~msg=ErrorMessages.arrayExprSpread),
-    )
-
-    Parser.expect(Rbracket, p)
-    Ast_helper.Exp.array(~loc=mkLoc(startPos, p.prevEndPos), exprs)
-  }
-
-  /* TODO: check attributes in the case of poly type vars,
-   * might be context dependend: parseFieldDeclaration (see ocaml) */
-  and parsePolyTypeExpr = p => {
-    let startPos = p.Parser.startPos
-    switch p.Parser.token {
-    | SingleQuote =>
-      let vars = parseTypeVarList(p)
-      switch vars {
-      | list{_v1, _v2, ..._} =>
-        Parser.expect(Dot, p)
-        let typ = parseTypExpr(p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Ast_helper.Typ.poly(~loc, vars, typ)
-      | list{var} =>
-        switch p.Parser.token {
-        | Dot =>
-          Parser.next(p)
-          let typ = parseTypExpr(p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          Ast_helper.Typ.poly(~loc, vars, typ)
-        | EqualGreater =>
-          Parser.next(p)
-          let typ = Ast_helper.Typ.var(~loc=var.loc, var.txt)
-          let returnType = parseTypExpr(~alias=false, p)
-          let loc = mkLoc(typ.Parsetree.ptyp_loc.loc_start, p.prevEndPos)
-          Ast_helper.Typ.arrow(~loc, Asttypes.Nolabel, typ, returnType)
-        | _ => Ast_helper.Typ.var(~loc=var.loc, var.txt)
-        }
-      | _ => assert false
-      }
-    | _ => parseTypExpr(p)
-    }
-  }
-
-  /* 'a 'b 'c */
-  and parseTypeVarList = p => {
-    let rec loop = (p, vars) =>
-      switch p.Parser.token {
-      | SingleQuote =>
-        Parser.next(p)
-        let (lident, loc) = parseLident(p)
-        let var = Location.mkloc(lident, loc)
-        loop(p, list{var, ...vars})
-      | _ => List.rev(vars)
-      }
-
-    loop(p, list{})
-  }
-
-  and parseLidentList = p => {
-    let rec loop = (p, ls) =>
-      switch p.Parser.token {
-      | Lident(lident) =>
-        let loc = mkLoc(p.startPos, p.endPos)
-        Parser.next(p)
-        loop(p, list{Location.mkloc(lident, loc), ...ls})
-      | _ => List.rev(ls)
-      }
-
-    loop(p, list{})
-  }
-
-  and parseAtomicTypExpr = (~attrs, p) => {
-    Parser.leaveBreadcrumb(p, Grammar.AtomicTypExpr)
-    let startPos = p.Parser.startPos
-    let typ = switch p.Parser.token {
-    | SingleQuote =>
-      Parser.next(p)
-      let (ident, loc) = parseLident(p)
-      Ast_helper.Typ.var(~loc, ~attrs, ident)
-    | Underscore =>
-      let endPos = p.endPos
-      Parser.next(p)
-      Ast_helper.Typ.any(~loc=mkLoc(startPos, endPos), ~attrs, ())
-    | Lparen =>
-      Parser.next(p)
-      switch p.Parser.token {
-      | Rparen =>
-        Parser.next(p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        let unitConstr = Location.mkloc(Longident.Lident("unit"), loc)
-        Ast_helper.Typ.constr(~attrs, unitConstr, list{})
-      | _ =>
-        let t = parseTypExpr(p)
-        switch p.token {
-        | Comma =>
-          Parser.next(p)
-          parseTupleType(~attrs, ~first=t, ~startPos, p)
-        | _ =>
-          Parser.expect(Rparen, p)
-          {
-            ...t,
-            ptyp_loc: mkLoc(startPos, p.prevEndPos),
-            ptyp_attributes: List.concat(list{attrs, t.ptyp_attributes}),
-          }
-        }
-      }
-    | Lbracket => parsePolymorphicVariantType(~attrs, p)
-    | Uident(_) | Lident(_) | List =>
-      let constr = parseValuePath(p)
-      let args = parseTypeConstructorArgs(~constrName=constr, p)
-      Ast_helper.Typ.constr(~loc=mkLoc(startPos, p.prevEndPos), ~attrs, constr, args)
-    | Module =>
-      Parser.next(p)
-      Parser.expect(Lparen, p)
-      let packageType = parsePackageType(~startPos, ~attrs, p)
-      Parser.expect(Rparen, p)
-      {...packageType, ptyp_loc: mkLoc(startPos, p.prevEndPos)}
-    | Percent =>
-      let extension = parseExtension(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Typ.extension(~attrs, ~loc, extension)
-    | Lbrace => parseBsObjectType(~attrs, p)
-    | token =>
-      switch skipTokensAndMaybeRetry(p, ~isStartOfGrammar=Grammar.isAtomicTypExprStart) {
-      | Some() => parseAtomicTypExpr(~attrs, p)
-      | None =>
-        Parser.err(~startPos=p.prevEndPos, p, Diagnostics.unexpected(token, p.breadcrumbs))
-        Recover.defaultType()
-      }
-    }
-
-    Parser.eatBreadcrumb(p)
-    typ
-  }
-
-  /* package-type	::=
-      | modtype-path
-      ∣ modtype-path with package-constraint  { and package-constraint }
- */
-  and parsePackageType = (~startPos, ~attrs, p) => {
-    let modTypePath = parseModuleLongIdent(~lowercase=true, p)
-    switch p.Parser.token {
-    | With =>
-      Parser.next(p)
-      let constraints = parsePackageConstraints(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Typ.package(~loc, ~attrs, modTypePath, constraints)
-    | _ =>
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Typ.package(~loc, ~attrs, modTypePath, list{})
-    }
-  }
-
-  /* package-constraint  { and package-constraint } */
-  and parsePackageConstraints = p => {
-    let first = {
-      Parser.expect(Typ, p)
-      let typeConstr = parseValuePath(p)
-      Parser.expect(Equal, p)
-      let typ = parseTypExpr(p)
-      (typeConstr, typ)
-    }
-
-    let rest = parseRegion(~grammar=Grammar.PackageConstraint, ~f=parsePackageConstraint, p)
-
-    list{first, ...rest}
-  }
-
-  /* and type typeconstr = typexpr */
-  and parsePackageConstraint = p =>
-    switch p.Parser.token {
-    | And =>
-      Parser.next(p)
-      Parser.expect(Typ, p)
-      let typeConstr = parseValuePath(p)
-      Parser.expect(Equal, p)
-      let typ = parseTypExpr(p)
-      Some(typeConstr, typ)
-    | _ => None
-    }
-
-  and parseBsObjectType = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Lbrace, p)
-    let closedFlag = switch p.token {
-    | DotDot =>
-      Parser.next(p)
-      Asttypes.Open
-    | Dot =>
-      Parser.next(p)
-      Asttypes.Closed
-    | _ => Asttypes.Closed
-    }
-
-    let fields = parseCommaDelimitedRegion(
-      ~grammar=Grammar.StringFieldDeclarations,
-      ~closing=Rbrace,
-      ~f=parseStringFieldDeclaration,
-      p,
-    )
-
-    Parser.expect(Rbrace, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    makeBsObjType(~attrs, ~loc, ~closed=closedFlag, fields)
-  }
-
-  /* TODO: check associativity in combination with attributes */
-  and parseTypeAlias = (p, typ) =>
-    switch p.Parser.token {
-    | As =>
-      Parser.next(p)
-      Parser.expect(SingleQuote, p)
-      let (ident, _loc) = parseLident(p)
-      /* TODO: how do we parse attributes here? */
-      Ast_helper.Typ.alias(~loc=mkLoc(typ.Parsetree.ptyp_loc.loc_start, p.prevEndPos), typ, ident)
-    | _ => typ
-    }
-
-  /* type_parameter ::=
-   *  | type_expr
-   *  | ~ident: type_expr
-   *  | ~ident: type_expr=?
-   *
-   * note:
-   *  | attrs ~ident: type_expr    -> attrs are on the arrow
-   *  | attrs type_expr            -> attrs are here part of the type_expr
-   *
-   * uncurried_type_parameter ::=
-   *  | . type_parameter
-   */
-  and parseTypeParameter = p =>
-    if p.Parser.token == Token.Tilde || (p.token == Dot || Grammar.isTypExprStart(p.token)) {
-      let startPos = p.Parser.startPos
-      let uncurried = Parser.optional(p, Dot)
-      let attrs = parseAttributes(p)
-      switch p.Parser.token {
-      | Tilde =>
-        Parser.next(p)
-        let (name, _loc) = parseLident(p)
-        Parser.expect(~grammar=Grammar.TypeExpression, Colon, p)
-        let typ = parseTypExpr(p)
-        switch p.Parser.token {
-        | Equal =>
-          Parser.next(p)
-          Parser.expect(Question, p)
-          Some(uncurried, attrs, Asttypes.Optional(name), typ, startPos)
-        | _ => Some(uncurried, attrs, Asttypes.Labelled(name), typ, startPos)
-        }
-      | Lident(_) | List =>
-        let (name, loc) = parseLident(p)
-        switch p.token {
-        | Colon =>
-          let () = {
-            let error = Diagnostics.message("Parameter names start with a `~`, like: ~" ++ name)
-
-            Parser.err(~startPos=loc.loc_start, ~endPos=loc.loc_end, p, error)
-          }
-
-          Parser.next(p)
-          let typ = parseTypExpr(p)
-          switch p.Parser.token {
-          | Equal =>
-            Parser.next(p)
-            Parser.expect(Question, p)
-            Some(uncurried, attrs, Asttypes.Optional(name), typ, startPos)
-          | _ => Some(uncurried, attrs, Asttypes.Labelled(name), typ, startPos)
-          }
-        | _ =>
-          let constr = Location.mkloc(Longident.Lident(name), loc)
-          let args = parseTypeConstructorArgs(~constrName=constr, p)
-          let typ = Ast_helper.Typ.constr(~loc=mkLoc(startPos, p.prevEndPos), ~attrs, constr, args)
-
-          let typ = parseArrowTypeRest(~es6Arrow=true, ~startPos, typ, p)
-          let typ = parseTypeAlias(p, typ)
-          Some(uncurried, list{}, Asttypes.Nolabel, typ, startPos)
-        }
-      | _ =>
-        let typ = parseTypExpr(p)
-        let typWithAttributes = {
-          ...typ,
-          ptyp_attributes: List.concat(list{attrs, typ.ptyp_attributes}),
-        }
-        Some(uncurried, list{}, Asttypes.Nolabel, typWithAttributes, startPos)
-      }
-    } else {
-      None
-    }
-
-  /* (int, ~x:string, float) */
-  and parseTypeParameters = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Lparen, p)
-    switch p.Parser.token {
-    | Rparen =>
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      let unitConstr = Location.mkloc(Longident.Lident("unit"), loc)
-      let typ = Ast_helper.Typ.constr(unitConstr, list{})
-      list{(false, list{}, Asttypes.Nolabel, typ, startPos)}
-    | _ =>
-      let params = parseCommaDelimitedRegion(
-        ~grammar=Grammar.TypeParameters,
-        ~closing=Rparen,
-        ~f=parseTypeParameter,
-        p,
-      )
-
-      Parser.expect(Rparen, p)
-      params
-    }
-  }
-
-  and parseEs6ArrowType = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    switch p.Parser.token {
-    | Tilde =>
-      Parser.next(p)
-      let (name, _loc) = parseLident(p)
-      Parser.expect(~grammar=Grammar.TypeExpression, Colon, p)
-      let typ = parseTypExpr(~alias=false, ~es6Arrow=false, p)
-      let arg = switch p.Parser.token {
-      | Equal =>
-        Parser.next(p)
-        Parser.expect(Question, p)
-        Asttypes.Optional(name)
-      | _ => Asttypes.Labelled(name)
-      }
-
-      Parser.expect(EqualGreater, p)
-      let returnType = parseTypExpr(~alias=false, p)
-      Ast_helper.Typ.arrow(~attrs, arg, typ, returnType)
-    | _ =>
-      let parameters = parseTypeParameters(p)
-      Parser.expect(EqualGreater, p)
-      let returnType = parseTypExpr(~alias=false, p)
-      let endPos = p.prevEndPos
-      let typ = List.fold_right(((uncurried, attrs, argLbl, typ, startPos), t) => {
-        let attrs = if uncurried {
-          list{uncurryAttr, ...attrs}
-        } else {
-          attrs
-        }
-        Ast_helper.Typ.arrow(~loc=mkLoc(startPos, endPos), ~attrs, argLbl, typ, t)
-      }, parameters, returnType)
-
-      {
-        ...typ,
-        ptyp_attributes: List.concat(list{typ.ptyp_attributes, attrs}),
-        ptyp_loc: mkLoc(startPos, p.prevEndPos),
-      }
-    }
-  }
-
-  /*
-   * typexpr ::=
-   *  | 'ident
-   *  | _
-   *  | (typexpr)
-   *  | typexpr => typexpr            --> es6 arrow
-   *  | (typexpr, typexpr) => typexpr --> es6 arrow
-   *  | /typexpr, typexpr, typexpr/  --> tuple
-   *  | typeconstr
-   *  | typeconstr<typexpr>
-   *  | typeconstr<typexpr, typexpr,>
-   *  | typexpr as 'ident
-   *  | %attr-id                      --> extension
-   *  | %attr-id(payload)             --> extension
-   *
-   * typeconstr ::=
-   *  | lident
-   *  | uident.lident
-   *  | uident.uident.lident     --> long module path
-   */
-  and parseTypExpr = (~attrs=?, ~es6Arrow=true, ~alias=true, p) => {
-    /* Parser.leaveBreadcrumb p Grammar.TypeExpression; */
-    let startPos = p.Parser.startPos
-    let attrs = switch attrs {
-    | Some(attrs) => attrs
-    | None => parseAttributes(p)
-    }
-    let typ = if es6Arrow && isEs6ArrowType(p) {
-      parseEs6ArrowType(~attrs, p)
-    } else {
-      let typ = parseAtomicTypExpr(~attrs, p)
-      parseArrowTypeRest(~es6Arrow, ~startPos, typ, p)
-    }
-
-    let typ = if alias {
-      parseTypeAlias(p, typ)
-    } else {
-      typ
-    }
-
-    /* Parser.eatBreadcrumb p; */
-    typ
-  }
-
-  and parseArrowTypeRest = (~es6Arrow, ~startPos, typ, p) =>
-    switch p.Parser.token {
-    | (EqualGreater | MinusGreater) as token when es6Arrow === true =>
-      /* error recovery */
-      if token == MinusGreater {
-        Parser.expect(EqualGreater, p)
-      }
-      Parser.next(p)
-      let returnType = parseTypExpr(~alias=false, p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Typ.arrow(~loc, Asttypes.Nolabel, typ, returnType)
-    | _ => typ
-    }
-
-  and parseTypExprRegion = p =>
-    if Grammar.isTypExprStart(p.Parser.token) {
-      Some(parseTypExpr(p))
-    } else {
-      None
-    }
-
-  and parseTupleType = (~attrs, ~first, ~startPos, p) => {
-    let typexprs = parseCommaDelimitedRegion(
-      ~grammar=Grammar.TypExprList,
-      ~closing=Rparen,
-      ~f=parseTypExprRegion,
-      p,
-    )
-
-    Parser.expect(Rparen, p)
-    let tupleLoc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Typ.tuple(~attrs, ~loc=tupleLoc, list{first, ...typexprs})
-  }
-
-  and parseTypeConstructorArgRegion = p =>
-    if Grammar.isTypExprStart(p.Parser.token) {
-      Some(parseTypExpr(p))
-    } else if p.token == LessThan {
-      Parser.next(p)
-      parseTypeConstructorArgRegion(p)
-    } else {
-      None
-    }
-
-  /* Js.Nullable.value<'a> */
-  and parseTypeConstructorArgs = (~constrName, p) => {
-    let opening = p.Parser.token
-    let openingStartPos = p.startPos
-    switch opening {
-    | LessThan | Lparen =>
-      Scanner.setDiamondMode(p.scanner)
-      Parser.next(p)
-      let typeArgs = /* TODO: change Grammar.TypExprList to TypArgList!!! Why did I wrote this? */
-      parseCommaDelimitedRegion(
-        ~grammar=Grammar.TypExprList,
-        ~closing=GreaterThan,
-        ~f=parseTypeConstructorArgRegion,
-        p,
-      )
-
-      let () = switch p.token {
-      | Rparen when opening == Token.Lparen =>
-        let typ = Ast_helper.Typ.constr(constrName, typeArgs)
-        let msg =
-          Doc.breakableGroup(
-            ~forceBreak=true,
-            Doc.concat(list{
-              Doc.text("Type parameters require angle brackets:"),
-              Doc.indent(Doc.concat(list{Doc.line, Printer.printTypExpr(typ, CommentTable.empty)})),
-            }),
-          ) |> Doc.toString(~width=80)
-
-        Parser.err(~startPos=openingStartPos, p, Diagnostics.message(msg))
-        Parser.next(p)
-      | _ => Parser.expect(GreaterThan, p)
-      }
-
-      Scanner.popMode(p.scanner, Diamond)
-      typeArgs
-    | _ => list{}
-    }
-  }
-
-  /* string-field-decl ::=
-   *  | string: poly-typexpr
-   *  | attributes string-field-decl */
-  and parseStringFieldDeclaration = p => {
-    let attrs = parseAttributes(p)
-    switch p.Parser.token {
-    | String(name) =>
-      let nameStartPos = p.startPos
-      let nameEndPos = p.endPos
-      Parser.next(p)
-      let fieldName = Location.mkloc(name, mkLoc(nameStartPos, nameEndPos))
-      Parser.expect(~grammar=Grammar.TypeExpression, Colon, p)
-      let typ = parsePolyTypeExpr(p)
-      Some(Parsetree.Otag(fieldName, attrs, typ))
-    | _token => None
-    }
-  }
-
-  /* field-decl	::=
-   *  | [mutable] field-name : poly-typexpr
-   *  | attributes field-decl */
-  and parseFieldDeclaration = p => {
-    let startPos = p.Parser.startPos
-    let attrs = parseAttributes(p)
-    let mut = if Parser.optional(p, Token.Mutable) {
-      Asttypes.Mutable
-    } else {
-      Asttypes.Immutable
-    }
-
-    let (lident, loc) = switch p.token {
-    | List =>
-      let loc = mkLoc(p.startPos, p.endPos)
-      Parser.next(p)
-      ("list", loc)
-    | _ => parseLident(p)
-    }
-
-    let name = Location.mkloc(lident, loc)
-    let typ = switch p.Parser.token {
-    | Colon =>
-      Parser.next(p)
-      parsePolyTypeExpr(p)
-    | _ => Ast_helper.Typ.constr(~loc=name.loc, {...name, txt: Lident(name.txt)}, list{})
-    }
-
-    let loc = mkLoc(startPos, typ.ptyp_loc.loc_end)
-    Ast_helper.Type.field(~attrs, ~loc, ~mut, name, typ)
-  }
-
-  and parseFieldDeclarationRegion = p => {
-    let startPos = p.Parser.startPos
-    let attrs = parseAttributes(p)
-    let mut = if Parser.optional(p, Token.Mutable) {
-      Asttypes.Mutable
-    } else {
-      Asttypes.Immutable
-    }
-
-    switch p.token {
-    | Lident(_) | List =>
-      let (lident, loc) = switch p.token {
-      | List =>
-        let loc = mkLoc(p.startPos, p.endPos)
-        Parser.next(p)
-        ("list", loc)
-      | _ => parseLident(p)
-      }
-
-      let name = Location.mkloc(lident, loc)
-      let typ = switch p.Parser.token {
-      | Colon =>
-        Parser.next(p)
-        parsePolyTypeExpr(p)
-      | _ => Ast_helper.Typ.constr(~loc=name.loc, {...name, txt: Lident(name.txt)}, list{})
-      }
-
-      let loc = mkLoc(startPos, typ.ptyp_loc.loc_end)
-      Some(Ast_helper.Type.field(~attrs, ~loc, ~mut, name, typ))
-    | _ => None
-    }
-  }
-
-  /* record-decl ::=
-   *  | { field-decl }
-   *  | { field-decl, field-decl }
-   *  | { field-decl, field-decl, field-decl, }
-   */
-  and parseRecordDeclaration = p => {
-    Parser.leaveBreadcrumb(p, Grammar.RecordDecl)
-    Parser.expect(Lbrace, p)
-    let rows = parseCommaDelimitedRegion(
-      ~grammar=Grammar.RecordDecl,
-      ~closing=Rbrace,
-      ~f=parseFieldDeclarationRegion,
-      p,
-    )
-
-    Parser.expect(Rbrace, p)
-    Parser.eatBreadcrumb(p)
-    rows
-  }
-
-  /* constr-args ::=
-   *  | (typexpr)
-   *  | (typexpr, typexpr)
-   *  | (typexpr, typexpr, typexpr,)
-   *  | (record-decl)
-   *
-   * TODO: should we overparse inline-records in every position?
-   * Give a good error message afterwards?
-   */
-  and parseConstrDeclArgs = p => {
-    let constrArgs = switch p.Parser.token {
-    | Lparen =>
-      Parser.next(p)
-      /* TODO: this could use some cleanup/stratification */
-      switch p.Parser.token {
-      | Lbrace =>
-        let lbrace = p.startPos
-        Parser.next(p)
-        let startPos = p.Parser.startPos
-        switch p.Parser.token {
-        | DotDot | Dot =>
-          let closedFlag = switch p.token {
-          | DotDot =>
-            Parser.next(p)
-            Asttypes.Open
-          | Dot =>
-            Parser.next(p)
-            Asttypes.Closed
-          | _ => Asttypes.Closed
-          }
-
-          let fields = parseCommaDelimitedRegion(
-            ~grammar=Grammar.StringFieldDeclarations,
-            ~closing=Rbrace,
-            ~f=parseStringFieldDeclaration,
-            p,
-          )
-
-          Parser.expect(Rbrace, p)
-          let loc = mkLoc(startPos, p.prevEndPos)
-          let typ = makeBsObjType(~attrs=list{}, ~loc, ~closed=closedFlag, fields)
-          Parser.optional(p, Comma) |> ignore
-          let moreArgs = parseCommaDelimitedRegion(
-            ~grammar=Grammar.TypExprList,
-            ~closing=Rparen,
-            ~f=parseTypExprRegion,
-            p,
-          )
-
-          Parser.expect(Rparen, p)
-          Parsetree.Pcstr_tuple(list{typ, ...moreArgs})
-        | _ =>
-          let attrs = parseAttributes(p)
-          switch p.Parser.token {
-          | String(_) =>
-            let closedFlag = Asttypes.Closed
-            let fields = switch attrs {
-            | list{} =>
-              parseCommaDelimitedRegion(
-                ~grammar=Grammar.StringFieldDeclarations,
-                ~closing=Rbrace,
-                ~f=parseStringFieldDeclaration,
-                p,
-              )
-            | attrs =>
-              let first = {
-                Parser.leaveBreadcrumb(p, Grammar.StringFieldDeclarations)
-                let field = switch parseStringFieldDeclaration(p) {
-                | Some(field) => field
-                | None => assert false
-                }
-
-                /* parse comma after first */
-                let () = switch p.Parser.token {
-                | Rbrace | Eof => ()
-                | Comma => Parser.next(p)
-                | _ => Parser.expect(Comma, p)
-                }
-
-                Parser.eatBreadcrumb(p)
-                switch field {
-                | Parsetree.Otag(label, _, ct) => Parsetree.Otag(label, attrs, ct)
-                | Oinherit(ct) => Oinherit(ct)
-                }
-              }
-
-              list{
-                first,
-                ...parseCommaDelimitedRegion(
-                  ~grammar=Grammar.StringFieldDeclarations,
-                  ~closing=Rbrace,
-                  ~f=parseStringFieldDeclaration,
-                  p,
-                ),
-              }
-            }
-            Parser.expect(Rbrace, p)
-            let loc = mkLoc(startPos, p.prevEndPos)
-            let typ = makeBsObjType(~attrs=list{}, ~loc, ~closed=closedFlag, fields)
-            Parser.optional(p, Comma) |> ignore
-            let moreArgs = parseCommaDelimitedRegion(
-              ~grammar=Grammar.TypExprList,
-              ~closing=Rparen,
-              ~f=parseTypExprRegion,
-              p,
-            )
-
-            Parser.expect(Rparen, p)
-            Parsetree.Pcstr_tuple(list{typ, ...moreArgs})
-          | _ =>
-            let fields = switch attrs {
-            | list{} =>
-              parseCommaDelimitedRegion(
-                ~grammar=Grammar.FieldDeclarations,
-                ~closing=Rbrace,
-                ~f=parseFieldDeclarationRegion,
-                p,
-              )
-            | attrs =>
-              let first = {
-                let field = parseFieldDeclaration(p)
-                Parser.expect(Comma, p)
-                {...field, Parsetree.pld_attributes: attrs}
-              }
-
-              list{
-                first,
-                ...parseCommaDelimitedRegion(
-                  ~grammar=Grammar.FieldDeclarations,
-                  ~closing=Rbrace,
-                  ~f=parseFieldDeclarationRegion,
-                  p,
-                ),
-              }
-            }
-
-            let () = switch fields {
-            | list{} =>
-              Parser.err(
-                ~startPos=lbrace,
-                p,
-                Diagnostics.message("An inline record declaration needs at least one field"),
-              )
-            | _ => ()
-            }
-
-            Parser.expect(Rbrace, p)
-            Parser.optional(p, Comma) |> ignore
-            Parser.expect(Rparen, p)
-            Parsetree.Pcstr_record(fields)
-          }
-        }
-      | _ =>
-        let args = parseCommaDelimitedRegion(
-          ~grammar=Grammar.TypExprList,
-          ~closing=Rparen,
-          ~f=parseTypExprRegion,
-          p,
-        )
-
-        Parser.expect(Rparen, p)
-        Parsetree.Pcstr_tuple(args)
-      }
-    | _ => Pcstr_tuple(list{})
-    }
-
-    let res = switch p.Parser.token {
-    | Colon =>
-      Parser.next(p)
-      Some(parseTypExpr(p))
-    | _ => None
-    }
-
-    (constrArgs, res)
-  }
-
-  /* constr-decl ::=
-   *  | constr-name
-   *  | attrs constr-name
-   *  | constr-name const-args
-   *  | attrs constr-name const-args */
-  and parseTypeConstructorDeclarationWithBar = p =>
-    switch p.Parser.token {
-    | Bar =>
-      let startPos = p.Parser.startPos
-      Parser.next(p)
-      Some(parseTypeConstructorDeclaration(~startPos, p))
-    | _ => None
-    }
-
-  and parseTypeConstructorDeclaration = (~startPos, p) => {
-    Parser.leaveBreadcrumb(p, Grammar.ConstructorDeclaration)
-    let attrs = parseAttributes(p)
-    switch p.Parser.token {
-    | Uident(uident) =>
-      let uidentLoc = mkLoc(p.startPos, p.endPos)
-      Parser.next(p)
-      let (args, res) = parseConstrDeclArgs(p)
-      Parser.eatBreadcrumb(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Type.constructor(~loc, ~attrs, ~res?, ~args, Location.mkloc(uident, uidentLoc))
-    | t =>
-      Parser.err(p, Diagnostics.uident(t))
-      Ast_helper.Type.constructor(Location.mknoloc("_"))
-    }
-  }
-
-  /* [|] constr-decl  { | constr-decl } */
-  and parseTypeConstructorDeclarations = (~first=?, p) => {
-    let firstConstrDecl = switch first {
-    | None =>
-      let startPos = p.Parser.startPos
-      ignore(Parser.optional(p, Token.Bar))
-      parseTypeConstructorDeclaration(~startPos, p)
-    | Some(firstConstrDecl) => firstConstrDecl
-    }
-
-    list{
-      firstConstrDecl,
-      ...parseRegion(
-        ~grammar=Grammar.ConstructorDeclaration,
-        ~f=parseTypeConstructorDeclarationWithBar,
-        p,
-      ),
-    }
-  }
-
-  /*
-   * type-representation ::=
-   *  ∣	 = [ | ] constr-decl  { | constr-decl }
-   *  ∣	 = private [ | ] constr-decl  { | constr-decl }
-   *  |  = |
-   *  ∣	 = private |
-   *  ∣	 = record-decl
-   *  ∣	 = private record-decl
-   *  |  = ..
-   */
-  and parseTypeRepresentation = p => {
-    Parser.leaveBreadcrumb(p, Grammar.TypeRepresentation)
-    /* = consumed */
-    let privateFlag = if Parser.optional(p, Token.Private) {
-      Asttypes.Private
-    } else {
-      Asttypes.Public
-    }
-
-    let kind = switch p.Parser.token {
-    | Bar | Uident(_) => Parsetree.Ptype_variant(parseTypeConstructorDeclarations(p))
-    | Lbrace => Parsetree.Ptype_record(parseRecordDeclaration(p))
-    | DotDot =>
-      Parser.next(p)
-      Ptype_open
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      /* TODO: I have no idea if this is even remotely a good idea */
-      Parsetree.Ptype_variant(list{})
-    }
-
-    Parser.eatBreadcrumb(p)
-    (privateFlag, kind)
-  }
-
-  /* type-param	::=
-   *  | variance 'lident
-   *  | variance _
-   *
-   * variance ::=
-   *   | +
-   *   | -
-   *   | (* empty *)
-   */
-  and parseTypeParam = p => {
-    let variance = switch p.Parser.token {
-    | Plus =>
-      Parser.next(p)
-      Asttypes.Covariant
-    | Minus =>
-      Parser.next(p)
-      Contravariant
-    | _ => Invariant
-    }
-
-    switch p.Parser.token {
-    | SingleQuote =>
-      Parser.next(p)
-      let (ident, loc) = parseLident(p)
-      Some(Ast_helper.Typ.var(~loc, ident), variance)
-    | Underscore =>
-      let loc = mkLoc(p.startPos, p.endPos)
-      Parser.next(p)
-      Some(Ast_helper.Typ.any(~loc, ()), variance)
-    /* TODO: should we try parsing lident as 'ident ? */
-    | _token => None
-    }
-  }
-
-  /* type-params	::=
-   *  | <type-param>
-   *  ∣	<type-param, type-param>
-   *  ∣	<type-param, type-param, type-param>
-   *  ∣	<type-param, type-param, type-param,>
-   *
-   *  TODO: when we have pretty-printer show an error
-   *  with the actual code corrected. */
-  and parseTypeParams = (~parent, p) => {
-    let opening = p.Parser.token
-    switch opening {
-    | LessThan | Lparen when p.startPos.pos_lnum === p.prevEndPos.pos_lnum =>
-      Scanner.setDiamondMode(p.scanner)
-      let openingStartPos = p.startPos
-      Parser.leaveBreadcrumb(p, Grammar.TypeParams)
-      Parser.next(p)
-      let params = parseCommaDelimitedRegion(
-        ~grammar=Grammar.TypeParams,
-        ~closing=GreaterThan,
-        ~f=parseTypeParam,
-        p,
-      )
-
-      let () = switch p.token {
-      | Rparen when opening == Token.Lparen =>
-        let msg =
-          Doc.breakableGroup(
-            ~forceBreak=true,
-            Doc.concat(list{
-              Doc.text("Type parameters require angle brackets:"),
-              Doc.indent(
-                Doc.concat(list{
-                  Doc.line,
-                  Doc.concat(list{
-                    Printer.printLongident(parent.Location.txt),
-                    Printer.printTypeParams(params, CommentTable.empty),
-                  }),
-                }),
-              ),
-            }),
-          ) |> Doc.toString(~width=80)
-
-        Parser.err(~startPos=openingStartPos, p, Diagnostics.message(msg))
-        Parser.next(p)
-      | _ => Parser.expect(GreaterThan, p)
-      }
-
-      Scanner.popMode(p.scanner, Diamond)
-      Parser.eatBreadcrumb(p)
-      params
-    | _ => list{}
-    }
-  }
-
-  /* type-constraint	::=	constraint ' ident =  typexpr */
-  and parseTypeConstraint = p => {
-    let startPos = p.Parser.startPos
-    switch p.Parser.token {
-    | Token.Constraint =>
-      Parser.next(p)
-      Parser.expect(SingleQuote, p)
-      switch p.Parser.token {
-      | Lident(ident) =>
-        let identLoc = mkLoc(startPos, p.endPos)
-        Parser.next(p)
-        Parser.expect(Equal, p)
-        let typ = parseTypExpr(p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Some(Ast_helper.Typ.var(~loc=identLoc, ident), typ, loc)
-      | t =>
-        Parser.err(p, Diagnostics.lident(t))
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Some(Ast_helper.Typ.any(), parseTypExpr(p), loc)
-      }
-    | _ => None
-    }
-  }
-
-  /* type-constraints ::=
-   *  | (* empty *)
-   *  | type-constraint
-   *  | type-constraint type-constraint
-   *  | type-constraint type-constraint type-constraint (* 0 or more *)
-   */
-  and parseTypeConstraints = p =>
-    parseRegion(~grammar=Grammar.TypeConstraint, ~f=parseTypeConstraint, p)
-
-  and parseTypeEquationOrConstrDecl = p => {
-    let uidentStartPos = p.Parser.startPos
-    switch p.Parser.token {
-    | Uident(uident) =>
-      Parser.next(p)
-      switch p.Parser.token {
-      | Dot =>
-        Parser.next(p)
-        let typeConstr = parseValuePathTail(p, uidentStartPos, Longident.Lident(uident))
-
-        let loc = mkLoc(uidentStartPos, p.prevEndPos)
-        let typ = parseTypeAlias(
-          p,
-          Ast_helper.Typ.constr(
-            ~loc,
-            typeConstr,
-            parseTypeConstructorArgs(~constrName=typeConstr, p),
-          ),
-        )
-        switch p.token {
-        | Equal =>
-          Parser.next(p)
-          let (priv, kind) = parseTypeRepresentation(p)
-          (Some(typ), priv, kind)
-        | EqualGreater =>
-          Parser.next(p)
-          let returnType = parseTypExpr(~alias=false, p)
-          let loc = mkLoc(uidentStartPos, p.prevEndPos)
-          let arrowType = Ast_helper.Typ.arrow(~loc, Asttypes.Nolabel, typ, returnType)
-          let typ = parseTypeAlias(p, arrowType)
-          (Some(typ), Asttypes.Public, Parsetree.Ptype_abstract)
-        | _ => (Some(typ), Asttypes.Public, Parsetree.Ptype_abstract)
-        }
-      | _ =>
-        let uidentEndPos = p.endPos
-        let (args, res) = parseConstrDeclArgs(p)
-        let first = Some({
-          let uidentLoc = mkLoc(uidentStartPos, uidentEndPos)
-          Ast_helper.Type.constructor(
-            ~loc=mkLoc(uidentStartPos, p.prevEndPos),
-            ~res?,
-            ~args,
-            Location.mkloc(uident, uidentLoc),
-          )
-        })
-        (
-          None,
-          Asttypes.Public,
-          Parsetree.Ptype_variant(parseTypeConstructorDeclarations(p, ~first?)),
-        )
-      }
-    | t =>
-      Parser.err(p, Diagnostics.uident(t))
-      /* TODO: is this a good idea? */
-      (None, Asttypes.Public, Parsetree.Ptype_abstract)
-    }
-  }
-
-  and parseRecordOrBsObjectDecl = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Lbrace, p)
-    switch p.Parser.token {
-    | DotDot | Dot =>
-      let closedFlag = switch p.token {
-      | DotDot =>
-        Parser.next(p)
-        Asttypes.Open
-      | Dot =>
-        Parser.next(p)
-        Asttypes.Closed
-      | _ => Asttypes.Closed
-      }
-
-      let fields = parseCommaDelimitedRegion(
-        ~grammar=Grammar.StringFieldDeclarations,
-        ~closing=Rbrace,
-        ~f=parseStringFieldDeclaration,
-        p,
-      )
-
-      Parser.expect(Rbrace, p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      let typ = makeBsObjType(~attrs=list{}, ~loc, ~closed=closedFlag, fields) |> parseTypeAlias(p)
-
-      let typ = parseArrowTypeRest(~es6Arrow=true, ~startPos, typ, p)
-      (Some(typ), Asttypes.Public, Parsetree.Ptype_abstract)
-    | _ =>
-      let attrs = parseAttributes(p)
-      switch p.Parser.token {
-      | String(_) =>
-        let closedFlag = Asttypes.Closed
-        let fields = switch attrs {
-        | list{} =>
-          parseCommaDelimitedRegion(
-            ~grammar=Grammar.StringFieldDeclarations,
-            ~closing=Rbrace,
-            ~f=parseStringFieldDeclaration,
-            p,
-          )
-        | attrs =>
-          let first = {
-            Parser.leaveBreadcrumb(p, Grammar.StringFieldDeclarations)
-            let field = switch parseStringFieldDeclaration(p) {
-            | Some(field) => field
-            | None => assert false
-            }
-
-            /* parse comma after first */
-            let () = switch p.Parser.token {
-            | Rbrace | Eof => ()
-            | Comma => Parser.next(p)
-            | _ => Parser.expect(Comma, p)
-            }
-
-            Parser.eatBreadcrumb(p)
-            switch field {
-            | Parsetree.Otag(label, _, ct) => Parsetree.Otag(label, attrs, ct)
-            | Oinherit(ct) => Oinherit(ct)
-            }
-          }
-
-          list{
-            first,
-            ...parseCommaDelimitedRegion(
-              ~grammar=Grammar.StringFieldDeclarations,
-              ~closing=Rbrace,
-              ~f=parseStringFieldDeclaration,
-              p,
-            ),
-          }
-        }
-
-        Parser.expect(Rbrace, p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        let typ =
-          makeBsObjType(~attrs=list{}, ~loc, ~closed=closedFlag, fields) |> parseTypeAlias(p)
-
-        let typ = parseArrowTypeRest(~es6Arrow=true, ~startPos, typ, p)
-        (Some(typ), Asttypes.Public, Parsetree.Ptype_abstract)
-      | _ =>
-        Parser.leaveBreadcrumb(p, Grammar.RecordDecl)
-        let fields = switch attrs {
-        | list{} =>
-          parseCommaDelimitedRegion(
-            ~grammar=Grammar.FieldDeclarations,
-            ~closing=Rbrace,
-            ~f=parseFieldDeclarationRegion,
-            p,
-          )
-        | list{attr, ..._} as attrs =>
-          let first = {
-            let field = parseFieldDeclaration(p)
-            Parser.optional(p, Comma) |> ignore
-            {
-              ...field,
-              Parsetree.pld_attributes: attrs,
-              pld_loc: {
-                ...field.Parsetree.pld_loc,
-                loc_start: (attr |> fst).loc.loc_start,
-              },
-            }
-          }
-
-          list{
-            first,
-            ...parseCommaDelimitedRegion(
-              ~grammar=Grammar.FieldDeclarations,
-              ~closing=Rbrace,
-              ~f=parseFieldDeclarationRegion,
-              p,
-            ),
-          }
-        }
-
-        let () = switch fields {
-        | list{} =>
-          Parser.err(~startPos, p, Diagnostics.message("A record needs at least one field"))
-        | _ => ()
-        }
-
-        Parser.expect(Rbrace, p)
-        Parser.eatBreadcrumb(p)
-        (None, Asttypes.Public, Parsetree.Ptype_record(fields))
-      }
-    }
-  }
-
-  and parsePrivateEqOrRepr = p => {
-    Parser.expect(Private, p)
-    switch p.Parser.token {
-    | Lbrace =>
-      let (manifest, _, kind) = parseRecordOrBsObjectDecl(p)
-      (manifest, Asttypes.Private, kind)
-    | Uident(_) =>
-      let (manifest, _, kind) = parseTypeEquationOrConstrDecl(p)
-      (manifest, Asttypes.Private, kind)
-    | Bar | DotDot =>
-      let (_, kind) = parseTypeRepresentation(p)
-      (None, Asttypes.Private, kind)
-    | t when Grammar.isTypExprStart(t) => (
-        Some(parseTypExpr(p)),
-        Asttypes.Private,
-        Parsetree.Ptype_abstract,
-      )
-    | _ =>
-      let (_, kind) = parseTypeRepresentation(p)
-      (None, Asttypes.Private, kind)
-    }
-  }
-
-  /*
-    polymorphic-variant-type	::=
-                              | [ tag-spec-first  { | tag-spec } ]
-                              | [> [ tag-spec ]  { | tag-spec } ]
-                              | [< [|] tag-spec-full  { | tag-spec-full }  [ > { `tag-name }+ ] ]
-
-              tag-spec-first	::=	`tag-name  [ of typexpr ]
- 	                            |	[ typexpr ] |  tag-spec
-
-                    tag-spec	::=	`tag-name  [ of typexpr ]
- 	                            |	typexpr
-
-                tag-spec-full	::=	`tag-name  [ of [&] typexpr  { & typexpr } ]
-                               |	typexpr
- */
-  and parsePolymorphicVariantType = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Lbracket, p)
-    switch p.token {
-    | GreaterThan =>
-      Parser.next(p)
-      let rowFields = switch p.token {
-      | Rbracket => list{}
-      | Bar => parseTagSpecs(p)
-      | _ =>
-        let rowField = parseTagSpec(p)
-        list{rowField, ...parseTagSpecs(p)}
-      }
-
-      let variant = {
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Ast_helper.Typ.variant(~attrs, ~loc, rowFields, Open, None)
-      }
-      Parser.expect(Rbracket, p)
-      variant
-    | LessThan =>
-      Parser.next(p)
-      Parser.optional(p, Bar) |> ignore
-      let rowField = parseTagSpecFull(p)
-      let rowFields = parseTagSpecFulls(p)
-      let tagNames = if p.token === GreaterThan {
-        Parser.next(p)
-        let rec loop = p =>
-          switch p.Parser.token {
-          | Rbracket => list{}
-          | _ =>
-            let (ident, _loc) = parseHashIdent(~startPos=p.startPos, p)
-            list{ident, ...loop(p)}
-          }
-
-        loop(p)
-      } else {
-        list{}
-      }
-      let variant = {
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Ast_helper.Typ.variant(~attrs, ~loc, list{rowField, ...rowFields}, Closed, Some(tagNames))
-      }
-      Parser.expect(Rbracket, p)
-      variant
-    | _ =>
-      let rowFields1 = parseTagSpecFirst(p)
-      let rowFields2 = parseTagSpecs(p)
-      let variant = {
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Ast_helper.Typ.variant(~attrs, ~loc, \"@"(rowFields1, rowFields2), Closed, None)
-      }
-      Parser.expect(Rbracket, p)
-      variant
-    }
-  }
-
-  and parseTagSpecFulls = p =>
-    switch p.Parser.token {
-    | Rbracket => list{}
-    | GreaterThan => list{}
-    | Bar =>
-      Parser.next(p)
-      let rowField = parseTagSpecFull(p)
-      list{rowField, ...parseTagSpecFulls(p)}
-    | _ => list{}
-    }
-
-  and parseTagSpecFull = p => {
-    let attrs = parseAttributes(p)
-    switch p.Parser.token {
-    | Hash => parsePolymorphicVariantTypeSpecHash(~attrs, ~full=true, p)
-    | _ =>
-      let typ = parseTypExpr(~attrs, p)
-      Parsetree.Rinherit(typ)
-    }
-  }
-
-  and parseTagSpecs = p =>
-    switch p.Parser.token {
-    | Bar =>
-      Parser.next(p)
-      let rowField = parseTagSpec(p)
-      list{rowField, ...parseTagSpecs(p)}
-    | _ => list{}
-    }
-
-  and parseTagSpec = p => {
-    let attrs = parseAttributes(p)
-    switch p.Parser.token {
-    | Hash => parsePolymorphicVariantTypeSpecHash(~attrs, ~full=false, p)
-    | _ =>
-      let typ = parseTypExpr(~attrs, p)
-      Parsetree.Rinherit(typ)
-    }
-  }
-
-  and parseTagSpecFirst = p => {
-    let attrs = parseAttributes(p)
-    switch p.Parser.token {
-    | Bar =>
-      Parser.next(p)
-      list{parseTagSpec(p)}
-    | Hash => list{parsePolymorphicVariantTypeSpecHash(~attrs, ~full=false, p)}
-    | _ =>
-      let typ = parseTypExpr(~attrs, p)
-      Parser.expect(Bar, p)
-      list{Parsetree.Rinherit(typ), parseTagSpec(p)}
-    }
-  }
-
-  and parsePolymorphicVariantTypeSpecHash = (~attrs, ~full, p): Parsetree.row_field => {
-    let startPos = p.Parser.startPos
-    let (ident, loc) = parseHashIdent(~startPos, p)
-    let rec loop = p =>
-      switch p.Parser.token {
-      | Band when full =>
-        Parser.next(p)
-        let rowField = parsePolymorphicVariantTypeArgs(p)
-        list{rowField, ...loop(p)}
-      | _ => list{}
-      }
-
-    let (firstTuple, tagContainsAConstantEmptyConstructor) = switch p.Parser.token {
-    | Band when full =>
-      Parser.next(p)
-      (list{parsePolymorphicVariantTypeArgs(p)}, true)
-    | Lparen => (list{parsePolymorphicVariantTypeArgs(p)}, false)
-    | _ => (list{}, true)
-    }
-
-    let tuples = \"@"(firstTuple, loop(p))
-    Parsetree.Rtag(Location.mkloc(ident, loc), attrs, tagContainsAConstantEmptyConstructor, tuples)
-  }
-
-  and parsePolymorphicVariantTypeArgs = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Lparen, p)
-    let args = parseCommaDelimitedRegion(
-      ~grammar=Grammar.TypExprList,
-      ~closing=Rparen,
-      ~f=parseTypExprRegion,
-      p,
-    )
-
-    Parser.expect(Rparen, p)
-    let attrs = list{}
-    let loc = mkLoc(startPos, p.prevEndPos)
-    switch args {
-    | list{{ptyp_desc: Ptyp_tuple(_)} as typ} as types =>
-      if p.mode == ParseForTypeChecker {
-        typ
-      } else {
-        Ast_helper.Typ.tuple(~loc, ~attrs, types)
-      }
-    | list{typ} => typ
-    | types => Ast_helper.Typ.tuple(~loc, ~attrs, types)
-    }
-  }
-
-  and parseTypeEquationAndRepresentation = p =>
-    switch p.Parser.token {
-    | (Equal | Bar) as token =>
-      if token == Bar {
-        Parser.expect(Equal, p)
-      }
-      Parser.next(p)
-      switch p.Parser.token {
-      | Uident(_) => parseTypeEquationOrConstrDecl(p)
-      | Lbrace => parseRecordOrBsObjectDecl(p)
-      | Private => parsePrivateEqOrRepr(p)
-      | Bar | DotDot =>
-        let (priv, kind) = parseTypeRepresentation(p)
-        (None, priv, kind)
-      | _ =>
-        let manifest = Some(parseTypExpr(p))
-        switch p.Parser.token {
-        | Equal =>
-          Parser.next(p)
-          let (priv, kind) = parseTypeRepresentation(p)
-          (manifest, priv, kind)
-        | _ => (manifest, Public, Parsetree.Ptype_abstract)
-        }
-      }
-    | _ => (None, Public, Parsetree.Ptype_abstract)
-    }
-
-  /* type-definition	::=	type [rec] typedef  { and typedef }
-   * typedef	::=	typeconstr-name [type-params] type-information
-   * type-information	::=	[type-equation]  [type-representation]  { type-constraint }
-   * type-equation	::=	= typexpr */
-  and parseTypeDef = (~attrs, ~startPos, p) => {
-    Parser.leaveBreadcrumb(p, Grammar.TypeDef)
-    /* let attrs = match attrs with | Some attrs -> attrs | None -> parseAttributes p in */
-    Parser.leaveBreadcrumb(p, Grammar.TypeConstrName)
-    let (name, loc) = parseLident(p)
-    let typeConstrName = Location.mkloc(name, loc)
-    Parser.eatBreadcrumb(p)
-    let params = {
-      let constrName = Location.mkloc(Longident.Lident(name), loc)
-      parseTypeParams(~parent=constrName, p)
-    }
-    let typeDef = {
-      let (manifest, priv, kind) = parseTypeEquationAndRepresentation(p)
-      let cstrs = parseTypeConstraints(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Type.mk(~loc, ~attrs, ~priv, ~kind, ~params, ~cstrs, ~manifest?, typeConstrName)
-    }
-
-    Parser.eatBreadcrumb(p)
-    typeDef
-  }
-
-  and parseTypeExtension = (~params, ~attrs, ~name, p) => {
-    Parser.expect(PlusEqual, p)
-    let priv = if Parser.optional(p, Token.Private) {
-      Asttypes.Private
-    } else {
-      Asttypes.Public
-    }
-
-    let constrStart = p.Parser.startPos
-    Parser.optional(p, Bar) |> ignore
-    let first = {
-      let (attrs, name, kind) = switch p.Parser.token {
-      | Bar =>
-        Parser.next(p)
-        parseConstrDef(~parseAttrs=true, p)
-      | _ => parseConstrDef(~parseAttrs=true, p)
-      }
-
-      let loc = mkLoc(constrStart, p.prevEndPos)
-      Ast_helper.Te.constructor(~loc, ~attrs, name, kind)
-    }
-
-    let rec loop = (p, cs) =>
-      switch p.Parser.token {
-      | Bar =>
-        let startPos = p.Parser.startPos
-        Parser.next(p)
-        let (attrs, name, kind) = parseConstrDef(~parseAttrs=true, p)
-        let extConstr = Ast_helper.Te.constructor(
-          ~attrs,
-          ~loc=mkLoc(startPos, p.prevEndPos),
-          name,
-          kind,
-        )
-
-        loop(p, list{extConstr, ...cs})
-      | _ => List.rev(cs)
-      }
-
-    let constructors = loop(p, list{first})
-    Ast_helper.Te.mk(~attrs, ~params, ~priv, name, constructors)
-  }
-
-  and parseTypeDefinitions = (~attrs, ~name, ~params, ~startPos, p) => {
-    let typeDef = {
-      let (manifest, priv, kind) = parseTypeEquationAndRepresentation(p)
-      let cstrs = parseTypeConstraints(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Type.mk(
-        ~loc,
-        ~attrs,
-        ~priv,
-        ~kind,
-        ~params,
-        ~cstrs,
-        ~manifest?,
-        {...name, txt: lidentOfPath(name.Location.txt)},
-      )
-    }
-
-    let rec loop = (p, defs) => {
-      let startPos = p.Parser.startPos
-      let attrs = parseAttributesAndBinding(p)
-      switch p.Parser.token {
-      | And =>
-        Parser.next(p)
-        let attrs = switch p.token {
-        | Export =>
-          let exportLoc = mkLoc(p.startPos, p.endPos)
-          Parser.next(p)
-          let genTypeAttr = (Location.mkloc("genType", exportLoc), Parsetree.PStr(list{}))
-          list{genTypeAttr, ...attrs}
-        | _ => attrs
-        }
-
-        let typeDef = parseTypeDef(~attrs, ~startPos, p)
-        loop(p, list{typeDef, ...defs})
-      | _ => List.rev(defs)
-      }
-    }
-
-    loop(p, list{typeDef})
-  }
-
-  /* TODO: decide if we really want type extensions (eg. type x += Blue)
-   * It adds quite a bit of complexity that can be avoided,
-   * implemented for now. Needed to get a feel for the complexities of
-   * this territory of the grammar */
-  and parseTypeDefinitionOrExtension = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Token.Typ, p)
-    let recFlag = switch p.token {
-    | Rec =>
-      Parser.next(p)
-      Asttypes.Recursive
-    | Lident("nonrec") =>
-      Parser.next(p)
-      Asttypes.Nonrecursive
-    | _ => Asttypes.Nonrecursive
-    }
-
-    let name = parseValuePath(p)
-    let params = parseTypeParams(~parent=name, p)
-    switch p.Parser.token {
-    | PlusEqual => TypeExt(parseTypeExtension(~params, ~attrs, ~name, p))
-    | _ =>
-      let typeDefs = parseTypeDefinitions(~attrs, ~name, ~params, ~startPos, p)
-      TypeDef({recFlag: recFlag, types: typeDefs})
-    }
-  }
-
-  and parsePrimitive = p =>
-    switch p.Parser.token {
-    | String(s) =>
-      Parser.next(p)
-      Some(s)
-    | _ => None
-    }
-
-  and parsePrimitives = p =>
-    switch parseRegion(~grammar=Grammar.Primitive, ~f=parsePrimitive, p) {
-    | list{} =>
-      let msg = "An external definition should have at least one primitive. Example: \"setTimeout\""
-      Parser.err(p, Diagnostics.message(msg))
-      list{}
-    | primitives => primitives
-    }
-
-  /* external value-name : typexp = external-declaration */
-  and parseExternalDef = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    Parser.leaveBreadcrumb(p, Grammar.External)
-    Parser.expect(Token.External, p)
-    let (name, loc) = parseLident(p)
-    let name = Location.mkloc(name, loc)
-    Parser.expect(~grammar=Grammar.TypeExpression, Colon, p)
-    let typExpr = parseTypExpr(p)
-    Parser.expect(Equal, p)
-    let prim = parsePrimitives(p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    let vb = Ast_helper.Val.mk(~loc, ~attrs, ~prim, name, typExpr)
-    Parser.eatBreadcrumb(p)
-    vb
-  }
-
-  /* constr-def ::=
-   *  | constr-decl
-   *  | constr-name = constr
-   *
-   *  constr-decl ::= constr-name constr-args
-   *  constr-name ::= uident
-   *  constr      ::= path-uident */
-  and parseConstrDef = (~parseAttrs, p) => {
-    let attrs = if parseAttrs {
-      parseAttributes(p)
-    } else {
-      list{}
-    }
-    let name = switch p.Parser.token {
-    | Uident(name) =>
-      let loc = mkLoc(p.startPos, p.endPos)
-      Parser.next(p)
-      Location.mkloc(name, loc)
-    | t =>
-      Parser.err(p, Diagnostics.uident(t))
-      Location.mknoloc("_")
-    }
-
-    let kind = switch p.Parser.token {
-    | Lparen =>
-      let (args, res) = parseConstrDeclArgs(p)
-      Parsetree.Pext_decl(args, res)
-    | Equal =>
-      Parser.next(p)
-      let longident = parseModuleLongIdent(~lowercase=false, p)
-      Parsetree.Pext_rebind(longident)
-    | _ => Parsetree.Pext_decl(Pcstr_tuple(list{}), None)
-    }
-
-    (attrs, name, kind)
-  }
-
-  /*
-   * exception-definition	::=
-   *  | exception constr-decl
-   *  ∣	exception constr-name = constr
-   *
-   *  constr-name ::= uident
-   *  constr ::= long_uident */
-  and parseExceptionDef = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Token.Exception, p)
-    let (_, name, kind) = parseConstrDef(~parseAttrs=false, p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Te.constructor(~loc, ~attrs, name, kind)
-  }
-
-  /* module structure on the file level */
-  @progress((Parser.next, Parser.expect, Parser.checkProgress))
-  and parseImplementation = (p): Parsetree.structure =>
-    parseRegion(p, ~grammar=Grammar.Implementation, ~f=parseStructureItemRegion)
-
-  and parseStructureItemRegion = p => {
-    let startPos = p.Parser.startPos
-    let attrs = parseAttributes(p)
-    switch p.Parser.token {
-    | Open =>
-      let openDescription = parseOpenDescription(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Str.open_(~loc, openDescription))
-    | Let =>
-      let (recFlag, letBindings) = parseLetBindings(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Str.value(~loc, recFlag, letBindings))
-    | Typ =>
-      Parser.beginRegion(p)
-      switch parseTypeDefinitionOrExtension(~attrs, p) {
-      | TypeDef({recFlag, types}) =>
-        Parser.optional(p, Semicolon) |> ignore
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Parser.endRegion(p)
-        Some(Ast_helper.Str.type_(~loc, recFlag, types))
-      | TypeExt(ext) =>
-        Parser.optional(p, Semicolon) |> ignore
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Parser.endRegion(p)
-        Some(Ast_helper.Str.type_extension(~loc, ext))
-      }
-    | External =>
-      let externalDef = parseExternalDef(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Str.primitive(~loc, externalDef))
-    | Import =>
-      let importDescr = parseJsImport(~startPos, ~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      let structureItem = JsFfi.toParsetree(importDescr)
-      Some({...structureItem, pstr_loc: loc})
-    | Exception =>
-      let exceptionDef = parseExceptionDef(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Str.exception_(~loc, exceptionDef))
-    | Include =>
-      let includeStatement = parseIncludeStatement(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Str.include_(~loc, includeStatement))
-    | Export =>
-      let structureItem = parseJsExport(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some({...structureItem, pstr_loc: loc})
-    | Module =>
-      let structureItem = parseModuleOrModuleTypeImplOrPackExpr(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some({...structureItem, pstr_loc: loc})
-    | AtAt =>
-      let attr = parseStandaloneAttribute(p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Str.attribute(~loc, attr))
-    | PercentPercent =>
-      let extension = parseExtension(~moduleLanguage=true, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Str.extension(~attrs, ~loc, extension))
-    | token when Grammar.isExprStart(token) =>
-      let prevEndPos = p.Parser.endPos
-      let exp = parseExpr(p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Parser.checkProgress(~prevEndPos, ~result=Ast_helper.Str.eval(~loc, ~attrs, exp), p)
-    | _ => None
-    }
-  }
-
-  and parseJsImport = (~startPos, ~attrs, p) => {
-    Parser.expect(Token.Import, p)
-    let importSpec = switch p.Parser.token {
-    | Token.Lident(_) | Token.At =>
-      let decl = switch parseJsFfiDeclaration(p) {
-      | Some(decl) => decl
-      | None => assert false
-      }
-
-      JsFfi.Default(decl)
-    | _ => JsFfi.Spec(parseJsFfiDeclarations(p))
-    }
-
-    let scope = parseJsFfiScope(p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    JsFfi.importDescr(~attrs, ~importSpec, ~scope, ~loc)
-  }
-
-  and parseJsExport = (~attrs, p) => {
-    let exportStart = p.Parser.startPos
-    Parser.expect(Token.Export, p)
-    let exportLoc = mkLoc(exportStart, p.prevEndPos)
-    let genTypeAttr = (Location.mkloc("genType", exportLoc), Parsetree.PStr(list{}))
-    let attrs = list{genTypeAttr, ...attrs}
-    switch p.Parser.token {
-    | Typ =>
-      switch parseTypeDefinitionOrExtension(~attrs, p) {
-      | TypeDef({recFlag, types}) => Ast_helper.Str.type_(recFlag, types)
-      | TypeExt(ext) => Ast_helper.Str.type_extension(ext)
-      }
-    /* Let */ | _ =>
-      let (recFlag, letBindings) = parseLetBindings(~attrs, p)
-      Ast_helper.Str.value(recFlag, letBindings)
-    }
-  }
-
-  and parseJsFfiScope = p =>
-    switch p.Parser.token {
-    | Token.Lident("from") =>
-      Parser.next(p)
-      switch p.token {
-      | String(s) =>
-        Parser.next(p)
-        JsFfi.Module(s)
-      | Uident(_) | Lident(_) =>
-        let value = parseIdentPath(p)
-        JsFfi.Scope(value)
-      | _ => JsFfi.Global
-      }
-    | _ => JsFfi.Global
-    }
-
-  and parseJsFfiDeclarations = p => {
-    Parser.expect(Token.Lbrace, p)
-    let decls = parseCommaDelimitedRegion(
-      ~grammar=Grammar.JsFfiImport,
-      ~closing=Rbrace,
-      ~f=parseJsFfiDeclaration,
-      p,
-    )
-
-    Parser.expect(Rbrace, p)
-    decls
-  }
-
-  and parseJsFfiDeclaration = p => {
-    let startPos = p.Parser.startPos
-    let attrs = parseAttributes(p)
-    switch p.Parser.token {
-    | Lident(_) =>
-      let (ident, _) = parseLident(p)
-      let alias = switch p.token {
-      | As =>
-        Parser.next(p)
-        let (ident, _) = parseLident(p)
-        ident
-      | _ => ident
-      }
-
-      Parser.expect(Token.Colon, p)
-      let typ = parseTypExpr(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(JsFfi.decl(~loc, ~alias, ~attrs, ~name=ident, ~typ))
-    | _ => None
-    }
-  }
-
-  /* include-statement ::= include module-expr */
-  and parseIncludeStatement = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Token.Include, p)
-    let modExpr = parseModuleExpr(p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Incl.mk(~loc, ~attrs, modExpr)
-  }
-
-  and parseAtomicModuleExpr = p => {
-    let startPos = p.Parser.startPos
-    switch p.Parser.token {
-    | Uident(_ident) =>
-      let longident = parseModuleLongIdent(~lowercase=false, p)
-      Ast_helper.Mod.ident(~loc=longident.loc, longident)
-    | Lbrace =>
-      Parser.next(p)
-      let structure = Ast_helper.Mod.structure(
-        parseDelimitedRegion(
-          ~grammar=Grammar.Structure,
-          ~closing=Rbrace,
-          ~f=parseStructureItemRegion,
-          p,
-        ),
-      )
-      Parser.expect(Rbrace, p)
-      let endPos = p.prevEndPos
-      {...structure, pmod_loc: mkLoc(startPos, endPos)}
-    | Lparen =>
-      Parser.next(p)
-      let modExpr = switch p.token {
-      | Rparen => Ast_helper.Mod.structure(~loc=mkLoc(startPos, p.prevEndPos), list{})
-      | _ => parseConstrainedModExpr(p)
-      }
-
-      Parser.expect(Rparen, p)
-      modExpr
-    | Lident("unpack") =>
-      /* TODO: should this be made a keyword?? */
-      Parser.next(p)
-      Parser.expect(Lparen, p)
-      let expr = parseExpr(p)
-      switch p.Parser.token {
-      | Colon =>
-        let colonStart = p.Parser.startPos
-        Parser.next(p)
-        let attrs = parseAttributes(p)
-        let packageType = parsePackageType(~startPos=colonStart, ~attrs, p)
-        Parser.expect(Rparen, p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        let constraintExpr = Ast_helper.Exp.constraint_(~loc, expr, packageType)
-
-        Ast_helper.Mod.unpack(~loc, constraintExpr)
-      | _ =>
-        Parser.expect(Rparen, p)
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Ast_helper.Mod.unpack(~loc, expr)
-      }
-    | Percent =>
-      let extension = parseExtension(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Mod.extension(~loc, extension)
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      Recover.defaultModuleExpr()
-    }
-  }
-
-  and parsePrimaryModExpr = p => {
-    let startPos = p.Parser.startPos
-    let modExpr = parseAtomicModuleExpr(p)
-    let rec loop = (p, modExpr) =>
-      switch p.Parser.token {
-      | Lparen when p.prevEndPos.pos_lnum === p.startPos.pos_lnum =>
-        loop(p, parseModuleApplication(p, modExpr))
-      | _ => modExpr
-      }
-
-    let modExpr = loop(p, modExpr)
-    {...modExpr, pmod_loc: mkLoc(startPos, p.prevEndPos)}
-  }
-
-  /*
-   * functor-arg ::=
-   *  | uident : modtype
-   *  | _ : modtype
-   *  | modtype           --> "punning" for _ : modtype
-   *  | attributes functor-arg
-   */
-  and parseFunctorArg = p => {
-    let startPos = p.Parser.startPos
-    let attrs = parseAttributes(p)
-    switch p.Parser.token {
-    | Uident(ident) =>
-      Parser.next(p)
-      let uidentEndPos = p.prevEndPos
-      switch p.Parser.token {
-      | Colon =>
-        Parser.next(p)
-        let moduleType = parseModuleType(p)
-        let loc = mkLoc(startPos, uidentEndPos)
-        let argName = Location.mkloc(ident, loc)
-        Some(attrs, argName, Some(moduleType), startPos)
-      | Dot =>
-        Parser.next(p)
-        let moduleType = {
-          let moduleLongIdent = parseModuleLongIdentTail(
-            ~lowercase=false,
-            p,
-            startPos,
-            Longident.Lident(ident),
-          )
-          Ast_helper.Mty.ident(~loc=moduleLongIdent.loc, moduleLongIdent)
-        }
-
-        let argName = Location.mknoloc("_")
-        Some(attrs, argName, Some(moduleType), startPos)
-      | _ =>
-        let loc = mkLoc(startPos, uidentEndPos)
-        let modIdent = Location.mkloc(Longident.Lident(ident), loc)
-        let moduleType = Ast_helper.Mty.ident(~loc, modIdent)
-        let argName = Location.mknoloc("_")
-        Some(attrs, argName, Some(moduleType), startPos)
-      }
-    | Underscore =>
-      Parser.next(p)
-      let argName = Location.mkloc("_", mkLoc(startPos, p.prevEndPos))
-      Parser.expect(Colon, p)
-      let moduleType = parseModuleType(p)
-      Some(attrs, argName, Some(moduleType), startPos)
-    | _ => None
-    }
-  }
-
-  and parseFunctorArgs = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Lparen, p)
-    let args = parseCommaDelimitedRegion(
-      ~grammar=Grammar.FunctorArgs,
-      ~closing=Rparen,
-      ~f=parseFunctorArg,
-      p,
-    )
-
-    Parser.expect(Rparen, p)
-    switch args {
-    | list{} => list{(list{}, Location.mkloc("*", mkLoc(startPos, p.prevEndPos)), None, startPos)}
-    | args => args
-    }
-  }
-
-  and parseFunctorModuleExpr = p => {
-    let startPos = p.Parser.startPos
-    let args = parseFunctorArgs(p)
-    let returnType = switch p.Parser.token {
-    | Colon =>
-      Parser.next(p)
-      Some(parseModuleType(~es6Arrow=false, p))
-    | _ => None
-    }
-
-    Parser.expect(EqualGreater, p)
-    let rhsModuleExpr = {
-      let modExpr = parseModuleExpr(p)
-      switch returnType {
-      | Some(modType) =>
-        Ast_helper.Mod.constraint_(
-          ~loc=mkLoc(modExpr.pmod_loc.loc_start, modType.Parsetree.pmty_loc.loc_end),
-          modExpr,
-          modType,
-        )
-      | None => modExpr
-      }
-    }
-
-    let endPos = p.prevEndPos
-    let modExpr = List.fold_right(
-      ((attrs, name, moduleType, startPos), acc) =>
-        Ast_helper.Mod.functor_(~loc=mkLoc(startPos, endPos), ~attrs, name, moduleType, acc),
-      args,
-      rhsModuleExpr,
-    )
-
-    {...modExpr, pmod_loc: mkLoc(startPos, endPos)}
-  }
-
-  /* module-expr	::=
-   *  | module-path
-   *  ∣	{ structure-items }
-   *  ∣	functorArgs =>  module-expr
-   *  ∣	module-expr(module-expr)
-   *  ∣	( module-expr )
-   *  ∣	( module-expr : module-type )
-   *  | extension
-   *  | attributes module-expr */
-  and parseModuleExpr = p => {
-    let attrs = parseAttributes(p)
-    let modExpr = if isEs6ArrowFunctor(p) {
-      parseFunctorModuleExpr(p)
-    } else {
-      parsePrimaryModExpr(p)
-    }
-
-    {...modExpr, pmod_attributes: List.concat(list{modExpr.pmod_attributes, attrs})}
-  }
-
-  and parseConstrainedModExpr = p => {
-    let modExpr = parseModuleExpr(p)
-    switch p.Parser.token {
-    | Colon =>
-      Parser.next(p)
-      let modType = parseModuleType(p)
-      let loc = mkLoc(modExpr.pmod_loc.loc_start, modType.pmty_loc.loc_end)
-      Ast_helper.Mod.constraint_(~loc, modExpr, modType)
-    | _ => modExpr
-    }
-  }
-
-  and parseConstrainedModExprRegion = p =>
-    if Grammar.isModExprStart(p.Parser.token) {
-      Some(parseConstrainedModExpr(p))
-    } else {
-      None
-    }
-
-  and parseModuleApplication = (p, modExpr) => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Lparen, p)
-    let args = parseCommaDelimitedRegion(
-      ~grammar=Grammar.ModExprList,
-      ~closing=Rparen,
-      ~f=parseConstrainedModExprRegion,
-      p,
-    )
-
-    Parser.expect(Rparen, p)
-    let args = switch args {
-    | list{} =>
-      let loc = mkLoc(startPos, p.prevEndPos)
-      list{Ast_helper.Mod.structure(~loc, list{})}
-    | args => args
-    }
-
-    List.fold_left(
-      (modExpr, arg) =>
-        Ast_helper.Mod.apply(
-          ~loc=mkLoc(modExpr.Parsetree.pmod_loc.loc_start, arg.Parsetree.pmod_loc.loc_end),
-          modExpr,
-          arg,
-        ),
-      modExpr,
-      args,
-    )
-  }
-
-  and parseModuleOrModuleTypeImplOrPackExpr = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Module, p)
-    switch p.Parser.token {
-    | Typ => parseModuleTypeImpl(~attrs, startPos, p)
-    | Lparen =>
-      let expr = parseFirstClassModuleExpr(~startPos, p)
-      Ast_helper.Str.eval(~attrs, expr)
-    | _ => parseMaybeRecModuleBinding(~attrs, ~startPos, p)
-    }
-  }
-
-  and parseModuleTypeImpl = (~attrs, startPos, p) => {
-    Parser.expect(Typ, p)
-    let nameStart = p.Parser.startPos
-    let name = switch p.Parser.token {
-    | List =>
-      Parser.next(p)
-      let loc = mkLoc(nameStart, p.prevEndPos)
-      Location.mkloc("list", loc)
-    | Lident(ident) =>
-      Parser.next(p)
-      let loc = mkLoc(nameStart, p.prevEndPos)
-      Location.mkloc(ident, loc)
-    | Uident(ident) =>
-      Parser.next(p)
-      let loc = mkLoc(nameStart, p.prevEndPos)
-      Location.mkloc(ident, loc)
-    | t =>
-      Parser.err(p, Diagnostics.uident(t))
-      Location.mknoloc("_")
-    }
-
-    Parser.expect(Equal, p)
-    let moduleType = parseModuleType(p)
-    let moduleTypeDeclaration = Ast_helper.Mtd.mk(
-      ~attrs,
-      ~loc=mkLoc(nameStart, p.prevEndPos),
-      ~typ=moduleType,
-      name,
-    )
-
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Str.modtype(~loc, moduleTypeDeclaration)
-  }
-
-  /* definition	::=
-    ∣	 module rec module-name :  module-type =  module-expr   { and module-name
-    :  module-type =  module-expr } */
-  and parseMaybeRecModuleBinding = (~attrs, ~startPos, p) =>
-    switch p.Parser.token {
-    | Token.Rec =>
-      Parser.next(p)
-      Ast_helper.Str.rec_module(parseModuleBindings(~startPos, ~attrs, p))
-    | _ => Ast_helper.Str.module_(parseModuleBinding(~attrs, ~startPos=p.Parser.startPos, p))
-    }
-
-  and parseModuleBinding = (~attrs, ~startPos, p) => {
-    let name = switch p.Parser.token {
-    | Uident(ident) =>
-      let startPos = p.Parser.startPos
-      Parser.next(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Location.mkloc(ident, loc)
-    | t =>
-      Parser.err(p, Diagnostics.uident(t))
-      Location.mknoloc("_")
-    }
-
-    let body = parseModuleBindingBody(p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Mb.mk(~attrs, ~loc, name, body)
-  }
-
-  and parseModuleBindingBody = p => {
-    /* TODO: make required with good error message when rec module binding */
-    let returnModType = switch p.Parser.token {
-    | Colon =>
-      Parser.next(p)
-      Some(parseModuleType(p))
-    | _ => None
-    }
-
-    Parser.expect(Equal, p)
-    let modExpr = parseModuleExpr(p)
-    switch returnModType {
-    | Some(modType) =>
-      Ast_helper.Mod.constraint_(
-        ~loc=mkLoc(modType.pmty_loc.loc_start, modExpr.pmod_loc.loc_end),
-        modExpr,
-        modType,
-      )
-    | None => modExpr
-    }
-  }
-
-  /* module-name :  module-type =  module-expr
-   * { and module-name :  module-type =  module-expr } */
-  and parseModuleBindings = (~attrs, ~startPos, p) => {
-    let rec loop = (p, acc) => {
-      let startPos = p.Parser.startPos
-      let attrs = parseAttributesAndBinding(p)
-      switch p.Parser.token {
-      | And =>
-        Parser.next(p)
-        ignore(Parser.optional(p, Module)) /* over-parse for fault-tolerance */
-        let modBinding = parseModuleBinding(~attrs, ~startPos, p)
-        loop(p, list{modBinding, ...acc})
-      | _ => List.rev(acc)
-      }
-    }
-
-    let first = parseModuleBinding(~attrs, ~startPos, p)
-    loop(p, list{first})
-  }
-
-  and parseAtomicModuleType = p => {
-    let startPos = p.Parser.startPos
-    let moduleType = switch p.Parser.token {
-    | Uident(_) | Lident(_) | List =>
-      /* Ocaml allows module types to end with lowercase: module Foo : bar = { ... }
-       * lets go with uppercase terminal for now */
-      let moduleLongIdent = parseModuleLongIdent(~lowercase=true, p)
-      Ast_helper.Mty.ident(~loc=moduleLongIdent.loc, moduleLongIdent)
-    | Lparen =>
-      Parser.next(p)
-      let mty = parseModuleType(p)
-      Parser.expect(Rparen, p)
-      {...mty, pmty_loc: mkLoc(startPos, p.prevEndPos)}
-    | Lbrace =>
-      Parser.next(p)
-      let spec = parseDelimitedRegion(
-        ~grammar=Grammar.Signature,
-        ~closing=Rbrace,
-        ~f=parseSignatureItemRegion,
-        p,
-      )
-
-      Parser.expect(Rbrace, p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Mty.signature(~loc, spec)
-    | Module =>
-      /* TODO: check if this is still atomic when implementing first class modules */
-      parseModuleTypeOf(p)
-    | Percent =>
-      let extension = parseExtension(p)
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Ast_helper.Mty.extension(~loc, extension)
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      Recover.defaultModuleType()
-    }
-
-    let moduleTypeLoc = mkLoc(startPos, p.prevEndPos)
-    {...moduleType, pmty_loc: moduleTypeLoc}
-  }
-
-  and parseFunctorModuleType = p => {
-    let startPos = p.Parser.startPos
-    let args = parseFunctorArgs(p)
-    Parser.expect(EqualGreater, p)
-    let rhs = parseModuleType(p)
-    let endPos = p.prevEndPos
-    let modType = List.fold_right(
-      ((attrs, name, moduleType, startPos), acc) =>
-        Ast_helper.Mty.functor_(~loc=mkLoc(startPos, endPos), ~attrs, name, moduleType, acc),
-      args,
-      rhs,
-    )
-
-    {...modType, pmty_loc: mkLoc(startPos, endPos)}
-  }
-
-  /* Module types are the module-level equivalent of type expressions: they
-   * specify the general shape and type properties of modules.
-   *
-   * module-type ::=
-   *  | modtype-path
-   *  | { signature }
-   *  | ( module-type )               --> parenthesized module-type
-   *  | functor-args => module-type   --> functor
-   *  | module-type => module-type    --> functor
-   *  | module type of module-expr
-   *  | attributes module-type
-   *  | module-type with-mod-constraints
-   *  | extension
-   */
-  and parseModuleType = (~es6Arrow=true, ~with_=true, p) => {
-    let attrs = parseAttributes(p)
-    let modty = if es6Arrow && isEs6ArrowFunctor(p) {
-      parseFunctorModuleType(p)
-    } else {
-      let modty = parseAtomicModuleType(p)
-      switch p.Parser.token {
-      | EqualGreater when es6Arrow === true =>
-        Parser.next(p)
-        let rhs = parseModuleType(~with_=false, p)
-        let str = Location.mknoloc("_")
-        let loc = mkLoc(modty.pmty_loc.loc_start, p.prevEndPos)
-        Ast_helper.Mty.functor_(~loc, str, Some(modty), rhs)
-      | _ => modty
-      }
-    }
-
-    let moduleType = {
-      ...modty,
-      pmty_attributes: List.concat(list{modty.pmty_attributes, attrs}),
-    }
-    if with_ {
-      parseWithConstraints(moduleType, p)
-    } else {
-      moduleType
-    }
-  }
-
-  and parseWithConstraints = (moduleType, p) =>
-    switch p.Parser.token {
-    | With =>
-      Parser.next(p)
-      let first = parseWithConstraint(p)
-      let rec loop = (p, acc) =>
-        switch p.Parser.token {
-        | And =>
-          Parser.next(p)
-          loop(p, list{parseWithConstraint(p), ...acc})
-        | _ => List.rev(acc)
-        }
-
-      let constraints = loop(p, list{first})
-      let loc = mkLoc(moduleType.pmty_loc.loc_start, p.prevEndPos)
-      Ast_helper.Mty.with_(~loc, moduleType, constraints)
-    | _ => moduleType
-    }
-
-  /* mod-constraint	::=
-   *  |  type typeconstr<type-params> type-equation type-constraints?
-   *  ∣	 type typeconstr-name<type-params> := typexpr
-   *  ∣	 module module-path = extended-module-path
-   *  ∣	 module module-path :=  extended-module-path
-   *
-   *  TODO: split this up into multiple functions, better errors */
-  and parseWithConstraint = p =>
-    switch p.Parser.token {
-    | Module =>
-      Parser.next(p)
-      let modulePath = parseModuleLongIdent(~lowercase=false, p)
-      switch p.Parser.token {
-      | ColonEqual =>
-        Parser.next(p)
-        let lident = parseModuleLongIdent(~lowercase=false, p)
-        Parsetree.Pwith_modsubst(modulePath, lident)
-      | Equal =>
-        Parser.next(p)
-        let lident = parseModuleLongIdent(~lowercase=false, p)
-        Parsetree.Pwith_module(modulePath, lident)
-      | token =>
-        /* TODO: revisit */
-        Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-        let lident = parseModuleLongIdent(~lowercase=false, p)
-        Parsetree.Pwith_modsubst(modulePath, lident)
-      }
-    | Typ =>
-      Parser.next(p)
-      let typeConstr = parseValuePath(p)
-      let params = parseTypeParams(~parent=typeConstr, p)
-      switch p.Parser.token {
-      | ColonEqual =>
-        Parser.next(p)
-        let typExpr = parseTypExpr(p)
-        Parsetree.Pwith_typesubst(
-          typeConstr,
-          Ast_helper.Type.mk(
-            ~loc=typeConstr.loc,
-            ~params,
-            ~manifest=typExpr,
-            Location.mkloc(Longident.last(typeConstr.txt), typeConstr.loc),
-          ),
-        )
-      | Equal =>
-        Parser.next(p)
-        let typExpr = parseTypExpr(p)
-        let typeConstraints = parseTypeConstraints(p)
-        Parsetree.Pwith_type(
-          typeConstr,
-          Ast_helper.Type.mk(
-            ~loc=typeConstr.loc,
-            ~params,
-            ~manifest=typExpr,
-            ~cstrs=typeConstraints,
-            Location.mkloc(Longident.last(typeConstr.txt), typeConstr.loc),
-          ),
-        )
-      | token =>
-        /* TODO: revisit */
-        Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-        let typExpr = parseTypExpr(p)
-        let typeConstraints = parseTypeConstraints(p)
-        Parsetree.Pwith_type(
-          typeConstr,
-          Ast_helper.Type.mk(
-            ~loc=typeConstr.loc,
-            ~params,
-            ~manifest=typExpr,
-            ~cstrs=typeConstraints,
-            Location.mkloc(Longident.last(typeConstr.txt), typeConstr.loc),
-          ),
-        )
-      }
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      exit(-1)
-    } /* TODO: handle this case */
-
-  and parseModuleTypeOf = p => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Module, p)
-    Parser.expect(Typ, p)
-    Parser.expect(Of, p)
-    let moduleExpr = parseModuleExpr(p)
-    Ast_helper.Mty.typeof_(~loc=mkLoc(startPos, p.prevEndPos), moduleExpr)
-  }
-
-  /* module signature on the file level */
-  @progress((Parser.next, Parser.expect, Parser.checkProgress))
-  and parseSpecification = p =>
-    parseRegion(~grammar=Grammar.Specification, ~f=parseSignatureItemRegion, p)
-
-  and parseSignatureItemRegion = p => {
-    let startPos = p.Parser.startPos
-    let attrs = parseAttributes(p)
-    switch p.Parser.token {
-    | Let =>
-      Parser.beginRegion(p)
-      let valueDesc = parseSignLetDesc(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Parser.endRegion(p)
-      Some(Ast_helper.Sig.value(~loc, valueDesc))
-    | Typ =>
-      Parser.beginRegion(p)
-      switch parseTypeDefinitionOrExtension(~attrs, p) {
-      | TypeDef({recFlag, types}) =>
-        Parser.optional(p, Semicolon) |> ignore
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Parser.endRegion(p)
-        Some(Ast_helper.Sig.type_(~loc, recFlag, types))
-      | TypeExt(ext) =>
-        Parser.optional(p, Semicolon) |> ignore
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Parser.endRegion(p)
-        Some(Ast_helper.Sig.type_extension(~loc, ext))
-      }
-    | External =>
-      let externalDef = parseExternalDef(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Sig.value(~loc, externalDef))
-    | Exception =>
-      let exceptionDef = parseExceptionDef(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Sig.exception_(~loc, exceptionDef))
-    | Open =>
-      let openDescription = parseOpenDescription(~attrs, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Sig.open_(~loc, openDescription))
-    | Include =>
-      Parser.next(p)
-      let moduleType = parseModuleType(p)
-      let includeDescription = Ast_helper.Incl.mk(
-        ~loc=mkLoc(startPos, p.prevEndPos),
-        ~attrs,
-        moduleType,
-      )
-
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Sig.include_(~loc, includeDescription))
-    | Module =>
-      Parser.next(p)
-      switch p.Parser.token {
-      | Uident(_) =>
-        let modDecl = parseModuleDeclarationOrAlias(~attrs, p)
-        Parser.optional(p, Semicolon) |> ignore
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Some(Ast_helper.Sig.module_(~loc, modDecl))
-      | Rec =>
-        let recModule = parseRecModuleSpec(~attrs, ~startPos, p)
-        Parser.optional(p, Semicolon) |> ignore
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Some(Ast_helper.Sig.rec_module(~loc, recModule))
-      | Typ => Some(parseModuleTypeDeclaration(~attrs, ~startPos, p))
-      | _t =>
-        let modDecl = parseModuleDeclarationOrAlias(~attrs, p)
-        Parser.optional(p, Semicolon) |> ignore
-        let loc = mkLoc(startPos, p.prevEndPos)
-        Some(Ast_helper.Sig.module_(~loc, modDecl))
-      }
-    | AtAt =>
-      let attr = parseStandaloneAttribute(p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Sig.attribute(~loc, attr))
-    | PercentPercent =>
-      let extension = parseExtension(~moduleLanguage=true, p)
-      Parser.optional(p, Semicolon) |> ignore
-      let loc = mkLoc(startPos, p.prevEndPos)
-      Some(Ast_helper.Sig.extension(~attrs, ~loc, extension))
-    | Import =>
-      Parser.next(p)
-      parseSignatureItemRegion(p)
-    | _ => None
-    }
-  }
-
-  /* module rec module-name :  module-type  { and module-name:  module-type } */
-  and parseRecModuleSpec = (~attrs, ~startPos, p) => {
-    Parser.expect(Rec, p)
-    let rec loop = (p, spec) => {
-      let startPos = p.Parser.startPos
-      let attrs = parseAttributesAndBinding(p)
-      switch p.Parser.token {
-      | And =>
-        /* TODO: give a good error message when with constraint, no parens
-         * and ASet: (Set.S with type elt = A.t)
-         * and BTree: (Btree.S with type elt = A.t)
-         * Without parens, the `and` signals the start of another
-         * `with-constraint`
-         */
-        Parser.expect(And, p)
-        let decl = parseRecModuleDeclaration(~attrs, ~startPos, p)
-        loop(p, list{decl, ...spec})
-      | _ => List.rev(spec)
-      }
-    }
-
-    let first = parseRecModuleDeclaration(~attrs, ~startPos, p)
-    loop(p, list{first})
-  }
-
-  /* module-name : module-type */
-  and parseRecModuleDeclaration = (~attrs, ~startPos, p) => {
-    let name = switch p.Parser.token {
-    | Uident(modName) =>
-      let loc = mkLoc(p.startPos, p.endPos)
-      Parser.next(p)
-      Location.mkloc(modName, loc)
-    | t =>
-      Parser.err(p, Diagnostics.uident(t))
-      Location.mknoloc("_")
-    }
-
-    Parser.expect(Colon, p)
-    let modType = parseModuleType(p)
-    Ast_helper.Md.mk(~loc=mkLoc(startPos, p.prevEndPos), ~attrs, name, modType)
-  }
-
-  and parseModuleDeclarationOrAlias = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    let moduleName = switch p.Parser.token {
-    | Uident(ident) =>
-      let loc = mkLoc(p.Parser.startPos, p.endPos)
-      Parser.next(p)
-      Location.mkloc(ident, loc)
-    | t =>
-      Parser.err(p, Diagnostics.uident(t))
-      Location.mknoloc("_")
-    }
-
-    let body = switch p.Parser.token {
-    | Colon =>
-      Parser.next(p)
-      parseModuleType(p)
-    | Equal =>
-      Parser.next(p)
-      let lident = parseModuleLongIdent(~lowercase=false, p)
-      Ast_helper.Mty.alias(lident)
-    | token =>
-      Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-      Recover.defaultModuleType()
-    }
-
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Md.mk(~loc, ~attrs, moduleName, body)
-  }
-
-  and parseModuleTypeDeclaration = (~attrs, ~startPos, p) => {
-    Parser.expect(Typ, p)
-    let moduleName = switch p.Parser.token {
-    | Uident(ident) =>
-      let loc = mkLoc(p.startPos, p.endPos)
-      Parser.next(p)
-      Location.mkloc(ident, loc)
-    | Lident(ident) =>
-      let loc = mkLoc(p.startPos, p.endPos)
-      Parser.next(p)
-      Location.mkloc(ident, loc)
-    | t =>
-      Parser.err(p, Diagnostics.uident(t))
-      Location.mknoloc("_")
-    }
-
-    let typ = switch p.Parser.token {
-    | Equal =>
-      Parser.next(p)
-      Some(parseModuleType(p))
-    | _ => None
-    }
-
-    let moduleDecl = Ast_helper.Mtd.mk(~attrs, ~typ?, moduleName)
-    Ast_helper.Sig.modtype(~loc=mkLoc(startPos, p.prevEndPos), moduleDecl)
-  }
-
-  and parseSignLetDesc = (~attrs, p) => {
-    let startPos = p.Parser.startPos
-    Parser.expect(Let, p)
-    let (name, loc) = parseLident(p)
-    let name = Location.mkloc(name, loc)
-    Parser.expect(Colon, p)
-    let typExpr = parsePolyTypeExpr(p)
-    let loc = mkLoc(startPos, p.prevEndPos)
-    Ast_helper.Val.mk(~loc, ~attrs, name, typExpr)
-  }
-
-  /* attr-id	::=	lowercase-ident
- 	∣	  capitalized-ident
- 	∣	  attr-id .  attr-id */
-  and parseAttributeId = p => {
-    let startPos = p.Parser.startPos
-    let rec loop = (p, acc) =>
-      switch p.Parser.token {
-      | Lident(ident) | Uident(ident) =>
-        Parser.next(p)
-        let id = acc ++ ident
-        switch p.Parser.token {
-        | Dot =>
-          Parser.next(p)
-          loop(p, id ++ ".")
-        | _ => id
-        }
-      | token when Token.isKeyword(token) =>
-        Parser.next(p)
-        let id = acc ++ Token.toString(token)
-        switch p.Parser.token {
-        | Dot =>
-          Parser.next(p)
-          loop(p, id ++ ".")
-        | _ => id
-        }
-      | token =>
-        Parser.err(p, Diagnostics.unexpected(token, p.breadcrumbs))
-        acc
-      }
-
-    let id = loop(p, "")
-    let endPos = p.prevEndPos
-    Location.mkloc(id, mkLoc(startPos, endPos))
-  }
-
-  /*
-   * payload ::=  empty
-   *          |  ( structure-item )
-   *
-   * TODO: what about multiple structure items?
-   * @attr({let x = 1; let x = 2})
-   *
-   * Also what about type-expressions and specifications?
-   * @attr(:myType) ???
-   */
-  and parsePayload = p =>
-    switch p.Parser.token {
-    | Lparen when p.startPos.pos_cnum == p.prevEndPos.pos_cnum =>
-      Parser.next(p)
-      switch p.token {
-      | Colon =>
-        Parser.next(p)
-        let typ = parseTypExpr(p)
-        Parser.expect(Rparen, p)
-        Parsetree.PTyp(typ)
-      | _ =>
-        let items = parseDelimitedRegion(
-          ~grammar=Grammar.Structure,
-          ~closing=Rparen,
-          ~f=parseStructureItemRegion,
-          p,
-        )
-
-        Parser.expect(Rparen, p)
-        Parsetree.PStr(items)
-      }
-    | _ => Parsetree.PStr(list{})
-    }
-
-  /* type attribute = string loc * payload */
-  and parseAttribute = p =>
-    switch p.Parser.token {
-    | At =>
-      Parser.next(p)
-      let attrId = parseAttributeId(p)
-      let payload = parsePayload(p)
-      Some(attrId, payload)
-    | _ => None
-    }
-
-  and parseAttributes = p => parseRegion(p, ~grammar=Grammar.Attribute, ~f=parseAttribute)
-
-  /*
-   * standalone-attribute ::=
-   *  | @@ atribute-id
-   *  | @@ attribute-id ( structure-item )
-   */
-  and parseStandaloneAttribute = p => {
-    Parser.expect(AtAt, p)
-    let attrId = parseAttributeId(p)
-    let payload = parsePayload(p)
-    (attrId, payload)
-  }
-
-  /* extension	::=	% attr-id  attr-payload
-   *              | %% attr-id(
-   *  expr	::=	 ...
-   *    ∣	 extension
-   *
-   *  typexpr	::=	 ...
-   *    ∣	 extension
-   *
-   *  pattern	::=	 ...
-   *    ∣	 extension
-   *
-   *  module-expr	::=	 ...
-   *    ∣	 extension
-   *
-   *  module-type	::=	 ...
-   *    ∣	 extension
-   *
-   *  class-expr	::=	 ...
-   *    ∣	 extension
-   *
-   *  class-type	::=	 ...
-   *    ∣	 extension
-   *
-   *
-   * item extension nodes usable in structures and signature
-   *
-   * item-extension ::= %% attr-id
-   *                  | %% attr-id(structure-item)
-   *
-   *  attr-payload ::= structure-item
-   *
-   *  ~moduleLanguage represents whether we're on the module level or not
-   */
-  and parseExtension = (~moduleLanguage=false, p) => {
-    if moduleLanguage {
-      Parser.expect(PercentPercent, p)
-    } else {
-      Parser.expect(Percent, p)
-    }
-    let attrId = parseAttributeId(p)
-    let payload = parsePayload(p)
-    (attrId, payload)
-  }
-}
-
-module OutcomePrinter: {
-  open Format
-  open Outcometree
-
-  @live let out_value: ref<(formatter, out_value) => unit>
-  @live let out_type: ref<(formatter, out_type) => unit>
-  @live let out_class_type: ref<(formatter, out_class_type) => unit>
-  @live let out_module_type: ref<(formatter, out_module_type) => unit>
-  @live let out_sig_item: ref<(formatter, out_sig_item) => unit>
-  @live let out_signature: ref<(formatter, list<out_sig_item>) => unit>
-  @live let out_type_extension: ref<(formatter, out_type_extension) => unit>
-  @live let out_phrase: ref<(formatter, out_phrase) => unit>
-
-  @live let parenthesized_ident: string => bool
-} = {
-  /* Napkin doesn't have parenthesized identifiers.
-   * We don't support custom operators. */
-  let parenthesized_ident = _name => true
-
-  /* TODO: better allocation strategy for the buffer */
-  let escapeStringContents = s => {
-    let len = String.length(s)
-    let b = Buffer.create(len)
-    for i in 0 to len - 1 {
-      let c = (@doesNotRaise String.get)(s, i)
-      if c == '\b' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, 'b')
-      } else if c == '\t' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, 't')
-      } else if c == '\n' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, 'n')
-      } else if c == '\r' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, 'r')
-      } else if c == '"' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, '"')
-      } else if c == '\\' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, '\\')
-      } else {
-        Buffer.add_char(b, c)
-      }
-    }
-    Buffer.contents(b)
-  }
-
-  /* let rec print_ident fmt ident = match ident with
-    | Outcometree.Oide_ident s -> Format.pp_print_string fmt s
-    | Oide_dot (id, s) ->
-      print_ident fmt id;
-      Format.pp_print_char fmt '.';
-      Format.pp_print_string fmt s
-    | Oide_apply (id1, id2) ->
-      print_ident fmt id1;
-      Format.pp_print_char fmt '(';
-      print_ident fmt id2;
-      Format.pp_print_char fmt ')' */
-
-  let rec printOutIdentDoc = (ident: Outcometree.out_ident) =>
-    switch ident {
-    | Oide_ident(s) => Doc.text(s)
-    | Oide_dot(ident, s) => Doc.concat(list{printOutIdentDoc(ident), Doc.dot, Doc.text(s)})
-    | Oide_apply(call, arg) =>
-      Doc.concat(list{printOutIdentDoc(call), Doc.lparen, printOutIdentDoc(arg), Doc.rparen})
-    }
-
-  let printOutAttributeDoc = (outAttribute: Outcometree.out_attribute) =>
-    Doc.concat(list{Doc.text("@"), Doc.text(outAttribute.oattr_name)})
-
-  let printOutAttributesDoc = (attrs: list<Outcometree.out_attribute>) =>
-    switch attrs {
-    | list{} => Doc.nil
-    | attrs =>
-      Doc.concat(list{
-        Doc.group(Doc.join(~sep=Doc.line, List.map(printOutAttributeDoc, attrs))),
-        Doc.line,
-      })
-    }
-
-  let rec collectArrowArgs = (outType: Outcometree.out_type, args) =>
-    switch outType {
-    | Otyp_arrow(label, argType, returnType) =>
-      let arg = (label, argType)
-      collectArrowArgs(returnType, list{arg, ...args})
-    | _ as returnType => (List.rev(args), returnType)
-    }
-
-  let rec collectFunctorArgs = (outModuleType: Outcometree.out_module_type, args) =>
-    switch outModuleType {
-    | Omty_functor(lbl, optModType, returnModType) =>
-      let arg = (lbl, optModType)
-      collectFunctorArgs(returnModType, list{arg, ...args})
-    | _ => (List.rev(args), outModuleType)
-    }
-
-  let rec printOutTypeDoc = (outType: Outcometree.out_type) =>
-    switch outType {
-    | Otyp_abstract | Otyp_variant(_) | Otyp_open => Doc.nil
-    | Otyp_alias(typ, aliasTxt) =>
-      Doc.concat(list{printOutTypeDoc(typ), Doc.text(" as '"), Doc.text(aliasTxt)})
-    | Otyp_constr(outIdent, list{}) => printOutIdentDoc(outIdent)
-    | Otyp_manifest(typ1, typ2) =>
-      Doc.concat(list{printOutTypeDoc(typ1), Doc.text(" = "), printOutTypeDoc(typ2)})
-    | Otyp_record(record) => printRecordDeclarationDoc(~inline=true, record)
-    | Otyp_stuff(txt) => Doc.text(txt)
-    | Otyp_var(ng, s) =>
-      Doc.concat(list{
-        Doc.text(
-          "'" ++ if ng {
-            "_"
-          } else {
-            ""
-          },
-        ),
-        Doc.text(s),
-      })
-    | Otyp_object(fields, rest) => printObjectFields(fields, rest)
-    | Otyp_class(_) => Doc.nil
-    | Otyp_attribute(typ, attribute) =>
-      Doc.group(Doc.concat(list{printOutAttributeDoc(attribute), Doc.line, printOutTypeDoc(typ)}))
-    /* example: Red | Blue | Green | CustomColour(float, float, float) */
-    | Otyp_sum(constructors) => printOutConstructorsDoc(constructors)
-
-    /* example: {"name": string, "age": int} */
-    | Otyp_constr(Oide_dot(Oide_ident("Js"), "t"), list{Otyp_object(fields, rest)}) =>
-      printObjectFields(fields, rest)
-
-    /* example: node<root, 'value> */
-    | Otyp_constr(outIdent, args) =>
-      let argsDoc = switch args {
-      | list{} => Doc.nil
-      | args =>
-        Doc.concat(list{
-          Doc.lessThan,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(printOutTypeDoc, args)),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.greaterThan,
-        })
-      }
-
-      Doc.group(Doc.concat(list{printOutIdentDoc(outIdent), argsDoc}))
-    | Otyp_tuple(tupleArgs) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(printOutTypeDoc, tupleArgs),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    | Otyp_poly(vars, outType) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.join(~sep=Doc.space, List.map(var => Doc.text("'" ++ var), vars)),
-          printOutTypeDoc(outType),
-        }),
-      )
-    | Otyp_arrow(_) as typ =>
-      let (typArgs, typ) = collectArrowArgs(typ, list{})
-      let args = Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(((lbl, typ)) =>
-          if lbl == "" {
-            printOutTypeDoc(typ)
-          } else {
-            Doc.group(Doc.concat(list{Doc.text("~" ++ (lbl ++ ": ")), printOutTypeDoc(typ)}))
-          }
-        , typArgs))
-      let argsDoc = {
-        let needsParens = switch typArgs {
-        | list{(_, Otyp_tuple(_) | Otyp_arrow(_))} => true
-        /* single argument should not be wrapped */
-        | list{("", _)} => false
-        | _ => true
-        }
-
-        if needsParens {
-          Doc.group(
-            Doc.concat(list{
-              Doc.lparen,
-              Doc.indent(Doc.concat(list{Doc.softLine, args})),
-              Doc.trailingComma,
-              Doc.softLine,
-              Doc.rparen,
-            }),
-          )
-        } else {
-          args
-        }
-      }
-
-      Doc.concat(list{argsDoc, Doc.text(" => "), printOutTypeDoc(typ)})
-    | Otyp_module(_modName, _stringList, _outTypes) => Doc.nil
-    }
-
-  and printObjectFields = (fields, rest) => {
-    let dots = switch rest {
-    | Some(non_gen) =>
-      Doc.text(
-        if non_gen {
-          "_"
-        } else {
-          ""
-        } ++ "..",
-      )
-    | None => Doc.nil
-    }
-
-    Doc.group(
-      Doc.concat(list{
-        Doc.lbrace,
-        dots,
-        Doc.indent(
-          Doc.concat(list{
-            Doc.softLine,
-            Doc.join(
-              ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-              List.map(
-                ((lbl, outType)) =>
-                  Doc.group(
-                    Doc.concat(list{Doc.text("\"" ++ (lbl ++ "\": ")), printOutTypeDoc(outType)}),
-                  ),
-                fields,
-              ),
-            ),
-          }),
-        ),
-        Doc.softLine,
-        Doc.trailingComma,
-        Doc.rbrace,
-      }),
-    )
-  }
-
-  and printOutConstructorsDoc = constructors =>
-    Doc.group(
-      Doc.indent(Doc.concat(list{Doc.line, Doc.join(~sep=Doc.line, List.mapi((i, constructor) =>
-              Doc.concat(list{
-                if i > 0 {
-                  Doc.text("| ")
-                } else {
-                  Doc.ifBreaks(Doc.text("| "), Doc.nil)
-                },
-                printOutConstructorDoc(constructor),
-              })
-            , constructors))})),
-    )
-
-  and printOutConstructorDoc = ((name, args, gadt)) => {
-    let gadtDoc = switch gadt {
-    | Some(outType) => Doc.concat(list{Doc.text(": "), printOutTypeDoc(outType)})
-    | None => Doc.nil
-    }
-
-    let argsDoc = switch args {
-    | list{} => Doc.nil
-    | list{Otyp_record(record)} =>
-      /* inline records
-       *   | Root({
-       *      mutable value: 'value,
-       *      mutable updatedTime: float,
-       *    })
-       */
-      Doc.concat(list{
-        Doc.lparen,
-        Doc.indent(printRecordDeclarationDoc(~inline=true, record)),
-        Doc.rparen,
-      })
-    | _types =>
-      Doc.indent(
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(printOutTypeDoc, args)),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    }
-
-    Doc.group(Doc.concat(list{Doc.text(name), argsDoc, gadtDoc}))
-  }
-
-  and printRecordDeclRowDoc = ((name, mut, arg)) =>
-    Doc.group(
-      Doc.concat(list{
-        if mut {
-          Doc.text("mutable ")
-        } else {
-          Doc.nil
-        },
-        Doc.text(name),
-        Doc.text(": "),
-        printOutTypeDoc(arg),
-      }),
-    )
-
-  and printRecordDeclarationDoc = (~inline, rows) => {
-    let content = Doc.concat(list{
-      Doc.lbrace,
-      Doc.indent(
-        Doc.concat(list{
-          Doc.softLine,
-          Doc.join(
-            ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-            List.map(printRecordDeclRowDoc, rows),
-          ),
-        }),
-      ),
-      Doc.trailingComma,
-      Doc.softLine,
-      Doc.rbrace,
-    })
-    if !inline {
-      Doc.group(content)
-    } else {
-      content
-    }
-  }
-
-  let printOutType = (fmt, outType) =>
-    Format.pp_print_string(fmt, Doc.toString(~width=80, printOutTypeDoc(outType)))
-
-  let printTypeParameterDoc = ((typ, (co, cn))) =>
-    Doc.concat(list{
-      if !cn {
-        Doc.text("+")
-      } else if !co {
-        Doc.text("-")
-      } else {
-        Doc.nil
-      },
-      if typ == "_" {
-        Doc.text("_")
-      } else {
-        Doc.text("'" ++ typ)
-      },
-    })
-
-  let rec printOutSigItemDoc = (outSigItem: Outcometree.out_sig_item) =>
-    switch outSigItem {
-    | Osig_class(_) | Osig_class_type(_) => Doc.nil
-    | Osig_ellipsis => Doc.dotdotdot
-    | Osig_value(valueDecl) =>
-      Doc.group(
-        Doc.concat(list{
-          printOutAttributesDoc(valueDecl.oval_attributes),
-          Doc.text(
-            switch valueDecl.oval_prims {
-            | list{} => "let "
-            | _ => "external "
-            },
-          ),
-          Doc.text(valueDecl.oval_name),
-          Doc.text(":"),
-          Doc.space,
-          printOutTypeDoc(valueDecl.oval_type),
-          switch valueDecl.oval_prims {
-          | list{} => Doc.nil
-          | primitives =>
-            Doc.indent(
-              Doc.concat(list{
-                Doc.text(" ="),
-                Doc.line,
-                Doc.group(
-                  Doc.join(
-                    ~sep=Doc.line,
-                    List.map(prim => Doc.text("\"" ++ (prim ++ "\"")), primitives),
-                  ),
-                ),
-              }),
-            )
-          },
-        }),
-      )
-    | Osig_typext(outExtensionConstructor, _outExtStatus) =>
-      printOutExtensionConstructorDoc(outExtensionConstructor)
-    | Osig_modtype(modName, Omty_signature(list{})) =>
-      Doc.concat(list{Doc.text("module type "), Doc.text(modName)})
-    | Osig_modtype(modName, outModuleType) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.text("module type "),
-          Doc.text(modName),
-          Doc.text(" = "),
-          printOutModuleTypeDoc(outModuleType),
-        }),
-      )
-    | Osig_module(modName, Omty_alias(ident), _) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.text("module "),
-          Doc.text(modName),
-          Doc.text(" ="),
-          Doc.line,
-          printOutIdentDoc(ident),
-        }),
-      )
-    | Osig_module(modName, outModType, outRecStatus) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.text(
-            switch outRecStatus {
-            | Orec_not => "module "
-            | Orec_first => "module rec "
-            | Orec_next => "and"
-            },
-          ),
-          Doc.text(modName),
-          Doc.text(" = "),
-          printOutModuleTypeDoc(outModType),
-        }),
-      )
-    | Osig_type(outTypeDecl, outRecStatus) =>
-      /* TODO: manifest ? */
-      let attrs = switch (outTypeDecl.otype_immediate, outTypeDecl.otype_unboxed) {
-      | (false, false) => Doc.nil
-      | (true, false) => Doc.concat(list{Doc.text("@immediate"), Doc.line})
-      | (false, true) => Doc.concat(list{Doc.text("@unboxed"), Doc.line})
-      | (true, true) => Doc.concat(list{Doc.text("@immediate @unboxed"), Doc.line})
-      }
-
-      let kw = Doc.text(
-        switch outRecStatus {
-        | Orec_not => "type "
-        | Orec_first => "type rec "
-        | Orec_next => "and "
-        },
-      )
-      let typeParams = switch outTypeDecl.otype_params {
-      | list{} => Doc.nil
-      | _params =>
-        Doc.group(
-          Doc.concat(list{
-            Doc.lessThan,
-            Doc.indent(
-              Doc.concat(list{
-                Doc.softLine,
-                Doc.join(
-                  ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                  List.map(printTypeParameterDoc, outTypeDecl.otype_params),
-                ),
-              }),
-            ),
-            Doc.trailingComma,
-            Doc.softLine,
-            Doc.greaterThan,
-          }),
-        )
-      }
-
-      let privateDoc = switch outTypeDecl.otype_private {
-      | Asttypes.Private => Doc.text("private ")
-      | Public => Doc.nil
-      }
-
-      let kind = switch outTypeDecl.otype_type {
-      | Otyp_open => Doc.concat(list{Doc.text(" = "), privateDoc, Doc.text("..")})
-      | Otyp_abstract => Doc.nil
-      | Otyp_record(record) =>
-        Doc.concat(list{
-          Doc.text(" = "),
-          privateDoc,
-          printRecordDeclarationDoc(~inline=false, record),
-        })
-      | typ => Doc.concat(list{Doc.text(" = "), printOutTypeDoc(typ)})
-      }
-
-      let constraints = switch outTypeDecl.otype_cstrs {
-      | list{} => Doc.nil
-      | _ =>
-        Doc.group(
-          Doc.concat(list{
-            Doc.line,
-            Doc.indent(
-              Doc.concat(list{
-                Doc.hardLine,
-                Doc.join(
-                  ~sep=Doc.line,
-                  List.map(
-                    ((typ1, typ2)) =>
-                      Doc.group(
-                        Doc.concat(list{
-                          Doc.text("constraint "),
-                          printOutTypeDoc(typ1),
-                          Doc.text(" ="),
-                          Doc.indent(Doc.concat(list{Doc.line, printOutTypeDoc(typ2)})),
-                        }),
-                      ),
-                    outTypeDecl.otype_cstrs,
-                  ),
-                ),
-              }),
-            ),
-          }),
-        )
-      }
-      Doc.group(
-        Doc.concat(list{
-          attrs,
-          Doc.group(
-            Doc.concat(list{attrs, kw, Doc.text(outTypeDecl.otype_name), typeParams, kind}),
-          ),
-          constraints,
-        }),
-      )
-    }
-
-  and printOutModuleTypeDoc = (outModType: Outcometree.out_module_type) =>
-    switch outModType {
-    | Omty_abstract => Doc.nil
-    | Omty_ident(ident) => printOutIdentDoc(ident)
-    /* example: module Increment = (M: X_int) => X_int */
-    | Omty_functor(_) =>
-      let (args, returnModType) = collectFunctorArgs(outModType, list{})
-      let argsDoc = switch args {
-      | list{(_, None)} => Doc.text("()")
-      | args =>
-        Doc.group(
-          Doc.concat(list{
-            Doc.lparen,
-            Doc.indent(
-              Doc.concat(list{
-                Doc.softLine,
-                Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(((lbl, optModType)) =>
-                    Doc.group(
-                      Doc.concat(list{
-                        Doc.text(lbl),
-                        switch optModType {
-                        | None => Doc.nil
-                        | Some(modType) =>
-                          Doc.concat(list{Doc.text(": "), printOutModuleTypeDoc(modType)})
-                        },
-                      }),
-                    )
-                  , args)),
-              }),
-            ),
-            Doc.trailingComma,
-            Doc.softLine,
-            Doc.rparen,
-          }),
-        )
-      }
-
-      Doc.group(Doc.concat(list{argsDoc, Doc.text(" => "), printOutModuleTypeDoc(returnModType)}))
-    | Omty_signature(list{}) => Doc.nil
-    | Omty_signature(signature) =>
-      Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list{
-          Doc.lbrace,
-          Doc.indent(Doc.concat(list{Doc.line, printOutSignatureDoc(signature)})),
-          Doc.softLine,
-          Doc.rbrace,
-        }),
-      )
-    | Omty_alias(_ident) => Doc.nil
-    }
-
-  and printOutSignatureDoc = (signature: list<Outcometree.out_sig_item>) => {
-    let rec loop = (signature, acc) =>
-      switch signature {
-      | list{} => List.rev(acc)
-      | list{Outcometree.Osig_typext(ext, Oext_first), ...items} =>
-        /* Gather together the extension constructors */
-        let rec gather_extensions = (acc, items) =>
-          switch items {
-          | list{Outcometree.Osig_typext(ext, Oext_next), ...items} =>
-            gather_extensions(
-              list{(ext.oext_name, ext.oext_args, ext.oext_ret_type), ...acc},
-              items,
-            )
-          | _ => (List.rev(acc), items)
-          }
-
-        let (exts, items) = gather_extensions(
-          list{(ext.oext_name, ext.oext_args, ext.oext_ret_type)},
-          items,
-        )
-
-        let te = {
-          Outcometree.otyext_name: ext.oext_type_name,
-          otyext_params: ext.oext_type_params,
-          otyext_constructors: exts,
-          otyext_private: ext.oext_private,
-        }
-
-        let doc = printOutTypeExtensionDoc(te)
-        loop(items, list{doc, ...acc})
-      | list{item, ...items} =>
-        let doc = printOutSigItemDoc(item)
-        loop(items, list{doc, ...acc})
-      }
-
-    switch loop(signature, list{}) {
-    | list{doc} => doc
-    | docs => Doc.breakableGroup(~forceBreak=true, Doc.join(~sep=Doc.line, docs))
-    }
-  }
-
-  and printOutExtensionConstructorDoc = (outExt: Outcometree.out_extension_constructor) => {
-    let typeParams = switch outExt.oext_type_params {
-    | list{} => Doc.nil
-    | params =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lessThan,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(ty =>
-                  Doc.text(
-                    if ty == "_" {
-                      ty
-                    } else {
-                      "'" ++ ty
-                    },
-                  )
-                , params)),
-            }),
-          ),
-          Doc.softLine,
-          Doc.greaterThan,
-        }),
-      )
-    }
-
-    Doc.group(
-      Doc.concat(list{
-        Doc.text("type "),
-        Doc.text(outExt.oext_type_name),
-        typeParams,
-        Doc.text(" +="),
-        Doc.line,
-        if outExt.oext_private == Asttypes.Private {
-          Doc.text("private ")
-        } else {
-          Doc.nil
-        },
-        printOutConstructorDoc((outExt.oext_name, outExt.oext_args, outExt.oext_ret_type)),
-      }),
-    )
-  }
-
-  and printOutTypeExtensionDoc = (typeExtension: Outcometree.out_type_extension) => {
-    let typeParams = switch typeExtension.otyext_params {
-    | list{} => Doc.nil
-    | params =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lessThan,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(~sep=Doc.concat(list{Doc.comma, Doc.line}), List.map(ty =>
-                  Doc.text(
-                    if ty == "_" {
-                      ty
-                    } else {
-                      "'" ++ ty
-                    },
-                  )
-                , params)),
-            }),
-          ),
-          Doc.softLine,
-          Doc.greaterThan,
-        }),
-      )
-    }
-
-    Doc.group(
-      Doc.concat(list{
-        Doc.text("type "),
-        Doc.text(typeExtension.otyext_name),
-        typeParams,
-        Doc.text(" +="),
-        if typeExtension.otyext_private == Asttypes.Private {
-          Doc.text("private ")
-        } else {
-          Doc.nil
-        },
-        printOutConstructorsDoc(typeExtension.otyext_constructors),
-      }),
-    )
-  }
-
-  let printOutSigItem = (fmt, outSigItem) =>
-    Format.pp_print_string(fmt, Doc.toString(~width=80, printOutSigItemDoc(outSigItem)))
-
-  let printOutSignature = (fmt, signature) =>
-    Format.pp_print_string(fmt, Doc.toString(~width=80, printOutSignatureDoc(signature)))
-
-  let validFloatLexeme = s => {
-    let l = String.length(s)
-    let rec loop = i =>
-      if i >= l {
-        s ++ "."
-      } else {
-        switch @doesNotRaise
-        String.get(s, i) {
-        | '0' .. '9' | '-' => loop(i + 1)
-        | _ => s
-        }
-      }
-    loop(0)
-  }
-
-  let floatRepres = f =>
-    switch classify_float(f) {
-    | FP_nan => "nan"
-    | FP_infinite =>
-      if f < 0.0 {
-        "neg_infinity"
-      } else {
-        "infinity"
-      }
-    | _ =>
-      let float_val = {
-        let s1 = Printf.sprintf("%.12g", f)
-        if f == (@doesNotRaise float_of_string)(s1) {
-          s1
-        } else {
-          let s2 = Printf.sprintf("%.15g", f)
-          if f == (@doesNotRaise float_of_string)(s2) {
-            s2
-          } else {
-            Printf.sprintf("%.18g", f)
-          }
-        }
-      }
-      validFloatLexeme(float_val)
-    }
-
-  let rec printOutValueDoc = (outValue: Outcometree.out_value) =>
-    switch outValue {
-    | Oval_array(outValues) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lbracket,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(printOutValueDoc, outValues),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rbracket,
-        }),
-      )
-    | Oval_char(c) => Doc.text("'" ++ (Char.escaped(c) ++ "'"))
-    | Oval_constr(outIdent, outValues) =>
-      Doc.group(
-        Doc.concat(list{
-          printOutIdentDoc(outIdent),
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(printOutValueDoc, outValues),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    | Oval_ellipsis => Doc.text("...")
-    | Oval_int(i) => Doc.text(Format.sprintf("%i", i))
-    | Oval_int32(i) => Doc.text(Format.sprintf("%lil", i))
-    | Oval_int64(i) => Doc.text(Format.sprintf("%LiL", i))
-    | Oval_nativeint(i) => Doc.text(Format.sprintf("%nin", i))
-    | Oval_float(f) => Doc.text(floatRepres(f))
-    | Oval_list(outValues) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.text("list["),
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(printOutValueDoc, outValues),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rbracket,
-        }),
-      )
-    | Oval_printer(fn) =>
-      let fmt = Format.str_formatter
-      fn(fmt)
-      let str = Format.flush_str_formatter()
-      Doc.text(str)
-    | Oval_record(rows) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(
-                  ((outIdent, outValue)) =>
-                    Doc.group(
-                      Doc.concat(list{
-                        printOutIdentDoc(outIdent),
-                        Doc.text(": "),
-                        printOutValueDoc(outValue),
-                      }),
-                    ),
-                  rows,
-                ),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    | Oval_string(txt, _sizeToPrint, _kind) => Doc.text(escapeStringContents(txt))
-    | Oval_stuff(txt) => Doc.text(txt)
-    | Oval_tuple(outValues) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list{
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-                List.map(printOutValueDoc, outValues),
-              ),
-            }),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        }),
-      )
-    /* Not supported by NapkinScript */
-    | Oval_variant(_) => Doc.nil
-    }
-
-  let printOutExceptionDoc = (exc, outValue) =>
-    switch exc {
-    | Sys.Break => Doc.text("Interrupted.")
-    | Out_of_memory => Doc.text("Out of memory during evaluation.")
-    | Stack_overflow => Doc.text("Stack overflow during evaluation (looping recursion?).")
-    | _ =>
-      Doc.group(
-        Doc.indent(Doc.concat(list{Doc.text("Exception:"), Doc.line, printOutValueDoc(outValue)})),
-      )
-    }
-
-  let printOutPhraseSignature = signature => {
-    let rec loop = (signature, acc) =>
-      switch signature {
-      | list{} => List.rev(acc)
-      | list{(Outcometree.Osig_typext(ext, Oext_first), None), ...signature} =>
-        /* Gather together extension constructors */
-        let rec gather_extensions = (acc, items) =>
-          switch items {
-          | list{(Outcometree.Osig_typext(ext, Oext_next), None), ...items} =>
-            gather_extensions(
-              list{(ext.oext_name, ext.oext_args, ext.oext_ret_type), ...acc},
-              items,
-            )
-          | _ => (List.rev(acc), items)
-          }
-
-        let (exts, signature) = gather_extensions(
-          list{(ext.oext_name, ext.oext_args, ext.oext_ret_type)},
-          signature,
-        )
-
-        let te = {
-          Outcometree.otyext_name: ext.oext_type_name,
-          otyext_params: ext.oext_type_params,
-          otyext_constructors: exts,
-          otyext_private: ext.oext_private,
-        }
-
-        let doc = printOutTypeExtensionDoc(te)
-        loop(signature, list{doc, ...acc})
-      | list{(sigItem, optOutValue), ...signature} =>
-        let doc = switch optOutValue {
-        | None => printOutSigItemDoc(sigItem)
-        | Some(outValue) =>
-          Doc.group(
-            Doc.concat(list{
-              printOutSigItemDoc(sigItem),
-              Doc.text(" = "),
-              printOutValueDoc(outValue),
-            }),
-          )
-        }
-
-        loop(signature, list{doc, ...acc})
-      }
-
-    Doc.breakableGroup(~forceBreak=true, Doc.join(~sep=Doc.line, loop(signature, list{})))
-  }
-
-  let printOutPhraseDoc = (outPhrase: Outcometree.out_phrase) =>
-    switch outPhrase {
-    | Ophr_eval(outValue, outType) =>
-      Doc.group(
-        Doc.concat(list{
-          Doc.text("- : "),
-          printOutTypeDoc(outType),
-          Doc.text(" ="),
-          Doc.indent(Doc.concat(list{Doc.line, printOutValueDoc(outValue)})),
-        }),
-      )
-    | Ophr_signature(list{}) => Doc.nil
-    | Ophr_signature(signature) => printOutPhraseSignature(signature)
-    | Ophr_exception(exc, outValue) => printOutExceptionDoc(exc, outValue)
-    }
-
-  let printOutPhase = (fmt, outPhrase) =>
-    Format.pp_print_string(fmt, Doc.toString(~width=80, printOutPhraseDoc(outPhrase)))
-
-  let printOutModuleType = (fmt, outModuleType) =>
-    Format.pp_print_string(fmt, Doc.toString(~width=80, printOutModuleTypeDoc(outModuleType)))
-
-  let printOutTypeExtension = (fmt, typeExtension) =>
-    Format.pp_print_string(fmt, Doc.toString(~width=80, printOutTypeExtensionDoc(typeExtension)))
-
-  let printOutValue = (fmt, outValue) =>
-    Format.pp_print_string(fmt, Doc.toString(~width=80, printOutValueDoc(outValue)))
-
-  /* Not supported in Napkin */
-  let printOutClassType = (_fmt, _) => ()
-
-  let out_value = ref(printOutValue)
-  let out_type = ref(printOutType)
-  let out_module_type = ref(printOutModuleType)
-  let out_sig_item = ref(printOutSigItem)
-  let out_signature = ref(printOutSignature)
-  let out_type_extension = ref(printOutTypeExtension)
-  let out_phrase = @live ref(printOutPhase)
-  let out_class_type = ref(printOutClassType)
-}
-
-module Repl = {
-  let parseToplevelPhrase = filename => {
-    let src = IO.readFile(filename)
-    let p = Parser.make(src, filename)
-    Parsetree.Ptop_def(NapkinScript.parseImplementation(p))
-  }
-
-  let typeAndPrintOutcome = filename => {
-    Compmisc.init_path(false)
-    let env = Compmisc.initial_env()
-    try {
-      let sstr = switch parseToplevelPhrase(filename) {
-      | Parsetree.Ptop_def(sstr) => sstr
-      | _ => assert false
-      }
-
-      let (_str, signature, _newenv) = Typemod.type_toplevel_phrase(env, sstr)
-      let outSigItems = Printtyp.tree_of_signature(signature)
-      let fmt = Format.str_formatter
-      OutcomePrinter.out_signature.contents(fmt, outSigItems)
-      let result = Format.flush_str_formatter()
-      print_string(result)
-    } catch {
-    | Typetexp.Error(_, _, err) =>
-      let fmt = Format.str_formatter
-      Typetexp.report_error(env, fmt, err)
-      let result = Format.flush_str_formatter()
-      let () = print_endline(result)
-    | _ => print_endline("catch all")
-    }
-  }
-}
-
-/* command line flags */
-module Clflags: {
-  let recover: ref<bool>
-  let print: ref<string>
-  let width: ref<int>
-  let origin: ref<string>
-  let files: ref<list<string>>
-  let interface: ref<bool>
-  let report: ref<string>
-
-  let parse: unit => unit
-  let outcome: ref<bool>
-} = {
-  let recover = ref(false)
-  let width = ref(100)
-
-  let files = ref(list{})
-  let addFilename = filename => files := list{filename, ...files.contents}
-
-  let print = ref("")
-  let outcome = ref(false)
-  let origin = ref("")
-  let interface = ref(false)
-  let report = ref("pretty")
-
-  let usage = "Usage: napkinscript <options> <file>\nOptions are:"
-
-  let spec = list{
-    ("-recover", Arg.Unit(() => recover := true), "Emit partial ast"),
-    ("-print", Arg.String(txt => print := txt), "Print either binary, ocaml or ast"),
-    ("-parse", Arg.String(txt => origin := txt), "Parse ocaml or napkinscript"),
-    ("-outcome", Arg.Bool(printOutcomeTree => outcome := printOutcomeTree), "print outcometree"),
-    ("-width", Arg.Int(w => width := w), "Specify the line length that the printer will wrap on"),
-    ("-interface", Arg.Unit(() => interface := true), "Parse as interface"),
-    (
-      "-report",
-      Arg.String(txt => report := txt),
-      "Stylize errors and messages using color and context. Accepts `Pretty` and `Plain`. Default `Plain`",
-    ),
-  }
-
-  let parse = () => Arg.parse(spec, addFilename, usage)
-}
-
-module Driver: {
-  let processFile: (
-    ~isInterface: bool,
-    ~width: int,
-    ~recover: bool,
-    ~origin: string,
-    ~target: string,
-    ~report: string,
-    string,
-  ) => unit
-} = {
-  type rec file_kind<'a> =
-    | Structure: file_kind<Parsetree.structure>
-    | Signature: file_kind<Parsetree.signature>
-
-  let parseNapkin = (type a, kind: file_kind<a>, p): a =>
-    switch kind {
-    | Structure => NapkinScript.parseImplementation(p)
-    | Signature => NapkinScript.parseSpecification(p)
-    }
-
-  let extractOcamlStringData = filename => {
-    let lexbuf = if String.length(filename) > 0 {
-      IO.readFile(filename) |> Lexing.from_string
-    } else {
-      Lexing.from_channel(stdin)
-    }
-
-    let stringLocs = ref(list{})
-    let rec next = () => {
-      let token = Lexer.token_with_comments(lexbuf)
-      switch token {
-      | OcamlParser.STRING(_txt, None) =>
-        open Location
-        let loc = {
-          loc_start: lexbuf.lex_start_p,
-          loc_end: lexbuf.Lexing.lex_curr_p,
-          loc_ghost: false,
-        }
-        let len = loc.loc_end.pos_cnum - loc.loc_start.pos_cnum
-        let txt = Bytes.to_string(
-          (@doesNotRaise Bytes.sub)(lexbuf.Lexing.lex_buffer, loc.loc_start.pos_cnum, len),
-        )
-        stringLocs := list{(txt, loc), ...stringLocs.contents}
-        next()
-      | OcamlParser.EOF => ()
-      | _ => next()
-      }
-    }
-
-    next()
-    List.rev(stringLocs.contents)
-  }
-
-  let parseOcaml = (type a, kind: file_kind<a>, filename): a => {
-    let lexbuf = if String.length(filename) > 0 {
-      IO.readFile(filename) |> Lexing.from_string
-    } else {
-      Lexing.from_channel(stdin)
-    }
-
-    let stringData = extractOcamlStringData(filename)
-    switch kind {
-    | Structure =>
-      Parse.implementation(lexbuf)
-      |> ParsetreeCompatibility.replaceStringLiteralStructure(stringData)
-      |> ParsetreeCompatibility.structure
-    | Signature =>
-      Parse.interface(lexbuf)
-      |> ParsetreeCompatibility.replaceStringLiteralSignature(stringData)
-      |> ParsetreeCompatibility.signature
-    }
-  }
-
-  let parseNapkinFile = (~destination, kind, filename) => {
-    let src = if String.length(filename) > 0 {
-      IO.readFile(filename)
-    } else {
-      IO.readStdin()
-    }
-
-    let p = {
-      let mode = switch destination {
-      | "napkinscript" | "ns" | "sexp" => Parser.Default
-      | _ => Parser.ParseForTypeChecker
-      }
-
-      Parser.make(~mode, src, filename)
-    }
-    let ast = parseNapkin(kind, p)
-    let report = switch p.diagnostics {
-    | list{} => None
-    | diagnostics => Some(diagnostics)
-    }
-
-    (ast, report, p)
-  }
-
-  let parseOcamlFile = (kind, filename) => {
-    let ast = parseOcaml(kind, filename)
-    let lexbuf2 = if String.length(filename) > 0 {
-      IO.readFile(filename) |> Lexing.from_string
-    } else {
-      Lexing.from_channel(stdin)
-    }
-
-    let comments = {
-      let rec next = (prevTokEndPos: Lexing.position, comments, lb) => {
-        let token = Lexer.token_with_comments(lb)
-        switch token {
-        | OcamlParser.EOF => comments
-        | OcamlParser.COMMENT(txt, loc) =>
-          let comment = Comment.fromOcamlComment(~loc, ~prevTokEndPos, ~txt)
-
-          next(loc.Location.loc_end, list{comment, ...comments}, lb)
-        | _ => next(lb.Lexing.lex_curr_p, comments, lb)
-        }
-      }
-
-      let cmts = next(lexbuf2.Lexing.lex_start_p, list{}, lexbuf2)
-      cmts
-    }
-
-    let p = Parser.make("", filename)
-    p.comments = comments
-    (ast, None, p)
-  }
-
-  let reasonFilename = ref("")
-  let commentData = ref(list{})
-  let stringData = ref(list{})
-
-  let parseReasonBinaryFromStdin = (type a, kind: file_kind<a>, filename): a => {
-    let (chan, close) =
-      String.length(filename) === 0
-        ? (stdin, _ => ())
-        : {
-            let file_chan = open_in_bin(filename)
-            seek_in(file_chan, 0)
-            (file_chan, close_in_noerr)
-          }
-
-    let ic = chan
-    let magic = switch kind {
-    | Structure => Config.ast_impl_magic_number
-    | Signature => Config.ast_intf_magic_number
-    }
-
-    let buffer = (@doesNotRaise really_input_string)(ic, String.length(magic))
-    assert (buffer == magic)
-    let filename = input_value(ic)
-    reasonFilename := filename
-    let ast = input_value(ic)
-    close(chan)
-
-    let src = if String.length(filename) > 0 {
-      IO.readFile(filename)
-    } else {
-      IO.readStdin()
-    }
-
-    let scanner = Scanner.make(Bytes.of_string(src), filename)
-
-    let rec next = (prevEndPos, scanner) => {
-      let (startPos, endPos, token) = Scanner.scan(scanner)
-      switch token {
-      | Eof => ()
-      | Comment(c) =>
-        Comment.setPrevTokEndPos(c, prevEndPos)
-        commentData := list{c, ...commentData.contents}
-        next(endPos, scanner)
-      | String(_) =>
-        let loc = {Location.loc_start: startPos, loc_end: endPos, loc_ghost: false}
-        let len = endPos.pos_cnum - startPos.pos_cnum
-        let txt = (@doesNotRaise String.sub)(src, startPos.pos_cnum, len)
-        stringData := list{(txt, loc), ...stringData.contents}
-        next(endPos, scanner)
-      | _ => next(endPos, scanner)
-      }
-    }
-
-    next(Lexing.dummy_pos, scanner)
-
-    switch kind {
-    | Structure =>
-      ast
-      |> ParsetreeCompatibility.replaceStringLiteralStructure(stringData.contents)
-      |> ParsetreeCompatibility.normalizeReasonArityStructure(~forPrinter=true)
-      |> ParsetreeCompatibility.structure
-    | Signature =>
-      ast
-      |> ParsetreeCompatibility.replaceStringLiteralSignature(stringData.contents)
-      |> ParsetreeCompatibility.normalizeReasonAritySignature(~forPrinter=true)
-      |> ParsetreeCompatibility.signature
-    }
-  }
-
-  let isReasonDocComment = (comment: Comment.t) => {
-    let content = Comment.txt(comment)
-    let len = String.length(content)
-    if len == 0 {
-      true
-    } else if (
-      len >= 2 && (String.unsafe_get(content, 0) == '*' && String.unsafe_get(content, 1) == '*')
-    ) {
-      false
-    } else if len >= 1 && String.unsafe_get(content, 0) == '*' {
-      true
-    } else {
-      false
-    }
-  }
-
-  let parseReasonBinary = (kind, filename) => {
-    let ast = parseReasonBinaryFromStdin(kind, filename)
-    let p = Parser.make("", reasonFilename.contents)
-    p.comments = List.filter(c => !isReasonDocComment(c), commentData.contents)
-    (ast, None, p)
-  }
-
-  let parseImplementation = (~origin, ~destination, filename) =>
-    switch origin {
-    | "ml" | "ocaml" => parseOcamlFile(Structure, filename)
-    | "reasonBinary" => parseReasonBinary(Structure, filename)
-    | _ => parseNapkinFile(~destination, Structure, filename)
-    }
-
-  let parseInterface = (~destination, ~origin, filename) =>
-    switch origin {
-    | "ml" | "ocaml" => parseOcamlFile(Signature, filename)
-    | "reasonBinary" => parseReasonBinary(Signature, filename)
-    | _ => parseNapkinFile(~destination, Signature, filename)
-    }
-
-  let process = (~reportStyle, parseFn, printFn, recover, filename) => {
-    let (ast, report, parserState) = parseFn(filename)
-    switch report {
-    | Some(report) when recover == true =>
-      printFn(ast, parserState)
-      prerr_string(
-        Diagnostics.stringOfReport(
-          ~style=Diagnostics.parseReportStyle(reportStyle),
-          report,
-          Bytes.to_string(parserState.Parser.scanner.src),
-        ),
-      )
-    | Some(report) =>
-      prerr_string(
-        Diagnostics.stringOfReport(
-          ~style=Diagnostics.parseReportStyle(reportStyle),
-          report,
-          Bytes.to_string(parserState.Parser.scanner.src),
-        ),
-      )
-      exit(1)
-    | None => printFn(ast, parserState)
-    }
-  }
-
-  type action =
-    | ProcessImplementation
-    | ProcessInterface
-
-  let printImplementation = (~target, ~width, filename, ast, _parserState) =>
-    switch target {
-    | "ml" | "ocaml" => Pprintast.structure(Format.std_formatter, ast)
-    | "ns" | "napkinscript" =>
-      Printer.printImplementation(~width, ast, List.rev(_parserState.Parser.comments))
-    | "ast" => Printast.implementation(Format.std_formatter, ast)
-    | "sexp" => ast |> SexpAst.implementation |> Sexp.toString |> print_string
-    | _ =>
-      /* default binary */
-      output_string(stdout, Config.ast_impl_magic_number)
-      output_value(stdout, filename)
-      output_value(stdout, ast)
-    }
-
-  let printInterface = (~target, ~width, filename, ast, _parserState) =>
-    switch target {
-    | "ml" | "ocaml" => Pprintast.signature(Format.std_formatter, ast)
-    | "ns" | "napkinscript" =>
-      Printer.printInterface(~width, ast, List.rev(_parserState.Parser.comments))
-    | "ast" => Printast.interface(Format.std_formatter, ast)
-    | "sexp" => ast |> SexpAst.interface |> Sexp.toString |> print_string
-    | _ =>
-      /* default binary */
-      output_string(stdout, Config.ast_intf_magic_number)
-      output_value(stdout, filename)
-      output_value(stdout, ast)
-    }
-
-  let processFile = (~isInterface, ~width, ~recover, ~origin, ~target, ~report, filename) =>
-    try {
-      let len = String.length(filename)
-      let action = if (
-        isInterface || (len > 0 && (@doesNotRaise String.get)(filename, len - 1) == 'i')
-      ) {
-        ProcessInterface
-      } else {
-        ProcessImplementation
-      }
-
-      switch action {
-      | ProcessImplementation =>
-        process(
-          ~reportStyle=report,
-          parseImplementation(~origin, ~destination=target),
-          printImplementation(~target, ~width, filename),
-          recover,
-          filename,
-        )
-      | ProcessInterface =>
-        process(
-          ~reportStyle=report,
-          parseInterface(~origin, ~destination=target),
-          printInterface(~target, ~width, filename),
-          recover,
-          filename,
-        )
-      }
-    } catch {
-    | Failure(txt) =>
-      prerr_string(txt)
-      prerr_newline()
-      exit(1)
-    | _ => exit(1)
-    }
-}
-
-let () = {
-  Clflags.parse()
-  if Clflags.outcome.contents {
-    Repl.typeAndPrintOutcome(List.hd(Clflags.files.contents))
-  } else {
-    let () = switch Clflags.files.contents {
-    | list{_file, ..._} as files =>
-      List.iter(
-        filename =>
-          Driver.processFile(
-            ~isInterface=Clflags.interface.contents,
-            ~width=Clflags.width.contents,
-            ~recover=Clflags.recover.contents,
-            ~target=Clflags.print.contents,
-            ~origin=Clflags.origin.contents,
-            ~report=Clflags.report.contents,
-            filename,
-          ),
-        files,
-      )
-    | list{} =>
-      Driver.processFile(
-        ~isInterface=Clflags.interface.contents,
-        ~width=Clflags.width.contents,
-        ~recover=Clflags.recover.contents,
-        ~target=Clflags.print.contents,
-        ~origin=Clflags.origin.contents,
-        ~report=Clflags.report.contents,
-        "",
-      )
-    }
-
-    exit(0)
-  }
-}
diff --git a/jscomp/syntax/benchmarks/data/PrinterNapkin.ml b/jscomp/syntax/benchmarks/data/PrinterNapkin.ml
deleted file mode 100644
index f9ce817..0000000
--- a/jscomp/syntax/benchmarks/data/PrinterNapkin.ml
+++ /dev/null
@@ -1,3501 +0,0 @@
-module Printer = {
-  type rec printer = {
-    src: bytes,
-    comments: CommentAst.t,
-  }
-  
-  let rec collectPatternsFromListConstruct = (acc, pattern) =>
-    {
-      open Parsetree
-      switch pattern.ppat_desc {
-      | Ppat_construct(
-          {txt: Longident.Lident("::")},
-          Some({ppat_desc: Ppat_tuple(list(pat, rest))}),
-        ) =>
-        collectPatternsFromListConstruct(list(pat, ...acc), rest)
-      | _ => /List.rev(acc), pattern/
-      }
-    }
-  
-  let addParens = doc =>
-    Doc.group(
-      Doc.concat(list(
-        Doc.lparen,
-        Doc.indent(Doc.concat(list(Doc.softLine, doc))),
-        Doc.softLine,
-        Doc.rparen,
-      )),
-    )
-  
-  let addBraces = doc =>
-    Doc.group(Doc.concat(list(Doc.lbrace, doc, Doc.rbrace)))
-  
-  let interleaveWhitespace = (
-    ~forceBreak=false,
-    rows: list</Location.t, Doc.t/>,
-  ) => {
-    let rec loop = (prevLoc, acc, rows) =>
-      switch rows {
-      | list() => Doc.concat(List.rev(acc))
-      | list(/loc, doc/, ...rest) =>
-        if (
-          loc.Location.loc_start.pos_lnum -
-          prevLoc.Location.loc_end.pos_lnum > 1
-        ) {
-          loop(loc, list(doc, Doc.line, Doc.line, ...acc), rest)
-        } else {
-          loop(loc, list(doc, Doc.line, ...acc), rest)
-        }
-      }
-    
-    switch rows {
-    | list() => Doc.nil
-    | list(/firstLoc, firstDoc/, ...rest) =>
-      let forceBreak =
-        forceBreak ||
-        switch List.rev(rest) {
-        | list(/lastLoc, _/, ..._) =>
-          firstLoc.loc_start.pos_lnum !== lastLoc.loc_end.pos_lnum
-        | _ => false
-        }
-      
-      Doc.breakableGroup(~forceBreak, loop(firstLoc, list(firstDoc), rest))
-    }
-  }
-  
-  let printLongident = l =>
-    switch l {
-    | Longident.Lident(lident) => Doc.text(lident)
-    | Longident.Ldot(lident, txt) as l =>
-      let txts = Longident.flatten(l)
-      Doc.join(~sep=Doc.dot, List.map(Doc.text, txts))
-    | _ => failwith("unsupported ident")
-    }
-  
-  let escapeStringContents = s => {
-    let len = String.length(s)
-    let b = Buffer.create(len)
-    for i in 0 to len - 1 {
-      let c = String.get(s, i)
-      if c == '\b' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, 'b')
-      } else if c == '\t' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, 't')
-      } else if c == '\n' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, 'n')
-      } else if c == '\r' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, 'r')
-      } else if c == '"' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, '"')
-      } else if c == '\\' {
-        Buffer.add_char(b, '\\')
-        Buffer.add_char(b, '\\')
-      } else {
-        Buffer.add_char(b, c)
-      }
-    }
-    Buffer.contents(b)
-  }
-  
-  let printConstant = c =>
-    switch c {
-    | Parsetree.Pconst_integer(s, _) => Doc.text(s)
-    | Pconst_string(s, _) => Doc.text("\"" ++ escapeStringContents(s) ++ "\"")
-    | Pconst_float(s, _) => Doc.text(s)
-    | Pconst_char(c) => Doc.text("'" ++ Char.escaped(c) ++ "'")
-    }
-  
-  let rec printStructure = (s: Parsetree.structure) =>
-    interleaveWhitespace(
-      List.map(si => /si.Parsetree.pstr_loc, printStructureItem(si)/, s),
-    )
-  
-  and printStructureItem = (si: Parsetree.structure_item) =>
-    switch si.pstr_desc {
-    | Pstr_value(rec_flag, valueBindings) =>
-      let recFlag = switch rec_flag {
-      | Asttypes.Nonrecursive => Doc.nil
-      | Asttypes.Recursive => Doc.text("rec ")
-      }
-      
-      printValueBindings(~recFlag, valueBindings)
-    | Pstr_type(recFlag, typeDeclarations) =>
-      let recFlag = switch recFlag {
-      | Asttypes.Nonrecursive => Doc.nil
-      | Asttypes.Recursive => Doc.text("rec ")
-      }
-      
-      printTypeDeclarations(~recFlag, typeDeclarations)
-    | Pstr_primitive(valueDescription) =>
-      printValueDescription(valueDescription)
-    | Pstr_eval(expr, attrs) =>
-      let needsParens = switch expr {
-      | {
-          pexp_attributes: list(/{txt: "res.ternary"}, _/),
-          pexp_desc: Pexp_ifthenelse(_),
-        } =>
-        false
-      | _ when ParsetreeViewer.hasAttributes(expr.pexp_attributes) => true
-      | _ => false
-      }
-      
-      let exprDoc = {
-        let doc = printExpression(expr)
-        if needsParens {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-      
-      Doc.concat(list(printAttributes(attrs), exprDoc))
-    | Pstr_attribute(attr) =>
-      Doc.concat(list(Doc.text("@"), printAttribute(attr)))
-    | Pstr_extension(extension, attrs) =>
-      Doc.concat(list(
-        printAttributes(attrs),
-        Doc.concat(list(Doc.text("%"), printExtension(extension))),
-      ))
-    | Pstr_include(includeDeclaration) =>
-      printIncludeDeclaration(includeDeclaration)
-    | Pstr_open(openDescription) => printOpenDescription(openDescription)
-    | Pstr_modtype(modTypeDecl) => printModuleTypeDeclaration(modTypeDecl)
-    | Pstr_module(moduleBinding) =>
-      printModuleBinding(~isRec=false, 0, moduleBinding)
-    | Pstr_recmodule(moduleBindings) =>
-      Doc.join(
-        ~sep=Doc.line,
-        List.mapi(
-          (i, mb) => printModuleBinding(~isRec=true, i, mb),
-          moduleBindings,
-        ),
-      )
-    | Pstr_exception(extensionConstructor) =>
-      printExceptionDef(extensionConstructor)
-    | Pstr_typext(typeExtension) => printTypeExtension(typeExtension)
-    | Pstr_class(_) | Pstr_class_type(_) => Doc.nil
-    }
-  
-  and printTypeExtension = (te: Parsetree.type_extension) => {
-    let prefix = Doc.text("type ")
-    let name = printLongident(te.ptyext_path.txt)
-    let typeParams = switch te.ptyext_params {
-    | list() => Doc.nil
-    | typeParams =>
-      Doc.group(
-        Doc.concat(list(
-          Doc.lessThan,
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                List.map(printTypeParam, typeParams),
-              ),
-            )),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.greaterThan,
-        )),
-      )
-    }
-    
-    let extensionConstructors = {
-      let ecs = te.ptyext_constructors
-      let forceBreak = switch /ecs, List.rev(ecs)/ {
-      | /list(first, ..._), list(last, ..._)/ =>
-        first.pext_loc.loc_start.pos_lnum >
-        te.ptyext_path.loc.loc_end.pos_lnum ||
-          first.pext_loc.loc_start.pos_lnum < last.pext_loc.loc_end.pos_lnum
-      | _ => false
-      }
-      
-      let privateFlag = switch te.ptyext_private {
-      | Asttypes.Private => Doc.concat(list(Doc.text("private"), Doc.line))
-      | Public => Doc.nil
-      }
-      
-      Doc.breakableGroup(
-        ~forceBreak,
-        Doc.indent(
-          Doc.concat(list(
-            Doc.line,
-            privateFlag,
-            Doc.join(~sep=Doc.line, List.mapi(printExtensionConstructor, ecs)),
-          )),
-        ),
-      )
-    }
-    
-    Doc.group(
-      Doc.concat(list(
-        printAttributes(~loc=te.ptyext_path.loc, te.ptyext_attributes),
-        prefix,
-        name,
-        typeParams,
-        Doc.text(" +="),
-        extensionConstructors,
-      )),
-    )
-  }
-  
-  and printModuleBinding = (~isRec, i, moduleBinding) => {
-    let prefix = if i == 0 {
-      Doc.concat(list(
-        Doc.text("module "),
-        if isRec {
-          Doc.text("rec ")
-        } else {
-          Doc.nil
-        },
-      ))
-    } else {
-      Doc.text("and ")
-    }
-    
-    let /modExprDoc, modConstraintDoc/ = switch moduleBinding.pmb_expr {
-    | {pmod_desc: Pmod_constraint(modExpr, modType)} =>
-      /
-        printModExpr(modExpr),
-        Doc.concat(list(Doc.text(": "), printModType(modType))),
-      /
-    | modExpr => /printModExpr(modExpr), Doc.nil/
-    }
-    
-    Doc.concat(list(
-      printAttributes(
-        ~loc=moduleBinding.pmb_name.loc,
-        moduleBinding.pmb_attributes,
-      ),
-      prefix,
-      Doc.text(moduleBinding.pmb_name.Location.txt),
-      modConstraintDoc,
-      Doc.text(" = "),
-      modExprDoc,
-    ))
-  }
-  
-  and printModuleTypeDeclaration = (
-    modTypeDecl: Parsetree.module_type_declaration,
-  ) =>
-    Doc.concat(list(
-      printAttributes(modTypeDecl.pmtd_attributes),
-      Doc.text("module type "),
-      Doc.text(modTypeDecl.pmtd_name.txt),
-      switch modTypeDecl.pmtd_type {
-      | None => Doc.nil
-      | Some(modType) =>
-        Doc.concat(list(Doc.text(" = "), printModType(modType)))
-      },
-    ))
-  
-  and printModType = modType => {
-    let modTypeDoc = switch modType.pmty_desc {
-    | Parsetree.Pmty_ident({txt: longident, loc}) =>
-      Doc.concat(list(
-        printAttributes(~loc, modType.pmty_attributes),
-        printLongident(longident),
-      ))
-    | Pmty_signature(signature) =>
-      let signatureDoc = Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list(
-          Doc.lbrace,
-          Doc.indent(Doc.concat(list(Doc.line, printSignature(signature)))),
-          Doc.line,
-          Doc.rbrace,
-        )),
-      )
-      Doc.concat(list(printAttributes(modType.pmty_attributes), signatureDoc))
-    | Pmty_functor(_) =>
-      let /parameters, returnType/ = ParsetreeViewer.functorType(modType)
-      let parametersDoc = switch parameters {
-      | list() => Doc.nil
-      | list(/attrs, {Location.txt: "_"}, Some(modType)/) =>
-        let attrs = switch attrs {
-        | list() => Doc.nil
-        | attrs =>
-          Doc.concat(list(
-            Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)),
-            Doc.line,
-          ))
-        }
-        Doc.concat(list(attrs, printModType(modType)))
-      | params =>
-        Doc.group(
-          Doc.concat(list(
-            Doc.lparen,
-            Doc.indent(
-              Doc.concat(list(
-                Doc.softLine,
-                Doc.join(
-                  ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                  List.map(
-                    (/attrs, lbl, modType/) => {
-                      let attrs = switch attrs {
-                      | list() => Doc.nil
-                      | attrs =>
-                        Doc.concat(list(
-                          Doc.join(
-                            ~sep=Doc.line,
-                            List.map(printAttribute, attrs),
-                          ),
-                          Doc.line,
-                        ))
-                      }
-                      Doc.concat(list(
-                        attrs,
-                        if lbl.Location.txt == "_" {
-                          Doc.nil
-                        } else {
-                          Doc.text(lbl.txt)
-                        },
-                        switch modType {
-                        | None => Doc.nil
-                        | Some(modType) =>
-                          Doc.concat(list(
-                            if lbl.txt == "_" {
-                              Doc.nil
-                            } else {
-                              Doc.text(": ")
-                            },
-                            printModType(modType),
-                          ))
-                        },
-                      ))
-                    },
-                    params,
-                  ),
-                ),
-              )),
-            ),
-            Doc.trailingComma,
-            Doc.softLine,
-            Doc.rparen,
-          )),
-        )
-      }
-      
-      let returnDoc = {
-        let doc = printModType(returnType)
-        if Parens.modTypeFunctorReturn(returnType) {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-      
-      Doc.group(
-        Doc.concat(list(
-          parametersDoc,
-          Doc.group(Doc.concat(list(Doc.text(" =>"), Doc.line, returnDoc))),
-        )),
-      )
-    | Pmty_typeof(modExpr) =>
-      Doc.concat(list(Doc.text("module type of "), printModExpr(modExpr)))
-    | Pmty_extension(extension) => printExtension(extension)
-    | Pmty_alias({txt: longident}) =>
-      Doc.concat(list(Doc.text("module "), printLongident(longident)))
-    | Pmty_with(modType, withConstraints) =>
-      let operand = {
-        let doc = printModType(modType)
-        if Parens.modTypeWithOperand(modType) {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-      
-      Doc.group(
-        Doc.concat(list(
-          operand,
-          Doc.indent(
-            Doc.concat(list(Doc.line, printWithConstraints(withConstraints))),
-          ),
-        )),
-      )
-    }
-    
-    let attrsAlreadyPrinted = switch modType.pmty_desc {
-    | (Pmty_functor(_) | Pmty_signature(_)) | Pmty_ident(_) => true
-    | _ => false
-    }
-    Doc.concat(list(
-      if attrsAlreadyPrinted {
-        Doc.nil
-      } else {
-        printAttributes(modType.pmty_attributes)
-      },
-      modTypeDoc,
-    ))
-  }
-  
-  and printWithConstraints = withConstraints => {
-    let rows = List.mapi(
-      (i, withConstraint) =>
-        Doc.group(
-          Doc.concat(list(
-            if i === 0 {
-              Doc.text("with ")
-            } else {
-              Doc.text("and ")
-            },
-            printWithConstraint(withConstraint),
-          )),
-        ),
-      withConstraints,
-    )
-    
-    Doc.join(~sep=Doc.line, rows)
-  }
-  
-  and printWithConstraint = (withConstraint: Parsetree.with_constraint) =>
-    switch withConstraint {
-    | Pwith_type({txt: longident}, typeDeclaration) =>
-      Doc.group(
-        printTypeDeclaration(
-          ~name=printLongident(longident),
-          ~equalSign="=",
-          ~recFlag=Doc.nil,
-          0,
-          typeDeclaration,
-        ),
-      )
-    | Pwith_module({txt: longident1}, {txt: longident2}) =>
-      Doc.concat(list(
-        Doc.text("module "),
-        printLongident(longident1),
-        Doc.text(" ="),
-        Doc.indent(Doc.concat(list(Doc.line, printLongident(longident2)))),
-      ))
-    | Pwith_typesubst({txt: longident}, typeDeclaration) =>
-      Doc.group(
-        printTypeDeclaration(
-          ~name=printLongident(longident),
-          ~equalSign=":=",
-          ~recFlag=Doc.nil,
-          0,
-          typeDeclaration,
-        ),
-      )
-    | Pwith_modsubst({txt: longident1}, {txt: longident2}) =>
-      Doc.concat(list(
-        Doc.text("module "),
-        printLongident(longident1),
-        Doc.text(" :="),
-        Doc.indent(Doc.concat(list(Doc.line, printLongident(longident2)))),
-      ))
-    }
-  
-  and printSignature = signature =>
-    interleaveWhitespace(
-      List.map(
-        si => /si.Parsetree.psig_loc, printSignatureItem(si)/,
-        signature,
-      ),
-    )
-  
-  and printSignatureItem = (si: Parsetree.signature_item) =>
-    switch si.psig_desc {
-    | Parsetree.Psig_value(valueDescription) =>
-      printValueDescription(valueDescription)
-    | Psig_type(recFlag, typeDeclarations) =>
-      let recFlag = switch recFlag {
-      | Asttypes.Nonrecursive => Doc.nil
-      | Asttypes.Recursive => Doc.text("rec ")
-      }
-      
-      printTypeDeclarations(~recFlag, typeDeclarations)
-    | Psig_typext(typeExtension) => printTypeExtension(typeExtension)
-    | Psig_exception(extensionConstructor) =>
-      printExceptionDef(extensionConstructor)
-    | Psig_module(moduleDeclaration) =>
-      printModuleDeclaration(moduleDeclaration)
-    | Psig_recmodule(moduleDeclarations) =>
-      printRecModuleDeclarations(moduleDeclarations)
-    | Psig_modtype(modTypeDecl) => printModuleTypeDeclaration(modTypeDecl)
-    | Psig_open(openDescription) => printOpenDescription(openDescription)
-    | Psig_include(includeDescription) =>
-      printIncludeDescription(includeDescription)
-    | Psig_attribute(attr) =>
-      Doc.concat(list(Doc.text("@"), printAttribute(attr)))
-    | Psig_extension(extension, attrs) =>
-      Doc.concat(list(
-        printAttributes(attrs),
-        Doc.concat(list(Doc.text("%"), printExtension(extension))),
-      ))
-    | Psig_class(_) | Psig_class_type(_) => Doc.nil
-    }
-  
-  and printRecModuleDeclarations = moduleDeclarations =>
-    Doc.group(
-      Doc.join(
-        ~sep=Doc.line,
-        List.mapi(
-          (i, md: Parsetree.module_declaration) => {
-            let body = switch md.pmd_type.pmty_desc {
-            | Parsetree.Pmty_alias({txt: longident}) =>
-              Doc.concat(list(Doc.text(" = "), printLongident(longident)))
-            | _ =>
-              let needsParens = switch md.pmd_type.pmty_desc {
-              | Pmty_with(_) => true
-              | _ => false
-              }
-              
-              let modTypeDoc = {
-                let doc = printModType(md.pmd_type)
-                if needsParens {
-                  addParens(doc)
-                } else {
-                  doc
-                }
-              }
-              
-              Doc.concat(list(Doc.text(": "), modTypeDoc))
-            }
-            
-            let prefix = if i < 1 {
-              "module rec "
-            } else {
-              "and "
-            }
-            Doc.concat(list(
-              printAttributes(~loc=md.pmd_name.loc, md.pmd_attributes),
-              Doc.text(prefix),
-              Doc.text(md.pmd_name.txt),
-              body,
-            ))
-          },
-          moduleDeclarations,
-        ),
-      ),
-    )
-  
-  and printModuleDeclaration = (md: Parsetree.module_declaration) => {
-    let body = switch md.pmd_type.pmty_desc {
-    | Parsetree.Pmty_alias({txt: longident}) =>
-      Doc.concat(list(Doc.text(" = "), printLongident(longident)))
-    | _ => Doc.concat(list(Doc.text(": "), printModType(md.pmd_type)))
-    }
-    
-    Doc.concat(list(
-      printAttributes(~loc=md.pmd_name.loc, md.pmd_attributes),
-      Doc.text("module "),
-      Doc.text(md.pmd_name.txt),
-      body,
-    ))
-  }
-  
-  and printOpenDescription = (openDescription: Parsetree.open_description) =>
-    Doc.concat(list(
-      printAttributes(openDescription.popen_attributes),
-      Doc.text("open"),
-      switch openDescription.popen_override {
-      | Asttypes.Fresh => Doc.space
-      | Asttypes.Override => Doc.text("! ")
-      },
-      printLongident(openDescription.popen_lid.txt),
-    ))
-  
-  and printIncludeDescription = (
-    includeDescription: Parsetree.include_description,
-  ) =>
-    Doc.concat(list(
-      printAttributes(includeDescription.pincl_attributes),
-      Doc.text("include "),
-      printModType(includeDescription.pincl_mod),
-    ))
-  
-  and printIncludeDeclaration = (
-    includeDeclaration: Parsetree.include_declaration,
-  ) =>
-    Doc.concat(list(
-      printAttributes(includeDeclaration.pincl_attributes),
-      Doc.text("include "),
-      printModExpr(includeDeclaration.pincl_mod),
-    ))
-  
-  and printValueBindings = (~recFlag, vbs: list<Parsetree.value_binding>) => {
-    let rows = List.mapi(
-      (i, vb) => {
-        let doc = printValueBinding(~recFlag, i, vb)
-        /vb.Parsetree.pvb_loc, doc/
-      },
-      vbs,
-    )
-    
-    interleaveWhitespace(rows)
-  }
-  
-  and printValueDescription = valueDescription => {
-    let isExternal = switch valueDescription.pval_prim {
-    | list() => false
-    | _ => true
-    }
-    
-    Doc.group(
-      Doc.concat(list(
-        Doc.text(
-          if isExternal {
-            "external "
-          } else {
-            "let "
-          },
-        ),
-        Doc.text(valueDescription.pval_name.txt),
-        Doc.text(": "),
-        printTypExpr(valueDescription.pval_type),
-        if isExternal {
-          Doc.group(
-            Doc.concat(list(
-              Doc.text(" ="),
-              Doc.indent(
-                Doc.concat(list(
-                  Doc.line,
-                  Doc.join(
-                    ~sep=Doc.line,
-                    List.map(
-                      s =>
-                        Doc.concat(list(
-                          Doc.text("\""),
-                          Doc.text(s),
-                          Doc.text("\""),
-                        )),
-                      valueDescription.pval_prim,
-                    ),
-                  ),
-                )),
-              ),
-            )),
-          )
-        } else {
-          Doc.nil
-        },
-      )),
-    )
-  }
-  
-  and printTypeDeclarations = (~recFlag, typeDeclarations) => {
-    let rows = List.mapi(
-      (i, td) => {
-        let doc = printTypeDeclaration(
-          ~name=Doc.text(td.Parsetree.ptype_name.txt),
-          ~equalSign="=",
-          ~recFlag,
-          i,
-          td,
-        )
-        
-        /td.Parsetree.ptype_loc, doc/
-      },
-      typeDeclarations,
-    )
-    interleaveWhitespace(rows)
-  }
-  
-  and printTypeDeclaration = (
-    ~name,
-    ~equalSign,
-    ~recFlag,
-    i,
-    td: Parsetree.type_declaration,
-  ) => {
-    let attrs = printAttributes(~loc=td.ptype_loc, td.ptype_attributes)
-    let prefix = if i > 0 {
-      Doc.text("and ")
-    } else {
-      Doc.concat(list(Doc.text("type "), recFlag))
-    }
-    
-    let typeName = name
-    let typeParams = switch td.ptype_params {
-    | list() => Doc.nil
-    | typeParams =>
-      Doc.group(
-        Doc.concat(list(
-          Doc.lessThan,
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                List.map(printTypeParam, typeParams),
-              ),
-            )),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.greaterThan,
-        )),
-      )
-    }
-    
-    let manifestAndKind = switch td.ptype_kind {
-    | Ptype_abstract =>
-      switch td.ptype_manifest {
-      | None => Doc.nil
-      | Some(typ) =>
-        Doc.concat(list(
-          Doc.concat(list(Doc.space, Doc.text(equalSign), Doc.space)),
-          printPrivateFlag(td.ptype_private),
-          printTypExpr(typ),
-        ))
-      }
-    | Ptype_open =>
-      Doc.concat(list(
-        Doc.concat(list(Doc.space, Doc.text(equalSign), Doc.space)),
-        printPrivateFlag(td.ptype_private),
-        Doc.text(".."),
-      ))
-    | Ptype_record(lds) =>
-      let manifest = switch td.ptype_manifest {
-      | None => Doc.nil
-      | Some(typ) =>
-        Doc.concat(list(
-          Doc.concat(list(Doc.space, Doc.text(equalSign), Doc.space)),
-          printTypExpr(typ),
-        ))
-      }
-      
-      Doc.concat(list(
-        manifest,
-        Doc.concat(list(Doc.space, Doc.text(equalSign), Doc.space)),
-        printPrivateFlag(td.ptype_private),
-        printRecordDeclaration(lds),
-      ))
-    | Ptype_variant(cds) =>
-      let manifest = switch td.ptype_manifest {
-      | None => Doc.nil
-      | Some(typ) =>
-        Doc.concat(list(
-          Doc.concat(list(Doc.space, Doc.text(equalSign), Doc.space)),
-          printTypExpr(typ),
-        ))
-      }
-      
-      Doc.concat(list(
-        manifest,
-        Doc.concat(list(Doc.space, Doc.text(equalSign))),
-        printConstructorDeclarations(~privateFlag=td.ptype_private, cds),
-      ))
-    }
-    
-    let constraints = printTypeDefinitionConstraints(td.ptype_cstrs)
-    Doc.group(
-      Doc.concat(list(
-        attrs,
-        prefix,
-        typeName,
-        typeParams,
-        manifestAndKind,
-        constraints,
-      )),
-    )
-  }
-  
-  and printTypeDefinitionConstraints = cstrs =>
-    switch cstrs {
-    | list() => Doc.nil
-    | cstrs =>
-      Doc.indent(
-        Doc.group(
-          Doc.concat(list(
-            Doc.line,
-            Doc.group(
-              Doc.join(
-                ~sep=Doc.line,
-                List.map(printTypeDefinitionConstraint, cstrs),
-              ),
-            ),
-          )),
-        ),
-      )
-    }
-  
-  and printTypeDefinitionConstraint = (
-    /typ1, typ2, _loc/: /Parsetree.core_type, Parsetree.core_type, Location.t/,
-  ) =>
-    Doc.concat(list(
-      Doc.text("constraint "),
-      printTypExpr(typ1),
-      Doc.text(" = "),
-      printTypExpr(typ2),
-    ))
-  
-  and printPrivateFlag = (flag: Asttypes.private_flag) =>
-    switch flag {
-    | Private => Doc.text("private ")
-    | Public => Doc.nil
-    }
-  
-  and printTypeParam = (param: /Parsetree.core_type, Asttypes.variance/) => {
-    let /typ, variance/ = param
-    let printedVariance = switch variance {
-    | Covariant => Doc.text("+")
-    | Contravariant => Doc.text("-")
-    | Invariant => Doc.nil
-    }
-    
-    Doc.concat(list(printedVariance, printTypExpr(typ)))
-  }
-  
-  and printRecordDeclaration = (lds: list<Parsetree.label_declaration>) => {
-    let forceBreak = switch /lds, List.rev(lds)/ {
-    | /list(first, ..._), list(last, ..._)/ =>
-      first.pld_loc.loc_start.pos_lnum < last.pld_loc.loc_end.pos_lnum
-    | _ => false
-    }
-    
-    Doc.breakableGroup(
-      ~forceBreak,
-      Doc.concat(list(
-        Doc.lbrace,
-        Doc.indent(
-          Doc.concat(list(
-            Doc.softLine,
-            Doc.join(
-              ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-              List.map(printLabelDeclaration, lds),
-            ),
-          )),
-        ),
-        Doc.trailingComma,
-        Doc.softLine,
-        Doc.rbrace,
-      )),
-    )
-  }
-  
-  and printConstructorDeclarations = (
-    ~privateFlag,
-    cds: list<Parsetree.constructor_declaration>,
-  ) => {
-    let forceBreak = switch /cds, List.rev(cds)/ {
-    | /list(first, ..._), list(last, ..._)/ =>
-      first.pcd_loc.loc_start.pos_lnum < last.pcd_loc.loc_end.pos_lnum
-    | _ => false
-    }
-    
-    let privateFlag = switch privateFlag {
-    | Asttypes.Private => Doc.concat(list(Doc.text("private"), Doc.line))
-    | Public => Doc.nil
-    }
-    
-    Doc.breakableGroup(
-      ~forceBreak,
-      Doc.indent(
-        Doc.concat(list(
-          Doc.line,
-          privateFlag,
-          Doc.join(~sep=Doc.line, List.mapi(printConstructorDeclaration, cds)),
-        )),
-      ),
-    )
-  }
-  
-  and printConstructorDeclaration = (
-    i,
-    cd: Parsetree.constructor_declaration,
-  ) => {
-    let attrs = printAttributes(cd.pcd_attributes)
-    let bar = if i > 0 {
-      Doc.text("| ")
-    } else {
-      Doc.ifBreaks(Doc.text("| "), Doc.nil)
-    }
-    
-    let constrName = Doc.text(cd.pcd_name.txt)
-    let constrArgs = printConstructorArguments(cd.pcd_args)
-    let gadt = switch cd.pcd_res {
-    | None => Doc.nil
-    | Some(typ) =>
-      Doc.indent(Doc.concat(list(Doc.text(": "), printTypExpr(typ))))
-    }
-    
-    Doc.concat(list(
-      bar,
-      Doc.group(Doc.concat(list(attrs, constrName, constrArgs, gadt))),
-    ))
-  }
-  
-  and printConstructorArguments = (cdArgs: Parsetree.constructor_arguments) =>
-    switch cdArgs {
-    | Pcstr_tuple(list()) => Doc.nil
-    | Pcstr_tuple(types) =>
-      Doc.group(
-        Doc.indent(
-          Doc.concat(list(
-            Doc.lparen,
-            Doc.indent(
-              Doc.concat(list(
-                Doc.softLine,
-                Doc.join(
-                  ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                  List.map(printTypExpr, types),
-                ),
-              )),
-            ),
-            Doc.trailingComma,
-            Doc.softLine,
-            Doc.rparen,
-          )),
-        ),
-      )
-    | Pcstr_record(lds) =>
-      Doc.indent(
-        Doc.concat(list(
-          Doc.lparen,
-          Doc.lbrace,
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                List.map(printLabelDeclaration, lds),
-              ),
-            )),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rbrace,
-          Doc.rparen,
-        )),
-      )
-    }
-  
-  and printLabelDeclaration = (ld: Parsetree.label_declaration) => {
-    let attrs = printAttributes(~loc=ld.pld_name.loc, ld.pld_attributes)
-    let mutableFlag = switch ld.pld_mutable {
-    | Mutable => Doc.text("mutable ")
-    | Immutable => Doc.nil
-    }
-    
-    let name = Doc.text(ld.pld_name.txt)
-    Doc.group(
-      Doc.concat(list(
-        attrs,
-        mutableFlag,
-        name,
-        Doc.text(": "),
-        printTypExpr(ld.pld_type),
-      )),
-    )
-  }
-  
-  and printTypExpr = (typExpr: Parsetree.core_type) => {
-    let renderedType = switch typExpr.ptyp_desc {
-    | Ptyp_any => Doc.text("_")
-    | Ptyp_var(var) => Doc.text("'" ++ var)
-    | Ptyp_extension(extension) => printExtension(extension)
-    | Ptyp_alias(typ, alias) =>
-      let typ = {
-        let needsParens = switch typ.ptyp_desc {
-        | Ptyp_arrow(_) => true
-        | _ => false
-        }
-        
-        let doc = printTypExpr(typ)
-        if needsParens {
-          Doc.concat(list(Doc.lparen, doc, Doc.rparen))
-        } else {
-          doc
-        }
-      }
-      
-      Doc.concat(list(typ, Doc.text(" as "), Doc.text("'" ++ alias)))
-    | Ptyp_constr(
-        {txt: Longident.Ldot(Longident.Lident("Js"), "t")},
-        list(typ),
-      ) =>
-      let bsObject = printTypExpr(typ)
-      switch typExpr.ptyp_attributes {
-      | list() => bsObject
-      | attrs =>
-        Doc.concat(list(
-          Doc.group(Doc.join(~sep=Doc.line, List.map(printAttribute, attrs))),
-          Doc.space,
-          printTypExpr(typ),
-        ))
-      }
-    | Ptyp_constr(
-        longidentLoc,
-        list({ptyp_desc: Parsetree.Ptyp_tuple(tuple)}),
-      ) =>
-      let constrName = printLongident(longidentLoc.txt)
-      Doc.group(
-        Doc.concat(list(
-          constrName,
-          Doc.lessThan,
-          printTupleType(~inline=true, tuple),
-          Doc.greaterThan,
-        )),
-      )
-    | Ptyp_constr(longidentLoc, constrArgs) =>
-      let constrName = printLongident(longidentLoc.txt)
-      switch constrArgs {
-      | list() => constrName
-      | list({
-          Parsetree.ptyp_desc: 
-            Ptyp_constr(
-              {txt: Longident.Ldot(Longident.Lident("Js"), "t")},
-              list({ptyp_desc: Ptyp_object(fields, openFlag)}),
-            ),
-        }) =>
-        Doc.concat(list(
-          constrName,
-          Doc.lessThan,
-          printBsObjectSugar(~inline=true, fields, openFlag),
-          Doc.greaterThan,
-        ))
-      | args =>
-        Doc.group(
-          Doc.concat(list(
-            constrName,
-            Doc.lessThan,
-            Doc.indent(
-              Doc.concat(list(
-                Doc.softLine,
-                Doc.join(
-                  ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                  List.map(printTypExpr, constrArgs),
-                ),
-              )),
-            ),
-            Doc.trailingComma,
-            Doc.softLine,
-            Doc.greaterThan,
-          )),
-        )
-      }
-    | Ptyp_arrow(_) =>
-      let /attrsBefore, args, returnType/ = ParsetreeViewer.arrowType(typExpr)
-      let returnTypeNeedsParens = switch returnType.ptyp_desc {
-      | Ptyp_alias(_) => true
-      | _ => false
-      }
-      
-      let returnDoc = {
-        let doc = printTypExpr(returnType)
-        if returnTypeNeedsParens {
-          Doc.concat(list(Doc.lparen, doc, Doc.rparen))
-        } else {
-          doc
-        }
-      }
-      
-      let /isUncurried, attrs/ = ParsetreeViewer.processUncurriedAttribute(
-        attrsBefore,
-      )
-      switch args {
-      | list() => Doc.nil
-      | list(/list(), Nolabel, n/) when !isUncurried =>
-        let hasAttrsBefore = !(attrs == list())
-        let attrs = if hasAttrsBefore {
-          Doc.concat(list(
-            Doc.join(~sep=Doc.line, List.map(printAttribute, attrsBefore)),
-            Doc.space,
-          ))
-        } else {
-          Doc.nil
-        }
-        
-        Doc.group(
-          Doc.concat(list(
-            Doc.group(attrs),
-            Doc.group(
-              if hasAttrsBefore {
-                Doc.concat(list(
-                  Doc.lparen,
-                  Doc.indent(
-                    Doc.concat(list(
-                      Doc.softLine,
-                      printTypExpr(n),
-                      Doc.text(" => "),
-                      returnDoc,
-                    )),
-                  ),
-                  Doc.softLine,
-                  Doc.rparen,
-                ))
-              } else {
-                Doc.concat(list(printTypExpr(n), Doc.text(" => "), returnDoc))
-              },
-            ),
-          )),
-        )
-      | args =>
-        let attrs = switch attrs {
-        | list() => Doc.nil
-        | attrs =>
-          Doc.concat(list(
-            Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)),
-            Doc.space,
-          ))
-        }
-        
-        let renderedArgs = Doc.concat(list(
-          attrs,
-          Doc.text("("),
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              if isUncurried {
-                Doc.concat(list(Doc.dot, Doc.space))
-              } else {
-                Doc.nil
-              },
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                List.map(printTypeParameter, args),
-              ),
-            )),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.text(")"),
-        ))
-        Doc.group(Doc.concat(list(renderedArgs, Doc.text(" => "), returnDoc)))
-      }
-    | Ptyp_tuple(types) => printTupleType(~inline=false, types)
-    | Ptyp_object(fields, openFlag) =>
-      printBsObjectSugar(~inline=false, fields, openFlag)
-    | Ptyp_poly(stringLocs, typ) =>
-      Doc.concat(list(
-        Doc.join(
-          ~sep=Doc.space,
-          List.map(({Location.txt: txt}) => Doc.text("'" ++ txt), stringLocs),
-        ),
-        Doc.dot,
-        Doc.space,
-        printTypExpr(typ),
-      ))
-    | Ptyp_package(packageType) =>
-      printPackageType(~printModuleKeywordAndParens=true, packageType)
-    | Ptyp_class(_) => failwith("classes are not supported in types")
-    | Ptyp_variant(_) =>
-      failwith("Polymorphic variants currently not supported")
-    }
-    
-    let shouldPrintItsOwnAttributes = switch typExpr.ptyp_desc {
-    | Ptyp_arrow(_)
-      | Ptyp_constr({txt: Longident.Ldot(Longident.Lident("Js"), "t")}, _) =>
-      true
-    | _ => false
-    }
-    
-    switch typExpr.ptyp_attributes {
-    | list(_, ..._) as attrs when !shouldPrintItsOwnAttributes =>
-      Doc.group(Doc.concat(list(printAttributes(attrs), renderedType)))
-    | _ => renderedType
-    }
-  }
-  
-  and printBsObjectSugar = (~inline, fields, openFlag) => {
-    let flag = switch openFlag {
-    | Asttypes.Closed => Doc.nil
-    | Open => Doc.dotdot
-    }
-    
-    let doc = Doc.concat(list(
-      Doc.lbrace,
-      flag,
-      Doc.indent(
-        Doc.concat(list(
-          Doc.softLine,
-          Doc.join(
-            ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-            List.map(printObjectField, fields),
-          ),
-        )),
-      ),
-      Doc.trailingComma,
-      Doc.softLine,
-      Doc.rbrace,
-    ))
-    if inline {
-      doc
-    } else {
-      Doc.group(doc)
-    }
-  }
-  
-  and printTupleType = (~inline, types: list<Parsetree.core_type>) => {
-    let tuple = Doc.concat(list(
-      Doc.text("/"),
-      Doc.indent(
-        Doc.concat(list(
-          Doc.softLine,
-          Doc.join(
-            ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-            List.map(printTypExpr, types),
-          ),
-        )),
-      ),
-      Doc.softLine,
-      Doc.text("/"),
-    ))
-    
-    if inline === false {
-      Doc.group(tuple)
-    } else {
-      tuple
-    }
-  }
-  
-  and printObjectField = (field: Parsetree.object_field) =>
-    switch field {
-    | Otag(labelLoc, attrs, typ) =>
-      Doc.concat(list(
-        Doc.text("\"" ++ labelLoc.txt ++ "\""),
-        Doc.text(": "),
-        printTypExpr(typ),
-      ))
-    | _ => Doc.nil
-    }
-  
-  and printTypeParameter = (/attrs, lbl, typ/) => {
-    let /isUncurried, attrs/ = ParsetreeViewer.processUncurriedAttribute(attrs)
-    let uncurried = if isUncurried {
-      Doc.concat(list(Doc.dot, Doc.space))
-    } else {
-      Doc.nil
-    }
-    let attrs = switch attrs {
-    | list() => Doc.nil
-    | attrs =>
-      Doc.concat(list(
-        Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)),
-        Doc.line,
-      ))
-    }
-    let label = switch lbl {
-    | Asttypes.Nolabel => Doc.nil
-    | Labelled(lbl) => Doc.text("~" ++ lbl ++ ": ")
-    | Optional(lbl) => Doc.text("~" ++ lbl ++ ": ")
-    }
-    
-    let optionalIndicator = switch lbl {
-    | Asttypes.Nolabel | Labelled(_) => Doc.nil
-    | Optional(lbl) => Doc.text("=?")
-    }
-    
-    Doc.group(
-      Doc.concat(list(
-        uncurried,
-        attrs,
-        label,
-        printTypExpr(typ),
-        optionalIndicator,
-      )),
-    )
-  }
-  
-  and printValueBinding = (~recFlag, i, vb) => {
-    let isGhost = ParsetreeViewer.isGhostUnitBinding(i, vb)
-    let header = if isGhost {
-      Doc.nil
-    } else if i === 0 {
-      Doc.concat(list(Doc.text("let "), recFlag))
-    } else {
-      Doc.text("and ")
-    }
-    
-    let printedExpr = {
-      let exprDoc = printExpression(vb.pvb_expr)
-      let needsParens = switch vb.pvb_expr.pexp_desc {
-      | Pexp_constraint(
-          {pexp_desc: Pexp_pack(_)},
-          {ptyp_desc: Ptyp_package(_)},
-        ) =>
-        false
-      | Pexp_constraint(_) => true
-      | _ => false
-      }
-      
-      if needsParens {
-        addParens(exprDoc)
-      } else {
-        exprDoc
-      }
-    }
-    
-    if isGhost {
-      printedExpr
-    } else {
-      let shouldIndent =
-        ParsetreeViewer.isBinaryExpression(vb.pvb_expr) ||
-        switch vb.pvb_expr {
-        | {
-            pexp_attributes: list(/{Location.txt: "res.ternary"}, _/),
-            pexp_desc: Pexp_ifthenelse(ifExpr, _, _),
-          } =>
-          ParsetreeViewer.isBinaryExpression(ifExpr) ||
-          ParsetreeViewer.hasAttributes(ifExpr.pexp_attributes)
-        | {pexp_desc: Pexp_newtype(_)} => false
-        | e =>
-          ParsetreeViewer.hasAttributes(e.pexp_attributes) ||
-          ParsetreeViewer.isArrayAccess(e)
-        }
-      
-      Doc.concat(list(
-        printAttributes(~loc=vb.pvb_loc, vb.pvb_attributes),
-        header,
-        printPattern(vb.pvb_pat),
-        Doc.text(" ="),
-        if shouldIndent {
-          Doc.indent(Doc.concat(list(Doc.line, printedExpr)))
-        } else {
-          Doc.concat(list(Doc.space, printedExpr))
-        },
-      ))
-    }
-  }
-  
-  and printPackageType = (
-    ~printModuleKeywordAndParens,
-    packageType: Parsetree.package_type,
-  ) => {
-    let doc = switch packageType {
-    | /longidentLoc, list()/ =>
-      Doc.group(Doc.concat(list(printLongident(longidentLoc.txt))))
-    | /longidentLoc, packageConstraints/ =>
-      Doc.group(
-        Doc.concat(list(
-          printLongident(longidentLoc.txt),
-          printPackageConstraints(packageConstraints),
-          Doc.softLine,
-        )),
-      )
-    }
-    
-    if printModuleKeywordAndParens {
-      Doc.concat(list(Doc.text("module("), doc, Doc.rparen))
-    } else {
-      doc
-    }
-  }
-  
-  and printPackageConstraints = packageConstraints =>
-    Doc.concat(list(
-      Doc.text(" with"),
-      Doc.indent(
-        Doc.concat(list(
-          Doc.line,
-          Doc.join(
-            ~sep=Doc.line,
-            List.mapi(printPackageconstraint, packageConstraints),
-          ),
-        )),
-      ),
-    ))
-  
-  and printPackageconstraint = (i, /longidentLoc, typ/) => {
-    let prefix = if i === 0 {
-      Doc.text("type ")
-    } else {
-      Doc.text("and type ")
-    }
-    Doc.concat(list(
-      prefix,
-      printLongident(longidentLoc.Location.txt),
-      Doc.text(" = "),
-      printTypExpr(typ),
-    ))
-  }
-  
-  and printExtension = (/stringLoc, payload/) => {
-    let extName = Doc.text("%" ++ stringLoc.Location.txt)
-    switch payload {
-    | PStr(list({pstr_desc: Pstr_eval(expr, attrs)})) =>
-      let exprDoc = printExpression(expr)
-      let needsParens = switch attrs {
-      | list() => false
-      | _ => true
-      }
-      Doc.group(
-        Doc.concat(list(
-          extName,
-          addParens(
-            Doc.concat(list(
-              printAttributes(attrs),
-              if needsParens {
-                addParens(exprDoc)
-              } else {
-                exprDoc
-              },
-            )),
-          ),
-        )),
-      )
-    | _ => extName
-    }
-  }
-  
-  and printPattern = (p: Parsetree.pattern) => {
-    let patternWithoutAttributes = switch p.ppat_desc {
-    | Ppat_any => Doc.text("_")
-    | Ppat_var(stringLoc) => Doc.text(stringLoc.txt)
-    | Ppat_constant(c) => printConstant(c)
-    | Ppat_tuple(patterns) =>
-      Doc.group(
-        Doc.concat(list(
-          Doc.text("/"),
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.text(","), Doc.line)),
-                List.map(printPattern, patterns),
-              ),
-            )),
-          ),
-          Doc.softLine,
-          Doc.text("/"),
-        )),
-      )
-    | Ppat_array(patterns) =>
-      Doc.group(
-        Doc.concat(list(
-          Doc.text("["),
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.text(","), Doc.line)),
-                List.map(printPattern, patterns),
-              ),
-            )),
-          ),
-          Doc.ifBreaks(Doc.text(","), Doc.nil),
-          Doc.softLine,
-          Doc.text("]"),
-        )),
-      )
-    | Ppat_construct({txt: Longident.Lident("[]")}, _) => Doc.text("list()")
-    | Ppat_construct({txt: Longident.Lident("::")}, _) =>
-      let /patterns, tail/ = collectPatternsFromListConstruct(list(), p)
-      let shouldHug = switch /patterns, tail/ {
-      | /
-          list(pat),
-          {ppat_desc: Ppat_construct({txt: Longident.Lident("[]")}, _)}
-        / when ParsetreeViewer.isHuggablePattern(pat) =>
-        true
-      | _ => false
-      }
-      
-      let children = Doc.concat(list(
-        if shouldHug {
-          Doc.nil
-        } else {
-          Doc.softLine
-        },
-        Doc.join(
-          ~sep=Doc.concat(list(Doc.text(","), Doc.line)),
-          List.map(printPattern, patterns),
-        ),
-        switch tail.Parsetree.ppat_desc {
-        | Ppat_construct({txt: Longident.Lident("[]")}, _) => Doc.nil
-        | _ =>
-          Doc.concat(list(
-            Doc.text(","),
-            Doc.line,
-            Doc.text("..."),
-            printPattern(tail),
-          ))
-        },
-      ))
-      Doc.group(
-        Doc.concat(list(
-          Doc.text("list("),
-          if shouldHug {
-            children
-          } else {
-            Doc.concat(list(
-              Doc.indent(children),
-              Doc.ifBreaks(Doc.text(","), Doc.nil),
-              Doc.softLine,
-            ))
-          },
-          Doc.text(")"),
-        )),
-      )
-    | Ppat_construct(constrName, constructorArgs) =>
-      let constrName = printLongident(constrName.txt)
-      switch constructorArgs {
-      | None => constrName
-      | Some(args) =>
-        let args = switch args.ppat_desc {
-        | Ppat_construct({txt: Longident.Lident("()")}, None) => list(Doc.nil)
-        | Ppat_tuple(patterns) => List.map(printPattern, patterns)
-        | _ => list(printPattern(args))
-        }
-        
-        Doc.group(
-          Doc.concat(list(
-            constrName,
-            Doc.text("("),
-            Doc.indent(
-              Doc.concat(list(
-                Doc.softLine,
-                Doc.join(~sep=Doc.concat(list(Doc.text(","), Doc.line)), args),
-              )),
-            ),
-            Doc.ifBreaks(Doc.text(","), Doc.nil),
-            Doc.softLine,
-            Doc.text(")"),
-          )),
-        )
-      }
-    | Ppat_record(rows, openFlag) =>
-      Doc.group(
-        Doc.concat(list(
-          Doc.text("{"),
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.text(","), Doc.line)),
-                List.map(printPatternRecordRow, rows),
-              ),
-              switch openFlag {
-              | Open => Doc.concat(list(Doc.text(","), Doc.line, Doc.text("_")))
-              | Closed => Doc.nil
-              },
-            )),
-          ),
-          Doc.ifBreaks(Doc.text(","), Doc.nil),
-          Doc.softLine,
-          Doc.text("}"),
-        )),
-      )
-    | Ppat_exception(p) =>
-      let needsParens = switch p.ppat_desc {
-      | Ppat_or(_, _) | Ppat_alias(_, _) => true
-      | _ => false
-      }
-      
-      let pat = {
-        let p = printPattern(p)
-        if needsParens {
-          Doc.concat(list(Doc.text("("), p, Doc.text(")")))
-        } else {
-          p
-        }
-      }
-      
-      Doc.group(Doc.concat(list(Doc.text("exception"), Doc.line, pat)))
-    | Ppat_or(p1, p2) =>
-      let p1 = {
-        let p = printPattern(p1)
-        switch p1.ppat_desc {
-        | Ppat_or(_, _) => Doc.concat(list(Doc.text("("), p, Doc.text(")")))
-        | _ => p
-        }
-      }
-      
-      let p2 = {
-        let p = printPattern(p2)
-        switch p2.ppat_desc {
-        | Ppat_or(_, _) => Doc.concat(list(Doc.text("("), p, Doc.text(")")))
-        | _ => p
-        }
-      }
-      
-      Doc.group(Doc.concat(list(p1, Doc.line, Doc.text("| "), p2)))
-    | Ppat_extension(ext) => printExtension(ext)
-    | Ppat_lazy(p) =>
-      let needsParens = switch p.ppat_desc {
-      | Ppat_or(_, _) | Ppat_alias(_, _) => true
-      | _ => false
-      }
-      
-      let pat = {
-        let p = printPattern(p)
-        if needsParens {
-          Doc.concat(list(Doc.text("("), p, Doc.text(")")))
-        } else {
-          p
-        }
-      }
-      
-      Doc.concat(list(Doc.text("lazy "), pat))
-    | Ppat_alias(p, aliasLoc) =>
-      let needsParens = switch p.ppat_desc {
-      | Ppat_or(_, _) | Ppat_alias(_, _) => true
-      | _ => false
-      }
-      
-      let renderedPattern = {
-        let p = printPattern(p)
-        if needsParens {
-          Doc.concat(list(Doc.text("("), p, Doc.text(")")))
-        } else {
-          p
-        }
-      }
-      
-      Doc.concat(list(
-        renderedPattern,
-        Doc.text(" as "),
-        Doc.text(aliasLoc.txt),
-      ))
-    | Ppat_constraint(
-        {ppat_desc: Ppat_unpack(stringLoc)},
-        {ptyp_desc: Ptyp_package(packageType)},
-      ) =>
-      Doc.concat(list(
-        Doc.text("module("),
-        Doc.text(stringLoc.txt),
-        Doc.text(": "),
-        printPackageType(~printModuleKeywordAndParens=false, packageType),
-        Doc.rparen,
-      ))
-    | Ppat_constraint(pattern, typ) =>
-      Doc.concat(list(printPattern(pattern), Doc.text(": "), printTypExpr(typ)))
-    | Ppat_unpack(stringLoc) =>
-      Doc.concat(list(Doc.text("module("), Doc.text(stringLoc.txt), Doc.rparen))
-    | _ => failwith("unsupported pattern")
-    }
-    
-    switch p.ppat_attributes {
-    | list() => patternWithoutAttributes
-    | attrs =>
-      Doc.group(
-        Doc.concat(list(printAttributes(attrs), patternWithoutAttributes)),
-      )
-    }
-  }
-  
-  and printPatternRecordRow = row =>
-    switch row {
-    | /
-        {Location.txt: Longident.Lident(ident)},
-        {Parsetree.ppat_desc: Ppat_var({txt, _})}
-      / when ident == txt =>
-      Doc.text(ident)
-    | /longident, pattern/ =>
-      Doc.group(
-        Doc.concat(list(
-          printLongident(longident.txt),
-          Doc.text(": "),
-          Doc.indent(Doc.concat(list(Doc.softLine, printPattern(pattern)))),
-        )),
-      )
-    }
-  
-  and printExpression = (e: Parsetree.expression) => {
-    let printedExpression = switch e.pexp_desc {
-    | Parsetree.Pexp_constant(c) => printConstant(c)
-    | Pexp_construct(_)
-      when ParsetreeViewer.hasJsxAttribute(e.pexp_attributes) =>
-      printJsxFragment(e)
-    | Pexp_construct({txt: Longident.Lident("()")}, _) => Doc.text("()")
-    | Pexp_construct({txt: Longident.Lident("[]")}, _) => Doc.text("list()")
-    | Pexp_construct({txt: Longident.Lident("::")}, _) =>
-      let /expressions, spread/ = ParsetreeViewer.collectListExpressions(e)
-      let spreadDoc = switch spread {
-      | Some(expr) =>
-        Doc.concat(list(
-          Doc.text(","),
-          Doc.line,
-          Doc.dotdotdot,
-          printExpression(expr),
-        ))
-      | None => Doc.nil
-      }
-      
-      Doc.group(
-        Doc.concat(list(
-          Doc.text("list("),
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.text(","), Doc.line)),
-                List.map(printExpression, expressions),
-              ),
-              spreadDoc,
-            )),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        )),
-      )
-    | Pexp_construct(longidentLoc, args) =>
-      let constr = printLongident(longidentLoc.txt)
-      let args = switch args {
-      | None => Doc.nil
-      | Some({pexp_desc: Pexp_construct({txt: Longident.Lident("()")}, _)}) =>
-        Doc.text("()")
-      | Some({pexp_desc: Pexp_tuple(args)}) =>
-        Doc.concat(list(
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                List.map(printExpression, args),
-              ),
-            )),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        ))
-      | Some(arg) =>
-        let argDoc = printExpression(arg)
-        let shouldHug = ParsetreeViewer.isHuggableExpression(arg)
-        Doc.concat(list(
-          Doc.lparen,
-          if shouldHug {
-            argDoc
-          } else {
-            Doc.concat(list(
-              Doc.indent(Doc.concat(list(Doc.softLine, argDoc))),
-              Doc.trailingComma,
-              Doc.softLine,
-            ))
-          },
-          Doc.rparen,
-        ))
-      }
-      
-      Doc.group(Doc.concat(list(constr, args)))
-    | Pexp_ident(longidentLoc) => printLongident(longidentLoc.txt)
-    | Pexp_tuple(exprs) =>
-      Doc.group(
-        Doc.concat(list(
-          Doc.text("/"),
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.text(","), Doc.line)),
-                List.map(printExpression, exprs),
-              ),
-            )),
-          ),
-          Doc.ifBreaks(Doc.text(","), Doc.nil),
-          Doc.softLine,
-          Doc.text("/"),
-        )),
-      )
-    | Pexp_array(list()) => Doc.text("[]")
-    | Pexp_array(exprs) =>
-      Doc.group(
-        Doc.concat(list(
-          Doc.lbracket,
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.text(","), Doc.line)),
-                List.map(printExpression, exprs),
-              ),
-            )),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rbracket,
-        )),
-      )
-    | Pexp_record(rows, spreadExpr) =>
-      let spread = switch spreadExpr {
-      | None => Doc.nil
-      | Some(expr) =>
-        Doc.concat(list(
-          Doc.dotdotdot,
-          printExpression(expr),
-          Doc.comma,
-          Doc.line,
-        ))
-      }
-      
-      let forceBreak =
-        e.pexp_loc.loc_start.pos_lnum < e.pexp_loc.loc_end.pos_lnum
-      
-      Doc.breakableGroup(
-        ~forceBreak,
-        Doc.concat(list(
-          Doc.lbrace,
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              spread,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.text(","), Doc.line)),
-                List.map(printRecordRow, rows),
-              ),
-            )),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rbrace,
-        )),
-      )
-    | Pexp_extension(extension) =>
-      switch extension {
-      | /
-          {txt: "bs.obj"},
-          PStr(
-            list({
-              pstr_loc: loc,
-              pstr_desc: Pstr_eval({pexp_desc: Pexp_record(rows, _)}, list()),
-            }),
-          )
-        / =>
-        let forceBreak = loc.loc_start.pos_lnum < loc.loc_end.pos_lnum
-        
-        Doc.breakableGroup(
-          ~forceBreak,
-          Doc.concat(list(
-            Doc.lbrace,
-            Doc.indent(
-              Doc.concat(list(
-                Doc.softLine,
-                Doc.join(
-                  ~sep=Doc.concat(list(Doc.text(","), Doc.line)),
-                  List.map(printBsObjectRow, rows),
-                ),
-              )),
-            ),
-            Doc.trailingComma,
-            Doc.softLine,
-            Doc.rbrace,
-          )),
-        )
-      | extension => printExtension(extension)
-      }
-    | Pexp_apply(_) =>
-      if ParsetreeViewer.isUnaryExpression(e) {
-        printUnaryExpression(e)
-      } else if ParsetreeViewer.isBinaryExpression(e) {
-        printBinaryExpression(e)
-      } else {
-        printPexpApply(e)
-      }
-    | Pexp_unreachable => Doc.dot
-    | Pexp_field(expr, longidentLoc) =>
-      let lhs = {
-        let doc = printExpression(expr)
-        if Parens.fieldExpr(expr) {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-      
-      Doc.concat(list(lhs, Doc.dot, printLongident(longidentLoc.txt)))
-    | Pexp_setfield(expr1, longidentLoc, expr2) =>
-      printSetFieldExpr(e.pexp_attributes, expr1, longidentLoc, expr2)
-    | Pexp_ifthenelse(ifExpr, thenExpr, elseExpr) =>
-      if ParsetreeViewer.isTernaryExpr(e) {
-        let /parts, alternate/ = ParsetreeViewer.collectTernaryParts(e)
-        let ternaryDoc = switch parts {
-        | list(/condition1, consequent1/, ...rest) =>
-          Doc.group(
-            Doc.concat(list(
-              printTernaryOperand(condition1),
-              Doc.indent(
-                Doc.concat(list(
-                  Doc.line,
-                  Doc.indent(
-                    Doc.concat(list(
-                      Doc.text("? "),
-                      printTernaryOperand(consequent1),
-                    )),
-                  ),
-                  Doc.concat(
-                    List.map(
-                      (/condition, consequent/) =>
-                        Doc.concat(list(
-                          Doc.line,
-                          Doc.text(": "),
-                          printTernaryOperand(condition),
-                          Doc.line,
-                          Doc.text("? "),
-                          printTernaryOperand(consequent),
-                        )),
-                      rest,
-                    ),
-                  ),
-                  Doc.line,
-                  Doc.text(": "),
-                  Doc.indent(printTernaryOperand(alternate)),
-                )),
-              ),
-            )),
-          )
-        | _ => Doc.nil
-        }
-        
-        let attrs = ParsetreeViewer.filterTernaryAttributes(e.pexp_attributes)
-        let needsParens = switch attrs {
-        | list() => false
-        | _ => true
-        }
-        Doc.concat(list(
-          printAttributes(attrs),
-          if needsParens {
-            addParens(ternaryDoc)
-          } else {
-            ternaryDoc
-          },
-        ))
-      } else {
-        let /ifs, elseExpr/ = ParsetreeViewer.collectIfExpressions(e)
-        let ifDocs = Doc.join(
-          ~sep=Doc.space,
-          List.mapi(
-            (i, /ifExpr, thenExpr/) => {
-              let ifTxt = if i > 0 {
-                Doc.text("else if ")
-              } else {
-                Doc.text("if ")
-              }
-              let condition = printExpression(ifExpr)
-              Doc.concat(list(
-                ifTxt,
-                Doc.group(Doc.ifBreaks(addParens(condition), condition)),
-                Doc.space,
-                printExpressionBlock(~braces=true, thenExpr),
-              ))
-            },
-            ifs,
-          ),
-        )
-        let elseDoc = switch elseExpr {
-        | None => Doc.nil
-        | Some(expr) =>
-          Doc.concat(list(
-            Doc.text(" else "),
-            printExpressionBlock(~braces=true, expr),
-          ))
-        }
-        
-        Doc.concat(list(printAttributes(e.pexp_attributes), ifDocs, elseDoc))
-      }
-    | Pexp_while(expr1, expr2) =>
-      let condition = printExpression(expr1)
-      Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list(
-          Doc.text("while "),
-          Doc.group(Doc.ifBreaks(addParens(condition), condition)),
-          Doc.space,
-          printExpressionBlock(~braces=true, expr2),
-        )),
-      )
-    | Pexp_for(pattern, fromExpr, toExpr, directionFlag, body) =>
-      Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list(
-          Doc.text("for "),
-          printPattern(pattern),
-          Doc.text(" in "),
-          printExpression(fromExpr),
-          printDirectionFlag(directionFlag),
-          printExpression(toExpr),
-          Doc.space,
-          printExpressionBlock(~braces=true, body),
-        )),
-      )
-    | Pexp_constraint(
-        {pexp_desc: Pexp_pack(modExpr)},
-        {ptyp_desc: Ptyp_package(packageType)},
-      ) =>
-      Doc.group(
-        Doc.concat(list(
-          Doc.text("module("),
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              printModExpr(modExpr),
-              Doc.text(": "),
-              printPackageType(~printModuleKeywordAndParens=false, packageType),
-            )),
-          ),
-          Doc.softLine,
-          Doc.rparen,
-        )),
-      )
-    | Pexp_constraint(expr, typ) =>
-      Doc.concat(list(printExpression(expr), Doc.text(": "), printTypExpr(typ)))
-    | Pexp_letmodule({txt: modName}, modExpr, expr) =>
-      printExpressionBlock(~braces=true, e)
-    | Pexp_letexception(extensionConstructor, expr) =>
-      printExpressionBlock(~braces=true, e)
-    | Pexp_assert(expr) =>
-      let rhs = {
-        let doc = printExpression(expr)
-        if Parens.lazyOrAssertExprRhs(expr) {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-      
-      Doc.concat(list(Doc.text("assert "), rhs))
-    | Pexp_lazy(expr) =>
-      let rhs = {
-        let doc = printExpression(expr)
-        if Parens.lazyOrAssertExprRhs(expr) {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-      
-      Doc.concat(list(Doc.text("lazy "), rhs))
-    | Pexp_open(overrideFlag, longidentLoc, expr) =>
-      printExpressionBlock(~braces=true, e)
-    | Pexp_pack(modExpr) =>
-      Doc.group(
-        Doc.concat(list(
-          Doc.text("module("),
-          Doc.indent(Doc.concat(list(Doc.softLine, printModExpr(modExpr)))),
-          Doc.softLine,
-          Doc.rparen,
-        )),
-      )
-    | Pexp_sequence(_) => printExpressionBlock(~braces=true, e)
-    | Pexp_let(_) => printExpressionBlock(~braces=true, e)
-    | Pexp_fun(_) | Pexp_newtype(_) =>
-      let /attrsOnArrow, parameters, returnExpr/ = ParsetreeViewer.funExpr(e)
-      let /uncurried, attrs/ = ParsetreeViewer.processUncurriedAttribute(
-        attrsOnArrow,
-      )
-      
-      let /returnExpr, typConstraint/ = switch returnExpr.pexp_desc {
-      | Pexp_constraint(expr, typ) => /expr, Some(typ)/
-      | _ => /returnExpr, None/
-      }
-      
-      let parametersDoc = printExprFunParameters(
-        ~inCallback=false,
-        ~uncurried,
-        parameters,
-      )
-      let returnExprDoc = {
-        let shouldInline = switch returnExpr.pexp_desc {
-        | ((Pexp_array(_) | Pexp_tuple(_)) | Pexp_construct(_, Some(_)))
-          | Pexp_record(_) =>
-          true
-        | _ => false
-        }
-        
-        let shouldIndent = switch returnExpr.pexp_desc {
-        | ((Pexp_sequence(_) | Pexp_let(_)) | Pexp_letmodule(_))
-          | Pexp_letexception(_) =>
-          false
-        | _ => true
-        }
-        
-        let returnDoc = printExpression(returnExpr)
-        if shouldInline {
-          Doc.concat(list(Doc.space, returnDoc))
-        } else {
-          Doc.group(
-            if shouldIndent {
-              Doc.indent(Doc.concat(list(Doc.line, returnDoc)))
-            } else {
-              Doc.concat(list(Doc.space, returnDoc))
-            },
-          )
-        }
-      }
-      
-      let typConstraintDoc = switch typConstraint {
-      | Some(typ) => Doc.concat(list(Doc.text(": "), printTypExpr(typ)))
-      | _ => Doc.nil
-      }
-      
-      let attrs = switch attrs {
-      | list() => Doc.nil
-      | attrs =>
-        Doc.concat(list(
-          Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)),
-          Doc.space,
-        ))
-      }
-      
-      Doc.group(
-        Doc.concat(list(
-          attrs,
-          parametersDoc,
-          typConstraintDoc,
-          Doc.text(" =>"),
-          returnExprDoc,
-        )),
-      )
-    | Pexp_try(expr, cases) =>
-      Doc.concat(list(
-        Doc.text("try "),
-        printExpression(expr),
-        Doc.text(" catch "),
-        printCases(cases),
-      ))
-    | Pexp_match(expr, cases) =>
-      Doc.concat(list(
-        Doc.text("switch "),
-        printExpression(expr),
-        Doc.space,
-        printCases(cases),
-      ))
-    | _ => failwith("expression not yet implemented in printer")
-    }
-    
-    let shouldPrintItsOwnAttributes = switch e.pexp_desc {
-    | (((Pexp_apply(_) | Pexp_fun(_)) | Pexp_newtype(_)) | Pexp_setfield(_))
-      | Pexp_ifthenelse(_) =>
-      true
-    | Pexp_construct(_)
-      when ParsetreeViewer.hasJsxAttribute(e.pexp_attributes) =>
-      true
-    | _ => false
-    }
-    
-    switch e.pexp_attributes {
-    | list() => printedExpression
-    | attrs when !shouldPrintItsOwnAttributes =>
-      Doc.group(Doc.concat(list(printAttributes(attrs), printedExpression)))
-    | _ => printedExpression
-    }
-  }
-  
-  and printPexpFun = (~inCallback, e) => {
-    let /attrsOnArrow, parameters, returnExpr/ = ParsetreeViewer.funExpr(e)
-    let /uncurried, attrs/ = ParsetreeViewer.processUncurriedAttribute(
-      attrsOnArrow,
-    )
-    
-    let /returnExpr, typConstraint/ = switch returnExpr.pexp_desc {
-    | Pexp_constraint(expr, typ) => /expr, Some(typ)/
-    | _ => /returnExpr, None/
-    }
-    
-    let parametersDoc = printExprFunParameters(
-      ~inCallback,
-      ~uncurried,
-      parameters,
-    )
-    let returnShouldIndent = switch returnExpr.pexp_desc {
-    | ((Pexp_sequence(_) | Pexp_let(_)) | Pexp_letmodule(_))
-      | Pexp_letexception(_) =>
-      false
-    | _ => true
-    }
-    
-    let returnExprDoc = {
-      let shouldInline = switch returnExpr.pexp_desc {
-      | ((Pexp_array(_) | Pexp_tuple(_)) | Pexp_construct(_, Some(_)))
-        | Pexp_record(_) =>
-        true
-      | _ => false
-      }
-      
-      let returnDoc = printExpression(returnExpr)
-      if shouldInline {
-        Doc.concat(list(Doc.space, returnDoc))
-      } else {
-        Doc.group(
-          if returnShouldIndent {
-            Doc.concat(list(
-              Doc.indent(Doc.concat(list(Doc.line, returnDoc))),
-              if inCallback {
-                Doc.softLine
-              } else {
-                Doc.nil
-              },
-            ))
-          } else {
-            Doc.concat(list(Doc.space, returnDoc))
-          },
-        )
-      }
-    }
-    
-    let typConstraintDoc = switch typConstraint {
-    | Some(typ) => Doc.concat(list(Doc.text(": "), printTypExpr(typ)))
-    | _ => Doc.nil
-    }
-    
-    let attrs = switch attrs {
-    | list() => Doc.nil
-    | attrs =>
-      Doc.concat(list(
-        Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)),
-        Doc.space,
-      ))
-    }
-    
-    Doc.group(
-      Doc.concat(list(
-        attrs,
-        parametersDoc,
-        typConstraintDoc,
-        Doc.text(" =>"),
-        returnExprDoc,
-      )),
-    )
-  }
-  
-  and printTernaryOperand = expr => {
-    let doc = printExpression(expr)
-    if Parens.ternaryOperand(expr) {
-      addParens(doc)
-    } else {
-      doc
-    }
-  }
-  
-  and printSetFieldExpr = (attrs, lhs, longidentLoc, rhs) => {
-    let rhsDoc = {
-      let doc = printExpression(rhs)
-      if Parens.setFieldExprRhs(rhs) {
-        addParens(doc)
-      } else {
-        doc
-      }
-    }
-    
-    let lhsDoc = {
-      let doc = printExpression(lhs)
-      if Parens.fieldExpr(lhs) {
-        addParens(doc)
-      } else {
-        doc
-      }
-    }
-    
-    let shouldIndent = ParsetreeViewer.isBinaryExpression(rhs)
-    let doc = Doc.concat(list(
-      lhsDoc,
-      Doc.dot,
-      printLongident(longidentLoc.txt),
-      Doc.text(" ="),
-      if shouldIndent {
-        Doc.group(Doc.indent(Doc.concat(list(Doc.line, rhsDoc))))
-      } else {
-        Doc.concat(list(Doc.space, rhsDoc))
-      },
-    ))
-    switch attrs {
-    | list() => doc
-    | attrs => Doc.group(Doc.concat(list(printAttributes(attrs), doc)))
-    }
-  }
-  
-  and printUnaryExpression = expr => {
-    let printUnaryOperator = op =>
-      Doc.text(
-        switch op {
-        | "~+" => "+"
-        | "~+." => "+."
-        | "~-" => "-"
-        | "~-." => "-."
-        | "not" => "!"
-        | "!" => "&"
-        | _ => assert false
-        },
-      )
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})},
-        list(/Nolabel, operand/),
-      ) =>
-      let printedOperand = {
-        let doc = printExpression(operand)
-        if Parens.unaryExprOperand(operand) {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-      
-      Doc.concat(list(printUnaryOperator(operator), printedOperand))
-    | _ => assert false
-    }
-  }
-  
-  and printBinaryExpression = (expr: Parsetree.expression) => {
-    let printBinaryOperator = (~inlineRhs, operator) => {
-      let operatorTxt = switch operator {
-      | "|." => "->"
-      | "^" => "++"
-      | "=" => "=="
-      | "==" => "==="
-      | "<>" => "!="
-      | "!=" => "!=="
-      | txt => txt
-      }
-      
-      let spacingBeforeOperator = if operator == "|." {
-        Doc.softLine
-      } else if operator == "|>" {
-        Doc.line
-      } else {
-        Doc.space
-      }
-      
-      let spacingAfterOperator = if operator == "|." {
-        Doc.nil
-      } else if operator == "|>" {
-        Doc.space
-      } else if inlineRhs {
-        Doc.space
-      } else {
-        Doc.line
-      }
-      
-      Doc.concat(list(
-        spacingBeforeOperator,
-        Doc.text(operatorTxt),
-        spacingAfterOperator,
-      ))
-    }
-    
-    let printOperand = (~isLhs, expr, parentOperator) => {
-      let rec flatten = (~isLhs, expr, parentOperator) =>
-        if ParsetreeViewer.isBinaryExpression(expr) {
-          switch expr {
-          | {
-              pexp_desc: 
-                Pexp_apply(
-                  {pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})},
-                  list(/_, left/, /_, right/),
-                ),
-            } =>
-            if (
-              ParsetreeViewer.flattenableOperators(parentOperator, operator) &&
-              !ParsetreeViewer.hasAttributes(expr.pexp_attributes)
-            ) {
-              let leftPrinted = flatten(~isLhs=true, left, operator)
-              let rightPrinted = {
-                let /
-                  _,
-                  rightAttrs
-                / = ParsetreeViewer.partitionPrinteableAttributes(
-                  right.pexp_attributes,
-                )
-                
-                let doc = printExpression({
-                  ...right,
-                  pexp_attributes: rightAttrs,
-                })
-                let doc = if Parens.flattenOperandRhs(parentOperator, right) {
-                  Doc.concat(list(Doc.lparen, doc, Doc.rparen))
-                } else {
-                  doc
-                }
-                
-                let printeableAttrs = ParsetreeViewer.filterPrinteableAttributes(
-                  right.pexp_attributes,
-                )
-                
-                Doc.concat(list(printAttributes(printeableAttrs), doc))
-              }
-              
-              Doc.concat(list(
-                leftPrinted,
-                printBinaryOperator(~inlineRhs=false, operator),
-                rightPrinted,
-              ))
-            } else {
-              let doc = printExpression({...expr, pexp_attributes: list()})
-              let doc = if (
-                Parens.subBinaryExprOperand(parentOperator, operator) ||
-                ((expr.pexp_attributes != list()) &&
-                  (ParsetreeViewer.isBinaryExpression(expr) ||
-                  ParsetreeViewer.isTernaryExpr(expr)))
-              ) {
-                Doc.concat(list(Doc.lparen, doc, Doc.rparen))
-              } else {
-                doc
-              }
-              Doc.concat(list(printAttributes(expr.pexp_attributes), doc))
-            }
-          | _ => assert false
-          }
-        } else {
-          switch expr.pexp_desc {
-          | Pexp_setfield(lhs, field, rhs) =>
-            let doc = printSetFieldExpr(expr.pexp_attributes, lhs, field, rhs)
-            if isLhs {
-              addParens(doc)
-            } else {
-              doc
-            }
-          | Pexp_apply(
-              {pexp_desc: Pexp_ident({txt: Longident.Lident("#=")})},
-              list(/Nolabel, lhs/, /Nolabel, rhs/),
-            ) =>
-            let rhsDoc = printExpression(rhs)
-            let lhsDoc = printExpression(lhs)
-            
-            let shouldIndent = ParsetreeViewer.isBinaryExpression(rhs)
-            let doc = Doc.group(
-              Doc.concat(list(
-                lhsDoc,
-                Doc.text(" ="),
-                if shouldIndent {
-                  Doc.group(Doc.indent(Doc.concat(list(Doc.line, rhsDoc))))
-                } else {
-                  Doc.concat(list(Doc.space, rhsDoc))
-                },
-              )),
-            )
-            let doc = switch expr.pexp_attributes {
-            | list() => doc
-            | attrs => Doc.group(Doc.concat(list(printAttributes(attrs), doc)))
-            }
-            
-            if isLhs {
-              addParens(doc)
-            } else {
-              doc
-            }
-          | _ =>
-            let doc = printExpression(expr)
-            if Parens.binaryExprOperand(~isLhs, expr, parentOperator) {
-              addParens(doc)
-            } else {
-              doc
-            }
-          }
-        }
-      
-      flatten(~isLhs, expr, parentOperator)
-    }
-    
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident(("|." | "|>") as op)})},
-        list(/Nolabel, lhs/, /Nolabel, rhs/),
-      )
-      when !(
-        ParsetreeViewer.isBinaryExpression(lhs) ||
-        ParsetreeViewer.isBinaryExpression(rhs)
-      ) =>
-      let lhsDoc = printOperand(~isLhs=true, lhs, op)
-      let rhsDoc = printOperand(~isLhs=false, rhs, op)
-      Doc.concat(list(
-        lhsDoc,
-        switch op {
-        | "|." => Doc.text("->")
-        | "|>" => Doc.text(" |> ")
-        | _ => assert false
-        },
-        rhsDoc,
-      ))
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident(operator)})},
-        list(/Nolabel, lhs/, /Nolabel, rhs/),
-      ) =>
-      let right = {
-        let operatorWithRhs = Doc.concat(list(
-          printBinaryOperator(
-            ~inlineRhs=ParsetreeViewer.shouldInlineRhsBinaryExpr(rhs),
-            operator,
-          ),
-          printOperand(~isLhs=false, rhs, operator),
-        ))
-        if ParsetreeViewer.shouldIndentBinaryExpr(expr) {
-          Doc.group(Doc.indent(operatorWithRhs))
-        } else {
-          operatorWithRhs
-        }
-      }
-      
-      let doc = Doc.group(
-        Doc.concat(list(printOperand(~isLhs=true, lhs, operator), right)),
-      )
-      Doc.concat(list(
-        printAttributes(expr.pexp_attributes),
-        if Parens.binaryExpr(expr) {
-          addParens(doc)
-        } else {
-          doc
-        },
-      ))
-    | _ => Doc.nil
-    }
-  }
-  
-  and printPexpApply = expr =>
-    switch expr.pexp_desc {
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident("##")})},
-        list(/Nolabel, parentExpr/, /Nolabel, memberExpr/),
-      ) =>
-      let member = {
-        let memberDoc = printExpression(memberExpr)
-        Doc.concat(list(Doc.text("\""), memberDoc, Doc.text("\"")))
-      }
-      
-      Doc.group(
-        Doc.concat(list(
-          printAttributes(expr.pexp_attributes),
-          printExpression(parentExpr),
-          Doc.lbracket,
-          member,
-          Doc.rbracket,
-        )),
-      )
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Lident("#=")})},
-        list(/Nolabel, lhs/, /Nolabel, rhs/),
-      ) =>
-      let rhsDoc = printExpression(rhs)
-      
-      let shouldIndent = ParsetreeViewer.isBinaryExpression(rhs)
-      let doc = Doc.group(
-        Doc.concat(list(
-          printExpression(lhs),
-          Doc.text(" ="),
-          if shouldIndent {
-            Doc.group(Doc.indent(Doc.concat(list(Doc.line, rhsDoc))))
-          } else {
-            Doc.concat(list(Doc.space, rhsDoc))
-          },
-        )),
-      )
-      switch expr.pexp_attributes {
-      | list() => doc
-      | attrs => Doc.group(Doc.concat(list(printAttributes(attrs), doc)))
-      }
-    | Pexp_apply(
-        {pexp_desc: Pexp_ident({txt: Longident.Ldot(Lident("Array"), "get")})},
-        list(/Nolabel, parentExpr/, /Nolabel, memberExpr/),
-      ) =>
-      let member = {
-        let memberDoc = printExpression(memberExpr)
-        let shouldInline = switch memberExpr.pexp_desc {
-        | Pexp_constant(_) | Pexp_ident(_) => true
-        | _ => false
-        }
-        
-        if shouldInline {
-          memberDoc
-        } else {
-          Doc.concat(list(
-            Doc.indent(Doc.concat(list(Doc.softLine, memberDoc))),
-            Doc.softLine,
-          ))
-        }
-      }
-      
-      Doc.group(
-        Doc.concat(list(
-          printAttributes(expr.pexp_attributes),
-          printExpression(parentExpr),
-          Doc.lbracket,
-          member,
-          Doc.rbracket,
-        )),
-      )
-    | Pexp_apply({pexp_desc: Pexp_ident({txt: lident})}, args)
-      when ParsetreeViewer.isJsxExpression(expr) =>
-      printJsxExpression(lident, args)
-    | Pexp_apply(callExpr, args) =>
-      let /uncurried, attrs/ = ParsetreeViewer.processUncurriedAttribute(
-        expr.pexp_attributes,
-      )
-      
-      let callExprDoc = printExpression(callExpr)
-      if ParsetreeViewer.requiresSpecialCallbackPrinting(args) {
-        let argsDoc = printArgumentsWithCallback(~uncurried, args)
-        Doc.concat(list(printAttributes(attrs), callExprDoc, argsDoc))
-      } else {
-        let argsDoc = printArguments(~uncurried, args)
-        Doc.concat(list(printAttributes(attrs), callExprDoc, argsDoc))
-      }
-    | _ => assert false
-    }
-  
-  and printJsxExpression = (lident, args) => {
-    let name = printJsxName(lident)
-    let /formattedProps, children/ = formatJsxProps(args)
-    
-    let isSelfClosing = switch children {
-    | list() => true
-    | _ => false
-    }
-    Doc.group(
-      Doc.concat(list(
-        Doc.group(
-          Doc.concat(list(
-            Doc.lessThan,
-            name,
-            formattedProps,
-            if isSelfClosing {
-              Doc.concat(list(Doc.line, Doc.text("/>")))
-            } else {
-              Doc.nil
-            },
-          )),
-        ),
-        if isSelfClosing {
-          Doc.nil
-        } else {
-          Doc.concat(list(
-            Doc.greaterThan,
-            Doc.indent(Doc.concat(list(Doc.line, printJsxChildren(children)))),
-            Doc.line,
-            Doc.text("</"),
-            name,
-            Doc.greaterThan,
-          ))
-        },
-      )),
-    )
-  }
-  
-  and printJsxFragment = expr => {
-    let opening = Doc.text("<>")
-    let closing = Doc.text("</>")
-    let /children, _/ = ParsetreeViewer.collectListExpressions(expr)
-    Doc.group(
-      Doc.concat(list(
-        opening,
-        switch children {
-        | list() => Doc.nil
-        | children =>
-          Doc.indent(Doc.concat(list(Doc.line, printJsxChildren(children))))
-        },
-        Doc.line,
-        closing,
-      )),
-    )
-  }
-  
-  and printJsxChildren = (children: list<Parsetree.expression>) =>
-    Doc.group(
-      Doc.join(
-        ~sep=Doc.line,
-        List.map(
-          expr => {
-            let exprDoc = printExpression(expr)
-            if Parens.jsxChildExpr(expr) {
-              addBraces(exprDoc)
-            } else {
-              exprDoc
-            }
-          },
-          children,
-        ),
-      ),
-    )
-  
-  and formatJsxProps = args => {
-    let rec loop = (props, args) =>
-      switch args {
-      | list() => /Doc.nil, list()/
-      | list(
-          /Asttypes.Labelled("children"), children/,
-          /
-            Asttypes.Nolabel,
-            {
-              Parsetree.pexp_desc: 
-                Pexp_construct({txt: Longident.Lident("()")}, None),
-            }
-          /,
-        ) =>
-        let formattedProps = Doc.indent(
-          switch props {
-          | list() => Doc.nil
-          | props =>
-            Doc.concat(list(
-              Doc.line,
-              Doc.group(Doc.join(~sep=Doc.line, props |> List.rev)),
-            ))
-          },
-        )
-        let /children, _/ = ParsetreeViewer.collectListExpressions(children)
-        /formattedProps, children/
-      | list(arg, ...args) =>
-        let propDoc = formatJsxProp(arg)
-        loop(list(propDoc, ...props), args)
-      }
-    
-    loop(list(), args)
-  }
-  
-  and formatJsxProp = arg =>
-    switch arg {
-    | /
-        (Asttypes.Labelled(lblTxt) | Optional(lblTxt)) as lbl,
-        {
-          Parsetree.pexp_attributes: list(),
-          pexp_desc: Pexp_ident({txt: Longident.Lident(ident)}),
-        }
-      / when lblTxt == ident =>
-      switch lbl {
-      | Nolabel => Doc.nil
-      | Labelled(lbl) => Doc.text(lbl)
-      | Optional(lbl) => Doc.text("?" ++ lbl)
-      }
-    | /lbl, expr/ =>
-      let lblDoc = switch lbl {
-      | Asttypes.Labelled(lbl) => Doc.text(lbl ++ "=")
-      | Asttypes.Optional(lbl) => Doc.text(lbl ++ "=?")
-      | Nolabel => Doc.nil
-      }
-      
-      let exprDoc = printExpression(expr)
-      Doc.concat(list(
-        lblDoc,
-        if Parens.jsxPropExpr(expr) {
-          addBraces(exprDoc)
-        } else {
-          exprDoc
-        },
-      ))
-    }
-  
-  and printJsxName = lident => {
-    let rec flatten = (acc, lident) =>
-      switch lident {
-      | Longident.Lident(txt) => list(txt, ...acc)
-      | Ldot(lident, txt) =>
-        let acc = if txt == "createElement" {
-          acc
-        } else {
-          list(txt, ...acc)
-        }
-        flatten(acc, lident)
-      | _ => acc
-      }
-    
-    switch lident {
-    | Longident.Lident(txt) => Doc.text(txt)
-    | _ as lident =>
-      let segments = flatten(list(), lident)
-      Doc.join(~sep=Doc.dot, List.map(Doc.text, segments))
-    }
-  }
-  
-  and printArgumentsWithCallback = (~uncurried, args) => {
-    let rec loop = (acc, args) =>
-      switch args {
-      | list() => /Doc.nil, Doc.nil/
-      | list(/_lbl, expr/) =>
-        let callback = printPexpFun(~inCallback=true, expr)
-        /Doc.concat(List.rev(acc)), callback/
-      | list(arg, ...args) =>
-        let argDoc = printArgument(arg)
-        loop(list(Doc.line, Doc.comma, argDoc, ...acc), args)
-      }
-    
-    let /printedArgs, callback/ = loop(list(), args)
-    
-    let fitsOnOneLine = Doc.concat(list(
-      if uncurried {
-        Doc.text("(.")
-      } else {
-        Doc.lparen
-      },
-      Doc.concat(list(printedArgs, callback)),
-      Doc.rparen,
-    ))
-    
-    let arugmentsFitOnOneLine = Doc.concat(list(
-      if uncurried {
-        Doc.text("(.")
-      } else {
-        Doc.lparen
-      },
-      Doc.concat(list(
-        Doc.softLine,
-        printedArgs,
-        Doc.breakableGroup(~forceBreak=true, callback),
-      )),
-      Doc.softLine,
-      Doc.rparen,
-    ))
-    
-    let breakAllArgs = printArguments(~uncurried, args)
-    Doc.customLayout(list(fitsOnOneLine, arugmentsFitOnOneLine, breakAllArgs))
-  }
-  
-  and printArguments = (
-    ~uncurried,
-    args: list</Asttypes.arg_label, Parsetree.expression/>,
-  ) =>
-    switch args {
-    | list(/
-        Nolabel,
-        {pexp_desc: Pexp_construct({txt: Longident.Lident("()")}, _)}
-      /) =>
-      if uncurried {
-        Doc.text("(.)")
-      } else {
-        Doc.text("()")
-      }
-    | list(/Nolabel, arg/) when ParsetreeViewer.isHuggableExpression(arg) =>
-      Doc.concat(list(
-        if uncurried {
-          Doc.text("(.")
-        } else {
-          Doc.lparen
-        },
-        printExpression(arg),
-        Doc.rparen,
-      ))
-    | args =>
-      Doc.group(
-        Doc.concat(list(
-          if uncurried {
-            Doc.text("(.")
-          } else {
-            Doc.lparen
-          },
-          Doc.indent(
-            Doc.concat(list(
-              if uncurried {
-                Doc.line
-              } else {
-                Doc.softLine
-              },
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                List.map(printArgument, args),
-              ),
-            )),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        )),
-      )
-    }
-  
-  and printArgument = (
-    /argLbl, arg/: /Asttypes.arg_label, Parsetree.expression/,
-  ) =>
-    switch /argLbl, arg/ {
-    | /
-        Asttypes.Labelled(lbl),
-        {pexp_desc: Pexp_ident({txt: Longident.Lident(name)})}
-      / when lbl == name =>
-      Doc.text("~" ++ lbl)
-    | /
-        Asttypes.Optional(lbl),
-        {pexp_desc: Pexp_ident({txt: Longident.Lident(name)})}
-      / when lbl == name =>
-      Doc.text("~" ++ lbl ++ "?")
-    | /lbl, expr/ =>
-      let printedLbl = switch argLbl {
-      | Asttypes.Nolabel => Doc.nil
-      | Asttypes.Labelled(lbl) => Doc.text("~" ++ lbl ++ "=")
-      | Asttypes.Optional(lbl) => Doc.text("~" ++ lbl ++ "=?")
-      }
-      
-      let printedExpr = printExpression(expr)
-      Doc.concat(list(printedLbl, printedExpr))
-    }
-  
-  and printCases = (cases: list<Parsetree.case>) =>
-    Doc.breakableGroup(
-      ~forceBreak=true,
-      Doc.concat(list(
-        Doc.lbrace,
-        Doc.concat(list(
-          Doc.line,
-          Doc.join(~sep=Doc.line, List.map(printCase, cases)),
-        )),
-        Doc.line,
-        Doc.rbrace,
-      )),
-    )
-  
-  and printCase = (case: Parsetree.case) => {
-    let rhs = switch case.pc_rhs.pexp_desc {
-    | (((Pexp_let(_) | Pexp_letmodule(_)) | Pexp_letexception(_))
-      | Pexp_open(_))
-      | Pexp_sequence(_) =>
-      printExpressionBlock(~braces=false, case.pc_rhs)
-    | _ => printExpression(case.pc_rhs)
-    }
-    
-    let guard = switch case.pc_guard {
-    | None => Doc.nil
-    | Some(expr) =>
-      Doc.group(
-        Doc.concat(list(Doc.line, Doc.text("when "), printExpression(expr))),
-      )
-    }
-    
-    Doc.group(
-      Doc.concat(list(
-        Doc.text("| "),
-        Doc.indent(
-          Doc.concat(list(
-            printPattern(case.pc_lhs),
-            guard,
-            Doc.text(" =>"),
-            Doc.line,
-            rhs,
-          )),
-        ),
-      )),
-    )
-  }
-  
-  and printExprFunParameters = (~inCallback, ~uncurried, parameters) =>
-    switch parameters {
-    | list(/list(), Asttypes.Nolabel, None, {Parsetree.ppat_desc: Ppat_any}/)
-      when !uncurried =>
-      Doc.text("_")
-    | list(/
-        list(),
-        Asttypes.Nolabel,
-        None,
-        {Parsetree.ppat_desc: Ppat_var(stringLoc)}
-      /) when !uncurried =>
-      Doc.text(stringLoc.txt)
-    | list(/
-        list(),
-        Nolabel,
-        None,
-        {ppat_desc: Ppat_construct({txt: Longident.Lident("()")}, None)}
-      /) when !uncurried =>
-      Doc.text("()")
-    | parameters =>
-      let lparen = if uncurried {
-        Doc.text("(. ")
-      } else {
-        Doc.lparen
-      }
-      let shouldHug = ParsetreeViewer.parametersShouldHug(parameters)
-      let printedParamaters = Doc.concat(list(
-        if shouldHug || inCallback {
-          Doc.nil
-        } else {
-          Doc.softLine
-        },
-        Doc.join(
-          ~sep=Doc.concat(list(
-            Doc.comma,
-            if inCallback {
-              Doc.space
-            } else {
-              Doc.line
-            },
-          )),
-          List.map(printExpFunParameter, parameters),
-        ),
-      ))
-      Doc.group(
-        Doc.concat(list(
-          lparen,
-          if shouldHug || inCallback {
-            printedParamaters
-          } else {
-            Doc.indent(printedParamaters)
-          },
-          if shouldHug || inCallback {
-            Doc.nil
-          } else {
-            Doc.concat(list(Doc.trailingComma, Doc.softLine))
-          },
-          Doc.rparen,
-        )),
-      )
-    }
-  
-  and printExpFunParameter = (/attrs, lbl, defaultExpr, pattern/) => {
-    let /isUncurried, attrs/ = ParsetreeViewer.processUncurriedAttribute(attrs)
-    let uncurried = if isUncurried {
-      Doc.concat(list(Doc.dot, Doc.space))
-    } else {
-      Doc.nil
-    }
-    let attrs = switch attrs {
-    | list() => Doc.nil
-    | attrs =>
-      Doc.concat(list(
-        Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)),
-        Doc.line,
-      ))
-    }
-    
-    let defaultExprDoc = switch defaultExpr {
-    | Some(expr) => Doc.concat(list(Doc.text("="), printExpression(expr)))
-    | None => Doc.nil
-    }
-    
-    let labelWithPattern = switch /lbl, pattern/ {
-    | /Asttypes.Nolabel, pattern/ => printPattern(pattern)
-    | /Asttypes.Labelled(lbl) | Optional(lbl), {ppat_desc: Ppat_var(stringLoc)}/
-      when lbl == stringLoc.txt =>
-      Doc.concat(list(Doc.text("~"), Doc.text(lbl)))
-    | /Asttypes.Labelled(lbl) | Optional(lbl), pattern/ =>
-      Doc.concat(list(
-        Doc.text("~"),
-        Doc.text(lbl),
-        Doc.text(" as "),
-        printPattern(pattern),
-      ))
-    }
-    
-    let optionalLabelSuffix = switch /lbl, defaultExpr/ {
-    | /Asttypes.Optional(_), None/ => Doc.text("=?")
-    | _ => Doc.nil
-    }
-    
-    Doc.group(
-      Doc.concat(list(
-        uncurried,
-        attrs,
-        labelWithPattern,
-        defaultExprDoc,
-        optionalLabelSuffix,
-      )),
-    )
-  }
-  
-  and printExpressionBlock = (~braces, expr) => {
-    let rec collectRows = (acc, expr) =>
-      switch expr.Parsetree.pexp_desc {
-      | Parsetree.Pexp_letmodule({txt: modName, loc: modLoc}, modExpr, expr) =>
-        let letModuleDoc = Doc.concat(list(
-          Doc.text("module "),
-          Doc.text(modName),
-          Doc.text(" = "),
-          printModExpr(modExpr),
-        ))
-        let loc = {...modLoc, loc_end: modExpr.pmod_loc.loc_end}
-        collectRows(list(/loc, letModuleDoc/, ...acc), expr)
-      | Pexp_letexception(extensionConstructor, expr) =>
-        let letExceptionDoc = printExceptionDef(extensionConstructor)
-        let loc = extensionConstructor.pext_loc
-        collectRows(list(/loc, letExceptionDoc/, ...acc), expr)
-      | Pexp_open(overrideFlag, longidentLoc, expr) =>
-        let openDoc = Doc.concat(list(
-          Doc.text("open"),
-          printOverrideFlag(overrideFlag),
-          Doc.space,
-          printLongident(longidentLoc.txt),
-        ))
-        let loc = longidentLoc.loc
-        collectRows(list(/loc, openDoc/, ...acc), expr)
-      | Pexp_sequence(expr1, expr2) =>
-        let exprDoc = {
-          let doc = printExpression(expr1)
-          if Parens.blockExpr(expr1) {
-            addParens(doc)
-          } else {
-            doc
-          }
-        }
-        
-        let loc = expr1.pexp_loc
-        collectRows(list(/loc, exprDoc/, ...acc), expr2)
-      | Pexp_let(recFlag, valueBindings, expr) =>
-        let recFlag = switch recFlag {
-        | Asttypes.Nonrecursive => Doc.nil
-        | Asttypes.Recursive => Doc.text("rec ")
-        }
-        
-        let letDoc = printValueBindings(~recFlag, valueBindings)
-        let loc = switch /valueBindings, List.rev(valueBindings)/ {
-        | /list({pvb_loc: firstLoc}, ..._), list({pvb_loc: lastLoc}, ..._)/ =>
-          {...firstLoc, loc_end: lastLoc.loc_end}
-        | _ => Location.none
-        }
-        
-        collectRows(list(/loc, letDoc/, ...acc), expr)
-      | _ =>
-        let exprDoc = {
-          let doc = printExpression(expr)
-          if Parens.blockExpr(expr) {
-            addParens(doc)
-          } else {
-            doc
-          }
-        }
-        
-        List.rev(list(/expr.pexp_loc, exprDoc/, ...acc))
-      }
-    
-    let block =
-      collectRows(list(), expr) |> interleaveWhitespace(~forceBreak=true)
-    Doc.breakableGroup(
-      ~forceBreak=true,
-      if braces {
-        Doc.concat(list(
-          Doc.lbrace,
-          Doc.indent(Doc.concat(list(Doc.line, block))),
-          Doc.line,
-          Doc.rbrace,
-        ))
-      } else {
-        block
-      },
-    )
-  }
-  
-  and printOverrideFlag = overrideFlag =>
-    switch overrideFlag {
-    | Asttypes.Override => Doc.text("!")
-    | Fresh => Doc.nil
-    }
-  
-  and printDirectionFlag = flag =>
-    switch flag {
-    | Asttypes.Downto => Doc.text(" downto ")
-    | Asttypes.Upto => Doc.text(" to ")
-    }
-  
-  and printRecordRow = (/lbl, expr/) =>
-    Doc.concat(list(
-      printLongident(lbl.txt),
-      Doc.text(": "),
-      printExpression(expr),
-    ))
-  
-  and printBsObjectRow = (/lbl, expr/) =>
-    Doc.concat(list(
-      Doc.text("\""),
-      printLongident(lbl.txt),
-      Doc.text("\""),
-      Doc.text(": "),
-      printExpression(expr),
-    ))
-  
-  and printAttributes = (~loc=?, attrs: Parsetree.attributes) =>
-    switch attrs {
-    | list() => Doc.nil
-    | attrs =>
-      let lineBreak = switch loc {
-      | None => Doc.line
-      | Some(loc) =>
-        switch List.rev(attrs) {
-        | list(/{loc: firstLoc}, _/, ..._)
-          when loc.loc_start.pos_lnum > firstLoc.loc_end.pos_lnum =>
-          Doc.literalLine
-        | _ => Doc.line
-        }
-      }
-      
-      Doc.concat(list(
-        Doc.group(Doc.join(~sep=Doc.line, List.map(printAttribute, attrs))),
-        lineBreak,
-      ))
-    }
-  
-  and printAttribute = (/id, payload/: Parsetree.attribute) => {
-    let attrName = Doc.text("@" ++ id.txt)
-    switch payload {
-    | PStr(list({pstr_desc: Pstr_eval(expr, attrs)})) =>
-      let exprDoc = printExpression(expr)
-      let needsParens = switch attrs {
-      | list() => false
-      | _ => true
-      }
-      Doc.group(
-        Doc.concat(list(
-          attrName,
-          addParens(
-            Doc.concat(list(
-              printAttributes(attrs),
-              if needsParens {
-                addParens(exprDoc)
-              } else {
-                exprDoc
-              },
-            )),
-          ),
-        )),
-      )
-    | _ => attrName
-    }
-  }
-  
-  and printModExpr = modExpr =>
-    switch modExpr.pmod_desc {
-    | Pmod_ident(longidentLoc) => printLongident(longidentLoc.txt)
-    | Pmod_structure(structure) =>
-      Doc.breakableGroup(
-        ~forceBreak=true,
-        Doc.concat(list(
-          Doc.lbrace,
-          Doc.indent(Doc.concat(list(Doc.softLine, printStructure(structure)))),
-          Doc.softLine,
-          Doc.rbrace,
-        )),
-      )
-    | Pmod_unpack(expr) =>
-      let shouldHug = switch expr.pexp_desc {
-      | Pexp_let(_) => true
-      | Pexp_constraint(
-          {pexp_desc: Pexp_let(_)},
-          {ptyp_desc: Ptyp_package(packageType)},
-        ) =>
-        true
-      | _ => false
-      }
-      
-      let /expr, moduleConstraint/ = switch expr.pexp_desc {
-      | Pexp_constraint(expr, {ptyp_desc: Ptyp_package(packageType)}) =>
-        let typeDoc = Doc.group(
-          Doc.concat(list(
-            Doc.text(":"),
-            Doc.indent(
-              Doc.concat(list(
-                Doc.line,
-                printPackageType(
-                  ~printModuleKeywordAndParens=false,
-                  packageType,
-                ),
-              )),
-            ),
-          )),
-        )
-        /expr, typeDoc/
-      | _ => /expr, Doc.nil/
-      }
-      
-      let unpackDoc = Doc.group(
-        Doc.concat(list(printExpression(expr), moduleConstraint)),
-      )
-      Doc.group(
-        Doc.concat(list(
-          Doc.text("unpack("),
-          if shouldHug {
-            unpackDoc
-          } else {
-            Doc.concat(list(
-              Doc.indent(Doc.concat(list(Doc.softLine, unpackDoc))),
-              Doc.softLine,
-            ))
-          },
-          Doc.rparen,
-        )),
-      )
-    | Pmod_extension(extension) => printExtension(extension)
-    | Pmod_apply(_) =>
-      let /args, callExpr/ = ParsetreeViewer.modExprApply(modExpr)
-      let isUnitSugar = switch args {
-      | list({pmod_desc: Pmod_structure(list())}) => true
-      | _ => false
-      }
-      
-      let shouldHug = switch args {
-      | list({pmod_desc: Pmod_structure(_)}) => true
-      | _ => false
-      }
-      
-      Doc.group(
-        Doc.concat(list(
-          printModExpr(callExpr),
-          if isUnitSugar {
-            printModApplyArg(List.hd(args))
-          } else {
-            Doc.concat(list(
-              Doc.lparen,
-              if shouldHug {
-                printModApplyArg(List.hd(args))
-              } else {
-                Doc.indent(
-                  Doc.concat(list(
-                    Doc.softLine,
-                    Doc.join(
-                      ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                      List.map(printModApplyArg, args),
-                    ),
-                  )),
-                )
-              },
-              if !shouldHug {
-                Doc.concat(list(Doc.trailingComma, Doc.softLine))
-              } else {
-                Doc.nil
-              },
-              Doc.rparen,
-            ))
-          },
-        )),
-      )
-    | Pmod_constraint(modExpr, modType) =>
-      Doc.concat(list(
-        printModExpr(modExpr),
-        Doc.text(": "),
-        printModType(modType),
-      ))
-    | Pmod_functor(_) => printModFunctor(modExpr)
-    }
-  
-  and printModFunctor = modExpr => {
-    let /parameters, returnModExpr/ = ParsetreeViewer.modExprFunctor(modExpr)
-    
-    let /returnConstraint, returnModExpr/ = switch returnModExpr.pmod_desc {
-    | Pmod_constraint(modExpr, modType) =>
-      let constraintDoc = {
-        let doc = printModType(modType)
-        if Parens.modExprFunctorConstraint(modType) {
-          addParens(doc)
-        } else {
-          doc
-        }
-      }
-      
-      let modConstraint = Doc.concat(list(Doc.text(": "), constraintDoc))
-      /modConstraint, printModExpr(modExpr)/
-    | _ => /Doc.nil, printModExpr(returnModExpr)/
-    }
-    
-    let parametersDoc = switch parameters {
-    | list(/attrs, {txt: "*"}, None/) =>
-      let attrs = switch attrs {
-      | list() => Doc.nil
-      | attrs =>
-        Doc.concat(list(
-          Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)),
-          Doc.line,
-        ))
-      }
-      Doc.group(Doc.concat(list(attrs, Doc.text("()"))))
-    | list(/list(), {txt: lbl}, None/) => Doc.text(lbl)
-    | parameters =>
-      Doc.group(
-        Doc.concat(list(
-          Doc.lparen,
-          Doc.indent(
-            Doc.concat(list(
-              Doc.softLine,
-              Doc.join(
-                ~sep=Doc.concat(list(Doc.comma, Doc.line)),
-                List.map(printModFunctorParam, parameters),
-              ),
-            )),
-          ),
-          Doc.trailingComma,
-          Doc.softLine,
-          Doc.rparen,
-        )),
-      )
-    }
-    
-    Doc.group(
-      Doc.concat(list(
-        parametersDoc,
-        returnConstraint,
-        Doc.text(" => "),
-        returnModExpr,
-      )),
-    )
-  }
-  
-  and printModFunctorParam = (/attrs, lbl, optModType/) => {
-    let attrs = switch attrs {
-    | list() => Doc.nil
-    | attrs =>
-      Doc.concat(list(
-        Doc.join(~sep=Doc.line, List.map(printAttribute, attrs)),
-        Doc.line,
-      ))
-    }
-    Doc.group(
-      Doc.concat(list(
-        attrs,
-        Doc.text(lbl.txt),
-        switch optModType {
-        | None => Doc.nil
-        | Some(modType) =>
-          Doc.concat(list(Doc.text(": "), printModType(modType)))
-        },
-      )),
-    )
-  }
-  
-  and printModApplyArg = modExpr =>
-    switch modExpr.pmod_desc {
-    | Pmod_structure(list()) => Doc.text("()")
-    | _ => printModExpr(modExpr)
-    }
-  
-  and printExceptionDef = (constr: Parsetree.extension_constructor) => {
-    let kind = switch constr.pext_kind {
-    | Pext_rebind({txt: longident}) =>
-      Doc.indent(
-        Doc.concat(list(Doc.text(" ="), Doc.line, printLongident(longident))),
-      )
-    | Pext_decl(Pcstr_tuple(list()), None) => Doc.nil
-    | Pext_decl(args, gadt) =>
-      let gadtDoc = switch gadt {
-      | Some(typ) => Doc.concat(list(Doc.text(": "), printTypExpr(typ)))
-      | None => Doc.nil
-      }
-      
-      Doc.concat(list(printConstructorArguments(args), gadtDoc))
-    }
-    
-    Doc.group(
-      Doc.concat(list(
-        printAttributes(constr.pext_attributes),
-        Doc.text("exception "),
-        Doc.text(constr.pext_name.txt),
-        kind,
-      )),
-    )
-  }
-  
-  and printExtensionConstructor = (
-    i,
-    constr: Parsetree.extension_constructor,
-  ) => {
-    let attrs = printAttributes(constr.pext_attributes)
-    let bar = if i > 0 {
-      Doc.text("| ")
-    } else {
-      Doc.ifBreaks(Doc.text("| "), Doc.nil)
-    }
-    
-    let kind = switch constr.pext_kind {
-    | Pext_rebind({txt: longident}) =>
-      Doc.indent(
-        Doc.concat(list(Doc.text(" ="), Doc.line, printLongident(longident))),
-      )
-    | Pext_decl(Pcstr_tuple(list()), None) => Doc.nil
-    | Pext_decl(args, gadt) =>
-      let gadtDoc = switch gadt {
-      | Some(typ) => Doc.concat(list(Doc.text(": "), printTypExpr(typ)))
-      | None => Doc.nil
-      }
-      
-      Doc.concat(list(printConstructorArguments(args), gadtDoc))
-    }
-    
-    Doc.concat(list(
-      bar,
-      Doc.group(Doc.concat(list(attrs, Doc.text(constr.pext_name.txt), kind))),
-    ))
-  }
-  
-  let printImplementation = (s: Parsetree.structure, comments, src) => {
-    let t = CommentAst.initStructure(s, comments)
-    
-    let stringDoc = Doc.toString(~width=80, printStructure(s))
-    print_endline(stringDoc)
-    print_newline()
-  }
-  
-  let printInterface = (s: Parsetree.signature) => {
-    let stringDoc = Doc.toString(~width=80, printSignature(s))
-    print_endline(stringDoc)
-    print_newline()
-  }
-}
-
-
-
diff --git a/jscomp/syntax/benchmarks/data/PrinterOcaml.ml b/jscomp/syntax/benchmarks/data/PrinterOcaml.ml
deleted file mode 100644
index 089beaf..0000000
--- a/jscomp/syntax/benchmarks/data/PrinterOcaml.ml
+++ /dev/null
@@ -1,3228 +0,0 @@
-module Printer = struct
-  type printer = {
-    src: bytes;
-    comments: CommentAst.t;
-  }
-
-
-  (* TODO: should this go inside a ast utility module? *)
-  let rec collectPatternsFromListConstruct acc pattern =
-    let open Parsetree in
-    match pattern.ppat_desc with
-    | Ppat_construct(
-        {txt = Longident.Lident "::"},
-        Some {ppat_desc=Ppat_tuple (pat::rest::[])}
-      ) ->
-      collectPatternsFromListConstruct (pat::acc) rest
-    | _ -> List.rev acc, pattern
-
-  let addParens doc =
-    Doc.group (
-      Doc.concat [
-        Doc.lparen;
-        Doc.indent (
-          Doc.concat [
-            Doc.softLine;
-            doc
-          ]
-        );
-        Doc.softLine;
-        Doc.rparen;
-      ]
-    )
-
-  let addBraces doc =
-    Doc.group (
-      Doc.concat [
-        Doc.lbrace;
-        doc;
-        Doc.rbrace;
-      ]
-    )
-
-  (* This could be done in one pass by collecting locations as we go? *)
-  let interleaveWhitespace ?(forceBreak=false) (rows: (Location.t * Doc.t) list) =
-    let rec loop prevLoc acc rows =
-      match rows with
-      | [] -> Doc.concat (List.rev acc)
-      | (loc, doc)::rest ->
-        if loc.Location.loc_start.pos_lnum - prevLoc.Location.loc_end.pos_lnum > 1 then
-          loop loc (doc::Doc.line::Doc.line::acc) rest
-        else
-          loop loc (doc::Doc.line::acc) rest
-    in
-    match rows with
-    | [] -> Doc.nil
-    | (firstLoc, firstDoc)::rest ->
-      (* TODO: perf, reversing the list twice! *)
-      let forceBreak = forceBreak || (match List.rev rest with
-      | (lastLoc, _)::_ ->
-        firstLoc.loc_start.pos_lnum != lastLoc.loc_end.pos_lnum
-      | _ -> false)
-      in
-      Doc.breakableGroup ~forceBreak (
-        loop firstLoc [firstDoc] rest
-      )
-
-  let printLongident l = match l with
-    | Longident.Lident lident -> Doc.text lident
-    | Longident.Ldot (lident, txt) as l ->
-      let txts = Longident.flatten l in
-      Doc.join ~sep:Doc.dot (List.map Doc.text txts)
-    | _ -> failwith "unsupported ident"
-
-  (* TODO: better allocation strategy for the buffer *)
-  let escapeStringContents s =
-    let len = String.length s in
-    let b = Buffer.create len in
-    for i = 0 to len - 1 do
-      let c = String.get s i in
-      if c = '\008'  then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b 'b';
-      ) else if c = '\009'  then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b 't';
-      ) else if c = '\010' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b 'n';
-      ) else if c = '\013' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b 'r';
-      ) else if c = '\034' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b '"';
-      ) else if c = '\092' then (
-        Buffer.add_char b '\\';
-        Buffer.add_char b '\\';
-      )else (
-        Buffer.add_char b c;
-      );
-    done;
-    Buffer.contents b
-
-  let printConstant c = match c with
-    | Parsetree.Pconst_integer (s, _) -> Doc.text s
-    | Pconst_string (s, _) -> Doc.text ("\"" ^ (escapeStringContents s) ^ "\"")
-    | Pconst_float (s, _) -> Doc.text s
-    | Pconst_char c -> Doc.text ("'" ^ (Char.escaped c) ^ "'")
-
-  let rec printStructure (s : Parsetree.structure) =
-    interleaveWhitespace  (
-      List.map (fun si -> (si.Parsetree.pstr_loc, printStructureItem si)) s
-    )
-
-  and printStructureItem (si: Parsetree.structure_item) =
-    match si.pstr_desc with
-    | Pstr_value(rec_flag, valueBindings) ->
-			let recFlag = match rec_flag with
-			| Asttypes.Nonrecursive -> Doc.nil
-			| Asttypes.Recursive -> Doc.text "rec "
-			in
-      printValueBindings ~recFlag valueBindings
-    | Pstr_type(recFlag, typeDeclarations) ->
-      let recFlag = match recFlag with
-      | Asttypes.Nonrecursive -> Doc.nil
-      | Asttypes.Recursive -> Doc.text "rec "
-      in
-      printTypeDeclarations ~recFlag typeDeclarations
-    | Pstr_primitive valueDescription ->
-      printValueDescription valueDescription
-    | Pstr_eval (expr, attrs) ->
-      let needsParens = match expr with
-      | {pexp_attributes=[({txt="res.ternary"},_)]; pexp_desc = Pexp_ifthenelse _} -> false
-      | _ when ParsetreeViewer.hasAttributes expr.pexp_attributes -> true
-      | _ -> false
-      in
-      let exprDoc =
-        let doc = printExpression expr in
-        if needsParens then addParens doc else doc
-      in
-      Doc.concat [
-        printAttributes attrs;
-        exprDoc;
-      ]
-    | Pstr_attribute attr -> Doc.concat [Doc.text "@"; printAttribute attr]
-    | Pstr_extension (extension, attrs) -> Doc.concat [
-        printAttributes attrs;
-        Doc.concat [Doc.text "%";printExtension extension];
-      ]
-    | Pstr_include includeDeclaration ->
-      printIncludeDeclaration includeDeclaration
-    | Pstr_open openDescription ->
-      printOpenDescription openDescription
-    | Pstr_modtype modTypeDecl ->
-      printModuleTypeDeclaration modTypeDecl
-    | Pstr_module moduleBinding ->
-      printModuleBinding ~isRec:false 0 moduleBinding
-    | Pstr_recmodule moduleBindings ->
-      Doc.join ~sep:Doc.line (List.mapi (fun i mb ->
-        printModuleBinding ~isRec:true i mb
-      ) moduleBindings)
-    | Pstr_exception extensionConstructor ->
-      printExceptionDef extensionConstructor;
-    | Pstr_typext typeExtension ->
-      printTypeExtension typeExtension
-    | Pstr_class _ | Pstr_class_type _ -> Doc.nil
-
-  and printTypeExtension (te : Parsetree.type_extension) =
-    let prefix = Doc.text "type " in
-    let name = printLongident te.ptyext_path.txt in
-    let typeParams = match te.ptyext_params with
-    | [] -> Doc.nil
-    | typeParams -> Doc.group (
-        Doc.concat [
-          Doc.lessThan;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printTypeParam typeParams
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.greaterThan;
-        ]
-      )
-    in
-    let extensionConstructors =
-      let ecs = te.ptyext_constructors in
-      let forceBreak =
-        match (ecs, List.rev ecs) with
-        | (first::_, last::_) ->
-          first.pext_loc.loc_start.pos_lnum > te.ptyext_path.loc.loc_end.pos_lnum ||
-          first.pext_loc.loc_start.pos_lnum < last.pext_loc.loc_end.pos_lnum
-        | _ -> false
-        in
-      let privateFlag = match te.ptyext_private with
-      | Asttypes.Private -> Doc.concat [
-          Doc.text "private";
-          Doc.line;
-        ]
-      | Public -> Doc.nil
-      in
-      Doc.breakableGroup ~forceBreak (
-        Doc.indent (
-          Doc.concat [
-            Doc.line;
-            privateFlag;
-            Doc.join ~sep:Doc.line (
-              List.mapi printExtensionConstructor ecs
-            )
-          ]
-        )
-      )
-    in
-    Doc.group (
-      Doc.concat [
-        printAttributes ~loc: te.ptyext_path.loc te.ptyext_attributes;
-        prefix;
-        name;
-        typeParams;
-        Doc.text " +=";
-        extensionConstructors;
-      ]
-    )
-
-  and printModuleBinding ~isRec i moduleBinding =
-    let prefix = if i = 0 then
-      Doc.concat [
-        Doc.text "module ";
-        if isRec then Doc.text "rec " else Doc.nil;
-      ]
-    else
-      Doc.text "and "
-    in
-    let (modExprDoc, modConstraintDoc) =
-      match moduleBinding.pmb_expr with
-      | {pmod_desc = Pmod_constraint (modExpr, modType)} ->
-        (
-          printModExpr modExpr,
-          Doc.concat [
-            Doc.text ": ";
-            printModType modType
-          ]
-        )
-      | modExpr ->
-        (printModExpr modExpr, Doc.nil)
-    in
-    Doc.concat [
-      printAttributes ~loc:moduleBinding.pmb_name.loc moduleBinding.pmb_attributes;
-      prefix;
-      Doc.text moduleBinding.pmb_name.Location.txt;
-      modConstraintDoc;
-      Doc.text " = ";
-      modExprDoc;
-    ]
-
-  and printModuleTypeDeclaration (modTypeDecl : Parsetree.module_type_declaration) =
-    Doc.concat [
-      printAttributes modTypeDecl.pmtd_attributes;
-      Doc.text "module type ";
-      Doc.text modTypeDecl.pmtd_name.txt;
-      (match modTypeDecl.pmtd_type with
-      | None -> Doc.nil
-      | Some modType -> Doc.concat [
-          Doc.text " = ";
-          printModType modType;
-        ]);
-    ]
-
-  and printModType modType =
-    let modTypeDoc = match modType.pmty_desc with
-    | Parsetree.Pmty_ident {txt = longident; loc} ->
-      Doc.concat [
-        printAttributes ~loc modType.pmty_attributes;
-        printLongident longident
-      ]
-    | Pmty_signature signature ->
-      let signatureDoc = Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printSignature signature;
-            ]
-          );
-          Doc.line;
-          Doc.rbrace;
-        ]
-      ) in
-      Doc.concat [
-        printAttributes modType.pmty_attributes;
-        signatureDoc
-      ]
-    | Pmty_functor _ ->
-      let (parameters, returnType) = ParsetreeViewer.functorType modType in
-      let parametersDoc = match parameters with
-      | [] -> Doc.nil
-      | [attrs, {Location.txt = "_"}, Some modType] ->
-        let attrs = match attrs with
-        | [] -> Doc.nil
-        | attrs -> Doc.concat [
-          Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-          Doc.line;
-        ] in
-        Doc.concat [
-          attrs;
-          printModType modType
-        ]
-      | params ->
-        Doc.group (
-          Doc.concat [
-            Doc.lparen;
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                  List.map (fun (attrs, lbl, modType) ->
-                    let attrs = match attrs with
-                    | [] -> Doc.nil
-                    | attrs -> Doc.concat [
-                      Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-                      Doc.line;
-                    ] in
-                    Doc.concat [
-                      attrs;
-                      if lbl.Location.txt = "_" then Doc.nil else Doc.text lbl.txt;
-                      (match modType with
-                      | None -> Doc.nil
-                      | Some modType -> Doc.concat [
-                        if lbl.txt = "_" then Doc.nil else Doc.text ": ";
-                        printModType modType;
-                      ]);
-                    ]
-                  ) params
-                );
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-            Doc.rparen;
-          ]
-        )
-      in
-      let returnDoc =
-        let doc = printModType returnType in
-        if Parens.modTypeFunctorReturn returnType then addParens doc else doc
-      in
-      Doc.group (
-        Doc.concat [
-          parametersDoc;
-          Doc.group (
-            Doc.concat [
-            Doc.text " =>";
-            Doc.line;
-            returnDoc;
-            ]
-          )
-        ]
-      )
-    | Pmty_typeof modExpr -> Doc.concat [
-        Doc.text "module type of ";
-        printModExpr modExpr;
-      ]
-    | Pmty_extension extension -> printExtension extension
-    | Pmty_alias {txt = longident} -> Doc.concat [
-        Doc.text "module ";
-        printLongident longident;
-      ]
-    | Pmty_with (modType, withConstraints) ->
-      let operand =
-        let doc = printModType modType in
-        if Parens.modTypeWithOperand modType then addParens doc else doc
-      in
-      Doc.group (
-        Doc.concat [
-          operand;
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printWithConstraints withConstraints;
-            ]
-          )
-        ]
-      )
-    in
-    let attrsAlreadyPrinted = match modType.pmty_desc with
-    | Pmty_functor _ | Pmty_signature _ | Pmty_ident _ -> true
-    | _ -> false in
-    Doc.concat [
-      if attrsAlreadyPrinted then Doc.nil else printAttributes modType.pmty_attributes;
-      modTypeDoc;
-    ]
-
-  and printWithConstraints withConstraints =
-    let rows =List.mapi (fun i withConstraint  ->
-      Doc.group (
-        Doc.concat [
-          if i == 0 then Doc.text "with " else Doc.text "and ";
-          printWithConstraint withConstraint;
-        ]
-      )
-    ) withConstraints
-    in
-    Doc.join ~sep:Doc.line rows
-
-  and printWithConstraint (withConstraint : Parsetree.with_constraint) =
-    match withConstraint with
-    (* with type X.t = ... *)
-    | Pwith_type ({txt = longident}, typeDeclaration) ->
-      Doc.group (printTypeDeclaration
-        ~name:(printLongident longident)
-        ~equalSign:"="
-        ~recFlag:Doc.nil
-        0
-        typeDeclaration)
-    (* with module X.Y = Z *)
-    | Pwith_module ({txt = longident1}, {txt = longident2}) ->
-        Doc.concat [
-          Doc.text "module ";
-          printLongident longident1;
-          Doc.text " =";
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printLongident longident2;
-            ]
-          )
-        ]
-    (* with type X.t := ..., same format as [Pwith_type] *)
-    | Pwith_typesubst ({txt = longident}, typeDeclaration) ->
-      Doc.group(printTypeDeclaration
-        ~name:(printLongident longident)
-        ~equalSign:":="
-        ~recFlag:Doc.nil
-        0
-        typeDeclaration)
-    | Pwith_modsubst ({txt = longident1}, {txt = longident2}) ->
-      Doc.concat [
-        Doc.text "module ";
-        printLongident longident1;
-        Doc.text " :=";
-        Doc.indent (
-          Doc.concat [
-            Doc.line;
-            printLongident longident2;
-          ]
-        )
-      ]
-
-  and printSignature signature =
-    interleaveWhitespace  (
-      List.map (fun si -> (si.Parsetree.psig_loc, printSignatureItem si)) signature
-    )
-
-  and printSignatureItem (si : Parsetree.signature_item) =
-    match si.psig_desc with
-    | Parsetree.Psig_value valueDescription ->
-      printValueDescription valueDescription
-    | Psig_type (recFlag, typeDeclarations) ->
-      let recFlag = match recFlag with
-      | Asttypes.Nonrecursive -> Doc.nil
-      | Asttypes.Recursive -> Doc.text "rec "
-      in
-      printTypeDeclarations ~recFlag typeDeclarations
-    | Psig_typext typeExtension ->
-      printTypeExtension typeExtension
-    | Psig_exception extensionConstructor ->
-      printExceptionDef extensionConstructor
-    | Psig_module moduleDeclaration ->
-      printModuleDeclaration moduleDeclaration
-    | Psig_recmodule moduleDeclarations ->
-      printRecModuleDeclarations moduleDeclarations
-    | Psig_modtype modTypeDecl ->
-      printModuleTypeDeclaration modTypeDecl
-    | Psig_open openDescription ->
-      printOpenDescription openDescription
-    | Psig_include includeDescription ->
-      printIncludeDescription includeDescription
-    | Psig_attribute attr -> Doc.concat [Doc.text "@"; printAttribute attr]
-    | Psig_extension (extension, attrs) -> Doc.concat [
-        printAttributes attrs;
-        Doc.concat [Doc.text "%";printExtension extension];
-      ]
-    | Psig_class _ | Psig_class_type _ -> Doc.nil
-
-  and printRecModuleDeclarations moduleDeclarations =
-    Doc.group (
-      Doc.join ~sep:Doc.line (
-        List.mapi (fun i (md: Parsetree.module_declaration) ->
-          let body = match md.pmd_type.pmty_desc with
-          | Parsetree.Pmty_alias {txt = longident } ->
-            Doc.concat [Doc.text " = "; printLongident longident]
-          | _ ->
-            let needsParens = match md.pmd_type.pmty_desc with
-            | Pmty_with _ -> true
-            | _ -> false
-            in
-            let modTypeDoc =
-              let doc = printModType md.pmd_type in
-              if needsParens then addParens doc else doc
-            in
-            Doc.concat [Doc.text ": "; modTypeDoc]
-          in
-          let prefix = if i < 1 then "module rec " else "and " in
-          Doc.concat [
-            printAttributes ~loc:md.pmd_name.loc md.pmd_attributes;
-            Doc.text prefix;
-            Doc.text md.pmd_name.txt;
-            body
-          ]
-        ) moduleDeclarations
-      )
-    )
-
-  and printModuleDeclaration (md: Parsetree.module_declaration) =
-    let body = match md.pmd_type.pmty_desc with
-    | Parsetree.Pmty_alias {txt = longident } ->
-      Doc.concat [Doc.text " = "; printLongident longident]
-    | _ -> Doc.concat [Doc.text ": "; printModType md.pmd_type]
-    in
-    Doc.concat [
-      printAttributes ~loc:md.pmd_name.loc md.pmd_attributes;
-      Doc.text "module ";
-      Doc.text md.pmd_name.txt;
-      body
-    ]
-
-  and printOpenDescription (openDescription : Parsetree.open_description) =
-    Doc.concat [
-      printAttributes openDescription.popen_attributes;
-      Doc.text "open";
-      (match openDescription.popen_override with
-      | Asttypes.Fresh -> Doc.space
-      | Asttypes.Override -> Doc.text "! ");
-      printLongident openDescription.popen_lid.txt
-    ]
-
-  and printIncludeDescription (includeDescription: Parsetree.include_description) =
-    Doc.concat [
-      printAttributes includeDescription.pincl_attributes;
-      Doc.text "include ";
-      printModType includeDescription.pincl_mod;
-    ]
-
-  and printIncludeDeclaration (includeDeclaration : Parsetree.include_declaration) =
-    Doc.concat [
-      printAttributes includeDeclaration.pincl_attributes;
-      Doc.text "include ";
-      printModExpr includeDeclaration.pincl_mod;
-    ]
-
-
-  and printValueBindings ~recFlag (vbs: Parsetree.value_binding list) =
-    let rows = List.mapi (fun i vb ->
-      let doc = printValueBinding ~recFlag i vb in
-      (vb.Parsetree.pvb_loc, doc)
-    ) vbs
-    in
-    interleaveWhitespace rows
-
-  (*
-   * type value_description = {
-   *   pval_name : string Asttypes.loc;
-   *   pval_type : Parsetree.core_type;
-   *   pval_prim : string list;
-   *   pval_attributes : Parsetree.attributes;
-   *   pval_loc : Location.t;
-   * }
-   *)
-  and printValueDescription valueDescription =
-    let isExternal =
-      match valueDescription.pval_prim with | [] -> false | _ -> true
-    in
-    Doc.group (
-      Doc.concat [
-        Doc.text (if isExternal then "external " else "let ");
-        Doc.text valueDescription.pval_name.txt;
-        Doc.text ": ";
-        printTypExpr valueDescription.pval_type;
-        if isExternal then
-          Doc.group (
-            Doc.concat [
-              Doc.text " =";
-              Doc.indent(
-                Doc.concat [
-                  Doc.line;
-                  Doc.join ~sep:Doc.line (
-                    List.map(fun s -> Doc.concat [
-                      Doc.text "\"";
-                      Doc.text s;
-                      Doc.text "\"";
-                    ])
-                    valueDescription.pval_prim
-                  );
-                ]
-              )
-            ]
-          )
-        else Doc.nil
-      ]
-    )
-
-  and printTypeDeclarations ~recFlag typeDeclarations =
-    let rows = List.mapi (fun i td ->
-      let doc = printTypeDeclaration
-        ~name:(Doc.text td.Parsetree.ptype_name.txt)
-        ~equalSign:"="
-        ~recFlag
-        i td
-      in
-      (td.Parsetree.ptype_loc, doc)
-    ) typeDeclarations in
-    interleaveWhitespace rows
-
-  (*
-   * type_declaration = {
-   *    ptype_name: string loc;
-   *    ptype_params: (core_type * variance) list;
-   *          (* ('a1,...'an) t; None represents  _*)
-   *    ptype_cstrs: (core_type * core_type * Location.t) list;
-   *          (* ... constraint T1=T1'  ... constraint Tn=Tn' *)
-   *    ptype_kind: type_kind;
-   *    ptype_private: private_flag;   (* = private ... *)
-   *    ptype_manifest: core_type option;  (* = T *)
-   *    ptype_attributes: attributes;   (* ... [@@id1] [@@id2] *)
-   *    ptype_loc: Location.t;
-   * }
-   *
-   *
-   *  type t                     (abstract, no manifest)
-   *  type t = T0                (abstract, manifest=T0)
-   *  type t = C of T | ...      (variant,  no manifest)
-   *  type t = T0 = C of T | ... (variant,  manifest=T0)
-   *  type t = {l: T; ...}       (record,   no manifest)
-   *  type t = T0 = {l : T; ...} (record,   manifest=T0)
-   *  type t = ..                (open,     no manifest)
-   *
-   *
-   * and type_kind =
-   *  | Ptype_abstract
-   *  | Ptype_variant of constructor_declaration list
-   *        (* Invariant: non-empty list *)
-   *  | Ptype_record of label_declaration list
-   *        (* Invariant: non-empty list *)
-   *  | Ptype_open
-   *)
-  and printTypeDeclaration ~name ~equalSign ~recFlag i (td: Parsetree.type_declaration) =
-    let attrs = printAttributes ~loc:td.ptype_loc td.ptype_attributes in
-    let prefix = if i > 0 then
-      Doc.text "and "
-    else
-      Doc.concat [Doc.text "type "; recFlag]
-    in
-    let typeName = name in
-    let typeParams = match td.ptype_params with
-    | [] -> Doc.nil
-    | typeParams -> Doc.group (
-        Doc.concat [
-          Doc.lessThan;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printTypeParam typeParams
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.greaterThan;
-        ]
-      )
-    in
-    let manifestAndKind = match td.ptype_kind with
-    | Ptype_abstract ->
-      begin match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some(typ) ->
-        Doc.concat [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printPrivateFlag td.ptype_private;
-          printTypExpr typ;
-        ]
-      end
-    | Ptype_open -> Doc.concat [
-        Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-        printPrivateFlag td.ptype_private;
-        Doc.text "..";
-      ]
-    | Ptype_record(lds) ->
-      let manifest = match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some(typ) -> Doc.concat [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printTypExpr typ;
-        ]
-      in
-      Doc.concat [
-        manifest;
-        Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-        printPrivateFlag td.ptype_private;
-        printRecordDeclaration lds;
-      ]
-    | Ptype_variant(cds) ->
-      let manifest = match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some(typ) -> Doc.concat [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printTypExpr typ;
-        ]
-      in
-      Doc.concat [
-        manifest;
-        Doc.concat [Doc.space; Doc.text equalSign];
-        printConstructorDeclarations ~privateFlag:td.ptype_private cds;
-      ]
-    in
-    let constraints = printTypeDefinitionConstraints td.ptype_cstrs in
-    Doc.group (
-      Doc.concat [
-        attrs;
-        prefix;
-        typeName;
-        typeParams;
-        manifestAndKind;
-        constraints;
-      ]
-    )
-
-  and printTypeDefinitionConstraints cstrs =
-    match cstrs with
-    | [] -> Doc.nil
-    | cstrs -> Doc.indent (
-        Doc.group (
-          Doc.concat [
-            Doc.line;
-            Doc.group(
-              Doc.join ~sep:Doc.line (
-                List.map printTypeDefinitionConstraint cstrs
-              )
-            )
-          ]
-        )
-      )
-
-  and printTypeDefinitionConstraint ((typ1, typ2, _loc ): Parsetree.core_type * Parsetree.core_type * Location.t) =
-    Doc.concat [
-      Doc.text "constraint ";
-      printTypExpr typ1;
-      Doc.text " = ";
-      printTypExpr typ2;
-    ]
-
-  and printPrivateFlag (flag : Asttypes.private_flag) = match flag with
-    | Private -> Doc.text "private "
-    | Public -> Doc.nil
-
-  and printTypeParam (param : (Parsetree.core_type * Asttypes.variance)) =
-    let (typ, variance) = param in
-    let printedVariance = match variance with
-    | Covariant -> Doc.text "+"
-    | Contravariant -> Doc.text "-"
-    | Invariant -> Doc.nil
-    in
-    Doc.concat [
-      printedVariance;
-      printTypExpr typ
-    ]
-
-  and printRecordDeclaration (lds: Parsetree.label_declaration list) =
-    let forceBreak = match (lds, List.rev lds) with
-    | (first::_, last::_) ->
-       first.pld_loc.loc_start.pos_lnum < last.pld_loc.loc_end.pos_lnum
-    | _ -> false
-    in
-    Doc.breakableGroup ~forceBreak (
-      Doc.concat [
-        Doc.lbrace;
-        Doc.indent (
-          Doc.concat [
-            Doc.softLine;
-            Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line])
-              (List.map printLabelDeclaration lds)
-          ]
-        );
-        Doc.trailingComma;
-        Doc.softLine;
-        Doc.rbrace;
-      ]
-    )
-
-  and printConstructorDeclarations ~privateFlag (cds: Parsetree.constructor_declaration list) =
-    let forceBreak = match (cds, List.rev cds) with
-    | (first::_, last::_) ->
-       first.pcd_loc.loc_start.pos_lnum < last.pcd_loc.loc_end.pos_lnum
-    | _ -> false
-    in
-    let privateFlag = match privateFlag with
-    | Asttypes.Private -> Doc.concat [
-        Doc.text "private";
-        Doc.line;
-      ]
-    | Public -> Doc.nil
-    in
-    Doc.breakableGroup ~forceBreak (
-      Doc.indent (
-        Doc.concat [
-          Doc.line;
-          privateFlag;
-          Doc.join ~sep:Doc.line (
-            List.mapi printConstructorDeclaration cds
-          )
-        ]
-      )
-    )
-
-  (*
-   * {
-   *  pcd_name: string loc;
-   *  pcd_args: constructor_arguments;
-   *  pcd_res: core_type option;
-   *  pcd_loc: Location.t;
-   *  pcd_attributes: attributes; (* C of ... [@id1] [@id2] *)
-   * }
-   *)
-  and printConstructorDeclaration i (cd : Parsetree.constructor_declaration) =
-    let attrs = printAttributes cd.pcd_attributes in
-    let bar = if i > 0 then Doc.text "| "
-      else Doc.ifBreaks (Doc.text "| ") Doc.nil
-    in
-    let constrName = Doc.text cd.pcd_name.txt in
-    let constrArgs = printConstructorArguments cd.pcd_args in
-    let gadt = match cd.pcd_res with
-    | None -> Doc.nil
-    | Some(typ) -> Doc.indent (
-        Doc.concat [
-          Doc.text ": ";
-          printTypExpr typ;
-        ]
-      )
-    in
-    Doc.concat [
-      bar;
-      Doc.group (
-        Doc.concat [
-          attrs; (* TODO: fix parsing of attributes, so when can print them above the bar? *)
-          constrName;
-          constrArgs;
-          gadt;
-        ]
-      )
-    ]
-
-  and printConstructorArguments (cdArgs : Parsetree.constructor_arguments) =
-    match cdArgs with
-    | Pcstr_tuple [] -> Doc.nil
-    | Pcstr_tuple types -> Doc.group (
-        Doc.indent (
-          Doc.concat [
-            Doc.lparen;
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                  List.map printTypExpr types
-                )
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-            Doc.rparen;
-          ]
-        )
-      )
-    | Pcstr_record lds ->
-      Doc.indent (
-        Doc.concat [
-          Doc.lparen;
-          (* manually inline the printRecordDeclaration, gives better layout *)
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line])
-                (List.map printLabelDeclaration lds)
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rbrace;
-          Doc.rparen;
-        ]
-      )
-
-
-  and printLabelDeclaration (ld : Parsetree.label_declaration) =
-    let attrs = printAttributes ~loc:ld.pld_name.loc ld.pld_attributes in
-    let mutableFlag = match ld.pld_mutable with
-    | Mutable -> Doc.text "mutable "
-    | Immutable -> Doc.nil
-    in
-    let name = Doc.text ld.pld_name.txt in
-    Doc.group (
-      Doc.concat [
-        attrs;
-        mutableFlag;
-        name;
-        Doc.text ": ";
-        printTypExpr ld.pld_type;
-      ]
-    )
-
-  and printTypExpr (typExpr : Parsetree.core_type) =
-    let renderedType = match typExpr.ptyp_desc with
-    | Ptyp_any -> Doc.text "_"
-    | Ptyp_var var -> Doc.text ("'" ^ var)
-    | Ptyp_extension(extension) ->
-      printExtension extension
-    | Ptyp_alias(typ, alias) ->
-      let typ =
-        (* Technically type t = (string, float) => unit as 'x, doesn't require
-         * parens around the arrow expression. This is very confusing though.
-         * Is the "as" part of "unit" or "(string, float) => unit". By printing
-         * parens we guide the user towards its meaning.*)
-        let needsParens = match typ.ptyp_desc with
-        | Ptyp_arrow _ -> true
-        | _ -> false
-        in
-        let doc = printTypExpr typ in
-        if needsParens then
-          Doc.concat [Doc.lparen; doc; Doc.rparen]
-        else
-          doc
-      in
-      Doc.concat [typ; Doc.text " as "; Doc.text ("'" ^ alias)]
-    | Ptyp_constr({txt = Longident.Ldot(Longident.Lident "Js", "t")}, [typ]) ->
-      let bsObject = printTypExpr typ in
-      begin match typExpr.ptyp_attributes with
-      | [] -> bsObject
-      | attrs ->
-        Doc.concat [
-          Doc.group (
-            Doc.join ~sep:Doc.line (List.map printAttribute attrs)
-          );
-          Doc.space;
-          printTypExpr typ;
-        ]
-      end
-    | Ptyp_constr(longidentLoc, [{ ptyp_desc = Parsetree.Ptyp_tuple tuple }]) ->
-      let constrName = printLongident longidentLoc.txt in
-      Doc.group(
-        Doc.concat([
-          constrName;
-          Doc.lessThan;
-          printTupleType ~inline:true tuple;
-          Doc.greaterThan;
-        ])
-      )
-    | Ptyp_constr(longidentLoc, constrArgs) ->
-      let constrName = printLongident longidentLoc.txt in
-      begin match constrArgs with
-      | [] -> constrName
-      | [{
-          Parsetree.ptyp_desc =
-            Ptyp_constr({txt = Longident.Ldot(Longident.Lident "Js", "t")},
-          [{ptyp_desc = Ptyp_object (fields, openFlag)}])
-        }] ->
-        Doc.concat([
-          constrName;
-          Doc.lessThan;
-          printBsObjectSugar ~inline:true fields openFlag;
-          Doc.greaterThan;
-        ])
-      | args -> Doc.group(
-        Doc.concat([
-          constrName;
-          Doc.lessThan;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printTypExpr constrArgs
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.greaterThan;
-        ])
-      )
-      end
-    | Ptyp_arrow _ ->
-      let (attrsBefore, args, returnType) = ParsetreeViewer.arrowType typExpr in
-      let returnTypeNeedsParens = match returnType.ptyp_desc with
-      | Ptyp_alias _ -> true
-      | _ -> false
-      in
-      let returnDoc =
-        let doc = printTypExpr returnType in
-        if returnTypeNeedsParens then
-          Doc.concat [Doc.lparen; doc; Doc.rparen]
-        else doc
-      in
-      let (isUncurried, attrs) = ParsetreeViewer.processUncurriedAttribute attrsBefore in
-      begin match args with
-      | [] -> Doc.nil
-      | [([], Nolabel, n)] when not isUncurried ->
-          let hasAttrsBefore = not (attrs = []) in
-          let attrs = if hasAttrsBefore then
-            Doc.concat [
-              Doc.join ~sep:Doc.line (List.map printAttribute attrsBefore);
-              Doc.space;
-            ]
-          else Doc.nil
-          in
-          Doc.group (
-            Doc.concat [
-              Doc.group attrs;
-              Doc.group (
-                if hasAttrsBefore then
-                  Doc.concat [
-                    Doc.lparen;
-                    Doc.indent (
-                      Doc.concat [
-                        Doc.softLine;
-                        printTypExpr n;
-                        Doc.text " => ";
-                        returnDoc;
-                      ]
-                    );
-                    Doc.softLine;
-                    Doc.rparen
-                  ]
-                else
-                Doc.concat [
-                  printTypExpr n;
-                  Doc.text " => ";
-                  returnDoc;
-                ]
-              )
-            ]
-          )
-      | args ->
-        let attrs = match attrs with
-        | [] -> Doc.nil
-        | attrs -> Doc.concat [
-            Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-            Doc.space;
-          ]
-        in
-        let renderedArgs = Doc.concat [
-          attrs;
-          Doc.text "(";
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              if isUncurried then Doc.concat [Doc.dot; Doc.space] else Doc.nil;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printTypeParameter args
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.text ")";
-        ] in
-        Doc.group (
-          Doc.concat [
-            renderedArgs;
-            Doc.text " => ";
-            returnDoc;
-          ]
-        )
-      end
-    | Ptyp_tuple types -> printTupleType ~inline:false types
-    | Ptyp_object (fields, openFlag) ->
-      printBsObjectSugar ~inline:false fields openFlag
-    | Ptyp_poly(stringLocs, typ) ->
-      Doc.concat [
-        Doc.join ~sep:Doc.space (List.map (fun {Location.txt} ->
-          Doc.text ("'" ^ txt)) stringLocs);
-        Doc.dot;
-        Doc.space;
-        printTypExpr typ
-      ]
-    | Ptyp_package packageType ->
-      printPackageType ~printModuleKeywordAndParens:true packageType
-    | Ptyp_class _ -> failwith "classes are not supported in types"
-    | Ptyp_variant _ -> failwith "Polymorphic variants currently not supported"
-    in
-    let shouldPrintItsOwnAttributes = match typExpr.ptyp_desc with
-    | Ptyp_arrow _ (* es6 arrow types print their own attributes *)
-    | Ptyp_constr({txt = Longident.Ldot(Longident.Lident "Js", "t")}, _) -> true
-    | _ -> false
-    in
-    begin match typExpr.ptyp_attributes with
-    | _::_ as attrs when not shouldPrintItsOwnAttributes ->
-      Doc.group (
-        Doc.concat [
-          printAttributes attrs;
-          renderedType;
-        ]
-      )
-    | _ -> renderedType
-    end
-
-  and printBsObjectSugar ~inline fields openFlag =
-    let flag = match openFlag with
-    | Asttypes.Closed -> Doc.nil
-    | Open -> Doc.dotdot
-    in
-    let doc = Doc.concat [
-      Doc.lbrace;
-      flag;
-      Doc.indent (
-        Doc.concat [
-          Doc.softLine;
-          Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-            List.map printObjectField fields
-          )
-        ]
-      );
-      Doc.trailingComma;
-      Doc.softLine;
-      Doc.rbrace;
-    ] in
-    if inline then doc else Doc.group doc
-
-
-  and printTupleType ~inline (types: Parsetree.core_type list) =
-    let tuple = Doc.concat([
-      Doc.text "/";
-      Doc.indent (
-        Doc.concat([
-          Doc.softLine;
-          Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-            List.map printTypExpr types
-          )
-        ])
-      );
-      (* Doc.trailingComma; *) (* Trailing comma not supported in tuples right now… *)
-      Doc.softLine;
-      Doc.text "/";
-    ])
-    in
-    if inline == false then Doc.group(tuple) else tuple
-
-  and printObjectField (field : Parsetree.object_field) =
-    match field with
-    | Otag (labelLoc, attrs, typ) ->
-      Doc.concat [
-        Doc.text ("\"" ^ labelLoc.txt ^ "\"");
-        Doc.text ": ";
-        printTypExpr typ;
-      ]
-    | _ -> Doc.nil
-
-  (* es6 arrow type arg
-   * type t = (~foo: string, ~bar: float=?, unit) => unit
-   * i.e. ~foo: string, ~bar: float *)
-  and printTypeParameter (attrs, lbl, typ)  =
-    let (isUncurried, attrs) = ParsetreeViewer.processUncurriedAttribute attrs in
-    let uncurried = if isUncurried then Doc.concat [Doc.dot; Doc.space] else Doc.nil in
-    let attrs = match attrs with
-    | [] -> Doc.nil
-    | attrs -> Doc.concat [
-      Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-      Doc.line;
-    ] in
-    let label = match lbl with
-    | Asttypes.Nolabel -> Doc.nil
-    | Labelled lbl -> Doc.text ("~" ^ lbl ^ ": ")
-    | Optional lbl -> Doc.text ("~" ^ lbl ^ ": ")
-    in
-    let optionalIndicator = match lbl with
-    | Asttypes.Nolabel
-    | Labelled _ -> Doc.nil
-    | Optional lbl -> Doc.text "=?"
-    in
-    Doc.group (
-      Doc.concat [
-        uncurried;
-        attrs;
-        label;
-        printTypExpr typ;
-        optionalIndicator;
-      ]
-    )
-
-
-  (*
-   * {
-   *   pvb_pat: pattern;
-   *   pvb_expr: expression;
-   *   pvb_attributes: attributes;
-   *   pvb_loc: Location.t;
-   * }
-   *)
-  and printValueBinding ~recFlag i vb =
-    let isGhost = ParsetreeViewer.isGhostUnitBinding i vb in
-		let header = if isGhost then Doc.nil else
-			if i == 0 then Doc.concat [Doc.text "let "; recFlag]
-			else Doc.text "and "
-		in
-    let printedExpr =
-      let exprDoc = printExpression vb.pvb_expr in
-      let needsParens = match vb.pvb_expr.pexp_desc with
-      | Pexp_constraint(
-          {pexp_desc = Pexp_pack _},
-          {ptyp_desc = Ptyp_package _}
-        ) -> false
-      | Pexp_constraint _ -> true
-      | _ -> false
-      in
-      if needsParens then addParens exprDoc else exprDoc
-    in
-		if isGhost then
-			printedExpr
-		else
-      let shouldIndent =
-        ParsetreeViewer.isBinaryExpression vb.pvb_expr ||
-        (match vb.pvb_expr with
-        | {
-            pexp_attributes = [({Location.txt="res.ternary"}, _)];
-            pexp_desc = Pexp_ifthenelse (ifExpr, _, _)
-          }  ->
-          ParsetreeViewer.isBinaryExpression ifExpr || ParsetreeViewer.hasAttributes ifExpr.pexp_attributes
-      | { pexp_desc = Pexp_newtype _} -> false
-      | e ->
-          ParsetreeViewer.hasAttributes e.pexp_attributes ||
-          ParsetreeViewer.isArrayAccess e
-        )
-      in
-			Doc.concat [
-        printAttributes ~loc:vb.pvb_loc vb.pvb_attributes;
-				header;
-				printPattern vb.pvb_pat;
-				Doc.text " =";
-        if shouldIndent then
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printedExpr;
-            ]
-          )
-        else
-          Doc.concat [
-            Doc.space;
-            printedExpr;
-          ]
-      ]
-
-  and printPackageType ~printModuleKeywordAndParens (packageType: Parsetree.package_type) =
-    let doc = match packageType with
-    | (longidentLoc, []) -> Doc.group(
-        Doc.concat [
-          printLongident longidentLoc.txt;
-        ]
-      )
-    | (longidentLoc, packageConstraints) -> Doc.group(
-        Doc.concat [
-          printLongident longidentLoc.txt;
-          printPackageConstraints packageConstraints;
-          Doc.softLine;
-        ]
-      )
-    in
-    if printModuleKeywordAndParens then
-      Doc.concat[
-        Doc.text "module(";
-        doc;
-        Doc.rparen
-      ]
-    else
-      doc
-
-
-
-
-  and printPackageConstraints packageConstraints  =
-    Doc.concat [
-      Doc.text " with";
-      Doc.indent (
-        Doc.concat [
-          Doc.line;
-          Doc.join ~sep:Doc.line (
-            List.mapi printPackageconstraint packageConstraints
-          )
-        ]
-      )
-    ]
-
-  and printPackageconstraint i (longidentLoc, typ) =
-    let prefix = if i == 0 then Doc.text "type " else Doc.text "and type " in
-    Doc.concat [
-      prefix;
-      printLongident longidentLoc.Location.txt;
-      Doc.text " = ";
-      printTypExpr typ
-    ]
-
-  and printExtension (stringLoc, payload) =
-    let extName = Doc.text ("%" ^ stringLoc.Location.txt) in
-    match payload with
-    | PStr [{pstr_desc = Pstr_eval (expr, attrs)}] ->
-      let exprDoc = printExpression expr in
-      let needsParens = match attrs with | [] -> false | _ -> true in
-      Doc.group (
-        Doc.concat [
-          extName;
-          addParens (
-            Doc.concat [
-              printAttributes attrs;
-              if needsParens then addParens exprDoc else exprDoc;
-            ]
-          )
-        ]
-      )
-    | _ -> extName
-
-  and printPattern (p : Parsetree.pattern) =
-    let patternWithoutAttributes = match p.ppat_desc with
-    | Ppat_any -> Doc.text "_"
-    | Ppat_var stringLoc -> Doc.text (stringLoc.txt)
-    | Ppat_constant c -> printConstant c
-    | Ppat_tuple patterns ->
-      Doc.group(
-        Doc.concat([
-          Doc.text "/";
-          Doc.indent (
-            Doc.concat([
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map printPattern patterns)
-            ])
-          );
-          (* Doc.ifBreaks (Doc.text ",") Doc.nil; *)
-          Doc.softLine;
-          Doc.text "/";
-        ])
-      )
-    | Ppat_array patterns ->
-      Doc.group(
-        Doc.concat([
-          Doc.text "[";
-          Doc.indent (
-            Doc.concat([
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map printPattern patterns)
-            ])
-          );
-          Doc.ifBreaks (Doc.text ",") Doc.nil;
-          Doc.softLine;
-          Doc.text "]";
-        ])
-      )
-    | Ppat_construct({txt = Longident.Lident "[]"}, _) ->
-        Doc.text "list()"
-    | Ppat_construct({txt = Longident.Lident "::"}, _) ->
-      let (patterns, tail) = collectPatternsFromListConstruct [] p in
-      let shouldHug = match (patterns, tail) with
-      | ([pat],
-        {ppat_desc = Ppat_construct({txt = Longident.Lident "[]"}, _)}) when ParsetreeViewer.isHuggablePattern pat -> true
-      | _ -> false
-      in
-      let children = Doc.concat([
-        if shouldHug then Doc.nil else Doc.softLine;
-        Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-          (List.map printPattern patterns);
-        begin match tail.Parsetree.ppat_desc with
-        | Ppat_construct({txt = Longident.Lident "[]"}, _) -> Doc.nil
-        | _ -> Doc.concat([Doc.text ","; Doc.line; Doc.text "..."; printPattern tail])
-        end;
-      ]) in
-      Doc.group(
-        Doc.concat([
-          Doc.text "list(";
-          if shouldHug then children else Doc.concat [
-            Doc.indent children;
-            Doc.ifBreaks (Doc.text ",") Doc.nil;
-            Doc.softLine;
-          ];
-          Doc.text ")";
-        ])
-      )
-    | Ppat_construct(constrName, constructorArgs) ->
-      let constrName = printLongident constrName.txt in
-      begin match constructorArgs with
-      | None -> constrName
-      | Some(args) ->
-        let args = match args.ppat_desc with
-        | Ppat_construct({txt = Longident.Lident "()"}, None) -> [Doc.nil]
-        | Ppat_tuple(patterns) -> List.map printPattern patterns
-        | _ -> [printPattern args]
-        in
-        Doc.group(
-          Doc.concat([
-            constrName;
-            Doc.text "(";
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                  args
-              ]
-            );
-            Doc.ifBreaks (Doc.text ",") Doc.nil;
-            Doc.softLine;
-            Doc.text ")";
-          ])
-        )
-      end
-    | Ppat_record(rows, openFlag) ->
-        Doc.group(
-          Doc.concat([
-            Doc.text "{";
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                  (List.map printPatternRecordRow rows);
-                begin match openFlag with
-                | Open -> Doc.concat [Doc.text ","; Doc.line; Doc.text "_"]
-                | Closed -> Doc.nil
-                end;
-              ]
-            );
-            Doc.ifBreaks (Doc.text ",") Doc.nil;
-            Doc.softLine;
-            Doc.text "}";
-          ])
-        )
-
-    | Ppat_exception p ->
-        let needsParens = match p.ppat_desc with
-        | Ppat_or (_, _) | Ppat_alias (_, _) -> true
-        | _ -> false
-        in
-        let pat =
-          let p = printPattern p in
-          if needsParens then
-            Doc.concat [Doc.text "("; p; Doc.text ")"]
-          else
-            p
-        in
-        Doc.group (
-          Doc.concat [ Doc.text "exception"; Doc.line; pat ]
-        )
-    | Ppat_or (p1, p2) ->
-      let p1 =
-        let p = printPattern p1 in
-        match p1.ppat_desc with
-        | Ppat_or (_, _) -> Doc.concat [Doc.text "("; p; Doc.text ")"]
-        | _ -> p
-      in
-      let p2 =
-        let p = printPattern p2 in
-        match p2.ppat_desc with
-        | Ppat_or (_, _) -> Doc.concat [Doc.text "("; p; Doc.text ")"]
-        | _ -> p
-      in
-      Doc.group(
-        Doc.concat([p1; Doc.line; Doc.text "| "; p2])
-      )
-    | Ppat_extension ext ->
-      printExtension ext
-    | Ppat_lazy p ->
-      let needsParens = match p.ppat_desc with
-      | Ppat_or (_, _) | Ppat_alias (_, _) -> true
-      | _ -> false
-      in
-      let pat =
-        let p = printPattern p in
-        if needsParens then
-          Doc.concat [Doc.text "("; p; Doc.text ")"]
-        else
-          p
-      in
-      Doc.concat [Doc.text "lazy "; pat]
-    | Ppat_alias (p, aliasLoc) ->
-      let needsParens = match p.ppat_desc with
-      | Ppat_or (_, _) | Ppat_alias (_, _) -> true
-      | _ -> false
-      in
-      let renderedPattern =
-        let p = printPattern p in
-        if needsParens then
-          Doc.concat [Doc.text "("; p; Doc.text ")"]
-        else
-          p
-      in
-      Doc.concat([
-        renderedPattern;
-        Doc.text " as ";
-        Doc.text aliasLoc.txt
-      ])
-
-     (* Note: module(P : S) is represented as *)
-     (* Ppat_constraint(Ppat_unpack, Ptyp_package) *)
-    | Ppat_constraint ({ppat_desc = Ppat_unpack stringLoc}, {ptyp_desc = Ptyp_package packageType}) ->
-        Doc.concat [
-          Doc.text "module(";
-          Doc.text stringLoc.txt;
-          Doc.text ": ";
-          printPackageType ~printModuleKeywordAndParens:false packageType;
-          Doc.rparen;
-        ]
-    | Ppat_constraint (pattern, typ) ->
-      Doc.concat [
-        printPattern pattern;
-        Doc.text ": ";
-        printTypExpr typ;
-      ]
-
-     (* Note: module(P : S) is represented as *)
-     (* Ppat_constraint(Ppat_unpack, Ptyp_package) *)
-    | Ppat_unpack stringLoc ->
-        Doc.concat [
-          Doc.text "module(";
-          Doc.text stringLoc.txt;
-          Doc.rparen;
-        ]
-    | _ -> failwith "unsupported pattern"
-    in
-    begin match p.ppat_attributes with
-    | [] -> patternWithoutAttributes
-    | attrs ->
-      Doc.group (
-        Doc.concat [
-          printAttributes attrs;
-          patternWithoutAttributes;
-        ]
-      )
-    end
-
-  and printPatternRecordRow row =
-    match row with
-    (* punned {x}*)
-    | ({Location.txt=Longident.Lident ident},
-       {Parsetree.ppat_desc=Ppat_var {txt;_}}) when ident = txt ->
-        Doc.text ident
-    | (longident, pattern) ->
-        Doc.group (
-          Doc.concat([
-            printLongident longident.txt;
-            Doc.text ": ";
-            Doc.indent(
-              Doc.concat [
-                Doc.softLine;
-                printPattern pattern;
-              ]
-            )
-          ])
-        )
-
-  and printExpression (e : Parsetree.expression) =
-    let printedExpression = match e.pexp_desc with
-    | Parsetree.Pexp_constant c -> printConstant c
-    | Pexp_construct _ when ParsetreeViewer.hasJsxAttribute e.pexp_attributes ->
-      printJsxFragment e
-    | Pexp_construct ({txt = Longident.Lident "()"}, _) -> Doc.text "()"
-    | Pexp_construct ({txt = Longident.Lident "[]"}, _) -> Doc.text "list()"
-    | Pexp_construct ({txt = Longident.Lident "::"}, _) ->
-      let (expressions, spread) = ParsetreeViewer.collectListExpressions e in
-      let spreadDoc = match spread with
-      | Some(expr) -> Doc.concat [
-          Doc.text ",";
-          Doc.line;
-          Doc.dotdotdot;
-          printExpression expr
-        ]
-      | None -> Doc.nil
-      in
-      Doc.group(
-        Doc.concat([
-          Doc.text "list(";
-          Doc.indent (
-            Doc.concat([
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map printExpression expressions);
-              spreadDoc;
-            ])
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ])
-      )
-    | Pexp_construct (longidentLoc, args) ->
-      let constr = printLongident longidentLoc.txt in
-      let args = match args with
-      | None -> Doc.nil
-      | Some({pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)}) ->
-        Doc.text "()"
-      | Some({pexp_desc = Pexp_tuple args }) ->
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printExpression args
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      | Some(arg) ->
-        let argDoc = printExpression arg in
-        let shouldHug = ParsetreeViewer.isHuggableExpression arg in
-        Doc.concat [
-          Doc.lparen;
-          if shouldHug then argDoc
-          else Doc.concat [
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                argDoc;
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-          ];
-          Doc.rparen;
-        ]
-      in
-      Doc.group(Doc.concat [constr; args])
-    | Pexp_ident(longidentLoc) ->
-      printLongident longidentLoc.txt
-    | Pexp_tuple exprs ->
-      Doc.group(
-        Doc.concat([
-          Doc.text "/";
-          Doc.indent (
-            Doc.concat([
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map printExpression exprs)
-            ])
-          );
-          Doc.ifBreaks (Doc.text ",") Doc.nil;
-          Doc.softLine;
-          Doc.text "/";
-        ])
-      )
-    | Pexp_array [] -> Doc.text "[]"
-    | Pexp_array exprs ->
-      Doc.group(
-        Doc.concat([
-          Doc.lbracket;
-          Doc.indent (
-            Doc.concat([
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map printExpression exprs)
-            ])
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rbracket;
-        ])
-      )
-    | Pexp_record (rows, spreadExpr) ->
-      let spread = match spreadExpr with
-      | None -> Doc.nil
-      | Some expr -> Doc.concat [
-          Doc.dotdotdot;
-          printExpression expr;
-          Doc.comma;
-          Doc.line;
-        ]
-      in
-      (* If the record is written over multiple lines, break automatically
-       * `let x = {a: 1, b: 3}` -> same line, break when line-width exceeded
-       * `let x = {
-       *   a: 1,
-       *   b: 2,
-       *  }` -> record is written on multiple lines, break the group *)
-      let forceBreak =
-        e.pexp_loc.loc_start.pos_lnum < e.pexp_loc.loc_end.pos_lnum
-      in
-      Doc.breakableGroup ~forceBreak (
-        Doc.concat([
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              spread;
-              Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                (List.map printRecordRow rows)
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rbrace;
-        ])
-      )
-    | Pexp_extension extension ->
-      begin match extension with
-      | (
-          {txt = "bs.obj"},
-          PStr [{
-            pstr_loc = loc;
-            pstr_desc = Pstr_eval({pexp_desc = Pexp_record (rows, _)}, [])
-          }]
-        ) ->
-        (* If the object is written over multiple lines, break automatically
-         * `let x = {"a": 1, "b": 3}` -> same line, break when line-width exceeded
-         * `let x = {
-         *   "a": 1,
-         *   "b": 2,
-         *  }` -> object is written on multiple lines, break the group *)
-        let forceBreak =
-          loc.loc_start.pos_lnum < loc.loc_end.pos_lnum
-        in
-        Doc.breakableGroup ~forceBreak (
-          Doc.concat([
-            Doc.lbrace;
-            Doc.indent (
-              Doc.concat [
-                Doc.softLine;
-                Doc.join ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                  (List.map printBsObjectRow rows)
-              ]
-            );
-            Doc.trailingComma;
-            Doc.softLine;
-            Doc.rbrace;
-          ])
-        )
-      | extension ->
-        printExtension extension
-      end
-    | Pexp_apply _ ->
-      if ParsetreeViewer.isUnaryExpression e then
-        printUnaryExpression e
-      else if ParsetreeViewer.isBinaryExpression e then
-        printBinaryExpression e
-      else
-        printPexpApply e
-    | Pexp_unreachable -> Doc.dot
-    | Pexp_field (expr, longidentLoc) ->
-      let lhs =
-        let doc = printExpression expr in
-        if Parens.fieldExpr expr then addParens doc else doc
-      in
-      Doc.concat [
-        lhs;
-        Doc.dot;
-        printLongident longidentLoc.txt;
-      ]
-    | Pexp_setfield (expr1, longidentLoc, expr2) ->
-      printSetFieldExpr e.pexp_attributes expr1 longidentLoc expr2
-    | Pexp_ifthenelse (ifExpr, thenExpr, elseExpr) ->
-      if ParsetreeViewer.isTernaryExpr e then
-        let (parts, alternate) = ParsetreeViewer.collectTernaryParts e in
-        let ternaryDoc = match parts with
-        | (condition1, consequent1)::rest ->
-          Doc.group (Doc.concat [
-            printTernaryOperand condition1;
-            Doc.indent (
-              Doc.concat [
-                Doc.line;
-                Doc.indent (Doc.concat [Doc.text "? "; printTernaryOperand consequent1]);
-                Doc.concat (
-                  List.map (fun (condition, consequent) ->
-                    Doc.concat [
-                      Doc.line;
-                      Doc.text ": ";
-                      printTernaryOperand condition;
-                      Doc.line;
-                      Doc.text "? ";
-                      printTernaryOperand consequent;
-                    ]
-                  ) rest
-                );
-                Doc.line;
-                Doc.text ": ";
-                Doc.indent (printTernaryOperand alternate);
-              ]
-            )
-          ])
-        | _ -> Doc.nil
-        in
-        let attrs = ParsetreeViewer.filterTernaryAttributes e.pexp_attributes in
-        let needsParens = match attrs with | [] -> false | _ -> true in
-        Doc.concat [
-          printAttributes attrs;
-          if needsParens then addParens ternaryDoc else ternaryDoc;
-        ]
-      else
-      let (ifs, elseExpr) = ParsetreeViewer.collectIfExpressions e in
-      let ifDocs = Doc.join ~sep:Doc.space (
-        List.mapi (fun i (ifExpr, thenExpr) ->
-          let ifTxt = if i > 0 then Doc.text "else if " else  Doc.text "if " in
-          let condition = printExpression ifExpr in
-          Doc.concat [
-            ifTxt;
-            Doc.group (
-              Doc.ifBreaks (addParens condition) condition;
-            );
-            Doc.space;
-            printExpressionBlock ~braces:true thenExpr;
-          ]
-        ) ifs
-      ) in
-      let elseDoc = match elseExpr with
-      | None -> Doc.nil
-      | Some expr -> Doc.concat [
-          Doc.text " else ";
-          printExpressionBlock ~braces:true expr;
-        ]
-      in
-      Doc.concat [
-        printAttributes e.pexp_attributes;
-        ifDocs;
-        elseDoc;
-      ]
-    | Pexp_while (expr1, expr2) ->
-      let condition = printExpression expr1 in
-      Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          Doc.text "while ";
-          Doc.group (
-            Doc.ifBreaks (addParens condition) condition
-          );
-          Doc.space;
-          printExpressionBlock ~braces:true expr2;
-        ]
-      )
-    | Pexp_for (pattern, fromExpr, toExpr, directionFlag, body) ->
-      Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          Doc.text "for ";
-          printPattern pattern;
-          Doc.text " in ";
-          printExpression fromExpr;
-          printDirectionFlag directionFlag;
-          printExpression toExpr;
-          Doc.space;
-          printExpressionBlock ~braces:true body;
-        ]
-      )
-    | Pexp_constraint(
-        {pexp_desc = Pexp_pack modExpr},
-        {ptyp_desc = Ptyp_package packageType}
-      ) ->
-      Doc.group (
-        Doc.concat [
-          Doc.text "module(";
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              printModExpr modExpr;
-              Doc.text ": ";
-              printPackageType ~printModuleKeywordAndParens:false packageType;
-            ]
-          );
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      )
-
-    | Pexp_constraint (expr, typ) ->
-      Doc.concat [
-        printExpression expr;
-        Doc.text ": ";
-        printTypExpr typ;
-      ]
-    | Pexp_letmodule ({txt = modName}, modExpr, expr) ->
-      printExpressionBlock ~braces:true e
-
-    | Pexp_letexception (extensionConstructor, expr) ->
-      printExpressionBlock ~braces:true e
-    | Pexp_assert expr ->
-      let rhs =
-        let doc = printExpression expr in
-        if Parens.lazyOrAssertExprRhs expr then addParens doc else doc
-      in
-      Doc.concat [
-        Doc.text "assert ";
-        rhs;
-      ]
-    | Pexp_lazy expr ->
-      let rhs =
-        let doc = printExpression expr in
-        if Parens.lazyOrAssertExprRhs expr then addParens doc else doc
-      in
-      Doc.concat [
-        Doc.text "lazy ";
-        rhs;
-      ]
-    | Pexp_open (overrideFlag, longidentLoc, expr) ->
-      printExpressionBlock ~braces:true e
-    | Pexp_pack (modExpr) ->
-      Doc.group (Doc.concat [
-        Doc.text "module(";
-        Doc.indent (
-          Doc.concat [
-            Doc.softLine;
-            printModExpr modExpr;
-          ]
-        );
-        Doc.softLine;
-        Doc.rparen;
-      ])
-    | Pexp_sequence _ ->
-      printExpressionBlock ~braces:true e
-    | Pexp_let _ ->
-      printExpressionBlock ~braces:true e
-    | Pexp_fun _ | Pexp_newtype _ ->
-      let (attrsOnArrow, parameters, returnExpr) = ParsetreeViewer.funExpr e in
-      let (uncurried, attrs) =
-        ParsetreeViewer.processUncurriedAttribute attrsOnArrow
-      in
-      let (returnExpr, typConstraint) = match returnExpr.pexp_desc with
-      | Pexp_constraint (expr, typ) -> (expr, Some typ)
-      | _ -> (returnExpr, None)
-      in
-      let parametersDoc = printExprFunParameters ~inCallback:false ~uncurried parameters in
-      let returnExprDoc =
-        let shouldInline = match returnExpr.pexp_desc with
-        | Pexp_array _
-        | Pexp_tuple _
-        | Pexp_construct (_, Some _)
-        | Pexp_record _ -> true
-        | _ -> false
-        in
-        let shouldIndent = match returnExpr.pexp_desc with
-        | Pexp_sequence _ | Pexp_let _ | Pexp_letmodule _ | Pexp_letexception _ -> false
-        | _ -> true
-        in
-        let returnDoc = printExpression returnExpr in
-        if shouldInline then Doc.concat [
-          Doc.space;
-          returnDoc;
-        ] else
-          Doc.group (
-            if shouldIndent then
-              Doc.indent (
-                Doc.concat [
-                  Doc.line;
-                  returnDoc;
-                ]
-              )
-            else
-              Doc.concat [
-                Doc.space;
-                returnDoc
-              ]
-          )
-      in
-      let typConstraintDoc = match typConstraint with
-      | Some(typ) -> Doc.concat [Doc.text ": "; printTypExpr typ]
-      | _ -> Doc.nil
-      in
-      let attrs = match attrs with
-      | [] -> Doc.nil
-      | attrs -> Doc.concat [
-          Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-          Doc.space;
-        ]
-      in
-      Doc.group (
-        Doc.concat [
-          attrs;
-          parametersDoc;
-          typConstraintDoc;
-          Doc.text " =>";
-          returnExprDoc;
-        ]
-      )
-    | Pexp_try (expr, cases) ->
-      Doc.concat [
-        Doc.text "try ";
-        printExpression expr;
-        Doc.text " catch ";
-        printCases cases;
-      ]
-    | Pexp_match (expr, cases) ->
-      Doc.concat [
-        Doc.text "switch ";
-        printExpression expr;
-        Doc.space;
-        printCases cases;
-      ]
-    | _ -> failwith "expression not yet implemented in printer"
-    in
-    let shouldPrintItsOwnAttributes = match e.pexp_desc with
-    | Pexp_apply _
-    | Pexp_fun _
-    | Pexp_newtype _
-    | Pexp_setfield _
-    | Pexp_ifthenelse _ -> true
-    | Pexp_construct _ when ParsetreeViewer.hasJsxAttribute e.pexp_attributes -> true
-    | _ -> false
-    in
-    begin match e.pexp_attributes with
-    | [] -> printedExpression
-    | attrs when not shouldPrintItsOwnAttributes ->
-      Doc.group (
-        Doc.concat [
-          printAttributes attrs;
-          printedExpression;
-        ]
-      )
-    | _ -> printedExpression
-    end
-
-  and printPexpFun ~inCallback e =
-      let (attrsOnArrow, parameters, returnExpr) = ParsetreeViewer.funExpr e in
-      let (uncurried, attrs) =
-        ParsetreeViewer.processUncurriedAttribute attrsOnArrow
-      in
-      let (returnExpr, typConstraint) = match returnExpr.pexp_desc with
-      | Pexp_constraint (expr, typ) -> (expr, Some typ)
-      | _ -> (returnExpr, None)
-      in
-      let parametersDoc = printExprFunParameters ~inCallback  ~uncurried parameters in
-      let returnShouldIndent = match returnExpr.pexp_desc with
-      | Pexp_sequence _ | Pexp_let _ | Pexp_letmodule _ | Pexp_letexception _ -> false
-      | _ -> true
-      in
-      let returnExprDoc =
-        let shouldInline = match returnExpr.pexp_desc with
-        | Pexp_array _
-        | Pexp_tuple _
-        | Pexp_construct (_, Some _)
-        | Pexp_record _ -> true
-        | _ -> false
-        in
-        let returnDoc = printExpression returnExpr in
-        if shouldInline then Doc.concat [
-          Doc.space;
-          returnDoc;
-        ] else
-          Doc.group (
-            if returnShouldIndent then
-              Doc.concat [
-                Doc.indent (
-                  Doc.concat [
-                    Doc.line;
-                    returnDoc;
-                  ]
-                );
-                if inCallback then Doc.softLine else Doc.nil;
-              ]
-            else
-              Doc.concat [
-                Doc.space;
-                returnDoc;
-              ]
-          )
-      in
-      let typConstraintDoc = match typConstraint with
-      | Some(typ) -> Doc.concat [Doc.text ": "; printTypExpr typ]
-      | _ -> Doc.nil
-      in
-      let attrs = match attrs with
-      | [] -> Doc.nil
-      | attrs -> Doc.concat [
-          Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-          Doc.space;
-        ]
-      in
-      Doc.group (
-        Doc.concat [
-          attrs;
-          parametersDoc;
-          typConstraintDoc;
-          Doc.text " =>";
-          returnExprDoc;
-        ]
-      )
-
-  and printTernaryOperand expr =
-    let doc = printExpression expr in
-    if Parens.ternaryOperand expr then addParens doc else doc
-
-  and printSetFieldExpr attrs lhs longidentLoc rhs =
-    let rhsDoc =
-      let doc = printExpression rhs in
-      if Parens.setFieldExprRhs rhs then addParens doc else doc
-    in
-    let lhsDoc =
-      let doc = printExpression lhs in
-      if Parens.fieldExpr lhs then addParens doc else doc
-    in
-    let shouldIndent = ParsetreeViewer.isBinaryExpression rhs in
-    let doc = Doc.concat [
-      lhsDoc;
-      Doc.dot;
-      printLongident longidentLoc.txt;
-      Doc.text " =";
-      if shouldIndent then Doc.group (
-        Doc.indent (
-          (Doc.concat [Doc.line; rhsDoc])
-        )
-      ) else
-        Doc.concat [Doc.space; rhsDoc]
-    ] in
-    match attrs with
-    | [] -> doc
-    | attrs ->
-      Doc.group (
-        Doc.concat [
-          printAttributes attrs;
-          doc
-        ]
-      )
-
-  and printUnaryExpression expr =
-    let printUnaryOperator op = Doc.text (
-      match op with
-      | "~+" -> "+"
-      | "~+." -> "+."
-      | "~-" -> "-"
-      | "~-." ->  "-."
-      | "not" -> "!"
-      | "!" -> "&"
-      | _ -> assert false
-    ) in
-    match expr.pexp_desc with
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [Nolabel, operand]
-      ) ->
-      let printedOperand =
-        let doc = printExpression operand in
-        if Parens.unaryExprOperand operand then addParens doc else doc
-      in
-      Doc.concat [
-        printUnaryOperator operator;
-        printedOperand;
-      ]
-    | _ -> assert false
-
-  and printBinaryExpression (expr : Parsetree.expression) =
-    let printBinaryOperator ~inlineRhs operator =
-      let operatorTxt = match operator with
-      | "|." -> "->"
-      | "^" -> "++"
-      | "=" -> "=="
-      | "==" -> "==="
-      | "<>" -> "!="
-      | "!=" -> "!=="
-      | txt -> txt
-      in
-      let spacingBeforeOperator =
-        if operator = "|." then Doc.softLine
-        else if operator = "|>" then Doc.line
-        else Doc.space;
-      in
-      let spacingAfterOperator =
-        if operator = "|." then Doc.nil
-        else if operator = "|>" then Doc.space
-        else if inlineRhs then Doc.space else Doc.line
-      in
-      Doc.concat [
-        spacingBeforeOperator;
-        Doc.text operatorTxt;
-        spacingAfterOperator;
-      ]
-    in
-    let printOperand ~isLhs expr parentOperator =
-      let rec flatten ~isLhs expr parentOperator =
-        if ParsetreeViewer.isBinaryExpression expr then
-          begin match expr with
-          | {pexp_desc = Pexp_apply (
-              {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-              [_, left; _, right]
-            )} ->
-            if ParsetreeViewer.flattenableOperators parentOperator operator &&
-                not (ParsetreeViewer.hasAttributes expr.pexp_attributes) then
-              let leftPrinted = flatten ~isLhs:true left operator in
-              let rightPrinted =
-                let (_, rightAttrs) =
-                  ParsetreeViewer.partitionPrinteableAttributes right.pexp_attributes
-                in
-                let doc =
-                  printExpression {right with pexp_attributes = rightAttrs } in
-                let doc = if Parens.flattenOperandRhs parentOperator right then
-                  Doc.concat [Doc.lparen; doc; Doc.rparen]
-                else
-                  doc
-                in
-                let printeableAttrs =
-                  ParsetreeViewer.filterPrinteableAttributes right.pexp_attributes
-                in
-                Doc.concat [printAttributes printeableAttrs; doc]
-              in
-              Doc.concat [
-                leftPrinted;
-                printBinaryOperator ~inlineRhs:false operator;
-                rightPrinted;
-              ]
-            else
-              let doc = printExpression {expr with pexp_attributes = []} in
-              let doc = if Parens.subBinaryExprOperand parentOperator operator ||
-                (expr.pexp_attributes <> [] &&
-                  (ParsetreeViewer.isBinaryExpression expr ||
-                ParsetreeViewer.isTernaryExpr expr)) then
-                Doc.concat [Doc.lparen; doc; Doc.rparen]
-              else doc
-              in Doc.concat [
-                printAttributes expr.pexp_attributes;
-                doc
-              ]
-          | _ -> assert false
-          end
-        else
-          begin match expr.pexp_desc with
-          | Pexp_setfield (lhs, field, rhs) ->
-            let doc = printSetFieldExpr expr.pexp_attributes lhs field rhs in
-            if isLhs then addParens doc else doc
-          | Pexp_apply(
-              {pexp_desc = Pexp_ident {txt = Longident.Lident "#="}},
-              [(Nolabel, lhs); (Nolabel, rhs)]
-            ) ->
-            let rhsDoc = printExpression rhs in
-            let lhsDoc = printExpression lhs in
-            (* TODO: unify indentation of "=" *)
-            let shouldIndent = ParsetreeViewer.isBinaryExpression rhs in
-            let doc = Doc.group(
-              Doc.concat [
-                lhsDoc;
-                Doc.text " =";
-                if shouldIndent then Doc.group (
-                  Doc.indent (Doc.concat [Doc.line; rhsDoc])
-                ) else
-                  Doc.concat [Doc.space; rhsDoc]
-              ]
-            ) in
-            let doc = match expr.pexp_attributes with
-            | [] -> doc
-            | attrs ->
-              Doc.group (
-                Doc.concat [
-                  printAttributes attrs;
-                  doc
-                ]
-              )
-            in
-            if isLhs then addParens doc else doc
-          | _ ->
-            let doc = printExpression expr in
-            if Parens.binaryExprOperand ~isLhs expr parentOperator then
-              addParens doc
-            else doc
-          end
-      in
-      flatten ~isLhs expr parentOperator
-    in
-    match expr.pexp_desc with
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident (("|." | "|>") as op)}},
-        [Nolabel, lhs; Nolabel, rhs]
-      ) when not (
-          ParsetreeViewer.isBinaryExpression lhs ||
-          ParsetreeViewer.isBinaryExpression rhs
-      ) ->
-      let lhsDoc = printOperand ~isLhs:true lhs op in
-      let rhsDoc = printOperand ~isLhs:false rhs op in
-      Doc.concat [
-        lhsDoc;
-        (match op with
-        | "|." -> Doc.text "->"
-        | "|>" -> Doc.text " |> "
-        | _ -> assert false);
-        rhsDoc;
-      ]
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [Nolabel, lhs; Nolabel, rhs]
-      ) ->
-      let right =
-        let operatorWithRhs = Doc.concat [
-          printBinaryOperator
-            ~inlineRhs:(ParsetreeViewer.shouldInlineRhsBinaryExpr rhs) operator;
-          printOperand ~isLhs:false rhs operator;
-        ] in
-        if ParsetreeViewer.shouldIndentBinaryExpr expr then
-          Doc.group (Doc.indent operatorWithRhs)
-        else operatorWithRhs
-      in
-      let doc = Doc.group (
-        Doc.concat [
-          printOperand ~isLhs:true lhs operator;
-          right
-        ]
-      ) in
-      Doc.concat [
-        printAttributes expr.pexp_attributes;
-        if Parens.binaryExpr expr then addParens doc else doc
-      ]
-    | _ -> Doc.nil
-
-  (* callExpr(arg1, arg2)*)
-  and printPexpApply expr =
-    match expr.pexp_desc with
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident "##"}},
-        [Nolabel, parentExpr; Nolabel, memberExpr]
-      ) ->
-        let member =
-          let memberDoc = printExpression memberExpr in
-          Doc.concat [Doc.text "\""; memberDoc; Doc.text "\""]
-        in
-        Doc.group (Doc.concat [
-          printAttributes expr.pexp_attributes;
-          printExpression parentExpr;
-          Doc.lbracket;
-          member;
-          Doc.rbracket;
-        ])
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Lident "#="}},
-        [Nolabel, lhs; Nolabel, rhs]
-      ) ->
-        let rhsDoc = printExpression rhs in
-        (* TODO: unify indentation of "=" *)
-        let shouldIndent = ParsetreeViewer.isBinaryExpression rhs in
-        let doc = Doc.group(
-          Doc.concat [
-            printExpression lhs;
-            Doc.text " =";
-            if shouldIndent then Doc.group (
-              Doc.indent (
-                (Doc.concat [Doc.line; rhsDoc])
-              )
-            ) else
-              Doc.concat [Doc.space; rhsDoc]
-          ]
-        ) in
-        begin match expr.pexp_attributes with
-        | [] -> doc
-        | attrs ->
-          Doc.group (
-            Doc.concat [
-              printAttributes attrs;
-              doc
-            ]
-          )
-        end
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "get")}},
-        [Nolabel, parentExpr; Nolabel, memberExpr]
-      ) ->
-        let member =
-          let memberDoc = printExpression memberExpr in
-          let shouldInline = match memberExpr.pexp_desc with
-          | Pexp_constant _ | Pexp_ident _ -> true
-          | _ -> false
-          in
-          if shouldInline then memberDoc else (
-            Doc.concat [
-              Doc.indent (
-                Doc.concat [
-                  Doc.softLine;
-                  memberDoc;
-                ]
-              );
-              Doc.softLine
-            ]
-          )
-        in
-        Doc.group (Doc.concat [
-          printAttributes expr.pexp_attributes;
-          printExpression parentExpr;
-          Doc.lbracket;
-          member;
-          Doc.rbracket;
-        ])
-    (* TODO: cleanup, are those branches even remotely performant? *)
-    | Pexp_apply (
-        {pexp_desc = Pexp_ident {txt = lident}},
-        args
-      ) when ParsetreeViewer.isJsxExpression expr ->
-      printJsxExpression lident args
-    | Pexp_apply (callExpr, args) ->
-      let (uncurried, attrs) =
-        ParsetreeViewer.processUncurriedAttribute expr.pexp_attributes
-      in
-      let callExprDoc = printExpression callExpr in
-      if ParsetreeViewer.requiresSpecialCallbackPrinting args then
-        let argsDoc = printArgumentsWithCallback ~uncurried args in
-        Doc.concat [
-          printAttributes attrs;
-          callExprDoc;
-          argsDoc;
-        ]
-      else
-        let argsDoc = printArguments ~uncurried args in
-        Doc.concat [
-          printAttributes attrs;
-          callExprDoc;
-          argsDoc;
-        ]
-    | _ -> assert false
-
-  and printJsxExpression lident args =
-    let name = printJsxName lident in
-    let (formattedProps, children) = formatJsxProps args in
-    (* <div className="test" /> *)
-    let isSelfClosing = match children with | [] -> true | _ -> false in
-    Doc.group (
-      Doc.concat [
-        Doc.group (
-          Doc.concat [
-            Doc.lessThan;
-            name;
-            formattedProps;
-            if isSelfClosing then Doc.concat [Doc.line; Doc.text "/>"] else Doc.nil
-          ]
-        );
-        if isSelfClosing then Doc.nil
-        else
-          Doc.concat [
-            Doc.greaterThan;
-            Doc.indent (
-              Doc.concat [
-                Doc.line;
-                printJsxChildren children;
-              ]
-            );
-            Doc.line;
-            Doc.text "</";
-            name;
-            Doc.greaterThan;
-          ]
-      ]
-    )
-
-  and printJsxFragment expr =
-    let opening = Doc.text "<>" in
-    let closing = Doc.text "</>" in
-    let (children, _) = ParsetreeViewer.collectListExpressions expr in
-    Doc.group (
-      Doc.concat [
-        opening;
-        begin match children with
-        | [] -> Doc.nil
-        | children ->
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printJsxChildren children;
-            ]
-          )
-        end;
-        Doc.line;
-        closing;
-      ]
-    )
-
-  and printJsxChildren (children: Parsetree.expression list) =
-    Doc.group (
-      Doc.join ~sep:Doc.line (
-        List.map (fun expr ->
-          let exprDoc = printExpression expr in
-          if Parens.jsxChildExpr expr then addBraces exprDoc else exprDoc
-        ) children
-      )
-    )
-
-  and formatJsxProps args =
-    let rec loop props args =
-      match args with
-      | [] -> (Doc.nil, [])
-      | [
-          (Asttypes.Labelled "children", children);
-          (
-            Asttypes.Nolabel,
-            {Parsetree.pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, None)}
-          )
-        ] ->
-        let formattedProps = Doc.indent (
-          match props with
-          | [] -> Doc.nil
-          | props ->
-            Doc.concat [
-              Doc.line;
-              Doc.group (
-                Doc.join ~sep:Doc.line (props |> List.rev)
-              )
-            ]
-        ) in
-        let (children, _) = ParsetreeViewer.collectListExpressions children in
-        (formattedProps, children)
-      | arg::args ->
-        let propDoc = formatJsxProp arg in
-        loop (propDoc::props) args
-    in
-    loop [] args
-
-  and formatJsxProp arg =
-    match arg with
-    | (
-        (Asttypes.Labelled lblTxt | Optional lblTxt) as lbl,
-        {
-          Parsetree.pexp_attributes = [];
-          pexp_desc = Pexp_ident {txt = Longident.Lident ident}
-        }
-      ) when lblTxt = ident (* jsx punning *) ->
-
-      begin match lbl with
-      | Nolabel -> Doc.nil
-      | Labelled lbl -> Doc.text lbl
-      | Optional lbl -> Doc.text ("?" ^ lbl)
-      end
-    | (lbl, expr) ->
-      let lblDoc = match lbl with
-      | Asttypes.Labelled lbl -> Doc.text (lbl ^ "=")
-      | Asttypes.Optional lbl -> Doc.text (lbl ^ "=?")
-      | Nolabel -> Doc.nil
-      in
-      let exprDoc = printExpression expr in
-      Doc.concat [
-        lblDoc;
-        if Parens.jsxPropExpr expr then addBraces exprDoc else exprDoc;
-      ]
-
-  (* div -> div.
-   * Navabar.createElement -> Navbar
-   * Staff.Users.createElement -> Staff.Users *)
-  and printJsxName lident =
-    let rec flatten acc lident = match lident with
-    | Longident.Lident txt -> txt::acc
-    | Ldot (lident, txt) ->
-      let acc = if txt = "createElement" then acc else txt::acc in
-      flatten acc lident
-    | _ -> acc
-    in
-    match lident with
-    | Longident.Lident txt -> Doc.text txt
-    | _ as lident ->
-      let segments = flatten [] lident in
-      Doc.join ~sep:Doc.dot (List.map Doc.text segments)
-
-  and printArgumentsWithCallback ~uncurried args =
-    let rec loop acc args = match args with
-    | [] -> (Doc.nil, Doc.nil)
-    | [_lbl, expr] ->
-      let callback = printPexpFun ~inCallback:true expr in
-      (Doc.concat (List.rev acc), callback)
-    | arg::args ->
-      let argDoc = printArgument arg in
-      loop (Doc.line::Doc.comma::argDoc::acc) args
-    in
-    let (printedArgs, callback) = loop [] args in
-
-    (* Thing.map(foo,(arg1, arg2) => MyModuleBlah.toList(argument)) *)
-    let fitsOnOneLine = Doc.concat [
-      if uncurried then Doc.text "(." else Doc.lparen;
-      Doc.concat [
-        printedArgs;
-        callback;
-      ];
-      Doc.rparen;
-    ] in
-
-    (* Thing.map(longArgumet, veryLooooongArgument, (arg1, arg2) =>
-     *   MyModuleBlah.toList(argument)
-     * )
-     *)
-    let arugmentsFitOnOneLine =
-      Doc.concat [
-        if uncurried then Doc.text "(." else Doc.lparen;
-        Doc.concat [
-          Doc.softLine;
-          printedArgs;
-          Doc.breakableGroup ~forceBreak:true callback;
-        ];
-        Doc.softLine;
-        Doc.rparen;
-      ]
-    in
-
-    (* Thing.map(
-     *   arg1,
-     *   arg2,
-     *   arg3,
-     *   (param1, parm2) => doStuff(param1, parm2)
-     * )
-     *)
-    let breakAllArgs = printArguments ~uncurried args in
-    Doc.customLayout [
-      fitsOnOneLine;
-      arugmentsFitOnOneLine;
-      breakAllArgs;
-    ]
-
-	and printArguments ~uncurried (args : (Asttypes.arg_label * Parsetree.expression) list) =
-		match args with
-		| [Nolabel, {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)}] ->
-      if uncurried then Doc.text "(.)" else Doc.text "()"
-    | [(Nolabel, arg)] when ParsetreeViewer.isHuggableExpression arg ->
-      Doc.concat [
-        if uncurried then Doc.text "(." else Doc.lparen;
-        printExpression arg;
-        Doc.rparen;
-      ]
-		| args -> Doc.group (
-				Doc.concat [
-          if uncurried then Doc.text "(." else Doc.lparen;
-					Doc.indent (
-						Doc.concat [
-              if uncurried then Doc.line else Doc.softLine;
-							Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-								List.map printArgument args
-							)
-						]
-					);
-					Doc.trailingComma;
-					Doc.softLine;
-					Doc.rparen;
-				]
-			)
-
-(*
-   * argument ::=
-   *   | _                            (* syntax sugar *)
-   *   | expr
-   *   | expr : type
-   *   | ~ label-name
-   *   | ~ label-name
-   *   | ~ label-name ?
-   *   | ~ label-name =   expr
-   *   | ~ label-name =   _           (* syntax sugar *)
-   *   | ~ label-name =   expr : type
-   *   | ~ label-name = ? expr
-   *   | ~ label-name = ? _           (* syntax sugar *)
-   *   | ~ label-name = ? expr : type *)
-	and printArgument ((argLbl, arg) : Asttypes.arg_label * Parsetree.expression) =
-		match (argLbl, arg) with
-		(* ~a (punned)*)
-		| (
-				(Asttypes.Labelled lbl),
-				{pexp_desc=Pexp_ident {txt =Longident.Lident name}}
-			) when lbl = name ->
-			Doc.text ("~" ^ lbl)
-		(* ~a? (optional lbl punned)*)
-		| (
-				(Asttypes.Optional lbl),
-				{pexp_desc=Pexp_ident {txt =Longident.Lident name}}
-			) when lbl = name ->
-			Doc.text ("~" ^ lbl ^ "?")
-		| (lbl, expr) ->
-			let printedLbl = match argLbl with
-			| Asttypes.Nolabel -> Doc.nil
-			| Asttypes.Labelled lbl -> Doc.text ("~" ^ lbl ^ "=")
-			| Asttypes.Optional lbl -> Doc.text ("~" ^ lbl ^ "=?")
-			in
-			let printedExpr = printExpression expr in
-			Doc.concat [
-				printedLbl;
-				printedExpr;
-			]
-
-  and printCases (cases: Parsetree.case list) =
-    Doc.breakableGroup ~forceBreak:true (
-      Doc.concat [
-        Doc.lbrace;
-          Doc.concat [
-            Doc.line;
-            Doc.join ~sep:Doc.line (
-              List.map printCase cases
-            )
-          ];
-        Doc.line;
-        Doc.rbrace;
-      ]
-    )
-
-  and printCase (case: Parsetree.case) =
-    let rhs = match case.pc_rhs.pexp_desc with
-    | Pexp_let _
-    | Pexp_letmodule _
-    | Pexp_letexception _
-    | Pexp_open _
-    | Pexp_sequence _ ->
-      printExpressionBlock ~braces:false case.pc_rhs
-    | _ -> printExpression case.pc_rhs
-    in
-    let guard = match case.pc_guard with
-    | None -> Doc.nil
-    | Some expr -> Doc.group (
-        Doc.concat [
-          Doc.line;
-          Doc.text "when ";
-          printExpression expr;
-        ]
-      )
-    in
-    Doc.group (
-      Doc.concat [
-        Doc.text "| ";
-        Doc.indent (
-          Doc.concat [
-            printPattern case.pc_lhs;
-            guard;
-            Doc.text " =>";
-            Doc.line;
-            rhs;
-          ]
-        );
-      ]
-    )
-
-  and printExprFunParameters ~inCallback ~uncurried parameters =
-    match parameters with
-    (* let f = _ => () *)
-    | [([], Asttypes.Nolabel, None, {Parsetree.ppat_desc = Ppat_any})] when not uncurried ->
-      Doc.text "_"
-    (* let f = a => () *)
-    | [([], Asttypes.Nolabel, None, {Parsetree.ppat_desc = Ppat_var stringLoc})]  when not uncurried ->
-      Doc.text stringLoc.txt
-    (* let f = () => () *)
-    | [([], Nolabel, None, {ppat_desc = Ppat_construct({txt = Longident.Lident "()"}, None)})] when not uncurried ->
-      Doc.text "()"
-    (* let f = (~greeting, ~from as hometown, ~x=?) => () *)
-    | parameters ->
-      let lparen = if uncurried then Doc.text "(. " else Doc.lparen in
-      let shouldHug = ParsetreeViewer.parametersShouldHug parameters in
-      let printedParamaters = Doc.concat [
-        if shouldHug || inCallback then Doc.nil else Doc.softLine;
-        Doc.join ~sep:(Doc.concat [Doc.comma; if inCallback then Doc.space else Doc.line])
-          (List.map printExpFunParameter parameters)
-      ] in
-      Doc.group (
-        Doc.concat [
-          lparen;
-          if shouldHug || inCallback then printedParamaters else Doc.indent (printedParamaters);
-          if shouldHug || inCallback then Doc.nil else Doc.concat [Doc.trailingComma; Doc.softLine];
-          Doc.rparen;
-        ]
-      )
-
-  and printExpFunParameter (attrs, lbl, defaultExpr, pattern) =
-    let (isUncurried, attrs) = ParsetreeViewer.processUncurriedAttribute attrs in
-    let uncurried = if isUncurried then Doc.concat [Doc.dot; Doc.space] else Doc.nil in
-    let attrs = match attrs with
-    | [] -> Doc.nil
-    | attrs -> Doc.concat [
-      Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-      Doc.line;
-    ] in
-    (* =defaultValue *)
-    let defaultExprDoc = match defaultExpr with
-    | Some expr -> Doc.concat [
-        Doc.text "=";
-        printExpression expr
-      ]
-    | None -> Doc.nil
-    in
-    (* ~from as hometown
-     * ~from                   ->  punning *)
-    let labelWithPattern = match (lbl, pattern) with
-    | (Asttypes.Nolabel, pattern) -> printPattern pattern
-    | (
-        (Asttypes.Labelled lbl | Optional lbl),
-        {ppat_desc = Ppat_var stringLoc}
-      ) when lbl = stringLoc.txt ->
-      Doc.concat [
-        Doc.text "~";
-        Doc.text lbl;
-      ]
-    | ((Asttypes.Labelled lbl | Optional lbl), pattern) ->
-      Doc.concat [
-        Doc.text "~";
-        Doc.text lbl;
-        Doc.text " as ";
-        printPattern pattern;
-      ]
-    in
-    let optionalLabelSuffix = match (lbl, defaultExpr) with
-    | (Asttypes.Optional _, None) -> Doc.text "=?"
-    | _ -> Doc.nil
-    in
-    Doc.group (
-      Doc.concat [
-        uncurried;
-        attrs;
-        labelWithPattern;
-        defaultExprDoc;
-        optionalLabelSuffix;
-      ]
-    )
-
-  (*
-   * let x = {
-   *   module Foo = Bar
-   *   exception Exit
-   *   open Belt
-   *   let a = 1
-   *   let b = 2
-   *   sideEffect()
-   *   a + b
-   * }
-   * What is an expr-block ? Everything between { ... }
-   *)
-  and printExpressionBlock ~braces expr =
-    let rec collectRows acc expr = match expr.Parsetree.pexp_desc with
-    | Parsetree.Pexp_letmodule ({txt = modName; loc = modLoc}, modExpr, expr) ->
-      let letModuleDoc = Doc.concat [
-        Doc.text "module ";
-        Doc.text modName;
-        Doc.text " = ";
-        printModExpr modExpr;
-      ] in
-      let loc = {modLoc with loc_end = modExpr.pmod_loc.loc_end} in
-      collectRows ((loc, letModuleDoc)::acc) expr
-    | Pexp_letexception (extensionConstructor, expr) ->
-      let letExceptionDoc = printExceptionDef extensionConstructor in
-      let loc = extensionConstructor.pext_loc in
-      collectRows ((loc, letExceptionDoc)::acc) expr
-    | Pexp_open (overrideFlag, longidentLoc, expr) ->
-      let openDoc = Doc.concat [
-        Doc.text "open";
-        printOverrideFlag overrideFlag;
-        Doc.space;
-        printLongident longidentLoc.txt;
-      ] in
-      let loc = longidentLoc.loc in
-      collectRows ((loc, openDoc)::acc) expr
-    | Pexp_sequence (expr1, expr2) ->
-      let exprDoc =
-        let doc = printExpression expr1 in
-        if Parens.blockExpr expr1 then addParens doc else doc
-      in
-      let loc = expr1.pexp_loc in
-      collectRows ((loc, exprDoc)::acc) expr2
-    | Pexp_let (recFlag, valueBindings, expr) ->
-			let recFlag = match recFlag with
-			| Asttypes.Nonrecursive -> Doc.nil
-			| Asttypes.Recursive -> Doc.text "rec "
-			in
-      let letDoc = printValueBindings ~recFlag valueBindings in
-      let loc = match (valueBindings, List.rev valueBindings) with
-      | ({pvb_loc = firstLoc}::_,{pvb_loc = lastLoc}::_) ->
-          {firstLoc with loc_end = lastLoc.loc_end}
-      | _ -> Location.none
-      in
-      collectRows((loc, letDoc)::acc) expr
-    | _ ->
-      let exprDoc =
-        let doc = printExpression expr in
-        if Parens.blockExpr expr then addParens doc else doc
-      in
-      List.rev ((expr.pexp_loc, exprDoc)::acc)
-    in
-    let block = collectRows [] expr |> interleaveWhitespace ~forceBreak:true in
-    Doc.breakableGroup ~forceBreak:true (
-      if braces then
-        Doc.concat [
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              block;
-            ]
-          );
-          Doc.line;
-          Doc.rbrace;
-        ]
-      else block
-    )
-
-  and printOverrideFlag overrideFlag = match overrideFlag with
-    | Asttypes.Override -> Doc.text "!"
-    | Fresh -> Doc.nil
-
-  and printDirectionFlag flag = match flag with
-    | Asttypes.Downto -> Doc.text " downto "
-    | Asttypes.Upto -> Doc.text " to "
-
-  and printRecordRow (lbl, expr) =
-    Doc.concat [
-      printLongident lbl.txt;
-      Doc.text ": ";
-      printExpression expr;
-    ]
-
-  and printBsObjectRow (lbl, expr) =
-    Doc.concat [
-      Doc.text "\"";
-      printLongident lbl.txt;
-      Doc.text "\"";
-      Doc.text ": ";
-      printExpression expr;
-    ]
-  (* The optional loc indicates whether we need to print the attributes in
-   * relation to some location. In practise this means the following:
-   *  `@attr type t = string` -> on the same line, print on the same line
-   *  `@attr
-   *   type t = string` -> attr is on prev line, print the attributes
-   *   with a line break between, we respect the users' original layout *)
-  and printAttributes ?loc (attrs: Parsetree.attributes) =
-    match attrs with
-    | [] -> Doc.nil
-    | attrs ->
-      let lineBreak = match loc with
-      | None -> Doc.line
-      | Some loc -> begin match List.rev attrs with
-        | ({loc = firstLoc}, _)::_ when loc.loc_start.pos_lnum > firstLoc.loc_end.pos_lnum ->
-          Doc.literalLine;
-        | _ -> Doc.line
-        end
-      in
-      Doc.concat [
-        Doc.group (Doc.join ~sep:Doc.line (List.map printAttribute attrs));
-        lineBreak;
-      ]
-
-  and printAttribute ((id, payload) : Parsetree.attribute) =
-      let attrName = Doc.text ("@" ^ id.txt) in
-        match payload with
-      | PStr [{pstr_desc = Pstr_eval (expr, attrs)}] ->
-        let exprDoc = printExpression expr in
-        let needsParens = match attrs with | [] -> false | _ -> true in
-        Doc.group (
-          Doc.concat [
-            attrName;
-            addParens (
-              Doc.concat [
-                printAttributes attrs;
-                if needsParens then addParens exprDoc else exprDoc;
-              ]
-            )
-          ]
-        )
-      | _ -> attrName
-
-
-  and printModExpr modExpr =
-    match modExpr.pmod_desc with
-    | Pmod_ident longidentLoc ->
-      printLongident longidentLoc.txt
-    | Pmod_structure structure ->
-      Doc.breakableGroup ~forceBreak:true (
-        Doc.concat [
-          Doc.lbrace;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              printStructure structure;
-            ];
-          );
-          Doc.softLine;
-          Doc.rbrace;
-        ]
-      )
-    | Pmod_unpack expr ->
-      let shouldHug = match expr.pexp_desc with
-      | Pexp_let _ -> true
-      | Pexp_constraint (
-          {pexp_desc = Pexp_let _ },
-          {ptyp_desc = Ptyp_package packageType}
-        ) -> true
-      | _ -> false
-      in
-      let (expr, moduleConstraint) = match expr.pexp_desc with
-      | Pexp_constraint (
-          expr,
-          {ptyp_desc = Ptyp_package packageType}
-      ) ->
-        let typeDoc = Doc.group (Doc.concat [
-          Doc.text ":";
-          Doc.indent (
-            Doc.concat [
-              Doc.line;
-              printPackageType ~printModuleKeywordAndParens:false packageType
-            ]
-          )
-        ]) in
-        (expr, typeDoc)
-      | _ -> (expr, Doc.nil)
-      in
-      let unpackDoc = Doc.group(Doc.concat [
-        printExpression expr;
-        moduleConstraint;
-      ]) in
-      Doc.group (
-        Doc.concat [
-          Doc.text "unpack(";
-          if shouldHug then unpackDoc
-          else
-            Doc.concat [
-              Doc.indent (
-                Doc.concat [
-                  Doc.softLine;
-                  unpackDoc;
-                ]
-              );
-             Doc.softLine;
-            ];
-          Doc.rparen;
-        ]
-      )
-    | Pmod_extension extension ->
-      printExtension extension
-    | Pmod_apply _ ->
-      let (args, callExpr) = ParsetreeViewer.modExprApply modExpr in
-      let isUnitSugar = match args with
-      | [{pmod_desc = Pmod_structure []}] -> true
-      | _ -> false
-      in
-      let shouldHug = match args with
-      | [{pmod_desc = Pmod_structure _}] -> true
-      | _ -> false
-      in
-      Doc.group (
-        Doc.concat [
-          printModExpr callExpr;
-          if isUnitSugar then
-            printModApplyArg (List.hd args)
-          else
-            Doc.concat [
-              Doc.lparen;
-              if shouldHug then
-                printModApplyArg (List.hd args)
-              else
-                Doc.indent (
-                  Doc.concat [
-                    Doc.softLine;
-                    Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                      List.map printModApplyArg args
-                    )
-                  ]
-                );
-              if not shouldHug then
-                Doc.concat [
-                  Doc.trailingComma;
-                  Doc.softLine;
-                ]
-              else Doc.nil;
-              Doc.rparen;
-            ]
-        ]
-      )
-    | Pmod_constraint (modExpr, modType) ->
-      Doc.concat [
-        printModExpr modExpr;
-        Doc.text ": ";
-        printModType modType;
-      ]
-    | Pmod_functor _ ->
-      printModFunctor modExpr
-
-  and printModFunctor modExpr =
-    let (parameters, returnModExpr) = ParsetreeViewer.modExprFunctor modExpr in
-    (* let shouldInline = match returnModExpr.pmod_desc with *)
-    (* | Pmod_structure _ | Pmod_ident _ -> true *)
-    (* | Pmod_constraint ({pmod_desc = Pmod_structure _}, _) -> true *)
-    (* | _ -> false *)
-    (* in *)
-    let (returnConstraint, returnModExpr) = match returnModExpr.pmod_desc with
-    | Pmod_constraint (modExpr, modType) ->
-      let constraintDoc =
-        let doc = printModType modType in
-        if Parens.modExprFunctorConstraint modType then addParens doc else doc
-      in
-      let modConstraint = Doc.concat [
-        Doc.text ": ";
-        constraintDoc;
-      ] in
-      (modConstraint, printModExpr modExpr)
-    | _ -> (Doc.nil, printModExpr returnModExpr)
-    in
-    let parametersDoc = match parameters with
-    | [(attrs, {txt = "*"}, None)] ->
-        let attrs = match attrs with
-        | [] -> Doc.nil
-        | attrs -> Doc.concat [
-          Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-          Doc.line;
-        ] in
-        Doc.group (Doc.concat [
-          attrs;
-          Doc.text "()"
-        ])
-    | [([], {txt = lbl}, None)] -> Doc.text lbl
-    | parameters ->
-      Doc.group (
-        Doc.concat [
-          Doc.lparen;
-          Doc.indent (
-            Doc.concat [
-              Doc.softLine;
-              Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-                List.map printModFunctorParam parameters
-              )
-            ]
-          );
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rparen;
-        ]
-      )
-    in
-    Doc.group (
-      Doc.concat [
-        parametersDoc;
-        returnConstraint;
-        Doc.text " => ";
-        returnModExpr
-
-      ]
-    )
-
-  and printModFunctorParam (attrs, lbl, optModType) =
-    let attrs = match attrs with
-    | [] -> Doc.nil
-    | attrs -> Doc.concat [
-      Doc.join ~sep:Doc.line (List.map printAttribute attrs);
-      Doc.line;
-    ] in
-    Doc.group (
-      Doc.concat [
-        attrs;
-        Doc.text lbl.txt;
-        (match optModType with
-        | None -> Doc.nil
-        | Some modType ->
-          Doc.concat [
-            Doc.text ": ";
-            printModType modType
-          ]);
-      ]
-    )
-
-  and printModApplyArg modExpr =
-    match modExpr.pmod_desc with
-    | Pmod_structure [] -> Doc.text "()"
-    | _ -> printModExpr modExpr
-
-
-  and printExceptionDef (constr : Parsetree.extension_constructor) =
-    let kind = match constr.pext_kind with
-    | Pext_rebind {txt = longident} -> Doc.indent (
-        Doc.concat [
-          Doc.text " =";
-          Doc.line;
-          printLongident longident;
-        ]
-     )
-    | Pext_decl (Pcstr_tuple [], None) -> Doc.nil
-    | Pext_decl (args, gadt) ->
-      let gadtDoc = match gadt with
-      | Some typ -> Doc.concat [
-          Doc.text ": ";
-          printTypExpr typ;
-        ]
-      | None -> Doc.nil
-      in
-      Doc.concat [
-        printConstructorArguments args;
-        gadtDoc
-      ]
-    in
-    Doc.group (
-      Doc.concat [
-        printAttributes constr.pext_attributes;
-        Doc.text "exception ";
-        Doc.text constr.pext_name.txt;
-        kind
-      ]
-    )
-
-  and printExtensionConstructor i (constr : Parsetree.extension_constructor) =
-    let attrs = printAttributes constr.pext_attributes in
-    let bar = if i > 0 then Doc.text "| "
-      else Doc.ifBreaks (Doc.text "| ") Doc.nil
-    in
-    let kind = match constr.pext_kind with
-    | Pext_rebind {txt = longident} -> Doc.indent (
-        Doc.concat [
-          Doc.text " =";
-          Doc.line;
-          printLongident longident;
-        ]
-     )
-    | Pext_decl (Pcstr_tuple [], None) -> Doc.nil
-    | Pext_decl (args, gadt) ->
-      let gadtDoc = match gadt with
-      | Some typ -> Doc.concat [
-          Doc.text ": ";
-          printTypExpr typ;
-        ]
-      | None -> Doc.nil
-      in
-      Doc.concat [
-        printConstructorArguments args;
-        gadtDoc
-      ]
-    in
-    Doc.concat [
-      bar;
-      Doc.group (
-        Doc.concat [
-          attrs;
-          Doc.text constr.pext_name.txt;
-          kind;
-        ]
-      )
-    ]
-
-  let printImplementation (s: Parsetree.structure) comments src =
-    let t = CommentAst.initStructure s comments in
-
-    let stringDoc = Doc.toString ~width:80 (printStructure s) in
-    print_endline stringDoc;
-    print_newline()
-
-  let printInterface (s: Parsetree.signature) =
-    let stringDoc = Doc.toString ~width:80 (printSignature s) in
-    print_endline stringDoc;
-    print_newline()
-end
-
diff --git a/jscomp/syntax/benchmarks/data/RedBlackTree.ml b/jscomp/syntax/benchmarks/data/RedBlackTree.ml
deleted file mode 100644
index 6e2551c..0000000
--- a/jscomp/syntax/benchmarks/data/RedBlackTree.ml
+++ /dev/null
@@ -1,498 +0,0 @@
-type nonrec nodeColor =
-  | Red
-  | Black
-type 'value node =
-  {
-  mutable left: 'value node option ;
-  mutable right: 'value node option ;
-  mutable parent: 'value node option ;
-  mutable sum: float ;
-  mutable color: nodeColor ;
-  mutable height: float ;
-  mutable value: 'value }
-type nonrec 'value t =
-  {
-  mutable size: int ;
-  mutable root: 'value node option ;
-  compare: (('value -> 'value -> int)[@bs ]) }
-let createNode ~color  ~value  ~height  =
-  { left = None; right = None; parent = None; sum = 0.; height; value; color
-  }
-external castNotOption : 'a option -> 'a = "%identity"
-let updateSum node =
-  let leftSum = match node.left with | None -> 0. | Some left -> left.sum in
-  let rightSum = match node.right with | None -> 0. | Some right -> right.sum in
-  node.sum <- ((leftSum +. rightSum) +. node.height)
-let rec updateSumRecursive rbt node =
-  updateSum node;
-  (match node.parent with
-   | None -> ()
-   | Some parent -> rbt |. (updateSumRecursive parent))
-let grandParentOf node =
-  match node.parent with | None -> None | Some ref_ -> ref_.parent
-let isLeft node =
-  match node.parent with
-  | None -> false
-  | Some parent -> (Some node) == parent.left
-let leftOrRightSet ~node  x value =
-  ((if isLeft node then x.left <- value else x.right <- value)[@res.ternary ])
-let siblingOf node =
-  if isLeft node
-  then (castNotOption node.parent).right
-  else (castNotOption node.parent).left
-let uncleOf node =
-  match grandParentOf node with
-  | None -> None
-  | Some grandParentOfNode ->
-      if isLeft (castNotOption node.parent)
-      then grandParentOfNode.right
-      else grandParentOfNode.left
-let rec findNode rbt node value =
-  match node with
-  | None -> None
-  | Some node ->
-      let cmp = ((rbt.compare value node.value)[@bs ]) in
-      if cmp == 0
-      then Some node
-      else
-        if cmp < 0
-        then findNode rbt node.left value
-        else findNode rbt node.right value
-let has rbt value = (findNode rbt rbt.root value) != None
-let rec peekMinNode node =
-  match node with
-  | None -> None
-  | Some node ->
-      ((if node.left == None then Some node else node.left |. peekMinNode)
-      [@res.ternary ])
-let rec peekMaxNode node =
-  match node with
-  | None -> None
-  | Some node ->
-      ((if node.right == None then Some node else node.right |. peekMaxNode)
-      [@res.ternary ])
-let rotateLeft rbt node =
-  let parent = node.parent in
-  let right = node.right in
-  (match parent with
-   | Some parent -> parent |. (leftOrRightSet ~node right)
-   | None -> rbt.root <- right);
-  node.parent <- right;
-  (let right = right |. castNotOption in
-   let rightLeft = right.left in
-   node.right <- rightLeft;
-   (match rightLeft with
-    | Some rightLeft -> rightLeft.parent <- (Some node)
-    | None -> ());
-   right.parent <- parent;
-   right.left <- (Some node);
-   updateSum node;
-   updateSum right)
-let rotateRight rbt node =
-  let parent = node.parent in
-  let left = node.left in
-  (match parent with
-   | Some parent -> parent |. (leftOrRightSet ~node left)
-   | None -> rbt.root <- left);
-  node.parent <- left;
-  (let left = left |. castNotOption in
-   let leftRight = left.right in
-   node.left <- leftRight;
-   (match leftRight with
-    | Some leftRight -> leftRight.parent <- (Some node)
-    | None -> ());
-   left.parent <- parent;
-   left.right <- (Some node);
-   updateSum node;
-   updateSum left)
-let rec findInsert rbt node nodeToInsert value =
-  match node with
-  | None -> None
-  | Some node ->
-      let cmp = ((rbt.compare value node.value)[@bs ]) in
-      if cmp == 0
-      then Some node
-      else
-        if cmp < 0
-        then
-          (if node.left != None
-           then rbt |. (findInsert node.left nodeToInsert value)
-           else
-             (nodeToInsert.parent <- (Some node);
-              node.left <- (Some nodeToInsert);
-              None))
-        else
-          if node.right != None
-          then rbt |. (findInsert node.right nodeToInsert value)
-          else
-            (nodeToInsert.parent <- (Some node);
-             node.right <- (Some nodeToInsert);
-             None)
-let rec _addLoop rbt currentNode =
-  if (Some currentNode) == rbt.root
-  then currentNode.color <- Black
-  else
-    if (currentNode.parent |. castNotOption).color == Black
-    then ()
-    else
-      if
-        (let uncle = uncleOf currentNode in
-         (uncle != None) && ((uncle |. castNotOption).color == Red))
-      then
-        ((currentNode.parent |. castNotOption).color <- Black;
-         ((uncleOf currentNode) |. castNotOption).color <- Black;
-         ((grandParentOf currentNode) |. castNotOption).color <- Red;
-         _addLoop rbt ((grandParentOf currentNode) |. castNotOption))
-      else
-        (let currentNode =
-           if
-             (not (isLeft currentNode)) &&
-               (isLeft (currentNode.parent |. castNotOption))
-           then
-             (rotateLeft rbt (currentNode.parent |. castNotOption);
-              currentNode.left |. castNotOption)
-           else
-             if
-               (isLeft currentNode) &&
-                 (not (isLeft (currentNode.parent |. castNotOption)))
-             then
-               (rotateRight rbt (currentNode.parent |. castNotOption);
-                currentNode.right |. castNotOption)
-             else currentNode in
-         (currentNode.parent |. castNotOption).color <- Black;
-         ((grandParentOf currentNode) |. castNotOption).color <- Red;
-         if isLeft currentNode
-         then rotateRight rbt ((grandParentOf currentNode) |. castNotOption)
-         else rotateLeft rbt ((grandParentOf currentNode) |. castNotOption))
-let add rbt value ~height  =
-  rbt.size <- (rbt.size + 1);
-  (let nodeToInsert = createNode ~value ~color:Red ~height in
-   let inserted =
-     if rbt.root == None
-     then (rbt.root <- (Some nodeToInsert); true)
-     else
-       (let foundNode = findInsert rbt rbt.root nodeToInsert value in
-        foundNode == None) in
-   if inserted
-   then
-     (rbt |. (updateSumRecursive nodeToInsert);
-      _addLoop rbt nodeToInsert;
-      Some nodeToInsert)
-   else None)
-let removeNode rbt node =
-  let nodeToRemove =
-    match ((node.left), (node.right)) with
-    | (Some _, Some _) ->
-        let successor = (peekMinNode node.right) |. castNotOption in
-        (node.value <- (successor.value);
-         node.height <- (successor.height);
-         successor)
-    | _ -> node in
-  let successor =
-    match nodeToRemove.left with | None -> nodeToRemove.right | left -> left in
-  let (successor, isLeaf) =
-    match successor with
-    | None ->
-        let leaf = createNode ~value:([%bs.raw "0"]) ~color:Black ~height:0. in
-        let isLeaf = ((fun x -> x == leaf)[@bs ]) in (leaf, isLeaf)
-    | Some successor -> (successor, (((fun _ -> false))[@bs ])) in
-  let nodeParent = nodeToRemove.parent in
-  successor.parent <- nodeParent;
-  (match nodeParent with
-   | None -> ()
-   | Some parent ->
-       parent |. (leftOrRightSet ~node:nodeToRemove (Some successor)));
-  rbt |. (updateSumRecursive successor);
-  if nodeToRemove.color == Black
-  then
-    (if successor.color == Red
-     then
-       (successor.color <- Black;
-        if successor.parent == None then rbt.root <- (Some successor))
-     else
-       (let break = ref false in
-        let successorRef = ref successor in
-        while not break.contents do
-          let successor = successorRef.contents in
-          match successor.parent with
-          | None -> (rbt.root <- (Some successor); break.contents <- true)
-          | Some successorParent ->
-              let sibling = siblingOf successor in
-              (if
-                 (sibling != None) &&
-                   ((sibling |. castNotOption).color == Red)
-               then
-                 (successorParent.color <- Red;
-                  (sibling |. castNotOption).color <- Black;
-                  if isLeft successor
-                  then rotateLeft rbt successorParent
-                  else rotateRight rbt successorParent);
-               (let sibling = siblingOf successor in
-                let siblingNN = sibling |. castNotOption in
-                if
-                  (successorParent.color == Black) &&
-                    ((sibling == None) ||
-                       (((siblingNN.color == Black) &&
-                           ((siblingNN.left == None) ||
-                              ((siblingNN.left |. castNotOption).color ==
-                                 Black)))
-                          &&
-                          ((siblingNN.right == None) ||
-                             ((siblingNN.right |. castNotOption).color ==
-                                Black))))
-                then
-                  (if sibling != None then siblingNN.color <- Red;
-                   successorRef.contents <- successorParent)
-                else
-                  if
-                    (successorParent.color == Red) &&
-                      ((sibling == None) ||
-                         (((siblingNN.color == Black) &&
-                             ((siblingNN.left == None) ||
-                                ((siblingNN.left |. castNotOption).color ==
-                                   Black)))
-                            &&
-                            ((siblingNN.right == None) ||
-                               ((siblingNN.right |. castNotOption).color ==
-                                  Black))))
-                  then
-                    (if sibling != None then siblingNN.color <- Red;
-                     successorParent.color <- Black;
-                     break.contents <- true)
-                  else
-                    if
-                      (sibling != None) &&
-                        ((sibling |. castNotOption).color == Black)
-                    then
-                      (let sibling = sibling |. castNotOption in
-                       if
-                         (((isLeft successor) &&
-                             ((sibling.right == None) ||
-                                ((sibling.right |. castNotOption).color ==
-                                   Black)))
-                            && (sibling.left != None))
-                           && ((sibling.left |. castNotOption).color == Red)
-                       then
-                         (sibling.color <- Red;
-                          (sibling.left |. castNotOption).color <- Black;
-                          rotateRight rbt sibling)
-                       else
-                         if
-                           (((not (isLeft successor)) &&
-                               ((sibling.left == None) ||
-                                  ((sibling.left |. castNotOption).color ==
-                                     Black)))
-                              && (sibling.right != None))
-                             &&
-                             ((sibling.right |. castNotOption).color == Red)
-                         then
-                           (sibling.color <- Red;
-                            (sibling.right |. castNotOption).color <- Black;
-                            rotateLeft rbt sibling);
-                       break.contents <- true)
-                    else
-                      (let sibling = siblingOf successor in
-                       let sibling = sibling |. castNotOption in
-                       sibling.color <- (successorParent.color);
-                       if isLeft successor
-                       then
-                         ((sibling.right |. castNotOption).color <- Black;
-                          rotateRight rbt successorParent)
-                       else
-                         ((sibling.left |. castNotOption).color <- Black;
-                          rotateLeft rbt successorParent))))
-          done));
-  if ((isLeaf successor)[@bs ])
-  then
-    (if rbt.root == (Some successor) then rbt.root <- None;
-     (match successor.parent with
-      | None -> ()
-      | Some parent -> parent |. (leftOrRightSet ~node:successor None)))
-let remove rbt value =
-  match findNode rbt rbt.root value with
-  | Some node -> (rbt |. (removeNode node); rbt.size <- (rbt.size - 1); true)
-  | None -> false
-let rec findNodeThroughCallback rbt node cb =
-  match node with
-  | None -> None
-  | Some node ->
-      let cmp = ((cb node)[@bs ]) in
-      if cmp == 0
-      then Some node
-      else
-        if cmp < 0
-        then findNodeThroughCallback rbt node.left cb
-        else findNodeThroughCallback rbt node.right cb
-let removeThroughCallback rbt cb =
-  match findNodeThroughCallback rbt rbt.root cb with
-  | Some node -> (rbt |. (removeNode node); rbt.size <- (rbt.size - 1); true)
-  | None -> false
-let make ~compare  = { size = 0; root = None; compare }
-let makeWith array ~compare  =
-  let rbt = make ~compare in
-  array |.
-    (Js.Array2.forEach
-       (fun (value, height) -> (add rbt value ~height) |. ignore));
-  rbt
-let rec heightOfInterval rbt node lhs rhs =
-  match node with
-  | None -> 0.
-  | Some n ->
-      if (lhs == None) && (rhs == None)
-      then n.sum
-      else
-        if
-          (lhs != None) &&
-            (((rbt.compare n.value (lhs |. castNotOption))[@bs ]) < 0)
-        then rbt |. (heightOfInterval n.right lhs rhs)
-        else
-          if
-            (rhs != None) &&
-              (((rbt.compare n.value (rhs |. castNotOption))[@bs ]) > 0)
-          then rbt |. (heightOfInterval n.left lhs rhs)
-          else
-            (n.height +. (rbt |. (heightOfInterval n.left lhs None))) +.
-              (rbt |. (heightOfInterval n.right None rhs))
-let heightOfInterval rbt lhs rhs = heightOfInterval rbt rbt.root lhs rhs
-let rec firstVisibleNode node top =
-  match node with
-  | None -> None
-  | Some node ->
-      if node.sum <= top
-      then None
-      else
-        (let nodeHeight = node.height in
-         let sumLeft =
-           match node.left with | None -> 0.0 | Some left -> left.sum in
-         if sumLeft > top
-         then firstVisibleNode node.left top
-         else
-           if (sumLeft +. nodeHeight) > top
-           then Some node
-           else
-             (let offset = sumLeft +. nodeHeight in
-              firstVisibleNode node.right (top -. offset)))
-let lastVisibleNode node top =
-  match firstVisibleNode node top with
-  | None -> node |. peekMaxNode
-  | first -> first
-let firstVisibleValue rbt ~top  =
-  match firstVisibleNode rbt.root top with
-  | None -> None
-  | Some node -> Some (node.value)
-let rec leftmost node =
-  match node.left with | None -> node | Some node -> node |. leftmost
-let rec firstRightParent node =
-  match node.parent with
-  | None -> None
-  | Some parent ->
-      ((if isLeft node then Some parent else parent |. firstRightParent)
-      [@res.ternary ])
-let nextNode node =
-  match node.right with
-  | None -> node |. firstRightParent
-  | Some right -> Some (right |. leftmost)
-let rec sumLeftSpine node ~fromRightChild  =
-  let leftSpine =
-    match node.left with
-    | None -> node.height
-    | Some left -> ((if fromRightChild then node.height +. left.sum else 0.0)
-        [@res.ternary ]) in
-  match node.parent with
-  | None -> leftSpine
-  | Some parent ->
-      leftSpine +.
-        (parent |.
-           (sumLeftSpine ~fromRightChild:(parent.right == (Some node))))
-let getY node = (node |. (sumLeftSpine ~fromRightChild:true)) -. node.height
-let rec iterate ~inclusive  firstNode lastNode ~callback  =
-  match firstNode with
-  | None -> ()
-  | Some node ->
-      (if inclusive then ((callback node)[@bs ]);
-       if firstNode != lastNode
-       then
-         (if not inclusive then ((callback node)[@bs ]);
-          iterate ~inclusive (node |. nextNode) lastNode ~callback))
-let rec iterateWithY ?y  ~inclusive  firstNode lastNode ~callback  =
-  match firstNode with
-  | None -> ()
-  | Some node ->
-      let y = match y with | None -> node |. getY | Some y -> y in
-      (if inclusive then ((callback node y)[@bs ]);
-       if firstNode != lastNode
-       then
-         (if not inclusive then ((callback node y)[@bs ]);
-          iterateWithY ~y:(y +. node.height) ~inclusive (node |. nextNode)
-            lastNode ~callback))
-let rec updateSum node ~delta  =
-  match node with
-  | None -> ()
-  | Some node ->
-      (node.sum <- (node.sum +. delta); node.parent |. (updateSum ~delta))
-let updateHeight node ~height  =
-  let delta = height -. node.height in
-  node.height <- height; (Some node) |. (updateSum ~delta)
-type nonrec 'value oldNewVisible =
-  {
-  mutable old: 'value array ;
-  mutable new_: 'value array }
-let getAnchorDelta rbt ~anchor  =
-  match anchor with
-  | None -> 0.0
-  | Some (value, y) ->
-      (match rbt |. (findNode rbt.root value) with
-       | Some node -> y -. (node |. getY)
-       | None -> 0.0)
-let onChangedVisible ?(anchor= None)  rbt ~oldNewVisible  ~top:top_
-  ~bottom:bottom_  ~appear  ~remained  ~disappear  =
-  let old = oldNewVisible.new_ in
-  let new_ = oldNewVisible.old in
-  (new_ |.
-     (Js.Array2.removeCountInPlace ~pos:0 ~count:(new_ |. Js.Array2.length)))
-    |. ignore;
-  oldNewVisible.old <- old;
-  oldNewVisible.new_ <- new_;
-  (let anchorDelta = rbt |. (getAnchorDelta ~anchor) in
-   let top = top_ -. anchorDelta in
-   let top = ((if top < 0.0 then 0.0 else top)[@res.ternary ]) in
-   let bottom = bottom_ -. anchorDelta in
-   let first = firstVisibleNode rbt.root top in
-   let last = lastVisibleNode rbt.root bottom in
-   let oldLen = old |. Js.Array2.length in
-   let oldIter = ref 0 in
-   iterateWithY ~inclusive:true first last
-     ((fun node ->
-         fun y_ ->
-           let y = y_ +. anchorDelta in
-           if y >= 0.0
-           then
-             (while
-                (oldIter.contents < oldLen) &&
-                  (((rbt.compare (Js.Array2.unsafe_get old oldIter.contents)
-                       node.value)
-                     [@bs ]) < 0)
-                do
-                (((disappear (Js.Array2.unsafe_get old oldIter.contents))
-                 [@bs ]);
-                 oldIter.contents <- (oldIter.contents + 1))
-                done;
-              (new_ |. (Js.Array2.push node.value)) |. ignore;
-              if oldIter.contents < oldLen
-              then
-                (let cmp =
-                   ((rbt.compare (Js.Array2.unsafe_get old oldIter.contents)
-                       node.value)
-                   [@bs ]) in
-                 if cmp = 0
-                 then
-                   (((remained node y)
-                    [@bs ]);
-                    oldIter.contents <- (oldIter.contents + 1))
-                 else ((appear node y)[@bs ]))
-              else ((appear node y)[@bs ])))[@bs ]);
-   while oldIter.contents < oldLen do
-     (((disappear (Js.Array2.unsafe_get old oldIter.contents))
-      [@bs ]);
-      oldIter.contents <- (oldIter.contents + 1))
-     done)
diff --git a/jscomp/syntax/benchmarks/data/RedBlackTree.res b/jscomp/syntax/benchmarks/data/RedBlackTree.res
deleted file mode 100644
index fbf68c2..0000000
--- a/jscomp/syntax/benchmarks/data/RedBlackTree.res
+++ /dev/null
@@ -1,751 +0,0 @@
-/*
-Credit to Wikipedia's article on [Red-black
-tree](http://en.wikipedia.org/wiki/Red–black_tree)
-
-**Note:** doesn't handle duplicate entries. This is by design.
-
-## Overview example:
-
-```
-var rbt = new RedBlackTree([7, 5, 1, 8])
-rbt.add(2) // => 2
-rbt.add(10) // => 10
-rbt.has(5) // => true
-rbt.remove(8) // => 8
-```
-
-## Properties:
-
-- size: The total number of items.
-*/
-
-type nodeColor =
-  | Red
-  | Black
-
-/*
-Property of a red-black tree, taken from Wikipedia:
-1. A node is either red or black.
-2. Root is black.
-3. Leaves are all null and considered black.
-4. Both children of a red node are black.
-5. Every path from a node to any of its descendent leaves contains the same
-number of black nodes.
-*/
-
-type rec node<'value> = {
-  mutable left: option<node<'value>>,
-  mutable right: option<node<'value>>,
-  mutable parent: option<node<'value>>,
-  mutable sum: float,
-  mutable color : nodeColor,
-  mutable height: float,
-  mutable value: 'value,
-}
-
-type t<'value> = {
-  mutable size: int,
-  mutable root: option<node<'value>>,
-  compare: (. 'value, 'value) => int,
-}
-
-let createNode = (~color, ~value, ~height) =>
-  {left:None, right:None, parent:None, sum:0., height, value, color}
-
-external castNotOption: option<'a> => 'a = "%identity"
-
-let updateSum = (node) => {
-  let leftSum = switch node.left {
-  | None => 0.
-  | Some(left) => left.sum
-  }
-  let rightSum = switch node.right {
-  | None => 0.
-  | Some(right) => right.sum
-  }
-  node.sum = leftSum +. rightSum +. node.height
-}
-
-/* Update the sum for the node and parents recursively. */
-let rec updateSumRecursive = (rbt, node) => {
-  updateSum(node)
-  switch node.parent {
-  | None => ()
-  | Some(parent) =>
-    rbt->updateSumRecursive(parent)
-  }
-}
-
-let grandParentOf = node => {
-  switch node.parent {
-  | None => None
-  | Some(ref_) => ref_.parent
-  }
-}
-
-let isLeft = node => {
-  switch node.parent {
-  | None => false
-  | Some(parent) => Some(node) === parent.left
-  }
-}
-
-let leftOrRightSet = (~node, x, value) => {
-  isLeft(node) ? x.left=value : x.right=value
-}
-
-let siblingOf = node => {
-  if isLeft(node) {
-    castNotOption(node.parent).right
-  } else {
-    castNotOption(node.parent).left
-  }
-}
-
-let uncleOf = node => {
-  switch grandParentOf(node) {
-  | None => None
-  | Some(grandParentOfNode) =>
-    if isLeft(castNotOption(node.parent)) {
-      grandParentOfNode.right
-    } else {
-      grandParentOfNode.left
-    }
-  }
-}
-
-let rec findNode = (rbt, node, value) => {
-  switch node {
-  | None => None
-  | Some(node) =>
-    let cmp = rbt.compare(. value, node.value)
-    if cmp === 0 {
-      Some(node)
-    } else if cmp < 0 {
-      findNode(rbt, node.left, value)
-    } else {
-      findNode(rbt, node.right, value)
-    }
-  }
-}
-
-let has = (rbt, value) => findNode(rbt, rbt.root, value) !== None
-
-let rec peekMinNode = node => switch node {
-  | None => None
-  | Some(node) =>
-    node.left === None ? Some(node) : node.left->peekMinNode
-}
-
-let rec peekMaxNode = node => switch node {
-  | None => None
-  | Some(node) =>
-    node.right === None ? Some(node) : node.right->peekMaxNode
-}
-
-let rotateLeft = (rbt, node) => {
-  let parent = node.parent
-  let right = node.right
-  switch parent {
-    | Some(parent) =>
-      parent->leftOrRightSet(~node, right)
-    | None =>
-      rbt.root = right
-  }
-  node.parent = right
-  let right = right->castNotOption // precondition
-  let rightLeft = right.left
-  node.right = rightLeft
-  switch rightLeft {
-    | Some(rightLeft) =>
-      rightLeft.parent = Some(node)
-    | None =>
-      ()
-  }
-  right.parent = parent
-  right.left = Some(node)
-  updateSum(node)
-  updateSum(right)
-}
-
-let rotateRight = (rbt, node) => {
-  let parent = node.parent
-  let left = node.left
-  switch parent {
-    | Some(parent) =>
-      parent->leftOrRightSet(~node, left)
-    | None =>
-      rbt.root = left
-  }
-  node.parent = left
-  let left = left->castNotOption // precondition
-  let leftRight = left.right
-  node.left = leftRight
-  switch leftRight {
-    | Some(leftRight) =>
-      leftRight.parent = Some(node)
-    | None =>
-      ()
-  }
-  left.parent = parent
-  left.right = Some(node)
-  updateSum(node)
-  updateSum(left)
-}
-
-let rec findInsert = (rbt, node, nodeToInsert, value) => {
-  switch node {
-    | None => None
-    | Some(node) => {
-      let cmp = rbt.compare(. value, node.value)
-      if cmp === 0 {
-        Some(node)
-      } else {
-        if cmp < 0 {
-          if node.left !== None {
-            rbt->findInsert(node.left, nodeToInsert, value)
-          } else {
-            nodeToInsert.parent = Some(node)
-            node.left = Some(nodeToInsert)
-            None
-          }
-        } else {
-          if node.right !== None {
-            rbt->findInsert(node.right, nodeToInsert, value)
-          } else {
-            nodeToInsert.parent = Some(node)
-            node.right = Some(nodeToInsert)
-            None
-          }
-        }
-      }
-    }
-  }
-}
-
-// After adding the node, we need to operate on it to preserve the tree's
-// properties by filtering it through a series of cases. It'd be easier if
-// there's tail recursion in JavaScript, as some cases fix the node but
-// restart the cases on the node's ancestor. We'll have to use loops for now.
-
-let rec _addLoop = (rbt, currentNode) => {
-  // Case 1: node is root. Violates 1. Paint it black.
-  if Some(currentNode) === rbt.root {
-    currentNode.color = Black
-  }
-
-  // Case 2: parent black. No properties violated. After that, parent is sure
-  // to be red.
-  else if (currentNode.parent->castNotOption).color === Black {
-    ()
-  }
-
-  // Case 3: if node's parent and uncle are red, they are painted black.
-  // Their parent (node's grandparent) should be painted red, and the
-  // grandparent red. Note that node certainly has a grandparent, since at
-  // this point, its parent's red, which can't be the root.
-
-  // After the painting, the grandparent might violate 2 or 4.
-  else if({
-      let uncle = uncleOf(currentNode)
-      uncle !== None && (uncle->castNotOption).color === Red
-    }) {
-    (currentNode.parent->castNotOption).color = Black
-    (uncleOf(currentNode)->castNotOption).color = Black
-    (grandParentOf(currentNode)->castNotOption).color = Red
-    _addLoop(rbt, grandParentOf(currentNode)->castNotOption)
-  }
-  else {
-    // At this point, uncle is either black or doesn't exist.
-
-    // Case 4: parent red, uncle black, node is right child, parent is left
-    // child. Do a left rotation. Then, former parent passes through case 5.
-    let currentNode =
-      if !isLeft(currentNode) && isLeft(currentNode.parent->castNotOption) {
-        rotateLeft(rbt, currentNode.parent->castNotOption)
-        currentNode.left->castNotOption
-      } else if isLeft(currentNode) && !isLeft(currentNode.parent->castNotOption) {
-        rotateRight(rbt, currentNode.parent->castNotOption)
-        currentNode.right->castNotOption
-      } else {
-        currentNode
-      }
-
-    // Case 5: parent red, uncle black, node is left child, parent is left
-    // child. Right rotation. Switch parent and grandparent's color.
-    (currentNode.parent->castNotOption).color = Black
-    (grandParentOf(currentNode)->castNotOption).color = Red
-    if isLeft(currentNode) {
-      rotateRight(rbt, grandParentOf(currentNode)->castNotOption)
-    } else {
-      rotateLeft(rbt, grandParentOf(currentNode)->castNotOption)
-    }
-  }
-}
-
-let add = (rbt, value, ~height) => {
-  // Again, make sure to not pass a value already in the tree.
-  //
-  // _Returns:_ value added.
-  rbt.size = rbt.size + 1
-  let nodeToInsert = createNode(~value, ~color=Red, ~height)
-  let inserted =
-    if rbt.root === None {
-      rbt.root = Some(nodeToInsert)
-      true
-    }
-    else {
-      let foundNode = findInsert(rbt, rbt.root, nodeToInsert, value)
-      foundNode === None
-    }
-  if inserted {
-    rbt->updateSumRecursive(nodeToInsert)
-
-    _addLoop(rbt, nodeToInsert)
-    Some(nodeToInsert)
-  } else {
-    None
-  }
-}
-
-
-// To simplify removal cases, we can notice this:
-// 1. Node has no child.
-// 2. Node has two children. Select the smallest child on the right branch
-// (leftmost) and copy its value into the node to delete. This replacement node
-// certainly has less than two children or it wouldn't be the smallest. Then
-// delete this replacement node.
-// 3. Node has one child.
-// They all come down to removing a node with maximum one child.
-let removeNode = (rbt, node) => {
-  let nodeToRemove =
-    switch (node.left, node.right) {
-    | (Some(_), Some(_)) =>
-      let successor = peekMinNode(node.right)->castNotOption
-      node.value = successor.value
-      node.height = successor.height
-      successor
-    | _ => node
-    }
-  // At this point, the node to remove has only one child.
-  let successor = switch nodeToRemove.left {
-  | None => nodeToRemove.right
-  | left => left
-  }
-  let (successor, isLeaf) = switch successor {
-    | None =>
-      let leaf = createNode(~value=%bs.raw("0"), ~color=Black, ~height=0.)
-      let isLeaf = (. x) => x === leaf;
-      (leaf, isLeaf)
-    | Some(successor) =>
-      (successor, (. _) => false)
-  }
-  let nodeParent = nodeToRemove.parent
-  successor.parent = nodeParent
-  switch nodeParent {
-  | None => ()
-  | Some(parent) =>
-    parent->leftOrRightSet(~node=nodeToRemove, Some(successor))
-  }
-
-  rbt->updateSumRecursive(successor)
-
-  // We're done if node's red. If it's black and its child that took its place
-  // is red, change it to black. If both are black, we do cases checking like
-  // in insert.
-  if nodeToRemove.color === Black {
-    if successor.color === Red {
-      successor.color = Black
-      if successor.parent === None {
-        rbt.root = Some(successor)
-      }
-    } else {
-      let break = ref(false)
-      let successorRef = ref(successor)
-      while !break.contents {
-        let successor = successorRef.contents
-        // Case 1: node is root. Done.
-        switch successor.parent {
-        | None =>
-          rbt.root = Some(successor)
-          break.contents = true
-        | Some(successorParent) =>
-          // Case 2: sibling red. Flip color of P and S. Left rotate P.
-          let sibling = siblingOf(successor)
-          if sibling !== None && (sibling->castNotOption).color === Red {
-            successorParent.color = Red
-            (sibling->castNotOption).color = Black
-            if isLeft(successor) {
-              rotateLeft(rbt, successorParent)
-            } else {
-              rotateRight(rbt, successorParent)
-            }
-          }
-
-          // Case 3: parent, sibling and sibling children all black. Paint
-          // sibling red. Rebalance parent.
-          let sibling = siblingOf(successor)
-          let siblingNN = sibling->castNotOption
-          if
-            successorParent.color === Black &&
-            ( sibling === None ||
-              ( siblingNN.color === Black &&
-                ( siblingNN.left === None ||
-                  (siblingNN.left->castNotOption).color === Black ) &&
-                ( siblingNN.right === None ||
-                  (siblingNN.right->castNotOption).color === Black)))
-             {
-            if sibling !== None {
-              siblingNN.color = Red
-            }
-            successorRef.contents = successorParent
-            // continue
-          } else if
-            // Case 4: sibling and sibling children black. Node parent red. Swap
-            // color of sibling and node parent.
-            successorParent.color === Red &&
-            ( sibling === None ||
-              ( siblingNN.color === Black &&
-              ( siblingNN.left === None ||
-                (siblingNN.left->castNotOption).color === Black) &&
-              ( siblingNN.right === None ||
-                (siblingNN.right->castNotOption).color === Black)))
-             {
-            if sibling !== None {
-              siblingNN.color = Red
-            }
-            successorParent.color = Black
-            break.contents = true
-          } else if
-            // Case 5: sibling black, sibling left child red, right child black,
-            // node is left child. Rotate right sibling. Swap color of sibling and
-            // its new parent.
-            sibling !== None && (sibling->castNotOption).color === Black
-             {
-            let sibling = sibling->castNotOption
-            if
-              isLeft(successor) &&
-              (sibling.right === None || (sibling.right->castNotOption).color === Black) &&
-              sibling.left !== None &&
-              (sibling.left->castNotOption).color === Red {
-              sibling.color = Red
-              (sibling.left->castNotOption).color = Black
-              rotateRight(rbt, sibling)
-            } else if
-              !isLeft(successor) &&
-              (sibling.left === None || (sibling.left->castNotOption).color === Black) &&
-              sibling.right !== None &&
-              (sibling.right->castNotOption).color === Red
-               {
-              sibling.color = Red
-              (sibling.right->castNotOption).color = Black
-              rotateLeft(rbt, sibling)
-            }
-            break.contents = true
-          } else {
-            // Case 6: sibling black, sibling right child red, node is left child.
-            // Rotate left node parent. Swap color of parent and sibling. Paint
-            // sibling right child black.
-            let sibling = siblingOf(successor)
-            let sibling = sibling->castNotOption
-            sibling.color = successorParent.color
-            if isLeft(successor) {
-              (sibling.right->castNotOption).color = Black
-              rotateRight(rbt, successorParent)
-            } else {
-              (sibling.left->castNotOption).color = Black
-              rotateLeft(rbt, successorParent)
-            }
-          }
-        }
-      }
-    }
-  }
-  // Don't forget to detatch the artificially created leaf.
-  if isLeaf(. successor) {
-    if rbt.root === Some(successor) {
-      rbt.root = None
-    }
-    switch successor.parent {
-    | None => ()
-    | Some(parent) =>
-      parent->leftOrRightSet(~node=successor, None)
-    }
-  }
-}
-
-let remove = (rbt, value) => {
-  switch findNode(rbt, rbt.root, value) {
-    | Some(node) =>
-      rbt->removeNode(node)
-      rbt.size = rbt.size - 1
-      true
-    | None =>
-      false
-  }
-}
-
-let rec findNodeThroughCallback = (rbt, node, cb) => {
-  switch node {
-  | None => None
-  | Some(node) =>
-    let cmp = cb(. node)
-    if cmp === 0 {
-      Some(node)
-    } else if cmp < 0 {
-      findNodeThroughCallback(rbt, node.left, cb)
-    } else {
-      findNodeThroughCallback(rbt, node.right, cb)
-    }
-  }
-}
-
-let removeThroughCallback = (rbt, cb) => {
-  switch findNodeThroughCallback(rbt, rbt.root, cb) {
-    | Some(node) =>
-      rbt->removeNode(node)
-      rbt.size = rbt.size - 1
-      true
-    | None =>
-      false
-  }
-}
-
-let make = (~compare) => {size: 0, root: None, compare}
-
-let makeWith = (array, ~compare) => {
-  let rbt = make(~compare)
-  array->Js.Array2.forEach(((value, height)) => add(rbt,value, ~height)->ignore)
-  rbt
-}
-
-// sum of the heights of the elements in [lhs ... rhs]
-// both lhs and rhs are optional
-let rec heightOfInterval = (rbt, node, lhs, rhs) => {
-  switch node {
-  | None => 0.
-  | Some(n) =>
-    //Js.log4("heightOfInterval n:", n.value, lhs, rhs)
-    if lhs === None && rhs === None {
-      n.sum
-    } else if lhs !== None && rbt.compare(. n.value, lhs->castNotOption) < 0 {
-      // to the lhs of the interval
-      rbt->heightOfInterval(n.right, lhs, rhs)
-    } else if rhs !== None && rbt.compare(. n.value, rhs->castNotOption) > 0 {
-      // to the rhs of the interval
-      rbt->heightOfInterval(n.left, lhs, rhs)
-    } else {
-      // in the interval
-      n.height +.
-      rbt->heightOfInterval(n.left, lhs, None) +.
-      rbt->heightOfInterval(n.right, None, rhs)
-    }
-  }
-}
-
-let heightOfInterval = (rbt, lhs, rhs) => {
-  //Js.log("-----------")
-  heightOfInterval(rbt, rbt.root, lhs, rhs)
-}
-
-// Return a node at y such that y <= top < y + node.height
-let rec firstVisibleNode = (node, top) => {
-  switch node {
-  | None => None
-  | Some(node) =>
-    //Js.log4("firstVisibleNode", node.value, "top:", top)
-    if node.sum <= top {
-    // no node is visible
-    None
-    } else {
-      let nodeHeight = node.height
-      let sumLeft = switch node.left {
-        | None => 0.0
-        | Some(left) => left.sum
-      }
-      if sumLeft > top {
-        firstVisibleNode(node.left, top)
-      } else if sumLeft +. nodeHeight > top {
-        // found
-        Some(node)
-      } else {
-        let offset = sumLeft +. nodeHeight
-        firstVisibleNode(node.right, top -. offset)
-      }
-    }
-  }
-}
-
-let lastVisibleNode = (node, top) => {
-  switch firstVisibleNode(node, top) {
-  | None =>
-    node->peekMaxNode
-  | first => first
-  }
-}
-
-// Find the value of the first visible node starting from top
-let firstVisibleValue = (rbt, ~top) =>
-  switch firstVisibleNode(rbt.root, top) {
-  | None => None
-  | Some(node) => Some(node.value)
-}
-
-let rec leftmost = node => switch node.left {
-  | None => node
-  | Some(node) => node->leftmost
-}
-
-let rec firstRightParent = node => {
-  switch node.parent {
-    | None => None
-    | Some(parent) =>
-      isLeft(node) ? Some(parent) : parent->firstRightParent
-  }
-}
-
-let nextNode = node => {
-  switch node.right {
-  | None =>
-    node->firstRightParent
-  | Some(right) =>
-    Some(right->leftmost)
-  }
-}
-
-let rec sumLeftSpine = (node, ~fromRightChild) => {
-  let leftSpine = switch node.left {
-    | None => node.height
-    | Some(left) => fromRightChild ? node.height +. left.sum : 0.0
-  }
-  switch node.parent {
-  | None =>
-    leftSpine
-  | Some(parent) =>
-    leftSpine +. parent->sumLeftSpine(~fromRightChild = parent.right === Some(node))
-  }
-}
-
-let getY = node =>
-  node->sumLeftSpine(~fromRightChild=true) -. node.height
-
-let rec iterate = (~inclusive, firstNode, lastNode, ~callback) => {
-  switch firstNode {
-    | None => ()
-    | Some(node) =>
-      if inclusive { callback(. node) }
-      if firstNode !== lastNode {
-        if !inclusive { callback (.node) }
-        iterate(~inclusive, node->nextNode, lastNode, ~callback)
-      }
-  }
-}
-
-let rec iterateWithY = (~y=?, ~inclusive, firstNode, lastNode, ~callback) => {
-  switch firstNode {
-    | None => ()
-    | Some(node) =>
-      let y = switch y {
-        | None => node->getY
-        | Some(y) => y
-      }
-      if inclusive {
-        callback(. node, y)
-      }
-      if firstNode !== lastNode {
-        if !inclusive {
-          callback (.node, y)
-        }
-        iterateWithY(~y=y+.node.height, ~inclusive, node->nextNode, lastNode, ~callback)
-      }
-  }
-}
-
-let rec updateSum = (node, ~delta) => switch node {
-  | None => ()
-  | Some(node) =>
-    node.sum = node.sum +. delta
-    node.parent->updateSum(~delta)
-}
-
-let updateHeight = (node, ~height) => {
-  let delta = height -. node.height
-  node.height = height
-  Some(node)->updateSum(~delta)
-}
-
-type oldNewVisible<'value> = {
-  mutable old: array<'value>,
-  mutable new: array<'value>,
-};
-
-let getAnchorDelta = (rbt, ~anchor) => {
-  switch anchor {
-    | None => 0.0
-    | Some((value, y)) =>
-      switch rbt->findNode(rbt.root, value) {
-        | Some(node) => y -. node->getY
-        | None => 0.0
-      }
-  }
-}
-
-let onChangedVisible =
-    (
-      ~anchor=None,
-      rbt,
-      ~oldNewVisible,
-      ~top as top_,
-      ~bottom as bottom_,
-      ~appear,
-      ~remained,
-      ~disappear,
-    ) =>
- {
-  let old = oldNewVisible.new
-  let new = oldNewVisible.old
-  // empty new
-  new->Js.Array2.removeCountInPlace(~pos=0, ~count=new->Js.Array2.length)->ignore
-  oldNewVisible.old = old
-  oldNewVisible.new = new
-
-  let anchorDelta = rbt->getAnchorDelta(~anchor)
-  //Js.log2("anchorDelta", anchorDelta)
-  let top = top_ -. anchorDelta
-  let top = top < 0.0 ? 0.0 : top // anchoring can make top negative
-  let bottom = bottom_ -. anchorDelta
-
-  let first = firstVisibleNode(rbt.root, top)
-  let last = lastVisibleNode(rbt.root, bottom)
-
-  let oldLen = old->Js.Array2.length
-  let oldIter = ref(0)
-  iterateWithY(~inclusive=true, first, last, ~callback=(. node, y_) => {
-    let y = y_ +. anchorDelta
-    if y >= 0.0 { // anchoring can make y negative
-      while (
-        oldIter.contents < oldLen &&
-        rbt.compare(. Js.Array2.unsafe_get(old, oldIter.contents), node.value) < 0
-      ) {
-        disappear(. Js.Array2.unsafe_get(old, oldIter.contents))
-        oldIter.contents = oldIter.contents + 1
-      }
-      new->Js.Array2.push(node.value)->ignore
-      if (oldIter.contents < oldLen) {
-        let cmp = rbt.compare(. Js.Array2.unsafe_get(old, oldIter.contents), node.value)
-        if cmp == 0 {
-          remained(. node, y)
-          oldIter.contents = oldIter.contents + 1
-        } else {
-          appear(. node, y)
-        }
-      } else {
-        appear(. node, y)
-      }
-    }
-  })
-  while (oldIter.contents < oldLen) {
-    disappear(. Js.Array2.unsafe_get(old, oldIter.contents))
-    oldIter.contents = oldIter.contents + 1
-  }
-};
diff --git a/jscomp/syntax/benchmarks/data/RedBlackTreeNoComments.res b/jscomp/syntax/benchmarks/data/RedBlackTreeNoComments.res
deleted file mode 100644
index 67a2a54..0000000
--- a/jscomp/syntax/benchmarks/data/RedBlackTreeNoComments.res
+++ /dev/null
@@ -1,643 +0,0 @@
-type nodeColor =
-  | Red
-  | Black
-
-type rec node<'value> = {
-  mutable left: option<node<'value>>,
-  mutable right: option<node<'value>>,
-  mutable parent: option<node<'value>>,
-  mutable sum: float,
-  mutable color: nodeColor,
-  mutable height: float,
-  mutable value: 'value,
-}
-
-type t<'value> = {
-  mutable size: int,
-  mutable root: option<node<'value>>,
-  compare: (. 'value, 'value) => int,
-}
-
-let createNode = (~color, ~value, ~height) => {
-  left: None,
-  right: None,
-  parent: None,
-  sum: 0.,
-  height: height,
-  value: value,
-  color: color,
-}
-
-external castNotOption: option<'a> => 'a = "%identity"
-
-let updateSum = node => {
-  let leftSum = switch node.left {
-  | None => 0.
-  | Some(left) => left.sum
-  }
-  let rightSum = switch node.right {
-  | None => 0.
-  | Some(right) => right.sum
-  }
-  node.sum = leftSum +. rightSum +. node.height
-}
-
-let rec updateSumRecursive = (rbt, node) => {
-  updateSum(node)
-  switch node.parent {
-  | None => ()
-  | Some(parent) => rbt->updateSumRecursive(parent)
-  }
-}
-
-let grandParentOf = node =>
-  switch node.parent {
-  | None => None
-  | Some(ref_) => ref_.parent
-  }
-
-let isLeft = node =>
-  switch node.parent {
-  | None => false
-  | Some(parent) => Some(node) === parent.left
-  }
-
-let leftOrRightSet = (~node, x, value) =>
-  isLeft(node)
-    ? x.left = value
-    : x.right = value
-
-let siblingOf = node =>
-  if isLeft(node) {
-    castNotOption(node.parent).right
-  } else {
-    castNotOption(node.parent).left
-  }
-
-let uncleOf = node =>
-  switch grandParentOf(node) {
-  | None => None
-  | Some(grandParentOfNode) =>
-    if isLeft(castNotOption(node.parent)) {
-      grandParentOfNode.right
-    } else {
-      grandParentOfNode.left
-    }
-  }
-
-let rec findNode = (rbt, node, value) =>
-  switch node {
-  | None => None
-  | Some(node) =>
-    let cmp = rbt.compare(. value, node.value)
-    if cmp === 0 {
-      Some(node)
-    } else if cmp < 0 {
-      findNode(rbt, node.left, value)
-    } else {
-      findNode(rbt, node.right, value)
-    }
-  }
-
-let has = (rbt, value) => findNode(rbt, rbt.root, value) !== None
-
-let rec peekMinNode = node =>
-  switch node {
-  | None => None
-  | Some(node) => node.left === None ? Some(node) : node.left->peekMinNode
-  }
-
-let rec peekMaxNode = node =>
-  switch node {
-  | None => None
-  | Some(node) => node.right === None ? Some(node) : node.right->peekMaxNode
-  }
-
-let rotateLeft = (rbt, node) => {
-  let parent = node.parent
-  let right = node.right
-  switch parent {
-  | Some(parent) => parent->leftOrRightSet(~node, right)
-  | None => rbt.root = right
-  }
-  node.parent = right
-  let right = right->castNotOption
-  let rightLeft = right.left
-  node.right = rightLeft
-  switch rightLeft {
-  | Some(rightLeft) => rightLeft.parent = Some(node)
-  | None => ()
-  }
-  right.parent = parent
-  right.left = Some(node)
-  updateSum(node)
-  updateSum(right)
-}
-
-let rotateRight = (rbt, node) => {
-  let parent = node.parent
-  let left = node.left
-  switch parent {
-  | Some(parent) => parent->leftOrRightSet(~node, left)
-  | None => rbt.root = left
-  }
-  node.parent = left
-  let left = left->castNotOption
-  let leftRight = left.right
-  node.left = leftRight
-  switch leftRight {
-  | Some(leftRight) => leftRight.parent = Some(node)
-  | None => ()
-  }
-  left.parent = parent
-  left.right = Some(node)
-  updateSum(node)
-  updateSum(left)
-}
-
-let rec findInsert = (rbt, node, nodeToInsert, value) =>
-  switch node {
-  | None => None
-  | Some(node) =>
-    let cmp = rbt.compare(. value, node.value)
-    if cmp === 0 {
-      Some(node)
-    } else if cmp < 0 {
-      if node.left !== None {
-        rbt->findInsert(node.left, nodeToInsert, value)
-      } else {
-        nodeToInsert.parent = Some(node)
-        node.left = Some(nodeToInsert)
-        None
-      }
-    } else if node.right !== None {
-      rbt->findInsert(node.right, nodeToInsert, value)
-    } else {
-      nodeToInsert.parent = Some(node)
-      node.right = Some(nodeToInsert)
-      None
-    }
-  }
-
-let rec _addLoop = (rbt, currentNode) =>
-  if Some(currentNode) === rbt.root {
-    currentNode.color = Black
-  } else if (currentNode.parent->castNotOption).color === Black {
-    ()
-  } else if {
-    let uncle = uncleOf(currentNode)
-    uncle !== None && (uncle->castNotOption).color === Red
-  } {
-    (currentNode.parent->castNotOption).color = Black
-    (uncleOf(currentNode)->castNotOption).color = Black
-    (grandParentOf(currentNode)->castNotOption).color = Red
-    _addLoop(rbt, grandParentOf(currentNode)->castNotOption)
-  } else {
-    let currentNode = if (
-      !isLeft(currentNode) && isLeft(currentNode.parent->castNotOption)
-    ) {
-      rotateLeft(rbt, currentNode.parent->castNotOption)
-      currentNode.left->castNotOption
-    } else if (
-      isLeft(currentNode) && !isLeft(currentNode.parent->castNotOption)
-    ) {
-      rotateRight(rbt, currentNode.parent->castNotOption)
-      currentNode.right->castNotOption
-    } else {
-      currentNode
-    }
-
-    (currentNode.parent->castNotOption).color = Black
-    (grandParentOf(currentNode)->castNotOption).color = Red
-    if isLeft(currentNode) {
-      rotateRight(rbt, grandParentOf(currentNode)->castNotOption)
-    } else {
-      rotateLeft(rbt, grandParentOf(currentNode)->castNotOption)
-    }
-  }
-
-let add = (rbt, value, ~height) => {
-  rbt.size = rbt.size + 1
-  let nodeToInsert = createNode(~value, ~color=Red, ~height)
-  let inserted = if rbt.root === None {
-    rbt.root = Some(nodeToInsert)
-    true
-  } else {
-    let foundNode = findInsert(rbt, rbt.root, nodeToInsert, value)
-    foundNode === None
-  }
-  if inserted {
-    rbt->updateSumRecursive(nodeToInsert)
-
-    _addLoop(rbt, nodeToInsert)
-    Some(nodeToInsert)
-  } else {
-    None
-  }
-}
-
-let removeNode = (rbt, node) => {
-  let nodeToRemove = switch (node.left, node.right) {
-  | (Some(_), Some(_)) =>
-    let successor = peekMinNode(node.right)->castNotOption
-    node.value = successor.value
-    node.height = successor.height
-    successor
-  | _ => node
-  }
-
-  let successor = switch nodeToRemove.left {
-  | None => nodeToRemove.right
-  | left => left
-  }
-  let (successor, isLeaf) = switch successor {
-  | None =>
-    let leaf = createNode(~value=%bs.raw("0"), ~color=Black, ~height=0.)
-    let isLeaf = (. x) => x === leaf
-    (leaf, isLeaf)
-  | Some(successor) => (successor, (. _) => false)
-  }
-  let nodeParent = nodeToRemove.parent
-  successor.parent = nodeParent
-  switch nodeParent {
-  | None => ()
-  | Some(parent) => parent->leftOrRightSet(~node=nodeToRemove, Some(successor))
-  }
-
-  rbt->updateSumRecursive(successor)
-
-  if nodeToRemove.color === Black {
-    if successor.color === Red {
-      successor.color = Black
-      if successor.parent === None {
-        rbt.root = Some(successor)
-      }
-    } else {
-      let break = ref(false)
-      let successorRef = ref(successor)
-      while !break.contents {
-        let successor = successorRef.contents
-
-        switch successor.parent {
-        | None =>
-          rbt.root = Some(successor)
-          break.contents = true
-        | Some(successorParent) =>
-          let sibling = siblingOf(successor)
-          if sibling !== None && (sibling->castNotOption).color === Red {
-            successorParent.color = Red
-            (sibling->castNotOption).color = Black
-            if isLeft(successor) {
-              rotateLeft(rbt, successorParent)
-            } else {
-              rotateRight(rbt, successorParent)
-            }
-          }
-
-          let sibling = siblingOf(successor)
-          let siblingNN = sibling->castNotOption
-          if (
-            successorParent.color === Black &&
-              (sibling === None ||
-                (siblingNN.color === Black &&
-                (siblingNN.left === None ||
-                  (siblingNN.left->castNotOption).color === Black) &&
-                (siblingNN.right === None ||
-                  (siblingNN.right->castNotOption).color === Black)))
-          ) {
-            if sibling !== None {
-              siblingNN.color = Red
-            }
-            successorRef.contents = successorParent
-          } else if (
-            successorParent.color === Red &&
-              (sibling === None ||
-                (siblingNN.color === Black &&
-                (siblingNN.left === None ||
-                  (siblingNN.left->castNotOption).color === Black) &&
-                (siblingNN.right === None ||
-                  (siblingNN.right->castNotOption).color === Black)))
-          ) {
-            if sibling !== None {
-              siblingNN.color = Red
-            }
-            successorParent.color = Black
-            break.contents = true
-          } else if (
-            sibling !== None && (sibling->castNotOption).color === Black
-          ) {
-            let sibling = sibling->castNotOption
-            if (
-              isLeft(successor) &&
-              (sibling.right === None ||
-                (sibling.right->castNotOption).color === Black) &&
-              sibling.left !== None &&
-              (sibling.left->castNotOption).color === Red
-            ) {
-              sibling.color = Red
-              (sibling.left->castNotOption).color = Black
-              rotateRight(rbt, sibling)
-            } else if (
-              !isLeft(successor) &&
-              (sibling.left === None ||
-                (sibling.left->castNotOption).color === Black) &&
-              sibling.right !== None &&
-              (sibling.right->castNotOption).color === Red
-            ) {
-              sibling.color = Red
-              (sibling.right->castNotOption).color = Black
-              rotateLeft(rbt, sibling)
-            }
-            break.contents = true
-          } else {
-            let sibling = siblingOf(successor)
-            let sibling = sibling->castNotOption
-            sibling.color = successorParent.color
-            if isLeft(successor) {
-              (sibling.right->castNotOption).color = Black
-              rotateRight(rbt, successorParent)
-            } else {
-              (sibling.left->castNotOption).color = Black
-              rotateLeft(rbt, successorParent)
-            }
-          }
-        }
-      }
-    }
-  }
-
-  if isLeaf(. successor) {
-    if rbt.root === Some(successor) {
-      rbt.root = None
-    }
-    switch successor.parent {
-    | None => ()
-    | Some(parent) => parent->leftOrRightSet(~node=successor, None)
-    }
-  }
-}
-
-let remove = (rbt, value) =>
-  switch findNode(rbt, rbt.root, value) {
-  | Some(node) =>
-    rbt->removeNode(node)
-    rbt.size = rbt.size - 1
-    true
-  | None => false
-  }
-
-let rec findNodeThroughCallback = (rbt, node, cb) =>
-  switch node {
-  | None => None
-  | Some(node) =>
-    let cmp = cb(. node)
-    if cmp === 0 {
-      Some(node)
-    } else if cmp < 0 {
-      findNodeThroughCallback(rbt, node.left, cb)
-    } else {
-      findNodeThroughCallback(rbt, node.right, cb)
-    }
-  }
-
-let removeThroughCallback = (rbt, cb) =>
-  switch findNodeThroughCallback(rbt, rbt.root, cb) {
-  | Some(node) =>
-    rbt->removeNode(node)
-    rbt.size = rbt.size - 1
-    true
-  | None => false
-  }
-
-let make = (~compare) => {size: 0, root: None, compare: compare}
-
-let makeWith = (array, ~compare) => {
-  let rbt = make(~compare)
-  array->Js.Array2.forEach(((value, height)) =>
-    add(rbt, value, ~height)->ignore
-  )
-  rbt
-}
-
-let rec heightOfInterval = (rbt, node, lhs, rhs) =>
-  switch node {
-  | None => 0.
-  | Some(n) =>
-    if lhs === None && rhs === None {
-      n.sum
-    } else if lhs !== None && rbt.compare(. n.value, lhs->castNotOption) < 0 {
-      rbt->heightOfInterval(n.right, lhs, rhs)
-    } else if rhs !== None && rbt.compare(. n.value, rhs->castNotOption) > 0 {
-      rbt->heightOfInterval(n.left, lhs, rhs)
-    } else {
-      n.height +.
-      rbt->heightOfInterval(n.left, lhs, None) +.
-      rbt->heightOfInterval(n.right, None, rhs)
-    }
-  }
-
-let heightOfInterval = (rbt, lhs, rhs) =>
-  heightOfInterval(rbt, rbt.root, lhs, rhs)
-
-let rec firstVisibleNode = (node, top) =>
-  switch node {
-  | None => None
-  | Some(node) =>
-    if node.sum <= top {
-      None
-    } else {
-      let nodeHeight = node.height
-      let sumLeft = switch node.left {
-      | None => 0.0
-      | Some(left) => left.sum
-      }
-      if sumLeft > top {
-        firstVisibleNode(node.left, top)
-      } else if sumLeft +. nodeHeight > top {
-        Some(node)
-      } else {
-        let offset = sumLeft +. nodeHeight
-        firstVisibleNode(node.right, top -. offset)
-      }
-    }
-  }
-
-let lastVisibleNode = (node, top) =>
-  switch firstVisibleNode(node, top) {
-  | None => node->peekMaxNode
-  | first => first
-  }
-
-let firstVisibleValue = (rbt, ~top) =>
-  switch firstVisibleNode(rbt.root, top) {
-  | None => None
-  | Some(node) => Some(node.value)
-  }
-
-let rec leftmost = node =>
-  switch node.left {
-  | None => node
-  | Some(node) => node->leftmost
-  }
-
-let rec firstRightParent = node =>
-  switch node.parent {
-  | None => None
-  | Some(parent) => isLeft(node) ? Some(parent) : parent->firstRightParent
-  }
-
-let nextNode = node =>
-  switch node.right {
-  | None => node->firstRightParent
-  | Some(right) => Some(right->leftmost)
-  }
-
-let rec sumLeftSpine = (node, ~fromRightChild) => {
-  let leftSpine = switch node.left {
-  | None => node.height
-  | Some(left) => fromRightChild ? node.height +. left.sum : 0.0
-  }
-  switch node.parent {
-  | None => leftSpine
-  | Some(parent) =>
-    leftSpine +.
-    parent->sumLeftSpine(~fromRightChild=parent.right === Some(node))
-  }
-}
-
-let getY = node => node->sumLeftSpine(~fromRightChild=true) -. node.height
-
-let rec iterate = (~inclusive, firstNode, lastNode, ~callback) =>
-  switch firstNode {
-  | None => ()
-  | Some(node) =>
-    if inclusive {
-      callback(. node)
-    }
-    if firstNode !== lastNode {
-      if !inclusive {
-        callback(. node)
-      }
-      iterate(~inclusive, node->nextNode, lastNode, ~callback)
-    }
-  }
-
-let rec iterateWithY = (~y=?, ~inclusive, firstNode, lastNode, ~callback) =>
-  switch firstNode {
-  | None => ()
-  | Some(node) =>
-    let y = switch y {
-    | None => node->getY
-    | Some(y) => y
-    }
-    if inclusive {
-      callback(. node, y)
-    }
-    if firstNode !== lastNode {
-      if !inclusive {
-        callback(. node, y)
-      }
-      iterateWithY(
-        ~y=y +. node.height,
-        ~inclusive,
-        node->nextNode,
-        lastNode,
-        ~callback,
-      )
-    }
-  }
-
-let rec updateSum = (node, ~delta) =>
-  switch node {
-  | None => ()
-  | Some(node) =>
-    node.sum = node.sum +. delta
-    node.parent->updateSum(~delta)
-  }
-
-let updateHeight = (node, ~height) => {
-  let delta = height -. node.height
-  node.height = height
-  Some(node)->updateSum(~delta)
-}
-
-type oldNewVisible<'value> = {
-  mutable old: array<'value>,
-  mutable new: array<'value>,
-}
-
-let getAnchorDelta = (rbt, ~anchor) =>
-  switch anchor {
-  | None => 0.0
-  | Some(value, y) =>
-    switch rbt->findNode(rbt.root, value) {
-    | Some(node) => y -. node->getY
-    | None => 0.0
-    }
-  }
-
-let onChangedVisible = (
-  ~anchor=None,
-  rbt,
-  ~oldNewVisible,
-  ~top as top_,
-  ~bottom as bottom_,
-  ~appear,
-  ~remained,
-  ~disappear,
-) => {
-  let old = oldNewVisible.new
-  let new = oldNewVisible.old
-
-  new
-  ->Js.Array2.removeCountInPlace(~pos=0, ~count=new->Js.Array2.length)
-  ->ignore
-  oldNewVisible.old = old
-  oldNewVisible.new = new
-
-  let anchorDelta = rbt->getAnchorDelta(~anchor)
-
-  let top = top_ -. anchorDelta
-  let top = top < 0.0 ? 0.0 : top
-  let bottom = bottom_ -. anchorDelta
-
-  let first = firstVisibleNode(rbt.root, top)
-  let last = lastVisibleNode(rbt.root, bottom)
-
-  let oldLen = old->Js.Array2.length
-  let oldIter = ref(0)
-  iterateWithY(~inclusive=true, first, last, (. node, y_) => {
-    let y = y_ +. anchorDelta
-    if y >= 0.0 {
-      while (
-        oldIter.contents < oldLen &&
-          rbt.compare(.
-            Js.Array2.unsafe_get(old, oldIter.contents),
-            node.value,
-          ) < 0
-      ) {
-        disappear(. Js.Array2.unsafe_get(old, oldIter.contents))
-        oldIter.contents = oldIter.contents + 1
-      }
-      new->Js.Array2.push(node.value)->ignore
-      if oldIter.contents < oldLen {
-        let cmp = rbt.compare(.
-          Js.Array2.unsafe_get(old, oldIter.contents),
-          node.value,
-        )
-        if cmp == 0 {
-          remained(. node, y)
-          oldIter.contents = oldIter.contents + 1
-        } else {
-          appear(. node, y)
-        }
-      } else {
-        appear(. node, y)
-      }
-    }
-  })
-  while oldIter.contents < oldLen {
-    disappear(. Js.Array2.unsafe_get(old, oldIter.contents))
-    oldIter.contents = oldIter.contents + 1
-  }
-}
diff --git a/jscomp/syntax/benchmarks/dune b/jscomp/syntax/benchmarks/dune
deleted file mode 100644
index 6d507d6..0000000
--- a/jscomp/syntax/benchmarks/dune
+++ /dev/null
@@ -1,27 +0,0 @@
-(env
- (static
-  (flags
-   (:standard -ccopt -static))))
-
-(executable
- (name benchmark)
- (public_name syntax_benchmarks)
- (enabled_if
-  (and
-   (<> %{profile} browser)
-   (or
-    (= %{system} macosx)
-    ; or one of Linuxes (see https://github.com/ocaml/ocaml/issues/10613)
-    (= %{system} linux)
-    (= %{system} linux_elf)
-    (= %{system} elf)
-    (= %{system} linux_eabihf)
-    (= %{system} linux_eabi))))
- (flags
-  (:standard -w -A))
- (foreign_stubs
-  (language c)
-  (names time))
- (libraries syntax))
-
-(data_only_dirs data)
diff --git a/jscomp/syntax/benchmarks/time.c b/jscomp/syntax/benchmarks/time.c
deleted file mode 100644
index df29af7..0000000
--- a/jscomp/syntax/benchmarks/time.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <caml/mlvalues.h>
-#include <caml/alloc.h>
-
-//
-// Platform-specific includes
-//
-#if (defined(__MACH__) && defined(__APPLE__))
-#include <mach/mach_time.h>
-#elif defined(__linux__)
-#include <time.h>
-#endif
-
-//
-// Platform-specific globals
-//
-#if (defined(__MACH__) && defined(__APPLE__))
-static mach_timebase_info_data_t info;
-#endif
-
-//
-// Exported functions
-//
-CAMLprim value caml_mach_initialize(value unit) {
-#if (defined(__MACH__) && defined(__APPLE__))
-  mach_timebase_info(&info);
-#endif
-
-  return Val_unit;
-}
-
-CAMLprim value caml_mach_absolute_time(value unit) {
-  uint64_t result = 0;
-
-#if (defined(__MACH__) && defined(__APPLE__))
-  uint64_t now = mach_absolute_time();
-  result = (now * info.numer) / info.denom;
-#elif defined(__linux__)
-  struct timespec now;
-  clock_gettime(CLOCK_MONOTONIC, &now);
-  result = now.tv_sec * 1000 + now.tv_nsec / 1000000;
-#endif
-
-  return caml_copy_int64(result);
-}
diff --git a/jscomp/syntax/cli/dune b/jscomp/syntax/cli/dune
deleted file mode 100644
index f7815b0..0000000
--- a/jscomp/syntax/cli/dune
+++ /dev/null
@@ -1,13 +0,0 @@
-(env
- (static
-  (flags
-   (:standard -ccopt -static))))
-
-(executable
- (name res_cli)
- (public_name res_parser)
- (enabled_if
-  (<> %{profile} browser))
- (flags
-  (:standard -w -A))
- (libraries syntax))
diff --git a/jscomp/syntax/cli/res_cli.ml b/jscomp/syntax/cli/res_cli.ml
deleted file mode 100644
index 23d9006..0000000
--- a/jscomp/syntax/cli/res_cli.ml
+++ /dev/null
@@ -1,320 +0,0 @@
-(*
-  This CLI isn't used apart for this repo's testing purposes. The syntax
-  itself is used by ReScript's compiler programmatically through various other apis.
-*)
-
-(*
-  This is OCaml's Misc.ml's Color module. More specifically, this is
-  ReScript's OCaml fork's Misc.ml's Color module:
-  https://github.com/rescript-lang/ocaml/blob/92e58bedced8d7e3e177677800a38922327ab860/utils/misc.ml#L540
-
-  The syntax's printing's coloring logic depends on:
-    1. a global mutable variable that's set in the compiler: Misc.Color.color_enabled
-    2. the colors tags supported by Misc.Color, e.g. style_of_tag, which Format
-      tags like @{<error>hello@} use
-    3. etc.
-
-  When this syntax is programmatically used inside ReScript, the various
-  Format tags like <error> and <dim> get properly colored depending on the
-  above points.
-
-  But when used by this cli file, that coloring logic doesn't render properly
-  because we're compiling against vanilla OCaml 4.06 instead of ReScript's
-  OCaml fork. For example, the vanilla compiler doesn't support the `dim`
-  color (grey). So we emulate the right coloring logic by copy pasting how our
-  forked OCaml compiler does it.
-*)
-module Color = struct
-  (* use ANSI color codes, see https://en.wikipedia.org/wiki/ANSI_escape_code *)
-  type color =
-    | Black [@live]
-    | Red
-    | Green [@live]
-    | Yellow
-    | Blue [@live]
-    | Magenta
-    | Cyan
-    | White [@live]
-
-  type style =
-    | FG of color (* foreground *)
-    | BG of color [@live] (* background *)
-    | Bold
-    | Reset
-    | Dim
-
-  let ansi_of_color = function
-    | Black -> "0"
-    | Red -> "1"
-    | Green -> "2"
-    | Yellow -> "3"
-    | Blue -> "4"
-    | Magenta -> "5"
-    | Cyan -> "6"
-    | White -> "7"
-
-  let code_of_style = function
-    | FG c -> "3" ^ ansi_of_color c
-    | BG c -> "4" ^ ansi_of_color c
-    | Bold -> "1"
-    | Reset -> "0"
-    | Dim -> "2"
-
-  let ansi_of_style_l l =
-    let s =
-      match l with
-      | [] -> code_of_style Reset
-      | [s] -> code_of_style s
-      | _ -> String.concat ";" (List.map code_of_style l)
-    in
-    "\x1b[" ^ s ^ "m"
-
-  type styles = {error: style list; warning: style list; loc: style list}
-
-  let default_styles =
-    {warning = [Bold; FG Magenta]; error = [Bold; FG Red]; loc = [Bold]}
-
-  let cur_styles = ref default_styles
-
-  (* let get_styles () = !cur_styles *)
-  (* let set_styles s = cur_styles := s *)
-
-  (* map a tag to a style, if the tag is known.
-     @raise Not_found otherwise *)
-  let style_of_tag s =
-    match s with
-    | Format.String_tag "error" -> !cur_styles.error
-    | Format.String_tag "warning" -> !cur_styles.warning
-    | Format.String_tag "loc" -> !cur_styles.loc
-    | Format.String_tag "info" -> [Bold; FG Yellow]
-    | Format.String_tag "dim" -> [Dim]
-    | Format.String_tag "filename" -> [FG Cyan]
-    | _ -> raise Not_found
-  [@@raises Not_found]
-
-  let color_enabled = ref true
-
-  (* either prints the tag of [s] or delegates to [or_else] *)
-  let mark_open_tag ~or_else s =
-    try
-      let style = style_of_tag s in
-      if !color_enabled then ansi_of_style_l style else ""
-    with Not_found -> or_else s
-
-  let mark_close_tag ~or_else s =
-    try
-      let _ = style_of_tag s in
-      if !color_enabled then ansi_of_style_l [Reset] else ""
-    with Not_found -> or_else s
-
-  (* add color handling to formatter [ppf] *)
-  let set_color_tag_handling ppf =
-    let open Format in
-    let functions = pp_get_formatter_stag_functions ppf () in
-    let functions' =
-      {
-        functions with
-        mark_open_stag = mark_open_tag ~or_else:functions.mark_open_stag;
-        mark_close_stag = mark_close_tag ~or_else:functions.mark_close_stag;
-      }
-    in
-    pp_set_mark_tags ppf true;
-    (* enable tags *)
-    pp_set_formatter_stag_functions ppf functions';
-    (* also setup margins *)
-    pp_set_margin ppf (pp_get_margin std_formatter ());
-    ()
-
-  external isatty : out_channel -> bool = "caml_sys_isatty"
-
-  (* reasonable heuristic on whether colors should be enabled *)
-  let should_enable_color () =
-    let term = try Sys.getenv "TERM" with Not_found -> "" in
-    term <> "dumb" && term <> "" && isatty stderr
-
-  type setting = Auto [@live] | Always [@live] | Never [@live]
-
-  let setup =
-    let first = ref true in
-    (* initialize only once *)
-    let formatter_l =
-      [Format.std_formatter; Format.err_formatter; Format.str_formatter]
-    in
-    fun o ->
-      if !first then (
-        first := false;
-        Format.set_mark_tags true;
-        List.iter set_color_tag_handling formatter_l;
-        color_enabled :=
-          match o with
-          | Some Always -> true
-          | Some Auto -> should_enable_color ()
-          | Some Never -> false
-          | None -> should_enable_color ());
-      ()
-end
-
-(* command line flags *)
-module ResClflags : sig
-  val recover : bool ref
-  val print : string ref
-  val width : int ref
-  val origin : string ref
-  val file : string ref
-  val interface : bool ref
-  val jsxVersion : int ref
-  val jsxModule : string ref
-  val jsxMode : string ref
-  val typechecker : bool ref
-
-  val parse : unit -> unit
-end = struct
-  let recover = ref false
-  let width = ref 100
-
-  let print = ref "res"
-  let origin = ref ""
-  let interface = ref false
-  let jsxVersion = ref (-1)
-  let jsxModule = ref "react"
-  let jsxMode = ref "automatic"
-  let file = ref ""
-  let typechecker = ref false
-
-  let usage =
-    "\n\
-     **This command line is for the repo developer's testing purpose only. DO \
-     NOT use it in production**!\n\n"
-    ^ "Usage:\n  res_parser <options> <file>\n\n" ^ "Examples:\n"
-    ^ "  res_parser myFile.res\n"
-    ^ "  res_parser -parse ml -print res myFile.ml\n"
-    ^ "  res_parser -parse res -print binary -interface myFile.resi\n\n"
-    ^ "Options are:"
-
-  let spec =
-    [
-      ("-recover", Arg.Unit (fun () -> recover := true), "Emit partial ast");
-      ( "-parse",
-        Arg.String (fun txt -> origin := txt),
-        "Parse ml or res. Default: res" );
-      ( "-print",
-        Arg.String (fun txt -> print := txt),
-        "Print either binary, ml, ast, sexp, comments or res. Default: res" );
-      ( "-width",
-        Arg.Int (fun w -> width := w),
-        "Specify the line length for the printer (formatter)" );
-      ( "-interface",
-        Arg.Unit (fun () -> interface := true),
-        "Parse as interface" );
-      ( "-jsx-version",
-        Arg.Int (fun i -> jsxVersion := i),
-        "Apply a specific built-in ppx before parsing, none or 3, 4. Default: \
-         none" );
-      ( "-jsx-module",
-        Arg.String (fun txt -> jsxModule := txt),
-        "Specify the jsx module. Default: react" );
-      ( "-jsx-mode",
-        Arg.String (fun txt -> jsxMode := txt),
-        "Specify the jsx mode, classic or automatic. Default: automatic" );
-      ( "-typechecker",
-        Arg.Unit (fun () -> typechecker := true),
-        "Parses the ast as it would be passed to the typechecker and not the \
-         printer" );
-    ]
-
-  let parse () = Arg.parse spec (fun f -> file := f) usage
-end
-
-module CliArgProcessor = struct
-  type backend = Parser : 'diagnostics Res_driver.parsingEngine -> backend
-  [@@unboxed]
-
-  let processFile ~isInterface ~width ~recover ~origin ~target ~jsxVersion
-      ~jsxModule ~jsxMode ~typechecker filename =
-    let len = String.length filename in
-    let processInterface =
-      isInterface
-      || (len > 0 && (String.get [@doesNotRaise]) filename (len - 1) = 'i')
-    in
-    let parsingEngine =
-      match origin with
-      | "ml" -> Parser Res_driver_ml_parser.parsingEngine
-      | "res" -> Parser Res_driver.parsingEngine
-      | "" -> (
-        match Filename.extension filename with
-        | ".ml" | ".mli" -> Parser Res_driver_ml_parser.parsingEngine
-        | _ -> Parser Res_driver.parsingEngine)
-      | origin ->
-        print_endline
-          ("-parse needs to be either ml or res. You provided " ^ origin);
-        exit 1
-    in
-    let printEngine =
-      match target with
-      | "binary" -> Res_driver_binary.printEngine
-      | "ml" -> Res_driver_ml_parser.printEngine
-      | "ast" -> Res_ast_debugger.printEngine
-      | "sexp" -> Res_ast_debugger.sexpPrintEngine
-      | "comments" -> Res_ast_debugger.commentsPrintEngine
-      | "res" -> Res_driver.printEngine
-      | target ->
-        print_endline
-          ("-print needs to be either binary, ml, ast, sexp, comments or res. \
-            You provided " ^ target);
-        exit 1
-    in
-
-    let forPrinter =
-      match target with
-      | ("res" | "sexp") when not typechecker -> true
-      | _ -> false
-    in
-
-    let (Parser backend) = parsingEngine in
-    (* This is the whole purpose of the Color module above *)
-    Color.setup None;
-    if processInterface then
-      let parseResult = backend.parseInterface ~forPrinter ~filename in
-      if parseResult.invalid then (
-        backend.stringOfDiagnostics ~source:parseResult.source
-          ~filename:parseResult.filename parseResult.diagnostics;
-        if recover then
-          printEngine.printInterface ~width ~filename
-            ~comments:parseResult.comments parseResult.parsetree
-        else exit 1)
-      else
-        let parsetree =
-          Jsx_ppx.rewrite_signature ~jsxVersion ~jsxModule ~jsxMode
-            parseResult.parsetree
-        in
-        printEngine.printInterface ~width ~filename
-          ~comments:parseResult.comments parsetree
-    else
-      let parseResult = backend.parseImplementation ~forPrinter ~filename in
-      if parseResult.invalid then (
-        backend.stringOfDiagnostics ~source:parseResult.source
-          ~filename:parseResult.filename parseResult.diagnostics;
-        if recover then
-          printEngine.printImplementation ~width ~filename
-            ~comments:parseResult.comments parseResult.parsetree
-        else exit 1)
-      else
-        let parsetree =
-          Jsx_ppx.rewrite_implementation ~jsxVersion ~jsxModule ~jsxMode
-            parseResult.parsetree
-        in
-        printEngine.printImplementation ~width ~filename
-          ~comments:parseResult.comments parsetree
-  [@@raises exit]
-end
-
-let () =
-  if not !Sys.interactive then (
-    ResClflags.parse ();
-    CliArgProcessor.processFile ~isInterface:!ResClflags.interface
-      ~width:!ResClflags.width ~recover:!ResClflags.recover
-      ~target:!ResClflags.print ~origin:!ResClflags.origin
-      ~jsxVersion:!ResClflags.jsxVersion ~jsxModule:!ResClflags.jsxModule
-      ~jsxMode:!ResClflags.jsxMode ~typechecker:!ResClflags.typechecker
-      !ResClflags.file)
-[@@raises exit]
diff --git a/jscomp/syntax/dune b/jscomp/syntax/dune
deleted file mode 100644
index 0a8105d..0000000
--- a/jscomp/syntax/dune
+++ /dev/null
@@ -1,9 +0,0 @@
-(dirs compiler-libs-406 src cli benchmarks testrunner)
-
-(env
- (dev
-  (flags
-   (:standard -w -A)))
- (release
-  (flags
-   (:standard -w -A))))
diff --git a/jscomp/syntax/src/dune b/jscomp/syntax/src/dune
deleted file mode 100644
index 428528a..0000000
--- a/jscomp/syntax/src/dune
+++ /dev/null
@@ -1,6 +0,0 @@
-(library
- (name syntax)
- (wrapped false)
- (flags
-  (:standard -w -A))
- (libraries ml))
diff --git a/jscomp/syntax/src/jsx_common.ml b/jscomp/syntax/src/jsx_common.ml
deleted file mode 100644
index 5379e10..0000000
--- a/jscomp/syntax/src/jsx_common.ml
+++ /dev/null
@@ -1,82 +0,0 @@
-open Asttypes
-open Parsetree
-
-type jsxConfig = {
-  mutable version: int;
-  mutable module_: string;
-  mutable mode: string;
-  mutable nestedModules: string list;
-  mutable hasComponent: bool;
-}
-
-(* Helper method to look up the [@react.component] attribute *)
-let hasAttr (loc, _) =
-  match loc.txt with
-  | "react.component" | "jsx.component" -> true
-  | _ -> false
-
-(* Iterate over the attributes and try to find the [@react.component] attribute *)
-let hasAttrOnBinding {pvb_attributes} =
-  List.find_opt hasAttr pvb_attributes <> None
-
-let coreTypeOfAttrs attributes =
-  List.find_map
-    (fun ({txt}, payload) ->
-      match (txt, payload) with
-      | ("react.component" | "jsx.component"), PTyp coreType -> Some coreType
-      | _ -> None)
-    attributes
-
-let typVarsOfCoreType {ptyp_desc} =
-  match ptyp_desc with
-  | Ptyp_constr (_, coreTypes) ->
-    List.filter
-      (fun {ptyp_desc} ->
-        match ptyp_desc with
-        | Ptyp_var _ -> true
-        | _ -> false)
-      coreTypes
-  | _ -> []
-
-let raiseError ~loc msg = Location.raise_errorf ~loc msg
-
-let raiseErrorMultipleComponent ~loc =
-  raiseError ~loc
-    "Only one component definition is allowed for each module. Move to a \
-     submodule or other file if necessary."
-
-let optionalAttr = ({txt = "res.optional"; loc = Location.none}, PStr [])
-
-let extractUncurried typ =
-  if Ast_uncurried.coreTypeIsUncurriedFun typ then
-    let _arity, t = Ast_uncurried.coreTypeExtractUncurriedFun typ in
-    t
-  else typ
-
-let removeArity binding =
-  let rec removeArityRecord expr =
-    match expr.pexp_desc with
-    | _ when Ast_uncurried.exprIsUncurriedFun expr ->
-      Ast_uncurried.exprExtractUncurriedFun expr
-    | Pexp_newtype (label, e) ->
-      {expr with pexp_desc = Pexp_newtype (label, removeArityRecord e)}
-    | Pexp_apply (forwardRef, [(label, e)]) ->
-      {
-        expr with
-        pexp_desc = Pexp_apply (forwardRef, [(label, removeArityRecord e)]);
-      }
-    | _ -> expr
-  in
-  {binding with pvb_expr = removeArityRecord binding.pvb_expr}
-
-let async_component ~async expr =
-  if async then
-    let open Ast_helper in
-    Exp.apply
-      (Exp.ident
-         {
-           loc = Location.none;
-           txt = Ldot (Lident "JsxPPXReactSupport", "asyncComponent");
-         })
-      [(Nolabel, expr)]
-  else expr
diff --git a/jscomp/syntax/src/jsx_ppx.ml b/jscomp/syntax/src/jsx_ppx.ml
deleted file mode 100644
index e0e1cac..0000000
--- a/jscomp/syntax/src/jsx_ppx.ml
+++ /dev/null
@@ -1,176 +0,0 @@
-open Ast_mapper
-open Asttypes
-open Parsetree
-open Longident
-
-let getPayloadFields payload =
-  match payload with
-  | PStr
-      ({
-         pstr_desc =
-           Pstr_eval ({pexp_desc = Pexp_record (recordFields, None)}, _);
-       }
-      :: _rest) ->
-    recordFields
-  | _ -> []
-
-type configKey = Int | String
-
-let getJsxConfigByKey ~key ~type_ recordFields =
-  let values =
-    List.filter_map
-      (fun ((lid, expr) : Longident.t Location.loc * expression) ->
-        match (type_, lid, expr) with
-        | ( Int,
-            {txt = Lident k},
-            {pexp_desc = Pexp_constant (Pconst_integer (value, None))} )
-          when k = key ->
-          Some value
-        | ( String,
-            {txt = Lident k},
-            (* accept both normal strings and "js" strings *)
-            {pexp_desc = Pexp_constant (Pconst_string (value, _))} )
-          when k = key ->
-          Some value
-        | _ -> None)
-      recordFields
-  in
-  match values with
-  | [] -> None
-  | [v] | v :: _ -> Some v
-
-let getInt ~key fields =
-  match fields |> getJsxConfigByKey ~key ~type_:Int with
-  | None -> None
-  | Some s -> int_of_string_opt s
-
-let getString ~key fields = fields |> getJsxConfigByKey ~key ~type_:String
-
-let updateConfig config payload =
-  let fields = getPayloadFields payload in
-  let moduleRaw = getString ~key:"module_" fields in
-  let isGeneric =
-    match moduleRaw |> Option.map (fun m -> String.lowercase_ascii m) with
-    | Some "react" | None -> false
-    | Some _ -> true
-  in
-  (match (isGeneric, getInt ~key:"version" fields) with
-  | true, _ -> config.Jsx_common.version <- 4
-  | false, Some i -> config.Jsx_common.version <- i
-  | _ -> ());
-  (match moduleRaw with
-  | None -> ()
-  | Some s -> config.module_ <- s);
-  match (isGeneric, getString ~key:"mode" fields) with
-  | true, _ -> config.mode <- "automatic"
-  | false, Some s -> config.mode <- s
-  | _ -> ()
-
-let isJsxConfigAttr ((loc, _) : attribute) = loc.txt = "jsxConfig"
-
-let processConfigAttribute attribute config =
-  if isJsxConfigAttr attribute then updateConfig config (snd attribute)
-
-let getMapper ~config =
-  let expr3, module_binding3, transformSignatureItem3, transformStructureItem3 =
-    Reactjs_jsx_v3.jsxMapper ~config
-  in
-  let expr4, module_binding4, transformSignatureItem4, transformStructureItem4 =
-    Jsx_v4.jsxMapper ~config
-  in
-
-  let expr mapper e =
-    match config.version with
-    | 3 -> expr3 mapper e
-    | 4 -> expr4 mapper e
-    | _ -> default_mapper.expr mapper e
-  in
-  let module_binding mapper mb =
-    match config.version with
-    | 3 -> module_binding3 mapper mb
-    | 4 -> module_binding4 mapper mb
-    | _ -> default_mapper.module_binding mapper mb
-  in
-  let saveConfig () =
-    {
-      config with
-      version = config.version;
-      module_ = config.module_;
-      mode = config.mode;
-      hasComponent = config.hasComponent;
-    }
-  in
-  let restoreConfig oldConfig =
-    config.version <- oldConfig.Jsx_common.version;
-    config.module_ <- oldConfig.module_;
-    config.mode <- oldConfig.mode;
-    config.hasComponent <- oldConfig.hasComponent
-  in
-  let signature mapper items =
-    let oldConfig = saveConfig () in
-    config.hasComponent <- false;
-    let result =
-      List.map
-        (fun item ->
-          (match item.psig_desc with
-          | Psig_attribute attr -> processConfigAttribute attr config
-          | _ -> ());
-          let item = default_mapper.signature_item mapper item in
-          if config.version = 3 then transformSignatureItem3 item
-          else if config.version = 4 then transformSignatureItem4 item
-          else [item])
-        items
-      |> List.flatten
-    in
-    restoreConfig oldConfig;
-    result
-  in
-  let structure mapper items =
-    let oldConfig = saveConfig () in
-    config.hasComponent <- false;
-    let result =
-      List.map
-        (fun item ->
-          (match item.pstr_desc with
-          | Pstr_attribute attr -> processConfigAttribute attr config
-          | _ -> ());
-          let item = default_mapper.structure_item mapper item in
-          if config.version = 3 then transformStructureItem3 item
-          else if config.version = 4 then transformStructureItem4 item
-          else [item])
-        items
-      |> List.flatten
-    in
-    restoreConfig oldConfig;
-    result
-  in
-
-  {default_mapper with expr; module_binding; signature; structure}
-
-let rewrite_implementation ~jsxVersion ~jsxModule ~jsxMode
-    (code : Parsetree.structure) : Parsetree.structure =
-  let config =
-    {
-      Jsx_common.version = jsxVersion;
-      module_ = jsxModule;
-      mode = jsxMode;
-      nestedModules = [];
-      hasComponent = false;
-    }
-  in
-  let mapper = getMapper ~config in
-  mapper.structure mapper code
-
-let rewrite_signature ~jsxVersion ~jsxModule ~jsxMode
-    (code : Parsetree.signature) : Parsetree.signature =
-  let config =
-    {
-      Jsx_common.version = jsxVersion;
-      module_ = jsxModule;
-      mode = jsxMode;
-      nestedModules = [];
-      hasComponent = false;
-    }
-  in
-  let mapper = getMapper ~config in
-  mapper.signature mapper code
diff --git a/jscomp/syntax/src/jsx_ppx.mli b/jscomp/syntax/src/jsx_ppx.mli
deleted file mode 100644
index 36a8468..0000000
--- a/jscomp/syntax/src/jsx_ppx.mli
+++ /dev/null
@@ -1,23 +0,0 @@
-(*
-  This is the module that handles turning Reason JSX' agnostic function call into
-  a ReasonReact-specific function call. Aka, this is a macro, using OCaml's ppx
-  facilities; https://whitequark.org/blog/2014/04/16/a-guide-to-extension-
-  points-in-ocaml/
-  You wouldn't use this file directly; it's used by ReScript's
-  rescript.json. Specifically, there's a field called `react-jsx` inside the
-  field `reason`, which enables this ppx through some internal call in bsb
-*)
-
-val rewrite_implementation :
-  jsxVersion:int ->
-  jsxModule:string ->
-  jsxMode:string ->
-  Parsetree.structure ->
-  Parsetree.structure
-
-val rewrite_signature :
-  jsxVersion:int ->
-  jsxModule:string ->
-  jsxMode:string ->
-  Parsetree.signature ->
-  Parsetree.signature
diff --git a/jscomp/syntax/src/jsx_v4.ml b/jscomp/syntax/src/jsx_v4.ml
deleted file mode 100644
index 89427fb..0000000
--- a/jscomp/syntax/src/jsx_v4.ml
+++ /dev/null
@@ -1,1481 +0,0 @@
-open Ast_helper
-open Ast_mapper
-open Asttypes
-open Parsetree
-open Longident
-
-let moduleAccessName config value =
-  String.capitalize_ascii config.Jsx_common.module_ ^ "." ^ value
-  |> Longident.parse
-
-let nolabel = Nolabel
-
-let labelled str = Labelled str
-
-let isOptional str =
-  match str with
-  | Optional _ -> true
-  | _ -> false
-
-let isLabelled str =
-  match str with
-  | Labelled _ -> true
-  | _ -> false
-
-let isForwardRef = function
-  | {pexp_desc = Pexp_ident {txt = Ldot (Lident "React", "forwardRef")}} -> true
-  | _ -> false
-
-let getLabel str =
-  match str with
-  | Optional str | Labelled str -> str
-  | Nolabel -> ""
-
-let optionalAttrs = [Jsx_common.optionalAttr]
-
-let constantString ~loc str =
-  Ast_helper.Exp.constant ~loc (Pconst_string (str, None))
-
-(* {} empty record *)
-let emptyRecord ~loc = Exp.record ~loc [] None
-
-let unitExpr ~loc = Exp.construct ~loc (Location.mkloc (Lident "()") loc) None
-
-let safeTypeFromValue valueStr =
-  let valueStr = getLabel valueStr in
-  if valueStr = "" || (valueStr.[0] [@doesNotRaise]) <> '_' then valueStr
-  else "T" ^ valueStr
-
-let refTypeVar loc = Typ.var ~loc "ref"
-
-let refType loc =
-  Typ.constr ~loc
-    {loc; txt = Ldot (Ldot (Lident "Js", "Nullable"), "t")}
-    [refTypeVar loc]
-
-type 'a children = ListLiteral of 'a | Exact of 'a
-
-(* if children is a list, convert it to an array while mapping each element. If not, just map over it, as usual *)
-let transformChildrenIfListUpper ~mapper theList =
-  let rec transformChildren_ theList accum =
-    (* not in the sense of converting a list to an array; convert the AST
-       reprensentation of a list to the AST reprensentation of an array *)
-    match theList with
-    | {pexp_desc = Pexp_construct ({txt = Lident "[]"}, None)} -> (
-      match accum with
-      | [singleElement] -> Exact singleElement
-      | accum -> ListLiteral (Exp.array (List.rev accum)))
-    | {
-     pexp_desc =
-       Pexp_construct
-         ({txt = Lident "::"}, Some {pexp_desc = Pexp_tuple [v; acc]});
-    } ->
-      transformChildren_ acc (mapper.expr mapper v :: accum)
-    | notAList -> Exact (mapper.expr mapper notAList)
-  in
-  transformChildren_ theList []
-
-let transformChildrenIfList ~mapper theList =
-  let rec transformChildren_ theList accum =
-    (* not in the sense of converting a list to an array; convert the AST
-       reprensentation of a list to the AST reprensentation of an array *)
-    match theList with
-    | {pexp_desc = Pexp_construct ({txt = Lident "[]"}, None)} ->
-      Exp.array (List.rev accum)
-    | {
-     pexp_desc =
-       Pexp_construct
-         ({txt = Lident "::"}, Some {pexp_desc = Pexp_tuple [v; acc]});
-    } ->
-      transformChildren_ acc (mapper.expr mapper v :: accum)
-    | notAList -> mapper.expr mapper notAList
-  in
-  transformChildren_ theList []
-
-let extractChildren ?(removeLastPositionUnit = false) ~loc propsAndChildren =
-  let rec allButLast_ lst acc =
-    match lst with
-    | [] -> []
-    | [(Nolabel, {pexp_desc = Pexp_construct ({txt = Lident "()"}, None)})] ->
-      acc
-    | (Nolabel, {pexp_loc}) :: _rest ->
-      Jsx_common.raiseError ~loc:pexp_loc
-        "JSX: found non-labelled argument before the last position"
-    | arg :: rest -> allButLast_ rest (arg :: acc)
-  in
-  let allButLast lst = allButLast_ lst [] |> List.rev in
-  match
-    List.partition
-      (fun (label, _) -> label = labelled "children")
-      propsAndChildren
-  with
-  | [], props ->
-    (* no children provided? Place a placeholder list *)
-    ( Exp.construct {loc = Location.none; txt = Lident "[]"} None,
-      if removeLastPositionUnit then allButLast props else props )
-  | [(_, childrenExpr)], props ->
-    (childrenExpr, if removeLastPositionUnit then allButLast props else props)
-  | _ ->
-    Jsx_common.raiseError ~loc
-      "JSX: somehow there's more than one `children` label"
-
-let merlinFocus = ({loc = Location.none; txt = "merlin.focus"}, PStr [])
-
-(* Helper method to filter out any attribute that isn't [@react.component] *)
-let otherAttrsPure (loc, _) =
-  match loc.txt with
-  | "react.component" | "jsx.component" -> false
-  | _ -> true
-
-(* Finds the name of the variable the binding is assigned to, otherwise raises Invalid_argument *)
-let rec getFnName binding =
-  match binding with
-  | {ppat_desc = Ppat_var {txt}} -> txt
-  | {ppat_desc = Ppat_constraint (pat, _)} -> getFnName pat
-  | {ppat_loc} ->
-    Jsx_common.raiseError ~loc:ppat_loc
-      "JSX component calls cannot be destructured."
-
-let makeNewBinding binding expression newName =
-  match binding with
-  | {pvb_pat = {ppat_desc = Ppat_var ppat_var} as pvb_pat} ->
-    {
-      binding with
-      pvb_pat =
-        {pvb_pat with ppat_desc = Ppat_var {ppat_var with txt = newName}};
-      pvb_expr = expression;
-      pvb_attributes = [merlinFocus];
-    }
-  | {pvb_loc} ->
-    Jsx_common.raiseError ~loc:pvb_loc
-      "JSX component calls cannot be destructured."
-
-(* Lookup the filename from the location information on the AST node and turn it into a valid module identifier *)
-let filenameFromLoc (pstr_loc : Location.t) =
-  let fileName =
-    match pstr_loc.loc_start.pos_fname with
-    | "" -> !Location.input_name
-    | fileName -> fileName
-  in
-  let fileName =
-    try Filename.chop_extension (Filename.basename fileName)
-    with Invalid_argument _ -> fileName
-  in
-  let fileName = String.capitalize_ascii fileName in
-  fileName
-
-(* Build a string representation of a module name with segments separated by $ *)
-let makeModuleName fileName nestedModules fnName =
-  let fullModuleName =
-    match (fileName, nestedModules, fnName) with
-    (* TODO: is this even reachable? It seems like the fileName always exists *)
-    | "", nestedModules, "make" -> nestedModules
-    | "", nestedModules, fnName -> List.rev (fnName :: nestedModules)
-    | fileName, nestedModules, "make" -> fileName :: List.rev nestedModules
-    | fileName, nestedModules, fnName ->
-      fileName :: List.rev (fnName :: nestedModules)
-  in
-  let fullModuleName = String.concat "$" fullModuleName in
-  fullModuleName
-
-(*
-  AST node builders
-  These functions help us build AST nodes that are needed when transforming a [@react.component] into a
-  constructor and a props external
-  *)
-
-(* make record from props and spread props if exists *)
-let recordFromProps ~loc ~removeKey callArguments =
-  let spreadPropsLabel = "_spreadProps" in
-  let rec removeLastPositionUnitAux props acc =
-    match props with
-    | [] -> acc
-    | [(Nolabel, {pexp_desc = Pexp_construct ({txt = Lident "()"}, None)})] ->
-      acc
-    | (Nolabel, {pexp_loc}) :: _rest ->
-      Jsx_common.raiseError ~loc:pexp_loc
-        "JSX: found non-labelled argument before the last position"
-    | ((Labelled txt, {pexp_loc}) as prop) :: rest
-    | ((Optional txt, {pexp_loc}) as prop) :: rest ->
-      if txt = spreadPropsLabel then
-        match acc with
-        | [] -> removeLastPositionUnitAux rest (prop :: acc)
-        | _ ->
-          Jsx_common.raiseError ~loc:pexp_loc
-            "JSX: use {...p} {x: v} not {x: v} {...p} \n\
-            \     multiple spreads {...p} {...p} not allowed."
-      else removeLastPositionUnitAux rest (prop :: acc)
-  in
-  let props, propsToSpread =
-    removeLastPositionUnitAux callArguments []
-    |> List.rev
-    |> List.partition (fun (label, _) -> label <> labelled "_spreadProps")
-  in
-  let props =
-    if removeKey then
-      props |> List.filter (fun (arg_label, _) -> "key" <> getLabel arg_label)
-    else props
-  in
-
-  let processProp (arg_label, ({pexp_loc} as pexpr)) =
-    (* In case filed label is "key" only then change expression to option *)
-    let id = getLabel arg_label in
-    if isOptional arg_label then
-      ( {txt = Lident id; loc = pexp_loc},
-        {pexpr with pexp_attributes = optionalAttrs} )
-    else ({txt = Lident id; loc = pexp_loc}, pexpr)
-  in
-  let fields = props |> List.map processProp in
-  let spreadFields =
-    propsToSpread |> List.map (fun (_, expression) -> expression)
-  in
-  match (fields, spreadFields) with
-  | [], [spreadProps] | [], spreadProps :: _ -> spreadProps
-  | _, [] ->
-    {
-      pexp_desc = Pexp_record (fields, None);
-      pexp_loc = loc;
-      pexp_attributes = [];
-    }
-  | _, [spreadProps]
-  (* take the first spreadProps only *)
-  | _, spreadProps :: _ ->
-    {
-      pexp_desc = Pexp_record (fields, Some spreadProps);
-      pexp_loc = loc;
-      pexp_attributes = [];
-    }
-
-(* make type params for make fn arguments *)
-(* let make = ({id, name, children}: props<'id, 'name, 'children>) *)
-let makePropsTypeParamsTvar namedTypeList =
-  namedTypeList
-  |> List.filter_map (fun (_isOptional, label, _, loc, _interiorType) ->
-         if label = "key" then None
-         else Some (Typ.var ~loc @@ safeTypeFromValue (Labelled label)))
-
-let stripOption coreType =
-  match coreType with
-  | {ptyp_desc = Ptyp_constr ({txt = Lident "option"}, coreTypes)} ->
-    List.nth_opt coreTypes 0 [@doesNotRaise]
-  | _ -> Some coreType
-
-let stripJsNullable coreType =
-  match coreType with
-  | {
-   ptyp_desc =
-     Ptyp_constr ({txt = Ldot (Ldot (Lident "Js", "Nullable"), "t")}, coreTypes);
-  } ->
-    List.nth_opt coreTypes 0 [@doesNotRaise]
-  | _ -> Some coreType
-
-(* Make type params of the props type *)
-(* (Sig) let make: React.componentLike<props<string>, React.element> *)
-(* (Str) let make = ({x, _}: props<'x>) => body *)
-(* (Str) external make: React.componentLike<props< .. >, React.element> = "default" *)
-let makePropsTypeParams ?(stripExplicitOption = false)
-    ?(stripExplicitJsNullableOfRef = false) namedTypeList =
-  namedTypeList
-  |> List.filter_map (fun (isOptional, label, _, loc, interiorType) ->
-         if label = "key" then None
-           (* TODO: Worth thinking how about "ref_" or "_ref" usages *)
-         else if label = "ref" then
-           (*
-                If ref has a type annotation then use it, else 'ref.
-                For example, if JSX ppx is used for React Native, type would be different.
-             *)
-           match interiorType with
-           | {ptyp_desc = Ptyp_any} -> Some (refTypeVar loc)
-           | _ ->
-             (* Strip explicit Js.Nullable.t in case of forwardRef *)
-             if stripExplicitJsNullableOfRef then stripJsNullable interiorType
-             else Some interiorType
-           (* Strip the explicit option type in implementation *)
-           (* let make = (~x: option<string>=?) => ... *)
-         else if isOptional && stripExplicitOption then stripOption interiorType
-         else Some interiorType)
-
-let makeLabelDecls namedTypeList =
-  let rec checkDuplicatedLabel l =
-    let rec mem_label ((_, (la : string), _, _, _) as x) = function
-      | [] -> false
-      | (_, (lb : string), _, _, _) :: l -> lb = la || mem_label x l
-    in
-    match l with
-    | [] -> ()
-    | hd :: tl ->
-      if mem_label hd tl then
-        let _, label, _, loc, _ = hd in
-        Jsx_common.raiseError ~loc "JSX: found the duplicated prop `%s`" label
-      else checkDuplicatedLabel tl
-  in
-  let () = namedTypeList |> List.rev |> checkDuplicatedLabel in
-
-  namedTypeList
-  |> List.map (fun (isOptional, label, attrs, loc, interiorType) ->
-         if label = "key" then
-           Type.field ~loc ~attrs:(optionalAttrs @ attrs) {txt = label; loc}
-             interiorType
-         else if isOptional then
-           Type.field ~loc ~attrs:(optionalAttrs @ attrs) {txt = label; loc}
-             (Typ.var @@ safeTypeFromValue @@ Labelled label)
-         else
-           Type.field ~loc ~attrs {txt = label; loc}
-             (Typ.var @@ safeTypeFromValue @@ Labelled label))
-
-let makeTypeDecls ~attrs propsName loc namedTypeList =
-  let labelDeclList = makeLabelDecls namedTypeList in
-  (* 'id, 'className, ... *)
-  let params =
-    makePropsTypeParamsTvar namedTypeList
-    |> List.map (fun coreType -> (coreType, Invariant))
-  in
-  [
-    Type.mk ~attrs ~loc ~params {txt = propsName; loc}
-      ~kind:(Ptype_record labelDeclList);
-  ]
-
-let makeTypeDeclsWithCoreType propsName loc coreType typVars =
-  [
-    Type.mk ~loc {txt = propsName; loc} ~kind:Ptype_abstract
-      ~params:(typVars |> List.map (fun v -> (v, Invariant)))
-      ~manifest:coreType;
-  ]
-
-let live_attr = ({txt = "live"; loc = Location.none}, PStr [])
-
-(* type props<'x, 'y, ...> = { x: 'x, y?: 'y, ... } *)
-let makePropsRecordType ~coreTypeOfAttr ~external_ ~typVarsOfCoreType propsName
-    loc namedTypeList =
-  let attrs = if external_ then [live_attr] else [] in
-  Str.type_ Nonrecursive
-    (match coreTypeOfAttr with
-    | None -> makeTypeDecls ~attrs propsName loc namedTypeList
-    | Some coreType ->
-      makeTypeDeclsWithCoreType propsName loc coreType typVarsOfCoreType)
-
-(* type props<'x, 'y, ...> = { x: 'x, y?: 'y, ... } *)
-let makePropsRecordTypeSig ~coreTypeOfAttr ~external_ ~typVarsOfCoreType
-    propsName loc namedTypeList =
-  let attrs = if external_ then [live_attr] else [] in
-  Sig.type_ Nonrecursive
-    (match coreTypeOfAttr with
-    | None -> makeTypeDecls ~attrs propsName loc namedTypeList
-    | Some coreType ->
-      makeTypeDeclsWithCoreType propsName loc coreType typVarsOfCoreType)
-
-let transformUppercaseCall3 ~config modulePath mapper jsxExprLoc callExprLoc
-    attrs callArguments =
-  let children, argsWithLabels =
-    extractChildren ~removeLastPositionUnit:true ~loc:jsxExprLoc callArguments
-  in
-  let argsForMake = argsWithLabels in
-  let childrenExpr = transformChildrenIfListUpper ~mapper children in
-  let recursivelyTransformedArgsForMake =
-    argsForMake
-    |> List.map (fun (label, expression) ->
-           (label, mapper.expr mapper expression))
-  in
-  let childrenArg = ref None in
-  let args =
-    recursivelyTransformedArgsForMake
-    @
-    match childrenExpr with
-    | Exact children -> [(labelled "children", children)]
-    | ListLiteral {pexp_desc = Pexp_array list} when list = [] -> []
-    | ListLiteral expression -> (
-      (* this is a hack to support react components that introspect into their children *)
-      childrenArg := Some expression;
-      match config.Jsx_common.mode with
-      | "automatic" ->
-        [
-          ( labelled "children",
-            Exp.apply
-              (Exp.ident
-                 {txt = moduleAccessName config "array"; loc = Location.none})
-              [(Nolabel, expression)] );
-        ]
-      | _ ->
-        [
-          ( labelled "children",
-            Exp.ident {loc = Location.none; txt = Ldot (Lident "React", "null")}
-          );
-        ])
-  in
-
-  let isCap str = String.capitalize_ascii str = str in
-  let ident ~suffix =
-    match modulePath with
-    | Lident _ -> Ldot (modulePath, suffix)
-    | Ldot (_modulePath, value) as fullPath when isCap value ->
-      Ldot (fullPath, suffix)
-    | modulePath -> modulePath
-  in
-  let isEmptyRecord {pexp_desc} =
-    match pexp_desc with
-    | Pexp_record (labelDecls, _) when List.length labelDecls = 0 -> true
-    | _ -> false
-  in
-
-  (* handle key, ref, children *)
-  (* React.createElement(Component.make, props, ...children) *)
-  let record = recordFromProps ~loc:jsxExprLoc ~removeKey:true args in
-  let props =
-    if isEmptyRecord record then emptyRecord ~loc:jsxExprLoc else record
-  in
-  let keyProp =
-    args |> List.filter (fun (arg_label, _) -> "key" = getLabel arg_label)
-  in
-  let makeID =
-    Exp.ident ~loc:callExprLoc {txt = ident ~suffix:"make"; loc = callExprLoc}
-  in
-  match config.mode with
-  (* The new jsx transform *)
-  | "automatic" ->
-    let jsxExpr, keyAndUnit =
-      match (!childrenArg, keyProp) with
-      | None, key :: _ ->
-        ( Exp.ident
-            {loc = Location.none; txt = moduleAccessName config "jsxKeyed"},
-          [key; (nolabel, unitExpr ~loc:Location.none)] )
-      | None, [] ->
-        ( Exp.ident {loc = Location.none; txt = moduleAccessName config "jsx"},
-          [] )
-      | Some _, key :: _ ->
-        ( Exp.ident
-            {loc = Location.none; txt = moduleAccessName config "jsxsKeyed"},
-          [key; (nolabel, unitExpr ~loc:Location.none)] )
-      | Some _, [] ->
-        ( Exp.ident {loc = Location.none; txt = moduleAccessName config "jsxs"},
-          [] )
-    in
-    Exp.apply ~loc:jsxExprLoc ~attrs jsxExpr
-      ([(nolabel, makeID); (nolabel, props)] @ keyAndUnit)
-  | _ -> (
-    match (!childrenArg, keyProp) with
-    | None, key :: _ ->
-      Exp.apply ~loc:jsxExprLoc ~attrs
-        (Exp.ident
-           {
-             loc = Location.none;
-             txt = Ldot (Lident "JsxPPXReactSupport", "createElementWithKey");
-           })
-        [key; (nolabel, makeID); (nolabel, props)]
-    | None, [] ->
-      Exp.apply ~loc:jsxExprLoc ~attrs
-        (Exp.ident
-           {loc = Location.none; txt = Ldot (Lident "React", "createElement")})
-        [(nolabel, makeID); (nolabel, props)]
-    | Some children, key :: _ ->
-      Exp.apply ~loc:jsxExprLoc ~attrs
-        (Exp.ident
-           {
-             loc = Location.none;
-             txt =
-               Ldot (Lident "JsxPPXReactSupport", "createElementVariadicWithKey");
-           })
-        [key; (nolabel, makeID); (nolabel, props); (nolabel, children)]
-    | Some children, [] ->
-      Exp.apply ~loc:jsxExprLoc ~attrs
-        (Exp.ident
-           {
-             loc = Location.none;
-             txt = Ldot (Lident "React", "createElementVariadic");
-           })
-        [(nolabel, makeID); (nolabel, props); (nolabel, children)])
-
-let transformLowercaseCall3 ~config mapper jsxExprLoc callExprLoc attrs
-    callArguments id =
-  let componentNameExpr = constantString ~loc:callExprLoc id in
-  match config.Jsx_common.mode with
-  (* the new jsx transform *)
-  | "automatic" ->
-    let elementBinding =
-      match config.module_ |> String.lowercase_ascii with
-      | "react" -> Lident "ReactDOM"
-      | _generic -> moduleAccessName config "Elements"
-    in
-
-    let children, nonChildrenProps =
-      extractChildren ~removeLastPositionUnit:true ~loc:jsxExprLoc callArguments
-    in
-    let argsForMake = nonChildrenProps in
-    let childrenExpr = transformChildrenIfListUpper ~mapper children in
-    let recursivelyTransformedArgsForMake =
-      argsForMake
-      |> List.map (fun (label, expression) ->
-             (label, mapper.expr mapper expression))
-    in
-    let childrenArg = ref None in
-    let args =
-      recursivelyTransformedArgsForMake
-      @
-      match childrenExpr with
-      | Exact children ->
-        [
-          ( labelled "children",
-            Exp.apply ~attrs:optionalAttrs
-              (Exp.ident
-                 {
-                   txt = Ldot (elementBinding, "someElement");
-                   loc = Location.none;
-                 })
-              [(Nolabel, children)] );
-        ]
-      | ListLiteral {pexp_desc = Pexp_array list} when list = [] -> []
-      | ListLiteral expression ->
-        (* this is a hack to support react components that introspect into their children *)
-        childrenArg := Some expression;
-        [
-          ( labelled "children",
-            Exp.apply
-              (Exp.ident
-                 {txt = moduleAccessName config "array"; loc = Location.none})
-              [(Nolabel, expression)] );
-        ]
-    in
-    let isEmptyRecord {pexp_desc} =
-      match pexp_desc with
-      | Pexp_record (labelDecls, _) when List.length labelDecls = 0 -> true
-      | _ -> false
-    in
-    let record = recordFromProps ~loc:jsxExprLoc ~removeKey:true args in
-    let props =
-      if isEmptyRecord record then emptyRecord ~loc:jsxExprLoc else record
-    in
-    let keyProp =
-      args |> List.filter (fun (arg_label, _) -> "key" = getLabel arg_label)
-    in
-    let jsxExpr, keyAndUnit =
-      match (!childrenArg, keyProp) with
-      | None, key :: _ ->
-        ( Exp.ident
-            {loc = Location.none; txt = Ldot (elementBinding, "jsxKeyed")},
-          [key; (nolabel, unitExpr ~loc:Location.none)] )
-      | None, [] ->
-        (Exp.ident {loc = Location.none; txt = Ldot (elementBinding, "jsx")}, [])
-      | Some _, key :: _ ->
-        ( Exp.ident
-            {loc = Location.none; txt = Ldot (elementBinding, "jsxsKeyed")},
-          [key; (nolabel, unitExpr ~loc:Location.none)] )
-      | Some _, [] ->
-        ( Exp.ident {loc = Location.none; txt = Ldot (elementBinding, "jsxs")},
-          [] )
-    in
-    Exp.apply ~loc:jsxExprLoc ~attrs jsxExpr
-      ([(nolabel, componentNameExpr); (nolabel, props)] @ keyAndUnit)
-  | _ ->
-    let children, nonChildrenProps =
-      extractChildren ~loc:jsxExprLoc callArguments
-    in
-    let childrenExpr = transformChildrenIfList ~mapper children in
-    let createElementCall =
-      match children with
-      (* [@JSX] div(~children=[a]), coming from <div> a </div> *)
-      | {
-       pexp_desc =
-         ( Pexp_construct ({txt = Lident "::"}, Some {pexp_desc = Pexp_tuple _})
-         | Pexp_construct ({txt = Lident "[]"}, None) );
-      } ->
-        "createDOMElementVariadic"
-      (* [@JSX] div(~children= value), coming from <div> ...(value) </div> *)
-      | {pexp_loc} ->
-        Jsx_common.raiseError ~loc:pexp_loc
-          "A spread as a DOM element's children don't make sense written \
-           together. You can simply remove the spread."
-    in
-    let args =
-      match nonChildrenProps with
-      | [_justTheUnitArgumentAtEnd] ->
-        [
-          (* "div" *)
-          (nolabel, componentNameExpr);
-          (* [|moreCreateElementCallsHere|] *)
-          (nolabel, childrenExpr);
-        ]
-      | nonEmptyProps ->
-        let propsRecord =
-          recordFromProps ~loc:Location.none ~removeKey:false nonEmptyProps
-        in
-        [
-          (* "div" *)
-          (nolabel, componentNameExpr);
-          (* ReactDOM.domProps(~className=blabla, ~foo=bar, ()) *)
-          (labelled "props", propsRecord);
-          (* [|moreCreateElementCallsHere|] *)
-          (nolabel, childrenExpr);
-        ]
-    in
-    Exp.apply ~loc:jsxExprLoc ~attrs
-      (* ReactDOM.createElement *)
-      (Exp.ident
-         {
-           loc = Location.none;
-           txt = Ldot (Lident "ReactDOM", createElementCall);
-         })
-      args
-
-let rec recursivelyTransformNamedArgsForMake expr args newtypes coreType =
-  match expr.pexp_desc with
-  (* TODO: make this show up with a loc. *)
-  | Pexp_fun (Labelled "key", _, _, _) | Pexp_fun (Optional "key", _, _, _) ->
-    Jsx_common.raiseError ~loc:expr.pexp_loc
-      "Key cannot be accessed inside of a component. Don't worry - you can \
-       always key a component from its parent!"
-  | Pexp_fun (Labelled "ref", _, _, _) | Pexp_fun (Optional "ref", _, _, _) ->
-    Jsx_common.raiseError ~loc:expr.pexp_loc
-      "Ref cannot be passed as a normal prop. Please use `forwardRef` API \
-       instead."
-  | Pexp_fun (arg, default, pattern, expression)
-    when isOptional arg || isLabelled arg ->
-    let () =
-      match (isOptional arg, pattern, default) with
-      | true, {ppat_desc = Ppat_constraint (_, {ptyp_desc})}, None -> (
-        match ptyp_desc with
-        | Ptyp_constr ({txt = Lident "option"}, [_]) -> ()
-        | _ ->
-          let currentType =
-            match ptyp_desc with
-            | Ptyp_constr ({txt}, []) ->
-              String.concat "." (Longident.flatten txt)
-            | Ptyp_constr ({txt}, _innerTypeArgs) ->
-              String.concat "." (Longident.flatten txt) ^ "(...)"
-            | _ -> "..."
-          in
-          Location.prerr_warning pattern.ppat_loc
-            (Preprocessor
-               (Printf.sprintf
-                  "React: optional argument annotations must have explicit \
-                   `option`. Did you mean `option<%s>=?`?"
-                  currentType)))
-      | _ -> ()
-    in
-    let alias =
-      match pattern with
-      | {
-       ppat_desc =
-         ( Ppat_alias (_, {txt})
-         | Ppat_var {txt}
-         | Ppat_constraint ({ppat_desc = Ppat_var {txt}}, _) );
-      } ->
-        txt
-      | {ppat_desc = Ppat_any} -> "_"
-      | _ -> getLabel arg
-    in
-    let type_ =
-      match pattern with
-      | {ppat_desc = Ppat_constraint (_, {ptyp_desc = Ptyp_package _})} -> None
-      | {ppat_desc = Ppat_constraint (_, type_)} -> Some type_
-      | _ -> None
-    in
-
-    recursivelyTransformNamedArgsForMake expression
-      ((arg, default, pattern, alias, pattern.ppat_loc, type_) :: args)
-      newtypes coreType
-  | Pexp_fun
-      ( Nolabel,
-        _,
-        {ppat_desc = Ppat_construct ({txt = Lident "()"}, _) | Ppat_any},
-        _expression ) ->
-    (args, newtypes, coreType)
-  | Pexp_fun
-      ( Nolabel,
-        _,
-        ({
-           ppat_desc =
-             Ppat_var {txt} | Ppat_constraint ({ppat_desc = Ppat_var {txt}}, _);
-         } as pattern),
-        _expression ) ->
-    if txt = "ref" then
-      let type_ =
-        match pattern with
-        | {ppat_desc = Ppat_constraint (_, type_)} -> Some type_
-        | _ -> None
-      in
-      (* The ref arguement of forwardRef should be optional *)
-      ( (Optional "ref", None, pattern, txt, pattern.ppat_loc, type_) :: args,
-        newtypes,
-        coreType )
-    else (args, newtypes, coreType)
-  | Pexp_fun (Nolabel, _, pattern, _expression) ->
-    Location.raise_errorf ~loc:pattern.ppat_loc
-      "React: react.component refs only support plain arguments and type \
-       annotations."
-  | Pexp_newtype (label, expression) ->
-    recursivelyTransformNamedArgsForMake expression args (label :: newtypes)
-      coreType
-  | Pexp_constraint (expression, coreType) ->
-    recursivelyTransformNamedArgsForMake expression args newtypes
-      (Some coreType)
-  | _ -> (args, newtypes, coreType)
-
-let argToType types
-    ((name, default, {ppat_attributes = attrs}, _alias, loc, type_) :
-      arg_label * expression option * pattern * label * 'loc * core_type option)
-    =
-  match (type_, name, default) with
-  | Some type_, name, _ when isOptional name ->
-    (true, getLabel name, attrs, loc, type_) :: types
-  | Some type_, name, _ -> (false, getLabel name, attrs, loc, type_) :: types
-  | None, name, _ when isOptional name ->
-    (true, getLabel name, attrs, loc, Typ.any ~loc ()) :: types
-  | None, name, _ when isLabelled name ->
-    (false, getLabel name, attrs, loc, Typ.any ~loc ()) :: types
-  | _ -> types
-
-let hasDefaultValue nameArgList =
-  nameArgList
-  |> List.exists (fun (name, default, _, _, _, _) ->
-         Option.is_some default && isOptional name)
-
-let argToConcreteType types (name, attrs, loc, type_) =
-  match name with
-  | name when isLabelled name ->
-    (false, getLabel name, attrs, loc, type_) :: types
-  | name when isOptional name ->
-    (true, getLabel name, attrs, loc, type_) :: types
-  | _ -> types
-
-let check_string_int_attribute_iter =
-  let attribute _ ({txt; loc}, _) =
-    if txt = "string" || txt = "int" then
-      Jsx_common.raiseError ~loc
-        "@string and @int attributes not supported. See \
-         https://github.com/rescript-lang/rescript-compiler/issues/5724"
-  in
-
-  {Ast_iterator.default_iterator with attribute}
-
-let checkMultipleComponents ~config ~loc =
-  (* If there is another component, throw error *)
-  if config.Jsx_common.hasComponent then
-    Jsx_common.raiseErrorMultipleComponent ~loc
-  else config.hasComponent <- true
-
-let modifiedBindingOld binding =
-  let expression = binding.pvb_expr in
-  (* TODO: there is a long-tail of unsupported features inside of blocks - Pexp_letmodule , Pexp_letexception , Pexp_ifthenelse *)
-  let rec spelunkForFunExpression expression =
-    match expression with
-    (* let make = (~prop) => ... *)
-    | {pexp_desc = Pexp_fun _} | {pexp_desc = Pexp_newtype _} -> expression
-    (* let make = {let foo = bar in (~prop) => ...} *)
-    | {pexp_desc = Pexp_let (_recursive, _vbs, returnExpression)} ->
-      (* here's where we spelunk! *)
-      spelunkForFunExpression returnExpression
-    (* let make = React.forwardRef((~prop) => ...) *)
-    | {
-     pexp_desc =
-       Pexp_apply (_wrapperExpression, [(Nolabel, innerFunctionExpression)]);
-    } ->
-      spelunkForFunExpression innerFunctionExpression
-    | {pexp_desc = Pexp_sequence (_wrapperExpression, innerFunctionExpression)}
-      ->
-      spelunkForFunExpression innerFunctionExpression
-    | {pexp_desc = Pexp_constraint (innerFunctionExpression, _typ)} ->
-      spelunkForFunExpression innerFunctionExpression
-    | {pexp_loc} ->
-      Jsx_common.raiseError ~loc:pexp_loc
-        "JSX component calls can only be on function definitions or component \
-         wrappers (forwardRef, memo)."
-  in
-  spelunkForFunExpression expression
-
-let modifiedBinding ~bindingLoc ~bindingPatLoc ~fnName binding =
-  let hasApplication = ref false in
-  let wrapExpressionWithBinding expressionFn expression =
-    Vb.mk ~loc:bindingLoc ~attrs:binding.pvb_attributes
-      (Pat.var ~loc:bindingPatLoc {loc = bindingPatLoc; txt = fnName})
-      (expressionFn expression)
-  in
-  let expression = binding.pvb_expr in
-  (* TODO: there is a long-tail of unsupported features inside of blocks - Pexp_letmodule , Pexp_letexception , Pexp_ifthenelse *)
-  let rec spelunkForFunExpression expression =
-    match expression with
-    (* let make = (~prop) => ... with no final unit *)
-    | {
-     pexp_desc =
-       Pexp_fun
-         ( ((Labelled _ | Optional _) as label),
-           default,
-           pattern,
-           ({pexp_desc = Pexp_fun _} as internalExpression) );
-    } ->
-      let wrap, hasForwardRef, exp =
-        spelunkForFunExpression internalExpression
-      in
-      ( wrap,
-        hasForwardRef,
-        {expression with pexp_desc = Pexp_fun (label, default, pattern, exp)} )
-    (* let make = (()) => ... *)
-    (* let make = (_) => ... *)
-    | {
-     pexp_desc =
-       Pexp_fun
-         ( Nolabel,
-           _default,
-           {ppat_desc = Ppat_construct ({txt = Lident "()"}, _) | Ppat_any},
-           _internalExpression );
-    } ->
-      ((fun a -> a), false, expression)
-    (* let make = (~prop) => ... *)
-    | {
-     pexp_desc =
-       Pexp_fun
-         ((Labelled _ | Optional _), _default, _pattern, _internalExpression);
-    } ->
-      ((fun a -> a), false, expression)
-    (* let make = (prop) => ... *)
-    | {pexp_desc = Pexp_fun (_nolabel, _default, pattern, _internalExpression)}
-      ->
-      if !hasApplication then ((fun a -> a), false, expression)
-      else
-        Location.raise_errorf ~loc:pattern.ppat_loc
-          "React: props need to be labelled arguments.\n\
-          \  If you are working with refs be sure to wrap with React.forwardRef.\n\
-          \  If your component doesn't have any props use () or _ instead of a \
-           name."
-    (* let make = {let foo = bar in (~prop) => ...} *)
-    | {pexp_desc = Pexp_let (recursive, vbs, internalExpression)} ->
-      (* here's where we spelunk! *)
-      let wrap, hasForwardRef, exp =
-        spelunkForFunExpression internalExpression
-      in
-      ( wrap,
-        hasForwardRef,
-        {expression with pexp_desc = Pexp_let (recursive, vbs, exp)} )
-    (* let make = React.forwardRef((~prop) => ...) *)
-    | {
-     pexp_desc = Pexp_apply (wrapperExpression, [(Nolabel, internalExpression)]);
-    } ->
-      let () = hasApplication := true in
-      let _, _, exp = spelunkForFunExpression internalExpression in
-      let hasForwardRef = isForwardRef wrapperExpression in
-      ( (fun exp -> Exp.apply wrapperExpression [(nolabel, exp)]),
-        hasForwardRef,
-        exp )
-    | {pexp_desc = Pexp_sequence (wrapperExpression, internalExpression)} ->
-      let wrap, hasForwardRef, exp =
-        spelunkForFunExpression internalExpression
-      in
-      ( wrap,
-        hasForwardRef,
-        {expression with pexp_desc = Pexp_sequence (wrapperExpression, exp)} )
-    | e -> ((fun a -> a), false, e)
-  in
-  let wrapExpression, hasForwardRef, expression =
-    spelunkForFunExpression expression
-  in
-  (wrapExpressionWithBinding wrapExpression, hasForwardRef, expression)
-
-let vbMatch ~expr (name, default, _, alias, loc, _) =
-  let label = getLabel name in
-  match default with
-  | Some default ->
-    let value_binding =
-      Vb.mk
-        (Pat.var (Location.mkloc alias loc))
-        (Exp.match_
-           (Exp.ident {txt = Lident ("__" ^ alias); loc = Location.none})
-           [
-             Exp.case
-               (Pat.construct
-                  (Location.mknoloc @@ Lident "Some")
-                  (Some (Pat.var (Location.mknoloc label))))
-               (Exp.ident (Location.mknoloc @@ Lident label));
-             Exp.case
-               (Pat.construct (Location.mknoloc @@ Lident "None") None)
-               default;
-           ])
-    in
-    Exp.let_ Nonrecursive [value_binding] expr
-  | None -> expr
-
-let vbMatchExpr namedArgList expr =
-  let rec aux namedArgList =
-    match namedArgList with
-    | [] -> expr
-    | namedArg :: rest -> vbMatch namedArg ~expr:(aux rest)
-  in
-  aux (List.rev namedArgList)
-
-let mapBinding ~config ~emptyLoc ~pstr_loc ~fileName ~recFlag binding =
-  if Jsx_common.hasAttrOnBinding binding then (
-    checkMultipleComponents ~config ~loc:pstr_loc;
-    let binding = Jsx_common.removeArity binding in
-    let coreTypeOfAttr = Jsx_common.coreTypeOfAttrs binding.pvb_attributes in
-    let typVarsOfCoreType =
-      coreTypeOfAttr
-      |> Option.map Jsx_common.typVarsOfCoreType
-      |> Option.value ~default:[]
-    in
-    let bindingLoc = binding.pvb_loc in
-    let bindingPatLoc = binding.pvb_pat.ppat_loc in
-    let binding =
-      {
-        binding with
-        pvb_pat = {binding.pvb_pat with ppat_loc = emptyLoc};
-        pvb_loc = emptyLoc;
-        pvb_attributes = binding.pvb_attributes |> List.filter otherAttrsPure;
-      }
-    in
-    let fnName = getFnName binding.pvb_pat in
-    let internalFnName = fnName ^ "$Internal" in
-    let fullModuleName = makeModuleName fileName config.nestedModules fnName in
-    let bindingWrapper, hasForwardRef, expression =
-      modifiedBinding ~bindingLoc ~bindingPatLoc ~fnName binding
-    in
-    let isAsync =
-      Ext_list.find_first binding.pvb_expr.pexp_attributes Ast_async.is_async
-      |> Option.is_some
-    in
-    (* do stuff here! *)
-    let namedArgList, newtypes, _typeConstraints =
-      recursivelyTransformNamedArgsForMake
-        (modifiedBindingOld binding)
-        [] [] None
-    in
-    let namedTypeList = List.fold_left argToType [] namedArgList in
-    (* type props = { ... } *)
-    let propsRecordType =
-      makePropsRecordType ~coreTypeOfAttr ~external_:false ~typVarsOfCoreType
-        "props" pstr_loc namedTypeList
-    in
-    let innerExpression =
-      Exp.apply
-        (Exp.ident
-           (Location.mknoloc
-           @@ Lident
-                (match recFlag with
-                | Recursive -> internalFnName
-                | Nonrecursive -> fnName)))
-        ([(Nolabel, Exp.ident (Location.mknoloc @@ Lident "props"))]
-        @
-        match hasForwardRef with
-        | true -> [(Nolabel, Exp.ident (Location.mknoloc @@ Lident "ref"))]
-        | false -> [])
-    in
-    let makePropsPattern = function
-      | [] -> Pat.var @@ Location.mknoloc "props"
-      | _ ->
-        Pat.constraint_
-          (Pat.var @@ Location.mknoloc "props")
-          (Typ.constr (Location.mknoloc @@ Lident "props") [Typ.any ()])
-    in
-    let innerExpression =
-      Jsx_common.async_component ~async:isAsync innerExpression
-    in
-    let fullExpression =
-      (* React component name should start with uppercase letter *)
-      (* let make = { let \"App" = props => make(props); \"App" } *)
-      (* let make = React.forwardRef({
-           let \"App" = (props, ref) => make({...props, ref: @optional (Js.Nullabel.toOption(ref))})
-         })*)
-      Exp.fun_ nolabel None
-        (match coreTypeOfAttr with
-        | None -> makePropsPattern namedTypeList
-        | Some _ -> makePropsPattern typVarsOfCoreType)
-        (if hasForwardRef then
-           Exp.fun_ nolabel None
-             (Pat.var @@ Location.mknoloc "ref")
-             innerExpression
-         else innerExpression)
-    in
-    let fullExpression =
-      if !Config.uncurried = Uncurried then
-        fullExpression
-        |> Ast_uncurried.uncurriedFun ~loc:fullExpression.pexp_loc
-             ~arity:(if hasForwardRef then 2 else 1)
-      else fullExpression
-    in
-    let fullExpression =
-      match fullModuleName with
-      | "" -> fullExpression
-      | txt ->
-        Exp.let_ Nonrecursive
-          [
-            Vb.mk ~loc:emptyLoc
-              (Pat.var ~loc:emptyLoc {loc = emptyLoc; txt})
-              fullExpression;
-          ]
-          (Exp.ident ~loc:pstr_loc {loc = emptyLoc; txt = Lident txt})
-    in
-    let rec stripConstraintUnpack ~label pattern =
-      match pattern with
-      | {ppat_desc = Ppat_constraint (_, {ptyp_desc = Ptyp_package _})} ->
-        pattern
-      | {ppat_desc = Ppat_constraint (pattern, _)} ->
-        stripConstraintUnpack ~label pattern
-      | _ -> pattern
-    in
-    let safePatternLabel pattern =
-      match pattern with
-      | {ppat_desc = Ppat_var {txt; loc}} ->
-        {pattern with ppat_desc = Ppat_var {txt = "__" ^ txt; loc}}
-      | {ppat_desc = Ppat_alias (p, {txt; loc})} ->
-        {pattern with ppat_desc = Ppat_alias (p, {txt = "__" ^ txt; loc})}
-      | _ -> pattern
-    in
-    let rec returnedExpression patternsWithLabel patternsWithNolabel
-        ({pexp_desc} as expr) =
-      match pexp_desc with
-      | Pexp_newtype (_, expr) ->
-        returnedExpression patternsWithLabel patternsWithNolabel expr
-      | Pexp_constraint (expr, _) ->
-        returnedExpression patternsWithLabel patternsWithNolabel expr
-      | Pexp_fun
-          ( _arg_label,
-            _default,
-            {ppat_desc = Ppat_construct ({txt = Lident "()"}, _)},
-            expr ) ->
-        (patternsWithLabel, patternsWithNolabel, expr)
-      | Pexp_fun (arg_label, default, ({ppat_loc; ppat_desc} as pattern), expr)
-        -> (
-        let patternWithoutConstraint =
-          stripConstraintUnpack ~label:(getLabel arg_label) pattern
-        in
-        (*
-           If prop has the default value as Ident, it will get a build error
-           when the referenced Ident value and the prop have the same name.
-           So we add a "__" to label to resolve the build error.
-        *)
-        let patternWithSafeLabel =
-          match default with
-          | Some _ -> safePatternLabel patternWithoutConstraint
-          | _ -> patternWithoutConstraint
-        in
-        if isLabelled arg_label || isOptional arg_label then
-          returnedExpression
-            (( {loc = ppat_loc; txt = Lident (getLabel arg_label)},
-               {
-                 patternWithSafeLabel with
-                 ppat_attributes =
-                   (if isOptional arg_label then optionalAttrs else [])
-                   @ pattern.ppat_attributes;
-               } )
-            :: patternsWithLabel)
-            patternsWithNolabel expr
-        else
-          (* Special case of nolabel arg "ref" in forwardRef fn *)
-          (* let make = React.forwardRef(ref => body) *)
-          match ppat_desc with
-          | Ppat_var {txt} | Ppat_constraint ({ppat_desc = Ppat_var {txt}}, _)
-            ->
-            returnedExpression patternsWithLabel
-              (( {loc = ppat_loc; txt = Lident txt},
-                 {
-                   pattern with
-                   ppat_attributes = optionalAttrs @ pattern.ppat_attributes;
-                 } )
-              :: patternsWithNolabel)
-              expr
-          | _ -> returnedExpression patternsWithLabel patternsWithNolabel expr)
-      | _ -> (patternsWithLabel, patternsWithNolabel, expr)
-    in
-    let patternsWithLabel, patternsWithNolabel, expression =
-      returnedExpression [] [] expression
-    in
-    (* add pattern matching for optional prop value *)
-    let expression =
-      if hasDefaultValue namedArgList then vbMatchExpr namedArgList expression
-      else expression
-    in
-    (* (ref) => expr *)
-    let expression =
-      List.fold_left
-        (fun expr (_, pattern) ->
-          let pattern =
-            match pattern.ppat_desc with
-            | Ppat_var {txt} when txt = "ref" ->
-              Pat.constraint_ pattern (refType Location.none)
-            | _ -> pattern
-          in
-          Exp.fun_ Nolabel None pattern expr)
-        expression patternsWithNolabel
-    in
-    (* ({a, b, _}: props<'a, 'b>) *)
-    let recordPattern =
-      match patternsWithLabel with
-      | [] -> Pat.any ()
-      | _ -> Pat.record (List.rev patternsWithLabel) Open
-    in
-    let expression =
-      Exp.fun_ Nolabel None
-        (Pat.constraint_ recordPattern
-           (Typ.constr ~loc:emptyLoc
-              {txt = Lident "props"; loc = emptyLoc}
-              (match coreTypeOfAttr with
-              | None ->
-                makePropsTypeParams ~stripExplicitOption:true
-                  ~stripExplicitJsNullableOfRef:hasForwardRef namedTypeList
-              | Some _ -> (
-                match typVarsOfCoreType with
-                | [] -> []
-                | _ -> [Typ.any ()]))))
-        expression
-    in
-    let expression = Ast_async.add_async_attribute ~async:isAsync expression in
-    let expression =
-      (* Add new tupes (type a,b,c) to make's definition *)
-      newtypes
-      |> List.fold_left (fun e newtype -> Exp.newtype newtype e) expression
-    in
-    (* let make = ({id, name, ...}: props<'id, 'name, ...>) => { ... } *)
-    let binding, newBinding =
-      match recFlag with
-      | Recursive ->
-        ( bindingWrapper
-            (Exp.let_ ~loc:emptyLoc Nonrecursive
-               [makeNewBinding binding expression internalFnName]
-               (Exp.let_ ~loc:emptyLoc Nonrecursive
-                  [
-                    Vb.mk (Pat.var {loc = emptyLoc; txt = fnName}) fullExpression;
-                  ]
-                  (Exp.ident {loc = emptyLoc; txt = Lident fnName}))),
-          None )
-      | Nonrecursive ->
-        ( {
-            binding with
-            pvb_expr = expression;
-            pvb_pat = Pat.var {txt = fnName; loc = Location.none};
-          },
-          Some (bindingWrapper fullExpression) )
-    in
-    (Some propsRecordType, binding, newBinding))
-  else (None, binding, None)
-
-let transformStructureItem ~config item =
-  match item with
-  (* external *)
-  | {
-      pstr_loc;
-      pstr_desc =
-        Pstr_primitive ({pval_attributes; pval_type} as value_description);
-    } as pstr -> (
-    match List.filter Jsx_common.hasAttr pval_attributes with
-    | [] -> [item]
-    | [_] ->
-      checkMultipleComponents ~config ~loc:pstr_loc;
-      check_string_int_attribute_iter.structure_item
-        check_string_int_attribute_iter item;
-      let pval_type = Jsx_common.extractUncurried pval_type in
-      let coreTypeOfAttr = Jsx_common.coreTypeOfAttrs pval_attributes in
-      let typVarsOfCoreType =
-        coreTypeOfAttr
-        |> Option.map Jsx_common.typVarsOfCoreType
-        |> Option.value ~default:[]
-      in
-      let rec getPropTypes types
-          ({ptyp_loc; ptyp_desc; ptyp_attributes} as fullType) =
-        match ptyp_desc with
-        | Ptyp_arrow (name, type_, ({ptyp_desc = Ptyp_arrow _} as rest))
-          when isLabelled name || isOptional name ->
-          getPropTypes ((name, ptyp_attributes, ptyp_loc, type_) :: types) rest
-        | Ptyp_arrow (Nolabel, _type, rest) -> getPropTypes types rest
-        | Ptyp_arrow (name, type_, returnValue)
-          when isLabelled name || isOptional name ->
-          ( returnValue,
-            (name, ptyp_attributes, returnValue.ptyp_loc, type_) :: types )
-        | _ -> (fullType, types)
-      in
-      let innerType, propTypes = getPropTypes [] pval_type in
-      let namedTypeList = List.fold_left argToConcreteType [] propTypes in
-      let retPropsType =
-        Typ.constr ~loc:pstr_loc
-          (Location.mkloc (Lident "props") pstr_loc)
-          (match coreTypeOfAttr with
-          | None -> makePropsTypeParams namedTypeList
-          | Some _ -> (
-            match typVarsOfCoreType with
-            | [] -> []
-            | _ -> [Typ.any ()]))
-      in
-      (* type props<'x, 'y> = { x: 'x, y?: 'y, ... } *)
-      let propsRecordType =
-        makePropsRecordType ~coreTypeOfAttr ~external_:true ~typVarsOfCoreType
-          "props" pstr_loc namedTypeList
-      in
-      (* can't be an arrow because it will defensively uncurry *)
-      let newExternalType =
-        Ptyp_constr
-          ( {loc = pstr_loc; txt = moduleAccessName config "componentLike"},
-            [retPropsType; innerType] )
-      in
-      let newStructure =
-        {
-          pstr with
-          pstr_desc =
-            Pstr_primitive
-              {
-                value_description with
-                pval_type = {pval_type with ptyp_desc = newExternalType};
-                pval_attributes = List.filter otherAttrsPure pval_attributes;
-              };
-        }
-      in
-      [propsRecordType; newStructure]
-    | _ ->
-      Jsx_common.raiseError ~loc:pstr_loc
-        "Only one JSX component call can exist on a component at one time")
-  (* let component = ... *)
-  | {pstr_loc; pstr_desc = Pstr_value (recFlag, valueBindings)} -> (
-    let fileName = filenameFromLoc pstr_loc in
-    let emptyLoc = Location.in_file fileName in
-    let processBinding binding (newItems, bindings, newBindings) =
-      let newItem, binding, newBinding =
-        mapBinding ~config ~emptyLoc ~pstr_loc ~fileName ~recFlag binding
-      in
-      let newItems =
-        match newItem with
-        | Some item -> item :: newItems
-        | None -> newItems
-      in
-      let newBindings =
-        match newBinding with
-        | Some newBinding -> newBinding :: newBindings
-        | None -> newBindings
-      in
-      (newItems, binding :: bindings, newBindings)
-    in
-    let newItems, bindings, newBindings =
-      List.fold_right processBinding valueBindings ([], [], [])
-    in
-    newItems
-    @ [{pstr_loc; pstr_desc = Pstr_value (recFlag, bindings)}]
-    @
-    match newBindings with
-    | [] -> []
-    | newBindings ->
-      [{pstr_loc = emptyLoc; pstr_desc = Pstr_value (recFlag, newBindings)}])
-  | _ -> [item]
-
-let transformSignatureItem ~config item =
-  match item with
-  | {
-      psig_loc;
-      psig_desc = Psig_value ({pval_attributes; pval_type} as psig_desc);
-    } as psig -> (
-    match List.filter Jsx_common.hasAttr pval_attributes with
-    | [] -> [item]
-    | [_] ->
-      checkMultipleComponents ~config ~loc:psig_loc;
-      let pval_type = Jsx_common.extractUncurried pval_type in
-      check_string_int_attribute_iter.signature_item
-        check_string_int_attribute_iter item;
-      let coreTypeOfAttr = Jsx_common.coreTypeOfAttrs pval_attributes in
-      let typVarsOfCoreType =
-        coreTypeOfAttr
-        |> Option.map Jsx_common.typVarsOfCoreType
-        |> Option.value ~default:[]
-      in
-      let rec getPropTypes types ({ptyp_loc; ptyp_desc} as fullType) =
-        match ptyp_desc with
-        | Ptyp_arrow
-            ( name,
-              ({ptyp_attributes = attrs} as type_),
-              ({ptyp_desc = Ptyp_arrow _} as rest) )
-          when isOptional name || isLabelled name ->
-          getPropTypes ((name, attrs, ptyp_loc, type_) :: types) rest
-        | Ptyp_arrow
-            (Nolabel, {ptyp_desc = Ptyp_constr ({txt = Lident "unit"}, _)}, rest)
-          ->
-          getPropTypes types rest
-        | Ptyp_arrow (Nolabel, _type, rest) -> getPropTypes types rest
-        | Ptyp_arrow (name, ({ptyp_attributes = attrs} as type_), returnValue)
-          when isOptional name || isLabelled name ->
-          (returnValue, (name, attrs, returnValue.ptyp_loc, type_) :: types)
-        | _ -> (fullType, types)
-      in
-      let innerType, propTypes = getPropTypes [] pval_type in
-      let namedTypeList = List.fold_left argToConcreteType [] propTypes in
-      let retPropsType =
-        Typ.constr
-          (Location.mkloc (Lident "props") psig_loc)
-          (match coreTypeOfAttr with
-          | None -> makePropsTypeParams namedTypeList
-          | Some _ -> (
-            match typVarsOfCoreType with
-            | [] -> []
-            | _ -> [Typ.any ()]))
-      in
-      let external_ = psig_desc.pval_prim <> [] in
-      let propsRecordType =
-        makePropsRecordTypeSig ~coreTypeOfAttr ~external_ ~typVarsOfCoreType
-          "props" psig_loc namedTypeList
-      in
-      (* can't be an arrow because it will defensively uncurry *)
-      let newExternalType =
-        Ptyp_constr
-          ( {loc = psig_loc; txt = moduleAccessName config "componentLike"},
-            [retPropsType; innerType] )
-      in
-      let newStructure =
-        {
-          psig with
-          psig_desc =
-            Psig_value
-              {
-                psig_desc with
-                pval_type = {pval_type with ptyp_desc = newExternalType};
-                pval_attributes = List.filter otherAttrsPure pval_attributes;
-              };
-        }
-      in
-      [propsRecordType; newStructure]
-    | _ ->
-      Jsx_common.raiseError ~loc:psig_loc
-        "Only one JSX component call can exist on a component at one time")
-  | _ -> [item]
-
-let transformJsxCall ~config mapper callExpression callArguments jsxExprLoc
-    attrs =
-  match callExpression.pexp_desc with
-  | Pexp_ident caller -> (
-    match caller with
-    | {txt = Lident "createElement"; loc} ->
-      Jsx_common.raiseError ~loc
-        "JSX: `createElement` should be preceeded by a module name."
-    (* Foo.createElement(~prop1=foo, ~prop2=bar, ~children=[], ()) *)
-    | {loc; txt = Ldot (modulePath, ("createElement" | "make"))} ->
-      transformUppercaseCall3 ~config modulePath mapper jsxExprLoc loc attrs
-        callArguments
-    (* div(~prop1=foo, ~prop2=bar, ~children=[bla], ()) *)
-    (* turn that into
-       ReactDOM.createElement(~props=ReactDOM.props(~props1=foo, ~props2=bar, ()), [|bla|]) *)
-    | {loc; txt = Lident id} ->
-      transformLowercaseCall3 ~config mapper jsxExprLoc loc attrs callArguments
-        id
-    | {txt = Ldot (_, anythingNotCreateElementOrMake); loc} ->
-      Jsx_common.raiseError ~loc
-        "JSX: the JSX attribute should be attached to a \
-         `YourModuleName.createElement` or `YourModuleName.make` call. We saw \
-         `%s` instead"
-        anythingNotCreateElementOrMake
-    | {txt = Lapply _; loc} ->
-      (* don't think there's ever a case where this is reached *)
-      Jsx_common.raiseError ~loc
-        "JSX: encountered a weird case while processing the code. Please \
-         report this!")
-  | _ ->
-    Jsx_common.raiseError ~loc:callExpression.pexp_loc
-      "JSX: `createElement` should be preceeded by a simple, direct module \
-       name."
-
-let expr ~config mapper expression =
-  match expression with
-  (* Does the function application have the @JSX attribute? *)
-  | {
-   pexp_desc = Pexp_apply (callExpression, callArguments);
-   pexp_attributes;
-   pexp_loc;
-  } -> (
-    let jsxAttribute, nonJSXAttributes =
-      List.partition
-        (fun (attribute, _) -> attribute.txt = "JSX")
-        pexp_attributes
-    in
-    match (jsxAttribute, nonJSXAttributes) with
-    (* no JSX attribute *)
-    | [], _ -> default_mapper.expr mapper expression
-    | _, nonJSXAttributes ->
-      transformJsxCall ~config mapper callExpression callArguments pexp_loc
-        nonJSXAttributes)
-  (* is it a list with jsx attribute? Reason <>foo</> desugars to [@JSX][foo]*)
-  | {
-      pexp_desc =
-        ( Pexp_construct
-            ({txt = Lident "::"; loc}, Some {pexp_desc = Pexp_tuple _})
-        | Pexp_construct ({txt = Lident "[]"; loc}, None) );
-      pexp_attributes;
-    } as listItems -> (
-    let jsxAttribute, nonJSXAttributes =
-      List.partition
-        (fun (attribute, _) -> attribute.txt = "JSX")
-        pexp_attributes
-    in
-    match (jsxAttribute, nonJSXAttributes) with
-    (* no JSX attribute *)
-    | [], _ -> default_mapper.expr mapper expression
-    | _, nonJSXAttributes ->
-      let loc = {loc with loc_ghost = true} in
-      let fragment =
-        match config.mode with
-        | "automatic" ->
-          Exp.ident ~loc {loc; txt = moduleAccessName config "jsxFragment"}
-        | "classic" | _ ->
-          Exp.ident ~loc {loc; txt = Ldot (Lident "React", "fragment")}
-      in
-      let childrenExpr = transformChildrenIfList ~mapper listItems in
-      let recordOfChildren children =
-        Exp.record [(Location.mknoloc (Lident "children"), children)] None
-      in
-      let applyJsxArray expr =
-        Exp.apply
-          (Exp.ident
-             {txt = moduleAccessName config "array"; loc = Location.none})
-          [(Nolabel, expr)]
-      in
-      let countOfChildren = function
-        | {pexp_desc = Pexp_array children} -> List.length children
-        | _ -> 0
-      in
-      let transformChildrenToProps childrenExpr =
-        match childrenExpr with
-        | {pexp_desc = Pexp_array children} -> (
-          match children with
-          | [] -> emptyRecord ~loc:Location.none
-          | [child] -> recordOfChildren child
-          | _ -> (
-            match config.mode with
-            | "automatic" -> recordOfChildren @@ applyJsxArray childrenExpr
-            | "classic" | _ -> emptyRecord ~loc:Location.none))
-        | _ -> (
-          match config.mode with
-          | "automatic" -> recordOfChildren @@ applyJsxArray childrenExpr
-          | "classic" | _ -> emptyRecord ~loc:Location.none)
-      in
-      let args =
-        (nolabel, fragment)
-        :: (nolabel, transformChildrenToProps childrenExpr)
-        ::
-        (match config.mode with
-        | "classic" when countOfChildren childrenExpr > 1 ->
-          [(nolabel, childrenExpr)]
-        | _ -> [])
-      in
-      Exp.apply
-        ~loc (* throw away the [@JSX] attribute and keep the others, if any *)
-        ~attrs:nonJSXAttributes
-        (* ReactDOM.createElement *)
-        (match config.mode with
-        | "automatic" ->
-          if countOfChildren childrenExpr > 1 then
-            Exp.ident ~loc {loc; txt = moduleAccessName config "jsxs"}
-          else Exp.ident ~loc {loc; txt = moduleAccessName config "jsx"}
-        | "classic" | _ ->
-          if countOfChildren childrenExpr > 1 then
-            Exp.ident ~loc
-              {loc; txt = Ldot (Lident "React", "createElementVariadic")}
-          else
-            Exp.ident ~loc {loc; txt = Ldot (Lident "React", "createElement")})
-        args)
-  (* Delegate to the default mapper, a deep identity traversal *)
-  | e -> default_mapper.expr mapper e
-
-let module_binding ~(config : Jsx_common.jsxConfig) mapper module_binding =
-  config.nestedModules <- module_binding.pmb_name.txt :: config.nestedModules;
-  let mapped = default_mapper.module_binding mapper module_binding in
-  let () =
-    match config.nestedModules with
-    | _ :: rest -> config.nestedModules <- rest
-    | [] -> ()
-  in
-  mapped
-
-(* TODO: some line number might still be wrong *)
-let jsxMapper ~config =
-  let expr = expr ~config in
-  let module_binding = module_binding ~config in
-  let transformStructureItem = transformStructureItem ~config in
-  let transformSignatureItem = transformSignatureItem ~config in
-  (expr, module_binding, transformSignatureItem, transformStructureItem)
diff --git a/jscomp/syntax/src/reactjs_jsx_v3.ml b/jscomp/syntax/src/reactjs_jsx_v3.ml
deleted file mode 100644
index 83316c9..0000000
--- a/jscomp/syntax/src/reactjs_jsx_v3.ml
+++ /dev/null
@@ -1,1196 +0,0 @@
-open Ast_helper
-open Ast_mapper
-open Asttypes
-open Parsetree
-open Longident
-
-let nolabel = Nolabel
-
-let labelled str = Labelled str
-
-let optional str = Optional str
-
-let isOptional str =
-  match str with
-  | Optional _ -> true
-  | _ -> false
-
-let isLabelled str =
-  match str with
-  | Labelled _ -> true
-  | _ -> false
-
-let getLabel str =
-  match str with
-  | Optional str | Labelled str -> str
-  | Nolabel -> ""
-
-let optionIdent = Lident "option"
-
-let constantString ~loc str =
-  Ast_helper.Exp.constant ~loc (Pconst_string (str, None))
-
-let safeTypeFromValue valueStr =
-  let valueStr = getLabel valueStr in
-  if valueStr = "" || (valueStr.[0] [@doesNotRaise]) <> '_' then valueStr
-  else "T" ^ valueStr
-
-let keyType loc =
-  Typ.constr ~loc {loc; txt = optionIdent}
-    [Typ.constr ~loc {loc; txt = Lident "string"} []]
-
-type 'a children = ListLiteral of 'a | Exact of 'a
-
-type componentConfig = {propsName: string}
-
-(* if children is a list, convert it to an array while mapping each element. If not, just map over it, as usual *)
-let transformChildrenIfListUpper ~loc ~mapper theList =
-  let rec transformChildren_ theList accum =
-    (* not in the sense of converting a list to an array; convert the AST
-       reprensentation of a list to the AST reprensentation of an array *)
-    match theList with
-    | {pexp_desc = Pexp_construct ({txt = Lident "[]"}, None)} -> (
-      match accum with
-      | [singleElement] -> Exact singleElement
-      | accum -> ListLiteral (Exp.array ~loc (List.rev accum)))
-    | {
-     pexp_desc =
-       Pexp_construct
-         ({txt = Lident "::"}, Some {pexp_desc = Pexp_tuple [v; acc]});
-    } ->
-      transformChildren_ acc (mapper.expr mapper v :: accum)
-    | notAList -> Exact (mapper.expr mapper notAList)
-  in
-  transformChildren_ theList []
-
-let transformChildrenIfList ~loc ~mapper theList =
-  let rec transformChildren_ theList accum =
-    (* not in the sense of converting a list to an array; convert the AST
-       reprensentation of a list to the AST reprensentation of an array *)
-    match theList with
-    | {pexp_desc = Pexp_construct ({txt = Lident "[]"}, None)} ->
-      Exp.array ~loc (List.rev accum)
-    | {
-     pexp_desc =
-       Pexp_construct
-         ({txt = Lident "::"}, Some {pexp_desc = Pexp_tuple [v; acc]});
-    } ->
-      transformChildren_ acc (mapper.expr mapper v :: accum)
-    | notAList -> mapper.expr mapper notAList
-  in
-  transformChildren_ theList []
-
-let extractChildren ?(removeLastPositionUnit = false) ~loc propsAndChildren =
-  let rec allButLast_ lst acc =
-    match lst with
-    | [] -> []
-    | [(Nolabel, {pexp_desc = Pexp_construct ({txt = Lident "()"}, None)})] ->
-      acc
-    | (Nolabel, {pexp_loc}) :: _rest ->
-      Jsx_common.raiseError ~loc:pexp_loc
-        "JSX: found non-labelled argument before the last position"
-    | arg :: rest -> allButLast_ rest (arg :: acc)
-  in
-  let allButLast lst = allButLast_ lst [] |> List.rev in
-  match
-    List.partition
-      (fun (label, _) -> label = labelled "children")
-      propsAndChildren
-  with
-  | [], props ->
-    (* no children provided? Place a placeholder list *)
-    ( Exp.construct ~loc {loc; txt = Lident "[]"} None,
-      if removeLastPositionUnit then allButLast props else props )
-  | [(_, childrenExpr)], props ->
-    (childrenExpr, if removeLastPositionUnit then allButLast props else props)
-  | _ ->
-    Jsx_common.raiseError ~loc
-      "JSX: somehow there's more than one `children` label"
-
-let unerasableIgnore loc =
-  ( {loc; txt = "warning"},
-    PStr [Str.eval (Exp.constant (Pconst_string ("-16", None)))] )
-
-let merlinFocus = ({loc = Location.none; txt = "merlin.focus"}, PStr [])
-
-(* Helper method to filter out any attribute that isn't [@react.component] *)
-let otherAttrsPure (loc, _) = loc.txt <> "react.component"
-
-(* Finds the name of the variable the binding is assigned to, otherwise raises Invalid_argument *)
-let rec getFnName binding =
-  match binding with
-  | {ppat_desc = Ppat_var {txt}} -> txt
-  | {ppat_desc = Ppat_constraint (pat, _)} -> getFnName pat
-  | {ppat_loc} ->
-    Jsx_common.raiseError ~loc:ppat_loc
-      "react.component calls cannot be destructured."
-
-let makeNewBinding binding expression newName =
-  match binding with
-  | {pvb_pat = {ppat_desc = Ppat_var ppat_var} as pvb_pat} ->
-    {
-      binding with
-      pvb_pat =
-        {pvb_pat with ppat_desc = Ppat_var {ppat_var with txt = newName}};
-      pvb_expr = expression;
-      pvb_attributes = [merlinFocus];
-    }
-  | {pvb_loc} ->
-    Jsx_common.raiseError ~loc:pvb_loc
-      "react.component calls cannot be destructured."
-
-(* Lookup the value of `props` otherwise raise Invalid_argument error *)
-let getPropsNameValue _acc (loc, exp) =
-  match (loc, exp) with
-  | {txt = Lident "props"}, {pexp_desc = Pexp_ident {txt = Lident str}} ->
-    {propsName = str}
-  | {txt; loc}, _ ->
-    Jsx_common.raiseError ~loc
-      "react.component only accepts props as an option, given: { %s }"
-      (Longident.last txt)
-
-(* Lookup the `props` record or string as part of [@react.component] and store the name for use when rewriting *)
-let getPropsAttr payload =
-  let defaultProps = {propsName = "Props"} in
-  match payload with
-  | Some
-      (PStr
-        ({
-           pstr_desc =
-             Pstr_eval ({pexp_desc = Pexp_record (recordFields, None)}, _);
-         }
-        :: _rest)) ->
-    List.fold_left getPropsNameValue defaultProps recordFields
-  | Some
-      (PStr
-        ({
-           pstr_desc =
-             Pstr_eval ({pexp_desc = Pexp_ident {txt = Lident "props"}}, _);
-         }
-        :: _rest)) ->
-    {propsName = "props"}
-  | Some (PStr ({pstr_desc = Pstr_eval (_, _); pstr_loc} :: _rest)) ->
-    Jsx_common.raiseError ~loc:pstr_loc
-      "react.component accepts a record config with props as an options."
-  | _ -> defaultProps
-
-(* Plucks the label, loc, and type_ from an AST node *)
-let pluckLabelDefaultLocType (label, default, _, _, loc, type_) =
-  (label, default, loc, type_)
-
-(* Lookup the filename from the location information on the AST node and turn it into a valid module identifier *)
-let filenameFromLoc (pstr_loc : Location.t) =
-  let fileName =
-    match pstr_loc.loc_start.pos_fname with
-    | "" -> !Location.input_name
-    | fileName -> fileName
-  in
-  let fileName =
-    try Filename.chop_extension (Filename.basename fileName)
-    with Invalid_argument _ -> fileName
-  in
-  let fileName = String.capitalize_ascii fileName in
-  fileName
-
-(* Build a string representation of a module name with segments separated by $ *)
-let makeModuleName fileName nestedModules fnName =
-  let fullModuleName =
-    match (fileName, nestedModules, fnName) with
-    (* TODO: is this even reachable? It seems like the fileName always exists *)
-    | "", nestedModules, "make" -> nestedModules
-    | "", nestedModules, fnName -> List.rev (fnName :: nestedModules)
-    | fileName, nestedModules, "make" -> fileName :: List.rev nestedModules
-    | fileName, nestedModules, fnName ->
-      fileName :: List.rev (fnName :: nestedModules)
-  in
-  let fullModuleName = String.concat "$" fullModuleName in
-  fullModuleName
-
-(*
-  AST node builders
-  These functions help us build AST nodes that are needed when transforming a [@react.component] into a
-  constructor and a props external
-*)
-
-(* Build an AST node representing all named args for the `external` definition for a component's props *)
-let rec recursivelyMakeNamedArgsForExternal list args =
-  match list with
-  | (label, default, loc, interiorType) :: tl ->
-    recursivelyMakeNamedArgsForExternal tl
-      (Typ.arrow ~loc label
-         (match (label, interiorType, default) with
-         (* ~foo=1 *)
-         | label, None, Some _ ->
-           {
-             ptyp_desc = Ptyp_var (safeTypeFromValue label);
-             ptyp_loc = loc;
-             ptyp_attributes = [];
-           }
-         (* ~foo: int=1 *)
-         | _label, Some type_, Some _ -> type_
-         (* ~foo: option<int>=? *)
-         | ( label,
-             Some {ptyp_desc = Ptyp_constr ({txt = Lident "option"}, [type_])},
-             _ )
-         | ( label,
-             Some
-               {
-                 ptyp_desc =
-                   Ptyp_constr
-                     ({txt = Ldot (Lident "*predef*", "option")}, [type_]);
-               },
-             _ )
-         (* ~foo: int=? - note this isnt valid. but we want to get a type error *)
-         | label, Some type_, _
-           when isOptional label ->
-           type_
-         (* ~foo=? *)
-         | label, None, _ when isOptional label ->
-           {
-             ptyp_desc = Ptyp_var (safeTypeFromValue label);
-             ptyp_loc = loc;
-             ptyp_attributes = [];
-           }
-         (* ~foo *)
-         | label, None, _ ->
-           {
-             ptyp_desc = Ptyp_var (safeTypeFromValue label);
-             ptyp_loc = loc;
-             ptyp_attributes = [];
-           }
-         | _label, Some type_, _ -> type_)
-         args)
-  | [] -> args
-
-(* Build an AST node for the [@bs.obj] representing props for a component *)
-let makePropsValue fnName loc namedArgListWithKeyAndRef propsType =
-  let propsName = fnName ^ "Props" in
-  {
-    pval_name = {txt = propsName; loc};
-    pval_type =
-      recursivelyMakeNamedArgsForExternal namedArgListWithKeyAndRef
-        (Typ.arrow nolabel
-           {
-             ptyp_desc = Ptyp_constr ({txt = Lident "unit"; loc}, []);
-             ptyp_loc = loc;
-             ptyp_attributes = [];
-           }
-           propsType);
-    pval_prim = [""];
-    pval_attributes = [({txt = "bs.obj"; loc}, PStr [])];
-    pval_loc = loc;
-  }
-
-(* Build an AST node representing an `external` with the definition of the [@bs.obj] *)
-let makePropsExternal fnName loc namedArgListWithKeyAndRef propsType =
-  {
-    pstr_loc = loc;
-    pstr_desc =
-      Pstr_primitive
-        (makePropsValue fnName loc namedArgListWithKeyAndRef propsType);
-  }
-
-(* Build an AST node for the signature of the `external` definition *)
-let makePropsExternalSig fnName loc namedArgListWithKeyAndRef propsType =
-  {
-    psig_loc = loc;
-    psig_desc =
-      Psig_value (makePropsValue fnName loc namedArgListWithKeyAndRef propsType);
-  }
-
-(* Build an AST node for the props name when converted to an object inside the function signature  *)
-let makePropsName ~loc name =
-  {ppat_desc = Ppat_var {txt = name; loc}; ppat_loc = loc; ppat_attributes = []}
-
-let makeObjectField loc (str, attrs, type_) =
-  Otag ({loc; txt = str}, attrs, type_)
-
-(* Build an AST node representing a "closed" object representing a component's props *)
-let makePropsType ~loc namedTypeList =
-  Typ.mk ~loc
-    (Ptyp_object (List.map (makeObjectField loc) namedTypeList, Closed))
-
-(* Builds an AST node for the entire `external` definition of props *)
-let makeExternalDecl fnName loc namedArgListWithKeyAndRef namedTypeList =
-  makePropsExternal fnName loc
-    (List.map pluckLabelDefaultLocType namedArgListWithKeyAndRef)
-    (makePropsType ~loc namedTypeList)
-
-let newtypeToVar newtype type_ =
-  let var_desc = Ptyp_var ("type-" ^ newtype) in
-  let typ (mapper : Ast_mapper.mapper) typ =
-    match typ.ptyp_desc with
-    | Ptyp_constr ({txt = Lident name}, _) when name = newtype ->
-      {typ with ptyp_desc = var_desc}
-    | _ -> Ast_mapper.default_mapper.typ mapper typ
-  in
-  let mapper = {Ast_mapper.default_mapper with typ} in
-  mapper.typ mapper type_
-
-(* TODO: some line number might still be wrong *)
-let jsxMapper ~config =
-  let transformUppercaseCall3 modulePath mapper loc attrs _ callArguments =
-    let children, argsWithLabels =
-      extractChildren ~loc ~removeLastPositionUnit:true callArguments
-    in
-    let argsForMake = argsWithLabels in
-    let childrenExpr = transformChildrenIfListUpper ~loc ~mapper children in
-    let recursivelyTransformedArgsForMake =
-      argsForMake
-      |> List.map (fun (label, expression) ->
-             (label, mapper.expr mapper expression))
-    in
-    let childrenArg = ref None in
-    let args =
-      recursivelyTransformedArgsForMake
-      @ (match childrenExpr with
-        | Exact children -> [(labelled "children", children)]
-        | ListLiteral {pexp_desc = Pexp_array list} when list = [] -> []
-        | ListLiteral expression ->
-          (* this is a hack to support react components that introspect into their children *)
-          childrenArg := Some expression;
-          [
-            ( labelled "children",
-              Exp.ident ~loc {loc; txt = Ldot (Lident "React", "null")} );
-          ])
-      @ [(nolabel, Exp.construct ~loc {loc; txt = Lident "()"} None)]
-    in
-    let isCap str = String.capitalize_ascii str = str in
-    let ident =
-      match modulePath with
-      | Lident _ -> Ldot (modulePath, "make")
-      | Ldot (_modulePath, value) as fullPath when isCap value ->
-        Ldot (fullPath, "make")
-      | modulePath -> modulePath
-    in
-    let propsIdent =
-      match ident with
-      | Lident path -> Lident (path ^ "Props")
-      | Ldot (ident, path) -> Ldot (ident, path ^ "Props")
-      | _ ->
-        Jsx_common.raiseError ~loc
-          "JSX name can't be the result of function applications"
-    in
-    let props =
-      Exp.apply ~attrs ~loc (Exp.ident ~loc {loc; txt = propsIdent}) args
-    in
-    (* handle key, ref, children *)
-    (* React.createElement(Component.make, props, ...children) *)
-    match !childrenArg with
-    | None ->
-      Exp.apply ~loc ~attrs
-        (Exp.ident ~loc {loc; txt = Ldot (Lident "React", "createElement")})
-        [(nolabel, Exp.ident ~loc {txt = ident; loc}); (nolabel, props)]
-    | Some children ->
-      Exp.apply ~loc ~attrs
-        (Exp.ident ~loc
-           {loc; txt = Ldot (Lident "React", "createElementVariadic")})
-        [
-          (nolabel, Exp.ident ~loc {txt = ident; loc});
-          (nolabel, props);
-          (nolabel, children);
-        ]
-  in
-
-  let transformLowercaseCall3 mapper loc attrs callArguments id =
-    let children, nonChildrenProps = extractChildren ~loc callArguments in
-    let componentNameExpr = constantString ~loc id in
-    let childrenExpr = transformChildrenIfList ~loc ~mapper children in
-    let createElementCall =
-      match children with
-      (* [@JSX] div(~children=[a]), coming from <div> a </div> *)
-      | {
-       pexp_desc =
-         ( Pexp_construct ({txt = Lident "::"}, Some {pexp_desc = Pexp_tuple _})
-         | Pexp_construct ({txt = Lident "[]"}, None) );
-      } ->
-        "createDOMElementVariadic"
-      (* [@JSX] div(~children= value), coming from <div> ...(value) </div> *)
-      | {pexp_loc} ->
-        Jsx_common.raiseError ~loc:pexp_loc
-          "A spread as a DOM element's children don't make sense written \
-           together. You can simply remove the spread."
-    in
-    let args =
-      match nonChildrenProps with
-      | [_justTheUnitArgumentAtEnd] ->
-        [
-          (* "div" *)
-          (nolabel, componentNameExpr);
-          (* [|moreCreateElementCallsHere|] *)
-          (nolabel, childrenExpr);
-        ]
-      | nonEmptyProps ->
-        let propsCall =
-          Exp.apply ~loc
-            (Exp.ident ~loc {loc; txt = Ldot (Lident "ReactDOMRe", "domProps")})
-            (nonEmptyProps
-            |> List.map (fun (label, expression) ->
-                   (label, mapper.expr mapper expression)))
-        in
-        [
-          (* "div" *)
-          (nolabel, componentNameExpr);
-          (* ReactDOMRe.props(~className=blabla, ~foo=bar, ()) *)
-          (labelled "props", propsCall);
-          (* [|moreCreateElementCallsHere|] *)
-          (nolabel, childrenExpr);
-        ]
-    in
-    Exp.apply
-      ~loc (* throw away the [@JSX] attribute and keep the others, if any *)
-      ~attrs
-      (* ReactDOMRe.createElement *)
-      (Exp.ident ~loc
-         {loc; txt = Ldot (Lident "ReactDOMRe", createElementCall)})
-      args
-  in
-
-  let rec recursivelyTransformNamedArgsForMake expr args newtypes =
-    match expr.pexp_desc with
-    (* TODO: make this show up with a loc. *)
-    | Pexp_fun (Labelled "key", _, _, _) | Pexp_fun (Optional "key", _, _, _) ->
-      Jsx_common.raiseError ~loc:expr.pexp_loc
-        "Key cannot be accessed inside of a component. Don't worry - you can \
-         always key a component from its parent!"
-    | Pexp_fun (Labelled "ref", _, _, _) | Pexp_fun (Optional "ref", _, _, _) ->
-      Jsx_common.raiseError ~loc:expr.pexp_loc
-        "Ref cannot be passed as a normal prop. Either give the prop a \
-         different name or use the `forwardRef` API instead."
-    | Pexp_fun (arg, default, pattern, expression)
-      when isOptional arg || isLabelled arg ->
-      let () =
-        match (isOptional arg, pattern, default) with
-        | true, {ppat_desc = Ppat_constraint (_, {ptyp_desc})}, None -> (
-          match ptyp_desc with
-          | Ptyp_constr ({txt = Lident "option"}, [_]) -> ()
-          | _ ->
-            let currentType =
-              match ptyp_desc with
-              | Ptyp_constr ({txt}, []) ->
-                String.concat "." (Longident.flatten txt)
-              | Ptyp_constr ({txt}, _innerTypeArgs) ->
-                String.concat "." (Longident.flatten txt) ^ "(...)"
-              | _ -> "..."
-            in
-            Location.prerr_warning pattern.ppat_loc
-              (Preprocessor
-                 (Printf.sprintf
-                    "React: optional argument annotations must have explicit \
-                     `option`. Did you mean `option<%s>=?`?"
-                    currentType)))
-        | _ -> ()
-      in
-      let alias =
-        match pattern with
-        | {ppat_desc = Ppat_alias (_, {txt}) | Ppat_var {txt}} -> txt
-        | {ppat_desc = Ppat_any} -> "_"
-        | _ -> getLabel arg
-      in
-      let type_ =
-        match pattern with
-        | {ppat_desc = Ppat_constraint (_, type_)} -> Some type_
-        | _ -> None
-      in
-
-      recursivelyTransformNamedArgsForMake expression
-        ((arg, default, pattern, alias, pattern.ppat_loc, type_) :: args)
-        newtypes
-    | Pexp_fun
-        ( Nolabel,
-          _,
-          {ppat_desc = Ppat_construct ({txt = Lident "()"}, _) | Ppat_any},
-          _expression ) ->
-      (args, newtypes, None)
-    | Pexp_fun
-        ( Nolabel,
-          _,
-          {
-            ppat_desc =
-              Ppat_var {txt} | Ppat_constraint ({ppat_desc = Ppat_var {txt}}, _);
-          },
-          _expression ) ->
-      (args, newtypes, Some txt)
-    | Pexp_fun (Nolabel, _, pattern, _expression) ->
-      Location.raise_errorf ~loc:pattern.ppat_loc
-        "React: react.component refs only support plain arguments and type \
-         annotations."
-    | Pexp_newtype (label, expression) ->
-      recursivelyTransformNamedArgsForMake expression args (label :: newtypes)
-    | Pexp_constraint (expression, _typ) ->
-      recursivelyTransformNamedArgsForMake expression args newtypes
-    | _ -> (args, newtypes, None)
-  in
-
-  let argToType types (name, default, _noLabelName, _alias, loc, type_) =
-    match (type_, name, default) with
-    | Some {ptyp_desc = Ptyp_constr ({txt = Lident "option"}, [type_])}, name, _
-      when isOptional name ->
-      ( getLabel name,
-        [],
-        {
-          type_ with
-          ptyp_desc =
-            Ptyp_constr ({loc = type_.ptyp_loc; txt = optionIdent}, [type_]);
-        } )
-      :: types
-    | Some type_, name, Some _default ->
-      ( getLabel name,
-        [],
-        {
-          ptyp_desc = Ptyp_constr ({loc; txt = optionIdent}, [type_]);
-          ptyp_loc = loc;
-          ptyp_attributes = [];
-        } )
-      :: types
-    | Some type_, name, _ -> (getLabel name, [], type_) :: types
-    | None, name, _ when isOptional name ->
-      ( getLabel name,
-        [],
-        {
-          ptyp_desc =
-            Ptyp_constr
-              ( {loc; txt = optionIdent},
-                [
-                  {
-                    ptyp_desc = Ptyp_var (safeTypeFromValue name);
-                    ptyp_loc = loc;
-                    ptyp_attributes = [];
-                  };
-                ] );
-          ptyp_loc = loc;
-          ptyp_attributes = [];
-        } )
-      :: types
-    | None, name, _ when isLabelled name ->
-      ( getLabel name,
-        [],
-        {
-          ptyp_desc = Ptyp_var (safeTypeFromValue name);
-          ptyp_loc = loc;
-          ptyp_attributes = [];
-        } )
-      :: types
-    | _ -> types
-  in
-
-  let argToConcreteType types (name, loc, type_) =
-    match name with
-    | name when isLabelled name -> (getLabel name, [], type_) :: types
-    | name when isOptional name ->
-      (getLabel name, [], Typ.constr ~loc {loc; txt = optionIdent} [type_])
-      :: types
-    | _ -> types
-  in
-
-  let nestedModules = ref [] in
-  let transformStructureItem item =
-    match item with
-    (* external *)
-    | {
-        pstr_loc;
-        pstr_desc =
-          Pstr_primitive
-            ({pval_name = {txt = fnName}; pval_attributes; pval_type} as
-             value_description);
-      } as pstr -> (
-      match List.filter Jsx_common.hasAttr pval_attributes with
-      | [] -> [item]
-      | [_] ->
-        let pval_type = Jsx_common.extractUncurried pval_type in
-        let rec getPropTypes types ({ptyp_loc; ptyp_desc} as fullType) =
-          match ptyp_desc with
-          | Ptyp_arrow (name, type_, ({ptyp_desc = Ptyp_arrow _} as rest))
-            when isLabelled name || isOptional name ->
-            getPropTypes ((name, ptyp_loc, type_) :: types) rest
-          | Ptyp_arrow (Nolabel, _type, rest) -> getPropTypes types rest
-          | Ptyp_arrow (name, type_, returnValue)
-            when isLabelled name || isOptional name ->
-            (returnValue, (name, returnValue.ptyp_loc, type_) :: types)
-          | _ -> (fullType, types)
-        in
-        let innerType, propTypes = getPropTypes [] pval_type in
-        let namedTypeList = List.fold_left argToConcreteType [] propTypes in
-        let pluckLabelAndLoc (label, loc, type_) =
-          (label, None (* default *), loc, Some type_)
-        in
-        let retPropsType = makePropsType ~loc:pstr_loc namedTypeList in
-        let externalPropsDecl =
-          makePropsExternal fnName pstr_loc
-            ((optional "key", None, pstr_loc, Some (keyType pstr_loc))
-            :: List.map pluckLabelAndLoc propTypes)
-            retPropsType
-        in
-        (* can't be an arrow because it will defensively uncurry *)
-        let newExternalType =
-          Ptyp_constr
-            ( {loc = pstr_loc; txt = Ldot (Lident "React", "componentLike")},
-              [retPropsType; innerType] )
-        in
-        let newStructure =
-          {
-            pstr with
-            pstr_desc =
-              Pstr_primitive
-                {
-                  value_description with
-                  pval_type = {pval_type with ptyp_desc = newExternalType};
-                  pval_attributes = List.filter otherAttrsPure pval_attributes;
-                };
-          }
-        in
-        [externalPropsDecl; newStructure]
-      | _ ->
-        Jsx_common.raiseError ~loc:pstr_loc
-          "Only one react.component call can exist on a component at one time")
-    (* let component = ... *)
-    | {pstr_loc; pstr_desc = Pstr_value (recFlag, valueBindings)} -> (
-      let fileName = filenameFromLoc pstr_loc in
-      let emptyLoc = Location.in_file fileName in
-      let mapBinding binding =
-        if Jsx_common.hasAttrOnBinding binding then
-          let binding = Jsx_common.removeArity binding in
-          let bindingLoc = binding.pvb_loc in
-          let bindingPatLoc = binding.pvb_pat.ppat_loc in
-          let binding =
-            {
-              binding with
-              pvb_pat = {binding.pvb_pat with ppat_loc = emptyLoc};
-              pvb_loc = emptyLoc;
-            }
-          in
-          let fnName = getFnName binding.pvb_pat in
-          let internalFnName = fnName ^ "$Internal" in
-          let fullModuleName = makeModuleName fileName !nestedModules fnName in
-          let modifiedBindingOld binding =
-            let expression = binding.pvb_expr in
-            (* TODO: there is a long-tail of unsupported features inside of blocks - Pexp_letmodule , Pexp_letexception , Pexp_ifthenelse *)
-            let rec spelunkForFunExpression expression =
-              match expression with
-              (* let make = (~prop) => ... *)
-              | {pexp_desc = Pexp_fun _} | {pexp_desc = Pexp_newtype _} ->
-                expression
-              (* let make = {let foo = bar in (~prop) => ...} *)
-              | {pexp_desc = Pexp_let (_recursive, _vbs, returnExpression)} ->
-                (* here's where we spelunk! *)
-                spelunkForFunExpression returnExpression
-              (* let make = React.forwardRef((~prop) => ...) *)
-              | {
-               pexp_desc =
-                 Pexp_apply
-                   (_wrapperExpression, [(Nolabel, innerFunctionExpression)]);
-              } ->
-                spelunkForFunExpression innerFunctionExpression
-              | {
-               pexp_desc =
-                 Pexp_sequence (_wrapperExpression, innerFunctionExpression);
-              } ->
-                spelunkForFunExpression innerFunctionExpression
-              | {pexp_desc = Pexp_constraint (innerFunctionExpression, _typ)} ->
-                spelunkForFunExpression innerFunctionExpression
-              | {pexp_loc} ->
-                Jsx_common.raiseError ~loc:pexp_loc
-                  "react.component calls can only be on function definitions \
-                   or component wrappers (forwardRef, memo)."
-            in
-            spelunkForFunExpression expression
-          in
-          let modifiedBinding binding =
-            let hasApplication = ref false in
-            let wrapExpressionWithBinding expressionFn expression =
-              Vb.mk ~loc:bindingLoc
-                ~attrs:(List.filter otherAttrsPure binding.pvb_attributes)
-                (Pat.var ~loc:bindingPatLoc {loc = bindingPatLoc; txt = fnName})
-                (expressionFn expression)
-            in
-            let expression = binding.pvb_expr in
-            let unerasableIgnoreExp exp =
-              {
-                exp with
-                pexp_attributes =
-                  unerasableIgnore emptyLoc :: exp.pexp_attributes;
-              }
-            in
-            (* TODO: there is a long-tail of unsupported features inside of blocks - Pexp_letmodule , Pexp_letexception , Pexp_ifthenelse *)
-            let rec spelunkForFunExpression expression =
-              match expression with
-              (* let make = (~prop) => ... with no final unit *)
-              | {
-               pexp_desc =
-                 Pexp_fun
-                   ( ((Labelled _ | Optional _) as label),
-                     default,
-                     pattern,
-                     ({pexp_desc = Pexp_fun _} as internalExpression) );
-              } ->
-                let wrap, hasUnit, exp =
-                  spelunkForFunExpression internalExpression
-                in
-                ( wrap,
-                  hasUnit,
-                  unerasableIgnoreExp
-                    {
-                      expression with
-                      pexp_desc = Pexp_fun (label, default, pattern, exp);
-                    } )
-              (* let make = (()) => ... *)
-              (* let make = (_) => ... *)
-              | {
-               pexp_desc =
-                 Pexp_fun
-                   ( Nolabel,
-                     _default,
-                     {
-                       ppat_desc =
-                         Ppat_construct ({txt = Lident "()"}, _) | Ppat_any;
-                     },
-                     _internalExpression );
-              } ->
-                ((fun a -> a), true, expression)
-              (* let make = (~prop) => ... *)
-              | {
-               pexp_desc =
-                 Pexp_fun
-                   ( (Labelled _ | Optional _),
-                     _default,
-                     _pattern,
-                     _internalExpression );
-              } ->
-                ((fun a -> a), false, unerasableIgnoreExp expression)
-              (* let make = (prop) => ... *)
-              | {
-               pexp_desc =
-                 Pexp_fun (_nolabel, _default, pattern, _internalExpression);
-              } ->
-                if hasApplication.contents then
-                  ((fun a -> a), false, unerasableIgnoreExp expression)
-                else
-                  Location.raise_errorf ~loc:pattern.ppat_loc
-                    "React: props need to be labelled arguments.\n\
-                    \  If you are working with refs be sure to wrap with \
-                     React.forwardRef.\n\
-                    \  If your component doesn't have any props use () or _ \
-                     instead of a name."
-              (* let make = {let foo = bar in (~prop) => ...} *)
-              | {pexp_desc = Pexp_let (recursive, vbs, internalExpression)} ->
-                (* here's where we spelunk! *)
-                let wrap, hasUnit, exp =
-                  spelunkForFunExpression internalExpression
-                in
-                ( wrap,
-                  hasUnit,
-                  {expression with pexp_desc = Pexp_let (recursive, vbs, exp)}
-                )
-              (* let make = React.forwardRef((~prop) => ...) *)
-              | {
-               pexp_desc =
-                 Pexp_apply (wrapperExpression, [(Nolabel, internalExpression)]);
-              } ->
-                let () = hasApplication := true in
-                let _, hasUnit, exp =
-                  spelunkForFunExpression internalExpression
-                in
-                ( (fun exp -> Exp.apply wrapperExpression [(nolabel, exp)]),
-                  hasUnit,
-                  exp )
-              | {
-               pexp_desc = Pexp_sequence (wrapperExpression, internalExpression);
-              } ->
-                let wrap, hasUnit, exp =
-                  spelunkForFunExpression internalExpression
-                in
-                ( wrap,
-                  hasUnit,
-                  {
-                    expression with
-                    pexp_desc = Pexp_sequence (wrapperExpression, exp);
-                  } )
-              | e -> ((fun a -> a), false, e)
-            in
-            let wrapExpression, hasUnit, expression =
-              spelunkForFunExpression expression
-            in
-            (wrapExpressionWithBinding wrapExpression, hasUnit, expression)
-          in
-          let bindingWrapper, hasUnit, expression = modifiedBinding binding in
-          let reactComponentAttribute =
-            try Some (List.find Jsx_common.hasAttr binding.pvb_attributes)
-            with Not_found -> None
-          in
-          let _attr_loc, payload =
-            match reactComponentAttribute with
-            | Some (loc, payload) -> (loc.loc, Some payload)
-            | None -> (emptyLoc, None)
-          in
-          let props = getPropsAttr payload in
-          (* do stuff here! *)
-          let namedArgList, newtypes, forwardRef =
-            recursivelyTransformNamedArgsForMake
-              (modifiedBindingOld binding)
-              [] []
-          in
-          let namedArgListWithKeyAndRef =
-            ( optional "key",
-              None,
-              Pat.var {txt = "key"; loc = emptyLoc},
-              "key",
-              emptyLoc,
-              Some (keyType emptyLoc) )
-            :: namedArgList
-          in
-          let namedArgListWithKeyAndRef =
-            match forwardRef with
-            | Some _ ->
-              ( optional "ref",
-                None,
-                Pat.var {txt = "key"; loc = emptyLoc},
-                "ref",
-                emptyLoc,
-                None )
-              :: namedArgListWithKeyAndRef
-            | None -> namedArgListWithKeyAndRef
-          in
-          let namedArgListWithKeyAndRefForNew =
-            match forwardRef with
-            | Some txt ->
-              namedArgList
-              @ [
-                  ( nolabel,
-                    None,
-                    Pat.var {txt; loc = emptyLoc},
-                    txt,
-                    emptyLoc,
-                    None );
-                ]
-            | None -> namedArgList
-          in
-          let pluckArg (label, _, _, alias, loc, _) =
-            let labelString =
-              match label with
-              | label when isOptional label || isLabelled label ->
-                getLabel label
-              | _ -> ""
-            in
-            ( label,
-              match labelString with
-              | "" -> Exp.ident ~loc {txt = Lident alias; loc}
-              | labelString ->
-                Exp.apply ~loc
-                  (Exp.ident ~loc {txt = Lident "##"; loc})
-                  [
-                    (nolabel, Exp.ident ~loc {txt = Lident props.propsName; loc});
-                    (nolabel, Exp.ident ~loc {txt = Lident labelString; loc});
-                  ] )
-          in
-          let namedTypeList = List.fold_left argToType [] namedArgList in
-          let loc = emptyLoc in
-          let externalArgs =
-            (* translate newtypes to type variables *)
-            List.fold_left
-              (fun args newtype ->
-                List.map
-                  (fun (a, b, c, d, e, maybeTyp) ->
-                    match maybeTyp with
-                    | Some typ ->
-                      (a, b, c, d, e, Some (newtypeToVar newtype.txt typ))
-                    | None -> (a, b, c, d, e, None))
-                  args)
-              namedArgListWithKeyAndRef newtypes
-          in
-          let externalTypes =
-            (* translate newtypes to type variables *)
-            List.fold_left
-              (fun args newtype ->
-                List.map
-                  (fun (a, b, typ) -> (a, b, newtypeToVar newtype.txt typ))
-                  args)
-              namedTypeList newtypes
-          in
-          let externalDecl =
-            makeExternalDecl fnName loc externalArgs externalTypes
-          in
-          let innerExpressionArgs =
-            List.map pluckArg namedArgListWithKeyAndRefForNew
-            @
-            if hasUnit then
-              [(Nolabel, Exp.construct {loc; txt = Lident "()"} None)]
-            else []
-          in
-          let innerExpression =
-            Exp.apply
-              (Exp.ident
-                 {
-                   loc;
-                   txt =
-                     Lident
-                       (match recFlag with
-                       | Recursive -> internalFnName
-                       | Nonrecursive -> fnName);
-                 })
-              innerExpressionArgs
-          in
-          let innerExpressionWithRef =
-            match forwardRef with
-            | Some txt ->
-              {
-                innerExpression with
-                pexp_desc =
-                  Pexp_fun
-                    ( nolabel,
-                      None,
-                      {
-                        ppat_desc = Ppat_var {txt; loc = emptyLoc};
-                        ppat_loc = emptyLoc;
-                        ppat_attributes = [];
-                      },
-                      innerExpression );
-              }
-            | None -> innerExpression
-          in
-          let fullExpression =
-            Exp.fun_ nolabel None
-              {
-                ppat_desc =
-                  Ppat_constraint
-                    ( makePropsName ~loc:emptyLoc props.propsName,
-                      makePropsType ~loc:emptyLoc externalTypes );
-                ppat_loc = emptyLoc;
-                ppat_attributes = [];
-              }
-              innerExpressionWithRef
-          in
-          let fullExpression =
-            if !Config.uncurried = Uncurried then
-              fullExpression
-              |> Ast_uncurried.uncurriedFun ~loc:fullExpression.pexp_loc
-                   ~arity:1
-            else fullExpression
-          in
-          let fullExpression =
-            match fullModuleName with
-            | "" -> fullExpression
-            | txt ->
-              Exp.let_ Nonrecursive
-                [
-                  Vb.mk ~loc:emptyLoc
-                    (Pat.var ~loc:emptyLoc {loc = emptyLoc; txt})
-                    fullExpression;
-                ]
-                (Exp.ident ~loc:emptyLoc {loc = emptyLoc; txt = Lident txt})
-          in
-          let bindings, newBinding =
-            match recFlag with
-            | Recursive ->
-              ( [
-                  bindingWrapper
-                    (Exp.let_ ~loc:emptyLoc Recursive
-                       [
-                         makeNewBinding binding expression internalFnName;
-                         Vb.mk
-                           (Pat.var {loc = emptyLoc; txt = fnName})
-                           fullExpression;
-                       ]
-                       (Exp.ident {loc = emptyLoc; txt = Lident fnName}));
-                ],
-                None )
-            | Nonrecursive ->
-              ( [{binding with pvb_expr = expression}],
-                Some (bindingWrapper fullExpression) )
-          in
-          (Some externalDecl, bindings, newBinding)
-        else (None, [binding], None)
-      in
-      let structuresAndBinding = List.map mapBinding valueBindings in
-      let otherStructures (extern, binding, newBinding)
-          (externs, bindings, newBindings) =
-        let externs =
-          match extern with
-          | Some extern -> extern :: externs
-          | None -> externs
-        in
-        let newBindings =
-          match newBinding with
-          | Some newBinding -> newBinding :: newBindings
-          | None -> newBindings
-        in
-        (externs, binding @ bindings, newBindings)
-      in
-      let externs, bindings, newBindings =
-        List.fold_right otherStructures structuresAndBinding ([], [], [])
-      in
-      externs
-      @ [{pstr_loc; pstr_desc = Pstr_value (recFlag, bindings)}]
-      @
-      match newBindings with
-      | [] -> []
-      | newBindings ->
-        [{pstr_loc = emptyLoc; pstr_desc = Pstr_value (recFlag, newBindings)}])
-    | _ -> [item]
-  in
-
-  let transformSignatureItem item =
-    match item with
-    | {
-        psig_loc;
-        psig_desc =
-          Psig_value
-            ({pval_name = {txt = fnName}; pval_attributes; pval_type} as
-             psig_desc);
-      } as psig -> (
-      match List.filter Jsx_common.hasAttr pval_attributes with
-      | [] -> [item]
-      | [_] ->
-        let pval_type = Jsx_common.extractUncurried pval_type in
-        let rec getPropTypes types ({ptyp_loc; ptyp_desc} as fullType) =
-          match ptyp_desc with
-          | Ptyp_arrow (name, type_, ({ptyp_desc = Ptyp_arrow _} as rest))
-            when isOptional name || isLabelled name ->
-            getPropTypes ((name, ptyp_loc, type_) :: types) rest
-          | Ptyp_arrow (Nolabel, _type, rest) -> getPropTypes types rest
-          | Ptyp_arrow (name, type_, returnValue)
-            when isOptional name || isLabelled name ->
-            (returnValue, (name, returnValue.ptyp_loc, type_) :: types)
-          | _ -> (fullType, types)
-        in
-        let innerType, propTypes = getPropTypes [] pval_type in
-        let namedTypeList = List.fold_left argToConcreteType [] propTypes in
-        let pluckLabelAndLoc (label, loc, type_) =
-          (label, None, loc, Some type_)
-        in
-        let retPropsType = makePropsType ~loc:psig_loc namedTypeList in
-        let externalPropsDecl =
-          makePropsExternalSig fnName psig_loc
-            ((optional "key", None, psig_loc, Some (keyType psig_loc))
-            :: List.map pluckLabelAndLoc propTypes)
-            retPropsType
-        in
-        (* can't be an arrow because it will defensively uncurry *)
-        let newExternalType =
-          Ptyp_constr
-            ( {loc = psig_loc; txt = Ldot (Lident "React", "componentLike")},
-              [retPropsType; innerType] )
-        in
-        let newStructure =
-          {
-            psig with
-            psig_desc =
-              Psig_value
-                {
-                  psig_desc with
-                  pval_type = {pval_type with ptyp_desc = newExternalType};
-                  pval_attributes = List.filter otherAttrsPure pval_attributes;
-                };
-          }
-        in
-        [externalPropsDecl; newStructure]
-      | _ ->
-        Jsx_common.raiseError ~loc:psig_loc
-          "Only one react.component call can exist on a component at one time")
-    | _ -> [item]
-  in
-
-  let transformJsxCall mapper callExpression callArguments attrs =
-    match callExpression.pexp_desc with
-    | Pexp_ident caller -> (
-      match caller with
-      | {txt = Lident "createElement"; loc} ->
-        Jsx_common.raiseError ~loc
-          "JSX: `createElement` should be preceeded by a module name."
-      (* Foo.createElement(~prop1=foo, ~prop2=bar, ~children=[], ()) *)
-      | {loc; txt = Ldot (modulePath, ("createElement" | "make"))} -> (
-        match config.Jsx_common.version with
-        | 3 ->
-          transformUppercaseCall3 modulePath mapper loc attrs callExpression
-            callArguments
-        | _ -> Jsx_common.raiseError ~loc "JSX: the JSX version must be  3")
-      (* div(~prop1=foo, ~prop2=bar, ~children=[bla], ()) *)
-      (* turn that into
-         ReactDOMRe.createElement(~props=ReactDOMRe.props(~props1=foo, ~props2=bar, ()), [|bla|]) *)
-      | {loc; txt = Lident id} -> (
-        match config.version with
-        | 3 -> transformLowercaseCall3 mapper loc attrs callArguments id
-        | _ -> Jsx_common.raiseError ~loc "JSX: the JSX version must be 3")
-      | {txt = Ldot (_, anythingNotCreateElementOrMake); loc} ->
-        Jsx_common.raiseError ~loc
-          "JSX: the JSX attribute should be attached to a \
-           `YourModuleName.createElement` or `YourModuleName.make` call. We \
-           saw `%s` instead"
-          anythingNotCreateElementOrMake
-      | {txt = Lapply _; loc} ->
-        (* don't think there's ever a case where this is reached *)
-        Jsx_common.raiseError ~loc
-          "JSX: encountered a weird case while processing the code. Please \
-           report this!")
-    | _ ->
-      Jsx_common.raiseError ~loc:callExpression.pexp_loc
-        "JSX: `createElement` should be preceeded by a simple, direct module \
-         name."
-  in
-
-  let expr mapper expression =
-    match expression with
-    (* Does the function application have the @JSX attribute? *)
-    | {pexp_desc = Pexp_apply (callExpression, callArguments); pexp_attributes}
-      -> (
-      let jsxAttribute, nonJSXAttributes =
-        List.partition
-          (fun (attribute, _) -> attribute.txt = "JSX")
-          pexp_attributes
-      in
-      match (jsxAttribute, nonJSXAttributes) with
-      (* no JSX attribute *)
-      | [], _ -> default_mapper.expr mapper expression
-      | _, nonJSXAttributes ->
-        transformJsxCall mapper callExpression callArguments nonJSXAttributes)
-    (* is it a list with jsx attribute? Reason <>foo</> desugars to [@JSX][foo]*)
-    | {
-        pexp_desc =
-          ( Pexp_construct
-              ({txt = Lident "::"; loc}, Some {pexp_desc = Pexp_tuple _})
-          | Pexp_construct ({txt = Lident "[]"; loc}, None) );
-        pexp_attributes;
-      } as listItems -> (
-      let jsxAttribute, nonJSXAttributes =
-        List.partition
-          (fun (attribute, _) -> attribute.txt = "JSX")
-          pexp_attributes
-      in
-      match (jsxAttribute, nonJSXAttributes) with
-      (* no JSX attribute *)
-      | [], _ -> default_mapper.expr mapper expression
-      | _, nonJSXAttributes ->
-        let loc = {loc with loc_ghost = true} in
-        let fragment =
-          Exp.ident ~loc {loc; txt = Ldot (Lident "ReasonReact", "fragment")}
-        in
-        let childrenExpr = transformChildrenIfList ~loc ~mapper listItems in
-        let args =
-          [
-            (* "div" *)
-            (nolabel, fragment);
-            (* [|moreCreateElementCallsHere|] *)
-            (nolabel, childrenExpr);
-          ]
-        in
-        Exp.apply
-          ~loc (* throw away the [@JSX] attribute and keep the others, if any *)
-          ~attrs:nonJSXAttributes
-          (* ReactDOMRe.createElement *)
-          (Exp.ident ~loc
-             {loc; txt = Ldot (Lident "ReactDOMRe", "createElement")})
-          args)
-    (* Delegate to the default mapper, a deep identity traversal *)
-    | e -> default_mapper.expr mapper e
-  in
-
-  let module_binding mapper module_binding =
-    let _ = nestedModules := module_binding.pmb_name.txt :: !nestedModules in
-    let mapped = default_mapper.module_binding mapper module_binding in
-    let () =
-      match !nestedModules with
-      | _ :: rest -> nestedModules := rest
-      | [] -> ()
-    in
-    mapped
-  in
-  (expr, module_binding, transformSignatureItem, transformStructureItem)
diff --git a/jscomp/syntax/src/res_ast_conversion.ml b/jscomp/syntax/src/res_ast_conversion.ml
deleted file mode 100644
index b8c419b..0000000
--- a/jscomp/syntax/src/res_ast_conversion.ml
+++ /dev/null
@@ -1,593 +0,0 @@
-let concatLongidents l1 l2 =
-  let parts1 = Longident.flatten l1 in
-  let parts2 = Longident.flatten l2 in
-  match List.concat [parts1; parts2] |> Longident.unflatten with
-  | Some longident -> longident
-  | None -> l2
-
-(* TODO: support nested open's ? *)
-let rec rewritePpatOpen longidentOpen pat =
-  match pat.Parsetree.ppat_desc with
-  | Ppat_array (first :: rest) ->
-    (* Color.[Red, Blue, Green] -> [Color.Red, Blue, Green] *)
-    {
-      pat with
-      ppat_desc = Ppat_array (rewritePpatOpen longidentOpen first :: rest);
-    }
-  | Ppat_tuple (first :: rest) ->
-    (* Color.(Red, Blue, Green) -> (Color.Red, Blue, Green) *)
-    {
-      pat with
-      ppat_desc = Ppat_tuple (rewritePpatOpen longidentOpen first :: rest);
-    }
-  | Ppat_construct
-      ( ({txt = Longident.Lident "::"} as listConstructor),
-        Some ({ppat_desc = Ppat_tuple (pat :: rest)} as element) ) ->
-    (* Color.(list[Red, Blue, Green]) -> list[Color.Red, Blue, Green] *)
-    {
-      pat with
-      ppat_desc =
-        Ppat_construct
-          ( listConstructor,
-            Some
-              {
-                element with
-                ppat_desc =
-                  Ppat_tuple (rewritePpatOpen longidentOpen pat :: rest);
-              } );
-    }
-  | Ppat_construct (({txt = constructor} as longidentLoc), optPattern) ->
-    (* Foo.(Bar(a)) -> Foo.Bar(a) *)
-    {
-      pat with
-      ppat_desc =
-        Ppat_construct
-          ( {longidentLoc with txt = concatLongidents longidentOpen constructor},
-            optPattern );
-    }
-  | Ppat_record ((({txt = lbl} as longidentLoc), firstPat) :: rest, flag) ->
-    (* Foo.{x} -> {Foo.x: x} *)
-    let firstRow =
-      ({longidentLoc with txt = concatLongidents longidentOpen lbl}, firstPat)
-    in
-    {pat with ppat_desc = Ppat_record (firstRow :: rest, flag)}
-  | Ppat_or (pat1, pat2) ->
-    {
-      pat with
-      ppat_desc =
-        Ppat_or
-          ( rewritePpatOpen longidentOpen pat1,
-            rewritePpatOpen longidentOpen pat2 );
-    }
-  | Ppat_constraint (pattern, typ) ->
-    {
-      pat with
-      ppat_desc = Ppat_constraint (rewritePpatOpen longidentOpen pattern, typ);
-    }
-  | Ppat_type ({txt = constructor} as longidentLoc) ->
-    {
-      pat with
-      ppat_desc =
-        Ppat_type
-          {longidentLoc with txt = concatLongidents longidentOpen constructor};
-    }
-  | Ppat_lazy p ->
-    {pat with ppat_desc = Ppat_lazy (rewritePpatOpen longidentOpen p)}
-  | Ppat_exception p ->
-    {pat with ppat_desc = Ppat_exception (rewritePpatOpen longidentOpen p)}
-  | _ -> pat
-
-let escapeTemplateLiteral s =
-  let len = String.length s in
-  let b = Buffer.create len in
-  let i = ref 0 in
-  while !i < len do
-    let c = (String.get [@doesNotRaise]) s !i in
-    if c = '`' then (
-      Buffer.add_char b '\\';
-      Buffer.add_char b '`';
-      incr i)
-    else if c = '$' then
-      if !i + 1 < len then (
-        let c2 = (String.get [@doesNotRaise]) s (!i + 1) in
-        if c2 = '{' then (
-          Buffer.add_char b '\\';
-          Buffer.add_char b '$';
-          Buffer.add_char b '{')
-        else (
-          Buffer.add_char b c;
-          Buffer.add_char b c2);
-        i := !i + 2)
-      else (
-        Buffer.add_char b c;
-        incr i)
-    else if c = '\\' then (
-      Buffer.add_char b '\\';
-      Buffer.add_char b '\\';
-      incr i)
-    else (
-      Buffer.add_char b c;
-      incr i)
-  done;
-  Buffer.contents b
-
-let escapeStringContents s =
-  let len = String.length s in
-  let b = Buffer.create len in
-
-  let i = ref 0 in
-
-  while !i < len do
-    let c = String.unsafe_get s !i in
-    if c = '\\' then (
-      incr i;
-      Buffer.add_char b c;
-      let c = String.unsafe_get s !i in
-      if !i < len then
-        let () = Buffer.add_char b c in
-        incr i
-      else ())
-    else if c = '"' then (
-      Buffer.add_char b '\\';
-      Buffer.add_char b c;
-      incr i)
-    else (
-      Buffer.add_char b c;
-      incr i)
-  done;
-  Buffer.contents b
-
-let looksLikeRecursiveTypeDeclaration typeDeclaration =
-  let open Parsetree in
-  let name = typeDeclaration.ptype_name.txt in
-  let rec checkKind kind =
-    match kind with
-    | Ptype_abstract | Ptype_open -> false
-    | Ptype_variant constructorDeclarations ->
-      List.exists checkConstructorDeclaration constructorDeclarations
-    | Ptype_record labelDeclarations ->
-      List.exists checkLabelDeclaration labelDeclarations
-  and checkConstructorDeclaration constrDecl =
-    checkConstructorArguments constrDecl.pcd_args
-    ||
-    match constrDecl.pcd_res with
-    | Some typexpr -> checkTypExpr typexpr
-    | None -> false
-  and checkLabelDeclaration labelDeclaration =
-    checkTypExpr labelDeclaration.pld_type
-  and checkConstructorArguments constrArg =
-    match constrArg with
-    | Pcstr_tuple types -> List.exists checkTypExpr types
-    | Pcstr_record labelDeclarations ->
-      List.exists checkLabelDeclaration labelDeclarations
-  and checkTypExpr typ =
-    match typ.ptyp_desc with
-    | Ptyp_any -> false
-    | Ptyp_var _ -> false
-    | Ptyp_object (fields, _) -> List.exists checkObjectField fields
-    | Ptyp_class _ -> false
-    | Ptyp_package _ -> false
-    | Ptyp_extension _ -> false
-    | Ptyp_arrow (_lbl, typ1, typ2) -> checkTypExpr typ1 || checkTypExpr typ2
-    | Ptyp_tuple types -> List.exists checkTypExpr types
-    | Ptyp_constr ({txt = longident}, types) ->
-      (match longident with
-      | Lident ident -> ident = name
-      | _ -> false)
-      || List.exists checkTypExpr types
-    | Ptyp_alias (typ, _) -> checkTypExpr typ
-    | Ptyp_variant (rowFields, _, _) -> List.exists checkRowFields rowFields
-    | Ptyp_poly (_, typ) -> checkTypExpr typ
-  and checkObjectField field =
-    match field with
-    | Otag (_label, _attrs, typ) -> checkTypExpr typ
-    | Oinherit typ -> checkTypExpr typ
-  and checkRowFields rowField =
-    match rowField with
-    | Rtag (_, _, _, types) -> List.exists checkTypExpr types
-    | Rinherit typexpr -> checkTypExpr typexpr
-  and checkManifest manifest =
-    match manifest with
-    | Some typ -> checkTypExpr typ
-    | None -> false
-  in
-  checkKind typeDeclaration.ptype_kind
-  || checkManifest typeDeclaration.ptype_manifest
-
-let filterReasonRawLiteral attrs =
-  List.filter
-    (fun attr ->
-      match attr with
-      | {Location.txt = "reason.raw_literal"}, _ -> false
-      | _ -> true)
-    attrs
-
-let stringLiteralMapper stringData =
-  let isSameLocation l1 l2 =
-    let open Location in
-    l1.loc_start.pos_cnum == l2.loc_start.pos_cnum
-  in
-  let remainingStringData = stringData in
-  let open Ast_mapper in
-  {
-    default_mapper with
-    expr =
-      (fun mapper expr ->
-        match expr.pexp_desc with
-        | Pexp_constant (Pconst_string (_txt, None)) -> (
-          match
-            List.find_opt
-              (fun (_stringData, stringLoc) ->
-                isSameLocation stringLoc expr.pexp_loc)
-              remainingStringData
-          with
-          | Some (stringData, _) ->
-            let stringData =
-              let attr =
-                List.find_opt
-                  (fun attr ->
-                    match attr with
-                    | {Location.txt = "reason.raw_literal"}, _ -> true
-                    | _ -> false)
-                  expr.pexp_attributes
-              in
-              match attr with
-              | Some
-                  ( _,
-                    PStr
-                      [
-                        {
-                          pstr_desc =
-                            Pstr_eval
-                              ( {
-                                  pexp_desc =
-                                    Pexp_constant (Pconst_string (raw, _));
-                                },
-                                _ );
-                        };
-                      ] ) ->
-                raw
-              | _ ->
-                (String.sub [@doesNotRaise]) stringData 1
-                  (String.length stringData - 2)
-            in
-            {
-              expr with
-              pexp_attributes = filterReasonRawLiteral expr.pexp_attributes;
-              pexp_desc = Pexp_constant (Pconst_string (stringData, None));
-            }
-          | None -> default_mapper.expr mapper expr)
-        | _ -> default_mapper.expr mapper expr);
-  }
-
-let hasUncurriedAttribute attrs =
-  List.exists
-    (fun attr ->
-      match attr with
-      | {Asttypes.txt = "bs"}, Parsetree.PStr [] -> true
-      | _ -> false)
-    attrs
-
-let templateLiteralAttr = (Location.mknoloc "res.template", Parsetree.PStr [])
-
-let normalize =
-  let open Ast_mapper in
-  {
-    default_mapper with
-    extension =
-      (fun mapper ext ->
-        match ext with
-        | id, payload ->
-          ( {id with txt = Res_printer.convertBsExtension id.txt},
-            default_mapper.payload mapper payload ));
-    attribute =
-      (fun mapper attr ->
-        match attr with
-        | id, payload ->
-          ( {id with txt = Res_printer.convertBsExternalAttribute id.txt},
-            default_mapper.payload mapper payload ));
-    attributes =
-      (fun mapper attrs ->
-        attrs
-        |> List.filter (fun attr ->
-               match attr with
-               | ( {
-                     Location.txt =
-                       ( "reason.preserve_braces" | "explicit_arity"
-                       | "implicity_arity" );
-                   },
-                   _ ) ->
-                 false
-               | _ -> true)
-        |> default_mapper.attributes mapper);
-    pat =
-      (fun mapper p ->
-        match p.ppat_desc with
-        | Ppat_open ({txt = longidentOpen}, pattern) ->
-          let p = rewritePpatOpen longidentOpen pattern in
-          default_mapper.pat mapper p
-        | Ppat_constant (Pconst_string (txt, tag)) ->
-          let newTag =
-            match tag with
-            (* transform {|abc|} into {js|abc|js}, because `template string` is interpreted as {js||js} *)
-            | Some "" -> Some "js"
-            | tag -> tag
-          in
-          let s = Parsetree.Pconst_string (escapeTemplateLiteral txt, newTag) in
-          {
-            p with
-            ppat_attributes =
-              templateLiteralAttr :: mapper.attributes mapper p.ppat_attributes;
-            ppat_desc = Ppat_constant s;
-          }
-        | _ -> default_mapper.pat mapper p);
-    typ =
-      (fun mapper typ ->
-        match typ.ptyp_desc with
-        | Ptyp_constr
-            ({txt = Longident.Ldot (Longident.Lident "Js", "t")}, [arg]) ->
-          (* Js.t({"a": b}) -> {"a": b}
-             Since compiler >9.0.1 objects don't need Js.t wrapping anymore *)
-          mapper.typ mapper arg
-        | _ -> default_mapper.typ mapper typ);
-    expr =
-      (fun mapper expr ->
-        match expr.pexp_desc with
-        | Pexp_constant (Pconst_string (txt, None)) ->
-          let raw = escapeStringContents txt in
-          let s = Parsetree.Pconst_string (raw, None) in
-          {expr with pexp_desc = Pexp_constant s}
-        | Pexp_constant (Pconst_string (txt, tag)) ->
-          let newTag =
-            match tag with
-            (* transform {|abc|} into {js|abc|js}, we want to preserve unicode by default *)
-            | Some "" -> Some "js"
-            | tag -> tag
-          in
-          let s = Parsetree.Pconst_string (escapeTemplateLiteral txt, newTag) in
-          {
-            expr with
-            pexp_attributes =
-              templateLiteralAttr
-              :: mapper.attributes mapper expr.pexp_attributes;
-            pexp_desc = Pexp_constant s;
-          }
-        | Pexp_apply
-            ( callExpr,
-              [
-                ( Nolabel,
-                  ({
-                     pexp_desc =
-                       Pexp_construct ({txt = Longident.Lident "()"}, None);
-                     pexp_attributes = [];
-                   } as unitExpr) );
-              ] )
-          when hasUncurriedAttribute expr.pexp_attributes ->
-          {
-            expr with
-            pexp_attributes = mapper.attributes mapper expr.pexp_attributes;
-            pexp_desc =
-              Pexp_apply
-                ( callExpr,
-                  [
-                    ( Nolabel,
-                      {
-                        unitExpr with
-                        pexp_loc = {unitExpr.pexp_loc with loc_ghost = true};
-                      } );
-                  ] );
-          }
-        | Pexp_function cases ->
-          let loc =
-            match (cases, List.rev cases) with
-            | first :: _, last :: _ ->
-              {
-                first.pc_lhs.ppat_loc with
-                loc_end = last.pc_rhs.pexp_loc.loc_end;
-              }
-            | _ -> Location.none
-          in
-          let var =
-            {
-              Parsetree.ppat_loc = Location.none;
-              ppat_attributes = [];
-              ppat_desc = Ppat_var (Location.mknoloc "x");
-            }
-          in
-          {
-            pexp_loc = loc;
-            pexp_attributes = [];
-            pexp_desc =
-              Pexp_fun
-                ( Asttypes.Nolabel,
-                  None,
-                  var,
-                  {
-                    pexp_loc = loc;
-                    pexp_attributes = [];
-                    pexp_desc =
-                      Pexp_match
-                        ( {
-                            pexp_loc = Location.none;
-                            pexp_attributes = [];
-                            pexp_desc =
-                              Pexp_ident
-                                (Location.mknoloc (Longident.Lident "x"));
-                          },
-                          mapper.cases mapper cases );
-                  } );
-          }
-        | Pexp_apply
-            ( {pexp_desc = Pexp_ident {txt = Longident.Lident "!"}},
-              [(Asttypes.Nolabel, operand)] ) ->
-          (* turn `!foo` into `foo.contents` *)
-          {
-            pexp_loc = expr.pexp_loc;
-            pexp_attributes = expr.pexp_attributes;
-            pexp_desc =
-              Pexp_field
-                ( mapper.expr mapper operand,
-                  Location.mknoloc (Longident.Lident "contents") );
-          }
-        | Pexp_apply
-            ( {pexp_desc = Pexp_ident {txt = Longident.Lident "##"}},
-              [
-                (Asttypes.Nolabel, lhs);
-                ( Nolabel,
-                  {
-                    pexp_desc =
-                      ( Pexp_constant (Pconst_string (txt, None))
-                      | Pexp_ident {txt = Longident.Lident txt} );
-                    pexp_loc = labelLoc;
-                  } );
-              ] ) ->
-          let label = Location.mkloc txt labelLoc in
-          {
-            pexp_loc = expr.pexp_loc;
-            pexp_attributes = expr.pexp_attributes;
-            pexp_desc = Pexp_send (mapper.expr mapper lhs, label);
-          }
-        | Pexp_match
-            ( condition,
-              [
-                {
-                  pc_lhs =
-                    {
-                      ppat_desc =
-                        Ppat_construct ({txt = Longident.Lident "true"}, None);
-                    };
-                  pc_rhs = thenExpr;
-                };
-                {
-                  pc_lhs =
-                    {
-                      ppat_desc =
-                        Ppat_construct ({txt = Longident.Lident "false"}, None);
-                    };
-                  pc_rhs = elseExpr;
-                };
-              ] ) ->
-          let ternaryMarker =
-            (Location.mknoloc "res.ternary", Parsetree.PStr [])
-          in
-          {
-            Parsetree.pexp_loc = expr.pexp_loc;
-            pexp_desc =
-              Pexp_ifthenelse
-                ( mapper.expr mapper condition,
-                  mapper.expr mapper thenExpr,
-                  Some (mapper.expr mapper elseExpr) );
-            pexp_attributes = ternaryMarker :: expr.pexp_attributes;
-          }
-        | _ -> default_mapper.expr mapper expr);
-    structure_item =
-      (fun mapper structureItem ->
-        match structureItem.pstr_desc with
-        (* heuristic: if we have multiple type declarations, mark them recursive *)
-        | Pstr_type ((Recursive as recFlag), typeDeclarations) ->
-          let flag =
-            match typeDeclarations with
-            | [td] ->
-              if looksLikeRecursiveTypeDeclaration td then Asttypes.Recursive
-              else Asttypes.Nonrecursive
-            | _ -> recFlag
-          in
-          {
-            structureItem with
-            pstr_desc =
-              Pstr_type
-                ( flag,
-                  List.map
-                    (fun typeDeclaration ->
-                      default_mapper.type_declaration mapper typeDeclaration)
-                    typeDeclarations );
-          }
-        | _ -> default_mapper.structure_item mapper structureItem);
-    signature_item =
-      (fun mapper signatureItem ->
-        match signatureItem.psig_desc with
-        (* heuristic: if we have multiple type declarations, mark them recursive *)
-        | Psig_type ((Recursive as recFlag), typeDeclarations) ->
-          let flag =
-            match typeDeclarations with
-            | [td] ->
-              if looksLikeRecursiveTypeDeclaration td then Asttypes.Recursive
-              else Asttypes.Nonrecursive
-            | _ -> recFlag
-          in
-          {
-            signatureItem with
-            psig_desc =
-              Psig_type
-                ( flag,
-                  List.map
-                    (fun typeDeclaration ->
-                      default_mapper.type_declaration mapper typeDeclaration)
-                    typeDeclarations );
-          }
-        | _ -> default_mapper.signature_item mapper signatureItem);
-    value_binding =
-      (fun mapper vb ->
-        match vb with
-        | {
-         pvb_pat = {ppat_desc = Ppat_var _} as pat;
-         pvb_expr =
-           {pexp_loc = expr_loc; pexp_desc = Pexp_constraint (expr, typ)};
-        }
-          when expr_loc.loc_ghost ->
-          (* let t: t = (expr : t) -> let t: t = expr *)
-          let typ = default_mapper.typ mapper typ in
-          let pat = default_mapper.pat mapper pat in
-          let expr = mapper.expr mapper expr in
-          let newPattern =
-            {
-              Parsetree.ppat_loc =
-                {pat.ppat_loc with loc_end = typ.ptyp_loc.loc_end};
-              ppat_attributes = [];
-              ppat_desc = Ppat_constraint (pat, typ);
-            }
-          in
-          {
-            vb with
-            pvb_pat = newPattern;
-            pvb_expr = expr;
-            pvb_attributes = default_mapper.attributes mapper vb.pvb_attributes;
-          }
-        | {
-         pvb_pat =
-           {ppat_desc = Ppat_constraint (pat, {ptyp_desc = Ptyp_poly ([], _)})};
-         pvb_expr =
-           {pexp_loc = expr_loc; pexp_desc = Pexp_constraint (expr, typ)};
-        }
-          when expr_loc.loc_ghost ->
-          (* let t: . t = (expr : t) -> let t: t = expr *)
-          let typ = default_mapper.typ mapper typ in
-          let pat = default_mapper.pat mapper pat in
-          let expr = mapper.expr mapper expr in
-          let newPattern =
-            {
-              Parsetree.ppat_loc =
-                {pat.ppat_loc with loc_end = typ.ptyp_loc.loc_end};
-              ppat_attributes = [];
-              ppat_desc = Ppat_constraint (pat, typ);
-            }
-          in
-          {
-            vb with
-            pvb_pat = newPattern;
-            pvb_expr = expr;
-            pvb_attributes = default_mapper.attributes mapper vb.pvb_attributes;
-          }
-        | _ -> default_mapper.value_binding mapper vb);
-  }
-
-let structure s = normalize.Ast_mapper.structure normalize s
-let signature s = normalize.Ast_mapper.signature normalize s
-
-let replaceStringLiteralStructure stringData structure =
-  let mapper = stringLiteralMapper stringData in
-  mapper.Ast_mapper.structure mapper structure
-
-let replaceStringLiteralSignature stringData signature =
-  let mapper = stringLiteralMapper stringData in
-  mapper.Ast_mapper.signature mapper signature
diff --git a/jscomp/syntax/src/res_ast_conversion.mli b/jscomp/syntax/src/res_ast_conversion.mli
deleted file mode 100644
index 32163e8..0000000
--- a/jscomp/syntax/src/res_ast_conversion.mli
+++ /dev/null
@@ -1,18 +0,0 @@
-(* The purpose of this module is to convert a parsetree coming from the reason
- * or ocaml parser, into something consumable by the rescript printer. *)
-
-(* Ocaml/Reason parser interprets string literals: i.e. escape sequences and unicode.
- * For printing purposes you want to preserve the original string.
- * Example: "😎" is interpreted as "\240\159\152\142"
- * The purpose of this routine is to place the original string back in
- * the parsetree for printing purposes. Unicode and escape sequences
- * shouldn't be mangled when *)
-val replaceStringLiteralStructure :
-  (string * Location.t) list -> Parsetree.structure -> Parsetree.structure
-val replaceStringLiteralSignature :
-  (string * Location.t) list -> Parsetree.signature -> Parsetree.signature
-
-(* transform parts of the parsetree into a suitable parsetree suitable
- * for printing. Example: convert reason ternaries into rescript ternaries *)
-val structure : Parsetree.structure -> Parsetree.structure
-val signature : Parsetree.signature -> Parsetree.signature
diff --git a/jscomp/syntax/src/res_ast_debugger.ml b/jscomp/syntax/src/res_ast_debugger.ml
deleted file mode 100644
index 150ff78..0000000
--- a/jscomp/syntax/src/res_ast_debugger.ml
+++ /dev/null
@@ -1,949 +0,0 @@
-module Doc = Res_doc
-module CommentTable = Res_comments_table
-
-let printEngine =
-  Res_driver.
-    {
-      printImplementation =
-        (fun ~width:_ ~filename:_ ~comments:_ structure ->
-          Printast.implementation Format.std_formatter structure);
-      printInterface =
-        (fun ~width:_ ~filename:_ ~comments:_ signature ->
-          Printast.interface Format.std_formatter signature);
-    }
-
-module Sexp : sig
-  type t
-
-  val atom : string -> t
-  val list : t list -> t
-  val toString : t -> string
-end = struct
-  type t = Atom of string | List of t list
-
-  let atom s = Atom s
-  let list l = List l
-
-  let rec toDoc t =
-    match t with
-    | Atom s -> Doc.text s
-    | List [] -> Doc.text "()"
-    | List [sexpr] -> Doc.concat [Doc.lparen; toDoc sexpr; Doc.rparen]
-    | List (hd :: tail) ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.lparen;
-             toDoc hd;
-             Doc.indent
-               (Doc.concat
-                  [Doc.line; Doc.join ~sep:Doc.line (List.map toDoc tail)]);
-             Doc.rparen;
-           ])
-
-  let toString sexpr =
-    let doc = toDoc sexpr in
-    Doc.toString ~width:80 doc
-end
-
-module SexpAst = struct
-  open Parsetree
-
-  let mapEmpty ~f items =
-    match items with
-    | [] -> [Sexp.list []]
-    | items -> List.map f items
-
-  let string txt = Sexp.atom ("\"" ^ txt ^ "\"")
-
-  let char c = Sexp.atom ("'" ^ Char.escaped c ^ "'")
-
-  let optChar oc =
-    match oc with
-    | None -> Sexp.atom "None"
-    | Some c -> Sexp.list [Sexp.atom "Some"; char c]
-
-  let longident l =
-    let rec loop l =
-      match l with
-      | Longident.Lident ident -> Sexp.list [Sexp.atom "Lident"; string ident]
-      | Longident.Ldot (lident, txt) ->
-        Sexp.list [Sexp.atom "Ldot"; loop lident; string txt]
-      | Longident.Lapply (l1, l2) ->
-        Sexp.list [Sexp.atom "Lapply"; loop l1; loop l2]
-    in
-    Sexp.list [Sexp.atom "longident"; loop l]
-
-  let closedFlag flag =
-    match flag with
-    | Asttypes.Closed -> Sexp.atom "Closed"
-    | Open -> Sexp.atom "Open"
-
-  let directionFlag flag =
-    match flag with
-    | Asttypes.Upto -> Sexp.atom "Upto"
-    | Downto -> Sexp.atom "Downto"
-
-  let recFlag flag =
-    match flag with
-    | Asttypes.Recursive -> Sexp.atom "Recursive"
-    | Nonrecursive -> Sexp.atom "Nonrecursive"
-
-  let overrideFlag flag =
-    match flag with
-    | Asttypes.Override -> Sexp.atom "Override"
-    | Fresh -> Sexp.atom "Fresh"
-
-  let privateFlag flag =
-    match flag with
-    | Asttypes.Public -> Sexp.atom "Public"
-    | Private -> Sexp.atom "Private"
-
-  let mutableFlag flag =
-    match flag with
-    | Asttypes.Immutable -> Sexp.atom "Immutable"
-    | Mutable -> Sexp.atom "Mutable"
-
-  let variance v =
-    match v with
-    | Asttypes.Covariant -> Sexp.atom "Covariant"
-    | Contravariant -> Sexp.atom "Contravariant"
-    | Invariant -> Sexp.atom "Invariant"
-
-  let argLabel lbl =
-    match lbl with
-    | Asttypes.Nolabel -> Sexp.atom "Nolabel"
-    | Labelled txt -> Sexp.list [Sexp.atom "Labelled"; string txt]
-    | Optional txt -> Sexp.list [Sexp.atom "Optional"; string txt]
-
-  let constant c =
-    let sexpr =
-      match c with
-      | Pconst_integer (txt, tag) ->
-        Sexp.list [Sexp.atom "Pconst_integer"; string txt; optChar tag]
-      | Pconst_char _ -> Sexp.list [Sexp.atom "Pconst_char"]
-      | Pconst_string (_, Some "INTERNAL_RES_CHAR_CONTENTS") ->
-        Sexp.list [Sexp.atom "Pconst_char"]
-      | Pconst_string (txt, tag) ->
-        Sexp.list
-          [
-            Sexp.atom "Pconst_string";
-            string txt;
-            (match tag with
-            | Some txt -> Sexp.list [Sexp.atom "Some"; string txt]
-            | None -> Sexp.atom "None");
-          ]
-      | Pconst_float (txt, tag) ->
-        Sexp.list [Sexp.atom "Pconst_float"; string txt; optChar tag]
-    in
-    Sexp.list [Sexp.atom "constant"; sexpr]
-
-  let rec structure s =
-    Sexp.list (Sexp.atom "structure" :: List.map structureItem s)
-
-  and structureItem si =
-    let desc =
-      match si.pstr_desc with
-      | Pstr_eval (expr, attrs) ->
-        Sexp.list [Sexp.atom "Pstr_eval"; expression expr; attributes attrs]
-      | Pstr_value (flag, vbs) ->
-        Sexp.list
-          [
-            Sexp.atom "Pstr_value";
-            recFlag flag;
-            Sexp.list (mapEmpty ~f:valueBinding vbs);
-          ]
-      | Pstr_primitive vd ->
-        Sexp.list [Sexp.atom "Pstr_primitive"; valueDescription vd]
-      | Pstr_type (flag, tds) ->
-        Sexp.list
-          [
-            Sexp.atom "Pstr_type";
-            recFlag flag;
-            Sexp.list (mapEmpty ~f:typeDeclaration tds);
-          ]
-      | Pstr_typext typext ->
-        Sexp.list [Sexp.atom "Pstr_type"; typeExtension typext]
-      | Pstr_exception ec ->
-        Sexp.list [Sexp.atom "Pstr_exception"; extensionConstructor ec]
-      | Pstr_module mb -> Sexp.list [Sexp.atom "Pstr_module"; moduleBinding mb]
-      | Pstr_recmodule mbs ->
-        Sexp.list
-          [
-            Sexp.atom "Pstr_recmodule"; Sexp.list (mapEmpty ~f:moduleBinding mbs);
-          ]
-      | Pstr_modtype modTypDecl ->
-        Sexp.list [Sexp.atom "Pstr_modtype"; moduleTypeDeclaration modTypDecl]
-      | Pstr_open openDesc ->
-        Sexp.list [Sexp.atom "Pstr_open"; openDescription openDesc]
-      | Pstr_class _ -> Sexp.atom "Pstr_class"
-      | Pstr_class_type _ -> Sexp.atom "Pstr_class_type"
-      | Pstr_include id ->
-        Sexp.list [Sexp.atom "Pstr_include"; includeDeclaration id]
-      | Pstr_attribute attr ->
-        Sexp.list [Sexp.atom "Pstr_attribute"; attribute attr]
-      | Pstr_extension (ext, attrs) ->
-        Sexp.list [Sexp.atom "Pstr_extension"; extension ext; attributes attrs]
-    in
-    Sexp.list [Sexp.atom "structure_item"; desc]
-
-  and includeDeclaration id =
-    Sexp.list
-      [
-        Sexp.atom "include_declaration";
-        moduleExpression id.pincl_mod;
-        attributes id.pincl_attributes;
-      ]
-
-  and openDescription od =
-    Sexp.list
-      [
-        Sexp.atom "open_description";
-        longident od.popen_lid.Asttypes.txt;
-        attributes od.popen_attributes;
-      ]
-
-  and moduleTypeDeclaration mtd =
-    Sexp.list
-      [
-        Sexp.atom "module_type_declaration";
-        string mtd.pmtd_name.Asttypes.txt;
-        (match mtd.pmtd_type with
-        | None -> Sexp.atom "None"
-        | Some modType -> Sexp.list [Sexp.atom "Some"; moduleType modType]);
-        attributes mtd.pmtd_attributes;
-      ]
-
-  and moduleBinding mb =
-    Sexp.list
-      [
-        Sexp.atom "module_binding";
-        string mb.pmb_name.Asttypes.txt;
-        moduleExpression mb.pmb_expr;
-        attributes mb.pmb_attributes;
-      ]
-
-  and moduleExpression me =
-    let desc =
-      match me.pmod_desc with
-      | Pmod_ident modName ->
-        Sexp.list [Sexp.atom "Pmod_ident"; longident modName.Asttypes.txt]
-      | Pmod_structure s -> Sexp.list [Sexp.atom "Pmod_structure"; structure s]
-      | Pmod_functor (lbl, optModType, modExpr) ->
-        Sexp.list
-          [
-            Sexp.atom "Pmod_functor";
-            string lbl.Asttypes.txt;
-            (match optModType with
-            | None -> Sexp.atom "None"
-            | Some modType -> Sexp.list [Sexp.atom "Some"; moduleType modType]);
-            moduleExpression modExpr;
-          ]
-      | Pmod_apply (callModExpr, modExprArg) ->
-        Sexp.list
-          [
-            Sexp.atom "Pmod_apply";
-            moduleExpression callModExpr;
-            moduleExpression modExprArg;
-          ]
-      | Pmod_constraint (modExpr, modType) ->
-        Sexp.list
-          [
-            Sexp.atom "Pmod_constraint";
-            moduleExpression modExpr;
-            moduleType modType;
-          ]
-      | Pmod_unpack expr -> Sexp.list [Sexp.atom "Pmod_unpack"; expression expr]
-      | Pmod_extension ext ->
-        Sexp.list [Sexp.atom "Pmod_extension"; extension ext]
-    in
-    Sexp.list [Sexp.atom "module_expr"; desc; attributes me.pmod_attributes]
-
-  and moduleType mt =
-    let desc =
-      match mt.pmty_desc with
-      | Pmty_ident longidentLoc ->
-        Sexp.list [Sexp.atom "Pmty_ident"; longident longidentLoc.Asttypes.txt]
-      | Pmty_signature s -> Sexp.list [Sexp.atom "Pmty_signature"; signature s]
-      | Pmty_functor (lbl, optModType, modType) ->
-        Sexp.list
-          [
-            Sexp.atom "Pmty_functor";
-            string lbl.Asttypes.txt;
-            (match optModType with
-            | None -> Sexp.atom "None"
-            | Some modType -> Sexp.list [Sexp.atom "Some"; moduleType modType]);
-            moduleType modType;
-          ]
-      | Pmty_alias longidentLoc ->
-        Sexp.list [Sexp.atom "Pmty_alias"; longident longidentLoc.Asttypes.txt]
-      | Pmty_extension ext ->
-        Sexp.list [Sexp.atom "Pmty_extension"; extension ext]
-      | Pmty_typeof modExpr ->
-        Sexp.list [Sexp.atom "Pmty_typeof"; moduleExpression modExpr]
-      | Pmty_with (modType, withConstraints) ->
-        Sexp.list
-          [
-            Sexp.atom "Pmty_with";
-            moduleType modType;
-            Sexp.list (mapEmpty ~f:withConstraint withConstraints);
-          ]
-    in
-    Sexp.list [Sexp.atom "module_type"; desc; attributes mt.pmty_attributes]
-
-  and withConstraint wc =
-    match wc with
-    | Pwith_type (longidentLoc, td) ->
-      Sexp.list
-        [
-          Sexp.atom "Pmty_with";
-          longident longidentLoc.Asttypes.txt;
-          typeDeclaration td;
-        ]
-    | Pwith_module (l1, l2) ->
-      Sexp.list
-        [
-          Sexp.atom "Pwith_module";
-          longident l1.Asttypes.txt;
-          longident l2.Asttypes.txt;
-        ]
-    | Pwith_typesubst (longidentLoc, td) ->
-      Sexp.list
-        [
-          Sexp.atom "Pwith_typesubst";
-          longident longidentLoc.Asttypes.txt;
-          typeDeclaration td;
-        ]
-    | Pwith_modsubst (l1, l2) ->
-      Sexp.list
-        [
-          Sexp.atom "Pwith_modsubst";
-          longident l1.Asttypes.txt;
-          longident l2.Asttypes.txt;
-        ]
-
-  and signature s = Sexp.list (Sexp.atom "signature" :: List.map signatureItem s)
-
-  and signatureItem si =
-    let descr =
-      match si.psig_desc with
-      | Psig_value vd -> Sexp.list [Sexp.atom "Psig_value"; valueDescription vd]
-      | Psig_type (flag, typeDeclarations) ->
-        Sexp.list
-          [
-            Sexp.atom "Psig_type";
-            recFlag flag;
-            Sexp.list (mapEmpty ~f:typeDeclaration typeDeclarations);
-          ]
-      | Psig_typext typExt ->
-        Sexp.list [Sexp.atom "Psig_typext"; typeExtension typExt]
-      | Psig_exception extConstr ->
-        Sexp.list [Sexp.atom "Psig_exception"; extensionConstructor extConstr]
-      | Psig_module modDecl ->
-        Sexp.list [Sexp.atom "Psig_module"; moduleDeclaration modDecl]
-      | Psig_recmodule modDecls ->
-        Sexp.list
-          [
-            Sexp.atom "Psig_recmodule";
-            Sexp.list (mapEmpty ~f:moduleDeclaration modDecls);
-          ]
-      | Psig_modtype modTypDecl ->
-        Sexp.list [Sexp.atom "Psig_modtype"; moduleTypeDeclaration modTypDecl]
-      | Psig_open openDesc ->
-        Sexp.list [Sexp.atom "Psig_open"; openDescription openDesc]
-      | Psig_include inclDecl ->
-        Sexp.list [Sexp.atom "Psig_include"; includeDescription inclDecl]
-      | Psig_class _ -> Sexp.list [Sexp.atom "Psig_class"]
-      | Psig_class_type _ -> Sexp.list [Sexp.atom "Psig_class_type"]
-      | Psig_attribute attr ->
-        Sexp.list [Sexp.atom "Psig_attribute"; attribute attr]
-      | Psig_extension (ext, attrs) ->
-        Sexp.list [Sexp.atom "Psig_extension"; extension ext; attributes attrs]
-    in
-    Sexp.list [Sexp.atom "signature_item"; descr]
-
-  and includeDescription id =
-    Sexp.list
-      [
-        Sexp.atom "include_description";
-        moduleType id.pincl_mod;
-        attributes id.pincl_attributes;
-      ]
-
-  and moduleDeclaration md =
-    Sexp.list
-      [
-        Sexp.atom "module_declaration";
-        string md.pmd_name.Asttypes.txt;
-        moduleType md.pmd_type;
-        attributes md.pmd_attributes;
-      ]
-
-  and valueBinding vb =
-    Sexp.list
-      [
-        Sexp.atom "value_binding";
-        pattern vb.pvb_pat;
-        expression vb.pvb_expr;
-        attributes vb.pvb_attributes;
-      ]
-
-  and valueDescription vd =
-    Sexp.list
-      [
-        Sexp.atom "value_description";
-        string vd.pval_name.Asttypes.txt;
-        coreType vd.pval_type;
-        Sexp.list (mapEmpty ~f:string vd.pval_prim);
-        attributes vd.pval_attributes;
-      ]
-
-  and typeDeclaration td =
-    Sexp.list
-      [
-        Sexp.atom "type_declaration";
-        string td.ptype_name.Asttypes.txt;
-        Sexp.list
-          [
-            Sexp.atom "ptype_params";
-            Sexp.list
-              (mapEmpty
-                 ~f:(fun (typexpr, var) ->
-                   Sexp.list [coreType typexpr; variance var])
-                 td.ptype_params);
-          ];
-        Sexp.list
-          [
-            Sexp.atom "ptype_cstrs";
-            Sexp.list
-              (mapEmpty
-                 ~f:(fun (typ1, typ2, _loc) ->
-                   Sexp.list [coreType typ1; coreType typ2])
-                 td.ptype_cstrs);
-          ];
-        Sexp.list [Sexp.atom "ptype_kind"; typeKind td.ptype_kind];
-        Sexp.list
-          [
-            Sexp.atom "ptype_manifest";
-            (match td.ptype_manifest with
-            | None -> Sexp.atom "None"
-            | Some typ -> Sexp.list [Sexp.atom "Some"; coreType typ]);
-          ];
-        Sexp.list [Sexp.atom "ptype_private"; privateFlag td.ptype_private];
-        attributes td.ptype_attributes;
-      ]
-
-  and extensionConstructor ec =
-    Sexp.list
-      [
-        Sexp.atom "extension_constructor";
-        string ec.pext_name.Asttypes.txt;
-        extensionConstructorKind ec.pext_kind;
-        attributes ec.pext_attributes;
-      ]
-
-  and extensionConstructorKind kind =
-    match kind with
-    | Pext_decl (args, optTypExpr) ->
-      Sexp.list
-        [
-          Sexp.atom "Pext_decl";
-          constructorArguments args;
-          (match optTypExpr with
-          | None -> Sexp.atom "None"
-          | Some typ -> Sexp.list [Sexp.atom "Some"; coreType typ]);
-        ]
-    | Pext_rebind longidentLoc ->
-      Sexp.list [Sexp.atom "Pext_rebind"; longident longidentLoc.Asttypes.txt]
-
-  and typeExtension te =
-    Sexp.list
-      [
-        Sexp.atom "type_extension";
-        Sexp.list
-          [Sexp.atom "ptyext_path"; longident te.ptyext_path.Asttypes.txt];
-        Sexp.list
-          [
-            Sexp.atom "ptyext_parms";
-            Sexp.list
-              (mapEmpty
-                 ~f:(fun (typexpr, var) ->
-                   Sexp.list [coreType typexpr; variance var])
-                 te.ptyext_params);
-          ];
-        Sexp.list
-          [
-            Sexp.atom "ptyext_constructors";
-            Sexp.list (mapEmpty ~f:extensionConstructor te.ptyext_constructors);
-          ];
-        Sexp.list [Sexp.atom "ptyext_private"; privateFlag te.ptyext_private];
-        attributes te.ptyext_attributes;
-      ]
-
-  and typeKind kind =
-    match kind with
-    | Ptype_abstract -> Sexp.atom "Ptype_abstract"
-    | Ptype_variant constrDecls ->
-      Sexp.list
-        [
-          Sexp.atom "Ptype_variant";
-          Sexp.list (mapEmpty ~f:constructorDeclaration constrDecls);
-        ]
-    | Ptype_record lblDecls ->
-      Sexp.list
-        [
-          Sexp.atom "Ptype_record";
-          Sexp.list (mapEmpty ~f:labelDeclaration lblDecls);
-        ]
-    | Ptype_open -> Sexp.atom "Ptype_open"
-
-  and constructorDeclaration cd =
-    Sexp.list
-      [
-        Sexp.atom "constructor_declaration";
-        string cd.pcd_name.Asttypes.txt;
-        Sexp.list [Sexp.atom "pcd_args"; constructorArguments cd.pcd_args];
-        Sexp.list
-          [
-            Sexp.atom "pcd_res";
-            (match cd.pcd_res with
-            | None -> Sexp.atom "None"
-            | Some typ -> Sexp.list [Sexp.atom "Some"; coreType typ]);
-          ];
-        attributes cd.pcd_attributes;
-      ]
-
-  and constructorArguments args =
-    match args with
-    | Pcstr_tuple types ->
-      Sexp.list
-        [Sexp.atom "Pcstr_tuple"; Sexp.list (mapEmpty ~f:coreType types)]
-    | Pcstr_record lds ->
-      Sexp.list
-        [Sexp.atom "Pcstr_record"; Sexp.list (mapEmpty ~f:labelDeclaration lds)]
-
-  and labelDeclaration ld =
-    Sexp.list
-      [
-        Sexp.atom "label_declaration";
-        string ld.pld_name.Asttypes.txt;
-        mutableFlag ld.pld_mutable;
-        coreType ld.pld_type;
-        attributes ld.pld_attributes;
-      ]
-
-  and expression expr =
-    let desc =
-      match expr.pexp_desc with
-      | Pexp_ident longidentLoc ->
-        Sexp.list [Sexp.atom "Pexp_ident"; longident longidentLoc.Asttypes.txt]
-      | Pexp_constant c -> Sexp.list [Sexp.atom "Pexp_constant"; constant c]
-      | Pexp_let (flag, vbs, expr) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_let";
-            recFlag flag;
-            Sexp.list (mapEmpty ~f:valueBinding vbs);
-            expression expr;
-          ]
-      | Pexp_function cases ->
-        Sexp.list
-          [Sexp.atom "Pexp_function"; Sexp.list (mapEmpty ~f:case cases)]
-      | Pexp_fun (argLbl, exprOpt, pat, expr) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_fun";
-            argLabel argLbl;
-            (match exprOpt with
-            | None -> Sexp.atom "None"
-            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
-            pattern pat;
-            expression expr;
-          ]
-      | Pexp_apply (expr, args) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_apply";
-            expression expr;
-            Sexp.list
-              (mapEmpty
-                 ~f:(fun (argLbl, expr) ->
-                   Sexp.list [argLabel argLbl; expression expr])
-                 args);
-          ]
-      | Pexp_match (expr, cases) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_match";
-            expression expr;
-            Sexp.list (mapEmpty ~f:case cases);
-          ]
-      | Pexp_try (expr, cases) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_try";
-            expression expr;
-            Sexp.list (mapEmpty ~f:case cases);
-          ]
-      | Pexp_tuple exprs ->
-        Sexp.list
-          [Sexp.atom "Pexp_tuple"; Sexp.list (mapEmpty ~f:expression exprs)]
-      | Pexp_construct (longidentLoc, exprOpt) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_construct";
-            longident longidentLoc.Asttypes.txt;
-            (match exprOpt with
-            | None -> Sexp.atom "None"
-            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
-          ]
-      | Pexp_variant (lbl, exprOpt) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_variant";
-            string lbl;
-            (match exprOpt with
-            | None -> Sexp.atom "None"
-            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
-          ]
-      | Pexp_record (rows, optExpr) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_record";
-            Sexp.list
-              (mapEmpty
-                 ~f:(fun (longidentLoc, expr) ->
-                   Sexp.list
-                     [longident longidentLoc.Asttypes.txt; expression expr])
-                 rows);
-            (match optExpr with
-            | None -> Sexp.atom "None"
-            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
-          ]
-      | Pexp_field (expr, longidentLoc) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_field";
-            expression expr;
-            longident longidentLoc.Asttypes.txt;
-          ]
-      | Pexp_setfield (expr1, longidentLoc, expr2) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_setfield";
-            expression expr1;
-            longident longidentLoc.Asttypes.txt;
-            expression expr2;
-          ]
-      | Pexp_array exprs ->
-        Sexp.list
-          [Sexp.atom "Pexp_array"; Sexp.list (mapEmpty ~f:expression exprs)]
-      | Pexp_ifthenelse (expr1, expr2, optExpr) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_ifthenelse";
-            expression expr1;
-            expression expr2;
-            (match optExpr with
-            | None -> Sexp.atom "None"
-            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
-          ]
-      | Pexp_sequence (expr1, expr2) ->
-        Sexp.list
-          [Sexp.atom "Pexp_sequence"; expression expr1; expression expr2]
-      | Pexp_while (expr1, expr2) ->
-        Sexp.list [Sexp.atom "Pexp_while"; expression expr1; expression expr2]
-      | Pexp_for (pat, e1, e2, flag, e3) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_for";
-            pattern pat;
-            expression e1;
-            expression e2;
-            directionFlag flag;
-            expression e3;
-          ]
-      | Pexp_constraint (expr, typexpr) ->
-        Sexp.list
-          [Sexp.atom "Pexp_constraint"; expression expr; coreType typexpr]
-      | Pexp_coerce (expr, optTyp, typexpr) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_coerce";
-            expression expr;
-            (match optTyp with
-            | None -> Sexp.atom "None"
-            | Some typ -> Sexp.list [Sexp.atom "Some"; coreType typ]);
-            coreType typexpr;
-          ]
-      | Pexp_send _ -> Sexp.list [Sexp.atom "Pexp_send"]
-      | Pexp_new _ -> Sexp.list [Sexp.atom "Pexp_new"]
-      | Pexp_setinstvar _ -> Sexp.list [Sexp.atom "Pexp_setinstvar"]
-      | Pexp_override _ -> Sexp.list [Sexp.atom "Pexp_override"]
-      | Pexp_letmodule (modName, modExpr, expr) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_letmodule";
-            string modName.Asttypes.txt;
-            moduleExpression modExpr;
-            expression expr;
-          ]
-      | Pexp_letexception (extConstr, expr) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_letexception";
-            extensionConstructor extConstr;
-            expression expr;
-          ]
-      | Pexp_assert expr -> Sexp.list [Sexp.atom "Pexp_assert"; expression expr]
-      | Pexp_lazy expr -> Sexp.list [Sexp.atom "Pexp_lazy"; expression expr]
-      | Pexp_poly _ -> Sexp.list [Sexp.atom "Pexp_poly"]
-      | Pexp_object _ -> Sexp.list [Sexp.atom "Pexp_object"]
-      | Pexp_newtype (lbl, expr) ->
-        Sexp.list
-          [Sexp.atom "Pexp_newtype"; string lbl.Asttypes.txt; expression expr]
-      | Pexp_pack modExpr ->
-        Sexp.list [Sexp.atom "Pexp_pack"; moduleExpression modExpr]
-      | Pexp_open (flag, longidentLoc, expr) ->
-        Sexp.list
-          [
-            Sexp.atom "Pexp_open";
-            overrideFlag flag;
-            longident longidentLoc.Asttypes.txt;
-            expression expr;
-          ]
-      | Pexp_extension ext ->
-        Sexp.list [Sexp.atom "Pexp_extension"; extension ext]
-      | Pexp_unreachable -> Sexp.atom "Pexp_unreachable"
-    in
-    Sexp.list [Sexp.atom "expression"; desc]
-
-  and case c =
-    Sexp.list
-      [
-        Sexp.atom "case";
-        Sexp.list [Sexp.atom "pc_lhs"; pattern c.pc_lhs];
-        Sexp.list
-          [
-            Sexp.atom "pc_guard";
-            (match c.pc_guard with
-            | None -> Sexp.atom "None"
-            | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]);
-          ];
-        Sexp.list [Sexp.atom "pc_rhs"; expression c.pc_rhs];
-      ]
-
-  and pattern p =
-    let descr =
-      match p.ppat_desc with
-      | Ppat_any -> Sexp.atom "Ppat_any"
-      | Ppat_var var ->
-        Sexp.list [Sexp.atom "Ppat_var"; string var.Location.txt]
-      | Ppat_alias (p, alias) ->
-        Sexp.list [Sexp.atom "Ppat_alias"; pattern p; string alias.txt]
-      | Ppat_constant c -> Sexp.list [Sexp.atom "Ppat_constant"; constant c]
-      | Ppat_interval (lo, hi) ->
-        Sexp.list [Sexp.atom "Ppat_interval"; constant lo; constant hi]
-      | Ppat_tuple patterns ->
-        Sexp.list
-          [Sexp.atom "Ppat_tuple"; Sexp.list (mapEmpty ~f:pattern patterns)]
-      | Ppat_construct (longidentLoc, optPattern) ->
-        Sexp.list
-          [
-            Sexp.atom "Ppat_construct";
-            longident longidentLoc.Location.txt;
-            (match optPattern with
-            | None -> Sexp.atom "None"
-            | Some p -> Sexp.list [Sexp.atom "some"; pattern p]);
-          ]
-      | Ppat_variant (lbl, optPattern) ->
-        Sexp.list
-          [
-            Sexp.atom "Ppat_variant";
-            string lbl;
-            (match optPattern with
-            | None -> Sexp.atom "None"
-            | Some p -> Sexp.list [Sexp.atom "Some"; pattern p]);
-          ]
-      | Ppat_record (rows, flag) ->
-        Sexp.list
-          [
-            Sexp.atom "Ppat_record";
-            closedFlag flag;
-            Sexp.list
-              (mapEmpty
-                 ~f:(fun (longidentLoc, p) ->
-                   Sexp.list [longident longidentLoc.Location.txt; pattern p])
-                 rows);
-          ]
-      | Ppat_array patterns ->
-        Sexp.list
-          [Sexp.atom "Ppat_array"; Sexp.list (mapEmpty ~f:pattern patterns)]
-      | Ppat_or (p1, p2) ->
-        Sexp.list [Sexp.atom "Ppat_or"; pattern p1; pattern p2]
-      | Ppat_constraint (p, typexpr) ->
-        Sexp.list [Sexp.atom "Ppat_constraint"; pattern p; coreType typexpr]
-      | Ppat_type longidentLoc ->
-        Sexp.list [Sexp.atom "Ppat_type"; longident longidentLoc.Location.txt]
-      | Ppat_lazy p -> Sexp.list [Sexp.atom "Ppat_lazy"; pattern p]
-      | Ppat_unpack stringLoc ->
-        Sexp.list [Sexp.atom "Ppat_unpack"; string stringLoc.Location.txt]
-      | Ppat_exception p -> Sexp.list [Sexp.atom "Ppat_exception"; pattern p]
-      | Ppat_extension ext ->
-        Sexp.list [Sexp.atom "Ppat_extension"; extension ext]
-      | Ppat_open (longidentLoc, p) ->
-        Sexp.list
-          [
-            Sexp.atom "Ppat_open"; longident longidentLoc.Location.txt; pattern p;
-          ]
-    in
-    Sexp.list [Sexp.atom "pattern"; descr]
-
-  and objectField field =
-    match field with
-    | Otag (lblLoc, attrs, typexpr) ->
-      Sexp.list
-        [
-          Sexp.atom "Otag"; string lblLoc.txt; attributes attrs; coreType typexpr;
-        ]
-    | Oinherit typexpr -> Sexp.list [Sexp.atom "Oinherit"; coreType typexpr]
-
-  and rowField field =
-    match field with
-    | Rtag (labelLoc, attrs, truth, types) ->
-      Sexp.list
-        [
-          Sexp.atom "Rtag";
-          string labelLoc.txt;
-          attributes attrs;
-          Sexp.atom (if truth then "true" else "false");
-          Sexp.list (mapEmpty ~f:coreType types);
-        ]
-    | Rinherit typexpr -> Sexp.list [Sexp.atom "Rinherit"; coreType typexpr]
-
-  and packageType (modNameLoc, packageConstraints) =
-    Sexp.list
-      [
-        Sexp.atom "package_type";
-        longident modNameLoc.Asttypes.txt;
-        Sexp.list
-          (mapEmpty
-             ~f:(fun (modNameLoc, typexpr) ->
-               Sexp.list [longident modNameLoc.Asttypes.txt; coreType typexpr])
-             packageConstraints);
-      ]
-
-  and coreType typexpr =
-    let desc =
-      match typexpr.ptyp_desc with
-      | Ptyp_any -> Sexp.atom "Ptyp_any"
-      | Ptyp_var var -> Sexp.list [Sexp.atom "Ptyp_var"; string var]
-      | Ptyp_arrow (argLbl, typ1, typ2) ->
-        Sexp.list
-          [
-            Sexp.atom "Ptyp_arrow"; argLabel argLbl; coreType typ1; coreType typ2;
-          ]
-      | Ptyp_tuple types ->
-        Sexp.list
-          [Sexp.atom "Ptyp_tuple"; Sexp.list (mapEmpty ~f:coreType types)]
-      | Ptyp_constr (longidentLoc, types) ->
-        Sexp.list
-          [
-            Sexp.atom "Ptyp_constr";
-            longident longidentLoc.txt;
-            Sexp.list (mapEmpty ~f:coreType types);
-          ]
-      | Ptyp_alias (typexpr, alias) ->
-        Sexp.list [Sexp.atom "Ptyp_alias"; coreType typexpr; string alias]
-      | Ptyp_object (fields, flag) ->
-        Sexp.list
-          [
-            Sexp.atom "Ptyp_object";
-            closedFlag flag;
-            Sexp.list (mapEmpty ~f:objectField fields);
-          ]
-      | Ptyp_class (longidentLoc, types) ->
-        Sexp.list
-          [
-            Sexp.atom "Ptyp_class";
-            longident longidentLoc.Location.txt;
-            Sexp.list (mapEmpty ~f:coreType types);
-          ]
-      | Ptyp_variant (fields, flag, optLabels) ->
-        Sexp.list
-          [
-            Sexp.atom "Ptyp_variant";
-            Sexp.list (mapEmpty ~f:rowField fields);
-            closedFlag flag;
-            (match optLabels with
-            | None -> Sexp.atom "None"
-            | Some lbls -> Sexp.list (mapEmpty ~f:string lbls));
-          ]
-      | Ptyp_poly (lbls, typexpr) ->
-        Sexp.list
-          [
-            Sexp.atom "Ptyp_poly";
-            Sexp.list (mapEmpty ~f:(fun lbl -> string lbl.Asttypes.txt) lbls);
-            coreType typexpr;
-          ]
-      | Ptyp_package package ->
-        Sexp.list [Sexp.atom "Ptyp_package"; packageType package]
-      | Ptyp_extension ext ->
-        Sexp.list [Sexp.atom "Ptyp_extension"; extension ext]
-    in
-    Sexp.list [Sexp.atom "core_type"; desc]
-
-  and payload p =
-    match p with
-    | PStr s -> Sexp.list (Sexp.atom "PStr" :: mapEmpty ~f:structureItem s)
-    | PSig s -> Sexp.list [Sexp.atom "PSig"; signature s]
-    | PTyp ct -> Sexp.list [Sexp.atom "PTyp"; coreType ct]
-    | PPat (pat, optExpr) ->
-      Sexp.list
-        [
-          Sexp.atom "PPat";
-          pattern pat;
-          (match optExpr with
-          | Some expr -> Sexp.list [Sexp.atom "Some"; expression expr]
-          | None -> Sexp.atom "None");
-        ]
-
-  and attribute (stringLoc, p) =
-    Sexp.list
-      [Sexp.atom "attribute"; Sexp.atom stringLoc.Asttypes.txt; payload p]
-
-  and extension (stringLoc, p) =
-    Sexp.list
-      [Sexp.atom "extension"; Sexp.atom stringLoc.Asttypes.txt; payload p]
-
-  and attributes attrs =
-    let sexprs = mapEmpty ~f:attribute attrs in
-    Sexp.list (Sexp.atom "attributes" :: sexprs)
-
-  let printEngine =
-    Res_driver.
-      {
-        printImplementation =
-          (fun ~width:_ ~filename:_ ~comments:_ parsetree ->
-            parsetree |> structure |> Sexp.toString |> print_string);
-        printInterface =
-          (fun ~width:_ ~filename:_ ~comments:_ parsetree ->
-            parsetree |> signature |> Sexp.toString |> print_string);
-      }
-end
-
-let sexpPrintEngine = SexpAst.printEngine
-
-let commentsPrintEngine =
-  {
-    Res_driver.printImplementation =
-      (fun ~width:_ ~filename:_ ~comments s ->
-        let cmtTbl = CommentTable.make () in
-        CommentTable.walkStructure s cmtTbl comments;
-        CommentTable.log cmtTbl);
-    printInterface =
-      (fun ~width:_ ~filename:_ ~comments s ->
-        let cmtTbl = CommentTable.make () in
-        CommentTable.walkSignature s cmtTbl comments;
-        CommentTable.log cmtTbl);
-  }
diff --git a/jscomp/syntax/src/res_ast_debugger.mli b/jscomp/syntax/src/res_ast_debugger.mli
deleted file mode 100644
index 1b325b7..0000000
--- a/jscomp/syntax/src/res_ast_debugger.mli
+++ /dev/null
@@ -1,3 +0,0 @@
-val printEngine : Res_driver.printEngine
-val sexpPrintEngine : Res_driver.printEngine
-val commentsPrintEngine : Res_driver.printEngine
diff --git a/jscomp/syntax/src/res_comment.ml b/jscomp/syntax/src/res_comment.ml
deleted file mode 100644
index 579b5d3..0000000
--- a/jscomp/syntax/src/res_comment.ml
+++ /dev/null
@@ -1,67 +0,0 @@
-type style = SingleLine | MultiLine | DocComment | ModuleComment
-
-let styleToString s =
-  match s with
-  | SingleLine -> "SingleLine"
-  | MultiLine -> "MultiLine"
-  | DocComment -> "DocComment"
-  | ModuleComment -> "ModuleComment"
-
-type t = {
-  txt: string;
-  style: style;
-  loc: Location.t;
-  mutable prevTokEndPos: Lexing.position;
-}
-
-let loc t = t.loc
-let txt t = t.txt
-let prevTokEndPos t = t.prevTokEndPos
-
-let setPrevTokEndPos t pos = t.prevTokEndPos <- pos
-
-let isSingleLineComment t = t.style = SingleLine
-
-let isDocComment t = t.style = DocComment
-
-let isModuleComment t = t.style = ModuleComment
-
-let toString t =
-  let {Location.loc_start; loc_end} = t.loc in
-  Format.sprintf "(txt: %s\nstyle: %s\nlocation: %d,%d-%d,%d)" t.txt
-    (styleToString t.style) loc_start.pos_lnum
-    (loc_start.pos_cnum - loc_start.pos_bol)
-    loc_end.pos_lnum
-    (loc_end.pos_cnum - loc_end.pos_bol)
-
-let makeSingleLineComment ~loc txt =
-  {txt; loc; style = SingleLine; prevTokEndPos = Lexing.dummy_pos}
-
-let makeMultiLineComment ~loc ~docComment ~standalone txt =
-  {
-    txt;
-    loc;
-    style =
-      (if docComment then if standalone then ModuleComment else DocComment
-       else MultiLine);
-    prevTokEndPos = Lexing.dummy_pos;
-  }
-
-let fromOcamlComment ~loc ~txt ~prevTokEndPos =
-  {txt; loc; style = MultiLine; prevTokEndPos}
-
-let trimSpaces s =
-  let len = String.length s in
-  if len = 0 then s
-  else if String.unsafe_get s 0 = ' ' || String.unsafe_get s (len - 1) = ' '
-  then (
-    let i = ref 0 in
-    while !i < len && String.unsafe_get s !i = ' ' do
-      incr i
-    done;
-    let j = ref (len - 1) in
-    while !j >= !i && String.unsafe_get s !j = ' ' do
-      decr j
-    done;
-    if !j >= !i then (String.sub [@doesNotRaise]) s !i (!j - !i + 1) else "")
-  else s
diff --git a/jscomp/syntax/src/res_comment.mli b/jscomp/syntax/src/res_comment.mli
deleted file mode 100644
index f1d5424..0000000
--- a/jscomp/syntax/src/res_comment.mli
+++ /dev/null
@@ -1,22 +0,0 @@
-type t
-
-val toString : t -> string
-
-val loc : t -> Location.t
-val txt : t -> string
-val prevTokEndPos : t -> Lexing.position
-
-val setPrevTokEndPos : t -> Lexing.position -> unit
-
-val isDocComment : t -> bool
-
-val isModuleComment : t -> bool
-
-val isSingleLineComment : t -> bool
-
-val makeSingleLineComment : loc:Location.t -> string -> t
-val makeMultiLineComment :
-  loc:Location.t -> docComment:bool -> standalone:bool -> string -> t
-val fromOcamlComment :
-  loc:Location.t -> txt:string -> prevTokEndPos:Lexing.position -> t
-val trimSpaces : string -> string
diff --git a/jscomp/syntax/src/res_comments_table.ml b/jscomp/syntax/src/res_comments_table.ml
deleted file mode 100644
index b23e65c..0000000
--- a/jscomp/syntax/src/res_comments_table.ml
+++ /dev/null
@@ -1,1913 +0,0 @@
-module Comment = Res_comment
-module Doc = Res_doc
-module ParsetreeViewer = Res_parsetree_viewer
-
-type t = {
-  leading: (Location.t, Comment.t list) Hashtbl.t;
-  inside: (Location.t, Comment.t list) Hashtbl.t;
-  trailing: (Location.t, Comment.t list) Hashtbl.t;
-}
-
-let make () =
-  {
-    leading = Hashtbl.create 100;
-    inside = Hashtbl.create 100;
-    trailing = Hashtbl.create 100;
-  }
-
-let copy tbl =
-  {
-    leading = Hashtbl.copy tbl.leading;
-    inside = Hashtbl.copy tbl.inside;
-    trailing = Hashtbl.copy tbl.trailing;
-  }
-
-let empty = make ()
-
-let printEntries tbl =
-  let open Location in
-  Hashtbl.fold
-    (fun (k : Location.t) (v : Comment.t list) acc ->
-      let loc =
-        Doc.concat
-          [
-            Doc.lbracket;
-            Doc.text (string_of_int k.loc_start.pos_lnum);
-            Doc.text ":";
-            Doc.text
-              (string_of_int (k.loc_start.pos_cnum - k.loc_start.pos_bol));
-            Doc.text "-";
-            Doc.text (string_of_int k.loc_end.pos_lnum);
-            Doc.text ":";
-            Doc.text (string_of_int (k.loc_end.pos_cnum - k.loc_end.pos_bol));
-            Doc.rbracket;
-          ]
-      in
-      let doc =
-        Doc.breakableGroup ~forceBreak:true
-          (Doc.concat
-             [
-               loc;
-               Doc.indent
-                 (Doc.concat
-                    [
-                      Doc.line;
-                      Doc.join
-                        ~sep:(Doc.concat [Doc.comma; Doc.line])
-                        (List.map (fun c -> Doc.text (Comment.txt c)) v);
-                    ]);
-               Doc.line;
-             ])
-      in
-      doc :: acc)
-    tbl []
-
-let log t =
-  let leadingStuff = printEntries t.leading in
-  let trailingStuff = printEntries t.trailing in
-  let stuffInside = printEntries t.inside in
-  Doc.breakableGroup ~forceBreak:true
-    (Doc.concat
-       [
-         Doc.text "leading comments:";
-         Doc.indent (Doc.concat [Doc.line; Doc.concat leadingStuff]);
-         Doc.line;
-         Doc.text "comments inside:";
-         Doc.indent (Doc.concat [Doc.line; Doc.concat stuffInside]);
-         Doc.line;
-         Doc.text "trailing comments:";
-         Doc.indent (Doc.concat [Doc.line; Doc.concat trailingStuff]);
-         Doc.line;
-       ])
-  |> Doc.toString ~width:80 |> print_endline
-
-let attach tbl loc comments =
-  match comments with
-  | [] -> ()
-  | comments -> Hashtbl.replace tbl loc comments
-
-let partitionByLoc comments loc =
-  let rec loop (leading, inside, trailing) comments =
-    let open Location in
-    match comments with
-    | comment :: rest ->
-      let cmtLoc = Comment.loc comment in
-      if cmtLoc.loc_end.pos_cnum <= loc.loc_start.pos_cnum then
-        loop (comment :: leading, inside, trailing) rest
-      else if cmtLoc.loc_start.pos_cnum >= loc.loc_end.pos_cnum then
-        loop (leading, inside, comment :: trailing) rest
-      else loop (leading, comment :: inside, trailing) rest
-    | [] -> (List.rev leading, List.rev inside, List.rev trailing)
-  in
-  loop ([], [], []) comments
-
-let partitionLeadingTrailing comments loc =
-  let rec loop (leading, trailing) comments =
-    let open Location in
-    match comments with
-    | comment :: rest ->
-      let cmtLoc = Comment.loc comment in
-      if cmtLoc.loc_end.pos_cnum <= loc.loc_start.pos_cnum then
-        loop (comment :: leading, trailing) rest
-      else loop (leading, comment :: trailing) rest
-    | [] -> (List.rev leading, List.rev trailing)
-  in
-  loop ([], []) comments
-
-let partitionByOnSameLine loc comments =
-  let rec loop (onSameLine, onOtherLine) comments =
-    let open Location in
-    match comments with
-    | [] -> (List.rev onSameLine, List.rev onOtherLine)
-    | comment :: rest ->
-      let cmtLoc = Comment.loc comment in
-      if cmtLoc.loc_start.pos_lnum == loc.loc_end.pos_lnum then
-        loop (comment :: onSameLine, onOtherLine) rest
-      else loop (onSameLine, comment :: onOtherLine) rest
-  in
-  loop ([], []) comments
-
-let partitionAdjacentTrailing loc1 comments =
-  let open Location in
-  let open Lexing in
-  let rec loop ~prevEndPos afterLoc1 comments =
-    match comments with
-    | [] -> (List.rev afterLoc1, [])
-    | comment :: rest as comments ->
-      let cmtPrevEndPos = Comment.prevTokEndPos comment in
-      if prevEndPos.Lexing.pos_cnum == cmtPrevEndPos.pos_cnum then
-        let commentEnd = (Comment.loc comment).loc_end in
-        loop ~prevEndPos:commentEnd (comment :: afterLoc1) rest
-      else (List.rev afterLoc1, comments)
-  in
-  loop ~prevEndPos:loc1.loc_end [] comments
-
-let rec collectListPatterns acc pattern =
-  let open Parsetree in
-  match pattern.ppat_desc with
-  | Ppat_construct
-      ({txt = Longident.Lident "::"}, Some {ppat_desc = Ppat_tuple [pat; rest]})
-    ->
-    collectListPatterns (pat :: acc) rest
-  | Ppat_construct ({txt = Longident.Lident "[]"}, None) -> List.rev acc
-  | _ -> List.rev (pattern :: acc)
-
-let rec collectListExprs acc expr =
-  let open Parsetree in
-  match expr.pexp_desc with
-  | Pexp_construct
-      ({txt = Longident.Lident "::"}, Some {pexp_desc = Pexp_tuple [expr; rest]})
-    ->
-    collectListExprs (expr :: acc) rest
-  | Pexp_construct ({txt = Longident.Lident "[]"}, _) -> List.rev acc
-  | _ -> List.rev (expr :: acc)
-
-(* TODO: use ParsetreeViewer *)
-let arrowType ct =
-  let open Parsetree in
-  let rec process attrsBefore acc typ =
-    match typ with
-    | {
-     ptyp_desc = Ptyp_arrow ((Nolabel as lbl), typ1, typ2);
-     ptyp_attributes = [];
-    } ->
-      let arg = ([], lbl, typ1) in
-      process attrsBefore (arg :: acc) typ2
-    | {
-     ptyp_desc = Ptyp_arrow ((Nolabel as lbl), typ1, typ2);
-     ptyp_attributes = [({txt = "bs"}, _)] as attrs;
-    } ->
-      let arg = (attrs, lbl, typ1) in
-      process attrsBefore (arg :: acc) typ2
-    | {ptyp_desc = Ptyp_arrow (Nolabel, _typ1, _typ2); ptyp_attributes = _attrs}
-      as returnType ->
-      let args = List.rev acc in
-      (attrsBefore, args, returnType)
-    | {
-     ptyp_desc = Ptyp_arrow (((Labelled _ | Optional _) as lbl), typ1, typ2);
-     ptyp_attributes = attrs;
-    } ->
-      let arg = (attrs, lbl, typ1) in
-      process attrsBefore (arg :: acc) typ2
-    | typ -> (attrsBefore, List.rev acc, typ)
-  in
-  match ct with
-  | {ptyp_desc = Ptyp_arrow (Nolabel, _typ1, _typ2); ptyp_attributes = attrs} as
-    typ ->
-    process attrs [] {typ with ptyp_attributes = []}
-  | typ -> process [] [] typ
-
-(* TODO: avoiding the dependency on ParsetreeViewer here, is this a good idea? *)
-let modExprApply modExpr =
-  let rec loop acc modExpr =
-    match modExpr with
-    | {Parsetree.pmod_desc = Pmod_apply (next, arg)} -> loop (arg :: acc) next
-    | _ -> modExpr :: acc
-  in
-  loop [] modExpr
-
-(* TODO: avoiding the dependency on ParsetreeViewer here, is this a good idea? *)
-let modExprFunctor modExpr =
-  let rec loop acc modExpr =
-    match modExpr with
-    | {
-     Parsetree.pmod_desc = Pmod_functor (lbl, modType, returnModExpr);
-     pmod_attributes = attrs;
-    } ->
-      let param = (attrs, lbl, modType) in
-      loop (param :: acc) returnModExpr
-    | returnModExpr -> (List.rev acc, returnModExpr)
-  in
-  loop [] modExpr
-
-let functorType modtype =
-  let rec process acc modtype =
-    match modtype with
-    | {
-     Parsetree.pmty_desc = Pmty_functor (lbl, argType, returnType);
-     pmty_attributes = attrs;
-    } ->
-      let arg = (attrs, lbl, argType) in
-      process (arg :: acc) returnType
-    | modType -> (List.rev acc, modType)
-  in
-  process [] modtype
-
-let funExpr expr =
-  let open Parsetree in
-  (* Turns (type t, type u, type z) into "type t u z" *)
-  let rec collectNewTypes acc returnExpr =
-    match returnExpr with
-    | {pexp_desc = Pexp_newtype (stringLoc, returnExpr); pexp_attributes = []}
-      ->
-      collectNewTypes (stringLoc :: acc) returnExpr
-    | returnExpr ->
-      let loc =
-        match (acc, List.rev acc) with
-        | _startLoc :: _, endLoc :: _ ->
-          {endLoc.loc with loc_end = endLoc.loc.loc_end}
-        | _ -> Location.none
-      in
-      let txt =
-        List.fold_right
-          (fun curr acc -> acc ^ " " ^ curr.Location.txt)
-          acc "type"
-      in
-      (Location.mkloc txt loc, returnExpr)
-  in
-  (* For simplicity reason Pexp_newtype gets converted to a Nolabel parameter,
-   * otherwise this function would need to return a variant:
-   * | NormalParamater(...)
-   * | NewType(...)
-   * This complicates printing with an extra variant/boxing/allocation for a code-path
-   * that is not often used. Lets just keep it simple for now *)
-  let rec collect attrsBefore acc expr =
-    match expr with
-    | {
-     pexp_desc = Pexp_fun (lbl, defaultExpr, pattern, returnExpr);
-     pexp_attributes = [];
-    } ->
-      let parameter = ([], lbl, defaultExpr, pattern) in
-      collect attrsBefore (parameter :: acc) returnExpr
-    | {pexp_desc = Pexp_newtype (stringLoc, rest); pexp_attributes = attrs} ->
-      let var, returnExpr = collectNewTypes [stringLoc] rest in
-      let parameter =
-        ( attrs,
-          Asttypes.Nolabel,
-          None,
-          Ast_helper.Pat.var ~loc:stringLoc.loc var )
-      in
-      collect attrsBefore (parameter :: acc) returnExpr
-    | {
-     pexp_desc = Pexp_fun (lbl, defaultExpr, pattern, returnExpr);
-     pexp_attributes = [({txt = "bs"}, _)] as attrs;
-    } ->
-      let parameter = (attrs, lbl, defaultExpr, pattern) in
-      collect attrsBefore (parameter :: acc) returnExpr
-    | {
-     pexp_desc =
-       Pexp_fun
-         (((Labelled _ | Optional _) as lbl), defaultExpr, pattern, returnExpr);
-     pexp_attributes = attrs;
-    } ->
-      let parameter = (attrs, lbl, defaultExpr, pattern) in
-      collect attrsBefore (parameter :: acc) returnExpr
-    | expr -> (attrsBefore, List.rev acc, expr)
-  in
-  match expr with
-  | {
-      pexp_desc = Pexp_fun (Nolabel, _defaultExpr, _pattern, _returnExpr);
-      pexp_attributes = attrs;
-    } as expr ->
-    collect attrs [] {expr with pexp_attributes = []}
-  | expr -> collect [] [] expr
-
-let rec isBlockExpr expr =
-  let open Parsetree in
-  match expr.pexp_desc with
-  | Pexp_letmodule _ | Pexp_letexception _ | Pexp_let _ | Pexp_open _
-  | Pexp_sequence _ ->
-    true
-  | Pexp_apply (callExpr, _) when isBlockExpr callExpr -> true
-  | Pexp_constraint (expr, _) when isBlockExpr expr -> true
-  | Pexp_field (expr, _) when isBlockExpr expr -> true
-  | Pexp_setfield (expr, _, _) when isBlockExpr expr -> true
-  | _ -> false
-
-let isIfThenElseExpr expr =
-  let open Parsetree in
-  match expr.pexp_desc with
-  | Pexp_ifthenelse _ -> true
-  | _ -> false
-
-type node =
-  | Case of Parsetree.case
-  | CoreType of Parsetree.core_type
-  | ExprArgument of Parsetree.expression
-  | Expression of Parsetree.expression
-  | ExprRecordRow of Longident.t Asttypes.loc * Parsetree.expression
-  | ExtensionConstructor of Parsetree.extension_constructor
-  | LabelDeclaration of Parsetree.label_declaration
-  | ModuleBinding of Parsetree.module_binding
-  | ModuleDeclaration of Parsetree.module_declaration
-  | ModuleExpr of Parsetree.module_expr
-  | ObjectField of Parsetree.object_field
-  | PackageConstraint of Longident.t Asttypes.loc * Parsetree.core_type
-  | Pattern of Parsetree.pattern
-  | PatternRecordRow of Longident.t Asttypes.loc * Parsetree.pattern
-  | RowField of Parsetree.row_field
-  | SignatureItem of Parsetree.signature_item
-  | StructureItem of Parsetree.structure_item
-  | TypeDeclaration of Parsetree.type_declaration
-  | ValueBinding of Parsetree.value_binding
-
-let getLoc node =
-  let open Parsetree in
-  match node with
-  | Case case ->
-    {
-      case.pc_lhs.ppat_loc with
-      loc_end =
-        (match ParsetreeViewer.processBracesAttr case.pc_rhs with
-        | None, _ -> case.pc_rhs.pexp_loc.loc_end
-        | Some ({loc}, _), _ -> loc.Location.loc_end);
-    }
-  | CoreType ct -> ct.ptyp_loc
-  | ExprArgument expr -> (
-    match expr.Parsetree.pexp_attributes with
-    | ({Location.txt = "res.namedArgLoc"; loc}, _) :: _attrs ->
-      {loc with loc_end = expr.pexp_loc.loc_end}
-    | _ -> expr.pexp_loc)
-  | Expression e -> (
-    match e.pexp_attributes with
-    | ({txt = "res.braces" | "ns.braces"; loc}, _) :: _ -> loc
-    | _ -> e.pexp_loc)
-  | ExprRecordRow (li, e) -> {li.loc with loc_end = e.pexp_loc.loc_end}
-  | ExtensionConstructor ec -> ec.pext_loc
-  | LabelDeclaration ld -> ld.pld_loc
-  | ModuleBinding mb -> mb.pmb_loc
-  | ModuleDeclaration md -> md.pmd_loc
-  | ModuleExpr me -> me.pmod_loc
-  | ObjectField field -> (
-    match field with
-    | Parsetree.Otag (lbl, _, typ) ->
-      {lbl.loc with loc_end = typ.ptyp_loc.loc_end}
-    | _ -> Location.none)
-  | PackageConstraint (li, te) -> {li.loc with loc_end = te.ptyp_loc.loc_end}
-  | Pattern p -> p.ppat_loc
-  | PatternRecordRow (li, p) -> {li.loc with loc_end = p.ppat_loc.loc_end}
-  | RowField rf -> (
-    match rf with
-    | Parsetree.Rtag ({loc}, _, _, _) -> loc
-    | Rinherit {ptyp_loc} -> ptyp_loc)
-  | SignatureItem si -> si.psig_loc
-  | StructureItem si -> si.pstr_loc
-  | TypeDeclaration td -> td.ptype_loc
-  | ValueBinding vb -> vb.pvb_loc
-
-let rec walkStructure s t comments =
-  match s with
-  | _ when comments = [] -> ()
-  | [] -> attach t.inside Location.none comments
-  | s -> walkList (s |> List.map (fun si -> StructureItem si)) t comments
-
-and walkStructureItem si t comments =
-  match si.Parsetree.pstr_desc with
-  | _ when comments = [] -> ()
-  | Pstr_primitive valueDescription ->
-    walkValueDescription valueDescription t comments
-  | Pstr_open openDescription -> walkOpenDescription openDescription t comments
-  | Pstr_value (_, valueBindings) -> walkValueBindings valueBindings t comments
-  | Pstr_type (_, typeDeclarations) ->
-    walkTypeDeclarations typeDeclarations t comments
-  | Pstr_eval (expr, _) -> walkExpression expr t comments
-  | Pstr_module moduleBinding -> walkModuleBinding moduleBinding t comments
-  | Pstr_recmodule moduleBindings ->
-    walkList
-      (moduleBindings |> List.map (fun mb -> ModuleBinding mb))
-      t comments
-  | Pstr_modtype modTypDecl -> walkModuleTypeDeclaration modTypDecl t comments
-  | Pstr_attribute attribute -> walkAttribute attribute t comments
-  | Pstr_extension (extension, _) -> walkExtension extension t comments
-  | Pstr_include includeDeclaration ->
-    walkIncludeDeclaration includeDeclaration t comments
-  | Pstr_exception extensionConstructor ->
-    walkExtensionConstructor extensionConstructor t comments
-  | Pstr_typext typeExtension -> walkTypeExtension typeExtension t comments
-  | Pstr_class_type _ | Pstr_class _ -> ()
-
-and walkValueDescription vd t comments =
-  let leading, trailing = partitionLeadingTrailing comments vd.pval_name.loc in
-  attach t.leading vd.pval_name.loc leading;
-  let afterName, rest = partitionAdjacentTrailing vd.pval_name.loc trailing in
-  attach t.trailing vd.pval_name.loc afterName;
-  let before, inside, after = partitionByLoc rest vd.pval_type.ptyp_loc in
-  attach t.leading vd.pval_type.ptyp_loc before;
-  walkCoreType vd.pval_type t inside;
-  attach t.trailing vd.pval_type.ptyp_loc after
-
-and walkTypeExtension te t comments =
-  let leading, trailing =
-    partitionLeadingTrailing comments te.ptyext_path.loc
-  in
-  attach t.leading te.ptyext_path.loc leading;
-  let afterPath, rest = partitionAdjacentTrailing te.ptyext_path.loc trailing in
-  attach t.trailing te.ptyext_path.loc afterPath;
-
-  (* type params *)
-  let rest =
-    match te.ptyext_params with
-    | [] -> rest
-    | typeParams ->
-      visitListButContinueWithRemainingComments
-        ~getLoc:(fun (typexpr, _variance) -> typexpr.Parsetree.ptyp_loc)
-        ~walkNode:walkTypeParam ~newlineDelimited:false typeParams t rest
-  in
-  walkList
-    (te.ptyext_constructors |> List.map (fun ec -> ExtensionConstructor ec))
-    t rest
-
-and walkIncludeDeclaration inclDecl t comments =
-  let before, inside, after =
-    partitionByLoc comments inclDecl.pincl_mod.pmod_loc
-  in
-  attach t.leading inclDecl.pincl_mod.pmod_loc before;
-  walkModuleExpr inclDecl.pincl_mod t inside;
-  attach t.trailing inclDecl.pincl_mod.pmod_loc after
-
-and walkModuleTypeDeclaration mtd t comments =
-  let leading, trailing = partitionLeadingTrailing comments mtd.pmtd_name.loc in
-  attach t.leading mtd.pmtd_name.loc leading;
-  match mtd.pmtd_type with
-  | None -> attach t.trailing mtd.pmtd_name.loc trailing
-  | Some modType ->
-    let afterName, rest =
-      partitionAdjacentTrailing mtd.pmtd_name.loc trailing
-    in
-    attach t.trailing mtd.pmtd_name.loc afterName;
-    let before, inside, after = partitionByLoc rest modType.pmty_loc in
-    attach t.leading modType.pmty_loc before;
-    walkModType modType t inside;
-    attach t.trailing modType.pmty_loc after
-
-and walkModuleBinding mb t comments =
-  let leading, trailing = partitionLeadingTrailing comments mb.pmb_name.loc in
-  attach t.leading mb.pmb_name.loc leading;
-  let afterName, rest = partitionAdjacentTrailing mb.pmb_name.loc trailing in
-  attach t.trailing mb.pmb_name.loc afterName;
-  let leading, inside, trailing = partitionByLoc rest mb.pmb_expr.pmod_loc in
-  (match mb.pmb_expr.pmod_desc with
-  | Pmod_constraint _ ->
-    walkModuleExpr mb.pmb_expr t (List.concat [leading; inside])
-  | _ ->
-    attach t.leading mb.pmb_expr.pmod_loc leading;
-    walkModuleExpr mb.pmb_expr t inside);
-  attach t.trailing mb.pmb_expr.pmod_loc trailing
-
-and walkSignature signature t comments =
-  match signature with
-  | _ when comments = [] -> ()
-  | [] -> attach t.inside Location.none comments
-  | _s ->
-    walkList (signature |> List.map (fun si -> SignatureItem si)) t comments
-
-and walkSignatureItem (si : Parsetree.signature_item) t comments =
-  match si.psig_desc with
-  | _ when comments = [] -> ()
-  | Psig_value valueDescription ->
-    walkValueDescription valueDescription t comments
-  | Psig_type (_, typeDeclarations) ->
-    walkTypeDeclarations typeDeclarations t comments
-  | Psig_typext typeExtension -> walkTypeExtension typeExtension t comments
-  | Psig_exception extensionConstructor ->
-    walkExtensionConstructor extensionConstructor t comments
-  | Psig_module moduleDeclaration ->
-    walkModuleDeclaration moduleDeclaration t comments
-  | Psig_recmodule moduleDeclarations ->
-    walkList
-      (moduleDeclarations |> List.map (fun md -> ModuleDeclaration md))
-      t comments
-  | Psig_modtype moduleTypeDeclaration ->
-    walkModuleTypeDeclaration moduleTypeDeclaration t comments
-  | Psig_open openDescription -> walkOpenDescription openDescription t comments
-  | Psig_include includeDescription ->
-    walkIncludeDescription includeDescription t comments
-  | Psig_attribute attribute -> walkAttribute attribute t comments
-  | Psig_extension (extension, _) -> walkExtension extension t comments
-  | Psig_class _ | Psig_class_type _ -> ()
-
-and walkIncludeDescription id t comments =
-  let before, inside, after = partitionByLoc comments id.pincl_mod.pmty_loc in
-  attach t.leading id.pincl_mod.pmty_loc before;
-  walkModType id.pincl_mod t inside;
-  attach t.trailing id.pincl_mod.pmty_loc after
-
-and walkModuleDeclaration md t comments =
-  let leading, trailing = partitionLeadingTrailing comments md.pmd_name.loc in
-  attach t.leading md.pmd_name.loc leading;
-  let afterName, rest = partitionAdjacentTrailing md.pmd_name.loc trailing in
-  attach t.trailing md.pmd_name.loc afterName;
-  let leading, inside, trailing = partitionByLoc rest md.pmd_type.pmty_loc in
-  attach t.leading md.pmd_type.pmty_loc leading;
-  walkModType md.pmd_type t inside;
-  attach t.trailing md.pmd_type.pmty_loc trailing
-
-and walkNode node tbl comments =
-  match node with
-  | Case c -> walkCase c tbl comments
-  | CoreType ct -> walkCoreType ct tbl comments
-  | ExprArgument ea -> walkExprArgument ea tbl comments
-  | Expression e -> walkExpression e tbl comments
-  | ExprRecordRow (ri, e) -> walkExprRecordRow (ri, e) tbl comments
-  | ExtensionConstructor ec -> walkExtensionConstructor ec tbl comments
-  | LabelDeclaration ld -> walkLabelDeclaration ld tbl comments
-  | ModuleBinding mb -> walkModuleBinding mb tbl comments
-  | ModuleDeclaration md -> walkModuleDeclaration md tbl comments
-  | ModuleExpr me -> walkModuleExpr me tbl comments
-  | ObjectField f -> walkObjectField f tbl comments
-  | PackageConstraint (li, te) -> walkPackageConstraint (li, te) tbl comments
-  | Pattern p -> walkPattern p tbl comments
-  | PatternRecordRow (li, p) -> walkPatternRecordRow (li, p) tbl comments
-  | RowField rf -> walkRowField rf tbl comments
-  | SignatureItem si -> walkSignatureItem si tbl comments
-  | StructureItem si -> walkStructureItem si tbl comments
-  | TypeDeclaration td -> walkTypeDeclaration td tbl comments
-  | ValueBinding vb -> walkValueBinding vb tbl comments
-
-and walkList : ?prevLoc:Location.t -> node list -> t -> Comment.t list -> unit =
- fun ?prevLoc l t comments ->
-  match l with
-  | _ when comments = [] -> ()
-  | [] -> (
-    match prevLoc with
-    | Some loc -> attach t.trailing loc comments
-    | None -> ())
-  | node :: rest ->
-    let currLoc = getLoc node in
-    let leading, inside, trailing = partitionByLoc comments currLoc in
-    (match prevLoc with
-    | None ->
-      (* first node, all leading comments attach here *)
-      attach t.leading currLoc leading
-    | Some prevLoc ->
-      (* Same line *)
-      if prevLoc.loc_end.pos_lnum == currLoc.loc_start.pos_lnum then (
-        let afterPrev, beforeCurr = partitionAdjacentTrailing prevLoc leading in
-        attach t.trailing prevLoc afterPrev;
-        attach t.leading currLoc beforeCurr)
-      else
-        let onSameLineAsPrev, afterPrev =
-          partitionByOnSameLine prevLoc leading
-        in
-        attach t.trailing prevLoc onSameLineAsPrev;
-        let leading, _inside, _trailing = partitionByLoc afterPrev currLoc in
-        attach t.leading currLoc leading);
-    walkNode node t inside;
-    walkList ~prevLoc:currLoc rest t trailing
-
-(* The parsetree doesn't always contain location info about the opening or
- * closing token of a "list-of-things". This routine visits the whole list,
- * but returns any remaining comments that likely fall after the whole list. *)
-and visitListButContinueWithRemainingComments :
-      'node.
-      ?prevLoc:Location.t ->
-      newlineDelimited:bool ->
-      getLoc:('node -> Location.t) ->
-      walkNode:('node -> t -> Comment.t list -> unit) ->
-      'node list ->
-      t ->
-      Comment.t list ->
-      Comment.t list =
- fun ?prevLoc ~newlineDelimited ~getLoc ~walkNode l t comments ->
-  let open Location in
-  match l with
-  | _ when comments = [] -> []
-  | [] -> (
-    match prevLoc with
-    | Some loc ->
-      let afterPrev, rest =
-        if newlineDelimited then partitionByOnSameLine loc comments
-        else partitionAdjacentTrailing loc comments
-      in
-      attach t.trailing loc afterPrev;
-      rest
-    | None -> comments)
-  | node :: rest ->
-    let currLoc = getLoc node in
-    let leading, inside, trailing = partitionByLoc comments currLoc in
-    let () =
-      match prevLoc with
-      | None ->
-        (* first node, all leading comments attach here *)
-        attach t.leading currLoc leading;
-        ()
-      | Some prevLoc ->
-        (* Same line *)
-        if prevLoc.loc_end.pos_lnum == currLoc.loc_start.pos_lnum then
-          let afterPrev, beforeCurr =
-            partitionAdjacentTrailing prevLoc leading
-          in
-          let () = attach t.trailing prevLoc afterPrev in
-          let () = attach t.leading currLoc beforeCurr in
-          ()
-        else
-          let onSameLineAsPrev, afterPrev =
-            partitionByOnSameLine prevLoc leading
-          in
-          let () = attach t.trailing prevLoc onSameLineAsPrev in
-          let leading, _inside, _trailing = partitionByLoc afterPrev currLoc in
-          let () = attach t.leading currLoc leading in
-          ()
-    in
-    walkNode node t inside;
-    visitListButContinueWithRemainingComments ~prevLoc:currLoc ~getLoc ~walkNode
-      ~newlineDelimited rest t trailing
-
-and walkValueBindings vbs t comments =
-  walkList (vbs |> List.map (fun vb -> ValueBinding vb)) t comments
-
-and walkOpenDescription openDescription t comments =
-  let loc = openDescription.popen_lid.loc in
-  let leading, trailing = partitionLeadingTrailing comments loc in
-  attach t.leading loc leading;
-  attach t.trailing loc trailing
-
-and walkTypeDeclarations typeDeclarations t comments =
-  walkList
-    (typeDeclarations |> List.map (fun td -> TypeDeclaration td))
-    t comments
-
-and walkTypeParam (typexpr, _variance) t comments =
-  walkCoreType typexpr t comments
-
-and walkTypeDeclaration (td : Parsetree.type_declaration) t comments =
-  let beforeName, rest = partitionLeadingTrailing comments td.ptype_name.loc in
-  attach t.leading td.ptype_name.loc beforeName;
-
-  let afterName, rest = partitionAdjacentTrailing td.ptype_name.loc rest in
-  attach t.trailing td.ptype_name.loc afterName;
-
-  (* type params *)
-  let rest =
-    match td.ptype_params with
-    | [] -> rest
-    | typeParams ->
-      visitListButContinueWithRemainingComments
-        ~getLoc:(fun (typexpr, _variance) -> typexpr.Parsetree.ptyp_loc)
-        ~walkNode:walkTypeParam ~newlineDelimited:false typeParams t rest
-  in
-
-  (* manifest:  = typexpr *)
-  let rest =
-    match td.ptype_manifest with
-    | Some typexpr ->
-      let beforeTyp, insideTyp, afterTyp =
-        partitionByLoc rest typexpr.ptyp_loc
-      in
-      attach t.leading typexpr.ptyp_loc beforeTyp;
-      walkCoreType typexpr t insideTyp;
-      let afterTyp, rest =
-        partitionAdjacentTrailing typexpr.Parsetree.ptyp_loc afterTyp
-      in
-      attach t.trailing typexpr.ptyp_loc afterTyp;
-      rest
-    | None -> rest
-  in
-
-  let rest =
-    match td.ptype_kind with
-    | Ptype_abstract | Ptype_open -> rest
-    | Ptype_record labelDeclarations ->
-      let () =
-        if labelDeclarations = [] then attach t.inside td.ptype_loc rest
-        else
-          walkList
-            (labelDeclarations |> List.map (fun ld -> LabelDeclaration ld))
-            t rest
-      in
-      []
-    | Ptype_variant constructorDeclarations ->
-      walkConstructorDeclarations constructorDeclarations t rest
-  in
-  attach t.trailing td.ptype_loc rest
-
-and walkLabelDeclarations lds t comments =
-  visitListButContinueWithRemainingComments
-    ~getLoc:(fun ld -> ld.Parsetree.pld_loc)
-    ~walkNode:walkLabelDeclaration ~newlineDelimited:false lds t comments
-
-and walkLabelDeclaration ld t comments =
-  let beforeName, rest = partitionLeadingTrailing comments ld.pld_name.loc in
-  attach t.leading ld.pld_name.loc beforeName;
-  let afterName, rest = partitionAdjacentTrailing ld.pld_name.loc rest in
-  attach t.trailing ld.pld_name.loc afterName;
-  let beforeTyp, insideTyp, afterTyp =
-    partitionByLoc rest ld.pld_type.ptyp_loc
-  in
-  attach t.leading ld.pld_type.ptyp_loc beforeTyp;
-  walkCoreType ld.pld_type t insideTyp;
-  attach t.trailing ld.pld_type.ptyp_loc afterTyp
-
-and walkConstructorDeclarations cds t comments =
-  visitListButContinueWithRemainingComments
-    ~getLoc:(fun cd -> cd.Parsetree.pcd_loc)
-    ~walkNode:walkConstructorDeclaration ~newlineDelimited:false cds t comments
-
-and walkConstructorDeclaration cd t comments =
-  let beforeName, rest = partitionLeadingTrailing comments cd.pcd_name.loc in
-  attach t.leading cd.pcd_name.loc beforeName;
-  let afterName, rest = partitionAdjacentTrailing cd.pcd_name.loc rest in
-  attach t.trailing cd.pcd_name.loc afterName;
-  let rest = walkConstructorArguments cd.pcd_args t rest in
-
-  let rest =
-    match cd.pcd_res with
-    | Some typexpr ->
-      let beforeTyp, insideTyp, afterTyp =
-        partitionByLoc rest typexpr.ptyp_loc
-      in
-      attach t.leading typexpr.ptyp_loc beforeTyp;
-      walkCoreType typexpr t insideTyp;
-      let afterTyp, rest =
-        partitionAdjacentTrailing typexpr.Parsetree.ptyp_loc afterTyp
-      in
-      attach t.trailing typexpr.ptyp_loc afterTyp;
-      rest
-    | None -> rest
-  in
-  attach t.trailing cd.pcd_loc rest
-
-and walkConstructorArguments args t comments =
-  match args with
-  | Pcstr_tuple typexprs ->
-    visitListButContinueWithRemainingComments
-      ~getLoc:(fun n -> n.Parsetree.ptyp_loc)
-      ~walkNode:walkCoreType ~newlineDelimited:false typexprs t comments
-  | Pcstr_record labelDeclarations ->
-    walkLabelDeclarations labelDeclarations t comments
-
-and walkValueBinding vb t comments =
-  let open Location in
-  let vb =
-    let open Parsetree in
-    match (vb.pvb_pat, vb.pvb_expr) with
-    | ( {ppat_desc = Ppat_constraint (pat, {ptyp_desc = Ptyp_poly ([], t)})},
-        {pexp_desc = Pexp_constraint (expr, _typ)} ) ->
-      {
-        vb with
-        pvb_pat =
-          Ast_helper.Pat.constraint_
-            ~loc:{pat.ppat_loc with loc_end = t.Parsetree.ptyp_loc.loc_end}
-            pat t;
-        pvb_expr = expr;
-      }
-    | ( {ppat_desc = Ppat_constraint (pat, {ptyp_desc = Ptyp_poly (_ :: _, t)})},
-        {pexp_desc = Pexp_fun _} ) ->
-      {
-        vb with
-        pvb_pat =
-          {
-            vb.pvb_pat with
-            ppat_loc = {pat.ppat_loc with loc_end = t.ptyp_loc.loc_end};
-          };
-      }
-    | ( ({
-           ppat_desc =
-             Ppat_constraint (pat, ({ptyp_desc = Ptyp_poly (_ :: _, t)} as typ));
-         } as constrainedPattern),
-        {pexp_desc = Pexp_newtype (_, {pexp_desc = Pexp_constraint (expr, _)})}
-      ) ->
-      (*
-       * The location of the Ptyp_poly on the pattern is the whole thing.
-       * let x:
-       *   type t. (int, int) => int =
-       *   (a, b) => {
-       *     // comment
-       *     a + b
-       *   }
-       *)
-      {
-        vb with
-        pvb_pat =
-          {
-            constrainedPattern with
-            ppat_desc = Ppat_constraint (pat, typ);
-            ppat_loc =
-              {constrainedPattern.ppat_loc with loc_end = t.ptyp_loc.loc_end};
-          };
-        pvb_expr = expr;
-      }
-    | _ -> vb
-  in
-  let patternLoc = vb.Parsetree.pvb_pat.ppat_loc in
-  let exprLoc = vb.Parsetree.pvb_expr.pexp_loc in
-  let expr = vb.pvb_expr in
-
-  let leading, inside, trailing = partitionByLoc comments patternLoc in
-
-  (* everything before start of pattern can only be leading on the pattern:
-   *   let |* before *| a = 1 *)
-  attach t.leading patternLoc leading;
-  walkPattern vb.Parsetree.pvb_pat t inside;
-  let afterPat, surroundingExpr =
-    partitionAdjacentTrailing patternLoc trailing
-  in
-  attach t.trailing patternLoc afterPat;
-  let beforeExpr, insideExpr, afterExpr =
-    partitionByLoc surroundingExpr exprLoc
-  in
-  if isBlockExpr expr then
-    walkExpression expr t (List.concat [beforeExpr; insideExpr; afterExpr])
-  else (
-    attach t.leading exprLoc beforeExpr;
-    walkExpression expr t insideExpr;
-    attach t.trailing exprLoc afterExpr)
-
-and walkExpression expr t comments =
-  let open Location in
-  match expr.Parsetree.pexp_desc with
-  | _ when comments = [] -> ()
-  | Pexp_constant _ ->
-    let leading, trailing = partitionLeadingTrailing comments expr.pexp_loc in
-    attach t.leading expr.pexp_loc leading;
-    attach t.trailing expr.pexp_loc trailing
-  | Pexp_ident longident ->
-    let leading, trailing = partitionLeadingTrailing comments longident.loc in
-    attach t.leading longident.loc leading;
-    attach t.trailing longident.loc trailing
-  | Pexp_let
-      ( _recFlag,
-        valueBindings,
-        {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, None)} ) ->
-    walkValueBindings valueBindings t comments
-  | Pexp_let (_recFlag, valueBindings, expr2) ->
-    let comments =
-      visitListButContinueWithRemainingComments
-        ~getLoc:(fun n ->
-          if n.Parsetree.pvb_pat.ppat_loc.loc_ghost then n.pvb_expr.pexp_loc
-          else n.Parsetree.pvb_loc)
-        ~walkNode:walkValueBinding ~newlineDelimited:true valueBindings t
-        comments
-    in
-    if isBlockExpr expr2 then walkExpression expr2 t comments
-    else
-      let leading, inside, trailing = partitionByLoc comments expr2.pexp_loc in
-      attach t.leading expr2.pexp_loc leading;
-      walkExpression expr2 t inside;
-      attach t.trailing expr2.pexp_loc trailing
-  | Pexp_sequence (expr1, expr2) ->
-    let leading, inside, trailing = partitionByLoc comments expr1.pexp_loc in
-    let comments =
-      if isBlockExpr expr1 then (
-        let afterExpr, comments =
-          partitionByOnSameLine expr1.pexp_loc trailing
-        in
-        walkExpression expr1 t (List.concat [leading; inside; afterExpr]);
-        comments)
-      else (
-        attach t.leading expr1.pexp_loc leading;
-        walkExpression expr1 t inside;
-        let afterExpr, comments =
-          partitionByOnSameLine expr1.pexp_loc trailing
-        in
-        attach t.trailing expr1.pexp_loc afterExpr;
-        comments)
-    in
-    if isBlockExpr expr2 then walkExpression expr2 t comments
-    else
-      let leading, inside, trailing = partitionByLoc comments expr2.pexp_loc in
-      attach t.leading expr2.pexp_loc leading;
-      walkExpression expr2 t inside;
-      attach t.trailing expr2.pexp_loc trailing
-  | Pexp_open (_override, longident, expr2) ->
-    let leading, comments = partitionLeadingTrailing comments expr.pexp_loc in
-    attach t.leading
-      {expr.pexp_loc with loc_end = longident.loc.loc_end}
-      leading;
-    let leading, trailing = partitionLeadingTrailing comments longident.loc in
-    attach t.leading longident.loc leading;
-    let afterLongident, rest = partitionByOnSameLine longident.loc trailing in
-    attach t.trailing longident.loc afterLongident;
-    if isBlockExpr expr2 then walkExpression expr2 t rest
-    else
-      let leading, inside, trailing = partitionByLoc rest expr2.pexp_loc in
-      attach t.leading expr2.pexp_loc leading;
-      walkExpression expr2 t inside;
-      attach t.trailing expr2.pexp_loc trailing
-  | Pexp_extension
-      ( {txt = "bs.obj" | "obj"},
-        PStr [{pstr_desc = Pstr_eval ({pexp_desc = Pexp_record (rows, _)}, [])}]
-      ) ->
-    walkList
-      (rows |> List.map (fun (li, e) -> ExprRecordRow (li, e)))
-      t comments
-  | Pexp_extension extension -> walkExtension extension t comments
-  | Pexp_letexception (extensionConstructor, expr2) ->
-    let leading, comments = partitionLeadingTrailing comments expr.pexp_loc in
-    attach t.leading
-      {expr.pexp_loc with loc_end = extensionConstructor.pext_loc.loc_end}
-      leading;
-    let leading, inside, trailing =
-      partitionByLoc comments extensionConstructor.pext_loc
-    in
-    attach t.leading extensionConstructor.pext_loc leading;
-    walkExtensionConstructor extensionConstructor t inside;
-    let afterExtConstr, rest =
-      partitionByOnSameLine extensionConstructor.pext_loc trailing
-    in
-    attach t.trailing extensionConstructor.pext_loc afterExtConstr;
-    if isBlockExpr expr2 then walkExpression expr2 t rest
-    else
-      let leading, inside, trailing = partitionByLoc rest expr2.pexp_loc in
-      attach t.leading expr2.pexp_loc leading;
-      walkExpression expr2 t inside;
-      attach t.trailing expr2.pexp_loc trailing
-  | Pexp_letmodule (stringLoc, modExpr, expr2) ->
-    let leading, comments = partitionLeadingTrailing comments expr.pexp_loc in
-    attach t.leading
-      {expr.pexp_loc with loc_end = modExpr.pmod_loc.loc_end}
-      leading;
-    let leading, trailing = partitionLeadingTrailing comments stringLoc.loc in
-    attach t.leading stringLoc.loc leading;
-    let afterString, rest = partitionAdjacentTrailing stringLoc.loc trailing in
-    attach t.trailing stringLoc.loc afterString;
-    let beforeModExpr, insideModExpr, afterModExpr =
-      partitionByLoc rest modExpr.pmod_loc
-    in
-    attach t.leading modExpr.pmod_loc beforeModExpr;
-    walkModuleExpr modExpr t insideModExpr;
-    let afterModExpr, rest =
-      partitionByOnSameLine modExpr.pmod_loc afterModExpr
-    in
-    attach t.trailing modExpr.pmod_loc afterModExpr;
-    if isBlockExpr expr2 then walkExpression expr2 t rest
-    else
-      let leading, inside, trailing = partitionByLoc rest expr2.pexp_loc in
-      attach t.leading expr2.pexp_loc leading;
-      walkExpression expr2 t inside;
-      attach t.trailing expr2.pexp_loc trailing
-  | Pexp_assert expr | Pexp_lazy expr ->
-    if isBlockExpr expr then walkExpression expr t comments
-    else
-      let leading, inside, trailing = partitionByLoc comments expr.pexp_loc in
-      attach t.leading expr.pexp_loc leading;
-      walkExpression expr t inside;
-      attach t.trailing expr.pexp_loc trailing
-  | Pexp_coerce (expr, optTypexpr, typexpr) ->
-    let leading, inside, trailing = partitionByLoc comments expr.pexp_loc in
-    attach t.leading expr.pexp_loc leading;
-    walkExpression expr t inside;
-    let afterExpr, rest = partitionAdjacentTrailing expr.pexp_loc trailing in
-    attach t.trailing expr.pexp_loc afterExpr;
-    let rest =
-      match optTypexpr with
-      | Some typexpr ->
-        let leading, inside, trailing =
-          partitionByLoc comments typexpr.ptyp_loc
-        in
-        attach t.leading typexpr.ptyp_loc leading;
-        walkCoreType typexpr t inside;
-        let afterTyp, rest =
-          partitionAdjacentTrailing typexpr.ptyp_loc trailing
-        in
-        attach t.trailing typexpr.ptyp_loc afterTyp;
-        rest
-      | None -> rest
-    in
-    let leading, inside, trailing = partitionByLoc rest typexpr.ptyp_loc in
-    attach t.leading typexpr.ptyp_loc leading;
-    walkCoreType typexpr t inside;
-    attach t.trailing typexpr.ptyp_loc trailing
-  | Pexp_constraint (expr, typexpr) ->
-    let leading, inside, trailing = partitionByLoc comments expr.pexp_loc in
-    attach t.leading expr.pexp_loc leading;
-    walkExpression expr t inside;
-    let afterExpr, rest = partitionAdjacentTrailing expr.pexp_loc trailing in
-    attach t.trailing expr.pexp_loc afterExpr;
-    let leading, inside, trailing = partitionByLoc rest typexpr.ptyp_loc in
-    attach t.leading typexpr.ptyp_loc leading;
-    walkCoreType typexpr t inside;
-    attach t.trailing typexpr.ptyp_loc trailing
-  | Pexp_tuple []
-  | Pexp_array []
-  | Pexp_construct ({txt = Longident.Lident "[]"}, _) ->
-    attach t.inside expr.pexp_loc comments
-  | Pexp_construct ({txt = Longident.Lident "::"}, _) ->
-    walkList
-      (collectListExprs [] expr |> List.map (fun e -> Expression e))
-      t comments
-  | Pexp_construct (longident, args) -> (
-    let leading, trailing = partitionLeadingTrailing comments longident.loc in
-    attach t.leading longident.loc leading;
-    match args with
-    | Some expr ->
-      let afterLongident, rest =
-        partitionAdjacentTrailing longident.loc trailing
-      in
-      attach t.trailing longident.loc afterLongident;
-      walkExpression expr t rest
-    | None -> attach t.trailing longident.loc trailing)
-  | Pexp_variant (_label, None) -> ()
-  | Pexp_variant (_label, Some expr) -> walkExpression expr t comments
-  | Pexp_array exprs | Pexp_tuple exprs ->
-    walkList (exprs |> List.map (fun e -> Expression e)) t comments
-  | Pexp_record (rows, spreadExpr) ->
-    if rows = [] then attach t.inside expr.pexp_loc comments
-    else
-      let comments =
-        match spreadExpr with
-        | None -> comments
-        | Some expr ->
-          let leading, inside, trailing =
-            partitionByLoc comments expr.pexp_loc
-          in
-          attach t.leading expr.pexp_loc leading;
-          walkExpression expr t inside;
-          let afterExpr, rest =
-            partitionAdjacentTrailing expr.pexp_loc trailing
-          in
-          attach t.trailing expr.pexp_loc afterExpr;
-          rest
-      in
-      walkList
-        (rows |> List.map (fun (li, e) -> ExprRecordRow (li, e)))
-        t comments
-  | Pexp_field (expr, longident) ->
-    let leading, inside, trailing = partitionByLoc comments expr.pexp_loc in
-    let trailing =
-      if isBlockExpr expr then (
-        let afterExpr, rest =
-          partitionAdjacentTrailing expr.pexp_loc trailing
-        in
-        walkExpression expr t (List.concat [leading; inside; afterExpr]);
-        rest)
-      else (
-        attach t.leading expr.pexp_loc leading;
-        walkExpression expr t inside;
-        trailing)
-    in
-    let afterExpr, rest = partitionAdjacentTrailing expr.pexp_loc trailing in
-    attach t.trailing expr.pexp_loc afterExpr;
-    let leading, trailing = partitionLeadingTrailing rest longident.loc in
-    attach t.leading longident.loc leading;
-    attach t.trailing longident.loc trailing
-  | Pexp_setfield (expr1, longident, expr2) ->
-    let leading, inside, trailing = partitionByLoc comments expr1.pexp_loc in
-    let rest =
-      if isBlockExpr expr1 then (
-        let afterExpr, rest =
-          partitionAdjacentTrailing expr1.pexp_loc trailing
-        in
-        walkExpression expr1 t (List.concat [leading; inside; afterExpr]);
-        rest)
-      else
-        let afterExpr, rest =
-          partitionAdjacentTrailing expr1.pexp_loc trailing
-        in
-        attach t.leading expr1.pexp_loc leading;
-        walkExpression expr1 t inside;
-        attach t.trailing expr1.pexp_loc afterExpr;
-        rest
-    in
-    let beforeLongident, afterLongident =
-      partitionLeadingTrailing rest longident.loc
-    in
-    attach t.leading longident.loc beforeLongident;
-    let afterLongident, rest =
-      partitionAdjacentTrailing longident.loc afterLongident
-    in
-    attach t.trailing longident.loc afterLongident;
-    if isBlockExpr expr2 then walkExpression expr2 t rest
-    else
-      let leading, inside, trailing = partitionByLoc rest expr2.pexp_loc in
-      attach t.leading expr2.pexp_loc leading;
-      walkExpression expr2 t inside;
-      attach t.trailing expr2.pexp_loc trailing
-  | Pexp_ifthenelse (ifExpr, thenExpr, elseExpr) -> (
-    let leading, rest = partitionLeadingTrailing comments expr.pexp_loc in
-    attach t.leading expr.pexp_loc leading;
-    let leading, inside, trailing = partitionByLoc rest ifExpr.pexp_loc in
-    let comments =
-      if isBlockExpr ifExpr then (
-        let afterExpr, comments =
-          partitionAdjacentTrailing ifExpr.pexp_loc trailing
-        in
-        walkExpression ifExpr t (List.concat [leading; inside; afterExpr]);
-        comments)
-      else (
-        attach t.leading ifExpr.pexp_loc leading;
-        walkExpression ifExpr t inside;
-        let afterExpr, comments =
-          partitionAdjacentTrailing ifExpr.pexp_loc trailing
-        in
-        attach t.trailing ifExpr.pexp_loc afterExpr;
-        comments)
-    in
-    let leading, inside, trailing = partitionByLoc comments thenExpr.pexp_loc in
-    let comments =
-      if isBlockExpr thenExpr then (
-        let afterExpr, trailing =
-          partitionAdjacentTrailing thenExpr.pexp_loc trailing
-        in
-        walkExpression thenExpr t (List.concat [leading; inside; afterExpr]);
-        trailing)
-      else (
-        attach t.leading thenExpr.pexp_loc leading;
-        walkExpression thenExpr t inside;
-        let afterExpr, comments =
-          partitionAdjacentTrailing thenExpr.pexp_loc trailing
-        in
-        attach t.trailing thenExpr.pexp_loc afterExpr;
-        comments)
-    in
-    match elseExpr with
-    | None -> ()
-    | Some expr ->
-      if isBlockExpr expr || isIfThenElseExpr expr then
-        walkExpression expr t comments
-      else
-        let leading, inside, trailing = partitionByLoc comments expr.pexp_loc in
-        attach t.leading expr.pexp_loc leading;
-        walkExpression expr t inside;
-        attach t.trailing expr.pexp_loc trailing)
-  | Pexp_while (expr1, expr2) ->
-    let leading, inside, trailing = partitionByLoc comments expr1.pexp_loc in
-    let rest =
-      if isBlockExpr expr1 then (
-        let afterExpr, rest =
-          partitionAdjacentTrailing expr1.pexp_loc trailing
-        in
-        walkExpression expr1 t (List.concat [leading; inside; afterExpr]);
-        rest)
-      else (
-        attach t.leading expr1.pexp_loc leading;
-        walkExpression expr1 t inside;
-        let afterExpr, rest =
-          partitionAdjacentTrailing expr1.pexp_loc trailing
-        in
-        attach t.trailing expr1.pexp_loc afterExpr;
-        rest)
-    in
-    if isBlockExpr expr2 then walkExpression expr2 t rest
-    else
-      let leading, inside, trailing = partitionByLoc rest expr2.pexp_loc in
-      attach t.leading expr2.pexp_loc leading;
-      walkExpression expr2 t inside;
-      attach t.trailing expr2.pexp_loc trailing
-  | Pexp_for (pat, expr1, expr2, _, expr3) ->
-    let leading, inside, trailing = partitionByLoc comments pat.ppat_loc in
-    attach t.leading pat.ppat_loc leading;
-    walkPattern pat t inside;
-    let afterPat, rest = partitionAdjacentTrailing pat.ppat_loc trailing in
-    attach t.trailing pat.ppat_loc afterPat;
-    let leading, inside, trailing = partitionByLoc rest expr1.pexp_loc in
-    attach t.leading expr1.pexp_loc leading;
-    walkExpression expr1 t inside;
-    let afterExpr, rest = partitionAdjacentTrailing expr1.pexp_loc trailing in
-    attach t.trailing expr1.pexp_loc afterExpr;
-    let leading, inside, trailing = partitionByLoc rest expr2.pexp_loc in
-    attach t.leading expr2.pexp_loc leading;
-    walkExpression expr2 t inside;
-    let afterExpr, rest = partitionAdjacentTrailing expr2.pexp_loc trailing in
-    attach t.trailing expr2.pexp_loc afterExpr;
-    if isBlockExpr expr3 then walkExpression expr3 t rest
-    else
-      let leading, inside, trailing = partitionByLoc rest expr3.pexp_loc in
-      attach t.leading expr3.pexp_loc leading;
-      walkExpression expr3 t inside;
-      attach t.trailing expr3.pexp_loc trailing
-  | Pexp_pack modExpr ->
-    let before, inside, after = partitionByLoc comments modExpr.pmod_loc in
-    attach t.leading modExpr.pmod_loc before;
-    walkModuleExpr modExpr t inside;
-    attach t.trailing modExpr.pmod_loc after
-  | Pexp_match (expr1, [case; elseBranch])
-    when Res_parsetree_viewer.hasIfLetAttribute expr.pexp_attributes ->
-    let before, inside, after = partitionByLoc comments case.pc_lhs.ppat_loc in
-    attach t.leading case.pc_lhs.ppat_loc before;
-    walkPattern case.pc_lhs t inside;
-    let afterPat, rest = partitionAdjacentTrailing case.pc_lhs.ppat_loc after in
-    attach t.trailing case.pc_lhs.ppat_loc afterPat;
-    let before, inside, after = partitionByLoc rest expr1.pexp_loc in
-    attach t.leading expr1.pexp_loc before;
-    walkExpression expr1 t inside;
-    let afterExpr, rest = partitionAdjacentTrailing expr1.pexp_loc after in
-    attach t.trailing expr1.pexp_loc afterExpr;
-    let before, inside, after = partitionByLoc rest case.pc_rhs.pexp_loc in
-    let after =
-      if isBlockExpr case.pc_rhs then (
-        let afterExpr, rest =
-          partitionAdjacentTrailing case.pc_rhs.pexp_loc after
-        in
-        walkExpression case.pc_rhs t (List.concat [before; inside; afterExpr]);
-        rest)
-      else (
-        attach t.leading case.pc_rhs.pexp_loc before;
-        walkExpression case.pc_rhs t inside;
-        after)
-    in
-    let afterExpr, rest =
-      partitionAdjacentTrailing case.pc_rhs.pexp_loc after
-    in
-    attach t.trailing case.pc_rhs.pexp_loc afterExpr;
-    let before, inside, after =
-      partitionByLoc rest elseBranch.pc_rhs.pexp_loc
-    in
-    let after =
-      if isBlockExpr elseBranch.pc_rhs then (
-        let afterExpr, rest =
-          partitionAdjacentTrailing elseBranch.pc_rhs.pexp_loc after
-        in
-        walkExpression elseBranch.pc_rhs t
-          (List.concat [before; inside; afterExpr]);
-        rest)
-      else (
-        attach t.leading elseBranch.pc_rhs.pexp_loc before;
-        walkExpression elseBranch.pc_rhs t inside;
-        after)
-    in
-    attach t.trailing elseBranch.pc_rhs.pexp_loc after
-  | Pexp_match (expr, cases) | Pexp_try (expr, cases) ->
-    let before, inside, after = partitionByLoc comments expr.pexp_loc in
-    let after =
-      if isBlockExpr expr then (
-        let afterExpr, rest = partitionAdjacentTrailing expr.pexp_loc after in
-        walkExpression expr t (List.concat [before; inside; afterExpr]);
-        rest)
-      else (
-        attach t.leading expr.pexp_loc before;
-        walkExpression expr t inside;
-        after)
-    in
-    let afterExpr, rest = partitionAdjacentTrailing expr.pexp_loc after in
-    attach t.trailing expr.pexp_loc afterExpr;
-    walkList (cases |> List.map (fun case -> Case case)) t rest
-    (* unary expression: todo use parsetreeviewer *)
-  | Pexp_apply
-      ( {
-          pexp_desc =
-            Pexp_ident
-              {
-                txt =
-                  Longident.Lident ("~+" | "~+." | "~-" | "~-." | "not" | "!");
-              };
-        },
-        [(Nolabel, argExpr)] ) ->
-    let before, inside, after = partitionByLoc comments argExpr.pexp_loc in
-    attach t.leading argExpr.pexp_loc before;
-    walkExpression argExpr t inside;
-    attach t.trailing argExpr.pexp_loc after
-  (* binary expression *)
-  | Pexp_apply
-      ( {
-          pexp_desc =
-            Pexp_ident
-              {
-                txt =
-                  Longident.Lident
-                    ( ":=" | "||" | "&&" | "=" | "==" | "<" | ">" | "!=" | "!=="
-                    | "<=" | ">=" | "|>" | "+" | "+." | "-" | "-." | "++" | "^"
-                    | "*" | "*." | "/" | "/." | "**" | "|." | "|.u" | "<>" );
-              };
-        },
-        [(Nolabel, operand1); (Nolabel, operand2)] ) ->
-    let before, inside, after = partitionByLoc comments operand1.pexp_loc in
-    attach t.leading operand1.pexp_loc before;
-    walkExpression operand1 t inside;
-    let afterOperand1, rest =
-      partitionAdjacentTrailing operand1.pexp_loc after
-    in
-    attach t.trailing operand1.pexp_loc afterOperand1;
-    let before, inside, after = partitionByLoc rest operand2.pexp_loc in
-    attach t.leading operand2.pexp_loc before;
-    walkExpression operand2 t inside;
-    (* (List.concat [inside; after]); *)
-    attach t.trailing operand2.pexp_loc after
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "get")}},
-        [(Nolabel, parentExpr); (Nolabel, memberExpr)] ) ->
-    walkList [Expression parentExpr; Expression memberExpr] t comments
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "set")}},
-        [(Nolabel, parentExpr); (Nolabel, memberExpr); (Nolabel, targetExpr)] )
-    ->
-    walkList
-      [Expression parentExpr; Expression memberExpr; Expression targetExpr]
-      t comments
-  | Pexp_apply (callExpr, arguments) ->
-    let before, inside, after = partitionByLoc comments callExpr.pexp_loc in
-    let after =
-      if isBlockExpr callExpr then (
-        let afterExpr, rest =
-          partitionAdjacentTrailing callExpr.pexp_loc after
-        in
-        walkExpression callExpr t (List.concat [before; inside; afterExpr]);
-        rest)
-      else (
-        attach t.leading callExpr.pexp_loc before;
-        walkExpression callExpr t inside;
-        after)
-    in
-    if ParsetreeViewer.isJsxExpression expr then (
-      let props =
-        arguments
-        |> List.filter (fun (label, _) ->
-               match label with
-               | Asttypes.Labelled "children" -> false
-               | Asttypes.Nolabel -> false
-               | _ -> true)
-      in
-      let maybeChildren =
-        arguments
-        |> List.find_opt (fun (label, _) ->
-               label = Asttypes.Labelled "children")
-      in
-      match maybeChildren with
-      (* There is no need to deal with this situation as the children cannot be NONE *)
-      | None -> ()
-      | Some (_, children) ->
-        let leading, inside, _ = partitionByLoc after children.pexp_loc in
-        if props = [] then
-          (* All comments inside a tag are trailing comments of the tag if there are no props
-             <A
-             // comment
-             // comment
-             />
-          *)
-          let afterExpr, _ =
-            partitionAdjacentTrailing callExpr.pexp_loc after
-          in
-          attach t.trailing callExpr.pexp_loc afterExpr
-        else
-          walkList (props |> List.map (fun (_, e) -> ExprArgument e)) t leading;
-        walkExpression children t inside)
-    else
-      let afterExpr, rest = partitionAdjacentTrailing callExpr.pexp_loc after in
-      attach t.trailing callExpr.pexp_loc afterExpr;
-      walkList (arguments |> List.map (fun (_, e) -> ExprArgument e)) t rest
-  | Pexp_fun (_, _, _, _) | Pexp_newtype _ -> (
-    let _, parameters, returnExpr = funExpr expr in
-    let comments =
-      visitListButContinueWithRemainingComments ~newlineDelimited:false
-        ~walkNode:walkExprPararameter
-        ~getLoc:(fun (_attrs, _argLbl, exprOpt, pattern) ->
-          let open Parsetree in
-          let startPos =
-            match pattern.ppat_attributes with
-            | ({Location.txt = "res.namedArgLoc"; loc}, _) :: _attrs ->
-              loc.loc_start
-            | _ -> pattern.ppat_loc.loc_start
-          in
-          match exprOpt with
-          | None -> {pattern.ppat_loc with loc_start = startPos}
-          | Some expr ->
-            {
-              pattern.ppat_loc with
-              loc_start = startPos;
-              loc_end = expr.pexp_loc.loc_end;
-            })
-        parameters t comments
-    in
-    match returnExpr.pexp_desc with
-    | Pexp_constraint (expr, typ)
-      when expr.pexp_loc.loc_start.pos_cnum >= typ.ptyp_loc.loc_end.pos_cnum ->
-      let leading, inside, trailing = partitionByLoc comments typ.ptyp_loc in
-      attach t.leading typ.ptyp_loc leading;
-      walkCoreType typ t inside;
-      let afterTyp, comments =
-        partitionAdjacentTrailing typ.ptyp_loc trailing
-      in
-      attach t.trailing typ.ptyp_loc afterTyp;
-      if isBlockExpr expr then walkExpression expr t comments
-      else
-        let leading, inside, trailing = partitionByLoc comments expr.pexp_loc in
-        attach t.leading expr.pexp_loc leading;
-        walkExpression expr t inside;
-        attach t.trailing expr.pexp_loc trailing
-    | Pexp_construct ({txt = Longident.Lident "Function$"}, Some returnExpr) ->
-      walkExpression returnExpr t comments
-    | _ ->
-      if isBlockExpr returnExpr then walkExpression returnExpr t comments
-      else
-        let leading, inside, trailing =
-          partitionByLoc comments returnExpr.pexp_loc
-        in
-        attach t.leading returnExpr.pexp_loc leading;
-        walkExpression returnExpr t inside;
-        attach t.trailing returnExpr.pexp_loc trailing)
-  | _ -> ()
-
-and walkExprPararameter (_attrs, _argLbl, exprOpt, pattern) t comments =
-  let leading, inside, trailing = partitionByLoc comments pattern.ppat_loc in
-  attach t.leading pattern.ppat_loc leading;
-  walkPattern pattern t inside;
-  match exprOpt with
-  | Some expr ->
-    let _afterPat, rest = partitionAdjacentTrailing pattern.ppat_loc trailing in
-    attach t.trailing pattern.ppat_loc trailing;
-    if isBlockExpr expr then walkExpression expr t rest
-    else
-      let leading, inside, trailing = partitionByLoc rest expr.pexp_loc in
-      attach t.leading expr.pexp_loc leading;
-      walkExpression expr t inside;
-      attach t.trailing expr.pexp_loc trailing
-  | None -> attach t.trailing pattern.ppat_loc trailing
-
-and walkExprArgument expr t comments =
-  match expr.Parsetree.pexp_attributes with
-  | ({Location.txt = "res.namedArgLoc"; loc}, _) :: _attrs ->
-    let leading, trailing = partitionLeadingTrailing comments loc in
-    attach t.leading loc leading;
-    let afterLabel, rest = partitionAdjacentTrailing loc trailing in
-    attach t.trailing loc afterLabel;
-    let before, inside, after = partitionByLoc rest expr.pexp_loc in
-    attach t.leading expr.pexp_loc before;
-    walkExpression expr t inside;
-    attach t.trailing expr.pexp_loc after
-  | _ ->
-    let before, inside, after = partitionByLoc comments expr.pexp_loc in
-    attach t.leading expr.pexp_loc before;
-    walkExpression expr t inside;
-    attach t.trailing expr.pexp_loc after
-
-and walkCase (case : Parsetree.case) t comments =
-  let before, inside, after = partitionByLoc comments case.pc_lhs.ppat_loc in
-  (* cases don't have a location on their own, leading comments should go
-   * after the bar on the pattern *)
-  walkPattern case.pc_lhs t (List.concat [before; inside]);
-  let afterPat, rest = partitionAdjacentTrailing case.pc_lhs.ppat_loc after in
-  attach t.trailing case.pc_lhs.ppat_loc afterPat;
-  let comments =
-    match case.pc_guard with
-    | Some expr ->
-      let before, inside, after = partitionByLoc rest expr.pexp_loc in
-      let afterExpr, rest = partitionAdjacentTrailing expr.pexp_loc after in
-      if isBlockExpr expr then
-        walkExpression expr t (List.concat [before; inside; afterExpr])
-      else (
-        attach t.leading expr.pexp_loc before;
-        walkExpression expr t inside;
-        attach t.trailing expr.pexp_loc afterExpr);
-      rest
-    | None -> rest
-  in
-  if isBlockExpr case.pc_rhs then walkExpression case.pc_rhs t comments
-  else
-    let before, inside, after = partitionByLoc comments case.pc_rhs.pexp_loc in
-    attach t.leading case.pc_rhs.pexp_loc before;
-    walkExpression case.pc_rhs t inside;
-    attach t.trailing case.pc_rhs.pexp_loc after
-
-and walkExprRecordRow (longident, expr) t comments =
-  let beforeLongident, afterLongident =
-    partitionLeadingTrailing comments longident.loc
-  in
-  attach t.leading longident.loc beforeLongident;
-  let afterLongident, rest =
-    partitionAdjacentTrailing longident.loc afterLongident
-  in
-  attach t.trailing longident.loc afterLongident;
-  let leading, inside, trailing = partitionByLoc rest expr.pexp_loc in
-  attach t.leading expr.pexp_loc leading;
-  walkExpression expr t inside;
-  attach t.trailing expr.pexp_loc trailing
-
-and walkExtensionConstructor extConstr t comments =
-  let leading, trailing =
-    partitionLeadingTrailing comments extConstr.pext_name.loc
-  in
-  attach t.leading extConstr.pext_name.loc leading;
-  let afterName, rest =
-    partitionAdjacentTrailing extConstr.pext_name.loc trailing
-  in
-  attach t.trailing extConstr.pext_name.loc afterName;
-  walkExtensionConstructorKind extConstr.pext_kind t rest
-
-and walkExtensionConstructorKind kind t comments =
-  match kind with
-  | Pext_rebind longident ->
-    let leading, trailing = partitionLeadingTrailing comments longident.loc in
-    attach t.leading longident.loc leading;
-    attach t.trailing longident.loc trailing
-  | Pext_decl (constructorArguments, maybeTypExpr) -> (
-    let rest = walkConstructorArguments constructorArguments t comments in
-    match maybeTypExpr with
-    | None -> ()
-    | Some typexpr ->
-      let before, inside, after = partitionByLoc rest typexpr.ptyp_loc in
-      attach t.leading typexpr.ptyp_loc before;
-      walkCoreType typexpr t inside;
-      attach t.trailing typexpr.ptyp_loc after)
-
-and walkModuleExpr modExpr t comments =
-  match modExpr.pmod_desc with
-  | Pmod_ident longident ->
-    let before, after = partitionLeadingTrailing comments longident.loc in
-    attach t.leading longident.loc before;
-    attach t.trailing longident.loc after
-  | Pmod_structure [] -> attach t.inside modExpr.pmod_loc comments
-  | Pmod_structure structure -> walkStructure structure t comments
-  | Pmod_extension extension -> walkExtension extension t comments
-  | Pmod_unpack expr ->
-    let before, inside, after = partitionByLoc comments expr.pexp_loc in
-    attach t.leading expr.pexp_loc before;
-    walkExpression expr t inside;
-    attach t.trailing expr.pexp_loc after
-  | Pmod_constraint (modexpr, modtype) ->
-    if modtype.pmty_loc.loc_start >= modexpr.pmod_loc.loc_end then (
-      let before, inside, after = partitionByLoc comments modexpr.pmod_loc in
-      attach t.leading modexpr.pmod_loc before;
-      walkModuleExpr modexpr t inside;
-      let after, rest = partitionAdjacentTrailing modexpr.pmod_loc after in
-      attach t.trailing modexpr.pmod_loc after;
-      let before, inside, after = partitionByLoc rest modtype.pmty_loc in
-      attach t.leading modtype.pmty_loc before;
-      walkModType modtype t inside;
-      attach t.trailing modtype.pmty_loc after)
-    else
-      let before, inside, after = partitionByLoc comments modtype.pmty_loc in
-      attach t.leading modtype.pmty_loc before;
-      walkModType modtype t inside;
-      let after, rest = partitionAdjacentTrailing modtype.pmty_loc after in
-      attach t.trailing modtype.pmty_loc after;
-      let before, inside, after = partitionByLoc rest modexpr.pmod_loc in
-      attach t.leading modexpr.pmod_loc before;
-      walkModuleExpr modexpr t inside;
-      attach t.trailing modexpr.pmod_loc after
-  | Pmod_apply (_callModExpr, _argModExpr) ->
-    let modExprs = modExprApply modExpr in
-    walkList (modExprs |> List.map (fun me -> ModuleExpr me)) t comments
-  | Pmod_functor _ -> (
-    let parameters, returnModExpr = modExprFunctor modExpr in
-    let comments =
-      visitListButContinueWithRemainingComments
-        ~getLoc:(fun (_, lbl, modTypeOption) ->
-          match modTypeOption with
-          | None -> lbl.Asttypes.loc
-          | Some modType ->
-            {lbl.loc with loc_end = modType.Parsetree.pmty_loc.loc_end})
-        ~walkNode:walkModExprParameter ~newlineDelimited:false parameters t
-        comments
-    in
-    match returnModExpr.pmod_desc with
-    | Pmod_constraint (modExpr, modType)
-      when modType.pmty_loc.loc_end.pos_cnum
-           <= modExpr.pmod_loc.loc_start.pos_cnum ->
-      let before, inside, after = partitionByLoc comments modType.pmty_loc in
-      attach t.leading modType.pmty_loc before;
-      walkModType modType t inside;
-      let after, rest = partitionAdjacentTrailing modType.pmty_loc after in
-      attach t.trailing modType.pmty_loc after;
-      let before, inside, after = partitionByLoc rest modExpr.pmod_loc in
-      attach t.leading modExpr.pmod_loc before;
-      walkModuleExpr modExpr t inside;
-      attach t.trailing modExpr.pmod_loc after
-    | _ ->
-      let before, inside, after =
-        partitionByLoc comments returnModExpr.pmod_loc
-      in
-      attach t.leading returnModExpr.pmod_loc before;
-      walkModuleExpr returnModExpr t inside;
-      attach t.trailing returnModExpr.pmod_loc after)
-
-and walkModExprParameter parameter t comments =
-  let _attrs, lbl, modTypeOption = parameter in
-  let leading, trailing = partitionLeadingTrailing comments lbl.loc in
-  attach t.leading lbl.loc leading;
-  match modTypeOption with
-  | None -> attach t.trailing lbl.loc trailing
-  | Some modType ->
-    let afterLbl, rest = partitionAdjacentTrailing lbl.loc trailing in
-    attach t.trailing lbl.loc afterLbl;
-    let before, inside, after = partitionByLoc rest modType.pmty_loc in
-    attach t.leading modType.pmty_loc before;
-    walkModType modType t inside;
-    attach t.trailing modType.pmty_loc after
-
-and walkModType modType t comments =
-  match modType.pmty_desc with
-  | Pmty_ident longident | Pmty_alias longident ->
-    let leading, trailing = partitionLeadingTrailing comments longident.loc in
-    attach t.leading longident.loc leading;
-    attach t.trailing longident.loc trailing
-  | Pmty_signature [] -> attach t.inside modType.pmty_loc comments
-  | Pmty_signature signature -> walkSignature signature t comments
-  | Pmty_extension extension -> walkExtension extension t comments
-  | Pmty_typeof modExpr ->
-    let before, inside, after = partitionByLoc comments modExpr.pmod_loc in
-    attach t.leading modExpr.pmod_loc before;
-    walkModuleExpr modExpr t inside;
-    attach t.trailing modExpr.pmod_loc after
-  | Pmty_with (modType, _withConstraints) ->
-    let before, inside, after = partitionByLoc comments modType.pmty_loc in
-    attach t.leading modType.pmty_loc before;
-    walkModType modType t inside;
-    attach t.trailing modType.pmty_loc after
-    (* TODO: withConstraints*)
-  | Pmty_functor _ ->
-    let parameters, returnModType = functorType modType in
-    let comments =
-      visitListButContinueWithRemainingComments
-        ~getLoc:(fun (_, lbl, modTypeOption) ->
-          match modTypeOption with
-          | None -> lbl.Asttypes.loc
-          | Some modType ->
-            if lbl.txt = "_" then modType.Parsetree.pmty_loc
-            else {lbl.loc with loc_end = modType.Parsetree.pmty_loc.loc_end})
-        ~walkNode:walkModTypeParameter ~newlineDelimited:false parameters t
-        comments
-    in
-    let before, inside, after =
-      partitionByLoc comments returnModType.pmty_loc
-    in
-    attach t.leading returnModType.pmty_loc before;
-    walkModType returnModType t inside;
-    attach t.trailing returnModType.pmty_loc after
-
-and walkModTypeParameter (_, lbl, modTypeOption) t comments =
-  let leading, trailing = partitionLeadingTrailing comments lbl.loc in
-  attach t.leading lbl.loc leading;
-  match modTypeOption with
-  | None -> attach t.trailing lbl.loc trailing
-  | Some modType ->
-    let afterLbl, rest = partitionAdjacentTrailing lbl.loc trailing in
-    attach t.trailing lbl.loc afterLbl;
-    let before, inside, after = partitionByLoc rest modType.pmty_loc in
-    attach t.leading modType.pmty_loc before;
-    walkModType modType t inside;
-    attach t.trailing modType.pmty_loc after
-
-and walkPattern pat t comments =
-  let open Location in
-  match pat.Parsetree.ppat_desc with
-  | _ when comments = [] -> ()
-  | Ppat_alias (pat, alias) ->
-    let leading, inside, trailing = partitionByLoc comments pat.ppat_loc in
-    attach t.leading pat.ppat_loc leading;
-    walkPattern pat t inside;
-    let afterPat, rest = partitionAdjacentTrailing pat.ppat_loc trailing in
-    attach t.leading pat.ppat_loc leading;
-    attach t.trailing pat.ppat_loc afterPat;
-    let beforeAlias, afterAlias = partitionLeadingTrailing rest alias.loc in
-    attach t.leading alias.loc beforeAlias;
-    attach t.trailing alias.loc afterAlias
-  | Ppat_tuple []
-  | Ppat_array []
-  | Ppat_construct ({txt = Longident.Lident "()"}, _)
-  | Ppat_construct ({txt = Longident.Lident "[]"}, _) ->
-    attach t.inside pat.ppat_loc comments
-  | Ppat_array patterns ->
-    walkList (patterns |> List.map (fun p -> Pattern p)) t comments
-  | Ppat_tuple patterns ->
-    walkList (patterns |> List.map (fun p -> Pattern p)) t comments
-  | Ppat_construct ({txt = Longident.Lident "::"}, _) ->
-    walkList
-      (collectListPatterns [] pat |> List.map (fun p -> Pattern p))
-      t comments
-  | Ppat_construct (constr, None) ->
-    let beforeConstr, afterConstr =
-      partitionLeadingTrailing comments constr.loc
-    in
-    attach t.leading constr.loc beforeConstr;
-    attach t.trailing constr.loc afterConstr
-  | Ppat_construct (constr, Some pat) ->
-    let leading, trailing = partitionLeadingTrailing comments constr.loc in
-    attach t.leading constr.loc leading;
-    let afterConstructor, rest =
-      partitionAdjacentTrailing constr.loc trailing
-    in
-    attach t.trailing constr.loc afterConstructor;
-    let leading, inside, trailing = partitionByLoc rest pat.ppat_loc in
-    attach t.leading pat.ppat_loc leading;
-    walkPattern pat t inside;
-    attach t.trailing pat.ppat_loc trailing
-  | Ppat_variant (_label, None) -> ()
-  | Ppat_variant (_label, Some pat) -> walkPattern pat t comments
-  | Ppat_type _ -> ()
-  | Ppat_record (recordRows, _) ->
-    walkList
-      (recordRows |> List.map (fun (li, p) -> PatternRecordRow (li, p)))
-      t comments
-  | Ppat_or _ ->
-    walkList
-      (Res_parsetree_viewer.collectOrPatternChain pat
-      |> List.map (fun pat -> Pattern pat))
-      t comments
-  | Ppat_constraint (pattern, typ) ->
-    let beforePattern, insidePattern, afterPattern =
-      partitionByLoc comments pattern.ppat_loc
-    in
-    attach t.leading pattern.ppat_loc beforePattern;
-    walkPattern pattern t insidePattern;
-    let afterPattern, rest =
-      partitionAdjacentTrailing pattern.ppat_loc afterPattern
-    in
-    attach t.trailing pattern.ppat_loc afterPattern;
-    let beforeTyp, insideTyp, afterTyp = partitionByLoc rest typ.ptyp_loc in
-    attach t.leading typ.ptyp_loc beforeTyp;
-    walkCoreType typ t insideTyp;
-    attach t.trailing typ.ptyp_loc afterTyp
-  | Ppat_lazy pattern | Ppat_exception pattern ->
-    let leading, inside, trailing = partitionByLoc comments pattern.ppat_loc in
-    attach t.leading pattern.ppat_loc leading;
-    walkPattern pattern t inside;
-    attach t.trailing pattern.ppat_loc trailing
-  | Ppat_unpack stringLoc ->
-    let leading, trailing = partitionLeadingTrailing comments stringLoc.loc in
-    attach t.leading stringLoc.loc leading;
-    attach t.trailing stringLoc.loc trailing
-  | Ppat_extension extension -> walkExtension extension t comments
-  | _ -> ()
-
-(* name: firstName *)
-and walkPatternRecordRow row t comments =
-  match row with
-  (* punned {x}*)
-  | ( {Location.txt = Longident.Lident ident; loc = longidentLoc},
-      {Parsetree.ppat_desc = Ppat_var {txt; _}} )
-    when ident = txt ->
-    let beforeLbl, afterLbl = partitionLeadingTrailing comments longidentLoc in
-    attach t.leading longidentLoc beforeLbl;
-    attach t.trailing longidentLoc afterLbl
-  | longident, pattern ->
-    let beforeLbl, afterLbl = partitionLeadingTrailing comments longident.loc in
-    attach t.leading longident.loc beforeLbl;
-    let afterLbl, rest = partitionAdjacentTrailing longident.loc afterLbl in
-    attach t.trailing longident.loc afterLbl;
-    let leading, inside, trailing = partitionByLoc rest pattern.ppat_loc in
-    attach t.leading pattern.ppat_loc leading;
-    walkPattern pattern t inside;
-    attach t.trailing pattern.ppat_loc trailing
-
-and walkRowField (rowField : Parsetree.row_field) t comments =
-  match rowField with
-  | Parsetree.Rtag ({loc}, _, _, _) ->
-    let before, after = partitionLeadingTrailing comments loc in
-    attach t.leading loc before;
-    attach t.trailing loc after
-  | Rinherit _ -> ()
-
-and walkCoreType typ t comments =
-  match typ.Parsetree.ptyp_desc with
-  | _ when comments = [] -> ()
-  | Ptyp_tuple typexprs ->
-    walkList (typexprs |> List.map (fun ct -> CoreType ct)) t comments
-  | Ptyp_extension extension -> walkExtension extension t comments
-  | Ptyp_package packageType -> walkPackageType packageType t comments
-  | Ptyp_alias (typexpr, _alias) ->
-    let beforeTyp, insideTyp, afterTyp =
-      partitionByLoc comments typexpr.ptyp_loc
-    in
-    attach t.leading typexpr.ptyp_loc beforeTyp;
-    walkCoreType typexpr t insideTyp;
-    attach t.trailing typexpr.ptyp_loc afterTyp
-  | Ptyp_poly (strings, typexpr) ->
-    let comments =
-      visitListButContinueWithRemainingComments
-        ~getLoc:(fun n -> n.Asttypes.loc)
-        ~walkNode:(fun longident t comments ->
-          let beforeLongident, afterLongident =
-            partitionLeadingTrailing comments longident.loc
-          in
-          attach t.leading longident.loc beforeLongident;
-          attach t.trailing longident.loc afterLongident)
-        ~newlineDelimited:false strings t comments
-    in
-    let beforeTyp, insideTyp, afterTyp =
-      partitionByLoc comments typexpr.ptyp_loc
-    in
-    attach t.leading typexpr.ptyp_loc beforeTyp;
-    walkCoreType typexpr t insideTyp;
-    attach t.trailing typexpr.ptyp_loc afterTyp
-  | Ptyp_variant (rowFields, _, _) ->
-    walkList (rowFields |> List.map (fun rf -> RowField rf)) t comments
-  | Ptyp_constr
-      ({txt = Lident "function$"}, [({ptyp_desc = Ptyp_arrow _} as desc); _]) ->
-    walkCoreType desc t comments
-  | Ptyp_constr (longident, typexprs) ->
-    let beforeLongident, _afterLongident =
-      partitionLeadingTrailing comments longident.loc
-    in
-    let afterLongident, rest =
-      partitionAdjacentTrailing longident.loc comments
-    in
-    attach t.leading longident.loc beforeLongident;
-    attach t.trailing longident.loc afterLongident;
-    walkList (typexprs |> List.map (fun ct -> CoreType ct)) t rest
-  | Ptyp_arrow _ ->
-    let _, parameters, typexpr = arrowType typ in
-    let comments = walkTypeParameters parameters t comments in
-    let beforeTyp, insideTyp, afterTyp =
-      partitionByLoc comments typexpr.ptyp_loc
-    in
-    attach t.leading typexpr.ptyp_loc beforeTyp;
-    walkCoreType typexpr t insideTyp;
-    attach t.trailing typexpr.ptyp_loc afterTyp
-  | Ptyp_object (fields, _) -> walkTypObjectFields fields t comments
-  | _ -> ()
-
-and walkTypObjectFields fields t comments =
-  walkList (fields |> List.map (fun f -> ObjectField f)) t comments
-
-and walkObjectField field t comments =
-  match field with
-  | Otag (lbl, _, typexpr) ->
-    let beforeLbl, afterLbl = partitionLeadingTrailing comments lbl.loc in
-    attach t.leading lbl.loc beforeLbl;
-    let afterLbl, rest = partitionAdjacentTrailing lbl.loc afterLbl in
-    attach t.trailing lbl.loc afterLbl;
-    let beforeTyp, insideTyp, afterTyp = partitionByLoc rest typexpr.ptyp_loc in
-    attach t.leading typexpr.ptyp_loc beforeTyp;
-    walkCoreType typexpr t insideTyp;
-    attach t.trailing typexpr.ptyp_loc afterTyp
-  | _ -> ()
-
-and walkTypeParameters typeParameters t comments =
-  visitListButContinueWithRemainingComments
-    ~getLoc:(fun (_, _, typexpr) ->
-      match typexpr.Parsetree.ptyp_attributes with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _) :: _attrs ->
-        {loc with loc_end = typexpr.ptyp_loc.loc_end}
-      | _ -> typexpr.ptyp_loc)
-    ~walkNode:walkTypeParameter ~newlineDelimited:false typeParameters t
-    comments
-
-and walkTypeParameter (_attrs, _lbl, typexpr) t comments =
-  let beforeTyp, insideTyp, afterTyp =
-    partitionByLoc comments typexpr.ptyp_loc
-  in
-  attach t.leading typexpr.ptyp_loc beforeTyp;
-  walkCoreType typexpr t insideTyp;
-  attach t.trailing typexpr.ptyp_loc afterTyp
-
-and walkPackageType packageType t comments =
-  let longident, packageConstraints = packageType in
-  let beforeLongident, afterLongident =
-    partitionLeadingTrailing comments longident.loc
-  in
-  attach t.leading longident.loc beforeLongident;
-  let afterLongident, rest =
-    partitionAdjacentTrailing longident.loc afterLongident
-  in
-  attach t.trailing longident.loc afterLongident;
-  walkPackageConstraints packageConstraints t rest
-
-and walkPackageConstraints packageConstraints t comments =
-  walkList
-    (packageConstraints |> List.map (fun (li, te) -> PackageConstraint (li, te)))
-    t comments
-
-and walkPackageConstraint packageConstraint t comments =
-  let longident, typexpr = packageConstraint in
-  let beforeLongident, afterLongident =
-    partitionLeadingTrailing comments longident.loc
-  in
-  attach t.leading longident.loc beforeLongident;
-  let afterLongident, rest =
-    partitionAdjacentTrailing longident.loc afterLongident
-  in
-  attach t.trailing longident.loc afterLongident;
-  let beforeTyp, insideTyp, afterTyp = partitionByLoc rest typexpr.ptyp_loc in
-  attach t.leading typexpr.ptyp_loc beforeTyp;
-  walkCoreType typexpr t insideTyp;
-  attach t.trailing typexpr.ptyp_loc afterTyp
-
-and walkExtension extension t comments =
-  let id, payload = extension in
-  let beforeId, afterId = partitionLeadingTrailing comments id.loc in
-  attach t.leading id.loc beforeId;
-  let afterId, rest = partitionAdjacentTrailing id.loc afterId in
-  attach t.trailing id.loc afterId;
-  walkPayload payload t rest
-
-and walkAttribute (id, payload) t comments =
-  let beforeId, afterId = partitionLeadingTrailing comments id.loc in
-  attach t.leading id.loc beforeId;
-  let afterId, rest = partitionAdjacentTrailing id.loc afterId in
-  attach t.trailing id.loc afterId;
-  walkPayload payload t rest
-
-and walkPayload payload t comments =
-  match payload with
-  | PStr s -> walkStructure s t comments
-  | _ -> ()
diff --git a/jscomp/syntax/src/res_core.ml b/jscomp/syntax/src/res_core.ml
deleted file mode 100644
index 2a08074..0000000
--- a/jscomp/syntax/src/res_core.ml
+++ /dev/null
@@ -1,6634 +0,0 @@
-module Doc = Res_doc
-module Grammar = Res_grammar
-module Token = Res_token
-module Diagnostics = Res_diagnostics
-module CommentTable = Res_comments_table
-module ResPrinter = Res_printer
-module Scanner = Res_scanner
-module Parser = Res_parser
-
-module LoopProgress = struct
-  let listRest list =
-    match list with
-    | [] -> assert false
-    | _ :: rest -> rest
-end
-
-let mkLoc startLoc endLoc =
-  Location.{loc_start = startLoc; loc_end = endLoc; loc_ghost = false}
-
-module Recover = struct
-  let defaultExpr () =
-    let id = Location.mknoloc "rescript.exprhole" in
-    Ast_helper.Exp.mk (Pexp_extension (id, PStr []))
-
-  let defaultType () =
-    let id = Location.mknoloc "rescript.typehole" in
-    Ast_helper.Typ.extension (id, PStr [])
-
-  let defaultPattern () =
-    let id = Location.mknoloc "rescript.patternhole" in
-    Ast_helper.Pat.extension (id, PStr [])
-
-  let defaultModuleExpr () = Ast_helper.Mod.structure []
-  let defaultModuleType () = Ast_helper.Mty.signature []
-
-  let defaultSignatureItem =
-    let id = Location.mknoloc "rescript.sigitemhole" in
-    Ast_helper.Sig.extension (id, PStr [])
-
-  let recoverEqualGreater p =
-    Parser.expect EqualGreater p;
-    match p.Parser.token with
-    | MinusGreater -> Parser.next p
-    | _ -> ()
-
-  let shouldAbortListParse p =
-    let rec check breadcrumbs =
-      match breadcrumbs with
-      | [] -> false
-      | (grammar, _) :: rest ->
-        if Grammar.isPartOfList grammar p.Parser.token then true else check rest
-    in
-    check p.breadcrumbs
-end
-
-module ErrorMessages = struct
-  let listPatternSpread =
-    "List pattern matches only supports one `...` spread, at the end.\n\
-     Explanation: a list spread at the tail is efficient, but a spread in the \
-     middle would create new lists; out of performance concern, our pattern \
-     matching currently guarantees to never create new intermediate data."
-
-  let recordPatternSpread =
-    "Record's `...` spread is not supported in pattern matches.\n\
-     Explanation: you can't collect a subset of a record's field into its own \
-     record, since a record needs an explicit declaration and that subset \
-     wouldn't have one.\n\
-     Solution: you need to pull out each field you want explicitly."
-  (* let recordPatternUnderscore = "Record patterns only support one `_`, at the end." *)
-  [@@live]
-
-  let arrayPatternSpread =
-    "Array's `...` spread is not supported in pattern matches.\n\
-     Explanation: such spread would create a subarray; out of performance \
-     concern, our pattern matching currently guarantees to never create new \
-     intermediate data.\n\
-     Solution: if it's to validate the first few elements, use a `when` clause \
-     + Array size check + `get` checks on the current pattern. If it's to \
-     obtain a subarray, use `Array.sub` or `Belt.Array.slice`."
-
-  let recordExprSpread =
-    "Records can only have one `...` spread, at the beginning.\n\
-     Explanation: since records have a known, fixed shape, a spread like `{a, \
-     ...b}` wouldn't make sense, as `b` would override every field of `a` \
-     anyway."
-
-  let variantIdent =
-    "A polymorphic variant (e.g. #id) must start with an alphabetical letter \
-     or be a number (e.g. #742)"
-
-  let experimentalIfLet expr =
-    let switchExpr = {expr with Parsetree.pexp_attributes = []} in
-    Doc.concat
-      [
-        Doc.text "If-let is currently highly experimental.";
-        Doc.line;
-        Doc.text "Use a regular `switch` with pattern matching instead:";
-        Doc.concat
-          [
-            Doc.hardLine;
-            Doc.hardLine;
-            ResPrinter.printExpression switchExpr CommentTable.empty;
-          ];
-      ]
-    |> Doc.toString ~width:80
-
-  let typeParam =
-    "A type param consists of a singlequote followed by a name like `'a` or \
-     `'A`"
-  let typeVar =
-    "A type variable consists of a singlequote followed by a name like `'a` or \
-     `'A`"
-
-  let attributeWithoutNode (attr : Parsetree.attribute) =
-    let {Asttypes.txt = attrName}, _ = attr in
-    "Did you forget to attach `" ^ attrName
-    ^ "` to an item?\n  Standalone attributes start with `@@` like: `@@"
-    ^ attrName ^ "`"
-
-  let typeDeclarationNameLongident longident =
-    "A type declaration's name cannot contain a module access. Did you mean `"
-    ^ Longident.last longident ^ "`?"
-
-  let tupleSingleElement = "A tuple needs at least two elements"
-
-  let missingTildeLabeledParameter name =
-    if name = "" then "A labeled parameter starts with a `~`."
-    else "A labeled parameter starts with a `~`. Did you mean: `~" ^ name ^ "`?"
-
-  let stringInterpolationInPattern =
-    "String interpolation is not supported in pattern matching."
-
-  let spreadInRecordDeclaration =
-    "A record type declaration doesn't support the ... spread. Only an object \
-     (with quoted field names) does."
-
-  let objectQuotedFieldName name =
-    "An object type declaration needs quoted field names. Did you mean \""
-    ^ name ^ "\"?"
-
-  let forbiddenInlineRecordDeclaration =
-    "An inline record type declaration is only allowed in a variant \
-     constructor's declaration"
-
-  let polyVarIntWithSuffix number =
-    "A numeric polymorphic variant cannot be followed by a letter. Did you \
-     mean `#" ^ number ^ "`?"
-end
-
-module InExternal = struct
-  let status = ref false
-end
-
-let jsxAttr = (Location.mknoloc "JSX", Parsetree.PStr [])
-let uncurriedAppAttr = (Location.mknoloc "res.uapp", Parsetree.PStr [])
-let ternaryAttr = (Location.mknoloc "res.ternary", Parsetree.PStr [])
-let ifLetAttr = (Location.mknoloc "res.iflet", Parsetree.PStr [])
-let optionalAttr = (Location.mknoloc "res.optional", Parsetree.PStr [])
-let makeAwaitAttr loc = (Location.mkloc "res.await" loc, Parsetree.PStr [])
-let makeAsyncAttr loc = (Location.mkloc "res.async" loc, Parsetree.PStr [])
-
-let makeExpressionOptional ~optional (e : Parsetree.expression) =
-  if optional then {e with pexp_attributes = optionalAttr :: e.pexp_attributes}
-  else e
-let makePatternOptional ~optional (p : Parsetree.pattern) =
-  if optional then {p with ppat_attributes = optionalAttr :: p.ppat_attributes}
-  else p
-
-let suppressFragileMatchWarningAttr =
-  ( Location.mknoloc "warning",
-    Parsetree.PStr
-      [
-        Ast_helper.Str.eval
-          (Ast_helper.Exp.constant (Pconst_string ("-4", None)));
-      ] )
-let makeBracesAttr loc = (Location.mkloc "res.braces" loc, Parsetree.PStr [])
-let templateLiteralAttr = (Location.mknoloc "res.template", Parsetree.PStr [])
-
-let taggedTemplateLiteralAttr =
-  (Location.mknoloc "res.taggedTemplate", Parsetree.PStr [])
-
-let spreadAttr = (Location.mknoloc "res.spread", Parsetree.PStr [])
-
-type argument = {
-  dotted: bool;
-  label: Asttypes.arg_label;
-  expr: Parsetree.expression;
-}
-
-type typeParameter = {
-  dotted: bool;
-  attrs: Ast_helper.attrs;
-  label: Asttypes.arg_label;
-  typ: Parsetree.core_type;
-  startPos: Lexing.position;
-}
-
-type typDefOrExt =
-  | TypeDef of {
-      recFlag: Asttypes.rec_flag;
-      types: Parsetree.type_declaration list;
-    }
-  | TypeExt of Parsetree.type_extension
-
-type labelledParameter =
-  | TermParameter of {
-      dotted: bool;
-      attrs: Parsetree.attributes;
-      label: Asttypes.arg_label;
-      expr: Parsetree.expression option;
-      pat: Parsetree.pattern;
-      pos: Lexing.position;
-    }
-  | TypeParameter of {
-      dotted: bool;
-      attrs: Parsetree.attributes;
-      locs: string Location.loc list;
-      pos: Lexing.position;
-    }
-
-type recordPatternItem =
-  | PatUnderscore
-  | PatField of (Ast_helper.lid * Parsetree.pattern)
-
-type context = OrdinaryExpr | TernaryTrueBranchExpr | WhenExpr
-
-let getClosingToken = function
-  | Token.Lparen -> Token.Rparen
-  | Lbrace -> Rbrace
-  | Lbracket -> Rbracket
-  | List -> Rbrace
-  | LessThan -> GreaterThan
-  | _ -> assert false
-
-let rec goToClosing closingToken state =
-  match (state.Parser.token, closingToken) with
-  | Rparen, Token.Rparen
-  | Rbrace, Rbrace
-  | Rbracket, Rbracket
-  | GreaterThan, GreaterThan ->
-    Parser.next state;
-    ()
-  | ((Token.Lbracket | Lparen | Lbrace | List | LessThan) as t), _ ->
-    Parser.next state;
-    goToClosing (getClosingToken t) state;
-    goToClosing closingToken state
-  | (Rparen | Token.Rbrace | Rbracket | Eof), _ ->
-    () (* TODO: how do report errors here? *)
-  | _ ->
-    Parser.next state;
-    goToClosing closingToken state
-
-(* Madness *)
-let isEs6ArrowExpression ~inTernary p =
-  Parser.lookahead p (fun state ->
-      let async =
-        match state.Parser.token with
-        | Lident "async" ->
-          Parser.next state;
-          true
-        | _ -> false
-      in
-      match state.Parser.token with
-      | Lident _ | Underscore -> (
-        Parser.next state;
-        match state.Parser.token with
-        (* Don't think that this valid
-         * Imagine: let x = (a: int)
-         * This is a parenthesized expression with a type constraint, wait for
-         * the arrow *)
-        (* | Colon when not inTernary -> true *)
-        | EqualGreater -> true
-        | _ -> false)
-      | Lparen -> (
-        let prevEndPos = state.prevEndPos in
-        Parser.next state;
-        match state.token with
-        (* arrived at `()` here *)
-        | Rparen -> (
-          Parser.next state;
-          match state.Parser.token with
-          (* arrived at `() :` here *)
-          | Colon when not inTernary -> (
-            Parser.next state;
-            match state.Parser.token with
-            (* arrived at `() :typ` here *)
-            | Lident _ -> (
-              Parser.next state;
-              (match state.Parser.token with
-              (* arrived at `() :typ<` here *)
-              | LessThan ->
-                Parser.next state;
-                goToClosing GreaterThan state
-              | _ -> ());
-              match state.Parser.token with
-              (* arrived at `() :typ =>` or `() :typ<'a,'b> =>` here *)
-              | EqualGreater -> true
-              | _ -> false)
-            | _ -> true)
-          | EqualGreater -> true
-          | _ -> false)
-        | Dot (* uncurried *) -> true
-        | Tilde when not async -> true
-        | Backtick ->
-          false
-          (* (` always indicates the start of an expr, can't be es6 parameter *)
-        | _ -> (
-          goToClosing Rparen state;
-          match state.Parser.token with
-          | EqualGreater -> true
-          (* | Lbrace TODO: detect missing =>, is this possible? *)
-          | Colon when not inTernary -> true
-          | Rparen ->
-            (* imagine having something as :
-             * switch colour {
-             * | Red
-             *    when l == l'
-             *    || (&Clflags.classic && (l == Nolabel && !is_optional(l'))) => (t1, t2)
-             * We'll arrive at the outer rparen just before the =>.
-             * This is not an es6 arrow.
-             * *)
-            false
-          | _ -> (
-            Parser.nextUnsafe state;
-            (* error recovery, peek at the next token,
-             * (elements, providerId] => {
-             *  in the example above, we have an unbalanced ] here
-             *)
-            match state.Parser.token with
-            | EqualGreater when state.startPos.pos_lnum == prevEndPos.pos_lnum
-              ->
-              true
-            | _ -> false)))
-      | _ -> false)
-
-let isEs6ArrowFunctor p =
-  Parser.lookahead p (fun state ->
-      match state.Parser.token with
-      (* | Uident _ | Underscore -> *)
-      (* Parser.next state; *)
-      (* begin match state.Parser.token with *)
-      (* | EqualGreater -> true *)
-      (* | _ -> false *)
-      (* end *)
-      | Lparen -> (
-        Parser.next state;
-        match state.token with
-        | Rparen -> (
-          Parser.next state;
-          match state.token with
-          | Colon | EqualGreater -> true
-          | _ -> false)
-        | _ -> (
-          goToClosing Rparen state;
-          match state.Parser.token with
-          | EqualGreater | Lbrace -> true
-          | Colon -> true
-          | _ -> false))
-      | _ -> false)
-
-let isEs6ArrowType p =
-  Parser.lookahead p (fun state ->
-      match state.Parser.token with
-      | Lparen -> (
-        Parser.next state;
-        match state.Parser.token with
-        | Rparen -> (
-          Parser.next state;
-          match state.Parser.token with
-          | EqualGreater -> true
-          | _ -> false)
-        | Tilde | Dot -> true
-        | _ -> (
-          goToClosing Rparen state;
-          match state.Parser.token with
-          | EqualGreater -> true
-          | _ -> false))
-      | Tilde -> true
-      | _ -> false)
-
-let buildLongident words =
-  match List.rev words with
-  | [] -> assert false
-  | hd :: tl -> List.fold_left (fun p s -> Longident.Ldot (p, s)) (Lident hd) tl
-
-let makeInfixOperator (p : Parser.t) token startPos endPos =
-  let stringifiedToken =
-    if token = Token.MinusGreater then
-      if p.uncurried_config = Legacy then "|." else "|.u"
-    else if token = Token.PlusPlus then "^"
-    else if token = Token.BangEqual then "<>"
-    else if token = Token.BangEqualEqual then "!="
-    else if token = Token.Equal then (
-      (* TODO: could have a totally different meaning like x->fooSet(y)*)
-      Parser.err ~startPos ~endPos p
-        (Diagnostics.message "Did you mean `==` here?");
-      "=")
-    else if token = Token.EqualEqual then "="
-    else if token = Token.EqualEqualEqual then "=="
-    else Token.toString token
-  in
-  let loc = mkLoc startPos endPos in
-  let operator = Location.mkloc (Longident.Lident stringifiedToken) loc in
-  Ast_helper.Exp.ident ~loc operator
-
-let negateString s =
-  if String.length s > 0 && (s.[0] [@doesNotRaise]) = '-' then
-    (String.sub [@doesNotRaise]) s 1 (String.length s - 1)
-  else "-" ^ s
-
-let makeUnaryExpr startPos tokenEnd token operand =
-  match (token, operand.Parsetree.pexp_desc) with
-  | (Token.Plus | PlusDot), Pexp_constant (Pconst_integer _ | Pconst_float _) ->
-    operand
-  | Minus, Pexp_constant (Pconst_integer (n, m)) ->
-    {
-      operand with
-      pexp_desc = Pexp_constant (Pconst_integer (negateString n, m));
-    }
-  | (Minus | MinusDot), Pexp_constant (Pconst_float (n, m)) ->
-    {operand with pexp_desc = Pexp_constant (Pconst_float (negateString n, m))}
-  | (Token.Plus | PlusDot | Minus | MinusDot), _ ->
-    let tokenLoc = mkLoc startPos tokenEnd in
-    let operator = "~" ^ Token.toString token in
-    Ast_helper.Exp.apply
-      ~loc:(mkLoc startPos operand.Parsetree.pexp_loc.loc_end)
-      (Ast_helper.Exp.ident ~loc:tokenLoc
-         (Location.mkloc (Longident.Lident operator) tokenLoc))
-      [(Nolabel, operand)]
-  | Token.Bang, _ ->
-    let tokenLoc = mkLoc startPos tokenEnd in
-    Ast_helper.Exp.apply
-      ~loc:(mkLoc startPos operand.Parsetree.pexp_loc.loc_end)
-      (Ast_helper.Exp.ident ~loc:tokenLoc
-         (Location.mkloc (Longident.Lident "not") tokenLoc))
-      [(Nolabel, operand)]
-  | _ -> operand
-
-let makeListExpression loc seq extOpt =
-  let rec handleSeq = function
-    | [] -> (
-      match extOpt with
-      | Some ext -> ext
-      | None ->
-        let loc = {loc with Location.loc_ghost = true} in
-        let nil = Location.mkloc (Longident.Lident "[]") loc in
-        Ast_helper.Exp.construct ~loc nil None)
-    | e1 :: el ->
-      let exp_el = handleSeq el in
-      let loc =
-        mkLoc e1.Parsetree.pexp_loc.Location.loc_start exp_el.pexp_loc.loc_end
-      in
-      let arg = Ast_helper.Exp.tuple ~loc [e1; exp_el] in
-      Ast_helper.Exp.construct ~loc
-        (Location.mkloc (Longident.Lident "::") loc)
-        (Some arg)
-  in
-  let expr = handleSeq seq in
-  {expr with pexp_loc = loc}
-
-let makeListPattern loc seq ext_opt =
-  let rec handle_seq = function
-    | [] ->
-      let base_case =
-        match ext_opt with
-        | Some ext -> ext
-        | None ->
-          let loc = {loc with Location.loc_ghost = true} in
-          let nil = {Location.txt = Longident.Lident "[]"; loc} in
-          Ast_helper.Pat.construct ~loc nil None
-      in
-      base_case
-    | p1 :: pl ->
-      let pat_pl = handle_seq pl in
-      let loc = mkLoc p1.Parsetree.ppat_loc.loc_start pat_pl.ppat_loc.loc_end in
-      let arg = Ast_helper.Pat.mk ~loc (Ppat_tuple [p1; pat_pl]) in
-      Ast_helper.Pat.mk ~loc
-        (Ppat_construct (Location.mkloc (Longident.Lident "::") loc, Some arg))
-  in
-  handle_seq seq
-
-(* TODO: diagnostic reporting *)
-let lidentOfPath longident =
-  match Longident.flatten longident |> List.rev with
-  | [] -> ""
-  | ident :: _ -> ident
-
-let makeNewtypes ~attrs ~loc newtypes exp =
-  let expr =
-    List.fold_right
-      (fun newtype exp -> Ast_helper.Exp.mk ~loc (Pexp_newtype (newtype, exp)))
-      newtypes exp
-  in
-  {expr with pexp_attributes = attrs}
-
-(* locally abstract types syntax sugar
- * Transforms
- *  let f: type t u v. = (foo : list</t, u, v/>) => ...
- * into
- *  let f = (type t u v. foo : list</t, u, v/>) => ...
- *)
-let wrapTypeAnnotation ~loc newtypes core_type body =
-  let exp =
-    makeNewtypes ~attrs:[] ~loc newtypes
-      (Ast_helper.Exp.constraint_ ~loc body core_type)
-  in
-  let typ =
-    Ast_helper.Typ.poly ~loc newtypes
-      (Ast_helper.Typ.varify_constructors newtypes core_type)
-  in
-  (exp, typ)
-
-(**
-  * process the occurrence of _ in the arguments of a function application
-  * replace _ with a new variable, currently __x, in the arguments
-  * return a wrapping function that wraps ((__x) => ...) around an expression
-  * e.g. foo(_, 3) becomes (__x) => foo(__x, 3)
-  *)
-let processUnderscoreApplication (p : Parser.t) args =
-  let exp_question = ref None in
-  let hidden_var = "__x" in
-  let check_arg ((lab, exp) as arg) =
-    match exp.Parsetree.pexp_desc with
-    | Pexp_ident ({txt = Lident "_"} as id) ->
-      let new_id = Location.mkloc (Longident.Lident hidden_var) id.loc in
-      let new_exp = Ast_helper.Exp.mk (Pexp_ident new_id) ~loc:exp.pexp_loc in
-      exp_question := Some new_exp;
-      (lab, new_exp)
-    | _ -> arg
-  in
-  let args = List.map check_arg args in
-  let wrap (exp_apply : Parsetree.expression) =
-    match !exp_question with
-    | Some {pexp_loc = loc} ->
-      let pattern =
-        Ast_helper.Pat.mk
-          (Ppat_var (Location.mkloc hidden_var loc))
-          ~loc:Location.none
-      in
-      let funExpr = Ast_helper.Exp.fun_ ~loc Nolabel None pattern exp_apply in
-      if p.uncurried_config = Legacy then funExpr
-      else Ast_uncurried.uncurriedFun ~loc ~arity:1 funExpr
-    | None -> exp_apply
-  in
-  (args, wrap)
-
-(* Transform A.a into a. For use with punned record fields as in {A.a, b}. *)
-let removeModuleNameFromPunnedFieldValue exp =
-  match exp.Parsetree.pexp_desc with
-  | Pexp_ident pathIdent ->
-    {
-      exp with
-      pexp_desc =
-        Pexp_ident {pathIdent with txt = Lident (Longident.last pathIdent.txt)};
-    }
-  | _ -> exp
-
-let rec parseLident p =
-  let recoverLident p =
-    if
-      Token.isKeyword p.Parser.token
-      && p.Parser.prevEndPos.pos_lnum == p.startPos.pos_lnum
-    then (
-      Parser.err p (Diagnostics.lident p.Parser.token);
-      Parser.next p;
-      None)
-    else
-      let rec loop p =
-        if (not (Recover.shouldAbortListParse p)) && p.token <> Eof then (
-          Parser.next p;
-          loop p)
-      in
-      Parser.err p (Diagnostics.lident p.Parser.token);
-      Parser.next p;
-      loop p;
-      match p.Parser.token with
-      | Lident _ -> Some ()
-      | _ -> None
-  in
-  let startPos = p.Parser.startPos in
-  match p.Parser.token with
-  | Lident ident ->
-    Parser.next p;
-    let loc = mkLoc startPos p.prevEndPos in
-    (ident, loc)
-  | Eof ->
-    Parser.err ~startPos p (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
-    ("_", mkLoc startPos p.prevEndPos)
-  | _ -> (
-    match recoverLident p with
-    | Some () -> parseLident p
-    | None -> ("_", mkLoc startPos p.prevEndPos))
-
-let parseIdent ~msg ~startPos p =
-  match p.Parser.token with
-  | Lident ident | Uident ident ->
-    Parser.next p;
-    let loc = mkLoc startPos p.prevEndPos in
-    (ident, loc)
-  | token
-    when Token.isKeyword token && p.prevEndPos.pos_lnum == p.startPos.pos_lnum
-    ->
-    let tokenTxt = Token.toString token in
-    let msg =
-      "`" ^ tokenTxt
-      ^ "` is a reserved keyword. Keywords need to be escaped: \\\"" ^ tokenTxt
-      ^ "\""
-    in
-    Parser.err ~startPos p (Diagnostics.message msg);
-    Parser.next p;
-    (tokenTxt, mkLoc startPos p.prevEndPos)
-  | _token ->
-    Parser.err ~startPos p (Diagnostics.message msg);
-    Parser.next p;
-    ("", mkLoc startPos p.prevEndPos)
-
-let parseHashIdent ~startPos p =
-  Parser.expect Hash p;
-  match p.token with
-  | String text ->
-    Parser.next p;
-    (text, mkLoc startPos p.prevEndPos)
-  | Int {i; suffix} ->
-    let () =
-      match suffix with
-      | Some _ ->
-        Parser.err p
-          (Diagnostics.message (ErrorMessages.polyVarIntWithSuffix i))
-      | None -> ()
-    in
-    Parser.next p;
-    (i, mkLoc startPos p.prevEndPos)
-  | Eof ->
-    Parser.err ~startPos p (Diagnostics.unexpected p.token p.breadcrumbs);
-    ("", mkLoc startPos p.prevEndPos)
-  | _ -> parseIdent ~startPos ~msg:ErrorMessages.variantIdent p
-
-(* Ldot (Ldot (Lident "Foo", "Bar"), "baz") *)
-let parseValuePath p =
-  let startPos = p.Parser.startPos in
-  let rec aux p path =
-    let startPos = p.Parser.startPos in
-    let token = p.token in
-
-    Parser.next p;
-    if p.Parser.token = Dot then (
-      Parser.expect Dot p;
-
-      match p.Parser.token with
-      | Lident ident -> Longident.Ldot (path, ident)
-      | Uident uident -> aux p (Ldot (path, uident))
-      | token ->
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        Longident.Ldot (path, "_"))
-    else (
-      Parser.err p ~startPos ~endPos:p.prevEndPos (Diagnostics.lident token);
-      path)
-  in
-  let ident =
-    match p.Parser.token with
-    | Lident ident ->
-      Parser.next p;
-      Longident.Lident ident
-    | Uident ident ->
-      let res = aux p (Lident ident) in
-      Parser.nextUnsafe p;
-      res
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Parser.nextUnsafe p;
-      Longident.Lident "_"
-  in
-  Location.mkloc ident (mkLoc startPos p.prevEndPos)
-
-let parseValuePathAfterDot p =
-  let startPos = p.Parser.startPos in
-  match p.Parser.token with
-  | Lident _ | Uident _ -> parseValuePath p
-  | token ->
-    Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-    Location.mkloc (Longident.Lident "_") (mkLoc startPos p.prevEndPos)
-
-let parseValuePathTail p startPos ident =
-  let rec loop p path =
-    match p.Parser.token with
-    | Lident ident ->
-      Parser.next p;
-      Location.mkloc
-        (Longident.Ldot (path, ident))
-        (mkLoc startPos p.prevEndPos)
-    | Uident ident ->
-      Parser.next p;
-      Parser.expect Dot p;
-      loop p (Longident.Ldot (path, ident))
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Location.mkloc (Longident.Ldot (path, "_")) (mkLoc startPos p.prevEndPos)
-  in
-  loop p ident
-
-let parseModuleLongIdentTail ~lowercase p startPos ident =
-  let rec loop p acc =
-    match p.Parser.token with
-    | Lident ident when lowercase ->
-      Parser.next p;
-      let lident = Longident.Ldot (acc, ident) in
-      Location.mkloc lident (mkLoc startPos p.prevEndPos)
-    | Uident ident -> (
-      Parser.next p;
-      let endPos = p.prevEndPos in
-      let lident = Longident.Ldot (acc, ident) in
-      match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        loop p lident
-      | _ -> Location.mkloc lident (mkLoc startPos endPos))
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mkloc (Longident.Ldot (acc, "_")) (mkLoc startPos p.prevEndPos)
-  in
-  loop p ident
-
-(* Parses module identifiers:
-     Foo
-     Foo.Bar *)
-let parseModuleLongIdent ~lowercase p =
-  (* Parser.leaveBreadcrumb p Reporting.ModuleLongIdent; *)
-  let startPos = p.Parser.startPos in
-  let moduleIdent =
-    match p.Parser.token with
-    | Lident ident when lowercase ->
-      let loc = mkLoc startPos p.endPos in
-      let lident = Longident.Lident ident in
-      Parser.next p;
-      Location.mkloc lident loc
-    | Uident ident -> (
-      let lident = Longident.Lident ident in
-      let endPos = p.endPos in
-      Parser.next p;
-      match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        parseModuleLongIdentTail ~lowercase p startPos lident
-      | _ -> Location.mkloc lident (mkLoc startPos endPos))
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mkloc (Longident.Lident "_") (mkLoc startPos p.prevEndPos)
-  in
-  (* Parser.eatBreadcrumb p; *)
-  moduleIdent
-
-let verifyJsxOpeningClosingName p nameExpr =
-  let closing =
-    match p.Parser.token with
-    | Lident lident ->
-      Parser.next p;
-      Longident.Lident lident
-    | Uident _ -> (parseModuleLongIdent ~lowercase:true p).txt
-    | _ -> Longident.Lident ""
-  in
-  match nameExpr.Parsetree.pexp_desc with
-  | Pexp_ident openingIdent ->
-    let opening =
-      let withoutCreateElement =
-        Longident.flatten openingIdent.txt
-        |> List.filter (fun s -> s <> "createElement")
-      in
-      match Longident.unflatten withoutCreateElement with
-      | Some li -> li
-      | None -> Longident.Lident ""
-    in
-    opening = closing
-  | _ -> assert false
-
-let string_of_pexp_ident nameExpr =
-  match nameExpr.Parsetree.pexp_desc with
-  | Pexp_ident openingIdent ->
-    Longident.flatten openingIdent.txt
-    |> List.filter (fun s -> s <> "createElement")
-    |> String.concat "."
-  | _ -> ""
-
-(* open-def ::=
- *   | open module-path
- *   | open! module-path *)
-let parseOpenDescription ~attrs p =
-  Parser.leaveBreadcrumb p Grammar.OpenDescription;
-  let startPos = p.Parser.startPos in
-  Parser.expect Open p;
-  let override =
-    if Parser.optional p Token.Bang then Asttypes.Override else Asttypes.Fresh
-  in
-  let modident = parseModuleLongIdent ~lowercase:false p in
-  let loc = mkLoc startPos p.prevEndPos in
-  Parser.eatBreadcrumb p;
-  Ast_helper.Opn.mk ~loc ~attrs ~override modident
-
-(* constant	::=	integer-literal   *)
-(* ∣	 float-literal   *)
-(* ∣	 string-literal   *)
-let parseConstant p =
-  let isNegative =
-    match p.Parser.token with
-    | Token.Minus ->
-      Parser.next p;
-      true
-    | Plus ->
-      Parser.next p;
-      false
-    | _ -> false
-  in
-  let constant =
-    match p.Parser.token with
-    | Int {i; suffix} ->
-      (* Only decimal literal is allowed for bigint *)
-      if suffix = Some 'n' && not (Bigint_utils.is_valid i) then
-        Parser.err p
-          (Diagnostics.message
-             "Invalid bigint literal. Only decimal literal is allowed for \
-              bigint.");
-      let intTxt = if isNegative then "-" ^ i else i in
-      Parsetree.Pconst_integer (intTxt, suffix)
-    | Float {f; suffix} ->
-      let floatTxt = if isNegative then "-" ^ f else f in
-      Parsetree.Pconst_float (floatTxt, suffix)
-    | String s ->
-      Pconst_string (s, if p.mode = ParseForTypeChecker then Some "js" else None)
-    | Codepoint {c; original} ->
-      if p.mode = ParseForTypeChecker then Pconst_char c
-      else
-        (* Pconst_char char does not have enough information for formatting.
-         * When parsing for the printer, we encode the char contents as a string
-         * with a special prefix. *)
-        Pconst_string (original, Some "INTERNAL_RES_CHAR_CONTENTS")
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Pconst_string ("", None)
-  in
-  Parser.nextUnsafe p;
-  constant
-
-let parseTemplateConstant ~prefix (p : Parser.t) =
-  (* Arrived at the ` char *)
-  let startPos = p.startPos in
-  Parser.nextTemplateLiteralToken p;
-  match p.token with
-  | TemplateTail (txt, _) ->
-    Parser.next p;
-    Parsetree.Pconst_string (txt, prefix)
-  | _ ->
-    let rec skipTokens () =
-      if p.token <> Eof then (
-        Parser.next p;
-        match p.token with
-        | Backtick ->
-          Parser.next p;
-          ()
-        | _ -> skipTokens ())
-    in
-    skipTokens ();
-    Parser.err ~startPos ~endPos:p.prevEndPos p
-      (Diagnostics.message ErrorMessages.stringInterpolationInPattern);
-    Pconst_string ("", None)
-
-let parseCommaDelimitedRegion p ~grammar ~closing ~f =
-  Parser.leaveBreadcrumb p grammar;
-  let rec loop nodes =
-    match f p with
-    | Some node -> (
-      match p.Parser.token with
-      | Comma ->
-        Parser.next p;
-        loop (node :: nodes)
-      | token when token = closing || token = Eof -> List.rev (node :: nodes)
-      | _ when Grammar.isListElement grammar p.token ->
-        (* missing comma between nodes in the region and the current token
-         * looks like the start of something valid in the current region.
-         * Example:
-         *   type student<'extraInfo> = {
-         *     name: string,
-         *     age: int
-         *     otherInfo: 'extraInfo
-         *   }
-         * There is a missing comma between `int` and `otherInfo`.
-         * `otherInfo` looks like a valid start of the record declaration.
-         * We report the error here and then continue parsing the region.
-         *)
-        Parser.expect Comma p;
-        loop (node :: nodes)
-      | _ ->
-        if
-          not
-            (p.token = Eof || p.token = closing
-            || Recover.shouldAbortListParse p)
-        then Parser.expect Comma p;
-        if p.token = Semicolon then Parser.next p;
-        loop (node :: nodes))
-    | None ->
-      if p.token = Eof || p.token = closing || Recover.shouldAbortListParse p
-      then List.rev nodes
-      else (
-        Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
-        Parser.next p;
-        loop nodes)
-  in
-  let nodes = loop [] in
-  Parser.eatBreadcrumb p;
-  nodes
-
-let parseCommaDelimitedReversedList p ~grammar ~closing ~f =
-  Parser.leaveBreadcrumb p grammar;
-  let rec loop nodes =
-    match f p with
-    | Some node -> (
-      match p.Parser.token with
-      | Comma ->
-        Parser.next p;
-        loop (node :: nodes)
-      | token when token = closing || token = Eof -> node :: nodes
-      | _ when Grammar.isListElement grammar p.token ->
-        (* missing comma between nodes in the region and the current token
-         * looks like the start of something valid in the current region.
-         * Example:
-         *   type student<'extraInfo> = {
-         *     name: string,
-         *     age: int
-         *     otherInfo: 'extraInfo
-         *   }
-         * There is a missing comma between `int` and `otherInfo`.
-         * `otherInfo` looks like a valid start of the record declaration.
-         * We report the error here and then continue parsing the region.
-         *)
-        Parser.expect Comma p;
-        loop (node :: nodes)
-      | _ ->
-        if
-          not
-            (p.token = Eof || p.token = closing
-            || Recover.shouldAbortListParse p)
-        then Parser.expect Comma p;
-        if p.token = Semicolon then Parser.next p;
-        loop (node :: nodes))
-    | None ->
-      if p.token = Eof || p.token = closing || Recover.shouldAbortListParse p
-      then nodes
-      else (
-        Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
-        Parser.next p;
-        loop nodes)
-  in
-  let nodes = loop [] in
-  Parser.eatBreadcrumb p;
-  nodes
-
-let parseDelimitedRegion p ~grammar ~closing ~f =
-  Parser.leaveBreadcrumb p grammar;
-  let rec loop nodes =
-    match f p with
-    | Some node -> loop (node :: nodes)
-    | None ->
-      if
-        p.Parser.token = Token.Eof || p.token = closing
-        || Recover.shouldAbortListParse p
-      then List.rev nodes
-      else (
-        Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
-        Parser.next p;
-        loop nodes)
-  in
-  let nodes = loop [] in
-  Parser.eatBreadcrumb p;
-  nodes
-
-let parseRegion p ~grammar ~f =
-  Parser.leaveBreadcrumb p grammar;
-  let rec loop nodes =
-    match f p with
-    | Some node -> loop (node :: nodes)
-    | None ->
-      if p.Parser.token = Token.Eof || Recover.shouldAbortListParse p then
-        List.rev nodes
-      else (
-        Parser.err p (Diagnostics.unexpected p.token p.breadcrumbs);
-        Parser.next p;
-        loop nodes)
-  in
-  let nodes = loop [] in
-  Parser.eatBreadcrumb p;
-  nodes
-
-(* let-binding	::=	pattern =  expr   *)
-(* ∣	 value-name  { parameter }  [: typexpr]  [:> typexpr] =  expr   *)
-(* ∣	 value-name :  poly-typexpr =  expr   *)
-
-(* pattern	::=	value-name   *)
-(* ∣	 _   *)
-(* ∣	 constant   *)
-(* ∣	 pattern as  value-name   *)
-(* ∣	 ( pattern )   *)
-(* ∣	 ( pattern :  typexpr )   *)
-(* ∣	 pattern |  pattern   *)
-(* ∣	 constr  pattern   *)
-(* ∣	 #variant variant-pattern *)
-(* ∣	 #...type  *)
-(* ∣	 / pattern  { , pattern }+  /   *)
-(* ∣	 { field  [: typexpr]  [= pattern] { ; field  [: typexpr]  [= pattern] }  [; _ ] [ ; ] }   *)
-(* ∣	 [ pattern  { ; pattern }  [ ; ] ]   *)
-(* ∣	 pattern ::  pattern   *)
-(* ∣	 [| pattern  { ; pattern }  [ ; ] |]   *)
-(* ∣	 char-literal ..  char-literal *)
-(*	∣	 exception pattern  *)
-let rec parsePattern ?(alias = true) ?(or_ = true) p =
-  let startPos = p.Parser.startPos in
-  let attrs = parseAttributes p in
-  let pat =
-    match p.Parser.token with
-    | (True | False) as token ->
-      let endPos = p.endPos in
-      Parser.next p;
-      let loc = mkLoc startPos endPos in
-      Ast_helper.Pat.construct ~loc
-        (Location.mkloc (Longident.Lident (Token.toString token)) loc)
-        None
-    | Int _ | String _ | Float _ | Codepoint _ | Minus | Plus -> (
-      let c = parseConstant p in
-      match p.token with
-      | DotDot ->
-        Parser.next p;
-        let c2 = parseConstant p in
-        Ast_helper.Pat.interval ~loc:(mkLoc startPos p.prevEndPos) c c2
-      | _ -> Ast_helper.Pat.constant ~loc:(mkLoc startPos p.prevEndPos) c)
-    | Backtick ->
-      let constant = parseTemplateConstant ~prefix:(Some "js") p in
-      Ast_helper.Pat.constant ~attrs:[templateLiteralAttr]
-        ~loc:(mkLoc startPos p.prevEndPos)
-        constant
-    | Lparen -> (
-      Parser.next p;
-      match p.token with
-      | Rparen ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let lid = Location.mkloc (Longident.Lident "()") loc in
-        Ast_helper.Pat.construct ~loc lid None
-      | _ -> (
-        let pat = parseConstrainedPattern p in
-        match p.token with
-        | Comma ->
-          Parser.next p;
-          parseTuplePattern ~attrs ~first:pat ~startPos p
-        | _ ->
-          Parser.expect Rparen p;
-          let loc = mkLoc startPos p.prevEndPos in
-          {
-            pat with
-            ppat_loc = loc;
-            ppat_attributes = attrs @ pat.Parsetree.ppat_attributes;
-          }))
-    | Lbracket -> parseArrayPattern ~attrs p
-    | Lbrace -> parseRecordPattern ~attrs p
-    | Underscore ->
-      let endPos = p.endPos in
-      let loc = mkLoc startPos endPos in
-      Parser.next p;
-      Ast_helper.Pat.any ~loc ~attrs ()
-    | Lident ident -> (
-      let endPos = p.endPos in
-      let loc = mkLoc startPos endPos in
-      Parser.next p;
-      match p.token with
-      | Backtick ->
-        let constant = parseTemplateConstant ~prefix:(Some ident) p in
-        Ast_helper.Pat.constant ~loc:(mkLoc startPos p.prevEndPos) constant
-      | _ -> Ast_helper.Pat.var ~loc ~attrs (Location.mkloc ident loc))
-    | Uident _ -> (
-      let constr = parseModuleLongIdent ~lowercase:false p in
-      match p.Parser.token with
-      | Lparen -> parseConstructorPatternArgs p constr startPos attrs
-      | _ -> Ast_helper.Pat.construct ~loc:constr.loc ~attrs constr None)
-    | Hash -> (
-      Parser.next p;
-      if p.Parser.token == DotDotDot then (
-        Parser.next p;
-        let ident = parseValuePath p in
-        let loc = mkLoc startPos ident.loc.loc_end in
-        Ast_helper.Pat.type_ ~loc ~attrs ident)
-      else
-        let ident, loc =
-          match p.token with
-          | String text ->
-            Parser.next p;
-            (text, mkLoc startPos p.prevEndPos)
-          | Int {i; suffix} ->
-            let () =
-              match suffix with
-              | Some _ ->
-                Parser.err p
-                  (Diagnostics.message (ErrorMessages.polyVarIntWithSuffix i))
-              | None -> ()
-            in
-            Parser.next p;
-            (i, mkLoc startPos p.prevEndPos)
-          | Eof ->
-            Parser.err ~startPos p
-              (Diagnostics.unexpected p.token p.breadcrumbs);
-            ("", mkLoc startPos p.prevEndPos)
-          | _ -> parseIdent ~msg:ErrorMessages.variantIdent ~startPos p
-        in
-        match p.Parser.token with
-        | Lparen -> parseVariantPatternArgs p ident startPos attrs
-        | _ -> Ast_helper.Pat.variant ~loc ~attrs ident None)
-    | Exception ->
-      Parser.next p;
-      let pat = parsePattern ~alias:false ~or_:false p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Pat.exception_ ~loc ~attrs pat
-    | Lazy ->
-      Parser.next p;
-      let pat = parsePattern ~alias:false ~or_:false p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Pat.lazy_ ~loc ~attrs pat
-    | List ->
-      Parser.next p;
-      parseListPattern ~startPos ~attrs p
-    | Module -> parseModulePattern ~attrs p
-    | Percent ->
-      let extension = parseExtension p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Pat.extension ~loc ~attrs extension
-    | Eof ->
-      Parser.err p (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
-      Recover.defaultPattern ()
-    | token -> (
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      match
-        skipTokensAndMaybeRetry p ~isStartOfGrammar:Grammar.isAtomicPatternStart
-      with
-      | None -> Recover.defaultPattern ()
-      | Some () -> parsePattern p)
-  in
-  let pat = if alias then parseAliasPattern ~attrs pat p else pat in
-  if or_ then parseOrPattern pat p else pat
-
-and skipTokensAndMaybeRetry p ~isStartOfGrammar =
-  if
-    Token.isKeyword p.Parser.token
-    && p.Parser.prevEndPos.pos_lnum == p.startPos.pos_lnum
-  then (
-    Parser.next p;
-    None)
-  else if Recover.shouldAbortListParse p then
-    if isStartOfGrammar p.Parser.token then (
-      Parser.next p;
-      Some ())
-    else None
-  else (
-    Parser.next p;
-    let rec loop p =
-      if not (Recover.shouldAbortListParse p) then (
-        Parser.next p;
-        loop p)
-    in
-    loop p;
-    if isStartOfGrammar p.Parser.token then Some () else None)
-
-(* alias ::= pattern as lident *)
-and parseAliasPattern ~attrs pattern p =
-  match p.Parser.token with
-  | As ->
-    Parser.next p;
-    let name, loc = parseLident p in
-    let name = Location.mkloc name loc in
-    Ast_helper.Pat.alias
-      ~loc:{pattern.ppat_loc with loc_end = p.prevEndPos}
-      ~attrs pattern name
-  | _ -> pattern
-
-(* or ::= pattern | pattern
- * precedence: Red | Blue | Green is interpreted as (Red | Blue) | Green *)
-and parseOrPattern pattern1 p =
-  let rec loop pattern1 =
-    match p.Parser.token with
-    | Bar ->
-      Parser.next p;
-      let pattern2 = parsePattern ~or_:false p in
-      let loc =
-        {pattern1.Parsetree.ppat_loc with loc_end = pattern2.ppat_loc.loc_end}
-      in
-      loop (Ast_helper.Pat.or_ ~loc pattern1 pattern2)
-    | _ -> pattern1
-  in
-  loop pattern1
-
-and parseNonSpreadPattern ~msg p =
-  let () =
-    match p.Parser.token with
-    | DotDotDot ->
-      Parser.err p (Diagnostics.message msg);
-      Parser.next p
-    | _ -> ()
-  in
-  match p.Parser.token with
-  | token when Grammar.isPatternStart token -> (
-    let pat = parsePattern p in
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      let typ = parseTypExpr p in
-      let loc = mkLoc pat.ppat_loc.loc_start typ.Parsetree.ptyp_loc.loc_end in
-      Some (Ast_helper.Pat.constraint_ ~loc pat typ)
-    | _ -> Some pat)
-  | _ -> None
-
-and parseConstrainedPattern p =
-  let pat = parsePattern p in
-  match p.Parser.token with
-  | Colon ->
-    Parser.next p;
-    let typ = parseTypExpr p in
-    let loc = mkLoc pat.ppat_loc.loc_start typ.Parsetree.ptyp_loc.loc_end in
-    Ast_helper.Pat.constraint_ ~loc pat typ
-  | _ -> pat
-
-and parseConstrainedPatternRegion p =
-  match p.Parser.token with
-  | token when Grammar.isPatternStart token -> Some (parseConstrainedPattern p)
-  | _ -> None
-
-and parseOptionalLabel p =
-  match p.Parser.token with
-  | Question ->
-    Parser.next p;
-    true
-  | _ -> false
-
-(* field ::=
- *   | longident
- *   | longident : pattern
- *   | longident as lident
- *
- *  row ::=
- *	 | field ,
- *	 | field , _
- *	 | field , _,
- *)
-and parseRecordPatternRowField ~attrs p =
-  let label = parseValuePath p in
-  let pattern =
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      let optional = parseOptionalLabel p in
-      let pat = parsePattern p in
-      makePatternOptional ~optional pat
-    | _ ->
-      Ast_helper.Pat.var ~loc:label.loc ~attrs
-        (Location.mkloc (Longident.last label.txt) label.loc)
-  in
-  (label, pattern)
-
-(* TODO: there are better representations than PatField|Underscore ? *)
-and parseRecordPatternRow p =
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | DotDotDot ->
-    Parser.next p;
-    Some (true, PatField (parseRecordPatternRowField ~attrs p))
-  | Uident _ | Lident _ ->
-    Some (false, PatField (parseRecordPatternRowField ~attrs p))
-  | Question -> (
-    Parser.next p;
-    match p.token with
-    | Uident _ | Lident _ ->
-      let lid, pat = parseRecordPatternRowField ~attrs p in
-      Some (false, PatField (lid, makePatternOptional ~optional:true pat))
-    | _ -> None)
-  | Underscore ->
-    Parser.next p;
-    Some (false, PatUnderscore)
-  | _ -> None
-
-and parseRecordPattern ~attrs p =
-  let startPos = p.startPos in
-  Parser.expect Lbrace p;
-  let rawFields =
-    parseCommaDelimitedReversedList p ~grammar:PatternRecord ~closing:Rbrace
-      ~f:parseRecordPatternRow
-  in
-  Parser.expect Rbrace p;
-  let fields, closedFlag =
-    let rawFields, flag =
-      match rawFields with
-      | (_hasSpread, PatUnderscore) :: rest -> (rest, Asttypes.Open)
-      | rawFields -> (rawFields, Asttypes.Closed)
-    in
-    List.fold_left
-      (fun (fields, flag) curr ->
-        let hasSpread, field = curr in
-        match field with
-        | PatField field ->
-          (if hasSpread then
-             let _, pattern = field in
-             Parser.err ~startPos:pattern.Parsetree.ppat_loc.loc_start p
-               (Diagnostics.message ErrorMessages.recordPatternSpread));
-          (field :: fields, flag)
-        | PatUnderscore -> (fields, flag))
-      ([], flag) rawFields
-  in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Pat.record ~loc ~attrs fields closedFlag
-
-and parseTuplePattern ~attrs ~first ~startPos p =
-  let patterns =
-    first
-    :: parseCommaDelimitedRegion p ~grammar:Grammar.PatternList ~closing:Rparen
-         ~f:parseConstrainedPatternRegion
-  in
-  Parser.expect Rparen p;
-  let () =
-    match patterns with
-    | [_] ->
-      Parser.err ~startPos ~endPos:p.prevEndPos p
-        (Diagnostics.message ErrorMessages.tupleSingleElement)
-    | _ -> ()
-  in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Pat.tuple ~loc ~attrs patterns
-
-and parsePatternRegion p =
-  match p.Parser.token with
-  | DotDotDot ->
-    Parser.next p;
-    Some (true, parseConstrainedPattern p)
-  | token when Grammar.isPatternStart token ->
-    Some (false, parseConstrainedPattern p)
-  | _ -> None
-
-and parseModulePattern ~attrs p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Module p;
-  Parser.expect Lparen p;
-  let uident =
-    match p.token with
-    | Uident uident ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc uident loc
-    | _ ->
-      (* TODO: error recovery *)
-      Location.mknoloc "_"
-  in
-  match p.token with
-  | Colon ->
-    let colonStart = p.Parser.startPos in
-    Parser.next p;
-    let packageTypAttrs = parseAttributes p in
-    let packageType =
-      parsePackageType ~startPos:colonStart ~attrs:packageTypAttrs p
-    in
-    Parser.expect Rparen p;
-    let loc = mkLoc startPos p.prevEndPos in
-    let unpack = Ast_helper.Pat.unpack ~loc:uident.loc uident in
-    Ast_helper.Pat.constraint_ ~loc ~attrs unpack packageType
-  | _ ->
-    Parser.expect Rparen p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Pat.unpack ~loc ~attrs uident
-
-and parseListPattern ~startPos ~attrs p =
-  let listPatterns =
-    parseCommaDelimitedReversedList p ~grammar:Grammar.PatternOcamlList
-      ~closing:Rbrace ~f:parsePatternRegion
-  in
-  Parser.expect Rbrace p;
-  let loc = mkLoc startPos p.prevEndPos in
-  let filterSpread (hasSpread, pattern) =
-    if hasSpread then (
-      Parser.err ~startPos:pattern.Parsetree.ppat_loc.loc_start p
-        (Diagnostics.message ErrorMessages.listPatternSpread);
-      pattern)
-    else pattern
-  in
-  match listPatterns with
-  | (true, pattern) :: patterns ->
-    let patterns = patterns |> List.map filterSpread |> List.rev in
-    let pat = makeListPattern loc patterns (Some pattern) in
-    {pat with ppat_loc = loc; ppat_attributes = attrs}
-  | patterns ->
-    let patterns = patterns |> List.map filterSpread |> List.rev in
-    let pat = makeListPattern loc patterns None in
-    {pat with ppat_loc = loc; ppat_attributes = attrs}
-
-and parseArrayPattern ~attrs p =
-  let startPos = p.startPos in
-  Parser.expect Lbracket p;
-  let patterns =
-    parseCommaDelimitedRegion p ~grammar:Grammar.PatternList ~closing:Rbracket
-      ~f:(parseNonSpreadPattern ~msg:ErrorMessages.arrayPatternSpread)
-  in
-  Parser.expect Rbracket p;
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Pat.array ~loc ~attrs patterns
-
-and parseConstructorPatternArgs p constr startPos attrs =
-  let lparen = p.startPos in
-  Parser.expect Lparen p;
-  let args =
-    parseCommaDelimitedRegion p ~grammar:Grammar.PatternList ~closing:Rparen
-      ~f:parseConstrainedPatternRegion
-  in
-  Parser.expect Rparen p;
-  let args =
-    match args with
-    | [] ->
-      let loc = mkLoc lparen p.prevEndPos in
-      Some
-        (Ast_helper.Pat.construct ~loc
-           (Location.mkloc (Longident.Lident "()") loc)
-           None)
-    | [({ppat_desc = Ppat_tuple _} as pat)] as patterns ->
-      if p.mode = ParseForTypeChecker then
-        (* Some(1, 2) for type-checker *)
-        Some pat
-      else
-        (* Some((1, 2)) for printer *)
-        Some (Ast_helper.Pat.tuple ~loc:(mkLoc lparen p.endPos) patterns)
-    | [pattern] -> Some pattern
-    | patterns ->
-      Some (Ast_helper.Pat.tuple ~loc:(mkLoc lparen p.endPos) patterns)
-  in
-  Ast_helper.Pat.construct ~loc:(mkLoc startPos p.prevEndPos) ~attrs constr args
-
-and parseVariantPatternArgs p ident startPos attrs =
-  let lparen = p.startPos in
-  Parser.expect Lparen p;
-  let patterns =
-    parseCommaDelimitedRegion p ~grammar:Grammar.PatternList ~closing:Rparen
-      ~f:parseConstrainedPatternRegion
-  in
-  let args =
-    match patterns with
-    | [] ->
-      let loc = mkLoc lparen p.prevEndPos in
-      Some
-        (Ast_helper.Pat.construct ~loc
-           (Location.mkloc (Longident.Lident "()") loc)
-           None)
-    | [({ppat_desc = Ppat_tuple _} as pat)] as patterns ->
-      if p.mode = ParseForTypeChecker then
-        (* #ident(1, 2) for type-checker *)
-        Some pat
-      else
-        (* #ident((1, 2)) for printer *)
-        Some (Ast_helper.Pat.tuple ~loc:(mkLoc lparen p.endPos) patterns)
-    | [pattern] -> Some pattern
-    | patterns ->
-      Some (Ast_helper.Pat.tuple ~loc:(mkLoc lparen p.endPos) patterns)
-  in
-  Parser.expect Rparen p;
-  Ast_helper.Pat.variant ~loc:(mkLoc startPos p.prevEndPos) ~attrs ident args
-
-and parseExpr ?(context = OrdinaryExpr) p =
-  let expr = parseOperandExpr ~context p in
-  let expr = parseBinaryExpr ~context ~a:expr p 1 in
-  parseTernaryExpr expr p
-
-(* expr ? expr : expr *)
-and parseTernaryExpr leftOperand p =
-  match p.Parser.token with
-  | Question ->
-    Parser.leaveBreadcrumb p Grammar.Ternary;
-    Parser.next p;
-    let trueBranch = parseExpr ~context:TernaryTrueBranchExpr p in
-    Parser.expect Colon p;
-    let falseBranch = parseExpr p in
-    Parser.eatBreadcrumb p;
-    let loc =
-      {
-        leftOperand.Parsetree.pexp_loc with
-        loc_start = leftOperand.pexp_loc.loc_start;
-        loc_end = falseBranch.Parsetree.pexp_loc.loc_end;
-      }
-    in
-    Ast_helper.Exp.ifthenelse ~attrs:[ternaryAttr] ~loc leftOperand trueBranch
-      (Some falseBranch)
-  | _ -> leftOperand
-
-and parseEs6ArrowExpression ?(arrowAttrs = []) ?(arrowStartPos = None) ?context
-    ?parameters p =
-  let startPos = p.Parser.startPos in
-  Parser.leaveBreadcrumb p Grammar.Es6ArrowExpr;
-  (* Parsing function parameters and attributes:
-     1. Basically, attributes outside of `(...)` are added to the function, except
-     the uncurried attribute `(.)` is added to the function. e.g. async, uncurried
-
-     2. Attributes inside `(...)` are added to the arguments regardless of whether
-     labeled, optional or nolabeled *)
-  let parameters =
-    match parameters with
-    | Some params -> params
-    | None -> parseParameters p
-  in
-  let parameters =
-    let updateAttrs attrs = arrowAttrs @ attrs in
-    let updatePos pos =
-      match arrowStartPos with
-      | Some startPos -> startPos
-      | None -> pos
-    in
-    match parameters with
-    | TermParameter p :: rest ->
-      TermParameter {p with attrs = updateAttrs p.attrs; pos = updatePos p.pos}
-      :: rest
-    | TypeParameter p :: rest ->
-      TypeParameter {p with attrs = updateAttrs p.attrs; pos = updatePos p.pos}
-      :: rest
-    | [] -> parameters
-  in
-  let parameters =
-    (* Propagate any dots from type parameters to the first term *)
-    let rec loop ~dotInType params =
-      match params with
-      | (TypeParameter {dotted} as p) :: _ ->
-        let rest = LoopProgress.listRest params in
-        (* Tell termination checker about progress *)
-        p :: loop ~dotInType:(dotInType || dotted) rest
-      | TermParameter termParam :: rest ->
-        TermParameter {termParam with dotted = dotInType || termParam.dotted}
-        :: rest
-      | [] -> []
-    in
-    loop ~dotInType:false parameters
-  in
-  let returnType =
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      Some (parseTypExpr ~es6Arrow:false p)
-    | _ -> None
-  in
-  Parser.expect EqualGreater p;
-  let body =
-    let expr = parseExpr ?context p in
-    match returnType with
-    | Some typ ->
-      Ast_helper.Exp.constraint_
-        ~loc:(mkLoc expr.pexp_loc.loc_start typ.Parsetree.ptyp_loc.loc_end)
-        expr typ
-    | None -> expr
-  in
-  Parser.eatBreadcrumb p;
-  let endPos = p.prevEndPos in
-  let termParameters =
-    parameters
-    |> List.filter (function
-         | TermParameter _ -> true
-         | TypeParameter _ -> false)
-  in
-  let bodyNeedsBraces =
-    let isFun =
-      match body.pexp_desc with
-      | Pexp_fun _ -> true
-      | _ -> false
-    in
-    match termParameters with
-    | TermParameter {dotted} :: _
-      when p.uncurried_config |> Res_uncurried.fromDotted ~dotted && isFun ->
-      true
-    | TermParameter _ :: rest when p.uncurried_config = Legacy && isFun ->
-      rest
-      |> List.exists (function
-           | TermParameter {dotted} -> dotted
-           | _ -> false)
-    | _ -> false
-  in
-  let body =
-    if bodyNeedsBraces then
-      {
-        body with
-        pexp_attributes = makeBracesAttr body.pexp_loc :: body.pexp_attributes;
-      }
-    else body
-  in
-  let _paramNum, arrowExpr, _arity =
-    List.fold_right
-      (fun parameter (termParamNum, expr, arity) ->
-        match parameter with
-        | TermParameter
-            {
-              dotted;
-              attrs;
-              label = lbl;
-              expr = defaultExpr;
-              pat;
-              pos = startPos;
-            } ->
-          let loc = mkLoc startPos endPos in
-          let funExpr =
-            Ast_helper.Exp.fun_ ~loc ~attrs lbl defaultExpr pat expr
-          in
-          let uncurried =
-            p.uncurried_config |> Res_uncurried.fromDotted ~dotted
-          in
-          if uncurried && (termParamNum = 1 || p.uncurried_config = Legacy) then
-            (termParamNum - 1, Ast_uncurried.uncurriedFun ~loc ~arity funExpr, 1)
-          else (termParamNum - 1, funExpr, arity + 1)
-        | TypeParameter {dotted = _; attrs; locs = newtypes; pos = startPos} ->
-          ( termParamNum,
-            makeNewtypes ~attrs ~loc:(mkLoc startPos endPos) newtypes expr,
-            arity ))
-      parameters
-      (List.length termParameters, body, 1)
-  in
-  {arrowExpr with pexp_loc = {arrowExpr.pexp_loc with loc_start = startPos}}
-
-(*
- * dotted_parameter ::=
- *   | . parameter
- *
- * parameter ::=
- *   | pattern
- *   | pattern : type
- *   | ~ labelName
- *   | ~ labelName as pattern
- *   | ~ labelName as pattern : type
- *   | ~ labelName = expr
- *   | ~ labelName as pattern = expr
- *   | ~ labelName as pattern : type = expr
- *   | ~ labelName = ?
- *   | ~ labelName as pattern = ?
- *   | ~ labelName as pattern : type = ?
- *
- * labelName ::= lident
- *)
-and parseParameter p =
-  if
-    p.Parser.token = Token.Typ || p.token = Tilde || p.token = Dot
-    || Grammar.isPatternStart p.token
-  then
-    let startPos = p.Parser.startPos in
-    let dotted = Parser.optional p Token.Dot in
-    let attrs = parseAttributes p in
-    if p.Parser.token = Typ then (
-      Parser.next p;
-      let lidents = parseLidentList p in
-      Some (TypeParameter {dotted; attrs; locs = lidents; pos = startPos}))
-    else
-      let attrs, lbl, pat =
-        match p.Parser.token with
-        | Tilde -> (
-          Parser.next p;
-          let lblName, loc = parseLident p in
-          let propLocAttr =
-            (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr [])
-          in
-          match p.Parser.token with
-          | Comma | Equal | Rparen ->
-            let loc = mkLoc startPos p.prevEndPos in
-            ( [],
-              Asttypes.Labelled lblName,
-              Ast_helper.Pat.var ~attrs:(propLocAttr :: attrs) ~loc
-                (Location.mkloc lblName loc) )
-          | Colon ->
-            let lblEnd = p.prevEndPos in
-            Parser.next p;
-            let typ = parseTypExpr p in
-            let loc = mkLoc startPos lblEnd in
-            let pat =
-              let pat = Ast_helper.Pat.var ~loc (Location.mkloc lblName loc) in
-              let loc = mkLoc startPos p.prevEndPos in
-              Ast_helper.Pat.constraint_ ~attrs:(propLocAttr :: attrs) ~loc pat
-                typ
-            in
-            ([], Asttypes.Labelled lblName, pat)
-          | As ->
-            Parser.next p;
-            let pat =
-              let pat = parseConstrainedPattern p in
-              {
-                pat with
-                ppat_attributes = (propLocAttr :: attrs) @ pat.ppat_attributes;
-              }
-            in
-            ([], Asttypes.Labelled lblName, pat)
-          | t ->
-            Parser.err p (Diagnostics.unexpected t p.breadcrumbs);
-            let loc = mkLoc startPos p.prevEndPos in
-            ( [],
-              Asttypes.Labelled lblName,
-              Ast_helper.Pat.var ~attrs:(propLocAttr :: attrs) ~loc
-                (Location.mkloc lblName loc) ))
-        | _ ->
-          let pattern = parseConstrainedPattern p in
-          let attrs = List.concat [pattern.ppat_attributes; attrs] in
-          ([], Asttypes.Nolabel, {pattern with ppat_attributes = attrs})
-      in
-      match p.Parser.token with
-      | Equal -> (
-        Parser.next p;
-        let lbl =
-          match lbl with
-          | Asttypes.Labelled lblName -> Asttypes.Optional lblName
-          | Asttypes.Nolabel ->
-            let lblName =
-              match pat.ppat_desc with
-              | Ppat_var var -> var.txt
-              | _ -> ""
-            in
-            Parser.err ~startPos ~endPos:p.prevEndPos p
-              (Diagnostics.message
-                 (ErrorMessages.missingTildeLabeledParameter lblName));
-            Asttypes.Optional lblName
-          | lbl -> lbl
-        in
-        match p.Parser.token with
-        | Question ->
-          Parser.next p;
-          Some
-            (TermParameter
-               {dotted; attrs; label = lbl; expr = None; pat; pos = startPos})
-        | _ ->
-          let expr = parseConstrainedOrCoercedExpr p in
-          Some
-            (TermParameter
-               {
-                 dotted;
-                 attrs;
-                 label = lbl;
-                 expr = Some expr;
-                 pat;
-                 pos = startPos;
-               }))
-      | _ ->
-        Some
-          (TermParameter
-             {dotted; attrs; label = lbl; expr = None; pat; pos = startPos})
-  else None
-
-and parseParameterList p =
-  let parameters =
-    parseCommaDelimitedRegion ~grammar:Grammar.ParameterList ~f:parseParameter
-      ~closing:Rparen p
-  in
-  Parser.expect Rparen p;
-  parameters
-
-(* parameters ::=
- *   | _
- *   | lident
- *   | ()
- *   | (.)
- *   | ( parameter {, parameter} [,] )
- *)
-and parseParameters p =
-  let startPos = p.Parser.startPos in
-  match p.Parser.token with
-  | Lident ident ->
-    Parser.next p;
-    let loc = mkLoc startPos p.Parser.prevEndPos in
-    [
-      TermParameter
-        {
-          dotted = false;
-          attrs = [];
-          label = Asttypes.Nolabel;
-          expr = None;
-          pat = Ast_helper.Pat.var ~loc (Location.mkloc ident loc);
-          pos = startPos;
-        };
-    ]
-  | Underscore ->
-    Parser.next p;
-    let loc = mkLoc startPos p.Parser.prevEndPos in
-    [
-      TermParameter
-        {
-          dotted = false;
-          attrs = [];
-          label = Asttypes.Nolabel;
-          expr = None;
-          pat = Ast_helper.Pat.any ~loc ();
-          pos = startPos;
-        };
-    ]
-  | Lparen -> (
-    Parser.next p;
-    match p.Parser.token with
-    | Rparen ->
-      Parser.next p;
-      let loc = mkLoc startPos p.Parser.prevEndPos in
-      let unitPattern =
-        Ast_helper.Pat.construct ~loc
-          (Location.mkloc (Longident.Lident "()") loc)
-          None
-      in
-      [
-        TermParameter
-          {
-            dotted = false;
-            attrs = [];
-            label = Asttypes.Nolabel;
-            expr = None;
-            pat = unitPattern;
-            pos = startPos;
-          };
-      ]
-    | Dot -> (
-      Parser.next p;
-      match p.token with
-      | Rparen ->
-        Parser.next p;
-        let loc = mkLoc startPos p.Parser.prevEndPos in
-        let unitPattern =
-          Ast_helper.Pat.construct ~loc
-            (Location.mkloc (Longident.Lident "()") loc)
-            None
-        in
-        [
-          TermParameter
-            {
-              dotted = true;
-              attrs = [];
-              label = Asttypes.Nolabel;
-              expr = None;
-              pat = unitPattern;
-              pos = startPos;
-            };
-        ]
-      | _ -> (
-        match parseParameterList p with
-        | TermParameter p :: rest ->
-          TermParameter {p with dotted = true; pos = startPos} :: rest
-        | TypeParameter p :: rest ->
-          TypeParameter {p with dotted = true; pos = startPos} :: rest
-        | parameters -> parameters))
-    | _ -> parseParameterList p)
-  | token ->
-    Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-    []
-
-and parseCoercedExpr ~(expr : Parsetree.expression) p =
-  Parser.expect ColonGreaterThan p;
-  let typ = parseTypExpr p in
-  let loc = mkLoc expr.pexp_loc.loc_start p.prevEndPos in
-  Ast_helper.Exp.coerce ~loc expr None typ
-
-and parseConstrainedOrCoercedExpr p =
-  let expr = parseExpr p in
-  match p.Parser.token with
-  | ColonGreaterThan -> parseCoercedExpr ~expr p
-  | Colon -> (
-    Parser.next p;
-    match p.token with
-    | _ -> (
-      let typ = parseTypExpr p in
-      let loc = mkLoc expr.pexp_loc.loc_start typ.ptyp_loc.loc_end in
-      let expr = Ast_helper.Exp.constraint_ ~loc expr typ in
-      match p.token with
-      | ColonGreaterThan -> parseCoercedExpr ~expr p
-      | _ -> expr))
-  | _ -> expr
-
-and parseConstrainedExprRegion p =
-  match p.Parser.token with
-  | token when Grammar.isExprStart token -> (
-    let expr = parseExpr p in
-    match p.Parser.token with
-    | ColonGreaterThan -> Some (parseCoercedExpr ~expr p)
-    | Colon ->
-      Parser.next p;
-      let typ = parseTypExpr p in
-      let loc = mkLoc expr.pexp_loc.loc_start typ.ptyp_loc.loc_end in
-      Some (Ast_helper.Exp.constraint_ ~loc expr typ)
-    | _ -> Some expr)
-  | _ -> None
-
-(* Atomic expressions represent unambiguous expressions.
- * This means that regardless of the context, these expressions
- * are always interpreted correctly. *)
-and parseAtomicExpr p =
-  Parser.leaveBreadcrumb p Grammar.ExprOperand;
-  let startPos = p.Parser.startPos in
-  let expr =
-    match p.Parser.token with
-    | (True | False) as token ->
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.construct ~loc
-        (Location.mkloc (Longident.Lident (Token.toString token)) loc)
-        None
-    | Int _ | String _ | Float _ | Codepoint _ ->
-      let c = parseConstant p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.constant ~loc c
-    | Backtick ->
-      let expr = parseTemplateExpr p in
-      {expr with pexp_loc = mkLoc startPos p.prevEndPos}
-    | Uident _ | Lident _ -> parseValueOrConstructor p
-    | Hash -> parsePolyVariantExpr p
-    | Lparen -> (
-      Parser.next p;
-      match p.Parser.token with
-      | Rparen ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Exp.construct ~loc
-          (Location.mkloc (Longident.Lident "()") loc)
-          None
-      | _t -> (
-        let expr = parseConstrainedOrCoercedExpr p in
-        match p.token with
-        | Comma ->
-          Parser.next p;
-          parseTupleExpr ~startPos ~first:expr p
-        | _ ->
-          Parser.expect Rparen p;
-          expr
-        (* {expr with pexp_loc = mkLoc startPos p.prevEndPos}
-         * What does this location mean here? It means that when there's
-         * a parenthesized we keep the location here for whitespace interleaving.
-         * Without the closing paren in the location there will always be an extra
-         * line. For now we don't include it, because it does weird things
-         * with for comments. *)))
-    | List ->
-      Parser.next p;
-      parseListExpr ~startPos p
-    | Module ->
-      Parser.next p;
-      parseFirstClassModuleExpr ~startPos p
-    | Lbracket -> parseArrayExp p
-    | Lbrace -> parseBracedOrRecordExpr p
-    | LessThan -> parseJsx p
-    | Percent ->
-      let extension = parseExtension p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.extension ~loc extension
-    | Underscore as token ->
-      (* This case is for error recovery. Not sure if it's the correct place *)
-      Parser.err p (Diagnostics.lident token);
-      Parser.next p;
-      Recover.defaultExpr ()
-    | Eof ->
-      Parser.err ~startPos:p.prevEndPos p
-        (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
-      Recover.defaultExpr ()
-    | token -> (
-      let errPos = p.prevEndPos in
-      Parser.err ~startPos:errPos p (Diagnostics.unexpected token p.breadcrumbs);
-      match
-        skipTokensAndMaybeRetry p ~isStartOfGrammar:Grammar.isAtomicExprStart
-      with
-      | None -> Recover.defaultExpr ()
-      | Some () -> parseAtomicExpr p)
-  in
-  Parser.eatBreadcrumb p;
-  expr
-
-(* module(module-expr)
- * module(module-expr : package-type) *)
-and parseFirstClassModuleExpr ~startPos p =
-  Parser.expect Lparen p;
-
-  let modExpr = parseModuleExpr p in
-  let modEndLoc = p.prevEndPos in
-  match p.Parser.token with
-  | Colon ->
-    let colonStart = p.Parser.startPos in
-    Parser.next p;
-    let attrs = parseAttributes p in
-    let packageType = parsePackageType ~startPos:colonStart ~attrs p in
-    Parser.expect Rparen p;
-    let loc = mkLoc startPos modEndLoc in
-    let firstClassModule = Ast_helper.Exp.pack ~loc modExpr in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.constraint_ ~loc firstClassModule packageType
-  | _ ->
-    Parser.expect Rparen p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.pack ~loc modExpr
-
-and parseBracketAccess p expr startPos =
-  Parser.leaveBreadcrumb p Grammar.ExprArrayAccess;
-  let lbracket = p.startPos in
-  Parser.expect Lbracket p;
-  let stringStart = p.startPos in
-  match p.Parser.token with
-  | String s -> (
-    Parser.next p;
-    let stringEnd = p.prevEndPos in
-    Parser.expect Rbracket p;
-    Parser.eatBreadcrumb p;
-    let rbracket = p.prevEndPos in
-    let e =
-      let identLoc = mkLoc stringStart stringEnd in
-      let loc = mkLoc startPos rbracket in
-      Ast_helper.Exp.send ~loc expr (Location.mkloc s identLoc)
-    in
-    let e = parsePrimaryExpr ~operand:e p in
-    let equalStart = p.startPos in
-    match p.token with
-    | Equal ->
-      Parser.next p;
-      let equalEnd = p.prevEndPos in
-      let rhsExpr = parseExpr p in
-      let loc = mkLoc startPos rhsExpr.pexp_loc.loc_end in
-      let operatorLoc = mkLoc equalStart equalEnd in
-      Ast_helper.Exp.apply ~loc
-        (Ast_helper.Exp.ident ~loc:operatorLoc
-           (Location.mkloc (Longident.Lident "#=") operatorLoc))
-        [(Nolabel, e); (Nolabel, rhsExpr)]
-    | _ -> e)
-  | _ -> (
-    let accessExpr = parseConstrainedOrCoercedExpr p in
-    Parser.expect Rbracket p;
-    Parser.eatBreadcrumb p;
-    let rbracket = p.prevEndPos in
-    let arrayLoc = mkLoc lbracket rbracket in
-    match p.token with
-    | Equal ->
-      Parser.leaveBreadcrumb p ExprArrayMutation;
-      Parser.next p;
-      let rhsExpr = parseExpr p in
-      let arraySet =
-        Location.mkloc (Longident.Ldot (Lident "Array", "set")) arrayLoc
-      in
-      let endPos = p.prevEndPos in
-      let arraySet =
-        Ast_helper.Exp.apply ~loc:(mkLoc startPos endPos)
-          (Ast_helper.Exp.ident ~loc:arrayLoc arraySet)
-          [(Nolabel, expr); (Nolabel, accessExpr); (Nolabel, rhsExpr)]
-      in
-      Parser.eatBreadcrumb p;
-      arraySet
-    | _ ->
-      let endPos = p.prevEndPos in
-      let e =
-        Ast_helper.Exp.apply ~loc:(mkLoc startPos endPos)
-          (Ast_helper.Exp.ident ~loc:arrayLoc
-             (Location.mkloc (Longident.Ldot (Lident "Array", "get")) arrayLoc))
-          [(Nolabel, expr); (Nolabel, accessExpr)]
-      in
-      parsePrimaryExpr ~operand:e p)
-
-(* * A primary expression represents
- *  - atomic-expr
- *  - john.age
- *  - array[0]
- *  - applyFunctionTo(arg1, arg2)
- *
- *  The "operand" represents the expression that is operated on
- *)
-and parsePrimaryExpr ~operand ?(noCall = false) p =
-  let startPos = operand.pexp_loc.loc_start in
-  let rec loop p expr =
-    match p.Parser.token with
-    | Dot -> (
-      Parser.next p;
-      let lident = parseValuePathAfterDot p in
-      match p.Parser.token with
-      | Equal when noCall = false ->
-        Parser.leaveBreadcrumb p Grammar.ExprSetField;
-        Parser.next p;
-        let targetExpr = parseExpr p in
-        let loc = mkLoc startPos p.prevEndPos in
-        let setfield = Ast_helper.Exp.setfield ~loc expr lident targetExpr in
-        Parser.eatBreadcrumb p;
-        setfield
-      | _ ->
-        let endPos = p.prevEndPos in
-        let loc = mkLoc startPos endPos in
-        loop p (Ast_helper.Exp.field ~loc expr lident))
-    | Lbracket
-      when noCall = false && p.prevEndPos.pos_lnum == p.startPos.pos_lnum ->
-      parseBracketAccess p expr startPos
-    | Lparen when noCall = false && p.prevEndPos.pos_lnum == p.startPos.pos_lnum
-      ->
-      loop p (parseCallExpr p expr)
-    | Backtick
-      when noCall = false && p.prevEndPos.pos_lnum == p.startPos.pos_lnum -> (
-      match expr.pexp_desc with
-      | Pexp_ident long_ident -> parseTemplateExpr ~prefix:long_ident p
-      | _ ->
-        Parser.err ~startPos:expr.pexp_loc.loc_start
-          ~endPos:expr.pexp_loc.loc_end p
-          (Diagnostics.message
-             "Tagged template literals are currently restricted to names like: \
-              json`null`.");
-        parseTemplateExpr p)
-    | _ -> expr
-  in
-  loop p operand
-
-(* a unary expression is an expression with only one operand and
- * unary operator. Examples:
- *   -1
- *   !condition
- *   -. 1.6
- *)
-and parseUnaryExpr p =
-  let startPos = p.Parser.startPos in
-  match p.Parser.token with
-  | (Minus | MinusDot | Plus | PlusDot | Bang) as token ->
-    Parser.leaveBreadcrumb p Grammar.ExprUnary;
-    let tokenEnd = p.endPos in
-    Parser.next p;
-    let operand = parseUnaryExpr p in
-    let unaryExpr = makeUnaryExpr startPos tokenEnd token operand in
-    Parser.eatBreadcrumb p;
-    unaryExpr
-  | _ -> parsePrimaryExpr ~operand:(parseAtomicExpr p) p
-
-(* Represents an "operand" in a binary expression.
- * If you have `a + b`, `a` and `b` both represent
- * the operands of the binary expression with opeartor `+` *)
-and parseOperandExpr ~context p =
-  let startPos = p.Parser.startPos in
-  let attrs = ref (parseAttributes p) in
-  let expr =
-    match p.Parser.token with
-    | Assert ->
-      Parser.next p;
-      let expr = parseExpr p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.assert_ ~loc expr
-    | Lident "async"
-    (* we need to be careful when we're in a ternary true branch:
-       `condition ? ternary-true-branch : false-branch`
-       Arrow expressions could be of the form: `async (): int => stuff()`
-       But if we're in a ternary, the `:` of the ternary takes precedence
-    *)
-      when isEs6ArrowExpression ~inTernary:(context = TernaryTrueBranchExpr) p
-      ->
-      let arrowAttrs = !attrs in
-      let () = attrs := [] in
-      parseAsyncArrowExpression ~arrowAttrs p
-    | Await -> parseAwaitExpression p
-    | Lazy ->
-      Parser.next p;
-      let expr = parseUnaryExpr p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.lazy_ ~loc expr
-    | Try -> parseTryExpression p
-    | If -> parseIfOrIfLetExpression p
-    | For -> parseForExpression p
-    | While -> parseWhileExpression p
-    | Switch -> parseSwitchExpression p
-    | _ ->
-      if
-        context != WhenExpr
-        && isEs6ArrowExpression ~inTernary:(context = TernaryTrueBranchExpr) p
-      then
-        let arrowAttrs = !attrs in
-        let () = attrs := [] in
-        parseEs6ArrowExpression ~arrowAttrs ~context p
-      else parseUnaryExpr p
-  in
-  (* let endPos = p.Parser.prevEndPos in *)
-  {
-    expr with
-    pexp_attributes = List.concat [expr.Parsetree.pexp_attributes; !attrs];
-    (* pexp_loc = mkLoc startPos endPos *)
-  }
-
-(* a binary expression is an expression that combines two expressions with an
- * operator. Examples:
- *    a + b
- *    f(x) |> g(y)
- *)
-and parseBinaryExpr ?(context = OrdinaryExpr) ?a p prec =
-  let a =
-    match a with
-    | Some e -> e
-    | None -> parseOperandExpr ~context p
-  in
-  let rec loop a =
-    let token = p.Parser.token in
-    let tokenPrec =
-      match token with
-      (* Can the minus be interpreted as a binary operator? Or is it a unary?
-       * let w = {
-       *   x
-       *   -10
-       * }
-       * vs
-       * let w = {
-       *   width
-       *   - gap
-       * }
-       *
-       * First case is unary, second is a binary operator.
-       * See Scanner.isBinaryOp *)
-      | (Minus | MinusDot | LessThan)
-        when (not
-                (Scanner.isBinaryOp p.scanner.src p.startPos.pos_cnum
-                   p.endPos.pos_cnum))
-             && p.startPos.pos_lnum > p.prevEndPos.pos_lnum ->
-        -1
-      | token -> Token.precedence token
-    in
-    if tokenPrec < prec then a
-    else (
-      Parser.leaveBreadcrumb p (Grammar.ExprBinaryAfterOp token);
-      let startPos = p.startPos in
-      Parser.next p;
-      let endPos = p.prevEndPos in
-      let tokenPrec =
-        (* exponentiation operator is right-associative *)
-        if token = Exponentiation then tokenPrec else tokenPrec + 1
-      in
-      let b = parseBinaryExpr ~context p tokenPrec in
-      let loc = mkLoc a.Parsetree.pexp_loc.loc_start b.pexp_loc.loc_end in
-      let expr =
-        match (token, b.pexp_desc) with
-        | BarGreater, Pexp_apply (funExpr, args)
-          when p.uncurried_config = Uncurried ->
-          {b with pexp_desc = Pexp_apply (funExpr, args @ [(Nolabel, a)])}
-        | BarGreater, _ when p.uncurried_config = Uncurried ->
-          Ast_helper.Exp.apply ~loc b [(Nolabel, a)]
-        | _ ->
-          Ast_helper.Exp.apply ~loc
-            (makeInfixOperator p token startPos endPos)
-            [(Nolabel, a); (Nolabel, b)]
-      in
-      Parser.eatBreadcrumb p;
-      loop expr)
-  in
-  loop a
-
-(* If we even need this, determines if < might be the start of jsx. Not 100% complete *)
-(* and isStartOfJsx p = *)
-(* Parser.lookahead p (fun p -> *)
-(* match p.Parser.token with *)
-(* | LessThan -> *)
-(* Parser.next p; *)
-(* begin match p.token with *)
-(* | GreaterThan (* <> *) -> true *)
-(* | Lident _ | Uident _ | List -> *)
-(* ignore (parseJsxName p); *)
-(* begin match p.token with *)
-(* | GreaterThan (* <div> *) -> true *)
-(* | Question (*<Component ? *) -> true *)
-(* | Lident _ | List -> *)
-(* Parser.next p; *)
-(* begin match p.token with *)
-(* | Equal (* <Component handleClick= *) -> true *)
-(* | _ -> false (* TODO *) *)
-(* end *)
-(* | Forwardslash (* <Component / *)-> *)
-(* Parser.next p; *)
-(* begin match p.token with *)
-(* | GreaterThan (* <Component /> *) -> true *)
-(* | _ -> false *)
-(* end *)
-(* | _ -> *)
-(* false *)
-(* end *)
-(* | _ -> false *)
-(* end *)
-(* | _ -> false *)
-(* ) *)
-
-and parseTemplateExpr ?prefix p =
-  let partPrefix =
-    (* we could stop treating js and j prefix as something special
-       for json, we would first need to remove @as(json`true`) feature *)
-    match prefix with
-    | Some {txt = Longident.Lident (("js" | "j" | "json") as prefix); _} ->
-      Some prefix
-    | _ -> Some "js"
-  in
-
-  let parseParts p =
-    let rec aux acc =
-      let startPos = p.Parser.startPos in
-      Parser.nextTemplateLiteralToken p;
-      match p.token with
-      | TemplateTail (txt, lastPos) ->
-        Parser.next p;
-        let loc = mkLoc startPos lastPos in
-        let str =
-          Ast_helper.Exp.constant ~attrs:[templateLiteralAttr] ~loc
-            (Pconst_string (txt, partPrefix))
-        in
-        List.rev ((str, None) :: acc)
-      | TemplatePart (txt, lastPos) ->
-        Parser.next p;
-        let loc = mkLoc startPos lastPos in
-        let expr = parseExprBlock p in
-        let str =
-          Ast_helper.Exp.constant ~attrs:[templateLiteralAttr] ~loc
-            (Pconst_string (txt, partPrefix))
-        in
-        aux ((str, Some expr) :: acc)
-      | token ->
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        []
-    in
-    aux []
-  in
-  let parts = parseParts p in
-  let strings = List.map fst parts in
-  let values = Ext_list.filter_map parts snd in
-
-  let genTaggedTemplateCall (lident_loc : Longident.t Location.loc) =
-    let ident = Ast_helper.Exp.ident ~attrs:[] ~loc:lident_loc.loc lident_loc in
-    let strings_array =
-      Ast_helper.Exp.array ~attrs:[] ~loc:Location.none strings
-    in
-    let values_array =
-      Ast_helper.Exp.array ~attrs:[] ~loc:Location.none values
-    in
-    Ast_helper.Exp.apply
-      ~attrs:[taggedTemplateLiteralAttr]
-      ~loc:lident_loc.loc ident
-      [(Nolabel, strings_array); (Nolabel, values_array)]
-  in
-
-  let hiddenOperator =
-    let op = Location.mknoloc (Longident.Lident "^") in
-    Ast_helper.Exp.ident op
-  in
-  let concat (e1 : Parsetree.expression) (e2 : Parsetree.expression) =
-    let loc = mkLoc e1.pexp_loc.loc_start e2.pexp_loc.loc_end in
-    Ast_helper.Exp.apply ~attrs:[templateLiteralAttr] ~loc hiddenOperator
-      [(Nolabel, e1); (Nolabel, e2)]
-  in
-  let genInterpolatedString () =
-    let subparts =
-      List.flatten
-        (List.map
-           (fun part ->
-             match part with
-             | s, Some v -> [s; v]
-             | s, None -> [s])
-           parts)
-    in
-    let exprOption =
-      List.fold_left
-        (fun acc subpart ->
-          Some
-            (match acc with
-            | Some expr -> concat expr subpart
-            | None -> subpart))
-        None subparts
-    in
-    match exprOption with
-    | Some expr -> expr
-    | None -> Ast_helper.Exp.constant (Pconst_string ("", None))
-  in
-
-  match prefix with
-  | Some {txt = Longident.Lident ("js" | "j" | "json"); _} | None ->
-    genInterpolatedString ()
-  | Some lident_loc -> genTaggedTemplateCall lident_loc
-
-(* Overparse: let f = a : int => a + 1, is it (a : int) => or (a): int =>
- * Also overparse constraints:
- *  let x = {
- *    let a = 1
- *    a + pi: int
- *  }
- *
- *  We want to give a nice error message in these cases
- * *)
-and overParseConstrainedOrCoercedOrArrowExpression p expr =
-  match p.Parser.token with
-  | ColonGreaterThan -> parseCoercedExpr ~expr p
-  | Colon -> (
-    Parser.next p;
-    let typ = parseTypExpr ~es6Arrow:false p in
-    match p.Parser.token with
-    | EqualGreater ->
-      Parser.next p;
-      let body = parseExpr p in
-      let pat =
-        match expr.pexp_desc with
-        | Pexp_ident longident ->
-          Ast_helper.Pat.var ~loc:expr.pexp_loc
-            (Location.mkloc
-               (Longident.flatten longident.txt |> String.concat ".")
-               longident.loc)
-        (* TODO: can we convert more expressions to patterns?*)
-        | _ ->
-          Ast_helper.Pat.var ~loc:expr.pexp_loc
-            (Location.mkloc "pattern" expr.pexp_loc)
-      in
-      let arrow1 =
-        Ast_helper.Exp.fun_
-          ~loc:(mkLoc expr.pexp_loc.loc_start body.pexp_loc.loc_end)
-          Asttypes.Nolabel None pat
-          (Ast_helper.Exp.constraint_ body typ)
-      in
-      let arrow2 =
-        Ast_helper.Exp.fun_
-          ~loc:(mkLoc expr.pexp_loc.loc_start body.pexp_loc.loc_end)
-          Asttypes.Nolabel None
-          (Ast_helper.Pat.constraint_ pat typ)
-          body
-      in
-      let msg =
-        Doc.breakableGroup ~forceBreak:true
-          (Doc.concat
-             [
-               Doc.text
-                 "Did you mean to annotate the parameter type or the return \
-                  type?";
-               Doc.indent
-                 (Doc.concat
-                    [
-                      Doc.line;
-                      Doc.text "1) ";
-                      ResPrinter.printExpression arrow1 CommentTable.empty;
-                      Doc.line;
-                      Doc.text "2) ";
-                      ResPrinter.printExpression arrow2 CommentTable.empty;
-                    ]);
-             ])
-        |> Doc.toString ~width:80
-      in
-      Parser.err ~startPos:expr.pexp_loc.loc_start ~endPos:body.pexp_loc.loc_end
-        p (Diagnostics.message msg);
-      arrow1
-    | _ ->
-      let loc = mkLoc expr.pexp_loc.loc_start typ.ptyp_loc.loc_end in
-      let expr = Ast_helper.Exp.constraint_ ~loc expr typ in
-      let () =
-        Parser.err ~startPos:expr.pexp_loc.loc_start
-          ~endPos:typ.ptyp_loc.loc_end p
-          (Diagnostics.message
-             (Doc.breakableGroup ~forceBreak:true
-                (Doc.concat
-                   [
-                     Doc.text
-                       "Expressions with type constraints need to be wrapped \
-                        in parens:";
-                     Doc.indent
-                       (Doc.concat
-                          [
-                            Doc.line;
-                            ResPrinter.addParens
-                              (ResPrinter.printExpression expr
-                                 CommentTable.empty);
-                          ]);
-                   ])
-             |> Doc.toString ~width:80))
-      in
-      expr)
-  | _ -> expr
-
-and parseLetBindingBody ~startPos ~attrs p =
-  Parser.beginRegion p;
-  Parser.leaveBreadcrumb p Grammar.LetBinding;
-  let pat, exp =
-    Parser.leaveBreadcrumb p Grammar.Pattern;
-    let pat = parsePattern p in
-    Parser.eatBreadcrumb p;
-    match p.Parser.token with
-    | Colon -> (
-      Parser.next p;
-      match p.token with
-      | Typ ->
-        (* locally abstract types *)
-        Parser.next p;
-        let newtypes = parseLidentList p in
-        Parser.expect Dot p;
-        let typ = parseTypExpr p in
-        Parser.expect Equal p;
-        let expr = parseExpr p in
-        let loc = mkLoc startPos p.prevEndPos in
-        let exp, poly = wrapTypeAnnotation ~loc newtypes typ expr in
-        let pat = Ast_helper.Pat.constraint_ ~loc pat poly in
-        (pat, exp)
-      | _ ->
-        let polyType = parsePolyTypeExpr p in
-        let loc =
-          {pat.ppat_loc with loc_end = polyType.Parsetree.ptyp_loc.loc_end}
-        in
-        let pat = Ast_helper.Pat.constraint_ ~loc pat polyType in
-        Parser.expect Token.Equal p;
-        let exp = parseExpr p in
-        let exp = overParseConstrainedOrCoercedOrArrowExpression p exp in
-        (pat, exp))
-    | _ ->
-      Parser.expect Token.Equal p;
-      let exp =
-        overParseConstrainedOrCoercedOrArrowExpression p (parseExpr p)
-      in
-      (pat, exp)
-  in
-  let loc = mkLoc startPos p.prevEndPos in
-  let vb = Ast_helper.Vb.mk ~loc ~attrs pat exp in
-  Parser.eatBreadcrumb p;
-  Parser.endRegion p;
-  vb
-
-(* TODO: find a better way? Is it possible?
- * let a = 1
- * @attr
- * and b = 2
- *
- * The problem is that without semi we need a lookahead to determine
- * if the attr is on the letbinding or the start of a new thing
- *
- * let a = 1
- * @attr
- * let b = 1
- *
- * Here @attr should attach to something "new": `let b = 1`
- * The parser state is forked, which is quite expensive…
- *)
-and parseAttributesAndBinding (p : Parser.t) =
-  let err = p.scanner.err in
-  let ch = p.scanner.ch in
-  let offset = p.scanner.offset in
-  let offset16 = p.scanner.offset16 in
-  let lineOffset = p.scanner.lineOffset in
-  let lnum = p.scanner.lnum in
-  let mode = p.scanner.mode in
-  let token = p.token in
-  let startPos = p.startPos in
-  let endPos = p.endPos in
-  let prevEndPos = p.prevEndPos in
-  let breadcrumbs = p.breadcrumbs in
-  let errors = p.errors in
-  let diagnostics = p.diagnostics in
-  let comments = p.comments in
-
-  match p.Parser.token with
-  | At | DocComment (_, _) -> (
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | And -> attrs
-    | _ ->
-      p.scanner.err <- err;
-      p.scanner.ch <- ch;
-      p.scanner.offset <- offset;
-      p.scanner.offset16 <- offset16;
-      p.scanner.lineOffset <- lineOffset;
-      p.scanner.lnum <- lnum;
-      p.scanner.mode <- mode;
-      p.token <- token;
-      p.startPos <- startPos;
-      p.endPos <- endPos;
-      p.prevEndPos <- prevEndPos;
-      p.breadcrumbs <- breadcrumbs;
-      p.errors <- errors;
-      p.diagnostics <- diagnostics;
-      p.comments <- comments;
-      [])
-  | _ -> []
-
-(* definition	::=	let [rec] let-binding  { and let-binding }   *)
-and parseLetBindings ~attrs ~startPos p =
-  Parser.optional p Let |> ignore;
-  let recFlag =
-    if Parser.optional p Token.Rec then Asttypes.Recursive
-    else Asttypes.Nonrecursive
-  in
-  let first = parseLetBindingBody ~startPos ~attrs p in
-
-  let rec loop p bindings =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributesAndBinding p in
-    match p.Parser.token with
-    | And ->
-      Parser.next p;
-      ignore (Parser.optional p Let);
-      (* overparse for fault tolerance *)
-      let letBinding = parseLetBindingBody ~startPos ~attrs p in
-      loop p (letBinding :: bindings)
-    | _ -> List.rev bindings
-  in
-  (recFlag, loop p [first])
-
-(*
- * div -> div
- * Foo -> Foo.createElement
- * Foo.Bar -> Foo.Bar.createElement
- *)
-and parseJsxName p =
-  let longident =
-    match p.Parser.token with
-    | Lident ident ->
-      let identStart = p.startPos in
-      let identEnd = p.endPos in
-      Parser.next p;
-      let loc = mkLoc identStart identEnd in
-      Location.mkloc (Longident.Lident ident) loc
-    | Uident _ ->
-      let longident = parseModuleLongIdent ~lowercase:true p in
-      Location.mkloc
-        (Longident.Ldot (longident.txt, "createElement"))
-        longident.loc
-    | _ ->
-      let msg =
-        "A jsx name must be a lowercase or uppercase name, like: div in <div \
-         /> or Navbar in <Navbar />"
-      in
-      Parser.err p (Diagnostics.message msg);
-      Location.mknoloc (Longident.Lident "_")
-  in
-  Ast_helper.Exp.ident ~loc:longident.loc longident
-
-and parseJsxOpeningOrSelfClosingElement ~startPos p =
-  let jsxStartPos = p.Parser.startPos in
-  let name = parseJsxName p in
-  let jsxProps = parseJsxProps p in
-  let children =
-    match p.Parser.token with
-    | Forwardslash ->
-      (* <foo a=b /> *)
-      let childrenStartPos = p.Parser.startPos in
-      Parser.next p;
-      let childrenEndPos = p.Parser.startPos in
-      Scanner.popMode p.scanner Jsx;
-      Parser.expect GreaterThan p;
-      let loc = mkLoc childrenStartPos childrenEndPos in
-      makeListExpression loc [] None (* no children *)
-    | GreaterThan -> (
-      (* <foo a=b> bar </foo> *)
-      let childrenStartPos = p.Parser.startPos in
-      Parser.next p;
-      let spread, children = parseJsxChildren p in
-      let childrenEndPos = p.Parser.startPos in
-      let () =
-        match p.token with
-        | LessThanSlash -> Parser.next p
-        | LessThan ->
-          Parser.next p;
-          Parser.expect Forwardslash p
-        | token when Grammar.isStructureItemStart token -> ()
-        | _ -> Parser.expect LessThanSlash p
-      in
-      match p.Parser.token with
-      | (Lident _ | Uident _) when verifyJsxOpeningClosingName p name -> (
-        Scanner.popMode p.scanner Jsx;
-        Parser.expect GreaterThan p;
-        let loc = mkLoc childrenStartPos childrenEndPos in
-        match (spread, children) with
-        | true, child :: _ -> child
-        | _ -> makeListExpression loc children None)
-      | token -> (
-        Scanner.popMode p.scanner Jsx;
-        let () =
-          if Grammar.isStructureItemStart token then
-            let closing = "</" ^ string_of_pexp_ident name ^ ">" in
-            let msg = Diagnostics.message ("Missing " ^ closing) in
-            Parser.err ~startPos ~endPos:p.prevEndPos p msg
-          else
-            let opening = "</" ^ string_of_pexp_ident name ^ ">" in
-            let msg =
-              "Closing jsx name should be the same as the opening name. Did \
-               you mean " ^ opening ^ " ?"
-            in
-            Parser.err ~startPos ~endPos:p.prevEndPos p
-              (Diagnostics.message msg);
-            Parser.expect GreaterThan p
-        in
-        let loc = mkLoc childrenStartPos childrenEndPos in
-        match (spread, children) with
-        | true, child :: _ -> child
-        | _ -> makeListExpression loc children None))
-    | token ->
-      Scanner.popMode p.scanner Jsx;
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      makeListExpression Location.none [] None
-  in
-  let jsxEndPos = p.prevEndPos in
-  let loc = mkLoc jsxStartPos jsxEndPos in
-  Ast_helper.Exp.apply ~loc name
-    (List.concat
-       [
-         jsxProps;
-         [
-           (Asttypes.Labelled "children", children);
-           ( Asttypes.Nolabel,
-             Ast_helper.Exp.construct
-               (Location.mknoloc (Longident.Lident "()"))
-               None );
-         ];
-       ])
-
-(*
- *  jsx ::=
- *    | <> jsx-children </>
- *    | <element-name {jsx-prop} />
- *    | <element-name {jsx-prop}> jsx-children </element-name>
- *
- *  jsx-children ::= primary-expr*          * => 0 or more
- *)
-and parseJsx p =
-  Scanner.setJsxMode p.Parser.scanner;
-  Parser.leaveBreadcrumb p Grammar.Jsx;
-  let startPos = p.Parser.startPos in
-  Parser.expect LessThan p;
-  let jsxExpr =
-    match p.Parser.token with
-    | Lident _ | Uident _ -> parseJsxOpeningOrSelfClosingElement ~startPos p
-    | GreaterThan ->
-      (* fragment: <> foo </> *)
-      parseJsxFragment p
-    | _ -> parseJsxName p
-  in
-  Parser.eatBreadcrumb p;
-  {jsxExpr with pexp_attributes = [jsxAttr]}
-
-(*
- * jsx-fragment ::=
- *  | <> </>
- *  | <> jsx-children </>
- *)
-and parseJsxFragment p =
-  let childrenStartPos = p.Parser.startPos in
-  Parser.expect GreaterThan p;
-  let _spread, children = parseJsxChildren p in
-  let childrenEndPos = p.Parser.startPos in
-  if p.token = LessThan then p.token <- Scanner.reconsiderLessThan p.scanner;
-  Parser.expect LessThanSlash p;
-  Scanner.popMode p.scanner Jsx;
-  Parser.expect GreaterThan p;
-  let loc = mkLoc childrenStartPos childrenEndPos in
-  makeListExpression loc children None
-
-(*
- * jsx-prop ::=
- *   |  lident
- *   | ?lident
- *   |  lident =  jsx_expr
- *   |  lident = ?jsx_expr
- *   |  {...jsx_expr}
- *)
-and parseJsxProp p =
-  match p.Parser.token with
-  | Question | Lident _ -> (
-    let optional = Parser.optional p Question in
-    let name, loc = parseLident p in
-    let propLocAttr =
-      (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr [])
-    in
-    (* optional punning: <foo ?a /> *)
-    if optional then
-      Some
-        ( Asttypes.Optional name,
-          Ast_helper.Exp.ident ~attrs:[propLocAttr] ~loc
-            (Location.mkloc (Longident.Lident name) loc) )
-    else
-      match p.Parser.token with
-      | Equal ->
-        Parser.next p;
-        (* no punning *)
-        let optional = Parser.optional p Question in
-        Scanner.popMode p.scanner Jsx;
-        let attrExpr =
-          let e = parsePrimaryExpr ~operand:(parseAtomicExpr p) p in
-          {e with pexp_attributes = propLocAttr :: e.pexp_attributes}
-        in
-        let label =
-          if optional then Asttypes.Optional name else Asttypes.Labelled name
-        in
-        Some (label, attrExpr)
-      | _ ->
-        let attrExpr =
-          Ast_helper.Exp.ident ~loc ~attrs:[propLocAttr]
-            (Location.mkloc (Longident.Lident name) loc)
-        in
-        let label =
-          if optional then Asttypes.Optional name else Asttypes.Labelled name
-        in
-        Some (label, attrExpr))
-  (* {...props} *)
-  | Lbrace -> (
-    Scanner.popMode p.scanner Jsx;
-    Parser.next p;
-    match p.Parser.token with
-    | DotDotDot -> (
-      Scanner.popMode p.scanner Jsx;
-      Parser.next p;
-      let loc = mkLoc p.Parser.startPos p.prevEndPos in
-      let propLocAttr =
-        (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr [])
-      in
-      let attrExpr =
-        let e = parsePrimaryExpr ~operand:(parseExpr p) p in
-        {e with pexp_attributes = propLocAttr :: e.pexp_attributes}
-      in
-      (* using label "spreadProps" to distinguish from others *)
-      let label = Asttypes.Labelled "_spreadProps" in
-      match p.Parser.token with
-      | Rbrace ->
-        Parser.next p;
-        Scanner.setJsxMode p.scanner;
-        Some (label, attrExpr)
-      | _ -> None)
-    | _ -> None)
-  | _ -> None
-
-and parseJsxProps p =
-  parseRegion ~grammar:Grammar.JsxAttribute ~f:parseJsxProp p
-
-and parseJsxChildren p =
-  Scanner.popMode p.scanner Jsx;
-  let rec loop p children =
-    match p.Parser.token with
-    | Token.Eof | LessThanSlash -> children
-    | LessThan ->
-      (* Imagine: <div> <Navbar /> <
-       * is `<` the start of a jsx-child? <div …
-       * or is it the start of a closing tag?  </div>
-       * reconsiderLessThan peeks at the next token and
-       * determines the correct token to disambiguate *)
-      let token = Scanner.reconsiderLessThan p.scanner in
-      if token = LessThan then
-        let child =
-          parsePrimaryExpr ~operand:(parseAtomicExpr p) ~noCall:true p
-        in
-        loop p (child :: children)
-      else
-        (* LessThanSlash *)
-        let () = p.token <- token in
-        children
-    | token when Grammar.isJsxChildStart token ->
-      let child =
-        parsePrimaryExpr ~operand:(parseAtomicExpr p) ~noCall:true p
-      in
-      loop p (child :: children)
-    | _ -> children
-  in
-  let spread, children =
-    match p.Parser.token with
-    | DotDotDot ->
-      Parser.next p;
-      (true, [parsePrimaryExpr ~operand:(parseAtomicExpr p) ~noCall:true p])
-    | _ ->
-      let children = List.rev (loop p []) in
-      (false, children)
-  in
-  Scanner.setJsxMode p.scanner;
-  (spread, children)
-
-and parseBracedOrRecordExpr p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Lbrace p;
-  match p.Parser.token with
-  | Rbrace ->
-    Parser.next p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.record ~loc [] None
-  | DotDotDot ->
-    (* beginning of record spread, parse record *)
-    Parser.next p;
-    let spreadExpr = parseConstrainedOrCoercedExpr p in
-    Parser.expect Comma p;
-    let expr = parseRecordExpr ~startPos ~spread:(Some spreadExpr) [] p in
-    Parser.expect Rbrace p;
-    expr
-  | String s -> (
-    let field =
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc (Longident.Lident s) loc
-    in
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      let fieldExpr = parseExpr p in
-      Parser.optional p Comma |> ignore;
-      let expr = parseRecordExprWithStringKeys ~startPos (field, fieldExpr) p in
-      Parser.expect Rbrace p;
-      expr
-    | _ -> (
-      let tag = if p.mode = ParseForTypeChecker then Some "js" else None in
-      let constant =
-        Ast_helper.Exp.constant ~loc:field.loc
-          (Parsetree.Pconst_string (s, tag))
-      in
-      let a = parsePrimaryExpr ~operand:constant p in
-      let e = parseBinaryExpr ~a p 1 in
-      let e = parseTernaryExpr e p in
-      match p.Parser.token with
-      | Semicolon ->
-        let expr = parseExprBlock ~first:e p in
-        Parser.expect Rbrace p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let braces = makeBracesAttr loc in
-        {
-          expr with
-          Parsetree.pexp_attributes = braces :: expr.Parsetree.pexp_attributes;
-        }
-      | Rbrace ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let braces = makeBracesAttr loc in
-        {e with pexp_attributes = braces :: e.pexp_attributes}
-      | _ ->
-        let expr = parseExprBlock ~first:e p in
-        Parser.expect Rbrace p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let braces = makeBracesAttr loc in
-        {expr with pexp_attributes = braces :: expr.pexp_attributes}))
-  | Question ->
-    let expr = parseRecordExpr ~startPos [] p in
-    Parser.expect Rbrace p;
-    expr
-  (*
-    The branch below takes care of the "braced" expression {async}.
-    The big reason that we need all these branches is that {x} isn't a record with a punned field x, but a braced expression… There's lots of "ambiguity" between a record with a single punned field and a braced expression…
-    What is {x}?
-      1) record {x: x}
-      2) expression x which happens to wrapped in braces
-    Due to historical reasons, we always follow 2
-  *)
-  | Lident "async" when isEs6ArrowExpression ~inTernary:false p ->
-    let expr = parseAsyncArrowExpression p in
-    let expr = parseExprBlock ~first:expr p in
-    Parser.expect Rbrace p;
-    let loc = mkLoc startPos p.prevEndPos in
-    let braces = makeBracesAttr loc in
-    {expr with pexp_attributes = braces :: expr.pexp_attributes}
-  | Uident _ | Lident _ -> (
-    let startToken = p.token in
-    let valueOrConstructor = parseValueOrConstructor p in
-    match valueOrConstructor.pexp_desc with
-    | Pexp_ident pathIdent -> (
-      let identEndPos = p.prevEndPos in
-      match p.Parser.token with
-      | Comma ->
-        Parser.next p;
-        let valueOrConstructor =
-          match startToken with
-          | Uident _ -> removeModuleNameFromPunnedFieldValue valueOrConstructor
-          | _ -> valueOrConstructor
-        in
-        let expr =
-          parseRecordExpr ~startPos [(pathIdent, valueOrConstructor)] p
-        in
-        Parser.expect Rbrace p;
-        expr
-      | Colon -> (
-        Parser.next p;
-        let optional = parseOptionalLabel p in
-        let fieldExpr = parseExpr p in
-        let fieldExpr = makeExpressionOptional ~optional fieldExpr in
-        match p.token with
-        | Rbrace ->
-          Parser.next p;
-          let loc = mkLoc startPos p.prevEndPos in
-          Ast_helper.Exp.record ~loc [(pathIdent, fieldExpr)] None
-        | _ ->
-          Parser.expect Comma p;
-          let expr = parseRecordExpr ~startPos [(pathIdent, fieldExpr)] p in
-          Parser.expect Rbrace p;
-          expr)
-      (* error case *)
-      | Lident _ ->
-        if p.prevEndPos.pos_lnum < p.startPos.pos_lnum then (
-          Parser.expect Comma p;
-          let expr =
-            parseRecordExpr ~startPos [(pathIdent, valueOrConstructor)] p
-          in
-          Parser.expect Rbrace p;
-          expr)
-        else (
-          Parser.expect Colon p;
-          let expr =
-            parseRecordExpr ~startPos [(pathIdent, valueOrConstructor)] p
-          in
-          Parser.expect Rbrace p;
-          expr)
-      | Semicolon ->
-        let expr = parseExprBlock ~first:(Ast_helper.Exp.ident pathIdent) p in
-        Parser.expect Rbrace p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let braces = makeBracesAttr loc in
-        {expr with pexp_attributes = braces :: expr.pexp_attributes}
-      | Rbrace ->
-        Parser.next p;
-        let expr = Ast_helper.Exp.ident ~loc:pathIdent.loc pathIdent in
-        let loc = mkLoc startPos p.prevEndPos in
-        let braces = makeBracesAttr loc in
-        {expr with pexp_attributes = braces :: expr.pexp_attributes}
-      | EqualGreater -> (
-        let loc = mkLoc startPos identEndPos in
-        let ident = Location.mkloc (Longident.last pathIdent.txt) loc in
-        let a =
-          parseEs6ArrowExpression
-            ~parameters:
-              [
-                TermParameter
-                  {
-                    dotted = false;
-                    attrs = [];
-                    label = Asttypes.Nolabel;
-                    expr = None;
-                    pat = Ast_helper.Pat.var ~loc:ident.loc ident;
-                    pos = startPos;
-                  };
-              ]
-            p
-        in
-        let e = parseBinaryExpr ~a p 1 in
-        let e = parseTernaryExpr e p in
-        match p.Parser.token with
-        | Semicolon ->
-          let expr = parseExprBlock ~first:e p in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {expr with pexp_attributes = braces :: expr.pexp_attributes}
-        | Rbrace ->
-          Parser.next p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {e with pexp_attributes = braces :: e.pexp_attributes}
-        | _ ->
-          let expr = parseExprBlock ~first:e p in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {expr with pexp_attributes = braces :: expr.pexp_attributes})
-      | _ -> (
-        Parser.leaveBreadcrumb p Grammar.ExprBlock;
-        let a =
-          parsePrimaryExpr
-            ~operand:(Ast_helper.Exp.ident ~loc:pathIdent.loc pathIdent)
-            p
-        in
-        let e = parseBinaryExpr ~a p 1 in
-        let e = parseTernaryExpr e p in
-        Parser.eatBreadcrumb p;
-        match p.Parser.token with
-        | Semicolon ->
-          let expr = parseExprBlock ~first:e p in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {expr with pexp_attributes = braces :: expr.pexp_attributes}
-        | Rbrace ->
-          Parser.next p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {e with pexp_attributes = braces :: e.pexp_attributes}
-        | _ ->
-          let expr = parseExprBlock ~first:e p in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let braces = makeBracesAttr loc in
-          {expr with pexp_attributes = braces :: expr.pexp_attributes}))
-    | _ -> (
-      Parser.leaveBreadcrumb p Grammar.ExprBlock;
-      let a = parsePrimaryExpr ~operand:valueOrConstructor p in
-      let e = parseBinaryExpr ~a p 1 in
-      let e = parseTernaryExpr e p in
-      Parser.eatBreadcrumb p;
-      match p.Parser.token with
-      | Semicolon ->
-        let expr = parseExprBlock ~first:e p in
-        Parser.expect Rbrace p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let braces = makeBracesAttr loc in
-        {expr with pexp_attributes = braces :: expr.pexp_attributes}
-      | Rbrace ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let braces = makeBracesAttr loc in
-        {e with pexp_attributes = braces :: e.pexp_attributes}
-      | _ ->
-        let expr = parseExprBlock ~first:e p in
-        Parser.expect Rbrace p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let braces = makeBracesAttr loc in
-        {expr with pexp_attributes = braces :: expr.pexp_attributes}))
-  | _ ->
-    let expr = parseExprBlock p in
-    Parser.expect Rbrace p;
-    let loc = mkLoc startPos p.prevEndPos in
-    let braces = makeBracesAttr loc in
-    {expr with pexp_attributes = braces :: expr.pexp_attributes}
-
-and parseRecordExprRowWithStringKey p =
-  match p.Parser.token with
-  | String s -> (
-    let loc = mkLoc p.startPos p.endPos in
-    Parser.next p;
-    let field = Location.mkloc (Longident.Lident s) loc in
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      let fieldExpr = parseExpr p in
-      Some (field, fieldExpr)
-    | _ -> Some (field, Ast_helper.Exp.ident ~loc:field.loc field))
-  | _ -> None
-
-and parseRecordExprRow p =
-  let attrs = parseAttributes p in
-  let () =
-    match p.Parser.token with
-    | Token.DotDotDot ->
-      Parser.err p (Diagnostics.message ErrorMessages.recordExprSpread);
-      Parser.next p
-    | _ -> ()
-  in
-  match p.Parser.token with
-  | Lident _ | Uident _ -> (
-    let startToken = p.token in
-    let field = parseValuePath p in
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      let optional = parseOptionalLabel p in
-      let fieldExpr = parseExpr p in
-      let fieldExpr = makeExpressionOptional ~optional fieldExpr in
-      Some (field, fieldExpr)
-    | _ ->
-      let value = Ast_helper.Exp.ident ~loc:field.loc ~attrs field in
-      let value =
-        match startToken with
-        | Uident _ -> removeModuleNameFromPunnedFieldValue value
-        | _ -> value
-      in
-      Some (field, value))
-  | Question -> (
-    Parser.next p;
-    match p.Parser.token with
-    | Lident _ | Uident _ ->
-      let startToken = p.token in
-      let field = parseValuePath p in
-      let value = Ast_helper.Exp.ident ~loc:field.loc ~attrs field in
-      let value =
-        match startToken with
-        | Uident _ -> removeModuleNameFromPunnedFieldValue value
-        | _ -> value
-      in
-      Some (field, makeExpressionOptional ~optional:true value)
-    | _ -> None)
-  | _ -> None
-
-and parseRecordExprWithStringKeys ~startPos firstRow p =
-  let rows =
-    firstRow
-    :: parseCommaDelimitedRegion ~grammar:Grammar.RecordRowsStringKey
-         ~closing:Rbrace ~f:parseRecordExprRowWithStringKey p
-  in
-  let loc = mkLoc startPos p.endPos in
-  let recordStrExpr =
-    Ast_helper.Str.eval ~loc (Ast_helper.Exp.record ~loc rows None)
-  in
-  Ast_helper.Exp.extension ~loc
-    (Location.mkloc "obj" loc, Parsetree.PStr [recordStrExpr])
-
-and parseRecordExpr ~startPos ?(spread = None) rows p =
-  let exprs =
-    parseCommaDelimitedRegion ~grammar:Grammar.RecordRows ~closing:Rbrace
-      ~f:parseRecordExprRow p
-  in
-  let rows = List.concat [rows; exprs] in
-  let () =
-    match rows with
-    | [] ->
-      let msg = "Record spread needs at least one field that's updated" in
-      Parser.err p (Diagnostics.message msg)
-    | _rows -> ()
-  in
-  let loc = mkLoc startPos p.endPos in
-  Ast_helper.Exp.record ~loc rows spread
-
-and parseNewlineOrSemicolonExprBlock p =
-  match p.Parser.token with
-  | Semicolon -> Parser.next p
-  | token when Grammar.isBlockExprStart token ->
-    if p.prevEndPos.pos_lnum < p.startPos.pos_lnum then ()
-    else
-      Parser.err ~startPos:p.prevEndPos ~endPos:p.endPos p
-        (Diagnostics.message
-           "consecutive expressions on a line must be separated by ';' or a \
-            newline")
-  | _ -> ()
-
-and parseExprBlockItem p =
-  let startPos = p.Parser.startPos in
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | Module -> (
-    Parser.next p;
-    match p.token with
-    | Lparen ->
-      let expr = parseFirstClassModuleExpr ~startPos p in
-      let a = parsePrimaryExpr ~operand:expr p in
-      let expr = parseBinaryExpr ~a p 1 in
-      parseTernaryExpr expr p
-    | _ ->
-      let name =
-        match p.Parser.token with
-        | Uident ident ->
-          let loc = mkLoc p.startPos p.endPos in
-          Parser.next p;
-          Location.mkloc ident loc
-        | t ->
-          Parser.err p (Diagnostics.uident t);
-          Location.mknoloc "_"
-      in
-      let body = parseModuleBindingBody p in
-      parseNewlineOrSemicolonExprBlock p;
-      let expr = parseExprBlock p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.letmodule ~loc name body expr)
-  | Exception ->
-    let extensionConstructor = parseExceptionDef ~attrs p in
-    parseNewlineOrSemicolonExprBlock p;
-    let blockExpr = parseExprBlock p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.letexception ~loc extensionConstructor blockExpr
-  | Open ->
-    let od = parseOpenDescription ~attrs p in
-    parseNewlineOrSemicolonExprBlock p;
-    let blockExpr = parseExprBlock p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.open_ ~loc od.popen_override od.popen_lid blockExpr
-  | Let ->
-    let recFlag, letBindings = parseLetBindings ~attrs ~startPos p in
-    parseNewlineOrSemicolonExprBlock p;
-    let next =
-      if Grammar.isBlockExprStart p.Parser.token then parseExprBlock p
-      else
-        let loc = mkLoc p.startPos p.endPos in
-        Ast_helper.Exp.construct ~loc
-          (Location.mkloc (Longident.Lident "()") loc)
-          None
-    in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.let_ ~loc recFlag letBindings next
-  | _ ->
-    let e1 =
-      let expr = parseExpr p in
-      {expr with pexp_attributes = List.concat [attrs; expr.pexp_attributes]}
-    in
-    parseNewlineOrSemicolonExprBlock p;
-    if Grammar.isBlockExprStart p.Parser.token then
-      let e2 = parseExprBlock p in
-      let loc = {e1.pexp_loc with loc_end = e2.pexp_loc.loc_end} in
-      Ast_helper.Exp.sequence ~loc e1 e2
-    else e1
-
-(* blockExpr ::= expr
- *            |  expr          ;
- *            |  expr          ; blockExpr
- *            |  module    ... ; blockExpr
- *            |  open      ... ; blockExpr
- *            |  exception ... ; blockExpr
- *            |  let       ...
- *            |  let       ... ;
- *            |  let       ... ; blockExpr
- *
- *  note: semi should be made optional
- *  a block of expression is always
- *)
-and parseExprBlock ?first p =
-  Parser.leaveBreadcrumb p Grammar.ExprBlock;
-  let item =
-    match first with
-    | Some e -> e
-    | None -> parseExprBlockItem p
-  in
-  parseNewlineOrSemicolonExprBlock p;
-  let blockExpr =
-    if Grammar.isBlockExprStart p.Parser.token then
-      let next = parseExprBlockItem p in
-      let loc = {item.pexp_loc with loc_end = next.pexp_loc.loc_end} in
-      Ast_helper.Exp.sequence ~loc item next
-    else item
-  in
-  Parser.eatBreadcrumb p;
-  overParseConstrainedOrCoercedOrArrowExpression p blockExpr
-
-and parseAsyncArrowExpression ?(arrowAttrs = []) p =
-  let startPos = p.Parser.startPos in
-  Parser.expect (Lident "async") p;
-  let asyncAttr = makeAsyncAttr (mkLoc startPos p.prevEndPos) in
-  parseEs6ArrowExpression ~arrowAttrs:(asyncAttr :: arrowAttrs)
-    ~arrowStartPos:(Some startPos) p
-
-and parseAwaitExpression p =
-  let awaitLoc = mkLoc p.Parser.startPos p.endPos in
-  let awaitAttr = makeAwaitAttr awaitLoc in
-  Parser.expect Await p;
-  let tokenPrec = Token.precedence MinusGreater in
-  let expr = parseBinaryExpr ~context:OrdinaryExpr p tokenPrec in
-  {
-    expr with
-    pexp_attributes = awaitAttr :: expr.pexp_attributes;
-    pexp_loc = {expr.pexp_loc with loc_start = awaitLoc.loc_start};
-  }
-
-and parseTryExpression p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Try p;
-  let expr = parseExpr ~context:WhenExpr p in
-  Parser.expect Res_token.catch p;
-  Parser.expect Lbrace p;
-  let cases = parsePatternMatching p in
-  Parser.expect Rbrace p;
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Exp.try_ ~loc expr cases
-
-and parseIfCondition p =
-  Parser.leaveBreadcrumb p Grammar.IfCondition;
-  (* doesn't make sense to try es6 arrow here? *)
-  let conditionExpr = parseExpr ~context:WhenExpr p in
-  Parser.eatBreadcrumb p;
-  conditionExpr
-
-and parseThenBranch p =
-  Parser.leaveBreadcrumb p IfBranch;
-  Parser.expect Lbrace p;
-  let thenExpr = parseExprBlock p in
-  Parser.expect Rbrace p;
-  Parser.eatBreadcrumb p;
-  thenExpr
-
-and parseElseBranch p =
-  Parser.expect Lbrace p;
-  let blockExpr = parseExprBlock p in
-  Parser.expect Rbrace p;
-  blockExpr
-
-and parseIfExpr startPos p =
-  let conditionExpr = parseIfCondition p in
-  let thenExpr = parseThenBranch p in
-  let elseExpr =
-    match p.Parser.token with
-    | Else ->
-      Parser.endRegion p;
-      Parser.leaveBreadcrumb p Grammar.ElseBranch;
-      Parser.next p;
-      Parser.beginRegion p;
-      let elseExpr =
-        match p.token with
-        | If -> parseIfOrIfLetExpression p
-        | _ -> parseElseBranch p
-      in
-      Parser.eatBreadcrumb p;
-      Parser.endRegion p;
-      Some elseExpr
-    | _ ->
-      Parser.endRegion p;
-      None
-  in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Exp.ifthenelse ~loc conditionExpr thenExpr elseExpr
-
-and parseIfLetExpr startPos p =
-  let pattern = parsePattern p in
-  Parser.expect Equal p;
-  let conditionExpr = parseIfCondition p in
-  let thenExpr = parseThenBranch p in
-  let elseExpr =
-    match p.Parser.token with
-    | Else ->
-      Parser.endRegion p;
-      Parser.leaveBreadcrumb p Grammar.ElseBranch;
-      Parser.next p;
-      Parser.beginRegion p;
-      let elseExpr =
-        match p.token with
-        | If -> parseIfOrIfLetExpression p
-        | _ -> parseElseBranch p
-      in
-      Parser.eatBreadcrumb p;
-      Parser.endRegion p;
-      elseExpr
-    | _ ->
-      Parser.endRegion p;
-      let startPos = p.Parser.startPos in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Exp.construct ~loc
-        (Location.mkloc (Longident.Lident "()") loc)
-        None
-  in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Exp.match_
-    ~attrs:[ifLetAttr; suppressFragileMatchWarningAttr]
-    ~loc conditionExpr
-    [
-      Ast_helper.Exp.case pattern thenExpr;
-      Ast_helper.Exp.case (Ast_helper.Pat.any ()) elseExpr;
-    ]
-
-and parseIfOrIfLetExpression p =
-  Parser.beginRegion p;
-  Parser.leaveBreadcrumb p Grammar.ExprIf;
-  let startPos = p.Parser.startPos in
-  Parser.expect If p;
-  let expr =
-    match p.Parser.token with
-    | Let ->
-      Parser.next p;
-      let ifLetExpr = parseIfLetExpr startPos p in
-      Parser.err ~startPos:ifLetExpr.pexp_loc.loc_start
-        ~endPos:ifLetExpr.pexp_loc.loc_end p
-        (Diagnostics.message (ErrorMessages.experimentalIfLet ifLetExpr));
-      ifLetExpr
-    | _ -> parseIfExpr startPos p
-  in
-  Parser.eatBreadcrumb p;
-  expr
-
-and parseForRest hasOpeningParen pattern startPos p =
-  Parser.expect In p;
-  let e1 = parseExpr p in
-  let direction =
-    match p.Parser.token with
-    | Lident "to" -> Asttypes.Upto
-    | Lident "downto" -> Asttypes.Downto
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Asttypes.Upto
-  in
-  if p.Parser.token = Eof then
-    Parser.err ~startPos:p.startPos p
-      (Diagnostics.unexpected p.Parser.token p.breadcrumbs)
-  else Parser.next p;
-  let e2 = parseExpr ~context:WhenExpr p in
-  if hasOpeningParen then Parser.expect Rparen p;
-  Parser.expect Lbrace p;
-  let bodyExpr = parseExprBlock p in
-  Parser.expect Rbrace p;
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Exp.for_ ~loc pattern e1 e2 direction bodyExpr
-
-and parseForExpression p =
-  let startPos = p.Parser.startPos in
-  Parser.leaveBreadcrumb p Grammar.ExprFor;
-  Parser.expect For p;
-  Parser.beginRegion p;
-  let forExpr =
-    match p.token with
-    | Lparen -> (
-      let lparen = p.startPos in
-      Parser.next p;
-      match p.token with
-      | Rparen ->
-        Parser.next p;
-        let unitPattern =
-          let loc = mkLoc lparen p.prevEndPos in
-          let lid = Location.mkloc (Longident.Lident "()") loc in
-          Ast_helper.Pat.construct lid None
-        in
-        parseForRest false
-          (parseAliasPattern ~attrs:[] unitPattern p)
-          startPos p
-      | _ -> (
-        Parser.leaveBreadcrumb p Grammar.Pattern;
-        let pat = parsePattern p in
-        Parser.eatBreadcrumb p;
-        match p.token with
-        | Comma ->
-          Parser.next p;
-          let tuplePattern =
-            parseTuplePattern ~attrs:[] ~startPos:lparen ~first:pat p
-          in
-          let pattern = parseAliasPattern ~attrs:[] tuplePattern p in
-          parseForRest false pattern startPos p
-        | _ -> parseForRest true pat startPos p))
-    | _ ->
-      Parser.leaveBreadcrumb p Grammar.Pattern;
-      let pat = parsePattern p in
-      Parser.eatBreadcrumb p;
-      parseForRest false pat startPos p
-  in
-  Parser.eatBreadcrumb p;
-  Parser.endRegion p;
-  forExpr
-
-and parseWhileExpression p =
-  let startPos = p.Parser.startPos in
-  Parser.expect While p;
-  let expr1 = parseExpr ~context:WhenExpr p in
-  Parser.expect Lbrace p;
-  let expr2 = parseExprBlock p in
-  Parser.expect Rbrace p;
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Exp.while_ ~loc expr1 expr2
-
-and parsePatternGuard p =
-  match p.Parser.token with
-  | When | If ->
-    Parser.next p;
-    Some (parseExpr ~context:WhenExpr p)
-  | _ -> None
-
-and parsePatternMatchCase p =
-  Parser.beginRegion p;
-  Parser.leaveBreadcrumb p Grammar.PatternMatchCase;
-  match p.Parser.token with
-  | Token.Bar ->
-    Parser.next p;
-    Parser.leaveBreadcrumb p Grammar.Pattern;
-    let lhs = parsePattern p in
-    Parser.eatBreadcrumb p;
-    let guard = parsePatternGuard p in
-    let () =
-      match p.token with
-      | EqualGreater -> Parser.next p
-      | _ -> Recover.recoverEqualGreater p
-    in
-    let rhs = parseExprBlock p in
-    Parser.endRegion p;
-    Parser.eatBreadcrumb p;
-    Some (Ast_helper.Exp.case lhs ?guard rhs)
-  | _ ->
-    Parser.endRegion p;
-    Parser.eatBreadcrumb p;
-    None
-
-and parsePatternMatching p =
-  let cases =
-    parseDelimitedRegion ~grammar:Grammar.PatternMatching ~closing:Rbrace
-      ~f:parsePatternMatchCase p
-  in
-  let () =
-    match cases with
-    | [] ->
-      Parser.err ~startPos:p.prevEndPos p
-        (Diagnostics.message "Pattern matching needs at least one case")
-    | _ -> ()
-  in
-  cases
-
-and parseSwitchExpression p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Switch p;
-  let switchExpr = parseExpr ~context:WhenExpr p in
-  Parser.expect Lbrace p;
-  let cases = parsePatternMatching p in
-  Parser.expect Rbrace p;
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Exp.match_ ~loc switchExpr cases
-
-(*
- * argument ::=
- *   | _                            (* syntax sugar *)
- *   | expr
- *   | expr : type
- *   | ~ label-name
- *   | ~ label-name
- *   | ~ label-name ?
- *   | ~ label-name =   expr
- *   | ~ label-name =   _           (* syntax sugar *)
- *   | ~ label-name =   expr : type
- *   | ~ label-name = ? expr
- *   | ~ label-name = ? _           (* syntax sugar *)
- *   | ~ label-name = ? expr : type
- *
- *  dotted_argument ::=
- *   | . argument
- *)
-and parseArgument p : argument option =
-  if
-    p.Parser.token = Token.Tilde
-    || p.token = Dot || p.token = Underscore
-    || Grammar.isExprStart p.token
-  then
-    match p.Parser.token with
-    | Dot -> (
-      let dotted = true in
-      Parser.next p;
-      match p.token with
-      (* apply(.) *)
-      | Rparen ->
-        let unitExpr =
-          Ast_helper.Exp.construct
-            (Location.mknoloc (Longident.Lident "()"))
-            None
-        in
-        Some {dotted; label = Asttypes.Nolabel; expr = unitExpr}
-      | _ -> parseArgument2 p ~dotted)
-    | _ -> parseArgument2 p ~dotted:false
-  else None
-
-and parseArgument2 p ~dotted : argument option =
-  match p.Parser.token with
-  (* foo(_), do not confuse with foo(_ => x), TODO: performance *)
-  | Underscore when not (isEs6ArrowExpression ~inTernary:false p) ->
-    let loc = mkLoc p.startPos p.endPos in
-    Parser.next p;
-    let expr =
-      Ast_helper.Exp.ident ~loc (Location.mkloc (Longident.Lident "_") loc)
-    in
-    Some {dotted; label = Nolabel; expr}
-  | Tilde -> (
-    Parser.next p;
-    (* TODO: nesting of pattern matches not intuitive for error recovery *)
-    match p.Parser.token with
-    | Lident ident -> (
-      let startPos = p.startPos in
-      Parser.next p;
-      let endPos = p.prevEndPos in
-      let loc = mkLoc startPos endPos in
-      let propLocAttr =
-        (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr [])
-      in
-      let identExpr =
-        Ast_helper.Exp.ident ~attrs:[propLocAttr] ~loc
-          (Location.mkloc (Longident.Lident ident) loc)
-      in
-      match p.Parser.token with
-      | Question ->
-        Parser.next p;
-        Some {dotted; label = Optional ident; expr = identExpr}
-      | Equal ->
-        Parser.next p;
-        let label =
-          match p.Parser.token with
-          | Question ->
-            Parser.next p;
-            Asttypes.Optional ident
-          | _ -> Labelled ident
-        in
-        let expr =
-          match p.Parser.token with
-          | Underscore when not (isEs6ArrowExpression ~inTernary:false p) ->
-            let loc = mkLoc p.startPos p.endPos in
-            Parser.next p;
-            Ast_helper.Exp.ident ~loc
-              (Location.mkloc (Longident.Lident "_") loc)
-          | _ ->
-            let expr = parseConstrainedOrCoercedExpr p in
-            {expr with pexp_attributes = propLocAttr :: expr.pexp_attributes}
-        in
-        Some {dotted; label; expr}
-      | Colon ->
-        Parser.next p;
-        let typ = parseTypExpr p in
-        let loc = mkLoc startPos p.prevEndPos in
-        let expr =
-          Ast_helper.Exp.constraint_ ~attrs:[propLocAttr] ~loc identExpr typ
-        in
-        Some {dotted; label = Labelled ident; expr}
-      | _ -> Some {dotted; label = Labelled ident; expr = identExpr})
-    | t ->
-      Parser.err p (Diagnostics.lident t);
-      Some {dotted; label = Nolabel; expr = Recover.defaultExpr ()})
-  | _ -> Some {dotted; label = Nolabel; expr = parseConstrainedOrCoercedExpr p}
-
-and parseCallExpr p funExpr =
-  Parser.expect Lparen p;
-  let startPos = p.Parser.startPos in
-  Parser.leaveBreadcrumb p Grammar.ExprCall;
-  let args =
-    parseCommaDelimitedRegion ~grammar:Grammar.ArgumentList ~closing:Rparen
-      ~f:parseArgument p
-  in
-  let resPartialAttr =
-    let loc = mkLoc startPos p.prevEndPos in
-    (Location.mkloc "res.partial" loc, Parsetree.PStr [])
-  in
-  let isPartial =
-    match p.token with
-    | DotDotDot when args <> [] ->
-      Parser.next p;
-      true
-    | _ -> false
-  in
-  Parser.expect Rparen p;
-  let args =
-    match args with
-    | [] ->
-      let loc = mkLoc startPos p.prevEndPos in
-      (* No args -> unit sugar: `foo()` *)
-      [
-        {
-          dotted = false;
-          label = Nolabel;
-          expr =
-            Ast_helper.Exp.construct ~loc
-              (Location.mkloc (Longident.Lident "()") loc)
-              None;
-        };
-      ]
-    | [
-     {
-       dotted = true;
-       label = Nolabel;
-       expr =
-         {
-           pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, None);
-           pexp_loc = loc;
-           pexp_attributes = [];
-         } as expr;
-     };
-    ]
-      when (not loc.loc_ghost) && p.mode = ParseForTypeChecker && not isPartial
-      ->
-      (*  Since there is no syntax space for arity zero vs arity one,
-       *  we expand
-       *    `fn(. ())` into
-       *    `fn(. {let __res_unit = (); __res_unit})`
-       *  when the parsetree is intended for type checking
-       *
-       *  Note:
-       *    `fn(.)` is treated as zero arity application.
-       *  The invisible unit expression here has loc_ghost === true
-       *
-       *  Related: https://github.com/rescript-lang/syntax/issues/138
-       *)
-      [
-        {
-          dotted = true;
-          label = Nolabel;
-          expr =
-            Ast_helper.Exp.let_ Asttypes.Nonrecursive
-              [
-                Ast_helper.Vb.mk
-                  (Ast_helper.Pat.var (Location.mknoloc "__res_unit"))
-                  expr;
-              ]
-              (Ast_helper.Exp.ident
-                 (Location.mknoloc (Longident.Lident "__res_unit")));
-        };
-      ]
-    | args -> args
-  in
-  let loc = {funExpr.pexp_loc with loc_end = p.prevEndPos} in
-  let args =
-    match args with
-    | {dotted = d; label = lbl; expr} :: args ->
-      let group (grp, acc) {dotted; label = lbl; expr} =
-        let _d, grp = grp in
-        if dotted == true then ((true, [(lbl, expr)]), (_d, List.rev grp) :: acc)
-        else ((_d, (lbl, expr) :: grp), acc)
-      in
-      let (_d, grp), acc = List.fold_left group ((d, [(lbl, expr)]), []) args in
-      List.rev ((_d, List.rev grp) :: acc)
-    | [] -> []
-  in
-  let apply =
-    Ext_list.fold_left args funExpr (fun callBody group ->
-        let dotted, args = group in
-        let args, wrap = processUnderscoreApplication p args in
-        let exp =
-          let uncurried =
-            p.uncurried_config |> Res_uncurried.fromDotted ~dotted
-          in
-          let attrs = if uncurried then [uncurriedAppAttr] else [] in
-          let attrs = if isPartial then resPartialAttr :: attrs else attrs in
-          Ast_helper.Exp.apply ~loc ~attrs callBody args
-        in
-        wrap exp)
-  in
-
-  Parser.eatBreadcrumb p;
-  apply
-
-and parseValueOrConstructor p =
-  let startPos = p.Parser.startPos in
-  let rec aux p acc =
-    match p.Parser.token with
-    | Uident ident -> (
-      let endPosLident = p.endPos in
-      Parser.next p;
-      match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        aux p (ident :: acc)
-      | Lparen when p.prevEndPos.pos_lnum == p.startPos.pos_lnum ->
-        let lparen = p.startPos in
-        let args = parseConstructorArgs p in
-        let rparen = p.prevEndPos in
-        let lident = buildLongident (ident :: acc) in
-        let tail =
-          match args with
-          | [] -> None
-          | [({Parsetree.pexp_desc = Pexp_tuple _} as arg)] as args ->
-            let loc = mkLoc lparen rparen in
-            if p.mode = ParseForTypeChecker then
-              (* Some(1, 2) for type-checker *)
-              Some arg
-            else
-              (* Some((1, 2)) for printer *)
-              Some (Ast_helper.Exp.tuple ~loc args)
-          | [arg] -> Some arg
-          | args ->
-            let loc = mkLoc lparen rparen in
-            Some (Ast_helper.Exp.tuple ~loc args)
-        in
-        let loc = mkLoc startPos p.prevEndPos in
-        let identLoc = mkLoc startPos endPosLident in
-        Ast_helper.Exp.construct ~loc (Location.mkloc lident identLoc) tail
-      | _ ->
-        let loc = mkLoc startPos p.prevEndPos in
-        let lident = buildLongident (ident :: acc) in
-        Ast_helper.Exp.construct ~loc (Location.mkloc lident loc) None)
-    | Lident ident ->
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      let lident = buildLongident (ident :: acc) in
-      Ast_helper.Exp.ident ~loc (Location.mkloc lident loc)
-    | token ->
-      if acc = [] then (
-        Parser.nextUnsafe p;
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        Recover.defaultExpr ())
-      else
-        let loc = mkLoc startPos p.prevEndPos in
-        Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-        let lident = buildLongident ("_" :: acc) in
-        Ast_helper.Exp.ident ~loc (Location.mkloc lident loc)
-  in
-  aux p []
-
-and parsePolyVariantExpr p =
-  let startPos = p.startPos in
-  let ident, _loc = parseHashIdent ~startPos p in
-  match p.Parser.token with
-  | Lparen when p.prevEndPos.pos_lnum == p.startPos.pos_lnum ->
-    let lparen = p.startPos in
-    let args = parseConstructorArgs p in
-    let rparen = p.prevEndPos in
-    let loc_paren = mkLoc lparen rparen in
-    let tail =
-      match args with
-      | [] -> None
-      | [({Parsetree.pexp_desc = Pexp_tuple _} as expr)] as args ->
-        if p.mode = ParseForTypeChecker then
-          (* #a(1, 2) for type-checker *)
-          Some expr
-        else
-          (* #a((1, 2)) for type-checker *)
-          Some (Ast_helper.Exp.tuple ~loc:loc_paren args)
-      | [arg] -> Some arg
-      | args ->
-        (* #a((1, 2)) for printer *)
-        Some (Ast_helper.Exp.tuple ~loc:loc_paren args)
-    in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.variant ~loc ident tail
-  | _ ->
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Exp.variant ~loc ident None
-
-and parseConstructorArgs p =
-  let lparen = p.Parser.startPos in
-  Parser.expect Lparen p;
-  let args =
-    parseCommaDelimitedRegion ~grammar:Grammar.ExprList
-      ~f:parseConstrainedExprRegion ~closing:Rparen p
-  in
-  Parser.expect Rparen p;
-  match args with
-  | [] ->
-    let loc = mkLoc lparen p.prevEndPos in
-    [
-      Ast_helper.Exp.construct ~loc
-        (Location.mkloc (Longident.Lident "()") loc)
-        None;
-    ]
-  | args -> args
-
-and parseTupleExpr ~first ~startPos p =
-  let exprs =
-    first
-    :: parseCommaDelimitedRegion p ~grammar:Grammar.ExprList ~closing:Rparen
-         ~f:parseConstrainedExprRegion
-  in
-  Parser.expect Rparen p;
-  let () =
-    match exprs with
-    | [_] ->
-      Parser.err ~startPos ~endPos:p.prevEndPos p
-        (Diagnostics.message ErrorMessages.tupleSingleElement)
-    | _ -> ()
-  in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Exp.tuple ~loc exprs
-
-and parseSpreadExprRegionWithLoc p =
-  let startPos = p.Parser.prevEndPos in
-  match p.Parser.token with
-  | DotDotDot ->
-    Parser.next p;
-    let expr = parseConstrainedOrCoercedExpr p in
-    Some (true, expr, startPos, p.prevEndPos)
-  | token when Grammar.isExprStart token ->
-    Some (false, parseConstrainedOrCoercedExpr p, startPos, p.prevEndPos)
-  | _ -> None
-
-and parseListExpr ~startPos p =
-  let split_by_spread exprs =
-    List.fold_left
-      (fun acc curr ->
-        match (curr, acc) with
-        | (true, expr, startPos, endPos), _ ->
-          (* find a spread expression, prepend a new sublist *)
-          ([], Some expr, startPos, endPos) :: acc
-        | ( (false, expr, startPos, _endPos),
-            (no_spreads, spread, _accStartPos, accEndPos) :: acc ) ->
-          (* find a non-spread expression, and the accumulated is not empty,
-           * prepend to the first sublist, and update the loc of the first sublist *)
-          (expr :: no_spreads, spread, startPos, accEndPos) :: acc
-        | (false, expr, startPos, endPos), [] ->
-          (* find a non-spread expression, and the accumulated is empty *)
-          [([expr], None, startPos, endPos)])
-      [] exprs
-  in
-  let make_sub_expr = function
-    | exprs, Some spread, startPos, endPos ->
-      makeListExpression (mkLoc startPos endPos) exprs (Some spread)
-    | exprs, None, startPos, endPos ->
-      makeListExpression (mkLoc startPos endPos) exprs None
-  in
-  let listExprsRev =
-    parseCommaDelimitedReversedList p ~grammar:Grammar.ListExpr ~closing:Rbrace
-      ~f:parseSpreadExprRegionWithLoc
-  in
-  Parser.expect Rbrace p;
-  let loc = mkLoc startPos p.prevEndPos in
-  match split_by_spread listExprsRev with
-  | [] -> makeListExpression loc [] None
-  | [(exprs, Some spread, _, _)] -> makeListExpression loc exprs (Some spread)
-  | [(exprs, None, _, _)] -> makeListExpression loc exprs None
-  | exprs ->
-    let listExprs = List.map make_sub_expr exprs in
-    Ast_helper.Exp.apply ~loc
-      (Ast_helper.Exp.ident ~loc ~attrs:[spreadAttr]
-         (Location.mkloc
-            (Longident.Ldot
-               (Longident.Ldot (Longident.Lident "Belt", "List"), "concatMany"))
-            loc))
-      [(Asttypes.Nolabel, Ast_helper.Exp.array ~loc listExprs)]
-
-and parseArrayExp p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Lbracket p;
-  let split_by_spread exprs =
-    List.fold_left
-      (fun acc curr ->
-        match (curr, acc) with
-        | (true, expr, startPos, endPos), _ ->
-          (* find a spread expression, prepend a new sublist *)
-          ([], Some expr, startPos, endPos) :: acc
-        | ( (false, expr, startPos, _endPos),
-            (no_spreads, spread, _accStartPos, accEndPos) :: acc ) ->
-          (* find a non-spread expression, and the accumulated is not empty,
-           * prepend to the first sublist, and update the loc of the first sublist *)
-          (expr :: no_spreads, spread, startPos, accEndPos) :: acc
-        | (false, expr, startPos, endPos), [] ->
-          (* find a non-spread expression, and the accumulated is empty *)
-          [([expr], None, startPos, endPos)])
-      [] exprs
-  in
-  let listExprsRev =
-    parseCommaDelimitedReversedList p ~grammar:Grammar.ExprList
-      ~closing:Rbracket ~f:parseSpreadExprRegionWithLoc
-  in
-  Parser.expect Rbracket p;
-  let loc = mkLoc startPos p.prevEndPos in
-  let collectExprs = function
-    | [], Some spread, _startPos, _endPos -> [spread]
-    | exprs, Some spread, _startPos, _endPos ->
-      let els = Ast_helper.Exp.array ~loc exprs in
-      [els; spread]
-    | exprs, None, _startPos, _endPos ->
-      let els = Ast_helper.Exp.array ~loc exprs in
-      [els]
-  in
-  match split_by_spread listExprsRev with
-  | [] -> Ast_helper.Exp.array ~loc:(mkLoc startPos p.prevEndPos) []
-  | [(exprs, None, _, _)] ->
-    Ast_helper.Exp.array ~loc:(mkLoc startPos p.prevEndPos) exprs
-  | exprs ->
-    let xs = List.map collectExprs exprs in
-    let listExprs =
-      List.fold_right
-        (fun exprs1 acc ->
-          List.fold_right (fun expr1 acc1 -> expr1 :: acc1) exprs1 acc)
-        xs []
-    in
-    Ast_helper.Exp.apply ~loc
-      (Ast_helper.Exp.ident ~loc ~attrs:[spreadAttr]
-         (Location.mkloc
-            (Longident.Ldot
-               (Longident.Ldot (Longident.Lident "Belt", "Array"), "concatMany"))
-            loc))
-      [(Asttypes.Nolabel, Ast_helper.Exp.array ~loc listExprs)]
-
-(* TODO: check attributes in the case of poly type vars,
- * might be context dependend: parseFieldDeclaration (see ocaml) *)
-and parsePolyTypeExpr p =
-  let startPos = p.Parser.startPos in
-  match p.Parser.token with
-  | SingleQuote -> (
-    let vars = parseTypeVarList p in
-    match vars with
-    | _v1 :: _v2 :: _ ->
-      Parser.expect Dot p;
-      let typ = parseTypExpr p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Typ.poly ~loc vars typ
-    | [var] -> (
-      match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        let typ = parseTypExpr p in
-        let loc = mkLoc startPos p.prevEndPos in
-        Ast_helper.Typ.poly ~loc vars typ
-      | EqualGreater ->
-        Parser.next p;
-        let typ = Ast_helper.Typ.var ~loc:var.loc var.txt in
-        let returnType = parseTypExpr ~alias:false p in
-        let loc = mkLoc typ.Parsetree.ptyp_loc.loc_start p.prevEndPos in
-        let tFun = Ast_helper.Typ.arrow ~loc Asttypes.Nolabel typ returnType in
-        if p.uncurried_config = Legacy then tFun
-        else Ast_uncurried.uncurriedType ~loc ~arity:1 tFun
-      | _ -> Ast_helper.Typ.var ~loc:var.loc var.txt)
-    | _ -> assert false)
-  | _ -> parseTypExpr p
-
-(* 'a 'b 'c *)
-and parseTypeVarList p =
-  let rec loop p vars =
-    match p.Parser.token with
-    | SingleQuote ->
-      Parser.next p;
-      let lident, loc =
-        parseIdent ~msg:ErrorMessages.typeParam ~startPos:p.startPos p
-      in
-      let var = Location.mkloc lident loc in
-      loop p (var :: vars)
-    | _ -> List.rev vars
-  in
-  loop p []
-
-and parseLidentList p =
-  let rec loop p ls =
-    match p.Parser.token with
-    | Lident lident ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      loop p (Location.mkloc lident loc :: ls)
-    | _ -> List.rev ls
-  in
-  loop p []
-
-and parseAtomicTypExpr ~attrs p =
-  Parser.leaveBreadcrumb p Grammar.AtomicTypExpr;
-  let startPos = p.Parser.startPos in
-  let typ =
-    match p.Parser.token with
-    | SingleQuote ->
-      Parser.next p;
-      let ident, loc =
-        if p.Parser.token = Eof then (
-          Parser.err ~startPos:p.startPos p
-            (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
-          ("", mkLoc p.startPos p.prevEndPos))
-        else parseIdent ~msg:ErrorMessages.typeVar ~startPos:p.startPos p
-      in
-      Ast_helper.Typ.var ~loc ~attrs ident
-    | Underscore ->
-      let endPos = p.endPos in
-      Parser.next p;
-      Ast_helper.Typ.any ~loc:(mkLoc startPos endPos) ~attrs ()
-    | Lparen -> (
-      Parser.next p;
-      match p.Parser.token with
-      | Rparen ->
-        Parser.next p;
-        let loc = mkLoc startPos p.prevEndPos in
-        let unitConstr = Location.mkloc (Longident.Lident "unit") loc in
-        Ast_helper.Typ.constr ~attrs unitConstr []
-      | _ -> (
-        let t = parseTypExpr p in
-        match p.token with
-        | Comma ->
-          Parser.next p;
-          parseTupleType ~attrs ~first:t ~startPos p
-        | _ ->
-          Parser.expect Rparen p;
-          {
-            t with
-            ptyp_loc = mkLoc startPos p.prevEndPos;
-            ptyp_attributes = List.concat [attrs; t.ptyp_attributes];
-          }))
-    | Lbracket -> parsePolymorphicVariantType ~attrs p
-    | Uident _ | Lident _ ->
-      let constr = parseValuePath p in
-      let args = parseTypeConstructorArgs ~constrName:constr p in
-      Ast_helper.Typ.constr
-        ~loc:(mkLoc startPos p.prevEndPos)
-        ~attrs constr args
-    | Module ->
-      Parser.next p;
-      Parser.expect Lparen p;
-      let packageType = parsePackageType ~startPos ~attrs p in
-      Parser.expect Rparen p;
-      {packageType with ptyp_loc = mkLoc startPos p.prevEndPos}
-    | Percent ->
-      let extension = parseExtension p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Typ.extension ~attrs ~loc extension
-    | Lbrace -> parseRecordOrObjectType ~attrs p
-    | Eof ->
-      Parser.err p (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
-      Recover.defaultType ()
-    | token -> (
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      match
-        skipTokensAndMaybeRetry p ~isStartOfGrammar:Grammar.isAtomicTypExprStart
-      with
-      | Some () -> parseAtomicTypExpr ~attrs p
-      | None ->
-        Parser.err ~startPos:p.prevEndPos p
-          (Diagnostics.unexpected token p.breadcrumbs);
-        Recover.defaultType ())
-  in
-  Parser.eatBreadcrumb p;
-  typ
-
-(* package-type	::=
-    | modtype-path
-    ∣ modtype-path with package-constraint  { and package-constraint }
-*)
-and parsePackageType ~startPos ~attrs p =
-  let modTypePath = parseModuleLongIdent ~lowercase:true p in
-  match p.Parser.token with
-  | Lident "with" ->
-    Parser.next p;
-    let constraints = parsePackageConstraints p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Typ.package ~loc ~attrs modTypePath constraints
-  | _ ->
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Typ.package ~loc ~attrs modTypePath []
-
-(* package-constraint  { and package-constraint } *)
-and parsePackageConstraints p =
-  let first =
-    Parser.expect Typ p;
-    let typeConstr = parseValuePath p in
-    Parser.expect Equal p;
-    let typ = parseTypExpr p in
-    (typeConstr, typ)
-  in
-  let rest =
-    parseRegion ~grammar:Grammar.PackageConstraint ~f:parsePackageConstraint p
-  in
-  first :: rest
-
-(* and type typeconstr = typexpr *)
-and parsePackageConstraint p =
-  match p.Parser.token with
-  | And ->
-    Parser.next p;
-    Parser.expect Typ p;
-    let typeConstr = parseValuePath p in
-    Parser.expect Equal p;
-    let typ = parseTypExpr p in
-    Some (typeConstr, typ)
-  | _ -> None
-
-and parseRecordOrObjectType ~attrs p =
-  (* for inline record in constructor *)
-  let startPos = p.Parser.startPos in
-  Parser.expect Lbrace p;
-  let closedFlag =
-    match p.token with
-    | DotDot ->
-      Parser.next p;
-      Asttypes.Open
-    | Dot ->
-      Parser.next p;
-      Asttypes.Closed
-    | _ -> Asttypes.Closed
-  in
-  let () =
-    match p.token with
-    | Lident _ ->
-      Parser.err p
-        (Diagnostics.message ErrorMessages.forbiddenInlineRecordDeclaration)
-    | _ -> ()
-  in
-  let fields =
-    parseCommaDelimitedRegion ~grammar:Grammar.StringFieldDeclarations
-      ~closing:Rbrace ~f:parseStringFieldDeclaration p
-  in
-  Parser.expect Rbrace p;
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Typ.object_ ~loc ~attrs fields closedFlag
-
-(* TODO: check associativity in combination with attributes *)
-and parseTypeAlias p typ =
-  match p.Parser.token with
-  | As ->
-    Parser.next p;
-    Parser.expect SingleQuote p;
-    let ident, _loc =
-      parseIdent ~msg:ErrorMessages.typeParam ~startPos:p.startPos p
-    in
-    (* TODO: how do we parse attributes here? *)
-    Ast_helper.Typ.alias
-      ~loc:(mkLoc typ.Parsetree.ptyp_loc.loc_start p.prevEndPos)
-      typ ident
-  | _ -> typ
-
-(* type_parameter ::=
-   *  | type_expr
-   *  | ~ident: type_expr
-   *  | ~ident: type_expr=?
-   *
-   * note:
-   *  | attrs ~ident: type_expr    -> attrs are on the arrow
-   *  | attrs type_expr            -> attrs are here part of the type_expr
-   *
-   * dotted_type_parameter ::=
-   *  | . type_parameter
-*)
-and parseTypeParameter p =
-  let docAttr : Parsetree.attributes =
-    match p.Parser.token with
-    | DocComment (loc, s) ->
-      Parser.next p;
-      [docCommentToAttribute loc s]
-    | _ -> []
-  in
-  if
-    p.Parser.token = Token.Tilde
-    || p.token = Dot
-    || Grammar.isTypExprStart p.token
-  then
-    let startPos = p.Parser.startPos in
-    let dotted = Parser.optional p Dot in
-    let attrs = docAttr @ parseAttributes p in
-    match p.Parser.token with
-    | Tilde -> (
-      Parser.next p;
-      let name, loc = parseLident p in
-      let lblLocAttr =
-        (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr [])
-      in
-      Parser.expect ~grammar:Grammar.TypeExpression Colon p;
-      let typ =
-        let typ = parseTypExpr p in
-        {typ with ptyp_attributes = lblLocAttr :: typ.ptyp_attributes}
-      in
-      match p.Parser.token with
-      | Equal ->
-        Parser.next p;
-        Parser.expect Question p;
-        Some {dotted; attrs; label = Optional name; typ; startPos}
-      | _ -> Some {dotted; attrs; label = Labelled name; typ; startPos})
-    | Lident _ -> (
-      let name, loc = parseLident p in
-      match p.token with
-      | Colon -> (
-        let () =
-          let error =
-            Diagnostics.message
-              (ErrorMessages.missingTildeLabeledParameter name)
-          in
-          Parser.err ~startPos:loc.loc_start ~endPos:loc.loc_end p error
-        in
-        Parser.next p;
-        let typ = parseTypExpr p in
-        match p.Parser.token with
-        | Equal ->
-          Parser.next p;
-          Parser.expect Question p;
-          Some {dotted; attrs; label = Optional name; typ; startPos}
-        | _ -> Some {dotted; attrs; label = Labelled name; typ; startPos})
-      | _ ->
-        let constr = Location.mkloc (Longident.Lident name) loc in
-        let args = parseTypeConstructorArgs ~constrName:constr p in
-        let typ =
-          Ast_helper.Typ.constr
-            ~loc:(mkLoc startPos p.prevEndPos)
-            ~attrs constr args
-        in
-
-        let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
-        let typ = parseTypeAlias p typ in
-        Some {dotted; attrs = []; label = Nolabel; typ; startPos})
-    | _ ->
-      let typ = parseTypExpr p in
-      let typWithAttributes =
-        {typ with ptyp_attributes = List.concat [attrs; typ.ptyp_attributes]}
-      in
-      Some
-        {dotted; attrs = []; label = Nolabel; typ = typWithAttributes; startPos}
-  else None
-
-(* (int, ~x:string, float) *)
-and parseTypeParameters p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Lparen p;
-  match p.Parser.token with
-  | Rparen ->
-    Parser.next p;
-    let loc = mkLoc startPos p.prevEndPos in
-    let unitConstr = Location.mkloc (Longident.Lident "unit") loc in
-    let typ = Ast_helper.Typ.constr unitConstr [] in
-    [{dotted = false; attrs = []; label = Nolabel; typ; startPos}]
-  | _ ->
-    let params =
-      parseCommaDelimitedRegion ~grammar:Grammar.TypeParameters ~closing:Rparen
-        ~f:parseTypeParameter p
-    in
-    Parser.expect Rparen p;
-    params
-
-and parseEs6ArrowType ~attrs p =
-  let startPos = p.Parser.startPos in
-  match p.Parser.token with
-  | Tilde ->
-    Parser.next p;
-    let name, loc = parseLident p in
-    let lblLocAttr =
-      (Location.mkloc "res.namedArgLoc" loc, Parsetree.PStr [])
-    in
-    Parser.expect ~grammar:Grammar.TypeExpression Colon p;
-    let typ =
-      let typ = parseTypExpr ~alias:false ~es6Arrow:false p in
-      {typ with ptyp_attributes = lblLocAttr :: typ.ptyp_attributes}
-    in
-    let arg =
-      match p.Parser.token with
-      | Equal ->
-        Parser.next p;
-        Parser.expect Question p;
-        Asttypes.Optional name
-      | _ -> Asttypes.Labelled name
-    in
-    Parser.expect EqualGreater p;
-    let returnType = parseTypExpr ~alias:false p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Typ.arrow ~loc ~attrs arg typ returnType
-  | DocComment _ -> assert false
-  | _ ->
-    let parameters = parseTypeParameters p in
-    Parser.expect EqualGreater p;
-    let returnType = parseTypExpr ~alias:false p in
-    let endPos = p.prevEndPos in
-    let returnTypeArity =
-      match parameters with
-      | _ when p.uncurried_config <> Legacy -> 0
-      | _ ->
-        if parameters |> List.exists (function {dotted; typ = _} -> dotted)
-        then 0
-        else
-          let _, args, _ = Res_parsetree_viewer.arrowType returnType in
-          List.length args
-    in
-    let _paramNum, typ, _arity =
-      List.fold_right
-        (fun {dotted; attrs; label = argLbl; typ; startPos} (paramNum, t, arity) ->
-          let uncurried =
-            p.uncurried_config |> Res_uncurried.fromDotted ~dotted
-          in
-          let loc = mkLoc startPos endPos in
-          let arity =
-            (* Workaround for ~lbl: @as(json`false`) _, which changes the arity *)
-            match argLbl with
-            | Labelled _s ->
-              let typ_is_any =
-                match typ.ptyp_desc with
-                | Ptyp_any -> true
-                | _ -> false
-              in
-              let has_as =
-                Ext_list.exists typ.ptyp_attributes (fun (x, _) -> x.txt = "as")
-              in
-              if !InExternal.status && typ_is_any && has_as then arity - 1
-              else arity
-            | _ -> arity
-          in
-          let tArg = Ast_helper.Typ.arrow ~loc ~attrs argLbl typ t in
-          if uncurried && (paramNum = 1 || p.uncurried_config = Legacy) then
-            (paramNum - 1, Ast_uncurried.uncurriedType ~loc ~arity tArg, 1)
-          else (paramNum - 1, tArg, arity + 1))
-        parameters
-        (List.length parameters, returnType, returnTypeArity + 1)
-    in
-    {
-      typ with
-      ptyp_attributes = List.concat [typ.ptyp_attributes; attrs];
-      ptyp_loc = mkLoc startPos p.prevEndPos;
-    }
-
-(*
- * typexpr ::=
- *  | 'ident
- *  | _
- *  | (typexpr)
- *  | typexpr => typexpr            --> es6 arrow
- *  | (typexpr, typexpr) => typexpr --> es6 arrow
- *  | /typexpr, typexpr, typexpr/  --> tuple
- *  | typeconstr
- *  | typeconstr<typexpr>
- *  | typeconstr<typexpr, typexpr,>
- *  | typexpr as 'ident
- *  | %attr-id                      --> extension
- *  | %attr-id(payload)             --> extension
- *
- * typeconstr ::=
- *  | lident
- *  | uident.lident
- *  | uident.uident.lident     --> long module path
- *)
-and parseTypExpr ?attrs ?(es6Arrow = true) ?(alias = true) p =
-  (* Parser.leaveBreadcrumb p Grammar.TypeExpression; *)
-  let startPos = p.Parser.startPos in
-  let attrs =
-    match attrs with
-    | Some attrs -> attrs
-    | None -> parseAttributes p
-  in
-  let typ =
-    if es6Arrow && isEs6ArrowType p then parseEs6ArrowType ~attrs p
-    else
-      let typ = parseAtomicTypExpr ~attrs p in
-      parseArrowTypeRest ~es6Arrow ~startPos typ p
-  in
-  let typ = if alias then parseTypeAlias p typ else typ in
-  (* Parser.eatBreadcrumb p; *)
-  typ
-
-and parseArrowTypeRest ~es6Arrow ~startPos typ p =
-  match p.Parser.token with
-  | (EqualGreater | MinusGreater) as token when es6Arrow == true ->
-    (* error recovery *)
-    if token = MinusGreater then Parser.expect EqualGreater p;
-    Parser.next p;
-    let returnType = parseTypExpr ~alias:false p in
-    let loc = mkLoc startPos p.prevEndPos in
-    let arrowTyp = Ast_helper.Typ.arrow ~loc Asttypes.Nolabel typ returnType in
-    if p.uncurried_config = Legacy then arrowTyp
-    else Ast_uncurried.uncurriedType ~loc ~arity:1 arrowTyp
-  | _ -> typ
-
-and parseTypExprRegion p =
-  if Grammar.isTypExprStart p.Parser.token then Some (parseTypExpr p) else None
-
-and parseTupleType ~attrs ~first ~startPos p =
-  let typexprs =
-    first
-    :: parseCommaDelimitedRegion ~grammar:Grammar.TypExprList ~closing:Rparen
-         ~f:parseTypExprRegion p
-  in
-  Parser.expect Rparen p;
-  let () =
-    match typexprs with
-    | [_] ->
-      Parser.err ~startPos ~endPos:p.prevEndPos p
-        (Diagnostics.message ErrorMessages.tupleSingleElement)
-    | _ -> ()
-  in
-  let tupleLoc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Typ.tuple ~attrs ~loc:tupleLoc typexprs
-
-and parseTypeConstructorArgRegion p =
-  if Grammar.isTypExprStart p.Parser.token then Some (parseTypExpr p)
-  else if p.token = LessThan then (
-    Parser.next p;
-    parseTypeConstructorArgRegion p)
-  else None
-
-(* Js.Nullable.value<'a> *)
-and parseTypeConstructorArgs ~constrName p =
-  let opening = p.Parser.token in
-  let openingStartPos = p.startPos in
-  match opening with
-  | LessThan | Lparen ->
-    Scanner.setDiamondMode p.scanner;
-    Parser.next p;
-    let typeArgs =
-      (* TODO: change Grammar.TypExprList to TypArgList!!! Why did I wrote this? *)
-      parseCommaDelimitedRegion ~grammar:Grammar.TypExprList
-        ~closing:GreaterThan ~f:parseTypeConstructorArgRegion p
-    in
-    let () =
-      match p.token with
-      | Rparen when opening = Token.Lparen ->
-        let typ = Ast_helper.Typ.constr constrName typeArgs in
-        let msg =
-          Doc.breakableGroup ~forceBreak:true
-            (Doc.concat
-               [
-                 Doc.text "Type parameters require angle brackets:";
-                 Doc.indent
-                   (Doc.concat
-                      [Doc.line; ResPrinter.printTypExpr typ CommentTable.empty]);
-               ])
-          |> Doc.toString ~width:80
-        in
-        Parser.err ~startPos:openingStartPos p (Diagnostics.message msg);
-        Parser.next p
-      | _ -> Parser.expect GreaterThan p
-    in
-    Scanner.popMode p.scanner Diamond;
-    typeArgs
-  | _ -> []
-
-(* string-field-decl ::=
- *  | string: poly-typexpr
- *  | attributes string-field-decl *)
-and parseStringFieldDeclaration p =
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | String name ->
-    let nameStartPos = p.startPos in
-    let nameEndPos = p.endPos in
-    Parser.next p;
-    let fieldName = Location.mkloc name (mkLoc nameStartPos nameEndPos) in
-    Parser.expect ~grammar:Grammar.TypeExpression Colon p;
-    let typ = parsePolyTypeExpr p in
-    Some (Parsetree.Otag (fieldName, attrs, typ))
-  | DotDotDot ->
-    Parser.next p;
-    let typ = parseTypExpr p in
-    Some (Parsetree.Oinherit typ)
-  | Lident name ->
-    let nameLoc = mkLoc p.startPos p.endPos in
-    Parser.err p
-      (Diagnostics.message (ErrorMessages.objectQuotedFieldName name));
-    Parser.next p;
-    let fieldName = Location.mkloc name nameLoc in
-    Parser.expect ~grammar:Grammar.TypeExpression Colon p;
-    let typ = parsePolyTypeExpr p in
-    Some (Parsetree.Otag (fieldName, attrs, typ))
-  | _token -> None
-
-(* field-decl	::=
- *  | [mutable] field-name : poly-typexpr
- *  | attributes field-decl *)
-and parseFieldDeclaration p =
-  let startPos = p.Parser.startPos in
-  let attrs = parseAttributes p in
-  let mut =
-    if Parser.optional p Token.Mutable then Asttypes.Mutable
-    else Asttypes.Immutable
-  in
-  let lident, loc =
-    match p.token with
-    | _ -> parseLident p
-  in
-  let optional = parseOptionalLabel p in
-  let name = Location.mkloc lident loc in
-  let typ =
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      parsePolyTypeExpr p
-    | _ ->
-      Ast_helper.Typ.constr ~loc:name.loc {name with txt = Lident name.txt} []
-  in
-  let loc = mkLoc startPos typ.ptyp_loc.loc_end in
-  (optional, Ast_helper.Type.field ~attrs ~loc ~mut name typ)
-
-and parseFieldDeclarationRegion ?foundObjectField p =
-  let startPos = p.Parser.startPos in
-  let attrs = parseAttributes p in
-  let mut =
-    if Parser.optional p Token.Mutable then Asttypes.Mutable
-    else Asttypes.Immutable
-  in
-  match p.token with
-  | DotDotDot ->
-    Parser.next p;
-    let name = Location.mkloc "..." (mkLoc startPos p.prevEndPos) in
-    let typ = parsePolyTypeExpr p in
-    let loc = mkLoc startPos typ.ptyp_loc.loc_end in
-    Some (Ast_helper.Type.field ~attrs ~loc ~mut name typ)
-  | String s when foundObjectField <> None ->
-    Option.get foundObjectField := true;
-    Parser.next p;
-    let name = Location.mkloc s (mkLoc startPos p.prevEndPos) in
-    Parser.expect Colon p;
-    let typ = parsePolyTypeExpr p in
-    let loc = mkLoc startPos typ.ptyp_loc.loc_end in
-    Some (Ast_helper.Type.field ~attrs ~loc ~mut name typ)
-  | Lident _ ->
-    let lident, loc = parseLident p in
-    let name = Location.mkloc lident loc in
-    let optional = parseOptionalLabel p in
-    let typ =
-      match p.Parser.token with
-      | Colon ->
-        Parser.next p;
-        parsePolyTypeExpr p
-      | _ ->
-        Ast_helper.Typ.constr ~loc:name.loc ~attrs
-          {name with txt = Lident name.txt}
-          []
-    in
-    let loc = mkLoc startPos typ.ptyp_loc.loc_end in
-    let attrs = if optional then optionalAttr :: attrs else attrs in
-    Some (Ast_helper.Type.field ~attrs ~loc ~mut name typ)
-  | _ ->
-    if attrs <> [] then
-      Parser.err ~startPos p
-        (Diagnostics.message
-           "Attributes and doc comments can only be used at the beginning of a \
-            field declaration");
-    if mut = Mutable then
-      Parser.err ~startPos p
-        (Diagnostics.message
-           "The `mutable` qualifier can only be used at the beginning of a \
-            field declaration");
-    None
-
-(* record-decl ::=
- *  | { field-decl }
- *  | { field-decl, field-decl }
- *  | { field-decl, field-decl, field-decl, }
- *)
-and parseRecordDeclaration p =
-  Parser.leaveBreadcrumb p Grammar.RecordDecl;
-  Parser.expect Lbrace p;
-  let rows =
-    parseCommaDelimitedRegion ~grammar:Grammar.RecordDecl ~closing:Rbrace
-      ~f:parseFieldDeclarationRegion p
-  in
-  Parser.expect Rbrace p;
-  Parser.eatBreadcrumb p;
-  rows
-
-(* constr-args ::=
- *  | (typexpr)
- *  | (typexpr, typexpr)
- *  | (typexpr, typexpr, typexpr,)
- *  | (record-decl)
- *
- * TODO: should we overparse inline-records in every position?
- * Give a good error message afterwards?
- *)
-and parseConstrDeclArgs p =
-  let constrArgs =
-    match p.Parser.token with
-    | Lparen -> (
-      Parser.next p;
-      (* TODO: this could use some cleanup/stratification *)
-      match p.Parser.token with
-      | Lbrace -> (
-        Parser.next p;
-        let startPos = p.Parser.startPos in
-        match p.Parser.token with
-        | DotDot | Dot ->
-          let closedFlag =
-            match p.token with
-            | DotDot ->
-              Parser.next p;
-              Asttypes.Open
-            | Dot ->
-              Parser.next p;
-              Asttypes.Closed
-            | _ -> Asttypes.Closed
-          in
-          let fields =
-            parseCommaDelimitedRegion ~grammar:Grammar.StringFieldDeclarations
-              ~closing:Rbrace ~f:parseStringFieldDeclaration p
-          in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let typ = Ast_helper.Typ.object_ ~loc ~attrs:[] fields closedFlag in
-          Parser.optional p Comma |> ignore;
-          let moreArgs =
-            parseCommaDelimitedRegion ~grammar:Grammar.TypExprList
-              ~closing:Rparen ~f:parseTypExprRegion p
-          in
-          Parser.expect Rparen p;
-          Parsetree.Pcstr_tuple (typ :: moreArgs)
-        | DotDotDot ->
-          let dotdotdotStart = p.startPos in
-          let dotdotdotEnd = p.endPos in
-          (* start of object type spreading, e.g. `User({...a, "u": int})` *)
-          Parser.next p;
-          let typ = parseTypExpr p in
-          let () =
-            match p.token with
-            | Rbrace ->
-              (* {...x}, spread without extra fields *)
-              Parser.next p
-            | _ -> Parser.expect Comma p
-          in
-          let () =
-            match p.token with
-            | Lident _ ->
-              Parser.err ~startPos:dotdotdotStart ~endPos:dotdotdotEnd p
-                (Diagnostics.message ErrorMessages.spreadInRecordDeclaration)
-            | _ -> ()
-          in
-          let fields =
-            Parsetree.Oinherit typ
-            :: parseCommaDelimitedRegion
-                 ~grammar:Grammar.StringFieldDeclarations ~closing:Rbrace
-                 ~f:parseStringFieldDeclaration p
-          in
-          Parser.expect Rbrace p;
-          let loc = mkLoc startPos p.prevEndPos in
-          let typ =
-            Ast_helper.Typ.object_ ~loc fields Asttypes.Closed
-            |> parseTypeAlias p
-          in
-          let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
-          Parser.optional p Comma |> ignore;
-          let moreArgs =
-            parseCommaDelimitedRegion ~grammar:Grammar.TypExprList
-              ~closing:Rparen ~f:parseTypExprRegion p
-          in
-          Parser.expect Rparen p;
-          Parsetree.Pcstr_tuple (typ :: moreArgs)
-        | _ -> (
-          let attrs = parseAttributes p in
-          match p.Parser.token with
-          | String _ ->
-            let closedFlag = Asttypes.Closed in
-            let fields =
-              match attrs with
-              | [] ->
-                parseCommaDelimitedRegion
-                  ~grammar:Grammar.StringFieldDeclarations ~closing:Rbrace
-                  ~f:parseStringFieldDeclaration p
-              | attrs ->
-                let first =
-                  Parser.leaveBreadcrumb p Grammar.StringFieldDeclarations;
-                  let field =
-                    match parseStringFieldDeclaration p with
-                    | Some field -> field
-                    | None -> assert false
-                  in
-                  (* parse comma after first *)
-                  let () =
-                    match p.Parser.token with
-                    | Rbrace | Eof -> ()
-                    | Comma -> Parser.next p
-                    | _ -> Parser.expect Comma p
-                  in
-                  Parser.eatBreadcrumb p;
-                  match field with
-                  | Parsetree.Otag (label, _, ct) ->
-                    Parsetree.Otag (label, attrs, ct)
-                  | Oinherit ct -> Oinherit ct
-                in
-                first
-                :: parseCommaDelimitedRegion
-                     ~grammar:Grammar.StringFieldDeclarations ~closing:Rbrace
-                     ~f:parseStringFieldDeclaration p
-            in
-            Parser.expect Rbrace p;
-            let loc = mkLoc startPos p.prevEndPos in
-            let typ =
-              Ast_helper.Typ.object_ ~loc ~attrs:[] fields closedFlag
-              |> parseTypeAlias p
-            in
-            let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
-            Parser.optional p Comma |> ignore;
-            let moreArgs =
-              parseCommaDelimitedRegion ~grammar:Grammar.TypExprList
-                ~closing:Rparen ~f:parseTypExprRegion p
-            in
-            Parser.expect Rparen p;
-            Parsetree.Pcstr_tuple (typ :: moreArgs)
-          | _ ->
-            let fields =
-              match attrs with
-              | [] ->
-                parseCommaDelimitedRegion ~grammar:Grammar.FieldDeclarations
-                  ~closing:Rbrace ~f:parseFieldDeclarationRegion p
-              | attrs ->
-                let first =
-                  let optional, field = parseFieldDeclaration p in
-                  let attrs =
-                    if optional then optionalAttr :: attrs else attrs
-                  in
-                  {field with Parsetree.pld_attributes = attrs}
-                in
-                if p.token = Rbrace then [first]
-                else (
-                  Parser.expect Comma p;
-                  first
-                  :: parseCommaDelimitedRegion
-                       ~grammar:Grammar.FieldDeclarations ~closing:Rbrace
-                       ~f:parseFieldDeclarationRegion p)
-            in
-            Parser.expect Rbrace p;
-            Parser.optional p Comma |> ignore;
-            Parser.expect Rparen p;
-            Parsetree.Pcstr_record fields))
-      | _ ->
-        let args =
-          parseCommaDelimitedRegion ~grammar:Grammar.TypExprList ~closing:Rparen
-            ~f:parseTypExprRegion p
-        in
-        Parser.expect Rparen p;
-        Parsetree.Pcstr_tuple args)
-    | _ -> Pcstr_tuple []
-  in
-  let res =
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      Some (parseTypExpr p)
-    | _ -> None
-  in
-  (constrArgs, res)
-
-(* constr-decl ::=
- *  | constr-name
- *  | attrs constr-name
- *  | constr-name const-args
- *  | attrs constr-name const-args *)
-and parseTypeConstructorDeclarationWithBar p =
-  match p.Parser.token with
-  | Bar ->
-    let startPos = p.Parser.startPos in
-    Parser.next p;
-    Some (parseTypeConstructorDeclaration ~startPos p)
-  | _ -> None
-
-and parseTypeConstructorDeclaration ~startPos p =
-  Parser.leaveBreadcrumb p Grammar.ConstructorDeclaration;
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | DotDotDot ->
-    Parser.next p;
-    let name = Location.mkloc "..." (mkLoc startPos p.prevEndPos) in
-    let typ = parsePolyTypeExpr p in
-    let loc = mkLoc startPos typ.ptyp_loc.loc_end in
-    Ast_helper.Type.constructor ~loc ~attrs ~args:(Pcstr_tuple [typ]) name
-  | Uident uident ->
-    let uidentLoc = mkLoc p.startPos p.endPos in
-    Parser.next p;
-    let args, res = parseConstrDeclArgs p in
-    Parser.eatBreadcrumb p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Type.constructor ~loc ~attrs ?res ~args
-      (Location.mkloc uident uidentLoc)
-  | t ->
-    Parser.err p (Diagnostics.uident t);
-    Ast_helper.Type.constructor (Location.mknoloc "_")
-
-(* [|] constr-decl  { | constr-decl }   *)
-and parseTypeConstructorDeclarations ?first p =
-  let firstConstrDecl =
-    match first with
-    | None ->
-      let startPos = p.Parser.startPos in
-      ignore (Parser.optional p Token.Bar);
-      parseTypeConstructorDeclaration ~startPos p
-    | Some firstConstrDecl -> firstConstrDecl
-  in
-  firstConstrDecl
-  :: parseRegion ~grammar:Grammar.ConstructorDeclaration
-       ~f:parseTypeConstructorDeclarationWithBar p
-
-(*
- * type-representation ::=
- *  ∣	 = [ | ] constr-decl  { | constr-decl }
- *  ∣	 = private [ | ] constr-decl  { | constr-decl }
- *  |  = |
- *  ∣	 = private |
- *  ∣	 = record-decl
- *  ∣	 = private record-decl
- *  |  = ..
- *)
-and parseTypeRepresentation p =
-  Parser.leaveBreadcrumb p Grammar.TypeRepresentation;
-  (* = consumed *)
-  let privateFlag =
-    if Parser.optional p Token.Private then Asttypes.Private
-    else Asttypes.Public
-  in
-  let kind =
-    match p.Parser.token with
-    | Bar | Uident _ ->
-      Parsetree.Ptype_variant (parseTypeConstructorDeclarations p)
-    | Lbrace -> Parsetree.Ptype_record (parseRecordDeclaration p)
-    | DotDot ->
-      Parser.next p;
-      Ptype_open
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      (* TODO: I have no idea if this is even remotely a good idea *)
-      Parsetree.Ptype_variant []
-  in
-  Parser.eatBreadcrumb p;
-  (privateFlag, kind)
-
-(* type-param	::=
- *  | variance 'lident
- *  | variance 'uident
- *  | variance _
- *
- * variance ::=
- *   | +
- *   | -
- *   | (* empty *)
- *)
-and parseTypeParam p =
-  let variance =
-    match p.Parser.token with
-    | Plus ->
-      Parser.next p;
-      Asttypes.Covariant
-    | Minus ->
-      Parser.next p;
-      Contravariant
-    | _ -> Invariant
-  in
-  match p.Parser.token with
-  | SingleQuote ->
-    Parser.next p;
-    let ident, loc =
-      if p.Parser.token = Eof then (
-        Parser.err ~startPos:p.startPos p
-          (Diagnostics.unexpected p.Parser.token p.breadcrumbs);
-        ("", mkLoc p.startPos p.prevEndPos))
-      else parseIdent ~msg:ErrorMessages.typeParam ~startPos:p.startPos p
-    in
-    Some (Ast_helper.Typ.var ~loc ident, variance)
-  | Underscore ->
-    let loc = mkLoc p.startPos p.endPos in
-    Parser.next p;
-    Some (Ast_helper.Typ.any ~loc (), variance)
-  | (Uident _ | Lident _) as token ->
-    Parser.err p
-      (Diagnostics.message
-         ("Type params start with a singlequote: '" ^ Token.toString token));
-    let ident, loc =
-      parseIdent ~msg:ErrorMessages.typeParam ~startPos:p.startPos p
-    in
-    Some (Ast_helper.Typ.var ~loc ident, variance)
-  | _token -> None
-
-(* type-params	::=
- *  | <type-param>
- *  ∣	<type-param, type-param>
- *  ∣	<type-param, type-param, type-param>
- *  ∣	<type-param, type-param, type-param,>
- *
- *  TODO: when we have pretty-printer show an error
- *  with the actual code corrected. *)
-and parseTypeParams ~parent p =
-  let opening = p.Parser.token in
-  match opening with
-  | (LessThan | Lparen) when p.startPos.pos_lnum == p.prevEndPos.pos_lnum ->
-    Scanner.setDiamondMode p.scanner;
-    let openingStartPos = p.startPos in
-    Parser.leaveBreadcrumb p Grammar.TypeParams;
-    Parser.next p;
-    let params =
-      parseCommaDelimitedRegion ~grammar:Grammar.TypeParams ~closing:GreaterThan
-        ~f:parseTypeParam p
-    in
-    let () =
-      match p.token with
-      | Rparen when opening = Token.Lparen ->
-        let msg =
-          Doc.breakableGroup ~forceBreak:true
-            (Doc.concat
-               [
-                 Doc.text "Type parameters require angle brackets:";
-                 Doc.indent
-                   (Doc.concat
-                      [
-                        Doc.line;
-                        Doc.concat
-                          [
-                            ResPrinter.printLongident parent.Location.txt;
-                            ResPrinter.printTypeParams params CommentTable.empty;
-                          ];
-                      ]);
-               ])
-          |> Doc.toString ~width:80
-        in
-        Parser.err ~startPos:openingStartPos p (Diagnostics.message msg);
-        Parser.next p
-      | _ -> Parser.expect GreaterThan p
-    in
-    Scanner.popMode p.scanner Diamond;
-    Parser.eatBreadcrumb p;
-    params
-  | _ -> []
-
-(* type-constraint	::=	constraint ' ident =  typexpr *)
-and parseTypeConstraint p =
-  let startPos = p.Parser.startPos in
-  match p.Parser.token with
-  | Token.Constraint -> (
-    Parser.next p;
-    Parser.expect SingleQuote p;
-    match p.Parser.token with
-    | Lident ident | Uident ident ->
-      let identLoc = mkLoc startPos p.endPos in
-      Parser.next p;
-      Parser.expect Equal p;
-      let typ = parseTypExpr p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Typ.var ~loc:identLoc ident, typ, loc)
-    | t ->
-      Parser.err p (Diagnostics.lident t);
-      let loc = mkLoc startPos p.prevEndPos in
-      Some (Ast_helper.Typ.any (), parseTypExpr p, loc))
-  | _ -> None
-
-(* type-constraints ::=
- *  | (* empty *)
- *  | type-constraint
- *  | type-constraint type-constraint
- *  | type-constraint type-constraint type-constraint (* 0 or more *)
- *)
-and parseTypeConstraints p =
-  parseRegion ~grammar:Grammar.TypeConstraint ~f:parseTypeConstraint p
-
-and parseTypeEquationOrConstrDecl p =
-  let uidentStartPos = p.Parser.startPos in
-  match p.Parser.token with
-  | Uident uident -> (
-    Parser.next p;
-    match p.Parser.token with
-    | Dot -> (
-      Parser.next p;
-      let typeConstr =
-        parseValuePathTail p uidentStartPos (Longident.Lident uident)
-      in
-      let loc = mkLoc uidentStartPos p.prevEndPos in
-      let typ =
-        parseTypeAlias p
-          (Ast_helper.Typ.constr ~loc typeConstr
-             (parseTypeConstructorArgs ~constrName:typeConstr p))
-      in
-      match p.token with
-      | Equal ->
-        Parser.next p;
-        let priv, kind = parseTypeRepresentation p in
-        (Some typ, priv, kind)
-      | EqualGreater ->
-        Parser.next p;
-        let returnType = parseTypExpr ~alias:false p in
-        let loc = mkLoc uidentStartPos p.prevEndPos in
-        let arrowType =
-          Ast_helper.Typ.arrow ~loc Asttypes.Nolabel typ returnType
-        in
-        let uncurried = p.uncurried_config <> Legacy in
-        let arrowType =
-          if uncurried then Ast_uncurried.uncurriedType ~loc ~arity:1 arrowType
-          else arrowType
-        in
-        let typ = parseTypeAlias p arrowType in
-        (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
-      | _ -> (Some typ, Asttypes.Public, Parsetree.Ptype_abstract))
-    | _ ->
-      let uidentEndPos = p.prevEndPos in
-      let args, res = parseConstrDeclArgs p in
-      let first =
-        Some
-          (let uidentLoc = mkLoc uidentStartPos uidentEndPos in
-           Ast_helper.Type.constructor
-             ~loc:(mkLoc uidentStartPos p.prevEndPos)
-             ?res ~args
-             (Location.mkloc uident uidentLoc))
-      in
-      ( None,
-        Asttypes.Public,
-        Parsetree.Ptype_variant (parseTypeConstructorDeclarations p ?first) ))
-  | t ->
-    Parser.err p (Diagnostics.uident t);
-    (* TODO: is this a good idea? *)
-    (None, Asttypes.Public, Parsetree.Ptype_abstract)
-
-and parseRecordOrObjectDecl p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Lbrace p;
-  match p.Parser.token with
-  | DotDot | Dot ->
-    let closedFlag =
-      match p.token with
-      | DotDot ->
-        Parser.next p;
-        Asttypes.Open
-      | Dot ->
-        Parser.next p;
-        Asttypes.Closed
-      | _ -> Asttypes.Closed
-    in
-    let fields =
-      parseCommaDelimitedRegion ~grammar:Grammar.StringFieldDeclarations
-        ~closing:Rbrace ~f:parseStringFieldDeclaration p
-    in
-    Parser.expect Rbrace p;
-    let loc = mkLoc startPos p.prevEndPos in
-    let typ =
-      Ast_helper.Typ.object_ ~loc ~attrs:[] fields closedFlag
-      |> parseTypeAlias p
-    in
-    let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
-    (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
-  | DotDotDot -> (
-    let dotdotdotStart = p.startPos in
-    let dotdotdotEnd = p.endPos in
-    (* start of object type spreading, e.g. `type u = {...a, "u": int}` *)
-    Parser.next p;
-    let typ = parseTypExpr p in
-    match p.token with
-    | Rbrace ->
-      (* {...x}, spread without extra fields *)
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      let dotField =
-        Ast_helper.Type.field ~loc
-          {txt = "..."; loc = mkLoc dotdotdotStart dotdotdotEnd}
-          typ
-      in
-      let kind = Parsetree.Ptype_record [dotField] in
-      (None, Public, kind)
-    | _ ->
-      Parser.expect Comma p;
-      let loc = mkLoc startPos p.prevEndPos in
-      let dotField =
-        Ast_helper.Type.field ~loc
-          {txt = "..."; loc = mkLoc dotdotdotStart dotdotdotEnd}
-          typ
-      in
-      let foundObjectField = ref false in
-      let fields =
-        parseCommaDelimitedRegion ~grammar:Grammar.RecordDecl ~closing:Rbrace
-          ~f:(parseFieldDeclarationRegion ~foundObjectField)
-          p
-      in
-      Parser.expect Rbrace p;
-      if !foundObjectField then
-        let fields =
-          Ext_list.map fields (fun ld ->
-              match ld.pld_name.txt with
-              | "..." -> Parsetree.Oinherit ld.pld_type
-              | _ -> Otag (ld.pld_name, ld.pld_attributes, ld.pld_type))
-        in
-        let dotField = Parsetree.Oinherit typ in
-        let typ_obj = Ast_helper.Typ.object_ (dotField :: fields) Closed in
-        let typ_obj = parseTypeAlias p typ_obj in
-        let typ_obj = parseArrowTypeRest ~es6Arrow:true ~startPos typ_obj p in
-        (Some typ_obj, Public, Ptype_abstract)
-      else
-        let kind = Parsetree.Ptype_record (dotField :: fields) in
-        (None, Public, kind))
-  | _ -> (
-    let attrs = parseAttributes p in
-    match p.Parser.token with
-    | String _ ->
-      let closedFlag = Asttypes.Closed in
-      let fields =
-        match attrs with
-        | [] ->
-          parseCommaDelimitedRegion ~grammar:Grammar.StringFieldDeclarations
-            ~closing:Rbrace ~f:parseStringFieldDeclaration p
-        | attrs ->
-          let first =
-            Parser.leaveBreadcrumb p Grammar.StringFieldDeclarations;
-            let field =
-              match parseStringFieldDeclaration p with
-              | Some field -> field
-              | None -> assert false
-            in
-            (* parse comma after first *)
-            let () =
-              match p.Parser.token with
-              | Rbrace | Eof -> ()
-              | Comma -> Parser.next p
-              | _ -> Parser.expect Comma p
-            in
-            Parser.eatBreadcrumb p;
-            match field with
-            | Parsetree.Otag (label, _, ct) -> Parsetree.Otag (label, attrs, ct)
-            | Oinherit ct -> Oinherit ct
-          in
-          first
-          :: parseCommaDelimitedRegion ~grammar:Grammar.StringFieldDeclarations
-               ~closing:Rbrace ~f:parseStringFieldDeclaration p
-      in
-      Parser.expect Rbrace p;
-      let loc = mkLoc startPos p.prevEndPos in
-      let typ =
-        Ast_helper.Typ.object_ ~loc ~attrs:[] fields closedFlag
-        |> parseTypeAlias p
-      in
-      let typ = parseArrowTypeRest ~es6Arrow:true ~startPos typ p in
-      (Some typ, Asttypes.Public, Parsetree.Ptype_abstract)
-    | _ ->
-      Parser.leaveBreadcrumb p Grammar.RecordDecl;
-      let fields =
-        (* XXX *)
-        match attrs with
-        | [] ->
-          parseCommaDelimitedRegion ~grammar:Grammar.FieldDeclarations
-            ~closing:Rbrace ~f:parseFieldDeclarationRegion p
-        | attr :: _ as attrs ->
-          let first =
-            let optional, field = parseFieldDeclaration p in
-            let attrs = if optional then optionalAttr :: attrs else attrs in
-            Parser.optional p Comma |> ignore;
-            {
-              field with
-              Parsetree.pld_attributes = attrs;
-              pld_loc =
-                {
-                  field.Parsetree.pld_loc with
-                  loc_start = (attr |> fst).loc.loc_start;
-                };
-            }
-          in
-          first
-          :: parseCommaDelimitedRegion ~grammar:Grammar.FieldDeclarations
-               ~closing:Rbrace ~f:parseFieldDeclarationRegion p
-      in
-      Parser.expect Rbrace p;
-      Parser.eatBreadcrumb p;
-      (None, Asttypes.Public, Parsetree.Ptype_record fields))
-
-and parsePrivateEqOrRepr p =
-  Parser.expect Private p;
-  match p.Parser.token with
-  | Lbrace ->
-    let manifest, _, kind = parseRecordOrObjectDecl p in
-    (manifest, Asttypes.Private, kind)
-  | Uident _ ->
-    let manifest, _, kind = parseTypeEquationOrConstrDecl p in
-    (manifest, Asttypes.Private, kind)
-  | Bar | DotDot ->
-    let _, kind = parseTypeRepresentation p in
-    (None, Asttypes.Private, kind)
-  | t when Grammar.isTypExprStart t ->
-    (Some (parseTypExpr p), Asttypes.Private, Parsetree.Ptype_abstract)
-  | _ ->
-    let _, kind = parseTypeRepresentation p in
-    (None, Asttypes.Private, kind)
-
-(*
-  polymorphic-variant-type	::=
-                            | [ tag-spec-first  { | tag-spec } ]
-                            | [> [ tag-spec ]  { | tag-spec } ]
-                            | [< [|] tag-spec-full  { | tag-spec-full }  [ > { `tag-name }+ ] ]
-
-            tag-spec-first	::=	`tag-name  [ of typexpr ]
-                            |	[ typexpr ] |  tag-spec
-
-                  tag-spec	::=	`tag-name  [ of typexpr ]
-                            |	typexpr
-
-              tag-spec-full	::=	`tag-name  [ of [&] typexpr  { & typexpr } ]
-                             |	typexpr
-*)
-and parsePolymorphicVariantType ~attrs p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Lbracket p;
-  match p.token with
-  | GreaterThan ->
-    Parser.next p;
-    let rowFields =
-      match p.token with
-      | Rbracket -> []
-      | Bar -> parseTagSpecs p
-      | _ ->
-        let rowField = parseTagSpec p in
-        rowField :: parseTagSpecs p
-    in
-    let variant =
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Typ.variant ~attrs ~loc rowFields Open None
-    in
-    Parser.expect Rbracket p;
-    variant
-  | LessThan ->
-    Parser.next p;
-    Parser.optional p Bar |> ignore;
-    let rowField = parseTagSpecFull p in
-    let rowFields = parseTagSpecFulls p in
-    let tagNames = parseTagNames p in
-    let variant =
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Typ.variant ~attrs ~loc (rowField :: rowFields) Closed
-        (Some tagNames)
-    in
-    Parser.expect Rbracket p;
-    variant
-  | _ ->
-    let rowFields1 = parseTagSpecFirst p in
-    let rowFields2 = parseTagSpecs p in
-    let variant =
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Typ.variant ~attrs ~loc (rowFields1 @ rowFields2) Closed None
-    in
-    Parser.expect Rbracket p;
-    variant
-
-and parseTagName p =
-  match p.Parser.token with
-  | Hash ->
-    let ident, _loc = parseHashIdent ~startPos:p.startPos p in
-    Some ident
-  | _ -> None
-
-and parseTagNames p =
-  if p.Parser.token == GreaterThan then (
-    Parser.next p;
-    parseRegion p ~grammar:Grammar.TagNames ~f:parseTagName)
-  else []
-
-and parseTagSpecFulls p =
-  match p.Parser.token with
-  | Rbracket -> []
-  | GreaterThan -> []
-  | Bar ->
-    Parser.next p;
-    let rowField = parseTagSpecFull p in
-    rowField :: parseTagSpecFulls p
-  | _ -> []
-
-and parseTagSpecFull p =
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | Hash -> parsePolymorphicVariantTypeSpecHash ~attrs ~full:true p
-  | _ ->
-    let typ = parseTypExpr ~attrs p in
-    Parsetree.Rinherit typ
-
-and parseTagSpecs p =
-  match p.Parser.token with
-  | Bar ->
-    Parser.next p;
-    let rowField = parseTagSpec p in
-    rowField :: parseTagSpecs p
-  | _ -> []
-
-and parseTagSpec p =
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | Hash -> parsePolymorphicVariantTypeSpecHash ~attrs ~full:false p
-  | _ ->
-    let typ = parseTypExpr ~attrs p in
-    Parsetree.Rinherit typ
-
-and parseTagSpecFirst p =
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | Bar ->
-    Parser.next p;
-    [parseTagSpec p]
-  | Hash -> [parsePolymorphicVariantTypeSpecHash ~attrs ~full:false p]
-  | _ -> (
-    let typ = parseTypExpr ~attrs p in
-    match p.token with
-    | Rbracket ->
-      (* example: [ListStyleType.t] *)
-      [Parsetree.Rinherit typ]
-    | _ ->
-      Parser.expect Bar p;
-      [Parsetree.Rinherit typ; parseTagSpec p])
-
-and parsePolymorphicVariantTypeSpecHash ~attrs ~full p : Parsetree.row_field =
-  let startPos = p.Parser.startPos in
-  let ident, loc = parseHashIdent ~startPos p in
-  let rec loop p =
-    match p.Parser.token with
-    | Band when full ->
-      Parser.next p;
-      let rowField = parsePolymorphicVariantTypeArgs p in
-      rowField :: loop p
-    | _ -> []
-  in
-  let firstTuple, tagContainsAConstantEmptyConstructor =
-    match p.Parser.token with
-    | Band when full ->
-      Parser.next p;
-      ([parsePolymorphicVariantTypeArgs p], true)
-    | Lparen -> ([parsePolymorphicVariantTypeArgs p], false)
-    | _ -> ([], true)
-  in
-  let tuples = firstTuple @ loop p in
-  Parsetree.Rtag
-    ( Location.mkloc ident loc,
-      attrs,
-      tagContainsAConstantEmptyConstructor,
-      tuples )
-
-and parsePolymorphicVariantTypeArgs p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Lparen p;
-  let args =
-    parseCommaDelimitedRegion ~grammar:Grammar.TypExprList ~closing:Rparen
-      ~f:parseTypExprRegion p
-  in
-  Parser.expect Rparen p;
-  let attrs = [] in
-  let loc = mkLoc startPos p.prevEndPos in
-  match args with
-  | [({ptyp_desc = Ptyp_tuple _} as typ)] as types ->
-    if p.mode = ParseForTypeChecker then typ
-    else Ast_helper.Typ.tuple ~loc ~attrs types
-  | [typ] -> typ
-  | types -> Ast_helper.Typ.tuple ~loc ~attrs types
-
-and parseTypeEquationAndRepresentation p =
-  match p.Parser.token with
-  | (Equal | Bar) as token -> (
-    if token = Bar then Parser.expect Equal p;
-    Parser.next p;
-    match p.Parser.token with
-    | Uident _ -> parseTypeEquationOrConstrDecl p
-    | Lbrace -> parseRecordOrObjectDecl p
-    | Private -> parsePrivateEqOrRepr p
-    | Bar | DotDot ->
-      let priv, kind = parseTypeRepresentation p in
-      (None, priv, kind)
-    | _ -> (
-      let manifest = Some (parseTypExpr p) in
-      match p.Parser.token with
-      | Equal ->
-        Parser.next p;
-        let priv, kind = parseTypeRepresentation p in
-        (manifest, priv, kind)
-      | _ -> (manifest, Public, Parsetree.Ptype_abstract)))
-  | _ -> (None, Public, Parsetree.Ptype_abstract)
-
-(* type-definition	::=	type [rec] typedef  { and typedef }
- * typedef	::=	typeconstr-name [type-params] type-information
- * type-information	::=	[type-equation]  [type-representation]  { type-constraint }
- * type-equation	::=	= typexpr *)
-and parseTypeDef ~attrs ~startPos p =
-  Parser.leaveBreadcrumb p Grammar.TypeDef;
-  (* let attrs = match attrs with | Some attrs -> attrs | None -> parseAttributes p in *)
-  Parser.leaveBreadcrumb p Grammar.TypeConstrName;
-  let name, loc = parseLident p in
-  let typeConstrName = Location.mkloc name loc in
-  Parser.eatBreadcrumb p;
-  let params =
-    let constrName = Location.mkloc (Longident.Lident name) loc in
-    parseTypeParams ~parent:constrName p
-  in
-  let typeDef =
-    let manifest, priv, kind = parseTypeEquationAndRepresentation p in
-    let cstrs = parseTypeConstraints p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Type.mk ~loc ~attrs ~priv ~kind ~params ~cstrs ?manifest
-      typeConstrName
-  in
-  Parser.eatBreadcrumb p;
-  typeDef
-
-and parseTypeExtension ~params ~attrs ~name p =
-  Parser.expect PlusEqual p;
-  let priv =
-    if Parser.optional p Token.Private then Asttypes.Private
-    else Asttypes.Public
-  in
-  let constrStart = p.Parser.startPos in
-  Parser.optional p Bar |> ignore;
-  let first =
-    let attrs, name, kind =
-      match p.Parser.token with
-      | Bar ->
-        Parser.next p;
-        parseConstrDef ~parseAttrs:true p
-      | _ -> parseConstrDef ~parseAttrs:true p
-    in
-    let loc = mkLoc constrStart p.prevEndPos in
-    Ast_helper.Te.constructor ~loc ~attrs name kind
-  in
-  let rec loop p cs =
-    match p.Parser.token with
-    | Bar ->
-      let startPos = p.Parser.startPos in
-      Parser.next p;
-      let attrs, name, kind = parseConstrDef ~parseAttrs:true p in
-      let extConstr =
-        Ast_helper.Te.constructor ~attrs
-          ~loc:(mkLoc startPos p.prevEndPos)
-          name kind
-      in
-      loop p (extConstr :: cs)
-    | _ -> List.rev cs
-  in
-  let constructors = loop p [first] in
-  Ast_helper.Te.mk ~attrs ~params ~priv name constructors
-
-and parseTypeDefinitions ~attrs ~name ~params ~startPos p =
-  let typeDef =
-    let manifest, priv, kind = parseTypeEquationAndRepresentation p in
-    let cstrs = parseTypeConstraints p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Type.mk ~loc ~attrs ~priv ~kind ~params ~cstrs ?manifest
-      {name with txt = lidentOfPath name.Location.txt}
-  in
-  let rec loop p defs =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributesAndBinding p in
-    match p.Parser.token with
-    | And ->
-      Parser.next p;
-      let typeDef = parseTypeDef ~attrs ~startPos p in
-      loop p (typeDef :: defs)
-    | _ -> List.rev defs
-  in
-  loop p [typeDef]
-
-(* TODO: decide if we really want type extensions (eg. type x += Blue)
- * It adds quite a bit of complexity that can be avoided,
- * implemented for now. Needed to get a feel for the complexities of
- * this territory of the grammar *)
-and parseTypeDefinitionOrExtension ~attrs p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Token.Typ p;
-  let recFlag =
-    match p.token with
-    | Rec ->
-      Parser.next p;
-      Asttypes.Recursive
-    | Lident "nonrec" ->
-      Parser.next p;
-      Asttypes.Nonrecursive
-    | _ -> Asttypes.Nonrecursive
-  in
-  let name = parseValuePath p in
-  let params = parseTypeParams ~parent:name p in
-  match p.Parser.token with
-  | PlusEqual -> TypeExt (parseTypeExtension ~params ~attrs ~name p)
-  | _ ->
-    (* shape of type name should be Lident, i.e. `t` is accepted. `User.t` not *)
-    let () =
-      match name.Location.txt with
-      | Lident _ -> ()
-      | longident ->
-        Parser.err ~startPos:name.loc.loc_start ~endPos:name.loc.loc_end p
-          (longident |> ErrorMessages.typeDeclarationNameLongident
-         |> Diagnostics.message)
-    in
-    let typeDefs = parseTypeDefinitions ~attrs ~name ~params ~startPos p in
-    TypeDef {recFlag; types = typeDefs}
-
-(* external value-name : typexp = external-declaration *)
-and parseExternalDef ~attrs ~startPos p =
-  let inExternal = !InExternal.status in
-  InExternal.status := true;
-  Parser.leaveBreadcrumb p Grammar.External;
-  Parser.expect Token.External p;
-  let name, loc = parseLident p in
-  let name = Location.mkloc name loc in
-  Parser.expect ~grammar:Grammar.TypeExpression Colon p;
-  let typExpr = parseTypExpr p in
-  let equalStart = p.startPos in
-  let equalEnd = p.endPos in
-  Parser.expect Equal p;
-  let prim =
-    match p.token with
-    | String s ->
-      Parser.next p;
-      [s]
-    | _ ->
-      Parser.err ~startPos:equalStart ~endPos:equalEnd p
-        (Diagnostics.message
-           ("An external requires the name of the JS value you're referring \
-             to, like \"" ^ name.txt ^ "\"."));
-      []
-  in
-  let loc = mkLoc startPos p.prevEndPos in
-  let vb = Ast_helper.Val.mk ~loc ~attrs ~prim name typExpr in
-  Parser.eatBreadcrumb p;
-  InExternal.status := inExternal;
-  vb
-
-(* constr-def ::=
- *  | constr-decl
- *  | constr-name = constr
- *
- *  constr-decl ::= constr-name constr-args
- *  constr-name ::= uident
- *  constr      ::= path-uident *)
-and parseConstrDef ~parseAttrs p =
-  let attrs = if parseAttrs then parseAttributes p else [] in
-  let name =
-    match p.Parser.token with
-    | Uident name ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc name loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-  in
-  let kind =
-    match p.Parser.token with
-    | Lparen ->
-      let args, res = parseConstrDeclArgs p in
-      Parsetree.Pext_decl (args, res)
-    | Equal ->
-      Parser.next p;
-      let longident = parseModuleLongIdent ~lowercase:false p in
-      Parsetree.Pext_rebind longident
-    | Colon ->
-      Parser.next p;
-      let typ = parseTypExpr p in
-      Parsetree.Pext_decl (Pcstr_tuple [], Some typ)
-    | _ -> Parsetree.Pext_decl (Pcstr_tuple [], None)
-  in
-  (attrs, name, kind)
-
-(*
- * exception-definition	::=
- *  | exception constr-decl
- *  ∣	exception constr-name = constr
- *
- *  constr-name ::= uident
- *  constr ::= long_uident *)
-and parseExceptionDef ~attrs p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Token.Exception p;
-  let _, name, kind = parseConstrDef ~parseAttrs:false p in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Te.constructor ~loc ~attrs name kind
-
-and parseNewlineOrSemicolonStructure p =
-  match p.Parser.token with
-  | Semicolon -> Parser.next p
-  | token when Grammar.isStructureItemStart token ->
-    if p.prevEndPos.pos_lnum < p.startPos.pos_lnum then ()
-    else
-      Parser.err ~startPos:p.prevEndPos ~endPos:p.endPos p
-        (Diagnostics.message
-           "consecutive statements on a line must be separated by ';' or a \
-            newline")
-  | _ -> ()
-
-and parseStructureItemRegion p =
-  let startPos = p.Parser.startPos in
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | Open ->
-    let openDescription = parseOpenDescription ~attrs p in
-    parseNewlineOrSemicolonStructure p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Str.open_ ~loc openDescription)
-  | Let ->
-    let recFlag, letBindings = parseLetBindings ~attrs ~startPos p in
-    parseNewlineOrSemicolonStructure p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Str.value ~loc recFlag letBindings)
-  | Typ -> (
-    Parser.beginRegion p;
-    match parseTypeDefinitionOrExtension ~attrs p with
-    | TypeDef {recFlag; types} ->
-      parseNewlineOrSemicolonStructure p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Parser.endRegion p;
-      Some (Ast_helper.Str.type_ ~loc recFlag types)
-    | TypeExt ext ->
-      parseNewlineOrSemicolonStructure p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Parser.endRegion p;
-      Some (Ast_helper.Str.type_extension ~loc ext))
-  | External ->
-    let externalDef = parseExternalDef ~attrs ~startPos p in
-    parseNewlineOrSemicolonStructure p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Str.primitive ~loc externalDef)
-  | Exception ->
-    let exceptionDef = parseExceptionDef ~attrs p in
-    parseNewlineOrSemicolonStructure p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Str.exception_ ~loc exceptionDef)
-  | Include ->
-    let includeStatement = parseIncludeStatement ~attrs p in
-    parseNewlineOrSemicolonStructure p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Str.include_ ~loc includeStatement)
-  | Module ->
-    Parser.beginRegion p;
-    let structureItem = parseModuleOrModuleTypeImplOrPackExpr ~attrs p in
-    parseNewlineOrSemicolonStructure p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Parser.endRegion p;
-    Some {structureItem with pstr_loc = loc}
-  | ModuleComment (loc, s) ->
-    Parser.next p;
-    Some
-      (Ast_helper.Str.attribute ~loc
-         ( {txt = "res.doc"; loc},
-           PStr
-             [
-               Ast_helper.Str.eval ~loc
-                 (Ast_helper.Exp.constant ~loc (Pconst_string (s, None)));
-             ] ))
-  | AtAt ->
-    let attr = parseStandaloneAttribute p in
-    parseNewlineOrSemicolonStructure p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Str.attribute ~loc attr)
-  | PercentPercent ->
-    let extension = parseExtension ~moduleLanguage:true p in
-    parseNewlineOrSemicolonStructure p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Str.extension ~attrs ~loc extension)
-  | token when Grammar.isExprStart token ->
-    let prevEndPos = p.Parser.endPos in
-    let exp = parseExpr p in
-    parseNewlineOrSemicolonStructure p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Parser.checkProgress ~prevEndPos
-      ~result:(Ast_helper.Str.eval ~loc ~attrs exp)
-      p
-  | _ -> (
-    match attrs with
-    | (({Asttypes.loc = attrLoc}, _) as attr) :: _ ->
-      Parser.err ~startPos:attrLoc.loc_start ~endPos:attrLoc.loc_end p
-        (Diagnostics.message (ErrorMessages.attributeWithoutNode attr));
-      let expr = parseExpr p in
-      Some
-        (Ast_helper.Str.eval ~loc:(mkLoc p.startPos p.prevEndPos) ~attrs expr)
-    | _ -> None)
-[@@progress Parser.next, Parser.expect, LoopProgress.listRest]
-
-(* include-statement ::= include module-expr *)
-and parseIncludeStatement ~attrs p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Token.Include p;
-  let modExpr = parseModuleExpr p in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Incl.mk ~loc ~attrs modExpr
-
-and parseAtomicModuleExpr p =
-  let startPos = p.Parser.startPos in
-  match p.Parser.token with
-  | Uident _ident ->
-    let longident = parseModuleLongIdent ~lowercase:false p in
-    Ast_helper.Mod.ident ~loc:longident.loc longident
-  | Lbrace ->
-    Parser.next p;
-    let structure =
-      Ast_helper.Mod.structure
-        (parseDelimitedRegion ~grammar:Grammar.Structure ~closing:Rbrace
-           ~f:parseStructureItemRegion p)
-    in
-    Parser.expect Rbrace p;
-    let endPos = p.prevEndPos in
-    {structure with pmod_loc = mkLoc startPos endPos}
-  | Lparen ->
-    Parser.next p;
-    let modExpr =
-      match p.token with
-      | Rparen -> Ast_helper.Mod.structure ~loc:(mkLoc startPos p.prevEndPos) []
-      | _ -> parseConstrainedModExpr p
-    in
-    Parser.expect Rparen p;
-    modExpr
-  | Lident "unpack" -> (
-    (* TODO: should this be made a keyword?? *)
-    Parser.next p;
-    Parser.expect Lparen p;
-    let expr = parseExpr p in
-    match p.Parser.token with
-    | Colon ->
-      let colonStart = p.Parser.startPos in
-      Parser.next p;
-      let attrs = parseAttributes p in
-      let packageType = parsePackageType ~startPos:colonStart ~attrs p in
-      Parser.expect Rparen p;
-      let loc = mkLoc startPos p.prevEndPos in
-      let constraintExpr = Ast_helper.Exp.constraint_ ~loc expr packageType in
-      Ast_helper.Mod.unpack ~loc constraintExpr
-    | _ ->
-      Parser.expect Rparen p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Mod.unpack ~loc expr)
-  | Percent ->
-    let extension = parseExtension p in
-    let loc = mkLoc startPos p.prevEndPos in
-    Ast_helper.Mod.extension ~loc extension
-  | token ->
-    Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-    Recover.defaultModuleExpr ()
-
-and parsePrimaryModExpr p =
-  let startPos = p.Parser.startPos in
-  let modExpr = parseAtomicModuleExpr p in
-  let rec loop p modExpr =
-    match p.Parser.token with
-    | Lparen when p.prevEndPos.pos_lnum == p.startPos.pos_lnum ->
-      loop p (parseModuleApplication p modExpr)
-    | _ -> modExpr
-  in
-  let modExpr = loop p modExpr in
-  {modExpr with pmod_loc = mkLoc startPos p.prevEndPos}
-
-(*
- * functor-arg ::=
- *  | uident : modtype
- *  | _ : modtype
- *  | modtype           --> "punning" for _ : modtype
- *  | attributes functor-arg
- *)
-and parseFunctorArg p =
-  let startPos = p.Parser.startPos in
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | Uident ident -> (
-    Parser.next p;
-    let uidentEndPos = p.prevEndPos in
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      let moduleType = parseModuleType p in
-      let loc = mkLoc startPos uidentEndPos in
-      let argName = Location.mkloc ident loc in
-      Some (attrs, argName, Some moduleType, startPos)
-    | Dot ->
-      Parser.next p;
-      let moduleType =
-        let moduleLongIdent =
-          parseModuleLongIdentTail ~lowercase:false p startPos
-            (Longident.Lident ident)
-        in
-        Ast_helper.Mty.ident ~loc:moduleLongIdent.loc moduleLongIdent
-      in
-      let argName = Location.mknoloc "_" in
-      Some (attrs, argName, Some moduleType, startPos)
-    | _ ->
-      let loc = mkLoc startPos uidentEndPos in
-      let modIdent = Location.mkloc (Longident.Lident ident) loc in
-      let moduleType = Ast_helper.Mty.ident ~loc modIdent in
-      let argName = Location.mknoloc "_" in
-      Some (attrs, argName, Some moduleType, startPos))
-  | Underscore ->
-    Parser.next p;
-    let argName = Location.mkloc "_" (mkLoc startPos p.prevEndPos) in
-    Parser.expect Colon p;
-    let moduleType = parseModuleType p in
-    Some (attrs, argName, Some moduleType, startPos)
-  | Lparen ->
-    Parser.next p;
-    Parser.expect Rparen p;
-    let argName = Location.mkloc "*" (mkLoc startPos p.prevEndPos) in
-    Some (attrs, argName, None, startPos)
-  | _ -> None
-
-and parseFunctorArgs p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Lparen p;
-  let args =
-    parseCommaDelimitedRegion ~grammar:Grammar.FunctorArgs ~closing:Rparen
-      ~f:parseFunctorArg p
-  in
-  Parser.expect Rparen p;
-  match args with
-  | [] ->
-    [([], Location.mkloc "*" (mkLoc startPos p.prevEndPos), None, startPos)]
-  | args -> args
-
-and parseFunctorModuleExpr p =
-  let startPos = p.Parser.startPos in
-  let args = parseFunctorArgs p in
-  let returnType =
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      Some (parseModuleType ~es6Arrow:false p)
-    | _ -> None
-  in
-  Parser.expect EqualGreater p;
-  let rhsModuleExpr =
-    let modExpr = parseModuleExpr p in
-    match returnType with
-    | Some modType ->
-      Ast_helper.Mod.constraint_
-        ~loc:
-          (mkLoc modExpr.pmod_loc.loc_start modType.Parsetree.pmty_loc.loc_end)
-        modExpr modType
-    | None -> modExpr
-  in
-  let endPos = p.prevEndPos in
-  let modExpr =
-    List.fold_right
-      (fun (attrs, name, moduleType, startPos) acc ->
-        Ast_helper.Mod.functor_ ~loc:(mkLoc startPos endPos) ~attrs name
-          moduleType acc)
-      args rhsModuleExpr
-  in
-  {modExpr with pmod_loc = mkLoc startPos endPos}
-
-(* module-expr	::=
- *  | module-path
- *  ∣	{ structure-items }
- *  ∣	functorArgs =>  module-expr
- *  ∣	module-expr(module-expr)
- *  ∣	( module-expr )
- *  ∣	( module-expr : module-type )
- *  | extension
- *  | attributes module-expr *)
-and parseModuleExpr p =
-  let hasAwait, loc_await =
-    let startPos = p.startPos in
-    match p.Parser.token with
-    | Await ->
-      Parser.expect Await p;
-      let endPos = p.endPos in
-      (true, mkLoc startPos endPos)
-    | _ -> (false, mkLoc startPos startPos)
-  in
-  let attrs = parseAttributes p in
-  let attrs =
-    if hasAwait then
-      (({txt = "res.await"; loc = loc_await}, PStr []) : Parsetree.attribute)
-      :: attrs
-    else attrs
-  in
-  let modExpr =
-    if isEs6ArrowFunctor p then parseFunctorModuleExpr p
-    else parsePrimaryModExpr p
-  in
-  {modExpr with pmod_attributes = List.concat [modExpr.pmod_attributes; attrs]}
-
-and parseConstrainedModExpr p =
-  let modExpr = parseModuleExpr p in
-  match p.Parser.token with
-  | Colon ->
-    Parser.next p;
-    let modType = parseModuleType p in
-    let loc = mkLoc modExpr.pmod_loc.loc_start modType.pmty_loc.loc_end in
-    Ast_helper.Mod.constraint_ ~loc modExpr modType
-  | _ -> modExpr
-
-and parseConstrainedModExprRegion p =
-  if Grammar.isModExprStart p.Parser.token then Some (parseConstrainedModExpr p)
-  else None
-
-and parseModuleApplication p modExpr =
-  let startPos = p.Parser.startPos in
-  Parser.expect Lparen p;
-  let args =
-    parseCommaDelimitedRegion ~grammar:Grammar.ModExprList ~closing:Rparen
-      ~f:parseConstrainedModExprRegion p
-  in
-  Parser.expect Rparen p;
-  let args =
-    match args with
-    | [] ->
-      let loc = mkLoc startPos p.prevEndPos in
-      [Ast_helper.Mod.structure ~loc []]
-    | args -> args
-  in
-  List.fold_left
-    (fun modExpr arg ->
-      Ast_helper.Mod.apply
-        ~loc:
-          (mkLoc modExpr.Parsetree.pmod_loc.loc_start
-             arg.Parsetree.pmod_loc.loc_end)
-        modExpr arg)
-    modExpr args
-
-and parseModuleOrModuleTypeImplOrPackExpr ~attrs p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Module p;
-  match p.Parser.token with
-  | Typ -> parseModuleTypeImpl ~attrs startPos p
-  | Lparen ->
-    let expr = parseFirstClassModuleExpr ~startPos p in
-    let a = parsePrimaryExpr ~operand:expr p in
-    let expr = parseBinaryExpr ~a p 1 in
-    let expr = parseTernaryExpr expr p in
-    Ast_helper.Str.eval ~attrs expr
-  | _ -> parseMaybeRecModuleBinding ~attrs ~startPos p
-
-and parseModuleTypeImpl ~attrs startPos p =
-  Parser.expect Typ p;
-  let nameStart = p.Parser.startPos in
-  let name =
-    match p.Parser.token with
-    | Lident ident ->
-      Parser.next p;
-      let loc = mkLoc nameStart p.prevEndPos in
-      Location.mkloc ident loc
-    | Uident ident ->
-      Parser.next p;
-      let loc = mkLoc nameStart p.prevEndPos in
-      Location.mkloc ident loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-  in
-  Parser.expect Equal p;
-  let moduleType = parseModuleType p in
-  let moduleTypeDeclaration =
-    Ast_helper.Mtd.mk ~attrs
-      ~loc:(mkLoc nameStart p.prevEndPos)
-      ~typ:moduleType name
-  in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Str.modtype ~loc moduleTypeDeclaration
-
-(* definition	::=
-   ∣	 module rec module-name :  module-type =  module-expr   { and module-name
-   :  module-type =  module-expr } *)
-and parseMaybeRecModuleBinding ~attrs ~startPos p =
-  match p.Parser.token with
-  | Token.Rec ->
-    Parser.next p;
-    Ast_helper.Str.rec_module (parseModuleBindings ~startPos ~attrs p)
-  | _ ->
-    Ast_helper.Str.module_
-      (parseModuleBinding ~attrs ~startPos:p.Parser.startPos p)
-
-and parseModuleBinding ~attrs ~startPos p =
-  let name =
-    match p.Parser.token with
-    | Uident ident ->
-      let startPos = p.Parser.startPos in
-      Parser.next p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Location.mkloc ident loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-  in
-  let body = parseModuleBindingBody p in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Mb.mk ~attrs ~loc name body
-
-and parseModuleBindingBody p =
-  (* TODO: make required with good error message when rec module binding *)
-  let returnModType =
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      Some (parseModuleType p)
-    | _ -> None
-  in
-  Parser.expect Equal p;
-  let modExpr = parseModuleExpr p in
-  match returnModType with
-  | Some modType ->
-    Ast_helper.Mod.constraint_
-      ~loc:(mkLoc modType.pmty_loc.loc_start modExpr.pmod_loc.loc_end)
-      modExpr modType
-  | None -> modExpr
-
-(* module-name :  module-type =  module-expr
- * { and module-name :  module-type =  module-expr } *)
-and parseModuleBindings ~attrs ~startPos p =
-  let rec loop p acc =
-    let startPos = p.Parser.startPos in
-    let docAttr : Parsetree.attributes =
-      match p.Parser.token with
-      | DocComment (loc, s) ->
-        Parser.next p;
-        [docCommentToAttribute loc s]
-      | _ -> []
-    in
-    let attrs = docAttr @ parseAttributesAndBinding p in
-    match p.Parser.token with
-    | And ->
-      Parser.next p;
-      ignore (Parser.optional p Module);
-      (* over-parse for fault-tolerance *)
-      let modBinding = parseModuleBinding ~attrs ~startPos p in
-      loop p (modBinding :: acc)
-    | _ -> List.rev acc
-  in
-  let first = parseModuleBinding ~attrs ~startPos p in
-  loop p [first]
-
-and parseAtomicModuleType p =
-  let startPos = p.Parser.startPos in
-  let moduleType =
-    match p.Parser.token with
-    | Uident _ | Lident _ ->
-      (* Ocaml allows module types to end with lowercase: module Foo : bar = { ... }
-       * lets go with uppercase terminal for now *)
-      let moduleLongIdent = parseModuleLongIdent ~lowercase:true p in
-      Ast_helper.Mty.ident ~loc:moduleLongIdent.loc moduleLongIdent
-    | Lparen ->
-      Parser.next p;
-      let mty = parseModuleType p in
-      Parser.expect Rparen p;
-      {mty with pmty_loc = mkLoc startPos p.prevEndPos}
-    | Lbrace ->
-      Parser.next p;
-      let spec =
-        parseDelimitedRegion ~grammar:Grammar.Signature ~closing:Rbrace
-          ~f:parseSignatureItemRegion p
-      in
-      Parser.expect Rbrace p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Mty.signature ~loc spec
-    | Module ->
-      (* TODO: check if this is still atomic when implementing first class modules*)
-      parseModuleTypeOf p
-    | Percent ->
-      let extension = parseExtension p in
-      let loc = mkLoc startPos p.prevEndPos in
-      Ast_helper.Mty.extension ~loc extension
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Recover.defaultModuleType ()
-  in
-  let moduleTypeLoc = mkLoc startPos p.prevEndPos in
-  {moduleType with pmty_loc = moduleTypeLoc}
-
-and parseFunctorModuleType p =
-  let startPos = p.Parser.startPos in
-  let args = parseFunctorArgs p in
-  Parser.expect EqualGreater p;
-  let rhs = parseModuleType p in
-  let endPos = p.prevEndPos in
-  let modType =
-    List.fold_right
-      (fun (attrs, name, moduleType, startPos) acc ->
-        Ast_helper.Mty.functor_ ~loc:(mkLoc startPos endPos) ~attrs name
-          moduleType acc)
-      args rhs
-  in
-  {modType with pmty_loc = mkLoc startPos endPos}
-
-(* Module types are the module-level equivalent of type expressions: they
- * specify the general shape and type properties of modules.
- *
- * module-type ::=
- *  | modtype-path
- *  | { signature }
- *  | ( module-type )               --> parenthesized module-type
- *  | functor-args => module-type   --> functor
- *  | module-type => module-type    --> functor
- *  | module type of module-expr
- *  | attributes module-type
- *  | module-type with-mod-constraints
- *  | extension
- *)
-and parseModuleType ?(es6Arrow = true) ?(with_ = true) p =
-  let attrs = parseAttributes p in
-  let modty =
-    if es6Arrow && isEs6ArrowFunctor p then parseFunctorModuleType p
-    else
-      let modty = parseAtomicModuleType p in
-      match p.Parser.token with
-      | EqualGreater when es6Arrow == true ->
-        Parser.next p;
-        let rhs = parseModuleType ~with_:false p in
-        let str = Location.mknoloc "_" in
-        let loc = mkLoc modty.pmty_loc.loc_start p.prevEndPos in
-        Ast_helper.Mty.functor_ ~loc str (Some modty) rhs
-      | _ -> modty
-  in
-  let moduleType =
-    {modty with pmty_attributes = List.concat [modty.pmty_attributes; attrs]}
-  in
-  if with_ then parseWithConstraints moduleType p else moduleType
-
-and parseWithConstraints moduleType p =
-  match p.Parser.token with
-  | Lident "with" ->
-    Parser.next p;
-    let first = parseWithConstraint p in
-    let rec loop p acc =
-      match p.Parser.token with
-      | And ->
-        Parser.next p;
-        loop p (parseWithConstraint p :: acc)
-      | _ -> List.rev acc
-    in
-    let constraints = loop p [first] in
-    let loc = mkLoc moduleType.pmty_loc.loc_start p.prevEndPos in
-    Ast_helper.Mty.with_ ~loc moduleType constraints
-  | _ -> moduleType
-
-(* mod-constraint	::=
- *  |  type typeconstr<type-params> type-equation type-constraints?
- *  ∣	 type typeconstr-name<type-params> := typexpr
- *  ∣	 module module-path = extended-module-path
- *  ∣	 module module-path :=  extended-module-path
- *
- *  TODO: split this up into multiple functions, better errors *)
-and parseWithConstraint p =
-  match p.Parser.token with
-  | Module -> (
-    Parser.next p;
-    let modulePath = parseModuleLongIdent ~lowercase:false p in
-    match p.Parser.token with
-    | ColonEqual ->
-      Parser.next p;
-      let lident = parseModuleLongIdent ~lowercase:false p in
-      Parsetree.Pwith_modsubst (modulePath, lident)
-    | Equal ->
-      Parser.next p;
-      let lident = parseModuleLongIdent ~lowercase:false p in
-      Parsetree.Pwith_module (modulePath, lident)
-    | token ->
-      (* TODO: revisit *)
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      let lident = parseModuleLongIdent ~lowercase:false p in
-      Parsetree.Pwith_modsubst (modulePath, lident))
-  | Typ -> (
-    Parser.next p;
-    let typeConstr = parseValuePath p in
-    let params = parseTypeParams ~parent:typeConstr p in
-    match p.Parser.token with
-    | ColonEqual ->
-      Parser.next p;
-      let typExpr = parseTypExpr p in
-      Parsetree.Pwith_typesubst
-        ( typeConstr,
-          Ast_helper.Type.mk ~loc:typeConstr.loc ~params ~manifest:typExpr
-            (Location.mkloc (Longident.last typeConstr.txt) typeConstr.loc) )
-    | Equal ->
-      Parser.next p;
-      let typExpr = parseTypExpr p in
-      let typeConstraints = parseTypeConstraints p in
-      Parsetree.Pwith_type
-        ( typeConstr,
-          Ast_helper.Type.mk ~loc:typeConstr.loc ~params ~manifest:typExpr
-            ~cstrs:typeConstraints
-            (Location.mkloc (Longident.last typeConstr.txt) typeConstr.loc) )
-    | token ->
-      (* TODO: revisit *)
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      let typExpr = parseTypExpr p in
-      let typeConstraints = parseTypeConstraints p in
-      Parsetree.Pwith_type
-        ( typeConstr,
-          Ast_helper.Type.mk ~loc:typeConstr.loc ~params ~manifest:typExpr
-            ~cstrs:typeConstraints
-            (Location.mkloc (Longident.last typeConstr.txt) typeConstr.loc) ))
-  | token ->
-    (* TODO: implement recovery strategy *)
-    Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-    Parsetree.Pwith_type
-      ( Location.mknoloc (Longident.Lident ""),
-        Ast_helper.Type.mk ~params:[] ~manifest:(Recover.defaultType ())
-          ~cstrs:[] (Location.mknoloc "") )
-
-and parseModuleTypeOf p =
-  let startPos = p.Parser.startPos in
-  Parser.expect Module p;
-  Parser.expect Typ p;
-  Parser.expect Of p;
-  let moduleExpr = parseModuleExpr p in
-  Ast_helper.Mty.typeof_ ~loc:(mkLoc startPos p.prevEndPos) moduleExpr
-
-and parseNewlineOrSemicolonSignature p =
-  match p.Parser.token with
-  | Semicolon -> Parser.next p
-  | token when Grammar.isSignatureItemStart token ->
-    if p.prevEndPos.pos_lnum < p.startPos.pos_lnum then ()
-    else
-      Parser.err ~startPos:p.prevEndPos ~endPos:p.endPos p
-        (Diagnostics.message
-           "consecutive specifications on a line must be separated by ';' or a \
-            newline")
-  | _ -> ()
-
-and parseSignatureItemRegion p =
-  let startPos = p.Parser.startPos in
-  let attrs = parseAttributes p in
-  match p.Parser.token with
-  | Let ->
-    Parser.beginRegion p;
-    let valueDesc = parseSignLetDesc ~attrs p in
-    parseNewlineOrSemicolonSignature p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Parser.endRegion p;
-    Some (Ast_helper.Sig.value ~loc valueDesc)
-  | Typ -> (
-    Parser.beginRegion p;
-    match parseTypeDefinitionOrExtension ~attrs p with
-    | TypeDef {recFlag; types} ->
-      parseNewlineOrSemicolonSignature p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Parser.endRegion p;
-      Some (Ast_helper.Sig.type_ ~loc recFlag types)
-    | TypeExt ext ->
-      parseNewlineOrSemicolonSignature p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Parser.endRegion p;
-      Some (Ast_helper.Sig.type_extension ~loc ext))
-  | External ->
-    let externalDef = parseExternalDef ~attrs ~startPos p in
-    parseNewlineOrSemicolonSignature p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Sig.value ~loc externalDef)
-  | Exception ->
-    let exceptionDef = parseExceptionDef ~attrs p in
-    parseNewlineOrSemicolonSignature p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Sig.exception_ ~loc exceptionDef)
-  | Open ->
-    let openDescription = parseOpenDescription ~attrs p in
-    parseNewlineOrSemicolonSignature p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Sig.open_ ~loc openDescription)
-  | Include ->
-    Parser.next p;
-    let moduleType = parseModuleType p in
-    let includeDescription =
-      Ast_helper.Incl.mk ~loc:(mkLoc startPos p.prevEndPos) ~attrs moduleType
-    in
-    parseNewlineOrSemicolonSignature p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Sig.include_ ~loc includeDescription)
-  | Module -> (
-    Parser.beginRegion p;
-    Parser.next p;
-    match p.Parser.token with
-    | Uident _ ->
-      let modDecl = parseModuleDeclarationOrAlias ~attrs p in
-      parseNewlineOrSemicolonSignature p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Parser.endRegion p;
-      Some (Ast_helper.Sig.module_ ~loc modDecl)
-    | Rec ->
-      let recModule = parseRecModuleSpec ~attrs ~startPos p in
-      parseNewlineOrSemicolonSignature p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Parser.endRegion p;
-      Some (Ast_helper.Sig.rec_module ~loc recModule)
-    | Typ ->
-      let modTypeDecl = parseModuleTypeDeclaration ~attrs ~startPos p in
-      Parser.endRegion p;
-      Some modTypeDecl
-    | _t ->
-      let modDecl = parseModuleDeclarationOrAlias ~attrs p in
-      parseNewlineOrSemicolonSignature p;
-      let loc = mkLoc startPos p.prevEndPos in
-      Parser.endRegion p;
-      Some (Ast_helper.Sig.module_ ~loc modDecl))
-  | AtAt ->
-    let attr = parseStandaloneAttribute p in
-    parseNewlineOrSemicolonSignature p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Sig.attribute ~loc attr)
-  | ModuleComment (loc, s) ->
-    Parser.next p;
-    Some
-      (Ast_helper.Sig.attribute ~loc
-         ( {txt = "res.doc"; loc},
-           PStr
-             [
-               Ast_helper.Str.eval ~loc
-                 (Ast_helper.Exp.constant ~loc (Pconst_string (s, None)));
-             ] ))
-  | PercentPercent ->
-    let extension = parseExtension ~moduleLanguage:true p in
-    parseNewlineOrSemicolonSignature p;
-    let loc = mkLoc startPos p.prevEndPos in
-    Some (Ast_helper.Sig.extension ~attrs ~loc extension)
-  | _ -> (
-    match attrs with
-    | (({Asttypes.loc = attrLoc}, _) as attr) :: _ ->
-      Parser.err ~startPos:attrLoc.loc_start ~endPos:attrLoc.loc_end p
-        (Diagnostics.message (ErrorMessages.attributeWithoutNode attr));
-      Some Recover.defaultSignatureItem
-    | _ -> None)
-[@@progress Parser.next, Parser.expect, LoopProgress.listRest]
-
-(* module rec module-name :  module-type  { and module-name:  module-type } *)
-and parseRecModuleSpec ~attrs ~startPos p =
-  Parser.expect Rec p;
-  let rec loop p spec =
-    let startPos = p.Parser.startPos in
-    let attrs = parseAttributesAndBinding p in
-    match p.Parser.token with
-    | And ->
-      (* TODO: give a good error message when with constraint, no parens
-       * and ASet: (Set.S with type elt = A.t)
-       * and BTree: (Btree.S with type elt = A.t)
-       * Without parens, the `and` signals the start of another
-       * `with-constraint`
-       *)
-      Parser.expect And p;
-      let decl = parseRecModuleDeclaration ~attrs ~startPos p in
-      loop p (decl :: spec)
-    | _ -> List.rev spec
-  in
-  let first = parseRecModuleDeclaration ~attrs ~startPos p in
-  loop p [first]
-
-(* module-name : module-type *)
-and parseRecModuleDeclaration ~attrs ~startPos p =
-  let name =
-    match p.Parser.token with
-    | Uident modName ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc modName loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-  in
-  Parser.expect Colon p;
-  let modType = parseModuleType p in
-  Ast_helper.Md.mk ~loc:(mkLoc startPos p.prevEndPos) ~attrs name modType
-
-and parseModuleDeclarationOrAlias ~attrs p =
-  let startPos = p.Parser.startPos in
-  let moduleName =
-    match p.Parser.token with
-    | Uident ident ->
-      let loc = mkLoc p.Parser.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc ident loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-  in
-  let body =
-    match p.Parser.token with
-    | Colon ->
-      Parser.next p;
-      parseModuleType p
-    | Equal ->
-      Parser.next p;
-      let lident = parseModuleLongIdent ~lowercase:false p in
-      Ast_helper.Mty.alias lident
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      Recover.defaultModuleType ()
-  in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Md.mk ~loc ~attrs moduleName body
-
-and parseModuleTypeDeclaration ~attrs ~startPos p =
-  Parser.expect Typ p;
-  let moduleName =
-    match p.Parser.token with
-    | Uident ident ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc ident loc
-    | Lident ident ->
-      let loc = mkLoc p.startPos p.endPos in
-      Parser.next p;
-      Location.mkloc ident loc
-    | t ->
-      Parser.err p (Diagnostics.uident t);
-      Location.mknoloc "_"
-  in
-  let typ =
-    match p.Parser.token with
-    | Equal ->
-      Parser.next p;
-      Some (parseModuleType p)
-    | _ -> None
-  in
-  let moduleDecl = Ast_helper.Mtd.mk ~attrs ?typ moduleName in
-  Ast_helper.Sig.modtype ~loc:(mkLoc startPos p.prevEndPos) moduleDecl
-
-and parseSignLetDesc ~attrs p =
-  let startPos = p.Parser.startPos in
-  Parser.optional p Let |> ignore;
-  let name, loc = parseLident p in
-  let name = Location.mkloc name loc in
-  Parser.expect Colon p;
-  let typExpr = parsePolyTypeExpr p in
-  let loc = mkLoc startPos p.prevEndPos in
-  Ast_helper.Val.mk ~loc ~attrs name typExpr
-
-(* attr-id	::=	lowercase-ident
-   ∣	  capitalized-ident
-   ∣	  attr-id .  attr-id *)
-and parseAttributeId ~startPos p =
-  let rec loop p acc =
-    match p.Parser.token with
-    | Lident ident | Uident ident -> (
-      Parser.next p;
-      let id = acc ^ ident in
-      match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        loop p (id ^ ".")
-      | _ -> id)
-    | token when Token.isKeyword token -> (
-      Parser.next p;
-      let id = acc ^ Token.toString token in
-      match p.Parser.token with
-      | Dot ->
-        Parser.next p;
-        loop p (id ^ ".")
-      | _ -> id)
-    | token ->
-      Parser.err p (Diagnostics.unexpected token p.breadcrumbs);
-      acc
-  in
-  let id = loop p "" in
-  let endPos = p.prevEndPos in
-  Location.mkloc id (mkLoc startPos endPos)
-
-(*
- * payload ::=  empty
- *          |  ( structure-item )
- *
- * TODO: what about multiple structure items?
- * @attr({let x = 1; let x = 2})
- *
- * Also what about type-expressions and specifications?
- * @attr(:myType) ???
- *)
-and parsePayload p =
-  match p.Parser.token with
-  | Lparen when p.startPos.pos_cnum = p.prevEndPos.pos_cnum -> (
-    Parser.leaveBreadcrumb p Grammar.AttributePayload;
-    Parser.next p;
-    match p.token with
-    | Colon ->
-      Parser.next p;
-      let payload =
-        if Grammar.isSignatureItemStart p.token then
-          Parsetree.PSig
-            (parseDelimitedRegion ~grammar:Grammar.Signature ~closing:Rparen
-               ~f:parseSignatureItemRegion p)
-        else Parsetree.PTyp (parseTypExpr p)
-      in
-      Parser.expect Rparen p;
-      Parser.eatBreadcrumb p;
-      payload
-    | Question ->
-      Parser.next p;
-      let pattern = parsePattern p in
-      let expr =
-        match p.token with
-        | When | If ->
-          Parser.next p;
-          Some (parseExpr p)
-        | _ -> None
-      in
-      Parser.expect Rparen p;
-      Parser.eatBreadcrumb p;
-      Parsetree.PPat (pattern, expr)
-    | _ ->
-      let items =
-        parseDelimitedRegion ~grammar:Grammar.Structure ~closing:Rparen
-          ~f:parseStructureItemRegion p
-      in
-      Parser.expect Rparen p;
-      Parser.eatBreadcrumb p;
-      Parsetree.PStr items)
-  | _ -> Parsetree.PStr []
-
-(* type attribute = string loc * payload *)
-and parseAttribute p =
-  match p.Parser.token with
-  | At ->
-    let startPos = p.startPos in
-    Parser.next p;
-    let attrId = parseAttributeId ~startPos p in
-    let payload = parsePayload p in
-    Some (attrId, payload)
-  | DocComment (loc, s) ->
-    Parser.next p;
-    Some (docCommentToAttribute loc s)
-  | _ -> None
-
-and docCommentToAttribute loc s : Parsetree.attribute =
-  ( {txt = "res.doc"; loc},
-    PStr
-      [
-        Ast_helper.Str.eval ~loc
-          (Ast_helper.Exp.constant ~loc (Pconst_string (s, None)));
-      ] )
-
-and parseAttributes p =
-  parseRegion p ~grammar:Grammar.Attribute ~f:parseAttribute
-
-(*
- * standalone-attribute ::=
- *  | @@ atribute-id
- *  | @@ attribute-id ( structure-item )
- *)
-and parseStandaloneAttribute p =
-  let startPos = p.startPos in
-  Parser.expect AtAt p;
-  let attrId = parseAttributeId ~startPos p in
-  let attrId =
-    match attrId.txt with
-    | "uncurried.swap" ->
-      p.uncurried_config <- Config.Swap;
-      attrId
-    | "uncurried" ->
-      p.uncurried_config <- Config.Uncurried;
-      attrId
-    | _ -> attrId
-  in
-  let payload = parsePayload p in
-  (attrId, payload)
-
-(* extension	::=	% attr-id  attr-payload
- *              | %% attr-id(
- *  expr	::=	 ...
- *    ∣	 extension
- *
- *  typexpr	::=	 ...
- *    ∣	 extension
- *
- *  pattern	::=	 ...
- *    ∣	 extension
- *
- *  module-expr	::=	 ...
- *    ∣	 extension
- *
- *  module-type	::=	 ...
- *    ∣	 extension
- *
- *  class-expr	::=	 ...
- *    ∣	 extension
- *
- *  class-type	::=	 ...
- *    ∣	 extension
- *
- *
- * item extension nodes usable in structures and signature
- *
- * item-extension ::= %% attr-id
- *                  | %% attr-id(structure-item)
- *
- *  attr-payload ::= structure-item
- *
- *  ~moduleLanguage represents whether we're on the module level or not
- *)
-and parseExtension ?(moduleLanguage = false) p =
-  let startPos = p.Parser.startPos in
-  if moduleLanguage then Parser.expect PercentPercent p
-  else Parser.expect Percent p;
-  let attrId = parseAttributeId ~startPos p in
-  let payload = parsePayload p in
-  (attrId, payload)
-
-(* module signature on the file level *)
-let parseSpecification p : Parsetree.signature =
-  parseRegion p ~grammar:Grammar.Specification ~f:parseSignatureItemRegion
-
-(* module structure on the file level *)
-let parseImplementation p : Parsetree.structure =
-  parseRegion p ~grammar:Grammar.Implementation ~f:parseStructureItemRegion
diff --git a/jscomp/syntax/src/res_core.mli b/jscomp/syntax/src/res_core.mli
deleted file mode 100644
index e77ca30..0000000
--- a/jscomp/syntax/src/res_core.mli
+++ /dev/null
@@ -1,2 +0,0 @@
-val parseImplementation : Res_parser.t -> Parsetree.structure
-val parseSpecification : Res_parser.t -> Parsetree.signature
diff --git a/jscomp/syntax/src/res_diagnostics.ml b/jscomp/syntax/src/res_diagnostics.ml
deleted file mode 100644
index 3b1da15..0000000
--- a/jscomp/syntax/src/res_diagnostics.ml
+++ /dev/null
@@ -1,172 +0,0 @@
-module Grammar = Res_grammar
-module Token = Res_token
-
-type category =
-  | Unexpected of {token: Token.t; context: (Grammar.t * Lexing.position) list}
-  | Expected of {
-      context: Grammar.t option;
-      pos: Lexing.position; (* prev token end*)
-      token: Token.t;
-    }
-  | Message of string
-  | Uident of Token.t
-  | Lident of Token.t
-  | UnclosedString
-  | UnclosedTemplate
-  | UnclosedComment
-  | UnknownUchar of Char.t
-
-type t = {
-  startPos: Lexing.position;
-  endPos: Lexing.position;
-  category: category;
-}
-
-type report = t list
-
-let getStartPos t = t.startPos
-let getEndPos t = t.endPos
-
-let defaultUnexpected token =
-  "I'm not sure what to parse here when looking at \"" ^ Token.toString token
-  ^ "\"."
-
-let reservedKeyword token =
-  let tokenTxt = Token.toString token in
-  "`" ^ tokenTxt ^ "` is a reserved keyword. Keywords need to be escaped: \\\""
-  ^ tokenTxt ^ "\""
-
-let explain t =
-  match t.category with
-  | Uident currentToken -> (
-    match currentToken with
-    | Lident lident ->
-      let guess = String.capitalize_ascii lident in
-      "Did you mean `" ^ guess ^ "` instead of `" ^ lident ^ "`?"
-    | t when Token.isKeyword t ->
-      let token = Token.toString t in
-      "`" ^ token ^ "` is a reserved keyword."
-    | _ ->
-      "At this point, I'm looking for an uppercased name like `Belt` or `Array`"
-    )
-  | Lident currentToken -> (
-    match currentToken with
-    | Uident uident ->
-      let guess = String.uncapitalize_ascii uident in
-      "Did you mean `" ^ guess ^ "` instead of `" ^ uident ^ "`?"
-    | t when Token.isKeyword t ->
-      let token = Token.toString t in
-      "`" ^ token ^ "` is a reserved keyword. Keywords need to be escaped: \\\""
-      ^ token ^ "\""
-    | Underscore -> "`_` isn't a valid name."
-    | _ -> "I'm expecting a lowercase name like `user or `age`")
-  | Message txt -> txt
-  | UnclosedString -> "This string is missing a double quote at the end"
-  | UnclosedTemplate ->
-    "Did you forget to close this template expression with a backtick?"
-  | UnclosedComment -> "This comment seems to be missing a closing `*/`"
-  | UnknownUchar uchar -> (
-    match uchar with
-    | '^' ->
-      "Not sure what to do with this character.\n"
-      ^ "  If you're trying to dereference a mutable value, use \
-         `myValue.contents` instead.\n"
-      ^ "  To concatenate strings, use `\"a\" ++ \"b\"` instead."
-    | _ -> "Not sure what to do with this character.")
-  | Expected {context; token = t} ->
-    let hint =
-      match context with
-      | Some grammar -> " It signals the start of " ^ Grammar.toString grammar
-      | None -> ""
-    in
-    "Did you forget a `" ^ Token.toString t ^ "` here?" ^ hint
-  | Unexpected {token = t; context = breadcrumbs} -> (
-    let name = Token.toString t in
-    match breadcrumbs with
-    | (AtomicTypExpr, _) :: breadcrumbs -> (
-      match (breadcrumbs, t) with
-      | ( ((StringFieldDeclarations | FieldDeclarations), _) :: _,
-          (String _ | At | Rbrace | Comma | Eof) ) ->
-        "I'm missing a type here"
-      | _, t when Grammar.isStructureItemStart t || t = Eof ->
-        "Missing a type here"
-      | _ -> defaultUnexpected t)
-    | (ExprOperand, _) :: breadcrumbs -> (
-      match (breadcrumbs, t) with
-      | (ExprBlock, _) :: _, Rbrace ->
-        "It seems that this expression block is empty"
-      | (ExprBlock, _) :: _, Bar ->
-        (* Pattern matching *)
-        "Looks like there might be an expression missing here"
-      | (ExprSetField, _) :: _, _ ->
-        "It seems that this record field mutation misses an expression"
-      | (ExprArrayMutation, _) :: _, _ ->
-        "Seems that an expression is missing, with what do I mutate the array?"
-      | ((ExprBinaryAfterOp _ | ExprUnary), _) :: _, _ ->
-        "Did you forget to write an expression here?"
-      | (Grammar.LetBinding, _) :: _, _ ->
-        "This let-binding misses an expression"
-      | _ :: _, (Rbracket | Rbrace | Eof) -> "Missing expression"
-      | _ -> "I'm not sure what to parse here when looking at \"" ^ name ^ "\"."
-      )
-    | (TypeParam, _) :: _ -> (
-      match t with
-      | Lident ident ->
-        "Did you mean '" ^ ident ^ "? A Type parameter starts with a quote."
-      | _ -> "I'm not sure what to parse here when looking at \"" ^ name ^ "\"."
-      )
-    | (Pattern, _) :: breadcrumbs -> (
-      match (t, breadcrumbs) with
-      | Equal, (LetBinding, _) :: _ ->
-        "I was expecting a name for this let-binding. Example: `let message = \
-         \"hello\"`"
-      | In, (ExprFor, _) :: _ ->
-        "A for-loop has the following form: `for i in 0 to 10`. Did you forget \
-         to supply a name before `in`?"
-      | EqualGreater, (PatternMatchCase, _) :: _ ->
-        "I was expecting a pattern to match on before the `=>`"
-      | token, _ when Token.isKeyword t -> reservedKeyword token
-      | token, _ -> defaultUnexpected token)
-    | _ ->
-      (* TODO: match on circumstance to verify Lident needed ? *)
-      if Token.isKeyword t then
-        "`" ^ name
-        ^ "` is a reserved keyword. Keywords need to be escaped: \\\""
-        ^ Token.toString t ^ "\""
-      else "I'm not sure what to parse here when looking at \"" ^ name ^ "\".")
-
-let make ~startPos ~endPos category = {startPos; endPos; category}
-
-let printReport diagnostics src =
-  let rec print diagnostics src =
-    match diagnostics with
-    | [] -> ()
-    | d :: rest ->
-      Location.report_error ~src:(Some src) Format.err_formatter
-        Location.
-          {
-            loc = {loc_start = d.startPos; loc_end = d.endPos; loc_ghost = false};
-            msg = explain d;
-            sub = [];
-            if_highlight = "";
-          };
-      (match rest with
-      | [] -> ()
-      | _ -> Format.fprintf Format.err_formatter "@.");
-      print rest src
-  in
-  Format.fprintf Format.err_formatter "@[<v>";
-  print (List.rev diagnostics) src;
-  Format.fprintf Format.err_formatter "@]@."
-
-let unexpected token context = Unexpected {token; context}
-
-let expected ?grammar pos token = Expected {context = grammar; pos; token}
-
-let uident currentToken = Uident currentToken
-let lident currentToken = Lident currentToken
-let unclosedString = UnclosedString
-let unclosedComment = UnclosedComment
-let unclosedTemplate = UnclosedTemplate
-let unknownUchar code = UnknownUchar code
-let message txt = Message txt
diff --git a/jscomp/syntax/src/res_diagnostics.mli b/jscomp/syntax/src/res_diagnostics.mli
deleted file mode 100644
index 0ae74ce..0000000
--- a/jscomp/syntax/src/res_diagnostics.mli
+++ /dev/null
@@ -1,25 +0,0 @@
-module Token = Res_token
-module Grammar = Res_grammar
-
-type t
-type category
-type report
-
-val getStartPos : t -> Lexing.position [@@live] (* for playground *)
-val getEndPos : t -> Lexing.position [@@live] (* for playground *)
-
-val explain : t -> string [@@live] (* for playground *)
-
-val unexpected : Token.t -> (Grammar.t * Lexing.position) list -> category
-val expected : ?grammar:Grammar.t -> Lexing.position -> Token.t -> category
-val uident : Token.t -> category
-val lident : Token.t -> category
-val unclosedString : category
-val unclosedTemplate : category
-val unclosedComment : category
-val unknownUchar : Char.t -> category
-val message : string -> category
-
-val make : startPos:Lexing.position -> endPos:Lexing.position -> category -> t
-
-val printReport : t list -> string -> unit
diff --git a/jscomp/syntax/src/res_doc.ml b/jscomp/syntax/src/res_doc.ml
deleted file mode 100644
index fe626e4..0000000
--- a/jscomp/syntax/src/res_doc.ml
+++ /dev/null
@@ -1,350 +0,0 @@
-module MiniBuffer = Res_minibuffer
-
-type mode = Break | Flat
-
-type lineStyle =
-  | Classic (* fits? -> replace with space *)
-  | Soft (* fits? -> replaced with nothing *)
-  | Hard
-  (* always included, forces breaks in parents *)
-  (* always included, forces breaks in parents, but doesn't increase indentation
-     use case: template literals, multiline string content *)
-  | Literal
-
-type t =
-  | Nil
-  | Text of string
-  | Concat of t list
-  | Indent of t
-  | IfBreaks of {yes: t; no: t; mutable broken: bool}
-    (* when broken is true, treat as the yes branch *)
-  | LineSuffix of t
-  | LineBreak of lineStyle
-  | Group of {mutable shouldBreak: bool; doc: t}
-  | CustomLayout of t list
-  | BreakParent
-
-let nil = Nil
-let line = LineBreak Classic
-let hardLine = LineBreak Hard
-let softLine = LineBreak Soft
-let literalLine = LineBreak Literal
-let text s = Text s
-
-(* Optimization. We eagerly collapse and reduce whatever allocation we can *)
-let rec _concat acc l =
-  match l with
-  | Text s1 :: Text s2 :: rest -> Text (s1 ^ s2) :: _concat acc rest
-  | Nil :: rest -> _concat acc rest
-  | Concat l2 :: rest ->
-    _concat (_concat acc rest) l2 (* notice the order here *)
-  | x :: rest ->
-    let rest1 = _concat acc rest in
-    if rest1 == rest then l else x :: rest1
-  | [] -> acc
-
-let concat l = Concat (_concat [] l)
-
-let indent d = Indent d
-let ifBreaks t f = IfBreaks {yes = t; no = f; broken = false}
-let lineSuffix d = LineSuffix d
-let group d = Group {shouldBreak = false; doc = d}
-let breakableGroup ~forceBreak d = Group {shouldBreak = forceBreak; doc = d}
-let customLayout gs = CustomLayout gs
-let breakParent = BreakParent
-
-let space = Text " "
-let comma = Text ","
-let dot = Text "."
-let dotdot = Text ".."
-let dotdotdot = Text "..."
-let lessThan = Text "<"
-let greaterThan = Text ">"
-let lbrace = Text "{"
-let rbrace = Text "}"
-let lparen = Text "("
-let rparen = Text ")"
-let lbracket = Text "["
-let rbracket = Text "]"
-let question = Text "?"
-let tilde = Text "~"
-let equal = Text "="
-let trailingComma = ifBreaks comma nil
-let doubleQuote = Text "\""
-
-let propagateForcedBreaks doc =
-  let rec walk doc =
-    match doc with
-    | Text _ | Nil | LineSuffix _ -> false
-    | BreakParent -> true
-    | LineBreak (Hard | Literal) -> true
-    | LineBreak (Classic | Soft) -> false
-    | Indent children ->
-      let childForcesBreak = walk children in
-      childForcesBreak
-    | IfBreaks ({yes = trueDoc; no = falseDoc} as ib) ->
-      let falseForceBreak = walk falseDoc in
-      if falseForceBreak then (
-        let _ = walk trueDoc in
-        ib.broken <- true;
-        true)
-      else
-        let forceBreak = walk trueDoc in
-        forceBreak
-    | Group ({shouldBreak = forceBreak; doc = children} as gr) ->
-      let childForcesBreak = walk children in
-      let shouldBreak = forceBreak || childForcesBreak in
-      gr.shouldBreak <- shouldBreak;
-      shouldBreak
-    | Concat children ->
-      List.fold_left
-        (fun forceBreak child ->
-          let childForcesBreak = walk child in
-          forceBreak || childForcesBreak)
-        false children
-    | CustomLayout children ->
-      (* When using CustomLayout, we don't want to propagate forced breaks
-       * from the children up. By definition it picks the first layout that fits
-       * otherwise it takes the last of the list.
-       * However we do want to propagate forced breaks in the sublayouts. They
-       * might need to be broken. We just don't propagate them any higher here *)
-      let _ = walk (Concat children) in
-      false
-  in
-  let _ = walk doc in
-  ()
-
-(* See documentation in interface file *)
-let rec willBreak doc =
-  match doc with
-  | LineBreak (Hard | Literal) | BreakParent | Group {shouldBreak = true} ->
-    true
-  | Group {doc} | Indent doc | CustomLayout (doc :: _) -> willBreak doc
-  | Concat docs -> List.exists willBreak docs
-  | IfBreaks {yes; no} -> willBreak yes || willBreak no
-  | _ -> false
-
-let join ~sep docs =
-  let rec loop acc sep docs =
-    match docs with
-    | [] -> List.rev acc
-    | [x] -> List.rev (x :: acc)
-    | x :: xs -> loop (sep :: x :: acc) sep xs
-  in
-  concat (loop [] sep docs)
-
-let joinWithSep docsWithSep =
-  let rec loop acc docs =
-    match docs with
-    | [] -> List.rev acc
-    | [(x, _sep)] -> List.rev (x :: acc)
-    | (x, sep) :: xs -> loop (sep :: x :: acc) xs
-  in
-  concat (loop [] docsWithSep)
-
-let fits w stack =
-  let width = ref w in
-  let result = ref None in
-
-  let rec calculate indent mode doc =
-    match (mode, doc) with
-    | _ when result.contents != None -> ()
-    | _ when width.contents < 0 -> result := Some false
-    | _, Nil | _, LineSuffix _ | _, BreakParent -> ()
-    | _, Text txt -> width := width.contents - String.length txt
-    | _, Indent doc -> calculate (indent + 2) mode doc
-    | Flat, LineBreak Hard | Flat, LineBreak Literal -> result := Some true
-    | Flat, LineBreak Classic -> width := width.contents - 1
-    | Flat, LineBreak Soft -> ()
-    | Break, LineBreak _ -> result := Some true
-    | _, Group {shouldBreak = true; doc} -> calculate indent Break doc
-    | _, Group {doc} -> calculate indent mode doc
-    | _, IfBreaks {yes = breakDoc; broken = true} ->
-      calculate indent mode breakDoc
-    | Break, IfBreaks {yes = breakDoc} -> calculate indent mode breakDoc
-    | Flat, IfBreaks {no = flatDoc} -> calculate indent mode flatDoc
-    | _, Concat docs -> calculateConcat indent mode docs
-    | _, CustomLayout (hd :: _) ->
-      (* TODO: if we have nested custom layouts, what we should do here? *)
-      calculate indent mode hd
-    | _, CustomLayout [] -> ()
-  and calculateConcat indent mode docs =
-    if result.contents == None then
-      match docs with
-      | [] -> ()
-      | doc :: rest ->
-        calculate indent mode doc;
-        calculateConcat indent mode rest
-  in
-  let rec calculateAll stack =
-    match (result.contents, stack) with
-    | Some r, _ -> r
-    | None, [] -> !width >= 0
-    | None, (indent, mode, doc) :: rest ->
-      calculate indent mode doc;
-      calculateAll rest
-  in
-  calculateAll stack
-
-let toString ~width doc =
-  propagateForcedBreaks doc;
-  let buffer = MiniBuffer.create 1000 in
-
-  let rec process ~pos lineSuffices stack =
-    match stack with
-    | ((ind, mode, doc) as cmd) :: rest -> (
-      match doc with
-      | Nil | BreakParent -> process ~pos lineSuffices rest
-      | Text txt ->
-        MiniBuffer.add_string buffer txt;
-        process ~pos:(String.length txt + pos) lineSuffices rest
-      | LineSuffix doc -> process ~pos ((ind, mode, doc) :: lineSuffices) rest
-      | Concat docs ->
-        let ops = List.map (fun doc -> (ind, mode, doc)) docs in
-        process ~pos lineSuffices (List.append ops rest)
-      | Indent doc -> process ~pos lineSuffices ((ind + 2, mode, doc) :: rest)
-      | IfBreaks {yes = breakDoc; broken = true} ->
-        process ~pos lineSuffices ((ind, mode, breakDoc) :: rest)
-      | IfBreaks {yes = breakDoc; no = flatDoc} ->
-        if mode = Break then
-          process ~pos lineSuffices ((ind, mode, breakDoc) :: rest)
-        else process ~pos lineSuffices ((ind, mode, flatDoc) :: rest)
-      | LineBreak lineStyle ->
-        if mode = Break then
-          match lineSuffices with
-          | [] ->
-            if lineStyle = Literal then (
-              MiniBuffer.add_char buffer '\n';
-              process ~pos:0 [] rest)
-            else (
-              MiniBuffer.flush_newline buffer;
-              MiniBuffer.add_string buffer (String.make ind ' ' [@doesNotRaise]);
-              process ~pos:ind [] rest)
-          | _docs ->
-            process ~pos:ind []
-              (List.concat [List.rev lineSuffices; cmd :: rest])
-        else
-          (* mode = Flat *)
-          let pos =
-            match lineStyle with
-            | Classic ->
-              MiniBuffer.add_string buffer " ";
-              pos + 1
-            | Hard ->
-              MiniBuffer.flush_newline buffer;
-              0
-            | Literal ->
-              MiniBuffer.add_char buffer '\n';
-              0
-            | Soft -> pos
-          in
-          process ~pos lineSuffices rest
-      | Group {shouldBreak; doc} ->
-        if shouldBreak || not (fits (width - pos) ((ind, Flat, doc) :: rest))
-        then process ~pos lineSuffices ((ind, Break, doc) :: rest)
-        else process ~pos lineSuffices ((ind, Flat, doc) :: rest)
-      | CustomLayout docs ->
-        let rec findGroupThatFits groups =
-          match groups with
-          | [] -> Nil
-          | [lastGroup] -> lastGroup
-          | doc :: docs ->
-            if fits (width - pos) ((ind, Flat, doc) :: rest) then doc
-            else findGroupThatFits docs
-        in
-        let doc = findGroupThatFits docs in
-        process ~pos lineSuffices ((ind, Flat, doc) :: rest))
-    | [] -> (
-      match lineSuffices with
-      | [] -> ()
-      | suffices -> process ~pos:0 [] (List.rev suffices))
-  in
-  process ~pos:0 [] [(0, Flat, doc)];
-  MiniBuffer.contents buffer
-
-let debug t =
-  let rec toDoc = function
-    | Nil -> text "nil"
-    | BreakParent -> text "breakparent"
-    | Text txt -> text ("text(\"" ^ txt ^ "\")")
-    | LineSuffix doc ->
-      group
-        (concat
-           [
-             text "linesuffix(";
-             indent (concat [line; toDoc doc]);
-             line;
-             text ")";
-           ])
-    | Concat [] -> text "concat()"
-    | Concat docs ->
-      group
-        (concat
-           [
-             text "concat(";
-             indent
-               (concat
-                  [
-                    line;
-                    join ~sep:(concat [text ","; line]) (List.map toDoc docs);
-                  ]);
-             line;
-             text ")";
-           ])
-    | CustomLayout docs ->
-      group
-        (concat
-           [
-             text "customLayout(";
-             indent
-               (concat
-                  [
-                    line;
-                    join ~sep:(concat [text ","; line]) (List.map toDoc docs);
-                  ]);
-             line;
-             text ")";
-           ])
-    | Indent doc ->
-      concat [text "indent("; softLine; toDoc doc; softLine; text ")"]
-    | IfBreaks {yes = trueDoc; broken = true} -> toDoc trueDoc
-    | IfBreaks {yes = trueDoc; no = falseDoc} ->
-      group
-        (concat
-           [
-             text "ifBreaks(";
-             indent
-               (concat
-                  [line; toDoc trueDoc; concat [text ","; line]; toDoc falseDoc]);
-             line;
-             text ")";
-           ])
-    | LineBreak break ->
-      let breakTxt =
-        match break with
-        | Classic -> "Classic"
-        | Soft -> "Soft"
-        | Hard -> "Hard"
-        | Literal -> "Liteal"
-      in
-      text ("LineBreak(" ^ breakTxt ^ ")")
-    | Group {shouldBreak; doc} ->
-      group
-        (concat
-           [
-             text "Group(";
-             indent
-               (concat
-                  [
-                    line;
-                    text ("{shouldBreak: " ^ string_of_bool shouldBreak ^ "}");
-                    concat [text ","; line];
-                    toDoc doc;
-                  ]);
-             line;
-             text ")";
-           ])
-  in
-  let doc = toDoc t in
-  toString ~width:10 doc |> print_endline
-[@@live]
diff --git a/jscomp/syntax/src/res_driver.ml b/jscomp/syntax/src/res_driver.ml
deleted file mode 100644
index a82c9a2..0000000
--- a/jscomp/syntax/src/res_driver.ml
+++ /dev/null
@@ -1,161 +0,0 @@
-module IO = Res_io
-
-type ('ast, 'diagnostics) parseResult = {
-  filename: string; [@live]
-  source: string;
-  parsetree: 'ast;
-  diagnostics: 'diagnostics;
-  invalid: bool;
-  comments: Res_comment.t list;
-}
-
-type 'diagnostics parsingEngine = {
-  parseImplementation:
-    forPrinter:bool ->
-    filename:string ->
-    (Parsetree.structure, 'diagnostics) parseResult;
-  parseInterface:
-    forPrinter:bool ->
-    filename:string ->
-    (Parsetree.signature, 'diagnostics) parseResult;
-  stringOfDiagnostics: source:string -> filename:string -> 'diagnostics -> unit;
-}
-
-type printEngine = {
-  printImplementation:
-    width:int ->
-    filename:string ->
-    comments:Res_comment.t list ->
-    Parsetree.structure ->
-    unit;
-  printInterface:
-    width:int ->
-    filename:string ->
-    comments:Res_comment.t list ->
-    Parsetree.signature ->
-    unit;
-}
-
-let setup ~filename ~forPrinter () =
-  let src = IO.readFile ~filename in
-  let mode = if forPrinter then Res_parser.Default else ParseForTypeChecker in
-  Res_parser.make ~mode src filename
-
-let setupFromSource ~displayFilename ~source ~forPrinter () =
-  let mode = if forPrinter then Res_parser.Default else ParseForTypeChecker in
-  Res_parser.make ~mode source displayFilename
-
-let parsingEngine =
-  {
-    parseImplementation =
-      (fun ~forPrinter ~filename ->
-        let engine = setup ~filename ~forPrinter () in
-        let structure = Res_core.parseImplementation engine in
-        let invalid, diagnostics =
-          match engine.diagnostics with
-          | [] as diagnostics -> (false, diagnostics)
-          | _ as diagnostics -> (true, diagnostics)
-        in
-        {
-          filename = engine.scanner.filename;
-          source = engine.scanner.src;
-          parsetree = structure;
-          diagnostics;
-          invalid;
-          comments = List.rev engine.comments;
-        });
-    parseInterface =
-      (fun ~forPrinter ~filename ->
-        let engine = setup ~filename ~forPrinter () in
-        let signature = Res_core.parseSpecification engine in
-        let invalid, diagnostics =
-          match engine.diagnostics with
-          | [] as diagnostics -> (false, diagnostics)
-          | _ as diagnostics -> (true, diagnostics)
-        in
-        {
-          filename = engine.scanner.filename;
-          source = engine.scanner.src;
-          parsetree = signature;
-          diagnostics;
-          invalid;
-          comments = List.rev engine.comments;
-        });
-    stringOfDiagnostics =
-      (fun ~source ~filename:_ diagnostics ->
-        Res_diagnostics.printReport diagnostics source);
-  }
-
-let parseImplementationFromSource ~forPrinter ~displayFilename ~source =
-  let engine = setupFromSource ~displayFilename ~source ~forPrinter () in
-  let structure = Res_core.parseImplementation engine in
-  let invalid, diagnostics =
-    match engine.diagnostics with
-    | [] as diagnostics -> (false, diagnostics)
-    | _ as diagnostics -> (true, diagnostics)
-  in
-  {
-    filename = engine.scanner.filename;
-    source = engine.scanner.src;
-    parsetree = structure;
-    diagnostics;
-    invalid;
-    comments = List.rev engine.comments;
-  }
-
-let parseInterfaceFromSource ~forPrinter ~displayFilename ~source =
-  let engine = setupFromSource ~displayFilename ~source ~forPrinter () in
-  let signature = Res_core.parseSpecification engine in
-  let invalid, diagnostics =
-    match engine.diagnostics with
-    | [] as diagnostics -> (false, diagnostics)
-    | _ as diagnostics -> (true, diagnostics)
-  in
-  {
-    filename = engine.scanner.filename;
-    source = engine.scanner.src;
-    parsetree = signature;
-    diagnostics;
-    invalid;
-    comments = List.rev engine.comments;
-  }
-
-let printEngine =
-  {
-    printImplementation =
-      (fun ~width ~filename:_ ~comments structure ->
-        print_string
-          (Res_printer.printImplementation ~width structure ~comments));
-    printInterface =
-      (fun ~width ~filename:_ ~comments signature ->
-        print_string (Res_printer.printInterface ~width signature ~comments));
-  }
-
-let parse_implementation ?(ignoreParseErrors = false) sourcefile =
-  Location.input_name := sourcefile;
-  let parseResult =
-    parsingEngine.parseImplementation ~forPrinter:false ~filename:sourcefile
-  in
-  if parseResult.invalid then (
-    Res_diagnostics.printReport parseResult.diagnostics parseResult.source;
-    if not ignoreParseErrors then exit 1);
-  parseResult.parsetree
-[@@raises exit]
-
-let parse_interface ?(ignoreParseErrors = false) sourcefile =
-  Location.input_name := sourcefile;
-  let parseResult =
-    parsingEngine.parseInterface ~forPrinter:false ~filename:sourcefile
-  in
-  if parseResult.invalid then (
-    Res_diagnostics.printReport parseResult.diagnostics parseResult.source;
-    if not ignoreParseErrors then exit 1);
-  parseResult.parsetree
-[@@raises exit]
-
-(* suppress unused optional arg *)
-let _ =
- fun s ->
-  ( parse_implementation ~ignoreParseErrors:false s,
-    parse_interface ~ignoreParseErrors:false s )
-[@@raises exit]
diff --git a/jscomp/syntax/src/res_driver.mli b/jscomp/syntax/src/res_driver.mli
deleted file mode 100644
index ddc2647..0000000
--- a/jscomp/syntax/src/res_driver.mli
+++ /dev/null
@@ -1,62 +0,0 @@
-type ('ast, 'diagnostics) parseResult = {
-  filename: string; [@live]
-  source: string;
-  parsetree: 'ast;
-  diagnostics: 'diagnostics;
-  invalid: bool;
-  comments: Res_comment.t list;
-}
-
-type 'diagnostics parsingEngine = {
-  parseImplementation:
-    forPrinter:bool ->
-    filename:string ->
-    (Parsetree.structure, 'diagnostics) parseResult;
-  parseInterface:
-    forPrinter:bool ->
-    filename:string ->
-    (Parsetree.signature, 'diagnostics) parseResult;
-  stringOfDiagnostics: source:string -> filename:string -> 'diagnostics -> unit;
-}
-
-val parseImplementationFromSource :
-  forPrinter:bool ->
-  displayFilename:string ->
-  source:string ->
-  (Parsetree.structure, Res_diagnostics.t list) parseResult
-[@@live]
-
-val parseInterfaceFromSource :
-  forPrinter:bool ->
-  displayFilename:string ->
-  source:string ->
-  (Parsetree.signature, Res_diagnostics.t list) parseResult
-[@@live]
-
-type printEngine = {
-  printImplementation:
-    width:int ->
-    filename:string ->
-    comments:Res_comment.t list ->
-    Parsetree.structure ->
-    unit;
-  printInterface:
-    width:int ->
-    filename:string ->
-    comments:Res_comment.t list ->
-    Parsetree.signature ->
-    unit;
-}
-
-val parsingEngine : Res_diagnostics.t list parsingEngine
-
-val printEngine : printEngine
-
-(* ReScript implementation parsing compatible with ocaml pparse driver. Used by the compiler. *)
-val parse_implementation :
-  ?ignoreParseErrors:bool -> string -> Parsetree.structure
-[@@live] [@@raises Location.Error]
-
-(* ReScript interface parsing compatible with ocaml pparse driver. Used by the compiler *)
-val parse_interface : ?ignoreParseErrors:bool -> string -> Parsetree.signature
-[@@live] [@@raises Location.Error]
diff --git a/jscomp/syntax/src/res_driver_binary.mli b/jscomp/syntax/src/res_driver_binary.mli
deleted file mode 100644
index 7991ba8..0000000
--- a/jscomp/syntax/src/res_driver_binary.mli
+++ /dev/null
@@ -1 +0,0 @@
-val printEngine : Res_driver.printEngine
diff --git a/jscomp/syntax/src/res_driver_ml_parser.ml b/jscomp/syntax/src/res_driver_ml_parser.ml
deleted file mode 100644
index 0d6a99e..0000000
--- a/jscomp/syntax/src/res_driver_ml_parser.ml
+++ /dev/null
@@ -1,100 +0,0 @@
-module OcamlParser = Parser
-module IO = Res_io
-
-let setup ~filename =
-  if String.length filename > 0 then (
-    Location.input_name := filename;
-    IO.readFile ~filename |> Lexing.from_string)
-  else Lexing.from_channel stdin
-
-let extractOcamlConcreteSyntax filename =
-  let lexbuf =
-    if String.length filename > 0 then
-      IO.readFile ~filename |> Lexing.from_string
-    else Lexing.from_channel stdin
-  in
-  let stringLocs = ref [] in
-  let commentData = ref [] in
-  let rec next (prevTokEndPos : Lexing.position) () =
-    let token = Lexer.token_with_comments lexbuf in
-    match token with
-    | OcamlParser.COMMENT (txt, loc) ->
-      let comment = Res_comment.fromOcamlComment ~loc ~prevTokEndPos ~txt in
-      commentData := comment :: !commentData;
-      next loc.Location.loc_end ()
-    | OcamlParser.STRING (_txt, None) ->
-      let open Location in
-      let loc =
-        {
-          loc_start = lexbuf.lex_start_p;
-          loc_end = lexbuf.Lexing.lex_curr_p;
-          loc_ghost = false;
-        }
-      in
-      let len = loc.loc_end.pos_cnum - loc.loc_start.pos_cnum in
-      let txt =
-        Bytes.to_string
-          ((Bytes.sub [@doesNotRaise]) lexbuf.Lexing.lex_buffer
-             loc.loc_start.pos_cnum len)
-      in
-      stringLocs := (txt, loc) :: !stringLocs;
-      next lexbuf.Lexing.lex_curr_p ()
-    | OcamlParser.EOF -> ()
-    | _ -> next lexbuf.Lexing.lex_curr_p ()
-  in
-  next lexbuf.Lexing.lex_start_p ();
-  (List.rev !stringLocs, List.rev !commentData)
-
-let parsingEngine =
-  {
-    Res_driver.parseImplementation =
-      (fun ~forPrinter:_ ~filename ->
-        let lexbuf = setup ~filename in
-        let stringData, comments =
-          extractOcamlConcreteSyntax !Location.input_name
-        in
-        let structure =
-          Parse.implementation lexbuf
-          |> Res_ast_conversion.replaceStringLiteralStructure stringData
-          |> Res_ast_conversion.structure
-        in
-        {
-          filename = !Location.input_name;
-          source = Bytes.to_string lexbuf.lex_buffer;
-          parsetree = structure;
-          diagnostics = ();
-          invalid = false;
-          comments;
-        });
-    parseInterface =
-      (fun ~forPrinter:_ ~filename ->
-        let lexbuf = setup ~filename in
-        let stringData, comments =
-          extractOcamlConcreteSyntax !Location.input_name
-        in
-        let signature =
-          Parse.interface lexbuf
-          |> Res_ast_conversion.replaceStringLiteralSignature stringData
-          |> Res_ast_conversion.signature
-        in
-        {
-          filename = !Location.input_name;
-          source = Bytes.to_string lexbuf.lex_buffer;
-          parsetree = signature;
-          diagnostics = ();
-          invalid = false;
-          comments;
-        });
-    stringOfDiagnostics = (fun ~source:_ ~filename:_ _diagnostics -> ());
-  }
-
-let printEngine =
-  Res_driver.
-    {
-      printImplementation =
-        (fun ~width:_ ~filename:_ ~comments:_ structure ->
-          Pprintast.structure Format.std_formatter structure);
-      printInterface =
-        (fun ~width:_ ~filename:_ ~comments:_ signature ->
-          Pprintast.signature Format.std_formatter signature);
-    }
diff --git a/jscomp/syntax/src/res_driver_ml_parser.mli b/jscomp/syntax/src/res_driver_ml_parser.mli
deleted file mode 100644
index 55a99c4..0000000
--- a/jscomp/syntax/src/res_driver_ml_parser.mli
+++ /dev/null
@@ -1,10 +0,0 @@
-(* This module represents a general interface to parse marshalled reason ast *)
-
-(* extracts comments and the original string data from an ocaml file *)
-val extractOcamlConcreteSyntax :
-  string -> (string * Location.t) list * Res_comment.t list
-[@@live]
-
-val parsingEngine : unit Res_driver.parsingEngine
-
-val printEngine : Res_driver.printEngine
diff --git a/jscomp/syntax/src/res_grammar.ml b/jscomp/syntax/src/res_grammar.ml
deleted file mode 100644
index 61e6f4e..0000000
--- a/jscomp/syntax/src/res_grammar.ml
+++ /dev/null
@@ -1,326 +0,0 @@
-module Token = Res_token
-
-type t =
-  | OpenDescription (* open Belt *)
-  | ModuleLongIdent (* Foo or Foo.Bar *) [@live]
-  | Ternary (* condExpr ? trueExpr : falseExpr *)
-  | Es6ArrowExpr
-  | Jsx
-  | JsxAttribute
-  | JsxChild [@live]
-  | ExprOperand
-  | ExprUnary
-  | ExprSetField
-  | ExprBinaryAfterOp of Token.t
-  | ExprBlock
-  | ExprCall
-  | ExprList
-  | ExprArrayAccess
-  | ExprArrayMutation
-  | ExprIf
-  | ExprFor
-  | IfCondition
-  | IfBranch
-  | ElseBranch
-  | TypeExpression
-  | External
-  | PatternMatching
-  | PatternMatchCase
-  | LetBinding
-  | PatternList
-  | PatternOcamlList
-  | PatternRecord
-  | TypeDef
-  | TypeConstrName
-  | TypeParams
-  | TypeParam [@live]
-  | PackageConstraint
-  | TypeRepresentation
-  | RecordDecl
-  | ConstructorDeclaration
-  | ParameterList
-  | StringFieldDeclarations
-  | FieldDeclarations
-  | TypExprList
-  | FunctorArgs
-  | ModExprList
-  | TypeParameters
-  | RecordRows
-  | RecordRowsStringKey
-  | ArgumentList
-  | Signature
-  | Specification
-  | Structure
-  | Implementation
-  | Attribute
-  | TypeConstraint
-  | AtomicTypExpr
-  | ListExpr
-  | Pattern
-  | AttributePayload
-  | TagNames
-
-let toString = function
-  | OpenDescription -> "an open description"
-  | ModuleLongIdent -> "a module path"
-  | Ternary -> "a ternary expression"
-  | Es6ArrowExpr -> "an es6 arrow function"
-  | Jsx -> "a jsx expression"
-  | JsxAttribute -> "a jsx attribute"
-  | ExprOperand -> "a basic expression"
-  | ExprUnary -> "a unary expression"
-  | ExprBinaryAfterOp op ->
-    "an expression after the operator \"" ^ Token.toString op ^ "\""
-  | ExprIf -> "an if expression"
-  | IfCondition -> "the condition of an if expression"
-  | IfBranch -> "the true-branch of an if expression"
-  | ElseBranch -> "the else-branch of an if expression"
-  | TypeExpression -> "a type"
-  | External -> "an external"
-  | PatternMatching -> "the cases of a pattern match"
-  | ExprBlock -> "a block with expressions"
-  | ExprSetField -> "a record field mutation"
-  | ExprCall -> "a function application"
-  | ExprArrayAccess -> "an array access expression"
-  | ExprArrayMutation -> "an array mutation"
-  | LetBinding -> "a let binding"
-  | TypeDef -> "a type definition"
-  | TypeParams -> "type parameters"
-  | TypeParam -> "a type parameter"
-  | TypeConstrName -> "a type-constructor name"
-  | TypeRepresentation -> "a type representation"
-  | RecordDecl -> "a record declaration"
-  | PatternMatchCase -> "a pattern match case"
-  | ConstructorDeclaration -> "a constructor declaration"
-  | ExprList -> "multiple expressions"
-  | PatternList -> "multiple patterns"
-  | PatternOcamlList -> "a list pattern"
-  | PatternRecord -> "a record pattern"
-  | ParameterList -> "parameters"
-  | StringFieldDeclarations -> "string field declarations"
-  | FieldDeclarations -> "field declarations"
-  | TypExprList -> "list of types"
-  | FunctorArgs -> "functor arguments"
-  | ModExprList -> "list of module expressions"
-  | TypeParameters -> "list of type parameters"
-  | RecordRows -> "rows of a record"
-  | RecordRowsStringKey -> "rows of a record with string keys"
-  | ArgumentList -> "arguments"
-  | Signature -> "signature"
-  | Specification -> "specification"
-  | Structure -> "structure"
-  | Implementation -> "implementation"
-  | Attribute -> "an attribute"
-  | TypeConstraint -> "constraints on a type"
-  | AtomicTypExpr -> "a type"
-  | ListExpr -> "an ocaml list expr"
-  | PackageConstraint -> "a package constraint"
-  | JsxChild -> "jsx child"
-  | Pattern -> "pattern"
-  | ExprFor -> "a for expression"
-  | AttributePayload -> "an attribute payload"
-  | TagNames -> "tag names"
-
-let isSignatureItemStart = function
-  | Token.At | Let | Typ | External | Exception | Open | Include | Module | AtAt
-  | PercentPercent ->
-    true
-  | _ -> false
-
-let isAtomicPatternStart = function
-  | Token.Int _ | String _ | Codepoint _ | Backtick | Lparen | Lbracket | Lbrace
-  | Underscore | Lident _ | Uident _ | List | Exception | Lazy | Percent ->
-    true
-  | _ -> false
-
-let isAtomicExprStart = function
-  | Token.True | False | Int _ | String _ | Float _ | Codepoint _ | Backtick
-  | Uident _ | Lident _ | Hash | Lparen | List | Lbracket | Lbrace | LessThan
-  | Module | Percent ->
-    true
-  | _ -> false
-
-let isAtomicTypExprStart = function
-  | Token.SingleQuote | Underscore | Lparen | Lbrace | Uident _ | Lident _
-  | Percent ->
-    true
-  | _ -> false
-
-let isExprStart = function
-  | Token.Assert | At | Await | Backtick | Bang | Codepoint _ | False | Float _
-  | For | Hash | If | Int _ | Lazy | Lbrace | Lbracket | LessThan | Lident _
-  | List | Lparen | Minus | MinusDot | Module | Percent | Plus | PlusDot
-  | String _ | Switch | True | Try | Uident _ | Underscore (* _ => doThings() *)
-  | While ->
-    true
-  | _ -> false
-
-let isJsxAttributeStart = function
-  | Token.Lident _ | Question | Lbrace -> true
-  | _ -> false
-
-let isStructureItemStart = function
-  | Token.Open | Let | Typ | External | Exception | Include | Module | AtAt
-  | PercentPercent | At ->
-    true
-  | t when isExprStart t -> true
-  | _ -> false
-
-let isPatternStart = function
-  | Token.Int _ | Float _ | String _ | Codepoint _ | Backtick | True | False
-  | Minus | Plus | Lparen | Lbracket | Lbrace | List | Underscore | Lident _
-  | Uident _ | Hash | Exception | Lazy | Percent | Module | At ->
-    true
-  | _ -> false
-
-let isParameterStart = function
-  | Token.Typ | Tilde | Dot -> true
-  | token when isPatternStart token -> true
-  | _ -> false
-
-(* TODO: overparse Uident ? *)
-let isStringFieldDeclStart = function
-  | Token.String _ | Lident _ | At | DotDotDot -> true
-  | _ -> false
-
-(* TODO: overparse Uident ? *)
-let isFieldDeclStart = function
-  | Token.At | Mutable | Lident _ -> true
-  (* recovery, TODO: this is not ideal… *)
-  | Uident _ -> true
-  | t when Token.isKeyword t -> true
-  | _ -> false
-
-let isRecordDeclStart = function
-  | Token.At | Mutable | Lident _ | DotDotDot | String _ -> true
-  | _ -> false
-
-let isTypExprStart = function
-  | Token.At | SingleQuote | Underscore | Lparen | Lbracket | Uident _
-  | Lident _ | Module | Percent | Lbrace ->
-    true
-  | _ -> false
-
-let isTypeParameterStart = function
-  | Token.Tilde | Dot -> true
-  | token when isTypExprStart token -> true
-  | _ -> false
-
-let isTypeParamStart = function
-  | Token.Plus | Minus | SingleQuote | Underscore -> true
-  | _ -> false
-
-let isFunctorArgStart = function
-  | Token.At | Uident _ | Underscore | Percent | Lbrace | Lparen -> true
-  | _ -> false
-
-let isModExprStart = function
-  | Token.At | Percent | Uident _ | Lbrace | Lparen | Lident "unpack" | Await ->
-    true
-  | _ -> false
-
-let isRecordRowStart = function
-  | Token.DotDotDot -> true
-  | Token.Uident _ | Lident _ -> true
-  (* TODO *)
-  | t when Token.isKeyword t -> true
-  | _ -> false
-
-let isRecordRowStringKeyStart = function
-  | Token.String _ -> true
-  | _ -> false
-
-let isArgumentStart = function
-  | Token.Tilde | Dot | Underscore -> true
-  | t when isExprStart t -> true
-  | _ -> false
-
-let isPatternMatchStart = function
-  | Token.Bar -> true
-  | t when isPatternStart t -> true
-  | _ -> false
-
-let isPatternOcamlListStart = function
-  | Token.DotDotDot -> true
-  | t when isPatternStart t -> true
-  | _ -> false
-
-let isPatternRecordItemStart = function
-  | Token.DotDotDot | Uident _ | Lident _ | Underscore -> true
-  | _ -> false
-
-let isAttributeStart = function
-  | Token.At -> true
-  | _ -> false
-
-let isJsxChildStart = isAtomicExprStart
-
-let isBlockExprStart = function
-  | Token.Assert | At | Await | Backtick | Bang | Codepoint _ | Exception
-  | False | Float _ | For | Forwardslash | Hash | If | Int _ | Lazy | Lbrace
-  | Lbracket | LessThan | Let | Lident _ | List | Lparen | Minus | MinusDot
-  | Module | Open | Percent | Plus | PlusDot | String _ | Switch | True | Try
-  | Uident _ | Underscore | While ->
-    true
-  | _ -> false
-
-let isListElement grammar token =
-  match grammar with
-  | ExprList -> token = Token.DotDotDot || isExprStart token
-  | ListExpr -> token = DotDotDot || isExprStart token
-  | PatternList -> token = DotDotDot || isPatternStart token
-  | ParameterList -> isParameterStart token
-  | StringFieldDeclarations -> isStringFieldDeclStart token
-  | FieldDeclarations -> isFieldDeclStart token
-  | RecordDecl -> isRecordDeclStart token
-  | TypExprList -> isTypExprStart token || token = Token.LessThan
-  | TypeParams -> isTypeParamStart token
-  | FunctorArgs -> isFunctorArgStart token
-  | ModExprList -> isModExprStart token
-  | TypeParameters -> isTypeParameterStart token
-  | RecordRows -> isRecordRowStart token
-  | RecordRowsStringKey -> isRecordRowStringKeyStart token
-  | ArgumentList -> isArgumentStart token
-  | Signature | Specification -> isSignatureItemStart token
-  | Structure | Implementation -> isStructureItemStart token
-  | PatternMatching -> isPatternMatchStart token
-  | PatternOcamlList -> isPatternOcamlListStart token
-  | PatternRecord -> isPatternRecordItemStart token
-  | Attribute -> isAttributeStart token
-  | TypeConstraint -> token = Constraint
-  | PackageConstraint -> token = And
-  | ConstructorDeclaration -> token = Bar
-  | JsxAttribute -> isJsxAttributeStart token
-  | AttributePayload -> token = Lparen
-  | TagNames -> token = Hash
-  | _ -> false
-
-let isListTerminator grammar token =
-  match (grammar, token) with
-  | _, Token.Eof
-  | ExprList, (Rparen | Forwardslash | Rbracket)
-  | ListExpr, Rparen
-  | ArgumentList, (Rparen | DotDotDot)
-  | TypExprList, (Rparen | Forwardslash | GreaterThan | Equal)
-  | ModExprList, Rparen
-  | ( (PatternList | PatternOcamlList | PatternRecord),
-      ( Forwardslash | Rbracket | Rparen | EqualGreater (* pattern matching => *)
-      | In (* for expressions *)
-      | Equal (* let {x} = foo *) ) )
-  | ExprBlock, Rbrace
-  | (Structure | Signature), Rbrace
-  | TypeParams, Rparen
-  | ParameterList, (EqualGreater | Lbrace)
-  | JsxAttribute, (Forwardslash | GreaterThan)
-  | StringFieldDeclarations, Rbrace ->
-    true
-  | Attribute, token when token <> At -> true
-  | TypeConstraint, token when token <> Constraint -> true
-  | PackageConstraint, token when token <> And -> true
-  | ConstructorDeclaration, token when token <> Bar -> true
-  | AttributePayload, Rparen -> true
-  | TagNames, Rbracket -> true
-  | _ -> false
-
-let isPartOfList grammar token =
-  isListElement grammar token || isListTerminator grammar token
diff --git a/jscomp/syntax/src/res_io.ml b/jscomp/syntax/src/res_io.ml
deleted file mode 100644
index e5934b8..0000000
--- a/jscomp/syntax/src/res_io.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-let readFile ~filename =
-  let chan = open_in_bin filename in
-  let content =
-    try really_input_string chan (in_channel_length chan)
-    with End_of_file -> ""
-  in
-  close_in_noerr chan;
-  content
-
-let writeFile ~filename ~contents:txt =
-  let chan = open_out_bin filename in
-  output_string chan txt;
-  close_out chan
-[@@raises Sys_error]
diff --git a/jscomp/syntax/src/res_io.mli b/jscomp/syntax/src/res_io.mli
deleted file mode 100644
index dcc6e14..0000000
--- a/jscomp/syntax/src/res_io.mli
+++ /dev/null
@@ -1,7 +0,0 @@
-(* utilities to read and write to/from files or stdin *)
-
-(* reads the contents of "filename" into a string *)
-val readFile : filename:string -> string
-
-(* writes "content" into file with name "filename" *)
-val writeFile : filename:string -> contents:string -> unit
diff --git a/jscomp/syntax/src/res_multi_printer.ml b/jscomp/syntax/src/res_multi_printer.ml
deleted file mode 100644
index 98cd1d4..0000000
--- a/jscomp/syntax/src/res_multi_printer.ml
+++ /dev/null
@@ -1,119 +0,0 @@
-let defaultPrintWidth = 100
-
-(* Look at rescript.json (or bsconfig.json) to set Uncurried or Legacy mode if it contains "uncurried": false *)
-let getUncurriedFromConfig ~filename =
-  let rec findConfig ~dir =
-    let config = Filename.concat dir "rescript.json" in
-    if Sys.file_exists config then Some (Res_io.readFile ~filename:config)
-    else
-      let config = Filename.concat dir "bsconfig.json" in
-      if Sys.file_exists config then Some (Res_io.readFile ~filename:config)
-      else
-        let parent = Filename.dirname dir in
-        if parent = dir then None else findConfig ~dir:parent
-  in
-  let rec findFromNodeModules ~dir =
-    let parent = Filename.dirname dir in
-    if Filename.basename dir = "node_modules" then
-      let config = Filename.concat parent "rescript.json" in
-      if Sys.file_exists config then Some (Res_io.readFile ~filename:config)
-      else
-        let config = Filename.concat parent "bsconfig.json" in
-        if Sys.file_exists config then Some (Res_io.readFile ~filename:config)
-        else None
-    else if parent = dir then None
-    else findFromNodeModules ~dir:parent
-  in
-  let dir =
-    if Filename.is_relative filename then
-      Filename.dirname (Filename.concat (Sys.getcwd ()) filename)
-    else Filename.dirname filename
-  in
-  let config () =
-    match findConfig ~dir with
-    | None ->
-      (* The editor calls format on a temporary file. So bsconfig can't be found.
-         This looks outside the node_modules containing the bsc binary *)
-      let dir = (Filename.dirname Sys.argv.(0) [@doesNotRaise]) in
-      findFromNodeModules ~dir
-    | x -> x
-  in
-  match config () with
-  | exception _ -> ()
-  | None -> ()
-  | Some config ->
-    let lines = config |> String.split_on_char '\n' in
-    let is_legacy_uncurried =
-      lines
-      |> List.exists (fun line ->
-             let is_uncurried_option = ref false in
-             let is_option_falsy = ref false in
-             let words = line |> String.split_on_char ' ' in
-             words
-             |> List.iter (fun word ->
-                    match word with
-                    | "\"uncurried\"" | "\"uncurried\":" ->
-                      is_uncurried_option := true
-                    | "\"uncurried\":false" | "\"uncurried\":false," ->
-                      is_uncurried_option := true;
-                      is_option_falsy := true
-                    | "false" | ":false" | "false," | ":false," ->
-                      is_option_falsy := true
-                    | _ -> ());
-             !is_uncurried_option && !is_option_falsy)
-    in
-    if not is_legacy_uncurried then Config.uncurried := Uncurried
-
-(* print res files to res syntax *)
-let printRes ~ignoreParseErrors ~isInterface ~filename =
-  getUncurriedFromConfig ~filename;
-  if isInterface then (
-    let parseResult =
-      Res_driver.parsingEngine.parseInterface ~forPrinter:true ~filename
-    in
-    if parseResult.invalid then (
-      Res_diagnostics.printReport parseResult.diagnostics parseResult.source;
-      if not ignoreParseErrors then exit 1);
-    Res_printer.printInterface ~width:defaultPrintWidth
-      ~comments:parseResult.comments parseResult.parsetree)
-  else
-    let parseResult =
-      Res_driver.parsingEngine.parseImplementation ~forPrinter:true ~filename
-    in
-    if parseResult.invalid then (
-      Res_diagnostics.printReport parseResult.diagnostics parseResult.source;
-      if not ignoreParseErrors then exit 1);
-    Res_printer.printImplementation ~width:defaultPrintWidth
-      ~comments:parseResult.comments parseResult.parsetree
-[@@raises exit]
-
-(* print ocaml files to res syntax *)
-let printMl ~isInterface ~filename =
-  if isInterface then
-    let parseResult =
-      Res_driver_ml_parser.parsingEngine.parseInterface ~forPrinter:true
-        ~filename
-    in
-    Res_printer.printInterface ~width:defaultPrintWidth
-      ~comments:parseResult.comments parseResult.parsetree
-  else
-    let parseResult =
-      Res_driver_ml_parser.parsingEngine.parseImplementation ~forPrinter:true
-        ~filename
-    in
-    Res_printer.printImplementation ~width:defaultPrintWidth
-      ~comments:parseResult.comments parseResult.parsetree
-
-(* print the given file named input to from "language" to res, general interface exposed by the compiler *)
-let print ?(ignoreParseErrors = false) language ~input =
-  let isInterface =
-    let len = String.length input in
-    len > 0 && String.unsafe_get input (len - 1) = 'i'
-  in
-  match language with
-  | `res -> printRes ~ignoreParseErrors ~isInterface ~filename:input
-  | `ml -> printMl ~isInterface ~filename:input
-[@@raises exit]
-
-(* suppress unused optional arg *)
-let _ = fun s -> print ~ignoreParseErrors:false s [@@raises exit]
diff --git a/jscomp/syntax/src/res_multi_printer.mli b/jscomp/syntax/src/res_multi_printer.mli
deleted file mode 100644
index 1d15c71..0000000
--- a/jscomp/syntax/src/res_multi_printer.mli
+++ /dev/null
@@ -1,3 +0,0 @@
-(* Interface to print source code from different languages to res.
- * Takes a filename called "input" and returns the corresponding formatted res syntax *)
-val print : ?ignoreParseErrors:bool -> [`ml | `res] -> input:string -> string
diff --git a/jscomp/syntax/src/res_outcome_printer.ml b/jscomp/syntax/src/res_outcome_printer.ml
deleted file mode 100644
index f704bd8..0000000
--- a/jscomp/syntax/src/res_outcome_printer.ml
+++ /dev/null
@@ -1,1174 +0,0 @@
-(* For the curious: the outcome printer is a printer to print data
- * from the outcometree.mli file in the ocaml compiler.
- * The outcome tree is used by:
- *  - ocaml's toplevel/repl, print results/errors
- *  - super errors, print nice errors
- *  - editor tooling, e.g. show type on hover
- *
- * In general it represent messages to show results or errors to the user. *)
-
-module Doc = Res_doc
-module Token = Res_token
-
-let rec unsafe_for_all_range s ~start ~finish p =
-  start > finish
-  || p (String.unsafe_get s start)
-     && unsafe_for_all_range s ~start:(start + 1) ~finish p
-
-let for_all_from s start p =
-  let len = String.length s in
-  unsafe_for_all_range s ~start ~finish:(len - 1) p
-
-(* See https://github.com/rescript-lang/rescript-compiler/blob/726cfa534314b586e5b5734471bc2023ad99ebd9/jscomp/ext/ext_string.ml#L510 *)
-let isValidNumericPolyvarNumber (x : string) =
-  let len = String.length x in
-  len > 0
-  &&
-  let a = Char.code (String.unsafe_get x 0) in
-  a <= 57
-  &&
-  if len > 1 then
-    a > 48
-    && for_all_from x 1 (function
-         | '0' .. '9' -> true
-         | _ -> false)
-  else a >= 48
-
-type identifierStyle = ExoticIdent | NormalIdent
-
-let classifyIdentContent ~allowUident txt =
-  let len = String.length txt in
-  let rec go i =
-    if i == len then NormalIdent
-    else
-      let c = String.unsafe_get txt i in
-      if
-        i == 0
-        && not
-             ((allowUident && c >= 'A' && c <= 'Z')
-             || (c >= 'a' && c <= 'z')
-             || c = '_')
-      then ExoticIdent
-      else if
-        not
-          ((c >= 'a' && c <= 'z')
-          || (c >= 'A' && c <= 'Z')
-          || c = '\'' || c = '_'
-          || (c >= '0' && c <= '9'))
-      then ExoticIdent
-      else go (i + 1)
-  in
-  if Token.isKeywordTxt txt then ExoticIdent else go 0
-
-let printIdentLike ~allowUident txt =
-  match classifyIdentContent ~allowUident txt with
-  | ExoticIdent -> Doc.concat [Doc.text "\\\""; Doc.text txt; Doc.text "\""]
-  | NormalIdent -> Doc.text txt
-
-let printPolyVarIdent txt =
-  (* numeric poly-vars don't need quotes: #644 *)
-  if isValidNumericPolyvarNumber txt then Doc.text txt
-  else
-    match classifyIdentContent ~allowUident:true txt with
-    | ExoticIdent -> Doc.concat [Doc.text "\""; Doc.text txt; Doc.text "\""]
-    | NormalIdent -> Doc.text txt
-
-(* ReScript doesn't have parenthesized identifiers.
- * We don't support custom operators. *)
-let parenthesized_ident _name = true
-
-(* TODO: better allocation strategy for the buffer *)
-let escapeStringContents s =
-  let len = String.length s in
-  let b = Buffer.create len in
-  for i = 0 to len - 1 do
-    let c = (String.get [@doesNotRaise]) s i in
-    if c = '\008' then (
-      Buffer.add_char b '\\';
-      Buffer.add_char b 'b')
-    else if c = '\009' then (
-      Buffer.add_char b '\\';
-      Buffer.add_char b 't')
-    else if c = '\010' then (
-      Buffer.add_char b '\\';
-      Buffer.add_char b 'n')
-    else if c = '\013' then (
-      Buffer.add_char b '\\';
-      Buffer.add_char b 'r')
-    else if c = '\034' then (
-      Buffer.add_char b '\\';
-      Buffer.add_char b '"')
-    else if c = '\092' then (
-      Buffer.add_char b '\\';
-      Buffer.add_char b '\\')
-    else Buffer.add_char b c
-  done;
-  Buffer.contents b
-
-(* let rec print_ident fmt ident = match ident with
-   | Outcometree.Oide_ident s -> Format.pp_print_string fmt s
-   | Oide_dot (id, s) ->
-     print_ident fmt id;
-     Format.pp_print_char fmt '.';
-     Format.pp_print_string fmt s
-   | Oide_apply (id1, id2) ->
-     print_ident fmt id1;
-     Format.pp_print_char fmt '(';
-     print_ident fmt id2;
-     Format.pp_print_char fmt ')' *)
-
-let rec printOutIdentDoc ?(allowUident = true) (ident : Outcometree.out_ident) =
-  match ident with
-  | Oide_ident s -> printIdentLike ~allowUident s
-  | Oide_dot (ident, s) ->
-    Doc.concat [printOutIdentDoc ident; Doc.dot; Doc.text s]
-  | Oide_apply (call, arg) ->
-    Doc.concat
-      [printOutIdentDoc call; Doc.lparen; printOutIdentDoc arg; Doc.rparen]
-
-let printOutAttributeDoc (outAttribute : Outcometree.out_attribute) =
-  Doc.concat [Doc.text "@"; Doc.text outAttribute.oattr_name]
-
-let printOutAttributesDoc (attrs : Outcometree.out_attribute list) =
-  match attrs with
-  | [] -> Doc.nil
-  | attrs ->
-    Doc.concat
-      [
-        Doc.group (Doc.join ~sep:Doc.line (List.map printOutAttributeDoc attrs));
-        Doc.line;
-      ]
-
-let rec collectArrowArgs (outType : Outcometree.out_type) args =
-  match outType with
-  | Otyp_arrow (label, argType, returnType) ->
-    let arg = (label, argType) in
-    collectArrowArgs returnType (arg :: args)
-  | _ as returnType -> (List.rev args, returnType)
-
-let rec collectFunctorArgs (outModuleType : Outcometree.out_module_type) args =
-  match outModuleType with
-  | Omty_functor (lbl, optModType, returnModType) ->
-    let arg = (lbl, optModType) in
-    collectFunctorArgs returnModType (arg :: args)
-  | _ -> (List.rev args, outModuleType)
-
-let rec printOutTypeDoc (outType : Outcometree.out_type) =
-  match outType with
-  | Otyp_abstract | Otyp_open -> Doc.nil
-  | Otyp_variant (nonGen, outVariant, closed, labels) ->
-    (* bool * out_variant * bool * (string list) option *)
-    let opening =
-      match (closed, labels) with
-      | true, None -> (* [#A | #B] *) Doc.softLine
-      | false, None ->
-        (* [> #A | #B] *)
-        Doc.concat [Doc.greaterThan; Doc.line]
-      | true, Some [] ->
-        (* [< #A | #B] *)
-        Doc.concat [Doc.lessThan; Doc.line]
-      | true, Some _ ->
-        (* [< #A | #B > #X #Y ] *)
-        Doc.concat [Doc.lessThan; Doc.line]
-      | false, Some _ ->
-        (* impossible!? ocaml seems to print ?, see oprint.ml in 4.06 *)
-        Doc.concat [Doc.text "?"; Doc.line]
-    in
-    Doc.group
-      (Doc.concat
-         [
-           (if nonGen then Doc.text "_" else Doc.nil);
-           Doc.lbracket;
-           Doc.indent (Doc.concat [opening; printOutVariant outVariant]);
-           (match labels with
-           | None | Some [] -> Doc.nil
-           | Some tags ->
-             Doc.group
-               (Doc.concat
-                  [
-                    Doc.space;
-                    Doc.join ~sep:Doc.space
-                      (List.map
-                         (fun lbl -> printIdentLike ~allowUident:true lbl)
-                         tags);
-                  ]));
-           Doc.softLine;
-           Doc.rbracket;
-         ])
-  | Otyp_alias (typ, aliasTxt) ->
-    Doc.concat
-      [
-        Doc.lparen;
-        printOutTypeDoc typ;
-        Doc.text " as '";
-        Doc.text aliasTxt;
-        Doc.rparen;
-      ]
-  | Otyp_constr (Oide_dot (Oide_dot (Oide_ident "Js", "Fn"), "arity0"), [typ])
-    ->
-    (* Compatibility with compiler up to v10.x *)
-    Doc.concat [Doc.text "(. ()) => "; printOutTypeDoc typ]
-  | Otyp_constr
-      ( Oide_dot (Oide_dot (Oide_ident "Js", "Fn"), _),
-        [(Otyp_arrow _ as arrowType)] ) ->
-    (* Compatibility with compiler up to v10.x *)
-    printOutArrowType ~uncurried:true arrowType
-  | Otyp_constr (Oide_ident "function$", [(Otyp_arrow _ as arrowType); _arity])
-    ->
-    (* function$<(int, int) => int, [#2]> -> (. int, int) => int *)
-    printOutArrowType ~uncurried:true arrowType
-  | Otyp_constr (Oide_ident "function$", [Otyp_var _; _arity]) ->
-    (* function$<'a, arity> -> _ => _ *)
-    printOutTypeDoc (Otyp_stuff "_ => _")
-  | Otyp_constr (outIdent, []) -> printOutIdentDoc ~allowUident:false outIdent
-  | Otyp_manifest (typ1, typ2) ->
-    Doc.concat [printOutTypeDoc typ1; Doc.text " = "; printOutTypeDoc typ2]
-  | Otyp_record record -> printRecordDeclarationDoc ~inline:true record
-  | Otyp_stuff txt -> Doc.text txt
-  | Otyp_var (ng, s) ->
-    Doc.concat [Doc.text ("'" ^ if ng then "_" else ""); Doc.text s]
-  | Otyp_object (fields, rest) -> printObjectFields fields rest
-  | Otyp_class _ -> Doc.nil
-  | Otyp_attribute (typ, attribute) ->
-    Doc.group
-      (Doc.concat
-         [printOutAttributeDoc attribute; Doc.line; printOutTypeDoc typ])
-  (* example: Red | Blue | Green | CustomColour(float, float, float) *)
-  | Otyp_sum constructors -> printOutConstructorsDoc constructors
-  (* example: {"name": string, "age": int} *)
-  | Otyp_constr (Oide_dot (Oide_ident "Js", "t"), [Otyp_object (fields, rest)])
-    ->
-    printObjectFields fields rest
-  (* example: node<root, 'value> *)
-  | Otyp_constr (outIdent, args) ->
-    let argsDoc =
-      match args with
-      | [] -> Doc.nil
-      | args ->
-        Doc.concat
-          [
-            Doc.lessThan;
-            Doc.indent
-              (Doc.concat
-                 [
-                   Doc.softLine;
-                   Doc.join
-                     ~sep:(Doc.concat [Doc.comma; Doc.line])
-                     (List.map printOutTypeDoc args);
-                 ]);
-            Doc.trailingComma;
-            Doc.softLine;
-            Doc.greaterThan;
-          ]
-    in
-    Doc.group (Doc.concat [printOutIdentDoc outIdent; argsDoc])
-  | Otyp_tuple tupleArgs ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.lparen;
-           Doc.indent
-             (Doc.concat
-                [
-                  Doc.softLine;
-                  Doc.join
-                    ~sep:(Doc.concat [Doc.comma; Doc.line])
-                    (List.map printOutTypeDoc tupleArgs);
-                ]);
-           Doc.trailingComma;
-           Doc.softLine;
-           Doc.rparen;
-         ])
-  | Otyp_poly (vars, outType) ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.join ~sep:Doc.space
-             (List.map (fun var -> Doc.text ("'" ^ var)) vars);
-           Doc.dot;
-           Doc.space;
-           printOutTypeDoc outType;
-         ])
-  | Otyp_arrow _ as typ -> printOutArrowType ~uncurried:false typ
-  | Otyp_module (modName, stringList, outTypes) ->
-    let packageTypeDoc =
-      match (stringList, outTypes) with
-      | [], [] -> Doc.nil
-      | labels, types ->
-        let i = ref 0 in
-        let package =
-          Doc.join ~sep:Doc.line
-            ((List.map2 [@doesNotRaise])
-               (fun lbl typ ->
-                 Doc.concat
-                   [
-                     Doc.text
-                       (if i.contents > 0 then "and type " else "with type ");
-                     Doc.text lbl;
-                     Doc.text " = ";
-                     printOutTypeDoc typ;
-                   ])
-               labels types)
-        in
-        Doc.indent (Doc.concat [Doc.line; package])
-    in
-    Doc.concat
-      [
-        Doc.text "module";
-        Doc.lparen;
-        Doc.text modName;
-        packageTypeDoc;
-        Doc.rparen;
-      ]
-
-and printOutArrowType ~uncurried typ =
-  let uncurried = Res_uncurried.getDotted ~uncurried !Config.uncurried in
-  let typArgs, typ = collectArrowArgs typ [] in
-  let args =
-    Doc.join
-      ~sep:(Doc.concat [Doc.comma; Doc.line])
-      (List.map
-         (fun (lbl, typ) ->
-           let lblLen = String.length lbl in
-           if lblLen = 0 then printOutTypeDoc typ
-           else
-             let lbl, optionalIndicator =
-               (* the ocaml compiler hardcodes the optional label inside the string of the label in printtyp.ml *)
-               match String.unsafe_get lbl 0 with
-               | '?' ->
-                 ((String.sub [@doesNotRaise]) lbl 1 (lblLen - 1), Doc.text "=?")
-               | _ -> (lbl, Doc.nil)
-             in
-             Doc.group
-               (Doc.concat
-                  [
-                    Doc.text ("~" ^ lbl ^ ": ");
-                    printOutTypeDoc typ;
-                    optionalIndicator;
-                  ]))
-         typArgs)
-  in
-  let argsDoc =
-    let needsParens =
-      match typArgs with
-      | _ when uncurried -> true
-      | [
-       ( _,
-         ( Otyp_tuple _ | Otyp_arrow _
-         | Otyp_constr (Oide_ident "function$", [Otyp_arrow _; _]) ) );
-      ] ->
-        true
-      (* single argument should not be wrapped *)
-      | [("", _)] -> false
-      | _ -> true
-    in
-    if needsParens then
-      Doc.group
-        (Doc.concat
-           [
-             (if uncurried then Doc.text "(. " else Doc.lparen);
-             Doc.indent (Doc.concat [Doc.softLine; args]);
-             Doc.trailingComma;
-             Doc.softLine;
-             Doc.rparen;
-           ])
-    else args
-  in
-  Doc.concat [argsDoc; Doc.text " => "; printOutTypeDoc typ]
-
-and printOutVariant variant =
-  match variant with
-  | Ovar_fields fields ->
-    (* (string * bool * out_type list) list *)
-    Doc.join ~sep:Doc.line
-      ((*
-        * [< | #T([< u2]) & ([< u2]) & ([< u1])]  --> no ampersand
-        * [< | #S & ([< u2]) & ([< u2]) & ([< u1])] --> ampersand
-        *)
-       List.mapi
-         (fun i (name, ampersand, types) ->
-           let needsParens =
-             match types with
-             | [Outcometree.Otyp_tuple _] -> false
-             | _ -> true
-           in
-           Doc.concat
-             [
-               (if i > 0 then Doc.text "| "
-                else Doc.ifBreaks (Doc.text "| ") Doc.nil);
-               Doc.group
-                 (Doc.concat
-                    [
-                      Doc.text "#";
-                      printPolyVarIdent name;
-                      (match types with
-                      | [] -> Doc.nil
-                      | types ->
-                        Doc.concat
-                          [
-                            (if ampersand then Doc.text " & " else Doc.nil);
-                            Doc.indent
-                              (Doc.concat
-                                 [
-                                   Doc.join
-                                     ~sep:(Doc.concat [Doc.text " &"; Doc.line])
-                                     (List.map
-                                        (fun typ ->
-                                          let outTypeDoc =
-                                            printOutTypeDoc typ
-                                          in
-                                          if needsParens then
-                                            Doc.concat
-                                              [
-                                                Doc.lparen;
-                                                outTypeDoc;
-                                                Doc.rparen;
-                                              ]
-                                          else outTypeDoc)
-                                        types);
-                                 ]);
-                          ]);
-                    ]);
-             ])
-         fields)
-  | Ovar_typ typ -> printOutTypeDoc typ
-
-and printObjectFields fields rest =
-  let dots =
-    match rest with
-    | Some non_gen -> Doc.text ((if non_gen then "_" else "") ^ "..")
-    | None -> if fields = [] then Doc.dot else Doc.nil
-  in
-  Doc.group
-    (Doc.concat
-       [
-         Doc.lbrace;
-         dots;
-         Doc.indent
-           (Doc.concat
-              [
-                Doc.softLine;
-                Doc.join
-                  ~sep:(Doc.concat [Doc.comma; Doc.line])
-                  (List.map
-                     (fun (lbl, outType) ->
-                       Doc.group
-                         (Doc.concat
-                            [
-                              Doc.text ("\"" ^ lbl ^ "\": ");
-                              printOutTypeDoc outType;
-                            ]))
-                     fields);
-              ]);
-         Doc.trailingComma;
-         Doc.softLine;
-         Doc.rbrace;
-       ])
-
-and printOutConstructorsDoc constructors =
-  Doc.group
-    (Doc.indent
-       (Doc.concat
-          [
-            Doc.softLine;
-            Doc.join ~sep:Doc.line
-              (List.mapi
-                 (fun i constructor ->
-                   Doc.concat
-                     [
-                       (if i > 0 then Doc.text "| "
-                        else Doc.ifBreaks (Doc.text "| ") Doc.nil);
-                       printOutConstructorDoc constructor;
-                     ])
-                 constructors);
-          ]))
-
-and printOutConstructorDoc (name, args, gadt, repr) =
-  let reprDoc =
-    match repr with
-    | None -> Doc.nil
-    | Some s -> Doc.text (s ^ " ")
-  in
-  let gadtDoc =
-    match gadt with
-    | Some outType -> Doc.concat [Doc.text ": "; printOutTypeDoc outType]
-    | None -> Doc.nil
-  in
-  let argsDoc =
-    match args with
-    | [] -> Doc.nil
-    | [Otyp_record record] ->
-      (* inline records
-       *   | Root({
-       *      mutable value: 'value,
-       *      mutable updatedTime: float,
-       *    })
-       *)
-      Doc.concat
-        [
-          Doc.lparen;
-          Doc.indent (printRecordDeclarationDoc ~inline:true record);
-          Doc.rparen;
-        ]
-    | _types ->
-      Doc.indent
-        (Doc.concat
-           [
-             Doc.lparen;
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    Doc.join
-                      ~sep:(Doc.concat [Doc.comma; Doc.line])
-                      (List.map printOutTypeDoc args);
-                  ]);
-             Doc.trailingComma;
-             Doc.softLine;
-             Doc.rparen;
-           ])
-  in
-  Doc.group (Doc.concat [reprDoc; Doc.text name; argsDoc; gadtDoc])
-
-and printRecordDeclRowDoc (name, mut, opt, arg) =
-  Doc.group
-    (Doc.concat
-       [
-         (if mut then Doc.text "mutable " else Doc.nil);
-         printIdentLike ~allowUident:false name;
-         (if opt then Doc.text "?" else Doc.nil);
-         Doc.text ": ";
-         printOutTypeDoc arg;
-       ])
-
-and printRecordDeclarationDoc ~inline rows =
-  let content =
-    Doc.concat
-      [
-        Doc.lbrace;
-        Doc.indent
-          (Doc.concat
-             [
-               Doc.softLine;
-               Doc.join
-                 ~sep:(Doc.concat [Doc.comma; Doc.line])
-                 (List.map printRecordDeclRowDoc rows);
-             ]);
-        Doc.trailingComma;
-        Doc.softLine;
-        Doc.rbrace;
-      ]
-  in
-  if not inline then Doc.group content else content
-
-let printOutType fmt outType =
-  Format.pp_print_string fmt (Doc.toString ~width:80 (printOutTypeDoc outType))
-
-let printTypeParameterDoc (typ, (co, cn)) =
-  Doc.concat
-    [
-      (if not cn then Doc.text "+" else if not co then Doc.text "-" else Doc.nil);
-      (if typ = "_" then Doc.text "_" else Doc.text ("'" ^ typ));
-    ]
-
-let rec printOutSigItemDoc ?(printNameAsIs = false)
-    (outSigItem : Outcometree.out_sig_item) =
-  match outSigItem with
-  | Osig_class _ | Osig_class_type _ -> Doc.nil
-  | Osig_ellipsis -> Doc.dotdotdot
-  | Osig_value valueDecl ->
-    Doc.group
-      (Doc.concat
-         [
-           printOutAttributesDoc valueDecl.oval_attributes;
-           Doc.text
-             (match valueDecl.oval_prims with
-             | [] -> "let "
-             | _ -> "external ");
-           Doc.text valueDecl.oval_name;
-           Doc.text ":";
-           Doc.space;
-           printOutTypeDoc valueDecl.oval_type;
-           (match valueDecl.oval_prims with
-           | [] -> Doc.nil
-           | primitives ->
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.text " =";
-                    Doc.line;
-                    Doc.group
-                      (Doc.join ~sep:Doc.line
-                         (List.map
-                            (fun prim ->
-                              let prim =
-                                if
-                                  prim <> ""
-                                  && (prim.[0] [@doesNotRaise]) = '\132'
-                                then "#rescript-external"
-                                else prim
-                              in
-                              (* not display those garbage '\132' is a magic number for marshal *)
-                              Doc.text ("\"" ^ prim ^ "\""))
-                            primitives));
-                  ]));
-         ])
-  | Osig_typext (outExtensionConstructor, _outExtStatus) ->
-    printOutExtensionConstructorDoc outExtensionConstructor
-  | Osig_modtype (modName, Omty_signature []) ->
-    Doc.concat [Doc.text "module type "; Doc.text modName]
-  | Osig_modtype (modName, outModuleType) ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.text "module type ";
-           Doc.text modName;
-           Doc.text " = ";
-           printOutModuleTypeDoc outModuleType;
-         ])
-  | Osig_module (modName, Omty_alias ident, _) ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.text "module ";
-           Doc.text modName;
-           Doc.text " =";
-           Doc.line;
-           printOutIdentDoc ident;
-         ])
-  | Osig_module (modName, outModType, outRecStatus) ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.text
-             (match outRecStatus with
-             | Orec_not -> "module "
-             | Orec_first -> "module rec "
-             | Orec_next -> "and ");
-           Doc.text modName;
-           Doc.text ": ";
-           printOutModuleTypeDoc outModType;
-         ])
-  | Osig_type (outTypeDecl, outRecStatus) ->
-    (* TODO: manifest ? *)
-    let attrs =
-      match (outTypeDecl.otype_immediate, outTypeDecl.otype_unboxed) with
-      | false, false -> Doc.nil
-      | true, false -> Doc.concat [Doc.text "@immediate"; Doc.line]
-      | false, true -> Doc.concat [Doc.text "@unboxed"; Doc.line]
-      | true, true -> Doc.concat [Doc.text "@immediate @unboxed"; Doc.line]
-    in
-    let kw =
-      Doc.text
-        (match outRecStatus with
-        | Orec_not -> "type "
-        | Orec_first -> "type rec "
-        | Orec_next -> "and ")
-    in
-    let typeParams =
-      match outTypeDecl.otype_params with
-      | [] -> Doc.nil
-      | _params ->
-        Doc.group
-          (Doc.concat
-             [
-               Doc.lessThan;
-               Doc.indent
-                 (Doc.concat
-                    [
-                      Doc.softLine;
-                      Doc.join
-                        ~sep:(Doc.concat [Doc.comma; Doc.line])
-                        (List.map printTypeParameterDoc outTypeDecl.otype_params);
-                    ]);
-               Doc.trailingComma;
-               Doc.softLine;
-               Doc.greaterThan;
-             ])
-    in
-    let privateDoc =
-      match outTypeDecl.otype_private with
-      | Asttypes.Private -> Doc.text "private "
-      | Public -> Doc.nil
-    in
-    let kind =
-      match outTypeDecl.otype_type with
-      | Otyp_open -> Doc.concat [Doc.text " = "; privateDoc; Doc.text ".."]
-      | Otyp_abstract -> Doc.nil
-      | Otyp_record record ->
-        Doc.concat
-          [
-            Doc.text " = ";
-            privateDoc;
-            printRecordDeclarationDoc ~inline:false record;
-          ]
-      | typ -> Doc.concat [Doc.text " = "; printOutTypeDoc typ]
-    in
-    let constraints =
-      match outTypeDecl.otype_cstrs with
-      | [] -> Doc.nil
-      | _ ->
-        Doc.group
-          (Doc.indent
-             (Doc.concat
-                [
-                  Doc.hardLine;
-                  Doc.join ~sep:Doc.line
-                    (List.map
-                       (fun (typ1, typ2) ->
-                         Doc.group
-                           (Doc.concat
-                              [
-                                Doc.text "constraint ";
-                                printOutTypeDoc typ1;
-                                Doc.text " =";
-                                Doc.space;
-                                printOutTypeDoc typ2;
-                              ]))
-                       outTypeDecl.otype_cstrs);
-                ]))
-    in
-    Doc.group
-      (Doc.concat
-         [
-           attrs;
-           Doc.group
-             (Doc.concat
-                [
-                  kw;
-                  (if printNameAsIs then Doc.text outTypeDecl.otype_name
-                   else printIdentLike ~allowUident:false outTypeDecl.otype_name);
-                  typeParams;
-                  kind;
-                ]);
-           constraints;
-         ])
-
-and printOutModuleTypeDoc (outModType : Outcometree.out_module_type) =
-  match outModType with
-  | Omty_abstract -> Doc.nil
-  | Omty_ident ident -> printOutIdentDoc ident
-  (* example: module Increment = (M: X_int) => X_int *)
-  | Omty_functor _ ->
-    let args, returnModType = collectFunctorArgs outModType [] in
-    let argsDoc =
-      match args with
-      | [(_, None)] -> Doc.text "()"
-      | args ->
-        Doc.group
-          (Doc.concat
-             [
-               Doc.lparen;
-               Doc.indent
-                 (Doc.concat
-                    [
-                      Doc.softLine;
-                      Doc.join
-                        ~sep:(Doc.concat [Doc.comma; Doc.line])
-                        (List.map
-                           (fun (lbl, optModType) ->
-                             Doc.group
-                               (Doc.concat
-                                  [
-                                    Doc.text lbl;
-                                    (match optModType with
-                                    | None -> Doc.nil
-                                    | Some modType ->
-                                      Doc.concat
-                                        [
-                                          Doc.text ": ";
-                                          printOutModuleTypeDoc modType;
-                                        ]);
-                                  ]))
-                           args);
-                    ]);
-               Doc.trailingComma;
-               Doc.softLine;
-               Doc.rparen;
-             ])
-    in
-    Doc.group
-      (Doc.concat
-         [argsDoc; Doc.text " => "; printOutModuleTypeDoc returnModType])
-  | Omty_signature [] -> Doc.nil
-  | Omty_signature signature ->
-    Doc.breakableGroup ~forceBreak:true
-      (Doc.concat
-         [
-           Doc.lbrace;
-           Doc.indent (Doc.concat [Doc.line; printOutSignatureDoc signature]);
-           Doc.softLine;
-           Doc.rbrace;
-         ])
-  | Omty_alias _ident -> Doc.nil
-
-and printOutSignatureDoc (signature : Outcometree.out_sig_item list) =
-  let rec loop signature acc =
-    match signature with
-    | [] -> List.rev acc
-    | Outcometree.Osig_typext (ext, Oext_first) :: items ->
-      (* Gather together the extension constructors *)
-      let rec gather_extensions acc items =
-        match items with
-        | Outcometree.Osig_typext (ext, Oext_next) :: items ->
-          gather_extensions
-            ((ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)
-            :: acc)
-            items
-        | _ -> (List.rev acc, items)
-      in
-      let exts, items =
-        gather_extensions
-          [(ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)]
-          items
-      in
-      let te =
-        {
-          Outcometree.otyext_name = ext.oext_type_name;
-          otyext_params = ext.oext_type_params;
-          otyext_constructors = exts;
-          otyext_private = ext.oext_private;
-        }
-      in
-      let doc = printOutTypeExtensionDoc te in
-      loop items (doc :: acc)
-    | item :: items ->
-      let doc = printOutSigItemDoc ~printNameAsIs:false item in
-      loop items (doc :: acc)
-  in
-  match loop signature [] with
-  | [doc] -> doc
-  | docs -> Doc.breakableGroup ~forceBreak:true (Doc.join ~sep:Doc.line docs)
-
-and printOutExtensionConstructorDoc
-    (outExt : Outcometree.out_extension_constructor) =
-  let typeParams =
-    match outExt.oext_type_params with
-    | [] -> Doc.nil
-    | params ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.lessThan;
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    Doc.join
-                      ~sep:(Doc.concat [Doc.comma; Doc.line])
-                      (List.map
-                         (fun ty ->
-                           Doc.text (if ty = "_" then ty else "'" ^ ty))
-                         params);
-                  ]);
-             Doc.softLine;
-             Doc.greaterThan;
-           ])
-  in
-
-  Doc.group
-    (Doc.concat
-       [
-         Doc.text "type ";
-         printIdentLike ~allowUident:false outExt.oext_type_name;
-         typeParams;
-         Doc.text " += ";
-         Doc.line;
-         (if outExt.oext_private = Asttypes.Private then Doc.text "private "
-          else Doc.nil);
-         printOutConstructorDoc
-           ( outExt.oext_name,
-             outExt.oext_args,
-             outExt.oext_ret_type,
-             outExt.oext_repr );
-       ])
-
-and printOutTypeExtensionDoc (typeExtension : Outcometree.out_type_extension) =
-  let typeParams =
-    match typeExtension.otyext_params with
-    | [] -> Doc.nil
-    | params ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.lessThan;
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    Doc.join
-                      ~sep:(Doc.concat [Doc.comma; Doc.line])
-                      (List.map
-                         (fun ty ->
-                           Doc.text (if ty = "_" then ty else "'" ^ ty))
-                         params);
-                  ]);
-             Doc.softLine;
-             Doc.greaterThan;
-           ])
-  in
-
-  Doc.group
-    (Doc.concat
-       [
-         Doc.text "type ";
-         printIdentLike ~allowUident:false typeExtension.otyext_name;
-         typeParams;
-         Doc.text " += ";
-         (if typeExtension.otyext_private = Asttypes.Private then
-            Doc.text "private "
-          else Doc.nil);
-         printOutConstructorsDoc typeExtension.otyext_constructors;
-       ])
-
-let printOutSigItem fmt outSigItem =
-  Format.pp_print_string fmt
-    (Doc.toString ~width:80 (printOutSigItemDoc outSigItem))
-
-let printOutSignature fmt signature =
-  Format.pp_print_string fmt
-    (Doc.toString ~width:80 (printOutSignatureDoc signature))
-
-let validFloatLexeme s =
-  let l = String.length s in
-  let rec loop i =
-    if i >= l then s ^ "."
-    else
-      match s.[i] [@doesNotRaise] with
-      | '0' .. '9' | '-' -> loop (i + 1)
-      | _ -> s
-  in
-  loop 0
-
-let floatRepres f =
-  match classify_float f with
-  | FP_nan -> "nan"
-  | FP_infinite -> if f < 0.0 then "neg_infinity" else "infinity"
-  | _ ->
-    let float_val =
-      let s1 = Printf.sprintf "%.12g" f in
-      if f = (float_of_string [@doesNotRaise]) s1 then s1
-      else
-        let s2 = Printf.sprintf "%.15g" f in
-        if f = (float_of_string [@doesNotRaise]) s2 then s2
-        else Printf.sprintf "%.18g" f
-    in
-    validFloatLexeme float_val
-
-let rec printOutValueDoc (outValue : Outcometree.out_value) =
-  match outValue with
-  | Oval_array outValues ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.lbracket;
-           Doc.indent
-             (Doc.concat
-                [
-                  Doc.softLine;
-                  Doc.join
-                    ~sep:(Doc.concat [Doc.comma; Doc.line])
-                    (List.map printOutValueDoc outValues);
-                ]);
-           Doc.trailingComma;
-           Doc.softLine;
-           Doc.rbracket;
-         ])
-  | Oval_char c -> Doc.text ("'" ^ Char.escaped c ^ "'")
-  | Oval_constr (outIdent, outValues) ->
-    Doc.group
-      (Doc.concat
-         [
-           printOutIdentDoc outIdent;
-           Doc.lparen;
-           Doc.indent
-             (Doc.concat
-                [
-                  Doc.softLine;
-                  Doc.join
-                    ~sep:(Doc.concat [Doc.comma; Doc.line])
-                    (List.map printOutValueDoc outValues);
-                ]);
-           Doc.trailingComma;
-           Doc.softLine;
-           Doc.rparen;
-         ])
-  | Oval_ellipsis -> Doc.text "..."
-  | Oval_int i -> Doc.text (Format.sprintf "%i" i)
-  | Oval_int32 i -> Doc.text (Format.sprintf "%lil" i)
-  | Oval_int64 i -> Doc.text (Format.sprintf "%LiL" i)
-  | Oval_nativeint i -> Doc.text (Format.sprintf "%nin" i)
-  | Oval_float f -> Doc.text (floatRepres f)
-  | Oval_list outValues ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.text "list[";
-           Doc.indent
-             (Doc.concat
-                [
-                  Doc.softLine;
-                  Doc.join
-                    ~sep:(Doc.concat [Doc.comma; Doc.line])
-                    (List.map printOutValueDoc outValues);
-                ]);
-           Doc.trailingComma;
-           Doc.softLine;
-           Doc.rbracket;
-         ])
-  | Oval_printer fn ->
-    let fmt = Format.str_formatter in
-    fn fmt;
-    let str = Format.flush_str_formatter () in
-    Doc.text str
-  | Oval_record rows ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.lparen;
-           Doc.indent
-             (Doc.concat
-                [
-                  Doc.softLine;
-                  Doc.join
-                    ~sep:(Doc.concat [Doc.comma; Doc.line])
-                    (List.map
-                       (fun (outIdent, outValue) ->
-                         Doc.group
-                           (Doc.concat
-                              [
-                                printOutIdentDoc outIdent;
-                                Doc.text ": ";
-                                printOutValueDoc outValue;
-                              ]))
-                       rows);
-                ]);
-           Doc.trailingComma;
-           Doc.softLine;
-           Doc.rparen;
-         ])
-  | Oval_string (txt, _sizeToPrint, _kind) ->
-    Doc.text (escapeStringContents txt)
-  | Oval_stuff txt -> Doc.text txt
-  | Oval_tuple outValues ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.lparen;
-           Doc.indent
-             (Doc.concat
-                [
-                  Doc.softLine;
-                  Doc.join
-                    ~sep:(Doc.concat [Doc.comma; Doc.line])
-                    (List.map printOutValueDoc outValues);
-                ]);
-           Doc.trailingComma;
-           Doc.softLine;
-           Doc.rparen;
-         ])
-  (* Not supported by ReScript *)
-  | Oval_variant _ -> Doc.nil
-
-let printOutExceptionDoc exc outValue =
-  match exc with
-  | Sys.Break -> Doc.text "Interrupted."
-  | Out_of_memory -> Doc.text "Out of memory during evaluation."
-  | Stack_overflow ->
-    Doc.text "Stack overflow during evaluation (looping recursion?)."
-  | _ ->
-    Doc.group
-      (Doc.indent
-         (Doc.concat
-            [Doc.text "Exception:"; Doc.line; printOutValueDoc outValue]))
-
-let printOutPhraseSignature signature =
-  let rec loop signature acc =
-    match signature with
-    | [] -> List.rev acc
-    | (Outcometree.Osig_typext (ext, Oext_first), None) :: signature ->
-      (* Gather together extension constructors *)
-      let rec gather_extensions acc items =
-        match items with
-        | (Outcometree.Osig_typext (ext, Oext_next), None) :: items ->
-          gather_extensions
-            ((ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)
-            :: acc)
-            items
-        | _ -> (List.rev acc, items)
-      in
-      let exts, signature =
-        gather_extensions
-          [(ext.oext_name, ext.oext_args, ext.oext_ret_type, ext.oext_repr)]
-          signature
-      in
-      let te =
-        {
-          Outcometree.otyext_name = ext.oext_type_name;
-          otyext_params = ext.oext_type_params;
-          otyext_constructors = exts;
-          otyext_private = ext.oext_private;
-        }
-      in
-      let doc = printOutTypeExtensionDoc te in
-      loop signature (doc :: acc)
-    | (sigItem, optOutValue) :: signature ->
-      let doc =
-        match optOutValue with
-        | None -> printOutSigItemDoc sigItem
-        | Some outValue ->
-          Doc.group
-            (Doc.concat
-               [
-                 printOutSigItemDoc sigItem;
-                 Doc.text " = ";
-                 printOutValueDoc outValue;
-               ])
-      in
-      loop signature (doc :: acc)
-  in
-  Doc.breakableGroup ~forceBreak:true
-    (Doc.join ~sep:Doc.line (loop signature []))
-
-let printOutPhraseDoc (outPhrase : Outcometree.out_phrase) =
-  match outPhrase with
-  | Ophr_eval (outValue, outType) ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.text "- : ";
-           printOutTypeDoc outType;
-           Doc.text " =";
-           Doc.indent (Doc.concat [Doc.line; printOutValueDoc outValue]);
-         ])
-  | Ophr_signature [] -> Doc.nil
-  | Ophr_signature signature -> printOutPhraseSignature signature
-  | Ophr_exception (exc, outValue) -> printOutExceptionDoc exc outValue
-
-let printOutPhrase fmt outPhrase =
-  Format.pp_print_string fmt
-    (Doc.toString ~width:80 (printOutPhraseDoc outPhrase))
-
-let printOutModuleType fmt outModuleType =
-  Format.pp_print_string fmt
-    (Doc.toString ~width:80 (printOutModuleTypeDoc outModuleType))
-
-let printOutTypeExtension fmt typeExtension =
-  Format.pp_print_string fmt
-    (Doc.toString ~width:80 (printOutTypeExtensionDoc typeExtension))
-
-let printOutValue fmt outValue =
-  Format.pp_print_string fmt
-    (Doc.toString ~width:80 (printOutValueDoc outValue))
-
-(* Not supported in ReScript *)
-(* Oprint.out_class_type *)
-let setup =
-  lazy
-    (Oprint.out_value := printOutValue;
-     Oprint.out_type := printOutType;
-     Oprint.out_module_type := printOutModuleType;
-     Oprint.out_sig_item := printOutSigItem;
-     Oprint.out_signature := printOutSignature;
-     Oprint.out_type_extension := printOutTypeExtension;
-     Oprint.out_phrase := printOutPhrase)
diff --git a/jscomp/syntax/src/res_parens.ml b/jscomp/syntax/src/res_parens.ml
deleted file mode 100644
index 83ae636..0000000
--- a/jscomp/syntax/src/res_parens.ml
+++ /dev/null
@@ -1,482 +0,0 @@
-module ParsetreeViewer = Res_parsetree_viewer
-type kind = Parenthesized | Braced of Location.t | Nothing
-
-let expr expr =
-  let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-  match optBraces with
-  | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-  | _ -> (
-    match expr with
-    | {
-     Parsetree.pexp_desc =
-       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-    } ->
-      Nothing
-    | {pexp_desc = Pexp_constraint _} -> Parenthesized
-    | _ -> Nothing)
-
-let exprRecordRowRhs e =
-  let kind = expr e in
-  match kind with
-  | Nothing when Res_parsetree_viewer.hasOptionalAttribute e.pexp_attributes
-    -> (
-    match e.pexp_desc with
-    | Pexp_ifthenelse _ | Pexp_fun _ -> Parenthesized
-    | _ -> kind)
-  | _ -> kind
-
-let callExpr expr =
-  let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-  match optBraces with
-  | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-  | _ -> (
-    match expr with
-    | {Parsetree.pexp_attributes = attrs}
-      when match ParsetreeViewer.filterParsingAttrs attrs with
-           | _ :: _ -> true
-           | [] -> false ->
-      Parenthesized
-    | _
-      when ParsetreeViewer.isUnaryExpression expr
-           || ParsetreeViewer.isBinaryExpression expr ->
-      Parenthesized
-    | {
-     Parsetree.pexp_desc =
-       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-    } ->
-      Nothing
-    | {pexp_desc = Pexp_fun _} when ParsetreeViewer.isUnderscoreApplySugar expr
-      ->
-      Nothing
-    | {
-     pexp_desc =
-       ( Pexp_lazy _ | Pexp_assert _ | Pexp_fun _ | Pexp_newtype _
-       | Pexp_function _ | Pexp_constraint _ | Pexp_setfield _ | Pexp_match _
-       | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
-    } ->
-      Parenthesized
-    | _ when Ast_uncurried.exprIsUncurriedFun expr -> Parenthesized
-    | _ when ParsetreeViewer.hasAwaitAttribute expr.pexp_attributes ->
-      Parenthesized
-    | _ -> Nothing)
-
-let structureExpr expr =
-  let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-  match optBraces with
-  | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-  | None -> (
-    match expr with
-    | _
-      when ParsetreeViewer.hasAttributes expr.pexp_attributes
-           && not (ParsetreeViewer.isJsxExpression expr) ->
-      Parenthesized
-    | {
-     Parsetree.pexp_desc =
-       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-    } ->
-      Nothing
-    | {pexp_desc = Pexp_constraint _} -> Parenthesized
-    | _ -> Nothing)
-
-let unaryExprOperand expr =
-  let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-  match optBraces with
-  | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-  | None -> (
-    match expr with
-    | {Parsetree.pexp_attributes = attrs}
-      when match ParsetreeViewer.filterParsingAttrs attrs with
-           | _ :: _ -> true
-           | [] -> false ->
-      Parenthesized
-    | expr
-      when ParsetreeViewer.isUnaryExpression expr
-           || ParsetreeViewer.isBinaryExpression expr ->
-      Parenthesized
-    | {
-     pexp_desc =
-       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-    } ->
-      Nothing
-    | {pexp_desc = Pexp_fun _} when ParsetreeViewer.isUnderscoreApplySugar expr
-      ->
-      Nothing
-    | {
-     pexp_desc =
-       ( Pexp_lazy _ | Pexp_assert _ | Pexp_fun _ | Pexp_newtype _
-       | Pexp_function _ | Pexp_constraint _ | Pexp_setfield _
-       | Pexp_extension _ (* readability? maybe remove *) | Pexp_match _
-       | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
-    } ->
-      Parenthesized
-    | _ when ParsetreeViewer.hasAwaitAttribute expr.pexp_attributes ->
-      Parenthesized
-    | {pexp_desc = Pexp_construct ({txt = Lident "Function$"}, Some expr)}
-      when ParsetreeViewer.isUnderscoreApplySugar expr ->
-      Nothing
-    | {pexp_desc = Pexp_construct ({txt = Lident "Function$"}, Some _)} ->
-      Parenthesized
-    | _ -> Nothing)
-
-let binaryExprOperand ~isLhs expr =
-  let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-  match optBraces with
-  | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-  | None -> (
-    match expr with
-    | {
-     Parsetree.pexp_desc =
-       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-    } ->
-      Nothing
-    | {pexp_desc = Pexp_fun _} when ParsetreeViewer.isUnderscoreApplySugar expr
-      ->
-      Nothing
-    | {
-     pexp_desc =
-       Pexp_constraint _ | Pexp_fun _ | Pexp_function _ | Pexp_newtype _;
-    } ->
-      Parenthesized
-    | _ when Ast_uncurried.exprIsUncurriedFun expr -> Parenthesized
-    | expr when ParsetreeViewer.isBinaryExpression expr -> Parenthesized
-    | expr when ParsetreeViewer.isTernaryExpr expr -> Parenthesized
-    | {pexp_desc = Pexp_lazy _ | Pexp_assert _} when isLhs -> Parenthesized
-    | _ when ParsetreeViewer.hasAwaitAttribute expr.pexp_attributes ->
-      Parenthesized
-    | {Parsetree.pexp_attributes = attrs} ->
-      if ParsetreeViewer.hasPrintableAttributes attrs then Parenthesized
-      else Nothing)
-
-let subBinaryExprOperand parentOperator childOperator =
-  let precParent = ParsetreeViewer.operatorPrecedence parentOperator in
-  let precChild = ParsetreeViewer.operatorPrecedence childOperator in
-  precParent > precChild
-  || precParent == precChild
-     && not (ParsetreeViewer.flattenableOperators parentOperator childOperator)
-  || (* a && b || c, add parens to (a && b) for readability, who knows the difference by heart… *)
-  (parentOperator = "||" && childOperator = "&&")
-
-let rhsBinaryExprOperand parentOperator rhs =
-  match rhs.Parsetree.pexp_desc with
-  | Parsetree.Pexp_apply
-      ( {
-          pexp_attributes = [];
-          pexp_desc =
-            Pexp_ident {txt = Longident.Lident operator; loc = operatorLoc};
-        },
-        [(_, _left); (_, _right)] )
-    when ParsetreeViewer.isBinaryOperator operator
-         && not (operatorLoc.loc_ghost && operator = "^") ->
-    let precParent = ParsetreeViewer.operatorPrecedence parentOperator in
-    let precChild = ParsetreeViewer.operatorPrecedence operator in
-    precParent == precChild
-  | _ -> false
-
-let flattenOperandRhs parentOperator rhs =
-  match rhs.Parsetree.pexp_desc with
-  | Parsetree.Pexp_apply
-      ( {
-          pexp_desc =
-            Pexp_ident {txt = Longident.Lident operator; loc = operatorLoc};
-        },
-        [(_, _left); (_, _right)] )
-    when ParsetreeViewer.isBinaryOperator operator
-         && not (operatorLoc.loc_ghost && operator = "^") ->
-    let precParent = ParsetreeViewer.operatorPrecedence parentOperator in
-    let precChild = ParsetreeViewer.operatorPrecedence operator in
-    precParent >= precChild || rhs.pexp_attributes <> []
-  | Pexp_construct ({txt = Lident "Function$"}, Some _) -> true
-  | Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _}) ->
-    false
-  | Pexp_fun _ when ParsetreeViewer.isUnderscoreApplySugar rhs -> false
-  | Pexp_fun _ | Pexp_newtype _ | Pexp_setfield _ | Pexp_constraint _ -> true
-  | _ when ParsetreeViewer.isTernaryExpr rhs -> true
-  | _ -> false
-
-let binaryOperatorInsideAwaitNeedsParens operator =
-  ParsetreeViewer.operatorPrecedence operator
-  < ParsetreeViewer.operatorPrecedence "|."
-
-let lazyOrAssertOrAwaitExprRhs ?(inAwait = false) expr =
-  let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-  match optBraces with
-  | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-  | None -> (
-    match expr with
-    | {Parsetree.pexp_attributes = attrs}
-      when match ParsetreeViewer.filterParsingAttrs attrs with
-           | _ :: _ -> true
-           | [] -> false ->
-      Parenthesized
-    | {
-     pexp_desc =
-       Pexp_apply ({pexp_desc = Pexp_ident {txt = Longident.Lident operator}}, _);
-    }
-      when ParsetreeViewer.isBinaryExpression expr ->
-      if inAwait && not (binaryOperatorInsideAwaitNeedsParens operator) then
-        Nothing
-      else Parenthesized
-    | {
-     pexp_desc =
-       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-    } ->
-      Nothing
-    | {pexp_desc = Pexp_fun _} when ParsetreeViewer.isUnderscoreApplySugar expr
-      ->
-      Nothing
-    | {
-     pexp_desc =
-       ( Pexp_lazy _ | Pexp_assert _ | Pexp_fun _ | Pexp_newtype _
-       | Pexp_function _ | Pexp_constraint _ | Pexp_setfield _ | Pexp_match _
-       | Pexp_try _ | Pexp_while _ | Pexp_for _ | Pexp_ifthenelse _ );
-    } ->
-      Parenthesized
-    | _
-      when (not inAwait)
-           && ParsetreeViewer.hasAwaitAttribute expr.pexp_attributes ->
-      Parenthesized
-    | _ -> Nothing)
-
-let isNegativeConstant constant =
-  let isNeg txt =
-    let len = String.length txt in
-    len > 0 && (String.get [@doesNotRaise]) txt 0 = '-'
-  in
-  match constant with
-  | (Parsetree.Pconst_integer (i, _) | Pconst_float (i, _)) when isNeg i -> true
-  | _ -> false
-
-let fieldExpr expr =
-  let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-  match optBraces with
-  | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-  | None -> (
-    match expr with
-    | {Parsetree.pexp_attributes = attrs}
-      when match ParsetreeViewer.filterParsingAttrs attrs with
-           | _ :: _ -> true
-           | [] -> false ->
-      Parenthesized
-    | expr
-      when ParsetreeViewer.isBinaryExpression expr
-           || ParsetreeViewer.isUnaryExpression expr ->
-      Parenthesized
-    | {
-     pexp_desc =
-       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-    } ->
-      Nothing
-    | {pexp_desc = Pexp_constant c} when isNegativeConstant c -> Parenthesized
-    | {pexp_desc = Pexp_fun _} when ParsetreeViewer.isUnderscoreApplySugar expr
-      ->
-      Nothing
-    | {
-     pexp_desc =
-       ( Pexp_lazy _ | Pexp_assert _
-       | Pexp_extension _ (* %extension.x vs (%extension).x *) | Pexp_fun _
-       | Pexp_newtype _ | Pexp_function _ | Pexp_constraint _ | Pexp_setfield _
-       | Pexp_match _ | Pexp_try _ | Pexp_while _ | Pexp_for _
-       | Pexp_ifthenelse _ );
-    } ->
-      Parenthesized
-    | _ when ParsetreeViewer.hasAwaitAttribute expr.pexp_attributes ->
-      Parenthesized
-    | {pexp_desc = Pexp_construct ({txt = Lident "Function$"}, Some expr)}
-      when ParsetreeViewer.isUnderscoreApplySugar expr ->
-      Nothing
-    | {pexp_desc = Pexp_construct ({txt = Lident "Function$"}, Some _)} ->
-      Parenthesized
-    | _ -> Nothing)
-
-let setFieldExprRhs expr =
-  let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-  match optBraces with
-  | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-  | None -> (
-    match expr with
-    | {
-     Parsetree.pexp_desc =
-       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-    } ->
-      Nothing
-    | {pexp_desc = Pexp_constraint _} -> Parenthesized
-    | _ -> Nothing)
-
-let ternaryOperand expr =
-  let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-  match optBraces with
-  | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-  | None -> (
-    match expr with
-    | {
-     Parsetree.pexp_desc =
-       Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-    } ->
-      Nothing
-    | {pexp_desc = Pexp_constraint _} -> Parenthesized
-    | _ when Res_parsetree_viewer.isFunNewtype expr -> (
-      let _uncurried, _attrsOnArrow, _parameters, returnExpr =
-        ParsetreeViewer.funExpr expr
-      in
-      match returnExpr.pexp_desc with
-      | Pexp_constraint _ -> Parenthesized
-      | _ -> Nothing)
-    | _ -> Nothing)
-
-let startsWithMinus txt =
-  let len = String.length txt in
-  if len == 0 then false
-  else
-    let s = (String.get [@doesNotRaise]) txt 0 in
-    s = '-'
-
-let jsxPropExpr expr =
-  match expr.Parsetree.pexp_desc with
-  | Parsetree.Pexp_let _ | Pexp_sequence _ | Pexp_letexception _
-  | Pexp_letmodule _ | Pexp_open _ ->
-    Nothing
-  | _ -> (
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-    | None -> (
-      match expr with
-      | {
-       Parsetree.pexp_desc =
-         Pexp_constant (Pconst_integer (x, _) | Pconst_float (x, _));
-       pexp_attributes = [];
-      }
-        when startsWithMinus x ->
-        Parenthesized
-      | _ when ParsetreeViewer.hasAwaitAttribute expr.pexp_attributes ->
-        Parenthesized
-      | {
-       Parsetree.pexp_desc =
-         ( Pexp_ident _ | Pexp_constant _ | Pexp_field _ | Pexp_construct _
-         | Pexp_variant _ | Pexp_array _ | Pexp_pack _ | Pexp_record _
-         | Pexp_extension _ | Pexp_letmodule _ | Pexp_letexception _
-         | Pexp_open _ | Pexp_sequence _ | Pexp_let _ | Pexp_tuple _ );
-       pexp_attributes = [];
-      } ->
-        Nothing
-      | {
-       Parsetree.pexp_desc =
-         Pexp_constraint
-           ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-       pexp_attributes = [];
-      } ->
-        Nothing
-      | _ -> Parenthesized))
-
-let jsxChildExpr expr =
-  match expr.Parsetree.pexp_desc with
-  | Parsetree.Pexp_let _ | Pexp_sequence _ | Pexp_letexception _
-  | Pexp_letmodule _ | Pexp_open _ ->
-    Nothing
-  | _ -> (
-    let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-    match optBraces with
-    | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-    | _ -> (
-      match expr with
-      | {
-       Parsetree.pexp_desc =
-         Pexp_constant (Pconst_integer (x, _) | Pconst_float (x, _));
-       pexp_attributes = [];
-      }
-        when startsWithMinus x ->
-        Parenthesized
-      | _ when ParsetreeViewer.hasAwaitAttribute expr.pexp_attributes ->
-        Parenthesized
-      | {
-       Parsetree.pexp_desc =
-         ( Pexp_ident _ | Pexp_constant _ | Pexp_field _ | Pexp_construct _
-         | Pexp_variant _ | Pexp_array _ | Pexp_pack _ | Pexp_record _
-         | Pexp_extension _ | Pexp_letmodule _ | Pexp_letexception _
-         | Pexp_open _ | Pexp_sequence _ | Pexp_let _ );
-       pexp_attributes = [];
-      } ->
-        Nothing
-      | {
-       Parsetree.pexp_desc =
-         Pexp_constraint
-           ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _});
-       pexp_attributes = [];
-      } ->
-        Nothing
-      | expr when ParsetreeViewer.isJsxExpression expr -> Nothing
-      | _ -> Parenthesized))
-
-let binaryExpr expr =
-  let optBraces, _ = ParsetreeViewer.processBracesAttr expr in
-  match optBraces with
-  | Some ({Location.loc = bracesLoc}, _) -> Braced bracesLoc
-  | None -> (
-    match expr with
-    | {Parsetree.pexp_attributes = _ :: _} as expr
-      when ParsetreeViewer.isBinaryExpression expr ->
-      Parenthesized
-    | _ -> Nothing)
-
-let modTypeFunctorReturn modType =
-  match modType with
-  | {Parsetree.pmty_desc = Pmty_with _} -> true
-  | _ -> false
-
-(* Add parens for readability:
-     module type Functor = SetLike => Set with type t = A.t
-   This is actually:
-     module type Functor = (SetLike => Set) with type t = A.t
-*)
-let modTypeWithOperand modType =
-  match modType with
-  | {Parsetree.pmty_desc = Pmty_functor _ | Pmty_with _} -> true
-  | _ -> false
-
-let modExprFunctorConstraint modType =
-  match modType with
-  | {Parsetree.pmty_desc = Pmty_functor _ | Pmty_with _} -> true
-  | _ -> false
-
-let bracedExpr expr =
-  match expr.Parsetree.pexp_desc with
-  | Pexp_constraint ({pexp_desc = Pexp_pack _}, {ptyp_desc = Ptyp_package _}) ->
-    false
-  | Pexp_constraint _ -> true
-  | _ -> false
-
-let includeModExpr modExpr =
-  match modExpr.Parsetree.pmod_desc with
-  | Parsetree.Pmod_constraint _ -> true
-  | _ -> false
-
-let modExprParens modExpr =
-  match modExpr with
-  | {
-   Parsetree.pmod_desc =
-     Pmod_constraint
-       ( {Parsetree.pmod_desc = Pmod_structure _},
-         {Parsetree.pmty_desc = Pmty_signature [{psig_desc = Psig_module _}]} );
-  } ->
-    false
-  | {
-   Parsetree.pmod_desc =
-     Pmod_constraint
-       (_, {Parsetree.pmty_desc = Pmty_signature [{psig_desc = Psig_module _}]});
-  } ->
-    true
-  | _ -> false
-
-let arrowReturnTypExpr typExpr =
-  match typExpr.Parsetree.ptyp_desc with
-  | Parsetree.Ptyp_arrow _ -> true
-  | _ when Ast_uncurried.coreTypeIsUncurriedFun typExpr -> true
-  | _ -> false
-
-let patternRecordRowRhs (pattern : Parsetree.pattern) =
-  match pattern.ppat_desc with
-  | Ppat_constraint ({ppat_desc = Ppat_unpack _}, {ptyp_desc = Ptyp_package _})
-    ->
-    false
-  | Ppat_constraint _ -> true
-  | _ -> false
diff --git a/jscomp/syntax/src/res_parens.mli b/jscomp/syntax/src/res_parens.mli
deleted file mode 100644
index 5d1abf9..0000000
--- a/jscomp/syntax/src/res_parens.mli
+++ /dev/null
@@ -1,41 +0,0 @@
-type kind = Parenthesized | Braced of Location.t | Nothing
-
-val expr : Parsetree.expression -> kind
-val structureExpr : Parsetree.expression -> kind
-
-val unaryExprOperand : Parsetree.expression -> kind
-
-val binaryExprOperand : isLhs:bool -> Parsetree.expression -> kind
-val subBinaryExprOperand : string -> string -> bool
-val rhsBinaryExprOperand : string -> Parsetree.expression -> bool
-val flattenOperandRhs : string -> Parsetree.expression -> bool
-
-val binaryOperatorInsideAwaitNeedsParens : string -> bool
-val lazyOrAssertOrAwaitExprRhs : ?inAwait:bool -> Parsetree.expression -> kind
-
-val fieldExpr : Parsetree.expression -> kind
-
-val setFieldExprRhs : Parsetree.expression -> kind
-
-val ternaryOperand : Parsetree.expression -> kind
-
-val jsxPropExpr : Parsetree.expression -> kind
-val jsxChildExpr : Parsetree.expression -> kind
-
-val binaryExpr : Parsetree.expression -> kind
-val modTypeFunctorReturn : Parsetree.module_type -> bool
-val modTypeWithOperand : Parsetree.module_type -> bool
-val modExprFunctorConstraint : Parsetree.module_type -> bool
-
-val bracedExpr : Parsetree.expression -> bool
-val callExpr : Parsetree.expression -> kind
-
-val includeModExpr : Parsetree.module_expr -> bool
-
-val modExprParens : Parsetree.module_expr -> bool
-
-val arrowReturnTypExpr : Parsetree.core_type -> bool
-
-val patternRecordRowRhs : Parsetree.pattern -> bool
-
-val exprRecordRowRhs : Parsetree.expression -> kind
diff --git a/jscomp/syntax/src/res_parser.ml b/jscomp/syntax/src/res_parser.ml
deleted file mode 100644
index ca39cfc..0000000
--- a/jscomp/syntax/src/res_parser.ml
+++ /dev/null
@@ -1,195 +0,0 @@
-module Scanner = Res_scanner
-module Diagnostics = Res_diagnostics
-module Token = Res_token
-module Grammar = Res_grammar
-module Reporting = Res_reporting
-
-module Comment = Res_comment
-
-type mode = ParseForTypeChecker | Default
-
-type regionStatus = Report | Silent
-
-type t = {
-  mode: mode;
-  mutable scanner: Scanner.t;
-  mutable token: Token.t;
-  mutable startPos: Lexing.position;
-  mutable endPos: Lexing.position;
-  mutable prevEndPos: Lexing.position;
-  mutable breadcrumbs: (Grammar.t * Lexing.position) list;
-  mutable errors: Reporting.parseError list;
-  mutable diagnostics: Diagnostics.t list;
-  mutable comments: Comment.t list;
-  mutable regions: regionStatus ref list;
-  mutable uncurried_config: Config.uncurried;
-}
-
-let err ?startPos ?endPos p error =
-  match p.regions with
-  | ({contents = Report} as region) :: _ ->
-    let d =
-      Diagnostics.make
-        ~startPos:
-          (match startPos with
-          | Some pos -> pos
-          | None -> p.startPos)
-        ~endPos:
-          (match endPos with
-          | Some pos -> pos
-          | None -> p.endPos)
-        error
-    in
-    p.diagnostics <- d :: p.diagnostics;
-    region := Silent
-  | _ -> ()
-
-let beginRegion p = p.regions <- ref Report :: p.regions
-let endRegion p =
-  match p.regions with
-  | [] -> ()
-  | _ :: rest -> p.regions <- rest
-
-let docCommentToAttributeToken comment =
-  let txt = Comment.txt comment in
-  let loc = Comment.loc comment in
-  Token.DocComment (loc, txt)
-
-let moduleCommentToAttributeToken comment =
-  let txt = Comment.txt comment in
-  let loc = Comment.loc comment in
-  Token.ModuleComment (loc, txt)
-
-(* Advance to the next non-comment token and store any encountered comment
-   * in the parser's state. Every comment contains the end position of its
-   * previous token to facilite comment interleaving *)
-let rec next ?prevEndPos p =
-  if p.token = Eof then assert false;
-  let prevEndPos =
-    match prevEndPos with
-    | Some pos -> pos
-    | None -> p.endPos
-  in
-  let startPos, endPos, token = Scanner.scan p.scanner in
-  match token with
-  | Comment c ->
-    if Comment.isDocComment c then (
-      p.token <- docCommentToAttributeToken c;
-      p.prevEndPos <- prevEndPos;
-      p.startPos <- startPos;
-      p.endPos <- endPos)
-    else if Comment.isModuleComment c then (
-      p.token <- moduleCommentToAttributeToken c;
-      p.prevEndPos <- prevEndPos;
-      p.startPos <- startPos;
-      p.endPos <- endPos)
-    else (
-      Comment.setPrevTokEndPos c p.endPos;
-      p.comments <- c :: p.comments;
-      p.prevEndPos <- p.endPos;
-      p.endPos <- endPos;
-      next ~prevEndPos p)
-  | _ ->
-    p.token <- token;
-    p.prevEndPos <- prevEndPos;
-    p.startPos <- startPos;
-    p.endPos <- endPos
-
-let nextUnsafe p = if p.token <> Eof then next p
-
-let nextTemplateLiteralToken p =
-  let startPos, endPos, token = Scanner.scanTemplateLiteralToken p.scanner in
-  p.token <- token;
-  p.prevEndPos <- p.endPos;
-  p.startPos <- startPos;
-  p.endPos <- endPos
-
-let checkProgress ~prevEndPos ~result p =
-  if p.endPos == prevEndPos then None else Some result
-
-let make ?(mode = ParseForTypeChecker) src filename =
-  let scanner = Scanner.make ~filename src in
-  let parserState =
-    {
-      mode;
-      scanner;
-      token = Token.Semicolon;
-      startPos = Lexing.dummy_pos;
-      prevEndPos = Lexing.dummy_pos;
-      endPos = Lexing.dummy_pos;
-      breadcrumbs = [];
-      errors = [];
-      diagnostics = [];
-      comments = [];
-      regions = [ref Report];
-      uncurried_config = !Config.uncurried;
-    }
-  in
-  parserState.scanner.err <-
-    (fun ~startPos ~endPos error ->
-      let diagnostic = Diagnostics.make ~startPos ~endPos error in
-      parserState.diagnostics <- diagnostic :: parserState.diagnostics);
-  next parserState;
-  parserState
-
-let leaveBreadcrumb p circumstance =
-  let crumb = (circumstance, p.startPos) in
-  p.breadcrumbs <- crumb :: p.breadcrumbs
-
-let eatBreadcrumb p =
-  match p.breadcrumbs with
-  | [] -> ()
-  | _ :: crumbs -> p.breadcrumbs <- crumbs
-
-let optional p token =
-  if p.token = token then
-    let () = next p in
-    true
-  else false
-
-let expect ?grammar token p =
-  if p.token = token then next p
-  else
-    let error = Diagnostics.expected ?grammar p.prevEndPos token in
-    err ~startPos:p.prevEndPos p error
-
-(* Don't use immutable copies here, it trashes certain heuristics
- * in the ocaml compiler, resulting in massive slowdowns of the parser *)
-let lookahead p callback =
-  let err = p.scanner.err in
-  let ch = p.scanner.ch in
-  let offset = p.scanner.offset in
-  let offset16 = p.scanner.offset16 in
-  let lineOffset = p.scanner.lineOffset in
-  let lnum = p.scanner.lnum in
-  let mode = p.scanner.mode in
-  let token = p.token in
-  let startPos = p.startPos in
-  let endPos = p.endPos in
-  let prevEndPos = p.prevEndPos in
-  let breadcrumbs = p.breadcrumbs in
-  let errors = p.errors in
-  let diagnostics = p.diagnostics in
-  let comments = p.comments in
-  let uncurried_config = p.uncurried_config in
-
-  let res = callback p in
-
-  p.scanner.err <- err;
-  p.scanner.ch <- ch;
-  p.scanner.offset <- offset;
-  p.scanner.offset16 <- offset16;
-  p.scanner.lineOffset <- lineOffset;
-  p.scanner.lnum <- lnum;
-  p.scanner.mode <- mode;
-  p.token <- token;
-  p.startPos <- startPos;
-  p.endPos <- endPos;
-  p.prevEndPos <- prevEndPos;
-  p.breadcrumbs <- breadcrumbs;
-  p.errors <- errors;
-  p.diagnostics <- diagnostics;
-  p.comments <- comments;
-  p.uncurried_config <- uncurried_config;
-
-  res
diff --git a/jscomp/syntax/src/res_parser.mli b/jscomp/syntax/src/res_parser.mli
deleted file mode 100644
index 9544a7c..0000000
--- a/jscomp/syntax/src/res_parser.mli
+++ /dev/null
@@ -1,48 +0,0 @@
-module Scanner = Res_scanner
-module Token = Res_token
-module Grammar = Res_grammar
-module Reporting = Res_reporting
-module Diagnostics = Res_diagnostics
-module Comment = Res_comment
-
-type mode = ParseForTypeChecker | Default
-
-type regionStatus = Report | Silent
-
-type t = {
-  mode: mode;
-  mutable scanner: Scanner.t;
-  mutable token: Token.t;
-  mutable startPos: Lexing.position;
-  mutable endPos: Lexing.position;
-  mutable prevEndPos: Lexing.position;
-  mutable breadcrumbs: (Grammar.t * Lexing.position) list;
-  mutable errors: Reporting.parseError list;
-  mutable diagnostics: Diagnostics.t list;
-  mutable comments: Comment.t list;
-  mutable regions: regionStatus ref list;
-  mutable uncurried_config: Config.uncurried;
-}
-
-val make : ?mode:mode -> string -> string -> t
-
-val expect : ?grammar:Grammar.t -> Token.t -> t -> unit
-val optional : t -> Token.t -> bool
-val next : ?prevEndPos:Lexing.position -> t -> unit
-val nextUnsafe : t -> unit (* Does not assert on Eof, makes no progress *)
-val nextTemplateLiteralToken : t -> unit
-val lookahead : t -> (t -> 'a) -> 'a
-val err :
-  ?startPos:Lexing.position ->
-  ?endPos:Lexing.position ->
-  t ->
-  Diagnostics.category ->
-  unit
-
-val leaveBreadcrumb : t -> Grammar.t -> unit
-val eatBreadcrumb : t -> unit
-
-val beginRegion : t -> unit
-val endRegion : t -> unit
-
-val checkProgress : prevEndPos:Lexing.position -> result:'a -> t -> 'a option
diff --git a/jscomp/syntax/src/res_parsetree_viewer.ml b/jscomp/syntax/src/res_parsetree_viewer.ml
deleted file mode 100644
index 9d8d594..0000000
--- a/jscomp/syntax/src/res_parsetree_viewer.ml
+++ /dev/null
@@ -1,756 +0,0 @@
-open Parsetree
-
-let arrowType ?(arity = max_int) ct =
-  let rec process attrsBefore acc typ arity =
-    match typ with
-    | typ when arity <= 0 -> (attrsBefore, List.rev acc, typ)
-    | {
-     ptyp_desc = Ptyp_arrow ((Nolabel as lbl), typ1, typ2);
-     ptyp_attributes = [];
-    } ->
-      let arg = ([], lbl, typ1) in
-      process attrsBefore (arg :: acc) typ2 (arity - 1)
-    | {
-     ptyp_desc = Ptyp_arrow (Nolabel, _typ1, _typ2);
-     ptyp_attributes = [({txt = "bs"}, _)];
-    } ->
-      (* stop here, the uncurried attribute always indicates the beginning of an arrow function
-         * e.g. `(. int) => (. int)` instead of `(. int, . int)` *)
-      (attrsBefore, List.rev acc, typ)
-    | {ptyp_desc = Ptyp_arrow (Nolabel, _typ1, _typ2); ptyp_attributes = _attrs}
-      as returnType ->
-      let args = List.rev acc in
-      (attrsBefore, args, returnType)
-    | {
-     ptyp_desc = Ptyp_arrow (((Labelled _ | Optional _) as lbl), typ1, typ2);
-     ptyp_attributes = attrs;
-    } ->
-      let arg = (attrs, lbl, typ1) in
-      process attrsBefore (arg :: acc) typ2 (arity - 1)
-    | typ -> (attrsBefore, List.rev acc, typ)
-  in
-  match ct with
-  | {ptyp_desc = Ptyp_arrow (Nolabel, _typ1, _typ2); ptyp_attributes = attrs} as
-    typ ->
-    process attrs [] {typ with ptyp_attributes = []} arity
-  | typ -> process [] [] typ arity
-
-let functorType modtype =
-  let rec process acc modtype =
-    match modtype with
-    | {
-     pmty_desc = Pmty_functor (lbl, argType, returnType);
-     pmty_attributes = attrs;
-    } ->
-      let arg = (attrs, lbl, argType) in
-      process (arg :: acc) returnType
-    | modType -> (List.rev acc, modType)
-  in
-  process [] modtype
-
-let processBsAttribute attrs =
-  let rec process bsSpotted acc attrs =
-    match attrs with
-    | [] -> (bsSpotted, List.rev acc)
-    | ({Location.txt = "bs"}, _) :: rest -> process true acc rest
-    | attr :: rest -> process bsSpotted (attr :: acc) rest
-  in
-  process false [] attrs
-
-let processUncurriedAppAttribute attrs =
-  let rec process uncurriedApp acc attrs =
-    match attrs with
-    | [] -> (uncurriedApp, List.rev acc)
-    | ( {
-          Location.txt =
-            "bs" (* still support @bs to convert .ml files *) | "res.uapp";
-        },
-        _ )
-      :: rest ->
-      process true acc rest
-    | attr :: rest -> process uncurriedApp (attr :: acc) rest
-  in
-  process false [] attrs
-
-let hasPartialAttribute attrs =
-  List.exists
-    (function
-      | {Location.txt = "res.partial"}, _ -> true
-      | _ -> false)
-    attrs
-
-let processPartialAppAttribute attrs =
-  let rec process partialApp acc attrs =
-    match attrs with
-    | [] -> (partialApp, List.rev acc)
-    | ({Location.txt = "res.partial"}, _) :: rest -> process true acc rest
-    | attr :: rest -> process partialApp (attr :: acc) rest
-  in
-  process false [] attrs
-
-type functionAttributesInfo = {
-  async: bool;
-  bs: bool;
-  attributes: Parsetree.attributes;
-}
-
-let processFunctionAttributes attrs =
-  let rec process async bs acc attrs =
-    match attrs with
-    | [] -> {async; bs; attributes = List.rev acc}
-    | ({Location.txt = "bs"}, _) :: rest -> process async true acc rest
-    | ({Location.txt = "res.async"}, _) :: rest -> process true bs acc rest
-    | attr :: rest -> process async bs (attr :: acc) rest
-  in
-  process false false [] attrs
-
-let hasAwaitAttribute attrs =
-  List.exists
-    (function
-      | {Location.txt = "res.await"}, _ -> true
-      | _ -> false)
-    attrs
-
-let collectArrayExpressions expr =
-  match expr.pexp_desc with
-  | Pexp_array exprs -> (exprs, None)
-  | _ -> ([], Some expr)
-
-let collectListExpressions expr =
-  let rec collect acc expr =
-    match expr.pexp_desc with
-    | Pexp_construct ({txt = Longident.Lident "[]"}, _) -> (List.rev acc, None)
-    | Pexp_construct
-        ( {txt = Longident.Lident "::"},
-          Some {pexp_desc = Pexp_tuple (hd :: [tail])} ) ->
-      collect (hd :: acc) tail
-    | _ -> (List.rev acc, Some expr)
-  in
-  collect [] expr
-
-(* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
-let rewriteUnderscoreApply expr =
-  let expr_fun =
-    if Ast_uncurried.exprIsUncurriedFun expr then
-      Ast_uncurried.exprExtractUncurriedFun expr
-    else expr
-  in
-  match expr_fun.pexp_desc with
-  | Pexp_fun
-      ( Nolabel,
-        None,
-        {ppat_desc = Ppat_var {txt = "__x"}},
-        ({pexp_desc = Pexp_apply (callExpr, args)} as e) ) ->
-    let newArgs =
-      List.map
-        (fun arg ->
-          match arg with
-          | ( lbl,
-              ({pexp_desc = Pexp_ident ({txt = Longident.Lident "__x"} as lid)}
-               as argExpr) ) ->
-            ( lbl,
-              {
-                argExpr with
-                pexp_desc = Pexp_ident {lid with txt = Longident.Lident "_"};
-              } )
-          | arg -> arg)
-        args
-    in
-    {e with pexp_desc = Pexp_apply (callExpr, newArgs)}
-  | _ -> expr
-
-type funParamKind =
-  | Parameter of {
-      attrs: Parsetree.attributes;
-      lbl: Asttypes.arg_label;
-      defaultExpr: Parsetree.expression option;
-      pat: Parsetree.pattern;
-    }
-  | NewTypes of {attrs: Parsetree.attributes; locs: string Asttypes.loc list}
-
-let funExpr expr =
-  (* Turns (type t, type u, type z) into "type t u z" *)
-  let rec collectNewTypes acc returnExpr =
-    match returnExpr with
-    | {pexp_desc = Pexp_newtype (stringLoc, returnExpr); pexp_attributes = []}
-      ->
-      collectNewTypes (stringLoc :: acc) returnExpr
-    | returnExpr -> (List.rev acc, returnExpr)
-  in
-  let rec collect ~uncurried ~nFun attrsBefore acc expr =
-    match expr with
-    | {
-     pexp_desc =
-       Pexp_fun
-         ( Nolabel,
-           None,
-           {ppat_desc = Ppat_var {txt = "__x"}},
-           {pexp_desc = Pexp_apply _} );
-    } ->
-      (uncurried, attrsBefore, List.rev acc, rewriteUnderscoreApply expr)
-    | {pexp_desc = Pexp_newtype (stringLoc, rest); pexp_attributes = attrs} ->
-      let stringLocs, returnExpr = collectNewTypes [stringLoc] rest in
-      let param = NewTypes {attrs; locs = stringLocs} in
-      collect ~uncurried ~nFun attrsBefore (param :: acc) returnExpr
-    | {
-     pexp_desc = Pexp_fun (lbl, defaultExpr, pattern, returnExpr);
-     pexp_attributes = [];
-    } ->
-      let parameter = Parameter {attrs = []; lbl; defaultExpr; pat = pattern} in
-      collect ~uncurried ~nFun:(nFun + 1) attrsBefore (parameter :: acc)
-        returnExpr
-    (* If a fun has an attribute, then it stops here and makes currying.
-       i.e attributes outside of (...), uncurried `(.)` and `async` make currying *)
-    | {pexp_desc = Pexp_fun _} -> (uncurried, attrsBefore, List.rev acc, expr)
-    | expr when nFun = 0 && Ast_uncurried.exprIsUncurriedFun expr ->
-      let expr = Ast_uncurried.exprExtractUncurriedFun expr in
-      collect ~uncurried:true ~nFun attrsBefore acc expr
-    | expr -> (uncurried, attrsBefore, List.rev acc, expr)
-  in
-  match expr with
-  | {pexp_desc = Pexp_fun _ | Pexp_newtype _} ->
-    collect ~uncurried:false ~nFun:0 expr.pexp_attributes []
-      {expr with pexp_attributes = []}
-  | _ when Ast_uncurried.exprIsUncurriedFun expr ->
-    let expr = Ast_uncurried.exprExtractUncurriedFun expr in
-    collect ~uncurried:true ~nFun:0 expr.pexp_attributes []
-      {expr with pexp_attributes = []}
-  | _ -> collect ~uncurried:false ~nFun:0 [] [] expr
-
-let processBracesAttr expr =
-  match expr.pexp_attributes with
-  | (({txt = "res.braces" | "ns.braces"}, _) as attr) :: attrs ->
-    (Some attr, {expr with pexp_attributes = attrs})
-  | _ -> (None, expr)
-
-let filterParsingAttrs attrs =
-  List.filter
-    (fun attr ->
-      match attr with
-      | ( {
-            Location.txt =
-              ( "bs" | "res.uapp" | "res.arity" | "res.braces" | "ns.braces"
-              | "res.iflet" | "res.namedArgLoc" | "res.optional" | "res.ternary"
-              | "res.async" | "res.await" | "res.template"
-              | "res.taggedTemplate" );
-          },
-          _ ) ->
-        false
-      | _ -> true)
-    attrs
-
-let isBlockExpr expr =
-  match expr.pexp_desc with
-  | Pexp_letmodule _ | Pexp_letexception _ | Pexp_let _ | Pexp_open _
-  | Pexp_sequence _ ->
-    true
-  | _ -> false
-
-let isBracedExpr expr =
-  match processBracesAttr expr with
-  | Some _, _ -> true
-  | _ -> false
-
-let isMultilineText txt =
-  let len = String.length txt in
-  let rec check i =
-    if i >= len then false
-    else
-      let c = String.unsafe_get txt i in
-      match c with
-      | '\010' | '\013' -> true
-      | '\\' -> if i + 2 = len then false else check (i + 2)
-      | _ -> check (i + 1)
-  in
-  check 0
-
-let isHuggableExpression expr =
-  match expr.pexp_desc with
-  | Pexp_array _ | Pexp_tuple _
-  | Pexp_constant (Pconst_string (_, Some _))
-  | Pexp_construct ({txt = Longident.Lident ("::" | "[]")}, _)
-  | Pexp_extension ({txt = "bs.obj" | "obj"}, _)
-  | Pexp_record _ ->
-    true
-  | _ when isBlockExpr expr -> true
-  | _ when isBracedExpr expr -> true
-  | Pexp_constant (Pconst_string (txt, None)) when isMultilineText txt -> true
-  | _ -> false
-
-let isHuggableRhs expr =
-  match expr.pexp_desc with
-  | Pexp_array _ | Pexp_tuple _
-  | Pexp_extension ({txt = "bs.obj" | "obj"}, _)
-  | Pexp_record _ ->
-    true
-  | _ when isBracedExpr expr -> true
-  | _ -> false
-
-let isHuggablePattern pattern =
-  match pattern.ppat_desc with
-  | Ppat_array _ | Ppat_tuple _ | Ppat_record _ | Ppat_variant _
-  | Ppat_construct _ ->
-    true
-  | _ -> false
-
-let operatorPrecedence operator =
-  match operator with
-  | ":=" -> 1
-  | "||" -> 2
-  | "&&" -> 3
-  | "=" | "==" | "<" | ">" | "!=" | "<>" | "!==" | "<=" | ">=" | "|>" -> 4
-  | "+" | "+." | "-" | "-." | "^" -> 5
-  | "*" | "*." | "/" | "/." -> 6
-  | "**" -> 7
-  | "#" | "##" | "|." | "|.u" -> 8
-  | _ -> 0
-
-let isUnaryOperator operator =
-  match operator with
-  | "~+" | "~+." | "~-" | "~-." | "not" -> true
-  | _ -> false
-
-let isUnaryExpression expr =
-  match expr.pexp_desc with
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [(Nolabel, _arg)] )
-    when isUnaryOperator operator ->
-    true
-  | _ -> false
-
-(* TODO: tweak this to check for ghost ^ as template literal *)
-let isBinaryOperator operator =
-  match operator with
-  | ":=" | "||" | "&&" | "=" | "==" | "<" | ">" | "!=" | "!==" | "<=" | ">="
-  | "|>" | "+" | "+." | "-" | "-." | "^" | "*" | "*." | "/" | "/." | "**" | "|."
-  | "|.u" | "<>" ->
-    true
-  | _ -> false
-
-let isBinaryExpression expr =
-  match expr.pexp_desc with
-  | Pexp_apply
-      ( {
-          pexp_desc =
-            Pexp_ident {txt = Longident.Lident operator; loc = operatorLoc};
-        },
-        [(Nolabel, _operand1); (Nolabel, _operand2)] )
-    when isBinaryOperator operator
-         && not (operatorLoc.loc_ghost && operator = "^")
-         (* template literal *) ->
-    true
-  | _ -> false
-
-let isEqualityOperator operator =
-  match operator with
-  | "=" | "==" | "<>" | "!=" -> true
-  | _ -> false
-
-let isRhsBinaryOperator operator =
-  match operator with
-  | "**" -> true
-  | _ -> false
-
-let flattenableOperators parentOperator childOperator =
-  let precParent = operatorPrecedence parentOperator in
-  let precChild = operatorPrecedence childOperator in
-  if precParent == precChild then
-    not (isEqualityOperator parentOperator && isEqualityOperator childOperator)
-  else false
-
-let rec hasIfLetAttribute attrs =
-  match attrs with
-  | [] -> false
-  | ({Location.txt = "res.iflet"}, _) :: _ -> true
-  | _ :: attrs -> hasIfLetAttribute attrs
-
-let isIfLetExpr expr =
-  match expr with
-  | {pexp_attributes = attrs; pexp_desc = Pexp_match _}
-    when hasIfLetAttribute attrs ->
-    true
-  | _ -> false
-
-let rec hasOptionalAttribute attrs =
-  match attrs with
-  | [] -> false
-  | ({Location.txt = "ns.optional" | "res.optional"}, _) :: _ -> true
-  | _ :: attrs -> hasOptionalAttribute attrs
-
-let hasAttributes attrs =
-  List.exists
-    (fun attr ->
-      match attr with
-      | ( {
-            Location.txt =
-              ( "bs" | "res.uapp" | "res.arity" | "res.braces" | "ns.braces"
-              | "res.iflet" | "res.ternary" | "res.async" | "res.await"
-              | "res.template" );
-          },
-          _ ) ->
-        false
-      (* Remove the fragile pattern warning for iflet expressions *)
-      | ( {Location.txt = "warning"},
-          PStr
-            [
-              {
-                pstr_desc =
-                  Pstr_eval
-                    ({pexp_desc = Pexp_constant (Pconst_string ("-4", None))}, _);
-              };
-            ] ) ->
-        not (hasIfLetAttribute attrs)
-      | _ -> true)
-    attrs
-
-let isArrayAccess expr =
-  match expr.pexp_desc with
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "get")}},
-        [(Nolabel, _parentExpr); (Nolabel, _memberExpr)] ) ->
-    true
-  | _ -> false
-
-type ifConditionKind =
-  | If of Parsetree.expression
-  | IfLet of Parsetree.pattern * Parsetree.expression
-
-let collectIfExpressions expr =
-  let rec collect acc expr =
-    let exprLoc = expr.pexp_loc in
-    match expr.pexp_desc with
-    | Pexp_ifthenelse (ifExpr, thenExpr, Some elseExpr) ->
-      collect ((exprLoc, If ifExpr, thenExpr) :: acc) elseExpr
-    | Pexp_ifthenelse (ifExpr, thenExpr, (None as elseExpr)) ->
-      let ifs = List.rev ((exprLoc, If ifExpr, thenExpr) :: acc) in
-      (ifs, elseExpr)
-    | Pexp_match
-        ( condition,
-          [
-            {pc_lhs = pattern; pc_guard = None; pc_rhs = thenExpr};
-            {
-              pc_rhs =
-                {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)};
-            };
-          ] )
-      when isIfLetExpr expr ->
-      let ifs =
-        List.rev ((exprLoc, IfLet (pattern, condition), thenExpr) :: acc)
-      in
-      (ifs, None)
-    | Pexp_match
-        ( condition,
-          [
-            {pc_lhs = pattern; pc_guard = None; pc_rhs = thenExpr};
-            {pc_rhs = elseExpr};
-          ] )
-      when isIfLetExpr expr ->
-      collect ((exprLoc, IfLet (pattern, condition), thenExpr) :: acc) elseExpr
-    | _ -> (List.rev acc, Some expr)
-  in
-  collect [] expr
-
-let rec hasTernaryAttribute attrs =
-  match attrs with
-  | [] -> false
-  | ({Location.txt = "res.ternary"}, _) :: _ -> true
-  | _ :: attrs -> hasTernaryAttribute attrs
-
-let isTernaryExpr expr =
-  match expr with
-  | {pexp_attributes = attrs; pexp_desc = Pexp_ifthenelse _}
-    when hasTernaryAttribute attrs ->
-    true
-  | _ -> false
-
-let collectTernaryParts expr =
-  let rec collect acc expr =
-    match expr with
-    | {
-     pexp_attributes = attrs;
-     pexp_desc = Pexp_ifthenelse (condition, consequent, Some alternate);
-    }
-      when hasTernaryAttribute attrs ->
-      collect ((condition, consequent) :: acc) alternate
-    | alternate -> (List.rev acc, alternate)
-  in
-  collect [] expr
-
-let parametersShouldHug parameters =
-  match parameters with
-  | [Parameter {attrs = []; lbl = Asttypes.Nolabel; defaultExpr = None; pat}]
-    when isHuggablePattern pat ->
-    true
-  | _ -> false
-
-let filterTernaryAttributes attrs =
-  List.filter
-    (fun attr ->
-      match attr with
-      | {Location.txt = "res.ternary"}, _ -> false
-      | _ -> true)
-    attrs
-
-let filterFragileMatchAttributes attrs =
-  List.filter
-    (fun attr ->
-      match attr with
-      | ( {Location.txt = "warning"},
-          PStr
-            [
-              {
-                pstr_desc =
-                  Pstr_eval
-                    ({pexp_desc = Pexp_constant (Pconst_string ("-4", _))}, _);
-              };
-            ] ) ->
-        false
-      | _ -> true)
-    attrs
-
-let isJsxExpression expr =
-  let rec loop attrs =
-    match attrs with
-    | [] -> false
-    | ({Location.txt = "JSX"}, _) :: _ -> true
-    | _ :: attrs -> loop attrs
-  in
-  match expr.pexp_desc with
-  | Pexp_apply _ -> loop expr.Parsetree.pexp_attributes
-  | _ -> false
-
-let hasJsxAttribute attributes =
-  let rec loop attrs =
-    match attrs with
-    | [] -> false
-    | ({Location.txt = "JSX"}, _) :: _ -> true
-    | _ :: attrs -> loop attrs
-  in
-  loop attributes
-
-let shouldIndentBinaryExpr expr =
-  let samePrecedenceSubExpression operator subExpression =
-    match subExpression with
-    | {
-     pexp_desc =
-       Pexp_apply
-         ( {pexp_desc = Pexp_ident {txt = Longident.Lident subOperator}},
-           [(Nolabel, _lhs); (Nolabel, _rhs)] );
-    }
-      when isBinaryOperator subOperator ->
-      flattenableOperators operator subOperator
-    | _ -> true
-  in
-  match expr with
-  | {
-   pexp_desc =
-     Pexp_apply
-       ( {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-         [(Nolabel, lhs); (Nolabel, _rhs)] );
-  }
-    when isBinaryOperator operator ->
-    isEqualityOperator operator
-    || (not (samePrecedenceSubExpression operator lhs))
-    || operator = ":="
-  | _ -> false
-
-let shouldInlineRhsBinaryExpr rhs =
-  match rhs.pexp_desc with
-  | Parsetree.Pexp_constant _ | Pexp_let _ | Pexp_letmodule _
-  | Pexp_letexception _ | Pexp_sequence _ | Pexp_open _ | Pexp_ifthenelse _
-  | Pexp_for _ | Pexp_while _ | Pexp_try _ | Pexp_array _ | Pexp_record _ ->
-    true
-  | _ -> false
-
-let isPrintableAttribute attr =
-  match attr with
-  | ( {
-        Location.txt =
-          ( "bs" | "res.uapp" | "res.arity" | "res.iflet" | "res.braces"
-          | "ns.braces" | "JSX" | "res.async" | "res.await" | "res.template"
-          | "res.ternary" );
-      },
-      _ ) ->
-    false
-  | _ -> true
-
-let hasPrintableAttributes attrs = List.exists isPrintableAttribute attrs
-
-let filterPrintableAttributes attrs = List.filter isPrintableAttribute attrs
-
-let partitionPrintableAttributes attrs =
-  List.partition isPrintableAttribute attrs
-
-let isFunNewtype expr =
-  match expr.pexp_desc with
-  | Pexp_fun _ | Pexp_newtype _ -> true
-  | _ -> Ast_uncurried.exprIsUncurriedFun expr
-
-let requiresSpecialCallbackPrintingLastArg args =
-  let rec loop args =
-    match args with
-    | [] -> false
-    | [(_, expr)] when isFunNewtype expr -> true
-    | (_, expr) :: _ when isFunNewtype expr -> false
-    | _ :: rest -> loop rest
-  in
-  loop args
-
-let requiresSpecialCallbackPrintingFirstArg args =
-  let rec loop args =
-    match args with
-    | [] -> true
-    | (_, expr) :: _ when isFunNewtype expr -> false
-    | _ :: rest -> loop rest
-  in
-  match args with
-  | [(_, expr)] when isFunNewtype expr -> false
-  | (_, expr) :: rest when isFunNewtype expr -> loop rest
-  | _ -> false
-
-let modExprApply modExpr =
-  let rec loop acc modExpr =
-    match modExpr with
-    | {pmod_desc = Pmod_apply (next, arg)} -> loop (arg :: acc) next
-    | _ -> (acc, modExpr)
-  in
-  loop [] modExpr
-
-let modExprFunctor modExpr =
-  let rec loop acc modExpr =
-    match modExpr with
-    | {
-     pmod_desc = Pmod_functor (lbl, modType, returnModExpr);
-     pmod_attributes = attrs;
-    } ->
-      let param = (attrs, lbl, modType) in
-      loop (param :: acc) returnModExpr
-    | returnModExpr -> (List.rev acc, returnModExpr)
-  in
-  loop [] modExpr
-
-let rec collectPatternsFromListConstruct acc pattern =
-  let open Parsetree in
-  match pattern.ppat_desc with
-  | Ppat_construct
-      ({txt = Longident.Lident "::"}, Some {ppat_desc = Ppat_tuple [pat; rest]})
-    ->
-    collectPatternsFromListConstruct (pat :: acc) rest
-  | _ -> (List.rev acc, pattern)
-
-let hasTemplateLiteralAttr attrs =
-  List.exists
-    (fun attr ->
-      match attr with
-      | {Location.txt = "res.template"}, _ -> true
-      | _ -> false)
-    attrs
-
-let hasTaggedTemplateLiteralAttr attrs =
-  List.exists
-    (fun attr ->
-      match attr with
-      | {Location.txt = "res.taggedTemplate"}, _ -> true
-      | _ -> false)
-    attrs
-
-let isTemplateLiteral expr =
-  match expr.pexp_desc with
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Lident "^"}},
-        [(Nolabel, _); (Nolabel, _)] )
-    when hasTemplateLiteralAttr expr.pexp_attributes ->
-    true
-  | Pexp_constant (Pconst_string (_, Some "")) -> true
-  | Pexp_constant _ when hasTemplateLiteralAttr expr.pexp_attributes -> true
-  | _ -> false
-
-let isTaggedTemplateLiteral expr =
-  match expr with
-  | {pexp_desc = Pexp_apply _; pexp_attributes = attrs} ->
-    hasTaggedTemplateLiteralAttr attrs
-  | _ -> false
-
-let hasSpreadAttr attrs =
-  List.exists
-    (fun attr ->
-      match attr with
-      | {Location.txt = "res.spread"}, _ -> true
-      | _ -> false)
-    attrs
-
-let isSpreadBeltListConcat expr =
-  match expr.pexp_desc with
-  | Pexp_ident
-      {
-        txt =
-          Longident.Ldot
-            (Longident.Ldot (Longident.Lident "Belt", "List"), "concatMany");
-      } ->
-    hasSpreadAttr expr.pexp_attributes
-  | _ -> false
-
-let isSpreadBeltArrayConcat expr =
-  match expr.pexp_desc with
-  | Pexp_ident
-      {
-        txt =
-          Longident.Ldot
-            (Longident.Ldot (Longident.Lident "Belt", "Array"), "concatMany");
-      } ->
-    hasSpreadAttr expr.pexp_attributes
-  | _ -> false
-
-(* Blue | Red | Green -> [Blue; Red; Green] *)
-let collectOrPatternChain pat =
-  let rec loop pattern chain =
-    match pattern.ppat_desc with
-    | Ppat_or (left, right) -> loop left (right :: chain)
-    | _ -> pattern :: chain
-  in
-  loop pat []
-
-let isSinglePipeExpr expr =
-  (* handles:
-   *   x
-   *   ->Js.Dict.get("wm-property")
-   *   ->Option.flatMap(Js.Json.decodeString)
-   *   ->Option.flatMap(x =>
-   *     switch x {
-   *     | "like-of" => Some(#like)
-   *     | "repost-of" => Some(#repost)
-   *     | _ => None
-   *     }
-   *   )
-   *)
-  let isPipeExpr expr =
-    match expr.pexp_desc with
-    | Pexp_apply
-        ( {pexp_desc = Pexp_ident {txt = Longident.Lident ("|." | "|.u" | "|>")}},
-          [(Nolabel, _operand1); (Nolabel, _operand2)] ) ->
-      true
-    | _ -> false
-  in
-  match expr.pexp_desc with
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Lident ("|." | "|.u" | "|>")}},
-        [(Nolabel, operand1); (Nolabel, _operand2)] )
-    when not (isPipeExpr operand1) ->
-    true
-  | _ -> false
-
-let isUnderscoreApplySugar expr =
-  match expr.pexp_desc with
-  | Pexp_fun
-      ( Nolabel,
-        None,
-        {ppat_desc = Ppat_var {txt = "__x"}},
-        {pexp_desc = Pexp_apply _} ) ->
-    true
-  | _ -> false
-
-let isRewrittenUnderscoreApplySugar expr =
-  match expr.pexp_desc with
-  | Pexp_ident {txt = Longident.Lident "_"} -> true
-  | _ -> false
diff --git a/jscomp/syntax/src/res_parsetree_viewer.mli b/jscomp/syntax/src/res_parsetree_viewer.mli
deleted file mode 100644
index d1bb8df..0000000
--- a/jscomp/syntax/src/res_parsetree_viewer.mli
+++ /dev/null
@@ -1,174 +0,0 @@
-(* Restructures a nested tree of arrow types into its args & returnType
-   * The parsetree contains: a => b => c => d, for printing purposes
-   * we restructure the tree into (a, b, c) and its returnType d *)
-val arrowType :
-  ?arity:int ->
-  Parsetree.core_type ->
-  Parsetree.attributes
-  * (Parsetree.attributes * Asttypes.arg_label * Parsetree.core_type) list
-  * Parsetree.core_type
-
-val functorType :
-  Parsetree.module_type ->
-  (Parsetree.attributes * string Asttypes.loc * Parsetree.module_type option)
-  list
-  * Parsetree.module_type
-
-(* filters @bs out of the provided attributes *)
-val processBsAttribute : Parsetree.attributes -> bool * Parsetree.attributes
-
-val processUncurriedAppAttribute :
-  Parsetree.attributes -> bool * Parsetree.attributes
-
-val processPartialAppAttribute :
-  Parsetree.attributes -> bool * Parsetree.attributes
-
-type functionAttributesInfo = {
-  async: bool;
-  bs: bool;
-  attributes: Parsetree.attributes;
-}
-
-val hasPartialAttribute : Parsetree.attributes -> bool
-
-(* determines whether a function is async and/or uncurried based on the given attributes *)
-val processFunctionAttributes : Parsetree.attributes -> functionAttributesInfo
-
-val hasAwaitAttribute : Parsetree.attributes -> bool
-
-type ifConditionKind =
-  | If of Parsetree.expression
-  | IfLet of Parsetree.pattern * Parsetree.expression
-
-(* if ... else if ... else ... is represented as nested expressions: if ... else { if ... }
-   * The purpose of this function is to flatten nested ifs into one sequence.
-   * Basically compute: ([if, else if, else if, else if], else) *)
-val collectIfExpressions :
-  Parsetree.expression ->
-  (Location.t * ifConditionKind * Parsetree.expression) list
-  * Parsetree.expression option
-
-val collectArrayExpressions :
-  Parsetree.expression ->
-  Parsetree.expression list * Parsetree.expression option
-
-val collectListExpressions :
-  Parsetree.expression ->
-  Parsetree.expression list * Parsetree.expression option
-
-type funParamKind =
-  | Parameter of {
-      attrs: Parsetree.attributes;
-      lbl: Asttypes.arg_label;
-      defaultExpr: Parsetree.expression option;
-      pat: Parsetree.pattern;
-    }
-  | NewTypes of {attrs: Parsetree.attributes; locs: string Asttypes.loc list}
-
-val funExpr :
-  Parsetree.expression ->
-  bool * Parsetree.attributes * funParamKind list * Parsetree.expression
-
-(* example:
-   *  `makeCoordinate({
-   *    x: 1,
-   *    y: 2,
-   *  })`
-   *  Notice howe `({` and `})` "hug" or stick to each other *)
-val isHuggableExpression : Parsetree.expression -> bool
-
-val isHuggablePattern : Parsetree.pattern -> bool
-
-val isHuggableRhs : Parsetree.expression -> bool
-
-val operatorPrecedence : string -> int
-
-val isUnaryExpression : Parsetree.expression -> bool
-val isBinaryOperator : string -> bool
-val isBinaryExpression : Parsetree.expression -> bool
-val isRhsBinaryOperator : string -> bool
-
-val flattenableOperators : string -> string -> bool
-
-val hasAttributes : Parsetree.attributes -> bool
-
-val isArrayAccess : Parsetree.expression -> bool
-val isTernaryExpr : Parsetree.expression -> bool
-val isIfLetExpr : Parsetree.expression -> bool
-
-val collectTernaryParts :
-  Parsetree.expression ->
-  (Parsetree.expression * Parsetree.expression) list * Parsetree.expression
-
-val parametersShouldHug : funParamKind list -> bool
-
-val filterTernaryAttributes : Parsetree.attributes -> Parsetree.attributes
-val filterFragileMatchAttributes : Parsetree.attributes -> Parsetree.attributes
-
-val isJsxExpression : Parsetree.expression -> bool
-val hasJsxAttribute : Parsetree.attributes -> bool
-val hasOptionalAttribute : Parsetree.attributes -> bool
-
-val shouldIndentBinaryExpr : Parsetree.expression -> bool
-val shouldInlineRhsBinaryExpr : Parsetree.expression -> bool
-val hasPrintableAttributes : Parsetree.attributes -> bool
-val filterPrintableAttributes : Parsetree.attributes -> Parsetree.attributes
-val partitionPrintableAttributes :
-  Parsetree.attributes -> Parsetree.attributes * Parsetree.attributes
-
-val requiresSpecialCallbackPrintingLastArg :
-  (Asttypes.arg_label * Parsetree.expression) list -> bool
-val requiresSpecialCallbackPrintingFirstArg :
-  (Asttypes.arg_label * Parsetree.expression) list -> bool
-
-val modExprApply :
-  Parsetree.module_expr -> Parsetree.module_expr list * Parsetree.module_expr
-
-(* Collection of utilities to view the ast in a more a convenient form,
- * allowing for easier processing.
- * Example: given a ptyp_arrow type, what are its arguments and what is the
- * returnType? *)
-
-val modExprFunctor :
-  Parsetree.module_expr ->
-  (Parsetree.attributes * string Asttypes.loc * Parsetree.module_type option)
-  list
-  * Parsetree.module_expr
-
-val collectPatternsFromListConstruct :
-  Parsetree.pattern list ->
-  Parsetree.pattern ->
-  Parsetree.pattern list * Parsetree.pattern
-
-val isBlockExpr : Parsetree.expression -> bool
-
-val isTemplateLiteral : Parsetree.expression -> bool
-val isTaggedTemplateLiteral : Parsetree.expression -> bool
-val hasTemplateLiteralAttr : Parsetree.attributes -> bool
-
-val isSpreadBeltListConcat : Parsetree.expression -> bool
-
-val isSpreadBeltArrayConcat : Parsetree.expression -> bool
-
-val collectOrPatternChain : Parsetree.pattern -> Parsetree.pattern list
-
-val processBracesAttr :
-  Parsetree.expression -> Parsetree.attribute option * Parsetree.expression
-
-val filterParsingAttrs : Parsetree.attributes -> Parsetree.attributes
-
-val isBracedExpr : Parsetree.expression -> bool
-
-val isSinglePipeExpr : Parsetree.expression -> bool
-
-(* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
-val rewriteUnderscoreApply : Parsetree.expression -> Parsetree.expression
-
-(* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
-val isUnderscoreApplySugar : Parsetree.expression -> bool
-
-val hasIfLetAttribute : Parsetree.attributes -> bool
-
-val isRewrittenUnderscoreApplySugar : Parsetree.expression -> bool
-
-val isFunNewtype : Parsetree.expression -> bool
diff --git a/jscomp/syntax/src/res_printer.ml b/jscomp/syntax/src/res_printer.ml
deleted file mode 100644
index 376e9ca..0000000
--- a/jscomp/syntax/src/res_printer.ml
+++ /dev/null
@@ -1,5795 +0,0 @@
-module Doc = Res_doc
-module CommentTable = Res_comments_table
-module Comment = Res_comment
-module Token = Res_token
-module Parens = Res_parens
-module ParsetreeViewer = Res_parsetree_viewer
-
-type callbackStyle =
-  (* regular arrow function, example: `let f = x => x + 1` *)
-  | NoCallback
-  (* `Thing.map(foo, (arg1, arg2) => MyModuleBlah.toList(argument))` *)
-  | FitsOnOneLine
-  (* Thing.map(longArgumet, veryLooooongArgument, (arg1, arg2) =>
-   *   MyModuleBlah.toList(argument)
-   * )
-   *)
-  | ArgumentsFitOnOneLine
-
-(* Since compiler version 8.3, the bs. prefix is no longer needed *)
-(* Synced from
-   https://github.com/rescript-lang/rescript-compiler/blob/29174de1a5fde3b16cf05d10f5ac109cfac5c4ca/jscomp/frontend/ast_external_process.ml#L291-L367 *)
-let convertBsExternalAttribute = function
-  | "bs.as" -> "as"
-  | "bs.deriving" -> "deriving"
-  | "bs.get" -> "get"
-  | "bs.get_index" -> "get_index"
-  | "bs.ignore" -> "ignore"
-  | "bs.inline" -> "inline"
-  | "bs.int" -> "int"
-  | "bs.meth" -> "meth"
-  | "bs.module" -> "module"
-  | "bs.new" -> "new"
-  | "bs.obj" -> "obj"
-  | "bs.optional" -> "optional"
-  | "bs.return" -> "return"
-  | "bs.send" -> "send"
-  | "bs.scope" -> "scope"
-  | "bs.set" -> "set"
-  | "bs.set_index" -> "set_index"
-  | "bs.splice" | "bs.variadic" -> "variadic"
-  | "bs.string" -> "string"
-  | "bs.this" -> "this"
-  | "bs.uncurry" -> "uncurry"
-  | "bs.unwrap" -> "unwrap"
-  | "bs.val" -> "val"
-  (* bs.send.pipe shouldn't be transformed *)
-  | txt -> txt
-
-(* These haven't been needed for a long time now *)
-(* Synced from
-   https://github.com/rescript-lang/rescript-compiler/blob/29174de1a5fde3b16cf05d10f5ac109cfac5c4ca/jscomp/frontend/ast_exp_extension.ml *)
-let convertBsExtension = function
-  | "bs.debugger" -> "debugger"
-  | "bs.external" -> "raw"
-  (* We should never see this one since we use the sugared object form, but still *)
-  | "bs.obj" -> "obj"
-  | "bs.raw" -> "raw"
-  | "bs.re" -> "re"
-  (* TODO: what about bs.time and bs.node? *)
-  | txt -> txt
-
-let addParens doc =
-  Doc.group
-    (Doc.concat
-       [
-         Doc.lparen;
-         Doc.indent (Doc.concat [Doc.softLine; doc]);
-         Doc.softLine;
-         Doc.rparen;
-       ])
-
-let addBraces doc =
-  Doc.group
-    (Doc.concat
-       [
-         Doc.lbrace;
-         Doc.indent (Doc.concat [Doc.softLine; doc]);
-         Doc.softLine;
-         Doc.rbrace;
-       ])
-
-let addAsync doc = Doc.concat [Doc.text "async "; doc]
-
-let getFirstLeadingComment tbl loc =
-  match Hashtbl.find tbl.CommentTable.leading loc with
-  | comment :: _ -> Some comment
-  | [] -> None
-  | exception Not_found -> None
-
-(* Checks if `loc` has a leading line comment, i.e. `// comment above`*)
-let hasLeadingLineComment tbl loc =
-  match getFirstLeadingComment tbl loc with
-  | Some comment -> Comment.isSingleLineComment comment
-  | None -> false
-
-let hasCommentBelow tbl loc =
-  match Hashtbl.find tbl.CommentTable.trailing loc with
-  | comment :: _ ->
-    let commentLoc = Comment.loc comment in
-    commentLoc.Location.loc_start.pos_lnum > loc.Location.loc_end.pos_lnum
-  | [] -> false
-  | exception Not_found -> false
-
-let hasNestedJsxOrMoreThanOneChild expr =
-  let rec loop inRecursion expr =
-    match expr.Parsetree.pexp_desc with
-    | Pexp_construct
-        ({txt = Longident.Lident "::"}, Some {pexp_desc = Pexp_tuple [hd; tail]})
-      ->
-      if inRecursion || ParsetreeViewer.isJsxExpression hd then true
-      else loop true tail
-    | _ -> false
-  in
-  loop false expr
-
-let hasCommentsInside tbl loc =
-  match Hashtbl.find_opt tbl.CommentTable.inside loc with
-  | None -> false
-  | _ -> true
-
-let hasTrailingComments tbl loc =
-  match Hashtbl.find_opt tbl.CommentTable.trailing loc with
-  | None -> false
-  | _ -> true
-
-let printMultilineCommentContent txt =
-  (* Turns
-   *         |* first line
-   *  * second line
-   *      * third line *|
-   * Into
-   * |* first line
-   *  * second line
-   *  * third line *|
-   *
-   * What makes a comment suitable for this kind of indentation?
-   *  ->  multiple lines + every line starts with a star
-   *)
-  let rec indentStars lines acc =
-    match lines with
-    | [] -> Doc.nil
-    | [lastLine] ->
-      let line = String.trim lastLine in
-      let doc = Doc.text (" " ^ line) in
-      let trailingSpace = if line = "" then Doc.nil else Doc.space in
-      List.rev (trailingSpace :: doc :: acc) |> Doc.concat
-    | line :: lines ->
-      let line = String.trim line in
-      if line != "" && String.unsafe_get line 0 == '*' then
-        let doc = Doc.text (" " ^ line) in
-        indentStars lines (Doc.hardLine :: doc :: acc)
-      else
-        let trailingSpace =
-          let len = String.length txt in
-          if len > 0 && String.unsafe_get txt (len - 1) = ' ' then Doc.space
-          else Doc.nil
-        in
-        let content = Comment.trimSpaces txt in
-        Doc.concat [Doc.text content; trailingSpace]
-  in
-  let lines = String.split_on_char '\n' txt in
-  match lines with
-  | [] -> Doc.text "/* */"
-  | [line] ->
-    Doc.concat
-      [Doc.text "/* "; Doc.text (Comment.trimSpaces line); Doc.text " */"]
-  | first :: rest ->
-    let firstLine = Comment.trimSpaces first in
-    Doc.concat
-      [
-        Doc.text "/*";
-        (match firstLine with
-        | "" | "*" -> Doc.nil
-        | _ -> Doc.space);
-        indentStars rest [Doc.hardLine; Doc.text firstLine];
-        Doc.text "*/";
-      ]
-
-let printTrailingComment (prevLoc : Location.t) (nodeLoc : Location.t) comment =
-  let singleLine = Comment.isSingleLineComment comment in
-  let content =
-    let txt = Comment.txt comment in
-    if singleLine then Doc.text ("//" ^ txt)
-    else printMultilineCommentContent txt
-  in
-  let diff =
-    let cmtStart = (Comment.loc comment).loc_start in
-    cmtStart.pos_lnum - prevLoc.loc_end.pos_lnum
-  in
-  let isBelow =
-    (Comment.loc comment).loc_start.pos_lnum > nodeLoc.loc_end.pos_lnum
-  in
-  if diff > 0 || isBelow then
-    Doc.concat
-      [
-        Doc.breakParent;
-        Doc.lineSuffix
-          (Doc.concat
-             [
-               Doc.hardLine;
-               (if diff > 1 then Doc.hardLine else Doc.nil);
-               content;
-             ]);
-      ]
-  else if not singleLine then Doc.concat [Doc.space; content]
-  else Doc.lineSuffix (Doc.concat [Doc.space; content])
-
-let printLeadingComment ?nextComment comment =
-  let singleLine = Comment.isSingleLineComment comment in
-  let content =
-    let txt = Comment.txt comment in
-    if singleLine then Doc.text ("//" ^ txt)
-    else printMultilineCommentContent txt
-  in
-  let separator =
-    Doc.concat
-      [
-        (if singleLine then Doc.concat [Doc.hardLine; Doc.breakParent]
-         else Doc.nil);
-        (match nextComment with
-        | Some next ->
-          let nextLoc = Comment.loc next in
-          let currLoc = Comment.loc comment in
-          let diff =
-            nextLoc.Location.loc_start.pos_lnum
-            - currLoc.Location.loc_end.pos_lnum
-          in
-          let nextSingleLine = Comment.isSingleLineComment next in
-          if singleLine && nextSingleLine then
-            if diff > 1 then Doc.hardLine else Doc.nil
-          else if singleLine && not nextSingleLine then
-            if diff > 1 then Doc.hardLine else Doc.nil
-          else if diff > 1 then Doc.concat [Doc.hardLine; Doc.hardLine]
-          else if diff == 1 then Doc.hardLine
-          else Doc.space
-        | None -> Doc.nil);
-      ]
-  in
-  Doc.concat [content; separator]
-
-(* This function is used for printing comments inside an empty block *)
-let printCommentsInside cmtTbl loc =
-  let printComment comment =
-    let singleLine = Comment.isSingleLineComment comment in
-    let txt = Comment.txt comment in
-    if singleLine then Doc.text ("//" ^ txt)
-    else printMultilineCommentContent txt
-  in
-  let forceBreak =
-    loc.Location.loc_start.pos_lnum <> loc.Location.loc_end.pos_lnum
-  in
-  let rec loop acc comments =
-    match comments with
-    | [] -> Doc.nil
-    | [comment] ->
-      let cmtDoc = printComment comment in
-      let cmtsDoc = Doc.concat (Doc.softLine :: List.rev (cmtDoc :: acc)) in
-      let doc =
-        Doc.breakableGroup ~forceBreak
-          (Doc.concat [Doc.ifBreaks (Doc.indent cmtsDoc) cmtsDoc; Doc.softLine])
-      in
-      doc
-    | comment :: rest ->
-      let cmtDoc = Doc.concat [printComment comment; Doc.line] in
-      loop (cmtDoc :: acc) rest
-  in
-  match Hashtbl.find cmtTbl.CommentTable.inside loc with
-  | exception Not_found -> Doc.nil
-  | comments ->
-    Hashtbl.remove cmtTbl.inside loc;
-    loop [] comments
-
-(* This function is used for printing comments inside an empty file *)
-let printCommentsInsideFile cmtTbl =
-  let rec loop acc comments =
-    match comments with
-    | [] -> Doc.nil
-    | [comment] ->
-      let cmtDoc = printLeadingComment comment in
-      let doc =
-        Doc.group (Doc.concat [Doc.concat (List.rev (cmtDoc :: acc))])
-      in
-      doc
-    | comment :: (nextComment :: _comments as rest) ->
-      let cmtDoc = printLeadingComment ~nextComment comment in
-      loop (cmtDoc :: acc) rest
-  in
-  match Hashtbl.find cmtTbl.CommentTable.inside Location.none with
-  | exception Not_found -> Doc.nil
-  | comments ->
-    Hashtbl.remove cmtTbl.inside Location.none;
-    Doc.group (loop [] comments)
-
-let printLeadingComments node tbl loc =
-  let rec loop acc comments =
-    match comments with
-    | [] -> node
-    | [comment] ->
-      let cmtDoc = printLeadingComment comment in
-      let diff =
-        loc.Location.loc_start.pos_lnum
-        - (Comment.loc comment).Location.loc_end.pos_lnum
-      in
-      let separator =
-        if Comment.isSingleLineComment comment then
-          if diff > 1 then Doc.hardLine else Doc.nil
-        else if diff == 0 then Doc.space
-        else if diff > 1 then Doc.concat [Doc.hardLine; Doc.hardLine]
-        else Doc.hardLine
-      in
-      let doc =
-        Doc.group
-          (Doc.concat [Doc.concat (List.rev (cmtDoc :: acc)); separator; node])
-      in
-      doc
-    | comment :: (nextComment :: _comments as rest) ->
-      let cmtDoc = printLeadingComment ~nextComment comment in
-      loop (cmtDoc :: acc) rest
-  in
-  match Hashtbl.find tbl loc with
-  | exception Not_found -> node
-  | comments ->
-    (* Remove comments from tbl: Some ast nodes have the same location.
-     * We only want to print comments once *)
-    Hashtbl.remove tbl loc;
-    loop [] comments
-
-let printTrailingComments node tbl loc =
-  let rec loop prev acc comments =
-    match comments with
-    | [] -> Doc.concat (List.rev acc)
-    | comment :: comments ->
-      let cmtDoc = printTrailingComment prev loc comment in
-      loop (Comment.loc comment) (cmtDoc :: acc) comments
-  in
-  match Hashtbl.find tbl loc with
-  | exception Not_found -> node
-  | [] -> node
-  | _first :: _ as comments ->
-    (* Remove comments from tbl: Some ast nodes have the same location.
-     * We only want to print comments once *)
-    Hashtbl.remove tbl loc;
-    let cmtsDoc = loop loc [] comments in
-    Doc.concat [node; cmtsDoc]
-
-let printComments doc (tbl : CommentTable.t) loc =
-  let docWithLeadingComments = printLeadingComments doc tbl.leading loc in
-  printTrailingComments docWithLeadingComments tbl.trailing loc
-
-let printList ~getLoc ~nodes ~print ?(forceBreak = false) t =
-  let rec loop (prevLoc : Location.t) acc nodes =
-    match nodes with
-    | [] -> (prevLoc, Doc.concat (List.rev acc))
-    | node :: nodes ->
-      let loc = getLoc node in
-      let startPos =
-        match getFirstLeadingComment t loc with
-        | None -> loc.loc_start
-        | Some comment -> (Comment.loc comment).loc_start
-      in
-      let sep =
-        if startPos.pos_lnum - prevLoc.loc_end.pos_lnum > 1 then
-          Doc.concat [Doc.hardLine; Doc.hardLine]
-        else Doc.hardLine
-      in
-      let doc = printComments (print node t) t loc in
-      loop loc (doc :: sep :: acc) nodes
-  in
-  match nodes with
-  | [] -> Doc.nil
-  | node :: nodes ->
-    let firstLoc = getLoc node in
-    let doc = printComments (print node t) t firstLoc in
-    let lastLoc, docs = loop firstLoc [doc] nodes in
-    let forceBreak =
-      forceBreak || firstLoc.loc_start.pos_lnum != lastLoc.loc_end.pos_lnum
-    in
-    Doc.breakableGroup ~forceBreak docs
-
-let printListi ~getLoc ~nodes ~print ?(forceBreak = false) t =
-  let rec loop i (prevLoc : Location.t) acc nodes =
-    match nodes with
-    | [] -> (prevLoc, Doc.concat (List.rev acc))
-    | node :: nodes ->
-      let loc = getLoc node in
-      let startPos =
-        match getFirstLeadingComment t loc with
-        | None -> loc.loc_start
-        | Some comment -> (Comment.loc comment).loc_start
-      in
-      let sep =
-        if startPos.pos_lnum - prevLoc.loc_end.pos_lnum > 1 then
-          Doc.concat [Doc.hardLine; Doc.hardLine]
-        else Doc.line
-      in
-      let doc = printComments (print node t i) t loc in
-      loop (i + 1) loc (doc :: sep :: acc) nodes
-  in
-  match nodes with
-  | [] -> Doc.nil
-  | node :: nodes ->
-    let firstLoc = getLoc node in
-    let doc = printComments (print node t 0) t firstLoc in
-    let lastLoc, docs = loop 1 firstLoc [doc] nodes in
-    let forceBreak =
-      forceBreak || firstLoc.loc_start.pos_lnum != lastLoc.loc_end.pos_lnum
-    in
-    Doc.breakableGroup ~forceBreak docs
-
-let rec printLongidentAux accu = function
-  | Longident.Lident s -> Doc.text s :: accu
-  | Ldot (lid, s) -> printLongidentAux (Doc.text s :: accu) lid
-  | Lapply (lid1, lid2) ->
-    let d1 = Doc.join ~sep:Doc.dot (printLongidentAux [] lid1) in
-    let d2 = Doc.join ~sep:Doc.dot (printLongidentAux [] lid2) in
-    Doc.concat [d1; Doc.lparen; d2; Doc.rparen] :: accu
-
-let printLongident = function
-  | Longident.Lident txt -> Doc.text txt
-  | lid -> Doc.join ~sep:Doc.dot (printLongidentAux [] lid)
-
-type identifierStyle = ExoticIdent | NormalIdent
-
-let classifyIdentContent ?(allowUident = false) ?(allowHyphen = false) txt =
-  if Token.isKeywordTxt txt then ExoticIdent
-  else
-    let len = String.length txt in
-    let rec loop i =
-      if i == len then NormalIdent
-      else if i == 0 then
-        match String.unsafe_get txt i with
-        | 'A' .. 'Z' when allowUident -> loop (i + 1)
-        | 'a' .. 'z' | '_' -> loop (i + 1)
-        | '-' when allowHyphen -> loop (i + 1)
-        | _ -> ExoticIdent
-      else
-        match String.unsafe_get txt i with
-        | 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '\'' | '_' -> loop (i + 1)
-        | '-' when allowHyphen -> loop (i + 1)
-        | _ -> ExoticIdent
-    in
-    loop 0
-
-let printIdentLike ?allowUident ?allowHyphen txt =
-  match classifyIdentContent ?allowUident ?allowHyphen txt with
-  | ExoticIdent -> Doc.concat [Doc.text "\\\""; Doc.text txt; Doc.text "\""]
-  | NormalIdent -> Doc.text txt
-
-let rec unsafe_for_all_range s ~start ~finish p =
-  start > finish
-  || p (String.unsafe_get s start)
-     && unsafe_for_all_range s ~start:(start + 1) ~finish p
-
-let for_all_from s start p =
-  let len = String.length s in
-  unsafe_for_all_range s ~start ~finish:(len - 1) p
-
-(* See https://github.com/rescript-lang/rescript-compiler/blob/726cfa534314b586e5b5734471bc2023ad99ebd9/jscomp/ext/ext_string.ml#L510 *)
-let isValidNumericPolyvarNumber (x : string) =
-  let len = String.length x in
-  len > 0
-  &&
-  let a = Char.code (String.unsafe_get x 0) in
-  a <= 57
-  &&
-  if len > 1 then
-    a > 48
-    && for_all_from x 1 (function
-         | '0' .. '9' -> true
-         | _ -> false)
-  else a >= 48
-
-(* Exotic identifiers in poly-vars have a "lighter" syntax: #"ease-in" *)
-let printPolyVarIdent txt =
-  (* numeric poly-vars don't need quotes: #644 *)
-  if isValidNumericPolyvarNumber txt then Doc.text txt
-  else
-    match classifyIdentContent ~allowUident:true txt with
-    | ExoticIdent -> Doc.concat [Doc.text "\""; Doc.text txt; Doc.text "\""]
-    | NormalIdent -> (
-      match txt with
-      | "" -> Doc.concat [Doc.text "\""; Doc.text txt; Doc.text "\""]
-      | _ -> Doc.text txt)
-
-let polyVarIdentToString polyVarIdent =
-  Doc.concat [Doc.text "#"; printPolyVarIdent polyVarIdent]
-  |> Doc.toString ~width:80
-
-let printLident l =
-  let flatLidOpt lid =
-    let rec flat accu = function
-      | Longident.Lident s -> Some (s :: accu)
-      | Ldot (lid, s) -> flat (s :: accu) lid
-      | Lapply (_, _) -> None
-    in
-    flat [] lid
-  in
-  match l with
-  | Longident.Lident txt -> printIdentLike txt
-  | Longident.Ldot (path, txt) ->
-    let doc =
-      match flatLidOpt path with
-      | Some txts ->
-        Doc.concat
-          [
-            Doc.join ~sep:Doc.dot (List.map Doc.text txts);
-            Doc.dot;
-            printIdentLike txt;
-          ]
-      | None -> Doc.text "printLident: Longident.Lapply is not supported"
-    in
-    doc
-  | Lapply (_, _) -> Doc.text "printLident: Longident.Lapply is not supported"
-
-let printLongidentLocation l cmtTbl =
-  let doc = printLongident l.Location.txt in
-  printComments doc cmtTbl l.loc
-
-(* Module.SubModule.x *)
-let printLidentPath path cmtTbl =
-  let doc = printLident path.Location.txt in
-  printComments doc cmtTbl path.loc
-
-(* Module.SubModule.x or Module.SubModule.X *)
-let printIdentPath path cmtTbl =
-  let doc = printLident path.Location.txt in
-  printComments doc cmtTbl path.loc
-
-let printStringLoc sloc cmtTbl =
-  let doc = printIdentLike sloc.Location.txt in
-  printComments doc cmtTbl sloc.loc
-
-let printStringContents txt =
-  let lines = String.split_on_char '\n' txt in
-  Doc.join ~sep:Doc.literalLine (List.map Doc.text lines)
-
-let printConstant ?(templateLiteral = false) c =
-  match c with
-  | Parsetree.Pconst_integer (s, suffix) -> (
-    match suffix with
-    | Some c -> Doc.text (s ^ Char.escaped c)
-    | None -> Doc.text s)
-  | Pconst_string (txt, None) ->
-    Doc.concat [Doc.text "\""; printStringContents txt; Doc.text "\""]
-  | Pconst_string (txt, Some prefix) ->
-    if prefix = "INTERNAL_RES_CHAR_CONTENTS" then
-      Doc.concat [Doc.text "'"; Doc.text txt; Doc.text "'"]
-    else
-      let lquote, rquote =
-        if templateLiteral then ("`", "`") else ("\"", "\"")
-      in
-      Doc.concat
-        [
-          (if prefix = "js" then Doc.nil else Doc.text prefix);
-          Doc.text lquote;
-          printStringContents txt;
-          Doc.text rquote;
-        ]
-  | Pconst_float (s, _) -> Doc.text s
-  | Pconst_char c ->
-    let str =
-      match Char.unsafe_chr c with
-      | '\'' -> "\\'"
-      | '\\' -> "\\\\"
-      | '\n' -> "\\n"
-      | '\t' -> "\\t"
-      | '\r' -> "\\r"
-      | '\b' -> "\\b"
-      | ' ' .. '~' as c ->
-        let s = (Bytes.create [@doesNotRaise]) 1 in
-        Bytes.unsafe_set s 0 c;
-        Bytes.unsafe_to_string s
-      | _ -> Res_utf8.encodeCodePoint c
-    in
-    Doc.text ("'" ^ str ^ "'")
-
-let printOptionalLabel attrs =
-  if Res_parsetree_viewer.hasOptionalAttribute attrs then Doc.text "?"
-  else Doc.nil
-
-module State = struct
-  let customLayoutThreshold = 2
-
-  type t = {customLayout: int; mutable uncurried_config: Config.uncurried}
-
-  let init () = {customLayout = 0; uncurried_config = !Config.uncurried}
-
-  let nextCustomLayout t = {t with customLayout = t.customLayout + 1}
-
-  let shouldBreakCallback t = t.customLayout > customLayoutThreshold
-end
-
-let rec printStructure ~state (s : Parsetree.structure) t =
-  match s with
-  | [] -> printCommentsInsideFile t
-  | structure ->
-    printList
-      ~getLoc:(fun s -> s.Parsetree.pstr_loc)
-      ~nodes:structure
-      ~print:(printStructureItem ~state)
-      t
-
-and printStructureItem ~state (si : Parsetree.structure_item) cmtTbl =
-  match si.pstr_desc with
-  | Pstr_value (rec_flag, valueBindings) ->
-    let recFlag =
-      match rec_flag with
-      | Asttypes.Nonrecursive -> Doc.nil
-      | Asttypes.Recursive -> Doc.text "rec "
-    in
-    printValueBindings ~state ~recFlag valueBindings cmtTbl
-  | Pstr_type (recFlag, typeDeclarations) ->
-    let recFlag =
-      match recFlag with
-      | Asttypes.Nonrecursive -> Doc.nil
-      | Asttypes.Recursive -> Doc.text "rec "
-    in
-    printTypeDeclarations ~state ~recFlag typeDeclarations cmtTbl
-  | Pstr_primitive valueDescription ->
-    printValueDescription ~state valueDescription cmtTbl
-  | Pstr_eval (expr, attrs) ->
-    let exprDoc =
-      let doc = printExpressionWithComments ~state expr cmtTbl in
-      match Parens.structureExpr expr with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc expr braces
-      | Nothing -> doc
-    in
-    Doc.concat [printAttributes ~state attrs cmtTbl; exprDoc]
-  | Pstr_attribute attr ->
-    fst (printAttribute ~state ~standalone:true attr cmtTbl)
-  | Pstr_extension (extension, attrs) ->
-    Doc.concat
-      [
-        printAttributes ~state attrs cmtTbl;
-        Doc.concat [printExtension ~state ~atModuleLvl:true extension cmtTbl];
-      ]
-  | Pstr_include includeDeclaration ->
-    printIncludeDeclaration ~state includeDeclaration cmtTbl
-  | Pstr_open openDescription ->
-    printOpenDescription ~state openDescription cmtTbl
-  | Pstr_modtype modTypeDecl ->
-    printModuleTypeDeclaration ~state modTypeDecl cmtTbl
-  | Pstr_module moduleBinding ->
-    printModuleBinding ~state ~isRec:false moduleBinding cmtTbl 0
-  | Pstr_recmodule moduleBindings ->
-    printListi
-      ~getLoc:(fun mb -> mb.Parsetree.pmb_loc)
-      ~nodes:moduleBindings
-      ~print:(printModuleBinding ~state ~isRec:true)
-      cmtTbl
-  | Pstr_exception extensionConstructor ->
-    printExceptionDef ~state extensionConstructor cmtTbl
-  | Pstr_typext typeExtension -> printTypeExtension ~state typeExtension cmtTbl
-  | Pstr_class _ | Pstr_class_type _ -> Doc.nil
-
-and printTypeExtension ~state (te : Parsetree.type_extension) cmtTbl =
-  let prefix = Doc.text "type " in
-  let name = printLidentPath te.ptyext_path cmtTbl in
-  let typeParams = printTypeParams ~state te.ptyext_params cmtTbl in
-  let extensionConstructors =
-    let ecs = te.ptyext_constructors in
-    let forceBreak =
-      match (ecs, List.rev ecs) with
-      | first :: _, last :: _ ->
-        first.pext_loc.loc_start.pos_lnum > te.ptyext_path.loc.loc_end.pos_lnum
-        || first.pext_loc.loc_start.pos_lnum < last.pext_loc.loc_end.pos_lnum
-      | _ -> false
-    in
-    let privateFlag =
-      match te.ptyext_private with
-      | Asttypes.Private -> Doc.concat [Doc.text "private"; Doc.line]
-      | Public -> Doc.nil
-    in
-    let rows =
-      printListi
-        ~getLoc:(fun n -> n.Parsetree.pext_loc)
-        ~print:(printExtensionConstructor ~state)
-        ~nodes:ecs ~forceBreak cmtTbl
-    in
-    Doc.breakableGroup ~forceBreak
-      (Doc.indent
-         (Doc.concat
-            [
-              Doc.line;
-              privateFlag;
-              rows;
-              (* Doc.join ~sep:Doc.line ( *)
-              (* List.mapi printExtensionConstructor ecs *)
-              (* ) *)
-            ]))
-  in
-  Doc.group
-    (Doc.concat
-       [
-         printAttributes ~state ~loc:te.ptyext_path.loc te.ptyext_attributes
-           cmtTbl;
-         prefix;
-         name;
-         typeParams;
-         Doc.text " +=";
-         extensionConstructors;
-       ])
-
-and printModuleBinding ~state ~isRec moduleBinding cmtTbl i =
-  let prefix =
-    if i = 0 then
-      Doc.concat
-        [Doc.text "module "; (if isRec then Doc.text "rec " else Doc.nil)]
-    else Doc.text "and "
-  in
-  let modExprDoc, modConstraintDoc =
-    match moduleBinding.pmb_expr with
-    | {pmod_desc = Pmod_constraint (modExpr, modType)}
-      when not
-             (ParsetreeViewer.hasAwaitAttribute
-                moduleBinding.pmb_expr.pmod_attributes) ->
-      ( printModExpr ~state modExpr cmtTbl,
-        Doc.concat [Doc.text ": "; printModType ~state modType cmtTbl] )
-    | modExpr -> (printModExpr ~state modExpr cmtTbl, Doc.nil)
-  in
-  let modExprDocParens =
-    if Parens.modExprParens moduleBinding.pmb_expr then
-      Doc.concat [Doc.lparen; modExprDoc; Doc.rparen]
-    else modExprDoc
-  in
-  let modName =
-    let doc = Doc.text moduleBinding.pmb_name.Location.txt in
-    printComments doc cmtTbl moduleBinding.pmb_name.loc
-  in
-  let doc =
-    Doc.concat
-      [
-        printAttributes ~state ~loc:moduleBinding.pmb_name.loc
-          moduleBinding.pmb_attributes cmtTbl;
-        prefix;
-        modName;
-        modConstraintDoc;
-        Doc.text " = ";
-        modExprDocParens;
-      ]
-  in
-  printComments doc cmtTbl moduleBinding.pmb_loc
-
-and printModuleTypeDeclaration ~state
-    (modTypeDecl : Parsetree.module_type_declaration) cmtTbl =
-  let modName =
-    let doc = Doc.text modTypeDecl.pmtd_name.txt in
-    printComments doc cmtTbl modTypeDecl.pmtd_name.loc
-  in
-  Doc.concat
-    [
-      printAttributes ~state modTypeDecl.pmtd_attributes cmtTbl;
-      Doc.text "module type ";
-      modName;
-      (match modTypeDecl.pmtd_type with
-      | None -> Doc.nil
-      | Some modType ->
-        Doc.concat [Doc.text " = "; printModType ~state modType cmtTbl]);
-    ]
-
-and printModType ~state modType cmtTbl =
-  let modTypeDoc =
-    match modType.pmty_desc with
-    | Parsetree.Pmty_ident longident ->
-      Doc.concat
-        [
-          printAttributes ~state ~loc:longident.loc modType.pmty_attributes
-            cmtTbl;
-          printLongidentLocation longident cmtTbl;
-        ]
-    | Pmty_signature [] ->
-      if hasCommentsInside cmtTbl modType.pmty_loc then
-        let doc = printCommentsInside cmtTbl modType.pmty_loc in
-        Doc.concat [Doc.lbrace; doc; Doc.rbrace]
-      else
-        let shouldBreak =
-          modType.pmty_loc.loc_start.pos_lnum
-          < modType.pmty_loc.loc_end.pos_lnum
-        in
-        Doc.breakableGroup ~forceBreak:shouldBreak
-          (Doc.concat [Doc.lbrace; Doc.softLine; Doc.softLine; Doc.rbrace])
-    | Pmty_signature signature ->
-      let signatureDoc =
-        Doc.breakableGroup ~forceBreak:true
-          (Doc.concat
-             [
-               Doc.lbrace;
-               Doc.indent
-                 (Doc.concat [Doc.line; printSignature ~state signature cmtTbl]);
-               Doc.line;
-               Doc.rbrace;
-             ])
-      in
-      Doc.concat
-        [printAttributes ~state modType.pmty_attributes cmtTbl; signatureDoc]
-    | Pmty_functor _ ->
-      let parameters, returnType = ParsetreeViewer.functorType modType in
-      let parametersDoc =
-        match parameters with
-        | [] -> Doc.nil
-        | [(attrs, {Location.txt = "_"; loc}, Some modType)] ->
-          let cmtLoc =
-            {loc with loc_end = modType.Parsetree.pmty_loc.loc_end}
-          in
-          let attrs = printAttributes ~state attrs cmtTbl in
-          let doc = Doc.concat [attrs; printModType ~state modType cmtTbl] in
-          printComments doc cmtTbl cmtLoc
-        | params ->
-          Doc.group
-            (Doc.concat
-               [
-                 Doc.lparen;
-                 Doc.indent
-                   (Doc.concat
-                      [
-                        Doc.softLine;
-                        Doc.join
-                          ~sep:(Doc.concat [Doc.comma; Doc.line])
-                          (List.map
-                             (fun (attrs, lbl, modType) ->
-                               let cmtLoc =
-                                 match modType with
-                                 | None -> lbl.Asttypes.loc
-                                 | Some modType ->
-                                   {
-                                     lbl.Asttypes.loc with
-                                     loc_end =
-                                       modType.Parsetree.pmty_loc.loc_end;
-                                   }
-                               in
-                               let attrs =
-                                 printAttributes ~state attrs cmtTbl
-                               in
-                               let lblDoc =
-                                 if lbl.Location.txt = "_" || lbl.txt = "*" then
-                                   Doc.nil
-                                 else
-                                   let doc = Doc.text lbl.txt in
-                                   printComments doc cmtTbl lbl.loc
-                               in
-                               let doc =
-                                 Doc.concat
-                                   [
-                                     attrs;
-                                     lblDoc;
-                                     (match modType with
-                                     | None -> Doc.nil
-                                     | Some modType ->
-                                       Doc.concat
-                                         [
-                                           (if lbl.txt = "_" then Doc.nil
-                                            else Doc.text ": ");
-                                           printModType ~state modType cmtTbl;
-                                         ]);
-                                   ]
-                               in
-                               printComments doc cmtTbl cmtLoc)
-                             params);
-                      ]);
-                 Doc.trailingComma;
-                 Doc.softLine;
-                 Doc.rparen;
-               ])
-      in
-      let returnDoc =
-        let doc = printModType ~state returnType cmtTbl in
-        if Parens.modTypeFunctorReturn returnType then addParens doc else doc
-      in
-      Doc.group
-        (Doc.concat
-           [
-             parametersDoc;
-             Doc.group (Doc.concat [Doc.text " =>"; Doc.line; returnDoc]);
-           ])
-    | Pmty_typeof modExpr ->
-      Doc.concat
-        [Doc.text "module type of "; printModExpr ~state modExpr cmtTbl]
-    | Pmty_extension extension ->
-      printExtension ~state ~atModuleLvl:false extension cmtTbl
-    | Pmty_alias longident ->
-      Doc.concat [Doc.text "module "; printLongidentLocation longident cmtTbl]
-    | Pmty_with (modType, withConstraints) ->
-      let operand =
-        let doc = printModType ~state modType cmtTbl in
-        if Parens.modTypeWithOperand modType then addParens doc else doc
-      in
-      Doc.group
-        (Doc.concat
-           [
-             operand;
-             Doc.indent
-               (Doc.concat
-                  [Doc.line; printWithConstraints ~state withConstraints cmtTbl]);
-           ])
-  in
-  let attrsAlreadyPrinted =
-    match modType.pmty_desc with
-    | Pmty_functor _ | Pmty_signature _ | Pmty_ident _ -> true
-    | _ -> false
-  in
-  let doc =
-    Doc.concat
-      [
-        (if attrsAlreadyPrinted then Doc.nil
-         else printAttributes ~state modType.pmty_attributes cmtTbl);
-        modTypeDoc;
-      ]
-  in
-  printComments doc cmtTbl modType.pmty_loc
-
-and printWithConstraints ~state withConstraints cmtTbl =
-  let rows =
-    List.mapi
-      (fun i withConstraint ->
-        Doc.group
-          (Doc.concat
-             [
-               (if i == 0 then Doc.text "with " else Doc.text "and ");
-               printWithConstraint ~state withConstraint cmtTbl;
-             ]))
-      withConstraints
-  in
-  Doc.join ~sep:Doc.line rows
-
-and printWithConstraint ~state (withConstraint : Parsetree.with_constraint)
-    cmtTbl =
-  match withConstraint with
-  (* with type X.t = ... *)
-  | Pwith_type (longident, typeDeclaration) ->
-    Doc.group
-      (printTypeDeclaration ~state
-         ~name:(printLidentPath longident cmtTbl)
-         ~equalSign:"=" ~recFlag:Doc.nil 0 typeDeclaration CommentTable.empty)
-  (* with module X.Y = Z *)
-  | Pwith_module ({txt = longident1}, {txt = longident2}) ->
-    Doc.concat
-      [
-        Doc.text "module ";
-        printLongident longident1;
-        Doc.text " =";
-        Doc.indent (Doc.concat [Doc.line; printLongident longident2]);
-      ]
-  (* with type X.t := ..., same format as [Pwith_type] *)
-  | Pwith_typesubst (longident, typeDeclaration) ->
-    Doc.group
-      (printTypeDeclaration ~state
-         ~name:(printLidentPath longident cmtTbl)
-         ~equalSign:":=" ~recFlag:Doc.nil 0 typeDeclaration CommentTable.empty)
-  | Pwith_modsubst ({txt = longident1}, {txt = longident2}) ->
-    Doc.concat
-      [
-        Doc.text "module ";
-        printLongident longident1;
-        Doc.text " :=";
-        Doc.indent (Doc.concat [Doc.line; printLongident longident2]);
-      ]
-
-and printSignature ~state signature cmtTbl =
-  match signature with
-  | [] -> printCommentsInsideFile cmtTbl
-  | signature ->
-    printList
-      ~getLoc:(fun s -> s.Parsetree.psig_loc)
-      ~nodes:signature
-      ~print:(printSignatureItem ~state)
-      cmtTbl
-
-and printSignatureItem ~state (si : Parsetree.signature_item) cmtTbl =
-  match si.psig_desc with
-  | Parsetree.Psig_value valueDescription ->
-    printValueDescription ~state valueDescription cmtTbl
-  | Psig_type (recFlag, typeDeclarations) ->
-    let recFlag =
-      match recFlag with
-      | Asttypes.Nonrecursive -> Doc.nil
-      | Asttypes.Recursive -> Doc.text "rec "
-    in
-    printTypeDeclarations ~state ~recFlag typeDeclarations cmtTbl
-  | Psig_typext typeExtension -> printTypeExtension ~state typeExtension cmtTbl
-  | Psig_exception extensionConstructor ->
-    printExceptionDef ~state extensionConstructor cmtTbl
-  | Psig_module moduleDeclaration ->
-    printModuleDeclaration ~state moduleDeclaration cmtTbl
-  | Psig_recmodule moduleDeclarations ->
-    printRecModuleDeclarations ~state moduleDeclarations cmtTbl
-  | Psig_modtype modTypeDecl ->
-    printModuleTypeDeclaration ~state modTypeDecl cmtTbl
-  | Psig_open openDescription ->
-    printOpenDescription ~state openDescription cmtTbl
-  | Psig_include includeDescription ->
-    printIncludeDescription ~state includeDescription cmtTbl
-  | Psig_attribute attr ->
-    fst (printAttribute ~state ~standalone:true attr cmtTbl)
-  | Psig_extension (extension, attrs) ->
-    Doc.concat
-      [
-        printAttributes ~state attrs cmtTbl;
-        Doc.concat [printExtension ~state ~atModuleLvl:true extension cmtTbl];
-      ]
-  | Psig_class _ | Psig_class_type _ -> Doc.nil
-
-and printRecModuleDeclarations ~state moduleDeclarations cmtTbl =
-  printListi
-    ~getLoc:(fun n -> n.Parsetree.pmd_loc)
-    ~nodes:moduleDeclarations
-    ~print:(printRecModuleDeclaration ~state)
-    cmtTbl
-
-and printRecModuleDeclaration ~state md cmtTbl i =
-  let body =
-    match md.pmd_type.pmty_desc with
-    | Parsetree.Pmty_alias longident ->
-      Doc.concat [Doc.text " = "; printLongidentLocation longident cmtTbl]
-    | _ ->
-      let needsParens =
-        match md.pmd_type.pmty_desc with
-        | Pmty_with _ -> true
-        | _ -> false
-      in
-      let modTypeDoc =
-        let doc = printModType ~state md.pmd_type cmtTbl in
-        if needsParens then addParens doc else doc
-      in
-      Doc.concat [Doc.text ": "; modTypeDoc]
-  in
-  let prefix = if i < 1 then "module rec " else "and " in
-  Doc.concat
-    [
-      printAttributes ~state ~loc:md.pmd_name.loc md.pmd_attributes cmtTbl;
-      Doc.text prefix;
-      printComments (Doc.text md.pmd_name.txt) cmtTbl md.pmd_name.loc;
-      body;
-    ]
-
-and printModuleDeclaration ~state (md : Parsetree.module_declaration) cmtTbl =
-  let body =
-    match md.pmd_type.pmty_desc with
-    | Parsetree.Pmty_alias longident ->
-      Doc.concat [Doc.text " = "; printLongidentLocation longident cmtTbl]
-    | _ -> Doc.concat [Doc.text ": "; printModType ~state md.pmd_type cmtTbl]
-  in
-  Doc.concat
-    [
-      printAttributes ~state ~loc:md.pmd_name.loc md.pmd_attributes cmtTbl;
-      Doc.text "module ";
-      printComments (Doc.text md.pmd_name.txt) cmtTbl md.pmd_name.loc;
-      body;
-    ]
-
-and printOpenDescription ~state (openDescription : Parsetree.open_description)
-    cmtTbl =
-  Doc.concat
-    [
-      printAttributes ~state openDescription.popen_attributes cmtTbl;
-      Doc.text "open";
-      (match openDescription.popen_override with
-      | Asttypes.Fresh -> Doc.space
-      | Asttypes.Override -> Doc.text "! ");
-      printLongidentLocation openDescription.popen_lid cmtTbl;
-    ]
-
-and printIncludeDescription ~state
-    (includeDescription : Parsetree.include_description) cmtTbl =
-  Doc.concat
-    [
-      printAttributes ~state includeDescription.pincl_attributes cmtTbl;
-      Doc.text "include ";
-      printModType ~state includeDescription.pincl_mod cmtTbl;
-    ]
-
-and printIncludeDeclaration ~state
-    (includeDeclaration : Parsetree.include_declaration) cmtTbl =
-  Doc.concat
-    [
-      printAttributes ~state includeDeclaration.pincl_attributes cmtTbl;
-      Doc.text "include ";
-      (let includeDoc =
-         printModExpr ~state includeDeclaration.pincl_mod cmtTbl
-       in
-       if Parens.includeModExpr includeDeclaration.pincl_mod then
-         addParens includeDoc
-       else includeDoc);
-    ]
-
-and printValueBindings ~state ~recFlag (vbs : Parsetree.value_binding list)
-    cmtTbl =
-  printListi
-    ~getLoc:(fun vb -> vb.Parsetree.pvb_loc)
-    ~nodes:vbs
-    ~print:(printValueBinding ~state ~recFlag)
-    cmtTbl
-
-and printValueDescription ~state valueDescription cmtTbl =
-  let isExternal =
-    match valueDescription.pval_prim with
-    | [] -> false
-    | _ -> true
-  in
-  let attrs =
-    printAttributes ~state ~loc:valueDescription.pval_name.loc
-      valueDescription.pval_attributes cmtTbl
-  in
-  let header = if isExternal then "external " else "let " in
-  Doc.group
-    (Doc.concat
-       [
-         attrs;
-         Doc.text header;
-         printComments
-           (printIdentLike valueDescription.pval_name.txt)
-           cmtTbl valueDescription.pval_name.loc;
-         Doc.text ": ";
-         printTypExpr ~state valueDescription.pval_type cmtTbl;
-         (if isExternal then
-            Doc.group
-              (Doc.concat
-                 [
-                   Doc.text " =";
-                   Doc.indent
-                     (Doc.concat
-                        [
-                          Doc.line;
-                          Doc.join ~sep:Doc.line
-                            (List.map
-                               (fun s ->
-                                 Doc.concat
-                                   [Doc.text "\""; Doc.text s; Doc.text "\""])
-                               valueDescription.pval_prim);
-                        ]);
-                 ])
-          else Doc.nil);
-       ])
-
-and printTypeDeclarations ~state ~recFlag typeDeclarations cmtTbl =
-  printListi
-    ~getLoc:(fun n -> n.Parsetree.ptype_loc)
-    ~nodes:typeDeclarations
-    ~print:(printTypeDeclaration2 ~state ~recFlag)
-    cmtTbl
-
-(*
- * type_declaration = {
- *    ptype_name: string loc;
- *    ptype_params: (core_type * variance) list;
- *          (* ('a1,...'an) t; None represents  _*)
- *    ptype_cstrs: (core_type * core_type * Location.t) list;
- *          (* ... constraint T1=T1'  ... constraint Tn=Tn' *)
- *    ptype_kind: type_kind;
- *    ptype_private: private_flag;   (* = private ... *)
- *    ptype_manifest: core_type option;  (* = T *)
- *    ptype_attributes: attributes;   (* ... [@@id1] [@@id2] *)
- *    ptype_loc: Location.t;
- * }
- *
- *
- *  type t                     (abstract, no manifest)
- *  type t = T0                (abstract, manifest=T0)
- *  type t = C of T | ...      (variant,  no manifest)
- *  type t = T0 = C of T | ... (variant,  manifest=T0)
- *  type t = {l: T; ...}       (record,   no manifest)
- *  type t = T0 = {l : T; ...} (record,   manifest=T0)
- *  type t = ..                (open,     no manifest)
- *
- *
- * and type_kind =
- *  | Ptype_abstract
- *  | Ptype_variant of constructor_declaration list
- *        (* Invariant: non-empty list *)
- *  | Ptype_record of label_declaration list
- *        (* Invariant: non-empty list *)
- *  | Ptype_open
- *)
-and printTypeDeclaration ~state ~name ~equalSign ~recFlag i
-    (td : Parsetree.type_declaration) cmtTbl =
-  let attrs =
-    printAttributes ~state ~loc:td.ptype_loc td.ptype_attributes cmtTbl
-  in
-  let prefix =
-    if i > 0 then Doc.text "and " else Doc.concat [Doc.text "type "; recFlag]
-  in
-  let typeName = name in
-  let typeParams = printTypeParams ~state td.ptype_params cmtTbl in
-  let manifestAndKind =
-    match td.ptype_kind with
-    | Ptype_abstract -> (
-      match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some typ ->
-        Doc.concat
-          [
-            Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-            printPrivateFlag td.ptype_private;
-            printTypExpr ~state typ cmtTbl;
-          ])
-    | Ptype_open ->
-      Doc.concat
-        [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printPrivateFlag td.ptype_private;
-          Doc.text "..";
-        ]
-    | Ptype_record lds ->
-      let manifest =
-        match td.ptype_manifest with
-        | None -> Doc.nil
-        | Some typ ->
-          Doc.concat
-            [
-              Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-              printTypExpr ~state typ cmtTbl;
-            ]
-      in
-      Doc.concat
-        [
-          manifest;
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printPrivateFlag td.ptype_private;
-          printRecordDeclaration ~state lds cmtTbl;
-        ]
-    | Ptype_variant cds ->
-      let manifest =
-        match td.ptype_manifest with
-        | None -> Doc.nil
-        | Some typ ->
-          Doc.concat
-            [
-              Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-              printTypExpr ~state typ cmtTbl;
-            ]
-      in
-      Doc.concat
-        [
-          manifest;
-          Doc.concat [Doc.space; Doc.text equalSign];
-          printConstructorDeclarations ~state ~privateFlag:td.ptype_private cds
-            cmtTbl;
-        ]
-  in
-  let constraints = printTypeDefinitionConstraints ~state td.ptype_cstrs in
-  Doc.group
-    (Doc.concat
-       [attrs; prefix; typeName; typeParams; manifestAndKind; constraints])
-
-and printTypeDeclaration2 ~state ~recFlag (td : Parsetree.type_declaration)
-    cmtTbl i =
-  let name =
-    let doc = printIdentLike td.Parsetree.ptype_name.txt in
-    printComments doc cmtTbl td.ptype_name.loc
-  in
-  let equalSign = "=" in
-  let attrs =
-    printAttributes ~state ~loc:td.ptype_loc td.ptype_attributes cmtTbl
-  in
-  let prefix =
-    if i > 0 then Doc.text "and " else Doc.concat [Doc.text "type "; recFlag]
-  in
-  let typeName = name in
-  let typeParams = printTypeParams ~state td.ptype_params cmtTbl in
-  let manifestAndKind =
-    match td.ptype_kind with
-    | Ptype_abstract -> (
-      match td.ptype_manifest with
-      | None -> Doc.nil
-      | Some typ ->
-        Doc.concat
-          [
-            Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-            printPrivateFlag td.ptype_private;
-            printTypExpr ~state typ cmtTbl;
-          ])
-    | Ptype_open ->
-      Doc.concat
-        [
-          Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-          printPrivateFlag td.ptype_private;
-          Doc.text "..";
-        ]
-    | Ptype_record lds ->
-      if lds = [] then
-        Doc.concat
-          [
-            Doc.space;
-            Doc.text equalSign;
-            Doc.space;
-            Doc.lbrace;
-            printCommentsInside cmtTbl td.ptype_loc;
-            Doc.rbrace;
-          ]
-      else
-        let manifest =
-          match td.ptype_manifest with
-          | None -> Doc.nil
-          | Some typ ->
-            Doc.concat
-              [
-                Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-                printTypExpr ~state typ cmtTbl;
-              ]
-        in
-        Doc.concat
-          [
-            manifest;
-            Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-            printPrivateFlag td.ptype_private;
-            printRecordDeclaration ~state lds cmtTbl;
-          ]
-    | Ptype_variant cds ->
-      let manifest =
-        match td.ptype_manifest with
-        | None -> Doc.nil
-        | Some typ ->
-          Doc.concat
-            [
-              Doc.concat [Doc.space; Doc.text equalSign; Doc.space];
-              printTypExpr ~state typ cmtTbl;
-            ]
-      in
-      Doc.concat
-        [
-          manifest;
-          Doc.concat [Doc.space; Doc.text equalSign];
-          printConstructorDeclarations ~state ~privateFlag:td.ptype_private cds
-            cmtTbl;
-        ]
-  in
-  let constraints = printTypeDefinitionConstraints ~state td.ptype_cstrs in
-  Doc.group
-    (Doc.concat
-       [attrs; prefix; typeName; typeParams; manifestAndKind; constraints])
-
-and printTypeDefinitionConstraints ~state cstrs =
-  match cstrs with
-  | [] -> Doc.nil
-  | cstrs ->
-    Doc.indent
-      (Doc.group
-         (Doc.concat
-            [
-              Doc.line;
-              Doc.group
-                (Doc.join ~sep:Doc.line
-                   (List.map (printTypeDefinitionConstraint ~state) cstrs));
-            ]))
-
-and printTypeDefinitionConstraint ~state
-    ((typ1, typ2, _loc) :
-      Parsetree.core_type * Parsetree.core_type * Location.t) =
-  Doc.concat
-    [
-      Doc.text "constraint ";
-      printTypExpr ~state typ1 CommentTable.empty;
-      Doc.text " = ";
-      printTypExpr ~state typ2 CommentTable.empty;
-    ]
-
-and printPrivateFlag (flag : Asttypes.private_flag) =
-  match flag with
-  | Private -> Doc.text "private "
-  | Public -> Doc.nil
-
-and printTypeParams ~state typeParams cmtTbl =
-  match typeParams with
-  | [] -> Doc.nil
-  | typeParams ->
-    Doc.group
-      (Doc.concat
-         [
-           Doc.lessThan;
-           Doc.indent
-             (Doc.concat
-                [
-                  Doc.softLine;
-                  Doc.join
-                    ~sep:(Doc.concat [Doc.comma; Doc.line])
-                    (List.map
-                       (fun typeParam ->
-                         let doc = printTypeParam ~state typeParam cmtTbl in
-                         printComments doc cmtTbl
-                           (fst typeParam).Parsetree.ptyp_loc)
-                       typeParams);
-                ]);
-           Doc.trailingComma;
-           Doc.softLine;
-           Doc.greaterThan;
-         ])
-
-and printTypeParam ~state (param : Parsetree.core_type * Asttypes.variance)
-    cmtTbl =
-  let typ, variance = param in
-  let printedVariance =
-    match variance with
-    | Covariant -> Doc.text "+"
-    | Contravariant -> Doc.text "-"
-    | Invariant -> Doc.nil
-  in
-  Doc.concat [printedVariance; printTypExpr ~state typ cmtTbl]
-
-and printRecordDeclaration ~state (lds : Parsetree.label_declaration list)
-    cmtTbl =
-  let forceBreak =
-    match (lds, List.rev lds) with
-    | first :: _, last :: _ ->
-      first.pld_loc.loc_start.pos_lnum < last.pld_loc.loc_end.pos_lnum
-    | _ -> false
-  in
-  Doc.breakableGroup ~forceBreak
-    (Doc.concat
-       [
-         Doc.lbrace;
-         Doc.indent
-           (Doc.concat
-              [
-                Doc.softLine;
-                Doc.join
-                  ~sep:(Doc.concat [Doc.comma; Doc.line])
-                  (List.map
-                     (fun ld ->
-                       let doc = printLabelDeclaration ~state ld cmtTbl in
-                       printComments doc cmtTbl ld.Parsetree.pld_loc)
-                     lds);
-              ]);
-         Doc.trailingComma;
-         Doc.softLine;
-         Doc.rbrace;
-       ])
-
-and printConstructorDeclarations ~state ~privateFlag
-    (cds : Parsetree.constructor_declaration list) cmtTbl =
-  let forceBreak =
-    match (cds, List.rev cds) with
-    | first :: _, last :: _ ->
-      first.pcd_loc.loc_start.pos_lnum < last.pcd_loc.loc_end.pos_lnum
-    | _ -> false
-  in
-  let privateFlag =
-    match privateFlag with
-    | Asttypes.Private -> Doc.concat [Doc.text "private"; Doc.line]
-    | Public -> Doc.nil
-  in
-  let rows =
-    printListi
-      ~getLoc:(fun cd -> cd.Parsetree.pcd_loc)
-      ~nodes:cds
-      ~print:(fun cd cmtTbl i ->
-        let doc = printConstructorDeclaration2 ~state i cd cmtTbl in
-        printComments doc cmtTbl cd.Parsetree.pcd_loc)
-      ~forceBreak cmtTbl
-  in
-  Doc.breakableGroup ~forceBreak
-    (Doc.indent (Doc.concat [Doc.line; privateFlag; rows]))
-
-and printConstructorDeclaration2 ~state i
-    (cd : Parsetree.constructor_declaration) cmtTbl =
-  let attrs = printAttributes ~state cd.pcd_attributes cmtTbl in
-  let isDotDotDot = cd.pcd_name.txt = "..." in
-  let bar =
-    if i > 0 || cd.pcd_attributes <> [] || isDotDotDot then Doc.text "| "
-    else Doc.ifBreaks (Doc.text "| ") Doc.nil
-  in
-  let constrName =
-    let doc = Doc.text cd.pcd_name.txt in
-    printComments doc cmtTbl cd.pcd_name.loc
-  in
-  let constrArgs =
-    printConstructorArguments ~isDotDotDot ~state ~indent:true cd.pcd_args
-      cmtTbl
-  in
-  let gadt =
-    match cd.pcd_res with
-    | None -> Doc.nil
-    | Some typ ->
-      Doc.indent (Doc.concat [Doc.text ": "; printTypExpr ~state typ cmtTbl])
-  in
-  Doc.concat
-    [
-      bar;
-      Doc.group
-        (Doc.concat
-           [
-             attrs;
-             (* TODO: fix parsing of attributes, so when can print them above the bar? *)
-             constrName;
-             constrArgs;
-             gadt;
-           ]);
-    ]
-
-and printConstructorArguments ?(isDotDotDot = false) ~state ~indent
-    (cdArgs : Parsetree.constructor_arguments) cmtTbl =
-  match cdArgs with
-  | Pcstr_tuple [] -> Doc.nil
-  | Pcstr_tuple types ->
-    let args =
-      Doc.concat
-        [
-          (if isDotDotDot then Doc.nil else Doc.lparen);
-          Doc.indent
-            (Doc.concat
-               [
-                 Doc.softLine;
-                 Doc.join
-                   ~sep:(Doc.concat [Doc.comma; Doc.line])
-                   (List.map
-                      (fun typexpr -> printTypExpr ~state typexpr cmtTbl)
-                      types);
-               ]);
-          Doc.trailingComma;
-          Doc.softLine;
-          (if isDotDotDot then Doc.nil else Doc.rparen);
-        ]
-    in
-    Doc.group (if indent then Doc.indent args else args)
-  | Pcstr_record lds ->
-    let args =
-      Doc.concat
-        [
-          Doc.lparen;
-          (* manually inline the printRecordDeclaration, gives better layout *)
-          Doc.lbrace;
-          Doc.indent
-            (Doc.concat
-               [
-                 Doc.softLine;
-                 Doc.join
-                   ~sep:(Doc.concat [Doc.comma; Doc.line])
-                   (List.map
-                      (fun ld ->
-                        let doc = printLabelDeclaration ~state ld cmtTbl in
-                        printComments doc cmtTbl ld.Parsetree.pld_loc)
-                      lds);
-               ]);
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rbrace;
-          Doc.rparen;
-        ]
-    in
-    if indent then Doc.indent args else args
-
-and printLabelDeclaration ~state (ld : Parsetree.label_declaration) cmtTbl =
-  let attrs =
-    printAttributes ~state ~loc:ld.pld_name.loc ld.pld_attributes cmtTbl
-  in
-  let mutableFlag =
-    match ld.pld_mutable with
-    | Mutable -> Doc.text "mutable "
-    | Immutable -> Doc.nil
-  in
-  let name, isDot =
-    let doc, isDot =
-      if ld.pld_name.txt = "..." then (Doc.text ld.pld_name.txt, true)
-      else (printIdentLike ld.pld_name.txt, false)
-    in
-    (printComments doc cmtTbl ld.pld_name.loc, isDot)
-  in
-  let optional = printOptionalLabel ld.pld_attributes in
-  Doc.group
-    (Doc.concat
-       [
-         attrs;
-         mutableFlag;
-         name;
-         optional;
-         (if isDot then Doc.nil else Doc.text ": ");
-         printTypExpr ~state ld.pld_type cmtTbl;
-       ])
-
-and printTypExpr ~(state : State.t) (typExpr : Parsetree.core_type) cmtTbl =
-  let printArrow ~uncurried ?(arity = max_int) typExpr =
-    let attrsBefore, args, returnType =
-      ParsetreeViewer.arrowType ~arity typExpr
-    in
-    let dotted, attrsBefore =
-      let dotted =
-        state.uncurried_config |> Res_uncurried.getDotted ~uncurried
-      in
-      (* Converting .ml code to .res requires processing uncurried attributes *)
-      let hasBs, attrs = ParsetreeViewer.processBsAttribute attrsBefore in
-      (dotted || hasBs, attrs)
-    in
-    let returnTypeNeedsParens =
-      match returnType.ptyp_desc with
-      | Ptyp_alias _ -> true
-      | _ -> false
-    in
-    let returnDoc =
-      let doc = printTypExpr ~state returnType cmtTbl in
-      if returnTypeNeedsParens then Doc.concat [Doc.lparen; doc; Doc.rparen]
-      else doc
-    in
-    match args with
-    | [] -> Doc.nil
-    | [([], Nolabel, n)] when not dotted ->
-      let hasAttrsBefore = not (attrsBefore = []) in
-      let attrs =
-        if hasAttrsBefore then
-          printAttributes ~state ~inline:true attrsBefore cmtTbl
-        else Doc.nil
-      in
-      let typDoc =
-        let doc = printTypExpr ~state n cmtTbl in
-        match n.ptyp_desc with
-        | Ptyp_arrow _ | Ptyp_tuple _ | Ptyp_alias _ -> addParens doc
-        | _ when Ast_uncurried.coreTypeIsUncurriedFun n -> addParens doc
-        | _ -> doc
-      in
-      Doc.group
-        (Doc.concat
-           [
-             Doc.group attrs;
-             Doc.group
-               (if hasAttrsBefore then
-                  Doc.concat
-                    [
-                      Doc.lparen;
-                      Doc.indent
-                        (Doc.concat
-                           [Doc.softLine; typDoc; Doc.text " => "; returnDoc]);
-                      Doc.softLine;
-                      Doc.rparen;
-                    ]
-                else Doc.concat [typDoc; Doc.text " => "; returnDoc]);
-           ])
-    | args ->
-      let attrs = printAttributes ~state ~inline:true attrsBefore cmtTbl in
-      let renderedArgs =
-        Doc.concat
-          [
-            attrs;
-            Doc.text "(";
-            Doc.indent
-              (Doc.concat
-                 [
-                   Doc.softLine;
-                   (if dotted then Doc.concat [Doc.dot; Doc.space] else Doc.nil);
-                   Doc.join
-                     ~sep:(Doc.concat [Doc.comma; Doc.line])
-                     (List.map
-                        (fun tp -> printTypeParameter ~state tp cmtTbl)
-                        args);
-                 ]);
-            Doc.trailingComma;
-            Doc.softLine;
-            Doc.text ")";
-          ]
-      in
-      Doc.group (Doc.concat [renderedArgs; Doc.text " => "; returnDoc])
-  in
-  let renderedType =
-    match typExpr.ptyp_desc with
-    | Ptyp_any -> Doc.text "_"
-    | Ptyp_var var ->
-      Doc.concat [Doc.text "'"; printIdentLike ~allowUident:true var]
-    | Ptyp_extension extension ->
-      printExtension ~state ~atModuleLvl:false extension cmtTbl
-    | Ptyp_alias (typ, alias) ->
-      let typ =
-        (* Technically type t = (string, float) => unit as 'x, doesn't require
-         * parens around the arrow expression. This is very confusing though.
-         * Is the "as" part of "unit" or "(string, float) => unit". By printing
-         * parens we guide the user towards its meaning.*)
-        let needsParens =
-          match typ.ptyp_desc with
-          | Ptyp_arrow _ -> true
-          | _ when Ast_uncurried.coreTypeIsUncurriedFun typ -> true
-          | _ -> false
-        in
-        let doc = printTypExpr ~state typ cmtTbl in
-        if needsParens then Doc.concat [Doc.lparen; doc; Doc.rparen] else doc
-      in
-      Doc.concat
-        [typ; Doc.text " as "; Doc.concat [Doc.text "'"; printIdentLike alias]]
-    (* object printings *)
-    | Ptyp_object (fields, openFlag) ->
-      printObject ~state ~inline:false fields openFlag cmtTbl
-    | Ptyp_arrow _ -> printArrow ~uncurried:false typExpr
-    | Ptyp_constr _ when Ast_uncurried.coreTypeIsUncurriedFun typExpr ->
-      let arity, tArg = Ast_uncurried.coreTypeExtractUncurriedFun typExpr in
-      printArrow ~uncurried:true ~arity tArg
-    | Ptyp_constr (longidentLoc, [{ptyp_desc = Ptyp_object (fields, openFlag)}])
-      ->
-      (* for foo<{"a": b}>, when the object is long and needs a line break, we
-         want the <{ and }> to stay hugged together *)
-      let constrName = printLidentPath longidentLoc cmtTbl in
-      Doc.concat
-        [
-          constrName;
-          Doc.lessThan;
-          printObject ~state ~inline:true fields openFlag cmtTbl;
-          Doc.greaterThan;
-        ]
-    | Ptyp_constr (longidentLoc, [{ptyp_desc = Parsetree.Ptyp_tuple tuple}]) ->
-      let constrName = printLidentPath longidentLoc cmtTbl in
-      Doc.group
-        (Doc.concat
-           [
-             constrName;
-             Doc.lessThan;
-             printTupleType ~state ~inline:true tuple cmtTbl;
-             Doc.greaterThan;
-           ])
-    | Ptyp_constr (longidentLoc, constrArgs) -> (
-      let constrName = printLidentPath longidentLoc cmtTbl in
-      match constrArgs with
-      | [] -> constrName
-      | _args ->
-        Doc.group
-          (Doc.concat
-             [
-               constrName;
-               Doc.lessThan;
-               Doc.indent
-                 (Doc.concat
-                    [
-                      Doc.softLine;
-                      Doc.join
-                        ~sep:(Doc.concat [Doc.comma; Doc.line])
-                        (List.map
-                           (fun typexpr -> printTypExpr ~state typexpr cmtTbl)
-                           constrArgs);
-                    ]);
-               Doc.trailingComma;
-               Doc.softLine;
-               Doc.greaterThan;
-             ]))
-    | Ptyp_tuple types -> printTupleType ~state ~inline:false types cmtTbl
-    | Ptyp_poly ([], typ) -> printTypExpr ~state typ cmtTbl
-    | Ptyp_poly (stringLocs, typ) ->
-      Doc.concat
-        [
-          Doc.join ~sep:Doc.space
-            (List.map
-               (fun {Location.txt; loc} ->
-                 let doc = Doc.concat [Doc.text "'"; Doc.text txt] in
-                 printComments doc cmtTbl loc)
-               stringLocs);
-          Doc.dot;
-          Doc.space;
-          printTypExpr ~state typ cmtTbl;
-        ]
-    | Ptyp_package packageType ->
-      printPackageType ~state ~printModuleKeywordAndParens:true packageType
-        cmtTbl
-    | Ptyp_class _ -> Doc.text "classes are not supported in types"
-    | Ptyp_variant (rowFields, closedFlag, labelsOpt) ->
-      let forceBreak =
-        typExpr.ptyp_loc.Location.loc_start.pos_lnum
-        < typExpr.ptyp_loc.loc_end.pos_lnum
-      in
-      let printRowField = function
-        | Parsetree.Rtag ({txt; loc}, attrs, true, []) ->
-          let doc =
-            Doc.group
-              (Doc.concat
-                 [
-                   printAttributes ~state attrs cmtTbl;
-                   Doc.concat [Doc.text "#"; printPolyVarIdent txt];
-                 ])
-          in
-          printComments doc cmtTbl loc
-        | Rtag ({txt}, attrs, truth, types) ->
-          let doType t =
-            match t.Parsetree.ptyp_desc with
-            | Ptyp_tuple _ -> printTypExpr ~state t cmtTbl
-            | _ ->
-              Doc.concat [Doc.lparen; printTypExpr ~state t cmtTbl; Doc.rparen]
-          in
-          let printedTypes = List.map doType types in
-          let cases =
-            Doc.join ~sep:(Doc.concat [Doc.line; Doc.text "& "]) printedTypes
-          in
-          let cases =
-            if truth then Doc.concat [Doc.line; Doc.text "& "; cases] else cases
-          in
-          Doc.group
-            (Doc.concat
-               [
-                 printAttributes ~state attrs cmtTbl;
-                 Doc.concat [Doc.text "#"; printPolyVarIdent txt];
-                 cases;
-               ])
-        | Rinherit coreType -> printTypExpr ~state coreType cmtTbl
-      in
-      let docs = List.map printRowField rowFields in
-      let cases = Doc.join ~sep:(Doc.concat [Doc.line; Doc.text "| "]) docs in
-      let cases =
-        if docs = [] then cases
-        else Doc.concat [Doc.ifBreaks (Doc.text "| ") Doc.nil; cases]
-      in
-      let openingSymbol =
-        if closedFlag = Open then Doc.concat [Doc.greaterThan; Doc.line]
-        else if labelsOpt = None then Doc.softLine
-        else Doc.concat [Doc.lessThan; Doc.line]
-      in
-      let labels =
-        match labelsOpt with
-        | None | Some [] -> Doc.nil
-        | Some labels ->
-          Doc.concat
-            (List.map
-               (fun label ->
-                 Doc.concat [Doc.line; Doc.text "#"; printPolyVarIdent label])
-               labels)
-      in
-      let closingSymbol =
-        match labelsOpt with
-        | None | Some [] -> Doc.nil
-        | _ -> Doc.text " >"
-      in
-      Doc.breakableGroup ~forceBreak
-        (Doc.concat
-           [
-             Doc.lbracket;
-             Doc.indent
-               (Doc.concat [openingSymbol; cases; closingSymbol; labels]);
-             Doc.softLine;
-             Doc.rbracket;
-           ])
-  in
-  let shouldPrintItsOwnAttributes =
-    match typExpr.ptyp_desc with
-    | Ptyp_arrow _ (* es6 arrow types print their own attributes *) -> true
-    | _ -> false
-  in
-  let doc =
-    match typExpr.ptyp_attributes with
-    | _ :: _ as attrs when not shouldPrintItsOwnAttributes ->
-      Doc.group (Doc.concat [printAttributes ~state attrs cmtTbl; renderedType])
-    | _ -> renderedType
-  in
-  printComments doc cmtTbl typExpr.ptyp_loc
-
-and printObject ~state ~inline fields openFlag cmtTbl =
-  let doc =
-    match fields with
-    | [] ->
-      Doc.concat
-        [
-          Doc.lbrace;
-          (match openFlag with
-          | Asttypes.Closed -> Doc.dot
-          | Open -> Doc.dotdot);
-          Doc.rbrace;
-        ]
-    | fields ->
-      Doc.concat
-        [
-          Doc.lbrace;
-          (match openFlag with
-          | Asttypes.Closed -> Doc.nil
-          | Open -> (
-            match fields with
-            (* handle `type t = {.. ...objType, "x": int}`
-             * .. and ... should have a space in between *)
-            | Oinherit _ :: _ -> Doc.text ".. "
-            | _ -> Doc.dotdot));
-          Doc.indent
-            (Doc.concat
-               [
-                 Doc.softLine;
-                 Doc.join
-                   ~sep:(Doc.concat [Doc.comma; Doc.line])
-                   (List.map
-                      (fun field -> printObjectField ~state field cmtTbl)
-                      fields);
-               ]);
-          Doc.trailingComma;
-          Doc.softLine;
-          Doc.rbrace;
-        ]
-  in
-  if inline then doc else Doc.group doc
-
-and printTupleType ~state ~inline (types : Parsetree.core_type list) cmtTbl =
-  let tuple =
-    Doc.concat
-      [
-        Doc.lparen;
-        Doc.indent
-          (Doc.concat
-             [
-               Doc.softLine;
-               Doc.join
-                 ~sep:(Doc.concat [Doc.comma; Doc.line])
-                 (List.map
-                    (fun typexpr -> printTypExpr ~state typexpr cmtTbl)
-                    types);
-             ]);
-        Doc.trailingComma;
-        Doc.softLine;
-        Doc.rparen;
-      ]
-  in
-  if inline == false then Doc.group tuple else tuple
-
-and printObjectField ~state (field : Parsetree.object_field) cmtTbl =
-  match field with
-  | Otag (labelLoc, attrs, typ) ->
-    let lbl =
-      let doc = Doc.text ("\"" ^ labelLoc.txt ^ "\"") in
-      printComments doc cmtTbl labelLoc.loc
-    in
-    let doc =
-      Doc.concat
-        [
-          printAttributes ~state ~loc:labelLoc.loc attrs cmtTbl;
-          lbl;
-          Doc.text ": ";
-          printTypExpr ~state typ cmtTbl;
-        ]
-    in
-    let cmtLoc = {labelLoc.loc with loc_end = typ.ptyp_loc.loc_end} in
-    printComments doc cmtTbl cmtLoc
-  | Oinherit typexpr ->
-    Doc.concat [Doc.dotdotdot; printTypExpr ~state typexpr cmtTbl]
-
-(* es6 arrow type arg
- * type t = (~foo: string, ~bar: float=?, unit) => unit
- * i.e. ~foo: string, ~bar: float *)
-and printTypeParameter ~state (attrs, lbl, typ) cmtTbl =
-  (* Converting .ml code to .res requires processing uncurried attributes *)
-  let hasBs, attrs = ParsetreeViewer.processBsAttribute attrs in
-  let dotted = if hasBs then Doc.concat [Doc.dot; Doc.space] else Doc.nil in
-  let attrs = printAttributes ~state attrs cmtTbl in
-  let label =
-    match lbl with
-    | Asttypes.Nolabel -> Doc.nil
-    | Labelled lbl ->
-      Doc.concat [Doc.text "~"; printIdentLike lbl; Doc.text ": "]
-    | Optional lbl ->
-      Doc.concat [Doc.text "~"; printIdentLike lbl; Doc.text ": "]
-  in
-  let optionalIndicator =
-    match lbl with
-    | Asttypes.Nolabel | Labelled _ -> Doc.nil
-    | Optional _lbl -> Doc.text "=?"
-  in
-  let loc, typ =
-    match typ.ptyp_attributes with
-    | ({Location.txt = "res.namedArgLoc"; loc}, _) :: attrs ->
-      ( {loc with loc_end = typ.ptyp_loc.loc_end},
-        {typ with ptyp_attributes = attrs} )
-    | _ -> (typ.ptyp_loc, typ)
-  in
-  let doc =
-    Doc.group
-      (Doc.concat
-         [
-           dotted;
-           attrs;
-           label;
-           printTypExpr ~state typ cmtTbl;
-           optionalIndicator;
-         ])
-  in
-  printComments doc cmtTbl loc
-
-and printValueBinding ~state ~recFlag (vb : Parsetree.value_binding) cmtTbl i =
-  let attrs =
-    printAttributes ~state ~loc:vb.pvb_pat.ppat_loc vb.pvb_attributes cmtTbl
-  in
-  let header =
-    if i == 0 then Doc.concat [Doc.text "let "; recFlag] else Doc.text "and "
-  in
-  match vb with
-  | {
-   pvb_pat =
-     {
-       ppat_desc =
-         Ppat_constraint (pattern, ({ptyp_desc = Ptyp_poly _} as patTyp));
-     };
-   pvb_expr = {pexp_desc = Pexp_newtype _} as expr;
-  } -> (
-    let _uncurried, _attrs, parameters, returnExpr =
-      ParsetreeViewer.funExpr expr
-    in
-    let abstractType =
-      match parameters with
-      | [NewTypes {locs = vars}] ->
-        Doc.concat
-          [
-            Doc.text "type ";
-            Doc.join ~sep:Doc.space
-              (List.map (fun var -> Doc.text var.Asttypes.txt) vars);
-            Doc.dot;
-          ]
-      | _ -> Doc.nil
-    in
-    match returnExpr.pexp_desc with
-    | Pexp_constraint (expr, typ) ->
-      Doc.group
-        (Doc.concat
-           [
-             attrs;
-             header;
-             printPattern ~state pattern cmtTbl;
-             Doc.text ":";
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.line;
-                    abstractType;
-                    Doc.space;
-                    printTypExpr ~state typ cmtTbl;
-                    Doc.text " =";
-                    Doc.concat
-                      [Doc.line; printExpressionWithComments ~state expr cmtTbl];
-                  ]);
-           ])
-    | _ ->
-      (* Example:
-       * let cancel_and_collect_callbacks:
-       *   'a 'u 'c. (list<packed_callbacks>, promise<'a, 'u, 'c>) => list<packed_callbacks> =         *  (type x, callbacks_accumulator, p: promise<_, _, c>)
-       *)
-      Doc.group
-        (Doc.concat
-           [
-             attrs;
-             header;
-             printPattern ~state pattern cmtTbl;
-             Doc.text ":";
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.line;
-                    abstractType;
-                    Doc.space;
-                    printTypExpr ~state patTyp cmtTbl;
-                    Doc.text " =";
-                    Doc.concat
-                      [Doc.line; printExpressionWithComments ~state expr cmtTbl];
-                  ]);
-           ]))
-  | _ ->
-    let optBraces, expr = ParsetreeViewer.processBracesAttr vb.pvb_expr in
-    let printedExpr =
-      let doc = printExpressionWithComments ~state vb.pvb_expr cmtTbl in
-      match Parens.expr vb.pvb_expr with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc expr braces
-      | Nothing -> doc
-    in
-    let patternDoc = printPattern ~state vb.pvb_pat cmtTbl in
-    (*
-     * we want to optimize the layout of one pipe:
-     *   let tbl = data->Js.Array2.reduce((map, curr) => {
-     *     ...
-     *   })
-     * important is that we don't do this for multiple pipes:
-     *   let decoratorTags =
-     *     items
-     *     ->Js.Array2.filter(items => {items.category === Decorators})
-     *     ->Belt.Array.map(...)
-     * Multiple pipes chained together lend themselves more towards the last layout.
-     *)
-    if ParsetreeViewer.isSinglePipeExpr vb.pvb_expr then
-      Doc.customLayout
-        [
-          Doc.group
-            (Doc.concat
-               [
-                 attrs; header; patternDoc; Doc.text " ="; Doc.space; printedExpr;
-               ]);
-          Doc.group
-            (Doc.concat
-               [
-                 attrs;
-                 header;
-                 patternDoc;
-                 Doc.text " =";
-                 Doc.indent (Doc.concat [Doc.line; printedExpr]);
-               ]);
-        ]
-    else
-      let shouldIndent =
-        match optBraces with
-        | Some _ -> false
-        | _ -> (
-          ParsetreeViewer.isBinaryExpression expr
-          ||
-          match vb.pvb_expr with
-          | {
-           pexp_attributes = [({Location.txt = "res.ternary"}, _)];
-           pexp_desc = Pexp_ifthenelse (ifExpr, _, _);
-          } ->
-            ParsetreeViewer.isBinaryExpression ifExpr
-            || ParsetreeViewer.hasAttributes ifExpr.pexp_attributes
-          | {pexp_desc = Pexp_newtype _} -> false
-          | {pexp_attributes = [({Location.txt = "res.taggedTemplate"}, _)]} ->
-            false
-          | e ->
-            ParsetreeViewer.hasAttributes e.pexp_attributes
-            || ParsetreeViewer.isArrayAccess e)
-      in
-      Doc.group
-        (Doc.concat
-           [
-             attrs;
-             header;
-             patternDoc;
-             Doc.text " =";
-             (if shouldIndent then
-                Doc.indent (Doc.concat [Doc.line; printedExpr])
-              else Doc.concat [Doc.space; printedExpr]);
-           ])
-
-and printPackageType ~state ~printModuleKeywordAndParens
-    (packageType : Parsetree.package_type) cmtTbl =
-  let doc =
-    match packageType with
-    | longidentLoc, [] ->
-      Doc.group (Doc.concat [printLongidentLocation longidentLoc cmtTbl])
-    | longidentLoc, packageConstraints ->
-      Doc.group
-        (Doc.concat
-           [
-             printLongidentLocation longidentLoc cmtTbl;
-             printPackageConstraints ~state packageConstraints cmtTbl;
-             Doc.softLine;
-           ])
-  in
-  if printModuleKeywordAndParens then
-    Doc.concat [Doc.text "module("; doc; Doc.rparen]
-  else doc
-
-and printPackageConstraints ~state packageConstraints cmtTbl =
-  Doc.concat
-    [
-      Doc.text " with";
-      Doc.indent
-        (Doc.concat
-           [
-             Doc.line;
-             Doc.join ~sep:Doc.line
-               (List.mapi
-                  (fun i pc ->
-                    let longident, typexpr = pc in
-                    let cmtLoc =
-                      {
-                        longident.Asttypes.loc with
-                        loc_end = typexpr.Parsetree.ptyp_loc.loc_end;
-                      }
-                    in
-                    let doc = printPackageConstraint ~state i cmtTbl pc in
-                    printComments doc cmtTbl cmtLoc)
-                  packageConstraints);
-           ]);
-    ]
-
-and printPackageConstraint ~state i cmtTbl (longidentLoc, typ) =
-  let prefix = if i == 0 then Doc.text "type " else Doc.text "and type " in
-  Doc.concat
-    [
-      prefix;
-      printLongidentLocation longidentLoc cmtTbl;
-      Doc.text " = ";
-      printTypExpr ~state typ cmtTbl;
-    ]
-
-and printExtension ~state ~atModuleLvl (stringLoc, payload) cmtTbl =
-  let txt = convertBsExtension stringLoc.Location.txt in
-  let extName =
-    let doc =
-      Doc.concat
-        [
-          Doc.text "%";
-          (if atModuleLvl then Doc.text "%" else Doc.nil);
-          Doc.text txt;
-        ]
-    in
-    printComments doc cmtTbl stringLoc.Location.loc
-  in
-  Doc.group (Doc.concat [extName; printPayload ~state payload cmtTbl])
-
-and printPattern ~state (p : Parsetree.pattern) cmtTbl =
-  let patternWithoutAttributes =
-    match p.ppat_desc with
-    | Ppat_any -> Doc.text "_"
-    | Ppat_var var -> printIdentLike var.txt
-    | Ppat_constant c ->
-      let templateLiteral =
-        ParsetreeViewer.hasTemplateLiteralAttr p.ppat_attributes
-      in
-      printConstant ~templateLiteral c
-    | Ppat_tuple patterns ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.lparen;
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    Doc.join
-                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                      (List.map
-                         (fun pat -> printPattern ~state pat cmtTbl)
-                         patterns);
-                  ]);
-             Doc.trailingComma;
-             Doc.softLine;
-             Doc.rparen;
-           ])
-    | Ppat_array [] ->
-      Doc.concat
-        [Doc.lbracket; printCommentsInside cmtTbl p.ppat_loc; Doc.rbracket]
-    | Ppat_array patterns ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.text "[";
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    Doc.join
-                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                      (List.map
-                         (fun pat -> printPattern ~state pat cmtTbl)
-                         patterns);
-                  ]);
-             Doc.trailingComma;
-             Doc.softLine;
-             Doc.text "]";
-           ])
-    | Ppat_construct ({txt = Longident.Lident "()"}, _) ->
-      Doc.concat [Doc.lparen; printCommentsInside cmtTbl p.ppat_loc; Doc.rparen]
-    | Ppat_construct ({txt = Longident.Lident "[]"}, _) ->
-      Doc.concat
-        [Doc.text "list{"; printCommentsInside cmtTbl p.ppat_loc; Doc.rbrace]
-    | Ppat_construct ({txt = Longident.Lident "::"}, _) ->
-      let patterns, tail =
-        ParsetreeViewer.collectPatternsFromListConstruct [] p
-      in
-      let shouldHug =
-        match (patterns, tail) with
-        | [pat], {ppat_desc = Ppat_construct ({txt = Longident.Lident "[]"}, _)}
-          when ParsetreeViewer.isHuggablePattern pat ->
-          true
-        | _ -> false
-      in
-      let children =
-        Doc.concat
-          [
-            (if shouldHug then Doc.nil else Doc.softLine);
-            Doc.join
-              ~sep:(Doc.concat [Doc.text ","; Doc.line])
-              (List.map (fun pat -> printPattern ~state pat cmtTbl) patterns);
-            (match tail.Parsetree.ppat_desc with
-            | Ppat_construct ({txt = Longident.Lident "[]"}, _) -> Doc.nil
-            | _ ->
-              let doc =
-                Doc.concat [Doc.text "..."; printPattern ~state tail cmtTbl]
-              in
-              let tail = printComments doc cmtTbl tail.ppat_loc in
-              Doc.concat [Doc.text ","; Doc.line; tail]);
-          ]
-      in
-      Doc.group
-        (Doc.concat
-           [
-             Doc.text "list{";
-             (if shouldHug then children
-              else
-                Doc.concat
-                  [
-                    Doc.indent children;
-                    Doc.ifBreaks (Doc.text ",") Doc.nil;
-                    Doc.softLine;
-                  ]);
-             Doc.rbrace;
-           ])
-    | Ppat_construct (constrName, constructorArgs) ->
-      let constrName = printLongidentLocation constrName cmtTbl in
-      let argsDoc =
-        match constructorArgs with
-        | None -> Doc.nil
-        | Some
-            {
-              ppat_loc;
-              ppat_desc = Ppat_construct ({txt = Longident.Lident "()"}, _);
-            } ->
-          Doc.concat
-            [Doc.lparen; printCommentsInside cmtTbl ppat_loc; Doc.rparen]
-        | Some {ppat_desc = Ppat_tuple []; ppat_loc = loc} ->
-          Doc.concat [Doc.lparen; printCommentsInside cmtTbl loc; Doc.rparen]
-        (* Some((1, 2) *)
-        | Some {ppat_desc = Ppat_tuple [({ppat_desc = Ppat_tuple _} as arg)]} ->
-          Doc.concat [Doc.lparen; printPattern ~state arg cmtTbl; Doc.rparen]
-        | Some {ppat_desc = Ppat_tuple patterns} ->
-          Doc.concat
-            [
-              Doc.lparen;
-              Doc.indent
-                (Doc.concat
-                   [
-                     Doc.softLine;
-                     Doc.join
-                       ~sep:(Doc.concat [Doc.comma; Doc.line])
-                       (List.map
-                          (fun pat -> printPattern ~state pat cmtTbl)
-                          patterns);
-                   ]);
-              Doc.trailingComma;
-              Doc.softLine;
-              Doc.rparen;
-            ]
-        | Some arg ->
-          let argDoc = printPattern ~state arg cmtTbl in
-          let shouldHug = ParsetreeViewer.isHuggablePattern arg in
-          Doc.concat
-            [
-              Doc.lparen;
-              (if shouldHug then argDoc
-               else
-                 Doc.concat
-                   [
-                     Doc.indent (Doc.concat [Doc.softLine; argDoc]);
-                     Doc.trailingComma;
-                     Doc.softLine;
-                   ]);
-              Doc.rparen;
-            ]
-      in
-      Doc.group (Doc.concat [constrName; argsDoc])
-    | Ppat_variant (label, None) ->
-      Doc.concat [Doc.text "#"; printPolyVarIdent label]
-    | Ppat_variant (label, variantArgs) ->
-      let variantName = Doc.concat [Doc.text "#"; printPolyVarIdent label] in
-      let argsDoc =
-        match variantArgs with
-        | None -> Doc.nil
-        | Some {ppat_desc = Ppat_construct ({txt = Longident.Lident "()"}, _)}
-          ->
-          Doc.text "()"
-        | Some {ppat_desc = Ppat_tuple []; ppat_loc = loc} ->
-          Doc.concat [Doc.lparen; printCommentsInside cmtTbl loc; Doc.rparen]
-        (* Some((1, 2) *)
-        | Some {ppat_desc = Ppat_tuple [({ppat_desc = Ppat_tuple _} as arg)]} ->
-          Doc.concat [Doc.lparen; printPattern ~state arg cmtTbl; Doc.rparen]
-        | Some {ppat_desc = Ppat_tuple patterns} ->
-          Doc.concat
-            [
-              Doc.lparen;
-              Doc.indent
-                (Doc.concat
-                   [
-                     Doc.softLine;
-                     Doc.join
-                       ~sep:(Doc.concat [Doc.comma; Doc.line])
-                       (List.map
-                          (fun pat -> printPattern ~state pat cmtTbl)
-                          patterns);
-                   ]);
-              Doc.trailingComma;
-              Doc.softLine;
-              Doc.rparen;
-            ]
-        | Some arg ->
-          let argDoc = printPattern ~state arg cmtTbl in
-          let shouldHug = ParsetreeViewer.isHuggablePattern arg in
-          Doc.concat
-            [
-              Doc.lparen;
-              (if shouldHug then argDoc
-               else
-                 Doc.concat
-                   [
-                     Doc.indent (Doc.concat [Doc.softLine; argDoc]);
-                     Doc.trailingComma;
-                     Doc.softLine;
-                   ]);
-              Doc.rparen;
-            ]
-      in
-      Doc.group (Doc.concat [variantName; argsDoc])
-    | Ppat_type ident ->
-      Doc.concat [Doc.text "#..."; printIdentPath ident cmtTbl]
-    | Ppat_record (rows, openFlag) ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.lbrace;
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    Doc.join
-                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                      (List.map
-                         (fun row -> printPatternRecordRow ~state row cmtTbl)
-                         rows);
-                    (match openFlag with
-                    | Open -> Doc.concat [Doc.text ","; Doc.line; Doc.text "_"]
-                    | Closed -> Doc.nil);
-                  ]);
-             Doc.ifBreaks (Doc.text ",") Doc.nil;
-             Doc.softLine;
-             Doc.rbrace;
-           ])
-    | Ppat_exception p ->
-      let needsParens =
-        match p.ppat_desc with
-        | Ppat_or (_, _) | Ppat_alias (_, _) -> true
-        | _ -> false
-      in
-      let pat =
-        let p = printPattern ~state p cmtTbl in
-        if needsParens then Doc.concat [Doc.text "("; p; Doc.text ")"] else p
-      in
-      Doc.group (Doc.concat [Doc.text "exception"; Doc.line; pat])
-    | Ppat_or _ ->
-      (* Blue | Red | Green -> [Blue; Red; Green] *)
-      let orChain = ParsetreeViewer.collectOrPatternChain p in
-      let docs =
-        List.mapi
-          (fun i pat ->
-            let patternDoc = printPattern ~state pat cmtTbl in
-            Doc.concat
-              [
-                (if i == 0 then Doc.nil else Doc.concat [Doc.line; Doc.text "| "]);
-                (match pat.ppat_desc with
-                (* (Blue | Red) | (Green | Black) | White *)
-                | Ppat_or _ -> addParens patternDoc
-                | _ -> patternDoc);
-              ])
-          orChain
-      in
-      let isSpreadOverMultipleLines =
-        match (orChain, List.rev orChain) with
-        | first :: _, last :: _ ->
-          first.ppat_loc.loc_start.pos_lnum < last.ppat_loc.loc_end.pos_lnum
-        | _ -> false
-      in
-      Doc.breakableGroup ~forceBreak:isSpreadOverMultipleLines (Doc.concat docs)
-    | Ppat_extension ext -> printExtension ~state ~atModuleLvl:false ext cmtTbl
-    | Ppat_lazy p ->
-      let needsParens =
-        match p.ppat_desc with
-        | Ppat_or (_, _) | Ppat_alias (_, _) -> true
-        | _ -> false
-      in
-      let pat =
-        let p = printPattern ~state p cmtTbl in
-        if needsParens then Doc.concat [Doc.text "("; p; Doc.text ")"] else p
-      in
-      Doc.concat [Doc.text "lazy "; pat]
-    | Ppat_alias (p, aliasLoc) ->
-      let needsParens =
-        match p.ppat_desc with
-        | Ppat_or (_, _) | Ppat_alias (_, _) -> true
-        | _ -> false
-      in
-      let renderedPattern =
-        let p = printPattern ~state p cmtTbl in
-        if needsParens then Doc.concat [Doc.text "("; p; Doc.text ")"] else p
-      in
-      Doc.concat
-        [renderedPattern; Doc.text " as "; printStringLoc aliasLoc cmtTbl]
-    (* Note: module(P : S) is represented as *)
-    (* Ppat_constraint(Ppat_unpack, Ptyp_package) *)
-    | Ppat_constraint
-        ( {ppat_desc = Ppat_unpack stringLoc},
-          {ptyp_desc = Ptyp_package packageType; ptyp_loc} ) ->
-      Doc.concat
-        [
-          Doc.text "module(";
-          printComments (Doc.text stringLoc.txt) cmtTbl stringLoc.loc;
-          Doc.text ": ";
-          printComments
-            (printPackageType ~state ~printModuleKeywordAndParens:false
-               packageType cmtTbl)
-            cmtTbl ptyp_loc;
-          Doc.rparen;
-        ]
-    | Ppat_constraint (pattern, typ) ->
-      Doc.concat
-        [
-          printPattern ~state pattern cmtTbl;
-          Doc.text ": ";
-          printTypExpr ~state typ cmtTbl;
-        ]
-    (* Note: module(P : S) is represented as *)
-    (* Ppat_constraint(Ppat_unpack, Ptyp_package) *)
-    | Ppat_unpack stringLoc ->
-      Doc.concat
-        [
-          Doc.text "module(";
-          printComments (Doc.text stringLoc.txt) cmtTbl stringLoc.loc;
-          Doc.rparen;
-        ]
-    | Ppat_interval (a, b) ->
-      Doc.concat [printConstant a; Doc.text " .. "; printConstant b]
-    | Ppat_open _ -> Doc.nil
-  in
-  let doc =
-    match p.ppat_attributes with
-    | [] -> patternWithoutAttributes
-    | attrs ->
-      Doc.group
-        (Doc.concat
-           [printAttributes ~state attrs cmtTbl; patternWithoutAttributes])
-  in
-  printComments doc cmtTbl p.ppat_loc
-
-and printPatternRecordRow ~state row cmtTbl =
-  match row with
-  (* punned {x}*)
-  | ( ({Location.txt = Longident.Lident ident} as longident),
-      {Parsetree.ppat_desc = Ppat_var {txt; _}; ppat_attributes} )
-    when ident = txt ->
-    Doc.concat
-      [
-        printOptionalLabel ppat_attributes;
-        printAttributes ~state ppat_attributes cmtTbl;
-        printLidentPath longident cmtTbl;
-      ]
-  | longident, pattern ->
-    let locForComments =
-      {longident.loc with loc_end = pattern.Parsetree.ppat_loc.loc_end}
-    in
-    let rhsDoc =
-      let doc = printPattern ~state pattern cmtTbl in
-      let doc =
-        if Parens.patternRecordRowRhs pattern then addParens doc else doc
-      in
-      Doc.concat [printOptionalLabel pattern.ppat_attributes; doc]
-    in
-    let doc =
-      Doc.group
-        (Doc.concat
-           [
-             printLidentPath longident cmtTbl;
-             Doc.text ":";
-             (if ParsetreeViewer.isHuggablePattern pattern then
-                Doc.concat [Doc.space; rhsDoc]
-              else Doc.indent (Doc.concat [Doc.line; rhsDoc]));
-           ])
-    in
-    printComments doc cmtTbl locForComments
-
-and printExpressionWithComments ~state expr cmtTbl : Doc.t =
-  let doc = printExpression ~state expr cmtTbl in
-  printComments doc cmtTbl expr.Parsetree.pexp_loc
-
-and printIfChain ~state pexp_attributes ifs elseExpr cmtTbl =
-  let ifDocs =
-    Doc.join ~sep:Doc.space
-      (List.mapi
-         (fun i (outerLoc, ifExpr, thenExpr) ->
-           let ifTxt = if i > 0 then Doc.text "else if " else Doc.text "if " in
-           let doc =
-             match ifExpr with
-             | ParsetreeViewer.If ifExpr ->
-               let condition =
-                 if ParsetreeViewer.isBlockExpr ifExpr then
-                   printExpressionBlock ~state ~braces:true ifExpr cmtTbl
-                 else
-                   let doc = printExpressionWithComments ~state ifExpr cmtTbl in
-                   match Parens.expr ifExpr with
-                   | Parens.Parenthesized -> addParens doc
-                   | Braced braces -> printBraces doc ifExpr braces
-                   | Nothing -> Doc.ifBreaks (addParens doc) doc
-               in
-               Doc.concat
-                 [
-                   ifTxt;
-                   Doc.group condition;
-                   Doc.space;
-                   (let thenExpr =
-                      match ParsetreeViewer.processBracesAttr thenExpr with
-                      (* This case only happens when coming from Reason, we strip braces *)
-                      | Some _, expr -> expr
-                      | _ -> thenExpr
-                    in
-                    printExpressionBlock ~state ~braces:true thenExpr cmtTbl);
-                 ]
-             | IfLet (pattern, conditionExpr) ->
-               let conditionDoc =
-                 let doc =
-                   printExpressionWithComments ~state conditionExpr cmtTbl
-                 in
-                 match Parens.expr conditionExpr with
-                 | Parens.Parenthesized -> addParens doc
-                 | Braced braces -> printBraces doc conditionExpr braces
-                 | Nothing -> doc
-               in
-               Doc.concat
-                 [
-                   ifTxt;
-                   Doc.text "let ";
-                   printPattern ~state pattern cmtTbl;
-                   Doc.text " = ";
-                   conditionDoc;
-                   Doc.space;
-                   printExpressionBlock ~state ~braces:true thenExpr cmtTbl;
-                 ]
-           in
-           printLeadingComments doc cmtTbl.leading outerLoc)
-         ifs)
-  in
-  let elseDoc =
-    match elseExpr with
-    | None -> Doc.nil
-    | Some expr ->
-      Doc.concat
-        [
-          Doc.text " else "; printExpressionBlock ~state ~braces:true expr cmtTbl;
-        ]
-  in
-  let attrs = ParsetreeViewer.filterFragileMatchAttributes pexp_attributes in
-  Doc.concat [printAttributes ~state attrs cmtTbl; ifDocs; elseDoc]
-
-and printExpression ~state (e : Parsetree.expression) cmtTbl =
-  let printArrow e =
-    let uncurried, attrsOnArrow, parameters, returnExpr =
-      ParsetreeViewer.funExpr e
-    in
-    let ParsetreeViewer.{async; bs; attributes = attrs} =
-      ParsetreeViewer.processFunctionAttributes attrsOnArrow
-    in
-    let uncurried = uncurried || bs in
-    let returnExpr, typConstraint =
-      match returnExpr.pexp_desc with
-      | Pexp_constraint (expr, typ) ->
-        ( {
-            expr with
-            pexp_attributes =
-              List.concat [expr.pexp_attributes; returnExpr.pexp_attributes];
-          },
-          Some typ )
-      | _ -> (returnExpr, None)
-    in
-    let hasConstraint =
-      match typConstraint with
-      | Some _ -> true
-      | None -> false
-    in
-    let parametersDoc =
-      printExprFunParameters ~state ~inCallback:NoCallback ~uncurried ~async
-        ~hasConstraint parameters cmtTbl
-    in
-    let returnExprDoc =
-      let optBraces, _ = ParsetreeViewer.processBracesAttr returnExpr in
-      let shouldInline =
-        match (returnExpr.pexp_desc, optBraces) with
-        | _, Some _ -> true
-        | ( ( Pexp_array _ | Pexp_tuple _
-            | Pexp_construct (_, Some _)
-            | Pexp_record _ ),
-            _ ) ->
-          true
-        | _ -> false
-      in
-      let shouldIndent =
-        match returnExpr.pexp_desc with
-        | Pexp_sequence _ | Pexp_let _ | Pexp_letmodule _ | Pexp_letexception _
-        | Pexp_open _ ->
-          false
-        | _ -> true
-      in
-      let returnDoc =
-        let doc = printExpressionWithComments ~state returnExpr cmtTbl in
-        match Parens.expr returnExpr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc returnExpr braces
-        | Nothing -> doc
-      in
-      if shouldInline then Doc.concat [Doc.space; returnDoc]
-      else
-        Doc.group
-          (if shouldIndent then Doc.indent (Doc.concat [Doc.line; returnDoc])
-           else Doc.concat [Doc.space; returnDoc])
-    in
-    let typConstraintDoc =
-      match typConstraint with
-      | Some typ ->
-        let typDoc =
-          let doc = printTypExpr ~state typ cmtTbl in
-          if Parens.arrowReturnTypExpr typ then addParens doc else doc
-        in
-        Doc.concat [Doc.text ": "; typDoc]
-      | _ -> Doc.nil
-    in
-    let attrs = printAttributes ~state attrs cmtTbl in
-    Doc.group
-      (Doc.concat
-         [attrs; parametersDoc; typConstraintDoc; Doc.text " =>"; returnExprDoc])
-  in
-  let uncurried = Ast_uncurried.exprIsUncurriedFun e in
-  let e_fun =
-    if uncurried then Ast_uncurried.exprExtractUncurriedFun e else e
-  in
-  let printedExpression =
-    match e_fun.pexp_desc with
-    | Pexp_fun
-        ( Nolabel,
-          None,
-          {ppat_desc = Ppat_var {txt = "__x"}},
-          {pexp_desc = Pexp_apply _} )
-    | Pexp_construct
-        ( {txt = Lident "Function$"},
-          Some
-            {
-              pexp_desc =
-                Pexp_fun
-                  ( Nolabel,
-                    None,
-                    {ppat_desc = Ppat_var {txt = "__x"}},
-                    {pexp_desc = Pexp_apply _} );
-            } ) ->
-      (* (__x) => f(a, __x, c) -----> f(a, _, c)  *)
-      printExpressionWithComments ~state
-        (ParsetreeViewer.rewriteUnderscoreApply e_fun)
-        cmtTbl
-    | Pexp_fun _ | Pexp_newtype _ -> printArrow e
-    | Parsetree.Pexp_constant c ->
-      printConstant ~templateLiteral:(ParsetreeViewer.isTemplateLiteral e) c
-    | Pexp_construct _ when ParsetreeViewer.hasJsxAttribute e.pexp_attributes ->
-      printJsxFragment ~state e cmtTbl
-    | Pexp_construct ({txt = Longident.Lident "()"}, _) -> Doc.text "()"
-    | Pexp_construct ({txt = Longident.Lident "[]"}, _) ->
-      Doc.concat
-        [Doc.text "list{"; printCommentsInside cmtTbl e.pexp_loc; Doc.rbrace]
-    | Pexp_construct ({txt = Longident.Lident "::"}, _) ->
-      let expressions, spread = ParsetreeViewer.collectListExpressions e in
-      let spreadDoc =
-        match spread with
-        | Some expr ->
-          Doc.concat
-            [
-              Doc.text ",";
-              Doc.line;
-              Doc.dotdotdot;
-              (let doc = printExpressionWithComments ~state expr cmtTbl in
-               match Parens.expr expr with
-               | Parens.Parenthesized -> addParens doc
-               | Braced braces -> printBraces doc expr braces
-               | Nothing -> doc);
-            ]
-        | None -> Doc.nil
-      in
-      Doc.group
-        (Doc.concat
-           [
-             Doc.text "list{";
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    Doc.join
-                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                      (List.map
-                         (fun expr ->
-                           let doc =
-                             printExpressionWithComments ~state expr cmtTbl
-                           in
-                           match Parens.expr expr with
-                           | Parens.Parenthesized -> addParens doc
-                           | Braced braces -> printBraces doc expr braces
-                           | Nothing -> doc)
-                         expressions);
-                    spreadDoc;
-                  ]);
-             Doc.trailingComma;
-             Doc.softLine;
-             Doc.rbrace;
-           ])
-    | Pexp_construct (longidentLoc, args) ->
-      let constr = printLongidentLocation longidentLoc cmtTbl in
-      let args =
-        match args with
-        | None -> Doc.nil
-        | Some {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)}
-          ->
-          Doc.text "()"
-        (* Some((1, 2)) *)
-        | Some {pexp_desc = Pexp_tuple [({pexp_desc = Pexp_tuple _} as arg)]} ->
-          Doc.concat
-            [
-              Doc.lparen;
-              (let doc = printExpressionWithComments ~state arg cmtTbl in
-               match Parens.expr arg with
-               | Parens.Parenthesized -> addParens doc
-               | Braced braces -> printBraces doc arg braces
-               | Nothing -> doc);
-              Doc.rparen;
-            ]
-        | Some {pexp_desc = Pexp_tuple args} ->
-          Doc.concat
-            [
-              Doc.lparen;
-              Doc.indent
-                (Doc.concat
-                   [
-                     Doc.softLine;
-                     Doc.join
-                       ~sep:(Doc.concat [Doc.comma; Doc.line])
-                       (List.map
-                          (fun expr ->
-                            let doc =
-                              printExpressionWithComments ~state expr cmtTbl
-                            in
-                            match Parens.expr expr with
-                            | Parens.Parenthesized -> addParens doc
-                            | Braced braces -> printBraces doc expr braces
-                            | Nothing -> doc)
-                          args);
-                   ]);
-              Doc.trailingComma;
-              Doc.softLine;
-              Doc.rparen;
-            ]
-        | Some arg ->
-          let argDoc =
-            let doc = printExpressionWithComments ~state arg cmtTbl in
-            match Parens.expr arg with
-            | Parens.Parenthesized -> addParens doc
-            | Braced braces -> printBraces doc arg braces
-            | Nothing -> doc
-          in
-          let shouldHug = ParsetreeViewer.isHuggableExpression arg in
-          Doc.concat
-            [
-              Doc.lparen;
-              (if shouldHug then argDoc
-               else
-                 Doc.concat
-                   [
-                     Doc.indent (Doc.concat [Doc.softLine; argDoc]);
-                     Doc.trailingComma;
-                     Doc.softLine;
-                   ]);
-              Doc.rparen;
-            ]
-      in
-      Doc.group (Doc.concat [constr; args])
-    | Pexp_ident path -> printLidentPath path cmtTbl
-    | Pexp_tuple exprs ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.lparen;
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    Doc.join
-                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                      (List.map
-                         (fun expr ->
-                           let doc =
-                             printExpressionWithComments ~state expr cmtTbl
-                           in
-                           match Parens.expr expr with
-                           | Parens.Parenthesized -> addParens doc
-                           | Braced braces -> printBraces doc expr braces
-                           | Nothing -> doc)
-                         exprs);
-                  ]);
-             Doc.ifBreaks (Doc.text ",") Doc.nil;
-             Doc.softLine;
-             Doc.rparen;
-           ])
-    | Pexp_array [] ->
-      Doc.concat
-        [Doc.lbracket; printCommentsInside cmtTbl e.pexp_loc; Doc.rbracket]
-    | Pexp_array exprs ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.lbracket;
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    Doc.join
-                      ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                      (List.map
-                         (fun expr ->
-                           let doc =
-                             printExpressionWithComments ~state expr cmtTbl
-                           in
-                           match Parens.expr expr with
-                           | Parens.Parenthesized -> addParens doc
-                           | Braced braces -> printBraces doc expr braces
-                           | Nothing -> doc)
-                         exprs);
-                  ]);
-             Doc.trailingComma;
-             Doc.softLine;
-             Doc.rbracket;
-           ])
-    | Pexp_variant (label, args) ->
-      let variantName = Doc.concat [Doc.text "#"; printPolyVarIdent label] in
-      let args =
-        match args with
-        | None -> Doc.nil
-        | Some {pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _)}
-          ->
-          Doc.text "()"
-        (* #poly((1, 2) *)
-        | Some {pexp_desc = Pexp_tuple [({pexp_desc = Pexp_tuple _} as arg)]} ->
-          Doc.concat
-            [
-              Doc.lparen;
-              (let doc = printExpressionWithComments ~state arg cmtTbl in
-               match Parens.expr arg with
-               | Parens.Parenthesized -> addParens doc
-               | Braced braces -> printBraces doc arg braces
-               | Nothing -> doc);
-              Doc.rparen;
-            ]
-        | Some {pexp_desc = Pexp_tuple args} ->
-          Doc.concat
-            [
-              Doc.lparen;
-              Doc.indent
-                (Doc.concat
-                   [
-                     Doc.softLine;
-                     Doc.join
-                       ~sep:(Doc.concat [Doc.comma; Doc.line])
-                       (List.map
-                          (fun expr ->
-                            let doc =
-                              printExpressionWithComments ~state expr cmtTbl
-                            in
-                            match Parens.expr expr with
-                            | Parens.Parenthesized -> addParens doc
-                            | Braced braces -> printBraces doc expr braces
-                            | Nothing -> doc)
-                          args);
-                   ]);
-              Doc.trailingComma;
-              Doc.softLine;
-              Doc.rparen;
-            ]
-        | Some arg ->
-          let argDoc =
-            let doc = printExpressionWithComments ~state arg cmtTbl in
-            match Parens.expr arg with
-            | Parens.Parenthesized -> addParens doc
-            | Braced braces -> printBraces doc arg braces
-            | Nothing -> doc
-          in
-          let shouldHug = ParsetreeViewer.isHuggableExpression arg in
-          Doc.concat
-            [
-              Doc.lparen;
-              (if shouldHug then argDoc
-               else
-                 Doc.concat
-                   [
-                     Doc.indent (Doc.concat [Doc.softLine; argDoc]);
-                     Doc.trailingComma;
-                     Doc.softLine;
-                   ]);
-              Doc.rparen;
-            ]
-      in
-      Doc.group (Doc.concat [variantName; args])
-    | Pexp_record (rows, spreadExpr) ->
-      if rows = [] then
-        Doc.concat
-          [Doc.lbrace; printCommentsInside cmtTbl e.pexp_loc; Doc.rbrace]
-      else
-        let spread =
-          match spreadExpr with
-          | None -> Doc.nil
-          | Some ({pexp_desc} as expr) ->
-            let doc =
-              match pexp_desc with
-              | Pexp_ident {txt = expr} -> printLident expr
-              | _ -> printExpression ~state expr cmtTbl
-            in
-            let docWithSpread =
-              Doc.concat
-                [
-                  Doc.dotdotdot;
-                  (match Parens.expr expr with
-                  | Parens.Parenthesized -> addParens doc
-                  | Braced braces -> printBraces doc expr braces
-                  | Nothing -> doc);
-                ]
-            in
-            Doc.concat
-              [
-                printComments docWithSpread cmtTbl expr.Parsetree.pexp_loc;
-                Doc.comma;
-                Doc.line;
-              ]
-        in
-        (* If the record is written over multiple lines, break automatically
-         * `let x = {a: 1, b: 3}` -> same line, break when line-width exceeded
-         * `let x = {
-         *   a: 1,
-         *   b: 2,
-         *  }` -> record is written on multiple lines, break the group *)
-        let forceBreak =
-          e.pexp_loc.loc_start.pos_lnum < e.pexp_loc.loc_end.pos_lnum
-        in
-        let punningAllowed =
-          match (spreadExpr, rows) with
-          | None, [_] -> false (* disallow punning for single-element records *)
-          | _ -> true
-        in
-        Doc.breakableGroup ~forceBreak
-          (Doc.concat
-             [
-               Doc.lbrace;
-               Doc.indent
-                 (Doc.concat
-                    [
-                      Doc.softLine;
-                      spread;
-                      Doc.join
-                        ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                        (List.map
-                           (fun row ->
-                             printExpressionRecordRow ~state row cmtTbl
-                               punningAllowed)
-                           rows);
-                    ]);
-               Doc.trailingComma;
-               Doc.softLine;
-               Doc.rbrace;
-             ])
-    | Pexp_extension extension -> (
-      match extension with
-      | ( {txt = "bs.obj" | "obj"},
-          PStr
-            [
-              {
-                pstr_loc = loc;
-                pstr_desc = Pstr_eval ({pexp_desc = Pexp_record (rows, _)}, []);
-              };
-            ] ) ->
-        (* If the object is written over multiple lines, break automatically
-         * `let x = {"a": 1, "b": 3}` -> same line, break when line-width exceeded
-         * `let x = {
-         *   "a": 1,
-         *   "b": 2,
-         *  }` -> object is written on multiple lines, break the group *)
-        let forceBreak = loc.loc_start.pos_lnum < loc.loc_end.pos_lnum in
-        Doc.breakableGroup ~forceBreak
-          (Doc.concat
-             [
-               Doc.lbrace;
-               Doc.indent
-                 (Doc.concat
-                    [
-                      Doc.softLine;
-                      Doc.join
-                        ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                        (List.map
-                           (fun row -> printBsObjectRow ~state row cmtTbl)
-                           rows);
-                    ]);
-               Doc.trailingComma;
-               Doc.softLine;
-               Doc.rbrace;
-             ])
-      | extension -> printExtension ~state ~atModuleLvl:false extension cmtTbl)
-    | Pexp_apply (e, [(Nolabel, {pexp_desc = Pexp_array subLists})])
-      when ParsetreeViewer.isSpreadBeltArrayConcat e ->
-      printBeltArrayConcatApply ~state subLists cmtTbl
-    | Pexp_apply (e, [(Nolabel, {pexp_desc = Pexp_array subLists})])
-      when ParsetreeViewer.isSpreadBeltListConcat e ->
-      printBeltListConcatApply ~state subLists cmtTbl
-    | Pexp_apply (callExpr, args) ->
-      if ParsetreeViewer.isUnaryExpression e then
-        printUnaryExpression ~state e cmtTbl
-      else if ParsetreeViewer.isTemplateLiteral e then
-        printTemplateLiteral ~state e cmtTbl
-      else if ParsetreeViewer.isTaggedTemplateLiteral e then
-        printTaggedTemplateLiteral ~state callExpr args cmtTbl
-      else if ParsetreeViewer.isBinaryExpression e then
-        printBinaryExpression ~state e cmtTbl
-      else printPexpApply ~state e cmtTbl
-    | Pexp_unreachable -> Doc.dot
-    | Pexp_field (expr, longidentLoc) ->
-      let lhs =
-        let doc = printExpressionWithComments ~state expr cmtTbl in
-        match Parens.fieldExpr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.concat [lhs; Doc.dot; printLidentPath longidentLoc cmtTbl]
-    | Pexp_setfield (expr1, longidentLoc, expr2) ->
-      printSetFieldExpr ~state e.pexp_attributes expr1 longidentLoc expr2
-        e.pexp_loc cmtTbl
-    | Pexp_ifthenelse (_ifExpr, _thenExpr, _elseExpr)
-      when ParsetreeViewer.isTernaryExpr e ->
-      let parts, alternate = ParsetreeViewer.collectTernaryParts e in
-      let ternaryDoc =
-        match parts with
-        | (condition1, consequent1) :: rest ->
-          Doc.group
-            (Doc.concat
-               [
-                 printTernaryOperand ~state condition1 cmtTbl;
-                 Doc.indent
-                   (Doc.concat
-                      [
-                        Doc.line;
-                        Doc.indent
-                          (Doc.concat
-                             [
-                               Doc.text "? ";
-                               printTernaryOperand ~state consequent1 cmtTbl;
-                             ]);
-                        Doc.concat
-                          (List.map
-                             (fun (condition, consequent) ->
-                               Doc.concat
-                                 [
-                                   Doc.line;
-                                   Doc.text ": ";
-                                   printTernaryOperand ~state condition cmtTbl;
-                                   Doc.line;
-                                   Doc.text "? ";
-                                   printTernaryOperand ~state consequent cmtTbl;
-                                 ])
-                             rest);
-                        Doc.line;
-                        Doc.text ": ";
-                        Doc.indent (printTernaryOperand ~state alternate cmtTbl);
-                      ]);
-               ])
-        | _ -> Doc.nil
-      in
-      let attrs = ParsetreeViewer.filterTernaryAttributes e.pexp_attributes in
-      let needsParens =
-        match ParsetreeViewer.filterParsingAttrs attrs with
-        | [] -> false
-        | _ -> true
-      in
-      Doc.concat
-        [
-          printAttributes ~state attrs cmtTbl;
-          (if needsParens then addParens ternaryDoc else ternaryDoc);
-        ]
-    | Pexp_ifthenelse (_ifExpr, _thenExpr, _elseExpr) ->
-      let ifs, elseExpr = ParsetreeViewer.collectIfExpressions e in
-      printIfChain ~state e.pexp_attributes ifs elseExpr cmtTbl
-    | Pexp_while (expr1, expr2) ->
-      let condition =
-        let doc = printExpressionWithComments ~state expr1 cmtTbl in
-        match Parens.expr expr1 with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc expr1 braces
-        | Nothing -> doc
-      in
-      Doc.breakableGroup ~forceBreak:true
-        (Doc.concat
-           [
-             Doc.text "while ";
-             (if ParsetreeViewer.isBlockExpr expr1 then condition
-              else Doc.group (Doc.ifBreaks (addParens condition) condition));
-             Doc.space;
-             printExpressionBlock ~state ~braces:true expr2 cmtTbl;
-           ])
-    | Pexp_for (pattern, fromExpr, toExpr, directionFlag, body) ->
-      Doc.breakableGroup ~forceBreak:true
-        (Doc.concat
-           [
-             Doc.text "for ";
-             printPattern ~state pattern cmtTbl;
-             Doc.text " in ";
-             (let doc = printExpressionWithComments ~state fromExpr cmtTbl in
-              match Parens.expr fromExpr with
-              | Parens.Parenthesized -> addParens doc
-              | Braced braces -> printBraces doc fromExpr braces
-              | Nothing -> doc);
-             printDirectionFlag directionFlag;
-             (let doc = printExpressionWithComments ~state toExpr cmtTbl in
-              match Parens.expr toExpr with
-              | Parens.Parenthesized -> addParens doc
-              | Braced braces -> printBraces doc toExpr braces
-              | Nothing -> doc);
-             Doc.space;
-             printExpressionBlock ~state ~braces:true body cmtTbl;
-           ])
-    | Pexp_constraint
-        ( {pexp_desc = Pexp_pack modExpr},
-          {ptyp_desc = Ptyp_package packageType; ptyp_loc} ) ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.text "module(";
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    printModExpr ~state modExpr cmtTbl;
-                    Doc.text ": ";
-                    printComments
-                      (printPackageType ~state
-                         ~printModuleKeywordAndParens:false packageType cmtTbl)
-                      cmtTbl ptyp_loc;
-                  ]);
-             Doc.softLine;
-             Doc.rparen;
-           ])
-    | Pexp_constraint (expr, typ) ->
-      let exprDoc =
-        let doc = printExpressionWithComments ~state expr cmtTbl in
-        match Parens.expr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.concat [exprDoc; Doc.text ": "; printTypExpr ~state typ cmtTbl]
-    | Pexp_letmodule ({txt = _modName}, _modExpr, _expr) ->
-      printExpressionBlock ~state ~braces:true e cmtTbl
-    | Pexp_letexception (_extensionConstructor, _expr) ->
-      printExpressionBlock ~state ~braces:true e cmtTbl
-    | Pexp_assert expr ->
-      let expr = printExpressionWithComments ~state expr cmtTbl in
-      Doc.concat [Doc.text "assert("; expr; Doc.text ")"]
-    | Pexp_lazy expr ->
-      let rhs =
-        let doc = printExpressionWithComments ~state expr cmtTbl in
-        match Parens.lazyOrAssertOrAwaitExprRhs expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.group (Doc.concat [Doc.text "lazy "; rhs])
-    | Pexp_open (_overrideFlag, _longidentLoc, _expr) ->
-      printExpressionBlock ~state ~braces:true e cmtTbl
-    | Pexp_pack modExpr ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.text "module(";
-             Doc.indent
-               (Doc.concat [Doc.softLine; printModExpr ~state modExpr cmtTbl]);
-             Doc.softLine;
-             Doc.rparen;
-           ])
-    | Pexp_sequence _ -> printExpressionBlock ~state ~braces:true e cmtTbl
-    | Pexp_let _ -> printExpressionBlock ~state ~braces:true e cmtTbl
-    | Pexp_try (expr, cases) ->
-      let exprDoc =
-        let doc = printExpressionWithComments ~state expr cmtTbl in
-        match Parens.expr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.concat
-        [
-          Doc.text "try ";
-          exprDoc;
-          Doc.text " catch ";
-          printCases ~state cases cmtTbl;
-        ]
-    | Pexp_match (_, [_; _]) when ParsetreeViewer.isIfLetExpr e ->
-      let ifs, elseExpr = ParsetreeViewer.collectIfExpressions e in
-      printIfChain ~state e.pexp_attributes ifs elseExpr cmtTbl
-    | Pexp_match (expr, cases) ->
-      let exprDoc =
-        let doc = printExpressionWithComments ~state expr cmtTbl in
-        match Parens.expr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.concat
-        [Doc.text "switch "; exprDoc; Doc.space; printCases ~state cases cmtTbl]
-    | Pexp_function cases ->
-      Doc.concat [Doc.text "x => switch x "; printCases ~state cases cmtTbl]
-    | Pexp_coerce (expr, typOpt, typ) ->
-      let docExpr = printExpressionWithComments ~state expr cmtTbl in
-      let docTyp = printTypExpr ~state typ cmtTbl in
-      let ofType =
-        match typOpt with
-        | None -> Doc.nil
-        | Some typ1 ->
-          Doc.concat [Doc.text ": "; printTypExpr ~state typ1 cmtTbl]
-      in
-      Doc.concat
-        [Doc.lparen; docExpr; ofType; Doc.text " :> "; docTyp; Doc.rparen]
-    | Pexp_send (parentExpr, label) ->
-      let parentDoc =
-        let doc = printExpressionWithComments ~state parentExpr cmtTbl in
-        match Parens.unaryExprOperand parentExpr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc parentExpr braces
-        | Nothing -> doc
-      in
-      let member =
-        let memberDoc = printComments (Doc.text label.txt) cmtTbl label.loc in
-        Doc.concat [Doc.text "\""; memberDoc; Doc.text "\""]
-      in
-      Doc.group (Doc.concat [parentDoc; Doc.lbracket; member; Doc.rbracket])
-    | Pexp_new _ -> Doc.text "Pexp_new not implemented in printer"
-    | Pexp_setinstvar _ -> Doc.text "Pexp_setinstvar not implemented in printer"
-    | Pexp_override _ -> Doc.text "Pexp_override not implemented in printer"
-    | Pexp_poly _ -> Doc.text "Pexp_poly not implemented in printer"
-    | Pexp_object _ -> Doc.text "Pexp_object not implemented in printer"
-  in
-  let exprWithAwait =
-    if ParsetreeViewer.hasAwaitAttribute e.pexp_attributes then
-      let rhs =
-        match
-          Parens.lazyOrAssertOrAwaitExprRhs ~inAwait:true
-            {
-              e with
-              pexp_attributes =
-                List.filter
-                  (function
-                    | {Location.txt = "res.braces" | "ns.braces"}, _ -> false
-                    | _ -> true)
-                  e.pexp_attributes;
-            }
-        with
-        | Parens.Parenthesized -> addParens printedExpression
-        | Braced braces -> printBraces printedExpression e braces
-        | Nothing -> printedExpression
-      in
-      Doc.concat [Doc.text "await "; rhs]
-    else printedExpression
-  in
-  let shouldPrintItsOwnAttributes =
-    match e.pexp_desc with
-    | Pexp_apply _ | Pexp_fun _ | Pexp_newtype _ | Pexp_setfield _
-    | Pexp_ifthenelse _ ->
-      true
-    | Pexp_match _ when ParsetreeViewer.isIfLetExpr e -> true
-    | Pexp_construct _ when ParsetreeViewer.hasJsxAttribute e.pexp_attributes ->
-      true
-    | _ -> false
-  in
-  match e.pexp_attributes with
-  | [] -> exprWithAwait
-  | attrs when not shouldPrintItsOwnAttributes ->
-    Doc.group (Doc.concat [printAttributes ~state attrs cmtTbl; exprWithAwait])
-  | _ -> exprWithAwait
-
-and printPexpFun ~state ~inCallback e cmtTbl =
-  let uncurried, attrsOnArrow, parameters, returnExpr =
-    ParsetreeViewer.funExpr e
-  in
-  let ParsetreeViewer.{async; bs; attributes = attrs} =
-    ParsetreeViewer.processFunctionAttributes attrsOnArrow
-  in
-  let uncurried = bs || uncurried in
-  let returnExpr, typConstraint =
-    match returnExpr.pexp_desc with
-    | Pexp_constraint (expr, typ) ->
-      ( {
-          expr with
-          pexp_attributes =
-            List.concat [expr.pexp_attributes; returnExpr.pexp_attributes];
-        },
-        Some typ )
-    | _ -> (returnExpr, None)
-  in
-  let parametersDoc =
-    printExprFunParameters ~state ~inCallback ~async ~uncurried
-      ~hasConstraint:
-        (match typConstraint with
-        | Some _ -> true
-        | None -> false)
-      parameters cmtTbl
-  in
-  let returnShouldIndent =
-    match returnExpr.pexp_desc with
-    | Pexp_sequence _ | Pexp_let _ | Pexp_letmodule _ | Pexp_letexception _
-    | Pexp_open _ ->
-      false
-    | _ -> true
-  in
-  let returnExprDoc =
-    let optBraces, _ = ParsetreeViewer.processBracesAttr returnExpr in
-    let shouldInline =
-      match (returnExpr.pexp_desc, optBraces) with
-      | _, Some _ -> true
-      | ( ( Pexp_array _ | Pexp_tuple _
-          | Pexp_construct (_, Some _)
-          | Pexp_record _ ),
-          _ ) ->
-        true
-      | _ -> false
-    in
-    let returnDoc =
-      let doc = printExpressionWithComments ~state returnExpr cmtTbl in
-      match Parens.expr returnExpr with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc returnExpr braces
-      | Nothing -> doc
-    in
-    if shouldInline then Doc.concat [Doc.space; returnDoc]
-    else
-      Doc.group
-        (if returnShouldIndent then
-           Doc.concat
-             [
-               Doc.indent (Doc.concat [Doc.line; returnDoc]);
-               (match inCallback with
-               | FitsOnOneLine | ArgumentsFitOnOneLine -> Doc.softLine
-               | _ -> Doc.nil);
-             ]
-         else Doc.concat [Doc.space; returnDoc])
-  in
-  let typConstraintDoc =
-    match typConstraint with
-    | Some typ -> Doc.concat [Doc.text ": "; printTypExpr ~state typ cmtTbl]
-    | _ -> Doc.nil
-  in
-  Doc.concat
-    [
-      printAttributes ~state attrs cmtTbl;
-      parametersDoc;
-      typConstraintDoc;
-      Doc.text " =>";
-      returnExprDoc;
-    ]
-
-and printTernaryOperand ~state expr cmtTbl =
-  let doc = printExpressionWithComments ~state expr cmtTbl in
-  match Parens.ternaryOperand expr with
-  | Parens.Parenthesized -> addParens doc
-  | Braced braces -> printBraces doc expr braces
-  | Nothing -> doc
-
-and printSetFieldExpr ~state attrs lhs longidentLoc rhs loc cmtTbl =
-  let rhsDoc =
-    let doc = printExpressionWithComments ~state rhs cmtTbl in
-    match Parens.setFieldExprRhs rhs with
-    | Parens.Parenthesized -> addParens doc
-    | Braced braces -> printBraces doc rhs braces
-    | Nothing -> doc
-  in
-  let lhsDoc =
-    let doc = printExpressionWithComments ~state lhs cmtTbl in
-    match Parens.fieldExpr lhs with
-    | Parens.Parenthesized -> addParens doc
-    | Braced braces -> printBraces doc lhs braces
-    | Nothing -> doc
-  in
-  let shouldIndent = ParsetreeViewer.isBinaryExpression rhs in
-  let doc =
-    Doc.group
-      (Doc.concat
-         [
-           lhsDoc;
-           Doc.dot;
-           printLidentPath longidentLoc cmtTbl;
-           Doc.text " =";
-           (if shouldIndent then
-              Doc.group (Doc.indent (Doc.concat [Doc.line; rhsDoc]))
-            else Doc.concat [Doc.space; rhsDoc]);
-         ])
-  in
-  let doc =
-    match attrs with
-    | [] -> doc
-    | attrs -> Doc.group (Doc.concat [printAttributes ~state attrs cmtTbl; doc])
-  in
-  printComments doc cmtTbl loc
-
-and printTemplateLiteral ~state expr cmtTbl =
-  let tag = ref "js" in
-  let rec walkExpr expr =
-    let open Parsetree in
-    match expr.pexp_desc with
-    | Pexp_apply
-        ( {pexp_desc = Pexp_ident {txt = Longident.Lident "^"}},
-          [(Nolabel, arg1); (Nolabel, arg2)] ) ->
-      let lhs = walkExpr arg1 in
-      let rhs = walkExpr arg2 in
-      Doc.concat [lhs; rhs]
-    | Pexp_constant (Pconst_string (txt, Some prefix)) ->
-      tag := prefix;
-      printStringContents txt
-    | _ ->
-      let doc = printExpressionWithComments ~state expr cmtTbl in
-      let doc =
-        match Parens.expr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      Doc.group (Doc.concat [Doc.text "${"; Doc.indent doc; Doc.rbrace])
-  in
-  let content = walkExpr expr in
-  Doc.concat
-    [
-      (if !tag = "js" then Doc.nil else Doc.text !tag);
-      Doc.text "`";
-      content;
-      Doc.text "`";
-    ]
-
-and printTaggedTemplateLiteral ~state callExpr args cmtTbl =
-  let stringsList, valuesList =
-    match args with
-    | [
-     (_, {Parsetree.pexp_desc = Pexp_array strings});
-     (_, {Parsetree.pexp_desc = Pexp_array values});
-    ] ->
-      (strings, values)
-    | _ -> assert false
-  in
-
-  let strings =
-    List.map
-      (fun x ->
-        match x with
-        | {Parsetree.pexp_desc = Pexp_constant (Pconst_string (txt, _))} ->
-          printStringContents txt
-        | _ -> assert false)
-      stringsList
-  in
-
-  let values =
-    List.map
-      (fun x ->
-        Doc.concat
-          [
-            Doc.text "${";
-            printExpressionWithComments ~state x cmtTbl;
-            Doc.text "}";
-          ])
-      valuesList
-  in
-
-  let process strings values =
-    let rec aux acc = function
-      | [], [] -> acc
-      | a_head :: a_rest, b -> aux (Doc.concat [acc; a_head]) (b, a_rest)
-      | _ -> assert false
-    in
-    aux Doc.nil (strings, values)
-  in
-
-  let content : Doc.t = process strings values in
-
-  let tag = printExpressionWithComments ~state callExpr cmtTbl in
-  Doc.concat [tag; Doc.text "`"; content; Doc.text "`"]
-
-and printUnaryExpression ~state expr cmtTbl =
-  let printUnaryOperator op =
-    Doc.text
-      (match op with
-      | "~+" -> "+"
-      | "~+." -> "+."
-      | "~-" -> "-"
-      | "~-." -> "-."
-      | "not" -> "!"
-      | _ -> assert false)
-  in
-  match expr.pexp_desc with
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [(Nolabel, operand)] ) ->
-    let printedOperand =
-      let doc = printExpressionWithComments ~state operand cmtTbl in
-      match Parens.unaryExprOperand operand with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc operand braces
-      | Nothing -> doc
-    in
-    let doc = Doc.concat [printUnaryOperator operator; printedOperand] in
-    printComments doc cmtTbl expr.pexp_loc
-  | _ -> assert false
-
-and printBinaryExpression ~state (expr : Parsetree.expression) cmtTbl =
-  let printBinaryOperator ~inlineRhs operator =
-    let operatorTxt =
-      match operator with
-      | "|." | "|.u" -> "->"
-      | "^" -> "++"
-      | "=" -> "=="
-      | "==" -> "==="
-      | "<>" -> "!="
-      | "!=" -> "!=="
-      | txt -> txt
-    in
-    let spacingBeforeOperator =
-      if operator = "|." || operator = "|.u" then Doc.softLine
-      else if operator = "|>" then Doc.line
-      else Doc.space
-    in
-    let spacingAfterOperator =
-      if operator = "|." || operator = "|.u" then Doc.nil
-      else if operator = "|>" then Doc.space
-      else if inlineRhs then Doc.space
-      else Doc.line
-    in
-    Doc.concat
-      [spacingBeforeOperator; Doc.text operatorTxt; spacingAfterOperator]
-  in
-  let printOperand ~isLhs ~isMultiline expr parentOperator =
-    let rec flatten ~isLhs ~isMultiline expr parentOperator =
-      if ParsetreeViewer.isBinaryExpression expr then
-        match expr with
-        | {
-         pexp_desc =
-           Pexp_apply
-             ( {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-               [(_, left); (_, right)] );
-        } ->
-          if
-            ParsetreeViewer.flattenableOperators parentOperator operator
-            && not (ParsetreeViewer.hasAttributes expr.pexp_attributes)
-          then
-            let leftPrinted = flatten ~isLhs:true ~isMultiline left operator in
-            let rightPrinted =
-              let rightPrinteableAttrs, rightInternalAttrs =
-                ParsetreeViewer.partitionPrintableAttributes
-                  right.pexp_attributes
-              in
-              let doc =
-                printExpressionWithComments ~state
-                  {right with pexp_attributes = rightInternalAttrs}
-                  cmtTbl
-              in
-              let doc =
-                if Parens.flattenOperandRhs parentOperator right then
-                  Doc.concat [Doc.lparen; doc; Doc.rparen]
-                else doc
-              in
-              let doc =
-                Doc.concat
-                  [printAttributes ~state rightPrinteableAttrs cmtTbl; doc]
-              in
-              match rightPrinteableAttrs with
-              | [] -> doc
-              | _ -> addParens doc
-            in
-            let isAwait =
-              ParsetreeViewer.hasAwaitAttribute expr.pexp_attributes
-            in
-            let doc =
-              if isAwait then
-                let parens =
-                  Res_parens.binaryOperatorInsideAwaitNeedsParens operator
-                in
-                Doc.concat
-                  [
-                    Doc.lparen;
-                    Doc.text "await ";
-                    (if parens then Doc.lparen else Doc.nil);
-                    leftPrinted;
-                    printBinaryOperator ~inlineRhs:false operator;
-                    rightPrinted;
-                    (if parens then Doc.rparen else Doc.nil);
-                    Doc.rparen;
-                  ]
-              else
-                match operator with
-                | ("|." | "|.u") when isMultiline ->
-                  (* If the pipe-chain is written over multiple lines, break automatically
-                   * `let x = a->b->c -> same line, break when line-width exceeded
-                   * `let x = a->
-                   *   b->c` -> pipe-chain is written on multiple lines, break the group *)
-                  Doc.breakableGroup ~forceBreak:true
-                    (Doc.concat
-                       [
-                         leftPrinted;
-                         printBinaryOperator ~inlineRhs:false operator;
-                         rightPrinted;
-                       ])
-                | _ ->
-                  Doc.concat
-                    [
-                      leftPrinted;
-                      printBinaryOperator ~inlineRhs:false operator;
-                      rightPrinted;
-                    ]
-            in
-
-            let doc =
-              if (not isLhs) && Parens.rhsBinaryExprOperand operator expr then
-                Doc.concat [Doc.lparen; doc; Doc.rparen]
-              else doc
-            in
-            printComments doc cmtTbl expr.pexp_loc
-          else
-            let printeableAttrs, internalAttrs =
-              ParsetreeViewer.partitionPrintableAttributes expr.pexp_attributes
-            in
-            let doc =
-              printExpressionWithComments ~state
-                {expr with pexp_attributes = internalAttrs}
-                cmtTbl
-            in
-            let doc =
-              if
-                Parens.subBinaryExprOperand parentOperator operator
-                || printeableAttrs <> []
-                   && (ParsetreeViewer.isBinaryExpression expr
-                      || ParsetreeViewer.isTernaryExpr expr)
-              then Doc.concat [Doc.lparen; doc; Doc.rparen]
-              else doc
-            in
-            Doc.concat [printAttributes ~state printeableAttrs cmtTbl; doc]
-        | _ -> assert false
-      else
-        match expr.pexp_desc with
-        | Pexp_apply
-            ( {pexp_desc = Pexp_ident {txt = Longident.Lident "^"; loc}},
-              [(Nolabel, _); (Nolabel, _)] )
-          when loc.loc_ghost ->
-          let doc = printTemplateLiteral ~state expr cmtTbl in
-          printComments doc cmtTbl expr.Parsetree.pexp_loc
-        | Pexp_setfield (lhs, field, rhs) ->
-          let doc =
-            printSetFieldExpr ~state expr.pexp_attributes lhs field rhs
-              expr.pexp_loc cmtTbl
-          in
-          if isLhs then addParens doc else doc
-        | Pexp_apply
-            ( {pexp_desc = Pexp_ident {txt = Longident.Lident "#="}},
-              [(Nolabel, lhs); (Nolabel, rhs)] ) ->
-          let rhsDoc = printExpressionWithComments ~state rhs cmtTbl in
-          let lhsDoc = printExpressionWithComments ~state lhs cmtTbl in
-          (* TODO: unify indentation of "=" *)
-          let shouldIndent = ParsetreeViewer.isBinaryExpression rhs in
-          let doc =
-            Doc.group
-              (Doc.concat
-                 [
-                   lhsDoc;
-                   Doc.text " =";
-                   (if shouldIndent then
-                      Doc.group (Doc.indent (Doc.concat [Doc.line; rhsDoc]))
-                    else Doc.concat [Doc.space; rhsDoc]);
-                 ])
-          in
-          let doc =
-            match expr.pexp_attributes with
-            | [] -> doc
-            | attrs ->
-              Doc.group (Doc.concat [printAttributes ~state attrs cmtTbl; doc])
-          in
-          if isLhs then addParens doc else doc
-        | _ -> (
-          let doc = printExpressionWithComments ~state expr cmtTbl in
-          match Parens.binaryExprOperand ~isLhs expr with
-          | Parens.Parenthesized -> addParens doc
-          | Braced braces -> printBraces doc expr braces
-          | Nothing -> doc)
-    in
-    flatten ~isLhs ~isMultiline expr parentOperator
-  in
-  match expr.pexp_desc with
-  | Pexp_apply
-      ( {
-          pexp_desc =
-            Pexp_ident {txt = Longident.Lident (("|." | "|.u" | "|>") as op)};
-        },
-        [(Nolabel, lhs); (Nolabel, rhs)] )
-    when not
-           (ParsetreeViewer.isBinaryExpression lhs
-           || ParsetreeViewer.isBinaryExpression rhs
-           || printAttributes ~state expr.pexp_attributes cmtTbl <> Doc.nil) ->
-    let lhsHasCommentBelow = hasCommentBelow cmtTbl lhs.pexp_loc in
-    let lhsDoc = printOperand ~isLhs:true ~isMultiline:false lhs op in
-    let rhsDoc = printOperand ~isLhs:false ~isMultiline:false rhs op in
-    Doc.group
-      (Doc.concat
-         [
-           printAttributes ~state expr.pexp_attributes cmtTbl;
-           lhsDoc;
-           (match (lhsHasCommentBelow, op) with
-           | true, ("|." | "|.u") -> Doc.concat [Doc.softLine; Doc.text "->"]
-           | false, ("|." | "|.u") -> Doc.text "->"
-           | true, "|>" -> Doc.concat [Doc.line; Doc.text "|> "]
-           | false, "|>" -> Doc.text " |> "
-           | _ -> Doc.nil);
-           rhsDoc;
-         ])
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Lident operator}},
-        [(Nolabel, lhs); (Nolabel, rhs)] ) ->
-    let isMultiline =
-      lhs.pexp_loc.loc_start.pos_lnum < rhs.pexp_loc.loc_start.pos_lnum
-    in
-
-    let right =
-      let operatorWithRhs =
-        let rhsDoc =
-          printOperand
-            ~isLhs:(ParsetreeViewer.isRhsBinaryOperator operator)
-            ~isMultiline rhs operator
-        in
-        Doc.concat
-          [
-            printBinaryOperator
-              ~inlineRhs:(ParsetreeViewer.shouldInlineRhsBinaryExpr rhs)
-              operator;
-            rhsDoc;
-          ]
-      in
-      if ParsetreeViewer.shouldIndentBinaryExpr expr then
-        Doc.group (Doc.indent operatorWithRhs)
-      else operatorWithRhs
-    in
-    let doc =
-      Doc.group
-        (Doc.concat
-           [
-             printOperand
-               ~isLhs:(not @@ ParsetreeViewer.isRhsBinaryOperator operator)
-               ~isMultiline lhs operator;
-             right;
-           ])
-    in
-    Doc.group
-      (Doc.concat
-         [
-           printAttributes ~state expr.pexp_attributes cmtTbl;
-           (match
-              Parens.binaryExpr
-                {
-                  expr with
-                  pexp_attributes =
-                    ParsetreeViewer.filterPrintableAttributes
-                      expr.pexp_attributes;
-                }
-            with
-           | Braced bracesLoc -> printBraces doc expr bracesLoc
-           | Parenthesized -> addParens doc
-           | Nothing -> doc);
-         ])
-  | _ -> Doc.nil
-
-and printBeltArrayConcatApply ~state subLists cmtTbl =
-  let makeSpreadDoc commaBeforeSpread = function
-    | Some expr ->
-      Doc.concat
-        [
-          commaBeforeSpread;
-          Doc.dotdotdot;
-          (let doc = printExpressionWithComments ~state expr cmtTbl in
-           match Parens.expr expr with
-           | Parens.Parenthesized -> addParens doc
-           | Braced braces -> printBraces doc expr braces
-           | Nothing -> doc);
-        ]
-    | None -> Doc.nil
-  in
-  let makeSubListDoc (expressions, spread) =
-    let commaBeforeSpread =
-      match expressions with
-      | [] -> Doc.nil
-      | _ -> Doc.concat [Doc.text ","; Doc.line]
-    in
-    let spreadDoc = makeSpreadDoc commaBeforeSpread spread in
-    Doc.concat
-      [
-        Doc.join
-          ~sep:(Doc.concat [Doc.text ","; Doc.line])
-          (List.map
-             (fun expr ->
-               let doc = printExpressionWithComments ~state expr cmtTbl in
-               match Parens.expr expr with
-               | Parens.Parenthesized -> addParens doc
-               | Braced braces -> printBraces doc expr braces
-               | Nothing -> doc)
-             expressions);
-        spreadDoc;
-      ]
-  in
-  Doc.group
-    (Doc.concat
-       [
-         Doc.lbracket;
-         Doc.indent
-           (Doc.concat
-              [
-                Doc.softLine;
-                Doc.join
-                  ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                  (List.map makeSubListDoc
-                     (List.map ParsetreeViewer.collectArrayExpressions subLists));
-              ]);
-         Doc.trailingComma;
-         Doc.softLine;
-         Doc.rbracket;
-       ])
-
-and printBeltListConcatApply ~state subLists cmtTbl =
-  let makeSpreadDoc commaBeforeSpread = function
-    | Some expr ->
-      Doc.concat
-        [
-          commaBeforeSpread;
-          Doc.dotdotdot;
-          (let doc = printExpressionWithComments ~state expr cmtTbl in
-           match Parens.expr expr with
-           | Parens.Parenthesized -> addParens doc
-           | Braced braces -> printBraces doc expr braces
-           | Nothing -> doc);
-        ]
-    | None -> Doc.nil
-  in
-  let makeSubListDoc (expressions, spread) =
-    let commaBeforeSpread =
-      match expressions with
-      | [] -> Doc.nil
-      | _ -> Doc.concat [Doc.text ","; Doc.line]
-    in
-    let spreadDoc = makeSpreadDoc commaBeforeSpread spread in
-    Doc.concat
-      [
-        Doc.join
-          ~sep:(Doc.concat [Doc.text ","; Doc.line])
-          (List.map
-             (fun expr ->
-               let doc = printExpressionWithComments ~state expr cmtTbl in
-               match Parens.expr expr with
-               | Parens.Parenthesized -> addParens doc
-               | Braced braces -> printBraces doc expr braces
-               | Nothing -> doc)
-             expressions);
-        spreadDoc;
-      ]
-  in
-  Doc.group
-    (Doc.concat
-       [
-         Doc.text "list{";
-         Doc.indent
-           (Doc.concat
-              [
-                Doc.softLine;
-                Doc.join
-                  ~sep:(Doc.concat [Doc.text ","; Doc.line])
-                  (List.map makeSubListDoc
-                     (List.map ParsetreeViewer.collectListExpressions subLists));
-              ]);
-         Doc.trailingComma;
-         Doc.softLine;
-         Doc.rbrace;
-       ])
-
-(* callExpr(arg1, arg2) *)
-and printPexpApply ~state expr cmtTbl =
-  match expr.pexp_desc with
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Lident "##"}},
-        [(Nolabel, parentExpr); (Nolabel, memberExpr)] ) ->
-    let parentDoc =
-      let doc = printExpressionWithComments ~state parentExpr cmtTbl in
-      match Parens.unaryExprOperand parentExpr with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc parentExpr braces
-      | Nothing -> doc
-    in
-    let member =
-      let memberDoc =
-        match memberExpr.pexp_desc with
-        | Pexp_ident lident ->
-          printComments (printLongident lident.txt) cmtTbl memberExpr.pexp_loc
-        | _ -> printExpressionWithComments ~state memberExpr cmtTbl
-      in
-      Doc.concat [Doc.text "\""; memberDoc; Doc.text "\""]
-    in
-    Doc.group
-      (Doc.concat
-         [
-           printAttributes ~state expr.pexp_attributes cmtTbl;
-           parentDoc;
-           Doc.lbracket;
-           member;
-           Doc.rbracket;
-         ])
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Lident "#="}},
-        [(Nolabel, lhs); (Nolabel, rhs)] ) -> (
-    let rhsDoc =
-      let doc = printExpressionWithComments ~state rhs cmtTbl in
-      match Parens.expr rhs with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc rhs braces
-      | Nothing -> doc
-    in
-    (* TODO: unify indentation of "=" *)
-    let shouldIndent =
-      (not (ParsetreeViewer.isBracedExpr rhs))
-      && ParsetreeViewer.isBinaryExpression rhs
-    in
-    let doc =
-      Doc.group
-        (Doc.concat
-           [
-             printExpressionWithComments ~state lhs cmtTbl;
-             Doc.text " =";
-             (if shouldIndent then
-                Doc.group (Doc.indent (Doc.concat [Doc.line; rhsDoc]))
-              else Doc.concat [Doc.space; rhsDoc]);
-           ])
-    in
-    match expr.pexp_attributes with
-    | [] -> doc
-    | attrs -> Doc.group (Doc.concat [printAttributes ~state attrs cmtTbl; doc])
-    )
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "get")}},
-        [(Nolabel, parentExpr); (Nolabel, memberExpr)] )
-    when not (ParsetreeViewer.isRewrittenUnderscoreApplySugar parentExpr) ->
-    (* Don't print the Array.get(_, 0) sugar a.k.a. (__x) => Array.get(__x, 0) as _[0] *)
-    let member =
-      let memberDoc =
-        let doc = printExpressionWithComments ~state memberExpr cmtTbl in
-        match Parens.expr memberExpr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc memberExpr braces
-        | Nothing -> doc
-      in
-      let shouldInline =
-        match memberExpr.pexp_desc with
-        | Pexp_constant _ | Pexp_ident _ -> true
-        | _ -> false
-      in
-      if shouldInline then memberDoc
-      else
-        Doc.concat
-          [Doc.indent (Doc.concat [Doc.softLine; memberDoc]); Doc.softLine]
-    in
-    let parentDoc =
-      let doc = printExpressionWithComments ~state parentExpr cmtTbl in
-      match Parens.unaryExprOperand parentExpr with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc parentExpr braces
-      | Nothing -> doc
-    in
-    Doc.group
-      (Doc.concat
-         [
-           printAttributes ~state expr.pexp_attributes cmtTbl;
-           parentDoc;
-           Doc.lbracket;
-           member;
-           Doc.rbracket;
-         ])
-  | Pexp_apply
-      ( {pexp_desc = Pexp_ident {txt = Longident.Ldot (Lident "Array", "set")}},
-        [(Nolabel, parentExpr); (Nolabel, memberExpr); (Nolabel, targetExpr)] )
-    ->
-    let member =
-      let memberDoc =
-        let doc = printExpressionWithComments ~state memberExpr cmtTbl in
-        match Parens.expr memberExpr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc memberExpr braces
-        | Nothing -> doc
-      in
-      let shouldInline =
-        match memberExpr.pexp_desc with
-        | Pexp_constant _ | Pexp_ident _ -> true
-        | _ -> false
-      in
-      if shouldInline then memberDoc
-      else
-        Doc.concat
-          [Doc.indent (Doc.concat [Doc.softLine; memberDoc]); Doc.softLine]
-    in
-    let shouldIndentTargetExpr =
-      if ParsetreeViewer.isBracedExpr targetExpr then false
-      else
-        ParsetreeViewer.isBinaryExpression targetExpr
-        ||
-        match targetExpr with
-        | {
-         pexp_attributes = [({Location.txt = "res.ternary"}, _)];
-         pexp_desc = Pexp_ifthenelse (ifExpr, _, _);
-        } ->
-          ParsetreeViewer.isBinaryExpression ifExpr
-          || ParsetreeViewer.hasAttributes ifExpr.pexp_attributes
-        | {pexp_desc = Pexp_newtype _} -> false
-        | e ->
-          ParsetreeViewer.hasAttributes e.pexp_attributes
-          || ParsetreeViewer.isArrayAccess e
-    in
-    let targetExpr =
-      let doc = printExpressionWithComments ~state targetExpr cmtTbl in
-      match Parens.expr targetExpr with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc targetExpr braces
-      | Nothing -> doc
-    in
-    let parentDoc =
-      let doc = printExpressionWithComments ~state parentExpr cmtTbl in
-      match Parens.unaryExprOperand parentExpr with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc parentExpr braces
-      | Nothing -> doc
-    in
-    Doc.group
-      (Doc.concat
-         [
-           printAttributes ~state expr.pexp_attributes cmtTbl;
-           parentDoc;
-           Doc.lbracket;
-           member;
-           Doc.rbracket;
-           Doc.text " =";
-           (if shouldIndentTargetExpr then
-              Doc.indent (Doc.concat [Doc.line; targetExpr])
-            else Doc.concat [Doc.space; targetExpr]);
-         ])
-  (* TODO: cleanup, are those branches even remotely performant? *)
-  | Pexp_apply ({pexp_desc = Pexp_ident lident}, args)
-    when ParsetreeViewer.isJsxExpression expr ->
-    printJsxExpression ~state lident args cmtTbl
-  | Pexp_apply (callExpr, args) ->
-    let args =
-      List.map
-        (fun (lbl, arg) -> (lbl, ParsetreeViewer.rewriteUnderscoreApply arg))
-        args
-    in
-    let uncurried, attrs =
-      ParsetreeViewer.processUncurriedAppAttribute expr.pexp_attributes
-    in
-    let partial, attrs = ParsetreeViewer.processPartialAppAttribute attrs in
-    let args =
-      if partial then
-        let loc =
-          {Asttypes.txt = "res.partial"; Asttypes.loc = expr.pexp_loc}
-        in
-        let attr = (loc, Parsetree.PTyp (Ast_helper.Typ.any ())) in
-        let dummy =
-          Ast_helper.Exp.constant ~attrs:[attr] (Ast_helper.Const.int 0)
-        in
-        args @ [(Asttypes.Labelled "...", dummy)]
-      else args
-    in
-    let dotted = state.uncurried_config |> Res_uncurried.getDotted ~uncurried in
-    let callExprDoc =
-      let doc = printExpressionWithComments ~state callExpr cmtTbl in
-      match Parens.callExpr callExpr with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc callExpr braces
-      | Nothing -> doc
-    in
-    if ParsetreeViewer.requiresSpecialCallbackPrintingFirstArg args then
-      let argsDoc =
-        printArgumentsWithCallbackInFirstPosition ~dotted ~state args cmtTbl
-      in
-      Doc.concat [printAttributes ~state attrs cmtTbl; callExprDoc; argsDoc]
-    else if ParsetreeViewer.requiresSpecialCallbackPrintingLastArg args then
-      let argsDoc =
-        printArgumentsWithCallbackInLastPosition ~state ~dotted args cmtTbl
-      in
-      (*
-       * Fixes the following layout (the `[` and `]` should break):
-       *   [fn(x => {
-       *     let _ = x
-       *   }), fn(y => {
-       *     let _ = y
-       *   }), fn(z => {
-       *     let _ = z
-       *   })]
-       * See `Doc.willBreak documentation in interface file for more context.
-       * Context:
-       *  https://github.com/rescript-lang/syntax/issues/111
-       *  https://github.com/rescript-lang/syntax/issues/166
-       *)
-      let maybeBreakParent =
-        if Doc.willBreak argsDoc then Doc.breakParent else Doc.nil
-      in
-      Doc.concat
-        [
-          maybeBreakParent;
-          printAttributes ~state attrs cmtTbl;
-          callExprDoc;
-          argsDoc;
-        ]
-    else
-      let argsDoc = printArguments ~state ~dotted ~partial args cmtTbl in
-      Doc.concat [printAttributes ~state attrs cmtTbl; callExprDoc; argsDoc]
-  | _ -> assert false
-
-and printJsxExpression ~state lident args cmtTbl =
-  let name = printJsxName lident in
-  let formattedProps, children = printJsxProps ~state args cmtTbl in
-  (* <div className="test" /> *)
-  let hasChildren =
-    match children with
-    | Some
-        {
-          Parsetree.pexp_desc =
-            Pexp_construct ({txt = Longident.Lident "[]"}, None);
-        } ->
-      false
-    | None -> false
-    | _ -> true
-  in
-  let isSelfClosing =
-    match children with
-    | Some
-        {
-          Parsetree.pexp_desc =
-            Pexp_construct ({txt = Longident.Lident "[]"}, None);
-          pexp_loc = loc;
-        } ->
-      not (hasCommentsInside cmtTbl loc)
-    | _ -> false
-  in
-  let printChildren children =
-    let lineSep =
-      match children with
-      | Some expr ->
-        if hasNestedJsxOrMoreThanOneChild expr then Doc.hardLine else Doc.line
-      | None -> Doc.line
-    in
-    Doc.concat
-      [
-        Doc.indent
-          (Doc.concat
-             [
-               Doc.line;
-               (match children with
-               | Some childrenExpression ->
-                 printJsxChildren ~state childrenExpression ~sep:lineSep cmtTbl
-               | None -> Doc.nil);
-             ]);
-        lineSep;
-      ]
-  in
-  Doc.group
-    (Doc.concat
-       [
-         Doc.group
-           (Doc.concat
-              [
-                printComments
-                  (Doc.concat [Doc.lessThan; name])
-                  cmtTbl lident.Asttypes.loc;
-                formattedProps;
-                (match children with
-                | Some
-                    {
-                      Parsetree.pexp_desc =
-                        Pexp_construct ({txt = Longident.Lident "[]"}, None);
-                    }
-                  when isSelfClosing ->
-                  Doc.text "/>"
-                | _ ->
-                  (* if tag A has trailing comments then put > on the next line
-                     <A
-                     // comments
-                     >
-                     </A>
-                  *)
-                  if hasTrailingComments cmtTbl lident.Asttypes.loc then
-                    Doc.concat [Doc.softLine; Doc.greaterThan]
-                  else Doc.greaterThan);
-              ]);
-         (if isSelfClosing then Doc.nil
-          else
-            Doc.concat
-              [
-                (if hasChildren then printChildren children
-                 else
-                   match children with
-                   | Some
-                       {
-                         Parsetree.pexp_desc =
-                           Pexp_construct ({txt = Longident.Lident "[]"}, None);
-                         pexp_loc = loc;
-                       } ->
-                     printCommentsInside cmtTbl loc
-                   | _ -> Doc.nil);
-                Doc.text "</";
-                name;
-                Doc.greaterThan;
-              ]);
-       ])
-
-and printJsxFragment ~state expr cmtTbl =
-  let opening = Doc.text "<>" in
-  let closing = Doc.text "</>" in
-  let lineSep =
-    if hasNestedJsxOrMoreThanOneChild expr then Doc.hardLine else Doc.line
-  in
-  Doc.group
-    (Doc.concat
-       [
-         opening;
-         (match expr.pexp_desc with
-         | Pexp_construct ({txt = Longident.Lident "[]"}, None) -> Doc.nil
-         | _ ->
-           Doc.indent
-             (Doc.concat
-                [Doc.line; printJsxChildren ~state expr ~sep:lineSep cmtTbl]));
-         lineSep;
-         closing;
-       ])
-
-and printJsxChildren ~state (childrenExpr : Parsetree.expression) ~sep cmtTbl =
-  match childrenExpr.pexp_desc with
-  | Pexp_construct ({txt = Longident.Lident "::"}, _) ->
-    let children, _ = ParsetreeViewer.collectListExpressions childrenExpr in
-    Doc.group
-      (Doc.join ~sep
-         (List.map
-            (fun (expr : Parsetree.expression) ->
-              let leadingLineCommentPresent =
-                hasLeadingLineComment cmtTbl expr.pexp_loc
-              in
-              let exprDoc = printExpressionWithComments ~state expr cmtTbl in
-              let addParensOrBraces exprDoc =
-                (* {(20: int)} make sure that we also protect the expression inside *)
-                let innerDoc =
-                  if Parens.bracedExpr expr then addParens exprDoc else exprDoc
-                in
-                if leadingLineCommentPresent then addBraces innerDoc
-                else Doc.concat [Doc.lbrace; innerDoc; Doc.rbrace]
-              in
-              match Parens.jsxChildExpr expr with
-              | Nothing -> exprDoc
-              | Parenthesized -> addParensOrBraces exprDoc
-              | Braced bracesLoc ->
-                printComments (addParensOrBraces exprDoc) cmtTbl bracesLoc)
-            children))
-  | _ ->
-    let leadingLineCommentPresent =
-      hasLeadingLineComment cmtTbl childrenExpr.pexp_loc
-    in
-    let exprDoc = printExpressionWithComments ~state childrenExpr cmtTbl in
-    Doc.concat
-      [
-        Doc.dotdotdot;
-        (match Parens.jsxChildExpr childrenExpr with
-        | Parenthesized | Braced _ ->
-          let innerDoc =
-            if Parens.bracedExpr childrenExpr then addParens exprDoc
-            else exprDoc
-          in
-          if leadingLineCommentPresent then addBraces innerDoc
-          else Doc.concat [Doc.lbrace; innerDoc; Doc.rbrace]
-        | Nothing -> exprDoc);
-      ]
-
-and printJsxProps ~state args cmtTbl : Doc.t * Parsetree.expression option =
-  (* This function was introduced because we have different formatting behavior for self-closing tags and other tags
-     we always put /> on a new line for self-closing tag when it breaks
-     <A
-      a=""
-     />
-
-     <A
-     a="">
-      <B />
-     </A>
-     we should remove this function once the format is unified
-  *)
-  let isSelfClosing children =
-    match children with
-    | {
-     Parsetree.pexp_desc = Pexp_construct ({txt = Longident.Lident "[]"}, None);
-     pexp_loc = loc;
-    } ->
-      not (hasCommentsInside cmtTbl loc)
-    | _ -> false
-  in
-  let rec loop props args =
-    match args with
-    | [] -> (Doc.nil, None)
-    | [
-     (Asttypes.Labelled "children", children);
-     ( Asttypes.Nolabel,
-       {
-         Parsetree.pexp_desc =
-           Pexp_construct ({txt = Longident.Lident "()"}, None);
-       } );
-    ] ->
-      let doc = if isSelfClosing children then Doc.line else Doc.nil in
-      (doc, Some children)
-    | ((_, expr) as lastProp)
-      :: [
-           (Asttypes.Labelled "children", children);
-           ( Asttypes.Nolabel,
-             {
-               Parsetree.pexp_desc =
-                 Pexp_construct ({txt = Longident.Lident "()"}, None);
-             } );
-         ] ->
-      let loc =
-        match expr.Parsetree.pexp_attributes with
-        | ({Location.txt = "res.namedArgLoc"; loc}, _) :: _attrs ->
-          {loc with loc_end = expr.pexp_loc.loc_end}
-        | _ -> expr.pexp_loc
-      in
-      let trailingCommentsPresent = hasTrailingComments cmtTbl loc in
-      let propDoc = printJsxProp ~state lastProp cmtTbl in
-      let formattedProps =
-        Doc.concat
-          [
-            Doc.indent
-              (Doc.concat
-                 [
-                   Doc.line;
-                   Doc.group
-                     (Doc.join ~sep:Doc.line (propDoc :: props |> List.rev));
-                 ]);
-            (* print > on new line if the last prop has trailing comments *)
-            (match (isSelfClosing children, trailingCommentsPresent) with
-            (* we always put /> on a new line when a self-closing tag breaks *)
-            | true, _ -> Doc.line
-            | false, true -> Doc.softLine
-            | false, false -> Doc.nil);
-          ]
-      in
-      (formattedProps, Some children)
-    | arg :: args ->
-      let propDoc = printJsxProp ~state arg cmtTbl in
-      loop (propDoc :: props) args
-  in
-  loop [] args
-
-and printJsxProp ~state arg cmtTbl =
-  match arg with
-  | ( ((Asttypes.Labelled lblTxt | Optional lblTxt) as lbl),
-      {
-        Parsetree.pexp_attributes =
-          [({Location.txt = "res.namedArgLoc"; loc = argLoc}, _)];
-        pexp_desc = Pexp_ident {txt = Longident.Lident ident};
-      } )
-    when lblTxt = ident (* jsx punning *) -> (
-    match lbl with
-    | Nolabel -> Doc.nil
-    | Labelled _lbl -> printComments (printIdentLike ident) cmtTbl argLoc
-    | Optional _lbl ->
-      let doc = Doc.concat [Doc.question; printIdentLike ident] in
-      printComments doc cmtTbl argLoc)
-  | ( ((Asttypes.Labelled lblTxt | Optional lblTxt) as lbl),
-      {
-        Parsetree.pexp_attributes = [];
-        pexp_desc = Pexp_ident {txt = Longident.Lident ident};
-      } )
-    when lblTxt = ident (* jsx punning when printing from Reason *) -> (
-    match lbl with
-    | Nolabel -> Doc.nil
-    | Labelled _lbl -> printIdentLike ident
-    | Optional _lbl -> Doc.concat [Doc.question; printIdentLike ident])
-  | Asttypes.Labelled "_spreadProps", expr ->
-    let doc = printExpressionWithComments ~state expr cmtTbl in
-    Doc.concat [Doc.lbrace; Doc.dotdotdot; doc; Doc.rbrace]
-  | lbl, expr ->
-    let argLoc, expr =
-      match expr.pexp_attributes with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _) :: attrs ->
-        (loc, {expr with pexp_attributes = attrs})
-      | _ -> (Location.none, expr)
-    in
-    let lblDoc =
-      match lbl with
-      | Asttypes.Labelled lbl ->
-        let lbl = printComments (printIdentLike lbl) cmtTbl argLoc in
-        Doc.concat [lbl; Doc.equal]
-      | Asttypes.Optional lbl ->
-        let lbl = printComments (printIdentLike lbl) cmtTbl argLoc in
-        Doc.concat [lbl; Doc.equal; Doc.question]
-      | Nolabel -> Doc.nil
-    in
-    let exprDoc =
-      let leadingLineCommentPresent =
-        hasLeadingLineComment cmtTbl expr.pexp_loc
-      in
-      let doc = printExpressionWithComments ~state expr cmtTbl in
-      match Parens.jsxPropExpr expr with
-      | Parenthesized | Braced _ ->
-        (* {(20: int)} make sure that we also protect the expression inside *)
-        let innerDoc = if Parens.bracedExpr expr then addParens doc else doc in
-        if leadingLineCommentPresent then addBraces innerDoc
-        else Doc.concat [Doc.lbrace; innerDoc; Doc.rbrace]
-      | _ -> doc
-    in
-    let fullLoc = {argLoc with loc_end = expr.pexp_loc.loc_end} in
-    printComments (Doc.concat [lblDoc; exprDoc]) cmtTbl fullLoc
-
-(* div -> div.
- * Navabar.createElement -> Navbar
- * Staff.Users.createElement -> Staff.Users *)
-and printJsxName {txt = lident} =
-  let printIdent = printIdentLike ~allowUident:true ~allowHyphen:true in
-  let rec flatten acc lident =
-    match lident with
-    | Longident.Lident txt -> printIdent txt :: acc
-    | Ldot (lident, "createElement") -> flatten acc lident
-    | Ldot (lident, txt) -> flatten (printIdent txt :: acc) lident
-    | _ -> acc
-  in
-  match lident with
-  | Longident.Lident txt -> printIdent txt
-  | _ as lident ->
-    let segments = flatten [] lident in
-    Doc.join ~sep:Doc.dot segments
-
-and printArgumentsWithCallbackInFirstPosition ~dotted ~state args cmtTbl =
-  (* Because the same subtree gets printed twice, we need to copy the cmtTbl.
-   * consumed comments need to be marked not-consumed and reprinted…
-   * Cheng's different comment algorithm will solve this. *)
-  let state = State.nextCustomLayout state in
-  let cmtTblCopy = CommentTable.copy cmtTbl in
-  let callback, printedArgs =
-    match args with
-    | (lbl, expr) :: args ->
-      let lblDoc =
-        match lbl with
-        | Asttypes.Nolabel -> Doc.nil
-        | Asttypes.Labelled txt ->
-          Doc.concat [Doc.tilde; printIdentLike txt; Doc.equal]
-        | Asttypes.Optional txt ->
-          Doc.concat [Doc.tilde; printIdentLike txt; Doc.equal; Doc.question]
-      in
-      let callback =
-        Doc.concat
-          [lblDoc; printPexpFun ~state ~inCallback:FitsOnOneLine expr cmtTbl]
-      in
-      let callback = lazy (printComments callback cmtTbl expr.pexp_loc) in
-      let printedArgs =
-        lazy
-          (Doc.join
-             ~sep:(Doc.concat [Doc.comma; Doc.line])
-             (List.map (fun arg -> printArgument ~state arg cmtTbl) args))
-      in
-      (callback, printedArgs)
-    | _ -> assert false
-  in
-
-  (* Thing.map((arg1, arg2) => MyModuleBlah.toList(argument), foo) *)
-  (* Thing.map((arg1, arg2) => {
-   *   MyModuleBlah.toList(argument)
-   * }, longArgumet, veryLooooongArgument)
-   *)
-  let fitsOnOneLine =
-    lazy
-      (Doc.concat
-         [
-           (if dotted then Doc.text "(. " else Doc.lparen);
-           Lazy.force callback;
-           Doc.comma;
-           Doc.line;
-           Lazy.force printedArgs;
-           Doc.rparen;
-         ])
-  in
-
-  (* Thing.map(
-   *   (param1, parm2) => doStuff(param1, parm2),
-   *   arg1,
-   *   arg2,
-   *   arg3,
-   * )
-   *)
-  let breakAllArgs = lazy (printArguments ~state ~dotted args cmtTblCopy) in
-
-  (* Sometimes one of the non-callback arguments will break.
-   * There might be a single line comment in there, or a multiline string etc.
-   * showDialog(
-   *   ~onConfirm={() => ()},
-   *   `
-   *   Do you really want to leave this workspace?
-   *   Some more text with detailed explanations...
-   *   `,
-   *   ~danger=true,
-   *   // comment   --> here a single line comment
-   *   ~confirmText="Yes, I am sure!",
-   *  )
-   * In this case, we always want the arguments broken over multiple lines,
-   * like a normal function call.
-   *)
-  if state |> State.shouldBreakCallback then Lazy.force breakAllArgs
-  else if Doc.willBreak (Lazy.force printedArgs) then Lazy.force breakAllArgs
-  else Doc.customLayout [Lazy.force fitsOnOneLine; Lazy.force breakAllArgs]
-
-and printArgumentsWithCallbackInLastPosition ~state ~dotted args cmtTbl =
-  (* Because the same subtree gets printed twice, we need to copy the cmtTbl.
-   * consumed comments need to be marked not-consumed and reprinted…
-   * Cheng's different comment algorithm will solve this. *)
-  let state = state |> State.nextCustomLayout in
-  let cmtTblCopy = CommentTable.copy cmtTbl in
-  let cmtTblCopy2 = CommentTable.copy cmtTbl in
-  let rec loop acc args =
-    match args with
-    | [] -> (lazy Doc.nil, lazy Doc.nil, lazy Doc.nil)
-    | [(lbl, expr)] ->
-      let lblDoc =
-        match lbl with
-        | Asttypes.Nolabel -> Doc.nil
-        | Asttypes.Labelled txt ->
-          Doc.concat [Doc.tilde; printIdentLike txt; Doc.equal]
-        | Asttypes.Optional txt ->
-          Doc.concat [Doc.tilde; printIdentLike txt; Doc.equal; Doc.question]
-      in
-      let callbackFitsOnOneLine =
-        lazy
-          (let pexpFunDoc =
-             printPexpFun ~state ~inCallback:FitsOnOneLine expr cmtTbl
-           in
-           let doc = Doc.concat [lblDoc; pexpFunDoc] in
-           printComments doc cmtTbl expr.pexp_loc)
-      in
-      let callbackArgumentsFitsOnOneLine =
-        lazy
-          (let pexpFunDoc =
-             printPexpFun ~state ~inCallback:ArgumentsFitOnOneLine expr
-               cmtTblCopy
-           in
-           let doc = Doc.concat [lblDoc; pexpFunDoc] in
-           printComments doc cmtTblCopy expr.pexp_loc)
-      in
-      ( lazy (Doc.concat (List.rev acc)),
-        callbackFitsOnOneLine,
-        callbackArgumentsFitsOnOneLine )
-    | arg :: args ->
-      let argDoc = printArgument ~state arg cmtTbl in
-      loop (Doc.line :: Doc.comma :: argDoc :: acc) args
-  in
-  let printedArgs, callback, callback2 = loop [] args in
-
-  (* Thing.map(foo, (arg1, arg2) => MyModuleBlah.toList(argument)) *)
-  let fitsOnOneLine =
-    lazy
-      (Doc.concat
-         [
-           (if dotted then Doc.text "(." else Doc.lparen);
-           Lazy.force printedArgs;
-           Lazy.force callback;
-           Doc.rparen;
-         ])
-  in
-
-  (* Thing.map(longArgumet, veryLooooongArgument, (arg1, arg2) =>
-   *   MyModuleBlah.toList(argument)
-   * )
-   *)
-  let arugmentsFitOnOneLine =
-    lazy
-      (Doc.concat
-         [
-           (if dotted then Doc.text "(." else Doc.lparen);
-           Lazy.force printedArgs;
-           Doc.breakableGroup ~forceBreak:true (Lazy.force callback2);
-           Doc.rparen;
-         ])
-  in
-
-  (* Thing.map(
-   *   arg1,
-   *   arg2,
-   *   arg3,
-   *   (param1, parm2) => doStuff(param1, parm2)
-   * )
-   *)
-  let breakAllArgs = lazy (printArguments ~state ~dotted args cmtTblCopy2) in
-
-  (* Sometimes one of the non-callback arguments will break.
-   * There might be a single line comment in there, or a multiline string etc.
-   * showDialog(
-   *   `
-   *   Do you really want to leave this workspace?
-   *   Some more text with detailed explanations...
-   *   `,
-   *   ~danger=true,
-   *   // comment   --> here a single line comment
-   *   ~confirmText="Yes, I am sure!",
-   *   ~onConfirm={() => ()},
-   *  )
-   * In this case, we always want the arguments broken over multiple lines,
-   * like a normal function call.
-   *)
-  if state |> State.shouldBreakCallback then Lazy.force breakAllArgs
-  else if Doc.willBreak (Lazy.force printedArgs) then Lazy.force breakAllArgs
-  else
-    Doc.customLayout
-      [
-        Lazy.force fitsOnOneLine;
-        Lazy.force arugmentsFitOnOneLine;
-        Lazy.force breakAllArgs;
-      ]
-
-and printArguments ~state ~dotted ?(partial = false)
-    (args : (Asttypes.arg_label * Parsetree.expression) list) cmtTbl =
-  match args with
-  | [
-   ( Nolabel,
-     {
-       pexp_desc = Pexp_construct ({txt = Longident.Lident "()"}, _);
-       pexp_loc = loc;
-     } );
-  ] -> (
-    (* See "parseCallExpr", ghost unit expression is used the implement
-     * arity zero vs arity one syntax.
-     * Related: https://github.com/rescript-lang/syntax/issues/138 *)
-    match (dotted, loc.loc_ghost) with
-    | true, true -> Doc.text "(.)" (* arity zero *)
-    | true, false -> Doc.text "(. ())" (* arity one *)
-    | _ -> Doc.text "()")
-  | [(Nolabel, arg)] when ParsetreeViewer.isHuggableExpression arg ->
-    let argDoc =
-      let doc = printExpressionWithComments ~state arg cmtTbl in
-      match Parens.expr arg with
-      | Parens.Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc arg braces
-      | Nothing -> doc
-    in
-    Doc.concat
-      [(if dotted then Doc.text "(. " else Doc.lparen); argDoc; Doc.rparen]
-  | args ->
-    (* Avoid printing trailing comma when there is ... in function application *)
-    let hasPartialAttr, printedArgs =
-      List.fold_right
-        (fun arg (flag, acc) ->
-          let _, expr = arg in
-          let hasPartialAttr =
-            ParsetreeViewer.hasPartialAttribute expr.Parsetree.pexp_attributes
-          in
-          let doc = printArgument ~state arg cmtTbl in
-          (flag || hasPartialAttr, doc :: acc))
-        args (false, [])
-    in
-    Doc.group
-      (Doc.concat
-         [
-           (if dotted then Doc.text "(." else Doc.lparen);
-           Doc.indent
-             (Doc.concat
-                [
-                  (if dotted then Doc.line else Doc.softLine);
-                  Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) printedArgs;
-                ]);
-           (if partial || hasPartialAttr then Doc.nil else Doc.trailingComma);
-           Doc.softLine;
-           Doc.rparen;
-         ])
-
-(*
- * argument ::=
- *   | _                            (* syntax sugar *)
- *   | expr
- *   | expr : type
- *   | ~ label-name
- *   | ~ label-name
- *   | ~ label-name ?
- *   | ~ label-name =   expr
- *   | ~ label-name =   _           (* syntax sugar *)
- *   | ~ label-name =   expr : type
- *   | ~ label-name = ? expr
- *   | ~ label-name = ? _           (* syntax sugar *)
- *   | ~ label-name = ? expr : type *)
-and printArgument ~state (argLbl, arg) cmtTbl =
-  match (argLbl, arg) with
-  (* ~a (punned)*)
-  | ( Labelled lbl,
-      ({
-         pexp_desc = Pexp_ident {txt = Longident.Lident name};
-         pexp_attributes = [] | [({Location.txt = "res.namedArgLoc"}, _)];
-       } as argExpr) )
-    when lbl = name && not (ParsetreeViewer.isBracedExpr argExpr) ->
-    let loc =
-      match arg.pexp_attributes with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _) :: _ -> loc
-      | _ -> arg.pexp_loc
-    in
-    let doc = Doc.concat [Doc.tilde; printIdentLike lbl] in
-    printComments doc cmtTbl loc
-  (* ~a: int (punned)*)
-  | ( Labelled lbl,
-      {
-        pexp_desc =
-          Pexp_constraint
-            ( ({pexp_desc = Pexp_ident {txt = Longident.Lident name}} as argExpr),
-              typ );
-        pexp_loc;
-        pexp_attributes =
-          ([] | [({Location.txt = "res.namedArgLoc"}, _)]) as attrs;
-      } )
-    when lbl = name && not (ParsetreeViewer.isBracedExpr argExpr) ->
-    let loc =
-      match attrs with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _) :: _ ->
-        {loc with loc_end = pexp_loc.loc_end}
-      | _ -> arg.pexp_loc
-    in
-    let doc =
-      Doc.concat
-        [
-          Doc.tilde;
-          printIdentLike lbl;
-          Doc.text ": ";
-          printTypExpr ~state typ cmtTbl;
-        ]
-    in
-    printComments doc cmtTbl loc
-  (* ~a? (optional lbl punned)*)
-  | ( Optional lbl,
-      {
-        pexp_desc = Pexp_ident {txt = Longident.Lident name};
-        pexp_attributes = [] | [({Location.txt = "res.namedArgLoc"}, _)];
-      } )
-    when lbl = name ->
-    let loc =
-      match arg.pexp_attributes with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _) :: _ -> loc
-      | _ -> arg.pexp_loc
-    in
-    let doc = Doc.concat [Doc.tilde; printIdentLike lbl; Doc.question] in
-    printComments doc cmtTbl loc
-  | _lbl, expr ->
-    let argLoc, expr =
-      match expr.pexp_attributes with
-      | ({Location.txt = "res.namedArgLoc"; loc}, _) :: attrs ->
-        (loc, {expr with pexp_attributes = attrs})
-      | _ -> (expr.pexp_loc, expr)
-    in
-    let printedLbl, dotdotdot =
-      match argLbl with
-      | Nolabel -> (Doc.nil, false)
-      | Labelled "..." ->
-        let doc = Doc.text "..." in
-        (printComments doc cmtTbl argLoc, true)
-      | Labelled lbl ->
-        let doc = Doc.concat [Doc.tilde; printIdentLike lbl; Doc.equal] in
-        (printComments doc cmtTbl argLoc, false)
-      | Optional lbl ->
-        let doc =
-          Doc.concat [Doc.tilde; printIdentLike lbl; Doc.equal; Doc.question]
-        in
-        (printComments doc cmtTbl argLoc, false)
-    in
-    let printedExpr =
-      let doc = printExpressionWithComments ~state expr cmtTbl in
-      match Parens.expr expr with
-      | Parenthesized -> addParens doc
-      | Braced braces -> printBraces doc expr braces
-      | Nothing -> doc
-    in
-    let loc = {argLoc with loc_end = expr.pexp_loc.loc_end} in
-    let doc =
-      if dotdotdot then printedLbl else Doc.concat [printedLbl; printedExpr]
-    in
-    printComments doc cmtTbl loc
-
-and printCases ~state (cases : Parsetree.case list) cmtTbl =
-  Doc.breakableGroup ~forceBreak:true
-    (Doc.concat
-       [
-         Doc.lbrace;
-         Doc.concat
-           [
-             Doc.line;
-             printList
-               ~getLoc:(fun n ->
-                 {
-                   n.Parsetree.pc_lhs.ppat_loc with
-                   loc_end =
-                     (match ParsetreeViewer.processBracesAttr n.pc_rhs with
-                     | None, _ -> n.pc_rhs.pexp_loc.loc_end
-                     | Some ({loc}, _), _ -> loc.Location.loc_end);
-                 })
-               ~print:(printCase ~state) ~nodes:cases cmtTbl;
-           ];
-         Doc.line;
-         Doc.rbrace;
-       ])
-
-and printCase ~state (case : Parsetree.case) cmtTbl =
-  let rhs =
-    match case.pc_rhs.pexp_desc with
-    | Pexp_let _ | Pexp_letmodule _ | Pexp_letexception _ | Pexp_open _
-    | Pexp_sequence _ ->
-      printExpressionBlock ~state
-        ~braces:(ParsetreeViewer.isBracedExpr case.pc_rhs)
-        case.pc_rhs cmtTbl
-    | _ -> (
-      let doc = printExpressionWithComments ~state case.pc_rhs cmtTbl in
-      match Parens.expr case.pc_rhs with
-      | Parenthesized -> addParens doc
-      | _ -> doc)
-  in
-
-  let guard =
-    match case.pc_guard with
-    | None -> Doc.nil
-    | Some expr ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.line;
-             Doc.text "if ";
-             printExpressionWithComments ~state expr cmtTbl;
-           ])
-  in
-  let shouldInlineRhs =
-    match case.pc_rhs.pexp_desc with
-    | Pexp_construct ({txt = Longident.Lident ("()" | "true" | "false")}, _)
-    | Pexp_constant _ | Pexp_ident _ ->
-      true
-    | _ when ParsetreeViewer.isHuggableRhs case.pc_rhs -> true
-    | _ -> false
-  in
-  let shouldIndentPattern =
-    match case.pc_lhs.ppat_desc with
-    | Ppat_or _ -> false
-    | _ -> true
-  in
-  let patternDoc =
-    let doc = printPattern ~state case.pc_lhs cmtTbl in
-    match case.pc_lhs.ppat_desc with
-    | Ppat_constraint _ -> addParens doc
-    | _ -> doc
-  in
-  let content =
-    Doc.concat
-      [
-        (if shouldIndentPattern then Doc.indent patternDoc else patternDoc);
-        Doc.indent guard;
-        Doc.text " =>";
-        Doc.indent
-          (Doc.concat [(if shouldInlineRhs then Doc.space else Doc.line); rhs]);
-      ]
-  in
-  Doc.group (Doc.concat [Doc.text "| "; content])
-
-and printExprFunParameters ~state ~inCallback ~async ~uncurried ~hasConstraint
-    parameters cmtTbl =
-  let dotted = state.uncurried_config |> Res_uncurried.getDotted ~uncurried in
-  match parameters with
-  (* let f = _ => () *)
-  | [
-   ParsetreeViewer.Parameter
-     {
-       attrs = [];
-       lbl = Asttypes.Nolabel;
-       defaultExpr = None;
-       pat = {Parsetree.ppat_desc = Ppat_any; ppat_loc};
-     };
-  ]
-    when not dotted ->
-    let any =
-      let doc = if hasConstraint then Doc.text "(_)" else Doc.text "_" in
-      printComments doc cmtTbl ppat_loc
-    in
-    if async then addAsync any else any
-  (* let f = a => () *)
-  | [
-   ParsetreeViewer.Parameter
-     {
-       attrs = [];
-       lbl = Asttypes.Nolabel;
-       defaultExpr = None;
-       pat =
-         {
-           Parsetree.ppat_desc = Ppat_var stringLoc;
-           Parsetree.ppat_attributes = attrs;
-         };
-     };
-  ]
-    when not dotted ->
-    let txtDoc =
-      let var = printIdentLike stringLoc.txt in
-      let var =
-        match attrs with
-        | [] -> if hasConstraint then addParens var else var
-        | attrs ->
-          let attrs = printAttributes ~state attrs cmtTbl in
-          addParens (Doc.concat [attrs; var])
-      in
-      if async then addAsync var else var
-    in
-    printComments txtDoc cmtTbl stringLoc.loc
-  (* let f = () => () *)
-  | [
-   ParsetreeViewer.Parameter
-     {
-       attrs = [];
-       lbl = Asttypes.Nolabel;
-       defaultExpr = None;
-       pat =
-         {ppat_desc = Ppat_construct ({txt = Longident.Lident "()"; loc}, None)};
-     };
-  ]
-    when not dotted ->
-    let doc =
-      let lparenRparen = Doc.text "()" in
-      if async then addAsync lparenRparen else lparenRparen
-    in
-    printComments doc cmtTbl loc
-  (* let f = (~greeting, ~from as hometown, ~x=?) => () *)
-  | parameters ->
-    let inCallback =
-      match inCallback with
-      | FitsOnOneLine -> true
-      | _ -> false
-    in
-    let maybeAsyncLparen =
-      let lparen = if dotted then Doc.text "(. " else Doc.lparen in
-      if async then addAsync lparen else lparen
-    in
-    let shouldHug = ParsetreeViewer.parametersShouldHug parameters in
-    let printedParamaters =
-      Doc.concat
-        [
-          (if shouldHug || inCallback then Doc.nil else Doc.softLine);
-          Doc.join
-            ~sep:(Doc.concat [Doc.comma; Doc.line])
-            (List.map
-               (fun p -> printExpFunParameter ~state p cmtTbl)
-               parameters);
-        ]
-    in
-    Doc.group
-      (Doc.concat
-         [
-           maybeAsyncLparen;
-           (if shouldHug || inCallback then printedParamaters
-            else
-              Doc.concat
-                [Doc.indent printedParamaters; Doc.trailingComma; Doc.softLine]);
-           Doc.rparen;
-         ])
-
-and printExpFunParameter ~state parameter cmtTbl =
-  match parameter with
-  | ParsetreeViewer.NewTypes {attrs; locs = lbls} ->
-    Doc.group
-      (Doc.concat
-         [
-           printAttributes ~state attrs cmtTbl;
-           Doc.text "type ";
-           (* XX *)
-           Doc.join ~sep:Doc.space
-             (List.map
-                (fun lbl ->
-                  printComments
-                    (printIdentLike lbl.Asttypes.txt)
-                    cmtTbl lbl.Asttypes.loc)
-                lbls);
-         ])
-  | Parameter {attrs; lbl; defaultExpr; pat = pattern} ->
-    let hasBs, attrs = ParsetreeViewer.processBsAttribute attrs in
-    let dotted = if hasBs then Doc.concat [Doc.dot; Doc.space] else Doc.nil in
-    let attrs = printAttributes ~state attrs cmtTbl in
-    (* =defaultValue *)
-    let defaultExprDoc =
-      match defaultExpr with
-      | Some expr ->
-        Doc.concat
-          [Doc.text "="; printExpressionWithComments ~state expr cmtTbl]
-      | None -> Doc.nil
-    in
-    (* ~from as hometown
-     * ~from                   ->  punning *)
-    let labelWithPattern =
-      match (lbl, pattern) with
-      | Asttypes.Nolabel, pattern -> printPattern ~state pattern cmtTbl
-      | ( (Asttypes.Labelled lbl | Optional lbl),
-          {ppat_desc = Ppat_var stringLoc; ppat_attributes} )
-        when lbl = stringLoc.txt ->
-        (* ~d *)
-        Doc.concat
-          [
-            printAttributes ~state ppat_attributes cmtTbl;
-            Doc.text "~";
-            printIdentLike lbl;
-          ]
-      | ( (Asttypes.Labelled lbl | Optional lbl),
-          {
-            ppat_desc = Ppat_constraint ({ppat_desc = Ppat_var {txt}}, typ);
-            ppat_attributes;
-          } )
-        when lbl = txt ->
-        (* ~d: e *)
-        Doc.concat
-          [
-            printAttributes ~state ppat_attributes cmtTbl;
-            Doc.text "~";
-            printIdentLike lbl;
-            Doc.text ": ";
-            printTypExpr ~state typ cmtTbl;
-          ]
-      | (Asttypes.Labelled lbl | Optional lbl), pattern ->
-        (* ~b as c *)
-        Doc.concat
-          [
-            Doc.text "~";
-            printIdentLike lbl;
-            Doc.text " as ";
-            printPattern ~state pattern cmtTbl;
-          ]
-    in
-    let optionalLabelSuffix =
-      match (lbl, defaultExpr) with
-      | Asttypes.Optional _, None -> Doc.text "=?"
-      | _ -> Doc.nil
-    in
-    let doc =
-      Doc.group
-        (Doc.concat
-           [
-             dotted; attrs; labelWithPattern; defaultExprDoc; optionalLabelSuffix;
-           ])
-    in
-    let cmtLoc =
-      match defaultExpr with
-      | None -> (
-        match pattern.ppat_attributes with
-        | ({Location.txt = "res.namedArgLoc"; loc}, _) :: _ ->
-          {loc with loc_end = pattern.ppat_loc.loc_end}
-        | _ -> pattern.ppat_loc)
-      | Some expr ->
-        let startPos =
-          match pattern.ppat_attributes with
-          | ({Location.txt = "res.namedArgLoc"; loc}, _) :: _ -> loc.loc_start
-          | _ -> pattern.ppat_loc.loc_start
-        in
-        {
-          pattern.ppat_loc with
-          loc_start = startPos;
-          loc_end = expr.pexp_loc.loc_end;
-        }
-    in
-    printComments doc cmtTbl cmtLoc
-
-and printExpressionBlock ~state ~braces expr cmtTbl =
-  let rec collectRows acc expr =
-    match expr.Parsetree.pexp_desc with
-    | Parsetree.Pexp_letmodule (modName, modExpr, expr2) ->
-      let name =
-        let doc = Doc.text modName.txt in
-        printComments doc cmtTbl modName.loc
-      in
-      let name, modExpr =
-        match modExpr.pmod_desc with
-        | Pmod_constraint (modExpr2, modType)
-          when not (ParsetreeViewer.hasAwaitAttribute modExpr.pmod_attributes)
-          ->
-          let name =
-            Doc.concat [name; Doc.text ": "; printModType ~state modType cmtTbl]
-          in
-          (name, modExpr2)
-        | _ -> (name, modExpr)
-      in
-      let letModuleDoc =
-        Doc.concat
-          [
-            Doc.text "module ";
-            name;
-            Doc.text " = ";
-            printModExpr ~state modExpr cmtTbl;
-          ]
-      in
-      let loc = {expr.pexp_loc with loc_end = modExpr.pmod_loc.loc_end} in
-      collectRows ((loc, letModuleDoc) :: acc) expr2
-    | Pexp_letexception (extensionConstructor, expr2) ->
-      let loc =
-        let loc =
-          {expr.pexp_loc with loc_end = extensionConstructor.pext_loc.loc_end}
-        in
-        match getFirstLeadingComment cmtTbl loc with
-        | None -> loc
-        | Some comment ->
-          let cmtLoc = Comment.loc comment in
-          {cmtLoc with loc_end = loc.loc_end}
-      in
-      let letExceptionDoc =
-        printExceptionDef ~state extensionConstructor cmtTbl
-      in
-      collectRows ((loc, letExceptionDoc) :: acc) expr2
-    | Pexp_open (overrideFlag, longidentLoc, expr2) ->
-      let openDoc =
-        Doc.concat
-          [
-            Doc.text "open";
-            printOverrideFlag overrideFlag;
-            Doc.space;
-            printLongidentLocation longidentLoc cmtTbl;
-          ]
-      in
-      let loc = {expr.pexp_loc with loc_end = longidentLoc.loc.loc_end} in
-      collectRows ((loc, openDoc) :: acc) expr2
-    | Pexp_sequence (expr1, expr2) ->
-      let exprDoc =
-        let doc = printExpression ~state expr1 cmtTbl in
-        match Parens.expr expr1 with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc expr1 braces
-        | Nothing -> doc
-      in
-      let loc = expr1.pexp_loc in
-      collectRows ((loc, exprDoc) :: acc) expr2
-    | Pexp_let (recFlag, valueBindings, expr2) -> (
-      let loc =
-        let loc =
-          match (valueBindings, List.rev valueBindings) with
-          | vb :: _, lastVb :: _ ->
-            {vb.pvb_loc with loc_end = lastVb.pvb_loc.loc_end}
-          | _ -> Location.none
-        in
-        match getFirstLeadingComment cmtTbl loc with
-        | None -> loc
-        | Some comment ->
-          let cmtLoc = Comment.loc comment in
-          {cmtLoc with loc_end = loc.loc_end}
-      in
-      let recFlag =
-        match recFlag with
-        | Asttypes.Nonrecursive -> Doc.nil
-        | Asttypes.Recursive -> Doc.text "rec "
-      in
-      let letDoc = printValueBindings ~state ~recFlag valueBindings cmtTbl in
-      (* let () = {
-       *   let () = foo()
-       *   ()
-       * }
-       * We don't need to print the () on the last line of the block
-       *)
-      match expr2.pexp_desc with
-      | Pexp_construct ({txt = Longident.Lident "()"}, _) ->
-        List.rev ((loc, letDoc) :: acc)
-      | _ -> collectRows ((loc, letDoc) :: acc) expr2)
-    | _ ->
-      let exprDoc =
-        let doc = printExpression ~state expr cmtTbl in
-        match Parens.expr expr with
-        | Parens.Parenthesized -> addParens doc
-        | Braced braces -> printBraces doc expr braces
-        | Nothing -> doc
-      in
-      List.rev ((expr.pexp_loc, exprDoc) :: acc)
-  in
-  let rows = collectRows [] expr in
-  let block =
-    printList ~getLoc:fst ~nodes:rows
-      ~print:(fun (_, doc) _ -> doc)
-      ~forceBreak:true cmtTbl
-  in
-  Doc.breakableGroup ~forceBreak:true
-    (if braces then
-       Doc.concat
-         [
-           Doc.lbrace;
-           Doc.indent (Doc.concat [Doc.line; block]);
-           Doc.line;
-           Doc.rbrace;
-         ]
-     else block)
-
-(*
- * // user types:
- * let f = (a, b) => { a + b }
- *
- * // printer: everything is on one line
- * let f = (a, b) => { a + b }
- *
- * // user types: over multiple lines
- * let f = (a, b) => {
- *   a + b
- * }
- *
- * // printer: over multiple lines
- * let f = (a, b) => {
- *   a + b
- * }
- *)
-and printBraces doc expr bracesLoc =
-  let overMultipleLines =
-    let open Location in
-    bracesLoc.loc_end.pos_lnum > bracesLoc.loc_start.pos_lnum
-  in
-  match expr.Parsetree.pexp_desc with
-  | Pexp_letmodule _ | Pexp_letexception _ | Pexp_let _ | Pexp_open _
-  | Pexp_sequence _ ->
-    (* already has braces *)
-    doc
-  | _ ->
-    Doc.breakableGroup ~forceBreak:overMultipleLines
-      (Doc.concat
-         [
-           Doc.lbrace;
-           Doc.indent
-             (Doc.concat
-                [
-                  Doc.softLine;
-                  (if Parens.bracedExpr expr then addParens doc else doc);
-                ]);
-           Doc.softLine;
-           Doc.rbrace;
-         ])
-
-and printOverrideFlag overrideFlag =
-  match overrideFlag with
-  | Asttypes.Override -> Doc.text "!"
-  | Fresh -> Doc.nil
-
-and printDirectionFlag flag =
-  match flag with
-  | Asttypes.Downto -> Doc.text " downto "
-  | Asttypes.Upto -> Doc.text " to "
-
-and printExpressionRecordRow ~state (lbl, expr) cmtTbl punningAllowed =
-  let cmtLoc = {lbl.loc with loc_end = expr.pexp_loc.loc_end} in
-  let doc =
-    Doc.group
-      (match expr.pexp_desc with
-      | Pexp_ident {txt = Lident key; loc = _keyLoc}
-        when punningAllowed && Longident.last lbl.txt = key ->
-        (* print punned field *)
-        Doc.concat
-          [
-            printAttributes ~state expr.pexp_attributes cmtTbl;
-            printOptionalLabel expr.pexp_attributes;
-            printLidentPath lbl cmtTbl;
-          ]
-      | _ ->
-        Doc.concat
-          [
-            printLidentPath lbl cmtTbl;
-            Doc.text ": ";
-            printOptionalLabel expr.pexp_attributes;
-            (let doc = printExpressionWithComments ~state expr cmtTbl in
-             match Parens.exprRecordRowRhs expr with
-             | Parens.Parenthesized -> addParens doc
-             | Braced braces -> printBraces doc expr braces
-             | Nothing -> doc);
-          ])
-  in
-  printComments doc cmtTbl cmtLoc
-
-and printBsObjectRow ~state (lbl, expr) cmtTbl =
-  let cmtLoc = {lbl.loc with loc_end = expr.pexp_loc.loc_end} in
-  let lblDoc =
-    let doc =
-      Doc.concat [Doc.text "\""; printLongident lbl.txt; Doc.text "\""]
-    in
-    printComments doc cmtTbl lbl.loc
-  in
-  let doc =
-    Doc.concat
-      [
-        lblDoc;
-        Doc.text ": ";
-        (let doc = printExpressionWithComments ~state expr cmtTbl in
-         match Parens.expr expr with
-         | Parens.Parenthesized -> addParens doc
-         | Braced braces -> printBraces doc expr braces
-         | Nothing -> doc);
-      ]
-  in
-  printComments doc cmtTbl cmtLoc
-
-(* The optional loc indicates whether we need to print the attributes in
- * relation to some location. In practise this means the following:
- *  `@attr type t = string` -> on the same line, print on the same line
- *  `@attr
- *   type t = string` -> attr is on prev line, print the attributes
- *   with a line break between, we respect the users' original layout *)
-and printAttributes ?loc ?(inline = false) ~state (attrs : Parsetree.attributes)
-    cmtTbl =
-  match ParsetreeViewer.filterParsingAttrs attrs with
-  | [] -> Doc.nil
-  | attrs ->
-    let lineBreak =
-      match loc with
-      | None -> Doc.line
-      | Some loc -> (
-        match List.rev attrs with
-        | ({loc = firstLoc}, _) :: _
-          when loc.loc_start.pos_lnum > firstLoc.loc_end.pos_lnum ->
-          Doc.hardLine
-        | _ -> Doc.line)
-    in
-    Doc.concat
-      [
-        Doc.group
-          (Doc.joinWithSep
-             (List.map (fun attr -> printAttribute ~state attr cmtTbl) attrs));
-        (if inline then Doc.space else lineBreak);
-      ]
-
-and printPayload ~state (payload : Parsetree.payload) cmtTbl =
-  match payload with
-  | PStr [] -> Doc.nil
-  | PStr [{pstr_desc = Pstr_eval (expr, attrs)}] ->
-    let exprDoc = printExpressionWithComments ~state expr cmtTbl in
-    let needsParens =
-      match attrs with
-      | [] -> false
-      | _ -> true
-    in
-    let shouldHug = ParsetreeViewer.isHuggableExpression expr in
-    if shouldHug then
-      Doc.concat
-        [
-          Doc.lparen;
-          printAttributes ~state attrs cmtTbl;
-          (if needsParens then addParens exprDoc else exprDoc);
-          Doc.rparen;
-        ]
-    else
-      Doc.concat
-        [
-          Doc.lparen;
-          Doc.indent
-            (Doc.concat
-               [
-                 Doc.softLine;
-                 printAttributes ~state attrs cmtTbl;
-                 (if needsParens then addParens exprDoc else exprDoc);
-               ]);
-          Doc.softLine;
-          Doc.rparen;
-        ]
-  | PStr [({pstr_desc = Pstr_value (_recFlag, _bindings)} as si)] ->
-    addParens (printStructureItem ~state si cmtTbl)
-  | PStr structure -> addParens (printStructure ~state structure cmtTbl)
-  | PTyp typ ->
-    Doc.concat
-      [
-        Doc.lparen;
-        Doc.text ":";
-        Doc.indent (Doc.concat [Doc.line; printTypExpr ~state typ cmtTbl]);
-        Doc.softLine;
-        Doc.rparen;
-      ]
-  | PPat (pat, optExpr) ->
-    let whenDoc =
-      match optExpr with
-      | Some expr ->
-        Doc.concat
-          [
-            Doc.line;
-            Doc.text "if ";
-            printExpressionWithComments ~state expr cmtTbl;
-          ]
-      | None -> Doc.nil
-    in
-    Doc.concat
-      [
-        Doc.lparen;
-        Doc.indent
-          (Doc.concat
-             [
-               Doc.softLine;
-               Doc.text "? ";
-               printPattern ~state pat cmtTbl;
-               whenDoc;
-             ]);
-        Doc.softLine;
-        Doc.rparen;
-      ]
-  | PSig signature ->
-    Doc.concat
-      [
-        Doc.lparen;
-        Doc.text ":";
-        Doc.indent
-          (Doc.concat [Doc.line; printSignature ~state signature cmtTbl]);
-        Doc.softLine;
-        Doc.rparen;
-      ]
-
-and printAttribute ?(standalone = false) ~state
-    ((id, payload) : Parsetree.attribute) cmtTbl =
-  match (id, payload) with
-  | ( {txt = "res.doc"},
-      PStr
-        [
-          {
-            pstr_desc =
-              Pstr_eval ({pexp_desc = Pexp_constant (Pconst_string (txt, _))}, _);
-          };
-        ] ) ->
-    ( Doc.concat
-        [
-          Doc.text (if standalone then "/***" else "/**");
-          Doc.text txt;
-          Doc.text "*/";
-        ],
-      Doc.hardLine )
-  | _ ->
-    let id =
-      match id.txt with
-      | "uncurried.swap" ->
-        state.uncurried_config <- Config.Swap;
-        id
-      | "uncurried" ->
-        state.uncurried_config <- Config.Uncurried;
-        id
-      | _ -> id
-    in
-    ( Doc.group
-        (Doc.concat
-           [
-             Doc.text (if standalone then "@@" else "@");
-             Doc.text (convertBsExternalAttribute id.txt);
-             printPayload ~state payload cmtTbl;
-           ]),
-      Doc.line )
-
-and printModExpr ~state modExpr cmtTbl =
-  let doc =
-    match modExpr.pmod_desc with
-    | Pmod_ident longidentLoc -> printLongidentLocation longidentLoc cmtTbl
-    | Pmod_structure [] ->
-      let shouldBreak =
-        modExpr.pmod_loc.loc_start.pos_lnum < modExpr.pmod_loc.loc_end.pos_lnum
-      in
-      Doc.breakableGroup ~forceBreak:shouldBreak
-        (Doc.concat
-           [Doc.lbrace; printCommentsInside cmtTbl modExpr.pmod_loc; Doc.rbrace])
-    | Pmod_structure structure ->
-      Doc.breakableGroup ~forceBreak:true
-        (Doc.concat
-           [
-             Doc.lbrace;
-             Doc.indent
-               (Doc.concat
-                  [Doc.softLine; printStructure ~state structure cmtTbl]);
-             Doc.softLine;
-             Doc.rbrace;
-           ])
-    | Pmod_unpack expr ->
-      let shouldHug =
-        match expr.pexp_desc with
-        | Pexp_let _ -> true
-        | Pexp_constraint
-            ({pexp_desc = Pexp_let _}, {ptyp_desc = Ptyp_package _packageType})
-          ->
-          true
-        | _ -> false
-      in
-      let expr, moduleConstraint =
-        match expr.pexp_desc with
-        | Pexp_constraint
-            (expr, {ptyp_desc = Ptyp_package packageType; ptyp_loc}) ->
-          let packageDoc =
-            let doc =
-              printPackageType ~state ~printModuleKeywordAndParens:false
-                packageType cmtTbl
-            in
-            printComments doc cmtTbl ptyp_loc
-          in
-          let typeDoc =
-            Doc.group
-              (Doc.concat
-                 [Doc.text ":"; Doc.indent (Doc.concat [Doc.line; packageDoc])])
-          in
-          (expr, typeDoc)
-        | _ -> (expr, Doc.nil)
-      in
-      let unpackDoc =
-        Doc.group
-          (Doc.concat
-             [printExpressionWithComments ~state expr cmtTbl; moduleConstraint])
-      in
-      Doc.group
-        (Doc.concat
-           [
-             Doc.text "unpack(";
-             (if shouldHug then unpackDoc
-              else
-                Doc.concat
-                  [
-                    Doc.indent (Doc.concat [Doc.softLine; unpackDoc]);
-                    Doc.softLine;
-                  ]);
-             Doc.rparen;
-           ])
-    | Pmod_extension extension ->
-      printExtension ~state ~atModuleLvl:false extension cmtTbl
-    | Pmod_apply _ ->
-      let args, callExpr = ParsetreeViewer.modExprApply modExpr in
-      let isUnitSugar =
-        match args with
-        | [{pmod_desc = Pmod_structure []}] -> true
-        | _ -> false
-      in
-      let shouldHug =
-        match args with
-        | [{pmod_desc = Pmod_structure _}] -> true
-        | _ -> false
-      in
-      Doc.group
-        (Doc.concat
-           [
-             printModExpr ~state callExpr cmtTbl;
-             (if isUnitSugar then
-                printModApplyArg ~state (List.hd args [@doesNotRaise]) cmtTbl
-              else
-                Doc.concat
-                  [
-                    Doc.lparen;
-                    (if shouldHug then
-                       printModApplyArg ~state
-                         (List.hd args [@doesNotRaise])
-                         cmtTbl
-                     else
-                       Doc.indent
-                         (Doc.concat
-                            [
-                              Doc.softLine;
-                              Doc.join
-                                ~sep:(Doc.concat [Doc.comma; Doc.line])
-                                (List.map
-                                   (fun modArg ->
-                                     printModApplyArg ~state modArg cmtTbl)
-                                   args);
-                            ]));
-                    (if not shouldHug then
-                       Doc.concat [Doc.trailingComma; Doc.softLine]
-                     else Doc.nil);
-                    Doc.rparen;
-                  ]);
-           ])
-    | Pmod_constraint (modExpr, modType) ->
-      Doc.concat
-        [
-          printModExpr ~state modExpr cmtTbl;
-          Doc.text ": ";
-          printModType ~state modType cmtTbl;
-        ]
-    | Pmod_functor _ -> printModFunctor ~state modExpr cmtTbl
-  in
-  let doc =
-    if ParsetreeViewer.hasAwaitAttribute modExpr.pmod_attributes then
-      match modExpr.pmod_desc with
-      | Pmod_constraint _ ->
-        Doc.concat [Doc.text "await "; Doc.lparen; doc; Doc.rparen]
-      | _ -> Doc.concat [Doc.text "await "; doc]
-    else doc
-  in
-  printComments doc cmtTbl modExpr.pmod_loc
-
-and printModFunctor ~state modExpr cmtTbl =
-  let parameters, returnModExpr = ParsetreeViewer.modExprFunctor modExpr in
-  (* let shouldInline = match returnModExpr.pmod_desc with *)
-  (* | Pmod_structure _ | Pmod_ident _ -> true *)
-  (* | Pmod_constraint ({pmod_desc = Pmod_structure _}, _) -> true *)
-  (* | _ -> false *)
-  (* in *)
-  let returnConstraint, returnModExpr =
-    match returnModExpr.pmod_desc with
-    | Pmod_constraint (modExpr, modType) ->
-      let constraintDoc =
-        let doc = printModType ~state modType cmtTbl in
-        if Parens.modExprFunctorConstraint modType then addParens doc else doc
-      in
-      let modConstraint = Doc.concat [Doc.text ": "; constraintDoc] in
-      (modConstraint, printModExpr ~state modExpr cmtTbl)
-    | _ -> (Doc.nil, printModExpr ~state returnModExpr cmtTbl)
-  in
-  let parametersDoc =
-    match parameters with
-    | [(attrs, {txt = "*"}, None)] ->
-      Doc.group
-        (Doc.concat [printAttributes ~state attrs cmtTbl; Doc.text "()"])
-    | [([], {txt = lbl}, None)] -> Doc.text lbl
-    | parameters ->
-      Doc.group
-        (Doc.concat
-           [
-             Doc.lparen;
-             Doc.indent
-               (Doc.concat
-                  [
-                    Doc.softLine;
-                    Doc.join
-                      ~sep:(Doc.concat [Doc.comma; Doc.line])
-                      (List.map
-                         (fun param -> printModFunctorParam ~state param cmtTbl)
-                         parameters);
-                  ]);
-             Doc.trailingComma;
-             Doc.softLine;
-             Doc.rparen;
-           ])
-  in
-  Doc.group
-    (Doc.concat
-       [parametersDoc; returnConstraint; Doc.text " => "; returnModExpr])
-
-and printModFunctorParam ~state (attrs, lbl, optModType) cmtTbl =
-  let cmtLoc =
-    match optModType with
-    | None -> lbl.Asttypes.loc
-    | Some modType ->
-      {lbl.loc with loc_end = modType.Parsetree.pmty_loc.loc_end}
-  in
-  let attrs = printAttributes ~state attrs cmtTbl in
-  let lblDoc =
-    let doc = if lbl.txt = "*" then Doc.text "()" else Doc.text lbl.txt in
-    printComments doc cmtTbl lbl.loc
-  in
-  let doc =
-    Doc.group
-      (Doc.concat
-         [
-           attrs;
-           lblDoc;
-           (match optModType with
-           | None -> Doc.nil
-           | Some modType ->
-             Doc.concat [Doc.text ": "; printModType ~state modType cmtTbl]);
-         ])
-  in
-  printComments doc cmtTbl cmtLoc
-
-and printModApplyArg ~state modExpr cmtTbl =
-  match modExpr.pmod_desc with
-  | Pmod_structure [] -> Doc.text "()"
-  | _ -> printModExpr ~state modExpr cmtTbl
-
-and printExceptionDef ~state (constr : Parsetree.extension_constructor) cmtTbl =
-  let kind =
-    match constr.pext_kind with
-    | Pext_rebind longident ->
-      Doc.indent
-        (Doc.concat
-           [Doc.text " ="; Doc.line; printLongidentLocation longident cmtTbl])
-    | Pext_decl (Pcstr_tuple [], None) -> Doc.nil
-    | Pext_decl (args, gadt) ->
-      let gadtDoc =
-        match gadt with
-        | Some typ -> Doc.concat [Doc.text ": "; printTypExpr ~state typ cmtTbl]
-        | None -> Doc.nil
-      in
-      Doc.concat
-        [printConstructorArguments ~state ~indent:false args cmtTbl; gadtDoc]
-  in
-  let name =
-    printComments (Doc.text constr.pext_name.txt) cmtTbl constr.pext_name.loc
-  in
-  let doc =
-    Doc.group
-      (Doc.concat
-         [
-           printAttributes ~state constr.pext_attributes cmtTbl;
-           Doc.text "exception ";
-           name;
-           kind;
-         ])
-  in
-  printComments doc cmtTbl constr.pext_loc
-
-and printExtensionConstructor ~state (constr : Parsetree.extension_constructor)
-    cmtTbl i =
-  let attrs = printAttributes ~state constr.pext_attributes cmtTbl in
-  let bar =
-    if i > 0 then Doc.text "| " else Doc.ifBreaks (Doc.text "| ") Doc.nil
-  in
-  let kind =
-    match constr.pext_kind with
-    | Pext_rebind longident ->
-      Doc.indent
-        (Doc.concat
-           [Doc.text " ="; Doc.line; printLongidentLocation longident cmtTbl])
-    | Pext_decl (Pcstr_tuple [], None) -> Doc.nil
-    | Pext_decl (args, gadt) ->
-      let gadtDoc =
-        match gadt with
-        | Some typ -> Doc.concat [Doc.text ": "; printTypExpr ~state typ cmtTbl]
-        | None -> Doc.nil
-      in
-      Doc.concat
-        [printConstructorArguments ~state ~indent:false args cmtTbl; gadtDoc]
-  in
-  let name =
-    printComments (Doc.text constr.pext_name.txt) cmtTbl constr.pext_name.loc
-  in
-  Doc.concat [bar; Doc.group (Doc.concat [attrs; name; kind])]
-
-let printTypeParams params = printTypeParams ~state:(State.init ()) params
-let printTypExpr t = printTypExpr ~state:(State.init ()) t
-let printExpression e = printExpression ~state:(State.init ()) e
-let printPattern p = printPattern ~state:(State.init ()) p
-
-let printImplementation ~width (s : Parsetree.structure) ~comments =
-  let cmtTbl = CommentTable.make () in
-  CommentTable.walkStructure s cmtTbl comments;
-  (* CommentTable.log cmtTbl; *)
-  let doc = printStructure ~state:(State.init ()) s cmtTbl in
-  (* Doc.debug doc; *)
-  Doc.toString ~width doc ^ "\n"
-
-let printInterface ~width (s : Parsetree.signature) ~comments =
-  let cmtTbl = CommentTable.make () in
-  CommentTable.walkSignature s cmtTbl comments;
-  Doc.toString ~width (printSignature ~state:(State.init ()) s cmtTbl) ^ "\n"
-
-let printStructure = printStructure ~state:(State.init ())
diff --git a/jscomp/syntax/src/res_printer.mli b/jscomp/syntax/src/res_printer.mli
deleted file mode 100644
index 3647dc3..0000000
--- a/jscomp/syntax/src/res_printer.mli
+++ /dev/null
@@ -1,28 +0,0 @@
-val convertBsExternalAttribute : string -> string
-val convertBsExtension : string -> string
-
-val printTypeParams :
-  (Parsetree.core_type * Asttypes.variance) list ->
-  Res_comments_table.t ->
-  Res_doc.t
-
-val printLongident : Longident.t -> Res_doc.t
-
-val printTypExpr : Parsetree.core_type -> Res_comments_table.t -> Res_doc.t
-
-val addParens : Res_doc.t -> Res_doc.t
-
-val printExpression : Parsetree.expression -> Res_comments_table.t -> Res_doc.t
-
-val printPattern : Parsetree.pattern -> Res_comments_table.t -> Res_doc.t
-[@@live]
-
-val printStructure : Parsetree.structure -> Res_comments_table.t -> Res_doc.t
-[@@live]
-
-val printImplementation :
-  width:int -> Parsetree.structure -> comments:Res_comment.t list -> string
-val printInterface :
-  width:int -> Parsetree.signature -> comments:Res_comment.t list -> string
-
-val polyVarIdentToString : string -> string [@@live]
diff --git a/jscomp/syntax/src/res_scanner.ml b/jscomp/syntax/src/res_scanner.ml
deleted file mode 100644
index 40d7590..0000000
--- a/jscomp/syntax/src/res_scanner.ml
+++ /dev/null
@@ -1,948 +0,0 @@
-module Diagnostics = Res_diagnostics
-module Token = Res_token
-module Comment = Res_comment
-
-type mode = Jsx | Diamond
-
-(* We hide the implementation detail of the scanner reading character. Our char
-   will also contain the special -1 value to indicate end-of-file. This isn't
-   ideal; we should clean this up *)
-let hackyEOFChar = Char.unsafe_chr (-1)
-type charEncoding = Char.t
-
-type t = {
-  filename: string;
-  src: string;
-  mutable err:
-    startPos:Lexing.position ->
-    endPos:Lexing.position ->
-    Diagnostics.category ->
-    unit;
-  mutable ch: charEncoding; (* current character *)
-  mutable offset: int; (* current byte offset *)
-  mutable offset16: int;
-      (* current number of utf16 code units since line start *)
-  mutable lineOffset: int; (* current line offset *)
-  mutable lnum: int; (* current line number *)
-  mutable mode: mode list;
-}
-
-let setDiamondMode scanner = scanner.mode <- Diamond :: scanner.mode
-
-let setJsxMode scanner = scanner.mode <- Jsx :: scanner.mode
-
-let popMode scanner mode =
-  match scanner.mode with
-  | m :: ms when m = mode -> scanner.mode <- ms
-  | _ -> ()
-
-let inDiamondMode scanner =
-  match scanner.mode with
-  | Diamond :: _ -> true
-  | _ -> false
-
-let inJsxMode scanner =
-  match scanner.mode with
-  | Jsx :: _ -> true
-  | _ -> false
-
-let position scanner =
-  Lexing.
-    {
-      pos_fname = scanner.filename;
-      (* line number *)
-      pos_lnum = scanner.lnum;
-      (* offset of the beginning of the line (number
-         of bytes between the beginning of the scanner and the beginning
-         of the line) *)
-      pos_bol = scanner.lineOffset;
-      (* [pos_cnum - pos_bol]  is the number of utf16 code units since line start *)
-      pos_cnum = scanner.lineOffset + scanner.offset16;
-    }
-
-(* Small debugging util
-   ❯ echo 'let msg = "hello"' | ./lib/rescript.exe
-   let msg = "hello"
-   ^-^ let 0-3
-   let msg = "hello"
-       ^-^ msg 4-7
-   let msg = "hello"
-           ^ = 8-9
-   let msg = "hello"
-             ^-----^ string "hello" 10-17
-   let msg = "hello"
-                     ^ eof 18-18
-   let msg = "hello"
-*)
-let _printDebug ~startPos ~endPos scanner token =
-  let open Lexing in
-  print_string scanner.src;
-  print_string ((String.make [@doesNotRaise]) startPos.pos_cnum ' ');
-  print_char '^';
-  (match endPos.pos_cnum - startPos.pos_cnum with
-  | 0 -> if token = Token.Eof then () else assert false
-  | 1 -> ()
-  | n ->
-    print_string ((String.make [@doesNotRaise]) (n - 2) '-');
-    print_char '^');
-  print_char ' ';
-  print_string (Res_token.toString token);
-  print_char ' ';
-  print_int startPos.pos_cnum;
-  print_char '-';
-  print_int endPos.pos_cnum;
-  print_endline ""
-[@@live]
-
-let next scanner =
-  let nextOffset = scanner.offset + 1 in
-  let utf16len =
-    match Ext_utf8.classify scanner.ch with
-    | Single _ | Invalid -> 1
-    | Leading (n, _) -> ( (((n + 1) / 2) [@doesNotRaise]))
-    | Cont _ -> 0
-  in
-  let newline =
-    scanner.ch = '\n'
-    (* What about CRLF (\r + \n) on windows?
-       \r\n will always be terminated by a \n
-       -> we can just bump the line count on \n *)
-  in
-  if newline then (
-    scanner.lineOffset <- nextOffset;
-    scanner.offset16 <- 0;
-    scanner.lnum <- scanner.lnum + 1)
-  else scanner.offset16 <- scanner.offset16 + utf16len;
-  if nextOffset < String.length scanner.src then (
-    scanner.offset <- nextOffset;
-    scanner.ch <- String.unsafe_get scanner.src nextOffset)
-  else (
-    scanner.offset <- String.length scanner.src;
-    scanner.offset16 <- scanner.offset - scanner.lineOffset;
-    scanner.ch <- hackyEOFChar)
-
-let next2 scanner =
-  next scanner;
-  next scanner
-
-let next3 scanner =
-  next scanner;
-  next scanner;
-  next scanner
-
-let peek scanner =
-  if scanner.offset + 1 < String.length scanner.src then
-    String.unsafe_get scanner.src (scanner.offset + 1)
-  else hackyEOFChar
-
-let peek2 scanner =
-  if scanner.offset + 2 < String.length scanner.src then
-    String.unsafe_get scanner.src (scanner.offset + 2)
-  else hackyEOFChar
-
-let peek3 scanner =
-  if scanner.offset + 3 < String.length scanner.src then
-    String.unsafe_get scanner.src (scanner.offset + 3)
-  else hackyEOFChar
-
-let make ~filename src =
-  {
-    filename;
-    src;
-    err = (fun ~startPos:_ ~endPos:_ _ -> ());
-    ch = (if src = "" then hackyEOFChar else String.unsafe_get src 0);
-    offset = 0;
-    offset16 = 0;
-    lineOffset = 0;
-    lnum = 1;
-    mode = [];
-  }
-
-(* generic helpers *)
-
-let isWhitespace ch =
-  match ch with
-  | ' ' | '\t' | '\n' | '\r' -> true
-  | _ -> false
-
-let rec skipWhitespace scanner =
-  if isWhitespace scanner.ch then (
-    next scanner;
-    skipWhitespace scanner)
-
-let digitValue ch =
-  match ch with
-  | '0' .. '9' -> Char.code ch - 48
-  | 'a' .. 'f' -> Char.code ch - Char.code 'a' + 10
-  | 'A' .. 'F' -> Char.code ch + 32 - Char.code 'a' + 10
-  | _ -> 16 (* larger than any legal value *)
-
-(* scanning helpers *)
-
-let scanIdentifier scanner =
-  let startOff = scanner.offset in
-  let rec skipGoodChars scanner =
-    match (scanner.ch, inJsxMode scanner) with
-    | ('A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '_' | '\''), false ->
-      next scanner;
-      skipGoodChars scanner
-    | ('A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '_' | '\'' | '-'), true ->
-      next scanner;
-      skipGoodChars scanner
-    | _ -> ()
-  in
-  skipGoodChars scanner;
-  let str =
-    (String.sub [@doesNotRaise]) scanner.src startOff (scanner.offset - startOff)
-  in
-  if '{' == scanner.ch && str = "list" then (
-    next scanner;
-    (* TODO: this isn't great *)
-    Token.lookupKeyword "list{")
-  else Token.lookupKeyword str
-
-let scanDigits scanner ~base =
-  if base <= 10 then
-    let rec loop scanner =
-      match scanner.ch with
-      | '0' .. '9' | '_' ->
-        next scanner;
-        loop scanner
-      | _ -> ()
-    in
-    loop scanner
-  else
-    let rec loop scanner =
-      match scanner.ch with
-      (* hex *)
-      | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' | '_' ->
-        next scanner;
-        loop scanner
-      | _ -> ()
-    in
-    loop scanner
-
-(* float: (0…9) { 0…9∣ _ } [. { 0…9∣ _ }] [(e∣ E) [+∣ -] (0…9) { 0…9∣ _ }]   *)
-let scanNumber scanner =
-  let startOff = scanner.offset in
-
-  (* integer part *)
-  let base =
-    match scanner.ch with
-    | '0' -> (
-      match peek scanner with
-      | 'x' | 'X' ->
-        next2 scanner;
-        16
-      | 'o' | 'O' ->
-        next2 scanner;
-        8
-      | 'b' | 'B' ->
-        next2 scanner;
-        2
-      | _ ->
-        next scanner;
-        8)
-    | _ -> 10
-  in
-  scanDigits scanner ~base;
-
-  (*  *)
-  let isFloat =
-    if '.' == scanner.ch then (
-      next scanner;
-      scanDigits scanner ~base;
-      true)
-    else false
-  in
-
-  (* exponent part *)
-  let isFloat =
-    match scanner.ch with
-    | 'e' | 'E' | 'p' | 'P' ->
-      (match peek scanner with
-      | '+' | '-' -> next2 scanner
-      | _ -> next scanner);
-      scanDigits scanner ~base;
-      true
-    | _ -> isFloat
-  in
-  let literal =
-    (String.sub [@doesNotRaise]) scanner.src startOff (scanner.offset - startOff)
-  in
-
-  (* suffix *)
-  let suffix =
-    match scanner.ch with
-    | ('g' .. 'z' | 'G' .. 'Z') as ch ->
-      next scanner;
-      Some ch
-    | _ -> None
-  in
-  if isFloat then Token.Float {f = literal; suffix}
-  else Token.Int {i = literal; suffix}
-
-let scanExoticIdentifier scanner =
-  (* TODO: are we disregarding the current char...? Should be a quote *)
-  next scanner;
-  let buffer = Buffer.create 20 in
-  let startPos = position scanner in
-
-  let rec scan () =
-    match scanner.ch with
-    | '"' -> next scanner
-    | '\n' | '\r' ->
-      (* line break *)
-      let endPos = position scanner in
-      scanner.err ~startPos ~endPos
-        (Diagnostics.message "A quoted identifier can't contain line breaks.");
-      next scanner
-    | ch when ch == hackyEOFChar ->
-      let endPos = position scanner in
-      scanner.err ~startPos ~endPos
-        (Diagnostics.message "Did you forget a \" here?")
-    | ch ->
-      Buffer.add_char buffer ch;
-      next scanner;
-      scan ()
-  in
-  scan ();
-  (* TODO: do we really need to create a new buffer instead of substring once? *)
-  Token.Lident (Buffer.contents buffer)
-
-let scanStringEscapeSequence ~startPos scanner =
-  let scan ~n ~base ~max =
-    let rec loop n x =
-      if n == 0 then x
-      else
-        let d = digitValue scanner.ch in
-        if d >= base then (
-          let pos = position scanner in
-          let msg =
-            if scanner.ch == hackyEOFChar then "unclosed escape sequence"
-            else "unknown escape sequence"
-          in
-          scanner.err ~startPos ~endPos:pos (Diagnostics.message msg);
-          -1)
-        else
-          let () = next scanner in
-          loop (n - 1) ((x * base) + d)
-    in
-    let x = loop n 0 in
-    if x > max || (0xD800 <= x && x < 0xE000) then
-      let pos = position scanner in
-      let msg = "escape sequence is invalid unicode code point" in
-      scanner.err ~startPos ~endPos:pos (Diagnostics.message msg)
-  in
-  match scanner.ch with
-  (* \ already consumed *)
-  | 'n' | 't' | 'b' | 'r' | '\\' | ' ' | '\'' | '"' -> next scanner
-  | '0'
-    when let c = peek scanner in
-         c < '0' || c > '9' ->
-    (* Allow \0 *)
-    next scanner
-  | '0' .. '9' -> scan ~n:3 ~base:10 ~max:255
-  | 'x' ->
-    (* hex *)
-    next scanner;
-    scan ~n:2 ~base:16 ~max:255
-  | 'u' -> (
-    next scanner;
-    match scanner.ch with
-    | '{' -> (
-      (* unicode code point escape sequence: '\u{7A}', one or more hex digits *)
-      next scanner;
-      let x = ref 0 in
-      while
-        match scanner.ch with
-        | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' -> true
-        | _ -> false
-      do
-        x := (!x * 16) + digitValue scanner.ch;
-        next scanner
-      done;
-      (* consume '}' in '\u{7A}' *)
-      match scanner.ch with
-      | '}' -> next scanner
-      | _ -> ())
-    | _ -> scan ~n:4 ~base:16 ~max:Res_utf8.max)
-  | _ ->
-    (* unknown escape sequence
-     * TODO: we should warn the user here. Let's not make it a hard error for now, for reason compat *)
-    (*
-      let pos = position scanner in
-      let msg =
-        if ch == -1 then "unclosed escape sequence"
-        else "unknown escape sequence"
-      in
-      scanner.err ~startPos ~endPos:pos (Diagnostics.message msg)
-     *)
-    ()
-
-let scanString scanner =
-  (* assumption: we've just matched a quote *)
-  let startPosWithQuote = position scanner in
-  next scanner;
-
-  (* If the text needs changing, a buffer is used *)
-  let buf = Buffer.create 0 in
-  let firstCharOffset = scanner.offset in
-  let lastOffsetInBuf = ref firstCharOffset in
-
-  let bringBufUpToDate ~startOffset =
-    let strUpToNow =
-      (String.sub scanner.src !lastOffsetInBuf
-         (startOffset - !lastOffsetInBuf) [@doesNotRaise])
-    in
-    Buffer.add_string buf strUpToNow;
-    lastOffsetInBuf := startOffset
-  in
-
-  let result ~firstCharOffset ~lastCharOffset =
-    if Buffer.length buf = 0 then
-      (String.sub [@doesNotRaise]) scanner.src firstCharOffset
-        (lastCharOffset - firstCharOffset)
-    else (
-      bringBufUpToDate ~startOffset:lastCharOffset;
-      Buffer.contents buf)
-  in
-
-  let rec scan () =
-    match scanner.ch with
-    | '"' ->
-      let lastCharOffset = scanner.offset in
-      next scanner;
-      result ~firstCharOffset ~lastCharOffset
-    | '\\' ->
-      let startPos = position scanner in
-      let startOffset = scanner.offset + 1 in
-      next scanner;
-      scanStringEscapeSequence ~startPos scanner;
-      let endOffset = scanner.offset in
-      convertOctalToHex ~startOffset ~endOffset
-    | ch when ch == hackyEOFChar ->
-      let endPos = position scanner in
-      scanner.err ~startPos:startPosWithQuote ~endPos Diagnostics.unclosedString;
-      let lastCharOffset = scanner.offset in
-      result ~firstCharOffset ~lastCharOffset
-    | _ ->
-      next scanner;
-      scan ()
-  and convertOctalToHex ~startOffset ~endOffset =
-    let len = endOffset - startOffset in
-    let isDigit = function
-      | '0' .. '9' -> true
-      | _ -> false
-    in
-    let txt = scanner.src in
-    let isNumericEscape =
-      len = 3
-      && (isDigit txt.[startOffset] [@doesNotRaise])
-      && (isDigit txt.[startOffset + 1] [@doesNotRaise])
-      && (isDigit txt.[startOffset + 2] [@doesNotRaise])
-    in
-    if isNumericEscape then (
-      let strDecimal = (String.sub txt startOffset 3 [@doesNotRaise]) in
-      bringBufUpToDate ~startOffset;
-      let strHex = Res_string.convertDecimalToHex ~strDecimal in
-      lastOffsetInBuf := startOffset + 3;
-      Buffer.add_string buf strHex;
-      scan ())
-    else scan ()
-  in
-  Token.String (scan ())
-
-let scanEscape scanner =
-  (* '\' consumed *)
-  let offset = scanner.offset - 1 in
-  let convertNumber scanner ~n ~base =
-    let x = ref 0 in
-    for _ = n downto 1 do
-      let d = digitValue scanner.ch in
-      x := (!x * base) + d;
-      next scanner
-    done;
-    let c = !x in
-    if Res_utf8.isValidCodePoint c then c else Res_utf8.repl
-  in
-  let codepoint =
-    match scanner.ch with
-    | '0' .. '9' -> convertNumber scanner ~n:3 ~base:10
-    | 'b' ->
-      next scanner;
-      8
-    | 'n' ->
-      next scanner;
-      10
-    | 'r' ->
-      next scanner;
-      13
-    | 't' ->
-      next scanner;
-      009
-    | 'x' ->
-      next scanner;
-      convertNumber scanner ~n:2 ~base:16
-    | 'o' ->
-      next scanner;
-      convertNumber scanner ~n:3 ~base:8
-    | 'u' -> (
-      next scanner;
-      match scanner.ch with
-      | '{' ->
-        (* unicode code point escape sequence: '\u{7A}', one or more hex digits *)
-        next scanner;
-        let x = ref 0 in
-        while
-          match scanner.ch with
-          | '0' .. '9' | 'a' .. 'f' | 'A' .. 'F' -> true
-          | _ -> false
-        do
-          x := (!x * 16) + digitValue scanner.ch;
-          next scanner
-        done;
-        (* consume '}' in '\u{7A}' *)
-        (match scanner.ch with
-        | '}' -> next scanner
-        | _ -> ());
-        let c = !x in
-        if Res_utf8.isValidCodePoint c then c else Res_utf8.repl
-      | _ ->
-        (* unicode escape sequence: '\u007A', exactly 4 hex digits *)
-        convertNumber scanner ~n:4 ~base:16)
-    | ch ->
-      next scanner;
-      Char.code ch
-  in
-  let contents =
-    (String.sub [@doesNotRaise]) scanner.src offset (scanner.offset - offset)
-  in
-  next scanner;
-  (* Consume \' *)
-  (* TODO: do we know it's \' ? *)
-  Token.Codepoint {c = codepoint; original = contents}
-
-let scanSingleLineComment scanner =
-  let startOff = scanner.offset in
-  let startPos = position scanner in
-  let rec skip scanner =
-    match scanner.ch with
-    | '\n' | '\r' -> ()
-    | ch when ch == hackyEOFChar -> ()
-    | _ ->
-      next scanner;
-      skip scanner
-  in
-  skip scanner;
-  let endPos = position scanner in
-  Token.Comment
-    (Comment.makeSingleLineComment
-       ~loc:Location.{loc_start = startPos; loc_end = endPos; loc_ghost = false}
-       ((String.sub [@doesNotRaise]) scanner.src startOff
-          (scanner.offset - startOff)))
-
-let scanMultiLineComment scanner =
-  (* assumption: we're only ever using this helper in `scan` after detecting a comment *)
-  let docComment = peek2 scanner = '*' && peek3 scanner <> '/' (* no /**/ *) in
-  let standalone = docComment && peek3 scanner = '*' (* /*** *) in
-  let contentStartOff =
-    scanner.offset + if docComment then if standalone then 4 else 3 else 2
-  in
-  let startPos = position scanner in
-  let rec scan ~depth =
-    (* invariant: depth > 0 right after this match. See assumption *)
-    match (scanner.ch, peek scanner) with
-    | '/', '*' ->
-      next2 scanner;
-      scan ~depth:(depth + 1)
-    | '*', '/' ->
-      next2 scanner;
-      if depth > 1 then scan ~depth:(depth - 1)
-    | ch, _ when ch == hackyEOFChar ->
-      let endPos = position scanner in
-      scanner.err ~startPos ~endPos Diagnostics.unclosedComment
-    | _ ->
-      next scanner;
-      scan ~depth
-  in
-  scan ~depth:0;
-  let length = scanner.offset - 2 - contentStartOff in
-  let length = if length < 0 (* in case of EOF *) then 0 else length in
-  Token.Comment
-    (Comment.makeMultiLineComment ~docComment ~standalone
-       ~loc:
-         Location.
-           {loc_start = startPos; loc_end = position scanner; loc_ghost = false}
-       ((String.sub [@doesNotRaise]) scanner.src contentStartOff length))
-
-let scanTemplateLiteralToken scanner =
-  let startOff = scanner.offset in
-
-  (* if starting } here, consume it *)
-  if scanner.ch == '}' then next scanner;
-
-  let startPos = position scanner in
-
-  let rec scan () =
-    let lastPos = position scanner in
-    match scanner.ch with
-    | '`' ->
-      next scanner;
-      let contents =
-        (String.sub [@doesNotRaise]) scanner.src startOff
-          (scanner.offset - 1 - startOff)
-      in
-      Token.TemplateTail (contents, lastPos)
-    | '$' -> (
-      match peek scanner with
-      | '{' ->
-        next2 scanner;
-        let contents =
-          (String.sub [@doesNotRaise]) scanner.src startOff
-            (scanner.offset - 2 - startOff)
-        in
-        Token.TemplatePart (contents, lastPos)
-      | _ ->
-        next scanner;
-        scan ())
-    | '\\' -> (
-      match peek scanner with
-      | '`' | '\\' | '$' | '\n' | '\r' ->
-        (* line break *)
-        next2 scanner;
-        scan ()
-      | _ ->
-        next scanner;
-        scan ())
-    | ch when ch = hackyEOFChar ->
-      let endPos = position scanner in
-      scanner.err ~startPos ~endPos Diagnostics.unclosedTemplate;
-      let contents =
-        (String.sub [@doesNotRaise]) scanner.src startOff
-          (max (scanner.offset - 1 - startOff) 0)
-      in
-      Token.TemplateTail (contents, lastPos)
-    | _ ->
-      next scanner;
-      scan ()
-  in
-  let token = scan () in
-  let endPos = position scanner in
-  (startPos, endPos, token)
-
-let rec scan scanner =
-  skipWhitespace scanner;
-  let startPos = position scanner in
-
-  let token =
-    match scanner.ch with
-    (* peeking 0 char *)
-    | 'A' .. 'Z' | 'a' .. 'z' -> scanIdentifier scanner
-    | '0' .. '9' -> scanNumber scanner
-    | '`' ->
-      next scanner;
-      Token.Backtick
-    | '~' ->
-      next scanner;
-      Token.Tilde
-    | '?' ->
-      next scanner;
-      Token.Question
-    | ';' ->
-      next scanner;
-      Token.Semicolon
-    | '(' ->
-      next scanner;
-      Token.Lparen
-    | ')' ->
-      next scanner;
-      Token.Rparen
-    | '[' ->
-      next scanner;
-      Token.Lbracket
-    | ']' ->
-      next scanner;
-      Token.Rbracket
-    | '{' ->
-      next scanner;
-      Token.Lbrace
-    | '}' ->
-      next scanner;
-      Token.Rbrace
-    | ',' ->
-      next scanner;
-      Token.Comma
-    | '"' -> scanString scanner
-    (* peeking 1 char *)
-    | '_' -> (
-      match peek scanner with
-      | 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '_' -> scanIdentifier scanner
-      | _ ->
-        next scanner;
-        Token.Underscore)
-    | '#' -> (
-      match peek scanner with
-      | '=' ->
-        next2 scanner;
-        Token.HashEqual
-      | _ ->
-        next scanner;
-        Token.Hash)
-    | '*' -> (
-      match peek scanner with
-      | '*' ->
-        next2 scanner;
-        Token.Exponentiation
-      | '.' ->
-        next2 scanner;
-        Token.AsteriskDot
-      | _ ->
-        next scanner;
-        Token.Asterisk)
-    | '@' -> (
-      match peek scanner with
-      | '@' ->
-        next2 scanner;
-        Token.AtAt
-      | _ ->
-        next scanner;
-        Token.At)
-    | '%' -> (
-      match peek scanner with
-      | '%' ->
-        next2 scanner;
-        Token.PercentPercent
-      | _ ->
-        next scanner;
-        Token.Percent)
-    | '|' -> (
-      match peek scanner with
-      | '|' ->
-        next2 scanner;
-        Token.Lor
-      | '>' ->
-        next2 scanner;
-        Token.BarGreater
-      | _ ->
-        next scanner;
-        Token.Bar)
-    | '&' -> (
-      match peek scanner with
-      | '&' ->
-        next2 scanner;
-        Token.Land
-      | _ ->
-        next scanner;
-        Token.Band)
-    | ':' -> (
-      match peek scanner with
-      | '=' ->
-        next2 scanner;
-        Token.ColonEqual
-      | '>' ->
-        next2 scanner;
-        Token.ColonGreaterThan
-      | _ ->
-        next scanner;
-        Token.Colon)
-    | '\\' ->
-      next scanner;
-      scanExoticIdentifier scanner
-    | '/' -> (
-      match peek scanner with
-      | '/' ->
-        next2 scanner;
-        scanSingleLineComment scanner
-      | '*' -> scanMultiLineComment scanner
-      | '.' ->
-        next2 scanner;
-        Token.ForwardslashDot
-      | _ ->
-        next scanner;
-        Token.Forwardslash)
-    | '-' -> (
-      match peek scanner with
-      | '.' ->
-        next2 scanner;
-        Token.MinusDot
-      | '>' ->
-        next2 scanner;
-        Token.MinusGreater
-      | _ ->
-        next scanner;
-        Token.Minus)
-    | '+' -> (
-      match peek scanner with
-      | '.' ->
-        next2 scanner;
-        Token.PlusDot
-      | '+' ->
-        next2 scanner;
-        Token.PlusPlus
-      | '=' ->
-        next2 scanner;
-        Token.PlusEqual
-      | _ ->
-        next scanner;
-        Token.Plus)
-    | '>' -> (
-      match peek scanner with
-      | '=' when not (inDiamondMode scanner) ->
-        next2 scanner;
-        Token.GreaterEqual
-      | _ ->
-        next scanner;
-        Token.GreaterThan)
-    | '<' when not (inJsxMode scanner) -> (
-      match peek scanner with
-      | '=' ->
-        next2 scanner;
-        Token.LessEqual
-      | _ ->
-        next scanner;
-        Token.LessThan)
-    (* special handling for JSX < *)
-    | '<' -> (
-      (* Imagine the following: <div><
-       * < indicates the start of a new jsx-element, the parser expects
-       * the name of a new element after the <
-       * Example: <div> <div
-       * But what if we have a / here: example </ in  <div></div>
-       * This signals a closing element. To simulate the two-token lookahead,
-       * the </ is emitted as a single new token LessThanSlash *)
-      next scanner;
-      skipWhitespace scanner;
-      match scanner.ch with
-      | '/' ->
-        next scanner;
-        Token.LessThanSlash
-      | '=' ->
-        next scanner;
-        Token.LessEqual
-      | _ -> Token.LessThan)
-    (* peeking 2 chars *)
-    | '.' -> (
-      match (peek scanner, peek2 scanner) with
-      | '.', '.' ->
-        next3 scanner;
-        Token.DotDotDot
-      | '.', _ ->
-        next2 scanner;
-        Token.DotDot
-      | _ ->
-        next scanner;
-        Token.Dot)
-    | '\'' -> (
-      match (peek scanner, peek2 scanner) with
-      | '\\', '"' ->
-        (* careful with this one! We're next-ing _once_ (not twice),
-           then relying on matching on the quote *)
-        next scanner;
-        SingleQuote
-      | '\\', _ ->
-        next2 scanner;
-        scanEscape scanner
-      | ch, '\'' ->
-        let offset = scanner.offset + 1 in
-        next3 scanner;
-        Token.Codepoint
-          {
-            c = Char.code ch;
-            original = (String.sub [@doesNotRaise]) scanner.src offset 1;
-          }
-      | ch, _ ->
-        next scanner;
-        let offset = scanner.offset in
-        let offset16 = scanner.offset16 in
-        let codepoint, length =
-          Res_utf8.decodeCodePoint scanner.offset scanner.src
-            (String.length scanner.src)
-        in
-        for _ = 0 to length - 1 do
-          next scanner
-        done;
-        if scanner.ch = '\'' then (
-          let contents =
-            (String.sub [@doesNotRaise]) scanner.src offset length
-          in
-          next scanner;
-          Token.Codepoint {c = codepoint; original = contents})
-        else (
-          scanner.ch <- ch;
-          scanner.offset <- offset;
-          scanner.offset16 <- offset16;
-          SingleQuote))
-    | '!' -> (
-      match (peek scanner, peek2 scanner) with
-      | '=', '=' ->
-        next3 scanner;
-        Token.BangEqualEqual
-      | '=', _ ->
-        next2 scanner;
-        Token.BangEqual
-      | _ ->
-        next scanner;
-        Token.Bang)
-    | '=' -> (
-      match (peek scanner, peek2 scanner) with
-      | '=', '=' ->
-        next3 scanner;
-        Token.EqualEqualEqual
-      | '=', _ ->
-        next2 scanner;
-        Token.EqualEqual
-      | '>', _ ->
-        next2 scanner;
-        Token.EqualGreater
-      | _ ->
-        next scanner;
-        Token.Equal)
-    (* special cases *)
-    | ch when ch == hackyEOFChar ->
-      next scanner;
-      Token.Eof
-    | ch ->
-      (* if we arrive here, we're dealing with an unknown character,
-       * report the error and continue scanning… *)
-      next scanner;
-      let endPos = position scanner in
-      scanner.err ~startPos ~endPos (Diagnostics.unknownUchar ch);
-      let _, _, token = scan scanner in
-      token
-  in
-  let endPos = position scanner in
-  (* _printDebug ~startPos ~endPos scanner token; *)
-  (startPos, endPos, token)
-
-(* misc helpers used elsewhere *)
-
-(* Imagine: <div> <Navbar /> <
- * is `<` the start of a jsx-child? <div …
- * or is it the start of a closing tag?  </div>
- * reconsiderLessThan peeks at the next token and
- * determines the correct token to disambiguate *)
-let reconsiderLessThan scanner =
-  (* < consumed *)
-  skipWhitespace scanner;
-  if scanner.ch == '/' then
-    let () = next scanner in
-    Token.LessThanSlash
-  else Token.LessThan
-
-(* If an operator has whitespace around both sides, it's a binary operator *)
-(* TODO: this helper seems out of place *)
-let isBinaryOp src startCnum endCnum =
-  if startCnum == 0 then false
-  else (
-    (* we're gonna put some assertions and invariant checks here because this is
-       used outside of the scanner's normal invariant assumptions *)
-    assert (endCnum >= 0);
-    assert (startCnum > 0 && startCnum < String.length src);
-    let leftOk = isWhitespace (String.unsafe_get src (startCnum - 1)) in
-    (* we need some stronger confidence that endCnum is ok *)
-    let rightOk =
-      endCnum >= String.length src
-      || isWhitespace (String.unsafe_get src endCnum)
-    in
-    leftOk && rightOk)
diff --git a/jscomp/syntax/src/res_scanner.mli b/jscomp/syntax/src/res_scanner.mli
deleted file mode 100644
index cc00269..0000000
--- a/jscomp/syntax/src/res_scanner.mli
+++ /dev/null
@@ -1,36 +0,0 @@
-type mode = Jsx | Diamond
-
-type charEncoding
-
-type t = {
-  filename: string;
-  src: string;
-  mutable err:
-    startPos:Lexing.position ->
-    endPos:Lexing.position ->
-    Res_diagnostics.category ->
-    unit;
-  mutable ch: charEncoding; (* current character *)
-  mutable offset: int; (* current byte offset *)
-  mutable offset16: int;
-      (* current number of utf16 code units since line start *)
-  mutable lineOffset: int; (* current line offset *)
-  mutable lnum: int; (* current line number *)
-  mutable mode: mode list;
-}
-
-val make : filename:string -> string -> t
-
-(* TODO: make this a record *)
-val scan : t -> Lexing.position * Lexing.position * Res_token.t
-
-val isBinaryOp : string -> int -> int -> bool
-
-val setJsxMode : t -> unit
-val setDiamondMode : t -> unit
-val popMode : t -> mode -> unit
-
-val reconsiderLessThan : t -> Res_token.t
-
-val scanTemplateLiteralToken :
-  t -> Lexing.position * Lexing.position * Res_token.t
diff --git a/jscomp/syntax/src/res_string.ml b/jscomp/syntax/src/res_string.ml
deleted file mode 100644
index a4ecba1..0000000
--- a/jscomp/syntax/src/res_string.ml
+++ /dev/null
@@ -1,11 +0,0 @@
-let hexTable =
-  [| '0'; '1'; '2'; '3'; '4'; '5'; '6'; '7'; '8'; '9'; 'a'; 'b'; 'c'; 'd'; 'e'; 'f'; |]
-  [@ocamlformat "disable"]
-
-let convertDecimalToHex ~strDecimal =
-  try
-    let intNum = int_of_string strDecimal in
-    let c1 = Array.get hexTable (intNum lsr 4) in
-    let c2 = Array.get hexTable (intNum land 15) in
-    "x" ^ String.concat "" [String.make 1 c1; String.make 1 c2]
-  with Invalid_argument _ | Failure _ -> strDecimal
diff --git a/jscomp/syntax/src/res_uncurried.ml b/jscomp/syntax/src/res_uncurried.ml
deleted file mode 100644
index 1a777e1..0000000
--- a/jscomp/syntax/src/res_uncurried.ml
+++ /dev/null
@@ -1,11 +0,0 @@
-(* For parsing *)
-let fromDotted ~dotted = function
-  | Config.Legacy -> dotted
-  | Swap -> not dotted
-  | Uncurried -> true
-
-(* For printing *)
-let getDotted ~uncurried = function
-  | Config.Legacy -> uncurried
-  | Swap -> not uncurried
-  | Uncurried -> false
diff --git a/jscomp/syntax/src/res_utf8.mli b/jscomp/syntax/src/res_utf8.mli
deleted file mode 100644
index 7dcb342..0000000
--- a/jscomp/syntax/src/res_utf8.mli
+++ /dev/null
@@ -1,9 +0,0 @@
-val repl : int
-
-val max : int
-
-val decodeCodePoint : int -> string -> int -> int * int
-
-val encodeCodePoint : int -> string
-
-val isValidCodePoint : int -> bool
diff --git a/jscomp/syntax/testrunner/dune b/jscomp/syntax/testrunner/dune
deleted file mode 100644
index c605c17..0000000
--- a/jscomp/syntax/testrunner/dune
+++ /dev/null
@@ -1,13 +0,0 @@
-(env
- (static
-  (flags
-   (:standard -ccopt -static))))
-
-(executable
- (name res_test)
- (public_name syntax_tests)
- (enabled_if
-  (<> %{profile} browser))
- (flags
-  (:standard -w -A))
- (libraries syntax core))
diff --git a/jscomp/syntax/testrunner/res_test.ml b/jscomp/syntax/testrunner/res_test.ml
deleted file mode 100644
index acda80f..0000000
--- a/jscomp/syntax/testrunner/res_test.ml
+++ /dev/null
@@ -1,158 +0,0 @@
-module IO = Res_io
-
-let dataDir = "jscomp/syntax/tests"
-
-(* test printing of .res file*)
-let () =
-  let filename = Filename.concat dataDir "api/resSyntax.res" in
-  let prettySource = Res_multi_printer.print `res ~input:filename in
-  assert (
-    prettySource
-    = {|// test file
-
-if true {
-  Js.log("true")
-} else {
-  Js.log("false")
-}
-|})
-
-(* test printing of .resi file*)
-let () =
-  let filename = Filename.concat dataDir "api/resiSyntax.resi" in
-  let prettySource = Res_multi_printer.print `res ~input:filename in
-  assert (prettySource = {|// test interface file
-
-let x: int
-|})
-
-(* test printing of ocaml .ml file *)
-let () =
-  let filename = Filename.concat dataDir "api/mlSyntax.ml" in
-  let prettySource = Res_multi_printer.print `ml ~input:filename in
-  assert (
-    prettySource
-    = {|/* test ml file */
-
-let () = print_endline("hello world")
-
-let unicode = "🙈 😅 🙌"
-
-let d = `Sehr Schön`
-|})
-
-(* test printing of ocaml .mli file *)
-let () =
-  let filename = Filename.concat dataDir "api/mliSyntax.mli" in
-  let prettySource = Res_multi_printer.print `ml ~input:filename in
-  assert (
-    prettySource
-    = {|/* test mli file */
-
-let x: int
-
-/* comment */
-let y: float
-|})
-
-let () = print_endline "✅ multi printer api tests"
-
-module OutcomePrinterTests = struct
-  let signatureToOutcome structure =
-    Lazy.force Res_outcome_printer.setup;
-
-    Clflags.include_dirs :=
-      Filename.concat "lib" "ocaml" :: !Clflags.include_dirs;
-    Res_compmisc.init_path ();
-    Clflags.nopervasives := true;
-    let env = Res_compmisc.initial_env () in
-    try
-      let _typedStructure, signature, _newenv =
-        Typemod.type_toplevel_phrase env structure
-      in
-      signature |> Printtyp.tree_of_signature
-      |> !Oprint.out_signature Format.str_formatter;
-      Format.flush_str_formatter ()
-    with
-    | Typetexp.Error (_, _, err) ->
-      Typetexp.report_error env Format.str_formatter err;
-      prerr_string (Format.flush_str_formatter ());
-      exit 1
-    | Typemod.Error (_, _, err) ->
-      Typemod.report_error env Format.str_formatter err;
-      prerr_string (Format.flush_str_formatter ());
-      exit 1
-    | Typedecl.Error (_, err) ->
-      Typedecl.report_error Format.str_formatter err;
-      prerr_string (Format.flush_str_formatter ());
-      exit 1
-    | e ->
-      prerr_string
-        ("Unknown error while trying to print outcome tree.\n"
-       ^ "We don't display all the outcome type errors; try adding the new \
-          case to the `try` pattern match.\n");
-      raise e
-
-  (* `tests/oprint/oprint.res` will be read into memory and typechecked.
-   * The inferred signature (i.e. the type of the module `oprint.res`) will
-   * then be converted to the outcome tree.
-   * The outcome tree is printed to a string
-   * and stored in a snapshot `tests/oprint/expected/oprint.resi.txt` *)
-  let run () =
-    let filename = Filename.concat dataDir "oprint/oprint.res" in
-    let result =
-      Res_driver.parsingEngine.parseImplementation ~forPrinter:false ~filename
-    in
-    let signature =
-      if result.Res_driver.invalid then (
-        Res_driver.parsingEngine.stringOfDiagnostics ~source:result.source
-          ~filename:result.filename result.diagnostics;
-        exit 1)
-      else result.Res_driver.parsetree
-    in
-    IO.writeFile
-      ~filename:(Filename.concat dataDir "oprint/expected/oprint.resi.txt")
-      ~contents:(signatureToOutcome signature)
-end
-
-module ParserApiTest = struct
-  let makeDefault () =
-    let src = "   let x = 1\nlet y = 2\nlet z = 3" in
-    let parser = Res_parser.make src "test.res" in
-    assert (parser.scanner.lnum == 1);
-    assert (parser.scanner.lineOffset == 0);
-    assert (parser.scanner.offset == 6);
-    assert (parser.token = Res_token.Let);
-    print_endline "✅ Parser make: initializes parser and checking offsets"
-
-  let unixLf () =
-    let src = "let x = 1\nlet y = 2\nlet z = 3" in
-    let parser = Res_parser.make src "test.res" in
-    (match Res_core.parseImplementation parser with
-    | [x; y; z] ->
-      assert (x.pstr_loc.loc_start.pos_lnum = 1);
-      assert (y.pstr_loc.loc_start.pos_lnum = 2);
-      assert (z.pstr_loc.loc_start.pos_lnum = 3)
-    | _ -> assert false);
-    print_endline "✅ Parser handles LF correct"
-
-  let windowsCrlf () =
-    let src = "let x = 1\r\nlet y = 2\r\nlet z = 3" in
-    let parser = Res_parser.make src "test.res" in
-    (match Res_core.parseImplementation parser with
-    | [x; y; z] ->
-      assert (x.pstr_loc.loc_start.pos_lnum = 1);
-      assert (y.pstr_loc.loc_start.pos_lnum = 2);
-      assert (z.pstr_loc.loc_start.pos_lnum = 3)
-    | _ -> assert false);
-    print_endline "✅ Parser handles CRLF correct"
-
-  let run () =
-    makeDefault ();
-    unixLf ();
-    windowsCrlf ()
-end
-
-let () = OutcomePrinterTests.run ()
-let () = ParserApiTest.run ()
-let () = Res_utf8_test.run ()
diff --git a/jscomp/syntax/testrunner/res_utf8_test.ml b/jscomp/syntax/testrunner/res_utf8_test.ml
deleted file mode 100644
index 5546ae3..0000000
--- a/jscomp/syntax/testrunner/res_utf8_test.ml
+++ /dev/null
@@ -1,93 +0,0 @@
-type utf8Test = {codepoint: int; str: string; size: int}
-
-let utf8CodePointTests =
-  [|
-    {codepoint = 0x00; str = "\x00"; size = 1};
-    {codepoint = 0x01; str = "\x01"; size = 1};
-    {codepoint = 0x7e; str = "\x7e"; size = 1};
-    {codepoint = 0x7f; str = "\x7f"; size = 1};
-    {codepoint = 0x0080; str = "\xc2\x80"; size = 2};
-    {codepoint = 0x0081; str = "\xc2\x81"; size = 2};
-    {codepoint = 0x00bf; str = "\xc2\xbf"; size = 2};
-    {codepoint = 0x00c0; str = "\xc3\x80"; size = 2};
-    {codepoint = 0x00c1; str = "\xc3\x81"; size = 2};
-    {codepoint = 0x00c8; str = "\xc3\x88"; size = 2};
-    {codepoint = 0x00d0; str = "\xc3\x90"; size = 2};
-    {codepoint = 0x00e0; str = "\xc3\xa0"; size = 2};
-    {codepoint = 0x00f0; str = "\xc3\xb0"; size = 2};
-    {codepoint = 0x00f8; str = "\xc3\xb8"; size = 2};
-    {codepoint = 0x00ff; str = "\xc3\xbf"; size = 2};
-    {codepoint = 0x0100; str = "\xc4\x80"; size = 2};
-    {codepoint = 0x07ff; str = "\xdf\xbf"; size = 2};
-    {codepoint = 0x0400; str = "\xd0\x80"; size = 2};
-    {codepoint = 0x0800; str = "\xe0\xa0\x80"; size = 3};
-    {codepoint = 0x0801; str = "\xe0\xa0\x81"; size = 3};
-    {codepoint = 0x1000; str = "\xe1\x80\x80"; size = 3};
-    {codepoint = 0xd000; str = "\xed\x80\x80"; size = 3};
-    {codepoint = 0xd7ff; str = "\xed\x9f\xbf"; size = 3};
-    {codepoint = 0xe000; str = "\xee\x80\x80"; size = 3};
-    {codepoint = 0xfffe; str = "\xef\xbf\xbe"; size = 3};
-    {codepoint = 0xffff; str = "\xef\xbf\xbf"; size = 3};
-    {codepoint = 0x10000; str = "\xf0\x90\x80\x80"; size = 4};
-    {codepoint = 0x10001; str = "\xf0\x90\x80\x81"; size = 4};
-    {codepoint = 0x40000; str = "\xf1\x80\x80\x80"; size = 4};
-    {codepoint = 0x10fffe; str = "\xf4\x8f\xbf\xbe"; size = 4};
-    {codepoint = 0x10ffff; str = "\xf4\x8f\xbf\xbf"; size = 4};
-    {codepoint = 0xFFFD; str = "\xef\xbf\xbd"; size = 3};
-  |]
-
-let surrogateRange =
-  [|
-    {codepoint = 0xFFFD; str = "\xed\xa0\x80"; size = 1};
-    {codepoint = 0xFFFD; str = "\xed\xbf\xbf"; size = 1};
-  |]
-
-let testDecode () =
-  Array.iter
-    (fun t ->
-      let len = String.length t.str in
-      let codepoint, size = Res_utf8.decodeCodePoint 0 t.str len in
-      assert (codepoint = t.codepoint);
-      assert (size = t.size))
-    utf8CodePointTests
-
-let testDecodeSurrogateRange () =
-  Array.iter
-    (fun t ->
-      let len = String.length t.str in
-      let codepoint, size = Res_utf8.decodeCodePoint 0 t.str len in
-      assert (codepoint = t.codepoint);
-      assert (size = t.size))
-    surrogateRange
-
-let testEncode () =
-  Array.iter
-    (fun t ->
-      let encodedString = Res_utf8.encodeCodePoint t.codepoint in
-      assert (encodedString = t.str))
-    utf8CodePointTests
-
-let validCodePointsTests =
-  [|
-    (0, true);
-    (Char.code 'e', true);
-    (Res_utf8.max, true);
-    (0xD7FF, true);
-    (0xD800, false);
-    (0xDFFF, false);
-    (0xE000, true);
-    (Res_utf8.max + 1, false);
-    (-1, false);
-  |]
-
-let testIsValidCodePoint () =
-  Array.iter
-    (fun (codePoint, t) -> assert (Res_utf8.isValidCodePoint codePoint = t))
-    validCodePointsTests
-
-let run () =
-  testDecode ();
-  testDecodeSurrogateRange ();
-  testEncode ();
-  testIsValidCodePoint ();
-  print_endline "✅ utf8 tests"
diff --git a/jscomp/syntax/tests/api/mlSyntax.ml b/jscomp/syntax/tests/api/mlSyntax.ml
deleted file mode 100644
index 33d3236..0000000
--- a/jscomp/syntax/tests/api/mlSyntax.ml
+++ /dev/null
@@ -1,7 +0,0 @@
-(* test ml file *)
-
-let () = print_endline "hello world"
-
-let unicode = "🙈 😅 🙌"
-
-let d = {|Sehr Schön|}
diff --git a/jscomp/syntax/tests/api/mliSyntax.mli b/jscomp/syntax/tests/api/mliSyntax.mli
deleted file mode 100644
index 4bba276..0000000
--- a/jscomp/syntax/tests/api/mliSyntax.mli
+++ /dev/null
@@ -1,6 +0,0 @@
-(* test mli file *)
-
-val x: int
-
-(* comment *)
-val y: float
diff --git a/jscomp/syntax/tests/api/reasonSyntax.res b/jscomp/syntax/tests/api/reasonSyntax.res
deleted file mode 100644
index 54bfdf9..0000000
--- a/jscomp/syntax/tests/api/reasonSyntax.res
+++ /dev/null
@@ -1,8 +0,0 @@
-// test .re file
-let \"+++" = (a, b) => a + b
-
-let unicode = "🙈 😅 🙌"
-
-let d = `Sehr Schön` /* test */
-
-let () = print_endline("foo")
diff --git a/jscomp/syntax/tests/api/reiSyntax.resi b/jscomp/syntax/tests/api/reiSyntax.resi
deleted file mode 100644
index bf897f3..0000000
--- a/jscomp/syntax/tests/api/reiSyntax.resi
+++ /dev/null
@@ -1,2 +0,0 @@
-// test .rei file
-let x: int
diff --git a/jscomp/syntax/tests/api/resReactJsx.res b/jscomp/syntax/tests/api/resReactJsx.res
deleted file mode 100644
index e236abf..0000000
--- a/jscomp/syntax/tests/api/resReactJsx.res
+++ /dev/null
@@ -1,6 +0,0 @@
-// test React JSX file
-
-@react.component
-let make = (~msg) => {
-  <div> {msg->React.string} </div>
-}
diff --git a/jscomp/syntax/tests/api/resSyntax.res b/jscomp/syntax/tests/api/resSyntax.res
deleted file mode 100644
index 2d6f904..0000000
--- a/jscomp/syntax/tests/api/resSyntax.res
+++ /dev/null
@@ -1,7 +0,0 @@
-// test file
-
-if true {
-  Js.log("true") 
-} else {
-  Js.log("false")
-}
diff --git a/jscomp/syntax/tests/api/resiSyntax.resi b/jscomp/syntax/tests/api/resiSyntax.resi
deleted file mode 100644
index c415b91..0000000
--- a/jscomp/syntax/tests/api/resiSyntax.resi
+++ /dev/null
@@ -1,3 +0,0 @@
-// test interface file
-
-let x: int
diff --git a/jscomp/syntax/tests/conversion/reason/attributes.res b/jscomp/syntax/tests/conversion/reason/attributes.res
deleted file mode 100644
index ff549e3..0000000
--- a/jscomp/syntax/tests/conversion/reason/attributes.res
+++ /dev/null
@@ -1,22 +0,0 @@
-module Color: {
-  type t = private string
-
-  @inline("red") let red: t
-  @inline("black") let black: t
-} = {
-  type t = string
-
-  @inline let red = "red"
-  @inline let black = "black"
-}
-
-@send external map: (array<'a>, 'a => 'b) => array<'b> = "map"
-@send external filter: (array<'a>, 'a => 'b) => array<'b> = "filter"
-list{1, 2, 3}->map(a => a + 1)->filter(a => modulo(a, 2) == 0)->Js.log
-
-type t
-@new external make: unit => t = "DOMParser"
-@bs.send.pipe(: t)
-external parseHtmlFromString: (string, @as("text/html") _) => Dom.htmlDocument = "parseFromString"
-
-Js.log(make() |> parseHtmlFromString("sdsd"))
diff --git a/jscomp/syntax/tests/conversion/reason/bracedJsx.res b/jscomp/syntax/tests/conversion/reason/bracedJsx.res
deleted file mode 100644
index 0cbb8f4..0000000
--- a/jscomp/syntax/tests/conversion/reason/bracedJsx.res
+++ /dev/null
@@ -1,147 +0,0 @@
-open Belt
-
-type action =
-  | RunCommand
-  | SetValue(string)
-
-type line =
-  | User(string)
-  | System(string)
-
-type state = {
-  history: array<line>,
-  input: string,
-}
-
-module Styles = {
-  open Css
-  let terminal = style(list{
-    margin(10->px),
-    backgroundColor("222"->hex),
-    borderRadius(10->px),
-    padding(10->px),
-    color("fff"->hex),
-    height(300->px),
-    overflowY(auto),
-    fontFamily(#custom(Theme.codeFontFamily)),
-    unsafe("WebkitOverflowScrolling", "touch"),
-  })
-  let line = style(list{whiteSpace(#preWrap)})
-  let input = style(list{
-    backgroundColor("222"->hex),
-    fontFamily(#custom(Theme.codeFontFamily)),
-    color("fff"->hex),
-    fontSize(16->px),
-    borderWidth(zero),
-    margin(zero),
-    padding(zero),
-    outlineStyle(none),
-  })
-  let title = style(list{
-    fontSize(48->px),
-    fontWeight(extraBold),
-    marginTop(20->px),
-    marginBottom(20->px),
-    textAlign(center),
-  })
-}
-
-@react.component
-let make = () => {
-  let containerRef = React.useRef(Js.Nullable.null)
-
-  let (state, send) = React.useReducer((state, action) =>
-    switch action {
-    | RunCommand => {
-        input: "",
-        history: Array.concat(
-          state.history,
-          [
-            User(state.input),
-            switch state.input->Js.String.trim {
-            | "" => System("")
-            | "help" =>
-              System(`available commands:
-- help
-- ls
-- cat `)
-            | "ls" =>
-              System(`- hack-website.sh
-- go-to-home.sh
-- nuclear-codes.txt`)
-            | "cat" => System("cat: missing argument")
-            | "cat hack-website.sh"
-            | "cat ./hack-website.sh" =>
-              System("# seriously?\necho \"lol\"")
-            | "hack-website.sh"
-            | "./hack-website.sh" =>
-              System("lol")
-            | "cat nuclear-codes.txt"
-            | "cat ./nuclear-codes.txt" =>
-              System("000000")
-            | "go-to-home.sh"
-            | "./go-to-home.sh" =>
-              Js.Global.setTimeout(() => ReasonReact.Router.push("/"), 1_000)->ignore
-              System("Redirecting ...")
-            | "cat go-to-home.sh"
-            | "cat ./go-to-home.sh" =>
-              System("ReasonReact.Router.push(\"/\")")
-            | _ => System("command not found: " ++ (state.input ++ "\ntry command 'help'"))
-            },
-          ],
-        ),
-      }
-    | SetValue(input) => {...state, input: input}
-    }
-  , {history: [], input: ""})
-
-  React.useEffect1(() => {
-    switch containerRef.current->Js.Nullable.toOption {
-    | Some(containerRef) =>
-      open Webapi.Dom
-      containerRef->Element.setScrollTop(containerRef->Element.scrollHeight->float_of_int)
-    | None => ()
-    }
-    None
-  }, [state.history])
-
-  let userPrefix = "~ "
-  <WidthContainer>
-    <div role="heading" ariaLevel=1 className=Styles.title> {"Erreur"->ReasonReact.string} </div>
-    <div
-      className=Styles.terminal
-      onClick={event => (event->ReactEvent.Mouse.target)["querySelector"]("input")["focus"]()}
-      ref={containerRef->ReactDOMRe.Ref.domRef}>
-      {state.history
-      ->Array.mapWithIndex((index, item) =>
-        <div key=j`$index` className=Styles.line>
-          {ReasonReact.string(
-            switch item {
-            | User(value) => userPrefix ++ value
-            | System(value) => value
-            },
-          )}
-        </div>
-      )
-      ->ReasonReact.array}
-      <div>
-        {userPrefix->ReasonReact.string}
-        {<input
-          type_="text"
-          className=Styles.input
-          autoFocus=true
-          value=state.input
-          onChange={event => send(SetValue((event->ReactEvent.Form.target)["value"]))}
-          onKeyDown={event => {
-            if event->ReactEvent.Keyboard.key == "Enter" {
-              send(RunCommand)
-            }
-            if event->ReactEvent.Keyboard.key == "Tab" {
-              event->ReactEvent.Keyboard.preventDefault
-            }
-          }}
-        />->ReasonReact.cloneElement(~props={"autoCapitalize": "off"}, [])}
-      </div>
-    </div>
-  </WidthContainer>
-}
diff --git a/jscomp/syntax/tests/conversion/reason/braces.res b/jscomp/syntax/tests/conversion/reason/braces.res
deleted file mode 100644
index cf164c9..0000000
--- a/jscomp/syntax/tests/conversion/reason/braces.res
+++ /dev/null
@@ -1,24 +0,0 @@
-let f = () => id
-let f = () => id
-
-if isArray(children) {
-  // Scenario 1
-  let code = children->asStringArray->Js.Array2.joinWith("")
-  <InlineCode> {code->s} </InlineCode>
-} else if isObject(children) {
-  // Scenario 2
-  children->asElement
-} else {
-  // Scenario 3
-  let code = unknownAsString(children)
-  makeCodeElement(~code, ~metastring, ~lang)
-}
-
-let getDailyNewCases = x =>
-  switch x {
-  | First(ret) => ret
-  | Pair({prevRecord, record}) =>
-    let confirmed = record.confirmed - prevRecord.confirmed
-    let deaths = record.deaths - prevRecord.deaths
-    {confirmed: confirmed, deaths: deaths}
-  }
diff --git a/jscomp/syntax/tests/conversion/reason/comments.res b/jscomp/syntax/tests/conversion/reason/comments.res
deleted file mode 100644
index 948e3ba..0000000
--- a/jscomp/syntax/tests/conversion/reason/comments.res
+++ /dev/null
@@ -1,770 +0,0 @@
-// comment 1
-let /* a */ x /* b */ = /* c */ 1 /* comment 2 */
-
-// comment 3
-
-// comment 4
-let x = 1 /* 5 */
-/* 6 */
-
-let f = (
-  // 1
-  a, //2
-  // 3
-  b,
-) => {
-  // 5
-  x: 1, // 6
-  // 7
-  y: 2, // 8
-}
-/* **** comment */
-/* ** comment */
-/* comment */
-/* ** comment */
-/* *** comment */
-/* **** comment */
-
-/* ** */
-/* *** */
-
-/* ** */
-
-/* (** comment *) */
-/* (*** comment *) */
-/* *(*** comment *) */
-
-/* comment * */
-/* comment ** */
-/* comment *** */
-/* comment **** */
-
-let testingNotQuiteEndOfLineComments = list{
-  "Item 1" /* Comment For First Item */,
-  "Item 2" /* Comment For Second Item */,
-  "Item 3" /* Comment For Third Item */,
-  "Item 4" /* Comment For Fourth Item - but no semi */,
-  /* Comment after last item in list. */
-} /* Comment after list bracket */
-
-let testingEndOfLineComments = list{
-  "Item 1" /* Comment For First Item */,
-  "Item 2" /* Comment For Second Item */,
-  "Item 3" /* Comment For Third Item */,
-  "Item 4" /* Comment For Fourth Item - but before semi */,
-  /* Comment after last item in list. */
-} /* Comment after list bracket */
-
-/* This time no space between bracket and comment */
-let testingEndOfLineComments = list{} /* Comment after list bracket */
-
-type t = (int, int) /* End of line on t */
-
-type t22 = /* End of t22 line on type t22 = */
-(int, int)
-
-type variant =
-  /* Comment above X */
-  | X(int) /* End of line on X */
-  /* Comment above Y */
-  | Y(int) /* End of line on Y */
-/* Comment on entire type def for variant */
-
-type rec x = {
-  /* not attached *above* x */
-  fieldOne: int,
-} /* Attached end of line after x */
-and y = {
-  /* not attached *above* y */
-  fieldTwo: int,
-} /* Attached end of line after y */
-
-let result = switch X(3) {
-| X(x) =>
-  /* Where does this comment go? */
-  let tmp = x
-  x + tmp
-| Y(x) =>
-  /* How about this one */
-  let tmp = x
-  x + tmp
-}
-
-let result = switch None {
-| Some({fieldOne: 20}) =>
-  /* Where does this comment go? */
-  let tmp = 0
-  2 + tmp
-| Some({fieldOne: n}) =>
-  /* How about this one */
-  let tmp = n
-  n + tmp
-| None => 20
-}
-
-type pointWithManyKindsOfComments = {
-  /* Line before x */
-  x: string /* x field */,
-  /* Line before y */
-  y: string /* y field */,
-  /* Final row of record */
-}
-
-type typeParamPointWithComments<'a> = {
-  /* Line before x */
-  x: 'a /* x field */,
-  /* Line before y */
-  y: 'a /* y field */,
-  /* Final row of record */
-}
-
-let name_equal = (x, y) => x == y
-
-let equal = (i1, i2) => i1.contents === i2.contents && true /* most unlikely first */
-
-let equal = (i1, i2) => compare(compare(0, 0), compare(1, 1)) /* END OF LINE HERE */
-
-module Temp = {
-  let v = true
-  let logIt = (str, ()) => print_string(str)
-}
-
-let store_attributes = arg => {
-  let attributes_file = "test"
-  let proc_name = attributes_file ++ ".proc"
-  let should_write =
-    /* only overwrite defined procedures */
-    Temp.v || !Temp.v
-  if should_write {
-    Temp.logIt(proc_name, ())
-  }
-}
-3 // -
-3 //-
-
-3 //-
-
-3 /* - */
-// **** comment
-/* ** comment */
-@ocaml.doc(" docstring ")
-@ocaml.doc(" docstring ")
-@ocaml.doc(" ")
-@ocaml.doc("")
-@ocaml.doc(" (** comment *) ")
-@ocaml.doc(" (*** comment *) ")
-@ocaml.doc("
- * Multiline
- ")
-@ocaml.doc(" Multiline
- *
- ")
-@ocaml.doc("
- **
- ")
-module // comment
-
-/* ** comment */
-/* *** comment */
-/* **** comment */
-
-/* ** */
-/* *** */
-
-/* ** */
-
-// (** comment *)
-// (*** comment *)
-// *(*** comment *)
-// comment *
-// comment **
-// comment ***
-// comment ****
-
-JustString = {
-  include Map.Make(Int32) // Comment eol include
-}
-
-let testingEndOfLineComments = list{
-  "Item 1" /* Comment For First Item */,
-  "Item 2" /* Comment For Second Item */,
-  "Item 3" /* Comment For Third Item */,
-  "Item 4" /* Comment For Fourth Item - but before trailing comma */,
-  // Comment after last item in list.
-} /* Comment after rbracket */
-
-// But if you place them after the comma at eol, they're preserved as such
-let testingEndOfLineComments = list{
-  "Item 1", // Comment For First Item
-  "Item 2", // Comment For Second Item
-  "Item 3", // Comment For Third Item
-  "Item 4" /* Comment For Fourth Item - but before trailing comma */,
-  // Comment after last item in list.
-} /* Comment after rbracket */
-
-// The space between ; and comment shoudn't matter
-let testPlacementOfTrailingComment = list{
-  "Item 0",
-  // Comment after last item in list.
-} // Comment after semi
-
-// The space between ; and comment shoudn't matter
-let testPlacementOfTrailingComment = list{
-  "Item 0",
-  // Comment after last item in list.
-} // Comment after semi
-
-// Try again but without other things in the list
-let testPlacementOfTrailingComment = list{"Item 0"} // Comment after semi
-
-// The space between ; and comment shoudn't matter
-let testPlacementOfTrailingComment = list{
-  "Item 0",
-  // Comment after last item in list.
-} // Comment after semi
-
-let testingEndOfLineComments = list{} // Comment after entire let binding
-
-// The following is not yet idempotent
-// let myFunction
-//     withFirstArg  // First arg
-//     andSecondArg  => { // Second Arg
-//   withFirstArg + andSecondArg /* before semi */ ;
-// };
-
-let myFunction = // First arg
-(
-  withFirstArg,
-  // Second Arg
-  andSecondArg,
-) => withFirstArg + andSecondArg // After Semi
-
-type point = {
-  x: string, // x field
-  y: string, // y field
-}
-
-type pointWithManyKindsOfComments = {
-  // Line before x
-  x: string, // x field
-  // Line before y
-  y: string, // y field
-  // Final row of record
-}
-
-type typeParamPointWithComments<'a> = {
-  // Line before x
-  x: 'a, // x field
-  // Line before y
-  y: 'a, // y field
-  // Final row of record
-}
-
-// Now, interleaving comments in type params
-// Type name
-type typeParamPointWithComments2<
-  'a,
-  // The b type apram
-  'b,
-> = {
-  // Line before x
-  x: 'a, // x field
-  // Line before y
-  y: 'a, // y field
-  // Final row of record
-}
-
-/* The way the last row comment is formatted is suboptimal becuase
- * record type definitions do not include enough location information */
-type anotherpoint = {
-  x: string, // x field
-  y: string, // y field
-  // comment as last row of record
-}
-
-type t = (int, int) // End of line on t
-type t2 = (int, int) // End of line on (int, int)
-
-type t3 = (int, int) // End of line on (int, int)
-
-type variant =
-  | X(int, int) // End of line on X
-  | Y(int, int) // End of line on Y
-// Comment on entire type def for variant
-
-// Before let
-let res = // Before switch
-switch X(2, 3) {
-// Above X line
-| X(_) => "result of X" // End of arrow and X line
-// Above Y line
-| Y(_) => "result of Y" // End of arrow and Y line
-} // After final semi in switch
-
-let res = switch X(2, 3) {
-| X(0, 0) => // After X arrow
-  "result of X" // End of X body line
-| X(1, 0) /* Before X's arrow */ => "result of X" // End of X body line
-| X(_) => // After X _ arrow
-  "result of X" // End of X body line
-// Above Y line
-| Y(_) => // Comment above Y body
-  "result of Y"
-}
-
-type variant2 =
-  // Comment above X
-  | X(int, int) // End of line on X
-  // Comment above Y
-  | Y(int, int)
-
-type variant3 =
-  // Comment above X
-  | X(int, int) // End of line on X
-  // Comment above Y
-  | Y(int, int) // End of line on Y
-
-type rec x = {
-  // not attached *above* x
-  fieldOne: int,
-  fieldA: int,
-} // Attached end of line after x
-and y = {
-  // not attached *above* y
-  fieldTwo: int,
-} // Attached end of line after y
-
-type rec x2 = {
-  // not attached *above* x2
-  fieldOne: int,
-  fieldA: int,
-} // Attached end of line after x2
-and y2 = {
-  // not attached *above* y2
-  fieldTwo: int,
-}
-
-let result = switch None {
-| Some({fieldOne: 20, fieldA: a}) =>
-  // Where does this comment go?
-  let tmp = 0
-  2 + tmp
-| Some({fieldOne: n, fieldA: a}) =>
-  // How about this one
-  let tmp = n
-  n + tmp
-| None => 20
-}
-
-let res = // Before switch
-switch X(2, 3) {
-// Above X line
-| X(_) => "result of X" // End of arrow and X line
-// Above Y line
-| Y(_) => "result of Y" // End of arrow and Y line
-}
-
-/*
- * Now these end of line comments *should* be retained.
- */
-let result = switch None {
-| Some({fieldOne: 20, fieldA: a}) =>
-  let tmp = 0
-  2 + tmp
-| Some({fieldOne: n, fieldA: a}) =>
-  let tmp = n
-  n + tmp
-| None => 20
-}
-
-/*
- * These end of line comments *should* be retained.
- * To get the simple expression eol comment to be retained, we just need to
- * implement label breaking eol behavior much like we did with sequences.
- * Otherwise, right now they are not idempotent.
- */
-let res = switch X(2, 3) {
-// Above X line
-| X(_, _) => "result of X" // retain this // retain this
-
-// Above Y line
-| Y(_) => "result of Y" // End of arrow and Y line
-}
-
-/* type optionalTuple = */
-/* | OptTup( */
-/* option( */
-/* ( */
-/* int, */
-/* int */
-/* ), */
-/* ), */
-/* ); */
-
-type optionTuple = option<(int, int)> // First int // Second int
-
-type intPair = (int, int) // First int // Second int
-
-type intPair2 = (
-  // First int
-  int,
-  // Second int
-  int,
-)
-
-let result = @ocaml.doc("") (2 + 3)
-
-// This is not yet idempotent
-// {
-//   /**/
-//   (+) 2 3
-// };
-
-let a = ()
-for i in 0 to 10 {
-  // bla
-  a
-}
-
-if true {
-  ()
-}
-
-type color =
-  | Red(int) // After red end of line
-  | Black(int) // After black end of line
-  | Green(int) // After green end of line
-// On next line after color type def
-
-let blahCurriedX = (x, x) =>
-  switch x {
-  | Red(10)
-  | Black(20)
-  | Green(10) => 1 // After or pattern green
-  | Red(x) => 0 // After red
-  | Black(x) => 0 // After black
-  | Green(x) => 0
-  } // After second green
-// On next line after blahCurriedX def
-
-let name_equal = (x, y) => x == y
-
-let equal = (i1, i2) => i1.contents === i2.contents && true // most unlikely first
-
-let equal = (i1, i2) => compare(compare(0, 0), compare(1, 1)) // END OF LINE HERE
-
-let tuple_equal = ((i1, i2)) => i1 == i2
-
-let tuple_equal = ((csu, mgd)) =>
-  // Some really long comments, see https://github.com/facebook/reason/issues/811
-  tuple_equal((csu, mgd))
-
-let trueThing = true
-
-for i in 0 to 1 {
-  // comment
-  print_newline()
-}
-
-while trueThing {
-  // comment
-  print_newline()
-}
-
-if trueThing {
-  // comment
-  print_newline()
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-  // Comment before print
-  print_newline()
-  // Comment after final print
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-  // Comment before print
-  print_newline()
-  // Comment after final print
-} else {
-  // Comment before print
-  print_newline()
-  // Comment before print
-  print_newline()
-  // Comment after final print
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-} else {
-  // Comment before print
-  print_newline()
-}
-
-// Comment before while test
-while trueThing {
-  // Comment before print
-  print_newline()
-  // Comment before print
-  print_newline()
-  // Comment after final print
-}
-
-// Comment before while test
-while trueThing {
-  // Comment before print
-  print_newline()
-}
-
-// Comment before for test
-for i in 0 to 100 {
-  // Comment before print
-  print_newline()
-  // Comment before print
-  print_newline()
-  // Comment after final print
-}
-
-// Comment before for test
-for i in 0 to 100 {
-  // Comment before print
-  print_newline()
-}
-
-if trueThing {
-  // Comment before print
-  print_newline() // eol print
-  // Comment before print
-  print_newline() // eol print
-  // Comment after print
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline() // eol print
-  // Comment before print
-  print_newline() // eol print
-  // Comment after print
-} else {
-  // Comment before print
-  print_newline() // eol print
-  // Comment before print
-  print_newline() // eol print
-  // Comment after print
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-} else {
-  // Comment before print
-  print_newline() // eol print
-  // Comment before print
-  print_newline() // eol print
-  // Comment after print
-}
-
-// Comment before while test
-while trueThing {
-  // Comment before print
-  print_newline() // eol
-  // Comment before print
-  print_newline() // eol
-  // Comment after final print
-}
-
-// Comment before while test
-while trueThing {
-  // Comment before print
-  print_newline()
-}
-
-// Comment before for test
-for i in 0 to 100 {
-  // Comment before print
-  print_newline() // eol
-  // Comment before print
-  print_newline() // eol
-  // Comment after final print
-}
-
-// Comment before for test
-for i in 0 to 100 {
-  // Comment before print
-  print_newline()
-}
-
-let f = (a, b, c, d) => a + b + c + d
-
-while trueThing {
-  f(
-    // a
-    1,
-    // b
-    2,
-    // c
-    3,
-    // d
-    4,
-    // does work
-  )
-}
-while trueThing {
-  f(
-    // a
-    1,
-    // b
-    2,
-    // c
-    3,
-    // d
-    4, // does work
-  )
-}
-
-ignore((_really, _long, _printWidth, _exceeded, _here) => {
-  // First comment
-  let x = 0
-  x + x
-  // Closing comment
-})
-
-ignore((_xxx, _yyy) => {
-  // First comment
-  let x = 0
-  x + x
-  // Closing comment
-})
-
-type tester<'a, 'b> =
-  | TwoArgsConstructor('a, 'b)
-  | OneTupleArgConstructor(('a, 'b))
-let callFunctionTwoArgs = (a, b) => ()
-let callFunctionOneTuple = tuple => ()
-
-let y = TwoArgsConstructor(1, 2) //eol1 // eol2
-
-let y = callFunctionTwoArgs(1, 2) //eol1 // eol2
-
-let y = OneTupleArgConstructor((1, 2)) //eol1 // eol2
-
-let y = callFunctionOneTuple((1, 2)) //eol1 // eol2
-
-type polyRecord<'a, 'b> = {
-  fieldOne: 'a,
-  fieldTwo: 'b,
-}
-
-let r = {
-  fieldOne: 1, //eol1
-  fieldTwo: 2, // eol2
-}
-
-let r = {
-  fieldOne: 1, //eol1
-  fieldTwo: 2, // eol2 with trailing comma
-}
-
-let y = TwoArgsConstructor("1", "2") //eol1 // eol2
-
-let y = callFunctionTwoArgs("1", "2") //eol1 // eol2
-
-let y = OneTupleArgConstructor(("1", "2")) //eol1 // eol2
-
-let y = callFunctionOneTuple(("1", "2")) //eol1 // eol2
-
-let r = {
-  fieldOne: "1", //eol1
-  fieldTwo: "2", // eol2
-}
-
-let r = {
-  fieldOne: "1", //eol1
-  fieldTwo: "2", // eol2 with trailing comma
-}
-
-let identifier = "hello"
-
-let y = TwoArgsConstructor(identifier, identifier) //eol1 // eol2
-
-let y = callFunctionTwoArgs(identifier, identifier) //eol1 // eol2
-
-let y = OneTupleArgConstructor((identifier, identifier)) //eol1 // eol2
-
-let y = callFunctionOneTuple((identifier, identifier)) //eol1 // eol2
-
-let r = {
-  fieldOne: identifier, //eol1
-  fieldTwo: identifier, // eol2
-}
-
-let r = {
-  fieldOne: identifier, //eol1
-  fieldTwo: identifier, // eol2 with trailing comma
-}
-
-let y = TwoArgsConstructor((identifier: string), (identifier: string)) //eol1 // eol2
-
-let y = callFunctionTwoArgs((identifier: string), (identifier: string)) //eol1 // eol2
-
-let y = OneTupleArgConstructor(((identifier: string), (identifier: string))) //eol1 // eol2
-
-let y = callFunctionOneTuple(((identifier: string), (identifier: string))) //eol1 // eol2
-
-let r = {
-  fieldOne: (identifier: string), //eol1
-  fieldTwo: (identifier: string), // eol2
-}
-
-let r = {
-  fieldOne: (identifier: string), //eol1
-  fieldTwo: (identifier: string), // eol2 with trailing comma
-}
-
-// whitespace interleaving
-
-// comment1
-// comment2
-
-// whitespace above & below
-
-let r = {
-  fieldOne: (identifier: string), //eol1
-  // c1
-
-  // c2
-
-  // c3
-  // c4
-
-  // c5
-  fieldTwo: (identifier: string), // eol2 with trailing comma
-}
-// trailing
-
-// trailing whitespace above
-// attach
-
-// last comment
diff --git a/jscomp/syntax/tests/conversion/reason/destructiveSubstitutionSubModules.ml b/jscomp/syntax/tests/conversion/reason/destructiveSubstitutionSubModules.ml
deleted file mode 100644
index f6060c1..0000000
--- a/jscomp/syntax/tests/conversion/reason/destructiveSubstitutionSubModules.ml
+++ /dev/null
@@ -1,51 +0,0 @@
-module type Id  =
-  sig type t val toString : t -> string val ofString : string -> t option end
-module type A  = sig module Id : Id type name = string val name : name end
-module type B  = sig module A : A val fullName : A.Id.t -> string end
-module MakeB(A:A): B with module A.Id := A.Id =
-  (struct
-     module A = A
-     let fullName id = A.name ^ ("-" ^ (A.Id.toString id))
-   end)
-module StringId : Id =
-  struct
-    type t = string
-    external toString : t -> string = "%identity"
-    external ofString : string -> t = "%identity"
-    let ofString id = ((Some ((id |> ofString)))[@explicit_arity ])
-  end
-module A = struct module Id = StringId
-                  type name = string
-                  let name = "A" end
-module B = (MakeB)(A)
-let test =
-  match "someId" |> StringId.ofString with
-  | ((Some (id))[@explicit_arity ]) -> ((Some ((id |> B.fullName)))
-      [@explicit_arity ])
-  | None as none -> none
-
-module type Printable = sig
-  type t
-  val print : Format.formatter -> t -> unit
-end
-
-module type Comparable = sig
-  type t
-  val compare : t -> t -> int
-end
-
-module type PrintableComparable = sig
-  include Printable
-  include Comparable with type t := t
-end
-
-module type S = Comparable with type t := int
-
-module type S = sig
-  type u
-  include Comparable with type t := u
-end
-
-module type ComparableInt = Comparable with type t = int
-
-module type CompareInt = ComparableInt with type t := int
diff --git a/jscomp/syntax/tests/conversion/reason/docComments.ml b/jscomp/syntax/tests/conversion/reason/docComments.ml
deleted file mode 100644
index 4a6a782..0000000
--- a/jscomp/syntax/tests/conversion/reason/docComments.ml
+++ /dev/null
@@ -1,40 +0,0 @@
-(** The first special comment of the file is the comment associated
-     to the whole module. *)
-
- (** The comment for function f *)
- let f x y = x + y
-
- (** This comment is not attached to any element since there is another
-     special comment just before the next element. *)
-
- (** Comment for exception My_exception, even with a simple comment
-     between the special comment and the exception.*)
- (* A simple comment. *)
- exception My_exception of (int -> int) * int
-
- (** Comment for type weather  *)
- type weather =
- | Rain of int (** The comment for constructor Rain *)
- | Sun (** The comment for constructor Sun *)
-
- (** The comment for type my_record *)
- type my_record = {
-     foo : int ;    (** Comment for field foo *)
-     bar : string ; (** Comment for field bar *)
-   }
-
- (** The comment for module Foo *)
- module Foo =
-   struct
-     (** The comment for x *)
-     let x = 0
-     (** A special comment in the class, but not associated to any element. *)
-   end
-
- (** The comment for module type my_module_type. *)
- module type my_module_type =
-   sig
-     (* Comment for value x. *)
-     val x : int
-     (* ... *)
-   end
diff --git a/jscomp/syntax/tests/conversion/reason/docComments.mli b/jscomp/syntax/tests/conversion/reason/docComments.mli
deleted file mode 100644
index bfde148..0000000
--- a/jscomp/syntax/tests/conversion/reason/docComments.mli
+++ /dev/null
@@ -1,70 +0,0 @@
-(** The first special comment of the file is the comment associated
-     with the whole module.*)
-
-
- (** Special comments can be placed between elements and are kept
-     by the OCamldoc tool, but are not associated to any element.
-     @-tags in these comments are ignored.*)
-
- (*******************************************************************)
- (** Comments like the one above, with more than two asterisks,
-     are ignored. *)
-
- (** The comment for function f. *)
- val f : int -> int -> int
- (** The continuation of the comment for function f. *)
-
- (** Comment for exception My_exception, even with a simple comment
-     between the special comment and the exception.*)
- (* Hello, I'm a simple comment :-) *)
- exception My_exception of (int -> int) * int
-
- (** Comment for type weather  *)
- type weather =
- | Rain of int (** The comment for constructor Rain *)
- | Sun (** The comment for constructor Sun *)
-
- (** Comment for type weather2  *)
- type weather2 =
- | Rain of int (** The comment for constructor Rain *)
- | Sun (** The comment for constructor Sun *)
- (** I can continue the comment for type weather2 here
-   because there is already a comment associated to the last constructor.*)
-
- (** The comment for type my_record *)
- type my_record = {
-     foo : int ;    (** Comment for field foo *)
-     bar : string ; (** Comment for field bar *)
-   }
-   (** Continuation of comment for type my_record *)
-
- (** Comment for foo *)
- val foo : string
- (** This comment is associated to foo and not to bar. *)
- val bar : string
- (** This comment is associated to bar. *)
-
- (** The comment for module Foo *)
- module Foo :
-   sig
-     (** The comment for x *)
-     val x : int
-
-     (** A special comment that is kept but not associated to any element *)
-   end
-
- (** The comment for module type my_module_type. *)
- module type my_module_type =
-   sig
-     (** The comment for value x. *)
-     val x : int
-
-     (** The comment for module M. *)
-     module M :
-       sig
-         (** The comment for value y. *)
-         val y : int
-
-         (* ... *)
-       end
-   end
diff --git a/jscomp/syntax/tests/conversion/reason/docComments.res b/jscomp/syntax/tests/conversion/reason/docComments.res
deleted file mode 100644
index 2628830..0000000
--- a/jscomp/syntax/tests/conversion/reason/docComments.res
+++ /dev/null
@@ -1,11 +0,0 @@
-@ocaml.doc(" foo ")
-let x = 1
-
-@ocaml.doc("")
-let x = 1
-
-/* ** foo */
-let x = 1
-
-/* **** foo */
-let x = 1
diff --git a/jscomp/syntax/tests/conversion/reason/expected/attributes.res.txt b/jscomp/syntax/tests/conversion/reason/expected/attributes.res.txt
deleted file mode 100644
index ff549e3..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/attributes.res.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-module Color: {
-  type t = private string
-
-  @inline("red") let red: t
-  @inline("black") let black: t
-} = {
-  type t = string
-
-  @inline let red = "red"
-  @inline let black = "black"
-}
-
-@send external map: (array<'a>, 'a => 'b) => array<'b> = "map"
-@send external filter: (array<'a>, 'a => 'b) => array<'b> = "filter"
-list{1, 2, 3}->map(a => a + 1)->filter(a => modulo(a, 2) == 0)->Js.log
-
-type t
-@new external make: unit => t = "DOMParser"
-@bs.send.pipe(: t)
-external parseHtmlFromString: (string, @as("text/html") _) => Dom.htmlDocument = "parseFromString"
-
-Js.log(make() |> parseHtmlFromString("sdsd"))
diff --git a/jscomp/syntax/tests/conversion/reason/expected/bracedJsx.res.txt b/jscomp/syntax/tests/conversion/reason/expected/bracedJsx.res.txt
deleted file mode 100644
index b49e82f..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/bracedJsx.res.txt
+++ /dev/null
@@ -1,147 +0,0 @@
-open Belt
-
-type action =
-  | RunCommand
-  | SetValue(string)
-
-type line =
-  | User(string)
-  | System(string)
-
-type state = {
-  history: array<line>,
-  input: string,
-}
-
-module Styles = {
-  open Css
-  let terminal = style(list{
-    margin(10->px),
-    backgroundColor("222"->hex),
-    borderRadius(10->px),
-    padding(10->px),
-    color("fff"->hex),
-    height(300->px),
-    overflowY(auto),
-    fontFamily(#custom(Theme.codeFontFamily)),
-    unsafe("WebkitOverflowScrolling", "touch"),
-  })
-  let line = style(list{whiteSpace(#preWrap)})
-  let input = style(list{
-    backgroundColor("222"->hex),
-    fontFamily(#custom(Theme.codeFontFamily)),
-    color("fff"->hex),
-    fontSize(16->px),
-    borderWidth(zero),
-    margin(zero),
-    padding(zero),
-    outlineStyle(none),
-  })
-  let title = style(list{
-    fontSize(48->px),
-    fontWeight(extraBold),
-    marginTop(20->px),
-    marginBottom(20->px),
-    textAlign(center),
-  })
-}
-
-@react.component
-let make = () => {
-  let containerRef = React.useRef(Js.Nullable.null)
-
-  let (state, send) = React.useReducer((state, action) =>
-    switch action {
-    | RunCommand => {
-        input: "",
-        history: Array.concat(
-          state.history,
-          [
-            User(state.input),
-            switch state.input->Js.String.trim {
-            | "" => System("")
-            | "help" =>
-              System(`available commands:
-- help
-- ls
-- cat `)
-            | "ls" =>
-              System(`- hack-website.sh
-- go-to-home.sh
-- nuclear-codes.txt`)
-            | "cat" => System("cat: missing argument")
-            | "cat hack-website.sh"
-            | "cat ./hack-website.sh" =>
-              System("# seriously?\necho \"lol\"")
-            | "hack-website.sh"
-            | "./hack-website.sh" =>
-              System("lol")
-            | "cat nuclear-codes.txt"
-            | "cat ./nuclear-codes.txt" =>
-              System("000000")
-            | "go-to-home.sh"
-            | "./go-to-home.sh" =>
-              Js.Global.setTimeout(() => ReasonReact.Router.push("/"), 1_000)->ignore
-              System("Redirecting ...")
-            | "cat go-to-home.sh"
-            | "cat ./go-to-home.sh" =>
-              System("ReasonReact.Router.push(\"/\")")
-            | _ => System("command not found: " ++ (state.input ++ "\ntry command 'help'"))
-            },
-          ],
-        ),
-      }
-    | SetValue(input) => {...state, input}
-    }
-  , {history: [], input: ""})
-
-  React.useEffect1(() => {
-    switch containerRef.current->Js.Nullable.toOption {
-    | Some(containerRef) =>
-      open Webapi.Dom
-      containerRef->Element.setScrollTop(containerRef->Element.scrollHeight->float_of_int)
-    | None => ()
-    }
-    None
-  }, [state.history])
-
-  let userPrefix = "~ "
-  <WidthContainer>
-    <div role="heading" ariaLevel=1 className=Styles.title> {"Erreur"->ReasonReact.string} </div>
-    <div
-      className=Styles.terminal
-      onClick={event => (event->ReactEvent.Mouse.target)["querySelector"]("input")["focus"]()}
-      ref={containerRef->ReactDOMRe.Ref.domRef}>
-      {state.history
-      ->Array.mapWithIndex((index, item) =>
-        <div key={j`$index`} className=Styles.line>
-          {ReasonReact.string(
-            switch item {
-            | User(value) => userPrefix ++ value
-            | System(value) => value
-            },
-          )}
-        </div>
-      )
-      ->ReasonReact.array}
-      <div>
-        {userPrefix->ReasonReact.string}
-        {<input
-          type_="text"
-          className=Styles.input
-          autoFocus=true
-          value=state.input
-          onChange={event => send(SetValue((event->ReactEvent.Form.target)["value"]))}
-          onKeyDown={event => {
-            if event->ReactEvent.Keyboard.key == "Enter" {
-              send(RunCommand)
-            }
-            if event->ReactEvent.Keyboard.key == "Tab" {
-              event->ReactEvent.Keyboard.preventDefault
-            }
-          }}
-        />->ReasonReact.cloneElement(~props={"autoCapitalize": "off"}, [])}
-      </div>
-    </div>
-  </WidthContainer>
-}
diff --git a/jscomp/syntax/tests/conversion/reason/expected/braces.res.txt b/jscomp/syntax/tests/conversion/reason/expected/braces.res.txt
deleted file mode 100644
index 0a3e335..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/braces.res.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-let f = () => id
-let f = () => id
-
-if isArray(children) {
-  // Scenario 1
-  let code = children->asStringArray->Js.Array2.joinWith("")
-  <InlineCode> {code->s} </InlineCode>
-} else if isObject(children) {
-  // Scenario 2
-  children->asElement
-} else {
-  // Scenario 3
-  let code = unknownAsString(children)
-  makeCodeElement(~code, ~metastring, ~lang)
-}
-
-let getDailyNewCases = x =>
-  switch x {
-  | First(ret) => ret
-  | Pair({prevRecord, record}) =>
-    let confirmed = record.confirmed - prevRecord.confirmed
-    let deaths = record.deaths - prevRecord.deaths
-    {confirmed, deaths}
-  }
diff --git a/jscomp/syntax/tests/conversion/reason/expected/comments.res.txt b/jscomp/syntax/tests/conversion/reason/expected/comments.res.txt
deleted file mode 100644
index 948e3ba..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/comments.res.txt
+++ /dev/null
@@ -1,770 +0,0 @@
-// comment 1
-let /* a */ x /* b */ = /* c */ 1 /* comment 2 */
-
-// comment 3
-
-// comment 4
-let x = 1 /* 5 */
-/* 6 */
-
-let f = (
-  // 1
-  a, //2
-  // 3
-  b,
-) => {
-  // 5
-  x: 1, // 6
-  // 7
-  y: 2, // 8
-}
-/* **** comment */
-/* ** comment */
-/* comment */
-/* ** comment */
-/* *** comment */
-/* **** comment */
-
-/* ** */
-/* *** */
-
-/* ** */
-
-/* (** comment *) */
-/* (*** comment *) */
-/* *(*** comment *) */
-
-/* comment * */
-/* comment ** */
-/* comment *** */
-/* comment **** */
-
-let testingNotQuiteEndOfLineComments = list{
-  "Item 1" /* Comment For First Item */,
-  "Item 2" /* Comment For Second Item */,
-  "Item 3" /* Comment For Third Item */,
-  "Item 4" /* Comment For Fourth Item - but no semi */,
-  /* Comment after last item in list. */
-} /* Comment after list bracket */
-
-let testingEndOfLineComments = list{
-  "Item 1" /* Comment For First Item */,
-  "Item 2" /* Comment For Second Item */,
-  "Item 3" /* Comment For Third Item */,
-  "Item 4" /* Comment For Fourth Item - but before semi */,
-  /* Comment after last item in list. */
-} /* Comment after list bracket */
-
-/* This time no space between bracket and comment */
-let testingEndOfLineComments = list{} /* Comment after list bracket */
-
-type t = (int, int) /* End of line on t */
-
-type t22 = /* End of t22 line on type t22 = */
-(int, int)
-
-type variant =
-  /* Comment above X */
-  | X(int) /* End of line on X */
-  /* Comment above Y */
-  | Y(int) /* End of line on Y */
-/* Comment on entire type def for variant */
-
-type rec x = {
-  /* not attached *above* x */
-  fieldOne: int,
-} /* Attached end of line after x */
-and y = {
-  /* not attached *above* y */
-  fieldTwo: int,
-} /* Attached end of line after y */
-
-let result = switch X(3) {
-| X(x) =>
-  /* Where does this comment go? */
-  let tmp = x
-  x + tmp
-| Y(x) =>
-  /* How about this one */
-  let tmp = x
-  x + tmp
-}
-
-let result = switch None {
-| Some({fieldOne: 20}) =>
-  /* Where does this comment go? */
-  let tmp = 0
-  2 + tmp
-| Some({fieldOne: n}) =>
-  /* How about this one */
-  let tmp = n
-  n + tmp
-| None => 20
-}
-
-type pointWithManyKindsOfComments = {
-  /* Line before x */
-  x: string /* x field */,
-  /* Line before y */
-  y: string /* y field */,
-  /* Final row of record */
-}
-
-type typeParamPointWithComments<'a> = {
-  /* Line before x */
-  x: 'a /* x field */,
-  /* Line before y */
-  y: 'a /* y field */,
-  /* Final row of record */
-}
-
-let name_equal = (x, y) => x == y
-
-let equal = (i1, i2) => i1.contents === i2.contents && true /* most unlikely first */
-
-let equal = (i1, i2) => compare(compare(0, 0), compare(1, 1)) /* END OF LINE HERE */
-
-module Temp = {
-  let v = true
-  let logIt = (str, ()) => print_string(str)
-}
-
-let store_attributes = arg => {
-  let attributes_file = "test"
-  let proc_name = attributes_file ++ ".proc"
-  let should_write =
-    /* only overwrite defined procedures */
-    Temp.v || !Temp.v
-  if should_write {
-    Temp.logIt(proc_name, ())
-  }
-}
-3 // -
-3 //-
-
-3 //-
-
-3 /* - */
-// **** comment
-/* ** comment */
-@ocaml.doc(" docstring ")
-@ocaml.doc(" docstring ")
-@ocaml.doc(" ")
-@ocaml.doc("")
-@ocaml.doc(" (** comment *) ")
-@ocaml.doc(" (*** comment *) ")
-@ocaml.doc("
- * Multiline
- ")
-@ocaml.doc(" Multiline
- *
- ")
-@ocaml.doc("
- **
- ")
-module // comment
-
-/* ** comment */
-/* *** comment */
-/* **** comment */
-
-/* ** */
-/* *** */
-
-/* ** */
-
-// (** comment *)
-// (*** comment *)
-// *(*** comment *)
-// comment *
-// comment **
-// comment ***
-// comment ****
-
-JustString = {
-  include Map.Make(Int32) // Comment eol include
-}
-
-let testingEndOfLineComments = list{
-  "Item 1" /* Comment For First Item */,
-  "Item 2" /* Comment For Second Item */,
-  "Item 3" /* Comment For Third Item */,
-  "Item 4" /* Comment For Fourth Item - but before trailing comma */,
-  // Comment after last item in list.
-} /* Comment after rbracket */
-
-// But if you place them after the comma at eol, they're preserved as such
-let testingEndOfLineComments = list{
-  "Item 1", // Comment For First Item
-  "Item 2", // Comment For Second Item
-  "Item 3", // Comment For Third Item
-  "Item 4" /* Comment For Fourth Item - but before trailing comma */,
-  // Comment after last item in list.
-} /* Comment after rbracket */
-
-// The space between ; and comment shoudn't matter
-let testPlacementOfTrailingComment = list{
-  "Item 0",
-  // Comment after last item in list.
-} // Comment after semi
-
-// The space between ; and comment shoudn't matter
-let testPlacementOfTrailingComment = list{
-  "Item 0",
-  // Comment after last item in list.
-} // Comment after semi
-
-// Try again but without other things in the list
-let testPlacementOfTrailingComment = list{"Item 0"} // Comment after semi
-
-// The space between ; and comment shoudn't matter
-let testPlacementOfTrailingComment = list{
-  "Item 0",
-  // Comment after last item in list.
-} // Comment after semi
-
-let testingEndOfLineComments = list{} // Comment after entire let binding
-
-// The following is not yet idempotent
-// let myFunction
-//     withFirstArg  // First arg
-//     andSecondArg  => { // Second Arg
-//   withFirstArg + andSecondArg /* before semi */ ;
-// };
-
-let myFunction = // First arg
-(
-  withFirstArg,
-  // Second Arg
-  andSecondArg,
-) => withFirstArg + andSecondArg // After Semi
-
-type point = {
-  x: string, // x field
-  y: string, // y field
-}
-
-type pointWithManyKindsOfComments = {
-  // Line before x
-  x: string, // x field
-  // Line before y
-  y: string, // y field
-  // Final row of record
-}
-
-type typeParamPointWithComments<'a> = {
-  // Line before x
-  x: 'a, // x field
-  // Line before y
-  y: 'a, // y field
-  // Final row of record
-}
-
-// Now, interleaving comments in type params
-// Type name
-type typeParamPointWithComments2<
-  'a,
-  // The b type apram
-  'b,
-> = {
-  // Line before x
-  x: 'a, // x field
-  // Line before y
-  y: 'a, // y field
-  // Final row of record
-}
-
-/* The way the last row comment is formatted is suboptimal becuase
- * record type definitions do not include enough location information */
-type anotherpoint = {
-  x: string, // x field
-  y: string, // y field
-  // comment as last row of record
-}
-
-type t = (int, int) // End of line on t
-type t2 = (int, int) // End of line on (int, int)
-
-type t3 = (int, int) // End of line on (int, int)
-
-type variant =
-  | X(int, int) // End of line on X
-  | Y(int, int) // End of line on Y
-// Comment on entire type def for variant
-
-// Before let
-let res = // Before switch
-switch X(2, 3) {
-// Above X line
-| X(_) => "result of X" // End of arrow and X line
-// Above Y line
-| Y(_) => "result of Y" // End of arrow and Y line
-} // After final semi in switch
-
-let res = switch X(2, 3) {
-| X(0, 0) => // After X arrow
-  "result of X" // End of X body line
-| X(1, 0) /* Before X's arrow */ => "result of X" // End of X body line
-| X(_) => // After X _ arrow
-  "result of X" // End of X body line
-// Above Y line
-| Y(_) => // Comment above Y body
-  "result of Y"
-}
-
-type variant2 =
-  // Comment above X
-  | X(int, int) // End of line on X
-  // Comment above Y
-  | Y(int, int)
-
-type variant3 =
-  // Comment above X
-  | X(int, int) // End of line on X
-  // Comment above Y
-  | Y(int, int) // End of line on Y
-
-type rec x = {
-  // not attached *above* x
-  fieldOne: int,
-  fieldA: int,
-} // Attached end of line after x
-and y = {
-  // not attached *above* y
-  fieldTwo: int,
-} // Attached end of line after y
-
-type rec x2 = {
-  // not attached *above* x2
-  fieldOne: int,
-  fieldA: int,
-} // Attached end of line after x2
-and y2 = {
-  // not attached *above* y2
-  fieldTwo: int,
-}
-
-let result = switch None {
-| Some({fieldOne: 20, fieldA: a}) =>
-  // Where does this comment go?
-  let tmp = 0
-  2 + tmp
-| Some({fieldOne: n, fieldA: a}) =>
-  // How about this one
-  let tmp = n
-  n + tmp
-| None => 20
-}
-
-let res = // Before switch
-switch X(2, 3) {
-// Above X line
-| X(_) => "result of X" // End of arrow and X line
-// Above Y line
-| Y(_) => "result of Y" // End of arrow and Y line
-}
-
-/*
- * Now these end of line comments *should* be retained.
- */
-let result = switch None {
-| Some({fieldOne: 20, fieldA: a}) =>
-  let tmp = 0
-  2 + tmp
-| Some({fieldOne: n, fieldA: a}) =>
-  let tmp = n
-  n + tmp
-| None => 20
-}
-
-/*
- * These end of line comments *should* be retained.
- * To get the simple expression eol comment to be retained, we just need to
- * implement label breaking eol behavior much like we did with sequences.
- * Otherwise, right now they are not idempotent.
- */
-let res = switch X(2, 3) {
-// Above X line
-| X(_, _) => "result of X" // retain this // retain this
-
-// Above Y line
-| Y(_) => "result of Y" // End of arrow and Y line
-}
-
-/* type optionalTuple = */
-/* | OptTup( */
-/* option( */
-/* ( */
-/* int, */
-/* int */
-/* ), */
-/* ), */
-/* ); */
-
-type optionTuple = option<(int, int)> // First int // Second int
-
-type intPair = (int, int) // First int // Second int
-
-type intPair2 = (
-  // First int
-  int,
-  // Second int
-  int,
-)
-
-let result = @ocaml.doc("") (2 + 3)
-
-// This is not yet idempotent
-// {
-//   /**/
-//   (+) 2 3
-// };
-
-let a = ()
-for i in 0 to 10 {
-  // bla
-  a
-}
-
-if true {
-  ()
-}
-
-type color =
-  | Red(int) // After red end of line
-  | Black(int) // After black end of line
-  | Green(int) // After green end of line
-// On next line after color type def
-
-let blahCurriedX = (x, x) =>
-  switch x {
-  | Red(10)
-  | Black(20)
-  | Green(10) => 1 // After or pattern green
-  | Red(x) => 0 // After red
-  | Black(x) => 0 // After black
-  | Green(x) => 0
-  } // After second green
-// On next line after blahCurriedX def
-
-let name_equal = (x, y) => x == y
-
-let equal = (i1, i2) => i1.contents === i2.contents && true // most unlikely first
-
-let equal = (i1, i2) => compare(compare(0, 0), compare(1, 1)) // END OF LINE HERE
-
-let tuple_equal = ((i1, i2)) => i1 == i2
-
-let tuple_equal = ((csu, mgd)) =>
-  // Some really long comments, see https://github.com/facebook/reason/issues/811
-  tuple_equal((csu, mgd))
-
-let trueThing = true
-
-for i in 0 to 1 {
-  // comment
-  print_newline()
-}
-
-while trueThing {
-  // comment
-  print_newline()
-}
-
-if trueThing {
-  // comment
-  print_newline()
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-  // Comment before print
-  print_newline()
-  // Comment after final print
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-  // Comment before print
-  print_newline()
-  // Comment after final print
-} else {
-  // Comment before print
-  print_newline()
-  // Comment before print
-  print_newline()
-  // Comment after final print
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-} else {
-  // Comment before print
-  print_newline()
-}
-
-// Comment before while test
-while trueThing {
-  // Comment before print
-  print_newline()
-  // Comment before print
-  print_newline()
-  // Comment after final print
-}
-
-// Comment before while test
-while trueThing {
-  // Comment before print
-  print_newline()
-}
-
-// Comment before for test
-for i in 0 to 100 {
-  // Comment before print
-  print_newline()
-  // Comment before print
-  print_newline()
-  // Comment after final print
-}
-
-// Comment before for test
-for i in 0 to 100 {
-  // Comment before print
-  print_newline()
-}
-
-if trueThing {
-  // Comment before print
-  print_newline() // eol print
-  // Comment before print
-  print_newline() // eol print
-  // Comment after print
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline() // eol print
-  // Comment before print
-  print_newline() // eol print
-  // Comment after print
-} else {
-  // Comment before print
-  print_newline() // eol print
-  // Comment before print
-  print_newline() // eol print
-  // Comment after print
-}
-
-// Comment before if test
-if trueThing {
-  // Comment before print
-  print_newline()
-} else {
-  // Comment before print
-  print_newline() // eol print
-  // Comment before print
-  print_newline() // eol print
-  // Comment after print
-}
-
-// Comment before while test
-while trueThing {
-  // Comment before print
-  print_newline() // eol
-  // Comment before print
-  print_newline() // eol
-  // Comment after final print
-}
-
-// Comment before while test
-while trueThing {
-  // Comment before print
-  print_newline()
-}
-
-// Comment before for test
-for i in 0 to 100 {
-  // Comment before print
-  print_newline() // eol
-  // Comment before print
-  print_newline() // eol
-  // Comment after final print
-}
-
-// Comment before for test
-for i in 0 to 100 {
-  // Comment before print
-  print_newline()
-}
-
-let f = (a, b, c, d) => a + b + c + d
-
-while trueThing {
-  f(
-    // a
-    1,
-    // b
-    2,
-    // c
-    3,
-    // d
-    4,
-    // does work
-  )
-}
-while trueThing {
-  f(
-    // a
-    1,
-    // b
-    2,
-    // c
-    3,
-    // d
-    4, // does work
-  )
-}
-
-ignore((_really, _long, _printWidth, _exceeded, _here) => {
-  // First comment
-  let x = 0
-  x + x
-  // Closing comment
-})
-
-ignore((_xxx, _yyy) => {
-  // First comment
-  let x = 0
-  x + x
-  // Closing comment
-})
-
-type tester<'a, 'b> =
-  | TwoArgsConstructor('a, 'b)
-  | OneTupleArgConstructor(('a, 'b))
-let callFunctionTwoArgs = (a, b) => ()
-let callFunctionOneTuple = tuple => ()
-
-let y = TwoArgsConstructor(1, 2) //eol1 // eol2
-
-let y = callFunctionTwoArgs(1, 2) //eol1 // eol2
-
-let y = OneTupleArgConstructor((1, 2)) //eol1 // eol2
-
-let y = callFunctionOneTuple((1, 2)) //eol1 // eol2
-
-type polyRecord<'a, 'b> = {
-  fieldOne: 'a,
-  fieldTwo: 'b,
-}
-
-let r = {
-  fieldOne: 1, //eol1
-  fieldTwo: 2, // eol2
-}
-
-let r = {
-  fieldOne: 1, //eol1
-  fieldTwo: 2, // eol2 with trailing comma
-}
-
-let y = TwoArgsConstructor("1", "2") //eol1 // eol2
-
-let y = callFunctionTwoArgs("1", "2") //eol1 // eol2
-
-let y = OneTupleArgConstructor(("1", "2")) //eol1 // eol2
-
-let y = callFunctionOneTuple(("1", "2")) //eol1 // eol2
-
-let r = {
-  fieldOne: "1", //eol1
-  fieldTwo: "2", // eol2
-}
-
-let r = {
-  fieldOne: "1", //eol1
-  fieldTwo: "2", // eol2 with trailing comma
-}
-
-let identifier = "hello"
-
-let y = TwoArgsConstructor(identifier, identifier) //eol1 // eol2
-
-let y = callFunctionTwoArgs(identifier, identifier) //eol1 // eol2
-
-let y = OneTupleArgConstructor((identifier, identifier)) //eol1 // eol2
-
-let y = callFunctionOneTuple((identifier, identifier)) //eol1 // eol2
-
-let r = {
-  fieldOne: identifier, //eol1
-  fieldTwo: identifier, // eol2
-}
-
-let r = {
-  fieldOne: identifier, //eol1
-  fieldTwo: identifier, // eol2 with trailing comma
-}
-
-let y = TwoArgsConstructor((identifier: string), (identifier: string)) //eol1 // eol2
-
-let y = callFunctionTwoArgs((identifier: string), (identifier: string)) //eol1 // eol2
-
-let y = OneTupleArgConstructor(((identifier: string), (identifier: string))) //eol1 // eol2
-
-let y = callFunctionOneTuple(((identifier: string), (identifier: string))) //eol1 // eol2
-
-let r = {
-  fieldOne: (identifier: string), //eol1
-  fieldTwo: (identifier: string), // eol2
-}
-
-let r = {
-  fieldOne: (identifier: string), //eol1
-  fieldTwo: (identifier: string), // eol2 with trailing comma
-}
-
-// whitespace interleaving
-
-// comment1
-// comment2
-
-// whitespace above & below
-
-let r = {
-  fieldOne: (identifier: string), //eol1
-  // c1
-
-  // c2
-
-  // c3
-  // c4
-
-  // c5
-  fieldTwo: (identifier: string), // eol2 with trailing comma
-}
-// trailing
-
-// trailing whitespace above
-// attach
-
-// last comment
diff --git a/jscomp/syntax/tests/conversion/reason/expected/destructiveSubstitutionSubModules.ml.txt b/jscomp/syntax/tests/conversion/reason/expected/destructiveSubstitutionSubModules.ml.txt
deleted file mode 100644
index 81c1f50..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/destructiveSubstitutionSubModules.ml.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-module type Id = {
-  type t
-  let toString: t => string
-  let ofString: string => option<t>
-}
-module type A = {
-  module Id: Id
-  type name = string
-  let name: name
-}
-module type B = {
-  module A: A
-  let fullName: A.Id.t => string
-}
-module MakeB = (A: A): (B with module A.Id := A.Id) => {
-  module A = A
-  let fullName = id => A.name ++ ("-" ++ A.Id.toString(id))
-}
-module StringId: Id = {
-  type t = string
-  external toString: t => string = "%identity"
-  external ofString: string => t = "%identity"
-  let ofString = id => Some(id |> ofString)
-}
-module A = {
-  module Id = StringId
-  type name = string
-  let name = "A"
-}
-module B = MakeB(A)
-let test = switch "someId" |> StringId.ofString {
-| Some(id) => Some(id |> B.fullName)
-| None as none => none
-}
-
-module type Printable = {
-  type t
-  let print: (Format.formatter, t) => unit
-}
-
-module type Comparable = {
-  type t
-  let compare: (t, t) => int
-}
-
-module type PrintableComparable = {
-  include Printable
-  include Comparable with type t := t
-}
-
-module type S = Comparable with type t := int
-
-module type S = {
-  type u
-  include Comparable with type t := u
-}
-
-module type ComparableInt = Comparable with type t = int
-
-module type CompareInt = ComparableInt with type t := int
diff --git a/jscomp/syntax/tests/conversion/reason/expected/docComments.ml.txt b/jscomp/syntax/tests/conversion/reason/expected/docComments.ml.txt
deleted file mode 100644
index 7b31e47..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/docComments.ml.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@@ocaml.text(" The first special comment of the file is the comment associated
-     to the whole module. ")
-
-@ocaml.doc(" The comment for function f ")
-let f = (x, y) => x + y
-
-@@ocaml.text(" This comment is not attached to any element since there is another
-     special comment just before the next element. ")
-
-/* A simple comment. */
-@ocaml.doc(" Comment for exception My_exception, even with a simple comment
-     between the special comment and the exception.")
-exception My_exception(int => int, int)
-
-@ocaml.doc(" Comment for type weather  ")
-type weather =
-  | @ocaml.doc(" The comment for constructor Rain ") Rain(int)
-  | @ocaml.doc(" The comment for constructor Sun ") Sun
-
-@ocaml.doc(" The comment for type my_record ")
-type my_record = {
-  @ocaml.doc(" Comment for field foo ")
-  foo: int,
-  @ocaml.doc(" Comment for field bar ")
-  bar: string,
-}
-
-@ocaml.doc(" The comment for module Foo ")
-module Foo = {
-  @ocaml.doc(" The comment for x ")
-  @ocaml.doc(" A special comment in the class, but not associated to any element. ")
-  let x = 0
-}
-
-@ocaml.doc(" The comment for module type my_module_type. ")
-module type my_module_type = {
-  /* Comment for value x. */
-  let x: int
-  /* ... */
-}
diff --git a/jscomp/syntax/tests/conversion/reason/expected/docComments.mli.txt b/jscomp/syntax/tests/conversion/reason/expected/docComments.mli.txt
deleted file mode 100644
index 1ca939e..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/docComments.mli.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-@@ocaml.text(" The first special comment of the file is the comment associated
-     with the whole module.")
-
-@@ocaml.text(" Special comments can be placed between elements and are kept
-     by the OCamldoc tool, but are not associated to any element.
-     @-tags in these comments are ignored.")
-
-@@ocaml.text(/* ***************************************************************** */
-" Comments like the one above, with more than two asterisks,
-     are ignored. ")
-
-@ocaml.doc(" The comment for function f. ")
-@ocaml.doc(" The continuation of the comment for function f. ")
-let f: (int, int) => int
-
-/* Hello, I'm a simple comment :-) */
-@ocaml.doc(" Comment for exception My_exception, even with a simple comment
-     between the special comment and the exception.")
-exception My_exception(int => int, int)
-
-@ocaml.doc(" Comment for type weather  ")
-type weather =
-  | @ocaml.doc(" The comment for constructor Rain ") Rain(int)
-  | @ocaml.doc(" The comment for constructor Sun ") Sun
-
-@ocaml.doc(" Comment for type weather2  ")
-@ocaml.doc(" I can continue the comment for type weather2 here
-   because there is already a comment associated to the last constructor.")
-type weather2 =
-  | @ocaml.doc(" The comment for constructor Rain ") Rain(int)
-  | @ocaml.doc(" The comment for constructor Sun ") Sun
-
-@ocaml.doc(" The comment for type my_record ")
-@ocaml.doc(" Continuation of comment for type my_record ")
-type my_record = {
-  @ocaml.doc(" Comment for field foo ")
-  foo: int,
-  @ocaml.doc(" Comment for field bar ")
-  bar: string,
-}
-
-@ocaml.doc(" Comment for foo ") @ocaml.doc(" This comment is associated to foo and not to bar. ")
-let foo: string
-
-@ocaml.doc(" This comment is associated to foo and not to bar. ")
-@ocaml.doc(" This comment is associated to bar. ")
-let bar: string
-
-@ocaml.doc(" The comment for module Foo ")
-module Foo: {
-  @ocaml.doc(" The comment for x ")
-  let x: int
-
-  @@ocaml.text(" A special comment that is kept but not associated to any element ")
-}
-
-@ocaml.doc(" The comment for module type my_module_type. ")
-module type my_module_type = {
-  @ocaml.doc(" The comment for value x. ")
-  let x: int
-
-  @ocaml.doc(" The comment for module M. ")
-  module M: {
-    @ocaml.doc(" The comment for value y. ")
-    let y: int
-
-    /* ... */
-  }
-}
diff --git a/jscomp/syntax/tests/conversion/reason/expected/docComments.res.txt b/jscomp/syntax/tests/conversion/reason/expected/docComments.res.txt
deleted file mode 100644
index 2628830..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/docComments.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@ocaml.doc(" foo ")
-let x = 1
-
-@ocaml.doc("")
-let x = 1
-
-/* ** foo */
-let x = 1
-
-/* **** foo */
-let x = 1
diff --git a/jscomp/syntax/tests/conversion/reason/expected/extension.res.txt b/jscomp/syntax/tests/conversion/reason/expected/extension.res.txt
deleted file mode 100644
index 0a6ff92..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/extension.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-// here
-%%raw(` eval(
-__gc,
-1,
-0
-)
-  `)
-
-let x = %raw("10")
-let y = %raw("20")
diff --git a/jscomp/syntax/tests/conversion/reason/expected/fastPipe.res.txt b/jscomp/syntax/tests/conversion/reason/expected/fastPipe.res.txt
deleted file mode 100644
index a7007b6..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/fastPipe.res.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-a->f(b, c)->g(d, e)
-
-Element.querySelectorAll(selector, element)
-->NodeList.toArray
-->Array.keepMap(Element.ofNode)
-->Array.getBy(node => node->Element.textContent === content)
-
-let x = @attr ((@attr2 a)->f(b)->c(d))
-
-5->doStuff(3, _, 7)
-
-(event->target)["value"]
-
-(Route.urlToRoute(url)->ChangeView->self).send
-Route.urlToRoute(url)->ChangeView->self.send
-
-let aggregateTotal = (forecast, ~audienceType) =>
-  Js.Nullable.toOption(forecast["audiences"])
-  ->Option.flatMap(item => Js.Dict.get(item, audienceType))
-  ->Option.map(item => {
-    pages: item["reach"]["pages"],
-    views: item["reach"]["views"],
-    sample: item["reach"]["sample"],
-  })
diff --git a/jscomp/syntax/tests/conversion/reason/expected/gentype.res.txt b/jscomp/syntax/tests/conversion/reason/expected/gentype.res.txt
deleted file mode 100644
index 0ce4deb..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/gentype.res.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-module M: {
-  @genType @after
-  type t
-
-  @genType @after
-  let x: int
-
-  @foo
-  type e = ..
-} = {
-  type t
-  let x = 34
-  type e = ..
-}
-
-module type MT = {
-  @genType @after
-  type t
-
-  @genType @after
-  let x: int
-
-  @foo
-  type e = ..
-}
-
-@genType("ddd")
-let x = 42
diff --git a/jscomp/syntax/tests/conversion/reason/expected/gentype.resi.txt b/jscomp/syntax/tests/conversion/reason/expected/gentype.resi.txt
deleted file mode 100644
index 90cc39f..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/gentype.resi.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-let x: int
diff --git a/jscomp/syntax/tests/conversion/reason/expected/jsObject.res.txt b/jscomp/syntax/tests/conversion/reason/expected/jsObject.res.txt
deleted file mode 100644
index 0c591da..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/jsObject.res.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-let component = props["Component"]
-
-let element = props["element"]
-
-let y = {"age": 30}
-let y = {"age": 30, "name": "steve"}
-
-type propField<'a> = {.}
-type propField<'a> = {..} as 'a
-type propField<'a> = {..} as 'a
-type propField<'a> = Js.nullable<{..} as 'a>
-
-type propField<'a> = {"a": b}
-type propField<'a> = {.."a": b}
-type propField<'a> = {"a": {"b": c}}
-
-user["address"]
-user["address"]["street"]
-user["address"]["street"]["log"]
-
-user["address"] = "Avenue 1"
-user["address"]["street"] = "Avenue"
-user["address"]["street"]["number"] = "1"
-
-school["print"](direction["name"], studentHead["name"])
-city["getSchool"]()["print"](direction["name"], studentHead["name"])
diff --git a/jscomp/syntax/tests/conversion/reason/expected/jsObject.resi.txt b/jscomp/syntax/tests/conversion/reason/expected/jsObject.resi.txt
deleted file mode 100644
index f9ca82b..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/jsObject.resi.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-type propField<'a> = {.}
-type propField<'a> = {..} as 'a
-type propField<'a> = {..} as 'a
-type propField<'a> = Js.nullable<{..} as 'a>
-
-type propField<'a> = {"a": b}
-type propField<'a> = {.."a": b}
-type propField<'a> = {"a": {"b": c}}
diff --git a/jscomp/syntax/tests/conversion/reason/expected/jsxProps.res.txt b/jscomp/syntax/tests/conversion/reason/expected/jsxProps.res.txt
deleted file mode 100644
index d368bc9..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/jsxProps.res.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-let handleClick = (href, event) =>
-  if !ReactEvent.Mouse.defaultPrevented(event) {
-    ReactEvent.Mouse.preventDefault(event)
-    ReasonReact.Router.push(href)
-  }
-
-@react.component
-let make = (~href, ~className="", ~children) =>
-  <a href className onClick={event => handleClick(href, event)}> children </a>
-
-<Animated> ...{x => <div />} </Animated>
-
-<div> ...element </div>
-<div> ...{a => 1} </div>
-<div> ...<span /> </div>
-<div> ...[a, b] </div>
-<div> ...{(1, 2)} </div>
diff --git a/jscomp/syntax/tests/conversion/reason/expected/letBinding.res.txt b/jscomp/syntax/tests/conversion/reason/expected/letBinding.res.txt
deleted file mode 100644
index 525c159..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/letBinding.res.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-let deltaMode: t => Webapi__Dom__Types.deltaMode = self =>
-  Webapi__Dom__Types.decodeDeltaMode(deltaMode(self))
-
-let fromJs: ResourceIo.campaignWeeklyPlanning => t = weeklyPlanning => (
-  weeklyPlanning["monday"]->dayFromJs,
-  weeklyPlanning["tuesday"]->dayFromJs,
-  weeklyPlanning["wednesday"]->dayFromJs,
-  weeklyPlanning["thursday"]->dayFromJs,
-  weeklyPlanning["friday"]->dayFromJs,
-  weeklyPlanning["saturday"]->dayFromJs,
-  weeklyPlanning["sunday"]->dayFromJs,
-)
-
-let newChapter: Video.chapter = {startTime: percent *. duration}
diff --git a/jscomp/syntax/tests/conversion/reason/expected/letprivate.res.txt b/jscomp/syntax/tests/conversion/reason/expected/letprivate.res.txt
deleted file mode 100644
index d8b86ef..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/letprivate.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-%%private(let x = 34)
diff --git a/jscomp/syntax/tests/conversion/reason/expected/modType.res.txt b/jscomp/syntax/tests/conversion/reason/expected/modType.res.txt
deleted file mode 100644
index 260265c..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/modType.res.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-module Same = (Na: N, Nb: N): ((S with type number1 = Na.number) with type number2 = Nb.number) => {
-  type number1 = Na.number
-  type number2 = Nb.number
-  let rec sim = ((n, m)) =>
-    if Na.is_zero(n) {
-      Nb.is_zero(m)
-    } else {
-      sim((Na.pred(n), Nb.pred(m)))
-    }
-  let similar = ((n, m)) =>
-    try sim((n, m)) catch {
-    | Na.Too_small => false
-    | Nb.Too_small => false
-    }
-}
diff --git a/jscomp/syntax/tests/conversion/reason/expected/moduleLanguage.res.txt b/jscomp/syntax/tests/conversion/reason/expected/moduleLanguage.res.txt
deleted file mode 100644
index 724dfc6..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/moduleLanguage.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-let someFunctorAsFunction = (x: module(MT)): module(ResT) => module(SomeFunctor(unpack(x)))
diff --git a/jscomp/syntax/tests/conversion/reason/expected/namedArgs.res.txt b/jscomp/syntax/tests/conversion/reason/expected/namedArgs.res.txt
deleted file mode 100644
index eb0d820..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/namedArgs.res.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-let wizard = Wizard.make(
-  ~spriteSheet=wizard,
-  ~hp=999999999999999,
-  ~mp=50,
-  //~coordinates={x: 0., y:0. z: 0.},
-  ~coordinates={x: 40, y: 100., z: 0.},
-  //  /* c0 */ ~gpuCoordinates= /* c1 */ gpuBuffer[10] /* c2 */, // trailing
-)
-
-apply(
-  // above
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-  // below
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
-  // here
-  ~cccccccccccccccccccccccccccccccc,
-)
-
-applyOptional(
-  // above
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?,
-  // below
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb?,
-  // here
-  ~cccccccccccccccccccccccccccccccc?,
-)
-
-foo(
-  // c0
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int,
-  // c1
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int,
-  // c2
-  ~cccccccccccccccccccccccccccccc: int,
-)
-
-let f = (
-  ~isItemActive=?,
-  // array((name, href))
-  ~headers: array<(string, string)>,
-  ~moduleName: string,
-  // foo
-  ~x,
-  // above
-  /* c0 */ ~d: /* c1 */ e, // end
-  ~from as // does it work
-  hometown,
-) => {
-  let a = 1
-  let b = 2
-  a + b
-}
-
-@react.component
-let make = (
-  ~theme: ColorTheme.t,
-  ~components: Mdx.Components.t,
-  ~sidebarState: (bool, (bool => bool) => unit),
-  // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
-  ~sidebar: React.element,
-  ~breadcrumbs: option<list<UrlPath.breadcrumb>>=?,
-  ~children,
-) => ()
diff --git a/jscomp/syntax/tests/conversion/reason/expected/object.ml.txt b/jscomp/syntax/tests/conversion/reason/expected/object.ml.txt
deleted file mode 100644
index 3afee67..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/object.ml.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-type hi = {"z": int}
-type u<'a> = {.. ...hi, "x": int, "y": int} as 'a
-type u1<'a> = {.. ...hi} as 'a
-type u2<'a> = {.. ...hi, ...hi, "y": int, ...hi} as 'a
diff --git a/jscomp/syntax/tests/conversion/reason/expected/openPattern.res.txt b/jscomp/syntax/tests/conversion/reason/expected/openPattern.res.txt
deleted file mode 100644
index 2855827..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/openPattern.res.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-let {T.a: a} = a()
-let [Color.Blue] = a()
-let list{Color.Blue} = a()
-let (Color.Blue, Red) = a()
-
-let Color.Blue = blue
-
-module Color = {
-  type t = Red | Blue | Green
-  let red = Red
-  let blue = Blue
-  let green = Green
-}
-
-let () = switch (Color.red, Color.blue, Color.green) {
-| (Color.Red, Blue, Green) => Js.log("hello world")
-| _ => ()
-}
-
-let () = switch [Color.red, Color.blue, Color.green] {
-| [Color.Red, Blue, Green] => Js.log("hello world")
-| _ => ()
-}
diff --git a/jscomp/syntax/tests/conversion/reason/expected/ppx.res.txt b/jscomp/syntax/tests/conversion/reason/expected/ppx.res.txt
deleted file mode 100644
index 3f0dda1..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/ppx.res.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-%graphql(
-  `
-  query Site {
-    site {
-      siteMetadata {
-        title
-        description
-        siteUrl
-      }
-    }
-  }
-`
-  {taggedTemplate: false}
-)
-
-module Form = %form(
-  type input = {
-    name: string,
-    email: string,
-    message: string,
-    @as("form-name")
-    formName: string,
-  }
-  type output = input
-  let validators = {
-    name: {
-      strategy: OnFirstBlur,
-      validate: ({name, _}) =>
-        switch name {
-        | "" => Error("Name is required.")
-        | name => Ok(name)
-        },
-    },
-    email: {
-      strategy: OnFirstBlur,
-      validate: ({email, _}) =>
-        switch email {
-        | "" => Error("Email is required.")
-        | email => Ok(email)
-        },
-    },
-    message: {
-      strategy: OnFirstBlur,
-      validate: ({message, _}) =>
-        switch message {
-        | "" => Error("Message is required.")
-        | message => Ok(message)
-        },
-    },
-    formName: {
-      strategy: OnSubmit,
-      validate: ({formName, _}) => Ok(formName),
-    },
-  }
-)
diff --git a/jscomp/syntax/tests/conversion/reason/expected/recursiveType.ml.txt b/jscomp/syntax/tests/conversion/reason/expected/recursiveType.ml.txt
deleted file mode 100644
index b77962f..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/recursiveType.ml.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-type rec tree = {"label": string, "left": option<tree>, "right": option<tree>}
-
-type t = t
diff --git a/jscomp/syntax/tests/conversion/reason/expected/refSugar.ml.txt b/jscomp/syntax/tests/conversion/reason/expected/refSugar.ml.txt
deleted file mode 100644
index 96255e4..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/refSugar.ml.txt
+++ /dev/null
@@ -1 +0,0 @@
-let x = foo.contents
diff --git a/jscomp/syntax/tests/conversion/reason/expected/refSugarReason.res.txt b/jscomp/syntax/tests/conversion/reason/expected/refSugarReason.res.txt
deleted file mode 100644
index 96255e4..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/refSugarReason.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-let x = foo.contents
diff --git a/jscomp/syntax/tests/conversion/reason/expected/singleLineComments.res.txt b/jscomp/syntax/tests/conversion/reason/expected/singleLineComments.res.txt
deleted file mode 100644
index c5a75c2..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/singleLineComments.res.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-// This is the implementation of the _app.js file
-
-// Resources:
-// --------------
-// Really good article on state persistence within layouts:
-// https://adamwathan.me/2019/10/17/persistent-layout-patterns-in-nextjs/
-
-/*
-   a
-
- */
-
-/*
-   a
-
-*/
-let x = 1
-// here
diff --git a/jscomp/syntax/tests/conversion/reason/expected/string.res.txt b/jscomp/syntax/tests/conversion/reason/expected/string.res.txt
deleted file mode 100644
index a85d0bb..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/string.res.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-%%raw("define(x.y, 'userAgent', {value: 'USER_AGENT_STRING'})")
-
-%%raw("define(x.y, 'userAgent', {value: 'USER_AGENT_STRING'})")
-
-let x = `This is a long string with a slash and line break \\
-carriage return`
-
-let x = "\""
-let y = "\n"
-
-(<> {"\n"->React.string} </>)
-
-// The `//` should not result into an extra comment
-let x = j`https://www.apple.com`
-let x = `https://www.apple.com`
-let x = `https://www.apple.com`
-let x = `https://www.apple.com`
-let x = sql`https://www.apple.com`
-
-// /* */ should not result in an extra comments
-let x = j`/* https://www.apple.com */`
-let x = `/* https://www.apple.com*/`
-let x = `/*https://www.apple.com*/`
-let x = `/*https://www.apple.com*/`
-let x = sql`/*https://www.apple.com*/`
-
-let x = `\`https://\${appleWebsite}\``
-
-let var1 = "three"
-let var2 = "a string"
-
-switch (var1, var2) {
-| (`3`, `a string`) => Js.log("worked")
-| (` test with \` \${here} \``, _) => Js.log("escapes ` and ${")
-| _ => Js.log("didn't match")
-}
diff --git a/jscomp/syntax/tests/conversion/reason/expected/ternary.res.txt b/jscomp/syntax/tests/conversion/reason/expected/ternary.res.txt
deleted file mode 100644
index 3c90de0..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/ternary.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-let a = x ? 1 : 2
diff --git a/jscomp/syntax/tests/conversion/reason/expected/uncurrried.res.txt b/jscomp/syntax/tests/conversion/reason/expected/uncurrried.res.txt
deleted file mode 100644
index 48283a4..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/uncurrried.res.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-// ok
-let updateBriefletNarrative = (. updateObj) => Js.log("patented merge algorithm goes here")
-
-// this is a bug in Reason, the . will be parsed wrong and disappear.
-/* updateBriefletNarrative(. briefletNarrativeUpdateObj); */
-
-// this is a bug in Reason, the . will be parsed wrong and disappear.
-/* foo(. 3); */
-
-module D = {
-  // this is a bug in Reason, the . will be parsed wrong and disappear.
-  /* foo(. 3); */
-}
-
-// ok
-let x = foo(. 3)
-
-let x = {
-  let a = 3
-  // ok
-  foo(. a)
-}
-
-let x = {
-  // ok
-  let f = (. a, b) => apply(. a + b)
-  let a = 3
-  // ok
-  foo(. a)
-  // ok
-  f(. 2, 2)
-}
-
-// ok
-let () = switch something(. x, y) {
-| None =>
-  // ok
-  log(. a, b)
-| Some(_) =>
-  let a = 1
-  // ok
-  log(. a, 2)
-}
-
-let () = {
-  // ok
-  let dontDoThisAhome = (. a, b) => (. c, d) => (. e, f) => a + b + c + d + e + f
-  // ok
-  dontDoThisAhome(. a, b)(. c, d)(. e, f)
-}
-
-let _ = library.getBalance(. account)->Promise.Js.catch(_ => Promise.resolved(None))
-
-let _ =
-  library.getBalance(. account)
-  ->Promise.Js.catch(_ => Promise.resolved(None))
-  ->Promise.get(newBalance =>
-    dispatch(
-      LoadAddress(
-        account,
-        newBalance->Belt.Option.flatMap(balance => Eth.make(balance.toString(.))),
-      ),
-    )
-  )
diff --git a/jscomp/syntax/tests/conversion/reason/expected/underscoreSugar.res.txt b/jscomp/syntax/tests/conversion/reason/expected/underscoreSugar.res.txt
deleted file mode 100644
index 9330f5c..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/underscoreSugar.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-let photo = pricedRoom["room"]["photos"] |> filterNone |> Array.get(_, 0)
diff --git a/jscomp/syntax/tests/conversion/reason/expected/unicode.res.txt b/jscomp/syntax/tests/conversion/reason/expected/unicode.res.txt
deleted file mode 100644
index 332b911..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/unicode.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-let x = "✅ foo bar"
-
-let x = "\n okokok"
-
-let z = "\t \b \n okok 🙈"
diff --git a/jscomp/syntax/tests/conversion/reason/expected/variant.res.txt b/jscomp/syntax/tests/conversion/reason/expected/variant.res.txt
deleted file mode 100644
index 2864a7d..0000000
--- a/jscomp/syntax/tests/conversion/reason/expected/variant.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-type t = | @foo X
diff --git a/jscomp/syntax/tests/conversion/reason/extension.res b/jscomp/syntax/tests/conversion/reason/extension.res
deleted file mode 100644
index 0a6ff92..0000000
--- a/jscomp/syntax/tests/conversion/reason/extension.res
+++ /dev/null
@@ -1,10 +0,0 @@
-// here
-%%raw(` eval(
-__gc,
-1,
-0
-)
-  `)
-
-let x = %raw("10")
-let y = %raw("20")
diff --git a/jscomp/syntax/tests/conversion/reason/fastPipe.res b/jscomp/syntax/tests/conversion/reason/fastPipe.res
deleted file mode 100644
index c758fcc..0000000
--- a/jscomp/syntax/tests/conversion/reason/fastPipe.res
+++ /dev/null
@@ -1,24 +0,0 @@
-a->f(b, c)->g(d, e)
-
-Element.querySelectorAll(selector, element)
-->NodeList.toArray
-->Array.keepMap(Element.ofNode)
-->Array.getBy(node => node->Element.textContent === content)
-
-let x = @attr (@attr2 a->f(b)->c(d))
-
-5->doStuff(3, _, 7)
-
-(event->target)["value"]
-
-(Route.urlToRoute(url)->ChangeView->self).send
-Route.urlToRoute(url)->ChangeView->self.send
-
-let aggregateTotal = (forecast, ~audienceType) =>
-  Js.Nullable.toOption(forecast["audiences"])
-  ->Option.flatMap(item => Js.Dict.get(item, audienceType))
-  ->Option.map(item => {
-    pages: item["reach"]["pages"],
-    views: item["reach"]["views"],
-    sample: item["reach"]["sample"],
-  })
diff --git a/jscomp/syntax/tests/conversion/reason/gentype.res b/jscomp/syntax/tests/conversion/reason/gentype.res
deleted file mode 100644
index 0ce4deb..0000000
--- a/jscomp/syntax/tests/conversion/reason/gentype.res
+++ /dev/null
@@ -1,28 +0,0 @@
-module M: {
-  @genType @after
-  type t
-
-  @genType @after
-  let x: int
-
-  @foo
-  type e = ..
-} = {
-  type t
-  let x = 34
-  type e = ..
-}
-
-module type MT = {
-  @genType @after
-  type t
-
-  @genType @after
-  let x: int
-
-  @foo
-  type e = ..
-}
-
-@genType("ddd")
-let x = 42
diff --git a/jscomp/syntax/tests/conversion/reason/gentype.resi b/jscomp/syntax/tests/conversion/reason/gentype.resi
deleted file mode 100644
index 90cc39f..0000000
--- a/jscomp/syntax/tests/conversion/reason/gentype.resi
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType
-let x: int
diff --git a/jscomp/syntax/tests/conversion/reason/jsObject.res b/jscomp/syntax/tests/conversion/reason/jsObject.res
deleted file mode 100644
index 0c591da..0000000
--- a/jscomp/syntax/tests/conversion/reason/jsObject.res
+++ /dev/null
@@ -1,26 +0,0 @@
-let component = props["Component"]
-
-let element = props["element"]
-
-let y = {"age": 30}
-let y = {"age": 30, "name": "steve"}
-
-type propField<'a> = {.}
-type propField<'a> = {..} as 'a
-type propField<'a> = {..} as 'a
-type propField<'a> = Js.nullable<{..} as 'a>
-
-type propField<'a> = {"a": b}
-type propField<'a> = {.."a": b}
-type propField<'a> = {"a": {"b": c}}
-
-user["address"]
-user["address"]["street"]
-user["address"]["street"]["log"]
-
-user["address"] = "Avenue 1"
-user["address"]["street"] = "Avenue"
-user["address"]["street"]["number"] = "1"
-
-school["print"](direction["name"], studentHead["name"])
-city["getSchool"]()["print"](direction["name"], studentHead["name"])
diff --git a/jscomp/syntax/tests/conversion/reason/jsObject.resi b/jscomp/syntax/tests/conversion/reason/jsObject.resi
deleted file mode 100644
index f9ca82b..0000000
--- a/jscomp/syntax/tests/conversion/reason/jsObject.resi
+++ /dev/null
@@ -1,8 +0,0 @@
-type propField<'a> = {.}
-type propField<'a> = {..} as 'a
-type propField<'a> = {..} as 'a
-type propField<'a> = Js.nullable<{..} as 'a>
-
-type propField<'a> = {"a": b}
-type propField<'a> = {.."a": b}
-type propField<'a> = {"a": {"b": c}}
diff --git a/jscomp/syntax/tests/conversion/reason/jsxProps.res b/jscomp/syntax/tests/conversion/reason/jsxProps.res
deleted file mode 100644
index d368bc9..0000000
--- a/jscomp/syntax/tests/conversion/reason/jsxProps.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let handleClick = (href, event) =>
-  if !ReactEvent.Mouse.defaultPrevented(event) {
-    ReactEvent.Mouse.preventDefault(event)
-    ReasonReact.Router.push(href)
-  }
-
-@react.component
-let make = (~href, ~className="", ~children) =>
-  <a href className onClick={event => handleClick(href, event)}> children </a>
-
-<Animated> ...{x => <div />} </Animated>
-
-<div> ...element </div>
-<div> ...{a => 1} </div>
-<div> ...<span /> </div>
-<div> ...[a, b] </div>
-<div> ...{(1, 2)} </div>
diff --git a/jscomp/syntax/tests/conversion/reason/letBinding.res b/jscomp/syntax/tests/conversion/reason/letBinding.res
deleted file mode 100644
index 525c159..0000000
--- a/jscomp/syntax/tests/conversion/reason/letBinding.res
+++ /dev/null
@@ -1,14 +0,0 @@
-let deltaMode: t => Webapi__Dom__Types.deltaMode = self =>
-  Webapi__Dom__Types.decodeDeltaMode(deltaMode(self))
-
-let fromJs: ResourceIo.campaignWeeklyPlanning => t = weeklyPlanning => (
-  weeklyPlanning["monday"]->dayFromJs,
-  weeklyPlanning["tuesday"]->dayFromJs,
-  weeklyPlanning["wednesday"]->dayFromJs,
-  weeklyPlanning["thursday"]->dayFromJs,
-  weeklyPlanning["friday"]->dayFromJs,
-  weeklyPlanning["saturday"]->dayFromJs,
-  weeklyPlanning["sunday"]->dayFromJs,
-)
-
-let newChapter: Video.chapter = {startTime: percent *. duration}
diff --git a/jscomp/syntax/tests/conversion/reason/letprivate.res b/jscomp/syntax/tests/conversion/reason/letprivate.res
deleted file mode 100644
index d8b86ef..0000000
--- a/jscomp/syntax/tests/conversion/reason/letprivate.res
+++ /dev/null
@@ -1 +0,0 @@
-%%private(let x = 34)
diff --git a/jscomp/syntax/tests/conversion/reason/modType.res b/jscomp/syntax/tests/conversion/reason/modType.res
deleted file mode 100644
index 260265c..0000000
--- a/jscomp/syntax/tests/conversion/reason/modType.res
+++ /dev/null
@@ -1,15 +0,0 @@
-module Same = (Na: N, Nb: N): ((S with type number1 = Na.number) with type number2 = Nb.number) => {
-  type number1 = Na.number
-  type number2 = Nb.number
-  let rec sim = ((n, m)) =>
-    if Na.is_zero(n) {
-      Nb.is_zero(m)
-    } else {
-      sim((Na.pred(n), Nb.pred(m)))
-    }
-  let similar = ((n, m)) =>
-    try sim((n, m)) catch {
-    | Na.Too_small => false
-    | Nb.Too_small => false
-    }
-}
diff --git a/jscomp/syntax/tests/conversion/reason/moduleLanguage.res b/jscomp/syntax/tests/conversion/reason/moduleLanguage.res
deleted file mode 100644
index 724dfc6..0000000
--- a/jscomp/syntax/tests/conversion/reason/moduleLanguage.res
+++ /dev/null
@@ -1 +0,0 @@
-let someFunctorAsFunction = (x: module(MT)): module(ResT) => module(SomeFunctor(unpack(x)))
diff --git a/jscomp/syntax/tests/conversion/reason/namedArgs.res b/jscomp/syntax/tests/conversion/reason/namedArgs.res
deleted file mode 100644
index eb0d820..0000000
--- a/jscomp/syntax/tests/conversion/reason/namedArgs.res
+++ /dev/null
@@ -1,63 +0,0 @@
-let wizard = Wizard.make(
-  ~spriteSheet=wizard,
-  ~hp=999999999999999,
-  ~mp=50,
-  //~coordinates={x: 0., y:0. z: 0.},
-  ~coordinates={x: 40, y: 100., z: 0.},
-  //  /* c0 */ ~gpuCoordinates= /* c1 */ gpuBuffer[10] /* c2 */, // trailing
-)
-
-apply(
-  // above
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-  // below
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
-  // here
-  ~cccccccccccccccccccccccccccccccc,
-)
-
-applyOptional(
-  // above
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?,
-  // below
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb?,
-  // here
-  ~cccccccccccccccccccccccccccccccc?,
-)
-
-foo(
-  // c0
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int,
-  // c1
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int,
-  // c2
-  ~cccccccccccccccccccccccccccccc: int,
-)
-
-let f = (
-  ~isItemActive=?,
-  // array((name, href))
-  ~headers: array<(string, string)>,
-  ~moduleName: string,
-  // foo
-  ~x,
-  // above
-  /* c0 */ ~d: /* c1 */ e, // end
-  ~from as // does it work
-  hometown,
-) => {
-  let a = 1
-  let b = 2
-  a + b
-}
-
-@react.component
-let make = (
-  ~theme: ColorTheme.t,
-  ~components: Mdx.Components.t,
-  ~sidebarState: (bool, (bool => bool) => unit),
-  // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
-  ~sidebar: React.element,
-  ~breadcrumbs: option<list<UrlPath.breadcrumb>>=?,
-  ~children,
-) => ()
diff --git a/jscomp/syntax/tests/conversion/reason/object.ml b/jscomp/syntax/tests/conversion/reason/object.ml
deleted file mode 100644
index 6209959..0000000
--- a/jscomp/syntax/tests/conversion/reason/object.ml
+++ /dev/null
@@ -1,4 +0,0 @@
-type hi = < z : int >
-type 'a u = < hi ; x : int ; y : int; .. >  as 'a
-type 'a u1 = < hi; .. > as 'a
-type 'a u2 = < hi ; hi; y : int ; hi; .. >  as 'a
diff --git a/jscomp/syntax/tests/conversion/reason/openPattern.res b/jscomp/syntax/tests/conversion/reason/openPattern.res
deleted file mode 100644
index 2855827..0000000
--- a/jscomp/syntax/tests/conversion/reason/openPattern.res
+++ /dev/null
@@ -1,23 +0,0 @@
-let {T.a: a} = a()
-let [Color.Blue] = a()
-let list{Color.Blue} = a()
-let (Color.Blue, Red) = a()
-
-let Color.Blue = blue
-
-module Color = {
-  type t = Red | Blue | Green
-  let red = Red
-  let blue = Blue
-  let green = Green
-}
-
-let () = switch (Color.red, Color.blue, Color.green) {
-| (Color.Red, Blue, Green) => Js.log("hello world")
-| _ => ()
-}
-
-let () = switch [Color.red, Color.blue, Color.green] {
-| [Color.Red, Blue, Green] => Js.log("hello world")
-| _ => ()
-}
diff --git a/jscomp/syntax/tests/conversion/reason/ppx.res b/jscomp/syntax/tests/conversion/reason/ppx.res
deleted file mode 100644
index 3f0dda1..0000000
--- a/jscomp/syntax/tests/conversion/reason/ppx.res
+++ /dev/null
@@ -1,55 +0,0 @@
-%graphql(
-  `
-  query Site {
-    site {
-      siteMetadata {
-        title
-        description
-        siteUrl
-      }
-    }
-  }
-`
-  {taggedTemplate: false}
-)
-
-module Form = %form(
-  type input = {
-    name: string,
-    email: string,
-    message: string,
-    @as("form-name")
-    formName: string,
-  }
-  type output = input
-  let validators = {
-    name: {
-      strategy: OnFirstBlur,
-      validate: ({name, _}) =>
-        switch name {
-        | "" => Error("Name is required.")
-        | name => Ok(name)
-        },
-    },
-    email: {
-      strategy: OnFirstBlur,
-      validate: ({email, _}) =>
-        switch email {
-        | "" => Error("Email is required.")
-        | email => Ok(email)
-        },
-    },
-    message: {
-      strategy: OnFirstBlur,
-      validate: ({message, _}) =>
-        switch message {
-        | "" => Error("Message is required.")
-        | message => Ok(message)
-        },
-    },
-    formName: {
-      strategy: OnSubmit,
-      validate: ({formName, _}) => Ok(formName),
-    },
-  }
-)
diff --git a/jscomp/syntax/tests/conversion/reason/recursiveType.ml b/jscomp/syntax/tests/conversion/reason/recursiveType.ml
deleted file mode 100644
index 6a378ee..0000000
--- a/jscomp/syntax/tests/conversion/reason/recursiveType.ml
+++ /dev/null
@@ -1,4 +0,0 @@
-type tree =
-  < label: string  ;left: tree option  ;right: tree option   >  Js.t
-
-type nonrec t = t
diff --git a/jscomp/syntax/tests/conversion/reason/refSugar.ml b/jscomp/syntax/tests/conversion/reason/refSugar.ml
deleted file mode 100644
index 6aa9cea..0000000
--- a/jscomp/syntax/tests/conversion/reason/refSugar.ml
+++ /dev/null
@@ -1 +0,0 @@
-let x = !foo
diff --git a/jscomp/syntax/tests/conversion/reason/refSugarReason.res b/jscomp/syntax/tests/conversion/reason/refSugarReason.res
deleted file mode 100644
index 96255e4..0000000
--- a/jscomp/syntax/tests/conversion/reason/refSugarReason.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = foo.contents
diff --git a/jscomp/syntax/tests/conversion/reason/singleLineComments.res b/jscomp/syntax/tests/conversion/reason/singleLineComments.res
deleted file mode 100644
index c5a75c2..0000000
--- a/jscomp/syntax/tests/conversion/reason/singleLineComments.res
+++ /dev/null
@@ -1,18 +0,0 @@
-// This is the implementation of the _app.js file
-
-// Resources:
-// --------------
-// Really good article on state persistence within layouts:
-// https://adamwathan.me/2019/10/17/persistent-layout-patterns-in-nextjs/
-
-/*
-   a
-
- */
-
-/*
-   a
-
-*/
-let x = 1
-// here
diff --git a/jscomp/syntax/tests/conversion/reason/string.res b/jscomp/syntax/tests/conversion/reason/string.res
deleted file mode 100644
index a85d0bb..0000000
--- a/jscomp/syntax/tests/conversion/reason/string.res
+++ /dev/null
@@ -1,36 +0,0 @@
-%%raw("define(x.y, 'userAgent', {value: 'USER_AGENT_STRING'})")
-
-%%raw("define(x.y, 'userAgent', {value: 'USER_AGENT_STRING'})")
-
-let x = `This is a long string with a slash and line break \\
-carriage return`
-
-let x = "\""
-let y = "\n"
-
-(<> {"\n"->React.string} </>)
-
-// The `//` should not result into an extra comment
-let x = j`https://www.apple.com`
-let x = `https://www.apple.com`
-let x = `https://www.apple.com`
-let x = `https://www.apple.com`
-let x = sql`https://www.apple.com`
-
-// /* */ should not result in an extra comments
-let x = j`/* https://www.apple.com */`
-let x = `/* https://www.apple.com*/`
-let x = `/*https://www.apple.com*/`
-let x = `/*https://www.apple.com*/`
-let x = sql`/*https://www.apple.com*/`
-
-let x = `\`https://\${appleWebsite}\``
-
-let var1 = "three"
-let var2 = "a string"
-
-switch (var1, var2) {
-| (`3`, `a string`) => Js.log("worked")
-| (` test with \` \${here} \``, _) => Js.log("escapes ` and ${")
-| _ => Js.log("didn't match")
-}
diff --git a/jscomp/syntax/tests/conversion/reason/ternary.res b/jscomp/syntax/tests/conversion/reason/ternary.res
deleted file mode 100644
index 3c90de0..0000000
--- a/jscomp/syntax/tests/conversion/reason/ternary.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = x ? 1 : 2
diff --git a/jscomp/syntax/tests/conversion/reason/uncurrried.res b/jscomp/syntax/tests/conversion/reason/uncurrried.res
deleted file mode 100644
index b273f54..0000000
--- a/jscomp/syntax/tests/conversion/reason/uncurrried.res
+++ /dev/null
@@ -1,64 +0,0 @@
-// ok
-let updateBriefletNarrative = (. updateObj) => Js.log("patented merge algorithm goes here")
-
-// this is a bug in Reason, the . will be parsed wrong and disappear.
-/* updateBriefletNarrative(. briefletNarrativeUpdateObj); */
-
-// this is a bug in Reason, the . will be parsed wrong and disappear.
-/* foo(. 3); */
-
-module D = {
-  // this is a bug in Reason, the . will be parsed wrong and disappear.
-  /* foo(. 3); */
-}
-
-// ok
-let x = foo(. 3)
-
-let x = {
-  let a = 3
-  // ok
-  foo(. a)
-}
-
-let x = {
-  // ok
-  let f = (. a, b) => apply(. a + b)
-  let a = 3
-  // ok
-  foo(. a)
-  // ok
-  f(. 2, 2)
-}
-
-// ok
-let () = switch something(. x, y) {
-| None =>
-  // ok
-  log(. a, b)
-| Some(_) =>
-  let a = 1
-  // ok
-  log(. a, 2)
-}
-
-let () = {
-  // ok
-  let dontDoThisAhome = (. a, b, . c, d, . e, f) => a + b + c + d + e + f
-  // ok
-  dontDoThisAhome(. a, b)(. c, d)(. e, f)
-}
-
-let _ = library.getBalance(. account)->Promise.Js.catch(_ => Promise.resolved(None))
-
-let _ =
-  library.getBalance(. account)
-  ->Promise.Js.catch(_ => Promise.resolved(None))
-  ->Promise.get(newBalance =>
-    dispatch(
-      LoadAddress(
-        account,
-        newBalance->Belt.Option.flatMap(balance => Eth.make(balance.toString(.))),
-      ),
-    )
-  )
diff --git a/jscomp/syntax/tests/conversion/reason/underscoreSugar.res b/jscomp/syntax/tests/conversion/reason/underscoreSugar.res
deleted file mode 100644
index 9330f5c..0000000
--- a/jscomp/syntax/tests/conversion/reason/underscoreSugar.res
+++ /dev/null
@@ -1 +0,0 @@
-let photo = pricedRoom["room"]["photos"] |> filterNone |> Array.get(_, 0)
diff --git a/jscomp/syntax/tests/conversion/reason/unicode.res b/jscomp/syntax/tests/conversion/reason/unicode.res
deleted file mode 100644
index 332b911..0000000
--- a/jscomp/syntax/tests/conversion/reason/unicode.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let x = "✅ foo bar"
-
-let x = "\n okokok"
-
-let z = "\t \b \n okok 🙈"
diff --git a/jscomp/syntax/tests/conversion/reason/variant.res b/jscomp/syntax/tests/conversion/reason/variant.res
deleted file mode 100644
index 2864a7d..0000000
--- a/jscomp/syntax/tests/conversion/reason/variant.res
+++ /dev/null
@@ -1 +0,0 @@
-type t = | @foo X
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Css.res b/jscomp/syntax/tests/idempotency/bs-css/Css.res
deleted file mode 100644
index 492b63b..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Css.res
+++ /dev/null
@@ -1,16 +0,0 @@
-include Css_Legacy_Core
-include Css_Colors
-
-include Css_Legacy_Core.Make({
-  exception NotImplemented
-
-  let make = (. _) => raise(NotImplemented)
-  let mergeStyles = (. _) => raise(NotImplemented)
-  let injectRule = (. _) => ()
-  let injectRaw = (. _) => ()
-  let makeKeyFrames = (. _) => raise(NotImplemented)
-})
-
-external unsafeJsonToStyles: Js.Json.t => ReactDOMRe.Style.t = "%identity"
-
-let style = rules => rules->toJson->unsafeJsonToStyles
diff --git a/jscomp/syntax/tests/idempotency/bs-css/CssEmotion.res b/jscomp/syntax/tests/idempotency/bs-css/CssEmotion.res
deleted file mode 100644
index 97b2eed..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/CssEmotion.res
+++ /dev/null
@@ -1,35 +0,0 @@
-include Css_Legacy_Core
-include Css_Colors
-
-include Css_Legacy_Core.Make({
-  @module("emotion")
-  external mergeStyles: (. array<string>) => string = "cx"
-
-  @module("emotion") external make: (. Js.Json.t) => string = "css"
-
-  @module("emotion")
-  external injectRule: (. Js.Json.t) => unit = "injectGlobal"
-
-  @module("emotion")
-  external injectRaw: (. string) => unit = "injectGlobal"
-
-  @module("emotion")
-  external makeKeyFrames: (. Js.Dict.t<Js.Json.t>) => string = "keyframes"
-})
-
-type cache
-
-@module("emotion") external cache: cache = "cache"
-
-let fontFace = (~fontFamily, ~src, ~fontStyle=?, ~fontWeight=?, ~fontDisplay=?, ()) => {
-  let asString = Css_Legacy_Core.fontFace(
-    ~fontFamily,
-    ~src,
-    ~fontStyle?,
-    ~fontWeight?,
-    ~fontDisplay?,
-    (),
-  )
-  insertRule(asString)
-  fontFamily
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-css/CssEmotionJs.res b/jscomp/syntax/tests/idempotency/bs-css/CssEmotionJs.res
deleted file mode 100644
index 8e711f2..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/CssEmotionJs.res
+++ /dev/null
@@ -1,29 +0,0 @@
-include Css_Js_Core
-include Css_Colors
-
-include Css_Js_Core.Make({
-  @module("emotion")
-  external mergeStyles: (. array<string>) => string = "cx"
-
-  @module("emotion") external make: (. Js.Json.t) => string = "css"
-
-  @module("emotion")
-  external injectRule: (. Js.Json.t) => unit = "injectGlobal"
-
-  @module("emotion")
-  external injectRaw: (. string) => unit = "injectGlobal"
-
-  @module("emotion")
-  external makeKeyFrames: (. Js.Dict.t<Js.Json.t>) => string = "keyframes"
-})
-
-type cache
-
-@module("emotion") external cache: cache = "cache"
-
-let fontFace = (~fontFamily, ~src, ~fontStyle=?, ~fontWeight=?, ~fontDisplay=?, ()) => {
-  insertRule(.
-    Css_Js_Core.fontFace(~fontFamily, ~src, ~fontStyle?, ~fontWeight?, ~fontDisplay?, ()),
-  )
-  fontFamily
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-css/CssJs.res b/jscomp/syntax/tests/idempotency/bs-css/CssJs.res
deleted file mode 100644
index ad8caf1..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/CssJs.res
+++ /dev/null
@@ -1,16 +0,0 @@
-include Css_Js_Core
-include Css_Colors
-
-include Css_Js_Core.Make({
-  exception NotImplemented
-
-  let make = (. _) => raise(NotImplemented)
-  let mergeStyles = (. _) => raise(NotImplemented)
-  let injectRule = (. _) => ()
-  let injectRaw = (. _) => ()
-  let makeKeyFrames = (. _) => raise(NotImplemented)
-})
-
-external unsafeJsonToStyles: Js.Json.t => ReactDOMRe.Style.t = "%identity"
-
-let style = (. rules) => rules->toJson->unsafeJsonToStyles
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Css_AtomicTypes.res b/jscomp/syntax/tests/idempotency/bs-css/Css_AtomicTypes.res
deleted file mode 100644
index 18d2935..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Css_AtomicTypes.res
+++ /dev/null
@@ -1,1823 +0,0 @@
-let join = (strings, separator) => {
-  let rec run = (strings, acc) =>
-    switch strings {
-    | list{} => acc
-    | list{x} => acc ++ x
-    | list{x, ...xs} => run(xs, acc ++ (x ++ separator))
-    }
-  run(strings, "")
-}
-
-module Cascading = {
-  type t = [#initial | #inherit_ | #unset]
-
-  let initial = #initial
-  let inherit_ = #inherit_
-  let unset = #unset
-
-  let toString = x =>
-    switch x {
-    | #initial => "initial"
-    | #inherit_ => "inherit"
-    | #unset => "unset"
-    }
-}
-
-module Var = {
-  type t = [#var(string) | #varDefault(string, string)]
-
-  let var = x => #var(x)
-  let varDefault = (x, default) => #varDefault(x, default)
-
-  let prefix = x => Js.String.startsWith("--", x) ? x : "--" ++ x
-
-  let toString = x =>
-    switch x {
-    | #var(x) => "var(" ++ (prefix(x) ++ ")")
-    | #varDefault(x, v) => "var(" ++ (prefix(x) ++ ("," ++ (v ++ ")")))
-    }
-}
-
-module Time = {
-  type t = [#s(float) | #ms(float)]
-
-  let s = x => #s(x)
-  let ms = x => #ms(x)
-
-  let toString = x =>
-    switch x {
-    | #s(v) => Js.Float.toString(v) ++ "s"
-    | #ms(v) => Js.Float.toString(v) ++ "ms"
-    }
-}
-
-module Percentage = {
-  type t = [#percent(float)]
-
-  let pct = x => #percent(x)
-
-  let toString = x =>
-    switch x {
-    | #percent(x) => Js.Float.toString(x) ++ "%"
-    }
-}
-
-module Url = {
-  type t = [#url(string)]
-
-  let toString = x =>
-    switch x {
-    | #url(s) => "url(" ++ (s ++ ")")
-    }
-}
-
-module Length = {
-  type rec t = [
-    | #ch(float)
-    | #em(float)
-    | #ex(float)
-    | #rem(float)
-    | #vh(float)
-    | #vw(float)
-    | #vmin(float)
-    | #vmax(float)
-    | #px(int)
-    | #pxFloat(float)
-    | #cm(float)
-    | #mm(float)
-    | #inch(float)
-    | #pc(float)
-    | #pt(int)
-    | #zero
-    | #calc([#add | #sub], t, t)
-    | #percent(float)
-  ]
-
-  let ch = x => #ch(x)
-  let em = x => #em(x)
-  let ex = x => #ex(x)
-  let rem = x => #rem(x)
-  let vh = x => #vh(x)
-  let vw = x => #vw(x)
-  let vmin = x => #vmin(x)
-  let vmax = x => #vmax(x)
-  let px = x => #px(x)
-  let pxFloat = x => #pxFloat(x)
-  let cm = x => #cm(x)
-  let mm = x => #mm(x)
-  let inch = x => #inch(x)
-  let pc = x => #pc(x)
-  let pt = x => #pt(x)
-  let zero = #zero
-
-  let rec toString = x =>
-    switch x {
-    | #ch(x) => Js.Float.toString(x) ++ "ch"
-    | #em(x) => Js.Float.toString(x) ++ "em"
-    | #ex(x) => Js.Float.toString(x) ++ "ex"
-    | #rem(x) => Js.Float.toString(x) ++ "rem"
-    | #vh(x) => Js.Float.toString(x) ++ "vh"
-    | #vw(x) => Js.Float.toString(x) ++ "vw"
-    | #vmin(x) => Js.Float.toString(x) ++ "vmin"
-    | #vmax(x) => Js.Float.toString(x) ++ "vmax"
-    | #px(x) => Js.Int.toString(x) ++ "px"
-    | #pxFloat(x) => Js.Float.toString(x) ++ "px"
-    | #cm(x) => Js.Float.toString(x) ++ "cm"
-    | #mm(x) => Js.Float.toString(x) ++ "mm"
-    | #inch(x) => Js.Float.toString(x) ++ "in"
-    | #pc(x) => Js.Float.toString(x) ++ "pc"
-    | #pt(x) => Js.Int.toString(x) ++ "pt"
-    | #zero => "0"
-
-    | #calc(#add, a, b) => "calc(" ++ (toString(a) ++ (" + " ++ (toString(b) ++ ")")))
-    | #calc(#sub, a, b) => "calc(" ++ (toString(a) ++ (" - " ++ (toString(b) ++ ")")))
-    | #percent(x) => Js.Float.toString(x) ++ "%"
-    }
-}
-
-module Angle = {
-  type t = [#deg(float) | #rad(float) | #grad(float) | #turn(float)]
-
-  let deg = (x: float) => #deg(x)
-  let rad = (x: float) => #rad(x)
-  let grad = (x: float) => #grad(x)
-  let turn = (x: float) => #turn(x)
-
-  let toString = x =>
-    switch x {
-    | #deg(x) => Js.Float.toString(x) ++ "deg"
-    | #rad(x) => Js.Float.toString(x) ++ "rad"
-    | #grad(x) => Js.Float.toString(x) ++ "grad"
-    | #turn(x) => Js.Float.toString(x) ++ "turn"
-    }
-}
-
-module Direction = {
-  type t = [#ltr | #rtl]
-
-  let ltr = #ltr
-  let rtl = #rtl
-
-  let toString = x =>
-    switch x {
-    | #ltr => "ltr"
-    | #rtl => "rtl"
-    }
-}
-
-module Position = {
-  type t = [#absolute | #relative | #static | #fixed | #sticky]
-
-  let absolute = #absolute
-  let relative = #relative
-  let static = #static
-  let fixed = #fixed
-  let sticky = #sticky
-
-  let toString = x =>
-    switch x {
-    | #absolute => "absolute"
-    | #relative => "relative"
-    | #static => "static"
-    | #fixed => "fixed"
-    | #sticky => "sticky"
-    }
-}
-
-module Resize = {
-  type t = [#none | #both | #horizontal | #vertical | #block | #inline]
-
-  let none = #none
-  let both = #both
-  let horizontal = #horizontal
-  let vertical = #vertical
-  let block = #block
-  let inline = #inline
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #both => "both"
-    | #horizontal => "horizontal"
-    | #vertical => "vertical"
-    | #block => "block"
-    | #inline => "inline"
-    }
-}
-
-module FontVariant = {
-  type t = [#normal | #smallCaps]
-
-  let normal = #normal
-  let smallCaps = #smallCaps
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    | #smallCaps => "smallCaps"
-    }
-}
-
-module FontStyle = {
-  type t = [#normal | #italic | #oblique]
-
-  let normal = #normal
-  let italic = #italic
-  let oblique = #oblique
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    | #italic => "italic"
-    | #oblique => "oblique"
-    }
-}
-
-module FlexBasis = {
-  type t = [
-    | #auto
-    | #fill
-    | #content
-    | #maxContent
-    | #minContent
-    | #fitContent
-  ]
-
-  let fill = #fill
-  let content = #content
-  let maxContent = #maxContent
-  let minContent = #minContent
-  let fitContent = #fitContent
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    | #fill => "fill"
-    | #content => "content"
-    | #maxContent => "max-content"
-    | #minContent => "min-content"
-    | #fitContent => "fit-content"
-    }
-}
-
-module Overflow = {
-  type t = [#hidden | #visible | #scroll | #auto]
-
-  let hidden = #hidden
-  let visible = #visible
-  let scroll = #scroll
-  let auto = #auto
-
-  let toString = x =>
-    switch x {
-    | #hidden => "hidden"
-    | #visible => "visible"
-    | #scroll => "scroll"
-    | #auto => "auto"
-    }
-}
-
-module Margin = {
-  type t = [#auto]
-
-  let auto = #auto
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    }
-}
-
-module GridAutoFlow = {
-  type t = [#column | #row | #columnDense | #rowDense]
-
-  let toString = x =>
-    switch x {
-    | #column => "column"
-    | #row => "row"
-    | #columnDense => "column dense"
-    | #rowDense => "row dense"
-    }
-}
-
-module ColumnGap = {
-  type t = [#normal]
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    }
-}
-
-module VerticalAlign = {
-  type t = [
-    | #baseline
-    | #sub
-    | #super
-    | #top
-    | #textTop
-    | #middle
-    | #bottom
-    | #textBottom
-  ]
-
-  let toString = x =>
-    switch x {
-    | #baseline => "baseline"
-    | #sub => "sub"
-    | #super => "super"
-    | #top => "top"
-    | #textTop => "text-top"
-    | #middle => "middle"
-    | #bottom => "bottom"
-    | #textBottom => "text-bottom"
-    }
-}
-
-module TimingFunction = {
-  type t = [
-    | #linear
-    | #ease
-    | #easeIn
-    | #easeOut
-    | #easeInOut
-    | #stepStart
-    | #stepEnd
-    | #steps(int, [#start | #end_])
-    | #cubicBezier(float, float, float, float)
-  ]
-
-  let linear = #linear
-  let ease = #ease
-  let easeIn = #easeIn
-  let easeInOut = #easeInOut
-  let easeOut = #easeOut
-  let stepStart = #stepStart
-  let stepEnd = #stepEnd
-  let steps = (i, dir) => #steps(i, dir)
-  let cubicBezier = (a, b, c, d) => #cubicBezier(a, b, c, d)
-
-  let toString = x =>
-    switch x {
-    | #linear => "linear"
-    | #ease => "ease"
-    | #easeIn => "ease-in"
-    | #easeOut => "ease-out"
-    | #easeInOut => "ease-in-out"
-    | #stepStart => "step-start"
-    | #stepEnd => "step-end"
-    | #steps(i, #start) => "steps(" ++ (Js.Int.toString(i) ++ ", start)")
-    | #steps(i, #end_) => "steps(" ++ (Js.Int.toString(i) ++ ", end)")
-    | #cubicBezier(a, b, c, d) =>
-      "cubic-bezier(" ++
-      (Js.Float.toString(a) ++
-      (", " ++
-      (Js.Float.toString(b) ++
-      (", " ++ (Js.Float.toString(c) ++ (", " ++ (Js.Float.toString(d) ++ ")")))))))
-    }
-}
-
-module RepeatValue = {
-  type t = [#autoFill | #autoFit | #num(int)]
-
-  let toString = x =>
-    switch x {
-    | #autoFill => "auto-fill"
-    | #autoFit => "auto-fit"
-    | #num(x) => Js.Int.toString(x)
-    }
-}
-
-module ListStyleType = {
-  type t = [
-    | #disc
-    | #circle
-    | #square
-    | #decimal
-    | #lowerAlpha
-    | #upperAlpha
-    | #lowerGreek
-    | #lowerLatin
-    | #upperLatin
-    | #lowerRoman
-    | #upperRoman
-    | #none
-  ]
-
-  let toString = x =>
-    switch x {
-    | #disc => "disc"
-    | #circle => "circle"
-    | #square => "square"
-    | #decimal => "decimal"
-    | #lowerAlpha => "lower-alpha"
-    | #upperAlpha => "upper-alpha"
-    | #lowerGreek => "lower-greek"
-    | #lowerLatin => "lower-latin"
-    | #upperLatin => "upper-latin"
-    | #lowerRoman => "lower-roman"
-    | #upperRoman => "upper-roman"
-    | #none => "none"
-    }
-}
-
-module ListStylePosition = {
-  type t = [#inside | #outside]
-
-  let toString = x =>
-    switch x {
-    | #inside => "inside"
-    | #outside => "outside"
-    }
-}
-
-module OutlineStyle = {
-  type t = [
-    | #none
-    | #hidden
-    | #dotted
-    | #dashed
-    | #solid
-    | #double
-    | #groove
-    | #ridge
-    | #inset
-    | #outset
-  ]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #hidden => "hidden"
-    | #dotted => "dotted"
-    | #dashed => "dashed"
-    | #solid => "solid"
-    | #double => "double"
-    | #groove => "grove"
-    | #ridge => "ridge"
-    | #inset => "inset"
-    | #outset => "outset"
-    }
-}
-
-module FontWeight = {
-  type t = [
-    | #num(int)
-    | #thin
-    | #extraLight
-    | #light
-    | #normal
-    | #medium
-    | #semiBold
-    | #bold
-    | #extraBold
-    | #black
-    | #lighter
-    | #bolder
-  ]
-
-  let thin = #thin
-  let extraLight = #extraLight
-  let light = #light
-  let medium = #medium
-  let semiBold = #semiBold
-  let bold = #bold
-  let extraBold = #extraBold
-  let lighter = #lighter
-  let bolder = #bolder
-
-  let toString = x =>
-    switch x {
-    | #num(n) => Js.Int.toString(n)
-    | #thin => "100"
-    | #extraLight => "200"
-    | #light => "300"
-    | #normal => "400"
-    | #medium => "500"
-    | #semiBold => "600"
-    | #bold => "700"
-    | #extraBold => "800"
-    | #black => "900"
-    | #lighter => "lighter"
-    | #bolder => "bolder"
-    }
-}
-
-module Transform = {
-  type t = [
-    | #translate(Length.t, Length.t)
-    | #translate3d(Length.t, Length.t, Length.t)
-    | #translateX(Length.t)
-    | #translateY(Length.t)
-    | #translateZ(Length.t)
-    | #scale(float, float)
-    | #scale3d(float, float, float)
-    | #scaleX(float)
-    | #scaleY(float)
-    | #scaleZ(float)
-    | #rotate(Angle.t)
-    | #rotate3d(float, float, float, Angle.t)
-    | #rotateX(Angle.t)
-    | #rotateY(Angle.t)
-    | #rotateZ(Angle.t)
-    | #skew(Angle.t, Angle.t)
-    | #skewX(Angle.t)
-    | #skewY(Angle.t)
-    | #perspective(int)
-  ]
-
-  let translate = (x, y) => #translate(x, y)
-  let translate3d = (x, y, z) => #translate3d(x, y, z)
-  let translateX = x => #translateX(x)
-  let translateY = y => #translateY(y)
-  let translateZ = z => #translateZ(z)
-  let scale = (x, y) => #scale(x, y)
-  let scale3d = (x, y, z) => #scale3d(x, y, z)
-  let scaleX = x => #scaleX(x)
-  let scaleY = x => #scaleY(x)
-  let scaleZ = x => #scaleZ(x)
-  let rotate = a => #rotate(a)
-  let rotate3d = (x, y, z, a) => #rotate3d(x, y, z, a)
-  let rotateX = a => #rotateX(a)
-  let rotateY = a => #rotateY(a)
-  let rotateZ = a => #rotateZ(a)
-  let skew = (a, a') => #skew(a, a')
-  let skewX = a => #skewX(a)
-  let skewY = a => #skewY(a)
-
-  let string_of_scale = (x, y) =>
-    "scale(" ++ (Js.Float.toString(x) ++ (", " ++ (Js.Float.toString(y) ++ ")")))
-
-  let string_of_translate3d = (x, y, z) =>
-    "translate3d(" ++
-    (Length.toString(x) ++
-    (", " ++ (Length.toString(y) ++ (", " ++ (Length.toString(z) ++ ")")))))
-
-  let toString = x =>
-    switch x {
-    | #translate(x, y) =>
-      "translate(" ++ (Length.toString(x) ++ (", " ++ (Length.toString(y) ++ ")")))
-    | #translate3d(x, y, z) => string_of_translate3d(x, y, z)
-    | #translateX(x) => "translateX(" ++ (Length.toString(x) ++ ")")
-    | #translateY(y) => "translateY(" ++ (Length.toString(y) ++ ")")
-    | #translateZ(z) => "translateZ(" ++ (Length.toString(z) ++ ")")
-    | #scale(x, y) => string_of_scale(x, y)
-    | #scale3d(x, y, z) =>
-      "scale3d(" ++
-      (Js.Float.toString(x) ++
-      (", " ++ (Js.Float.toString(y) ++ (", " ++ (Js.Float.toString(z) ++ ")")))))
-    | #scaleX(x) => "scaleX(" ++ (Js.Float.toString(x) ++ ")")
-    | #scaleY(y) => "scaleY(" ++ (Js.Float.toString(y) ++ ")")
-    | #scaleZ(z) => "scaleZ(" ++ (Js.Float.toString(z) ++ ")")
-    | #rotate(a) => "rotate(" ++ (Angle.toString(a) ++ ")")
-    | #rotate3d(x, y, z, a) =>
-      "rotate3d(" ++
-      (Js.Float.toString(x) ++
-      (", " ++
-      (Js.Float.toString(y) ++
-      (", " ++ (Js.Float.toString(z) ++ (", " ++ (Angle.toString(a) ++ ")")))))))
-    | #rotateX(a) => "rotateX(" ++ (Angle.toString(a) ++ ")")
-    | #rotateY(a) => "rotateY(" ++ (Angle.toString(a) ++ ")")
-    | #rotateZ(a) => "rotateZ(" ++ (Angle.toString(a) ++ ")")
-    | #skew(x, y) => "skew(" ++ (Angle.toString(x) ++ (", " ++ (Angle.toString(y) ++ ")")))
-    | #skewX(a) => "skewX(" ++ (Angle.toString(a) ++ ")")
-    | #skewY(a) => "skewY(" ++ (Angle.toString(a) ++ ")")
-    | #perspective(x) => "perspective(" ++ (Js.Int.toString(x) ++ ")")
-    }
-}
-
-module AnimationDirection = {
-  type t = [#normal | #reverse | #alternate | #alternateReverse]
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    | #reverse => "reverse"
-    | #alternate => "alternate"
-    | #alternateReverse => "alternate-reverse"
-    }
-}
-
-module AnimationFillMode = {
-  type t = [#none | #forwards | #backwards | #both]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #forwards => "forwards"
-    | #backwards => "backwards"
-    | #both => "both"
-    }
-}
-
-module AnimationIterationCount = {
-  type t = [#infinite | #count(int)]
-
-  let toString = x =>
-    switch x {
-    | #infinite => "infinite"
-    | #count(x) => Js.Int.toString(x)
-    }
-}
-
-module AnimationPlayState = {
-  type t = [#paused | #running]
-
-  let toString = x =>
-    switch x {
-    | #paused => "paused"
-    | #running => "running"
-    }
-}
-
-module Cursor = {
-  type t = [
-    | #auto
-    | #default
-    | #none
-    | #contextMenu
-    | #help
-    | #pointer
-    | #progress
-    | #wait
-    | #cell
-    | #crosshair
-    | #text
-    | #verticalText
-    | #alias
-    | #copy
-    | #move
-    | #noDrop
-    | #notAllowed
-    | #grab
-    | #grabbing
-    | #allScroll
-    | #colResize
-    | #rowResize
-    | #nResize
-    | #eResize
-    | #sResize
-    | #wResize
-    | #neResize
-    | #nwResize
-    | #seResize
-    | #swResize
-    | #ewResize
-    | #nsResize
-    | #neswResize
-    | #nwseResize
-    | #zoomIn
-    | #zoomOut
-  ]
-
-  let auto = #auto
-  let default = #default
-  let none = #none
-  let contextMenu = #contextMenu
-  let help = #help
-  let pointer = #pointer
-  let progress = #progress
-  let wait = #wait
-  let cell = #cell
-  let crosshair = #crosshair
-  let text = #text
-  let verticalText = #verticalText
-  let alias = #alias
-  let copy = #copy
-  let move = #move
-  let noDrop = #noDrop
-  let notAllowed = #notAllowed
-  let grab = #grab
-  let grabbing = #grabbing
-  let allScroll = #allScroll
-  let colResize = #colResize
-  let rowResize = #rowResize
-  let nResize = #nResize
-  let eResize = #eResize
-  let sResize = #sResize
-  let wResize = #wResize
-  let neResize = #neResize
-  let nwResize = #nwResize
-  let seResize = #seResize
-  let swResize = #swResize
-  let ewResize = #ewResize
-  let nsResize = #nsResize
-  let neswResize = #neswResize
-  let nwseResize = #nwseResize
-  let zoomIn = #zoomIn
-  let zoomOut = #zoomOut
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    | #default => "default"
-    | #none => "none"
-    | #contextMenu => "context-menu"
-    | #help => "help"
-    | #pointer => "pointer"
-    | #progress => "progress"
-    | #wait => "wait"
-    | #cell => "cell"
-    | #crosshair => "crosshair"
-    | #text => "text"
-    | #verticalText => "vertical-text"
-    | #alias => "alias"
-    | #copy => "copy"
-    | #move => "move"
-    | #noDrop => "no-drop"
-    | #notAllowed => "not-allowed"
-    | #grab => "grab"
-    | #grabbing => "grabbing"
-    | #allScroll => "all-scroll"
-    | #colResize => "col-resize"
-    | #rowResize => "row-resize"
-    | #nResize => "n-resize"
-    | #eResize => "e-resize"
-    | #sResize => "s-resize"
-    | #wResize => "w-resize"
-    | #neResize => "ne-resize"
-    | #nwResize => "nw-resize"
-    | #seResize => "se-resize"
-    | #swResize => "sw-resize"
-    | #ewResize => "ew-resize"
-    | #nsResize => "ns-resize"
-    | #neswResize => "nesw-resize"
-    | #nwseResize => "nwse-resize"
-    | #zoomIn => "zoom-in"
-    | #zoomOut => "zoom-out"
-    }
-}
-
-module Color = {
-  type t = [
-    | #rgb(int, int, int)
-    | #rgba(int, int, int, [#num(float) | Percentage.t])
-    | #hsl(Angle.t, Percentage.t, Percentage.t)
-    | #hsla(Angle.t, Percentage.t, Percentage.t, [#num(float) | Percentage.t])
-    | #hex(string)
-    | #transparent
-    | #currentColor
-  ]
-
-  let rgb = (r, g, b) => #rgb(r, g, b)
-  let rgba = (r, g, b, a) => #rgba(r, g, b, a)
-  let hsl = (h, s, l) => #hsl(h, s, l)
-  let hsla = (h, s, l, a) => #hsla(h, s, l, a)
-  let hex = x => #hex(x)
-  let transparent = #transparent
-  let currentColor = #currentColor
-
-  let string_of_alpha = x =>
-    switch x {
-    | #num(f) => Js.Float.toString(f)
-    | #...Percentage.t as pc => Percentage.toString(pc)
-    }
-
-  let toString = x =>
-    switch x {
-    | #rgb(r, g, b) =>
-      "rgb(" ++
-      (Js.Int.toString(r) ++
-      (", " ++ (Js.Int.toString(g) ++ (", " ++ (Js.Int.toString(b) ++ ")")))))
-    | #rgba(r, g, b, a) =>
-      "rgba(" ++
-      (Js.Int.toString(r) ++
-      (", " ++
-      (Js.Int.toString(g) ++
-      (", " ++ (Js.Int.toString(b) ++ (", " ++ (string_of_alpha(a) ++ ")")))))))
-    | #hsl(h, s, l) =>
-      "hsl(" ++
-      (Angle.toString(h) ++
-      (", " ++ (Percentage.toString(s) ++ (", " ++ (Percentage.toString(l) ++ ")")))))
-    | #hsla(h, s, l, a) =>
-      "hsla(" ++
-      (Angle.toString(h) ++
-      (", " ++
-      (Percentage.toString(s) ++
-      (", " ++ (Percentage.toString(l) ++ (", " ++ (string_of_alpha(a) ++ ")")))))))
-    | #hex(s) => "#" ++ s
-    | #transparent => "transparent"
-    | #currentColor => "currentColor"
-    }
-}
-
-module BorderStyle = {
-  type t = [
-    | #none
-    | #hidden
-    | #dotted
-    | #dashed
-    | #solid
-    | #double
-    | #groove
-    | #ridge
-    | #inset
-    | #outset
-  ]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #hidden => "hidden"
-    | #dotted => "dotted"
-    | #dashed => "dashed"
-    | #solid => "solid"
-    | #double => "double"
-    | #groove => "groove"
-    | #ridge => "ridge"
-    | #inset => "inset"
-    | #outset => "outset"
-    }
-}
-
-module PointerEvents = {
-  type t = [#auto | #none]
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    | #none => "none"
-    }
-}
-
-module Perspective = {
-  type t = [#none]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    }
-}
-
-module LetterSpacing = {
-  type t = [#normal]
-
-  let normal = #normal
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    }
-}
-
-module LineHeight = {
-  type t = [#normal | #abs(float)]
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    | #abs(x) => Js.Float.toString(x)
-    }
-}
-
-module WordSpacing = {
-  type t = [#normal]
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    }
-}
-
-module DisplayOutside = {
-  type t = [#block | #inline | #runIn]
-
-  let toString = x =>
-    switch x {
-    | #block => "block"
-    | #inline => "inline"
-    | #runIn => "run-in"
-    }
-}
-
-module DisplayInside = {
-  type t = [#table | #flex | #grid]
-
-  let toString = x =>
-    switch x {
-    | #table => "table"
-    | #flex => "flex"
-    | #grid => "grid"
-    }
-}
-
-module DisplayListItem = {
-  type t = [#listItem]
-
-  let toString = x =>
-    switch x {
-    | #listItem => "list-item"
-    }
-}
-
-module DisplayInternal = {
-  type t = [
-    | #tableRowGroup
-    | #tableHeaderGroup
-    | #tableFooterGroup
-    | #tableRow
-    | #tableCell
-    | #tableColumnGroup
-    | #tableColumn
-    | #tableCaption
-  ]
-
-  let toString = x =>
-    switch x {
-    | #tableRowGroup => "table-row-group"
-    | #tableHeaderGroup => "table-header-group"
-    | #tableFooterGroup => "table-footer-group"
-    | #tableRow => "table-row"
-    | #tableCell => "table-cell"
-    | #tableColumnGroup => "table-column-group"
-    | #tableColumn => "table-column"
-    | #tableCaption => "table-caption"
-    }
-}
-
-module DisplayBox = {
-  type t = [#contents | #none]
-
-  let toString = x =>
-    switch x {
-    | #contents => "contents"
-    | #none => "none"
-    }
-}
-
-module DisplayLegacy = {
-  type t = [#inlineBlock | #inlineFlex | #inlineGrid | #inlineTable]
-
-  let toString = x =>
-    switch x {
-    | #inlineBlock => "inline-block"
-    | #inlineFlex => "inline-flex"
-    | #inlineGrid => "inline-grid"
-    | #inlineTable => "inline-table"
-    }
-}
-
-module JustifySelf = {
-  type t = [#auto | #normal | #stretch]
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    | #normal => "normal"
-    | #stretch => "stretch"
-    }
-}
-
-module PositionalAlignment = {
-  type t = [
-    | #center
-    | #start
-    | #end_
-    | #flexStart
-    | #flexEnd
-    | #selfStart
-    | #selfEnd
-    | #left
-    | #right
-  ]
-
-  let toString = x =>
-    switch x {
-    | #center => "center"
-    | #start => "start"
-    | #end_ => "end"
-    | #flexStart => "flex-start"
-    | #flexEnd => "flex-end"
-    | #selfStart => "self-start"
-    | #selfEnd => "self-end"
-    | #left => "left"
-    | #right => "right"
-    }
-}
-
-module OverflowAlignment = {
-  type t = [
-    | #safe(PositionalAlignment.t)
-    | #unsafe(PositionalAlignment.t)
-  ]
-
-  let toString = x =>
-    switch x {
-    | #safe(pa) => "safe " ++ PositionalAlignment.toString(pa)
-    | #unsafe(pa) => "unsafe " ++ PositionalAlignment.toString(pa)
-    }
-}
-
-module BaselineAlignment = {
-  type t = [#baseline | #firstBaseline | #lastBaseline]
-
-  let toString = x =>
-    switch x {
-    | #baseline => "baseline"
-    | #firstBaseline => "first baseline"
-    | #lastBaseline => "last baseline"
-    }
-}
-
-module NormalAlignment = {
-  type t = [#normal]
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    }
-}
-
-module DistributedAlignment = {
-  type t = [#spaceBetween | #spaceAround | #spaceEvenly | #stretch]
-
-  let toString = x =>
-    switch x {
-    | #spaceBetween => "space-between"
-    | #spaceAround => "space-around"
-    | #spaceEvenly => "space-evenly"
-    | #stretch => "stretch"
-    }
-}
-
-module LegacyAlignment = {
-  type t = [#legacy | #legacyRight | #legacyLeft | #legacyCenter]
-
-  let toString = x =>
-    switch x {
-    | #legacy => "legacy"
-    | #legacyRight => "legacy right"
-    | #legacyLeft => "legacy left"
-    | #legacyCenter => "legacy center"
-    }
-}
-
-module TextAlign = {
-  type t = [#left | #right | #center | #justify]
-
-  let toString = x =>
-    switch x {
-    | #left => "left"
-    | #right => "right"
-    | #center => "center"
-    | #justify => "justify"
-    }
-}
-
-module WordBreak = {
-  type t = [#normal | #breakAll | #keepAll]
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    | #breakAll => "break-all"
-    | #keepAll => "keep-all"
-    }
-}
-
-module WhiteSpace = {
-  type t = [#normal | #nowrap | #pre | #preLine | #preWrap | #breakSpaces]
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    | #nowrap => "nowrap"
-    | #pre => "pre"
-    | #preLine => "pre-line"
-    | #preWrap => "pre-wrap"
-    | #breakSpaces => "break-spaces"
-    }
-}
-
-module AlignItems = {
-  type t = [#normal | #stretch]
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    | #stretch => "stretch"
-    }
-}
-
-module AlignSelf = {
-  type t = [#auto | #normal | #stretch]
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    | #normal => "normal"
-    | #stretch => "stretch"
-    }
-}
-
-module AlignContent = {
-  type t = [#center | #start | #end_ | #flexStart | #flexEnd]
-
-  let toString = x =>
-    switch x {
-    | #center => "center"
-    | #start => "start"
-    | #end_ => "end"
-    | #flexStart => "flex-start"
-    | #flexEnd => "flex-end"
-    }
-}
-
-module ObjectFit = {
-  type t = [#fill | #contain | #cover | #none | #scaleDown]
-
-  let toString = x =>
-    switch x {
-    | #fill => "fill"
-    | #contain => "contain"
-    | #cover => "cover"
-    | #none => "none"
-    | #scaleDown => "scale-down"
-    }
-}
-
-module Clear = {
-  type t = [#none | #left | #right | #both | #inlineStart | #inlineEnd]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #left => "left"
-    | #right => "right"
-    | #both => "both"
-    | #inlineStart => "inline-start"
-    | #inlineEnd => "inline-end"
-    }
-}
-
-module Float = {
-  type t = [#left | #right | #none | #inlineStart | #inlineEnd]
-
-  let toString = x =>
-    switch x {
-    | #left => "left"
-    | #right => "right"
-    | #none => "none"
-    | #inlineStart => "inline-start"
-    | #inlineEnd => "inline-end"
-    }
-}
-
-module Visibility = {
-  type t = [#visible | #hidden | #collapse]
-
-  let toString = x =>
-    switch x {
-    | #visible => "visible"
-    | #hidden => "hidden"
-    | #collapse => "collapse"
-    }
-}
-
-module TableLayout = {
-  type t = [#auto | #fixed]
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    | #fixed => "fixed"
-    }
-}
-
-module BorderCollapse = {
-  type t = [#collapse | #separate]
-
-  let toString = x =>
-    switch x {
-    | #collapse => "collapse"
-    | #separate => "separate"
-    }
-}
-
-module FlexWrap = {
-  type t = [#nowrap | #wrap | #wrapReverse]
-
-  let toString = x =>
-    switch x {
-    | #nowrap => "nowrap"
-    | #wrap => "wrap"
-    | #wrapReverse => "wrap-reverse"
-    }
-}
-
-module FlexDirection = {
-  type t = [#row | #rowReverse | #column | #columnReverse]
-
-  let toString = x =>
-    switch x {
-    | #row => "row"
-    | #rowReverse => "row-reverse"
-    | #column => "column"
-    | #columnReverse => "column-reverse"
-    }
-}
-
-module BoxSizing = {
-  type t = [#contentBox | #borderBox]
-
-  let toString = x =>
-    switch x {
-    | #contentBox => "content-box"
-    | #borderBox => "border-box"
-    }
-}
-
-module ColumnCount = {
-  type t = [#auto | #count(int)]
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    | #count(v) => Js.Int.toString(v)
-    }
-}
-
-module UserSelect = {
-  type t = [#none | #auto | #text | #contain | #all]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #auto => "auto"
-    | #text => "text"
-    | #contain => "contain"
-    | #all => "all"
-    }
-}
-
-module TextTransform = {
-  type t = [#none | #capitalize | #uppercase | #lowercase]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #capitalize => "capitalize"
-    | #uppercase => "uppercase"
-    | #lowercase => "lowercase"
-    }
-}
-
-module GridTemplateAreas = {
-  type t = [#none | #areas(list<string>)]
-
-  let areas = x => #areas(x)
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #areas(l) =>
-      String.trim(List.fold_left((carry, elem) => carry ++ ("'" ++ (elem ++ "' ")), "", l))
-    }
-}
-
-module GridArea = {
-  type t = [
-    | #auto
-    | #ident(string)
-    | #num(int)
-    | #numIdent(int, string)
-    | #span([#num(int) | #ident(string)])
-  ]
-
-  let auto = #auto
-  let ident = x => #ident(x)
-  let num = x => #num(x)
-  let numIdent = (x, y) => #numIdent(x, y)
-  let span = x => #span(x)
-
-  let toString = t =>
-    switch t {
-    | #auto => "auto"
-    | #ident(s) => s
-    | #num(i) => string_of_int(i)
-    | #numIdent(i, s) => string_of_int(i) ++ (" " ++ s)
-    | #span(e) =>
-      "span " ++
-      switch e {
-      | #num(i) => string_of_int(i)
-      | #ident(s) => s
-      }
-    }
-}
-
-module BackdropFilter = {
-  type t = [
-    | #blur(Length.t)
-    | #brightness([#num(int) | #percent(float)])
-    | #contrast([#num(int) | #percent(float)])
-    | #dropShadow([#num(int) | #percent(float)])
-    | #grayscale([#num(int) | #percent(float)])
-    | #hueRotate([Angle.t | #zero])
-    | #invert([#num(int) | #percent(float)])
-    | #none
-    | #opacity([#num(int) | #percent(float)])
-    | #saturate([#num(int) | #percent(float)])
-    | #sepia([#num(int) | #percent(float)])
-  ]
-
-  let string_of_percent = p => Js.Float.toString(p) ++ "%"
-
-  let toString = x =>
-    switch x {
-    | #blur(#...Length.t as b) => "blur(" ++ (Length.toString(b) ++ ")")
-    | #brightness(#num(b)) => "brightness(" ++ (string_of_int(b) ++ ")")
-    | #brightness(#percent(b)) => "brightness(" ++ (string_of_percent(b) ++ ")")
-    | #contrast(#num(c)) => "contrast(" ++ (string_of_int(c) ++ ")")
-    | #contrast(#percent(c)) => "contrast(" ++ (string_of_percent(c) ++ ")")
-    | #dropShadow(#num(i)) => "drop-shadow(" ++ (string_of_int(i) ++ ")")
-    | #dropShadow(#percent(i)) => "drop-shadow(" ++ (string_of_percent(i) ++ ")")
-    | #grayscale(#num(i)) => "grayscale(" ++ (string_of_int(i) ++ ")")
-    | #grayscale(#percent(i)) => "grayscale(" ++ (string_of_percent(i) ++ ")")
-    | #hueRotate(#...Angle.t as h) => "hue-rotate(" ++ (Angle.toString(h) ++ ")")
-    | #hueRotate(#zero) => "hue-rotate(0deg)"
-    | #invert(#num(i)) => "invert(" ++ (string_of_int(i) ++ ")")
-    | #invert(#percent(i)) => "invert(" ++ (string_of_percent(i) ++ ")")
-    | #none => "none"
-    | #opacity(#num(i)) => "opacity(" ++ (string_of_int(i) ++ ")")
-    | #opacity(#percent(i)) => "opacity(" ++ (string_of_percent(i) ++ ")")
-    | #saturate(#num(i)) => "saturate(" ++ (string_of_int(i) ++ ")")
-    | #saturate(#percent(i)) => "saturate(" ++ (string_of_percent(i) ++ ")")
-    | #sepia(#num(i)) => "sepia(" ++ (string_of_int(i) ++ ")")
-    | #sepia(#percent(i)) => "sepia(" ++ (string_of_percent(i) ++ ")")
-    }
-}
-
-module BackgroundAttachment = {
-  type t = [#scroll | #fixed | #local]
-
-  let toString = x =>
-    switch x {
-    | #scroll => "scroll"
-    | #fixed => "fixed"
-    | #local => "local"
-    }
-}
-
-module BackgroundClip = {
-  type t = [#borderBox | #paddingBox | #contentBox]
-
-  let toString = x =>
-    switch x {
-    | #borderBox => "border-box"
-    | #contentBox => "content-box"
-    | #paddingBox => "padding-box"
-    }
-}
-
-module BackgroundOrigin = {
-  type t = [#borderBox | #paddingBox | #contentBox]
-
-  let toString = x =>
-    switch x {
-    | #borderBox => "border-box"
-    | #contentBox => "content-box"
-    | #paddingBox => "padding-box"
-    }
-}
-
-module BackgroundPosition = {
-  module X = {
-    type t = [#left | #right | #center]
-
-    let toString = x =>
-      switch x {
-      | #left => "left"
-      | #right => "right"
-      | #center => "center"
-      }
-  }
-
-  module Y = {
-    type t = [#top | #bottom | #center]
-
-    let toString = x =>
-      switch x {
-      | #top => "top"
-      | #bottom => "bottom"
-      | #center => "center"
-      }
-  }
-
-  type t = [X.t | Y.t]
-
-  let toString = x =>
-    switch x {
-    | #left => "left"
-    | #right => "right"
-    | #top => "top"
-    | #bottom => "bottom"
-    | #center => "center"
-    }
-}
-
-module BackgroundRepeat = {
-  type twoValue = [#repeat | #space | #round | #noRepeat]
-  type t = [#repeatX | #repeatY | twoValue]
-  type horizontal = twoValue
-  type vertical = twoValue
-
-  let toString = x =>
-    switch x {
-    | #repeatX => "repeat-x"
-    | #repeatY => "repeat-y"
-    | #repeat => "repeat"
-    | #space => "space"
-    | #round => "round"
-    | #noRepeat => "no-repeat"
-    }
-}
-
-module TextOverflow = {
-  type t = [#clip | #ellipsis | #string(string)]
-
-  let toString = x =>
-    switch x {
-    | #clip => "clip"
-    | #ellipsis => "ellipsis"
-    | #string(s) => s
-    }
-}
-
-module TextDecorationLine = {
-  type t = [#none | #underline | #overline | #lineThrough | #blink]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #underline => "underline"
-    | #overline => "overline"
-    | #lineThrough => "line-through"
-    | #blink => "blink"
-    }
-}
-
-module TextDecorationStyle = {
-  type t = [#solid | #double | #dotted | #dashed | #wavy]
-
-  let toString = x =>
-    switch x {
-    | #solid => "solid"
-    | #double => "double"
-    | #dotted => "dotted"
-    | #dashed => "dashed"
-    | #wavy => "wavy"
-    }
-}
-
-module Width = {
-  type t = [#auto | #fitContent]
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    | #fitContent => "fit-content"
-    }
-}
-
-module MaxWidth = {
-  type t = [#none]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    }
-}
-
-module Height = {
-  type t = [#auto]
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    }
-}
-
-module MaxHeight = {
-  type t = [#none]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    }
-}
-
-module OverflowWrap = {
-  type t = [#normal | #breakWord | #anywhere]
-
-  let toString = x =>
-    switch x {
-    | #normal => "normal"
-    | #breakWord => "break-word"
-    | #anywhere => "anywhere"
-    }
-}
-
-module Gradient = {
-  type t<'colorOrVar> = [
-    | #linearGradient(Angle.t, list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)>)
-    | #repeatingLinearGradient(Angle.t, list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)>)
-    | #radialGradient(list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)>)
-    | #repeatingRadialGradient(list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)>)
-  ]
-
-  let linearGradient = (angle, stops) => #linearGradient(angle, stops)
-  let repeatingLinearGradient = (angle, stops) => #repeatingLinearGradient(angle, stops)
-  let radialGradient = stops => #radialGradient(stops)
-  let repeatingRadialGradient = stops => #repeatingRadialGradient(stops)
-
-  let string_of_color = x =>
-    switch x {
-    | #...Color.t as co => Color.toString(co)
-    | #...Var.t as va => Var.toString(va)
-    }
-  let string_of_stops = stops =>
-    stops->Belt.List.map(((l, c)) => string_of_color(c) ++ (" " ++ Length.toString(l)))->join(", ")
-
-  let toString = x =>
-    switch x {
-    | #linearGradient(angle, stops) =>
-      "linear-gradient(" ++ (Angle.toString(angle) ++ (", " ++ (string_of_stops(stops) ++ ")")))
-    | #repeatingLinearGradient(angle, stops) =>
-      "repeating-linear-gradient(" ++
-      (Angle.toString(angle) ++
-      (", " ++ (string_of_stops(stops) ++ ")")))
-    | #radialGradient(stops) => "radial-gradient(" ++ (string_of_stops(stops) ++ ")")
-    | #repeatingRadialGradient(stops) =>
-      "repeating-radial-gradient(" ++ (string_of_stops(stops) ++ ")")
-    }
-}
-
-module BackgroundImage = {
-  type t = [#none]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    }
-}
-
-module GeometyBox = {
-  type t = [
-    | #marginBox
-    | #borderBox
-    | #paddingBox
-    | #contentBox
-    | #fillBox
-    | #strokeBox
-    | #viewBox
-  ]
-
-  let marginBox = #marginBox
-  let borderBox = #borderBox
-  let paddingBox = #paddingBox
-  let contentBox = #contentBox
-  let fillBox = #fillBox
-  let strokeBox = #strokeBox
-  let viewBox = #viewBox
-
-  let toString = x =>
-    switch x {
-    | #marginBox => "margin-box"
-    | #borderBox => "border-box"
-    | #paddingBox => "padding-box"
-    | #contentBox => "content-box"
-    | #fillBox => "fill-box"
-    | #strokeBox => "stroke-box"
-    | #viewBox => "view-box"
-    }
-}
-
-module ClipPath = {
-  type t = [#none]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    }
-}
-
-module BackfaceVisibility = {
-  type t = [#visible | #hidden]
-
-  let toString = x =>
-    switch x {
-    | #visible => "visible"
-    | #hidden => "hidden"
-    }
-}
-
-module Flex = {
-  type t = [#auto | #initial | #none]
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    | #initial => "initial"
-    | #none => "none"
-    }
-}
-
-module TransformStyle = {
-  type t = [#preserve3d | #flat]
-
-  let toString = x =>
-    switch x {
-    | #preserve3d => "preserve-3d"
-    | #flat => "flat"
-    }
-}
-
-module ListStyleImage = {
-  type t = [#none]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    }
-}
-
-module FontFamilyName = {
-  type t = [
-    | #custom(string)
-    | #serif
-    | #sansSerif
-    | #cursive
-    | #fantasy
-    | #monospace
-    | #systemUi
-    | #emoji
-    | #math
-    | #fangsong
-  ]
-
-  let custom = #custom
-  let serif = #serif
-  let sansSerif = #sansSerif
-  let cursive = #cursive
-  let fantasy = #fantasy
-  let monospace = #monospace
-  let systemUi = #systemUi
-  let emoji = #emoji
-  let math = #math
-  let fangsong = #fangsong
-
-  let toString = x =>
-    switch x {
-    | #custom(name) => name
-    | #serif => "serif"
-    | #sansSerif => "sans-serif"
-    | #cursive => "cursive"
-    | #fantasy => "fantasy"
-    | #monospace => "monospace"
-    | #systemUi => "system-ui"
-    | #emoji => "emoji"
-    | #math => "math"
-    | #fangsong => "fangsong"
-    }
-}
-
-module FontDisplay = {
-  type t = [#auto | #block | #swap | #fallback | #optional]
-
-  let auto = #auto
-  let block = #block
-  let swap = #swap
-  let fallback = #fallback
-  let optional = #optional
-
-  let toString = x =>
-    switch x {
-    | #auto => "auto"
-    | #block => "block"
-    | #swap => "swap"
-    | #fallback => "fallback"
-    | #optional => "optional"
-    }
-}
-
-module CounterStyleType = {
-  type t = [ListStyleType.t]
-
-  let toString = x =>
-    switch x {
-    | #...ListStyleType.t as c => ListStyleType.toString(c)
-    }
-}
-
-module Counter = {
-  type style = [CounterStyleType.t | #unset]
-  type t = [#counter(string, style)]
-
-  let counter = (~style=#unset, name) => #counter(name, style)
-
-  let toString = x =>
-    switch x {
-    | #counter(counter, style) =>
-      switch style {
-      | #unset => "counter(" ++ (counter ++ ")")
-      | #...CounterStyleType.t as t =>
-        "counter(" ++ (counter ++ ("," ++ (CounterStyleType.toString(t) ++ ")")))
-      }
-    }
-}
-
-module Counters = {
-  type style = [CounterStyleType.t | #unset]
-  type t = [#counters(string, string, style)]
-
-  let counters = (~style=#unset, ~separator="", name) => #counters(name, separator, style)
-
-  let toString = x =>
-    switch x {
-    | #counters(name, separator, style) =>
-      switch style {
-      | #unset => "counters(" ++ (name ++ (",\"" ++ (separator ++ "\")")))
-      | #...CounterStyleType.t as s =>
-        "counters(" ++
-        (name ++
-        (",\"" ++ (separator ++ ("\"," ++ (CounterStyleType.toString(s) ++ ")")))))
-      }
-    }
-}
-
-module CounterIncrement = {
-  type t = [#none | #increment(string, int)]
-
-  let increment = (~value=1, name) => #increment(name, value)
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #increment(name, value) => name ++ (" " ++ string_of_int(value))
-    }
-}
-
-module CounterReset = {
-  type t = [#none | #reset(string, int)]
-
-  let reset = (~value=0, name) => #reset(name, value)
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #reset(name, value) => name ++ (" " ++ string_of_int(value))
-    }
-}
-
-module CounterSet = {
-  type t = [#none | #set(string, int)]
-
-  let set = (~value=0, name) => #set(name, value)
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #set(name, value) => name ++ (" " ++ string_of_int(value))
-    }
-}
-
-module Content = {
-  type t = [
-    | #none
-    | #normal
-    | #openQuote
-    | #closeQuote
-    | #noOpenQuote
-    | #noCloseQuote
-    | #attr(string)
-    | #text(string)
-  ]
-
-  let toString = x =>
-    switch x {
-    | #none => "none"
-    | #normal => "normal"
-    | #openQuote => "open-quote"
-    | #closeQuote => "close-quote"
-    | #noOpenQuote => "no-open-quote"
-    | #noCloseQuote => "no-close-quote"
-    | #attr(name) => "attr(" ++ (name ++ ")")
-    | #text(string) => j`"$string"`
-    }
-}
-
-module SVG = {
-  module Fill = {
-    type t = [#none | #contextFill | #contextStroke]
-
-    let contextFill = #contextFill
-    let contextStroke = #contextStroke
-
-    let toString = x =>
-      switch x {
-      | #none => "none"
-      | #contextFill => "context-fill"
-      | #contextStroke => "context-stroke"
-      }
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Css_AtomicTypes.resi b/jscomp/syntax/tests/idempotency/bs-css/Css_AtomicTypes.resi
deleted file mode 100644
index 549b7dd..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Css_AtomicTypes.resi
+++ /dev/null
@@ -1,1342 +0,0 @@
-// Docs copied from MDN
-
-module Cascading: {
-  type t = [#initial | #inherit_ | #unset]
-
-  let initial: [> t]
-  let inherit_: [> t]
-  let unset: [> t]
-
-  let toString: t => string
-}
-
-module Var: {
-  type t = [#var(string) | #varDefault(string, string)]
-
-  let var: string => [> t]
-  let varDefault: (string, string) => [> t]
-
-  let toString: t => string
-}
-
-module Time: {
-  @ocaml.doc("
-   The <time> CSS data type represents a time value expressed in seconds or milliseconds.
-   It is used in animation, transition, and related properties.
-   ")
-  type t = [#s(float) | #ms(float)]
-
-  let s: float => [> #s(float)]
-  let ms: float => [> #ms(float)]
-
-  let toString: t => string
-}
-
-module Percentage: {
-  @ocaml.doc("
-   The <percentage> CSS data type represents a percentage value.
-   It is often used to define a size as relative to an element's parent object.
-   ")
-  type t = [#percent(float)]
-
-  let pct: float => [> t]
-
-  let toString: t => string
-}
-
-module Url: {
-  @ocaml.doc("
-   The <url> CSS data type denotes a pointer to a resource, such as an image or a font.
-   URLs can be used in numerous CSS properties, such as background-image, cursor, and list-style.
-   ")
-  type t = [#url(string)]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/length
- ")
-module Length: {
-  // calc/percent are incorrect
-
-  @ocaml.doc(" The <length> CSS data type represents a distance value. ")
-  type rec t = [
-    | #ch(float)
-    | #em(float)
-    | #ex(float)
-    | #rem(float)
-    | #vh(float)
-    | #vw(float)
-    | #vmin(float)
-    | #vmax(float)
-    | #px(int)
-    | #pxFloat(float)
-    | #cm(float)
-    | #mm(float)
-    | #inch(float)
-    | #pc(float)
-    | #pt(int)
-    | #zero
-    | #calc([#add | #sub], t, t)
-    | #percent(float)
-  ]
-
-  @ocaml.doc(
-    " Represents the width, or more precisely the advance measure, of the glyph \"0\" (zero, the Unicode character U+0030) in the element's font. "
-  )
-  let ch: float => [> #ch(float)]
-  @ocaml.doc(
-    " Represents the calculated font-size of the element. If used on the font-size property itself, it represents the inherited font-size of the element. "
-  )
-  let em: float => [> #em(float)]
-  @ocaml.doc(
-    " Represents the x-height of the element's font. On fonts with the \"x\" letter, this is generally the height of lowercase letters in the font; 1ex ≈ 0.5em in many fonts. "
-  )
-  let ex: float => [> #ex(float)]
-  @ocaml.doc(
-    " Represents the font-size of the root element (typically <html>). When used within the root element font-size, it represents its initial value (a common browser default is 16px, but user-defined preferences may modify this) "
-  )
-  let rem: float => [> #rem(float)]
-  @ocaml.doc(" Equal to 1% of the height of the viewport's initial containing block ")
-  let vh: float => [> #vh(float)]
-  @ocaml.doc(" Equal to 1% of the width of the viewport's initial containing block ")
-  let vw: float => [> #vw(float)]
-  @ocaml.doc(" Equal to the smaller of vw and vh ")
-  let vmin: float => [> #vmin(float)]
-  @ocaml.doc(" Equal to the larger of vw and vh ")
-  let vmax: float => [> #vmax(float)]
-  @ocaml.doc(
-    " One pixel. For screen displays, it traditionally represents one device pixel (dot). However, for printers and high-resolution screens, one CSS pixel implies multiple device pixels. 1px = 1/96th of 1in "
-  )
-  let px: int => [> #px(int)]
-  let pxFloat: float => [> #pxFloat(float)]
-  @ocaml.doc(" One centimeter. 1cm = 96px/2.54 ")
-  let cm: float => [> #cm(float)]
-  @ocaml.doc(" One millimeter. 1mm = 1/10th of 1cm ")
-  let mm: float => [> #mm(float)]
-  @ocaml.doc(" One inch. 1in = 2.54cm = 96px ")
-  let inch: float => [> #inch(float)]
-  @ocaml.doc(" One pica. 1pc = 12pt = 1/6th of 1in ")
-  let pc: float => [> #pc(float)]
-  @ocaml.doc(" One point. 1pt = 1/72nd of 1in ")
-  let pt: int => [> #pt(int)]
-  @ocaml.doc(" The value 0 ")
-  let zero: [> #zero]
-
-  let toString: t => string
-}
-
-module Angle: {
-  @ocaml.doc("
-   The angle CSS data type represents an angle value expressed in degrees, gradians, radians, or turns.
-   It is used, for example, in <gradient>s and in some transform functions.
-   ")
-  type t = [#deg(float) | #rad(float) | #grad(float) | #turn(float)]
-
-  let deg: float => t
-  let rad: float => t
-  let grad: float => t
-  let turn: float => t
-
-  let toString: t => string
-}
-
-module Direction: {
-  type t = [#ltr | #rtl]
-
-  @ocaml.doc(" Text and other elements go from left to right. This is the default value. ")
-  let ltr: [> t]
-  @ocaml.doc(" Text and other elements go from right to left. ")
-  let rtl: [> t]
-
-  let toString: t => string
-}
-
-module Position: {
-  type t = [#absolute | #relative | #static | #fixed | #sticky]
-
-  let absolute: [> t]
-  let relative: [> t]
-  let static: [> t]
-  let fixed: [> t]
-  let sticky: [> t]
-
-  let toString: t => string
-}
-
-module Resize: {
-  type t = [#none | #both | #horizontal | #vertical | #block | #inline]
-
-  @ocaml.doc(" The element offers no user-controllable method for resizing it ")
-  let none: [> t]
-  @ocaml.doc(
-    " The element displays a mechanism for allowing the user to resize it, which may be resized both horizontally and vertically "
-  )
-  let both: [> t]
-  @ocaml.doc(
-    " The element displays a mechanism for allowing the user to resize it in the horizontal direction "
-  )
-  let horizontal: [> t]
-  @ocaml.doc(
-    " The element displays a mechanism for allowing the user to resize it in the vertical direction "
-  )
-  let vertical: [> t]
-  @ocaml.doc(
-    " The element displays a mechanism for allowing the user to resize it in the block direction (either horizontally or vertically, depending on the writing-mode and direction value) "
-  )
-  let block: [> t]
-  @ocaml.doc(
-    " The element displays a mechanism for allowing the user to resize it in the inline direction (either horizontally or vertically, depending on the writing-mode and direction value) "
-  )
-  let inline: [> t]
-
-  let toString: t => string
-}
-
-module FontVariant: {
-  type t = [#normal | #smallCaps]
-
-  let normal: [> t]
-  let smallCaps: [> t]
-
-  let toString: t => string
-}
-
-module FontStyle: {
-  type t = [#normal | #italic | #oblique]
-
-  let normal: [> t]
-  let italic: [> t]
-  let oblique: [> t]
-
-  let toString: t => string
-}
-
-module FlexBasis: {
-  type t = [
-    | #auto
-    | #fill
-    | #content
-    | #maxContent
-    | #minContent
-    | #fitContent
-  ]
-
-  let fill: [> t]
-  let content: [> t]
-  let maxContent: [> t]
-  let minContent: [> t]
-  let fitContent: [> t]
-
-  let toString: t => string
-}
-
-module Overflow: {
-  type t = [#hidden | #visible | #scroll | #auto]
-
-  let hidden: [> t]
-  let visible: [> t]
-  let scroll: [> t]
-  let auto: [> t]
-
-  let toString: t => string
-}
-
-module Margin: {
-  type t = [#auto]
-
-  let auto: [> t]
-
-  let toString: t => string
-}
-
-module GridAutoFlow: {
-  type t = [#column | #row | #columnDense | #rowDense]
-
-  let toString: t => string
-}
-
-module ColumnGap: {
-  type t = [#normal]
-
-  let toString: t => string
-}
-
-module VerticalAlign: {
-  type t = [
-    | #baseline
-    | #sub
-    | #super
-    | #top
-    | #textTop
-    | #middle
-    | #bottom
-    | #textBottom
-  ]
-
-  let toString: t => string
-}
-
-module TimingFunction: {
-  type t = [
-    | #linear
-    | #ease
-    | #easeIn
-    | #easeOut
-    | #easeInOut
-    | #stepStart
-    | #stepEnd
-    | #steps(int, [#start | #end_])
-    | #cubicBezier(float, float, float, float)
-  ]
-
-  let linear: [> t]
-  let ease: [> t]
-  let easeIn: [> t]
-  let easeOut: [> t]
-  let easeInOut: [> t]
-  let stepStart: [> t]
-  let stepEnd: [> t]
-  let steps: (int, [#start | #end_]) => [> t]
-  let cubicBezier: (float, float, float, float) => [> t]
-
-  let toString: t => string
-}
-
-module RepeatValue: {
-  type t = [#autoFill | #autoFit | #num(int)]
-
-  let toString: t => string
-}
-
-module ListStyleType: {
-  type t = [
-    | #disc
-    | #circle
-    | #square
-    | #decimal
-    | #lowerAlpha
-    | #upperAlpha
-    | #lowerGreek
-    | #lowerLatin
-    | #upperLatin
-    | #lowerRoman
-    | #upperRoman
-    | #none
-  ]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/list-style-position
- ")
-module ListStylePosition: {
-  type t = [#inside | #outside]
-
-  let toString: t => string
-}
-
-module OutlineStyle: {
-  type t = [
-    | #none
-    | #hidden
-    | #dotted
-    | #dashed
-    | #solid
-    | #double
-    | #groove
-    | #ridge
-    | #inset
-    | #outset
-  ]
-
-  let toString: t => string
-}
-
-module FontWeight: {
-  /* see https://developer.mozilla.org/docs/Web/CSS/font-weight#Common_weight_name_mapping */
-  type t = [
-    | #num(int)
-    | #thin
-    | #extraLight
-    | #light
-    | #normal
-    | #medium
-    | #semiBold
-    | #bold
-    | #extraBold
-    | #black
-    | #lighter
-    | #bolder
-  ]
-
-  let thin: [> t]
-  let extraLight: [> t]
-  let light: [> t]
-  let medium: [> t]
-  let semiBold: [> t]
-  let bold: [> t]
-  let extraBold: [> t]
-  let lighter: [> t]
-  let bolder: [> t]
-
-  let toString: t => string
-}
-
-module Transform: {
-  type t = [
-    | #translate(Length.t, Length.t)
-    | #translate3d(Length.t, Length.t, Length.t)
-    | #translateX(Length.t)
-    | #translateY(Length.t)
-    | #translateZ(Length.t)
-    | #scale(float, float)
-    | #scale3d(float, float, float)
-    | #scaleX(float)
-    | #scaleY(float)
-    | #scaleZ(float)
-    | #rotate(Angle.t)
-    | #rotate3d(float, float, float, Angle.t)
-    | #rotateX(Angle.t)
-    | #rotateY(Angle.t)
-    | #rotateZ(Angle.t)
-    | #skew(Angle.t, Angle.t)
-    | #skewX(Angle.t)
-    | #skewY(Angle.t)
-    | #perspective(int)
-  ]
-
-  let translate: (Length.t, Length.t) => [> #translate(Length.t, Length.t)]
-  let translate3d: (Length.t, Length.t, Length.t) => [> #translate3d(Length.t, Length.t, Length.t)]
-  let translateX: Length.t => [> t]
-  let translateY: Length.t => [> t]
-  let translateZ: Length.t => [> t]
-  let scale: (float, float) => [> t]
-  let scale3d: (float, float, float) => [> t]
-  let scaleX: float => [> t]
-  let scaleY: float => [> t]
-  let scaleZ: float => [> t]
-  let rotate: Angle.t => [> t]
-  let rotate3d: (float, float, float, Angle.t) => [> t]
-  let rotateX: Angle.t => [> t]
-  let rotateY: Angle.t => [> t]
-  let rotateZ: Angle.t => [> t]
-  let skew: (Angle.t, Angle.t) => [> t]
-  let skewX: Angle.t => [> t]
-  let skewY: Angle.t => [> t]
-
-  let toString: t => string
-}
-
-module AnimationDirection: {
-  type t = [#normal | #reverse | #alternate | #alternateReverse]
-
-  let toString: t => string
-}
-
-module AnimationFillMode: {
-  type t = [#none | #forwards | #backwards | #both]
-
-  let toString: t => string
-}
-
-module AnimationIterationCount: {
-  type t = [#infinite | #count(int)]
-
-  let toString: t => string
-}
-
-module AnimationPlayState: {
-  type t = [#paused | #running]
-
-  let toString: t => string
-}
-
-module Cursor: {
-  type t = [
-    | #auto
-    | #default
-    | #none
-    | #contextMenu
-    | #help
-    | #pointer
-    | #progress
-    | #wait
-    | #cell
-    | #crosshair
-    | #text
-    | #verticalText
-    | #alias
-    | #copy
-    | #move
-    | #noDrop
-    | #notAllowed
-    | #grab
-    | #grabbing
-    | #allScroll
-    | #colResize
-    | #rowResize
-    | #nResize
-    | #eResize
-    | #sResize
-    | #wResize
-    | #neResize
-    | #nwResize
-    | #seResize
-    | #swResize
-    | #ewResize
-    | #nsResize
-    | #neswResize
-    | #nwseResize
-    | #zoomIn
-    | #zoomOut
-  ]
-
-  let auto: [> t]
-  let default: [> t]
-  let none: [> t]
-  let contextMenu: [> t]
-  let help: [> t]
-  let pointer: [> t]
-  let progress: [> t]
-  let wait: [> t]
-  let cell: [> t]
-  let crosshair: [> t]
-  let text: [> t]
-  let verticalText: [> t]
-  let alias: [> t]
-  let copy: [> t]
-  let move: [> t]
-  let noDrop: [> t]
-  let notAllowed: [> t]
-  let grab: [> t]
-  let grabbing: [> t]
-  let allScroll: [> t]
-  let colResize: [> t]
-  let rowResize: [> t]
-  let nResize: [> t]
-  let eResize: [> t]
-  let sResize: [> t]
-  let wResize: [> t]
-  let neResize: [> t]
-  let nwResize: [> t]
-  let seResize: [> t]
-  let swResize: [> t]
-  let ewResize: [> t]
-  let nsResize: [> t]
-  let neswResize: [> t]
-  let nwseResize: [> t]
-  let zoomIn: [> t]
-  let zoomOut: [> t]
-
-  let toString: t => string
-}
-
-module Color: {
-  type t = [
-    | #rgb(int, int, int)
-    | #rgba(int, int, int, [#num(float) | Percentage.t])
-    | #hsl(Angle.t, Percentage.t, Percentage.t)
-    | #hsla(Angle.t, Percentage.t, Percentage.t, [#num(float) | Percentage.t])
-    | #hex(string)
-    | #transparent
-    | #currentColor
-  ]
-
-  let rgb: (int, int, int) => [> t]
-  let rgba: (int, int, int, [#num(float) | Percentage.t]) => [> t]
-  let hsl: (Angle.t, Percentage.t, Percentage.t) => [> t]
-  let hsla: (Angle.t, Percentage.t, Percentage.t, [#num(float) | Percentage.t]) => [> t]
-  let hex: string => [> t]
-  let transparent: [> t]
-  let currentColor: [> t]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/border-style
- ")
-module BorderStyle: {
-  type t = [
-    | #none
-    | #hidden
-    | #dotted
-    | #dashed
-    | #solid
-    | #double
-    | #groove
-    | #ridge
-    | #inset
-    | #outset
-  ]
-
-  let toString: t => string
-}
-
-module PointerEvents: {
-  type t = [#auto | #none]
-
-  let toString: t => string
-}
-
-module Perspective: {
-  type t = [#none]
-
-  let toString: t => string
-}
-
-module LetterSpacing: {
-  type t = [#normal]
-
-  @ocaml.doc("
-   The normal letter spacing for the current font.
-   Unlike a value of 0, this keyword allows the user agent to alter the space between characters in order to justify text.
-   ")
-  let normal: [> t]
-
-  let toString: t => string
-}
-
-module LineHeight: {
-  type t = [#normal | #abs(float)]
-
-  let toString: t => string
-}
-
-module WordSpacing: {
-  type t = [#normal]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/display
- ")
-module DisplayOutside: {
-  type t = [#block | #inline | #runIn]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/display
- ")
-module DisplayInside: {
-  type t = [#table | #flex | #grid]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/display
- ")
-module DisplayListItem: {
-  type t = [#listItem]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/display
- ")
-module DisplayInternal: {
-  type t = [
-    | #tableRowGroup
-    | #tableHeaderGroup
-    | #tableFooterGroup
-    | #tableRow
-    | #tableCell
-    | #tableColumnGroup
-    | #tableColumn
-    | #tableCaption
-  ]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/display-box
- ")
-module DisplayBox: {
-  type t = [#contents | #none]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/display
- ")
-module DisplayLegacy: {
-  type t = [#inlineBlock | #inlineFlex | #inlineGrid | #inlineTable]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/justify-self
- ")
-module JustifySelf: {
-  type t = [#auto | #normal | #stretch]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/justify-self
- https://developer.mozilla.org/docs/Web/CSS/justify-content
- ")
-module PositionalAlignment: {
-  type t = [
-    | #center
-    | #start
-    | #end_
-    | #flexStart
-    | #flexEnd
-    | #selfStart
-    | #selfEnd
-    | #left
-    | #right
-  ]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Box_Alignment#Overflow_alignment
- ")
-module OverflowAlignment: {
-  type t = [
-    | #safe(PositionalAlignment.t)
-    | #unsafe(PositionalAlignment.t)
-  ]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Box_Alignment#Baseline_alignment
- ")
-module BaselineAlignment: {
-  type t = [#baseline | #firstBaseline | #lastBaseline]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/justify-content
- ")
-module NormalAlignment: {
-  type t = [#normal]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/justify-content
- ")
-module DistributedAlignment: {
-  type t = [#spaceBetween | #spaceAround | #spaceEvenly | #stretch]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://drafts.csswg.org/css-align-3/#propdef-justify-items
- ")
-module LegacyAlignment: {
-  type t = [#legacy | #legacyRight | #legacyLeft | #legacyCenter]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/text-align
- ")
-module TextAlign: {
-  type t = [#left | #right | #center | #justify]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/word-break
- ")
-module WordBreak: {
-  type t = [#normal | #breakAll | #keepAll]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/white-space
- ")
-module WhiteSpace: {
-  type t = [#normal | #nowrap | #pre | #preLine | #preWrap | #breakSpaces]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/align-items
- ")
-module AlignItems: {
-  type t = [#normal | #stretch]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/align-self
- ")
-module AlignSelf: {
-  type t = [#auto | #normal | #stretch]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/align-content
- ")
-module AlignContent: {
-  type t = [#center | #start | #end_ | #flexStart | #flexEnd]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/object-fit
- ")
-module ObjectFit: {
-  type t = [#fill | #contain | #cover | #none | #scaleDown]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/clear
- ")
-module Clear: {
-  type t = [#none | #left | #right | #both | #inlineStart | #inlineEnd]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/float
- ")
-module Float: {
-  type t = [#left | #right | #none | #inlineStart | #inlineEnd]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/visibility
- ")
-module Visibility: {
-  type t = [#visible | #hidden | #collapse]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/table-layout
- ")
-module TableLayout: {
-  type t = [#auto | #fixed]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/border-collapse
- ")
-module BorderCollapse: {
-  type t = [#collapse | #separate]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/flex-wrap
- ")
-module FlexWrap: {
-  type t = [#nowrap | #wrap | #wrapReverse]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/flex-direction
- ")
-module FlexDirection: {
-  type t = [#row | #rowReverse | #column | #columnReverse]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/box-sizing
- ")
-module BoxSizing: {
-  type t = [#contentBox | #borderBox]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/box-sizing
- ")
-module ColumnCount: {
-  type t = [#auto | #count(int)]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/user-select
- ")
-module UserSelect: {
-  type t = [#none | #auto | #text | #contain | #all]
-
-  let toString: t => string
-}
-
-module TextTransform: {
-  type t = [#none | #capitalize | #uppercase | #lowercase]
-
-  let toString: t => string
-}
-
-module GridTemplateAreas: {
-  type t = [#none | #areas(list<string>)]
-
-  let areas: list<string> => [> t]
-
-  let toString: t => string
-}
-
-module GridArea: {
-  type t = [
-    | #auto
-    | #ident(string)
-    | #num(int)
-    | #numIdent(int, string)
-    | #span([#num(int) | #ident(string)])
-  ]
-
-  let auto: [> t]
-  let ident: string => [> t]
-  let num: int => [> t]
-  let numIdent: (int, string) => [> t]
-  let span: [#num(int) | #ident(string)] => [> t]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
-  https://developer.mozilla.org/en-US/docs/Web/CSS/backdrop-filter
-  ")
-module BackdropFilter: {
-  type t = [
-    | #blur(Length.t)
-    | #brightness([#num(int) | #percent(float)])
-    | #contrast([#num(int) | #percent(float)])
-    | #dropShadow([#num(int) | #percent(float)])
-    | #grayscale([#num(int) | #percent(float)])
-    | #hueRotate([Angle.t | #zero])
-    | #invert([#num(int) | #percent(float)])
-    | #none
-    | #opacity([#num(int) | #percent(float)])
-    | #saturate([#num(int) | #percent(float)])
-    | #sepia([#num(int) | #percent(float)])
-  ]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/background-attachment
- ")
-module BackgroundAttachment: {
-  type t = [#scroll | #fixed | #local]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/background-clip
- ")
-module BackgroundClip: {
-  type t = [#borderBox | #paddingBox | #contentBox]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/background-origin
- ")
-module BackgroundOrigin: {
-  type t = [#borderBox | #paddingBox | #contentBox]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/background-position
- ")
-module BackgroundPosition: {
-  module X: {
-    type t = [#left | #right | #center]
-
-    let toString: t => string
-  }
-
-  module Y: {
-    type t = [#top | #bottom | #center]
-
-    let toString: t => string
-  }
-
-  type t = [X.t | Y.t]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/background-origin
- ")
-module BackgroundRepeat: {
-  type twoValue = [#repeat | #space | #round | #noRepeat]
-  type t = [#repeatX | #repeatY | twoValue]
-  type horizontal = twoValue
-  type vertical = twoValue
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/text-overflow
- ")
-module TextOverflow: {
-  type t = [#clip | #ellipsis | #string(string)]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/text-decoration-line
- ")
-module TextDecorationLine: {
-  type t = [#none | #underline | #overline | #lineThrough | #blink]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/text-decoration-style
- ")
-module TextDecorationStyle: {
-  type t = [#solid | #double | #dotted | #dashed | #wavy]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/width
- ")
-module Width: {
-  type t = [#auto | #fitContent]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/max-width
- ")
-module MaxWidth: {
-  type t = [#none]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/height
- ")
-module Height: {
-  type t = [#auto]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/max-height
- ")
-module MaxHeight: {
-  type t = [#none]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/overflow-wrap
- ")
-module OverflowWrap: {
-  type t = [#normal | #breakWord | #anywhere]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/gradient
- ")
-module Gradient: {
-  type t<'colorOrVar> = [
-    | #linearGradient(Angle.t, list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)>)
-    | #repeatingLinearGradient(Angle.t, list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)>)
-    | #radialGradient(list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)>)
-    | #repeatingRadialGradient(list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)>)
-  ]
-
-  @ocaml.doc(" Linear gradients transition colors progressively along an imaginary line. ")
-  let linearGradient: (
-    Angle.t,
-    list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)>,
-  ) => [> t<'colorOrVar>]
-  @ocaml.doc(" Radial gradients transition colors progressively from a center point (origin). ")
-  let radialGradient: list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)> => [> t<'colorOrVar>]
-
-  @ocaml.doc(
-    " Repeating gradients duplicate a gradient as much as necessary to fill a given area (linearGradient function). "
-  )
-  let repeatingLinearGradient: (
-    Angle.t,
-    list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)>,
-  ) => [> t<'colorOrVar>]
-  @ocaml.doc(
-    " Repeating gradients duplicate a gradient as much as necessary to fill a given area (radialGradient function). "
-  )
-  let repeatingRadialGradient: list<(Length.t, [< Color.t | Var.t] as 'colorOrVar)> => [>
-    | t<'colorOrVar>
-  ]
-
-  let toString: t<[< Color.t | Var.t]> => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/background-image
- ")
-module BackgroundImage: {
-  type t = [#none]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/clip-path
- ")
-module GeometyBox: {
-  type t = [
-    | #marginBox
-    | #borderBox
-    | #paddingBox
-    | #contentBox
-    | #fillBox
-    | #strokeBox
-    | #viewBox
-  ]
-
-  @ocaml.doc(" Uses the margin box as the reference box. ")
-  let marginBox: [> t]
-  @ocaml.doc(" Uses the border box as the reference box. ")
-  let borderBox: [> t]
-  @ocaml.doc(" Uses the padding box as the reference box. ")
-  let paddingBox: [> t]
-  @ocaml.doc(" Uses the content box as the reference box. ")
-  let contentBox: [> t]
-  @ocaml.doc(" Uses the object bounding box as the reference box. ")
-  let fillBox: [> t]
-  @ocaml.doc(" Uses the stroke bounding box as the reference box. ")
-  let strokeBox: [> t]
-  @ocaml.doc("
-   Uses the nearest SVG viewport as the reference box.
-   If a viewBox attribute is specified for the element creating the SVG viewport,
-   the reference box is positioned at the origin of the coordinate system established by the viewBox attribute and
-   the dimension of the size of the reference box is set to the width and height values of the viewBox attribute.
-   ")
-  let viewBox: [> t]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/clip-path
- ")
-module ClipPath: {
-  type t = [#none]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/backface-visibility
- ")
-module BackfaceVisibility: {
-  type t = [#visible | #hidden]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/flex
- ")
-module Flex: {
-  type t = [#auto | #initial | #none]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/transform-style
- ")
-module TransformStyle: {
-  type t = [#preserve3d | #flat]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/list-style-image
- ")
-module ListStyleImage: {
-  type t = [#none]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- https://developer.mozilla.org/docs/Web/CSS/font-family
- ")
-module FontFamilyName: {
-  type t = [
-    | #custom(string)
-    | #serif
-    | #sansSerif
-    | #cursive
-    | #fantasy
-    | #monospace
-    | #systemUi
-    | #emoji
-    | #math
-    | #fangsong
-  ]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- * https://developer.mozilla.org/fr/docs/Web/CSS/@font-face/font-display
- ")
-module FontDisplay: {
-  type t = [#auto | #block | #swap | #fallback | #optional]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- * https://developer.mozilla.org/en-US/docs/Web/CSS/counters
- ")
-module CounterStyleType: {
-  type t = [ListStyleType.t]
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- * https://developer.mozilla.org/en-US/docs/Web/CSS/counter
- ")
-module Counter: {
-  type style = [CounterStyleType.t | #unset]
-  type t = [#counter(string, style)]
-
-  let counter: (~style: style=?, string) => t
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- * https://developer.mozilla.org/en-US/docs/Web/CSS/counters
- ")
-module Counters: {
-  type style = [CounterStyleType.t | #unset]
-  type t = [#counters(string, string, style)]
-
-  let counters: (~style: style=?, ~separator: string=?, string) => t
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- * https://developer.mozilla.org/en-US/docs/Web/CSS/counter-increment
- ")
-module CounterIncrement: {
-  type t = [#none | #increment(string, int)]
-
-  let increment: (~value: int=?, string) => t
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- * https://developer.mozilla.org/en-US/docs/Web/CSS/counter-reset
- ")
-module CounterReset: {
-  type t = [#none | #reset(string, int)]
-
-  let reset: (~value: int=?, string) => t
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- * https://developer.mozilla.org/en-US/docs/Web/CSS/counter-set
- ")
-module CounterSet: {
-  type t = [#none | #set(string, int)]
-
-  let set: (~value: int=?, string) => t
-
-  let toString: t => string
-}
-
-@ocaml.doc("
- * https://developer.mozilla.org/en-US/docs/Web/CSS/content
- ")
-module Content: {
-  type t = [
-    | #none
-    | #normal
-    | #openQuote
-    | #closeQuote
-    | #noOpenQuote
-    | #noCloseQuote
-    | #attr(string)
-    | #text(string)
-  ]
-
-  let toString: t => string
-}
-
-module SVG: {
-  module Fill: {
-    type t = [#none | #contextFill | #contextStroke]
-
-    let contextFill: [> t]
-    let contextStroke: [> t]
-
-    let toString: t => string
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Css_Colors.res b/jscomp/syntax/tests/idempotency/bs-css/Css_Colors.res
deleted file mode 100644
index 568f705..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Css_Colors.res
+++ /dev/null
@@ -1,149 +0,0 @@
-let aliceblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F0F8FF")
-let antiquewhite: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FAEBD7")
-let aqua: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("00FFFF")
-let aquamarine: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("7FFFD4")
-let azure: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F0FFFF")
-let beige: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F5F5DC")
-let bisque: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFE4C4")
-let black: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("000000")
-let blanchedalmond: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFEBCD")
-let blue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("0000FF")
-let blueviolet: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("8A2BE2")
-let brown: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("A52A2A")
-let burlywood: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("DEB887")
-let cadetblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("5F9EA0")
-let chartreuse: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("7FFF00")
-let chocolate: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("D2691E")
-let coral: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FF7F50")
-let cornflowerblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("6495ED")
-let cornsilk: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFF8DC")
-let crimson: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("DC143C")
-let cyan: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("00FFFF")
-let darkblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("00008B")
-let darkcyan: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("008B8B")
-let darkgoldenrod: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("B8860B")
-let darkgray: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("A9A9A9")
-let darkgreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("006400")
-let darkgrey: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("A9A9A9")
-let darkkhaki: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("BDB76B")
-let darkmagenta: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("8B008B")
-let darkolivegreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("556B2F")
-let darkorange: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FF8C00")
-let darkorchid: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("9932CC")
-let darkred: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("8B0000")
-let darksalmon: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("E9967A")
-let darkseagreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("8FBC8F")
-let darkslateblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("483D8B")
-let darkslategray: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("2F4F4F")
-let darkslategrey: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("2F4F4F")
-let darkturquoise: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("00CED1")
-let darkviolet: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("9400D3")
-let deeppink: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FF1493")
-let deepskyblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("00BFFF")
-let dimgray: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("696969")
-let dimgrey: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("696969")
-let dodgerblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("1E90FF")
-let firebrick: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("B22222")
-let floralwhite: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFFAF0")
-let forestgreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("228B22")
-let fuchsia: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FF00FF")
-let gainsboro: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("DCDCDC")
-let ghostwhite: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F8F8FF")
-let gold: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFD700")
-let goldenrod: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("DAA520")
-let gray: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("808080")
-let green: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("008000")
-let greenyellow: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("ADFF2F")
-let grey: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("808080")
-let honeydew: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F0FFF0")
-let hotpink: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FF69B4")
-let indianred: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("CD5C5C")
-let indigo: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("4B0082")
-let ivory: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFFFF0")
-let khaki: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F0E68C")
-let lavender: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("E6E6FA")
-let lavenderblush: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFF0F5")
-let lawngreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("7CFC00")
-let lemonchiffon: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFFACD")
-let lightblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("ADD8E6")
-let lightcoral: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F08080")
-let lightcyan: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("E0FFFF")
-let lightgoldenrodyellow: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FAFAD2")
-let lightgray: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("D3D3D3")
-let lightgreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("90EE90")
-let lightgrey: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("D3D3D3")
-let lightpink: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFB6C1")
-let lightsalmon: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFA07A")
-let lightseagreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("20B2AA")
-let lightskyblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("87CEFA")
-let lightslategray: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("778899")
-let lightslategrey: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("778899")
-let lightsteelblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("B0C4DE")
-let lightyellow: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFFFE0")
-let lime: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("00FF00")
-let limegreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("32CD32")
-let linen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FAF0E6")
-let magenta: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FF00FF")
-let maroon: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("800000")
-let mediumaquamarine: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("66CDAA")
-let mediumblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("0000CD")
-let mediumorchid: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("BA55D3")
-let mediumpurple: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("9370DB")
-let mediumseagreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("3CB371")
-let mediumslateblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("7B68EE")
-let mediumspringgreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("00FA9A")
-let mediumturquoise: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("48D1CC")
-let mediumvioletred: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("C71585")
-let midnightblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("191970")
-let mintcream: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F5FFFA")
-let mistyrose: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFE4E1")
-let moccasin: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFE4B5")
-let navajowhite: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFDEAD")
-let navy: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("000080")
-let oldlace: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FDF5E6")
-let olive: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("808000")
-let olivedrab: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("6B8E23")
-let orange: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFA500")
-let orangered: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FF4500")
-let orchid: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("DA70D6")
-let palegoldenrod: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("EEE8AA")
-let palegreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("98FB98")
-let paleturquoise: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("AFEEEE")
-let palevioletred: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("DB7093")
-let papayawhip: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFEFD5")
-let peachpuff: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFDAB9")
-let peru: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("CD853F")
-let pink: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFC0CB")
-let plum: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("DDA0DD")
-let powderblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("B0E0E6")
-let purple: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("800080")
-let rebeccapurple: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("663399")
-let red: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FF0000")
-let rosybrown: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("BC8F8F")
-let royalblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("4169E1")
-let saddlebrown: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("8B4513")
-let salmon: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FA8072")
-let sandybrown: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F4A460")
-let seagreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("2E8B57")
-let seashell: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFF5EE")
-let sienna: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("A0522D")
-let silver: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("C0C0C0")
-let skyblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("87CEEB")
-let slateblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("6A5ACD")
-let slategray: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("708090")
-let slategrey: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("708090")
-let snow: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFFAFA")
-let springgreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("00FF7F")
-let steelblue: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("4682B4")
-let tan: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("D2B48C")
-let teal: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("008080")
-let thistle: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("D8BFD8")
-let tomato: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FF6347")
-let turquoise: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("40E0D0")
-let violet: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("EE82EE")
-let wheat: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F5DEB3")
-let white: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFFFFF")
-let whitesmoke: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("F5F5F5")
-let yellow: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("FFFF00")
-let yellowgreen: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.hex("9ACD3")
-let transparent: [> Css_AtomicTypes.Color.t] = Css_AtomicTypes.Color.transparent
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Css_Core.res b/jscomp/syntax/tests/idempotency/bs-css/Css_Core.res
deleted file mode 100644
index 11a23ec..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Css_Core.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module type CssImplementationIntf = {
-  let mergeStyles: (. array<string>) => string
-  let injectRule: (. Js.Json.t) => unit
-  let injectRaw: (. string) => unit
-  let make: (. Js.Json.t) => string
-  let makeKeyFrames: (. Js.Dict.t<Js.Json.t>) => string
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Css_Js_Core.res b/jscomp/syntax/tests/idempotency/bs-css/Css_Js_Core.res
deleted file mode 100644
index eacb481..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Css_Js_Core.res
+++ /dev/null
@@ -1,1913 +0,0 @@
-module Types = Css_AtomicTypes
-open Css_AtomicTypes
-
-type rec rule =
-  | D(string, string) // Declaration
-  | S(string, array<rule>) // Selector
-  | PseudoClass(string, array<rule>)
-  | PseudoClassParam(string, string, array<rule>)
-
-let rec ruleToDict = (dict, rule) => {
-  switch rule {
-  | D(name, value) if name == "content" =>
-    dict->Js.Dict.set(name, Js.Json.string(value == "" ? "\"\"" : value))
-  | D(name, value) => dict->Js.Dict.set(name, Js.Json.string(value))
-  | S(name, ruleset) => dict->Js.Dict.set(name, toJson(ruleset))
-  | PseudoClass(name, ruleset) => dict->Js.Dict.set(":" ++ name, toJson(ruleset))
-  | PseudoClassParam(name, param, ruleset) =>
-    dict->Js.Dict.set(":" ++ (name ++ ("(" ++ (param ++ ")"))), toJson(ruleset))
-  }
-  dict
-}
-
-and toJson = rules => rules->Belt.Array.reduce(Js.Dict.empty(), ruleToDict)->Js.Json.object_
-
-module Make = (CssImplementation: Css_Core.CssImplementationIntf) => {
-  let merge = (. stylenames) => CssImplementation.mergeStyles(. stylenames)
-
-  let insertRule = (. rule) => CssImplementation.injectRaw(. rule)
-
-  let style = (. rules) => CssImplementation.make(. rules->toJson)
-
-  let global = (. selector, rules) =>
-    CssImplementation.injectRule(. [(selector, toJson(rules))]->Js.Dict.fromArray->Js.Json.object_)
-
-  let keyframes = (. frames) =>
-    CssImplementation.makeKeyFrames(.
-      frames->Belt.Array.reduceU(Js.Dict.empty(), (. dict, (stop, rules)) => {
-        Js.Dict.set(dict, Js.Int.toString(stop) ++ "%", toJson(rules))
-        dict
-      }),
-    )
-}
-
-let join = (strings, separator) =>
-  strings->Belt.Array.reduceWithIndexU("", (. acc, item, index) =>
-    index == 0 ? item : acc ++ (separator ++ item)
-  )
-
-module Converter = {
-  let string_of_time = t => Js.Int.toString(t) ++ "ms"
-
-  let string_of_content = x =>
-    switch x {
-    | #...Content.t as c => Content.toString(c)
-    | #...Counter.t as c => Counter.toString(c)
-    | #...Counters.t as c => Counters.toString(c)
-    | #...Gradient.t as g => Gradient.toString(g)
-    | #...Url.t as u => Url.toString(u)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-  let string_of_counter_increment = x =>
-    switch x {
-    | #...CounterIncrement.t as o => CounterIncrement.toString(o)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-  let string_of_counter_reset = x =>
-    switch x {
-    | #...CounterReset.t as o => CounterReset.toString(o)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-  let string_of_counter_set = x =>
-    switch x {
-    | #...CounterSet.t as o => CounterSet.toString(o)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-
-  let string_of_column_gap = x =>
-    switch x {
-    | #...ColumnGap.t as gcg => ColumnGap.toString(gcg)
-    | #...Percentage.t as p => Percentage.toString(p)
-    | #...Length.t as l => Length.toString(l)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-
-  let string_of_position = x =>
-    switch x {
-    | #auto => "auto"
-    | #...Length.t as l => Length.toString(l)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-
-  let string_of_color = x =>
-    switch x {
-    | #...Color.t as co => Color.toString(co)
-    | #...Var.t as va => Var.toString(va)
-    }
-
-  let string_of_dasharray = x =>
-    switch x {
-    | #...Percentage.t as p => Percentage.toString(p)
-    | #...Length.t as l => Length.toString(l)
-    }
-}
-
-include Converter
-
-type animationName = string
-
-let important = v =>
-  switch v {
-  | D(name, value) => D(name, value ++ " !important")
-  | S(_, _)
-  | PseudoClass(_, _)
-  | PseudoClassParam(_, _, _) => v
-  }
-
-let label = label => D("label", label)
-
-/* Properties */
-
-let alignContent = x => D(
-  "alignContent",
-  switch x {
-  | #...AlignContent.t as ac => AlignContent.toString(ac)
-  | #...NormalAlignment.t as na => NormalAlignment.toString(na)
-  | #...BaselineAlignment.t as ba => BaselineAlignment.toString(ba)
-  | #...DistributedAlignment.t as da => DistributedAlignment.toString(da)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let alignItems = x => D(
-  "alignItems",
-  switch x {
-  | #...AlignItems.t as ai => AlignItems.toString(ai)
-  | #...PositionalAlignment.t as pa => PositionalAlignment.toString(pa)
-  | #...BaselineAlignment.t as ba => BaselineAlignment.toString(ba)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let alignSelf = x => D(
-  "alignSelf",
-  switch x {
-  | #...AlignSelf.t as a => AlignSelf.toString(a)
-  | #...PositionalAlignment.t as pa => PositionalAlignment.toString(pa)
-  | #...BaselineAlignment.t as ba => BaselineAlignment.toString(ba)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let animationDelay = x => D("animationDelay", string_of_time(x))
-
-let animationDirection = x => D("animationDirection", AnimationDirection.toString(x))
-
-let animationDuration = x => D("animationDuration", string_of_time(x))
-
-let animationFillMode = x => D("animationFillMode", AnimationFillMode.toString(x))
-
-let animationIterationCount = x => D("animationIterationCount", AnimationIterationCount.toString(x))
-
-let animationPlayState = x => D("animationPlayState", AnimationPlayState.toString(x))
-
-let animationTimingFunction = x => D("animationTimingFunction", TimingFunction.toString(x))
-
-let backfaceVisibility = x => D(
-  "backfaceVisibility",
-  switch x {
-  | #...BackfaceVisibility.t as bv => BackfaceVisibility.toString(bv)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let backdropFilter = x => D(
-  "backdrop-filter",
-  x->Belt.Array.map(Types.BackdropFilter.toString)->join(", "),
-)
-
-let backgroundAttachment = x => D(
-  "backgroundAttachment",
-  switch x {
-  | #...BackgroundAttachment.t as ba => BackgroundAttachment.toString(ba)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let backgroundColor = x => D("backgroundColor", string_of_color(x))
-
-let backgroundClip = x => D(
-  "backgroundClip",
-  switch x {
-  | #...BackgroundClip.t as bc => BackgroundClip.toString(bc)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let backgroundImage = x => D(
-  "backgroundImage",
-  switch x {
-  | #...BackgroundImage.t as bi => BackgroundImage.toString(bi)
-  | #...Url.t as u => Url.toString(u)
-  | #...Gradient.t as g => Gradient.toString(g)
-  },
-)
-
-let backgroundOrigin = x => D(
-  "backgroundOrigin",
-  switch x {
-  | #...BackgroundOrigin.t as bo => BackgroundOrigin.toString(bo)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let string_of_backgroundposition = x =>
-  switch x {
-  | #...BackgroundPosition.t as bp => BackgroundPosition.toString(bp)
-  | #hv(h, v) =>
-    switch h {
-    | #...BackgroundPosition.X.t as h => BackgroundPosition.X.toString(h)
-    | #...Length.t as l => Length.toString(l)
-    } ++
-    (" " ++
-    switch v {
-    | #...BackgroundPosition.Y.t as v => BackgroundPosition.Y.toString(v)
-    | #...Length.t as l => Length.toString(l)
-    })
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  }
-
-let backgroundPosition = x => D("backgroundPosition", string_of_backgroundposition(x))
-
-let backgroundPositions = bp => D(
-  "backgroundPosition",
-  bp->Belt.Array.map(string_of_backgroundposition)->join(", "),
-)
-
-let backgroundPosition4 = (~x, ~offsetX, ~y, ~offsetY) => D(
-  "backgroundPosition",
-  BackgroundPosition.X.toString(x) ++
-  (" " ++
-  (Length.toString(offsetX) ++
-  (" " ++
-  (BackgroundPosition.Y.toString(y) ++ (" " ++ Length.toString(offsetY)))))),
-)
-
-let backgroundRepeat = x => D(
-  "backgroundRepeat",
-  switch x {
-  | #...BackgroundRepeat.t as br => BackgroundRepeat.toString(br)
-  | #hv(#...BackgroundRepeat.horizontal as h, #...BackgroundRepeat.vertical as v) =>
-    BackgroundRepeat.toString(h) ++ (" " ++ BackgroundRepeat.toString(v))
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let borderBottomColor = x => D("borderBottomColor", string_of_color(x))
-
-let borderBottomLeftRadius = x => D("borderBottomLeftRadius", Length.toString(x))
-
-let borderBottomRightRadius = x => D("borderBottomRightRadius", Length.toString(x))
-
-let borderBottomWidth = x => D("borderBottomWidth", Length.toString(x))
-
-let borderCollapse = x => D(
-  "borderCollapse",
-  switch x {
-  | #...BorderCollapse.t as bc => BorderCollapse.toString(bc)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let borderColor = x => D("borderColor", string_of_color(x))
-
-let borderLeftColor = x => D("borderLeftColor", string_of_color(x))
-
-let borderLeftWidth = x => D("borderLeftWidth", Length.toString(x))
-
-let borderSpacing = x => D("borderSpacing", Length.toString(x))
-
-let borderRadius = x => D("borderRadius", Length.toString(x))
-
-let borderRightColor = x => D("borderRightColor", string_of_color(x))
-
-let borderRightWidth = x => D("borderRightWidth", Length.toString(x))
-
-let borderTopColor = x => D("borderTopColor", string_of_color(x))
-
-let borderTopLeftRadius = x => D("borderTopLeftRadius", Length.toString(x))
-
-let borderTopRightRadius = x => D("borderTopRightRadius", Length.toString(x))
-
-let borderTopWidth = x => D("borderTopWidth", Length.toString(x))
-
-let borderWidth = x => D("borderWidth", Length.toString(x))
-
-let bottom = x => D("bottom", string_of_position(x))
-
-let boxSizing = x => D(
-  "boxSizing",
-  switch x {
-  | #...BoxSizing.t as bs => BoxSizing.toString(bs)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let clear = x => D(
-  "clear",
-  switch x {
-  | #...Clear.t as cl => Clear.toString(cl)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let clipPath = x => D(
-  "clipPath",
-  switch x {
-  | #...ClipPath.t as cp => ClipPath.toString(cp)
-  | #...Url.t as u => Url.toString(u)
-  | #...GeometyBox.t as gb => GeometyBox.toString(gb)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let color = x => D("color", string_of_color(x))
-
-let columnCount = x => D(
-  "columnCount",
-  switch x {
-  | #...ColumnCount.t as cc => ColumnCount.toString(cc)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let columnGap = x => D("columnGap", string_of_column_gap(x))
-
-let contentRule = x => D("content", string_of_content(x))
-let contentRules = xs => D("content", xs->Belt.Array.map(string_of_content)->join(" "))
-
-let counterIncrement = x => D("counter-increment", string_of_counter_increment(x))
-let countersIncrement = xs => D(
-  "counter-increment",
-  xs->Belt.Array.map(string_of_counter_increment)->join(" "),
-)
-
-let counterReset = x => D("counter-reset", string_of_counter_reset(x))
-let countersReset = xs => D("counter-reset", xs->Belt.Array.map(string_of_counter_reset)->join(" "))
-
-let counterSet = x => D("counter-set", string_of_counter_set(x))
-let countersSet = xs => D("counter-set", xs->Belt.Array.map(string_of_counter_set)->join(" "))
-
-let cursor = x => D("cursor", Cursor.toString(x))
-
-let direction = x => D(
-  "direction",
-  switch x {
-  | #...Direction.t as d => Direction.toString(d)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let display = x => D(
-  "display",
-  switch x {
-  | #...DisplayOutside.t as o => DisplayOutside.toString(o)
-  | #...DisplayInside.t as i => DisplayInside.toString(i)
-  | #...DisplayListItem.t as l => DisplayListItem.toString(l)
-  | #...DisplayInternal.t as i' => DisplayInternal.toString(i')
-  | #...DisplayBox.t as b => DisplayBox.toString(b)
-  | #...DisplayLegacy.t as l' => DisplayLegacy.toString(l')
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let flex = x => D(
-  "flex",
-  switch x {
-  | #...Flex.t as f => Flex.toString(f)
-  | #num(n) => Js.Float.toString(n)
-  },
-)
-
-let flexDirection = x => D(
-  "flexDirection",
-  switch x {
-  | #...FlexDirection.t as fd => FlexDirection.toString(fd)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let flexGrow = x => D("flexGrow", Js.Float.toString(x))
-
-let flexShrink = x => D("flexShrink", Js.Float.toString(x))
-
-let flexWrap = x => D(
-  "flexWrap",
-  switch x {
-  | #...FlexWrap.t as fw => FlexWrap.toString(fw)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let float = x => D(
-  "float",
-  switch x {
-  | #...Float.t as f => Float.toString(f)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let fontFamily = x => D(
-  "fontFamily",
-  switch x {
-  | #...FontFamilyName.t as n => FontFamilyName.toString(n)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let fontFamilies = xs => D("fontFamily", xs->Belt.Array.map(FontFamilyName.toString)->join(", "))
-
-let fontSize = x => D(
-  "fontSize",
-  switch x {
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let fontStyle = x => D(
-  "fontStyle",
-  switch x {
-  | #...FontStyle.t as f => FontStyle.toString(f)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let fontVariant = x => D(
-  "fontVariant",
-  switch x {
-  | #...FontVariant.t as f => FontVariant.toString(f)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let fontWeight = x => D(
-  "fontWeight",
-  switch x {
-  | #...FontWeight.t as f => FontWeight.toString(f)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let gridAutoFlow = x => D(
-  "gridAutoFlow",
-  switch x {
-  | #...GridAutoFlow.t as f => GridAutoFlow.toString(f)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let gridColumn = (start, end') => D(
-  "gridColumn",
-  Js.Int.toString(start) ++ (" / " ++ Js.Int.toString(end')),
-)
-
-let gridColumnGap = x => D("gridColumnGap", string_of_column_gap(x))
-
-let gridColumnStart = n => D("gridColumnStart", Js.Int.toString(n))
-
-let gridColumnEnd = n => D("gridColumnEnd", Js.Int.toString(n))
-
-let gridRow = (start, end') => D(
-  "gridRow",
-  Js.Int.toString(start) ++ (" / " ++ Js.Int.toString(end')),
-)
-
-let gridGap = x => D(
-  "gridGap",
-  switch x {
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let gridRowGap = x => D(
-  "gridRowGap",
-  switch x {
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let gridRowEnd = n => D("gridRowEnd", Js.Int.toString(n))
-
-let gridRowStart = n => D("gridRowStart", Js.Int.toString(n))
-
-let height = x => D(
-  "height",
-  switch x {
-  | #...Height.t as h => Height.toString(h)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let justifyContent = x => D(
-  "justifyContent",
-  switch x {
-  | #...PositionalAlignment.t as pa => PositionalAlignment.toString(pa)
-  | #...NormalAlignment.t as na => NormalAlignment.toString(na)
-  | #...DistributedAlignment.t as da => DistributedAlignment.toString(da)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let justifyItems = x => D(
-  "justifyItems",
-  switch x {
-  | #...PositionalAlignment.t as pa => PositionalAlignment.toString(pa)
-  | #...NormalAlignment.t as na => NormalAlignment.toString(na)
-  | #...BaselineAlignment.t as ba => BaselineAlignment.toString(ba)
-  | #...OverflowAlignment.t as oa => OverflowAlignment.toString(oa)
-  | #...LegacyAlignment.t as la => LegacyAlignment.toString(la)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let left = x => D("left", string_of_position(x))
-
-let letterSpacing = x => D(
-  "letterSpacing",
-  switch x {
-  | #...LetterSpacing.t as s => LetterSpacing.toString(s)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let lineHeight = x => D(
-  "lineHeight",
-  switch x {
-  | #...LineHeight.t as h => LineHeight.toString(h)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let listStyle = (style, position, image) => D(
-  "listStyle",
-  ListStyleType.toString(style) ++
-  (" " ++
-  (ListStylePosition.toString(position) ++
-  (" " ++
-  switch image {
-  | #...ListStyleImage.t as lsi => ListStyleImage.toString(lsi)
-  | #...Url.t as u => Url.toString(u)
-  }))),
-)
-
-let listStyleImage = x => D(
-  "listStyleImage",
-  switch x {
-  | #...ListStyleImage.t as lsi => ListStyleImage.toString(lsi)
-  | #...Url.t as u => Url.toString(u)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let listStyleType = x => D(
-  "listStyleType",
-  switch x {
-  | #...ListStyleType.t as lsp => ListStyleType.toString(lsp)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let listStylePosition = x => D(
-  "listStylePosition",
-  switch x {
-  | #...ListStylePosition.t as lsp => ListStylePosition.toString(lsp)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let marginToString = x =>
-  switch x {
-  | #...Length.t as l => Length.toString(l)
-  | #...Margin.t as m => Margin.toString(m)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  }
-
-let margin = x => D("margin", marginToString(x))
-let margin2 = (~v, ~h) => D("margin", marginToString(v) ++ (" " ++ marginToString(h)))
-let margin3 = (~top, ~h, ~bottom) => D(
-  "margin",
-  marginToString(top) ++ (" " ++ (marginToString(h) ++ (" " ++ marginToString(bottom)))),
-)
-let margin4 = (~top, ~right, ~bottom, ~left) => D(
-  "margin",
-  marginToString(top) ++
-  (" " ++
-  (marginToString(right) ++ (" " ++ (marginToString(bottom) ++ (" " ++ marginToString(left)))))),
-)
-let marginLeft = x => D("marginLeft", marginToString(x))
-let marginRight = x => D("marginRight", marginToString(x))
-let marginTop = x => D("marginTop", marginToString(x))
-let marginBottom = x => D("marginBottom", marginToString(x))
-
-let maxHeight = x => D(
-  "maxHeight",
-  switch x {
-  | #...MaxHeight.t as mh => MaxHeight.toString(mh)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let maxWidth = x => D(
-  "maxWidth",
-  switch x {
-  | #...MaxWidth.t as mw => MaxWidth.toString(mw)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let minHeight = x => D(
-  "minHeight",
-  switch x {
-  | #...Height.t as h => Height.toString(h)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let minWidth = x => D(
-  "minWidth",
-  switch x {
-  | #...Width.t as w => Width.toString(w)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let objectFit = x => D(
-  "objectFit",
-  switch x {
-  | #...ObjectFit.t as o => ObjectFit.toString(o)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let objectPosition = x => D("objectPosition", string_of_backgroundposition(x))
-
-let opacity = x => D("opacity", Js.Float.toString(x))
-
-let outline = (size, style, color) => D(
-  "outline",
-  Length.toString(size) ++
-  (" " ++
-  (OutlineStyle.toString(style) ++ (" " ++ string_of_color(color)))),
-)
-let outlineColor = x => D("outlineColor", string_of_color(x))
-let outlineOffset = x => D("outlineOffset", Length.toString(x))
-let outlineStyle = x => D("outlineStyle", OutlineStyle.toString(x))
-let outlineWidth = x => D("outlineWidth", Length.toString(x))
-
-let overflow = x => D("overflow", Overflow.toString(x))
-let overflowX = x => D("overflowX", Overflow.toString(x))
-let overflowY = x => D("overflowY", Overflow.toString(x))
-
-let overflowWrap = x => D(
-  "overflowWrap",
-  switch x {
-  | #...OverflowWrap.t as ow => OverflowWrap.toString(ow)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let padding = x => D("padding", Length.toString(x))
-let padding2 = (~v, ~h) => D("padding", Length.toString(v) ++ (" " ++ Length.toString(h)))
-let padding3 = (~top, ~h, ~bottom) => D(
-  "padding",
-  Length.toString(top) ++ (" " ++ (Length.toString(h) ++ (" " ++ Length.toString(bottom)))),
-)
-let padding4 = (~top, ~right, ~bottom, ~left) => D(
-  "padding",
-  Length.toString(top) ++
-  (" " ++
-  (Length.toString(right) ++ (" " ++ (Length.toString(bottom) ++ (" " ++ Length.toString(left)))))),
-)
-
-let paddingBottom = x => D("paddingBottom", Length.toString(x))
-
-let paddingLeft = x => D("paddingLeft", Length.toString(x))
-
-let paddingRight = x => D("paddingRight", Length.toString(x))
-
-let paddingTop = x => D("paddingTop", Length.toString(x))
-
-let perspective = x => D(
-  "perspective",
-  switch x {
-  | #...Perspective.t as p => Perspective.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let perspectiveOrigin = (x, y) => D(
-  "perspectiveOrigin",
-  switch x {
-  | #...Perspective.t as p => Perspective.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  } ++
-  (" " ++
-  switch y {
-  | #...Perspective.t as p => Perspective.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  }),
-)
-
-let pointerEvents = x => D(
-  "pointerEvents",
-  switch x {
-  | #...PointerEvents.t as p => PointerEvents.toString(p)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let position = x => D(
-  "position",
-  switch x {
-  | #...Position.t as p => Position.toString(p)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let justifySelf = x => D(
-  "justifySelf",
-  switch x {
-  | #...JustifySelf.t as j => JustifySelf.toString(j)
-  | #...PositionalAlignment.t as pa => PositionalAlignment.toString(pa)
-  | #...BaselineAlignment.t as ba => BaselineAlignment.toString(ba)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let resize = x => D(
-  "resize",
-  switch x {
-  | #...Resize.t as r => Resize.toString(r)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let right = x => D("right", string_of_position(x))
-
-let tableLayout = x => D(
-  "tableLayout",
-  switch x {
-  | #...TableLayout.t as tl => TableLayout.toString(tl)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textAlign = x => D(
-  "textAlign",
-  switch x {
-  | #...TextAlign.t as ta => TextAlign.toString(ta)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textDecorationColor = x => D(
-  "textDecorationColor",
-  switch x {
-  | #...Color.t as co => Color.toString(co)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textDecorationLine = x => D(
-  "textDecorationLine",
-  switch x {
-  | #...TextDecorationLine.t as tdl => TextDecorationLine.toString(tdl)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textDecorationStyle = x => D(
-  "textDecorationStyle",
-  switch x {
-  | #...TextDecorationStyle.t as tds => TextDecorationStyle.toString(tds)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textIndent = x => D(
-  "textIndent",
-  switch x {
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textOverflow = x => D(
-  "textOverflow",
-  switch x {
-  | #...TextOverflow.t as txo => TextOverflow.toString(txo)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textTransform = x => D(
-  "textTransform",
-  switch x {
-  | #...TextTransform.t as tt => TextTransform.toString(tt)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let top = x => D("top", string_of_position(x))
-
-let transform = x => D(
-  "transform",
-  switch x {
-  | #none => "none"
-  | #...Transform.t as t => Transform.toString(t)
-  },
-)
-
-let transforms = x => D("transform", x->Belt.Array.map(Transform.toString)->join(" "))
-
-let transformOrigin = (x, y) => D(
-  "transformOrigin",
-  Length.toString(x) ++ (" " ++ Length.toString(y)),
-)
-
-let transformOrigin3d = (x, y, z) => D(
-  "transformOrigin",
-  Length.toString(x) ++ (" " ++ (Length.toString(y) ++ (" " ++ (Length.toString(z) ++ " ")))),
-)
-
-let unsafe = (property, value) => D(property, value)
-
-let userSelect = x => D(
-  "userSelect",
-  switch x {
-  | #...UserSelect.t as us => UserSelect.toString(us)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let verticalAlign = x => D(
-  "verticalAlign",
-  switch x {
-  | #...VerticalAlign.t as v => VerticalAlign.toString(v)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let visibility = x => D(
-  "visibility",
-  switch x {
-  | #...Visibility.t as v => Visibility.toString(v)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let width = x => D(
-  "width",
-  switch x {
-  | #...Width.t as w => Width.toString(w)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let whiteSpace = x => D(
-  "whiteSpace",
-  switch x {
-  | #...WhiteSpace.t as w => WhiteSpace.toString(w)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let wordBreak = x => D(
-  "wordBreak",
-  switch x {
-  | #...WordBreak.t as w => WordBreak.toString(w)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let wordSpacing = x => D(
-  "wordSpacing",
-  switch x {
-  | #...WordSpacing.t as w => WordSpacing.toString(w)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let wordWrap = overflowWrap
-
-let zIndex = x => D("zIndex", Js.Int.toString(x))
-
-/* Selectors */
-
-let media = (query, rules) => S("@media " ++ query, rules)
-let selector = (selector, rules) => S(selector, rules)
-let pseudoClass = (selector, rules) => PseudoClass(selector, rules)
-
-let active = pseudoClass("active")
-let checked = pseudoClass("checked")
-let default = pseudoClass("default")
-let defined = pseudoClass("defined")
-let disabled = pseudoClass("disabled")
-let empty = pseudoClass("empty")
-let enabled = pseudoClass("enabled")
-let first = pseudoClass("first")
-let firstChild = pseudoClass("first-child")
-let firstOfType = pseudoClass("first-of-type")
-let focus = pseudoClass("focus")
-let focusWithin = pseudoClass("focus-within")
-let host = (~selector=?, rules) =>
-  switch selector {
-  | None => PseudoClass("host", rules)
-  | Some(s) => PseudoClassParam("host", s, rules)
-  }
-let hover = pseudoClass("hover")
-let indeterminate = pseudoClass("indeterminate")
-let inRange = pseudoClass("in-range")
-let invalid = pseudoClass("invalid")
-let lang = (code, rules) => PseudoClassParam("lang", code, rules)
-let lastChild = pseudoClass("last-child")
-let lastOfType = pseudoClass("last-of-type")
-//let left = selector(":left");
-let link = pseudoClass("link")
-let not__ = (selector, rules) => PseudoClassParam("not", selector, rules)
-module Nth = {
-  type t = [#odd | #even | #n(int) | #add(int, int)]
-  let toString = x =>
-    switch x {
-    | #odd => "odd"
-    | #even => "even"
-    | #n(x) => Js.Int.toString(x) ++ "n"
-    | #add(x, y) => Js.Int.toString(x) ++ ("n+" ++ Js.Int.toString(y))
-    }
-}
-let nthChild = (x, rules) => PseudoClassParam("nth-child", Nth.toString(x), rules)
-let nthLastChild = (x, rules) => PseudoClassParam("nth-last-child", Nth.toString(x), rules)
-let nthLastOfType = (x, rules) => PseudoClassParam("nth-last-of-type", Nth.toString(x), rules)
-let nthOfType = (x, rules) => PseudoClassParam("nth-of-type", Nth.toString(x), rules)
-let onlyChild = pseudoClass("only-child")
-let onlyOfType = pseudoClass("only-of-type")
-let optional = pseudoClass("optional")
-let outOfRange = pseudoClass("out-of-range")
-let readOnly = pseudoClass("read-only")
-let readWrite = pseudoClass("read-write")
-let required = pseudoClass("required")
-//let right = selector(":right");
-let root = pseudoClass("root")
-let scope = pseudoClass("scope")
-let target = pseudoClass("target")
-let valid = pseudoClass("valid")
-let visited = pseudoClass("visited")
-
-let after = selector("::after")
-let before = selector("::before")
-let firstLetter = selector("::first-letter")
-let firstLine = selector("::first-line")
-let selection = selector("::selection")
-
-let child = x => selector(" > " ++ x)
-let children = selector(" > *")
-let directSibling = selector(" + ")
-let placeholder = selector("::placeholder")
-let siblings = selector(" ~ ")
-
-let anyLink = selector(":any-link")
-
-/* Type aliasing */
-
-type angle = Angle.t
-type animationDirection = AnimationDirection.t
-type animationFillMode = AnimationFillMode.t
-type animationIterationCount = AnimationIterationCount.t
-type animationPlayState = AnimationPlayState.t
-type cascading = Cascading.t
-type color = Color.t
-type fontStyle = FontStyle.t
-type fontWeight = FontWeight.t
-type length = Length.t
-type listStyleType = ListStyleType.t
-type repeatValue = RepeatValue.t
-type outlineStyle = OutlineStyle.t
-type transform = Transform.t
-type gradient<'colorOrVar> = Gradient.t<'colorOrVar>
-
-/* Constructor aliases */
-
-let initial = Cascading.initial
-let inherit_ = Cascading.inherit_
-let unset = Cascading.unset
-
-let var = Types.Var.var
-let varDefault = Types.Var.varDefault
-
-// shared
-let auto = #auto
-let none = #none
-let text = #text
-
-let pct = Percentage.pct
-
-let ch = Length.ch
-let cm = Length.cm
-let em = Length.em
-let ex = Length.ex
-let mm = Length.mm
-let pt = Length.pt
-let px = Length.px
-let pxFloat = Length.pxFloat
-let rem = Length.rem
-let vh = Length.vh
-let vmin = Length.vmin
-let vmax = Length.vmax
-let zero = Length.zero
-
-let deg = Angle.deg
-let rad = Angle.rad
-let grad = Angle.grad
-let turn = Angle.turn
-
-let ltr = Direction.ltr
-let rtl = Direction.rtl
-
-let absolute = Position.absolute
-let relative = Position.relative
-let static = Position.static
-let fixed = #fixed
-let sticky = Position.sticky
-
-//let none = Resize.none;
-//let both = Resize.both;
-let horizontal = Resize.horizontal
-let vertical = Resize.vertical
-//let block = Resize.block;
-//let inline = Resize.inline;
-
-let smallCaps = FontVariant.smallCaps
-
-//let normal = `normal;
-let italic = FontStyle.italic
-let oblique = FontStyle.oblique
-
-let hidden = #hidden
-let visible = #visible
-let scroll = #scroll
-
-let rgb = Color.rgb
-let rgba = Color.rgba
-let hsl = Color.hsl
-let hsla = Color.hsla
-let hex = Color.hex
-let currentColor = Color.currentColor
-let transparent = Color.transparent
-
-let linear = TimingFunction.linear
-let ease = TimingFunction.ease
-let easeIn = TimingFunction.easeIn
-let easeInOut = TimingFunction.easeInOut
-let easeOut = TimingFunction.easeOut
-let stepStart = TimingFunction.stepStart
-let stepEnd = TimingFunction.stepEnd
-let steps = TimingFunction.steps
-let cubicBezier = TimingFunction.cubicBezier
-
-let marginBox = GeometyBox.marginBox
-//let borderBox = GeometyBox.borderBox;
-//let paddingBox = GeometyBox.paddingBox;
-//let contentBox = GeometyBox.contentBox;
-let fillBox = GeometyBox.fillBox
-let strokeBox = GeometyBox.strokeBox
-let viewBox = GeometyBox.viewBox
-
-let translate = Transform.translate
-let translate3d = Transform.translate3d
-let translateX = Transform.translateX
-let translateY = Transform.translateY
-let translateZ = Transform.translateZ
-let scaleX = Transform.scaleX
-let scaleY = Transform.scaleY
-let scaleZ = Transform.scaleZ
-let rotateX = Transform.rotateX
-let rotateY = Transform.rotateY
-let rotateZ = Transform.rotateZ
-let scale = Transform.scale
-let scale3d = Transform.scale3d
-let skew = Transform.skew
-let skewX = Transform.skewX
-let skewY = Transform.skewY
-
-let thin = FontWeight.thin
-let extraLight = FontWeight.extraLight
-let light = FontWeight.light
-let medium = FontWeight.medium
-let semiBold = FontWeight.semiBold
-let bold = FontWeight.bold
-let extraBold = FontWeight.extraBold
-let lighter = FontWeight.lighter
-let bolder = FontWeight.bolder
-
-let linearGradient = Gradient.linearGradient
-let repeatingLinearGradient = Gradient.repeatingLinearGradient
-let radialGradient = Gradient.radialGradient
-let repeatingRadialGradient = Gradient.repeatingRadialGradient
-
-let areas = GridTemplateAreas.areas
-let ident = GridArea.ident
-let numIdent = GridArea.numIdent
-
-// cursor aliases
-//let auto = Cursor.auto;
-//let default = Cursor.default;
-//let none = Cursor.none;
-let contextMenu = Cursor.contextMenu
-let help = Cursor.help
-let pointer = Cursor.pointer
-let progress = Cursor.progress
-let wait = Cursor.wait
-let cell = Cursor.cell
-let crosshair = Cursor.crosshair
-//let text = Cursor.text;
-let verticalText = Cursor.verticalText
-let alias = Cursor.alias
-let copy = Cursor.copy
-let move = Cursor.move
-let noDrop = Cursor.noDrop
-let notAllowed = Cursor.notAllowed
-let grab = Cursor.grab
-let grabbing = Cursor.grabbing
-let allScroll = Cursor.allScroll
-let colResize = Cursor.colResize
-let rowResize = Cursor.rowResize
-let nResize = Cursor.nResize
-let eResize = Cursor.eResize
-let sResize = Cursor.sResize
-let wResize = Cursor.wResize
-let neResize = Cursor.neResize
-let nwResize = Cursor.nwResize
-let seResize = Cursor.seResize
-let swResize = Cursor.swResize
-let ewResize = Cursor.ewResize
-let nsResize = Cursor.nsResize
-let neswResize = Cursor.neswResize
-let nwseResize = Cursor.nwseResize
-let zoomIn = Cursor.zoomIn
-let zoomOut = Cursor.zoomOut
-
-/* *******************************************************
- ********************************************************
- ******************************************************* */
-
-let vw = x => #vw(x)
-let fr = x => #fr(x)
-
-module Calc = {
-  let \"-" = (a, b) => #calc(#sub, a, b)
-  let \"+" = (a, b) => #calc(#add, a, b)
-}
-let size = (x, y) => #size(x, y)
-
-let all = #all
-let backwards = #backwards
-let baseline = #baseline
-let block = #block
-let borderBox = #borderBox
-let both = #both
-let center = #center
-let column = #column
-let columnReverse = #columnReverse
-let contain = #contain
-let contentBox = #contentBox
-let count = x => #count(x)
-let cover = #cover
-let dashed = #dashed
-let dotted = #dotted
-let flexBox = #flex
-let grid = #grid
-let inlineGrid = #inlineGrid
-let flexEnd = #flexEnd
-let flexStart = #flexStart
-let forwards = #forwards
-let infinite = #infinite
-
-let inline = #inline
-let contents = #contents
-let inlineBlock = #inlineBlock
-let inlineFlex = #inlineFlex
-let inlineTable = #inlineTable
-let listItem = #listItem
-let runIn = #runIn
-let table = #table
-let tableCaption = #tableCaption
-let tableColumnGroup = #tableColumnGroup
-let tableHeaderGroup = #tableHeaderGroup
-let tableFooterGroup = #tableFooterGroup
-let tableRowGroup = #tableRowGroup
-let tableCell = #tableCell
-let tableColumn = #tableColumn
-let tableRow = #tableRow
-
-let local = #local
-let localUrl = x => #localUrl(x)
-let noRepeat = #noRepeat
-let space = #space
-let nowrap = #nowrap
-let paddingBox = #paddingBox
-let paused = #paused
-let repeat = #repeat
-let minmax = #minmax
-let repeatX = #repeatX
-let repeatY = #repeatY
-let rotate = a => #rotate(a)
-let rotate3d = (x, y, z, a) => #rotate3d(x, y, z, a)
-let row = #row
-let rowReverse = #rowReverse
-let running = #running
-let solid = #solid
-let spaceAround = #spaceAround
-let spaceBetween = #spaceBetween
-let spaceEvenly = #spaceEvenly
-let stretch = #stretch
-let url = x => #url(x)
-let wrap = #wrap
-let wrapReverse = #wrapReverse
-
-let inside = #inside
-let outside = #outside
-
-let underline = #underline
-let overline = #overline
-let lineThrough = #lineThrough
-let clip = #clip
-let ellipsis = #ellipsis
-
-let wavy = #wavy
-let double = #double
-
-let uppercase = #uppercase
-let lowercase = #lowercase
-let capitalize = #capitalize
-
-let sub = #sub
-let super = #super
-let textTop = #textTop
-let textBottom = #textBottom
-let middle = #middle
-
-let normal = #normal
-
-let breakAll = #breakAll
-let keepAll = #keepAll
-let breakWord = #breakWord
-
-let reverse = #reverse
-let alternate = #alternate
-let alternateReverse = #alternateReverse
-
-let fill = #fill
-let content = #content
-let maxContent = #maxContent
-let minContent = #minContent
-let fitContent = #fitContent
-
-let round = #round
-let miter = #miter
-let bevel = #bevel
-let butt = #butt
-let square = #square
-
-let flex3 = (~grow, ~shrink, ~basis) => D(
-  "flex",
-  Js.Float.toString(grow) ++
-  (" " ++
-  (Js.Float.toString(shrink) ++
-  (" " ++
-  switch basis {
-  | #...FlexBasis.t as b => FlexBasis.toString(b)
-  | #...Length.t as l => Length.toString(l)
-  }))),
-)
-let flexBasis = x => D(
-  "flexBasis",
-  switch x {
-  | #...FlexBasis.t as b => FlexBasis.toString(b)
-  | #...Length.t as l => Length.toString(l)
-  },
-)
-
-let order = x => D("order", Js.Int.toString(x))
-
-let string_of_minmax = x =>
-  switch x {
-  | #auto => "auto"
-  | #calc(#add, a, b) => "calc(" ++ (Length.toString(a) ++ (" + " ++ (Length.toString(b) ++ ")")))
-  | #calc(#sub, a, b) => "calc(" ++ (Length.toString(a) ++ (" - " ++ (Length.toString(b) ++ ")")))
-  | #ch(x) => Js.Float.toString(x) ++ "ch"
-  | #cm(x) => Js.Float.toString(x) ++ "cm"
-  | #em(x) => Js.Float.toString(x) ++ "em"
-  | #ex(x) => Js.Float.toString(x) ++ "ex"
-  | #mm(x) => Js.Float.toString(x) ++ "mm"
-  | #percent(x) => Js.Float.toString(x) ++ "%"
-  | #pt(x) => Js.Int.toString(x) ++ "pt"
-  | #px(x) => Js.Int.toString(x) ++ "px"
-  | #pxFloat(x) => Js.Float.toString(x) ++ "px"
-  | #rem(x) => Js.Float.toString(x) ++ "rem"
-  | #vh(x) => Js.Float.toString(x) ++ "vh"
-  | #vmax(x) => Js.Float.toString(x) ++ "vmax"
-  | #vmin(x) => Js.Float.toString(x) ++ "vmin"
-  | #vw(x) => Js.Float.toString(x) ++ "vw"
-  | #fr(x) => Js.Float.toString(x) ++ "fr"
-  | #inch(x) => Js.Float.toString(x) ++ "in"
-  | #pc(x) => Js.Float.toString(x) ++ "pc"
-  | #zero => "0"
-  | #minContent => "min-content"
-  | #maxContent => "max-content"
-  }
-
-let string_of_dimension = x =>
-  switch x {
-  | #auto => "auto"
-  | #none => "none"
-  | #calc(#add, a, b) => "calc(" ++ (Length.toString(a) ++ (" + " ++ (Length.toString(b) ++ ")")))
-  | #calc(#sub, a, b) => "calc(" ++ (Length.toString(a) ++ (" - " ++ (Length.toString(b) ++ ")")))
-  | #ch(x) => Js.Float.toString(x) ++ "ch"
-  | #cm(x) => Js.Float.toString(x) ++ "cm"
-  | #em(x) => Js.Float.toString(x) ++ "em"
-  | #ex(x) => Js.Float.toString(x) ++ "ex"
-  | #mm(x) => Js.Float.toString(x) ++ "mm"
-  | #percent(x) => Js.Float.toString(x) ++ "%"
-  | #pt(x) => Js.Int.toString(x) ++ "pt"
-  | #px(x) => Js.Int.toString(x) ++ "px"
-  | #pxFloat(x) => Js.Float.toString(x) ++ "px"
-  | #rem(x) => Js.Float.toString(x) ++ "rem"
-  | #vh(x) => Js.Float.toString(x) ++ "vh"
-  | #vmax(x) => Js.Float.toString(x) ++ "vmax"
-  | #vmin(x) => Js.Float.toString(x) ++ "vmin"
-  | #vw(x) => Js.Float.toString(x) ++ "vw"
-  | #fr(x) => Js.Float.toString(x) ++ "fr"
-  | #inch(x) => Js.Float.toString(x) ++ "in"
-  | #pc(x) => Js.Float.toString(x) ++ "pc"
-  | #zero => "0"
-  | #fitContent => "fit-content"
-  | #minContent => "min-content"
-  | #maxContent => "max-content"
-  | #minmax(a, b) => "minmax(" ++ (string_of_minmax(a) ++ ("," ++ (string_of_minmax(b) ++ ")")))
-  }
-
-type minmax = [#fr(float) | #minContent | #maxContent | #auto | Length.t]
-
-type trackLength = [
-  | Length.t
-  | #auto
-  | #fr(float)
-  | #minContent
-  | #maxContent
-  | #minmax(minmax, minmax)
-]
-type gridLength = [trackLength | #repeat(RepeatValue.t, trackLength)]
-
-let gridLengthToJs = x =>
-  switch x {
-  | #auto => "auto"
-  | #calc(#add, a, b) => "calc(" ++ (Length.toString(a) ++ (" + " ++ (Length.toString(b) ++ ")")))
-  | #calc(#sub, a, b) => "calc(" ++ (Length.toString(a) ++ (" - " ++ (Length.toString(b) ++ ")")))
-  | #ch(x) => Js.Float.toString(x) ++ "ch"
-  | #cm(x) => Js.Float.toString(x) ++ "cm"
-  | #em(x) => Js.Float.toString(x) ++ "em"
-  | #ex(x) => Js.Float.toString(x) ++ "ex"
-  | #mm(x) => Js.Float.toString(x) ++ "mm"
-  | #percent(x) => Js.Float.toString(x) ++ "%"
-  | #pt(x) => Js.Int.toString(x) ++ "pt"
-  | #px(x) => Js.Int.toString(x) ++ "px"
-  | #pxFloat(x) => Js.Float.toString(x) ++ "px"
-  | #rem(x) => Js.Float.toString(x) ++ "rem"
-  | #vh(x) => Js.Float.toString(x) ++ "vh"
-  | #inch(x) => Js.Float.toString(x) ++ "in"
-  | #pc(x) => Js.Float.toString(x) ++ "pc"
-  | #vmax(x) => Js.Float.toString(x) ++ "vmax"
-  | #vmin(x) => Js.Float.toString(x) ++ "vmin"
-  | #vw(x) => Js.Float.toString(x) ++ "vw"
-  | #fr(x) => Js.Float.toString(x) ++ "fr"
-  | #zero => "0"
-  | #minContent => "min-content"
-  | #maxContent => "max-content"
-  | #repeat(n, x) =>
-    "repeat(" ++ (RepeatValue.toString(n) ++ (", " ++ (string_of_dimension(x) ++ ")")))
-  | #minmax(a, b) => "minmax(" ++ (string_of_minmax(a) ++ ("," ++ (string_of_minmax(b) ++ ")")))
-  }
-
-let string_of_dimensions = dimensions => dimensions->Belt.Array.map(gridLengthToJs)->join(" ")
-
-let gridTemplateColumns = dimensions => D("gridTemplateColumns", string_of_dimensions(dimensions))
-
-let gridTemplateRows = dimensions => D("gridTemplateRows", string_of_dimensions(dimensions))
-
-let gridAutoColumns = dimensions => D("gridAutoColumns", string_of_dimension(dimensions))
-
-let gridAutoRows = dimensions => D("gridAutoRows", string_of_dimension(dimensions))
-
-let gridArea = s => D(
-  "gridArea",
-  switch s {
-  | #...GridArea.t as t => GridArea.toString(t)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let gridArea2 = (s, s2) => D("gridArea", GridArea.toString(s) ++ (" / " ++ GridArea.toString(s2)))
-
-let gridArea3 = (s, s2, s3) => D(
-  "gridArea",
-  GridArea.toString(s) ++ (" / " ++ (GridArea.toString(s2) ++ (" / " ++ GridArea.toString(s3)))),
-)
-
-let gridArea4 = (s, s2, s3, s4) => D(
-  "gridArea",
-  GridArea.toString(s) ++
-  (" / " ++
-  (GridArea.toString(s2) ++
-  (" / " ++
-  (GridArea.toString(s3) ++ (" / " ++ GridArea.toString(s4)))))),
-)
-
-let gridTemplateAreas = l => D(
-  "gridTemplateAreas",
-  switch l {
-  | #...GridTemplateAreas.t as t => GridTemplateAreas.toString(t)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-type filter = [
-  | #blur(Length.t)
-  | #brightness(float)
-  | #contrast(float)
-  | #dropShadow(Length.t, Length.t, Length.t, Color.t)
-  | #grayscale(float)
-  | #hueRotate(angle)
-  | #invert(float)
-  | #opacity(float)
-  | #saturate(float)
-  | #sepia(float)
-  | #url(string)
-  | #none
-  | Var.t
-  | Cascading.t
-]
-
-let string_of_filter = x =>
-  switch x {
-  | #blur(v) => "blur(" ++ (Length.toString(v) ++ ")")
-  | #brightness(v) => "brightness(" ++ (Js.Float.toString(v) ++ "%)")
-  | #contrast(v) => "contrast(" ++ (Js.Float.toString(v) ++ "%)")
-  | #dropShadow(a, b, c, d) =>
-    "drop-shadow(" ++
-    (Length.toString(a) ++
-    (" " ++
-    (Length.toString(b) ++
-    (" " ++ (Length.toString(c) ++ (" " ++ (Color.toString(d) ++ ")")))))))
-  | #grayscale(v) => "grayscale(" ++ (Js.Float.toString(v) ++ "%)")
-  | #hueRotate(v) => "hue-rotate(" ++ (Angle.toString(v) ++ ")")
-  | #invert(v) => "invert(" ++ (Js.Float.toString(v) ++ "%)")
-  | #opacity(v) => "opacity(" ++ (Js.Float.toString(v) ++ "%)")
-  | #saturate(v) => "saturate(" ++ (Js.Float.toString(v) ++ "%)")
-  | #sepia(v) => "sepia(" ++ (Js.Float.toString(v) ++ "%)")
-  | #none => "none"
-  | #...Url.t as u => Url.toString(u)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  }
-
-let filter = x => D("filter", x->Belt.Array.map(string_of_filter)->join(" "))
-
-module Shadow = {
-  type value<'a> = string
-  type box
-  type text
-  type t<'a> = [#shadow(value<'a>) | #none]
-
-  let box = (~x=zero, ~y=zero, ~blur=zero, ~spread=zero, ~inset=false, color) =>
-    #shadow(
-      Length.toString(x) ++
-      (" " ++
-      (Length.toString(y) ++
-      (" " ++
-      (Length.toString(blur) ++
-      (" " ++
-      (Length.toString(spread) ++
-      (" " ++
-      (string_of_color(color) ++ (inset ? " inset" : ""))))))))),
-    )
-
-  let text = (~x=zero, ~y=zero, ~blur=zero, color) =>
-    #shadow(
-      Length.toString(x) ++
-      (" " ++
-      (Length.toString(y) ++ (" " ++ (Length.toString(blur) ++ (" " ++ string_of_color(color)))))),
-    )
-
-  let toString: t<'a> => string = x =>
-    switch x {
-    | #shadow(x) => x
-    | #none => "none"
-    }
-}
-
-let boxShadow = x => D(
-  "boxShadow",
-  switch x {
-  | #...Shadow.t as s => Shadow.toString(s)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let boxShadows = x => D("boxShadow", x->Belt.Array.map(Shadow.toString)->join(", "))
-
-let string_of_borderstyle = x =>
-  switch x {
-  | #...BorderStyle.t as b => BorderStyle.toString(b)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  }
-
-let border = (px, style, color) => D(
-  "border",
-  Length.toString(px) ++ (" " ++ (string_of_borderstyle(style) ++ (" " ++ string_of_color(color)))),
-)
-let borderStyle = x => D("borderStyle", string_of_borderstyle(x))
-
-let borderLeft = (px, style, color) => D(
-  "borderLeft",
-  Length.toString(px) ++ (" " ++ (string_of_borderstyle(style) ++ (" " ++ string_of_color(color)))),
-)
-let borderLeftStyle = x => D("borderLeftStyle", string_of_borderstyle(x))
-
-let borderRight = (px, style, color) => D(
-  "borderRight",
-  Length.toString(px) ++ (" " ++ (string_of_borderstyle(style) ++ (" " ++ string_of_color(color)))),
-)
-
-let borderRightStyle = x => D("borderRightStyle", string_of_borderstyle(x))
-let borderTop = (px, style, color) => D(
-  "borderTop",
-  Length.toString(px) ++ (" " ++ (string_of_borderstyle(style) ++ (" " ++ string_of_color(color)))),
-)
-
-let borderTopStyle = x => D("borderTopStyle", string_of_borderstyle(x))
-
-let borderBottom = (px, style, color) => D(
-  "borderBottom",
-  Length.toString(px) ++ (" " ++ (string_of_borderstyle(style) ++ (" " ++ string_of_color(color)))),
-)
-
-let borderBottomStyle = x => D("borderBottomStyle", string_of_borderstyle(x))
-
-let background = x => D(
-  "background",
-  switch x {
-  | #...Color.t as c => Color.toString(c)
-  | #...Url.t as u => Url.toString(u)
-  | #...Gradient.t as g => Gradient.toString(g)
-  | #none => "none"
-  },
-)
-
-let backgrounds = x => D(
-  "background",
-  x
-  ->Belt.Array.map(item =>
-    switch item {
-    | #...Color.t as c => Color.toString(c)
-    | #...Url.t as u => Url.toString(u)
-    | #...Gradient.t as g => Gradient.toString(g)
-    | #none => "none"
-    }
-  )
-  ->join(", "),
-)
-
-let backgroundSize = x => D(
-  "backgroundSize",
-  switch x {
-  | #size(x, y) => Length.toString(x) ++ (" " ++ Length.toString(y))
-  | #auto => "auto"
-  | #cover => "cover"
-  | #contain => "contain"
-  },
-)
-
-let fontFace = (~fontFamily, ~src, ~fontStyle=?, ~fontWeight=?, ~fontDisplay=?, ()) => {
-  let fontStyle = Js.Option.map((. value) => FontStyle.toString(value), fontStyle)
-  let src =
-    src
-    ->Belt.Array.map(x =>
-      switch x {
-      | #localUrl(value) => j`local("$(value)")`
-      | #url(value) => j`url("$(value)")`
-      }
-    )
-    ->join(", ")
-
-  let fontStyle = Belt.Option.mapWithDefault(fontStyle, "", s => "font-style: " ++ (s ++ ";"))
-  let fontWeight = Belt.Option.mapWithDefault(fontWeight, "", w =>
-    "font-weight: " ++
-    (switch w {
-    | #...FontWeight.t as f => FontWeight.toString(f)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    } ++
-    ";")
-  )
-  let fontDisplay = Belt.Option.mapWithDefault(fontDisplay, "", f =>
-    "font-display: " ++ (FontDisplay.toString(f) ++ ";")
-  )
-
-  j`@font-face {
-     font-family: $fontFamily;
-     src: $src;
-     $(fontStyle)
-     $(fontWeight)
-     $(fontDisplay)
-   }`
-}
-
-let textDecoration = x => D(
-  "textDecoration",
-  switch x {
-  | #none => "none"
-  | #underline => "underline"
-  | #overline => "overline"
-  | #lineThrough => "line-through"
-  | #initial => "initial"
-  | #inherit_ => "inherit"
-  | #unset => "unset"
-  | #...Var.t as va => Var.toString(va)
-  },
-)
-
-let textShadow = x => D(
-  "textShadow",
-  switch x {
-  | #...Shadow.t as s => Shadow.toString(s)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textShadows = x => D("textShadow", x->Belt.Array.map(Shadow.toString)->join(", "))
-
-let transformStyle = x => D(
-  "transformStyle",
-  switch x {
-  | #...TransformStyle.t as ts => TransformStyle.toString(ts)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-@ocaml.doc("
- * Transition
- ")
-module Transition = {
-  type t = [#value(string)]
-
-  let shorthand = (~duration=0, ~delay=0, ~timingFunction=#ease, property) =>
-    #value(
-      string_of_time(duration) ++
-      (" " ++
-      (TimingFunction.toString(timingFunction) ++
-      (" " ++
-      (string_of_time(delay) ++ (" " ++ property))))),
-    )
-
-  let toString = x =>
-    switch x {
-    | #value(v) => v
-    }
-}
-
-let transitionValue = x => D("transition", Transition.toString(x))
-
-let transitionList = x => D("transition", x->Belt.Array.map(Transition.toString)->join(", "))
-let transitions = transitionList
-
-let transition = (~duration=?, ~delay=?, ~timingFunction=?, property) =>
-  transitionValue(Transition.shorthand(~duration?, ~delay?, ~timingFunction?, property))
-
-let transitionDelay = i => D("transitionDelay", string_of_time(i))
-
-let transitionDuration = i => D("transitionDuration", string_of_time(i))
-
-let transitionTimingFunction = x => D("transitionTimingFunction", TimingFunction.toString(x))
-
-let transitionProperty = x => D("transitionProperty", x)
-
-@ocaml.doc("
- * Animation
- ")
-module Animation = {
-  type t = [#value(string)]
-
-  let shorthand = (
-    ~duration=0,
-    ~delay=0,
-    ~direction=#normal,
-    ~timingFunction=#ease,
-    ~fillMode=#none,
-    ~playState=#running,
-    ~iterationCount=#count(1),
-    name,
-  ) =>
-    #value(
-      name ++
-      (" " ++
-      (string_of_time(duration) ++
-      (" " ++
-      (TimingFunction.toString(timingFunction) ++
-      (" " ++
-      (string_of_time(delay) ++
-      (" " ++
-      (AnimationIterationCount.toString(iterationCount) ++
-      (" " ++
-      (AnimationDirection.toString(direction) ++
-      (" " ++
-      (AnimationFillMode.toString(fillMode) ++
-      (" " ++
-      AnimationPlayState.toString(playState)))))))))))))),
-    )
-
-  let toString = x =>
-    switch x {
-    | #value(v) => v
-    }
-}
-
-let animationValue = x => D("animation", Animation.toString(x))
-
-let animation = (
-  ~duration=?,
-  ~delay=?,
-  ~direction=?,
-  ~timingFunction=?,
-  ~fillMode=?,
-  ~playState=?,
-  ~iterationCount=?,
-  name,
-) =>
-  animationValue(
-    Animation.shorthand(
-      ~duration?,
-      ~delay?,
-      ~direction?,
-      ~timingFunction?,
-      ~fillMode?,
-      ~playState?,
-      ~iterationCount?,
-      name,
-    ),
-  )
-
-let animations = x => D("animation", x->Belt.Array.map(Animation.toString)->join(", "))
-
-let animationName = x => D("animationName", x)
-
-@ocaml.doc("
- * SVG
- ")
-module SVG = {
-  let fill = x => D(
-    "fill",
-    switch x {
-    | #...Types.SVG.Fill.t as f => Types.SVG.Fill.toString(f)
-    | #...Types.Color.t as c => Types.Color.toString(c)
-    | #...Types.Var.t as v => Types.Var.toString(v)
-    | #...Types.Url.t as u => Types.Url.toString(u)
-    },
-  )
-  let fillOpacity = opacity => D("fillOpacity", Js.Float.toString(opacity))
-  let fillRule = x => D(
-    "fillRule",
-    switch x {
-    | #evenodd => "evenodd"
-    | #nonzero => "nonzero"
-    },
-  )
-  let stroke = x => D("stroke", string_of_color(x))
-  let strokeDasharray = x => D(
-    "stroke-dasharray",
-    switch x {
-    | #none => "none"
-    | #dasharray(a) => a->Belt.Array.map(string_of_dasharray)->join(" ")
-    },
-  )
-  let strokeWidth = x => D("strokeWidth", Length.toString(x))
-  let strokeOpacity = opacity => D("strokeOpacity", Js.Float.toString(opacity))
-  let strokeMiterlimit = x => D("strokeMiterlimit", Js.Float.toString(x))
-  let strokeLinecap = x => D(
-    "strokeLinecap",
-    switch x {
-    | #butt => "butt"
-    | #round => "round"
-    | #square => "square"
-    },
-  )
-
-  let strokeLinejoin = x => D(
-    "strokeLinejoin",
-    switch x {
-    | #miter => "miter"
-    | #round => "round"
-    | #bevel => "bevel"
-    },
-  )
-  let stopColor = x => D("stopColor", string_of_color(x))
-  let stopOpacity = x => D("stopOpacity", Js.Float.toString(x))
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Css_Js_Core.resi b/jscomp/syntax/tests/idempotency/bs-css/Css_Js_Core.resi
deleted file mode 100644
index a98abca..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Css_Js_Core.resi
+++ /dev/null
@@ -1,1752 +0,0 @@
-/* Css documentation is copy/pasted from mozilla mdn web docs */
-
-module Types = Css_AtomicTypes
-
-type rule
-type animationName
-
-module Make: Css_Core.CssImplementationIntf =>
-{
-  let global: (. string, array<rule>) => unit
-  let insertRule: (. string) => unit
-  let merge: (. array<string>) => string
-  let style: (. array<rule>) => string
-  let keyframes: (. array<(int, array<rule>)>) => animationName
-}
-
-let toJson: array<rule> => Js.Json.t
-
-let important: rule => rule
-let label: string => rule
-
-module Shadow: {
-  type value<'a>
-  type box
-  type text
-
-  type t<'a> = [#shadow(value<'a>) | #none]
-
-  let box: (
-    ~x: Types.Length.t=?,
-    ~y: Types.Length.t=?,
-    ~blur: Types.Length.t=?,
-    ~spread: Types.Length.t=?,
-    ~inset: bool=?,
-    [< Types.Color.t | Types.Var.t],
-  ) => [> t<box>]
-
-  let text: (
-    ~x: Types.Length.t=?,
-    ~y: Types.Length.t=?,
-    ~blur: Types.Length.t=?,
-    [< Types.Color.t | Types.Var.t],
-  ) => [> t<text>]
-
-  let toString: t<'a> => string
-}
-
-/* ********
- Properties
- ********** */
-
-@ocaml.doc(" If nothing works, use this (unsafe) escape hatch ")
-let unsafe: (string, string) => rule
-
-@ocaml.doc("
- The CSS align-content property sets the distribution of space between and around content items along a flexbox's
- cross-axis or a grid's block axis.
- ")
-let alignContent: [<
-  | Types.AlignContent.t
-  | Types.NormalAlignment.t
-  | Types.BaselineAlignment.t
-  | Types.DistributedAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The CSS align-items property sets the align-self value on all direct children as a group.
- In Flexbox, it controls the alignment of items on the Cross Axis.
- In Grid Layout, it controls the alignment of items on the Block Axis within their grid area.
- ")
-let alignItems: [<
-  | Types.AlignItems.t
-  | Types.PositionalAlignment.t
-  | Types.BaselineAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The align-self CSS property overrides a grid or flex item's align-items value.
- In Grid, it aligns the item inside the grid area. In Flexbox, it aligns the item on the cross axis.
- ")
-let alignSelf: [<
-  | Types.AlignSelf.t
-  | Types.PositionalAlignment.t
-  | Types.BaselineAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The animation-delay CSS property sets when an animation starts.
- The animation can start later, immediately from its beginning, or immediately and partway through the animation.
- ")
-let animationDelay: int => rule
-
-@ocaml.doc("
- The animation-direction CSS property sets whether an animation should play forwards, backwards,
- or alternating back and forth.
- ")
-let animationDirection: Types.AnimationDirection.t => rule
-
-@ocaml.doc("
- The animation-duration CSS property sets the length of time that an animation takes to complete one cycle.
- ")
-let animationDuration: int => rule
-
-@ocaml.doc("
- The animation-fill-mode CSS property sets how a CSS animation applies styles to its target before and after
- its execution.
- ")
-let animationFillMode: Types.AnimationFillMode.t => rule
-
-@ocaml.doc("
- The animation-iteration-count CSS property sets the number of times an animation cycle should be played
- before stopping.
- ")
-let animationIterationCount: Types.AnimationIterationCount.t => rule
-
-@ocaml.doc("
- The animation-play-state CSS property sets whether an animation is running or paused.
- ")
-let animationPlayState: Types.AnimationPlayState.t => rule
-
-@ocaml.doc("
- The animation-timing-function CSS property sets how an animation progresses through the duration of each cycle.
- ")
-let animationTimingFunction: Types.TimingFunction.t => rule
-
-@ocaml.doc("
- The backdrop-filter CSS property lets you apply graphical effects such as blurring or color shifting to the
- area behind an element. Because it applies to everything behind the element, to see the effect you must
- make the element or its background at least partially transparent.
- ")
-let backdropFilter: array<Types.BackdropFilter.t> => rule
-
-/* Warning: experimental */
-let backfaceVisibility: [< Types.BackfaceVisibility.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc(" The background-attachment CSS property sets whether a background image's position is fixed within the viewport,
- or scrolls with its containing block.
- ")
-let backgroundAttachment: [< Types.BackgroundAttachment.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The background-color CSS property sets the background color of an element.
- ")
-let backgroundColor: [< Types.Color.t | Types.Var.t] => rule
-
-@ocaml.doc("
- The background-clip CSS property sets whether an element's background extends underneath its border box,
- padding box, or content box.
- ")
-let backgroundClip: [< Types.BackgroundClip.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The background-image CSS property sets one or more background images on an element.
- ")
-let backgroundImage: [< Types.BackgroundImage.t | Types.Url.t | Types.Gradient.t<'gradient>] => rule
-
-@ocaml.doc("
- The background-origin CSS property sets the background's origin: from the border start,
- inside the border, or inside the padding.
- ")
-let backgroundOrigin: [< Types.BackgroundClip.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The background-position CSS property sets the initial position for each background image.
- The position is relative to the position layer set by background-origin.
- ")
-let backgroundPosition: [<
-  | Types.BackgroundPosition.t
-  | #hv(
-    [Types.BackgroundPosition.X.t | Types.Length.t],
-    [Types.BackgroundPosition.Y.t | Types.Length.t],
-  )
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-let backgroundPositions: array<
-  [<
-    | Types.BackgroundPosition.t
-    | #hv(
-      [Types.BackgroundPosition.X.t | Types.Length.t],
-      [Types.BackgroundPosition.Y.t | Types.Length.t],
-    )
-    | Types.Length.t
-    | Types.Var.t
-    | Types.Cascading.t
-  ],
-> => rule
-
-let backgroundPosition4: (
-  ~x: Types.BackgroundPosition.X.t,
-  ~offsetX: Types.Length.t,
-  ~y: Types.BackgroundPosition.Y.t,
-  ~offsetY: Types.Length.t,
-) => rule
-
-@ocaml.doc("
- The background-repeat CSS property sets how background images are repeated.
- A background image can be repeated along the horizontal and vertical axes, or not repeated at all.
- ")
-let backgroundRepeat: [<
-  | Types.BackgroundRepeat.t
-  | #hv(Types.BackgroundRepeat.horizontal, Types.BackgroundRepeat.vertical)
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The border-bottom shorthand CSS property sets an element's bottom border.
- It sets the values of border-bottom-width, border-bottom-style and border-bottom-color.
- ")
-let borderBottom: (
-  Types.Length.t,
-  [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t],
-  [< Types.Color.t | Types.Var.t],
-) => rule
-
-@ocaml.doc("
- The border-bottom-color CSS property sets the color of an element's bottom border.
- It can also be set with the shorthand CSS properties border-color or border-bottom.
- ")
-let borderBottomColor: [< Types.Color.t | Types.Var.t] => rule
-
-@ocaml.doc("
- The border-bottom-left-radius CSS property rounds the bottom-left corner of an element.
- ")
-let borderBottomLeftRadius: Types.Length.t => rule
-
-@ocaml.doc("
- The border-bottom-right-radius CSS property rounds the bottom-right corner of an element.
- ")
-let borderBottomRightRadius: Types.Length.t => rule
-
-@ocaml.doc("
- The border-bottom-style CSS property sets the line style of an element's bottom border.
- ")
-let borderBottomStyle: [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The border-bottom-width CSS property sets the width of the bottom border of an element.
- ")
-let borderBottomWidth: Types.Length.t => rule
-
-@ocaml.doc("
- The border-collapse CSS property sets whether cells inside a <table> have shared or separate borders.
- ")
-let borderCollapse: [< Types.BorderCollapse.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The border-color shorthand CSS property sets the color of an element's border.
- ")
-let borderColor: [< Types.Color.t | Types.Var.t] => rule
-
-@ocaml.doc("
- The border-left shorthand CSS property set an element's left border.
- ")
-let borderLeft: (
-  Types.Length.t,
-  [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t],
-  [< Types.Color.t | Types.Var.t],
-) => rule
-
-let borderLeftColor: [< Types.Color.t | Types.Var.t] => rule
-
-let borderLeftStyle: [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-let borderLeftWidth: Types.Length.t => rule
-
-let borderRight: (
-  Types.Length.t,
-  [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t],
-  [< Types.Color.t | Types.Var.t],
-) => rule
-
-let borderRightColor: [< Types.Color.t | Types.Var.t] => rule
-
-let borderRightStyle: [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-let borderRightWidth: Types.Length.t => rule
-
-let borderRadius: Types.Length.t => rule
-
-let borderSpacing: Types.Length.t => rule
-
-@ocaml.doc("
- The border-style shorthand CSS property sets the line style for all four sides of an element's border.
- ")
-let borderStyle: [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-let borderTopColor: [< Types.Color.t | Types.Var.t] => rule
-
-let borderTopLeftRadius: Types.Length.t => rule
-
-let borderTopRightRadius: Types.Length.t => rule
-
-let borderTopStyle: [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-let borderTopWidth: Types.Length.t => rule
-
-let borderWidth: Types.Length.t => rule
-
-let bottom: [< #auto | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The box-sizing CSS property sets how the total width and height of an element is calculated.
- ")
-let boxSizing: [< Types.BoxSizing.t | Types.Var.t | Types.Cascading.t] => rule
-
-let boxShadow: [< Shadow.t<Shadow.box> | Types.Var.t | Types.Cascading.t] => rule
-
-let boxShadows: array<[Shadow.t<Shadow.box>]> => rule
-
-@ocaml.doc("
- The clear CSS property sets whether an element must be moved below (cleared) floating elements that precede it.
- The clear property applies to floating and non-floating elements.
- ")
-let clear: [< Types.Clear.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The clip-path CSS property creates a clipping region that sets what part of an element should be shown.
- Parts that are inside the region are shown, while those outside are hidden.
- ")
-let clipPath: [<
-  | Types.ClipPath.t
-  | Types.Url.t
-  | Types.GeometyBox.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-let color: [< Types.Color.t | Types.Var.t] => rule
-
-@ocaml.doc("
- The column-count CSS property breaks an element's content into the specified number of columns.
- ")
-let columnCount: [< Types.ColumnCount.t | Types.Cascading.t] => rule
-
-let contentRule: [<
-  | Types.Content.t
-  | Types.Counter.t
-  | Types.Counters.t
-  | Types.Gradient.t<'gradient>
-  | Types.Url.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-let contentRules: array<
-  [<
-    | Types.Content.t
-    | Types.Counter.t
-    | Types.Counters.t
-    | Types.Gradient.t<'gradient>
-    | Types.Url.t
-  ],
-> => rule
-
-let counterIncrement: [< Types.CounterIncrement.t | Types.Var.t | Types.Cascading.t] => rule
-let countersIncrement: array<[< Types.CounterIncrement.t]> => rule
-let counterReset: [< Types.CounterReset.t | Types.Var.t | Types.Cascading.t] => rule
-let countersReset: array<[< Types.CounterReset.t]> => rule
-let counterSet: [< Types.CounterSet.t | Types.Var.t | Types.Cascading.t] => rule
-let countersSet: array<[< Types.CounterSet.t]> => rule
-
-let cursor: Types.Cursor.t => rule
-
-@ocaml.doc("
- The direction CSS property sets the direction of text, table columns, and horizontal overflow.
- Use rtl for languages written from right to left (like Hebrew or Arabic),
- and ltr for those written from left to right (like English and most other languages).
- ")
-let direction: [< Types.Direction.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The display CSS property sets whether an element is treated as a block or inline element
- and the layout used for its children, such as grid or flex.
- ")
-let display: [<
-  | Types.DisplayOutside.t
-  | Types.DisplayInside.t
-  | Types.DisplayListItem.t
-  | Types.DisplayInternal.t
-  | Types.DisplayBox.t
-  | Types.DisplayLegacy.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The flex CSS property sets how a flex item will grow or shrink to fit the space available in its flex container.
- It is a shorthand for flex-grow, flex-shrink, and flex-basis.
- ")
-let flex: [< Types.Flex.t | #num(float)] => rule
-
-@ocaml.doc("
- The flex-basis CSS property sets the initial main size of a flex item.
- It sets the size of the content box unless otherwise set with box-sizing.
- ")
-let flexBasis: [< Types.FlexBasis.t | Types.Percentage.t | Types.Length.t] => rule
-
-@ocaml.doc("
- The flex-direction CSS property sets how flex items are placed in the flex container defining the main axis and the direction (normal or reversed).
- ")
-let flexDirection: [< Types.FlexDirection.t | Types.Var.t | Types.Cascading.t] => rule
-
-let flexGrow: float => rule
-
-let flexShrink: float => rule
-
-@ocaml.doc("
- The flex-wrap CSS property sets whether flex items are forced onto one line or can wrap onto multiple lines.
- If wrapping is allowed, it sets the direction that lines are stacked.
- ")
-let flexWrap: [< Types.FlexWrap.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The float CSS property places an element on the left or right side of its container,
- allowing text and inline elements to wrap around it.
- The element is removed from the normal flow of the page, though still remaining a part of the flow
- (in contrast to absolute positioning).
- ")
-let float: [< Types.Float.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The font-family CSS property specifies a prioritized list of one or more font family names and/or generic family names
- for the selected element.
- ")
-let fontFamily: [< Types.FontFamilyName.t | Types.Var.t | Types.Cascading.t] => rule
-
-let fontFamilies: array<[Types.FontFamilyName.t]> => rule
-
-@ocaml.doc("
- The font-size CSS property sets the size of the font. This property is also used to compute the size of em, ex, and
- other relative <length> units.
- ")
-let fontSize: [< Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The font-style CSS property sets whether a font should be styled with a normal, italic, or oblique face from its
- font-family.
- ")
-let fontStyle: [< Types.FontStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The font-variant CSS property is a shorthand for the longhand properties font-variant-caps, font-variant-numeric,
- font-variant-alternates, font-variant-ligatures, and font-variant-east-asian.
- You can also set the CSS Level 2 (Revision 1) values of font-variant, (that is, normal or small-caps),
- by using the font shorthand.
- ")
-let fontVariant: [< Types.FontVariant.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The font-weight CSS property sets the weight (or boldness) of the font. The weights available depend on the
- font-family you are using.
- ")
-let fontWeight: [< Types.FontWeight.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The grid-area CSS property is a shorthand property for grid-row-start, grid-column-start, grid-row-end and
- grid-column-end, specifying a grid item’s size and location within the grid by contributing a line, a span,
- or nothing (automatic) to its grid placement, thereby specifying the edges of its grid area.
- ")
-let gridArea: [< Types.GridArea.t | Types.Var.t | Types.Cascading.t] => rule
-let gridArea2: (Types.GridArea.t, Types.GridArea.t) => rule
-let gridArea3: (Types.GridArea.t, Types.GridArea.t, Types.GridArea.t) => rule
-let gridArea4: (Types.GridArea.t, Types.GridArea.t, Types.GridArea.t, Types.GridArea.t) => rule
-
-@ocaml.doc("
- The grid-auto-flow CSS property controls how the auto-placement algorithm works,
- specifying exactly how auto-placed items get flowed into the grid.
- ")
-let gridAutoFlow: [< Types.GridAutoFlow.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The grid-column CSS property is a shorthand property for grid-column-start and grid-column-end
- specifying a grid item's size and location within the grid column by contributing a line, a span,
- or nothing (automatic) to its grid placement, thereby specifying the inline-start and
- inline-end edge of its grid area.
- ")
-let gridColumn: (int, int) => rule
-
-@ocaml.doc("
- The grid-column-end CSS property specifies a grid item’s end position within the grid column by contributing a line,
- a span, or nothing (automatic) to its grid placement, thereby specifying the block-end edge of its grid area.
- ")
-let gridColumnEnd: int => rule
-
-@ocaml.doc("
- The column-gap CSS property sets the size of the gap (gutter) between an element's columns.
- ")
-let columnGap: [<
-  | Types.ColumnGap.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- This prefixed property is being replaced by column-gap.
- ")
-let gridColumnGap: [<
-  | Types.ColumnGap.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The grid-column-start CSS property specifies a grid item’s start position within the grid column
- by contributing a line, a span, or nothing (automatic) to its grid placement.
- This start position defines the block-start edge of the grid area.
- ")
-let gridColumnStart: int => rule
-
-@ocaml.doc("
- The gap CSS property sets the gaps (gutters) between rows and columns. It is a shorthand for row-gap and column-gap.
- ")
-let gridGap: [< Types.Percentage.t | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The grid-row CSS property is a shorthand property for grid-row-start and grid-row-end specifying a grid item’s size
- and location within the grid row by contributing a line, a span, or nothing (automatic) to its grid placement,
- thereby specifying the inline-start and inline-end edge of its grid area.
- ")
-let gridRow: (int, int) => rule
-
-@ocaml.doc("
- The grid-row-end CSS property specifies a grid item’s end position within the grid row by contributing a line, a span,
- or nothing (automatic) to its grid placement, thereby specifying the inline-end edge of its grid area.
- ")
-let gridRowEnd: int => rule
-
-@ocaml.doc("
- The row-gap CSS property sets the size of the gap (gutter) between an element's grid rows.
- ")
-let gridRowGap: [< Types.Percentage.t | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The grid-row-start CSS property specifies a grid item’s start position within the grid row by contributing a line,
- a span, or nothing (automatic) to its grid placement, thereby specifying the inline-start edge of its grid area.
- ")
-let gridRowStart: int => rule
-
-@ocaml.doc("
- The grid-template-areas CSS property specifies named grid areas.
- ")
-let gridTemplateAreas: [< Types.GridTemplateAreas.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The height CSS property specifies the height of an element.
- By default, the property defines the height of the content area.
- If box-sizing is set to border-box, however, it instead determines the height of the border area.
- ")
-let height: [<
-  | Types.Height.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The CSS justify-content property defines how the browser distributes space between and around content items
- along the main-axis of a flex container, and the inline axis of a grid container.
- ")
-let justifyContent: [<
-  | Types.PositionalAlignment.t
-  | Types.NormalAlignment.t
-  | Types.DistributedAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The CSS justify-items property defines the default justify-self for all items of the box, giving them all
- a default way of justifying each box along the appropriate axis.
- ")
-let justifyItems: [<
-  | Types.PositionalAlignment.t
-  | Types.NormalAlignment.t
-  | Types.BaselineAlignment.t
-  | Types.OverflowAlignment.t
-  | Types.LegacyAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The CSS justify-self property sets the way a box is justified inside its alignment container along the appropriate axis.
- ")
-let justifySelf: [<
-  | Types.JustifySelf.t
-  | Types.PositionalAlignment.t
-  | Types.BaselineAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-let left: [< #auto | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The letter-spacing CSS property sets the spacing behavior between text characters
- ")
-let letterSpacing: [<
-  | Types.LetterSpacing.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The line-height CSS property sets the height of a line box. It's commonly used to set the distance between lines of text.
- On block-level elements, it specifies the minimum height of line boxes within the element.
- On non-replaced inline elements, it specifies the height that is used to calculate line box height.
- ")
-let lineHeight: [< Types.LineHeight.t | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The list-style CSS property is a shorthand to set list style properties list-style-type,
- list-style-image, and list-style-position.
- ")
-let listStyle: (
-  Types.ListStyleType.t,
-  Types.ListStylePosition.t,
-  [< Types.ListStyleImage.t | Types.Url.t],
-) => rule
-
-@ocaml.doc("
- The list-style-image CSS property sets an image to be used as the list item marker.
- It is often more convenient to use the shorthand list-style.
- ")
-let listStyleImage: [<
-  | Types.ListStyleImage.t
-  | Types.Url.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The list-style-type CSS property sets the marker (such as a disc, character, or custom counter style) of a list item element.
- ")
-let listStyleType: [< Types.ListStyleType.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The list-style-position CSS property sets the position of the ::marker relative to a list item.
- ")
-let listStylePosition: [< Types.ListStylePosition.t | Types.Var.t | Types.Cascading.t] => rule
-
-let margin: [< Types.Length.t | Types.Margin.t] => rule
-let margin2: (
-  ~v: [< Types.Length.t | Types.Margin.t],
-  ~h: [< Types.Length.t | Types.Margin.t],
-) => rule
-let margin3: (
-  ~top: [< Types.Length.t | Types.Margin.t],
-  ~h: [< Types.Length.t | Types.Margin.t],
-  ~bottom: [< Types.Length.t | Types.Margin.t],
-) => rule
-let margin4: (
-  ~top: [< Types.Length.t | Types.Margin.t],
-  ~right: [< Types.Length.t | Types.Margin.t],
-  ~bottom: [< Types.Length.t | Types.Margin.t],
-  ~left: [< Types.Length.t | Types.Margin.t],
-) => rule
-
-let marginLeft: [< Types.Length.t | Types.Margin.t | Types.Var.t | Types.Cascading.t] => rule
-
-let marginRight: [< Types.Length.t | Types.Margin.t | Types.Var.t | Types.Cascading.t] => rule
-
-let marginTop: [< Types.Length.t | Types.Margin.t | Types.Var.t | Types.Cascading.t] => rule
-
-let marginBottom: [< Types.Length.t | Types.Margin.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The max-height CSS property sets the maximum height of an element.
- It prevents the used value of the height property from becoming larger than the value specified for max-height.
- ")
-let maxHeight: [<
-  | Types.MaxHeight.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The max-width CSS property sets the maximum width of an element.
- It prevents the used value of the width property from becoming larger than the value specified by max-width.
- ")
-let maxWidth: [<
-  | Types.MaxWidth.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The min-height CSS property sets the minimum height of an element.
- It prevents the used value of the height property from becoming smaller than the value specified for min-height.
- ")
-let minHeight: [<
-  | Types.Height.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The min-width CSS property sets the minimum width of an element.
- It prevents the used value of the width property from becoming smaller than the value specified for min-width.
- ")
-let minWidth: [<
-  | Types.Width.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The object-fit CSS property sets how the content of a replaced element,
- such as an <img> or <video>, should be resized to fit its container.
- ")
-let objectFit: [< Types.ObjectFit.t | Types.Var.t | Types.Cascading.t] => rule
-
-let objectPosition: [<
-  | Types.BackgroundPosition.t
-  | #hv(
-    [Types.BackgroundPosition.X.t | Types.Length.t],
-    [Types.BackgroundPosition.Y.t | Types.Length.t],
-  )
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-let opacity: float => rule
-
-let order: int => rule
-
-let outline: (Types.Length.t, Types.OutlineStyle.t, [< Types.Color.t | Types.Var.t]) => rule
-
-let outlineColor: [< Types.Color.t | Types.Var.t] => rule
-
-let outlineOffset: Types.Length.t => rule
-
-let outlineStyle: Types.OutlineStyle.t => rule
-
-let outlineWidth: Types.Length.t => rule
-
-let overflow: Types.Overflow.t => rule
-
-let overflowX: Types.Overflow.t => rule
-
-let overflowY: Types.Overflow.t => rule
-
-@ocaml.doc("
- The overflow-wrap CSS property applies to inline elements, setting whether the browser
- should insert line breaks within an otherwise unbreakable string to prevent text
- from overflowing its line box.
- ")
-let overflowWrap: [< Types.OverflowWrap.t | Types.Var.t | Types.Cascading.t] => rule
-
-let padding: Types.Length.t => rule
-let padding2: (~v: Types.Length.t, ~h: Types.Length.t) => rule
-let padding3: (~top: Types.Length.t, ~h: Types.Length.t, ~bottom: Types.Length.t) => rule
-let padding4: (
-  ~top: Types.Length.t,
-  ~right: Types.Length.t,
-  ~bottom: Types.Length.t,
-  ~left: Types.Length.t,
-) => rule
-
-let paddingLeft: Types.Length.t => rule
-
-let paddingRight: Types.Length.t => rule
-
-let paddingTop: Types.Length.t => rule
-
-let paddingBottom: Types.Length.t => rule
-
-@ocaml.doc("
- The perspective CSS property determines the distance between the z=0 plane and the user in order
- to give a 3D-positioned element some perspective.
- Each 3D element with z>0 becomes larger; each 3D-element with z<0 becomes smaller.
- The strength of the effect is determined by the value of this property.
- ")
-let perspective: [< Types.Perspective.t | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The perspective-origin CSS property determines the position at which the viewer is looking.
- It is used as the vanishing point by the perspective property.
- ")
-let perspectiveOrigin: (
-  [< Types.Perspective.t | Types.Length.t],
-  [< Types.Perspective.t | Types.Length.t],
-) => rule
-
-@ocaml.doc("
- The pointer-events CSS property sets under what circumstances (if any) a particular graphic element can become the target of pointer events.
- ")
-let pointerEvents: [< Types.PointerEvents.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The position CSS property sets how an element is positioned in a document.
- The top, right, bottom, and left properties determine the final location of positioned elements.
- ")
-let position: [< Types.Position.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The resize CSS property sets whether an element is resizable, and if so,
- in which directions.
- ")
-let resize: [< Types.Resize.t | Types.Var.t | Types.Cascading.t] => rule
-
-let right: [< #auto | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The table-layout CSS property sets the algorithm used to lay out <table> cells, rows, and columns.
- ")
-let tableLayout: [< Types.TableLayout.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-align CSS property sets the horizontal alignment of a block element or table-cell box.
- This means it works like vertical-align but in the horizontal direction.
- ")
-let textAlign: [< Types.TextAlign.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-decoration-color CSS property sets the color of decorations added to text by text-decoration-line.
- ")
-let textDecorationColor: [< Types.Color.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-decoration-line CSS property sets the kind of decoration
- that is used on text in an element, such as an underline or overline.
- ")
-let textDecorationLine: [< Types.TextDecorationLine.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-decoration-style CSS property sets the style of the lines specified by text-decoration-line.
- The style applies to all lines that are set with text-decoration-line.
- ")
-let textDecorationStyle: [< Types.TextDecorationStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-indent CSS property sets the length of empty space (indentation)
- that is put before lines of text in a block.
- ")
-let textIndent: [< Types.Percentage.t | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-overflow CSS property sets how hidden overflow content is signaled to users.
- It can be clipped, display an ellipsis ('…'), or display a custom string.
- ")
-let textOverflow: [< Types.TextOverflow.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-shadow CSS property adds shadows to text.
- It accepts a comma-separated list of shadows to be applied to the text and any of its decorations.
- Each shadow is described by some combination of X and Y offsets from the element, blur radius, and color.
- ")
-let textShadow: [< Shadow.t<Shadow.text> | Types.Var.t | Types.Cascading.t] => rule
-let textShadows: array<[Shadow.t<Shadow.text>]> => rule
-
-@ocaml.doc("
- The text-transform CSS property specifies how to capitalize an element's text.
- It can be used to make text appear in all-uppercase or all-lowercase, or with each word capitalized.
- ")
-let textTransform: [< Types.TextTransform.t | Types.Var.t | Types.Cascading.t] => rule
-
-let top: [< #auto | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-let transform: [< #none | Types.Transform.t] => rule
-
-let transforms: array<Types.Transform.t> => rule
-
-@ocaml.doc("
\"")
-let transformOrigin: (Types.Length.t, Types.Length.t) => rule
-let transformOrigin3d: (Types.Length.t, Types.Length.t, Types.Length.t) => rule
-
-let transitionDelay: int => rule
-
-let transitionDuration: int => rule
-
-let transitionProperty: string => rule
-
-let transformStyle: [< Types.TransformStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-let transitionTimingFunction: Types.TimingFunction.t => rule
-
-@ocaml.doc("
- The user-select CSS property controls whether the user can select text.
- This doesn't have any effect on content loaded as chrome, except in textboxes.
- ")
-let userSelect: [< Types.UserSelect.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The vertical-align CSS property sets vertical alignment of an inline or table-cell box.
- ")
-let verticalAlign: [<
-  | Types.VerticalAlign.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The visibility CSS property shows or hides an element without changing the layout of a document.
- The property can also hide rows or columns in a <table>.
- ")
-let visibility: [< Types.Visibility.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The width CSS property sets an element's width.
- By default, it sets the width of the content area, but if box-sizing is set to border-box,
- it sets the width of the border area.
- ")
-let width: [<
-  | Types.Width.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The white-space CSS property sets how white space inside an element is handled.
- ")
-let whiteSpace: [< Types.WhiteSpace.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The word-break CSS property sets whether line breaks appear wherever the text would otherwise overflow its content box.
- ")
-let wordBreak: [< Types.WordBreak.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The word-spacing CSS property sets the length of space between words and between tags
- ")
-let wordSpacing: [<
-  | Types.WordSpacing.t
-  | Types.Length.t
-  | Types.Percentage.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- see overflowWrap
- ")
-let wordWrap: [< Types.OverflowWrap.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The z-index CSS property sets the z-order of a positioned element and its descendants or flex items.
- Overlapping elements with a larger z-index cover those with a smaller one.
- ")
-let zIndex: int => rule
-
-/* *******
- selectors
- ********* */
-
-let selector: (string, array<rule>) => rule
-let media: (string, array<rule>) => rule
-
-@ocaml.doc(" type selector ")
-@ocaml.doc("
- The :active CSS pseudo-class represents an element (such as a button) that is being activated by the user.
- When using a mouse, \"activation\" typically starts when the user presses down the primary mouse button.
- ")
-let /*
- Pseudo-classes selectors
-
- A CSS pseudo-class is a keyword added to a selector that specifies a special state of the selected element(s).
- */
-
-active: array<rule> => rule
-
-@ocaml.doc("
- The :checked CSS pseudo-class selector represents any radio (<input type=\"radio\">), checkbox (<input type=\"checkbox\">),
- or option (<option> in a <select>) element that is checked or toggled to an on state.
- ")
-let checked: array<rule> => rule
-
-@ocaml.doc("
- The :default CSS pseudo-class selects form elements that are the default in a group of related elements.
- ")
-let default: array<rule> => rule
-
-@ocaml.doc("
- The :defined CSS pseudo-class represents any element that has been defined.
- This includes any standard element built in to the browser, and custom elements that have been successfully defined
- (i.e. with the CustomElementRegistry.define() method).
- ")
-let defined: array<rule> => rule
-
-@ocaml.doc("
- The :disabled CSS pseudo-class represents any disabled element.
- An element is disabled if it can't be activated (selected, clicked on, typed into, etc.) or accept focus.
- The element also has an enabled state, in which it can be activated or accept focus.
- ")
-let disabled: array<rule> => rule
-
-@ocaml.doc("
- The :empty CSS pseudo-class represents any element that has no children.
- Children can be either element nodes or text (including whitespace).
- Comments, processing instructions, and CSS content do not affect whether an element is considered empty.
- ")
-let empty: array<rule> => rule
-
-@ocaml.doc("
- The :enabled CSS pseudo-class represents any enabled element.
- An element is enabled if it can be activated (selected, clicked on, typed into, etc.) or accept focus.
- The element also has a disabled state, in which it can't be activated or accept focus.
- ")
-let enabled: array<rule> => rule
-
-@ocaml.doc("
- The :first CSS pseudo-class, used with the  @page at-rule, represents the first page of a printed document.
- ")
-let first: array<rule> => rule
-
-@ocaml.doc("
- The :first-child CSS pseudo-class represents the first element among a group of sibling elements.
- ")
-let firstChild: array<rule> => rule
-
-@ocaml.doc("
- The :first-of-type CSS pseudo-class represents the first element of its type among a group of sibling elements.
- ")
-let firstOfType: array<rule> => rule
-
-@ocaml.doc("
- The :focus CSS pseudo-class represents an element (such as a form input) that has received focus.
- It is generally triggered when the user clicks or taps on an element or selects it with the keyboard's \"tab\" key.
- ")
-let focus: array<rule> => rule
-
-@ocaml.doc("
- The :focus-within CSS pseudo-class represents an element that has received focus or contains an element
- that has received focus. In other words, it represents an element that is itself matched by the :focus pseudo-class or has a descendant that is matched by :focus.
-  (This includes descendants in shadow trees.)
- ")
-let focusWithin: array<rule> => rule
-
-@ocaml.doc("
- The :host CSS pseudo-class selects the shadow host of the shadow DOM containing the CSS it is used inside
- — in other words, this allows you to select a custom element from inside its shadow DOM.
- ")
-let host: (~selector: string=?, array<rule>) => rule
-
-@ocaml.doc("
- The :hover CSS pseudo-class matches when the user interacts with an element with a pointing device,
- but does not necessarily activate it.
- It is generally triggered when the user hovers over an element with the cursor (mouse pointer).
- ")
-let hover: array<rule> => rule
-
-@ocaml.doc("
- The :indeterminate CSS pseudo-class represents any form element whose state is indeterminate.
- ")
-let indeterminate: array<rule> => rule
-
-@ocaml.doc("
- The :in-range CSS pseudo-class represents an <input> element whose current value is
- within the range limits specified by the min and max attributes.
- ")
-let inRange: array<rule> => rule
-
-@ocaml.doc("
- The :invalid CSS pseudo-class represents any <input> or other <form> element whose contents fail to validate.
- ")
-let invalid: array<rule> => rule
-
-@ocaml.doc("
- The :lang() CSS pseudo-class matches elements based on the language they are determined to be in.
- ")
-let lang: (string, array<rule>) => rule
-
-@ocaml.doc("
- The :last-child CSS pseudo-class represents the last element among a group of sibling elements.
- ")
-let lastChild: array<rule> => rule
-
-@ocaml.doc("
- The :last-of-type CSS pseudo-class represents the last element of its type among a group of sibling elements.
- ")
-let lastOfType: array<rule> => rule
-
-//let left: array(rule) => rule;
-
-@ocaml.doc("
- The :link CSS pseudo-class represents an element that has not yet been visited.
- It matches every unvisited <a>, <area>, or <link> element that has an href attribute.
- ")
-let link: array<rule> => rule
-
-@ocaml.doc("
- The :not() CSS pseudo-class represents elements that do not match a list of selectors.
- Since it prevents specific items from being selected, it is known as the negation pseudo-class.
- ")
-let not__: (string, array<rule>) => rule
-
-module Nth: {
-  type t = [#odd | #even | #n(int) | #add(int, int)]
-  let toString: t => string
-}
-
-@ocaml.doc("
- The :nth-child() CSS pseudo-class matches elements based on their position in a group of siblings.
- ")
-let nthChild: (Nth.t, array<rule>) => rule
-
-@ocaml.doc("
- The :nth-last-child() CSS pseudo-class matches elements based on their position among a group of siblings,
- counting from the end.
- ")
-let nthLastChild: (Nth.t, array<rule>) => rule
-
-@ocaml.doc("
- The :nth-last-of-type() CSS pseudo-class matches elements of a given type,
- based on their position among a group of siblings, counting from the end.
- ")
-let nthLastOfType: (Nth.t, array<rule>) => rule
-
-@ocaml.doc("
- The :nth-of-type() CSS pseudo-class matches elements of a given type,
- based on their position among a group of siblings.
- ")
-let nthOfType: (Nth.t, array<rule>) => rule
-
-@ocaml.doc("
- The :only-child CSS pseudo-class represents an element without any siblings.
- This is the same as :first-child:last-child or :nth-child(1):nth-last-child(1),
- but with a lower specificity.
- ")
-let onlyChild: array<rule> => rule
-
-@ocaml.doc("
- The :only-of-type CSS pseudo-class represents an element that has no siblings of the same type.
- ")
-let onlyOfType: array<rule> => rule
-
-@ocaml.doc("
- The :optional CSS pseudo-class represents any <input>, <select>,
- or <textarea> element that does not have the required attribute set on it.
- ")
-let optional: array<rule> => rule
-
-@ocaml.doc("
- The :out-of-range CSS pseudo-class represents an <input> element whose current value
- is outside the range limits specified by the min and max attributes.
- ")
-let outOfRange: array<rule> => rule
-
-@ocaml.doc("
- The :read-only CSS pseudo-class represents an element (such as input or textarea)
- that is not editable by the user.
- ")
-let readOnly: array<rule> => rule
-
-@ocaml.doc("
- The :read-write CSS pseudo-class represents an element (such as input or textarea)
- that is editable by the user.
- ")
-let readWrite: array<rule> => rule
-
-@ocaml.doc("
- The :required CSS pseudo-class represents any <input>, <select>, or <textarea> element
- that has the required attribute set on it.
- ")
-let required: array<rule> => rule
-
-//let right: array(rule) => rule;
-
-@ocaml.doc("
- The :root CSS pseudo-class matches the root element of a tree representing the document.
- In HTML, :root represents the <html> element and is identical to the selector html,
- except that its specificity is higher.
- ")
-let root: array<rule> => rule
-
-@ocaml.doc("
- The :scope CSS pseudo-class represents elements that are a reference point for selectors to match against.
- ")
-let scope: array<rule> => rule
-
-@ocaml.doc("
- The :target CSS pseudo-class represents a unique element (the target element) with an id matching
- the URL's fragment.
- ")
-let target: array<rule> => rule
-
-@ocaml.doc("
- The :valid CSS pseudo-class represents any <input> or other <form> element whose contents validate successfully.
- This allows to easily make valid fields adopt an appearance that helps the user confirm that their data is formatted properly.
- ")
-let valid: array<rule> => rule
-
-@ocaml.doc("
- The :visited CSS pseudo-class represents links that the user has already visited.
- For privacy reasons, the styles that can be modified using this selector are very limited.
- ")
-let visited: array<rule> => rule
-
-/*
- Pseudo-elements selectors
-
- A CSS pseudo-element is a keyword added to a selector that lets you style a specific part of the selected element(s).
- */
-
-@ocaml.doc("
- ::after creates a pseudo-element that is the last child of the selected element.
- It is often used to add cosmetic content to an element with the content property. It is inline by default.
- ")
-let after: array<rule> => rule
-
-@ocaml.doc("
- ::before creates a pseudo-element that is the first child of the selected element.
- It is often used to add cosmetic content to an element with the content property. It is inline by default.
- ")
-let before: array<rule> => rule
-
-@ocaml.doc("
- The ::first-letter CSS pseudo-element applies styles to the first letter of the first line of a block-level element,
- but only when not preceded by other content (such as images or inline tables).
- ")
-let firstLetter: array<rule> => rule
-
-@ocaml.doc("
,L��

�
,")
-let firstLine: array<rule> => rule
-
-@ocaml.doc("
- The ::placeholder CSS pseudo-element represents the placeholder text in an <input> or <textarea> element.
- ")
-let placeholder: array<rule> => rule
-
-@ocaml.doc("
- The ::selection CSS pseudo-element applies styles to the part of a document that has been highlighted by the user
- (such as clicking and dragging the mouse across text).
- ")
-let selection: array<rule> => rule
-
-@ocaml.doc("
- Combinators selectors
- ")
-@ocaml.doc("
- The > combinator selects nodes that are direct children of the first element.
- ")
-let child: (string, array<rule>) => rule
-
-@ocaml.doc("
- The > * combinator selects all nodes that are direct children of the first element.
- ")
-let children: array<rule> => rule
-
-@ocaml.doc("
- The + combinator selects adjacent siblings.
- This means that the second element directly follows the first, and both share the same parent.
- ")
-let directSibling: array<rule> => rule
-
-@ocaml.doc("
- The ~ combinator selects siblings.
- This means that the second element follows the first (though not necessarily immediately),
- and both share the same parent.
- ")
-let siblings: array<rule> => rule
-
-/* !experimental! */
-
-let anyLink: array<rule> => rule
-
-/* **************************************************
- Constructor aliases, for ease of use.
- Refer to the equivalent function in the type module.
- **************************************************** */
-
-let initial: [> Types.Cascading.t]
-let inherit_: [> Types.Cascading.t]
-let unset: [> Types.Cascading.t]
-
-let var: string => [> Types.Var.t]
-let varDefault: (string, string) => [> Types.Var.t]
-
-// shared
-let auto: [> #auto]
-let none: [> #none]
-let text: [> #text]
-
-let pct: float => [> Types.Percentage.t]
-
-let ch: float => [> #ch(float)]
-let cm: float => [> #cm(float)]
-let em: float => [> #em(float)]
-let ex: float => [> #ex(float)]
-let mm: float => [> #mm(float)]
-let pt: int => [> #pt(int)]
-let px: int => [> #px(int)]
-let pxFloat: float => [> #pxFloat(float)]
-let rem: float => [> #rem(float)]
-let vh: float => [> #vh(float)]
-let vmin: float => [> #vmin(float)]
-let vmax: float => [> #vmax(float)]
-let zero: [> #zero]
-
-let deg: float => Types.Angle.t
-let rad: float => Types.Angle.t
-let grad: float => Types.Angle.t
-let turn: float => Types.Angle.t
-
-let ltr: [> Types.Direction.t]
-let rtl: [> Types.Direction.t]
-
-let absolute: [> Types.Position.t]
-let relative: [> Types.Position.t]
-let static: [> Types.Position.t]
-let fixed: [> #fixed]
-let sticky: [> Types.Position.t]
-
-let horizontal: [> Types.Resize.t]
-let vertical: [> Types.Resize.t]
-
-let smallCaps: [> Types.FontVariant.t]
-
-/* let normal: [> | Types.FontStyle.t] */
-let italic: [> Types.FontStyle.t]
-let oblique: [> Types.FontStyle.t]
-
-let hidden: [> #hidden]
-let visible: [> #visible]
-let scroll: [> #scroll]
-
-let rgb: (int, int, int) => [> Types.Color.t]
-let rgba: (int, int, int, [#num(float) | #percent(float)]) => [> Types.Color.t]
-let hsl: (Types.Angle.t, Types.Percentage.t, Types.Percentage.t) => [> Types.Color.t]
-let hsla: (
-  Types.Angle.t,
-  Types.Percentage.t,
-  Types.Percentage.t,
-  [#num(float) | #percent(float)],
-) => [> Types.Color.t]
-let hex: string => [> Types.Color.t]
-let transparent: [> Types.Color.t]
-let currentColor: [> Types.Color.t]
-
-let local: [> #local]
-
-let paddingBox: [> #paddingBox]
-let borderBox: [> #borderBox]
-let contentBox: [> #contentBox]
-
-let noRepeat: [> #noRepeat]
-let space: [> #space]
-let repeat: [> #repeat]
-let minmax: [> #minmax]
-let repeatX: [> #repeatX]
-let repeatY: [> #repeatY]
-let contain: [> #contain]
-let cover: [> #cover]
-
-let row: [> #row]
-let rowReverse: [> #rowReverse]
-let column: [> #column]
-let columnReverse: [> #columnReverse]
-let wrap: [> #wrap]
-let nowrap: [> #nowrap]
-let wrapReverse: [> #wrapReverse]
-
-let inline: [> #inline]
-let block: [> #block]
-let contents: [> #contents]
-let flexBox: [> #flex]
-let grid: [> #grid]
-let inlineBlock: [> #inlineBlock]
-let inlineFlex: [> #inlineFlex]
-let inlineGrid: [> #inlineGrid]
-let inlineTable: [> #inlineTable]
-let listItem: [> #listItem]
-let runIn: [> #runIn]
-let table: [> #table]
-let tableCaption: [> #tableCaption]
-let tableColumnGroup: [> #tableColumnGroup]
-let tableHeaderGroup: [> #tableHeaderGroup]
-let tableFooterGroup: [> #tableFooterGroup]
-let tableRowGroup: [> #tableRowGroup]
-let tableCell: [> #tableCell]
-let tableColumn: [> #tableColumn]
-let tableRow: [> #tableRow]
-
-let flexStart: [> #flexStart]
-let flexEnd: [> #flexEnd]
-let center: [> #center]
-let stretch: [> #stretch]
-let spaceBetween: [> #spaceBetween]
-let spaceAround: [> #spaceAround]
-let spaceEvenly: [> #spaceEvenly]
-let baseline: [> #baseline]
-
-let forwards: [> #forwards]
-let backwards: [> #backwards]
-let both: [> #both]
-let infinite: [> #infinite]
-let count: int => [> #count(int)]
-let paused: [> #paused]
-let running: [> #running]
-
-let inside: [> #inside]
-let outside: [> #outside]
-
-let solid: [> #solid]
-let dotted: [> #dotted]
-let dashed: [> #dashed]
-
-let underline: [> #underline]
-let overline: [> #overline]
-let lineThrough: [> #lineThrough]
-
-let clip: [> #clip]
-let ellipsis: [> #ellipsis]
-
-let wavy: [> #wavy]
-let double: [> #double]
-
-let uppercase: [> #uppercase]
-let lowercase: [> #lowercase]
-let capitalize: [> #capitalize]
-
-let sub: [> #sub]
-let super: [> #super]
-let textTop: [> #textTop]
-let textBottom: [> #textBottom]
-let middle: [> #middle]
-
-let normal: [> #normal]
-
-let breakAll: [> #breakAll]
-let keepAll: [> #keepAll]
-let breakWord: [> #breakWord]
-
-let reverse: [> #reverse]
-let alternate: [> #alternate]
-let alternateReverse: [> #alternateReverse]
-
-let fill: [> #fill]
-let content: [> #content]
-let maxContent: [> #maxContent]
-let minContent: [> #minContent]
-let fitContent: [> #fitContent]
-
-let all: [> #all]
-
-let round: [> #round]
-let miter: [> #miter]
-let bevel: [> #bevel]
-let butt: [> #butt]
-let square: [> #square]
-
-let thin: [> Types.FontWeight.t]
-let extraLight: [> Types.FontWeight.t]
-let light: [> Types.FontWeight.t]
-let medium: [> Types.FontWeight.t]
-let semiBold: [> Types.FontWeight.t]
-let bold: [> Types.FontWeight.t]
-let extraBold: [> Types.FontWeight.t]
-let lighter: [> Types.FontWeight.t]
-let bolder: [> Types.FontWeight.t]
-
-let fr: float => [> #fr(float)]
-let vw: float => [> #vw(float)]
-
-let localUrl: string => [> #localUrl(string)]
-let url: string => [> #url(string)]
-
-let linear: [> Types.TimingFunction.t]
-let ease: [> Types.TimingFunction.t]
-let easeIn: [> Types.TimingFunction.t]
-let easeOut: [> Types.TimingFunction.t]
-let easeInOut: [> Types.TimingFunction.t]
-let stepStart: [> Types.TimingFunction.t]
-let stepEnd: [> Types.TimingFunction.t]
-let steps: (int, [#start | #end_]) => [> Types.TimingFunction.t]
-let cubicBezier: (float, float, float, float) => [> Types.TimingFunction.t]
-
-let marginBox: [> Types.GeometyBox.t]
-//let borderBox: [> Types.GeometyBox.t];
-//let paddingBox: [> Types.GeometyBox.t];
-//let contentBox: [> Types.GeometyBox.t];
-let fillBox: [> Types.GeometyBox.t]
-let strokeBox: [> Types.GeometyBox.t]
-let viewBox: [> Types.GeometyBox.t]
-
-let translate: (Types.Length.t, Types.Length.t) => [> Types.Transform.t]
-let translate3d: (Types.Length.t, Types.Length.t, Types.Length.t) => [> Types.Transform.t]
-let translateX: Types.Length.t => [> Types.Transform.t]
-let translateY: Types.Length.t => [> Types.Transform.t]
-let translateZ: Types.Length.t => [> Types.Transform.t]
-let scale: (float, float) => [> Types.Transform.t]
-let scale3d: (float, float, float) => [> Types.Transform.t]
-let scaleX: float => [> Types.Transform.t]
-let scaleY: float => [> Types.Transform.t]
-let scaleZ: float => [> Types.Transform.t]
-let rotate: Types.Angle.t => [> Types.Transform.t]
-let rotate3d: (float, float, float, Types.Angle.t) => [> Types.Transform.t]
-let rotateX: Types.Angle.t => [> Types.Transform.t]
-let rotateY: Types.Angle.t => [> Types.Transform.t]
-let rotateZ: Types.Angle.t => [> Types.Transform.t]
-let skew: (Types.Angle.t, Types.Angle.t) => [> Types.Transform.t]
-let skewX: Types.Angle.t => [> Types.Transform.t]
-let skewY: Types.Angle.t => [> Types.Transform.t]
-
-let linearGradient: (
-  Types.Angle.t,
-  list<(Types.Length.t, [< Types.Color.t | Types.Var.t] as 'colorOrVar)>,
-) => [> Types.Gradient.t<'colorOrVar>]
-let repeatingLinearGradient: (
-  Types.Angle.t,
-  list<(Types.Length.t, [< Types.Color.t | Types.Var.t] as 'colorOrVar)>,
-) => [> Types.Gradient.t<'colorOrVar>]
-let radialGradient: list<(Types.Length.t, [< Types.Color.t | Types.Var.t] as 'colorOrVar)> => [>
-  | Types.Gradient.t<'colorOrVar>
-]
-let repeatingRadialGradient: list<(
-  Types.Length.t,
-  [< Types.Color.t | Types.Var.t] as 'colorOrVar,
-)> => [> Types.Gradient.t<'colorOrVar>]
-
-let areas: list<string> => [> Types.GridTemplateAreas.t]
-let ident: string => [> Types.GridArea.t]
-let numIdent: (int, string) => [> Types.GridArea.t]
-
-// cursor aliases
-//let auto: [> Types.Cursor.t];
-//let default: [> Types.Cursor.t];
-//let none: [> Types.Cursor.t];
-let contextMenu: [> Types.Cursor.t]
-let help: [> Types.Cursor.t]
-let pointer: [> Types.Cursor.t]
-let progress: [> Types.Cursor.t]
-let wait: [> Types.Cursor.t]
-let cell: [> Types.Cursor.t]
-let crosshair: [> Types.Cursor.t]
-//let text: [> Types.Cursor.t];
-let verticalText: [> Types.Cursor.t]
-let alias: [> Types.Cursor.t]
-let copy: [> Types.Cursor.t]
-let move: [> Types.Cursor.t]
-let noDrop: [> Types.Cursor.t]
-let notAllowed: [> Types.Cursor.t]
-let grab: [> Types.Cursor.t]
-let grabbing: [> Types.Cursor.t]
-let allScroll: [> Types.Cursor.t]
-let colResize: [> Types.Cursor.t]
-let rowResize: [> Types.Cursor.t]
-let nResize: [> Types.Cursor.t]
-let eResize: [> Types.Cursor.t]
-let sResize: [> Types.Cursor.t]
-let wResize: [> Types.Cursor.t]
-let neResize: [> Types.Cursor.t]
-let nwResize: [> Types.Cursor.t]
-let seResize: [> Types.Cursor.t]
-let swResize: [> Types.Cursor.t]
-let ewResize: [> Types.Cursor.t]
-let nsResize: [> Types.Cursor.t]
-let neswResize: [> Types.Cursor.t]
-let nwseResize: [> Types.Cursor.t]
-let zoomIn: [> Types.Cursor.t]
-let zoomOut: [> Types.Cursor.t]
-
-/* *******************************************************
- ********************************************************
- ******************************************************* */
-
-let flex3: (~grow: float, ~shrink: float, ~basis: [< Types.Length.t | Types.FlexBasis.t]) => rule
-
-let border: (
-  Types.Length.t,
-  [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t],
-  [< Types.Color.t | Types.Var.t],
-) => rule
-let borderTop: (
-  Types.Length.t,
-  [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t],
-  [< Types.Color.t | Types.Var.t],
-) => rule
-let backgroundSize: [#size(Types.Length.t, Types.Length.t) | #auto | #cover | #contain] => rule
-
-let textDecoration: [
-  | #none
-  | #underline
-  | #overline
-  | #lineThrough
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-let background: [< Types.Color.t | Types.Url.t | Types.Gradient.t<'gradient> | #none] => rule
-let backgrounds: array<
-  [< Types.Color.t | Types.Url.t | Types.Gradient.t<'gradient> | #none],
-> => rule
-
-type minmax = [
-  | #fr(float)
-  | #minContent
-  | #maxContent
-  | #auto
-  | Types.Length.t
-]
-
-type trackLength = [
-  | Types.Length.t
-  | #auto
-  | #fr(float)
-  | #minContent
-  | #maxContent
-  | #minmax(minmax, minmax)
-]
-type gridLength = [trackLength | #repeat(Types.RepeatValue.t, trackLength)]
-
-let gridAutoColumns: [< trackLength | #auto] => rule
-let gridAutoRows: [< trackLength | #auto] => rule
-let gridTemplateColumns: array<[< gridLength | #auto]> => rule
-let gridTemplateRows: array<[< gridLength | #auto]> => rule
-
-module Calc: {
-  let \"-": (Types.Length.t, Types.Length.t) => [> Types.Length.t]
-  let \"+": (Types.Length.t, Types.Length.t) => [> Types.Length.t]
-}
-
-let size: (Types.Length.t, Types.Length.t) => [> #size(Types.Length.t, Types.Length.t)]
-
-type filter = [
-  | #blur(Types.Length.t)
-  | #brightness(float)
-  | #contrast(float)
-  | #dropShadow(Types.Length.t, Types.Length.t, Types.Length.t, Types.Color.t)
-  | #grayscale(float)
-  | #hueRotate(Types.Angle.t)
-  | #invert(float)
-  | #opacity(float)
-  | #saturate(float)
-  | #sepia(float)
-  | #none
-  | Types.Url.t
-  | Types.Var.t
-  | Types.Cascading.t
-]
-
-let filter: array<filter> => rule
-
-let fontFace: (
-  ~fontFamily: string,
-  ~src: array<[< #localUrl(string) | Types.Url.t]>,
-  ~fontStyle: Types.FontStyle.t=?,
-  ~fontWeight: [< Types.FontWeight.t | Types.Var.t | Types.Cascading.t]=?,
-  ~fontDisplay: Types.FontDisplay.t=?,
-  unit,
-) => string
-
-@ocaml.doc("
-  * Transition
-  ")
-module Transition: {
-  type t = [#value(string)]
-
-  let shorthand: (
-    ~duration: int=?,
-    ~delay: int=?,
-    ~timingFunction: Types.TimingFunction.t=?,
-    string,
-  ) => [> t]
-
-  let toString: t => string
-}
-
-let transitionValue: Transition.t => rule
-let transitionList: array<[Transition.t]> => rule
-
-let transition: (
-  ~duration: int=?,
-  ~delay: int=?,
-  ~timingFunction: Types.TimingFunction.t=?,
-  string,
-) => rule
-let transitions: array<[Transition.t]> => rule
-
-@ocaml.doc("
- * Animation
- ")
-module Animation: {
-  type t = [#value(string)]
-
-  let shorthand: (
-    ~duration: int=?,
-    ~delay: int=?,
-    ~direction: Types.AnimationDirection.t=?,
-    ~timingFunction: Types.TimingFunction.t=?,
-    ~fillMode: Types.AnimationFillMode.t=?,
-    ~playState: Types.AnimationPlayState.t=?,
-    ~iterationCount: Types.AnimationIterationCount.t=?,
-    animationName,
-  ) => [> t]
-
-  let toString: t => string
-}
-
-let animationValue: Animation.t => rule
-let animation: (
-  ~duration: int=?,
-  ~delay: int=?,
-  ~direction: Types.AnimationDirection.t=?,
-  ~timingFunction: Types.TimingFunction.t=?,
-  ~fillMode: Types.AnimationFillMode.t=?,
-  ~playState: Types.AnimationPlayState.t=?,
-  ~iterationCount: Types.AnimationIterationCount.t=?,
-  animationName,
-) => rule
-let animations: array<[Animation.t]> => rule
-
-let animationName: animationName => rule
-
-/**
- SVG
- *** */
-
-module SVG: {
-  let fill: [< Types.SVG.Fill.t | Types.Color.t | Types.Var.t | Types.Url.t] => rule
-  let fillRule: [#nonzero | #evenodd] => rule
-  let fillOpacity: float => rule
-  let stroke: [< Types.Color.t | Types.Var.t] => rule
-  let strokeDasharray: [<
-    | #none
-    | #dasharray(array<[< Types.Length.t | Types.Percentage.t]>)
-  ] => rule
-  let strokeLinecap: [#butt | #round | #square] => rule
-  let strokeLinejoin: [#miter | #round | #bevel] => rule
-  let strokeMiterlimit: float => rule
-  let strokeWidth: Types.Length.t => rule
-  let strokeOpacity: float => rule
-  let stopColor: [< Types.Color.t | Types.Var.t] => rule
-  let stopOpacity: float => rule
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Css_Legacy_Core.res b/jscomp/syntax/tests/idempotency/bs-css/Css_Legacy_Core.res
deleted file mode 100644
index 1470459..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Css_Legacy_Core.res
+++ /dev/null
@@ -1,1924 +0,0 @@
-module Types = Css_AtomicTypes
-open Css_AtomicTypes
-
-type rec rule =
-  | D(string, string) // Declaration
-  | S(string, list<rule>) // Selector
-  | PseudoClass(string, list<rule>)
-  | PseudoClassParam(string, string, list<rule>)
-
-let rec ruleToDict = (dict, rule) => {
-  switch rule {
-  | D(name, value) if name == "content" =>
-    dict->Js.Dict.set(name, Js.Json.string(value == "" ? "\"\"" : value))
-  | D(name, value) => dict->Js.Dict.set(name, Js.Json.string(value))
-  | S(name, ruleset) => dict->Js.Dict.set(name, toJson(ruleset))
-  | PseudoClass(name, ruleset) => dict->Js.Dict.set(":" ++ name, toJson(ruleset))
-  | PseudoClassParam(name, param, ruleset) =>
-    dict->Js.Dict.set(":" ++ (name ++ ("(" ++ (param ++ ")"))), toJson(ruleset))
-  }
-  dict
-}
-
-and toJson = rules => rules->Belt.List.reduce(Js.Dict.empty(), ruleToDict)->Js.Json.object_
-
-let addStop = (dict, (stop, rules)) => {
-  Js.Dict.set(dict, Js.Int.toString(stop) ++ "%", toJson(rules))
-  dict
-}
-
-module Make = (CssImplementation: Css_Core.CssImplementationIntf) => {
-  let merge = stylenames => CssImplementation.mergeStyles(. stylenames->Array.of_list)
-
-  let insertRule = s => CssImplementation.injectRaw(. s)
-
-  let style = rules => CssImplementation.make(. rules->toJson)
-
-  let global = (selector, rules: list<rule>) =>
-    CssImplementation.injectRule(.
-      list{(selector, toJson(rules))}->Js.Dict.fromList->Js.Json.object_,
-    )
-
-  let keyframes = frames =>
-    CssImplementation.makeKeyFrames(. List.fold_left(addStop, Js.Dict.empty(), frames))
-}
-
-let join = (strings, separator) => {
-  let rec run = (strings, acc) =>
-    switch strings {
-    | list{} => acc
-    | list{x} => acc ++ x
-    | list{x, ...xs} => run(xs, acc ++ (x ++ separator))
-    }
-  run(strings, "")
-}
-
-module Converter = {
-  let string_of_stops = stops =>
-    stops->Belt.List.map(((l, c)) => Color.toString(c) ++ (" " ++ Length.toString(l)))->join(", ")
-
-  let string_of_time = t => Js.Int.toString(t) ++ "ms"
-
-  let string_of_content = x =>
-    switch x {
-    | #...Content.t as c => Content.toString(c)
-    | #...Counter.t as c => Counter.toString(c)
-    | #...Counters.t as c => Counters.toString(c)
-    | #...Gradient.t as g => Gradient.toString(g)
-    | #...Url.t as u => Url.toString(u)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-  let string_of_counter_increment = x =>
-    switch x {
-    | #...CounterIncrement.t as o => CounterIncrement.toString(o)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-  let string_of_counter_reset = x =>
-    switch x {
-    | #...CounterReset.t as o => CounterReset.toString(o)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-  let string_of_counter_set = x =>
-    switch x {
-    | #...CounterSet.t as o => CounterSet.toString(o)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-
-  let string_of_column_gap = x =>
-    switch x {
-    | #...ColumnGap.t as gcg => ColumnGap.toString(gcg)
-    | #...Percentage.t as p => Percentage.toString(p)
-    | #...Length.t as l => Length.toString(l)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-
-  let string_of_position = x =>
-    switch x {
-    | #auto => "auto"
-    | #...Length.t as l => Length.toString(l)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    }
-
-  let string_of_color = x =>
-    switch x {
-    | #...Color.t as co => Color.toString(co)
-    | #...Var.t as va => Var.toString(va)
-    }
-
-  let string_of_dasharray = x =>
-    switch x {
-    | #...Percentage.t as p => Percentage.toString(p)
-    | #...Length.t as l => Length.toString(l)
-    }
-}
-
-include Converter
-
-type animationName = string
-
-let important = v =>
-  switch v {
-  | D(name, value) => D(name, value ++ " !important")
-  | S(_, _)
-  | PseudoClass(_, _)
-  | PseudoClassParam(_, _, _) => v
-  }
-
-let label = label => D("label", label)
-
-/* Properties */
-
-let alignContent = x => D(
-  "alignContent",
-  switch x {
-  | #...AlignContent.t as ac => AlignContent.toString(ac)
-  | #...NormalAlignment.t as na => NormalAlignment.toString(na)
-  | #...BaselineAlignment.t as ba => BaselineAlignment.toString(ba)
-  | #...DistributedAlignment.t as da => DistributedAlignment.toString(da)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let alignItems = x => D(
-  "alignItems",
-  switch x {
-  | #...AlignItems.t as ai => AlignItems.toString(ai)
-  | #...PositionalAlignment.t as pa => PositionalAlignment.toString(pa)
-  | #...BaselineAlignment.t as ba => BaselineAlignment.toString(ba)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let alignSelf = x => D(
-  "alignSelf",
-  switch x {
-  | #...AlignSelf.t as a => AlignSelf.toString(a)
-  | #...PositionalAlignment.t as pa => PositionalAlignment.toString(pa)
-  | #...BaselineAlignment.t as ba => BaselineAlignment.toString(ba)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let animationDelay = x => D("animationDelay", string_of_time(x))
-
-let animationDirection = x => D("animationDirection", AnimationDirection.toString(x))
-
-let animationDuration = x => D("animationDuration", string_of_time(x))
-
-let animationFillMode = x => D("animationFillMode", AnimationFillMode.toString(x))
-
-let animationIterationCount = x => D("animationIterationCount", AnimationIterationCount.toString(x))
-
-let animationPlayState = x => D("animationPlayState", AnimationPlayState.toString(x))
-
-let animationTimingFunction = x => D("animationTimingFunction", TimingFunction.toString(x))
-
-let backfaceVisibility = x => D(
-  "backfaceVisibility",
-  switch x {
-  | #...BackfaceVisibility.t as bv => BackfaceVisibility.toString(bv)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let backdropFilter = x => D(
-  "backdrop-filter",
-  x->Belt.List.map(Types.BackdropFilter.toString)->join(", "),
-)
-
-let backgroundAttachment = x => D(
-  "backgroundAttachment",
-  switch x {
-  | #...BackgroundAttachment.t as ba => BackgroundAttachment.toString(ba)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let backgroundColor = x => D("backgroundColor", string_of_color(x))
-
-let backgroundClip = x => D(
-  "backgroundClip",
-  switch x {
-  | #...BackgroundClip.t as bc => BackgroundClip.toString(bc)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let backgroundImage = x => D(
-  "backgroundImage",
-  switch x {
-  | #...BackgroundImage.t as bi => BackgroundImage.toString(bi)
-  | #...Url.t as u => Url.toString(u)
-  | #...Gradient.t as g => Gradient.toString(g)
-  },
-)
-
-let backgroundOrigin = x => D(
-  "backgroundOrigin",
-  switch x {
-  | #...BackgroundOrigin.t as bo => BackgroundOrigin.toString(bo)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let string_of_backgroundposition = x =>
-  switch x {
-  | #...BackgroundPosition.t as bp => BackgroundPosition.toString(bp)
-  | #hv(h, v) =>
-    switch h {
-    | #...BackgroundPosition.X.t as h => BackgroundPosition.X.toString(h)
-    | #...Length.t as l => Length.toString(l)
-    } ++
-    (" " ++
-    switch v {
-    | #...BackgroundPosition.Y.t as v => BackgroundPosition.Y.toString(v)
-    | #...Length.t as l => Length.toString(l)
-    })
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  }
-
-let backgroundPosition = x => D("backgroundPosition", string_of_backgroundposition(x))
-
-let backgroundPositions = bp => D(
-  "backgroundPosition",
-  bp->Belt.List.map(string_of_backgroundposition)->join(", "),
-)
-
-let backgroundPosition4 = (~x, ~offsetX, ~y, ~offsetY) => D(
-  "backgroundPosition",
-  BackgroundPosition.X.toString(x) ++
-  (" " ++
-  (Length.toString(offsetX) ++
-  (" " ++
-  (BackgroundPosition.Y.toString(y) ++ (" " ++ Length.toString(offsetY)))))),
-)
-
-let backgroundRepeat = x => D(
-  "backgroundRepeat",
-  switch x {
-  | #...BackgroundRepeat.t as br => BackgroundRepeat.toString(br)
-  | #hv(#...BackgroundRepeat.horizontal as h, #...BackgroundRepeat.vertical as v) =>
-    BackgroundRepeat.toString(h) ++ (" " ++ BackgroundRepeat.toString(v))
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let borderBottomColor = x => D("borderBottomColor", string_of_color(x))
-
-let borderBottomLeftRadius = x => D("borderBottomLeftRadius", Length.toString(x))
-
-let borderBottomRightRadius = x => D("borderBottomRightRadius", Length.toString(x))
-
-let borderBottomWidth = x => D("borderBottomWidth", Length.toString(x))
-
-let borderCollapse = x => D(
-  "borderCollapse",
-  switch x {
-  | #...BorderCollapse.t as bc => BorderCollapse.toString(bc)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let borderColor = x => D("borderColor", string_of_color(x))
-
-let borderLeftColor = x => D("borderLeftColor", string_of_color(x))
-
-let borderLeftWidth = x => D("borderLeftWidth", Length.toString(x))
-
-let borderSpacing = x => D("borderSpacing", Length.toString(x))
-
-let borderRadius = x => D("borderRadius", Length.toString(x))
-
-let borderRightColor = x => D("borderRightColor", string_of_color(x))
-
-let borderRightWidth = x => D("borderRightWidth", Length.toString(x))
-
-let borderTopColor = x => D("borderTopColor", string_of_color(x))
-
-let borderTopLeftRadius = x => D("borderTopLeftRadius", Length.toString(x))
-
-let borderTopRightRadius = x => D("borderTopRightRadius", Length.toString(x))
-
-let borderTopWidth = x => D("borderTopWidth", Length.toString(x))
-
-let borderWidth = x => D("borderWidth", Length.toString(x))
-
-let bottom = x => D("bottom", string_of_position(x))
-
-let boxSizing = x => D(
-  "boxSizing",
-  switch x {
-  | #...BoxSizing.t as bs => BoxSizing.toString(bs)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let clear = x => D(
-  "clear",
-  switch x {
-  | #...Clear.t as cl => Clear.toString(cl)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let clipPath = x => D(
-  "clipPath",
-  switch x {
-  | #...ClipPath.t as cp => ClipPath.toString(cp)
-  | #...Url.t as u => Url.toString(u)
-  | #...GeometyBox.t as gb => GeometyBox.toString(gb)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let color = x => D("color", string_of_color(x))
-
-let columnCount = x => D(
-  "columnCount",
-  switch x {
-  | #...ColumnCount.t as cc => ColumnCount.toString(cc)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let columnGap = x => D("columnGap", string_of_column_gap(x))
-
-let contentRule = x => D("content", string_of_content(x))
-let contentRules = xs => D("content", xs->Belt.List.map(string_of_content)->join(" "))
-
-let counterIncrement = x => D("counter-increment", string_of_counter_increment(x))
-let countersIncrement = xs => D(
-  "counter-increment",
-  xs->Belt.List.map(string_of_counter_increment)->join(" "),
-)
-
-let counterReset = x => D("counter-reset", string_of_counter_reset(x))
-let countersReset = xs => D("counter-reset", xs->Belt.List.map(string_of_counter_reset)->join(" "))
-
-let counterSet = x => D("counter-set", string_of_counter_set(x))
-let countersSet = xs => D("counter-set", xs->Belt.List.map(string_of_counter_set)->join(" "))
-
-let cursor = x => D("cursor", Cursor.toString(x))
-
-let direction = x => D(
-  "direction",
-  switch x {
-  | #...Direction.t as d => Direction.toString(d)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let display = x => D(
-  "display",
-  switch x {
-  | #...DisplayOutside.t as o => DisplayOutside.toString(o)
-  | #...DisplayInside.t as i => DisplayInside.toString(i)
-  | #...DisplayListItem.t as l => DisplayListItem.toString(l)
-  | #...DisplayInternal.t as i' => DisplayInternal.toString(i')
-  | #...DisplayBox.t as b => DisplayBox.toString(b)
-  | #...DisplayLegacy.t as l' => DisplayLegacy.toString(l')
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let flex = x => D(
-  "flex",
-  switch x {
-  | #...Flex.t as f => Flex.toString(f)
-  | #num(n) => Js.Float.toString(n)
-  },
-)
-
-let flexDirection = x => D(
-  "flexDirection",
-  switch x {
-  | #...FlexDirection.t as fd => FlexDirection.toString(fd)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let flexGrow = x => D("flexGrow", Js.Float.toString(x))
-
-let flexShrink = x => D("flexShrink", Js.Float.toString(x))
-
-let flexWrap = x => D(
-  "flexWrap",
-  switch x {
-  | #...FlexWrap.t as fw => FlexWrap.toString(fw)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let float = x => D(
-  "float",
-  switch x {
-  | #...Float.t as f => Float.toString(f)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let fontFamily = x => D(
-  "fontFamily",
-  switch x {
-  | #...FontFamilyName.t as n => FontFamilyName.toString(n)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let fontFamilies = xs => D("fontFamily", xs->Belt.List.map(FontFamilyName.toString)->join(", "))
-
-let fontSize = x => D(
-  "fontSize",
-  switch x {
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let fontStyle = x => D(
-  "fontStyle",
-  switch x {
-  | #...FontStyle.t as f => FontStyle.toString(f)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let fontVariant = x => D(
-  "fontVariant",
-  switch x {
-  | #...FontVariant.t as f => FontVariant.toString(f)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let fontWeight = x => D(
-  "fontWeight",
-  switch x {
-  | #...FontWeight.t as f => FontWeight.toString(f)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let gridAutoFlow = x => D(
-  "gridAutoFlow",
-  switch x {
-  | #...GridAutoFlow.t as f => GridAutoFlow.toString(f)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let gridColumn = (start, end') => D(
-  "gridColumn",
-  Js.Int.toString(start) ++ (" / " ++ Js.Int.toString(end')),
-)
-
-let gridColumnGap = x => D("gridColumnGap", string_of_column_gap(x))
-
-let gridColumnStart = n => D("gridColumnStart", Js.Int.toString(n))
-
-let gridColumnEnd = n => D("gridColumnEnd", Js.Int.toString(n))
-
-let gridRow = (start, end') => D(
-  "gridRow",
-  Js.Int.toString(start) ++ (" / " ++ Js.Int.toString(end')),
-)
-
-let gridGap = x => D(
-  "gridGap",
-  switch x {
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let gridRowGap = x => D(
-  "gridRowGap",
-  switch x {
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let gridRowEnd = n => D("gridRowEnd", Js.Int.toString(n))
-
-let gridRowStart = n => D("gridRowStart", Js.Int.toString(n))
-
-let height = x => D(
-  "height",
-  switch x {
-  | #...Height.t as h => Height.toString(h)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let justifyContent = x => D(
-  "justifyContent",
-  switch x {
-  | #...PositionalAlignment.t as pa => PositionalAlignment.toString(pa)
-  | #...NormalAlignment.t as na => NormalAlignment.toString(na)
-  | #...DistributedAlignment.t as da => DistributedAlignment.toString(da)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let justifyItems = x => D(
-  "justifyItems",
-  switch x {
-  | #...PositionalAlignment.t as pa => PositionalAlignment.toString(pa)
-  | #...NormalAlignment.t as na => NormalAlignment.toString(na)
-  | #...BaselineAlignment.t as ba => BaselineAlignment.toString(ba)
-  | #...OverflowAlignment.t as oa => OverflowAlignment.toString(oa)
-  | #...LegacyAlignment.t as la => LegacyAlignment.toString(la)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let left = x => D("left", string_of_position(x))
-
-let letterSpacing = x => D(
-  "letterSpacing",
-  switch x {
-  | #...LetterSpacing.t as s => LetterSpacing.toString(s)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let lineHeight = x => D(
-  "lineHeight",
-  switch x {
-  | #...LineHeight.t as h => LineHeight.toString(h)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let listStyle = (style, position, image) => D(
-  "listStyle",
-  ListStyleType.toString(style) ++
-  (" " ++
-  (ListStylePosition.toString(position) ++
-  (" " ++
-  switch image {
-  | #...ListStyleImage.t as lsi => ListStyleImage.toString(lsi)
-  | #...Url.t as u => Url.toString(u)
-  }))),
-)
-
-let listStyleImage = x => D(
-  "listStyleImage",
-  switch x {
-  | #...ListStyleImage.t as lsi => ListStyleImage.toString(lsi)
-  | #...Url.t as u => Url.toString(u)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let listStyleType = x => D(
-  "listStyleType",
-  switch x {
-  | #...ListStyleType.t as lsp => ListStyleType.toString(lsp)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let listStylePosition = x => D(
-  "listStylePosition",
-  switch x {
-  | #...ListStylePosition.t as lsp => ListStylePosition.toString(lsp)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let marginToString = x =>
-  switch x {
-  | #...Length.t as l => Length.toString(l)
-  | #...Margin.t as m => Margin.toString(m)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  }
-
-let margin = x => D("margin", marginToString(x))
-let margin2 = (~v, ~h) => D("margin", marginToString(v) ++ (" " ++ marginToString(h)))
-let margin3 = (~top, ~h, ~bottom) => D(
-  "margin",
-  marginToString(top) ++ (" " ++ (marginToString(h) ++ (" " ++ marginToString(bottom)))),
-)
-let margin4 = (~top, ~right, ~bottom, ~left) => D(
-  "margin",
-  marginToString(top) ++
-  (" " ++
-  (marginToString(right) ++ (" " ++ (marginToString(bottom) ++ (" " ++ marginToString(left)))))),
-)
-let marginLeft = x => D("marginLeft", marginToString(x))
-let marginRight = x => D("marginRight", marginToString(x))
-let marginTop = x => D("marginTop", marginToString(x))
-let marginBottom = x => D("marginBottom", marginToString(x))
-
-let maxHeight = x => D(
-  "maxHeight",
-  switch x {
-  | #...MaxHeight.t as mh => MaxHeight.toString(mh)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let maxWidth = x => D(
-  "maxWidth",
-  switch x {
-  | #...MaxWidth.t as mw => MaxWidth.toString(mw)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let minHeight = x => D(
-  "minHeight",
-  switch x {
-  | #...Height.t as h => Height.toString(h)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let minWidth = x => D(
-  "minWidth",
-  switch x {
-  | #...Width.t as w => Width.toString(w)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let objectFit = x => D(
-  "objectFit",
-  switch x {
-  | #...ObjectFit.t as o => ObjectFit.toString(o)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let objectPosition = x => D("objectPosition", string_of_backgroundposition(x))
-
-let opacity = x => D("opacity", Js.Float.toString(x))
-
-let outline = (size, style, color) => D(
-  "outline",
-  Length.toString(size) ++
-  (" " ++
-  (OutlineStyle.toString(style) ++ (" " ++ string_of_color(color)))),
-)
-let outlineColor = x => D("outlineColor", string_of_color(x))
-let outlineOffset = x => D("outlineOffset", Length.toString(x))
-let outlineStyle = x => D("outlineStyle", OutlineStyle.toString(x))
-let outlineWidth = x => D("outlineWidth", Length.toString(x))
-
-let overflow = x => D("overflow", Overflow.toString(x))
-let overflowX = x => D("overflowX", Overflow.toString(x))
-let overflowY = x => D("overflowY", Overflow.toString(x))
-
-let overflowWrap = x => D(
-  "overflowWrap",
-  switch x {
-  | #...OverflowWrap.t as ow => OverflowWrap.toString(ow)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let padding = x => D("padding", Length.toString(x))
-let padding2 = (~v, ~h) => D("padding", Length.toString(v) ++ (" " ++ Length.toString(h)))
-let padding3 = (~top, ~h, ~bottom) => D(
-  "padding",
-  Length.toString(top) ++ (" " ++ (Length.toString(h) ++ (" " ++ Length.toString(bottom)))),
-)
-let padding4 = (~top, ~right, ~bottom, ~left) => D(
-  "padding",
-  Length.toString(top) ++
-  (" " ++
-  (Length.toString(right) ++ (" " ++ (Length.toString(bottom) ++ (" " ++ Length.toString(left)))))),
-)
-
-let paddingBottom = x => D("paddingBottom", Length.toString(x))
-
-let paddingLeft = x => D("paddingLeft", Length.toString(x))
-
-let paddingRight = x => D("paddingRight", Length.toString(x))
-
-let paddingTop = x => D("paddingTop", Length.toString(x))
-
-let perspective = x => D(
-  "perspective",
-  switch x {
-  | #...Perspective.t as p => Perspective.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let perspectiveOrigin = (x, y) => D(
-  "perspectiveOrigin",
-  switch x {
-  | #...Perspective.t as p => Perspective.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  } ++
-  (" " ++
-  switch y {
-  | #...Perspective.t as p => Perspective.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  }),
-)
-
-let pointerEvents = x => D(
-  "pointerEvents",
-  switch x {
-  | #...PointerEvents.t as p => PointerEvents.toString(p)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let position = x => D(
-  "position",
-  switch x {
-  | #...Position.t as p => Position.toString(p)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let justifySelf = x => D(
-  "justifySelf",
-  switch x {
-  | #...JustifySelf.t as j => JustifySelf.toString(j)
-  | #...PositionalAlignment.t as pa => PositionalAlignment.toString(pa)
-  | #...BaselineAlignment.t as ba => BaselineAlignment.toString(ba)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let resize = x => D(
-  "resize",
-  switch x {
-  | #...Resize.t as r => Resize.toString(r)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let right = x => D("right", string_of_position(x))
-
-let tableLayout = x => D(
-  "tableLayout",
-  switch x {
-  | #...TableLayout.t as tl => TableLayout.toString(tl)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textAlign = x => D(
-  "textAlign",
-  switch x {
-  | #...TextAlign.t as ta => TextAlign.toString(ta)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textDecorationColor = x => D(
-  "textDecorationColor",
-  switch x {
-  | #...Color.t as co => Color.toString(co)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textDecorationLine = x => D(
-  "textDecorationLine",
-  switch x {
-  | #...TextDecorationLine.t as tdl => TextDecorationLine.toString(tdl)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textDecorationStyle = x => D(
-  "textDecorationStyle",
-  switch x {
-  | #...TextDecorationStyle.t as tds => TextDecorationStyle.toString(tds)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textIndent = x => D(
-  "textIndent",
-  switch x {
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textOverflow = x => D(
-  "textOverflow",
-  switch x {
-  | #...TextOverflow.t as txo => TextOverflow.toString(txo)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textTransform = x => D(
-  "textTransform",
-  switch x {
-  | #...TextTransform.t as tt => TextTransform.toString(tt)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let top = x => D("top", string_of_position(x))
-
-let transform = x => D(
-  "transform",
-  switch x {
-  | #none => "none"
-  | #...Transform.t as t => Transform.toString(t)
-  },
-)
-
-let transforms = x => D("transform", x->Belt.List.map(Transform.toString)->join(" "))
-
-let transformOrigin = (x, y) => D(
-  "transformOrigin",
-  Length.toString(x) ++ (" " ++ Length.toString(y)),
-)
-
-let transformOrigin3d = (x, y, z) => D(
-  "transformOrigin",
-  Length.toString(x) ++ (" " ++ (Length.toString(y) ++ (" " ++ (Length.toString(z) ++ " ")))),
-)
-
-let unsafe = (property, value) => D(property, value)
-
-let userSelect = x => D(
-  "userSelect",
-  switch x {
-  | #...UserSelect.t as us => UserSelect.toString(us)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let verticalAlign = x => D(
-  "verticalAlign",
-  switch x {
-  | #...VerticalAlign.t as v => VerticalAlign.toString(v)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let visibility = x => D(
-  "visibility",
-  switch x {
-  | #...Visibility.t as v => Visibility.toString(v)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let width = x => D(
-  "width",
-  switch x {
-  | #...Width.t as w => Width.toString(w)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let whiteSpace = x => D(
-  "whiteSpace",
-  switch x {
-  | #...WhiteSpace.t as w => WhiteSpace.toString(w)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let wordBreak = x => D(
-  "wordBreak",
-  switch x {
-  | #...WordBreak.t as w => WordBreak.toString(w)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let wordSpacing = x => D(
-  "wordSpacing",
-  switch x {
-  | #...WordSpacing.t as w => WordSpacing.toString(w)
-  | #...Percentage.t as p => Percentage.toString(p)
-  | #...Length.t as l => Length.toString(l)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let wordWrap = overflowWrap
-
-let zIndex = x => D("zIndex", Js.Int.toString(x))
-
-/* Selectors */
-
-let media = (query, rules) => S("@media " ++ query, rules)
-let selector = (selector, rules) => S(selector, rules)
-let pseudoClass = (selector, rules) => PseudoClass(selector, rules)
-
-let active = pseudoClass("active")
-let checked = pseudoClass("checked")
-let default = pseudoClass("default")
-let defined = pseudoClass("defined")
-let disabled = pseudoClass("disabled")
-let empty = pseudoClass("empty")
-let enabled = pseudoClass("enabled")
-let first = pseudoClass("first")
-let firstChild = pseudoClass("first-child")
-let firstOfType = pseudoClass("first-of-type")
-let focus = pseudoClass("focus")
-let focusWithin = pseudoClass("focus-within")
-let host = (~selector=?, rules) =>
-  switch selector {
-  | None => PseudoClass("host", rules)
-  | Some(s) => PseudoClassParam("host", s, rules)
-  }
-let hover = pseudoClass("hover")
-let indeterminate = pseudoClass("indeterminate")
-let inRange = pseudoClass("in-range")
-let invalid = pseudoClass("invalid")
-let lang = (code, rules) => PseudoClassParam("lang", code, rules)
-let lastChild = pseudoClass("last-child")
-let lastOfType = pseudoClass("last-of-type")
-//let left = selector(":left");
-let link = pseudoClass("link")
-let not__ = (selector, rules) => PseudoClassParam("not", selector, rules)
-module Nth = {
-  type t = [#odd | #even | #n(int) | #add(int, int)]
-  let toString = x =>
-    switch x {
-    | #odd => "odd"
-    | #even => "even"
-    | #n(x) => Js.Int.toString(x) ++ "n"
-    | #add(x, y) => Js.Int.toString(x) ++ ("n+" ++ Js.Int.toString(y))
-    }
-}
-let nthChild = (x, rules) => PseudoClassParam("nth-child", Nth.toString(x), rules)
-let nthLastChild = (x, rules) => PseudoClassParam("nth-last-child", Nth.toString(x), rules)
-let nthLastOfType = (x, rules) => PseudoClassParam("nth-last-of-type", Nth.toString(x), rules)
-let nthOfType = (x, rules) => PseudoClassParam("nth-of-type", Nth.toString(x), rules)
-let onlyChild = pseudoClass("only-child")
-let onlyOfType = pseudoClass("only-of-type")
-let optional = pseudoClass("optional")
-let outOfRange = pseudoClass("out-of-range")
-let readOnly = pseudoClass("read-only")
-let readWrite = pseudoClass("read-write")
-let required = pseudoClass("required")
-//let right = selector(":right");
-let root = pseudoClass("root")
-let scope = pseudoClass("scope")
-let target = pseudoClass("target")
-let valid = pseudoClass("valid")
-let visited = pseudoClass("visited")
-
-let after = selector("::after")
-let before = selector("::before")
-let firstLetter = selector("::first-letter")
-let firstLine = selector("::first-line")
-let selection = selector("::selection")
-
-let child = x => selector(" > " ++ x)
-let children = selector(" > *")
-let directSibling = selector(" + ")
-let placeholder = selector("::placeholder")
-let siblings = selector(" ~ ")
-
-let anyLink = selector(":any-link")
-
-/* Type aliasing */
-
-type angle = Angle.t
-type animationDirection = AnimationDirection.t
-type animationFillMode = AnimationFillMode.t
-type animationIterationCount = AnimationIterationCount.t
-type animationPlayState = AnimationPlayState.t
-type cascading = Cascading.t
-type color = Color.t
-type fontStyle = FontStyle.t
-type fontWeight = FontWeight.t
-type length = Length.t
-type listStyleType = ListStyleType.t
-type repeatValue = RepeatValue.t
-type outlineStyle = OutlineStyle.t
-type transform = Transform.t
-type gradient<'colorOrVar> = Gradient.t<'colorOrVar>
-
-/* Constructor aliases */
-
-let initial = Cascading.initial
-let inherit_ = Cascading.inherit_
-let unset = Cascading.unset
-
-let var = Types.Var.var
-let varDefault = Types.Var.varDefault
-
-// shared
-let auto = #auto
-let none = #none
-let text = #text
-
-let pct = Percentage.pct
-
-let ch = Length.ch
-let cm = Length.cm
-let em = Length.em
-let ex = Length.ex
-let mm = Length.mm
-let pt = Length.pt
-let px = Length.px
-let pxFloat = Length.pxFloat
-let rem = Length.rem
-let vh = Length.vh
-let vmin = Length.vmin
-let vmax = Length.vmax
-let zero = Length.zero
-
-let deg = Angle.deg
-let rad = Angle.rad
-let grad = Angle.grad
-let turn = Angle.turn
-
-let ltr = Direction.ltr
-let rtl = Direction.rtl
-
-let absolute = Position.absolute
-let relative = Position.relative
-let static = Position.static
-let fixed = #fixed
-let sticky = Position.sticky
-
-//let none = Resize.none;
-//let both = Resize.both;
-let horizontal = Resize.horizontal
-let vertical = Resize.vertical
-//let block = Resize.block;
-//let inline = Resize.inline;
-
-let smallCaps = FontVariant.smallCaps
-
-//let normal = `normal;
-let italic = FontStyle.italic
-let oblique = FontStyle.oblique
-
-let hidden = #hidden
-let visible = #visible
-let scroll = #scroll
-
-let rgb = Color.rgb
-let rgba = Color.rgba
-let hsl = Color.hsl
-let hsla = Color.hsla
-let hex = Color.hex
-let currentColor = Color.currentColor
-let transparent = Color.transparent
-
-let linear = TimingFunction.linear
-let ease = TimingFunction.ease
-let easeIn = TimingFunction.easeIn
-let easeInOut = TimingFunction.easeInOut
-let easeOut = TimingFunction.easeOut
-let stepStart = TimingFunction.stepStart
-let stepEnd = TimingFunction.stepEnd
-let steps = TimingFunction.steps
-let cubicBezier = TimingFunction.cubicBezier
-
-let marginBox = GeometyBox.marginBox
-//let borderBox = GeometyBox.borderBox;
-//let paddingBox = GeometyBox.paddingBox;
-//let contentBox = GeometyBox.contentBox;
-let fillBox = GeometyBox.fillBox
-let strokeBox = GeometyBox.strokeBox
-let viewBox = GeometyBox.viewBox
-
-let translate = Transform.translate
-let translate3d = Transform.translate3d
-let translateX = Transform.translateX
-let translateY = Transform.translateY
-let translateZ = Transform.translateZ
-let scaleX = Transform.scaleX
-let scaleY = Transform.scaleY
-let scaleZ = Transform.scaleZ
-let rotateX = Transform.rotateX
-let rotateY = Transform.rotateY
-let rotateZ = Transform.rotateZ
-let scale = Transform.scale
-let scale3d = Transform.scale3d
-let skew = Transform.skew
-let skewX = Transform.skewX
-let skewY = Transform.skewY
-
-let thin = FontWeight.thin
-let extraLight = FontWeight.extraLight
-let light = FontWeight.light
-let medium = FontWeight.medium
-let semiBold = FontWeight.semiBold
-let bold = FontWeight.bold
-let extraBold = FontWeight.extraBold
-let lighter = FontWeight.lighter
-let bolder = FontWeight.bolder
-
-let linearGradient = Gradient.linearGradient
-let repeatingLinearGradient = Gradient.repeatingLinearGradient
-let radialGradient = Gradient.radialGradient
-let repeatingRadialGradient = Gradient.repeatingRadialGradient
-
-let areas = GridTemplateAreas.areas
-let ident = GridArea.ident
-let numIdent = GridArea.numIdent
-
-// cursor aliases
-//let auto = Cursor.auto;
-//let default = Cursor.default;
-//let none = Cursor.none;
-let contextMenu = Cursor.contextMenu
-let help = Cursor.help
-let pointer = Cursor.pointer
-let progress = Cursor.progress
-let wait = Cursor.wait
-let cell = Cursor.cell
-let crosshair = Cursor.crosshair
-//let text = Cursor.text;
-let verticalText = Cursor.verticalText
-let alias = Cursor.alias
-let copy = Cursor.copy
-let move = Cursor.move
-let noDrop = Cursor.noDrop
-let notAllowed = Cursor.notAllowed
-let grab = Cursor.grab
-let grabbing = Cursor.grabbing
-let allScroll = Cursor.allScroll
-let colResize = Cursor.colResize
-let rowResize = Cursor.rowResize
-let nResize = Cursor.nResize
-let eResize = Cursor.eResize
-let sResize = Cursor.sResize
-let wResize = Cursor.wResize
-let neResize = Cursor.neResize
-let nwResize = Cursor.nwResize
-let seResize = Cursor.seResize
-let swResize = Cursor.swResize
-let ewResize = Cursor.ewResize
-let nsResize = Cursor.nsResize
-let neswResize = Cursor.neswResize
-let nwseResize = Cursor.nwseResize
-let zoomIn = Cursor.zoomIn
-let zoomOut = Cursor.zoomOut
-
-/* *******************************************************
- ********************************************************
- ******************************************************* */
-
-let vw = x => #vw(x)
-let fr = x => #fr(x)
-
-module Calc = {
-  let \"-" = (a, b) => #calc(#sub, a, b)
-  let \"+" = (a, b) => #calc(#add, a, b)
-}
-let size = (x, y) => #size(x, y)
-
-let all = #all
-let backwards = #backwards
-let baseline = #baseline
-let block = #block
-let borderBox = #borderBox
-let both = #both
-let center = #center
-let column = #column
-let columnReverse = #columnReverse
-let contain = #contain
-let contentBox = #contentBox
-let count = x => #count(x)
-let cover = #cover
-let dashed = #dashed
-let dotted = #dotted
-let flexBox = #flex
-let grid = #grid
-let inlineGrid = #inlineGrid
-let flexEnd = #flexEnd
-let flexStart = #flexStart
-let forwards = #forwards
-let infinite = #infinite
-
-let inline = #inline
-let contents = #contents
-let inlineBlock = #inlineBlock
-let inlineFlex = #inlineFlex
-let inlineTable = #inlineTable
-let listItem = #listItem
-let runIn = #runIn
-let table = #table
-let tableCaption = #tableCaption
-let tableColumnGroup = #tableColumnGroup
-let tableHeaderGroup = #tableHeaderGroup
-let tableFooterGroup = #tableFooterGroup
-let tableRowGroup = #tableRowGroup
-let tableCell = #tableCell
-let tableColumn = #tableColumn
-let tableRow = #tableRow
-
-let local = #local
-let localUrl = x => #localUrl(x)
-let noRepeat = #noRepeat
-let space = #space
-let nowrap = #nowrap
-let paddingBox = #paddingBox
-let paused = #paused
-let repeat = #repeat
-let minmax = #minmax
-let repeatX = #repeatX
-let repeatY = #repeatY
-let rotate = a => #rotate(a)
-let rotate3d = (x, y, z, a) => #rotate3d(x, y, z, a)
-let row = #row
-let rowReverse = #rowReverse
-let running = #running
-let solid = #solid
-let spaceAround = #spaceAround
-let spaceBetween = #spaceBetween
-let spaceEvenly = #spaceEvenly
-let stretch = #stretch
-let url = x => #url(x)
-let wrap = #wrap
-let wrapReverse = #wrapReverse
-
-let inside = #inside
-let outside = #outside
-
-let underline = #underline
-let overline = #overline
-let lineThrough = #lineThrough
-let clip = #clip
-let ellipsis = #ellipsis
-
-let wavy = #wavy
-let double = #double
-
-let uppercase = #uppercase
-let lowercase = #lowercase
-let capitalize = #capitalize
-
-let sub = #sub
-let super = #super
-let textTop = #textTop
-let textBottom = #textBottom
-let middle = #middle
-
-let normal = #normal
-
-let breakAll = #breakAll
-let keepAll = #keepAll
-let breakWord = #breakWord
-
-let reverse = #reverse
-let alternate = #alternate
-let alternateReverse = #alternateReverse
-
-let fill = #fill
-let content = #content
-let maxContent = #maxContent
-let minContent = #minContent
-let fitContent = #fitContent
-
-let round = #round
-let miter = #miter
-let bevel = #bevel
-let butt = #butt
-let square = #square
-
-let flex3 = (~grow, ~shrink, ~basis) => D(
-  "flex",
-  Js.Float.toString(grow) ++
-  (" " ++
-  (Js.Float.toString(shrink) ++
-  (" " ++
-  switch basis {
-  | #...FlexBasis.t as b => FlexBasis.toString(b)
-  | #...Length.t as l => Length.toString(l)
-  }))),
-)
-let flexBasis = x => D(
-  "flexBasis",
-  switch x {
-  | #...FlexBasis.t as b => FlexBasis.toString(b)
-  | #...Length.t as l => Length.toString(l)
-  },
-)
-
-let order = x => D("order", Js.Int.toString(x))
-
-let string_of_minmax = x =>
-  switch x {
-  | #auto => "auto"
-  | #calc(#add, a, b) => "calc(" ++ (Length.toString(a) ++ (" + " ++ (Length.toString(b) ++ ")")))
-  | #calc(#sub, a, b) => "calc(" ++ (Length.toString(a) ++ (" - " ++ (Length.toString(b) ++ ")")))
-  | #ch(x) => Js.Float.toString(x) ++ "ch"
-  | #cm(x) => Js.Float.toString(x) ++ "cm"
-  | #em(x) => Js.Float.toString(x) ++ "em"
-  | #ex(x) => Js.Float.toString(x) ++ "ex"
-  | #mm(x) => Js.Float.toString(x) ++ "mm"
-  | #percent(x) => Js.Float.toString(x) ++ "%"
-  | #pt(x) => Js.Int.toString(x) ++ "pt"
-  | #px(x) => Js.Int.toString(x) ++ "px"
-  | #pxFloat(x) => Js.Float.toString(x) ++ "px"
-  | #rem(x) => Js.Float.toString(x) ++ "rem"
-  | #vh(x) => Js.Float.toString(x) ++ "vh"
-  | #vmax(x) => Js.Float.toString(x) ++ "vmax"
-  | #vmin(x) => Js.Float.toString(x) ++ "vmin"
-  | #vw(x) => Js.Float.toString(x) ++ "vw"
-  | #fr(x) => Js.Float.toString(x) ++ "fr"
-  | #inch(x) => Js.Float.toString(x) ++ "in"
-  | #pc(x) => Js.Float.toString(x) ++ "pc"
-  | #zero => "0"
-  | #minContent => "min-content"
-  | #maxContent => "max-content"
-  }
-
-let string_of_dimension = x =>
-  switch x {
-  | #auto => "auto"
-  | #none => "none"
-  | #calc(#add, a, b) => "calc(" ++ (Length.toString(a) ++ (" + " ++ (Length.toString(b) ++ ")")))
-  | #calc(#sub, a, b) => "calc(" ++ (Length.toString(a) ++ (" - " ++ (Length.toString(b) ++ ")")))
-  | #ch(x) => Js.Float.toString(x) ++ "ch"
-  | #cm(x) => Js.Float.toString(x) ++ "cm"
-  | #em(x) => Js.Float.toString(x) ++ "em"
-  | #ex(x) => Js.Float.toString(x) ++ "ex"
-  | #mm(x) => Js.Float.toString(x) ++ "mm"
-  | #percent(x) => Js.Float.toString(x) ++ "%"
-  | #pt(x) => Js.Int.toString(x) ++ "pt"
-  | #px(x) => Js.Int.toString(x) ++ "px"
-  | #pxFloat(x) => Js.Float.toString(x) ++ "px"
-  | #rem(x) => Js.Float.toString(x) ++ "rem"
-  | #vh(x) => Js.Float.toString(x) ++ "vh"
-  | #vmax(x) => Js.Float.toString(x) ++ "vmax"
-  | #vmin(x) => Js.Float.toString(x) ++ "vmin"
-  | #vw(x) => Js.Float.toString(x) ++ "vw"
-  | #fr(x) => Js.Float.toString(x) ++ "fr"
-  | #inch(x) => Js.Float.toString(x) ++ "in"
-  | #pc(x) => Js.Float.toString(x) ++ "pc"
-  | #zero => "0"
-  | #fitContent => "fit-content"
-  | #minContent => "min-content"
-  | #maxContent => "max-content"
-  | #minmax(a, b) => "minmax(" ++ (string_of_minmax(a) ++ ("," ++ (string_of_minmax(b) ++ ")")))
-  }
-
-type minmax = [#fr(float) | #minContent | #maxContent | #auto | Length.t]
-
-type trackLength = [
-  | Length.t
-  | #auto
-  | #fr(float)
-  | #minContent
-  | #maxContent
-  | #minmax(minmax, minmax)
-]
-type gridLength = [trackLength | #repeat(RepeatValue.t, trackLength)]
-
-let gridLengthToJs = x =>
-  switch x {
-  | #auto => "auto"
-  | #calc(#add, a, b) => "calc(" ++ (Length.toString(a) ++ (" + " ++ (Length.toString(b) ++ ")")))
-  | #calc(#sub, a, b) => "calc(" ++ (Length.toString(a) ++ (" - " ++ (Length.toString(b) ++ ")")))
-  | #ch(x) => Js.Float.toString(x) ++ "ch"
-  | #cm(x) => Js.Float.toString(x) ++ "cm"
-  | #em(x) => Js.Float.toString(x) ++ "em"
-  | #ex(x) => Js.Float.toString(x) ++ "ex"
-  | #mm(x) => Js.Float.toString(x) ++ "mm"
-  | #percent(x) => Js.Float.toString(x) ++ "%"
-  | #pt(x) => Js.Int.toString(x) ++ "pt"
-  | #px(x) => Js.Int.toString(x) ++ "px"
-  | #pxFloat(x) => Js.Float.toString(x) ++ "px"
-  | #rem(x) => Js.Float.toString(x) ++ "rem"
-  | #vh(x) => Js.Float.toString(x) ++ "vh"
-  | #inch(x) => Js.Float.toString(x) ++ "in"
-  | #pc(x) => Js.Float.toString(x) ++ "pc"
-  | #vmax(x) => Js.Float.toString(x) ++ "vmax"
-  | #vmin(x) => Js.Float.toString(x) ++ "vmin"
-  | #vw(x) => Js.Float.toString(x) ++ "vw"
-  | #fr(x) => Js.Float.toString(x) ++ "fr"
-  | #zero => "0"
-  | #minContent => "min-content"
-  | #maxContent => "max-content"
-  | #repeat(n, x) =>
-    "repeat(" ++ (RepeatValue.toString(n) ++ (", " ++ (string_of_dimension(x) ++ ")")))
-  | #minmax(a, b) => "minmax(" ++ (string_of_minmax(a) ++ ("," ++ (string_of_minmax(b) ++ ")")))
-  }
-
-let string_of_dimensions = dimensions =>
-  dimensions |> List.map(gridLengthToJs) |> String.concat(" ")
-
-let gridTemplateColumns = dimensions => D("gridTemplateColumns", string_of_dimensions(dimensions))
-
-let gridTemplateRows = dimensions => D("gridTemplateRows", string_of_dimensions(dimensions))
-
-let gridAutoColumns = dimensions => D("gridAutoColumns", string_of_dimension(dimensions))
-
-let gridAutoRows = dimensions => D("gridAutoRows", string_of_dimension(dimensions))
-
-let gridArea = s => D(
-  "gridArea",
-  switch s {
-  | #...GridArea.t as t => GridArea.toString(t)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let gridArea2 = (s, s2) => D("gridArea", GridArea.toString(s) ++ (" / " ++ GridArea.toString(s2)))
-
-let gridArea3 = (s, s2, s3) => D(
-  "gridArea",
-  GridArea.toString(s) ++ (" / " ++ (GridArea.toString(s2) ++ (" / " ++ GridArea.toString(s3)))),
-)
-
-let gridArea4 = (s, s2, s3, s4) => D(
-  "gridArea",
-  GridArea.toString(s) ++
-  (" / " ++
-  (GridArea.toString(s2) ++
-  (" / " ++
-  (GridArea.toString(s3) ++ (" / " ++ GridArea.toString(s4)))))),
-)
-
-let gridTemplateAreas = l => D(
-  "gridTemplateAreas",
-  switch l {
-  | #...GridTemplateAreas.t as t => GridTemplateAreas.toString(t)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-type filter = [
-  | #blur(Length.t)
-  | #brightness(float)
-  | #contrast(float)
-  | #dropShadow(Length.t, Length.t, Length.t, Color.t)
-  | #grayscale(float)
-  | #hueRotate(angle)
-  | #invert(float)
-  | #opacity(float)
-  | #saturate(float)
-  | #sepia(float)
-  | #url(string)
-  | #none
-  | Var.t
-  | Cascading.t
-]
-
-let string_of_filter = x =>
-  switch x {
-  | #blur(v) => "blur(" ++ (Length.toString(v) ++ ")")
-  | #brightness(v) => "brightness(" ++ (Js.Float.toString(v) ++ "%)")
-  | #contrast(v) => "contrast(" ++ (Js.Float.toString(v) ++ "%)")
-  | #dropShadow(a, b, c, d) =>
-    "drop-shadow(" ++
-    (Length.toString(a) ++
-    (" " ++
-    (Length.toString(b) ++
-    (" " ++ (Length.toString(c) ++ (" " ++ (Color.toString(d) ++ ")")))))))
-  | #grayscale(v) => "grayscale(" ++ (Js.Float.toString(v) ++ "%)")
-  | #hueRotate(v) => "hue-rotate(" ++ (Angle.toString(v) ++ ")")
-  | #invert(v) => "invert(" ++ (Js.Float.toString(v) ++ "%)")
-  | #opacity(v) => "opacity(" ++ (Js.Float.toString(v) ++ "%)")
-  | #saturate(v) => "saturate(" ++ (Js.Float.toString(v) ++ "%)")
-  | #sepia(v) => "sepia(" ++ (Js.Float.toString(v) ++ "%)")
-  | #none => "none"
-  | #...Url.t as u => Url.toString(u)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  }
-
-let filter = x => D("filter", x->Belt.List.map(string_of_filter)->join(" "))
-
-module Shadow = {
-  type value<'a> = string
-  type box
-  type text
-  type t<'a> = [#shadow(value<'a>) | #none]
-
-  let box = (~x=zero, ~y=zero, ~blur=zero, ~spread=zero, ~inset=false, color) =>
-    #shadow(
-      Length.toString(x) ++
-      (" " ++
-      (Length.toString(y) ++
-      (" " ++
-      (Length.toString(blur) ++
-      (" " ++
-      (Length.toString(spread) ++
-      (" " ++
-      (string_of_color(color) ++ (inset ? " inset" : ""))))))))),
-    )
-
-  let text = (~x=zero, ~y=zero, ~blur=zero, color) =>
-    #shadow(
-      Length.toString(x) ++
-      (" " ++
-      (Length.toString(y) ++ (" " ++ (Length.toString(blur) ++ (" " ++ string_of_color(color)))))),
-    )
-
-  let toString: t<'a> => string = x =>
-    switch x {
-    | #shadow(x) => x
-    | #none => "none"
-    }
-}
-
-let boxShadow = x => D(
-  "boxShadow",
-  switch x {
-  | #...Shadow.t as s => Shadow.toString(s)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let boxShadows = x => D("boxShadow", x->Belt.List.map(Shadow.toString)->join(", "))
-
-let string_of_borderstyle = x =>
-  switch x {
-  | #...BorderStyle.t as b => BorderStyle.toString(b)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  }
-
-let border = (px, style, color) => D(
-  "border",
-  Length.toString(px) ++ (" " ++ (string_of_borderstyle(style) ++ (" " ++ string_of_color(color)))),
-)
-let borderStyle = x => D("borderStyle", string_of_borderstyle(x))
-
-let borderLeft = (px, style, color) => D(
-  "borderLeft",
-  Length.toString(px) ++ (" " ++ (string_of_borderstyle(style) ++ (" " ++ string_of_color(color)))),
-)
-let borderLeftStyle = x => D("borderLeftStyle", string_of_borderstyle(x))
-
-let borderRight = (px, style, color) => D(
-  "borderRight",
-  Length.toString(px) ++ (" " ++ (string_of_borderstyle(style) ++ (" " ++ string_of_color(color)))),
-)
-
-let borderRightStyle = x => D("borderRightStyle", string_of_borderstyle(x))
-let borderTop = (px, style, color) => D(
-  "borderTop",
-  Length.toString(px) ++ (" " ++ (string_of_borderstyle(style) ++ (" " ++ string_of_color(color)))),
-)
-
-let borderTopStyle = x => D("borderTopStyle", string_of_borderstyle(x))
-
-let borderBottom = (px, style, color) => D(
-  "borderBottom",
-  Length.toString(px) ++ (" " ++ (string_of_borderstyle(style) ++ (" " ++ string_of_color(color)))),
-)
-
-let borderBottomStyle = x => D("borderBottomStyle", string_of_borderstyle(x))
-
-let background = x => D(
-  "background",
-  switch x {
-  | #...Color.t as c => Color.toString(c)
-  | #...Url.t as u => Url.toString(u)
-  | #...Gradient.t as g => Gradient.toString(g)
-  | #none => "none"
-  },
-)
-
-let backgrounds = x => D(
-  "background",
-  x
-  ->Belt.List.map(item =>
-    switch item {
-    | #...Color.t as c => Color.toString(c)
-    | #...Url.t as u => Url.toString(u)
-    | #...Gradient.t as g => Gradient.toString(g)
-    | #none => "none"
-    }
-  )
-  ->join(", "),
-)
-
-let backgroundSize = x => D(
-  "backgroundSize",
-  switch x {
-  | #size(x, y) => Length.toString(x) ++ (" " ++ Length.toString(y))
-  | #auto => "auto"
-  | #cover => "cover"
-  | #contain => "contain"
-  },
-)
-
-let fontFace = (~fontFamily, ~src, ~fontStyle=?, ~fontWeight=?, ~fontDisplay=?, ()) => {
-  let fontStyle = Js.Option.map((. value) => FontStyle.toString(value), fontStyle)
-  let src =
-    src
-    |> List.map(x =>
-      switch x {
-      | #localUrl(value) => j`local("$(value)")`
-      | #url(value) => j`url("$(value)")`
-      }
-    )
-    |> String.concat(", ")
-
-  let fontStyle = Belt.Option.mapWithDefault(fontStyle, "", s => "font-style: " ++ (s ++ ";"))
-  let fontWeight = Belt.Option.mapWithDefault(fontWeight, "", w =>
-    "font-weight: " ++
-    (switch w {
-    | #...FontWeight.t as f => FontWeight.toString(f)
-    | #...Var.t as va => Var.toString(va)
-    | #...Cascading.t as c => Cascading.toString(c)
-    } ++
-    ";")
-  )
-  let fontDisplay = Belt.Option.mapWithDefault(fontDisplay, "", f =>
-    "font-display: " ++ (FontDisplay.toString(f) ++ ";")
-  )
-
-  j`@font-face {
-     font-family: $fontFamily;
-     src: $src;
-     $(fontStyle)
-     $(fontWeight)
-     $(fontDisplay)
-   }`
-}
-
-let textDecoration = x => D(
-  "textDecoration",
-  switch x {
-  | #none => "none"
-  | #underline => "underline"
-  | #overline => "overline"
-  | #lineThrough => "line-through"
-  | #initial => "initial"
-  | #inherit_ => "inherit"
-  | #unset => "unset"
-  | #...Var.t as va => Var.toString(va)
-  },
-)
-
-let textShadow = x => D(
-  "textShadow",
-  switch x {
-  | #...Shadow.t as s => Shadow.toString(s)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-let textShadows = x => D("textShadow", x->Belt.List.map(Shadow.toString)->join(", "))
-
-let transformStyle = x => D(
-  "transformStyle",
-  switch x {
-  | #...TransformStyle.t as ts => TransformStyle.toString(ts)
-  | #...Var.t as va => Var.toString(va)
-  | #...Cascading.t as c => Cascading.toString(c)
-  },
-)
-
-@ocaml.doc("
- * Transition
- ")
-module Transition = {
-  type t = [#value(string)]
-
-  let shorthand = (~duration=0, ~delay=0, ~timingFunction=#ease, property) =>
-    #value(
-      string_of_time(duration) ++
-      (" " ++
-      (TimingFunction.toString(timingFunction) ++
-      (" " ++
-      (string_of_time(delay) ++ (" " ++ property))))),
-    )
-
-  let toString = x =>
-    switch x {
-    | #value(v) => v
-    }
-}
-
-let transitionValue = x => D("transition", Transition.toString(x))
-
-let transitionList = x => D("transition", x->Belt.List.map(Transition.toString)->join(", "))
-let transitions = transitionList
-
-let transition = (~duration=?, ~delay=?, ~timingFunction=?, property) =>
-  transitionValue(Transition.shorthand(~duration?, ~delay?, ~timingFunction?, property))
-
-let transitionDelay = i => D("transitionDelay", string_of_time(i))
-
-let transitionDuration = i => D("transitionDuration", string_of_time(i))
-
-let transitionTimingFunction = x => D("transitionTimingFunction", TimingFunction.toString(x))
-
-let transitionProperty = x => D("transitionProperty", x)
-
-@ocaml.doc("
- * Animation
- ")
-module Animation = {
-  type t = [#value(string)]
-
-  let shorthand = (
-    ~duration=0,
-    ~delay=0,
-    ~direction=#normal,
-    ~timingFunction=#ease,
-    ~fillMode=#none,
-    ~playState=#running,
-    ~iterationCount=#count(1),
-    name,
-  ) =>
-    #value(
-      name ++
-      (" " ++
-      (string_of_time(duration) ++
-      (" " ++
-      (TimingFunction.toString(timingFunction) ++
-      (" " ++
-      (string_of_time(delay) ++
-      (" " ++
-      (AnimationIterationCount.toString(iterationCount) ++
-      (" " ++
-      (AnimationDirection.toString(direction) ++
-      (" " ++
-      (AnimationFillMode.toString(fillMode) ++
-      (" " ++
-      AnimationPlayState.toString(playState)))))))))))))),
-    )
-
-  let toString = x =>
-    switch x {
-    | #value(v) => v
-    }
-}
-
-let animationValue = x => D("animation", Animation.toString(x))
-
-let animation = (
-  ~duration=?,
-  ~delay=?,
-  ~direction=?,
-  ~timingFunction=?,
-  ~fillMode=?,
-  ~playState=?,
-  ~iterationCount=?,
-  name,
-) =>
-  animationValue(
-    Animation.shorthand(
-      ~duration?,
-      ~delay?,
-      ~direction?,
-      ~timingFunction?,
-      ~fillMode?,
-      ~playState?,
-      ~iterationCount?,
-      name,
-    ),
-  )
-
-let animations = x => D("animation", x->Belt.List.map(Animation.toString)->join(", "))
-
-let animationName = x => D("animationName", x)
-
-@ocaml.doc("
- * SVG
- ")
-module SVG = {
-  let fill = x => D(
-    "fill",
-    switch x {
-    | #...Types.SVG.Fill.t as f => Types.SVG.Fill.toString(f)
-    | #...Types.Color.t as c => Types.Color.toString(c)
-    | #...Types.Var.t as v => Types.Var.toString(v)
-    | #...Types.Url.t as u => Types.Url.toString(u)
-    },
-  )
-  let fillOpacity = opacity => D("fillOpacity", Js.Float.toString(opacity))
-  let fillRule = x => D(
-    "fillRule",
-    switch x {
-    | #evenodd => "evenodd"
-    | #nonzero => "nonzero"
-    },
-  )
-  let stroke = x => D("stroke", string_of_color(x))
-  let strokeDasharray = x => D(
-    "stroke-dasharray",
-    switch x {
-    | #none => "none"
-    | #dasharray(a) => a->Belt.List.map(string_of_dasharray)->join(" ")
-    },
-  )
-  let strokeWidth = x => D("strokeWidth", Length.toString(x))
-  let strokeOpacity = opacity => D("strokeOpacity", Js.Float.toString(opacity))
-  let strokeMiterlimit = x => D("strokeMiterlimit", Js.Float.toString(x))
-  let strokeLinecap = x => D(
-    "strokeLinecap",
-    switch x {
-    | #butt => "butt"
-    | #round => "round"
-    | #square => "square"
-    },
-  )
-
-  let strokeLinejoin = x => D(
-    "strokeLinejoin",
-    switch x {
-    | #miter => "miter"
-    | #round => "round"
-    | #bevel => "bevel"
-    },
-  )
-  let stopColor = x => D("stopColor", string_of_color(x))
-  let stopOpacity = x => D("stopOpacity", Js.Float.toString(x))
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Css_Legacy_Core.resi b/jscomp/syntax/tests/idempotency/bs-css/Css_Legacy_Core.resi
deleted file mode 100644
index f601ed4..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Css_Legacy_Core.resi
+++ /dev/null
@@ -1,1754 +0,0 @@
-/* Css documentation is copy/pasted from mozilla mdn web docs */
-
-module Types = Css_AtomicTypes
-
-type rule
-type animationName
-
-module Make: Css_Core.CssImplementationIntf =>
-{
-  let global: (string, list<rule>) => unit
-  let insertRule: string => unit
-  let merge: list<string> => string
-  let style: list<rule> => string
-  let keyframes: list<(int, list<rule>)> => animationName
-}
-
-let toJson: list<rule> => Js.Json.t
-
-let important: rule => rule
-let label: string => rule
-
-module Shadow: {
-  type value<'a>
-  type box
-  type text
-
-  type t<'a> = [#shadow(value<'a>) | #none]
-
-  let box: (
-    ~x: Types.Length.t=?,
-    ~y: Types.Length.t=?,
-    ~blur: Types.Length.t=?,
-    ~spread: Types.Length.t=?,
-    ~inset: bool=?,
-    [< Types.Color.t | Types.Var.t],
-  ) => [> t<box>]
-
-  let text: (
-    ~x: Types.Length.t=?,
-    ~y: Types.Length.t=?,
-    ~blur: Types.Length.t=?,
-    [< Types.Color.t | Types.Var.t],
-  ) => [> t<text>]
-
-  let toString: t<'a> => string
-}
-
-/* ********
- Properties
- ********** */
-
-@ocaml.doc(" If nothing works, use this (unsafe) escape hatch ")
-let unsafe: (string, string) => rule
-
-@ocaml.doc("
- The CSS align-content property sets the distribution of space between and around content items along a flexbox's
- cross-axis or a grid's block axis.
- ")
-let alignContent: [<
-  | Types.AlignContent.t
-  | Types.NormalAlignment.t
-  | Types.BaselineAlignment.t
-  | Types.DistributedAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The CSS align-items property sets the align-self value on all direct children as a group.
- In Flexbox, it controls the alignment of items on the Cross Axis.
- In Grid Layout, it controls the alignment of items on the Block Axis within their grid area.
- ")
-let alignItems: [<
-  | Types.AlignItems.t
-  | Types.PositionalAlignment.t
-  | Types.BaselineAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The align-self CSS property overrides a grid or flex item's align-items value.
- In Grid, it aligns the item inside the grid area. In Flexbox, it aligns the item on the cross axis.
- ")
-let alignSelf: [<
-  | Types.AlignSelf.t
-  | Types.PositionalAlignment.t
-  | Types.BaselineAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The animation-delay CSS property sets when an animation starts.
- The animation can start later, immediately from its beginning, or immediately and partway through the animation.
- ")
-let animationDelay: int => rule
-
-@ocaml.doc("
- The animation-direction CSS property sets whether an animation should play forwards, backwards,
- or alternating back and forth.
- ")
-let animationDirection: Types.AnimationDirection.t => rule
-
-@ocaml.doc("
- The animation-duration CSS property sets the length of time that an animation takes to complete one cycle.
- ")
-let animationDuration: int => rule
-
-@ocaml.doc("
- The animation-fill-mode CSS property sets how a CSS animation applies styles to its target before and after
- its execution.
- ")
-let animationFillMode: Types.AnimationFillMode.t => rule
-
-@ocaml.doc("
- The animation-iteration-count CSS property sets the number of times an animation cycle should be played
- before stopping.
- ")
-let animationIterationCount: Types.AnimationIterationCount.t => rule
-
-@ocaml.doc("
- The animation-play-state CSS property sets whether an animation is running or paused.
- ")
-let animationPlayState: Types.AnimationPlayState.t => rule
-
-@ocaml.doc("
- The animation-timing-function CSS property sets how an animation progresses through the duration of each cycle.
- ")
-let animationTimingFunction: Types.TimingFunction.t => rule
-
-@ocaml.doc("
- The backdrop-filter CSS property lets you apply graphical effects such as blurring or color shifting to the
- area behind an element. Because it applies to everything behind the element, to see the effect you must
- make the element or its background at least partially transparent.
- ")
-let backdropFilter: list<Types.BackdropFilter.t> => rule
-
-/* Warning: experimental */
-let backfaceVisibility: [< Types.BackfaceVisibility.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The background-attachment CSS property sets whether a background image's position is fixed within the viewport,
- or scrolls with its containing block.
- ")
-let backgroundAttachment: [< Types.BackgroundAttachment.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The background-color CSS property sets the background color of an element.
- ")
-let backgroundColor: [< Types.Color.t | Types.Var.t] => rule
-
-@ocaml.doc("
- The background-clip CSS property sets whether an element's background extends underneath its border box,
- padding box, or content box.
- ")
-let backgroundClip: [< Types.BackgroundClip.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The background-image CSS property sets one or more background images on an element.
- ")
-let backgroundImage: [< Types.BackgroundImage.t | Types.Url.t | Types.Gradient.t<'gradient>] => rule
-
-@ocaml.doc("
- The background-origin CSS property sets the background's origin: from the border start,
- inside the border, or inside the padding.
- ")
-let backgroundOrigin: [< Types.BackgroundClip.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The background-position CSS property sets the initial position for each background image.
- The position is relative to the position layer set by background-origin.
- ")
-let backgroundPosition: [<
-  | Types.BackgroundPosition.t
-  | #hv(
-    [Types.BackgroundPosition.X.t | Types.Length.t],
-    [Types.BackgroundPosition.Y.t | Types.Length.t],
-  )
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-let backgroundPositions: list<
-  [<
-    | Types.BackgroundPosition.t
-    | #hv(
-      [Types.BackgroundPosition.X.t | Types.Length.t],
-      [Types.BackgroundPosition.Y.t | Types.Length.t],
-    )
-    | Types.Length.t
-    | Types.Var.t
-    | Types.Cascading.t
-  ],
-> => rule
-
-let backgroundPosition4: (
-  ~x: Types.BackgroundPosition.X.t,
-  ~offsetX: Types.Length.t,
-  ~y: Types.BackgroundPosition.Y.t,
-  ~offsetY: Types.Length.t,
-) => rule
-
-@ocaml.doc("
- The background-repeat CSS property sets how background images are repeated.
- A background image can be repeated along the horizontal and vertical axes, or not repeated at all.
- ")
-let backgroundRepeat: [<
-  | Types.BackgroundRepeat.t
-  | #hv(Types.BackgroundRepeat.horizontal, Types.BackgroundRepeat.vertical)
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The border-bottom shorthand CSS property sets an element's bottom border.
- It sets the values of border-bottom-width, border-bottom-style and border-bottom-color.
- ")
-let borderBottom: (
-  Types.Length.t,
-  [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t],
-  [< Types.Color.t | Types.Var.t],
-) => rule
-
-@ocaml.doc("
- The border-bottom-color CSS property sets the color of an element's bottom border.
- It can also be set with the shorthand CSS properties border-color or border-bottom.
- ")
-let borderBottomColor: [< Types.Color.t | Types.Var.t] => rule
-
-@ocaml.doc("
- The border-bottom-left-radius CSS property rounds the bottom-left corner of an element.
- ")
-let borderBottomLeftRadius: Types.Length.t => rule
-
-@ocaml.doc("
- The border-bottom-right-radius CSS property rounds the bottom-right corner of an element.
- ")
-let borderBottomRightRadius: Types.Length.t => rule
-
-@ocaml.doc("
- The border-bottom-style CSS property sets the line style of an element's bottom border.
- ")
-let borderBottomStyle: [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The border-bottom-width CSS property sets the width of the bottom border of an element.
- ")
-let borderBottomWidth: Types.Length.t => rule
-
-@ocaml.doc("
- The border-collapse CSS property sets whether cells inside a <table> have shared or separate borders.
- ")
-let borderCollapse: [< Types.BorderCollapse.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The border-color shorthand CSS property sets the color of an element's border.
- ")
-let borderColor: [< Types.Color.t | Types.Var.t] => rule
-
-@ocaml.doc("
- The border-left shorthand CSS property set an element's left border.
- ")
-let borderLeft: (
-  Types.Length.t,
-  [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t],
-  [< Types.Color.t | Types.Var.t],
-) => rule
-
-let borderLeftColor: [< Types.Color.t | Types.Var.t] => rule
-
-let borderLeftStyle: [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-let borderLeftWidth: Types.Length.t => rule
-
-let borderRight: (
-  Types.Length.t,
-  [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t],
-  [< Types.Color.t | Types.Var.t],
-) => rule
-
-let borderRightColor: [< Types.Color.t | Types.Var.t] => rule
-
-let borderRightStyle: [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-let borderRightWidth: Types.Length.t => rule
-
-let borderRadius: Types.Length.t => rule
-
-let borderSpacing: Types.Length.t => rule
-
-@ocaml.doc("
- The border-style shorthand CSS property sets the line style for all four sides of an element's border.
- ")
-let borderStyle: [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-let borderTopColor: [< Types.Color.t | Types.Var.t] => rule
-
-let borderTopLeftRadius: Types.Length.t => rule
-
-let borderTopRightRadius: Types.Length.t => rule
-
-let borderTopStyle: [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-let borderTopWidth: Types.Length.t => rule
-
-let borderWidth: Types.Length.t => rule
-
-let bottom: [< #auto | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The box-sizing CSS property sets how the total width and height of an element is calculated.
- ")
-let boxSizing: [< Types.BoxSizing.t | Types.Var.t | Types.Cascading.t] => rule
-
-let boxShadow: [< Shadow.t<Shadow.box> | Types.Var.t | Types.Cascading.t] => rule
-
-let boxShadows: list<[Shadow.t<Shadow.box>]> => rule
-
-@ocaml.doc("
- The clear CSS property sets whether an element must be moved below (cleared) floating elements that precede it.
- The clear property applies to floating and non-floating elements.
- ")
-let clear: [< Types.Clear.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The clip-path CSS property creates a clipping region that sets what part of an element should be shown.
- Parts that are inside the region are shown, while those outside are hidden.
- ")
-let clipPath: [<
-  | Types.ClipPath.t
-  | Types.Url.t
-  | Types.GeometyBox.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-let color: [< Types.Color.t | Types.Var.t] => rule
-
-@ocaml.doc("
- The column-count CSS property breaks an element's content into the specified number of columns.
- ")
-let columnCount: [< Types.ColumnCount.t | Types.Cascading.t] => rule
-
-let contentRule: [<
-  | Types.Content.t
-  | Types.Counter.t
-  | Types.Counters.t
-  | Types.Gradient.t<'gradient>
-  | Types.Url.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-let contentRules: list<
-  [<
-    | Types.Content.t
-    | Types.Counter.t
-    | Types.Counters.t
-    | Types.Gradient.t<'gradient>
-    | Types.Url.t
-  ],
-> => rule
-
-let counterIncrement: [< Types.CounterIncrement.t | Types.Var.t | Types.Cascading.t] => rule
-let countersIncrement: list<[< Types.CounterIncrement.t]> => rule
-let counterReset: [< Types.CounterReset.t | Types.Var.t | Types.Cascading.t] => rule
-let countersReset: list<[< Types.CounterReset.t]> => rule
-let counterSet: [< Types.CounterSet.t | Types.Var.t | Types.Cascading.t] => rule
-let countersSet: list<[< Types.CounterSet.t]> => rule
-
-let cursor: Types.Cursor.t => rule
-
-@ocaml.doc("
- The direction CSS property sets the direction of text, table columns, and horizontal overflow.
- Use rtl for languages written from right to left (like Hebrew or Arabic),
- and ltr for those written from left to right (like English and most other languages).
- ")
-let direction: [< Types.Direction.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The display CSS property sets whether an element is treated as a block or inline element
- and the layout used for its children, such as grid or flex.
- ")
-let display: [<
-  | Types.DisplayOutside.t
-  | Types.DisplayInside.t
-  | Types.DisplayListItem.t
-  | Types.DisplayInternal.t
-  | Types.DisplayBox.t
-  | Types.DisplayLegacy.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The flex CSS property sets how a flex item will grow or shrink to fit the space available in its flex container.
- It is a shorthand for flex-grow, flex-shrink, and flex-basis.
- ")
-let flex: [< Types.Flex.t | #num(float)] => rule
-
-@ocaml.doc("
- The flex-basis CSS property sets the initial main size of a flex item.
- It sets the size of the content box unless otherwise set with box-sizing.
- ")
-let flexBasis: [< Types.FlexBasis.t | Types.Percentage.t | Types.Length.t] => rule
-
-@ocaml.doc("
- The flex-direction CSS property sets how flex items are placed in the flex container defining the main axis and the direction (normal or reversed).
- ")
-let flexDirection: [< Types.FlexDirection.t | Types.Var.t | Types.Cascading.t] => rule
-
-let flexGrow: float => rule
-
-let flexShrink: float => rule
-
-@ocaml.doc("
- The flex-wrap CSS property sets whether flex items are forced onto one line or can wrap onto multiple lines.
- If wrapping is allowed, it sets the direction that lines are stacked.
- ")
-let flexWrap: [< Types.FlexWrap.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The float CSS property places an element on the left or right side of its container,
- allowing text and inline elements to wrap around it.
- The element is removed from the normal flow of the page, though still remaining a part of the flow
- (in contrast to absolute positioning).
- ")
-let float: [< Types.Float.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The font-family CSS property specifies a prioritized list of one or more font family names and/or generic family names
- for the selected element.
- ")
-let fontFamily: [< Types.FontFamilyName.t | Types.Var.t | Types.Cascading.t] => rule
-
-let fontFamilies: list<[Types.FontFamilyName.t]> => rule
-
-@ocaml.doc("
- The font-size CSS property sets the size of the font. This property is also used to compute the size of em, ex, and
- other relative <length> units.
- ")
-let fontSize: [< Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The font-style CSS property sets whether a font should be styled with a normal, italic, or oblique face from its
- font-family.
- ")
-let fontStyle: [< Types.FontStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The font-variant CSS property is a shorthand for the longhand properties font-variant-caps, font-variant-numeric,
- font-variant-alternates, font-variant-ligatures, and font-variant-east-asian.
- You can also set the CSS Level 2 (Revision 1) values of font-variant, (that is, normal or small-caps),
- by using the font shorthand.
- ")
-let fontVariant: [< Types.FontVariant.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The font-weight CSS property sets the weight (or boldness) of the font. The weights available depend on the
- font-family you are using.
- ")
-let fontWeight: [< Types.FontWeight.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The grid-area CSS property is a shorthand property for grid-row-start, grid-column-start, grid-row-end and
- grid-column-end, specifying a grid item’s size and location within the grid by contributing a line, a span,
- or nothing (automatic) to its grid placement, thereby specifying the edges of its grid area.
- ")
-let gridArea: [< Types.GridArea.t | Types.Var.t | Types.Cascading.t] => rule
-let gridArea2: (Types.GridArea.t, Types.GridArea.t) => rule
-let gridArea3: (Types.GridArea.t, Types.GridArea.t, Types.GridArea.t) => rule
-let gridArea4: (Types.GridArea.t, Types.GridArea.t, Types.GridArea.t, Types.GridArea.t) => rule
-
-@ocaml.doc("
- The grid-auto-flow CSS property controls how the auto-placement algorithm works,
- specifying exactly how auto-placed items get flowed into the grid.
- ")
-let gridAutoFlow: [< Types.GridAutoFlow.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The grid-column CSS property is a shorthand property for grid-column-start and grid-column-end
- specifying a grid item's size and location within the grid column by contributing a line, a span,
- or nothing (automatic) to its grid placement, thereby specifying the inline-start and
- inline-end edge of its grid area.
- ")
-let gridColumn: (int, int) => rule
-
-@ocaml.doc("
- The grid-column-end CSS property specifies a grid item’s end position within the grid column by contributing a line,
- a span, or nothing (automatic) to its grid placement, thereby specifying the block-end edge of its grid area.
- ")
-let gridColumnEnd: int => rule
-
-@ocaml.doc("
- The column-gap CSS property sets the size of the gap (gutter) between an element's columns.
- ")
-let columnGap: [<
-  | Types.ColumnGap.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- This prefixed property is being replaced by column-gap.
- ")
-let gridColumnGap: [<
-  | Types.ColumnGap.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The grid-column-start CSS property specifies a grid item’s start position within the grid column
- by contributing a line, a span, or nothing (automatic) to its grid placement.
- This start position defines the block-start edge of the grid area.
- ")
-let gridColumnStart: int => rule
-
-@ocaml.doc("
- The gap CSS property sets the gaps (gutters) between rows and columns. It is a shorthand for row-gap and column-gap.
- ")
-let gridGap: [< Types.Percentage.t | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The grid-row CSS property is a shorthand property for grid-row-start and grid-row-end specifying a grid item’s size
- and location within the grid row by contributing a line, a span, or nothing (automatic) to its grid placement,
- thereby specifying the inline-start and inline-end edge of its grid area.
- ")
-let gridRow: (int, int) => rule
-
-@ocaml.doc("
- The grid-row-end CSS property specifies a grid item’s end position within the grid row by contributing a line, a span,
- or nothing (automatic) to its grid placement, thereby specifying the inline-end edge of its grid area.
- ")
-let gridRowEnd: int => rule
-
-@ocaml.doc("
- The row-gap CSS property sets the size of the gap (gutter) between an element's grid rows.
- ")
-let gridRowGap: [< Types.Percentage.t | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The grid-row-start CSS property specifies a grid item’s start position within the grid row by contributing a line,
- a span, or nothing (automatic) to its grid placement, thereby specifying the inline-start edge of its grid area.
- ")
-let gridRowStart: int => rule
-
-@ocaml.doc("
- The grid-template-areas CSS property specifies named grid areas.
- ")
-let gridTemplateAreas: [< Types.GridTemplateAreas.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The height CSS property specifies the height of an element.
- By default, the property defines the height of the content area.
- If box-sizing is set to border-box, however, it instead determines the height of the border area.
- ")
-let height: [<
-  | Types.Height.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The CSS justify-content property defines how the browser distributes space between and around content items
- along the main-axis of a flex container, and the inline axis of a grid container.
- ")
-let justifyContent: [<
-  | Types.PositionalAlignment.t
-  | Types.NormalAlignment.t
-  | Types.DistributedAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The CSS justify-items property defines the default justify-self for all items of the box, giving them all
- a default way of justifying each box along the appropriate axis.
- ")
-let justifyItems: [<
-  | Types.PositionalAlignment.t
-  | Types.NormalAlignment.t
-  | Types.BaselineAlignment.t
-  | Types.OverflowAlignment.t
-  | Types.LegacyAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The CSS justify-self property sets the way a box is justified inside its alignment container along the appropriate axis.
- ")
-let justifySelf: [<
-  | Types.JustifySelf.t
-  | Types.PositionalAlignment.t
-  | Types.BaselineAlignment.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-let left: [< #auto | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The letter-spacing CSS property sets the spacing behavior between text characters
- ")
-let letterSpacing: [<
-  | Types.LetterSpacing.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The line-height CSS property sets the height of a line box. It's commonly used to set the distance between lines of text.
- On block-level elements, it specifies the minimum height of line boxes within the element.
- On non-replaced inline elements, it specifies the height that is used to calculate line box height.
- ")
-let lineHeight: [< Types.LineHeight.t | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The list-style CSS property is a shorthand to set list style properties list-style-type,
- list-style-image, and list-style-position.
- ")
-let listStyle: (
-  Types.ListStyleType.t,
-  Types.ListStylePosition.t,
-  [< Types.ListStyleImage.t | Types.Url.t],
-) => rule
-
-@ocaml.doc("
- The list-style-image CSS property sets an image to be used as the list item marker.
- It is often more convenient to use the shorthand list-style.
- ")
-let listStyleImage: [<
-  | Types.ListStyleImage.t
-  | Types.Url.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The list-style-type CSS property sets the marker (such as a disc, character, or custom counter style) of a list item element.
- ")
-let listStyleType: [< Types.ListStyleType.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The list-style-position CSS property sets the position of the ::marker relative to a list item.
- ")
-let listStylePosition: [< Types.ListStylePosition.t | Types.Var.t | Types.Cascading.t] => rule
-
-let margin: [< Types.Length.t | Types.Margin.t] => rule
-let margin2: (
-  ~v: [< Types.Length.t | Types.Margin.t],
-  ~h: [< Types.Length.t | Types.Margin.t],
-) => rule
-let margin3: (
-  ~top: [< Types.Length.t | Types.Margin.t],
-  ~h: [< Types.Length.t | Types.Margin.t],
-  ~bottom: [< Types.Length.t | Types.Margin.t],
-) => rule
-let margin4: (
-  ~top: [< Types.Length.t | Types.Margin.t],
-  ~right: [< Types.Length.t | Types.Margin.t],
-  ~bottom: [< Types.Length.t | Types.Margin.t],
-  ~left: [< Types.Length.t | Types.Margin.t],
-) => rule
-
-let marginLeft: [< Types.Length.t | Types.Margin.t | Types.Var.t | Types.Cascading.t] => rule
-
-let marginRight: [< Types.Length.t | Types.Margin.t | Types.Var.t | Types.Cascading.t] => rule
-
-let marginTop: [< Types.Length.t | Types.Margin.t | Types.Var.t | Types.Cascading.t] => rule
-
-let marginBottom: [< Types.Length.t | Types.Margin.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The max-height CSS property sets the maximum height of an element.
- It prevents the used value of the height property from becoming larger than the value specified for max-height.
- ")
-let maxHeight: [<
-  | Types.MaxHeight.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The max-width CSS property sets the maximum width of an element.
- It prevents the used value of the width property from becoming larger than the value specified by max-width.
- ")
-let maxWidth: [<
-  | Types.MaxWidth.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The min-height CSS property sets the minimum height of an element.
- It prevents the used value of the height property from becoming smaller than the value specified for min-height.
- ")
-let minHeight: [<
-  | Types.Height.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The min-width CSS property sets the minimum width of an element.
- It prevents the used value of the width property from becoming smaller than the value specified for min-width.
- ")
-let minWidth: [<
-  | Types.Width.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The object-fit CSS property sets how the content of a replaced element,
- such as an <img> or <video>, should be resized to fit its container.
- ")
-let objectFit: [< Types.ObjectFit.t | Types.Var.t | Types.Cascading.t] => rule
-
-let objectPosition: [<
-  | Types.BackgroundPosition.t
-  | #hv(
-    [Types.BackgroundPosition.X.t | Types.Length.t],
-    [Types.BackgroundPosition.Y.t | Types.Length.t],
-  )
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-let opacity: float => rule
-
-let order: int => rule
-
-let outline: (Types.Length.t, Types.OutlineStyle.t, [< Types.Color.t | Types.Var.t]) => rule
-
-let outlineColor: [< Types.Color.t | Types.Var.t] => rule
-
-let outlineOffset: Types.Length.t => rule
-
-let outlineStyle: Types.OutlineStyle.t => rule
-
-let outlineWidth: Types.Length.t => rule
-
-let overflow: Types.Overflow.t => rule
-
-let overflowX: Types.Overflow.t => rule
-
-let overflowY: Types.Overflow.t => rule
-
-@ocaml.doc("
- The overflow-wrap CSS property applies to inline elements, setting whether the browser
- should insert line breaks within an otherwise unbreakable string to prevent text
- from overflowing its line box.
- ")
-let overflowWrap: [< Types.OverflowWrap.t | Types.Var.t | Types.Cascading.t] => rule
-
-let padding: Types.Length.t => rule
-let padding2: (~v: Types.Length.t, ~h: Types.Length.t) => rule
-let padding3: (~top: Types.Length.t, ~h: Types.Length.t, ~bottom: Types.Length.t) => rule
-let padding4: (
-  ~top: Types.Length.t,
-  ~right: Types.Length.t,
-  ~bottom: Types.Length.t,
-  ~left: Types.Length.t,
-) => rule
-
-let paddingLeft: Types.Length.t => rule
-
-let paddingRight: Types.Length.t => rule
-
-let paddingTop: Types.Length.t => rule
-
-let paddingBottom: Types.Length.t => rule
-
-@ocaml.doc("
- The perspective CSS property determines the distance between the z=0 plane and the user in order
- to give a 3D-positioned element some perspective.
- Each 3D element with z>0 becomes larger; each 3D-element with z<0 becomes smaller.
- The strength of the effect is determined by the value of this property.
- ")
-let perspective: [< Types.Perspective.t | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The perspective-origin CSS property determines the position at which the viewer is looking.
- It is used as the vanishing point by the perspective property.
- ")
-let perspectiveOrigin: (
-  [< Types.Perspective.t | Types.Length.t],
-  [< Types.Perspective.t | Types.Length.t],
-) => rule
-
-@ocaml.doc("
- The pointer-events CSS property sets under what circumstances (if any) a particular graphic element can become the target of pointer events.
- ")
-let pointerEvents: [< Types.PointerEvents.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The position CSS property sets how an element is positioned in a document.
- The top, right, bottom, and left properties determine the final location of positioned elements.
- ")
-let position: [< Types.Position.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The resize CSS property sets whether an element is resizable, and if so,
- in which directions.
- ")
-let resize: [< Types.Resize.t | Types.Var.t | Types.Cascading.t] => rule
-
-let right: [< #auto | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The table-layout CSS property sets the algorithm used to lay out <table> cells, rows, and columns.
- ")
-let tableLayout: [< Types.TableLayout.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-align CSS property sets the horizontal alignment of a block element or table-cell box.
- This means it works like vertical-align but in the horizontal direction.
- ")
-let textAlign: [< Types.TextAlign.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-decoration-color CSS property sets the color of decorations added to text by text-decoration-line.
- ")
-let textDecorationColor: [< Types.Color.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-decoration-line CSS property sets the kind of decoration
- that is used on text in an element, such as an underline or overline.
- ")
-let textDecorationLine: [< Types.TextDecorationLine.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-decoration-style CSS property sets the style of the lines specified by text-decoration-line.
- The style applies to all lines that are set with text-decoration-line.
- ")
-let textDecorationStyle: [< Types.TextDecorationStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-indent CSS property sets the length of empty space (indentation)
- that is put before lines of text in a block.
- ")
-let textIndent: [< Types.Percentage.t | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-overflow CSS property sets how hidden overflow content is signaled to users.
- It can be clipped, display an ellipsis ('…'), or display a custom string.
- ")
-let textOverflow: [< Types.TextOverflow.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The text-shadow CSS property adds shadows to text.
- It accepts a comma-separated list of shadows to be applied to the text and any of its decorations.
- Each shadow is described by some combination of X and Y offsets from the element, blur radius, and color.
- ")
-let textShadow: [< Shadow.t<Shadow.text> | Types.Var.t | Types.Cascading.t] => rule
-let textShadows: list<[Shadow.t<Shadow.text>]> => rule
-
-@ocaml.doc("
- The text-transform CSS property specifies how to capitalize an element's text.
- It can be used to make text appear in all-uppercase or all-lowercase, or with each word capitalized.
- ")
-let textTransform: [< Types.TextTransform.t | Types.Var.t | Types.Cascading.t] => rule
-
-let top: [< #auto | Types.Length.t | Types.Var.t | Types.Cascading.t] => rule
-
-let transform: [< #none | Types.Transform.t] => rule
-
-let transforms: list<Types.Transform.t> => rule
-
-@ocaml.doc("
- The transform-origin CSS property sets the origin for an element's transformations.
- ")
-let transformOrigin: (Types.Length.t, Types.Length.t) => rule
-let transformOrigin3d: (Types.Length.t, Types.Length.t, Types.Length.t) => rule
-
-let transitionDelay: int => rule
-
-let transitionDuration: int => rule
-
-let transitionProperty: string => rule
-
-let transformStyle: [< Types.TransformStyle.t | Types.Var.t | Types.Cascading.t] => rule
-
-let transitionTimingFunction: Types.TimingFunction.t => rule
-
-@ocaml.doc("
- The user-select CSS property controls whether the user can select text.
- This doesn't have any effect on content loaded as chrome, except in textboxes.
- ")
-let userSelect: [< Types.UserSelect.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The vertical-align CSS property sets vertical alignment of an inline or table-cell box.
- ")
-let verticalAlign: [<
-  | Types.VerticalAlign.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The visibility CSS property shows or hides an element without changing the layout of a document.
- The property can also hide rows or columns in a <table>.
- ")
-let visibility: [< Types.Visibility.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The width CSS property sets an element's width.
- By default, it sets the width of the content area, but if box-sizing is set to border-box,
- it sets the width of the border area.
- ")
-let width: [<
-  | Types.Width.t
-  | Types.Percentage.t
-  | Types.Length.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- The white-space CSS property sets how white space inside an element is handled.
- ")
-let whiteSpace: [< Types.WhiteSpace.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The word-break CSS property sets whether line breaks appear wherever the text would otherwise overflow its content box.
- ")
-let wordBreak: [< Types.WordBreak.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The word-spacing CSS property sets the length of space between words and between tags
- ")
-let wordSpacing: [<
-  | Types.WordSpacing.t
-  | Types.Length.t
-  | Types.Percentage.t
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-@ocaml.doc("
- see overflowWrap
- ")
-let wordWrap: [< Types.OverflowWrap.t | Types.Var.t | Types.Cascading.t] => rule
-
-@ocaml.doc("
- The z-index CSS property sets the z-order of a positioned element and its descendants or flex items.
- Overlapping elements with a larger z-index cover those with a smaller one.
- ")
-let zIndex: int => rule
-
-/* *******
- selectors
- ********* */
-
-let selector: (string, list<rule>) => rule
-let media: (string, list<rule>) => rule
-
-@ocaml.doc(" type selector ")
-@ocaml.doc("
- The :active CSS pseudo-class represents an element (such as a button) that is being activated by the user.
- When using a mouse, \"activation\" typically starts when the user presses down the primary mouse button.
- ")
-let /*
- Pseudo-classes selectors
-
- A CSS pseudo-class is a keyword added to a selector that specifies a special state of the selected element(s).
- */
-
-active: list<rule> => rule
-
-@ocaml.doc("
- The :checked CSS pseudo-class selector represents any radio (<input type=\"radio\">), checkbox (<input type=\"checkbox\">),
- or option (<option> in a <select>) element that is checked or toggled to an on state.
- ")
-let checked: list<rule> => rule
-
-@ocaml.doc("
- The :default CSS pseudo-class selects form elements that are the default in a group of related elements.
- ")
-let default: list<rule> => rule
-
-@ocaml.doc("
- The :defined CSS pseudo-class represents any element that has been defined.
- This includes any standard element built in to the browser, and custom elements that have been successfully defined
- (i.e. with the CustomElementRegistry.define() method).
- ")
-let defined: list<rule> => rule
-
-@ocaml.doc("
- The :disabled CSS pseudo-class represents any disabled element.
- An element is disabled if it can't be activated (selected, clicked on, typed into, etc.) or accept focus.
- The element also has an enabled state, in which it can be activated or accept focus.
- ")
-let disabled: list<rule> => rule
-
-@ocaml.doc("
- The :empty CSS pseudo-class represents any element that has no children.
- Children can be either element nodes or text (including whitespace).
- Comments, processing instructions, and CSS content do not affect whether an element is considered empty.
- ")
-let empty: list<rule> => rule
-
-@ocaml.doc("
- The :enabled CSS pseudo-class represents any enabled element.
- An element is enabled if it can be activated (selected, clicked on, typed into, etc.) or accept focus.
- The element also has a disabled state, in which it can't be activated or accept focus.
- ")
-let enabled: list<rule> => rule
-
-@ocaml.doc("
- The :first CSS pseudo-class, used with the  @page at-rule, represents the first page of a printed document.
- ")
-let first: list<rule> => rule
-
-@ocaml.doc("
- The :first-child CSS pseudo-class represents the first element among a group of sibling elements.
- ")
-let firstChild: list<rule> => rule
-
-@ocaml.doc("
- The :first-of-type CSS pseudo-class represents the first element of its type among a group of sibling elements.
- ")
-let firstOfType: list<rule> => rule
-
-@ocaml.doc("
- The :focus CSS pseudo-class represents an element (such as a form input) that has received focus.
- It is generally triggered when the user clicks or taps on an element or selects it with the keyboard's \"tab\" key.
- ")
-let focus: list<rule> => rule
-
-@ocaml.doc("
- The :focus-within CSS pseudo-class represents an element that has received focus or contains an element
- that has received focus. In other words, it represents an element that is itself matched by the :focus pseudo-class or has a descendant that is matched by :focus.
-  (This includes descendants in shadow trees.)
- ")
-let focusWithin: list<rule> => rule
-
-@ocaml.doc("
- The :host CSS pseudo-class selects the shadow host of the shadow DOM containing the CSS it is used inside
- — in other words, this allows you to select a custom element from inside its shadow DOM.
- ")
-let host: (~selector: string=?, list<rule>) => rule
-
-@ocaml.doc("
- The :hover CSS pseudo-class matches when the user interacts with an element with a pointing device,
- but does not necessarily activate it.
- It is generally triggered when the user hovers over an element with the cursor (mouse pointer).
- ")
-let hover: list<rule> => rule
-
-@ocaml.doc("
- The :indeterminate CSS pseudo-class represents any form element whose state is indeterminate.
- ")
-let indeterminate: list<rule> => rule
-
-@ocaml.doc("
- The :in-range CSS pseudo-class represents an <input> element whose current value is
- within the range limits specified by the min and max attributes.
- ")
-let inRange: list<rule> => rule
-
-@ocaml.doc("
- The :invalid CSS pseudo-class represents any <input> or other <form> element whose contents fail to validate.
- ")
-let invalid: list<rule> => rule
-
-@ocaml.doc("
- The :lang() CSS pseudo-class matches elements based on the language they are determined to be in.
- ")
-let lang: (string, list<rule>) => rule
-
-@ocaml.doc("
- The :last-child CSS pseudo-class represents the last element among a group of sibling elements.
- ")
-let lastChild: list<rule> => rule
-
-@ocaml.doc("
- The :last-of-type CSS pseudo-class represents the last element of its type among a group of sibling elements.
- ")
-let lastOfType: list<rule> => rule
-
-//let left: list(rule) => rule;
-
-@ocaml.doc("
- The :link CSS pseudo-class represents an element that has not yet been visited.
- It matches every unvisited <a>, <area>, or <link> element that has an href attribute.
- ")
-let link: list<rule> => rule
-
-@ocaml.doc("
- The :not() CSS pseudo-class represents elements that do not match a list of selectors.
- Since it prevents specific items from being selected, it is known as the negation pseudo-class.
- ")
-let not__: (string, list<rule>) => rule
-
-module Nth: {
-  type t = [#odd | #even | #n(int) | #add(int, int)]
-  let toString: t => string
-}
-
-@ocaml.doc("
- The :nth-child() CSS pseudo-class matches elements based on their position in a group of siblings.
- ")
-let nthChild: (Nth.t, list<rule>) => rule
-
-@ocaml.doc("
- The :nth-last-child() CSS pseudo-class matches elements based on their position among a group of siblings,
- counting from the end.
- ")
-let nthLastChild: (Nth.t, list<rule>) => rule
-
-@ocaml.doc("
- The :nth-last-of-type() CSS pseudo-class matches elements of a given type,
- based on their position among a group of siblings, counting from the end.
- ")
-let nthLastOfType: (Nth.t, list<rule>) => rule
-
-@ocaml.doc("
- The :nth-of-type() CSS pseudo-class matches elements of a given type,
- based on their position among a group of siblings.
- ")
-let nthOfType: (Nth.t, list<rule>) => rule
-
-@ocaml.doc("
- The :only-child CSS pseudo-class represents an element without any siblings.
- This is the same as :first-child:last-child or :nth-child(1):nth-last-child(1),
- but with a lower specificity.
- ")
-let onlyChild: list<rule> => rule
-
-@ocaml.doc("
- The :only-of-type CSS pseudo-class represents an element that has no siblings of the same type.
- ")
-let onlyOfType: list<rule> => rule
-
-@ocaml.doc("
- The :optional CSS pseudo-class represents any <input>, <select>,
- or <textarea> element that does not have the required attribute set on it.
- ")
-let optional: list<rule> => rule
-
-@ocaml.doc("
- The :out-of-range CSS pseudo-class represents an <input> element whose current value
- is outside the range limits specified by the min and max attributes.
- ")
-let outOfRange: list<rule> => rule
-
-@ocaml.doc("
- The :read-only CSS pseudo-class represents an element (such as input or textarea)
- that is not editable by the user.
- ")
-let readOnly: list<rule> => rule
-
-@ocaml.doc("
- The :read-write CSS pseudo-class represents an element (such as input or textarea)
- that is editable by the user.
- ")
-let readWrite: list<rule> => rule
-
-@ocaml.doc("
- The :required CSS pseudo-class represents any <input>, <select>, or <textarea> element
- that has the required attribute set on it.
- ")
-let required: list<rule> => rule
-
-//let right: list(rule) => rule;
-
-@ocaml.doc("
- The :root CSS pseudo-class matches the root element of a tree representing the document.
- In HTML, :root represents the <html> element and is identical to the selector html,
- except that its specificity is higher.
- ")
-let root: list<rule> => rule
-
-@ocaml.doc("
- The :scope CSS pseudo-class represents elements that are a reference point for selectors to match against.
- ")
-let scope: list<rule> => rule
-
-@ocaml.doc("
- The :target CSS pseudo-class represents a unique element (the target element) with an id matching
- the URL's fragment.
- ")
-let target: list<rule> => rule
-
-@ocaml.doc("
- The :valid CSS pseudo-class represents any <input> or other <form> element whose contents validate successfully.
- This allows to easily make valid fields adopt an appearance that helps the user confirm that their data is formatted properly.
- ")
-let valid: list<rule> => rule
-
-@ocaml.doc("
- The :visited CSS pseudo-class represents links that the user has already visited.
- For privacy reasons, the styles that can be modified using this selector are very limited.
- ")
-let visited: list<rule> => rule
-
-/*
- Pseudo-elements selectors
-
- A CSS pseudo-element is a keyword added to a selector that lets you style a specific part of the selected element(s).
- */
-
-@ocaml.doc("
- ::after creates a pseudo-element that is the last child of the selected element.
- It is often used to add cosmetic content to an element with the content property. It is inline by default.
- ")
-let after: list<rule> => rule
-
-@ocaml.doc("
- ::before creates a pseudo-element that is the first child of the selected element.
- It is often used to add cosmetic content to an element with the content property. It is inline by default.
- ")
-let before: list<rule> => rule
-
-@ocaml.doc("
- The ::first-letter CSS pseudo-element applies styles to the first letter of the first line of a block-level element,
- but only when not preceded by other content (such as images or inline tables).
- ")
-let firstLetter: list<rule> => rule
-
-@ocaml.doc("
- The ::first-line CSS pseudo-element applies styles to the first line of a block-level element.
- Note that the length of the first line depends on many factors, including the width of the element,
- the width of the document, and the font size of the text.
- ")
-let firstLine: list<rule> => rule
-
-@ocaml.doc("
- The ::placeholder CSS pseudo-element represents the placeholder text in an <input> or <textarea> element.
- ")
-let placeholder: list<rule> => rule
-
-@ocaml.doc("
- The ::selection CSS pseudo-element applies styles to the part of a document that has been highlighted by the user
- (such as clicking and dragging the mouse across text).
- ")
-let selection: list<rule> => rule
-
-@ocaml.doc("
- Combinators selectors
- ")
-@ocaml.doc("
- The > combinator selects nodes that are direct children of the first element.
- ")
-let child: (string, list<rule>) => rule
-
-@ocaml.doc("
- The > * combinator selects all nodes that are direct children of the first element.
- ")
-let children: list<rule> => rule
-
-@ocaml.doc("
- The + combinator selects adjacent siblings.
- This means that the second element directly follows the first, and both share the same parent.
- ")
-let directSibling: list<rule> => rule
-
-@ocaml.doc("
- The ~ combinator selects siblings.
- This means that the second element follows the first (though not necessarily immediately),
- and both share the same parent.
- ")
-let siblings: list<rule> => rule
-
-/* !experimental! */
-
-let anyLink: list<rule> => rule
-
-/* **************************************************
- Constructor aliases, for ease of use.
- Refer to the equivalent function in the type module.
- **************************************************** */
-
-let initial: [> Types.Cascading.t]
-let inherit_: [> Types.Cascading.t]
-let unset: [> Types.Cascading.t]
-
-let var: string => [> Types.Var.t]
-let varDefault: (string, string) => [> Types.Var.t]
-
-// shared
-let auto: [> #auto]
-let none: [> #none]
-let text: [> #text]
-
-let pct: float => [> Types.Percentage.t]
-
-let ch: float => [> #ch(float)]
-let cm: float => [> #cm(float)]
-let em: float => [> #em(float)]
-let ex: float => [> #ex(float)]
-let mm: float => [> #mm(float)]
-let pt: int => [> #pt(int)]
-let px: int => [> #px(int)]
-let pxFloat: float => [> #pxFloat(float)]
-let rem: float => [> #rem(float)]
-let vh: float => [> #vh(float)]
-let vmin: float => [> #vmin(float)]
-let vmax: float => [> #vmax(float)]
-let zero: [> #zero]
-
-let deg: float => Types.Angle.t
-let rad: float => Types.Angle.t
-let grad: float => Types.Angle.t
-let turn: float => Types.Angle.t
-
-let ltr: [> Types.Direction.t]
-let rtl: [> Types.Direction.t]
-
-let absolute: [> Types.Position.t]
-let relative: [> Types.Position.t]
-let static: [> Types.Position.t]
-let fixed: [> #fixed]
-let sticky: [> Types.Position.t]
-
-let horizontal: [> Types.Resize.t]
-let vertical: [> Types.Resize.t]
-
-let smallCaps: [> Types.FontVariant.t]
-
-/* let normal: [> | Types.FontStyle.t] */
-let italic: [> Types.FontStyle.t]
-let oblique: [> Types.FontStyle.t]
-
-let hidden: [> #hidden]
-let visible: [> #visible]
-let scroll: [> #scroll]
-
-let rgb: (int, int, int) => [> Types.Color.t]
-let rgba: (int, int, int, [#num(float) | #percent(float)]) => [> Types.Color.t]
-let hsl: (Types.Angle.t, Types.Percentage.t, Types.Percentage.t) => [> Types.Color.t]
-let hsla: (
-  Types.Angle.t,
-  Types.Percentage.t,
-  Types.Percentage.t,
-  [#num(float) | #percent(float)],
-) => [> Types.Color.t]
-let hex: string => [> Types.Color.t]
-let transparent: [> Types.Color.t]
-let currentColor: [> Types.Color.t]
-
-let local: [> #local]
-
-let paddingBox: [> #paddingBox]
-let borderBox: [> #borderBox]
-let contentBox: [> #contentBox]
-
-let noRepeat: [> #noRepeat]
-let space: [> #space]
-let repeat: [> #repeat]
-let minmax: [> #minmax]
-let repeatX: [> #repeatX]
-let repeatY: [> #repeatY]
-let contain: [> #contain]
-let cover: [> #cover]
-
-let row: [> #row]
-let rowReverse: [> #rowReverse]
-let column: [> #column]
-let columnReverse: [> #columnReverse]
-let wrap: [> #wrap]
-let nowrap: [> #nowrap]
-let wrapReverse: [> #wrapReverse]
-
-let inline: [> #inline]
-let block: [> #block]
-let contents: [> #contents]
-let flexBox: [> #flex]
-let grid: [> #grid]
-let inlineBlock: [> #inlineBlock]
-let inlineFlex: [> #inlineFlex]
-let inlineGrid: [> #inlineGrid]
-let inlineTable: [> #inlineTable]
-let listItem: [> #listItem]
-let runIn: [> #runIn]
-let table: [> #table]
-let tableCaption: [> #tableCaption]
-let tableColumnGroup: [> #tableColumnGroup]
-let tableHeaderGroup: [> #tableHeaderGroup]
-let tableFooterGroup: [> #tableFooterGroup]
-let tableRowGroup: [> #tableRowGroup]
-let tableCell: [> #tableCell]
-let tableColumn: [> #tableColumn]
-let tableRow: [> #tableRow]
-
-let flexStart: [> #flexStart]
-let flexEnd: [> #flexEnd]
-let center: [> #center]
-let stretch: [> #stretch]
-let spaceBetween: [> #spaceBetween]
-let spaceAround: [> #spaceAround]
-let spaceEvenly: [> #spaceEvenly]
-let baseline: [> #baseline]
-
-let forwards: [> #forwards]
-let backwards: [> #backwards]
-let both: [> #both]
-let infinite: [> #infinite]
-let count: int => [> #count(int)]
-let paused: [> #paused]
-let running: [> #running]
-
-let inside: [> #inside]
-let outside: [> #outside]
-
-let solid: [> #solid]
-let dotted: [> #dotted]
-let dashed: [> #dashed]
-
-let underline: [> #underline]
-let overline: [> #overline]
-let lineThrough: [> #lineThrough]
-
-let clip: [> #clip]
-let ellipsis: [> #ellipsis]
-
-let wavy: [> #wavy]
-let double: [> #double]
-
-let uppercase: [> #uppercase]
-let lowercase: [> #lowercase]
-let capitalize: [> #capitalize]
-
-let sub: [> #sub]
-let super: [> #super]
-let textTop: [> #textTop]
-let textBottom: [> #textBottom]
-let middle: [> #middle]
-
-let normal: [> #normal]
-
-let breakAll: [> #breakAll]
-let keepAll: [> #keepAll]
-let breakWord: [> #breakWord]
-
-let reverse: [> #reverse]
-let alternate: [> #alternate]
-let alternateReverse: [> #alternateReverse]
-
-let fill: [> #fill]
-let content: [> #content]
-let maxContent: [> #maxContent]
-let minContent: [> #minContent]
-let fitContent: [> #fitContent]
-
-let all: [> #all]
-
-let round: [> #round]
-let miter: [> #miter]
-let bevel: [> #bevel]
-let butt: [> #butt]
-let square: [> #square]
-
-let thin: [> Types.FontWeight.t]
-let extraLight: [> Types.FontWeight.t]
-let light: [> Types.FontWeight.t]
-let medium: [> Types.FontWeight.t]
-let semiBold: [> Types.FontWeight.t]
-let bold: [> Types.FontWeight.t]
-let extraBold: [> Types.FontWeight.t]
-let lighter: [> Types.FontWeight.t]
-let bolder: [> Types.FontWeight.t]
-
-let fr: float => [> #fr(float)]
-let vw: float => [> #vw(float)]
-
-let localUrl: string => [> #localUrl(string)]
-let url: string => [> #url(string)]
-
-let linear: [> Types.TimingFunction.t]
-let ease: [> Types.TimingFunction.t]
-let easeIn: [> Types.TimingFunction.t]
-let easeOut: [> Types.TimingFunction.t]
-let easeInOut: [> Types.TimingFunction.t]
-let stepStart: [> Types.TimingFunction.t]
-let stepEnd: [> Types.TimingFunction.t]
-let steps: (int, [#start | #end_]) => [> Types.TimingFunction.t]
-let cubicBezier: (float, float, float, float) => [> Types.TimingFunction.t]
-
-let marginBox: [> Types.GeometyBox.t]
-//let borderBox: [> Types.GeometyBox.t];
-//let paddingBox: [> Types.GeometyBox.t];
-//let contentBox: [> Types.GeometyBox.t];
-let fillBox: [> Types.GeometyBox.t]
-let strokeBox: [> Types.GeometyBox.t]
-let viewBox: [> Types.GeometyBox.t]
-
-let translate: (Types.Length.t, Types.Length.t) => [> Types.Transform.t]
-let translate3d: (Types.Length.t, Types.Length.t, Types.Length.t) => [> Types.Transform.t]
-let translateX: Types.Length.t => [> Types.Transform.t]
-let translateY: Types.Length.t => [> Types.Transform.t]
-let translateZ: Types.Length.t => [> Types.Transform.t]
-let scale: (float, float) => [> Types.Transform.t]
-let scale3d: (float, float, float) => [> Types.Transform.t]
-let scaleX: float => [> Types.Transform.t]
-let scaleY: float => [> Types.Transform.t]
-let scaleZ: float => [> Types.Transform.t]
-let rotate: Types.Angle.t => [> Types.Transform.t]
-let rotate3d: (float, float, float, Types.Angle.t) => [> Types.Transform.t]
-let rotateX: Types.Angle.t => [> Types.Transform.t]
-let rotateY: Types.Angle.t => [> Types.Transform.t]
-let rotateZ: Types.Angle.t => [> Types.Transform.t]
-let skew: (Types.Angle.t, Types.Angle.t) => [> Types.Transform.t]
-let skewX: Types.Angle.t => [> Types.Transform.t]
-let skewY: Types.Angle.t => [> Types.Transform.t]
-
-let linearGradient: (
-  Types.Angle.t,
-  list<(Types.Length.t, [< Types.Color.t | Types.Var.t] as 'colorOrVar)>,
-) => [> Types.Gradient.t<'colorOrVar>]
-let repeatingLinearGradient: (
-  Types.Angle.t,
-  list<(Types.Length.t, [< Types.Color.t | Types.Var.t] as 'colorOrVar)>,
-) => [> Types.Gradient.t<'colorOrVar>]
-let radialGradient: list<(Types.Length.t, [< Types.Color.t | Types.Var.t] as 'colorOrVar)> => [>
-  | Types.Gradient.t<'colorOrVar>
-]
-let repeatingRadialGradient: list<(
-  Types.Length.t,
-  [< Types.Color.t | Types.Var.t] as 'colorOrVar,
-)> => [> Types.Gradient.t<'colorOrVar>]
-
-let areas: list<string> => [> Types.GridTemplateAreas.t]
-let ident: string => [> Types.GridArea.t]
-let numIdent: (int, string) => [> Types.GridArea.t]
-
-// cursor aliases
-//let auto: [> Types.Cursor.t];
-//let default: [> Types.Cursor.t];
-//let none: [> Types.Cursor.t];
-let contextMenu: [> Types.Cursor.t]
-let help: [> Types.Cursor.t]
-let pointer: [> Types.Cursor.t]
-let progress: [> Types.Cursor.t]
-let wait: [> Types.Cursor.t]
-let cell: [> Types.Cursor.t]
-let crosshair: [> Types.Cursor.t]
-//let text: [> Types.Cursor.t];
-let verticalText: [> Types.Cursor.t]
-let alias: [> Types.Cursor.t]
-let copy: [> Types.Cursor.t]
-let move: [> Types.Cursor.t]
-let noDrop: [> Types.Cursor.t]
-let notAllowed: [> Types.Cursor.t]
-let grab: [> Types.Cursor.t]
-let grabbing: [> Types.Cursor.t]
-let allScroll: [> Types.Cursor.t]
-let colResize: [> Types.Cursor.t]
-let rowResize: [> Types.Cursor.t]
-let nResize: [> Types.Cursor.t]
-let eResize: [> Types.Cursor.t]
-let sResize: [> Types.Cursor.t]
-let wResize: [> Types.Cursor.t]
-let neResize: [> Types.Cursor.t]
-let nwResize: [> Types.Cursor.t]
-let seResize: [> Types.Cursor.t]
-let swResize: [> Types.Cursor.t]
-let ewResize: [> Types.Cursor.t]
-let nsResize: [> Types.Cursor.t]
-let neswResize: [> Types.Cursor.t]
-let nwseResize: [> Types.Cursor.t]
-let zoomIn: [> Types.Cursor.t]
-let zoomOut: [> Types.Cursor.t]
-
-/* *******************************************************
- ********************************************************
- ******************************************************* */
-
-let flex3: (~grow: float, ~shrink: float, ~basis: [< Types.Length.t | Types.FlexBasis.t]) => rule
-
-let border: (
-  Types.Length.t,
-  [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t],
-  [< Types.Color.t | Types.Var.t],
-) => rule
-let borderTop: (
-  Types.Length.t,
-  [< Types.BorderStyle.t | Types.Var.t | Types.Cascading.t],
-  [< Types.Color.t | Types.Var.t],
-) => rule
-let backgroundSize: [#size(Types.Length.t, Types.Length.t) | #auto | #cover | #contain] => rule
-
-let textDecoration: [
-  | #none
-  | #underline
-  | #overline
-  | #lineThrough
-  | Types.Var.t
-  | Types.Cascading.t
-] => rule
-
-let background: [< Types.Color.t | Types.Url.t | Types.Gradient.t<'gradient> | #none] => rule
-let backgrounds: list<[< Types.Color.t | Types.Url.t | Types.Gradient.t<'gradient> | #none]> => rule
-
-type minmax = [
-  | #fr(float)
-  | #minContent
-  | #maxContent
-  | #auto
-  | Types.Length.t
-]
-
-type trackLength = [
-  | Types.Length.t
-  | #auto
-  | #fr(float)
-  | #minContent
-  | #maxContent
-  | #minmax(minmax, minmax)
-]
-type gridLength = [trackLength | #repeat(Types.RepeatValue.t, trackLength)]
-
-let gridAutoColumns: [< trackLength | #auto] => rule
-let gridAutoRows: [< trackLength | #auto] => rule
-let gridTemplateColumns: list<[< gridLength | #auto]> => rule
-let gridTemplateRows: list<[< gridLength | #auto]> => rule
-
-module Calc: {
-  let \"-": (Types.Length.t, Types.Length.t) => [> Types.Length.t]
-  let \"+": (Types.Length.t, Types.Length.t) => [> Types.Length.t]
-}
-
-let size: (Types.Length.t, Types.Length.t) => [> #size(Types.Length.t, Types.Length.t)]
-
-type filter = [
-  | #blur(Types.Length.t)
-  | #brightness(float)
-  | #contrast(float)
-  | #dropShadow(Types.Length.t, Types.Length.t, Types.Length.t, Types.Color.t)
-  | #grayscale(float)
-  | #hueRotate(Types.Angle.t)
-  | #invert(float)
-  | #opacity(float)
-  | #saturate(float)
-  | #sepia(float)
-  | #none
-  | Types.Url.t
-  | Types.Var.t
-  | Types.Cascading.t
-]
-
-let filter: list<filter> => rule
-
-let fontFace: (
-  ~fontFamily: string,
-  ~src: list<[< #localUrl(string) | Types.Url.t]>,
-  ~fontStyle: Types.FontStyle.t=?,
-  ~fontWeight: [< Types.FontWeight.t | Types.Var.t | Types.Cascading.t]=?,
-  ~fontDisplay: Types.FontDisplay.t=?,
-  unit,
-) => string
-
-@ocaml.doc("
-  * Transition
-  ")
-module Transition: {
-  type t = [#value(string)]
-
-  let shorthand: (
-    ~duration: int=?,
-    ~delay: int=?,
-    ~timingFunction: Types.TimingFunction.t=?,
-    string,
-  ) => [> t]
-
-  let toString: t => string
-}
-
-let transitionValue: Transition.t => rule
-let transitionList: list<[Transition.t]> => rule
-
-let transition: (
-  ~duration: int=?,
-  ~delay: int=?,
-  ~timingFunction: Types.TimingFunction.t=?,
-  string,
-) => rule
-let transitions: list<[Transition.t]> => rule
-
-@ocaml.doc("
- * Animation
- ")
-module Animation: {
-  type t = [#value(string)]
-
-  let shorthand: (
-    ~duration: int=?,
-    ~delay: int=?,
-    ~direction: Types.AnimationDirection.t=?,
-    ~timingFunction: Types.TimingFunction.t=?,
-    ~fillMode: Types.AnimationFillMode.t=?,
-    ~playState: Types.AnimationPlayState.t=?,
-    ~iterationCount: Types.AnimationIterationCount.t=?,
-    animationName,
-  ) => [> t]
-
-  let toString: t => string
-}
-
-let animationValue: Animation.t => rule
-let animation: (
-  ~duration: int=?,
-  ~delay: int=?,
-  ~direction: Types.AnimationDirection.t=?,
-  ~timingFunction: Types.TimingFunction.t=?,
-  ~fillMode: Types.AnimationFillMode.t=?,
-  ~playState: Types.AnimationPlayState.t=?,
-  ~iterationCount: Types.AnimationIterationCount.t=?,
-  animationName,
-) => rule
-let animations: list<[Animation.t]> => rule
-
-let animationName: animationName => rule
-
-/**
- SVG
- *** */
-
-module SVG: {
-  let fill: [< Types.SVG.Fill.t | Types.Color.t | Types.Var.t | Types.Url.t] => rule
-  let fillRule: [#nonzero | #evenodd] => rule
-  let fillOpacity: float => rule
-  let stroke: [< Types.Color.t | Types.Var.t] => rule
-  let strokeDasharray: [< #none | #dasharray(list<[< Types.Length.t | Types.Percentage.t]>)] => rule
-  let strokeLinecap: [#butt | #round | #square] => rule
-  let strokeLinejoin: [#miter | #round | #bevel] => rule
-  let strokeMiterlimit: float => rule
-  let strokeWidth: Types.Length.t => rule
-  let strokeOpacity: float => rule
-  let stopColor: [< Types.Color.t | Types.Var.t] => rule
-  let stopOpacity: float => rule
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Css_test.res b/jscomp/syntax/tests/idempotency/bs-css/Css_test.res
deleted file mode 100644
index 900e1d1..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Css_test.res
+++ /dev/null
@@ -1,811 +0,0 @@
-module CssForTest = {
-  include Css_Colors
-  include Css_Legacy_Core
-  include Css_Legacy_Core.Make({
-    exception NotImplemented
-
-    let mergeStyles = (. _) => raise(NotImplemented)
-    let make = (. _) => raise(NotImplemented)
-    let injectRule = (. _) => raise(NotImplemented)
-    let injectRaw = (. _) => raise(NotImplemented)
-    let makeKeyFrames = (. _) => raise(NotImplemented)
-  })
-}
-
-open Jest
-open Expect
-open CssForTest
-
-let toBeJson = x => Expect.toBe(x->Js.Json.stringifyAny)
-let r = x => toJson(list{x}) /* simple rule for more readable tests */
-
-describe("Var", () => {
-  test("test usage (limited)", () =>
-    expect((r(color(var("foo"))), r(marginTop(var("--bar"))))->Js.Json.stringifyAny) |> toBeJson((
-      {"color": "var(--foo)"},
-      {"marginTop": "var(--bar)"},
-    ))
-  )
-
-  test("test usage with default (limited)", () =>
-    expect(
-      (
-        r(textDecoration(varDefault("foo", "default"))),
-        r(alignItems(varDefault("--bar", "default"))),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson(({"textDecoration": "var(--foo,default)"}, {"alignItems": "var(--bar,default)"}))
-  )
-})
-
-describe("Color style", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(color(rgb(1, 2, 3))),
-        r(color(rgba(4, 5, 6, #num(0.3)))),
-        r(color(hsl(deg(7.), pct(8.), pct(9.)))),
-        r(color(hsla(deg(10.), pct(11.), pct(12.), #num(0.5)))),
-        r(color(hsla(rad(4.7), pct(11.), pct(12.), pct(50.)))),
-        r(color(transparent)),
-        r(color(hex("FFF"))),
-        r(color(currentColor)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"color": "rgb(1, 2, 3)"},
-      {"color": "rgba(4, 5, 6, 0.3)"},
-      {"color": "hsl(7deg, 8%, 9%)"},
-      {"color": "hsla(10deg, 11%, 12%, 0.5)"},
-      {"color": "hsla(4.7rad, 11%, 12%, 50%)"},
-      {"color": "transparent"},
-      {"color": "#FFF"},
-      {"color": "currentColor"},
-    ))
-  )
-)
-
-describe("Label", () =>
-  test("test value", () => expect(r(label("a"))->Js.Json.stringifyAny) |> toBeJson({"label": "a"}))
-)
-//  test("test classname", () =>
-//    expect(style([label("theName")])) |> toContainString("theName")
-//  );
-
-describe("Filter", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(filter(list{#opacity(10.), #invert(20.)})),
-        r(filter(list{#blur(#px(20)), #brightness(20.)})),
-        r(filter(list{#contrast(30.), #dropShadow(#px(5), #px(6), #px(7), #rgb(255, 0, 0))})),
-        r(filter(list{#grayscale(10.), #hueRotate(#deg(180.))})),
-        r(filter(list{#saturate(10.), #sepia(100.)})),
-        r(filter(list{#none})),
-        r(filter(list{#inherit_})),
-        r(filter(list{#initial})),
-        r(filter(list{#unset})),
-        r(filter(list{#url("myurl")})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"filter": "opacity(10%) invert(20%)"},
-      {"filter": "blur(20px) brightness(20%)"},
-      {"filter": "contrast(30%) drop-shadow(5px 6px 7px rgb(255, 0, 0))"},
-      {"filter": "grayscale(10%) hue-rotate(180deg)"},
-      {"filter": "saturate(10%) sepia(100%)"},
-      {"filter": "none"},
-      {"filter": "inherit"},
-      {"filter": "initial"},
-      {"filter": "unset"},
-      {"filter": "url(myurl)"},
-    ))
-  )
-)
-
-describe("Angle", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(transform(rotate(deg(1.)))),
-        r(transform(rotate(rad(6.28)))),
-        r(transform(rotate(grad(38.8)))),
-        r(transform(rotate(turn(0.25)))),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"transform": "rotate(1deg)"},
-      {"transform": "rotate(6.28rad)"},
-      {"transform": "rotate(38.8grad)"},
-      {"transform": "rotate(0.25turn)"},
-    ))
-  )
-)
-
-describe("Direction", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(direction(#ltr)),
-        r(direction(ltr)),
-        r(direction(rtl)),
-        r(direction(inherit_)),
-        r(direction(unset)),
-        r(direction(initial)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"direction": "ltr"},
-      {"direction": "ltr"},
-      {"direction": "rtl"},
-      {"direction": "inherit"},
-      {"direction": "unset"},
-      {"direction": "initial"},
-    ))
-  )
-)
-
-describe("Resize", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(resize(none)),
-        r(resize(both)),
-        r(resize(horizontal)),
-        r(resize(vertical)),
-        r(resize(block)),
-        r(resize(inline)),
-        r(resize(inherit_)),
-        r(resize(unset)),
-        r(resize(initial)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"resize": "none"},
-      {"resize": "both"},
-      {"resize": "horizontal"},
-      {"resize": "vertical"},
-      {"resize": "block"},
-      {"resize": "inline"},
-      {"resize": "inherit"},
-      {"resize": "unset"},
-      {"resize": "initial"},
-    ))
-  )
-)
-
-describe("Backdrop filter", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(backdropFilter(list{#none})),
-        r(backdropFilter(list{#blur(#px(10)), #brightness(#percent(42.0))})),
-        r(backdropFilter(list{#contrast(#num(10)), #dropShadow(#percent(0.5))})),
-        r(backdropFilter(list{#grayscale(#percent(99.9)), #hueRotate(#deg(90.0))})),
-        r(backdropFilter(list{#invert(#num(30)), #opacity(#percent(10.0))})),
-        r(backdropFilter(list{#saturate(#num(30)), #sepia(#percent(10.0))})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"backdrop-filter": "none"},
-      {"backdrop-filter": "blur(10px), brightness(42%)"},
-      {"backdrop-filter": "contrast(10), drop-shadow(0.5%)"},
-      {"backdrop-filter": "grayscale(99.9%), hue-rotate(90deg)"},
-      {"backdrop-filter": "invert(30), opacity(10%)"},
-      {"backdrop-filter": "saturate(30), sepia(10%)"},
-    ))
-  )
-)
-
-describe("Gradient background", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(background(linearGradient(deg(45.), list{(zero, red), (pct(100.), blue)}))),
-        r(background(repeatingLinearGradient(deg(45.), list{(zero, red), (px(10), blue)}))),
-        r(background(radialGradient(list{(zero, red), (pct(100.), blue)}))),
-        r(
-          background(
-            repeatingRadialGradient(list{
-              (zero, red),
-              (
-                {
-                  open Calc
-                  pct(20.) + px(5)
-                },
-                blue,
-              ),
-            }),
-          ),
-        ),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"background": "linear-gradient(45deg, #FF0000 0, #0000FF 100%)"},
-      {
-        "background": "repeating-linear-gradient(45deg, #FF0000 0, #0000FF 10px)",
-      },
-      {"background": "radial-gradient(#FF0000 0, #0000FF 100%)"},
-      {
-        "background": "repeating-radial-gradient(#FF0000 0, #0000FF calc(20% + 5px))",
-      },
-    ))
-  )
-)
-
-describe("Position", () => {
-  test("should use length", () =>
-    expect(
-      (
-        r(top(px(10))),
-        r(right(rem(1.))),
-        r(bottom(pct(20.))),
-        r(left(vh(4.))),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson(({"top": "10px"}, {"right": "1rem"}, {"bottom": "20%"}, {"left": "4vh"}))
-  )
-
-  test("should allow cascading", () =>
-    expect(
-      (
-        r(top(initial)),
-        r(right(inherit_)),
-        r(bottom(unset)),
-        r(left(initial)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"top": "initial"},
-      {"right": "inherit"},
-      {"bottom": "unset"},
-      {"left": "initial"},
-    ))
-  )
-})
-
-describe("object-fit", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(objectFit(#fill)),
-        r(objectFit(#contain)),
-        r(objectFit(#cover)),
-        r(objectFit(#none)),
-        r(objectFit(#scaleDown)),
-        r(objectFit(#inherit_)),
-        r(objectFit(#initial)),
-        r(objectFit(#unset)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"objectFit": "fill"},
-      {"objectFit": "contain"},
-      {"objectFit": "cover"},
-      {"objectFit": "none"},
-      {"objectFit": "scale-down"},
-      {"objectFit": "inherit"},
-      {"objectFit": "initial"},
-      {"objectFit": "unset"},
-    ))
-  )
-)
-
-describe("box-shadow", () => {
-  test("should allow single or list definition", () =>
-    expect(
-      (
-        r(boxShadow(Shadow.box(green))),
-        r(boxShadows(list{Shadow.box(yellow), Shadow.box(red)})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"boxShadow": "0 0 0 0 #008000"},
-      {"boxShadow": "0 0 0 0 #FFFF00, 0 0 0 0 #FF0000"},
-    ))
-  )
-
-  test("should use options when present", () =>
-    expect(
-      (
-        r(boxShadow(Shadow.box(~x=px(1), ~y=px(2), red))),
-        r(boxShadow(Shadow.box(~inset=true, red))),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson(({"boxShadow": "1px 2px 0 0 #FF0000"}, {"boxShadow": "0 0 0 0 #FF0000 inset"}))
-  )
-
-  test("should allow special values", () =>
-    expect(
-      (
-        r(boxShadow(none)),
-        r(boxShadow(inherit_)),
-        r(boxShadow(initial)),
-        r(boxShadow(unset)),
-        r(important(boxShadow(none))),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"boxShadow": "none"},
-      {"boxShadow": "inherit"},
-      {"boxShadow": "initial"},
-      {"boxShadow": "unset"},
-      {"boxShadow": "none !important"},
-    ))
-  )
-})
-
-describe("text-shadow", () => {
-  test("should allow single or list definition", () =>
-    expect(
-      (
-        r(textShadow(Shadow.text(green))),
-        r(textShadows(list{Shadow.text(yellow), Shadow.text(red)})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson(({"textShadow": "0 0 0 #008000"}, {"textShadow": "0 0 0 #FFFF00, 0 0 0 #FF0000"}))
-  )
-
-  test("should use options when present", () =>
-    expect(
-      (
-        r(textShadow(Shadow.text(~x=px(1), ~y=px(2), red))),
-        r(textShadow(Shadow.text(~blur=vh(1.), red))),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson(({"textShadow": "1px 2px 0 #FF0000"}, {"textShadow": "0 0 1vh #FF0000"}))
-  )
-
-  test("should allow special values", () =>
-    expect(
-      (
-        r(textShadow(none)),
-        r(textShadow(inherit_)),
-        r(textShadow(initial)),
-        r(textShadow(unset)),
-        r(important(textShadow(none))),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"textShadow": "none"},
-      {"textShadow": "inherit"},
-      {"textShadow": "initial"},
-      {"textShadow": "unset"},
-      {"textShadow": "none !important"},
-    ))
-  )
-})
-
-describe("transitions", () => {
-  test("should allow single or list definition", () =>
-    expect(
-      (
-        r(transition("transform")),
-        r(transitions(list{Transition.shorthand("height"), Transition.shorthand("top")})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"transition": "0ms ease 0ms transform"},
-      {"transition": "0ms ease 0ms height, 0ms ease 0ms top"},
-    ))
-  )
-
-  test("should use options when present", () =>
-    expect(
-      r(transition(~duration=3, ~delay=4, ~timingFunction=easeOut, "top"))->Js.Json.stringifyAny,
-    ) |> toBeJson({"transition": "3ms ease-out 4ms top"})
-  )
-})
-
-external toAnimationName: string => animationName = "%identity"
-
-describe("animation", () => {
-  test("should allow single or list definition", () =>
-    expect(
-      (
-        r(animation(toAnimationName("a"))),
-        r(
-          animations(list{
-            Animation.shorthand(toAnimationName("a1")),
-            Animation.shorthand(toAnimationName("a2")),
-          }),
-        ),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"animation": "a 0ms ease 0ms 1 normal none running"},
-      {
-        "animation": "a1 0ms ease 0ms 1 normal none running, a2 0ms ease 0ms 1 normal none running",
-      },
-    ))
-  )
-
-  test("should use options when present", () =>
-    expect(
-      r(
-        animation(
-          ~duration=300,
-          ~delay=400,
-          ~direction=reverse,
-          ~timingFunction=linear,
-          ~fillMode=forwards,
-          ~playState=running,
-          ~iterationCount=infinite,
-          toAnimationName("a"),
-        ),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson({
-      "animation": "a 300ms linear 400ms infinite reverse forwards running",
-    })
-  )
-})
-
-describe("Word spacing", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(wordSpacing(#normal)),
-        r(wordSpacing(vh(1.))),
-        r(wordSpacing(pct(50.))),
-        r(wordSpacing(inherit_)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"wordSpacing": "normal"},
-      {"wordSpacing": "1vh"},
-      {"wordSpacing": "50%"},
-      {"wordSpacing": "inherit"},
-    ))
-  )
-)
-
-describe("gridTemplateAreas", () => {
-  test("takes acceptable types & cascades", () =>
-    expect(
-      (
-        r(gridTemplateAreas(#none)),
-        r(gridTemplateAreas(#areas(list{"a"}))),
-        r(gridTemplateAreas(#inherit_)),
-        r(gridTemplateAreas(#initial)),
-        r(gridTemplateAreas(#unset)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"gridTemplateAreas": "none"},
-      {"gridTemplateAreas": "'a'"},
-      {"gridTemplateAreas": "inherit"},
-      {"gridTemplateAreas": "initial"},
-      {"gridTemplateAreas": "unset"},
-    ))
-  )
-
-  test("sucessfully combines list", () =>
-    expect(r(gridTemplateAreas(#areas(list{"a a a", "b b b"})))->Js.Json.stringifyAny) |> toBeJson({
-      "gridTemplateAreas": "'a a a' 'b b b'",
-    })
-  )
-})
-
-describe("GridArea", () => {
-  test("gridArea takes values & cascades", () =>
-    expect(
-      (
-        r(gridArea(#auto)),
-        r(gridArea(#ident("a"))),
-        r(gridArea(#num(1))),
-        r(gridArea(#numIdent(1, "a"))),
-        r(gridArea(#span(#num(1)))),
-        r(gridArea(#span(#ident("a")))),
-        r(gridArea(#inherit_)),
-        r(gridArea(#initial)),
-        r(gridArea(#unset)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"gridArea": "auto"},
-      {"gridArea": "a"},
-      {"gridArea": "1"},
-      {"gridArea": "1 a"},
-      {"gridArea": "span 1"},
-      {"gridArea": "span a"},
-      {"gridArea": "inherit"},
-      {"gridArea": "initial"},
-      {"gridArea": "unset"},
-    ))
-  )
-
-  test("multi-arg functions add in slashes", () =>
-    expect(
-      (
-        r(gridArea2(#auto, #num(1))),
-        r(gridArea3(#ident("a"), #numIdent(1, "a"), #auto)),
-        r(gridArea4(#num(5), #span(#num(16)), #span(#ident("b")), #auto)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"gridArea": "auto / 1"},
-      {"gridArea": "a / 1 a / auto"},
-      {"gridArea": "5 / span 16 / span b / auto"},
-    ))
-  )
-})
-
-describe("gridTemplateCoumns", () => {
-  test("concatenates list", () =>
-    expect(
-      r(gridTemplateColumns(list{#fr(1.), #px(100), #auto}))->Js.Json.stringifyAny,
-    ) |> toBeJson({"gridTemplateColumns": "1fr 100px auto"})
-  )
-
-  test("unfolds repeats", () =>
-    expect(
-      (
-        r(gridTemplateColumns(list{#repeat(#num(4), #fr(1.))})),
-        r(gridTemplateColumns(list{#repeat(#num(4), #auto)})),
-        r(gridTemplateColumns(list{#repeat(#num(4), #minContent)})),
-        r(gridTemplateColumns(list{#repeat(#num(4), #maxContent)})),
-        r(gridTemplateColumns(list{#repeat(#num(4), #minmax(#px(100), #fr(1.)))})),
-        // r(gridTemplateColumns([`repeat(`num(4), `fitContent(`px(200)))])),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"gridTemplateColumns": "repeat(4, 1fr)"},
-      {"gridTemplateColumns": "repeat(4, auto)"},
-      {"gridTemplateColumns": "repeat(4, min-content)"},
-      {"gridTemplateColumns": "repeat(4, max-content)"},
-      {"gridTemplateColumns": "repeat(4, minmax(100px,1fr))"},
-      //  {"gridTemplateColumns": "repeat(4, fit-content(200px))"},
-    ))
-  )
-})
-
-describe("backgroundPosition", () => {
-  test("test single values", () =>
-    expect(
-      (
-        r(backgroundPosition(#left)),
-        r(backgroundPosition(#right)),
-        r(backgroundPosition(#top)),
-        r(backgroundPosition(#bottom)),
-        r(backgroundPosition(center)),
-        r(backgroundPosition(pct(50.))),
-        r(backgroundPosition(initial)),
-        r(backgroundPosition(inherit_)),
-        r(backgroundPosition(unset)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"backgroundPosition": "left"},
-      {"backgroundPosition": "right"},
-      {"backgroundPosition": "top"},
-      {"backgroundPosition": "bottom"},
-      {"backgroundPosition": "center"},
-      {"backgroundPosition": "50%"},
-      {"backgroundPosition": "initial"},
-      {"backgroundPosition": "inherit"},
-      {"backgroundPosition": "unset"},
-    ))
-  )
-
-  test("test two values", () =>
-    expect(
-      (
-        r(backgroundPosition(#hv(#left, center))),
-        r(backgroundPosition(#hv(#right, pct(50.)))),
-        r(backgroundPosition(#hv(pct(50.), #top))),
-        r(backgroundPosition(#hv(pct(50.), pct(50.)))),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"backgroundPosition": "left center"},
-      {"backgroundPosition": "right 50%"},
-      {"backgroundPosition": "50% top"},
-      {"backgroundPosition": "50% 50%"},
-    ))
-  )
-
-  test("test multiple positions", () =>
-    expect(
-      r(backgroundPositions(list{#hv(px(0), px(0)), center}))->Js.Json.stringifyAny,
-    ) |> toBeJson({"backgroundPosition": "0px 0px, center"})
-  )
-
-  test("test edge offsets values", () =>
-    expect(
-      r(
-        backgroundPosition4(~y=#top, ~offsetY=px(10), ~x=#right, ~offsetX=px(50)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson({"backgroundPosition": "right 50px top 10px"})
-  )
-})
-
-describe("backgroundRepeat", () => {
-  test("test single values", () =>
-    expect(
-      (
-        r(backgroundRepeat(repeatX)),
-        r(backgroundRepeat(repeatY)),
-        r(backgroundRepeat(repeat)),
-        r(backgroundRepeat(space)),
-        r(backgroundRepeat(round)),
-        r(backgroundRepeat(noRepeat)),
-        r(backgroundRepeat(inherit_)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"backgroundRepeat": "repeat-x"},
-      {"backgroundRepeat": "repeat-y"},
-      {"backgroundRepeat": "repeat"},
-      {"backgroundRepeat": "space"},
-      {"backgroundRepeat": "round"},
-      {"backgroundRepeat": "no-repeat"},
-      {"backgroundRepeat": "inherit"},
-    ))
-  )
-
-  test("test two values", () =>
-    expect(
-      (
-        r(backgroundRepeat(#hv(repeat, space))),
-        r(backgroundRepeat(#hv(repeat, repeat))),
-        r(backgroundRepeat(#hv(round, space))),
-        r(backgroundRepeat(#hv(noRepeat, round))),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"backgroundRepeat": "repeat space"},
-      {"backgroundRepeat": "repeat repeat"},
-      {"backgroundRepeat": "round space"},
-      {"backgroundRepeat": "no-repeat round"},
-    ))
-  )
-})
-
-describe("backgroundImage", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(backgroundImage(none)),
-        r(backgroundImage(url("x"))),
-        r(backgroundImage(linearGradient(deg(5.), list{(pct(10.), red)}))),
-        r(backgroundImage(repeatingLinearGradient(rad(6.), list{(pct(20.), black)}))),
-        r(backgroundImage(radialGradient(list{(pct(30.), yellow)}))),
-        r(backgroundImage(repeatingRadialGradient(list{(pct(30.), yellow)}))),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"backgroundImage": "none"},
-      {"backgroundImage": "url(x)"},
-      {"backgroundImage": "linear-gradient(5deg, #FF0000 10%)"},
-      {"backgroundImage": "repeating-linear-gradient(6rad, #000000 20%)"},
-      {"backgroundImage": "radial-gradient(#FFFF00 30%)"},
-      {"backgroundImage": "repeating-radial-gradient(#FFFF00 30%)"},
-    ))
-  )
-)
-
-describe("background shorhand", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(background(rgb(1, 2, 3))),
-        r(background(url("x"))),
-        r(background(linearGradient(deg(5.), list{(pct(10.), red)}))),
-        r(background(none)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"background": "rgb(1, 2, 3)"},
-      {"background": "url(x)"},
-      {"background": "linear-gradient(5deg, #FF0000 10%)"},
-      {"background": "none"},
-    ))
-  )
-)
-
-describe("clipPath", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(clipPath(none)),
-        r(clipPath(url("x"))),
-        r(clipPath(marginBox)),
-        r(clipPath(borderBox)),
-        r(clipPath(paddingBox)),
-        r(clipPath(contentBox)),
-        r(clipPath(fillBox)),
-        r(clipPath(strokeBox)),
-        r(clipPath(viewBox)),
-        r(clipPath(inherit_)),
-        r(clipPath(initial)),
-        r(clipPath(unset)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"clipPath": "none"},
-      {"clipPath": "url(x)"},
-      {"clipPath": "margin-box"},
-      {"clipPath": "border-box"},
-      {"clipPath": "padding-box"},
-      {"clipPath": "content-box"},
-      {"clipPath": "fill-box"},
-      {"clipPath": "stroke-box"},
-      {"clipPath": "view-box"},
-      {"clipPath": "inherit"},
-      {"clipPath": "initial"},
-      {"clipPath": "unset"},
-    ))
-  )
-)
-
-describe("columnGap", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(columnGap(normal)),
-        r(columnGap(px(3))),
-        r(columnGap(em(2.5))),
-        r(columnGap(pct(3.))),
-        r(columnGap(inherit_)),
-        r(columnGap(initial)),
-        r(columnGap(unset)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"columnGap": "normal"},
-      {"columnGap": "3px"},
-      {"columnGap": "2.5em"},
-      {"columnGap": "3%"},
-      {"columnGap": "inherit"},
-      {"columnGap": "initial"},
-      {"columnGap": "unset"},
-    ))
-  )
-)
-
-describe("cursor", () =>
-  test("test values", () =>
-    expect(
-      (
-        //let auto: [> Types.Cursor.t];
-        //let default: [> Types.Cursor.t];
-        //let none: [> Types.Cursor.t];
-        r(cursor(contextMenu)),
-        r(cursor(help)),
-        r(cursor(pointer)),
-        r(cursor(progress)),
-        r(cursor(wait)),
-        r(cursor(cell)),
-        r(cursor(crosshair)),
-        r(cursor(text)),
-        r(cursor(verticalText)),
-        r(cursor(alias)),
-        r(cursor(copy)),
-        r(cursor(move)),
-        r(cursor(noDrop)),
-        r(cursor(notAllowed)),
-        r(cursor(grab)),
-        r(cursor(grabbing)),
-        r(cursor(allScroll)),
-        r(cursor(colResize)),
-        r(cursor(rowResize)),
-        r(cursor(nResize)),
-        r(cursor(eResize)),
-        r(cursor(sResize)),
-        r(cursor(wResize)),
-        r(cursor(neResize)),
-        r(cursor(nwResize)),
-        r(cursor(seResize)),
-        r(cursor(swResize)),
-        r(cursor(ewResize)),
-        r(cursor(nsResize)),
-        r(cursor(neswResize)),
-        r(cursor(nwseResize)),
-        r(cursor(zoomIn)),
-        r(cursor(zoomOut)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"cursor": "context-menu"},
-      {"cursor": "help"},
-      {"cursor": "pointer"},
-      {"cursor": "progress"},
-      {"cursor": "wait"},
-      {"cursor": "cell"},
-      {"cursor": "crosshair"},
-      {"cursor": "text"},
-      {"cursor": "vertical-text"},
-      {"cursor": "alias"},
-      {"cursor": "copy"},
-      {"cursor": "move"},
-      {"cursor": "no-drop"},
-      {"cursor": "not-allowed"},
-      {"cursor": "grab"},
-      {"cursor": "grabbing"},
-      {"cursor": "all-scroll"},
-      {"cursor": "col-resize"},
-      {"cursor": "row-resize"},
-      {"cursor": "n-resize"},
-      {"cursor": "e-resize"},
-      {"cursor": "s-resize"},
-      {"cursor": "w-resize"},
-      {"cursor": "ne-resize"},
-      {"cursor": "nw-resize"},
-      {"cursor": "se-resize"},
-      {"cursor": "sw-resize"},
-      {"cursor": "ew-resize"},
-      {"cursor": "ns-resize"},
-      {"cursor": "nesw-resize"},
-      {"cursor": "nwse-resize"},
-      {"cursor": "zoom-in"},
-      {"cursor": "zoom-out"},
-    ))
-  )
-)
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Selectors_test.res b/jscomp/syntax/tests/idempotency/bs-css/Selectors_test.res
deleted file mode 100644
index 0c02b63..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Selectors_test.res
+++ /dev/null
@@ -1,207 +0,0 @@
-module CssForTest = {
-  include Css_Legacy_Core
-  include Css_Legacy_Core.Make({
-    exception NotImplemented
-
-    let mergeStyles = (. _) => raise(NotImplemented)
-    let make = (. _) => raise(NotImplemented)
-    let injectRule = (. _) => raise(NotImplemented)
-    let injectRaw = (. _) => raise(NotImplemented)
-    let makeKeyFrames = (. _) => raise(NotImplemented)
-  })
-}
-
-open Jest
-open Expect
-open CssForTest
-
-let toBeJson = x => Expect.toBe(x->Js.Json.stringifyAny)
-let r = x => toJson(list{x}) /* simple rule for more readable tests */
-let ruleSelector = display(block)
-let ruleJson = {"display": "block"}
-
-describe("Pseudo classes", () => {
-  test("test selectors that have no parameters", () =>
-    expect(
-      (
-        r(active(list{ruleSelector})),
-        r(checked(list{ruleSelector})),
-        r(default(list{ruleSelector})),
-        r(defined(list{ruleSelector})),
-        r(disabled(list{ruleSelector})),
-        r(empty(list{ruleSelector})),
-        r(enabled(list{ruleSelector})),
-        r(first(list{ruleSelector})),
-        r(firstChild(list{ruleSelector})),
-        r(firstOfType(list{ruleSelector})),
-        r(focus(list{ruleSelector})),
-        r(focusWithin(list{ruleSelector})),
-        r(hover(list{ruleSelector})),
-        r(indeterminate(list{ruleSelector})),
-        r(inRange(list{ruleSelector})),
-        r(invalid(list{ruleSelector})),
-        r(lastChild(list{ruleSelector})),
-        r(lastOfType(list{ruleSelector})),
-        r(link(list{ruleSelector})),
-        r(onlyChild(list{ruleSelector})),
-        r(onlyOfType(list{ruleSelector})),
-        r(optional(list{ruleSelector})),
-        r(outOfRange(list{ruleSelector})),
-        r(readOnly(list{ruleSelector})),
-        r(readWrite(list{ruleSelector})),
-        r(required(list{ruleSelector})),
-        r(root(list{ruleSelector})),
-        r(scope(list{ruleSelector})),
-        r(target(list{ruleSelector})),
-        r(valid(list{ruleSelector})),
-        r(visited(list{ruleSelector})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {":active": ruleJson},
-      {":checked": ruleJson},
-      {":default": ruleJson},
-      {":defined": ruleJson},
-      {":disabled": ruleJson},
-      {":empty": ruleJson},
-      {":enabled": ruleJson},
-      {":first": ruleJson},
-      {":first-child": ruleJson},
-      {":first-of-type": ruleJson},
-      {":focus": ruleJson},
-      {":focus-within": ruleJson},
-      {":hover": ruleJson},
-      {":indeterminate": ruleJson},
-      {":in-range": ruleJson},
-      {":invalid": ruleJson},
-      {":last-child": ruleJson},
-      {":last-of-type": ruleJson},
-      {":link": ruleJson},
-      {":only-child": ruleJson},
-      {":only-of-type": ruleJson},
-      {":optional": ruleJson},
-      {":out-of-range": ruleJson},
-      {":read-only": ruleJson},
-      {":read-write": ruleJson},
-      {":required": ruleJson},
-      {":root": ruleJson},
-      {":scope": ruleJson},
-      {":target": ruleJson},
-      {":valid": ruleJson},
-      {":visited": ruleJson},
-    ))
-  )
-
-  test("test host", () =>
-    expect(
-      (
-        r(host(list{ruleSelector})),
-        r(host(~selector=".special-custom-element", list{ruleSelector})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson(({":host": ruleJson}, {":host(.special-custom-element)": ruleJson}))
-  )
-
-  test("test not", () =>
-    expect(r(not__("p", list{ruleSelector}))->Js.Json.stringifyAny) |> toBeJson({
-      ":not(p)": ruleJson,
-    })
-  )
-
-  test("test nth-child", () =>
-    expect(
-      (
-        r(nthChild(#odd, list{ruleSelector})),
-        r(nthChild(#even, list{ruleSelector})),
-        r(nthChild(#n(2), list{ruleSelector})),
-        r(nthChild(#add(3, 4), list{ruleSelector})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {":nth-child(odd)": ruleJson},
-      {":nth-child(even)": ruleJson},
-      {":nth-child(2n)": ruleJson},
-      {":nth-child(3n+4)": ruleJson},
-    ))
-  )
-
-  test("test nth-last-child", () =>
-    expect(
-      (
-        r(nthLastChild(#odd, list{ruleSelector})),
-        r(nthLastChild(#even, list{ruleSelector})),
-        r(nthLastChild(#n(2), list{ruleSelector})),
-        r(nthLastChild(#add(3, 4), list{ruleSelector})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {":nth-last-child(odd)": ruleJson},
-      {":nth-last-child(even)": ruleJson},
-      {":nth-last-child(2n)": ruleJson},
-      {":nth-last-child(3n+4)": ruleJson},
-    ))
-  )
-
-  test("test nth-last-of-type", () =>
-    expect(
-      (
-        r(nthLastOfType(#odd, list{ruleSelector})),
-        r(nthLastOfType(#even, list{ruleSelector})),
-        r(nthLastOfType(#n(2), list{ruleSelector})),
-        r(nthLastOfType(#add(3, 4), list{ruleSelector})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {":nth-last-of-type(odd)": ruleJson},
-      {":nth-last-of-type(even)": ruleJson},
-      {":nth-last-of-type(2n)": ruleJson},
-      {":nth-last-of-type(3n+4)": ruleJson},
-    ))
-  )
-
-  test("test nth-of-type", () =>
-    expect(
-      (
-        r(nthOfType(#odd, list{ruleSelector})),
-        r(nthOfType(#even, list{ruleSelector})),
-        r(nthOfType(#n(2), list{ruleSelector})),
-        r(nthOfType(#add(3, 4), list{ruleSelector})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {":nth-of-type(odd)": ruleJson},
-      {":nth-of-type(even)": ruleJson},
-      {":nth-of-type(2n)": ruleJson},
-      {":nth-of-type(3n+4)": ruleJson},
-    ))
-  )
-})
-
-describe("Pseudo classes", () =>
-  test("test selectors that have no parameters", () =>
-    expect(
-      (
-        r(after(list{ruleSelector})),
-        r(before(list{ruleSelector})),
-        r(firstLetter(list{ruleSelector})),
-        r(firstLine(list{ruleSelector})),
-        r(placeholder(list{ruleSelector})),
-        r(selection(list{ruleSelector})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"::after": ruleJson},
-      {"::before": ruleJson},
-      {"::first-letter": ruleJson},
-      {"::first-line": ruleJson},
-      {"::placeholder": ruleJson},
-      {"::selection": ruleJson},
-    ))
-  )
-)
-
-describe("Combinators", () =>
-  test("test selectors", () =>
-    expect(
-      (
-        r(child("li", list{ruleSelector})),
-        r(children(list{ruleSelector})),
-        r(siblings(list{ruleSelector})),
-        r(directSibling(list{ruleSelector})),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson(({" > li": ruleJson}, {" > *": ruleJson}, {" ~ ": ruleJson}, {" + ": ruleJson}))
-  )
-)
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Svg_test.res b/jscomp/syntax/tests/idempotency/bs-css/Svg_test.res
deleted file mode 100644
index bf8288a..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Svg_test.res
+++ /dev/null
@@ -1,59 +0,0 @@
-module CssForTest = {
-  include Css_Legacy_Core
-  include Css_Legacy_Core.Make({
-    exception NotImplemented
-
-    let mergeStyles = (. _) => raise(NotImplemented)
-    let make = (. _) => raise(NotImplemented)
-    let injectRule = (. _) => raise(NotImplemented)
-    let injectRaw = (. _) => raise(NotImplemented)
-    let makeKeyFrames = (. _) => raise(NotImplemented)
-  })
-}
-
-open Jest
-open Expect
-open CssForTest
-
-let toBeJson = x => Expect.toBe(x->Js.Json.stringifyAny)
-let r = x => toJson(list{x}) /* simple rule for more readable tests */
-
-describe("Fill", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(SVG.fill(hex("FF0044"))),
-        r(SVG.fill(url("#mydef"))),
-        r(SVG.fill(#contextFill)),
-        r(SVG.fill(#contextStroke)),
-        r(SVG.fill(#none)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"fill": "#FF0044"},
-      {"fill": "url(#mydef)"},
-      {"fill": "context-fill"},
-      {"fill": "context-stroke"},
-      {"fill": "none"},
-    ))
-  )
-)
-
-describe("strokeDasharray", () =>
-  test("test values", () =>
-    expect(
-      (
-        r(SVG.strokeDasharray(#dasharray(list{1->px, 2->px, 3->px, 4->px}))),
-        r(SVG.strokeDasharray(#dasharray(list{1.->pct, 2.->pct, 3.->pct, 4.->pct}))),
-        r(SVG.strokeDasharray(#dasharray(list{1->px, 2.->pct, 3->px, 4.->pct}))),
-        r(SVG.strokeDasharray(#dasharray(list{1.->pct, 2->px, 3.->pct, 4->px}))),
-        r(SVG.strokeDasharray(#none)),
-      )->Js.Json.stringifyAny,
-    ) |> toBeJson((
-      {"stroke-dasharray": "1px 2px 3px 4px"},
-      {"stroke-dasharray": "1% 2% 3% 4%"},
-      {"stroke-dasharray": "1px 2% 3px 4%"},
-      {"stroke-dasharray": "1% 2px 3% 4px"},
-      {"stroke-dasharray": "none"},
-    ))
-  )
-)
diff --git a/jscomp/syntax/tests/idempotency/bs-css/Test.res b/jscomp/syntax/tests/idempotency/bs-css/Test.res
deleted file mode 100644
index e17dd2f..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/Test.res
+++ /dev/null
@@ -1,2185 +0,0 @@
-let text = React.string
-
-let fontItem = {
-  open Css
-  list{marginLeft(px(10)), paddingRight(px(10)), borderRight(px(1), solid, black)}
-}
-
-//let spin =
-//  Css.(
-//    keyframes([
-//      (0, [transform(rotate(deg(0.)))]),
-//      (100, [transform(rotate(deg(360.)))]),
-//    ])
-//  );
-
-//let scaleAnimation =
-//  Css.(
-//    keyframes([
-//      (0, [transform(scale(0.3, 0.3))]),
-//      (100, [transform(scale(1.0, 1.0))]),
-//    ])
-//  );
-
-let redBox = {
-  open Css
-  list{
-    background(red),
-    borderBottom(px(5), solid, black),
-    width(px(50)),
-    height(px(50)),
-    margin(px(10)),
-  }
-}
-
-let miniBox = {
-  open Css
-  list{border(px(2), solid, black), width(px(15)), height(px(15)), margin(px(1))}
-}
-
-// https://github.com/SentiaAnalytics/bs-css/issues/86
-//let mergedStyles =
-//  Css.(
-//    merge([
-//      style([padding(px(0)), fontSize(px(1))]),
-//      style([padding(px(20)), fontSize(px(24)), color(blue)]),
-//      style([media("(max-width: 768px)", [padding(px(10))])]),
-//      style([
-//        media("(max-width: 768px)", [fontSize(px(16)), color(red)]),
-//      ]),
-//    ])
-//  );
-
-let differentHeightLengths = {
-  open Css
-  [
-    cm(1.),
-    em(1.2),
-    ex(1.2),
-    mm(10.),
-    pct(50.),
-    pt(14),
-    px(20),
-    rem(2.0),
-    vh(1.),
-    vw(1.0),
-    vmax(1.0),
-    vmin(1.0),
-    zero,
-  ] |> Array.map(x => {
-    let className = style(\"@"(redBox, list{height(x)}))
-    <div style=className key="x" />
-  })
-}->React.array
-
-@react.component
-let make = () =>
-  <div
-    style={
-      open Css
-      style(list{background(hex("f5f5f5"))})
-    }>
-    <Section name="angles">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{transform(rotate(deg(45.)))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{transform(rotate(rad(3.1415)))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{transform(rotate(grad(50.)))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{transform(rotate(turn(1. /. 3.)))}))
-        }
-      />
-    </Section>
-    <Section name="colors">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{background(red)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{background(rgb(255, 0, 0))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{background(rgba(255, 0, 0, #num(0.5)))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{background(hsl(deg(255.), pct(100.), pct(50.)))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{background(hsla(deg(255.), pct(100.), pct(50.), #num(0.5)))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{background(hex("FF0000"))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{background(transparent)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{background(currentColor), color(blue)}))
-        }
-      />
-    </Section>
-    <Section name="Named colors">
-      {React.array(
-        {
-          open Css
-          [
-            aliceblue,
-            antiquewhite,
-            aqua,
-            aquamarine,
-            azure,
-            beige,
-            bisque,
-            black,
-            blanchedalmond,
-            blue,
-            blueviolet,
-            brown,
-            burlywood,
-            cadetblue,
-            chartreuse,
-            chocolate,
-            coral,
-            cornflowerblue,
-            cornsilk,
-            crimson,
-            cyan,
-            darkblue,
-            darkcyan,
-            darkgoldenrod,
-            darkgray,
-            darkgreen,
-            darkgrey,
-            darkkhaki,
-            darkmagenta,
-            darkolivegreen,
-            darkorange,
-            darkorchid,
-            darkred,
-            darksalmon,
-            darkseagreen,
-            darkslateblue,
-            darkslategray,
-            darkslategrey,
-            darkturquoise,
-            darkviolet,
-            deeppink,
-            deepskyblue,
-            dimgray,
-            dimgrey,
-            dodgerblue,
-            firebrick,
-            floralwhite,
-            forestgreen,
-            fuchsia,
-            gainsboro,
-            ghostwhite,
-            gold,
-            goldenrod,
-            gray,
-            green,
-            greenyellow,
-            grey,
-            honeydew,
-            hotpink,
-            indianred,
-            indigo,
-            ivory,
-            khaki,
-            lavender,
-            lavenderblush,
-            lawngreen,
-            lemonchiffon,
-            lightblue,
-            lightcoral,
-            lightcyan,
-            lightgoldenrodyellow,
-            lightgray,
-            lightgreen,
-            lightgrey,
-            lightpink,
-            lightsalmon,
-            lightseagreen,
-            lightskyblue,
-            lightslategray,
-            lightslategrey,
-            lightsteelblue,
-            lightyellow,
-            lime,
-            limegreen,
-            linen,
-            magenta,
-            maroon,
-            mediumaquamarine,
-            mediumblue,
-            mediumorchid,
-            mediumpurple,
-            mediumseagreen,
-            mediumslateblue,
-            mediumspringgreen,
-            mediumturquoise,
-            mediumvioletred,
-            midnightblue,
-            mintcream,
-            mistyrose,
-            moccasin,
-            navajowhite,
-            navy,
-            oldlace,
-            olive,
-            olivedrab,
-            orange,
-            orangered,
-            orchid,
-            palegoldenrod,
-            palegreen,
-            paleturquoise,
-            palevioletred,
-            papayawhip,
-            peachpuff,
-            peru,
-            pink,
-            plum,
-            powderblue,
-            purple,
-            rebeccapurple,
-            red,
-            rosybrown,
-            royalblue,
-            saddlebrown,
-            salmon,
-            sandybrown,
-            seagreen,
-            seashell,
-            sienna,
-            silver,
-            skyblue,
-            slateblue,
-            slategray,
-            slategrey,
-            snow,
-            springgreen,
-            steelblue,
-            tan,
-            teal,
-            thistle,
-            tomato,
-            transparent,
-            turquoise,
-            violet,
-            wheat,
-            white,
-            whitesmoke,
-            yellow,
-            yellowgreen,
-          ]
-        }->Belt.Array.map(c =>
-          <div
-            style={
-              open Css
-              style(list{background(c), ...miniBox})
-            }
-          />
-        ),
-      )}
-    </Section>
-    <Section name="gradients">
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{background(linearGradient(deg(45.), list{(zero, red), (pct(100.), blue)}))},
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                background(repeatingLinearGradient(deg(45.), list{(zero, red), (pct(10.), blue)})),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(redBox, list{background(radialGradient(list{(zero, red), (pct(100.), blue)}))}),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{background(repeatingRadialGradient(list{(zero, red), (pct(10.), blue)}))},
-            ),
-          )
-        }
-      />
-    </Section>
-    <Section name="lengths">
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{height(ch(1.2)), width(px(10)), maxHeight(pct(50.)), maxWidth(pct(100.))},
-            ),
-          )
-        }
-      />
-      differentHeightLengths
-    </Section>
-    <Section name="calc">
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                height({
-                  open Calc
-                  pt(14) - px(10)
-                }),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                height({
-                  open Calc
-                  cm(0.2) + mm(10.)
-                }),
-              },
-            ),
-          )
-        }
-      />
-    </Section>
-    <Section name="display">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{display(block)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{display(inline)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{display(inlineBlock)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{display(none)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{display(flexBox)}))
-        }
-      />
-    </Section>
-    <Section name="position">
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{position(absolute), top(zero), left(zero), right(zero), bottom(zero)},
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{position(relative)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{position(fixed), bottom(px(10)), right(px(10))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{position(static)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{position(sticky)}))
-        }
-      />
-    </Section>
-    <Section name="Padding & Margin">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{padding(px(10)), margin(px(10))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                paddingLeft(px(10)),
-                paddingRight(px(10)),
-                paddingTop(px(10)),
-                paddingBottom(px(10)),
-                marginLeft(px(10)),
-                marginRight(px(10)),
-                marginTop(px(10)),
-                marginBottom(px(10)),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{padding2(~v=px(10), ~h=px(20)), margin2(~v=px(10), ~h=px(20))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                padding3(~top=px(10), ~h=px(20), ~bottom=px(1)),
-                margin3(~top=px(10), ~h=px(20), ~bottom=px(2)),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                padding4(~top=px(10), ~bottom=px(1), ~left=px(5), ~right=px(15)),
-                margin4(~top=px(10), ~bottom=px(1), ~left=px(5), ~right=px(15)),
-              },
-            ),
-          )
-        }
-      />
-    </Section>
-    <Section name="grid">
-      <div
-        style={
-          open Css
-          style(list{
-            width(pct(100.)),
-            height(px(500)),
-            display(grid),
-            gridTemplateColumns(list{px(150), auto, px(150)}),
-            gridTemplateRows(list{px(60), auto}),
-          })
-        }>
-        <div
-          style={
-            open Css
-            style(list{
-              gridColumnStart(1),
-              gridColumnEnd(4),
-              background(red),
-              gridRowStart(1),
-              gridRowEnd(1),
-            })
-          }
-        />
-        <div
-          style={
-            open Css
-            style(list{background(blue), gridColumn(1, 1), gridRow(2, 2)})
-          }
-        />
-        <div
-          style={
-            open Css
-            style(list{
-              background(green),
-              gridColumn(2, 2),
-              gridRow(2, 2),
-              display(inlineGrid),
-              gridTemplateColumns(list{px(50), auto}),
-              gridTemplateRows(list{px(40), auto}),
-            })
-          }>
-          <div
-            style={
-              open Css
-              style(list{background(yellow), gridRow(1, 1), gridColumn(2, 2)})
-            }
-          />
-          <div
-            style={
-              open Css
-              style(list{background(green), gridRow(1, 2), gridColumn(1, 1)})
-            }
-          />
-          <div
-            style={
-              open Css
-              style(list{background(purple), gridRow(2, 2), gridColumn(2, 2)})
-            }
-          />
-        </div>
-        <div
-          style={
-            open Css
-            style(list{
-              gridColumnStart(3),
-              gridColumnEnd(3),
-              background(blue),
-              gridRowStart(2),
-              gridRowEnd(2),
-            })
-          }
-        />
-      </div>
-      <div
-        style={
-          open Css
-          style(list{display(#grid), gridAutoFlow(#row)})
-        }>
-        <div
-          style={
-            open Css
-            style(list{background(purple)})
-          }>
-          {text("grid auto direction row 1")}
-        </div>
-        <div
-          style={
-            open Css
-            style(list{background(green)})
-          }>
-          {text("grid auto direction row 2")}
-        </div>
-      </div>
-      <div
-        style={
-          open Css
-          style(list{display(#grid), gridTemplateColumns(list{100->px, #repeat(#num(2), 60->px)})})
-        }>
-        <div
-          style={
-            open Css
-            style(list{background(purple)})
-          }>
-          {text("Grid track repeat")}
-        </div>
-        <div
-          style={
-            open Css
-            style(list{background(green)})
-          }>
-          {text("two times")}
-        </div>
-        <div
-          style={
-            open Css
-            style(list{background(red)})
-          }>
-          {text("three times")}
-        </div>
-      </div>
-      <div
-        style={
-          open Css
-          style(list{display(#grid), gridAutoColumns(100->px)})
-        }>
-        <div
-          style={
-            open Css
-            style(list{background(purple)})
-          }>
-          {text("Grid auto columns (100px)")}
-        </div>
-        <div
-          style={
-            open Css
-            style(list{background(green)})
-          }>
-          {text("100px")}
-        </div>
-        <div
-          style={
-            open Css
-            style(list{background(blue)})
-          }>
-          {text("100px")}
-        </div>
-      </div>
-    </Section>
-    <Section name="flexbox">
-      <div
-        style={
-          open Css
-          style(list{
-            flexDirection(column),
-            flexGrow(1.),
-            alignItems(stretch),
-            selector("& > *", list{marginBottom(px(10)), width(pct(100.))}),
-          })
-        }>
-        <div
-          style={
-            open Css
-            style(list{
-              display(flexBox),
-              flexDirection(row),
-              background(gray),
-              alignItems(flexStart),
-              justifyContent(flexEnd),
-            })
-          }>
-          <div
-            style={
-              open Css
-              style(\"@"(redBox, list{order(1), flexGrow(1.), flexShrink(1.), flexBasis(auto)}))
-            }
-          />
-          <div
-            style={
-              open Css
-              style(\"@"(redBox, list{flex(none)}))
-            }
-          />
-          <div
-            style={
-              open Css
-              style(\"@"(redBox, list{order(1), flex3(~grow=1.5, ~shrink=0.8, ~basis=100->px)}))
-            }
-          />
-          <div
-            style={
-              open Css
-              style(\"@"(redBox, list{alignSelf(flexEnd)}))
-            }
-          />
-          <div style={Css.style(redBox)} />
-        </div>
-        <div
-          style={
-            open Css
-            style(list{
-              display(flexBox),
-              flexDirection(column),
-              background(gray),
-              alignItems(baseline),
-              justifyContent(flexStart),
-            })
-          }>
-          <div style={Css.style(redBox)} />
-          <div style={Css.style(redBox)} />
-          <div style={Css.style(redBox)} />
-        </div>
-        <div
-          style={
-            open Css
-            style(list{
-              display(flexBox),
-              flexDirection(rowReverse),
-              background(gray),
-              alignItems(center),
-              justifyContent(spaceBetween),
-            })
-          }>
-          <div style={Css.style(redBox)} />
-          <div
-            style={
-              open Css
-              style(\"@"(redBox, list{height(px(50)), width(px(50))}))
-            }
-          />
-          <div style={Css.style(redBox)} />
-        </div>
-        <div
-          style={
-            open Css
-            style(list{
-              display(flexBox),
-              flexDirection(columnReverse),
-              background(gray),
-              alignItems(flexEnd),
-              justifyContent(flexEnd),
-            })
-          }>
-          <div style={Css.style(redBox)} />
-          <div
-            style={
-              open Css
-              style(\"@"(redBox, list{height(px(50)), width(px(50))}))
-            }
-          />
-          <div style={Css.style(redBox)} />
-        </div>
-        <div
-          style={
-            open Css
-            style(list{
-              display(flexBox),
-              flexDirection(row),
-              background(gray),
-              alignItems(stretch),
-              justifyContent(spaceAround),
-            })
-          }>
-          <div style={Css.style(redBox)} />
-          <div
-            style={
-              open Css
-              style(\"@"(redBox, list{height(px(50)), width(px(50))}))
-            }
-          />
-          <div style={Css.style(redBox)} />
-        </div>
-        <div
-          style={
-            open Css
-            style(list{
-              display(flexBox),
-              flexDirection(row),
-              background(gray),
-              alignItems(stretch),
-              justifyContent(spaceEvenly),
-            })
-          }>
-          <div style={Css.style(redBox)} />
-          <div
-            style={
-              open Css
-              style(\"@"(redBox, list{height(px(50)), width(px(50))}))
-            }
-          />
-          <div style={Css.style(redBox)} />
-        </div>
-      </div>
-    </Section>
-    <Section name="float">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{float(#left), clear(#right)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{float(#right), clear(#left)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{float(none), clear(both)}))
-        }
-      />
-    </Section>
-    <Section name="overflow">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{overflow(hidden)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{overflow(visible)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{overflow(auto)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{overflow(scroll)}))
-        }
-      />
-    </Section>
-    <Section name="border">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{border(px(5), solid, blue), borderRadius(px(1000))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                border(px(5), solid, green),
-                borderTopRightRadius(px(1000)),
-                borderTopLeftRadius(px(1000)),
-                borderBottomRightRadius(px(1000)),
-                borderBottomLeftRadius(px(1000)),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                borderTop(px(5), dashed, hex("FFF")),
-                borderRight(px(5), dotted, rgb(0, 0, 0)),
-                borderBottom(px(5), none, green),
-                borderLeft(px(5), solid, blue),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{borderWidth(px(5)), borderStyle(solid), borderColor(blue)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(redBox, list{borderTopWidth(px(5)), borderTopStyle(solid), borderTopColor(blue)}),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{borderBottomWidth(px(5)), borderBottomStyle(solid), borderBottomColor(blue)},
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{borderLeftWidth(px(5)), borderLeftStyle(solid), borderLeftColor(blue)},
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{borderRightWidth(px(5)), borderRightStyle(solid), borderRightColor(blue)},
-            ),
-          )
-        }
-      />
-    </Section>
-    <Section name="background">
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                background(red),
-                backgroundAttachment(scroll),
-                backgroundClip(borderBox),
-                backgroundOrigin(borderBox),
-                backgroundPosition(#hv(pct(50.), pct(50.))),
-                backgroundRepeat(noRepeat),
-                backgroundSize(size(px(100), px(100))),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                background(radialGradient(list{(zero, red), (pct(10.), blue)})),
-                backgroundAttachment(fixed),
-                backgroundClip(contentBox),
-                backgroundOrigin(contentBox),
-                backgroundRepeat(repeat),
-                backgroundSize(auto),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                background(url("./img-29.jpg")),
-                backgroundAttachment(local),
-                backgroundClip(paddingBox),
-                backgroundOrigin(paddingBox),
-                backgroundRepeat(repeatX),
-                backgroundSize(cover),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                backgroundColor(rgb(0, 0, 255)),
-                backgroundImage(
-                  linearGradient(
-                    deg(45.),
-                    list{(zero, green), (pct(50.), red), (pct(100.), yellow)},
-                  ),
-                ),
-                backgroundRepeat(repeatY),
-                backgroundSize(contain),
-              },
-            ),
-          )
-        }
-      />
-    </Section>
-    <Section name="cursor">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#auto)}))
-        }>
-        {text("auto")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#default)}))
-        }>
-        {text("default")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#none)}))
-        }>
-        {text("none")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#contextMenu)}))
-        }>
-        {text("context menu")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#help)}))
-        }>
-        {text("help")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#pointer)}))
-        }>
-        {text("pointer")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#progress)}))
-        }>
-        {text("progress")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#wait)}))
-        }>
-        {text("wait")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#cell)}))
-        }>
-        {text("cell")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#crosshair)}))
-        }>
-        {text("crosshair")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#text)}))
-        }>
-        {text("text")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#verticalText)}))
-        }>
-        {text("vert text")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#alias)}))
-        }>
-        {text("alias")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#copy)}))
-        }>
-        {text("copy")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#move)}))
-        }>
-        {text("move")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#noDrop)}))
-        }>
-        {text("no drop")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#notAllowed)}))
-        }>
-        {text("not allowed")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#grab)}))
-        }>
-        {text("grab")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#grabbing)}))
-        }>
-        {text("grabbing")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#allScroll)}))
-        }>
-        {text("all scroll")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#colResize)}))
-        }>
-        {text("col resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#rowResize)}))
-        }>
-        {text("row resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#nResize)}))
-        }>
-        {text("n resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#eResize)}))
-        }>
-        {text("e resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#sResize)}))
-        }>
-        {text("s resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#wResize)}))
-        }>
-        {text("w resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#neResize)}))
-        }>
-        {text("ne resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#nwResize)}))
-        }>
-        {text("nw resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#seResize)}))
-        }>
-        {text("se resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#swResize)}))
-        }>
-        {text("sw resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#ewResize)}))
-        }>
-        {text("ew resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#nsResize)}))
-        }>
-        {text("ns resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#neswResize)}))
-        }>
-        {text("nesw resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#nwseResize)}))
-        }>
-        {text("nwse resize")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#zoomIn)}))
-        }>
-        {text("zoom in")}
-      </div>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{cursor(#zoomOut)}))
-        }>
-        {text("zoom out")}
-      </div>
-    </Section>
-    <Section name="list">
-      <ul>
-        <li
-          style={
-            open Css
-            style(list{listStyle(#disc, inside, none)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{listStyleType(#circle)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{listStyleType(#square)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{listStyleType(#decimal)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{listStyleType(#lowerAlpha)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{listStyleType(#upperAlpha)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{listStyleType(#lowerGreek)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{listStyleType(#lowerLatin)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{listStyleType(#upperLatin)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{listStyleType(#lowerRoman)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{listStyleType(#upperRoman)})
-          }
-        />
-        <li
-          style={
-            open Css
-            style(list{
-              listStyleType(#disc),
-              listStylePosition(inside),
-              listStyleImage(url("./facebook.png")),
-            })
-          }
-        />
-      </ul>
-    </Section>
-    <Section name="outline">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{outline(px(5), #double, green)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                outlineStyle(solid),
-                outlineWidth(px(5)),
-                outlineColor(green),
-                outlineOffset(px(5)),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{outline(px(5), #double, red)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{outline(px(5), #ridge, red)}))
-        }
-      />
-    </Section>
-    <Section name="transform">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{opacity(0.5)}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{perspective(px(500)), transform(rotate(deg(10.)))}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{transforms(list{translate(px(10), pct(10.)), skew(deg(10.), deg(10.))})},
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                transform(rotate(deg(19.))),
-                transformOrigin(pct(50.), pct(50.)),
-                transformStyle(#preserve3d),
-                perspective(px(900)),
-                perspectiveOrigin(pct(10.), pct(10.)),
-              },
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                transform(translate(px(10), pct(10.))),
-                transformOrigin3d(px(10), px(10), px(10)),
-              },
-            ),
-          )
-        }
-      />
-    </Section>
-    <Section name="transition">
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{transition(~duration=300, ~delay=300, ~timingFunction=easeInOut, "transform")},
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                transitionProperty("height"),
-                transitionDelay(300),
-                transitionDuration(300),
-                transitionTimingFunction(linear),
-              },
-            ),
-          )
-        }
-      />
-    </Section>
-    <Section name="text">
-      <p
-        style={
-          open Css
-          style(list{
-            color(black),
-            fontFamilies(list{#custom("Helvetica"), #sansSerif}),
-            fontSize(pt(18)),
-            fontVariant(#smallCaps),
-            fontStyle(italic),
-            fontWeight(#num(300)),
-            letterSpacing(px(3)),
-            lineHeight(#abs(2.)),
-            textAlign(#left),
-            textDecoration(underline),
-            textDecorationColor(pink),
-            textDecorationStyle(wavy),
-            textIndent(px(10)),
-            textOverflow(clip),
-            textShadow(Shadow.text(~y=px(3), ~blur=px(2), black)),
-            textTransform(capitalize),
-            verticalAlign(sub),
-            whiteSpace(normal),
-            wordBreak(breakAll),
-            wordSpacing(px(20)),
-            wordWrap(breakWord),
-          })
-        }>
-        {text(
-          "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
-        )}
-      </p>
-      <h2
-        style={
-          open Css
-          style(list{width(pct(100.))})
-        }>
-        {text("Named Font weights")}
-      </h2>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(thin), paddingRight(px(10)), borderRight(px(1), solid, black)})
-        }>
-        {text("thin")}
-      </span>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(extraLight), ...fontItem})
-        }>
-        {text("extra light")}
-      </span>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(light), ...fontItem})
-        }>
-        {text("light")}
-      </span>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(normal), ...fontItem})
-        }>
-        {text("normal")}
-      </span>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(medium), ...fontItem})
-        }>
-        {text("medium")}
-      </span>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(semiBold), ...fontItem})
-        }>
-        {text("semiBold")}
-      </span>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(bold), ...fontItem})
-        }>
-        {text("bold")}
-      </span>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(extraBold), ...fontItem})
-        }>
-        {text("extra bold")}
-      </span>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(#black), ...fontItem})
-        }>
-        {text("black")}
-      </span>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(lighter), ...fontItem})
-        }>
-        {text("lighter")}
-      </span>
-      <span
-        style={
-          open Css
-          style(list{fontWeight(bolder), ...fontItem})
-        }>
-        {text("bolder")}
-      </span>
-    </Section>
-    //    <Section name="animation">
-    //      <div
-    //        style=Css.(
-    //          style(
-    //            redBox
-    //            @ [
-    //              animation(
-    //                ~duration=300,
-    //                ~delay=300,
-    //                ~direction=reverse,
-    //                ~timingFunction=linear,
-    //                ~fillMode=forwards,
-    //                ~playState=running,
-    //                ~iterationCount=infinite,
-    //                spin,
-    //              ),
-    //            ],
-    //          )
-    //        )
-    //      />
-    //      <div
-    //        style=Css.(
-    //          style(
-    //            redBox
-    //            @ [
-    //              animations([
-    //                Animation.shorthand(
-    //                  ~duration=300,
-    //                  ~iterationCount=infinite,
-    //                  spin,
-    //                ),
-    //                Animation.shorthand(
-    //                  ~duration=300,
-    //                  ~iterationCount=infinite,
-    //                  scaleAnimation,
-    //                ),
-    //              ]),
-    //            ],
-    //          )
-    //        )
-    //      />
-    //      <div
-    //        style=Css.(
-    //          style(
-    //            redBox
-    //            @ [
-    //              animationName(spin),
-    //              animationTimingFunction(easeIn),
-    //              animationDuration(300),
-    //              animationDelay(300),
-    //              animationDirection(normal),
-    //              animationFillMode(backwards),
-    //              animationPlayState(paused),
-    //              animationIterationCount(count(5)),
-    //            ],
-    //          )
-    //        )
-    //      />
-    //    </Section>
-    <Section name="cascading">
-      {text("inherit")}
-      <div
-        style={
-          open Css
-          style(list{
-            display(inherit_),
-            position(inherit_),
-            fontSize(inherit_),
-            fontStyle(inherit_),
-            lineHeight(inherit_),
-          })
-        }
-      />
-      {text("unset")}
-      <div
-        style={
-          open Css
-          style(list{
-            display(unset),
-            position(unset),
-            fontSize(unset),
-            fontStyle(unset),
-            lineHeight(unset),
-          })
-        }
-      />
-    </Section>
-    <Section name="columns">
-      <p
-        style={
-          open Css
-          style(list{columnCount(count(10))})
-        }>
-        {text("This is a bunch of text split into columns
-             using the CSS `column-count` property. The text
-             is equally distributed over the columns.")}
-      </p>
-    </Section>
-    <Section name="resize">
-      <textarea
-        style={
-          open Css
-          style(list{resize(none)})
-        }>
-        {"Can't resize textarea"->text}
-      </textarea>
-      <div
-        style={
-          open Css
-          style(list{marginLeft(px(20)), overflow(scroll), resize(horizontal)})
-        }>
-        {"Resizable div (horizontal)"->text}
-      </div>
-      <div
-        style={
-          open Css
-          style(list{marginLeft(px(20)), overflow(scroll), resize(vertical)})
-        }>
-        {"Resizable div (vertical)"->text}
-      </div>
-    </Section>
-    <Section name="content">
-      <div
-        style={
-          open Css
-          style(list{
-            position(relative),
-            after(list{
-              contentRule(#none),
-              position(absolute),
-              top(zero),
-              left(zero),
-              width(pct(100.)),
-              height(pct(100.)),
-              border(px(1), solid, black),
-            }),
-          })
-        }>
-        {text("none")}
-      </div>
-      <div
-        style={
-          open Css
-          style(list{
-            position(relative),
-            after(list{
-              contentRule(#normal),
-              position(absolute),
-              top(zero),
-              left(zero),
-              width(pct(100.)),
-              height(pct(100.)),
-              border(px(1), solid, black),
-            }),
-          })
-        }>
-        {text("normal")}
-      </div>
-      <div
-        style={
-          open Css
-          style(list{position(relative), marginLeft(px(20))})
-        }>
-        <a
-          href="https://github.com/SentiaAnalytics/bs-css"
-          style={
-            open Css
-            style(list{
-              before(list{
-                contentRule(#text("external ")),
-                backgroundColor(red),
-                display(inlineBlock),
-                flexBasis(content /* for test */),
-              }),
-            })
-          }>
-          {text("link")}
-        </a>
-      </div>
-      <div
-        style={
-          open Css
-          style(list{
-            position(relative),
-            marginLeft(px(20)),
-            after(list{
-              contentRule(#text("")),
-              position(absolute),
-              top(zero),
-              left(zero),
-              width(pct(100.)),
-              height(pct(100.)),
-              border(px(1), solid, black),
-            }),
-          })
-        }>
-        {text("empty content")}
-      </div>
-      <div
-        style={
-          open Css
-          style(list{
-            position(relative),
-            marginLeft(px(20)),
-            paddingLeft(px(20)),
-            after(list{
-              contentRule(#url("https://via.placeholder.com/18")),
-              position(absolute),
-              top(zero),
-              left(zero),
-              width(px(18)),
-              height(px(18)),
-              border(px(1), solid, black),
-            }),
-          })
-        }>
-        {text("url")}
-      </div>
-      <div
-        style={
-          open Css
-          style(list{
-            marginLeft(px(20)),
-            counterReset(Types.CounterReset.reset("foo", ~value=1)),
-            before(list{contentRule(Types.Counter.counter("foo")), border(px(1), solid, black)}),
-          })
-        }>
-        {text("counter")}
-      </div>
-      <div
-        style={
-          open Css
-          style(list{counterReset(Types.CounterReset.reset("foo", ~value=1)), marginLeft(px(20))})
-        }>
-        <div
-          style={
-            open Css
-            style(list{
-              counterReset(Types.CounterReset.reset("foo", ~value=2)),
-              before(list{
-                contentRule(Types.Counters.counters("foo", ~separator="@", ~style=#upperRoman)),
-                border(px(1), solid, black),
-              }),
-            })
-          }>
-          {text("counters")}
-        </div>
-      </div>
-      <div
-        style={
-          open Css
-          style(list{
-            marginLeft(px(20)),
-            before(list{contentRule(#attr("class")), border(px(1), solid, black)}),
-          })
-        }>
-        {text("attr")}
-      </div>
-      <div
-        style={
-          open Css
-          style(list{
-            marginLeft(px(20)),
-            before(list{
-              contentRule(
-                Types.Gradient.linearGradient(deg(45.), list{(zero, red), (pct(100.), blue)}),
-              ),
-              border(px(1), solid, black),
-              display(#inlineBlock),
-              height(px(18)),
-              width(px(18)),
-            }),
-          })
-        }>
-        {text("linear gradient")}
-      </div>
-      <div
-        style={
-          open Css
-          style(list{
-            marginLeft(px(20)),
-            before(list{
-              contentRules(list{#openQuote, #text("foo"), #closeQuote}),
-              border(px(1), solid, black),
-            }),
-          })
-        }>
-        {text("contents (quotes)")}
-      </div>
-    </Section>
-    <Section name="insertRule, the ultimate escape hatch"> <div className="raw-css" /> </Section>
-    //    <Section name="merging style names">
-    //      <button className=mergedStyles> {text("Merged")} </button>
-    //    </Section>
-    <Section name="filter">
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{filter(list{#blur(#px(10))})}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{filter(list{#brightness(50.)})}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{filter(list{#contrast(50.)})}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{filter(list{#dropShadow(#px(3), #px(3), #px(3), #rgb(200, 100, 100))})},
-            ),
-          )
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{filter(list{#grayscale(50.)})}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{filter(list{#hueRotate(#deg(180.))})}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{filter(list{#invert(50.)})}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{filter(list{#opacity(50.)})}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{filter(list{#saturate(50.)})}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{filter(list{#sepia(50.)})}))
-        }
-      />
-      <div
-        style={
-          open Css
-          style(
-            \"@"(
-              redBox,
-              list{
-                filter(list{
-                  #sepia(50.),
-                  #saturate(50.),
-                  #dropShadow(#px(3), #px(3), #px(3), #rgb(200, 100, 100)),
-                }),
-              },
-            ),
-          )
-        }
-      />
-      <svg
-        height="0"
-        style={
-          open Css
-          style(list{display(#none)})
-        }>
-        <filter id="f1"> <feGaussianBlur stdDeviation="3" /> </filter>
-      </svg>
-      <div
-        style={
-          open Css
-          style(\"@"(redBox, list{filter(list{#url("#f1")})}))
-        }
-      />
-    </Section>
-    <Section name="direction">
-      <Section name="ltr">
-        <div
-          style={
-            open Css
-            style(list{direction(#ltr), display(#flex)})
-          }>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"1" |> text}
-          </div>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"2" |> text}
-          </div>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"3" |> text}
-          </div>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"4" |> text}
-          </div>
-        </div>
-      </Section>
-      <Section name="rtl">
-        <div
-          style={
-            open Css
-            style(list{direction(#rtl), display(#flex)})
-          }>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"1" |> text}
-          </div>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"2" |> text}
-          </div>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"3" |> text}
-          </div>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"4" |> text}
-          </div>
-        </div>
-      </Section>
-      <Section name="unset">
-        <div
-          style={
-            open Css
-            style(list{direction(#unset), display(#flex)})
-          }>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"1" |> text}
-          </div>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"2" |> text}
-          </div>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"3" |> text}
-          </div>
-          <div
-            style={
-              open Css
-              style(redBox)
-            }>
-            {"4" |> text}
-          </div>
-        </div>
-      </Section>
-    </Section>
-    <Section name="object-fit">
-      <img
-        style={
-          open Css
-          style(\"@"(redBox, list{objectFit(#fill)}))
-        }
-        src="./img-29.jpg"
-      />
-      <img
-        style={
-          open Css
-          style(\"@"(redBox, list{objectFit(#contain)}))
-        }
-        src="./img-29.jpg"
-      />
-      <img
-        style={
-          open Css
-          style(\"@"(redBox, list{objectFit(#cover)}))
-        }
-        src="./img-29.jpg"
-      />
-      <img
-        style={
-          open Css
-          style(\"@"(redBox, list{objectFit(#none)}))
-        }
-        src="./img-29.jpg"
-      />
-      <img
-        style={
-          open Css
-          style(\"@"(redBox, list{objectFit(#scaleDown)}))
-        }
-        src="./img-29.jpg"
-      />
-      <img
-        style={
-          open Css
-          style(\"@"(redBox, list{objectFit(#inherit_)}))
-        }
-        src="./img-29.jpg"
-      />
-      <img
-        style={
-          open Css
-          style(\"@"(redBox, list{objectFit(#initial)}))
-        }
-        src="./img-29.jpg"
-      />
-      <img
-        style={
-          open Css
-          style(\"@"(redBox, list{objectFit(#unset)}))
-        }
-        src="./img-29.jpg"
-      />
-    </Section>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/bs-css/TestEmotion.res b/jscomp/syntax/tests/idempotency/bs-css/TestEmotion.res
deleted file mode 100644
index 6e916d1..0000000
--- a/jscomp/syntax/tests/idempotency/bs-css/TestEmotion.res
+++ /dev/null
@@ -1,1215 +0,0 @@
-open Css
-
-insertRule(".raw-css { display:block; background-color: green; width: 50px; height: 50px; }")
-
-let fontItem = list{marginLeft(px(10)), paddingRight(px(10)), borderRight(px(1), solid, black)}
-
-let spin = keyframes(list{
-  (0, list{transform(rotate(deg(0.)))}),
-  (100, list{transform(rotate(deg(360.)))}),
-})
-
-let scaleAnimation = keyframes(list{
-  (0, list{transform(scale(0.3, 0.3))}),
-  (100, list{transform(scale(1.0, 1.0))}),
-})
-
-let redBox = list{
-  background(red),
-  borderBottom(px(5), solid, black),
-  width(px(50)),
-  height(px(50)),
-  margin(px(10)),
-}
-
-let miniBox = list{border(px(2), solid, black), width(px(15)), height(px(15)), margin(px(1))}
-
-// https://github.com/SentiaAnalytics/bs-css/issues/86
-let mergedStyles = merge(list{
-  style(list{padding(px(0)), fontSize(px(1))}),
-  style(list{padding(px(20)), fontSize(px(24)), color(blue)}),
-  style(list{media("(max-width: 768px)", list{padding(px(10))})}),
-  style(list{media("(max-width: 768px)", list{fontSize(px(16)), color(red)})}),
-})
-
-let differentHeightLengths =
-  [
-    cm(1.),
-    em(1.2),
-    ex(1.2),
-    mm(10.),
-    pct(50.),
-    pt(14),
-    px(20),
-    rem(2.0),
-    vh(1.),
-    vw(1.0),
-    vmax(1.0),
-    vmin(1.0),
-    zero,
-  ]
-  ->Belt.Array.map(x => {
-    let className = style(\"@"(redBox, list{height(x)}))
-    <div className key=className />
-  })
-  ->React.array
-
-@react.component
-let make = () =>
-  <div className={style(list{background(hex("f5f5f5"))})}>
-    <Section name="angles">
-      <div className={style(\"@"(redBox, list{transform(rotate(deg(45.)))}))} />
-      <div className={style(\"@"(redBox, list{transform(rotate(rad(3.1415)))}))} />
-      <div className={style(\"@"(redBox, list{transform(rotate(grad(50.)))}))} />
-      <div className={style(\"@"(redBox, list{transform(rotate(turn(1. /. 3.)))}))} />
-    </Section>
-    <Section name="colors">
-      <div className={style(\"@"(redBox, list{background(red)}))} />
-      <div className={style(\"@"(redBox, list{background(rgb(255, 0, 0))}))} />
-      <div className={style(\"@"(redBox, list{background(rgba(255, 0, 0, #num(0.5)))}))} />
-      <div className={style(\"@"(redBox, list{background(hsl(deg(255.), pct(100.), pct(50.)))}))} />
-      <div
-        className={style(
-          \"@"(redBox, list{background(hsla(deg(255.), pct(100.), pct(50.), #num(0.5)))}),
-        )}
-      />
-      <div className={style(\"@"(redBox, list{background(hex("FF0000"))}))} />
-      <div className={style(\"@"(redBox, list{background(transparent)}))} />
-      <div className={style(\"@"(redBox, list{background(currentColor), color(blue)}))} />
-    </Section>
-    <Section name="Named colors">
-      {React.array(
-        [
-          aliceblue,
-          antiquewhite,
-          aqua,
-          aquamarine,
-          azure,
-          beige,
-          bisque,
-          black,
-          blanchedalmond,
-          blue,
-          blueviolet,
-          brown,
-          burlywood,
-          cadetblue,
-          chartreuse,
-          chocolate,
-          coral,
-          cornflowerblue,
-          cornsilk,
-          crimson,
-          cyan,
-          darkblue,
-          darkcyan,
-          darkgoldenrod,
-          darkgray,
-          darkgreen,
-          darkgrey,
-          darkkhaki,
-          darkmagenta,
-          darkolivegreen,
-          darkorange,
-          darkorchid,
-          darkred,
-          darksalmon,
-          darkseagreen,
-          darkslateblue,
-          darkslategray,
-          darkslategrey,
-          darkturquoise,
-          darkviolet,
-          deeppink,
-          deepskyblue,
-          dimgray,
-          dimgrey,
-          dodgerblue,
-          firebrick,
-          floralwhite,
-          forestgreen,
-          fuchsia,
-          gainsboro,
-          ghostwhite,
-          gold,
-          goldenrod,
-          gray,
-          green,
-          greenyellow,
-          grey,
-          honeydew,
-          hotpink,
-          indianred,
-          indigo,
-          ivory,
-          khaki,
-          lavender,
-          lavenderblush,
-          lawngreen,
-          lemonchiffon,
-          lightblue,
-          lightcoral,
-          lightcyan,
-          lightgoldenrodyellow,
-          lightgray,
-          lightgreen,
-          lightgrey,
-          lightpink,
-          lightsalmon,
-          lightseagreen,
-          lightskyblue,
-          lightslategray,
-          lightslategrey,
-          lightsteelblue,
-          lightyellow,
-          lime,
-          limegreen,
-          linen,
-          magenta,
-          maroon,
-          mediumaquamarine,
-          mediumblue,
-          mediumorchid,
-          mediumpurple,
-          mediumseagreen,
-          mediumslateblue,
-          mediumspringgreen,
-          mediumturquoise,
-          mediumvioletred,
-          midnightblue,
-          mintcream,
-          mistyrose,
-          moccasin,
-          navajowhite,
-          navy,
-          oldlace,
-          olive,
-          olivedrab,
-          orange,
-          orangered,
-          orchid,
-          palegoldenrod,
-          palegreen,
-          paleturquoise,
-          palevioletred,
-          papayawhip,
-          peachpuff,
-          peru,
-          pink,
-          plum,
-          powderblue,
-          purple,
-          rebeccapurple,
-          red,
-          rosybrown,
-          royalblue,
-          saddlebrown,
-          salmon,
-          sandybrown,
-          seagreen,
-          seashell,
-          sienna,
-          silver,
-          skyblue,
-          slateblue,
-          slategray,
-          slategrey,
-          snow,
-          springgreen,
-          steelblue,
-          Css.tan,
-          teal,
-          thistle,
-          tomato,
-          transparent,
-          turquoise,
-          violet,
-          wheat,
-          white,
-          whitesmoke,
-          yellow,
-          yellowgreen,
-        ]->Belt.Array.map(c => <div className={style(list{background(c), ...miniBox})} />),
-      )}
-    </Section>
-    <Section name="gradients">
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{background(linearGradient(deg(45.), list{(zero, red), (pct(100.), blue)}))},
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              background(repeatingLinearGradient(deg(45.), list{(zero, red), (pct(10.), blue)})),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(redBox, list{background(radialGradient(list{(zero, red), (pct(100.), blue)}))}),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{background(repeatingRadialGradient(list{(zero, red), (pct(10.), blue)}))},
-          ),
-        )}
-      />
-    </Section>
-    <Section name="lengths">
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{height(ch(1.2)), width(px(10)), maxHeight(pct(50.)), maxWidth(pct(100.))},
-          ),
-        )}
-      />
-      differentHeightLengths
-    </Section>
-    <Section name="calc">
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              height({
-                open Calc
-                pt(14) - px(10)
-              }),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              height({
-                open Calc
-                cm(0.2) + mm(10.)
-              }),
-            },
-          ),
-        )}
-      />
-    </Section>
-    <Section name="display">
-      <div className={style(\"@"(redBox, list{display(block)}))} />
-      <div className={style(\"@"(redBox, list{display(inline)}))} />
-      <div className={style(\"@"(redBox, list{display(inlineBlock)}))} />
-      <div className={style(\"@"(redBox, list{display(none)}))} />
-      <div className={style(\"@"(redBox, list{display(flexBox)}))} />
-    </Section>
-    <Section name="position">
-      <div
-        className={style(
-          \"@"(redBox, list{position(absolute), top(zero), left(zero), right(zero), bottom(zero)}),
-        )}
-      />
-      <div className={style(\"@"(redBox, list{position(relative)}))} />
-      <div className={style(\"@"(redBox, list{position(fixed), bottom(px(10)), right(px(10))}))} />
-      <div className={style(\"@"(redBox, list{position(static)}))} />
-      <div className={style(\"@"(redBox, list{position(sticky)}))} />
-    </Section>
-    <Section name="Padding & Margin">
-      <div className={style(\"@"(redBox, list{padding(px(10)), margin(px(10))}))} />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              paddingLeft(px(10)),
-              paddingRight(px(10)),
-              paddingTop(px(10)),
-              paddingBottom(px(10)),
-              marginLeft(px(10)),
-              marginRight(px(10)),
-              marginTop(px(10)),
-              marginBottom(px(10)),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(redBox, list{padding2(~v=px(10), ~h=px(20)), margin2(~v=px(10), ~h=px(20))}),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              padding3(~top=px(10), ~h=px(20), ~bottom=px(1)),
-              margin3(~top=px(10), ~h=px(20), ~bottom=px(2)),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              padding4(~top=px(10), ~bottom=px(1), ~left=px(5), ~right=px(15)),
-              margin4(~top=px(10), ~bottom=px(1), ~left=px(5), ~right=px(15)),
-            },
-          ),
-        )}
-      />
-    </Section>
-    <Section name="grid">
-      <div
-        className={style(list{
-          width(pct(100.)),
-          height(px(500)),
-          display(grid),
-          gridTemplateColumns(list{px(150), auto, px(150)}),
-          gridTemplateRows(list{px(60), auto}),
-        })}>
-        <div
-          className={style(list{
-            gridColumnStart(1),
-            gridColumnEnd(4),
-            background(red),
-            gridRowStart(1),
-            gridRowEnd(1),
-          })}
-        />
-        <div className={style(list{background(blue), gridColumn(1, 1), gridRow(2, 2)})} />
-        <div
-          className={style(list{
-            background(green),
-            gridColumn(2, 2),
-            gridRow(2, 2),
-            display(inlineGrid),
-            gridTemplateColumns(list{px(50), auto}),
-            gridTemplateRows(list{px(40), auto}),
-          })}>
-          <div className={style(list{background(yellow), gridRow(1, 1), gridColumn(2, 2)})} />
-          <div className={style(list{background(green), gridRow(1, 2), gridColumn(1, 1)})} />
-          <div className={style(list{background(purple), gridRow(2, 2), gridColumn(2, 2)})} />
-        </div>
-        <div
-          className={style(list{
-            gridColumnStart(3),
-            gridColumnEnd(3),
-            background(blue),
-            gridRowStart(2),
-            gridRowEnd(2),
-          })}
-        />
-      </div>
-      <div className={style(list{display(#grid), gridAutoFlow(#row)})}>
-        <div className={style(list{background(purple)})}>
-          {"grid auto direction row 1"->React.string}
-        </div>
-        <div className={style(list{background(green)})}>
-          {"grid auto direction row 2"->React.string}
-        </div>
-      </div>
-      <div
-        className={style(list{
-          display(#grid),
-          gridTemplateColumns(list{100->px, #repeat(#num(2), 60->px)}),
-        })}>
-        <div className={style(list{background(purple)})}> {"Grid track repeat"->React.string} </div>
-        <div className={style(list{background(green)})}> {"two times"->React.string} </div>
-        <div className={style(list{background(red)})}> {"three times"->React.string} </div>
-      </div>
-      <div className={style(list{display(#grid), gridAutoColumns(100->px)})}>
-        <div className={style(list{background(purple)})}>
-          {"Grid auto columns (100px)"->React.string}
-        </div>
-        <div className={style(list{background(green)})}> {"100px"->React.string} </div>
-        <div className={style(list{background(blue)})}> {"100px"->React.string} </div>
-      </div>
-    </Section>
-    <Section name="flexbox">
-      <div
-        className={style(list{
-          flexDirection(column),
-          flexGrow(1.),
-          alignItems(stretch),
-          selector("& > *", list{marginBottom(px(10)), width(pct(100.))}),
-        })}>
-        <div
-          className={style(list{
-            display(flexBox),
-            flexDirection(row),
-            background(gray),
-            alignItems(flexStart),
-            justifyContent(flexEnd),
-          })}>
-          <div
-            className={style(
-              \"@"(redBox, list{order(1), flexGrow(1.), flexShrink(1.), flexBasis(auto)}),
-            )}
-          />
-          <div className={style(\"@"(redBox, list{flex(none)}))} />
-          <div
-            className={style(
-              \"@"(redBox, list{order(1), flex3(~grow=1.5, ~shrink=0.8, ~basis=100->px)}),
-            )}
-          />
-          <div className={style(\"@"(redBox, list{alignSelf(flexEnd)}))} />
-          <div className={style(redBox)} />
-        </div>
-        <div
-          className={style(list{
-            display(flexBox),
-            flexDirection(column),
-            background(gray),
-            alignItems(baseline),
-            justifyContent(flexStart),
-          })}>
-          <div className={style(redBox)} />
-          <div className={style(redBox)} />
-          <div className={style(redBox)} />
-        </div>
-        <div
-          className={style(list{
-            display(flexBox),
-            flexDirection(rowReverse),
-            background(gray),
-            alignItems(center),
-            justifyContent(spaceBetween),
-          })}>
-          <div className={style(redBox)} />
-          <div className={style(\"@"(redBox, list{height(px(50)), width(px(50))}))} />
-          <div className={style(redBox)} />
-        </div>
-        <div
-          className={style(list{
-            display(flexBox),
-            flexDirection(columnReverse),
-            background(gray),
-            alignItems(flexEnd),
-            justifyContent(flexEnd),
-          })}>
-          <div className={style(redBox)} />
-          <div className={style(\"@"(redBox, list{height(px(50)), width(px(50))}))} />
-          <div className={style(redBox)} />
-        </div>
-        <div
-          className={style(list{
-            display(flexBox),
-            flexDirection(row),
-            background(gray),
-            alignItems(stretch),
-            justifyContent(spaceAround),
-          })}>
-          <div className={style(redBox)} />
-          <div className={style(\"@"(redBox, list{height(px(50)), width(px(50))}))} />
-          <div className={style(redBox)} />
-        </div>
-        <div
-          className={style(list{
-            display(flexBox),
-            flexDirection(row),
-            background(gray),
-            alignItems(stretch),
-            justifyContent(spaceEvenly),
-          })}>
-          <div className={style(redBox)} />
-          <div className={style(\"@"(redBox, list{height(px(50)), width(px(50))}))} />
-          <div className={style(redBox)} />
-        </div>
-      </div>
-    </Section>
-    <Section name="float">
-      <div className={style(\"@"(redBox, list{Css.float(#left), clear(#right)}))} />
-      <div className={style(\"@"(redBox, list{Css.float(#right), clear(#left)}))} />
-      <div className={style(\"@"(redBox, list{Css.float(none), clear(both)}))} />
-    </Section>
-    <Section name="overflow">
-      <div className={style(\"@"(redBox, list{overflow(hidden)}))} />
-      <div className={style(\"@"(redBox, list{overflow(visible)}))} />
-      <div className={style(\"@"(redBox, list{overflow(auto)}))} />
-      <div className={style(\"@"(redBox, list{overflow(scroll)}))} />
-    </Section>
-    <Section name="border">
-      <div
-        className={style(\"@"(redBox, list{border(px(5), solid, blue), borderRadius(px(1000))}))}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              border(px(5), solid, green),
-              borderTopRightRadius(px(1000)),
-              borderTopLeftRadius(px(1000)),
-              borderBottomRightRadius(px(1000)),
-              borderBottomLeftRadius(px(1000)),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              borderTop(px(5), dashed, hex("FFF")),
-              borderRight(px(5), dotted, rgb(0, 0, 0)),
-              borderBottom(px(5), none, green),
-              borderLeft(px(5), solid, blue),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(redBox, list{borderWidth(px(5)), borderStyle(solid), borderColor(blue)}),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(redBox, list{borderTopWidth(px(5)), borderTopStyle(solid), borderTopColor(blue)}),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{borderBottomWidth(px(5)), borderBottomStyle(solid), borderBottomColor(blue)},
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(redBox, list{borderLeftWidth(px(5)), borderLeftStyle(solid), borderLeftColor(blue)}),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{borderRightWidth(px(5)), borderRightStyle(solid), borderRightColor(blue)},
-          ),
-        )}
-      />
-    </Section>
-    <Section name="background">
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              background(red),
-              backgroundAttachment(scroll),
-              backgroundClip(borderBox),
-              backgroundOrigin(borderBox),
-              backgroundPosition(#hv(pct(50.), pct(50.))),
-              backgroundRepeat(noRepeat),
-              backgroundSize(size(px(100), px(100))),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              background(radialGradient(list{(zero, red), (pct(10.), blue)})),
-              backgroundAttachment(fixed),
-              backgroundClip(contentBox),
-              backgroundOrigin(contentBox),
-              backgroundRepeat(repeat),
-              backgroundSize(auto),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              background(url("./img-29.jpg")),
-              backgroundAttachment(local),
-              backgroundClip(paddingBox),
-              backgroundOrigin(paddingBox),
-              backgroundRepeat(repeatX),
-              backgroundSize(cover),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              backgroundColor(rgb(0, 0, 255)),
-              backgroundImage(
-                linearGradient(deg(45.), list{(zero, green), (pct(50.), red), (pct(100.), yellow)}),
-              ),
-              backgroundRepeat(repeatY),
-              backgroundSize(contain),
-            },
-          ),
-        )}
-      />
-    </Section>
-    <Section name="cursor">
-      <div className={style(\"@"(redBox, list{cursor(#auto)}))}> {"auto"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#default)}))}> {"default"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#none)}))}> {"none"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#contextMenu)}))}>
-        {"context menu"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#help)}))}> {"help"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#pointer)}))}> {"pointer"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#progress)}))}>
-        {"progress"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#wait)}))}> {"wait"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#cell)}))}> {"cell"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#crosshair)}))}>
-        {"crosshair"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#text)}))}> {"text"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#verticalText)}))}>
-        {"vert text"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#alias)}))}> {"alias"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#copy)}))}> {"copy"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#move)}))}> {"move"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#noDrop)}))}> {"no drop"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#notAllowed)}))}>
-        {"not allowed"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#grab)}))}> {"grab"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#grabbing)}))}>
-        {"grabbing"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#allScroll)}))}>
-        {"all scroll"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#colResize)}))}>
-        {"col resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#rowResize)}))}>
-        {"row resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#nResize)}))}>
-        {"n resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#eResize)}))}>
-        {"e resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#sResize)}))}>
-        {"s resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#wResize)}))}>
-        {"w resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#neResize)}))}>
-        {"ne resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#nwResize)}))}>
-        {"nw resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#seResize)}))}>
-        {"se resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#swResize)}))}>
-        {"sw resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#ewResize)}))}>
-        {"ew resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#nsResize)}))}>
-        {"ns resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#neswResize)}))}>
-        {"nesw resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#nwseResize)}))}>
-        {"nwse resize"->React.string}
-      </div>
-      <div className={style(\"@"(redBox, list{cursor(#zoomIn)}))}> {"zoom in"->React.string} </div>
-      <div className={style(\"@"(redBox, list{cursor(#zoomOut)}))}>
-        {"zoom out"->React.string}
-      </div>
-    </Section>
-    <Section name="list">
-      <ul>
-        <li className={style(list{listStyle(#disc, inside, none)})} />
-        <li className={style(list{listStyleType(#circle)})} />
-        <li className={style(list{listStyleType(#square)})} />
-        <li className={style(list{listStyleType(#decimal)})} />
-        <li className={style(list{listStyleType(#lowerAlpha)})} />
-        <li className={style(list{listStyleType(#upperAlpha)})} />
-        <li className={style(list{listStyleType(#lowerGreek)})} />
-        <li className={style(list{listStyleType(#lowerLatin)})} />
-        <li className={style(list{listStyleType(#upperLatin)})} />
-        <li className={style(list{listStyleType(#lowerRoman)})} />
-        <li className={style(list{listStyleType(#upperRoman)})} />
-        <li
-          className={style(list{
-            listStyleType(#disc),
-            listStylePosition(inside),
-            listStyleImage(url("./facebook.png")),
-          })}
-        />
-      </ul>
-    </Section>
-    <Section name="outline">
-      <div className={style(\"@"(redBox, list{outline(px(5), #double, green)}))} />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              outlineStyle(solid),
-              outlineWidth(px(5)),
-              outlineColor(green),
-              outlineOffset(px(5)),
-            },
-          ),
-        )}
-      />
-      <div className={style(\"@"(redBox, list{outline(px(5), #double, red)}))} />
-      <div className={style(\"@"(redBox, list{outline(px(5), #ridge, red)}))} />
-    </Section>
-    <Section name="transform">
-      <div className={style(\"@"(redBox, list{opacity(0.5)}))} />
-      <div
-        className={style(\"@"(redBox, list{perspective(px(500)), transform(rotate(deg(10.)))}))}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{transforms(list{translate(px(10), pct(10.)), skew(deg(10.), deg(10.))})},
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              transform(rotate(deg(19.))),
-              transformOrigin(pct(50.), pct(50.)),
-              transformStyle(#preserve3d),
-              perspective(px(900)),
-              perspectiveOrigin(pct(10.), pct(10.)),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{transform(translate(px(10), pct(10.))), transformOrigin3d(px(10), px(10), px(10))},
-          ),
-        )}
-      />
-    </Section>
-    <Section name="transition">
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{transition(~duration=300, ~delay=300, ~timingFunction=easeInOut, "transform")},
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              transitionProperty("height"),
-              transitionDelay(300),
-              transitionDuration(300),
-              transitionTimingFunction(linear),
-            },
-          ),
-        )}
-      />
-    </Section>
-    <Section name="text">
-      <p
-        className={style(list{
-          color(black),
-          fontFamilies(list{#custom("Helvetica"), #sansSerif}),
-          fontSize(pt(18)),
-          fontVariant(#smallCaps),
-          fontStyle(italic),
-          fontWeight(#num(300)),
-          letterSpacing(px(3)),
-          lineHeight(#abs(2.)),
-          textAlign(#left),
-          textDecoration(underline),
-          textDecorationColor(pink),
-          textDecorationStyle(wavy),
-          textIndent(px(10)),
-          textOverflow(clip),
-          textShadow(Shadow.text(~y=px(3), ~blur=px(2), black)),
-          textTransform(capitalize),
-          verticalAlign(sub),
-          whiteSpace(normal),
-          wordBreak(breakAll),
-          wordSpacing(px(20)),
-          wordWrap(breakWord),
-        })}>
-        {"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."->React.string}
-      </p>
-      <h2 className={style(list{width(pct(100.))})}> {"Named Font weights"->React.string} </h2>
-      <span
-        className={style(list{
-          fontWeight(thin),
-          paddingRight(px(10)),
-          borderRight(px(1), solid, black),
-        })}>
-        {"thin"->React.string}
-      </span>
-      <span className={style(list{fontWeight(extraLight), ...fontItem})}>
-        {"extra light"->React.string}
-      </span>
-      <span className={style(list{fontWeight(light), ...fontItem})}> {"light"->React.string} </span>
-      <span className={style(list{fontWeight(normal), ...fontItem})}>
-        {"normal"->React.string}
-      </span>
-      <span className={style(list{fontWeight(medium), ...fontItem})}>
-        {"medium"->React.string}
-      </span>
-      <span className={style(list{fontWeight(semiBold), ...fontItem})}>
-        {"semiBold"->React.string}
-      </span>
-      <span className={style(list{fontWeight(bold), ...fontItem})}> {"bold"->React.string} </span>
-      <span className={style(list{fontWeight(extraBold), ...fontItem})}>
-        {"extra bold"->React.string}
-      </span>
-      <span className={style(list{fontWeight(#black), ...fontItem})}>
-        {"black"->React.string}
-      </span>
-      <span className={style(list{fontWeight(lighter), ...fontItem})}>
-        {"lighter"->React.string}
-      </span>
-      <span className={style(list{fontWeight(bolder), ...fontItem})}>
-        {"bolder"->React.string}
-      </span>
-    </Section>
-    <Section name="animation">
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              animation(
-                ~duration=300,
-                ~delay=300,
-                ~direction=reverse,
-                ~timingFunction=linear,
-                ~fillMode=forwards,
-                ~playState=running,
-                ~iterationCount=infinite,
-                spin,
-              ),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              animations(list{
-                Animation.shorthand(~duration=300, ~iterationCount=infinite, spin),
-                Animation.shorthand(~duration=300, ~iterationCount=infinite, scaleAnimation),
-              }),
-            },
-          ),
-        )}
-      />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              animationName(spin),
-              animationTimingFunction(easeIn),
-              animationDuration(300),
-              animationDelay(300),
-              animationDirection(normal),
-              animationFillMode(backwards),
-              animationPlayState(paused),
-              animationIterationCount(count(5)),
-            },
-          ),
-        )}
-      />
-    </Section>
-    <Section name="cascading">
-      {"inherit"->React.string}
-      <div
-        className={style(list{
-          display(inherit_),
-          position(inherit_),
-          fontSize(inherit_),
-          fontStyle(inherit_),
-          lineHeight(inherit_),
-        })}
-      />
-      {"unset"->React.string}
-      <div
-        className={style(list{
-          display(unset),
-          position(unset),
-          fontSize(unset),
-          fontStyle(unset),
-          lineHeight(unset),
-        })}
-      />
-    </Section>
-    <Section name="columns">
-      <p className={style(list{columnCount(count(10))})}>
-        {"This is a bunch of text split into columns
-             using the CSS `column-count` property. The text
-             is equally distributed over the columns."->React.string}
-      </p>
-    </Section>
-    <Section name="resize">
-      <textarea className={style(list{resize(none)})}>
-        {"Can't resize textarea"->React.string}
-      </textarea>
-      <div className={style(list{marginLeft(px(20)), overflow(scroll), resize(horizontal)})}>
-        {"Resizable div (horizontal)"->React.string}
-      </div>
-      <div className={style(list{marginLeft(px(20)), overflow(scroll), resize(vertical)})}>
-        {"Resizable div (vertical)"->React.string}
-      </div>
-    </Section>
-    <Section name="content">
-      <div
-        className={style(list{
-          position(relative),
-          after(list{
-            contentRule(#none),
-            position(absolute),
-            top(zero),
-            left(zero),
-            width(pct(100.)),
-            height(pct(100.)),
-            border(px(1), solid, black),
-          }),
-        })}>
-        {"none"->React.string}
-      </div>
-      <div
-        className={style(list{
-          position(relative),
-          after(list{
-            contentRule(#normal),
-            position(absolute),
-            top(zero),
-            left(zero),
-            width(pct(100.)),
-            height(pct(100.)),
-            border(px(1), solid, black),
-          }),
-        })}>
-        {"normal"->React.string}
-      </div>
-      <div className={style(list{position(relative), marginLeft(px(20))})}>
-        <a
-          href="https://github.com/SentiaAnalytics/bs-css"
-          className={style(list{
-            before(list{
-              contentRule(#text("external ")),
-              backgroundColor(red),
-              display(inlineBlock),
-              flexBasis(content /* for test */),
-            }),
-          })}>
-          {"link"->React.string}
-        </a>
-      </div>
-      <div
-        className={style(list{
-          position(relative),
-          marginLeft(px(20)),
-          after(list{
-            contentRule(#text("")),
-            position(absolute),
-            top(zero),
-            left(zero),
-            width(pct(100.)),
-            height(pct(100.)),
-            border(px(1), solid, black),
-          }),
-        })}>
-        {"empty content"->React.string}
-      </div>
-      <div
-        className={style(list{
-          position(relative),
-          marginLeft(px(20)),
-          paddingLeft(px(20)),
-          after(list{
-            contentRule(#url("https://via.placeholder.com/18")),
-            position(absolute),
-            top(zero),
-            left(zero),
-            width(px(18)),
-            height(px(18)),
-            border(px(1), solid, black),
-          }),
-        })}>
-        {"url"->React.string}
-      </div>
-      <div
-        className={style(list{
-          marginLeft(px(20)),
-          counterReset(Types.CounterReset.reset("foo", ~value=1)),
-          before(list{contentRule(Types.Counter.counter("foo")), border(px(1), solid, black)}),
-        })}>
-        {"counter"->React.string}
-      </div>
-      <div
-        className={style(list{
-          counterReset(Types.CounterReset.reset("foo", ~value=1)),
-          marginLeft(px(20)),
-        })}>
-        <div
-          className={style(list{
-            counterReset(Types.CounterReset.reset("foo", ~value=2)),
-            before(list{
-              contentRule(Types.Counters.counters("foo", ~separator="@", ~style=#upperRoman)),
-              border(px(1), solid, black),
-            }),
-          })}>
-          {"counters"->React.string}
-        </div>
-      </div>
-      <div
-        className={style(list{
-          marginLeft(px(20)),
-          before(list{contentRule(#attr("class")), border(px(1), solid, black)}),
-        })}>
-        {"attr"->React.string}
-      </div>
-      <div
-        className={style(list{
-          marginLeft(px(20)),
-          before(list{
-            contentRule(
-              Types.Gradient.linearGradient(deg(45.), list{(zero, red), (pct(100.), blue)}),
-            ),
-            border(px(1), solid, black),
-            display(#inlineBlock),
-            height(px(18)),
-            width(px(18)),
-          }),
-        })}>
-        {"linear gradient"->React.string}
-      </div>
-      <div
-        className={style(list{
-          marginLeft(px(20)),
-          before(list{
-            contentRules(list{#openQuote, #text("foo"), #closeQuote}),
-            border(px(1), solid, black),
-          }),
-        })}>
-        {"contents (quotes)"->React.string}
-      </div>
-    </Section>
-    <Section name="insertRule, the ultimate escape hatch"> <div className="raw-css" /> </Section>
-    <Section name="merging style names">
-      <button className=mergedStyles> {"Merged"->React.string} </button>
-    </Section>
-    <Section name="filter">
-      <div className={style(\"@"(redBox, list{filter(list{#blur(#px(10))})}))} />
-      <div className={style(\"@"(redBox, list{filter(list{#brightness(50.)})}))} />
-      <div className={style(\"@"(redBox, list{filter(list{#contrast(50.)})}))} />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{filter(list{#dropShadow(#px(3), #px(3), #px(3), #rgb(200, 100, 100))})},
-          ),
-        )}
-      />
-      <div className={style(\"@"(redBox, list{filter(list{#grayscale(50.)})}))} />
-      <div className={style(\"@"(redBox, list{filter(list{#hueRotate(#deg(180.))})}))} />
-      <div className={style(\"@"(redBox, list{filter(list{#invert(50.)})}))} />
-      <div className={style(\"@"(redBox, list{filter(list{#opacity(50.)})}))} />
-      <div className={style(\"@"(redBox, list{filter(list{#saturate(50.)})}))} />
-      <div className={style(\"@"(redBox, list{filter(list{#sepia(50.)})}))} />
-      <div
-        className={style(
-          \"@"(
-            redBox,
-            list{
-              filter(list{
-                #sepia(50.),
-                #saturate(50.),
-                #dropShadow(#px(3), #px(3), #px(3), #rgb(200, 100, 100)),
-              }),
-            },
-          ),
-        )}
-      />
-      <svg height="0" className={style(list{display(#none)})}>
-        <filter id="f1"> <feGaussianBlur stdDeviation="3" /> </filter>
-      </svg>
-      <div className={style(\"@"(redBox, list{filter(list{#url("#f1")})}))} />
-    </Section>
-    <Section name="direction">
-      <Section name="ltr">
-        <div className={style(list{direction(#ltr), display(#flex)})}>
-          <div className={style(redBox)}> {"1"->React.string} </div>
-          <div className={style(redBox)}> {"2"->React.string} </div>
-          <div className={style(redBox)}> {"3"->React.string} </div>
-          <div className={style(redBox)}> {"4"->React.string} </div>
-        </div>
-      </Section>
-      <Section name="rtl">
-        <div className={style(list{direction(#rtl), display(#flex)})}>
-          <div className={style(redBox)}> {"1"->React.string} </div>
-          <div className={style(redBox)}> {"2"->React.string} </div>
-          <div className={style(redBox)}> {"3"->React.string} </div>
-          <div className={style(redBox)}> {"4"->React.string} </div>
-        </div>
-      </Section>
-      <Section name="unset">
-        <div className={style(list{direction(#unset), display(#flex)})}>
-          <div className={style(redBox)}> {"1"->React.string} </div>
-          <div className={style(redBox)}> {"2"->React.string} </div>
-          <div className={style(redBox)}> {"3"->React.string} </div>
-          <div className={style(redBox)}> {"4"->React.string} </div>
-        </div>
-      </Section>
-    </Section>
-    <Section name="object-fit">
-      <img className={style(\"@"(redBox, list{objectFit(#fill)}))} src="./img-29.jpg" />
-      <img className={style(\"@"(redBox, list{objectFit(#contain)}))} src="./img-29.jpg" />
-      <img className={style(\"@"(redBox, list{objectFit(#cover)}))} src="./img-29.jpg" />
-      <img className={style(\"@"(redBox, list{objectFit(#none)}))} src="./img-29.jpg" />
-      <img className={style(\"@"(redBox, list{objectFit(#scaleDown)}))} src="./img-29.jpg" />
-      <img className={style(\"@"(redBox, list{objectFit(#inherit_)}))} src="./img-29.jpg" />
-      <img className={style(\"@"(redBox, list{objectFit(#initial)}))} src="./img-29.jpg" />
-      <img className={style(\"@"(redBox, list{objectFit(#unset)}))} src="./img-29.jpg" />
-    </Section>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/bs-fetch/reason_examples.res b/jscomp/syntax/tests/idempotency/bs-fetch/reason_examples.res
deleted file mode 100644
index a69da21..0000000
--- a/jscomp/syntax/tests/idempotency/bs-fetch/reason_examples.res
+++ /dev/null
@@ -1,41 +0,0 @@
-let _ = {
-  open Js.Promise
-  Fetch.fetch("/api/hellos/1")
-  |> then_(Fetch.Response.text)
-  |> then_(text => print_endline(text) |> resolve)
-}
-
-let _ = {
-  open Js.Promise
-  Fetch.fetchWithInit("/api/hello", Fetch.RequestInit.make(~method_=Post, ()))
-  |> then_(Fetch.Response.text)
-  |> then_(text => print_endline(text) |> resolve)
-}
-
-let _ = {
-  open Js.Promise
-  Fetch.fetch("/api/fruit")
-  /* assume server returns `["apple", "banana", "pear", ...]` */
-  |> then_(Fetch.Response.json)
-  |> then_(json => Js.Json.decodeArray(json) |> resolve)
-  |> then_(opt => Belt.Option.getExn(opt) |> resolve)
-  |> then_(items =>
-    items |> Js.Array.map(item => item |> Js.Json.decodeString |> Belt.Option.getExn) |> resolve
-  )
-}
-
-/* makes a post request with the following json payload { hello: "world" } */
-let _ = {
-  let payload = Js.Dict.empty()
-  Js.Dict.set(payload, "hello", Js.Json.string("world"))
-  open Js.Promise
-  Fetch.fetchWithInit(
-    "/api/hello",
-    Fetch.RequestInit.make(
-      ~method_=Post,
-      ~body=Fetch.BodyInit.make(Js.Json.stringify(Js.Json.object_(payload))),
-      ~headers=Fetch.HeadersInit.make({"Content-Type": "application/json"}),
-      (),
-    ),
-  ) |> then_(Fetch.Response.json)
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi.res
deleted file mode 100644
index fcfa7d2..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi.res
+++ /dev/null
@@ -1,13 +0,0 @@
-type rafId
-
-@val external requestAnimationFrame: (float => unit) => unit = ""
-@val external requestCancellableAnimationFrame: (float => unit) => rafId = "requestAnimationFrame"
-@val external cancelAnimationFrame: rafId => unit = ""
-
-module Base64 = Webapi__Base64
-module Canvas = Webapi__Canvas
-module Dom = Webapi__Dom
-module File = Webapi__File
-module Performance = Webapi__Performance
-module Url = Webapi__Url
-module ResizeObserver = Webapi__ResizeObserver
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Base64.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Base64.res
deleted file mode 100644
index 2d6f449..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Base64.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@val external btoa: string => string = ""
-@val external atob: string => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Canvas.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Canvas.res
deleted file mode 100644
index 9f4089d..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Canvas.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module Canvas2d = Webapi__Canvas__Canvas2d
-module WebGl = Webapi__Canvas__WebGl
-
-module CanvasElement = {
-  @send external getContext2d: (Dom.element, @as("2d") _) => Canvas2d.t = "getContext"
-  @send external getContextWebGl: (Dom.element, @as("webgl") _) => WebGl.glT = "getContext"
-  @get external height: Dom.element => int = "height"
-  @set external setHeight: (Dom.element, int) => unit = "height"
-  @get external width: Dom.element => int = "width"
-  @set external setWidth: (Dom.element, int) => unit = "width"
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Canvas/Webapi__Canvas__Canvas2d.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Canvas/Webapi__Canvas__Canvas2d.res
deleted file mode 100644
index 41c63e4..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Canvas/Webapi__Canvas__Canvas2d.res
+++ /dev/null
@@ -1,265 +0,0 @@
-type t /* Main type, representing the 2d canvas rendering context object */
-type gradient
-type pattern
-type measureText
-
-/* Sub-modules (and their interfaces) for string enum arguments: */
-module type CompositeType = {
-  type t = private string
-
-  let sourceOver: t
-  let sourceIn: t
-  let sourceOut: t
-  let sourceAtop: t
-  let destinationOver: t
-  let destinationIn: t
-  let destinationOut: t
-  let destinationAtop: t
-  let lighter: t
-  let copy: t
-  let xor: t
-}
-
-module Composite: CompositeType = {
-  type t = string
-
-  let sourceOver: t = "source-over"
-  let sourceIn: t = "source-in"
-  let sourceOut: t = "source-out"
-  let sourceAtop: t = "source-atop"
-  let destinationOver: t = "destination-over"
-  let destinationIn: t = "destination-in"
-  let destinationOut: t = "destination-out"
-  let destinationAtop: t = "destination-atop"
-  let lighter: t = "lighter"
-  let copy: t = "copy"
-  let xor: t = "xor"
-}
-
-module type LineCapType = {
-  type t = private string
-
-  let butt: t
-  let round: t
-  let square: t
-}
-
-module LineCap: LineCapType = {
-  type t = string
-
-  let butt: t = "butt"
-  let round: t = "round"
-  let square: t = "square"
-}
-
-module type LineJoinType = {
-  type t = private string
-
-  let round: t
-  let bevel: t
-  let miter: t
-}
-
-module LineJoin: LineJoinType = {
-  type t = string
-
-  let round: t = "round"
-  let bevel: t = "bevel"
-  let miter: t = "miter"
-}
-
-type rec image<'a> =
-  | Number: image<float>
-  | ImageData: image<Webapi__Dom__Image.t>
-
-type rec style<_> =
-  | String: style<string>
-  | Gradient: style<gradient>
-  | Pattern: style<pattern>
-
-/* 2d Canvas API, following https://simon.html5.org/dump/html5-canvas-cheat-sheet.html */
-@bs.send.pipe(: t) external save: unit = ""
-@bs.send.pipe(: t) external restore: unit = ""
-
-/* Transformation */
-@bs.send.pipe(: t) external scale: (~x: float, ~y: float) => unit = ""
-@bs.send.pipe(: t) external rotate: float => unit = ""
-@bs.send.pipe(: t) external translate: (~x: float, ~y: float) => unit = ""
-@bs.send.pipe(: t)
-external transform: (
-  ~m11: float,
-  ~m12: float,
-  ~m21: float,
-  ~m22: float,
-  ~dx: float,
-  ~dy: float,
-) => unit = ""
-@bs.send.pipe(: t)
-external setTransform: (
-  ~m11: float,
-  ~m12: float,
-  ~m21: float,
-  ~m22: float,
-  ~dx: float,
-  ~dy: float,
-) => unit = ""
-
-/* Compositing */
-@set external globalAlpha: (t, float) => unit = ""
-@set external globalCompositeOperation: (t, Composite.t) => unit = ""
-
-/* Line Styles */
-@set external lineWidth: (t, float) => unit = ""
-@set external lineCap: (t, LineCap.t) => unit = ""
-@set external lineJoin: (t, LineJoin.t) => unit = ""
-@set external miterLimit: (t, float) => unit = ""
-
-/* Colors, Styles, and Shadows */
-@set external setFillStyle: (t, 'a) => unit = "fillStyle"
-@set external setStrokeStyle: (t, 'a) => unit = "strokeStyle"
-
-/* in re unused warnings
-   awaiting release of https://github.com/rescript-lang/rescript-compiler/issues/1656
-   to just use [@@bs.set] directly with an ignored (style a) */
-let setStrokeStyle = (type a, ctx: t, _: style<a>, v: a) => setStrokeStyle(ctx, v)
-
-let setFillStyle = (type a, ctx: t, _: style<a>, v: a) => setFillStyle(ctx, v)
-
-let reifyStyle = (type a, x: 'a): (style<a>, a) => {
-  module Internal = {
-    type constructor
-    @val external canvasGradient: constructor = "CanvasGradient" /* internal */
-    @val external canvasPattern: constructor = "CanvasPattern" /* internal */
-    let instanceOf: (
-      'a,
-      constructor,
-    ) => bool = %raw(`function(x,y) {return +(x instanceof y)}`) /* internal */
-  }
-
-  (
-    if Js.typeof(x) == "string" {
-      Obj.magic(String)
-    } else if Internal.instanceOf(x, Internal.canvasGradient) {
-      Obj.magic(Gradient)
-    } else if Internal.instanceOf(x, Internal.canvasPattern) {
-      Obj.magic(Pattern)
-    } else {
-      raise(
-        Invalid_argument(
-          "Unknown canvas style kind. Known values are: String, CanvasGradient, CanvasPattern",
-        ),
-      )
-    },
-    Obj.magic(x),
-  )
-}
-
-@get external fillStyle: t => 'a = ""
-@get external strokeStyle: t => 'a = ""
-
-let fillStyle = (ctx: t) => ctx |> fillStyle |> reifyStyle
-
-let strokeStyle = (ctx: t) => ctx |> strokeStyle |> reifyStyle
-
-@set external shadowOffsetX: (t, float) => unit = ""
-@set external shadowOffsetY: (t, float) => unit = ""
-@set external shadowBlur: (t, float) => unit = ""
-@set external shadowColor: (t, string) => unit = ""
-
-/* Gradients */
-@bs.send.pipe(: t)
-external createLinearGradient: (~x0: float, ~y0: float, ~x1: float, ~y1: float) => gradient = ""
-@bs.send.pipe(: t)
-external createRadialGradient: (
-  ~x0: float,
-  ~y0: float,
-  ~x1: float,
-  ~y1: float,
-  ~r0: float,
-  ~r1: float,
-) => gradient = ""
-@bs.send.pipe(: gradient) external addColorStop: (float, string) => unit = ""
-@val
-external createPattern: (
-  t,
-  Dom.element,
-  @string
-  [
-    | #repeat
-    | @as("repeat-x") #repeatX
-    | @as("repeat-y") #repeatY
-    | @as("no-repeat") #noRepeat
-  ],
-) => pattern = ""
-
-/* Paths */
-@bs.send.pipe(: t) external beginPath: unit = ""
-@bs.send.pipe(: t) external closePath: unit = ""
-@bs.send.pipe(: t) external fill: unit = ""
-@bs.send.pipe(: t) external stroke: unit = ""
-@bs.send.pipe(: t) external clip: unit = ""
-@bs.send.pipe(: t) external moveTo: (~x: float, ~y: float) => unit = ""
-@bs.send.pipe(: t) external lineTo: (~x: float, ~y: float) => unit = ""
-@bs.send.pipe(: t)
-external quadraticCurveTo: (~cp1x: float, ~cp1y: float, ~x: float, ~y: float) => unit = ""
-@bs.send.pipe(: t)
-external bezierCurveTo: (
-  ~cp1x: float,
-  ~cp1y: float,
-  ~cp2x: float,
-  ~cp2y: float,
-  ~x: float,
-  ~y: float,
-) => unit = ""
-@bs.send.pipe(: t)
-external arcTo: (~x1: float, ~y1: float, ~x2: float, ~y2: float, ~r: float) => unit = ""
-@bs.send.pipe(: t)
-external arc: (
-  ~x: float,
-  ~y: float,
-  ~r: float,
-  ~startAngle: float,
-  ~endAngle: float,
-  ~anticw: bool,
-) => unit = ""
-@bs.send.pipe(: t) external rect: (~x: float, ~y: float, ~w: float, ~h: float) => unit = ""
-@bs.send.pipe(: t) external isPointInPath: (~x: float, ~y: float) => bool = ""
-
-/* Text */
-@set external font: (t, string) => unit = ""
-@set external textAlign: (t, string) => unit = ""
-@set external textBaseline: (t, string) => unit = ""
-@bs.send.pipe(: t)
-external fillText: (string, ~x: float, ~y: float, ~maxWidth: float=?) => unit = ""
-@bs.send.pipe(: t)
-external strokeText: (string, ~x: float, ~y: float, ~maxWidth: float=?) => unit = ""
-@bs.send.pipe(: t) external measureText: string => measureText = ""
-@get external width: measureText => float = ""
-
-/* Rectangles */
-@bs.send.pipe(: t) external fillRect: (~x: float, ~y: float, ~w: float, ~h: float) => unit = ""
-@bs.send.pipe(: t) external strokeRect: (~x: float, ~y: float, ~w: float, ~h: float) => unit = ""
-@bs.send.pipe(: t) external clearRect: (~x: float, ~y: float, ~w: float, ~h: float) => unit = ""
-
-@send
-external createImageDataCoords: (t, ~width: float, ~height: float) => Webapi__Dom__Image.t =
-  "createImageData"
-@send
-external createImageDataFromImage: (t, Webapi__Dom__Image.t) => Webapi__Dom__Image.t =
-  "createImageData"
-
-@send
-external getImageData: (t, ~sx: float, ~sy: float, ~sw: float, ~sh: float) => Webapi__Dom__Image.t =
-  ""
-@send
-external putImageData: (
-  t,
-  ~imageData: Webapi__Dom__Image.t,
-  ~dx: float,
-  ~dy: float,
-  ~dirtyX: float=?,
-  ~dirtyY: float=?,
-  ~dirtyWidth: float=?,
-  ~dirtyHeight: float=?,
-  unit,
-) => unit = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Canvas/Webapi__Canvas__WebGl.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Canvas/Webapi__Canvas__WebGl.res
deleted file mode 100644
index 07fa2cd..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Canvas/Webapi__Canvas__WebGl.res
+++ /dev/null
@@ -1,107 +0,0 @@
-type glT
-type programT
-type shaderT
-type bufferT
-
-/* ClearBufferMask */
-let _DEPTH_BUFFER_BIT: int = 256
-let _STENCIL_BUFFER_BIT: int = 1024
-let _COLOR_BUFFER_BIT: int = 16384
-
-/* BeginMode */
-let _POINTS: int = 0
-let _LINES: int = 1
-let _LINE_LOOP: int = 2
-let _LINE_STRIP: int = 3
-let _TRIANGLES: int = 4
-let _TRIANGLE_STRIP: int = 5
-let _TRIANGLE_FAN: int = 6
-
-/* TEXTURE_2D */
-let _CULL_FACE: int = 2884
-let _BLEND: int = 3042
-let _DITHER: int = 3024
-let _STENCIL_TEST: int = 2960
-let _DEPTH_TEST: int = 2929
-let _SCISSOR_TEST: int = 3089
-let _POLYGON_OFFSET_FILL: int = 32823
-let _SAMPLE_ALPHA_TO_COVERAGE: int = 32926
-let _SAMPLE_COVERAGE: int = 32928
-
-/* BlendingFactorDest */
-let _ZERO: int = 0
-let _ONE: int = 1
-let _SRC_COLOR: int = 768
-let _ONE_MINUS_SRC_COLOR: int = 769
-let _SRC_ALPHA: int = 770
-let _ONE_MINUS_SRC_ALPHA: int = 771
-let _DST_ALPHA: int = 772
-let _ONE_MINUS_DST_ALPHA: int = 773
-
-/* DataType */
-let _BYTE: int = 5120
-let _UNSIGNED_BYTE: int = 5121
-let _SHORT: int = 5122
-let _UNSIGNED_SHORT: int = 5123
-let _INT: int = 5124
-let _UNSIGNED_INT: int = 5125
-let _FLOAT: int = 5126
-
-/* CullFaceMode */
-let _FRONT: int = 1028
-let _BACK: int = 1029
-let _FRONT_AND_BACK: int = 1032
-
-/* Shaders */
-let _FRAGMENT_SHADER: int = 35632
-let _VERTEX_SHADER: int = 35633
-
-/* Buffer Objects */
-let _ARRAY_BUFFER: int = 34962
-let _ELEMENT_ARRAY_BUFFER: int = 34963
-let _ARRAY_BUFFER_BINDING: int = 34964
-let _ELEMENT_ARRAY_BUFFER_BINDING: int = 34965
-let _STREAM_DRAW: int = 35040
-let _STATIC_DRAW: int = 35044
-let _DYNAMIC_DRAW: int = 35048
-
-/* void clear(GLbitfield mask); */
-@send external clear: (glT, int) => unit = "clear"
-/* void clearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); */
-@send external clearColor: (glT, float, float, float, float) => unit = "clearColor"
-/* void enable(GLenum cap); */
-@send external enable: (glT, int) => unit = "enable"
-/* void disable(GLenum cap); */
-@send external disable: (glT, int) => unit = "disable"
-/* void blendFunc(GLenum sfactor, GLenum dfactor); */
-@send external blendFunc: (glT, int, int) => unit = "blendFunc"
-/* void cullFace(GLenum mode); */
-@send external cullFace: (glT, int) => unit = "cullFace"
-@send external createBuffer: glT => bufferT = "createBuffer"
-@send external deleteBuffer: (glT, bufferT) => unit = "deleteBuffer"
-@send external bindBuffer: (glT, int, bufferT) => unit = "bindBuffer"
-@send external bufferData: (glT, int, Js.Typed_array.Uint16Array.t, int) => unit = "bufferData"
-@send
-external bufferFloatData: (glT, int, Js.Typed_array.Float32Array.t, int) => unit = "bufferData"
-@send external createProgram: glT => programT = "createProgram"
-@send external linkProgram: (glT, programT) => unit = "linkProgram"
-@send external useProgram: (glT, programT) => unit = "useProgram"
-@send external getProgramInfoLog: (glT, programT) => string = "getProgramInfoLog"
-@send external bindAttribLocation: (glT, programT, int, string) => unit = "bindAttribLocation"
-@send external createShader: (glT, int) => shaderT = "createShader"
-@send external shaderSource: (glT, shaderT, string) => unit = "shaderSource"
-@send external compileShader: (glT, shaderT) => unit = "compileShader"
-@send external attachShader: (glT, programT, shaderT) => unit = "attachShader"
-@send external getShaderInfoLog: (glT, shaderT) => string = "getShaderInfoLog"
-/* void drawElements(GLenum mode, GLsizei count, GLenum type, GLintptr offset); */
-@send external drawElements: (glT, int, int, int, int) => unit = "drawElements"
-/* void enableVertexAttribArray(GLuint index); */
-@send external enableVertexAttribArray: (glT, int) => unit = "enableVertexAttribArray"
-/* void vertexAttribPointer(GLuint indx, GLint size, GLenum type,
- GLboolean normalized, GLsizei stride, GLintptr offset); */
-@send
-external vertexAttribPointer: (glT, int, int, int, bool, int, int) => unit = "vertexAttribPointer"
-/* GLint gl.getAttribLocation(program, name); */
-@send external getAttribLocation: (glT, programT, string) => int = "getAttribLocation"
-/* void gl.drawArrays(mode, first, count); */
-@send external drawArrays: (glT, int, int, int) => unit = "drawArrays"
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom.res
deleted file mode 100644
index c8f876f..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom.res
+++ /dev/null
@@ -1,335 +0,0 @@
-module AnimationEvent = Webapi__Dom__AnimationEvent
-module Attr = Webapi__Dom__Attr
-module BeforeUnloadEvent = Webapi__Dom__BeforeUnloadEvent
-module CdataSection = Webapi__Dom__CdataSection
-module CharacterData = Webapi__Dom__CharacterData
-module Comment = Webapi__Dom__Comment
-module CssStyleDeclaration = Webapi__Dom__CssStyleDeclaration
-module ClipboardEvent = Webapi__Dom__ClipboardEvent
-module CloseEvent = Webapi__Dom__CloseEvent
-module CompositionEvent = Webapi__Dom__CompositionEvent
-module CustomEvent = Webapi__Dom__CustomEvent
-module Document = Webapi__Dom__Document
-module DocumentFragment = Webapi__Dom__DocumentFragment
-module DocumentType = Webapi__Dom__DocumentType
-module DomImplementation = Webapi__Dom__DomImplementation
-module DomRect = Webapi__Dom__DomRect
-module DomStringMap = Webapi__Dom__DomStringMap
-module DomTokenList = Webapi__Dom__DomTokenList
-module DragEvent = Webapi__Dom__DragEvent
-module Element = Webapi__Dom__Element
-module ErrorEvent = Webapi__Dom__ErrorEvent
-module Event = Webapi__Dom__Event
-module EventTarget = Webapi__Dom__EventTarget
-module FocusEvent = Webapi__Dom__FocusEvent
-module History = Webapi__Dom__History
-module HtmlCollection = Webapi__Dom__HtmlCollection
-module HtmlDocument = Webapi__Dom__HtmlDocument
-module HtmlElement = Webapi__Dom__HtmlElement
-module HtmlFormElement = Webapi__Dom__HtmlFormElement
-module HtmlImageElement = Webapi__Dom__HtmlImageElement
-module HtmlInputElement = Webapi__Dom__HtmlInputElement
-module IdbVersionChangeEvent = Webapi__Dom__IdbVersionChangeEvent
-module Image = Webapi__Dom__Image
-module InputEvent = Webapi__Dom__InputEvent
-module KeyboardEvent = Webapi__Dom__KeyboardEvent
-module Location = Webapi__Dom__Location
-module MouseEvent = Webapi__Dom__MouseEvent
-module MutationObserver = Webapi__Dom__MutationObserver
-module MutationRecord = Webapi__Dom__MutationRecord
-module NamedNodeMap = Webapi__Dom__NamedNodeMap
-module Node = Webapi__Dom__Node
-module NodeFilter = Webapi__Dom__NodeFilter
-module NodeIterator = Webapi__Dom__NodeIterator
-module NodeList = Webapi__Dom__NodeList
-module PageTransitionEvent = Webapi__Dom__PageTransitionEvent
-module PointerEvent = Webapi__Dom__PointerEvent
-module PopStateEvent = Webapi__Dom__PopStateEvent
-module ProcessingInstruction = Webapi__Dom__ProcessingInstruction
-module ProgressEvent = Webapi__Dom__ProgressEvent
-module Range = Webapi__Dom__Range
-module RelatedEvent = Webapi__Dom__RelatedEvent
-module Selection = Webapi__Dom__Selection
-module ShadowRoot = Webapi__Dom__ShadowRoot
-module StorageEvent = Webapi__Dom__StorageEvent
-module SvgZoomEvent = Webapi__Dom__SvgZoomEvent
-module Text = Webapi__Dom__Text
-module TimeEvent = Webapi__Dom__TimeEvent
-module TouchEvent = Webapi__Dom__TouchEvent
-module TrackEvent = Webapi__Dom__TrackEvent
-module TransitionEvent = Webapi__Dom__TransitionEvent
-module TreeWalker = Webapi__Dom__TreeWalker
-module UiEvent = Webapi__Dom__UiEvent
-module ValidityState = Webapi__Dom__ValidityState
-module WebGlContextEvent = Webapi__Dom__WebGlContextEvent
-module WheelEvent = Webapi__Dom__WheelEvent
-module Window = Webapi__Dom__Window
-
-include Webapi__Dom__Types
-
-@val external window: Dom.window = "window"
-@val external document: Dom.document = "document"
-@val @scope("window") external history: Dom.history = "history"
-@val @scope("window") external location: Dom.location = "location"
-
-/* Unimplemented interfaces (aka. "The TODO list")
-
-   Attr
-   CharacterData
-   ChildNode /* experimental */
-   Comment
-   DocumentFragment
-   DocumentType
-   DOMError
-   DOMException
-   DOMImplementation
-   DOMTimeStamp
-   DOMSettableTokenList /* deprecated, merged with DOMTokenList */
-   DOMStringList
-   MutationObserver
-   MutationRecord
-   NodeIterator
-   ParentNode /* experimental */
-   ProcessingInstruction
-   Text
-   TreeWalker
-   URL
-   Worker
-   XMLDocument /* experimental */
-
-   /* HTML Elements */
-   HTMLAnchorElement
-   HTMLAppletElement
-   HTMLAreaElement
-   HTMLAudioElement
-   HTMLBaseElement
-   HTMLBodyElement
-   HTMLBRElement
-   HTMLButtonELement
-   HTMLCanvasElement
-   HTMLDataElement
-   HTMLDataListElement
-   HTMLDialogElement
-   HTMLDirectoryElement
-   HTMLDivElement
-   HTMLDListElement
-   HTMLEmbedElement
-   HTMLFieldSetElement
-   HTMLFontElement
-   HTMLFormElement
-   HTMLFrameElement
-   HTMLFrameSetElement
-   HTMLHeadElement
-   HTMLHeadingElement
-   HTMLHtmlElement
-   HTMLHRElement
-   HTMLIFrameElement
-   HTMLImageElement
-   HTMLInputElement
-   HTMLKeygenElement
-   HTMLLabelElement
-   HTMLLegendElement
-   HTMLLIElement
-   HTMLLinkElement
-   HTMLMapElement
-   HTMLMediaElement
-   HTMLMenuElement
-   HTMLMetaElement
-   HTMLMeterElement
-   HTMLModElement
-   HTMLObjectElement
-   HTMLOListElement
-   HTMLOptGroupElement
-   HTMLOptionElement
-   HTMLOutputElement
-   HTMLParagraphElement
-   HTMLParamElement
-   HTMLPreElement
-   HTMLProgressElement
-   HTMLQuoteElement
-   HTMLScriptElement
-   HTMLSelectElement
-   HTMLSourceElement
-   HTMLSpanElement
-   HTMLStyleElement
-   HTMLTableElement
-   HTMLTableCaptionElement
-   HTMLTableCellElement
-   HTMLTableDataCellElement
-   HTMLTableHeaderCellElement
-   HTMLTableColElement
-   HTMLTableRowElement
-   HTMLTableSectionElement
-   HTMLTextAreaElement
-   HTMLTimeElement
-   HTMLTitleElement
-   HTMLTrackElement
-   HTMLUListElement
-   HTMLUnknownElement
-   HTMLVideoElement
-
-   /* Other interfaces */
-   CanvasRenderingContext2D
-   CanvasGradient
-   CanvasPattern
-   TextMetrics
-   ImageData
-   CanvasPixelArray
-   NotifyAudioAvailableEvent
-   HTMLAllCollection
-   HTMLFormControlsCollection
-   HTMLOptionsCollection
-   HTMLPropertiesCollection
-   DOMStringMap
-   RadioNodeList
-   MediaError
-
-   /* SVG Element interfaces */
-   SVGAElement
-   SVGAltGlyphElement
-   SVGAltGlyphDefElement
-   SVGAltGlyphItemElement
-   SVGAnimationElement
-   SVGAnimateElement
-   SVGAnimateColorElement
-   SVGAnimateMotionElement
-   SVGAnimateTransformElement
-   SVGCircleElement
-   SVGClipPathElement
-   SVGColorProfileElement
-   SVGComponentTransferFunctionElement
-   SVGCursorElement
-   SVGDefsElement
-   SVGDescElement
-   SVGElement
-   SVGEllipseElement
-   SVGFEBlendElement
-   SVGFEColorMatrixElement
-   SVGFEComponentTransferElement
-   SVGFECompositeElement
-   SVGFEConvolveMatrixElement
-   SVGFEDiffuseLightingElement
-   SVGFEDisplacementMapElement
-   SVGFEDistantLightElement
-   SVGFEFloodElement
-   SVGFEGaussianBlurElement
-   SVGFEImageElement
-   SVGFEMergeElement
-   SVGFEMergeNodeElement
-   SVGFEMorphologyElement
-   SVGFEOffsetElement
-   SVGFEPointLightElement
-   SVGFESpecularLightingElement
-   SVGFESpotLightElement
-   SVGFETileElement
-   SVGFETurbulenceElement
-   SVGFEFuncRElement
-   SVGFEFuncGElement
-   SVGFEFuncBElement
-   SVGFEFuncAElement
-   SVGFilterElement
-   SVGFilterPrimitiveStandardAttributes
-   SVGFontElement
-   SVGFontFaceElement
-   SVGFontFaceFormatElement
-   SVGFontFaceNameElement
-   SVGFontFaceSrcElement
-   SVGFontFaceUriElement
-   SVGForeignObjectElement
-   SVGGElement
-   SVGGlyphElement
-   SVGGlyphRefElement
-   SVGGradientElement
-   SVGHKernElement
-   SVGImageElement
-   SVGLinearGradientElement
-   SVGLineElement
-   SVGMarkerElement
-   SVGMaskElement
-   SVGMetadataElement
-   SVGMissingGlyphElement
-   SVGMPathElement
-   SVGPathElement
-   SVGPatternElement
-   SVGPolylineElement
-   SVGPolygonElement
-   SVGRadialGradientElement
-   SVGRectElement
-   SVGScriptElement
-   SVGSetElement
-   SVGStopElement
-   SVGStyleElement
-   SVGSVGElement
-   SVGSwitchElement
-   SVGSymbolElement
-   SVGTextElement
-   SVGTextPathElement
-   SVGTitleElement
-   SVGTRefElement
-   SVGTSpanElement
-   SVGUseElement
-   SVGViewElement
-   SVGVKernElement
-
-   /* SVG data type interfaces */
-
-   /* Static type */
-   SVGAngle
-   SVGColor
-   SVGICCColor
-   SVGElementInstance
-   SVGElementInstanceList
-   SVGLength
-   SVGLengthList
-   SVGMatrix
-   SVGNumber
-   SVGNumberList
-   SVGPaint
-   SVGPoint
-   SVGPointList
-   SVGPreserveAspectRatio
-   SVGRect
-   SVGStringList
-   SVGTransform
-   SVGTransformList
-
-   /* Animated type */
-   SVGAnimatedAngle
-   SVGAnimatedBoolean
-   SVGAnimatedEnumeration
-   SVGAnimatedInteger
-   SVGAnimatedLength
-   SVGAnimatedLengthList
-   SVGAnimatedNumber
-   SVGAnimatedNumberList
-   SVGAnimatedPreserveAspectRatio
-   SVGAnimatedRect
-   SVGAnimatedString
-   SVGAnimatedTransformList
-
-   /* SIML related interfaces */
-   ElementTimeControl
-   TimeEvent
-
-   /* Other SVG interfaces */
-   SVGAnimatedPathData
-   SVGAnimatedPoints
-   SVGColorProfileRule
-   SVGCSSRule
-   SVGExternalResourcesRequired
-   SVGFitToViewBox
-   SVGLangSpace
-   SVGLocatable
-   SVGRenderingIntent
-   SVGStylable
-   SVGTests
-   SVGTextContentElement
-   SVGTextPositioningElement
-   SVGTransformable
-   SVGUnitTypes
-   SVGURIReference
-   SVGViewSpec
-   SVGZoomAndPan
-
-   /* obsolete interfaces skipped */
- */
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__AnimationEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__AnimationEvent.res
deleted file mode 100644
index 3ab50b8..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__AnimationEvent.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type t = Dom.animationEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "AnimationEvent"
-@new external makeWithOptions: (string, {..}) => t = "AnimationEvent"
-
-@get external animationName: t => string = ""
-@get external elapsedTime: t => float = ""
-@get external pseudoElement: t => string /* enum-ish */ = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Attr.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Attr.res
deleted file mode 100644
index c58aac5..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Attr.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type t = Dom.attr
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-
-@get external namespaceURI: t => string = ""
-@get external prefix: t => string = ""
-@get external localName: t => string = ""
-@get external name: t => string = ""
-@get external value: t => string = ""
-@get @return(nullable) external ownerElement: t => option<Dom.element> = ""
-@get external specified: t => bool = "" /* useless; always returns true (exact wording from spec) */
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__BeforeUnloadEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__BeforeUnloadEvent.res
deleted file mode 100644
index 3975ece..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__BeforeUnloadEvent.res
+++ /dev/null
@@ -1,10 +0,0 @@
-type t = Dom.beforeUnloadEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "BeforeUnloadEvent"
-@new external makeWithOptions: (string, {..}) => t = "BeforeUnloadEvent"
-
-@get external returnValue: t => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CdataSection.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CdataSection.res
deleted file mode 100644
index 97d7eb2..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CdataSection.res
+++ /dev/null
@@ -1,20 +0,0 @@
-type t = Dom.cdataSection
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__CharacterData.Impl({
-  type t = t
-})
-include Webapi__Dom__NonDocumentTypeChildNode.Impl({
-  type t = t
-})
-include Webapi__Dom__ChildNode.Impl({
-  type t = t
-})
-include Webapi__Dom__Slotable.Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CharacterData.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CharacterData.res
deleted file mode 100644
index 0b1ee6e..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CharacterData.res
+++ /dev/null
@@ -1,32 +0,0 @@
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @get external data: T.t => string = ""
-  @get external length: T.t => int = ""
-
-  @bs.send.pipe(: T.t) external substringData: (~offset: int, ~count: int) => string = ""
-  @bs.send.pipe(: T.t) external appendData: string => unit = ""
-  @bs.send.pipe(: T.t) external insertData: (~offset: int, string) => unit = ""
-  @bs.send.pipe(: T.t) external deleteData: (~offset: int, ~count: int) => unit = ""
-  @bs.send.pipe(: T.t) external replaceData: (~offset: int, ~count: int, string) => unit = ""
-}
-
-type t = Dom.characterData
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__NonDocumentTypeChildNode.Impl({
-  type t = t
-})
-include Webapi__Dom__ChildNode.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ChildNode.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ChildNode.res
deleted file mode 100644
index 8b49e60..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ChildNode.res
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Mixin */
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @bs.send.pipe(: T.t) external remove: unit = ""
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ClipboardEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ClipboardEvent.res
deleted file mode 100644
index 59305b5..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ClipboardEvent.res
+++ /dev/null
@@ -1,10 +0,0 @@
-type t = Dom.clipboardEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "ClipboardEvent"
-@new external makeWithOptions: (string, {..}) => t = "ClipboardEvent"
-
-@get external clipboardData: t => Dom.dataTransfer = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CloseEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CloseEvent.res
deleted file mode 100644
index 7fe1d60..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CloseEvent.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type t = Dom.closeEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "CloseEvent"
-@new external makeWithOptions: (string, {..}) => t = "CloseEvent"
-
-@get external wasClean: t => bool = ""
-@get external code: t => int = ""
-@get external reason: t => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Comment.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Comment.res
deleted file mode 100644
index 9554558..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Comment.res
+++ /dev/null
@@ -1,20 +0,0 @@
-type t = Dom.comment
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__CharacterData.Impl({
-  type t = t
-})
-include Webapi__Dom__NonDocumentTypeChildNode.Impl({
-  type t = t
-})
-include Webapi__Dom__ChildNode.Impl({
-  type t = t
-})
-include Webapi__Dom__Slotable.Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CompositionEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CompositionEvent.res
deleted file mode 100644
index 4e55c38..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CompositionEvent.res
+++ /dev/null
@@ -1,13 +0,0 @@
-type t = Dom.compositionEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Webapi__Dom__UiEvent.Impl({
-  type t = t
-})
-
-@new external make: string => t = "CompositionEvent"
-@new external makeWithOptions: (string, {..}) => t = "CompositionEvent"
-
-@get external data: t => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CssStyleDeclaration.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CssStyleDeclaration.res
deleted file mode 100644
index f0be084..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CssStyleDeclaration.res
+++ /dev/null
@@ -1,138 +0,0 @@
-type t = Dom.cssStyleDeclaration
-type cssRule /* TODO: Move to Webapi__Dom */
-
-@get external cssText: t => string = ""
-@set external setCssText: (t, string) => unit = "cssText"
-@get external length: t => int = ""
-@get external parentRule: t => cssRule = ""
-
-@bs.send.pipe(: t) external getPropertyPriority: string => string = ""
-@bs.send.pipe(: t) external getPropertyValue: string => string = ""
-@bs.send.pipe(: t) external item: int => string = ""
-@bs.send.pipe(: t) external removeProperty: string => string = ""
-@bs.send.pipe(: t) external setProperty: (string, string, string) => unit = ""
-/* [@@bs.send.pipe : t] external setPropertyValue : (string, string) => unit = ""; */ /* not mentioned by MDN and not implemented by chrome, but in the CSSOM spec:  https://drafts.csswg.org/cssom/#the-cssstyledeclaration-interface */
-
-/* CSS2Properties */
-@get external azimuth: t => string = ""
-@get external background: t => string = ""
-@get external backgroundAttachment: t => string = ""
-@get external backgroundColor: t => string = ""
-@get external backgroundImage: t => string = ""
-@get external backgroundPosition: t => string = ""
-@get external backgroundRepeat: t => string = ""
-@get external border: t => string = ""
-@get external borderCollapse: t => string = ""
-@get external borderColor: t => string = ""
-@get external borderSpacing: t => string = ""
-@get external borderStyle: t => string = ""
-@get external borderTop: t => string = ""
-@get external borderRight: t => string = ""
-@get external borderBottom: t => string = ""
-@get external borderLeft: t => string = ""
-@get external borderTopColor: t => string = ""
-@get external borderRightColor: t => string = ""
-@get external borderBottomColor: t => string = ""
-@get external borderLeftColor: t => string = ""
-@get external borderTopStyle: t => string = ""
-@get external borderRightStyle: t => string = ""
-@get external borderBottomStyle: t => string = ""
-@get external borderLeftStyle: t => string = ""
-@get external borderTopWidth: t => string = ""
-@get external borderRightWidth: t => string = ""
-@get external borderBottomWidth: t => string = ""
-@get external borderLeftWidth: t => string = ""
-@get external borderWidth: t => string = ""
-@get external bottom: t => string = ""
-@get external captionSide: t => string = ""
-@get external clear: t => string = ""
-@get external clip: t => string = ""
-@get external color: t => string = ""
-@get external content: t => string = ""
-@get external counterIncrement: t => string = ""
-@get external counterReset: t => string = ""
-@get external cue: t => string = ""
-@get external cueAfter: t => string = ""
-@get external cueBefore: t => string = ""
-@get external cursor: t => string = ""
-@get external direction: t => string = ""
-@get external display: t => string = ""
-@get external elevation: t => string = ""
-@get external emptyCells: t => string = ""
-@get external cssFloat: t => string = ""
-@get external font: t => string = ""
-@get external fontFamily: t => string = ""
-@get external fontSize: t => string = ""
-@get external fontSizeAdjust: t => string = ""
-@get external fontStretch: t => string = ""
-@get external fontStyle: t => string = ""
-@get external fontVariant: t => string = ""
-@get external fontWeight: t => string = ""
-@get external height: t => string = ""
-@get external left: t => string = ""
-@get external letterSpacing: t => string = ""
-@get external lineHeight: t => string = ""
-@get external listStyle: t => string = ""
-@get external listStyleImage: t => string = ""
-@get external listStylePosition: t => string = ""
-@get external listStyleType: t => string = ""
-@get external margin: t => string = ""
-@get external marginTop: t => string = ""
-@get external marginRight: t => string = ""
-@get external marginBottom: t => string = ""
-@get external marginLeft: t => string = ""
-@get external markerOffset: t => string = ""
-@get external marks: t => string = ""
-@get external maxHeight: t => string = ""
-@get external maxWidth: t => string = ""
-@get external minHeight: t => string = ""
-@get external minWidth: t => string = ""
-@get external orphans: t => string = ""
-@get external outline: t => string = ""
-@get external outlineColor: t => string = ""
-@get external outlineStyle: t => string = ""
-@get external outlineWidth: t => string = ""
-@get external overflow: t => string = ""
-@get external padding: t => string = ""
-@get external paddingTop: t => string = ""
-@get external paddingRight: t => string = ""
-@get external paddingBottom: t => string = ""
-@get external paddingLeft: t => string = ""
-@get external page: t => string = ""
-@get external pageBreakAfter: t => string = ""
-@get external pageBreakBefore: t => string = ""
-@get external pageBreakInside: t => string = ""
-@get external pause: t => string = ""
-@get external pauseAfter: t => string = ""
-@get external pauseBefore: t => string = ""
-@get external pitch: t => string = ""
-@get external pitchRange: t => string = ""
-@get external playDuring: t => string = ""
-@get external position: t => string = ""
-@get external quotes: t => string = ""
-@get external richness: t => string = ""
-@get external right: t => string = ""
-@get external size: t => string = ""
-@get external speak: t => string = ""
-@get external speakHeader: t => string = ""
-@get external speakNumeral: t => string = ""
-@get external speakPunctuation: t => string = ""
-@get external speechRate: t => string = ""
-@get external stress: t => string = ""
-@get external tableLayout: t => string = ""
-@get external textAlign: t => string = ""
-@get external textDecoration: t => string = ""
-@get external textIndent: t => string = ""
-@get external textShadow: t => string = ""
-@get external textTransform: t => string = ""
-@get external top: t => string = ""
-@get external unicodeBidi: t => string = ""
-@get external verticalAlign: t => string = ""
-@get external visibility: t => string = ""
-@get external voiceFamily: t => string = ""
-@get external volume: t => string = ""
-@get external whiteSpace: t => string = ""
-@get external widows: t => string = ""
-@get external width: t => string = ""
-@get external wordSpacing: t => string = ""
-@get external zIndex: t => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CustomEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CustomEvent.res
deleted file mode 100644
index d411b36..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__CustomEvent.res
+++ /dev/null
@@ -1,8 +0,0 @@
-type t = Dom.customEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "CustomEvent"
-@new external makeWithOptions: (string, {..}) => t = "CustomEvent"
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Document.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Document.res
deleted file mode 100644
index 1e02ec4..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Document.res
+++ /dev/null
@@ -1,138 +0,0 @@
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  external asDocument: T.t => Dom.document = "%identity"
-
-  let asHtmlDocument: T.t => Js.null<Dom.htmlDocument> = %raw(`
-    function (document) {
-      return document.doctype.name === "html" ?  document : null;
-    }
-  `)
-  @deprecated("Will fail if no doctype is defined, consider using unsafeAsHtmlDocument instead")
-  let asHtmlDocument: T.t => option<Dom.htmlDocument> = self =>
-    Js.Null.toOption(asHtmlDocument(self))
-
-  external unsafeAsHtmlDocument: T.t => Dom.htmlDocument = "%identity"
-
-  let ofNode = (node: Dom.node): option<T.t> =>
-    Webapi__Dom__Node.nodeType(node) == Document ? Some(Obj.magic(node)) : None
-
-  @get external characterSet: T.t => string = ""
-  @get external compatMode: T.t => string /* compatMode enum */ = "" /* experimental */
-  let compatMode: T.t => Webapi__Dom__Types.compatMode = self =>
-    Webapi__Dom__Types.decodeCompatMode(compatMode(self))
-  @get external doctype: T.t => Dom.documentType = ""
-  @get external documentElement: T.t => Dom.element = ""
-  @get external documentURI: T.t => string = ""
-  @get external hidden: T.t => bool = ""
-  @get external implementation: T.t => Dom.domImplementation = ""
-  @get external lastStyleSheetSet: T.t => string = ""
-  @get @return(nullable)
-  external pointerLockElement: T.t => option<Dom.element> = "" /* experimental */
-
-  @get external preferredStyleSheetSet: T.t => string = ""
-  @get @return(nullable) external scrollingElement: T.t => option<Dom.element> = ""
-  @get external selectedStyleSheetSet: T.t => string = ""
-  @set external setSelectedStyleSheetSet: (T.t, string) => unit = "selectedStyleSheetSet"
-  @get
-  external styleSheets: T.t => array<Dom.cssStyleSheet> = "" /* return StyleSheetList, not array */
-  @get external styleSheetSets: T.t => array<string> = ""
-  @get external visibilityState: T.t => string /* visibilityState enum */ = ""
-  let visibilityState: T.t => Webapi__Dom__Types.visibilityState = self =>
-    Webapi__Dom__Types.decodeVisibilityState(visibilityState(self))
-
-  @bs.send.pipe(: T.t) external adoptNode: Dom.element_like<'a> => Dom.element_like<'a> = ""
-  @bs.send.pipe(: T.t) external createAttribute: string => Dom.attr = ""
-  @bs.send.pipe(: T.t) external createAttributeNS: (string, string) => Dom.attr = ""
-  @bs.send.pipe(: T.t) external createComment: string => Dom.comment = ""
-  @bs.send.pipe(: T.t) external createDocumentFragment: Dom.documentFragment = ""
-  @bs.send.pipe(: T.t) external createElement: string => Dom.element = ""
-  @bs.send.pipe(: T.t)
-  external createElementWithOptions: (string, {..}) => Dom.element =
-    "createElement" /* not widely supported */
-  @bs.send.pipe(: T.t) external createElementNS: (string, string) => Dom.element = ""
-  @bs.send.pipe(: T.t)
-  external createElementNSWithOptions: (string, string, {..}) => Dom.element =
-    "createElementNS" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external createEvent: string /* large enum */ => Dom.event =
-    "" /* discouraged (but not deprecated) in favor of Event constructors */
-  @bs.send.pipe(: T.t) external createNodeIterator: Dom.node_like<'a> => Dom.nodeIterator = ""
-  @bs.send.pipe(: T.t)
-  external createNodeIteratorWithWhatToShow: (
-    Dom.node_like<'a>,
-    Webapi__Dom__Types.WhatToShow.t,
-  ) => Dom.nodeIterator = "createNodeIterator"
-  @bs.send.pipe(: T.t)
-  external createNodeIteratorWithWhatToShowFilter: (
-    Dom.node_like<'a>,
-    Webapi__Dom__Types.WhatToShow.t,
-    Dom.nodeFilter,
-  ) => Dom.nodeIterator = "createNodeIterator" /* createProcessingInstruction */
-  @bs.send.pipe(: T.t) external createRange: Dom.range = ""
-  @bs.send.pipe(: T.t) external createTextNode: string => Dom.text = ""
-  @bs.send.pipe(: T.t) external createTreeWalker: Dom.element_like<'a> => Dom.treeWalker = ""
-  @bs.send.pipe(: T.t)
-  external createTreeWalkerWithWhatToShow: (
-    Dom.element_like<'a>,
-    Webapi__Dom__Types.WhatToShow.t,
-  ) => Dom.treeWalker = "createTreeWalker"
-  @bs.send.pipe(: T.t)
-  external createTreeWalkerWithWhatToShowFilter: (
-    Dom.element_like<'a>,
-    Webapi__Dom__Types.WhatToShow.t,
-    Dom.nodeFilter,
-  ) => Dom.treeWalker = "createTreeWalker"
-  @bs.send.pipe(: T.t)
-  external elementFromPoint: (int, int) => Dom.element = "" /* experimental, but widely supported */
-  @bs.send.pipe(: T.t)
-  external elementsFromPoint: (int, int) => array<Dom.element> = "" /* experimental */
-  @bs.send.pipe(: T.t) external enableStyleSheetsForSet: string => unit = ""
-  @bs.send.pipe(: T.t) external exitPointerLock: unit = "" /* experimental */
-  @bs.send.pipe(: T.t) external getAnimations: array<Dom.animation> = "" /* experimental */
-  @bs.send.pipe(: T.t) external getElementsByClassName: string => Dom.htmlCollection = ""
-  @bs.send.pipe(: T.t) external getElementsByTagName: string => Dom.htmlCollection = ""
-  @bs.send.pipe(: T.t) external getElementsByTagNameNS: (string, string) => Dom.htmlCollection = ""
-  @bs.send.pipe(: T.t) external importNode: Dom.element_like<'a> => Dom.element_like<'a> = ""
-  @bs.send.pipe(: T.t)
-  external importNodeDeep: (Dom.element_like<'a>, @as(json`true`) _) => Dom.element_like<'a> =
-    "importNode"
-  @bs.send.pipe(: T.t)
-  external registerElement: (string, unit) => Dom.element =
-    "" /* experimental and deprecated in favor of customElements.define() */
-  @bs.send.pipe(: T.t)
-  external registerElementWithOptions: (string, {..}, unit) => Dom.element =
-    "registerElement" /* experimental and deprecated in favor of customElements.define() */
-
-  @@ocaml.doc(
-    " XPath stuff "
-    /* createExpression */
-    /* createNSResolver */
-    /* evaluate */
-
-    /* GlobalEventHandlers interface */
-  )
-}
-
-type t = Dom.document
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__NonElementParentNode.Impl({
-  type t = t
-})
-include Webapi__Dom__DocumentOrShadowRoot.Impl({
-  type t = t
-})
-include Webapi__Dom__ParentNode.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DocumentFragment.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DocumentFragment.res
deleted file mode 100644
index 4332cbe..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DocumentFragment.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type t = Dom.documentFragment
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__NonElementParentNode.Impl({
-  type t = t
-})
-include Webapi__Dom__ParentNode.Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DocumentOrShadowRoot.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DocumentOrShadowRoot.res
deleted file mode 100644
index 1a7c120..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DocumentOrShadowRoot.res
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Mixin */
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  /* TODO: Implemented in Shadow DOM spec */
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DocumentType.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DocumentType.res
deleted file mode 100644
index d6235f5..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DocumentType.res
+++ /dev/null
@@ -1,15 +0,0 @@
-type t = Dom.documentType
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__ChildNode.Impl({
-  type t = t
-})
-
-@get external name: t => string = ""
-@get external publicId: t => string = ""
-@get external systemId: t => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomImplementation.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomImplementation.res
deleted file mode 100644
index b355686..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomImplementation.res
+++ /dev/null
@@ -1,22 +0,0 @@
-type t = Dom.domImplementation
-
-@bs.send.pipe(: t)
-external createDocumentType: (
-  ~qualifiedName: string,
-  ~publicId: string,
-  ~systemId: string,
-) => Dom.documentType = ""
-@bs.send.pipe(: t)
-external createDocument: (Js.null<string>, string, Js.null<Dom.documentType>) => Dom.xmlDocument =
-  ""
-let createDocument = (
-  ~namespace: option<string>=?,
-  ~qualifiedName: string,
-  ~docType: option<Dom.documentType>=?,
-) => createDocument(Js.Null.fromOption(namespace), qualifiedName, Js.Null.fromOption(docType))
-@bs.send.pipe(: t) external createHTMLDocument: Dom.htmlDocument = ""
-@bs.send.pipe(: t)
-external createHTMLDocumentWithTitle: string => Dom.htmlDocument = "createHTMLDocument"
-@bs.send.pipe(: t)
-external hasFeature: bool =
-  "" /* useless; always returns true (this is exact wording from the actual spec) */
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomRect.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomRect.res
deleted file mode 100644
index a6748b7..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomRect.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type t = Dom.domRect
-
-@new
-external make: (~x: float, ~y: float, ~width: float, ~height: float) => t =
-  "DOMRect" /* experimental */
-
-@get external top: t => float = ""
-@get external bottom: t => float = ""
-@get external left: t => float = ""
-@get external right: t => float = ""
-@get external height: t => float = ""
-@get external width: t => float = ""
-@get external x: t => float = ""
-@get external y: t => float = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomStringMap.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomStringMap.res
deleted file mode 100644
index 679d4a9..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomStringMap.res
+++ /dev/null
@@ -1,10 +0,0 @@
-type t = Dom.domStringMap
-
-type key = string
-
-@get_index @return(nullable)
-external get: (t, key) => option<string> = ""
-let get = (key, map) => get(map, key)
-@set_index external set: (t, key, string) => unit = ""
-let set = (key, value, map) => set(map, key, value)
-let unsafeDeleteKey: (key, t) => unit = %raw((key, map) => "delete map[key];")
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomTokenList.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomTokenList.res
deleted file mode 100644
index 64f5111..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DomTokenList.res
+++ /dev/null
@@ -1,26 +0,0 @@
-type t = Dom.domTokenList
-
-@get external length: t => int = ""
-
-@bs.send.pipe(: t) @return(nullable) external item: int => option<string> = ""
-@bs.send.pipe(: t) external add: string => unit = ""
-@bs.send.pipe(: t) @variadic external addMany: array<string> => unit = "add"
-@bs.send.pipe(: t) external contains: string => bool = "contains"
-/* entries: iterator API, should have language support */
-@bs.send.pipe(: t) external forEach: ((string, int) => unit) => unit = ""
-/* keys: iterator API, should have language support */
-@bs.send.pipe(: t) external remove: string => unit = ""
-@bs.send.pipe(: t) @variadic external removeMany: array<string> => unit = "remove"
-@bs.send.pipe(: t) external replace: (string, string) => unit = "" /* experimental */
-@bs.send.pipe(: t)
-external supports: string => bool = "" /* experimental, Content Management Level 1 */
-@bs.send.pipe(: t) external toggle: string => bool = ""
-@bs.send.pipe(: t) external toggleForced: (string, @as(json`true`) _) => bool = "toggle"
-@bs.send.pipe(: t) external toString: string = ""
-/* values: iterator API, should have language support */
-
-@get
-external value: t => string = "" /* experimental, from being merged with domSettableTokenList */
-@set
-external setValue: (t, string) => unit =
-  "value" /* experimental, from being merged with domSettableTokenList */
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DragEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DragEvent.res
deleted file mode 100644
index a875162..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__DragEvent.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type t = Dom.dragEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Webapi__Dom__UiEvent.Impl({
-  type t = t
-})
-include Webapi__Dom__MouseEvent.Impl({
-  type t = t
-})
-
-@new external make: string => t = "DragEvent"
-@new external makeWithOptions: (string, {..}) => t = "DragEvent"
-
-@get external dataTransfer: t => Dom.dataTransfer = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Element.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Element.res
deleted file mode 100644
index d2566e5..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Element.res
+++ /dev/null
@@ -1,169 +0,0 @@
-/* internal, moved out of Impl to reduce unnecessary code duplication */
-let ofNode = (node: Dom.node): option<'a> =>
-  Webapi__Dom__Node.nodeType(node) == Element ? Some(Obj.magic(node)) : None
-
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  let asHtmlElement: T.t => Js.null<Dom.htmlElement> = %raw(`
-    function (element) {
-      // BEWARE: Assumes "contentEditable" uniquely identifies an HTMLELement
-      return element.contentEditable !== undefined ?  element : null;
-    }
-  `)
-  @deprecated("asHtmlElement uses a weak heuristic, consider using unsafeAsHtmlElement instead")
-  let asHtmlElement: T.t => option<Dom.htmlElement> = self => Js.Null.toOption(asHtmlElement(self))
-
-  external unsafeAsHtmlElement: T.t => Dom.htmlElement = "%identity"
-  let ofNode: Dom.node => option<T.t> = ofNode
-
-  @get external attributes: T.t => Dom.namedNodeMap = ""
-  @get external classList: T.t => Dom.domTokenList = ""
-  @get external className: T.t => string = ""
-  @set external setClassName: (T.t, string) => unit = "className"
-  @get external clientHeight: T.t => int = "" /* experimental */
-  @get external clientLeft: T.t => int = "" /* experimental */
-  @get external clientTop: T.t => int = "" /* experimental */
-  @get external clientWidth: T.t => int = "" /* experimental */
-  @get external id: T.t => string = ""
-  @set external setId: (T.t, string) => unit = "id"
-  @get external innerHTML: T.t => string = ""
-  @set external setInnerHTML: (T.t, string) => unit = "innerHTML"
-  @get external localName: T.t => string = ""
-  @get @return(nullable) external namespaceURI: T.t => option<string> = ""
-  @get external outerHTML: T.t => string = "" /* experimental, but widely supported */
-  @set
-  external setOuterHTML: (T.t, string) => unit =
-    "outerHTML" /* experimental, but widely supported */
-  @get @return(nullable) external prefix: T.t => option<string> = ""
-  @get external scrollHeight: T.t => int = "" /* experimental, but widely supported */
-  @get external scrollLeft: T.t => float = "" /* experimental */
-  @set external setScrollLeft: (T.t, float) => unit = "scrollLeft" /* experimental */
-  @get external scrollTop: T.t => float = "" /* experimental, but widely supported */
-  @set
-  external setScrollTop: (T.t, float) => unit = "scrollTop" /* experimental, but widely supported */
-  @get external scrollWidth: T.t => int = "" /* experimental */
-  @get external shadowRoot: T.t => Dom.element = "" /* experimental */
-  @get external slot: T.t => string = "" /* experimental */
-  @set external setSlot: (T.t, string) => unit = "slot" /* experimental */
-  @get external tagName: T.t => string = ""
-
-  @bs.send.pipe(: T.t)
-  external attachShadow: {"mode": string} => Dom.shadowRoot = "" /* experimental */
-  @bs.send.pipe(: T.t)
-  external attachShadowOpen: @as(json`{ "mode": "open" }`) _ => Dom.shadowRoot =
-    "attachShadow" /* experimental */
-  @bs.send.pipe(: T.t)
-  external attachShadowClosed: @as(json`{ "mode": "closed" }`) _ => Dom.shadowRoot =
-    "attachShadow" /* experimental */
-  @bs.send.pipe(: T.t) external animate: ({..}, {..}) => Dom.animation = "" /* experimental */
-  @bs.send.pipe(: T.t) @return(nullable)
-  external closest: string => option<Dom.element> = "" /* experimental */
-  @bs.send.pipe(: T.t)
-  external createShadowRoot: Dom.shadowRoot = "" /* experimental AND deprecated (?!) */
-  @bs.send.pipe(: T.t) @return(nullable) external getAttribute: string => option<string> = ""
-  @bs.send.pipe(: T.t) @return(nullable)
-  external getAttributeNS: (string, string) => option<string> = ""
-  @bs.send.pipe(: T.t) external getBoundingClientRect: Dom.domRect = ""
-  @bs.send.pipe(: T.t) external getClientRects: array<Dom.domRect> = ""
-  @bs.send.pipe(: T.t) external getElementsByClassName: string => Dom.htmlCollection = ""
-  @bs.send.pipe(: T.t) external getElementsByTagName: string => Dom.htmlCollection = ""
-  @bs.send.pipe(: T.t) external getElementsByTagNameNS: (string, string) => Dom.htmlCollection = ""
-  @bs.send.pipe(: T.t) external hasAttribute: string => bool = ""
-  @bs.send.pipe(: T.t) external hasAttributeNS: (string, string) => bool = ""
-  @bs.send.pipe(: T.t) external hasAttributes: bool = ""
-  @bs.send.pipe(: T.t)
-  external insertAdjacentElement: (string /* insertPosition enum */, Dom.element_like<'a>) => unit =
-    "" /* experimental, but widely supported */
-  let insertAdjacentElement: (
-    Webapi__Dom__Types.insertPosition,
-    Dom.element_like<'a>,
-    T.t,
-  ) => unit = (position, element, self) =>
-    insertAdjacentElement(Webapi__Dom__Types.encodeInsertPosition(position), element, self)
-  @bs.send.pipe(: T.t)
-  external insertAdjacentHTML: (string /* insertPosition enum */, string) => unit =
-    "" /* experimental, but widely supported */
-  let insertAdjacentHTML: (Webapi__Dom__Types.insertPosition, string, T.t) => unit = (
-    position,
-    text,
-    self,
-  ) => insertAdjacentHTML(Webapi__Dom__Types.encodeInsertPosition(position), text, self)
-  @bs.send.pipe(: T.t)
-  external insertAdjacentText: (string /* insertPosition enum */, string) => unit =
-    "" /* experimental, but widely supported */
-  let insertAdjacentText: (Webapi__Dom__Types.insertPosition, string, T.t) => unit = (
-    position,
-    text,
-    self,
-  ) => insertAdjacentText(Webapi__Dom__Types.encodeInsertPosition(position), text, self)
-  @bs.send.pipe(: T.t)
-  external matches: string => bool = "" /* experimental, but widely supported */
-  @bs.send.pipe(: T.t) external releasePointerCapture: Dom.eventPointerId => unit = ""
-  @bs.send.pipe(: T.t) external removeAttribute: string => unit = ""
-  @bs.send.pipe(: T.t) external removeAttributeNS: (string, string) => unit = ""
-  @bs.send.pipe(: T.t) external requestFullscreen: unit = "" /* experimental */
-  @bs.send.pipe(: T.t) external requestPointerLock: unit = "" /* experimental */
-  @bs.send.pipe(: T.t) external scrollIntoView: unit = "" /* experimental, but widely supported */
-  @bs.send.pipe(: T.t)
-  external scrollIntoViewNoAlignToTop: @as(json`true`) _ => unit =
-    "scrollIntoView" /* experimental, but widely supported */
-  @bs.send.pipe(: T.t)
-  external scrollIntoViewWithOptions: {"behavior": string, "block": string} => unit =
-    "scrollIntoView" /* experimental */
-  @bs.send.pipe(: T.t) external scrollBy: (float, float) => unit = ""
-  @bs.send.pipe(: T.t)
-  external scrollByWithOptions: {"top": float, "left": float, "behavior": string} => unit =
-    "scrollBy"
-  @bs.send.pipe(: T.t) external scrollTo: (float, float) => unit = ""
-  @bs.send.pipe(: T.t)
-  external scrollToWithOptions: {"top": float, "left": float, "behavior": string} => unit =
-    "scrollTo"
-  @bs.send.pipe(: T.t) external setAttribute: (string, string) => unit = ""
-  @bs.send.pipe(: T.t) external setAttributeNS: (string, string, string) => unit = ""
-  @bs.send.pipe(: T.t) external setPointerCapture: Dom.eventPointerId => unit = ""
-
-  /* GlobalEventHandlers interface */
-  /* Not sure this should be exposed, since EventTarget seems like a better API */
-
-  @set external setOnClick: (T.t, Dom.mouseEvent => unit) => unit = "onclick"
-}
-
-/* TODO: This doesn't work. Why?
-module Tree (T: { type t; }) => {
-  include NodeRe.Impl { type t = Type };
-  include EventTargetRe.Impl { type t = Type };
-  include Impl { type t = Type };
-};
-
-include Tree { type t = Dom.element };
-*/
-
-type t = Dom.element
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__GlobalEventHandlers.Impl({
-  type t = t
-})
-include Webapi__Dom__ParentNode.Impl({
-  type t = t
-})
-include Webapi__Dom__NonDocumentTypeChildNode.Impl({
-  type t = t
-})
-include Webapi__Dom__ChildNode.Impl({
-  type t = t
-})
-include Webapi__Dom__Slotable.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ErrorEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ErrorEvent.res
deleted file mode 100644
index 4567cbe..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ErrorEvent.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type t = Dom.errorEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "ErrorEvent"
-@new external makeWithOptions: (string, {..}) => t = "ErrorEvent"
-
-@get external message: t => string = ""
-@get external filename: t => string = ""
-@get external lineno: t => int = ""
-@get external colno: t => int = ""
-@get external error: t => {..} = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Event.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Event.res
deleted file mode 100644
index bf7d32f..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Event.res
+++ /dev/null
@@ -1,60 +0,0 @@
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @get external bubbles: T.t => bool = ""
-  @get external cancelable: T.t => bool = ""
-  @get external composed: T.t => bool = ""
-  @get external currentTarget: T.t => Dom.eventTarget = ""
-  @get external defaultPrevented: T.t => bool = ""
-  @get external eventPhase: T.t => int /* eventPhase enum */ = ""
-  let eventPhase: T.t => Webapi__Dom__Types.eventPhase = self =>
-    Webapi__Dom__Types.decodeEventPhase(eventPhase(self))
-  @get external target: T.t => Dom.eventTarget = ""
-  @get external timeStamp: T.t => float = ""
-  @get external type_: T.t => string = "type"
-  @get external isTrusted: T.t => bool = ""
-
-  @bs.send.pipe(: T.t) external preventDefault: unit = ""
-  @bs.send.pipe(: T.t) external stopImmediatePropagation: unit = ""
-  @bs.send.pipe(: T.t) external stopPropagation: unit = ""
-}
-
-type t = Dom.event
-
-include Impl({
-  type t = t
-})
-
-@new external make: string => t = "Event"
-@new external makeWithOptions: (string, {..}) => t = "Event"
-
-/*
-   Unimplemented Event interfaces
-
-   AudioProcessingEvent /* deprecated */
-   BeforeInputEvent /* experimental? Looks like it might just be an InputEvent */
-   BlobEvent /* experimental, MediaStream recording */
-   CSSFontFaceLoadEvent /* experimental - https://www.w3.org/TR/css-font-loading-3/#dom-cssfontfaceloadevent */
-   DeviceLightEvent /* experimenta, Ambient Light */
-   DeviceMotionEvent /* experimental, Device Orientation */
-   DeviceOrientationEvent /* experimental, Device Orientation */
-   DeviceProximityEvent /* experimental, Device Orientation */
-   DOMTransactionEvent /* very experimental - https://dvcs.w3.org/hg/undomanager/raw-file/tip/undomanager.html#the-domtransactionevent-interface */
-   EditingBeforeInputEvent /* deprecated? - https://dvcs.w3.org/hg/editing/raw-file/57abe6d3cb60/editing.html#editingbeforeinputevent */
-   FetchEvent /* experimental, Service Workers */
-   GamepadEvent /* experimental, Gamepad */
-   HashChangeEvent /* https://www.w3.org/TR/html51/browsers.html#the-hashchangeevent-interface */
-   MediaStreamEvent /* experimental, WebRTC */
-   MessageEvent /* experimental, Websocket/WebRTC */
-   MutationEvent /* deprecated */
-   OfflineAudioCompletionEvent /* experimental, Web Audio */
-   RTCDataChannelEvent /* experimental, WebRTC */
-   RTCIdentityErrorEventA /* experimental, WebRTC */
-   RTCIdentityEvent /* experimental, WebRTC */
-   RTCPeerConnectionIceEvent /* experimental, WebRTC */
-   SensorEvent /* deprecated? */
-   SVGEvent /* deprecated */
-   UserProximityEvent /* experimental, Proximity Events */
-*/
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__EventTarget.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__EventTarget.res
deleted file mode 100644
index 6bed97a..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__EventTarget.res
+++ /dev/null
@@ -1,1383 +0,0 @@
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  external asEventTarget: T.t => Dom.eventTarget = "%identity"
-
-  @bs.send.pipe(: T.t) external addEventListener: (string, Dom.event => unit) => unit = ""
-  @bs.send.pipe(: T.t)
-  external addEventListenerWithOptions: (
-    string,
-    Dom.event => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addEventListenerUseCapture: (string, Dom.event => unit, @as(json`true`) _) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t) external removeEventListener: (string, Dom.event => unit) => unit = ""
-  @bs.send.pipe(: T.t)
-  external removeEventListenerWithOptions: (
-    string,
-    Dom.event => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeEventListenerUseCapture: (string, Dom.event => unit, @as(json`true`) _) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t) external dispatchEvent: Dom.event_like<'a> => bool = ""
-
-  @ocaml.doc("
-   *  non-standard event-specific functions
-   ")
-  @bs.send.pipe(: T.t)
-  external /* UI */
-
-  addLoadEventListener: (@as("load") _, Dom.event => unit) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addLoadEventListenerWithOptions: (
-    @as("load") _,
-    Dom.event => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addLoadEventListenerUseCapture: (
-    @as("load") _,
-    Dom.event => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeLoadEventListener: (@as("load") _, Dom.event => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeLoadEventListenerWithOptions: (
-    @as("load") _,
-    Dom.event => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeLoadEventListenerUseCapture: (
-    @as("load") _,
-    Dom.event => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addUnloadEventListener: (@as("unload") _, Dom.event => unit) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addUnloadEventListenerWithOptions: (
-    @as("unload") _,
-    Dom.event => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addUnloadEventListenerUseCapture: (
-    @as("unload") _,
-    Dom.event => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeUnloadEventListener: (@as("unload") _, Dom.event => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeUnloadEventListenerWithOptions: (
-    @as("unload") _,
-    Dom.event => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeUnloadEventListenerUseCapture: (
-    @as("unload") _,
-    Dom.event => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addAbortEventListener: (@as("abort") _, Dom.event => unit) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addAbortEventListenerWithOptions: (
-    @as("abort") _,
-    Dom.event => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addAbortEventListenerUseCapture: (
-    @as("abort") _,
-    Dom.event => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeAbortEventListener: (@as("abort") _, Dom.event => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeAbortEventListenerWithOptions: (
-    @as("abort") _,
-    Dom.event => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeAbortEventListenerUseCapture: (
-    @as("abort") _,
-    Dom.event => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addErrorEventListener: (@as("error") _, Dom.event => unit) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addErrorEventListenerWithOptions: (
-    @as("error") _,
-    Dom.event => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addErrorEventListenerUseCapture: (
-    @as("error") _,
-    Dom.event => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeErrorEventListener: (@as("error") _, Dom.event => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeErrorEventListenerWithOptions: (
-    @as("error") _,
-    Dom.event => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeErrorEventListenerUseCapture: (
-    @as("error") _,
-    Dom.event => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addSelectEventListener: (@as("select") _, Dom.event => unit) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addSelectEventListenerWithOptions: (
-    @as("select") _,
-    Dom.event => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addSelectEventListenerUseCapture: (
-    @as("select") _,
-    Dom.event => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeSelectEventListener: (@as("select") _, Dom.event => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeSelectEventListenerWithOptions: (
-    @as("select") _,
-    Dom.event => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeSelectEventListenerUseCapture: (
-    @as("select") _,
-    Dom.event => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  /* Focus */
-
-  @bs.send.pipe(: T.t)
-  external addBlurEventListener: (@as("blur") _, Dom.focusEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addBlurEventListenerWithOptions: (
-    @as("blur") _,
-    Dom.focusEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addBlurEventListenerUseCapture: (
-    @as("blur") _,
-    Dom.focusEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeBlurEventListener: (@as("blur") _, Dom.focusEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeBlurEventListenerWithOptions: (
-    @as("blur") _,
-    Dom.focusEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeBlurEventListenerUseCapture: (
-    @as("blur") _,
-    Dom.focusEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addFocusEventListener: (@as("focus") _, Dom.focusEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addFocusEventListenerWithOptions: (
-    @as("focus") _,
-    Dom.focusEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addFocusEventListenerUseCapture: (
-    @as("focus") _,
-    Dom.focusEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeFocusEventListener: (@as("focus") _, Dom.focusEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeFocusEventListenerWithOptions: (
-    @as("focus") _,
-    Dom.focusEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeFocusEventListenerUseCapture: (
-    @as("focus") _,
-    Dom.focusEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addFocusInEventListener: (@as("focusin") _, Dom.focusEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addFocusInEventListenerWithOptions: (
-    @as("focusin") _,
-    Dom.focusEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addFocusInEventListenerUseCapture: (
-    @as("focusin") _,
-    Dom.focusEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeFocusInEventListener: (@as("focusin") _, Dom.focusEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeFocusInEventListenerWithOptions: (
-    @as("focusin") _,
-    Dom.focusEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeFocusInEventListenerUseCapture: (
-    @as("focusin") _,
-    Dom.focusEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addFocusOutEventListener: (@as("focusout") _, Dom.focusEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addFocusOutEventListenerWithOptions: (
-    @as("focusout") _,
-    Dom.focusEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addFocusOutEventListenerUseCapture: (
-    @as("focusout") _,
-    Dom.focusEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeFocusOutEventListener: (@as("focusout") _, Dom.focusEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeFocusOutEventListenerWithOptions: (
-    @as("focusout") _,
-    Dom.focusEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeFocusOutEventListenerUseCapture: (
-    @as("focusout") _,
-    Dom.focusEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  /* Mouse */
-
-  @bs.send.pipe(: T.t)
-  external addClickEventListener: (@as("click") _, Dom.mouseEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addClickEventListenerWithOptions: (
-    @as("click") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addClickEventListenerUseCapture: (
-    @as("click") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeClickEventListener: (@as("click") _, Dom.mouseEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeClickEventListenerWithOptions: (
-    @as("click") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeClickEventListenerUseCapture: (
-    @as("click") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addDblClickEventListener: (@as("dblclick") _, Dom.mouseEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addDblClickEventListenerWithOptions: (
-    @as("dblclick") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addDblClickEventListenerUseCapture: (
-    @as("dblclick") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDblClickEventListener: (@as("dblclick") _, Dom.mouseEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDblClickEventListenerWithOptions: (
-    @as("dblclick") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeDblClickEventListenerUseCapture: (
-    @as("dblclick") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addMouseDownEventListener: (@as("mousedown") _, Dom.mouseEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addMouseDownEventListenerWithOptions: (
-    @as("mousedown") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addMouseDownEventListenerUseCapture: (
-    @as("mousedown") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseDownEventListener: (@as("mousedown") _, Dom.mouseEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseDownEventListenerWithOptions: (
-    @as("mousedown") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeMouseDownEventListenerUseCapture: (
-    @as("mousedown") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addMouseEnterEventListener: (@as("mouseenter") _, Dom.mouseEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addMouseEnterEventListenerWithOptions: (
-    @as("mouseenter") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addMouseEnterEventListenerUseCapture: (
-    @as("mouseenter") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseEnterEventListener: (@as("mouseenter") _, Dom.mouseEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseEnterEventListenerWithOptions: (
-    @as("mouseenter") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeMouseEnterEventListenerUseCapture: (
-    @as("mouseenter") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addMouseMoveEventListener: (@as("mousemove") _, Dom.mouseEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addMouseMoveEventListenerWithOptions: (
-    @as("mousemove") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addMouseMoveEventListenerUseCapture: (
-    @as("mousemove") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseMoveEventListener: (@as("mousemove") _, Dom.mouseEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseMoveEventListenerWithOptions: (
-    @as("mousemove") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeMouseMoveEventListenerUseCapture: (
-    @as("mousemove") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addMouseOutEventListener: (@as("mouseout") _, Dom.mouseEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addMouseOutEventListenerWithOptions: (
-    @as("mouseout") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addMouseOutEventListenerUseCapture: (
-    @as("mouseout") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseOutEventListener: (@as("mouseout") _, Dom.mouseEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseOutEventListenerWithOptions: (
-    @as("mouseout") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeMouseOutEventListenerUseCapture: (
-    @as("mouseout") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addMouseOverEventListener: (@as("mouseover") _, Dom.mouseEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addMouseOverEventListenerWithOptions: (
-    @as("mouseover") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addMouseOverEventListenerUseCapture: (
-    @as("mouseover") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseOverEventListener: (@as("mouseover") _, Dom.mouseEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseOverEventListenerWithOptions: (
-    @as("mouseover") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeMouseOverEventListenerUseCapture: (
-    @as("mouseover") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addMouseUpEventListener: (@as("mouseup") _, Dom.mouseEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addMouseUpEventListenerWithOptions: (
-    @as("mouseup") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addMouseUpEventListenerUseCapture: (
-    @as("mouseup") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseUpEventListener: (@as("mouseup") _, Dom.mouseEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeMouseUpEventListenerWithOptions: (
-    @as("mouseup") _,
-    Dom.mouseEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeMouseUpEventListenerUseCapture: (
-    @as("mouseup") _,
-    Dom.mouseEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  /* Wheel */
-
-  @bs.send.pipe(: T.t)
-  external addWheelEventListener: (@as("wheel") _, Dom.wheelEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addWheelEventListenerWithOptions: (
-    @as("wheel") _,
-    Dom.wheelEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addWheelEventListenerUseCapture: (
-    @as("wheel") _,
-    Dom.wheelEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeWheelEventListener: (@as("wheel") _, Dom.wheelEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeWheelEventListenerWithOptions: (
-    @as("wheel") _,
-    Dom.wheelEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeWheelEventListenerUseCapture: (
-    @as("wheel") _,
-    Dom.wheelEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  /* Input */
-
-  @bs.send.pipe(: T.t)
-  external addBeforeInputEventListener: (@as("beforeinput") _, Dom.inputEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addBeforeInputEventListenerWithOptions: (
-    @as("beforeinput") _,
-    Dom.inputEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addBeforeInputEventListenerUseCapture: (
-    @as("beforeinput") _,
-    Dom.inputEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeBeforeInputEventListener: (@as("beforeinput") _, Dom.inputEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeBeforeInputEventListenerWithOptions: (
-    @as("beforeinput") _,
-    Dom.inputEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeBeforeInputEventListenerUseCapture: (
-    @as("beforeinput") _,
-    Dom.inputEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addInputEventListener: (@as("input") _, Dom.inputEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addInputEventListenerWithOptions: (
-    @as("input") _,
-    Dom.inputEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addInputEventListenerUseCapture: (
-    @as("input") _,
-    Dom.inputEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeInputEventListener: (@as("input") _, Dom.inputEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeInputEventListenerWithOptions: (
-    @as("input") _,
-    Dom.inputEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeInputEventListenerUseCapture: (
-    @as("input") _,
-    Dom.inputEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  /* Keyboard */
-
-  @bs.send.pipe(: T.t)
-  external addKeyDownEventListener: (@as("keydown") _, Dom.keyboardEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addKeyDownEventListenerWithOptions: (
-    @as("keydown") _,
-    Dom.keyboardEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addKeyDownEventListenerUseCapture: (
-    @as("keydown") _,
-    Dom.keyboardEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeKeyDownEventListener: (@as("keydown") _, Dom.keyboardEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeKeyDownEventListenerWithOptions: (
-    @as("keydown") _,
-    Dom.keyboardEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeKeyDownEventListenerUseCapture: (
-    @as("keydown") _,
-    Dom.keyboardEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addKeyUpEventListener: (@as("keyup") _, Dom.keyboardEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addKeyUpEventListenerWithOptions: (
-    @as("keyup") _,
-    Dom.keyboardEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addKeyUpEventListenerUseCapture: (
-    @as("keyup") _,
-    Dom.keyboardEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeKeyUpEventListener: (@as("keyup") _, Dom.keyboardEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeKeyUpEventListenerWithOptions: (
-    @as("keyup") _,
-    Dom.keyboardEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeKeyUpEventListenerUseCapture: (
-    @as("keyup") _,
-    Dom.keyboardEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addKeyPressEventListener: (@as("keypress") _, Dom.keyboardEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addKeyPressEventListenerWithOptions: (
-    @as("keypress") _,
-    Dom.keyboardEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addKeyPressEventListenerUseCapture: (
-    @as("keypress") _,
-    Dom.keyboardEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeKeyPressEventListener: (@as("keypress") _, Dom.keyboardEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeKeyPressEventListenerWithOptions: (
-    @as("keypress") _,
-    Dom.keyboardEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeKeyPressEventListenerUseCapture: (
-    @as("keypress") _,
-    Dom.keyboardEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  /* Composition */
-
-  @bs.send.pipe(: T.t)
-  external addCompositionStartEventListener: (
-    @as("compositionstart") _,
-    Dom.compositionEvent => unit,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addCompositionStartEventListenerWithOptions: (
-    @as("compositionstart") _,
-    Dom.compositionEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addCompositionStartEventListenerUseCapture: (
-    @as("compositionstart") _,
-    Dom.compositionEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeCompositionStartEventListener: (
-    @as("compositionstart") _,
-    Dom.compositionEvent => unit,
-  ) => unit = "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeCompositionStartEventListenerWithOptions: (
-    @as("compositionstart") _,
-    Dom.compositionEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeCompositionStartEventListenerUseCapture: (
-    @as("compositionstart") _,
-    Dom.compositionEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addCompositionUpdateEventListener: (
-    @as("compositionupdate") _,
-    Dom.compositionEvent => unit,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addCompositionUpdateEventListenerWithOptions: (
-    @as("compositionupdate") _,
-    Dom.compositionEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addCompositionUpdateEventListenerUseCapture: (
-    @as("compositionupdate") _,
-    Dom.compositionEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeCompositionUpdateEventListener: (
-    @as("compositionupdate") _,
-    Dom.compositionEvent => unit,
-  ) => unit = "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeCompositionUpdateEventListenerWithOptions: (
-    @as("compositionupdate") _,
-    Dom.compositionEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeCompositionUpdateEventListenerUseCapture: (
-    @as("compositionupdate") _,
-    Dom.compositionEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addCompositionEndEventListener: (
-    @as("compositionend") _,
-    Dom.compositionEvent => unit,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addCompositionEndEventListenerWithOptions: (
-    @as("compositionend") _,
-    Dom.compositionEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addCompositionEndEventListenerUseCapture: (
-    @as("compositionend") _,
-    Dom.compositionEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeCompositionEndEventListener: (
-    @as("compositionend") _,
-    Dom.compositionEvent => unit,
-  ) => unit = "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeCompositionEndEventListenerWithOptions: (
-    @as("compositionend") _,
-    Dom.compositionEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeCompositionEndEventListenerUseCapture: (
-    @as("compositionend") _,
-    Dom.compositionEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  /* Drag */
-
-  @bs.send.pipe(: T.t)
-  external addDragEventListener: (@as("drag") _, Dom.dragEvent => unit) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addDragEventListenerWithOptions: (
-    @as("drag") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addDragEventListenerUseCapture: (
-    @as("drag") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragEventListener: (@as("drag") _, Dom.dragEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragEventListenerWithOptions: (
-    @as("drag") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeDragEventListenerUseCapture: (
-    @as("drag") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addDragEndEventListener: (@as("dragend") _, Dom.dragEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addDragEndEventListenerWithOptions: (
-    @as("dragend") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addDragEndEventListenerUseCapture: (
-    @as("dragend") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragEndEventListener: (@as("dragend") _, Dom.dragEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragEndEventListenerWithOptions: (
-    @as("dragend") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeDragEndEventListenerUseCapture: (
-    @as("dragend") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addDragEnterEventListener: (@as("dragenter") _, Dom.dragEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addDragEnterEventListenerWithOptions: (
-    @as("dragenter") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addDragEnterEventListenerUseCapture: (
-    @as("dragenter") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragEnterEventListener: (@as("dragenter") _, Dom.dragEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragEnterEventListenerWithOptions: (
-    @as("dragenter") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeDragEnterEventListenerUseCapture: (
-    @as("dragenter") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addDragExitEventListener: (@as("dragexit") _, Dom.dragEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addDragExitEventListenerWithOptions: (
-    @as("dragexit") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addDragExitEventListenerUseCapture: (
-    @as("dragexit") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragExitEventListener: (@as("dragexit") _, Dom.dragEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragExitEventListenerWithOptions: (
-    @as("dragexit") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeDragExitEventListenerUseCapture: (
-    @as("dragexit") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addDragLeaveEventListener: (@as("dragleave") _, Dom.dragEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addDragLeaveEventListenerWithOptions: (
-    @as("dragleave") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addDragLeaveEventListenerUseCapture: (
-    @as("dragleave") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragLeaveEventListener: (@as("dragleave") _, Dom.dragEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragLeaveEventListenerWithOptions: (
-    @as("dragleave") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeDragLeaveEventListenerUseCapture: (
-    @as("dragleave") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addDragOverEventListener: (@as("dragover") _, Dom.dragEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addDragOverEventListenerWithOptions: (
-    @as("dragover") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addDragOverEventListenerUseCapture: (
-    @as("dragover") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragOverEventListener: (@as("dragover") _, Dom.dragEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragOverEventListenerWithOptions: (
-    @as("dragover") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeDragOverEventListenerUseCapture: (
-    @as("dragover") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addDragStartEventListener: (@as("dragstart") _, Dom.dragEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addDragStartEventListenerWithOptions: (
-    @as("dragstart") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addDragStartEventListenerUseCapture: (
-    @as("dragstart") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragStartEventListener: (@as("dragstart") _, Dom.dragEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDragStartEventListenerWithOptions: (
-    @as("dragstart") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeDragStartEventListenerUseCapture: (
-    @as("dragstart") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addDropEventListener: (@as("drop") _, Dom.dragEvent => unit) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addDropEventListenerWithOptions: (
-    @as("drop") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addDropEventListenerUseCapture: (
-    @as("drop") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDropEventListener: (@as("drop") _, Dom.dragEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeDropEventListenerWithOptions: (
-    @as("drop") _,
-    Dom.dragEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeDropEventListenerUseCapture: (
-    @as("drop") _,
-    Dom.dragEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  /* Touch */
-
-  @bs.send.pipe(: T.t)
-  external addTouchCancelEventListener: (@as("touchcancel") _, Dom.touchEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addTouchCancelEventListenerWithOptions: (
-    @as("touchcancel") _,
-    Dom.touchEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addTouchCancelEventListenerUseCapture: (
-    @as("touchcancel") _,
-    Dom.touchEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeTouchCancelEventListener: (@as("touchcancel") _, Dom.touchEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeTouchCancelEventListenerWithOptions: (
-    @as("touchcancel") _,
-    Dom.touchEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeTouchCancelEventListenerUseCapture: (
-    @as("touchcancel") _,
-    Dom.touchEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addTouchEndEventListener: (@as("touchend") _, Dom.touchEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addTouchEndEventListenerWithOptions: (
-    @as("touchend") _,
-    Dom.touchEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addTouchEndEventListenerUseCapture: (
-    @as("touchend") _,
-    Dom.touchEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeTouchEndEventListener: (@as("touchend") _, Dom.touchEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeTouchEndEventListenerWithOptions: (
-    @as("touchend") _,
-    Dom.touchEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeTouchEndEventListenerUseCapture: (
-    @as("touchend") _,
-    Dom.touchEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addTouchMoveEventListener: (@as("touchmove") _, Dom.touchEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addTouchMoveEventListenerWithOptions: (
-    @as("touchmove") _,
-    Dom.touchEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addTouchMoveEventListenerUseCapture: (
-    @as("touchmove") _,
-    Dom.touchEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeTouchMoveEventListener: (@as("touchmove") _, Dom.touchEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeTouchMoveEventListenerWithOptions: (
-    @as("touchmove") _,
-    Dom.touchEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeTouchMoveEventListenerUseCapture: (
-    @as("touchmove") _,
-    Dom.touchEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addTouchStartEventListener: (@as("touchstart") _, Dom.touchEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addTouchStartEventListenerWithOptions: (
-    @as("touchstart") _,
-    Dom.touchEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addTouchStartEventListenerUseCapture: (
-    @as("touchstart") _,
-    Dom.touchEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeTouchStartEventListener: (@as("touchstart") _, Dom.touchEvent => unit) => unit =
-    "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeTouchStartEventListenerWithOptions: (
-    @as("touchstart") _,
-    Dom.touchEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeTouchStartEventListenerUseCapture: (
-    @as("touchstart") _,
-    Dom.touchEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  /* Animation */
-
-  @bs.send.pipe(: T.t)
-  external addAnimationCancelEventListener: (
-    @as("animationcancel") _,
-    Dom.animationEvent => unit,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addAnimationCancelEventListenerWithOptions: (
-    @as("animationcancel") _,
-    Dom.animationEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addAnimationCancelEventListenerUseCapture: (
-    @as("animationcancel") _,
-    Dom.animationEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeAnimationCancelEventListener: (
-    @as("animationcancel") _,
-    Dom.animationEvent => unit,
-  ) => unit = "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeAnimationCancelEventListenerWithOptions: (
-    @as("animationcancel") _,
-    Dom.animationEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeAnimationCancelEventListenerUseCapture: (
-    @as("animationcancel") _,
-    Dom.animationEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addAnimationEndEventListener: (
-    @as("animationend") _,
-    Dom.animationEvent => unit,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addAnimationEndEventListenerWithOptions: (
-    @as("animationend") _,
-    Dom.animationEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addAnimationEndEventListenerUseCapture: (
-    @as("animationend") _,
-    Dom.animationEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeAnimationEndEventListener: (
-    @as("animationend") _,
-    Dom.animationEvent => unit,
-  ) => unit = "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeAnimationEndEventListenerWithOptions: (
-    @as("animationend") _,
-    Dom.animationEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeAnimationEndEventListenerUseCapture: (
-    @as("animationend") _,
-    Dom.animationEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addAnimationIterationEventListener: (
-    @as("animationiteration") _,
-    Dom.animationEvent => unit,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addAnimationIterationEventListenerWithOptions: (
-    @as("animationiteration") _,
-    Dom.animationEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addAnimationIterationEventListenerUseCapture: (
-    @as("animationiteration") _,
-    Dom.animationEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeAnimationIterationEventListener: (
-    @as("animationiteration") _,
-    Dom.animationEvent => unit,
-  ) => unit = "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeAnimationIterationEventListenerWithOptions: (
-    @as("animationiteration") _,
-    Dom.animationEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeAnimationIterationEventListenerUseCapture: (
-    @as("animationiteration") _,
-    Dom.animationEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-
-  @bs.send.pipe(: T.t)
-  external addAnimationStartEventListener: (
-    @as("animationstart") _,
-    Dom.animationEvent => unit,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addAnimationStartEventListenerWithOptions: (
-    @as("animationstart") _,
-    Dom.animationEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addAnimationStartEventListenerUseCapture: (
-    @as("animationstart") _,
-    Dom.animationEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeAnimationStartEventListener: (
-    @as("animationstart") _,
-    Dom.animationEvent => unit,
-  ) => unit = "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeAnimationStartEventListenerWithOptions: (
-    @as("animationstart") _,
-    Dom.animationEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeAnimationStartEventListenerUseCapture: (
-    @as("animationstart") _,
-    Dom.animationEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-}
-
-include Impl({
-  type t = Dom.eventTarget
-})
-
-external unsafeAsDocument: Dom.eventTarget => Dom.document = "%identity"
-external unsafeAsElement: Dom.eventTarget => Dom.element = "%identity"
-external unsafeAsWindow: Dom.eventTarget => Dom.window = "%identity"
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__FocusEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__FocusEvent.res
deleted file mode 100644
index 61f566a..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__FocusEvent.res
+++ /dev/null
@@ -1,13 +0,0 @@
-type t = Dom.focusEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Webapi__Dom__UiEvent.Impl({
-  type t = t
-})
-
-@new external make: string => t = "FocusEvent"
-@new external makeWithOptions: (string, {..}) => t = "FocusEvent"
-
-@get @return(nullable) external relatedTarget: t => option<Dom.eventTarget> = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__GlobalEventHandlers.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__GlobalEventHandlers.res
deleted file mode 100644
index 9f1fdab..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__GlobalEventHandlers.res
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Mixin */
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @bs.send.pipe(: T.t)
-  external addSelectionChangeEventListener: (
-    @as("selectionchange") _,
-    Dom.focusEvent => unit,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external addSelectionChangeEventListenerWithOptions: (
-    @as("selectionchange") _,
-    Dom.focusEvent => unit,
-    {"capture": bool, "once": bool, "passive": bool},
-  ) => unit = "addEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external addSelectionChangeEventListenerUseCapture: (
-    @as("selectionchange") _,
-    Dom.focusEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "addEventListener"
-  @bs.send.pipe(: T.t)
-  external removeSelectionChangeEventListener: (
-    @as("selectionchange") _,
-    Dom.focusEvent => unit,
-  ) => unit = "removeEventListener"
-  @bs.send.pipe(: T.t)
-  external removeSelectionChangeEventListenerWithOptions: (
-    @as("selectionchange") _,
-    Dom.focusEvent => unit,
-    {"capture": bool, "passive": bool},
-  ) => unit = "removeEventListener" /* not widely supported */
-  @bs.send.pipe(: T.t)
-  external removeSelectionChangeEventListenerUseCapture: (
-    @as("selectionchange") _,
-    Dom.focusEvent => unit,
-    @as(json`true`) _,
-  ) => unit = "removeEventListener"
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__History.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__History.res
deleted file mode 100644
index d054fe7..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__History.res
+++ /dev/null
@@ -1,13 +0,0 @@
-type t = Dom.history
-type state /* TODO: should be "anything that can be serializable" apparently */
-
-@get external length: t => int = ""
-@get external scrollRestoration: t => bool = "" /* experimental */
-@set external setScrollRestoration: (t, bool) => unit = "scrollRestoration" /* experimental */
-@get external state: t => state = ""
-
-@bs.send.pipe(: t) external back: unit = ""
-@bs.send.pipe(: t) external forward: unit = ""
-@bs.send.pipe(: t) external go: int => unit = ""
-@bs.send.pipe(: t) external pushState: (state, string, string) => unit = ""
-@bs.send.pipe(: t) external replaceState: (state, string, string) => unit = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlCollection.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlCollection.res
deleted file mode 100644
index 81bbe25..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlCollection.res
+++ /dev/null
@@ -1,7 +0,0 @@
-type t = Dom.htmlCollection
-
-@val @scope(("Array", "prototype", "slice")) external toArray: t => array<Dom.element> = "call"
-
-@get external length: t => int = ""
-@bs.send.pipe(: t) @return(nullable) external item: int => option<Dom.element> = ""
-@bs.send.pipe(: t) @return(nullable) external namedItem: string => option<Dom.element> = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlDocument.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlDocument.res
deleted file mode 100644
index a738536..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlDocument.res
+++ /dev/null
@@ -1,84 +0,0 @@
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  type t_htmlDocument = T.t
-
-  @get @return(nullable) external activeElement: t_htmlDocument => option<Dom.element> = ""
-  @get @return(nullable)
-  external body: t_htmlDocument => option<Dom.element> = "" /* returns option HTMLBodyElement */
-  @set
-  external setBody: (t_htmlDocument, Dom.element) => unit = "body" /* accepth HTMLBodyElement */
-  @get external cookie: t_htmlDocument => string = ""
-  @set external setCookie: (t_htmlDocument, string) => unit = "cookie"
-  @get @return(nullable) external defaultView: t_htmlDocument => option<Dom.window> = ""
-  @get external designMode: t_htmlDocument => string /* designMode enum */ = ""
-  let designMode: t_htmlDocument => Webapi__Dom__Types.designMode = self =>
-    Webapi__Dom__Types.decodeDesignMode(designMode(self))
-  @set external setDesignMode: (t_htmlDocument, string /* designMode enum */) => unit = "designMode"
-  let setDesignMode: (t_htmlDocument, Webapi__Dom__Types.designMode) => unit = (self, value) =>
-    setDesignMode(self, Webapi__Dom__Types.encodeDesignMode(value))
-  @get external dir: t_htmlDocument => string /* dir enum */ = ""
-  let dir: t_htmlDocument => Webapi__Dom__Types.dir = self =>
-    Webapi__Dom__Types.decodeDir(dir(self))
-  @set external setDir: (t_htmlDocument, string /* dir enum */) => unit = "dir"
-  let setDir: (t_htmlDocument, Webapi__Dom__Types.dir) => unit = (self, value) =>
-    setDir(self, Webapi__Dom__Types.encodeDir(value))
-  @get @return(nullable) external domain: t_htmlDocument => option<string> = ""
-  @set external setDomain: (t_htmlDocument, string) => unit = "domain"
-  @get external embeds: t_htmlDocument => Dom.nodeList = ""
-  @get external forms: t_htmlDocument => Dom.htmlCollection = ""
-  @get external head: t_htmlDocument => Dom.element = "" /* returns HTMLHeadElement */
-  @get external images: t_htmlDocument => Dom.htmlCollection = ""
-  @get external lastModified: t_htmlDocument => string = ""
-  @get external links: t_htmlDocument => Dom.nodeList = ""
-  @get external location: t_htmlDocument => Dom.location = ""
-  @set external setLocation: (t_htmlDocument, string) => unit = "location"
-  @get external plugins: t_htmlDocument => Dom.htmlCollection = ""
-  @get external readyState: t_htmlDocument => string /* enum */ = ""
-  let readyState: t_htmlDocument => Webapi__Dom__Types.readyState = self =>
-    Webapi__Dom__Types.decodeReadyState(readyState(self))
-  @get external referrer: t_htmlDocument => string = ""
-  @get external scripts: t_htmlDocument => Dom.htmlCollection = ""
-  @get external title: t_htmlDocument => string = ""
-  @set external setTitle: (t_htmlDocument, string) => unit = "title"
-  @get external url: t_htmlDocument => string = "URL"
-
-  @bs.send.pipe(: t_htmlDocument) external close: unit = ""
-  @bs.send.pipe(: t_htmlDocument) external execCommand: (string, bool, Js.null<string>) => bool = ""
-  let execCommand: (string, bool, option<string>, t_htmlDocument) => bool = (
-    command,
-    show,
-    value,
-    self,
-  ) => execCommand(command, show, Js.Null.fromOption(value), self)
-  @bs.send.pipe(: t_htmlDocument) external getElementsByName: string => Dom.nodeList = ""
-  @bs.send.pipe(: t_htmlDocument) external getSelection: Dom.selection = ""
-  @bs.send.pipe(: t_htmlDocument) external hasFocus: bool = ""
-  @bs.send.pipe(: t_htmlDocument) external open_: unit = "open"
-  @bs.send.pipe(: t_htmlDocument) external queryCommandEnabled: string => bool = ""
-  @bs.send.pipe(: t_htmlDocument) external queryCommandIndeterm: string => bool = ""
-  @bs.send.pipe(: t_htmlDocument) external queryCommandSupported: string => bool = ""
-  @bs.send.pipe(: t_htmlDocument) external queryCommandValue: string => string = ""
-  @bs.send.pipe(: t_htmlDocument) external write: string => unit = ""
-  @bs.send.pipe(: t_htmlDocument) external writeln: string => unit = ""
-}
-
-type t = Dom.htmlDocument
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__GlobalEventHandlers.Impl({
-  type t = t
-})
-include Webapi__Dom__Document.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlElement.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlElement.res
deleted file mode 100644
index 88a1737..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlElement.res
+++ /dev/null
@@ -1,123 +0,0 @@
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  type t_htmlElement = T.t
-
-  let ofElement: Dom.element => Js.null<t_htmlElement> = %raw(`
-    function (element) {
-      // BEWARE: Assumes "contentEditable" uniquely identifies an HTMLELement
-      return element.contentEditable !== undefined ?  element : null;
-    }
-  `)
-  @deprecated("Consider using Element.asHtmlElement or Element.unsafeAsHtmlElement instead")
-  let ofElement: Dom.element => option<t_htmlElement> = self => Js.Null.toOption(ofElement(self))
-
-  @get external accessKey: t_htmlElement => string = ""
-  @set external setAccessKey: (t_htmlElement, string) => unit = "accessKey"
-  @get external accessKeyLabel: t_htmlElement => string = ""
-  @get external contentEditable: t_htmlElement => string /* enum */ = ""
-  let contentEditable: t_htmlElement => Webapi__Dom__Types.contentEditable = self =>
-    Webapi__Dom__Types.decodeContentEditable(contentEditable(self))
-  @set external setContentEditable: (t_htmlElement, string /* enum */) => unit = "contentEditable"
-  let setContentEditable: (t_htmlElement, Webapi__Dom__Types.contentEditable) => unit = (
-    self,
-    value,
-  ) => setContentEditable(self, Webapi__Dom__Types.encodeContentEditable(value))
-  @get external isContentEditable: t_htmlElement => bool = ""
-  @get external contextMenu: t_htmlElement => Dom.htmlElement = "" /* returns HTMLMenuElement */
-  @set
-  external setContextMenu: (t_htmlElement, Dom.htmlElement) => unit =
-    "contextMenu" /* accepts and returns HTMLMenuElement */
-  @get external dataset: t_htmlElement => Dom.domStringMap = ""
-  @get external dir: t_htmlElement => string /* enum */ = ""
-  let dir: t_htmlElement => Webapi__Dom__Types.dir = self => Webapi__Dom__Types.decodeDir(dir(self))
-  @set external setDir: (t_htmlElement, string /* enum */) => unit = "dir"
-  let setDir: (t_htmlElement, Webapi__Dom__Types.dir) => unit = (self, value) =>
-    setDir(self, Webapi__Dom__Types.encodeDir(value))
-  @get external draggable: t_htmlElement => bool = ""
-  @set external setDraggable: (t_htmlElement, bool) => unit = "draggable"
-  /* let setDraggable : t_htmlElement => bool => unit = fun self value => setDraggable self (Js.Boolean.to_js_boolean value); */ /* temproarily removed to reduce codegen size */
-  @get external dropzone: t_htmlElement => Dom.domSettableTokenList = ""
-  @get external hidden: t_htmlElement => bool = ""
-  @set external setHidden: (t_htmlElement, bool) => unit = "hidden"
-  /* let setHidden : t_htmlElement => bool => unit = fun self value => setHidden self (Js.Boolean.to_js_boolean value); */ /* temproarily removed to reduce codegen size */
-  @get external itemScope: t_htmlElement => bool = "" /* experimental */
-  @set external setItemScope: (t_htmlElement, bool) => unit = "itemScope"
-  /* let setItemScope : t_htmlElement => bool => unit = fun self value => setItemScope self (Js.Boolean.to_js_boolean value); */ /* experimental */ /* temproarily removed to reduce codegen size */
-  @get external itemType: t_htmlElement => Dom.domSettableTokenList = "" /* experimental */
-  @get external itemId: t_htmlElement => string = "" /* experimental */
-  @set external setItemId: (t_htmlElement, string) => unit = "itemId" /* experimental */
-  @get external itemRef: t_htmlElement => Dom.domSettableTokenList = "" /* experimental */
-  @get external itemProp: t_htmlElement => Dom.domSettableTokenList = "" /* experimental */
-  @get external itemValue: t_htmlElement => {..} = "" /* experimental */
-  @set external setItemValue: (t_htmlElement, {..}) => unit = "itemValue" /* experimental */
-  @get external lang: t_htmlElement => string = ""
-  @set external setLang: (t_htmlElement, string) => unit = "lang"
-  @get external offsetHeight: t_htmlElement => int = "" /* experimental */
-  @get external offsetLeft: t_htmlElement => int = "" /* experimental */
-  @get @return(nullable)
-  external offsetParent: t_htmlElement => option<Dom.element> = "" /* experimental */
-  @get external offsetTop: t_htmlElement => int = "" /* experimental, but widely supported */
-  @get external offsetWidth: t_htmlElement => int = "" /* experimental */
-  /* external properties : r => HTMLPropertiesCollection.t = "properties" [@@bs.get]; /* experimental */ */
-  @get external spellcheck: t_htmlElement => bool = ""
-  @set external setSpellcheck: (t_htmlElement, bool) => unit = "spellcheck"
-  /* let setSpellcheck : t_htmlElement => bool => unit = fun self value => setSpellcheck self (Js.Boolean.to_js_boolean value); */ /* temproarily removed to reduce codegen size */
-  @get external style: t_htmlElement => Dom.cssStyleDeclaration = ""
-  @set external setStyle: (t_htmlElement, Dom.cssStyleDeclaration) => unit = "style"
-  @get external tabIndex: t_htmlElement => int = ""
-  @set external setTabIndex: (t_htmlElement, int) => unit = "tabIndex"
-  @get external title: t_htmlElement => string = ""
-  @set external setTitle: (t_htmlElement, string) => unit = "title"
-  @get external translate: t_htmlElement => bool = "" /* experimental */
-  @set external setTranslate: (t_htmlElement, bool) => unit = "translate" /* experimental */
-  /* let setTranslate : t_htmlElement => bool => unit = fun self value => setTranslate self (Js.Boolean.to_js_boolean value); */ /* temproarily removed to reduce codegen size */
-
-  @bs.send.pipe(: t_htmlElement) external blur: unit = ""
-  @bs.send.pipe(: t_htmlElement) external click: unit = ""
-  @bs.send.pipe(: t_htmlElement) external focus: unit = ""
-  @bs.send.pipe(: t_htmlElement)
-  external focusPreventScroll: @as(json`{ "preventScroll": true }`) _ => unit = "focus"
-  @bs.send.pipe(: t_htmlElement) external forceSpellCheck: unit = "" /* experimental */
-
-  /* TODO: element-spcific, should be pulled out */
-  @get external value: t_htmlElement => string = "" /* HTMLInputElement */
-  @get external checked: t_htmlElement => bool = "" /* HTMLInputElement */
-  @get external type_: t_htmlElement => string = "type" /* HTMLStyleElement */
-  @set external setType: (t_htmlElement, string) => unit = "type" /* HTMLStyleElement */
-  @get external rel: t_htmlElement => string = "" /* HTMLLinkElement */
-  @set external setRel: (t_htmlElement, string) => unit = "rel" /* HTMLLinkElement */
-  @get external href: t_htmlElement => string = "" /* HTMLLinkElement, HTMLAnchorElement */
-  @set
-  external setHref: (t_htmlElement, string) => unit =
-    "href" /* HTMLLinkElement, HTMLAnchorElement */
-}
-
-/* TODO
-module Tree (T: { type t; }) => {
-  include ElementRe.Tree { type t = Type };
-  include Impl { type t = Type };
-};
-
-include Tree { type t = Dom.htmlElement };
-*/
-
-type t = Dom.htmlElement
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__GlobalEventHandlers.Impl({
-  type t = t
-})
-include Webapi__Dom__Element.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlFormElement.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlFormElement.res
deleted file mode 100644
index 56d75a4..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlFormElement.res
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Spec: https://html.spec.whatwg.org/multipage/forms.html#the-form-element
- * MDN: https://developer.mozilla.org/en-US/docs/Web/API/HTMLFormElement
- */
-
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  type t_htmlFormElement = T.t
-
-  /* TODO: elements: HTMLFormControlsCollection */
-  @get external length: t_htmlFormElement => int = ""
-  @get external name: t_htmlFormElement => string = ""
-  @set external setName: (t_htmlFormElement, string) => unit = "name"
-  @get external method_: t_htmlFormElement => string = ""
-  @set external setMethod: (t_htmlFormElement, string) => unit = "method"
-  @get external target: t_htmlFormElement => string = ""
-  @set external setTarget: (t_htmlFormElement, string) => unit = "target"
-  @get external action: t_htmlFormElement => string = ""
-  @set external setAction: (t_htmlFormElement, string) => unit = "action"
-  @get external acceptCharset: t_htmlFormElement => string = ""
-  @set external setAcceptCharset: (t_htmlFormElement, string) => unit = "acceptCharset"
-  @get external autocomplete: t_htmlFormElement => string = ""
-  @set external setAutocomplete: (t_htmlFormElement, string) => unit = "autocomplete"
-  @get external noValidate: t_htmlFormElement => bool = ""
-  @set external setNoValidate: (t_htmlFormElement, bool) => unit = "noValidate"
-  @get external enctype: t_htmlFormElement => string = ""
-  @set external setEnctype: (t_htmlFormElement, string) => unit = "enctype"
-  @get external encoding: t_htmlFormElement => string = ""
-  @set external setEncoding: (t_htmlFormElement, string) => unit = "encoding"
-
-  @bs.send.pipe(: t_htmlFormElement) external submit: unit = ""
-  @bs.send.pipe(: t_htmlFormElement) external reset: unit = ""
-  @bs.send.pipe(: t_htmlFormElement) external checkValidity: bool = ""
-  @bs.send.pipe(: t_htmlFormElement) external reportValidity: bool = ""
-}
-
-type t = Dom.htmlFormElement
-
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__Element.Impl({
-  type t = t
-})
-include Webapi__Dom__HtmlElement.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlImageElement.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlImageElement.res
deleted file mode 100644
index 3e8d2b9..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlImageElement.res
+++ /dev/null
@@ -1,47 +0,0 @@
-type t
-
-@new external make: unit => t = "Image"
-@new external makeWithSize: (int, int) => t = "Image"
-
-@get external alt: t => string = ""
-@set external setAlt: (t, string) => unit = "alt"
-@get external src: t => string = ""
-@set external setSrc: (t, string) => unit = "src"
-@get external srcset: t => string = ""
-@set external setSrcset: (t, string) => unit = "srcset"
-@get external sizes: t => string = ""
-@set external setSizes: (t, string) => unit = "sizes"
-@get @return(nullable) external crossOrigin: t => option<string> = ""
-@set external setCrossOrigin: (t, Js.null<string>) => unit = "crossOrigin"
-let setCrossOrigin = (self, value) => setCrossOrigin(self, Js.Null.fromOption(value))
-@get external useMap: t => string = ""
-@set external setUseMap: (t, string) => unit = "useMap"
-@get external isMap: t => bool = ""
-@set external setIsMap: (t, bool) => unit = "isMap"
-@get external height: t => int = ""
-@set external setHeight: (t, int) => unit = "height"
-@get external width: t => int = ""
-@set external setWidth: (t, int) => unit = "width"
-@get external naturalHeight: t => int = ""
-@get external naturalWidth: t => int = ""
-@get external complete: t => bool = ""
-@get external currentSrc: t => string = ""
-@get external referrerPolicy: t => string = ""
-@set external setReferrerPolicy: (t, string) => unit = "referrerPolicy"
-@get external decoding: t => string = ""
-@set external setDecoding: (t, string) => unit = "decoding"
-
-@bs.send.pipe(: t) external decode: Js.Promise.t<unit> = ""
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__Element.Impl({
-  type t = t
-})
-include Webapi__Dom__HtmlElement.Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlInputElement.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlInputElement.res
deleted file mode 100644
index 6342bd2..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__HtmlInputElement.res
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Spec: https://html.spec.whatwg.org/multipage/input.html#the-input-element
- * MDN: https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement
- */
-
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  type t_htmlInputElement = T.t
-
-  @get @return(nullable) external form: t_htmlInputElement => option<Dom.htmlFormElement> = ""
-  @get external formAction: t_htmlInputElement => string = ""
-  @set external setFormAction: (t_htmlInputElement, string) => unit = "formAction"
-  @get external formEncType: t_htmlInputElement => string = ""
-  @set external setFormEncType: (t_htmlInputElement, string) => unit = "formEncType"
-  @get external formMethod: t_htmlInputElement => string = ""
-  @set external setFormMethod: (t_htmlInputElement, string) => unit = "formMethod"
-  @get external formNoValidate: t_htmlInputElement => bool = ""
-  @set external setFormNoValidate: (t_htmlInputElement, bool) => unit = "formNoValidate"
-  @get external formTarget: t_htmlInputElement => string = ""
-  @set external setFormTarget: (t_htmlInputElement, string) => unit = "formTarget"
-
-  /* Properties that apply to any type of input element that is not hidden */
-  @get external name: t_htmlInputElement => string = ""
-  @set external setName: (t_htmlInputElement, string) => unit = "name"
-  @get external type_: t_htmlInputElement => string = "type"
-  @set external setType: (t_htmlInputElement, string) => unit = "type"
-  @get external disabled: t_htmlInputElement => bool = ""
-  @set external setDisabled: (t_htmlInputElement, bool) => unit = "disabled"
-  @get external autofocus: t_htmlInputElement => bool = ""
-  @set external setAutofocus: (t_htmlInputElement, bool) => unit = "autofocus"
-  @get external required: t_htmlInputElement => bool = ""
-  @set external setRequired: (t_htmlInputElement, bool) => unit = "required"
-  @get external value: t_htmlInputElement => string = ""
-  @set external setValue: (t_htmlInputElement, string) => unit = "value"
-  @get external validity: t_htmlInputElement => Webapi__Dom__ValidityState.t = ""
-  @get external validationMessage: t_htmlInputElement => string = ""
-  @get external willValidate: t_htmlInputElement => bool = ""
-
-  /* Properties that apply only to elements of type "checkbox" or "radio" */
-  @get external checked: t_htmlInputElement => bool = ""
-  @set external setChecked: (t_htmlInputElement, bool) => unit = "checked"
-  @get external defaultChecked: t_htmlInputElement => bool = ""
-  @set external setDefaultChecked: (t_htmlInputElement, bool) => unit = "defaultChecked"
-  @get external indeterminate: t_htmlInputElement => bool = ""
-  @set external setIndeterminate: (t_htmlInputElement, bool) => unit = "indeterminate"
-
-  /* Properties that apply only to elements of type "image" */
-  @get external alt: t_htmlInputElement => string = ""
-  @set external setAlt: (t_htmlInputElement, string) => unit = "alt"
-  @get external height: t_htmlInputElement => string = ""
-  @set external setHeight: (t_htmlInputElement, string) => unit = "height"
-  @get external src: t_htmlInputElement => string = ""
-  @set external setSrc: (t_htmlInputElement, string) => unit = "src"
-  @get external width: t_htmlInputElement => string = ""
-  @set external setWidth: (t_htmlInputElement, string) => unit = "width"
-
-  /* Properties that apply only to elements of type "file" */
-  @get external accept: t_htmlInputElement => string = ""
-  @set external setAccept: (t_htmlInputElement, string) => unit = "accept"
-  /* TODO: files: Returns/accepts a FileList object. */
-
-  /* Properties that apply only to text/number-containing or elements */
-  @get external autocomplete: t_htmlInputElement => string = ""
-  @set external setAutocomplete: (t_htmlInputElement, string) => unit = "autocomplete"
-  @get external maxLength: t_htmlInputElement => int = ""
-  @set external setMaxLength: (t_htmlInputElement, int) => unit = "maxLength"
-  @get external minLength: t_htmlInputElement => int = ""
-  @set external setMinLength: (t_htmlInputElement, int) => unit = "minLength"
-  @get external size: t_htmlInputElement => int = ""
-  @set external setSize: (t_htmlInputElement, int) => unit = "size"
-  @get external pattern: t_htmlInputElement => string = ""
-  @set external setPattern: (t_htmlInputElement, string) => unit = "pattern"
-  @get external placeholder: t_htmlInputElement => string = ""
-  @set external setPlaceholder: (t_htmlInputElement, string) => unit = "placeholder"
-  @get external readOnly: t_htmlInputElement => bool = ""
-  @set external setReadOnly: (t_htmlInputElement, bool) => unit = "readOnly"
-  @get external min: t_htmlInputElement => string = ""
-  @set external setMin: (t_htmlInputElement, string) => unit = "min"
-  @get external max: t_htmlInputElement => string = ""
-  @set external setMax: (t_htmlInputElement, string) => unit = "max"
-  @get external selectionStart: t_htmlInputElement => int = ""
-  @set external setSelectionStart: (t_htmlInputElement, int) => unit = "selectionStart"
-  @get external selectionEnd: t_htmlInputElement => int = ""
-  @set external setSelectionEnd: (t_htmlInputElement, int) => unit = "selectionEnd"
-  @get external selectionDirection: t_htmlInputElement => string = ""
-  @set external setSelectionDirection: (t_htmlInputElement, string) => unit = "selectionDirection"
-
-  /* Properties not yet categorized */
-  @get external defaultValue: t_htmlInputElement => string = ""
-  @set external setDefaultValue: (t_htmlInputElement, string) => unit = "defaultValue"
-  @get external dirName: t_htmlInputElement => string = ""
-  @set external setDirName: (t_htmlInputElement, string) => unit = "dirName"
-  @get external accessKey: t_htmlInputElement => string = ""
-  @set external setAccessKey: (t_htmlInputElement, string) => unit = "accessKey"
-  @get @return(nullable) external list: t_htmlInputElement => option<Dom.htmlElement> = ""
-  @get external multiple: t_htmlInputElement => bool = ""
-  @set external setMultiple: (t_htmlInputElement, bool) => unit = "multiple"
-  /* TODO: files: FileList array. Returns the list of selected files. */
-  @get external labels: t_htmlInputElement => array<Dom.nodeList> = ""
-  @get external step: t_htmlInputElement => string = ""
-  @set external setStep: (t_htmlInputElement, string) => unit = "step"
-  @get @return(nullable) external valueAsDate: t_htmlInputElement => option<Js.Date.t> = ""
-  @set external setValueAsDate: (t_htmlInputElement, Js.Date.t) => unit = "valueAsDate"
-  @get external valueAsNumber: t_htmlInputElement => float = ""
-
-  @bs.send.pipe(: t_htmlInputElement) external select: unit = ""
-
-  module SelectionDirection = {
-    type t =
-      | Forward
-      | Backward
-      | None
-
-    let toString = x =>
-      switch x {
-      | Forward => "forward"
-      | Backward => "backward"
-      | None => "none"
-      }
-  }
-
-  @bs.send.pipe(: t_htmlInputElement) external setSelectionRange: (int, int) => unit = ""
-  @bs.send.pipe(: t_htmlInputElement)
-  external setSelectionRangeWithDirection_: (int, int, string) => unit = "setSelectionRange"
-  let setSelectionRangeWithDirection = (
-    selectionStart,
-    selectionEnd,
-    selectionDirection,
-    element,
-  ) =>
-    element |> setSelectionRangeWithDirection_(
-      selectionStart,
-      selectionEnd,
-      selectionDirection |> SelectionDirection.toString,
-    )
-
-  module SelectionMode = {
-    type t =
-      | Select
-      | Start
-      | End
-      | Preserve
-
-    let toString = x =>
-      switch x {
-      | Select => "select"
-      | Start => "start"
-      | End => "end"
-      | Preserve => "preserve"
-      }
-  }
-
-  @bs.send.pipe(: t_htmlInputElement)
-  external setRangeTextWithinSelection: string => unit = "setRangeText"
-  @bs.send.pipe(: t_htmlInputElement)
-  external setRangeTextWithinInterval: (string, int, int) => unit = "setRangeText"
-  @bs.send.pipe(: t_htmlInputElement)
-  external setRangeTextWithinIntervalWithSelectionMode_: (string, int, int, string) => unit =
-    "setRangeText"
-  let setRangeTextWithinIntervalWithSelectionMode = (
-    text,
-    selectionStart,
-    selectionEnd,
-    selectionMode,
-    element,
-  ) =>
-    element |> setRangeTextWithinIntervalWithSelectionMode_(
-      text,
-      selectionStart,
-      selectionEnd,
-      selectionMode |> SelectionMode.toString,
-    )
-
-  @bs.send.pipe(: t_htmlInputElement) external setCustomValidity: string => unit = ""
-  @bs.send.pipe(: t_htmlInputElement) external checkValidity: bool = ""
-  @bs.send.pipe(: t_htmlInputElement) external reportValidity: bool = ""
-  @bs.send.pipe(: t_htmlInputElement) external stepDownBy: int => unit = "stepDown"
-  @bs.send.pipe(: t_htmlInputElement) external stepDownByOne: unit = "stepDown"
-  @bs.send.pipe(: t_htmlInputElement) external stepUpBy: int => unit = "stepUp"
-  @bs.send.pipe(: t_htmlInputElement) external stepUpByOne: unit = "stepUp"
-}
-
-type t = Dom.htmlInputElement
-
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__Element.Impl({
-  type t = t
-})
-include Webapi__Dom__HtmlElement.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__IdbVersionChangeEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__IdbVersionChangeEvent.res
deleted file mode 100644
index 5ea5d3d..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__IdbVersionChangeEvent.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type t = Dom.idbVersionChangeEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "IDBVersionChangeEvent"
-@new external makeWithOptions: (string, {..}) => t = "IDBVersionChangeEvent"
-
-@get external oldVersion: t => int = ""
-@get external newVersion: t => int = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Image.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Image.res
deleted file mode 100644
index 08bd26b..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Image.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type t
-
-@new
-external makeWithData: (
-  ~array: Js.Typed_array.Uint8ClampedArray.t,
-  ~width: float,
-  ~height: float,
-) => t = "ImageData"
-
-@new external make: (~width: float, ~height: float) => t = "ImageData"
-
-@get external data: t => Js.Typed_array.Uint8ClampedArray.t = ""
-@get external height: t => float = ""
-@get external width: t => float = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__InputEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__InputEvent.res
deleted file mode 100644
index 3384c60..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__InputEvent.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type t = Dom.inputEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Webapi__Dom__UiEvent.Impl({
-  type t = t
-})
-
-@new external make: string => t = "InputEvent"
-@new external makeWithOptions: (string, {..}) => t = "InputEvent"
-
-@get external data: t => string = ""
-@get external isComposing: t => bool = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__KeyboardEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__KeyboardEvent.res
deleted file mode 100644
index 4b37f62..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__KeyboardEvent.res
+++ /dev/null
@@ -1,26 +0,0 @@
-type t = Dom.keyboardEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Webapi__Dom__UiEvent.Impl({
-  type t = t
-})
-
-@new external make: string => t = "KeyboardEvent"
-@new external makeWithOptions: (string, {..}) => t = "KeyboardEvent"
-
-@get external altKey: t => bool = ""
-@get external code: t => string = ""
-@get external ctrlKey: t => bool = ""
-@get external isComposing: t => bool = ""
-@get external key: t => string = ""
-@get external locale: t => string = ""
-@get external location: t => int = ""
-@get external metaKey: t => bool = ""
-@get external repeat: t => bool = ""
-@get external shiftKey: t => bool = ""
-
-@bs.send.pipe(: t) external getModifierState: string /* modifierKey enum */ => bool = ""
-let getModifierState: (Webapi__Dom__Types.modifierKey, t) => bool = (key, self) =>
-  getModifierState(Webapi__Dom__Types.encodeModifierKey(key), self)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Location.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Location.res
deleted file mode 100644
index 2c030a4..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Location.res
+++ /dev/null
@@ -1,30 +0,0 @@
-type t = Dom.location
-
-/* a more ergonomic API would perhaps accept a Window.t directly instead of Location.t */
-@get external href: t => string = ""
-@set external setHref: (t, string) => unit = "href"
-@get external protocol: t => string = ""
-@set external setProtocol: (t, string) => unit = "protocol"
-@get external host: t => string = ""
-@set external setHost: (t, string) => unit = "host"
-@get external hostname: t => string = ""
-@set external setHostname: (t, string) => unit = "hostname"
-@get external port: t => string = ""
-@set external setPort: (t, string) => unit = "port"
-@get external pathname: t => string = ""
-@set external setPathname: (t, string) => unit = "pathname"
-@get external search: t => string = ""
-@set external setSearch: (t, string) => unit = "search"
-@get external hash: t => string = ""
-@set external setHash: (t, string) => unit = "hash"
-@get external username: t => string = ""
-@set external setUsername: (t, string) => unit = "username"
-@get external password: t => string = ""
-@set external setPassword: (t, string) => unit = "password"
-@get external origin: t => string = ""
-
-@bs.send.pipe(: t) external assign: string => unit = ""
-@bs.send.pipe(: t) external reload: unit = ""
-@bs.send.pipe(: t) external reloadWithForce: @as(json`true`) _ => unit = "reload"
-@bs.send.pipe(: t) external replace: string => unit = ""
-@bs.send.pipe(: t) external toString: string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__MouseEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__MouseEvent.res
deleted file mode 100644
index 758d4fa..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__MouseEvent.res
+++ /dev/null
@@ -1,44 +0,0 @@
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @get external altKey: T.t => bool = ""
-  @get external button: T.t => int = ""
-  @get external buttons: T.t => int /* bitmask */ = ""
-  @get external clientX: T.t => int = ""
-  @get external clientY: T.t => int = ""
-  @get external ctrlKey: T.t => bool = ""
-  @get external metaKey: T.t => bool = ""
-  @get external movementX: T.t => int = ""
-  @get external movementY: T.t => int = ""
-  @get external offsetX: T.t => int = "" /* experimental, but widely supported */
-  @get external offsetY: T.t => int = "" /* experimental, but widely supported */
-  @get external pageX: T.t => int = "" /* experimental, but widely supported */
-  @get external pageY: T.t => int = "" /* experimental, but widely supported */
-  @get @return(nullable) external region: T.t => option<string> = ""
-  @get @return(nullable) external relatedTarget: T.t => option<Dom.eventTarget> = ""
-  @get external screenX: T.t => int = ""
-  @get external screenY: T.t => int = ""
-  @get external shiftKey: T.t => bool = ""
-  @get external x: T.t => int = "" /* experimental */
-  @get external y: T.t => int = "" /* experimental */
-  @bs.send.pipe(: T.t) external getModifierState: string /* modifierKey enum */ => bool = ""
-  let getModifierState: (Webapi__Dom__Types.modifierKey, T.t) => bool = (key, self) =>
-    getModifierState(Webapi__Dom__Types.encodeModifierKey(key), self)
-}
-
-type t = Dom.mouseEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Webapi__Dom__UiEvent.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
-
-@new external make: string => t = "MouseEvent"
-@new external makeWithOptions: (string, {..}) => t = "MouseEvent"
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__MutationObserver.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__MutationObserver.res
deleted file mode 100644
index a701460..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__MutationObserver.res
+++ /dev/null
@@ -1,7 +0,0 @@
-type t = Dom.mutationObserver
-
-@new external make: ((array<Dom.mutationRecord>, t) => unit) => t = "MutationObserver"
-
-@bs.send.pipe(: t) external observe: (Dom.node_like<'a>, {..}) => unit = ""
-@bs.send.pipe(: t) external disconnect: unit = ""
-@bs.send.pipe(: t) external takeRecords: array<Dom.mutationRecord> = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__MutationRecord.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__MutationRecord.res
deleted file mode 100644
index 7740ab1..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__MutationRecord.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type t = Dom.mutationRecord
-
-@get external type_: t => string = "type"
-@get external target: t => Dom.node = ""
-@get external addedNodes: t => Dom.nodeList = ""
-@get external removedNodes: t => Dom.nodeList = ""
-@get @return(nullable) external previousSibling: t => option<Dom.node> = ""
-@get @return(nullable) external pnextSibling: t => option<Dom.node> = ""
-@get external attributeName: t => string = ""
-@get external attributeNamespace: t => string = ""
-@get external oldValue: t => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NamedNodeMap.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NamedNodeMap.res
deleted file mode 100644
index ffe1897..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NamedNodeMap.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type t = Dom.namedNodeMap
-
-@get external length: t => int = ""
-
-@bs.send.pipe(: t) @return(nullable) external item: int => option<Dom.attr> = ""
-@bs.send.pipe(: t) @return(nullable) external getNamedItem: string => option<Dom.attr> = ""
-@bs.send.pipe(: t) @return(nullable)
-external getNamedItemNS: (string, string) => option<Dom.attr> = ""
-@bs.send.pipe(: t) external setNamedItem: Dom.attr => unit = ""
-@bs.send.pipe(: t) external setNamedItemNS: Dom.attr => unit = ""
-@bs.send.pipe(: t) external removeNamedItem: string => Dom.attr = ""
-@bs.send.pipe(: t) external removeNamedItemNS: (string, string) => Dom.attr = ""
-
-@val @scope(("Array", "prototype", "slice")) external toArray: t => array<Dom.attr> = "call"
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Node.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Node.res
deleted file mode 100644
index 6e7165c..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Node.res
+++ /dev/null
@@ -1,71 +0,0 @@
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  external asNode: T.t => Dom.node = "%identity"
-
-  /* baseURI */
-  @get external childNodes: T.t => Dom.nodeList = ""
-  @get @return(nullable) external firstChild: T.t => option<Dom.node> = ""
-  @get external innerText: T.t => string = ""
-  @set external setInnerText: (T.t, string) => unit = "innerText"
-  @get @return(nullable) external lastChild: T.t => option<Dom.node> = ""
-  @get @return(nullable) external nextSibling: T.t => option<Dom.node> = ""
-  @get external nodeName: T.t => string = "" /* nodePrincipal */
-  @get external nodeType: T.t => int /* nodeType enum */ = ""
-  let nodeType: T.t => Webapi__Dom__Types.nodeType = self =>
-    Webapi__Dom__Types.decodeNodeType(nodeType(self))
-  @get @return(nullable) external nodeValue: T.t => option<string> = ""
-  @set external setNodeValue: (T.t, Js.null<string>) => unit = "nodeValue"
-  /* let setNodeValue : T.t => option string => unit = fun self value => setNodeValue self (Js.Null.fromOption value); */ /* temporarily removed to reduce codegen size */
-  /* Not supported yet
-  external setNodeValue : T.t => string => unit = "nodeValue" [@@bs.set];
-  external clearNodeValue : T.t => _ [@bs.as {json|null|json}] => unit = "nodeValue" [@@bs.set];
- */
-  /* outerText */
-  @get external ownerDocument: T.t => Dom.document = ""
-  @get @return(nullable) external parentElement: T.t => option<Dom.element> = ""
-  @get @return(nullable) external parentNode: T.t => option<Dom.node> = ""
-  @get @return(nullable) external previousSibling: T.t => option<Dom.node> = ""
-  @get external rootNode: T.t => Dom.node = ""
-  @get external textContent: T.t => string = ""
-  @set external setTextContent: (T.t, string) => unit = "textContent"
-
-  @bs.send.pipe(: T.t) external appendChild: Dom.node_like<'a> => unit = ""
-  @bs.send.pipe(: T.t) external cloneNode: T.t = ""
-  @bs.send.pipe(: T.t) external cloneNodeDeep: @as(json`true`) _ => T.t = "cloneNode"
-  @bs.send.pipe(: T.t)
-  external compareDocumentPosition: Dom.node_like<'a> => int =
-    "" /* returns a bitmask which could also be represeneted as an enum, see https://developer.mozilla.org/en-US/docs/Web/API/Node/compareDocumentPosition */
-  @bs.send.pipe(: T.t) external contains: Dom.node_like<'a> => bool = ""
-  @bs.send.pipe(: T.t) external getRootNode: Dom.node = ""
-  @bs.send.pipe(: T.t)
-  external getRootNodeComposed: @as(json`{ "composed": true }`) _ => Dom.node = "getRootNode"
-  @bs.send.pipe(: T.t) external hasChildNodes: bool = ""
-  @bs.send.pipe(: T.t)
-  external insertBefore: (Dom.node_like<'a>, Dom.node_like<'b>) => Dom.node_like<'a> = ""
-  /* (temporarily?) removed to reduce codegen size. This variant is just for convenience, `appendChild` can be used in place of passing `null` to `insertBefore`
-  external insertBefore : Dom.node_like 'a => Js.null (Dom.node_like 'b) => Dom.node_like 'a = "" [@@bs.send.pipe: T.t];
-  let insertBefore : Dom.node_like 'a => option (Dom.node_like 'b) => T.t => Dom.node_like 'a = fun node reference self => insertBefore node (Js.Null.fromOption reference) self;
- */
-  @bs.send.pipe(: T.t) external isDefaultNamespace: string => bool = ""
-  @bs.send.pipe(: T.t) external isEqualNode: Dom.node_like<'a> => bool = ""
-  @bs.send.pipe(: T.t) external isSameNode: Dom.node_like<'a> => bool = ""
-  @bs.send.pipe(: T.t) @return(nullable) external lookupNamespaceURI: string => option<string> = ""
-  @bs.send.pipe(: T.t) @return(nullable)
-  external lookupDefaultNamespaceURI: @as(json`null`) _ => option<string> = "lookupNamespaceURI"
-  @bs.send.pipe(: T.t) external lookupPrefix: string = "lookupPrefix"
-  @bs.send.pipe(: T.t) external normalize: unit = ""
-  @bs.send.pipe(: T.t) external removeChild: Dom.node_like<'a> => Dom.node_like<'a> = ""
-  /* replacChild */
-}
-
-type t = Dom.node
-
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NodeFilter.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NodeFilter.res
deleted file mode 100644
index 0413e71..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NodeFilter.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type t = Dom.nodeFilter
-
-let make = (f): t => {acceptNode: f}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NodeIterator.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NodeIterator.res
deleted file mode 100644
index 7fd4989..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NodeIterator.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type t = Dom.nodeIterator
-
-@get external root: t => Dom.node = ""
-@get external referenceNode: t => Dom.node = ""
-@get external pointerBeforeReferenceNode: t => bool = ""
-@get external whatToShow: t => Webapi__Dom__Types.WhatToShow.t = ""
-@get @return(nullable) external filter: t => option<Dom.nodeFilter> = ""
-
-@bs.send.pipe(: t) @return(nullable) external nextNode: option<Dom.node> = ""
-@bs.send.pipe(: t) @return(nullable) external previousNode: option<Dom.node> = ""
-@bs.send.pipe(: t) external detach: unit = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NodeList.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NodeList.res
deleted file mode 100644
index 9b8888b..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NodeList.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type t = Dom.nodeList
-
-@val external toArray: t => array<Dom.node> = "Array.prototype.slice.call"
-
-@bs.send.pipe(: t) external forEach: ((Dom.node, int) => unit) => unit = ""
-
-@get external length: t => int = ""
-
-@bs.send.pipe(: t) @return(nullable) external item: int => option<Dom.node> = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NonDocumentTypeChildNode.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NonDocumentTypeChildNode.res
deleted file mode 100644
index 96e61c5..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NonDocumentTypeChildNode.res
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Mixin */
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @get @return(nullable) external previousElementSibling: T.t => option<Dom.element> = ""
-  @get @return(nullable) external nextElementSibling: T.t => option<Dom.element> = ""
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NonElementParentNode.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NonElementParentNode.res
deleted file mode 100644
index 00f64b0..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__NonElementParentNode.res
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Mixin */
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @bs.send.pipe(: T.t) @return(nullable) external getElementById: string => option<Dom.element> = ""
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__PageTransitionEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__PageTransitionEvent.res
deleted file mode 100644
index 9b4e79e..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__PageTransitionEvent.res
+++ /dev/null
@@ -1,10 +0,0 @@
-type t = Dom.pageTransitionEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "PageTransitionEvent"
-@new external makeWithOptions: (string, {..}) => t = "PageTransitionEvent"
-
-@get external persisted: t => bool = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ParentNode.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ParentNode.res
deleted file mode 100644
index f645124..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ParentNode.res
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Mixin */
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @get external children: T.t => Dom.htmlCollection = ""
-  @get @return(nullable) external firstElementChild: T.t => option<Dom.element> = ""
-  @get @return(nullable) external lastElementChild: T.t => option<Dom.element> = ""
-  @get external childElementCount: T.t => int = ""
-  @bs.send.pipe(: T.t) @return(nullable) external querySelector: string => option<Dom.element> = ""
-  @bs.send.pipe(: T.t) external querySelectorAll: string => Dom.nodeList = ""
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__PointerEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__PointerEvent.res
deleted file mode 100644
index ef9df2a..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__PointerEvent.res
+++ /dev/null
@@ -1,26 +0,0 @@
-type t = Dom.pointerEvent
-type pointerId = Dom.eventPointerId
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Webapi__Dom__UiEvent.Impl({
-  type t = t
-})
-include Webapi__Dom__MouseEvent.Impl({
-  type t = t
-})
-
-@new external make: string => t = "PointerEvent"
-@new external makeWithOptions: (string, {..}) => t = "PointerEvent"
-
-@get external pointerId: t => pointerId = ""
-@get external width: t => int = ""
-@get external height: t => int = ""
-@get external pressure: t => float = ""
-@get external tiltX: t => int = ""
-@get external tiltY: t => int = ""
-@get external pointerType: t => string /* pointerType enum */ = ""
-let pointerType: t => Webapi__Dom__Types.pointerType = self =>
-  Webapi__Dom__Types.decodePointerType(pointerType(self))
-@get external isPrimary: t => bool = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__PopStateEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__PopStateEvent.res
deleted file mode 100644
index f3d35f1..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__PopStateEvent.res
+++ /dev/null
@@ -1,10 +0,0 @@
-type t = Dom.popStateEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "PopStateEvent"
-@new external makeWithOptions: (string, {..}) => t = "PopStateEvent"
-
-@get external state: t => {..} = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ProcessingInstruction.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ProcessingInstruction.res
deleted file mode 100644
index 3d576ab..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ProcessingInstruction.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type t = Dom.processingInstruction
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__NonDocumentTypeChildNode.Impl({
-  type t = t
-})
-include Webapi__Dom__ChildNode.Impl({
-  type t = t
-})
-
-@get external target: t => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ProgressEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ProgressEvent.res
deleted file mode 100644
index a1a040d..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ProgressEvent.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type t = Dom.progressEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "ProgressEvent"
-@new external makeWithOptions: (string, {..}) => t = "ProgressEvent"
-
-@get external lengthComputable: t => bool = ""
-@get external loaded: t => int = ""
-@get external total: t => int = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Range.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Range.res
deleted file mode 100644
index 1b39b1b..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Range.res
+++ /dev/null
@@ -1,55 +0,0 @@
-type t = Dom.range
-
-@new external make: unit => t = "Range" /* experimental */
-
-@get external collapsed: t => bool = ""
-@get external commonAncestorContainer: t => Dom.node = ""
-@get external endContainer: t => Dom.node = ""
-@get external endOffset: t => int = ""
-@get external startContainer: t => Dom.node = ""
-@get external startOffset: t => int = ""
-
-@bs.send.pipe(: t) external setStart: (Dom.node_like<'a>, int) => unit = ""
-@bs.send.pipe(: t) external setEnd: (Dom.node_like<'a>, int) => unit = ""
-@bs.send.pipe(: t) external setStartBefore: Dom.node_like<'a> => unit = ""
-@bs.send.pipe(: t) external setStartAfter: Dom.node_like<'a> => unit = ""
-@bs.send.pipe(: t) external setEndBefore: Dom.node_like<'a> => unit = ""
-@bs.send.pipe(: t) external setEndAfter: Dom.node_like<'a> => unit = ""
-@bs.send.pipe(: t) external selectNode: Dom.node_like<'a> => unit = ""
-@bs.send.pipe(: t) external selectNodeContents: Dom.node_like<'a> => unit = ""
-@bs.send.pipe(: t) external collapse: unit = ""
-@bs.send.pipe(: t) external collapseToStart: @as(json`true`) _ => unit = "collapse"
-@bs.send.pipe(: t) external cloneContents: Dom.documentFragment = ""
-@bs.send.pipe(: t) external deleteContents: unit = ""
-@bs.send.pipe(: t) external extractContents: Dom.documentFragment = ""
-@bs.send.pipe(: t) external insertNode: Dom.node_like<'a> => unit = ""
-@bs.send.pipe(: t) external surroundContents: Dom.node_like<'a> => unit = ""
-@bs.send.pipe(: t)
-external compareBoundaryPoints: (int /* compareHow enum */, t) => int /* compareResult enum */ = ""
-let compareBoundaryPoint: (
-  Webapi__Dom__Types.compareHow,
-  t,
-  t,
-) => Webapi__Dom__Types.compareResult = (how, range, self) =>
-  Webapi__Dom__Types.decodeCompareResult(
-    compareBoundaryPoints(Webapi__Dom__Types.encodeCompareHow(how), range, self),
-  )
-@bs.send.pipe(: t) external cloneRange: t = ""
-@bs.send.pipe(: t) external detach: unit = ""
-@bs.send.pipe(: t) external toString: string = ""
-@bs.send.pipe(: t)
-external comparePoint: (Dom.node_like<'a>, int) => int /* compareRsult enum */ = ""
-let comparePoint: (Dom.node_like<'a>, int, t) => Webapi__Dom__Types.compareResult = (
-  node,
-  offset,
-  self,
-) => Webapi__Dom__Types.decodeCompareResult(comparePoint(node, offset, self))
-@bs.send.pipe(: t)
-external createContextualFragment: string => Dom.documentFragment =
-  "" /* experimental, but widely supported */
-@bs.send.pipe(: t)
-external getBoundingClientRect: Dom.domRect = "" /* experimental, but widely supported */
-@bs.send.pipe(: t)
-external getClientRects: array<Dom.domRect> = "" /* experimental, but widely supported */
-@bs.send.pipe(: t) external intersectsNode: Dom.node_like<'a> => bool = ""
-@bs.send.pipe(: t) external isPointInRange: (Dom.node_like<'a>, int) => bool = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__RelatedEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__RelatedEvent.res
deleted file mode 100644
index 7de5148..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__RelatedEvent.res
+++ /dev/null
@@ -1,10 +0,0 @@
-type t = Dom.relatedEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "RelatedEvent"
-@new external makeWithOptions: (string, {..}) => t = "RelatedEvent"
-
-@get @return(nullable) external relatedTarget: t => option<Dom.eventTarget> = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Selection.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Selection.res
deleted file mode 100644
index 868ca25..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Selection.res
+++ /dev/null
@@ -1,25 +0,0 @@
-type t = Dom.selection
-
-@get @return(nullable) external anchorNode: t => option<Dom.node> = ""
-@get external anchorOffset: t => int = ""
-@get @return(nullable) external focusNode: t => option<Dom.node> = ""
-@get external focusOffset: t => int = ""
-@get external isCollapsed: t => bool = ""
-@get external rangeCount: t => int = ""
-
-@bs.send.pipe(: t) external getRangeAt: int => Dom.range = ""
-@bs.send.pipe(: t) external collapse: (Dom.node_like<_>, int) => unit = ""
-@bs.send.pipe(: t) external extend: (Dom.node_like<_>, int) => unit = ""
-@bs.send.pipe(: t) external collapseToStart: unit = ""
-@bs.send.pipe(: t) external collapseToEnd: unit = ""
-@bs.send.pipe(: t) external selectAllChildren: Dom.node_like<_> => unit = ""
-@bs.send.pipe(: t)
-external setBaseAndExtent: (Dom.node_like<_>, int, Dom.node_like<_>, int) => unit = ""
-@bs.send.pipe(: t) external addRange: Dom.range => unit = ""
-@bs.send.pipe(: t) external removeRange: Dom.range => unit = ""
-@bs.send.pipe(: t) external removeAllRanges: unit = ""
-@bs.send.pipe(: t) external deleteFromDocument: unit = ""
-@bs.send.pipe(: t) external toString: string = ""
-@bs.send.pipe(: t) external containsNode: (Dom.node_like<_>, @as(json`false`) _) => bool = ""
-@bs.send.pipe(: t)
-external containsNodePartly: (Dom.node_like<_>, @as(json`true`) _) => bool = "containsNode"
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ShadowRoot.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ShadowRoot.res
deleted file mode 100644
index 784859f..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ShadowRoot.res
+++ /dev/null
@@ -1,22 +0,0 @@
-type t = Dom.shadowRoot
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__NonElementParentNode.Impl({
-  type t = t
-})
-include Webapi__Dom__DocumentOrShadowRoot.Impl({
-  type t = t
-})
-include Webapi__Dom__ParentNode.Impl({
-  type t = t
-})
-
-@get external shadowRootMode: t => string = ""
-let shadowRootMode: t => Webapi__Dom__Types.shadowRootMode = self =>
-  Webapi__Dom__Types.decodeShadowRootMode(shadowRootMode(self))
-@get external host: t => Dom.element = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Slotable.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Slotable.res
deleted file mode 100644
index 2eb1c3a..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Slotable.res
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Mixin */
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @get @return(nullable) external assignedSlot: T.t => option<Dom.htmlSlotElement> = ""
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__StorageEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__StorageEvent.res
deleted file mode 100644
index 416929a..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__StorageEvent.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type t = Dom.storageEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "StorageEvent"
-@new external makeWithOptions: (string, {..}) => t = "StorageEvent"
-
-@get external key: t => string = ""
-@get external newValue: t => Js.Nullable.t<string> = ""
-@get external oldValue: t => Js.Nullable.t<string> = ""
-@get external storageArea: t => Dom.Storage.t = ""
-@get external url: t => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__SvgZoomEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__SvgZoomEvent.res
deleted file mode 100644
index a3e0f43..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__SvgZoomEvent.res
+++ /dev/null
@@ -1,17 +0,0 @@
-type t = Dom.svgZoomEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Webapi__Dom__UiEvent.Impl({
-  type t = t
-})
-
-@new external make: string => t = "SVGZoomEvent"
-@new external makeWithOptions: (string, {..}) => t = "SVGZoomEvent"
-
-@get external zoomRectScreen: t => Dom.svgRect = ""
-@get external previousScale: t => float = ""
-@get external previousTranslate: t => Dom.svgPoint = ""
-@get external newScale: t => float = ""
-@get external newTranslate: t => Dom.svgPoint = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Text.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Text.res
deleted file mode 100644
index 91e06a1..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Text.res
+++ /dev/null
@@ -1,37 +0,0 @@
-let ofNode = (node: Dom.node): option<'a> =>
-  Webapi__Dom__Node.nodeType(node) == Text ? Some(Obj.magic(node)) : None
-
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  let ofNode: Dom.node => option<T.t> = ofNode
-
-  @bs.send.pipe(: T.t) external splitText: (~offset: int, unit) => Dom.text = ""
-  @get external wholeText: T.t => string = ""
-}
-
-type t = Dom.text
-
-include Webapi__Dom__Node.Impl({
-  type t = t
-})
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__CharacterData.Impl({
-  type t = t
-})
-include Webapi__Dom__NonDocumentTypeChildNode.Impl({
-  type t = t
-})
-include Webapi__Dom__ChildNode.Impl({
-  type t = t
-})
-include Webapi__Dom__Slotable.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TimeEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TimeEvent.res
deleted file mode 100644
index f1c8cdc..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TimeEvent.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type t = Dom.timeEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "TimeEvent"
-@new external makeWithOptions: (string, {..}) => t = "TimeEvent"
-
-@get external detail: t => int = ""
-@get external view: t => Dom.window = "" /* technically returns a `WindowProxy` */
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TouchEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TouchEvent.res
deleted file mode 100644
index 8a08b22..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TouchEvent.res
+++ /dev/null
@@ -1,30 +0,0 @@
-type touchList /* TODO, Touch Events */
-
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @get external altKey: T.t => bool = ""
-  @get external changedTouches: T.t => touchList = ""
-  @get external ctrlKey: T.t => bool = ""
-  @get external metaKey: T.t => bool = ""
-  @get external shiftKey: T.t => bool = ""
-  @get external targetTouches: T.t => touchList = ""
-  @get external touches: T.t => touchList = ""
-}
-
-type t = Dom.touchEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Webapi__Dom__UiEvent.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
-
-@new external make: string => t = "TouchEvent"
-@new external makeWithOptions: (string, {..}) => t = "TouchEvent"
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TrackEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TrackEvent.res
deleted file mode 100644
index 25282cc..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TrackEvent.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type t = Dom.trackEvent
-type track /* TODO: VideoTrack or AudioTrack or TextTrack */
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "TrackEvent"
-@new external makeWithOptions: (string, {..}) => t = "TrackEvent"
-
-@get external track: t => track = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TransitionEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TransitionEvent.res
deleted file mode 100644
index bac667c..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TransitionEvent.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type t = Dom.transitionEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "TransitionEvent"
-@new external makeWithOptions: (string, {..}) => t = "TransitionEvent"
-
-@get external propertyName: t => string = ""
-@get external elapsedTime: t => float = ""
-@get external pseudoElement: t => string /* enum-ish */ = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TreeWalker.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TreeWalker.res
deleted file mode 100644
index 3967138..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__TreeWalker.res
+++ /dev/null
@@ -1,15 +0,0 @@
-type t = Dom.treeWalker
-
-@get external root: t => Dom.node = ""
-@get external whatToShow: t => Webapi__Dom__Types.WhatToShow.t = ""
-@get @return(nullable) external filter: t => option<Dom.nodeFilter> = ""
-@get external currentNode: t => Dom.node = ""
-@set external setCurrentNode: (t, Dom.node) => unit = ""
-
-@bs.send.pipe(: t) @return(nullable) external parentNode: option<Dom.node> = ""
-@bs.send.pipe(: t) @return(nullable) external firstChild: option<Dom.node> = ""
-@bs.send.pipe(: t) @return(nullable) external lastChild: option<Dom.node> = ""
-@bs.send.pipe(: t) @return(nullable) external previousSibling: option<Dom.node> = ""
-@bs.send.pipe(: t) @return(nullable) external nextSibling: option<Dom.node> = ""
-@bs.send.pipe(: t) @return(nullable) external previousNode: option<Dom.node> = ""
-@bs.send.pipe(: t) @return(nullable) external nextNode: option<Dom.node> = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Types.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Types.res
deleted file mode 100644
index 7300187..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Types.res
+++ /dev/null
@@ -1,340 +0,0 @@
-/* ** enums, bitmaks and constants ** */
-type compareHow =
-  | StartToStart
-  | StartToEnd
-  | EndToEnd
-  | EndToStart
-
-let encodeCompareHow = x =>
-  /* internal */
-  switch x {
-  | StartToStart => 0
-  | StartToEnd => 1
-  | EndToEnd => 2
-  | EndToStart => 3
-  }
-
-type compareResult =
-  | Before
-  | Equal
-  | After
-  | Unknown
-
-let decodeCompareResult = x =>
-  /* internal */
-  switch x {
-  | -1 => Before
-  | 0 => Equal
-  | 1 => After
-  | _ => Unknown
-  }
-
-type compatMode =
-  | BackCompat
-  | CSS1Compat
-  | Unknown
-
-let decodeCompatMode = x =>
-  /* internal */
-  switch x {
-  | "BackCompat" => BackCompat
-  | "CSS1Compat" => CSS1Compat
-  | _ => Unknown
-  }
-
-type contentEditable =
-  | True
-  | False
-  | Inherit
-  | Unknown
-
-let encodeContentEditable = x =>
-  /* internal */
-  switch x {
-  | True => "true"
-  | False => "false"
-  | Inherit => "inherit"
-  | Unknown => ""
-  }
-
-let decodeContentEditable = x =>
-  /* internal */
-  switch x {
-  | "true" => True
-  | "false" => False
-  | "inherit" => Inherit
-  | _ => Unknown
-  }
-
-type deltaMode =
-  | Pixel
-  | Line
-  | Page
-
-let decodeDeltaMode = x =>
-  /* internal */
-  switch x {
-  | 0 => Pixel
-  | 1 => Line
-  | 2 => Page
-  | _ => raise(Invalid_argument("invalid deltaMode"))
-  }
-
-type designMode =
-  | On
-  | Off
-  | Unknown
-
-let encodeDesignMode = x =>
-  /* internal */
-  switch x {
-  | On => "on"
-  | Off => "off"
-  | Unknown => ""
-  }
-
-let decodeDesignMode = x =>
-  /* internal */
-  switch x {
-  | "on" => On
-  | "off" => Off
-  | _ => Unknown
-  }
-
-type dir =
-  | Ltr
-  | Rtl
-  | Unknown
-
-let encodeDir = x =>
-  /* internal */
-  switch x {
-  | Ltr => "ltr"
-  | Rtl => "rtl"
-  | Unknown => ""
-  }
-
-let decodeDir = x =>
-  /* internal */
-  switch x {
-  | "ltr" => Ltr
-  | "rtl" => Rtl
-  | _ => Unknown
-  }
-
-type eventPhase =
-  | None
-  | CapturingPhase
-  | AtTarget
-  | BubblingPhase
-  | Unknown
-
-let decodeEventPhase = x =>
-  /* internal */
-  switch x {
-  | 0 => None
-  | 1 => CapturingPhase
-  | 2 => AtTarget
-  | 3 => BubblingPhase
-  | _ => Unknown
-  }
-
-type filterAction =
-  | Accept
-  | Reject
-  | Skip
-
-let encodeFilterAction = x =>
-  switch x {
-  | Accept => 1
-  | Reject => 2
-  | Skip => 3
-  }
-
-type insertPosition =
-  | BeforeBegin
-  | AfterBegin
-  | BeforeEnd
-  | AfterEnd
-
-let encodeInsertPosition = x =>
-  /* internal */
-  switch x {
-  | BeforeBegin => "beforebegin"
-  | AfterBegin => "afterbegin"
-  | BeforeEnd => "beforeend"
-  | AfterEnd => "afterend"
-  }
-
-type modifierKey =
-  | Alt
-  | AltGraph
-  | CapsLock
-  | Control
-  | Fn
-  | FnLock
-  | Hyper
-  | Meta
-  | NumLock
-  | ScrollLock
-  | Shift
-  | Super
-  | Symbol
-  | SymbolLock
-
-let encodeModifierKey = x =>
-  /* internal */
-  switch x {
-  | Alt => "Alt"
-  | AltGraph => "AltGraph"
-  | CapsLock => "CapsLock"
-  | Control => "Control"
-  | Fn => "Fn"
-  | FnLock => "FnLock"
-  | Hyper => "Hyper"
-  | Meta => "Meta"
-  | NumLock => "NumLock"
-  | ScrollLock => "ScrollLock"
-  | Shift => "Shift"
-  | Super => "Super"
-  | Symbol => "Symbol"
-  | SymbolLock => "SymbolLock"
-  }
-
-type nodeType =
-  | Element
-  | Attribute /* deprecated */
-  | Text
-  | CDATASection /* deprecated */
-  | EntityReference /* deprecated */
-  | Entity /* deprecated */
-  | ProcessingInstruction
-  | Comment
-  | Document
-  | DocumentType
-  | DocumentFragment
-  | Notation /* deprecated */
-  | Unknown
-
-let decodeNodeType = x =>
-  /* internal */
-  switch x {
-  | 1 => Element
-  | 2 => Attribute
-  | 3 => Text
-  | 4 => CDATASection
-  | 5 => EntityReference
-  | 6 => Entity
-  | 7 => ProcessingInstruction
-  | 8 => Comment
-  | 9 => Document
-  | 10 => DocumentType
-  | 11 => DocumentFragment
-  | 12 => Notation
-  | _ => Unknown
-  }
-
-type pointerType =
-  | Mouse
-  | Pen
-  | Touch
-  | Unknown
-
-let decodePointerType = x =>
-  /* itnernal */
-  switch x {
-  | "mouse" => Mouse
-  | "pen" => Pen
-  | "touch|" => Touch
-  | _ => Unknown
-  }
-
-type readyState =
-  | Loading
-  | Interactive
-  | Complete
-  | Unknown
-
-let decodeReadyState = x =>
-  /* internal */
-  switch x {
-  | "loading" => Loading
-  | "interactive" => Interactive
-  | "complete" => Complete
-  | _ => Unknown
-  }
-
-type shadowRootMode =
-  | Open
-  | Closed
-
-let decodeShadowRootMode = x =>
-  /* internal */
-  switch x {
-  | "open" => Open
-  | "closed" => Closed
-  | _ => raise(Invalid_argument("Unknown shadowRootMode"))
-  }
-
-type visibilityState =
-  | Visible
-  | Hidden
-  | Prerender
-  | Unloaded
-  | Unknown
-
-let decodeVisibilityState = x =>
-  /* internal */
-  switch x {
-  | "visible" => Visible
-  | "hidden" => Hidden
-  | "prerender" => Prerender
-  | "unloaded" => Unloaded
-  | _ => Unknown
-  }
-
-type image
-
-module type WhatToShowT = {
-  type t
-
-  let _All: t
-  let _Element: t
-  let _Attribute: t
-  let _Text: t
-  let _CDATASection: t
-  let _EntityReference: t
-  let _Entity: t
-  let _ProcessingInstruction: t
-  let _Comment: t
-  let _Document: t
-  let _DocumentType: t
-  let _DocumentFragment: t
-  let _Notation: t
-
-  let many: list<t> => t
-}
-
-module WhatToShow: WhatToShowT = {
-  type t = int
-
-  let _All = -1
-  let _Element = 1
-  let _Attribute = 2
-  let _Text = 4
-  let _CDATASection = 8
-  let _EntityReference = 16
-  let _Entity = 32
-  let _ProcessingInstruction = 64
-  let _Comment = 128
-  let _Document = 256
-  let _DocumentType = 512
-  let _DocumentFragment = 1024
-  let _Notation = 2048
-
-  let rec many = x =>
-    switch x {
-    | list{} => 0
-    | list{hd, ...rest} => lor(hd, many(rest))
-    }
-}
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__UiEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__UiEvent.res
deleted file mode 100644
index c3fd580..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__UiEvent.res
+++ /dev/null
@@ -1,20 +0,0 @@
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  @get external detail: T.t => int = ""
-  @get external view: T.t => Dom.window = "" /* technically returns a `WindowProxy` */
-}
-
-type t = Dom.uiEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
-
-@new external make: string => t = "UIEvent"
-@new external makeWithOptions: (string, {..}) => t = "UIEvent"
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ValidityState.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ValidityState.res
deleted file mode 100644
index 799b581..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__ValidityState.res
+++ /dev/null
@@ -1,13 +0,0 @@
-type t
-
-@get external valueMissing: t => bool = ""
-@get external typeMismatch: t => bool = ""
-@get external patternMismatch: t => bool = ""
-@get external tooLong: t => bool = ""
-@get external tooShort: t => bool = ""
-@get external rangeUnderflow: t => bool = ""
-@get external rangeOverflow: t => bool = ""
-@get external stepMismatch: t => bool = ""
-@get external badInput: t => bool = ""
-@get external customError: t => bool = ""
-@get external valid: t => bool = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__WebGlContextEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__WebGlContextEvent.res
deleted file mode 100644
index 1718cad..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__WebGlContextEvent.res
+++ /dev/null
@@ -1,10 +0,0 @@
-type t = Dom.webGlContextEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-
-@new external make: string => t = "WebGLContextEvent"
-@new external makeWithOptions: (string, {..}) => t = "WebGLContextEvent"
-
-@get external statusMessage: t => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__WheelEvent.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__WheelEvent.res
deleted file mode 100644
index d8dbe8a..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__WheelEvent.res
+++ /dev/null
@@ -1,21 +0,0 @@
-type t = Dom.wheelEvent
-
-include Webapi__Dom__Event.Impl({
-  type t = t
-})
-include Webapi__Dom__UiEvent.Impl({
-  type t = t
-})
-include Webapi__Dom__MouseEvent.Impl({
-  type t = t
-})
-
-@new external make: string => t = "WheelEvent"
-@new external makeWithOptions: (string, {..}) => t = "WheelEvent"
-
-@get external deltaX: t => float = ""
-@get external deltaY: t => float = ""
-@get external deltaZ: t => float = ""
-@get external deltaMode: t => int = ""
-let deltaMode: t => Webapi__Dom__Types.deltaMode = self =>
-  Webapi__Dom__Types.decodeDeltaMode(deltaMode(self))
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Window.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Window.res
deleted file mode 100644
index 50d68dd..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Dom/Webapi__Dom__Window.res
+++ /dev/null
@@ -1,151 +0,0 @@
-type console /* Console API, should maybe be defined in Js stdlib */
-type crypto /* Web Cryptography API */
-type frameList /* array-like, WindowProxy? */
-type idleDeadline /* Cooperative Scheduling of Background Tasks */
-type locationbar /* "bar object" */
-type menubar /* "bar object" */
-type navigator
-type personalbar /* "bar object" */
-type screen
-type scrollbars /* "bar object" */
-type speechSynthesis
-type statusbar /* "bar object" */
-type toolbar /* "bar object" */
-type mediaQueryList /* CSSOM View module */
-type transferable
-
-type idleCallbackId /* used by requestIdleCallback and cancelIdleCallback */
-
-module Impl = (
-  T: {
-    type t
-  },
-) => {
-  type t_window = T.t
-
-  /* A lot of this isn't really "dom", but rather global exports */
-
-  @get external console: t_window => console = ""
-  @get external crypto: t_window => crypto = ""
-  @get external document: t_window => Dom.document = ""
-  @get @return(nullable)
-  external frameElement: t_window => option<Dom.element> = "" /* experimental? */
-  @get external frames: t_window => frameList = ""
-  @get external fullScreen: t_window => bool = ""
-  @get external history: t_window => Dom.history = ""
-  @get external innerWidth: t_window => int = ""
-  @get external innerHeight: t_window => int = ""
-  @get external isSecureContext: t_window => bool = ""
-  @get external length: t_window => int = ""
-  @get external location: t_window => Dom.location = ""
-  @set external setLocation: (t_window, string) => unit = "location"
-  @get external locationbar: t_window => locationbar = ""
-  /* localStorage: accessed directly via Dom.Storage.localStorage */
-  @get external menubar: t_window => menubar = ""
-  @get external name: t_window => string = ""
-  @set external setName: (t_window, string) => unit = "name"
-  @get external navigator: t_window => navigator = ""
-  @get @return(nullable) external opener: t_window => option<Dom.window> = ""
-  @get external outerWidth: t_window => int = ""
-  @get external outerHeight: t_window => int = ""
-  @get external pageXOffset: t_window => float = "" /* alias for scrollX */
-  @get external pageYOffset: t_window => float = "" /* alias for scrollY */
-  @get external parent: t_window => Dom.window = ""
-  @get external performance: t_window => Webapi__Performance.t = ""
-  @get external personalbar: t_window => personalbar = ""
-  @get external screen: t_window => screen = ""
-  @get external screenX: t_window => int = ""
-  @get external screenY: t_window => int = ""
-  @get external scrollbars: t_window => scrollbars = ""
-  @get external scrollX: t_window => float = ""
-  @get external scrollY: t_window => float = ""
-  @get
-  external self: t_window => Dom.window =
-    "" /* alias for window, but apparently convenient because self (stand-alone) resolves to WorkerGlobalScope in a web worker. Probably poitnless here though */
-  /* sessionStorage: accessed directly via Dom.Storage.sessionStorage */
-  @get external speechSynthesis: t_window => speechSynthesis = "" /* experimental */
-  @get external status: t_window => string = ""
-  @set external setStatus: (t_window, string) => unit = "status"
-  @get external statusbar: t_window => statusbar = ""
-  @get external toolbar: t_window => toolbar = ""
-  @get external top: t_window => Dom.window = ""
-  @get
-  external window: t_window => t_window =
-    "" /* This is pointless I think, it's just here because window is the implicit global scope, and it's needed to be able to get a reference to it */
-
-  @bs.send.pipe(: t_window) external alert: string => unit = ""
-  @bs.send.pipe(: t_window) external blur: unit = ""
-  @bs.send.pipe(: t_window)
-  external cancelIdleCallback: idleCallbackId => unit =
-    "" /* experimental, Cooperative Scheduling of Background Tasks */
-  @bs.send.pipe(: t_window) external close: unit = ""
-  @bs.send.pipe(: t_window) external confirm: string => bool = ""
-  @bs.send.pipe(: t_window) external focus: unit = ""
-  @bs.send.pipe(: t_window) external getComputedStyle: Dom.element => Dom.cssStyleDeclaration = ""
-  @bs.send.pipe(: t_window)
-  external getComputedStyleWithPseudoElement: (Dom.element, string) => Dom.cssStyleDeclaration =
-    "getComputedStyle"
-  @bs.send.pipe(: t_window) external getSelection: Dom.selection = ""
-  @bs.send.pipe(: t_window)
-  external matchMedia: string => mediaQueryList = "" /* experimental, CSSOM View module */
-  @bs.send.pipe(: t_window)
-  external moveBy: (int, int) => unit = "" /* experimental, CSSOM View module */
-  @bs.send.pipe(: t_window)
-  external moveTo: (int, int) => unit = "" /* experimental, CSSOM View module */
-  @bs.send.pipe(: t_window) @return(nullable)
-  external open_: (~url: string, ~name: string, ~features: string=?) => option<Dom.window> =
-    "open" /* yes, features is a stringly typed list of key value pairs, sigh */
-  @bs.send.pipe(: t_window)
-  external postMessage: ('a, string) => unit = "" /* experimental-ish?, Web Messaging */
-  @bs.send.pipe(: t_window)
-  external postMessageWithTransfers: ('a, string, array<transferable>) => unit =
-    "postMessage" /* experimental-ish?, Web Messaging */
-  @bs.send.pipe(: t_window) external print: unit = ""
-  @bs.send.pipe(: t_window) external prompt: string => string = ""
-  @bs.send.pipe(: t_window) external promptWithDefault: (string, string) => string = "prompt"
-  /* requestAnimationFrame: accessed directly via Webapi */
-  @bs.send.pipe(: t_window)
-  external requestIdleCallback: (idleDeadline => unit) => idleCallbackId =
-    "" /* experimental, Cooperative Scheduling of Background Tasks */
-  @bs.send.pipe(: t_window)
-  external requestIdleCallbackWithOptions: (
-    idleDeadline => unit,
-    {"timeout": int},
-  ) => idleCallbackId =
-    "requestIdleCallback" /* experimental, Cooperative Scheduling of Background Tasks */
-  @bs.send.pipe(: t_window)
-  external resizeBy: (int, int) => unit = "" /* experimental, CSSOM View module */
-  @bs.send.pipe(: t_window)
-  external resizeTo: (int, int) => unit = "" /* experimental, CSSOM View module */
-  @bs.send.pipe(: t_window)
-  external scroll: (float, float) => unit = "" /* experimental, CSSOM View module */
-  @bs.send.pipe(: t_window)
-  external scrollBy: (float, float) => unit = "" /* experimental, CSSOM View module */
-  @bs.send.pipe(: t_window)
-  external scrollTo: (float, float) => unit = "" /* experimental, CSSOM View module */
-  @bs.send.pipe(: t_window) external stop: unit = ""
-
-  @bs.send.pipe(: t_window)
-  external addPopStateEventListener: (@as("popstate") _, Dom.popStateEvent => unit) => unit =
-    "addEventListener"
-  @bs.send.pipe(: t_window)
-  external removePopStateEventListener: (@as("popstate") _, Dom.popStateEvent => unit) => unit =
-    "removeEventListener"
-
-  @set
-  external setOnLoad: (t_window, unit => unit) => unit =
-    "onload" /* use addEventListener instead? */
-}
-
-type t = Dom.window
-
-/* include WindowOrWorkerGlobalScope? not really "dom" though */
-include Webapi__Dom__EventTarget.Impl({
-  type t = t
-})
-include Webapi__Dom__GlobalEventHandlers.Impl({
-  type t = t
-})
-include Impl({
-  type t = t
-})
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__File.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__File.res
deleted file mode 100644
index 523f3c9..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__File.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type t
-
-@get external _type: t => string = "type"
-
-@get external name: t => string = "name"
-
-@get external size: t => float = "size"
-
-@get external preview: t => string = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Performance.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Performance.res
deleted file mode 100644
index 5a88c53..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Performance.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type t
-
-@send external now: t => float = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__ResizeObserver.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__ResizeObserver.res
deleted file mode 100644
index 8137720..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__ResizeObserver.res
+++ /dev/null
@@ -1,12 +0,0 @@
-module ResizeObserverEntry = Webapi__ResizeObserver__ResizeObserverEntry
-
-type t
-
-@new
-external make: (array<ResizeObserverEntry.t> => unit) => t = "ResizeObserver"
-@new
-external makeWithObserver: ((array<ResizeObserverEntry.t>, t) => unit) => t = "ResizeObserver"
-
-@send external disconnect: t => unit = ""
-@send external observe: (t, Dom.element) => unit = ""
-@send external unobserve: (t, Dom.element) => unit = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__ResizeObserver/Webapi__ResizeObserver__ResizeObserverEntry.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__ResizeObserver/Webapi__ResizeObserver__ResizeObserverEntry.res
deleted file mode 100644
index e6b1881..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__ResizeObserver/Webapi__ResizeObserver__ResizeObserverEntry.res
+++ /dev/null
@@ -1,4 +0,0 @@
-type t
-
-@get external contentRect: t => Dom.domRect = ""
-@get external target: t => Dom.element = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Url.res b/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Url.res
deleted file mode 100644
index 8c158d4..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/src/Webapi/Webapi__Url.res
+++ /dev/null
@@ -1,50 +0,0 @@
-module URLSearchParams = {
-  type t
-
-  @new external make: string => t = "URLSearchParams"
-  @new external makeWithDict: Js.Dict.t<string> => t = "URLSearchParams"
-  @new external makeWithArray: array<(string, string)> => t = "URLSearchParams"
-  @bs.send.pipe(: t) external append: (string, string) => unit = ""
-  @bs.send.pipe(: t) external delete: string => unit = ""
-  @bs.send.pipe(: t) external entries: Js.Array.array_like<string> = ""
-  @bs.send.pipe(: t) external forEach: (@uncurry (string, string) => unit) => unit = ""
-  @return(nullable) @bs.send.pipe(: t) external get: string => option<string> = ""
-  @bs.send.pipe(: t) external getAll: string => array<string> = ""
-  @bs.send.pipe(: t) external has: string => bool = ""
-  @bs.send.pipe(: t) external keys: Js.Array.array_like<string> = ""
-  @bs.send.pipe(: t) external set: (string, string) => unit = ""
-  @bs.send.pipe(: t) external sort: unit = ""
-  @bs.send.pipe(: t) external toString: string = ""
-  @bs.send.pipe(: t) external values: Js.Array.array_like<string> = ""
-}
-
-type t
-
-@new external make: string => t = "URL"
-@new external makeWithBase: (string, string) => t = "URL"
-@get external hash: t => string = ""
-@set external setHash: (t, string) => unit = "hash"
-@get external host: t => string = ""
-@set external setHost: (t, string) => unit = "host"
-@get external hostname: t => string = ""
-@set external setHostname: (t, string) => unit = "hostname"
-@get external href: t => string = ""
-@set external setHref: (t, string) => unit = "href"
-@get external origin: t => string = ""
-@get external password: t => string = ""
-@set external setPassword: (t, string) => unit = "password"
-@get external pathname: t => string = ""
-@set external setPathname: (t, string) => unit = "pathname"
-@get external port: t => string = ""
-@set external setPort: (t, string) => unit = "port"
-@get external protocol: t => string = ""
-@set external setProtocol: (t, string) => unit = "protocol"
-@get external search: t => string = ""
-@set external setSearch: (t, string) => unit = "search"
-@get external searchParams: t => URLSearchParams.t = ""
-@get external username: t => string = ""
-@set external setUsername: (t, string) => unit = "username"
-@get external toJson: t => string = ""
-
-@val @scope("URL") external createObjectURL: Webapi__File.t => string = ""
-@val @scope("URL") external revokeObjectURL: string => unit = ""
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Base64__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Base64__test.res
deleted file mode 100644
index 8171563..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Base64__test.res
+++ /dev/null
@@ -1,4 +0,0 @@
-open Webapi.Base64
-
-let _ = atob("foo")
-let _ = btoa("gibberish")
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Canvas/Webapi__Canvas__Canvas2d__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Canvas/Webapi__Canvas__Canvas2d__test.res
deleted file mode 100644
index 21b28b3..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Canvas/Webapi__Canvas__Canvas2d__test.res
+++ /dev/null
@@ -1,98 +0,0 @@
-open Webapi.Canvas
-open Webapi.Canvas.Canvas2d
-open Webapi.Dom
-
-let canvasEl = Document.createElement("canvas", document)
-let ctx = CanvasElement.getContext2d(canvasEl)
-
-ctx |> save
-ctx |> restore
-
-ctx |> scale(~x=1., ~y=2.)
-ctx |> rotate(2.)
-ctx |> translate(~x=2., ~y=3.)
-ctx |> transform(~m11=1., ~m12=2., ~m21=1., ~m22=1., ~dx=1., ~dy=1.)
-
-globalAlpha(ctx, 0.9)
-globalCompositeOperation(ctx, Composite.sourceOver)
-
-lineWidth(ctx, 1.)
-lineCap(ctx, LineCap.butt)
-lineJoin(ctx, LineJoin.round)
-miterLimit(ctx, 10.)
-
-setStrokeStyle(ctx, String, "red")
-setFillStyle(ctx, String, "red")
-
-switch fillStyle(ctx) {
-| (Gradient, g) => g |> addColorStop(0.0, "red")
-| (String, s) => Js.log(s)
-| _ => ()
-}
-
-switch strokeStyle(ctx) {
-| (Gradient, g) => g |> addColorStop(1.2, "blue")
-| (String, s) => Js.log(s)
-| _ => ()
-}
-
-shadowOffsetX(ctx, 1.)
-shadowOffsetY(ctx, 1.)
-shadowBlur(ctx, 1.)
-shadowColor(ctx, "red")
-
-ctx |> beginPath
-ctx |> closePath
-ctx |> fill
-ctx |> stroke
-ctx |> clip
-ctx |> moveTo(~x=1., ~y=1.)
-ctx |> lineTo(~x=1., ~y=2.)
-ctx |> quadraticCurveTo(~cp1x=1., ~cp1y=1., ~x=1., ~y=1.)
-ctx |> bezierCurveTo(~cp1x=1., ~cp1y=1., ~cp2x=2., ~cp2y=2., ~x=4., ~y=4.)
-ctx |> arcTo(~x1=1., ~y1=1., ~x2=2., ~y2=2., ~r=4.)
-ctx |> arc(~x=1., ~y=1., ~r=4., ~startAngle=1., ~endAngle=3., ~anticw=true)
-ctx |> rect(~x=0., ~y=0., ~w=10., ~h=10.)
-let _ = ctx |> isPointInPath(~x=0., ~y=0.)
-
-let linearGradient = ctx |> createLinearGradient(~x0=0.0, ~y0=0.0, ~x1=0.0, ~y1=0.0)
-setStrokeStyle(ctx, Gradient, linearGradient)
-let _ = ctx |> createRadialGradient(~x0=0.0, ~y0=0.0, ~x1=0.0, ~y1=0.0, ~r0=0.0, ~r1=0.0)
-linearGradient |> addColorStop(0.0, "red")
-let _ = List.map(
-  createPattern(ctx, Document.createElement("img", document)),
-  list{#noRepeat, #repeat, #repeatX, #repeatY},
-)
-
-let measureText = ctx |> measureText("foo")
-let width = width(measureText)
-ctx |> fillText("foo!", ~x=0.0, ~y=0.0, ~maxWidth=width)
-ctx |> strokeText("foo!", ~x=0.0, ~y=0.0, ~maxWidth=width)
-let imageData = createImageDataCoords(ctx, ~width=0.0, ~height=0.0)
-createImageDataFromImage(ctx, imageData)
-Image.width(imageData)
-Image.height(imageData)
-
-getImageData(ctx, ~sx=0.0, ~sy=0.0, ~sw=0.0, ~sh=0.0)
-let _: unit = putImageData(ctx, ~imageData, ~dx=0.0, ~dy=0.0, ())
-let _: unit = putImageData(
-  ctx,
-  ~imageData,
-  ~dx=0.0,
-  ~dy=0.0,
-  ~dirtyX=0.0,
-  ~dirtyY=0.0,
-  ~dirtyWidth=0.0,
-  ~dirtyHeight=0.0,
-  (),
-)
-
-font(ctx, "10px Courier")
-textAlign(ctx, "left")
-textBaseline(ctx, "top")
-ctx |> fillText("hi", ~x=1., ~y=0.)
-ctx |> strokeText("hi", ~x=1., ~y=0.)
-
-ctx |> fillRect(~x=1., ~y=0., ~w=10., ~h=10.)
-ctx |> strokeRect(~x=1., ~y=0., ~w=10., ~h=10.)
-ctx |> clearRect(~x=1., ~y=0., ~w=10., ~h=10.)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__AnimationEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__AnimationEvent__test.res
deleted file mode 100644
index 1c12351..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__AnimationEvent__test.res
+++ /dev/null
@@ -1,25 +0,0 @@
-open Webapi.Dom
-open AnimationEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* AnimationEvent */
-let _ = animationName(event)
-let _ = elapsedTime(event)
-let _ = pseudoElement(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__BeforeUnloadEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__BeforeUnloadEvent__test.res
deleted file mode 100644
index 55d9dda..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__BeforeUnloadEvent__test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-open Webapi.Dom
-open BeforeUnloadEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* BeforeUnloadEvent */
-let _ = returnValue(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__ClipboardEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__ClipboardEvent__test.res
deleted file mode 100644
index dbbf343..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__ClipboardEvent__test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-open Webapi.Dom
-open ClipboardEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* ClipboardEvent */
-let _ = clipboardData(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__CloseEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__CloseEvent__test.res
deleted file mode 100644
index d76087c..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__CloseEvent__test.res
+++ /dev/null
@@ -1,25 +0,0 @@
-open Webapi.Dom
-open CloseEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* CloseEvent */
-let _ = wasClean(event)
-let _ = code(event)
-let _ = reason(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__CompositionEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__CompositionEvent__test.res
deleted file mode 100644
index 92a7837..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__CompositionEvent__test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-open Webapi.Dom
-open CompositionEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
-
-/* CompositionEvent */
-let _ = data(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__CustomEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__CustomEvent__test.res
deleted file mode 100644
index 385171e..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__CustomEvent__test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-open Webapi.Dom
-open CustomEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Document__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Document__test.res
deleted file mode 100644
index bee60a1..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Document__test.res
+++ /dev/null
@@ -1,82 +0,0 @@
-open Webapi.Dom
-open Document
-
-let el = document |> createElement("strong")
-
-let _ = characterSet(document)
-let _ = compatMode(document)
-let _ = doctype(document)
-let _ = documentElement(document)
-let _ = documentURI(document)
-let _ = hidden(document)
-let _ = implementation(document)
-let _ = lastStyleSheetSet(document)
-let _ = pointerLockElement(document)
-let _ = preferredStyleSheetSet(document)
-let _ = scrollingElement(document)
-let _ = selectedStyleSheetSet(document)
-let _ = setSelectedStyleSheetSet(document, "muh-stylesheet")
-let _ = styleSheets(document)
-let _ = styleSheetSets(document)
-let _ = visibilityState(document)
-
-let _ = adoptNode(el, document)
-let _ = createAttribute("data-foo", document)
-let _ = createAttributeNS("http://...", "foo", document)
-let _ = createComment("witty comment", document)
-let _ = createDocumentFragment(document)
-let _ = createElement("div", document)
-let _ = createElementWithOptions(
-  "div",
-  %raw("{}"),
-  document,
-) /* I've no idea what this options object is supposed to be, even the spec doesn't seem to bother explaining it */
-let _ = createElementNS("http://...", "foo", document)
-let _ = createElementNSWithOptions(
-  "http://...",
-  "div",
-  %raw("{}"),
-  document,
-) /* I've no idea what this options object is supposed to be, even the spec doesn't seem to bother explaining it */
-let _ = createEvent("MyCustomEvent", document)
-let _ = createNodeIterator(el, document)
-let _ = createNodeIteratorWithWhatToShow(el, WhatToShow._All, document)
-let _ = createNodeIteratorWithWhatToShowFilter(
-  el,
-  {
-    open WhatToShow
-    many(list{_Element, _Attribute})
-  },
-  NodeFilter.make(_ => 0),
-  document,
-)
-let _ = createRange(document)
-let _ = createTextNode("Very reasonable!", document)
-let _ = createTreeWalker(el, document)
-let _ = createTreeWalkerWithWhatToShow(el, WhatToShow._All, document)
-let _ = createTreeWalkerWithWhatToShowFilter(
-  el,
-  {
-    open WhatToShow
-    many(list{_Element, _Attribute})
-  },
-  NodeFilter.make(_ => 0),
-  document,
-)
-let _ = elementFromPoint(0, 0, document)
-let _ = elementsFromPoint(0, 0, document)
-let _ = enableStyleSheetsForSet("my-stylesheet-set", document)
-let _ = exitPointerLock(document)
-let _ = getAnimations(document)
-let _ = getElementsByClassName("lstlisting", document)
-let _ = getElementsByTagName("code", document)
-let _ = getElementsByTagNameNS("http://...", "foo", document)
-let _ = importNode(el, document)
-let _ = importNodeDeep(el, document)
-/* TODO: These get dead code eliminated
-let _ = registerElement(document, "my-component");
-let _ = registerElementWithOptions(document, "my-component", [%bs.raw "{}"]);
-*/
-let _ = getElementById("root", document)
-let _ = querySelector(".lstlisting", document)
-let _ = querySelectorAll(".lstlisting", document)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__DomStringMap__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__DomStringMap__test.res
deleted file mode 100644
index 26218b2..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__DomStringMap__test.res
+++ /dev/null
@@ -1,9 +0,0 @@
-open Webapi.Dom
-open Webapi.Dom.DomStringMap
-
-let dataset =
-  document |> Document.createElement("div") |> Element.unsafeAsHtmlElement |> HtmlElement.dataset
-
-let () = set("fooKey", "barValue", dataset)
-let _ = get("fooKey", dataset)
-let () = unsafeDeleteKey("fooKey", dataset)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__DomTokenList__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__DomTokenList__test.res
deleted file mode 100644
index 18f98f1..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__DomTokenList__test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-open Webapi.Dom
-open DomTokenList
-
-let tlist = document |> Document.createElement("div") |> Element.classList
-
-let _ = length(tlist)
-let _ = item(3, tlist)
-
-add("my-class", tlist)
-addMany(["my-class", "my-other-class"], tlist)
-let _ = contains("my-class", tlist)
-forEach((item, _) => print_endline(item), tlist)
-remove("my-class", tlist)
-removeMany(["my-class", "my-other-class"], tlist)
-replace("my-class", "my-other-class", tlist)
-let _ = supports("my-class", tlist)
-let _ = toggle("my-class", tlist)
-let _ = toggleForced("my-class", tlist)
-let _ = toString(tlist)
-let _ = value(tlist)
-let _ = setValue(tlist, "foo")
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__DragEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__DragEvent__test.res
deleted file mode 100644
index 146ac8d..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__DragEvent__test.res
+++ /dev/null
@@ -1,50 +0,0 @@
-open Webapi.Dom
-open DragEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
-
-/* MouseEvent */
-let _ = altKey(event)
-let _ = button(event)
-let _ = buttons(event)
-let _ = clientX(event)
-let _ = clientY(event)
-let _ = ctrlKey(event)
-let _ = metaKey(event)
-let _ = movementX(event)
-let _ = movementY(event)
-let _ = offsetX(event)
-let _ = offsetY(event)
-let _ = pageX(event)
-let _ = pageY(event)
-let _ = region(event)
-let _ = relatedTarget(event)
-let _ = screenX(event)
-let _ = screenY(event)
-let _ = shiftKey(event)
-let _ = x(event)
-let _ = y(event)
-let _ = getModifierState(Alt, event)
-
-/* DragEvent */
-let _ = dataTransfer(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Element__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Element__test.res
deleted file mode 100644
index f800478..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Element__test.res
+++ /dev/null
@@ -1,73 +0,0 @@
-open Webapi.Dom
-open Element
-
-let el = document |> Document.createElement("strong")
-let el2 = document |> Document.createElement("small")
-let event = PointerEvent.make("my-event")
-
-let _ = assignedSlot(el)
-let _ = attributes(el)
-let _ = classList(el)
-let _ = className(el)
-let _ = setClassName(el, "my-class-name")
-let _ = clientHeight(el)
-let _ = clientLeft(el)
-let _ = clientTop(el)
-let _ = clientWidth(el)
-let _ = id(el)
-let _ = setId(el, "my-id")
-let _ = innerHTML(el)
-let _ = setInnerHTML(el, "<strong>stuff</strong>")
-let _ = localName(el)
-let _ = namespaceURI(el)
-let _ = nextElementSibling(el)
-let _ = outerHTML(el)
-let _ = setOuterHTML(el, "<strong>stuff</strong>")
-let _ = prefix(el)
-let _ = previousElementSibling(el)
-let _ = scrollHeight(el)
-let _ = scrollLeft(el)
-let _ = setScrollLeft(el, 0.0)
-let _ = scrollTop(el)
-let _ = setScrollTop(el, 0.0)
-let _ = scrollWidth(el)
-let _ = shadowRoot(el)
-let _ = slot(el)
-let _ = setSlot(el, "<strong>stuff</strong>")
-let _ = tagName(el)
-
-let _ = attachShadow({"mode": "open"}, el)
-let _ = attachShadowOpen(el)
-let _ = attachShadowClosed(el)
-let _ = animate({"transform": "translateT(0px)"}, {"duration": 1000}, el)
-let _ = closest("input", el)
-let _ = createShadowRoot(el)
-let _ = getAttribute("href", el)
-let _ = getAttributeNS("http://...", "foo", el)
-let _ = getBoundingClientRect(el)
-let _ = getClientRects(el)
-let _ = getElementsByClassName("some-class-name", el)
-let _ = getElementsByTagName("pre", el)
-let _ = getElementsByTagNameNS("http://...", "td", el)
-let _ = hasAttribute("data-my-value", el)
-let _ = hasAttributeNS("http://...", "foo", el)
-let _ = hasAttributes(el)
-let _ = insertAdjacentElement(BeforeBegin, el2, el)
-let _ = insertAdjacentHTML(AfterBegin, "<strong>text</strong>", el)
-let _ = insertAdjacentText(AfterEnd, "text", el)
-let _ = matches("input", el)
-let _ = querySelector("input", el)
-let _ = querySelectorAll("input", el)
-let _ = releasePointerCapture(PointerEvent.pointerId(event), el)
-let _ = remove(el)
-let _ = removeAttribute("href", el)
-let _ = removeAttributeNS("http://...", "foo", el)
-let _ = requestFullscreen(el)
-let _ = requestPointerLock(el)
-let _ = scrollIntoView(el)
-/* let _ = scrollIntoViewNoAlignToTop(el); */
-let _ = scrollIntoViewNoAlignToTop(el)
-let _ = scrollIntoViewWithOptions({"block": "end", "behavior": "smooth"}, el)
-let _ = setAttribute("href", "http://...", el)
-let _ = setAttributeNS("http://...", "foo", "bar", el)
-let _ = setPointerCapture(PointerEvent.pointerId(event), el)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__ErrorEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__ErrorEvent__test.res
deleted file mode 100644
index a54bc17..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__ErrorEvent__test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-open Webapi.Dom
-open ErrorEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* ErrorEvent */
-let _ = message(event)
-let _ = filename(event)
-let _ = lineno(event)
-let _ = colno(event)
-let _ = error(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__EventTarget__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__EventTarget__test.res
deleted file mode 100644
index 1ff84dc..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__EventTarget__test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-open Webapi.Dom
-open EventTarget
-
-let target = document |> Document.createElement("strong") |> Element.asEventTarget
-let event = Event.make("my-event")
-let handleClick = _ => print_endline("asd")
-
-addEventListener("click", handleClick, target)
-addEventListenerWithOptions(
-  "click",
-  handleClick,
-  {"passive": true, "once": true, "capture": false},
-  target,
-)
-addEventListenerUseCapture("click", handleClick, target)
-removeEventListener("click", handleClick, target)
-removeEventListenerWithOptions("click", handleClick, {"passive": true, "capture": false}, target)
-removeEventListenerUseCapture("click", handleClick, target)
-let _ = dispatchEvent(event, target)
-
-/* https://github.com/reasonml-community/bs-webapi-incubator/issues/103 */
-let customEvent = CustomEvent.makeWithOptions("custom-event", {"detail": {"test": "test"}})
-dispatchEvent(customEvent, target)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Event__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Event__test.res
deleted file mode 100644
index 61edc0b..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Event__test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-open Webapi.Dom
-open Event
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__FocusEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__FocusEvent__test.res
deleted file mode 100644
index 33c2605..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__FocusEvent__test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-open Webapi.Dom
-open FocusEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
-
-/* FocusEvent */
-let _ = relatedTarget(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__GlobalEventHandlers__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__GlobalEventHandlers__test.res
deleted file mode 100644
index 7959ff2..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__GlobalEventHandlers__test.res
+++ /dev/null
@@ -1,69 +0,0 @@
-open Webapi.Dom
-
-let handleSelection = _ => print_endline("change")
-
-let elm = document |> Document.createElement("strong")
-
-Element.addSelectionChangeEventListenerWithOptions(
-  handleSelection,
-  {"passive": true, "once": true, "capture": false},
-  elm,
-)
-Element.addSelectionChangeEventListenerUseCapture(handleSelection, elm)
-Element.removeSelectionChangeEventListener(handleSelection, elm)
-Element.removeSelectionChangeEventListenerWithOptions(
-  handleSelection,
-  {"passive": true, "capture": false},
-  elm,
-)
-Element.removeSelectionChangeEventListenerUseCapture(handleSelection, elm)
-
-let htmlElm =
-  document
-  |> Document.createElement("strong")
-  |> HtmlElement.ofElement
-  |> TestHelpers.unsafelyUnwrapOption
-
-HtmlElement.addSelectionChangeEventListenerWithOptions(
-  handleSelection,
-  {"passive": true, "once": true, "capture": false},
-  htmlElm,
-)
-HtmlElement.addSelectionChangeEventListenerUseCapture(handleSelection, htmlElm)
-HtmlElement.removeSelectionChangeEventListener(handleSelection, htmlElm)
-HtmlElement.removeSelectionChangeEventListenerWithOptions(
-  handleSelection,
-  {"passive": true, "capture": false},
-  htmlElm,
-)
-HtmlElement.removeSelectionChangeEventListenerUseCapture(handleSelection, htmlElm)
-
-let htmlDoc = document |> Document.asHtmlDocument |> TestHelpers.unsafelyUnwrapOption
-
-HtmlDocument.addSelectionChangeEventListenerWithOptions(
-  handleSelection,
-  {"passive": true, "once": true, "capture": false},
-  htmlDoc,
-)
-HtmlDocument.addSelectionChangeEventListenerUseCapture(handleSelection, htmlDoc)
-HtmlDocument.removeSelectionChangeEventListener(handleSelection, htmlDoc)
-HtmlDocument.removeSelectionChangeEventListenerWithOptions(
-  handleSelection,
-  {"passive": true, "capture": false},
-  htmlDoc,
-)
-HtmlDocument.removeSelectionChangeEventListenerUseCapture(handleSelection, htmlDoc)
-
-Window.addSelectionChangeEventListenerWithOptions(
-  handleSelection,
-  {"passive": true, "once": true, "capture": false},
-  window,
-)
-Window.addSelectionChangeEventListenerUseCapture(handleSelection, window)
-Window.removeSelectionChangeEventListener(handleSelection, window)
-Window.removeSelectionChangeEventListenerWithOptions(
-  handleSelection,
-  {"passive": true, "capture": false},
-  window,
-)
-Window.removeSelectionChangeEventListenerUseCapture(handleSelection, window)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__History__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__History__test.res
deleted file mode 100644
index 31c400e..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__History__test.res
+++ /dev/null
@@ -1,13 +0,0 @@
-open Webapi.Dom
-open History
-
-let _ = length(history)
-let _ = scrollRestoration(history)
-let _ = setScrollRestoration(history, true)
-let _ = state(history)
-
-back(history)
-forward(history)
-go(-2, history)
-pushState(state(history), "My title", "http://...", history)
-replaceState(state(history), "My title", "http://...", history)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__HtmlDocument__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__HtmlDocument__test.res
deleted file mode 100644
index fafe584..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__HtmlDocument__test.res
+++ /dev/null
@@ -1,46 +0,0 @@
-open Webapi.Dom
-open! HtmlDocument
-
-let el = document |> Document.createElement("strong")
-let htmlDocument = document |> Document.asHtmlDocument |> TestHelpers.unsafelyUnwrapOption
-
-let _ = activeElement(htmlDocument)
-let _ = body(htmlDocument)
-let _ = setBody(htmlDocument, el)
-let _ = cookie(htmlDocument)
-let _ = setCookie(htmlDocument, "foo=bar;reason=ml")
-let _ = defaultView(htmlDocument)
-let _ = designMode(htmlDocument)
-let _ = setDesignMode(htmlDocument, On)
-let _ = dir(htmlDocument)
-let _ = setDir(htmlDocument, Ltr)
-let _ = domain(htmlDocument)
-let _ = setDomain(htmlDocument, "reason.ml")
-let _ = embeds(htmlDocument)
-let _ = forms(htmlDocument)
-let _ = head(htmlDocument)
-let _ = images(htmlDocument)
-let _ = lastModified(htmlDocument)
-let _ = links(htmlDocument)
-let _ = location(htmlDocument)
-let _ = setLocation(htmlDocument, "http://reason.ml")
-let _ = plugins(htmlDocument)
-let _ = readyState(htmlDocument)
-let _ = referrer(htmlDocument)
-let _ = scripts(htmlDocument)
-let _ = title(htmlDocument)
-let _ = setTitle(htmlDocument, "Reason: Rapid Expressive Systems Programming.")
-let _ = url(htmlDocument)
-
-close(htmlDocument)
-let _ = execCommand("copy", false, None, htmlDocument)
-let _ = getElementsByName("angry-joe", htmlDocument)
-let _ = getSelection(htmlDocument)
-let _ = hasFocus(htmlDocument)
-open_(htmlDocument)
-let _ = queryCommandEnabled("copy", htmlDocument)
-let _ = queryCommandIndeterm("cut", htmlDocument)
-let _ = queryCommandSupported("paste", htmlDocument)
-let _ = queryCommandValue("fontName", htmlDocument)
-write("Hello World!", htmlDocument)
-writeln("Hello Newline!", htmlDocument)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__HtmlElement__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__HtmlElement__test.res
deleted file mode 100644
index 7117028..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__HtmlElement__test.res
+++ /dev/null
@@ -1,62 +0,0 @@
-open Webapi.Dom
-open HtmlElement
-
-let el =
-  document
-  |> Document.createElement("strong")
-  |> Element.asHtmlElement
-  |> TestHelpers.unsafelyUnwrapOption
-let el2 =
-  document
-  |> Document.createElement("small")
-  |> Element.asHtmlElement
-  |> TestHelpers.unsafelyUnwrapOption
-let event = document |> Document.createEvent("my-event")
-
-let _ = accessKey(el)
-let _ = setAccessKey(el, "")
-let _ = accessKeyLabel(el)
-let _ = contentEditable(el)
-let _ = setContentEditable(el, Inherit)
-let _ = isContentEditable(el)
-let _ = contextMenu(el)
-let _ = setContextMenu(el, el2)
-let _ = dataset(el)
-let _ = dir(el)
-let _ = setDir(el, Rtl)
-let _ = draggable(el)
-let _ = setDraggable(el, true)
-let _ = dropzone(el)
-let _ = hidden(el)
-let _ = setHidden(el, true)
-let _ = itemScope(el)
-let _ = setItemScope(el, true)
-let _ = itemType(el)
-let _ = itemId(el)
-let _ = setItemId(el, "my-id")
-let _ = itemRef(el)
-let _ = itemProp(el)
-let _ = itemValue(el)
-let _ = setItemValue(el, %raw("{}"))
-let _ = lang(el)
-let _ = setLang(el, "en")
-let _ = offsetHeight(el)
-let _ = offsetLeft(el)
-let _ = offsetParent(el)
-let _ = offsetTop(el)
-let _ = offsetWidth(el)
-let _ = spellcheck(el)
-let _ = setSpellcheck(el, true)
-let _ = style(el)
-/* let _ = setStyle el CSSStyleDeclaration.t; /* TODO: No way to make a CSSStyleDeclaration at the moment */ */
-let _ = tabIndex(el)
-let _ = setTabIndex(el, 42)
-let _ = title(el)
-let _ = setTitle(el, "hovertext!")
-let _ = translate(el)
-let _ = setTranslate(el, true)
-
-blur(el)
-click(el)
-focus(el)
-forceSpellCheck(el)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__IdbVersionChangeEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__IdbVersionChangeEvent__test.res
deleted file mode 100644
index 0c7298f..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__IdbVersionChangeEvent__test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-open Webapi.Dom
-open IdbVersionChangeEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* IdbVersionChangeEvent */
-let _ = oldVersion(event)
-let _ = newVersion(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Image__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Image__test.res
deleted file mode 100644
index 48f4dec..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Image__test.res
+++ /dev/null
@@ -1,9 +0,0 @@
-open Webapi.Dom.Image
-
-let imageData = make(~width=0.0, ~height=0.0)
-
-let arr = Js.Typed_array.Uint8ClampedArray.make([])
-let _ = makeWithData(~array=arr, ~width=0.0, ~height=0.0)
-
-let _ = height(imageData)
-let _ = width(imageData)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__InputEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__InputEvent__test.res
deleted file mode 100644
index 4ca7455..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__InputEvent__test.res
+++ /dev/null
@@ -1,28 +0,0 @@
-open Webapi.Dom
-open InputEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
-
-/* InputEvent */
-let _ = data(event)
-let _ = isComposing(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__KeyboardEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__KeyboardEvent__test.res
deleted file mode 100644
index 8a57fda..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__KeyboardEvent__test.res
+++ /dev/null
@@ -1,37 +0,0 @@
-open Webapi.Dom
-open! KeyboardEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
-
-/* KeyboardEvent */
-let _ = altKey(event)
-let _ = code(event)
-let _ = ctrlKey(event)
-let _ = isComposing(event)
-let _ = key(event)
-let _ = locale(event)
-let _ = location(event)
-let _ = metaKey(event)
-let _ = repeat(event)
-let _ = shiftKey(event)
-let _ = getModifierState(Alt, event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Location__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Location__test.res
deleted file mode 100644
index b57fdab..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Location__test.res
+++ /dev/null
@@ -1,30 +0,0 @@
-open Webapi.Dom
-open Location
-
-let _ = href(location)
-let _ = setHref(location, "http://reason.ml")
-let _ = protocol(location)
-let _ = setProtocol(location, "https")
-let _ = host(location)
-let _ = setHost(location, "reason.ml")
-let _ = hostname(location)
-let _ = setHostname(location, "reason.ml")
-let _ = port(location)
-let _ = setPort(location, "443")
-let _ = pathname(location)
-let _ = setPathname(location, "/reason/tools.html")
-let _ = search(location)
-let _ = setSearch(location, "q=reasonml")
-let _ = hash(location)
-let _ = setHash(location, "merlin-atom")
-let _ = username(location)
-let _ = setUsername(location, "alonzo.church")
-let _ = password(location)
-let _ = setPassword(location, "lambda-the-ultimate")
-let _ = origin(location)
-
-assign("http://reason.ml", location)
-reload(location)
-reloadWithForce(location)
-replace("http://reason.ml", location)
-let _ = toString(location)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__MouseEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__MouseEvent__test.res
deleted file mode 100644
index dc8fb3a..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__MouseEvent__test.res
+++ /dev/null
@@ -1,47 +0,0 @@
-open Webapi.Dom
-open MouseEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
-
-/* MouseEvent */
-let _ = altKey(event)
-let _ = button(event)
-let _ = buttons(event)
-let _ = clientX(event)
-let _ = clientY(event)
-let _ = ctrlKey(event)
-let _ = metaKey(event)
-let _ = movementX(event)
-let _ = movementY(event)
-let _ = offsetX(event)
-let _ = offsetY(event)
-let _ = pageX(event)
-let _ = pageY(event)
-let _ = region(event)
-let _ = relatedTarget(event)
-let _ = screenX(event)
-let _ = screenY(event)
-let _ = shiftKey(event)
-let _ = x(event)
-let _ = y(event)
-let _ = getModifierState(Alt, event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__NodeList__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__NodeList__test.res
deleted file mode 100644
index d7768ee..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__NodeList__test.res
+++ /dev/null
@@ -1,6 +0,0 @@
-open Webapi.Dom
-open NodeList
-
-let items = document |> Document.querySelectorAll(".item")
-
-forEach((item, _) => Js.log(item), items)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Node__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Node__test.res
deleted file mode 100644
index 77cc939..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Node__test.res
+++ /dev/null
@@ -1,45 +0,0 @@
-open Webapi.Dom
-open Node
-
-let node = document |> Document.createElement("strong") |> Element.rootNode
-let node2 = document |> Document.createElement("small") |> Element.rootNode
-let node3 = document |> Document.createElement("small") |> Element.rootNode
-
-let _ = childNodes(node)
-let _ = firstChild(node)
-let _ = lastChild(node)
-let _ = nextSibling(node)
-let _ = nodeName(node)
-let _ = nodeType(node)
-let _ = nodeValue(node)
-let _ = setNodeValue(node, Js.Null.return("foo"))
-/* Not supported yet
-let _ = setNodeValue(node, "foo");
-let _ = clearNodeValue(node);
-*/
-let _ = ownerDocument(node)
-let _ = parentNode(node)
-let _ = parentElement(node)
-let _ = previousSibling(node)
-let _ = rootNode(node)
-let _ = textContent(node)
-let _ = setTextContent(node, "foo")
-
-let _ = appendChild(node2, node)
-let _ = cloneNode(node)
-let _ = cloneNodeDeep(node)
-let _ = compareDocumentPosition(node2, node)
-let _ = contains(node2, node)
-let _ = getRootNode(node)
-let _ = getRootNodeComposed(node)
-let _ = hasChildNodes(node)
-let _ = insertBefore(node2, node3, node)
-/* **let _ = insertBefore(node2, None, node); */
-let _ = isDefaultNamespace("http://...", node)
-let _ = isEqualNode(node2, node)
-let _ = isSameNode(node2, node)
-let _ = lookupPrefix(node)
-let _ = lookupNamespaceURI("https://...", node)
-let _ = lookupDefaultNamespaceURI(node)
-let _ = normalize(node)
-let _ = removeChild(node2, node)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__PageTransitionEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__PageTransitionEvent__test.res
deleted file mode 100644
index 692b0ba..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__PageTransitionEvent__test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-open Webapi.Dom
-open PageTransitionEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* PageTransitionEvent */
-let _ = persisted(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__PointerEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__PointerEvent__test.res
deleted file mode 100644
index 0751093..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__PointerEvent__test.res
+++ /dev/null
@@ -1,57 +0,0 @@
-open Webapi.Dom
-open PointerEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
-
-/* MouseEvent */
-let _ = altKey(event)
-let _ = button(event)
-let _ = buttons(event)
-let _ = clientX(event)
-let _ = clientY(event)
-let _ = ctrlKey(event)
-let _ = metaKey(event)
-let _ = movementX(event)
-let _ = movementY(event)
-let _ = offsetX(event)
-let _ = offsetY(event)
-let _ = pageX(event)
-let _ = pageY(event)
-let _ = region(event)
-let _ = relatedTarget(event)
-let _ = screenX(event)
-let _ = screenY(event)
-let _ = shiftKey(event)
-let _ = x(event)
-let _ = y(event)
-let _ = getModifierState(Alt, event)
-
-/* PointerEvent */
-let _ = pointerId(event)
-let _ = width(event)
-let _ = height(event)
-let _ = pressure(event)
-let _ = tiltX(event)
-let _ = tiltY(event)
-let _ = pointerType(event)
-let _ = isPrimary(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__PopStateEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__PopStateEvent__test.res
deleted file mode 100644
index b371496..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__PopStateEvent__test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-open Webapi.Dom
-open PopStateEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* PopStateEvent */
-let _ = state(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__ProgressEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__ProgressEvent__test.res
deleted file mode 100644
index 4dd4431..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__ProgressEvent__test.res
+++ /dev/null
@@ -1,25 +0,0 @@
-open Webapi.Dom
-open ProgressEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* ProgressEvent */
-let _ = lengthComputable(event)
-let _ = loaded(event)
-let _ = total(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Range__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Range__test.res
deleted file mode 100644
index a5bffa7..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Range__test.res
+++ /dev/null
@@ -1,39 +0,0 @@
-open Webapi.Dom
-open Range
-
-let node = document |> Document.createElement("strong")
-
-let range = make()
-
-let _ = collapsed(range)
-let _ = commonAncestorContainer(range)
-let _ = endContainer(range)
-let _ = endOffset(range)
-let _ = startContainer(range)
-let _ = startOffset(range)
-
-setStart(node, 0, range)
-setEnd(node, 0, range)
-setStartBefore(node, range)
-setStartAfter(node, range)
-setEndBefore(node, range)
-setEndAfter(node, range)
-selectNode(node, range)
-selectNodeContents(node, range)
-collapse(range)
-collapseToStart(range)
-let _ = cloneContents(range)
-deleteContents(range)
-let _ = extractContents(range)
-insertNode(node, range)
-surroundContents(node, range)
-let _ = compareBoundaryPoints(0, range, range)
-let _ = cloneRange(range)
-detach(range)
-let _ = toString(range)
-let _ = comparePoint(node, 0, range)
-let _ = createContextualFragment("<strong>stuff</strong>", range)
-let _ = getBoundingClientRect(range)
-let _ = getClientRects(range)
-let _ = intersectsNode(node, range)
-let _ = isPointInRange(node, 0, range)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__RelatedEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__RelatedEvent__test.res
deleted file mode 100644
index 1a240ce..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__RelatedEvent__test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-open Webapi.Dom
-open RelatedEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* RelatedEvent */
-let _ = relatedTarget(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Selection__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Selection__test.res
deleted file mode 100644
index 662205b..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Selection__test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-open Webapi.Dom
-open Selection
-
-let node = document |> Document.createElement("strong")
-let sel =
-  document
-  |> Document.asHtmlDocument
-  |> TestHelpers.unsafelyUnwrapOption
-  |> HtmlDocument.getSelection
-
-let range = Range.make()
-
-let _ = anchorNode(sel)
-let _ = anchorOffset(sel)
-let _ = focusNode(sel)
-let _ = focusOffset(sel)
-let _ = isCollapsed(sel)
-let _ = rangeCount(sel)
-let _ = getRangeAt(0, sel)
-
-collapse(node, 0, sel)
-extend(node, 0, sel)
-collapseToStart(sel)
-collapseToEnd(sel)
-selectAllChildren(node, sel)
-addRange(range, sel)
-removeRange(range, sel)
-removeAllRanges(sel)
-deleteFromDocument(sel)
-setBaseAndExtent(node, 0, node, 0, sel)
-let _ = toString(sel)
-let _ = containsNode(node, sel)
-let _ = containsNodePartly(node, sel)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__StorageEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__StorageEvent__test.res
deleted file mode 100644
index 9ce1e1b..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__StorageEvent__test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-open Webapi.Dom
-open StorageEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* StorageEvent */
-let _ = key(event)
-let _ = newValue(event)
-let _ = oldValue(event)
-let _ = storageArea(event)
-let _ = url(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__SvgZoomEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__SvgZoomEvent__test.res
deleted file mode 100644
index 7c014fd..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__SvgZoomEvent__test.res
+++ /dev/null
@@ -1,31 +0,0 @@
-open Webapi.Dom
-open SvgZoomEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
-
-/* SvgZoomEvent */
-let _ = zoomRectScreen(event)
-let _ = previousScale(event)
-let _ = previousTranslate(event)
-let _ = newScale(event)
-let _ = newTranslate(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Text__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Text__test.res
deleted file mode 100644
index 6d89163..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Text__test.res
+++ /dev/null
@@ -1,5 +0,0 @@
-open Webapi.Dom
-
-let node = document |> Document.createTextNode("text") |> Text.asNode
-
-let text = Text.ofNode(node)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TimeEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TimeEvent__test.res
deleted file mode 100644
index 45d5373..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TimeEvent__test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-open Webapi.Dom
-open TimeEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* TimeEvent */
-let _ = detail(event)
-let _ = view(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TouchEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TouchEvent__test.res
deleted file mode 100644
index b6531be..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TouchEvent__test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-open Webapi.Dom
-open TouchEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
-
-/* TouchEvent */
-let _ = altKey(event)
-let _ = changedTouches(event)
-let _ = ctrlKey(event)
-let _ = metaKey(event)
-let _ = shiftKey(event)
-let _ = targetTouches(event)
-let _ = touches(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TrackEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TrackEvent__test.res
deleted file mode 100644
index 1884dbf..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TrackEvent__test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-open Webapi.Dom
-open TrackEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* TrackEvent */
-let _ = track(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TransitionEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TransitionEvent__test.res
deleted file mode 100644
index 8a8f016..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__TransitionEvent__test.res
+++ /dev/null
@@ -1,25 +0,0 @@
-open Webapi.Dom
-open TransitionEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* TransitionEvent */
-let _ = propertyName(event)
-let _ = elapsedTime(event)
-let _ = pseudoElement(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__UiEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__UiEvent__test.res
deleted file mode 100644
index c1c4608..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__UiEvent__test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-open Webapi.Dom
-open UiEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__WebGlContextEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__WebGlContextEvent__test.res
deleted file mode 100644
index 4f17010..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__WebGlContextEvent__test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-open Webapi.Dom
-open WebGlContextEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* WebGlContextEvent */
-let _ = statusMessage(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__WheelEvent__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__WheelEvent__test.res
deleted file mode 100644
index 89d248a..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__WheelEvent__test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-open Webapi.Dom
-open WheelEvent
-
-let event = make("my-event")
-
-/* Event */
-let _ = bubbles(event)
-let _ = cancelable(event)
-let _ = composed(event)
-let _ = currentTarget(event)
-let _ = defaultPrevented(event)
-let _ = eventPhase(event)
-let _ = target(event)
-let _ = timeStamp(event)
-let _ = type_(event)
-let _ = isTrusted(event)
-
-preventDefault(event)
-stopImmediatePropagation(event)
-stopPropagation(event)
-
-/* UIEvent */
-let _ = detail(event)
-let _ = view(event)
-
-/* MouseEvent */
-let _ = clientX(event)
-
-/* WheelEvent */
-let _ = deltaX(event)
-let _ = deltaY(event)
-let _ = deltaZ(event)
-let _ = deltaMode(event)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Window__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Window__test.res
deleted file mode 100644
index 7f793cb..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Dom/Webapi__Dom__Window__test.res
+++ /dev/null
@@ -1,78 +0,0 @@
-open Webapi.Dom
-
-let el = document |> Document.createElement("strong")
-let event = document |> Document.createEvent("my-event")
-let handleClick = _ => print_endline("asd")
-
-let _ = Window.console(window)
-let _ = Window.crypto(window)
-let _ = Window.document(window)
-let _ = Window.frameElement(window)
-let _ = Window.frames(window)
-let _ = Window.fullScreen(window)
-let _ = Window.history(window)
-let _ = Window.innerWidth(window)
-let _ = Window.innerHeight(window)
-let _ = Window.isSecureContext(window)
-let _ = Window.length(window)
-let _ = Window.location(window)
-let _ = Window.setLocation(window, "http://reason.ml")
-let _ = Window.locationbar(window)
-let _ = Window.menubar(window)
-let _ = Window.name(window)
-let _ = Window.setName(window, "new name")
-let _ = Window.navigator(window)
-let _ = Window.opener(window)
-let _ = Window.outerWidth(window)
-let _ = Window.outerHeight(window)
-let _ = Window.pageXOffset(window)
-let _ = Window.pageYOffset(window)
-let _ = Window.parent(window)
-let _ = Window.performance(window)
-let _ = Window.personalbar(window)
-let _ = Window.screen(window)
-let _ = Window.screenX(window)
-let _ = Window.screenY(window)
-let _ = Window.scrollbars(window)
-let _ = Window.scrollX(window)
-let _ = Window.scrollY(window)
-let _ = Window.self(window)
-let _ = Window.speechSynthesis(window)
-let _ = Window.status(window)
-let _ = Window.setStatus(window, "new status")
-let _ = Window.statusbar(window)
-let _ = Window.toolbar(window)
-let _ = Window.top(window)
-let _ = Window.window(window)
-
-Window.alert("hello!", window)
-Window.blur(window)
-let idleId = Window.requestIdleCallback(_ => (), window) /* out of order */
-Window.cancelIdleCallback(idleId, window)
-Window.close(window)
-let _ = Window.confirm("is ok?", window)
-Window.focus(window)
-let _ = Window.getComputedStyle(el, window)
-let _ = Window.getComputedStyleWithPseudoElement(el, "hover", window)
-let _ = Window.getSelection(window)
-let _ = Window.matchMedia("max-height: 400", window)
-let _ = Window.moveBy(10, -10, window)
-let _ = Window.moveTo(120, 300, window)
-let _ = Window.open_(~url="http://...", ~name="my window", ~features="menubar=yes", window)
-let _ = Window.open_(~url="http://...", ~name="my window", window)
-Window.postMessage(
-  "my message",
-  "*",
-  window,
-) /* Currently no way to make transferables */ /* Window.postMessageWithTransfers "my message" "*" transfers window; */
-Window.print(window)
-let _ = Window.prompt("type you password, please?", window)
-let _ = Window.promptWithDefault("type password or use this?", "password", window)
-let _ = Window.requestIdleCallbackWithOptions(_ => (), {"timeout": 1000}, window)
-let _ = Window.resizeBy(10, -10, window)
-let _ = Window.resizeTo(120, 300, window)
-let _ = Window.scroll(0.0, 0.0, window)
-let _ = Window.scrollBy(10.0, -10.0, window)
-let _ = Window.scrollTo(120.5, 300.3, window)
-Window.stop(window)
-Window.setOnLoad(window, () => print_endline("load"))
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Performace__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Performace__test.res
deleted file mode 100644
index b55d0f0..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Performace__test.res
+++ /dev/null
@@ -1 +0,0 @@
-let _ = Webapi.Dom.window |> Webapi.Dom.Window.performance |> Webapi.Performance.now
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__ResizeObserver__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__ResizeObserver__test.res
deleted file mode 100644
index 9e8af1e..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__ResizeObserver__test.res
+++ /dev/null
@@ -1,13 +0,0 @@
-let el = Webapi.Dom.document |> Webapi.Dom.Document.createElement("strong")
-
-let handler = entries => {
-  let entry = entries[0]
-  let _: Dom.domRect = Webapi.ResizeObserver.ResizeObserverEntry.contentRect(entry)
-  let _: Dom.element = Webapi.ResizeObserver.ResizeObserverEntry.target(entry)
-}
-
-let observer = Webapi.ResizeObserver.make(handler)
-
-Webapi.ResizeObserver.observe(observer, el)
-Webapi.ResizeObserver.unobserve(observer, el)
-Webapi.ResizeObserver.disconnect(observer)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Url__test.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Url__test.res
deleted file mode 100644
index 134797a..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/Webapi/Webapi__Url__test.res
+++ /dev/null
@@ -1,4 +0,0 @@
-open Webapi.Url
-
-let params = URLSearchParams.make("key1=value1&key2=value2")
-URLSearchParams.forEach(Js.log2, params)
diff --git a/jscomp/syntax/tests/idempotency/bs-webapi/tests/testHelpers.res b/jscomp/syntax/tests/idempotency/bs-webapi/tests/testHelpers.res
deleted file mode 100644
index e8704e6..0000000
--- a/jscomp/syntax/tests/idempotency/bs-webapi/tests/testHelpers.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let unsafelyUnwrapOption = x =>
-  switch x {
-  | Some(v) => v
-  | None => raise(Invalid_argument("Passed `None` to unsafelyUnwrapOption"))
-  }
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/data-processor/data_processor.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/data-processor/data_processor.res
deleted file mode 100644
index db3b34e..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/data-processor/data_processor.res
+++ /dev/null
@@ -1,171 +0,0 @@
-let pathToConfirmedDataCsv = Sys.argv[1]
-let pathToDeathsDataCsv = Sys.argv[2]
-
-let csv = Csv.load(pathToConfirmedDataCsv)
-
-let createId = (country, provinceOrState) =>
-  if String.length(provinceOrState) === 0 {
-    country
-  } else {
-    country ++ (" (" ++ (provinceOrState ++ ")"))
-  }
-
-module StringSet = Set.Make(String)
-
-let locationRows = Csv.sub(~r=1, ~c=0, ~cols=2, ~rows=Csv.lines(csv) - 1, csv) |> Csv.to_array
-let duplicateCountries = Array.fold_left(((countries, duplicateCountries), x) =>
-  switch x {
-  | [provinceOrState, country] =>
-    if StringSet.mem(country, countries) {
-      (countries, StringSet.add(country, duplicateCountries))
-    } else {
-      (StringSet.add(country, countries), duplicateCountries)
-    }
-  | _ => invalid_arg("Unknown format")
-  }
-, (StringSet.empty, StringSet.empty), locationRows) |> snd
-
-let locations = \"@"(
-  duplicateCountries
-  |> StringSet.elements
-  |> List.map(country => {
-    let id = country ++ " (All regions)"
-    (id, #Assoc(list{("country", #String(country)), ("name", #String(id))}))
-  }),
-  locationRows
-  |> Array.map(x =>
-    switch x {
-    | [provinceOrState, country] if String.length(provinceOrState) === 0 =>
-      let id = createId(country, provinceOrState)
-      (id, #Assoc(list{("country", #String(country)), ("name", #String(id))}))
-    | [provinceOrState, country] =>
-      let id = createId(country, provinceOrState)
-      (
-        id,
-        #Assoc(list{
-          ("country", #String(country)),
-          ("provinceOrState", #String(provinceOrState)),
-          ("name", #String(id)),
-        }),
-      )
-    | _ => invalid_arg("Unknown format")
-    }
-  )
-  |> Array.to_list,
-)
-
-Yojson.Basic.to_file(Sys.argv[3], #Assoc(locations))
-
-let days =
-  (
-    Csv.sub(~r=0, ~c=4, ~cols=Csv.columns(csv) - 4, ~rows=1, csv) |> Csv.to_array
-  )[0] |> Array.map(x => #String(x))
-
-Yojson.Basic.to_file(Sys.argv[4], #List(days |> Array.to_list))
-
-module LocationMap = Map.Make(String)
-module DayMap = LocationMap
-
-let casesListToMap = list => list |> List.fold_left((countryMap, row) =>
-    switch Csv.Row.to_assoc(row) {
-    | list{("Province/State", provinceOrState), ("Country/Region", country), _lat, _lon, ...rest} =>
-      let currentCountryMap = LocationMap.find_opt(country, countryMap) |> (
-        x =>
-          switch x {
-          | Some(x) => x
-          | None => LocationMap.empty
-          }
-      )
-      LocationMap.add(
-        country,
-        LocationMap.add(
-          provinceOrState,
-          List.fold_left(
-            (days, (key, value)) => DayMap.add(key, value |> int_of_string, days),
-            DayMap.empty,
-            rest,
-          ),
-          currentCountryMap,
-        ),
-        countryMap,
-      )
-    | _ => invalid_arg("")
-    }
-  , LocationMap.empty)
-
-type record = {
-  deaths: int,
-  confirmed: int,
-}
-
-let getWithDefault = (default, x) =>
-  switch x {
-  | Some(x) => x
-  | None => default
-  }
-
-let data = {
-  let confirmed = Csv.Rows.load(~has_header=true, pathToConfirmedDataCsv) |> casesListToMap
-  let deaths = Csv.Rows.load(~has_header=true, pathToDeathsDataCsv) |> casesListToMap
-
-  let merged = LocationMap.merge((countryId, confirmed, deaths) => {
-    let confirmed = getWithDefault(LocationMap.empty, confirmed)
-    let deaths = getWithDefault(LocationMap.empty, deaths)
-    Some(LocationMap.merge((regionId, confirmed, deaths) => {
-        let confirmed = getWithDefault(DayMap.empty, confirmed)
-        let deaths = getWithDefault(DayMap.empty, deaths)
-        Some(DayMap.merge((day, confirmed, deaths) => Some({
-            deaths: getWithDefault(0, deaths),
-            confirmed: getWithDefault(0, confirmed),
-          }), confirmed, deaths))
-      }, confirmed, deaths))
-  }, confirmed, deaths)
-
-  let allRegionsPerCountry = {
-    let nullRecord = {confirmed: 0, deaths: 0}
-
-    List.fold_left((countries, countryId) => {
-      let allRegions = LocationMap.find(countryId, merged)
-      let days = LocationMap.fold(_regionId =>
-        DayMap.merge((day, all, region) => {
-          let all = getWithDefault(nullRecord, all)
-          let region = getWithDefault(nullRecord, region)
-
-          Some({
-            confirmed: all.confirmed + region.confirmed,
-            deaths: all.deaths + region.deaths,
-          })
-        })
-      , allRegions, DayMap.empty)
-
-      let id = countryId ++ " (All regions)"
-      LocationMap.add(id, days, countries)
-    }, LocationMap.empty, duplicateCountries |> StringSet.elements)
-  }
-
-  LocationMap.fold(
-    (countryId, regions, locations): LocationMap.t<DayMap.t<record>> =>
-      LocationMap.fold(
-        (regionId, days, allRegions) =>
-          LocationMap.add(createId(countryId, regionId), days, allRegions),
-        regions,
-        locations,
-      ),
-    merged,
-    allRegionsPerCountry,
-  )
-  |> LocationMap.bindings
-  |> List.map(((locationId, dayMap)) => (
-    locationId,
-    #Assoc(
-      dayMap
-      |> DayMap.bindings
-      |> List.map(((day, {confirmed, deaths})) => (
-        day,
-        #Assoc(list{("confirmed", #Int(confirmed)), ("deaths", #Int(deaths))}),
-      )),
-    ),
-  ))
-}
-
-Yojson.Basic.to_file(Sys.argv[5], #Assoc(data))
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Chart.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Chart.res
deleted file mode 100644
index cf4779a..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Chart.res
+++ /dev/null
@@ -1,295 +0,0 @@
-open Recharts
-module R = Recharts.Make({
-  type dataItem = Data.item
-})
-
-type domain
-external int_to_domain: int => domain = "%identity"
-external string_to_domain: string => domain = "%identity"
-@get external clientHeight: Dom.element => float = "clientHeight"
-
-let calculateMaxValue = (dataType, locations, data) =>
-  Js.Array.reduce(
-    (maxValue, {Data.values: values}) =>
-      Js.Array.reduce(
-        (maxValue, location) =>
-          values(location.Location.id)
-          |> Js.Option.map((. value) => Js.Math.max_int(maxValue, Data.getValue(dataType, value)))
-          |> Js.Option.getWithDefault(maxValue),
-        maxValue,
-        locations,
-      ),
-    1,
-    data,
-  )
-
-let ordinalSuffix = i => {
-  let j = mod(i, 10)
-  let k = mod(i, 100)
-  let i = Js.Int.toString(i)
-  if j == 1 && k != 11 {
-    i ++ "st"
-  } else if j == 2 && k != 12 {
-    i ++ "nd"
-  } else if j == 3 && k != 13 {
-    i ++ "rd"
-  } else {
-    i ++ "th"
-  }
-}
-
-let renderTooltipValues = (~chartType, ~payload, ~separator) =>
-  payload
-  |> Js.Array.filter(payload => payload.R.Tooltip.name !== "daily-growth-indicator")
-  |> Js.Array.map(payload => {
-    let currentDataItem = (payload: R.Tooltip.payload).payload.Data.values(payload.R.Tooltip.name)
-    <span className="text-base font-bold" key=payload.R.Tooltip.name>
-      <span style={ReactDOMRe.Style.make(~color=payload.stroke, ())}>
-        {React.string(payload.name)}
-      </span>
-      {
-        let (mainData, extraData) = switch chartType {
-        | Filters.Number(dataType) =>
-          let growthString =
-            currentDataItem
-            |> Js.Option.map((. dataItem) =>
-              " (+" ++ ((Data.getGrowth(dataType, dataItem) *. 100. |> Js.Float.toFixed) ++ "%)")
-            )
-            |> Js.Option.getWithDefault("")
-          (separator ++ Js.Int.toString(R.Line.toInt(payload.value)), growthString)
-        | Filters.PercentageGrowthOfCases =>
-          let growthString =
-            currentDataItem
-            |> Js.Option.map((. dataItem) =>
-              " (+" ++ ((Data.getDailyNewCases(dataItem).confirmed |> Js.Int.toString) ++ ")")
-            )
-            |> Js.Option.getWithDefault("")
-          (
-            separator ++
-            ("+" ++
-            ((R.Line.toFloat(payload.value) *. 100. |> Js.Float.toFixed) ++ "%")),
-            growthString,
-          )
-        | Filters.TotalMortalityRate =>
-          let growthString =
-            currentDataItem
-            |> Js.Option.map((. dataItem) => {
-              let {Data.confirmed: confirmed, deaths} = Data.getRecord(dataItem)
-              " (" ++ (Js.Int.toString(deaths) ++ ("/" ++ Js.Int.toString(confirmed)) ++ ")")
-            })
-            |> Js.Option.getWithDefault("")
-          (
-            separator ++
-            (Js.Float.toFixedWithPrecision(R.Line.toFloat(payload.value) *. 100., ~digits=2) ++
-            "%"),
-            growthString,
-          )
-        }
-        <>
-          {React.string(mainData)}
-          <span className="text-base font-normal"> {React.string(extraData)} </span>
-        </>
-      }
-    </span>
-  })
-  |> React.array
-
-@react.component
-let make = (
-  ~timeline: Filters.timeline,
-  ~locations,
-  ~scale,
-  ~threshold,
-  ~chartType,
-  ~startDate,
-  ~endDate,
-) => {
-  let dataType = switch chartType {
-  | Filters.Number(typ) => typ
-  | Filters.PercentageGrowthOfCases => Data.Confirmed
-  | Filters.TotalMortalityRate => Data.Deaths
-  }
-  let dataTypeSuffix = switch dataType {
-  | Data.Confirmed => " case"
-  | Data.Deaths => " fatality"
-  }
-  let formatLabel = switch timeline {
-  | Filters.RelativeToThreshold =>
-    x =>
-      switch x {
-      | "1" => "1 day since " ++ (ordinalSuffix(threshold) ++ dataTypeSuffix)
-      | str => str ++ (" days since " ++ (ordinalSuffix(threshold) ++ dataTypeSuffix))
-      }
-
-  | _ => x => x
-  }
-  let data = switch timeline {
-  | Filters.RelativeToThreshold => Data.alignToDay0(dataType, threshold)
-  | CalendarDates => Data.calendar(startDate, endDate)
-  }
-  let growthBaseline = switch (chartType, timeline, scale) {
-  | (Filters.Number(Data.Confirmed), Filters.RelativeToThreshold, Filters.Logarithmic) =>
-    let dailyGrowth = 1.33
-    let exponent = {
-      let threshold = Js.Int.toFloat(threshold)
-      let maxValue = calculateMaxValue(Data.Confirmed, locations, data)
-      log((maxValue |> Belt.Int.toFloat) /. threshold) /. log(dailyGrowth) |> Js.Math.ceil
-    }
-    <R.Line
-      dot={Dot.bool(false)}
-      activeDot={Dot.bool(false)}
-      name="daily-growth-indicator"
-      _type=#monotone
-      stroke={Colors.colors["black"]}
-      strokeWidth=2.
-      strokeDasharray="3 3"
-      dataKey={item =>
-        if item.Data.index <= exponent {
-          Js.Null.return(
-            Js.Int.toFloat(threshold) *.
-            Js.Math.pow_float(~base=dailyGrowth, ~exp=item.Data.index |> Belt.Int.toFloat)
-            |> int_of_float
-            |> R.Line.int,
-          )
-        } else {
-          Js.null
-        }}
-    />
-
-  | _ => React.null
-  }
-
-  let divRef = React.useRef(Js.Nullable.null)
-  let (dot, setDot) = React.useState(() => true)
-  React.useEffect1(() => {
-    let opt = divRef |> React.Ref.current |> Js.Nullable.toOption
-    switch opt {
-    | Some(ref) => setDot(_ => clientHeight(ref) > 500.)
-    | None => ()
-    }
-    None
-  }, [])
-
-  let (linkCopied, setLinkCopied) = React.useState(() => false)
-
-  React.useEffect4(() => {
-    setLinkCopied(_ => false)
-    None
-  }, (timeline, scale, locations, threshold))
-
-  <div
-    ref={ReactDOMRe.Ref.domRef(divRef)}
-    className="max-h-screen flex-1 flex flex-col justify-center flex-basis-100">
-    <div className="flex-1 min-h-400 max-h-600 flex-basis-100">
-      <R.ResponsiveContainer minHeight=400. height={pct(100.)} width={pct(100.)}>
-        <R.LineChart margin={"top": 20, "right": 50, "bottom": 20, "left": 0} data>
-          <R.CartesianGrid strokeDasharray="3 3" />
-          growthBaseline
-          {Js.Array.map(({Location.id: id, primaryColor}) =>
-            <R.Line
-              key=id
-              name=id
-              _type=#monotone
-              dataKey={item =>
-                switch item.Data.values(id) {
-                | Some(x) =>
-                  switch chartType {
-                  | Filters.Number(dataType) =>
-                    let value = Data.getValue(dataType, x)
-                    if value != 0 {
-                      Js.Null.return(R.Line.int(value))
-                    } else {
-                      Js.null
-                    }
-                  | Filters.PercentageGrowthOfCases =>
-                    Js.Null.return(R.Line.float(Data.getGrowth(Data.Confirmed, x)))
-                  | Filters.TotalMortalityRate =>
-                    Js.Null.return(R.Line.float(Data.getTotalMortailityRate(x)))
-                  }
-                | _ => Js.Null.empty
-                }}
-              stroke=primaryColor
-              strokeWidth=2.
-              dot={dot
-                ? Dot.obj({
-                    "r": 3,
-                    "strokeWidth": 0,
-                    "fill": primaryColor,
-                  })
-                : Dot.bool(false)}
-              activeDot={Dot.obj({
-                "strokeWidth": 2,
-                "fill": Colors.colors["white"],
-                "stroke": primaryColor,
-              })}
-            />
-          , locations) |> Js.Array.reverseInPlace |> React.array}
-          <R.Tooltip
-            content={({R.Tooltip.payload: payload, label, separator}) =>
-              switch Js.Null.toOption(payload) {
-              | Some(payload) =>
-                <div
-                  className="tooltip flex flex-col bg-white shadow-lg border-solid border border-lightgrayblue rounded p-2">
-                  <span className="text-base font-bold"> {React.string(formatLabel(label))} </span>
-                  {renderTooltipValues(~chartType, ~payload, ~separator)}
-                </div>
-              | None => React.null
-              }}
-          />
-          <R.XAxis
-            minTickGap=70.
-            interval="preserveStartEnd"
-            dataKey={item =>
-              switch item.Data.x {
-              | Day(int) => R.XAxis.int(int)
-              | Date(date) => R.XAxis.string(Js.Date.toLocaleDateString(date))
-              }}
-            padding={"left": 0, "right": 30}
-            axisLine=false
-            tickLine=false>
-            {switch timeline {
-            | Filters.RelativeToThreshold =>
-              let value = "Number of days since " ++ (ordinalSuffix(threshold) ++ dataTypeSuffix)
-              <R.Label
-                style={"fontWeight": "bold", "fontSize": "14px"}
-                value
-                position="insideTop"
-                offset=30.
-              />
-            | _ => React.null
-            }}
-          </R.XAxis>
-          <R.YAxis
-            axisLine=false
-            tickLine=false
-            _type=#number
-            scale={switch (chartType, scale) {
-            | (Filters.Number(_), Filters.Logarithmic) => #log
-            | _ => #linear
-            }}
-            domain=("dataMin" |> R.YAxis.string, "dataMax" |> R.YAxis.string)
-            tickFormatter={x =>
-              switch chartType {
-              | Filters.Number(_) => Js.Int.toString(R.Line.toInt(x))
-              | Filters.TotalMortalityRate
-              | Filters.PercentageGrowthOfCases =>
-                (R.Line.toFloat(x) *. 100. |> Js.Float.toFixed) ++ "%"
-              }}
-          />
-        </R.LineChart>
-      </R.ResponsiveContainer>
-      <div className="pl-4">
-        <button
-          onClick={_ => {
-            setLinkCopied(_ => true)
-            CopyToClipboard.copy(Window.window.location.href)
-          }}
-          className={"border border-activeblue text-activeblue text-base px-2 py-1 rounded hover:bg-activeblue hover:text-white " ++ (
-            linkCopied ? "text-white bg-activeblue" : ""
-          )}>
-          {React.string(linkCopied ? "Link copied to clipboard" : "Copy link to current chart")}
-        </button>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/ColorStack.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/ColorStack.res
deleted file mode 100644
index cdc9032..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/ColorStack.res
+++ /dev/null
@@ -1,82 +0,0 @@
-module Map = Belt.Map.String
-module Set = Belt.Set.String
-module Stack = Belt.MutableStack
-
-type color =
-  | Color(string, string)
-  | Fallback
-
-type t = {
-  colors: Stack.t<color>,
-  associations: Map.t<color>,
-}
-
-let white = "#fff"
-let black = "#000"
-let fallbackColor = ("#878787", white)
-let colors = [
-  Color("#a50026", white),
-  Color("#fdae61", black),
-  Color("#313695", white),
-  Color("#d73027", white),
-  Color("#fee090", black),
-  Color("#abd9e9", black),
-  Color("#f46d43", white),
-  Color("#74add1", white),
-  Color("#4575b4", white),
-]
-
-let initialColors = {
-  let stack = Stack.make()
-  Js.Array.forEach(color => Stack.push(stack, color), colors)
-  stack
-}
-
-let popColor = colorQueue =>
-  switch Stack.pop(colorQueue) {
-  | Some(color) => color
-  | None => Fallback
-  }
-
-let make = (~locations) => {
-  let colors = Stack.copy(initialColors)
-  {
-    associations: Js.Array.reduce((associations, location) => {
-      let color = popColor(colors)
-      Map.set(associations, location, color)
-    }, Map.empty, locations),
-    colors: colors,
-  }
-}
-
-let updateColors = (~locations, {colors, associations}) => {
-  let colors = Stack.copy(colors)
-  let locations = Set.fromArray(locations)
-  let prevLocations = Map.keysToArray(associations) |> Set.fromArray
-  let removed = Set.diff(prevLocations, locations)
-
-  Set.forEach(removed, location =>
-    switch Map.get(associations, location) {
-    | Some(Color(_) as color) => Stack.push(colors, color)
-    | _ => ()
-    }
-  )
-
-  {
-    associations: Set.reduce(locations, Map.empty, (newAssociations, location) =>
-      switch Map.get(associations, location) {
-      | Some(x) => Map.set(newAssociations, location, x)
-      | None =>
-        let color = popColor(colors)
-        Map.set(newAssociations, location, color)
-      }
-    ),
-    colors: colors,
-  }
-}
-
-let getColor = (~location, {associations}) =>
-  switch Map.getWithDefault(associations, location, Fallback) {
-  | Color(primaryColor, secondaryColor) => (primaryColor, secondaryColor)
-  | Fallback => fallbackColor
-  }
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/ColorStack.resi b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/ColorStack.resi
deleted file mode 100644
index ec9e9b7..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/ColorStack.resi
+++ /dev/null
@@ -1,5 +0,0 @@
-type t
-
-let make: (~locations: array<string>) => t
-let updateColors: (~locations: array<string>, t) => t
-let getColor: (~location: string, t) => (string, string)
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Colors.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Colors.res
deleted file mode 100644
index 821554c..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Colors.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let colors = {
-  "activeblue": "#0099FF",
-  "grayblue": "#ACBBCB",
-  "bggray": "#F0F1F2",
-  "fggray": "#A4A4A4",
-  "white": "#FFFFFF",
-  "black": "#000000",
-  "lightgrayblue": "#DBE3EC",
-  "darkgray": "#494949",
-}
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/CopyToClipboard.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/CopyToClipboard.res
deleted file mode 100644
index 915f62b..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/CopyToClipboard.res
+++ /dev/null
@@ -1 +0,0 @@
-@module external copy: string => unit = "copy-to-clipboard"
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Data.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Data.res
deleted file mode 100644
index dc57f5e..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Data.res
+++ /dev/null
@@ -1,214 +0,0 @@
-module Map: {
-  type t<'key, 'value> constraint 'key = string
-
-  let keys: t<'key, 'value> => array<'key>
-  let get: (t<'key, 'value>, 'key) => 'value
-  let get_opt: (t<'key, 'value>, 'key) => option<'value>
-  let map: ((. 'value) => 'b, t<'key, 'value>) => t<'key, 'b>
-  let entries: t<'key, 'value> => array<('key, 'value)>
-  let fromArray: array<('key, 'value)> => t<'key, 'value>
-  let set: (t<'key, 'value>, 'key, 'value) => unit
-  let empty: unit => t<'key, 'value>
-} = {
-  type t<'key, 'value> = Js.Dict.t<'value> constraint 'key = string
-  let keys = Js.Dict.keys
-  let get = Js.Dict.unsafeGet
-  let get_opt = Js.Dict.get
-  let map = Js.Dict.map
-  let entries = Js.Dict.entries
-  let fromArray = Js.Dict.fromArray
-  let set = Js.Dict.set
-  let empty = Js.Dict.empty
-}
-
-@val external require: string => 'a = "require"
-
-type countryId = string
-type location = {
-  country: string,
-  provinceOrState: option<string>,
-  name: string,
-}
-type day = string
-type record = {
-  confirmed: int,
-  deaths: int,
-}
-type dataPoints = Map.t<day, record>
-
-let locations: Map.t<countryId, location> = require("../data/locations.json")
-let days: array<day> = require("../data/days.json")
-let data: Map.t<countryId, dataPoints> = require("../data/data.json")
-let countryIds = Map.keys(locations)
-
-let startDate = Js.Date.fromString(days[0])
-let endDate = Js.Date.fromString(days[Js.Array.length(days) - 1])
-
-let dayToIndex = Js.Array.mapi((day, index) => (day, index), days) |> Map.fromArray
-
-type xValue =
-  | Date(Js.Date.t)
-  | Day(int)
-
-type value =
-  | First(record)
-  | Pair({prevRecord: record, record: record})
-
-let dataWithGrowth =
-  Map.entries(data)
-  |> Js.Array.map(((countryId, dataPoints)) => {
-    let data = lazy {
-      let countryDataWithGrowth = Map.empty()
-      let _ = Js.Array.reduce((prevRecord, day) => {
-        let record = Map.get(dataPoints, day)
-        Map.set(
-          countryDataWithGrowth,
-          day,
-          switch prevRecord {
-          | None => First(record)
-          | Some(x) => Pair({prevRecord: x, record: record})
-          },
-        )
-        Some(record)
-      }, None, days)
-      countryDataWithGrowth
-    }
-    (countryId, data)
-  })
-  |> Belt.Map.String.fromArray
-
-type item = {
-  x: xValue,
-  index: int,
-  values: countryId => option<value>,
-}
-
-type t = array<item>
-
-let calendar: t = Js.Array.mapi((day, index) => {
-  let values = Belt.HashMap.String.make(~hintSize=Js.Array.length(countryIds))
-  Js.Array.forEach(
-    countryId =>
-      Belt.HashMap.String.set(
-        values,
-        Map.get(locations, countryId).name,
-        lazy Map.get(Belt.Map.String.getExn(dataWithGrowth, countryId) |> Lazy.force, day),
-      ),
-    countryIds,
-  )
-  {
-    x: Date(Js.Date.fromString(day)),
-    index: index,
-    values: countryId =>
-      Belt.HashMap.String.get(values, countryId) |> Js.Option.map((. x) => Lazy.force(x)),
-  }
-}, days)
-
-let isInitialRange = (selectedStartDate, selectedEndDate) =>
-  Js.Date.getTime(selectedEndDate) == Js.Date.getTime(endDate) &&
-    Js.Date.getDate(selectedStartDate) == Js.Date.getTime(startDate)
-
-let calendar = (selectedStartDate, selectedEndDate) =>
-  if isInitialRange(selectedStartDate, selectedEndDate) {
-    calendar
-  } else {
-    Js.Array.filter(({x}) =>
-      switch x {
-      | Date(date) => date >= selectedStartDate && date <= selectedEndDate
-      | _ => false
-      }
-    , calendar)
-  }
-
-type dataType =
-  | Confirmed
-  | Deaths
-
-let getRecord = x =>
-  switch x {
-  | First(value) => value
-  | Pair({record}) => record
-  }
-
-let getValueFromRecord = (dataType, record) =>
-  switch dataType {
-  | Deaths => record.deaths
-  | Confirmed => record.confirmed
-  }
-
-let getValue = (dataType, dataItem) => getValueFromRecord(dataType, getRecord(dataItem))
-
-let alignToDay0 = (dataType, threshold) => {
-  let data = Belt.Map.String.mapU(dataWithGrowth, (. dataPoints) =>
-    lazy {
-      let dataPoints = Lazy.force(dataPoints)
-      Map.entries(dataPoints)
-      |> Js.Array.map(((date, value)) => (Map.get(dayToIndex, date), value))
-      |> Js.Array.sortInPlaceWith((a, b) => compare(a |> fst, b |> fst))
-      |> Js.Array.map(((_, value)) => value)
-      |> Js.Array.filter(value => getValue(dataType, value) >= threshold)
-      |> Js.Array.mapi((value, index) => (index, value))
-      |> Belt.Map.Int.fromArray
-    }
-  )
-
-  Array.init(Js.Array.length(days), day => {
-    x: Day(day),
-    index: day,
-    values: countryId =>
-      Belt.Map.String.get(data, countryId) |> Js.Option.andThen((. countryData) =>
-        Belt.Map.Int.get(Lazy.force(countryData), day)
-      ),
-  })
-}
-
-let getGrowth = (dataType, x) =>
-  switch x {
-  | First(_) => 0.
-  | Pair({prevRecord, record}) =>
-    let numberOfCasesF = Js.Int.toFloat(getValueFromRecord(dataType, record))
-    let prevNumberOfCases = getValueFromRecord(dataType, prevRecord)
-    let prevNumberOfCasesF = Js.Int.toFloat(prevNumberOfCases)
-    prevNumberOfCases == 0 ? 0. : numberOfCasesF /. prevNumberOfCasesF -. 1.
-  }
-
-let getTotalMortailityRate = x =>
-  switch x {
-  | First({confirmed, deaths}) if confirmed > 0 =>
-    Js.Int.toFloat(deaths) /. Js.Int.toFloat(confirmed)
-  | Pair({record: {confirmed, deaths}}) if confirmed > 0 =>
-    Js.Int.toFloat(deaths) /. Js.Int.toFloat(confirmed)
-  | _ => 0.
-  }
-
-let getDailyNewCases = x =>
-  switch x {
-  | First(ret) => ret
-  | Pair({prevRecord, record}) =>
-    let confirmed = record.confirmed - prevRecord.confirmed
-    let deaths = record.deaths - prevRecord.deaths
-    {confirmed: confirmed, deaths: deaths}
-  }
-
-let getDailyMortailityRate = x => {
-  let {confirmed, deaths} = getDailyNewCases(x)
-  if confirmed > 0 {
-    Js.Int.toFloat(deaths) /. Js.Int.toFloat(confirmed)
-  } else {
-    0.
-  }
-}
-
-/*
- * let allLocations =
- *   Map.entries(locations)
- *   |> Js.Array.map(((locationId, value)) =>
- *        {ReactSelect.label: value.name, value: locationId}
- *      );
- */
-
-/* Workaround Datepicker bug/feature.
-   This file is loaded before filters :/.
-   https://github.com/inspect-js/has-symbols/issues/6
- */
-Window.window.global = Window.window
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/DatePicker.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/DatePicker.res
deleted file mode 100644
index 4260ff0..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/DatePicker.res
+++ /dev/null
@@ -1,11 +0,0 @@
-@module("react-datepicker") @react.component
-external make: (
-  ~selected: Js.Date.t,
-  ~onChange: Js.Date.t => unit,
-  ~customInput: React.element,
-  ~selectsStart: bool=?,
-  ~selectsEnd: bool=?,
-  ~startDate: Js.Date.t=?,
-  ~endDate: Js.Date.t=?,
-  ~minDate: Js.Date.t=?,
-) => React.element = "default"
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Filters.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Filters.res
deleted file mode 100644
index 3810a0c..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Filters.res
+++ /dev/null
@@ -1,374 +0,0 @@
-module Input = {
-  type typ =
-    | Float(option<float>)
-    | Number(option<int>)
-    | Text(string)
-  @react.component
-  let make = (~id, ~value, ~onBlur, ~onChange, ~label) =>
-    <input
-      className="threshold-input"
-      id
-      type_={switch value {
-      | Float(_)
-      | Number(_) => "number"
-      | Text(_) => "text"
-      }}
-      onBlur
-      onChange
-      value={switch value {
-      | Float(float) =>
-        float |> Js.Option.map((. int) => Js.Float.toString(int)) |> Js.Option.getWithDefault("")
-      | Number(int) =>
-        int |> Js.Option.map((. int) => Js.Int.toString(int)) |> Js.Option.getWithDefault("")
-      | Text(text) => text
-      }}
-      placeholder=label
-    />
-}
-
-module H1 = {
-  @react.component
-  let make = (~text) => <h1 className="text-big font-bold"> {React.string(text)} </h1>
-}
-
-module H2 = {
-  @react.component
-  let make = (~text) => <h2 className="text-md font-bold pt-3"> {React.string(text)} </h2>
-}
-
-module P = {
-  @react.component
-  let make = (~text) => <p className="text-base font-regular"> {React.string(text)} </p>
-}
-
-module Footer = {
-  module A = {
-    @react.component
-    let make = (~href, ~str) => <a className="font-bold" href> {React.string(str)} </a>
-  }
-  @react.component
-  let make = () =>
-    <div className="py-3 overflow-scroll text-base">
-      <div>
-        <span>
-          {React.string("Created by ")}
-          <A href="https://twitter.com/wokalski" str="Wojtek Czekalski" />
-          {React.string(" and Marta Konopko")}
-        </span>
-      </div>
-      <div>
-        <span className="text-gray-400 text-base">
-          {React.string("Data provided by ")}
-          <A
-            href="https://github.com/CSSEGISandData/COVID-19" str="CSSE at Johns Hopkins University"
-          />
-        </span>
-      </div>
-      <div>
-        <span className="text-gray-400 text-base">
-          {React.string("Contribute on ")}
-          <A href="https://github.com/wokalski/COVID-19charts.com" str="Github" />
-          {React.string(" or contact the author at: ")}
-          <br />
-          {React.string("me (at) wczekalski.com")}
-        </span>
-      </div>
-    </div>
-}
-
-module MultiValueContainer = {
-  @react.component
-  let make = (~children) => <div> children </div>
-}
-
-module Radio = {
-  module Circle = {
-    @react.component
-    let make = (~selected) => {
-      let selected = selected ? "-selected" : ""
-      <div className={"radio-button-ring" ++ selected}>
-        <div className={"radio-button-circle" ++ selected} />
-      </div>
-    }
-  }
-  @react.component
-  let make = (~values, ~selectedValue, ~format, ~getKey=Js.String.make, ~onChange) =>
-    <div className="flex flex-col">
-      {Belt.Array.mapU(values, (. value) => {
-        let text = format(value)
-        let selected = value == selectedValue
-        let fontWeight = selected ? "font-bold" : "font-regular"
-        <button
-          key={getKey(value)} className="flex items-center py-1" onClick={_ => onChange(value)}>
-          <Circle selected={value == selectedValue} />
-          <span className={"text-black text-base pl-2 " ++ fontWeight}> {React.string(text)} </span>
-        </button>
-      }) |> React.array}
-    </div>
-}
-
-module RadioSection = {
-  @react.component
-  let make = (~text, ~values, ~selectedValue, ~format, ~onChange) =>
-    <div> <H2 text /> <Radio values selectedValue format onChange /> </div>
-}
-
-module Locations = {
-  module Remove = {
-    @react.component
-    let make = () =>
-      <svg
-        className="legend-remove-button"
-        width="14px"
-        height="14px"
-        viewBox="0 0 14 14"
-        version="1.1"
-        xmlns="http://www.w3.org/2000/svg">
-        <defs />
-        <g id="Page-1" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
-          <g id="Desktop" transform="translate(-575.000000, -253.000000)">
-            <g id="Group-2" transform="translate(572.000000, 250.000000)">
-              <g id="Group-3">
-                <rect id="Rectangle-2" x="3" y="3" width="14" height="14" />
-                <path
-                  d="M11.8994949,7.89949494 L14.8994949,7.89949494 C16.0040644,7.89949494 16.8994949,8.79492544 16.8994949,9.89949494 C16.8994949,11.0040644 16.0040644,11.8994949 14.8994949,11.8994949 L11.8994949,11.8994949 L11.8994949,14.8994949 C11.8994949,16.0040644 11.0040644,16.8994949 9.89949494,16.8994949 C8.79492544,16.8994949 7.89949494,16.0040644 7.89949494,14.8994949 L7.89949494,11.8994949 L4.89949494,11.8994949 C3.79492544,11.8994949 2.89949494,11.0040644 2.89949494,9.89949494 C2.89949494,8.79492544 3.79492544,7.89949494 4.89949494,7.89949494 L7.89949494,7.89949494 L7.89949494,4.89949494 C7.89949494,3.79492544 8.79492544,2.89949494 9.89949494,2.89949494 C11.0040644,2.89949494 11.8994949,3.79492544 11.8994949,4.89949494 L11.8994949,7.89949494 Z"
-                  id="Combined-Shape"
-                  transform="translate(9.899495, 9.899495) rotate(45.000000) translate(-9.899495, -9.899495) "
-                />
-              </g>
-            </g>
-          </g>
-        </g>
-      </svg>
-  }
-  module Button = {
-    @react.component
-    let make = (
-      ~location as {Location.secondaryColor: secondaryColor, primaryColor, text, id},
-      ~onClick,
-    ) =>
-      <button onClick={_ => onClick(id)} className="flex items-center py-1 location-button">
-        <Remove />
-        <span
-          style={ReactDOMRe.Style.make(~color=secondaryColor, ~backgroundColor=primaryColor, ())}
-          className="text-base font-bold ml-2 rounded p-1">
-          {React.string(text)}
-        </span>
-      </button>
-  }
-  @react.component
-  let make = (~allLocations, ~locations, ~setLocations) =>
-    <div>
-      <H2 text="Locations" />
-      {Belt.Array.mapU(locations, (. location) =>
-        <Button
-          key=location.Location.id
-          location
-          onClick={removedId =>
-            setLocations(locations => Js.Array.filter(id => id != removedId, locations))}
-        />
-      ) |> React.array}
-      <div className="pt-1">
-        <ReactSelect
-          value={Belt.Array.mapU(locations, (. {Location.text: text, id}) => {
-            ReactSelect.value: id,
-            label: text,
-          })}
-          components={"IndicatorSeparator": Js.null}
-          styles={
-            "control": base =>
-              Js.Obj.assign(
-                base,
-                {
-                  "color": Colors.colors["fggray"],
-                  "fontWeight": "regular",
-                  "flex": "1",
-                  "width": "130px",
-                  "minHeight": "29px",
-                  "height": "29px",
-                  "fontSize": "14px",
-                  "border": 0,
-                  "backgroundColor": Colors.colors["bggray"],
-                  "borderRadius": "4px",
-                },
-              ),
-            "option": base => Js.Obj.assign(base, {"fontSize": "14px"}),
-            "noOptionsMessage": base => Js.Obj.assign(base, {"fontSize": "14px"}),
-          }
-          controlShouldRenderValue=false
-          isMulti=true
-          name="Locations"
-          options=allLocations
-          placeholder="Add location"
-          isClearable=false
-          onChange={newSelection =>
-            switch Js.Nullable.toOption(newSelection) {
-            | Some(newSelection) =>
-              setLocations(_ =>
-                Belt.Array.mapU(newSelection, (. {ReactSelect.value: value}) => value)
-              )
-            | None => setLocations(_ => [])
-            }}
-          noOptionsMessage={() => Some(React.string("Unknown location"))}
-        />
-      </div>
-    </div>
-}
-
-module ThresholdInput = {
-  @react.component
-  let make = (~threshold as (threshold, setThreshold)) =>
-    <div>
-      <H2 text="Threshold (# of cases)" />
-      <div className="pt-1">
-        <Input
-          id="nr_of_cases"
-          value=Input.Number(threshold)
-          onBlur=ignore
-          onChange={ev => {
-            let value = ReactEvent.Form.target(ev)["value"] |> int_of_string_opt
-            setThreshold(_ => value)
-          }}
-          label="1"
-        />
-      </div>
-    </div>
-}
-
-module CalendarInput = {
-  module Button = {
-    @react.component
-    let make = React.forwardRef((
-      ~value: string="",
-      ~onClick: ReactEvent.Mouse.t => unit=ignore,
-      forwardedRef,
-    ) =>
-      <div className="p-1">
-        <button
-          ref=?{Belt.Option.map(Js.Nullable.toOption(forwardedRef), ReactDOMRe.Ref.domRef)}
-          className="bg-bggray text-base border-bggray border date-range-button"
-          onClick>
-          {React.string(Js.Date.fromString(value) |> Js.Date.toLocaleDateString)}
-        </button>
-      </div>
-    )
-  }
-  @react.component
-  let make = (~startDate as (startDate, setStartDate), ~endDate as (endDate, setEndDate), ~reset) =>
-    <div>
-      <div className="flex items-center">
-        <H2 text="Date range" />
-        {switch reset {
-        | Some(reset) =>
-          <button
-            onClick={_ => reset()} className="pt-3 hover:opacity-50 text-activeblue text-base pl-2">
-            {React.string("Reset")}
-          </button>
-        | None => React.null
-        }}
-      </div>
-      <div className="pt-1">
-        <DatePicker
-          selected=startDate
-          onChange={newDate => setStartDate(_ => newDate)}
-          customInput={<Button />}
-          selectsStart=true
-          startDate
-          endDate
-        />
-        <DatePicker
-          selected=endDate
-          onChange={newDate => setEndDate(_ => newDate)}
-          customInput={<Button />}
-          selectsEnd=true
-          startDate
-          endDate
-          minDate=startDate
-        />
-      </div>
-    </div>
-}
-
-type scale =
-  | Logarithmic
-  | Linear
-
-type timeline =
-  | RelativeToThreshold
-  | CalendarDates
-
-type chartType =
-  | Number(Data.dataType)
-  | PercentageGrowthOfCases
-  | TotalMortalityRate
-
-@react.component
-let make = (
-  ~locations,
-  ~allLocations,
-  ~setLocations,
-  ~scale as (scale, setScale),
-  ~timeline as (timeline, setTimeline),
-  ~chartType as (chartType, setChartType),
-  ~threshold,
-  ~startDate,
-  ~endDate,
-  ~resetDates,
-) =>
-  <div className="w-full md:w-64 p-4">
-    <H1 text=`Stay at home` />
-    <P
-      text=`Most important charts to help you understand the COVID-19 outlook for your location.`
-    />
-    <RadioSection
-      text=`Chart type`
-      values=[
-        Number(Data.Confirmed),
-        PercentageGrowthOfCases,
-        Number(Data.Deaths),
-        TotalMortalityRate,
-      ]
-      selectedValue=chartType
-      format={x =>
-        switch x {
-        | Number(Data.Confirmed) => "Number of cases"
-        | PercentageGrowthOfCases => "% growth of cases"
-        | Number(Data.Deaths) => "Number of fatalities"
-        | TotalMortalityRate => "Mortality rate"
-        }}
-      onChange={chartType => setChartType(_ => chartType)}
-    />
-    {switch chartType {
-    | Number(_) =>
-      <RadioSection
-        text=`Scale`
-        values=[Logarithmic, Linear]
-        selectedValue=scale
-        format={x =>
-          switch x {
-          | Logarithmic => "Logarithmic"
-          | Linear => "Linear"
-          }}
-        onChange={scale => setScale(_ => scale)}
-      />
-    | TotalMortalityRate
-    | PercentageGrowthOfCases => React.null
-    }}
-    <Locations setLocations allLocations locations />
-    <RadioSection
-      text=`Timeline`
-      values=[RelativeToThreshold, CalendarDates]
-      selectedValue=timeline
-      format={x =>
-        switch x {
-        | RelativeToThreshold => "Relative to threshold"
-        | CalendarDates => "Calendar dates"
-        }}
-      onChange={timeline => setTimeline(_ => timeline)}
-    />
-    {switch timeline {
-    | RelativeToThreshold => <ThresholdInput threshold />
-    | CalendarDates => <CalendarInput reset=resetDates startDate endDate />
-    }}
-    <Footer />
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Index.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Index.res
deleted file mode 100644
index bbf7893..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Index.res
+++ /dev/null
@@ -1,157 +0,0 @@
-module App = {
-  let useLocations = (~default) => {
-    let (colors, setColors) = React.useState(() => ColorStack.make(~locations=default))
-
-    let (locations, setLocations) = UseQueryParam.hook(
-      () => default,
-      ~queryFragment="loc",
-      ~coder=SerializeQueryParam.stringArray,
-    )
-    (
-      Belt.Array.mapU(locations, (. locationId) => {
-        let (primaryColor, secondaryColor) = ColorStack.getColor(~location=locationId, colors)
-        {
-          Location.primaryColor: primaryColor,
-          secondaryColor: secondaryColor,
-          text: Data.Map.get(Data.locations, locationId).name,
-          id: locationId,
-        }
-      }),
-      updater => {
-        setColors(colorStack => ColorStack.updateColors(~locations=updater(locations), colorStack))
-        setLocations(updater)
-      },
-    )
-  }
-
-  let useStringQueryParamState = (initial, ~queryFragment, ~encode, ~decode) =>
-    UseQueryParam.hook(
-      initial,
-      ~queryFragment,
-      ~coder={
-        encode: x => SerializeQueryParam.string.encode(encode(x)),
-        decode: x => SerializeQueryParam.string.decode(x) |> Js.Option.andThen((. x) => decode(x)),
-      },
-    )
-
-  @react.component
-  let make = () => {
-    let (locations, setLocations) = useLocations(
-      ~default=[
-        "Italy",
-        "Poland",
-        "Spain",
-        "Germany",
-        "Canada (All regions)",
-        "US",
-        "China (All regions)",
-      ],
-    )
-    let scale = useStringQueryParamState(
-      () => Filters.Logarithmic,
-      ~queryFragment="scale",
-      ~encode=x =>
-        switch x {
-        | Logarithmic => "log"
-        | Linear => "linear"
-        },
-      ~decode=x =>
-        switch x {
-        | "log" => Some(Filters.Logarithmic)
-        | "linear" => Some(Linear)
-        | _ => None
-        },
-    )
-
-    let timeline = useStringQueryParamState(
-      () => Filters.RelativeToThreshold,
-      ~queryFragment="timeline",
-      ~encode=x =>
-        switch x {
-        | RelativeToThreshold => "relative"
-        | CalendarDates => "calendar"
-        },
-      ~decode=x =>
-        switch x {
-        | "relative" => Some(Filters.RelativeToThreshold)
-        | "calendar" => Some(CalendarDates)
-        | _ => None
-        },
-    )
-    let chartType = useStringQueryParamState(
-      () => Filters.Number(Data.Confirmed),
-      ~queryFragment="chart",
-      ~encode=x =>
-        switch x {
-        | Number(Data.Confirmed) => "cases_count"
-        | Number(Data.Deaths) => "deaths_count"
-        | PercentageGrowthOfCases => "percentage_growth_cases"
-        | TotalMortalityRate => "total_mortality_rate"
-        },
-      ~decode=x =>
-        switch x {
-        | "cases_count" => Some(Number(Data.Confirmed))
-        | "deaths_count" => Some(Number(Data.Deaths))
-        | "percentage_growth_cases" => Some(Filters.PercentageGrowthOfCases)
-        | "total_mortality_rate" => Some(Filters.TotalMortalityRate)
-        | _ => None
-        },
-    )
-    let threshold = UseQueryParam.hook(
-      () => Some(17),
-      ~queryFragment="threshold",
-      ~coder={
-        encode: x => Belt.Option.getWithDefault(x, 1) |> SerializeQueryParam.int.encode,
-        decode: x => SerializeQueryParam.int.decode(x) |> Js.Option.map((. x) => Some(x)),
-      },
-    )
-    let startDate = UseQueryParam.hook(
-      () => Data.startDate,
-      ~queryFragment="since",
-      ~coder=SerializeQueryParam.date,
-    )
-    let endDate = UseQueryParam.hook(
-      () => Data.endDate,
-      ~queryFragment="until",
-      ~coder=SerializeQueryParam.date,
-    )
-    let resetDates = if Data.isInitialRange(startDate |> fst, endDate |> fst) {
-      None
-    } else {
-      Some(
-        () => {
-          let setStart = startDate |> snd
-          let setEnd = endDate |> snd
-          setStart(_ => Data.startDate)
-          setEnd(_ => Data.endDate)
-        },
-      )
-    }
-    let thresholdOr1 = Belt.Option.getWithDefault(threshold |> fst, 1)
-    <div className="flex bg-white flex-col-reverse md:flex-row">
-      <Filters
-        startDate
-        endDate
-        locations
-        setLocations
-        allLocations=Data.allLocations
-        scale
-        timeline
-        threshold
-        chartType
-        resetDates
-      />
-      <Chart
-        chartType={chartType |> fst}
-        threshold=thresholdOr1
-        timeline={timeline |> fst}
-        locations
-        scale={scale |> fst}
-        startDate={startDate |> fst}
-        endDate={endDate |> fst}
-      />
-    </div>
-  }
-}
-
-ReactDOMRe.renderToElementWithId(<App />, "index")
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Location.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Location.res
deleted file mode 100644
index 16a8d5d..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Location.res
+++ /dev/null
@@ -1,6 +0,0 @@
-type t = {
-  primaryColor: string,
-  secondaryColor: string,
-  text: string,
-  id: Data.countryId,
-}
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/ReactSelect.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/ReactSelect.res
deleted file mode 100644
index faace74..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/ReactSelect.res
+++ /dev/null
@@ -1,24 +0,0 @@
-type selectOption<'a> = {
-  value: 'a,
-  label: string,
-}
-
-@module("react-select") @react.component
-external make: (
-  ~components: _=?,
-  ~styles: {..}=?,
-  ~controlShouldRenderValue: bool=?,
-  ~value: array<selectOption<'a>>=?,
-  ~isMulti: bool=?,
-  ~name: string=?,
-  ~options: array<selectOption<'a>>,
-  ~className: string=?,
-  ~classNamePrefix: string=?,
-  ~menuIsOpen: bool=?,
-  ~maxMenuHeight: int=?,
-  ~maxHeight: int=?,
-  ~placeholder: string=?,
-  ~isClearable: bool=?,
-  ~onChange: Js.Nullable.t<array<selectOption<'a>>> => unit=?,
-  ~noOptionsMessage: unit => option<React.element>,
-) => React.element = "default"
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Recharts.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Recharts.res
deleted file mode 100644
index cfb78a6..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Recharts.res
+++ /dev/null
@@ -1,146 +0,0 @@
-module PctOrPx = {
-  type t
-  external px: float => t = "%identity"
-  external pct: string => t = "%identity"
-  let pct = float => pct(Js.Float.toString(float) ++ "%")
-}
-
-let px = PctOrPx.px
-let pct = PctOrPx.pct
-
-module Dot = {
-  type t
-
-  external bool: bool => t = "%identity"
-  external element: React.element => t = "%identity"
-  external obj: _ => t = "%identity"
-  external render: (_ => React.element) => t = "%identity"
-}
-
-module Make = (
-  Config: {
-    type dataItem
-  },
-) => {
-  module ResponsiveContainer = {
-    @module("recharts") @react.component
-    external make: (
-      ~minHeight: float=?,
-      ~height: PctOrPx.t=?,
-      ~width: PctOrPx.t=?,
-      ~children: React.element=?,
-    ) => React.element = "ResponsiveContainer"
-  }
-  module LineChart = {
-    @module("recharts") @react.component
-    external make: (
-      ~margin: _=?,
-      ~data: array<Config.dataItem>=?,
-      ~children: React.element=?,
-    ) => React.element = "LineChart"
-  }
-  module Line = {
-    type yValue
-    external int: int => yValue = "%identity"
-    external float: float => yValue = "%identity"
-    external toInt: yValue => int = "%identity"
-    external toFloat: yValue => float = "%identity"
-    @module("recharts") @react.component
-    external make: (
-      ~_type: @string
-      [
-        | #basis
-        | #basisClosed
-        | #basisOpen
-        | #linear
-        | #linearClosed
-        | #natural
-        | #monotoneX
-        | #monotoneY
-        | #monotone
-        | #step
-        | #stepBefore
-        | #stepAfter
-      ]=?,
-      ~dataKey: Config.dataItem => Js.null<yValue>,
-      ~stroke: string=?,
-      ~strokeWidth: float=?,
-      ~strokeDasharray: string=?,
-      ~children: React.element=?,
-      ~dot: Dot.t=?,
-      ~activeDot: Dot.t=?,
-      ~label: string=?,
-      ~name: string=?,
-      ~connectNulls: bool=?,
-    ) => React.element = "Line"
-  }
-  module XAxis = {
-    type value
-    external int: int => value = "%identity"
-    external float: float => value = "%identity"
-    external string: string => value = "%identity"
-
-    type label
-    external obj: _ => label = "%identity"
-    external bool: bool => label = "%identity"
-
-    @module("recharts") @react.component
-    external make: (
-      ~_type: @string [#number | #category]=?,
-      ~padding: _=?,
-      ~dataKey: Config.dataItem => value,
-      ~axisLine: bool=?,
-      ~tickLine: bool=?,
-      ~interval: string=?,
-      ~minTickGap: float=?,
-      ~label: label=?,
-      ~tick: bool=?,
-      ~children: React.element=?,
-    ) => React.element = "XAxis"
-  }
-  module YAxis = {
-    type domain
-    external int: int => domain = "%identity"
-    external string: string => domain = "%identity"
-    @module("recharts") @react.component
-    external make: (
-      ~_type: @string [#number]=?,
-      ~scale: @string [#log | #linear]=?,
-      ~domain: (domain, domain)=?,
-      ~axisLine: bool=?,
-      ~tickLine: bool=?,
-      ~tick: bool=?,
-      ~tickFormatter: Line.yValue => string=?,
-    ) => React.element = "YAxis"
-  }
-  module Tooltip = {
-    type payload = {
-      stroke: string,
-      name: string,
-      value: Line.yValue,
-      dataKey: string,
-      payload: Config.dataItem,
-    }
-
-    type data = {
-      payload: Js.null<array<payload>>,
-      label: string,
-      separator: string,
-    }
-    @module("recharts") @react.component
-    external make: (~content: data => React.element=?) => React.element = "Tooltip"
-  }
-  module CartesianGrid = {
-    @module("recharts") @react.component
-    external make: (~strokeDasharray: string=?) => React.element = "CartesianGrid"
-  }
-  module Label = {
-    @module("recharts") @react.component
-    external make: (
-      ~style: _=?,
-      ~value: string=?,
-      ~position: string=?,
-      ~offset: float=?,
-    ) => React.element = "Label"
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/SerializeQueryParam.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/SerializeQueryParam.res
deleted file mode 100644
index 3686070..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/SerializeQueryParam.res
+++ /dev/null
@@ -1,31 +0,0 @@
-type encoded
-type coder<'a> = {
-  encode: 'a => option<encoded>,
-  decode: encoded => option<'a>,
-}
-
-@module("serialize-query-params") @val
-external float: coder<float> = "NumberParam"
-@module("serialize-query-params") @val
-external int: coder<int> = "NumberParam"
-@module("serialize-query-params") @val
-external string: coder<string> = "StringParam"
-@module("serialize-query-params") @val
-external stringArray: coder<array<string>> = "ArrayParam"
-@module("serialize-query-params") @val
-external date: coder<Js.Date.t> = "DateParam"
-
-type locationFragments = {
-  protocol: string,
-  host: string,
-  pathname: string,
-  search: string,
-  state: Window.locationState,
-}
-
-@module("serialize-query-params")
-external updateInLocation: (Js.Dict.t<option<encoded>>, Window.location) => locationFragments =
-  "updateInLocation"
-
-@module("serialize-query-params")
-external parse: string => Js.Dict.t<encoded> = "parse"
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/UseQueryParam.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/UseQueryParam.res
deleted file mode 100644
index dadfa1e..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/UseQueryParam.res
+++ /dev/null
@@ -1,38 +0,0 @@
-let hook = (makeInitial, ~queryFragment, ~coder) => {
-  let isInitialRender = React.useRef(true)
-  let (value, setValue) = React.useState(makeInitial)
-  React.useEffect1(() =>
-    if React.Ref.current(isInitialRender) {
-      let pathname = SerializeQueryParam.parse(Window.window.location.search)
-
-      {
-        open Belt.Option
-        forEach(
-          flatMap(Js.Dict.get(pathname, queryFragment), coder.SerializeQueryParam.decode),
-          x => setValue(_ => x),
-        )
-      }
-
-      React.Ref.setCurrent(isInitialRender, false)
-      None
-    } else {
-      let obj = Js.Dict.empty()
-      Js.Dict.set(obj, queryFragment, coder.encode(value))
-      let {
-        SerializeQueryParam.protocol: protocol,
-        host,
-        pathname,
-        search,
-        state,
-      } = SerializeQueryParam.updateInLocation(obj, Window.window.location)
-
-      {
-        open Window
-        window.history.replaceState(. state, "", j`$protocol//$host$pathname$search`)
-      }
-
-      None
-    }
-  , [value])
-  (value, setValue)
-}
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Victory.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Victory.res
deleted file mode 100644
index 69c1eea..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Victory.res
+++ /dev/null
@@ -1,119 +0,0 @@
-module Chart = {
-  type scale = {
-    x: string,
-    y: string,
-  }
-  @module("victory") @react.component
-  external make: (
-    ~animate: bool=?,
-    ~width: float=?,
-    ~height: float=?,
-    ~children: React.element,
-    ~scale: scale,
-    ~groupComponent: React.element=?,
-    ~containerComponent: React.element=?,
-    ~height: float=?,
-  ) => React.element = "VictoryChart"
-}
-
-module Label = {
-  type origin = {
-    x: float,
-    y: float,
-  }
-  type props<'a> = {
-    datum: 'a,
-    index: int,
-    y: float,
-    x: float,
-    origin: origin,
-  }
-  @module("victory") @react.component
-  external make: (
-    ~labelPlacement: string=?,
-    ~angle: float=?,
-    ~dx: float=?,
-    ~dy: float=?,
-    ~className: string=?,
-  ) => React.element = "VictoryLabel"
-}
-
-module Line = {
-  @unboxed
-  type xValue<'a> = XValue('a)
-
-  let ofInt = (x: int) => XValue(x)
-  let ofDate = (x: Js.Date.t) => XValue(x)
-  let ofString = (x: string) => XValue(x)
-
-  @module("victory") @react.component
-  external make: (
-    ~name: string=?,
-    ~data: array<'a>,
-    ~x: 'a => xValue<'b>=?,
-    ~y: 'a => int=?,
-    ~labels: Label.props<'a> => string=?,
-    ~interpolation: string=?,
-    ~style: _=?,
-    ~labelComponent: React.element=?,
-  ) => React.element = "VictoryLine"
-}
-
-module Axis = {
-  type tick
-  external tickToDate: tick => Js.Date.t = "%identity"
-  external tickToInt: tick => int = "%identity"
-  @module("victory") @react.component
-  external make: (
-    ~fixLabelOverlap: bool=?,
-    ~dependentAxis: bool=?,
-    ~tickFormat: (tick, int) => string=?,
-    ~label: string=?,
-    ~padding: float=?,
-    ~tickLabelComponent: React.element=?,
-    ~style: _=?,
-  ) => React.element = "VictoryAxis"
-}
-
-module Stack = {
-  @module("victory") @react.component
-  external make: (~children: React.element) => React.element = "VictoryStack"
-}
-
-module Scatter = {
-  type info<'a> = {
-    datum: 'a,
-    active: bool,
-  }
-
-  @module("victory") @react.component
-  external make: (
-    ~name: string=?,
-    ~style: _=?,
-    ~data: array<'a>,
-    ~x: 'a => Line.xValue<'b>=?,
-    ~y: 'a => int=?,
-    ~size: info<'a> => float=?,
-  ) => React.element = "VictoryScatter"
-}
-
-module ClipContainer = {
-  type padding = {
-    top: float,
-    right: float,
-    bottom: float,
-    left: float,
-  }
-  @module("victory") @react.component
-  external make: (~clipPadding: padding) => React.element = "VictoryClipContainer"
-}
-
-module VoronoiContainer = {
-  @module("victory") @react.component
-  external make: (
-    ~mouseFollowTooltips: bool=?,
-    ~voronoiDimension: string=?,
-    ~labels: Label.props<'a> => string=?,
-    ~voronoiBlacklist: array<string>=?,
-  ) => React.element = "VictoryVoronoiContainer"
-}
diff --git a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Window.res b/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Window.res
deleted file mode 100644
index 7ed9bca..0000000
--- a/jscomp/syntax/tests/idempotency/covid-19charts.com/src/Window.res
+++ /dev/null
@@ -1,15 +0,0 @@
-type location = {
-  search: string,
-  href: string,
-}
-type locationState
-
-type history = {replaceState: (. locationState, string, string) => unit}
-
-type rec window = {
-  history: history,
-  location: location,
-  mutable global: window,
-}
-
-@val external window: window = "window"
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Annotation.res b/jscomp/syntax/tests/idempotency/genType/src/Annotation.res
deleted file mode 100644
index bc8b83c..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Annotation.res
+++ /dev/null
@@ -1,229 +0,0 @@
-type \"import" = {
-  name: string,
-  importPath: ImportPath.t,
-}
-
-type rec attributePayload =
-  | BoolPayload(bool)
-  | FloatPayload(string)
-  | IdentPayload(Longident.t)
-  | IntPayload(string)
-  | StringPayload(string)
-  | TuplePayload(list<attributePayload>)
-  | UnrecognizedPayload
-
-type t =
-  | GenType
-  | GenTypeOpaque
-  | NoGenType
-
-let toString = annotation =>
-  switch annotation {
-  | GenType => "GenType"
-  | GenTypeOpaque => "GenTypeOpaque"
-  | NoGenType => "NoGenType"
-  }
-
-let tagIsGenType = s => s == "genType" || s == "gentype"
-let tagIsGenTypeAs = s => s == "genType.as" || s == "gentype.as"
-
-let tagIsBsAs = s => s == "bs.as"
-
-let tagIsUnboxed = s => s == "unboxed" || s == "ocaml.unboxed"
-
-let tagIsGenTypeImport = s => s == "genType.import" || s == "gentype.import"
-
-let tagIsGenTypeOpaque = s => s == "genType.opaque" || s == "gentype.opaque"
-
-let tagIsOneOfTheGenTypeAnnotations = s =>
-  tagIsGenType(s) || (tagIsGenTypeImport(s) || tagIsGenTypeOpaque(s))
-
-let tagIsGenTypeIgnoreInterface = s =>
-  s == "genType.ignoreInterface" || s == "gentype.ignoreInterface"
-
-let tagIsOcamlDoc = s => s == "ocaml.doc"
-
-let tagIsInternLocal = s => s == "internal.local"
-
-let rec getAttributePayload = (checkText, attributes: Typedtree.attributes) => {
-  let rec fromExpr = (expr: Parsetree.expression) =>
-    switch expr {
-    | {pexp_desc: Pexp_constant(Pconst_string(s, _))} => Some(StringPayload(s))
-    | {pexp_desc: Pexp_constant(Pconst_integer(n, _))} => Some(IntPayload(n))
-    | {pexp_desc: Pexp_constant(Pconst_float(s, _))} => Some(FloatPayload(s))
-    | {pexp_desc: Pexp_construct({txt: Lident(("true" | "false") as s)}, _), _} =>
-      Some(BoolPayload(s == "true"))
-    | {pexp_desc: Pexp_tuple(exprs)} =>
-      let payloads = exprs |> List.rev |> List.fold_left((payloads, expr) =>
-          switch expr |> fromExpr {
-          | Some(payload) => list{payload, ...payloads}
-          | None => payloads
-          }
-        , list{})
-      Some(TuplePayload(payloads))
-    | {pexp_desc: Pexp_ident({txt})} => Some(IdentPayload(txt))
-    | _ => None
-    }
-  switch attributes {
-  | list{} => None
-  | list{({Asttypes.txt: txt}, payload), ..._tl} if checkText(txt) =>
-    switch payload {
-    | PStr(list{}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_eval(expr, _)}, ..._}) => expr |> fromExpr
-    | PStr(list{{pstr_desc: Pstr_extension(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_value(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_primitive(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_type(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_typext(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_exception(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_module(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_recmodule(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_modtype(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_open(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_class(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_class_type(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_include(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PStr(list{{pstr_desc: Pstr_attribute(_)}, ..._}) => Some(UnrecognizedPayload)
-    | PPat(_) => Some(UnrecognizedPayload)
-    | PSig(_) => Some(UnrecognizedPayload)
-    | PTyp(_) => Some(UnrecognizedPayload)
-    }
-  | list{_hd, ...tl} => getAttributePayload(checkText, tl)
-  }
-}
-
-let getGenTypeAsRenaming = attributes =>
-  switch attributes |> getAttributePayload(tagIsGenTypeAs) {
-  | Some(StringPayload(s)) => Some(s)
-  | None =>
-    switch attributes |> getAttributePayload(tagIsGenType) {
-    | Some(StringPayload(s)) => Some(s)
-    | _ => None
-    }
-  | _ => None
-  }
-
-let getBsAsRenaming = attributes =>
-  switch attributes |> getAttributePayload(tagIsBsAs) {
-  | Some(StringPayload(s)) => Some(s)
-  | _ => None
-  }
-
-let getAttributeImportRenaming = attributes => {
-  let attributeImport = attributes |> getAttributePayload(tagIsGenTypeImport)
-  let genTypeAsRenaming = attributes |> getGenTypeAsRenaming
-  switch (attributeImport, genTypeAsRenaming) {
-  | (Some(StringPayload(importString)), _) => (Some(importString), genTypeAsRenaming)
-  | (Some(TuplePayload(list{StringPayload(importString), StringPayload(renameString)})), _) => (
-      Some(importString),
-      Some(renameString),
-    )
-  | _ => (None, genTypeAsRenaming)
-  }
-}
-
-let getDocString = attributes => {
-  let docPayload = attributes |> getAttributePayload(tagIsOcamlDoc)
-  switch docPayload {
-  | Some(StringPayload(docString)) => "/** " ++ (docString ++ " */\n")
-  | _ => ""
-  }
-}
-
-let hasAttribute = (checkText, attributes: Typedtree.attributes) =>
-  getAttributePayload(checkText, attributes) != None
-
-let fromAttributes = (attributes: Typedtree.attributes) =>
-  if hasAttribute(tagIsGenType, attributes) {
-    GenType
-  } else if hasAttribute(tagIsGenTypeOpaque, attributes) {
-    GenTypeOpaque
-  } else {
-    NoGenType
-  }
-
-let rec moduleTypeCheckAnnotation = (~checkAnnotation, {mty_desc}: Typedtree.module_type) =>
-  switch mty_desc {
-  | Tmty_signature(signature) => signature |> signatureCheckAnnotation(~checkAnnotation)
-  | Tmty_ident(_)
-  | Tmty_functor(_)
-  | Tmty_with(_)
-  | Tmty_typeof(_)
-  | Tmty_alias(_) => false
-  }
-and moduleDeclarationCheckAnnotation = (
-  ~checkAnnotation,
-  {md_attributes, md_type, md_loc: loc}: Typedtree.module_declaration,
-) =>
-  md_attributes |> checkAnnotation(~loc) || md_type |> moduleTypeCheckAnnotation(~checkAnnotation)
-and signatureItemCheckAnnotation = (~checkAnnotation, signatureItem: Typedtree.signature_item) =>
-  switch signatureItem {
-  | {Typedtree.sig_desc: Typedtree.Tsig_type(_, typeDeclarations)} =>
-    typeDeclarations |> List.exists(({typ_attributes, typ_loc: loc}: Typedtree.type_declaration) =>
-      typ_attributes |> checkAnnotation(~loc)
-    )
-  | {sig_desc: Tsig_value({val_attributes, val_loc: loc})} =>
-    val_attributes |> checkAnnotation(~loc)
-  | {sig_desc: Tsig_module(moduleDeclaration)} =>
-    moduleDeclaration |> moduleDeclarationCheckAnnotation(~checkAnnotation)
-  | {sig_desc: Tsig_attribute(attribute), sig_loc: loc} => list{attribute} |> checkAnnotation(~loc)
-  | _ => false
-  }
-and signatureCheckAnnotation = (~checkAnnotation, signature: Typedtree.signature) =>
-  signature.sig_items |> List.exists(signatureItemCheckAnnotation(~checkAnnotation))
-
-let rec structureItemCheckAnnotation = (
-  ~checkAnnotation,
-  structureItem: Typedtree.structure_item,
-) =>
-  switch structureItem {
-  | {Typedtree.str_desc: Typedtree.Tstr_type(_, typeDeclarations)} =>
-    typeDeclarations |> List.exists(({typ_attributes, typ_loc: loc}: Typedtree.type_declaration) =>
-      typ_attributes |> checkAnnotation(~loc)
-    )
-  | {str_desc: Tstr_value(_loc, valueBindings)} =>
-    valueBindings |> List.exists(({vb_attributes, vb_loc: loc}: Typedtree.value_binding) =>
-      vb_attributes |> checkAnnotation(~loc)
-    )
-  | {str_desc: Tstr_primitive({val_attributes, val_loc: loc})} =>
-    val_attributes |> checkAnnotation(~loc)
-  | {str_desc: Tstr_module(moduleBinding)} =>
-    moduleBinding |> moduleBindingCheckAnnotation(~checkAnnotation)
-  | {str_desc: Tstr_recmodule(moduleBindings)} =>
-    moduleBindings |> List.exists(moduleBindingCheckAnnotation(~checkAnnotation))
-  | {str_desc: Tstr_include({incl_attributes, incl_mod, incl_loc: loc})} =>
-    incl_attributes |> checkAnnotation(~loc) ||
-      incl_mod |> moduleExprCheckAnnotation(~checkAnnotation)
-  | _ => false
-  }
-and moduleExprCheckAnnotation = (~checkAnnotation, moduleExpr: Typedtree.module_expr) =>
-  switch moduleExpr.mod_desc {
-  | Tmod_structure(structure)
-  | Tmod_constraint({mod_desc: Tmod_structure(structure)}, _, _, _) =>
-    structure |> structureCheckAnnotation(~checkAnnotation)
-  | Tmod_constraint(_)
-  | Tmod_ident(_)
-  | Tmod_functor(_)
-  | Tmod_apply(_)
-  | Tmod_unpack(_) => false
-  }
-and moduleBindingCheckAnnotation = (
-  ~checkAnnotation,
-  {mb_expr, mb_attributes, mb_loc: loc}: Typedtree.module_binding,
-) =>
-  mb_attributes |> checkAnnotation(~loc) || mb_expr |> moduleExprCheckAnnotation(~checkAnnotation)
-and structureCheckAnnotation = (~checkAnnotation, structure: Typedtree.structure) =>
-  structure.str_items |> List.exists(structureItemCheckAnnotation(~checkAnnotation))
-
-let sanitizeVariableName = name => name |> Str.global_replace(Str.regexp("-"), "_")
-
-let importFromString = (importString): \"import" => {
-  let name = {
-    let base = importString |> Filename.basename
-    try base |> Filename.chop_extension catch {
-    | Invalid_argument(_) => base
-    } |> sanitizeVariableName
-  }
-  let importPath = ImportPath.fromStringUnsafe(importString)
-  {name: name, importPath: importPath}
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Arnold.res b/jscomp/syntax/tests/idempotency/genType/src/Arnold.res
deleted file mode 100644
index a6df037..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Arnold.res
+++ /dev/null
@@ -1,1474 +0,0 @@
-let verbose = DeadCommon.verbose
-
-let printPos = (ppf, pos: Lexing.position) => {
-  let file = pos.Lexing.pos_fname
-  let line = pos.Lexing.pos_lnum
-  Format.fprintf(ppf, "@{<filename>%s@} @{<dim>%i@}", file |> Filename.basename, line)
-}
-
-module StringSet = Set.Make(String)
-
-// Type Definitions
-
-module FunctionName = {
-  type t = string
-}
-
-module FunctionArgs = {
-  type arg = {
-    label: string,
-    functionName: FunctionName.t,
-  }
-
-  type t = list<arg>
-
-  let empty = list{}
-
-  let argToString = ({label, functionName}) => label ++ (":" ++ functionName)
-
-  let toString = functionArgs =>
-    functionArgs == list{}
-      ? ""
-      : "<" ++ ((functionArgs |> List.map(argToString) |> String.concat(",")) ++ ">")
-
-  let find = (t: t, ~label) =>
-    switch t |> List.find_opt(arg => arg.label == label) {
-    | Some({functionName}) => Some(functionName)
-    | None => None
-    }
-
-  let compareArg = (a1, a2) => {
-    let n = compare(a1.label, a2.label)
-    if n != 0 {
-      n
-    } else {
-      compare(a1.functionName, a2.functionName)
-    }
-  }
-
-  let rec compare = (l1, l2) =>
-    switch (l1, l2) {
-    | (list{}, list{}) => 0
-    | (list{}, list{_, ..._}) => -1
-    | (list{_, ..._}, list{}) => 1
-    | (list{x1, ...l1}, list{x2, ...l2}) =>
-      let n = compareArg(x1, x2)
-      if n != 0 {
-        n
-      } else {
-        compare(l1, l2)
-      }
-    }
-}
-
-module FunctionCall = {
-  type t = {
-    functionName: FunctionName.t,
-    functionArgs: FunctionArgs.t,
-  }
-
-  let substituteName = (~sub, name) =>
-    switch sub |> FunctionArgs.find(~label=name) {
-    | Some(functionName) => functionName
-    | None => name
-    }
-
-  let applySubstitution = (~sub: FunctionArgs.t, t: t) =>
-    if sub == list{} {
-      t
-    } else {
-      {
-        functionName: t.functionName |> substituteName(~sub),
-        functionArgs: t.functionArgs |> List.map((arg: FunctionArgs.arg) => {
-          ...arg,
-          functionName: arg.functionName |> substituteName(~sub),
-        }),
-      }
-    }
-
-  let noArgs = functionName => {functionName: functionName, functionArgs: list{}}
-
-  let toString = ({functionName, functionArgs}) =>
-    functionName ++ FunctionArgs.toString(functionArgs)
-
-  let compare = (x1: t, x2) => {
-    let n = compare(x1.functionName, x2.functionName)
-    if n != 0 {
-      n
-    } else {
-      FunctionArgs.compare(x1.functionArgs, x2.functionArgs)
-    }
-  }
-}
-
-module FunctionCallSet = Set.Make(FunctionCall)
-
-module Stats = {
-  let nCacheChecks = ref(0)
-  let nCacheHits = ref(0)
-  let nFiles = ref(0)
-  let nFunctions = ref(0)
-  let nHygieneErrors = ref(0)
-  let nInfiniteLoops = ref(0)
-  let nRecursiveBlocks = ref(0)
-
-  let print = (ppf, ()) => {
-    Format.fprintf(ppf, "@[<v 2>@,@{<warning>Termination Analysis Stats@}@,")
-    Format.fprintf(ppf, "Files:@{<dim>%d@}@,", nFiles.contents)
-    Format.fprintf(ppf, "Recursive Blocks:@{<dim>%d@}@,", nRecursiveBlocks.contents)
-    Format.fprintf(ppf, "Functions:@{<dim>%d@}@,", nFunctions.contents)
-    Format.fprintf(ppf, "Infinite Loops:@{<dim>%d@}@,", nInfiniteLoops.contents)
-    Format.fprintf(ppf, "Hygiene Errors:@{<dim>%d@}@,", nHygieneErrors.contents)
-    Format.fprintf(
-      ppf,
-      "Cache Hits:@{<dim>%d@}/@{<dim>%d@}@,",
-      nCacheHits.contents,
-      nCacheChecks.contents,
-    )
-    Format.fprintf(ppf, "@]")
-  }
-
-  let dump = () => Format.fprintf(Format.std_formatter, "%a@.", print, ())
-
-  let newFile = () => incr(nFiles)
-
-  let newRecursiveFunctions = (~numFunctions) => {
-    incr(nRecursiveBlocks)
-    nFunctions := nFunctions.contents + numFunctions
-  }
-
-  let logLoop = () => incr(nInfiniteLoops)
-
-  let logCache = (~functionCall, ~hit, ~loc) => {
-    incr(nCacheChecks)
-    if hit {
-      incr(nCacheHits)
-    }
-    if verbose {
-      Log_.info(~loc, ~name="Termination Analysis", (ppf, ()) =>
-        Format.fprintf(
-          ppf,
-          "Cache %s for @{<info>%s@}",
-          hit ? "hit" : "miss",
-          FunctionCall.toString(functionCall),
-        )
-      )
-    }
-  }
-
-  let logResult = (~functionCall, ~loc, ~resString) =>
-    if verbose {
-      Log_.info(~loc, ~name="Termination Analysis", (ppf, ()) =>
-        Format.fprintf(
-          ppf,
-          "@{<info>%s@} returns %s",
-          FunctionCall.toString(functionCall),
-          resString,
-        )
-      )
-    }
-
-  let logHygieneParametric = (~functionName, ~loc) => {
-    incr(nHygieneErrors)
-    Log_.error(~loc, ~name="Error Hygiene", (ppf, ()) =>
-      Format.fprintf(
-        ppf,
-        "@{<error>%s@} cannot be analyzed directly as it is parametric",
-        functionName,
-      )
-    )
-  }
-
-  let logHygieneOnlyCallDirectly = (~path, ~loc) => {
-    incr(nHygieneErrors)
-    Log_.error(~loc, ~name="Error Hygiene", (ppf, ()) =>
-      Format.fprintf(
-        ppf,
-        "@{<error>%s@} can only be called directly, or passed as labeled argument",
-        Path.name(path),
-      )
-    )
-  }
-
-  let logHygieneMustHaveNamedArgument = (~label, ~loc) => {
-    incr(nHygieneErrors)
-    Log_.error(~loc, ~name="Error Hygiene", (ppf, ()) =>
-      Format.fprintf(ppf, "Call must have named argument @{<error>%s@}", label)
-    )
-  }
-
-  let logHygieneNamedArgValue = (~label, ~loc) => {
-    incr(nHygieneErrors)
-    Log_.error(~loc, ~name="Error Hygiene", (ppf, ()) =>
-      Format.fprintf(ppf, "Named argument @{<error>%s@} must be passed a recursive function", label)
-    )
-  }
-
-  let logHygieneNoNestedLetRec = (~loc) => {
-    incr(nHygieneErrors)
-    Log_.error(~loc, ~name="Error Hygiene", (ppf, ()) =>
-      Format.fprintf(ppf, "Nested multiple let rec not supported yet")
-    )
-  }
-}
-
-module Progress = {
-  type t =
-    | Progress
-    | NoProgress
-
-  let toString = progress => progress == Progress ? "Progress" : "NoProgress"
-}
-
-module Call = {
-  type progressFunction = Path.t
-  type t =
-    | FunctionCall(FunctionCall.t)
-    | ProgressFunction(progressFunction)
-
-  let toString = call =>
-    switch call {
-    | ProgressFunction(progressFunction) => "+" ++ Path.name(progressFunction)
-    | FunctionCall(functionCall) => FunctionCall.toString(functionCall)
-    }
-}
-
-module Trace = {
-  type retOption =
-    | Rsome
-    | Rnone
-
-  type rec t =
-    | Tcall(Call.t, Progress.t)
-    | Tnondet(list<t>)
-    | Toption(retOption)
-    | Tseq(list<t>)
-
-  let empty = Tseq(list{})
-
-  let nd = (t1: t, t2: t): t =>
-    switch (t1, t2) {
-    | (Tnondet(l1), Tnondet(l2)) => Tnondet(\"@"(l1, l2))
-    | (_, Tnondet(l2)) => Tnondet(list{t1, ...l2})
-    | (Tnondet(l1), _) => Tnondet(\"@"(l1, list{t2}))
-    | _ => Tnondet(list{t1, t2})
-    }
-
-  let seq = (t1: t, t2: t): t =>
-    switch (t1, t2) {
-    | (Tseq(l1), Tseq(l2)) => Tseq(\"@"(l1, l2))
-    | (_, Tseq(l2)) => Tseq(list{t1, ...l2})
-    | (Tseq(l1), _) => Tseq(\"@"(l1, list{t2}))
-    | _ => Tseq(list{t1, t2})
-    }
-
-  let some = Toption(Rsome)
-  let none = Toption(Rnone)
-
-  let retOptionToString = r => r == Rsome ? "Some" : "None"
-
-  let rec toString = trace =>
-    switch trace {
-    | Tcall(ProgressFunction(progressFunction), progress) =>
-      Path.name(progressFunction) ++ (":" ++ Progress.toString(progress))
-    | Tcall(FunctionCall(functionCall), progress) =>
-      FunctionCall.toString(functionCall) ++ (":" ++ Progress.toString(progress))
-    | Tnondet(traces) => "[" ++ ((traces |> List.map(toString) |> String.concat(" || ")) ++ "]")
-    | Toption(retOption) => retOption |> retOptionToString
-    | Tseq(traces) =>
-      let tracesNotEmpty = traces |> List.filter(\"<>"(empty))
-      switch tracesNotEmpty {
-      | list{} => "_"
-      | list{t} => t |> toString
-      | list{_, ..._} => tracesNotEmpty |> List.map(toString) |> String.concat("; ")
-      }
-    }
-}
-
-module Values: {
-  type t
-  let getNone: t => option<Progress.t>
-  let getSome: t => option<Progress.t>
-  let nd: (t, t) => t
-  let none: (~progress: Progress.t) => t
-  let some: (~progress: Progress.t) => t
-  let toString: t => string
-} = {
-  type t = {
-    none: option<Progress.t>,
-    some: option<Progress.t>,
-  }
-
-  let getNone = ({none}) => none
-  let getSome = ({some}) => some
-
-  let toString = x =>
-    \"@"(
-      switch x.some {
-      | None => list{}
-      | Some(p) => list{"some: " ++ Progress.toString(p)}
-      },
-      switch x.none {
-      | None => list{}
-      | Some(p) => list{"none: " ++ Progress.toString(p)}
-      },
-    ) |> String.concat(", ")
-
-  let none = (~progress) => {none: Some(progress), some: None}
-  let some = (~progress) => {none: None, some: Some(progress)}
-
-  let nd = (v1: t, v2: t): t => {
-    let combine = (x, y) =>
-      switch (x, y) {
-      | (Some(progress1), Some(progress2)) =>
-        Some(
-          progress1 == Progress.Progress && progress2 == Progress ? Progress.Progress : NoProgress,
-        )
-      | (None, progressOpt)
-      | (progressOpt, None) => progressOpt
-      }
-    let none = combine(v1.none, v2.none)
-    let some = combine(v1.some, v2.some)
-    {none: none, some: some}
-  }
-}
-
-module State = {
-  type t = {
-    progress: Progress.t,
-    trace: Trace.t,
-    valuesOpt: option<Values.t>,
-  }
-
-  let toString = ({progress, trace, valuesOpt}) => {
-    let progressStr = switch valuesOpt {
-    | None => progress |> Progress.toString
-    | Some(values) => "{" ++ ((values |> Values.toString) ++ "}")
-    }
-    progressStr ++ (" with trace " ++ Trace.toString(trace))
-  }
-
-  let init = (~progress=Progress.NoProgress, ~trace=Trace.empty, ~valuesOpt=None, ()) => {
-    progress: progress,
-    trace: trace,
-    valuesOpt: valuesOpt,
-  }
-
-  let seq = (s1, s2) => {
-    let progress =
-      s1.progress == Progress || s2.progress == Progress ? Progress.Progress : NoProgress
-    let trace = Trace.seq(s1.trace, s2.trace)
-    let valuesOpt = s2.valuesOpt
-    {progress: progress, trace: trace, valuesOpt: valuesOpt}
-  }
-
-  let sequence = states =>
-    switch states {
-    | list{} => assert(false)
-    | list{s, ...nextStates} => List.fold_left(seq, s, nextStates)
-    }
-
-  let nd = (s1, s2) => {
-    let progress =
-      s1.progress == Progress && s2.progress == Progress ? Progress.Progress : NoProgress
-    let trace = Trace.nd(s1.trace, s2.trace)
-    let valuesOpt = switch (s1.valuesOpt, s2.valuesOpt) {
-    | (None, valuesOpt) => s1.progress == Progress ? valuesOpt : None
-    | (valuesOpt, None) => s2.progress == Progress ? valuesOpt : None
-    | (Some(values1), Some(values2)) => Some(Values.nd(values1, values2))
-    }
-    {progress: progress, trace: trace, valuesOpt: valuesOpt}
-  }
-
-  let nondet = states =>
-    switch states {
-    | list{} => assert(false)
-    | list{s, ...nextStates} => List.fold_left(nd, s, nextStates)
-    }
-
-  let unorderedSequence = states => {...states |> sequence, valuesOpt: None}
-
-  let none = (~progress) =>
-    init(~progress, ~trace=Trace.none, ~valuesOpt=Some(Values.none(~progress)), ())
-
-  let some = (~progress) =>
-    init(~progress, ~trace=Trace.some, ~valuesOpt=Some(Values.some(~progress)), ())
-}
-
-module Command = {
-  type progress = Progress.t
-
-  type retOption = Trace.retOption
-
-  type rec t =
-    | Call(Call.t, Location.t)
-    | ConstrOption(retOption)
-    | Nondet(list<t>)
-    | Nothing
-    | Sequence(list<t>)
-    | SwitchOption({functionCall: FunctionCall.t, loc: Location.t, some: t, none: t})
-    | UnorderedSequence(list<t>)
-
-  let rec toString = command =>
-    switch command {
-    | Call(call, _pos) => call |> Call.toString
-    | ConstrOption(r) => r |> Trace.retOptionToString
-    | Nondet(commands) => "[" ++ ((commands |> List.map(toString) |> String.concat(" || ")) ++ "]")
-    | Nothing => "_"
-    | Sequence(commands) => commands |> List.map(toString) |> String.concat("; ")
-    | SwitchOption({functionCall, some: cSome, none: cNone}) =>
-      "switch " ++
-      (FunctionCall.toString(functionCall) ++
-      (" {some: " ++ (toString(cSome) ++ (", none: " ++ (toString(cNone) ++ "}")))))
-    | UnorderedSequence(commands) =>
-      "{" ++ ((commands |> List.map(toString) |> String.concat(", ")) ++ "}")
-    }
-
-  let nothing = Nothing
-
-  let nondet = commands => {
-    let rec loop = commands =>
-      switch commands {
-      | list{} => nothing
-      | list{Nondet(commands), ...rest} => loop(\"@"(commands, rest))
-      | list{command} => command
-      | _ => Nondet(commands)
-      }
-    loop(commands)
-  }
-
-  let sequence = commands => {
-    let rec loop = (acc, commands) =>
-      switch commands {
-      | list{} => List.rev(acc)
-      | list{Nothing, ...cs} if cs != list{} => loop(acc, cs)
-      | list{Sequence(cs1), ...cs2} => loop(acc, \"@"(cs1, cs2))
-      | list{c, ...cs} => loop(list{c, ...acc}, cs)
-      }
-    switch loop(list{}, commands) {
-    | list{c} => c
-    | cs => Sequence(cs)
-    }
-  }
-
-  let \"+++" = (c1, c2) => sequence(list{c1, c2})
-
-  let unorderedSequence = commands => {
-    let relevantCommands = commands |> List.filter(x => x != nothing)
-    switch relevantCommands {
-    | list{} => nothing
-    | list{c} => c
-    | list{_, _, ..._} => UnorderedSequence(relevantCommands)
-    }
-  }
-}
-
-module Kind = {
-  type rec t = list<entry>
-  and entry = {
-    label: string,
-    k: t,
-  }
-
-  let empty: t = list{}
-
-  let hasLabel = (~label, k: t) => k |> List.exists(entry => entry.label == label)
-
-  let rec entryToString = ({label, k}) => k == list{} ? label : label ++ (":" ++ (k |> toString))
-
-  and toString = (kind: t) =>
-    kind == list{} ? "" : "<" ++ ((kind |> List.map(entryToString) |> String.concat(", ")) ++ ">")
-
-  let addLabelWithEmptyKind = (~label, kind) =>
-    if !(kind |> hasLabel(~label)) {
-      list{{label: label, k: empty}, ...kind} |> List.sort(compare)
-    } else {
-      kind
-    }
-}
-
-module FunctionTable = {
-  type functionDefinition = {
-    mutable body: option<Command.t>,
-    mutable kind: Kind.t,
-  }
-
-  type t = Hashtbl.t<FunctionName.t, functionDefinition>
-
-  let create = (): t => Hashtbl.create(1)
-
-  let print = (ppf, tbl: t) => {
-    Format.fprintf(ppf, "@[<v 2>@,@{<warning>Function Table@}")
-    let definitions =
-      Hashtbl.fold(
-        (functionName, {kind, body}, definitions) => list{
-          (functionName, kind, body),
-          ...definitions,
-        },
-        tbl,
-        list{},
-      ) |> List.sort(((fn1, _, _), (fn2, _, _)) => String.compare(fn1, fn2))
-    definitions |> List.iteri((i, (functionName, kind, body)) =>
-      Format.fprintf(
-        ppf,
-        "@,@{<dim>%d@} @{<info>%s%s@}: %s",
-        i + 1,
-        functionName,
-        Kind.toString(kind),
-        switch body {
-        | Some(command) => Command.toString(command)
-        | None => "None"
-        },
-      )
-    )
-    Format.fprintf(ppf, "@]")
-  }
-
-  let dump = tbl => Format.fprintf(Format.std_formatter, "%a@.", print, tbl)
-
-  let initialFunctionDefinition = () => {kind: Kind.empty, body: None}
-
-  let getFunctionDefinition = (~functionName, tbl: t) =>
-    try Hashtbl.find(tbl, functionName) catch {
-    | Not_found => assert(false)
-    }
-
-  let isInFunctionInTable = (~functionTable, path) => Hashtbl.mem(functionTable, Path.name(path))
-
-  let addFunction = (~functionName, tbl: t) => {
-    if Hashtbl.mem(tbl, functionName) {
-      assert(false)
-    }
-    Hashtbl.replace(tbl, functionName, initialFunctionDefinition())
-  }
-
-  let addLabelToKind = (~functionName, ~label, tbl: t) => {
-    let functionDefinition = tbl |> getFunctionDefinition(~functionName)
-    functionDefinition.kind = functionDefinition.kind |> Kind.addLabelWithEmptyKind(~label)
-  }
-
-  let addBody = (~body, ~functionName, tbl: t) => {
-    let functionDefinition = tbl |> getFunctionDefinition(~functionName)
-    functionDefinition.body = body
-  }
-
-  let functionGetKindOfLabel = (~functionName, ~label, tbl: t) =>
-    switch Hashtbl.find(tbl, functionName) {
-    | {kind} => kind |> Kind.hasLabel(~label) ? Some(Kind.empty) : None
-    | exception Not_found => None
-    }
-}
-
-module FindFunctionsCalled = {
-  let traverseExpr = (~callees) => {
-    let super = Tast_mapper.default
-
-    let expr = (self: Tast_mapper.mapper, e: Typedtree.expression) => {
-      switch e.exp_desc {
-      | Texp_apply({exp_desc: Texp_ident(callee, _, _)}, _args) =>
-        let functionName = Path.name(callee)
-        callees := StringSet.add(functionName, callees.contents)
-      | _ => ()
-      }
-      super.expr(self, e)
-    }
-
-    open Tast_mapper
-    {...super, expr: expr}
-  }
-
-  let findCallees = (expression: Typedtree.expression) => {
-    let isFunction = switch expression.exp_desc {
-    | Texp_function(_) => true
-    | _ => false
-    }
-    let callees = ref(StringSet.empty)
-    let traverseExpr = traverseExpr(~callees)
-    if isFunction {
-      expression |> traverseExpr.expr(traverseExpr) |> ignore
-    }
-    callees.contents
-  }
-}
-
-module ExtendFunctionTable = {
-  // Add functions passed a recursive function via a labeled argument,
-  // and functions calling progress functions, to the function table.
-
-  let extractLabelledArgument = (~kindOpt=None, argOpt: option<Typedtree.expression>) =>
-    switch argOpt {
-    | Some({exp_desc: Texp_ident(path, {loc}, _)}) => Some((path, loc))
-    | Some({
-        exp_desc: Texp_let(
-          Nonrecursive,
-          list{{
-            vb_pat: {pat_desc: Tpat_var(_, _)},
-            vb_expr: {exp_desc: Texp_ident(path, {loc}, _)},
-            vb_loc: {loc_ghost: true},
-          }},
-          _,
-        ),
-      }) =>
-      Some((path, loc))
-    | Some({exp_desc: Texp_apply({exp_desc: Texp_ident(path, {loc}, _)}, args)})
-      if kindOpt != None =>
-      let checkArg = ((argLabel: Asttypes.arg_label, _argOpt)) =>
-        switch (argLabel, kindOpt) {
-        | (Labelled(l) | Optional(l), Some(kind)) =>
-          kind |> List.for_all(({Kind.label: label}) => label != l)
-        | _ => true
-        }
-      if args |> List.for_all(checkArg) {
-        Some((path, loc))
-      } else {
-        None
-      }
-    | _ => None
-    }
-
-  let traverseExpr = (~functionTable, ~progressFunctions, ~valueBindingsTable) => {
-    let super = Tast_mapper.default
-
-    let expr = (self: Tast_mapper.mapper, e: Typedtree.expression) => {
-      switch e.exp_desc {
-      | Texp_ident(callee, _, _) =>
-        let loc = e.exp_loc
-        switch Hashtbl.find_opt(valueBindingsTable, Path.name(callee)) {
-        | None => ()
-        | Some((id_pos, _, callees)) =>
-          if !StringSet.is_empty(StringSet.inter(Lazy.force(callees), progressFunctions)) {
-            let functionName = Path.name(callee)
-            if !(callee |> FunctionTable.isInFunctionInTable(~functionTable)) {
-              functionTable |> FunctionTable.addFunction(~functionName)
-              if verbose {
-                Log_.info(~loc, ~name="Termination Analysis", (ppf, ()) =>
-                  Format.fprintf(
-                    ppf,
-                    "Extend Function Table with @{<info>%s@} (%a) as it calls a progress function",
-                    functionName,
-                    printPos,
-                    id_pos,
-                  )
-                )
-              }
-            }
-          }
-        }
-      | Texp_apply({exp_desc: Texp_ident(callee, _, _)}, args)
-        if callee |> FunctionTable.isInFunctionInTable(~functionTable) =>
-        let functionName = Path.name(callee)
-        args |> List.iter(((argLabel: Asttypes.arg_label, argOpt)) =>
-          switch (argLabel, argOpt |> extractLabelledArgument) {
-          | (Labelled(label), Some((path, loc)))
-            if path |> FunctionTable.isInFunctionInTable(~functionTable) =>
-            functionTable |> FunctionTable.addLabelToKind(~functionName, ~label)
-            if verbose {
-              Log_.info(~loc, ~name="Termination Analysis", (ppf, ()) =>
-                Format.fprintf(
-                  ppf,
-                  "@{<info>%s@} is parametric ~@{<info>%s@}=@{<info>%s@}",
-                  functionName,
-                  label,
-                  Path.name(path),
-                )
-              )
-            }
-
-          | _ => ()
-          }
-        )
-      | _ => ()
-      }
-      super.expr(self, e)
-    }
-
-    open Tast_mapper
-    {...super, expr: expr}
-  }
-
-  let run = (
-    ~functionTable,
-    ~progressFunctions,
-    ~valueBindingsTable,
-    expression: Typedtree.expression,
-  ) => {
-    let traverseExpr = traverseExpr(~functionTable, ~progressFunctions, ~valueBindingsTable)
-    expression |> traverseExpr.expr(traverseExpr) |> ignore
-  }
-}
-
-module CheckExpressionWellFormed = {
-  let traverseExpr = (~functionTable, ~valueBindingsTable) => {
-    let super = Tast_mapper.default
-
-    let checkIdent = (~path, ~loc) =>
-      if path |> FunctionTable.isInFunctionInTable(~functionTable) {
-        Stats.logHygieneOnlyCallDirectly(~path, ~loc)
-      }
-
-    let expr = (self: Tast_mapper.mapper, e: Typedtree.expression) =>
-      switch e.exp_desc {
-      | Texp_ident(path, {loc}, _) =>
-        checkIdent(~path, ~loc)
-        e
-      | Texp_apply({exp_desc: Texp_ident(functionPath, _, _)}, args) =>
-        let functionName = Path.name(functionPath)
-        args |> List.iter(((argLabel: Asttypes.arg_label, argOpt)) =>
-          switch argOpt |> ExtendFunctionTable.extractLabelledArgument {
-          | Some((path, loc)) =>
-            switch argLabel {
-            | Labelled(label) =>
-              if (
-                functionTable |> FunctionTable.functionGetKindOfLabel(~functionName, ~label) != None
-              ) {
-                ()
-              } else {
-                switch Hashtbl.find_opt(valueBindingsTable, functionName) {
-                | Some((_pos, body: Typedtree.expression, _))
-                  if path |> FunctionTable.isInFunctionInTable(~functionTable) =>
-                  let inTable = functionPath |> FunctionTable.isInFunctionInTable(~functionTable)
-                  if !inTable {
-                    functionTable |> FunctionTable.addFunction(~functionName)
-                  }
-                  functionTable |> FunctionTable.addLabelToKind(~functionName, ~label)
-                  if verbose {
-                    Log_.info(~loc=body.exp_loc, ~name="Termination Analysis", (ppf, ()) =>
-                      Format.fprintf(
-                        ppf,
-                        "Extend Function Table with @{<info>%s@} as parametric ~@{<info>%s@}=@{<info>%s@}",
-                        functionName,
-                        label,
-                        Path.name(path),
-                      )
-                    )
-                  }
-
-                | _ => checkIdent(~path, ~loc)
-                }
-              }
-
-            | Optional(_)
-            | Nolabel =>
-              checkIdent(~path, ~loc)
-            }
-
-          | _ => ()
-          }
-        )
-        e
-
-      | _ => super.expr(self, e)
-      }
-
-    open Tast_mapper
-    {...super, expr: expr}
-  }
-
-  let run = (~functionTable, ~valueBindingsTable, expression: Typedtree.expression) => {
-    let traverseExpr = traverseExpr(~functionTable, ~valueBindingsTable)
-    expression |> traverseExpr.expr(traverseExpr) |> ignore
-  }
-}
-
-module Compile = {
-  type ctx = {
-    currentFunctionName: FunctionName.t,
-    functionTable: FunctionTable.t,
-    innerRecursiveFunctions: Hashtbl.t<FunctionName.t, FunctionName.t>,
-    isProgressFunction: Path.t => bool,
-  }
-
-  let rec expression = (~ctx, expr: Typedtree.expression) => {
-    let {currentFunctionName, functionTable, isProgressFunction} = ctx
-    let loc = expr.exp_loc
-    switch expr.exp_desc {
-    | Texp_ident(_) => Command.nothing
-
-    | Texp_apply({exp_desc: Texp_ident(calleeToRename, l, vd)} as expr, argsToExtend) =>
-      let (callee, args) = switch Hashtbl.find_opt(
-        ctx.innerRecursiveFunctions,
-        Path.name(calleeToRename),
-      ) {
-      | Some(innerFunctionName) =>
-        let innerFunctionDefinition =
-          functionTable |> FunctionTable.getFunctionDefinition(~functionName=innerFunctionName)
-        let argsFromKind = innerFunctionDefinition.kind |> List.map((entry: Kind.entry) => (
-          Asttypes.Labelled(entry.label),
-          Some({
-            ...expr,
-            exp_desc: Texp_ident(Path.Pident(Ident.create(entry.label)), l, vd),
-          }),
-        ))
-        (Path.Pident(Ident.create(innerFunctionName)), \"@"(argsFromKind, argsToExtend))
-      | None => (calleeToRename, argsToExtend)
-      }
-      if callee |> FunctionTable.isInFunctionInTable(~functionTable) {
-        let functionName = Path.name(callee)
-        let functionDefinition = functionTable |> FunctionTable.getFunctionDefinition(~functionName)
-        exception ArgError
-        let getFunctionArg = ({Kind.label: label}) => {
-          let argOpt = args |> List.find_opt(arg =>
-            switch arg {
-            | (Asttypes.Labelled(s), Some(_)) => s == label
-            | _ => false
-            }
-          )
-          let argOpt = switch argOpt {
-          | Some((_, Some(e))) => Some(e)
-          | _ => None
-          }
-          let functionArg = switch argOpt |> ExtendFunctionTable.extractLabelledArgument(
-            ~kindOpt=Some(functionDefinition.kind),
-          ) {
-          | None =>
-            Stats.logHygieneMustHaveNamedArgument(~label, ~loc)
-            raise(ArgError)
-
-          | Some((path, _pos)) if path |> FunctionTable.isInFunctionInTable(~functionTable) =>
-            let functionName = Path.name(path)
-            {FunctionArgs.label: label, functionName: functionName}
-
-          | Some((path, _pos))
-            if functionTable
-            |> FunctionTable.functionGetKindOfLabel(
-              ~functionName=currentFunctionName,
-              ~label=Path.name(path),
-            ) ==
-              Some(list{}) /* TODO: when kinds are inferred, support and check non-empty kinds */ =>
-            let functionName = Path.name(path)
-            {FunctionArgs.label: label, functionName: functionName}
-
-          | _ =>
-            Stats.logHygieneNamedArgValue(~label, ~loc)
-            raise(ArgError)
-          }
-          functionArg
-        }
-        let functionArgsOpt = try Some(functionDefinition.kind |> List.map(getFunctionArg)) catch {
-        | ArgError => None
-        }
-        switch functionArgsOpt {
-        | None => Command.nothing
-        | Some(functionArgs) =>
-          Command.Call(
-            FunctionCall({functionName: functionName, functionArgs: functionArgs}),
-            loc,
-          ) |> evalArgs(~args, ~ctx)
-        }
-      } else if callee |> isProgressFunction {
-        Command.Call(ProgressFunction(callee), loc) |> evalArgs(~args, ~ctx)
-      } else {
-        switch functionTable |> FunctionTable.functionGetKindOfLabel(
-          ~functionName=currentFunctionName,
-          ~label=Path.name(callee),
-        ) {
-        | Some(kind) if kind == Kind.empty =>
-          Command.Call(FunctionCall(Path.name(callee) |> FunctionCall.noArgs), loc) |> evalArgs(
-            ~args,
-            ~ctx,
-          )
-        | Some(_kind) =>
-          // TODO when kinds are extended in future: check that args matches with kind
-          // and create a function call with the appropriate arguments
-          assert(false)
-        | None => expr |> expression(~ctx) |> evalArgs(~args, ~ctx)
-        }
-      }
-    | Texp_apply(expr, args) => expr |> expression(~ctx) |> evalArgs(~args, ~ctx)
-    | Texp_let(Recursive, list{{vb_pat: {pat_desc: Tpat_var(id, _), pat_loc}, vb_expr}}, inExpr) =>
-      let oldFunctionName = Ident.name(id)
-      let newFunctionName = currentFunctionName ++ ("$" ++ oldFunctionName)
-      functionTable |> FunctionTable.addFunction(~functionName=newFunctionName)
-      let newFunctionDefinition =
-        functionTable |> FunctionTable.getFunctionDefinition(~functionName=newFunctionName)
-      let currentFunctionDefinition =
-        functionTable |> FunctionTable.getFunctionDefinition(~functionName=currentFunctionName)
-      newFunctionDefinition.kind = currentFunctionDefinition.kind
-      let newCtx = {...ctx, currentFunctionName: newFunctionName}
-      Hashtbl.replace(ctx.innerRecursiveFunctions, oldFunctionName, newFunctionName)
-      newFunctionDefinition.body = Some(vb_expr |> expression(~ctx=newCtx))
-      if verbose {
-        Log_.info(~loc=pat_loc, ~name="Termination Analysis", (ppf, ()) =>
-          Format.fprintf(ppf, "Adding recursive definition @{<info>%s@}", newFunctionName)
-        )
-      }
-      inExpr |> expression(~ctx)
-
-    | Texp_let(recFlag, valueBindings, inExpr) =>
-      if recFlag == Recursive {
-        Stats.logHygieneNoNestedLetRec(~loc)
-      }
-      let commands = \"@"(
-        valueBindings |> List.map((vb: Typedtree.value_binding) => vb.vb_expr |> expression(~ctx)),
-        list{inExpr |> expression(~ctx)},
-      )
-      Command.sequence(commands)
-    | Texp_sequence(e1, e2) =>
-      open Command
-      \"+++"(expression(~ctx, e1), expression(~ctx, e2))
-    | Texp_ifthenelse(e1, e2, eOpt) =>
-      let c1 = e1 |> expression(~ctx)
-      let c2 = e2 |> expression(~ctx)
-      let c3 = eOpt |> expressionOpt(~ctx)
-      open Command
-      \"+++"(c1, nondet(list{c2, c3}))
-    | Texp_constant(_) => Command.nothing
-    | Texp_construct({loc: {loc_ghost}}, {cstr_name}, expressions) =>
-      let c = expressions |> List.map(e => e |> expression(~ctx)) |> Command.unorderedSequence
-      switch cstr_name {
-      | "Some" if loc_ghost == false =>
-        open Command
-        \"+++"(c, ConstrOption(Rsome))
-      | "None" if loc_ghost == false =>
-        open Command
-        \"+++"(c, ConstrOption(Rnone))
-      | _ => c
-      }
-    | Texp_function({cases}) => cases |> List.map(case(~ctx)) |> Command.nondet
-
-    | Texp_match(e, cases, list{}, _) =>
-      let cE = e |> expression(~ctx)
-      let cCases = cases |> List.map(case(~ctx))
-      switch (cE, cases) {
-      | (
-          Call(FunctionCall(functionCall), loc),
-          list{
-            {c_lhs: {pat_desc: Tpat_construct(_, {cstr_name: ("Some" | "None") as name1}, _)}},
-            {c_lhs: {pat_desc: Tpat_construct(_, {cstr_name: "Some" | "None"}, _)}},
-          },
-        ) =>
-        let casesArr = Array.of_list(cCases)
-        let (some, none) = name1 == "Some" ? (casesArr[0], casesArr[1]) : (casesArr[1], casesArr[0])
-        SwitchOption({functionCall: functionCall, loc: loc, some: some, none: none})
-      | _ =>
-        open Command
-        \"+++"(cE, nondet(cCases))
-      }
-
-    | Texp_match(_, _, list{_, ..._} as _casesExn, _) => assert(false)
-
-    | Texp_field(e, _lid, _desc) => e |> expression(~ctx)
-
-    | Texp_record({fields, extended_expression}) =>
-      list{
-        extended_expression,
-        ...fields
-        |> Array.to_list
-        |> List.map(((_desc, recordLabelDefinition: Typedtree.record_label_definition)) =>
-          switch recordLabelDefinition {
-          | Kept(_typeExpr) => None
-          | Overridden(_loc, e) => Some(e)
-          }
-        ),
-      }
-      |> List.map(expressionOpt(~ctx))
-      |> Command.unorderedSequence
-
-    | Texp_setfield(e1, _loc, _desc, e2) =>
-      list{e1, e2} |> List.map(expression(~ctx)) |> Command.unorderedSequence
-
-    | Texp_tuple(expressions) =>
-      expressions |> List.map(expression(~ctx)) |> Command.unorderedSequence
-
-    | Texp_assert(_) => Command.nothing
-
-    | Texp_try(_) => assert(false)
-    | Texp_variant(_) => assert(false)
-    | Texp_array(_) => assert(false)
-    | Texp_while(_) => assert(false)
-    | Texp_for(_) => assert(false)
-    | Texp_send(_) => assert(false)
-    | Texp_new(_) => assert(false)
-    | Texp_instvar(_) => assert(false)
-    | Texp_setinstvar(_) => assert(false)
-    | Texp_override(_) => assert(false)
-    | Texp_letmodule(_) => assert(false)
-    | Texp_letexception(_) => assert(false)
-    | Texp_lazy(_) => assert(false)
-    | Texp_object(_) => assert(false)
-    | Texp_pack(_) => assert(false)
-    | Texp_unreachable => assert(false)
-    | Texp_extension_constructor(_) => assert(false)
-    }
-  }
-  and expressionOpt = (~ctx, eOpt) =>
-    switch eOpt {
-    | None => Command.nothing
-    | Some(e) => e |> expression(~ctx)
-    }
-  and evalArgs = (~args, ~ctx, command) => {
-    // Don't assume any evaluation order on the arguments
-    let commands = args |> List.map(((_, eOpt)) => eOpt |> expressionOpt(~ctx))
-    open Command
-    \"+++"(unorderedSequence(commands), command)
-  }
-  and case = (~ctx, {c_guard, c_rhs}: Typedtree.case) =>
-    switch c_guard {
-    | None => c_rhs |> expression(~ctx)
-    | Some(e) =>
-      open Command
-      \"+++"(expression(~ctx, e), expression(~ctx, c_rhs))
-    }
-}
-
-module CallStack = {
-  type frame = {
-    frameNumber: int,
-    pos: Lexing.position,
-  }
-
-  type t = {
-    tbl: Hashtbl.t<FunctionCall.t, frame>,
-    mutable size: int,
-  }
-
-  let create = () => {tbl: Hashtbl.create(1), size: 0}
-
-  let toSet = ({tbl}) =>
-    Hashtbl.fold((frame, _i, set) => FunctionCallSet.add(frame, set), tbl, FunctionCallSet.empty)
-
-  let hasFunctionCall = (~functionCall, t: t) => Hashtbl.mem(t.tbl, functionCall)
-
-  let addFunctionCall = (~functionCall, ~pos, t: t) => {
-    t.size = t.size + 1
-    Hashtbl.replace(t.tbl, functionCall, {frameNumber: t.size, pos: pos})
-  }
-
-  let removeFunctionCall = (~functionCall, t: t) => {
-    t.size = t.size - 1
-    Hashtbl.remove(t.tbl, functionCall)
-  }
-
-  let print = (ppf, t: t) => {
-    Format.fprintf(ppf, "@[<v 2>CallStack:")
-    let frames =
-      Hashtbl.fold(
-        (functionCall, {frameNumber, pos}, frames) => list{
-          (functionCall, frameNumber, pos),
-          ...frames,
-        },
-        t.tbl,
-        list{},
-      ) |> List.sort(((_, i1, _), (_, i2, _)) => i2 - i1)
-    frames |> List.iter(((functionCall: FunctionCall.t, i, pos)) =>
-      Format.fprintf(
-        ppf,
-        "@,@{<dim>%d@} %s (%a)",
-        i,
-        FunctionCall.toString(functionCall),
-        printPos,
-        pos,
-      )
-    )
-    Format.fprintf(ppf, "@]")
-  }
-}
-
-module Eval = {
-  type progress = Progress.t
-
-  type cache = Hashtbl.t<FunctionCall.t, State.t>
-
-  let createCache = (): cache => Hashtbl.create(1)
-
-  let lookupCache = (~functionCall, cache: cache) => Hashtbl.find_opt(cache, functionCall)
-
-  let updateCache = (~functionCall, ~loc, ~state, cache: cache) => {
-    Stats.logResult(~functionCall, ~resString=state |> State.toString, ~loc)
-    if !Hashtbl.mem(cache, functionCall) {
-      Hashtbl.replace(cache, functionCall, state)
-    }
-  }
-
-  let hasInfiniteLoop = (~callStack, ~functionCallToInstantiate, ~functionCall, ~loc, ~state) =>
-    if callStack |> CallStack.hasFunctionCall(~functionCall) {
-      if state.State.progress == NoProgress {
-        Log_.error(~loc, ~name="Error Termination", (ppf, ()) => {
-          Format.fprintf(ppf, "Possible infinite loop when calling ")
-          functionCallToInstantiate == functionCall
-            ? Format.fprintf(
-                ppf,
-                "@{<error>%s@}",
-                functionCallToInstantiate |> FunctionCall.toString,
-              )
-            : Format.fprintf(
-                ppf,
-                "@{<error>%s@} which is @{<error>%s@}",
-                functionCallToInstantiate |> FunctionCall.toString,
-                functionCall |> FunctionCall.toString,
-              )
-          Format.fprintf(ppf, "@,%a", CallStack.print, callStack)
-        })
-        Stats.logLoop()
-      }
-      true
-    } else {
-      false
-    }
-
-  let rec runFunctionCall = (
-    ~cache,
-    ~callStack,
-    ~functionArgs,
-    ~functionTable,
-    ~madeProgressOn,
-    ~loc,
-    ~state,
-    functionCallToInstantiate,
-  ): State.t => {
-    let pos = loc.Location.loc_start
-    let functionCall =
-      functionCallToInstantiate |> FunctionCall.applySubstitution(~sub=functionArgs)
-    let functionName = functionCall.functionName
-    let call = Call.FunctionCall(functionCall)
-    let stateAfterCall = switch cache |> lookupCache(~functionCall) {
-    | Some(stateAfterCall) =>
-      Stats.logCache(~functionCall, ~hit=true, ~loc)
-      {
-        ...stateAfterCall,
-        trace: Trace.Tcall(call, stateAfterCall.progress),
-      }
-    | None =>
-      if FunctionCallSet.mem(functionCall, madeProgressOn) {
-        State.init(~progress=Progress, ~trace=Trace.Tcall(call, Progress), ())
-      } else if (
-        hasInfiniteLoop(~callStack, ~functionCallToInstantiate, ~functionCall, ~loc, ~state)
-      ) {
-        {
-          ...state,
-          trace: Trace.Tcall(call, state.progress),
-        }
-      } else {
-        Stats.logCache(~functionCall, ~hit=false, ~loc)
-        let functionDefinition = functionTable |> FunctionTable.getFunctionDefinition(~functionName)
-        callStack |> CallStack.addFunctionCall(~functionCall, ~pos)
-        let body = switch functionDefinition.body {
-        | Some(body) => body
-        | None => assert(false)
-        }
-        let stateAfterCall =
-          body |> run(
-            ~cache,
-            ~callStack,
-            ~functionArgs=functionCall.functionArgs,
-            ~functionTable,
-            ~madeProgressOn,
-            ~state=State.init(),
-          )
-        cache |> updateCache(~functionCall, ~loc, ~state=stateAfterCall)
-        // Invariant: run should restore the callStack
-        callStack |> CallStack.removeFunctionCall(~functionCall)
-        let trace = Trace.Tcall(call, stateAfterCall.progress)
-        {...stateAfterCall, trace: trace}
-      }
-    }
-    State.seq(state, stateAfterCall)
-  }
-  and run = (
-    ~cache: cache,
-    ~callStack,
-    ~functionArgs,
-    ~functionTable,
-    ~madeProgressOn,
-    ~state,
-    command: Command.t,
-  ): State.t =>
-    switch command {
-    | Call(FunctionCall(functionCall), loc) =>
-      functionCall |> runFunctionCall(
-        ~cache,
-        ~callStack,
-        ~functionArgs,
-        ~functionTable,
-        ~madeProgressOn,
-        ~loc,
-        ~state,
-      )
-    | Call(ProgressFunction(_) as call, _pos) =>
-      let state1 = State.init(~progress=Progress, ~trace=Tcall(call, Progress), ())
-      State.seq(state, state1)
-
-    | ConstrOption(r) =>
-      let state1 =
-        r == Rsome ? State.some(~progress=state.progress) : State.none(~progress=state.progress)
-      State.seq(state, state1)
-
-    | Nothing =>
-      let state1 = State.init()
-      State.seq(state, state1)
-
-    | Sequence(commands) =>
-      // if one command makes progress, then the sequence makes progress
-      let rec findFirstProgress = (~callStack, ~commands, ~madeProgressOn, ~state) =>
-        switch commands {
-        | list{} => state
-        | list{c, ...nextCommands} =>
-          let state1 =
-            c |> run(~cache, ~callStack, ~functionArgs, ~functionTable, ~madeProgressOn, ~state)
-          let (madeProgressOn, callStack) = switch state1.progress {
-          | Progress => // look for infinite loops in the rest of the sequence, remembering what has made progress
-            (
-              FunctionCallSet.union(madeProgressOn, callStack |> CallStack.toSet),
-              CallStack.create(),
-            )
-          | NoProgress => (madeProgressOn, callStack)
-          }
-          findFirstProgress(~callStack, ~commands=nextCommands, ~madeProgressOn, ~state=state1)
-        }
-      findFirstProgress(~callStack, ~commands, ~madeProgressOn, ~state)
-
-    | UnorderedSequence(commands) =>
-      let stateNoTrace = {...state, trace: Trace.empty}
-      // the commands could be executed in any order: progess if any one does
-      let states =
-        commands |> List.map(c =>
-          c |> run(
-            ~cache,
-            ~callStack,
-            ~functionArgs,
-            ~functionTable,
-            ~madeProgressOn,
-            ~state=stateNoTrace,
-          )
-        )
-      State.seq(state, states |> State.unorderedSequence)
-
-    | Nondet(commands) =>
-      let stateNoTrace = {...state, trace: Trace.empty}
-      // the commands could be executed in any order: progess if any one does
-      let states =
-        commands |> List.map(c =>
-          c |> run(
-            ~cache,
-            ~callStack,
-            ~functionArgs,
-            ~functionTable,
-            ~madeProgressOn,
-            ~state=stateNoTrace,
-          )
-        )
-      State.seq(state, states |> State.nondet)
-
-    | SwitchOption({functionCall, loc, some, none}) =>
-      let stateAfterCall =
-        functionCall |> runFunctionCall(
-          ~cache,
-          ~callStack,
-          ~functionArgs,
-          ~functionTable,
-          ~madeProgressOn,
-          ~loc,
-          ~state,
-        )
-      switch stateAfterCall.valuesOpt {
-      | None =>
-        Command.nondet(list{some, none}) |> run(
-          ~cache,
-          ~callStack,
-          ~functionArgs,
-          ~functionTable,
-          ~madeProgressOn,
-          ~state=stateAfterCall,
-        )
-      | Some(values) =>
-        let runOpt = (c, progressOpt) =>
-          switch progressOpt {
-          | None => State.init(~progress=Progress, ())
-          | Some(progress) =>
-            c |> run(
-              ~cache,
-              ~callStack,
-              ~functionArgs,
-              ~functionTable,
-              ~madeProgressOn,
-              ~state=State.init(~progress, ()),
-            )
-          }
-        let stateNone = values |> Values.getNone |> runOpt(none)
-        let stateSome = values |> Values.getSome |> runOpt(some)
-        State.seq(stateAfterCall, State.nondet(list{stateSome, stateNone}))
-      }
-    }
-
-  let analyzeFunction = (~cache, ~functionTable, ~loc, functionName) => {
-    if verbose {
-      Log_.log("@[<v 2>@,@{<warning>Termination Analysis@} for @{<info>%s@}@]@.", functionName)
-    }
-    let pos = loc.Location.loc_start
-    let callStack = CallStack.create()
-    let functionArgs = FunctionArgs.empty
-    let functionCall = FunctionCall.noArgs(functionName)
-    callStack |> CallStack.addFunctionCall(~functionCall, ~pos)
-    let functionDefinition = functionTable |> FunctionTable.getFunctionDefinition(~functionName)
-    if functionDefinition.kind != Kind.empty {
-      Stats.logHygieneParametric(~functionName, ~loc)
-    } else {
-      let body = switch functionDefinition.body {
-      | Some(body) => body
-      | None => assert(false)
-      }
-      let state =
-        body |> run(
-          ~cache,
-          ~callStack,
-          ~functionArgs,
-          ~functionTable,
-          ~madeProgressOn=FunctionCallSet.empty,
-          ~state=State.init(),
-        )
-      cache |> updateCache(~functionCall, ~loc, ~state)
-    }
-  }
-}
-
-let progressFunctionsFromAttributes = attributes => {
-  let lidToString = lid => lid |> Longident.flatten |> String.concat(".")
-  let isProgress = \"="("progress")
-  if attributes |> Annotation.hasAttribute(isProgress) {
-    Some(
-      switch attributes |> Annotation.getAttributePayload(isProgress) {
-      | None => list{}
-      | Some(IdentPayload(lid)) => list{lidToString(lid)}
-      | Some(TuplePayload(l)) =>
-        l
-        |> List.filter(x =>
-          switch x {
-          | Annotation.IdentPayload(_) => true
-          | _ => false
-          }
-        )
-        |> List.map(x =>
-          switch x {
-          | Annotation.IdentPayload(lid) => lidToString(lid)
-          | _ => assert(false)
-          }
-        )
-      | _ => list{}
-      },
-    )
-  } else {
-    None
-  }
-}
-
-let traverseAst = (~valueBindingsTable) => {
-  let super = Tast_mapper.default
-
-  let value_bindings = (self: Tast_mapper.mapper, (recFlag, valueBindings)) => {
-    // Update the table of value bindings for variables
-    valueBindings |> List.iter((vb: Typedtree.value_binding) =>
-      switch vb.vb_pat.pat_desc {
-      | Tpat_var(id, {loc: {loc_start: pos}}) =>
-        let callees = lazy FindFunctionsCalled.findCallees(vb.vb_expr)
-        Hashtbl.replace(valueBindingsTable, Ident.name(id), (pos, vb.vb_expr, callees))
-      | _ => ()
-      }
-    )
-
-    let (progressFunctions, functionsToAnalyze) = if recFlag == Asttypes.Nonrecursive {
-      (StringSet.empty, list{})
-    } else {
-      let (progressFunctions0, functionsToAnalyze0) =
-        valueBindings |> List.fold_left(
-          ((progressFunctions, functionsToAnalyze), valueBinding: Typedtree.value_binding) =>
-            switch progressFunctionsFromAttributes(valueBinding.vb_attributes) {
-            | None => (progressFunctions, functionsToAnalyze)
-            | Some(newProgressFunctions) => (
-                StringSet.union(StringSet.of_list(newProgressFunctions), progressFunctions),
-                switch valueBinding.vb_pat.pat_desc {
-                | Tpat_var(id, _) => list{
-                    (Ident.name(id), valueBinding.vb_expr.exp_loc),
-                    ...functionsToAnalyze,
-                  }
-                | _ => functionsToAnalyze
-                },
-              )
-            },
-          (StringSet.empty, list{}),
-        )
-      (progressFunctions0, functionsToAnalyze0 |> List.rev)
-    }
-
-    if functionsToAnalyze != list{} {
-      let functionTable = FunctionTable.create()
-      let isProgressFunction = path => StringSet.mem(Path.name(path), progressFunctions)
-
-      let recursiveFunctions = List.fold_left((defs, valueBinding: Typedtree.value_binding) =>
-        switch valueBinding.vb_pat.pat_desc {
-        | Tpat_var(id, _) => list{Ident.name(id), ...defs}
-        | _ => defs
-        }
-      , list{}, valueBindings) |> List.rev
-      let recursiveDefinitions = recursiveFunctions |> List.map(functionName => (
-        functionName,
-        {
-          let (_pos, e, _set) = Hashtbl.find(valueBindingsTable, functionName)
-          e
-        },
-      ))
-
-      recursiveDefinitions |> List.iter(((functionName, _body)) =>
-        functionTable |> FunctionTable.addFunction(~functionName)
-      )
-
-      recursiveDefinitions |> List.iter(((_, body)) =>
-        body |> ExtendFunctionTable.run(~functionTable, ~progressFunctions, ~valueBindingsTable)
-      )
-
-      recursiveDefinitions |> List.iter(((_, body)) =>
-        body |> CheckExpressionWellFormed.run(~functionTable, ~valueBindingsTable)
-      )
-
-      functionTable |> Hashtbl.iter((
-        functionName,
-        functionDefinition: FunctionTable.functionDefinition,
-      ) =>
-        if functionDefinition.body == None {
-          let (_pos, body, _) = Hashtbl.find(valueBindingsTable, functionName)
-          functionTable |> FunctionTable.addBody(
-            ~body=Some(
-              body |> Compile.expression(
-                ~ctx={
-                  currentFunctionName: functionName,
-                  functionTable: functionTable,
-                  innerRecursiveFunctions: Hashtbl.create(1),
-                  isProgressFunction: isProgressFunction,
-                },
-              ),
-            ),
-            ~functionName,
-          )
-        }
-      )
-
-      if verbose {
-        FunctionTable.dump(functionTable)
-      }
-
-      let cache = Eval.createCache()
-      functionsToAnalyze |> List.iter(((functionName, loc)) =>
-        functionName |> Eval.analyzeFunction(~cache, ~functionTable, ~loc)
-      )
-      Stats.newRecursiveFunctions(~numFunctions=Hashtbl.length(functionTable))
-    }
-
-    valueBindings |> List.iter(valueBinding => super.value_binding(self, valueBinding) |> ignore)
-
-    (recFlag, valueBindings)
-  }
-
-  open Tast_mapper
-  {...super, value_bindings: value_bindings}
-}
-
-let processStructure = (structure: Typedtree.structure) => {
-  Stats.newFile()
-  let valueBindingsTable = Hashtbl.create(1)
-  let traverseAst = traverseAst(~valueBindingsTable)
-  structure |> traverseAst.structure(traverseAst) |> ignore
-}
-
-let reportResults = () =>
-  if verbose {
-    Stats.dump()
-  }
diff --git a/jscomp/syntax/tests/idempotency/genType/src/CodeItem.res b/jscomp/syntax/tests/idempotency/genType/src/CodeItem.res
deleted file mode 100644
index f7b9e20..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/CodeItem.res
+++ /dev/null
@@ -1,77 +0,0 @@
-open GenTypeCommon
-
-type exportType = {
-  nameAs: option<string>,
-  opaque: option<bool>,
-  type_: type_,
-  typeVars: list<string>,
-  resolvedTypeName: ResolvedName.t,
-}
-
-type importComponent = {
-  asPath: string,
-  childrenTyp: type_,
-  exportType: exportType,
-  importAnnotation: Annotation.\"import",
-  propsFields: fields,
-  propsTypeName: string,
-}
-
-type importValue = {
-  asPath: string,
-  importAnnotation: Annotation.\"import",
-  type_: type_,
-  valueName: string,
-}
-
-type exportComponent = {
-  componentAccessPath: Runtime.moduleAccessPath,
-  exportType: exportType,
-  moduleAccessPath: Runtime.moduleAccessPath,
-  nestedModuleName: option<ModuleName.t>,
-  type_: type_,
-}
-
-type exportValue = {
-  docString: string,
-  moduleAccessPath: Runtime.moduleAccessPath,
-  originalName: string,
-  resolvedName: ResolvedName.t,
-  type_: type_,
-}
-
-type exportFromTypeDeclaration = {
-  exportType: exportType,
-  annotation: Annotation.t,
-}
-
-type importType = {
-  typeName: string,
-  asTypeName: option<string>,
-  importPath: ImportPath.t,
-}
-
-type exportTypeItem = {
-  typeVars: list<string>,
-  type_: type_,
-  annotation: Annotation.t,
-}
-
-type exportTypeMap = StringMap.t<exportTypeItem>
-
-type typeDeclaration = {
-  exportFromTypeDeclaration: exportFromTypeDeclaration,
-  importTypes: list<importType>,
-}
-
-type t =
-  | ExportComponent(exportComponent)
-  | ExportValue(exportValue)
-  | ImportComponent(importComponent)
-  | ImportValue(importValue)
-
-type translation = {
-  importTypes: list<importType>,
-  codeItems: list<t>,
-  typeDeclarations: list<typeDeclaration>,
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Config_.res b/jscomp/syntax/tests/idempotency/genType/src/Config_.res
deleted file mode 100644
index bb78874..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Config_.res
+++ /dev/null
@@ -1,335 +0,0 @@
-module ModuleNameMap = Map.Make(ModuleName)
-
-let bsbProjectRoot = ref("")
-let projectRoot = ref("")
-
-type language =
-  | Flow
-  | TypeScript
-  | Untyped
-
-type module_ =
-  | CommonJS
-  | ES6
-
-type importPath =
-  | Relative
-  | Node
-
-type bsVersion = (int, int, int)
-
-type config = {
-  bsBlockPath: option<string>,
-  bsCurryPath: option<string>,
-  bsDependencies: list<string>,
-  mutable emitCreateBucklescriptBlock: bool,
-  mutable emitFlowAny: bool,
-  mutable emitImportCurry: bool,
-  mutable emitImportPropTypes: bool,
-  mutable emitImportReact: bool,
-  mutable emitTypePropDone: bool,
-  exportInterfaces: bool,
-  fileHeader: option<string>,
-  generatedFileExtension: option<string>,
-  importPath: importPath,
-  language: language,
-  module_: module_,
-  modulesAsObjects: bool,
-  namespace: option<string>,
-  propTypes: bool,
-  reasonReactPath: string,
-  recordsAsObjects: bool,
-  shimsMap: ModuleNameMap.t<ModuleName.t>,
-  sources: option<Ext_json_types.t>,
-  useUnboxedAnnotations: bool,
-}
-
-let default = {
-  bsBlockPath: None,
-  bsCurryPath: None,
-  bsDependencies: list{},
-  emitCreateBucklescriptBlock: false,
-  emitFlowAny: false,
-  emitImportCurry: false,
-  emitImportPropTypes: false,
-  emitImportReact: false,
-  emitTypePropDone: false,
-  exportInterfaces: false,
-  fileHeader: None,
-  generatedFileExtension: None,
-  importPath: Relative,
-  language: Flow,
-  module_: ES6,
-  modulesAsObjects: false,
-  namespace: None,
-  propTypes: false,
-  reasonReactPath: "reason-react/src/ReasonReact.js",
-  recordsAsObjects: false,
-  shimsMap: ModuleNameMap.empty,
-  sources: None,
-  useUnboxedAnnotations: false,
-}
-
-let bsPlatformLib = (~config) =>
-  switch config.module_ {
-  | ES6 => "bs-platform/lib/es6"
-  | CommonJS => "bs-platform/lib/js"
-  }
-
-let getBsBlockPath = (~config) =>
-  switch config.bsBlockPath {
-  | None => bsPlatformLib(~config) ++ "/block.js"
-  | Some(s) => s
-  }
-
-let getBsCurryPath = (~config) =>
-  switch config.bsCurryPath {
-  | None => bsPlatformLib(~config) ++ "/curry.js"
-  | Some(s) => s
-  }
-
-let getBool = (s, json) =>
-  switch json {
-  | Ext_json_types.Obj({map}) =>
-    switch map |> String_map.find_opt(s) {
-    | Some(True(_)) => Some(true)
-    | Some(False(_)) => Some(false)
-    | _ => None
-    }
-  | _ => None
-  }
-
-let getString = (s, json) =>
-  switch json {
-  | Ext_json_types.Obj({map}) =>
-    switch map |> String_map.find_opt(s) {
-    | Some(Str({str})) => str
-    | _ => ""
-    }
-  | _ => ""
-  }
-
-let getStringOption = (s, json) =>
-  switch json {
-  | Ext_json_types.Obj({map}) =>
-    switch map |> String_map.find_opt(s) {
-    | Some(Str({str})) => Some(str)
-    | _ => None
-    }
-  | _ => None
-  }
-
-let getShims = json => {
-  let shims = ref(list{})
-  switch json {
-  | Ext_json_types.Obj({map}) =>
-    switch map |> String_map.find_opt("shims") {
-    | Some(Ext_json_types.Obj({map: shimsMap})) =>
-      shimsMap |> String_map.iter((fromModule, toModule) =>
-        switch toModule {
-        | Ext_json_types.Str({str}) => shims := list{(fromModule, str), ...shims.contents}
-        | _ => ()
-        }
-      )
-    | Some(Arr({content})) =>
-      /* To be deprecated: array of strings */
-      content |> Array.iter(x =>
-        switch x {
-        | Ext_json_types.Str({str}) =>
-          let fromTo = Str.split(Str.regexp("="), str) |> Array.of_list
-          assert (Array.length(fromTo) === 2)
-          shims := list{(fromTo[0], fromTo[1]), ...shims.contents}
-        | _ => ()
-        }
-      )
-    | _ => ()
-    }
-  | _ => ()
-  }
-  shims.contents
-}
-
-let getDebug = json =>
-  switch json {
-  | Ext_json_types.Obj({map}) =>
-    switch map |> String_map.find_opt("debug") {
-    | Some(Ext_json_types.Obj({map})) => map |> String_map.iter(Debug.setItem)
-    | _ => ()
-    }
-  | _ => ()
-  }
-
-let readConfig = (~bsVersion, ~getConfigFile, ~getBsConfigFile, ~namespace) => {
-  let fromJson = json => {
-    let languageString = json |> getString("language")
-    let moduleString = json |> getString("module")
-    let importPathString = json |> getString("importPath")
-    let reasonReactPathString = json |> getString("reasonReactPath")
-    let fileHeader = json |> getStringOption("fileHeader")
-    let bsBlockPathString = json |> getString("bsBlockPath")
-    let bsCurryPathString = json |> getString("bsCurryPath")
-    let exportInterfacesBool = json |> getBool("exportInterfaces")
-    let generatedFileExtensionStringOption = json |> getStringOption("generatedFileExtension")
-    let propTypesBool = json |> getBool("propTypes")
-    let shimsMap = json |> getShims |> List.fold_left((map, (fromModule, toModule)) => {
-        let moduleName: ModuleName.t = fromModule |> ModuleName.fromStringUnsafe
-        let shimModuleName = toModule |> ModuleName.fromStringUnsafe
-        ModuleNameMap.add(moduleName, shimModuleName, map)
-      }, ModuleNameMap.empty)
-    json |> getDebug
-    let language = switch languageString {
-    | "typescript" => TypeScript
-    | "untyped" => Untyped
-    | _ => Flow
-    }
-    let module_ = switch moduleString {
-    | "commonjs" => CommonJS
-    | "es6" => ES6
-    | _ => default.module_
-    }
-    let importPath = switch importPathString {
-    | "relative" => Relative
-    | "node" => Node
-    | _ => default.importPath
-    }
-    let reasonReactPath = switch reasonReactPathString {
-    | "" => default.reasonReactPath
-    | _ => reasonReactPathString
-    }
-    let bsBlockPath = switch bsBlockPathString {
-    | "" => None
-    | _ => Some(bsBlockPathString)
-    }
-    let bsCurryPath = switch bsCurryPathString {
-    | "" => None
-    | _ => Some(bsCurryPathString)
-    }
-    let exportInterfaces = switch exportInterfacesBool {
-    | None => default.exportInterfaces
-    | Some(b) => b
-    }
-    let propTypes = switch propTypesBool {
-    | None => default.propTypes
-    | Some(b) => b
-    }
-    let fileHeader = fileHeader
-    let generatedFileExtension = generatedFileExtensionStringOption
-    let bsVersion = switch bsVersion {
-    | None => (0, 0, 0)
-    | Some(s) =>
-      switch s |> Str.split(Str.regexp(Str.quote("."))) {
-      | list{x1, x2, x3, ..._} =>
-        let v1 = int_of_string(x1)
-        let v2 = int_of_string(x2)
-        let v3 = switch x3 |> Str.split(Str.regexp("-")) {
-        | list{x3, ..._} => int_of_string(x3)
-        | _ => 0
-        }
-        (v1, v2, v3)
-      | _ => (0, 0, 0)
-      }
-    }
-    let (v1, v2, v3) = bsVersion
-    let modulesAsObjects = switch v1 {
-    | 5 => bsVersion >= (5, 2, 0)
-    | 6 => bsVersion >= (6, 2, 0)
-    | _ => v1 > 6
-    }
-    let recordsAsObjects = switch v1 {
-    | 5 => bsVersion >= (5, 3, 0)
-    | 6 => bsVersion >= (6, 3, 0)
-    | _ => v1 > 6
-    }
-    let useUnboxedAnnotations = switch v1 {
-    | 7 => bsVersion > (7, 0, 1)
-    | _ => v1 > 7
-    }
-    if Debug.config.contents {
-      Log_.item("Project root: %s\n", projectRoot.contents)
-      if bsbProjectRoot.contents != projectRoot.contents {
-        Log_.item("bsb project root: %s\n", bsbProjectRoot.contents)
-      }
-      Log_.item(
-        "Config language:%s module:%s importPath:%s shims:%d entries bsVersion:%d.%d.%d\n",
-        languageString,
-        moduleString,
-        importPathString,
-        shimsMap |> ModuleNameMap.cardinal,
-        v1,
-        v2,
-        v3,
-      )
-    }
-
-    {
-      bsBlockPath: bsBlockPath,
-      bsCurryPath: bsCurryPath,
-      bsDependencies: list{},
-      emitCreateBucklescriptBlock: false,
-      emitFlowAny: false,
-      emitImportCurry: false,
-      emitImportPropTypes: false,
-      emitImportReact: false,
-      emitTypePropDone: false,
-      exportInterfaces: exportInterfaces,
-      fileHeader: fileHeader,
-      generatedFileExtension: generatedFileExtension,
-      importPath: importPath,
-      language: language,
-      module_: module_,
-      modulesAsObjects: modulesAsObjects,
-      namespace: None,
-      propTypes: propTypes,
-      reasonReactPath: reasonReactPath,
-      recordsAsObjects: recordsAsObjects,
-      shimsMap: shimsMap,
-      sources: None,
-      useUnboxedAnnotations: useUnboxedAnnotations,
-    }
-  }
-
-  let fromBsConfig = json =>
-    switch json {
-    | Ext_json_types.Obj({map}) =>
-      let config = switch map |> String_map.find_opt("gentypeconfig") {
-      | Some(jsonGenFlowConfig) => jsonGenFlowConfig |> fromJson
-      | _ => default
-      }
-      let config = switch map |> String_map.find_opt("namespace") {
-      | Some(True(_)) => {...config, namespace: namespace}
-      | _ => config
-      }
-      let config = switch map |> String_map.find_opt("bs-dependencies") {
-      | Some(Arr({content})) =>
-        let strings = ref(list{})
-        content |> Array.iter(x =>
-          switch x {
-          | Ext_json_types.Str({str}) => strings := list{str, ...strings.contents}
-          | _ => ()
-          }
-        )
-        {...config, bsDependencies: strings.contents}
-      | _ => config
-      }
-      let config = switch map |> String_map.find_opt("sources") {
-      | Some(sourceItem) => {...config, sources: Some(sourceItem)}
-      | _ => config
-      }
-      config
-    | _ => default
-    }
-  switch getConfigFile() {
-  | Some(configFile) =>
-    try configFile |> Ext_json_parse.parse_json_from_file |> fromJson catch {
-    | _ => default
-    }
-  | None =>
-    switch getBsConfigFile() {
-    | Some(bsConfigFile) =>
-      try bsConfigFile |> Ext_json_parse.parse_json_from_file |> fromBsConfig catch {
-      | _ => default
-      }
-    | None => default
-    }
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Converter.res b/jscomp/syntax/tests/idempotency/genType/src/Converter.res
deleted file mode 100644
index 7a452df..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Converter.res
+++ /dev/null
@@ -1,736 +0,0 @@
-open GenTypeCommon
-
-type rec t =
-  | ArrayC(t)
-  | CircularC(string, t)
-  | FunctionC(functionC)
-  | IdentC
-  | NullableC(t)
-  | ObjectC(fieldsC)
-  | OptionC(t)
-  | PromiseC(t)
-  | RecordC(fieldsC)
-  | TupleC(list<t>)
-  | VariantC(variantC)
-and groupedArgConverter =
-  | ArgConverter(t)
-  | GroupConverter(list<(string, optional, t)>)
-and fieldC = {
-  lblJS: string,
-  lblRE: string,
-  c: t,
-}
-and fieldsC = list<fieldC>
-and functionC = {
-  argConverters: list<groupedArgConverter>,
-  componentName: option<string>,
-  isHook: bool,
-  retConverter: t,
-  typeVars: list<string>,
-  uncurried: bool,
-}
-and variantC = {
-  hash: int,
-  noPayloads: list<case>,
-  withPayload: list<(case, int, t)>,
-  polymorphic: bool,
-  unboxed: bool,
-}
-
-let rec toString = converter =>
-  switch converter {
-  | ArrayC(c) => "array(" ++ (toString(c) ++ ")")
-
-  | CircularC(s, c) => "circular(" ++ (s ++ (" " ++ (toString(c) ++ ")")))
-
-  | FunctionC({argConverters, retConverter, uncurried}) =>
-    "fn" ++
-    ((uncurried ? "Uncurried" : "") ++
-    ("(" ++
-    ((argConverters
-    |> List.map(groupedArgConverter =>
-      switch groupedArgConverter {
-      | ArgConverter(conv) => "(" ++ ("_" ++ (":" ++ (toString(conv) ++ ")")))
-      | GroupConverter(groupConverters) =>
-        "{|" ++
-        ((groupConverters
-        |> List.map(((s, optional, argConverter)) =>
-          s ++ ((optional == Optional ? "?" : "") ++ (":" ++ toString(argConverter)))
-        )
-        |> String.concat(", ")) ++
-        "|}")
-      }
-    )
-    |> String.concat(", ")) ++
-    (" -> " ++ (toString(retConverter) ++ ")")))))
-
-  | IdentC => "id"
-
-  | NullableC(c) => "nullable(" ++ (toString(c) ++ ")")
-
-  | ObjectC(fieldsC)
-  | RecordC(fieldsC) =>
-    let dot = switch converter {
-    | ObjectC(_) => ". "
-    | _ => ""
-    }
-    "{" ++
-    (dot ++
-    ((fieldsC
-    |> List.map(({lblJS, lblRE, c}) =>
-      (lblJS == lblRE ? lblJS : "(" ++ (lblJS ++ ("/" ++ (lblRE ++ ")")))) ++
-      (":" ++
-      (c |> toString))
-    )
-    |> String.concat(", ")) ++ "}"))
-
-  | OptionC(c) => "option(" ++ (toString(c) ++ ")")
-  | PromiseC(c) => "promise(" ++ (toString(c) ++ ")")
-  | TupleC(innerTypesC) =>
-    "[" ++ ((innerTypesC |> List.map(toString) |> String.concat(", ")) ++ "]")
-
-  | VariantC({noPayloads, withPayload}) =>
-    "variant(" ++
-    ((\"@"(
-      noPayloads |> List.map(case => case.labelJS |> labelJSToString),
-      withPayload |> List.map(((case, numArgs, c)) =>
-        (case.labelJS |> labelJSToString) ++
-          (":" ++
-          (string_of_int(numArgs) ++ (":" ++ (c |> toString))))
-      ),
-    ) |> String.concat(", ")) ++
-    ")")
-  }
-
-let typeGetConverterNormalized = (~config, ~inline, ~lookupId, ~typeNameIsInterface, type0) => {
-  let circular = ref("")
-  let expandOneLevel = type_ =>
-    switch type_ {
-    | Ident({builtin: false, name}) =>
-      switch name |> lookupId {
-      | (t: CodeItem.exportTypeItem) => t.type_
-      | exception Not_found => type_
-      }
-    | _ => type_
-    }
-  let rec visit = (~visited: StringSet.t, type_) => {
-    let normalized_ = type_
-    switch type_ {
-    | Array(t, mutable_) =>
-      let (tConverter, tNormalized) = t |> visit(~visited)
-      (ArrayC(tConverter), Array(tNormalized, mutable_))
-
-    | Function({argTypes, componentName, retType, typeVars, uncurried} as function_) =>
-      let argConverted = argTypes |> List.map(argTypeToGroupedArgConverter(~visited))
-      let argConverters = argConverted |> List.map(fst)
-      let (retConverter, retNormalized) = retType |> visit(~visited)
-      let isHook = switch argTypes {
-      | list{{aType: Object(_)}} => retType |> EmitType.isTypeReactElement(~config)
-      | _ => false
-      }
-      (
-        FunctionC({
-          argConverters: argConverters,
-          componentName: componentName,
-          isHook: isHook,
-          retConverter: retConverter,
-          typeVars: typeVars,
-          uncurried: uncurried,
-        }),
-        Function({
-          ...function_,
-          argTypes: argConverted |> List.map(snd),
-          retType: retNormalized,
-        }),
-      )
-
-    | GroupOfLabeledArgs(_) => /* This case should only fire from withing a function */
-      (IdentC, normalized_)
-
-    | Ident({builtin: true}) => (IdentC, normalized_)
-
-    | Ident({builtin: false, name, typeArgs}) =>
-      if visited |> StringSet.mem(name) {
-        circular := name
-        (IdentC, normalized_)
-      } else {
-        let visited = visited |> StringSet.add(name)
-        switch name |> lookupId {
-        | {annotation: GenTypeOpaque} => (IdentC, normalized_)
-        | {annotation: NoGenType} => (IdentC, normalized_)
-        | {typeVars, type_} =>
-          let pairs = try List.combine(typeVars, typeArgs) catch {
-          | Invalid_argument(_) => list{}
-          }
-
-          let f = typeVar =>
-            switch pairs |> List.find(((typeVar1, _)) => typeVar == typeVar1) {
-            | (_, typeArgument) => Some(typeArgument)
-            | exception Not_found => None
-            }
-          let (converter, inlined) = type_ |> TypeVars.substitute(~f) |> visit(~visited)
-          (converter, inline ? inlined : normalized_)
-        | exception Not_found =>
-          if inline {
-            let typeArgs = typeArgs |> List.map(t => t |> visit(~visited) |> snd)
-            (IdentC, Ident({builtin: false, name: name, typeArgs: typeArgs}))
-          } else {
-            (IdentC, normalized_)
-          }
-        }
-      }
-
-    | Null(t) =>
-      let (tConverter, tNormalized) = t |> visit(~visited)
-      (NullableC(tConverter), Null(tNormalized))
-
-    | Nullable(t) =>
-      let (tConverter, tNormalized) = t |> visit(~visited)
-      (NullableC(tConverter), Nullable(tNormalized))
-
-    /* | Object(closedFlag, fields) => */
-    /* let fieldsConverted = */
-    /* fields */
-    /* |> List.map(({type_} as field) => */
-    /* (field, type_ |> visit(~visited)) */
-    /* ); */
-    /* ( */
-    /* ObjectC( */
-    /* fieldsConverted */
-    /* |> List.map((({nameJS, nameRE, optional}, (converter, _))) => */
-    /* { */
-    /* lblJS: nameJS, */
-    /* lblRE: nameRE, */
-    /* c: optional == Mandatory ? converter : OptionC(converter), */
-    /* } */
-    /* ), */
-    /* ), */
-    /* Object( */
-    /* closedFlag, */
-    /* fieldsConverted */
-    /* |> List.map(((field, (_, tNormalized))) => */
-    /* {...field, type_: tNormalized} */
-    /* ), */
-    /* ), */
-    /* ); */
-
-    | Option(t) =>
-      let (tConverter, tNormalized) = t |> visit(~visited)
-      (OptionC(tConverter), Option(tNormalized))
-
-    | Promise(t) =>
-      let (tConverter, tNormalized) = t |> visit(~visited)
-      (PromiseC(tConverter), Promise(tNormalized))
-
-    | Record(fields) =>
-      let fieldsConverted =
-        fields |> List.map(({type_} as field) => (field, type_ |> visit(~visited)))
-    /* ( */
-    /* RecordC( */
-    /* fieldsConverted */
-    /* |> List.map((({nameJS, nameRE, optional}, (converter, _))) => */
-    /* { */
-    /* lblJS: nameJS, */
-    /* lblRE: nameRE, */
-    /* c: optional == Mandatory ? converter : OptionC(converter), */
-    /* } */
-    /* ), */
-    /* ), */
-    /* Record( */
-    /* fieldsConverted */
-    /* |> List.map(((field, (_, tNormalized))) => */
-    /* {...field, type_: tNormalized} */
-    /* ), */
-    /* ), */
-    /* ); */
-
-    | Tuple(innerTypes) =>
-      let (innerConversions, normalizedList) = innerTypes |> List.map(visit(~visited)) |> List.split
-      (TupleC(innerConversions), Tuple(normalizedList))
-
-    | TypeVar(_) => (IdentC, normalized_)
-
-    | Variant(variant) =>
-      let (withPayload, normalized, unboxed) = switch variant.payloads |> List.map(((
-        case,
-        numArgs,
-        t,
-      )) => (case, numArgs, t |> visit(~visited))) {
-      | list{} => (list{}, normalized_, variant.unboxed)
-      | list{(case, numArgs, (converter, tNormalized))} =>
-        let unboxed = tNormalized |> expandOneLevel |> typeIsObject
-        let normalized = Variant({
-          ...variant,
-          payloads: list{(case, numArgs, tNormalized)},
-          unboxed: unboxed ? true : variant.unboxed,
-        })
-        (list{(case, numArgs, converter)}, normalized, unboxed)
-      | list{_, _, ..._} as withPayloadConverted =>
-        let withPayloadNormalized =
-          withPayloadConverted |> List.map(((case, numArgs, (_, tNormalized))) => (
-            case,
-            numArgs,
-            tNormalized,
-          ))
-        let normalized = Variant({...variant, payloads: withPayloadNormalized})
-        (
-          withPayloadConverted |> List.map(((case, numArgs, (converter, _))) => (
-            case,
-            numArgs,
-            converter,
-          )),
-          normalized,
-          variant.unboxed,
-        )
-      }
-      let converter = VariantC({
-        hash: variant.hash,
-        noPayloads: variant.noPayloads,
-        withPayload: withPayload,
-        polymorphic: variant.polymorphic,
-        unboxed: unboxed,
-      })
-      (converter, normalized)
-    }
-  }
-  and argTypeToGroupedArgConverter = (~visited, {aName, aType}) =>
-    switch aType {
-    | GroupOfLabeledArgs(fields) =>
-      let fieldsConverted =
-        fields |> List.map(({type_} as field) => (field, type_ |> visit(~visited)))
-      let tNormalized = GroupOfLabeledArgs(
-        fieldsConverted |> List.map(((field, (_, t))) => {...field, type_: t}),
-      )
-      let converter = GroupConverter(
-        fieldsConverted |> List.map((({nameJS, optional}, (converter, _))) => (
-          nameJS,
-          optional,
-          converter,
-        )),
-      )
-      (converter, {aName: aName, aType: tNormalized})
-    | _ =>
-      let (converter, tNormalized) = aType |> visit(~visited)
-      let converter = ArgConverter(converter)
-      (converter, {aName: aName, aType: tNormalized})
-    }
-
-  let (converter, normalized) = type0 |> visit(~visited=StringSet.empty)
-  let finalConverter = circular.contents != "" ? CircularC(circular.contents, converter) : converter
-  if Debug.converter.contents {
-    Log_.item(
-      "Converter type0:%s converter:%s\n",
-      type0 |> EmitType.typeToString(~config, ~typeNameIsInterface),
-      finalConverter |> toString,
-    )
-  }
-  (finalConverter, normalized)
-}
-
-let typeGetConverter = (~config, ~lookupId, ~typeNameIsInterface, type_) =>
-  type_
-  |> typeGetConverterNormalized(~config, ~inline=false, ~lookupId, ~typeNameIsInterface)
-  |> fst
-
-let typeGetNormalized = (~config, ~inline, ~lookupId, ~typeNameIsInterface, type_) =>
-  type_ |> typeGetConverterNormalized(~config, ~inline, ~lookupId, ~typeNameIsInterface) |> snd
-
-let rec converterIsIdentity = (~toJS, converter) =>
-  switch converter {
-  | ArrayC(c) => c |> converterIsIdentity(~toJS)
-
-  | CircularC(_, c) => c |> converterIsIdentity(~toJS)
-
-  | FunctionC({argConverters, retConverter, uncurried}) =>
-    retConverter |> converterIsIdentity(~toJS) &&
-      ((!toJS || (uncurried || argConverters |> List.length <= 1)) &&
-      argConverters |> List.for_all(groupedArgConverter =>
-        switch groupedArgConverter {
-        | ArgConverter(argConverter) => argConverter |> converterIsIdentity(~toJS=!toJS)
-        | GroupConverter(_) => false
-        }
-      ))
-
-  | IdentC => true
-
-  | NullableC(c) => c |> converterIsIdentity(~toJS)
-
-  | ObjectC(fieldsC) =>
-    fieldsC |> List.for_all(({lblJS, lblRE, c}) =>
-      lblJS == lblRE &&
-        switch c {
-        | OptionC(c1) => c1 |> converterIsIdentity(~toJS)
-        | _ => c |> converterIsIdentity(~toJS)
-        }
-    )
-
-  | OptionC(c) =>
-    if toJS {
-      c |> converterIsIdentity(~toJS)
-    } else {
-      false
-    }
-
-  | PromiseC(c) => c |> converterIsIdentity(~toJS)
-
-  | RecordC(_) => false
-
-  | TupleC(innerTypesC) => innerTypesC |> List.for_all(converterIsIdentity(~toJS))
-
-  | VariantC(_) => false
-  }
-
-let rec apply = (~config, ~converter, ~indent, ~nameGen, ~toJS, ~variantTables, value) =>
-  switch converter {
-  | _ if converter |> converterIsIdentity(~toJS) => value
-
-  | ArrayC(c) =>
-    let x = "ArrayItem" |> EmitText.name(~nameGen)
-    value ++
-    (".map(function _element(" ++
-    ((x |> EmitType.ofTypeAny(~config)) ++
-      (") { return " ++
-      ((x |> apply(~config, ~converter=c, ~indent, ~nameGen, ~toJS, ~variantTables)) ++ "})"))))
-
-  | CircularC(s, c) =>
-    value
-    |> EmitText.addComment(
-      ~comment="WARNING: circular type " ++ (s ++ ". Only shallow converter applied."),
-    )
-    |> apply(~config, ~converter=c, ~indent, ~nameGen, ~toJS, ~variantTables)
-
-  | FunctionC({argConverters, componentName, isHook, retConverter, typeVars, uncurried}) =>
-    let resultName = EmitText.resultName(~nameGen)
-    let indent1 = indent |> Indent.more
-    let indent2 = indent1 |> Indent.more
-
-    let mkReturn = x =>
-      "const " ++
-      (resultName ++
-      (" = " ++
-      (x ++
-      (";" ++
-      (Indent.break(~indent=indent1) ++
-      ("return " ++
-      (resultName |> apply(
-        ~config,
-        ~converter=retConverter,
-        ~indent=indent2,
-        ~nameGen,
-        ~toJS,
-        ~variantTables,
-      ))))))))
-
-    let convertArg = (i, groupedArgConverter) =>
-      switch groupedArgConverter {
-      | ArgConverter(argConverter) =>
-        let varName = i + 1 |> EmitText.argi(~nameGen)
-        let notToJS = !toJS
-        (
-          list{varName},
-          list{
-            varName |> apply(
-              ~config,
-              ~converter=argConverter,
-              ~indent=indent2,
-              ~nameGen,
-              ~toJS=notToJS,
-              ~variantTables,
-            ),
-          },
-        )
-      | GroupConverter(groupConverters) =>
-        let notToJS = !toJS
-        if toJS {
-          let varName = i + 1 |> EmitText.argi(~nameGen)
-          (
-            list{varName},
-            groupConverters |> List.map(((label, optional, argConverter)) =>
-              varName
-              |> EmitText.fieldAccess(~label)
-              |> apply(
-                ~config,
-                ~converter=optional == Optional && !(argConverter |> converterIsIdentity(~toJS))
-                  ? OptionC(argConverter)
-                  : argConverter,
-                ~indent=indent2,
-                ~nameGen,
-                ~toJS=notToJS,
-                ~variantTables,
-              )
-            ),
-          )
-        } else {
-          let varNames =
-            groupConverters |> List.map(((s, _optional, _argConverter)) =>
-              s |> EmitText.arg(~nameGen)
-            )
-
-          let varNamesArr = varNames |> Array.of_list
-          let fieldValues =
-            groupConverters
-            |> List.mapi((i, (s, _optional, argConverter)) =>
-              s ++
-              (":" ++
-              (varNamesArr[i] |> apply(
-                ~config,
-                ~converter=argConverter,
-                ~indent=indent2,
-                ~nameGen,
-                ~toJS=notToJS,
-                ~variantTables,
-              )))
-            )
-            |> String.concat(", ")
-          (varNames, list{"{" ++ (fieldValues ++ "}")})
-        }
-      }
-
-    let mkBody = bodyArgs => {
-      let useCurry = !uncurried && (toJS && List.length(bodyArgs) > 1)
-      config.emitImportCurry = config.emitImportCurry || useCurry
-      let functionName = isHook ? "React.createElement" : value
-      if isHook {
-        config.emitImportReact = true
-      }
-      let (declareProps, args) = switch bodyArgs {
-      | list{props} if isHook =>
-        let propsName = "$props" |> EmitText.name(~nameGen)
-        (
-          Indent.break(~indent=indent1) ++ ("const " ++ (propsName ++ (" = " ++ (props ++ ";")))),
-          list{value, propsName},
-        )
-
-      | _ => ("", bodyArgs)
-      }
-
-      declareProps ++
-      (Indent.break(~indent=indent1) ++
-      (functionName |> EmitText.funCall(~args, ~useCurry) |> mkReturn))
-    }
-
-    let convertedArgs = argConverters |> List.mapi(convertArg)
-    let args = convertedArgs |> List.map(fst) |> List.concat
-    let funParams = args |> List.map(v => v |> EmitType.ofTypeAny(~config))
-    let bodyArgs = convertedArgs |> List.map(snd) |> List.concat
-    EmitText.funDef(
-      ~bodyArgs,
-      ~functionName=componentName,
-      ~funParams,
-      ~indent,
-      ~mkBody,
-      ~typeVars=switch config.language {
-      | Flow
-      | TypeScript => typeVars
-      | Untyped => list{}
-      },
-    )
-
-  | IdentC => value
-
-  | NullableC(c) =>
-    EmitText.parens(list{
-      value ++
-      (" == null ? " ++
-      (value ++
-      (" : " ++
-      (value |> apply(~config, ~converter=c, ~indent, ~nameGen, ~toJS, ~variantTables))))),
-    })
-
-  | ObjectC(fieldsC) =>
-    let simplifyFieldConverted = fieldConverter =>
-      switch fieldConverter {
-      | OptionC(converter1) if converter1 |> converterIsIdentity(~toJS) => IdentC
-      | _ => fieldConverter
-      }
-    let fieldValues =
-      fieldsC
-      |> List.map(({lblJS, lblRE, c: fieldConverter}) =>
-        (toJS ? lblJS : lblRE) ++
-        (":" ++
-        (value
-        |> EmitText.fieldAccess(~label=toJS ? lblRE : lblJS)
-        |> apply(
-          ~config,
-          ~converter=fieldConverter |> simplifyFieldConverted,
-          ~indent,
-          ~nameGen,
-          ~toJS,
-          ~variantTables,
-        )))
-      )
-      |> String.concat(", ")
-    "{" ++ (fieldValues ++ "}")
-
-  | OptionC(c) =>
-    if toJS {
-      EmitText.parens(list{
-        value ++
-        (" == null ? " ++
-        (value ++
-        (" : " ++
-        (value |> apply(~config, ~converter=c, ~indent, ~nameGen, ~toJS, ~variantTables))))),
-      })
-    } else {
-      EmitText.parens(list{
-        value ++
-        (" == null ? undefined : " ++
-        (value |> apply(~config, ~converter=c, ~indent, ~nameGen, ~toJS, ~variantTables))),
-      })
-    }
-
-  | PromiseC(c) =>
-    let x = "$promise" |> EmitText.name(~nameGen)
-    value ++
-    (".then(function _element(" ++
-    ((x |> EmitType.ofTypeAny(~config)) ++
-      (") { return " ++
-      ((x |> apply(~config, ~converter=c, ~indent, ~nameGen, ~toJS, ~variantTables)) ++ "})"))))
-
-  | RecordC(fieldsC) =>
-    let simplifyFieldConverted = fieldConverter =>
-      switch fieldConverter {
-      | OptionC(converter1) if converter1 |> converterIsIdentity(~toJS) => IdentC
-      | _ => fieldConverter
-      }
-    if toJS {
-      let fieldValues =
-        fieldsC
-        |> List.mapi((index, {lblJS, c: fieldConverter}) =>
-          lblJS ++
-          (":" ++
-          (value
-          |> EmitText.arrayAccess(~index)
-          |> apply(
-            ~config,
-            ~converter=fieldConverter |> simplifyFieldConverted,
-            ~indent,
-            ~nameGen,
-            ~toJS,
-            ~variantTables,
-          )))
-        )
-        |> String.concat(", ")
-      fieldsC == list{} && config.language == Flow
-        ? "Object.freeze({})"
-        : "{" ++ (fieldValues ++ "}")
-    } else {
-      let fieldValues =
-        fieldsC
-        |> List.map(({lblJS, c: fieldConverter}) =>
-          value
-          |> EmitText.fieldAccess(~label=lblJS)
-          |> apply(
-            ~config,
-            ~converter=fieldConverter |> simplifyFieldConverted,
-            ~indent,
-            ~nameGen,
-            ~toJS,
-            ~variantTables,
-          )
-        )
-        |> String.concat(", ")
-      "[" ++ (fieldValues ++ "]")
-    }
-  | TupleC(innerTypesC) =>
-    "[" ++
-    ((innerTypesC
-    |> List.mapi((index, c) =>
-      value
-      |> EmitText.arrayAccess(~index)
-      |> apply(~config, ~converter=c, ~indent, ~nameGen, ~toJS, ~variantTables)
-    )
-    |> String.concat(", ")) ++
-    "]")
-
-  | VariantC({noPayloads: list{case}, withPayload: list{}, polymorphic}) =>
-    toJS ? case.labelJS |> labelJSToString : case.label |> Runtime.emitVariantLabel(~polymorphic)
-
-  | VariantC(variantC) =>
-    if variantC.noPayloads != list{} {
-      Hashtbl.replace(variantTables, (variantC.hash, toJS), variantC)
-    }
-    let convertToString =
-      !toJS &&
-      variantC.noPayloads |> List.exists(({labelJS}) =>
-        labelJS == BoolLabel(true) || labelJS == BoolLabel(false)
-      )
-        ? ".toString()"
-        : ""
-    let table = variantC.hash |> variantTable(~toJS)
-    let accessTable = v => table ++ EmitText.array(list{v ++ convertToString})
-    switch variantC.withPayload {
-    | list{} => value |> accessTable
-
-    | list{(case, numArgs, objConverter)} if variantC.unboxed =>
-      let casesWithPayload = (~indent) =>
-        if toJS {
-          value
-          |> Runtime.emitVariantGetPayload(~numArgs, ~polymorphic=variantC.polymorphic)
-          |> apply(~config, ~converter=objConverter, ~indent, ~nameGen, ~toJS, ~variantTables)
-        } else {
-          value
-          |> apply(~config, ~converter=objConverter, ~indent, ~nameGen, ~toJS, ~variantTables)
-          |> Runtime.emitVariantWithPayload(
-            ~config,
-            ~label=case.label,
-            ~numArgs,
-            ~polymorphic=variantC.polymorphic,
-          )
-        }
-      variantC.noPayloads == list{}
-        ? casesWithPayload(~indent)
-        : EmitText.ifThenElse(
-            ~indent,
-            (~indent as _) => value |> EmitText.typeOfObject,
-            casesWithPayload,
-            (~indent as _) => value |> accessTable,
-          )
-
-    | list{_, ..._} =>
-      let convertCaseWithPayload = (~indent, ~numArgs, ~objConverter, case) =>
-        value
-        |> (toJS
-          ? Runtime.emitVariantGetPayload(~numArgs, ~polymorphic=variantC.polymorphic)
-          : Runtime.emitJSVariantGetPayload)
-        |> apply(~config, ~converter=objConverter, ~indent, ~nameGen, ~toJS, ~variantTables)
-        |> (
-          toJS
-            ? Runtime.emitJSVariantWithPayload(~label=case.labelJS |> labelJSToString)
-            : Runtime.emitVariantWithPayload(
-                ~config,
-                ~label=case.label,
-                ~numArgs,
-                ~polymorphic=variantC.polymorphic,
-              )
-        )
-      let switchCases = (~indent) =>
-        variantC.withPayload |> List.map(((case, numArgs, objConverter)) => (
-          toJS
-            ? case.label |> Runtime.emitVariantLabel(~polymorphic=variantC.polymorphic)
-            : case.labelJS |> labelJSToString,
-          case |> convertCaseWithPayload(~indent, ~numArgs, ~objConverter),
-        ))
-      let casesWithPayload = (~indent) =>
-        value
-        |> {
-          open Runtime
-          toJS ? emitVariantGetLabel(~polymorphic=variantC.polymorphic) : emitJSVariantGetLabel
-        }
-        |> EmitText.\"switch"(~indent, ~cases=switchCases(~indent))
-      variantC.noPayloads == list{}
-        ? casesWithPayload(~indent)
-        : EmitText.ifThenElse(
-            ~indent,
-            (~indent as _) => value |> EmitText.typeOfObject,
-            casesWithPayload,
-            (~indent as _) => value |> accessTable,
-          )
-    }
-  }
-
-let toJS = (~config, ~converter, ~indent, ~nameGen, ~variantTables, value) =>
-  value |> apply(~config, ~converter, ~indent, ~nameGen, ~variantTables, ~toJS=true)
-
-let toReason = (~config, ~converter, ~indent, ~nameGen, ~variantTables, value) =>
-  value |> apply(~config, ~converter, ~indent, ~nameGen, ~toJS=false, ~variantTables)
diff --git a/jscomp/syntax/tests/idempotency/genType/src/DeadCode.res b/jscomp/syntax/tests/idempotency/genType/src/DeadCode.res
deleted file mode 100644
index e75fbd6..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/DeadCode.res
+++ /dev/null
@@ -1,167 +0,0 @@
-open DeadCommon
-
-let \"+++" = Filename.concat
-
-let getModuleName = fn => fn |> Paths.getModuleName |> ModuleName.toString
-
-let rec getSignature = (~isfunc=false, moduleType: Types.module_type) =>
-  switch moduleType {
-  | Mty_signature(signature) => signature
-  | Mty_functor(_, tOpt, _) if isfunc =>
-    switch tOpt {
-    | None => list{}
-    | Some(moduleType) => getSignature(moduleType)
-    }
-  | Mty_functor(_, _, moduleType) => getSignature(moduleType)
-  | _ => list{}
-  }
-
-let rec collectExportFromSignatureItem = (~path, si: Types.signature_item) =>
-  switch si {
-  | Sig_value(id, {Types.val_loc: val_loc, val_kind}) if !val_loc.Location.loc_ghost =>
-    let isPrimitive = switch val_kind {
-    | Val_prim(_) => true
-    | _ => false
-    }
-    if !isPrimitive || analyzeExternals {
-      addValueDeclaration(~sideEffects=false, ~path, ~loc=val_loc, Ident.name(id))
-    }
-  | Sig_type(id, t, _) =>
-    if analyzeTypes.contents {
-      DeadType.addDeclaration(~path=list{id |> Ident.name, ...path}, t)
-    }
-  | (Sig_module(id, {Types.md_type: moduleType}, _)
-    | Sig_modtype(id, {Types.mtd_type: Some(moduleType)})) as s =>
-    let collect = switch s {
-    | Sig_modtype(_) => false
-    | _ => true
-    }
-    if collect {
-      getSignature(moduleType) |> List.iter(
-        collectExportFromSignatureItem(~path=list{id |> Ident.name, ...path}),
-      )
-    }
-  | _ => ()
-  }
-
-let processSignature = (signature: Types.signature) => {
-  let module_id = currentModuleName.contents
-  signature |> List.iter(sig_item =>
-    collectExportFromSignatureItem(~path=list{module_id}, sig_item)
-  )
-}
-
-let loadCmtFile = cmtFilePath => {
-  if verbose {
-    Log_.item("Scanning %s@.", cmtFilePath)
-  }
-
-  let {
-    Cmt_format.cmt_annots: cmt_annots,
-    cmt_sourcefile,
-    cmt_value_dependencies,
-  } = Cmt_format.read_cmt(cmtFilePath)
-
-  switch cmt_sourcefile {
-  | None => ()
-
-  | Some(sourceFile_) =>
-    let sourceFile = if Filename.check_suffix(sourceFile_, ".re.ml") {
-      Filename.chop_suffix(sourceFile_, ".ml")
-    } else if Filename.check_suffix(sourceFile_, ".re.mli") {
-      Filename.chop_suffix(sourceFile_, ".re.mli") ++ ".rei"
-    } else {
-      sourceFile_
-    }
-
-    FileHash.addFile(fileReferences, sourceFile)
-    currentSrc := sourceFile
-    currentModuleName := getModuleName(sourceFile)
-
-    if dce.contents {
-      switch cmt_annots {
-      | Interface(signature) =>
-        ProcessDeadAnnotations.signature(signature)
-        processSignature(signature.sig_type)
-      | Implementation(structure) =>
-        let cmtiExists = Sys.file_exists((cmtFilePath |> Filename.chop_extension) ++ ".cmti")
-        if !cmtiExists {
-          ProcessDeadAnnotations.structure(structure)
-        }
-        processSignature(structure.str_type)
-        DeadValue.processStructure(~cmt_value_dependencies, structure)
-      | _ => ()
-      }
-    }
-    if analyzeTermination.contents {
-      switch cmt_annots {
-      | Interface(_) => ()
-      | Implementation(structure) => Arnold.processStructure(structure)
-      | _ => ()
-      }
-    }
-  }
-}
-
-let reportResults = () => {
-  reportDead()
-  WriteDeadAnnotations.write()
-}
-
-let runAnalysis = (~cmtRoot) => {
-  Log_.Color.setup()
-  switch cmtRoot {
-  | Some(root) =>
-    let rec walkSubDirs = dir => {
-      let absDir = dir == "" ? root : \"+++"(root, dir)
-      if Sys.file_exists(absDir) {
-        if Sys.is_directory(absDir) {
-          absDir |> Sys.readdir |> Array.iter(d => walkSubDirs(\"+++"(dir, d)))
-        } else if Filename.check_suffix(absDir, ".cmt") || Filename.check_suffix(absDir, ".cmti") {
-          absDir |> loadCmtFile
-        }
-      }
-    }
-    walkSubDirs("")
-    if dce.contents {
-      reportResults()
-    }
-    if analyzeTermination.contents {
-      Arnold.reportResults()
-    }
-
-  | None =>
-    Paths.setProjectRoot()
-    let lib_bs = \"+++"(GenTypeCommon.projectRoot.contents, \"+++"("lib", "bs"))
-
-    let sourceDirs = ModuleResolver.readSourceDirs(~configSources=None)
-    sourceDirs.dirs |> List.iter(sourceDir => {
-      let libBsSourceDir = Filename.concat(lib_bs, sourceDir)
-      let files = switch Sys.readdir(libBsSourceDir) |> Array.to_list {
-      | files => files
-      | exception Sys_error(_) => list{}
-      }
-      let cmtFiles =
-        files |> List.filter(x =>
-          Filename.check_suffix(x, ".cmt") || Filename.check_suffix(x, ".cmti")
-        )
-      cmtFiles |> List.iter(cmtFile => {
-        let cmtFilePath = Filename.concat(libBsSourceDir, cmtFile)
-        cmtFilePath |> loadCmtFile
-      })
-    })
-
-    if dce.contents {
-      reportResults()
-    }
-    if analyzeTermination.contents {
-      Arnold.reportResults()
-    }
-  }
-}
-
-let runTerminationAnalysis = (~cmtRoot) => {
-  dce := false
-  analyzeTermination := true
-  runAnalysis(~cmtRoot)
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/DeadCommon.res b/jscomp/syntax/tests/idempotency/genType/src/DeadCommon.res
deleted file mode 100644
index e351f22..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/DeadCommon.res
+++ /dev/null
@@ -1,820 +0,0 @@
-/* Adapted from https://github.com/LexiFi/dead_code_analyzer */
-
-// Turn on the main dead code analysis
-let dce = ref(true)
-
-// Turn on type analysis
-let analyzeTypes = ref(true)
-
-let analyzeTermination = ref(false)
-
-let analyzeExternals = true
-
-let verbose = Sys.getenv_opt("Debug") != None
-
-let removeDeadValuesWithSideEffects = false
-
-let recursiveDebug = false
-
-let checkPrefix = prefix_ => {
-  let prefix =
-    GenTypeCommon.projectRoot.contents == ""
-      ? prefix_
-      : Filename.concat(GenTypeCommon.projectRoot.contents, prefix_)
-  let prefixLen = prefix |> String.length
-  sourceDir =>
-    String.length(sourceDir) >= prefixLen && String.sub(sourceDir, 0, prefixLen) == prefix
-}
-
-let rec checkSub = (s1, s2, n) =>
-  n <= 0 || (String.get(s1, n) == String.get(s2, n) && checkSub(s1, s2, n - 1))
-let fileIsImplementationOf = (s1, s2) => {
-  let n1 = String.length(s1)
-  and n2 = String.length(s2)
-  n2 == n1 + 1 && checkSub(s1, s2, n1 - 1)
-}
-
-// Whitelist=prefix only report on source dirs with the given prefix
-let whitelistSourceDir = lazy (
-  switch Sys.getenv_opt("Whitelist") {
-  | None => _sourceDir => true
-  | Some(prefix) => checkPrefix(prefix)
-  }
-)
-
-let posInWhitelist = (pos: Lexing.position) => pos.pos_fname |> Lazy.force(whitelistSourceDir)
-
-// Blacklist=prefix don't report on source dirs with the given prefix
-let blacklistSourceDir = lazy (
-  switch Sys.getenv_opt("Blacklist") {
-  | None => _sourceDir => false
-  | Some(prefix) => checkPrefix(prefix)
-  }
-)
-
-let posInBlacklist = (pos: Lexing.position) => pos.pos_fname |> Lazy.force(blacklistSourceDir)
-
-let write = Sys.getenv_opt("Write") != None
-
-let deadAnnotation = "dead"
-let liveAnnotation = "live"
-
-/* Location printer: `filename:line: ' */
-let posToString = (~printCol=true, ~shortFile=true, pos: Lexing.position) => {
-  let file = pos.Lexing.pos_fname
-  let line = pos.Lexing.pos_lnum
-  let col = pos.Lexing.pos_cnum - pos.Lexing.pos_bol
-  (shortFile ? file |> Filename.basename : file) ++
-  (":" ++
-  (string_of_int(line) ++ (printCol ? ":" ++ string_of_int(col) : ": ")))
-}
-
-let posIsReason = (pos: Lexing.position) =>
-  Filename.check_suffix(pos.pos_fname, ".re") || Filename.check_suffix(pos.pos_fname, ".rei")
-
-/* *******   ATTRIBUTES   ******* */
-module PosSet = Set.Make({
-  type t = Lexing.position
-  let compare = compare
-})
-
-module PosHash = {
-  include Hashtbl.Make({
-    type t = Lexing.position
-
-    let hash = x => {
-      let s = Filename.basename(x.Lexing.pos_fname)
-      Hashtbl.hash((x.Lexing.pos_cnum, s))
-    }
-
-    let equal = (x: t, y) => x == y
-  })
-
-  let findSet = (h, k) =>
-    try find(h, k) catch {
-    | Not_found => PosSet.empty
-    }
-
-  let addSet = (h, k, v) => {
-    let set = findSet(h, k)
-    replace(h, k, PosSet.add(v, set))
-  }
-}
-
-module FileSet = Set.Make(String)
-
-module FileHash = {
-  include Hashtbl.Make({
-    type t = string
-
-    let hash = (x: t) => Hashtbl.hash(x)
-
-    let equal = (x: t, y) => x == y
-  })
-
-  let findSet = (table, key) =>
-    try find(table, key) catch {
-    | Not_found => FileSet.empty
-    }
-
-  let addFile = (table, key) => {
-    let set = findSet(table, key)
-    replace(table, key, set)
-  }
-
-  let addSet = (table, key, value) => {
-    let set = findSet(table, key)
-    replace(table, key, FileSet.add(value, set))
-  }
-}
-
-type path = list<string>
-
-type declKind =
-  | RecordLabel
-  | VariantCase
-  | Value
-
-type decl = {
-  declKind: declKind,
-  path: path,
-  pos: Lexing.position,
-  posEnd: Lexing.position,
-  posStart: Lexing.position,
-  mutable resolved: bool,
-  sideEffects: bool,
-}
-
-type decls = PosHash.t<decl>
-
-let decls: decls = PosHash.create(256) /* all exported declarations */
-let moduleDecls: Hashtbl.t<string, PosSet.t> = Hashtbl.create(1) /* from module name to its decls */
-
-let valueReferences: PosHash.t<PosSet.t> = PosHash.create(256) /* all value references */
-let typeReferences: PosHash.t<PosSet.t> = PosHash.create(256) /* all type references */
-
-let fileReferences: FileHash.t<FileSet.t> = FileHash.create(256) /* references across files */
-
-let fields: Hashtbl.t<string, Location.t> = Hashtbl.create(
-  256,
-) /* link from fields (record/variant) paths and locations */
-
-let currentSrc = ref("")
-let currentModuleName = ref("")
-let currentBindings = ref(PosSet.empty)
-let lastBinding = ref(Location.none)
-let getLastBinding = () => lastBinding.contents
-let maxValuePosEnd = ref(Lexing.dummy_pos) // max end position of a value reported dead
-
-let declGetLoc = decl => {
-  Location.loc_start: decl.posStart,
-  loc_end: decl.posEnd,
-  loc_ghost: false,
-}
-
-let getPosOfValue = (~moduleName, ~valueName) =>
-  switch Hashtbl.find_opt(moduleDecls, moduleName) {
-  | Some(posSet) =>
-    posSet |> PosSet.find_first_opt(pos =>
-      switch PosHash.find_opt(decls, pos) {
-      | Some({declKind: Value, path: list{name, ..._}}) if name == valueName => true
-      | _ => false
-      }
-    )
-  | None => None
-  }
-
-let getDeclPositions = (~moduleName) =>
-  switch Hashtbl.find_opt(moduleDecls, moduleName) {
-  | Some(posSet) => posSet
-  | None => PosSet.empty
-  }
-
-/* Keep track of the module path while traversing with Tast_mapper */
-let currentModulePath: ref<path> = ref(list{})
-
-/* *******   HELPERS   ******* */
-
-let addValueReference = (~addFileReference, ~locFrom: Location.t, ~locTo: Location.t) => {
-  let lastBinding = getLastBinding()
-  let locFrom = lastBinding == Location.none ? locFrom : lastBinding
-  if !locFrom.loc_ghost {
-    if verbose {
-      Log_.item(
-        "addValueReference %s --> %s@.",
-        locFrom.loc_start |> posToString,
-        locTo.loc_start |> posToString,
-      )
-    }
-    PosHash.addSet(valueReferences, locTo.loc_start, locFrom.loc_start)
-    if (
-      addFileReference &&
-      (!locTo.loc_ghost &&
-      (!locFrom.loc_ghost && locFrom.loc_start.pos_fname != locTo.loc_start.pos_fname))
-    ) {
-      FileHash.addSet(fileReferences, locFrom.loc_start.pos_fname, locTo.loc_start.pos_fname)
-    }
-  }
-}
-
-let iterFilesFromRootsToLeaves = iterFun => {
-  /* For each file, the number of incoming references */
-  let inverseReferences: Hashtbl.t<string, int> = Hashtbl.create(1)
-  /* For each number of incoming references, the files */
-  let referencesByNumber: Hashtbl.t<int, FileSet.t> = Hashtbl.create(1)
-
-  let getNum = fileName =>
-    try Hashtbl.find(inverseReferences, fileName) catch {
-    | Not_found => 0
-    }
-
-  let getSet = num =>
-    try Hashtbl.find(referencesByNumber, num) catch {
-    | Not_found => FileSet.empty
-    }
-
-  let addIncomingEdge = fileName => {
-    let oldNum = getNum(fileName)
-    let newNum = oldNum + 1
-    let oldSetAtNum = getSet(oldNum)
-    let newSetAtNum = FileSet.remove(fileName, oldSetAtNum)
-    let oldSetAtNewNum = getSet(newNum)
-    let newSetAtNewNum = FileSet.add(fileName, oldSetAtNewNum)
-    Hashtbl.replace(inverseReferences, fileName, newNum)
-    Hashtbl.replace(referencesByNumber, oldNum, newSetAtNum)
-    Hashtbl.replace(referencesByNumber, newNum, newSetAtNewNum)
-  }
-
-  let removeIncomingEdge = fileName => {
-    let oldNum = getNum(fileName)
-    let newNum = oldNum - 1
-    let oldSetAtNum = getSet(oldNum)
-    let newSetAtNum = FileSet.remove(fileName, oldSetAtNum)
-    let oldSetAtNewNum = getSet(newNum)
-    let newSetAtNewNum = FileSet.add(fileName, oldSetAtNewNum)
-    Hashtbl.replace(inverseReferences, fileName, newNum)
-    Hashtbl.replace(referencesByNumber, oldNum, newSetAtNum)
-    Hashtbl.replace(referencesByNumber, newNum, newSetAtNewNum)
-  }
-
-  let isSourceFile = fileName => FileHash.mem(fileReferences, fileName)
-
-  let addEdge = (fromFile, toFile) =>
-    if isSourceFile(fromFile) {
-      addIncomingEdge(toFile)
-    }
-
-  let removeEdge = (fromFile, toFile) =>
-    if isSourceFile(fromFile) {
-      removeIncomingEdge(toFile)
-    }
-
-  fileReferences |> FileHash.iter((fromFile, set) => {
-    if getNum(fromFile) == 0 {
-      Hashtbl.replace(referencesByNumber, 0, FileSet.add(fromFile, getSet(0)))
-    }
-    set |> FileSet.iter(toFile => addEdge(fromFile, toFile))
-  })
-
-  while getSet(0) != FileSet.empty {
-    let filesWithNoIncomingReferences = getSet(0)
-    Hashtbl.remove(referencesByNumber, 0)
-    filesWithNoIncomingReferences |> FileSet.iter(fileName => {
-      iterFun(fileName)
-      let references = try FileHash.find(fileReferences, fileName) catch {
-      | Not_found => FileSet.empty
-      }
-      references |> FileSet.iter(toFile => removeEdge(fileName, toFile))
-    })
-  }
-  // Process any remaining items in case of circular references
-  referencesByNumber |> Hashtbl.iter((_num, set) =>
-    if FileSet.is_empty(set) {
-      ()
-    } else {
-      set |> FileSet.iter(fileName => {
-        let pos = {...Lexing.dummy_pos, pos_fname: fileName}
-        let loc = {...Location.none, loc_start: pos, loc_end: pos}
-        Log_.info(~loc, ~name="Warning Dead Analysis Cycle", (ppf, ()) =>
-          Format.fprintf(
-            ppf,
-            "Results for %s could be inaccurate because of circular references",
-            fileName,
-          )
-        )
-        iterFun(fileName)
-      })
-    }
-  )
-}
-
-/* *******   PROCESSING  ******* */
-
-let pathToString = path => path |> List.rev |> String.concat(".")
-
-let pathWithoutHead = path => path |> List.rev |> List.tl |> String.concat(".")
-
-let annotateAtEnd = (~pos) => !posIsReason(pos)
-
-let getPosAnnotation = decl => annotateAtEnd(~pos=decl.pos) ? decl.posEnd : decl.posStart
-
-let addDeclaration_ = (~sideEffects=false, ~declKind, ~path, ~loc: Location.t, name) => {
-  let pos = loc.loc_start
-  let posStart = pos
-  let posEnd = loc.loc_end
-
-  /* a .cmi file can contain locations from other files.
-       For instance:
-           module M : Set.S with type elt = int
-       will create value definitions whose location is in set.mli
- */
-  if (
-    !loc.loc_ghost &&
-    (currentSrc.contents == pos.pos_fname || currentModuleName.contents === "*include*")
-  ) {
-    if verbose {
-      Log_.item(
-        "add%sDeclaration %s %s@.",
-        declKind == Value ? "Value" : "Type",
-        name,
-        pos |> posToString,
-      )
-    }
-
-    switch path {
-    | list{moduleName} if declKind == Value =>
-      let oldSet = getDeclPositions(~moduleName)
-      Hashtbl.replace(moduleDecls, moduleName, PosSet.add(pos, oldSet))
-    | _ => ()
-    }
-    let decl = {
-      declKind: declKind,
-      path: list{name, ...path},
-      pos: pos,
-      posEnd: posEnd,
-      posStart: posStart,
-      resolved: false,
-      sideEffects: sideEffects,
-    }
-    PosHash.replace(decls, pos, decl)
-  }
-}
-
-let addTypeDeclaration = addDeclaration_
-
-let addValueDeclaration = (~sideEffects, ~path, ~loc: Location.t, name) =>
-  name |> addDeclaration_(~sideEffects, ~declKind=Value, ~path, ~loc)
-
-/* *** REPORTING *** */
-
-/* Keep track of the location of values annotated @genType or @dead */
-module ProcessDeadAnnotations = {
-  type annotatedAs =
-    | GenType
-    | Dead
-    | Live
-
-  let positionsAnnotated = PosHash.create(1)
-
-  let isAnnotatedDead = pos => PosHash.find_opt(positionsAnnotated, pos) == Some(Dead)
-
-  let isAnnotatedGenTypeOrLive = pos =>
-    switch PosHash.find_opt(positionsAnnotated, pos) {
-    | Some(Live | GenType) => true
-    | Some(Dead)
-    | None => false
-    }
-
-  let isAnnotatedGenTypeOrDead = pos =>
-    switch PosHash.find_opt(positionsAnnotated, pos) {
-    | Some(Dead | GenType) => true
-    | Some(Live)
-    | None => false
-    }
-
-  let annotateGenType = (pos: Lexing.position) => PosHash.replace(positionsAnnotated, pos, GenType)
-
-  let annotateDead = (pos: Lexing.position) => PosHash.replace(positionsAnnotated, pos, Dead)
-
-  let annotateLive = (pos: Lexing.position) => PosHash.replace(positionsAnnotated, pos, Live)
-
-  let processAttributes = (~pos, attributes) => {
-    if (
-      attributes
-      |> Annotation.getAttributePayload(Annotation.tagIsOneOfTheGenTypeAnnotations) != None
-    ) {
-      pos |> annotateGenType
-    }
-    if attributes |> Annotation.getAttributePayload(\"="(deadAnnotation)) != None {
-      pos |> annotateDead
-    } else if attributes |> Annotation.getAttributePayload(\"="(liveAnnotation)) != None {
-      pos |> annotateLive
-    }
-  }
-
-  let collectExportLocations = () => {
-    let super = Tast_mapper.default
-    let value_binding = (
-      self,
-      {vb_attributes, vb_pat} as value_binding: Typedtree.value_binding,
-    ) => {
-      switch vb_pat.pat_desc {
-      | Tpat_var(_id, pLoc) => vb_attributes |> processAttributes(~pos=pLoc.loc.loc_start)
-
-      | _ => ()
-      }
-      super.value_binding(self, value_binding)
-    }
-    let type_kind = (self, typeKind: Typedtree.type_kind) => {
-      switch typeKind {
-      | Ttype_record(labelDeclarations) =>
-        labelDeclarations |> List.iter(({ld_attributes, ld_loc}: Typedtree.label_declaration) =>
-          ld_attributes |> processAttributes(~pos=ld_loc.loc_start)
-        )
-      | Ttype_variant(constructorDeclarations) =>
-        constructorDeclarations |> List.iter((
-          {cd_attributes, cd_loc}: Typedtree.constructor_declaration,
-        ) => cd_attributes |> processAttributes(~pos=cd_loc.loc_start))
-      | _ => ()
-      }
-      super.type_kind(self, typeKind)
-    }
-    let value_description = (
-      self,
-      {val_attributes, val_val} as value_description: Typedtree.value_description,
-    ) => {
-      val_attributes |> processAttributes(~pos=val_val.val_loc.loc_start)
-      super.value_description(self, value_description)
-    }
-    {
-      ...super,
-      type_kind: type_kind,
-      value_binding: value_binding,
-      value_description: value_description,
-    }
-  }
-
-  let structure = structure => {
-    let collectExportLocations = collectExportLocations()
-    structure |> collectExportLocations.structure(collectExportLocations) |> ignore
-  }
-  let signature = signature => {
-    let collectExportLocations = collectExportLocations()
-    signature |> collectExportLocations.signature(collectExportLocations) |> ignore
-  }
-}
-
-module WriteDeadAnnotations = {
-  type line = {
-    mutable declarations: list<decl>,
-    original: string,
-  }
-
-  let rec lineToString_ = ({original, declarations}) =>
-    switch declarations {
-    | list{} => original
-    | list{{declKind, path, pos} as decl, ...nextDeclarations} =>
-      let isReason = posIsReason(pos)
-      let annotationStr =
-        (isReason ? "" : " ") ++
-        ("[" ++
-        ((isReason || declKind != Value ? "@" : "@@") ++
-        (deadAnnotation ++
-        (" \"" ++ ((path |> pathWithoutHead) ++ "\"] ")))))
-      let posAnnotation = decl |> getPosAnnotation
-      let col = posAnnotation.pos_cnum - posAnnotation.pos_bol
-      let originalLen = String.length(original)
-      {
-        original: if String.length(original) >= col && col > 0 {
-          let original1 = String.sub(original, 0, col)
-          let original2 = String.sub(original, col, originalLen - col)
-          original1 ++ (annotationStr ++ original2)
-        } else if isReason {
-          annotationStr ++ original
-        } else {
-          original ++ annotationStr
-        },
-        declarations: nextDeclarations,
-      } |> lineToString_
-    }
-
-  let lineToString = ({original, declarations}) => {
-    let declarations =
-      declarations |> List.sort((decl1, decl2) =>
-        getPosAnnotation(decl2).pos_cnum - getPosAnnotation(decl1).pos_cnum
-      )
-    lineToString_({original: original, declarations: declarations})
-  }
-
-  let currentFile = ref("")
-  let currentFileLines: ref<array<line>> = ref([])
-
-  let readFile = fileName => {
-    let channel = open_in(fileName)
-    let lines = ref(list{})
-    let rec loop = () => {
-      let line = {original: input_line(channel), declarations: list{}}
-      lines := list{line, ...lines.contents}
-      loop()
-    }
-    try loop() catch {
-    | End_of_file =>
-      close_in(channel)
-      lines.contents |> List.rev |> Array.of_list
-    }
-  }
-
-  let writeFile = (fileName, lines) =>
-    if fileName != "" && write {
-      let channel = open_out(fileName)
-      let lastLine = Array.length(lines)
-      lines |> Array.iteri((n, line) => {
-        output_string(channel, line |> lineToString)
-        if n < lastLine - 1 {
-          output_char(channel, '\n')
-        }
-      })
-      close_out(channel)
-    }
-
-  let onDeadDecl = (~ppf, decl) => {
-    let fileName = decl.pos.pos_fname
-    if Sys.file_exists(fileName) {
-      if fileName != currentFile.contents {
-        writeFile(currentFile.contents, currentFileLines.contents)
-        currentFile := fileName
-        currentFileLines := readFile(fileName)
-      }
-
-      let indexInLines = (decl |> getPosAnnotation).pos_lnum - 1
-
-      if indexInLines < Array.length(currentFileLines.contents) {
-        let line = currentFileLines.contents[indexInLines]
-        line.declarations = list{decl, ...line.declarations}
-        Format.fprintf(ppf, "  <-- line %d@.  %s@.", decl.pos.pos_lnum, line |> lineToString)
-      } else {
-        Format.fprintf(ppf, "  <-- Can't find line %d@.", decl.pos.pos_lnum)
-      }
-    } else {
-      Format.fprintf(ppf, "  <-- can't find file@.")
-    }
-  }
-
-  let write = () => writeFile(currentFile.contents, currentFileLines.contents)
-}
-
-let declIsDead = (~refs, decl) => {
-  let liveRefs = refs |> PosSet.filter(p => !ProcessDeadAnnotations.isAnnotatedDead(p))
-  liveRefs |> PosSet.cardinal == 0 && !ProcessDeadAnnotations.isAnnotatedGenTypeOrLive(decl.pos)
-}
-
-let doReportDead = pos =>
-  !ProcessDeadAnnotations.isAnnotatedGenTypeOrDead(pos) &&
-  (posInWhitelist(pos) &&
-  !posInBlacklist(pos))
-
-let checkSideEffects = decl => removeDeadValuesWithSideEffects || !decl.sideEffects
-
-let rec resolveRecursiveRefs = (
-  ~deadDeclarations,
-  ~level,
-  ~orderedFiles,
-  ~refs,
-  ~refsBeingResolved,
-  decl,
-): bool =>
-  switch decl.pos {
-  | _ if decl.resolved =>
-    if recursiveDebug {
-      Log_.item("recursiveDebug %s [%d] already resolved@.", decl.path |> pathToString, level)
-    }
-    decl.pos |> ProcessDeadAnnotations.isAnnotatedDead
-  | _ if PosSet.mem(decl.pos, refsBeingResolved.contents) =>
-    if recursiveDebug {
-      Log_.item(
-        "recursiveDebug %s [%d] is being resolved: assume dead@.",
-        decl.path |> pathToString,
-        level,
-      )
-    }
-    true
-  | _ =>
-    if recursiveDebug {
-      Log_.item("recursiveDebug resolving %s [%d]@.", decl.path |> pathToString, level)
-    }
-    refsBeingResolved := PosSet.add(decl.pos, refsBeingResolved.contents)
-    let allDepsResolved = ref(true)
-    let newRefs = refs |> PosSet.filter(x =>
-      if x == decl.pos {
-        if recursiveDebug {
-          Log_.item("recursiveDebug %s ignoring reference to self@.", decl.path |> pathToString)
-        }
-        false
-      } else {
-        switch PosHash.find_opt(decls, x) {
-        | None =>
-          if recursiveDebug {
-            Log_.item("recursiveDebug can't find decl for %s@.", x |> posToString)
-          }
-          true
-        | Some(xDecl) =>
-          let xRefs = PosHash.findSet(xDecl.declKind == Value ? valueReferences : typeReferences, x)
-          let xDeclIsDead =
-            xDecl |> resolveRecursiveRefs(
-              ~deadDeclarations,
-              ~level=level + 1,
-              ~orderedFiles,
-              ~refs=xRefs,
-              ~refsBeingResolved,
-            )
-          if !xDecl.resolved {
-            allDepsResolved := false
-          }
-          !xDeclIsDead
-        }
-      }
-    )
-
-    let isDead = decl |> declIsDead(~refs=newRefs)
-    let isResolved = !isDead || (allDepsResolved.contents || level == 0)
-
-    if isResolved {
-      decl.resolved = true
-
-      if isDead {
-        if decl.pos |> doReportDead {
-          deadDeclarations := list{decl, ...deadDeclarations.contents}
-        }
-        if decl |> checkSideEffects {
-          decl.pos |> ProcessDeadAnnotations.annotateDead
-        }
-      }
-
-      if verbose {
-        let refsString = newRefs |> PosSet.elements |> List.map(posToString) |> String.concat(", ")
-        Log_.item(
-          "%s %s %s: %d references (%s) [%d]@.",
-          isDead ? "Dead" : "Live",
-          decl.declKind == Value ? "Value" : "Type",
-          decl.path |> pathToString,
-          newRefs |> PosSet.cardinal,
-          refsString,
-          level,
-        )
-      }
-    }
-
-    isDead
-  }
-
-module Decl = {
-  let compareUsingDependencies = (
-    ~orderedFiles,
-    {
-      declKind: kind1,
-      path: path1,
-      pos: {pos_fname: fname1, pos_lnum: lnum1, pos_bol: bol1, pos_cnum: cnum1},
-    },
-    {
-      declKind: kind2,
-      path: path2,
-      pos: {pos_fname: fname2, pos_lnum: lnum2, pos_bol: bol2, pos_cnum: cnum2},
-    },
-  ) => {
-    let findPosition = fn => Hashtbl.find(orderedFiles, fn)
-
-    let pathIsImplementationOf = (path1, path2) =>
-      switch (path1, path2) {
-      | (list{name1, ...restPath1}, list{name2, ...restPath2}) =>
-        String.get(name1, 0) == '+' &&
-          (String.get(name2, 0) != '+' &&
-          (List.length(restPath1) > 1 && restPath1 == restPath2))
-      | (list{}, _)
-      | (_, list{}) => false
-      }
-
-    /* From the root of the file dependency DAG to the leaves.
-     From the bottom of the file to the top. */
-    let (position1, position2) = (fname1 |> findPosition, fname2 |> findPosition)
-    let (p1, p2) = pathIsImplementationOf(path1, path2)
-      ? (1, 0)
-      : pathIsImplementationOf(path2, path1)
-      ? (0, 1)
-      : (0, 0)
-    compare((position1, p1, lnum2, bol2, cnum2, kind1), (position2, p2, lnum1, bol1, cnum1, kind2))
-  }
-
-  let compareForReporting = (
-    {declKind: kind1, pos: {pos_fname: fname1, pos_lnum: lnum1, pos_bol: bol1, pos_cnum: cnum1}},
-    {declKind: kind2, pos: {pos_fname: fname2, pos_lnum: lnum2, pos_bol: bol2, pos_cnum: cnum2}},
-  ) => compare((fname1, lnum1, bol1, cnum1, kind1), (fname2, lnum2, bol2, cnum2, kind2))
-
-  let emitWarning = (~message, ~loc, ~name, ~path) =>
-    Log_.info(~loc, ~name, (ppf, ()) =>
-      Format.fprintf(ppf, "@{<info>%s@} %s", path |> pathWithoutHead, message)
-    )
-
-  let isInsideReportedValue = decl => {
-    let fileHasChanged = maxValuePosEnd.contents.pos_fname != decl.pos.pos_fname
-
-    let insideReportedValue =
-      decl.declKind == Value &&
-        (!fileHasChanged &&
-        maxValuePosEnd.contents.pos_cnum > decl.pos.pos_cnum)
-
-    if !insideReportedValue {
-      if decl.declKind == Value {
-        if fileHasChanged || decl.posEnd.pos_cnum > maxValuePosEnd.contents.pos_cnum {
-          maxValuePosEnd := decl.posEnd
-        }
-      }
-    }
-
-    insideReportedValue
-  }
-
-  let report = (~ppf, decl) => {
-    let noSideEffectsOrUnderscore =
-      !decl.sideEffects || {
-        let name = decl.path |> List.hd
-        name |> String.length >= 2 &&
-          (String.get(name, 0) == '_' || (String.get(name, 0) == '+' && String.get(name, 1) == '_'))
-      }
-
-    let (name, message) = switch decl.declKind {
-    | Value => (
-        "Warning Dead Value" ++ (!noSideEffectsOrUnderscore ? " With Side Effects" : ""),
-        switch decl.path {
-        | list{"_", ..._} => "has no side effects and can be removed"
-        | _ => "is never used" ++ (!noSideEffectsOrUnderscore ? " and could have side effects" : "")
-        },
-      )
-    | RecordLabel => ("Warning Dead Type", "is a record label never used to read a value")
-    | VariantCase => ("Warning Dead Type", "is a variant case which is never constructed")
-    }
-
-    let insideReportedValue = decl |> isInsideReportedValue
-
-    let shouldEmitWarning = !insideReportedValue
-    let shouldWriteAnnotation = shouldEmitWarning && decl |> checkSideEffects
-    if shouldEmitWarning {
-      emitWarning(~message, ~loc=decl |> declGetLoc, ~name, ~path=decl.path)
-    }
-    if shouldWriteAnnotation {
-      decl |> WriteDeadAnnotations.onDeadDecl(~ppf)
-    }
-  }
-}
-
-let reportDead = () => {
-  let iterDeclInOrder = (~orderedFiles, ~deadDeclarations, decl) => {
-    let refs =
-      decl.pos |> PosHash.findSet(decl.declKind == Value ? valueReferences : typeReferences)
-    resolveRecursiveRefs(
-      ~deadDeclarations,
-      ~level=0,
-      ~orderedFiles,
-      ~refsBeingResolved=ref(PosSet.empty),
-      ~refs,
-      decl,
-    ) |> ignore
-  }
-
-  if verbose {
-    Log_.item("@.File References@.@.")
-    fileReferences |> FileHash.iter((file, files) =>
-      Log_.item(
-        "%s -->> %s@.",
-        file |> Filename.basename,
-        files |> FileSet.elements |> List.map(Filename.basename) |> String.concat(", "),
-      )
-    )
-  }
-
-  let declarations = PosHash.fold(
-    (_pos, decl, declarations) => list{decl, ...declarations},
-    decls,
-    list{},
-  )
-
-  let orderedFiles = Hashtbl.create(256)
-  iterFilesFromRootsToLeaves({
-    let current = ref(0)
-    fileName => {
-      incr(current)
-      Hashtbl.add(orderedFiles, fileName, current.contents)
-    }
-  })
-
-  let orderedDeclarations =
-    declarations |> List.fast_sort(
-      Decl.compareUsingDependencies(~orderedFiles),
-    ) /* analyze in reverse order */
-
-  let deadDeclarations = ref(list{})
-  orderedDeclarations |> List.iter(iterDeclInOrder(~orderedFiles, ~deadDeclarations))
-
-  let ppf = Format.std_formatter
-  let sortedDeadDeclarations = deadDeclarations.contents |> List.fast_sort(Decl.compareForReporting)
-  sortedDeadDeclarations |> List.iter(Decl.report(~ppf))
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/DeadType.res b/jscomp/syntax/tests/idempotency/genType/src/DeadType.res
deleted file mode 100644
index be04809..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/DeadType.res
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Adapted from https://github.com/LexiFi/dead_code_analyzer */
-
-open DeadCommon
-
-let typeDependencies = ref(list{})
-
-let addTypeReference = (~posFrom, ~posTo) => {
-  if verbose {
-    Log_.item("addTypeReference %s --> %s@.", posFrom |> posToString, posTo |> posToString)
-  }
-  PosHash.addSet(typeReferences, posTo, posFrom)
-}
-
-let addDeclaration = (~path as path_, {type_kind, type_manifest}: Types.type_declaration) => {
-  let save = (~declKind, ~loc: Location.t, ~name) => {
-    let isInterfaceFile = Filename.check_suffix(loc.loc_start.pos_fname, "i")
-    let name = isInterfaceFile ? name : "+" ++ name
-    let path = list{name, ...path_} |> pathToString
-    if type_manifest == None {
-      addTypeDeclaration(~declKind, ~path=path_, ~loc, name)
-    }
-    Hashtbl.replace(fields, path, loc)
-  }
-
-  switch type_kind {
-  | Type_record(l, _) =>
-    List.iter(
-      ({Types.ld_id: ld_id, ld_loc}) =>
-        save(~declKind=RecordLabel, ~loc=ld_loc, ~name=Ident.name(ld_id)),
-      l,
-    )
-  | Type_variant(l) =>
-    List.iter(
-      ({Types.cd_id: cd_id, cd_loc}) =>
-        save(~declKind=VariantCase, ~loc=cd_loc, ~name=Ident.name(cd_id)),
-      l,
-    )
-  | _ => ()
-  }
-}
-
-let processTypeDeclaration = (typeDeclaration: Typedtree.type_declaration) => {
-  let extendTypeDependencies = (loc1: Location.t, loc2: Location.t) =>
-    if loc1.loc_start != loc2.loc_start {
-      if verbose {
-        Log_.item(
-          "extendTypeDependencies %s --> %s@.",
-          loc1.loc_start |> posToString,
-          loc2.loc_start |> posToString,
-        )
-      }
-
-      typeDependencies := list{(loc1, loc2), ...typeDependencies.contents}
-    }
-  let updateDependencies = (name, loc) => {
-    let path2 =
-      list{
-        currentModuleName.contents,
-        ...List.rev(list{
-          name.Asttypes.txt,
-          typeDeclaration.typ_name.txt,
-          ...currentModulePath.contents,
-        }),
-      } |> String.concat(".")
-
-    try switch typeDeclaration.typ_manifest {
-    | Some({ctyp_desc: Ttyp_constr(_, {txt}, _)}) =>
-      let path1 =
-        \"@"(
-          list{currentModuleName.contents, ...Longident.flatten(txt)},
-          list{name.Asttypes.txt},
-        ) |> String.concat(".")
-      let loc1 = Hashtbl.find(fields, path1)
-      let loc2 = Hashtbl.find(fields, path2)
-      extendTypeDependencies(loc, loc1)
-      extendTypeDependencies(loc1, loc2)
-    | _ => ()
-    } catch {
-    | _ => ()
-    }
-    switch Hashtbl.find_opt(fields, path2) {
-    | Some(loc2) => extendTypeDependencies(loc, loc2)
-    | None => Hashtbl.add(fields, path2, loc)
-    }
-  }
-
-  switch typeDeclaration.typ_kind {
-  | Ttype_record(l) =>
-    l |> List.iter(({Typedtree.ld_name: ld_name, ld_loc}) => updateDependencies(ld_name, ld_loc))
-
-  | Ttype_variant(l) =>
-    l |> List.iter(({Typedtree.cd_name: cd_name, cd_loc}) => updateDependencies(cd_name, cd_loc))
-
-  | _ => ()
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/DeadValue.res b/jscomp/syntax/tests/idempotency/genType/src/DeadValue.res
deleted file mode 100644
index fc5587f..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/DeadValue.res
+++ /dev/null
@@ -1,340 +0,0 @@
-/* Adapted from https://github.com/LexiFi/dead_code_analyzer */
-
-open DeadCommon
-
-let whiteListSideEffects = list{
-  "Pervasives./.",
-  "Pervasives.ref",
-  "Int64.mul",
-  "Int64.neg",
-  "Int64.sub",
-  "Int64.shift_left",
-  "Int64.one",
-  "String.length",
-}
-let whiteTableSideEffects = lazy {
-  let tbl = Hashtbl.create(11)
-
-  whiteListSideEffects |> List.iter(s => Hashtbl.add(tbl, s, ()))
-  tbl
-}
-
-let pathIsWhitelistedForSideEffects = path =>
-  switch path |> Path.flatten {
-  | #Ok(id, mods) =>
-    Hashtbl.mem(
-      Lazy.force(whiteTableSideEffects),
-      list{Ident.name(id), ...mods} |> String.concat("."),
-    )
-  | #Contains_apply => false
-  }
-
-let rec exprNoSideEffects = (expr: Typedtree.expression) =>
-  switch expr.exp_desc {
-  | Texp_ident(_)
-  | Texp_constant(_) => true
-  | Texp_construct(_, _, el) => el |> List.for_all(exprNoSideEffects)
-  | Texp_function(_) => true
-  | Texp_apply({exp_desc: Texp_ident(path, _, _)}, args)
-    if path |> pathIsWhitelistedForSideEffects =>
-    args |> List.for_all(((_, eo)) => eo |> exprOptNoSideEffects)
-  | Texp_apply(_) => false
-  | Texp_sequence(e1, e2) => e1 |> exprNoSideEffects && e2 |> exprNoSideEffects
-  | Texp_let(_, vbs, e) =>
-    vbs |> List.for_all((vb: Typedtree.value_binding) => vb.vb_expr |> exprNoSideEffects) &&
-      e |> exprNoSideEffects
-  | Texp_record({fields, extended_expression}) =>
-    fields |> Array.for_all(fieldNoSideEffects) && extended_expression |> exprOptNoSideEffects
-  | Texp_assert(_) => false
-  | Texp_match(e, casesOK, casesExn, partial) =>
-    partial == Total &&
-      (e |> exprNoSideEffects &&
-      (casesOK |> List.for_all(caseNoSideEffects) && casesExn |> List.for_all(caseNoSideEffects)))
-  | Texp_letmodule(_) => false
-  | Texp_lazy(e) => e |> exprNoSideEffects
-  | Texp_try(e, cases) => e |> exprNoSideEffects && cases |> List.for_all(caseNoSideEffects)
-  | Texp_tuple(el) => el |> List.for_all(exprNoSideEffects)
-  | Texp_variant(_lbl, eo) => eo |> exprOptNoSideEffects
-  | Texp_field(e, _lid, _ld) => e |> exprNoSideEffects
-  | Texp_setfield(_) => false
-  | Texp_array(el) => el |> List.for_all(exprNoSideEffects)
-  | Texp_ifthenelse(e1, e2, eo) =>
-    e1 |> exprNoSideEffects && (e2 |> exprNoSideEffects && eo |> exprOptNoSideEffects)
-  | Texp_while(e1, e2) => e1 |> exprNoSideEffects && e2 |> exprNoSideEffects
-  | Texp_for(_id, _pat, e1, e2, _dir, e3) =>
-    e1 |> exprNoSideEffects && (e2 |> exprNoSideEffects && e3 |> exprNoSideEffects)
-  | Texp_send(_) => false
-  | Texp_new(_) => true
-  | Texp_instvar(_) => true
-  | Texp_setinstvar(_) => false
-  | Texp_override(_) => false
-  | Texp_letexception(_ec, e) => e |> exprNoSideEffects
-  | Texp_object(_) => true
-  | Texp_pack(_) => false
-  | Texp_unreachable => false
-  | Texp_extension_constructor(_) => true
-  }
-and exprOptNoSideEffects = eo =>
-  switch eo {
-  | None => true
-  | Some(e) => e |> exprNoSideEffects
-  }
-and fieldNoSideEffects = ((_ld, rld): (_, Typedtree.record_label_definition)) =>
-  switch rld {
-  | Kept(_typeExpr) => true
-  | Overridden(_lid, e) => e |> exprNoSideEffects
-  }
-and caseNoSideEffects = ({c_guard, c_rhs}: Typedtree.case) =>
-  c_guard |> exprOptNoSideEffects && c_rhs |> exprNoSideEffects
-
-let checkAnyBindingWithNoSideEffects = (
-  {vb_pat: {pat_desc}, vb_expr: expr, vb_loc: loc}: Typedtree.value_binding,
-) =>
-  switch pat_desc {
-  | Tpat_any if exprNoSideEffects(expr) && !loc.loc_ghost =>
-    let name = "_"
-    let path = \"@"(currentModulePath.contents, list{currentModuleName.contents})
-    addValueDeclaration(~path, ~loc, ~sideEffects=false, name)
-  | _ => ()
-  }
-
-let collectValueBinding = (super, self, vb: Typedtree.value_binding) => {
-  let oldCurrentBindings = currentBindings.contents
-  let oldLastBinding = lastBinding.contents
-  checkAnyBindingWithNoSideEffects(vb)
-  let loc = switch vb.vb_pat.pat_desc {
-  | Tpat_var(id, {loc: {loc_start, loc_ghost} as loc}) if !loc_ghost && !vb.vb_loc.loc_ghost =>
-    let name = "+" ++ Ident.name(id)
-    let exists = switch PosHash.find_opt(decls, loc_start) {
-    | Some({declKind: Value}) => true
-    | _ => false
-    }
-    let path = \"@"(currentModulePath.contents, list{currentModuleName.contents})
-    if !exists {
-      let sideEffects = !exprNoSideEffects(vb.vb_expr)
-      addValueDeclaration(~path, ~loc, ~sideEffects, name)
-    }
-    switch PosHash.find_opt(decls, loc_start) {
-    | None => ()
-    | Some(decl) =>
-      // Value bindings contain the correct location for the entire declaration: update final position.
-      // The previous value was taken from the signature, which only has positions for the id.
-
-      let sideEffects = !exprNoSideEffects(vb.vb_expr)
-      PosHash.replace(
-        decls,
-        loc_start,
-        {
-          ...decl,
-          posEnd: vb.vb_loc.loc_end,
-          posStart: vb.vb_loc.loc_start,
-          sideEffects: sideEffects,
-        },
-      )
-    }
-    loc
-  | _ => getLastBinding()
-  }
-  currentBindings := PosSet.add(loc.loc_start, currentBindings.contents)
-  lastBinding := loc
-  let r = super.Tast_mapper.value_binding(self, vb)
-  currentBindings := oldCurrentBindings
-  lastBinding := oldLastBinding
-  r
-}
-
-let collectExpr = (super, self, e: Typedtree.expression) => {
-  let locFrom = e.exp_loc
-  switch e.exp_desc {
-  | Texp_ident(path, _, {Types.val_loc: {loc_ghost: true}}) =>
-    // When the ppx uses a dummy location, find the original location.
-    let moduleName = switch path {
-    | Pident(_) => currentModuleName.contents
-    | _ => path |> Path.head |> Ident.name
-    }
-    let valueName = path |> Path.last
-    switch getPosOfValue(~moduleName, ~valueName) {
-    | Some(posName) =>
-      addValueReference(
-        ~addFileReference=true,
-        ~locFrom,
-        ~locTo={loc_start: posName, loc_end: posName, loc_ghost: false},
-      )
-    | None => ()
-    }
-
-  | Texp_ident(_path, _, {Types.val_loc: {loc_ghost: false, _} as locTo, _}) =>
-    addValueReference(~addFileReference=true, ~locFrom, ~locTo)
-
-  | Texp_apply(
-      {exp_desc: Texp_ident(path, _, {Types.val_loc: locTo, _})},
-      list{(_lbl, Some({exp_desc: Texp_constant(Const_string(s, _))}))},
-    ) if path |> Path.name == "JSResource.jSResource" && Filename.check_suffix(s, ".bs") =>
-    let moduleName = Filename.chop_extension(s)
-    switch getPosOfValue(~moduleName, ~valueName="make") {
-    | None => ()
-    | Some(posMake) =>
-      if verbose {
-        Log_.item(
-          "lazyLoad %s(%s) %s defined in %s@.",
-          path |> Path.name,
-          moduleName,
-          locTo.loc_start |> posToString,
-          posMake |> posToString,
-        )
-      }
-      let locMake = {
-        Location.loc_start: posMake,
-        loc_end: posMake,
-        loc_ghost: false,
-      }
-      addValueReference(~addFileReference=true, ~locFrom, ~locTo=locMake)
-    }
-
-  | Texp_apply(
-      {exp_desc: Texp_ident(path, _, _)},
-      list{
-        (_, Some({exp_desc: Texp_constant(Const_string(sTrue, _))})),
-        (_, Some({exp_desc: Texp_constant(Const_string(sFalse, _))})),
-      },
-    )
-    if path |> Path.name == "J.unsafe_expr" &&
-      (Filename.check_suffix(sTrue, ".bs") &&
-      Filename.check_suffix(sFalse, ".bs")) =>
-    let moduleTrue = Filename.chop_extension(sTrue)
-    let moduleFalse = Filename.chop_extension(sFalse)
-
-    let positionsTrue = getDeclPositions(~moduleName=moduleTrue)
-    let positionsFalse = getDeclPositions(~moduleName=moduleFalse)
-    let allPositions = PosSet.union(positionsTrue, positionsFalse)
-
-    if verbose {
-      Log_.item(
-        "requireCond  true:%s false:%s allPositions:[%s]@.",
-        moduleTrue,
-        moduleFalse,
-        allPositions |> PosSet.elements |> List.map(posToString) |> String.concat(", "),
-      )
-    }
-
-    allPositions |> PosSet.iter(pos => {
-      let posFrom = {...Lexing.dummy_pos, pos_fname: currentModuleName.contents}
-      let locFrom = {
-        Location.loc_start: posFrom,
-        loc_end: posFrom,
-        loc_ghost: false,
-      }
-      addValueReference(
-        ~addFileReference=false,
-        ~locTo={Location.loc_start: pos, loc_end: pos, loc_ghost: false},
-        ~locFrom,
-      )
-    })
-
-  | Texp_field(_, _, {lbl_loc: {Location.loc_start: posTo, loc_ghost: false}, _})
-  | Texp_construct(_, {cstr_loc: {Location.loc_start: posTo, loc_ghost: false}, _}, _) =>
-    if analyzeTypes.contents {
-      DeadType.addTypeReference(~posTo, ~posFrom=locFrom.loc_start)
-    }
-
-  | _ => ()
-  }
-  super.Tast_mapper.expr(self, e)
-}
-
-let collectPattern = (super, self, pat: Typedtree.pattern) => {
-  let posFrom = pat.pat_loc.loc_start
-  switch pat.pat_desc {
-  | Tpat_record(cases, _clodsedFlag) =>
-    cases |> List.iter(((_loc, {Types.lbl_loc: {loc_start: posTo}}, _pat)) =>
-      if analyzeTypes.contents {
-        DeadType.addTypeReference(~posFrom, ~posTo)
-      }
-    )
-  | _ => ()
-  }
-  super.Tast_mapper.pat(self, pat)
-}
-
-/* Traverse the AST */
-let collectValueReferences = {
-  /* Tast_mapper */
-  let super = Tast_mapper.default
-
-  let expr = (self, e) => e |> collectExpr(super, self)
-  let pat = (self, p) => p |> collectPattern(super, self)
-  let value_binding = (self, vb) => vb |> collectValueBinding(super, self)
-  let type_declaration = (self, typeDeclaration: Typedtree.type_declaration) => {
-    DeadType.processTypeDeclaration(typeDeclaration)
-    super.type_declaration(self, typeDeclaration)
-  }
-  let structure_item = (self, structureItem: Typedtree.structure_item) => {
-    let oldModulePath = currentModulePath.contents
-    switch structureItem.str_desc {
-    | Tstr_module({mb_name}) =>
-      currentModulePath := list{mb_name.txt, ...currentModulePath.contents}
-    | Tstr_primitive(vd) if analyzeExternals =>
-      let path = \"@"(currentModulePath.contents, list{currentModuleName.contents})
-      let exists = switch PosHash.find_opt(decls, vd.val_loc.loc_start) {
-      | Some({declKind: Value}) => true
-      | _ => false
-      }
-      if !exists {
-        addValueDeclaration(
-          ~path,
-          ~loc=vd.val_loc,
-          ~sideEffects=false,
-          "+" ++ (vd.val_id |> Ident.name),
-        )
-      }
-
-    | _ => ()
-    }
-    let result = super.structure_item(self, structureItem)
-    currentModulePath := oldModulePath
-    result
-  }
-  open Tast_mapper
-  {
-    ...super,
-    expr: expr,
-    pat: pat,
-    structure_item: structure_item,
-    type_declaration: type_declaration,
-    value_binding: value_binding,
-  }
-}
-
-/* Merge a location's references to another one's */
-let processValueDependency = ((
-  {
-    val_loc: {loc_start: {pos_fname: fnTo} as posTo, loc_ghost: ghost1} as locTo,
-  }: Types.value_description,
-  {
-    val_loc: {loc_start: {pos_fname: fnFrom} as posFrom, loc_ghost: ghost2} as locFrom,
-  }: Types.value_description,
-)) =>
-  if !ghost1 && (!ghost2 && posTo != posFrom) {
-    let addFileReference = fileIsImplementationOf(fnTo, fnFrom)
-    addValueReference(~addFileReference, ~locFrom, ~locTo)
-  }
-
-let processTypeDependency = ((
-  {loc_start: posTo, loc_ghost: ghost1}: Location.t,
-  {loc_start: posFrom, loc_ghost: ghost2}: Location.t,
-)) =>
-  if !ghost1 && (!ghost2 && posTo != posFrom) {
-    DeadType.addTypeReference(~posTo, ~posFrom)
-  }
-
-let processStructure = (~cmt_value_dependencies, structure: Typedtree.structure) => {
-  structure |> collectValueReferences.structure(collectValueReferences) |> ignore
-
-  let valueDependencies = cmt_value_dependencies |> List.rev
-
-  valueDependencies |> List.iter(processValueDependency)
-
-  DeadType.typeDependencies.contents |> List.iter(processTypeDependency)
-
-  DeadType.typeDependencies := list{}
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Debug.res b/jscomp/syntax/tests/idempotency/genType/src/Debug.res
deleted file mode 100644
index c059611..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Debug.res
+++ /dev/null
@@ -1,48 +0,0 @@
-/* log Add and Remove and file actions to see that the cmt hook is working */
-let basic = ref(false)
-let codeItems = ref(false)
-let config = ref(false)
-let converter = ref(false)
-let dependencies = ref(false)
-let moduleResolution = ref(false)
-
-let notImplemented = ref(false)
-
-let translation = ref(false)
-
-let typeEnv = ref(false)
-
-let typeResolution = ref(false)
-
-let setAll = () => {
-  basic := true
-  codeItems := true
-  config := true
-  converter := true
-  dependencies := true
-  moduleResolution := true
-  notImplemented := true
-  translation := true
-  typeEnv := true
-  typeResolution := true
-}
-let setItem = (debugItem, debugValue) => {
-  let isOn = switch debugValue {
-  | Ext_json_types.True(_) => true
-  | _ => false
-  }
-  switch debugItem {
-  | "all" if isOn => setAll()
-  | "basic" => basic := isOn
-  | "codeItems" => codeItems := isOn
-  | "config" => config := isOn
-  | "converter" => converter := isOn
-  | "dependencies" => dependencies := isOn
-  | "moduleResolution" => moduleResolution := isOn
-  | "notImplemented" => notImplemented := isOn
-  | "translation" => translation := isOn
-  | "typeEnv" => typeEnv := isOn
-  | "typeResolution" => typeResolution := isOn
-  | _ => ()
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Dependencies.res b/jscomp/syntax/tests/idempotency/genType/src/Dependencies.res
deleted file mode 100644
index 3203a73..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Dependencies.res
+++ /dev/null
@@ -1,70 +0,0 @@
-open GenTypeCommon
-
-let rec handleNamespace = (~name, dep) =>
-  switch dep {
-  | External(_)
-  | Internal(_) => dep
-  | Dot(External(s), moduleName) if s == name => External(moduleName)
-  | Dot(dep1, s) => Dot(dep1 |> handleNamespace(~name), s)
-  }
-
-let rec fromPath1 = (~config, ~typeEnv, path: Path.t) =>
-  switch path {
-  | Pident(id) =>
-    let name = id |> Ident.name
-    switch typeEnv |> TypeEnv.lookup(~name) {
-    | None => External(name)
-    | Some(typeEnv1) =>
-      switch typeEnv1 |> TypeEnv.expandAliasToExternalModule(~name) {
-      | Some(dep) => dep
-      | None =>
-        let resolvedName = name |> TypeEnv.addModulePath(~typeEnv=typeEnv1)
-        Internal(resolvedName)
-      }
-    }
-
-  | Pdot(Pident(id), s, _pos) if id |> ScopedPackage.isGeneratedModule(~config) =>
-    External(s |> ScopedPackage.addGeneratedModule(~generatedModule=id))
-
-  | Pdot(p, s, _pos) => Dot(p |> fromPath1(~config, ~typeEnv), s)
-  | Papply(_) => Internal("__Papply_unsupported_genType__" |> ResolvedName.fromString)
-  }
-
-let rec isInternal = dep =>
-  switch dep {
-  | External(_) => false
-  | Internal(_) => true
-  | Dot(d, _) => d |> isInternal
-  }
-
-let fromPath = (~config, ~typeEnv, path) => {
-  let dep = path |> fromPath1(~config, ~typeEnv)
-  if Debug.typeResolution.contents {
-    Log_.item(
-      "fromPath path:%s typeEnv:%s %s resolved:%s\n",
-      path |> Path.name,
-      typeEnv |> TypeEnv.toString,
-      dep |> isInternal ? "Internal" : "External",
-      dep |> depToString,
-    )
-  }
-  switch config.namespace {
-  | None => dep
-  | Some(name) => dep |> handleNamespace(~name)
-  }
-}
-
-let rec getOuterModuleName = dep =>
-  switch dep {
-  | External(name) => name |> ModuleName.fromStringUnsafe
-  | Internal(resolvedName) => resolvedName |> ResolvedName.toString |> ModuleName.fromStringUnsafe
-  | Dot(dep1, _) => dep1 |> getOuterModuleName
-  }
-
-let rec removeExternalOuterModule = dep =>
-  switch dep {
-  | External(_)
-  | Internal(_) => dep
-  | Dot(External(_), s) => External(s)
-  | Dot(dep1, s) => Dot(dep1 |> removeExternalOuterModule, s)
-  }
diff --git a/jscomp/syntax/tests/idempotency/genType/src/EmitJs.res b/jscomp/syntax/tests/idempotency/genType/src/EmitJs.res
deleted file mode 100644
index 95df8ee..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/EmitJs.res
+++ /dev/null
@@ -1,1141 +0,0 @@
-open GenTypeCommon
-
-type env = {
-  requiresEarly: ModuleNameMap.t<(ImportPath.t, bool)>,
-  requires: ModuleNameMap.t<(ImportPath.t, bool)>,
-  /* For each .cmt we import types from, keep the map of exported types. */
-  cmtToExportTypeMap: StringMap.t<CodeItem.exportTypeMap>,
-  /* Map of types imported from other files. */
-  exportTypeMapFromOtherFiles: CodeItem.exportTypeMap,
-  importedValueOrComponent: bool,
-}
-
-let requireModule = (~\"import", ~env, ~importPath, ~strict=false, moduleName) => {
-  let requires = \"import" ? env.requiresEarly : env.requires
-  let requiresNew = requires |> ModuleNameMap.add(moduleName, (importPath, strict))
-  \"import" ? {...env, requiresEarly: requiresNew} : {...env, requires: requiresNew}
-}
-
-let createExportTypeMap = (
-  ~config,
-  ~file,
-  typeDeclarations: list<CodeItem.typeDeclaration>,
-): CodeItem.exportTypeMap => {
-  if Debug.codeItems.contents {
-    Log_.item("Create Type Map for %s\n", file)
-  }
-  let updateExportTypeMap = (
-    exportTypeMap: CodeItem.exportTypeMap,
-    typeDeclaration: CodeItem.typeDeclaration,
-  ): CodeItem.exportTypeMap => {
-    let addExportType = (~annotation, {resolvedTypeName, type_, typeVars}: CodeItem.exportType) => {
-      if Debug.codeItems.contents {
-        Log_.item(
-          "Type Map: %s%s%s\n",
-          resolvedTypeName |> ResolvedName.toString,
-          typeVars == list{} ? "" : "(" ++ ((typeVars |> String.concat(",")) ++ ")"),
-          " " ++
-          ((annotation |> Annotation.toString |> EmitText.comment) ++
-          (" = " ++ (type_ |> EmitType.typeToString(~config, ~typeNameIsInterface=_ => false)))),
-        )
-      }
-
-      exportTypeMap |> StringMap.add(
-        resolvedTypeName |> ResolvedName.toString,
-        {CodeItem.typeVars: typeVars, type_: type_, annotation: annotation},
-      )
-    }
-    switch typeDeclaration.exportFromTypeDeclaration {
-    | {exportType, annotation} => exportType |> addExportType(~annotation)
-    }
-  }
-  typeDeclarations |> List.fold_left(updateExportTypeMap, StringMap.empty)
-}
-
-let codeItemToString = (~config, ~typeNameIsInterface, codeItem: CodeItem.t) =>
-  switch codeItem {
-  | ExportComponent({nestedModuleName}) =>
-    "ExportComponent nestedModuleName:" ++
-    switch nestedModuleName {
-    | Some(moduleName) => moduleName |> ModuleName.toString
-    | None => ""
-    }
-  | ExportValue({resolvedName, type_}) =>
-    "ExportValue" ++
-    (" resolvedName:" ++
-    (ResolvedName.toString(resolvedName) ++
-    (" type:" ++
-    EmitType.typeToString(~config, ~typeNameIsInterface, type_))))
-  | ImportComponent({importAnnotation}) =>
-    "ImportComponent " ++ (importAnnotation.importPath |> ImportPath.dump)
-  | ImportValue({importAnnotation}) =>
-    "ImportValue " ++ (importAnnotation.importPath |> ImportPath.dump)
-  }
-
-let emitExportType = (
-  ~early=?,
-  ~emitters,
-  ~config,
-  ~typeGetNormalized,
-  ~typeNameIsInterface,
-  {CodeItem.nameAs: nameAs, opaque, type_, typeVars, resolvedTypeName},
-) => {
-  let (opaque, type_) = switch opaque {
-  | Some(opaque) => (opaque, type_)
-  | None =>
-    let normalized = type_ |> typeGetNormalized
-    (false, normalized)
-  }
-  resolvedTypeName
-  |> ResolvedName.toString
-  |> EmitType.emitExportType(
-    ~early?,
-    ~config,
-    ~emitters,
-    ~nameAs,
-    ~opaque,
-    ~type_,
-    ~typeNameIsInterface,
-    ~typeVars,
-  )
-}
-
-let typeNameIsInterface = (
-  ~exportTypeMap: CodeItem.exportTypeMap,
-  ~exportTypeMapFromOtherFiles: CodeItem.exportTypeMap,
-  typeName,
-) => {
-  let typeIsInterface = type_ =>
-    switch type_ {
-    | Object(_)
-    | Record(_) => true
-    | _ => false
-    }
-  switch exportTypeMap |> StringMap.find(typeName) {
-  | {type_} => type_ |> typeIsInterface
-  | exception Not_found =>
-    switch exportTypeMapFromOtherFiles |> StringMap.find(typeName) {
-    | {type_} => type_ |> typeIsInterface
-    | exception Not_found => false
-    }
-  }
-}
-
-let emitExportFromTypeDeclaration = (
-  ~config,
-  ~emitters,
-  ~typeGetNormalized,
-  ~env,
-  ~typeNameIsInterface,
-  exportFromTypeDeclaration: CodeItem.exportFromTypeDeclaration,
-) => (
-  env,
-  exportFromTypeDeclaration.exportType |> emitExportType(
-    ~emitters,
-    ~config,
-    ~typeGetNormalized,
-    ~typeNameIsInterface,
-  ),
-)
-
-let emitExportFromTypeDeclarations = (
-  ~config,
-  ~emitters,
-  ~env,
-  ~typeGetNormalized,
-  ~typeNameIsInterface,
-  exportFromTypeDeclarations,
-) =>
-  exportFromTypeDeclarations |> List.fold_left(
-    ((env, emitters)) =>
-      emitExportFromTypeDeclaration(
-        ~config,
-        ~emitters,
-        ~env,
-        ~typeGetNormalized,
-        ~typeNameIsInterface,
-      ),
-    (env, emitters),
-  )
-
-let rec emitCodeItem = (
-  ~config,
-  ~emitters,
-  ~moduleItemsEmitter,
-  ~env,
-  ~fileName,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeGetConverter,
-  ~typeGetInlined,
-  ~typeGetNormalized,
-  ~typeNameIsInterface,
-  ~variantTables,
-  codeItem,
-) => {
-  let language = config.language
-  if Debug.codeItems.contents {
-    Log_.item("Code Item: %s\n", codeItem |> codeItemToString(~config, ~typeNameIsInterface))
-  }
-  let indent = Some("")
-
-  switch codeItem {
-  | ImportComponent({
-      asPath,
-      childrenTyp,
-      exportType,
-      importAnnotation,
-      propsFields,
-      propsTypeName,
-    }) =>
-    let importPath = importAnnotation.importPath
-    let name = importAnnotation.name
-
-    let es6 = switch (language, config.module_) {
-    | (_, ES6)
-    | (TypeScript, _) => true
-    | (Flow | Untyped, _) => false
-    }
-
-    let (firstNameInPath, restOfPath, lastNameInPath) = switch asPath |> Str.split(
-      Str.regexp("\\."),
-    ) {
-    | list{x, ...y} =>
-      let lastNameInPath = switch y |> List.rev {
-      | list{last, ..._} => last
-      | list{} => x
-      }
-      es6
-        ? (x, list{"", ...y} |> String.concat("."), lastNameInPath)
-        : (name, list{"", x, ...y} |> String.concat("."), lastNameInPath)
-    | _ => (name, "", name)
-    }
-
-    let componentPath = firstNameInPath ++ restOfPath
-
-    let nameGen = EmitText.newNameGen()
-
-    let (emitters, env) = if es6 {
-      /* emit an import {... as ...} immediately */
-      let emitters =
-        importPath |> EmitType.emitImportValueAsEarly(
-          ~config,
-          ~emitters,
-          ~name=firstNameInPath,
-          ~nameAs=firstNameInPath == name ? None : Some(firstNameInPath),
-        )
-      (emitters, env)
-    } else {
-      /* add an early require(...) */
-      let env =
-        firstNameInPath
-        |> ModuleName.fromStringUnsafe
-        |> requireModule(~\"import"=true, ~env, ~importPath, ~strict=true)
-      (emitters, env)
-    }
-    let componentNameTypeChecked = lastNameInPath ++ "TypeChecked"
-
-    /* Check the type of the component */
-    config.emitImportReact = true
-    let emitters = emitExportType(
-      ~early=true,
-      ~config,
-      ~emitters,
-      ~typeGetNormalized,
-      ~typeNameIsInterface,
-      exportType,
-    )
-    let emitters =
-      config.language == Untyped
-        ? emitters
-        : ("(" ++
-          (("props" |> EmitType.ofType(
-            ~config,
-            ~typeNameIsInterface,
-            ~type_=ident(propsTypeName),
-          )) ++
-          ")")
-            |> EmitType.ofType(
-              ~config,
-              ~typeNameIsInterface,
-              ~type_=EmitType.typeReactElement(~config),
-            )) ++ (" {\n  return <" ++ (componentPath ++ " {...props}/>;\n}"))
-            |> EmitType.emitExportFunction(
-              ~early=true,
-              ~emitters,
-              ~name=componentNameTypeChecked,
-              ~config,
-              ~comment="In case of type error, check the type of '" ++
-              ("make" ++
-              ("' in '" ++
-              ((fileName |> ModuleName.toString) ++
-              (".re'" ++
-              (" and the props of '" ++
-              ((importPath |> ImportPath.emit(~config)) ++ "'.")))))),
-            )
-
-    /* Wrap the component */
-    let emitters =
-      "function " ++
-      (EmitText.parens(
-        \"@"(propsFields |> List.map(({nameJS}: field) => nameJS), list{"children"}) |> List.map(
-          EmitType.ofTypeAny(~config),
-        ),
-      ) ++
-      (" { return ReasonReact.wrapJsForReason" ++
-      (EmitText.parens(list{
-        componentPath,
-        "{" ++
-        ((propsFields
-        |> List.map(({nameJS: propName, optional, type_: propTyp}) =>
-          propName ++
-          (": " ++
-          (propName |> Converter.toJS(
-            ~config,
-            ~converter=(optional == Mandatory ? propTyp : Option(propTyp)) |> typeGetConverter,
-            ~indent,
-            ~nameGen,
-            ~variantTables,
-          )))
-        )
-        |> String.concat(", ")) ++
-        "}"),
-        "children" |> Converter.toJS(
-          ~config,
-          ~converter=childrenTyp |> typeGetConverter,
-          ~indent,
-          ~nameGen,
-          ~variantTables,
-        ),
-      }) ++ "; }"))) ++ ";"
-        |> EmitType.emitExportConstEarly(
-          ~comment="Export '" ++
-          ("make" ++
-          "' early to allow circular import from the '.bs.js' file."),
-          ~config,
-          ~emitters,
-          ~name="make",
-          ~type_=mixedOrUnknown(~config),
-          ~typeNameIsInterface,
-        )
-    let env =
-      ModuleName.reasonReact |> requireModule(
-        ~\"import"=true,
-        ~env,
-        ~importPath=ImportPath.reasonReactPath(~config),
-      )
-    ({...env, importedValueOrComponent: true}, emitters)
-
-  | ImportValue({asPath, importAnnotation, type_, valueName}) =>
-    let nameGen = EmitText.newNameGen()
-    let importPath = importAnnotation.importPath
-    let importFile = importAnnotation.name
-
-    let (firstNameInPath, restOfPath) =
-      valueName == asPath
-        ? (valueName, "")
-        : switch asPath |> Str.split(Str.regexp("\\.")) {
-          | list{x, ...y} => (x, list{"", ...y} |> String.concat("."))
-          | _ => (asPath, "")
-          }
-    let importFileVariable = "$$" ++ importFile
-    let (emitters, importedAsName, env) = switch (language, config.module_) {
-    | (_, ES6)
-    | (TypeScript, _) =>
-      /* emit an import {... as ...} immediately */
-      let valueNameNotChecked = valueName ++ "NotChecked"
-      let emitters =
-        importPath |> EmitType.emitImportValueAsEarly(
-          ~config,
-          ~emitters,
-          ~name=firstNameInPath,
-          ~nameAs=Some(valueNameNotChecked),
-        )
-      (emitters, valueNameNotChecked, env)
-    | (Flow | Untyped, _) =>
-      /* add an early require(...) */
-      let importedAsName =
-        firstNameInPath == "default"
-          ? importFileVariable
-          : importFileVariable ++ ("." ++ firstNameInPath)
-      let env =
-        importFileVariable
-        |> ModuleName.fromStringUnsafe
-        |> requireModule(~\"import"=true, ~env, ~importPath, ~strict=true)
-      (emitters, importedAsName, env)
-    }
-
-    let type_ = switch type_ {
-    | Function({argTypes: list{{aType: Object(_)}}, retType} as function_)
-      if retType |> EmitType.isTypeReactElement(~config) =>
-      let componentName = switch importFile {
-      | "."
-      | ".." =>
-        None
-      | _ => Some(importFile)
-      }
-      Function({...function_, componentName: componentName})
-    | _ => type_
-    }
-
-    let converter = type_ |> typeGetConverter
-
-    let valueNameTypeChecked = valueName ++ "TypeChecked"
-
-    let emitters =
-      importedAsName ++ restOfPath ++ ";"
-        |> EmitType.emitExportConstEarly(
-          ~config,
-          ~comment="In case of type error, check the type of '" ++
-          (valueName ++
-          ("' in '" ++
-          ((fileName |> ModuleName.toString) ++
-          (".re'" ++ (" and '" ++ ((importPath |> ImportPath.emit(~config)) ++ "'.")))))),
-          ~emitters,
-          ~name=valueNameTypeChecked,
-          ~type_,
-          ~typeNameIsInterface,
-        )
-    let valueNameNotDefault = valueName == "default" ? Runtime.default : valueName
-    let emitters =
-      (valueNameTypeChecked
-      |> Converter.toReason(~config, ~converter, ~indent, ~nameGen, ~variantTables)
-      |> EmitType.emitTypeCast(~config, ~type_, ~typeNameIsInterface)) ++ ";"
-        |> EmitType.emitExportConstEarly(
-          ~comment="Export '" ++
-          (valueNameNotDefault ++
-          "' early to allow circular import from the '.bs.js' file."),
-          ~config,
-          ~emitters,
-          ~name=valueNameNotDefault,
-          ~type_=mixedOrUnknown(~config),
-          ~typeNameIsInterface,
-        )
-    let emitters =
-      valueName == "default"
-        ? EmitType.emitExportDefault(~emitters, ~config, valueNameNotDefault)
-        : emitters
-
-    ({...env, importedValueOrComponent: true}, emitters)
-
-  | ExportComponent({componentAccessPath, exportType, moduleAccessPath, nestedModuleName, type_}) =>
-    let nameGen = EmitText.newNameGen()
-    let converter = type_ |> typeGetConverter
-    let importPath =
-      fileName |> ModuleResolver.resolveModule(
-        ~importExtension=".bs",
-        ~outputFileRelative,
-        ~resolver,
-        ~useBsDependencies=false,
-      )
-    let moduleNameBs = fileName |> ModuleName.forBsFile
-    let moduleName = switch nestedModuleName {
-    | Some(moduleName) => moduleName
-    | None => fileName
-    }
-    let propsTypeName = exportType.resolvedTypeName |> ResolvedName.toString
-    let componentType = EmitType.typeReactComponent(~config, ~propsType=ident(propsTypeName))
-
-    let name = EmitType.componentExportName(~config, ~fileName, ~moduleName)
-    let jsProps = "jsProps"
-    let jsPropsDot = s => jsProps ++ ("." ++ s)
-
-    let (propConverters, childrenConverter) = switch converter {
-    | FunctionC({argConverters}) =>
-      switch argConverters {
-      | list{GroupConverter(propConverters), ArgConverter(childrenConverter), ..._} => (
-          propConverters,
-          childrenConverter,
-        )
-      | list{ArgConverter(childrenConverter), ..._} => (list{}, childrenConverter)
-
-      | _ => (list{}, IdentC)
-      }
-
-    | _ => (list{}, IdentC)
-    }
-
-    let args = \"@"(
-      propConverters |> List.map(((s, optional, argConverter)) =>
-        jsPropsDot(s) |> Converter.toReason(
-          ~config,
-          ~converter=optional == Optional &&
-            !(argConverter |> Converter.converterIsIdentity(~toJS=false))
-            ? OptionC(argConverter)
-            : argConverter,
-          ~indent,
-          ~nameGen,
-          ~variantTables,
-        )
-      ),
-      list{
-        jsPropsDot("children") |> Converter.toReason(
-          ~config,
-          ~converter=childrenConverter,
-          ~indent,
-          ~nameGen,
-          ~variantTables,
-        ),
-      },
-    )
-
-    let emitters = emitExportType(
-      ~emitters,
-      ~config,
-      ~typeGetNormalized,
-      ~typeNameIsInterface,
-      exportType,
-    )
-
-    let emitters = EmitType.emitExportConst(
-      ~config,
-      ~emitters,
-      ~name,
-      ~type_=componentType,
-      ~typeNameIsInterface,
-      list{
-        "ReasonReact.wrapReasonForJs(",
-        "  " ++
-        (ModuleName.toString(moduleNameBs) ++
-        ("." ++ ((componentAccessPath |> Runtime.emitModuleAccessPath(~config)) ++ ","))),
-        "  (function _(" ++
-        (EmitType.ofType(~config, ~typeNameIsInterface, ~type_=ident(propsTypeName), jsProps) ++
-        ") {"),
-        "     return " ++
-        ((ModuleName.toString(moduleNameBs) ++
-        ("." ++
-        (moduleAccessPath |> Runtime.emitModuleAccessPath(~config)))
-          |> EmitText.curry(~args, ~numArgs=args |> List.length)) ++
-        ";"),
-        "  }));",
-      } |> String.concat("\n"),
-    )
-
-    let emitters = switch exportType.type_ {
-    | GroupOfLabeledArgs(fields) if config.language == Untyped && config.propTypes =>
-      fields
-      |> List.map((field: field) => {
-        let type_ = field.type_ |> typeGetInlined
-        {...field, type_: type_}
-      })
-      |> EmitType.emitPropTypes(~config, ~name, ~emitters, ~indent)
-    | _ => emitters
-    }
-
-    let emitters =
-      /* only export default for the top level component in the file */
-      fileName == moduleName ? EmitType.emitExportDefault(~emitters, ~config, name) : emitters
-
-    let env = moduleNameBs |> requireModule(~\"import"=false, ~env, ~importPath)
-
-    let env =
-      ModuleName.reasonReact |> requireModule(
-        ~\"import"=false,
-        ~env,
-        ~importPath=ImportPath.reasonReactPath(~config),
-      )
-
-    let numArgs = args |> List.length
-    let useCurry = numArgs >= 2
-    config.emitImportCurry = config.emitImportCurry || useCurry
-    (env, emitters)
-
-  | ExportValue({docString, moduleAccessPath, originalName, resolvedName, type_}) =>
-    resolvedName |> ExportModule.extendExportModules(~moduleItemsEmitter, ~type_)
-    let resolvedName = ResolvedName.toString(resolvedName)
-    let nameGen = EmitText.newNameGen()
-    let importPath =
-      fileName |> ModuleResolver.resolveModule(
-        ~importExtension=".bs",
-        ~outputFileRelative,
-        ~resolver,
-        ~useBsDependencies=false,
-      )
-    let fileNameBs = fileName |> ModuleName.forBsFile
-    let envWithRequires = fileNameBs |> requireModule(~\"import"=false, ~env, ~importPath)
-
-    let default = "default"
-    let make = "make"
-
-    let name = originalName == default ? Runtime.default : resolvedName
-
-    module HookType = {
-      type t = {
-        propsType: type_,
-        resolvedTypeName: ResolvedName.t,
-        retType: type_,
-        typeVars: list<string>,
-      }
-    }
-
-    let (type_, hookType) = switch type_ {
-    | Function(
-        {argTypes: list{{aType: Object(closedFlags, fields)}}, retType, typeVars} as function_,
-      ) if retType |> EmitType.isTypeReactElement(~config) =>
-      let propsType = {
-        let fields =
-          fields |> List.map((field: field) =>
-            field.nameJS == "children" && field.type_ |> EmitType.isTypeReactElement(~config)
-              ? {...field, type_: EmitType.typeReactChild(~config)}
-              : field
-          )
-        Object(closedFlags, fields)
-      }
-      let function_ = {
-        ...function_,
-        argTypes: list{{aName: "", aType: propsType}},
-      }
-      let chopSuffix = suffix =>
-        resolvedName == suffix
-          ? ""
-          : Filename.check_suffix(resolvedName, "_" ++ suffix)
-          ? Filename.chop_suffix(resolvedName, "_" ++ suffix)
-          : resolvedName
-      let suffix = if originalName == default {
-        chopSuffix(default)
-      } else if originalName == make {
-        chopSuffix(make)
-      } else {
-        resolvedName
-      }
-      let hookName = (fileName |> ModuleName.toString) ++ (suffix == "" ? suffix : "_" ++ suffix)
-      let resolvedTypeName = if (
-        !config.emitTypePropDone && (originalName == default || originalName == make)
-      ) {
-        config.emitTypePropDone = true
-        ResolvedName.fromString("Props")
-      } else {
-        ResolvedName.fromString(name) |> ResolvedName.dot("Props")
-      }
-
-      (
-        Function({...function_, componentName: Some(hookName)}),
-        Some({
-          HookType.propsType: propsType,
-          resolvedTypeName: resolvedTypeName,
-          retType: retType,
-          typeVars: typeVars,
-        }),
-      )
-    | _ => (type_, None)
-    }
-    /* Work around Flow issue with function components.
-     If type annotated direcly, they are not checked. But typeof() works. */
-    let flowFunctionTypeWorkaround = hookType != None && config.language == Flow
-
-    let converter = type_ |> typeGetConverter
-
-    let hookNameForTypeof = name ++ "$$forTypeof"
-    let type_ = flowFunctionTypeWorkaround ? ident("typeof(" ++ (hookNameForTypeof ++ ")")) : type_
-
-    let emitters = switch hookType {
-    | Some({propsType, retType, typeVars}) if flowFunctionTypeWorkaround =>
-      EmitType.emitHookTypeAsFunction(
-        ~config,
-        ~emitters,
-        ~name=hookNameForTypeof,
-        ~propsType,
-        ~retType,
-        ~retValue="null",
-        ~typeNameIsInterface,
-        ~typeVars,
-      )
-    | _ => emitters
-    }
-
-    let emitters = switch hookType {
-    | Some({propsType, resolvedTypeName, typeVars}) =>
-      let exportType: CodeItem.exportType = {
-        nameAs: None,
-        opaque: Some(false),
-        type_: propsType,
-        typeVars: typeVars,
-        resolvedTypeName: resolvedTypeName,
-      }
-      if config.language == TypeScript {
-        config.emitImportReact = true // For doc gen (https://github.com/cristianoc/genType/issues/342)
-      }
-      emitExportType(~emitters, ~config, ~typeGetNormalized, ~typeNameIsInterface, exportType)
-    | _ => emitters
-    }
-
-    let emitters =
-      ((fileNameBs |> ModuleName.toString) ++
-        ("." ++
-        (moduleAccessPath |> Runtime.emitModuleAccessPath(~config)))
-        |> Converter.toJS(~config, ~converter, ~indent, ~nameGen, ~variantTables)) ++ ";"
-        |> EmitType.emitExportConst(
-          ~config,
-          ~docString,
-          ~emitters,
-          ~name,
-          ~type_,
-          ~typeNameIsInterface,
-        )
-
-    let emitters = switch hookType {
-    | Some({propsType: Object(_, fields)}) if config.language == Untyped && config.propTypes =>
-      fields
-      |> List.map((field: field) => {
-        let type_ = field.type_ |> typeGetInlined
-        {...field, type_: type_}
-      })
-      |> EmitType.emitPropTypes(~config, ~name, ~emitters, ~indent)
-    | _ => emitters
-    }
-
-    let emitters =
-      originalName == default
-        ? EmitType.emitExportDefault(~emitters, ~config, Runtime.default)
-        : emitters
-
-    (envWithRequires, emitters)
-  }
-}
-and emitCodeItems = (
-  ~config,
-  ~outputFileRelative,
-  ~emitters,
-  ~moduleItemsEmitter,
-  ~env,
-  ~fileName,
-  ~resolver,
-  ~typeNameIsInterface,
-  ~typeGetConverter,
-  ~typeGetInlined,
-  ~typeGetNormalized,
-  ~variantTables,
-  codeItems,
-) =>
-  codeItems |> List.fold_left(
-    ((env, emitters)) =>
-      emitCodeItem(
-        ~config,
-        ~emitters,
-        ~moduleItemsEmitter,
-        ~env,
-        ~fileName,
-        ~outputFileRelative,
-        ~resolver,
-        ~typeGetConverter,
-        ~typeGetInlined,
-        ~typeGetNormalized,
-        ~typeNameIsInterface,
-        ~variantTables,
-      ),
-    (env, emitters),
-  )
-
-let emitRequires = (~importedValueOrComponent, ~early, ~config, ~requires, emitters) =>
-  ModuleNameMap.fold(
-    (moduleName, (importPath, strict), emitters) =>
-      importPath |> EmitType.emitRequire(
-        ~importedValueOrComponent,
-        ~early,
-        ~emitters,
-        ~config,
-        ~moduleName,
-        ~strict,
-      ),
-    requires,
-    emitters,
-  )
-
-let emitVariantTables = (~config, ~emitters, variantTables) => {
-  let typeAnnotation = config.language == TypeScript ? ": { [key: string]: any }" : ""
-  let emitTable = (~table, ~toJS, variantC: Converter.variantC) =>
-    "const " ++
-    (table ++
-    (typeAnnotation ++
-    (" = {" ++
-    ((variantC.noPayloads
-    |> List.map(case => {
-      let js = case.labelJS |> labelJSToString(~alwaysQuotes=!toJS)
-      let re =
-        case.label |> Runtime.emitVariantLabel(~comment=false, ~polymorphic=variantC.polymorphic)
-      toJS ? (re |> EmitText.quotes) ++ (": " ++ js) : js ++ (": " ++ re)
-    })
-    |> String.concat(", ")) ++ "};"))))
-  Hashtbl.fold(((_, toJS), variantC, l) => list{(variantC, toJS), ...l}, variantTables, list{})
-  |> List.sort(((variantC1, toJS1), (variantC2, toJS2)) => {
-    let n = compare(variantC1.Converter.hash, variantC2.hash)
-    n != 0 ? n : compare(toJS2, toJS1)
-  })
-  |> List.fold_left(
-    (emitters, (variantC, toJS)) =>
-      variantC
-      |> emitTable(~table=variantC.Converter.hash |> variantTable(~toJS), ~toJS)
-      |> Emitters.requireEarly(~emitters),
-    emitters,
-  )
-}
-
-let typeGetInlined = (~config, ~exportTypeMap, type_) =>
-  type_ |> Converter.typeGetNormalized(
-    ~config,
-    ~inline=true,
-    ~lookupId=s => exportTypeMap |> StringMap.find(s),
-    ~typeNameIsInterface=_ => false,
-  )
-
-/* Read the cmt file referenced in an import type,
- and recursively for the import types obtained from reading the cmt file. */
-let rec readCmtFilesRecursively = (
-  ~config,
-  ~env,
-  ~inputCmtTranslateTypeDeclarations,
-  ~outputFileRelative,
-  ~resolver,
-  {CodeItem.typeName: typeName, asTypeName, importPath},
-) => {
-  let updateTypeMapFromOtherFiles = (~asType, ~exportTypeMapFromCmt, env) =>
-    switch exportTypeMapFromCmt |> StringMap.find(typeName) {
-    | (exportTypeItem: CodeItem.exportTypeItem) =>
-      let type_ =
-        exportTypeItem.type_ |> typeGetInlined(~config, ~exportTypeMap=exportTypeMapFromCmt)
-      {
-        ...env,
-        exportTypeMapFromOtherFiles: env.exportTypeMapFromOtherFiles |> StringMap.add(
-          asType,
-          {...exportTypeItem, type_: type_},
-        ),
-      }
-    | exception Not_found => env
-    }
-  let cmtFile = importPath |> ImportPath.toCmt(~config, ~outputFileRelative) |> Paths.getCmtFile
-  switch asTypeName {
-  | Some(asType) if cmtFile != "" =>
-    switch env.cmtToExportTypeMap |> StringMap.find(cmtFile) {
-    | exportTypeMapFromCmt => env |> updateTypeMapFromOtherFiles(~asType, ~exportTypeMapFromCmt)
-
-    | exception Not_found =>
-      /* cmt file not read before: this ensures termination */
-      let typeDeclarations =
-        Cmt_format.read_cmt(cmtFile)
-        |> inputCmtTranslateTypeDeclarations(~config, ~outputFileRelative, ~resolver)
-        |> ((x: CodeItem.translation) => x.typeDeclarations)
-
-      let exportTypeMapFromCmt =
-        typeDeclarations |> createExportTypeMap(
-          ~config,
-          ~file=cmtFile |> Filename.basename |> Filename.chop_extension,
-        )
-      let cmtToExportTypeMap =
-        env.cmtToExportTypeMap |> StringMap.add(cmtFile, exportTypeMapFromCmt)
-      let env =
-        {...env, cmtToExportTypeMap: cmtToExportTypeMap} |> updateTypeMapFromOtherFiles(
-          ~asType,
-          ~exportTypeMapFromCmt,
-        )
-
-      let newImportTypes =
-        typeDeclarations
-        |> List.map((typeDeclaration: CodeItem.typeDeclaration) => typeDeclaration.importTypes)
-        |> List.concat
-
-      newImportTypes |> List.fold_left(
-        (env, newImportType) =>
-          newImportType |> readCmtFilesRecursively(
-            ~config,
-            ~env,
-            ~inputCmtTranslateTypeDeclarations,
-            ~outputFileRelative,
-            ~resolver,
-          ),
-        env,
-      )
-    }
-  | _ => env
-  }
-}
-
-let emitImportType = (
-  ~config,
-  ~emitters,
-  ~env,
-  ~inputCmtTranslateTypeDeclarations,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeNameIsInterface,
-  {CodeItem.typeName: typeName, asTypeName, importPath} as importType,
-) => {
-  let env =
-    importType |> readCmtFilesRecursively(
-      ~config,
-      ~env,
-      ~inputCmtTranslateTypeDeclarations,
-      ~outputFileRelative,
-      ~resolver,
-    )
-  let emitters = EmitType.emitImportTypeAs(
-    ~emitters,
-    ~config,
-    ~typeName,
-    ~asTypeName,
-    ~typeNameIsInterface=typeNameIsInterface(~env),
-    ~importPath,
-  )
-  (env, emitters)
-}
-
-let emitImportTypes = (
-  ~config,
-  ~emitters,
-  ~env,
-  ~inputCmtTranslateTypeDeclarations,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeNameIsInterface,
-  importTypes,
-) =>
-  importTypes |> List.fold_left(
-    ((env, emitters)) =>
-      emitImportType(
-        ~config,
-        ~emitters,
-        ~env,
-        ~inputCmtTranslateTypeDeclarations,
-        ~outputFileRelative,
-        ~resolver,
-        ~typeNameIsInterface,
-      ),
-    (env, emitters),
-  )
-
-let getAnnotatedTypedDeclarations = (~annotatedSet, typeDeclarations) =>
-  typeDeclarations
-  |> List.map(typeDeclaration => {
-    let nameInAnnotatedSet =
-      annotatedSet |> StringSet.mem(
-        typeDeclaration.CodeItem.exportFromTypeDeclaration.exportType.resolvedTypeName |> ResolvedName.toString,
-      )
-    if nameInAnnotatedSet {
-      {
-        ...typeDeclaration,
-        exportFromTypeDeclaration: {
-          ...typeDeclaration.exportFromTypeDeclaration,
-          annotation: GenType,
-        },
-      }
-    } else {
-      typeDeclaration
-    }
-  })
-  |> List.filter(({exportFromTypeDeclaration: {annotation}}: CodeItem.typeDeclaration) =>
-    annotation != NoGenType
-  )
-
-let propagateAnnotationToSubTypes = (~codeItems, typeMap: CodeItem.exportTypeMap) => {
-  let annotatedSet = ref(StringSet.empty)
-  let initialAnnotatedTypes =
-    typeMap
-    |> StringMap.bindings
-    |> List.filter(((_, {CodeItem.annotation: annotation})) => annotation == Annotation.GenType)
-    |> List.map(((_, {CodeItem.type_: type_})) => type_)
-  let typesOfExportedValue = (codeItem: CodeItem.t) =>
-    switch codeItem {
-    | ExportComponent({type_})
-    | ExportValue({type_})
-    | ImportValue({type_}) => list{type_}
-    | _ => list{}
-    }
-  let typesOfExportedValues = codeItems |> List.map(typesOfExportedValue) |> List.concat
-
-  let visitTypAndUpdateMarked = type0 => {
-    let visited = ref(StringSet.empty)
-    let rec visit = type_ =>
-      switch type_ {
-      | Ident({name: typeName, typeArgs}) =>
-        if visited.contents |> StringSet.mem(typeName) {
-          ()
-        } else {
-          visited := visited.contents |> StringSet.add(typeName)
-          typeArgs |> List.iter(visit)
-          switch typeMap |> StringMap.find(typeName) {
-          | {annotation: GenType | GenTypeOpaque} => ()
-          | {type_: type1, annotation: NoGenType} =>
-            if Debug.translation.contents {
-              Log_.item("Marking Type As Annotated %s\n", typeName)
-            }
-            annotatedSet := annotatedSet.contents |> StringSet.add(typeName)
-            type1 |> visit
-          | exception Not_found => annotatedSet := annotatedSet.contents |> StringSet.add(typeName)
-          }
-        }
-      | Array(t, _) => t |> visit
-      | Function({argTypes, retType}) =>
-        argTypes |> List.iter(({aType}) => visit(aType))
-        retType |> visit
-      | GroupOfLabeledArgs(fields)
-      | Object(_, fields)
-      | Record(fields) =>
-        fields |> List.iter(({type_}) => type_ |> visit)
-      | Option(t)
-      | Null(t)
-      | Nullable(t)
-      | Promise(t) =>
-        t |> visit
-      | Tuple(innerTypes) => innerTypes |> List.iter(visit)
-      | TypeVar(_) => ()
-      | Variant({payloads}) => payloads |> List.iter(((_, _, t)) => t |> visit)
-      }
-    type0 |> visit
-  }
-  \"@"(initialAnnotatedTypes, typesOfExportedValues) |> List.iter(visitTypAndUpdateMarked)
-  let newTypeMap = typeMap |> StringMap.mapi((
-    typeName,
-    exportTypeItem: CodeItem.exportTypeItem,
-  ) => {
-    ...exportTypeItem,
-    annotation: annotatedSet.contents |> StringSet.mem(typeName)
-      ? Annotation.GenType
-      : exportTypeItem.annotation,
-  })
-
-  (newTypeMap, annotatedSet.contents)
-}
-
-let emitTranslationAsString = (
-  ~config,
-  ~fileName,
-  ~inputCmtTranslateTypeDeclarations,
-  ~outputFileRelative,
-  ~resolver,
-  translation: Translation.t,
-) => {
-  let initialEnv = {
-    requires: ModuleNameMap.empty,
-    requiresEarly: ModuleNameMap.empty,
-    cmtToExportTypeMap: StringMap.empty,
-    exportTypeMapFromOtherFiles: StringMap.empty,
-    importedValueOrComponent: false,
-  }
-  let variantTables = Hashtbl.create(1)
-
-  let (exportTypeMap, annotatedSet) =
-    translation.typeDeclarations
-    |> createExportTypeMap(~config, ~file=fileName |> ModuleName.toString)
-    |> propagateAnnotationToSubTypes(~codeItems=translation.codeItems)
-
-  let annotatedTypeDeclarations =
-    translation.typeDeclarations |> getAnnotatedTypedDeclarations(~annotatedSet)
-
-  let importTypesFromTypeDeclarations =
-    annotatedTypeDeclarations
-    |> List.map((typeDeclaration: CodeItem.typeDeclaration) => typeDeclaration.importTypes)
-    |> List.concat
-
-  let exportFromTypeDeclarations =
-    annotatedTypeDeclarations |> List.map((typeDeclaration: CodeItem.typeDeclaration) =>
-      typeDeclaration.exportFromTypeDeclaration
-    )
-
-  let typeNameIsInterface = (~env) =>
-    typeNameIsInterface(
-      ~exportTypeMap,
-      ~exportTypeMapFromOtherFiles=env.exportTypeMapFromOtherFiles,
-    )
-
-  let lookupId_ = (~env, s) =>
-    try exportTypeMap |> StringMap.find(s) catch {
-    | Not_found => env.exportTypeMapFromOtherFiles |> StringMap.find(s)
-    }
-
-  let typeGetNormalized_ = (~env, ~inline=false, type_) =>
-    type_ |> Converter.typeGetNormalized(
-      ~config,
-      ~inline,
-      ~lookupId=lookupId_(~env),
-      ~typeNameIsInterface=typeNameIsInterface(~env),
-    )
-
-  let typeGetConverter_ = (~env, type_) =>
-    type_ |> Converter.typeGetConverter(
-      ~config,
-      ~lookupId=lookupId_(~env),
-      ~typeNameIsInterface=typeNameIsInterface(~env),
-    )
-
-  let emitters = Emitters.initial
-  and moduleItemsEmitter = ExportModule.createModuleItemsEmitter()
-  and env = initialEnv
-
-  let (env, emitters) =
-    /* imports from type declarations go first to build up type tables */
-    \"@"(importTypesFromTypeDeclarations, translation.importTypes)
-    |> List.sort_uniq(Translation.importTypeCompare)
-    |> emitImportTypes(
-      ~config,
-      ~emitters,
-      ~env,
-      ~inputCmtTranslateTypeDeclarations,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeNameIsInterface,
-    )
-
-  let (env, emitters) =
-    exportFromTypeDeclarations |> emitExportFromTypeDeclarations(
-      ~config,
-      ~emitters,
-      ~typeGetNormalized=typeGetNormalized_(~env),
-      ~env,
-      ~typeNameIsInterface=typeNameIsInterface(~env),
-    )
-
-  let (env, emitters) =
-    translation.codeItems |> emitCodeItems(
-      ~config,
-      ~emitters,
-      ~moduleItemsEmitter,
-      ~env,
-      ~fileName,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeGetInlined=typeGetNormalized_(~env, ~inline=true),
-      ~typeGetNormalized=typeGetNormalized_(~env),
-      ~typeGetConverter=typeGetConverter_(~env),
-      ~typeNameIsInterface=typeNameIsInterface(~env),
-      ~variantTables,
-    )
-  let emitters = config.emitImportReact ? EmitType.emitImportReact(~emitters, ~config) : emitters
-
-  let env = config.emitImportCurry
-    ? ModuleName.curry |> requireModule(
-        ~\"import"=true,
-        ~env,
-        ~importPath=ImportPath.bsCurryPath(~config),
-      )
-    : env
-
-  let env = config.emitImportPropTypes
-    ? ModuleName.propTypes |> requireModule(~\"import"=true, ~env, ~importPath=ImportPath.propTypes)
-    : env
-
-  let finalEnv = config.emitCreateBucklescriptBlock
-    ? ModuleName.createRescriptBlock |> requireModule(
-        ~\"import"=true,
-        ~env,
-        ~importPath=ImportPath.bsBlockPath(~config),
-      )
-    : env
-
-  let emitters = variantTables |> emitVariantTables(~config, ~emitters)
-  let emitters =
-    moduleItemsEmitter |> ExportModule.emitAllModuleItems(~config, ~emitters, ~fileName)
-
-  emitters
-  |> emitRequires(
-    ~importedValueOrComponent=false,
-    ~early=true,
-    ~config,
-    ~requires=finalEnv.requiresEarly,
-  )
-  |> emitRequires(
-    ~importedValueOrComponent=finalEnv.importedValueOrComponent,
-    ~early=false,
-    ~config,
-    ~requires=finalEnv.requires,
-  )
-  |> Emitters.toString(~separator="\n\n")
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/EmitText.res b/jscomp/syntax/tests/idempotency/genType/src/EmitText.res
deleted file mode 100644
index af0fe23..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/EmitText.res
+++ /dev/null
@@ -1,86 +0,0 @@
-type nameGen = Hashtbl.t<string, int>
-
-let name = (~nameGen, s) =>
-  switch Hashtbl.find(nameGen, s) {
-  | n =>
-    Hashtbl.replace(nameGen, s, n + 1)
-    s ++ string_of_int(n + 1)
-  | exception Not_found =>
-    Hashtbl.replace(nameGen, s, 0)
-    s
-  }
-
-let parens = xs => "(" ++ ((xs |> String.concat(", ")) ++ ")")
-
-let arg = (~nameGen, x) => "Arg" ++ x |> name(~nameGen)
-
-let argi = (~nameGen, i) => "Arg" ++ (i |> string_of_int) |> name(~nameGen)
-
-let array = xs => "[" ++ ((xs |> String.concat(", ")) ++ "]")
-
-let comment = x => "/* " ++ (x ++ " */")
-
-let curry = (~args, ~numArgs, name) =>
-  switch numArgs {
-  | 0
-  | 1 =>
-    name ++ parens(args)
-  | (2 | 3 | 4 | 5 | 6 | 7 | 8) as n =>
-    "Curry._" ++ ((n |> string_of_int) ++ parens(\"@"(list{name}, args)))
-  | _ => "Curry.app" ++ parens(list{name, args |> array})
-  }
-
-let funCall = (~args, ~useCurry=false, name) =>
-  useCurry ? name |> curry(~args, ~numArgs=args |> List.length) : name ++ parens(args)
-
-let genericsString = (~typeVars) =>
-  typeVars === list{} ? "" : "<" ++ (String.concat(",", typeVars) ++ ">")
-
-let funDef = (~bodyArgs, ~functionName, ~funParams, ~indent, ~mkBody, ~typeVars) =>
-  "function " ++
-  (switch functionName {
-  | None => ""
-  | Some(name) => name
-  } ++
-  (genericsString(~typeVars) ++
-  ((funParams |> parens) ++
-  (" {" ++ ((bodyArgs |> mkBody) ++ (Indent.break(~indent) ++ "}"))))))
-
-let ifThenElse = (~indent, if_, then_, else_) => {
-  let indent1 = indent |> Indent.more
-  if_(~indent=indent1) ++
-  (Indent.break(~indent) ++
-  ("? " ++ (then_(~indent=indent1) ++ (Indent.break(~indent) ++ (": " ++ else_(~indent=indent1))))))
-}
-
-let newNameGen = () => Hashtbl.create(1)
-
-let quotes = x => "\"" ++ (x ++ "\"")
-
-let resultName = (~nameGen) => "result" |> name(~nameGen)
-
-let \"switch" = (~indent, ~cases, expr) => {
-  let lastCase = (cases |> List.length) - 1
-
-  cases
-  |> List.mapi((i, (label, code)) =>
-    if i == lastCase {
-      code
-    } else {
-      expr ++
-      ("===" ++
-      (label ++ (Indent.break(~indent) ++ ("? " ++ (code ++ (Indent.break(~indent) ++ ": "))))))
-    }
-  )
-  |> String.concat("")
-}
-
-let typeOfObject = x => "typeof(" ++ (x ++ (")" ++ (" === " ++ "\'object\'")))
-
-let addComment = (~comment, x) => "\n/* " ++ (comment ++ (" */\n  " ++ x))
-
-let arrayAccess = (~index, value) => value ++ ("[" ++ (string_of_int(index) ++ "]"))
-
-let arraySlice = value => value ++ ".slice()"
-
-let fieldAccess = (~label, value) => value ++ ("." ++ label)
diff --git a/jscomp/syntax/tests/idempotency/genType/src/EmitType.res b/jscomp/syntax/tests/idempotency/genType/src/EmitType.res
deleted file mode 100644
index ea04291..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/EmitType.res
+++ /dev/null
@@ -1,613 +0,0 @@
-open GenTypeCommon
-
-let flowExpectedError = "// $FlowExpectedError: Reason checked type sufficiently\n"
-
-let flowTypeAny = flowExpectedError ++ "type $any = any;\n"
-
-let fileHeader = (~config, ~sourceFile) => {
-  let makeHeader = (~lines) => {
-    let lines = switch config.fileHeader {
-    | Some(header) => list{header, ...lines}
-    | None => lines
-    }
-    switch lines {
-    | list{line} => "/* " ++ (line ++ " */\n")
-    | _ =>
-      "/** \n" ++ ((lines |> List.map(line => " * " ++ line) |> String.concat("\n")) ++ "\n */\n")
-    }
-  }
-
-  switch config.language {
-  | Flow =>
-    makeHeader(~lines=list{"@flow strict", "@" ++ ("generated from " ++ sourceFile), "@nolint"}) ++
-    ("/* eslint-disable */\n" ++
-    (config.emitFlowAny ? flowTypeAny : ""))
-  | TypeScript =>
-    makeHeader(
-      ~lines=list{"TypeScript file generated from " ++ (sourceFile ++ " by genType.")},
-    ) ++ "/* eslint-disable import/first */
-\n"
-  | Untyped =>
-    makeHeader(
-      ~lines=list{"Untyped file generated from " ++ (sourceFile ++ " by genType.")},
-    ) ++ "/* eslint-disable */\n"
-  }
-}
-
-let generatedFilesExtension = (~config) =>
-  switch config.generatedFileExtension {
-  | Some(s) => s
-  | None => ".gen"
-  }
-
-let outputFileSuffix = (~config) =>
-  switch config.language {
-  | Flow
-  | Untyped =>
-    generatedFilesExtension(~config) ++ ".js"
-  | TypeScript => generatedFilesExtension(~config) ++ ".tsx"
-  }
-
-let generatedModuleExtension = (~config) => generatedFilesExtension(~config)
-
-let shimExtension = (~config) =>
-  switch config.language {
-  | Flow => ".shim.js"
-  | TypeScript => ".shim.ts"
-  | Untyped => ".shim.not.used"
-  }
-
-let interfaceName = (~config, name) => config.exportInterfaces ? "I" ++ name : name
-
-let typeReactComponent = (~config, ~propsType) =>
-  (config.language == Flow ? "React$ComponentType" : "React.ComponentType") |> ident(
-    ~builtin=true,
-    ~typeArgs=list{propsType},
-  )
-
-let typeReactContext = (~config, ~type_) =>
-  (config.language == Flow ? "React$Context" : "React.Context") |> ident(
-    ~builtin=true,
-    ~typeArgs=list{type_},
-  )
-
-let typeReactElementFlow = ident(~builtin=true, "React$Node")
-
-let typeReactElementTypeScript = ident(~builtin=true, "JSX.Element")
-
-let typeReactChildTypeScript = ident(~builtin=true, "React.ReactNode")
-
-let typeReactElement = (~config) =>
-  config.language == Flow ? typeReactElementFlow : typeReactElementTypeScript
-
-let typeReactChild = (~config) =>
-  config.language == Flow ? typeReactElementFlow : typeReactChildTypeScript
-
-let isTypeReactElement = (~config, type_) => type_ === typeReactElement(~config)
-
-let typeReactDOMReDomRef = (~config) =>
-  (config.language == Flow ? "React$Ref" : "React.Ref") |> ident(
-    ~builtin=true,
-    ~typeArgs=list{mixedOrUnknown(~config)},
-  )
-
-let typeReactRef = (~type_) => Object(
-  Closed,
-  list{
-    {
-      mutable_: Mutable,
-      nameJS: "current",
-      nameRE: "current",
-      optional: Mandatory,
-      type_: Null(type_),
-    },
-  },
-)
-
-let componentExportName = (~config, ~fileName, ~moduleName) =>
-  switch config.language {
-  | Flow => fileName == moduleName ? "component" : moduleName |> ModuleName.toString
-  | _ => moduleName |> ModuleName.toString
-  }
-
-let typeAny = (~config) =>
-  ident(
-    ~builtin=true,
-    config.language == Flow
-      ? {
-          config.emitFlowAny = true
-          "$any"
-        }
-      : "any",
-  )
-
-let rec renderType = (~config, ~indent=None, ~typeNameIsInterface, ~inFunType, type0) =>
-  switch type0 {
-  | Array(t, arrayKind) =>
-    let typeIsSimple = switch t {
-    | Ident(_)
-    | TypeVar(_) => true
-    | _ => false
-    }
-
-    if config.language == TypeScript && (typeIsSimple && arrayKind == Mutable) {
-      (t |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType)) ++ "[]"
-    } else {
-      let arrayName =
-        arrayKind == Mutable
-          ? "Array"
-          : config.language == Flow
-          ? "$ReadOnlyArray"
-          : "ReadonlyArray"
-      arrayName ++
-      ("<" ++
-      ((t |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType)) ++ ">"))
-    }
-
-  | Function({argTypes: list{{aType: Object(closedFlag, fields)}}, retType, typeVars})
-    if retType |> isTypeReactElement(~config) =>
-    let fields = fields |> List.map(field => {
-      ...field,
-      type_: field.type_ |> TypeVars.substitute(~f=s =>
-        if typeVars |> List.mem(s) {
-          Some(typeAny(~config))
-        } else {
-          None
-        }
-      ),
-    })
-    let componentType = typeReactComponent(~config, ~propsType=Object(closedFlag, fields))
-    componentType |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType)
-
-  | Function({argTypes, retType, typeVars}) =>
-    renderFunType(~config, ~indent, ~inFunType, ~typeNameIsInterface, ~typeVars, argTypes, retType)
-
-  | GroupOfLabeledArgs(fields)
-  | Object(_, fields)
-  | Record(fields) =>
-    let indent1 = fields |> Indent.heuristicFields(~indent)
-    let config = switch type0 {
-    | GroupOfLabeledArgs(_) => {...config, exportInterfaces: false}
-    | _ => config
-    }
-    let closedFlag = switch type0 {
-    | Object(closedFlag, _) => closedFlag
-    | _ => Closed
-    }
-    fields |> renderFields(~closedFlag, ~config, ~indent=indent1, ~inFunType, ~typeNameIsInterface)
-
-  | Ident({builtin, name, typeArgs}) =>
-    (
-      !builtin && (config.exportInterfaces && name |> typeNameIsInterface)
-        ? name |> interfaceName(~config)
-        : name
-    ) ++
-    EmitText.genericsString(
-      ~typeVars=typeArgs |> List.map(
-        renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType),
-      ),
-    )
-  | Null(type_) =>
-    "(null | " ++ ((type_ |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType)) ++ ")")
-  | Nullable(type_)
-  | Option(type_) =>
-    switch config.language {
-    | Flow
-    | Untyped =>
-      let isComplex = switch type_ {
-      | Variant(_) => true
-      | _ => false
-      }
-      "?" ++
-      ((isComplex ? " (" : "") ++
-      ((type_ |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType)) ++ (
-          isComplex ? ")" : ""
-        )))
-    | TypeScript =>
-      "(null | undefined | " ++
-      ((type_ |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType)) ++
-      ")")
-    }
-  | Promise(type_) =>
-    "Promise" ++
-    ("<" ++
-    ((type_ |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType)) ++ ">"))
-  | Tuple(innerTypes) =>
-    "[" ++
-    ((innerTypes
-    |> List.map(renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType))
-    |> String.concat(", ")) ++
-    "]")
-  | TypeVar(s) => s
-
-  | Variant({noPayloads, payloads, unboxed}) =>
-    let noPayloadsRendered = noPayloads |> List.map(case => case.labelJS |> labelJSToString)
-    let field = (~name, value) => {
-      mutable_: Mutable,
-      nameJS: name,
-      nameRE: name,
-      optional: Mandatory,
-      type_: TypeVar(value),
-    }
-    let fields = fields =>
-      fields |> renderFields(~closedFlag=Closed, ~config, ~indent, ~inFunType, ~typeNameIsInterface)
-    let payloadsRendered = payloads |> List.map(((case, _numArgs, type_)) => {
-      let typeRendered = type_ |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType)
-      unboxed
-        ? typeRendered
-        : list{
-            case.labelJS |> labelJSToString |> field(~name=Runtime.jsVariantTag),
-            typeRendered |> field(~name=Runtime.jsVariantValue),
-          } |> fields
-    })
-    let rendered = \"@"(noPayloadsRendered, payloadsRendered)
-    let indent1 = rendered |> Indent.heuristicVariants(~indent)
-    (indent1 == None ? "" : Indent.break(~indent=indent1) ++ "  ") ++
-    (rendered |> String.concat((indent1 == None ? " " : Indent.break(~indent=indent1)) ++ "| "))
-  }
-and renderField = (
-  ~config,
-  ~indent,
-  ~typeNameIsInterface,
-  ~inFunType,
-  {mutable_, nameJS: lbl, optional, type_},
-) => {
-  let optMarker = optional === Optional ? "?" : ""
-  let mutMarker = mutable_ == Immutable ? config.language == Flow ? "+" : "readonly " : ""
-  Indent.break(~indent) ++
-  (mutMarker ++
-  (lbl ++
-  (optMarker ++
-  (": " ++ (type_ |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType))))))
-}
-and renderFields = (~closedFlag, ~config, ~indent, ~inFunType, ~typeNameIsInterface, fields) => {
-  let indent1 = indent |> Indent.more
-  let exact = config.language == Flow && (!config.exportInterfaces && closedFlag == Closed)
-  let space = indent == None && fields != list{} ? " " : ""
-  let renderedFields =
-    fields |> List.map(renderField(~config, ~indent=indent1, ~typeNameIsInterface, ~inFunType))
-  let dotdotdot =
-    config.language == Flow && !exact ? list{Indent.break(~indent=indent1) ++ "..."} : list{}
-  (exact ? "{|" : "{") ++
-  space ++
-  (String.concat(config.language == TypeScript ? "; " : ", ", \"@"(renderedFields, dotdotdot)) ++
-  (Indent.break(~indent) ++ (space ++ (exact ? "|}" : "}"))))
-}
-and renderFunType = (
-  ~config,
-  ~indent,
-  ~inFunType,
-  ~typeNameIsInterface,
-  ~typeVars,
-  argTypes,
-  retType,
-) =>
-  (inFunType ? "(" : "") ++
-  (EmitText.genericsString(~typeVars) ++
-  ("(" ++ (String.concat(", ", List.mapi((i, {aName, aType}) => {
-      let parameterName = if config.language == Flow {
-        ""
-      } else {
-        (aName == "" ? "_" ++ string_of_int(i + 1) : aName) ++ ":"
-      }
-      parameterName ++
-      (aType |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType=true))
-    }, argTypes)) ++ (") => " ++
-  ((retType |> renderType(~config, ~indent, ~typeNameIsInterface, ~inFunType)) ++
-  (inFunType ? ")" : ""))))))
-
-let typeToString = (~config, ~typeNameIsInterface, type_) =>
-  type_ |> renderType(~config, ~typeNameIsInterface, ~inFunType=false)
-
-let ofType = (~config, ~typeNameIsInterface=_ => false, ~type_, s) =>
-  config.language == Untyped
-    ? s
-    : s ++ (": " ++ (type_ |> typeToString(~config, ~typeNameIsInterface)))
-
-let emitHookTypeAsFunction = (
-  ~config,
-  ~emitters,
-  ~name,
-  ~propsType,
-  ~retType,
-  ~retValue,
-  ~typeNameIsInterface,
-  ~typeVars,
-) =>
-  "// Type annotated function components are not checked by Flow, but typeof() works.\n" ++
-  ("const " ++
-  (name ++
-  (" = function " ++
-  (EmitText.genericsString(~typeVars) ++
-  ("(" ++
-  ("_: " ++
-  (propsType |> renderType(~config, ~typeNameIsInterface, ~inFunType=true)) ++
-  (")" ++
-  ((" " |> ofType(~config, ~typeNameIsInterface, ~type_=retType)) ++
-    (" { return " ++
-    (retValue ++ " };")))))))))) |> Emitters.\"export"(~emitters)
-
-let emitExportConst_ = (
-  ~early,
-  ~comment="",
-  ~config,
-  ~docString="",
-  ~emitters,
-  ~name,
-  ~type_,
-  ~typeNameIsInterface,
-  line,
-) =>
-  (comment == "" ? comment : "// " ++ (comment ++ "\n")) ++
-  (docString ++
-  switch (config.module_, config.language) {
-  | (_, TypeScript)
-  | (ES6, _) =>
-    "export const " ++ ((name |> ofType(~config, ~typeNameIsInterface, ~type_)) ++ (" = " ++ line))
-  | (CommonJS, _) =>
-    "const " ++
-    ((name |> ofType(~config, ~typeNameIsInterface, ~type_)) ++
-    (" = " ++ (line ++ (";\nexports." ++ (name ++ (" = " ++ name))))))
-  }) |> (early ? Emitters.exportEarly : Emitters.\"export")(~emitters)
-
-let emitExportConst = emitExportConst_(~early=false)
-
-let emitExportConstEarly = emitExportConst_(~early=true)
-
-let emitExportFunction = (~early, ~comment, ~emitters, ~name, ~config, line) =>
-  "// " ++
-  (comment ++ "\n") ++
-  switch (config.module_, config.language) {
-  | (_, TypeScript)
-  | (ES6, _) =>
-    "export function " ++ (name ++ line)
-  | (CommonJS, _) => "function " ++ (name ++ (line ++ (";\nexports." ++ (name ++ (" = " ++ name)))))
-  } |> (early ? Emitters.exportEarly : Emitters.\"export")(~emitters)
-
-let emitExportDefault = (~emitters, ~config, name) =>
-  switch (config.module_, config.language) {
-  | (_, TypeScript)
-  | (ES6, _) =>
-    "export default " ++ (name ++ ";") |> Emitters.\"export"(~emitters)
-  | (CommonJS, _) => "exports.default = " ++ (name ++ ";") |> Emitters.\"export"(~emitters)
-  }
-
-let emitExportType = (
-  ~early=false,
-  ~config,
-  ~emitters,
-  ~nameAs,
-  ~opaque,
-  ~type_,
-  ~typeNameIsInterface,
-  ~typeVars,
-  resolvedTypeName,
-) => {
-  let \"export" = early ? Emitters.exportEarly : Emitters.\"export"
-  let typeParamsString = EmitText.genericsString(~typeVars)
-  let isInterface = resolvedTypeName |> typeNameIsInterface
-  let resolvedTypeName =
-    config.exportInterfaces && isInterface
-      ? resolvedTypeName |> interfaceName(~config)
-      : resolvedTypeName
-  let exportNameAs = switch nameAs {
-  | None => ""
-  | Some(s) =>
-    "\nexport type " ++
-    (s ++
-    (typeParamsString ++ (" = " ++ (resolvedTypeName ++ (typeParamsString ++ ";")))))
-  }
-
-  switch config.language {
-  | Flow =>
-    if config.exportInterfaces && (isInterface && !opaque) {
-      "export interface " ++
-      (resolvedTypeName ++
-      (typeParamsString ++
-      (" " ++
-      (((opaque ? mixedOrUnknown(~config) : type_) |> typeToString(
-        ~config,
-        ~typeNameIsInterface,
-      )) ++ (";" ++ exportNameAs))))) |> \"export"(~emitters)
-    } else {
-      "export" ++
-      ((opaque ? " opaque " : " ") ++
-      ("type " ++
-      (resolvedTypeName ++
-      (typeParamsString ++
-      (" = " ++
-      (((opaque ? mixedOrUnknown(~config) : type_) |> typeToString(
-        ~config,
-        ~typeNameIsInterface,
-      )) ++ (";" ++ exportNameAs))))))) |> \"export"(~emitters)
-    }
-  | TypeScript =>
-    if opaque {
-      /* Represent an opaque type as an absract class with a field called 'opaque'.
-         Any type parameters must occur in the type of opaque, so that different
-         instantiations are considered different types. */
-      let typeOfOpaqueField = typeVars == list{} ? "any" : typeVars |> String.concat(" | ")
-      "// tslint:disable-next-line:max-classes-per-file \n" ++
-      ((
-        String.capitalize_ascii(resolvedTypeName) != resolvedTypeName
-          ? "// tslint:disable-next-line:class-name\n"
-          : ""
-      ) ++
-      ("export abstract class " ++
-      (resolvedTypeName ++
-      (typeParamsString ++
-      (" { protected opaque!: " ++
-      (typeOfOpaqueField ++ (" }; /* simulate opaque types */" ++ exportNameAs)))))))
-        |> \"export"(~emitters)
-    } else {
-      if isInterface && config.exportInterfaces {
-        "export interface " ++ (resolvedTypeName ++ (typeParamsString ++ " "))
-      } else {
-        "// tslint:disable-next-line:interface-over-type-literal\n" ++
-        ("export type " ++
-        (resolvedTypeName ++ (typeParamsString ++ " = ")))
-      } ++
-      (switch type_ {
-      | _ => type_ |> typeToString(~config, ~typeNameIsInterface)
-      } ++
-      (";" ++ exportNameAs)) |> \"export"(~emitters)
-    }
-  | Untyped => emitters
-  }
-}
-
-let emitImportValueAsEarly = (~config, ~emitters, ~name, ~nameAs, importPath) => {
-  let commentBeforeImport =
-    config.language == Flow ? "// flowlint-next-line nonstrict-import:off\n" : ""
-  commentBeforeImport ++
-  ("import " ++
-  (switch nameAs {
-  | Some(nameAs) => "{" ++ (name ++ (" as " ++ (nameAs ++ "}")))
-  | None => name
-  } ++
-  (" from " ++
-  ("'" ++ ((importPath |> ImportPath.emit(~config)) ++ "';"))))) |> Emitters.requireEarly(~emitters)
-}
-
-let emitRequire = (
-  ~importedValueOrComponent,
-  ~early,
-  ~emitters,
-  ~config,
-  ~moduleName,
-  ~strict,
-  importPath,
-) => {
-  let commentBeforeRequire = switch config.language {
-  | TypeScript => "// eslint-disable-next-line @typescript-eslint/no-var-requires\n"
-  | Flow => strict ? early ? "// flowlint-next-line nonstrict-import:off\n" : "" : flowExpectedError
-  | Untyped => ""
-  }
-  switch config.module_ {
-  | ES6 if !importedValueOrComponent && config.language != TypeScript =>
-    commentBeforeRequire ++
-    ("import * as " ++
-    (ModuleName.toString(moduleName) ++
-    (" from '" ++
-    ((importPath |> ImportPath.emit(~config)) ++ "';"))))
-      |> (early ? Emitters.requireEarly : Emitters.require)(~emitters)
-  | _ =>
-    commentBeforeRequire ++
-    ("const " ++
-    (ModuleName.toString(moduleName) ++
-    (" = require('" ++
-    ((importPath |> ImportPath.emit(~config)) ++ "');"))))
-      |> (early ? Emitters.requireEarly : Emitters.require)(~emitters)
-  }
-}
-
-let require = (~early) => early ? Emitters.requireEarly : Emitters.require
-
-let emitImportReact = (~emitters, ~config) =>
-  switch config.language {
-  | Flow
-  | Untyped =>
-    emitRequire(
-      ~importedValueOrComponent=false,
-      ~early=true,
-      ~emitters,
-      ~config,
-      ~moduleName=ModuleName.react,
-      ~strict=false,
-      ImportPath.react,
-    )
-  | TypeScript => "import * as React from 'react';" |> require(~early=true, ~emitters)
-  }
-
-let emitPropTypes = (~config, ~emitters, ~indent, ~name, fields) => {
-  let indent1 = indent |> Indent.more
-  let prefix = s => "PropTypes." ++ s
-  let rec emitType = (~indent, type_: type_) =>
-    switch type_ {
-    | Array(t, _) => prefix("arrayOf") ++ ("(" ++ ((t |> emitType(~indent)) ++ ")"))
-    | Ident({name: ("bool" | "number" | "string") as id}) => id |> prefix
-    | Function(_) => "func" |> prefix
-    | GroupOfLabeledArgs(fields)
-    | Object(_, fields)
-    | Record(fields) =>
-      let indent1 = indent |> Indent.more
-      prefix("shape") ++
-      ("({" ++
-      (Indent.break(~indent=indent1) ++
-      ((fields
-      |> List.filter(({nameJS}: field) => nameJS != "children")
-      |> List.map(emitField(~indent=indent1))
-      |> String.concat("," ++ Indent.break(~indent=indent1))) ++
-      (Indent.break(~indent) ++ "})"))))
-
-    | Ident(_)
-    | Null(_)
-    | Nullable(_)
-    | Option(_)
-    | Promise(_)
-    | Tuple(_)
-    | TypeVar(_)
-    | Variant(_) =>
-      "any" |> prefix
-    }
-  and emitField = (~indent, {nameJS, optional, type_}: field) =>
-    nameJS ++
-    (" : " ++
-    ((type_ |> emitType(~indent)) ++ (optional == Mandatory ? ".isRequired" : "")))
-
-  config.emitImportPropTypes = true
-
-  name ++
-  (".propTypes = " ++
-  ("{" ++
-  (Indent.break(~indent=indent1) ++
-  ((fields
-  |> List.filter(({nameJS}: field) => nameJS != "children")
-  |> List.map(emitField(~indent=indent1))
-  |> String.concat("," ++ Indent.break(~indent=indent1))) ++ (Indent.break(~indent) ++ "};")))))
-    |> Emitters.\"export"(~emitters)
-}
-
-let emitImportTypeAs = (
-  ~emitters,
-  ~config,
-  ~typeName,
-  ~asTypeName,
-  ~typeNameIsInterface,
-  ~importPath,
-) => {
-  let (typeName, asTypeName) = switch asTypeName {
-  | Some(asName) =>
-    asName |> typeNameIsInterface
-      ? (typeName |> interfaceName(~config), Some(asName |> interfaceName(~config)))
-      : (typeName, asTypeName)
-  | None => (typeName, asTypeName)
-  }
-  let strictLocalPrefix =
-    config.language == Flow ? "// flowlint-next-line nonstrict-import:off\n" : ""
-  switch config.language {
-  | Flow
-  | TypeScript =>
-    strictLocalPrefix ++
-    ("import " ++
-    ((config.language == Flow ? "type " : "") ++
-    ("{" ++
-    (typeName ++
-    (switch asTypeName {
-    | Some(asT) => " as " ++ asT
-    | None => ""
-    } ++
-    ("} from '" ++ ((importPath |> ImportPath.emit(~config)) ++ "';")))))))
-      |> Emitters.\"import"(~emitters)
-  | Untyped => emitters
-  }
-}
-
-let ofTypeAny = (~config, s) => s |> ofType(~config, ~type_=typeAny(~config))
-
-let emitTypeCast = (~config, ~type_, ~typeNameIsInterface, s) =>
-  switch config.language {
-  | TypeScript => s ++ (" as " ++ (type_ |> typeToString(~config, ~typeNameIsInterface)))
-  | Untyped
-  | Flow => s
-  }
diff --git a/jscomp/syntax/tests/idempotency/genType/src/EmitType.resi b/jscomp/syntax/tests/idempotency/genType/src/EmitType.resi
deleted file mode 100644
index 18e79dc..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/EmitType.resi
+++ /dev/null
@@ -1,143 +0,0 @@
-open GenTypeCommon
-
-let componentExportName: (
-  ~config: config,
-  ~fileName: ModuleName.t,
-  ~moduleName: ModuleName.t,
-) => string
-
-let emitExportConst: (
-  ~comment: string=?,
-  ~config: config,
-  ~docString: string=?,
-  ~emitters: Emitters.t,
-  ~name: string,
-  ~type_: type_,
-  ~typeNameIsInterface: string => bool,
-  string,
-) => Emitters.t
-
-let emitExportConstEarly: (
-  ~comment: string=?,
-  ~config: config,
-  ~docString: string=?,
-  ~emitters: Emitters.t,
-  ~name: string,
-  ~type_: type_,
-  ~typeNameIsInterface: string => bool,
-  string,
-) => Emitters.t
-
-let emitExportDefault: (~emitters: Emitters.t, ~config: config, string) => Emitters.t
-
-let emitExportFunction: (
-  ~early: bool,
-  ~comment: string,
-  ~emitters: Emitters.t,
-  ~name: string,
-  ~config: config,
-  string,
-) => Emitters.t
-
-let emitExportType: (
-  ~early: bool=?,
-  ~config: config,
-  ~emitters: Emitters.t,
-  ~nameAs: option<string>,
-  ~opaque: bool,
-  ~type_: type_,
-  ~typeNameIsInterface: string => bool,
-  ~typeVars: list<string>,
-  string,
-) => Emitters.t
-
-let emitHookTypeAsFunction: (
-  ~config: config,
-  ~emitters: Emitters.t,
-  ~name: string,
-  ~propsType: type_,
-  ~retType: type_,
-  ~retValue: string,
-  ~typeNameIsInterface: string => bool,
-  ~typeVars: list<string>,
-) => Emitters.t
-
-let emitImportReact: (~emitters: Emitters.t, ~config: config) => Emitters.t
-
-let emitImportTypeAs: (
-  ~emitters: Emitters.t,
-  ~config: config,
-  ~typeName: string,
-  ~asTypeName: option<string>,
-  ~typeNameIsInterface: string => bool,
-  ~importPath: ImportPath.t,
-) => Emitters.t
-
-let emitImportValueAsEarly: (
-  ~config: config,
-  ~emitters: Emitters.t,
-  ~name: string,
-  ~nameAs: option<string>,
-  ImportPath.t,
-) => Emitters.t
-
-let emitPropTypes: (
-  ~config: config,
-  ~emitters: Emitters.t,
-  ~indent: Indent.t,
-  ~name: string,
-  list<field>,
-) => Emitters.t
-
-let emitRequire: (
-  ~importedValueOrComponent: bool,
-  ~early: bool,
-  ~emitters: Emitters.t,
-  ~config: config,
-  ~moduleName: ModuleName.t,
-  ~strict: bool,
-  ImportPath.t,
-) => Emitters.t
-
-let emitTypeCast: (
-  ~config: config,
-  ~type_: type_,
-  ~typeNameIsInterface: string => bool,
-  string,
-) => string
-
-let fileHeader: (~config: config, ~sourceFile: string) => string
-
-let generatedModuleExtension: (~config: config) => string
-
-let isTypeReactElement: (~config: config, type_) => bool
-
-let ofType: (
-  ~config: config,
-  ~typeNameIsInterface: string => bool=?,
-  ~type_: type_,
-  string,
-) => string
-
-@ocaml.doc(" Help type-checking by making the argument of type any ")
-let ofTypeAny: (~config: config, string) => string
-
-let outputFileSuffix: (~config: config) => string
-
-let shimExtension: (~config: config) => string
-
-let typeReactChild: (~config: config) => type_
-
-let typeReactComponent: (~config: config, ~propsType: type_) => type_
-
-let typeReactContext: (~config: config, ~type_: type_) => type_
-
-let typeReactDOMReDomRef: (~config: config) => type_
-
-let typeReactElement: (~config: config) => type_
-
-let typeReactRef: (~type_: type_) => type_
-
-let typeAny: (~config: config) => type_
-
-let typeToString: (~config: config, ~typeNameIsInterface: string => bool, type_) => string
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Emitters.res b/jscomp/syntax/tests/idempotency/genType/src/Emitters.res
deleted file mode 100644
index 54da7d4..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Emitters.res
+++ /dev/null
@@ -1,52 +0,0 @@
-type t = {
-  requireEmitterEarly: list<string>,
-  exportEmitterEarly: list<string>,
-  requireEmitter: list<string>,
-  importEmitter: list<string>,
-  exportEmitter: list<string>,
-}
-
-let initial = {
-  requireEmitterEarly: list{},
-  exportEmitterEarly: list{},
-  requireEmitter: list{},
-  importEmitter: list{},
-  exportEmitter: list{},
-}
-
-let string = (~emitter, s) => list{s, ...emitter}
-
-let requireEarly = (~emitters, s) => {
-  ...emitters,
-  requireEmitterEarly: s |> string(~emitter=emitters.requireEmitterEarly),
-}
-
-let exportEarly = (~emitters, s) => {
-  ...emitters,
-  exportEmitterEarly: s |> string(~emitter=emitters.exportEmitterEarly),
-}
-
-let require = (~emitters, s) => {
-  ...emitters,
-  requireEmitter: s |> string(~emitter=emitters.requireEmitter),
-}
-let \"import" = (~emitters, s) => {
-  ...emitters,
-  importEmitter: s |> string(~emitter=emitters.importEmitter),
-}
-
-let \"export" = (~emitters, s) => {
-  ...emitters,
-  exportEmitter: s |> string(~emitter=emitters.exportEmitter),
-}
-
-let toString = (~separator, emitters) =>
-  list{
-    emitters.requireEmitterEarly |> List.rev,
-    emitters.exportEmitterEarly |> List.rev,
-    emitters.requireEmitter |> List.rev,
-    emitters.importEmitter |> List.rev,
-    emitters.exportEmitter |> List.rev,
-  }
-  |> List.concat
-  |> String.concat(separator)
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Emitters.resi b/jscomp/syntax/tests/idempotency/genType/src/Emitters.resi
deleted file mode 100644
index dc4e0d2..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Emitters.resi
+++ /dev/null
@@ -1,15 +0,0 @@
-type t
-
-let initial: t
-
-let exportEarly: (~emitters: t, string) => t
-
-let requireEarly: (~emitters: t, string) => t
-
-let \"export": (~emitters: t, string) => t
-
-let \"import": (~emitters: t, string) => t
-
-let require: (~emitters: t, string) => t
-
-let toString: (~separator: string, t) => string
diff --git a/jscomp/syntax/tests/idempotency/genType/src/ExportModule.res b/jscomp/syntax/tests/idempotency/genType/src/ExportModule.res
deleted file mode 100644
index 44af002..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/ExportModule.res
+++ /dev/null
@@ -1,103 +0,0 @@
-open GenTypeCommon
-
-type rec exportModuleItem = Hashtbl.t<string, exportModuleValue>
-and exportModuleValue =
-  | S(string, type_)
-  | M(exportModuleItem)
-
-type exportModuleItems = Hashtbl.t<string, exportModuleItem>
-
-type types = {
-  typeForValue: type_,
-  typeForType: type_,
-}
-
-let rec exportModuleValueToType = exportModuleValue =>
-  switch exportModuleValue {
-  | S(s, type_) => {typeForValue: ident(s), typeForType: type_}
-  | M(exportModuleItem) =>
-    let (fieldsForValue, fieldsForType) = exportModuleItem |> exportModuleItemToFields |> List.split
-    {
-      typeForValue: Object(Open, fieldsForValue),
-      typeForType: Object(Open, fieldsForType),
-    }
-  }
-and exportModuleItemToFields: exportModuleItem => list<(field, field)> = exportModuleItem =>
-  Hashtbl.fold((fieldName, exportModuleValue, fields) => {
-    let {typeForValue, typeForType} = exportModuleValue |> exportModuleValueToType
-    let fieldForType = {
-      mutable_: Mutable,
-      nameJS: fieldName,
-      nameRE: fieldName,
-      optional: Mandatory,
-      type_: typeForType,
-    }
-    let fieldForValue = {...fieldForType, type_: typeForValue}
-    list{(fieldForValue, fieldForType), ...fields}
-  }, exportModuleItem, list{})
-
-let rec extendExportModuleItem = (x, ~exportModuleItem: exportModuleItem, ~type_, ~valueName) =>
-  switch x {
-  | list{} => ()
-  | list{fieldName} => Hashtbl.replace(exportModuleItem, fieldName, S(valueName, type_))
-  | list{fieldName, ...rest} =>
-    let innerExportModuleItem = switch Hashtbl.find(exportModuleItem, fieldName) {
-    | M(innerExportModuleItem) => innerExportModuleItem
-    | S(_) => assert(false)
-    | exception Not_found =>
-      let innerExportModuleItem = Hashtbl.create(1)
-      Hashtbl.replace(exportModuleItem, fieldName, M(innerExportModuleItem))
-      innerExportModuleItem
-    }
-    rest |> extendExportModuleItem(~exportModuleItem=innerExportModuleItem, ~valueName, ~type_)
-  }
-
-let extendExportModuleItems = (x, ~exportModuleItems: exportModuleItems, ~type_, ~valueName) =>
-  switch x {
-  | list{} => assert(false)
-  | list{_valueName} => ()
-  | list{moduleName, ...rest} =>
-    let exportModuleItem = switch Hashtbl.find(exportModuleItems, moduleName) {
-    | exportModuleItem => exportModuleItem
-    | exception Not_found =>
-      let exportModuleItem = Hashtbl.create(1)
-      Hashtbl.replace(exportModuleItems, moduleName, exportModuleItem)
-      exportModuleItem
-    }
-    rest |> extendExportModuleItem(~exportModuleItem, ~type_, ~valueName)
-  }
-
-let createModuleItemsEmitter: unit => exportModuleItems = () => Hashtbl.create(1)
-
-let rev_fold = (f, tbl, base) => {
-  let list = Hashtbl.fold((k, v, l) => list{(k, v), ...l}, tbl, list{})
-  List.fold_left((x, (k, v)) => f(k, v, x), base, list)
-}
-
-let emitAllModuleItems = (~config, ~emitters, ~fileName, exportModuleItems: exportModuleItems) =>
-  emitters |> rev_fold((moduleName, exportModuleItem, emitters) => {
-    let {typeForValue, typeForType} = M(exportModuleItem) |> exportModuleValueToType
-    let emittedModuleItem = config.modulesAsObjects
-      ? ModuleName.forInnerModule(~fileName, ~innerModuleName=moduleName) |> ModuleName.toString
-      : typeForValue |> EmitType.typeToString(
-          /* abuse type to print object */
-          ~config={...config, language: Flow},
-          ~typeNameIsInterface=_ => false,
-        )
-    emittedModuleItem |> EmitType.emitExportConst(
-      ~config,
-      ~emitters,
-      ~name=moduleName,
-      ~type_=typeForType,
-      ~typeNameIsInterface=_ => false,
-    )
-  }, exportModuleItems)
-
-let extendExportModules = (~moduleItemsEmitter: exportModuleItems, ~type_, resolvedName) =>
-  resolvedName
-  |> ResolvedName.toList
-  |> extendExportModuleItems(
-    ~exportModuleItems=moduleItemsEmitter,
-    ~type_,
-    ~valueName=resolvedName |> ResolvedName.toString,
-  )
diff --git a/jscomp/syntax/tests/idempotency/genType/src/GenIdent.res b/jscomp/syntax/tests/idempotency/genType/src/GenIdent.res
deleted file mode 100644
index 587218f..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/GenIdent.res
+++ /dev/null
@@ -1,21 +0,0 @@
-@ocaml.doc(" Generate fresh identifiers ")
-module IntMap = Map.Make({
-  type t = int
-  let compare = (x: int, y: int) => compare(x, y)
-})
-
-type typeVarsGen = {
-  mutable typeNameMap: IntMap.t<string>,
-  mutable typeNameCounter: int,
-}
-
-let createTypeVarsGen = () => {typeNameMap: IntMap.empty, typeNameCounter: 0}
-
-let jsTypeNameForAnonymousTypeID = (~typeVarsGen, id) =>
-  try typeVarsGen.typeNameMap |> IntMap.find(id) catch {
-  | Not_found =>
-    typeVarsGen.typeNameCounter = typeVarsGen.typeNameCounter + 1
-    let name = "T" ++ string_of_int(typeVarsGen.typeNameCounter)
-    typeVarsGen.typeNameMap = typeVarsGen.typeNameMap |> IntMap.add(id, name)
-    name
-  }
diff --git a/jscomp/syntax/tests/idempotency/genType/src/GenType.res b/jscomp/syntax/tests/idempotency/genType/src/GenType.res
deleted file mode 100644
index ecf8427..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/GenType.res
+++ /dev/null
@@ -1,134 +0,0 @@
-/* **
- * Copyright 2004-present Facebook. All Rights Reserved.
- */
-
-open GenTypeCommon
-
-let version = Version.version
-
-let signFile = s => s
-
-type cliCommand =
-  | Add(string)
-  | Clean
-  | DCE(option<string>)
-  | NoOp
-  | Rm(string)
-  | Termination(option<string>)
-
-let cli = () => {
-  let bsVersion = ref(None)
-  let cliCommand = ref(NoOp)
-  let setBsVersion = s => bsVersion := Some(s)
-  let usage = "genType version " ++ version
-  let versionAndExit = () => {
-    print_endline(usage)
-    exit(0)
-  }
-  let rec printUsageAndExit = () => {
-    Arg.usage(speclist, usage)
-    exit(0)
-  }
-  and setCliCommand = command => {
-    if cliCommand.contents != NoOp {
-      printUsageAndExit()
-    }
-    cliCommand := command
-  }
-  and setAdd = s => Add(s) |> setCliCommand
-  and setRm = s => Rm(s) |> setCliCommand
-  and setClean = () => Clean |> setCliCommand
-  and setDCE = cmtRoot => DCE(cmtRoot) |> setCliCommand
-  and setTermination = cmtRoot => Termination(cmtRoot) |> setCliCommand
-  and speclist = list{
-    ("-bs-version", Arg.String(setBsVersion), "set the bucklescript version"),
-    ("-clean", Arg.Unit(setClean), "clean all the generated files"),
-    ("-cmt-add", Arg.String(setAdd), "compile a .cmt[i] file"),
-    ("-cmt-rm", Arg.String(setRm), "remove a .cmt[i] file"),
-    ("-dce", Arg.Unit(() => setDCE(None)), "experimental DCE"),
-    (
-      "-dce-cmt",
-      Arg.String(s => setDCE(Some(s))),
-      "root_path experimental DCE for all the .cmt files under the root path",
-    ),
-    ("-termination", Arg.Unit(() => setTermination(None)), "experimental termination"),
-    (
-      "-termination-cmt",
-      Arg.String(s => setTermination(Some(s))),
-      "root_path experimental termination for all the .cmt files under the root path",
-    ),
-    ("-version", Arg.Unit(versionAndExit), "show version information and exit"),
-    ("--version", Arg.Unit(versionAndExit), "show version information and exit"),
-  }
-
-  let executeCliCommand = (~bsVersion, cliCommand) =>
-    switch cliCommand {
-    | Add(s) =>
-      Log_.Color.forceColor := true
-      let splitColon = Str.split(Str.regexp(":"), s)
-      let (cmt, mlast) = switch splitColon {
-      | list{cmt, ...rest} =>
-        let mlast = rest |> String.concat("")
-        (cmt, mlast)
-      | _ => assert(false)
-      }
-      let config = Paths.readConfig(~bsVersion, ~namespace=cmt |> Paths.findNameSpace)
-      if Debug.basic.contents {
-        Log_.item("Add %s  %s\n", cmt, mlast)
-      }
-      cmt |> GenTypeMain.processCmtFile(~signFile, ~config)
-      exit(0)
-
-    | Clean =>
-      let config = Paths.readConfig(~bsVersion, ~namespace=None)
-      let sourceDirs = ModuleResolver.readSourceDirs(~configSources=config.sources)
-      if Debug.basic.contents {
-        Log_.item("Clean %d dirs\n", sourceDirs.dirs |> List.length)
-      }
-      let count = ref(0)
-      sourceDirs.dirs |> List.iter(dir => {
-        let files = Sys.readdir(dir)
-        files |> Array.iter(file =>
-          if Filename.check_suffix(file, ".re") {
-            let extension = EmitType.outputFileSuffix(~config)
-            let generated = Filename.concat(dir, (file |> Filename.chop_extension) ++ extension)
-            if Sys.file_exists(generated) {
-              Unix.unlink(generated)
-              incr(count)
-            }
-          }
-        )
-      })
-      if Debug.basic.contents {
-        Log_.item("Cleaned %d files\n", count.contents)
-      }
-      exit(0)
-
-    | NoOp => printUsageAndExit()
-
-    | Rm(s) =>
-      let splitColon = Str.split(Str.regexp(":"), s) |> Array.of_list
-      assert (Array.length(splitColon) === 1)
-      let cmtAbsolutePath: string = splitColon[0]
-      /* somehow the CMT hook is passing an absolute path here */
-      let cmt = cmtAbsolutePath |> Paths.relativePathFromBsLib
-      let config = Paths.readConfig(~bsVersion, ~namespace=cmt |> Paths.findNameSpace)
-      let outputFile = cmt |> Paths.getOutputFile(~config)
-      if Debug.basic.contents {
-        Log_.item("Remove %s\n", cmt)
-      }
-      if Sys.file_exists(outputFile) {
-        Unix.unlink(outputFile)
-      }
-      exit(0)
-
-    | DCE(cmtRoot) => DeadCode.runAnalysis(~cmtRoot)
-    | Termination(cmtRoot) => DeadCode.runTerminationAnalysis(~cmtRoot)
-    }
-
-  Arg.parse(speclist, print_endline, usage)
-
-  executeCliCommand(~bsVersion=bsVersion.contents, cliCommand.contents)
-}
-
-cli()
diff --git a/jscomp/syntax/tests/idempotency/genType/src/GenTypeCommon.res b/jscomp/syntax/tests/idempotency/genType/src/GenTypeCommon.res
deleted file mode 100644
index 661606f..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/GenTypeCommon.res
+++ /dev/null
@@ -1,275 +0,0 @@
-/* **
- * Copyright 2004-present Facebook. All Rights Reserved.
- */
-
-module StringMap = Map.Make(String)
-module StringSet = Set.Make(String)
-
-module Config = Config_
-include Config
-
-let logNotImplemented = x =>
-  if Debug.notImplemented.contents {
-    Log_.item("Not Implemented: %s\n", x)
-  }
-
-type optional =
-  | Mandatory
-  | Optional
-
-type mutable_ =
-  | Immutable
-  | Mutable
-
-type labelJS =
-  | BoolLabel(bool)
-  | FloatLabel(string)
-  | IntLabel(string)
-  | StringLabel(string)
-
-let labelJSToString = (~alwaysQuotes=false, labelJS) => {
-  let addQuotes = x => alwaysQuotes ? x |> EmitText.quotes : x
-  switch labelJS {
-  | BoolLabel(b) => b |> string_of_bool |> addQuotes
-  | FloatLabel(s) => s |> addQuotes
-  | IntLabel(i) => i |> addQuotes
-  | StringLabel(s) => s |> EmitText.quotes
-  }
-}
-
-type case = {
-  label: string,
-  labelJS: labelJS,
-}
-
-type closedFlag =
-  | Open
-  | Closed
-
-type rec type_ =
-  | Array(type_, mutable_)
-  | Function(function_)
-  | GroupOfLabeledArgs(fields)
-  | Ident(ident)
-  | Null(type_)
-  | Nullable(type_)
-  | Object(closedFlag, fields)
-  | Option(type_)
-  | Promise(type_)
-  | Record(fields)
-  | Tuple(list<type_>)
-  | TypeVar(string)
-  | Variant(variant)
-and fields = list<field>
-and argType = {
-  aName: string,
-  aType: type_,
-}
-and field = {
-  mutable_: mutable_,
-  nameJS: string,
-  nameRE: string,
-  optional: optional,
-  type_: type_,
-}
-and function_ = {
-  argTypes: list<argType>,
-  componentName: option<string>,
-  retType: type_,
-  typeVars: list<string>,
-  uncurried: bool,
-}
-and ident = {
-  builtin: bool,
-  name: string,
-  typeArgs: list<type_>,
-}
-and variant = {
-  hash: int,
-  noPayloads: list<case>,
-  payloads: list<(case, int, type_)>,
-  polymorphic: bool,
-  unboxed: bool,
-}
-
-let typeIsObject = type_ =>
-  switch type_ {
-  | Array(_) => true
-  | Function(_) => false
-  | GroupOfLabeledArgs(_) => false
-  | Ident(_) => false
-  | Null(_) => false
-  | Nullable(_) => false
-  | Object(_) => true
-  | Option(_) => false
-  | Promise(_) => true
-  | Record(_) => true
-  | Tuple(_) => true
-  | TypeVar(_) => false
-  | Variant(_) => false
-  }
-
-type label =
-  | Nolabel
-  | Label(string)
-  | OptLabel(string)
-
-type rec dep =
-  | External(string)
-  | Internal(ResolvedName.t)
-  | Dot(dep, string)
-
-module ScopedPackage = {
-  // Taken from ext_namespace.ml in bukclescript
-  let namespace_of_package_name = (s: string): string => {
-    let len = String.length(s)
-    let buf = Buffer.create(len)
-    let add = (capital, ch) =>
-      Buffer.add_char(
-        buf,
-        if capital {
-          Char.uppercase_ascii(ch)
-        } else {
-          ch
-        },
-      )
-    let rec aux = (capital, off, len) =>
-      if off >= len {
-        ()
-      } else {
-        let ch = String.unsafe_get(s, off)
-        switch ch {
-        | 'a' .. 'z'
-        | 'A' .. 'Z'
-        | '0' .. '9' =>
-          add(capital, ch)
-          aux(false, off + 1, len)
-        | '/'
-        | '-' =>
-          aux(true, off + 1, len)
-        | _ => aux(capital, off + 1, len)
-        }
-      }
-
-    aux(true, 0, len)
-    Buffer.contents(buf)
-  }
-
-  // @demo/some-library -> DemoSomelibrary
-  let packageNameToGeneratedModuleName = packageName =>
-    if String.contains(packageName, '/') {
-      Some(packageName |> namespace_of_package_name)
-    } else {
-      None
-    }
-
-  let isGeneratedModule = (id, ~config) =>
-    config.bsDependencies |> List.exists(packageName =>
-      packageName |> packageNameToGeneratedModuleName == Some(id |> Ident.name)
-    )
-
-  // (Common, DemoSomelibrary) -> Common-DemoSomelibrary
-  let addGeneratedModule = (s, ~generatedModule) => s ++ ("-" ++ Ident.name(generatedModule))
-
-  // Common-DemoSomelibrary -> Common
-  let removeGeneratedModule = s =>
-    switch s |> String.split_on_char('-') {
-    | list{name, _scope} => name
-    | _ => s
-    }
-}
-
-let rec depToString = dep =>
-  switch dep {
-  | External(name) => name |> ScopedPackage.removeGeneratedModule
-  | Internal(resolvedName) => resolvedName |> ResolvedName.toString
-  | Dot(d, s) => depToString(d) ++ ("_" ++ s)
-  }
-
-let rec depToResolvedName = (dep: dep) =>
-  switch dep {
-  | External(name) => name |> ResolvedName.fromString
-  | Internal(resolvedName) => resolvedName
-  | Dot(p, s) => ResolvedName.dot(s, p |> depToResolvedName)
-  }
-
-let createVariant = (~noPayloads, ~payloads, ~polymorphic) => {
-  let hash =
-    noPayloads |> List.map(case => (case.label, case.labelJS)) |> Array.of_list |> Hashtbl.hash
-
-  let unboxed = payloads == list{}
-  Variant({
-    hash: hash,
-    noPayloads: noPayloads,
-    payloads: payloads,
-    polymorphic: polymorphic,
-    unboxed: unboxed,
-  })
-}
-
-let variantTable = (hash, ~toJS) => (toJS ? "$$toJS" : "$$toRE") ++ string_of_int(hash)
-
-let ident = (~builtin=true, ~typeArgs=list{}, name) => Ident({
-  builtin: builtin,
-  name: name,
-  typeArgs: typeArgs,
-})
-
-let mixedOrUnknown = (~config) =>
-  ident(
-    switch config.language {
-    | Flow => "mixed"
-    | TypeScript
-    | Untyped => "unknown"
-    },
-  )
-
-let booleanT = ident("boolean")
-let dateT = ident("Date")
-let numberT = ident("number")
-let stringT = ident("string")
-let unitT = ident("void")
-let int64T = Tuple(list{numberT, numberT})
-
-module NodeFilename = {
-  include Filename
-
-  /* Force "/" separator. */
-  let dirSep = "/"
-
-  module Path: {
-    type t
-    let normalize: string => t
-    let concat: (t, string) => t
-    let toString: t => string
-  } = {
-    type t = string
-
-    let normalize = (path): t =>
-      switch Sys.os_type {
-      | "Win32" => path |> Str.split(Str.regexp("\\")) |> String.concat(dirSep)
-      | _ => path
-      }
-
-    let toString = path => path
-    let length = path => String.length(path)
-
-    let concat = (dirname, filename) => {
-      let isDirSep = (s, i) => {
-        let c = String.get(s, i)
-        c == '/' || (c == '\\' || c == ':')
-      }
-      let l = length(dirname)
-      if l == 0 || isDirSep(dirname, l - 1) {
-        dirname ++ filename
-      } else {
-        dirname ++ (dirSep ++ filename)
-      }
-    }
-  }
-
-  let concat = (dirname: string, filename) => {
-    open Path
-    Path.concat(normalize(dirname), filename) |> toString
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/GenTypeMain.res b/jscomp/syntax/tests/idempotency/genType/src/GenTypeMain.res
deleted file mode 100644
index 4c2c61a..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/GenTypeMain.res
+++ /dev/null
@@ -1,208 +0,0 @@
-/* **
- * Copyright 2004-present Facebook. All Rights Reserved.
- */
-
-module StringSet = Set.Make(String)
-
-let cmtCheckAnnotations = (~checkAnnotation, inputCMT) =>
-  switch inputCMT.Cmt_format.cmt_annots {
-  | Implementation(structure) => structure |> Annotation.structureCheckAnnotation(~checkAnnotation)
-  | Interface(signature) => signature |> Annotation.signatureCheckAnnotation(~checkAnnotation)
-  | _ => false
-  }
-
-let cmtHasTypeErrors = inputCMT =>
-  switch inputCMT.Cmt_format.cmt_annots {
-  | Partial_implementation(_)
-  | Partial_interface(_) => true
-  | _ => false
-  }
-
-let structureItemIsDeclaration = structItem =>
-  switch structItem.Typedtree.str_desc {
-  | Typedtree.Tstr_type(_)
-  | Tstr_modtype(_)
-  | Tstr_module(_) => true
-  | _ => false
-  }
-
-let signatureItemIsDeclaration = signatureItem =>
-  switch signatureItem.Typedtree.sig_desc {
-  | Typedtree.Tsig_type(_)
-  | Tsig_modtype(_) => true
-  | _ => false
-  }
-
-let inputCmtTranslateTypeDeclarations = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  inputCMT,
-): CodeItem.translation => {
-  let {Cmt_format.cmt_annots: cmt_annots} = inputCMT
-  let typeEnv = TypeEnv.root()
-  let translations = switch cmt_annots {
-  | Implementation(structure) =>
-    {
-      ...structure,
-      str_items: structure.str_items |> List.filter(structureItemIsDeclaration),
-    } |> TranslateStructure.translateStructure(~config, ~outputFileRelative, ~resolver, ~typeEnv)
-
-  | Interface(signature) =>
-    {
-      ...signature,
-      sig_items: signature.sig_items |> List.filter(signatureItemIsDeclaration),
-    } |> TranslateSignature.translateSignature(~config, ~outputFileRelative, ~resolver, ~typeEnv)
-
-  | Packed(_)
-  | Partial_implementation(_)
-  | Partial_interface(_) => list{}
-  }
-  translations
-  |> Translation.combine
-  |> Translation.addTypeDeclarationsFromModuleEquations(~typeEnv)
-}
-
-let translateCMT = (~config, ~outputFileRelative, ~resolver, inputCMT): Translation.t => {
-  let {Cmt_format.cmt_annots: cmt_annots} = inputCMT
-  let typeEnv = TypeEnv.root()
-  let translations = switch cmt_annots {
-  | Implementation(structure) =>
-    structure |> TranslateStructure.translateStructure(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-    )
-  | Interface(signature) =>
-    signature |> TranslateSignature.translateSignature(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-    )
-  | _ => list{}
-  }
-  translations
-  |> Translation.combine
-  |> Translation.addTypeDeclarationsFromModuleEquations(~typeEnv)
-}
-
-let emitTranslation = (
-  ~config,
-  ~fileName,
-  ~isInterface,
-  ~outputFile,
-  ~outputFileRelative,
-  ~resolver,
-  ~signFile,
-  translation,
-) => {
-  let codeText =
-    translation |> EmitJs.emitTranslationAsString(
-      ~config,
-      ~fileName,
-      ~outputFileRelative,
-      ~resolver,
-      ~inputCmtTranslateTypeDeclarations,
-    )
-  let fileContents = signFile(
-    EmitType.fileHeader(
-      ~config,
-      ~sourceFile=(fileName |> ModuleName.toString) ++ (isInterface ? ".rei" : ".re"),
-    ) ++
-    ("\n" ++
-    (codeText ++ "\n")),
-  )
-
-  GeneratedFiles.writeFileIfRequired(~outputFile, ~fileContents)
-}
-
-let readCmt = cmtFile =>
-  try Cmt_format.read_cmt(cmtFile) catch {
-  | Cmi_format.Error(_) =>
-    Log_.item("Error loading %s\n\n", cmtFile)
-    Log_.item(
-      "It looks like you might be using an old version of Bucklescript, or have stale compilation artifacts.\n",
-    )
-    Log_.item("Check that bs-platform is version 6.2.x or later.\n")
-    Log_.item("And try to clean and rebuild.\n\n")
-    assert(false)
-  }
-
-let processCmtFile = (~signFile, ~config, cmt) => {
-  let cmtFile = cmt |> Paths.getCmtFile
-  if cmtFile != "" {
-    let outputFile = cmt |> Paths.getOutputFile(~config)
-    let outputFileRelative = cmt |> Paths.getOutputFileRelative(~config)
-    let fileName = cmt |> Paths.getModuleName
-    let isInterface = Filename.check_suffix(cmtFile, ".cmti")
-    let resolver = ModuleResolver.createLazyResolver(
-      ~config,
-      ~extensions=list{".re", EmitType.shimExtension(~config)},
-      ~excludeFile=fname => fname == "React.re" || fname == "ReasonReact.re",
-    )
-    let (inputCMT, hasGenTypeAnnotations) = {
-      let inputCMT = readCmt(cmtFile)
-      let ignoreInterface = ref(false)
-      let checkAnnotation = (~loc as _, attributes) => {
-        if (
-          attributes
-          |> Annotation.getAttributePayload(Annotation.tagIsGenTypeIgnoreInterface) != None
-        ) {
-          ignoreInterface := true
-        }
-        attributes
-        |> Annotation.getAttributePayload(Annotation.tagIsOneOfTheGenTypeAnnotations) != None
-      }
-
-      let hasGenTypeAnnotations = inputCMT |> cmtCheckAnnotations(~checkAnnotation)
-      if isInterface {
-        let cmtFileImpl = (cmtFile |> Filename.chop_extension) ++ ".cmt"
-        let inputCMTImpl = readCmt(cmtFileImpl)
-        let hasGenTypeAnnotationsImpl = inputCMTImpl |> cmtCheckAnnotations(~checkAnnotation=(
-          ~loc,
-          attributes,
-        ) =>
-          if attributes |> checkAnnotation(~loc) {
-            if !ignoreInterface.contents {
-              Log_.Color.setup()
-              Log_.info(~loc, ~name="Warning genType", (ppf, ()) =>
-                Format.fprintf(ppf, "Annotation is ignored as there's a .rei file")
-              )
-            }
-            true
-          } else {
-            false
-          }
-        )
-        (
-          ignoreInterface.contents ? inputCMTImpl : inputCMT,
-          ignoreInterface.contents ? hasGenTypeAnnotationsImpl : hasGenTypeAnnotations,
-        )
-      } else {
-        (inputCMT, hasGenTypeAnnotations)
-      }
-    }
-    if hasGenTypeAnnotations {
-      inputCMT
-      |> translateCMT(~config, ~outputFileRelative, ~resolver)
-      |> emitTranslation(
-        ~config,
-        ~fileName,
-        ~isInterface,
-        ~outputFile,
-        ~outputFileRelative,
-        ~resolver,
-        ~signFile,
-      )
-    } else if inputCMT |> cmtHasTypeErrors {
-      outputFile |> GeneratedFiles.logFileAction(TypeError)
-    } else {
-      outputFile |> GeneratedFiles.logFileAction(NoMatch)
-      if Sys.file_exists(outputFile) {
-        Unix.unlink(outputFile)
-      }
-    }
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/GeneratedFiles.res b/jscomp/syntax/tests/idempotency/genType/src/GeneratedFiles.res
deleted file mode 100644
index da9df37..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/GeneratedFiles.res
+++ /dev/null
@@ -1,60 +0,0 @@
-type fileAction =
-  | NoMatch /* No @genType annotation found. */
-  | Replace /* Replace existing file on disk with new contents. */
-  | Identical /* File already on disk with identical contents. Skip. */
-  | TypeError /* The cmt file was produced after a type error -- don't delete generated files. */
-  | Write /* File not present on disk. */
-
-let logFileAction = (fileAction, fileName) =>
-  if Debug.basic.contents {
-    Log_.item(
-      "%s  %s\n",
-      switch fileAction {
-      | NoMatch => "NoMatch"
-      | Replace => "Replace"
-      | Identical => "Identical"
-      | TypeError => "TypeError"
-      | Write => "Write"
-      },
-      fileName,
-    )
-  }
-
-let readLines = (file: string): list<string> => {
-  let lines = ref(list{})
-  let chan = open_in(file)
-  let finished_lines = try {
-    while true {
-      lines := list{input_line(chan), ...lines.contents}
-    }
-    list{}
-  } catch {
-  | End_of_file =>
-    close_in(chan)
-    lines.contents |> List.rev
-  }
-  finished_lines
-}
-
-let readFile = (file: string): string => String.concat("\n", readLines(file))
-
-let writeFile = (filePath: string, contents: string) => {
-  let outFile = open_out(filePath)
-  output_string(outFile, contents)
-  close_out(outFile)
-}
-
-let writeFileIfRequired = (~outputFile, ~fileContents) =>
-  if Sys.file_exists(outputFile) {
-    let oldContents = readFile(outputFile)
-    let identical = oldContents == fileContents
-    if identical {
-      outputFile |> logFileAction(Identical)
-    } else {
-      outputFile |> logFileAction(Replace)
-      writeFile(outputFile, fileContents)
-    }
-  } else {
-    outputFile |> logFileAction(Write)
-    writeFile(outputFile, fileContents)
-  }
diff --git a/jscomp/syntax/tests/idempotency/genType/src/ImportPath.res b/jscomp/syntax/tests/idempotency/genType/src/ImportPath.res
deleted file mode 100644
index deb305f..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/ImportPath.res
+++ /dev/null
@@ -1,45 +0,0 @@
-open GenTypeCommon
-
-type t = (string, string)
-
-let propTypes = ("", "prop-types")
-
-let react = ("", "react")
-let reasonReactPath = (~config) => ("", config.reasonReactPath)
-let bsBlockPath = (~config) => ("", Config_.getBsBlockPath(~config))
-
-let bsCurryPath = (~config) => ("", Config_.getBsCurryPath(~config))
-
-let fromModule = (~dir, ~importExtension, moduleName) => {
-  let withNoPath =
-    (moduleName |> ModuleName.toString |> ScopedPackage.removeGeneratedModule) ++ importExtension
-  (dir, withNoPath)
-}
-
-let fromStringUnsafe = s => ("", s)
-
-let chopExtensionSafe = s =>
-  try s |> Filename.chop_extension catch {
-  | Invalid_argument(_) => s
-  }
-
-let dump = ((dir, s)) => NodeFilename.concat(dir, s)
-
-let toCmt = (~config, ~outputFileRelative, (dir, s)) => {
-  open Filename
-  concat(
-    outputFileRelative |> dirname,
-    ((dir, s |> chopExtensionSafe) |> dump) ++
-      (switch config.namespace {
-      | None => ""
-      | Some(name) => "-" ++ name
-      } ++
-      ".cmt"),
-  )
-}
-
-let emit = (~config, (dir, s)) =>
-  switch config.importPath {
-  | Relative => (dir, s) |> dump
-  | Node => s
-  }
diff --git a/jscomp/syntax/tests/idempotency/genType/src/ImportPath.resi b/jscomp/syntax/tests/idempotency/genType/src/ImportPath.resi
deleted file mode 100644
index 640e3da..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/ImportPath.resi
+++ /dev/null
@@ -1,23 +0,0 @@
-open GenTypeCommon
-
-type t
-
-let bsBlockPath: (~config: config) => t
-
-let bsCurryPath: (~config: config) => t
-
-let dump: t => string
-
-let emit: (~config: config, t) => string
-
-let fromModule: (~dir: string, ~importExtension: string, ModuleName.t) => t
-
-let fromStringUnsafe: string => t
-
-let propTypes: t
-
-let reasonReactPath: (~config: config) => t
-
-let react: t
-
-let toCmt: (~config: config, ~outputFileRelative: string, t) => string
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Indent.res b/jscomp/syntax/tests/idempotency/genType/src/Indent.res
deleted file mode 100644
index 5c7f031..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Indent.res
+++ /dev/null
@@ -1,24 +0,0 @@
-type t = option<string>
-
-let break = (~indent) =>
-  switch indent {
-  | None => ""
-  | Some(s) => "\n" ++ s
-  }
-
-let more = indent =>
-  switch indent {
-  | None => None
-  | Some(s) => Some("  " ++ s)
-  }
-
-let heuristicFields = (~indent, fields) => {
-  let threshold = 2
-  fields |> List.length > threshold && indent == None ? Some("") : indent
-}
-
-let heuristicVariants = (~indent, rendered) => {
-  let threshold = 40
-  let break = rendered |> String.concat(" ") |> String.length > threshold
-  break && indent == None ? Some("  ") : indent
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Log_.res b/jscomp/syntax/tests/idempotency/genType/src/Log_.res
deleted file mode 100644
index dbc1f50..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Log_.res
+++ /dev/null
@@ -1,161 +0,0 @@
-module Color = {
-  let color_enabled = lazy Unix.isatty(Unix.stdout)
-  let forceColor = ref(false)
-
-  let get_color_enabled = () => forceColor.contents || Lazy.force(color_enabled)
-
-  type color =
-    | Red
-    | Yellow
-    | Magenta
-    | Cyan
-
-  type style =
-    | FG(color)
-    | Bold
-    | Dim
-
-  let code_of_style = x =>
-    switch x {
-    | FG(Red) => "31"
-    | FG(Yellow) => "33"
-    | FG(Magenta) => "35"
-    | FG(Cyan) => "36"
-
-    | Bold => "1"
-    | Dim => "2"
-    }
-
-  let style_of_tag = s =>
-    switch s {
-    | "error" => list{Bold, FG(Red)}
-    | "warning" => list{Bold, FG(Magenta)}
-    | "info" => list{Bold, FG(Yellow)}
-    | "dim" => list{Dim}
-    | "filename" => list{FG(Cyan)}
-    | _ => list{}
-    }
-
-  let ansi_of_tag = s => {
-    let l = style_of_tag(s)
-    let s = String.concat(";", List.map(code_of_style, l))
-    "\027[" ++ (s ++ "m")
-  }
-
-  let reset_lit = "\027[0m"
-
-  let color_functions: Format.formatter_tag_functions = (
-    {
-      mark_open_tag: s =>
-        if get_color_enabled() {
-          ansi_of_tag(s)
-        } else {
-          ""
-        },
-      mark_close_tag: _ =>
-        if get_color_enabled() {
-          reset_lit
-        } else {
-          ""
-        },
-      print_open_tag: _ => (),
-      print_close_tag: _ => (),
-    }: Format.formatter_tag_functions
-  )
-
-  let setup = () => {
-    Format.pp_set_mark_tags(Format.std_formatter, true)
-    Format.pp_set_formatter_tag_functions(Format.std_formatter, color_functions)
-  }
-
-  let error = (ppf, s) => Format.fprintf(ppf, "@{<error>%s@}", s)
-  let info = (ppf, s) => Format.fprintf(ppf, "@{<info>%s@}", s)
-}
-
-module Loc = {
-  let print_filename = (ppf, file) =>
-    switch file {
-    /* modified */
-    | "_none_"
-    | "" =>
-      Format.fprintf(ppf, "(No file name)")
-    | real_file => Format.fprintf(ppf, "%s", Location.show_filename(real_file))
-    }
-
-  let print_loc = (~normalizedRange, ppf, loc: Location.t) => {
-    let (file, _, _) = Location.get_pos_info(loc.loc_start)
-    if file == "//toplevel//" {
-      if Location.highlight_locations(ppf, list{loc}) {
-        ()
-      } else {
-        Format.fprintf(ppf, "Characters %i-%i", loc.loc_start.pos_cnum, loc.loc_end.pos_cnum)
-      }
-    } else {
-      let dim_loc = (ppf, x) =>
-        switch x {
-        | None => ()
-        | Some(((start_line, start_line_start_char), (end_line, end_line_end_char))) =>
-          if start_line == end_line {
-            if start_line_start_char == end_line_end_char {
-              Format.fprintf(ppf, " @{<dim>%i:%i@}", start_line, start_line_start_char)
-            } else {
-              Format.fprintf(
-                ppf,
-                " @{<dim>%i:%i-%i@}",
-                start_line,
-                start_line_start_char,
-                end_line_end_char,
-              )
-            }
-          } else {
-            Format.fprintf(
-              ppf,
-              " @{<dim>%i:%i-%i:%i@}",
-              start_line,
-              start_line_start_char,
-              end_line,
-              end_line_end_char,
-            )
-          }
-        }
-
-      Format.fprintf(ppf, "@{<filename>%a@}%a", print_filename, file, dim_loc, normalizedRange)
-    }
-  }
-
-  let print = (ppf, loc: Location.t) => {
-    let (_file, start_line, start_char) = Location.get_pos_info(loc.loc_start)
-    let (_, end_line, end_char) = Location.get_pos_info(loc.loc_end)
-    let normalizedRange = if start_char === -1 || end_char === -1 {
-      None
-    } else if start_line == end_line && start_char >= end_char {
-      let same_char = start_char + 1
-      Some(((start_line, same_char), (end_line, same_char)))
-    } else {
-      Some(((start_line, start_char + 1), (end_line, end_char)))
-    }
-    Format.fprintf(ppf, "@[%a@]", print_loc(~normalizedRange), loc)
-  }
-}
-
-let log = x => Format.fprintf(Format.std_formatter, x)
-
-let item = x => {
-  Format.fprintf(Format.std_formatter, "  ")
-  Format.fprintf(Format.std_formatter, x)
-}
-
-let logKind = (body, ~color, ~loc, ~name) =>
-  Format.fprintf(
-    Format.std_formatter,
-    "@[<v 2>@,%a@,%a@,%a@]@.",
-    color,
-    name,
-    Loc.print,
-    loc,
-    body,
-    (),
-  )
-
-let info = (body, ~loc, ~name) => logKind(body, ~color=Color.info, ~loc, ~name)
-let error = (body, ~loc, ~name) => logKind(body, ~color=Color.error, ~loc, ~name)
diff --git a/jscomp/syntax/tests/idempotency/genType/src/ModuleName.res b/jscomp/syntax/tests/idempotency/genType/src/ModuleName.res
deleted file mode 100644
index 5009724..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/ModuleName.res
+++ /dev/null
@@ -1,22 +0,0 @@
-type t = string
-
-let createRescriptBlock = "CreateRescriptBlock"
-
-let curry = "Curry"
-
-let propTypes = "PropTypes"
-
-let react = "React"
-
-let reasonPervasives = "ReasonPervasives"
-let reasonReact = "ReasonReact"
-
-let forBsFile = s => s ++ "BS"
-
-let forInnerModule = (~fileName, ~innerModuleName) =>
-  (fileName |> forBsFile) ++ ("." ++ innerModuleName)
-let fromStringUnsafe = s => s
-let toString = s => s
-let compare = (s1: string, s2) => compare(s1, s2)
-
-let uncapitalize = String.uncapitalize_ascii
diff --git a/jscomp/syntax/tests/idempotency/genType/src/ModuleName.resi b/jscomp/syntax/tests/idempotency/genType/src/ModuleName.resi
deleted file mode 100644
index bc77b60..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/ModuleName.resi
+++ /dev/null
@@ -1,26 +0,0 @@
-type t
-
-let compare: (t, t) => int
-
-let createRescriptBlock: t
-
-let curry: t
-
-let forBsFile: t => t
-
-let forInnerModule: (~fileName: t, ~innerModuleName: string) => t
-
-@ocaml.doc(" Used to turn strings read from external files into module names. ")
-let fromStringUnsafe: string => t
-
-let propTypes: t
-
-let react: t
-
-let reasonPervasives: t
-
-let reasonReact: t
-
-let toString: t => string
-
-let uncapitalize: t => t
diff --git a/jscomp/syntax/tests/idempotency/genType/src/ModuleResolver.res b/jscomp/syntax/tests/idempotency/genType/src/ModuleResolver.res
deleted file mode 100644
index f542628..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/ModuleResolver.res
+++ /dev/null
@@ -1,318 +0,0 @@
-open GenTypeCommon
-
-module ModuleNameMap = Map.Make(ModuleName)
-
-let \"+++" = Filename.concat
-
-/* Read all the dirs from a library in node_modules */
-let readBsDependenciesDirs = (~root) => {
-  let dirs = ref(list{})
-  let rec findSubDirs = dir => {
-    let absDir = dir == "" ? root : \"+++"(root, dir)
-    if Sys.file_exists(absDir) && Sys.is_directory(absDir) {
-      dirs := list{dir, ...dirs.contents}
-      absDir |> Sys.readdir |> Array.iter(d => findSubDirs(\"+++"(dir, d)))
-    }
-  }
-  findSubDirs("")
-  dirs.contents
-}
-
-type pkgs = {
-  dirs: list<string>,
-  pkgs: Hashtbl.t<string, string>,
-}
-
-let readDirsFromConfig = (~configSources) => {
-  let dirs = ref(list{})
-  let root = projectRoot.contents
-  let \"+++" = Filename.concat
-
-  let rec processDir = (~subdirs, dir) => {
-    let absDir = dir == "" ? root : \"+++"(root, dir)
-    if Sys.file_exists(absDir) && Sys.is_directory(absDir) {
-      dirs := list{dir, ...dirs.contents}
-      if subdirs {
-        absDir |> Sys.readdir |> Array.iter(d => processDir(~subdirs, \"+++"(dir, d)))
-      }
-    }
-  }
-
-  let rec processSourceItem = (sourceItem: Ext_json_types.t) =>
-    switch sourceItem {
-    | Str({str}) => str |> processDir(~subdirs=false)
-    | Obj({map}) =>
-      switch map |> String_map.find_opt("dir") {
-      | Some(Str({str})) =>
-        let subdirs = switch map |> String_map.find_opt("subdirs") {
-        | Some(True(_)) => true
-        | Some(False(_)) => false
-        | _ => false
-        }
-        str |> processDir(~subdirs)
-      | _ => ()
-      }
-    | Arr({content}) => Array.iter(processSourceItem, content)
-    | _ => ()
-    }
-
-  switch configSources {
-  | Some(sourceItem) => processSourceItem(sourceItem)
-  | None => ()
-  }
-  dirs.contents
-}
-
-let readSourceDirs = (~configSources) => {
-  let sourceDirs =
-    list{"lib", "bs", ".sourcedirs.json"} |> List.fold_left(\"+++", bsbProjectRoot.contents)
-  let dirs = ref(list{})
-  let pkgs = Hashtbl.create(1)
-
-  let readDirs = json =>
-    switch json {
-    | Ext_json_types.Obj({map}) =>
-      switch map |> String_map.find_opt("dirs") {
-      | Some(Arr({content})) =>
-        content |> Array.iter(x =>
-          switch x {
-          | Ext_json_types.Str({str}) => dirs := list{str, ...dirs.contents}
-          | _ => ()
-          }
-        )
-        ()
-      | _ => ()
-      }
-    | _ => ()
-    }
-
-  let readPkgs = json =>
-    switch json {
-    | Ext_json_types.Obj({map}) =>
-      switch map |> String_map.find_opt("pkgs") {
-      | Some(Arr({content})) =>
-        content |> Array.iter(x =>
-          switch x {
-          | Ext_json_types.Arr({content: [Str({str: name}), Str({str: path})]}) =>
-            Hashtbl.add(pkgs, name, path)
-          | _ => ()
-          }
-        )
-        ()
-      | _ => ()
-      }
-    | _ => ()
-    }
-
-  if sourceDirs |> Sys.file_exists {
-    try {
-      let json = sourceDirs |> Ext_json_parse.parse_json_from_file
-      if bsbProjectRoot.contents != projectRoot.contents {
-        dirs := readDirsFromConfig(~configSources)
-      } else {
-        readDirs(json)
-      }
-      readPkgs(json)
-    } catch {
-    | _ => ()
-    }
-  } else {
-    Log_.item("Warning: can't find source dirs: %s\n", sourceDirs)
-    Log_.item("Types for cross-references will not be found by genType.\n")
-    dirs := readDirsFromConfig(~configSources)
-  }
-  {dirs: dirs.contents, pkgs: pkgs}
-}
-
-/* Read the project's .sourcedirs.json file if it exists
-   and build a map of the files with the given extension
-   back to the directory where they belong. */
-let sourcedirsJsonToMap = (~config, ~extensions, ~excludeFile) => {
-  let rec chopExtensions = fname =>
-    switch fname |> Filename.chop_extension {
-    | fnameChopped => fnameChopped |> chopExtensions
-    | exception _ => fname
-    }
-
-  let fileMap = ref(ModuleNameMap.empty)
-  let bsDependenciesFileMap = ref(ModuleNameMap.empty)
-
-  let filterGivenExtension = fileName =>
-    extensions |> List.exists(ext => Filename.check_suffix(fileName, ext)) && !excludeFile(fileName)
-
-  let addDir = (~dirOnDisk, ~dirEmitted, ~filter, ~map) =>
-    dirOnDisk
-    |> Sys.readdir
-    |> Array.iter(fname =>
-      if fname |> filter {
-        map :=
-          map.contents |> ModuleNameMap.add(
-            fname |> chopExtensions |> ModuleName.fromStringUnsafe,
-            dirEmitted,
-          )
-      }
-    )
-  let {dirs, pkgs} = readSourceDirs(~configSources=config.sources)
-  dirs |> List.iter(dir =>
-    addDir(
-      ~dirEmitted=dir,
-      ~dirOnDisk=\"+++"(projectRoot.contents, dir),
-      ~filter=filterGivenExtension,
-      ~map=fileMap,
-    )
-  )
-
-  config.bsDependencies |> List.iter(packageName =>
-    switch Hashtbl.find(pkgs, packageName) {
-    | path =>
-      let root = list{"lib", "bs"} |> List.fold_left(\"+++", path)
-      let filter = fileName =>
-        list{".cmt", ".cmti"} |> List.exists(ext => Filename.check_suffix(fileName, ext))
-      readBsDependenciesDirs(~root) |> List.iter(dir => {
-        let dirOnDisk = \"+++"(root, dir)
-        let dirEmitted = \"+++"(packageName, dir)
-        addDir(~dirEmitted, ~dirOnDisk, ~filter, ~map=bsDependenciesFileMap)
-      })
-    | exception Not_found => ()
-    }
-  )
-
-  (fileMap.contents, bsDependenciesFileMap.contents)
-}
-
-type case =
-  | Lowercase
-  | Uppercase
-
-type resolver = {
-  lazyFind: Lazy.t<(~useBsDependencies: bool, ModuleName.t) => option<(string, case, bool)>>,
-}
-
-let createLazyResolver = (~config, ~extensions, ~excludeFile) => {
-  lazyFind: lazy {
-    let (moduleNameMap, bsDependenciesFileMap) = sourcedirsJsonToMap(
-      ~config,
-      ~extensions,
-      ~excludeFile,
-    )
-    let find = (~bsDependencies, ~map, moduleName) =>
-      switch map |> ModuleNameMap.find(moduleName) {
-      | resolvedModuleDir => Some((resolvedModuleDir, Uppercase, bsDependencies))
-      | exception Not_found =>
-        switch map |> ModuleNameMap.find(moduleName |> ModuleName.uncapitalize) {
-        | resolvedModuleDir => Some((resolvedModuleDir, Lowercase, bsDependencies))
-        | exception Not_found => None
-        }
-      }
-    (~useBsDependencies, moduleName) =>
-      switch moduleName |> find(~bsDependencies=false, ~map=moduleNameMap) {
-      | None if useBsDependencies =>
-        moduleName |> find(~bsDependencies=true, ~map=bsDependenciesFileMap)
-      | res => res
-      }
-  },
-}
-
-let apply = (~resolver, ~useBsDependencies, moduleName) =>
-  moduleName |> Lazy.force(resolver.lazyFind, ~useBsDependencies)
-
-/* Resolve a reference to ModuleName, and produce a path suitable for require.
- E.g. require "../foo/bar/ModuleName.ext" where ext is ".re" or ".js". */
-let resolveModule = (
-  ~importExtension,
-  ~outputFileRelative,
-  ~resolver,
-  ~useBsDependencies,
-  moduleName,
-) => {
-  let outputFileRelativeDir = /* e.g. src if we're generating src/File.re.js */
-  Filename.dirname(outputFileRelative)
-  let outputFileAbsoluteDir = \"+++"(projectRoot.contents, outputFileRelativeDir)
-  let moduleNameReFile = /* Check if the module is in the same directory as the file being generated.
-   So if e.g. project_root/src/ModuleName.re exists. */
-  \"+++"(outputFileAbsoluteDir, ModuleName.toString(moduleName) ++ ".re")
-  let candidate = /* e.g. import "./Modulename.ext" */
-  moduleName |> ImportPath.fromModule(~dir=Filename.current_dir_name, ~importExtension)
-  if Sys.file_exists(moduleNameReFile) {
-    candidate
-  } else {
-    let rec pathToList = path => {
-      let isRoot = path |> Filename.basename == path
-      isRoot
-        ? list{path}
-        : list{path |> Filename.basename, ...path |> Filename.dirname |> pathToList}
-    }
-    switch moduleName |> apply(~resolver, ~useBsDependencies) {
-    | None => candidate
-    | Some((resolvedModuleDir, case, bsDependencies)) =>
-      /* e.g. "dst" in case of dst/ModuleName.re */
-
-      let walkUpOutputDir =
-        /* e.g. ".." in case dst is a path of length 1 */
-        outputFileRelativeDir
-        |> pathToList
-        |> List.map(_ => Filename.parent_dir_name)
-        |> (
-          l =>
-            switch l {
-            | list{} => ""
-            | list{_, ...rest} => rest |> List.fold_left(\"+++", Filename.parent_dir_name)
-            }
-        )
-
-      let fromOutputDirToModuleDir = /* e.g. "../dst" */
-      bsDependencies ? resolvedModuleDir : \"+++"(walkUpOutputDir, resolvedModuleDir)
-
-      /* e.g. import "../dst/ModuleName.ext" */
-
-      (
-        case == Uppercase ? moduleName : moduleName |> ModuleName.uncapitalize
-      ) |> ImportPath.fromModule(~dir=fromOutputDirToModuleDir, ~importExtension)
-    }
-  }
-}
-
-let resolveGeneratedModule = (~config, ~outputFileRelative, ~resolver, moduleName) => {
-  if Debug.moduleResolution.contents {
-    Log_.item("Resolve Generated Module: %s\n", moduleName |> ModuleName.toString)
-  }
-  let importPath = resolveModule(
-    ~importExtension=EmitType.generatedModuleExtension(~config),
-    ~outputFileRelative,
-    ~resolver,
-    ~useBsDependencies=true,
-    moduleName,
-  )
-  if Debug.moduleResolution.contents {
-    Log_.item("Import Path: %s\n", importPath |> ImportPath.dump)
-  }
-  importPath
-}
-
-@ocaml.doc("
- * Returns the path to import a given Reason module name.
- ")
-let importPathForReasonModuleName = (~config, ~outputFileRelative, ~resolver, moduleName) => {
-  if Debug.moduleResolution.contents {
-    Log_.item("Resolve Reason Module: %s\n", moduleName |> ModuleName.toString)
-  }
-  switch config.shimsMap |> ModuleNameMap.find(moduleName) {
-  | shimModuleName =>
-    if Debug.moduleResolution.contents {
-      Log_.item("ShimModuleName: %s\n", shimModuleName |> ModuleName.toString)
-    }
-    let importPath = resolveModule(
-      ~importExtension=".shim",
-      ~outputFileRelative,
-      ~resolver,
-      ~useBsDependencies=false,
-      shimModuleName,
-    )
-    if Debug.moduleResolution.contents {
-      Log_.item("Import Path: %s\n", importPath |> ImportPath.dump)
-    }
-    importPath
-  | exception Not_found =>
-    moduleName |> resolveGeneratedModule(~config, ~outputFileRelative, ~resolver)
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/NamedArgs.res b/jscomp/syntax/tests/idempotency/genType/src/NamedArgs.res
deleted file mode 100644
index afe84b7..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/NamedArgs.res
+++ /dev/null
@@ -1,74 +0,0 @@
-open GenTypeCommon
-
-type groupedArg =
-  | Group(fields)
-  | Arg(type_)
-
-@ocaml.doc("
- * For convenient processing turns consecutive named arguments into a
- * `NamedArgs` group, and individual non-named arguments into `Arg`s.
- ")
-let rec groupReversed = (~revCurGroup, ~revResult, labeledTypes) =>
-  switch (revCurGroup, labeledTypes) {
-  | (list{}, list{(Nolabel, type_), ...tl}) =>
-    groupReversed(~revCurGroup=list{}, ~revResult=list{Arg(type_), ...revResult}, tl)
-  /* Add it to the current group, not result. */
-  | (_, list{(OptLabel(name), type_), ...tl}) =>
-    groupReversed(
-      ~revCurGroup=list{
-        {
-          mutable_: Immutable,
-          nameJS: name,
-          nameRE: name,
-          optional: Optional,
-          type_: type_,
-        },
-        ...revCurGroup,
-      },
-      ~revResult,
-      tl,
-    )
-  | (_, list{(Label(name), type_), ...tl}) =>
-    groupReversed(
-      ~revCurGroup=list{
-        {
-          mutable_: Immutable,
-          nameJS: name,
-          nameRE: name,
-          optional: Mandatory,
-          type_: type_,
-        },
-        ...revCurGroup,
-      },
-      ~revResult,
-      tl,
-    )
-  | (list{}, list{}) => revResult
-  | (list{_grpHd, ..._grpTl}, list{} as _tl)
-  /* Just form the group, and recurse ignoring the (None, t) in that case.
-   * it will be handled in recursion. */
-  | (list{_grpHd, ..._grpTl}, list{(Nolabel, _), ..._tl}) =>
-    groupReversed(
-      ~revCurGroup=list{},
-      ~revResult=list{Group(revCurGroup), ...revResult},
-      labeledTypes,
-    )
-  }
-
-@ocaml.doc("
- * Special reverse that not only reverses the entire list but also the order of
- * items in the NamedArgs grouping.
- ")
-let rec reverse = (~soFar=list{}, lst) =>
-  switch lst {
-  | list{} => soFar
-  | list{Arg(type_)}
-    if type_ == unitT && soFar == list{} => // treat a single argument of type unit as no argument
-    list{}
-  | list{Arg(type_), ...tl} => reverse(~soFar=list{{aName: "", aType: type_}, ...soFar}, tl)
-  | list{Group(fields), ...tl} =>
-    reverse(~soFar=list{{aName: "", aType: GroupOfLabeledArgs(List.rev(fields))}, ...soFar}, tl)
-  }
-
-let group = labeledTypes =>
-  labeledTypes |> groupReversed(~revCurGroup=list{}, ~revResult=list{}) |> reverse
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Paths.res b/jscomp/syntax/tests/idempotency/genType/src/Paths.res
deleted file mode 100644
index 259cac5..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Paths.res
+++ /dev/null
@@ -1,139 +0,0 @@
-open GenTypeCommon
-
-let bsconfig = "bsconfig.json"
-
-let rec findProjectRoot = (~dir) =>
-  if Sys.file_exists(Filename.concat(dir, bsconfig)) {
-    dir
-  } else {
-    let parent = dir |> Filename.dirname
-    if parent == dir {
-      prerr_endline("Error: cannot find project root containing " ++ (bsconfig ++ "."))
-      assert(false)
-    } else {
-      findProjectRoot(~dir=parent)
-    }
-  }
-
-let setProjectRoot = () => {
-  projectRoot := findProjectRoot(~dir=Sys.getcwd())
-  bsbProjectRoot :=
-    switch Sys.getenv_opt("BSB_PROJECT_ROOT") {
-    | None => projectRoot.contents
-    | Some(s) => s
-    }
-}
-
-let concat = Filename.concat
-
-/*
- * Handle namespaces in cmt files.
- * E.g. src/Module-Project.cmt becomes src/Module
- */
-let handleNamespace = cmt => {
-  let cutAfterDash = s =>
-    switch String.index(s, '-') {
-    | n => String.sub(s, 0, n)
-    | exception Not_found => s
-    }
-  let noDir = Filename.basename(cmt) == cmt
-  if noDir {
-    cmt |> Filename.chop_extension |> cutAfterDash
-  } else {
-    let dir = cmt |> Filename.dirname
-    let base = cmt |> Filename.basename |> Filename.chop_extension |> cutAfterDash
-    Filename.concat(dir, base)
-  }
-}
-
-let findNameSpace = cmt => {
-  let keepAfterDash = s =>
-    switch String.index(s, '-') {
-    | n => Some(String.sub(s, n + 1, String.length(s) - n - 1))
-    | exception Not_found => None
-    }
-  cmt |> Filename.basename |> Filename.chop_extension |> keepAfterDash
-}
-
-/* Get the output file to be written, relative to the project root. */
-let getOutputFileRelative = (~config, cmt) =>
-  (cmt |> handleNamespace) ++ EmitType.outputFileSuffix(~config)
-
-/* Get the output file to be written, as an absolute path. */
-let getOutputFile = (~config, cmt) =>
-  Filename.concat(projectRoot.contents, getOutputFileRelative(~config, cmt))
-
-let getModuleName = cmt =>
-  cmt |> handleNamespace |> Filename.basename |> ModuleName.fromStringUnsafe
-
-let getCmtFile = cmt => {
-  let pathCmt = Filename.concat(Sys.getcwd(), cmt)
-
-  let cmtFile = if Filename.check_suffix(pathCmt, ".cmt") {
-    let pathCmtLowerCase = {
-      let dirName = pathCmt |> Filename.dirname
-      let baseName = pathCmt |> Filename.basename
-      Filename.concat(dirName, baseName |> String.uncapitalize_ascii)
-    }
-    let pathCmti = Filename.chop_extension(pathCmt) ++ ".cmti"
-    let pathCmtiLowerCase = Filename.chop_extension(pathCmtLowerCase) ++ ".cmti"
-    if Sys.file_exists(pathCmtiLowerCase) {
-      pathCmtiLowerCase
-    } else if Sys.file_exists(pathCmti) {
-      pathCmti
-    } else if Sys.file_exists(pathCmtLowerCase) {
-      pathCmtLowerCase
-    } else if Sys.file_exists(pathCmt) {
-      pathCmt
-    } else {
-      ""
-    }
-  } else {
-    ""
-  }
-  cmtFile
-}
-
-let getConfigFile = () => {
-  let gentypeconfig = concat(projectRoot.contents, "gentypeconfig.json")
-  gentypeconfig |> Sys.file_exists ? Some(gentypeconfig) : None
-}
-let getBsConfigFile = () => {
-  let bsconfig = concat(projectRoot.contents, "bsconfig.json")
-  bsconfig |> Sys.file_exists ? Some(bsconfig) : None
-}
-
-/* Find the relative path from /.../bs/lib
- e.g. /foo/bar/bs/lib/src/Hello.re --> src/Hello.re */
-let relativePathFromBsLib = fileName =>
-  if Filename.is_relative(fileName) {
-    fileName
-  } else {
-    let rec pathToList = path => {
-      let isRoot = path |> Filename.basename == path
-      isRoot
-        ? list{path}
-        : list{path |> Filename.basename, ...path |> Filename.dirname |> pathToList}
-    }
-    let rec fromLibBs = (~acc, reversedList) =>
-      switch reversedList {
-      | list{"bs", "lib", ..._} => acc
-      | list{dir, ...dirs} => fromLibBs(~acc=list{dir, ...acc}, dirs)
-      | list{} => list{} /* not found */
-      }
-    fileName
-    |> pathToList
-    |> fromLibBs(~acc=list{})
-    |> (
-      l =>
-        switch l {
-        | list{} => fileName
-        | list{root, ...dirs} => dirs |> List.fold_left(concat, root)
-        }
-    )
-  }
-
-let readConfig = (~bsVersion, ~namespace) => {
-  setProjectRoot()
-  Config.readConfig(~bsVersion, ~getConfigFile, ~getBsConfigFile, ~namespace)
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/ResolvedName.res b/jscomp/syntax/tests/idempotency/genType/src/ResolvedName.res
deleted file mode 100644
index 701bc5c..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/ResolvedName.res
+++ /dev/null
@@ -1,54 +0,0 @@
-type t = list<string>
-
-let dot = (s, x) => \"@"(x, list{s})
-
-let fromString = x => list{x}
-
-let toList = x => x
-
-let toString = x => x |> String.concat("_")
-
-type eq = (t, t)
-
-module NameSet = Set.Make({
-  type t = t
-  let rec compare = (x: t, y: t) =>
-    switch (x, y) {
-    | (list{}, list{}) => 0
-    | (list{}, list{_, ..._}) => -1
-    | (list{_, ..._}, list{}) => -1
-    | (list{s1, ...rest1}, list{s2, ...rest2}) =>
-      let n = String.compare(s1, s2)
-      n != 0 ? n : compare(rest1, rest2)
-    }
-})
-
-let rec applyEquation = (~el: t, eq: eq): list<t> =>
-  switch (eq, el) {
-  | ((list{}, rhs), _) => list{\"@"(rhs, el)}
-  | ((list{s1, ...rest1}, rhs), list{s2, ...rest2}) =>
-    s1 == s2 ? (rest1, rhs) |> applyEquation(~el=rest2) : list{}
-  | ((list{_, ..._}, _), list{}) => list{}
-  }
-
-let rec applyEquationsToElements = (~eqs: list<eq>, ~seen, elements: list<t>): list<eq> => {
-  let applyEqs = el => {
-    let freshElements =
-      eqs |> List.map(applyEquation(~el)) |> List.concat |> List.filter(y => !NameSet.mem(y, seen))
-    freshElements |> List.map(elFresh => (elFresh, el))
-  }
-
-  let newEquations = elements |> List.map(applyEqs) |> List.concat
-  let newElements = newEquations |> List.map(fst)
-  let newSeen = NameSet.union(seen, newElements |> NameSet.of_list)
-
-  newEquations == list{}
-    ? newEquations
-    : \"@"(newEquations, newElements |> applyEquationsToElements(~eqs, ~seen=newSeen))
-}
-
-/* Apply equations of the form e.g. X.Y = A from the alias: module A = X.Y.
-   Return a list of equations on types.
-   E.g. if the element is X.Y.t, return equation A.t = X.Y.t */
-let applyEquations = (~eqs: list<eq>, el: t): list<eq> =>
-  list{el} |> applyEquationsToElements(~eqs, ~seen=NameSet.empty)
diff --git a/jscomp/syntax/tests/idempotency/genType/src/ResolvedName.resi b/jscomp/syntax/tests/idempotency/genType/src/ResolvedName.resi
deleted file mode 100644
index 3fdf0b3..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/ResolvedName.resi
+++ /dev/null
@@ -1,13 +0,0 @@
-type t
-
-type eq = (t, t)
-
-let applyEquations: (~eqs: list<eq>, t) => list<eq>
-
-let dot: (string, t) => t
-
-let fromString: string => t
-
-let toList: t => list<string>
-
-let toString: t => string
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Runtime.res b/jscomp/syntax/tests/idempotency/genType/src/Runtime.res
deleted file mode 100644
index 4fe0a0a..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Runtime.res
+++ /dev/null
@@ -1,205 +0,0 @@
-open GenTypeCommon
-
-let createRescriptBlock = "CreateRescriptBlock" ++ ".__"
-
-type recordGen = {
-  mutable unboxed: int,
-  mutable boxed: int,
-}
-
-type recordValue = int
-
-type moduleItemGen = {mutable itemIndex: int}
-
-type moduleItem = {
-  name: string,
-  index: int,
-}
-
-type rec moduleAccessPath =
-  | Root(string)
-  | Dot(moduleAccessPath, moduleItem)
-
-let recordValueToString = recordValue => recordValue |> string_of_int
-
-let recordGen = () => {unboxed: 0, boxed: 0}
-
-let newRecordValue = (~unboxed, recordGen) =>
-  if unboxed {
-    let v = recordGen.unboxed
-    recordGen.unboxed = recordGen.unboxed + 1
-    v
-  } else {
-    let v = recordGen.boxed
-    recordGen.boxed = recordGen.boxed + 1
-    v
-  }
-
-let moduleItemGen = () => {itemIndex: 0}
-
-let newModuleItem = (~name, moduleItemGen) => {
-  let index = moduleItemGen.itemIndex
-  moduleItemGen.itemIndex = moduleItemGen.itemIndex + 1
-  {name: name, index: index}
-}
-
-let rec emitModuleAccessPath = (~config, moduleAccessPath) =>
-  switch moduleAccessPath {
-  | Root(s) => s
-  | Dot(p, moduleItem) =>
-    p
-    |> emitModuleAccessPath(~config)
-    |> (
-      config.modulesAsObjects
-        ? EmitText.fieldAccess(~label=moduleItem.name)
-        : EmitText.arrayAccess(~index=moduleItem.index)
-    )
-  }
-
-let emitVariantLabel = (~comment=true, ~polymorphic, label) =>
-  if polymorphic {
-    (comment ? label |> EmitText.comment : "") ++ (label |> Btype.hash_variant |> string_of_int)
-  } else {
-    label
-  }
-
-let emitVariantGetLabel = (~polymorphic, x) =>
-  if polymorphic {
-    x |> EmitText.arrayAccess(~index=0)
-  } else {
-    x |> EmitText.fieldAccess(~label="tag")
-  }
-
-let emitVariantGetPayload = (~numArgs, ~polymorphic, x) =>
-  if polymorphic {
-    x |> EmitText.arrayAccess(~index=1)
-  } else if numArgs == 1 {
-    x |> EmitText.arrayAccess(~index=0)
-  } else if numArgs == 0 {
-    /* inline record */
-    x
-  } else {
-    /* to convert a runtime block to a tuple, remove the tag */
-    x |> EmitText.arraySlice
-  }
-
-let emitVariantWithPayload = (~config, ~label, ~numArgs, ~polymorphic, x) =>
-  if polymorphic {
-    EmitText.array(list{label |> emitVariantLabel(~polymorphic), x})
-  } else {
-    config.emitCreateBucklescriptBlock = true
-    let args = numArgs == 1 ? list{x} |> EmitText.array : x
-    createRescriptBlock |> EmitText.funCall(~args=list{label, args})
-  }
-
-let jsVariantTag = "tag"
-let jsVariantValue = "value"
-
-let emitJSVariantGetLabel = x => x |> EmitText.fieldAccess(~label=jsVariantTag)
-
-let emitJSVariantGetPayload = x => x |> EmitText.fieldAccess(~label=jsVariantValue)
-
-let emitJSVariantWithPayload = (~label, x) =>
-  "{" ++ (jsVariantTag ++ (":" ++ (label ++ (", " ++ (jsVariantValue ++ (":" ++ (x ++ "}")))))))
-
-let isMutableObjectField = name =>
-  String.length(name) >= 2 && String.sub(name, String.length(name) - 2, 2) == "#="
-
-/* Mutable fields, i.e. fields annotated "[@bs.set]"
-   are represented as extra fields called "fieldName#="
-   preceding the normal field. */
-let checkMutableObjectField = (~previousName, ~name) => previousName == name ++ "#="
-
-let default = "$$default"
-
-module Mangle = {
-  let keywords = [
-    "and",
-    "as",
-    "assert",
-    "begin",
-    "class",
-    "constraint",
-    "do",
-    "done",
-    "downto",
-    "else",
-    "end",
-    "exception",
-    "external",
-    "false",
-    "for",
-    "fun",
-    "function",
-    "functor",
-    "if",
-    "in",
-    "include",
-    "inherit",
-    "initializer",
-    "lazy",
-    "let",
-    "match",
-    "method",
-    "module",
-    "mutable",
-    "new",
-    "nonrec",
-    "object",
-    "of",
-    "open",
-    "or",
-    "private",
-    "rec",
-    "sig",
-    "struct",
-    "then",
-    "to",
-    "true",
-    "try",
-    "type",
-    "val",
-    "virtual",
-    "when",
-    "while",
-    "with",
-    "mod",
-    "land",
-    "lor",
-    "lxor",
-    "lsl",
-    "lsr",
-    "asr",
-  ]
-
-  let table = Hashtbl.create(keywords |> Array.length)
-  keywords |> Array.iter(x => Hashtbl.add(table, "_" ++ x, x))
-
-  /*
-     Apply bucklescript's mangling rules for object field names:
-     Remove trailing "__" if present.
-     Otherwise remove leading "_" when followed by an uppercase letter, or keyword.
- */
-  let translate = x => {
-    let len = x |> String.length
-    if len > 2 && (String.get(x, len - 1) == '_' && String.get(x, len - 2) == '_') {
-      /* "foo__" -> "foo" */
-      String.sub(x, 0, len - 2)
-    } else if len > 1 && String.get(x, 0) == '_' {
-      if String.get(x, 1) >= 'A' && String.get(x, 1) <= 'Z' {
-        /* "_Uppercase" => "Uppercase" */
-        String.sub(x, 1, len - 1)
-      } else {
-        switch /* "_rec" -> "rec" */
-        Hashtbl.find(table, x) {
-        | y => y
-        | exception Not_found => x
-        }
-      }
-    } else {
-      x
-    }
-  }
-}
-
-let mangleObjectField = Mangle.translate
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Runtime.resi b/jscomp/syntax/tests/idempotency/genType/src/Runtime.resi
deleted file mode 100644
index 2e012b4..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Runtime.resi
+++ /dev/null
@@ -1,58 +0,0 @@
-open GenTypeCommon
-
-type recordGen
-
-type recordValue
-
-type moduleItemGen
-
-type moduleItem
-
-type rec moduleAccessPath =
-  | Root(string)
-  | Dot(moduleAccessPath, moduleItem)
-
-let checkMutableObjectField: (~previousName: string, ~name: string) => bool
-
-/* Internal name of a value called "default" used by buclescript for default export */
-let default: string
-
-let emitModuleAccessPath: (~config: config, moduleAccessPath) => string
-
-let emitJSVariantGetLabel: string => string
-
-let emitJSVariantGetPayload: string => string
-
-let emitJSVariantWithPayload: (~label: string, string) => string
-
-let emitVariantGetLabel: (~polymorphic: bool, string) => string
-
-let emitVariantGetPayload: (~numArgs: int, ~polymorphic: bool, string) => string
-
-let emitVariantLabel: (~comment: bool=?, ~polymorphic: bool, string) => string
-
-let emitVariantWithPayload: (
-  ~config: config,
-  ~label: string,
-  ~numArgs: int,
-  ~polymorphic: bool,
-  string,
-) => string
-
-let isMutableObjectField: string => bool
-
-let mangleObjectField: string => string
-
-let moduleItemGen: unit => moduleItemGen
-
-let newModuleItem: (~name: string, moduleItemGen) => moduleItem
-
-let newRecordValue: (~unboxed: bool, recordGen) => recordValue
-
-let recordGen: unit => recordGen
-
-let recordValueToString: recordValue => string
-
-let jsVariantTag: string
-
-let jsVariantValue: string
diff --git a/jscomp/syntax/tests/idempotency/genType/src/TranslateCoreType.res b/jscomp/syntax/tests/idempotency/genType/src/TranslateCoreType.res
deleted file mode 100644
index fa6c120..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/TranslateCoreType.res
+++ /dev/null
@@ -1,270 +0,0 @@
-open GenTypeCommon
-
-open! TranslateTypeExprFromTypes
-
-let removeOption = (~label: Asttypes.arg_label, coreType: Typedtree.core_type) =>
-  switch (coreType.ctyp_desc, label) {
-  | (Ttyp_constr(Path.Pident(id), _, list{t}), Optional(lbl)) if Ident.name(id) == "option" =>
-    Some((lbl, t))
-  | (Ttyp_constr(Pdot(Path.Pident(nameSpace), id, _), _, list{t}), Optional(lbl))
-    /* This has a different representation in 4.03+ */
-    if Ident.name(nameSpace) == "FB" && id == "option" =>
-    Some((lbl, t))
-  | _ => None
-  }
-
-type processVariant = {
-  noPayloads: list<(string, Typedtree.attributes)>,
-  payloads: list<(string, Typedtree.attributes, Typedtree.core_type)>,
-  unknowns: list<string>,
-}
-
-let processVariant = rowFields => {
-  let rec loop = (~noPayloads, ~payloads, ~unknowns, fields) =>
-    switch fields {
-    | list{
-        Typedtree.Ttag({txt: label}, attributes, _, /* only variants with no payload */ list{}),
-        ...otherFields,
-      } =>
-      otherFields |> loop(
-        ~noPayloads=list{(label, attributes), ...noPayloads},
-        ~payloads,
-        ~unknowns,
-      )
-    | list{Ttag({txt: label}, attributes, _, list{payload}), ...otherFields} =>
-      otherFields |> loop(
-        ~noPayloads,
-        ~payloads=list{(label, attributes, payload), ...payloads},
-        ~unknowns,
-      )
-    | list{Ttag(_, _, _, list{_, _, ..._}) | Tinherit(_), ...otherFields} =>
-      otherFields |> loop(~noPayloads, ~payloads, ~unknowns=list{"Tinherit", ...unknowns})
-    | list{} => {
-        noPayloads: noPayloads |> List.rev,
-        payloads: payloads |> List.rev,
-        unknowns: unknowns |> List.rev,
-      }
-    }
-  rowFields |> loop(~noPayloads=list{}, ~payloads=list{}, ~unknowns=list{})
-}
-
-let rec translateArrowType = (
-  ~config,
-  ~typeVarsGen,
-  ~noFunctionReturnDependencies,
-  ~typeEnv,
-  ~revArgDeps,
-  ~revArgs,
-  coreType: Typedtree.core_type,
-) =>
-  switch coreType.ctyp_desc {
-  | Ttyp_arrow(Nolabel, coreType1, coreType2) =>
-    let {dependencies, type_} = coreType1 |> translateCoreType_(~config, ~typeVarsGen, ~typeEnv, _)
-    let nextRevDeps = List.rev_append(dependencies, revArgDeps)
-    coreType2 |> translateArrowType(
-      ~config,
-      ~typeVarsGen,
-      ~noFunctionReturnDependencies,
-      ~typeEnv,
-      ~revArgDeps=nextRevDeps,
-      ~revArgs=list{(Nolabel, type_), ...revArgs},
-    )
-  | Ttyp_arrow((Labelled(lbl) | Optional(lbl)) as label, coreType1, coreType2) =>
-    let asLabel = switch coreType.ctyp_attributes |> Annotation.getGenTypeAsRenaming {
-    | Some(s) => s
-    | None => ""
-    }
-    switch coreType1 |> removeOption(~label) {
-    | None =>
-      let {dependencies, type_: type1} =
-        coreType1 |> translateCoreType_(~config, ~typeVarsGen, ~typeEnv)
-      let nextRevDeps = List.rev_append(dependencies, revArgDeps)
-      coreType2 |> translateArrowType(
-        ~config,
-        ~typeVarsGen,
-        ~noFunctionReturnDependencies,
-        ~typeEnv,
-        ~revArgDeps=nextRevDeps,
-        ~revArgs=list{
-          (Label(asLabel == "" ? lbl |> Runtime.mangleObjectField : asLabel), type1),
-          ...revArgs,
-        },
-      )
-    | Some((lbl, t1)) =>
-      let {dependencies, type_: type1} = t1 |> translateCoreType_(~config, ~typeVarsGen, ~typeEnv)
-      let nextRevDeps = List.rev_append(dependencies, revArgDeps)
-      coreType2 |> translateArrowType(
-        ~config,
-        ~typeVarsGen,
-        ~noFunctionReturnDependencies,
-        ~typeEnv,
-        ~revArgDeps=nextRevDeps,
-        ~revArgs=list{
-          (OptLabel(asLabel == "" ? lbl |> Runtime.mangleObjectField : asLabel), type1),
-          ...revArgs,
-        },
-      )
-    }
-  | _ =>
-    let {dependencies, type_: retType} =
-      coreType |> translateCoreType_(~config, ~typeVarsGen, ~typeEnv)
-    let allDeps = List.rev_append(revArgDeps, noFunctionReturnDependencies ? list{} : dependencies)
-
-    let labeledConvertableTypes = revArgs |> List.rev
-    let argTypes = labeledConvertableTypes |> NamedArgs.group
-
-    let functionType = Function({
-      argTypes: argTypes,
-      componentName: None,
-      retType: retType,
-      typeVars: list{},
-      uncurried: false,
-    })
-
-    {dependencies: allDeps, type_: functionType}
-  }
-and translateCoreType_ = (
-  ~config,
-  ~typeVarsGen,
-  ~noFunctionReturnDependencies=false,
-  ~typeEnv,
-  coreType: Typedtree.core_type,
-) =>
-  switch coreType.ctyp_desc {
-  | Ttyp_alias(ct, _) =>
-    ct |> translateCoreType_(~config, ~typeVarsGen, ~noFunctionReturnDependencies=false, ~typeEnv)
-
-  | Ttyp_constr(
-      Pdot(Pident({name: "Js"}), "t", _) as path,
-      _,
-      list{{
-        ctyp_desc:
-          Ttyp_object(tObj, closedFlag)
-          | Ttyp_alias({ctyp_desc: Ttyp_object(tObj, closedFlag)}, _),
-        _,
-      }},
-    ) =>
-    let getFieldType = objectField =>
-      switch objectField {
-      | Typedtree.OTtag({txt: name}, _, t) => (
-          name,
-          name |> Runtime.isMutableObjectField
-            ? {dependencies: list{}, type_: ident("")}
-            : t |> translateCoreType_(~config, ~typeVarsGen, ~typeEnv),
-        )
-      | OTinherit(t) => ("Inherit", t |> translateCoreType_(~config, ~typeVarsGen, ~typeEnv))
-      }
-    let fieldsTranslations = tObj |> List.map(getFieldType)
-    translateConstr(
-      ~config,
-      ~fieldsTranslations,
-      ~closedFlag=closedFlag == Closed ? Closed : Open,
-      ~paramsTranslation=list{},
-      ~path,
-      ~typeEnv,
-    )
-
-  | Ttyp_constr(path, _, typeParams) =>
-    let paramsTranslation = typeParams |> translateCoreTypes_(~config, ~typeVarsGen, ~typeEnv)
-    TranslateTypeExprFromTypes.translateConstr(
-      ~config,
-      ~fieldsTranslations=list{},
-      ~closedFlag=Closed,
-      ~paramsTranslation,
-      ~path,
-      ~typeEnv,
-    )
-
-  | Ttyp_poly(_, t) =>
-    t |> translateCoreType_(~config, ~typeVarsGen, ~noFunctionReturnDependencies, ~typeEnv)
-
-  | Ttyp_arrow(_) =>
-    coreType |> translateArrowType(
-      ~config,
-      ~typeVarsGen,
-      ~noFunctionReturnDependencies,
-      ~typeEnv,
-      ~revArgDeps=list{},
-      ~revArgs=list{},
-    )
-
-  | Ttyp_tuple(listExp) =>
-    let innerTypesTranslation = listExp |> translateCoreTypes_(~config, ~typeVarsGen, ~typeEnv)
-    let innerTypes = innerTypesTranslation |> List.map(({type_}) => type_)
-    let innerTypesDeps =
-      innerTypesTranslation |> List.map(({dependencies}) => dependencies) |> List.concat
-
-    let tupleType = Tuple(innerTypes)
-
-    {dependencies: innerTypesDeps, type_: tupleType}
-
-  | Ttyp_var(s) => {dependencies: list{}, type_: TypeVar(s)}
-
-  | Ttyp_variant(rowFields, _, _) =>
-    switch rowFields |> processVariant {
-    | {noPayloads, payloads, unknowns: list{}} =>
-      let noPayloads =
-        noPayloads |> List.map(((label, _attibutes)) => {label: label, labelJS: StringLabel(label)})
-      let payloadsTranslations =
-        payloads |> List.map(((label, attributes, payload)) => (
-          label,
-          attributes,
-          payload |> translateCoreType_(~config, ~typeVarsGen, ~typeEnv),
-        ))
-      let payloads = payloadsTranslations |> List.map(((label, _attributes, translation)) => {
-        let numArgs = 1
-        ({label: label, labelJS: StringLabel(label)}, numArgs, translation.type_)
-      })
-      let type_ = createVariant(~noPayloads, ~payloads, ~polymorphic=true)
-      let dependencies =
-        payloadsTranslations |> List.map(((_, _, {dependencies})) => dependencies) |> List.concat
-      {dependencies: dependencies, type_: type_}
-
-    | _ => {dependencies: list{}, type_: mixedOrUnknown(~config)}
-    }
-
-  | Ttyp_package({pack_path, pack_fields}) =>
-    switch typeEnv |> TypeEnv.lookupModuleTypeSignature(~path=pack_path) {
-    | Some((signature, typeEnv)) =>
-      let typeEquationsTranslation =
-        pack_fields |> List.map(((x, t)) => (
-          x.Asttypes.txt,
-          t |> translateCoreType_(~config, ~typeVarsGen, ~typeEnv),
-        ))
-      let typeEquations =
-        typeEquationsTranslation |> List.map(((x, translation)) => (x, translation.type_))
-      let dependenciesFromTypeEquations =
-        typeEquationsTranslation
-        |> List.map(((_, translation)) => translation.dependencies)
-        |> List.flatten
-      let typeEnv1 = typeEnv |> TypeEnv.addTypeEquations(~typeEquations)
-      let (dependenciesFromRecordType, type_) =
-        signature.sig_type |> signatureToModuleRuntimeRepresentation(
-          ~config,
-          ~typeVarsGen,
-          ~typeEnv=typeEnv1,
-        )
-      {
-        dependencies: \"@"(dependenciesFromTypeEquations, dependenciesFromRecordType),
-        type_: type_,
-      }
-    | None => {dependencies: list{}, type_: mixedOrUnknown(~config)}
-    }
-
-  | Ttyp_any
-  | Ttyp_class(_)
-  | Ttyp_object(_) => {dependencies: list{}, type_: mixedOrUnknown(~config)}
-  }
-and translateCoreTypes_ = (~config, ~typeVarsGen, ~typeEnv, typeExprs): list<translation> =>
-  typeExprs |> List.map(translateCoreType_(~config, ~typeVarsGen, ~typeEnv))
-
-let translateCoreType = (~config, ~noFunctionReturnDependencies=?, ~typeEnv, coreType) => {
-  let typeVarsGen = GenIdent.createTypeVarsGen()
-  let translation =
-    coreType |> translateCoreType_(~config, ~typeVarsGen, ~noFunctionReturnDependencies?, ~typeEnv)
-
-  if Debug.dependencies.contents {
-    translation.dependencies |> List.iter(dep => Log_.item("Dependency: %s\n", dep |> depToString))
-  }
-  translation
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/TranslateSignature.res b/jscomp/syntax/tests/idempotency/genType/src/TranslateSignature.res
deleted file mode 100644
index af69083..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/TranslateSignature.res
+++ /dev/null
@@ -1,213 +0,0 @@
-open GenTypeCommon
-
-let translateSignatureValue = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  valueDescription: Typedtree.value_description,
-): Translation.t => {
-  let {Typedtree.val_id: val_id, val_desc, val_attributes} = valueDescription
-  if Debug.translation.contents {
-    Log_.item("Translate Signature Value %s\n", val_id |> Ident.name)
-  }
-  let typeExpr = val_desc.ctyp_type
-  let addAnnotationsToFunction = type_ => type_
-  switch (val_id, Annotation.fromAttributes(val_attributes)) {
-  | (id, GenType) =>
-    id
-    |> Ident.name
-    |> {
-      open Translation
-      Ident.name(id) == "make" ? translateComponent : translateValue
-    }(
-      ~attributes=val_attributes,
-      ~config,
-      ~docString=Annotation.getDocString(val_attributes),
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-      ~typeExpr,
-      ~addAnnotationsToFunction,
-    )
-  | _ => Translation.empty
-  }
-}
-
-let rec translateModuleDeclaration = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  {md_id, md_type}: Typedtree.module_declaration,
-) => {
-  let name = md_id |> Ident.name
-  if Debug.translation.contents {
-    Log_.item("Translate Module Declaration %s\n", name)
-  }
-  let typeEnv = typeEnv |> TypeEnv.newModule(~name)
-
-  switch md_type.mty_desc {
-  | Tmty_signature(signature) =>
-    signature
-    |> translateSignature(~config, ~outputFileRelative, ~resolver, ~typeEnv)
-    |> Translation.combine
-
-  | Tmty_ident(path, _) =>
-    switch typeEnv |> TypeEnv.lookupModuleTypeSignature(~path) {
-    | None => Translation.empty
-    | Some((signature, _)) =>
-      signature
-      |> translateSignature(~config, ~outputFileRelative, ~resolver, ~typeEnv)
-      |> Translation.combine
-    }
-
-  | Tmty_functor(_) =>
-    logNotImplemented("Tmty_functor " ++ __LOC__)
-    Translation.empty
-  | Tmty_with(_) =>
-    logNotImplemented("Tmty_with " ++ __LOC__)
-    Translation.empty
-  | Tmty_typeof(_) =>
-    logNotImplemented("Tmty_typeof " ++ __LOC__)
-    Translation.empty
-  | Tmty_alias(_) =>
-    logNotImplemented("Tmty_alias " ++ __LOC__)
-    Translation.empty
-  }
-}
-and translateModuleTypeDeclaration = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  moduleTypeDeclaration: Typedtree.module_type_declaration,
-) => {
-  if Debug.translation.contents {
-    Log_.item("Translate Module Type Declaration %s\n", moduleTypeDeclaration.mtd_id |> Ident.name)
-  }
-  switch moduleTypeDeclaration {
-  | {mtd_type: None} => Translation.empty
-  | {mtd_id, mtd_type: Some(mtd_type)} =>
-    switch mtd_type.mty_desc {
-    | Tmty_signature(signature) =>
-      let name = mtd_id |> Ident.name
-      let translation =
-        signature
-        |> translateSignature(
-          ~config,
-          ~outputFileRelative,
-          ~resolver,
-          ~typeEnv=typeEnv |> TypeEnv.newModuleType(~name, ~signature),
-        )
-        |> Translation.combine
-      translation
-
-    | Tmty_ident(_) =>
-      logNotImplemented("Tmty_ident " ++ __LOC__)
-      Translation.empty
-    | Tmty_functor(_) =>
-      logNotImplemented("Tmty_functor " ++ __LOC__)
-      Translation.empty
-    | Tmty_with(_) =>
-      logNotImplemented("Tmty_with " ++ __LOC__)
-      Translation.empty
-    | Tmty_typeof(_) =>
-      logNotImplemented("Tmty_typeof " ++ __LOC__)
-      Translation.empty
-    | Tmty_alias(_) =>
-      logNotImplemented("Tmty_alias " ++ __LOC__)
-      Translation.empty
-    }
-  }
-}
-and translateSignatureItem = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~moduleItemGen,
-  ~typeEnv,
-  signatureItem,
-): Translation.t =>
-  switch signatureItem {
-  | {Typedtree.sig_desc: Typedtree.Tsig_type(_, typeDeclarations)} => {
-      importTypes: list{},
-      codeItems: list{},
-      typeDeclarations: typeDeclarations |> TranslateTypeDeclarations.translateTypeDeclarations(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-        ~typeEnv,
-      ),
-    }
-
-  | {Typedtree.sig_desc: Tsig_value(valueDescription)} =>
-    if valueDescription.val_prim != list{} {
-      valueDescription |> Translation.translatePrimitive(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-        ~typeEnv,
-      )
-    } else {
-      let moduleItem =
-        moduleItemGen |> Runtime.newModuleItem(~name=valueDescription.val_id |> Ident.name)
-      typeEnv |> TypeEnv.updateModuleItem(~moduleItem)
-      valueDescription |> translateSignatureValue(~config, ~outputFileRelative, ~resolver, ~typeEnv)
-    }
-
-  | {Typedtree.sig_desc: Typedtree.Tsig_module(moduleDeclaration)} =>
-    moduleDeclaration |> translateModuleDeclaration(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-    )
-
-  | {Typedtree.sig_desc: Typedtree.Tsig_modtype(moduleTypeDeclaration)} =>
-    let moduleItem =
-      moduleItemGen |> Runtime.newModuleItem(~name=moduleTypeDeclaration.mtd_id |> Ident.name)
-    typeEnv |> TypeEnv.updateModuleItem(~moduleItem)
-    moduleTypeDeclaration |> translateModuleTypeDeclaration(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-    )
-
-  | {Typedtree.sig_desc: Typedtree.Tsig_typext(_)} =>
-    logNotImplemented("Tsig_typext " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.sig_desc: Typedtree.Tsig_exception(_)} =>
-    logNotImplemented("Tsig_exception " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.sig_desc: Typedtree.Tsig_recmodule(_)} =>
-    logNotImplemented("Tsig_recmodule " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.sig_desc: Typedtree.Tsig_open(_)} =>
-    logNotImplemented("Tsig_open " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.sig_desc: Typedtree.Tsig_include(_)} =>
-    logNotImplemented("Tsig_include " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.sig_desc: Typedtree.Tsig_class(_)} =>
-    logNotImplemented("Tsig_class " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.sig_desc: Typedtree.Tsig_class_type(_)} =>
-    logNotImplemented("Tsig_class_type " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.sig_desc: Typedtree.Tsig_attribute(_)} =>
-    logNotImplemented("Tsig_attribute " ++ __LOC__)
-    Translation.empty
-  }
-and translateSignature = (~config, ~outputFileRelative, ~resolver, ~typeEnv, signature): list<
-  Translation.t,
-> => {
-  if Debug.translation.contents {
-    Log_.item("Translate Signature\n")
-  }
-  let moduleItemGen = Runtime.moduleItemGen()
-  signature.Typedtree.sig_items |> List.map(
-    translateSignatureItem(~config, ~outputFileRelative, ~resolver, ~moduleItemGen, ~typeEnv),
-  )
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/TranslateSignatureFromTypes.res b/jscomp/syntax/tests/idempotency/genType/src/TranslateSignatureFromTypes.res
deleted file mode 100644
index 5cf3613..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/TranslateSignatureFromTypes.res
+++ /dev/null
@@ -1,144 +0,0 @@
-open GenTypeCommon
-
-/* Like translateTypeDeclaration but from Types not Typedtree */
-let translateTypeDeclarationFromTypes = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  ~id,
-  {type_params, type_kind, type_attributes, type_manifest}: Types.type_declaration,
-): list<CodeItem.typeDeclaration> => {
-  typeEnv |> TypeEnv.newType(~name=id |> Ident.name)
-  let typeName = Ident.name(id)
-  let typeVars = type_params |> TypeVars.extractFromTypeExpr
-  if Debug.translation.contents {
-    Log_.item("Translate Types.type_declaration %s\n", typeName)
-  }
-
-  let declarationKind = switch type_kind {
-  | Type_record(labelDeclarations, _) =>
-    TranslateTypeDeclarations.RecordDeclarationFromTypes(labelDeclarations)
-
-  | Type_variant(constructorDeclarations)
-    if !TranslateTypeDeclarations.hasSomeGADTLeaf(constructorDeclarations) =>
-    VariantDeclarationFromTypes(constructorDeclarations)
-
-  | Type_abstract => GeneralDeclarationFromTypes(type_manifest)
-
-  | _ => NoDeclaration
-  }
-
-  declarationKind |> TranslateTypeDeclarations.traslateDeclarationKind(
-    ~config,
-    ~outputFileRelative,
-    ~resolver,
-    ~typeAttributes=type_attributes,
-    ~typeEnv,
-    ~typeName,
-    ~typeVars,
-  )
-}
-
-/* Like translateModuleDeclaration but from Types not Typedtree */
-let rec translateModuleDeclarationFromTypes = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  ~id,
-  moduleDeclaration: Types.module_declaration,
-): Translation.t =>
-  switch moduleDeclaration.md_type {
-  | Mty_signature(signature) =>
-    let name = id |> Ident.name
-    signature
-    |> translateSignatureFromTypes(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv=typeEnv |> TypeEnv.newModule(~name),
-    )
-    |> Translation.combine
-
-  | Mty_ident(_) =>
-    logNotImplemented("Mty_ident " ++ __LOC__)
-    Translation.empty
-  | Mty_functor(_) =>
-    logNotImplemented("Mty_functor " ++ __LOC__)
-    Translation.empty
-  | Mty_alias(_) =>
-    logNotImplemented("Mty_alias " ++ __LOC__)
-    Translation.empty
-  }
-/* Like translateSignatureItem but from Types not Typedtree */
-and translateSignatureItemFromTypes = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~moduleItemGen,
-  ~typeEnv,
-  signatureItem: Types.signature_item,
-): Translation.t =>
-  switch signatureItem {
-  | Types.Sig_type(id, typeDeclaration, _) => {
-      importTypes: list{},
-      codeItems: list{},
-      typeDeclarations: typeDeclaration |> translateTypeDeclarationFromTypes(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-        ~typeEnv,
-        ~id,
-      ),
-    }
-
-  | Types.Sig_module(id, moduleDeclaration, _) =>
-    let moduleItem = moduleItemGen |> Runtime.newModuleItem(~name=id |> Ident.name)
-    typeEnv |> TypeEnv.updateModuleItem(~moduleItem)
-    moduleDeclaration |> translateModuleDeclarationFromTypes(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-      ~id,
-    )
-
-  | Types.Sig_value(_) =>
-    logNotImplemented("Sig_value " ++ __LOC__)
-    Translation.empty
-  | Types.Sig_typext(_) =>
-    logNotImplemented("Sig_typext " ++ __LOC__)
-    Translation.empty
-  | Types.Sig_modtype(_) =>
-    logNotImplemented("Sig_modtype " ++ __LOC__)
-    Translation.empty
-  | Types.Sig_class(_) =>
-    logNotImplemented("Sig_class " ++ __LOC__)
-    Translation.empty
-  | Types.Sig_class_type(_) =>
-    logNotImplemented("Sig_class_type " ++ __LOC__)
-    Translation.empty
-  }
-/* Like translateSignature but from Types not Typedtree */
-and translateSignatureFromTypes = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  signature: list<Types.signature_item>,
-): list<Translation.t> => {
-  if Debug.translation.contents {
-    Log_.item("Translate Types.signature\n")
-  }
-  let moduleItemGen = Runtime.moduleItemGen()
-  signature |> List.map(
-    translateSignatureItemFromTypes(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~moduleItemGen,
-      ~typeEnv,
-    ),
-  )
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/TranslateStructure.res b/jscomp/syntax/tests/idempotency/genType/src/TranslateStructure.res
deleted file mode 100644
index 9bafaa4..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/TranslateStructure.res
+++ /dev/null
@@ -1,426 +0,0 @@
-open GenTypeCommon
-
-let rec addAnnotationsToTypes_ = (~config, ~expr: Typedtree.expression, argTypes: list<argType>) =>
-  switch (expr.exp_desc, expr.exp_type.desc, argTypes) {
-  | (_, _, list{{aName, aType: GroupOfLabeledArgs(fields)}, ...nextTypes}) =>
-    let (fields1, nextTypes1) = addAnnotationsToFields(~config, expr, fields, nextTypes)
-    list{{aName: aName, aType: GroupOfLabeledArgs(fields1)}, ...nextTypes1}
-  | (Texp_function({param, cases: list{{c_rhs}}}), _, list{{aType}, ...nextTypes}) =>
-    let nextTypes1 = nextTypes |> addAnnotationsToTypes_(~config, ~expr=c_rhs)
-    let aName = Ident.name(param)
-    list{{aName: aName, aType: aType}, ...nextTypes1}
-  | (Texp_record({fields: [({lbl_name: "I"}, Overridden(_, exprRecord))]}), Tconstr(path, _, _), _)
-    if switch path |> TranslateTypeExprFromTypes.pathToList |> List.rev {
-    | list{"Js", "Fn", _arity} => true
-    | _ => false
-    } =>
-    // let uncurried1: Js.Fn.arity1(_) = {I: x => x |> string_of_int};
-    addAnnotationsToTypes_(~config, ~expr=exprRecord, argTypes)
-  | (Texp_apply({exp_desc: Texp_ident(path, _, _)}, list{(_, Some(expr1))}), _, _) =>
-    switch path |> TranslateTypeExprFromTypes.pathToList |> List.rev {
-    | list{"Js", "Internal", fn_mk}
-      // Uncurried function definition uses Js.Internal.fn_mkX(...)
-      if String.length(fn_mk) >= 5 && String.sub(fn_mk, 0, 5) == "fn_mk" =>
-      argTypes |> addAnnotationsToTypes_(~config, ~expr=expr1)
-    | _ => argTypes
-    }
-  | _ => argTypes
-  }
-and addAnnotationsToTypes = (~config, ~expr: Typedtree.expression, argTypes: list<argType>) => {
-  let argTypes = addAnnotationsToTypes_(~config, ~expr, argTypes)
-  if argTypes |> List.filter(({aName}) => aName == "param") |> List.length > 1 {
-    // Underscore "_" appears as "param", can occur more than once
-    argTypes |> List.mapi((i, {aName, aType}) => {
-      aName: aName ++ ("_" ++ string_of_int(i)),
-      aType: aType,
-    })
-  } else {
-    argTypes
-  }
-}
-and addAnnotationsToFields = (
-  ~config,
-  expr: Typedtree.expression,
-  fields: fields,
-  argTypes: list<argType>,
-) =>
-  switch (expr.exp_desc, fields, argTypes) {
-  | (_, list{}, _) => (list{}, argTypes |> addAnnotationsToTypes(~config, ~expr))
-  | (Texp_function({cases: list{{c_rhs}}}), list{field, ...nextFields}, _) =>
-    let (nextFields1, types1) = addAnnotationsToFields(~config, c_rhs, nextFields, argTypes)
-    let (nameJS, nameRE) = TranslateTypeDeclarations.renameRecordField(
-      ~attributes=expr.exp_attributes,
-      ~config,
-      ~nameRE=field.nameRE,
-    )
-    (list{{...field, nameJS: nameJS, nameRE: nameRE}, ...nextFields1}, types1)
-
-  | _ => (fields, argTypes)
-  }
-
-/* Recover from expr the renaming annotations on named arguments. */
-let addAnnotationsToFunctionType = (~config, expr: Typedtree.expression, type_: type_) =>
-  switch type_ {
-  | Function(function_) =>
-    let argTypes = function_.argTypes |> addAnnotationsToTypes(~config, ~expr)
-    Function({...function_, argTypes: argTypes})
-  | _ => type_
-  }
-
-let removeValueBindingDuplicates = structureItems => {
-  let rec processBindings = (bindings: list<Typedtree.value_binding>, ~seen) =>
-    switch bindings {
-    | list{{vb_pat: {pat_desc: Tpat_var(id, _)}} as binding, ...otherBindings} =>
-      let name = Ident.name(id)
-      if seen.contents |> StringSet.mem(name) {
-        otherBindings |> processBindings(~seen)
-      } else {
-        seen := seen.contents |> StringSet.add(name)
-        list{binding, ...otherBindings |> processBindings(~seen)}
-      }
-    | list{binding, ...otherBindings} => list{binding, ...otherBindings |> processBindings(~seen)}
-    | list{} => list{}
-    }
-  let rec processItems = (items: list<Typedtree.structure_item>, ~acc, ~seen) =>
-    switch items {
-    | list{{Typedtree.str_desc: Tstr_value(loc, valueBindings)} as item, ...otherItems} =>
-      let bindings = valueBindings |> processBindings(~seen)
-      let item = {...item, str_desc: Tstr_value(loc, bindings)}
-      otherItems |> processItems(~acc=list{item, ...acc}, ~seen)
-    | list{item, ...otherItems} => otherItems |> processItems(~acc=list{item, ...acc}, ~seen)
-    | list{} => acc
-    }
-  structureItems |> List.rev |> processItems(~acc=list{}, ~seen=ref(StringSet.empty))
-}
-
-let translateValueBinding = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~moduleItemGen,
-  ~typeEnv,
-  {Typedtree.vb_pat: vb_pat, vb_attributes, vb_expr},
-): Translation.t =>
-  switch vb_pat.pat_desc {
-  | Tpat_var(id, _) =>
-    let name = id |> Ident.name
-    if Debug.translation.contents {
-      Log_.item("Translate Value Binding %s\n", name)
-    }
-    let moduleItem = moduleItemGen |> Runtime.newModuleItem(~name)
-    typeEnv |> TypeEnv.updateModuleItem(~nameOpt=Some(name), ~moduleItem)
-
-    if Annotation.fromAttributes(vb_attributes) == GenType {
-      id
-      |> Ident.name
-      |> {
-        open Translation
-        Ident.name(id) == "make" ? translateComponent : translateValue
-      }(
-        ~attributes=vb_attributes,
-        ~config,
-        ~docString=Annotation.getDocString(vb_attributes),
-        ~outputFileRelative,
-        ~resolver,
-        ~typeEnv,
-        ~typeExpr=vb_expr.exp_type,
-        ~addAnnotationsToFunction=addAnnotationsToFunctionType(~config, vb_expr),
-      )
-    } else {
-      Translation.empty
-    }
-
-  | _ => Translation.empty
-  }
-
-let rec removeDuplicateValueBindings = (structureItems: list<Typedtree.structure_item>) =>
-  switch structureItems {
-  | list{{Typedtree.str_desc: Tstr_value(loc, valueBindings)} as structureItem, ...rest} =>
-    let (boundInRest, filteredRest) = rest |> removeDuplicateValueBindings
-    let valueBindingsFiltered = valueBindings |> List.filter(valueBinding =>
-      switch valueBinding {
-      | {Typedtree.vb_pat: {pat_desc: Tpat_var(id, _)}} =>
-        !(boundInRest |> StringSet.mem(id |> Ident.name))
-      | _ => true
-      }
-    )
-    let bound = valueBindings |> List.fold_left((bound, valueBinding: Typedtree.value_binding) =>
-      switch valueBinding {
-      | {vb_pat: {pat_desc: Tpat_var(id, _)}} => bound |> StringSet.add(id |> Ident.name)
-      | _ => bound
-      }
-    , boundInRest)
-    (
-      bound,
-      list{{...structureItem, str_desc: Tstr_value(loc, valueBindingsFiltered)}, ...filteredRest},
-    )
-  | list{structureItem, ...rest} =>
-    let (boundInRest, filteredRest) = rest |> removeDuplicateValueBindings
-    (boundInRest, list{structureItem, ...filteredRest})
-
-  | list{} => (StringSet.empty, list{})
-  }
-
-let rec translateModuleBinding = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  ~moduleItemGen,
-  {mb_id, mb_expr, mb_attributes}: Typedtree.module_binding,
-): Translation.t => {
-  let name = mb_id |> Ident.name
-  if Debug.translation.contents {
-    Log_.item("Translate Module Binding %s\n", name)
-  }
-  let moduleItem = moduleItemGen |> Runtime.newModuleItem(~name)
-  typeEnv |> TypeEnv.updateModuleItem(~moduleItem)
-  let typeEnv = typeEnv |> TypeEnv.newModule(~name)
-
-  switch mb_expr.mod_desc {
-  | Tmod_structure(structure) =>
-    let isLetPrivate = mb_attributes |> Annotation.hasAttribute(Annotation.tagIsInternLocal)
-    if isLetPrivate {
-      Translation.empty
-    } else {
-      structure
-      |> translateStructure(~config, ~outputFileRelative, ~resolver, ~typeEnv)
-      |> Translation.combine
-    }
-  | Tmod_apply(_) =>
-    /* Only look at the resulting type of the module */
-    switch mb_expr.mod_type {
-    | Mty_signature(signature) =>
-      signature
-      |> TranslateSignatureFromTypes.translateSignatureFromTypes(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-        ~typeEnv,
-      )
-      |> Translation.combine
-
-    | Mty_ident(_) =>
-      logNotImplemented("Mty_ident " ++ __LOC__)
-      Translation.empty
-    | Mty_functor(_) =>
-      logNotImplemented("Mty_functor " ++ __LOC__)
-      Translation.empty
-    | Mty_alias(_) =>
-      logNotImplemented("Mty_alias " ++ __LOC__)
-      Translation.empty
-    }
-
-  | Tmod_unpack(_, moduleType) =>
-    switch moduleType {
-    | Mty_signature(signature) =>
-      signature
-      |> TranslateSignatureFromTypes.translateSignatureFromTypes(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-        ~typeEnv,
-      )
-      |> Translation.combine
-
-    | Mty_ident(path) =>
-      switch typeEnv |> TypeEnv.lookupModuleTypeSignature(~path) {
-      | None => Translation.empty
-      | Some((signature, _)) =>
-        signature
-        |> TranslateSignature.translateSignature(~config, ~outputFileRelative, ~resolver, ~typeEnv)
-        |> Translation.combine
-      }
-
-    | Mty_functor(_) =>
-      logNotImplemented("Mty_functor " ++ __LOC__)
-      Translation.empty
-    | Mty_alias(_) =>
-      logNotImplemented("Mty_alias " ++ __LOC__)
-      Translation.empty
-    }
-
-  | Tmod_ident(path, _) =>
-    let dep = path |> Dependencies.fromPath(~config, ~typeEnv)
-    let internal = dep |> Dependencies.isInternal
-    typeEnv |> TypeEnv.addModuleEquation(~dep, ~internal)
-    Translation.empty
-
-  | Tmod_functor(_) =>
-    logNotImplemented("Tmod_functor " ++ __LOC__)
-    Translation.empty
-  | Tmod_constraint(_, Mty_ident(path), Tmodtype_explicit(_), Tcoerce_none) =>
-    switch typeEnv |> TypeEnv.lookupModuleTypeSignature(~path) {
-    | None => Translation.empty
-    | Some((signature, _)) =>
-      signature
-      |> TranslateSignature.translateSignature(~config, ~outputFileRelative, ~resolver, ~typeEnv)
-      |> Translation.combine
-    }
-
-  | Tmod_constraint(_, Mty_signature(signature), Tmodtype_explicit(_), Tcoerce_none) =>
-    signature
-    |> TranslateSignatureFromTypes.translateSignatureFromTypes(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-    )
-    |> Translation.combine
-
-  | Tmod_constraint(
-      {mod_desc: Tmod_structure(structure)},
-      _,
-      Tmodtype_implicit,
-      Tcoerce_structure(_),
-    ) =>
-    {
-      ...structure,
-      str_items: structure.str_items |> removeDuplicateValueBindings |> snd,
-    }
-    |> translateStructure(~config, ~outputFileRelative, ~resolver, ~typeEnv)
-    |> Translation.combine
-
-  | Tmod_constraint(_) =>
-    logNotImplemented("Tmod_constraint " ++ __LOC__)
-    Translation.empty
-  }
-}
-and translateStructureItem = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~moduleItemGen,
-  ~typeEnv,
-  structItem,
-): Translation.t =>
-  switch structItem {
-  | {Typedtree.str_desc: Typedtree.Tstr_type(_, typeDeclarations)} => {
-      importTypes: list{},
-      codeItems: list{},
-      typeDeclarations: typeDeclarations |> TranslateTypeDeclarations.translateTypeDeclarations(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-        ~typeEnv,
-      ),
-    }
-
-  | {Typedtree.str_desc: Tstr_value(_loc, valueBindings)} =>
-    valueBindings
-    |> List.map(
-      translateValueBinding(~config, ~outputFileRelative, ~resolver, ~moduleItemGen, ~typeEnv),
-    )
-    |> Translation.combine
-
-  | {Typedtree.str_desc: Tstr_primitive(valueDescription)} =>
-    /* external declaration */
-    valueDescription |> Translation.translatePrimitive(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-    )
-
-  | {Typedtree.str_desc: Tstr_module(moduleBinding)} =>
-    moduleBinding |> translateModuleBinding(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-      ~moduleItemGen,
-    )
-
-  | {Typedtree.str_desc: Tstr_modtype(moduleTypeDeclaration)} =>
-    moduleTypeDeclaration |> TranslateSignature.translateModuleTypeDeclaration(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-    )
-
-  | {Typedtree.str_desc: Tstr_recmodule(moduleBindings)} =>
-    moduleBindings
-    |> List.map(
-      translateModuleBinding(~config, ~outputFileRelative, ~resolver, ~typeEnv, ~moduleItemGen),
-    )
-    |> Translation.combine
-
-  | {
-      /* Bucklescript's encoding of bs.module: include with constraint. */
-      Typedtree.str_desc: Tstr_include({
-        incl_mod: {
-          mod_desc: Tmod_constraint(
-            {
-              mod_desc: Tmod_structure({
-                str_items: list{{str_desc: Tstr_primitive(_)} as structItem1},
-              }),
-            },
-            _,
-            _,
-            _,
-          ),
-        },
-        _,
-      }),
-      _,
-    } =>
-    structItem1 |> translateStructureItem(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~moduleItemGen,
-      ~typeEnv,
-    )
-
-  | {Typedtree.str_desc: Tstr_include({incl_type: signature})} =>
-    signature
-    |> TranslateSignatureFromTypes.translateSignatureFromTypes(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-    )
-    |> Translation.combine
-
-  | {Typedtree.str_desc: Tstr_eval(_)} =>
-    logNotImplemented("Tstr_eval " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.str_desc: Tstr_typext(_)} =>
-    logNotImplemented("Tstr_typext " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.str_desc: Tstr_exception(_)} =>
-    logNotImplemented("Tstr_exception " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.str_desc: Tstr_open(_)} =>
-    logNotImplemented("Tstr_open " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.str_desc: Tstr_class(_)} =>
-    logNotImplemented("Tstr_class " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.str_desc: Tstr_class_type(_)} =>
-    logNotImplemented("Tstr_class_type " ++ __LOC__)
-    Translation.empty
-  | {Typedtree.str_desc: Tstr_attribute(_)} =>
-    logNotImplemented("Tstr_attribute " ++ __LOC__)
-    Translation.empty
-  }
-and translateStructure = (~config, ~outputFileRelative, ~resolver, ~typeEnv, structure): list<
-  Translation.t,
-> => {
-  if Debug.translation.contents {
-    Log_.item("Translate Structure\n")
-  }
-  let moduleItemGen = Runtime.moduleItemGen()
-  structure.Typedtree.str_items
-  |> removeValueBindingDuplicates
-  |> List.map(structItem =>
-    structItem |> translateStructureItem(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-      ~moduleItemGen,
-      ~typeEnv,
-    )
-  )
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/TranslateTypeDeclarations.res b/jscomp/syntax/tests/idempotency/genType/src/TranslateTypeDeclarations.res
deleted file mode 100644
index bba68c1..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/TranslateTypeDeclarations.res
+++ /dev/null
@@ -1,376 +0,0 @@
-open GenTypeCommon
-
-type declarationKind =
-  | RecordDeclarationFromTypes(list<Types.label_declaration>)
-  | GeneralDeclaration(option<Typedtree.core_type>)
-  | GeneralDeclarationFromTypes(
-      option<Types.type_expr>,
-    ) /* As the above, but from Types not Typedtree */
-  | VariantDeclarationFromTypes(list<Types.constructor_declaration>)
-  | NoDeclaration
-
-let createExportTypeFromTypeDeclaration = (
-  ~annotation,
-  ~nameAs,
-  ~opaque,
-  ~type_,
-  ~typeEnv,
-  typeName,
-  ~typeVars,
-): CodeItem.exportFromTypeDeclaration => {
-  let resolvedTypeName = typeName |> TypeEnv.addModulePath(~typeEnv)
-  {
-    exportType: {
-      nameAs: nameAs,
-      opaque: opaque,
-      type_: type_,
-      typeVars: typeVars,
-      resolvedTypeName: resolvedTypeName,
-    },
-    annotation: annotation,
-  }
-}
-
-let createCase = ((label, attributes)) =>
-  switch attributes |> Annotation.getAttributePayload(Annotation.tagIsGenTypeAs) {
-  | Some(BoolPayload(b)) => {label: label, labelJS: BoolLabel(b)}
-  | Some(FloatPayload(s)) => {label: label, labelJS: FloatLabel(s)}
-  | Some(IntPayload(i)) => {label: label, labelJS: IntLabel(i)}
-  | Some(StringPayload(asLabel)) => {label: label, labelJS: StringLabel(asLabel)}
-  | _ => {label: label, labelJS: StringLabel(label)}
-  }
-
-// Rename record fields.
-// If @genType.as is used, perform renaming conversion.
-// If @bs.as is used (with records-as-objects active), no conversion is required.
-let renameRecordField = (~config, ~attributes, ~nameRE) =>
-  switch attributes |> Annotation.getGenTypeAsRenaming {
-  | Some(nameJS) => (nameJS, nameRE)
-  | None =>
-    if config.recordsAsObjects {
-      switch attributes |> Annotation.getBsAsRenaming {
-      | Some(name) => (name, name)
-      | None => (nameRE, nameRE)
-      }
-    } else {
-      (nameRE, nameRE)
-    }
-  }
-
-let traslateDeclarationKind = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeAttributes,
-  ~typeEnv,
-  ~typeName,
-  ~typeVars,
-  declarationKind,
-): list<CodeItem.typeDeclaration> => {
-  let annotation = typeAttributes |> Annotation.fromAttributes
-  let opaque =
-    annotation == Annotation.GenTypeOpaque ? Some(true) : None /* None means don't know */
-  let (importStringOpt, nameAs) = typeAttributes |> Annotation.getAttributeImportRenaming
-  let unboxedAnnotation = typeAttributes |> Annotation.hasAttribute(Annotation.tagIsUnboxed)
-
-  let returnTypeDeclaration = (typeDeclaration: CodeItem.typeDeclaration) =>
-    opaque == Some(true) ? list{{...typeDeclaration, importTypes: list{}}} : list{typeDeclaration}
-
-  let handleGeneralDeclaration = (translation: TranslateTypeExprFromTypes.translation) => {
-    let exportFromTypeDeclaration =
-      typeName |> createExportTypeFromTypeDeclaration(
-        ~annotation,
-        ~nameAs,
-        ~opaque,
-        ~type_=translation.type_,
-        ~typeEnv,
-        ~typeVars,
-      )
-    let importTypes =
-      translation.dependencies |> Translation.translateDependencies(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-      )
-    {CodeItem.importTypes: importTypes, exportFromTypeDeclaration: exportFromTypeDeclaration}
-  }
-
-  let translateLabelDeclarations = labelDeclarations => {
-    let fieldTranslations = labelDeclarations |> List.map(({
-      Types.ld_id: ld_id,
-      ld_mutable,
-      ld_type,
-      ld_attributes,
-    }) => {
-      let (nameJS, nameRE) = renameRecordField(
-        ~attributes=ld_attributes,
-        ~config,
-        ~nameRE=ld_id |> Ident.name,
-      )
-      let mutability = ld_mutable == Mutable ? Mutable : Immutable
-      (
-        nameJS,
-        nameRE,
-        mutability,
-        ld_type |> TranslateTypeExprFromTypes.translateTypeExprFromTypes(~config, ~typeEnv),
-      )
-    })
-
-    let dependencies =
-      fieldTranslations
-      |> List.map(((_, _, _, {TranslateTypeExprFromTypes.dependencies: dependencies})) =>
-        dependencies
-      )
-      |> List.concat
-
-    let fields = fieldTranslations |> List.map(((
-      nameJS,
-      nameRE,
-      mutable_,
-      {TranslateTypeExprFromTypes.type_: type_},
-    )) => {
-      let (optional, type1) = switch type_ {
-      | Option(type1) => (Optional, type1)
-      | _ => (Mandatory, type_)
-      }
-      {mutable_: mutable_, nameJS: nameJS, nameRE: nameRE, optional: optional, type_: type1}
-    })
-    let type_ = switch fields {
-    | list{field} if unboxedAnnotation && config.useUnboxedAnnotations => field.type_
-    | _ => config.recordsAsObjects ? Object(Closed, fields) : Record(fields)
-    }
-    {TranslateTypeExprFromTypes.dependencies: dependencies, type_: type_}
-  }
-
-  switch (declarationKind, importStringOpt) {
-  | (_, Some(importString)) =>
-    /* import type */
-    let typeName_ = typeName
-    let nameWithModulePath = typeName_ |> TypeEnv.addModulePath(~typeEnv) |> ResolvedName.toString
-    let (typeName, asTypeName) = switch nameAs {
-    | Some(asString) => (asString, "$$" ++ nameWithModulePath)
-    | None => (nameWithModulePath, "$$" ++ nameWithModulePath)
-    }
-    let importTypes = list{
-      {
-        CodeItem.typeName: typeName,
-        asTypeName: Some(asTypeName),
-        importPath: importString |> ImportPath.fromStringUnsafe,
-      },
-    }
-    let exportFromTypeDeclaration =
-      /* Make the imported type usable from other modules by exporting it too. */
-      typeName_ |> createExportTypeFromTypeDeclaration(
-        ~annotation=GenType,
-        ~nameAs=None,
-        ~opaque=Some(false),
-        ~type_=asTypeName |> ident(~typeArgs=typeVars |> List.map(s => TypeVar(s))),
-        ~typeEnv,
-        ~typeVars,
-      )
-    list{{CodeItem.importTypes: importTypes, exportFromTypeDeclaration: exportFromTypeDeclaration}}
-
-  | (GeneralDeclarationFromTypes(None) | GeneralDeclaration(None), None) =>
-    {
-      CodeItem.importTypes: list{},
-      exportFromTypeDeclaration: typeName |> createExportTypeFromTypeDeclaration(
-        ~annotation,
-        ~nameAs,
-        ~opaque=Some(true),
-        ~type_=mixedOrUnknown(~config),
-        ~typeEnv,
-        ~typeVars,
-      ),
-    } |> returnTypeDeclaration
-
-  | (GeneralDeclarationFromTypes(Some(typeExpr)), None) =>
-    let translation =
-      typeExpr |> TranslateTypeExprFromTypes.translateTypeExprFromTypes(~config, ~typeEnv)
-    translation |> handleGeneralDeclaration |> returnTypeDeclaration
-
-  | (GeneralDeclaration(Some(coreType)), None) =>
-    let translation = coreType |> TranslateCoreType.translateCoreType(~config, ~typeEnv)
-
-    let type_ = switch (coreType, translation.type_) {
-    | ({ctyp_desc: Ttyp_variant(rowFields, _, _)}, Variant(variant)) =>
-      let rowFieldsVariants = rowFields |> TranslateCoreType.processVariant
-      let noPayloads = rowFieldsVariants.noPayloads |> List.map(createCase)
-      let payloads = if (
-        variant.payloads |> List.length == (rowFieldsVariants.payloads |> List.length)
-      ) {
-        List.combine(variant.payloads, rowFieldsVariants.payloads) |> List.map(((
-          (_case, i, type_),
-          (label, attributes, _),
-        )) => {
-          let case = (label, attributes) |> createCase
-          (case, i, type_)
-        })
-      } else {
-        variant.payloads
-      }
-
-      createVariant(~noPayloads, ~payloads, ~polymorphic=true)
-    | _ => translation.type_
-    }
-    {...translation, type_: type_} |> handleGeneralDeclaration |> returnTypeDeclaration
-
-  | (RecordDeclarationFromTypes(labelDeclarations), None) =>
-    let {TranslateTypeExprFromTypes.dependencies: dependencies, type_} =
-      labelDeclarations |> translateLabelDeclarations
-
-    let importTypes =
-      dependencies |> Translation.translateDependencies(~config, ~outputFileRelative, ~resolver)
-
-    {
-      CodeItem.importTypes: importTypes,
-      exportFromTypeDeclaration: typeName |> createExportTypeFromTypeDeclaration(
-        ~annotation,
-        ~nameAs,
-        ~opaque,
-        ~type_,
-        ~typeEnv,
-        ~typeVars,
-      ),
-    } |> returnTypeDeclaration
-
-  | (VariantDeclarationFromTypes(constructorDeclarations), None) =>
-    let recordGen = Runtime.recordGen()
-    let variants = constructorDeclarations |> List.map(constructorDeclaration => {
-      let constructorArgs = constructorDeclaration.Types.cd_args
-      let name = constructorDeclaration.Types.cd_id |> Ident.name
-      let attributes = constructorDeclaration.Types.cd_attributes
-      let argsTranslation = switch constructorArgs {
-      | Cstr_tuple(typeExprs) =>
-        typeExprs |> TranslateTypeExprFromTypes.translateTypeExprsFromTypes(~config, ~typeEnv)
-      | Cstr_record(labelDeclarations) => list{labelDeclarations |> translateLabelDeclarations}
-      }
-      let inlineRecord = switch constructorArgs {
-      | Cstr_tuple(_) => false
-      | Cstr_record(_) => true
-      }
-
-      let argTypes =
-        argsTranslation |> List.map(({TranslateTypeExprFromTypes.type_: type_}) => type_)
-      let importTypes =
-        argsTranslation
-        |> List.map(({TranslateTypeExprFromTypes.dependencies: dependencies}) => dependencies)
-        |> List.concat
-        |> Translation.translateDependencies(~config, ~outputFileRelative, ~resolver)
-
-      let recordValue =
-        recordGen |> Runtime.newRecordValue(~unboxed=constructorArgs == Cstr_tuple(list{}))
-      (
-        name,
-        attributes,
-        argTypes,
-        importTypes,
-        inlineRecord,
-        recordValue |> Runtime.recordValueToString,
-      )
-    })
-    let (variantsNoPayload, variantsWithPayload) =
-      variants |> List.partition(((_, _, argTypes, _, _, _)) => argTypes == list{})
-
-    let noPayloads =
-      variantsNoPayload |> List.map(((
-        name,
-        attributes,
-        _argTypes,
-        _importTypes,
-        _inlineRecord,
-        recordValue,
-      )) => {...(name, attributes) |> createCase, label: recordValue})
-    let payloads = variantsWithPayload |> List.map(((
-      name,
-      attributes,
-      argTypes,
-      _importTypes,
-      inlineRecord,
-      recordValue,
-    )) => {
-      let type_ = switch argTypes {
-      | list{type_} => type_
-      | _ => Tuple(argTypes)
-      }
-      let numArgs = inlineRecord ? 0 : argTypes |> List.length
-      ({...(name, attributes) |> createCase, label: recordValue}, numArgs, type_)
-    })
-
-    let variantTyp = switch (noPayloads, payloads) {
-    | (list{}, list{(_c, _, type_)}) if unboxedAnnotation && config.useUnboxedAnnotations => type_
-    | _ => createVariant(~noPayloads, ~payloads, ~polymorphic=false)
-    }
-    let resolvedTypeName = typeName |> TypeEnv.addModulePath(~typeEnv)
-
-    let exportFromTypeDeclaration = {
-      CodeItem.exportType: {
-        nameAs: nameAs,
-        opaque: opaque,
-        type_: variantTyp,
-        typeVars: typeVars,
-        resolvedTypeName: resolvedTypeName,
-      },
-      annotation: annotation,
-    }
-    let importTypes =
-      variants |> List.map(((_, _, _, importTypes, _, _)) => importTypes) |> List.concat
-
-    {
-      CodeItem.exportFromTypeDeclaration: exportFromTypeDeclaration,
-      importTypes: importTypes,
-    } |> returnTypeDeclaration
-
-  | (NoDeclaration, None) => list{}
-  }
-}
-
-let hasSomeGADTLeaf = constructorDeclarations =>
-  List.exists(declaration => declaration.Types.cd_res !== None, constructorDeclarations)
-
-let translateTypeDeclaration = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  {typ_attributes, typ_id, typ_manifest, typ_params, typ_type}: Typedtree.type_declaration,
-): list<CodeItem.typeDeclaration> => {
-  if Debug.translation.contents {
-    Log_.item("Translate Type Declaration %s\n", typ_id |> Ident.name)
-  }
-  typeEnv |> TypeEnv.newType(~name=typ_id |> Ident.name)
-
-  let typeName = Ident.name(typ_id)
-
-  let typeVars = typ_params |> List.map(((coreType, _)) => coreType) |> TypeVars.extractFromCoreType
-
-  let declarationKind = switch typ_type.type_kind {
-  | Type_record(labelDeclarations, _) => RecordDeclarationFromTypes(labelDeclarations)
-
-  | Type_variant(constructorDeclarations) => VariantDeclarationFromTypes(constructorDeclarations)
-
-  | Type_abstract => GeneralDeclaration(typ_manifest)
-
-  | _ => NoDeclaration
-  }
-
-  declarationKind |> traslateDeclarationKind(
-    ~config,
-    ~outputFileRelative,
-    ~resolver,
-    ~typeAttributes=typ_attributes,
-    ~typeEnv,
-    ~typeName,
-    ~typeVars,
-  )
-}
-
-let translateTypeDeclarations = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  typeDeclarations: list<Typedtree.type_declaration>,
-): list<CodeItem.typeDeclaration> =>
-  typeDeclarations
-  |> List.map(translateTypeDeclaration(~config, ~outputFileRelative, ~resolver, ~typeEnv))
-  |> List.concat
diff --git a/jscomp/syntax/tests/idempotency/genType/src/TranslateTypeExprFromTypes.res b/jscomp/syntax/tests/idempotency/genType/src/TranslateTypeExprFromTypes.res
deleted file mode 100644
index f8ee715..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/TranslateTypeExprFromTypes.res
+++ /dev/null
@@ -1,712 +0,0 @@
-open GenTypeCommon
-
-type translation = {
-  dependencies: list<dep>,
-  type_: type_,
-}
-
-let rec removeOption = (~label: Asttypes.arg_label, typeExpr: Types.type_expr) =>
-  switch (typeExpr.desc, label) {
-  | (Tconstr(Path.Pident(id), list{t}, _), Optional(lbl)) if Ident.name(id) == "option" =>
-    Some((lbl, t))
-  | (Tconstr(Pdot(Path.Pident(nameSpace), id, _), list{t}, _), Optional(lbl))
-    if Ident.name(nameSpace) == "FB" && id == "option" =>
-    Some((lbl, t))
-  | (Tlink(t), _) => t |> removeOption(~label)
-  | _ => None
-  }
-
-let rec pathToList = path =>
-  switch path {
-  | Path.Pident(id) => list{id |> Ident.name}
-  | Path.Pdot(p, s, _) => list{s, ...p |> pathToList}
-  | Path.Papply(_) => list{}
-  }
-
-let translateConstr = (
-  ~config,
-  ~fieldsTranslations,
-  ~closedFlag,
-  ~paramsTranslation,
-  ~path: Path.t,
-  ~typeEnv,
-) => {
-  let defaultCase = () => {
-    let typeArgs = paramsTranslation |> List.map(({type_}: translation) => type_)
-    let typeParamDeps =
-      paramsTranslation |> List.map(({dependencies}) => dependencies) |> List.concat
-
-    switch typeEnv |> TypeEnv.applyTypeEquations(~config, ~path) {
-    | Some(type_) => {dependencies: typeParamDeps, type_: type_}
-    | None =>
-      let dep = path |> Dependencies.fromPath(~config, ~typeEnv)
-      {
-        dependencies: list{dep, ...typeParamDeps},
-        type_: Ident({builtin: false, name: dep |> depToString, typeArgs: typeArgs}),
-      }
-    }
-  }
-  switch (path |> pathToList |> List.rev, paramsTranslation) {
-  | (list{"FB", "bool"} | list{"bool"}, list{}) => {dependencies: list{}, type_: booleanT}
-
-  | (list{"FB", "int"} | list{"int"}, list{}) => {dependencies: list{}, type_: numberT}
-
-  | (list{"Int64", "t"} | list{"int64"}, list{}) => {dependencies: list{}, type_: int64T}
-
-  | (list{"FB", "float"} | list{"float"}, list{}) => {dependencies: list{}, type_: numberT}
-
-  | (
-      list{"FB", "string"}
-      | list{"string"}
-      | list{"String", "t"}
-      | list{"Js", "String" | "String2", "t"},
-      list{},
-    ) => {
-      dependencies: list{},
-      type_: stringT,
-    }
-
-  | (list{"Js", "Date", "t"}, list{}) => {dependencies: list{}, type_: dateT}
-
-  | (list{"FB", "unit"} | list{"unit"}, list{}) => {dependencies: list{}, type_: unitT}
-
-  | (
-      list{"FB", "array"} | list{"array"} | list{"Js", "Array" | "Array2", "t"},
-      list{paramTranslation},
-    ) => {
-      ...paramTranslation,
-      type_: Array(paramTranslation.type_, Mutable),
-    }
-
-  | (list{"ImmutableArray", "t"}, list{paramTranslation}) => {
-      ...paramTranslation,
-      type_: Array(paramTranslation.type_, Immutable),
-    }
-
-  | (list{"Pervasives", "ref"}, list{paramTranslation}) => {
-      dependencies: paramTranslation.dependencies,
-      type_: Tuple(list{paramTranslation.type_}),
-    }
-
-  | (
-      list{"Pervasives", "result"} | list{"Belt", "Result", "t"},
-      list{paramTranslation1, paramTranslation2},
-    ) =>
-    let case = (n, name, type_) => ({label: string_of_int(n), labelJS: StringLabel(name)}, 1, type_)
-    let variant = createVariant(
-      ~noPayloads=list{},
-      ~payloads=list{
-        case(0, "Ok", paramTranslation1.type_),
-        case(1, "Error", paramTranslation2.type_),
-      },
-      ~polymorphic=false,
-    )
-    {
-      dependencies: \"@"(paramTranslation1.dependencies, paramTranslation2.dependencies),
-      type_: variant,
-    }
-
-  | (list{"React", "callback"}, list{fromTranslation, toTranslation}) => {
-      dependencies: \"@"(fromTranslation.dependencies, toTranslation.dependencies),
-      type_: Function({
-        argTypes: list{{aName: "", aType: fromTranslation.type_}},
-        componentName: None,
-        retType: toTranslation.type_,
-        typeVars: list{},
-        uncurried: false,
-      }),
-    }
-
-  | (list{"React", "componentLike"}, list{propsTranslation, retTranslation}) => {
-      dependencies: \"@"(propsTranslation.dependencies, retTranslation.dependencies),
-      type_: Function({
-        argTypes: list{{aName: "", aType: propsTranslation.type_}},
-        componentName: None,
-        retType: retTranslation.type_,
-        typeVars: list{},
-        uncurried: false,
-      }),
-    }
-
-  | (list{"React", "component"}, list{propsTranslation}) => {
-      dependencies: propsTranslation.dependencies,
-      type_: Function({
-        argTypes: list{{aName: "", aType: propsTranslation.type_}},
-        componentName: None,
-        retType: EmitType.typeReactElement(~config),
-        typeVars: list{},
-        uncurried: false,
-      }),
-    }
-
-  | (list{"React", "Context", "t"}, list{paramTranslation}) => {
-      dependencies: paramTranslation.dependencies,
-      type_: EmitType.typeReactContext(~config, ~type_=paramTranslation.type_),
-    }
-
-  | (list{"React", "Ref", "t"}, list{paramTranslation}) => {
-      dependencies: paramTranslation.dependencies,
-      type_: EmitType.typeReactRef(~type_=paramTranslation.type_),
-    }
-
-  | (list{"ReactDOMRe", "domRef"}, list{}) => {
-      dependencies: list{},
-      type_: EmitType.typeReactDOMReDomRef(~config),
-    }
-
-  | (list{"ReactDOMRe", "Ref", "currentDomRef"}, list{}) => {
-      dependencies: list{},
-      type_: EmitType.typeAny(~config),
-    }
-
-  | (list{"React", "element"} | list{"ReasonReact", "reactElement"}, list{}) => {
-      dependencies: list{},
-      type_: EmitType.typeReactElement(~config),
-    }
-
-  | (list{"FB", "option"} | list{"option"}, list{paramTranslation}) => {
-      ...paramTranslation,
-      type_: Option(paramTranslation.type_),
-    }
-
-  | (list{"Js", "Null", "t"} | list{"Js", "null"}, list{paramTranslation}) => {
-      ...paramTranslation,
-      type_: Null(paramTranslation.type_),
-    }
-
-  | (
-      list{"Js", "Nullable", "t"}
-      | list{"Js", "nullable"}
-      | list{"Js", "Null_undefined", "t"}
-      | list{"Js", "null_undefined"},
-      list{paramTranslation},
-    ) => {
-      ...paramTranslation,
-      type_: Nullable(paramTranslation.type_),
-    }
-  | (list{"Js", "Promise", "t"}, list{paramTranslation}) => {
-      ...paramTranslation,
-      type_: Promise(paramTranslation.type_),
-    }
-  | (
-      list{"Js", "Internal", "fn"},
-      list{{dependencies: argsDependencies, type_: Tuple(ts)}, ret},
-    ) => {
-      dependencies: \"@"(argsDependencies, ret.dependencies),
-      type_: Function({
-        argTypes: ts |> List.map(type_ => {aName: "", aType: type_}),
-        componentName: None,
-        retType: ret.type_,
-        typeVars: list{},
-        uncurried: true,
-      }),
-    }
-
-  | (
-      list{"Js", "Internal", "fn"},
-      list{
-        {dependencies: argsDependencies, type_: Variant({noPayloads: list{{label: "Arity_0"}}})},
-        ret,
-      },
-    ) => {
-      dependencies: \"@"(argsDependencies, ret.dependencies),
-      type_: Function({
-        argTypes: list{},
-        componentName: None,
-        retType: ret.type_,
-        typeVars: list{},
-        uncurried: true,
-      }),
-    }
-  | (list{"Js", "Fn", "arity0"}, list{ret}) => {
-      dependencies: ret.dependencies,
-      type_: Function({
-        argTypes: list{},
-        componentName: None,
-        retType: ret.type_,
-        typeVars: list{},
-        uncurried: true,
-      }),
-    }
-  | (
-      list{
-        "Js" | "Js_OO",
-        "Fn" | "Meth",
-        "arity1"
-        | "arity2"
-        | "arity3"
-        | "arity4"
-        | "arity5"
-        | "arity6"
-        | "arity7"
-        | "arity8"
-        | "arity9"
-        | "arity10"
-        | "arity11"
-        | "arity12"
-        | "arity13"
-        | "arity14"
-        | "arity15"
-        | "arity16"
-        | "arity17"
-        | "arity18"
-        | "arity19"
-        | "arity20"
-        | "arity21"
-        | "arity22",
-      },
-      list{arg},
-    ) => {
-      dependencies: arg.dependencies,
-      type_: switch arg.type_ {
-      | Function(function_) => Function({...function_, uncurried: true})
-      | _ => arg.type_
-      },
-    }
-  | (list{"Js", "Internal", "fn"}, list{{dependencies: argsDependencies, type_: singleT}, ret}) =>
-    let argTypes = switch singleT {
-    | Variant({payloads: list{(_, _, Tuple(argTypes))}}) => argTypes
-    | Variant({payloads: list{(_, _, type_)}}) => list{type_}
-    | _ => list{singleT}
-    } |> List.map(type_ => {aName: "", aType: type_})
-    {
-      dependencies: \"@"(argsDependencies, ret.dependencies),
-      type_: Function({
-        argTypes: argTypes,
-        componentName: None,
-        retType: ret.type_,
-        typeVars: list{},
-        uncurried: true,
-      }),
-    }
-  | (
-      list{"Js", "Internal", "meth"} | list{"Js_internalOO", "meth"},
-      list{
-        {
-          dependencies: argsDependencies,
-          type_: Variant({payloads: list{({label: "Arity_1"}, _, type_)}}),
-        },
-        ret,
-      },
-    ) => {
-      dependencies: \"@"(argsDependencies, ret.dependencies),
-      type_: Function({
-        argTypes: list{{aName: "", aType: type_}},
-        componentName: None,
-        retType: ret.type_,
-        typeVars: list{},
-        uncurried: true,
-      }),
-    }
-  | (
-      list{"Js", "Internal", "meth"} | list{"Js_internalOO", "meth"},
-      list{
-        {dependencies: argsDependencies, type_: Variant({payloads: list{(_, _, Tuple(ts))}})},
-        ret,
-      },
-    ) => {
-      dependencies: \"@"(argsDependencies, ret.dependencies),
-      type_: Function({
-        argTypes: ts |> List.map(type_ => {aName: "", aType: type_}),
-        componentName: None,
-        retType: ret.type_,
-        typeVars: list{},
-        uncurried: true,
-      }),
-    }
-  | (list{"Js", "t"}, _) =>
-    let dependencies =
-      fieldsTranslations |> List.map(((_, {dependencies})) => dependencies) |> List.concat
-    let rec checkMutableField = (~acc=list{}, fields) =>
-      switch fields {
-      | list{(previousName, {type_: _}), (name, {type_}), ...rest}
-        if Runtime.checkMutableObjectField(~previousName, ~name) =>
-        /* The field was annotated "@bs.set" */
-        rest |> checkMutableField(~acc=list{(name, type_, Mutable), ...acc})
-      | list{(name, {type_}), ...rest} =>
-        rest |> checkMutableField(~acc=list{(name, type_, Immutable), ...acc})
-      | list{} => acc |> List.rev
-      }
-    let fields =
-      fieldsTranslations
-      |> checkMutableField
-      |> List.map(((name, t, mutable_)) => {
-        let (optional, type_) = switch t {
-        | Option(t) => (Optional, t)
-        | _ => (Mandatory, t)
-        }
-        let name = name |> Runtime.mangleObjectField
-        {mutable_: mutable_, nameJS: name, nameRE: name, optional: optional, type_: type_}
-      })
-    let type_ = Object(closedFlag, fields)
-    {dependencies: dependencies, type_: type_}
-
-  | _ => defaultCase()
-  }
-}
-
-type processVariant = {
-  noPayloads: list<string>,
-  payloads: list<(string, Types.type_expr)>,
-  unknowns: list<string>,
-}
-
-let processVariant = rowFields => {
-  let rec loop = (~noPayloads, ~payloads, ~unknowns, fields) =>
-    switch fields {
-    | list{
-        (
-          label,
-          Types.Rpresent(/* no payload */ None)
-          | Reither(/* constant constructor */ true, _, _, _),
-        ),
-        ...otherFields,
-      } =>
-      otherFields |> loop(~noPayloads=list{label, ...noPayloads}, ~payloads, ~unknowns)
-    | list{(label, Rpresent(Some(payload))), ...otherFields} =>
-      otherFields |> loop(~noPayloads, ~payloads=list{(label, payload), ...payloads}, ~unknowns)
-    | list{(label, Rabsent | Reither(false, _, _, _)), ...otherFields} =>
-      otherFields |> loop(~noPayloads, ~payloads, ~unknowns=list{label, ...unknowns})
-    | list{} => {
-        noPayloads: noPayloads |> List.rev,
-        payloads: payloads |> List.rev,
-        unknowns: unknowns |> List.rev,
-      }
-    }
-  rowFields |> loop(~noPayloads=list{}, ~payloads=list{}, ~unknowns=list{})
-}
-
-let rec translateArrowType = (
-  ~config,
-  ~typeVarsGen,
-  ~noFunctionReturnDependencies=false,
-  ~typeEnv,
-  ~revArgDeps,
-  ~revArgs,
-  typeExpr: Types.type_expr,
-) =>
-  switch typeExpr.desc {
-  | Tlink(t) =>
-    translateArrowType(
-      ~config,
-      ~typeVarsGen,
-      ~noFunctionReturnDependencies,
-      ~typeEnv,
-      ~revArgDeps,
-      ~revArgs,
-      t,
-    )
-  | Tarrow(Nolabel, typeExpr1, typeExpr2, _) =>
-    let {dependencies, type_} =
-      typeExpr1 |> translateTypeExprFromTypes_(~config, ~typeVarsGen, ~typeEnv, _)
-    let nextRevDeps = List.rev_append(dependencies, revArgDeps)
-    typeExpr2 |> translateArrowType(
-      ~config,
-      ~typeVarsGen,
-      ~noFunctionReturnDependencies,
-      ~typeEnv,
-      ~revArgDeps=nextRevDeps,
-      ~revArgs=list{(Nolabel, type_), ...revArgs},
-    )
-  | Tarrow((Labelled(lbl) | Optional(lbl)) as label, typeExpr1, typeExpr2, _) =>
-    switch typeExpr1 |> removeOption(~label) {
-    | None =>
-      let {dependencies, type_: type1} =
-        typeExpr1 |> translateTypeExprFromTypes_(~config, ~typeVarsGen, ~typeEnv)
-      let nextRevDeps = List.rev_append(dependencies, revArgDeps)
-      typeExpr2 |> translateArrowType(
-        ~config,
-        ~typeVarsGen,
-        ~noFunctionReturnDependencies,
-        ~typeEnv,
-        ~revArgDeps=nextRevDeps,
-        ~revArgs=list{(Label(lbl |> Runtime.mangleObjectField), type1), ...revArgs},
-      )
-    | Some((lbl, t1)) =>
-      let {dependencies, type_: type1} =
-        t1 |> translateTypeExprFromTypes_(~config, ~typeVarsGen, ~typeEnv)
-      let nextRevDeps = List.rev_append(dependencies, revArgDeps)
-      typeExpr2 |> translateArrowType(
-        ~config,
-        ~typeVarsGen,
-        ~noFunctionReturnDependencies,
-        ~typeEnv,
-        ~revArgDeps=nextRevDeps,
-        ~revArgs=list{(OptLabel(lbl |> Runtime.mangleObjectField), type1), ...revArgs},
-      )
-    }
-  | _ =>
-    let {dependencies, type_: retType} =
-      typeExpr |> translateTypeExprFromTypes_(~config, ~typeVarsGen, ~typeEnv)
-    let allDeps = List.rev_append(revArgDeps, noFunctionReturnDependencies ? list{} : dependencies)
-
-    let labeledConvertableTypes = revArgs |> List.rev
-    let argTypes = labeledConvertableTypes |> NamedArgs.group
-
-    let functionType = Function({
-      argTypes: argTypes,
-      componentName: None,
-      retType: retType,
-      typeVars: list{},
-      uncurried: false,
-    })
-
-    {dependencies: allDeps, type_: functionType}
-  }
-and translateTypeExprFromTypes_ = (
-  ~config,
-  ~typeVarsGen,
-  ~noFunctionReturnDependencies=false,
-  ~typeEnv,
-  typeExpr: Types.type_expr,
-) =>
-  switch typeExpr.desc {
-  | Tvar(None) =>
-    let typeName = GenIdent.jsTypeNameForAnonymousTypeID(~typeVarsGen, typeExpr.id)
-    {dependencies: list{}, type_: TypeVar(typeName)}
-
-  | Tvar(Some(s)) => {dependencies: list{}, type_: TypeVar(s)}
-
-  | Tconstr(Pdot(Pident({name: "Js"}), "t", _) as path, list{{desc: Tobject(tObj, _)}}, _) =>
-    let rec getFieldTypes = (texp: Types.type_expr) =>
-      switch texp.desc {
-      | Tfield(name, _, t1, t2) =>
-        let (closedFlafg, fields) = t2 |> getFieldTypes
-        (
-          closedFlafg,
-          list{
-            (
-              name,
-              name |> Runtime.isMutableObjectField
-                ? {dependencies: list{}, type_: ident("")}
-                : t1 |> translateTypeExprFromTypes_(~config, ~typeVarsGen, ~typeEnv),
-            ),
-            ...fields,
-          },
-        )
-      | Tlink(te) => te |> getFieldTypes
-      | Tvar(None) => (Open, list{})
-      | _ => (Closed, list{})
-      }
-    let (closedFlag, fieldsTranslations) = tObj |> getFieldTypes
-    translateConstr(
-      ~config,
-      ~fieldsTranslations,
-      ~closedFlag,
-      ~paramsTranslation=list{},
-      ~path,
-      ~typeEnv,
-    )
-
-  | Tconstr(path, list{{desc: Tlink(te)}}, r) =>
-    {...typeExpr, desc: Types.Tconstr(path, list{te}, r)} |> translateTypeExprFromTypes_(
-      ~config,
-      ~typeVarsGen,
-      ~noFunctionReturnDependencies=false,
-      ~typeEnv,
-    )
-
-  | Tconstr(path, typeParams, _) =>
-    let paramsTranslation =
-      typeParams |> translateTypeExprsFromTypes_(~config, ~typeVarsGen, ~typeEnv)
-    translateConstr(
-      ~config,
-      ~fieldsTranslations=list{},
-      ~closedFlag=Closed,
-      ~paramsTranslation,
-      ~path,
-      ~typeEnv,
-    )
-
-  | Tpoly(t, list{}) =>
-    t |> translateTypeExprFromTypes_(~config, ~typeVarsGen, ~noFunctionReturnDependencies, ~typeEnv)
-
-  | Tarrow(_) =>
-    typeExpr |> translateArrowType(
-      ~config,
-      ~typeVarsGen,
-      ~noFunctionReturnDependencies,
-      ~typeEnv,
-      ~revArgDeps=list{},
-      ~revArgs=list{},
-    )
-  | Ttuple(listExp) =>
-    let innerTypesTranslation =
-      listExp |> translateTypeExprsFromTypes_(~config, ~typeVarsGen, ~typeEnv)
-    let innerTypes = innerTypesTranslation |> List.map(({type_}) => type_)
-    let innerTypesDeps =
-      innerTypesTranslation |> List.map(({dependencies}) => dependencies) |> List.concat
-
-    let tupleType = Tuple(innerTypes)
-
-    {dependencies: innerTypesDeps, type_: tupleType}
-
-  | Tlink(t) =>
-    t |> translateTypeExprFromTypes_(~config, ~typeVarsGen, ~noFunctionReturnDependencies, ~typeEnv)
-
-  | Tvariant(rowDesc) =>
-    switch rowDesc.row_fields |> processVariant {
-    | {noPayloads, payloads: list{}, unknowns: list{}} =>
-      let noPayloads = noPayloads |> List.map(label => {label: label, labelJS: StringLabel(label)})
-      let type_ = createVariant(~noPayloads, ~payloads=list{}, ~polymorphic=true)
-      {dependencies: list{}, type_: type_}
-
-    | {noPayloads: list{}, payloads: list{(_label, t)}, unknowns: list{}} =>
-      /* Handle bucklescript's "Arity_" encoding in first argument of Js.Internal.fn(_,_) for uncurried functions.
-       Return the argument tuple. */
-      t |> translateTypeExprFromTypes_(
-        ~config,
-        ~typeVarsGen,
-        ~noFunctionReturnDependencies,
-        ~typeEnv,
-      )
-
-    | {noPayloads, payloads, unknowns: list{}} =>
-      let noPayloads = noPayloads |> List.map(label => {label: label, labelJS: StringLabel(label)})
-      let payloadTranslations =
-        payloads |> List.map(((label, payload)) => (
-          label,
-          payload |> translateTypeExprFromTypes_(~config, ~typeVarsGen, ~typeEnv),
-        ))
-      let payloads = payloadTranslations |> List.map(((label, translation)) => {
-        let numArgs = 1
-        ({label: label, labelJS: StringLabel(label)}, numArgs, translation.type_)
-      })
-      let type_ = createVariant(~noPayloads, ~payloads, ~polymorphic=true)
-      let dependencies =
-        payloadTranslations |> List.map(((_, {dependencies})) => dependencies) |> List.concat
-      {dependencies: dependencies, type_: type_}
-
-    | {unknowns: list{_, ..._}} => {
-        dependencies: list{},
-        type_: mixedOrUnknown(~config),
-      }
-    }
-
-  | Tpackage(path, ids, types) =>
-    switch typeEnv |> TypeEnv.lookupModuleTypeSignature(~path) {
-    | Some((signature, typeEnv)) =>
-      let typeEquationsTranslation =
-        List.combine(ids, types) |> List.map(((x, t)) => (
-          x,
-          t |> translateTypeExprFromTypes_(~config, ~typeVarsGen, ~typeEnv),
-        ))
-      let typeEquations =
-        typeEquationsTranslation |> List.map(((x, translation)) => (x, translation.type_))
-      let dependenciesFromTypeEquations =
-        typeEquationsTranslation
-        |> List.map(((_, translation)) => translation.dependencies)
-        |> List.flatten
-      let typeEnv1 = typeEnv |> TypeEnv.addTypeEquations(~typeEquations)
-      let (dependenciesFromRecordType, type_) =
-        signature.sig_type |> signatureToModuleRuntimeRepresentation(
-          ~config,
-          ~typeVarsGen,
-          ~typeEnv=typeEnv1,
-        )
-      {
-        dependencies: \"@"(dependenciesFromTypeEquations, dependenciesFromRecordType),
-        type_: type_,
-      }
-    | None => {dependencies: list{}, type_: mixedOrUnknown(~config)}
-    }
-
-  | Tfield(_)
-  | Tnil
-  | Tobject(_)
-  | Tpoly(_)
-  | Tsubst(_)
-  | Tunivar(_) => {dependencies: list{}, type_: mixedOrUnknown(~config)}
-  }
-and translateTypeExprsFromTypes_ = (~config, ~typeVarsGen, ~typeEnv, typeExprs): list<
-  translation,
-> => typeExprs |> List.map(translateTypeExprFromTypes_(~config, ~typeVarsGen, ~typeEnv))
-and signatureToModuleRuntimeRepresentation = (~config, ~typeVarsGen, ~typeEnv, signature) => {
-  let dependenciesAndFields = signature |> List.map(signatureItem =>
-    switch signatureItem {
-    | Types.Sig_value(_id, {val_kind: Val_prim(_)}) => (list{}, list{})
-    | Types.Sig_value(id, {val_type: typeExpr}) =>
-      let {dependencies, type_} =
-        typeExpr |> translateTypeExprFromTypes_(
-          ~config,
-          ~typeVarsGen,
-          ~noFunctionReturnDependencies=false,
-          ~typeEnv,
-        )
-      let field = {
-        mutable_: Immutable,
-        nameJS: id |> Ident.name,
-        nameRE: id |> Ident.name,
-        optional: Mandatory,
-        type_: type_,
-      }
-      (dependencies, list{field})
-
-    | Types.Sig_module(id, moduleDeclaration, _recStatus) =>
-      let typeEnv1 = switch typeEnv |> TypeEnv.getModule(~name=id |> Ident.name) {
-      | Some(typeEnv1) => typeEnv1
-      | None => typeEnv
-      }
-      let (dependencies, type_) = switch moduleDeclaration.md_type {
-      | Mty_signature(signature) =>
-        signature |> signatureToModuleRuntimeRepresentation(
-          ~config,
-          ~typeVarsGen,
-          ~typeEnv=typeEnv1,
-        )
-      | Mty_ident(_)
-      | Mty_functor(_)
-      | Mty_alias(_) => (list{}, mixedOrUnknown(~config))
-      }
-      let field = {
-        mutable_: Immutable,
-        nameJS: id |> Ident.name,
-        nameRE: id |> Ident.name,
-        optional: Mandatory,
-        type_: type_,
-      }
-      (dependencies, list{field})
-
-    | Types.Sig_type(_)
-    | Types.Sig_typext(_)
-    | Types.Sig_modtype(_)
-    | Types.Sig_class(_)
-    | Types.Sig_class_type(_) => (list{}, list{})
-    }
-  )
-  let (dependencies, fields) = {
-    let (dl, fl) = dependenciesAndFields |> List.split
-    (dl |> List.concat, fl |> List.concat)
-  }
-  (dependencies, config.modulesAsObjects ? Object(Closed, fields) : Record(fields))
-}
-
-let translateTypeExprFromTypes = (~config, ~noFunctionReturnDependencies=?, ~typeEnv, typeExpr) => {
-  let typeVarsGen = GenIdent.createTypeVarsGen()
-  let translation =
-    typeExpr |> translateTypeExprFromTypes_(
-      ~config,
-      ~typeVarsGen,
-      ~noFunctionReturnDependencies?,
-      ~typeEnv,
-    )
-
-  if Debug.dependencies.contents {
-    translation.dependencies |> List.iter(dep => Log_.item("Dependency: %s\n", dep |> depToString))
-  }
-  translation
-}
-
-let translateTypeExprsFromTypes = (~config, ~typeEnv, typeExprs) => {
-  let typeVarsGen = GenIdent.createTypeVarsGen()
-  let translations = typeExprs |> translateTypeExprsFromTypes_(~config, ~typeVarsGen, ~typeEnv)
-
-  if Debug.dependencies.contents {
-    translations |> List.iter(translation =>
-      translation.dependencies |> List.iter(dep =>
-        Log_.item("Dependency: %s\n", dep |> depToString)
-      )
-    )
-  }
-  translations
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Translation.res b/jscomp/syntax/tests/idempotency/genType/src/Translation.res
deleted file mode 100644
index b4a8919..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Translation.res
+++ /dev/null
@@ -1,462 +0,0 @@
-open GenTypeCommon
-
-type t = CodeItem.translation
-
-let empty: t = {importTypes: list{}, codeItems: list{}, typeDeclarations: list{}}
-
-let getImportTypeUniqueName = ({typeName, asTypeName}: CodeItem.importType) =>
-  typeName ++
-  switch asTypeName {
-  | None => ""
-  | Some(s) => "_as_" ++ s
-  }
-
-let importTypeCompare = (i1, i2) =>
-  compare(i1 |> getImportTypeUniqueName, i2 |> getImportTypeUniqueName)
-
-let combine = (translations: list<t>): t =>
-  translations
-  |> List.map(({CodeItem.importTypes: importTypes, codeItems, typeDeclarations}) => (
-    (importTypes, codeItems),
-    typeDeclarations,
-  ))
-  |> List.split
-  |> (((x, y)) => (x |> List.split, y))
-  |> (
-    (((importTypes, codeItems), typeDeclarations)) => {
-      CodeItem.importTypes: importTypes |> List.concat,
-      codeItems: codeItems |> List.concat,
-      typeDeclarations: typeDeclarations |> List.concat,
-    }
-  )
-
-/* Applies type parameters to types (for all) */
-let abstractTheTypeParameters = (~typeVars, type_) =>
-  switch type_ {
-  | Function(function_) => Function({...function_, typeVars: typeVars})
-  | _ => type_
-  }
-
-let depToImportType = (~config, ~outputFileRelative, ~resolver, dep: dep) =>
-  switch dep {
-  | _ if dep |> Dependencies.isInternal => list{}
-  | External(name) if name == "list" => list{
-      {
-        CodeItem.typeName: "list",
-        asTypeName: None,
-        importPath: ModuleName.reasonPervasives |> ModuleResolver.importPathForReasonModuleName(
-          ~config,
-          ~outputFileRelative,
-          ~resolver,
-        ),
-      },
-    }
-  | External(_) => list{}
-  | Internal(_) => list{}
-
-  | Dot(_) =>
-    let moduleName = dep |> Dependencies.getOuterModuleName
-    let typeName = dep |> Dependencies.removeExternalOuterModule |> depToString
-    let asTypeName = dep |> Dependencies.isInternal ? None : Some(dep |> depToString)
-    let importPath =
-      moduleName |> ModuleResolver.importPathForReasonModuleName(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-      )
-    list{{typeName: typeName, asTypeName: asTypeName, importPath: importPath}}
-  }
-
-let translateDependencies = (~config, ~outputFileRelative, ~resolver, dependencies): list<
-  CodeItem.importType,
-> =>
-  dependencies |> List.map(depToImportType(~config, ~outputFileRelative, ~resolver)) |> List.concat
-
-let translateValue = (
-  ~attributes,
-  ~config,
-  ~docString,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  ~typeExpr,
-  ~addAnnotationsToFunction: type_ => type_,
-  name,
-): t => {
-  let nameAs = switch Annotation.getGenTypeAsRenaming(attributes) {
-  | Some(s) => s
-  | _ => name
-  }
-  let typeExprTranslation =
-    typeExpr |> TranslateTypeExprFromTypes.translateTypeExprFromTypes(~config, ~typeEnv)
-  let typeVars = typeExprTranslation.type_ |> TypeVars.free
-  let type_ =
-    typeExprTranslation.type_ |> abstractTheTypeParameters(~typeVars) |> addAnnotationsToFunction
-  let resolvedNameOriginal = name |> TypeEnv.addModulePath(~typeEnv) |> ResolvedName.toString
-  let resolvedName = nameAs |> TypeEnv.addModulePath(~typeEnv)
-  let moduleAccessPath = typeEnv |> TypeEnv.getModuleAccessPath(~name=resolvedNameOriginal)
-
-  let codeItems = list{
-    CodeItem.ExportValue({
-      docString: docString,
-      moduleAccessPath: moduleAccessPath,
-      originalName: name,
-      resolvedName: resolvedName,
-      type_: type_,
-    }),
-  }
-  {
-    importTypes: typeExprTranslation.dependencies |> translateDependencies(
-      ~config,
-      ~outputFileRelative,
-      ~resolver,
-    ),
-    codeItems: codeItems,
-    typeDeclarations: list{},
-  }
-}
-
-/*
- * The `make` function is typically of the type:
- *
- *    (~named, ~args=?, 'childrenType) => ReasonReactComponentSpec<
- *      State,
- *      State,
- *      RetainedProps,
- *      RetainedProps,
- *      Action,
- *    >)
- *
- * We take a reference to that function and turn it into a React component of
- * type:
- *
- *
- *     exports.component = (component : React.Component<Props>);
- *
- * Where `Props` is of type:
- *
- *     {named: number, args?: number}
- */
-let translateComponent = (
-  ~attributes,
-  ~config,
-  ~docString,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  ~typeExpr,
-  ~addAnnotationsToFunction: type_ => type_,
-  name,
-): t => {
-  let typeExprTranslation_ = typeExpr |> TranslateTypeExprFromTypes.translateTypeExprFromTypes(
-    ~config,
-    /* Only get the dependencies for the prop types.
-     The return type is a ReasonReact component. */
-    ~noFunctionReturnDependencies=true,
-    ~typeEnv,
-  )
-  let typeExprTranslation = {
-    ...typeExprTranslation_,
-    type_: typeExprTranslation_.type_ |> addAnnotationsToFunction,
-  }
-
-  let freeTypeVarsSet = typeExprTranslation.type_ |> TypeVars.free_
-
-  /* Replace type variables in props/children with any. */
-  let (typeVars, type_) = (
-    list{},
-    typeExprTranslation.type_ |> TypeVars.substitute(~f=s =>
-      if freeTypeVarsSet |> StringSet.mem(s) {
-        Some(mixedOrUnknown(~config))
-      } else {
-        None
-      }
-    ),
-  )
-  switch type_ {
-  | Function(
-      {
-        argTypes: list{propOrChildren, ...childrenOrNil},
-        retType: Ident(
-          {
-            name:
-              "ReasonReact_componentSpec"
-              | "React_componentSpec"
-              | "ReasonReact_component"
-              | "React_component",
-            typeArgs: list{_state, ..._},
-          } as id,
-        ),
-        _,
-      } as function_,
-    ) =>
-    let type_ = Function({...function_, retType: Ident({...id, typeArgs: list{}})})
-
-    /* Add children?:any to props type */
-    let propsType = switch childrenOrNil {
-    /* Then we only extracted a function that accepts children, no props */
-    | list{} =>
-      GroupOfLabeledArgs(list{
-        {
-          mutable_: Immutable,
-          nameJS: "children",
-          nameRE: "children",
-          optional: Optional,
-          type_: mixedOrUnknown(~config),
-        },
-      })
-    /* Then we had both props and children. */
-    | list{{aType: childrenType}, ..._} =>
-      switch propOrChildren.aType {
-      | GroupOfLabeledArgs(fields) =>
-        GroupOfLabeledArgs(
-          \"@"(
-            fields,
-            list{
-              {
-                mutable_: Immutable,
-                nameJS: "children",
-                nameRE: "children",
-                optional: Optional,
-                type_: childrenType,
-              },
-            },
-          ),
-        )
-      | t => t
-      }
-    }
-    let resolvedTypeName = "Props" |> TypeEnv.addModulePath(~typeEnv)
-
-    let nestedModuleName = typeEnv |> TypeEnv.getNestedModuleName
-
-    let moduleAccessPath = typeEnv |> TypeEnv.getModuleAccessPath(~name="make")
-    let componentAccessPath =
-      typeEnv |> TypeEnv.getModuleAccessPath(~component=true, ~name="component")
-
-    let codeItems = list{
-      CodeItem.ExportComponent({
-        componentAccessPath: componentAccessPath,
-        exportType: {
-          nameAs: None,
-          opaque: Some(false),
-          type_: propsType,
-          typeVars: typeVars,
-          resolvedTypeName: resolvedTypeName,
-        },
-        moduleAccessPath: moduleAccessPath,
-        nestedModuleName: nestedModuleName,
-        type_: type_,
-      }),
-    }
-    {
-      importTypes: typeExprTranslation.dependencies |> translateDependencies(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-      ),
-      codeItems: codeItems,
-      typeDeclarations: list{},
-    }
-
-  | _ =>
-    /* not a component: treat make as a normal function */
-    name |> translateValue(
-      ~attributes,
-      ~config,
-      ~docString,
-      ~outputFileRelative,
-      ~resolver,
-      ~typeEnv,
-      ~typeExpr,
-      ~addAnnotationsToFunction,
-    )
-  }
-}
-
-@ocaml.doc("
- * [@genType]
- * [@bs.module] external myBanner : ReasonReact.reactClass = \"./MyBanner\";
- ")
-let translatePrimitive = (
-  ~config,
-  ~outputFileRelative,
-  ~resolver,
-  ~typeEnv,
-  valueDescription: Typedtree.value_description,
-): t => {
-  if Debug.translation.contents {
-    Log_.item("Translate Primitive\n")
-  }
-  let valueName = switch valueDescription.val_prim {
-  | list{"", ..._}
-  | list{} =>
-    valueDescription.val_id |> Ident.name
-  | list{nameOfExtern, ..._} => /* extern foo : someType = "abc"
-     The first element of val_prim is "abc" */
-    nameOfExtern
-  }
-  let typeExprTranslation =
-    valueDescription.val_desc |> TranslateCoreType.translateCoreType(~config, ~typeEnv)
-
-  let (attributeImport, attributeRenaming) =
-    valueDescription.val_attributes |> Annotation.getAttributeImportRenaming
-  switch (typeExprTranslation.type_, attributeImport) {
-  | (
-      Function({
-        argTypes: list{_, ..._},
-        retType: Ident({
-          name:
-            "ReasonReact_componentSpec"
-            | "React_componentSpec"
-            | "ReasonReact_component"
-            | "React_component",
-          typeArgs: list{_state, ..._},
-        }),
-        _,
-      }),
-      Some(importString),
-    ) if valueName == "make" =>
-    let asPath = switch attributeRenaming {
-    | Some(asPath) => asPath
-    | None => ""
-    }
-    let typeExprTranslation = valueDescription.val_desc |> TranslateCoreType.translateCoreType(
-      ~config,
-      /* Only get the dependencies for the prop types.
-       The return type is a ReasonReact component. */
-      ~noFunctionReturnDependencies=true,
-      ~typeEnv,
-    )
-
-    let freeTypeVarsSet = typeExprTranslation.type_ |> TypeVars.free_
-
-    /* Replace type variables in props/children with any. */
-    let (typeVars, type_) = (
-      list{},
-      typeExprTranslation.type_ |> TypeVars.substitute(~f=s =>
-        if freeTypeVarsSet |> StringSet.mem(s) {
-          Some(mixedOrUnknown(~config))
-        } else {
-          None
-        }
-      ),
-    )
-
-    let (propsFields, childrenTyp) = switch type_ {
-    | Function({argTypes: list{propOrChildren, ...childrenOrNil}}) =>
-      switch childrenOrNil {
-      | list{} => (list{}, mixedOrUnknown(~config))
-      | list{{aType: children}, ..._} =>
-        switch propOrChildren {
-        | {aType: GroupOfLabeledArgs(fields)} => (
-            fields |> List.map(({optional, type_} as field) =>
-              switch (type_, optional) {
-              | (Option(type1), Optional) => {
-                  ...field,
-                  optional: Optional,
-                  type_: type1,
-                }
-              | _ => field
-              }
-            ),
-            children,
-          )
-        | _ => (list{}, mixedOrUnknown(~config))
-        }
-      }
-    | _ => (list{}, mixedOrUnknown(~config))
-    }
-    let propsTyp = Object(Closed, propsFields)
-    let resolvedTypeName = "Props" |> TypeEnv.addModulePath(~typeEnv)
-    let propsTypeName = resolvedTypeName |> ResolvedName.toString
-
-    let codeItems = list{
-      CodeItem.ImportComponent({
-        asPath: asPath,
-        childrenTyp: childrenTyp,
-        exportType: {
-          nameAs: None,
-          opaque: Some(false),
-          type_: propsTyp,
-          typeVars: typeVars,
-          resolvedTypeName: resolvedTypeName,
-        },
-        importAnnotation: importString |> Annotation.importFromString,
-        propsFields: propsFields,
-        propsTypeName: propsTypeName,
-      }),
-    }
-    {
-      importTypes: typeExprTranslation.dependencies |> translateDependencies(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-      ),
-      codeItems: codeItems,
-      typeDeclarations: list{},
-    }
-
-  | (_, Some(importString)) =>
-    let asPath = switch attributeRenaming {
-    | Some(asPath) => asPath
-    | None => valueName
-    }
-
-    let typeVars = typeExprTranslation.type_ |> TypeVars.free
-    let type_ = typeExprTranslation.type_ |> abstractTheTypeParameters(~typeVars)
-
-    {
-      importTypes: typeExprTranslation.dependencies |> translateDependencies(
-        ~config,
-        ~outputFileRelative,
-        ~resolver,
-      ),
-      codeItems: list{
-        ImportValue({
-          asPath: asPath,
-          importAnnotation: importString |> Annotation.importFromString,
-          type_: type_,
-          valueName: valueName,
-        }),
-      },
-      typeDeclarations: list{},
-    }
-
-  | _ => {importTypes: list{}, codeItems: list{}, typeDeclarations: list{}}
-  }
-}
-
-let addTypeDeclarationsFromModuleEquations = (~typeEnv, translation: t) => {
-  let eqs = typeEnv |> TypeEnv.getModuleEquations
-  let newTypeDeclarations =
-    translation.typeDeclarations
-    |> List.map((typeDeclaration: CodeItem.typeDeclaration) => {
-      let exportType = typeDeclaration.exportFromTypeDeclaration.exportType
-      let equations = exportType.resolvedTypeName |> ResolvedName.applyEquations(~eqs)
-      equations |> List.map(((x, y)) => {
-        let newExportType = {
-          ...exportType,
-          nameAs: None,
-          type_: y
-          |> ResolvedName.toString
-          |> ident(~builtin=false, ~typeArgs=exportType.typeVars |> List.map(s => TypeVar(s))),
-          resolvedTypeName: x,
-        }
-        {
-          CodeItem.exportFromTypeDeclaration: {
-            CodeItem.exportType: newExportType,
-            annotation: typeDeclaration.exportFromTypeDeclaration.annotation,
-          },
-          importTypes: list{},
-        }
-      })
-    })
-    |> List.concat
-  newTypeDeclarations == list{}
-    ? translation
-    : {
-        ...translation,
-        typeDeclarations: \"@"(translation.typeDeclarations, newTypeDeclarations),
-      }
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/TypeEnv.res b/jscomp/syntax/tests/idempotency/genType/src/TypeEnv.res
deleted file mode 100644
index a1ec35c..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/TypeEnv.res
+++ /dev/null
@@ -1,253 +0,0 @@
-open GenTypeCommon
-
-type moduleEquation = {
-  internal: bool,
-  dep: dep,
-}
-
-type rec t = {
-  mutable componentModuleItem: Runtime.moduleItem,
-  mutable map: StringMap.t<entry>,
-  mutable mapModuleTypes: StringMap.t<(Typedtree.signature, t)>,
-  mutable moduleEquation: option<moduleEquation>,
-  mutable moduleItem: Runtime.moduleItem,
-  name: string,
-  parent: option<t>,
-  typeEquations: StringMap.t<type_>,
-}
-and entry =
-  | Module(t)
-  | Type(string)
-
-let createTypeEnv = (~name, parent) => {
-  let moduleItem = Runtime.moduleItemGen() |> Runtime.newModuleItem(~name)
-  {
-    componentModuleItem: moduleItem,
-    map: StringMap.empty,
-    mapModuleTypes: StringMap.empty,
-    moduleEquation: None,
-    moduleItem: moduleItem,
-    name: name,
-    parent: parent,
-    typeEquations: StringMap.empty,
-  }
-}
-
-let root = () => None |> createTypeEnv(~name="__root__")
-
-let toString = typeEnv => typeEnv.name
-
-let newModule = (~name, typeEnv) => {
-  if Debug.typeEnv.contents {
-    Log_.item("TypeEnv.newModule %s %s\n", typeEnv |> toString, name)
-  }
-  let newTypeEnv = Some(typeEnv) |> createTypeEnv(~name)
-  typeEnv.map = typeEnv.map |> StringMap.add(name, Module(newTypeEnv))
-  newTypeEnv
-}
-
-let newModuleType = (~name, ~signature, typeEnv) => {
-  if Debug.typeEnv.contents {
-    Log_.item("TypeEnv.newModuleType %s %s\n", typeEnv |> toString, name)
-  }
-  let newTypeEnv = Some(typeEnv) |> createTypeEnv(~name)
-  typeEnv.mapModuleTypes = typeEnv.mapModuleTypes |> StringMap.add(name, (signature, newTypeEnv))
-  newTypeEnv
-}
-
-let newType = (~name, typeEnv) => {
-  if Debug.typeEnv.contents {
-    Log_.item("TypeEnv.newType %s %s\n", typeEnv |> toString, name)
-  }
-  typeEnv.map = typeEnv.map |> StringMap.add(name, Type(name))
-}
-
-let getModule = (~name, typeEnv) =>
-  switch typeEnv.map |> StringMap.find(name) {
-  | Module(typeEnv1) => Some(typeEnv1)
-  | Type(_) => None
-  | exception Not_found => None
-  }
-
-let expandAliasToExternalModule = (~name, typeEnv) =>
-  switch typeEnv |> getModule(~name) {
-  | Some({moduleEquation: Some({internal: false, dep})}) =>
-    if Debug.typeEnv.contents {
-      Log_.item(
-        "TypeEnv.expandAliasToExternalModule %s %s aliased to %s\n",
-        typeEnv |> toString,
-        name,
-        dep |> depToString,
-      )
-    }
-    Some(dep)
-  | _ => None
-  }
-
-let addModuleEquation = (~dep, ~internal, typeEnv) => {
-  if Debug.typeEnv.contents {
-    Log_.item(
-      "Typenv.addModuleEquation %s %s dep:%s\n",
-      typeEnv |> toString,
-      internal ? "Internal" : "External",
-      dep |> depToString,
-    )
-  }
-  typeEnv.moduleEquation = Some({internal: internal, dep: dep})
-}
-
-let rec addTypeEquation = (~flattened, ~type_, typeEnv) =>
-  switch flattened {
-  | list{name} => {
-      ...typeEnv,
-      typeEquations: typeEnv.typeEquations |> StringMap.add(name, type_),
-    }
-  | list{moduleName, ...rest} =>
-    switch typeEnv |> getModule(~name=moduleName) {
-    | Some(typeEnv1) => {
-        ...typeEnv,
-        map: typeEnv.map |> StringMap.add(
-          moduleName,
-          Module(typeEnv1 |> addTypeEquation(~flattened=rest, ~type_)),
-        ),
-      }
-    | None => typeEnv
-    }
-  | list{} => typeEnv
-  }
-
-let addTypeEquations = (~typeEquations, typeEnv) =>
-  typeEquations |> List.fold_left(
-    (te, (longIdent, type_)) =>
-      te |> addTypeEquation(~flattened=longIdent |> Longident.flatten, ~type_),
-    typeEnv,
-  )
-
-let applyTypeEquations = (~config, ~path, typeEnv) =>
-  switch path {
-  | Path.Pident(id) =>
-    switch typeEnv.typeEquations |> StringMap.find(id |> Ident.name) {
-    | type_ =>
-      if Debug.typeResolution.contents {
-        Log_.item(
-          "Typenv.applyTypeEquations %s name:%s type_:%s\n",
-          typeEnv |> toString,
-          id |> Ident.name,
-          type_ |> EmitType.typeToString(~config, ~typeNameIsInterface=_ => false),
-        )
-      }
-
-      Some(type_)
-    | exception Not_found => None
-    }
-  | _ => None
-  }
-
-let rec lookup = (~name, typeEnv) =>
-  switch typeEnv.map |> StringMap.find(name) {
-  | _ => Some(typeEnv)
-  | exception Not_found =>
-    switch typeEnv.parent {
-    | None => None
-    | Some(parent) => parent |> lookup(~name)
-    }
-  }
-
-let rec lookupModuleType = (~path, typeEnv) =>
-  switch path {
-  | list{moduleTypeName} =>
-    if Debug.typeEnv.contents {
-      Log_.item(
-        "Typenv.lookupModuleType %s moduleTypeName:%s\n",
-        typeEnv |> toString,
-        moduleTypeName,
-      )
-    }
-    switch typeEnv.mapModuleTypes |> StringMap.find(moduleTypeName) {
-    | x => Some(x)
-    | exception Not_found =>
-      switch typeEnv.parent {
-      | None => None
-      | Some(parent) => parent |> lookupModuleType(~path)
-      }
-    }
-  | list{moduleName, ...path1} =>
-    if Debug.typeEnv.contents {
-      Log_.item("Typenv.lookupModuleType %s moduleName:%s\n", typeEnv |> toString, moduleName)
-    }
-    switch typeEnv.map |> StringMap.find(moduleName) {
-    | Module(typeEnv1) => typeEnv1 |> lookupModuleType(~path=path1)
-    | Type(_) => None
-    | exception Not_found =>
-      switch typeEnv.parent {
-      | None => None
-      | Some(parent) => parent |> lookupModuleType(~path)
-      }
-    }
-  | list{} => None
-  }
-
-let rec pathToList = path =>
-  switch path {
-  | Path.Pident(id) => list{id |> Ident.name}
-  | Path.Pdot(p, s, _) => list{s, ...p |> pathToList}
-  | Path.Papply(_) => list{}
-  }
-
-let lookupModuleTypeSignature = (~path, typeEnv) => {
-  if Debug.typeEnv.contents {
-    Log_.item("TypeEnv.lookupModuleTypeSignature %s %s\n", typeEnv |> toString, path |> Path.name)
-  }
-
-  typeEnv |> lookupModuleType(~path=path |> pathToList |> List.rev)
-}
-
-let getNestedModuleName = typeEnv =>
-  typeEnv.parent == None ? None : Some(typeEnv.name |> ModuleName.fromStringUnsafe)
-
-let updateModuleItem = (~nameOpt=None, ~moduleItem, typeEnv) => {
-  switch nameOpt {
-  | Some("component") => typeEnv.componentModuleItem = moduleItem
-  | _ => ()
-  }
-  typeEnv.moduleItem = moduleItem
-}
-
-let rec addModulePath = (~typeEnv, name) =>
-  switch typeEnv.parent {
-  | None => name |> ResolvedName.fromString
-  | Some(parent) => typeEnv.name |> addModulePath(~typeEnv=parent) |> ResolvedName.dot(name)
-  }
-
-let rec getModuleEquations = (typeEnv): list<ResolvedName.eq> => {
-  let subEquations =
-    typeEnv.map
-    |> StringMap.bindings
-    |> List.map(((_, entry)) =>
-      switch entry {
-      | Module(te) => te |> getModuleEquations
-      | Type(_) => list{}
-      }
-    )
-    |> List.concat
-  switch (typeEnv.moduleEquation, typeEnv.parent) {
-  | (None, _)
-  | (_, None) => subEquations
-  | (Some({dep}), Some(parent)) => list{
-      (dep |> depToResolvedName, typeEnv.name |> addModulePath(~typeEnv=parent)),
-    }
-  }
-}
-
-let getModuleAccessPath = (~component=false, ~name, typeEnv) => {
-  let rec accessPath = typeEnv =>
-    switch typeEnv.parent {
-    | None => Runtime.Root(name) /* not nested */
-    | Some(parent) =>
-      Dot(
-        parent.parent == None ? Root(typeEnv.name) : parent |> accessPath,
-        component ? typeEnv.componentModuleItem : typeEnv.moduleItem,
-      )
-    }
-  typeEnv |> accessPath
-}
diff --git a/jscomp/syntax/tests/idempotency/genType/src/TypeEnv.resi b/jscomp/syntax/tests/idempotency/genType/src/TypeEnv.resi
deleted file mode 100644
index 275466d..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/TypeEnv.resi
+++ /dev/null
@@ -1,40 +0,0 @@
-open GenTypeCommon
-
-type t
-
-let addModuleEquation: (~dep: dep, ~internal: bool, t) => unit
-
-let addModulePath: (~typeEnv: t, string) => ResolvedName.t
-
-let addTypeEquations: (~typeEquations: list<(Longident.t, type_)>, t) => t
-
-let applyTypeEquations: (~config: config, ~path: Path.t, t) => option<type_>
-
-let expandAliasToExternalModule: (~name: string, t) => option<dep>
-
-let getModuleEquations: t => list<ResolvedName.eq>
-
-let getNestedModuleName: t => option<ModuleName.t>
-
-/* Access path for the value in the module.
-   It can be the value name if the module is not nested.
-   Or TopLevelModule[x][y] if accessing a value in a doubly nested module */
-let getModuleAccessPath: (~component: bool=?, ~name: string, t) => Runtime.moduleAccessPath
-
-let getModule: (~name: string, t) => option<t>
-
-let lookup: (~name: string, t) => option<t>
-
-let lookupModuleTypeSignature: (~path: Path.t, t) => option<(Typedtree.signature, t)>
-
-let newModule: (~name: string, t) => t
-
-let newModuleType: (~name: string, ~signature: Typedtree.signature, t) => t
-
-let newType: (~name: string, t) => unit
-
-let root: unit => t
-
-let toString: t => string
-
-let updateModuleItem: (~nameOpt: option<string>=?, ~moduleItem: Runtime.moduleItem, t) => unit
diff --git a/jscomp/syntax/tests/idempotency/genType/src/TypeVars.res b/jscomp/syntax/tests/idempotency/genType/src/TypeVars.res
deleted file mode 100644
index 08d27a6..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/TypeVars.res
+++ /dev/null
@@ -1,100 +0,0 @@
-open GenTypeCommon
-
-let extractFromTypeExpr = typeParams => typeParams |> List.fold_left((soFar, typeExpr) =>
-    switch typeExpr {
-    | {Types.desc: Tvar(Some(s))} =>
-      let typeName = s
-      list{typeName, ...soFar}
-    | _ => assert(false)
-    }
-  , list{}) |> List.rev
-
-let extractFromCoreType = typeParams => typeParams |> List.fold_left((soFar, typeExpr) =>
-    switch typeExpr.Typedtree.ctyp_desc {
-    | Ttyp_var(s) =>
-      let typeName = s
-      list{typeName, ...soFar}
-    | _ => soFar
-    }
-  , list{}) |> List.rev
-
-let rec substitute = (~f, type0) =>
-  switch type0 {
-  | Array(t, arrayKind) => Array(t |> substitute(~f), arrayKind)
-  | Function(function_) =>
-    Function({
-      ...function_,
-      argTypes: function_.argTypes |> List.map(({aName, aType: t}) => {
-        aName: aName,
-        aType: t |> substitute(~f),
-      }),
-      retType: function_.retType |> substitute(~f),
-    })
-  | GroupOfLabeledArgs(fields) =>
-    GroupOfLabeledArgs(
-      fields |> List.map(field => {...field, type_: field.type_ |> substitute(~f)}),
-    )
-  | Ident({typeArgs: list{}}) => type0
-  | Ident({typeArgs} as ident) => Ident({...ident, typeArgs: typeArgs |> List.map(substitute(~f))})
-  | Null(type_) => Null(type_ |> substitute(~f))
-  | Nullable(type_) => Nullable(type_ |> substitute(~f))
-  | Object(closedFlag, fields) =>
-    Object(
-      closedFlag,
-      fields |> List.map(field => {...field, type_: field.type_ |> substitute(~f)}),
-    )
-  | Option(type_) => Option(type_ |> substitute(~f))
-  | Promise(type_) => Promise(type_ |> substitute(~f))
-  | Record(fields) =>
-    Record(fields |> List.map(field => {...field, type_: field.type_ |> substitute(~f)}))
-  | Tuple(innerTypes) => Tuple(innerTypes |> List.map(substitute(~f)))
-  | TypeVar(s) =>
-    switch f(s) {
-    | None => type0
-    | Some(type1) => type1
-    }
-  | Variant(variant) =>
-    Variant({
-      ...variant,
-      payloads: variant.payloads |> List.map(((case, numArgs, t)) => (
-        case,
-        numArgs,
-        t |> substitute(~f),
-      )),
-    })
-  }
-
-let rec free_ = (type0): StringSet.t =>
-  switch type0 {
-  | Array(t, _) => t |> free_
-  | Function({argTypes, retType, typeVars}) =>
-    StringSet.diff(\"+++"(argTypes |> freeOfList_, retType |> free_), typeVars |> StringSet.of_list)
-  | GroupOfLabeledArgs(fields)
-  | Object(_, fields)
-  | Record(fields) =>
-    fields |> List.fold_left((s, {type_}) => StringSet.union(s, type_ |> free_), StringSet.empty)
-  | Ident({typeArgs}) =>
-    typeArgs |> List.fold_left(
-      (s, typeArg) => StringSet.union(s, typeArg |> free_),
-      StringSet.empty,
-    )
-  | Null(type_)
-  | Nullable(type_) =>
-    type_ |> free_
-  | Option(type_)
-  | Promise(type_) =>
-    type_ |> free_
-  | Tuple(innerTypes) =>
-    innerTypes |> List.fold_left(
-      (s, typeArg) => StringSet.union(s, typeArg |> free_),
-      StringSet.empty,
-    )
-  | TypeVar(s) => s |> StringSet.singleton
-  | Variant({payloads}) =>
-    payloads |> List.fold_left((s, (_, _, t)) => StringSet.union(s, t |> free_), StringSet.empty)
-  }
-and freeOfList_ = types =>
-  types |> List.fold_left((s, {aType}) => \"+++"(s, aType |> free_), StringSet.empty)
-and \"+++" = StringSet.union
-
-let free = type_ => type_ |> free_ |> StringSet.elements
diff --git a/jscomp/syntax/tests/idempotency/genType/src/Version.res b/jscomp/syntax/tests/idempotency/genType/src/Version.res
deleted file mode 100644
index ba5004d..0000000
--- a/jscomp/syntax/tests/idempotency/genType/src/Version.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/* CREATED BY genType/scripts/bump_version_module.js */
-/* DO NOT MODIFY BY HAND, WILL BE AUTOMATICALLY UPDATED BY npm version */
-let version = "3.18.0"
diff --git a/jscomp/syntax/tests/idempotency/ludum-dare-46/FlappyBird.res b/jscomp/syntax/tests/idempotency/ludum-dare-46/FlappyBird.res
deleted file mode 100644
index 516ae36..0000000
--- a/jscomp/syntax/tests/idempotency/ludum-dare-46/FlappyBird.res
+++ /dev/null
@@ -1,283 +0,0 @@
-open Reprocessing
-
-let g = 40.
-
-let birdRad = 15.
-
-let scrollRate = 175.
-
-let jumpSpeed = -11.
-
-let pipeColor = Utils.color(~r=80, ~g=185, ~b=0, ~a=255)
-
-type pipeT = (float, float)
-
-type stateT = {
-  pos: (float, float),
-  vy: float,
-  running: bool,
-  pipes: list<pipeT>,
-  score: int,
-  angle: float,
-  worldPos: float,
-  font: Reprocessing.fontT,
-  img: Reprocessing.imageT,
-}
-
-let gapRadius = 60.
-
-let pipeWidth = 75.
-
-let floorHeight = 100
-
-let floorHeightf = float_of_int(floorHeight)
-
-let birdX = 150.
-
-let minInterPipeGap = 120. +. pipeWidth
-
-let intersectPipe = (birdPos, (centerX, gapCenterY), env): bool => {
-  let pipeRad = pipeWidth /. 2.
-  let height = float_of_int(Env.height(env))
-  let tophit = Utils.intersectRectCircle(
-    ~rectPos=(centerX -. pipeRad, 0.),
-    ~rectW=pipeWidth,
-    ~rectH=gapCenterY -. gapRadius,
-    ~circlePos=birdPos,
-    ~circleRad=birdRad -. 2.,
-  )
-  let bottomhit = Utils.intersectRectCircle(
-    ~rectPos=(centerX -. pipeRad, gapCenterY +. gapRadius),
-    ~rectW=pipeWidth,
-    ~rectH=height -. gapCenterY -. gapRadius,
-    ~circlePos=birdPos,
-    ~circleRad=birdRad -. 2.,
-  )
-  tophit || bottomhit
-}
-
-let findNewPipePos = (pipes, screenHeight) => {
-  let maxPipeX = List.fold_left((acc, (x, _y)) => max(acc, x), 0., pipes)
-  (
-    maxPipeX +. Utils.randomf(~min=minInterPipeGap, ~max=1.5 *. minInterPipeGap),
-    Utils.randomf(~min=gapRadius *. 2., ~max=screenHeight -. floorHeightf -. gapRadius *. 2.),
-  )
-}
-
-let rec generateSomePipes = (num, screenHeight) =>
-  switch num {
-  | 0 => list{}
-  | 1 => list{(500., 200.)}
-  | n =>
-    let pipes = generateSomePipes(n - 1, screenHeight)
-    list{findNewPipePos(pipes, screenHeight), ...pipes}
-  }
-
-let drawPipe = ((centerX, gapCenterY): pipeT, img, env) => {
-  let pipeX = int_of_float(centerX -. pipeWidth /. 2.)
-  let pipeWidth = int_of_float(pipeWidth)
-  let pipeHeight = 400
-  Draw.subImage(
-    img,
-    ~pos=(pipeX, int_of_float(gapCenterY -. gapRadius -. float_of_int(pipeHeight))),
-    ~width=pipeWidth,
-    ~height=pipeHeight,
-    ~texPos=(56, 323),
-    ~texWidth=26,
-    ~texHeight=160,
-    env,
-  )
-  Draw.subImage(
-    img,
-    ~pos=(pipeX, int_of_float(gapCenterY +. gapRadius)),
-    ~width=pipeWidth,
-    ~height=pipeHeight,
-    ~texPos=(84, 323),
-    ~texWidth=26,
-    ~texHeight=160,
-    env,
-  )
-}
-
-let resetState = (state, env) => {
-  ...state,
-  pos: (birdX, 40.),
-  vy: 0.,
-  running: true,
-  pipes: generateSomePipes(5, float_of_int(Env.height(env))),
-  angle: 0.,
-  worldPos: 0.,
-  score: 0,
-}
-
-let setup = (env): stateT => {
-  Env.resizeable(false, env)
-  Env.size(~width=400, ~height=640, env)
-  Draw.noStroke(env)
-  resetState(
-    {
-      pos: (birdX, 40.),
-      vy: 0.,
-      running: true,
-      pipes: list{},
-      score: 0,
-      angle: 0.,
-      worldPos: 0.,
-      font: Draw.loadFont(~filename="./assets/flappy.fnt", ~isPixel=true, env),
-      img: Draw.loadImage(~filename="./assets/flappy.png", ~isPixel=true, env),
-    },
-    env,
-  )
-}
-
-let show_state = ({pos: (x, y)}: stateT): string => Printf.sprintf("{x: %f, y: %f}", x, y)
-
-let crashed = ({running, pos: (_, y)}, env) =>
-  !running && float_of_int(Env.height(env)) -. birdRad -. floorHeightf -. y < 1.
-
-let drawBird = ({pos: (x, y), img} as state, env) => {
-  Draw.pushMatrix(env)
-  let drawBirdRad = birdRad +. 5.
-  Draw.translate(~x, ~y, env)
-  Draw.rotate(state.angle, env)
-  let negBirdRad = -.drawBirdRad
-  Draw.translate(~x=negBirdRad, ~y=negBirdRad, env)
-  switch mod(int_of_float(state.worldPos) / 20, 3) {
-  | 0 =>
-    Draw.subImage(
-      img,
-      ~pos=(0, 0),
-      ~width=int_of_float(drawBirdRad) * 2,
-      ~height=int_of_float(drawBirdRad) * 2,
-      ~texPos=(3, 488),
-      ~texWidth=17,
-      ~texHeight=17,
-      env,
-    )
-  | 1 =>
-    Draw.subImage(
-      img,
-      ~pos=(0, 0),
-      ~width=int_of_float(drawBirdRad) * 2,
-      ~height=int_of_float(drawBirdRad) * 2,
-      ~texPos=(31, 488),
-      ~texWidth=17,
-      ~texHeight=17,
-      env,
-    )
-  | 2 =>
-    Draw.subImage(
-      img,
-      ~pos=(0, 0),
-      ~width=int_of_float(drawBirdRad) * 2,
-      ~height=int_of_float(drawBirdRad) * 2,
-      ~texPos=(59, 488),
-      ~texWidth=17,
-      ~texHeight=17,
-      env,
-    )
-  | _ => assert(false)
-  }
-  Draw.popMatrix(env)
-}
-
-let drawTiled = (screenY, screenHeight, x, y, w, h, img, worldPosf, env) => {
-  let sw = Env.width(env)
-  let worldPos = int_of_float(worldPosf)
-  Draw.subImage(
-    img,
-    ~pos=(-mod(worldPos, sw), screenY),
-    ~width=sw,
-    ~height=screenHeight,
-    ~texPos=(x, y),
-    ~texWidth=w,
-    ~texHeight=h,
-    env,
-  )
-  Draw.subImage(
-    img,
-    ~pos=(-mod(worldPos, sw) + sw - 3, screenY),
-    ~width=sw,
-    ~height=screenHeight,
-    ~texPos=(x, y),
-    ~texWidth=w,
-    ~texHeight=h,
-    env,
-  )
-}
-
-let draw = ({pos: (x, y) as pos, vy, running, pipes, font, img} as state, env) => {
-  let timeStep = Env.deltaTime(env)
-  let screenHeight = Env.height(env)
-  Draw.clear(env)
-  drawTiled(0, screenHeight, 0, 0, 144, 256, img, state.worldPos /. 2., env)
-  List.iter((pipe: pipeT) => drawPipe(pipe, img, env), pipes)
-  drawTiled(screenHeight - floorHeight, floorHeight, 292, 0, 169, 56, img, state.worldPos, env)
-  drawBird(state, env)
-  let halfPipeWidth = pipeWidth /. 2.
-  let screenHeight = float_of_int(Env.height(env))
-  Draw.pushMatrix(env)
-  Draw.translate(~x=float_of_int(Env.width(env) / 2 - 20), ~y=50., env)
-  Draw.scale(~x=3., ~y=3., env)
-  Draw.text(~font, ~body=string_of_int(state.score), ~pos=(0, 0), env)
-  Draw.popMatrix(env)
-  if !running {
-    Draw.subImage(
-      img,
-      ~pos=((Env.width(env) - 98 * 3) / 2, Env.height(env) / 2 - 20),
-      ~width=98 * 3,
-      ~height=23 * 3,
-      ~texPos=(393, 59),
-      ~texWidth=98,
-      ~texHeight=23,
-      env,
-    )
-  }
-  let floorLocation = screenHeight -. birdRad -. floorHeightf
-  let newY = Utils.constrain(~amt=y +. vy *. g *. timeStep, ~low=birdRad, ~high=floorLocation)
-  let hit = List.exists(pipe => intersectPipe(pos, pipe, env), pipes) || newY >= floorLocation
-  let scrollAmount = scrollRate *. timeStep
-  let isCrashed = crashed(state, env)
-  let (newPipes, newScore) = isCrashed
-    ? (pipes, state.score)
-    : List.fold_left(((newPipes, score), (x, y)) => {
-        let (newX, _) as newPos = if x < -.halfPipeWidth {
-          findNewPipePos(pipes, screenHeight)
-        } else {
-          (x -. scrollAmount, y)
-        }
-        (list{newPos, ...newPipes}, score + (running && (newX < birdX && x >= birdX) ? 1 : 0))
-      }, (list{}, state.score), pipes)
-  {
-    ...state,
-    pos: (x, newY),
-    vy: vy +. g *. timeStep,
-    running: state.running && !hit,
-    angle: {
-      let highAngle = -1.2
-      let targetAngle = Utils.remapf(
-        ~value=vy,
-        ~low1=jumpSpeed,
-        ~high1=10.,
-        ~low2=highAngle,
-        ~high2=0.7,
-      )
-      let newVal = Utils.lerpf(~value=vy > 0. ? 0.1 : 0.7, ~low=state.angle, ~high=targetAngle)
-      Utils.constrain(~amt=newVal, ~low=highAngle, ~high=1.0)
-    },
-    worldPos: isCrashed ? state.worldPos : state.worldPos +. scrollAmount,
-    pipes: newPipes,
-    score: newScore,
-  }
-}
-
-let keyPressed = (state, env) => {
-  open Events
-  switch (state.running, crashed(state, env), Env.keyCode(env)) {
-  | (true, false, Space) => {...state, vy: jumpSpeed}
-  | (false, true, Space) => resetState(state, env)
-  | _ => state
-  }
-}
-
-run(~setup, ~draw, ~keyPressed, ())
diff --git a/jscomp/syntax/tests/idempotency/ludum-dare-46/IndexHot.res b/jscomp/syntax/tests/idempotency/ludum-dare-46/IndexHot.res
deleted file mode 100644
index 7b0702e..0000000
--- a/jscomp/syntax/tests/idempotency/ludum-dare-46/IndexHot.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let a = Json.parse("{}")
-Reprocessing.hotreload("src/index.re")
diff --git a/jscomp/syntax/tests/idempotency/ludum-dare-46/assets.res b/jscomp/syntax/tests/idempotency/ludum-dare-46/assets.res
deleted file mode 100644
index c28b1a5..0000000
--- a/jscomp/syntax/tests/idempotency/ludum-dare-46/assets.res
+++ /dev/null
@@ -1,119 +0,0 @@
-open Common
-open Reprocessing
-
-let spriteSize = 120.
-
-let maybeInt = f =>
-  switch int_of_float(f) {
-  | i => Some(i)
-  | exception Failure(_) => None
-  }
-
-let loadSpriteSheet = (filename, cb) =>
-  Reasongl.Gl.File.readFile(~filename, ~cb=jsonString => {
-    open Json.Infix
-    let json = Json.parse(jsonString)
-    let things = \"|!"(
-      \"|?>"(Json.get("frames", json), Json.array),
-      "Expected field `frames` to be an array",
-    )
-    let assets = List.fold_left((assets, thing) => {
-      let frame = \"|!"(Json.get("frame", thing), "Expected field `frame` in `frames` array")
-      let x = \"|!"(
-        \"|?>"(\"|?>"(Json.get("x", frame), Json.number), maybeInt),
-        "Invalid field `x`",
-      )
-      let y = \"|!"(
-        \"|?>"(\"|?>"(Json.get("y", frame), Json.number), maybeInt),
-        "Invalid field `y`",
-      )
-      let w = \"|!"(
-        \"|?>"(\"|?>"(Json.get("w", frame), Json.number), maybeInt),
-        "Invalid field `w`",
-      )
-      let h = \"|!"(
-        \"|?>"(\"|?>"(Json.get("h", frame), Json.number), maybeInt),
-        "Invalid field `h`",
-      )
-      let name = \"|!"(\"|?>"(Json.get("filename", thing), Json.string), "Invalid field `filename`")
-      let name = List.hd(Reprocessing.Utils.split(name, ~sep='.'))
-      StringMap.add(
-        name,
-        {
-          open Sprite
-          {x: x, y: y, w: w, h: h}
-        },
-        assets,
-      )
-    }, StringMap.empty, things)
-    cb(assets)
-  })
-
-let placeholder = (name, ~pos, ~width, ~height, env) => {
-  Draw.fill(Constants.red, env)
-  Draw.noStroke(env)
-  Draw.rectf(
-    ~pos={
-      open Point.Float
-      toPair(pos)
-    },
-    ~width,
-    ~height,
-    env,
-  )
-  Draw.text(~body=name, ~pos=(int_of_float(pos.x), int_of_float(pos.y)), env)
-}
-
-let drawSprite = (t, name, ~pos, ~width=?, ~height=?, env) =>
-  switch StringMap.find(name, t.Sprite.map) {
-  | {x, y, w, h} =>
-    let width = switch width {
-    | None => float_of_int(w)
-    | Some(w) => w
-    }
-    let height = switch height {
-    | None => float_of_int(h)
-    | Some(h) => h
-    }
-
-    Draw.subImagef(
-      t.sheet,
-      ~pos={
-        open Point.Float
-        toPair(pos - create(width /. 2., height /. 2.))
-      },
-      ~width,
-      ~height,
-      ~texPos=(x, y),
-      ~texWidth=w,
-      ~texHeight=h,
-      env,
-    )
-  | exception Not_found =>
-    placeholder(
-      name,
-      ~pos={
-        open Point.Float
-        pos - create(spriteSize /. 2., spriteSize /. 2.)
-      },
-      ~width=spriteSize,
-      ~height=spriteSize,
-      env,
-    )
-  }
-
-let drawSpriteWithCenterRotation = (
-  t,
-  name,
-  ~pos as {x, y}: Point.Float.t,
-  ~width,
-  ~height,
-  ~rot,
-  env,
-) => {
-  Draw.pushMatrix(env)
-  Draw.translate(~x, ~y, env)
-  Draw.rotate(rot, env)
-  drawSprite(t, name, ~pos=Point.Float.zero, ~width, ~height, env)
-  Draw.popMatrix(env)
-}
diff --git a/jscomp/syntax/tests/idempotency/ludum-dare-46/common.res b/jscomp/syntax/tests/idempotency/ludum-dare-46/common.res
deleted file mode 100644
index bff0f44..0000000
--- a/jscomp/syntax/tests/idempotency/ludum-dare-46/common.res
+++ /dev/null
@@ -1,150 +0,0 @@
-open Reprocessing
-
-let tileSizef = 50.
-let toolbarHeight = 110.0
-let toolbarItemRowLen = 10
-let btnMargin = 20.0
-let fontHeight = 50
-let accelerateMult = 2.
-let tickTimeMS = 600.0
-let loseMsgTimeMS = 1500.0
-let winMsgTimeMS = 1500.0
-let btnSize = toolbarHeight -. 2.0 *. btnMargin
-let lossCountRudeMessage = 4
-let rudeLossMessages = list{"It's really not that hard.", "Hope you're not in a hurry."}
-
-module StringMap = Map.Make(String)
-
-module Sprite = {
-  type spriteEntry = {
-    x: int,
-    y: int,
-    w: int,
-    h: int,
-  }
-
-  type t = {
-    sheet: Reprocessing.imageT,
-    map: StringMap.t<spriteEntry>,
-  }
-
-  let create = (sheet, map) => {sheet: sheet, map: map}
-}
-
-type mouse = {
-  down: bool,
-  up: bool,
-  pressed: bool,
-}
-
-type state = {
-  hooks: Hooks.t,
-  mouse: mouse,
-  spriteData: Sprite.t,
-  soundData: StringMap.t<(Reprocessing.soundT, float)>,
-  font: fontT,
-}
-
-type id = int
-type move =
-  | TurnRight
-  | Forward
-  | TurnLeft
-type facing =
-  | Up
-  | Down
-  | Left
-  | Right
-type boulderHealth =
-  | Hard
-  | Cracked // TODO: We could have "strong" boulders be ones starting with a SuperHard state
-type obj =
-  | Player(id, facing, list<move>)
-  | Boulder(id, boulderHealth)
-  | Empty
-type spinnerDirection =
-  | CW
-  | CCW
-type floorKind =
-  | Regular
-  | FilledPit(id, boulderHealth)
-  | Spinner(spinnerDirection)
-type tile =
-  | Wall
-  | Floor(floorKind, obj)
-  | Pit
-type map = list<list<tile>>
-type level = {
-  map: map,
-  items: list<tile>,
-  title: string,
-}
-type deathInfo = {
-  obj: obj,
-  prevPosition: Point.Int.t,
-  position: Point.Int.t,
-}
-type tick =
-  | Win
-  | Lose(map, list<deathInfo>)
-  | Move(map)
-
-module Rect = {
-  type t<'a> = {
-    top: 'a,
-    left: 'a,
-    width: 'a,
-    height: 'a,
-  }
-
-  let fromPoints = ({x: left, y: top}: Point.t<'a>, {x: width, y: height}: Point.t<'a>) => {
-    top: top,
-    left: left,
-    width: width,
-    height: height,
-  }
-
-  let containsPt = ({top, left, width, height}, {x, y}: Point.Int.t) =>
-    x >= left && (y >= top && (x < left + width && y < top + height))
-
-  let containsPtf = ({top, left, width, height}, {x, y}: Point.Float.t) =>
-    x >= left && (y >= top && (x < left +. width && y < top +. height))
-
-  let printf = ({top, left, width, height}) =>
-    Printf.printf("{top:%f, left:%f, w:%f, h%f}\n%!", top, left, width, height)
-}
-
-type gameState =
-  | Intro
-  | WinLevel(level, level)
-  | LoseLevel({deadList: list<deathInfo>, loseState: level, preparingUndoStack: list<level>})
-  | RunningLevel({states: list<level>, preparingUndoStack: list<level>})
-  | PreparingLevel(list<level>)
-
-module Option = {
-  type t<'a> = option<'a>
-  let iter = (f, o) =>
-    switch o {
-    | None => ()
-    | Some(v) => f(v)
-    }
-
-  let map = (f, o) =>
-    switch o {
-    | Some(v) => Some(f(v))
-    | None => None
-    }
-}
-
-module List = {
-  include List
-
-  let filteri = (p: (int, 'a) => bool, l: list<'a>) =>
-    fst(
-      List.fold_right(
-        (el, (acc, i)) => p(i, el) ? (list{el, ...acc}, i - 1) : (acc, i - 1),
-        l,
-        (list{}, List.length(l) - 1),
-      ),
-    )
-}
diff --git a/jscomp/syntax/tests/idempotency/ludum-dare-46/hooks.res b/jscomp/syntax/tests/idempotency/ludum-dare-46/hooks.res
deleted file mode 100644
index 37d67da..0000000
--- a/jscomp/syntax/tests/idempotency/ludum-dare-46/hooks.res
+++ /dev/null
@@ -1,38 +0,0 @@
-module Internal: {
-  type t
-  let empty: t
-  let initialize: t => unit
-  let finalize: unit => t
-  let useState: (string, ~id: string=?, 'a) => (ref<'a>, 'a => unit)
-} = {
-  module StringMap = Map.Make(String)
-
-  type t = StringMap.t<string>
-
-  let globalRef: ref<t> = ref(StringMap.empty)
-
-  let empty = StringMap.empty
-
-  let initialize = hooks => globalRef := hooks
-
-  let finalize = () => globalRef.contents
-
-  let useState = (loc, ~id="", initialState) => {
-    let key = loc ++ id
-    let initialState = Obj.magic(initialState)
-    let v = switch StringMap.find(key, globalRef.contents) {
-    | v => ref(v)
-    | exception Not_found =>
-      globalRef := StringMap.add(key, initialState, globalRef.contents)
-      ref(initialState)
-    }
-    let setState = newVal => {
-      let newVal = Obj.magic(newVal)
-      v := newVal
-      globalRef := StringMap.add(key, newVal, globalRef.contents)
-    }
-    (Obj.magic(v), setState)
-  }
-}
-
-include Internal
diff --git a/jscomp/syntax/tests/idempotency/ludum-dare-46/index.res b/jscomp/syntax/tests/idempotency/ludum-dare-46/index.res
deleted file mode 100644
index ab00622..0000000
--- a/jscomp/syntax/tests/idempotency/ludum-dare-46/index.res
+++ /dev/null
@@ -1,1323 +0,0 @@
-open Common
-open Reprocessing
-
-let editor = ref(false)
-
-let setup = (spriteData, env): Common.state => {
-  let fontPath = "assets/font/ptsans_regular_2x.fnt"
-  let spritesheetLocation = "assets/sprites/spritesheet.png"
-  Env.size(~width=1000, ~height=790, env)
-  {
-    hooks: Hooks.empty,
-    mouse: {
-      down: false,
-      up: false,
-      pressed: false,
-    },
-    spriteData: Sprite.create(Draw.loadImage(~filename=spritesheetLocation, env), spriteData),
-    soundData: Sound.load(env),
-    font: Draw.loadFont(~filename=fontPath, env),
-  }
-}
-
-let drawObj = (
-  ~obj,
-  ~pos as {Point.x: x, y},
-  ~spriteData,
-  ~height=tileSizef,
-  ~width=tileSizef,
-  env,
-) => {
-  let halfTileSize = tileSizef /. 2.
-  let pos = Point.create(x +. halfTileSize, y +. halfTileSize)
-  switch obj {
-  | Player(_, facing, _) =>
-    let assetName = switch facing {
-    | Up => "guy_up"
-    | Down => "guy_down"
-    | Right => "guy_right"
-    | Left => "guy_left"
-    }
-    Assets.drawSprite(spriteData, assetName, ~pos, ~width, ~height, env)
-  | Boulder(_, health) =>
-    switch health {
-    | Hard =>
-      Assets.drawSprite(
-        spriteData,
-        "normal_boulder",
-        ~pos,
-        ~width=tileSizef,
-        ~height=tileSizef,
-        env,
-      )
-    | Cracked =>
-      Assets.drawSprite(
-        spriteData,
-        "cracked_boulder",
-        ~pos,
-        ~width=tileSizef,
-        ~height=tileSizef,
-        env,
-      )
-    }
-  | Empty => ()
-  }
-}
-
-let drawTile = (
-  kind,
-  {x, y}: Point.Float.t,
-  ~time,
-  ~noBackground=false,
-  ~withObj=false,
-  spriteData: Sprite.t,
-  env,
-) => {
-  let halfTileSize = tileSizef /. 2.
-  let pos = Point.create(x +. halfTileSize, y +. halfTileSize)
-  switch kind {
-  | Floor(kind, obj) =>
-    let background = !noBackground || editor.contents
-    switch kind {
-    | Regular =>
-      if background {
-        Assets.drawSprite(spriteData, "floor", ~pos, ~width=tileSizef, ~height=tileSizef, env)
-      }
-    | FilledPit(_, Hard) =>
-      if background {
-        Assets.drawSprite(
-          spriteData,
-          "pit_with_boulder",
-          ~pos,
-          ~width=tileSizef,
-          ~height=tileSizef,
-          env,
-        )
-      }
-    | FilledPit(_, Cracked) =>
-      if background {
-        Assets.drawSprite(
-          spriteData,
-          "pit_with_cracked_boulder",
-          ~pos,
-          ~width=tileSizef,
-          ~height=tileSizef,
-          env,
-        )
-      }
-    | Spinner(dir) =>
-      if background {
-        Assets.drawSprite(spriteData, "floor", ~pos, ~width=tileSizef, ~height=tileSizef, env)
-      }
-      Assets.drawSpriteWithCenterRotation(
-        spriteData,
-        "rotator",
-        ~pos,
-        ~width=tileSizef,
-        ~height=tileSizef,
-        ~rot=dir == CW ? time : -.time,
-        env,
-      )
-    }
-    if withObj {
-      drawObj(~obj, ~pos={x: x, y: y}, ~spriteData, env)
-    }
-  | Pit => Assets.drawSprite(spriteData, "pit", ~pos, ~width=tileSizef, ~height=tileSizef, env)
-  | Wall => Assets.drawSprite(spriteData, "wall", ~pos, ~width=tileSizef, ~height=tileSizef, env)
-  }
-}
-
-let getMapTile = (map, {x, y}: Point.Int.t) =>
-  if y < 0 || x < 0 {
-    Wall
-  } else {
-    switch List.nth_opt(map, y) {
-    | None => Wall
-    | Some(row) =>
-      switch List.nth_opt(row, x) {
-      | None => Wall
-      | Some(tile) => tile
-      }
-    }
-  }
-
-let setMapTile = (map, {x, y}: Point.Int.t, newTile) =>
-  List.mapi((y2, row) => List.mapi((x2, tile) => x == x2 && y == y2 ? newTile : tile, row), map)
-
-let updateMapTile = (map, {x, y}: Point.Int.t, update) =>
-  List.mapi(
-    (y2, row) => List.mapi((x2, tile) => x == x2 && y == y2 ? update(tile) : tile, row),
-    map,
-  )
-
-let getInventoryTopLeft = env => {
-  let height = float_of_int(Env.height(env))
-  let backgroundY = height -. toolbarHeight
-  let xOffset = 340.
-  let yOffset = backgroundY +. btnMargin
-  Point.create(xOffset, yOffset)
-}
-
-let getMapTopLeft = (map, env) => {
-  Point.x: Env.width(env)->float_of_int /. 2. -.
-    List.length(List.hd(map))->float_of_int *. tileSizef /. 2.,
-  y: (Env.height(env)->float_of_int -. toolbarHeight) /. 2. -.
-    List.length(map)->float_of_int *. tileSizef /. 2.,
-}
-
-let getHoveredMapSquare = (map, env) => {
-  let mousePt = Point.Float.ofIntPt(Point.fromPair(Env.mouse(env)))
-  let topLeft = getMapTopLeft(map, env)
-  let mapWidth = tileSizef *. float_of_int(List.length(List.hd(map)))
-  let mapHeight = tileSizef *. float_of_int(List.length(map))
-  let mapRect = Rect.fromPoints(topLeft, Point.create(mapWidth, mapHeight))
-
-  if Rect.containsPtf(mapRect, mousePt) {
-    let relativePos = {
-      open Point.Float
-      mousePt - topLeft
-    }
-    let {Point.x: x, y} as tilePos = Point.Int.ofFloatPt({
-      open Point.Float
-      \"/@"(relativePos, tileSizef)
-    })
-    switch getMapTile(map, tilePos) {
-    | Floor(Regular, Empty) => Some(Point.create(x, y))
-    | _ if editor.contents => Some(Point.create(x, y))
-    | _ => None
-    }
-  } else {
-    None
-  }
-}
-
-let getHoveredInventoryIndex = (items, env) => {
-  let mousePt = Point.Float.ofIntPt(Point.fromPair(Env.mouse(env)))
-  let inventoryTopLeft = getInventoryTopLeft(env)
-
-  let inventoryWidth = (btnMargin +. tileSizef) *. float_of_int(Common.toolbarItemRowLen)
-  let inventoryHeight = (btnMargin +. tileSizef) *. 2.
-  let inventoryRect = Rect.fromPoints(
-    inventoryTopLeft,
-    Point.create(inventoryWidth, inventoryHeight),
-  )
-
-  if Rect.containsPtf(inventoryRect, mousePt) {
-    let relativePos = {
-      open Point.Float
-      mousePt - inventoryTopLeft
-    }
-    let tileAndMargin = tileSizef +. btnMargin
-    let hoverOffset = Point.map(~f=v => mod_float(v, tileAndMargin), relativePos)
-    let {x, y}: Point.Int.t = Point.Int.ofFloatPt({
-      open Point.Float
-      \"/@"(relativePos, tileAndMargin)
-    })
-    let index = x + y * toolbarItemRowLen
-    if index < List.length(items) {
-      Some((index, hoverOffset))
-    } else {
-      None
-    }
-  } else {
-    None
-  }
-}
-
-let drawInventory = (inventory, spriteData, ~dragging, ~hovered, ~time, env) => {
-  let topleft = getInventoryTopLeft(env)
-  List.iteri((i, item) => {
-    let x = float_of_int(mod(i, toolbarItemRowLen)) *. (tileSizef +. btnMargin)
-    let y = (tileSizef +. btnMargin) *. float_of_int(i / toolbarItemRowLen)
-    let relativePos = Point.create(x, y)
-    Draw.pushStyle(env)
-    if Some(i) == dragging {
-      Draw.tint(Utils.color(~r=255, ~g=255, ~b=255, ~a=100), env)
-    } else if Some(i) == hovered {
-      let highlight = 300
-      Draw.tint(Utils.color(~r=highlight, ~g=highlight, ~b=highlight, ~a=255), env)
-    }
-    drawTile(
-      item,
-      ~noBackground=true,
-      ~withObj=true,
-      ~time,
-      Point.Float.add(topleft, relativePos),
-      spriteData,
-      env,
-    )
-    Draw.popStyle(env)
-  }, inventory)
-}
-
-let getUndoRect = env => {
-  let height = float_of_int(Env.height(env))
-  let backgroundY = height -. toolbarHeight
-  let size = tileSizef *. 1.4
-  let delta = btnMargin /. 2.
-  Rect.fromPoints(
-    Point.create(btnMargin +. size +. btnMargin +. delta, btnMargin +. backgroundY -. delta),
-    Point.create(size, size),
-  )
-}
-
-let getBackRect = env => {
-  let height = float_of_int(Env.height(env))
-  let backgroundY = height -. toolbarHeight
-  let size = tileSizef *. 1.4
-  let delta = btnMargin /. 2.
-  Rect.fromPoints(
-    Point.create(btnMargin +. delta, btnMargin +. backgroundY -. delta),
-    Point.create(size, size),
-  )
-}
-
-let getPlayRect = env => {
-  let height = float_of_int(Env.height(env))
-  let backgroundY = height -. toolbarHeight
-  let size = tileSizef *. 1.4
-  let delta = btnMargin /. 2.
-  Rect.fromPoints(
-    Point.create(
-      btnMargin +. size +. btnMargin +. size +. btnMargin +. delta,
-      btnMargin +. backgroundY -. delta,
-    ),
-    Point.create(size, size),
-  )
-}
-
-type allButtonStates = {
-  undo: (bool, bool),
-  restart: (bool, bool),
-  play: (bool, bool),
-}
-
-let drawToolbar = (
-  inventory,
-  ~accelerateTime=false,
-  ~canAccelerate=false,
-  ~inPreparingLevel=false,
-  ~allButtonStates,
-  spriteData,
-  ~hovered,
-  ~dragging,
-  ~time,
-  env,
-) => {
-  let width = float_of_int(Env.width(env))
-  let height = float_of_int(Env.height(env))
-  let x = 0.0
-  let backgroundY = height -. toolbarHeight
-  // Draw.fill(Utils.color(~r=32, ~g=60, ~b=86, ~a=255), env);
-  // Draw.rectf(~pos=(x, backgroundY), ~width, ~height, env);
-
-  let pressed = ((down, hovered)) => down ? "_pressed" : hovered ? "_hovered" : ""
-  let rect = getUndoRect(env)
-  Assets.drawSprite(
-    spriteData,
-    "undo" ++ pressed(allButtonStates.undo),
-    ~pos=Point.create(rect.left +. rect.width /. 2., rect.top +. rect.height /. 2.),
-    ~width=rect.width,
-    ~height=rect.height,
-    env,
-  )
-
-  let rect = getBackRect(env)
-  Assets.drawSprite(
-    spriteData,
-    "back" ++ pressed(allButtonStates.restart),
-    ~pos=Point.create(rect.left +. rect.width /. 2., rect.top +. rect.height /. 2.),
-    ~width=rect.width,
-    ~height=rect.height,
-    env,
-  )
-
-  let rect = getPlayRect(env)
-  let playOrAcceleate = if accelerateTime || !canAccelerate {
-    "play"
-  } else {
-    "accelerate"
-  }
-  Assets.drawSprite(
-    spriteData,
-    playOrAcceleate ++ pressed(allButtonStates.play),
-    ~pos=Point.create(rect.left +. rect.width /. 2., rect.top +. rect.height /. 2.),
-    ~width=rect.width,
-    ~height=rect.height,
-    env,
-  )
-
-  Draw.pushStyle(env)
-  Draw.fill(Utils.color(~r=84, ~g=78, ~b=104, ~a=255), env)
-  Draw.stroke(Utils.color(~r=84, ~g=78, ~b=104, ~a=255), env)
-  Draw.strokeWeight(12, env)
-  // Draw.strokeCap(Round, env);
-  let x = rect.left +. rect.width +. btnMargin *. 2.
-  Draw.rectf(~pos=(x, backgroundY), ~width=width -. x -. 24., ~height=84., env)
-
-  Draw.popStyle(env)
-
-  drawInventory(inventory, spriteData, ~dragging, ~hovered, ~time, env)
-}
-
-let facingToDelta = facing =>
-  switch facing {
-  | Up => Point.create(0, -1)
-  | Right => Point.create(1, 0)
-  | Down => Point.create(0, 1)
-  | Left => Point.create(-1, 0)
-  }
-
-let turnFacing = (facing, move) =>
-  switch move {
-  | Forward => facing
-  | TurnLeft =>
-    switch facing {
-    | Up => Left
-    | Right => Up
-    | Down => Right
-    | Left => Down
-    }
-  | TurnRight =>
-    switch facing {
-    | Up => Right
-    | Right => Down
-    | Down => Left
-    | Left => Up
-    }
-  }
-
-let rec resolveMove = (level, pos, moveDelta, retrying, state, env) => {
-  let secondPos = Point.Int.add(pos, moveDelta)
-  let replaceWith = (level, t1, t2) => Move(setMapTile(setMapTile(level, pos, t1), secondPos, t2))
-
-  let retryResolveMove = level =>
-    !retrying ? resolveMove(level, pos, moveDelta, true, state, env) : Move(level)
-
-  let resolveMove = (level, pos, moveDelta) =>
-    !retrying ? resolveMove(level, pos, moveDelta, false, state, env) : Move(level)
-
-  switch (getMapTile(level, pos), getMapTile(level, secondPos)) {
-  | (Wall | Pit | Floor(_, Empty), _) => Move(level)
-  | (Floor(k1, Boulder(id, health)), Wall) => Move(level)
-  | (_, Floor(k, Player(_) as p)) =>
-    Lose(
-      setMapTile(level, secondPos, Floor(k, Empty)),
-      list{{obj: p, position: secondPos, prevPosition: pos}},
-    )
-  | (Floor(k1, Boulder(id, health)), Floor(k2, Empty)) =>
-    Sound.play("moving_boulder", state, env)
-    replaceWith(level, Floor(k1, Empty), Floor(k2, Boulder(id, health)))
-  | (Floor(k1, Boulder(id, health)), Pit) =>
-    Sound.play("moving_boulder", state, env)
-    replaceWith(level, Floor(k1, Empty), Floor(FilledPit(id, health), Empty))
-  | (Floor(k, Player(id, facing, moves)), Floor(Spinner(dir), Empty)) =>
-    let move = dir == CW ? TurnRight : TurnLeft
-    replaceWith(
-      level,
-      Floor(k, Empty),
-      Floor(Spinner(dir), Player(id, facing, list{move, ...moves})),
-    )
-  | (Floor(Spinner(dir), Player(id, facing, moves)), Floor(k, Boulder(id2, boulderState)))
-    if retrying =>
-    let move = dir == CW ? TurnRight : TurnLeft
-    let obj = boulderState == Hard ? Boulder(id2, Cracked) : Empty
-    Sound.play("rock_crack", state, env)
-    replaceWith(level, Floor(Spinner(dir), Player(id, facing, list{move, ...moves})), Floor(k, obj))
-  | (Floor(k1, Player(_) as p), Floor(k2, Empty)) =>
-    replaceWith(level, Floor(k1, Empty), Floor(k2, p))
-  | (Floor(k, Player(_) as p), Wall)
-  | (Floor(k, Player(_) as p), Pit) =>
-    Lose(
-      setMapTile(level, pos, Floor(k, Empty)),
-      list{{obj: p, position: secondPos, prevPosition: pos}},
-    )
-  | (Floor(k1, Player(_) as p), Floor(k2, Boulder(id, boulderState))) if retrying =>
-    let obj = boulderState == Hard ? Boulder(id, Cracked) : Empty
-    Sound.play("rock_crack", state, env)
-    replaceWith(level, Floor(k1, p), Floor(k2, obj))
-  | (Floor(k1, Player(_) | Boulder(_, _)), Floor(k2, Boulder(_))) =>
-    switch resolveMove(level, secondPos, moveDelta) {
-    | Move(level) => retryResolveMove(level)
-    | other => other
-    }
-  }
-}
-
-type agentInfo =
-  | AgentWin
-  | Push(facing, Point.Int.t)
-
-// TODO: tick needs to return a win or lose state that's compatible with animation
-let tick = (level, state, env) => {
-  let fold_righti = (f, a, l) =>
-    snd(List.fold_right((el, (i, a)) => (i - 1, f(i, a, el)), l, (List.length(l) - 1, a)))
-
-  let (movingAgents, level) = fold_righti((y, (agents, rows), row) => {
-    let (agents, newRow) = fold_righti((x, (agents, row), tile) =>
-      switch tile {
-      | Floor(k, Player(id, facing, list{})) => (
-          list{AgentWin, ...agents},
-          list{Floor(k, Player(id, facing, list{})), ...row},
-        )
-      | Floor(k, Player(id, facing, list{Forward, ...moves})) => (
-          list{Push(facing, Point.create(x, y)), ...agents},
-          list{Floor(k, Player(id, facing, moves)), ...row},
-        )
-      | Floor(k, Player(id, facing, list{turn, ...moves})) => (
-          agents,
-          list{Floor(k, Player(id, turnFacing(facing, turn), moves)), ...row},
-        )
-      | _ => (agents, list{tile, ...row})
-      }
-    , (agents, list{}), row)
-    (agents, list{newRow, ...rows})
-  }, (list{}, list{}), level)
-
-  // TODO: Optionally sort the agents
-  List.fold_left((level, agent) =>
-    switch (level, agent) {
-    | (Move(level), Push(facing, pos)) =>
-      resolveMove(level, pos, facingToDelta(facing), false, state, env)
-    | (Lose(level, deadList), Push(facing, pos)) =>
-      switch resolveMove(level, pos, facingToDelta(facing), false, state, env) {
-      | Move(level) => Lose(level, deadList)
-      | Win => Lose(level, deadList)
-      | Lose(level, newDeadList) => Lose(level, \"@"(newDeadList, deadList))
-      }
-    | (_, AgentWin)
-    | (Win, _) =>
-      Win
-    }
-  , Move(level), movingAgents)
-}
-
-let drawMessage = (
-  message,
-  font,
-  ~offset=0,
-  ~withControl=?,
-  ~alternativeText=?,
-  ~time=0.,
-  ~spriteData=?,
-  env,
-) => {
-  let y = (180 + offset - fontHeight) / 2
-  let textWidth = Draw.textWidth(~font, ~body=message, env)
-  let x = (Env.width(env) - textWidth) / 2
-
-  let fullWidth = Env.width(env)
-
-  Draw.fill(Utils.color(~r=13, ~g=43, ~b=69, ~a=200), env)
-  Draw.rect(~pos=(0, 0), ~width=fullWidth, ~height=y + 20, env)
-
-  if withControl != None {
-    Draw.rect(~pos=(0, y), ~width=fullWidth, ~height=fontHeight + 60, env)
-  }
-
-  Draw.tint(Utils.color(~r=255, ~g=236, ~b=214, ~a=255), env)
-  Draw.text(~font, ~body=message, ~pos=(x, y), env)
-
-  Option.iter(t => {
-    let textWidth = Draw.textWidth(~font, ~body=t, env)
-    let x2 = (Env.width(env) - textWidth) / 2
-    let y2 = y + fontHeight + 24
-    Draw.text(~font, ~body=t, ~pos=(x2, y2), env)
-  }, alternativeText)
-
-  switch (withControl, spriteData) {
-  | (Some(assetName), Some(spriteData)) =>
-    let body = switch assetName {
-    | "back" => "press         to try again"
-    | _ => "press         to continue"
-    }
-    let textWidth2 = Draw.textWidth(~font, ~body, env)
-    let rect = getPlayRect(env)
-    let x2 = (Env.width(env) - textWidth2) / 2
-    let y2 = y + fontHeight + 24
-    Draw.tint(Utils.color(~r=255, ~g=236, ~b=214, ~a=255), env)
-    Draw.text(~font, ~body, ~pos=(x2, y2), env)
-
-    Assets.drawSprite(
-      spriteData,
-      assetName,
-      ~pos=Point.create(x2->float_of_int +. 166., y2->float_of_int -. 12.),
-      ~width=rect.width,
-      ~height=rect.height,
-      env,
-    )
-  | _ => ()
-  }
-
-  Draw.noTint(env)
-}
-
-let drawLines = (map, env) => {
-  let mapTopLeft = getMapTopLeft(map, env)
-  let halfTileSize = tileSizef /. 2.
-  let centerOffset = Point.create(halfTileSize, halfTileSize)
-
-  List.iteri((y, row) => List.iteri((x, tile) =>
-      switch tile {
-      | Floor(_, Player(id, facing, moves)) =>
-        let (_, mapPositions) = List.fold_left(
-          ((currFacing, acc), move) =>
-            switch acc {
-            | list{prevPoint, ...rest} =>
-              switch move {
-              | Forward => (
-                  currFacing,
-                  list{Point.Int.add(facingToDelta(currFacing), prevPoint), prevPoint, ...rest},
-                )
-              | turn => (turnFacing(currFacing, turn), list{prevPoint, ...rest})
-              }
-            | _ => assert(false)
-            },
-          (
-            facing,
-            list{
-              {
-                open Point
-                create(x, y)
-              },
-            },
-          ),
-          moves,
-        )
-
-        let screenPositions = List.map(p => {
-          open Point.Float
-          \"*@"(ofIntPt(p), tileSizef) + centerOffset + mapTopLeft
-        }, mapPositions)
-
-        Draw.stroke(Utils.color(~r=255, ~g=236, ~b=214, ~a=255), env)
-        let _ = List.fold_left((acc, pos) =>
-          switch acc {
-          | None => Some(pos)
-          | Some(prevPos) =>
-            Draw.linef(~p1=Point.toPair(prevPos), ~p2=Point.toPair(pos), env)
-            Some(pos)
-          }
-        , None, screenPositions)
-        Draw.noStroke(env)
-        ()
-      | _ => ()
-      }
-    , row), map)
-}
-
-let drawMap = (map, spriteData, ~time, env) => {
-  let topleft = getMapTopLeft(map, env)
-  List.iteri((y, row) => List.iteri((x, tile) => {
-      let p = Point.Int.create(x, y)
-      drawTile(
-        tile,
-        ~time,
-        {
-          open Point.Float
-          topleft + \"*@"(ofIntPt(p), tileSizef)
-        },
-        spriteData,
-        env,
-      )
-    }, row), map)
-}
-
-let findInMap = (level, withId) => {
-  let cur = ref(None)
-  List.iteri((y, row) => List.iteri((x, tile) =>
-      switch tile {
-      | Floor(FilledPit(id, _), _) if id == withId => cur := Some((Point.create(x, y), None))
-      | Floor(_, Boulder(id, _) as obj)
-      | Floor(_, Player(id, _, _) as obj) if id === withId =>
-        cur := Some((Point.create(x, y), Some(obj)))
-      | _ => ()
-      }
-    , row), level)
-  cur.contents
-}
-
-let easeInOutQuad = t => t < 0.5 ? 2. *. t *. t : -1. +. (4. -. 2. *. t) *. t
-
-let easeInOutCubic = t =>
-  t < 0.5 ? 4. *. t *. t *. t : (t -. 1.) *. (2. *. t -. 2.) *. (2. *. t -. 2.) +. 1.
-
-let calculateBounce = (~elapsedTime, ~tickTimeMS, pos: Point.Float.t, prevPos: Point.Float.t) => {
-  let numBounces = 2.
-  // TODO: There's something we could do here to ease more proportionally.
-  let time = easeInOutQuad(elapsedTime /. tickTimeMS)
-
-  let bounce = Utils.remapf(
-    ~value=time,
-    ~low1=0.,
-    ~high1=1.0,
-    ~low2=0.,
-    ~high2=numBounces *. Constants.pi,
-  )
-
-  // If we're moving in the x position, we need to calculate gravity from a Y perspective
-  let bounceY = if prevPos.x != pos.x {
-    sin(bounce) *. 6.
-  } else if prevPos.y != pos.y {
-    sin(bounce) *. 6.
-  } else {
-    0.
-  }
-
-  abs_float(bounceY) *. -1.0
-}
-
-let drawObjWithAnimation = (
-  ~time,
-  ~tickTimeMS,
-  ~obj,
-  ~scaleX=1.,
-  ~scaleY=1.,
-  pos: Point.Float.t,
-  prevPos: Point.Float.t,
-  state,
-  env,
-) => {
-  let elapsedTime = time
-  let time = easeInOutQuad(time /. tickTimeMS)
-
-  let animatingPosX = Utils.remapf(~value=time, ~low1=0., ~high1=1.0, ~low2=prevPos.x, ~high2=pos.x)
-  let animatingPosY = Utils.remapf(~value=time, ~low1=0., ~high1=1.0, ~low2=prevPos.y, ~high2=pos.y)
-
-  let animatedPosition = Point.Float.create(animatingPosX, animatingPosY)
-  let bounceY = switch obj {
-  | Player(_, _, _) => calculateBounce(~elapsedTime, ~tickTimeMS, pos, prevPos)
-  | _ => 0.
-  }
-
-  let squishY = switch obj {
-  | Player(_, _, _) => tileSizef -. bounceY *. -0.75
-  | _ => tileSizef
-  }
-  let squishX = switch obj {
-  | Player(_, _, _) => tileSizef +. bounceY *. -0.75
-  | _ => tileSizef
-  }
-
-  let bouncedPosition = Point.Float.create(0., bounceY)
-
-  drawObj(
-    ~obj,
-    ~pos={
-      open Point.Float
-      animatedPosition + bouncedPosition
-    },
-    ~spriteData=state.spriteData,
-    ~height=squishY *. scaleY,
-    ~width=squishX *. scaleX,
-    env,
-  )
-}
-
-let drawObjects = (~previousLevel=?, ~time=0., ~tickTimeMS, level, state, env) => {
-  let topleft = getMapTopLeft(level, env)
-  let drawHelper = (x, y, obj) => {
-    let p = Point.Int.create(x, y)
-    let pos = {
-      open Point.Float
-      topleft + \"*@"(ofIntPt(p), tileSizef)
-    }
-    drawObj(~obj, ~pos, ~spriteData=state.spriteData, env)
-  }
-
-  switch previousLevel {
-  | None => List.iteri((y, row) => List.iteri((x, tile) =>
-        switch tile {
-        | Floor(_, Boulder(id, _) as obj)
-        | Floor(_, Player(id, _, _) as obj) =>
-          drawHelper(x, y, obj)
-        | _ => ()
-        }
-      , row), level)
-  | Some({map: previousLevel}) => List.iteri((y, row) => List.iteri((x, tile) =>
-        switch tile {
-        | Floor(_, Boulder(id, _) as obj)
-        | Floor(_, Player(id, _, _) as obj) =>
-          switch findInMap(level, id) {
-          | None => drawHelper(x, y, obj)
-          | Some((p, newObj)) =>
-            let obj = switch newObj {
-            | Some(o) => o
-            | None => obj
-            }
-            let pos = {
-              open Point.Float
-              topleft + \"*@"(ofIntPt(p), tileSizef)
-            }
-            let prevP = Point.Int.create(x, y)
-            let prevPos = {
-              open Point.Float
-              topleft + \"*@"(ofIntPt(prevP), tileSizef)
-            }
-            drawObjWithAnimation(~time, ~tickTimeMS, ~obj, pos, prevPos, state, env)
-            ()
-          }
-
-        | _ => ()
-        }
-      , row), previousLevel)
-  }
-}
-
-let drawAnimatingDead = (~deadList, ~lastTickTime, ~level, ~state, env) => {
-  let topleft = getMapTopLeft(level.map, env)
-
-  List.iter(deadThing =>
-    switch deadThing.obj {
-    | Player(id, _, _) as obj =>
-      let p = deadThing.position
-      let pos = {
-        open Point.Float
-        topleft + \"*@"(ofIntPt(p), tileSizef)
-      }
-      let prevP = deadThing.prevPosition
-      let prevPos = {
-        open Point.Float
-        topleft + \"*@"(ofIntPt(prevP), tileSizef)
-      }
-      let time = easeInOutCubic(lastTickTime /. tickTimeMS)
-      let (scaleX, scaleY, pos) = switch List.nth_opt(List.nth(level.map, p.y), p.x) {
-      | Some(Pit) =>
-        let v = Utils.lerpf(~low=1.0, ~high=0.6, ~value=time)
-        (v, v, pos)
-      | Some(Wall) =>
-        if p.y == prevP.y {
-          let dir = p.x > prevP.x ? -1. : 1.
-          let pos = Point.create(
-            pos.x +.
-            dir *.
-            (Utils.lerpf(~low=0.0, ~high=tileSizef /. 8. +. 4., ~value=time) +.
-            tileSizef /. 4. +. 8.),
-            pos.y,
-          )
-          (Utils.lerpf(~low=1.0, ~high=0.3, ~value=time), 1.0, pos)
-        } else {
-          let dir = p.y > prevP.y ? -1. : 1.
-          let pos = Point.create(
-            pos.x,
-            pos.y +.
-            dir *.
-            (Utils.lerpf(~low=0.0, ~high=tileSizef /. 8. +. 4., ~value=time) +.
-            tileSizef /. 4. +. 8.),
-          )
-          (1.0, Utils.lerpf(~low=1.0, ~high=0.3, ~value=time), pos)
-        }
-      | _ => (1.0, 1.0, pos)
-      }
-      drawObjWithAnimation(
-        ~time=lastTickTime,
-        ~tickTimeMS,
-        ~obj,
-        ~scaleX,
-        ~scaleY,
-        pos,
-        prevPos,
-        state,
-        env,
-      )
-    | _ => ()
-    }
-  , deadList)
-}
-
-let getClickOn = (rect, mousePtf, (down, setDown), env) => {
-  let hovered = rect->Rect.containsPtf(mousePtf)
-  let clicked = if Env.mousePressed(env) {
-    setDown(hovered)
-    false
-  } else if down.contents {
-    setDown(false)
-    hovered
-  } else {
-    false
-  }
-  (clicked, (down.contents, hovered))
-}
-
-let draw = (state, env) => {
-  Hooks.initialize(state.hooks)
-  let (levels, setLevels) = Hooks.useState(__LOC__, Levels.all)
-  let (gameState, setGameState) = Hooks.useState(__LOC__, Intro)
-
-  // This value always starts at MAX so we tick once immediately
-  let (lastTickTime, setLastTickTime) = Hooks.useState(__LOC__, tickTimeMS +. 1.)
-
-  let mousePtf = {
-    open Point
-    Float.ofIntPt(fromPair(Env.mouse(env)))
-  }
-
-  let undo = if Env.mousePressed(env) {
-    let rect = getUndoRect(env)
-    rect->Rect.containsPtf({
-      open Point
-      Float.ofIntPt(fromPair(Env.mouse(env)))
-    })
-  } else {
-    false
-  }
-
-  let backButtonState = Hooks.useState(__LOC__, false)
-  let backButtonRect = getBackRect(env)
-  let (restartClicked, restartButtonDown) = getClickOn(
-    backButtonRect,
-    mousePtf,
-    backButtonState,
-    env,
-  )
-  let restartClicked = restartClicked || Env.keyPressed(R, env)
-
-  let playButtonState = Hooks.useState(__LOC__, false)
-  let playButtonRect = getPlayRect(env)
-  let (playClicked, playButtonDown) = getClickOn(playButtonRect, mousePtf, playButtonState, env)
-  let playClicked = playClicked || Env.keyPressed(Space, env)
-  let (lastAccelerating, setLastAccelerating) = Hooks.useState(__LOC__, false)
-
-  let undoButtonState = Hooks.useState(__LOC__, false)
-  let undoButtonRect = getUndoRect(env)
-  let (undoClicked, undoButtonDown) = getClickOn(undoButtonRect, mousePtf, undoButtonState, env)
-  let undoClicked = undoClicked || (Env.keyPressed(Z, env) || Env.keyPressed(U, env))
-
-  // Start button code
-  let startButtonState = Hooks.useState(__LOC__, false)
-  let width = 642. /. 2.
-  let height = 369. /. 2.
-  let startButtonRect = Rect.fromPoints(
-    Point.create(
-      Env.width(env)->float_of_int /. 2. -. width /. 2.,
-      Env.height(env)->float_of_int /. 2. -. height /. 2.,
-    ),
-    Point.create(width, height),
-  )
-  let (startButtonClicked, (startButtonDown, startButtonHovered)) = getClickOn(
-    startButtonRect,
-    mousePtf,
-    startButtonState,
-    env,
-  )
-
-  let (lossCounter, setLossCounter) = Hooks.useState(__LOC__, 0)
-
-  let allButtonStates = {
-    restart: restartButtonDown,
-    play: playButtonDown,
-    undo: undoButtonDown,
-  }
-
-  let (totalTime, setTotalTime) = Hooks.useState(__LOC__, 0.)
-  setTotalTime(mod_float(totalTime.contents +. Env.deltaTime(env), 10000000.))
-
-  if restartClicked {
-    setLastTickTime(tickTimeMS +. 1.)
-  }
-
-  if editor.contents && Env.keyPressed(T, env) {
-    setLevels(Levels.all)
-    setGameState(Intro)
-    setLastTickTime(tickTimeMS +. 1.)
-  }
-
-  /* if (Env.keyPressed(E, env)) { */
-  /* editor := ! editor^; */
-  /* }; */
-
-  if editor.contents {
-    Draw.background(Constants.red, env)
-  } else {
-    Draw.background(Utils.color(~r=13, ~g=43, ~b=69, ~a=255), env)
-  }
-
-  switch (levels.contents, gameState.contents) {
-  | (list{}, _) => drawMessage("You WON the whole game", state.font, env)
-  | (list{first, ...rest}, Intro) =>
-    drawMessage("Death Trap II", ~alternativeText="Revenge of the Walls", state.font, env)
-
-    Assets.drawSprite(
-      state.spriteData,
-      "start" ++ (startButtonDown ? "_pressed" : startButtonHovered ? "_hovered" : ""),
-      ~pos=Point.create(
-        startButtonRect.left +. startButtonRect.width /. 2.,
-        startButtonRect.top +. startButtonRect.height /. 2.,
-      ),
-      ~width=startButtonRect.width,
-      ~height=startButtonRect.height,
-      env,
-    )
-
-    if startButtonClicked || playClicked {
-      let (playingMusic, setPlayingMusic) = Hooks.useState(__LOC__, false)
-      if !playingMusic.contents {
-        setPlayingMusic(true)
-        Sound.play("background_tunes", state, ~loop=true, env)
-      }
-      setGameState(PreparingLevel(list{first}))
-    }
-  | (
-      list{levelInitialState, ...restOfLevels},
-      PreparingLevel(list{levelCurrentState, ...undoStates}),
-    ) =>
-    let (dragging, setDragging) = Hooks.useState(__LOC__, None)
-
-    let hoveredItem = getHoveredInventoryIndex(levelCurrentState.items, env)
-    let hoveredMapSquare = getHoveredMapSquare(levelCurrentState.map, env)
-    let hoveredTile = Option.map(p => (getMapTile(levelCurrentState.map, p), p), hoveredMapSquare)
-
-    if editor.contents && Env.keyPressed(P, env) {
-      Serialize.map(levelCurrentState.map)
-    }
-
-    let levelCurrentState = if editor.contents {
-      let removeLast = l =>
-        switch List.rev(l) {
-        | list{_, ...tl} => List.rev(tl)
-        | list{} => list{}
-        }
-
-      let append = (e, l) => List.rev(list{e, ...List.rev(l)})
-
-      switch hoveredTile {
-      | Some((Floor(k, Player(id, facing, moves)), pt)) =>
-        if Env.keyPressed(Backspace, env) || Env.keyPressed(Down, env) {
-          {
-            ...levelCurrentState,
-            map: setMapTile(
-              levelCurrentState.map,
-              pt,
-              Floor(k, Player(id, facing, removeLast(moves))),
-            ),
-          }
-        } else if Env.keyPressed(Right, env) {
-          {
-            ...levelCurrentState,
-            map: setMapTile(
-              levelCurrentState.map,
-              pt,
-              Floor(k, Player(id, facing, append(TurnRight, moves))),
-            ),
-          }
-        } else if Env.keyPressed(Left, env) {
-          {
-            ...levelCurrentState,
-            map: setMapTile(
-              levelCurrentState.map,
-              pt,
-              Floor(k, Player(id, facing, append(TurnLeft, moves))),
-            ),
-          }
-        } else if Env.keyPressed(Up, env) {
-          {
-            ...levelCurrentState,
-            map: setMapTile(
-              levelCurrentState.map,
-              pt,
-              Floor(k, Player(id, facing, append(Forward, moves))),
-            ),
-          }
-        } else {
-          levelCurrentState
-        }
-
-      | Some(_)
-      | None => levelCurrentState
-      }
-    } else {
-      levelCurrentState
-    }
-
-    let maybeUpdatedLevel = switch (hoveredItem, hoveredMapSquare, dragging.contents) {
-    | (None, _, None) => levelCurrentState
-    | (Some(v), _, None) if state.mouse.down =>
-      setDragging(Some(v))
-      Sound.play("pickup", state, env)
-      levelCurrentState
-    | (Some(_), _, None) => levelCurrentState
-    | (_, _, Some(i)) if Env.mousePressed(env) => levelCurrentState
-    | (_, Some(mapSquare), Some((draggedI, _))) =>
-      setDragging(None)
-      let newTile = switch List.nth(levelCurrentState.items, draggedI) {
-      | Floor(k, Boulder(_, bk)) => Floor(k, Boulder(Levels.id(), bk))
-      | Floor(k, Player(_, f, m)) => Floor(k, Player(Levels.id(), f, m))
-      | t => t
-      }
-
-      Sound.play("drop", state, env)
-      {
-        ...levelCurrentState,
-        items: List.filteri((i, _) => editor.contents || i != draggedI, levelCurrentState.items),
-        map: setMapTile(levelCurrentState.map, mapSquare, newTile),
-      }
-    | (_, _, Some(i)) =>
-      setDragging(None)
-      levelCurrentState
-    }
-
-    let (levelCurrentState, undoStates) = if maybeUpdatedLevel != levelCurrentState {
-      (maybeUpdatedLevel, list{levelCurrentState, ...undoStates})
-    } else if undoClicked {
-      switch undoStates {
-      | list{} => (levelCurrentState, list{})
-      | list{undoState, ...undoStates} => (undoState, undoStates)
-      }
-    } else {
-      (levelCurrentState, undoStates)
-    }
-
-    setGameState(PreparingLevel(list{levelCurrentState, ...undoStates}))
-
-    if restartClicked {
-      setGameState(PreparingLevel(list{levelInitialState}))
-    }
-    if playClicked {
-      setGameState(
-        RunningLevel({
-          states: list{levelCurrentState},
-          preparingUndoStack: list{levelCurrentState, ...undoStates},
-        }),
-      )
-    }
-    drawMap(levelCurrentState.map, state.spriteData, ~time=totalTime.contents, env)
-    drawLines(levelCurrentState.map, env)
-    drawObjects(levelCurrentState.map, state, ~tickTimeMS, env)
-    drawMessage(levelCurrentState.title, state.font, env)
-    drawToolbar(
-      levelCurrentState.items,
-      ~inPreparingLevel=true,
-      ~allButtonStates,
-      state.spriteData,
-      ~dragging=Option.map(fst, dragging.contents),
-      ~hovered=Option.map(fst, hoveredItem),
-      ~time=totalTime.contents,
-      env,
-    )
-    Option.iter(((i, dragOffset)) => {
-      switch hoveredTile {
-      | Some((Floor(k, Empty), pt)) =>
-        let pos: Point.Float.t = {
-          open Point.Float
-          getMapTopLeft(levelCurrentState.map, env) + \"*@"(ofIntPt(pt), tileSizef)
-        }
-        Draw.tint(Utils.color(~r=255, ~g=255, ~b=255, ~a=100), env)
-        drawTile(
-          List.nth(levelCurrentState.items, i),
-          pos,
-          ~time=totalTime.contents,
-          ~noBackground=true,
-          ~withObj=true,
-          state.spriteData,
-          env,
-        )
-        Draw.noTint(env)
-      | _ => ()
-      }
-
-      drawTile(
-        List.nth(levelCurrentState.items, i),
-        {
-          open Point.Float
-          mousePtf - dragOffset
-        },
-        ~time=totalTime.contents,
-        ~noBackground=true,
-        ~withObj=true,
-        state.spriteData,
-        env,
-      )
-    }, dragging.contents)
-  | (list{levelInitialState, ...restOfLevels}, RunningLevel({states: list{}})) =>
-    failwith("This should not happen, RunningLevel got an empty list.")
-  | (
-      list{levelInitialState, ...restOfLevels} as allLevels,
-      RunningLevel({states: list{levelCurrentState, ...pastLevelStates}, preparingUndoStack}),
-    ) =>
-    let deltaTime = Env.deltaTime(env) *. 1000.0
-    if playClicked {
-      setLastAccelerating(!lastAccelerating.contents)
-    }
-    let accelerating = lastAccelerating.contents
-    let tickTimeMS = accelerating ? tickTimeMS /. accelerateMult : tickTimeMS *. 1.
-
-    let (pastLevelStates, levelCurrentState) = if lastTickTime.contents > tickTimeMS {
-      switch tick(levelCurrentState.map, state, env) {
-      | Move(level) =>
-        setLastTickTime(0.0)
-        let newLevelState = {...levelCurrentState, map: level}
-        setGameState(
-          RunningLevel({
-            states: list{newLevelState, levelCurrentState, ...pastLevelStates},
-            preparingUndoStack: preparingUndoStack,
-          }),
-        )
-        (list{levelCurrentState, ...pastLevelStates}, newLevelState)
-      | Win =>
-        if editor.contents {
-          setGameState(PreparingLevel(preparingUndoStack))
-        } else {
-          Sound.play("win", state, env)
-          setLevels(restOfLevels)
-          setGameState(WinLevel(levelInitialState, levelCurrentState))
-        }
-        setLastTickTime(tickTimeMS +. 1.)
-        (pastLevelStates, levelCurrentState)
-      | Lose(level, deadList) =>
-        Sound.play("lose", state, env)
-        setLossCounter(lossCounter.contents + 1)
-        let newLevelState = {...levelCurrentState, map: level}
-        setGameState(
-          LoseLevel({
-            deadList: deadList,
-            loseState: newLevelState,
-            preparingUndoStack: preparingUndoStack,
-          }),
-        )
-
-        // Set to 0 to make sure the death animation can play for a tick
-        setLastTickTime(0.)
-        (list{levelCurrentState, ...pastLevelStates}, newLevelState)
-      }
-    } else {
-      setLastTickTime(lastTickTime.contents +. deltaTime)
-      (pastLevelStates, levelCurrentState)
-    }
-    let pastLevel = switch List.nth_opt(pastLevelStates, 0) {
-    | None => levelCurrentState
-    | Some(pastLevel) => pastLevel
-    }
-    drawMap(pastLevel.map, state.spriteData, ~time=totalTime.contents, env)
-    if lastTickTime.contents /. tickTimeMS < 0.5 {
-      drawLines(pastLevel.map, env)
-    } else {
-      drawLines(levelCurrentState.map, env)
-    }
-    drawObjects(
-      ~previousLevel=pastLevel,
-      ~tickTimeMS,
-      ~time=lastTickTime.contents,
-      levelCurrentState.map,
-      state,
-      env,
-    )
-    drawMessage(levelCurrentState.title, state.font, env)
-    drawToolbar(
-      list{},
-      state.spriteData,
-      ~dragging=None,
-      ~hovered=None,
-      ~accelerateTime=accelerating,
-      ~canAccelerate=true,
-      ~allButtonStates,
-      ~inPreparingLevel=false,
-      ~time=totalTime.contents,
-      env,
-    ) // TODO: Any items?
-    if restartClicked {
-      setGameState(PreparingLevel(preparingUndoStack))
-      setLastTickTime(tickTimeMS +. 1.)
-    }
-  | (list{nextLevel, ...restLevels}, WinLevel(wonLevel, level)) =>
-    drawMap(level.map, state.spriteData, ~time=totalTime.contents, env)
-    drawLines(level.map, env)
-    drawObjects(level.map, state, ~tickTimeMS, env)
-    drawToolbar(
-      list{},
-      state.spriteData,
-      ~dragging=None,
-      ~hovered=None,
-      ~allButtonStates,
-      ~inPreparingLevel=false,
-      ~time=totalTime.contents,
-      env,
-    )
-    let deltaTime = Env.deltaTime(env) *. 1000.0
-    if playClicked {
-      setGameState(PreparingLevel(list{nextLevel}))
-    } else if restartClicked {
-      setLevels(list{wonLevel, nextLevel, ...restLevels})
-      setGameState(PreparingLevel(list{wonLevel}))
-    }
-    drawMessage(
-      "That's how it's done!",
-      ~withControl="play",
-      ~spriteData=state.spriteData,
-      state.font,
-      env,
-    )
-  | (
-      list{initialLevel, ..._},
-      LoseLevel({loseState, preparingUndoStack: prepLevelState, deadList}),
-    ) =>
-    drawMap(loseState.map, state.spriteData, ~time=totalTime.contents, env)
-    drawLines(loseState.map, env)
-    drawObjects(loseState.map, state, ~tickTimeMS, env)
-
-    drawAnimatingDead(~deadList, ~level=loseState, ~lastTickTime=lastTickTime.contents, ~state, env)
-
-    drawToolbar(
-      list{},
-      state.spriteData,
-      ~dragging=None,
-      ~hovered=None,
-      ~allButtonStates,
-      ~inPreparingLevel=false,
-      ~time=totalTime.contents,
-      env,
-    )
-
-    let deltaTime = Env.deltaTime(env) *. 1000.0
-    if lastTickTime.contents < tickTimeMS {
-      setLastTickTime(lastTickTime.contents +. deltaTime)
-    }
-
-    if playClicked || restartClicked {
-      setGameState(PreparingLevel(prepLevelState))
-    }
-
-    let message = if (
-      lossCounter.contents != 0 && mod(lossCounter.contents, lossCountRudeMessage) == 0
-    ) {
-      let index = mod(
-        lossCounter.contents / lossCountRudeMessage + String.length(initialLevel.title),
-        List.length(rudeLossMessages),
-      )
-      List.nth(rudeLossMessages, index)
-    } else {
-      "Oh no! Keep him alive next time, ok?"
-    }
-    drawMessage(message, state.font, ~withControl="back", ~spriteData=state.spriteData, env)
-  }
-
-  {
-    ...state,
-    hooks: Hooks.finalize(),
-    mouse: {
-      ...state.mouse,
-      down: false,
-      up: false,
-    },
-  }
-}
-
-let mouseDown = (state, _) => {
-  ...state,
-  mouse: {
-    down: true,
-    up: false,
-    pressed: true,
-  },
-}
-let mouseUp = (state, _) => {
-  ...state,
-  mouse: {
-    down: false,
-    up: true,
-    pressed: false,
-  },
-}
-
-Assets.loadSpriteSheet("assets/sprites/spritesheet.json", assets =>
-  run(~setup=setup(assets), ~draw, ~mouseDown, ~mouseUp, ())
-)
diff --git a/jscomp/syntax/tests/idempotency/ludum-dare-46/levels.res b/jscomp/syntax/tests/idempotency/ludum-dare-46/levels.res
deleted file mode 100644
index b69f074..0000000
--- a/jscomp/syntax/tests/idempotency/ludum-dare-46/levels.res
+++ /dev/null
@@ -1,1908 +0,0 @@
-open Common
-
-let id = {
-  let counter = ref(0)
-  () => {
-    incr(counter)
-    counter.contents
-  }
-}
-
-let editorItemList = list{
-  Floor(Regular, Empty),
-  Floor(Regular, Boulder(id(), Hard)),
-  Floor(Regular, Boulder(id(), Cracked)),
-  Floor(Regular, Player(id(), Down, list{Forward, Forward})),
-  Floor(FilledPit(id(), Hard), Empty), // We don't need filled pit
-  Wall,
-  Pit,
-  Floor(Spinner(CW), Empty),
-  Floor(Spinner(CCW), Empty),
-}
-
-let emptyLevel = {
-  title: "Editor",
-  items: editorItemList,
-  map: Serialize.emptyMap(11, 11),
-}
-
-let boulderPitTutorial = {
-  title: "Press Play",
-  items: list{},
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Player(id(), Right, list{Forward, Forward, Forward, Forward})),
-      Floor(Regular, Empty),
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let placeBoulderTutorial = {
-  title: "Just Drag a Boulder",
-  items: list{Floor(Regular, Boulder(id(), Hard))},
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Player(id(), Right, list{Forward, Forward, Forward, Forward})),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let multiPitTutorial = {
-  title: "Little More Interesting",
-  items: list{Floor(Regular, Boulder(id(), Hard)), Floor(Regular, Boulder(id(), Hard))},
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Left,
-          list{
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-          },
-        ),
-      ),
-      Wall,
-    },
-    list{Wall, Floor(Regular, Empty), Pit, Floor(Regular, Empty), Floor(Regular, Empty), Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let multiPushBoulderTutorial = {
-  title: "Picking up a Package",
-  items: list{
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-  },
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Left,
-          list{
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-          },
-        ),
-      ),
-      Wall,
-    },
-    list{Wall, Floor(Regular, Empty), Pit, Pit, Floor(Regular, Empty), Floor(Regular, Empty), Wall},
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let dontbreak1 = {
-  title: "Disappearing Trick",
-  items: list{
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-  },
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Pit,
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Right,
-          list{
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Boulder(id(), Hard)),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let dontbreak2 = {
-  title: "Please Don't Break Again",
-  items: list{Floor(Regular, Boulder(id(), Hard)), Floor(Regular, Boulder(id(), Hard))},
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Pit,
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Right,
-          list{
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            TurnRight,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Boulder(id(), Hard)),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Boulder(id(), Hard)),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let boulderWall1 = {
-  title: "Crunch",
-  items: list{Floor(Regular, Boulder(id(), Hard)), Floor(Regular, Boulder(id(), Hard))},
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Right,
-          list{
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Pit,
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let level1 = {
-  title: "Tutorial",
-  items: list{
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-  },
-  map: list{
-    list{
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-    },
-    list{
-      Floor(
-        Regular,
-        Player(id(), Right, list{Forward, Forward, Forward, Forward, TurnLeft, Forward}),
-      ),
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Boulder(id(), Hard)),
-      Pit,
-      Floor(Regular, Empty),
-    },
-    list{
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-    },
-  },
-}
-
-let level2 = {
-  title: "Tutorial",
-  items: list{
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-  },
-  map: list{
-    list{
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-    },
-    list{
-      Floor(
-        Regular,
-        Player(id(), Right, list{Forward, Forward, Forward, Forward, TurnLeft, Forward}),
-      ),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-    },
-    list{
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-    },
-  },
-}
-
-let ambiguousPath1 = {
-  title: "Ambiguity",
-  // items: editorItemList,
-  items: list{
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-  },
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Right,
-          list{
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Wall,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let ambiguousPath2 = {
-  title: "Looks Familiar...",
-  items: list{
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-  },
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Right,
-          list{
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Wall,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let ambiguousPath3 = {
-  title: "Just One More",
-  // items: editorItemList,
-  items: list{
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-  },
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Right,
-          list{
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Wall,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let small1 = {
-  title: "Tight Quarters",
-  items: list{
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-  },
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Right,
-          list{
-            TurnRight,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            TurnRight,
-            Forward,
-            TurnRight,
-            Forward,
-            TurnLeft,
-            Forward,
-            TurnRight,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{
-      Wall,
-      Wall,
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let zigzag1 = {
-  title: "Zig Zag",
-  items: list{
-    Floor(Regular, Boulder(id(), Cracked)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-  },
-  // items: editorItemList,
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Empty),
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Empty),
-      Floor(Regular, Boulder(id(), Hard)),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Right,
-          list{
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Empty),
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let withAFriend = {
-  title: "Fun with a Friend",
-  items: list{
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Regular, Boulder(id(), Cracked)),
-  },
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Wall,
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Right,
-          list{
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            TurnRight,
-            TurnRight,
-            TurnLeft,
-            TurnLeft,
-            TurnRight,
-            TurnLeft,
-            TurnLeft,
-            TurnRight,
-            TurnRight,
-            TurnLeft,
-            TurnLeft,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Boulder(id(), Hard)),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Floor(Regular, Empty), Pit, Wall, Floor(Regular, Empty), Wall},
-    list{
-      Wall,
-      Wall,
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Wall,
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Floor(Regular, Empty), Floor(Regular, Empty), Wall},
-    list{
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Left,
-          list{
-            TurnLeft,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            TurnRight,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let rotateTutorial = {
-  title: "Spinny",
-  items: list{Floor(Spinner(CCW), Empty), Floor(Spinner(CW), Empty)},
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{Wall, Floor(Regular, Empty), Wall, Pit, Wall, Floor(Regular, Empty), Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Boulder(id(), Hard)),
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Player(id(), Right, list{Forward, Forward, Forward, Forward})),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Pit,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Floor(Regular, Empty), Wall, Pit, Wall, Floor(Regular, Empty), Wall},
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let bigSquare = {
-  title: "Square Dancing",
-  items: list{Floor(Regular, Boulder(id(), Hard)), Floor(Regular, Boulder(id(), Hard))},
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Spinner(CW), Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CCW), Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Wall,
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Wall,
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Down,
-          list{
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            TurnLeft,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Wall,
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Spinner(CCW), Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CW), Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let finale = {
-  title: "Finale",
-  items: list{
-    Floor(Regular, Boulder(id(), Hard)),
-    Floor(Spinner(CW), Empty),
-    Floor(Spinner(CCW), Empty),
-  },
-  map: list{
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-    list{
-      Wall,
-      Floor(Spinner(CCW), Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CCW), Empty),
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Down,
-          list{
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CCW), Empty),
-      Pit,
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Spinner(CW), Empty),
-      Floor(Spinner(CW), Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CCW), Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CW), Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CCW), Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Boulder(id(), Hard)),
-      Pit,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Spinner(CW), Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CW), Empty),
-      Pit,
-      Floor(Spinner(CCW), Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Spinner(CW), Empty),
-      Floor(Spinner(CCW), Empty),
-      Floor(Spinner(CCW), Empty),
-      Pit,
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Regular, Empty),
-      Floor(Spinner(CW), Empty),
-      Floor(Regular, Boulder(id(), Hard)),
-      Floor(Spinner(CCW), Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CCW), Empty),
-      Pit,
-      Floor(Regular, Empty),
-      Pit,
-      Floor(Spinner(CCW), Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Regular, Empty),
-      Floor(Spinner(CW), Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CW), Empty),
-      Floor(Spinner(CW), Boulder(id(), Hard)),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CCW), Empty),
-      Floor(Regular, Empty),
-      Wall,
-    },
-    list{
-      Wall,
-      Floor(Spinner(CW), Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(
-        Regular,
-        Player(
-          id(),
-          Up,
-          list{
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            Forward,
-            TurnRight,
-          },
-        ),
-      ),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Regular, Empty),
-      Floor(Spinner(CCW), Empty),
-      Wall,
-    },
-    list{Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall, Wall},
-  },
-}
-
-let all = list{
-  boulderPitTutorial,
-  placeBoulderTutorial,
-  multiPitTutorial,
-  multiPushBoulderTutorial,
-  boulderWall1,
-  small1,
-  dontbreak1,
-  dontbreak2,
-  zigzag1,
-  ambiguousPath1,
-  ambiguousPath2,
-  ambiguousPath3,
-  rotateTutorial,
-  bigSquare,
-  withAFriend,
-  finale,
-}
-
-/* let all = [bigSquare]; */
diff --git a/jscomp/syntax/tests/idempotency/ludum-dare-46/point.res b/jscomp/syntax/tests/idempotency/ludum-dare-46/point.res
deleted file mode 100644
index a21eb3b..0000000
--- a/jscomp/syntax/tests/idempotency/ludum-dare-46/point.res
+++ /dev/null
@@ -1,51 +0,0 @@
-type t<'a> = {
-  x: 'a,
-  y: 'a,
-}
-module Common = {
-  let create = (x, y) => {x: x, y: y}
-  let toPair = ({x, y}) => (x, y)
-  let fromPair = ((x, y)) => {x: x, y: y}
-  let map = (~f, {x, y}) => {x: f(x), y: f(y)}
-}
-include Common
-
-module Int = {
-  include Common
-  type t = t<int>
-  let zero = {x: 0, y: 0}
-  let add = ({x: x1, y: y1}, {x: x2, y: y2}) => {x: x1 + x2, y: y1 + y2}
-  let sub = ({x: x1, y: y1}, {x: x2, y: y2}) => {x: x1 - x2, y: y1 - y2}
-  let addScalar = ({x, y}, s) => {x: x + s, y: y + s}
-  let divScalar = ({x, y}, s) => {x: x / s, y: y / s}
-  let neg = x => sub(zero, x)
-  let mag = ({x, y}) => sqrt(float_of_int(x * x + y * y))
-  let string = t => Printf.sprintf("{x:%d,y:%d}", t.x, t.y)
-  let print = t => print_endline(string(t))
-  let ofFloatPt = t => map(t, ~f=int_of_float)
-  let \"+" = add
-  let \"-" = sub
-  let \"/@" = divScalar
-  let \"+@" = addScalar
-}
-
-module Float = {
-  include Common
-  type t = t<float>
-  let zero = {x: 0., y: 0.}
-  let add = ({x: x1, y: y1}, {x: x2, y: y2}) => {x: x1 +. x2, y: y1 +. y2}
-  let sub = ({x: x1, y: y1}, {x: x2, y: y2}) => {x: x1 -. x2, y: y1 -. y2}
-  let addScalar = ({x, y}, s) => {x: x +. s, y: y +. s}
-  let multScalar = ({x, y}, s) => {x: x *. s, y: y *. s}
-  let divScalar = ({x, y}, s) => {x: x /. s, y: y /. s}
-  let neg = x => sub(zero, x)
-  let mag = ({x, y}) => sqrt(x *. x +. y *. y)
-  let string = t => Printf.sprintf("{x:%f,y:%f}", t.x, t.y)
-  let print = t => print_endline(string(t))
-  let ofIntPt = t => map(t, ~f=float_of_int)
-  let \"+" = add
-  let \"-" = sub
-  let \"/@" = divScalar
-  let \"+@" = addScalar
-  let \"*@" = multScalar
-}
diff --git a/jscomp/syntax/tests/idempotency/ludum-dare-46/serialize.res b/jscomp/syntax/tests/idempotency/ludum-dare-46/serialize.res
deleted file mode 100644
index 876c304..0000000
--- a/jscomp/syntax/tests/idempotency/ludum-dare-46/serialize.res
+++ /dev/null
@@ -1,77 +0,0 @@
-open Common
-
-let spinnerDirection = d =>
-  switch d {
-  | CW => "CW"
-  | CCW => "CCW"
-  }
-
-let boulderHealth = health =>
-  switch health {
-  | Cracked => "Cracked"
-  | Hard => "Hard"
-  }
-
-let floorKind = fKind =>
-  switch fKind {
-  | Regular => "Regular"
-  | FilledPit(_, h) => "FilledPit(id(), " ++ (boulderHealth(h) ++ ")")
-  | Spinner(dir) => "Spinner(" ++ (spinnerDirection(dir) ++ ")")
-  }
-
-let move = m =>
-  switch m {
-  | TurnRight => "TurnRight"
-  | Forward => "Forward"
-  | TurnLeft => "TurnLeft"
-  }
-
-let moves = mList => "[" ++ (String.concat(",", List.map(m => move(m), mList)) ++ "]")
-
-let facing = f =>
-  switch f {
-  | Up => "Up"
-  | Down => "Down"
-  | Left => "Left"
-  | Right => "Right"
-  }
-
-let obj = o =>
-  switch o {
-  | Player(id, f, mList) => "Player(id()," ++ (facing(f) ++ ("," ++ (moves(mList) ++ ")")))
-  | Boulder(id, health) => "Boulder(id()," ++ (boulderHealth(health) ++ ")")
-  | Empty => "Empty"
-  }
-
-let tile = t =>
-  switch t {
-  | Wall => "Wall"
-  | Floor(fKind, o) => "Floor(" ++ (floorKind(fKind) ++ (", " ++ (obj(o) ++ ")")))
-  | Pit => "Pit"
-  }
-
-let map = m => {
-  let r =
-    "[" ++
-    (String.concat(
-      ",",
-      List.map(row => "[" ++ (String.concat(",", List.map(t => tile(t), row)) ++ "]"), m),
-    ) ++
-    "]")
-  print_endline(r)
-}
-
-let emptyMap = (width, height) =>
-  List.init(height, y =>
-    List.init(width, x => {
-      let tuple = (x, y)
-      switch tuple {
-      | (0, _)
-      | (_, 0) =>
-        Wall
-      | (w, _) if w == width - 1 => Wall
-      | (_, h) if h == height - 1 => Wall
-      | _ => Floor(Regular, Empty)
-      }
-    })
-  )
diff --git a/jscomp/syntax/tests/idempotency/ludum-dare-46/sound.res b/jscomp/syntax/tests/idempotency/ludum-dare-46/sound.res
deleted file mode 100644
index c09ba5e..0000000
--- a/jscomp/syntax/tests/idempotency/ludum-dare-46/sound.res
+++ /dev/null
@@ -1,28 +0,0 @@
-open Common
-
-// This is a map of the sound name to the volume level.
-let names = list{
-  ("drop", 1.0),
-  ("pickup", 1.0),
-  ("win", 0.1),
-  ("lose", 0.1),
-  ("moving_boulder", 0.05),
-  ("rock_crack", 0.1),
-  ("background_tunes", 0.1),
-}
-
-let load = env => {
-  let loadSoundHelper = (sounds, (name: string, volume)) =>
-    StringMap.add(
-      name,
-      (Reprocessing.Env.loadSound(Printf.sprintf("assets/sounds/%s.wav", name), env), volume),
-      sounds,
-    )
-  List.fold_left(loadSoundHelper, StringMap.empty, names)
-}
-
-let play = (name, state, ~loop=false, env) =>
-  switch StringMap.find(name, state.soundData) {
-  | (s, volume) => Reprocessing.Env.playSound(s, ~loop, ~volume, env)
-  | exception Not_found => print_endline("Couldn't find sound " ++ name)
-  }
diff --git a/jscomp/syntax/tests/idempotency/mareo/Actors.res b/jscomp/syntax/tests/idempotency/mareo/Actors.res
deleted file mode 100644
index ebac7f8..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Actors.res
+++ /dev/null
@@ -1,71 +0,0 @@
-type dir_1d =
-  | Left
-  | Right
-
-type dir_2d =
-  | North
-  | South
-  | East
-  | West
-
-type xy = {
-  mutable x: float,
-  mutable y: float,
-}
-
-type controls =
-  | CLeft
-  | CRight
-  | CUp
-  | CDown
-
-type pl_typ =
-  | BigM
-  | SmallM
-
-type item_typ =
-  | Mushroom
-  | FireFlower
-  | Star
-  | Coin
-
-type enemy_typ =
-  | Goomba
-  | GKoopa
-  | RKoopa
-  | GKoopaShell
-  | RKoopaShell
-
-type block_typ =
-  | QBlock(item_typ)
-  | QBlockUsed
-  | Brick
-  | UnBBlock
-  | Cloud
-  | Panel
-  | Ground
-
-type player_typ =
-  | Standing
-  | Jumping
-  | Running
-  | Crouching
-
-type part_typ =
-  | GoombaSquish
-  | BrickChunkL
-  | BrickChunkR
-  | Score100
-  | Score200
-  | Score400
-  | Score800
-  | Score1000
-  | Score2000
-  | Score4000
-  | Score8000
-
-type spawn_typ =
-  | SPlayer(pl_typ, player_typ)
-  | SEnemy(enemy_typ)
-  | SItem(item_typ)
-  | SBlock(block_typ)
diff --git a/jscomp/syntax/tests/idempotency/mareo/Actors.resi b/jscomp/syntax/tests/idempotency/mareo/Actors.resi
deleted file mode 100644
index eb64bdf..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Actors.resi
+++ /dev/null
@@ -1,82 +0,0 @@
-type dir_1d =
-  | Left
-  | Right
-
-type dir_2d =
-  | North
-  | South
-  | East
-  | West
-
-/* Generic xy record for easy position access */
-type xy = {
-  mutable x: float,
-  mutable y: float,
-}
-
-/* Controls correspond to keyboard input */
-type controls =
-  | CLeft
-  | CRight
-  | CUp
-  | CDown
-
-/* Player ability type */
-type pl_typ =
-  | BigM
-  | SmallM
-
-type item_typ =
-  | Mushroom
-  | FireFlower
-  | Star
-  | Coin
-
-type enemy_typ =
-  | Goomba
-  | GKoopa
-  | RKoopa
-  | GKoopaShell
-  | RKoopaShell
-
-type block_typ =
-  | QBlock(item_typ)
-  | QBlockUsed
-  | Brick
-  | UnBBlock
-  | Cloud
-  | Panel
-  | Ground
-
-/* Player action type */
-type player_typ =
-  | Standing
-  | Jumping
-  | Running
-  | Crouching
-
-/* Particle Type */
-type part_typ =
-  | GoombaSquish
-  | BrickChunkL
-  | BrickChunkR
-  | Score100
-  | Score200
-  | Score400
-  | Score800
-  | Score1000
-  | Score2000
-  | Score4000
-  | Score8000
-
-/* type unbblock_typ =
-    | Wood
-    | Earth
-    | Brick
-  | */
-type spawn_typ =
-  | SPlayer(pl_typ, player_typ)
-  | SEnemy(enemy_typ)
-  | SItem(item_typ)
-  | SBlock(block_typ)
-/* | SGround of ground_typ */
diff --git a/jscomp/syntax/tests/idempotency/mareo/Director.res b/jscomp/syntax/tests/idempotency/mareo/Director.res
deleted file mode 100644
index b0c5e68..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Director.res
+++ /dev/null
@@ -1,555 +0,0 @@
-open Belt
-
-open Sprite
-
-open Object
-
-open Actors
-
-/* open Viewport */
-/* Represents the values of relevant key bindings. */
-type keys = {
-  mutable left: bool,
-  mutable right: bool,
-  mutable up: bool,
-  mutable down: bool,
-  mutable bbox: int,
-}
-
-/* st represents the state of the game. It includes a background sprite (e.g.,
- * (e.g., hills), a context (used for rendering onto the page), a viewport
- * (used for moving the player's "camera"), a score (which is kept track
- * throughout the game), coins (also kept track through the game),
- * a multiplier (used for when you kill multiple enemies before ever touching
- * the ground, as in the actual Super Mario), and a game_over bool (which
- * is only true when the game is over). */
-type st = {
-  bgd: sprite,
-  ctx: Dom_html.canvasRenderingContext2D,
-  vpt: Viewport.viewport,
-  map: float,
-  mutable score: int,
-  mutable coins: int,
-  mutable multiplier: int,
-  mutable game_over: bool,
-}
-
-/* pressed_keys instantiates the keys. */
-let pressed_keys = {
-  left: false,
-  right: false,
-  up: false,
-  down: false,
-  bbox: 0,
-}
-
-let collid_objs = ref(list{}) /* List of next iteration collidable objects */
-
-let particles = ref(list{}) /* List of next iteration particles */
-
-let last_time = ref(0.) /* Used for calculating fps */
-
-/* Calculates fps as the difference between [t0] and [t1] */
-let calc_fps = (t0, t1) => {
-  let delta = (t1 -. t0) /. 1000.
-  1. /. delta
-}
-
-/* Adds [i] to the score in [state] */
-let update_score = (state, i) => state.score = state.score + i
-
-/* player_attack_enemy is called for a player hitting an enemy from the north.
- *This causes the player to either kill the enemy or move the enemy, in the
- *case that the enemy is a shell. Invulnerability, jumping, and grounded
- *are used for fine tuning the movements. */
-let player_attack_enemy = (s1, o1, typ, s2, o2, state, context) => {
-  ignore(s1)
-  o1.invuln = 10
-  o1.jumping = false
-  o1.grounded = true
-  switch typ {
-  | GKoopaShell
-  | RKoopaShell =>
-    let r2 = evolve_enemy(o1.dir, typ, s2, o2, context)
-    o1.vel.y = -.dampen_jump
-    o1.pos.y = o1.pos.y -. 5.
-    (None, r2)
-  | _ =>
-    dec_health(o2)
-    o1.vel.y = -.dampen_jump
-    if state.multiplier == 8 {
-      update_score(state, 800)
-      o2.score = 800
-      (None, evolve_enemy(o1.dir, typ, s2, o2, context))
-    } else {
-      let score = 100 * state.multiplier
-      update_score(state, score)
-      o2.score = score
-      state.multiplier = state.multiplier * 2
-      (None, evolve_enemy(o1.dir, typ, s2, o2, context))
-    }
-  }
-}
-
-/* enemy_attack_player is used when an enemy kills a player. */
-let enemy_attack_player = (s1, o1: Object.obj, t2, s2, o2: Object.obj, context) => {
-  ignore(s1)
-  switch t2 {
-  | GKoopaShell
-  | RKoopaShell =>
-    let r2 = if o2.vel.x == 0. {
-      evolve_enemy(o1.dir, t2, s2, o2, context)
-    } else {
-      dec_health(o1)
-      o1.invuln = invuln
-      None
-    }
-    (None, r2)
-  | _ =>
-    dec_health(o1)
-    o1.invuln = invuln
-    (None, None)
-  }
-}
-
-/* In the case that two enemies collide, they are to reverse directions. However,
- *in the case that one or more of the two enemies is a koopa shell, then
- *the koopa shell kills the other enemy. */
-let col_enemy_enemy = (t1, s1, o1, t2, s2, o2, dir) =>
-  switch (t1, t2) {
-  | (GKoopaShell, GKoopaShell)
-  | (GKoopaShell, RKoopaShell)
-  | (RKoopaShell, RKoopaShell)
-  | (RKoopaShell, GKoopaShell) =>
-    dec_health(o1)
-    dec_health(o2)
-    (None, None)
-  | (RKoopaShell, _)
-  | (GKoopaShell, _) =>
-    if o1.vel.x == 0. {
-      rev_dir(o2, t2, s2)
-      (None, None)
-    } else {
-      dec_health(o2)
-      (None, None)
-    }
-  | (_, RKoopaShell)
-  | (_, GKoopaShell) =>
-    if o2.vel.x == 0. {
-      rev_dir(o1, t1, s1)
-      (None, None)
-    } else {
-      dec_health(o1)
-      (None, None)
-    }
-  | (_, _) =>
-    switch dir {
-    | West
-    | East =>
-      rev_dir(o1, t1, s1)
-      rev_dir(o2, t2, s2)
-      (None, None)
-    | _ => (None, None)
-    }
-  }
-
-/* Gets the object at a given position */
-/* let obj_at_pos dir (pos: xy) (collids: Object.collidable list)
-                                             : Object.collidable list =
-   match dir with
-   | Left -> List.filter (fun (col: Object.collidable) ->
-       (get_obj col).pos.y = pos.y && (get_obj col).pos.x = pos.x -. 16.)
-             collids
-   | _ -> List.filter (fun (col: Object.collidable) ->
-       (get_obj col).pos.y = pos.y && (get_obj col).pos.x = pos.x +. 16.)
-             collids */
-/* Returns whether the object at a given position is a block */
-/* let is_block dir pos collids =
-   match obj_at_pos dir pos collids with
-   | [] -> false
-   | [Block (_,_,_)] -> true
-   | _ -> false */
-/* Returns whether the given object is a red koopa */
-/* let is_rkoopa collid =
-   match collid with
-   | Enemy(RKoopa,_,_) -> true
-   | _ -> false */
-/* Process collision is called to match each of the possible collisions that
- * may occur. Returns a pair of collidable options, representing objects that
- * were created from the existing ones. That is, the first element represents
- * a new item spawned as a result of the first collidable. None indicates that
- * no new item should be spawned. Transformations to existing objects occur
- * mutably, as many changes are side-effectual. */
-let process_collision = (
-  dir: Actors.dir_2d,
-  c1: Object.collidable,
-  c2: Object.collidable,
-  state: st,
-) => {
-  let context = state.ctx
-  switch (c1, c2, dir) {
-  | (Player(_, s1, o1), Enemy(typ, s2, o2), South)
-  | (Enemy(typ, s2, o2), Player(_, s1, o1), North) =>
-    player_attack_enemy(s1, o1, typ, s2, o2, state, context)
-  | (Player(_, s1, o1), Enemy(t2, s2, o2), _)
-  | (Enemy(t2, s2, o2), Player(_, s1, o1), _) =>
-    enemy_attack_player(s1, o1, t2, s2, o2, context)
-  | (Player(_, _, o1), Item(t2, _, o2), _)
-  | (Item(t2, _, o2), Player(_, _, o1), _) =>
-    switch t2 {
-    | Mushroom =>
-      dec_health(o2)
-      if o1.health == 2 {
-        ()
-      } else {
-        o1.health = o1.health + 1
-      }
-      o1.vel.x = 0.
-      o1.vel.y = 0.
-      update_score(state, 1000)
-      o2.score = 1000
-      (None, None)
-    | Coin =>
-      state.coins = state.coins + 1
-      dec_health(o2)
-      update_score(state, 100)
-      (None, None)
-    | _ =>
-      dec_health(o2)
-      update_score(state, 1000)
-      (None, None)
-    }
-  | (Enemy(t1, s1, o1), Enemy(t2, s2, o2), dir) => col_enemy_enemy(t1, s1, o1, t2, s2, o2, dir)
-  | (Enemy(t1, s1, o1), Block(t2, _, o2), East)
-  | (Enemy(t1, s1, o1), Block(t2, _, o2), West) =>
-    switch (t1, t2) {
-    | (RKoopaShell, Brick)
-    | (GKoopaShell, Brick) =>
-      dec_health(o2)
-      reverse_left_right(o1)
-      (None, None)
-    | (RKoopaShell, QBlock(typ))
-    | (GKoopaShell, QBlock(typ)) =>
-      let updated_block = evolve_block(o2, context)
-      let spawned_item = spawn_above(o1.dir, o2, typ, context)
-      rev_dir(o1, t1, s1)
-      (Some(updated_block), Some(spawned_item))
-    | (_, _) =>
-      rev_dir(o1, t1, s1)
-      (None, None)
-    }
-  | (Item(_, _, o1), Block(_, _, _), East)
-  | (Item(_, _, o1), Block(_, _, _), West) =>
-    reverse_left_right(o1)
-    (None, None)
-  | (Enemy(_, _, o1), Block(_, _, _), _)
-  | (Item(_, _, o1), Block(_, _, _), _) =>
-    collide_block(dir, o1)
-    (None, None)
-  | (Player(t1, _, o1), Block(t, _, o2), North) =>
-    switch t {
-    | QBlock(typ) =>
-      let updated_block = evolve_block(o2, context)
-      let spawned_item = spawn_above(o1.dir, o2, typ, context)
-      collide_block(dir, o1)
-      (Some(spawned_item), Some(updated_block))
-    | Brick =>
-      if t1 == BigM {
-        collide_block(dir, o1)
-        dec_health(o2)
-        (None, None)
-      } else {
-        collide_block(dir, o1)
-        (None, None)
-      }
-    | Panel =>
-      Draw.game_win(state.ctx)
-      (None, None)
-    | _ =>
-      collide_block(dir, o1)
-      (None, None)
-    }
-  | (Player(_, _, o1), Block(t, _, _), _) =>
-    switch t {
-    | Panel =>
-      Draw.game_win(state.ctx)
-      (None, None)
-    | _ =>
-      switch dir {
-      | South =>
-        state.multiplier = 1
-        collide_block(dir, o1)
-        (None, None)
-      | _ =>
-        collide_block(dir, o1)
-        (None, None)
-      }
-    }
-  | (_, _, _) => (None, None)
-  }
-}
-
-/* Run the broad phase object filtering */
-let broad_phase = (collid, all_collids, state) => {
-  let obj = get_obj(collid)
-  List.keep(all_collids, _c =>
-    Viewport.in_viewport(state.vpt, obj.pos) ||
-    (is_player(collid) ||
-    Viewport.out_of_viewport_below(state.vpt, obj.pos.y))
-  )
-}
-
-/* narrow_phase of collision is used in order to continuously loop through
- *each of the collidable objects to constantly check if collisions are
- *occurring. */
-let narrow_phase = (c, cs, state) => {
-  let rec narrow_helper = (c, cs, state, acc) =>
-    switch cs {
-    | list{} => acc
-    | list{h, ...t} =>
-      let c_obj = get_obj(c)
-      let new_objs = if !equals(c, h) {
-        switch Object.check_collision(c, h) {
-        | None => (None, None)
-        | Some(dir) =>
-          if get_obj(h).id != c_obj.id {
-            /* ( (if (if is_rkoopa c then
-                begin match c_obj.dir with
-                | Left -> is_block c_obj.dir {x= c_obj.pos.x -. 16.; y= c_obj.pos.y -. 27.} cs
-                | _ -> is_block c_obj.dir {x= c_obj.pos.x +. 16.; y= c_obj.pos.y -. 27.} cs
-                end else false) then rev_dir c_obj RKoopa (Object.get_sprite c) else
-                ());*/
-            process_collision(dir, c, h, state)
-          } else {
-            (None, None)
-          }
-        }
-      } else {
-        (None, None)
-      }
-      let acc = switch new_objs {
-      | (None, Some(o)) => list{o, ...acc}
-      | (Some(o), None) => list{o, ...acc}
-      | (Some(o1), Some(o2)) => list{o1, o2, ...acc}
-      | (None, None) => acc
-      }
-      narrow_helper(c, t, state, acc)
-    }
-  narrow_helper(c, cs, state, list{})
-}
-
-/* This is an optimization setp to determine which objects require narrow phase
- * checking. This excludes static collidables, allowing collision to only be
- * checked with moving objects. This method is called once per collidable.
- * Collision detection proceeds as follows:
- * 1. Broad phase - filter collidables that cannot possibly collide with
- *    this object.
- * 2. Narrow phase - compare against all objects to determine whether there
- *    is a collision, and process the collision.
- * This method returns a list of objects that are created, which should be
- * added to the list of collidables for the next iteration.
- * */
-let check_collisions = (collid, all_collids, state) =>
-  switch collid {
-  | Block(_, _, _) => list{}
-  | _ =>
-    let broad = broad_phase(collid, all_collids, state)
-    narrow_phase(collid, broad, state)
-  }
-
-/* Returns whether the bounding box should be drawn */
-let check_bbox_enabled = () => pressed_keys.bbox == 1
-
-/* update_collidable is the primary update method for collidable objects,
- * checking the collision, updating the object, and drawing to the canvas. */
-let update_collidable = (state, collid: Object.collidable, all_collids) => {
-  /* TODO: optimize. Draw static elements only once */
-  let obj = Object.get_obj(collid)
-  let spr = Object.get_sprite(collid)
-  obj.invuln = if obj.invuln > 0 {
-    obj.invuln - 1
-  } else {
-    0
-  }
-  /* Prevent position from being updated outside of viewport */
-  let viewport_filter =
-    Viewport.in_viewport(state.vpt, obj.pos) ||
-    (is_player(collid) ||
-    Viewport.out_of_viewport_below(state.vpt, obj.pos.y))
-  if !obj.kill && viewport_filter {
-    obj.grounded = false
-    Object.process_obj(obj, state.map)
-    /* Run collision detection if moving object */
-    let evolved = check_collisions(collid, all_collids, state)
-    /* Render and update animation */
-    let vpt_adj_xy = Viewport.coord_to_viewport(state.vpt, obj.pos)
-    Draw.render(spr, (vpt_adj_xy.x, vpt_adj_xy.y))
-    if check_bbox_enabled() {
-      Draw.render_bbox(spr, (vpt_adj_xy.x, vpt_adj_xy.y))
-    }
-    if obj.vel.x != 0. || !is_enemy(collid) {
-      Sprite.update_animation(spr)
-    }
-    evolved
-  } else {
-    list{}
-  }
-}
-
-/* Converts a keypress to a list of control keys, allowing more than one key
- * to be processed each frame. */
-let translate_keys = () => {
-  let k = pressed_keys
-  let ctrls = list{(k.left, CLeft), (k.right, CRight), (k.up, CUp), (k.down, CDown)}
-  List.reduce(ctrls, list{}, (a, x) =>
-    if fst(x) {
-      list{snd(x), ...a}
-    } else {
-      a
-    }
-  )
-}
-
-/* run_update is used to update all of the collidables at once. Primarily used
- * as a wrapper method. This method is necessary to differentiate between
- * the player collidable and the remaining collidables, as special operations
- * such as viewport centering only occur with the player. */
-let run_update_collid = (state, collid, all_collids) =>
-  switch collid {
-  | Player(_, s, o) as p =>
-    let keys = translate_keys()
-    o.crouch = false
-    let player = switch Object.update_player(o, keys, state.ctx) {
-    | None => p
-    | Some((new_typ, new_spr)) =>
-      Object.normalize_pos(o.pos, s.params, new_spr.params)
-      Player(new_typ, new_spr, o)
-    }
-    let evolved = update_collidable(state, player, all_collids)
-    collid_objs := \"@"(collid_objs.contents, evolved)
-    player
-  | _ =>
-    let obj = get_obj(collid)
-    let evolved = update_collidable(state, collid, all_collids)
-    if !obj.kill {
-      collid_objs := list{collid, ...\"@"(collid_objs.contents, evolved)}
-    }
-    let new_parts = if obj.kill {
-      Object.kill(collid, state.ctx)
-    } else {
-      list{}
-    }
-    particles := \"@"(particles.contents, new_parts)
-    collid
-  }
-
-/* Primary update function to update and persist a particle */
-let run_update_particle = (state, part) => {
-  Particle.process(part)
-  let x = part.pos.x -. state.vpt.pos.x
-  and y = part.pos.y -. state.vpt.pos.y
-  Draw.render(part.params.sprite, (x, y))
-  if !part.kill {
-    particles := list{part, ...particles.contents}
-  }
-}
-
-/* update_loop is constantly being called to check for collisions and to
- *update each of the objects in the game. */
-let update_loop = (canvas, (player, objs), map_dim) => {
-  let scale = 1.
-  let ctx = Dom_html.canvasElementToJsObj(canvas)["getContext"]("2d")
-  let cwidth = float_of_int(Dom_html.canvasElementToJsObj(canvas)["width"]) /. scale
-  let cheight = float_of_int(Dom_html.canvasElementToJsObj(canvas)["height"]) /. scale
-  let viewport = Viewport.make((cwidth, cheight), map_dim)
-  let state = {
-    bgd: Sprite.make_bgd(ctx),
-    vpt: Viewport.update(viewport, get_obj(player).pos),
-    ctx: ctx,
-    score: 0,
-    coins: 0,
-    multiplier: 1,
-    map: snd(map_dim),
-    game_over: false,
-  }
-  ignore(Dom_html.canvasRenderingContext2DToJsObj(state.ctx)["scale"](scale, scale))
-  let rec update_helper = (time, state, player, objs, parts) =>
-    if state.game_over == true {
-      Draw.game_win(state.ctx)
-    } else {
-      collid_objs := list{}
-      particles := list{}
-      let fps = calc_fps(last_time.contents, time)
-      last_time := time
-      Draw.clear_canvas(canvas)
-      /* Parallax background */
-      let vpos_x_int = int_of_float(state.vpt.pos.x /. 5.)
-      let bgd_width = int_of_float(fst(state.bgd.params.frame_size))
-      Draw.draw_bgd(state.bgd, float_of_int(mod(vpos_x_int, bgd_width)))
-      let player = run_update_collid(state, player, objs)
-      if get_obj(player).kill == true {
-        Draw.game_loss(state.ctx)
-      } else {
-        let state = {
-          ...state,
-          vpt: Viewport.update(state.vpt, get_obj(player).pos),
-        }
-        List.forEach(objs, obj => ignore(run_update_collid(state, obj, objs)))
-        List.forEach(parts, part => run_update_particle(state, part))
-        Draw.fps(canvas, fps)
-        Draw.hud(canvas, state.score, state.coins)
-        \"@@"(
-          ignore,
-          Dom_html.requestAnimationFrame((t: float) =>
-            update_helper(t, state, player, collid_objs.contents, particles.contents)
-          ),
-        )
-      }
-    }
-  update_helper(0., state, player, objs, list{})
-}
-
-/* Keydown event handler translates a key press */
-let keydown = evt => {
-  let evt = Dom_html.keyboardEventToJsObj(evt)
-  let () = switch evt["keyCode"] {
-  | 38
-  | 32
-  | 87 =>
-    pressed_keys.up = true
-  | 39
-  | 68 =>
-    pressed_keys.right = true
-  | 37
-  | 65 =>
-    pressed_keys.left = true
-  | 40
-  | 83 =>
-    pressed_keys.down = true
-  | 66 => pressed_keys.bbox = mod(pressed_keys.bbox + 1, 2)
-  | _ => ()
-  }
-  true
-}
-
-/* Keyup event handler translates a key release */
-let keyup = evt => {
-  let evt = Dom_html.keyboardEventToJsObj(evt)
-  let () = switch evt["keyCode"] {
-  | 38
-  | 32
-  | 87 =>
-    pressed_keys.up = false
-  | 39
-  | 68 =>
-    pressed_keys.right = false
-  | 37
-  | 65 =>
-    pressed_keys.left = false
-  | 40
-  | 83 =>
-    pressed_keys.down = false
-  | _ => ()
-  }
-  true
-}
diff --git a/jscomp/syntax/tests/idempotency/mareo/Director.resi b/jscomp/syntax/tests/idempotency/mareo/Director.resi
deleted file mode 100644
index 62f1ee1..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Director.resi
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Initiates the main game loop */
-let update_loop: (
-  Dom_html.canvasElement,
-  (Object.collidable, list<Object.collidable>),
-  (float, float),
-) => unit
-
-/* Keydown event handler function */
-let keydown: Dom.keyboardEvent => bool
-
-/* Keyup event handler function */
-let keyup: Dom.keyboardEvent => bool
diff --git a/jscomp/syntax/tests/idempotency/mareo/Dom_html.res b/jscomp/syntax/tests/idempotency/mareo/Dom_html.res
deleted file mode 100644
index bb4e4de..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Dom_html.res
+++ /dev/null
@@ -1,38 +0,0 @@
-type imageElement
-
-type canvasRenderingContext2D
-
-type canvasElement
-
-@val external document: Dom.document = ""
-
-@val external window: Dom.window = ""
-
-/* external createImg: (_ [@bs.as "img"]) -> document -> imageElement = "createElement" [@@bs.send] */
-@send
-external createImg: (Dom.document, @as("img") _) => imageElement = "createElement"
-
-@val external requestAnimationFrame: (float => unit) => unit = ""
-
-@return(null_to_opt) @send
-external getElementById: (Dom.document, string) => option<Dom.element> = ""
-
-@send
-external addEventListener: (Dom.document, string, Dom.event_like<'a> => bool, bool) => unit = ""
-
-@send
-external addEventListenerImg: (imageElement, string, Dom.event_like<'a> => bool, bool) => unit =
-  "addEventListener"
-
-/* unsafe casts */
-external imageElementToJsObj: imageElement => {..} = "%identity"
-
-external canvasRenderingContext2DToJsObj: canvasRenderingContext2D => {..} = "%identity"
-
-external canvasElementToJsObj: canvasElement => {..} = "%identity"
-
-external keyboardEventToJsObj: Dom.keyboardEvent => {..} = "%identity"
-
-external elementToCanvasElement: Dom.element => canvasElement = "%identity"
-
-external windowToJsObj: Dom.window => {..} = "%identity"
diff --git a/jscomp/syntax/tests/idempotency/mareo/Draw.res b/jscomp/syntax/tests/idempotency/mareo/Draw.res
deleted file mode 100644
index ac1567d..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Draw.res
+++ /dev/null
@@ -1,87 +0,0 @@
-open Sprite
-
-module Html = Dom_html
-
-let render_bbox = (sprite, (posx, posy)) => {
-  let context = Dom_html.canvasRenderingContext2DToJsObj(sprite.context)
-  let (bbox, bboy) = sprite.params.bbox_offset
-  let (bbsx, bbsy) = sprite.params.bbox_size
-  context["strokeStyle"] = "#FF0000"
-  context["strokeRect"](posx +. bbox, posy +. bboy, bbsx, bbsy)
-}
-
-/* Draws a sprite onto the canvas. */
-let render = (sprite, (posx, posy)) => {
-  let context = Dom_html.canvasRenderingContext2DToJsObj(sprite.context)
-  let (sx, sy) = sprite.params.src_offset
-  let (sw, sh) = sprite.params.frame_size
-  let (dx, dy) = (posx, posy)
-  let (dw, dh) = sprite.params.frame_size
-  let sx = sx +. float_of_int(sprite.frame.contents) *. sw
-  /* print_endline (string_of_int !(sprite.frame)); */
-  /* context##clearRect(0.,0.,sw, sh); */
-  \"@@"(ignore, context["drawImage"](sprite.img, sx, sy, sw, sh, dx, dy, dw, dh))
-}
-
-/* Draws two background images, which needs to be done because of the
- *constantly changing viewport, which is always at most going to be
- *between two background images. */
-let draw_bgd = (bgd, off_x) => {
-  render(bgd, (-.off_x, 0.))
-  render(bgd, (fst(bgd.params.frame_size) -. off_x, 0.))
-}
-
-/* Used for animation updating. Canvas is cleared each frame and redrawn. */
-let clear_canvas = canvas => {
-  let canvas = Dom_html.canvasElementToJsObj(canvas)
-  let context = Dom_html.canvasRenderingContext2DToJsObj(canvas["getContext"]("2d"))
-  let cwidth = float_of_int(canvas["width"])
-  let cheight = float_of_int(canvas["height"])
-  \"@@"(ignore, context["clearRect"](0., 0., cwidth, cheight))
-}
-
-/* Displays the text for score and coins. */
-let hud = (canvas, score, coins) => {
-  let score_string = string_of_int(score)
-  let coin_string = string_of_int(coins)
-  let canvas = Dom_html.canvasElementToJsObj(canvas)
-  let context = Dom_html.canvasRenderingContext2DToJsObj(canvas["getContext"]("2d"))
-  \"@@"(ignore, context["font"] = "10px 'Press Start 2P'")
-  \"@@"(
-    ignore,
-    context["fillText"]("Score: " ++ score_string, float_of_int(canvas["width"]) -. 140., 18.),
-  )
-  \"@@"(ignore, context["fillText"]("Coins: " ++ coin_string, 120., 18.))
-}
-
-/* Displays the fps. */
-let fps = (canvas, fps_val) => {
-  let fps_str = int_of_float(fps_val) |> string_of_int
-  let canvas = Dom_html.canvasElementToJsObj(canvas)
-  let context = Dom_html.canvasRenderingContext2DToJsObj(canvas["getContext"]("2d"))
-  \"@@"(ignore, context["fillText"](fps_str, 10., 18.))
-}
-
-/* game_win displays a black screen when you finish a game. */
-let game_win = ctx => {
-  let ctx = Dom_html.canvasRenderingContext2DToJsObj(ctx)
-  \"@@"(ignore, ctx["rect"](0., 0., 512., 512.))
-  \"@@"(ignore, ctx["fillStyle"] = "black")
-  \"@@"(ignore, ctx["fill"]())
-  \"@@"(ignore, ctx["fillStyle"] = "white")
-  \"@@"(ignore, ctx["font"] = "20px 'Press Start 2P'")
-  \"@@"(ignore, ctx["fillText"]("You win!", 180., 128.))
-  failwith("Game over.")
-}
-
-/* gave_loss displays a black screen stating a loss to finish that level play. */
-let game_loss = ctx => {
-  let ctx = Dom_html.canvasRenderingContext2DToJsObj(ctx)
-  \"@@"(ignore, ctx["rect"](0., 0., 512., 512.))
-  ctx["fillStyle"] = "black"
-  \"@@"(ignore, ctx["fill"]())
-  ctx["fillStyle"] = "white"
-  ctx["font"] = "20px 'Press Start 2P'"
-  \"@@"(ignore, ctx["fillText"]("GAME OVER. You lose!", 60., 128.))
-  failwith("Game over.")
-}
diff --git a/jscomp/syntax/tests/idempotency/mareo/Draw.resi b/jscomp/syntax/tests/idempotency/mareo/Draw.resi
deleted file mode 100644
index 9e766d2..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Draw.resi
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Renders a given object on the canvas */
-let render: (Sprite.sprite, (float, float)) => unit
-
-/* Clears the canvas */
-let clear_canvas: Dom_html.canvasElement => unit
-
-/* Draw the given sprite as a background */
-let draw_bgd: (Sprite.sprite, float) => unit
-
-/* Draws the axis aligned bounding box of the sprite at the position */
-let render_bbox: (Sprite.sprite, (float, float)) => unit
-
-/* Draws the fps on the canvas */
-let fps: (Dom_html.canvasElement, float) => unit
-
-/* Draw the heads up display */
-let hud: (Dom_html.canvasElement, int, int) => unit
-
-/* Draw the game win screen */
-let game_win: Dom_html.canvasRenderingContext2D => unit
-
-/* Draw the game loss screen */
-let game_loss: Dom_html.canvasRenderingContext2D => unit
diff --git a/jscomp/syntax/tests/idempotency/mareo/Main.res b/jscomp/syntax/tests/idempotency/mareo/Main.res
deleted file mode 100644
index 2d742a7..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Main.res
+++ /dev/null
@@ -1,74 +0,0 @@
-@@bs.config({no_export: no_export})
-
-open Belt
-
-module Html = Dom_html
-
-module Pg = Procedural_generator
-
-let loadCount = ref(0)
-
-let imgsToLoad = 4
-
-let level_width = 2400.
-
-let level_height = 256.
-
-/* Canvas is chosen from the index.html file. The context is obtained from
- *the canvas. Listeners are added. A level is generated and the general
- *update_loop method is called to make the level playable. */
-let load = _ => {
-  Random.self_init()
-  let canvas_id = "canvas"
-  let canvas = switch Dom_html.getElementById(Dom_html.document, canvas_id) {
-  | None =>
-    print_endline("cant find canvas " ++ (canvas_id ++ " \n"))
-    failwith("fail")
-  | Some(el) => Dom_html.elementToCanvasElement(el)
-  }
-  let context = Dom_html.canvasElementToJsObj(canvas)["getContext"]("2d")
-  let _ = Dom_html.addEventListener(Dom_html.document, "keydown", Director.keydown, true)
-  let _ = Dom_html.addEventListener(Dom_html.document, "keyup", Director.keyup, true)
-  let () = Pg.init()
-  Director.update_loop(
-    canvas,
-    Pg.generate(level_width, level_height, context),
-    (level_width, level_height),
-  )
-}
-
-let inc_counter = _ => {
-  loadCount := loadCount.contents + 1
-  if loadCount.contents == imgsToLoad {
-    load()
-  } else {
-    ()
-  }
-}
-
-/* Used for concurrency issues. */
-let preload = _ => {
-  let root_dir = "sprites/"
-  let imgs = list{"blocks.png", "items.png", "enemies.png", "mario-small.png"}
-  List.map(imgs, img_src => {
-    let img_src = root_dir ++ img_src
-    let img = Html.createImg(Dom_html.document)
-    Dom_html.imageElementToJsObj(img)["src"] = img_src
-    ignore(
-      Dom_html.addEventListenerImg(
-        img,
-        "load",
-        _ev => {
-          inc_counter()
-          true
-        },
-        true,
-      ),
-    )
-  })
-}
-
-Dom_html.windowToJsObj(Dom_html.window)["onload"] = _ => {
-  ignore(preload())
-  true
-}
diff --git a/jscomp/syntax/tests/idempotency/mareo/Object.res b/jscomp/syntax/tests/idempotency/mareo/Object.res
deleted file mode 100644
index 41cdb58..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Object.res
+++ /dev/null
@@ -1,522 +0,0 @@
-open Belt
-
-open Actors
-
-/* Variables */
-let friction = 0.9
-
-let gravity = 0.2
-
-let max_y_vel = 4.5
-
-let player_speed = 2.8
-
-let player_jump = 5.7
-
-let player_max_jump = -6.
-
-let dampen_jump = 4.
-
-let invuln = 60
-
-type aabb = {
-  center: xy,
-  half: xy,
-}
-
-type obj_params = {
-  has_gravity: bool,
-  speed: float,
-}
-
-let id_counter = ref(min_int)
-
-type obj = {
-  params: obj_params,
-  pos: xy,
-  vel: xy,
-  id: int,
-  mutable jumping: bool,
-  mutable grounded: bool,
-  mutable dir: Actors.dir_1d,
-  mutable invuln: int,
-  mutable kill: bool,
-  mutable health: int,
-  mutable crouch: bool,
-  mutable score: int,
-}
-
-type collidable =
-  | Player(pl_typ, Sprite.sprite, obj)
-  | Enemy(enemy_typ, Sprite.sprite, obj)
-  | Item(item_typ, Sprite.sprite, obj)
-  | Block(block_typ, Sprite.sprite, obj)
-
-/* setup_obj is used to set gravity and speed, with default values true and 1. */
-let setup_obj = (~g as has_gravity=true, ~spd as speed=1., ()) => {
-  has_gravity: has_gravity,
-  speed: speed,
-}
-
-/* Sets an object's x velocity to the speed specified in its params based on
- * its direction */
-let set_vel_to_speed = obj => {
-  let speed = obj.params.speed
-  switch obj.dir {
-  | Left => obj.vel.x = -.speed
-  | Right => obj.vel.x = speed
-  }
-}
-
-/* The following make functions all set the objects' has_gravity and speed,
- * returning an [obj_params] that can be directly plugged into the [obj]
- * during creation. */
-let make_player = () => setup_obj(~spd=player_speed, ())
-
-let make_item = x =>
-  switch x {
-  | Mushroom => setup_obj()
-  | FireFlower => setup_obj()
-  | Star => setup_obj()
-  | Coin => setup_obj(~g=false, ())
-  }
-
-let make_enemy = x =>
-  switch x {
-  | Goomba => setup_obj()
-  | GKoopa => setup_obj()
-  | RKoopa => setup_obj()
-  | GKoopaShell => setup_obj(~spd=3., ())
-  | RKoopaShell => setup_obj(~spd=3., ())
-  }
-
-let make_block = x =>
-  switch x {
-  | QBlock(_) => setup_obj(~g=false, ())
-  | QBlockUsed => setup_obj(~g=false, ())
-  | Brick => setup_obj(~g=false, ())
-  | UnBBlock => setup_obj(~g=false, ())
-  | Cloud => setup_obj(~g=false, ())
-  | Panel => setup_obj(~g=false, ())
-  | Ground => setup_obj(~g=false, ())
-  }
-
-let make_type = x =>
-  switch x {
-  | SPlayer(_) => make_player()
-  | SEnemy(t) => make_enemy(t)
-  | SItem(t) => make_item(t)
-  | SBlock(t) => make_block(t)
-  }
-
-/* Used in object creation and to compare two objects. */
-let new_id = () => {
-  id_counter := id_counter.contents + 1
-  id_counter.contents
-}
-
-/* Used to return a new sprite and object of a created spawnable object */
-let make = (~id=None, ~dir=Left, spawnable, context, (posx, posy)) => {
-  let spr = Sprite.make(spawnable, dir, context)
-  let params = make_type(spawnable)
-  let id = switch id {
-  | None => new_id()
-  | Some(n) => n
-  }
-  let obj = {
-    params: params,
-    pos: {
-      x: posx,
-      y: posy,
-    },
-    vel: {
-      x: 0.0,
-      y: 0.0,
-    },
-    id: id,
-    jumping: false,
-    grounded: false,
-    dir: dir,
-    invuln: 0,
-    kill: false,
-    health: 1,
-    crouch: false,
-    score: 0,
-  }
-  (spr, obj)
-}
-
-/* spawn returns a new collidable */
-let spawn = (spawnable, context, (posx, posy)) => {
-  let (spr, obj) = make(spawnable, context, (posx, posy))
-  switch spawnable {
-  | SPlayer(typ, _) => Player(typ, spr, obj)
-  | SEnemy(t) =>
-    set_vel_to_speed(obj)
-    Enemy(t, spr, obj)
-  | SItem(t) => Item(t, spr, obj)
-  | SBlock(t) => Block(t, spr, obj)
-  }
-}
-
-/* Helper methods for getting sprites and objects from their collidables */
-let get_sprite = x =>
-  switch x {
-  | Player(_, s, _)
-  | Enemy(_, s, _)
-  | Item(_, s, _)
-  | Block(_, s, _) => s
-  }
-
-let get_obj = x =>
-  switch x {
-  | Player(_, _, o)
-  | Enemy(_, _, o)
-  | Item(_, _, o)
-  | Block(_, _, o) => o
-  }
-
-let is_player = x =>
-  switch x {
-  | Player(_, _, _) => true
-  | _ => false
-  }
-
-let is_enemy = x =>
-  switch x {
-  | Enemy(_, _, _) => true
-  | _ => false
-  }
-
-let equals = (col1, col2) => get_obj(col1).id == get_obj(col2).id
-
-/* Matches the controls being used and updates each of the player's params. */
-let update_player_keys = (player: obj, controls: controls): unit => {
-  let lr_acc = player.vel.x *. 0.2
-  switch controls {
-  | CLeft =>
-    if !player.crouch {
-      if player.vel.x > -.player.params.speed {
-        player.vel.x = player.vel.x -. (0.4 -. lr_acc)
-      }
-      player.dir = Left
-    }
-  | CRight =>
-    if !player.crouch {
-      if player.vel.x < player.params.speed {
-        player.vel.x = player.vel.x +. (0.4 +. lr_acc)
-      }
-      player.dir = Right
-    }
-  | CUp =>
-    if !player.jumping && player.grounded {
-      player.jumping = true
-      player.grounded = false
-      player.vel.y = max(
-        player.vel.y -. (player_jump +. abs_float(player.vel.x) *. 0.25),
-        player_max_jump,
-      )
-    }
-  | CDown =>
-    if !player.jumping && player.grounded {
-      player.crouch = true
-    }
-  }
-}
-
-/* Used for sprite changing. If sprites change to different dimensions as a result
- *of some action, the new sprite must be normalized so that things aren't
- *jumpy */
-let normalize_pos = (pos, p1: Sprite.sprite_params, p2: Sprite.sprite_params) => {
-  let (box1, boy1) = p1.bbox_offset
-  and (box2, boy2) = p2.bbox_offset
-  let (bw1, bh1) = p1.bbox_size
-  and (bw2, bh2) = p2.bbox_size
-  pos.x = pos.x -. (bw2 +. box2) +. (bw1 +. box1)
-  pos.y = pos.y -. (bh2 +. boy2) +. (bh1 +. boy1)
-}
-
-/* Update player is constantly being called to check for if big or small
- *Mario sprites/collidables should be used. */
-let update_player = (player, keys, context) => {
-  let prev_jumping = player.jumping
-  let prev_dir = player.dir
-  and prev_vx = abs_float(player.vel.x)
-  List.forEach(keys, update_player_keys(player))
-  let v = player.vel.x *. friction
-  let vel_damped = if abs_float(v) < 0.1 {
-    0.
-  } else {
-    v
-  }
-  player.vel.x = vel_damped
-  let pl_typ = if player.health <= 1 {
-    SmallM
-  } else {
-    BigM
-  }
-  if !prev_jumping && player.jumping {
-    Some((pl_typ, Sprite.make(SPlayer(pl_typ, Jumping), player.dir, context)))
-  } else if (
-    prev_dir != player.dir || (prev_vx == 0. && abs_float(player.vel.x) > 0. && !player.jumping)
-  ) {
-    Some((pl_typ, Sprite.make(SPlayer(pl_typ, Running), player.dir, context)))
-  } else if prev_dir != player.dir && (player.jumping && prev_jumping) {
-    Some((pl_typ, Sprite.make(SPlayer(pl_typ, Jumping), player.dir, context)))
-  } else if player.vel.y == 0. && player.crouch {
-    Some((pl_typ, Sprite.make(SPlayer(pl_typ, Crouching), player.dir, context)))
-  } else if player.vel.y == 0. && player.vel.x == 0. {
-    Some((pl_typ, Sprite.make(SPlayer(pl_typ, Standing), player.dir, context)))
-  } else {
-    None
-  }
-}
-
-/* The following two helper methods update velocity and position of the player */
-let update_vel = obj =>
-  if obj.grounded {
-    obj.vel.y = 0.
-  } else if obj.params.has_gravity {
-    obj.vel.y = min(obj.vel.y +. gravity +. abs_float(obj.vel.y) *. 0.01, max_y_vel)
-  }
-
-let update_pos = obj => {
-  obj.pos.x = obj.vel.x +. obj.pos.x
-  if obj.params.has_gravity {
-    obj.pos.y = obj.vel.y +. obj.pos.y
-  }
-}
-
-/* Calls two above helper functions to update velocity and position of player. */
-let process_obj = (obj, mapy) => {
-  update_vel(obj)
-  update_pos(obj)
-  if obj.pos.y > mapy {
-    obj.kill = true
-  }
-}
-
-/* Converts an origin based on the bottom left of the bounding box to the top
- * right of the sprite, to make it easier to place objects flush with the ground. */
-let normalize_origin = (pos, spr: Sprite.sprite) => {
-  let p = spr.params
-  let (box, boy) = p.bbox_offset
-  and (_, bh) = p.bbox_size
-  pos.x = pos.x -. box
-  pos.y = pos.y -. (boy +. bh)
-}
-
-/* Checks upon collision of block and updates the values of the object. */
-let collide_block = (~check_x=true, dir, obj) =>
-  switch dir {
-  | North => obj.vel.y = -0.001
-  | South =>
-    obj.vel.y = 0.
-    obj.grounded = true
-    obj.jumping = false
-  | East
-  | West =>
-    if check_x {
-      obj.vel.x = 0.
-    }
-  }
-
-/* Simple helper method that reverses the direction in question */
-let opposite_dir = dir =>
-  switch dir {
-  | Left => Right
-  | Right => Left
-  }
-
-/* Used for enemy-enemy collisions */
-let reverse_left_right = obj => {
-  obj.vel.x = -.obj.vel.x
-  obj.dir = opposite_dir(obj.dir)
-}
-
-/* Actually creates a new enemy and deletes the previous. The positions must be
- *normalized. This method is typically called when enemies are killed and a
- *new sprite must be used (i.e., koopa to koopa shell). */
-let evolve_enemy = (player_dir, typ, spr: Sprite.sprite, obj, context) =>
-  switch typ {
-  | GKoopa =>
-    let (new_spr, new_obj) = make(
-      ~dir=obj.dir,
-      SEnemy(GKoopaShell),
-      context,
-      (obj.pos.x, obj.pos.y),
-    )
-    normalize_pos(new_obj.pos, spr.params, new_spr.params)
-    Some(Enemy(GKoopaShell, new_spr, new_obj))
-  | RKoopa =>
-    let (new_spr, new_obj) = make(
-      ~dir=obj.dir,
-      SEnemy(RKoopaShell),
-      context,
-      (obj.pos.x, obj.pos.y),
-    )
-    normalize_pos(new_obj.pos, spr.params, new_spr.params)
-    Some(Enemy(RKoopaShell, new_spr, new_obj))
-  | GKoopaShell
-  | RKoopaShell =>
-    obj.dir = player_dir
-    if obj.vel.x != 0. {
-      obj.vel.x = 0.
-    } else {
-      set_vel_to_speed(obj)
-    }
-    None
-  | _ =>
-    obj.kill = true
-    None
-  }
-
-/* Updates the direction of the sprite. */
-let rev_dir = (o, t, s: Sprite.sprite) => {
-  reverse_left_right(o)
-  let old_params = s.params
-  Sprite.transform_enemy(t, s, o.dir)
-  normalize_pos(o.pos, old_params, s.params)
-}
-
-/* Used for killing enemies, or to make big Mario into small Mario */
-let dec_health = obj => {
-  let health = obj.health - 1
-  if health == 0 {
-    obj.kill = true
-  } else if obj.invuln == 0 {
-    obj.health = health
-  }
-}
-
-/* Used for deleting a block and replacing it with a used block */
-let evolve_block = (obj, context) => {
-  dec_health(obj)
-  let (new_spr, new_obj) = make(SBlock(QBlockUsed), context, (obj.pos.x, obj.pos.y))
-  Block(QBlockUsed, new_spr, new_obj)
-}
-
-/* Used for making a small Mario into a Big Mario */
-/* let evolve_player (spr : Sprite.sprite) obj context =
-   let (new_spr,new_obj) =
-     make (SPlayer (BigM,Standing)) context (obj.pos.x, obj.pos.y) in
-   normalize_pos new_obj.pos spr.params new_spr.params ;
-   Player(BigM,new_spr,new_obj) */
-/* Used for spawning items above question mark blocks */
-let spawn_above = (player_dir, obj, typ, context) => {
-  let item = spawn(SItem(typ), context, (obj.pos.x, obj.pos.y))
-  let item_obj = get_obj(item)
-  item_obj.pos.y = item_obj.pos.y -. snd(get_sprite(item).params.frame_size)
-  item_obj.dir = opposite_dir(player_dir)
-  set_vel_to_speed(item_obj)
-  item
-}
-
-/* Used to get the bounding box. */
-let get_aabb = obj => {
-  let spr = get_sprite(obj).params
-  let obj = get_obj(obj)
-  let (offx, offy) = spr.bbox_offset
-  let (box, boy) = (obj.pos.x +. offx, obj.pos.y +. offy)
-  let (sx, sy) = spr.bbox_size
-  {
-    center: {
-      x: box +. sx /. 2.,
-      y: boy +. sy /. 2.,
-    },
-    half: {
-      x: sx /. 2.,
-      y: sy /. 2.,
-    },
-  }
-}
-
-let col_bypass = (c1, c2) => {
-  let o1 = get_obj(c1)
-  and o2 = get_obj(c2)
-  let ctypes = switch (c1, c2) {
-  | (Item(_, _, _), Enemy(_, _, _))
-  | (Enemy(_, _, _), Item(_, _, _))
-  | (Item(_, _, _), Item(_, _, _)) => true
-  | (Player(_, _, o1), Enemy(_, _, _)) =>
-    if o1.invuln > 0 {
-      true
-    } else {
-      false
-    }
-  | _ => false
-  }
-  o1.kill || (o2.kill || ctypes)
-}
-
-/* Used for checking if collisions occur. Compares half-widths and half-heights
- *and adjusts for when collisions do occur, by changing position so that
- *a second collision does not occur again immediately. This causes snapping. */
-let check_collision = (c1, c2) => {
-  let b1 = get_aabb(c1)
-  and b2 = get_aabb(c2)
-  let o1 = get_obj(c1)
-  if col_bypass(c1, c2) {
-    None
-  } else {
-    let vx = b1.center.x -. b2.center.x
-    let vy = b1.center.y -. b2.center.y
-    let hwidths = b1.half.x +. b2.half.x
-    let hheights = b1.half.y +. b2.half.y
-    if abs_float(vx) < hwidths && abs_float(vy) < hheights {
-      let ox = hwidths -. abs_float(vx)
-      let oy = hheights -. abs_float(vy)
-      if ox >= oy {
-        if vy > 0. {
-          o1.pos.y = o1.pos.y +. oy
-          Some(North)
-        } else {
-          o1.pos.y = o1.pos.y -. oy
-          Some(South)
-        }
-      } else if vx > 0. {
-        o1.pos.x = o1.pos.x +. ox
-        Some(West)
-      } else {
-        o1.pos.x = o1.pos.x -. ox
-        Some(East)
-      }
-    } else {
-      None
-    }
-  }
-}
-
-/* "Kills" the matched object by setting certain parameters for each. */
-let kill = (collid, ctx) =>
-  switch collid {
-  | Enemy(t, _, o) =>
-    let pos = (o.pos.x, o.pos.y)
-    let score = if o.score > 0 {
-      list{Particle.make_score(o.score, pos, ctx)}
-    } else {
-      list{}
-    }
-    let remains = switch t {
-    | Goomba => list{Particle.make(GoombaSquish, pos, ctx)}
-    | _ => list{}
-    }
-    \"@"(score, remains)
-  | Block(t, _, o) =>
-    switch t {
-    | Brick =>
-      let pos = (o.pos.x, o.pos.y)
-      let p1 = Particle.make(~vel=(-5., -5.), ~acc=(0., 0.2), BrickChunkL, pos, ctx)
-      let p2 = Particle.make(~vel=(-3., -4.), ~acc=(0., 0.2), BrickChunkL, pos, ctx)
-      let p3 = Particle.make(~vel=(3., -4.), ~acc=(0., 0.2), BrickChunkR, pos, ctx)
-      let p4 = Particle.make(~vel=(5., -5.), ~acc=(0., 0.2), BrickChunkR, pos, ctx)
-      list{p1, p2, p3, p4}
-    | _ => list{}
-    }
-  | Item(t, _, o) =>
-    switch t {
-    | Mushroom => list{Particle.make_score(o.score, (o.pos.x, o.pos.y), ctx)}
-    | _ => list{}
-    }
-  | _ => list{}
-  }
diff --git a/jscomp/syntax/tests/idempotency/mareo/Object.resi b/jscomp/syntax/tests/idempotency/mareo/Object.resi
deleted file mode 100644
index 4d981e9..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Object.resi
+++ /dev/null
@@ -1,97 +0,0 @@
-open Actors
-
-open Particle
-
-let invuln: int /* # of frames of invulnerability */
-
-let dampen_jump: float /* Boost to jump when enemy jumped on */
-
-type aabb = {
-  center: xy,
-  half: xy,
-}
-
-type obj_params = {
-  has_gravity: bool,
-  speed: float,
-}
-
-type obj = {
-  params: obj_params,
-  pos: xy,
-  vel: xy,
-  id: int,
-  mutable jumping: bool,
-  mutable grounded: bool,
-  mutable dir: Actors.dir_1d,
-  mutable invuln: int,
-  mutable kill: bool,
-  mutable health: int,
-  mutable crouch: bool,
-  mutable score: int,
-}
-
-type collidable =
-  | Player(pl_typ, Sprite.sprite, obj)
-  | Enemy(enemy_typ, Sprite.sprite, obj)
-  | Item(item_typ, Sprite.sprite, obj)
-  | Block(block_typ, Sprite.sprite, obj)
-
-/* Returns the sprite associated with the object */
-let get_sprite: collidable => Sprite.sprite
-
-let get_obj: collidable => obj
-
-/* Creates a new object with a given
- * actor type on the the canvas at a given position */
-let spawn: (Actors.spawn_typ, Dom_html.canvasRenderingContext2D, (float, float)) => collidable
-
-let equals: (collidable, collidable) => bool
-
-let is_player: collidable => bool
-
-let is_enemy: collidable => bool
-
-let normalize_origin: (xy, Sprite.sprite) => unit
-
-let normalize_pos: (xy, Sprite.sprite_params, Sprite.sprite_params) => unit
-
-/* Destroys the object, returning a list of destruction effect objects */
-let kill: (collidable, Dom_html.canvasRenderingContext2D) => list<particle>
-
-let process_obj: (obj, float) => unit
-
-let update_player: (
-  obj,
-  list<Actors.controls>,
-  Dom_html.canvasRenderingContext2D,
-) => option<(pl_typ, Sprite.sprite)>
-
-/* Checks whether a collision occured between two objects, returning the
- * direction of the collision if one occurred. */
-let check_collision: (collidable, collidable) => option<Actors.dir_2d>
-
-let evolve_enemy: (
-  Actors.dir_1d,
-  Actors.enemy_typ,
-  Sprite.sprite,
-  obj,
-  Dom_html.canvasRenderingContext2D,
-) => option<collidable>
-
-let evolve_block: (obj, Dom_html.canvasRenderingContext2D) => collidable
-
-let dec_health: obj => unit
-
-let rev_dir: (obj, Actors.enemy_typ, Sprite.sprite) => unit
-
-let reverse_left_right: obj => unit
-
-let collide_block: (~check_x: bool=?, Actors.dir_2d, obj) => unit
-
-let spawn_above: (
-  Actors.dir_1d,
-  obj,
-  Actors.item_typ,
-  Dom_html.canvasRenderingContext2D,
-) => collidable
diff --git a/jscomp/syntax/tests/idempotency/mareo/Particle.res b/jscomp/syntax/tests/idempotency/mareo/Particle.res
deleted file mode 100644
index a9d0b28..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Particle.res
+++ /dev/null
@@ -1,92 +0,0 @@
-open Actors
-
-type part_params = {
-  sprite: Sprite.sprite,
-  rot: float,
-  lifetime: int,
-}
-
-type particle = {
-  params: part_params,
-  part_type: Actors.part_typ,
-  pos: Actors.xy,
-  vel: Actors.xy,
-  acc: Actors.xy,
-  mutable kill: bool,
-  mutable life: int,
-}
-
-/* Converts an x,y [pair] to an Actors.xy record */
-let pair_to_xy = pair => {x: fst(pair), y: snd(pair)}
-
-/* Function wrapper to assist in generating the template paramss for a
- * particle. */
-let make_params = (sprite, rot, lifetime) => {sprite: sprite, rot: rot, lifetime: lifetime}
-
-/* Generate the template for a specific particle type */
-let make_type = (typ, ctx) =>
-  switch typ {
-  | GoombaSquish as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-  | BrickChunkL as t => make_params(Sprite.make_particle(t, ctx), 0., 300)
-  | BrickChunkR as t => make_params(Sprite.make_particle(t, ctx), 0., 300)
-  | Score100 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-  | Score200 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-  | Score400 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-  | Score800 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-  | Score1000 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-  | Score2000 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-  | Score4000 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-  | Score8000 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-  }
-
-let make = (~vel=(0., 0.), ~acc=(0., 0.), part_type, pos, ctx) => {
-  let params = make_type(part_type, ctx)
-  let pos = pair_to_xy(pos)
-  and vel = pair_to_xy(vel)
-  and acc = pair_to_xy(acc)
-  {
-    params: params,
-    part_type: part_type,
-    pos: pos,
-    vel: vel,
-    acc: acc,
-    kill: false,
-    life: params.lifetime,
-  }
-}
-
-let make_score = (score, pos, ctx) => {
-  let t = switch score {
-  | 100 => Score100
-  | 200 => Score200
-  | 400 => Score400
-  | 800 => Score800
-  | 1000 => Score1000
-  | 2000 => Score2000
-  | 4000 => Score4000
-  | 8000 => Score8000
-  | _ => Score100
-  }
-  make(~vel=(0.5, -0.7), t, pos, ctx)
-}
-
-/* Mutably update the velocity of a particle */
-let update_vel = part => {
-  part.vel.x = part.vel.x +. part.acc.x
-  part.vel.y = part.vel.y +. part.acc.y
-}
-
-/* Mutably update the position of a particle */
-let update_pos = part => {
-  part.pos.x = part.vel.x +. part.pos.x
-  part.pos.y = part.vel.y +. part.pos.y
-}
-
-let process = part => {
-  part.life = part.life - 1
-  if part.life == 0 {
-    part.kill = true
-  }
-  update_vel(part)
-  update_pos(part)
-}
diff --git a/jscomp/syntax/tests/idempotency/mareo/Particle.resi b/jscomp/syntax/tests/idempotency/mareo/Particle.resi
deleted file mode 100644
index f2d2afc..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Particle.resi
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Template params associated with a particle */
-type part_params = {
-  sprite: Sprite.sprite /* Backing sprite */,
-  rot: float /* Rotation */,
-  lifetime: int /* Life span */,
-}
-
-type particle = {
-  params: part_params,
-  part_type: Actors.part_typ,
-  pos: Actors.xy,
-  vel: Actors.xy,
-  acc: Actors.xy,
-  mutable kill: bool /* Kill the particle in the next frame */,
-  mutable life: int /* Remaining lifespan of particle */,
-}
-
-/* Makes a new particle of the given particle type with at a position. */
-let make: (
-  ~vel: (float, float)=?,
-  ~acc: (float, float)=?,
-  Actors.part_typ,
-  (float, float),
-  Dom_html.canvasRenderingContext2D,
-) => particle
-
-/* Make a score particle. The first int indicates the score to spawn */
-let make_score: (int, (float, float), Dom_html.canvasRenderingContext2D) => particle
-
-/* Process a particle, updating its velocity and position. Also marks it as
- * killable if it exceeds its lifespan */
-let process: particle => unit
diff --git a/jscomp/syntax/tests/idempotency/mareo/Procedural_generator.res b/jscomp/syntax/tests/idempotency/mareo/Procedural_generator.res
deleted file mode 100644
index 8900b15..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Procedural_generator.res
+++ /dev/null
@@ -1,403 +0,0 @@
-open Actors
-
-open Object
-
-/* Note: Canvas is 512 by 256 (w*h) -> 32 by 16 blocks */
-/* Holds obj typ and its coordinates. (int, (x-coord, y-coord)) */
-type obj_coord = (int, (float, float))
-
-/* Checks if the given location checkloc is already part of the list of locations
- * in loclist. */
-let rec mem_loc = (checkloc: (float, float), loclist: list<obj_coord>): bool =>
-  switch loclist {
-  | list{} => false
-  | list{h, ...t} =>
-    if checkloc == snd(h) {
-      true
-    } else {
-      mem_loc(checkloc, t)
-    }
-  }
-
-/* Converts list of locations from blocksize to pixelsize by multiplying (x,y) by
- * 16. */
-let rec convert_list = (lst: list<obj_coord>): list<obj_coord> =>
-  switch lst {
-  | list{} => list{}
-  | list{h, ...t} => \"@"(list{(fst(h), (fst(snd(h)) *. 16., snd(snd(h)) *. 16.))}, convert_list(t))
-  }
-
-/* Chooses what type of enemy should be instantiated given typ number */
-let choose_enemy_typ = (typ: int): enemy_typ =>
-  switch typ {
-  | 0 => RKoopa
-  | 1 => GKoopa
-  | 2 => Goomba
-  | _ => failwith("Shouldn't reach here")
-  }
-
-/* Chooses what type of block should be instantiated given typ number */
-let choose_sblock_typ = (typ: int): block_typ =>
-  switch typ {
-  | 0 => Brick
-  | 1 => UnBBlock
-  | 2 => Cloud
-  | 3 => QBlock(Mushroom)
-  | 4 => Ground
-  | _ => failwith("Shouldn't reach here")
-  }
-
-/* Optimizes lst such that there are no two items in the list that have the same
- * coordinates. If there is one, it is removed. */
-let rec avoid_overlap = (lst: list<obj_coord>, currentLst: list<obj_coord>): list<obj_coord> =>
-  switch lst {
-  | list{} => list{}
-  | list{h, ...t} =>
-    if mem_loc(snd(h), currentLst) {
-      avoid_overlap(t, currentLst)
-    } else {
-      \"@"(list{h}, avoid_overlap(t, currentLst))
-    }
-  }
-
-/* Gets rid of objects with coordinates in the ending frame, within 128 pixels of
- * the start, at the very top, and two blocks from the ground. */
-let rec trim_edges = (lst: list<obj_coord>, blockw: float, blockh: float): list<obj_coord> =>
-  switch lst {
-  | list{} => list{}
-  | list{h, ...t} =>
-    let cx = fst(snd(h))
-    let cy = snd(snd(h))
-    let pixx = blockw *. 16.
-    let pixy = blockh *. 16.
-    if cx < 128. || (pixx -. cx < 528. || (cy == 0. || pixy -. cy < 48.)) {
-      trim_edges(t, blockw, blockh)
-    } else {
-      \"@"(list{h}, trim_edges(t, blockw, blockh))
-    }
-  }
-
-/* Generates a stair formation with block typ being dependent on typ. This type
- * of stair formation requires that the first step be on the ground. */
-let generate_ground_stairs = (cbx, cby, typ) => {
-  let four = list{
-    (typ, (cbx, cby)),
-    (typ, (cbx +. 1., cby)),
-    (typ, (cbx +. 2., cby)),
-    (typ, (cbx +. 3., cby)),
-  }
-  let three = list{
-    (typ, (cbx +. 1., cby -. 1.)),
-    (typ, (cbx +. 2., cby -. 1.)),
-    (typ, (cbx +. 3., cby -. 1.)),
-  }
-  let two = list{(typ, (cbx +. 2., cby -. 2.)), (typ, (cbx +. 3., cby -. 2.))}
-  let one = list{(typ, (cbx +. 3., cby -. 3.))}
-  \"@"(four, \"@"(three, \"@"(two, one)))
-}
-
-/* Generates a stair formation going upwards. */
-let generate_airup_stairs = (cbx, cby, typ) => {
-  let one = list{(typ, (cbx, cby)), (typ, (cbx +. 1., cby))}
-  let two = list{(typ, (cbx +. 3., cby -. 1.)), (typ, (cbx +. 4., cby -. 1.))}
-  let three = list{
-    (typ, (cbx +. 4., cby -. 2.)),
-    (typ, (cbx +. 5., cby -. 2.)),
-    (typ, (cbx +. 6., cby -. 2.)),
-  }
-  \"@"(one, \"@"(two, three))
-}
-
-/* Generates a stair formation going downwards */
-let generate_airdown_stairs = (cbx, cby, typ) => {
-  let three = list{(typ, (cbx, cby)), (typ, (cbx +. 1., cby)), (typ, (cbx +. 2., cby))}
-  let two = list{(typ, (cbx +. 2., cby +. 1.)), (typ, (cbx +. 3., cby +. 1.))}
-  let one = list{(typ, (cbx +. 5., cby +. 2.)), (typ, (cbx +. 6., cby +. 2.))}
-  \"@"(three, \"@"(two, one))
-}
-
-/* Generates a cloud block platform with some length num. */
-let rec generate_clouds = (cbx, cby, typ, num) =>
-  if num == 0 {
-    list{}
-  } else {
-    \"@"(list{(typ, (cbx, cby))}, generate_clouds(cbx +. 1., cby, typ, num - 1))
-  }
-
-/* Generates an obj_coord list (typ, coordinates) of coins to be placed. */
-let rec generate_coins = (block_coord: list<obj_coord>): list<obj_coord> => {
-  let place_coin = Random.int(2)
-  switch block_coord {
-  | list{} => list{}
-  | list{h, ...t} =>
-    if place_coin == 0 {
-      let xc = fst(snd(h))
-      let yc = snd(snd(h))
-      \"@"(list{(0, (xc, yc -. 16.))}, generate_coins(t))
-    } else {
-      generate_coins(t)
-    }
-  }
-}
-
-/* Chooses the form of the blocks to be placed.
- * When called, leaves a 1 block gap from canvas size.
- * 1. If current xblock or yblock is greater than canvas width or height
- *    respectively, return an empty list.
- * 2. If current xblock or yblock is within 10 blocks of the left and right sides
- *    of the level map, prevent any objects from being initialized.
- * 3. Else call helper methods to created block formations and return obj_coord
- *    list.
- * */
-let choose_block_pattern = (blockw: float, blockh: float, cbx: float, cby: float, prob: int): list<
-  obj_coord,
-> =>
-  if cbx > blockw || cby > blockh {
-    list{}
-  } else {
-    let block_typ = Random.int(4)
-    let stair_typ = Random.int(2)
-    let life_block_chance = Random.int(5)
-    let middle_block = if life_block_chance == 0 {
-      3
-    } else {
-      stair_typ
-    }
-    let obj_coord = switch prob {
-    | 0 =>
-      if blockw -. cbx > 2. {
-        list{
-          (stair_typ, (cbx, cby)),
-          (middle_block, (cbx +. 1., cby)),
-          (stair_typ, (cbx +. 2., cby)),
-        }
-      } else if blockw -. cbx > 1. {
-        list{(block_typ, (cbx, cby)), (block_typ, (cbx +. 1., cby))}
-      } else {
-        list{(block_typ, (cbx, cby))}
-      }
-    | 1 =>
-      let num_clouds = Random.int(5) + 5
-      if cby < 5. {
-        generate_clouds(cbx, cby, 2, num_clouds)
-      } else {
-        list{}
-      }
-    | 2 =>
-      if blockh -. cby == 1. {
-        generate_ground_stairs(cbx, cby, stair_typ)
-      } else {
-        list{}
-      }
-    | 3 =>
-      if stair_typ == 0 && blockh -. cby > 3. {
-        generate_airdown_stairs(cbx, cby, stair_typ)
-      } else if blockh -. cby > 2. {
-        generate_airup_stairs(cbx, cby, stair_typ)
-      } else {
-        list{(stair_typ, (cbx, cby))}
-      }
-    | 4 =>
-      if cby +. 3. -. blockh == 2. {
-        list{(stair_typ, (cbx, cby))}
-      } else if cby +. 3. -. blockh == 1. {
-        list{(stair_typ, (cbx, cby)), (stair_typ, (cbx, cby +. 1.))}
-      } else {
-        list{(stair_typ, (cbx, cby)), (stair_typ, (cbx, cby +. 1.)), (stair_typ, (cbx, cby +. 2.))}
-      }
-    | 5 => list{(3, (cbx, cby))}
-    | _ => failwith("Shouldn't reach here")
-    }
-    obj_coord
-  }
-
-/* Generates a list of enemies to be placed on the ground. */
-let rec generate_enemies = (
-  blockw: float,
-  blockh: float,
-  cbx: float,
-  cby: float,
-  acc: list<obj_coord>,
-) =>
-  if cbx > blockw -. 32. {
-    list{}
-  } else if cby > blockh -. 1. || cbx < 15. {
-    generate_enemies(blockw, blockh, cbx +. 1., 0., acc)
-  } else if mem_loc((cbx, cby), acc) || cby == 0. {
-    generate_enemies(blockw, blockh, cbx, cby +. 1., acc)
-  } else {
-    let prob = Random.int(30)
-    let enem_prob = 3
-    if prob < enem_prob && blockh -. 1. == cby {
-      let enemy = list{(prob, (cbx *. 16., cby *. 16.))}
-      \"@"(enemy, generate_enemies(blockw, blockh, cbx, cby +. 1., acc))
-    } else {
-      generate_enemies(blockw, blockh, cbx, cby +. 1., acc)
-    }
-  }
-
-/* Generates a list of enemies to be placed upon the block objects. */
-let rec generate_block_enemies = (block_coord: list<obj_coord>): list<obj_coord> => {
-  let place_enemy = Random.int(20)
-  let enemy_typ = Random.int(3)
-  switch block_coord {
-  | list{} => list{}
-  | list{h, ...t} =>
-    if place_enemy == 0 {
-      let xc = fst(snd(h))
-      let yc = snd(snd(h))
-      \"@"(list{(enemy_typ, (xc, yc -. 16.))}, generate_block_enemies(t))
-    } else {
-      generate_block_enemies(t)
-    }
-  }
-}
-
-/* Generates an obj_coord list (typ, coordinates) of blocks to be placed. */
-let rec generate_block_locs = (
-  blockw: float,
-  blockh: float,
-  cbx: float,
-  cby: float,
-  acc: list<obj_coord>,
-): list<obj_coord> =>
-  if blockw -. cbx < 33. {
-    acc
-  } else if cby > blockh -. 1. {
-    generate_block_locs(blockw, blockh, cbx +. 1., 0., acc)
-  } else if mem_loc((cbx, cby), acc) || cby == 0. {
-    generate_block_locs(blockw, blockh, cbx, cby +. 1., acc)
-  } else {
-    let prob = Random.int(100)
-    let block_prob = 5
-    if prob < block_prob {
-      let newacc = choose_block_pattern(blockw, blockh, cbx, cby, prob)
-      let undup_lst = avoid_overlap(newacc, acc)
-      let called_acc = \"@"(acc, undup_lst)
-      generate_block_locs(blockw, blockh, cbx, cby +. 1., called_acc)
-    } else {
-      generate_block_locs(blockw, blockh, cbx, cby +. 1., acc)
-    }
-  }
-
-/* Generates the ending item panel at the end of the level. Games ends upon
- * collision with player. */
-let generate_panel = (
-  context: Dom_html.canvasRenderingContext2D,
-  blockw: float,
-  blockh: float,
-): collidable => {
-  let ob = Object.spawn(SBlock(Panel), context, (blockw *. 16. -. 256., blockh *. 16. *. 2. /. 3.))
-  ob
-}
-
-/* Generates the list of brick locations needed to display the ground.
- * 1/10 chance that a ground block is skipped each call to create holes. */
-let rec generate_ground = (blockw: float, blockh: float, inc: float, acc: list<obj_coord>): list<
-  obj_coord,
-> =>
-  if inc > blockw {
-    acc
-  } else if inc > 10. {
-    let skip = Random.int(10)
-    let newacc = \"@"(acc, list{(4, (inc *. 16., blockh *. 16.))})
-    if skip == 7 && blockw -. inc > 32. {
-      generate_ground(blockw, blockh, inc +. 1., acc)
-    } else {
-      generate_ground(blockw, blockh, inc +. 1., newacc)
-    }
-  } else {
-    let newacc = \"@"(acc, list{(4, (inc *. 16., blockh *. 16.))})
-    generate_ground(blockw, blockh, inc +. 1., newacc)
-  }
-
-/* Converts the obj_coord list called by generate_block_locs to a list of objects
- * with the coordinates given from the obj_coord list. */
-let rec convert_to_block_obj = (
-  lst: list<obj_coord>,
-  context: Dom_html.canvasRenderingContext2D,
-): list<collidable> =>
-  switch lst {
-  | list{} => list{}
-  | list{h, ...t} =>
-    let sblock_typ = choose_sblock_typ(fst(h))
-    let ob = Object.spawn(SBlock(sblock_typ), context, snd(h))
-    \"@"(list{ob}, convert_to_block_obj(t, context))
-  }
-
-/* Converts the obj_coord list called by generate_enemies to a list of objects
- * with the coordinates given from the obj_coord list. */
-let rec convert_to_enemy_obj = (
-  lst: list<obj_coord>,
-  context: Dom_html.canvasRenderingContext2D,
-): list<collidable> =>
-  switch lst {
-  | list{} => list{}
-  | list{h, ...t} =>
-    let senemy_typ = choose_enemy_typ(fst(h))
-    let ob = Object.spawn(SEnemy(senemy_typ), context, snd(h))
-    \"@"(list{ob}, convert_to_enemy_obj(t, context))
-  }
-
-/* Converts the list of coordinates into a list of Coin objects */
-let rec convert_to_coin_obj = (
-  lst: list<obj_coord>,
-  context: Dom_html.canvasRenderingContext2D,
-): list<collidable> =>
-  switch lst {
-  | list{} => list{}
-  | list{h, ...t} =>
-    let sitem_typ = Coin
-    let ob = Object.spawn(SItem(sitem_typ), context, snd(h))
-    \"@"(list{ob}, convert_to_coin_obj(t, context))
-  }
-
-/* Procedurally generates a list of collidables given canvas width, height and
- * context. Arguments block width (blockw) and block height (blockh) are in
- * block form, not pixels. */
-let generate_helper = (
-  blockw: float,
-  blockh: float,
-  _cx: float,
-  _cy: float,
-  context: Dom_html.canvasRenderingContext2D,
-): list<collidable> => {
-  let block_locs = generate_block_locs(blockw, blockh, 0., 0., list{})
-  let converted_block_locs = trim_edges(convert_list(block_locs), blockw, blockh)
-  let obj_converted_block_locs = convert_to_block_obj(converted_block_locs, context)
-  let ground_blocks = generate_ground(blockw, blockh, 0., list{})
-  let obj_converted_ground_blocks = convert_to_block_obj(ground_blocks, context)
-  let block_locations = \"@"(block_locs, ground_blocks)
-  let all_blocks = \"@"(obj_converted_block_locs, obj_converted_ground_blocks)
-  let enemy_locs = generate_enemies(blockw, blockh, 0., 0., block_locations)
-  let obj_converted_enemies = convert_to_enemy_obj(enemy_locs, context)
-  let coin_locs = generate_coins(converted_block_locs)
-  let undup_coin_locs = trim_edges(avoid_overlap(coin_locs, converted_block_locs), blockw, blockh)
-  let converted_block_coin_locs = \"@"(converted_block_locs, coin_locs)
-  let enemy_block_locs = generate_block_enemies(converted_block_locs)
-  let undup_enemy_block_locs = avoid_overlap(enemy_block_locs, converted_block_coin_locs)
-  let obj_enemy_blocks = convert_to_enemy_obj(undup_enemy_block_locs, context)
-  let coin_objects = convert_to_coin_obj(undup_coin_locs, context)
-  let obj_panel = generate_panel(context, blockw, blockh)
-  \"@"(
-    all_blocks,
-    \"@"(obj_converted_enemies, \"@"(coin_objects, \"@"(obj_enemy_blocks, list{obj_panel}))),
-  )
-}
-
-/* Main function called to procedurally generate the level map. w and h args
- * are in pixel form. Converts to block form to call generate_helper. Spawns
- * the list of collidables received from generate_helper to display on canvas. */
-let generate = (w: float, h: float, context: Dom_html.canvasRenderingContext2D): (
-  collidable,
-  list<collidable>,
-) => {
-  let blockw = w /. 16.
-  let blockh = h /. 16. -. 1.
-  let collide_list = generate_helper(blockw, blockh, 0., 0., context)
-  let player = Object.spawn(SPlayer(SmallM, Standing), context, (100., 224.))
-  (player, collide_list)
-}
-
-/* Makes sure level map is uniquely generated at each call. */
-let init = () => Random.self_init()
diff --git a/jscomp/syntax/tests/idempotency/mareo/Procedural_generator.resi b/jscomp/syntax/tests/idempotency/mareo/Procedural_generator.resi
deleted file mode 100644
index f9747ed..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Procedural_generator.resi
+++ /dev/null
@@ -1,8 +0,0 @@
-open Object
-
-type obj_coord
-
-let init: unit => unit
-
-/* Procedurally generates a new map of default size */
-let generate: (float, float, Dom_html.canvasRenderingContext2D) => (collidable, list<collidable>)
diff --git a/jscomp/syntax/tests/idempotency/mareo/Sprite.res b/jscomp/syntax/tests/idempotency/mareo/Sprite.res
deleted file mode 100644
index 2c97fc0..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Sprite.res
+++ /dev/null
@@ -1,362 +0,0 @@
-open Actors
-
-type xy = (float, float)
-
-type sprite_params = {
-  max_frames: int,
-  max_ticks: int,
-  img_src: string,
-  frame_size: xy,
-  src_offset: xy,
-  bbox_offset: xy,
-  bbox_size: xy,
-  loop: bool,
-}
-
-type sprite = {
-  mutable params: sprite_params,
-  context: Dom_html.canvasRenderingContext2D,
-  frame: ref<int>,
-  ticks: ref<int>,
-  mutable img: Dom_html.imageElement,
-}
-
-/* setup_sprite is used to initialize a sprite. */
-let setup_sprite = (
-  ~loop=true,
-  ~bb_off as bbox_offset=(0., 0.),
-  ~bb_sz as bbox_size=(0., 0.),
-  img_src,
-  max_frames,
-  max_ticks,
-  frame_size,
-  src_offset,
-) => {
-  let bbox_size = if bbox_size == (0., 0.) {
-    frame_size
-  } else {
-    bbox_size
-  }
-  let img_src = "./sprites/" ++ img_src
-  {
-    img_src: img_src,
-    max_frames: max_frames,
-    max_ticks: max_ticks,
-    frame_size: frame_size,
-    src_offset: src_offset,
-    bbox_offset: bbox_offset,
-    bbox_size: bbox_size,
-    loop: loop,
-  }
-}
-
-/* The following functions are used in order to define sprite animations
- *from their sprite sheets. Also creates bounding boxes if necessary. */
-/* Sets sprite for small mario. */
-let make_small_player = ((typ, dir)) =>
-  switch dir {
-  /* 16x16 grid with 0x0 offset */
-  | Left =>
-    switch typ {
-    | Standing =>
-      setup_sprite(
-        "mario-small.png",
-        ~bb_off=(3., 1.),
-        ~bb_sz=(11., 15.),
-        1,
-        0,
-        (16., 16.),
-        (0., 0.),
-      )
-    | Jumping =>
-      setup_sprite(
-        "mario-small.png",
-        ~bb_off=(2., 1.),
-        ~bb_sz=(13., 15.),
-        2,
-        10,
-        (16., 16.),
-        (16., 16.),
-      )
-    | Running =>
-      setup_sprite(
-        "mario-small.png",
-        ~bb_off=(2., 1.),
-        ~bb_sz=(12., 15.),
-        3,
-        5,
-        (16., 16.),
-        (16., 0.),
-      )
-    | Crouching =>
-      setup_sprite(
-        "mario-small.png",
-        ~bb_off=(1., 5.),
-        ~bb_sz=(14., 10.),
-        1,
-        0,
-        (16., 16.),
-        (0., 64.),
-      )
-    }
-  | Right =>
-    switch typ {
-    | Standing =>
-      setup_sprite(
-        "mario-small.png",
-        ~bb_off=(1., 1.),
-        ~bb_sz=(11., 15.),
-        1,
-        0,
-        (16., 16.),
-        (0., 32.),
-      )
-    | Jumping =>
-      setup_sprite(
-        "mario-small.png",
-        ~bb_off=(2., 1.),
-        ~bb_sz=(13., 15.),
-        2,
-        10,
-        (16., 16.),
-        (16., 48.),
-      )
-    | Running =>
-      setup_sprite(
-        "mario-small.png",
-        ~bb_off=(2., 1.),
-        ~bb_sz=(12., 15.),
-        3,
-        5,
-        (16., 16.),
-        (16., 32.),
-      )
-    | Crouching =>
-      setup_sprite(
-        "mario-small.png",
-        ~bb_off=(1., 5.),
-        ~bb_sz=(14., 10.),
-        1,
-        0,
-        (16., 16.),
-        (0., 64.),
-      )
-    }
-  }
-
-/* Sets sprite for big mario. */
-let make_big_player = ((typ, dir)) =>
-  switch dir {
-  | Left =>
-    switch typ {
-    | Standing =>
-      setup_sprite(
-        "mario-big.png",
-        1,
-        0,
-        ~bb_off=(2., 1.),
-        ~bb_sz=(13., 25.),
-        (16., 27.),
-        (16., 5.),
-      )
-    | Jumping =>
-      setup_sprite(
-        "mario-big.png",
-        1,
-        0,
-        ~bb_off=(2., 1.),
-        ~bb_sz=(12., 25.),
-        (16., 26.),
-        (48., 6.),
-      )
-    | Running =>
-      setup_sprite(
-        "mario-big.png",
-        4,
-        10,
-        ~bb_off=(2., 1.),
-        ~bb_sz=(13., 25.),
-        (16., 27.),
-        (0., 37.),
-      )
-    | Crouching =>
-      setup_sprite(
-        "mario-big.png",
-        1,
-        0,
-        ~bb_off=(2., 10.),
-        ~bb_sz=(13., 17.),
-        (16., 27.),
-        (32., 5.),
-      )
-    }
-  | Right =>
-    switch typ {
-    | Standing =>
-      setup_sprite(
-        "mario-big.png",
-        1,
-        0,
-        ~bb_off=(1., 1.),
-        ~bb_sz=(13., 25.),
-        (16., 26.),
-        (16., 69.),
-      )
-    | Jumping =>
-      setup_sprite(
-        "mario-big.png",
-        1,
-        0,
-        ~bb_off=(2., 1.),
-        ~bb_sz=(12., 25.),
-        (16., 26.),
-        (48., 70.),
-      )
-    | Running =>
-      setup_sprite(
-        "mario-big.png",
-        4,
-        10,
-        ~bb_off=(2., 1.),
-        ~bb_sz=(13., 25.),
-        (16., 27.),
-        (0., 101.),
-      )
-    | Crouching =>
-      setup_sprite(
-        "mario-big.png",
-        1,
-        0,
-        ~bb_off=(2., 10.),
-        ~bb_sz=(13., 17.),
-        (16., 27.),
-        (32., 69.),
-      )
-    }
-  }
-
-/* Sets sprites for enemies: Goomba, Red Koopa, Green Koopa. */
-let make_enemy = ((typ, dir)) =>
-  switch (typ, dir) {
-  | (Goomba, _) =>
-    setup_sprite("enemies.png", ~bb_off=(1., 1.), ~bb_sz=(14., 14.), 2, 10, (16., 16.), (0., 128.))
-  | (GKoopa, Left) =>
-    setup_sprite("enemies.png", ~bb_off=(4., 10.), ~bb_sz=(11., 16.), 2, 10, (16., 27.), (0., 69.))
-  | (GKoopa, Right) =>
-    setup_sprite("enemies.png", ~bb_off=(1., 10.), ~bb_sz=(11., 16.), 2, 10, (16., 27.), (32., 69.))
-  | (RKoopa, Left) =>
-    setup_sprite("enemies.png", ~bb_off=(4., 10.), ~bb_sz=(11., 16.), 2, 10, (16., 27.), (0., 5.))
-  | (RKoopa, Right) =>
-    setup_sprite("enemies.png", ~bb_off=(1., 10.), ~bb_sz=(11., 16.), 2, 10, (16., 27.), (32., 5.))
-  | (GKoopaShell, _) =>
-    setup_sprite("enemies.png", ~bb_off=(2., 2.), ~bb_sz=(12., 13.), 4, 10, (16., 16.), (0., 96.))
-  | (RKoopaShell, _) =>
-    setup_sprite("enemies.png", ~bb_off=(2., 2.), ~bb_sz=(12., 13.), 4, 10, (16., 16.), (0., 32.))
-  }
-
-/* Sets sprites for items: coin, fireflower, mushroom, star. */
-let make_item = x =>
-  /* 16x16 grid with 0x0 offset */
-  switch x {
-  | Coin =>
-    setup_sprite("items.png", ~bb_off=(3., 0.), ~bb_sz=(12., 16.), 3, 15, (16., 16.), (0., 80.))
-  | FireFlower => setup_sprite("items.png", 1, 0, (16., 16.), (0., 188.))
-  | Mushroom =>
-    setup_sprite("items.png", ~bb_off=(2., 0.), ~bb_sz=(12., 16.), 1, 0, (16., 16.), (0., 0.))
-  | Star => setup_sprite("items.png", 1, 0, (16., 16.), (16., 48.))
-  }
-
-/* Sets sprites for blocks: brick, question block, unbreakable block, cloud block
- * panel block, ground block. */
-let make_block = x =>
-  /* 16x16 grid with 0x0 offset */
-  switch x {
-  | Brick => setup_sprite("blocks.png", 5, 10, (16., 16.), (0., 0.))
-  | QBlock(_) => setup_sprite("blocks.png", 4, 15, (16., 16.), (0., 16.))
-  | QBlockUsed => setup_sprite("blocks.png", 1, 0, (16., 16.), (0., 32.))
-  | UnBBlock => setup_sprite("blocks.png", 1, 0, (16., 16.), (0., 48.))
-  | Cloud => setup_sprite("blocks.png", 1, 0, (16., 16.), (0., 64.))
-  | Panel => setup_sprite("panel.png", 3, 15, (26., 26.), (0., 0.))
-  | Ground => setup_sprite("ground.png", 1, 0, (16., 16.), (0., 32.))
-  }
-
-/* Sets sprites for particles, squished goomba, brick chunks (upon destruction
- * of brick), score text. */
-let make_particle = x =>
-  switch x {
-  | GoombaSquish => setup_sprite("enemies.png", 1, 0, (16., 16.), (0., 144.))
-  | BrickChunkL => setup_sprite("chunks.png", 1, 0, (8., 8.), (0., 0.))
-  | BrickChunkR => setup_sprite("chunks.png", 1, 0, (8., 8.), (8., 0.))
-  | Score100 => setup_sprite("score.png", 1, 0, (12., 8.), (0., 0.))
-  | Score200 => setup_sprite("score.png", 1, 0, (12., 9.), (0., 9.))
-  | Score400 => setup_sprite("score.png", 1, 0, (12., 9.), (0., 18.))
-  | Score800 => setup_sprite("score.png", 1, 0, (12., 9.), (0., 27.))
-  | Score1000 => setup_sprite("score.png", 1, 0, (14., 9.), (13., 0.))
-  | Score2000 => setup_sprite("score.png", 1, 0, (14., 9.), (13., 9.))
-  | Score4000 => setup_sprite("score.png", 1, 0, (14., 9.), (13., 18.))
-  | Score8000 => setup_sprite("score.png", 1, 0, (14., 9.), (13., 27.))
-  }
-
-/* Calls to set sprite for either big or small mario. */
-let make_player = (pt, spr_type) =>
-  switch pt {
-  | BigM => make_big_player(spr_type)
-  | SmallM => make_small_player(spr_type)
-  }
-
-/* Calls to set sprites for each type of object. */
-let make_type = (typ, dir: Actors.dir_1d) =>
-  switch typ {
-  | SPlayer(pt, st) => make_player(pt, (st, dir))
-  | SEnemy(t) => make_enemy((t, dir))
-  | SItem(t) => make_item(t)
-  | SBlock(t) => make_block(t)
-  }
-
-/* Makes a sprite from provided [params]. */
-let make_from_params = (params, context) => {
-  let img = Dom_html.createImg(Dom_html.document)
-  Dom_html.imageElementToJsObj(img)["src"] = params.img_src
-  {params: params, context: context, img: img, frame: ref(0), ticks: ref(0)}
-}
-
-/* Make is the wrapper function to cycle through sprite animations */
-let make = (spawn, dir, context) => {
-  let params = make_type(spawn, dir)
-  make_from_params(params, context)
-}
-
-/* Make a background */
-let make_bgd = context => {
-  let params = setup_sprite("bgd-1.png", 1, 0, (512., 256.), (0., 0.))
-  make_from_params(params, context)
-}
-
-/* Make a particle from the given particle type */
-let make_particle = (ptyp, context) => {
-  let params = make_particle(ptyp)
-  make_from_params(params, context)
-}
-
-/* Transform_enemy is used in order to switch the direction an enemy faces. */
-let transform_enemy = (enemy_typ, spr, dir) => {
-  let params = make_enemy((enemy_typ, dir))
-  let img = Dom_html.createImg(Dom_html.document)
-  Dom_html.imageElementToJsObj(img)["src"] = params.img_src
-  spr.params = params
-  spr.img = img
-}
-
-/* update_animation is the main method to cycle through sprite animations */
-let update_animation = (spr: sprite) => {
-  /* Only advance frame when ticked */
-  let curr_ticks = spr.ticks.contents
-  if curr_ticks >= spr.params.max_ticks {
-    spr.ticks := 0
-    if spr.params.loop {
-      spr.frame := mod(spr.frame.contents + 1, spr.params.max_frames)
-    }
-  } else {
-    spr.ticks := curr_ticks + 1
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/mareo/Sprite.resi b/jscomp/syntax/tests/idempotency/mareo/Sprite.resi
deleted file mode 100644
index 8082be5..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Sprite.resi
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Represents an xy vector */
-type xy = (float, float) /* x, y */
-
-/* Inherent sprite parameters from which to create the sprite */
-type sprite_params = {
-  max_frames: int,
-  max_ticks: int,
-  img_src: string,
-  frame_size: xy,
-  src_offset: xy,
-  bbox_offset: xy,
-  bbox_size: xy,
-  loop: bool,
-}
-
-/* Concrete sprite created to visually represent an object */
-type sprite = {
-  mutable params: sprite_params,
-  context: Dom_html.canvasRenderingContext2D,
-  frame: ref<int>,
-  ticks: ref<int>,
-  mutable img: Dom_html.imageElement,
-}
-
-/* Sets up a sprite to create */
-let setup_sprite: (
-  ~loop: bool=?,
-  ~bb_off: (float, float)=?,
-  ~bb_sz: (float, float)=?,
-  string,
-  int,
-  int,
-  xy,
-  xy,
-) => sprite_params
-
-/* Creates a sprite given the actor type */
-let make: (Actors.spawn_typ, Actors.dir_1d, Dom_html.canvasRenderingContext2D) => sprite
-
-/* Make a background */
-let make_bgd: Dom_html.canvasRenderingContext2D => sprite
-
-/* Make a particle corresponding to the given type */
-let make_particle: (Actors.part_typ, Dom_html.canvasRenderingContext2D) => sprite
-
-/* Transform an enemy sprite based on direction */
-let transform_enemy: (Actors.enemy_typ, sprite, Actors.dir_1d) => unit
-
-/* Updates the sprite's animation */
-let update_animation: sprite => unit
diff --git a/jscomp/syntax/tests/idempotency/mareo/Viewport.res b/jscomp/syntax/tests/idempotency/mareo/Viewport.res
deleted file mode 100644
index c8f48bf..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Viewport.res
+++ /dev/null
@@ -1,63 +0,0 @@
-open Actors
-
-type viewport = {
-  pos: Actors.xy,
-  v_dim: Actors.xy,
-  m_dim: Actors.xy,
-}
-
-let make = ((vx, vy), (mx, my)) => {
-  pos: {
-    x: 0.,
-    y: 0.,
-  },
-  v_dim: {
-    x: vx,
-    y: vy,
-  },
-  m_dim: {
-    x: mx,
-    y: my,
-  },
-}
-
-/* Calculates the viewport origin coordinate given the centering coordinate
- * [cc], the canvas coordinate [vc], and the map coordinate [mc]. This function
- * works for both x and y. At the extreme points, it will ensure that the
- * viewport is always within bounds of the map, even if it is no longer
- * centered about the origin point. */
-let calc_viewport_point = (cc, vc, mc) => {
-  let vc_half = vc /. 2.
-  min(max(cc -. vc_half, 0.), min(mc -. vc, abs_float(cc -. vc_half)))
-}
-
-/* Returns whether a coordinate pair [pos] is inside the viewport [v] */
-let in_viewport = (v, pos) => {
-  let margin = 32.
-  let (v_min_x, v_max_x) = (v.pos.x -. margin, v.pos.x +. v.v_dim.x)
-  let (v_min_y, v_max_y) = (v.pos.y -. margin, v.pos.y +. v.v_dim.y)
-  let (x, y) = (pos.x, pos.y)
-  x >= v_min_x && (x <= v_max_x && (y >= v_min_y && y <= v_max_y))
-}
-
-/* Returns whether an object is outside of the viewport and below it. This is
- * useful for determining whether to process falling out of screen normally. */
-let out_of_viewport_below = (v, y) => {
-  let v_max_y = v.pos.y +. v.v_dim.y
-  y >= v_max_y
-}
-
-/* Converts a x,y [coord] pair in absolute coordinates to coordinates relative
- * to the viewport */
-let coord_to_viewport = (viewport, coord) => {
-  x: coord.x -. viewport.pos.x,
-  y: coord.y -. viewport.pos.y,
-}
-
-/* Update the viewport [vpt] given the new center x,y coordinate pair [ctr] */
-let update = (vpt, ctr) => {
-  let new_x = calc_viewport_point(ctr.x, vpt.v_dim.x, vpt.m_dim.x)
-  let new_y = calc_viewport_point(ctr.y, vpt.v_dim.y, vpt.m_dim.y)
-  let pos = {x: new_x, y: new_y}
-  {...vpt, pos: pos}
-}
diff --git a/jscomp/syntax/tests/idempotency/mareo/Viewport.resi b/jscomp/syntax/tests/idempotency/mareo/Viewport.resi
deleted file mode 100644
index 61c3b0e..0000000
--- a/jscomp/syntax/tests/idempotency/mareo/Viewport.resi
+++ /dev/null
@@ -1,23 +0,0 @@
-type viewport = {
-  pos: Actors.xy /* Absolute position of viewport relative to map */,
-  v_dim: Actors.xy /* Dimensions of viewport */,
-  m_dim: Actors.xy /* Dimensions of map */,
-}
-
-/* Makes a new viewport of viewport dimensions and map dimensions */
-let make: ((float, float), (float, float)) => viewport
-
-/* Calculates the viewport origin point */
-let calc_viewport_point: (float, float, float) => float
-
-/* Whether the supplied position is outside of the viewport */
-let in_viewport: (viewport, Actors.xy) => bool
-
-/* Whether the supplied position is below the viewport */
-let out_of_viewport_below: (viewport, float) => bool
-
-/* Converts absolute coordinates to viewport coodinates */
-let coord_to_viewport: (viewport, Actors.xy) => Actors.xy
-
-/* Update the viewport */
-let update: (viewport, Actors.xy) => viewport
diff --git a/jscomp/syntax/tests/idempotency/napkinscript/docComments.res b/jscomp/syntax/tests/idempotency/napkinscript/docComments.res
deleted file mode 100644
index ace1c4a..0000000
--- a/jscomp/syntax/tests/idempotency/napkinscript/docComments.res
+++ /dev/null
@@ -1,11 +0,0 @@
-/** This is a doc ✅ comment */
-let z = 34
-
-@res.doc("And this is a res.doc ✅ annotation")
-let q = 11
-
-/** This
-  * is a multi-line
-  multiline doc comment
-  */
-type h = int
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/API.res b/jscomp/syntax/tests/idempotency/nook-exchange/API.res
deleted file mode 100644
index 7c90c8e..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/API.res
+++ /dev/null
@@ -1,518 +0,0 @@
-let makeAuthenticatedPostRequest = (~url, ~bodyJson, ~sessionId) =>
-  Fetch.fetchWithInit(
-    url,
-    Fetch.RequestInit.make(
-      ~method_=Post,
-      ~body=Fetch.BodyInit.make(Js.Json.stringify(Json.Encode.object_(bodyJson))),
-      ~headers=Fetch.HeadersInit.make({
-        "X-Client-Version": Constants.gitCommitRef,
-        "Content-Type": "application/json",
-        "Authorization": "Bearer " ++ Belt.Option.getWithDefault(sessionId, ""),
-      }),
-      ~credentials=Include,
-      ~mode=CORS,
-      (),
-    ),
-  )
-
-let setItemStatus = (~userId, ~sessionId, ~itemId, ~variant, ~status) =>
-  %Repromise.Js({
-    let responseResult = makeAuthenticatedPostRequest(
-      ~url=Constants.apiUrl ++
-      ("/@me/items/" ++
-      (string_of_int(itemId) ++ ("/" ++ (string_of_int(variant) ++ "/status")))),
-      ~bodyJson=list{
-        ("status", Json.Encode.int(User.itemStatusToJs(status))),
-        ("userId", Json.Encode.string(userId)),
-      },
-      ~sessionId,
-    )
-    Promise.resolved(responseResult)
-  })
-
-let setItemStatusBatch = (~sessionId, ~items: array<(int, int)>, ~status) => {
-  let url = Constants.apiUrl ++ "/@me/items/batch/status"
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Post,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify({
-            open Json.Encode
-            object_(list{
-              ("items", array(tuple2(int, int), items)),
-              ("status", int(User.itemStatusToJs(status))),
-            })
-          }),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-}
-
-let setItemNote = (~userId, ~sessionId, ~itemId, ~variant, ~note) =>
-  %Repromise.Js({
-    let responseResult = makeAuthenticatedPostRequest(
-      ~url=Constants.apiUrl ++
-      ("/@me/items/" ++
-      (string_of_int(itemId) ++ ("/" ++ (string_of_int(variant) ++ "/note")))),
-      ~bodyJson=list{("note", Json.Encode.string(note)), ("userId", Json.Encode.string(userId))},
-      ~sessionId,
-    )
-    Promise.resolved(responseResult)
-  })
-
-let setItemPriority = (~sessionId, ~itemId, ~variant, ~isPriority) =>
-  %Repromise.Js({
-    let responseResult = makeAuthenticatedPostRequest(
-      ~url=Constants.apiUrl ++
-      ("/@me/items/" ++
-      (string_of_int(itemId) ++ ("/" ++ (string_of_int(variant) ++ "/priority")))),
-      ~bodyJson=list{("isPriority", Json.Encode.bool(isPriority))},
-      ~sessionId,
-    )
-    Promise.resolved(responseResult)
-  })
-
-let importItems = (~sessionId, ~updates: array<((int, int), User.itemStatus)>) =>
-  %Repromise.Js({
-    let responseResult = makeAuthenticatedPostRequest(
-      ~url=Constants.apiUrl ++ "/@me/items/import",
-      ~bodyJson=list{
-        (
-          "updates",
-          updates |> {
-            open Json.Encode
-            array((((itemId, variant), status)) =>
-              tuple3(int, int, int, (itemId, variant, User.itemStatusToJs(status)))
-            )
-          },
-        ),
-      },
-      ~sessionId,
-    )
-    Promise.resolved(responseResult)
-  })
-
-let removeItem = (~userId, ~sessionId, ~itemId, ~variant) => {
-  let url =
-    Constants.apiUrl ++
-    ("/@me/items/" ++
-    (string_of_int(itemId) ++ ("/" ++ string_of_int(variant))))
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Delete,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify(Json.Encode.object_(list{("userId", Json.Encode.string(userId))})),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ Belt.Option.getWithDefault(sessionId, ""),
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-}
-
-let removeItems = (~sessionId, ~items: array<(int, int)>) => {
-  let url = Constants.apiUrl ++ "/@me/items/batch"
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Delete,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify({
-            open Json.Encode
-            object_(list{("items", array(tuple2(int, int), items))})
-          }),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-}
-
-let updateProfileText = (~userId, ~sessionId, ~profileText) =>
-  %Repromise.Js({
-    let responseResult = makeAuthenticatedPostRequest(
-      ~url=Constants.apiUrl ++ "/@me/profileText",
-      ~bodyJson=list{
-        ("text", Json.Encode.string(profileText)),
-        ("userId", Json.Encode.string(userId)),
-      },
-      ~sessionId,
-    )
-    Promise.resolved(responseResult)
-  })
-
-let updateSetting = (~userId, ~sessionId, ~settingKey, ~settingValue) => {
-  let url = Constants.apiUrl ++ "/@me/settings"
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Patch,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify(
-            Json.Encode.object_(list{
-              ("key", Json.Encode.string(settingKey)),
-              ("value", settingValue),
-              ("userId", Json.Encode.string(userId)),
-            }),
-          ),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ Belt.Option.getWithDefault(sessionId, ""),
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-}
-
-let patchMe = (~userId, ~sessionId, ~username, ~newPassword, ~email, ~oldPassword) => {
-  open Belt
-  let url = Constants.apiUrl ++ "/@me"
-  %Repromise.JsExn({
-    let response = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Patch,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify(
-            Js.Json.object_(
-              Js.Dict.fromArray(
-                Array.keepMap(
-                  [
-                    Option.map(username, username => ("username", Js.Json.string(username))),
-                    Option.map(newPassword, newPassword => (
-                      "password",
-                      Js.Json.string(newPassword),
-                    )),
-                    Option.map(email, email => ("email", Js.Json.string(email))),
-                    Option.map(oldPassword, oldPassword => (
-                      "oldPassword",
-                      Js.Json.string(oldPassword),
-                    )),
-                  ],
-                  x => x,
-                ),
-              ),
-            ),
-          ),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ Belt.Option.getWithDefault(sessionId, ""),
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(response)
-  })
-}
-
-let getUserLists = (~sessionId) => {
-  let url = Constants.apiUrl ++ "/@me/item-lists"
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Get,
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-}
-
-let createItemList = (~sessionId, ~items: array<(int, int)>) => {
-  let url = Constants.apiUrl ++ "/item-lists"
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Post,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify({
-            open Json.Encode
-            object_(list{("items", array(tuple2(int, int), items))})
-          }),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ Belt.Option.getWithDefault(sessionId, ""),
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-}
-
-let cloneItemList = (~sessionId, ~listId) => {
-  let url = Constants.apiUrl ++ ("/item-lists/" ++ (listId ++ "/clone"))
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Post,
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-}
-
-let updateItemList = (~sessionId, ~listId, ~title=?, ~items: option<array<(int, int)>>=?, ()) => {
-  let url = Constants.apiUrl ++ ("/item-lists/" ++ listId)
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Patch,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify({
-            open Json.Encode
-            object_(
-              Belt.List.keepMap(
-                list{
-                  title->Belt.Option.map(title => ("title", string(title))),
-                  items->Belt.Option.map(items => ("items", array(tuple2(int, int), items))),
-                },
-                x => x,
-              ),
-            )
-          }),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-}
-
-let deleteItemList = (~sessionId, ~listId) => {
-  let url = Constants.apiUrl ++ ("/item-lists/" ++ listId)
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Delete,
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-}
-
-let getItemList = (~listId: string) => {
-  let url = Constants.apiUrl ++ ("/item-lists/" ++ listId)
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      url,
-      Fetch.RequestInit.make(
-        ~method_=Get,
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-        }),
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-}
-
-let followUser = (~userId, ~sessionId) =>
-  %Repromise.JsExn({
-    let response = Fetch.fetchWithInit(
-      Constants.apiUrl ++ ("/@me/follow/" ++ userId),
-      Fetch.RequestInit.make(
-        ~method_=Post,
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    if Fetch.Response.status(response) < 300 {
-      Promise.resolved(Ok())
-    } else {
-      %Repromise.JsExn({
-        let text = Fetch.Response.text(response)
-        Promise.resolved(Error(text))
-      })
-    }
-  })
-
-let unfollowUser = (~userId, ~sessionId) =>
-  %Repromise.JsExn({
-    let response = Fetch.fetchWithInit(
-      Constants.apiUrl ++ ("/@me/unfollow/" ++ userId),
-      Fetch.RequestInit.make(
-        ~method_=Post,
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    if Fetch.Response.status(response) < 300 {
-      Promise.resolved(Ok())
-    } else {
-      %Repromise.JsExn({
-        let text = Fetch.Response.text(response)
-        Promise.resolved(Error(text))
-      })
-    }
-  })
-
-let getFolloweesItem = (~sessionId, ~itemId) =>
-  %Repromise.JsExn({
-    let response = Fetch.fetchWithInit(
-      Constants.apiUrl ++ ("/@me/followees/items/" ++ string_of_int(itemId)),
-      Fetch.RequestInit.make(
-        ~method_=Get,
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(response)
-  })
-
-let connectDiscordAccount = (~sessionId, ~code) =>
-  %Repromise.JsExn({
-    let response = Fetch.fetchWithInit(
-      Constants.apiUrl ++ "/@me/discord",
-      Fetch.RequestInit.make(
-        ~method_=Post,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify(Json.Encode.object_(list{("code", Js.Json.string(code))})),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(response)
-  })
-
-let removeAllItems = (~sessionId) =>
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      Constants.apiUrl ++ "/@me/items/all",
-      Fetch.RequestInit.make(
-        ~method_=Delete,
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
-
-let deleteAccount = (~sessionId, ~userId) =>
-  %Repromise.Js({
-    let responseResult = Fetch.fetchWithInit(
-      Constants.apiUrl ++ ("/@me/" ++ userId),
-      Fetch.RequestInit.make(
-        ~method_=Delete,
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-          "Authorization": "Bearer " ++ sessionId,
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved(responseResult)
-  })
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Analytics.res b/jscomp/syntax/tests/idempotency/nook-exchange/Analytics.res
deleted file mode 100644
index b0e1048..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Analytics.res
+++ /dev/null
@@ -1,69 +0,0 @@
-module Amplitude = {
-  module API = {
-    type t
-
-    @module("amplitude-js")
-    external getInstance: unit => t = "getInstance"
-
-    @send external init: (t, string) => unit = "init"
-    @send external logEvent: (t, string) => unit = "logEvent"
-    @send
-    external logEventWithProperties: (t, string, 'a) => unit = "logEvent"
-    @send external setUserId: (t, option<string>) => unit = "setUserId"
-    @send external setVersionName: (t, string) => unit = "setVersionName"
-
-    type identify
-    @module("amplitude-js") @new
-    external getIdentify: unit => identify = "Identify"
-    @send
-    external identifySet: (identify, string, string) => identify = "set"
-    @send
-    external identifySetInt: (identify, string, int) => identify = "set"
-    @send
-    external identifyAppend: (identify, string, string) => identify = "append"
-
-    @send external identify: (t, identify) => unit = "identify"
-  }
-
-  let instanceRef = ref(None)
-  let getInstance = () =>
-    switch instanceRef.contents {
-    | Some(instance) => instance
-    | None =>
-      let instance = API.getInstance()
-      instance->API.init(Constants.amplitudeApiKey)
-      instanceRef := Some(instance)
-      instance
-    }
-
-  let init = () => getInstance()->API.setVersionName(Constants.gitCommitRef)
-
-  let logEvent = (~eventName) => getInstance()->API.logEvent(eventName)
-
-  let logEventWithProperties = (~eventName, ~eventProperties) =>
-    getInstance()->API.logEventWithProperties(eventName, eventProperties)
-
-  let setUserId = (~userId) => getInstance()->API.setUserId(userId)
-
-  let setUsername = (~username, ~email) => {
-    let identifyInstance =
-      API.getIdentify()->API.identifySet("username", username)->API.identifySet("email", email)
-    getInstance()->API.identify(identifyInstance)
-  }
-
-  let setLanguage = (~language) => {
-    let identifyInstance = API.getIdentify()->API.identifySet("language", language)
-    getInstance()->API.identify(identifyInstance)
-  }
-
-  let setItemCount = (~itemCount) => {
-    let identifyInstance = API.getIdentify()->API.identifySetInt("itemCount", itemCount)
-    getInstance()->API.identify(identifyInstance)
-  }
-
-  let addExperimentBucket = (~experimentId, ~bucketId) => {
-    let identifyInstance =
-      API.getIdentify()->API.identifyAppend("experiments", experimentId ++ ("__" ++ bucketId))
-    getInstance()->API.identify(identifyInstance)
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/App.res b/jscomp/syntax/tests/idempotency/nook-exchange/App.res
deleted file mode 100644
index 057b36e..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/App.res
+++ /dev/null
@@ -1,201 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{display(flexBox), flexDirection(column), minHeight(vh(100.))})
-  let body = style(list{flexGrow(1.)})
-  let tagline = style(list{
-    textAlign(center),
-    marginTop(px(-8)),
-    marginBottom(px(32)),
-    media("(max-width: 500px)", list{marginBottom(px(32))}),
-  })
-  let tooltip = style(list{
-    backgroundColor(Colors.darkLayerBackground),
-    borderRadius(px(4)),
-    color(Colors.white),
-    fontSize(px(14)),
-    padding3(~top=px(5), ~bottom=px(3), ~h=px(10)),
-    position(relative),
-    whiteSpace(#preLine),
-    Colors.darkLayerShadow,
-  })
-  let layerContainer = style(list{position(relative), zIndex(1)})
-}
-
-@val @scope("window")
-external gtag: option<(. string, string, {"page_path": string}) => unit> = "gtag"
-
-module TooltipConfigContextProvider = {
-  type tooltipModifiers = array<{"name": string, "options": {"offset": array<int>}}>
-  let makeProps = (~value, ~children, ()) =>
-    {
-      "value": value,
-      "children": children,
-    }
-  let make = React.Context.provider(
-    (
-      ReactAtmosphere.Tooltip.configContext: React.Context.t<
-        ReactAtmosphere.Tooltip.configContext<tooltipModifiers>,
-      >
-    ),
-  )
-}
-
-let tooltipConfig: ReactAtmosphere.Tooltip.configContext<
-  TooltipConfigContextProvider.tooltipModifiers,
-> = {
-  renderTooltip: (tooltip, _) => <div className=Styles.tooltip> tooltip </div>,
-  options: Some({
-    placement: Some("top"),
-    modifiers: Some([
-      {
-        "name": "offset",
-        "options": {
-          "offset": [0, 2],
-        },
-      },
-    ]),
-  }),
-}
-
-exception DiscordOauthStateMismatch(string)
-
-@react.component
-let make = () => {
-  let url = ReasonReactRouter.useUrl()
-  let (showLogin, setShowLogin) = React.useState(() => false)
-  let itemDetails = {
-    let result = url.hash |> Js.Re.exec_(%re("/i(-?\d+)(:(\d+))?/g"))
-    switch result {
-    | Some(match_) =>
-      let captures = Js.Re.captures(match_)
-      let itemId = captures[1]->Js.Nullable.toOption->Belt.Option.getExn
-      Item.itemMap
-      ->Js.Dict.get(itemId)
-      ->Belt.Option.map(item => (
-        item,
-        captures[3]->Js.Nullable.toOption->Belt.Option.map(int_of_string),
-      ))
-    | None => None
-    }
-  }
-
-  let pathString = "/" ++ Js.Array.joinWith("/", Belt.List.toArray(url.path))
-  React.useEffect0(() => {
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Session Started",
-      ~eventProperties={
-        "path": pathString ++
-        (switch url.search {
-        | "" => ""
-        | search => "?" ++ search
-        } ++
-        switch url.hash {
-        | "" => ""
-        | hash => "#" ++ hash
-        }),
-      },
-    )
-    None
-  })
-  React.useEffect1(() => {
-    switch gtag {
-    | Some(gtag) => gtag(. "config", Constants.gtagId, {"page_path": pathString})
-    | None => ()
-    }
-
-    None
-  }, [pathString])
-  let (_, forceUpdate) = React.useState(() => 1)
-
-  let language = SettingsStore.useLanguage()
-  let (isLanguageLoaded, setIsLanguageLoaded) = React.useState(() => language === #English)
-  if language === #English && !isLanguageLoaded {
-    setIsLanguageLoaded(_ => true)
-  }
-  React.useEffect1(() => {
-    if language !== #English {
-      Item.loadTranslation(SettingsStore.languageToJs(language), json => {
-        setIsLanguageLoaded(_ => true)
-        Item.setTranslations(json)
-        forceUpdate(x => x + 1)
-      })
-    } else {
-      Item.clearTranslations()
-      forceUpdate(x => x + 1)
-    }
-    Analytics.Amplitude.setLanguage(~language=SettingsStore.languageToJs(language))
-    None
-  }, [language])
-
-  let isInitialLoadRef = React.useRef(true)
-  React.useEffect0(() => {
-    React.Ref.setCurrent(isInitialLoadRef, false)
-    if url.path == list{"discord_oauth2"} {
-      let (code, state) = {
-        open Webapi.Url.URLSearchParams
-        let searchParams = make(url.search)
-        (searchParams |> get("code"), searchParams |> get("state"))
-      }
-      switch (code, state) {
-      | (Some(code), Some(state)) =>
-        if (
-          {
-            open Dom.Storage
-            localStorage |> getItem("discord_state")
-          } != Some(state)
-        ) {
-          raise(DiscordOauthStateMismatch(state))
-        }
-        DiscordOauth.process(
-          ~code,
-          ~isLogin=state |> Js.String.startsWith("login"),
-          ~isRegister=state |> Js.String.startsWith("register"),
-          ~isConnect=state |> Js.String.startsWith("connect"),
-        ) |> ignore
-        ReasonReactRouter.replace("/")
-      | _ => ()
-      }
-    }
-    None
-  })
-
-  <div className=Styles.root>
-    <TooltipConfigContextProvider value=tooltipConfig>
-      <HeaderBar onLogin={_ => setShowLogin(_ => true)} />
-      {isLanguageLoaded
-        ? <div className=Styles.body>
-            {switch url.path {
-            | list{"friends", ..._} => <FriendsPage />
-            | list{"lists", ..._} => <MyListsPage />
-            | list{"u", username, ...urlRest} =>
-              <UserPage
-                username urlRest url showLogin={() => setShowLogin(_ => true)} key=username
-              />
-            | list{"l", listId, ..._urlRest} => <ListPage listId url key=listId />
-            | list{"password-reset"} => <PasswordResetPage url />
-            | list{"privacy"} => <TextPages.PrivacyPolicy />
-            | list{"terms"} => <TextPages.TermsOfService />
-            | list{"import"} => <ImportPage url showLogin={() => setShowLogin(_ => true)} />
-            | list{"settings"} => <SettingsPage />
-            | list{"discord_oauth2"} => React.null
-            | _ => <>
-                <div className=Styles.tagline>
-                  {React.string("Your friendly Animal Crossing marketplace!")}
-                </div>
-                <ItemBrowser showLogin={() => setShowLogin(_ => true)} url />
-              </>
-            }}
-          </div>
-        : React.null}
-      <Footer />
-      <QuicklistOverlay />
-      {showLogin ? <LoginOverlay onClose={() => setShowLogin(_ => false)} /> : React.null}
-      {switch itemDetails {
-      | Some((item, variant)) =>
-        <ItemDetailOverlay item variant isInitialLoad={React.Ref.current(isInitialLoadRef)} />
-      | None => React.null
-      }}
-    </TooltipConfigContextProvider>
-    <div className=Styles.layerContainer> <ReactAtmosphere.LayerContainer /> </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/BodyCard.res b/jscomp/syntax/tests/idempotency/nook-exchange/BodyCard.res
deleted file mode 100644
index 82a2967..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/BodyCard.res
+++ /dev/null
@@ -1,23 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{
-    backgroundColor(hex("ffffffc0")),
-    boxSizing(borderBox),
-    lineHeight(px(20)),
-    maxWidth(px(512)),
-    marginBottom(px(32)),
-    marginLeft(auto),
-    marginRight(auto),
-    padding2(~v=px(16), ~h=px(24)),
-    borderRadius(px(8)),
-    selector(
-      "& > p",
-      list{marginTop(zero), marginBottom(px(8)), lastChild(list{marginBottom(zero)})},
-    ),
-    media("(max-width: 512px)", list{padding(px(16)), borderRadius(zero)}),
-  })
-}
-
-@react.component
-let make = (~children, ~className=?, ()) =>
-  <div className={Cn.make(list{Styles.root, Cn.unpack(className)})}> children </div>
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Button.res b/jscomp/syntax/tests/idempotency/nook-exchange/Button.res
deleted file mode 100644
index 36ec7d8..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Button.res
+++ /dev/null
@@ -1,29 +0,0 @@
-module Styles = {
-  open Css
-  let button = style(list{
-    backgroundColor(hex("3aa563e0")),
-    borderWidth(zero),
-    borderRadius(px(4)),
-    color(Colors.white),
-    cursor(pointer),
-    padding2(~v=px(10), ~h=px(14)),
-    fontSize(px(14)),
-    transition(~duration=200, "all"),
-    hover(list{backgroundColor(Colors.green)}),
-    disabled(list{opacity(0.5)}),
-  })
-  let buttonSmall = style(list{padding2(~v=px(6), ~h=px(10))})
-}
-
-@react.component
-let make = (~onClick=?, ~small=false, ~children, ~disabled=?, ~className=?, ()) =>
-  <button
-    className={Cn.make(list{
-      Styles.button,
-      Cn.ifTrue(Styles.buttonSmall, small),
-      Cn.unpack(className),
-    })}
-    ?disabled
-    ?onClick>
-    children
-  </button>
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Colors.res b/jscomp/syntax/tests/idempotency/nook-exchange/Colors.res
deleted file mode 100644
index 46a87b7..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Colors.res
+++ /dev/null
@@ -1,15 +0,0 @@
-open Css
-
-let linkGreen = hex("247d46")
-let green = hex("3aa563")
-let lightGreen = hex("bae8cc")
-let faintGreen = hex("f2fbf3")
-let white = hex("ffffff")
-let red = hex("ED3730")
-let charcoal = hex("202020")
-let gray = hex("808080")
-let lightGray = hex("d0d0d0")
-let veryLightGray = hex("e0e0e0")
-let faintGray = hex("f0f0f0")
-let darkLayerBackground = hex("404040f8")
-let darkLayerShadow = boxShadow(Shadow.box(~blur=px(16), hex("00000040")))
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/ConfirmDialog.res b/jscomp/syntax/tests/idempotency/nook-exchange/ConfirmDialog.res
deleted file mode 100644
index 3d0b038..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/ConfirmDialog.res
+++ /dev/null
@@ -1,90 +0,0 @@
-module Styles = {
-  open Css
-  let overlay = style(list{
-    position(fixed),
-    top(zero),
-    bottom(zero),
-    left(zero),
-    right(zero),
-    display(flexBox),
-    alignItems(center),
-    justifyContent(center),
-  })
-  let backdrop = style(list{
-    position(absolute),
-    top(zero),
-    bottom(zero),
-    left(zero),
-    right(zero),
-    backgroundColor(hex("80808080")),
-  })
-  let root = style(list{
-    backgroundColor(hex("ffffff")),
-    padding2(~v=px(16), ~h=px(16)),
-    borderRadius(px(8)),
-    position(relative),
-    maxWidth(px(400)),
-    boxSizing(borderBox),
-    width(pct(90.)),
-    boxShadow(Shadow.box(~blur=px(32), rgba(0, 0, 0, 0.2))),
-    overflow(auto),
-    maxHeight(vh(100.)),
-    // media(
-    //   "(max-width: 540px)",
-    //   [paddingTop(px(24)), paddingBottom(px(24))],
-    // ),
-  })
-  let text = style(list{padding(px(8))})
-  let buttonRow = style(list{
-    display(flexBox),
-    alignItems(center),
-    justifyContent(flexEnd),
-    paddingTop(px(16)),
-  })
-  let confirmButton = style(list{marginLeft(px(16))})
-  let cancelLink = style(list{
-    opacity(0.8),
-    transition(~duration=200, "all"),
-    textDecoration(none),
-    hover(list{opacity(1.), textDecoration(underline)}),
-  })
-}
-
-let confirm = (~bodyText, ~confirmLabel, ~cancelLabel=?, ~onConfirm, ()) => {
-  let modalKey = ref(None)
-  let closeModal = () => ReactAtmosphere.API.removeLayer(~key=Belt.Option.getExn(modalKey.contents))
-  modalKey :=
-    Some(
-      ReactAtmosphere.API.pushLayer(~render=_ =>
-        <div className=Styles.overlay>
-          <div className=Styles.backdrop onClick={_ => closeModal()} />
-          <div className=Styles.root>
-            <div className=Styles.text> {React.string(bodyText)} </div>
-            <div className=Styles.buttonRow>
-              {switch cancelLabel {
-              | Some(cancelLabel) =>
-                <a
-                  href="#"
-                  onClick={e => {
-                    ReactEvent.Mouse.preventDefault(e)
-                    closeModal()
-                  }}
-                  className=Styles.cancelLink>
-                  {React.string(cancelLabel)}
-                </a>
-              | None => React.null
-              }}
-              <Button
-                onClick={_ => {
-                  onConfirm()
-                  closeModal()
-                }}
-                className=Styles.confirmButton>
-                {React.string(confirmLabel)}
-              </Button>
-            </div>
-          </div>
-        </div>
-      ),
-    )
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Constants.res b/jscomp/syntax/tests/idempotency/nook-exchange/Constants.res
deleted file mode 100644
index 78cd3fd..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Constants.res
+++ /dev/null
@@ -1,28 +0,0 @@
-@val @scope(("process", "env"))
-external nodeEnv: option<string> = "NODE_ENV"
-@val @scope(("process", "env"))
-external gitCommitRef: option<string> = "COMMIT_REF"
-let gitCommitRef = Belt.Option.getWithDefault(gitCommitRef, "") |> Js.String.slice(~from=0, ~to_=8)
-
-let apiUrl =
-  nodeEnv === Some("paul-development") ? "http://localhost:3000" : "https://a.nook.exchange"
-let cdnUrl =
-  nodeEnv === Some("paul-development") ? "" : "https://b.nook.exchange/file/nook-exchange"
-
-let gtagId = "UA-55966633-6"
-let amplitudeApiKey = "d91231e0b8a96baf38ba67eb36d25a48"
-let sentryId = "https://b3e870897abf4c5caef3e12320202dee@o378523.ingest.sentry.io/5202020"
-
-exception Uhoh
-
-let headerHeight = 52
-@val external encodeURIComponent: string => string = "encodeURIComponent"
-let discordOauthRedirectUri = state =>
-  "https://discord.com/api/oauth2/authorize?client_id=703109829610176522&redirect_uri=" ++
-  (encodeURIComponent(
-    {
-      open Webapi.Dom
-      location |> Location.origin
-    } ++ "/discord_oauth2",
-  ) ++
-  ("&response_type=code&scope=guilds.join%20identify&prompt=none&state=" ++ state))
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/DeleteFromCatalog.res b/jscomp/syntax/tests/idempotency/nook-exchange/DeleteFromCatalog.res
deleted file mode 100644
index b80a697..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/DeleteFromCatalog.res
+++ /dev/null
@@ -1,33 +0,0 @@
-module PersistConfig = {
-  let key = "confirm_catalog_delete"
-  let value = ref(Dom.Storage.localStorage |> Dom.Storage.getItem(key))
-  let confirm = () => {
-    let nowString = Js.Date.now()->Js.Float.toString
-    value := Some(nowString)
-    Dom.Storage.localStorage |> Dom.Storage.setItem(key, nowString)
-  }
-}
-
-let confirm = (~onConfirm) =>
-  if Belt.Option.isSome(PersistConfig.value.contents) {
-    onConfirm()
-  } else {
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Confirm Dialog Shown",
-      ~eventProperties={"id": "deleteFromCatalog"},
-    )
-    ConfirmDialog.confirm(
-      ~bodyText="Removing an item from your catalog will also remove it from your For Trade and Can Craft lists. Do you want to continue?",
-      ~confirmLabel="Remove from catalog",
-      ~cancelLabel="Not now",
-      ~onConfirm=() => {
-        PersistConfig.confirm()
-        onConfirm()
-        Analytics.Amplitude.logEventWithProperties(
-          ~eventName="Confirm Dialog Confirmed",
-          ~eventProperties={"id": "deleteFromCatalog"},
-        )
-      },
-      (),
-    )
-  }
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/DiscordBotUpsell.res b/jscomp/syntax/tests/idempotency/nook-exchange/DiscordBotUpsell.res
deleted file mode 100644
index 5ee7155..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/DiscordBotUpsell.res
+++ /dev/null
@@ -1,113 +0,0 @@
-module PersistConfig = {
-  let key = "dismiss_discord_bot_notice"
-  let value = ref(Dom.Storage.localStorage |> Dom.Storage.getItem(key))
-  let dismiss = () => {
-    let nowString = Js.Date.now()->Js.Float.toString
-    value := Some(nowString)
-    Dom.Storage.localStorage |> Dom.Storage.setItem(key, nowString)
-  }
-}
-
-module Component = {
-  module Styles = {
-    open Css
-    let root = style(list{
-      position(fixed),
-      right(px(32)),
-      bottom(px(32)),
-      backgroundColor(hex("f9fdf9")),
-      padding(px(24)),
-      borderRadius(px(16)),
-      boxShadow(Shadow.box(~blur=px(32), hex("4a846080"))),
-      maxWidth(px(360)),
-      media("(max-width: 540px)", list{bottom(px(8)), right(px(8)), left(px(8)), padding(px(16))}),
-    })
-    let bodyText = style(list{lineHeight(px(18))})
-    let buttonRow = style(list{
-      display(flexBox),
-      alignItems(center),
-      marginTop(px(24)),
-      justifyContent(flexEnd),
-    })
-    let registerButton = style(list{marginLeft(px(16))})
-    let notNowLink = style(list{
-      opacity(0.8),
-      transition(~duration=200, "all"),
-      textDecoration(none),
-      hover(list{opacity(1.), textDecoration(underline)}),
-    })
-  }
-
-  @react.component
-  let make = (~onDismiss) => {
-    React.useEffect0(() => {
-      Analytics.Amplitude.logEvent(~eventName="Discord Bot Notice Shown")
-      None
-    })
-    <div className=Styles.root>
-      <div className=Styles.bodyText>
-        {React.string("Use our ")}
-        <a
-          href="#"
-          onClick={e => {
-            ReactEvent.Mouse.preventDefault(e)
-            Analytics.Amplitude.logEventWithProperties(
-              ~eventName="Discord Bot Notice Accepted",
-              ~eventProperties={"source": "link"},
-            )
-            open Webapi.Dom
-            window
-            |> Window.open_(~url="https://discord.gg/9sh66CX", ~name="", ~features=?None)
-            |> ignore
-          }}>
-          {React.string("Discord bot")}
-        </a>
-        {React.string(" to find DIY swaps and bulk catalog trades with other Nook Exchange users!")}
-      </div>
-      <div className=Styles.buttonRow>
-        <a
-          href="#"
-          onClick={e => {
-            ReactEvent.Mouse.preventDefault(e)
-            onDismiss()
-            Analytics.Amplitude.logEvent(~eventName="Discord Bot Notice Dismissed")
-          }}
-          className=Styles.notNowLink>
-          {React.string("Not now")}
-        </a>
-        <Button
-          onClick={_ => {
-            open Webapi.Dom
-            window
-            |> Window.open_(~url="https://discord.gg/9sh66CX", ~name="", ~features=?None)
-            |> ignore
-            onDismiss()
-            Analytics.Amplitude.logEventWithProperties(
-              ~eventName="Discord Bot Notice Accepted",
-              ~eventProperties={"source": "button"},
-            )
-          }}
-          className=Styles.registerButton>
-          {React.string("Try Discord bot")}
-        </Button>
-      </div>
-    </div>
-  }
-}
-
-@react.component
-let make = () => {
-  let me = UserStore.useMe()
-  let (dismissed, setDismissed) = React.useState(() => PersistConfig.value.contents !== None)
-  let discordId = me->Belt.Option.map(me => me.discordId)
-  switch (dismissed, discordId) {
-  | (false, Some(None)) =>
-    <Component
-      onDismiss={() => {
-        setDismissed(_ => true)
-        PersistConfig.dismiss()
-      }}
-    />
-  | _ => React.null
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/DiscordOauth.res b/jscomp/syntax/tests/idempotency/nook-exchange/DiscordOauth.res
deleted file mode 100644
index 2bce891..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/DiscordOauth.res
+++ /dev/null
@@ -1,64 +0,0 @@
-module Styles = {
-  open Css
-  let body = style(list{
-    padding2(~v=px(32), ~h=px(32)),
-    width(vw(90.)),
-    maxWidth(px(400)),
-    boxSizing(borderBox),
-    media("(max-width: 480px)", list{paddingLeft(px(16)), paddingRight(px(16))}),
-  })
-  let blurb = style(list{lineHeight(px(18)), paddingBottom(px(24))})
-}
-
-let process = (~code, ~isLogin, ~isRegister, ~isConnect) =>
-  if isLogin || isRegister {
-    %Repromise({
-      let response = UserStore.loginWithDiscord(~code, ~isRegister)
-      switch response {
-      | Ok((user, true)) =>
-        let modalKey = ref(None)
-        let onClose = () =>
-          ReactAtmosphere.API.removeLayer(~key=Belt.Option.getExn(modalKey.contents))
-        modalKey :=
-          Some(
-            ReactAtmosphere.API.pushLayer(~render=_ =>
-              <Modal>
-                <div className=Styles.body>
-                  <div>
-                    <div className=LoginOverlay.Styles.registerTitle>
-                      {React.string("Your account is created!")}
-                    </div>
-                    <div> {React.string("Add items to profile and share it with others!")} </div>
-                    <div className=LoginOverlay.Styles.url>
-                      <Link path={"/u/" ++ user.username}>
-                        {React.string("nook.exchange/u/" ++ user.username)}
-                      </Link>
-                    </div>
-                    <div className=Styles.blurb>
-                      {React.string(
-                        "Your username is " ++ (user.username ++ ". You can change it "),
-                      )}
-                      <Link path="/settings" onClick={_ => onClose()}>
-                        {React.string("here")}
-                      </Link>
-                      {React.string(".")}
-                    </div>
-                    <div className=LoginOverlay.Styles.submitBar>
-                      <button onClick={_ => onClose()} className=LoginOverlay.Styles.submitButton>
-                        {React.string("Okay!")}
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </Modal>
-            ),
-          )
-      | Ok(_) => ()
-      | Error(_) =>
-        Error.showPopup(~message="Something went wrong. Sorry! Please reload and try again.")
-      }
-      Promise.resolved()
-    }) |> ignore
-  } else if isConnect {
-    UserStore.connectDiscordAccount(~code) |> ignore
-  }
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Emoji.res b/jscomp/syntax/tests/idempotency/nook-exchange/Emoji.res
deleted file mode 100644
index a2d5bd1..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Emoji.res
+++ /dev/null
@@ -1,82 +0,0 @@
-module Component = {
-  @module("emoji-mart") @react.component
-  external make: (~emoji: string, ~size: int) => React.element = "Emoji"
-}
-
-@module("./assets/nmt.png") external nmtPng: string = "default"
-@module("./assets/bell.png") external bellPng: string = "default"
-
-module Styles = {
-  open Css
-  let nmt = style(list{
-    backgroundImage(url(nmtPng)),
-    width(px(16)),
-    height(px(16)),
-    display(inlineBlock),
-    backgroundSize(cover),
-    verticalAlign(#bottom),
-    position(relative),
-    top(px(-2)),
-  })
-  let bell = style(list{
-    backgroundImage(url(bellPng)),
-    width(px(16)),
-    height(px(16)),
-    display(inlineBlock),
-    backgroundSize(cover),
-    verticalAlign(#bottom),
-    position(relative),
-    top(px(-2)),
-  })
-  let emoji = style(list{verticalAlign(#bottom), position(relative), top(px(-2))})
-}
-
-let emojiRegex = %re(`/(^|\\s)(\\:[a-zA-Z0-9-_+]+\\:)/g`)
-
-let parseText = (text: string): React.element => {
-  let children = []
-  let iter = ref(0)
-
-  let resultRef = ref(text |> Js.Re.exec_(emojiRegex))
-  while resultRef.contents != None {
-    let result = Belt.Option.getExn(resultRef.contents)
-    let matches = Js.Re.captures(result)
-    let emojiColons = Belt.Option.getExn(Js.Nullable.toOption(matches[2]))
-    let offset =
-      Js.Re.index(result) + Belt.Option.getExn(Js.Nullable.toOption(matches[1]))->Js.String.length
-    if iter.contents < offset {
-      children
-      |> Js.Array.push(
-        <span key={string_of_int(Js.Array.length(children))}>
-          {React.string(text |> Js.String.substring(~from=iter.contents, ~to_=offset))}
-        </span>,
-      )
-      |> ignore
-    }
-    children
-    |> Js.Array.push(
-      switch emojiColons {
-      | ":nmt:" => <span className=Styles.nmt key={string_of_int(Js.Array.length(children))} />
-      | ":bell:" => <span className=Styles.bell key={string_of_int(Js.Array.length(children))} />
-      | _ =>
-        <span className=Styles.emoji key={string_of_int(Js.Array.length(children))}>
-          <Component emoji=emojiColons size=16 />
-        </span>
-      },
-    )
-    |> ignore
-
-    resultRef := text |> Js.Re.exec_(emojiRegex)
-    iter := offset + Js.String.length(emojiColons)
-  }
-  if iter.contents < Js.String.length(text) {
-    children
-    |> Js.Array.push(
-      <span key={string_of_int(Js.Array.length(children))}>
-        {React.string(text |> Js.String.substringToEnd(~from=iter.contents))}
-      </span>,
-    )
-    |> ignore
-  }
-  React.array(children)
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Error.res b/jscomp/syntax/tests/idempotency/nook-exchange/Error.res
deleted file mode 100644
index 9382ff7..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Error.res
+++ /dev/null
@@ -1,44 +0,0 @@
-module ErrorPopup = {
-  module Styles = {
-    open Css
-    let overlay = style(list{
-      position(fixed),
-      top(zero),
-      bottom(zero),
-      left(zero),
-      right(zero),
-      display(flexBox),
-      alignItems(center),
-      justifyContent(center),
-    })
-    let backdrop = style(list{
-      position(absolute),
-      top(zero),
-      bottom(zero),
-      left(zero),
-      right(zero),
-      backgroundColor(hex("ffffffc0")),
-    })
-    let root = style(list{
-      padding2(~v=px(32), ~h=px(32)),
-      backgroundColor(Colors.red),
-      color(Colors.white),
-      borderRadius(px(4)),
-      position(relative),
-      maxWidth(px(448)),
-      width(pct(90.)),
-      fontSize(px(16)),
-      whiteSpace(#preLine),
-      boxShadow(Shadow.box(~spread=px(12), rgba(0, 0, 0, 0.1))),
-    })
-  }
-
-  @react.component
-  let make = (~message) =>
-    <div className=Styles.overlay>
-      <div className=Styles.backdrop /> <div className=Styles.root> {React.string(message)} </div>
-    </div>
-}
-
-let showPopup = (~message) =>
-  ReactAtmosphere.API.pushLayer(~render=_ => <ErrorPopup message />) |> ignore
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Experiment.res b/jscomp/syntax/tests/idempotency/nook-exchange/Experiment.res
deleted file mode 100644
index 443836d..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Experiment.res
+++ /dev/null
@@ -1,65 +0,0 @@
-let key = "bucket_hash"
-let bucketHash = ref(
-  (Dom.Storage.localStorage |> Dom.Storage.getItem(key))->Belt.Option.flatMap(int_of_string_opt),
-)
-
-let triggerKey = "triggered_experiments"
-let triggeredMap = ref(
-  (Dom.Storage.localStorage |> Dom.Storage.getItem(triggerKey))
-  ->Belt.Option.map(value => {
-    let json = Js.Json.parseExn(value)
-    open Json.Decode
-    dict(string, json)
-  })
-  ->Belt.Option.getWithDefault(Js.Dict.empty()),
-)
-let addTrigger = (key, value) => {
-  triggeredMap.contents->Js.Dict.set(key, value)
-  open Dom.Storage
-  localStorage |> setItem(
-    triggerKey,
-    Js.Json.stringify({
-      open Json.Encode
-      dict(string, triggeredMap.contents)
-    }),
-  )
-}
-
-exception UnexpectedExperimentId(string)
-let getBucketHash = () =>
-  switch bucketHash.contents {
-  | Some(bucketHash) => bucketHash
-  | None =>
-    let value = Js.Math.random_int(0, max_int)
-    bucketHash := Some(value)
-    Dom.Storage.localStorage |> Dom.Storage.setItem(key, string_of_int(value))
-    value
-  }
-
-module ExperimentIds = {
-  let matchListNotice = "524"
-  let quicklistOverlay = "927"
-}
-
-let getBucketIdForExperiment = (~experimentId) =>
-  if experimentId == ExperimentIds.matchListNotice {
-    string_of_int(
-      // skip two low bits for now
-      // Use the 3rd bit (50%)
-      land(lsr(getBucketHash(), 2), 1),
-    )
-  } else if experimentId == ExperimentIds.quicklistOverlay {
-    string_of_int(land(lsr(getBucketHash(), 3), 1))
-  } else {
-    raise(UnexpectedExperimentId(experimentId))
-  }
-
-let trigger = (~experimentId, ~bucketId) =>
-  if triggeredMap.contents->Js.Dict.get(experimentId) != Some(bucketId) {
-    addTrigger(experimentId, bucketId)
-    Analytics.Amplitude.addExperimentBucket(~experimentId, ~bucketId)
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Experiment Triggered",
-      ~eventProperties={"experimentId": experimentId, "bucketId": bucketId},
-    )
-  }
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Footer.res b/jscomp/syntax/tests/idempotency/nook-exchange/Footer.res
deleted file mode 100644
index fa22b23..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Footer.res
+++ /dev/null
@@ -1,71 +0,0 @@
-module Styles = {
-  open Css
-  let footer = style(list{
-    display(flexBox),
-    flexDirection(column),
-    fontSize(px(12)),
-    alignItems(center),
-    textAlign(center),
-    margin3(~top=px(96), ~bottom=px(48), ~h=zero),
-  })
-  let contents = style(list{
-    color(Colors.gray),
-    lineHeight(px(16)),
-    maxWidth(px(512)),
-    padding2(~v=zero, ~h=px(8)),
-  })
-  let disclaimer = style(list{marginTop(px(8))})
-}
-
-@react.component
-let make = () => {
-  let language = SettingsStore.useLanguage()
-  <div className=Styles.footer>
-    <div className=Styles.contents>
-      <div>
-        <a href="https://www.buymeacoffee.com/nookexchange" target="_blank">
-          {React.string("Support us")}
-        </a>
-        {React.string(" | ")}
-        <a href="https://discord.gg/9sh66CX" target="_blank"> {React.string("Discord")} </a>
-        {React.string(" | ")}
-        <a href="https://twitter.com/nookexchange" target="_blank"> {React.string("Twitter")} </a>
-        {React.string(" | ")}
-        <a
-          href="https://docs.google.com/spreadsheets/d/13d_LAJPlxMa_DubPTuirkIV4DERBMXbrWQsmSh8ReK4/edit?usp=sharing"
-          target="_blank">
-          {React.string("Data source")}
-        </a>
-        {React.string(" | ")}
-        <a href="https://tinyurl.com/acnh-translations" target="_blank">
-          {React.string("Translations")}
-        </a>
-        {React.string(" | ")}
-        <span>
-          {React.string("Language: ")}
-          <a
-            href="#"
-            onClick={e => {
-              ReactEvent.Mouse.preventDefault(e)
-              LanguageSelector.show()
-            }}>
-            {React.string(SettingsStore.languageToString(language))}
-          </a>
-        </span>
-      </div>
-      <div>
-        <a href="/terms"> {React.string("Terms of Service")} </a>
-        {React.string(" | ")}
-        <a href="/privacy"> {React.string("Privacy Policy")} </a>
-        {React.string(" | ")}
-        <a href="mailto:hi@nook.exchange"> {React.string("Contact us")} </a>
-        {React.string(" | Thanks for visiting!")}
-      </div>
-      <div className=Styles.disclaimer>
-        {React.string(
-          "Animal Crossing is a registered trademark of Nintendo. Nook Exchange in no way claims ownership of any intellectual property associated with Animal Crossing.",
-        )}
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/FriendsPage.res b/jscomp/syntax/tests/idempotency/nook-exchange/FriendsPage.res
deleted file mode 100644
index e82639b..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/FriendsPage.res
+++ /dev/null
@@ -1,322 +0,0 @@
-let cardWidth = 176
-
-type followee = {
-  id: string,
-  username: string,
-  lastUpdate: option<float>,
-  items: array<(int, int, User.item)>,
-}
-
-let compareOptionTimestamps = (aTime, bTime) =>
-  switch (aTime, bTime) {
-  | (None, None) => 0
-  | (Some(_), None) => -1
-  | (None, Some(_)) => 1
-  | (Some(aTime), Some(bTime)) => int_of_float(bTime -. aTime)
-  }
-
-let fetchFeed = () =>
-  %Repromise.JsExn({
-    let response = Fetch.fetchWithInit(
-      Constants.apiUrl ++ "/@me/follow-feed",
-      Fetch.RequestInit.make(
-        ~method_=Get,
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Authorization": "Bearer " ++ Belt.Option.getExn(UserStore.sessionId.contents),
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    %Repromise.JsExn({
-      let json = Fetch.Response.json(response)
-      open Json.Decode
-      let feed =
-        json
-        |> array(json => {
-          let items =
-            (json |> field("items", dict(User.itemFromJson)))
-            ->Js.Dict.entries
-            ->Belt.Array.keepMap(((itemKey, item)) =>
-              item->Belt.Option.flatMap(item =>
-                User.fromItemKey(~key=itemKey)->Belt.Option.map(((itemId, variant)) => (
-                  itemId,
-                  variant,
-                  item,
-                ))
-              )
-            )
-              |> Js.Array.sortInPlaceWith(((_, _, aItem: User.item), (_, _, bItem: User.item)) =>
-                compareOptionTimestamps(aItem.timeUpdated, bItem.timeUpdated)
-              )
-          {
-            id: json |> field("id", string),
-            username: json |> field("username", string),
-            lastUpdate: Belt.Array.get(items, 0)->Belt.Option.flatMap(((_, _, item)) =>
-              item.timeUpdated
-            ),
-            items: items,
-          }
-        })
-        |> Js.Array.sortInPlaceWith((a, b) => compareOptionTimestamps(a.lastUpdate, b.lastUpdate))
-      Promise.resolved(feed)
-    })
-  })
-
-module Followee = {
-  let getRootWidth = numCards => numCards * cardWidth + (numCards - 1) * 16
-  module Styles = {
-    open Css
-    let root = style(list{
-      width(px(getRootWidth(5))),
-      backgroundColor(hex("b0dec1c0")),
-      borderRadius(px(16)),
-      padding3(~top=px(32), ~bottom=px(16), ~h=px(32)),
-      margin3(~top=zero, ~h=auto, ~bottom=px(48)),
-      width(auto),
-      media("(min-width: 660px)", list{width(px(getRootWidth(3)))}),
-      media("(min-width: 860px)", list{width(px(getRootWidth(4)))}),
-      media("(min-width: 1040px)", list{width(px(getRootWidth(5)))}),
-      media("(max-width: 640px)", list{width(auto), padding(px(16)), borderRadius(zero)}),
-    })
-    let usernameRow = style(list{
-      display(flexBox),
-      alignItems(center),
-      justifyContent(spaceBetween),
-      marginBottom(px(24)),
-    })
-    let usernameRowUnfollowed = style(list{
-      important(marginBottom(px(16))),
-      media("(max-width: 640px)", list{important(marginBottom(zero))}),
-    })
-    let usernameLink = style(list{
-      fontSize(px(24)),
-      color(Colors.charcoal),
-      textDecoration(none),
-      media("(hover: hover)", list{hover(list{textDecoration(underline)})}),
-    })
-    let unfollowLink = style(list{
-      textDecoration(none),
-      media("(hover: hover)", list{hover(list{textDecoration(underline)})}),
-    })
-    let items = style(list{display(flexBox), flexWrap(wrap), marginRight(px(-16))})
-    let listLink = style(list{
-      position(absolute),
-      top(px(8)),
-      left(px(8)),
-      display(flexBox),
-      alignItems(center),
-      color(Colors.gray),
-      textDecoration(none),
-      media("(hover: hover)", list{hover(list{textDecoration(underline)})}),
-    })
-    let itemMatch = style(list{boxShadow(Shadow.box(~spread=px(2), Colors.green))})
-  }
-
-  let getNumCards = viewportWidth =>
-    if viewportWidth >= 1040 {
-      10
-    } else if viewportWidth >= 860 {
-      8
-    } else {
-      6
-    }
-
-  module ItemCard = {
-    @react.component
-    let make = (~itemId, ~variant, ~userItem: User.item, ~username) => {
-      let viewerItem = UserStore.useItem(~itemId, ~variation=variant)
-      let isMatch = switch viewerItem {
-      | Some(viewerItem) =>
-        switch (userItem.status, viewerItem.status) {
-        | (ForTrade, Wishlist)
-        | (CanCraft, Wishlist)
-        | (CatalogOnly, Wishlist)
-        | (Wishlist, ForTrade)
-        | (Wishlist, CanCraft)
-        | (Wishlist, CatalogOnly) => true
-        | _ => false
-        }
-      | None => false
-      }
-      <UserItemCard
-        itemId
-        variation=variant
-        userItem
-        list={switch userItem.status {
-        | CatalogOnly
-        | ForTrade =>
-          ForTrade
-        | CanCraft => CanCraft
-        | Wishlist => Wishlist
-        }}
-        editable=false
-        showRecipe=false
-        customTopLeft={<Link
-          path={"/u/" ++
-          (username ++
-          ("/" ++
-          (ViewingList.viewingListToUrl(
-            switch userItem.status {
-            | Wishlist => Wishlist
-            | ForTrade => ForTrade
-            | CanCraft => CanCraft
-            | CatalogOnly => Catalog
-            },
-          ) ++
-          "?s=tu")))}
-          className=Styles.listLink>
-          {React.string(User.itemStatusToString(userItem.status))}
-        </Link>}
-        className={Cn.ifTrue(Styles.itemMatch, isMatch)}
-      />
-    }
-  }
-
-  @react.component
-  let make = (~followee) => {
-    let viewportWidth = Utils.useViewportWidth()
-    let numCards = getNumCards(viewportWidth)
-    let (unfollowed, setUnfollowed) = React.useState(() => false)
-
-    <div className=Styles.root>
-      <div
-        className={Cn.make(list{
-          Styles.usernameRow,
-          Cn.ifTrue(Styles.usernameRowUnfollowed, unfollowed),
-        })}>
-        <Link path={"/u/" ++ followee.username} className=Styles.usernameLink>
-          {React.string(followee.username)}
-        </Link>
-        {!unfollowed
-          ? <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                %Repromise({
-                  let response = UserStore.unfollowUser(~userId=followee.id)
-                  switch response {
-                  | Ok() =>
-                    setUnfollowed(_ => true)
-                    Analytics.Amplitude.logEventWithProperties(
-                      ~eventName="Friend Unfollowed",
-                      ~eventProperties={"followeeId": followee.id},
-                    )
-                  | Error(_) => ()
-                  }
-                  Promise.resolved()
-                }) |> ignore
-              }}
-              className=Styles.unfollowLink>
-              {React.string("Unfollow")}
-            </a>
-          : <span> {React.string("Unfollowed")} </span>}
-      </div>
-      {!unfollowed
-        ? <div className=Styles.items>
-            {followee.items
-            |> Js.Array.slice(~start=0, ~end_=numCards - 1)
-            |> Js.Array.map(((itemId, variant, userItem)) =>
-              <ItemCard
-                itemId
-                variant
-                userItem
-                username=followee.username
-                key={string_of_int(itemId) ++ string_of_int(variant)}
-              />
-            )
-            |> React.array}
-            {Js.Array.length(followee.items) > 0
-              ? <Link
-                  path={"/u/" ++ (followee.username ++ "?s=tu")}
-                  className={Cn.make(list{
-                    UserItemCard.Styles.card,
-                    UserProfileBrowser.Styles.cardSeeAll,
-                  })}>
-                  {React.string("Go to profile")}
-                  <span
-                    className={Cn.make(list{
-                      UserProfileBrowser.Styles.sectionTitleLinkIcon,
-                      UserProfileBrowser.Styles.cardSeeAllLinkIcon,
-                    })}
-                  />
-                </Link>
-              : <div> {React.string(followee.username ++ (" has no items! " ++ j`😞`))} </div>}
-          </div>
-        : React.null}
-    </div>
-  }
-}
-
-module WithViewer = {
-  module Styles = {
-    open Css
-    let root = style(list{})
-    let emptyFeed = style(list{
-      backgroundColor(hex("ffffffc0")),
-      boxSizing(borderBox),
-      lineHeight(px(20)),
-      margin3(~top=zero, ~bottom=px(48), ~h=auto),
-      maxWidth(px(512)),
-      padding2(~v=px(32), ~h=px(24)),
-      borderRadius(px(8)),
-      textAlign(center),
-      media(
-        "(max-width: 512px)",
-        list{
-          borderRadius(zero),
-          padding2(~v=px(24), ~h=px(16)),
-          marginBottom(zero),
-          borderBottom(px(1), solid, Colors.faintGray),
-        },
-      ),
-    })
-  }
-
-  @react.component
-  let make = (~me: User.t) => {
-    let (feed: option<array<followee>>, setFeed) = React.useState(() => None)
-
-    React.useEffect0(() => {
-      %Repromise({
-        let feed = fetchFeed()
-        setFeed(_ => Some(feed))
-        Analytics.Amplitude.logEventWithProperties(
-          ~eventName="Friend Page Viewed",
-          ~eventProperties={"numFollowees": Js.Array.length(feed)},
-        )
-        Promise.resolved()
-      }) |> ignore
-      None
-    })
-
-    <div className=Styles.root>
-      <PageTitle title="My Friends" />
-      {switch feed {
-      | Some(feed) =>
-        Js.Array.length(feed) > 0
-          ? <div>
-              {feed
-              |> Js.Array.map(followee => <Followee followee key=followee.id />)
-              |> React.array}
-            </div>
-          : <div className=Styles.emptyFeed>
-              {React.string("Visit people's profiles to add them to your friends page!")}
-            </div>
-      | None => React.null
-      }}
-    </div>
-  }
-}
-
-@react.component
-let make = () => {
-  let me = UserStore.useMe()
-
-  switch me {
-  | Some(me) => <WithViewer me />
-  | None => React.null
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/HeaderBar.res b/jscomp/syntax/tests/idempotency/nook-exchange/HeaderBar.res
deleted file mode 100644
index 8c25586..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/HeaderBar.res
+++ /dev/null
@@ -1,289 +0,0 @@
-module Styles = {
-  open Css
-  let wrapper = style(list{
-    height(px(Constants.headerHeight)),
-    marginBottom(px(40)),
-    media("(max-width: 500px)", list{marginBottom(px(28))}),
-  })
-  let root = style(list{
-    position(fixed),
-    left(zero),
-    right(zero),
-    top(zero),
-    display(flexBox),
-    flexWrap(wrap),
-    fontSize(px(16)),
-    justifyContent(spaceBetween),
-    padding3(~top=px(16), ~bottom=zero, ~h=px(16)),
-    zIndex(1),
-    opacity(0.),
-    transition(~duration=300, "all"),
-    selector("& a", list{textDecoration(none), hover(list{textDecoration(underline)})}),
-    media("(max-width: 600px)", list{paddingBottom(zero)}),
-    media("(hover: none)", list{pointerEvents(none)}),
-    media("(hover: hover)", list{hover(list{opacity(1.), backgroundColor(hex("fffffff0"))})}),
-  })
-  let rootWithMenu = style(list{
-    opacity(1.),
-    backgroundColor(hex("fffffff0")),
-    media("(hover: none)", list{pointerEvents(auto)}),
-  })
-  let rootIsScrollingUp = style(list{
-    opacity(1.),
-    media("(hover: none)", list{pointerEvents(auto)}),
-    media("(max-width: 600px)", list{backgroundColor(hex("fffffff0"))}),
-  })
-  let rootIsNearTop = style(list{
-    opacity(1.),
-    media("(hover: none)", list{pointerEvents(auto)}),
-    important(backgroundColor(transparent)),
-  })
-  let biggerViewport = style(list{media("(max-width: 700px)", list{display(none)})})
-  let standardViewport = style(list{media("(max-width: 500px)", list{display(none)})})
-  let smallViewport = style(list{
-    important(display(none)),
-    media("(max-width: 500px)", list{important(display(inherit_))}),
-  })
-  let logoLink = style(list{
-    position(absolute),
-    left(pct(50.)),
-    marginLeft(px(-100)),
-    top(px(8)),
-    zIndex(1),
-    media("(max-width: 500px)", list{marginLeft(px(-70))}),
-  })
-  @module("./assets/logo.png") external logo: string = "default"
-  @module("./assets/logo_small.png")
-  external logoSmall: string = "default"
-  let logo = style(list{
-    backgroundImage(url(logo)),
-    backgroundSize(cover),
-    margin(zero),
-    width(px(200)),
-    height(px(60)),
-    textIndent(px(-9999)),
-    media(
-      "(max-width: 500px)",
-      list{backgroundImage(url(logoSmall)), width(px(140)), height(px(50))},
-    ),
-  })
-  let nav = style(list{display(flexBox)})
-  let navLeft = style(list{marginBottom(px(16)), marginRight(px(16))})
-  let navLink = style(list{
-    color(Colors.gray),
-    marginLeft(px(16)),
-    firstChild(list{marginLeft(zero)}),
-  })
-  let twitterLink = style(list{})
-}
-
-let userHasFriends = (user: option<User.t>) =>
-  switch user {
-  | Some(me) =>
-    switch me.followeeIds {
-    | Some(followeeIds) => Js.Array.length(followeeIds) > 0
-    | None => false
-    }
-  | None => false
-  }
-
-module Menu = {
-  module MenuStyles = {
-    open Css
-    let root = style(list{
-      position(fixed),
-      left(zero),
-      top(px(Constants.headerHeight)),
-      backgroundColor(Colors.white),
-      padding2(~v=px(8), ~h=zero),
-      borderTopRightRadius(px(8)),
-      borderBottomRightRadius(px(8)),
-      overflow(hidden),
-      minWidth(px(256)),
-      boxSizing(borderBox),
-      Colors.darkLayerShadow,
-      zIndex(1),
-      opacity(0.),
-      transition(~duration=200, "all"),
-      transform(translateX(px(-64))),
-    })
-    let rootAppear = style(list{opacity(1.), transform(translateX(zero))})
-    let menuItem = style(list{
-      display(block),
-      fontSize(px(16)),
-      width(pct(100.)),
-      cursor(pointer),
-      padding2(~v=px(8), ~h=px(16)),
-      boxSizing(borderBox),
-      textDecoration(none),
-      hover(list{backgroundColor(Colors.green), color(Colors.white)}),
-    })
-  }
-
-  @react.component
-  let make = (~onClose, ~user: option<User.t>, ~onLogin) => {
-    let (animateIn, setAnimateIn) = React.useState(() => false)
-    React.useEffect0(() => {
-      setAnimateIn(_ => true)
-      let onClick = _ => onClose()
-      open Webapi.Dom
-      window |> Window.addClickEventListener(onClick)
-      Some(() => window |> Window.removeClickEventListener(onClick))
-    })
-    <div className={Cn.make(list{MenuStyles.root, Cn.ifTrue(MenuStyles.rootAppear, animateIn)})}>
-      <Link path="/" className={Cn.make(list{MenuStyles.menuItem, Styles.smallViewport})}>
-        {React.string("Browse Items")}
-      </Link>
-      {switch user {
-      | Some(user) => <>
-          <Link path={"/u/" ++ user.username} className=MenuStyles.menuItem>
-            {React.string("My Profile")}
-          </Link>
-          <Link path="/friends" className=MenuStyles.menuItem> {React.string("My Friends")} </Link>
-          <Link path="/lists" className=MenuStyles.menuItem>
-            {React.string("My Custom Lists")}
-          </Link>
-          <Link path="/settings" className=MenuStyles.menuItem> {React.string("Settings")} </Link>
-          <a href="https://twitter.com/nookexchange" target="_blank" className=MenuStyles.menuItem>
-            {React.string("Twitter")}
-          </a>
-          <a
-            href="https://www.buymeacoffee.com/nookexchange"
-            target="_blank"
-            className=MenuStyles.menuItem>
-            {React.string("Support us")}
-          </a>
-          <a
-            href="#"
-            className=MenuStyles.menuItem
-            onClick={e => {
-              UserStore.logout() |> ignore
-              ReactEvent.Mouse.preventDefault(e)
-            }}>
-            {React.string("Logout")}
-          </a>
-        </>
-      | None => <>
-          <a
-            href="#"
-            onClick={e => {
-              onLogin()
-              ReactEvent.Mouse.preventDefault(e)
-            }}
-            className=MenuStyles.menuItem>
-            {React.string("Login")}
-          </a>
-          <a href="https://twitter.com/nookexchange" target="_blank" className=MenuStyles.menuItem>
-            {React.string("Twitter")}
-          </a>
-          <a
-            href="https://www.buymeacoffee.com/nookexchange"
-            target="_blank"
-            className=MenuStyles.menuItem>
-            {React.string("Support us")}
-          </a>
-        </>
-      }}
-    </div>
-  }
-}
-
-let nearTopThreshold = 64.
-
-@react.component
-let make = (~onLogin) => {
-  let user = UserStore.useMe()
-  let (isNearTop, setIsNearTop) = React.useState(() => {
-    open Webapi.Dom
-    window |> Window.pageYOffset < nearTopThreshold
-  })
-  let (isScrollingUp, setIsScrollingUp) = React.useState(() => false)
-  React.useEffect0(() => {
-    open Webapi.Dom
-    let scrollTop = ref(window |> Window.pageYOffset)
-    let isScrollingUp = ref(false)
-    let newIsNearTop = scrollTop.contents < nearTopThreshold
-    if newIsNearTop != isNearTop {
-      setIsNearTop(_ => newIsNearTop)
-    }
-    let isNearTop = ref(newIsNearTop)
-    let onScroll = e => {
-      let newScrollTop = window |> Window.pageYOffset
-      let newIsScrollingUp =
-        newScrollTop < scrollTop.contents && newScrollTop > scrollTop.contents -. 300.
-      let newIsNearTop = newScrollTop < nearTopThreshold
-      if newIsScrollingUp != isScrollingUp.contents {
-        setIsScrollingUp(_ => newIsScrollingUp)
-      }
-      if newIsNearTop != isNearTop.contents {
-        setIsNearTop(_ => newIsNearTop)
-      }
-      scrollTop := newScrollTop
-      isScrollingUp := newIsScrollingUp
-      isNearTop := newIsNearTop
-    }
-    window |> Window.addEventListener("scroll", onScroll)
-    Some(() => window |> Window.removeEventListener("scroll", onScroll))
-  })
-  let (showMenu, setShowMenu) = React.useState(() => false)
-  <div className=Styles.wrapper>
-    <div
-      className={Cn.make(list{
-        Styles.root,
-        Cn.ifTrue(Styles.rootWithMenu, showMenu),
-        Cn.ifTrue(Styles.rootIsScrollingUp, isScrollingUp),
-        Cn.ifTrue(Styles.rootIsNearTop, isNearTop),
-      })}>
-      <div className={Cn.make(list{Styles.nav, Styles.navLeft})}>
-        <div className=Styles.navLink>
-          <a
-            href="#"
-            onClick={e => {
-              ReactEvent.Mouse.preventDefault(e)
-              setShowMenu(show => !show)
-            }}>
-            {React.string("Menu")}
-          </a>
-        </div>
-        <div className=Styles.navLink>
-          <Link path="/" className=Styles.standardViewport> {React.string("Browse Items")} </Link>
-        </div>
-        {userHasFriends(user)
-          ? <div className=Styles.navLink>
-              <Link path="/friends" className=Styles.biggerViewport>
-                {React.string("Friends")}
-              </Link>
-            </div>
-          : React.null}
-      </div>
-      <div className=Styles.nav>
-        {switch user {
-        | Some(user) => <>
-            <div className=Styles.navLink>
-              <Link path={"/u/" ++ user.username}> {React.string(user.username)} </Link>
-            </div>
-          </>
-        | None => <>
-            <div className=Styles.navLink>
-              <a
-                href="#"
-                onClick={e => {
-                  onLogin()
-                  ReactEvent.Mouse.preventDefault(e)
-                }}>
-                {React.string("Register")}
-              </a>
-            </div>
-          </>
-        }}
-        <div className={Cn.make(list{Styles.navLink, Styles.standardViewport})}>
-          <a href="https://twitter.com/nookexchange" target="_blank"> {React.string("Twitter")} </a>
-        </div>
-      </div>
-    </div>
-    <Link path="/" className=Styles.logoLink>
-      <h1 className=Styles.logo> {React.string("Nook Exchange")} </h1>
-    </Link>
-    {showMenu ? <Menu user onLogin onClose={() => setShowMenu(_ => false)} /> : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/ImportPage.res b/jscomp/syntax/tests/idempotency/nook-exchange/ImportPage.res
deleted file mode 100644
index a25c903..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/ImportPage.res
+++ /dev/null
@@ -1,838 +0,0 @@
-open Belt
-
-module Styles = {
-  open Css
-  let root = style(list{margin3(~top=zero, ~bottom=px(32), ~h=auto)})
-  let body = style(list{maxWidth(px(512)), margin2(~v=zero, ~h=auto), padding2(~v=zero, ~h=px(16))})
-  let fetchingCatalogScanner = style(list{marginBottom(px(16))})
-  let textarea = style(list{
-    borderRadius(px(4)),
-    borderColor(Colors.lightGray),
-    width(pct(100.)),
-    minHeight(px(256)),
-    padding(px(8)),
-    boxSizing(borderBox),
-    marginBottom(px(8)),
-  })
-  let searchButtonRow = style(list{display(flexBox), justifyContent(flexEnd)})
-
-  let sectionTitle = style(list{fontSize(px(24)), marginBottom(px(8))})
-  let results = style(list{maxWidth(px(400)), margin2(~v=zero, ~h=auto)})
-  let missingRows = style(list{marginBottom(px(64))})
-  let missingRow = style(list{color(Colors.red)})
-  let matchRows = style(list{marginBottom(px(64))})
-  let itemRowName = style(list{
-    fontSize(px(16)),
-    marginBottom(px(4)),
-    display(flexBox),
-    justifyContent(spaceBetween),
-    alignItems(center),
-  })
-  let itemRowNameLink = style(list{
-    color(Colors.charcoal),
-    textDecoration(none),
-    hover(list{textDecoration(underline)}),
-  })
-  let itemRowVariants = style(list{width(pct(100.))})
-
-  let variantRowImageLink = style(list{marginRight(px(8))})
-  let variantRowImage = style(list{display(block), width(px(32)), height(px(32))})
-  let variantRowName = style(list{flexGrow(1.)})
-  let variantRow = style(list{
-    display(flexBox),
-    alignItems(center),
-    media(
-      "(hover: hover)",
-      list{hover(list{selector("& ." ++ variantRowName, list{fontWeight(#num(800))})})},
-    ),
-  })
-  let variantRowUserStatus = style(list{width(px(32))})
-  let radioButtons = style(list{display(flexBox)})
-  let radioButtonsBatchLabel = style(list{marginRight(px(8)), fontSize(px(12)), color(Colors.gray)})
-  let radioButtonsBatch = style(list{
-    display(flexBox),
-    alignItems(center),
-    opacity(0.1),
-    transition(~duration=200, "all"),
-    media("(hover: none)", list{opacity(0.5)}),
-  })
-  let itemRow = style(list{
-    marginBottom(px(16)),
-    media(
-      "(hover: hover)",
-      list{hover(list{selector("& ." ++ radioButtonsBatch, list{opacity(1.)})})},
-    ),
-  })
-  let radioButton = style(list{
-    backgroundColor(Colors.white),
-    borderStyle(solid),
-    borderColor(Colors.lightGray),
-    borderTopWidth(px(1)),
-    borderBottomWidth(px(1)),
-    borderLeftWidth(px(1)),
-    borderRightWidth(zero),
-    height(px(27)),
-    boxSizing(borderBox),
-    margin(zero),
-    padding2(~v=px(1), ~h=px(6)),
-    unsafe("touchAction", "manipulation"),
-    firstChild(list{borderTopLeftRadius(px(4)), borderBottomLeftRadius(px(4))}),
-    lastChild(list{
-      borderRightWidth(px(1)),
-      borderTopRightRadius(px(4)),
-      borderBottomRightRadius(px(4)),
-    }),
-  })
-  let radioButtonDisabled = style(list{opacity(0.1)})
-  let radioButtonSelected = style(list{
-    backgroundColor(hex("3aa56380")),
-    borderColor(Colors.green),
-    selector("& + ." ++ radioButton, list{borderLeftColor(Colors.green)}),
-  })
-
-  let resultsOverlay = style(list{
-    position(fixed),
-    bottom(zero),
-    backgroundColor(Colors.white),
-    padding(px(16)),
-    borderTopLeftRadius(px(8)),
-    borderTopRightRadius(px(8)),
-    left(pct(50.)),
-    width(px(512)),
-    boxSizing(borderBox),
-    marginLeft(px(-256)),
-    display(flexBox),
-    alignItems(center),
-    justifyContent(spaceBetween),
-    Colors.darkLayerShadow,
-    selector("& a", list{textDecoration(none), hover(list{textDecoration(underline)})}),
-    media("(max-width: 550px)", list{width(auto), left(zero), right(zero), marginLeft(zero)}),
-  })
-  let bulkActionsLink = style(list{})
-  let bulkActionsButtons = style(list{
-    display(flexBox),
-    flexDirection(column),
-    padding(px(16)),
-    backgroundColor(Colors.white),
-    borderRadius(px(8)),
-    Colors.darkLayerShadow,
-    selector(
-      "& > a",
-      list{
-        display(inlineBlock),
-        marginBottom(px(4)),
-        textDecoration(none),
-        hover(list{textDecoration(underline)}),
-      },
-    ),
-  })
-  let successBlock = style(list{
-    backgroundColor(Colors.white),
-    padding2(~v=px(16), ~h=px(16)),
-    borderRadius(px(8)),
-    marginBottom(px(32)),
-  })
-  let successMessage = style(list{flexGrow(1.), textAlign(#right), color(Colors.green)})
-  let errorMessage = style(list{flexGrow(1.), textAlign(#right), color(Colors.red)})
-  let saveButton = style(list{marginLeft(px(16))})
-}
-
-@deriving(jsConverter)
-type itemDestination = [
-  | @as("For Trade") #ForTrade
-  | @as("Can Craft") #CanCraft
-  | @as("Catalog Only") #CatalogOnly
-  | @as("Wishlist") #Wishlist
-  | @as("Ignore") #Ignore
-]
-
-let itemDestinationToEmoji = destination =>
-  switch destination {
-  | #ForTrade => j`🤝`
-  | #CanCraft => j`🔨`
-  | #CatalogOnly => j`📖`
-  | #Wishlist => j`🙏`
-  | #Ignore => j`🤝`
-  }
-
-module VariantRow = {
-  @react.component
-  let make = (~item: Item.t, ~variant, ~itemsState, ~onChange) => {
-    let renderDestinationOption = destination => {
-      let disabled = destination == #CanCraft && item.recipe == None
-      <button
-        onClick={_ => onChange(item.id, variant, destination)}
-        disabled
-        title={switch destination {
-        | #CanCraft => "Can Craft"
-        | #ForTrade => "For Trade"
-        | #Wishlist => "Wishlist"
-        | #CatalogOnly => "Catalog"
-        | #Ignore => "Skip"
-        }}
-        className={Cn.make(list{
-          Styles.radioButton,
-          Cn.ifTrue(
-            Styles.radioButtonSelected,
-            Js.Dict.get(itemsState, User.getItemKey(~itemId=item.id, ~variation=variant)) ==
-              Some(destination),
-          ),
-        })}>
-        <span className={Cn.ifTrue(Styles.radioButtonDisabled, disabled)}>
-          {React.string(destination == #Ignore ? "Skip" : itemDestinationToEmoji(destination))}
-        </span>
-      </button>
-    }
-
-    <div className=Styles.variantRow>
-      <Link
-        path={Utils.getItemDetailUrl(~itemId=item.id, ~variant=Some(variant))}
-        className=Styles.variantRowImageLink>
-        <img src={Item.getImageUrl(~item, ~variant)} className=Styles.variantRowImage />
-      </Link>
-      <div className=Styles.variantRowName>
-        {switch Item.getVariantName(~item, ~variant, ~hidePattern=true, ()) {
-        | Some(variantName) => React.string(variantName)
-        | None => React.null
-        }}
-      </div>
-      <div className=Styles.variantRowUserStatus>
-        {switch UserStore.getItem(~itemId=item.id, ~variation=variant) {
-        | Some(userItem) => <div> {React.string(User.itemStatusToEmoji(userItem.status))} </div>
-        | None => React.null
-        }}
-      </div>
-      <div className=Styles.radioButtons>
-        {renderDestinationOption(#ForTrade)}
-        {renderDestinationOption(#CanCraft)}
-        {renderDestinationOption(#CatalogOnly)}
-        {renderDestinationOption(#Wishlist)}
-        {renderDestinationOption(#Ignore)}
-      </div>
-    </div>
-  }
-}
-
-module ResultRowWithItem = {
-  @react.component
-  let make = (
-    ~item: Item.t,
-    ~variants,
-    ~itemsState,
-    ~onChange: (int, int, itemDestination) => unit,
-  ) => {
-    let renderDestinationOption = destination => {
-      let disabled = destination == #CanCraft && item.recipe == None
-      <button
-        onClick={_ =>
-          variants->Belt.Array.forEach(variant => onChange(item.id, variant, destination))}
-        disabled
-        className=Styles.radioButton>
-        <span className={Cn.ifTrue(Styles.radioButtonDisabled, disabled)}>
-          {React.string(destination == #Ignore ? "Skip" : itemDestinationToEmoji(destination))}
-        </span>
-      </button>
-    }
-
-    <div className=Styles.itemRow>
-      <div className=Styles.itemRowName>
-        <Link
-          path={Utils.getItemDetailUrl(~itemId=item.id, ~variant=None)}
-          className=Styles.itemRowNameLink>
-          {React.string(Item.getName(item))}
-        </Link>
-        {Js.Array.length(variants) > 1
-          ? <div className=Styles.radioButtonsBatch>
-              <span className=Styles.radioButtonsBatchLabel> {React.string("Quick")} </span>
-              <div className=Styles.radioButtons>
-                {renderDestinationOption(#ForTrade)}
-                {renderDestinationOption(#CanCraft)}
-                {renderDestinationOption(#CatalogOnly)}
-                {renderDestinationOption(#Wishlist)}
-                {renderDestinationOption(#Ignore)}
-              </div>
-            </div>
-          : React.null}
-      </div>
-      <div className=Styles.itemRowVariants>
-        {variants
-        |> Js.Array.map(variant =>
-          <VariantRow item variant itemsState onChange key={string_of_int(variant)} />
-        )
-        |> React.array}
-      </div>
-    </div>
-  }
-}
-
-module BulkActions = {
-  @react.component
-  let make = (~setItemStates) => {
-    let (showPopup, setShowPopup) = React.useState(() => false)
-    let reference = React.useRef(Js.Nullable.null)
-
-    <>
-      <a
-        href="#"
-        onClick={e => {
-          ReactEvent.Mouse.preventDefault(e)
-          setShowPopup(show => !show)
-        }}
-        className=Styles.bulkActionsLink
-        ref={ReactDOMRe.Ref.domRef(reference)}>
-        {React.string("Bulk actions")}
-      </a>
-      {showPopup
-        ? <ReactAtmosphere.PopperLayer
-            reference
-            onOutsideClick={() => setShowPopup(_ => false)}
-            options={
-              placement: Some("top"),
-              modifiers: Some([
-                {
-                  "name": "offset",
-                  "options": {
-                    "offset": [0, 4],
-                  },
-                },
-              ]),
-            }
-            render={_ =>
-              <div className=Styles.bulkActionsButtons>
-                <a
-                  href="#"
-                  onClick={e => {
-                    ReactEvent.Mouse.preventDefault(e)
-                    setItemStates(itemStates =>
-                      itemStates
-                      |> Js.Dict.entries
-                      |> Js.Array.map(((key, _value)) => (key, #Ignore))
-                      |> Js.Dict.fromArray
-                    )
-                    setShowPopup(_ => false)
-                    Analytics.Amplitude.logEventWithProperties(
-                      ~eventName="Item Import Bulk Set",
-                      ~eventProperties={"destination": "skip"},
-                    )
-                  }}>
-                  {React.string("Set every item to Skip")}
-                </a>
-                <a
-                  href="#"
-                  onClick={e => {
-                    ReactEvent.Mouse.preventDefault(e)
-                    setItemStates(itemStates =>
-                      itemStates
-                      |> Js.Dict.entries
-                      |> Js.Array.map(((key, _value)) => (key, #ForTrade))
-                      |> Js.Dict.fromArray
-                    )
-                    setShowPopup(_ => false)
-                    Analytics.Amplitude.logEventWithProperties(
-                      ~eventName="Item Import Bulk Set",
-                      ~eventProperties={"destination": "for-trade"},
-                    )
-                  }}>
-                  {React.string("Set every item to For Trade")}
-                </a>
-                <a
-                  href="#"
-                  onClick={e => {
-                    ReactEvent.Mouse.preventDefault(e)
-                    setItemStates(itemStates =>
-                      itemStates
-                      |> Js.Dict.entries
-                      |> Js.Array.map(((key, _value)) => (key, #CatalogOnly))
-                      |> Js.Dict.fromArray
-                    )
-                    setShowPopup(_ => false)
-                    Analytics.Amplitude.logEventWithProperties(
-                      ~eventName="Item Import Bulk Set",
-                      ~eventProperties={"destination": "catalog"},
-                    )
-                  }}>
-                  {React.string("Set every item to Catalog")}
-                </a>
-                <a
-                  href="#"
-                  onClick={e => {
-                    ReactEvent.Mouse.preventDefault(e)
-                    setItemStates(itemStates =>
-                      itemStates
-                      |> Js.Dict.entries
-                      |> Js.Array.map(((key, value)) => {
-                        let (itemId, _variant) = User.fromItemKey(~key)->Option.getExn
-                        let item = Item.getItem(~itemId)
-                        (
-                          key,
-                          if item.recipe != None {
-                            #CanCraft
-                          } else {
-                            value
-                          },
-                        )
-                      })
-                      |> Js.Dict.fromArray
-                    )
-                    setShowPopup(_ => false)
-                    Analytics.Amplitude.logEventWithProperties(
-                      ~eventName="Item Import Bulk Set",
-                      ~eventProperties={"destination": "can-craft"},
-                    )
-                  }}>
-                  {React.string("Set every craftable item to Can Craft")}
-                </a>
-                <a
-                  href="#"
-                  onClick={e => {
-                    ReactEvent.Mouse.preventDefault(e)
-                    setItemStates(itemStates =>
-                      itemStates
-                      |> Js.Dict.entries
-                      |> Js.Array.map(((key, _value)) => (key, #Wishlist))
-                      |> Js.Dict.fromArray
-                    )
-                    setShowPopup(_ => false)
-                    Analytics.Amplitude.logEventWithProperties(
-                      ~eventName="Item Import Bulk Set",
-                      ~eventProperties={"destination": "wishlist"},
-                    )
-                  }}>
-                  {React.string("Set every item to Wishlist")}
-                </a>
-              </div>}
-          />
-        : React.null}
-    </>
-  }
-}
-
-module Results = {
-  type submitState =
-    | Submitting
-    | Success
-    | Error(string)
-
-  @react.component
-  let make = (
-    ~me: User.t,
-    ~matches: array<(Item.t, array<int>)>,
-    ~misses: array<string>,
-    ~onReset,
-  ) => {
-    let (itemsState, setItemStates) = React.useState(() =>
-      Js.Dict.fromArray(
-        Array.concatMany(
-          matches->Array.map(((item, variants)) =>
-            variants->Belt.Array.map(variant => (
-              User.getItemKey(~itemId=item.id, ~variation=variant),
-              switch UserStore.getItem(~itemId=item.id, ~variation=variant) {
-              | Some(userItem) =>
-                switch userItem.status {
-                | CanCraft => #CanCraft
-                | ForTrade => #ForTrade
-                | CatalogOnly => #CatalogOnly
-                | Wishlist => #Ignore
-                }
-              | None => #Ignore
-              },
-            ))
-          ),
-        ),
-      )
-    )
-    let (submitStatus, setSubmitState) = React.useState(() => None)
-
-    let numMissingRows = Array.length(misses)
-    let numMatchingRows = Array.length(matches)
-    React.useEffect0(() => {
-      Analytics.Amplitude.logEventWithProperties(
-        ~eventName="Import Page List Processed",
-        ~eventProperties={
-          "numMismatch": numMissingRows,
-          "numMatch": numMatchingRows,
-        },
-      )
-      None
-    })
-
-    <div className=Styles.results>
-      {submitStatus == Some(Success)
-        ? <div className=Styles.successBlock>
-            {React.string("Your import was successful! Go to ")}
-            <Link path={"/u/" ++ me.username}> {React.string("your profile")} </Link>
-            {React.string("!")}
-          </div>
-        : React.null}
-      {Js.Array.length(misses) > 0
-        ? <div className=Styles.missingRows>
-            <div className=Styles.sectionTitle> {React.string("Items without matches")} </div>
-            {misses
-            ->Array.mapWithIndex((i, query) =>
-              <div className=Styles.missingRow key={string_of_int(i)}> {React.string(query)} </div>
-            )
-            ->React.array}
-          </div>
-        : React.null}
-      {Js.Array.length(matches) > 0
-        ? <div className=Styles.matchRows>
-            {matches
-            ->Belt.Array.map(((item, variants)) =>
-              <ResultRowWithItem
-                item
-                variants
-                itemsState
-                onChange={(itemId, variant, destination) =>
-                  setItemStates(itemsState => {
-                    let clone = Utils.cloneJsDict(itemsState)
-                    clone->Js.Dict.set(User.getItemKey(~itemId, ~variation=variant), destination)
-                    clone
-                  })}
-                key={string_of_int(item.id)}
-              />
-            )
-            ->React.array}
-          </div>
-        : <div>
-            {React.string("No items were matched. ")}
-            <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                onReset()
-              }}>
-              {React.string("Start over")}
-            </a>
-          </div>}
-      <div className=Styles.resultsOverlay>
-        <BulkActions setItemStates />
-        {switch submitStatus {
-        | Some(Success) => <div className=Styles.successMessage> {React.string("Success!")} </div>
-        | Some(Error(error)) => <div className=Styles.errorMessage> {React.string(error)} </div>
-        | _ =>
-          <div className=Styles.successMessage>
-            <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                onReset()
-              }}>
-              {React.string("Start over")}
-            </a>
-          </div>
-        }}
-        <Button
-          onClick={_ => {
-            let numForTrade = ref(0)
-            let numCanCraft = ref(0)
-            let numCatalog = ref(0)
-            let numWishlist = ref(0)
-            itemsState
-            ->Js.Dict.entries
-            ->Array.forEach(((_itemKey, destination)) =>
-              switch destination {
-              | #ForTrade => numForTrade := numForTrade.contents + 1
-              | #CanCraft => numCanCraft := numCanCraft.contents + 1
-              | #CatalogOnly => numCatalog := numCatalog.contents + 1
-              | #Wishlist => numWishlist := numWishlist.contents + 1
-              | #Ignore => ()
-              }
-            )
-            if (
-              numForTrade.contents +
-              numCanCraft.contents +
-              numCatalog.contents +
-              numWishlist.contents != 0
-            ) {
-              ConfirmDialog.confirm(
-                ~bodyText="This will add " ++
-                (Js.Array.joinWith(
-                  ", ",
-                  Array.keepMap(
-                    [
-                      switch numForTrade.contents {
-                      | 0 => None
-                      | numForTrade => Some(string_of_int(numForTrade) ++ " For Trade")
-                      },
-                      switch numCanCraft.contents {
-                      | 0 => None
-                      | numCanCraft => Some(string_of_int(numCanCraft) ++ " Can Craft")
-                      },
-                      switch numWishlist.contents {
-                      | 0 => None
-                      | numWishlist => Some(string_of_int(numWishlist) ++ " Wishlist")
-                      },
-                      switch numCatalog.contents {
-                      | 0 => None
-                      | numCatalog => Some(string_of_int(numCatalog) ++ " Catalog")
-                      },
-                    ],
-                    x => x,
-                  ),
-                ) ++
-                " items. Are you sure you want to continue?"),
-                ~confirmLabel="Do it!",
-                ~cancelLabel="Never mind",
-                ~onConfirm=() => {
-                  setSubmitState(_ => Some(Submitting))
-                  let updates =
-                    itemsState
-                    ->Js.Dict.entries
-                    ->Array.keepMap(((itemKey, value)) =>
-                      switch value {
-                      | #Ignore => None
-                      | #CanCraft =>
-                        Some((Option.getExn(User.fromItemKey(~key=itemKey)), User.CanCraft))
-                      | #ForTrade =>
-                        Some((Option.getExn(User.fromItemKey(~key=itemKey)), User.ForTrade))
-                      | #Wishlist =>
-                        Some((Option.getExn(User.fromItemKey(~key=itemKey)), User.Wishlist))
-                      | #CatalogOnly =>
-                        Some((Option.getExn(User.fromItemKey(~key=itemKey)), User.CatalogOnly))
-                      }
-                    )
-                  %Repromise({
-                    let responseResult = API.importItems(
-                      ~sessionId=UserStore.sessionId.contents,
-                      ~updates,
-                    )
-                    switch responseResult {
-                    | Ok(response) =>
-                      if Fetch.Response.status(response) < 400 {
-                        UserStore.init()
-                        setSubmitState(_ => Some(Success))
-                        Analytics.Amplitude.logEventWithProperties(
-                          ~eventName="Item Import Success",
-                          ~eventProperties={
-                            "numMismatch": numMissingRows,
-                            "numMatch": numMatchingRows,
-                            "numUpdates": Js.Array.length(updates),
-                          },
-                        )
-                        Promise.resolved()
-                      } else {
-                        %Repromise.JsExn({
-                          let text = Fetch.Response.text(response)
-                          Analytics.Amplitude.logEventWithProperties(
-                            ~eventName="Item Import Error",
-                            ~eventProperties={
-                              "error": text,
-                              "numMismatch": numMissingRows,
-                              "numMatch": numMatchingRows,
-                              "numUpdates": Js.Array.length(updates),
-                            },
-                          )
-                          setSubmitState(_ => Some(Error(text)))
-                          Promise.resolved()
-                        })
-                      }
-                    | Error(_error) =>
-                      setSubmitState(_ => Some(Error("Something went wrong. Sorry!")))
-                      Promise.resolved()
-                    }
-                  }) |> ignore
-                },
-                (),
-              )
-            }
-          }}
-          disabled={submitStatus == Some(Submitting)}
-          className=Styles.saveButton>
-          {React.string("Save changes")}
-        </Button>
-      </div>
-    </div>
-  }
-}
-
-let process = value => {
-  let rows =
-    value
-    |> Js.String.split("\n")
-    |> Js.Array.map(str => str |> Js.String.trim)
-    |> Js.Array.filter(x => x != "")
-  let resultMap = Js.Dict.empty()
-  let missingQueries = []
-  rows->Array.forEach(row => {
-    let result = row |> Js.Re.exec_(%re("/(.*?) \[(.*?)\]$/g"))
-    let itemWithVariant = switch result {
-    | Some(match_) =>
-      let captures = Js.Re.captures(match_)
-      let itemName = Array.getUnsafe(captures, 1)->Js.Nullable.toOption
-      let variantName = Array.getUnsafe(captures, 2)->Js.Nullable.toOption
-      switch (itemName, variantName) {
-      | (Some(itemName), Some(variantName)) =>
-        Item.getByName(~name=itemName)->Option.flatMap(item =>
-          Item.getVariantByName(~item, ~variantName)->Option.map(variant => (item, variant))
-        )
-      | _ => None
-      }
-    | None => None
-    }
-    let itemWithVariants = switch itemWithVariant {
-    | Some((item, variant)) => Some((item, [variant]))
-    | None =>
-      Item.getByName(~name=row)->Option.map(item => (item, Item.getCollapsedVariants(~item)))
-    }
-    switch itemWithVariants {
-    | Some((item, variants)) =>
-      let resultMapVariants = switch resultMap->Js.Dict.get(string_of_int(item.id)) {
-      | Some(arr) => arr
-      | None =>
-        let arr = []
-        resultMap->Js.Dict.set(string_of_int(item.id), arr)
-        arr
-      }
-      variants |> Js.Array.forEach(variant =>
-        if !(resultMapVariants |> Js.Array.includes(variant)) {
-          resultMapVariants |> Js.Array.push(variant) |> ignore
-        }
-      )
-    | None => missingQueries |> Js.Array.push(row) |> ignore
-    }
-  })
-  (
-    resultMap
-    ->Js.Dict.entries
-    ->Array.map(((itemId, variants)) => (Item.getItem(~itemId=int_of_string(itemId)), variants))
-      |> Js.Array.sortInPlaceWith(((aItem, _), (bItem, _)) =>
-        ItemFilters.compareItemsABC(aItem, bItem)
-      ),
-    missingQueries,
-  )
-}
-
-@react.component
-let make = (~showLogin, ~url: ReasonReactRouter.url) => {
-  let userState = UserStore.useStore()
-  let (value, setValue) = React.useState(() => "")
-  let (results, setResults) = React.useState(() => None)
-  let (isFetchingFromCatalogScanner, setIsFetchingFromCatalogScanner) = React.useState(() => false)
-  let onSubmit = e => {
-    ReactEvent.Form.preventDefault(e)
-    setResults(_ => Some(process(value)))
-  }
-
-  let needsLogin = userState == NotLoggedIn
-  React.useEffect1(() => {
-    if needsLogin {
-      showLogin()
-    }
-    None
-  }, [needsLogin])
-  React.useEffect0(() => {
-    open Webapi.Url.URLSearchParams
-    let searchParams = make(url.search)
-    let catalogScannerId = searchParams |> get("cs")
-    switch catalogScannerId {
-    | Some(catalogScannerId) =>
-      setIsFetchingFromCatalogScanner(_ => true)
-      %Repromise.Js({
-        let response = Fetch.fetchWithInit(
-          j`https://ehsan.lol/$catalogScannerId/raw`,
-          Fetch.RequestInit.make(~method_=Get, ~mode=CORS, ()),
-        )
-        setIsFetchingFromCatalogScanner(_ => false)
-        switch response {
-        | Ok(response) =>
-          if Fetch.Response.status(response) < 400 {
-            %Repromise.JsExn({
-              let text = Fetch.Response.text(response)
-              setResults(_ => Some(process(text)))
-              Promise.resolved()
-            })
-          } else {
-            Promise.resolved()
-          }
-        | Error(_) => Promise.resolved()
-        }
-      })
-    | None => Promise.resolved()
-    } |> ignore
-    Analytics.Amplitude.logEvent(~eventName="Import Page Viewed")
-    None
-  })
-
-  <div className=Styles.root>
-    <PageTitle title="Import items" />
-    {switch userState {
-    | LoggedIn(me) =>
-      switch results {
-      | Some((matches, misses)) =>
-        <div>
-          <BodyCard>
-            <p>
-              {React.string(j`For each item, choose For Trade 🤝, Can Craft 🔨, Catalog 📖 or skip. If the item is already in your profile, you will see the status next to the selector.`)}
-            </p>
-            <p>
-              {React.string(j`On Nook Exchange, customizable variations are hidden. That is why you do not see all colors and patterns here.`)}
-            </p>
-            <p>
-              {React.string(
-                "When you are done, press the Save button in the bottom bar. There are bulk actions to help as well!",
-              )}
-            </p>
-          </BodyCard>
-          <div className=Styles.body>
-            <Results
-              me
-              matches
-              misses
-              onReset={() => {
-                setResults(_ => None)
-                setValue(_ => "")
-              }}
-            />
-          </div>
-        </div>
-      | None =>
-        <div>
-          <BodyCard>
-            <p>
-              {React.string(
-                "Have a big collection? This tool can help you add many items at once. Start by pasting a list of item names in the textbox. ",
-              )}
-              <a href="https://twitter.com/nookexchange" target="_blank">
-                {React.string("Let us know")}
-              </a>
-              {React.string(" if you have issues.")}
-            </p>
-            <p>
-              {React.string("If you don't want to type each item, check out ")}
-              <a href="https://twitter.com/CatalogScanner" target="_blank">
-                {React.string("Catalog Scanner")}
-              </a>
-              {React.string(" by ")}
-              <a href="https://twitter.com/@ehsankia_" target="_blank">
-                {React.string("Ehsan Kia")}
-              </a>
-              {React.string("!")}
-            </p>
-          </BodyCard>
-          <div className=Styles.body>
-            {isFetchingFromCatalogScanner
-              ? <div className=Styles.fetchingCatalogScanner>
-                  {React.string("Fetching from Catalog Scanner...")}
-                </div>
-              : React.null}
-            <form onSubmit>
-              <textarea
-                value
-                placeholder="Enter each item name on its own line"
-                onChange={e => {
-                  let value = ReactEvent.Form.target(e)["value"]
-                  setValue(_ => value)
-                }}
-                className=Styles.textarea
-              />
-              <div className=Styles.searchButtonRow>
-                <Button> {React.string("Search for items")} </Button>
-              </div>
-            </form>
-          </div>
-        </div>
-      }
-    | _ => React.null
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Index.res b/jscomp/syntax/tests/idempotency/nook-exchange/Index.res
deleted file mode 100644
index b65ae76..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Index.res
+++ /dev/null
@@ -1,27 +0,0 @@
-@module("@sentry/browser")
-external initSentry: {"dsn": string, "ignoreErrors": array<string>} => unit = "init"
-
-@set
-external setOnError: (
-  Webapi.Dom.Window.t,
-  (string, string, int, int, {"stack": string}) => unit,
-) => unit = "onerror"
-
-initSentry({
-  "dsn": Constants.sentryId,
-  "ignoreErrors": ["Failed to execute 'insertBefore' on 'Node'", "Loading chunk"],
-})
-Analytics.Amplitude.init()
-Webapi.Dom.window->setOnError((message, url, _line, _column, error) =>
-  Analytics.Amplitude.logEventWithProperties(
-    ~eventName="Error Raised",
-    ~eventProperties={
-      "message": message,
-      "url": url,
-      "errorStack": error["stack"],
-    },
-  )
-)
-UserStore.init()
-
-ReactDOMRe.renderToElementWithId(<App />, "container")
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Item.res b/jscomp/syntax/tests/idempotency/nook-exchange/Item.res
deleted file mode 100644
index 8269aec..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Item.res
+++ /dev/null
@@ -1,372 +0,0 @@
-type recipeMaterial = (string, int)
-type recipe = array<recipeMaterial>
-
-type variations =
-  | Single
-  | OneDimension(int)
-  | TwoDimensions(int, int)
-
-type image =
-  | Base(string)
-  | Array(array<string>)
-type type_ =
-  | Item(option<int>)
-  | Recipe(int)
-type t = {
-  id: int,
-  type_: type_,
-  name: string,
-  image: image,
-  variations: variations,
-  sellPrice: option<int>,
-  buyPrice: option<int>,
-  recipe: option<recipe>,
-  orderable: bool,
-  source: option<string>,
-  bodyCustomizable: bool,
-  patternCustomizable: bool,
-  customizeCost: option<int>,
-  category: string,
-  version: option<string>,
-  tags: array<string>,
-}
-
-let categories = [
-  "housewares",
-  "miscellaneous",
-  "wall-mounted",
-  "wallpapers",
-  "floors",
-  "rugs",
-  "tops",
-  "bottoms",
-  "dresses",
-  "headwear",
-  "accessories",
-  "socks",
-  "shoes",
-  "bags",
-  "umbrellas",
-  "wetsuits",
-  "fossils",
-  "photos",
-  "posters",
-  "fencing",
-  "tools",
-  "music",
-  "other",
-]
-let validCategoryStrings = ["furniture", "clothing", "recipes"]->Belt.Array.concat(categories)
-
-let furnitureCategories = ["housewares", "miscellaneous", "wall-mounted"]
-
-let clothingCategories = [
-  "tops",
-  "bottoms",
-  "dresses",
-  "headwear",
-  "accessories",
-  "socks",
-  "shoes",
-  "bags",
-  "umbrellas",
-  "wetsuits",
-]
-
-@val @scope("window") external itemsJson: Js.Json.t = "items"
-@val @scope("window") external variantsJson: Js.Json.t = "variants"
-
-let loadTranslation: (string, Js.Json.t => unit) => unit = %raw(`function(language, callback) {
-    import(/* webpackChunkName */ './translations/' + language + '.json').then(j => callback(j.default))
-  }`)
-
-exception UnexpectedType(string)
-
-let spaceRegex = %re("/\\s/g")
-
-exception Unexpected
-let jsonToItems = (json: Js.Json.t) => {
-  open Json.Decode
-  let flags = json |> field("flags", int)
-  let recipeInfo = json |> optional(
-    field("recipe", json => {
-      let jsonArray = Js.Json.decodeArray(json)->Belt.Option.getExn
-      (
-        -int(jsonArray[0]),
-        string(jsonArray[1]),
-        jsonArray
-        |> Js.Array.sliceFrom(2)
-        |> Js.Array.map(json => {
-          let (quantity, itemName) = json |> tuple2(int, string)
-          (itemName, quantity)
-        }),
-      )
-    }),
-  )
-  let item = {
-    id: json |> field("id", int),
-    type_: Item(recipeInfo->Belt.Option.map(((recipeId, _, _)) => recipeId)),
-    name: json |> field("name", string),
-    image: json |> field(
-      "image",
-      oneOf(list{json => Base(string(json)), json => Array(array(string, json))}),
-    ),
-    variations: switch json |> field("variants", array(int)) {
-    | [] => Single
-    | [a] => OneDimension(a)
-    | [a, b] => TwoDimensions(a, b)
-    | _ => raise(Unexpected)
-    },
-    sellPrice: json |> optional(field("sell", int)),
-    buyPrice: json |> optional(field("buy", int)),
-    recipe: recipeInfo->Belt.Option.map(((_, _, recipe)) => recipe),
-    orderable: land(flags, 2) !== 0,
-    source: json |> optional(field("source", string)),
-    bodyCustomizable: land(flags, 4) != 0,
-    patternCustomizable: land(flags, 8) != 0,
-    customizeCost: json |> optional(field("kitCost", int)),
-    category: json |> field("category", string),
-    version: json |> optional(field("v", string)),
-    tags: (json |> optional(field("tags", array(string))))->Belt.Option.getWithDefault([]),
-  }
-  let items = switch recipeInfo {
-  | Some((recipeId, recipeSource, _)) => [
-      item,
-      {
-        ...item,
-        id: recipeId,
-        type_: Recipe(item.id),
-        name: item.name ++ " DIY",
-        sellPrice: None,
-        buyPrice: None,
-        source: Some(recipeSource),
-        customizeCost: None,
-        orderable: false,
-        bodyCustomizable: false,
-        patternCustomizable: false,
-      },
-    ]
-  | None => [item]
-  }
-  items |> Js.Array.map((item: t) => {
-    let extraTags = []
-    switch item.source {
-    | Some(source) =>
-      if source == "Jolly Redd's Treasure Trawler" {
-        extraTags |> Js.Array.push("redd") |> ignore
-      }
-    | None => ()
-    }
-    {...item, tags: item.tags |> Js.Array.concat(extraTags)}
-  })
-}
-
-let all = itemsJson |> Json.Decode.array(jsonToItems) |> Belt.Array.concatMany
-
-let itemMap = {
-  let itemMap = Js.Dict.empty()
-  all->Belt.Array.forEach(item => itemMap->Js.Dict.set(string_of_int(item.id), item))
-  itemMap
-}
-let getItem = (~itemId) => itemMap->Js.Dict.unsafeGet(string_of_int(itemId))
-
-exception UnexpectedVersion(string)
-let getImageUrl = (~item, ~variant) =>
-  Constants.cdnUrl ++
-  ("/items/" ++
-  (switch item.image {
-  | Base(base) =>
-    base ++
-    switch (item.category, item.variations) {
-    | (_, Single) => ""
-    | (_, OneDimension(_)) => string_of_int(variant)
-    | (_, TwoDimensions(_a, b)) =>
-      "_" ++ (string_of_int(variant / b) ++ ("_" ++ string_of_int(mod(variant, b))))
-    }
-  | Array(variantImages) => variantImages[variant]
-  } ++ ".png"))
-
-let isRecipe = (~item: t) =>
-  switch item.type_ {
-  | Item(_) => false
-  | Recipe(_) => true
-  }
-
-let getRecipeIdForItem = (~item: t) =>
-  switch item.type_ {
-  | Item(recipeId) => recipeId
-  | Recipe(_) => raise(Constants.Uhoh)
-  }
-
-let getItemIdForRecipe = (~recipe: t) =>
-  switch recipe.type_ {
-  | Recipe(itemId) => itemId
-  | Item(_) => raise(Constants.Uhoh)
-  }
-
-let getNumVariations = (~item) =>
-  if isRecipe(~item) {
-    1
-  } else {
-    switch item.variations {
-    | Single => 1
-    | OneDimension(a) => a
-    | TwoDimensions(a, b) => a * b
-    }
-  }
-
-let getCollapsedVariants = (~item: t) =>
-  switch (item.type_, item.variations) {
-  | (Recipe(_), _)
-  | (_, Single) => [0]
-  | (_, OneDimension(a)) => Array.make(a, None)->Belt.Array.mapWithIndex((i, _) => i)
-  | (_, TwoDimensions(a, b)) =>
-    if item.bodyCustomizable {
-      [0]
-    } else {
-      Array.make(a, None)->Belt.Array.mapWithIndex((i, _) => i * b)
-    }
-  }
-
-let getCanonicalVariant = (~item, ~variant) =>
-  switch item.variations {
-  | Single => 0
-  | OneDimension(_a) => variant
-  | TwoDimensions(_a, b) =>
-    if item.bodyCustomizable {
-      0
-    } else {
-      variant / b * b
-    }
-  }
-
-type variantNames =
-  | NameOneDimension(array<string>)
-  | NameTwoDimensions((array<string>, array<string>))
-let variantNames: Js.Dict.t<variantNames> = variantsJson |> {
-  open Json.Decode
-  dict(
-    oneOf(list{
-      json => NameTwoDimensions(json |> tuple2(array(string), array(string))),
-      json => NameOneDimension(json |> array(string)),
-    }),
-  )
-}
-
-let loadTranslation: (string, Js.Json.t => unit) => unit = %raw(`function(language, callback) {
-    import(/* webpackChunkName */ './translations/' + language + '.json').then(j => callback(j.default))
-  }`)
-type translationItem = {
-  name: string,
-  variants: option<variantNames>,
-}
-type translations = {
-  items: Js.Dict.t<translationItem>,
-  materials: Js.Dict.t<string>,
-}
-let translations: ref<option<translations>> = ref(None)
-let setTranslations = json => {
-  open Json.Decode
-  translations :=
-    Some({
-      items: json |> field(
-        "items",
-        dict(json => {
-          let row = Js.Json.decodeArray(json)->Belt.Option.getExn
-          {
-            name: string(row[0]),
-            variants: Belt.Option.map(Belt.Array.get(row, 1), json =>
-              json |> oneOf(list{
-                json => NameTwoDimensions(json |> tuple2(array(string), array(string))),
-                json => NameOneDimension(json |> array(string)),
-              })
-            ),
-          }
-        }),
-      ),
-      materials: json |> field("materials", dict(string)),
-    })
-}
-let clearTranslations = () => translations := None
-
-let getName = (item: t) =>
-  switch item.type_ {
-  | Recipe(itemId) =>
-    open Belt
-    translations.contents
-    ->Option.flatMap(translations => Js.Dict.get(translations.items, string_of_int(itemId)))
-    ->Option.map(translation => translation.name ++ " DIY")
-    ->Option.getWithDefault(item.name)
-  | Item(_) =>
-    open Belt
-    translations.contents
-    ->Option.flatMap(translations => Js.Dict.get(translations.items, string_of_int(item.id)))
-    ->Option.map(translation => translation.name)
-    ->Option.getWithDefault(item.name)
-  }
-
-let getVariantName = (~item: t, ~variant: int, ~hideBody=false, ~hidePattern=false, ()) => {
-  open Belt
-  switch item.variations {
-  | Single => None
-  | OneDimension(_) =>
-    switch translations.contents
-    ->Option.flatMap(translations => Js.Dict.get(translations.items, string_of_int(item.id)))
-    ->Option.flatMap(translationItem => translationItem.variants) {
-    | Some(value) => Some(value)
-    | None => variantNames->Js.Dict.get(_, string_of_int(item.id))
-    }->Option.flatMap(value =>
-      switch value {
-      | NameOneDimension(names) => Some(Option.getExn(names[variant]))
-      | _ => None
-      }
-    )
-  | TwoDimensions(_a, b) =>
-    switch translations.contents
-    ->Option.flatMap(translations => Js.Dict.get(translations.items, string_of_int(item.id)))
-    ->Option.flatMap(translationItem => translationItem.variants) {
-    | Some(value) => Some(value)
-    | None => variantNames->Js.Dict.get(_, string_of_int(item.id))
-    }->Belt.Option.flatMap(value =>
-      switch value {
-      | NameTwoDimensions((nameA, nameB)) =>
-        let bodyName = Option.getExn(nameA[variant / b])
-        Some(
-          (!hideBody ? bodyName : "") ++
-          ((!hideBody && (!hidePattern && (b > 1 && bodyName != "")) ? " x " : "") ++
-          if !hidePattern && b > 1 {
-            Option.getExn(nameB[mod(variant, b)])
-          } else {
-            ""
-          }),
-        )
-      | _ => None
-      }
-    )
-  }
-}
-
-let getMaterialName = (material: string) => {
-  open Belt
-  translations.contents
-  ->Option.flatMap(translations => Js.Dict.get(translations.materials, material))
-  ->Option.getWithDefault(material)
-}
-
-let getCanonicalName = text => Js.String.toLowerCase(text) |> Js.String.replaceByRe(spaceRegex, "-")
-let getByName = (~name: string) => {
-  let searchName = getCanonicalName(name)
-  all->Belt.Array.getBy((item: t) =>
-    getCanonicalName(item.name) == searchName || getCanonicalName(getName(item)) == searchName
-  )
-}
-
-let getVariantByName = (~item: t, ~variantName: string) => {
-  let collapsedVariants = getCollapsedVariants(~item)
-  collapsedVariants->Belt.Array.getBy(variant =>
-    switch getVariantName(~item, ~variant, ~hidePattern=true, ()) {
-    | Some(name) => getCanonicalName(name) == getCanonicalName(variantName)
-    | None => false
-    }
-  )
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/ItemBrowser.res b/jscomp/syntax/tests/idempotency/nook-exchange/ItemBrowser.res
deleted file mode 100644
index bdc1f15..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/ItemBrowser.res
+++ /dev/null
@@ -1,241 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{
-    margin2(~v=zero, ~h=auto),
-    padding2(~v=zero, ~h=px(16)),
-    media("(min-width: 600px)", list{width(px(544))}),
-    media("(min-width: 940px)", list{width(px(832))}),
-    media("(min-width: 1200px)", list{width(px(1120))}),
-    media("(min-width: 1520px)", list{width(px(1408))}),
-  })
-  let cards = style(list{
-    display(flexBox),
-    flexWrap(wrap),
-    marginRight(px(-32)),
-    justifyContent(flexStart),
-    media("(max-width: 600px)", list{marginRight(px(-16))}),
-  })
-  let filterBarTop = style(list{
-    display(flexBox),
-    alignItems(center),
-    media(
-      "(max-width: 600px)",
-      list{
-        marginLeft(px(-16)),
-        marginRight(px(-16)),
-        paddingLeft(px(16)),
-        overflowX(auto),
-        selector(
-          "& ." ++ ItemFilters.CategoryButtons.CategoryStyles.button,
-          list{marginBottom(zero)},
-        ),
-        selector(
-          "& ." ++ ItemFilters.CategoryButtons.CategoryStyles.select,
-          list{marginBottom(zero)},
-        ),
-      },
-    ),
-  })
-  let filterBar = style(list{
-    display(flexBox),
-    justifyContent(spaceBetween),
-    marginBottom(px(16)),
-    flexWrap(wrap),
-    alignItems(center),
-  })
-  let filters = style(list{media("(max-width: 939px)", list{width(pct(100.))})})
-  let topPager = style(list{marginBottom(px(8))})
-  let bottomFilterBar = style(list{display(flexBox), justifyContent(flexEnd)})
-  let noResults = style(list{fontSize(px(20)), paddingTop(px(32))})
-}
-
-let getNumResultsPerPage = () => {
-  open Webapi.Dom
-  let windowWidth = window |> Window.innerWidth
-  if windowWidth >= 1520 {
-    50
-  } else if windowWidth >= 1200 {
-    40
-  } else {
-    24
-  }
-}
-
-let getUrl = (~url: ReasonReactRouter.url, ~urlSearchParams: Webapi.Url.URLSearchParams.t) =>
-  "/" ++
-  (Js.Array.joinWith("/", Belt.List.toArray(url.path)) ++
-  switch Webapi.Url.URLSearchParams.toString(urlSearchParams) {
-  | "" => ""
-  | search => "?" ++ search
-  })
-
-@react.component
-let make = (~showLogin, ~url: ReasonReactRouter.url) => {
-  let isLoggedIn = UserStore.useIsLoggedIn()
-  let viewportWidth = Utils.useViewportWidth()
-  let (numResultsPerPage, _setNumResultsPerPage) = React.useState(() => getNumResultsPerPage())
-  let (filters, pageOffset) = React.useMemo1(
-    () => ItemFilters.fromUrlSearch(~urlSearch=url.search, ~defaultSort=SellPriceDesc),
-    [url.search],
-  )
-  let numFiltersChangeLogged = React.useRef(0)
-  let setFilters = (filters: ItemFilters.t) => {
-    let urlSearchParams = Webapi.Url.URLSearchParams.makeWithArray(
-      ItemFilters.serialize(~filters, ~defaultSort=SellPriceDesc, ~pageOffset=0),
-    )
-    ReasonReactRouter.push(getUrl(~url, ~urlSearchParams))
-    if React.Ref.current(numFiltersChangeLogged) < 2 {
-      Analytics.Amplitude.logEventWithProperties(
-        ~eventName="Filters Changed",
-        ~eventProperties={
-          "filterText": filters.text,
-          "filterMask": filters.mask,
-          "filterCategory": filters.category,
-          "filterSort": filters.sort,
-        },
-      )
-      React.Ref.setCurrent(numFiltersChangeLogged, React.Ref.current(numFiltersChangeLogged) + 1)
-    }
-  }
-  let rootRef = React.useRef(Js.Nullable.null)
-  let setPageOffset = f => {
-    let nextPageOffset = f(pageOffset)
-    let urlSearchParams = Webapi.Url.URLSearchParams.makeWithArray(
-      ItemFilters.serialize(~filters, ~defaultSort=SellPriceDesc, ~pageOffset=nextPageOffset),
-    )
-    ReasonReactRouter.push(getUrl(~url, ~urlSearchParams))
-  }
-  let excludeString = filters.exclude |> Js.Array.joinWith(",")
-  let excludeUserItemIds = React.useMemo2(() =>
-    if isLoggedIn && Js.Array.length(filters.exclude) > 0 {
-      let userItems = UserStore.getUser().items
-      let userItemMap = Js.Dict.empty()
-      userItems
-      ->Js.Dict.entries
-      ->Belt.Array.forEach(((itemKey, userItem)) =>
-        if (
-          switch userItem.status {
-          | Wishlist => filters.exclude |> Js.Array.includes(ItemFilters.Wishlist)
-          | CanCraft =>
-            filters.exclude |> Js.Array.includes(ItemFilters.Catalog) ||
-              filters.exclude |> Js.Array.includes(ItemFilters.CanCraft)
-          | CatalogOnly
-          | ForTrade =>
-            filters.exclude |> Js.Array.includes(ItemFilters.Catalog)
-          }
-        ) {
-          let (itemId, variant) = User.fromItemKey(~key=itemKey)->Belt.Option.getExn
-          let itemVariantList = switch Js.Dict.get(userItemMap, string_of_int(itemId)) {
-          | Some(list) => list
-          | None =>
-            let list = []
-            userItemMap->Js.Dict.set(string_of_int(itemId), list)
-            list
-          }
-          itemVariantList |> Js.Array.push(variant) |> ignore
-        }
-      )
-      userItemMap
-      ->Js.Dict.entries
-      ->Belt.Array.keepMap(((itemId, variantList)) => {
-        let itemId = int_of_string(itemId)
-        let numVariations = Item.getCollapsedVariants(~item=Item.getItem(~itemId))
-        // Exclude item only if user has all variants
-        if Js.Array.length(variantList) >= Js.Array.length(numVariations) {
-          Some(itemId)
-        } else {
-          None
-        }
-      })
-    } else {
-      []
-    }
-  , (excludeString, isLoggedIn))
-  let filteredItems = React.useMemo2(
-    () =>
-      Item.all->Belt.Array.keep(item =>
-        !(
-          Js.Array.includes(item.id, excludeUserItemIds) ||
-          (Item.isRecipe(~item) &&
-          Js.Array.includes(Item.getItemIdForRecipe(~recipe=item), excludeUserItemIds))
-        ) &&
-        ItemFilters.doesItemMatchFilters(~item, ~filters)
-      ) |> Js.Array.sortInPlaceWith(ItemFilters.getSort(~sort=filters.sort)),
-    (filters, excludeUserItemIds),
-  )
-  let numResults = filteredItems->Belt.Array.length
-
-  let isInitialLoadRef = React.useRef(true)
-  React.useEffect1(() => {
-    open Webapi.Dom
-    if React.Ref.current(isInitialLoadRef) {
-      window |> Window.scrollTo(0., 0.)
-      React.Ref.setCurrent(isInitialLoadRef, false)
-    } else {
-      let rootElement = Utils.getElementForDomRef(rootRef)
-      let boundingRect = Element.getBoundingClientRect(rootElement)
-      window |> Window.scrollBy(
-        0.,
-        DomRect.top(boundingRect) -. float_of_int(Constants.headerHeight),
-      )
-    }
-    None
-  }, [url.search])
-
-  <div className=Styles.root ref={ReactDOMRe.Ref.domRef(rootRef)}>
-    <div className=Styles.filterBarTop>
-      <ItemFilters.CategoryButtons filters onChange={filters => setFilters(filters)} />
-      {isLoggedIn && viewportWidth >= 940
-        ? <ItemFilters.AdvancedFilter filters onChange=setFilters />
-        : React.null}
-      <div className=ItemFilters.Styles.rootScrollerSpacer />
-    </div>
-    <div className=Styles.filterBar>
-      <ItemFilters filters onChange={filters => setFilters(filters)} className=Styles.filters />
-      {isLoggedIn && viewportWidth < 940
-        ? <ItemFilters.AdvancedFilter filters onChange=setFilters />
-        : React.null}
-      <ItemFilters.Pager
-        numResults pageOffset numResultsPerPage setPageOffset className=Styles.topPager
-      />
-    </div>
-    <div className=Styles.cards>
-      {filteredItems
-      ->Belt.Array.slice(~offset=pageOffset * numResultsPerPage, ~len=numResultsPerPage)
-      ->Belt.Array.mapWithIndexU((. i, item) =>
-        <ItemCard item isLoggedIn showLogin key={string_of_int(item.id) ++ string_of_int(i)} />
-      )
-      ->React.array}
-    </div>
-    <div className=Styles.bottomFilterBar>
-      <ItemFilters.Pager
-        numResults pageOffset numResultsPerPage setPageOffset={f => setPageOffset(f)}
-      />
-    </div>
-    {if Js.Array.length(filteredItems) == 0 {
-      <div className=Styles.noResults>
-        {React.string("There are no results. Try changing or ")}
-        <a
-          href="#"
-          onClick={e => {
-            setFilters(
-              (
-                {
-                  text: "",
-                  mask: None,
-                  category: None,
-                  exclude: [],
-                  sort: SellPriceDesc,
-                }: ItemFilters.t
-              ),
-            )
-            ReactEvent.Mouse.preventDefault(e)
-          }}>
-          {React.string("clearing the filters!")}
-        </a>
-      </div>
-    } else {
-      React.null
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/ItemCard.res b/jscomp/syntax/tests/idempotency/nook-exchange/ItemCard.res
deleted file mode 100644
index a898bd5..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/ItemCard.res
+++ /dev/null
@@ -1,575 +0,0 @@
-open Belt
-
-module Styles = {
-  open Css
-  let statusButton = style(list{
-    backgroundColor(transparent),
-    color(hex("3aa563c0")),
-    borderWidth(zero),
-    borderRadius(px(4)),
-    fontSize(px(12)),
-    marginRight(px(8)),
-    outlineStyle(none),
-    padding3(~top=px(5), ~bottom=px(3), ~h=px(4)),
-    transition(~duration=200, "all"),
-    cursor(pointer),
-    whiteSpace(nowrap),
-    lastChild(list{marginRight(zero)}),
-    hover(list{important(backgroundColor(Colors.green)), important(color(Colors.white))}),
-    media("(max-width: 430px)", list{fontSize(px(14))}),
-  })
-  let catalogCheckbox = style(list{
-    backgroundColor(Colors.white),
-    height(px(20)),
-    width(px(20)),
-    borderRadius(px(3)),
-    border(px(2), solid, hex("c0c0c0")),
-    padding(zero),
-    transition(~duration=200, "all"),
-    margin(zero),
-    cursor(pointer),
-    outlineStyle(none),
-    opacity(0.),
-    transition(~duration=200, "all"),
-    media("(hover: none)", list{opacity(0.5)}),
-    hover(list{borderColor(hex("808080"))}),
-  })
-  @module("./assets/check.png") external checkImage: string = "default"
-  let catalogCheckboxChecked = style(list{
-    borderColor(Colors.white),
-    backgroundImage(url(checkImage)),
-    backgroundSize(size(px(16), px(16))),
-    backgroundRepeat(noRepeat),
-    backgroundPosition(center),
-    opacity(0.5),
-  })
-  let nameLink = style(list{
-    color(Colors.charcoal),
-    textDecoration(none),
-    media("(hover: hover)", list{hover(list{textDecoration(underline)})}),
-  })
-  let card = style(list{
-    backgroundColor(hex("fffffff0")),
-    borderRadius(px(8)),
-    display(flexBox),
-    flexDirection(column),
-    alignItems(center),
-    marginRight(px(32)),
-    marginBottom(px(32)),
-    padding3(~top=px(24), ~bottom=px(8), ~h=px(8)),
-    position(relative),
-    boxSizing(borderBox),
-    width(px(256)),
-    transition(~duration=200, "all"),
-    hover(list{
-      selector("& ." ++ statusButton, list{backgroundColor(hex("3aa56320")), color(Colors.green)}),
-      selector(
-        "& ." ++ catalogCheckbox,
-        list{opacity(1.), media("(hover: none)", list{borderColor(hex("c0c0c0"))})},
-      ),
-      selector("& ." ++ ItemImage.Styles.variantButton, list{opacity(0.5)}),
-    }),
-    media(
-      "(max-width: 600px)",
-      list{
-        marginRight(px(16)),
-        marginBottom(px(16)),
-        width({
-          open Calc
-          pct(50.) - px(16)
-        }),
-      },
-    ),
-    media("(max-width: 430px)", list{width(pct(100.)), paddingTop(px(16))}),
-  })
-  let cardSelected = style(list{backgroundColor(hex("ffffff"))})
-  let body = style(list{
-    flexGrow(1.),
-    display(flexBox),
-    flexDirection(column),
-    alignItems(center),
-    width(pct(100.)),
-  })
-  let name = style(list{
-    fontSize(px(20)),
-    marginBottom(px(8)),
-    padding2(~v=zero, ~h=px(16)),
-    textAlign(center),
-  })
-  let itemImage = style(list{unsafe("alignSelf", "stretch"), marginBottom(px(8))})
-  let variation = style(list{
-    display(flexBox),
-    flexWrap(wrap),
-    justifyContent(center),
-    marginBottom(px(8)),
-  })
-  let variationImageWrapper = style(list{position(relative)})
-  let variationImage = style(list{
-    display(block),
-    cursor(pointer),
-    width(px(32)),
-    height(px(32)),
-    borderRadius(px(4)),
-    hover(list{backgroundColor(hex("00000010"))}),
-  })
-  let variationImageSelected = style(list{backgroundColor(hex("3aa56320"))})
-  @module("./assets/check_small.png")
-  external checkSmall: string = "default"
-  let variationImageCheck = style(list{
-    position(absolute),
-    backgroundImage(url(checkSmall)),
-    width(px(12)),
-    height(px(12)),
-    backgroundSize(cover),
-    top(px(-2)),
-    right(px(-2)),
-  })
-  let metaIcons = style(list{position(absolute), top(px(8)), left(px(6))})
-  let topRightIcons = style(list{position(absolute), top(px(10)), right(px(10))})
-  let bottomBar = style(list{fontSize(px(12))})
-  let bottomBarStatus = style(list{alignSelf(flexStart), paddingTop(px(4))})
-  let bottomBarEmoji = style(list{display(inlineBlock), marginRight(px(8))})
-  let statusButtons = style(list{display(flexBox), alignItems(center)})
-  let removeButton = style(list{
-    position(absolute),
-    bottom(px(10)),
-    right(px(10)),
-    selector("." ++ (card ++ ":hover &"), list{opacity(0.8)}),
-  })
-  let ellipsisButton = style(list{
-    position(absolute),
-    bottom(px(8)),
-    right(px(8)),
-    selector("." ++ (card ++ ":hover &"), list{opacity(0.8)}),
-  })
-
-  let cardHasQuicklist = style(list{
-    selector("& ." ++ metaIcons, list{display(none)}),
-    selector("& ." ++ bottomBar, list{display(none)}),
-    selector("& ." ++ catalogCheckbox, list{display(none)}),
-    media(
-      "(hover: hover)",
-      list{children(list{opacity(0.5)}), hover(list{children(list{opacity(1.)})})},
-    ),
-  })
-  let cardQuicklistSelected = style(list{
-    boxShadow(Shadow.box(~spread=px(2), Colors.green)),
-    children(list{opacity(1.)}),
-  })
-  let quicklistButton = style(list{position(absolute), top(px(6)), left(px(6))})
-}
-
-module MetaIconStyles = {
-  open Css
-  let icon = style(list{display(block), width(px(24)), height(px(24))})
-  let iconClickable = style(list{cursor(pointer)})
-  let layer = style(list{padding2(~v=px(4), ~h=px(4))})
-  let clickNote = style(list{
-    borderTop(px(1), solid, hex("ffffff40")),
-    marginTop(px(6)),
-    marginLeft(px(-8)),
-    marginRight(px(-8)),
-    marginBottom(px(-4)),
-    paddingTop(px(6)),
-    paddingLeft(px(8)),
-    paddingRight(px(8)),
-    paddingBottom(px(4)),
-  })
-}
-
-module RecipeIcon = {
-  module RecipeIconStyles = {
-    open Css
-    let tooltip = style(list{
-      backgroundColor(Colors.darkLayerBackground),
-      borderRadius(px(4)),
-      color(Colors.white),
-      fontSize(px(14)),
-      padding3(~top=px(9), ~bottom=px(7), ~h=px(14)),
-      position(relative),
-      whiteSpace(#preLine),
-      Colors.darkLayerShadow,
-    })
-  }
-
-  module RecipeLayer = {
-    @react.component
-    let make = (~recipe, ~isRecipe, ~onClickAlternate) =>
-      <div className={Cn.make(list{MetaIconStyles.layer, RecipeIconStyles.tooltip})}>
-        {recipe
-        ->Array.map(((itemId, quantity)) =>
-          <div key=itemId>
-            {React.string(Item.getMaterialName(itemId) ++ (j` × ` ++ string_of_int(quantity)))}
-          </div>
-        )
-        ->React.array}
-        {switch (isRecipe, onClickAlternate) {
-        | (Some(isRecipe), Some(onClickAlternate)) =>
-          <div
-            onClick={_ => onClickAlternate()}
-            onTouchStart={_ => onClickAlternate()}
-            className=MetaIconStyles.clickNote>
-            {React.string("Click to see " ++ (isRecipe ? "item" : "DIY"))}
-          </div>
-        | _ => React.null
-        }}
-      </div>
-  }
-
-  @module("./assets/recipe_icon.png")
-  external recipeIcon: string = "default"
-
-  @react.component
-  let make = (~recipe: Item.recipe, ~isRecipe=?, ~onClick=?, ~className=?, ()) => {
-    let (showLayer, setShowLayer) = React.useState(() => false)
-    let iconRef = React.useRef(Js.Nullable.null)
-    let isMountedRef = React.useRef(true)
-    React.useEffect0(() => Some(() => React.Ref.setCurrent(isMountedRef, false)))
-    <>
-      <img
-        src=recipeIcon
-        className={Cn.make(list{
-          MetaIconStyles.icon,
-          Cn.ifTrue(MetaIconStyles.iconClickable, onClick !== None),
-          Cn.unpack(className),
-        })}
-        onMouseEnter={_ => Js.Global.setTimeout(() => setShowLayer(_ => true), 10) |> ignore}
-        onMouseLeave={_ => Js.Global.setTimeout(() =>
-            if React.Ref.current(isMountedRef) {
-              setShowLayer(_ => false)
-            }
-          , 10) |> ignore}
-        onClick=?{Belt.Option.map(onClick, (onClick, e) =>
-          if Utils.browserSupportsHover {
-            onClick()
-          }
-        )}
-        ref={ReactDOMRe.Ref.domRef(iconRef)}
-      />
-      {showLayer
-        ? <ReactAtmosphere.PopperLayer
-            reference=iconRef
-            render={_ => <RecipeLayer recipe isRecipe onClickAlternate=onClick />}
-            options={Obj.magic({
-              "placement": "bottom-start",
-              "modifiers": Some([
-                {
-                  "name": "offset",
-                  "options": {
-                    "offset": [0, 2],
-                  },
-                },
-              ]),
-            })}
-          />
-        : React.null}
-    </>
-  }
-}
-
-module OrderableIcon = {
-  module OrderableLayer = {
-    @react.component
-    let make = () =>
-      <div className=MetaIconStyles.layer>
-        <div> {React.string("Orderable from catalog")} </div>
-        <div> {React.string("Touch tradeable")} </div>
-      </div>
-  }
-
-  @module("./assets/shop_icon.png")
-  external orderableIcon: string = "default"
-
-  @react.component
-  let make = (~className=?, ()) =>
-    <ReactAtmosphere.Tooltip
-      text={<OrderableLayer />} options={Obj.magic({"placement": "bottom-start"})}>
-      {({onMouseEnter, onMouseLeave, ref}) =>
-        <img
-          src=orderableIcon
-          className={Cn.make(list{MetaIconStyles.icon, Cn.unpack(className)})}
-          onMouseEnter
-          onMouseLeave
-          ref={ReactDOMRe.Ref.domRef(ref)}
-        />}
-    </ReactAtmosphere.Tooltip>
-}
-
-module StatusButtons = {
-  let renderStatusButton = (~itemId, ~variation, ~status: User.itemStatus, ~showLogin=?, ()) =>
-    <button
-      onClick={_ =>
-        if UserStore.isLoggedIn() {
-          UserStore.setItemStatus(~itemId, ~variation, ~status)
-        } else {
-          Option.map(showLogin, showLogin => showLogin()) |> ignore
-        }}
-      className=Styles.statusButton
-      title={switch status {
-      | Wishlist => "Add to Wishlist"
-      | ForTrade => "Add to For Trade list"
-      | CanCraft => "Add to Can Craft list"
-      | CatalogOnly => raise(Constants.Uhoh)
-      }}>
-      {React.string(
-        switch status {
-        | Wishlist => "+ Wishlist"
-        | ForTrade => "+ For Trade"
-        | CanCraft => "+ Can Craft"
-        | CatalogOnly => raise(Constants.Uhoh)
-        },
-      )}
-    </button>
-
-  @react.component
-  let make = (~item: Item.t, ~variant, ~showLogin=?, ~className=?, ()) =>
-    <div className={Cn.make(list{Styles.statusButtons, Cn.unpack(className)})}>
-      {renderStatusButton(~itemId=item.id, ~variation=variant, ~status=Wishlist, ~showLogin?, ())}
-      {renderStatusButton(~itemId=item.id, ~variation=variant, ~status=ForTrade, ~showLogin?, ())}
-      {switch item.type_ {
-      | Item(Some(_)) => true
-      | _ => false
-      }
-        ? renderStatusButton(~itemId=item.id, ~variation=variant, ~status=CanCraft, ~showLogin?, ())
-        : React.null}
-    </div>
-}
-
-module CatalogCheckbox = {
-  @react.component
-  let make = (~item: Item.t, ~variant, ~userItem: option<User.item>, ~className=?, ()) =>
-    <ReactAtmosphere.Tooltip
-      options={
-        placement: Some("top"),
-        modifiers: Some([
-          {
-            "name": "offset",
-            "options": {
-              "offset": [0, 4],
-            },
-          },
-        ]),
-      }
-      text={React.string(
-        switch userItem->Option.map(userItem => userItem.status) {
-        | None => "Not in catalog"
-        | Some(Wishlist) => "Move to catalog from Wishlist"
-        | Some(ForTrade)
-        | Some(CanCraft)
-        | Some(CatalogOnly) => "In your catalog"
-        },
-      )}>
-      {({onMouseEnter, onMouseLeave, ref}) =>
-        <button
-          className={Cn.make(list{
-            Styles.catalogCheckbox,
-            Cn.ifTrue(
-              Styles.catalogCheckboxChecked,
-              switch userItem {
-              | Some(userItem) => userItem.status !== Wishlist
-              | None => false
-              },
-            ),
-            Cn.unpack(className),
-          })}
-          onClick={e => {
-            let status = switch Option.map(userItem, userItem => userItem.status) {
-            | None
-            | Some(Wishlist) =>
-              Some(User.CatalogOnly)
-            | Some(CanCraft)
-            | Some(ForTrade)
-            | Some(CatalogOnly) =>
-              None
-            }
-            switch status {
-            | Some(status) =>
-              let updateItem = () =>
-                UserStore.setItemStatus(~itemId=item.id, ~variation=variant, ~status)
-              if Option.map(userItem, userItem => userItem.status) == Some(Wishlist) {
-                WishlistToCatalog.confirm(~onConfirm=updateItem)
-              } else {
-                updateItem()
-              }
-            | None =>
-              if Belt.Option.getExn(userItem).status == CatalogOnly {
-                UserStore.removeItem(~itemId=item.id, ~variation=variant)
-              } else {
-                DeleteFromCatalog.confirm(~onConfirm=() =>
-                  UserStore.removeItem(~itemId=item.id, ~variation=variant)
-                )
-              }
-            }
-          }}
-          onMouseEnter
-          onMouseLeave
-          ref={ReactDOMRe.Ref.domRef(ref)}
-        />}
-    </ReactAtmosphere.Tooltip>
-}
-
-module VariantImage = {
-  @react.component
-  let make = (~item: Item.t, ~variant, ~selected) => {
-    let userItem = UserStore.useItem(~itemId=item.id, ~variation=variant)
-    <div className=Styles.variationImageWrapper>
-      <img
-        src={Item.getImageUrl(~item, ~variant)}
-        className={Cn.make(list{
-          Styles.variationImage,
-          Cn.ifTrue(Styles.variationImageSelected, selected),
-        })}
-      />
-      {switch userItem->Belt.Option.map(userItem => userItem.status) {
-      | Some(ForTrade)
-      | Some(CanCraft)
-      | Some(CatalogOnly) =>
-        <span className=Styles.variationImageCheck />
-      | _ => React.null
-      }}
-    </div>
-  }
-}
-
-@react.component
-let make = (~item: Item.t, ~isLoggedIn, ~showLogin) => {
-  let (showRecipeAlternate, setShowRecipeAlternate) = React.useState(() => false)
-  let item = if showRecipeAlternate {
-    switch item.type_ {
-    | Recipe(itemId) => Item.getItem(~itemId)
-    | Item(Some(recipeId)) => Item.getItem(~itemId=recipeId)
-    | Item(None) => raise(Constants.Uhoh)
-    }
-  } else {
-    item
-  }
-
-  let (variation, setVariation) = React.useState(() => 0)
-  let numVariations = Item.getNumVariations(~item)
-  if variation > numVariations {
-    setVariation(_ => 0)
-  }
-  let variation = Js.Math.min_int(variation, numVariations - 1)
-  let userItem = UserStore.useItem(~itemId=item.id, ~variation)
-
-  let hasQuicklist = QuicklistStore.useHasQuicklist()
-  let isInQuicklist = QuicklistStore.useItemState(~itemId=item.id, ~variant=variation)
-
-  <div
-    className={Cn.make(list{
-      Styles.card,
-      Cn.ifSome(Styles.cardSelected, userItem),
-      Cn.ifTrue(Styles.cardHasQuicklist, hasQuicklist),
-      Cn.ifTrue(Styles.cardQuicklistSelected, isInQuicklist),
-    })}>
-    <div className=Styles.body>
-      <div className=Styles.name>
-        <Link
-          path={Utils.getItemDetailUrl(
-            ~itemId=item.id,
-            ~variant=variation != 0 ? Some(variation) : None,
-          )}
-          className=Styles.nameLink>
-          {React.string(Item.getName(item))}
-        </Link>
-      </div>
-      <ItemImage item variant=variation className=Styles.itemImage key={string_of_int(item.id)} />
-      {
-        let collapsedVariants = Item.getCollapsedVariants(~item)
-        if Js.Array.length(collapsedVariants) === 1 {
-          React.null
-        } else {
-          <div className={Cn.make(list{Styles.variation})}>
-            {collapsedVariants
-            ->Belt.Array.map(v => {
-              let image = <VariantImage item variant=v selected={v == variation} />
-              switch Item.getVariantName(~item, ~variant=v, ~hidePattern=true, ()) {
-              | Some(variantName) =>
-                <ReactAtmosphere.Tooltip text={React.string(variantName)} key={string_of_int(v)}>
-                  {({onMouseEnter, onMouseLeave, onFocus, onBlur, ref}) =>
-                    <div
-                      onClick={_ => setVariation(_ => v)}
-                      onMouseEnter
-                      onMouseLeave
-                      onFocus
-                      onBlur
-                      ref={ReactDOMRe.Ref.domRef(ref)}>
-                      image
-                    </div>}
-                </ReactAtmosphere.Tooltip>
-              | None =>
-                <div onClick={_ => setVariation(_ => v)} key={string_of_int(v)}> image </div>
-              }
-            })
-            ->React.array}
-          </div>
-        }
-      }
-      <div className=Styles.metaIcons>
-        {switch item.recipe {
-        | Some(recipe) =>
-          <RecipeIcon
-            recipe
-            isRecipe={Item.isRecipe(~item)}
-            onClick={_ => setShowRecipeAlternate(show => !show)}
-            key={string_of_int(item.id)}
-          />
-        | None => React.null
-        }}
-        {if item.orderable {
-          <OrderableIcon />
-        } else {
-          React.null
-        }}
-      </div>
-      {isLoggedIn
-        ? <div className=Styles.topRightIcons>
-            <CatalogCheckbox item variant=variation userItem />
-          </div>
-        : React.null}
-    </div>
-    {
-      let userItemStatus = userItem->Option.map(userItem => userItem.status)
-      <>
-        {switch userItem {
-        | Some(userItem) => <>
-            <UserItemNote itemId=item.id variation userItem key={string_of_int(variation)} />
-            {switch userItemStatus {
-            | Some(Wishlist)
-            | Some(ForTrade)
-            | Some(CanCraft) => <>
-                <div className={Cn.make(list{Styles.bottomBar, Styles.bottomBarStatus})}>
-                  <span className=Styles.bottomBarEmoji>
-                    {React.string(User.itemStatusToEmoji(userItem.status))}
-                  </span>
-                  {React.string(
-                    switch userItem.status {
-                    | Wishlist => j`In your Wishlist`
-                    | ForTrade => j`In your For Trade list`
-                    | CanCraft => j`In your Can Craft list`
-                    | _ => raise(Constants.Uhoh)
-                    },
-                  )}
-                </div>
-                <UserItemEllipsisButton item userItem variation className=Styles.ellipsisButton />
-              </>
-            | _ => React.null
-            }}
-          </>
-        | None => React.null
-        }}
-        {switch userItemStatus {
-        | Some(CatalogOnly)
-        | None =>
-          <StatusButtons item variant=variation showLogin className=Styles.bottomBar />
-        | _ => React.null
-        }}
-      </>
-    }
-    {hasQuicklist
-      ? <QuicklistButton
-          itemId=item.id variant=variation selected=isInQuicklist className=Styles.quicklistButton
-        />
-      : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/ItemDetailOverlay.res b/jscomp/syntax/tests/idempotency/nook-exchange/ItemDetailOverlay.res
deleted file mode 100644
index 9f0406f..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/ItemDetailOverlay.res
+++ /dev/null
@@ -1,733 +0,0 @@
-let smallThreshold = 500
-let smallThresholdMediaQuery = styles =>
-  Css.media("(max-width: " ++ (string_of_int(smallThreshold) ++ "px)"), styles)
-
-module Styles = {
-  open Css
-  let backdrop = style(list{
-    position(absolute),
-    top(zero),
-    bottom(zero),
-    left(zero),
-    right(zero),
-    opacity(0.),
-    backgroundColor(hex("80808080")),
-    transition(~duration=200, "all"),
-  })
-  let root100VH = style(list{
-    display(flexBox),
-    alignItems(center),
-    justifyContent(center),
-    width({
-      open Calc
-      vw(100.) - px(16)
-    }),
-  })
-  let root = style(list{
-    backgroundColor(hex("ffffff")),
-    borderRadius(px(8)),
-    position(relative),
-    maxWidth(px(640)),
-    boxSizing(borderBox),
-    boxShadow(Shadow.box(~blur=px(32), rgba(0, 0, 0, 0.2))),
-    overflow(auto),
-    maxHeight(pct(95.)),
-    minHeight(px(256)),
-    opacity(0.),
-    transforms(list{scale(0.85, 0.85), translate3d(zero, zero, zero)}),
-    media("(max-width: 400px)", list{maxHeight(pct(90.)), minWidth(zero)}),
-    transition(~duration=200, ~timingFunction=cubicBezier(0.48, 1.38, 0.71, 0.93), "all"),
-    smallThresholdMediaQuery(list{width(pct(100.))}),
-  })
-  let body = style(list{
-    display(flexBox),
-    justifyContent(center),
-    padding2(~v=px(32), ~h=px(32)),
-    smallThresholdMediaQuery(list{justifyContent(flexStart)}),
-  })
-  let bodyContent = style(list{
-    display(flexBox),
-    flexDirection(column),
-    smallThresholdMediaQuery(list{width(pct(100.))}),
-  })
-  let itemBodyTop = style(list{fontSize(px(16)), paddingRight(px(8))})
-  let itemImageUnit = style(list{
-    width(px(128)),
-    marginRight(px(48)),
-    smallThresholdMediaQuery(list{
-      display(flexBox),
-      marginTop(px(16)),
-      marginRight(zero),
-      width(auto),
-      justifyContent(center),
-    }),
-  })
-  let itemImageUnitWithRecipe = style(list{
-    smallThresholdMediaQuery(list{
-      display(flexBox),
-      marginTop(px(16)),
-      marginRight(zero),
-      width(auto),
-      justifyContent(spaceBetween),
-    }),
-  })
-  let itemImage = style(list{display(block), width(px(128)), height(px(128))})
-  let itemImageUnitBody = style(list{display(flexBox), flexDirection(column), alignItems(center)})
-  let itemImageLabel = style(list{fontSize(px(16)), textAlign(center), marginTop(px(8))})
-  let itemRecipe = style(list{
-    marginTop(px(16)),
-    smallThresholdMediaQuery(list{width(pct(50.)), marginTop(zero)}),
-  })
-  let itemRecipeTitle = style(list{marginBottom(px(2))})
-  @module("./assets/recipe_icon.png")
-  external recipeIcon: string = "default"
-  let recipeIcon = style(list{
-    display(inlineBlock),
-    backgroundImage(url(recipeIcon)),
-    width(px(16)),
-    height(px(16)),
-    backgroundSize(cover),
-    marginLeft(px(4)),
-    verticalAlign(#top),
-  })
-  let recipeRow = style(list{
-    color(Colors.gray),
-    display(flexBox),
-    borderTop(px(1), dashed, Colors.faintGray),
-    padding2(~v=px(2), ~h=zero),
-  })
-  let recipeRowMaterial = style(list{flexGrow(1.)})
-  let recipeRowQuantity = style(list{width(px(24)), color(Colors.lightGray), textAlign(#right)})
-  let itemName = style(list{
-    fontSize(px(24)),
-    marginBottom(px(8)),
-    paddingRight(px(16)),
-    smallThresholdMediaQuery(list{paddingRight(px(8))}),
-  })
-  let itemCategory = style(list{marginBottom(px(4))})
-  let itemCategoryLink = style(list{
-    color(Colors.gray),
-    textDecoration(none),
-    hover(list{textDecoration(underline)}),
-  })
-  let itemSourceFrom = style(list{color(Colors.lightGray)})
-  let itemTags = style(list{marginBottom(px(4))})
-  @module("./assets/tag.png") external tagIcon: string = "default"
-  let itemTagIcon = style(list{
-    display(inlineBlock),
-    backgroundImage(url(tagIcon)),
-    width(px(16)),
-    height(px(16)),
-    backgroundSize(cover),
-    marginRight(px(6)),
-    verticalAlign(#top),
-    position(relative),
-    top(px(1)),
-  })
-  let itemTag = style(list{
-    color(Colors.gray),
-    display(inlineBlock),
-    textDecoration(none),
-    hover(list{textDecoration(underline)}),
-    marginRight(px(8)),
-  })
-  let itemPriceIcon = style(list{marginRight(px(6)), verticalAlign(#top), top(px(1))})
-  let itemPrices = style(list{display(flexBox), marginBottom(px(4))})
-  let itemPrice = style(list{marginRight(px(16)), whiteSpace(nowrap)})
-  let itemPriceLabel = style(list{color(Colors.gray), marginRight(px(4))})
-  let itemPriceValue = style(list{fontWeight(#num(700))})
-  let itemCustomizeCost = style(list{marginBottom(px(4))})
-  @module("./assets/remake.png") external remakeIcon: string = "default"
-  let itemRemakeIcon = style(list{
-    display(inlineBlock),
-    backgroundImage(url(remakeIcon)),
-    width(px(16)),
-    height(px(16)),
-    backgroundSize(cover),
-    marginRight(px(6)),
-    verticalAlign(#top),
-    position(relative),
-    top(px(1)),
-  })
-  let variantSection = style(list{
-    marginTop(px(24)),
-    marginLeft(px(-16)),
-    marginRight(px(-16)),
-    paddingLeft(px(16)),
-    paddingRight(px(32)),
-    overflowX(auto),
-    overflowY(hidden),
-    smallThresholdMediaQuery(list{marginLeft(px(-32)), marginRight(px(-32))}),
-  })
-  let variantTable = style(list{display(flexBox), flexWrap(wrap), maxWidth(px(288))})
-  let variantRow = style(list{
-    display(flexBox),
-    alignItems(center),
-    marginRight(px(8)),
-    marginBottom(px(4)),
-  })
-  let variantRowLabel = style(list{alignItems(flexStart)})
-  let variantLabel = style(list{width(px(86)), paddingRight(px(6)), flexShrink(0.)})
-  let variantCell = style(list{fontSize(zero)})
-  let variantImage = style(list{
-    borderRadius(px(4)),
-    border(px(1), solid, transparent),
-    display(inlineBlock),
-    width(px(32)),
-    height(px(32)),
-    flexShrink(0.),
-    cursor(pointer),
-  })
-  let variantImageCell = style(list{
-    marginRight(px(4)),
-    hover(list{borderColor(Colors.veryLightGray)}),
-  })
-  let variantImageWrap = style(list{marginRight(px(8))})
-  let variantImageSelected = style(list{important(borderColor(Colors.lightGray))})
-  let singleVariantUnit = style(list{
-    borderRadius(px(4)),
-    border(px(1), solid, transparent),
-    cursor(pointer),
-    hover(list{selector("& ." ++ variantImage, list{borderColor(Colors.veryLightGray)})}),
-  })
-  let singleVariantUnitSelected = style(list{
-    selector("& ." ++ variantImage, list{important(borderColor(Colors.lightGray))}),
-  })
-  let patternCell = style(list{marginRight(px(4))})
-  let patternLabel = style(list{
-    width(px(34)),
-    transforms(list{translateX(px(22)), rotate(deg(45.))}),
-    transformOrigin(zero, zero),
-    whiteSpace(nowrap),
-  })
-  let transitionIn = style(list{
-    selector("& ." ++ backdrop, list{opacity(1.)}),
-    selector(
-      "& ." ++ root,
-      list{opacity(1.), transforms(list{scale(1., 1.), translate3d(zero, zero, zero)})},
-    ),
-  })
-}
-
-module VariantWithLabel = {
-  @react.component
-  let make = (~item: Item.t, ~variant, ~selected) =>
-    <div
-      onClick={_ => {
-        open Webapi.Dom
-        location->Location.setHash(
-          "i" ++ (string_of_int(item.id) ++ (":" ++ string_of_int(variant))),
-        )
-      }}
-      className={Cn.make(list{
-        Styles.variantRow,
-        Styles.singleVariantUnit,
-        Cn.ifTrue(Styles.singleVariantUnitSelected, selected),
-      })}>
-      <img
-        src={Item.getImageUrl(~item, ~variant)}
-        className={Cn.make(list{Styles.variantImage, Styles.variantImageWrap})}
-      />
-      <div className=Styles.variantLabel>
-        {switch Item.getVariantName(~item, ~variant, ()) {
-        | Some(bodyName) => React.string(bodyName)
-        | None => React.null
-        }}
-      </div>
-    </div>
-}
-
-module OneDimensionVariants = {
-  @react.component
-  let make = (~item, ~a, ~variant) =>
-    <div className={Cn.make(list{Styles.variantSection, Styles.variantTable})}>
-      {Belt.Array.make(a, None)
-      ->Belt.Array.mapWithIndex((i, _) =>
-        <VariantWithLabel item variant=i selected={i == variant} key={string_of_int(i)} />
-      )
-      ->React.array}
-    </div>
-}
-
-module TwoDimensionVariants = {
-  @react.component
-  let make = (~item, ~a, ~b, ~variant) =>
-    <div className={Cn.make(list{Styles.variantSection, Cn.ifTrue(Styles.variantTable, b == 1)})}>
-      {Belt.Array.make(a, None)
-      ->Belt.Array.mapWithIndex((i, _) =>
-        if b > 1 {
-          <div className=Styles.variantRow key={string_of_int(i)}>
-            {a > 1
-              ? <div className=Styles.variantLabel>
-                  {switch Item.getVariantName(~item, ~variant=i * b, ~hidePattern=true, ()) {
-                  | Some(bodyName) => React.string(bodyName)
-                  | None => React.null
-                  }}
-                </div>
-              : React.null}
-            {Belt.Array.make(b, None)
-            ->Belt.Array.mapWithIndex((j, _) => {
-              let v = i * b + j
-              <img
-                src={Item.getImageUrl(~item, ~variant=v)}
-                onClick={_ => {
-                  open Webapi.Dom
-                  location->Location.setHash(
-                    "i" ++ (string_of_int(item.id) ++ (":" ++ string_of_int(v))),
-                  )
-                }}
-                className={Cn.make(list{
-                  Styles.variantImage,
-                  Styles.variantImageCell,
-                  Cn.ifTrue(Styles.variantImageSelected, variant == v),
-                })}
-                key={string_of_int(j)}
-              />
-            })
-            ->React.array}
-          </div>
-        } else {
-          <VariantWithLabel item variant=i selected={i == variant} key={string_of_int(i)} />
-        }
-      )
-      ->React.array}
-      {b > 1
-        ? <div className={Cn.make(list{Styles.variantRow, Styles.variantRowLabel})}>
-            {a > 1 ? <div className=Styles.variantLabel /> : React.null}
-            {Belt.Array.make(b, None)
-            ->Belt.Array.mapWithIndex((j, _) =>
-              <div className=Styles.patternCell key={string_of_int(j)}>
-                {switch Item.getVariantName(~item, ~variant=j, ~hideBody=true, ()) {
-                | Some(patternName) =>
-                  <div
-                    className=Styles.patternLabel
-                    style={ReactDOMRe.Style.make(
-                      ~height=string_of_int(Js.String.length(patternName) * 6) ++ "px",
-                      (),
-                    )}>
-                    {React.string(patternName)}
-                  </div>
-                | None => React.null
-                }}
-              </div>
-            )
-            ->React.array}
-          </div>
-        : React.null}
-    </div>
-}
-
-module ItemRecipe = {
-  @react.component
-  let make = (~recipe) =>
-    <div className=Styles.itemRecipe>
-      <div className=Styles.itemRecipeTitle>
-        {React.string("DIY")} <span className=Styles.recipeIcon />
-      </div>
-      {recipe
-      ->Belt.Array.map(((itemId, quantity)) =>
-        <div className=Styles.recipeRow key=itemId>
-          <div className=Styles.recipeRowMaterial>
-            {React.string(Item.getMaterialName(itemId))}
-          </div>
-          <div className=Styles.recipeRowQuantity>
-            {React.string(j`×` ++ string_of_int(quantity))}
-          </div>
-        </div>
-      )
-      ->React.array}
-    </div>
-}
-
-module MyStatusSection = {
-  module Styles = {
-    open Css
-    let root = style(list{
-      marginTop(px(16)),
-      borderTop(px(1), dashed, Colors.veryLightGray),
-      paddingTop(px(8)),
-      position(relative),
-      selector(
-        "& ." ++ ItemCard.Styles.statusButton,
-        list{
-          fontSize(px(14)),
-          backgroundColor(Colors.faintGreen),
-          paddingLeft(px(6)),
-          paddingRight(px(6)),
-        },
-      ),
-      selector(
-        "& ." ++ ItemCard.Styles.catalogCheckbox,
-        list{borderColor(Colors.lightGray), opacity(1.)},
-      ),
-      smallThresholdMediaQuery(list{marginLeft(px(-16)), marginRight(px(-16))}),
-    })
-    let ellipsisButton = style(list{})
-    let currentStatusRow = style(list{
-      display(flexBox),
-      alignItems(center),
-      justifyContent(spaceBetween),
-    })
-    let currentStatus = style(list{})
-    let currentStatusEmoji = style(list{display(inlineBlock), marginRight(px(8))})
-    let itemNote = style(list{marginTop(px(8))})
-    let catalogCheckbox = style(list{marginLeft(px(12))})
-  }
-
-  @react.component
-  let make = (~item: Item.t, ~variant) => {
-    let userItem = UserStore.useItem(~itemId=item.id, ~variation=variant)
-    <div className=Styles.root>
-      {switch userItem {
-      | Some(userItem) => <>
-          {switch userItem.status {
-          | Wishlist
-          | ForTrade
-          | CanCraft => <>
-              <div className=Styles.currentStatusRow>
-                <div className=Styles.currentStatus>
-                  <span className=Styles.currentStatusEmoji>
-                    {React.string(User.itemStatusToEmoji(userItem.status))}
-                  </span>
-                  {React.string(
-                    switch userItem.status {
-                    | Wishlist => j`In your Wishlist`
-                    | ForTrade => j`In your For Trade list`
-                    | CanCraft => j`In your Can Craft list`
-                    | _ => raise(Constants.Uhoh)
-                    },
-                  )}
-                </div>
-                <UserItemEllipsisButton
-                  item userItem variation=variant className=Styles.ellipsisButton
-                />
-              </div>
-            </>
-          | CatalogOnly =>
-            <div className=Styles.currentStatusRow>
-              <ItemCard.StatusButtons item variant />
-              <ItemCard.CatalogCheckbox
-                item variant userItem=Some(userItem) className=Styles.catalogCheckbox
-              />
-            </div>
-          }}
-          <UserItemNote itemId=item.id variation=variant userItem className=Styles.itemNote />
-        </>
-      | None =>
-        <div className=Styles.currentStatusRow>
-          <ItemCard.StatusButtons item variant />
-          <ItemCard.CatalogCheckbox item variant userItem=None className=Styles.catalogCheckbox />
-        </div>
-      }}
-    </div>
-  }
-}
-
-module FriendsSection = {
-  module Styles = {
-    open Css
-    let friendSection = style(list{
-      borderTop(px(1), dashed, Colors.lightGreen),
-      backgroundColor(Colors.faintGreen),
-    })
-    let friendItemList = style(list{
-      display(flexBox),
-      flexWrap(wrap),
-      padding(px(16)),
-      maxWidth(px(512)),
-    })
-    let friendItem = style(list{
-      display(flexBox),
-      alignItems(center),
-      boxSizing(borderBox),
-      paddingRight(px(8)),
-      marginBottom(px(2)),
-      width(pct(50.)),
-      whiteSpace(nowrap),
-      smallThresholdMediaQuery(list{width(pct(100.))}),
-    })
-    let image = style(list{display(block), width(px(32)), height(px(32)), marginRight(px(8))})
-    let hasIn = style(list{color(Colors.gray)})
-    let listLink = style(list{
-      color(Colors.charcoal),
-      textDecoration(none),
-      hover(list{textDecoration(underline)}),
-    })
-    let showAllRow = style(list{width(pct(100.)), paddingTop(px(8))})
-    let showAllButton = style(list{
-      backgroundColor(transparent),
-      border(px(1), solid, Colors.lightGreen),
-      borderRadius(px(4)),
-      color(Colors.green),
-      padding2(~v=px(10), ~h=zero),
-      width(pct(100.)),
-      transition(~duration=200, "all"),
-      hover(list{borderColor(Colors.green)}),
-    })
-  }
-
-  type friendItem = {
-    userId: string,
-    username: string,
-    variant: int,
-    status: User.itemStatus,
-  }
-
-  @react.component
-  let make = (~item: Item.t) => {
-    let (friendItems, setFriendItems) = React.useState(() => None)
-    let (showLimit, setShowLimit) = React.useState(() => 12)
-    React.useEffect0(() => {
-      %Repromise({
-        let response = API.getFolloweesItem(
-          ~sessionId=Belt.Option.getExn(UserStore.sessionId.contents),
-          ~itemId=item.id,
-        )
-        %Repromise.JsExn({
-          let json = Fetch.Response.json(response)
-          open Json.Decode
-          let friendItems = json |> array(json => {
-            userId: json |> field("userId", string),
-            username: json |> field("username", string),
-            variant: json |> field("variant", int),
-            status: json |> field("status", int) |> User.itemStatusFromJs |> Belt.Option.getExn,
-          })
-          setFriendItems(_ => Some(friendItems))
-          Promise.resolved()
-        })
-      }) |> ignore
-      None
-    })
-
-    switch friendItems {
-    | Some(friendItems) =>
-      if Js.Array.length(friendItems) > 0 {
-        <div className=Styles.friendSection>
-          <div className=Styles.friendItemList>
-            {friendItems
-            |> Js.Array.slice(~start=0, ~end_=showLimit)
-            |> Js.Array.map(friendItem =>
-              <div
-                className=Styles.friendItem
-                key={friendItem.userId ++ string_of_int(friendItem.variant)}>
-                <img
-                  src={Item.getImageUrl(~item, ~variant=friendItem.variant)} className=Styles.image
-                />
-                <span>
-                  <Link path={"/u/" ++ friendItem.username}>
-                    {React.string(friendItem.username)}
-                  </Link>
-                  <span className=Styles.hasIn> {React.string(" has in ")} </span>
-                  <Link
-                    path={"/u/" ++
-                    (friendItem.username ++
-                    ("/" ++
-                    ViewingList.viewingListToUrl(
-                      switch friendItem.status {
-                      | ForTrade => ForTrade
-                      | CanCraft => CanCraft
-                      | Wishlist => Wishlist
-                      | CatalogOnly => Catalog
-                      },
-                    )))}
-                    className=Styles.listLink>
-                    {React.string(User.itemStatusToString(friendItem.status))}
-                  </Link>
-                </span>
-              </div>
-            )
-            |> React.array}
-            {Js.Array.length(friendItems) > showLimit
-              ? <div className=Styles.showAllRow>
-                  <button
-                    onClick={_ => setShowLimit(showLimit => showLimit + 12)}
-                    className=Styles.showAllButton>
-                    {React.string("Show more")}
-                  </button>
-                </div>
-              : React.null}
-          </div>
-        </div>
-      } else {
-        React.null
-      }
-    | None => React.null
-    }
-  }
-}
-
-let hasLoggedDetailOverlay = ref(false)
-
-@react.component
-let make = (~item: Item.t, ~variant, ~isInitialLoad) => {
-  let me = UserStore.useMe()
-  let onClose = () => {
-    let url = ReasonReactRouter.dangerouslyGetInitialUrl()
-    ReasonReactRouter.push(
-      "/" ++
-      (Js.Array.joinWith("/", Belt.List.toArray(url.path)) ++
-      switch url.search {
-      | "" => ""
-      | search => "?" ++ search
-      }),
-    )
-  }
-  let variant = variant->Belt.Option.getWithDefault(0)
-  let (transitionIn, setTransitionIn) = React.useState(() => isInitialLoad)
-  React.useEffect0(() => {
-    Js.Global.setTimeout(() => setTransitionIn(_ => true), 20) |> ignore
-    if !hasLoggedDetailOverlay.contents {
-      Analytics.Amplitude.logEventWithProperties(
-        ~eventName="Item Detail Overlay Shown",
-        ~eventProperties={
-          "isInitialLoad": isInitialLoad,
-          "itemId": item.id,
-          "variant": variant,
-          "pathname": {
-            open Webapi.Dom
-            location |> Location.pathname
-          },
-        },
-      )
-      hasLoggedDetailOverlay := true
-    }
-    None
-  })
-
-  let viewportWidth = Utils.useViewportWidth()
-  let itemImage =
-    <div
-      className={Cn.make(list{
-        Styles.itemImageUnit,
-        Cn.ifTrue(Styles.itemImageUnitWithRecipe, item.recipe != None),
-      })}>
-      <div className=Styles.itemImageUnitBody>
-        <img src={Item.getImageUrl(~item, ~variant)} className=Styles.itemImage />
-        {if Item.getNumVariations(~item) > 1 {
-          switch Item.getVariantName(~item, ~variant, ()) {
-          | Some(variantName) =>
-            <div className=Styles.itemImageLabel> {React.string(variantName)} </div>
-          | None => React.null
-          }
-        } else {
-          React.null
-        }}
-      </div>
-      {switch item.recipe {
-      | Some(recipe) => <ItemRecipe recipe />
-      | None => React.null
-      }}
-    </div>
-
-  <div
-    className={Cn.make(list{Modal.Styles.overlay, Cn.ifTrue(Styles.transitionIn, transitionIn)})}>
-    <div className=Styles.backdrop onClick={_ => onClose()} />
-    <Modal.Div100VH className=Styles.root100VH>
-      <div className=Styles.root>
-        <div className=Styles.body>
-          {viewportWidth > 500 ? itemImage : React.null}
-          <div className=Styles.bodyContent>
-            <div className=Styles.itemBodyTop>
-              <div className=Styles.itemName> {React.string(Item.getName(item))} </div>
-              <div className=Styles.itemCategory>
-                <Link path={"/?c=" ++ item.category} className=Styles.itemCategoryLink>
-                  {React.string(Utils.capitalizeFirstLetter(item.category))}
-                </Link>
-                {switch item.source {
-                | Some(itemSource) => <>
-                    <span className=Styles.itemSourceFrom> {React.string(" from ")} </span>
-                    {React.string(itemSource)}
-                  </>
-                | None => React.null
-                }}
-              </div>
-              {if item.tags->Js.Array.length > 0 {
-                <div className=Styles.itemTags>
-                  <span className=Styles.itemTagIcon />
-                  {item.tags
-                  ->Belt.Array.map(tag =>
-                    <Link path={"/?q=" ++ tag} className=Styles.itemTag key=tag>
-                      {React.string(Utils.capitalizeFirstLetter(tag))}
-                    </Link>
-                  )
-                  ->React.array}
-                </div>
-              } else {
-                React.null
-              }}
-              {if item.buyPrice != None || item.sellPrice != None {
-                <div className=Styles.itemPrices>
-                  {switch item.buyPrice {
-                  | Some(buyPrice) =>
-                    <div className=Styles.itemPrice>
-                      <span className={Cn.make(list{Emoji.Styles.bell, Styles.itemPriceIcon})} />
-                      <label className=Styles.itemPriceLabel> {React.string("Buy")} </label>
-                      <span className=Styles.itemPriceValue>
-                        {React.string(string_of_int(buyPrice))}
-                      </span>
-                    </div>
-                  | None => React.null
-                  }}
-                  {switch item.sellPrice {
-                  | Some(sellPrice) =>
-                    <div className=Styles.itemPrice>
-                      <span className={Cn.make(list{Emoji.Styles.bell, Styles.itemPriceIcon})} />
-                      <label className=Styles.itemPriceLabel> {React.string("Sell")} </label>
-                      <span className=Styles.itemPriceValue>
-                        {React.string(string_of_int(sellPrice))}
-                      </span>
-                    </div>
-                  | None => React.null
-                  }}
-                </div>
-              } else {
-                React.null
-              }}
-              {switch item.customizeCost {
-              | Some(customizeCost) =>
-                <div className=Styles.itemCustomizeCost>
-                  <span className=Styles.itemRemakeIcon />
-                  {React.string(
-                    switch (item.bodyCustomizable, item.patternCustomizable) {
-                    | (true, true) => "Body and Pattern Customizable "
-                    | (false, true) => "Pattern Customizable "
-                    | (true, false) => "Body Customizable "
-                    | _ => ""
-                    },
-                  )}
-                  {React.string(j`(×` ++ (string_of_int(customizeCost) ++ ")"))}
-                </div>
-              | None => React.null
-              }}
-            </div>
-            {viewportWidth <= 500 ? itemImage : React.null}
-            {switch (item.type_, item.variations) {
-            | (Recipe(_), _) => React.null
-            | (_, Single) => React.null
-            | (_, OneDimension(a)) => <OneDimensionVariants item a variant />
-            | (_, TwoDimensions(a, b)) => <TwoDimensionVariants item a b variant />
-            }}
-            {switch me {
-            | Some(me) =>
-              let canonicalVariant = Item.getCanonicalVariant(~item, ~variant)
-              <MyStatusSection
-                item variant=canonicalVariant key={string_of_int(canonicalVariant)}
-              />
-            | None => React.null
-            }}
-          </div>
-        </div>
-        {switch me->Belt.Option.flatMap(me => me.followeeIds) {
-        | Some(followeeIds) =>
-          if Js.Array.length(followeeIds) > 0 {
-            <FriendsSection item />
-          } else {
-            React.null
-          }
-        | None => React.null
-        }}
-        <Modal.CloseButton onClose />
-      </div>
-    </Modal.Div100VH>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/ItemFilters.res b/jscomp/syntax/tests/idempotency/nook-exchange/ItemFilters.res
deleted file mode 100644
index 8ef33d1..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/ItemFilters.res
+++ /dev/null
@@ -1,912 +0,0 @@
-module Styles = {
-  open Css
-  let select = style(list{
-    borderColor(hex("00000020")),
-    fontSize(px(16)),
-    height(px(37)),
-    marginRight(px(8)),
-    marginBottom(px(8)),
-  })
-  let selectSort = style(list{marginRight(px(16))})
-  let textInputWrapper = style(list{display(inlineBlock), position(relative), marginRight(px(8))})
-  let textInput = style(list{
-    backgroundColor(Colors.white),
-    border(px(1), solid, hex("00000020")),
-    fontSize(px(16)),
-    marginBottom(px(8)),
-    padding2(~v=zero, ~h=px(12)),
-    borderRadius(px(4)),
-    height(px(35)),
-    width(px(180)),
-  })
-  @module("./assets/close.png") external closePng: string = "default"
-  let textInputClear = style(list{
-    position(absolute),
-    right(px(8)),
-    top(px(10)),
-    width(px(16)),
-    height(px(16)),
-    backgroundColor(transparent),
-    backgroundImage(url(closePng)),
-    backgroundSize(#size(px(16), px(16))),
-    backgroundRepeat(noRepeat),
-    backgroundPosition(center),
-    borderStyle(none),
-    opacity(0.5),
-    padding(zero),
-  })
-  let inputWithValue = style(list{boxShadow(Shadow.box(~spread=px(2), hex("3aa56380")))})
-  let clearFilters = style(list{
-    alignSelf(flexStart),
-    fontSize(px(16)),
-    lineHeight(px(37)),
-    paddingRight(px(16)),
-    whiteSpace(#nowrap),
-    textDecoration(none),
-    hover(list{textDecoration(underline)}),
-  })
-  let root = style(list{display(flexBox), flexWrap(wrap)})
-  let rootScrollerSpacer = style(list{
-    media("(max-width: 600px)", list{flexShrink(0.), width(px(1)), height(px(1))}),
-  })
-  let pager = style(list{fontSize(px(16)), lineHeight(px(32))})
-  let pagerArrow = style(list{
-    fontSize(px(24)),
-    lineHeight(px(24)),
-    textDecoration(none),
-    opacity(0.8),
-    padding2(~v=zero, ~h=px(8)),
-    transition(~duration=200, "all"),
-    hover(list{opacity(1.)}),
-  })
-}
-
-type sort =
-  | ABC
-  | SellPriceDesc
-  | SellPriceAsc
-  | UserDefault
-  | UserTimeUpdated
-  | UserNote
-  | ListTimeAdded
-
-type mask =
-  | Orderable
-  | Craftable
-  | NotOrderable
-
-type excludables =
-  | Catalog
-  | CanCraft
-  | Wishlist
-
-type t = {
-  text: string,
-  mask: option<mask>,
-  category: option<string>,
-  exclude: array<excludables>,
-  sort: sort,
-}
-
-let serializeSort = (~sort, ~defaultSort) =>
-  if sort != defaultSort && sort != UserDefault {
-    Some((
-      "s",
-      switch sort {
-      | ABC => "abc"
-      | SellPriceDesc => "pd"
-      | SellPriceAsc => "pa"
-      | UserDefault => ""
-      | UserTimeUpdated => "tu"
-      | UserNote => "note"
-      | ListTimeAdded => ""
-      },
-    ))
-  } else {
-    None
-  }
-
-let serialize = (~filters, ~defaultSort, ~pageOffset) => {
-  let p = []
-  switch serializeSort(~sort=filters.sort, ~defaultSort) {
-  | Some(param) => p |> Js.Array.push(param) |> ignore
-  | None => ()
-  }
-  if filters.text != "" {
-    p |> Js.Array.push(("q", filters.text)) |> ignore
-  }
-  switch filters.mask {
-  | Some(Orderable) => p |> Js.Array.push(("orderable", "")) |> ignore
-  | Some(NotOrderable) => p |> Js.Array.push(("not-orderable", "")) |> ignore
-  | Some(Craftable) => p |> Js.Array.push(("craftable", "")) |> ignore
-  | None => ()
-  }
-  switch filters.category {
-  | Some(category) => p |> Js.Array.push(("c", category)) |> ignore
-  | None => ()
-  }
-  if Js.Array.length(filters.exclude) > 0 {
-    p
-    |> Js.Array.push((
-      "e",
-      filters.exclude->Belt.Array.map(exclude =>
-        switch exclude {
-        | Catalog => "catalog"
-        | CanCraft => "can-craft"
-        | Wishlist => "wishlist"
-        }
-      ) |> Js.Array.joinWith(","),
-    ))
-    |> ignore
-  }
-  if pageOffset != 0 {
-    p |> Js.Array.push(("p", string_of_int(pageOffset + 1))) |> ignore
-  }
-  p
-}
-
-let sortFromUrlSearch = (~searchParams, ~defaultSort) => {
-  open Webapi.Url.URLSearchParams
-  switch searchParams |> get("s") {
-  | Some("abc") => ABC
-  | Some("pd") => SellPriceDesc
-  | Some("pa") => SellPriceAsc
-  | Some("tu") => UserTimeUpdated
-  | Some("note") => UserNote
-  | _ => defaultSort
-  }
-}
-
-let fromUrlSearch = (~urlSearch, ~defaultSort) => {
-  open Belt
-  open Webapi.Url.URLSearchParams
-  let searchParams = make(urlSearch)
-  (
-    {
-      text: (searchParams |> get("q"))->Option.getWithDefault(""),
-      mask: searchParams |> has("orderable")
-        ? Some(Orderable)
-        : searchParams |> has("craftable")
-        ? Some(Craftable)
-        : searchParams |> has("not-orderable")
-        ? Some(NotOrderable)
-        : None,
-      category: Option.flatMap(searchParams |> get("c"), category =>
-        if Item.validCategoryStrings |> Js.Array.includes(category) {
-          Some(category)
-        } else {
-          None
-        }
-      ),
-      exclude: switch searchParams |> get("e") {
-      | Some(e) =>
-        (e |> Js.String.split(","))
-          ->Belt.Array.keepMap(fragment =>
-            switch fragment {
-            | "wishlist" => Some(Wishlist)
-            | "can-craft" => Some(CanCraft)
-            | "catalog" => Some(Catalog)
-            | _ => None
-            }
-          )
-      | None => []
-      },
-      sort: sortFromUrlSearch(~searchParams, ~defaultSort),
-    },
-    Option.map(searchParams |> get("p"), s => int_of_string(s) - 1)->Option.getWithDefault(0),
-  )
-}
-
-let doesItemMatchCategory = (~item: Item.t, ~category: string) =>
-  switch category {
-  | "furniture" => Item.furnitureCategories |> Js.Array.includes(item.category)
-  | "clothing" => Item.clothingCategories |> Js.Array.includes(item.category)
-  | "recipes" => Item.isRecipe(~item)
-  | category => item.category == category
-  }
-
-let removeAccents = str =>
-  str |> Js.String.normalizeByForm("NFD") |> Js.String.replaceByRe(%re("/[\u0300-\u036f]/g"), "")
-
-let doesItemMatchFilters = (~item: Item.t, ~filters: t) =>
-  switch filters.text {
-  | "" => true
-  | text =>
-    let textLower = Js.String.toLowerCase(text)
-    switch item.source {
-    | Some(source) => textLower == Js.String.toLowerCase(source)
-    | None => false
-    } || {
-      let fragments =
-        (textLower |> Js.String.splitByRe(%re(`/[\\s-]+/`)))->Belt.Array.keepMap(x => x)
-      fragments->Belt.Array.every(fragment =>
-        Js.String.toLowerCase(Item.getName(item))
-        |> removeAccents
-        |> Js.String.includes(removeAccents(fragment)) || item.tags |> Js.Array.includes(fragment)
-      )
-    }
-  } &&
-  (switch filters.mask {
-  | Some(Orderable) => item.orderable
-  | Some(Craftable) => item.recipe !== None
-  | Some(NotOrderable) => !item.orderable && item.recipe === None
-  | None => true
-  } &&
-  switch filters.category {
-  | Some(category) => doesItemMatchCategory(~item, ~category)
-  | None => true
-  })
-
-let compareArrays = (a, b) => {
-  let rv = ref(None)
-  let i = ref(0)
-  while i.contents < Js.Array.length(a) && rv.contents === None {
-    if a[i.contents] < b[i.contents] {
-      rv := Some(-1)
-    } else if a[i.contents] > b[i.contents] {
-      rv := Some(1)
-    }
-    i := i.contents + 1
-  }
-  Belt.Option.getWithDefault(rv.contents, 0)
-}
-
-let compareItemsABC = (a: Item.t, b: Item.t) => {
-  // hack to sort "wooden-" before "wooden "
-  let aName = Item.getName(a) |> Js.String.replaceByRe(%re("/-/g"), " ")
-  let bName = Item.getName(b) |> Js.String.replaceByRe(%re("/-/g"), " ")
-  int_of_float(Js.String.localeCompare(bName, aName))
-}
-let compareItemsSellPriceDesc = (a: Item.t, b: Item.t) =>
-  compareArrays(
-    [Belt.Option.getWithDefault(b.sellPrice, 0), compareItemsABC(a, b)],
-    [Belt.Option.getWithDefault(a.sellPrice, 0), 0],
-  )
-let compareItemsSellPriceAsc = (a: Item.t, b: Item.t) =>
-  compareArrays(
-    [Belt.Option.getWithDefault(a.sellPrice, 0), compareItemsABC(a, b)],
-    [Belt.Option.getWithDefault(b.sellPrice, 0), 0],
-  )
-
-exception UnexpectedSort(sort)
-let getSort = (~sort) =>
-  switch sort {
-  | ABC => compareItemsABC
-  | SellPriceDesc => compareItemsSellPriceDesc
-  | SellPriceAsc => compareItemsSellPriceAsc
-  | ListTimeAdded
-  | UserTimeUpdated
-  | UserNote
-  | UserDefault =>
-    raise(UnexpectedSort(sort))
-  }
-
-let wrapWithVariantSort = (sort, a, b) => {
-  let order = sort(a, b)
-  if order != 0 {
-    order
-  } else {
-    let ((_, aVariant), _) = a
-    let ((_, bVariant), _) = b
-    aVariant - bVariant
-  }
-}
-let getUserItemSort = (~prioritizeViewerStatuses: array<User.itemStatus>=[], ~sort) =>
-  switch sort {
-  | ABC =>
-    wrapWithVariantSort((((aId, _), _), ((bId, _), _)) =>
-      compareItemsABC(Item.getItem(~itemId=aId), Item.getItem(~itemId=bId))
-    )
-  | SellPriceDesc =>
-    wrapWithVariantSort((((aId, _), _), ((bId, _), _)) =>
-      compareItemsSellPriceDesc(Item.getItem(~itemId=aId), Item.getItem(~itemId=bId))
-    )
-  | SellPriceAsc =>
-    wrapWithVariantSort((((aId, _), _), ((bId, _), _)) =>
-      compareItemsSellPriceAsc(Item.getItem(~itemId=aId), Item.getItem(~itemId=bId))
-    )
-  | UserDefault =>
-    wrapWithVariantSort((
-      ((aId, aVariant), {priorityTimestamp: aPriorityTimestamp}: User.item),
-      ((bId, bVariant), {priorityTimestamp: bPriorityTimestamp}: User.item),
-    ) => {
-      let aItem = Item.getItem(~itemId=aId)
-      let bItem = Item.getItem(~itemId=bId)
-      compareArrays(
-        [
-          switch UserStore.getItem(~itemId=aId, ~variation=aVariant) {
-          | Some(aUserItem) =>
-            prioritizeViewerStatuses |> Js.Array.includes(aUserItem.status) ? -1. : 0.
-          | None => 0.
-          },
-          -.Belt.Option.getWithDefault(aPriorityTimestamp, 0.),
-          Item.categories |> Js.Array.indexOf(aItem.category) |> float_of_int,
-          float_of_int(compareItemsABC(aItem, bItem)),
-        ],
-        [
-          switch UserStore.getItem(~itemId=bId, ~variation=bVariant) {
-          | Some(bUserItem) =>
-            prioritizeViewerStatuses |> Js.Array.includes(bUserItem.status) ? -1. : 0.
-          | None => 0.
-          },
-          -.Belt.Option.getWithDefault(bPriorityTimestamp, 0.),
-          Item.categories |> Js.Array.indexOf(bItem.category) |> float_of_int,
-          0.,
-        ],
-      )
-    })
-  | UserTimeUpdated =>
-    wrapWithVariantSort((((aId, _), aUserItem: User.item), ((bId, _), bUserItem: User.item)) => {
-      let aItem = Item.getItem(~itemId=aId)
-      let bItem = Item.getItem(~itemId=bId)
-      compareArrays(
-        [
-          -.(aUserItem.timeUpdated->Belt.Option.getWithDefault(0.)),
-          float_of_int(compareItemsABC(aItem, bItem)),
-        ],
-        [-.(bUserItem.timeUpdated->Belt.Option.getWithDefault(0.)), 0.],
-      )
-    })
-  | UserNote =>
-    wrapWithVariantSort((((aId, _), aUserItem: User.item), ((bId, _), bUserItem: User.item)) => {
-      let aItem = Item.getItem(~itemId=aId)
-      let bItem = Item.getItem(~itemId=bId)
-      compareArrays(
-        [
-          switch (aUserItem.note, bUserItem.note) {
-          | ("", _) => 1
-          | (_, "") => -1
-          | (a, b) => int_of_float(a |> Js.String.localeCompare(b))
-          },
-          compareItemsABC(aItem, bItem),
-        ],
-        [0, 0],
-      )
-    })
-  | ListTimeAdded => raise(UnexpectedSort(sort))
-  }
-
-module Pager = {
-  @react.component
-  let make = (~numResults, ~pageOffset, ~numResultsPerPage, ~setPageOffset, ~className=?, ()) =>
-    if numResults > 8 {
-      <div className={Cn.make(list{Styles.pager, Cn.unpack(className)})}>
-        {pageOffset > 0
-          ? <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                setPageOffset(pageOffset => pageOffset - 1)
-              }}
-              className=Styles.pagerArrow>
-              {React.string("<")}
-            </a>
-          : React.null}
-        {React.string(
-          "Showing " ++
-          (string_of_int(pageOffset * numResultsPerPage + 1) ++
-          (" - " ++
-          (string_of_int(Js.Math.min_int((pageOffset + 1) * numResultsPerPage, numResults)) ++
-          (" of " ++ string_of_int(numResults))))),
-        )}
-        {pageOffset < (numResults - 1) / numResultsPerPage
-          ? <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                setPageOffset(pageOffset => pageOffset + 1)
-              }}
-              className=Styles.pagerArrow>
-              {React.string(">")}
-            </a>
-          : React.null}
-      </div>
-    } else {
-      React.null
-    }
-}
-
-external unsafeAsHtmlInputElement: 'a => Webapi.Dom.HtmlInputElement.t = "%identity"
-
-let getCategoryLabel = category =>
-  switch category {
-  | "recipes" => "Recipes"
-  | "furniture" => "Furniture"
-  | "clothing" => "Clothing"
-  | category => Utils.capitalizeFirstLetter(category)
-  }
-
-module CategoryButtons = {
-  module CategoryStyles = {
-    open Css
-    let button = style(list{marginRight(px(8)), transition(~duration=200, "all")})
-    let buttonNotSelected = style(list{
-      backgroundColor(hex("8fcaa3e0")),
-      hover(list{backgroundColor(hex("3aa563e0"))}),
-    })
-    let select = style(list{
-      height(px(37)),
-      opacity(0.7),
-      marginRight(px(16)),
-      marginBottom(zero),
-      hover(list{opacity(1.)}),
-    })
-    let selectSelected = style(list{height(px(37)), opacity(1.)})
-    let root = style(list{paddingBottom(px(8)), whiteSpace(#nowrap)})
-  }
-
-  @react.component
-  let make = (~filters: t, ~onChange, ~userItemIds: option<array<int>>=?, ()) => {
-    let shouldRenderCategory = category =>
-      switch userItemIds {
-      | Some(userItemIds) =>
-        userItemIds->Belt.Array.some(itemId =>
-          doesItemMatchCategory(~item=Item.getItem(~itemId), ~category)
-        )
-      | None => true
-      }
-    let renderButton = category =>
-      if shouldRenderCategory(category) {
-        let isSelected = filters.category == Some(category)
-        <Button
-          onClick={_ =>
-            onChange({
-              ...filters,
-              text: "",
-              category: isSelected ? None : Some(category),
-            })}
-          className={Cn.make(list{
-            CategoryStyles.button,
-            Cn.ifTrue(CategoryStyles.buttonNotSelected, !isSelected),
-          })}
-          key=category>
-          {React.string(getCategoryLabel(category))}
-        </Button>
-      } else {
-        React.null
-      }
-
-    let selectCategories = Belt.Array.concatMany([
-      ["housewares", "miscellaneous", "wall-mounted", "wallpapers", "floors", "rugs", "other"],
-      Item.clothingCategories,
-      ["fossils", "photos", "posters", "fencing", "tools", "music"],
-    ])
-
-    <div className=CategoryStyles.root>
-      <Button
-        onClick={_ => onChange({...filters, category: None})}
-        className={Cn.make(list{
-          CategoryStyles.button,
-          Cn.ifTrue(CategoryStyles.buttonNotSelected, filters.category != None),
-        })}>
-        {React.string("Everything!")}
-      </Button>
-      {renderButton("furniture")}
-      {renderButton("recipes")}
-      {renderButton("clothing")}
-      <select
-        value={switch filters.category {
-        | Some(category) => selectCategories |> Js.Array.includes(category) ? category : ""
-        | None => ""
-        }}
-        onChange={e => {
-          let value = ReactEvent.Form.target(e)["value"]
-          onChange({
-            ...filters,
-            text: "",
-            category: switch value {
-            | "" => None
-            | category => Some(category)
-            },
-          })
-        }}
-        className={Cn.make(list{
-          Styles.select,
-          CategoryStyles.select,
-          Cn.ifTrue(
-            CategoryStyles.selectSelected,
-            switch filters.category {
-            | Some(category) => selectCategories |> Js.Array.includes(category)
-            | None => false
-            },
-          ),
-        })}>
-        <option value=""> {React.string("-- Categories")} </option>
-        {selectCategories
-        ->Belt.Array.mapU((. category) =>
-          shouldRenderCategory(category)
-            ? <option value=category key=category>
-                {React.string(getCategoryLabel(category))}
-              </option>
-            : React.null
-        )
-        ->React.array}
-      </select>
-    </div>
-  }
-}
-
-module AdvancedFilter = {
-  module Styles = {
-    open Css
-    let link = style(list{
-      fontSize(px(16)),
-      textDecoration(none),
-      lineHeight(px(32)),
-      marginBottom(px(8)),
-      hover(list{textDecoration(underline)}),
-      media("(min-width: 940px)", list{lineHeight(px(37))}),
-    })
-    let linkSelected = style(list{fontWeight(#num(800))})
-    let root = style(list{
-      padding2(~v=px(24), ~h=px(32)),
-      width(vw(90.)),
-      boxSizing(borderBox),
-      maxWidth(px(360)),
-    })
-    let sectionTitle = style(list{fontSize(px(20)), marginBottom(px(8))})
-    let option = style(list{
-      display(flexBox),
-      justifyContent(spaceBetween),
-      alignItems(center),
-      selector("& > input", list{fontSize(px(16)), margin(zero)}),
-    })
-    let optionLabel = style(list{fontSize(px(16)), lineHeight(px(24))})
-  }
-
-  module AdvancedFilterModal = {
-    @react.component
-    let make = (~filters: t, ~onChange, ~onClose) => {
-      let onChangeCheckbox = (excludable, e) => {
-        let checked = ReactEvent.Form.target(e)["checked"]
-        if checked {
-          onChange({
-            ...filters,
-            exclude: if filters.exclude |> Js.Array.includes(excludable) {
-              filters.exclude
-            } else {
-              filters.exclude->Belt.Array.concat([excludable])
-            },
-          })
-        } else {
-          onChange({
-            ...filters,
-            exclude: filters.exclude->Belt.Array.keep(a => a !== excludable),
-          })
-        }
-      }
-
-      <Modal onBackdropClick={_ => onClose()}>
-        <div className=Styles.root>
-          <div className=Styles.sectionTitle> {React.string("Hide items from")} </div>
-          <div>
-            <label className=Styles.option>
-              <span className=Styles.optionLabel> {React.string("My Catalog")} </span>
-              <input
-                type_="checkbox"
-                value="catalog"
-                checked={filters.exclude |> Js.Array.includes(Catalog)}
-                onChange={onChangeCheckbox(Catalog)}
-              />
-            </label>
-          </div>
-          <div>
-            <label className=Styles.option>
-              <span className=Styles.optionLabel> {React.string("Can Craft")} </span>
-              <input
-                type_="checkbox"
-                value="can-craft"
-                checked={filters.exclude |> Js.Array.includes(CanCraft)}
-                onChange={onChangeCheckbox(CanCraft)}
-              />
-            </label>
-          </div>
-          <div>
-            <label className=Styles.option>
-              <span className=Styles.optionLabel> {React.string("My Wishlist")} </span>
-              <input
-                type_="checkbox"
-                value="wishlist"
-                checked={filters.exclude |> Js.Array.includes(Wishlist)}
-                onChange={onChangeCheckbox(Wishlist)}
-              />
-            </label>
-          </div>
-        </div>
-        <Modal.CloseButton onClose />
-      </Modal>
-    }
-  }
-
-  @react.component
-  let make = (~filters, ~onChange, ~className=?, ()) => {
-    let (showModal, setShowModal) = React.useState(() => false)
-    <>
-      <a
-        href="#"
-        onClick={e => {
-          ReactEvent.Mouse.preventDefault(e)
-          setShowModal(_ => true)
-        }}
-        className={Cn.make(list{
-          Styles.link,
-          Cn.ifTrue(Styles.linkSelected, filters.exclude != []),
-          Cn.unpack(className),
-        })}>
-        {React.string("Advanced")}
-      </a>
-      {showModal
-        ? <AdvancedFilterModal filters onChange onClose={() => setShowModal(_ => false)} />
-        : React.null}
-    </>
-  }
-}
-
-module UserCategorySelector = {
-  module CategoryStyles = {
-    open Css
-    let select = style(list{height(px(37))})
-  }
-
-  @react.component
-  let make = (~filters: t, ~onChange, ~userItemIds: array<int>) => {
-    let shouldRenderCategory = category =>
-      userItemIds->Belt.Array.some(itemId =>
-        doesItemMatchCategory(~item=Item.getItem(~itemId), ~category)
-      )
-
-    <select
-      value={Belt.Option.getWithDefault(filters.category, "")}
-      onChange={e => {
-        let value = ReactEvent.Form.target(e)["value"]
-        if value == "" {
-          onChange({...filters, category: None})
-        } else {
-          onChange({...filters, text: "", category: Some(value)})
-        }
-      }}
-      className={Cn.make(list{
-        Styles.select,
-        CategoryStyles.select,
-        Cn.ifTrue(Styles.inputWithValue, filters.category != None),
-      })}>
-      <option value=""> {React.string("All categories")} </option>
-      {Item.validCategoryStrings
-      ->Belt.Array.mapU((. category) =>
-        shouldRenderCategory(category)
-          ? <option value=category key=category>
-              {React.string(Utils.capitalizeFirstLetter(category))}
-            </option>
-          : React.null
-      )
-      ->React.array}
-    </select>
-  }
-}
-
-module SortSelector = {
-  @react.component
-  let make = (
-    ~sort,
-    ~onChange,
-    ~onListPage=false,
-    ~userItemIds,
-    ~isViewingSelf,
-    ~className=?,
-    (),
-  ) =>
-    <select
-      value={switch sort {
-      | ABC => "abc"
-      | SellPriceDesc => "sell-desc"
-      | SellPriceAsc => "sell-asc"
-      | UserDefault => "user-default"
-      | UserTimeUpdated => "time-updated"
-      | UserNote => "note"
-      | ListTimeAdded => "list-added"
-      }}
-      onChange={e => {
-        let value = ReactEvent.Form.target(e)["value"]
-        onChange(
-          switch value {
-          | "abc" => ABC
-          | "sell-desc" => SellPriceDesc
-          | "sell-asc" => SellPriceAsc
-          | "user-default" => UserDefault
-          | "time-updated" => UserTimeUpdated
-          | "note" => UserNote
-          | "list-added" => ListTimeAdded
-          | _ => SellPriceDesc
-          },
-        )
-      }}
-      className={Cn.unpack(className)}>
-      {if onListPage {
-        <option value="list-added"> {React.string(j`Time Added ↓`)} </option>
-      } else {
-        React.null
-      }}
-      {if userItemIds !== None {
-        <>
-          <option value="user-default">
-            {React.string(isViewingSelf ? "Sort: Category" : "Sort: Default")}
-          </option>
-          <option value="time-updated"> {React.string(j`Time Updated ↓`)} </option>
-        </>
-      } else {
-        React.null
-      }}
-      <option value="sell-desc"> {React.string(j`Sell Price ↓`)} </option>
-      <option value="sell-asc"> {React.string(j`Sell Price ↑`)} </option>
-      <option value="abc"> {React.string("A - Z")} </option>
-      {if userItemIds !== None {
-        <option value="note"> {React.string(j`Item Note`)} </option>
-      } else {
-        React.null
-      }}
-    </select>
-}
-
-@get
-external activeElementForDocument: Webapi.Dom.Document.t => Webapi.Dom.HtmlElement.t =
-  "activeElement"
-
-let isInputActiveElement = () => {
-  open Webapi.Dom
-
-  let activeElementTagName = activeElementForDocument(document)->HtmlElement.tagName
-  activeElementTagName == "INPUT" ||
-    (activeElementTagName == "SELECT" ||
-    activeElementTagName == "TEXTAREA")
-}
-
-@react.component
-let make = (
-  ~filters,
-  ~onChange,
-  ~userItemIds: option<array<int>>=?,
-  ~isViewingSelf=false,
-  ~className=?,
-  (),
-) => {
-  let inputTextRef = React.useRef(Js.Nullable.null)
-  let updateTextTimeoutRef = React.useRef(None)
-  React.useEffect1(() => {
-    {
-      open Webapi.Dom
-      Utils.getElementForDomRef(inputTextRef)
-      ->unsafeAsHtmlInputElement
-      ->HtmlInputElement.setValue(filters.text)
-    }
-
-    Some(
-      () => {
-        switch React.Ref.current(updateTextTimeoutRef) {
-        | Some(updateTextTimeout) => Js.Global.clearTimeout(updateTextTimeout)
-        | None => ()
-        }
-        React.Ref.setCurrent(updateTextTimeoutRef, None)
-      },
-    )
-  }, [filters])
-
-  React.useEffect0(() => {
-    open Webapi.Dom
-    let onKeyDown = e =>
-      switch KeyboardEvent.key(e) {
-      | "Esc"
-      | "Escape" =>
-        let url = ReasonReactRouter.dangerouslyGetInitialUrl()
-        // don't trigger if ItemDetailOverlay is shown
-        if !(url.hash |> Js.Re.test_(%re("/i(-?\d+)(:(\d+))?/g"))) {
-          onChange({...filters, text: ""})
-        }
-      | "/" =>
-        if !isInputActiveElement() {
-          Js.Global.setTimeout(
-            () =>
-              Utils.getElementForDomRef(inputTextRef)
-              ->unsafeAsHtmlInputElement
-              ->HtmlInputElement.focus,
-            20,
-          ) |> ignore
-        }
-      | _ => ()
-      }
-    window |> Window.addKeyDownEventListener(onKeyDown)
-    Some(() => window |> Window.removeKeyDownEventListener(onKeyDown))
-  })
-
-  <div className={Cn.make(list{Styles.root, Cn.unpack(className)})}>
-    <div className=Styles.textInputWrapper>
-      <input
-        type_="text"
-        ref={ReactDOMRe.Ref.domRef(inputTextRef)}
-        placeholder="Search.. Esc to clear"
-        defaultValue=filters.text
-        onChange={e => {
-          let value = ReactEvent.Form.target(e)["value"]
-          switch React.Ref.current(updateTextTimeoutRef) {
-          | Some(updateTextTimeout) => Js.Global.clearTimeout(updateTextTimeout)
-          | None => ()
-          }
-          React.Ref.setCurrent(updateTextTimeoutRef, Some(Js.Global.setTimeout(() => {
-                React.Ref.setCurrent(updateTextTimeoutRef, None)
-                onChange({...filters, text: value})
-              }, 500)))
-        }}
-        className={Cn.make(list{
-          Styles.textInput,
-          Cn.ifTrue(Styles.inputWithValue, filters.text != ""),
-        })}
-      />
-      {filters.text != ""
-        ? <button onClick={e => onChange({...filters, text: ""})} className=Styles.textInputClear />
-        : React.null}
-    </div>
-    {switch userItemIds {
-    | Some(userItemIds) => <UserCategorySelector userItemIds filters onChange />
-    | None => React.null
-    }}
-    <select
-      value={switch filters.mask {
-      | Some(Orderable) => "orderable"
-      | Some(Craftable) => "craftable"
-      | Some(NotOrderable) => "not-orderable"
-      | None => "none"
-      }}
-      onChange={e => {
-        let value = ReactEvent.Form.target(e)["value"]
-        onChange({
-          ...filters,
-          mask: switch value {
-          | "orderable" => Some(Orderable)
-          | "craftable" => Some(Craftable)
-          | "not-orderable" => Some(NotOrderable)
-          | "none" => None
-          | _ => None
-          },
-        })
-      }}
-      className={Cn.make(list{
-        Styles.select,
-        Cn.ifTrue(Styles.inputWithValue, filters.mask != None),
-      })}>
-      <option value="none"> {React.string("No Filter")} </option>
-      <option value="orderable"> {React.string("Orderable")} </option>
-      <option value="craftable"> {React.string("Craftable")} </option>
-      <option value="not-orderable"> {React.string("Not Orderable")} </option>
-    </select>
-    <SortSelector
-      sort=filters.sort
-      onChange={sort => onChange({...filters, sort: sort})}
-      userItemIds
-      isViewingSelf
-      className={Cn.make(list{Styles.select, Styles.selectSort})}
-    />
-    {if (
-      filters.text != "" ||
-        (filters.mask != None ||
-        (filters.exclude != [] || filters.category != None))
-    ) {
-      <a
-        href="#"
-        onClick={e => {
-          ReactEvent.Mouse.preventDefault(e)
-          onChange({
-            text: "",
-            mask: None,
-            category: None,
-            exclude: [],
-            sort: filters.sort,
-          })
-        }}
-        className=Styles.clearFilters>
-        {React.string("Clear filters")}
-      </a>
-    } else {
-      React.null
-    }}
-    <div className=Styles.rootScrollerSpacer />
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/ItemImage.res b/jscomp/syntax/tests/idempotency/nook-exchange/ItemImage.res
deleted file mode 100644
index 83a22a8..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/ItemImage.res
+++ /dev/null
@@ -1,140 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{display(flexBox), alignItems(stretch), justifyContent(center)})
-  let mainImageWrapper = style(list{position(relative)})
-  let mainImageWrapperRecipe = style(list{marginBottom(px(16))})
-  let image = style(list{display(block), height(px(128)), width(px(128))})
-  let recipeIcon = style(list{
-    display(block),
-    height(px(64)),
-    width(px(64)),
-    position(absolute),
-    right(px(-16)),
-    bottom(px(-16)),
-    opacity(0.95),
-    transition(~duration=200, "all"),
-    hover(list{opacity(1.)}),
-  })
-  let variantButton = style(list{
-    background(transparent),
-    borderWidth(zero),
-    padding(zero),
-    cursor(pointer),
-    flexGrow(1.),
-    display(flexBox),
-    alignItems(center),
-    justifyContent(center),
-    transition(~duration=200, "all"),
-    outlineStyle(none),
-    opacity(0.2),
-    media("(hover: none)", list{opacity(0.5)}),
-    media("(hover: hover)", list{hover(list{important(opacity(1.))})}),
-    unsafe("touchAction", "manipulation"),
-  })
-  let variantButtonLeft = "variant-button-left"
-  let variantButtonRight = "variant-button-right"
-  @module("./assets/variant_left.png")
-  external variantLeftIcon: string = "default"
-  let variantArrow = style(list{
-    display(inlineBlock),
-    width(px(32)),
-    height(px(32)),
-    backgroundSize(cover),
-  })
-  let variantArrowLeft = style(list{backgroundImage(url(variantLeftIcon))})
-  @module("./assets/variant_right.png")
-  external variantRightIcon: string = "default"
-  let variantArrowRight = style(list{backgroundImage(url(variantRightIcon))})
-  let variantButtonNarrow = style(list{
-    selector("& ." ++ variantArrow, list{width(px(16)), height(px(16))}),
-  })
-  let variantButtonDisabled = style(list{
-    important(opacity(0.1)),
-    cursor(#default),
-    media("(hover: hover)", list{hover(list{important(opacity(0.1))})}),
-  })
-}
-
-@react.component
-let make = (
-  ~item: Item.t,
-  ~variant,
-  ~narrow=false,
-  ~forceTooltip=false,
-  ~link=true,
-  ~className=?,
-  (),
-) => {
-  let numCollapsedVariants = if Item.isRecipe(~item) {
-    1
-  } else {
-    switch item.variations {
-    | Single
-    | OneDimension(_) => 1
-    | TwoDimensions(a, b) =>
-      if item.bodyCustomizable {
-        a * b
-      } else {
-        b
-      }
-    }
-  }
-  let (offset, setOffset) = React.useState(() => 0)
-  <div className={Cn.make(list{Styles.root, Cn.unpack(className)})}>
-    {numCollapsedVariants > 1
-      ? <button
-          onClick={_ => setOffset(offset => Js.Math.max_int(offset - 1, 0))}
-          className={Cn.make(list{
-            Styles.variantButton,
-            Styles.variantButtonLeft,
-            Cn.ifTrue(Styles.variantButtonNarrow, narrow),
-            Cn.ifTrue(Styles.variantButtonDisabled, offset <= 0),
-          })}>
-          <span className={Cn.make(list{Styles.variantArrow, Styles.variantArrowLeft})} />
-        </button>
-      : React.null}
-    <div
-      className={Cn.make(list{
-        Styles.mainImageWrapper,
-        Cn.ifTrue(Styles.mainImageWrapperRecipe, Item.isRecipe(~item)),
-        Cn.unpack(className),
-      })}>
-      {
-        let image =
-          <Link path={Utils.getItemDetailUrl(~itemId=item.id, ~variant=Some(variant + offset))}>
-            <img src={Item.getImageUrl(~item, ~variant=variant + offset)} className=Styles.image />
-          </Link>
-        let variantName = if numCollapsedVariants > 1 || forceTooltip {
-          Item.getVariantName(~item, ~variant=variant + offset, ())
-        } else {
-          None
-        }
-        switch (Utils.browserSupportsHover, variantName) {
-        | (true, Some(variantName)) =>
-          <ReactAtmosphere.Tooltip text={React.string(variantName)}>
-            {({onMouseEnter, onMouseLeave, onFocus, onBlur, ref}) =>
-              <div onMouseEnter onMouseLeave onFocus onBlur ref={ReactDOMRe.Ref.domRef(ref)}>
-                image
-              </div>}
-          </ReactAtmosphere.Tooltip>
-        | _ => image
-        }
-      }
-      {Item.isRecipe(~item)
-        ? <img src={Constants.cdnUrl ++ "/images/DIYRecipe.png"} className=Styles.recipeIcon />
-        : React.null}
-    </div>
-    {numCollapsedVariants > 1
-      ? <button
-          onClick={_ => setOffset(offset => Js.Math.min_int(offset + 1, numCollapsedVariants - 1))}
-          className={Cn.make(list{
-            Styles.variantButton,
-            Styles.variantButtonRight,
-            Cn.ifTrue(Styles.variantButtonNarrow, narrow),
-            Cn.ifTrue(Styles.variantButtonDisabled, offset >= numCollapsedVariants - 1),
-          })}>
-          <span className={Cn.make(list{Styles.variantArrow, Styles.variantArrowRight})} />
-        </button>
-      : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/LanguageSelector.res b/jscomp/syntax/tests/idempotency/nook-exchange/LanguageSelector.res
deleted file mode 100644
index a9aa3fc..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/LanguageSelector.res
+++ /dev/null
@@ -1,91 +0,0 @@
-module Modal = {
-  module Styles = {
-    open Css
-    let overlay = style(list{
-      position(fixed),
-      top(zero),
-      bottom(zero),
-      left(zero),
-      right(zero),
-      display(flexBox),
-      alignItems(center),
-      justifyContent(center),
-    })
-    let backdrop = style(list{
-      position(absolute),
-      top(zero),
-      bottom(zero),
-      left(zero),
-      right(zero),
-      backgroundColor(hex("6f8477d0")),
-    })
-    let root = style(list{
-      backgroundColor(hex("ffffff")),
-      padding2(~v=px(32), ~h=px(32)),
-      borderRadius(px(4)),
-      position(relative),
-      maxWidth(px(448)),
-      boxSizing(borderBox),
-      width(pct(90.)),
-      boxShadow(Shadow.box(~spread=px(12), rgba(0, 0, 0, 0.1))),
-      overflow(auto),
-      maxHeight(vh(100.)),
-      media("(max-width: 540px)", list{paddingTop(px(24)), paddingBottom(px(24))}),
-    })
-    let body = style(list{maxWidth(px(320)), margin2(~v=zero, ~h=auto)})
-    let label = style(list{marginBottom(px(12))})
-    let row = style(list{marginBottom(px(6))})
-    let languageLink = style(list{
-      opacity(0.8),
-      textDecoration(none),
-      hover(list{textDecoration(underline)}),
-    })
-    let languageLinkSelected = style(list{opacity(1.), textDecoration(underline)})
-  }
-
-  @react.component
-  let make = (~onClose) => {
-    let selectedLanguage = SettingsStore.useLanguage()
-    <div className=Styles.overlay>
-      <div className=Styles.backdrop onClick={_ => onClose()} />
-      <div className=Styles.root>
-        <div className=Styles.label> {React.string("Select a language:")} </div>
-        <div>
-          {SettingsStore.languages
-          ->Belt.Array.map(language =>
-            <div className=Styles.row key={SettingsStore.languageToJs(language)}>
-              <a
-                href="#"
-                onClick={e => {
-                  ReactEvent.Mouse.preventDefault(e)
-                  SettingsStore.setLanguage(~language)
-                  onClose()
-                }}
-                className={Cn.make(list{
-                  Styles.languageLink,
-                  Cn.ifTrue(Styles.languageLinkSelected, selectedLanguage == language),
-                })}>
-                {React.string(SettingsStore.languageToString(language))}
-              </a>
-            </div>
-          )
-          ->React.array}
-        </div>
-        <Modal.CloseButton onClose />
-      </div>
-    </div>
-  }
-}
-
-let show = () => {
-  let modalKey = ref(None)
-  modalKey :=
-    Some(
-      ReactAtmosphere.API.pushLayer(~render=_ =>
-        <Modal
-          onClose={() =>
-            ReactAtmosphere.API.removeLayer(~key=Belt.Option.getExn(modalKey.contents))}
-        />
-      ),
-    )
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Link.res b/jscomp/syntax/tests/idempotency/nook-exchange/Link.res
deleted file mode 100644
index 6f0ab93..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Link.res
+++ /dev/null
@@ -1,15 +0,0 @@
-@react.component
-let make = (~path, ~children, ~className=?, ~onClick=?, ()) =>
-  <a
-    href=path
-    onClick={e => {
-      switch onClick {
-      | Some(onClick) => onClick()
-      | None => ()
-      }
-      ReasonReactRouter.push(path)
-      ReactEvent.Mouse.preventDefault(e)
-    }}
-    ?className>
-    children
-  </a>
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/ListPage.res b/jscomp/syntax/tests/idempotency/nook-exchange/ListPage.res
deleted file mode 100644
index 15e1667..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/ListPage.res
+++ /dev/null
@@ -1,636 +0,0 @@
-let cardWidth = 176
-
-module Styles = {
-  open Css
-  let root = style(list{
-    display(flexBox),
-    flexDirection(column),
-    margin2(~v=zero, ~h=auto),
-    media("(max-width: 630px)", list{marginLeft(px(16)), marginRight(px(16))}),
-  })
-  let cloneMessage = style(list{
-    backgroundColor(hex("ffffffc0")),
-    display(flexBox),
-    alignItems(center),
-    justifyContent(spaceBetween),
-    marginBottom(px(32)),
-    padding(px(16)),
-    borderRadius(px(8)),
-  })
-  let cloneMessageDismissLink = style(list{
-    textDecoration(none),
-    hover(list{textDecoration(underline)}),
-  })
-  let myListsLinkText = style(list{marginLeft(px(4))})
-  let myListsLink = style(list{
-    textDecoration(none),
-    hover(list{selector("& ." ++ myListsLinkText, list{textDecoration(underline)})}),
-  })
-  let titleForm = style(list{display(flexBox)})
-  let titleInput = style(list{
-    boxSizing(borderBox),
-    borderRadius(px(4)),
-    border(px(1), solid, transparent),
-    backgroundColor(transparent),
-    padding3(~top=px(6), ~bottom=px(6), ~h=px(7)),
-    marginLeft(px(-8)),
-    fontSize(px(24)),
-    flexGrow(1.),
-    transition(~duration=200, "all"),
-    focus(list{backgroundColor(Colors.white), borderColor(Colors.lightGreen)}),
-    media(
-      "(hover: hover)",
-      list{hover(list{backgroundColor(Colors.white), borderColor(Colors.lightGreen)})},
-    ),
-    media("(hover: none)", list{borderColor(Colors.lightGreen)}),
-  })
-  let titleInputHasChanges = style(list{
-    important(backgroundColor(Colors.white)),
-    important(borderColor(Colors.lightGreen)),
-  })
-  let titleSubmitButton = style(list{
-    unsafe("alignSelf", "center"),
-    marginLeft(px(16)),
-    paddingLeft(px(16)),
-    paddingRight(px(16)),
-  })
-  let titleSubmitRow = style(list{display(flexBox), justifyContent(flexStart), marginTop(px(6))})
-  let listTitle = style(list{fontSize(px(28))})
-  let gridWidth = numCards => numCards * cardWidth + (numCards - 1) * 16
-  let rootGrid = style(list{
-    width(px(gridWidth(4))),
-    media("(max-width: 840px)", list{width(px(gridWidth(3)))}),
-    media("(max-width: 630px)", list{width(auto)}),
-  })
-  let rootList = style(list{maxWidth(px(560))})
-  let rootThumbnail = style(list{maxWidth(px(594))})
-  let topRow = style(list{
-    display(flexBox),
-    alignItems(center),
-    flexWrap(wrap),
-    justifyContent(spaceBetween),
-    marginBottom(px(16)),
-  })
-  let topRowLeft = style(list{flexGrow(1.), marginRight(px(16)), marginTop(px(8))})
-  let listUserLink = style(list{
-    textDecoration(none),
-    media("(hover: hover)", list{hover(list{textDecoration(underline)})}),
-  })
-  let viewToggles = style(list{display(flexBox), justifyContent(flexEnd), marginTop(px(8))})
-  let sortSelector = style(list{
-    height(px(30)),
-    boxSizing(borderBox),
-    marginTop(px(8)),
-    marginRight(px(8)),
-    media("(max-width: 520px)", list{marginRight(zero)}),
-  })
-  @module("./assets/grid.png") external gridPng: string = "default"
-  @module("./assets/thumbnail.png")
-  external thumbnailPng: string = "default"
-  @module("./assets/list.png") external listPng: string = "default"
-  let viewButton = style(list{
-    display(flexBox),
-    borderWidth(zero),
-    alignItems(center),
-    backgroundColor(Colors.green),
-    color(Colors.white),
-    borderRadius(px(4)),
-    padding2(~v=px(6), ~h=px(10)),
-    marginLeft(px(8)),
-    opacity(0.5),
-    transition(~duration=200, "all"),
-    firstChild(list{marginLeft(zero)}),
-    hover(list{opacity(0.8)}),
-  })
-  let viewButtonSelected = style(list{important(opacity(1.))})
-  let gridIcon = style(list{
-    display(inlineBlock),
-    width(px(18)),
-    height(px(18)),
-    backgroundImage(url(gridPng)),
-    backgroundSize(cover),
-    marginRight(px(8)),
-  })
-  let thumbnailIcon = style(list{
-    display(inlineBlock),
-    width(px(18)),
-    height(px(18)),
-    backgroundImage(url(thumbnailPng)),
-    backgroundSize(cover),
-    marginRight(px(8)),
-  })
-  let listIcon = style(list{
-    display(inlineBlock),
-    width(px(18)),
-    height(px(18)),
-    backgroundImage(url(listPng)),
-    backgroundSize(cover),
-    marginRight(px(8)),
-  })
-  let list = style(list{
-    borderRadius(px(8)),
-    overflow(hidden),
-    border(px(1), solid, Colors.lightGreen),
-  })
-  let grid = style(list{display(flexBox), flexWrap(wrap), marginRight(px(-16))})
-  let thumbnails = style(list{
-    display(flexBox),
-    flexWrap(wrap),
-    justifyContent(center),
-    backgroundColor(Colors.white),
-    borderRadius(px(8)),
-    border(px(1), solid, Colors.lightGreen),
-    padding(px(8)),
-  })
-  let listFooter = style(list{
-    marginTop(px(32)),
-    display(flexBox),
-    flexDirection(column),
-    alignItems(flexEnd),
-  })
-  let numItems = style(list{color(Colors.gray)})
-  let deleteListLink = style(list{
-    textDecoration(none),
-    media("(hover: hover)", list{hover(list{textDecoration(underline)})}),
-  })
-  let cloneListLink = style(list{
-    textDecoration(none),
-    media("(hover: hover)", list{hover(list{textDecoration(underline)})}),
-  })
-}
-
-module ListRow = {
-  module Styles = {
-    open Css
-    let itemName = style(list{flexGrow(1.), padding2(~v=zero, ~h=px(16))})
-    let row = style(list{
-      backgroundColor(Colors.white),
-      padding2(~v=px(8), ~h=px(8)),
-      borderTop(px(1), solid, Colors.faintGray),
-      firstChild(list{borderTopWidth(zero)}),
-      display(flexBox),
-      alignItems(center),
-      fontSize(px(16)),
-      color(Colors.charcoal),
-      textDecoration(none),
-      hover(list{
-        backgroundColor(Colors.faintGreen),
-        borderTopColor(Colors.lightGreen),
-        // color(Colors.white),
-        // selector("& ." ++ itemName, [textDecoration(underline)]),
-      }),
-    })
-    let variantName = style(list{
-      color(Colors.gray),
-      padding2(~v=zero, ~h=px(8)),
-      textAlign(#right),
-    })
-    let imageWrapper = style(list{position(relative), fontSize(zero)})
-    let image = style(list{width(px(48)), height(px(48))})
-    let recipeIcon = style(list{
-      position(absolute),
-      bottom(px(-4)),
-      right(px(-4)),
-      width(px(24)),
-      height(px(24)),
-    })
-  }
-
-  @react.component
-  let make = (~itemId, ~variant) => {
-    let item = Item.getItem(~itemId)
-    <Link path={Utils.getItemDetailUrl(~itemId, ~variant=Some(variant))} className=Styles.row>
-      <div className=Styles.imageWrapper>
-        <img src={Item.getImageUrl(~item, ~variant)} className=Styles.image />
-        {Item.isRecipe(~item)
-          ? <img src={Constants.cdnUrl ++ "/images/DIYRecipe.png"} className=Styles.recipeIcon />
-          : React.null}
-      </div>
-      <div className=Styles.itemName> {React.string(Item.getName(item))} </div>
-      {switch Item.getVariantName(~item, ~variant, ~hidePattern=true, ()) {
-      | Some(variantName) => <div className=Styles.variantName> {React.string(variantName)} </div>
-      | None => React.null
-      }}
-    </Link>
-  }
-}
-
-type viewMode =
-  | Grid
-  | Thumbnail
-  | List
-
-@react.component
-let make = (~listId, ~url: ReasonReactRouter.url) => {
-  let (showCloneMessage, setShowCloneMessage) = React.useState(() => {
-    open Webapi.Url.URLSearchParams
-    make(url.search) |> has("clone")
-  })
-  let (list, setList) = React.useState(() => None)
-  let (editTitle, setEditTitle) = React.useState(() => "")
-  React.useEffect0(() => {
-    %Repromise({
-      let response = API.getItemList(~listId)
-      %Repromise.JsExn({
-        let json = Fetch.Response.json(Belt.Result.getExn(response))
-        open Json.Decode
-        let list: QuicklistStore.t = {
-          id: Some(json |> field("id", string)),
-          title: (json |> optional(field("title", string)))
-            ->Belt.Option.flatMap(title => title != "" ? Some(title) : None),
-          userId: json |> optional(field("userId", string)),
-          itemIds: json |> field("itemIds", array(tuple2(int, int))),
-        }
-        let username = json |> optional(field("username", string))
-        setList(_ => Some((list, username)))
-        setEditTitle(_ => list.title->Belt.Option.getWithDefault(""))
-        Analytics.Amplitude.logEventWithProperties(
-          ~eventName="Item List Page Viewed",
-          ~eventProperties={
-            "listId": listId,
-            "numItems": Js.Array.length(list.itemIds),
-          },
-        )
-        Promise.resolved()
-      })
-    }) |> ignore
-    None
-  })
-  React.useEffect0(() => {
-    if showCloneMessage {
-      ReasonReactRouter.replace("/l/" ++ listId)
-    }
-    None
-  })
-
-  let onTitleSubmit = e => {
-    ReactEvent.Form.preventDefault(e)
-    let editTitle = editTitle |> Js.String.slice(~from=0, ~to_=48)
-    QuicklistStore.updateListTitle(~listId, ~title=Some(editTitle)) |> ignore
-    setList(list =>
-      list->Belt.Option.map(((list, username)) => (
-        {...list, title: editTitle != "" ? Some(editTitle) : None},
-        username,
-      ))
-    )
-  }
-
-  let (viewMode, setViewMode) = React.useState(() => List)
-  let me = UserStore.useMe()
-  let numViewToggleLoggedRef = React.useRef(0)
-  let searchParams = Webapi.Url.URLSearchParams.make(url.search)
-  let sort = ItemFilters.sortFromUrlSearch(~searchParams, ~defaultSort=ListTimeAdded)
-
-  <div
-    className={Cn.make(list{
-      Styles.root,
-      switch viewMode {
-      | Grid => Styles.rootGrid
-      | List => Styles.rootList
-      | Thumbnail => Styles.rootThumbnail
-      },
-    })}>
-    <div>
-      {showCloneMessage
-        ? <div className=Styles.cloneMessage>
-            <span> {React.string(j`This is your clone. Edit away!️`)} </span>
-            <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                setShowCloneMessage(_ => false)
-              }}
-              className=Styles.cloneMessageDismissLink>
-              {React.string("Hide")}
-            </a>
-          </div>
-        : React.null}
-      {switch list {
-      | Some((list, _)) =>
-        list.userId
-        ->Belt.Option.flatMap(userId =>
-          if me->Belt.Option.map(me => me.id) == Some(userId) {
-            let hasChanges =
-              list.title != Some(editTitle) && !(editTitle == "" && list.title === None)
-            Some(
-              <form onSubmit=onTitleSubmit>
-                <div>
-                  <Link path="/lists" className=Styles.myListsLink>
-                    {React.string(j`←`)}
-                    <span className=Styles.myListsLinkText> {React.string("My Lists")} </span>
-                  </Link>
-                </div>
-                <div className=Styles.titleForm>
-                  <input
-                    type_="text"
-                    value=editTitle
-                    onChange={e => {
-                      let value = ReactEvent.Form.target(e)["value"]
-                      setEditTitle(_ => value)
-                    }}
-                    className={Cn.make(list{
-                      Styles.titleInput,
-                      Cn.ifTrue(Styles.titleInputHasChanges, hasChanges),
-                    })}
-                    placeholder="Name your list"
-                  />
-                  {if hasChanges {
-                    <Button className=Styles.titleSubmitButton> {React.string("Save")} </Button>
-                  } else {
-                    React.null
-                  }}
-                </div>
-              </form>,
-            )
-          } else {
-            None
-          }
-        )
-        ->Belt.Option.getWithDefault(
-          switch list.title {
-          | Some(title) => <div className=Styles.listTitle> {Emoji.parseText(title)} </div>
-          | None => React.null
-          },
-        )
-      | None => React.null
-      }}
-    </div>
-    <div className=Styles.topRow>
-      <div className=Styles.topRowLeft>
-        {switch list {
-        | Some((list, username)) =>
-          switch list.userId {
-          | Some(userId) =>
-            if me->Belt.Option.map(me => me.id) == Some(userId) {
-              <div>
-                <a
-                  href="#"
-                  onClick={e => {
-                    ReactEvent.Mouse.preventDefault(e)
-                    QuicklistStore.loadList(~listId, ~title=list.title, ~listItems=list.itemIds)
-                    ReasonReactRouter.push("/")
-                  }}
-                  className=Styles.listUserLink>
-                  {React.string("Edit your list")}
-                </a>
-              </div>
-            } else {
-              switch username {
-              | Some(username) =>
-                <Link path={"/u/" ++ username} className=Styles.listUserLink>
-                  {React.string("Visit " ++ (username ++ "'s profile"))}
-                </Link>
-              | None => React.null
-              }
-            }
-          | None => React.null
-          }
-        | None => React.null
-        }}
-      </div>
-      {switch list {
-      | Some((list, _)) =>
-        if Js.Array.length(list.itemIds) >= 4 {
-          <ItemFilters.SortSelector
-            sort
-            onChange={sort => {
-              let p = []
-              switch ItemFilters.serializeSort(~sort, ~defaultSort=ListTimeAdded) {
-              | Some(param) => p |> Js.Array.push(param) |> ignore
-              | None => ()
-              }
-              let urlSearchParams = Webapi.Url.URLSearchParams.makeWithArray(p)
-              ReasonReactRouter.push(ItemBrowser.getUrl(~url, ~urlSearchParams))
-            }}
-            onListPage=true
-            userItemIds=None
-            isViewingSelf=false
-            className=Styles.sortSelector
-          />
-        } else {
-          React.null
-        }
-      | None => React.null
-      }}
-      <div className=Styles.viewToggles>
-        <button
-          onClick={_ => {
-            setViewMode(_ => List)
-            if React.Ref.current(numViewToggleLoggedRef) < 5 {
-              Analytics.Amplitude.logEventWithProperties(
-                ~eventName="Item List Page View Toggled",
-                ~eventProperties={
-                  "view": "list",
-                  "listId": listId,
-                  "numItems": switch list {
-                  | Some((list, _)) => Js.Array.length(list.itemIds)
-                  | None => 0
-                  },
-                },
-              )
-              React.Ref.setCurrent(
-                numViewToggleLoggedRef,
-                React.Ref.current(numViewToggleLoggedRef) + 1,
-              )
-            }
-          }}
-          className={Cn.make(list{
-            Styles.viewButton,
-            Cn.ifTrue(Styles.viewButtonSelected, viewMode == List),
-          })}>
-          <span className=Styles.listIcon /> {React.string("List")}
-        </button>
-        <button
-          onClick={_ => {
-            setViewMode(_ => Grid)
-            if React.Ref.current(numViewToggleLoggedRef) < 5 {
-              Analytics.Amplitude.logEventWithProperties(
-                ~eventName="Item List Page View Toggled",
-                ~eventProperties={
-                  "view": "grid",
-                  "listId": listId,
-                  "numItems": switch list {
-                  | Some((list, _)) => Js.Array.length(list.itemIds)
-                  | None => 0
-                  },
-                },
-              )
-              React.Ref.setCurrent(
-                numViewToggleLoggedRef,
-                React.Ref.current(numViewToggleLoggedRef) + 1,
-              )
-            }
-          }}
-          className={Cn.make(list{
-            Styles.viewButton,
-            Cn.ifTrue(Styles.viewButtonSelected, viewMode == Grid),
-          })}>
-          <span className=Styles.gridIcon /> {React.string("Grid")}
-        </button>
-        {switch list {
-        | Some((list, _)) => Js.Array.length(list.itemIds) > 8
-        | None => false
-        }
-          ? <button
-              onClick={_ => {
-                setViewMode(_ => Thumbnail)
-                if React.Ref.current(numViewToggleLoggedRef) < 5 {
-                  Analytics.Amplitude.logEventWithProperties(
-                    ~eventName="Item List Page View Toggled",
-                    ~eventProperties={
-                      "view": "thumbnail",
-                      "listId": listId,
-                      "numItems": switch list {
-                      | Some((list, _)) => Js.Array.length(list.itemIds)
-                      | None => 0
-                      },
-                    },
-                  )
-                  React.Ref.setCurrent(
-                    numViewToggleLoggedRef,
-                    React.Ref.current(numViewToggleLoggedRef) + 1,
-                  )
-                }
-              }}
-              className={Cn.make(list{
-                Styles.viewButton,
-                Cn.ifTrue(Styles.viewButtonSelected, viewMode == Thumbnail),
-              })}>
-              <span className=Styles.thumbnailIcon /> {React.string("Thumbnail")}
-            </button>
-          : React.null}
-      </div>
-    </div>
-    {switch list {
-    | Some((list, _)) =>
-      <div>
-        {if Js.Array.length(list.itemIds) > 0 {
-          <div
-            className={switch viewMode {
-            | Grid => Styles.grid
-            | List => Styles.list
-            | Thumbnail => Styles.thumbnails
-            }}>
-            {list.itemIds
-            |> (sort !== ListTimeAdded
-              ? x => {
-                  let sortFn = ItemFilters.getSort(~sort)
-                  x |> Js.Array.sortInPlaceWith(((aItemId, aVariant), (bItemId, bVariant)) => {
-                    let aItem = Item.getItem(~itemId=aItemId)
-                    let bItem = Item.getItem(~itemId=bItemId)
-                    switch sortFn(aItem, bItem) {
-                    | 0 => aVariant - bVariant
-                    | y => y
-                    }
-                  })
-                }
-              : x => x)
-            |> Js.Array.mapi(((itemId, variant), i) =>
-              switch viewMode {
-              | Grid =>
-                <UserItemCard
-                  itemId
-                  variation=variant
-                  editable=false
-                  showRecipe=false
-                  showMetaIcons=false
-                  key={string_of_int(i)}
-                />
-              | Thumbnail =>
-                <UserProfileBrowser.UserItemCardMini
-                  itemId variation=variant key={string_of_int(i)}
-                />
-              | List => <ListRow itemId variant key={string_of_int(i)} />
-              }
-            )
-            |> React.array}
-          </div>
-        } else {
-          React.null
-        }}
-        <div className=Styles.listFooter>
-          {
-            let numItems = Js.Array.length(list.itemIds)
-            if numItems > 8 {
-              <div className=Styles.numItems>
-                {React.string(string_of_int(numItems) ++ " items")}
-              </div>
-            } else {
-              React.null
-            }
-          }
-          {switch me {
-          | Some(me) => <>
-              <div>
-                <a
-                  href="#"
-                  onClick={e => {
-                    ReactEvent.Mouse.preventDefault(e)
-                    %Repromise({
-                      let response = API.cloneItemList(
-                        ~sessionId=Belt.Option.getExn(UserStore.sessionId.contents),
-                        ~listId,
-                      )
-                      UserStore.handleServerResponse("/item-lists/clone", response)
-                      %Repromise.JsExn({
-                        let json = Fetch.Response.json(Belt.Result.getExn(response))
-                        let newListId = {
-                          open Json.Decode
-                          json |> field("id", string)
-                        }
-                        ReasonReactRouter.push("/l/" ++ (newListId ++ "?clone"))
-                        Analytics.Amplitude.logEventWithProperties(
-                          ~eventName="Item List Cloned",
-                          ~eventProperties={
-                            "listId": listId,
-                            "newListId": newListId,
-                            "numItems": Js.Array.length(list.itemIds),
-                          },
-                        )
-                        Promise.resolved()
-                      })
-                    }) |> ignore
-                  }}
-                  className=Styles.cloneListLink>
-                  {React.string("Clone list")}
-                </a>
-              </div>
-              {if list.userId == Some(me.id) {
-                <div>
-                  <a
-                    href="#"
-                    onClick={e => {
-                      ReactEvent.Mouse.preventDefault(e)
-                      ConfirmDialog.confirm(
-                        ~bodyText="Are you sure you want to delete this list?",
-                        ~confirmLabel="Delete list",
-                        ~cancelLabel="Not now",
-                        ~onConfirm=() =>
-                          %Repromise({
-                            let response = API.deleteItemList(
-                              ~sessionId=Belt.Option.getExn(UserStore.sessionId.contents),
-                              ~listId,
-                            )
-                            UserStore.handleServerResponse("/item-lists/delete", response)
-                            ReasonReactRouter.push("/lists")
-                            Promise.resolved()
-                          }) |> ignore,
-                        (),
-                      )
-                    }}
-                    className=Styles.deleteListLink>
-                    {React.string("Delete list")}
-                  </a>
-                </div>
-              } else {
-                React.null
-              }}
-            </>
-          | None => React.null
-          }}
-        </div>
-      </div>
-    | None => React.null
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/LoginOverlay.res b/jscomp/syntax/tests/idempotency/nook-exchange/LoginOverlay.res
deleted file mode 100644
index da4494d..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/LoginOverlay.res
+++ /dev/null
@@ -1,479 +0,0 @@
-module Styles = {
-  open Css
-  let backdrop = style(list{
-    position(absolute),
-    top(zero),
-    bottom(zero),
-    left(zero),
-    right(zero),
-    backgroundColor(hex("808080a0")),
-  })
-  let root = style(list{
-    backgroundColor(hex("ffffff")),
-    borderRadius(px(4)),
-    position(relative),
-    maxWidth(px(448)),
-    boxSizing(borderBox),
-    width(pct(90.)),
-    boxShadow(Shadow.box(~spread=px(12), rgba(0, 0, 0, 0.1))),
-    overflow(auto),
-    maxHeight(vh(100.)),
-    media("(max-width: 540px)", list{paddingTop(px(24)), paddingBottom(px(24))}),
-  })
-  let body = style(list{
-    padding2(~v=px(32), ~h=px(32)),
-    boxSizing(borderBox),
-    maxWidth(px(400)),
-    width(vw(90.)),
-    margin2(~v=zero, ~h=auto),
-    media("(max-width: 480px)", list{paddingLeft(px(16)), paddingRight(px(16))}),
-  })
-  let input = style(list{
-    backgroundColor(rgba(0, 0, 0, 0.05)),
-    border(px(1), solid, transparent),
-    borderRadius(px(4)),
-    padding2(~v=px(10), ~h=px(12)),
-    boxSizing(borderBox),
-    outlineStyle(none),
-    fontSize(px(16)),
-    width(pct(100.)),
-    marginBottom(px(16)),
-    transition(~duration=200, "all"),
-    focus(list{
-      backgroundColor(hex("ffffff")),
-      borderColor(rgba(0, 0, 0, 0.15)),
-      boxShadow(Shadow.box(~spread=px(4), rgba(0, 0, 0, 0.05))),
-    }),
-  })
-  let submitBar = style(list{display(flexBox), alignItems(center), justifyContent(flexEnd)})
-  let submitButton = style(list{
-    backgroundColor(Colors.green),
-    borderWidth(zero),
-    borderRadius(px(4)),
-    color(Colors.white),
-    cursor(pointer),
-    marginLeft(px(16)),
-    padding2(~v=px(10), ~h=px(16)),
-    fontSize(px(16)),
-    transition(~duration=200, "all"),
-    disabled(list{opacity(0.5)}),
-  })
-  let divider = style(list{
-    backgroundColor(hex("e0e0e0")),
-    height(px(1)),
-    width(pct(100.)),
-    margin2(~v=px(24), ~h=zero),
-  })
-  let terms = style(list{color(hex("a0a0a0")), fontSize(px(12)), marginTop(px(32))})
-  let registerTitle = style(list{fontSize(px(20)), textAlign(center), marginBottom(px(24))})
-  let blurb = style(list{marginBottom(px(16)), textAlign(center)})
-  let discordLoginRow = style(list{display(flexBox), justifyContent(center), marginBottom(px(8))})
-  @module("./assets/discord_logo.png")
-  external discordPng: string = "default"
-  let discordButtonLogo = style(list{
-    backgroundImage(url(discordPng)),
-    display(inlineBlock),
-    marginRight(px(8)),
-    width(px(24)),
-    height(px(24)),
-    backgroundSize(cover),
-  })
-  let discordButton = style(list{
-    backgroundColor(hex("7289da")),
-    borderWidth(zero),
-    borderRadius(px(4)),
-    color(Colors.white),
-    display(flexBox),
-    alignItems(center),
-    justifyContent(spaceBetween),
-    fontSize(px(16)),
-    padding2(~v=px(8), ~h=px(16)),
-  })
-  let orSection = style(list{
-    padding2(~v=px(8), ~h=zero),
-    display(flexBox),
-    alignItems(center),
-    justifyContent(center),
-  })
-  let orWord = style(list{color(Colors.gray), padding2(~v=zero, ~h=px(16))})
-  let orLine = style(list{flexGrow(1.), height(px(1)), backgroundColor(Colors.veryLightGray)})
-  let urlPreview = style(list{
-    fontSize(px(12)),
-    letterSpacing(pxFloat(0.3)),
-    color(hex("b0b0b0")),
-    marginBottom(px(8)),
-  })
-  let url = style(list{
-    border(px(2), dashed, Colors.lightGreen),
-    textAlign(center),
-    borderRadius(px(4)),
-    padding(px(16)),
-    margin2(~v=px(16), ~h=zero),
-  })
-  let successMessage = style(list{flexGrow(1.), color(Colors.green)})
-  let errorMessage = style(list{marginTop(px(-10)), marginBottom(px(16)), color(Colors.red)})
-}
-
-module PasswordReset = {
-  type status =
-    | Success
-    | Error(string)
-
-  @react.component
-  let make = () => {
-    let (email, setEmail) = React.useState(() => "")
-    let (isSubmitting, setIsSubmitting) = React.useState(() => false)
-    let (status, setStatus) = React.useState(() => None)
-
-    let onSubmit = e => {
-      ReactEvent.Form.preventDefault(e)
-      setIsSubmitting(_ => true)
-      %Repromise.JsExn({
-        let response = Fetch.fetchWithInit(
-          Constants.apiUrl ++ "/password-reset",
-          Fetch.RequestInit.make(
-            ~method_=Post,
-            ~body=Fetch.BodyInit.make(
-              Js.Json.stringify(Json.Encode.object_(list{("email", Js.Json.string(email))})),
-            ),
-            ~headers=Fetch.HeadersInit.make({
-              "X-Client-Version": Constants.gitCommitRef,
-              "Content-Type": "application/json",
-            }),
-            ~mode=CORS,
-            (),
-          ),
-        )
-        %Repromise({
-          let _ = if Fetch.Response.status(response) < 300 {
-            setStatus(_ => Some(Success))
-            Analytics.Amplitude.logEventWithProperties(
-              ~eventName="Reset Password Request Success",
-              ~eventProperties={"email": email},
-            )
-            Promise.resolved()
-          } else {
-            %Repromise.JsExn({
-              let text = Fetch.Response.text(response)
-              setStatus(_ => Some(Error(text)))
-              Analytics.Amplitude.logEventWithProperties(
-                ~eventName="Reset Password Request Failure",
-                ~eventProperties={"email": email, "error": text},
-              )
-              Promise.resolved()
-            })
-          }
-          setIsSubmitting(_ => false)
-          Promise.resolved()
-        })
-      }) |> ignore
-    }
-
-    <form onSubmit>
-      <div className=Styles.registerTitle> {React.string("Reset your password")} </div>
-      <input
-        type_="text"
-        placeholder="Account email"
-        value=email
-        onChange={e => {
-          let value = ReactEvent.Form.target(e)["value"]
-          setEmail(_ => value)
-        }}
-        className=Styles.input
-      />
-      {switch status {
-      | Some(Error(error)) => <div className=Styles.errorMessage> {React.string(error)} </div>
-      | _ => React.null
-      }}
-      <div className=Styles.submitBar>
-        {status == Some(Success)
-          ? <div className=Styles.successMessage> {React.string("Check your email!")} </div>
-          : React.null}
-        <button
-          type_="submit"
-          disabled={isSubmitting || status == Some(Success)}
-          className=Styles.submitButton>
-          {React.string("Send reset link")}
-        </button>
-      </div>
-    </form>
-  }
-}
-
-type registerStatus =
-  | Success
-  | Error(string)
-
-type screen =
-  | Login
-  | Register
-  | PasswordReset
-
-@react.component
-let make = (~onClose) => {
-  let (screen, setScreen) = React.useState(() => Register)
-
-  let (username, setUsername) = React.useState(() => "")
-  let (email, setEmail) = React.useState(() => "")
-  let (password, setPassword) = React.useState(() => "")
-  let (isSubmitting, setIsSubmitting) = React.useState(() => false)
-
-  React.useEffect0(() => {
-    Analytics.Amplitude.logEvent(~eventName="Registration Viewed")
-    None
-  })
-
-  let (registerStatus, setRegisterStatus) = React.useState(() => None)
-  let onLoginSubmit = e => {
-    ReactEvent.Form.preventDefault(e)
-
-    {
-      setIsSubmitting(_ => true)
-      %Repromise({
-        let result = UserStore.login(~username, ~password)
-        switch result {
-        | Ok(_) =>
-          onClose()
-          Analytics.Amplitude.logEvent(~eventName="Login Succeeded")
-        | Error(_) =>
-          setRegisterStatus(_ => Some(Error("Login failed. Please try again.")))
-          Analytics.Amplitude.logEvent(~eventName="Login Failed")
-          setIsSubmitting(_ => false)
-        }
-        Promise.resolved()
-      })
-    } |> ignore
-  }
-
-  let onRegisterSubmit = e => {
-    ReactEvent.Form.preventDefault(e)
-
-    {
-      setIsSubmitting(_ => true)
-      %Repromise({
-        let result = UserStore.register(~username, ~email, ~password)
-        switch result {
-        | Ok(_) =>
-          setRegisterStatus(_ => Some(Success))
-          Analytics.Amplitude.logEventWithProperties(
-            ~eventName="Registration Succeeded",
-            ~eventProperties={"username": username, "email": email},
-          )
-        | Error(error) =>
-          setRegisterStatus(_ => Some(Error(error)))
-          Analytics.Amplitude.logEventWithProperties(
-            ~eventName="Registration Failed",
-            ~eventProperties={"error": error},
-          )
-        }
-        setIsSubmitting(_ => false)
-        Promise.resolved()
-      })
-    } |> ignore
-  }
-
-  let usernameRef = React.useRef(Js.Nullable.null)
-  React.useEffect0(() => {
-    open Webapi.Dom
-    let usernameInput = Utils.getElementForDomRef(usernameRef)->Element.unsafeAsHtmlElement
-    HtmlElement.focus(usernameInput)
-    None
-  })
-
-  <Modal>
-    <div className=Styles.body>
-      {switch screen {
-      | Login =>
-        <div>
-          <div className=Styles.registerTitle> {React.string("Welcome back!")} </div>
-          <div className=Styles.discordLoginRow>
-            <button
-              onClick={_ => {
-                let state = "login_" ++ string_of_int(Js.Math.random_int(100000, 999999))
-
-                {
-                  open Dom.Storage
-                  localStorage |> setItem("discord_state", state)
-                }
-
-                open Webapi.Dom
-                location->Location.setHref(Constants.discordOauthRedirectUri(state))
-              }}
-              className=Styles.discordButton>
-              <span className=Styles.discordButtonLogo /> {React.string("Login with Discord")}
-            </button>
-          </div>
-          <div className=Styles.orSection>
-            <div className=Styles.orLine />
-            <div className=Styles.orWord> {React.string("or")} </div>
-            <div className=Styles.orLine />
-          </div>
-          <form onSubmit=onLoginSubmit>
-            <input
-              type_="text"
-              placeholder="Username"
-              value=username
-              onChange={e => {
-                let value = ReactEvent.Form.target(e)["value"]
-                setUsername(_ => value)
-              }}
-              className=Styles.input
-            />
-            <input
-              type_="password"
-              placeholder="Password"
-              value=password
-              onChange={e => {
-                let value = ReactEvent.Form.target(e)["value"]
-                setPassword(_ => value)
-              }}
-              className=Styles.input
-            />
-            <div className=Styles.errorMessage>
-              <a
-                href="#"
-                onClick={e => {
-                  ReactEvent.Mouse.preventDefault(e)
-                  setScreen(_ => PasswordReset)
-                }}>
-                {React.string("Forgot password?")}
-              </a>
-            </div>
-            {switch registerStatus {
-            | Some(Error(error)) => <div className=Styles.errorMessage> {React.string(error)} </div>
-            | _ => React.null
-            }}
-            <div className=Styles.submitBar>
-              <a
-                href="#"
-                onClick={e => {
-                  ReactEvent.Mouse.preventDefault(e)
-                  setScreen(_ => Register)
-                }}>
-                {React.string("Need an account?")}
-              </a>
-              <button type_="submit" disabled=isSubmitting className=Styles.submitButton>
-                {React.string("Login")}
-              </button>
-            </div>
-          </form>
-        </div>
-      | Register =>
-        registerStatus == Some(Success)
-          ? <div>
-              <div className=Styles.registerTitle> {React.string("Your account is created!")} </div>
-              <div className=Styles.blurb>
-                {React.string("Add items to profile and share it with others!")}
-              </div>
-              <div className=Styles.url>
-                <Link path={"/u/" ++ username}>
-                  {React.string("nook.exchange/u/" ++ username)}
-                </Link>
-              </div>
-              <div className=Styles.submitBar>
-                <button onClick={_ => onClose()} className=Styles.submitButton>
-                  {React.string("Okay!")}
-                </button>
-              </div>
-            </div>
-          : <div>
-              <div className=Styles.registerTitle> {React.string("Register an account")} </div>
-              <div className=Styles.blurb>
-                {React.string("Create and share lists of Animal Crossing items!")}
-              </div>
-              <div className=Styles.discordLoginRow>
-                <button
-                  onClick={_ => {
-                    let state = "register_" ++ string_of_int(Js.Math.random_int(100000, 999999))
-
-                    {
-                      open Dom.Storage
-                      localStorage |> setItem("discord_state", state)
-                    }
-
-                    open Webapi.Dom
-                    location->Location.setHref(Constants.discordOauthRedirectUri(state))
-                  }}
-                  className=Styles.discordButton>
-                  <span className=Styles.discordButtonLogo />
-                  {React.string("Register and Join Discord")}
-                </button>
-              </div>
-              <div className=Styles.orSection>
-                <div className=Styles.orLine />
-                <div className=Styles.orWord> {React.string("or")} </div>
-                <div className=Styles.orLine />
-              </div>
-              <div className=Styles.urlPreview>
-                {React.string("nook.exchange/u/" ++ username)}
-              </div>
-              <div>
-                <form onSubmit=onRegisterSubmit>
-                  <input
-                    type_="text"
-                    placeholder="Username"
-                    value=username
-                    onChange={e => {
-                      let value = ReactEvent.Form.target(e)["value"]
-                      setUsername(_ => value)
-                    }}
-                    ref={ReactDOMRe.Ref.domRef(usernameRef)}
-                    className=Styles.input
-                  />
-                  <input
-                    type_="text"
-                    placeholder="Email (Optional for account recovery)"
-                    value=email
-                    onChange={e => {
-                      let value = ReactEvent.Form.target(e)["value"]
-                      setEmail(_ => value)
-                    }}
-                    className=Styles.input
-                  />
-                  <input
-                    type_="password"
-                    placeholder="Password"
-                    value=password
-                    onChange={e => {
-                      let value = ReactEvent.Form.target(e)["value"]
-                      setPassword(_ => value)
-                    }}
-                    className=Styles.input
-                  />
-                  {switch registerStatus {
-                  | Some(Error(error)) =>
-                    <div className=Styles.errorMessage> {React.string(error)} </div>
-                  | _ => React.null
-                  }}
-                  <div className=Styles.submitBar>
-                    <a
-                      href="#"
-                      onClick={e => {
-                        ReactEvent.Mouse.preventDefault(e)
-                        setScreen(_ => Login)
-                      }}>
-                      {React.string("Login instead?")}
-                    </a>
-                    <button
-                      type_="submit"
-                      className=Styles.submitButton
-                      disabled={Js.String.length(password) < 4 || isSubmitting}>
-                      {React.string("Register")}
-                    </button>
-                  </div>
-                  <div className=Styles.terms>
-                    {React.string("By registering, you agree to Nook Exchange's ")}
-                    <a href="/terms" target="_blank"> {React.string("Terms of Service")} </a>
-                    {React.string(" and ")}
-                    <a href="/privacy" target="_blank"> {React.string("Privacy Policy")} </a>
-                    {React.string(".")}
-                  </div>
-                </form>
-              </div>
-            </div>
-      | PasswordReset => <PasswordReset />
-      }}
-    </div>
-    <Modal.CloseButton onClose />
-  </Modal>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/MatchFeatureUpsell.res b/jscomp/syntax/tests/idempotency/nook-exchange/MatchFeatureUpsell.res
deleted file mode 100644
index 47a373d..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/MatchFeatureUpsell.res
+++ /dev/null
@@ -1,118 +0,0 @@
-module PersistConfig = {
-  let key = "dismiss_match_list_notice"
-  let value = ref(Dom.Storage.localStorage |> Dom.Storage.getItem(key))
-  let dismiss = () => {
-    let nowString = Js.Date.now()->Js.Float.toString
-    value := Some(nowString)
-    Dom.Storage.localStorage |> Dom.Storage.setItem(key, nowString)
-  }
-}
-
-module Component = {
-  module Styles = {
-    open Css
-    let root = style(list{
-      position(fixed),
-      right(px(32)),
-      bottom(px(32)),
-      backgroundColor(hex("f9fdf9")),
-      padding(px(24)),
-      borderRadius(px(16)),
-      boxShadow(Shadow.box(~blur=px(32), hex("4a846080"))),
-      media("(max-width: 540px)", list{bottom(px(8)), right(px(8)), left(px(8)), padding(px(16))}),
-    })
-    let buttonRow = style(list{
-      display(flexBox),
-      alignItems(center),
-      marginTop(px(16)),
-      justifyContent(flexEnd),
-    })
-    let registerButton = style(list{marginLeft(px(16))})
-    let notNowLink = style(list{
-      opacity(0.8),
-      transition(~duration=200, "all"),
-      hover(list{opacity(1.)}),
-    })
-  }
-
-  @react.component
-  let make = (~username, ~showLogin, ~onDismiss) => {
-    React.useEffect0(() => {
-      Analytics.Amplitude.logEventWithProperties(
-        ~eventName="Match List Notice Shown",
-        ~eventProperties={"username": username},
-      )
-      None
-    })
-    <div className=Styles.root>
-      <div>
-        {React.string(
-          "Make your own list and see what matches you have with " ++ (username ++ "!"),
-        )}
-      </div>
-      <div className=Styles.buttonRow>
-        <a
-          href="#"
-          onClick={e => {
-            ReactEvent.Mouse.preventDefault(e)
-            onDismiss()
-            Analytics.Amplitude.logEventWithProperties(
-              ~eventName="Match List Notice Dismissed",
-              ~eventProperties={"username": username},
-            )
-          }}
-          className=Styles.notNowLink>
-          {React.string("Not now")}
-        </a>
-        <Button
-          onClick={_ => {
-            showLogin()
-            onDismiss()
-            Analytics.Amplitude.logEventWithProperties(
-              ~eventName="Match List Notice Accepted",
-              ~eventProperties={"username": username},
-            )
-          }}
-          className=Styles.registerButton>
-          {React.string("Sign me up!")}
-        </Button>
-      </div>
-    </div>
-  }
-}
-
-module WrappedComponent = {
-  @react.component
-  let make = (~username, ~showLogin, ~onDismiss) => {
-    let bucketId = Experiment.getBucketIdForExperiment(
-      ~experimentId=Experiment.ExperimentIds.matchListNotice,
-    )
-    React.useEffect0(() => {
-      Experiment.trigger(~experimentId=Experiment.ExperimentIds.matchListNotice, ~bucketId)
-      None
-    })
-    if bucketId === "1" {
-      <Component username showLogin onDismiss />
-    } else {
-      React.null
-    }
-  }
-}
-
-@react.component
-let make = (~username, ~showLogin) => {
-  let userState = UserStore.useStore()
-  let (dismissed, setDismissed) = React.useState(() => PersistConfig.value.contents !== None)
-  switch (dismissed, userState) {
-  | (false, NotLoggedIn) =>
-    <WrappedComponent
-      username
-      showLogin
-      onDismiss={() => {
-        setDismissed(_ => true)
-        PersistConfig.dismiss()
-      }}
-    />
-  | _ => React.null
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Modal.res b/jscomp/syntax/tests/idempotency/nook-exchange/Modal.res
deleted file mode 100644
index 559ae0a..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Modal.res
+++ /dev/null
@@ -1,109 +0,0 @@
-let smallThreshold = 500
-
-module Styles = {
-  open Css
-  let smallThresholdMediaQuery = styles =>
-    media("(max-width: " ++ (string_of_int(smallThreshold) ++ "px)"), styles)
-  let overlay = style(list{
-    position(fixed),
-    top(zero),
-    bottom(zero),
-    left(zero),
-    right(zero),
-    display(flexBox),
-    alignItems(center),
-    justifyContent(center),
-    zIndex(1),
-  })
-  let backdrop = style(list{
-    position(absolute),
-    top(zero),
-    bottom(zero),
-    left(zero),
-    right(zero),
-    opacity(0.),
-    backgroundColor(hex("808080a0")),
-    transition(~duration=200, "all"),
-  })
-  let root100VH = style(list{
-    display(flexBox),
-    alignItems(center),
-    justifyContent(center),
-    width({
-      open Calc
-      vw(100.) - px(16)
-    }),
-  })
-  let root = style(list{
-    backgroundColor(hex("ffffff")),
-    borderRadius(px(8)),
-    position(relative),
-    maxWidth(px(640)),
-    boxSizing(borderBox),
-    boxShadow(Shadow.box(~blur=px(32), rgba(0, 0, 0, 0.2))),
-    overflow(auto),
-    maxHeight(pct(100.)),
-    opacity(0.),
-    minWidth(px(320)),
-    transforms(list{scale(0.85, 0.85), translate3d(zero, zero, zero)}),
-    media("(max-width: 400px)", list{maxHeight(pct(90.)), minWidth(zero)}),
-    transition(~duration=200, ~timingFunction=cubicBezier(0.48, 1.38, 0.71, 0.93), "all"),
-    smallThresholdMediaQuery(list{maxWidth(vw(90.))}),
-  })
-  let transitionIn = style(list{
-    selector("& ." ++ backdrop, list{opacity(1.)}),
-    selector(
-      "& ." ++ root,
-      list{opacity(1.), transforms(list{scale(1., 1.), translate3d(zero, zero, zero)})},
-    ),
-  })
-  let footerBar = style(list{padding(px(8)), display(flexBox), justifyContent(flexEnd)})
-
-  @module("../assets/close.png") external closePng: string = "default"
-  let closeButton = style(list{
-    backgroundColor(transparent),
-    backgroundImage(url(closePng)),
-    backgroundSize(#size(px(16), px(16))),
-    backgroundRepeat(noRepeat),
-    backgroundPosition(center),
-    borderWidth(zero),
-    padding(zero),
-    cursor(pointer),
-    height(px(48)),
-    width(px(48)),
-    position(absolute),
-    top(zero),
-    right(zero),
-    opacity(0.5),
-    hover(list{opacity(1.)}),
-  })
-}
-
-module Div100VH = {
-  @module("react-div-100vh") @react.component
-  external make: (~children: React.element, ~className: string) => React.element = "default"
-}
-
-module FooterBar = {
-  @react.component
-  let make = (~children) => <div className=Styles.footerBar> children </div>
-}
-
-module CloseButton = {
-  @react.component
-  let make = (~onClose) => <button onClick={_ => onClose()} className=Styles.closeButton />
-}
-
-@react.component
-let make = (~children, ~onBackdropClick=?, ()) => {
-  let (transitionIn, setTransitionIn) = React.useState(() => false)
-  React.useEffect0(() => {
-    Js.Global.setTimeout(() => setTransitionIn(_ => true), 20) |> ignore
-    None
-  })
-
-  <div className={Cn.make(list{Styles.overlay, Cn.ifTrue(Styles.transitionIn, transitionIn)})}>
-    <div className=Styles.backdrop onClick=?onBackdropClick />
-    <Div100VH className=Styles.root100VH> <div className=Styles.root> children </div> </Div100VH>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/MyListsPage.res b/jscomp/syntax/tests/idempotency/nook-exchange/MyListsPage.res
deleted file mode 100644
index d1f4ae3..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/MyListsPage.res
+++ /dev/null
@@ -1,189 +0,0 @@
-module WithViewer = {
-  module Styles = {
-    open Css
-    let root = style(list{
-      display(flexBox),
-      flexDirection(column),
-      margin2(~v=zero, ~h=auto),
-      maxWidth(px(560)),
-      media("(max-width: 630px)", list{marginLeft(px(16)), marginRight(px(16))}),
-    })
-    let bodyCard = style(list{
-      maxWidth(none),
-      media("(max-width: 512px)", list{marginLeft(px(-16)), marginRight(px(-16))}),
-    })
-    let body = style(list{
-      backgroundColor(Colors.white),
-      borderRadius(px(8)),
-      border(px(1), solid, Colors.lightGreen),
-      overflow(hidden),
-    })
-    let listItem = style(list{
-      display(block),
-      padding2(~v=px(16), ~h=px(16)),
-      textDecoration(none),
-      borderTop(px(1), solid, Colors.faintGray),
-      firstChild(list{borderTopWidth(zero)}),
-      media(
-        "(hover: hover)",
-        list{hover(list{backgroundColor(Colors.faintGreen), borderTopColor(Colors.lightGreen)})},
-      ),
-    })
-    let listTitleRow = style(list{
-      display(flexBox),
-      alignItems(center),
-      justifyContent(spaceBetween),
-      marginBottom(px(16)),
-    })
-    let listTitle = style(list{fontSize(px(16)), color(Colors.charcoal)})
-    let listNumberItems = style(list{color(Colors.lightGray)})
-    let listItemImages = style(list{display(flexBox)})
-    let listItemImage = style(list{width(px(64)), height(px(64)), flexShrink(0.)})
-    let noLists = style(list{padding2(~v=px(16), ~h=px(16))})
-    let startListFooter = style(list{
-      paddingTop(px(32)),
-      selector("& > a", list{textDecoration(none), hover(list{textDecoration(underline)})}),
-    })
-  }
-
-  type listInfo = {
-    id: string,
-    createTime: Js.Date.t,
-    itemIds: array<(int, int)>,
-    title: option<string>,
-  }
-
-  @react.component
-  let make = (~me: User.t) => {
-    let (lists, setLists) = React.useState(() => None)
-    React.useEffect0(() => {
-      %Repromise({
-        let response = API.getUserLists(~sessionId=Belt.Option.getExn(UserStore.sessionId.contents))
-        %Repromise.JsExn({
-          let json = Fetch.Response.json(Belt.Result.getExn(response))
-          let lists = {
-            open Json.Decode
-            json |> array(json => {
-              id: json |> field("id", string),
-              createTime: json |> field("createTime", date),
-              itemIds: json |> field("itemIds", array(tuple2(int, int))),
-              title: (json |> optional(field("title", string)))
-                ->Belt.Option.flatMap(title => title == "" ? None : Some(title)),
-            })
-          } |> Js.Array.sortInPlaceWith((a, b) =>
-            int_of_float({
-              open Js.Date
-              getTime(b.createTime) -. getTime(a.createTime)
-            })
-          )
-          setLists(_ => Some(lists))
-          Analytics.Amplitude.logEventWithProperties(
-            ~eventName="My Lists Page Viewed",
-            ~eventProperties={"numLists": Js.Array.length(lists)},
-          )
-          Promise.resolved()
-        })
-      }) |> ignore
-      None
-    })
-    <div className=Styles.root>
-      <PageTitle title="My Custom Lists" />
-      <BodyCard className=Styles.bodyCard>
-        <p> {React.string("You can create and manage your custom lists here.")} </p>
-        <p>
-          {React.string(
-            "Be sure to also try the more powerful default lists (For Trade, Wishlist, Catalog)! You can share filtered views of your profile such as ",
-          )}
-          <Link path={"/u/" ++ (me.username ++ "/for-trade?c=recipes")}>
-            {React.string("DIY for Trade")}
-          </Link>
-          {React.string(", ")}
-          <Link path={"/u/" ++ (me.username ++ "/wishlist?c=recipes")}>
-            {React.string("DIY I want")}
-          </Link>
-          {React.string(", ")}
-          <Link path={"/u/" ++ (me.username ++ "/catalog?orderable=&c=furniture")}>
-            {React.string("Furniture I can Order")}
-          </Link>
-          {React.string(", ")}
-          <Link path={"/u/" ++ (me.username ++ "/wishlist?q=saharah")}>
-            {React.string("Saharah items I want")}
-          </Link>
-          {React.string(". Just use the URL!")}
-        </p>
-      </BodyCard>
-      {switch lists {
-      | Some(lists) =>
-        <div>
-          <div className=Styles.body>
-            {lists
-            |> Js.Array.map(list =>
-              <Link path={"/l/" ++ list.id} className=Styles.listItem key=list.id>
-                <div className=Styles.listTitleRow>
-                  <div className=Styles.listTitle>
-                    {switch list.title {
-                    | Some(title) => Emoji.parseText(title)
-                    | None => React.string("Unnamed list")
-                    }}
-                  </div>
-                  <div className=Styles.listNumberItems>
-                    {
-                      let numItems = Js.Array.length(list.itemIds)
-                      React.string(
-                        string_of_int(numItems) ++ (" item" ++ (numItems == 1 ? "" : "s")),
-                      )
-                    }
-                  </div>
-                </div>
-                <div className=Styles.listItemImages>
-                  {list.itemIds
-                  |> Js.Array.slice(~start=0, ~end_=8)
-                  |> Js.Array.mapi(((itemId, variant), i) => {
-                    let item = Item.getItem(~itemId)
-                    <img
-                      src={Item.getImageUrl(~item, ~variant)}
-                      className=Styles.listItemImage
-                      key={string_of_int(i)}
-                    />
-                  })
-                  |> React.array}
-                </div>
-              </Link>
-            )
-            |> React.array}
-            {if Js.Array.length(lists) == 0 {
-              <div className=Styles.noLists>
-                {React.string("You have no custom lists. ")}
-                <Link path="/" onClick={() => QuicklistStore.startList()}>
-                  {React.string("Start one!")}
-                </Link>
-              </div>
-            } else {
-              React.null
-            }}
-          </div>
-          {if Js.Array.length(lists) > 0 {
-            <div className=Styles.startListFooter>
-              <Link path="/" onClick={() => QuicklistStore.startList()}>
-                {React.string("Create new custom list")}
-              </Link>
-            </div>
-          } else {
-            React.null
-          }}
-        </div>
-      | None => React.null
-      }}
-    </div>
-  }
-}
-
-@react.component
-let make = () => {
-  let me = UserStore.useMe()
-
-  switch me {
-  | Some(me) => <WithViewer me />
-  | None => React.null
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/MyPage.res b/jscomp/syntax/tests/idempotency/nook-exchange/MyPage.res
deleted file mode 100644
index a172880..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/MyPage.res
+++ /dev/null
@@ -1,186 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{})
-  let emptyProfile = style(list{
-    maxWidth(px(768)),
-    margin3(~top=px(32), ~bottom=px(128), ~h=auto),
-    textAlign(center),
-  })
-  let username = style(list{fontSize(px(32)), textAlign(center), marginBottom(px(16))})
-  let url = style(list{})
-  let bodyText = style(list{fontSize(px(18))})
-}
-
-module ProfileTextarea = {
-  module Styles = {
-    open Css
-    let root = style(list{display(flexBox), flexDirection(column), marginBottom(px(8))})
-    let textarea = style(list{
-      backgroundColor(hex("f6f6f6")),
-      border(px(1), solid, transparent),
-      borderRadius(px(4)),
-      padding(px(7)),
-      height(px(64)),
-      boxSizing(borderBox),
-      outlineStyle(none),
-      fontSize(px(14)),
-      lineHeight(px(18)),
-      width(pct(100.)),
-      transition(~duration=200, "all"),
-      width(pct(100.)),
-      placeholder(list{opacity(0.7)}),
-      marginBottom(px(6)),
-      focus(list{backgroundColor(Colors.white), borderColor(rgba(0, 0, 0, 0.1))}),
-    })
-    let profileTextPreview = style(list{
-      backgroundColor(hex("f6f6f6")),
-      borderRadius(px(4)),
-      padding4(~top=px(8), ~bottom=px(8), ~left=px(8), ~right=px(32)),
-      fontSize(px(14)),
-      lineHeight(px(18)),
-      marginBottom(px(6)),
-      cursor(pointer),
-      whiteSpace(#preLine),
-      transition(~duration=200, "all"),
-    })
-    let updateBar = style(list{justifyContent(flexEnd)})
-    let previewWrapper = style(list{
-      position(relative),
-      hover(list{selector("& ." ++ profileTextPreview, list{backgroundColor(hex("f0f0f0"))})}),
-    })
-    let editLink = style(list{
-      color(hex("a0a0a0")),
-      fontSize(px(12)),
-      opacity(0.8),
-      textDecoration(none),
-      position(absolute),
-      top(px(8)),
-      right(px(8)),
-      hover(list{opacity(1.), textDecoration(underline)}),
-    })
-  }
-
-  @react.component
-  let make = (~user: User.t) => {
-    let (isEditing, setIsEditing) = React.useState(() => false)
-    let (profileText, setProfileText) = React.useState(() => user.profileText)
-
-    let textareaRef = React.useRef(Js.Nullable.null)
-    React.useEffect1(() => {
-      if isEditing {
-        open Webapi.Dom
-        let textareaElement = Utils.getElementForDomRef(textareaRef)
-        textareaElement->Element.unsafeAsHtmlElement->HtmlElement.focus
-      }
-      None
-    }, [isEditing])
-
-    <div className=Styles.root>
-      {isEditing || user.profileText == ""
-        ? <textarea
-            value=profileText
-            placeholder="Add a welcome message and your Discord username!\nYou can use emoji :nmt: and :bell:"
-            className=Styles.textarea
-            onChange={e => {
-              let value = ReactEvent.Form.target(e)["value"]
-              setProfileText(_ => value)
-            }}
-            ref={ReactDOMRe.Ref.domRef(textareaRef)}
-          />
-        : <div className=Styles.previewWrapper>
-            <div onClick={_ => setIsEditing(_ => true)} className=Styles.profileTextPreview>
-              {Emoji.parseText(user.profileText)}
-            </div>
-            <a
-              href="#"
-              onClick={e => {
-                setIsEditing(_ => true)
-                ReactEvent.Mouse.preventDefault(e)
-              }}
-              className=Styles.editLink>
-              {React.string("Edit")}
-            </a>
-          </div>}
-      {isEditing || profileText != user.profileText
-        ? <div className={Cn.make(list{UserItemNote.Styles.updateBar, Styles.updateBar})}>
-            <Button
-              small=true
-              onClick={_ => {
-                UserStore.updateProfileText(~profileText)
-                setIsEditing(_ => false)
-              }}>
-              {React.string("Save")}
-            </Button>
-            <a
-              href="#"
-              onClick={e => {
-                setProfileText(_ => user.profileText)
-                setIsEditing(_ => false)
-                ReactEvent.Mouse.preventDefault(e)
-              }}
-              className=UserItemNote.Styles.cancelLink>
-              {React.string("Cancel")}
-            </a>
-          </div>
-        : React.null}
-    </div>
-  }
-}
-
-@react.component
-let make = (~user: User.t, ~urlRest, ~url) => {
-  React.useEffect0(() => {
-    open Webapi.Dom
-    window |> Window.scrollTo(0., 0.)
-    None
-  })
-  let list = switch urlRest {
-  | list{url} => ViewingList.urlToViewingList(url)
-  | _ => None
-  }
-  <div className=Styles.root>
-    <div className=Styles.username> {React.string(user.username)} </div>
-    <BodyCard>
-      <ProfileTextarea user />
-      <div className=Styles.url>
-        {React.string("Share your profile! ")}
-        <Link path={"/u/" ++ user.username}>
-          {React.string("https://nook.exchange/u/" ++ user.username)}
-        </Link>
-      </div>
-      <div>
-        {React.string("Have a lot of items to add? Try the new ")}
-        <Link path="/import"> {React.string("item importer")} </Link>
-        {React.string(".")}
-      </div>
-    </BodyCard>
-    {switch list {
-    | Some(list) => <UserListBrowser user list url me=true />
-    | None =>
-      if user.items->Js.Dict.keys->Js.Array.length > 0 {
-        <UserProfileBrowser
-          username=user.username
-          userItems={user.items
-          ->Js.Dict.entries
-          ->Belt.Array.mapU((. (itemKey, item)) => (
-            Belt.Option.getExn(User.fromItemKey(~key=itemKey)),
-            item,
-          ))}
-          editable=true
-        />
-      } else {
-        <>
-          <div className=Styles.emptyProfile>
-            <div className=Styles.bodyText>
-              <div> {React.string("Your profile is empty!")} </div>
-              <div>
-                {React.string("Add items from the ")}
-                <Link path="/"> {React.string("Item Browser")} </Link>
-              </div>
-            </div>
-          </div>
-        </>
-      }
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/PageTitle.res b/jscomp/syntax/tests/idempotency/nook-exchange/PageTitle.res
deleted file mode 100644
index ea12ff0..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/PageTitle.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module Styles = {
-  open Css
-  let pageTitle = style(list{fontSize(px(32)), textAlign(center), marginBottom(px(16))})
-}
-
-@react.component
-let make = (~title) => <div className=Styles.pageTitle> {React.string(title)} </div>
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/PasswordResetPage.res b/jscomp/syntax/tests/idempotency/nook-exchange/PasswordResetPage.res
deleted file mode 100644
index eb113a2..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/PasswordResetPage.res
+++ /dev/null
@@ -1,130 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{
-    backgroundColor(Colors.white),
-    width(vw(90.)),
-    boxSizing(borderBox),
-    margin2(~v=px(32), ~h=auto),
-    padding2(~v=px(32), ~h=px(32)),
-    borderRadius(px(16)),
-    maxWidth(px(512)),
-  })
-}
-
-type status =
-  | Success(string)
-  | Error(string)
-
-@react.component
-let make = (~url: ReasonReactRouter.url) => {
-  let (password, setPassword) = React.useState(() => "")
-  let (isSubmitting, setIsSubmitting) = React.useState(() => false)
-  let (status, setStatus) = React.useState(() => None)
-  let token = React.useMemo1(() => {
-    open Webapi.Url.URLSearchParams
-    let searchParams = make(url.search)
-    searchParams |> get("token")
-  }, [url.search])
-
-  let onSubmit = e => {
-    ReactEvent.Form.preventDefault(e)
-    switch token {
-    | Some(token) =>
-      setIsSubmitting(_ => true)
-      %Repromise.JsExn({
-        let response = Fetch.fetchWithInit(
-          Constants.apiUrl ++ "/password-reset/consume",
-          Fetch.RequestInit.make(
-            ~method_=Post,
-            ~body=Fetch.BodyInit.make(
-              Js.Json.stringify(
-                Json.Encode.object_(list{
-                  ("token", Js.Json.string(token)),
-                  ("password", Js.Json.string(password)),
-                }),
-              ),
-            ),
-            ~headers=Fetch.HeadersInit.make({
-              "X-Client-Version": Constants.gitCommitRef,
-              "Content-Type": "application/json",
-            }),
-            ~mode=CORS,
-            (),
-          ),
-        )
-        %Repromise({
-          let _ = if Fetch.Response.status(response) < 300 {
-            %Repromise.JsExn({
-              let json = Fetch.Response.json(response)
-              let username = {
-                open Json.Decode
-                json |> field("username", string)
-              }
-              setStatus(_ => Some(Success(username)))
-              Analytics.Amplitude.logEventWithProperties(
-                ~eventName="Reset Password Changed Success",
-                ~eventProperties={"token": token, "username": username},
-              )
-              Promise.resolved()
-            })
-          } else {
-            %Repromise.JsExn({
-              let text = Fetch.Response.text(response)
-              setStatus(_ => Some(Error(text)))
-              Analytics.Amplitude.logEventWithProperties(
-                ~eventName="Reset Password Changed Failure",
-                ~eventProperties={"token": token, "error": text},
-              )
-              Promise.resolved()
-            })
-          }
-          setIsSubmitting(_ => false)
-          Promise.resolved()
-        })
-      }) |> ignore
-    | None => setStatus(_ => Some(Error("Missing token")))
-    }
-  }
-
-  <div className=Styles.root>
-    <form onSubmit>
-      <div className=LoginOverlay.Styles.registerTitle>
-        {React.string("Change your password")}
-      </div>
-      <input
-        type_="password"
-        placeholder="New password"
-        value=password
-        onChange={e => {
-          let value = ReactEvent.Form.target(e)["value"]
-          setPassword(_ => value)
-        }}
-        className=LoginOverlay.Styles.input
-      />
-      {switch status {
-      | Some(Error(error)) =>
-        <div className=LoginOverlay.Styles.errorMessage> {React.string(error)} </div>
-      | _ => React.null
-      }}
-      <div className=LoginOverlay.Styles.submitBar>
-        {switch status {
-        | Some(Success(username)) =>
-          <div className=LoginOverlay.Styles.successMessage>
-            {React.string(username ++ "'s password is changed!")}
-          </div>
-        | _ => React.null
-        }}
-        <button
-          type_="submit"
-          disabled={isSubmitting ||
-          switch status {
-          | Some(Success(_)) => true
-          | _ => false
-          }}
-          className=LoginOverlay.Styles.submitButton>
-          {React.string("Change password")}
-        </button>
-      </div>
-    </form>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/QuicklistButton.res b/jscomp/syntax/tests/idempotency/nook-exchange/QuicklistButton.res
deleted file mode 100644
index 35f6caf..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/QuicklistButton.res
+++ /dev/null
@@ -1,45 +0,0 @@
-module Styles = {
-  open Css
-  let button = style(list{
-    backgroundColor(hex("3aa56320")),
-    borderRadius(px(4)),
-    border(px(2), solid, Colors.green),
-    cursor(pointer),
-    width(px(24)),
-    height(px(24)),
-    padding(zero),
-    outlineStyle(none),
-    transitions(list{
-      Transition.shorthand(~duration=200, "background-color"),
-      Transition.shorthand(~duration=200, "border-color"),
-    }),
-    backgroundPosition(center),
-    media(
-      "(hover: hover)",
-      list{hover(list{backgroundColor(hex("3aa56380")), borderColor(Colors.green)})},
-    ),
-    important(opacity(1.)),
-  })
-  @module("./assets/check_white.png")
-  external checkImage: string = "default"
-  let buttonSelected = style(list{
-    important(backgroundColor(Colors.green)),
-    backgroundImage(url(checkImage)),
-    backgroundSize(size(px(16), px(16))),
-    backgroundRepeat(noRepeat),
-    borderColor(Colors.green),
-  })
-}
-
-@react.component
-let make = (~itemId, ~variant, ~selected, ~className) =>
-  <button
-    onClick={_ =>
-      if selected {
-        QuicklistStore.removeItem(~itemId, ~variant)
-      } else {
-        QuicklistStore.addItem(~itemId, ~variant)
-      }}
-    className={Cn.make(list{Styles.button, Cn.ifTrue(Styles.buttonSelected, selected), className})}>
-    React.null
-  </button>
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/QuicklistOverlay.res b/jscomp/syntax/tests/idempotency/nook-exchange/QuicklistOverlay.res
deleted file mode 100644
index 73c7b88..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/QuicklistOverlay.res
+++ /dev/null
@@ -1,541 +0,0 @@
-let viewportThreshold = 450
-
-module Styles = {
-  open Css
-  let mobileOverlay = style(list{
-    media(
-      "(max-width: 450px)",
-      list{
-        position(fixed),
-        backgroundColor(hex("ffffff80")),
-        bottom(zero),
-        top(zero),
-        left(zero),
-        right(zero),
-      },
-    ),
-  })
-  let root = style(list{
-    position(fixed),
-    bottom(zero),
-    left(px(32)),
-    width(px(288)),
-    borderTopLeftRadius(px(8)),
-    borderTopRightRadius(px(8)),
-    overflow(hidden),
-    backgroundColor(Colors.green),
-    color(Colors.white),
-    transition(~duration=250, "all"),
-    transform(translate3d(zero, pct(100.), zero)),
-    media(
-      "(max-width: 450px)",
-      list{backgroundColor(hex("fffffff0")), left(zero), right(zero), width(auto)},
-    ),
-  })
-  let rootWithQuicklist = style(list{Colors.darkLayerShadow})
-  let introBar = style(list{
-    display(flexBox),
-    justifyContent(spaceBetween),
-    alignItems(center),
-    padding2(~v=px(8), ~h=px(8)),
-    height(px(33)),
-    media(
-      "(max-width: 450px)",
-      list{
-        paddingTop(px(16)),
-        paddingBottom(px(16)),
-        selector("@supports (-webkit-touch-callout: none)", list{paddingBottom(px(20))}),
-      },
-    ),
-    transition(~duration=200, "all"),
-  })
-  let shown = style(list{transform(translate3d(zero, px(384), zero))})
-  let button = style(list{
-    backgroundColor(Colors.white),
-    color(Colors.green),
-    borderWidth(zero),
-    borderRadius(px(4)),
-    padding2(~v=px(8), ~h=px(12)),
-    cursor(pointer),
-    disabled(list{opacity(0.8)}),
-    media("(min-width: 451px)", list{hover(list{backgroundColor(Colors.white)})}),
-    media("(max-width: 450px)", list{backgroundColor(Colors.green), color(Colors.white)}),
-  })
-  let barLink = style(list{
-    color(Colors.white),
-    display(inlineBlock),
-    padding2(~v=px(4), ~h=px(8)),
-    textDecoration(none),
-    hover(list{textDecoration(underline)}),
-    media("(max-width: 450px)", list{color(Colors.green)}),
-  })
-  @module("./assets/down_caret.png")
-  external downCaretIcon: string = "default"
-  let hidePanelLink = style(list{
-    padding2(~v=zero, ~h=px(8)),
-    textDecoration(none),
-    display(flexBox),
-    alignItems(center),
-    unsafe("alignSelf", "stretch"),
-    media("(hover: hover)", list{hover(list{textDecoration(underline)})}),
-  })
-  let hidePanelLinkCaret = style(list{
-    backgroundImage(url(downCaretIcon)),
-    backgroundSize(cover),
-    display(inlineBlock),
-    height(px(16)),
-    width(px(16)),
-    verticalAlign(#top),
-  })
-  let shownPanel = style(list{
-    boxShadow(Shadow.box(~blur=px(24), hex("00000040"))),
-    transform(translate3d(zero, zero, zero)),
-    backgroundColor(Colors.white),
-    color(Colors.charcoal),
-    selector("& ." ++ barLink, list{color(Colors.linkGreen)}),
-    selector("& ." ++ introBar, list{borderBottom(px(1), solid, Colors.faintGray)}),
-    media(
-      "(max-width: 450px)",
-      list{
-        boxShadow(Shadow.box(~blur=px(16), hex("00000040"))),
-        selector("& ." ++ introBar, list{paddingTop(px(8)), paddingBottom(px(8))}),
-      },
-    ),
-  })
-  let body = style(list{
-    height(px(384)),
-    boxSizing(borderBox),
-    display(flexBox),
-    flexDirection(column),
-  })
-  let bodyListWrapper = style(list{
-    flexGrow(1.),
-    overflow(hidden),
-    position(relative),
-    display(flexBox),
-    flexDirection(column),
-  })
-  let bodyList = style(list{height(pct(100.)), overflow(auto)})
-  let listImages = style(list{
-    display(flexBox),
-    flexWrap(wrap),
-    padding(px(16)),
-    position(relative),
-  })
-  let listImagesScrollFade = style(list{
-    backgroundImage(
-      linearGradient(deg(0.), list{(zero, hex("ffffffff")), (pct(100.), hex("ffffff00"))}),
-    ),
-    position(absolute),
-    bottom(zero),
-    left(zero),
-    right(zero),
-    height(px(16)),
-  })
-  let listImage = style(list{
-    display(block),
-    width(px(64)),
-    height(px(64)),
-    cursor(pointer),
-    media("(hover: hover)", list{hover(list{backgroundColor(Colors.faintGray)})}),
-  })
-  let emptyList = style(list{paddingTop(px(32)), textAlign(center), fontSize(px(20))})
-  let saveRow = style(list{
-    backgroundColor(Colors.white),
-    display(flexBox),
-    flexDirection(column),
-    flexShrink(0.),
-    padding3(~top=px(8), ~h=px(16), ~bottom=px(16)),
-  })
-  let mobileRemoveMessage = style(list{
-    display(none),
-    media(
-      "(max-width: 450px)",
-      list{display(block), paddingBottom(px(8)), color(Colors.gray), textAlign(center)},
-    ),
-  })
-  let saveButton = style(list{
-    padding2(~v=px(12), ~h=zero),
-    backgroundColor(Colors.green),
-    borderWidth(zero),
-    fontSize(px(16)),
-    color(Colors.white),
-    borderRadius(px(10)),
-    width(pct(100.)),
-  })
-}
-
-type visibility =
-  | Hidden
-  | Bar
-  | Panel
-
-module CreateDialog = {
-  module Styles = {
-    open Css
-    let body = style(list{
-      padding(px(16)),
-      width(px(384)),
-      boxSizing(borderBox),
-      minHeight(px(96)),
-      maxWidth(vw(90.)),
-    })
-    let title = style(list{fontSize(px(24)), marginBottom(px(16))})
-    let listUrl = style(list{
-      width(pct(100.)),
-      padding2(~v=px(12), ~h=px(8)),
-      backgroundColor(transparent),
-      border(px(2), dashed, hex("bae8cc")),
-      borderRadius(px(4)),
-      textAlign(center),
-      cursor(pointer),
-      outlineStyle(none),
-      margin2(~v=px(16), ~h=zero),
-      transition(~duration=300, "all"),
-    })
-    let listUrlCopied = style(list{borderColor(hex("3cb56c"))})
-  }
-
-  @module external copyToClipboard: string => unit = "copy-to-clipboard"
-
-  module ConfirmModal = {
-    @react.component
-    let make = (~listId, ~onClose) => {
-      let (hasCopied, setHasCopied) = React.useState(() => false)
-      <Modal>
-        <div className=Styles.body>
-          <div className=Styles.title> {React.string("List created!")} </div>
-          {
-            let url =
-              {
-                open Webapi.Dom
-                location |> Location.origin
-              } ++
-              ("/l/" ++
-              listId)
-            <>
-              <div>
-                {React.string("Tap to copy or ")}
-                <a
-                  href=url
-                  target="_blank"
-                  onClick={_ =>
-                    Analytics.Amplitude.logEventWithProperties(
-                      ~eventName="Item List Opened in New Tab",
-                      ~eventProperties={"listId": listId},
-                    )}>
-                  {React.string("open in new tab")}
-                </a>
-                {React.string(".")}
-              </div>
-              {if UserStore.isLoggedIn() {
-                <div>
-                  {React.string(" You can find this on your ")}
-                  <Link path="/lists" onClick={() => onClose()}>
-                    {React.string("custom lists page")}
-                  </Link>
-                  {React.string(".")}
-                </div>
-              } else {
-                React.null
-              }}
-              <button
-                className={Cn.make(list{
-                  Styles.listUrl,
-                  Cn.ifTrue(Styles.listUrlCopied, hasCopied),
-                })}
-                onClick={_ => {
-                  copyToClipboard(url)
-                  Analytics.Amplitude.logEventWithProperties(
-                    ~eventName="Item List Copied to Clipboard",
-                    ~eventProperties={"listId": listId},
-                  )
-                  setHasCopied(_ => true)
-                }}>
-                {React.string(url)}
-              </button>
-              <div>
-                {React.string("We are working on this feature. Please ")}
-                <a href="https://twitter.com/nookexchange" target="_blank">
-                  {React.string("share your feedback")}
-                </a>
-                {React.string("!")}
-              </div>
-            </>
-          }
-        </div>
-        // {if (UserStore.isLoggedIn()) {
-        //    <div>
-        //      {React.string(
-        //         {j|Lists are saved to your account. The page is coming soon 🙃|j},
-        //       )}
-        //    </div>;
-        //  } else {
-        //    <div>
-        //      {React.string("Create an account to save your lists!")}
-        //    </div>;
-        //  }}
-        <Modal.FooterBar>
-          <Button onClick={_ => onClose()}> {React.string("Okay")} </Button>
-        </Modal.FooterBar>
-      </Modal>
-    }
-  }
-
-  let show = (~listId) => {
-    let modalKey = ref(None)
-    let onClose = () => ReactAtmosphere.API.removeLayer(~key=Belt.Option.getExn(modalKey.contents))
-    modalKey := Some(ReactAtmosphere.API.pushLayer(~render=_ => <ConfirmModal listId onClose />))
-  }
-}
-
-@react.component
-let make = () => {
-  let me = UserStore.useMe()
-  let quicklist = QuicklistStore.useQuicklist()
-  let (visibility, setVisibility) = React.useState(() => Bar)
-  let (isSubmitting, setIsSubmitting) = React.useState(() => false)
-
-  if visibility == Panel && quicklist == None {
-    setVisibility(_ => Bar)
-  }
-  let listId = quicklist->Belt.Option.flatMap(quicklist => quicklist.id)
-  React.useEffect1(() => {
-    if listId != None {
-      setVisibility(_ => Panel)
-    }
-    None
-  }, [listId])
-
-  let url = ReasonReactRouter.useUrl()
-  let viewportWidth = Utils.useViewportWidth()
-  let isShown =
-    quicklist != None ||
-      (visibility != Hidden &&
-        switch url.path {
-        | list{"u", username, ..._} =>
-          switch me {
-          | Some(me) => me.username != username || Js.Dict.keys(me.items)->Js.Array.length >= 8
-          | None => true
-          }
-        | _ => false
-        })
-  <>
-    {visibility == Panel
-      ? <div onClick={_ => setVisibility(_ => Bar)} className=Styles.mobileOverlay />
-      : React.null}
-    <div
-      className={Cn.make(list{
-        Styles.root,
-        Cn.ifTrue(Styles.shown, isShown),
-        Cn.ifTrue(Styles.shownPanel, visibility == Panel),
-        Cn.ifTrue(Styles.rootWithQuicklist, quicklist != None),
-      })}>
-      <div className=Styles.introBar>
-        {visibility == Panel
-          ? <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                Analytics.Amplitude.logEvent(~eventName="Item List Overlay Closed")
-                setVisibility(_ => Bar)
-              }}
-              className=Styles.hidePanelLink>
-              <span className=Styles.hidePanelLinkCaret /> {React.string("Close")}
-            </a>
-          : switch quicklist {
-            | Some(quicklist) =>
-              let numItems = quicklist.itemIds->Js.Array.length
-              <button
-                onClick={_ => {
-                  setVisibility(_ => Panel)
-                  Analytics.Amplitude.logEventWithProperties(
-                    ~eventName="Item List Overlay Shown",
-                    ~eventProperties={"numItems": numItems},
-                  )
-                }}
-                disabled={Js.Array.length(quicklist.itemIds) == 0}
-                className=Styles.button>
-                {React.string(
-                  numItems > 0
-                    ? "See " ++ (string_of_int(numItems) ++ (" item" ++ (numItems == 1 ? "" : "s")))
-                    : "Select items",
-                )}
-              </button>
-            | None =>
-              <button onClick={_ => QuicklistStore.startList()} className=Styles.button>
-                {React.string("Start a list")}
-              </button>
-            }}
-        {switch quicklist {
-        | Some(quicklist) =>
-          switch quicklist.id {
-          | Some(listId) =>
-            <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                QuicklistStore.removeList()
-                setVisibility(_ => Bar)
-              }}
-              className=Styles.barLink>
-              {React.string("Stop editing list")}
-            </a>
-          | None =>
-            <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                let numItems = Js.Array.length(quicklist.itemIds)
-                if numItems > 1 {
-                  ConfirmDialog.confirm(
-                    ~bodyText="You have " ++
-                    (string_of_int(numItems) ++
-                    " items that will be discarded. Are you sure?"),
-                    ~confirmLabel="Yes, discard list",
-                    ~cancelLabel="Not yet",
-                    ~onConfirm=() => {
-                      QuicklistStore.removeList()
-                      Analytics.Amplitude.logEventWithProperties(
-                        ~eventName="Item List Removed",
-                        ~eventProperties={"numItems": numItems},
-                      )
-                    },
-                    (),
-                  )
-                } else {
-                  QuicklistStore.removeList()
-                  Analytics.Amplitude.logEventWithProperties(
-                    ~eventName="Item List Removed",
-                    ~eventProperties={"numItems": numItems},
-                  )
-                }
-                setVisibility(_ => Bar)
-              }}
-              className=Styles.barLink>
-              {React.string("Discard list")}
-            </a>
-          }
-        | None =>
-          <a
-            href="#"
-            onClick={e => {
-              ReactEvent.Mouse.preventDefault(e)
-              setVisibility(_ => Hidden)
-              Analytics.Amplitude.logEvent(~eventName="Item List Overlay Hidden")
-            }}
-            className=Styles.barLink>
-            {React.string("Hide")}
-          </a>
-        }}
-      </div>
-      <div className=Styles.body>
-        <div className=Styles.bodyListWrapper>
-          <div className=Styles.bodyList>
-            {switch quicklist {
-            | Some(quicklist) =>
-              if Js.Array.length(quicklist.itemIds) > 0 {
-                <div className=Styles.listImages>
-                  {quicklist.itemIds
-                  ->Belt.Array.map(((itemId, variant)) => {
-                    let item = Item.getItem(~itemId)
-                    if viewportWidth > viewportThreshold {
-                      <ReactAtmosphere.Tooltip
-                        text={React.string(
-                          Item.getName(item) ++
-                          ((
-                            Item.getNumVariations(~item) > 1
-                              ? " (" ++
-                                (Item.getVariantName(
-                                  ~item,
-                                  ~variant,
-                                  ~hidePattern=true,
-                                  (),
-                                )->Belt.Option.getExn ++
-                                ")")
-                              : ""
-                          ) ++
-                          "\nTap to remove"),
-                        )}
-                        options={
-                          placement: Some("top"),
-                          modifiers: Some([
-                            {
-                              "name": "offset",
-                              "options": {
-                                "offset": [0, 4],
-                              },
-                            },
-                          ]),
-                        }
-                        key={string_of_int(itemId) ++ string_of_int(variant)}>
-                        {({onMouseEnter, onMouseLeave, ref}) =>
-                          <img
-                            src={Item.getImageUrl(~item, ~variant)}
-                            className=Styles.listImage
-                            onMouseEnter
-                            onMouseLeave
-                            onClick={_ => QuicklistStore.removeItem(~itemId, ~variant)}
-                            ref={ReactDOMRe.Ref.domRef(ref)}
-                          />}
-                      </ReactAtmosphere.Tooltip>
-                    } else {
-                      <img
-                        src={Item.getImageUrl(~item, ~variant)}
-                        className=Styles.listImage
-                        onClick={_ => QuicklistStore.removeItem(~itemId, ~variant)}
-                        key={string_of_int(itemId) ++ string_of_int(variant)}
-                      />
-                    }
-                  })
-                  ->React.array}
-                </div>
-              } else {
-                <div className=Styles.emptyList> {React.string("Your list is empty!")} </div>
-              }
-            | None => React.null
-            }}
-          </div>
-          <div className=Styles.listImagesScrollFade />
-        </div>
-        <div className=Styles.saveRow>
-          <div className=Styles.mobileRemoveMessage> {React.string("Tap item to remove")} </div>
-          {switch quicklist->Belt.Option.flatMap(quicklist => quicklist.id) {
-          | None =>
-            <button
-              onClick={_ =>
-                {
-                  setIsSubmitting(_ => true)
-                  %Repromise({
-                    let listId = QuicklistStore.saveList()
-                    setIsSubmitting(_ => false)
-                    setVisibility(_ => Bar)
-                    CreateDialog.show(~listId)
-                    QuicklistStore.removeList()
-                    Promise.resolved()
-                  })
-                } |> ignore}
-              disabled={switch quicklist {
-              | Some(quicklist) => Js.Array.length(quicklist.itemIds) == 0 || isSubmitting
-              | None => true
-              }}
-              className=Styles.saveButton>
-              {React.string("Save and share this list!")}
-            </button>
-          | Some(listId) =>
-            <button
-              onClick={_ => {
-                ReasonReactRouter.push("/l/" ++ listId)
-                setVisibility(_ => Hidden)
-                QuicklistStore.removeList()
-              }}
-              disabled=isSubmitting
-              className=Styles.saveButton>
-              {React.string("See list")}
-            </button>
-          }}
-        </div>
-      </div>
-    </div>
-  </>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/QuicklistStore.res b/jscomp/syntax/tests/idempotency/nook-exchange/QuicklistStore.res
deleted file mode 100644
index 6a68202..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/QuicklistStore.res
+++ /dev/null
@@ -1,195 +0,0 @@
-type t = {
-  id: option<string>,
-  title: option<string>,
-  userId: option<string>,
-  itemIds: array<(int, int)>,
-}
-
-type action =
-  | StartList
-  | LoadList(string, option<string>, array<(int, int)>)
-  | AddItem(int, int)
-  | RemoveItem(int, int)
-  | UpdateTitle(string, option<string>)
-  | RemoveList
-
-open Belt
-
-let api = Restorative.createStore(None, (state, action) =>
-  switch action {
-  | StartList => Some({id: None, title: None, userId: None, itemIds: []})
-  | LoadList(id, title, itemIds) =>
-    Some({id: Some(id), title: title, userId: None, itemIds: itemIds})
-  | AddItem(itemId, variant) =>
-    state->Option.map(state => {
-      ...state,
-      itemIds: state.itemIds->Array.concat([(itemId, variant)]),
-    })
-  | RemoveItem(itemId, variant) =>
-    state->Option.map(state => {
-      ...state,
-      itemIds: state.itemIds->Array.keep(((a, b)) => a != itemId || b != variant),
-    })
-  | UpdateTitle(listId, title) =>
-    state->Option.map(state =>
-      if state.id == Some(listId) {
-        {
-          ...state,
-          title: title,
-        }
-      } else {
-        state
-      }
-    )
-  | RemoveList => None
-  }
-)
-
-let useHasQuicklist = () => api.useStoreWithSelector(state => state != None, ())
-let useQuicklist = () => api.useStore()
-
-let useItemState = (~itemId, ~variant) => api.useStoreWithSelector(state =>
-    switch state {
-    | Some(state) => state.itemIds->Array.getBy(((a, b)) => a == itemId && b == variant) !== None
-    | None => false
-    }
-  , ())
-
-let startList = () => {
-  api.dispatch(StartList)
-  Analytics.Amplitude.logEventWithProperties(
-    ~eventName="Item List Started",
-    ~eventProperties={
-      "path": {
-        open Webapi.Dom
-        location |> Location.pathname
-      },
-      "isLoggedIn": UserStore.isLoggedIn(),
-      "isViewingSelf": switch UserStore.getUserOption() {
-      | Some(user) =>
-        let url = ReasonReactRouter.dangerouslyGetInitialUrl()
-        switch url.path {
-        | list{"u", username, ..._} =>
-          Js.String.toLowerCase(username) == Js.String.toLowerCase(user.username)
-        | _ => false
-        }
-      | None => false
-      },
-    },
-  )
-}
-
-let removeList = () => api.dispatch(RemoveList)
-
-let hasLoggedItemListUpdate = ref(false)
-let saveList = () => {
-  let list = api.getState()->Belt.Option.getExn
-  let itemIds = list.itemIds
-  switch list.id {
-  | Some(listId) =>
-    %Repromise({
-      let responseResult = API.updateItemList(
-        ~sessionId=Belt.Option.getExn(UserStore.sessionId.contents),
-        ~listId,
-        ~items=itemIds,
-        (),
-      )
-      UserStore.handleServerResponse("/item-lists/patch", responseResult)
-      if !hasLoggedItemListUpdate.contents {
-        Analytics.Amplitude.logEventWithProperties(
-          ~eventName="Item List Updated",
-          ~eventProperties={
-            "listId": listId,
-            "numItems": Js.Array.length(itemIds),
-          },
-        )
-        hasLoggedItemListUpdate := true
-      }
-      Promise.resolved(listId)
-    })
-  | None =>
-    %Repromise({
-      let responseResult = API.createItemList(
-        ~sessionId=UserStore.sessionId.contents,
-        ~items=itemIds,
-      )
-      UserStore.handleServerResponse("/item-lists", responseResult)
-      let response = Belt.Result.getExn(responseResult)
-      %Repromise.JsExn({
-        let json = Fetch.Response.json(response)
-        let listId = json |> {
-          open Json.Decode
-          field("id", string)
-        }
-        Analytics.Amplitude.logEventWithProperties(
-          ~eventName="Item List Created",
-          ~eventProperties={
-            "listId": listId,
-            "numItems": Js.Array.length(itemIds),
-          },
-        )
-        Promise.resolved(listId)
-      })
-    })
-  }
-}
-
-let hasLoggedItemAdd = ref(false)
-let addItem = (~itemId, ~variant) => {
-  api.dispatch(AddItem(itemId, variant))
-  switch api.getState() {
-  | Some(quicklist) =>
-    switch quicklist.id {
-    | Some(_listId) => saveList() |> ignore
-    | None =>
-      if !hasLoggedItemAdd.contents {
-        Analytics.Amplitude.logEventWithProperties(
-          ~eventName="Item List Item Added",
-          ~eventProperties={"itemId": itemId, "variant": variant},
-        )
-        hasLoggedItemAdd := true
-      }
-    }
-  | None => ()
-  }
-}
-
-let hasLoggedItemRemove = ref(false)
-let removeItem = (~itemId, ~variant) => {
-  api.dispatch(RemoveItem(itemId, variant))
-  switch api.getState() {
-  | Some(quicklist) =>
-    switch quicklist.id {
-    | Some(_listId) => saveList() |> ignore
-    | None =>
-      if !hasLoggedItemRemove.contents {
-        Analytics.Amplitude.logEventWithProperties(
-          ~eventName="Item List Item Removed",
-          ~eventProperties={"itemId": itemId, "variant": variant},
-        )
-        hasLoggedItemRemove := true
-      }
-    }
-  | None => ()
-  }
-}
-
-let updateListTitle = (~listId, ~title: option<string>) => {
-  api.dispatch(UpdateTitle(listId, title))
-  %Repromise({
-    let responseResult = API.updateItemList(
-      ~sessionId=Option.getExn(UserStore.sessionId.contents),
-      ~listId,
-      ~title=title->Option.getWithDefault(""),
-      (),
-    )
-    UserStore.handleServerResponse("/item-lists/patch", responseResult)
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Item List Title Updated",
-      ~eventProperties={"listId": listId, "title": title},
-    )
-    Promise.resolved()
-  })
-}
-
-let loadList = (~listId, ~title, ~listItems) => api.dispatch(LoadList(listId, title, listItems))
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/RemoveButton.res b/jscomp/syntax/tests/idempotency/nook-exchange/RemoveButton.res
deleted file mode 100644
index 2fbed70..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/RemoveButton.res
+++ /dev/null
@@ -1,41 +0,0 @@
-module Styles = {
-  open Css
-  @module("../assets/remove.png") external removeIcon: string = "default"
-  let removeButton = style(list{
-    backgroundColor(transparent),
-    backgroundImage(url(removeIcon)),
-    backgroundSize(cover),
-    width(px(16)),
-    height(px(16)),
-    padding(zero),
-    borderWidth(zero),
-    opacity(0.5),
-    transition(~duration=200, "all"),
-    cursor(pointer),
-    hover(list{important(opacity(1.))}),
-  })
-}
-
-@react.component
-let make = React.forwardRef((
-  ~onMouseEnter=?,
-  ~onMouseLeave=?,
-  ~onFocus=?,
-  ~onBlur=?,
-  ~onClick,
-  ~className,
-  forwardedRef,
-) =>
-  <button
-    title="Remove"
-    ?onMouseEnter
-    ?onMouseLeave
-    ?onFocus
-    ?onBlur
-    ref=?{Belt.Option.map(Js.Nullable.toOption(forwardedRef), forwardedRef =>
-      ReactDOMRe.Ref.domRef(forwardedRef)
-    )}
-    onClick
-    className={Cn.make(list{Styles.removeButton, className})}
-  />
-)
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Repromise.res b/jscomp/syntax/tests/idempotency/nook-exchange/Repromise.res
deleted file mode 100644
index dc829ea..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Repromise.res
+++ /dev/null
@@ -1,29 +0,0 @@
-let let_ = Promise.flatMap
-
-module Wrap = {
-  let let_ = Promise.map
-}
-
-module JsExn = {
-  exception Unexpected(Js.Promise.error)
-  let let_ = (bsPromise, cb) => {
-    let promise = bsPromise->Promise.Js.fromBsPromise->Promise.Js.toResult
-    Promise.flatMap(promise, result =>
-      cb(
-        switch result {
-        | Ok(result) => result
-        | Error(error) =>
-          Js.log2("Repromise.JsExn", error)
-          raise(Unexpected(error))
-        },
-      )
-    )
-  }
-}
-
-module Js = {
-  let let_ = (bsPromise, cb) => {
-    let promise = bsPromise->Promise.Js.fromBsPromise->Promise.Js.toResult
-    Promise.flatMap(promise, cb)
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/SettingsPage.res b/jscomp/syntax/tests/idempotency/nook-exchange/SettingsPage.res
deleted file mode 100644
index 4a1b2fa..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/SettingsPage.res
+++ /dev/null
@@ -1,271 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{})
-  let input = style(list{
-    backgroundColor(rgba(0, 0, 0, 0.05)),
-    border(px(1), solid, transparent),
-    borderRadius(px(4)),
-    padding2(~v=px(10), ~h=px(12)),
-    boxSizing(borderBox),
-    outlineStyle(none),
-    fontSize(px(16)),
-    width(pct(100.)),
-    marginBottom(px(16)),
-    transition(~duration=200, "all"),
-    focus(list{
-      backgroundColor(Colors.white),
-      borderColor(rgba(0, 0, 0, 0.15)),
-      boxShadow(Shadow.box(~spread=px(4), rgba(0, 0, 0, 0.05))),
-    }),
-    disabled(list{color(Colors.gray)}),
-  })
-  let submitBar = style(list{display(flexBox), alignItems(center), justifyContent(flexEnd)})
-  let successMessage = style(list{flexGrow(1.), color(Colors.green)})
-  let submitButton = style(list{
-    backgroundColor(Colors.green),
-    borderWidth(zero),
-    borderRadius(px(4)),
-    color(Colors.white),
-    cursor(pointer),
-    marginLeft(px(16)),
-    padding2(~v=px(8), ~h=px(16)),
-    fontSize(px(16)),
-    transition(~duration=200, "all"),
-    disabled(list{opacity(0.5)}),
-  })
-  let blurb = style(list{marginBottom(px(16))})
-  let urlPreview = style(list{
-    fontSize(px(12)),
-    letterSpacing(pxFloat(0.3)),
-    color(hex("b0b0b0")),
-    marginBottom(px(8)),
-  })
-  let errorMessage = style(list{marginTop(px(-10)), marginBottom(px(16)), color(Colors.red)})
-  let discordSection = style(list{
-    borderBottom(px(1), dashed, Colors.lightGray),
-    marginBottom(px(16)),
-    paddingTop(px(8)),
-    paddingBottom(px(16)),
-  })
-  let discordButton = style(list{marginTop(px(16))})
-  let deleteSection = style(list{
-    borderTop(px(1), dashed, Colors.lightGray),
-    marginTop(px(16)),
-    paddingTop(px(16)),
-  })
-  let deleteLink = style(list{
-    color(Colors.red),
-    textDecoration(none),
-    hover(list{textDecoration(underline)}),
-  })
-}
-
-type submitStatus =
-  | Success
-  | Error(string)
-
-module WithUser = {
-  @react.component
-  let make = (~user: User.t) => {
-    let (username, setUsername) = React.useState(() => user.username)
-    let (password, setPassword) = React.useState(() => "")
-    let (oldPassword, setOldPassword) = React.useState(() => "")
-    let hasChanges = user.username != username || password != ""
-    let (isSubmitting, setIsSubmitting) = React.useState(() => false)
-    let (status, setStatus) = React.useState(() => None)
-
-    React.useEffect0(() => {
-      Analytics.Amplitude.logEvent(~eventName="Settings Viewed")
-      None
-    })
-
-    let onSubmit = e => {
-      ReactEvent.Form.preventDefault(e)
-
-      {
-        let prevUsername = user.username
-        setIsSubmitting(_ => true)
-        let usernameUpdate = username == user.username ? None : Some(username)
-        %Repromise({
-          let result = UserStore.patchMe(
-            ~username=?usernameUpdate,
-            ~newPassword=?password != "" ? Some(password) : None,
-            ~oldPassword=?oldPassword != "" ? Some(oldPassword) : None,
-            (),
-          )
-          setIsSubmitting(_ => false)
-          switch result {
-          | Ok() =>
-            setStatus(_ => Some(Success))
-            setPassword(_ => "")
-            setOldPassword(_ => "")
-          | Error(err) => setStatus(_ => Some(Error(err)))
-          }
-          switch usernameUpdate {
-          | Some(username) =>
-            let url = ReasonReactRouter.dangerouslyGetInitialUrl()
-            switch url.path {
-            | list{"u", pathUsername, ..._} =>
-              if Js.String.toLowerCase(pathUsername) == Js.String.toLowerCase(prevUsername) {
-                ReasonReactRouter.push("/u/" ++ username)
-              }
-            | _ => ()
-            }
-          | None => ()
-          }
-          Promise.resolved()
-        })
-      } |> ignore
-    }
-
-    <div className=Styles.root>
-      <PageTitle title="Settings" />
-      <BodyCard>
-        <div className=Styles.discordSection>
-          {switch user.discordId {
-          | Some(_) =>
-            <div>
-              {React.string("Your Discord account is connected. Visit the ")}
-              <a href="https://discord.gg/9sh66CX" target="_blank">
-                {React.string("Discord server")}
-              </a>
-              {React.string(" to trade and share feedback!")}
-            </div>
-          | None => <>
-              <div> {React.string("Join the Discord server to trade and share feedback!")} </div>
-              <div>
-                <button
-                  onClick={_ => {
-                    let state = "connect_" ++ string_of_int(Js.Math.random_int(100000, 999999))
-
-                    {
-                      open Dom.Storage
-                      localStorage |> setItem("discord_state", state)
-                    }
-
-                    open Webapi.Dom
-                    location->Location.setHref(Constants.discordOauthRedirectUri(state))
-                  }}
-                  className={Cn.make(list{
-                    LoginOverlay.Styles.discordButton,
-                    Styles.discordButton,
-                  })}>
-                  <span className=LoginOverlay.Styles.discordButtonLogo />
-                  {React.string("Connect and Join Discord")}
-                </button>
-              </div>
-            </>
-          }}
-        </div>
-        <form onSubmit>
-          <div className=Styles.blurb>
-            {React.string(
-              user.discordId === None
-                ? "You can change your username or password here!"
-                : "You can change your username here!",
-            )}
-          </div>
-          <div className=Styles.urlPreview> {React.string("nook.exchange/u/" ++ username)} </div>
-          <input
-            type_="text"
-            placeholder="Username"
-            value=username
-            onChange={e => {
-              let value = ReactEvent.Form.target(e)["value"]
-              setUsername(_ => value)
-            }}
-            className=Styles.input
-          />
-          {if user.discordId === None {
-            <>
-              <input
-                type_="password"
-                placeholder="New Password (optional)"
-                value=password
-                onChange={e => {
-                  let value = ReactEvent.Form.target(e)["value"]
-                  setPassword(_ => value)
-                }}
-                className=Styles.input
-              />
-              <input
-                type_="password"
-                placeholder="Old Password (required)"
-                value=oldPassword
-                onChange={e => {
-                  let value = ReactEvent.Form.target(e)["value"]
-                  setOldPassword(_ => value)
-                }}
-                className=Styles.input
-              />
-            </>
-          } else {
-            React.null
-          }}
-          {switch status {
-          | Some(Error(error)) => <div className=Styles.errorMessage> {React.string(error)} </div>
-          | _ => React.null
-          }}
-          <div className=Styles.submitBar>
-            {status == Some(Success)
-              ? <div className=Styles.successMessage> {React.string("Update successful!")} </div>
-              : React.null}
-            <button
-              type_="submit"
-              disabled={!hasChanges ||
-              (isSubmitting ||
-              user.discordId === None && oldPassword == "")}
-              className=Styles.submitButton>
-              {React.string("Submit")}
-            </button>
-          </div>
-        </form>
-        <div className=Styles.deleteSection>
-          <div>
-            <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                ConfirmDialog.confirm(
-                  ~bodyText="Are you sure you want to remove ALL ITEMS from your account? This includes all items in your For Trade, Can Craft, Wishlist, and Catalog.",
-                  ~confirmLabel="Remove items",
-                  ~cancelLabel="Never mind",
-                  ~onConfirm=() => UserStore.removeAllItems() |> ignore,
-                  (),
-                )
-              }}
-              className=Styles.deleteLink>
-              {React.string("Remove all items")}
-            </a>
-          </div>
-          <div>
-            <a
-              href="#"
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                ConfirmDialog.confirm(
-                  ~bodyText="Are you sure you want to delete your account? THIS CANNOT BE UNDONE!",
-                  ~confirmLabel="Delete account",
-                  ~cancelLabel="Never mind",
-                  ~onConfirm=() => UserStore.deleteAccount() |> ignore,
-                  (),
-                )
-              }}
-              className=Styles.deleteLink>
-              {React.string("Delete account")}
-            </a>
-          </div>
-        </div>
-      </BodyCard>
-    </div>
-  }
-}
-
-@react.component
-let make = () => {
-  let user = UserStore.useMe()
-  switch user {
-  | Some(user) => <WithUser user />
-  | None => React.null
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/SettingsStore.res b/jscomp/syntax/tests/idempotency/nook-exchange/SettingsStore.res
deleted file mode 100644
index 3f8e0aa..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/SettingsStore.res
+++ /dev/null
@@ -1,119 +0,0 @@
-@deriving(jsConverter)
-type language = [
-  | @as("de") #German
-  | @as("es-eu") #SpanishEurope
-  | @as("es-us") #SpanishAmerica
-  | @as("fr-eu") #FrenchEurope
-  | @as("fr-us") #FrenchAmerica
-  | @as("it") #Italian
-  | @as("ja") #Japanese
-  | @as("ko") #Korean
-  | @as("nl") #Dutch
-  | @as("ru") #Russian
-  | @as("zh-cn") #ChineseSimplified
-  | @as("zh-tw") #ChineseTraditional
-  | @as("en") #English
-  | @as("en-gb") #EnglishEurope
-]
-
-let languages: array<language> = [
-  #English,
-  #EnglishEurope,
-  #SpanishAmerica,
-  #SpanishEurope,
-  #FrenchAmerica,
-  #FrenchEurope,
-  #German,
-  #Italian,
-  #Dutch,
-  #Russian,
-  #Japanese,
-  #Korean,
-  #ChineseTraditional,
-  #ChineseSimplified,
-]
-
-let languageToString = (language: language) =>
-  switch language {
-  | #German => j`Deutsch`
-  | #SpanishEurope => j`Español (Europe)`
-  | #SpanishAmerica => j`Español (America)`
-  | #FrenchEurope => j`Français (Europe)`
-  | #FrenchAmerica => j`Français (America)`
-  | #Italian => j`Italiano`
-  | #Japanese => j`日本語`
-  | #Korean => j`한국어`
-  | #Dutch => j`Nederlands`
-  | #Russian => j`Русский`
-  | #ChineseSimplified => j`中文`
-  | #ChineseTraditional => j`繁體中文`
-  | #English => j`English`
-  | #EnglishEurope => j`English (UK)`
-  }
-
-@val @scope("navigator")
-external browserLanguage: string = "language"
-
-let browserLanguage = if browserLanguage == "de" {
-  #German
-} else if Js.String.toLowerCase(browserLanguage) == "es-es" {
-  #SpanishEurope
-} else if browserLanguage |> Js.String.startsWith("es") {
-  #SpanishAmerica
-} else if Js.String.toLowerCase(browserLanguage) == "fr-ca" {
-  #FrenchAmerica
-} else if browserLanguage |> Js.String.startsWith("fr") {
-  #FrenchEurope
-} else if browserLanguage |> Js.String.startsWith("it") {
-  #Italian
-} else if browserLanguage == "ja" {
-  #Japanese
-} else if browserLanguage == "ko" {
-  #Korean
-} else if browserLanguage == "nl" {
-  #Dutch
-} else if browserLanguage |> Js.String.startsWith("ru") {
-  #Russian
-} else if Js.String.toLowerCase(browserLanguage) == "zh-cn" {
-  #ChineseSimplified
-} else if browserLanguage |> Js.String.startsWith("zh") {
-  #ChineseTraditional
-} else if Js.String.toLowerCase(browserLanguage) == "en-gb" {
-  #EnglishEurope
-} else {
-  #English
-}
-
-type state = {language: language}
-type action = SetLanguage(language)
-
-let localStorageKey = "language"
-let localStorageLanguage = Dom.Storage.localStorage |> Dom.Storage.getItem(localStorageKey)
-
-let api = Restorative.createStore(
-  {
-    language: localStorageLanguage
-    ->Belt.Option.flatMap(languageFromJs)
-    ->Belt.Option.getWithDefault(browserLanguage),
-  },
-  (state, action) =>
-    switch action {
-    | SetLanguage(language) => {language: language}
-    },
-)
-
-let useLanguage = () => api.useStoreWithSelector(state => state.language, ())
-let getLanguage = () => api.getState().language
-
-let setLanguage = (~language) => {
-  api.dispatch(SetLanguage(language))
-  if language == browserLanguage {
-    Dom.Storage.localStorage |> Dom.Storage.removeItem(localStorageKey)
-  } else {
-    Dom.Storage.localStorage |> Dom.Storage.setItem(localStorageKey, languageToJs(language))
-  }
-  Analytics.Amplitude.logEventWithProperties(
-    ~eventName="Language Changed",
-    ~eventProperties={"language": languageToJs(language)},
-  )
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/TemporaryState.res b/jscomp/syntax/tests/idempotency/nook-exchange/TemporaryState.res
deleted file mode 100644
index 7c8cc7d..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/TemporaryState.res
+++ /dev/null
@@ -1,2 +0,0 @@
-type t = FromProfileBrowser
-let state: ref<option<t>> = ref(None)
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/TextPages.res b/jscomp/syntax/tests/idempotency/nook-exchange/TextPages.res
deleted file mode 100644
index cd7ac73..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/TextPages.res
+++ /dev/null
@@ -1,148 +0,0 @@
-module PrivacyPolicy = {
-  let text = `Nook Exchange ("us", "we", or "our") operates nook.exchange (the "Site"). This page informs you of our policies regarding the collection, use and disclosure of Personal Information we receive from users of the Site.
-
-We use your Personal Information only for providing and improving the Site. By using the Site, you agree to the collection and use of information in accordance with this policy.
-
-1. INFORMATION COLLECTION AND USE
-
-While using our Site, we may ask you to provide us with certain personally identifiable information that can be used to contact or identify you. Personally identifiable information may include, but is not limited to your email address ("Personal Information"). We collect your email address should you choose to create an account. While we ask for your birth date at registration to confirm that you are 13 years or older, we do not store this information.
-
-2. LOG DATA
-
-Like many site operators, we collect information that your browser sends whenever you visit our Site ("Log Data").
-
-This Log Data may include information such as your computer's Internet Protocol ("IP") address, browser type, browser version, the pages of our Site that you visit, the time and date of your visit, the time spent on those pages and other statistics.
-
-In addition, we may use third party services such as Google Analytics that collect, monitor and analyze this data.
-
-3. COMMUNICATIONS
-
-We may use your Personal Information to contact you if necessary for assistance with your account, or if we need to send a site-wide notice to all of our users. If we add a newsletter for regular updates in the future, it will be an opt-in service and you will not be subscribed by default.
-
-4. COOKIES
-
-Cookies are files with small amount of data, which may include an anonymous unique identifier. Cookies are sent to your browser from a web site and stored on your computer's hard drive.
-
-Like many sites, we use "cookies" to collect information. You can instruct your browser to refuse all cookies or to indicate when a cookie is being sent. However, if you do not accept cookies, you may not be able to use some portions of our Site. We send a session cookie to users who log in and refusal to accept this cookie will prevent your account from working.
-
-5. SECURITY
-
-The security of your Personal Information is important to us, but remember that no method of transmission over the Internet, or method of electronic storage, is 100% secure. While we strive to use commercially acceptable means to protect your Personal Information, we cannot guarantee its absolute security.
-
-6. CHANGES TO THIS PRIVACY POLICY
-
-This Privacy Policy will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page.
-
-We reserve the right to update or change our Privacy Policy at any time and you should check this Privacy Policy periodically. Your continued use of the Site after we post any modifications to the Privacy Policy on this page will constitute your acknowledgment of the modifications and your consent to abide and be bound by the modified Privacy Policy.
-
-7. CONTACT US
-
-If you have any questions about this Privacy Policy, please contact us at hi"AT"nook.exchange.`
-
-  module Styles = {
-    open Css
-    let root = style(list{
-      padding2(~v=zero, ~h=px(16)),
-      margin3(~top=px(48), ~bottom=px(32), ~h=auto),
-      maxWidth(px(720)),
-    })
-    let body = style(list{whiteSpace(#preLine)})
-  }
-
-  @react.component
-  let make = () =>
-    <div className=Styles.root>
-      <h2> {React.string("Privacy Policy")} </h2>
-      <div className=Styles.body> {React.string(text)} </div>
-    </div>
-}
-
-module TermsOfService = {
-  let text = `
-3. ANTI-SPAM POLICY.
-
-Use of our website in any way deemed to be spam by the administration will result in termination of your account. This includes creating a username or list that encourages users to visit another website or use another service. Attempting to contact other users of this site in any way for purposes deemed to be spam will not be tolerated.
-
-4. MODIFICATIONS AND TERMINATIONS.
-
-These terms and conditions may change from time to time. If such changes are made, they will be effective immediately. If you disagree with changes that have been made to these terms, you should not use this website.
-
-We may terminate these terms and conditions of use for any reason and at any time without notice to you.
-
-If you are concerned about these terms and conditions of use, you should read them each time before you use our website.
-
-5. LICENSEE STATUS.
-
-You understand and agree that your use of our website is limited and non-exclusive as a revocable licensee. We may terminate your license to use our website, and access to our website, for any reason, and without giving you notice.
-
-6. CONTENT OWNERSHIP.
-
-All in-game content on this website is the intellectual property of Nintendo. As a result, we nor you may claim ownership over any lists you create on this website.
-
-7. DISCLAIMERS AND LIMITATIONS OF LIABILITY.
-
-The information on our website is provided on an "as is," "as available" basis. You agree that your use of our website is at your sole risk. We disclaim all warranties of any kind, including but not limited to, any express warranties, statutory warranties, and any implied warranties of merchantability, fitness for a particular purpose, and non-infringement. We do not warrant that our website will always be available, access will be uninterrupted, be error-free, meet your requirements, or that any defects in our website will be corrected.
-
-Information on our website should not necessarily be relied upon and should not to be construed to be professional advice from us. We do not guarantee the accuracy or completeness of any of the information provided, and are not responsible for any loss resulting from your reliance on such information.
-
-If your jurisdiction does not allow limitations on warranties, this limitation may not apply to you. Your sole and exclusive remedy relating to your use of the site shall be to discontinue using the site.
-
-Under no circumstances will we be liable or responsible for any direct, indirect, incidental, consequential (including damages from loss of business, lost profits, litigation, or the like), special, exemplary, punitive, or other damages, under any legal theory, arising out of or in any way relating to our website, your website use, or the content, even if advised of the possibility of such damages.
-
-8. OBSCENE AND OFFENSIVE CONTENT.
-
-We are not responsible for any obscene or offensive content that you receive or view from others while using our website. However, if you do receive or view such content, please contact us by e-mail at hi"AT"nook.exchange. Although we are not obligated to do so, we reserve the right to monitor, investigate, and remove obscene or offensive material posted to our website.
-
-9. INDEMNIFICATION.
-
-You understand and agree that you will indemnify, defend and hold us and our affiliates harmless from any liability, loss, claim and expense, including reasonable attorney's fees, arising from your use of our website or your violation of these terms and conditions.
-
-10. COMPLIANCE WITH GOVERNING LAW AND DISPUTE RESOLUTION.
-
-You agree to obey all applicable laws while using our website.
-
-11. SEVERABILITY OF THESE TERMS AND CONDITIONS.
-
-If any part of these terms and conditions of use are determined by a court of competent jurisdiction to be invalid or unenforceable, that part shall be limited or eliminated to the minimum extent necessary so that the remainder of these terms and conditions are fully enforceable and legally binding.
-
-12. HOW TO CONTACT US.
-
-Any questions or concerns about these terms and conditions of use should be brought to our attention by e-mail to hi"AT"nook.exchange. and providing us with information relating to your concern.
-
-13. ENTIRE AGREEMENT.
-
-These terms and conditions, including the policies incorporated herein by express reference, constitutes your entire agreement with us with respect to your use of our website.`
-
-  module Styles = {
-    open Css
-    let root = style(list{
-      padding2(~v=zero, ~h=px(16)),
-      margin3(~top=px(48), ~bottom=px(32), ~h=auto),
-      maxWidth(px(720)),
-    })
-    let body = style(list{whiteSpace(#preLine)})
-  }
-
-  @react.component
-  let make = () =>
-    <div className=Styles.root>
-      <h2> {React.string("Terms of Service")} </h2>
-      <div className=Styles.body>
-        {React.string(`1. INTRODUCTION AND ACCEPTING THE TERMS
-
-Welcome to Nook Exchange! These Terms of Service ("Terms"), which include and hereby incorporate the Privacy Policy, Nook Exchange ("us", "our", or "we") and you ("you" or "your"). By using or accessing the website located at https://nook.exchange, you agree (i) that you are 13 years of age or older, (ii) if you are the age of majority in your jurisdiction or over, that you have read, understood, and accept to be bound by the Terms, and (iii) if you are between 13 and the age of majority in your jurisdiction, that your legal guardian has reviewed and agrees to these Terms.
-
-2. PRIVACY POLICY IS PART OF THESE TERMS AND CONDITIONS.
-
-`)}
-      </div>
-      <div>
-        {React.string(
-          "Our privacy policy is part of, and subject to, these terms and conditions of use. You may view our privacy policy on this website ",
-        )}
-        <a href="/privacy-policy"> {React.string("here")} </a>
-        {React.string(".")}
-      </div>
-      <div className=Styles.body> {React.string(text)} </div>
-    </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/User.res b/jscomp/syntax/tests/idempotency/nook-exchange/User.res
deleted file mode 100644
index 3cc9dd3..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/User.res
+++ /dev/null
@@ -1,125 +0,0 @@
-@deriving(jsConverter)
-type itemStatus =
-  | @as(1) Wishlist
-  | @as(2) ForTrade
-  | @as(3) CanCraft
-  | @as(4) CatalogOnly
-
-let itemStatusToEmoji = itemStatus =>
-  switch itemStatus {
-  | Wishlist => j`🙏`
-  | ForTrade => j`🤝`
-  | CanCraft => j`🔨`
-  | CatalogOnly => j`📖`
-  }
-let itemStatusToString = itemStatus =>
-  switch itemStatus {
-  | Wishlist => "Wishlist"
-  | ForTrade => "For Trade"
-  | CanCraft => "Can Craft"
-  | CatalogOnly => "Catalog"
-  }
-
-type item = {
-  status: itemStatus,
-  note: string,
-  timeUpdated: option<float>,
-  priorityTimestamp: option<float>,
-}
-
-let itemToJson = (item: item) => {
-  open Json.Encode
-  object_(
-    list{
-      Some(("status", int(itemStatusToJs(item.status)))),
-      item.note != "" ? Some(("note", string(item.note))) : None,
-    }->Belt.List.keepMap(x => x),
-  )
-}
-
-let itemFromJson = json => {
-  open Json.Decode
-  let status = (json |> field("status", int))->itemStatusFromJs
-  Belt.Option.map(status, status => {
-    status: status,
-    note: (json |> optional(field("note", string)))->Belt.Option.getWithDefault(""),
-    timeUpdated: json |> optional(field("t", Json.Decode.float)),
-    priorityTimestamp: json |> optional(field("p", Json.Decode.float)),
-  })
-}
-
-let getItemKey = (~itemId: int, ~variation: int) =>
-  string_of_int(itemId) ++ ("@@" ++ string_of_int(variation))
-
-let fromItemKey = (~key: string) => {
-  let [itemId, variation] = key |> Js.String.split("@@")
-  let itemId = if itemId |> Js.String.endsWith("r") {
-    Item.itemMap
-    ->Js.Dict.get(itemId |> Js.String.slice(~from=0, ~to_=Js.String.length(itemId) - 1))
-    ->Belt.Option.flatMap(item =>
-      switch item.type_ {
-      | Item(recipeId) => recipeId
-      | Recipe(_) => None
-      }
-    )
-  } else {
-    int_of_string_opt(itemId)
-  }
-  itemId->Belt.Option.map(itemId => (itemId, int_of_string(variation)))
-}
-
-type t = {
-  id: string,
-  username: string,
-  email: option<string>,
-  items: Js.Dict.t<item>,
-  profileText: string,
-  enableCatalogCheckbox: bool,
-  followeeIds: option<array<string>>,
-  discordId: option<string>,
-}
-
-let fromAPI = (json: Js.Json.t) => {
-  open Json.Decode
-  {
-    id: json |> oneOf(list{field("id", string), field("uuid", string)}),
-    username: json |> field("username", string),
-    email: switch json |> optional(field("email", string)) {
-    | Some("") => None
-    | Some(email) => Some(email)
-    | None => None
-    },
-    items: (json |> field("items", dict(itemFromJson)))
-    ->Js.Dict.entries
-    ->Belt.Array.keepMap(((itemKey, value)) =>
-      Belt.Option.flatMap(value, value =>
-        fromItemKey(~key=itemKey)
-        ->Belt.Option.flatMap(((itemId, variant)) =>
-          Item.itemMap->Js.Dict.get(string_of_int(itemId))->Belt.Option.map(item => (item, variant))
-        )
-        ->Belt.Option.map(((item, variant)) => {
-          let canonicalVariant = Item.getCanonicalVariant(~item, ~variant)
-          (getItemKey(~itemId=item.id, ~variation=canonicalVariant), value)
-        })
-      )
-    )
-    ->Js.Dict.fromArray,
-    profileText: json |> oneOf(list{
-      field("profileText", string),
-      field("metadata", json =>
-        (json |> optional(field("profileText", string)))->Belt.Option.getWithDefault("")
-      ),
-      _ => "",
-    }),
-    enableCatalogCheckbox: json |> oneOf(list{
-      field("settings", json =>
-        (json |> optional(field("enableCatalog", bool)))->Belt.Option.getWithDefault(false)
-      ),
-      field("metadata", json =>
-        (json |> optional(field("enableCatalogCheckbox", bool)))->Belt.Option.getWithDefault(false)
-      ),
-    }),
-    followeeIds: json |> optional(field("followeeIds", array(string))),
-    discordId: json |> optional(field("discordId", string)),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/UserItemCard.res b/jscomp/syntax/tests/idempotency/nook-exchange/UserItemCard.res
deleted file mode 100644
index 8baf084..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/UserItemCard.res
+++ /dev/null
@@ -1,290 +0,0 @@
-module Styles = {
-  open Css
-  let metaIcons = style(list{position(absolute), top(px(5)), left(px(7)), display(flexBox)})
-  let metaIcon = style(list{opacity(0.), transition(~duration=200, "all")})
-  let topRightIcon = style(list{
-    position(absolute),
-    top(px(5)),
-    right(px(8)),
-    fontSize(px(13)),
-    boxSizing(borderBox),
-    cursor(#default),
-    padding2(~v=zero, ~h=px(2)),
-    height(px(24)),
-    display(flexBox),
-    alignItems(center),
-    opacity(0.8),
-    transition(~duration=200, "all"),
-    hover(list{opacity(1.)}),
-  })
-  let ellipsisButton = style(list{position(absolute), top(px(8)), right(px(8))})
-  let catalogStatusButton = style(list{
-    fontSize(px(13)),
-    opacity(0.5),
-    cursor(#default),
-    padding2(~v=zero, ~h=px(1)),
-    transition(~duration=200, "all"),
-  })
-  let nameLink = style(list{
-    color(Colors.charcoal),
-    textDecoration(none),
-    media("(hover: hover)", list{hover(list{textDecoration(underline)})}),
-  })
-  let card = style(list{
-    backgroundColor(hex("fffffff0")),
-    borderRadius(px(8)),
-    display(flexBox),
-    flexDirection(column),
-    alignItems(center),
-    marginRight(px(16)),
-    marginBottom(px(16)),
-    padding3(~top=px(24), ~bottom=px(8), ~h=px(8)),
-    position(relative),
-    boxSizing(borderBox),
-    width({
-      open Calc
-      pct(50.) - px(16)
-    }),
-    transition(~duration=200, "all"),
-    media("(min-width: 660px)", list{width(px(176))}),
-    media(
-      "(hover: hover)",
-      list{
-        children(list{transition(~duration=200, "opacity")}),
-        hover(list{
-          selector("& ." ++ metaIcon, list{opacity(1.)}),
-          selector("& ." ++ topRightIcon, list{opacity(1.)}),
-          selector("& ." ++ catalogStatusButton, list{opacity(1.)}),
-          selector("& ." ++ ItemImage.Styles.variantButton, list{opacity(0.5)}),
-        }),
-      },
-    ),
-  })
-  let cardOnCatalogPage = style(list{paddingBottom(px(16))})
-  let cardWithoutTopRow = style(list{paddingTop(px(8))})
-  let itemImage = style(list{marginLeft(px(-8)), marginRight(px(-8))})
-  let name = style(list{fontSize(px(16)), marginBottom(px(4)), textAlign(center)})
-  let userItemNote = style(list{marginTop(px(8))})
-  let userNote = style(list{
-    borderTop(px(1), solid, hex("f0f0f0")),
-    unsafe("alignSelf", "stretch"),
-    lineHeight(px(18)),
-    marginTop(px(4)),
-    padding3(~top=px(8), ~bottom=zero, ~h=px(4)),
-  })
-  let removeButton = style(list{
-    position(absolute),
-    top(px(10)),
-    right(px(10)),
-    selector("." ++ (card ++ ":hover &"), list{opacity(0.8)}),
-  })
-  let recipe = style(list{marginTop(px(6)), textAlign(center), fontSize(px(12))})
-  let cardViewerMatch = style(list{boxShadow(Shadow.box(~spread=px(2), Colors.green))})
-  let cardHasQuicklist = style(list{
-    boxShadow(none),
-    selector("& ." ++ metaIcons, list{display(none)}),
-    media(
-      "(hover: hover)",
-      list{children(list{opacity(0.5)}), hover(list{children(list{opacity(1.)})})},
-    ),
-  })
-  let cardQuicklistSelected = style(list{
-    important(boxShadow(Shadow.box(~spread=px(2), Colors.green))),
-    children(list{opacity(1.)}),
-  })
-  let quicklistButton = style(list{position(absolute), top(px(6)), left(px(6))})
-}
-
-module StarIcon = {
-  module Styles = {
-    open Css
-    let icon = style(list{
-      padding2(~v=zero, ~h=px(2)),
-      display(flexBox),
-      alignItems(center),
-      height(px(24)),
-      fontSize(px(12)),
-      cursor(#default),
-    })
-  }
-
-  @react.component
-  let make = () => <div className=Styles.icon> {React.string(j`⭐️`)} </div>
-}
-
-@react.component
-let make = (
-  ~itemId,
-  ~variation,
-  ~userItem: option<User.item>=?,
-  ~list: option<ViewingList.t>=?,
-  ~editable,
-  ~showRecipe,
-  ~showMetaIcons=true,
-  ~onCatalogPage=false,
-  ~customTopLeft=?,
-  ~className=?,
-  (),
-) => {
-  let item = Item.getItem(~itemId)
-  let viewerItem = UserStore.useItem(~itemId, ~variation)
-  let hasQuicklist = QuicklistStore.useHasQuicklist()
-  let isInQuicklist = QuicklistStore.useItemState(~itemId, ~variant=variation)
-
-  let isViewerMatch = switch viewerItem {
-  | Some(viewerItem) =>
-    switch (list, viewerItem.status) {
-    | (Some(ForTrade), Wishlist)
-    | (Some(CanCraft), Wishlist)
-    | (Some(Wishlist), ForTrade)
-    | (Some(Wishlist), CanCraft) => true
-    | (Some(Catalog), Wishlist)
-    | (Some(Wishlist), CatalogOnly) =>
-      item.orderable
-    | _ => false
-    }
-  | None => false
-  }
-
-  <div
-    className={Cn.make(list{
-      Styles.card,
-      Cn.ifTrue(Styles.cardWithoutTopRow, !showMetaIcons),
-      Cn.ifTrue(Styles.cardOnCatalogPage, onCatalogPage),
-      Cn.ifTrue(Styles.cardHasQuicklist, hasQuicklist),
-      Cn.ifTrue(Styles.cardQuicklistSelected, isInQuicklist),
-      Cn.ifTrue(Styles.cardViewerMatch, isViewerMatch),
-      Cn.unpack(className),
-    })}>
-    <div className=ItemCard.Styles.body>
-      <ItemImage
-        item
-        variant=variation
-        forceTooltip=true
-        narrow=true
-        className={Cn.make(list{ItemCard.Styles.itemImage, Styles.itemImage})}
-      />
-      <div className=Styles.name>
-        <Link
-          path={Utils.getItemDetailUrl(
-            ~itemId=item.id,
-            ~variant=variation != 0 ? Some(variation) : None,
-          )}
-          className=Styles.nameLink>
-          {React.string(Item.getName(item))}
-        </Link>
-      </div>
-      {switch (showRecipe, item.recipe) {
-      | (true, Some(recipe)) =>
-        <div className=Styles.recipe>
-          {recipe
-          ->Belt.Array.map(((itemId, quantity)) =>
-            <div key=itemId> {React.string(itemId ++ (" x " ++ string_of_int(quantity)))} </div>
-          )
-          ->React.array}
-        </div>
-      | _ => React.null
-      }}
-    </div>
-    {showMetaIcons
-      ? switch customTopLeft {
-        | None =>
-          <div className=Styles.metaIcons>
-            {if Belt.Option.flatMap(userItem, userItem => userItem.priorityTimestamp) !== None {
-              <StarIcon />
-            } else {
-              React.null
-            }}
-            {switch (onCatalogPage, list, Belt.Option.map(userItem, userItem => userItem.status)) {
-            | (true, _, Some(CanCraft) as userItemStatus)
-            | (true, _, Some(ForTrade) as userItemStatus)
-            | (false, Some(Catalog), Some(CanCraft) as userItemStatus)
-            | (false, Some(Catalog), Some(ForTrade) as userItemStatus) =>
-              <ReactAtmosphere.Tooltip
-                text={React.string(userItemStatus == Some(ForTrade) ? "For Trade" : "Can Craft")}
-                options={Obj.magic({"modifiers": None})}>
-                {({onMouseEnter, onMouseLeave, onFocus, onBlur, ref}) =>
-                  <div
-                    onMouseEnter
-                    onMouseLeave
-                    onFocus
-                    onBlur
-                    className=Styles.catalogStatusButton
-                    ref={ReactDOMRe.Ref.domRef(ref)}>
-                    {React.string(userItemStatus == Some(ForTrade) ? j`🤝` : j`🔨`)}
-                  </div>}
-              </ReactAtmosphere.Tooltip>
-            | _ => React.null
-            }}
-            {switch (onCatalogPage, item.recipe) {
-            | (false, Some(recipe)) => <ItemCard.RecipeIcon recipe className=Styles.metaIcon />
-            | _ => React.null
-            }}
-            {if !onCatalogPage && item.orderable {
-              <ItemCard.OrderableIcon className=Styles.metaIcon />
-            } else {
-              React.null
-            }}
-          </div>
-        | Some(customTopLeft) => customTopLeft
-        }
-      : React.null}
-    {editable
-      ? <>
-          {switch userItem {
-          | Some(userItem) =>
-            <UserItemNote
-              itemId=item.id
-              variation
-              userItem
-              className=Styles.userItemNote
-              key={string_of_int(variation)}
-            />
-          | _ => React.null
-          }}
-          <UserItemEllipsisButton
-            item userItem={Belt.Option.getExn(userItem)} variation className=Styles.ellipsisButton
-          />
-        </>
-      : <>
-          {switch userItem {
-          | Some(userItem) =>
-            if userItem.note->Js.String.length > 0 {
-              <div className=Styles.userNote> {Emoji.parseText(userItem.note)} </div>
-            } else {
-              React.null
-            }
-          | None => React.null
-          }}
-          {switch viewerItem {
-          | Some(viewerItem) =>
-            switch (list, viewerItem.status, item.orderable) {
-            | (Some(Catalog), Wishlist, true)
-            | (Some(ForTrade), Wishlist, _)
-            | (Some(CanCraft), Wishlist, _)
-            | (Some(Wishlist), ForTrade, _)
-            | (Some(Wishlist), CanCraft, _)
-            | (Some(Wishlist), CatalogOnly, true) =>
-              <ReactAtmosphere.Tooltip
-                text={React.string("In your " ++ User.itemStatusToString(viewerItem.status))}>
-                {({onMouseEnter, onMouseLeave, ref}) =>
-                  <div
-                    onMouseEnter
-                    onMouseLeave
-                    className={Cn.make(list{Styles.topRightIcon})}
-                    ref={ReactDOMRe.Ref.domRef(ref)}>
-                    {React.string(User.itemStatusToEmoji(viewerItem.status))}
-                  </div>}
-              </ReactAtmosphere.Tooltip>
-            | _ => React.null
-            }
-          | None => React.null
-          }}
-        </>}
-    {hasQuicklist
-      ? <QuicklistButton
-          itemId variant=variation selected=isInQuicklist className=Styles.quicklistButton
-        />
-      : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/UserItemEllipsisButton.res b/jscomp/syntax/tests/idempotency/nook-exchange/UserItemEllipsisButton.res
deleted file mode 100644
index 125ae04..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/UserItemEllipsisButton.res
+++ /dev/null
@@ -1,154 +0,0 @@
-module Styles = {
-  open Css
-  let recipe = style(list{marginTop(px(6)), textAlign(center), fontSize(px(12))})
-  @module("../assets/dotdotdot.png")
-  external dotdotdotIcon: string = "default"
-  let ellipsisButton = style(list{
-    width(px(19)),
-    height(px(19)),
-    backgroundColor(Colors.white),
-    backgroundImage(url(dotdotdotIcon)),
-    backgroundSize(cover),
-    borderWidth(zero),
-    cursor(pointer),
-    padding(zero),
-    outlineStyle(none),
-    opacity(0.5),
-    transition(~duration=200, "all"),
-    hover(list{important(opacity(1.))}),
-  })
-  let ellipsisButtonOpen = style(list{opacity(1.)})
-  let menu = style(list{
-    backgroundColor(Colors.white),
-    borderRadius(px(8)),
-    padding2(~v=px(6), ~h=zero),
-    overflow(hidden),
-    Colors.darkLayerShadow,
-  })
-  let menuItem = style(list{
-    backgroundColor(Colors.white),
-    borderWidth(zero),
-    display(block),
-    width(pct(100.)),
-    textAlign(#left),
-    cursor(pointer),
-    padding2(~v=px(4), ~h=px(12)),
-    hover(list{backgroundColor(Colors.faintGray)}),
-  })
-  let menuItemStar = style(list{
-    marginLeft(px(6)),
-    fontSize(px(10)),
-    position(relative),
-    top(px(-1)),
-  })
-  let menuItemRemove = style(list{color(Colors.red)})
-}
-
-@react.component
-let make = (~item: Item.t, ~userItem: User.item, ~variation, ~className) => {
-  let me = UserStore.useMe()->Belt.Option.getExn
-  let ellipsisButtonRef = React.useRef(Js.Nullable.null)
-  let (showEllipsisMenu, setShowEllipsisMenu) = React.useState(() => false)
-
-  <>
-    <button
-      className={Cn.make(list{
-        Styles.ellipsisButton,
-        Cn.ifTrue(Styles.ellipsisButtonOpen, showEllipsisMenu),
-        className,
-      })}
-      onClick={_ => setShowEllipsisMenu(show => !show)}
-      ref={ReactDOMRe.Ref.domRef(ellipsisButtonRef)}
-    />
-    {showEllipsisMenu
-      ? <ReactAtmosphere.PopperLayer
-          reference=ellipsisButtonRef
-          onOutsideClick={() => setShowEllipsisMenu(_ => false)}
-          options={
-            placement: Some("bottom"),
-            modifiers: Some([
-              {
-                "name": "offset",
-                "options": {
-                  "offset": [0, 4],
-                },
-              },
-            ]),
-          }
-          render={_renderArgs =>
-            <div className=Styles.menu>
-              <button
-                onClick={_ => {
-                  UserStore.setItemPriority(
-                    ~itemId=item.id,
-                    ~variant=variation,
-                    ~isPriority=userItem.priorityTimestamp == None,
-                  )
-                  setShowEllipsisMenu(_ => false)
-                }}
-                className=Styles.menuItem>
-                {if userItem.priorityTimestamp != None {
-                  React.string("Remove star")
-                } else {
-                  <>
-                    {React.string("Move to front")}
-                    <span className=Styles.menuItemStar> {React.string(j`⭐️`)} </span>
-                  </>
-                }}
-              </button>
-              {switch userItem.status {
-              | CatalogOnly
-              | Wishlist => <>
-                  <button
-                    onClick={_ =>
-                      UserStore.setItemStatus(~itemId=item.id, ~variation, ~status=ForTrade)}
-                    className=Styles.menuItem>
-                    {React.string("Move to For Trade")}
-                  </button>
-                  {item.recipe !== None
-                    ? <button
-                        onClick={_ =>
-                          if Item.isRecipe(~item) {
-                            UserStore.setItemStatus(
-                              ~itemId=Item.getItemIdForRecipe(~recipe=item),
-                              ~variation=0,
-                              ~status=CanCraft,
-                            )
-                            UserStore.removeItem(~itemId=item.id, ~variation)
-                          } else {
-                            UserStore.setItemStatus(~itemId=item.id, ~variation, ~status=CanCraft)
-                          }}
-                        className=Styles.menuItem>
-                        {React.string("Move to Can Craft")}
-                      </button>
-                    : React.null}
-                </>
-              | _ => React.null
-              }}
-              {switch userItem.status {
-              | ForTrade
-              | Wishlist =>
-                <button
-                  onClick={_ =>
-                    UserStore.setItemStatus(~itemId=item.id, ~variation, ~status=CatalogOnly)}
-                  className=Styles.menuItem>
-                  {React.string(
-                    userItem.status == ForTrade
-                      ? "Move to Catalog Only"
-                      : Item.isRecipe(~item)
-                      ? "Move DIY to Catalog"
-                      : "Move to Catalog",
-                  )}
-                </button>
-              | _ => React.null
-              }}
-              <button
-                onClick={_ => UserStore.removeItem(~itemId=item.id, ~variation)}
-                className={Cn.make(list{Styles.menuItem, Styles.menuItemRemove})}>
-                {React.string("Remove")}
-              </button>
-            </div>}
-        />
-      : React.null}
-  </>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/UserItemNote.res b/jscomp/syntax/tests/idempotency/nook-exchange/UserItemNote.res
deleted file mode 100644
index 41f6295..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/UserItemNote.res
+++ /dev/null
@@ -1,66 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{unsafe("alignSelf", "stretch")})
-  let textarea = style(list{
-    backgroundColor(rgba(0, 0, 0, 0.03)),
-    border(px(1), solid, transparent),
-    borderRadius(px(4)),
-    padding(px(8)),
-    height(px(36)),
-    boxSizing(borderBox),
-    outlineStyle(none),
-    fontSize(px(14)),
-    width(pct(100.)),
-    transition(~duration=200, "all"),
-    width(pct(100.)),
-    placeholder(list{opacity(0.5)}),
-    focus(list{backgroundColor(Colors.white), borderColor(rgba(0, 0, 0, 0.1))}),
-  })
-  let updateBar = style(list{display(flexBox), justifyContent(spaceBetween), alignItems(center)})
-  let cancelLink = style(list{
-    opacity(0.8),
-    textDecoration(none),
-    marginLeft(px(8)),
-    hover(list{opacity(1.), textDecoration(underline)}),
-  })
-}
-
-@react.component
-let make = (~itemId, ~variation, ~userItem: User.item, ~className=?, ()) => {
-  let (userItemNote, setUserItemNote) = React.useState(() => userItem.note)
-
-  React.useEffect1(() => {
-    setUserItemNote(_ => userItem.note)
-    None
-  }, [userItem.note])
-
-  <div className={Cn.make(list{Styles.root, Cn.unpack(className)})}>
-    <textarea
-      value=userItemNote
-      placeholder="Add a note"
-      className=Styles.textarea
-      onChange={e => {
-        let value = ReactEvent.Form.target(e)["value"]
-        setUserItemNote(_ => value)
-      }}
-    />
-    {userItem.note != userItemNote
-      ? <div className=Styles.updateBar>
-          <Button
-            small=true
-            onClick={_ => UserStore.setItemNote(~itemId, ~variation, ~note=userItemNote)}>
-            {React.string("Save")}
-          </Button>
-          <a
-            href="#"
-            onClick={e => {
-              setUserItemNote(_ => userItem.note)
-              ReactEvent.Mouse.preventDefault(e)
-            }}
-            className=Styles.cancelLink>
-            {React.string("Cancel")}
-          </a>
-        </div>
-      : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/UserListBrowser.res b/jscomp/syntax/tests/idempotency/nook-exchange/UserListBrowser.res
deleted file mode 100644
index 0fff959..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/UserListBrowser.res
+++ /dev/null
@@ -1,535 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{
-    borderRadius(px(16)),
-    margin2(~v=zero, ~h=auto),
-    overflow(hidden),
-    media("(min-width: 640px)", list{width(px(624))}),
-    media("(min-width: 860px)", list{width(px(816))}),
-    media("(min-width: 1040px)", list{width(px(1008))}),
-    media("(min-width: 1240px)", list{width(px(1200))}),
-    media("(min-width: 1440px)", list{width(px(1392))}),
-    media("(max-width: 640px)", list{width(auto), borderRadius(zero)}),
-  })
-  let body = style(list{
-    padding(px(32)),
-    backgroundColor(hex("b0dec1c0")),
-    position(relative),
-    media("(max-width: 640px)", list{padding(px(16))}),
-  })
-  let listLinks = style(list{
-    backgroundColor(hex("ffffff80")),
-    media("(max-width: 640px)", list{overflowX(auto)}),
-  })
-  let listLinksContent = style(list{
-    display(flexBox),
-    alignItems(center),
-    padding3(~top=px(18), ~bottom=px(16), ~h=px(32)),
-    media(
-      "(max-width: 640px)",
-      list{paddingLeft(px(16)), paddingRight(px(16)), whiteSpace(nowrap)},
-    ),
-  })
-  let profileLink = style(list{
-    color(Colors.charcoal),
-    display(inlineBlock),
-    fontSize(px(20)),
-    textDecoration(none),
-    opacity(0.8),
-    hover(list{opacity(1.)}),
-    media("(max-width: 860px)", list{display(none)}),
-  })
-  let profileLinkIcon = style(list{
-    flexShrink(0.),
-    margin2(~v=zero, ~h=px(8)),
-    top(zero),
-    media("(max-width: 860px)", list{display(none)}),
-  })
-  let listLinkEmoji = style(list{
-    display(inlineBlock),
-    lineHeight(zero),
-    marginRight(px(6)),
-    position(relative),
-    top(px(2)),
-    media("(max-width: 460px)", list{display(none)}),
-  })
-  let listLinkName = "listLinkName"
-  let listLinkSelectedName = style(list{borderBottom(px(2), solid, Colors.charcoal)})
-  let listLink = style(list{
-    color(Colors.charcoal),
-    display(inlineBlock),
-    fontSize(px(20)),
-    textDecoration(none),
-    marginRight(px(28)),
-    media("(max-width: 640px)", list{fontSize(px(16))}),
-    media("(max-width: 370px)", list{marginRight(px(16))}),
-    lastChild(list{marginRight(zero)}),
-    hover(list{selector("& ." ++ listLinkName, list{borderBottom(px(2), solid, Colors.charcoal)})}),
-  })
-  let rootMini = style(list{important(backgroundColor(hex("fffffff0")))})
-  let catalogNotice = style(list{
-    lineHeight(px(18)),
-    marginBottom(px(24)),
-    media("(max-width: 640px)", list{marginBottom(px(16))}),
-  })
-  let filterBar = style(list{marginBottom(zero)})
-  let topPager = style(list{marginBottom(px(8)), media("(max-width: 640px)", list{display(none)})})
-  let sectionToggles = style(list{
-    display(flexBox),
-    position(static),
-    textAlign(center),
-    marginTop(px(8)),
-    media(
-      "(min-width: 1040px)",
-      list{position(absolute), right(px(32)), top(px(-40)), marginTop(zero)},
-    ),
-    media("(max-width: 470px)", list{marginBottom(px(16))}),
-  })
-  let bottomBar = style(list{display(flexBox), alignItems(center), justifyContent(spaceBetween)})
-}
-
-let getUrl = (~url: ReasonReactRouter.url, ~urlSearchParams: Webapi.Url.URLSearchParams.t) =>
-  Utils.getPath(~url) ++
-  switch Webapi.Url.URLSearchParams.toString(urlSearchParams) {
-  | "" => ""
-  | search => "?" ++ search
-  }
-
-let getNumResultsPerPage = (~viewportWidth) =>
-  if viewportWidth >= 1440 {
-    49
-  } else if viewportWidth >= 1240 {
-    42
-  } else if viewportWidth >= 1040 {
-    35
-  } else if viewportWidth >= 860 {
-    28
-  } else if viewportWidth >= 640 {
-    21
-  } else {
-    20
-  }
-
-let userItemsHasOneWithStatus = (~userItems, ~status) =>
-  userItems->Js.Dict.values->Belt.Array.someU((. item: User.item) => item.status == status)
-
-module BulkActions = {
-  module Styles = {
-    open Css
-    let bulkActionsLink = style(list{textDecoration(none), hover(list{textDecoration(underline)})})
-    let note = style(list{color(Colors.gray), marginBottom(px(8))})
-    let bulkActionsButtons = style(list{
-      display(flexBox),
-      flexDirection(column),
-      padding(px(16)),
-      backgroundColor(Colors.white),
-      borderRadius(px(8)),
-      Colors.darkLayerShadow,
-      selector(
-        "& > a",
-        list{
-          display(inlineBlock),
-          marginBottom(px(4)),
-          textDecoration(none),
-          lastChild(list{marginBottom(zero)}),
-          hover(list{textDecoration(underline)}),
-        },
-      ),
-    })
-  }
-
-  @react.component
-  let make = (~filteredItems, ~list: ViewingList.t) => {
-    let (showPopup, setShowPopup) = React.useState(() => false)
-    let reference = React.useRef(Js.Nullable.null)
-
-    <>
-      <a
-        href="#"
-        onClick={e => {
-          ReactEvent.Mouse.preventDefault(e)
-          setShowPopup(show => !show)
-        }}
-        className=Styles.bulkActionsLink
-        ref={ReactDOMRe.Ref.domRef(reference)}>
-        {React.string("Bulk Actions")}
-      </a>
-      {showPopup
-        ? <ReactAtmosphere.PopperLayer
-            reference
-            onOutsideClick={() => setShowPopup(_ => false)}
-            options={
-              placement: Some("top-start"),
-              modifiers: Some([
-                {
-                  "name": "offset",
-                  "options": {
-                    "offset": [-16, 8],
-                  },
-                },
-              ]),
-            }
-            render={_ => {
-              let numItems = Js.Array.length(filteredItems)
-              let itemsString = string_of_int(numItems) ++ (" item" ++ (numItems !== 1 ? "s" : ""))
-              <div className=Styles.bulkActionsButtons>
-                <div className=Styles.note>
-                  {React.string("These actions operate on this filtered list.")}
-                </div>
-                {switch list {
-                | Wishlist
-                | ForTrade =>
-                  <a
-                    href="#"
-                    onClick={e => {
-                      ReactEvent.Mouse.preventDefault(e)
-                      ConfirmDialog.confirm(
-                        ~bodyText="Are you sure you want to move these " ++
-                        (itemsString ++
-                        " to your Catalog?"),
-                        ~confirmLabel="Move items",
-                        ~cancelLabel="Never mind",
-                        ~onConfirm=() =>
-                          UserStore.setItemStatusBatch(
-                            ~items=filteredItems->Belt.Array.map(((item, _)) => item),
-                            ~status=CatalogOnly,
-                          ),
-                        (),
-                      )
-                      setShowPopup(_ => false)
-                    }}>
-                    {React.string("Move " ++ (itemsString ++ " to Catalog"))}
-                  </a>
-                | _ => React.null
-                }}
-                {switch list {
-                | Catalog
-                | Wishlist =>
-                  <a
-                    href="#"
-                    onClick={e => {
-                      ReactEvent.Mouse.preventDefault(e)
-                      ConfirmDialog.confirm(
-                        ~bodyText="Are you sure you want to move these " ++
-                        (itemsString ++
-                        " to your For Trade?"),
-                        ~confirmLabel="Move items",
-                        ~cancelLabel="Never mind",
-                        ~onConfirm=() =>
-                          UserStore.setItemStatusBatch(
-                            ~items=filteredItems->Belt.Array.map(((item, _)) => item),
-                            ~status=ForTrade,
-                          ),
-                        (),
-                      )
-                      setShowPopup(_ => false)
-                    }}>
-                    {React.string("Move " ++ (itemsString ++ " to For Trade"))}
-                  </a>
-                | _ => React.null
-                }}
-                <a
-                  href="#"
-                  onClick={e => {
-                    ReactEvent.Mouse.preventDefault(e)
-                    ConfirmDialog.confirm(
-                      ~bodyText="Are you sure you want to remove these " ++ (itemsString ++ "?"),
-                      ~confirmLabel="Remove items",
-                      ~cancelLabel="Never mind",
-                      ~onConfirm=() =>
-                        UserStore.removeItems(
-                          ~items=filteredItems->Belt.Array.map(((item, _)) => item),
-                        ),
-                      (),
-                    )
-                    setShowPopup(_ => false)
-                  }}>
-                  {React.string("Remove " ++ itemsString)}
-                </a>
-              </div>
-            }}
-          />
-        : React.null}
-    </>
-  }
-}
-
-@react.component
-let make = (~user: User.t, ~list: ViewingList.t, ~url: ReasonReactRouter.url, ~me=false, ()) => {
-  let viewportWidth = Utils.useViewportWidth()
-  let numResultsPerPage = getNumResultsPerPage(~viewportWidth)
-  let hasForTrade = React.useMemo1(
-    () => userItemsHasOneWithStatus(~userItems=user.items, ~status=ForTrade),
-    [user],
-  )
-  let hasCanCraft = React.useMemo1(
-    () => userItemsHasOneWithStatus(~userItems=user.items, ~status=CanCraft),
-    [user],
-  )
-  let hasWishlist = React.useMemo1(
-    () => userItemsHasOneWithStatus(~userItems=user.items, ~status=Wishlist),
-    [user],
-  )
-  let hasCatalogOnly = React.useMemo1(
-    () => userItemsHasOneWithStatus(~userItems=user.items, ~status=CatalogOnly),
-    [user],
-  )
-  let userItems = React.useMemo2(
-    () =>
-      user.items
-      ->Js.Dict.entries
-      ->Belt.Array.keepMapU((. (itemKey, item: User.item)) =>
-        ViewingList.doesUserItemStatusMatchViewingList(item.status, list)
-          ? User.fromItemKey(~key=itemKey)->Belt.Option.map(x => (x, item))
-          : None
-      ),
-    (user, list),
-  )
-  let userItemIds = userItems->Belt.Array.mapU((. ((itemId, _variant), _)) => itemId)
-
-  let url = ReasonReactRouter.useUrl()
-  let showMini = {
-    open Webapi.Url.URLSearchParams
-    make(url.search) |> has("thumbnails")
-  }
-  let (showRecipes, setShowRecipes) = React.useState(() => false)
-  let (filters, pageOffset) = React.useMemo1(
-    () => ItemFilters.fromUrlSearch(~urlSearch=url.search, ~defaultSort=UserDefault),
-    [url.search],
-  )
-  let numFiltersChangeLogged = React.useRef(0)
-  let setFilters = (filters: ItemFilters.t) => {
-    let urlSearchParams = Webapi.Url.URLSearchParams.makeWithArray(
-      ItemFilters.serialize(~filters, ~defaultSort=UserDefault, ~pageOffset=0),
-    )
-    if showMini {
-      urlSearchParams |> Webapi.Url.URLSearchParams.append("thumbnails", "")
-    }
-    let url = ReasonReactRouter.dangerouslyGetInitialUrl()
-    let newUrl = getUrl(~url, ~urlSearchParams)
-    ReasonReactRouter.push(newUrl)
-    if React.Ref.current(numFiltersChangeLogged) < 2 {
-      Analytics.Amplitude.logEventWithProperties(
-        ~eventName="Filters Changed",
-        ~eventProperties={
-          "filterText": filters.text,
-          "filterMask": filters.mask,
-          "filterCategory": filters.category,
-          "filterSort": filters.sort,
-        },
-      )
-      React.Ref.setCurrent(numFiltersChangeLogged, React.Ref.current(numFiltersChangeLogged) + 1)
-    }
-  }
-  let setPageOffset = f => {
-    let nextPageOffset = f(pageOffset)
-    let urlSearchParams = Webapi.Url.URLSearchParams.makeWithArray(
-      ItemFilters.serialize(~filters, ~defaultSort=UserDefault, ~pageOffset=nextPageOffset),
-    )
-    ReasonReactRouter.push(getUrl(~url, ~urlSearchParams))
-  }
-  let filteredItems = React.useMemo2(() => {
-    let sortFn = ItemFilters.getUserItemSort(
-      ~prioritizeViewerStatuses=?!me
-        ? Some(
-            switch list {
-            | Wishlist => [User.ForTrade, User.CanCraft, User.CatalogOnly]
-            | ForTrade
-            | CanCraft
-            | Catalog => [User.Wishlist]
-            },
-          )
-        : None,
-      ~sort=filters.sort,
-    )
-    userItems->Belt.Array.keep((((itemId, _), _)) =>
-      ItemFilters.doesItemMatchFilters(~item=Item.getItem(~itemId), ~filters)
-    ) |> Js.Array.sortInPlaceWith((aUserItem, bUserItem) => sortFn(aUserItem, bUserItem))
-  }, (userItems, filters))
-  let numResults = filteredItems->Belt.Array.length
-
-  let renderListLink = (linkList: ViewingList.t) =>
-    if (
-      switch linkList {
-      | Wishlist => hasWishlist
-      | CanCraft => hasCanCraft
-      | ForTrade => hasForTrade
-      | Catalog => hasCatalogOnly
-      }
-    ) {
-      <Link
-        path={"/u/" ++ (user.username ++ ("/" ++ ViewingList.viewingListToUrl(linkList)))}
-        className=Styles.listLink>
-        <span className=Styles.listLinkEmoji>
-          {React.string(ViewingList.viewingListToEmoji(linkList))}
-        </span>
-        <span
-          className={Cn.make(list{
-            Styles.listLinkName,
-            Cn.ifTrue(Styles.listLinkSelectedName, linkList == list),
-          })}>
-          {React.string(ViewingList.viewingListToString(linkList))}
-        </span>
-      </Link>
-    } else {
-      React.null
-    }
-
-  let rootRef = React.useRef(Js.Nullable.null)
-  React.useEffect0(() => {
-    if TemporaryState.state.contents == Some(FromProfileBrowser) {
-      TemporaryState.state := None
-      let rootElement = Utils.getElementForDomRef(rootRef)
-      open Webapi.Dom
-      let boundingRect = Element.getBoundingClientRect(rootElement)
-      window |> Window.scrollBy(0., DomRect.top(boundingRect) -. 32.)
-    } else {
-      open Webapi.Dom
-      window |> Window.scrollTo(0., 0.)
-    }
-    None
-  })
-
-  <div className=Styles.root ref={ReactDOMRe.Ref.domRef(rootRef)}>
-    <div className=Styles.listLinks>
-      <div className=Styles.listLinksContent>
-        <Link path={"/u/" ++ user.username} className=Styles.profileLink>
-          {React.string(user.username)}
-        </Link>
-        <span
-          className={Cn.make(list{
-            UserProfileBrowser.Styles.sectionTitleLinkIcon,
-            Styles.profileLinkIcon,
-          })}
-        />
-        {renderListLink(ForTrade)}
-        {renderListLink(CanCraft)}
-        {renderListLink(Wishlist)}
-        {renderListLink(Catalog)}
-      </div>
-    </div>
-    <div className={Cn.make(list{Styles.body, Cn.ifTrue(Styles.rootMini, showMini)})}>
-      {me && list == Catalog
-        ? <div className=Styles.catalogNotice>
-            {React.string(j`This list includes your For Trade and Can Craft items. You can also add catalog-only items.`)}
-          </div>
-        : React.null}
-      {Js.Array.length(userItems) > 8
-        ? <div className={Cn.make(list{ItemBrowser.Styles.filterBar, Styles.filterBar})}>
-            <ItemFilters
-              userItemIds filters isViewingSelf=me onChange={filters => setFilters(filters)}
-            />
-            {!showMini
-              ? <ItemFilters.Pager
-                  numResults pageOffset numResultsPerPage setPageOffset className=Styles.topPager
-                />
-              : React.null}
-          </div>
-        : React.null}
-      <div className=Styles.sectionToggles>
-        <div className=UserProfileBrowser.Styles.showRecipesBox>
-          <label htmlFor="show-mini" className=UserProfileBrowser.Styles.showRecipesLabel>
-            {React.string("Thumbnails")}
-          </label>
-          <input
-            id="show-mini"
-            type_="checkbox"
-            checked=showMini
-            onChange={e => {
-              let checked = ReactEvent.Form.target(e)["checked"]
-              Analytics.Amplitude.logEventWithProperties(
-                ~eventName="Miniature Mode Clicked",
-                ~eventProperties={"checked": checked, "status": list},
-              )
-              let urlSearchParams = Webapi.Url.URLSearchParams.makeWithArray(
-                ItemFilters.serialize(~filters, ~defaultSort=UserDefault, ~pageOffset=0),
-              )
-              if checked {
-                urlSearchParams |> Webapi.Url.URLSearchParams.append("thumbnails", "")
-              }
-              let url = ReasonReactRouter.dangerouslyGetInitialUrl()
-              let newUrl = getUrl(~url, ~urlSearchParams)
-              ReasonReactRouter.replace(newUrl)
-            }}
-            className=UserProfileBrowser.Styles.showRecipesCheckbox
-          />
-        </div>
-        <div className=UserProfileBrowser.Styles.showRecipesBox>
-          <label
-            htmlFor="craftShowRecipe"
-            className={Cn.make(list{
-              UserProfileBrowser.Styles.showRecipesLabel,
-              Cn.ifTrue(UserProfileBrowser.Styles.showRecipesLabelDisabled, showMini),
-            })}>
-            {React.string("Show Recipes")}
-          </label>
-          <input
-            id="craftShowRecipe"
-            type_="checkbox"
-            checked={showRecipes && !showMini}
-            onChange={e => {
-              let checked = ReactEvent.Form.target(e)["checked"]
-              Analytics.Amplitude.logEventWithProperties(
-                ~eventName="Show Recipes Clicked",
-                ~eventProperties={"checked": checked},
-              )
-              setShowRecipes(_ => checked)
-            }}
-            disabled=showMini
-            className=UserProfileBrowser.Styles.showRecipesCheckbox
-          />
-        </div>
-      </div>
-      <div
-        className={Cn.make(list{
-          ItemBrowser.Styles.cards,
-          UserProfileBrowser.Styles.cards,
-          Cn.ifTrue(UserProfileBrowser.Styles.cardsMini, showMini),
-        })}>
-        {filteredItems
-        ->(showMini
-          ? x => x
-          : Belt.Array.slice(~offset=pageOffset * numResultsPerPage, ~len=numResultsPerPage))
-        ->Belt.Array.mapU((. ((itemId, variation), userItem)) =>
-          showMini
-            ? <UserProfileBrowser.UserItemCardMini
-                itemId variation key={string_of_int(itemId) ++ string_of_int(variation)}
-              />
-            : <UserItemCard
-                itemId
-                variation
-                userItem
-                list
-                editable=me
-                showRecipe=showRecipes
-                key={string_of_int(itemId) ++ string_of_int(variation)}
-              />
-        )
-        ->React.array}
-      </div>
-      {!showMini
-        ? <div className=Styles.bottomBar>
-            {me && Js.Array.length(filteredItems) >= 3
-              ? <BulkActions filteredItems list />
-              : React.null}
-            {Js.Array.length(filteredItems) > numResultsPerPage
-              ? <div className=ItemBrowser.Styles.bottomFilterBar>
-                  <ItemFilters.Pager
-                    numResults
-                    pageOffset
-                    numResultsPerPage
-                    setPageOffset={f => {
-                      setPageOffset(f)
-                      let rootElement = Utils.getElementForDomRef(rootRef)
-                      open Webapi.Dom
-                      let boundingRect = Element.getBoundingClientRect(rootElement)
-                      window |> Window.scrollBy(0., DomRect.top(boundingRect))
-                    }}
-                  />
-                </div>
-              : React.null}
-          </div>
-        : React.null}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/UserPage.res b/jscomp/syntax/tests/idempotency/nook-exchange/UserPage.res
deleted file mode 100644
index f15c273..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/UserPage.res
+++ /dev/null
@@ -1,13 +0,0 @@
-@react.component
-let make = (~username, ~urlRest, ~url, ~showLogin) => {
-  let me = UserStore.useMe()
-  switch me {
-  | Some(me) =>
-    if Js.String.toLowerCase(me.username) == Js.String.toLowerCase(username) {
-      <MyPage user=me urlRest url />
-    } else {
-      <UserViewingPage username urlRest url showLogin />
-    }
-  | None => <UserViewingPage username urlRest url showLogin />
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/UserProfileBrowser.res b/jscomp/syntax/tests/idempotency/nook-exchange/UserProfileBrowser.res
deleted file mode 100644
index df82231..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/UserProfileBrowser.res
+++ /dev/null
@@ -1,383 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{
-    padding2(~v=zero, ~h=px(16)),
-    margin3(~top=zero, ~bottom=px(48), ~h=auto),
-    media("(min-width: 660px)", list{width(px(560))}),
-    media("(min-width: 860px)", list{width(px(752))}),
-    media("(min-width: 1040px)", list{width(px(944))}),
-    media("(min-width: 1240px)", list{width(px(1136))}),
-    media("(min-width: 1440px)", list{width(px(1328))}),
-    padding(px(32)),
-    borderRadius(px(16)),
-    backgroundColor(hex("b0dec1c0")),
-    position(relative),
-    media("(max-width: 640px)", list{width(auto), padding(px(16)), borderRadius(zero)}),
-  })
-  let rootMini = style(list{backgroundColor(hex("fffffff0"))})
-  let sectionTitle = style(list{marginBottom(px(16))})
-  @module("./assets/link.png") external linkIcon: string = "default"
-  let sectionTitleLinkIcon = style(list{
-    backgroundImage(url(linkIcon)),
-    display(inlineBlock),
-    backgroundSize(cover),
-    width(px(24)),
-    height(px(24)),
-    opacity(0.5),
-    position(relative),
-    top(px(4)),
-    left(px(-2)),
-    transition(~duration=200, "all"),
-  })
-  let sectionTitleLink = style(list{
-    color(Colors.charcoal),
-    fontSize(px(24)),
-    textDecoration(none),
-    hover(list{
-      selector("& ." ++ sectionTitleLinkIcon, list{opacity(1.), transform(translateX(px(4)))}),
-    }),
-  })
-  let filterBar = style(list{marginTop(px(32)), marginBottom(zero)})
-  let cards = style(list{
-    paddingTop(px(16)),
-    marginRight(px(-16)),
-    media("(max-width: 470px)", list{paddingTop(zero)}),
-  })
-  let cardsMini = style(list{
-    justifyContent(flexStart),
-    marginLeft(px(-8)),
-    marginRight(px(-8)),
-    media("(max-width: 640px)", list{justifyContent(center)}),
-  })
-  let cardSeeAllLinkIcon = style(list{opacity(0.8), top(px(-1))})
-  let cardSeeAll = style(list{
-    flexDirection(row),
-    justifyContent(center),
-    fontSize(px(20)),
-    color(Colors.charcoal),
-    paddingTop(px(36)),
-    paddingBottom(px(36)),
-    textDecoration(none),
-    hover(list{
-      Colors.darkLayerShadow,
-      selector("& ." ++ cardSeeAllLinkIcon, list{transform(translateX(px(2)))}),
-    }),
-  })
-  let cardMini = style(list{position(relative), cursor(pointer)})
-  let cardMiniHasQuicklist = style(list{
-    cursor(pointer),
-    transition(~duration=200, "all"),
-    media("(hover: hover)", list{opacity(0.5), hover(list{opacity(0.8)})}),
-  })
-  let cardMiniQuicklistSelected = style(list{
-    important(opacity(1.)),
-    backgroundColor(hex("3aa56340")),
-  })
-  let cardMiniImage = style(list{display(block), width(px(64)), height(px(64))})
-  let cardMiniRecipe = style(list{
-    display(block),
-    width(px(32)),
-    height(px(32)),
-    position(absolute),
-    bottom(px(-4)),
-    right(px(-4)),
-  })
-  let sectionToggles = style(list{
-    position(absolute),
-    right(px(32)),
-    top(px(48)),
-    display(flexBox),
-    flexDirection(column),
-    alignItems(flexEnd),
-    transform(translateY(pct(-50.))),
-    media("(max-width: 640px)", list{top(px(32)), right(px(16))}),
-  })
-  let showRecipesBox = style(list{
-    marginLeft(px(16)),
-    display(flexBox),
-    alignItems(center),
-    firstChild(list{marginLeft(zero)}),
-  })
-  let showRecipesLabel = style(list{fontSize(px(16)), marginRight(px(8))})
-  let showRecipesLabelDisabled = style(list{opacity(0.5)})
-  let showRecipesCheckbox = style(list{
-    fontSize(px(24)),
-    margin(zero),
-    position(relative),
-    top(px(-2)),
-  })
-  let recipe = style(list{marginTop(px(6)), textAlign(center), fontSize(px(12))})
-}
-
-open Belt
-
-module UserItemCardMini = {
-  @react.component
-  let make = (~itemId: int, ~variation) => {
-    let hasQuicklist = QuicklistStore.useHasQuicklist()
-    let isInQuicklist = QuicklistStore.useItemState(~itemId, ~variant=variation)
-
-    let item = Item.getItem(~itemId)
-    <div
-      className={Cn.make(list{
-        Styles.cardMini,
-        Cn.ifTrue(Styles.cardMiniHasQuicklist, hasQuicklist),
-        Cn.ifTrue(Styles.cardMiniQuicklistSelected, isInQuicklist),
-      })}>
-      {
-        let image =
-          <img
-            onClick={_ =>
-              if hasQuicklist {
-                if isInQuicklist {
-                  QuicklistStore.removeItem(~itemId, ~variant=variation)
-                } else {
-                  QuicklistStore.addItem(~itemId, ~variant=variation)
-                }
-              } else {
-                ReasonReactRouter.push(
-                  Utils.getItemDetailUrl(~itemId=item.id, ~variant=Some(variation)),
-                )
-              }}
-            src={Item.getImageUrl(~item, ~variant=variation)}
-            className=Styles.cardMiniImage
-          />
-        if Utils.browserSupportsHover {
-          <ReactAtmosphere.Tooltip text={React.string(Item.getName(item))}>
-            {({onMouseEnter, onMouseLeave, onFocus, onBlur, ref}) =>
-              <div onMouseEnter onMouseLeave onFocus onBlur ref={ReactDOMRe.Ref.domRef(ref)}>
-                image
-              </div>}
-          </ReactAtmosphere.Tooltip>
-        } else {
-          image
-        }
-      }
-      {Item.isRecipe(~item)
-        ? <img src={Constants.cdnUrl ++ "/images/DIYRecipe.png"} className=Styles.cardMiniRecipe />
-        : React.null}
-    </div>
-  }
-}
-
-module Section = {
-  let randomString = () => Js.Math.random()->Js.Float.toString
-
-  let getMaxResults = (~viewportWidth) =>
-    if viewportWidth >= 1440 {
-      14
-    } else if viewportWidth >= 1240 {
-      12
-    } else if viewportWidth >= 1040 {
-      10
-    } else if viewportWidth >= 860 {
-      8
-    } else if viewportWidth >= 640 {
-      6
-    } else {
-      6
-    }
-
-  @react.component
-  let make = (
-    ~username: string,
-    ~list: ViewingList.t,
-    ~userItems: array<((int, int), User.item)>,
-    ~editable,
-  ) => {
-    let id = React.useMemo0(() => randomString())
-    let viewportWidth = Utils.useViewportWidth()
-    let maxResults = getMaxResults(~viewportWidth)
-    let (showRecipes, setShowRecipes) = React.useState(() => false)
-    let url = ReasonReactRouter.useUrl()
-    let showMini = {
-      open Webapi.Url.URLSearchParams
-      make(url.search) |> has("thumbnails")
-    }
-    let url = ReasonReactRouter.useUrl()
-    let sort = React.useMemo1(() => {
-      let (filters, _) = ItemFilters.fromUrlSearch(~urlSearch=url.search, ~defaultSort=UserDefault)
-      filters.sort
-    }, [url.search])
-    let filteredItems = React.useMemo1(() => {
-      let sortFn = ItemFilters.getUserItemSort(
-        ~prioritizeViewerStatuses=?!editable
-          ? Some(
-              switch list {
-              | Wishlist => [User.ForTrade, User.CanCraft, User.CatalogOnly]
-              | ForTrade
-              | Catalog
-              | CanCraft => [User.Wishlist]
-              },
-            )
-          : None,
-        ~sort,
-      )
-      userItems |> Js.Array.sortInPlaceWith((aUserItem, bUserItem) => sortFn(aUserItem, bUserItem))
-    }, [userItems])
-    let viewingListUrl =
-      "/u/" ++
-      (username ++
-      ("/" ++
-      (ViewingList.viewingListToUrl(list) ++
-      switch url.search {
-      | "" => ""
-      | search => "?" ++ search
-      })))
-    let numResults = userItems |> Js.Array.length
-
-    <div className={Cn.make(list{Styles.root, Cn.ifTrue(Styles.rootMini, showMini)})}>
-      <div className=Styles.sectionTitle>
-        <Link path=viewingListUrl className=Styles.sectionTitleLink>
-          {React.string(ViewingList.viewingListToEmoji(list))}
-          {React.string(" " ++ ViewingList.viewingListToString(list))}
-          <span className=Styles.sectionTitleLinkIcon />
-        </Link>
-      </div>
-      <div className=Styles.sectionToggles>
-        <div className=Styles.showRecipesBox>
-          <label htmlFor=id className=Styles.showRecipesLabel> {React.string("Thumbnails")} </label>
-          <input
-            id
-            type_="checkbox"
-            checked=showMini
-            onChange={e => {
-              let checked = ReactEvent.Form.target(e)["checked"]
-              Analytics.Amplitude.logEventWithProperties(
-                ~eventName="Miniature Mode Clicked",
-                ~eventProperties={"checked": checked, "list": list},
-              )
-              let url = ReasonReactRouter.dangerouslyGetInitialUrl()
-              ReasonReactRouter.replace(Utils.getPath(~url) ++ (checked ? "?thumbnails" : ""))
-            }}
-            className=Styles.showRecipesCheckbox
-          />
-        </div>
-        {if list == CanCraft {
-          <div className=Styles.showRecipesBox>
-            <label
-              htmlFor="craftShowRecipe"
-              className={Cn.make(list{
-                Styles.showRecipesLabel,
-                Cn.ifTrue(Styles.showRecipesLabelDisabled, showMini),
-              })}>
-              {React.string("Show Recipes")}
-            </label>
-            <input
-              id="craftShowRecipe"
-              type_="checkbox"
-              checked={showRecipes && !showMini}
-              onChange={e => {
-                let checked = ReactEvent.Form.target(e)["checked"]
-                Analytics.Amplitude.logEventWithProperties(
-                  ~eventName="Show Recipes Clicked",
-                  ~eventProperties={"checked": checked},
-                )
-                setShowRecipes(_ => checked)
-              }}
-              disabled=showMini
-              className=Styles.showRecipesCheckbox
-            />
-          </div>
-        } else {
-          React.null
-        }}
-      </div>
-      <div
-        className={Cn.make(list{
-          ItemBrowser.Styles.cards,
-          Styles.cards,
-          Cn.ifTrue(Styles.cardsMini, showMini),
-        })}>
-        {filteredItems
-        ->(showMini
-          ? x => x
-          : Belt.Array.slice(~offset=0, ~len=numResults > maxResults ? maxResults - 1 : maxResults))
-        ->Belt.Array.mapU((. ((itemId, variation), userItem)) =>
-          showMini
-            ? <UserItemCardMini
-                itemId variation key={string_of_int(itemId) ++ string_of_int(variation)}
-              />
-            : <UserItemCard
-                itemId
-                variation
-                userItem
-                editable
-                list
-                showRecipe=showRecipes
-                key={string_of_int(itemId) ++ string_of_int(variation)}
-              />
-        )
-        ->(!showMini && numResults > maxResults
-          ? Belt.Array.concat(
-              _,
-              [
-                <Link
-                  path=viewingListUrl
-                  className={Cn.make(list{UserItemCard.Styles.card, Styles.cardSeeAll})}
-                  key="link">
-                  {React.string("See all " ++ string_of_int(Js.Array.length(userItems)))}
-                  <span
-                    className={Cn.make(list{
-                      Styles.sectionTitleLinkIcon,
-                      Styles.cardSeeAllLinkIcon,
-                    })}
-                  />
-                </Link>,
-              ],
-            )
-          : x => x)
-        ->React.array}
-      </div>
-    </div>
-  }
-}
-
-@react.component
-let make = (~username, ~userItems: array<((int, int), User.item)>, ~editable) => {
-  let wishlist = userItems->Array.keepU((. (_, item: User.item)) => item.status == Wishlist)
-  let forTradeList = userItems->Array.keepU((. (_, item: User.item)) => item.status == ForTrade)
-  let canCraftList = userItems->Array.keepU((. (_, item: User.item)) => item.status == CanCraft)
-  let hasForTrade = forTradeList->Array.length > 0
-  let hasCanCraft = canCraftList->Array.length > 0
-  let hasWishlist = wishlist->Array.length > 0
-  let hasCatalogOnly =
-    userItems->Array.getBy(((_, item: User.item)) => item.status == CatalogOnly) != None
-
-  React.useEffect0(() => Some(() => TemporaryState.state := Some(FromProfileBrowser)))
-
-  <div>
-    {if hasForTrade {
-      <Section username list=ForTrade userItems=forTradeList editable />
-    } else {
-      React.null
-    }}
-    {if hasCanCraft {
-      <Section username list=CanCraft userItems=canCraftList editable />
-    } else {
-      React.null
-    }}
-    {if hasWishlist {
-      <Section username list=Wishlist userItems=wishlist editable />
-    } else {
-      React.null
-    }}
-    {if hasCatalogOnly {
-      <Section
-        username
-        list=Catalog
-        userItems={userItems->Array.keepU((. (_, item: User.item)) =>
-          switch item.status {
-          | CanCraft
-          | ForTrade
-          | CatalogOnly => true
-          | Wishlist => false
-          }
-        )}
-        editable
-      />
-    } else {
-      React.null
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/UserStore.res b/jscomp/syntax/tests/idempotency/nook-exchange/UserStore.res
deleted file mode 100644
index 20cbf8c..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/UserStore.res
+++ /dev/null
@@ -1,811 +0,0 @@
-open Belt
-
-type state =
-  | Loading
-  | NotLoggedIn
-  | LoggedIn(User.t)
-type action =
-  | Login(User.t)
-  | UpdateUser(User.t)
-  | Logout
-  | FetchMeFailed
-  | ConnectDiscordId(string)
-  | FollowUser(string)
-  | UnfollowUser(string)
-
-let sessionId = ref(Dom.Storage.localStorage |> Dom.Storage.getItem("sessionId"))
-let updateSessionId = newValue => {
-  sessionId := newValue
-  open Dom.Storage
-  switch newValue {
-  | Some(sessionId) => localStorage |> setItem("sessionId", sessionId)
-  | None => localStorage |> removeItem("sessionId")
-  }
-}
-
-let api = Restorative.createStore(
-  switch sessionId.contents {
-  | Some(_) => Loading
-  | None => NotLoggedIn
-  },
-  (state, action) =>
-    switch action {
-    | Login(user) => LoggedIn(user)
-    | UpdateUser(user) => LoggedIn(user)
-    | Logout => NotLoggedIn
-    | FetchMeFailed => NotLoggedIn
-    | ConnectDiscordId(discordId) =>
-      switch state {
-      | LoggedIn(user) => LoggedIn({...user, discordId: Some(discordId)})
-      | _ => state
-      }
-    | FollowUser(followeeId) =>
-      switch state {
-      | LoggedIn(user) =>
-        LoggedIn({
-          ...user,
-          followeeIds: user.followeeIds->Belt.Option.map(followeeIds =>
-            Js.Array.includes(followeeId, followeeIds)
-              ? followeeIds
-              : followeeIds->Belt.Array.concat([followeeId])
-          ),
-        })
-      | _ => state
-      }
-    | UnfollowUser(followeeId) =>
-      switch state {
-      | LoggedIn(user) =>
-        LoggedIn({
-          ...user,
-          followeeIds: user.followeeIds->Belt.Option.map(followeeIds =>
-            followeeIds->Belt.Array.keep(f => f !== followeeId)
-          ),
-        })
-      | _ => state
-      }
-    },
-)
-
-let useStore = api.useStore
-let useMe = () =>
-  switch api.useStore() {
-  | LoggedIn(user) => Some(user)
-  | _ => None
-  }
-let useItem = (~itemId, ~variation) => {
-  let selector = React.useCallback2((state: state) =>
-    switch state {
-    | LoggedIn(user) => user.items->Js.Dict.get(User.getItemKey(~itemId, ~variation))
-    | _ => None
-    }
-  , (itemId, variation))
-  api.useStoreWithSelector(selector, ())
-}
-let useIsLoggedIn = () => api.useStoreWithSelector(state =>
-    switch state {
-    | LoggedIn(_) => true
-    | _ => false
-    }
-  , ())
-exception ExpectedUser
-let getUser = () =>
-  switch api.getState() {
-  | LoggedIn(user) => user
-  | _ => raise(ExpectedUser)
-  }
-let getItem = (~itemId, ~variation) =>
-  switch api.getState() {
-  | LoggedIn(user) => user.items->Js.Dict.get(User.getItemKey(~itemId, ~variation))
-  | _ => None
-  }
-
-let getUserOption = () =>
-  switch api.getState() {
-  | LoggedIn(user) => Some(user)
-  | _ => None
-  }
-let isLoggedIn = () =>
-  switch api.getState() {
-  | LoggedIn(_) => true
-  | _ => false
-  }
-
-let handleServerResponse = (url, responseResult) =>
-  if (
-    switch responseResult {
-    | Error(_) => true
-    | Ok(response) => Fetch.Response.status(response) >= 400
-    }
-  ) {
-    Error.showPopup(
-      ~message="Something went wrong. Sorry!\nRefresh your browser and try again.\nIf you are running into issues, please email hi@nook.exchange",
-    )
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Error Dialog Shown",
-      ~eventProperties={
-        "url": url,
-        "errorResponse": Js.Json.stringifyAny(
-          switch responseResult {
-          | Ok(response) => {
-              "status": Fetch.Response.status(response),
-              "statusText": Fetch.Response.statusText(response),
-            }
-          | Error(error) => Obj.magic(error)
-          },
-        )->Option.getExn,
-      },
-    )
-  }
-
-let makeAuthenticatedPostRequest = (~url, ~bodyJson) =>
-  Fetch.fetchWithInit(
-    url,
-    Fetch.RequestInit.make(
-      ~method_=Post,
-      ~body=Fetch.BodyInit.make(Js.Json.stringify(Json.Encode.object_(bodyJson))),
-      ~headers=Fetch.HeadersInit.make({
-        "X-Client-Version": Constants.gitCommitRef,
-        "Content-Type": "application/json",
-        "Authorization": "Bearer " ++ Option.getWithDefault(sessionId.contents, ""),
-      }),
-      ~credentials=Include,
-      ~mode=CORS,
-      (),
-    ),
-  )
-
-exception NotCanonicalVariant(int, int)
-let numItemUpdatesLogged = ref(0)
-let setItemStatus = (~itemId: int, ~variation: int, ~status: User.itemStatus) => {
-  let item = Item.getItem(~itemId)
-  if Item.getCanonicalVariant(~item, ~variant=variation) != variation {
-    raise(NotCanonicalVariant(itemId, variation))
-  }
-  let user = getUser()
-  let itemKey = User.getItemKey(~itemId, ~variation)
-  let timeUpdated = Some(Js.Date.now() /. 1000.)
-  let userItem = switch user.items->Js.Dict.get(itemKey) {
-  | Some(item) => {...item, status: status, timeUpdated: timeUpdated}
-  | None => {status: status, note: "", priorityTimestamp: None, timeUpdated: timeUpdated}
-  }
-  let updatedUser = {
-    ...user,
-    items: {
-      let clone = Utils.cloneJsDict(user.items)
-      clone->Js.Dict.set(itemKey, userItem)
-      clone
-    },
-  }
-  api.dispatch(UpdateUser(updatedUser))
-  %Repromise({
-    let responseResult = API.setItemStatus(
-      ~userId=user.id,
-      ~sessionId=sessionId.contents,
-      ~itemId,
-      ~variant=variation,
-      ~status,
-    )
-    handleServerResponse("/@me/items/status", responseResult)
-    Promise.resolved()
-  }) |> ignore
-  if numItemUpdatesLogged.contents < 2 || updatedUser.items->Js.Dict.keys->Js.Array.length < 4 {
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Item Status Updated",
-      ~eventProperties={
-        "itemId": itemId,
-        "variant": variation,
-        "status": User.itemStatusToJs(status),
-      },
-    )
-    numItemUpdatesLogged := numItemUpdatesLogged.contents + 1
-  }
-  Analytics.Amplitude.setItemCount(~itemCount=Js.Dict.keys(updatedUser.items)->Js.Array.length)
-}
-
-let setItemStatusBatch = (~items: array<(int, int)>, ~status) => {
-  let user = getUser()
-  let updatedUser = {
-    ...user,
-    items: {
-      let clone = Utils.cloneJsDict(user.items)
-      items |> Js.Array.forEach(((itemId, variant)) => {
-        let itemKey = User.getItemKey(~itemId, ~variation=variant)
-        clone->Js.Dict.set(
-          itemKey,
-          switch user.items->Js.Dict.get(itemKey) {
-          | Some(item) => {...item, status: status}
-          | None => {
-              status: status,
-              note: "",
-              priorityTimestamp: None,
-              timeUpdated: None,
-            }
-          },
-        )
-      })
-      clone
-    },
-  }
-  api.dispatch(UpdateUser(updatedUser))
-  %Repromise({
-    let responseResult = API.setItemStatusBatch(
-      ~sessionId=Belt.Option.getExn(sessionId.contents),
-      ~items,
-      ~status,
-    )
-    handleServerResponse("/@me/items/batch/status", responseResult)
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Item Status Batch Updated",
-      ~eventProperties={
-        "numItems": Js.Array.length(items),
-        "status": User.itemStatusToJs(status),
-      },
-    )
-    Promise.resolved()
-  }) |> ignore
-  Analytics.Amplitude.setItemCount(~itemCount=Js.Dict.keys(updatedUser.items)->Js.Array.length)
-}
-
-let setItemNote = (~itemId: int, ~variation: int, ~note: string) => {
-  let item = Item.getItem(~itemId)
-  if Item.getCanonicalVariant(~item, ~variant=variation) != variation {
-    raise(NotCanonicalVariant(itemId, variation))
-  }
-  let user = getUser()
-  let itemKey = User.getItemKey(~itemId, ~variation)
-  let userItem = {
-    ...Belt.Option.getExn(user.items->Js.Dict.get(itemKey)),
-    note: note,
-  }
-  let updatedUser = {
-    ...user,
-    items: {
-      let clone = Utils.cloneJsDict(user.items)
-      clone->Js.Dict.set(itemKey, userItem)
-      clone
-    },
-  }
-  api.dispatch(UpdateUser(updatedUser))
-  let item = Item.getItem(~itemId)
-  %Repromise({
-    let responseResult = API.setItemNote(
-      ~userId=user.id,
-      ~sessionId=sessionId.contents,
-      ~itemId,
-      ~variant=variation,
-      ~note,
-    )
-    handleServerResponse("/@me/items/note", responseResult)
-    Promise.resolved()
-  }) |> ignore
-  if numItemUpdatesLogged.contents < 2 || updatedUser.items->Js.Dict.keys->Js.Array.length < 4 {
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Item Note Updated",
-      ~eventProperties={
-        "itemId": item.id,
-        "variant": variation,
-        "note": note,
-      },
-    )
-    numItemUpdatesLogged := numItemUpdatesLogged.contents + 1
-  }
-}
-
-let didLogItemPriority = ref(false)
-let setItemPriority = (~itemId: int, ~variant: int, ~isPriority: bool) => {
-  let user = getUser()
-  let itemKey = User.getItemKey(~itemId, ~variation=variant)
-  let userItem = {
-    ...Belt.Option.getExn(user.items->Js.Dict.get(itemKey)),
-    priorityTimestamp: isPriority ? Some(Js.Date.now()) : None,
-  }
-  let updatedUser = {
-    ...user,
-    items: {
-      let clone = Utils.cloneJsDict(user.items)
-      clone->Js.Dict.set(itemKey, userItem)
-      clone
-    },
-  }
-  api.dispatch(UpdateUser(updatedUser))
-  let item = Item.getItem(~itemId)
-  %Repromise({
-    let responseResult = API.setItemPriority(
-      ~sessionId=sessionId.contents,
-      ~itemId,
-      ~variant,
-      ~isPriority,
-    )
-    handleServerResponse("/@me/items/priority", responseResult)
-    Promise.resolved()
-  }) |> ignore
-  if !didLogItemPriority.contents {
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Item Priority Updated",
-      ~eventProperties={
-        "itemId": item.id,
-        "variant": variant,
-        "isPriority": isPriority,
-      },
-    )
-    didLogItemPriority := true
-  }
-}
-
-let numItemRemovesLogged = ref(0)
-let removeItem = (~itemId, ~variation) => {
-  let user = getUser()
-  let key = User.getItemKey(~itemId, ~variation)
-  if user.items->Js.Dict.get(key)->Option.isSome {
-    let updatedUser = {
-      ...user,
-      items: {
-        let clone = Utils.cloneJsDict(user.items)
-        Utils.deleteJsDictKey(clone, key)
-        clone
-      },
-    }
-    api.dispatch(UpdateUser(updatedUser))
-    let item = Item.getItem(~itemId)
-    if numItemRemovesLogged.contents < 3 {
-      Analytics.Amplitude.logEventWithProperties(
-        ~eventName="Item Removed",
-        ~eventProperties={"itemId": item.id, "variant": variation},
-      )
-      numItemRemovesLogged := numItemRemovesLogged.contents + 1
-    }
-    %Repromise({
-      let responseResult = API.removeItem(
-        ~userId=user.id,
-        ~sessionId=sessionId.contents,
-        ~itemId,
-        ~variant=variation,
-      )
-      handleServerResponse("/@me/items/remove", responseResult)
-      Promise.resolved()
-    }) |> ignore
-    Analytics.Amplitude.setItemCount(~itemCount=Js.Dict.keys(updatedUser.items)->Js.Array.length)
-  }
-}
-
-let removeItems = (~items: array<(int, int)>) => {
-  let user = getUser()
-  let updatedUser = {
-    ...user,
-    items: {
-      let clone = Utils.cloneJsDict(user.items)
-      items |> Js.Array.forEach(((itemId, variant)) => {
-        let key = User.getItemKey(~itemId, ~variation=variant)
-        Utils.deleteJsDictKey(clone, key)
-      })
-      clone
-    },
-  }
-  api.dispatch(UpdateUser(updatedUser))
-  %Repromise({
-    let responseResult = API.removeItems(~sessionId=Belt.Option.getExn(sessionId.contents), ~items)
-    handleServerResponse("/@me/items/batch/remove", responseResult)
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Item Batch Removed",
-      ~eventProperties={"numItems": Js.Array.length(items)},
-    )
-    Promise.resolved()
-  }) |> ignore
-  Analytics.Amplitude.setItemCount(~itemCount=Js.Dict.keys(updatedUser.items)->Js.Array.length)
-}
-
-let updateProfileText = (~profileText) => {
-  let user = getUser()
-  let updatedUser = {...user, profileText: profileText}
-  api.dispatch(UpdateUser(updatedUser))
-  %Repromise({
-    let responseResult = API.updateProfileText(
-      ~userId=user.id,
-      ~sessionId=sessionId.contents,
-      ~profileText,
-    )
-    handleServerResponse("/@me/profileText", responseResult)
-    Promise.resolved()
-  }) |> ignore
-  Analytics.Amplitude.logEventWithProperties(
-    ~eventName="Profile Text Updated",
-    ~eventProperties={"text": profileText},
-  )
-}
-
-let patchMe = (~username=?, ~newPassword=?, ~email=?, ~oldPassword=?, ()) => {
-  let user = getUser()
-  %Repromise({
-    let response = API.patchMe(
-      ~userId=user.id,
-      ~sessionId=sessionId.contents,
-      ~username,
-      ~newPassword,
-      ~email,
-      ~oldPassword,
-    )
-    if Fetch.Response.status(response) < 300 {
-      let user = getUser()
-      let updatedUser = {
-        ...user,
-        username: username->Belt.Option.getWithDefault(user.username),
-        email: switch email {
-        | Some(email) => email != "" ? Some(email) : None
-        | None => user.email
-        },
-      }
-      api.dispatch(UpdateUser(updatedUser))
-      Analytics.Amplitude.logEventWithProperties(
-        ~eventName="Account Update Succeeded",
-        ~eventProperties={
-          "username": username,
-          "password": newPassword !== None,
-          "email": email,
-        },
-      )
-      Promise.resolved(Ok())
-    } else {
-      %Repromise.JsExn({
-        let error = Fetch.Response.text(response)
-        Analytics.Amplitude.logEventWithProperties(
-          ~eventName="Account Update Failed",
-          ~eventProperties={"error": error},
-        )
-        Promise.resolved(Error(error))
-      })
-    }
-  })
-}
-
-let toggleCatalogCheckboxSetting = (~enabled) => {
-  let user = getUser()
-  let updatedUser = {...user, enableCatalogCheckbox: enabled}
-  api.dispatch(UpdateUser(updatedUser))
-  %Repromise({
-    let responseResult = API.updateSetting(
-      ~userId=user.id,
-      ~sessionId=sessionId.contents,
-      ~settingKey="enableCatalog",
-      ~settingValue=Js.Json.boolean(enabled),
-    )
-    handleServerResponse("/@me/toggleCatalogCheckboxSetting", responseResult)
-    Promise.resolved()
-  }) |> ignore
-  Analytics.Amplitude.logEventWithProperties(
-    ~eventName="Catalog Checkbox Setting Toggled",
-    ~eventProperties={"enabled": enabled},
-  )
-}
-
-let errorQuotationMarksRegex = %re(`/^"(.*)"$/`)
-let register = (~username, ~email, ~password) =>
-  %Repromise.JsExn({
-    let response = Fetch.fetchWithInit(
-      Constants.apiUrl ++ "/register2",
-      Fetch.RequestInit.make(
-        ~method_=Post,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify(
-            Json.Encode.object_(list{
-              ("username", Js.Json.string(username)),
-              ("email", Js.Json.string(email)),
-              ("password", Js.Json.string(password)),
-            }),
-          ),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    if Fetch.Response.status(response) < 300 {
-      %Repromise.JsExn({
-        let json = Fetch.Response.json(response)
-        updateSessionId(
-          json |> {
-            open Json.Decode
-            optional(field("sessionId", string))
-          },
-        )
-        let user = User.fromAPI(json)
-        api.dispatch(Login(user))
-        Analytics.Amplitude.setUserId(~userId=Some(user.id))
-        Analytics.Amplitude.setUsername(~username, ~email)
-        Promise.resolved(Ok(user))
-      })
-    } else {
-      %Repromise.JsExn({
-        let text = Fetch.Response.text(response)
-        let result = text |> Js.Re.exec_(errorQuotationMarksRegex)
-        let text = switch result {
-        | Some(match_) =>
-          let captures = Js.Re.captures(match_)
-          captures[1]->Option.getExn->Js.Nullable.toOption->Option.getExn
-        | None => text
-        }
-        Promise.resolved(Error(text))
-      })
-    }
-  })
-
-let loginWithDiscord = (~code, ~isRegister) =>
-  %Repromise.JsExn({
-    let response = Fetch.fetchWithInit(
-      Constants.apiUrl ++ "/login-discord",
-      Fetch.RequestInit.make(
-        ~method_=Post,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify(
-            Json.Encode.object_(list{
-              ("code", Js.Json.string(code)),
-              ("isRegister", Js.Json.boolean(isRegister)),
-            }),
-          ),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    if Fetch.Response.status(response) < 300 {
-      %Repromise.JsExn({
-        let json = Fetch.Response.json(response)
-        updateSessionId(
-          json |> {
-            open Json.Decode
-            optional(field("sessionId", string))
-          },
-        )
-        let user = User.fromAPI(json)
-        api.dispatch(Login(user))
-        Analytics.Amplitude.setUserId(~userId=Some(user.id))
-        Analytics.Amplitude.setUsername(
-          ~username=user.username,
-          ~email=user.email->Belt.Option.getWithDefault(""),
-        )
-        let isRegister =
-          (json |> {
-            open Json.Decode
-            optional(field("isRegister", bool))
-          })->Belt.Option.getWithDefault(false)
-        if isRegister {
-          Analytics.Amplitude.logEventWithProperties(
-            ~eventName="Registration Succeeded",
-            ~eventProperties={
-              "username": user.username,
-              "email": user.email,
-              "discordId": user.discordId,
-            },
-          )
-        }
-        Promise.resolved(Ok((user, isRegister)))
-      })
-    } else {
-      %Repromise.JsExn({
-        let text = Fetch.Response.text(response)
-        let result = text |> Js.Re.exec_(errorQuotationMarksRegex)
-        let text = switch result {
-        | Some(match_) =>
-          let captures = Js.Re.captures(match_)
-          captures[1]->Option.getExn->Js.Nullable.toOption->Option.getExn
-        | None => text
-        }
-        Promise.resolved(Error(text))
-      })
-    }
-  })
-
-let followUser = (~userId) =>
-  %Repromise({
-    let response = API.followUser(~userId, ~sessionId=Belt.Option.getExn(sessionId.contents))
-    switch response {
-    | Ok() => api.dispatch(FollowUser(userId))
-    | Error(_) => ()
-    }
-    Promise.resolved(response)
-  })
-
-let unfollowUser = (~userId) =>
-  %Repromise({
-    let response = API.unfollowUser(~userId, ~sessionId=Belt.Option.getExn(sessionId.contents))
-    switch response {
-    | Ok() => api.dispatch(UnfollowUser(userId))
-    | Error(_) => ()
-    }
-    Promise.resolved(response)
-  })
-
-let login = (~username, ~password) =>
-  %Repromise.JsExn({
-    let response = Fetch.fetchWithInit(
-      Constants.apiUrl ++ "/login",
-      Fetch.RequestInit.make(
-        ~method_=Post,
-        ~body=Fetch.BodyInit.make(
-          Js.Json.stringify(
-            Js.Json.object_(
-              Js.Dict.fromArray([
-                ("username", Js.Json.string(username)),
-                ("password", Js.Json.string(password)),
-              ]),
-            ),
-          ),
-        ),
-        ~headers=Fetch.HeadersInit.make({
-          "X-Client-Version": Constants.gitCommitRef,
-          "Content-Type": "application/json",
-        }),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    if Fetch.Response.status(response) < 300 {
-      %Repromise.JsExn({
-        let json = Fetch.Response.json(response)
-        updateSessionId(
-          json |> {
-            open Json.Decode
-            optional(field("sessionId", string))
-          },
-        )
-        let user = User.fromAPI(json)
-        api.dispatch(Login(user))
-        Analytics.Amplitude.setUserId(~userId=Some(user.id))
-        Promise.resolved(Ok(user))
-      })
-    } else {
-      Promise.resolved(Error())
-    }
-  })
-
-let logout = () => {
-  api.dispatch(Logout)
-  Dom.Storage.localStorage |> Dom.Storage.removeItem("sessionId")
-  Analytics.Amplitude.setUserId(~userId=None)
-  ReasonReactRouter.push("/")
-  let sessionId = sessionId.contents
-  updateSessionId(None)
-  %Repromise.JsExn({
-    let response = Fetch.fetchWithInit(
-      Constants.apiUrl ++ "/logout",
-      Fetch.RequestInit.make(
-        ~method_=Post,
-        ~headers=?Option.map(sessionId, sessionId =>
-          Fetch.HeadersInit.make({
-            "X-Client-Version": Constants.gitCommitRef,
-            "Authorization": "Bearer " ++ sessionId,
-          })
-        ),
-        ~credentials=Include,
-        ~mode=CORS,
-        (),
-      ),
-    )
-    Promise.resolved()
-  })
-}
-
-let removeAllItems = () => {
-  let sessionId = Belt.Option.getExn(sessionId.contents)
-  %Repromise({
-    let responseResult = API.removeAllItems(~sessionId)
-    handleServerResponse("/@me/items/all/delete", responseResult)
-    switch responseResult {
-    | Ok(response) =>
-      if Fetch.Response.status(response) < 300 {
-        let user = getUser()
-        api.dispatch(UpdateUser({...user, items: Js.Dict.empty()}))
-      }
-    | Error(_) => ()
-    }
-    Promise.resolved()
-  })
-}
-
-let deleteAccount = () => {
-  let sessionId = Belt.Option.getExn(sessionId.contents)
-  %Repromise({
-    let responseResult = API.deleteAccount(~sessionId, ~userId=getUser().id)
-    handleServerResponse("/@me/delete", responseResult)
-    switch responseResult {
-    | Ok(response) =>
-      if Fetch.Response.status(response) < 300 {
-        api.dispatch(Logout)
-        Dom.Storage.localStorage |> Dom.Storage.removeItem("sessionId")
-        Analytics.Amplitude.setUserId(~userId=None)
-        ReasonReactRouter.push("/")
-        updateSessionId(None)
-      }
-    | Error(_) => ()
-    }
-    Promise.resolved()
-  })
-}
-
-let connectDiscordAccount = (~code) => {
-  let processLoggedIn = user =>
-    %Repromise({
-      let response = API.connectDiscordAccount(
-        ~sessionId=Belt.Option.getExn(sessionId.contents),
-        ~code,
-      )
-      %Repromise.JsExn({
-        let json = Fetch.Response.json(response)
-        let discordId = json |> {
-          open Json.Decode
-          field("discordId", string)
-        }
-        api.dispatch(ConnectDiscordId(discordId))
-        ReasonReactRouter.push("/settings")
-        Promise.resolved()
-      })
-    }) |> ignore
-  // TODO: error
-  let processNotLoggedIn = () => ()
-  switch api.getState() {
-  | Loading =>
-    let unsubscribe = ref(() => ())
-    unsubscribe := api.subscribe(state =>
-        switch state {
-        | Loading => ()
-        | LoggedIn(user) =>
-          processLoggedIn(user)
-          unsubscribe.contents()
-        | NotLoggedIn =>
-          processNotLoggedIn()
-          unsubscribe.contents()
-        }
-      , ())
-  | LoggedIn(user) => processLoggedIn(user)
-  | NotLoggedIn => processNotLoggedIn()
-  }
-}
-
-let init = () =>
-  switch sessionId.contents {
-  | Some(sessionId) =>
-    %Repromise.JsExn({
-      let response = Fetch.fetchWithInit(
-        Constants.apiUrl ++ "/@me",
-        Fetch.RequestInit.make(
-          ~method_=Get,
-          ~headers=Fetch.HeadersInit.make({
-            "X-Client-Version": Constants.gitCommitRef,
-            "Authorization": "Bearer " ++ sessionId,
-          }),
-          ~credentials=Include,
-          ~mode=CORS,
-          (),
-        ),
-      )
-      if Fetch.Response.status(response) < 400 {
-        %Repromise.JsExn({
-          let json = Fetch.Response.json(response)
-          switch json |> {
-            open Json.Decode
-            optional(field("sessionId", string))
-          } {
-          | Some(sessionId) => updateSessionId(Some(sessionId))
-          | None => ()
-          }
-          let user = User.fromAPI(json)
-          api.dispatch(Login(user))
-          Analytics.Amplitude.setUserId(~userId=Some(user.id))
-          Promise.resolved()
-        })
-      } else {
-        api.dispatch(FetchMeFailed)
-        Promise.resolved()
-      }
-    }) |> ignore
-  | None => ()
-  }
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/UserViewingPage.res b/jscomp/syntax/tests/idempotency/nook-exchange/UserViewingPage.res
deleted file mode 100644
index c9c4fe9..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/UserViewingPage.res
+++ /dev/null
@@ -1,232 +0,0 @@
-module Styles = {
-  open Css
-  let root = style(list{})
-  let emptyProfile = style(list{
-    maxWidth(px(768)),
-    margin3(~top=px(32), ~bottom=px(128), ~h=auto),
-    textAlign(center),
-  })
-  let username = style(list{fontSize(px(32)), textAlign(center), marginBottom(px(24))})
-  let usernameLink = style(list{
-    color(Colors.charcoal),
-    textDecoration(none),
-    hover(list{textDecoration(underline)}),
-  })
-  let userBodySpacer = style(list{height(px(16))})
-  let userBody = style(list{
-    backgroundColor(hex("ffffffc0")),
-    boxSizing(borderBox),
-    lineHeight(px(20)),
-    margin3(~top=zero, ~bottom=px(48), ~h=auto),
-    maxWidth(px(512)),
-    padding2(~v=px(16), ~h=px(24)),
-    borderRadius(px(8)),
-    whiteSpace(#preLine),
-    position(relative),
-    media(
-      "(max-width: 512px)",
-      list{
-        borderRadius(zero),
-        padding(px(16)),
-        marginBottom(zero),
-        borderBottom(px(1), solid, Colors.faintGray),
-      },
-    ),
-  })
-  let bodyText = style(list{fontSize(px(18))})
-  let followBlock = style(list{marginTop(px(16)), firstChild(list{marginTop(zero)})})
-  let followLink = style(list{textDecoration(none)})
-  let followLinkText = style(list{
-    media(
-      "(hover: hover)",
-      list{selector("." ++ (followLink ++ ":hover &"), list{textDecoration(underline)})},
-    ),
-  })
-}
-
-module FollowLink = {
-  type status =
-    | Success
-    | Error(string)
-
-  @react.component
-  let make = (~user: User.t, ~showLogin) => {
-    let (status, setStatus) = React.useState(() => None)
-
-    <div className=Styles.followBlock>
-      {switch status {
-      | Some(Success) =>
-        <div>
-          {React.string(j`🙌` ++ " Yay! You can find them on your ")}
-          <Link path="/friends"> {React.string("friends page")} </Link>
-          {React.string(".")}
-        </div>
-      | _ => <>
-          <a
-            href="#"
-            onClick={e => {
-              ReactEvent.Mouse.preventDefault(e)
-              Analytics.Amplitude.logEventWithProperties(
-                ~eventName="Friend Link Clicked",
-                ~eventProperties={
-                  "isLoggedIn": UserStore.isLoggedIn(),
-                  "followeeId": user.id,
-                },
-              )
-              if UserStore.isLoggedIn() {
-                %Repromise({
-                  let response = UserStore.followUser(~userId=user.id)
-                  switch response {
-                  | Ok() =>
-                    setStatus(_ => Some(Success))
-                    Analytics.Amplitude.logEventWithProperties(
-                      ~eventName="Friend Follow Success",
-                      ~eventProperties={"followeeId": user.id},
-                    )
-                  | Error(error) =>
-                    setStatus(_ => Some(Error(error)))
-                    Analytics.Amplitude.logEventWithProperties(
-                      ~eventName="Friend Follow Failed",
-                      ~eventProperties={
-                        "followeeId": user.id,
-                        "error": error,
-                      },
-                    )
-                  }
-                  Promise.resolved()
-                }) |> ignore
-              } else {
-                showLogin()
-              }
-            }}
-            className=Styles.followLink>
-            {React.string(j`😊 `)}
-            <span className=Styles.followLinkText>
-              {React.string("Add " ++ (user.username ++ " to my friends"))}
-            </span>
-          </a>
-          {switch status {
-          | Some(Error("")) => <div> {React.string(j`Oh no! Something went wrong 🙁`)} </div>
-          | Some(Error(error)) => <div> {React.string(error)} </div>
-          | _ => React.null
-          }}
-        </>
-      }}
-    </div>
-  }
-}
-
-@react.component
-let make = (~username, ~urlRest, ~url: ReasonReactRouter.url, ~showLogin) => {
-  let list = switch urlRest {
-  | list{url} => ViewingList.urlToViewingList(url)
-  | _ => None
-  }
-  let (user, setUser) = React.useState(() => None)
-  let isMountedRef = React.useRef(true)
-  let me = UserStore.useMe()
-  let isLoggedIn = me != None
-  let wasFollowing = React.useMemo2(() =>
-    switch (me, user) {
-    | (Some(me), Some(user: User.t)) =>
-      switch me.followeeIds {
-      | Some(followeeIds) => followeeIds |> Js.Array.includes(user.id)
-      | None => false
-      }
-    | _ => false
-    }
-  , (isLoggedIn, user))
-  React.useEffect0(() => {
-    open Webapi.Dom
-    window |> Window.scrollTo(0., 0.)
-    Some(() => React.Ref.setCurrent(isMountedRef, false))
-  })
-  React.useEffect1(() => {
-    %Repromise.JsExn({
-      let response = Fetch.fetchWithInit(
-        Constants.apiUrl ++ ("/users/" ++ username),
-        Fetch.RequestInit.make(
-          ~headers=Fetch.HeadersInit.make({
-            "X-Client-Version": Constants.gitCommitRef,
-          }),
-          (),
-        ),
-      )
-      switch Fetch.Response.status(response) {
-      | 200 =>
-        %Repromise.JsExn({
-          let json = Fetch.Response.json(response)
-          if React.Ref.current(isMountedRef) {
-            setUser(_ => Some(User.fromAPI(json)))
-          }
-          Promise.resolved()
-        })
-      | _ => Promise.resolved()
-      }
-    }) |> ignore
-    None
-  }, [username])
-  React.useEffect0(() => {
-    switch url.hash {
-    | "for-trade"
-    | "can-craft"
-    | "wishlist" =>
-      if urlRest == list{} {
-        ReasonReactRouter.replace(
-          "/" ++ (Js.Array.joinWith("/", Belt.List.toArray(url.path)) ++ ("/" ++ url.hash)),
-        )
-      }
-    | _ => ()
-    }
-    None
-  })
-  <div className=Styles.root>
-    <div className=Styles.username>
-      {switch list {
-      | Some(_) =>
-        <Link path={"/u/" ++ username} className=Styles.usernameLink>
-          {React.string(username)}
-        </Link>
-      | None => React.string(username)
-      }}
-    </div>
-    {switch user {
-    | Some(user) =>
-      <div>
-        {switch (user.profileText, wasFollowing) {
-        | ("", true) => React.null
-        | _ =>
-          <div className=Styles.userBody>
-            {switch user.profileText {
-            | "" => React.null
-            | profileText => <div> {Emoji.parseText(profileText)} </div>
-            }}
-            {!wasFollowing ? <FollowLink user showLogin /> : React.null}
-          </div>
-        }}
-        {switch list {
-        | Some(list) => <UserListBrowser user list url />
-        | None =>
-          if user.items->Js.Dict.keys->Js.Array.length > 0 {
-            <UserProfileBrowser
-              username
-              userItems={user.items
-              ->Js.Dict.entries
-              ->Belt.Array.keepMapU((. (itemKey, item)) =>
-                User.fromItemKey(~key=itemKey)->Belt.Option.map(x => (x, item))
-              )}
-              editable=false
-            />
-          } else {
-            <div className=Styles.emptyProfile>
-              <div className=Styles.bodyText>
-                {React.string(j`I have no items on my profile 😞`)}
-              </div>
-            </div>
-          }
-        }}
-      </div>
-    | None => React.null
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/Utils.res b/jscomp/syntax/tests/idempotency/nook-exchange/Utils.res
deleted file mode 100644
index 9a00182..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/Utils.res
+++ /dev/null
@@ -1,94 +0,0 @@
-@val @scope("Object")
-external objectAssign: (Js.Dict.t<'a>, Js.Dict.t<'a>) => unit = "assign"
-
-@val @scope("Object") @variadic
-external objectAssignMany: array<Js.Dict.t<'a>> => unit = "assign"
-
-let cloneJsDict = dict => {
-  let clone = Js.Dict.empty()
-  objectAssign(clone, dict)
-  clone
-}
-
-let combineJsDict = (dictA, dictB) => {
-  let combined = Js.Dict.empty()
-  objectAssignMany([combined, dictA, dictB])
-  combined
-}
-
-type any
-let _internalDeleteJsDictKey: (any, string) => unit = %raw(
-  "function(dict, key) { delete dict[key]; }"
-)
-external convertToAny: Js.Dict.t<'a> => any = "%identity"
-
-let deleteJsDictKey = (dict, key) => _internalDeleteJsDictKey(convertToAny(dict), key)
-
-let getElementForDomRef = domRef =>
-  domRef->React.Ref.current->Js.Nullable.toOption->Belt.Option.getExn
-
-let capitalizeFirstLetter = input =>
-  Js.String.toUpperCase(Js.String.charAt(0, input)) ++ (input |> Js.String.sliceToEnd(~from=1))
-
-let throttle = (fn, ms) => {
-  let timeoutRef = ref(None)
-  _ => {
-    switch timeoutRef.contents {
-    | Some(timeout) => Js.Global.clearTimeout(timeout)
-    | None => ()
-    }
-    timeoutRef := Some(Js.Global.setTimeout(() => {
-          timeoutRef := None
-          fn()
-        }, ms))
-  }
-}
-
-let useViewportWidth = () => {
-  let (viewportWidth, setViewportWidth) = React.useState(() => {
-    open Webapi.Dom
-    window |> Window.innerWidth
-  })
-  React.useEffect0(() => {
-    open Webapi.Dom
-    let onResize = _ => setViewportWidth(_ => window |> Window.innerWidth)
-    let onResize = throttle(onResize, 300)
-    window |> Window.addEventListener("resize", onResize)
-    Some(() => window |> Window.removeEventListener("resize", onResize))
-  })
-  viewportWidth
-}
-
-@get
-external mediaQueryListMatches: Webapi.Dom.Window.mediaQueryList => bool = "matches"
-let browserSupportsHover = {
-  open Webapi.Dom
-  window |> Window.matchMedia("(hover: hover)")
-}->mediaQueryListMatches
-
-let getPath = (~url: ReasonReactRouter.url) =>
-  "/" ++ (Belt.List.toArray(url.path) |> Js.Array.joinWith("/"))
-
-let getPathWithSearch = (~url: ReasonReactRouter.url) =>
-  "/" ++
-  ((Belt.List.toArray(url.path) |> Js.Array.joinWith("/")) ++
-  switch url.search {
-  | "" => ""
-  | search => "?" ++ search
-  })
-
-let getItemDetailUrl = (~itemId, ~variant) => {
-  let url = ReasonReactRouter.dangerouslyGetInitialUrl()
-  "/" ++
-  (Js.Array.joinWith("/", Belt.List.toArray(url.path)) ++
-  (switch url.search {
-  | "" => ""
-  | search => "?" ++ search
-  } ++
-  ("#i" ++
-  (string_of_int(itemId) ++
-  switch variant {
-  | Some(variant) => ":" ++ string_of_int(variant)
-  | None => ""
-  }))))
-}
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/ViewingList.res b/jscomp/syntax/tests/idempotency/nook-exchange/ViewingList.res
deleted file mode 100644
index 34cb16f..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/ViewingList.res
+++ /dev/null
@@ -1,46 +0,0 @@
-type t =
-  | ForTrade
-  | CanCraft
-  | Wishlist
-  | Catalog
-
-let viewingListToUrl = viewingList =>
-  switch viewingList {
-  | Wishlist => "wishlist"
-  | ForTrade => "for-trade"
-  | CanCraft => "can-craft"
-  | Catalog => "catalog"
-  }
-let urlToViewingList = url =>
-  switch url {
-  | "for-trade" => Some(ForTrade)
-  | "can-craft" => Some(CanCraft)
-  | "wishlist" => Some(Wishlist)
-  | "catalog" => Some(Catalog)
-  | _ => None
-  }
-let viewingListToEmoji = viewingList =>
-  switch viewingList {
-  | Wishlist => j`🙏`
-  | ForTrade => j`🤝`
-  | CanCraft => j`🔨`
-  | Catalog => j`📖`
-  }
-let viewingListToString = viewingList =>
-  switch viewingList {
-  | Wishlist => "Wishlist"
-  | ForTrade => "For Trade"
-  | CanCraft => "Can Craft"
-  | Catalog => "Catalog"
-  }
-
-let doesUserItemStatusMatchViewingList = (userItemStatus: User.itemStatus, viewingList: t) =>
-  switch (userItemStatus, viewingList) {
-  | (ForTrade, ForTrade)
-  | (CanCraft, CanCraft)
-  | (Wishlist, Wishlist)
-  | (ForTrade, Catalog)
-  | (CanCraft, Catalog)
-  | (CatalogOnly, Catalog) => true
-  | _ => false
-  }
diff --git a/jscomp/syntax/tests/idempotency/nook-exchange/WishlistToCatalog.res b/jscomp/syntax/tests/idempotency/nook-exchange/WishlistToCatalog.res
deleted file mode 100644
index b634b8c..0000000
--- a/jscomp/syntax/tests/idempotency/nook-exchange/WishlistToCatalog.res
+++ /dev/null
@@ -1,33 +0,0 @@
-module PersistConfig = {
-  let key = "confirm_wishlist_to_catalog"
-  let value = ref(Dom.Storage.localStorage |> Dom.Storage.getItem(key))
-  let confirm = () => {
-    let nowString = Js.Date.now()->Js.Float.toString
-    value := Some(nowString)
-    Dom.Storage.localStorage |> Dom.Storage.setItem(key, nowString)
-  }
-}
-
-let confirm = (~onConfirm) =>
-  if Belt.Option.isSome(PersistConfig.value.contents) {
-    onConfirm()
-  } else {
-    Analytics.Amplitude.logEventWithProperties(
-      ~eventName="Confirm Dialog Shown",
-      ~eventProperties={"id": "wishlistToCatalog"},
-    )
-    ConfirmDialog.confirm(
-      ~bodyText="Adding an item to your catalog will remove it from your Wishlist. Do you want to continue?",
-      ~confirmLabel="Move to catalog",
-      ~cancelLabel="Not now",
-      ~onConfirm=() => {
-        PersistConfig.confirm()
-        onConfirm()
-        Analytics.Amplitude.logEventWithProperties(
-          ~eventName="Confirm Dialog Confirmed",
-          ~eventProperties={"id": "wishlistToCatalog"},
-        )
-      },
-      (),
-    )
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesApply__Form.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesApply__Form.res
deleted file mode 100644
index 8a3f8c3..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesApply__Form.res
+++ /dev/null
@@ -1,83 +0,0 @@
-let str = React.string
-
-module CreateApplicantQuery = %graphql(`
-   mutation CreateApplicantMutation($courseId: ID!, $email: String!, $name: String!) {
-    createApplicant(courseId: $courseId, email: $email, name: $name){
-      success
-     }
-   }
- `)
-
-let createApplicant = (courseId, email, name, setSaving, setViewEmailSent, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  setSaving(_ => true)
-
-  CreateApplicantQuery.make(~courseId, ~email, ~name, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["createApplicant"]["success"] ? setViewEmailSent() : setSaving(_ => false)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let isInvalidEmail = email => email |> EmailUtils.isInvalid(false)
-let saveDisabled = (email, name, saving) => isInvalidEmail(email) || (saving || name == "")
-
-let buttonText = (email, name, saving) =>
-  switch (saving, email == "", isInvalidEmail(email), name == "") {
-  | (true, _, _, _) => "Saving"
-  | (false, true, _, _) => "Enter your Email"
-  | (false, false, true, _) => "Enter a valid Email"
-  | (false, false, false, true) => "Enter your full name"
-  | (false, false, false, false) => "Apply"
-  }
-
-@react.component
-let make = (~courseName, ~courseId, ~setViewEmailSent, ~email, ~name) => {
-  let (email, setEmail) = React.useState(() => email |> OptionUtils.default(""))
-  let (name, setName) = React.useState(() => name |> OptionUtils.default(""))
-  let (saving, setSaving) = React.useState(() => false)
-  <div className="flex flex-col">
-    <h4 className="font-bold"> {"Enroll to " ++ (courseName ++ " course") |> str} </h4>
-    <div className="w-full">
-      <div className="mt-4">
-        <label htmlFor="email" className="inline-block tracking-wide text-xs font-semibold">
-          {"Email" |> str}
-        </label>
-        <input
-          className="appearance-none h-10 mt-1 block w-full border border-gray-400 rounded py-2 px-4 text-sm bg-gray-100 hover:bg-gray-200 focus:outline-none focus:bg-white focus:border-primary-400"
-          type_="text"
-          id="email"
-          maxLength=128
-          value=email
-          disabled=saving
-          onChange={event => setEmail(ReactEvent.Form.target(event)["value"])}
-          placeholder="johnDoe@example.com"
-        />
-      </div>
-      <div className="mt-4">
-        <label htmlFor="name" className="inline-block tracking-wide text-xs font-semibold">
-          {"Name" |> str}
-        </label>
-        <input
-          className="appearance-none h-10 mt-1 block w-full border border-gray-400 rounded py-2 px-4 text-sm bg-gray-100 hover:bg-gray-200 focus:outline-none focus:bg-white focus:border-primary-400"
-          type_="text"
-          id="name"
-          value=name
-          maxLength=128
-          disabled=saving
-          onChange={event => setName(ReactEvent.Form.target(event)["value"])}
-          placeholder="John Doe"
-        />
-      </div>
-    </div>
-    <button
-      disabled={saveDisabled(email, name, saving)}
-      onClick={createApplicant(courseId, email, name, setSaving, setViewEmailSent)}
-      className="btn btn-primary btn-large text-center w-full mt-6">
-      {saving ? <FaIcon classes="fas fa-spinner fa-spin mr-2" /> : ReasonReact.null}
-      <span> {buttonText(email, name, saving) |> str} </span>
-    </button>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesApply__Root.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesApply__Root.res
deleted file mode 100644
index 6ae53cd..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesApply__Root.res
+++ /dev/null
@@ -1,80 +0,0 @@
-%raw(`require("../shared/background_patterns.css")`)
-%raw(`require("./CoursesApply__Root.css")`)
-
-@module("./images/email-sent-icon.svg")
-external emailSentIcon: string = "default"
-
-let str = React.string
-
-type views =
-  | Apply
-  | EmailSent
-
-let setViewEmailSent = (setView, ()) => setView(_ => EmailSent)
-
-let emailSentMessage = () =>
-  <div>
-    <img className="mx-auto w-44 sm:w-48" src=emailSentIcon />
-    <div className="text-xl font-bold text-center mt-4">
-      {"We've sent you a verification mail." |> str}
-    </div>
-    <p className="mt-4 text-center">
-      {"It should reach you in less than a minute. Click the link in the email to sign up, and get started." |> str}
-    </p>
-  </div>
-
-@react.component
-let make = (~courseName, ~courseId, ~thumbnailUrl, ~email, ~name, ~privacyPolicy, ~termsOfUse) => {
-  let (view, setView) = React.useState(() => Apply)
-
-  <div className="flex min-h-screen bg-gray-100 items-center justify-center">
-    <div className="py-8 w-full">
-      <div className="container mx-auto px-3 max-w-lg">
-        <div
-          className="relative flex flex-col shadow-xl rounded-lg overflow-hidden bg-white border">
-          <div className="flex flex-col text-gray-900 bg-gray-200 text-white">
-            <div className="relative pb-1/2 bg-primary-900">
-              {switch thumbnailUrl {
-              | Some(src) => <img className="absolute h-full w-full object-cover" src />
-              | None =>
-                <div
-                  className="course-apply__cover-default absolute h-full w-full svg-bg-pattern-1"
-                />
-              }}
-            </div>
-          </div>
-          <div className="">
-            <div className="p-4 pt-5 md:px-12 md:py-12 md:pt-10">
-              {switch view {
-              | Apply =>
-                <CoursesApply__Form
-                  courseName courseId setViewEmailSent={setViewEmailSent(setView)} email name
-                />
-              | EmailSent => emailSentMessage()
-              }}
-            </div>
-          </div>
-        </div>
-        <div className="text-center mt-4 text-gray-700">
-          {termsOfUse
-            ? <a
-                href="/agreements/terms-of-use"
-                className="text-xs cursor-pointer hover:text-primary-500">
-                {"Terms of Use" |> str}
-              </a>
-            : React.null}
-          {termsOfUse && privacyPolicy
-            ? <span className="px-4 text-gray-500" dangerouslySetInnerHTML={"__html": "&vert;"} />
-            : React.null}
-          {privacyPolicy
-            ? <a
-                href="/agreements/privacy-policy"
-                className="text-xs cursor-pointer hover:text-primary-500">
-                {"Privacy Policy" |> str}
-              </a>
-            : React.null}
-        </div>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum.res
deleted file mode 100644
index d448721..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum.res
+++ /dev/null
@@ -1,455 +0,0 @@
-%raw(`require("./CoursesCurriculum.css")`)
-
-@module("../images/level-lock.svg")
-external levelLockedImage: string = "default"
-
-open CoursesCurriculum__Types
-
-let str = React.string
-
-type state = {
-  selectedLevelId: string,
-  showLevelZero: bool,
-  latestSubmissions: list<LatestSubmission.t>,
-  statusOfTargets: list<TargetStatus.t>,
-  notice: Notice.t,
-}
-
-let targetStatusClasses = targetStatus => {
-  let statusClasses =
-    "curriculum__target-status--" ++
-    (targetStatus |> TargetStatus.statusToString |> Js.String.toLowerCase)
-  "curriculum__target-status px-3 py-px ml-4 h-6 " ++ statusClasses
-}
-
-let rendertarget = (target, statusOfTargets) => {
-  let targetId = target |> Target.id
-  let targetStatus =
-    statusOfTargets |> ListUtils.unsafeFind(
-      ts => ts |> TargetStatus.targetId == targetId,
-      "Could not find targetStatus for listed target with ID " ++ targetId,
-    )
-
-  <Link
-    href={"/targets/" ++ targetId}
-    key={"target-" ++ targetId}
-    className="bg-white border-t p-6 flex items-center justify-between hover:bg-gray-200 hover:text-primary-500 cursor-pointer"
-    ariaLabel={"Select Target " ++ targetId}>
-    <span className="font-semibold text-left leading-snug"> {target |> Target.title |> str} </span>
-    <span className={targetStatusClasses(targetStatus)}>
-      {targetStatus |> TargetStatus.statusToString |> str}
-    </span>
-  </Link>
-}
-
-let renderTargetGroup = (targetGroup, targets, statusOfTargets) => {
-  let targetGroupId = targetGroup |> TargetGroup.id
-  let targets = targets |> List.filter(t => t |> Target.targetGroupId == targetGroupId)
-
-  <div
-    key={"target-group-" ++ targetGroupId}
-    className="curriculum__target-group-container relative mt-5 px-3">
-    <div
-      className="curriculum__target-group max-w-3xl mx-auto bg-white text-center rounded-lg shadow-md relative z-10 overflow-hidden ">
-      {targetGroup |> TargetGroup.milestone
-        ? <div
-            className="inline-block px-3 py-2 bg-orange-400 font-bold text-xs rounded-b-lg leading-tight text-white uppercase">
-            {"Milestone targets" |> str}
-          </div>
-        : React.null}
-      <div className="p-6 pt-5">
-        <div className="text-2xl font-bold leading-snug">
-          {targetGroup |> TargetGroup.name |> str}
-        </div>
-        <div className="text-sm max-w-md mx-auto leading-snug mt-1">
-          {targetGroup |> TargetGroup.description |> str}
-        </div>
-      </div>
-      {targets
-      |> List.sort((t1, t2) => (t1 |> Target.sortIndex) - (t2 |> Target.sortIndex))
-      |> List.map(target => rendertarget(target, statusOfTargets))
-      |> Array.of_list
-      |> React.array}
-    </div>
-  </div>
-}
-
-let addSubmission = (setState, latestSubmission) =>
-  setState(state => {
-    let withoutSubmissionForThisTarget =
-      state.latestSubmissions |> List.filter(s =>
-        s |> LatestSubmission.targetId != (latestSubmission |> LatestSubmission.targetId)
-      )
-
-    {
-      ...state,
-      latestSubmissions: list{latestSubmission, ...withoutSubmissionForThisTarget},
-    }
-  })
-
-let handleLockedLevel = level =>
-  <div className="max-w-xl mx-auto text-center mt-4">
-    <div className="font-semibold text-2xl font-bold px-3"> {"Level Locked" |> str} </div>
-    <img className="max-w-sm mx-auto" src=levelLockedImage />
-    {switch level |> Level.unlockOn {
-    | Some(date) =>
-      let dateString = date |> DateFns.parseString |> DateFns.format("MMMM D, YYYY")
-      <div className="font-semibold text-md px-3">
-        <p> {"The level is currently locked!" |> str} </p>
-        <p> {"You can access the content on " ++ (dateString ++ ".") |> str} </p>
-      </div>
-    | None => React.null
-    }}
-  </div>
-
-let statusOfMilestoneTargets = (targetGroups, targets, level, statusOfTargets) => {
-  let targetGroupsInLevel =
-    targetGroups |> List.filter(tg => tg |> TargetGroup.levelId == (level |> Level.id))
-  let milestoneTargetGroupIds =
-    targetGroupsInLevel
-    |> List.filter(tg => tg |> TargetGroup.milestone)
-    |> List.map(tg => tg |> TargetGroup.id)
-
-  let milestoneTargetIds =
-    targets
-    |> List.filter(t => (t |> Target.targetGroupId)->List.mem(milestoneTargetGroupIds))
-    |> List.map(t => t |> Target.id)
-
-  statusOfTargets |> List.filter(ts => (ts |> TargetStatus.targetId)->List.mem(milestoneTargetIds))
-}
-
-let isLevelComplete = (targetStatuses, eligibleStatuses) =>
-  targetStatuses |> ListUtils.isNotEmpty &&
-    targetStatuses |> TargetStatus.matchesStatuses(eligibleStatuses)
-
-let computeLevelUp = (
-  levels,
-  teamLevel,
-  targetGroups,
-  targets,
-  statusOfTargets,
-  accessLockedLevels,
-) => {
-  let lastLevel = switch teamLevel |> Level.number {
-  | 0
-  | 1 =>
-    None
-  | levelTwoOrAbove => levels |> ListUtils.findOpt(l => l |> Level.number == levelTwoOrAbove - 1)
-  }
-
-  let statusOfCurrentMilestoneTargets = statusOfMilestoneTargets(
-    targetGroups,
-    targets,
-    teamLevel,
-    statusOfTargets,
-  )
-
-  let currentLevelComplete = isLevelComplete(
-    statusOfCurrentMilestoneTargets,
-    TargetStatus.currentLevelStatuses,
-  )
-
-  let lastLevelComplete = switch lastLevel {
-  | None => true
-  | Some(level) =>
-    let statusOfLastMilestoneTargets = statusOfMilestoneTargets(
-      targetGroups,
-      targets,
-      level,
-      statusOfTargets,
-    )
-
-    isLevelComplete(statusOfLastMilestoneTargets, TargetStatus.lastLevelStatuses)
-  }
-
-  let nextLevel =
-    levels |> ListUtils.findOpt(l => l |> Level.number == (teamLevel |> Level.number) + 1)
-
-  switch (nextLevel, currentLevelComplete, lastLevelComplete) {
-  | (Some(level), true, true) =>
-    level |> Level.isUnlocked || accessLockedLevels ? Notice.LevelUp : Nothing
-  | (None, true, true) => CourseComplete
-  | (Some(_), true, false) => LevelUpBlocked(teamLevel |> Level.number)
-  | (Some(_) | None, false, false | true)
-  | (None, true, false) =>
-    Nothing
-  }
-}
-
-let computeNotice = (
-  levels,
-  teamLevel,
-  targetGroups,
-  targets,
-  statusOfTargets,
-  course,
-  team,
-  preview,
-  accessLockedLevels,
-) =>
-  switch (preview, course |> Course.hasEnded, team |> Team.accessEnded) {
-  | (true, _, _) => Notice.Preview
-  | (false, true, true | false) => CourseEnded
-  | (false, false, true) => AccessEnded
-  | (false, false, false) =>
-    computeLevelUp(levels, teamLevel, targetGroups, targets, statusOfTargets, accessLockedLevels)
-  }
-
-let navigationLink = (direction, level, setState) => {
-  let (leftIcon, longText, shortText, rightIcon) = switch direction {
-  | #Previous => (Some("fa-arrow-left"), "Previous Level", "Previous", None)
-  | #Next => (None, "Next Level", "Next", Some("fa-arrow-right"))
-  }
-
-  let arrow = icon =>
-    icon->Belt.Option.mapWithDefault(React.null, icon => <FaIcon classes={"fas " ++ icon} />)
-
-  <button
-    onClick={_ => setState(state => {...state, selectedLevelId: level |> Level.id})}
-    className="block w-full focus:outline-none p-4 text-center border rounded-lg bg-gray-100 hover:bg-gray-200 cursor-pointer">
-    {arrow(leftIcon)}
-    <span className="mx-2 hidden md:inline"> {longText |> str} </span>
-    <span className="mx-2 inline md:hidden"> {shortText |> str} </span>
-    {arrow(rightIcon)}
-  </button>
-}
-
-let quickNavigationLinks = (levels, selectedLevel, setState) => {
-  let previous = selectedLevel |> Level.previous(levels)
-  let next = selectedLevel |> Level.next(levels)
-
-  <div>
-    <hr className="my-6" />
-    <div className="container mx-auto max-w-3xl flex px-3 lg:px-0">
-      {switch (previous, next) {
-      | (Some(previousLevel), Some(nextLevel)) =>
-        [
-          <div key="previous" className="w-1/2 mr-2">
-            {navigationLink(#Previous, previousLevel, setState)}
-          </div>,
-          <div key="next" className="w-1/2 ml-2">
-            {navigationLink(#Next, nextLevel, setState)}
-          </div>,
-        ] |> React.array
-
-      | (Some(previousUrl), None) =>
-        <div className="w-full"> {navigationLink(#Previous, previousUrl, setState)} </div>
-      | (None, Some(nextUrl)) =>
-        <div className="w-full"> {navigationLink(#Next, nextUrl, setState)} </div>
-      | (None, None) => React.null
-      }}
-    </div>
-  </div>
-}
-
-@react.component
-let make = (
-  ~course,
-  ~levels,
-  ~targetGroups,
-  ~targets,
-  ~submissions,
-  ~team,
-  ~coaches,
-  ~users,
-  ~evaluationCriteria,
-  ~preview,
-  ~accessLockedLevels,
-) => {
-  let url = ReasonReactRouter.useUrl()
-
-  let selectedTarget = switch url.path {
-  | list{"targets", targetId, ..._} =>
-    Some(
-      targets |> ListUtils.unsafeFind(
-        t => t |> Target.id == targetId,
-        "Could not find selectedTarget with ID " ++ targetId,
-      ),
-    )
-  | _ => None
-  }
-
-  /* Level selection is a bit complicated because of how the selector for L0 is
-   * separate from the other levels. selectedLevelId is the numbered level
-   * selected by the user, whereas showLevelZero is the toggle on the title of
-   * L0 determining whether the user has picked it or not - it'll show up only
-   * if L0 is available, and will override the selectedLevelId. This rule is
-   * used to determine currentLevelId, which is the actual level whose contents
-   * are shown on the page. */
-
-  let levelZero = levels |> ListUtils.findOpt(l => l |> Level.number == 0)
-  let teamLevelId = team |> Team.levelId
-
-  let teamLevel =
-    levels |> ListUtils.unsafeFind(
-      l => l |> Level.id == teamLevelId,
-      "Could not find teamLevel with ID " ++ teamLevelId,
-    )
-
-  let targetLevelId = switch selectedTarget {
-  | Some(target) =>
-    let targetGroupId = target |> Target.targetGroupId
-
-    let targetGroup =
-      targetGroups |> ListUtils.unsafeFind(
-        t => t |> TargetGroup.id == targetGroupId,
-        "Could not find targetGroup with ID " ++ targetGroupId,
-      )
-
-    Some(targetGroup |> TargetGroup.levelId)
-  | None => None
-  }
-
-  /* Curried function so that this can be re-used when a new submission is created. */
-  let computeTargetStatus = TargetStatus.compute(
-    preview,
-    team,
-    course,
-    levels,
-    targetGroups,
-    targets,
-  )
-
-  let initialRender = React.useRef(true)
-
-  let (state, setState) = React.useState(() => {
-    let statusOfTargets = computeTargetStatus(submissions)
-
-    {
-      selectedLevelId: switch (preview, targetLevelId, levelZero) {
-      | (true, None, None) => levels |> Level.first |> Level.id
-      | (_, Some(targetLevelId), Some(levelZero)) =>
-        levelZero |> Level.id == targetLevelId ? teamLevelId : targetLevelId
-      | (_, Some(targetLevelId), None) => targetLevelId
-      | (_, None, _) => teamLevelId
-      },
-      showLevelZero: switch (levelZero, targetLevelId) {
-      | (Some(levelZero), Some(targetLevelId)) => levelZero |> Level.id == targetLevelId
-      | (Some(_), None)
-      | (None, Some(_))
-      | (None, None) => false
-      },
-      latestSubmissions: submissions,
-      statusOfTargets: statusOfTargets,
-      notice: computeNotice(
-        levels,
-        teamLevel,
-        targetGroups,
-        targets,
-        statusOfTargets,
-        course,
-        team,
-        preview,
-        accessLockedLevels,
-      ),
-    }
-  })
-
-  let currentLevelId = switch (levelZero, state.showLevelZero) {
-  | (Some(levelZero), true) => levelZero |> Level.id
-  | (Some(_), false)
-  | (None, true | false) =>
-    state.selectedLevelId
-  }
-
-  let currentLevel =
-    levels |> ListUtils.unsafeFind(
-      l => l |> Level.id == currentLevelId,
-      "Could not find currentLevel with id " ++ currentLevelId,
-    )
-
-  let selectedLevel =
-    levels |> ListUtils.unsafeFind(
-      l => l |> Level.id == state.selectedLevelId,
-      "Could not find selectedLevel with id " ++ state.selectedLevelId,
-    )
-
-  React.useEffect1(() => {
-    if initialRender |> React.Ref.current {
-      initialRender->React.Ref.setCurrent(false)
-    } else {
-      let newStatusOfTargets = computeTargetStatus(state.latestSubmissions)
-
-      setState(state => {
-        ...state,
-        statusOfTargets: newStatusOfTargets,
-        notice: computeNotice(
-          levels,
-          teamLevel,
-          targetGroups,
-          targets,
-          newStatusOfTargets,
-          course,
-          team,
-          preview,
-          accessLockedLevels,
-        ),
-      })
-    }
-    None
-  }, [state.latestSubmissions])
-
-  let targetGroupsInLevel =
-    targetGroups |> List.filter(tg => tg |> TargetGroup.levelId == currentLevelId)
-
-  <div className="bg-gray-100 pt-11 pb-8 -mt-7">
-    {switch selectedTarget {
-    | Some(target) =>
-      let targetStatus =
-        state.statusOfTargets |> ListUtils.unsafeFind(
-          ts => ts |> TargetStatus.targetId == (target |> Target.id),
-          "Could not find targetStatus for selectedTarget with ID " ++ (target |> Target.id),
-        )
-
-      <CoursesCurriculum__Overlay
-        target
-        course
-        targetStatus
-        addSubmissionCB={addSubmission(setState)}
-        targets
-        statusOfTargets=state.statusOfTargets
-        users
-        evaluationCriteria
-        coaches
-        preview
-      />
-
-    | None => React.null
-    }}
-    <CoursesCurriculum__NoticeManager notice=state.notice course />
-    {switch state.notice {
-    | LevelUp => React.null
-    | _anyOtherNotice =>
-      <div className="relative">
-        <CoursesCurriculum__LevelSelector
-          levels
-          teamLevel
-          selectedLevel
-          setSelectedLevelId={selectedLevelId =>
-            setState(state => {...state, selectedLevelId: selectedLevelId})}
-          showLevelZero=state.showLevelZero
-          setShowLevelZero={showLevelZero =>
-            setState(state => {...state, showLevelZero: showLevelZero})}
-          levelZero
-        />
-        {currentLevel |> Level.isLocked && accessLockedLevels
-          ? <div className="text-center p-3 mt-5 border rounded-lg bg-blue-100 max-w-3xl mx-auto">
-              {"This level is still locked for students, and will be unlocked on " |> str}
-              <strong> {currentLevel |> Level.unlockDateString |> str} </strong>
-              {"." |> str}
-            </div>
-          : React.null}
-        {currentLevel |> Level.isUnlocked || accessLockedLevels
-          ? targetGroupsInLevel
-            |> TargetGroup.sort
-            |> List.map(targetGroup =>
-              renderTargetGroup(targetGroup, targets, state.statusOfTargets)
-            )
-            |> Array.of_list
-            |> React.array
-          : handleLockedLevel(currentLevel)}
-      </div>
-    }}
-    {state.showLevelZero ? React.null : quickNavigationLinks(levels, selectedLevel, setState)}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__AutoVerify.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__AutoVerify.res
deleted file mode 100644
index 1c438b6..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__AutoVerify.res
+++ /dev/null
@@ -1,128 +0,0 @@
-let str = React.string
-
-open CoursesCurriculum__Types
-module TargetStatus = CoursesCurriculum__TargetStatus
-
-module AutoVerifySubmissionQuery = %graphql(`
-   mutation AutoVerifySubmissionMutation($targetId: ID!) {
-    autoVerifySubmission(targetId: $targetId){
-      submission{
-        id
-        createdAt
-      }
-     }
-   }
- `)
-
-let redirect = link => {
-  let window = Webapi.Dom.window
-
-  window |> Webapi.Dom.Window.open_(~url=link, ~name="_blank", ~features="") |> ignore
-}
-
-let handleSuccess = (submission, linkToComplete, addSubmissionCB) => {
-  addSubmissionCB(
-    Submission.make(
-      ~id=submission["id"],
-      ~createdAt=submission["createdAt"],
-      ~status=Submission.MarkedAsComplete,
-      ~checklist=[],
-    ),
-  )
-  switch linkToComplete {
-  | Some(link) => redirect(link)
-  | None => ()
-  }
-}
-
-let createAutoVerifySubmission = (target, linkToComplete, setSaving, addSubmissionCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  setSaving(_ => true)
-
-  AutoVerifySubmissionQuery.make(~targetId=target |> Target.id, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    switch response["autoVerifySubmission"]["submission"] {
-    | Some(details) => handleSuccess(details, linkToComplete, addSubmissionCB)
-    | None => setSaving(_ => false)
-    }
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let completeButtonText = (title, iconClasses) =>
-  <span> <FaIcon classes={iconClasses ++ " mr-2"} /> {title |> str} </span>
-
-let previewLinkToComplete = link =>
-  <a
-    href=link
-    target="_blank"
-    className="block text-primary-500 w-full text-center bg-gray-200 hover:bg-gray-300 hover:text-primary-600 p-4 rounded text-lg font-bold">
-    <span> <FaIcon classes="fas fa-external-link-alt mr-2" /> {"Visit Link " |> str} </span>
-  </a>
-
-let autoVerify = (target, linkToComplete, saving, setSaving, addSubmissionCB, preview) =>
-  /* Handle special case for preview mode with link to complete */
-  switch (preview, linkToComplete) {
-  | (true, Some(link)) => previewLinkToComplete(link)
-  | _ =>
-    <button
-      disabled={saving || preview}
-      className="flex rounded btn-success text-lg justify-center w-full font-bold p-4  "
-      onClick={createAutoVerifySubmission(target, linkToComplete, setSaving, addSubmissionCB)}>
-      {switch (saving, linkToComplete) {
-      | (true, _) => completeButtonText("Saving", "fas fa-spinner fa-spin")
-      | (false, Some(_)) => completeButtonText("Visit Link To Complete", "fas fa-external-link-alt")
-      | (false, None) => completeButtonText("Mark As Complete", "fas fa-check-square")
-      }}
-    </button>
-  }
-
-let statusBar = (string, linkToComplete) => {
-  let defaultClasses = "font-bold p-4 flex w-full items-center text-green-500 bg-green-100 justify-center"
-  let message =
-    <div className="flex items-center">
-      <span className="fa-stack text-lg mr-1 text-green-500">
-        <i className="fas fa-certificate fa-stack-2x" />
-        <i className="fas fa-check fa-stack-1x fa-inverse" />
-      </span>
-      <span> {string |> str} </span>
-    </div>
-  let visitLink = link =>
-    <a className="text-right w-full" href=link target="_blank">
-      <i className="fas fa-external-link-alt mr-2" /> {"Visit Link" |> str}
-    </a>
-
-  <div className=defaultClasses>
-    message
-    {switch linkToComplete {
-    | Some(link) => visitLink(link)
-    | None => React.null
-    }}
-  </div>
-}
-
-let completionInstructionText = linkToComplete =>
-  switch linkToComplete {
-  | Some(_) => "Before visiting the link..."
-  | None => "Before marking as complete..."
-  }
-
-@react.component
-let make = (~target, ~targetDetails, ~targetStatus, ~addSubmissionCB, ~preview) => {
-  let (saving, setSaving) = React.useState(() => false)
-  let linkToComplete = targetDetails |> TargetDetails.linkToComplete
-  [
-    <CoursesCurriculum__CompletionInstructions
-      key="completion-instructions" targetDetails title={completionInstructionText(linkToComplete)}
-    />,
-    <div className="mt-5" id="auto-verify-target" key="completion-button">
-      {switch targetStatus |> TargetStatus.status {
-      | Pending => autoVerify(target, linkToComplete, saving, setSaving, addSubmissionCB, preview)
-      | Locked(_) => React.null
-      | _ => statusBar("Completed", linkToComplete)
-      }}
-    </div>,
-  ] |> React.array
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__ChecklistItem.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__ChecklistItem.res
deleted file mode 100644
index 7c51e57..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__ChecklistItem.res
+++ /dev/null
@@ -1,153 +0,0 @@
-type file = {
-  id: string,
-  name: string,
-}
-
-type rec result =
-  | Files(array<file>)
-  | Link(string)
-  | ShortText(string)
-  | LongText(string)
-  | MultiChoice(choices, option<int>)
-
-and choices = array<string>
-
-type t = {
-  title: string,
-  optional: bool,
-  result: result,
-}
-
-let title = t => t.title
-
-let result = t => t.result
-
-let optional = t => t.optional
-
-let make = (~result, ~title, ~optional) => {result: result, title: title, optional: optional}
-
-let fromTargetChecklistItem = targetChecklist =>
-  targetChecklist |> Array.map(tc => {
-    let title = tc |> TargetChecklistItem.title
-    let optional = tc |> TargetChecklistItem.optional
-    let result = switch tc |> TargetChecklistItem.kind {
-    | Files => Files([])
-    | Link => Link("")
-    | ShortText => ShortText("")
-    | LongText => LongText("")
-    | MultiChoice(choices) => MultiChoice(choices, None)
-    }
-    make(~title, ~optional, ~result)
-  })
-
-let updateResultAtIndex = (index, result, checklist) =>
-  checklist |> Array.mapi((i, c) => i == index ? {...c, result: result} : c)
-
-let makeFile = (id, name) => {id: id, name: name}
-
-let filename = file => file.name
-
-let fileId = file => file.id
-
-let fileIds = checklist =>
-  checklist
-  |> Array.map(c =>
-    switch c.result {
-    | Files(files) => files |> Array.map(a => a.id) |> Array.to_list
-    | _anyOtherResult => list{}
-    }
-  )
-  |> ArrayUtils.flatten
-
-let kindAsString = t =>
-  switch t.result {
-  | Files(_) => "files"
-  | Link(_) => "link"
-  | ShortText(_) => "shortText"
-  | LongText(_) => "longText"
-  | MultiChoice(_, _) => "multiChoice"
-  }
-
-let resultAsString = t =>
-  switch t.result {
-  | Files(_) => "files"
-  | Link(t)
-  | ShortText(t)
-  | LongText(t) => t
-  | MultiChoice(choices, index) =>
-    index |> OptionUtils.flatMap(i => choices |> ArrayUtils.getOpt(i)) |> OptionUtils.default("")
-  }
-
-let validString = (s, maxLength) => {
-  let length = s |> String.trim |> String.length
-  length >= 1 && length <= maxLength
-}
-
-let validShortText = s => validString(s, 250)
-
-let validLongText = s => validString(s, 5000)
-
-let validFiles = files => files != [] && files |> Array.length < 3
-
-let validMultiChoice = (choices, index) =>
-  index |> OptionUtils.mapWithDefault(i => choices |> Array.length > i, false)
-
-let validResponse = (response, allowBlank) => {
-  let optional = allowBlank ? response.optional : false
-
-  switch (response.result, optional) {
-  | (Files(files), false) => validFiles(files)
-  | (Files(files), true) => files |> ArrayUtils.isEmpty || validFiles(files)
-  | (Link(link), false) => link |> UrlUtils.isValid(false)
-  | (Link(link), true) => link |> UrlUtils.isValid(true)
-  | (ShortText(t), false) => validShortText(t)
-  | (ShortText(t), true) => validShortText(t) || t == ""
-  | (LongText(t), false) => validLongText(t)
-  | (LongText(t), true) => validLongText(t) || t == ""
-  | (MultiChoice(choices, index), false) => validMultiChoice(choices, index)
-  | (MultiChoice(choices, index), true) => validMultiChoice(choices, index) || index == None
-  }
-}
-
-let validChecklist = checklist =>
-  checklist
-  |> Array.map(c => validResponse(c, true))
-  |> Js.Array.filter(c => !c)
-  |> ArrayUtils.isEmpty
-
-let validResonses = responses => responses |> Js.Array.filter(c => validResponse(c, false))
-
-let encode = t => {
-  open Json.Encode
-  object_(list{
-    ("title", t.title |> string),
-    ("kind", kindAsString(t) |> string),
-    ("status", "noAnswer" |> string),
-    ("result", resultAsString(t) |> string),
-  })
-}
-
-let encodeArray = checklist =>
-  validResonses(checklist) |> {
-    open Json.Encode
-    array(encode)
-  }
-
-let makeFiles = checklist =>
-  checklist
-  |> Js.Array.find(c =>
-    switch c.result {
-    | Files(_files) => true
-    | _anyOtherResult => false
-    }
-  )
-  |> OptionUtils.mapWithDefault(c =>
-    switch c.result {
-    | Files(files) => files
-    | _anyOtherResult => []
-    }
-  , [])
-  |> Array.map(f => {
-    let url = "/timeline_event_files/" ++ (f.id ++ "/download")
-    SubmissionChecklistItem.makeFile(~name=f.name, ~id=f.id, ~url)
-  })
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Coach.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Coach.res
deleted file mode 100644
index 4b93c20..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Coach.res
+++ /dev/null
@@ -1,15 +0,0 @@
-type t = {
-  id: string,
-  userId: string,
-}
-
-let id = t => t.id
-let userId = t => t.userId
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    userId: json |> field("userId", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Community.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Community.res
deleted file mode 100644
index 6670c29..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Community.res
+++ /dev/null
@@ -1,37 +0,0 @@
-type question = {
-  questionId: string,
-  questionTitle: string,
-}
-
-type t = {
-  id: string,
-  name: string,
-  questions: list<question>,
-}
-
-let decodeQuestion = json => {
-  open Json.Decode
-  {
-    questionId: json |> field("id", string),
-    questionTitle: json |> field("title", string),
-  }
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    questions: json |> field("questions", list(decodeQuestion)),
-  }
-}
-
-let id = t => t.id
-
-let name = t => t.name
-
-let questions = t => t.questions
-
-let questionId = question => question.questionId
-
-let questionTitle = question => question.questionTitle
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__CompletionInstructions.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__CompletionInstructions.res
deleted file mode 100644
index 0179cd4..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__CompletionInstructions.res
+++ /dev/null
@@ -1,20 +0,0 @@
-let str = React.string
-
-open CoursesCurriculum__Types
-
-@react.component
-let make = (~targetDetails, ~title) =>
-  switch targetDetails |> TargetDetails.completionInstructions {
-  | Some(completionInstructions) =>
-    <div
-      className="flex flex-col sm:flex-row mt-4 bg-yellow-100 rounded-lg border border-yellow-500 overflow-hidden">
-      <div className="bg-yellow-500 p-4 sm:py-8 sm:px-7 flex-shrink-0 text-center">
-        <Icon className="if i-lamp-solid text-3xl sm:text-5xl text-yellow-800" />
-      </div>
-      <div className="p-5 text-center sm:text-left">
-        <h4 className="font-semibold text-lg"> {title |> str} </h4>
-        <p className="mt-1 leading-snug"> {completionInstructions |> str} </p>
-      </div>
-    </div>
-  | None => React.null
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Course.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Course.res
deleted file mode 100644
index 194823d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Course.res
+++ /dev/null
@@ -1,21 +0,0 @@
-type t = {
-  id: string,
-  endsAt: option<string>,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    endsAt: json |> field("endsAt", nullable(string)) |> Js.Null.toOption,
-  }
-}
-
-let endsAt = t => t.endsAt
-let id = t => t.id
-
-let hasEnded = t =>
-  switch t.endsAt {
-  | Some(date) => date |> DateFns.parseString |> DateFns.isPast
-  | None => false
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Discuss.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Discuss.res
deleted file mode 100644
index 68e668d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Discuss.res
+++ /dev/null
@@ -1,83 +0,0 @@
-let str = React.string
-
-open CoursesCurriculum__Types
-
-let linkToCommunity = (communityId, targetId) =>
-  "/communities/" ++ (communityId ++ ("?target_id=" ++ targetId))
-
-let linkToNewQuestion = (communityId, targetId) =>
-  "/communities/" ++ (communityId ++ ("/new_question" ++ ("?target_id=" ++ targetId)))
-
-let questionCard = question => {
-  let questionId = question |> Community.questionId
-  let questionLink = "/questions/" ++ questionId
-  <div
-    href=questionLink
-    key=questionId
-    className="flex justify-between items-center px-5 py-4 bg-white border-t">
-    <span className="text-sm font-semibold"> {question |> Community.questionTitle |> str} </span>
-    <a href=questionLink className="btn btn-primary-ghost btn-small"> {"View" |> str} </a>
-  </div>
-}
-
-let handleEmpty = () =>
-  <div className="flex flex-col justify-center items-center bg-white px-3 py-10">
-    <i className="fa fa-comments text-5xl text-gray-600 mb-2 " />
-    <div className="text-center">
-      <h4 className="font-bold">
-        {"There's been no recent discussion about this target." |> str}
-      </h4>
-      <p> {"Use the community to clear your doubts, and to help your peers!" |> str} </p>
-    </div>
-  </div>
-
-let actionButtons = (community, targetId) => {
-  let communityId = community |> Community.id
-  let communityName = community |> Community.name
-
-  <div className="flex">
-    <a
-      title={"Browse all questions about this target in the " ++ (communityName ++ " community")}
-      href={linkToCommunity(communityId, targetId)}
-      className="btn btn-default mr-3">
-      {"Go to community" |> str}
-    </a>
-    <a
-      title={"Ask a question in the " ++ (communityName ++ " community")}
-      href={linkToNewQuestion(communityId, targetId)}
-      className="btn btn-primary">
-      {"Ask a question" |> str}
-    </a>
-  </div>
-}
-
-let communityTitle = community =>
-  <h5 className="font-bold">
-    {"Questions from " ++ ((community |> Community.name) ++ " community") |> str}
-  </h5>
-
-@react.component
-let make = (~targetId, ~communities) =>
-  <div className="">
-    {communities
-    |> List.map(community => {
-      let communityId = community |> Community.id
-      <div key=communityId className="mt-12 bg-gray-100 px-6 py-4 rounded-lg">
-        <div className="flex flex-col md:flex-row w-full justify-between pb-3 items-center">
-          <div> {communityTitle(community)} </div> {actionButtons(community, targetId)}
-        </div>
-        <div className="justify-between rounded-lg overflow-hidden shadow">
-          {switch community |> Community.questions {
-          | list{} => handleEmpty()
-          | questions =>
-            questions
-            |> List.map(question => questionCard(question))
-            |> Array.of_list
-            |> React.array
-          }}
-        </div>
-      </div>
-    })
-    |> Array.of_list
-    |> React.array}
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Feedback.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Feedback.res
deleted file mode 100644
index 26d2d78..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Feedback.res
+++ /dev/null
@@ -1,23 +0,0 @@
-type id = string
-
-type t = {
-  id: id,
-  coachId: string,
-  submissionId: string,
-  feedback: string,
-}
-
-let id = t => t.id
-let coachId = t => t.coachId
-let submissionId = t => t.submissionId
-let feedback = t => t.feedback
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    coachId: json |> field("coachId", string),
-    submissionId: json |> field("submissionId", string),
-    feedback: json |> field("feedback", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__FileForm.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__FileForm.res
deleted file mode 100644
index 1f95a0d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__FileForm.res
+++ /dev/null
@@ -1,152 +0,0 @@
-exception FormNotFound(string)
-exception UnexpectedResponse(int)
-
-let str = React.string
-
-type state = {
-  formId: string,
-  filename: string,
-  errors: list<string>,
-}
-
-type action =
-  | AttachFile(string)
-  | SelectFile(string, list<string>)
-  | ResetForm
-
-let defaultTitle = "Choose file to upload"
-
-let reducer = (state, action) =>
-  switch action {
-  | AttachFile(filename) => {...state, filename: filename, errors: list{}}
-  | SelectFile(filename, errors) => {...state, filename: filename, errors: errors}
-  | ResetForm => {...state, errors: list{}, filename: defaultTitle}
-  }
-
-let handleResponseJSON = (filename, send, attachFileCB, json) => {
-  let id = json |> {
-    open Json.Decode
-    field("id", string)
-  }
-  attachFileCB(id, filename)
-  send(ResetForm)
-}
-
-let handleApiError = x =>
-  switch x {
-  | UnexpectedResponse(code) => code
-  }
-
-let uploadFile = (filename, send, attachFileCB, formData) => {
-  open Js.Promise
-  Fetch.fetchWithInit(
-    "/timeline_event_files/",
-    Fetch.RequestInit.make(
-      ~method_=Post,
-      ~body=Fetch.BodyInit.makeWithFormData(formData),
-      ~credentials=Fetch.SameOrigin,
-      (),
-    ),
-  )
-  |> then_(response =>
-    if Fetch.Response.ok(response) {
-      response |> Fetch.Response.json
-    } else {
-      Js.Promise.reject(UnexpectedResponse(response |> Fetch.Response.status))
-    }
-  )
-  |> then_(json => handleResponseJSON(filename, send, attachFileCB, json) |> resolve)
-  |> catch(error =>
-    switch error |> handleApiError {
-    | Some(code) =>
-      Notification.error(
-        "Error " ++ (code |> string_of_int),
-        "Please reload the page and try again.",
-      )
-    | None =>
-      Notification.error(
-        "Something went wrong!",
-        "Our team has been notified of this error. Please reload the page and try again.",
-      )
-    } |> resolve
-  )
-  |> ignore
-}
-
-let submitForm = (filename, formId, send, addFileAttachmentCB) => {
-  let element = ReactDOMRe._getElementById(formId)
-  switch element {
-  | Some(element) =>
-    DomUtils.FormData.create(element) |> uploadFile(filename, send, addFileAttachmentCB)
-  | None => raise(FormNotFound(formId))
-  }
-}
-
-let attachFile = (state, send, attachingCB, attachFileCB, preview, event) =>
-  preview
-    ? Notification.notice("Preview Mode", "You cannot attach files.")
-    : switch ReactEvent.Form.target(event)["files"] {
-      | [] => ()
-      | files =>
-        let file = files[0]
-        let maxFileSize = 5 * 1024 * 1024
-
-        let errors = file["size"] > maxFileSize ? list{"The maximum file size is 5 MB."} : list{}
-
-        if errors |> ListUtils.isEmpty {
-          let filename = file["name"]
-          attachingCB(true)
-          send(AttachFile(filename))
-          submitForm(filename, state.formId, send, attachFileCB)
-        } else {
-          send(SelectFile(file["name"], errors))
-        }
-      }
-
-@react.component
-let make = (~attachFileCB, ~attachingCB, ~preview) => {
-  let (state, send) = React.useReducer(
-    reducer,
-    {
-      formId: Random.int(99999) |> string_of_int,
-      filename: defaultTitle,
-      errors: list{},
-    },
-  )
-
-  <div>
-    <form className="flex items-center flex-wrap" id=state.formId>
-      <input name="authenticity_token" type_="hidden" value={AuthenticityToken.fromHead()} />
-      <input
-        id="attachment_file"
-        className="hidden"
-        name="file"
-        required=true
-        multiple=false
-        type_="file"
-        onChange={attachFile(state, send, attachingCB, attachFileCB, preview)}
-      />
-      <label
-        className="text-center cursor-pointer truncate bg-gray-200 border border-dashed border-gray-600 flex px-4 py-5 items-center font-semibold rounded text-sm hover:text-primary-600 hover:bg-primary-100 hover:border-primary-500 flex-grow"
-        htmlFor="attachment_file">
-        <span className="w-full">
-          <i className="fas fa-upload mr-2 text-lg" />
-          <span className="truncate"> {state.filename |> str} </span>
-        </span>
-      </label>
-    </form>
-    {state.errors
-    |> List.map(error =>
-      <div className="mt-2 text-red-700 text-sm" key=error>
-        <i className="fas fa-exclamation-circle mr-2" /> <span> {error |> str} </span>
-      </div>
-    )
-    |> Array.of_list
-    |> React.array}
-    {state.errors |> ListUtils.isEmpty
-      ? React.null
-      : <div className="px-4 mt-2 text-sm">
-          {"Please choose another file for upload." |> str}
-        </div>}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Grade.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Grade.res
deleted file mode 100644
index d92cf72..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Grade.res
+++ /dev/null
@@ -1,44 +0,0 @@
-type t = {
-  submissionId: string,
-  evaluationCriterionId: string,
-  grade: int,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    submissionId: json |> field("submissionId", string),
-    evaluationCriterionId: json |> field("evaluationCriterionId", string),
-    grade: json |> field("grade", int),
-  }
-}
-
-let sort = (criteria, grades) =>
-  grades
-  |> Array.of_list
-  |> ArrayUtils.copyAndSort((g1, g2) => {
-    let ec1 =
-      criteria
-      |> Array.of_list
-      |> ArrayUtils.unsafeFind(
-        ec => EvaluationCriterion.id(ec) == g1.evaluationCriterionId,
-        "Unable to find evaluation criterion with ID: " ++
-        (g1.evaluationCriterionId ++
-        " in CoursesCurriculum__Grade"),
-      )
-    let ec2 =
-      criteria
-      |> Array.of_list
-      |> ArrayUtils.unsafeFind(
-        ec => EvaluationCriterion.id(ec) == g2.evaluationCriterionId,
-        "Unable to find evaluation criterion with ID: " ++
-        (g2.evaluationCriterionId ++
-        " in CoursesCurriculum__Grade"),
-      )
-    String.compare(ec1 |> EvaluationCriterion.name, ec2 |> EvaluationCriterion.name)
-  })
-  |> Array.to_list
-
-let grade = t => t.grade
-let submissionId = t => t.submissionId
-let evaluationCriterionId = t => t.evaluationCriterionId
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__GradeBar.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__GradeBar.res
deleted file mode 100644
index 75fa164..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__GradeBar.res
+++ /dev/null
@@ -1,90 +0,0 @@
-%raw(`require("./CoursesCurriculum__GradeBar.scss")`)
-
-let str = React.string
-
-open CoursesCurriculum__Types
-let gradeDescription = (gradeLabels, grading) =>
-  <div className="grade-bar__criterion-name">
-    {grading |> Grading.criterionName |> str}
-    {switch grading |> Grading.grade {
-    | Some(grade) =>
-      <span>
-        {": " |> str}
-        <span className="grade-bar__grade-label">
-          {grade |> GradeLabel.labelFor(gradeLabels) |> str}
-        </span>
-      </span>
-    | None => ReasonReact.null
-    }}
-  </div>
-
-let maxGrade = gradeLabels => gradeLabels |> GradeLabel.maxGrade |> string_of_int
-
-let gradePillClasses = (gradeReceived, passGrade, pillGrade, callBack) => {
-  let defaultClasses = "grade-bar__grade-pill cursor-auto"
-  let resultModifier = switch gradeReceived {
-  | None => ""
-  | Some(grade) if pillGrade > grade => ""
-  | Some(grade) =>
-    grade < passGrade ? " grade-bar__grade-pill--failed" : " grade-bar__grade-pill--passed"
-  }
-  let selectableModifier = switch callBack {
-  | None => ""
-  | Some(_callBack) =>
-    pillGrade < passGrade
-      ? " grade-bar__grade-pill--selectable-fail cursor-pointer"
-      : " grade-bar__grade-pill--selectable-pass cursor-pointer"
-  }
-  defaultClasses ++ (resultModifier ++ selectableModifier)
-}
-
-let gradeBarHeader = (grading, gradeLabels) =>
-  <div className="grade-bar__header pb-1">
-    {grading |> gradeDescription(gradeLabels)}
-    {switch grading |> Grading.grade {
-    | None => ReasonReact.null
-    | Some(grade) =>
-      <div className="grade-bar__grade font-semibold">
-        {(grade |> string_of_int) ++ ("/" ++ maxGrade(gradeLabels)) |> str}
-      </div>
-    }}
-  </div>
-
-let handleClick = (gradeSelectCB, grading, newGrade) =>
-  switch gradeSelectCB {
-  | None => ()
-  | Some(callBack) => callBack(grading |> Grading.updateGrade(newGrade))
-  }
-
-let gradeBarPill = (gradeLabel, grading, gradeSelectCB, passGrade) => {
-  let myGrade = gradeLabel |> GradeLabel.grade
-  <div
-    key={myGrade |> string_of_int}
-    title={gradeLabel |> GradeLabel.label}
-    role="button"
-    onClick={_event => handleClick(gradeSelectCB, grading, myGrade)}
-    className={gradePillClasses(grading |> Grading.grade, passGrade, myGrade, gradeSelectCB)}>
-    {switch gradeSelectCB {
-    | None => ReasonReact.null
-    | Some(_CB) => myGrade |> string_of_int |> str
-    }}
-  </div>
-}
-
-let gradeBarPanel = (grading, gradeLabels, gradeSelectCB, passGrade) =>
-  <div className="grade-bar__track" role="group">
-    {gradeLabels
-    |> List.map(gradeLabel => gradeBarPill(gradeLabel, grading, gradeSelectCB, passGrade))
-    |> Array.of_list
-    |> ReasonReact.array}
-  </div>
-
-@react.component
-let make = (~grading, ~gradeSelectCB=?, ~criterion) => {
-  let gradeLabels = criterion |> EvaluationCriterion.gradesAndLabels |> Array.to_list
-  let passGrade = criterion |> EvaluationCriterion.passGrade
-  <div className="flex-column" role="toolbar">
-    {gradeBarHeader(grading, gradeLabels)}
-    {gradeBarPanel(grading, gradeLabels, gradeSelectCB, passGrade)}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Grading.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Grading.res
deleted file mode 100644
index fc9d66d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Grading.res
+++ /dev/null
@@ -1,57 +0,0 @@
-type t = {
-  criterionId: string,
-  criterionName: string,
-  grade: option<int>,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    criterionId: json |> field("criterionId", string),
-    criterionName: json |> field("criterionName", string),
-    grade: json |> field("grade", nullable(int)) |> Js.Null.toOption,
-  }
-}
-
-let grade = t => t.grade
-
-let pending = evaluation => evaluation |> List.exists(grading => grading.grade == None)
-
-let isFail = (passGrade, grading) =>
-  switch grading.grade {
-  | Some(grade) => grade < passGrade
-  | None => false
-  }
-
-let anyFail = (passGrade, evaluation) =>
-  evaluation |> List.exists(grading => grading |> isFail(passGrade))
-
-let criterionId = t => t.criterionId
-
-let criterionName = t => t.criterionName
-
-let updateGrade = (newGrade, t) => {
-  criterionId: t.criterionId,
-  criterionName: t.criterionName,
-  grade: Some(newGrade),
-}
-
-let gradingEncoder = grading => {
-  open Json.Encode
-  object_(list{
-    ("criterionId", grading.criterionId |> string),
-    (
-      "grade",
-      switch grading.grade {
-      | Some(grade) => grade |> int
-      | None => null
-      },
-    ),
-  })
-}
-
-let make = (~criterionId, ~criterionName, ~grade) => {
-  criterionId: criterionId,
-  criterionName: criterionName,
-  grade: Some(grade),
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__LatestSubmission.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__LatestSubmission.res
deleted file mode 100644
index a2d1c08..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__LatestSubmission.res
+++ /dev/null
@@ -1,34 +0,0 @@
-type t = {
-  targetId: string,
-  passedAt: option<string>,
-  evaluatorId: option<string>,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    targetId: json |> field("targetId", string),
-    passedAt: json |> field("passedAt", nullable(string)) |> Js.Null.toOption,
-    evaluatorId: json |> field("evaluatorId", nullable(string)) |> Js.Null.toOption,
-  }
-}
-
-let targetId = t => t.targetId
-
-let hasPassed = t =>
-  switch t.passedAt {
-  | Some(_time) => true
-  | None => false
-  }
-
-let hasBeenEvaluated = t =>
-  switch t.evaluatorId {
-  | Some(_evaluator) => true
-  | None => false
-  }
-
-let make = (~pending, ~targetId) => {
-  targetId: targetId,
-  passedAt: pending ? None : Some(Js.Date.make() |> Js.Date.toISOString),
-  evaluatorId: None,
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Learn.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Learn.res
deleted file mode 100644
index fd08cb5..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Learn.res
+++ /dev/null
@@ -1,8 +0,0 @@
-open CoursesCurriculum__Types
-
-@react.component
-let make = (~targetDetails) => {
-  let contentBlocks =
-    targetDetails |> TargetDetails.contentBlocks |> Array.of_list |> ContentBlock.sort
-  <div id="learn-component"> <TargetContentView contentBlocks /> </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Level.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Level.res
deleted file mode 100644
index 385e0be..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Level.res
+++ /dev/null
@@ -1,62 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  number: int,
-  unlockOn: option<string>,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    number: json |> field("number", int),
-    unlockOn: json |> field("unlockOn", nullable(string)) |> Js.Null.toOption,
-  }
-}
-
-let id = t => t.id
-let name = t => t.name
-let number = t => t.number
-let unlockOn = t => t.unlockOn
-
-let isUnlocked = t =>
-  switch t.unlockOn {
-  | Some(date) => date |> DateFns.parseString |> DateFns.isPast
-  | None => true
-  }
-
-let isLocked = t => !(t |> isUnlocked)
-
-let sort = levels => levels |> List.sort((x, y) => x.number - y.number)
-
-let first = levels =>
-  switch levels |> sort {
-  | list{} =>
-    Rollbar.error("Failed to find the first level from a course's levels.")
-    raise(Not_found)
-  | list{firstLevel, ..._rest} => firstLevel
-  }
-
-let unlockDateString = t =>
-  switch t.unlockOn {
-  | None =>
-    Rollbar.error("unlockDateString was called for a CoursesCurriculum__Level without unlockOn")
-    ""
-  | Some(unlockOn) => unlockOn |> DateFns.parseString |> DateFns.format("MMM D")
-  }
-
-let findByLevelNumber = (levels, levelNumber) =>
-  levels |> List.find_opt(l => l.number == levelNumber)
-
-let next = (levels, t) => t.number + 1 |> findByLevelNumber(levels)
-
-let previous = (levels, t) => {
-  let previousLevelNumber = t.number - 1
-
-  if previousLevelNumber == 0 {
-    None
-  } else {
-    previousLevelNumber |> findByLevelNumber(levels)
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__LevelSelector.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__LevelSelector.res
deleted file mode 100644
index fdf4fb1..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__LevelSelector.res
+++ /dev/null
@@ -1,131 +0,0 @@
-open CoursesCurriculum__Types
-
-let str = React.string
-
-let levelZeroSelectorClasses = isSelected => {
-  let defaultClasses = "w-1/2 px-4 py-2 focus:outline-none text-sm font-semibold "
-  defaultClasses ++ (
-    isSelected ? "bg-primary-100 text-primary-500 hover:bg-primary-100 hover:text-primary-500" : ""
-  )
-}
-
-let levelName = level =>
-  "L" ++ ((level |> Level.number |> string_of_int) ++ (": " ++ (level |> Level.name)))
-
-let selectableLevels = (orderedLevels, teamLevel, setSelectedLevelId) => {
-  let teamLevelNumber = teamLevel |> Level.number
-  orderedLevels
-  |> List.map(level => {
-    let levelNumber = level |> Level.number
-
-    let icon = if levelNumber < teamLevelNumber {
-      "fas fa-check text-green-500"
-    } else if levelNumber == teamLevelNumber {
-      "fas fa-map-marker-alt text-blue-400"
-    } else if level |> Level.isUnlocked {
-      "inline-block"
-    } else {
-      "fas fa-lock text-gray-600"
-    }
-
-    <button
-      className="focus:outline-none p-2 w-full text-left"
-      key={level |> Level.id}
-      onClick={_ => setSelectedLevelId(level |> Level.id)}>
-      <span className="mr-2"> <FaIcon classes={"fa-fw " ++ icon} /> </span>
-      {levelName(level) |> str}
-    </button>
-  })
-  |> Array.of_list
-}
-
-let untabbedLevelSelector = (selectedLevel, orderedLevels, teamLevel, setSelectedLevelId) => {
-  let selected =
-    <button className="font-semibold w-full px-2 h-10 flex items-center justify-between">
-      <span className="flex-grow text-center truncate w-0">
-        {selectedLevel |> levelName |> str}
-      </span>
-      <FaIcon classes="fas fa-caret-down ml-1" />
-    </button>
-
-  <Dropdown
-    selected
-    contents={selectableLevels(orderedLevels, teamLevel, setSelectedLevelId)}
-    className="flex-grow cursor-pointer rounded-lg bg-primary-100 hover:bg-gray-200 hover:text-primary-500"
-  />
-}
-
-let tabbedLevelSelector = (
-  orderedLevels,
-  teamLevel,
-  selectedLevel,
-  setSelectedLevelId,
-  showLevelZero,
-  setShowLevelZero,
-  levelZero,
-) => {
-  let selected = hideCaret =>
-    <button
-      className="rounded-l-lg font-semibold w-full px-2 h-10 flex items-center justify-between">
-      <span className="flex-grow text-center truncate w-0">
-        {selectedLevel |> levelName |> str}
-      </span>
-      <FaIcon classes={"fas fa-caret-down ml-1" ++ (hideCaret ? " invisible" : "")} />
-    </button>
-
-  let numberedLevelSelector = showLevelZero
-    ? <div
-        className="cursor-pointer text-sm flex-grow rounded-l-lg hover:bg-gray-200 hover:text-primary-500"
-        onClick={_ => setShowLevelZero(false)}>
-        {selected(true)}
-      </div>
-    : <Dropdown
-        key="numbered-level-selector"
-        selected={selected(false)}
-        contents={selectableLevels(orderedLevels, teamLevel, setSelectedLevelId)}
-        className="cursor-pointer flex-grow rounded-l-lg bg-primary-100 hover:bg-gray-200 hover:text-primary-500"
-      />
-
-  [
-    numberedLevelSelector,
-    <button
-      key="level-zero-selector"
-      className={"border-l rounded-r-lg bg-white border-gray-400 font-semibold truncate hover:bg-gray-100 hover:text-primary-500 " ++
-      levelZeroSelectorClasses(showLevelZero)}
-      onClick={_e => setShowLevelZero(true)}>
-      {levelZero |> Level.name |> str}
-    </button>,
-  ] |> React.array
-}
-
-@react.component
-let make = (
-  ~levels,
-  ~teamLevel,
-  ~selectedLevel,
-  ~setSelectedLevelId,
-  ~showLevelZero,
-  ~setShowLevelZero,
-  ~levelZero,
-) => {
-  let orderedLevels = levels |> List.filter(l => l |> Level.number != 0) |> Level.sort
-
-  <div className="bg-gray-100 px-3 py-2 mt-3 md:px-0 sticky top-0 z-20">
-    <div
-      className="flex justify-center max-w-sm md:max-w-xl mx-auto rounded-lg border border-gray-400 h-11">
-      {switch levelZero {
-      | Some(levelZero) =>
-        tabbedLevelSelector(
-          orderedLevels,
-          teamLevel,
-          selectedLevel,
-          setSelectedLevelId,
-          showLevelZero,
-          setShowLevelZero,
-          levelZero,
-        )
-      | None => untabbedLevelSelector(selectedLevel, orderedLevels, teamLevel, setSelectedLevelId)
-      }}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__LevelUpButton.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__LevelUpButton.res
deleted file mode 100644
index c9b1b0e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__LevelUpButton.res
+++ /dev/null
@@ -1,49 +0,0 @@
-open CoursesCurriculum__Types
-
-let str = React.string
-
-module LevelUpQuery = %graphql(`
-   mutation LevelUpMutation($courseId: ID!) {
-    levelUp(courseId: $courseId){
-      success
-      }
-    }
- `)
-
-let handleSubmitButton = saving => {
-  let submitButtonText = (title, iconClasses) =>
-    <span> <FaIcon classes={iconClasses ++ " mr-2"} /> {title |> str} </span>
-
-  saving
-    ? submitButtonText("Saving", "fas fa-spinner fa-spin")
-    : submitButtonText("Level Up", "fas fa-flag")
-}
-
-let refreshPage = () => {
-  open Webapi.Dom
-  location |> Location.reload
-}
-
-let createLevelUpQuery = (course, setSaving, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  setSaving(_ => true)
-
-  LevelUpQuery.make(~courseId=course |> Course.id, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["levelUp"]["success"] ? refreshPage() : setSaving(_ => false)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-@react.component
-let make = (~course) => {
-  let (saving, setSaving) = React.useState(() => false)
-  <button
-    disabled=saving
-    onClick={createLevelUpQuery(course, setSaving)}
-    className="btn btn-success btn-large w-full md:w-4/6 mt-4">
-    {handleSubmitButton(saving)}
-  </button>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Notice.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Notice.res
deleted file mode 100644
index 2bd4479..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Notice.res
+++ /dev/null
@@ -1,32 +0,0 @@
-type t =
-  | Preview
-  | CourseEnded
-  | CourseComplete
-  | AccessEnded
-  | LevelUp
-  | LevelUpBlocked(int)
-  | Nothing
-
-@module("../images/course-ended.svg")
-external courseEndedImage: string = "default"
-@module("../images/course-complete.svg")
-external courseCompleteImage: string = "default"
-@module("../images/access-ended.svg")
-external accessEndedImage: string = "default"
-@module("../images/level-up.svg")
-external levelUpImage: string = "default"
-@module("../images/preview-mode.svg")
-external previewModeImage: string = "default"
-@module("../images/level-up-blocked.svg")
-external levelUpBlockedImage: string = "default"
-
-let icon = t =>
-  switch t {
-  | Preview => previewModeImage
-  | CourseEnded => courseEndedImage
-  | CourseComplete => courseCompleteImage
-  | AccessEnded => accessEndedImage
-  | LevelUp => levelUpImage
-  | LevelUpBlocked(_) => levelUpBlockedImage
-  | Nothing => ""
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__NoticeManager.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__NoticeManager.res
deleted file mode 100644
index 8646fe3..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__NoticeManager.res
+++ /dev/null
@@ -1,83 +0,0 @@
-open CoursesCurriculum__Types
-
-let str = React.string
-
-let showNotice = (
-  ~title,
-  ~description,
-  ~notice,
-  ~classes="max-w-3xl mx-auto text-center mt-4 bg-white lg:rounded-lg shadow-md px-6 pt-6 pb-8",
-  (),
-) =>
-  <div className=classes>
-    <img className="h-50 mx-auto" src={notice |> Notice.icon} />
-    <div className="max-w-xl font-bold text-xl mx-auto mt-2 leading-tight"> {title |> str} </div>
-    <div className="text-sm max-w-lg mx-auto mt-2"> {description |> str} </div>
-  </div>
-
-let courseCompletedMessage = () => {
-  let title = "Congratulations! You have completed all milestone targets in this course."
-  let description = "You've completed our coursework. Feel free to complete targets that you might have left out, and read up on attached links and resources."
-  showNotice(~title, ~description, ~notice=Notice.CourseComplete, ())
-}
-
-let courseEndedMessage = () => {
-  let title = "Course Ended"
-  let description = "The course has ended and submissions are disabled for all targets!"
-  showNotice(~title, ~description, ~notice=Notice.CourseEnded, ())
-}
-
-let showPreviewMessage = () =>
-  <div
-    className="flex max-w-lg md:mx-auto mx-3 mt-4 rounded-lg px-3 py-2 shadow-lg items-center border border-primary-300 bg-gray-200 ">
-    <img className="w-20 md:w-22 flex-no-shrink" src=Notice.previewModeImage />
-    <div className="flex-1 text-left ml-4">
-      <h4 className="font-bold text-lg leading-tight"> {"Preview Mode" |> str} </h4>
-      <p className="text-sm mt-1">
-        {"You are accessing the preview mode for this course" |> str}
-      </p>
-    </div>
-  </div>
-
-let accessEndedMessage = () => {
-  let title = "Access Ended"
-  let description = "Your access to this course has ended."
-  showNotice(~title, ~description, ~notice=Notice.AccessEnded, ())
-}
-
-let levelUpBlockedMessage = levelNumber => {
-  let title = "Level Up Blocked"
-  let currentLevel = levelNumber |> string_of_int
-  let lastLevel = levelNumber - 1 |> string_of_int
-  let description =
-    "You're at Level " ++
-    (currentLevel ++
-    (", but you have targets in the Level " ++
-    (lastLevel ++
-    (" that are failed, or are pending review by a coach. You'll need to pass all milestone targets in Level " ++
-    (lastLevel ++
-    " to continue leveling up.")))))
-  showNotice(~title, ~description, ~notice=Notice.LevelUpBlocked(levelNumber), ())
-}
-
-let renderLevelUp = course => {
-  let title = "Ready to Level Up!"
-  let description = "Congratulations! You have successfully completed all milestone targets required to level up. Click the button below to proceed to the next level. New challenges await!"
-  <div
-    className="max-w-3xl mx-3 lg:mx-auto text-center mt-4 bg-white rounded-lg shadow px-6 pt-4 pb-8">
-    {showNotice(~title, ~description, ~notice=Notice.LevelUp, ~classes="", ())}
-    <CoursesCurriculum__LevelUpButton course />
-  </div>
-}
-
-@react.component
-let make = (~notice, ~course) =>
-  switch notice {
-  | Notice.Preview => showPreviewMessage()
-  | CourseEnded => courseEndedMessage()
-  | CourseComplete => courseCompletedMessage()
-  | AccessEnded => accessEndedMessage()
-  | LevelUp => renderLevelUp(course)
-  | LevelUpBlocked(levelNumber) => levelUpBlockedMessage(levelNumber)
-  | Nothing => React.null
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Overlay.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Overlay.res
deleted file mode 100644
index 4832f81..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Overlay.res
+++ /dev/null
@@ -1,573 +0,0 @@
-exception UnexpectedSubmissionStatus(string)
-
-%raw(`require("./CoursesCurriculum__Overlay.css")`)
-
-open CoursesCurriculum__Types
-module TargetStatus = CoursesCurriculum__TargetStatus
-
-let str = React.string
-
-type tab =
-  | Learn
-  | Discuss
-  | Complete(TargetDetails.completionType)
-
-type state = {
-  targetDetails: option<TargetDetails.t>,
-  tab: tab,
-}
-
-type action =
-  | Select(tab)
-  | SetTargetDetails(TargetDetails.t)
-  | AddSubmission(Target.role)
-  | ClearTargetDetails
-
-let initialState = {targetDetails: None, tab: Learn}
-
-let reducer = (state, action) =>
-  switch action {
-  | Select(tab) => {...state, tab: tab}
-  | SetTargetDetails(targetDetails) => {
-      ...state,
-      targetDetails: Some(targetDetails),
-    }
-  | ClearTargetDetails => {...state, targetDetails: None}
-  | AddSubmission(role) =>
-    switch role {
-    | Target.Student => state
-    | Team => {
-        ...state,
-        targetDetails: state.targetDetails |> OptionUtils.map(TargetDetails.clearPendingUserIds),
-      }
-    }
-  }
-
-let closeOverlay = course =>
-  ReasonReactRouter.push("/courses/" ++ ((course |> Course.id) ++ "/curriculum"))
-
-let loadTargetDetails = (target, send, ()) => {
-  {
-    open Js.Promise
-    Fetch.fetch("/targets/" ++ ((target |> Target.id) ++ "/details_v2"))
-    |> then_(Fetch.Response.json)
-    |> then_(json => send(SetTargetDetails(json |> TargetDetails.decode)) |> resolve)
-  } |> ignore
-
-  None
-}
-
-let completionTypeToString = (completionType, targetStatus) =>
-  switch (targetStatus |> TargetStatus.status, (completionType: TargetDetails.completionType)) {
-  | (Pending, Evaluated) => "Complete"
-  | (Pending, TakeQuiz) => "Take Quiz"
-  | (Pending, LinkToComplete) => "Visit Link to Complete"
-  | (Pending, MarkAsComplete) => "Mark as Complete"
-  | (
-      Submitted | Passed | Failed | Locked(CourseLocked | AccessLocked),
-      Evaluated | TakeQuiz,
-    ) => "Submissions & Feedback"
-  | (Submitted | Passed | Failed, LinkToComplete | MarkAsComplete) => "Completed"
-  | (Locked(_), Evaluated | TakeQuiz | LinkToComplete | MarkAsComplete) => "Locked"
-  }
-
-let tabToString = (targetStatus, tab) =>
-  switch tab {
-  | Learn => "Learn"
-  | Discuss => "Discuss"
-  | Complete(completionType) => completionTypeToString(completionType, targetStatus)
-  }
-
-let selectableTabs = targetDetails =>
-  targetDetails |> TargetDetails.communities |> ListUtils.isNotEmpty
-    ? list{Learn, Discuss}
-    : list{Learn}
-
-let tabClasses = (selection, tab) =>
-  "course-overlay__body-tab-item p-2 md:px-3 md:py-4 flex w-full items-center justify-center text-sm -mx-px font-semibold" ++ (
-    tab == selection
-      ? " course-overlay__body-tab-item--selected"
-      : " bg-gray-100 hover:text-primary-400 hover:bg-gray-200 cursor-pointer"
-  )
-
-let scrollCompleteButtonIntoViewEventually = () => Js.Global.setTimeout(() => {
-    let element = Webapi.Dom.document |> Webapi.Dom.Document.getElementById("auto-verify-target")
-    switch element {
-    | Some(e) =>
-      Webapi.Dom.Element.scrollIntoView(e)
-      e->Webapi.Dom.Element.setClassName("mt-4 complete-button-selected")
-    | None => Rollbar.error("Could not find the 'Complete' button to scroll to.")
-    }
-  }, 50) |> ignore
-
-let handleTablink = (send, _event) => {
-  send(Select(Learn))
-  scrollCompleteButtonIntoViewEventually()
-}
-
-let tabButton = (tab, state, send, targetStatus) =>
-  <span
-    key={"select-" ++ (tab |> tabToString(targetStatus))}
-    className={tabClasses(tab, state.tab)}
-    onClick={_e => send(Select(tab))}>
-    {tab |> tabToString(targetStatus) |> str}
-  </span>
-
-let tabLink = (tab, state, send, targetStatus) =>
-  <span onClick={handleTablink(send)} className={tabClasses(tab, state.tab)}>
-    {tab |> tabToString(targetStatus) |> str}
-  </span>
-
-let tabOptions = (state, send, targetDetails, targetStatus) => {
-  let completionType = targetDetails |> TargetDetails.computeCompletionType
-
-  <div className="flex justify-between max-w-3xl mx-auto -mb-px mt-5 md:mt-7">
-    {selectableTabs(targetDetails)
-    |> List.map(selection => tabButton(selection, state, send, targetStatus))
-    |> Array.of_list
-    |> React.array}
-    {switch (targetStatus |> TargetStatus.status, completionType) {
-    | (Pending | Submitted | Passed | Failed, Evaluated | TakeQuiz) =>
-      tabButton(Complete(completionType), state, send, targetStatus)
-    | (Locked(CourseLocked | AccessLocked), Evaluated | TakeQuiz) =>
-      targetDetails |> TargetDetails.submissions |> ListUtils.isNotEmpty
-        ? tabButton(Complete(completionType), state, send, targetStatus)
-        : React.null
-    | (Pending | Submitted | Passed | Failed, LinkToComplete | MarkAsComplete) =>
-      tabLink(Complete(completionType), state, send, targetStatus)
-    | (Locked(_), _) => React.null
-    }}
-  </div>
-}
-
-let addSubmission = (target, state, send, addSubmissionCB, submission) => {
-  switch state.targetDetails {
-  | Some(targetDetails) =>
-    let newTargetDetails = targetDetails |> TargetDetails.addSubmission(submission)
-
-    send(SetTargetDetails(newTargetDetails))
-  | None => ()
-  }
-
-  switch submission |> Submission.status {
-  | MarkedAsComplete =>
-    addSubmissionCB(LatestSubmission.make(~pending=false, ~targetId=target |> Target.id))
-  | Pending => addSubmissionCB(LatestSubmission.make(~pending=true, ~targetId=target |> Target.id))
-  | Passed =>
-    raise(
-      UnexpectedSubmissionStatus(
-        "CoursesCurriculum__Overlay.addSubmission cannot handle a submsision with status Passed",
-      ),
-    )
-  | Failed =>
-    raise(
-      UnexpectedSubmissionStatus(
-        "CoursesCurriculum__Overlay.addSubmission cannot handle a submsision with status Failed",
-      ),
-    )
-  }
-}
-
-let addVerifiedSubmission = (target, state, send, addSubmissionCB, submission) => {
-  switch state.targetDetails {
-  | Some(targetDetails) =>
-    let newTargetDetails = targetDetails |> TargetDetails.addSubmission(submission)
-    send(SetTargetDetails(newTargetDetails))
-  | None => ()
-  }
-
-  addSubmissionCB(LatestSubmission.make(~pending=false, ~targetId=target |> Target.id))
-}
-
-let targetStatusClass = (prefix, targetStatus) =>
-  prefix ++ (targetStatus |> TargetStatus.statusToString |> Js.String.toLowerCase)
-
-let targetStatusClasses = targetStatus =>
-  "curriculum__target-status bg-white text-xs mt-2 md:mt-0 py-1 px-2 md:px-4 " ++
-  targetStatusClass("curriculum__target-status--", targetStatus)
-
-let overlayHeaderTitleCardClasses = targetStatus =>
-  "course-overlay__header-title-card relative flex justify-between items-center px-3 py-5 md:p-6 " ++
-  targetStatusClass("course-overlay__header-title-card--", targetStatus)
-
-let renderLocked = text =>
-  <div
-    className="mx-auto text-center bg-gray-900 text-white max-w-fc px-4 py-2 text-sm font-semibold relative z-10 rounded-b-lg">
-    <i className="fas fa-lock text-lg" /> <span className="ml-2"> {text |> str} </span>
-  </div>
-let overlayStatus = (course, target, targetStatus, preview) =>
-  <div>
-    <div className={overlayHeaderTitleCardClasses(targetStatus)}>
-      <button
-        className={"course-overlay__close xl:absolute flex flex-col items-center justify-center absolute rounded-t-lg lg:rounded-t-none lg:rounded-b-lg leading-tight px-4 py-1 h-8 lg:h-full cursor-pointer border border-b-0 lg:border-transparent lg:border-t-0 lg:shadow hover:text-gray-900 hover:shadow-md focus:border-gray-300 focus:outline-none focus:shadow-inner " ++
-        targetStatusClass("course-overlay__close--", targetStatus)}
-        onClick={_e => closeOverlay(course)}>
-        <Icon className="if i-times-regular text-xl lg:text-2xl mt-1 lg:mt-0" />
-        <span className="text-xs hidden lg:inline-block mt-px"> {"Close" |> str} </span>
-      </button>
-      <div className="w-full flex flex-wrap md:flex-no-wrap items-center justify-between relative">
-        <h1 className="text-base leading-snug md:mr-6 md:text-xl">
-          {target |> Target.title |> str}
-        </h1>
-        <div className={targetStatusClasses(targetStatus)}>
-          {targetStatus |> TargetStatus.statusToString |> str}
-        </div>
-      </div>
-    </div>
-    {preview
-      ? <div> {renderLocked("You are currently looking at a preview of this course.")} </div>
-      : React.null}
-  </div>
-
-let renderLockReason = reason => renderLocked(reason |> TargetStatus.lockReasonToString)
-
-let prerequisitesIncomplete = (reason, target, targets, statusOfTargets) => {
-  let prerequisiteTargetIds = target |> Target.prerequisiteTargetIds
-  let prerequisiteTargets =
-    targets |> List.filter(target => (target |> Target.id)->List.mem(prerequisiteTargetIds))
-  <div className="relative px-3 md:px-0">
-    {renderLockReason(reason)}
-    <div
-      className="course-overlay__prerequisite-targets z-10 max-w-3xl mx-auto bg-white text-center rounded-lg overflow-hidden shadow mt-6">
-      {prerequisiteTargets
-      |> List.map(target => {
-        let targetStatus =
-          statusOfTargets |> List.find(ts => ts |> TargetStatus.targetId == (target |> Target.id))
-
-        <Link
-          href={"/targets/" ++ (target |> Target.id)}
-          ariaLabel={"Select Target " ++ (target |> Target.id)}
-          key={target |> Target.id}
-          className="bg-white border-t px-6 py-4 relative z-10 flex items-center justify-between hover:bg-gray-200 hover:text-primary-500 cursor-pointer">
-          <span className="font-semibold text-left leading-snug">
-            {target |> Target.title |> str}
-          </span>
-          <span className={targetStatusClasses(targetStatus)}>
-            {targetStatus |> TargetStatus.statusToString |> str}
-          </span>
-        </Link>
-      })
-      |> Array.of_list
-      |> React.array}
-    </div>
-  </div>
-}
-
-let handleLocked = (target, targets, targetStatus, statusOfTargets) =>
-  switch targetStatus |> TargetStatus.status {
-  | Locked(reason) =>
-    switch reason {
-    | PrerequisitesIncomplete => prerequisitesIncomplete(reason, target, targets, statusOfTargets)
-    | CourseLocked
-    | AccessLocked
-    | LevelLocked =>
-      renderLockReason(reason)
-    }
-  | Pending
-  | Submitted
-  | Passed
-  | Failed => React.null
-  }
-
-let overlayContentClasses = bool => bool ? "" : "hidden"
-
-let learnSection = (targetDetails, tab) =>
-  <div className={overlayContentClasses(tab == Learn)}>
-    <CoursesCurriculum__Learn targetDetails />
-  </div>
-
-let discussSection = (target, targetDetails, tab) =>
-  <div className={overlayContentClasses(tab == Discuss)}>
-    <CoursesCurriculum__Discuss
-      targetId={target |> Target.id} communities={targetDetails |> TargetDetails.communities}
-    />
-  </div>
-
-let completeSectionClasses = (tab, completionType: TargetDetails.completionType) =>
-  switch (tab, completionType) {
-  | (Learn, Evaluated | TakeQuiz)
-  | (Discuss, Evaluated | TakeQuiz | MarkAsComplete | LinkToComplete) => "hidden"
-  | (Learn, MarkAsComplete | LinkToComplete)
-  | (Complete(_), Evaluated | TakeQuiz | MarkAsComplete | LinkToComplete) => ""
-  }
-
-let completeSection = (
-  state,
-  send,
-  target,
-  targetDetails,
-  targetStatus,
-  addSubmissionCB,
-  evaluationCriteria,
-  coaches,
-  users,
-  preview,
-) => {
-  let completionType = targetDetails |> TargetDetails.computeCompletionType
-
-  let addVerifiedSubmissionCB = addVerifiedSubmission(target, state, send, addSubmissionCB)
-
-  <div className={completeSectionClasses(state.tab, completionType)}>
-    {switch (targetStatus |> TargetStatus.status, completionType) {
-    | (Pending, Evaluated) =>
-      [
-        <CoursesCurriculum__CompletionInstructions
-          key="completion-instructions" targetDetails title="Instructions"
-        />,
-        <CoursesCurriculum__SubmissionBuilder
-          key="courses-curriculum-submission-form"
-          target
-          checklist={targetDetails |> TargetDetails.checklist}
-          addSubmissionCB={addSubmission(target, state, send, addSubmissionCB)}
-          preview
-        />,
-      ] |> React.array
-    | (Pending, TakeQuiz) =>
-      [
-        <CoursesCurriculum__CompletionInstructions
-          key="completion-instructions" targetDetails title="Instructions"
-        />,
-        <CoursesCurriculum__Quiz
-          key="courses-curriculum-quiz"
-          target
-          targetDetails
-          addSubmissionCB=addVerifiedSubmissionCB
-          preview
-        />,
-      ] |> React.array
-
-    | (Submitted | Passed | Failed | Locked(CourseLocked | AccessLocked), Evaluated | TakeQuiz) =>
-      <CoursesCurriculum__SubmissionsAndFeedback
-        targetDetails
-        target
-        evaluationCriteria
-        addSubmissionCB={addSubmission(target, state, send, addSubmissionCB)}
-        targetStatus
-        coaches
-        users
-        preview
-        checklist={targetDetails |> TargetDetails.checklist}
-      />
-    | (Pending | Submitted | Passed | Failed, LinkToComplete | MarkAsComplete) =>
-      <CoursesCurriculum__AutoVerify
-        target targetDetails targetStatus addSubmissionCB=addVerifiedSubmissionCB preview
-      />
-    | (Locked(_), Evaluated | TakeQuiz | MarkAsComplete | LinkToComplete) => React.null
-    }}
-  </div>
-}
-
-let renderPendingStudents = (pendingUserIds, users) =>
-  <div className="max-w-3xl mx-auto text-center mt-4">
-    <div className="font-semibold text-md">
-      {"You have team members who are yet to complete this target:" |> str}
-    </div>
-    <div className="flex justify-center flex-wrap">
-      {pendingUserIds
-      |> List.map(studentId => {
-        let user =
-          users |> ListUtils.unsafeFind(
-            u => u |> User.id == studentId,
-            "Unable to find user with id " ++ (studentId ++ "in CoursesCurriculum__Overlay"),
-          )
-
-        <div
-          title={(user |> User.name) ++ " has not completed this target."}
-          className="w-10 h-10 rounded-full border border-yellow-400 flex items-center justify-center overflow-hidden mx-1 shadow-md flex-shrink-0 mt-2">
-          <img src={user |> User.avatarUrl} />
-        </div>
-      })
-      |> Array.of_list
-      |> React.array}
-    </div>
-  </div>
-
-let handlePendingStudents = (targetStatus, targetDetails, users) =>
-  switch (targetDetails, targetStatus |> TargetStatus.status) {
-  | (Some(targetDetails), Submitted | Passed) =>
-    let pendingUserIds = targetDetails |> TargetDetails.pendingUserIds
-    pendingUserIds |> ListUtils.isNotEmpty
-      ? renderPendingStudents(pendingUserIds, users)
-      : React.null
-  | (Some(_) | None, Locked(_) | Pending | Submitted | Passed | Failed) => React.null
-  }
-
-let performQuickNavigation = (send, _event) => {
-  {
-    open // Scroll to the top of the overlay before pushing the new URL.
-    Webapi.Dom
-    switch document |> Document.getElementById("target-overlay") {
-    | Some(element) => Webapi.Dom.Element.setScrollTop(element, 0.0)
-    | None => ()
-    }
-  }
-
-  // Clear loaded target details.
-  send(ClearTargetDetails)
-}
-
-let navigationLink = (direction, url, send) => {
-  let (leftIcon, text, rightIcon) = switch direction {
-  | #Previous => (Some("fa-arrow-left"), "Previous Target", None)
-  | #Next => (None, "Next Target", Some("fa-arrow-right"))
-  }
-
-  let arrow = icon =>
-    icon->Belt.Option.mapWithDefault(React.null, icon => <FaIcon classes={"fas " ++ icon} />)
-
-  <Link
-    href=url
-    onClick={performQuickNavigation(send)}
-    className="block p-2 md:p-4 text-center border rounded-lg bg-gray-100 hover:bg-gray-200">
-    {arrow(leftIcon)}
-    <span className="mx-2 hidden md:inline"> {text |> str} </span>
-    {arrow(rightIcon)}
-  </Link>
-}
-
-let scrollOverlayToTop = _event => {
-  let element = {
-    open Webapi.Dom
-    document |> Document.getElementById("target-overlay")
-  }
-  element->Belt.Option.mapWithDefault((), element => element->Webapi.Dom.Element.setScrollTop(0.0))
-}
-
-let quickNavigationLinks = (targetDetails, send) => {
-  let (previous, next) = targetDetails |> TargetDetails.navigation
-
-  <div className="pb-6">
-    <hr className="my-6" />
-    <div className="container mx-auto max-w-3xl flex px-3 lg:px-0">
-      <div className="w-1/3 mr-2">
-        {previous->Belt.Option.mapWithDefault(React.null, previousUrl =>
-          navigationLink(#Previous, previousUrl, send)
-        )}
-      </div>
-      <div className="w-1/3 mx-2">
-        <button
-          onClick=scrollOverlayToTop
-          className="block w-full focus:outline-none p-2 md:p-4 text-center border rounded-lg bg-gray-100 hover:bg-gray-200">
-          <span className="mx-2 hidden md:inline"> {"Scroll to Top" |> str} </span>
-          <span className="mx-2 md:hidden"> <i className="fas fa-arrow-up" /> </span>
-        </button>
-      </div>
-      <div className="w-1/3 ml-2">
-        {next->Belt.Option.mapWithDefault(React.null, nextUrl =>
-          navigationLink(#Next, nextUrl, send)
-        )}
-      </div>
-    </div>
-  </div>
-}
-
-let updatePendingUserIdsWhenAddingSubmission = (send, target, addSubmissionCB, submission) => {
-  send(AddSubmission(target |> Target.role))
-  addSubmissionCB(submission)
-}
-
-@react.component
-let make = (
-  ~target,
-  ~course,
-  ~targetStatus,
-  ~addSubmissionCB,
-  ~targets,
-  ~statusOfTargets,
-  ~users,
-  ~evaluationCriteria,
-  ~coaches,
-  ~preview,
-) => {
-  let (state, send) = React.useReducer(reducer, initialState)
-
-  React.useEffect1(loadTargetDetails(target, send), [target |> Target.id])
-
-  React.useEffect(() => {
-    ScrollLock.activate()
-    Some(() => ScrollLock.deactivate())
-  })
-
-  <div
-    id="target-overlay"
-    className="fixed z-30 top-0 left-0 w-full h-full overflow-y-scroll bg-white">
-    <div className="bg-gray-100 border-b border-gray-400 px-3">
-      <div className="course-overlay__header-container pt-12 lg:pt-0 mx-auto">
-        {overlayStatus(course, target, targetStatus, preview)}
-        {handleLocked(target, targets, targetStatus, statusOfTargets)}
-        {handlePendingStudents(targetStatus, state.targetDetails, users)}
-        {switch state.targetDetails {
-        | Some(targetDetails) => tabOptions(state, send, targetDetails, targetStatus)
-        | None =>
-          <div className="course-overlay__skeleton-head-container max-w-3xl w-full mx-auto">
-            <div
-              className="course-overlay__skeleton-head-wrapper bg-white h-13 flex items-center justify-between border border-b-0 rounded-t-lg mt-5 md:mt-7">
-              <div
-                className="course-overlay__skeleton-line-placeholder-sm w-1/3 mx-8 skeleton-animate"
-              />
-              <div
-                className="course-overlay__skeleton-line-placeholder-sm w-1/3 mx-8 skeleton-animate"
-              />
-              <div
-                className="course-overlay__skeleton-line-placeholder-sm w-1/3 mx-8 skeleton-animate"
-              />
-            </div>
-          </div>
-        }}
-      </div>
-    </div>
-    {switch state.targetDetails {
-    | Some(targetDetails) =>
-      <div>
-        <div className="container mx-auto mt-6 md:mt-8 max-w-3xl px-3 lg:px-0">
-          {learnSection(targetDetails, state.tab)}
-          {discussSection(target, targetDetails, state.tab)}
-          {completeSection(
-            state,
-            send,
-            target,
-            targetDetails,
-            targetStatus,
-            updatePendingUserIdsWhenAddingSubmission(send, target, addSubmissionCB),
-            evaluationCriteria,
-            coaches,
-            users,
-            preview,
-          )}
-        </div>
-        {switch state.tab {
-        | Learn => quickNavigationLinks(targetDetails, send)
-        | Discuss
-        | Complete(_) => React.null
-        }}
-      </div>
-
-    | None =>
-      <div className="course-overlay__skeleton-body-container max-w-3xl w-full pb-4 mx-auto">
-        <div className="course-overlay__skeleton-body-wrapper mt-8 px-3 lg:px-0">
-          <div
-            className="course-overlay__skeleton-line-placeholder-md mt-4 w-2/4 skeleton-animate"
-          />
-          <div className="course-overlay__skeleton-line-placeholder-sm mt-4 skeleton-animate" />
-          <div className="course-overlay__skeleton-line-placeholder-sm mt-4 skeleton-animate" />
-          <div
-            className="course-overlay__skeleton-line-placeholder-sm mt-4 w-3/4 skeleton-animate"
-          />
-          <div className="course-overlay__skeleton-image-placeholder mt-5 skeleton-animate" />
-          <div
-            className="course-overlay__skeleton-line-placeholder-sm mt-4 w-2/5 skeleton-animate"
-          />
-        </div>
-        <div className="course-overlay__skeleton-body-wrapper mt-8 px-3 lg:px-0">
-          <div
-            className="course-overlay__skeleton-line-placeholder-sm mt-4 w-3/4 skeleton-animate"
-          />
-          <div className="course-overlay__skeleton-line-placeholder-sm mt-4 skeleton-animate" />
-          <div
-            className="course-overlay__skeleton-line-placeholder-sm mt-4 w-3/4 skeleton-animate"
-          />
-        </div>
-      </div>
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Quiz.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Quiz.res
deleted file mode 100644
index a494678..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Quiz.res
+++ /dev/null
@@ -1,145 +0,0 @@
-%raw(`require("./CoursesCurriculum__Quiz.css")`)
-
-open CoursesCurriculum__Types
-
-let str = React.string
-
-module CreateQuizSubmissionQuery = %graphql(`
-   mutation CreateQuizSubmissionMutation($targetId: ID!, $answerIds: [ID!]!) {
-    createQuizSubmission(targetId: $targetId, answerIds: $answerIds){
-      submission{
-        id
-        createdAt
-        checklist
-      }
-     }
-   }
- `)
-
-let createQuizSubmission = (target, selectedAnswersIds, setSaving, addSubmissionCB) => {
-  setSaving(_ => true)
-  CreateQuizSubmissionQuery.make(
-    ~targetId=target |> Target.id,
-    ~answerIds=selectedAnswersIds |> Array.of_list,
-    (),
-  )
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    switch response["createQuizSubmission"]["submission"] {
-    | Some(submission) =>
-      let checklist =
-        submission["checklist"] |> Json.Decode.array(SubmissionChecklistItem.decode([]))
-      addSubmissionCB(
-        Submission.make(
-          ~id=submission["id"],
-          ~createdAt=submission["createdAt"],
-          ~status=Submission.MarkedAsComplete,
-          ~checklist,
-        ),
-      )
-    | None => setSaving(_ => false)
-    }
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-let answerOptionClasses = (answerOption, selectedAnswer) => {
-  let defaultClasses = "quiz-root__answer bg-white flex items-center shadow border border-transparent rounded p-3 mt-3 cursor-pointer "
-  switch selectedAnswer {
-  | Some(answer) if answer == answerOption =>
-    defaultClasses ++ "bg-primary-100 border-primary-500 text-primary-500 shadow-md quiz-root__answer-selected "
-  | Some(_otherAnswer) => defaultClasses
-  | None => defaultClasses
-  }
-}
-
-let iconClasses = (answerOption, selectedAnswer) => {
-  let defaultClasses = "quiz-root__answer-option-icon far fa-check-circle text-lg "
-  switch selectedAnswer {
-  | Some(answer) if answer == answerOption => defaultClasses ++ "text-primary-500"
-  | Some(_otherAnswer) => defaultClasses ++ "text-gray-500"
-  | None => defaultClasses ++ "text-gray-500"
-  }
-}
-
-let handleSubmit = (answer, target, selectedAnswersIds, setSaving, addSubmissionCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  let answerIds = selectedAnswersIds |> List.append(list{answer |> QuizQuestion.answerId})
-
-  createQuizSubmission(target, answerIds, setSaving, addSubmissionCB)
-}
-
-@react.component
-let make = (~target, ~targetDetails, ~addSubmissionCB, ~preview) => {
-  let quizQuestions = targetDetails |> TargetDetails.quizQuestions
-  let (saving, setSaving) = React.useState(() => false)
-  let (selectedQuestion, setSelectedQuestion) = React.useState(() => quizQuestions |> List.hd)
-  let (selectedAnswer, setSelectedAnswer) = React.useState(() => None)
-  let (selectedAnswersIds, setSelectedAnswersIds) = React.useState(() => list{})
-  let currentQuestion = selectedQuestion
-  <div className="bg-gray-100 rounded overflow-hidden relative mb-18 mt-4">
-    <div className="p-2 md:p-5">
-      <span className="font-semibold text-xs block uppercase text-gray-600">
-        {"Question #" |> str} {string_of_int((currentQuestion |> QuizQuestion.index) + 1) |> str}
-      </span>
-      <MarkdownBlock
-        markdown={currentQuestion |> QuizQuestion.question}
-        className="font-semibold text-lg md:text-xl"
-        profile=Markdown.Permissive
-      />
-      <div className="pt-2">
-        {currentQuestion
-        |> QuizQuestion.answerOptions
-        |> List.map(answerOption =>
-          <div
-            className={answerOptionClasses(answerOption, selectedAnswer)}
-            key={answerOption |> QuizQuestion.answerId}
-            onClick={_ => setSelectedAnswer(_ => Some(answerOption))}>
-            <FaIcon classes={iconClasses(answerOption, selectedAnswer)} />
-            <MarkdownBlock
-              markdown={answerOption |> QuizQuestion.answerValue}
-              className="overflow-auto ml-2 w-full"
-              profile=Markdown.Permissive
-            />
-          </div>
-        )
-        |> Array.of_list
-        |> React.array}
-      </div>
-    </div>
-    {switch selectedAnswer {
-    | None => React.null
-    | Some(answer) =>
-      <div
-        className="quiz-root__answer-submit-section text-center py-4 border-t border-gray-400 fixed z-10 left-0 right-0 bottom-0 w-full">
-        {currentQuestion |> QuizQuestion.isLastQuestion(quizQuestions)
-          ? <button
-              disabled={saving || preview}
-              className="btn btn-primary"
-              onClick={handleSubmit(
-                answer,
-                target,
-                selectedAnswersIds,
-                setSaving,
-                addSubmissionCB,
-              )}>
-              {str("Submit Quiz")}
-            </button>
-          : {
-              let nextQuestion = currentQuestion |> QuizQuestion.nextQuestion(quizQuestions)
-              <button
-                className="btn btn-primary"
-                onClick={_ => {
-                  setSelectedQuestion(_ => nextQuestion)
-                  setSelectedAnswersIds(_ =>
-                    selectedAnswersIds |> List.append(list{answer |> QuizQuestion.answerId})
-                  )
-                  setSelectedAnswer(_ => None)
-                }}>
-                {str("Next Question")}
-              </button>
-            }}
-      </div>
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__QuizQuestion.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__QuizQuestion.res
deleted file mode 100644
index 58c9b01..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__QuizQuestion.res
+++ /dev/null
@@ -1,48 +0,0 @@
-type answerOption = {
-  id: string,
-  value: string,
-}
-
-type t = {
-  index: int,
-  question: string,
-  answerOptions: list<answerOption>,
-}
-
-let decodeAnswerOption = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    value: json |> field("value", string),
-  }
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    index: json |> field("index", int),
-    question: json |> field("question", string),
-    answerOptions: json |> field("answerOptions", list(decodeAnswerOption)),
-  }
-}
-
-let index = t => t.index
-
-let question = t => t.question
-
-let answerOptions = t => t.answerOptions
-
-let answerId = answerOption => answerOption.id
-
-let answerValue = answerOption => answerOption.value
-
-let lastQuestion = questions => {
-  let maxIndex =
-    questions |> List.sort((q1, q2) => q1.index - q2.index) |> List.rev |> List.hd |> index
-  questions |> List.find(q => q.index == maxIndex)
-}
-
-let nextQuestion = (questions, question) =>
-  questions |> List.find(q => q.index == question.index + 1)
-
-let isLastQuestion = (questions, question) => questions |> lastQuestion == question
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Submission.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Submission.res
deleted file mode 100644
index ee95981..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Submission.res
+++ /dev/null
@@ -1,60 +0,0 @@
-exception UnexpectedStatusValue(string)
-
-type status =
-  | MarkedAsComplete
-  | Pending
-  | Passed
-  | Failed
-
-type t = {
-  id: string,
-  createdAt: string,
-  status: status,
-  checklist: array<SubmissionChecklistItem.t>,
-}
-
-let id = t => t.id
-let createdAt = t => t.createdAt
-let status = t => t.status
-let checklist = t => t.checklist
-let createdAtDate = t => t |> createdAt |> DateFns.parseString
-
-let pending = t =>
-  switch t.status {
-  | Pending => true
-  | MarkedAsComplete
-  | Passed
-  | Failed => false
-  }
-
-let createdAtPretty = t => t |> createdAtDate |> DateFns.format("MMMM D, YYYY")
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    createdAt: json |> field("createdAt", string),
-    status: switch json |> field("status", string) {
-    | "marked_as_complete" => MarkedAsComplete
-    | "pending" => Pending
-    | "passed" => Passed
-    | "failed" => Failed
-    | unknownValue => raise(UnexpectedStatusValue(unknownValue))
-    },
-    checklist: json |> field(
-      "checklist",
-      array(
-        SubmissionChecklistItem.decode(
-          json |> field("files", array(SubmissionChecklistItem.decodeFile)),
-        ),
-      ),
-    ),
-  }
-}
-
-let make = (~id, ~createdAt, ~status, ~checklist) => {
-  id: id,
-  createdAt: createdAt,
-  status: status,
-  checklist: checklist,
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionBuilder.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionBuilder.res
deleted file mode 100644
index 3c1b082..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionBuilder.res
+++ /dev/null
@@ -1,173 +0,0 @@
-@@bs.config({jsx: 3})
-
-open CoursesCurriculum__Types
-
-let str = React.string
-
-type formState =
-  | Attaching
-  | Saving
-  | Ready
-
-let buttonContents = (formState, checklist) => {
-  let icon = switch formState {
-  | Attaching
-  | Saving =>
-    <FaIcon classes="fas fa-spinner fa-pulse mr-2" />
-  | Ready => <FaIcon classes="fas fa-cloud-upload-alt mr-2" />
-  }
-
-  let text = switch formState {
-  | Attaching => "Attaching..."
-  | Saving => "Submitting..."
-  | Ready => checklist |> ArrayUtils.isEmpty ? "Complete" : "Submit"
-  } |> str
-
-  <span> icon text </span>
-}
-
-type state = {
-  formState: formState,
-  checklist: array<ChecklistItem.t>,
-}
-
-type action =
-  | SetAttaching
-  | SetSaving
-  | SetReady
-  | UpdateResponse(array<ChecklistItem.t>)
-
-let initialState = checklist => {
-  formState: Ready,
-  checklist: ChecklistItem.fromTargetChecklistItem(checklist),
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | SetAttaching => {...state, formState: Attaching}
-  | SetSaving => {...state, formState: Saving}
-  | SetReady => {...state, formState: Ready}
-  | UpdateResponse(checklist) => {checklist: checklist, formState: Ready}
-  }
-
-let isBusy = formState =>
-  switch formState {
-  | Attaching
-  | Saving => true
-  | Ready => false
-  }
-
-module CreateSubmissionQuery = %graphql(`
-  mutation CreateSubmissionMutation($targetId: ID!, $checklist: JSON!, $fileIds: [ID!]!) {
-    createSubmission(targetId: $targetId, checklist: $checklist, fileIds: $fileIds) {
-      submission {
-        id
-        createdAt
-      }
-    }
-  }
-  `)
-
-let isButtonDisabled = state =>
-  switch state.formState {
-  | Attaching
-  | Saving => true
-  | Ready => false
-  } ||
-  !(state.checklist |> ChecklistItem.validChecklist)
-
-let submit = (state, send, target, addSubmissionCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  send(SetSaving)
-
-  let fileIds = state.checklist |> ChecklistItem.fileIds
-  let checklist = state.checklist |> ChecklistItem.encodeArray
-
-  CreateSubmissionQuery.make(~targetId=target |> Target.id, ~fileIds, ~checklist, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    switch response["createSubmission"]["submission"] {
-    | Some(submission) =>
-      let files = state.checklist |> ChecklistItem.makeFiles
-      let submissionChecklist =
-        checklist |> Json.Decode.array(SubmissionChecklistItem.decode(files))
-      let newSubmission = Submission.make(
-        ~id=submission["id"],
-        ~createdAt=submission["createdAt"],
-        ~status=Submission.Pending,
-        ~checklist=submissionChecklist,
-      )
-      addSubmissionCB(newSubmission)
-    | None =>
-      /* Enable the form again in case of a validation failure. */
-      send(SetReady)
-    }
-    Js.Promise.resolve()
-  })
-  |> Js.Promise.catch(_error => {
-    /* Enable the form again in case of server crash. */
-    send(SetReady)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let updateResult = (state, send, index, result) =>
-  send(UpdateResponse(state.checklist |> ChecklistItem.updateResultAtIndex(index, result)))
-
-let buttonClasses = checklist =>
-  "flex mt-3 " ++ (checklist |> ArrayUtils.isEmpty ? "justify-center" : "justify-end")
-
-let setAttaching = (send, bool) => send(bool ? SetAttaching : SetReady)
-
-let statusText = formState =>
-  switch formState {
-  | Attaching => "Attaching..."
-  | Saving => "Submitting..."
-  | Ready => "Submit"
-  }
-
-let tooltipText = preview =>
-  if preview {
-    <span> {"You are accessing the preview mode" |> str} <br /> {"for this course" |> str} </span>
-  } else {
-    <span>
-      {"Please complete all the required" |> str} <br /> {"steps to submit this target" |> str}
-    </span>
-  }
-
-@react.component
-let make = (~target, ~addSubmissionCB, ~preview, ~checklist) => {
-  let (state, send) = React.useReducer(reducer, initialState(checklist))
-  <div className="bg-gray-100 p-4 my-4 border rounded-lg">
-    <DisablingCover disabled={isBusy(state.formState)} message={statusText(state.formState)}>
-      {state.checklist |> ArrayUtils.isEmpty
-        ? <div className="text-center">
-            {"This target has no actions. Click submit to complete the target" |> str}
-          </div>
-        : state.checklist
-          |> Array.mapi((index, checklistItem) =>
-            <CoursesCurriculum__SubmissionItem
-              key={index |> string_of_int}
-              index
-              checklistItem
-              updateResultCB={updateResult(state, send, index)}
-              attachingCB={setAttaching(send)}
-              preview
-            />
-          )
-          |> React.array}
-      <div className={buttonClasses(state.checklist)}>
-        <Tooltip tip={tooltipText(preview)} position=#Left disabled={!isButtonDisabled(state)}>
-          <button
-            onClick={submit(state, send, target, addSubmissionCB)}
-            disabled={isButtonDisabled(state) || preview}
-            className="btn btn-primary flex justify-center flex-grow md:flex-grow-0">
-            {buttonContents(state.formState, checklist)}
-          </button>
-        </Tooltip>
-      </div>
-    </DisablingCover>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionItem.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionItem.res
deleted file mode 100644
index 68857ac..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionItem.res
+++ /dev/null
@@ -1,198 +0,0 @@
-open CoursesCurriculum__Types
-
-let str = React.string
-
-let kindIconClasses = result =>
-  switch (result: ChecklistItem.result) {
-  | ShortText(_text) => "if i-short-text-regular md:text-base text-gray-800 if-fw"
-  | LongText(_markdown) => "if i-long-text-regular md:text-base text-gray-800 if-fw"
-  | Link(_link) => "if i-link-regular md:text-base text-gray-800 if-fw"
-  | MultiChoice(
-      _choices,
-      _selected,
-    ) => "if i-check-circle-alt-regular md:text-base text-gray-800 if-fw"
-  | Files(_attachments) => "if i-file-regular md:text-base text-gray-800 if-fw"
-  }
-
-let computeId = (index, checklistItem) =>
-  (index |> string_of_int) ++ ("-" ++ ChecklistItem.kindAsString(checklistItem))
-
-let notBlank = string => string |> String.trim != ""
-
-let placeholder = (id, checklistItem) => {
-  let title = checklistItem |> ChecklistItem.title
-  let optional = checklistItem |> ChecklistItem.optional
-  <div className="flex items-center">
-    <PfIcon className={kindIconClasses(checklistItem |> ChecklistItem.result)} />
-    <label htmlFor=id className="font-semibold text-sm pl-2 tracking-wide">
-      {title ++ (optional ? " (optional)" : "") |> str}
-    </label>
-  </div>
-}
-
-let showError = (message, active) =>
-  if active {
-    <div
-      className="mt-1 px-1 py-px rounded text-xs font-semibold text-red-600 bg-red-100 inline-flex items-center">
-      <span className="mr-2"> <i className="fas fa-exclamation-triangle" /> </span>
-      <span> {message |> str} </span>
-    </div>
-  } else {
-    React.null
-  }
-
-let showLink = (value, id, updateResultCB) =>
-  <div>
-    <input
-      id
-      type_="text"
-      value
-      onChange={e => updateResultCB(ChecklistItem.Link(ReactEvent.Form.target(e)["value"]))}
-      placeholder="Type full URL starting with https://..."
-      className="cursor-pointer truncate h-10 border border-gray-400 focus:outline-none focus:border-primary-400 focus:shadow-inner px-4 items-center font-semibold rounded text-sm mr-2 block w-full"
-    />
-    {showError("This doesn't look like a valid URL.", UrlUtils.isInvalid(true, value))}
-  </div>
-
-let showShortText = (value, id, updateResultCB) =>
-  <div>
-    <input
-      id
-      type_="text"
-      value
-      maxLength=250
-      onChange={e => updateResultCB(ChecklistItem.ShortText(ReactEvent.Form.target(e)["value"]))}
-      placeholder="Add a short text"
-      className="cursor-pointer truncate h-10 border border-gray-400 focus:outline-none focus:border-primary-400 focus:shadow-inner px-4 items-center font-semibold rounded text-sm mr-2 block w-full"
-    />
-    {showError(
-      "Answer should be less than 250 characters",
-      !ChecklistItem.validShortText(value) && notBlank(value),
-    )}
-  </div>
-
-let longTextWarning = value => {
-  let currentLength = value |> String.length
-  let showWarning = notBlank(value) && currentLength > 4500
-
-  let colors = currentLength < 4900 ? "text-orange-700 bg-orange-100" : "text-red-600 bg-red-100"
-
-  showWarning
-    ? <div className="flex justify-between items-center mt-1">
-        <div
-          className={"hidden md:inline px-2 py-px rounded text-xs font-semibold inline-flex items-center " ++
-          colors}>
-          <span className="mr-2"> <i className="fas fa-exclamation-triangle" /> </span>
-          <span> {"Please keep your answer to less than 5000 characters in length." |> str} </span>
-        </div>
-        <div
-          className={"flex-shrink-1 text-tiny font-semibold px-1 py-px border border-transparent rounded " ++
-          colors}>
-          {currentLength |> string_of_int |> str} {" / 5000" |> str}
-        </div>
-      </div>
-    : React.null
-}
-
-let updateLongText = (updateResultCB, value) => updateResultCB(ChecklistItem.LongText(value))
-
-let showLongText = (value, id, updateResultCB) =>
-  <div>
-    <MarkdownEditor
-      textareaId=id
-      onChange={updateLongText(updateResultCB)}
-      value
-      profile=Markdown.QuestionAndAnswer
-      maxLength=5000
-    />
-    {longTextWarning(value)}
-  </div>
-
-let checkboxOnChange = (choices, itemIndex, updateResultCB, event) =>
-  ReactEvent.Form.target(event)["checked"]
-    ? updateResultCB(ChecklistItem.MultiChoice(choices, Some(itemIndex)))
-    : updateResultCB(ChecklistItem.MultiChoice(choices, None))
-
-let showMultiChoice = (choices, choice, id, updateResultCB) =>
-  <div>
-    <div>
-      {choices
-      |> Array.mapi((index, label) => {
-        let checked = choice |> OptionUtils.mapWithDefault(i => i == index, false)
-        <Radio
-          key={index |> string_of_int}
-          id={id ++ (index |> string_of_int)}
-          label
-          onChange={checkboxOnChange(choices, index, updateResultCB)}
-          checked
-        />
-      })
-      |> React.array}
-    </div>
-  </div>
-
-let attachFile = (updateResultCB, attachingCB, files, id, filename) => {
-  attachingCB(false)
-  updateResultCB(ChecklistItem.Files(files |> Array.append([ChecklistItem.makeFile(id, filename)])))
-}
-
-let removeFile = (updateResultCB, files, id) =>
-  updateResultCB(
-    ChecklistItem.Files(files |> Js.Array.filter(a => a |> ChecklistItem.fileId != id)),
-  )
-
-let showFiles = (files, preview, id, attachingCB, updateResultCB) =>
-  <div>
-    <div className="flex flex-wrap" id>
-      {files
-      |> Array.map(file =>
-        <div
-          key={"file-" ++ (file |> ChecklistItem.fileId)}
-          ariaLabel={"file-" ++ (file |> ChecklistItem.filename)}
-          target="_blank"
-          className="w-1/3 pr-2 pb-2">
-          <div
-            className="flex justify-between border overflow-hidden rounded border-pink-400 bg-white text-pink-700 hover:text-pink-700">
-            <div className="flex">
-              <span className="flex w-10 justify-center items-center p-2 bg-pink-700 text-white">
-                <i className="far fa-file" />
-              </span>
-              <span
-                className="course-show-attachments__attachment-title rounded text-xs font-semibold inline-block whitespace-normal truncate w-32 md:w-38 pl-3 pr-2 py-2 leading-loose">
-                {file |> ChecklistItem.filename |> str}
-              </span>
-            </div>
-            <button
-              title={"Remove " ++ (file |> ChecklistItem.filename)}
-              className="flex w-8 justify-center items-center p-2 cursor-pointer bg-gray-100 border-l text-gray-700 hover:bg-gray-200 hover:text-gray-900"
-              onClick={_ => removeFile(updateResultCB, files, file |> ChecklistItem.fileId)}>
-              <PfIcon className="if i-times-regular text-sm" />
-            </button>
-          </div>
-        </div>
-      )
-      |> React.array}
-    </div>
-    {files |> Array.length < 3
-      ? <CoursesCurriculum__FileForm
-          attachingCB attachFileCB={attachFile(updateResultCB, attachingCB, files)} preview
-        />
-      : React.null}
-  </div>
-
-@react.component
-let make = (~index, ~checklistItem, ~updateResultCB, ~attachingCB, ~preview) => {
-  let id = computeId(index, checklistItem)
-  <div className="mt-4" ariaLabel=id>
-    {placeholder(id, checklistItem)}
-    <div className="md:pl-7 pt-2 pr-0 pb-4">
-      {switch checklistItem |> ChecklistItem.result {
-      | Files(files) => showFiles(files, preview, id, attachingCB, updateResultCB)
-      | Link(link) => showLink(link, id, updateResultCB)
-      | ShortText(shortText) => showShortText(shortText, id, updateResultCB)
-      | LongText(longText) => showLongText(longText, id, updateResultCB)
-      | MultiChoice(choices, selected) => showMultiChoice(choices, selected, id, updateResultCB)
-      }}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionsAndFeedback.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionsAndFeedback.res
deleted file mode 100644
index edc02ca..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__SubmissionsAndFeedback.res
+++ /dev/null
@@ -1,275 +0,0 @@
-%raw(`require("./CoursesCurriculum__SubmissionsAndFeedback.css")`)
-
-let str = React.string
-
-open CoursesCurriculum__Types
-
-let gradeBar = (evaluationCriteria, grade) => {
-  let criterion =
-    evaluationCriteria |> ListUtils.findOpt(c =>
-      c |> EvaluationCriterion.id == (grade |> Grade.evaluationCriterionId)
-    )
-
-  switch criterion {
-  | Some(criterion) =>
-    let criterionId = criterion |> EvaluationCriterion.id
-    let criterionName = criterion |> EvaluationCriterion.name
-    let gradeNumber = grade |> Grade.grade
-    let grading = Grading.make(~criterionId, ~criterionName, ~grade=gradeNumber)
-
-    <div key={gradeNumber |> string_of_int} className="mb-4">
-      <CoursesCurriculum__GradeBar grading criterion />
-    </div>
-  | None => React.null
-  }
-}
-
-let statusBar = (~color, ~text) => {
-  let textColor = "text-" ++ (color ++ "-500 ")
-  let bgColor = "bg-" ++ (color ++ "-100 ")
-
-  let icon = switch color {
-  | "green" =>
-    <span>
-      <i className="fas fa-certificate fa-stack-2x" />
-      <i className="fas fa-check fa-stack-1x fa-inverse" />
-    </span>
-  | _anyOtherColor => <i className="fas fa-exclamation-triangle text-3xl text-red-500 mx-1" />
-  }
-
-  <div
-    className={"font-semibold p-2 py-4 flex border-t w-full items-center justify-center " ++
-    (textColor ++
-    bgColor)}>
-    <span className={"fa-stack text-lg mr-1 " ++ textColor}> icon </span> {text |> str}
-  </div>
-}
-
-let submissionStatusIcon = (~passed) => {
-  let text = passed ? "Passed" : "Failed"
-  let color = passed ? "green" : "red"
-
-  <div className="max-w-fc">
-    <div className={"flex border-2 rounded-lg border-" ++ (color ++ "-500 px-4 py-6")}>
-      {passed
-        ? <span className="fa-stack text-green-500 text-lg">
-            <i className="fas fa-certificate fa-stack-2x" />
-            <i className="fas fa-check fa-stack-1x fa-inverse" />
-          </span>
-        : <i className="fas fa-exclamation-triangle text-3xl text-red-500 mx-1" />}
-    </div>
-    <div className={"text-center text-" ++ (color ++ "-500 font-bold mt-2")}> {text |> str} </div>
-  </div>
-}
-
-let undoSubmissionCB = () => {
-  open Webapi.Dom
-  location |> Location.reload
-}
-
-let gradingSection = (~grades, ~evaluationCriteria, ~gradeBar, ~passed) =>
-  <div>
-    <div className="w-full md:hidden">
-      {statusBar(~color=passed ? "green" : "red", ~text=passed ? "Passed" : "Failed")}
-    </div>
-    <div className="bg-white flex border-t flex-wrap items-center py-4">
-      <div className="w-full md:w-1/2 flex-shrink-0 justify-center hidden md:flex border-l px-6">
-        {submissionStatusIcon(~passed)}
-      </div>
-      <div className="w-full md:w-1/2 flex-shrink-0 md:order-first px-4 md:px-6">
-        <h5 className="pb-1 border-b"> {"Grading" |> str} </h5>
-        <div className="mt-3">
-          {grades
-          |> Grade.sort(evaluationCriteria)
-          |> List.map(grade => gradeBar(grade))
-          |> Array.of_list
-          |> React.array}
-        </div>
-      </div>
-    </div>
-  </div>
-
-let handleAddAnotherSubmission = (setShowSubmissionForm, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  setShowSubmissionForm(showSubmissionForm => !showSubmissionForm)
-}
-
-let submissions = (target, targetStatus, targetDetails, evaluationCriteria, coaches, users) => {
-  let curriedGradeBar = gradeBar(evaluationCriteria)
-
-  targetDetails
-  |> TargetDetails.submissions
-  |> List.sort((s1, s2) => {
-    let s1CreatedAt = s1 |> Submission.createdAtDate
-    let s2CreatedAt = s2 |> Submission.createdAtDate
-
-    s1CreatedAt |> DateFns.differenceInSeconds(s2CreatedAt) |> int_of_float
-  })
-  |> List.map(submission => {
-    let grades = targetDetails |> TargetDetails.grades(submission |> Submission.id)
-
-    <div
-      key={submission |> Submission.id}
-      className="mt-4 pb-4 relative curriculum__submission-feedback-container"
-      ariaLabel={"Details about your submission on " ++ (submission |> Submission.createdAtPretty)}>
-      <div
-        className="text-xs font-semibold bg-gray-100 inline-block px-3 py-1 ml-2 rounded-t-lg border-t border-r border-l text-gray-800 leading-tight">
-        {"Submitted on " ++ (submission |> Submission.createdAtPretty) |> str}
-      </div>
-      <div className="rounded-lg bg-gray-100 border shadow-md overflow-hidden">
-        <div className="px-4 py-4 md:px-6 md:pt-6 md:pb-5">
-          <SubmissionChecklistShow
-            checklist={submission |> Submission.checklist}
-            updateChecklistCB=None
-            pending={submission |> Submission.pending}
-          />
-        </div>
-        {switch submission |> Submission.status {
-        | MarkedAsComplete => statusBar(~color="green", ~text="Marked as complete")
-        | Pending =>
-          <div
-            className="bg-white p-3 md:px-6 md:py-4 flex border-t justify-between items-center w-full">
-            <div
-              className="flex items-center justify-center font-semibold text-sm pl-2 pr-3 py-1 bg-orange-100 text-orange-600 rounded">
-              <span className="fa-stack text-orange-400 mr-2 flex-shrink-0">
-                <i className="fas fa-circle fa-stack-2x" />
-                <i className="fas fa-hourglass-half fa-stack-1x fa-inverse" />
-              </span>
-              {"Review pending" |> str}
-            </div>
-            {switch targetStatus |> TargetStatus.status {
-            | Submitted =>
-              <CoursesCurriculum__UndoButton undoSubmissionCB targetId={target |> Target.id} />
-
-            | Pending
-            | Passed
-            | Failed
-            | Locked(_) => React.null
-            }}
-          </div>
-        | Passed =>
-          gradingSection(~grades, ~evaluationCriteria, ~passed=true, ~gradeBar=curriedGradeBar)
-        | Failed =>
-          gradingSection(~grades, ~evaluationCriteria, ~passed=false, ~gradeBar=curriedGradeBar)
-        }}
-        {targetDetails
-        |> TargetDetails.feedback
-        |> List.filter(feedback =>
-          feedback |> Feedback.submissionId == (submission |> Submission.id)
-        )
-        |> List.map(feedback => {
-          let coach =
-            coaches |> ListUtils.findOpt(c => c |> Coach.id == (feedback |> Feedback.coachId))
-
-          let user = switch coach {
-          | Some(coach) =>
-            users |> ListUtils.findOpt(up => up |> User.id == (coach |> Coach.userId))
-          | None => None
-          }
-
-          let (coachName, coachTitle, coachAvatar) = switch user {
-          | Some(user) =>
-            let name = user |> User.name
-            let avatar = user |> User.avatarUrl
-            let title = user |> User.title
-            (name, title, <img src=avatar />)
-          | None => (
-              "Unknown Coach",
-              None,
-              <div
-                className="w-10 h-10 rounded-full bg-gray-400 inline-block flex items-center justify-center">
-                <i className="fas fa-user-times" />
-              </div>,
-            )
-          }
-
-          <div className="bg-white border-t p-4 md:p-6" key={feedback |> Feedback.id}>
-            <div className="flex items-center">
-              <div
-                className="flex-shrink-0 w-12 h-12 bg-gray-300 rounded-full overflow-hidden mr-3 object-cover">
-                coachAvatar
-              </div>
-              <div>
-                <p className="text-xs leading-tight"> {"Feedback from:" |> str} </p>
-                <div>
-                  <h4
-                    className="font-semibold text-base leading-tight block md:inline-flex self-end">
-                    {coachName |> str}
-                  </h4>
-                  {switch coachTitle {
-                  | Some(title) =>
-                    <span
-                      className="block md:inline-flex text-xs text-gray-800 md:ml-2 leading-tight self-end">
-                      {"(" ++ (title ++ ")") |> str}
-                    </span>
-                  | None => React.null
-                  }}
-                </div>
-              </div>
-            </div>
-            <MarkdownBlock
-              profile=Markdown.Permissive
-              className="md:ml-15"
-              markdown={feedback |> Feedback.feedback}
-            />
-          </div>
-        })
-        |> Array.of_list
-        |> React.array}
-      </div>
-    </div>
-  })
-  |> Array.of_list
-  |> React.array
-}
-
-let addSubmission = (setShowSubmissionForm, addSubmissionCB, submission) => {
-  setShowSubmissionForm(_ => false)
-  addSubmissionCB(submission)
-}
-
-@react.component
-let make = (
-  ~targetDetails,
-  ~target,
-  ~evaluationCriteria,
-  ~addSubmissionCB,
-  ~targetStatus,
-  ~coaches,
-  ~users,
-  ~preview,
-  ~checklist,
-) => {
-  let (showSubmissionForm, setShowSubmissionForm) = React.useState(() => false)
-
-  <div>
-    <div className="flex justify-between items-end border-b pb-2">
-      <h4 className="text-base md:text-xl"> {"Your Submissions" |> str} </h4>
-      {targetStatus |> TargetStatus.canSubmit(~resubmittable=target |> Target.resubmittable)
-        ? showSubmissionForm
-            ? <button
-                className="btn btn-subtle"
-                onClick={handleAddAnotherSubmission(setShowSubmissionForm)}>
-                <PfIcon className="if i-times-regular text-lg mr-2" />
-                <span className="hidden md:inline"> {"Cancel" |> str} </span>
-                <span className="md:hidden"> {"Cancel" |> str} </span>
-              </button>
-            : <button
-                className="btn btn-primary"
-                onClick={handleAddAnotherSubmission(setShowSubmissionForm)}>
-                <PfIcon className="if i-plus-regular text-lg mr-2" />
-                <span className="hidden md:inline"> {"Add another submission" |> str} </span>
-                <span className="md:hidden"> {"Add another" |> str} </span>
-              </button>
-        : React.null}
-    </div>
-    {showSubmissionForm
-      ? <CoursesCurriculum__SubmissionBuilder
-          target
-          addSubmissionCB={addSubmission(setShowSubmissionForm, addSubmissionCB)}
-          checklist
-          preview
-        />
-      : submissions(target, targetStatus, targetDetails, evaluationCriteria, coaches, users)}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Target.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Target.res
deleted file mode 100644
index 98ea4e6..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Target.res
+++ /dev/null
@@ -1,43 +0,0 @@
-exception CannotParseUnknownRole(string)
-
-type role =
-  | Student
-  | Team
-
-type t = {
-  id: string,
-  role: role,
-  title: string,
-  targetGroupId: string,
-  sortIndex: int,
-  resubmittable: bool,
-  prerequisiteTargetIds: list<string>,
-  reviewed: bool,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    role: switch json |> field("role", string) {
-    | "student" => Student
-    | "team" => Team
-    | unknownRole => raise(CannotParseUnknownRole(unknownRole))
-    },
-    title: json |> field("title", string),
-    targetGroupId: json |> field("targetGroupId", string),
-    sortIndex: json |> field("sortIndex", int),
-    resubmittable: json |> field("resubmittable", bool),
-    prerequisiteTargetIds: json |> field("prerequisiteTargetIds", list(string)),
-    reviewed: json |> field("reviewed", bool),
-  }
-}
-
-let id = t => t.id
-let role = t => t.role
-let title = t => t.title
-let sortIndex = t => t.sortIndex
-let targetGroupId = t => t.targetGroupId
-let prerequisiteTargetIds = t => t.prerequisiteTargetIds
-let resubmittable = t => t.resubmittable
-let reviewed = t => t.reviewed
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__TargetDetails.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__TargetDetails.res
deleted file mode 100644
index 030354f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__TargetDetails.res
+++ /dev/null
@@ -1,92 +0,0 @@
-type navigation = {
-  previous: option<string>,
-  next: option<string>,
-}
-
-type t = {
-  pendingUserIds: list<string>,
-  submissions: list<CoursesCurriculum__Submission.t>,
-  feedback: list<CoursesCurriculum__Feedback.t>,
-  quizQuestions: list<CoursesCurriculum__QuizQuestion.t>,
-  contentBlocks: list<ContentBlock.t>,
-  communities: list<CoursesCurriculum__Community.t>,
-  linkToComplete: option<string>,
-  evaluated: bool,
-  grading: list<CoursesCurriculum__Grade.t>,
-  completionInstructions: option<string>,
-  navigation: navigation,
-  checklist: array<TargetChecklistItem.t>,
-}
-
-let submissions = t => t.submissions
-
-let pendingUserIds = t => t.pendingUserIds
-let feedback = t => t.feedback
-let navigation = t => (t.navigation.previous, t.navigation.next)
-let checklist = t => t.checklist
-
-type completionType =
-  | Evaluated
-  | TakeQuiz
-  | LinkToComplete
-  | MarkAsComplete
-
-let decodeNavigation = json => {
-  open Json.Decode
-  {
-    previous: json |> optional(field("previous", string)),
-    next: json |> optional(field("next", string)),
-  }
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    pendingUserIds: json |> field("pendingUserIds", list(string)),
-    submissions: json |> field("submissions", list(CoursesCurriculum__Submission.decode)),
-    feedback: json |> field("feedback", list(CoursesCurriculum__Feedback.decode)),
-    quizQuestions: json |> field("quizQuestions", list(CoursesCurriculum__QuizQuestion.decode)),
-    contentBlocks: json |> field("contentBlocks", list(ContentBlock.decode)),
-    communities: json |> field("communities", list(CoursesCurriculum__Community.decode)),
-    linkToComplete: json |> field("linkToComplete", nullable(string)) |> Js.Null.toOption,
-    evaluated: json |> field("evaluated", bool),
-    grading: json |> field("grading", list(CoursesCurriculum__Grade.decode)),
-    completionInstructions: json
-    |> field("completionInstructions", nullable(string))
-    |> Js.Null.toOption,
-    navigation: json |> field("navigation", decodeNavigation),
-    checklist: json |> field("checklist", array(TargetChecklistItem.decode)),
-  }
-}
-
-let computeCompletionType = targetDetails => {
-  let evaluated = targetDetails.evaluated
-  let hasQuiz = targetDetails.quizQuestions |> ListUtils.isNotEmpty
-  let hasLinkToComplete = switch targetDetails.linkToComplete {
-  | Some(_) => true
-  | None => false
-  }
-  switch (evaluated, hasQuiz, hasLinkToComplete) {
-  | (true, _, _) => Evaluated
-  | (false, true, _) => TakeQuiz
-  | (false, false, true) => LinkToComplete
-  | (_, _, _) => MarkAsComplete
-  }
-}
-
-let contentBlocks = t => t.contentBlocks
-let quizQuestions = t => t.quizQuestions
-let communities = t => t.communities
-let linkToComplete = t => t.linkToComplete
-
-let completionInstructions = t => t.completionInstructions
-
-let grades = (submissionId, t) =>
-  t.grading |> List.filter(grade => grade |> CoursesCurriculum__Grade.submissionId == submissionId)
-
-let addSubmission = (submission, t) => {
-  ...t,
-  submissions: list{submission, ...t |> submissions},
-}
-
-let clearPendingUserIds = t => {...t, pendingUserIds: list{}}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__TargetGroup.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__TargetGroup.res
deleted file mode 100644
index 929aea5..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__TargetGroup.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type t = {
-  id: string,
-  levelId: string,
-  name: string,
-  description: string,
-  sortIndex: int,
-  milestone: bool,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    levelId: json |> field("levelId", string),
-    name: json |> field("name", string),
-    description: json |> field("description", string),
-    sortIndex: json |> field("sortIndex", int),
-    milestone: json |> field("milestone", bool),
-  }
-}
-
-let sort = targetGroups => targetGroups |> List.sort((x, y) => x.sortIndex - y.sortIndex)
-
-let id = t => t.id
-let name = t => t.name
-let levelId = t => t.levelId
-let milestone = t => t.milestone
-let description = t => t.description
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__TargetStatus.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__TargetStatus.res
deleted file mode 100644
index 898f6df..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__TargetStatus.res
+++ /dev/null
@@ -1,177 +0,0 @@
-module Course = CoursesCurriculum__Course
-module Team = CoursesCurriculum__Team
-module Target = CoursesCurriculum__Target
-module Level = CoursesCurriculum__Level
-module TargetGroup = CoursesCurriculum__TargetGroup
-module LatestSubmission = CoursesCurriculum__LatestSubmission
-
-/*
- * Create a higher level state abstraction here. Let's pre-calculate the status for
- * all targets, since there are only two (infrequent) actions that can affect this
- * pre-calculation: a student submitting a target, or undoing a previous submission.
- *
- * The higher-level abstraction should pre-calculate and cache intermediary values for
- * the sake of performance - things like target and student's level number, the
- * submission state for each target.
- */
-
-type lockReason =
-  | CourseLocked
-  | AccessLocked
-  | LevelLocked
-  | PrerequisitesIncomplete
-
-type status =
-  | Pending
-  | Submitted
-  | Passed
-  | Failed
-  | Locked(lockReason)
-
-type t = {
-  targetId: string,
-  status: status,
-}
-
-type submissionStatus =
-  | SubmissionMissing
-  | SubmissionPendingReview
-  | SubmissionPassed
-  | SubmissionFailed
-
-type cachedTarget = {
-  targetId: string,
-  targetReviewed: bool,
-  levelNumber: int,
-  milestone: bool,
-  submissionStatus: submissionStatus,
-  prerequisiteTargetIds: list<string>,
-}
-
-let isPast = dateString =>
-  switch dateString {
-  | Some(date) => date |> DateFns.parseString |> DateFns.isBefore(Js.Date.make())
-  | None => false
-  }
-
-let makePending = targets => targets |> List.map(t => {targetId: t |> Target.id, status: Pending})
-
-let lockTargets = (targets, reason) =>
-  targets |> List.map(t => {targetId: t |> Target.id, status: Locked(reason)})
-
-let allTargetsComplete = (targetCache, targetIds) =>
-  targetIds |> List.for_all(targetId => {
-    let cachedTarget = targetCache |> List.find(ct => ct.targetId == targetId)
-    cachedTarget.submissionStatus == SubmissionPassed
-  })
-
-let compute = (preview, team, course, levels, targetGroups, targets, submissions) =>
-  /* Eliminate the two course ended and student access ended conditions. */
-  if preview {
-    makePending(targets)
-  } else if course |> Course.endsAt |> isPast {
-    lockTargets(targets, CourseLocked)
-  } else if team |> Team.accessEndsAt |> isPast {
-    lockTargets(targets, AccessLocked)
-  } else {
-    /* Cache level number of the student. */
-    let studentLevelNumber =
-      levels |> List.find(l => l |> Level.id == (team |> Team.levelId)) |> Level.number
-
-    /* Cache level number, milestone boolean, and submission status for all targets. */
-    let targetsCache = targets |> List.map(target => {
-      let targetId = target |> Target.id
-
-      let targetGroup =
-        targetGroups |> List.find(tg => tg |> TargetGroup.id == (target |> Target.targetGroupId))
-
-      let milestone = targetGroup |> TargetGroup.milestone
-
-      let levelNumber =
-        levels
-        |> List.find(l => l |> Level.id == (targetGroup |> TargetGroup.levelId))
-        |> Level.number
-
-      let submission =
-        submissions |> ListUtils.findOpt(s => s |> LatestSubmission.targetId == targetId)
-
-      let submissionStatus = switch submission {
-      | Some(s) =>
-        if s |> LatestSubmission.hasPassed {
-          SubmissionPassed
-        } else if s |> LatestSubmission.hasBeenEvaluated {
-          SubmissionFailed
-        } else {
-          SubmissionPendingReview
-        }
-      | None => SubmissionMissing
-      }
-
-      {
-        targetId: targetId,
-        targetReviewed: target |> Target.reviewed,
-        levelNumber: levelNumber,
-        milestone: milestone,
-        submissionStatus: submissionStatus,
-        prerequisiteTargetIds: target |> Target.prerequisiteTargetIds,
-      }
-    })
-
-    /* Scan the targets cache again to form final list of target statuses. */
-    targetsCache |> List.map(ct => {
-      let status = switch ct.submissionStatus {
-      | SubmissionPendingReview => Submitted
-      | SubmissionPassed => Passed
-      | SubmissionFailed => Failed
-      | SubmissionMissing =>
-        if ct.levelNumber > studentLevelNumber && ct.targetReviewed {
-          Locked(LevelLocked)
-        } else if !(ct.prerequisiteTargetIds |> allTargetsComplete(targetsCache)) {
-          Locked(PrerequisitesIncomplete)
-        } else {
-          Pending
-        }
-      }
-
-      {targetId: ct.targetId, status: status}
-    })
-  }
-
-let targetId = (t: t) => t.targetId
-let status = t => t.status
-
-let lockReasonToString = lr =>
-  switch lr {
-  | CourseLocked => "The course has ended and submissions are disabled for all targets!"
-  | AccessLocked => "Your access to this course has ended."
-  | LevelLocked => "You must level up to complete this target."
-  | PrerequisitesIncomplete => "This target has pre-requisites that are incomplete."
-  }
-
-let statusToString = t =>
-  switch t.status {
-  | Pending => "Pending"
-  | Submitted => "Submitted"
-  | Passed => "Passed"
-  | Failed => "Failed"
-  | Locked(_) => "Locked"
-  }
-
-let canSubmit = (~resubmittable, t) =>
-  switch (resubmittable, t.status) {
-  | (true, Passed)
-  | (_, Pending)
-  | (_, Failed) => true
-  | (false, Passed)
-  | (_, Submitted)
-  | (_, Locked(_)) => false
-  }
-
-let currentLevelStatuses = list{Submitted, Passed}
-let lastLevelStatuses = list{Passed}
-
-let matchesStatuses = (statuses, ts) => {
-  let matchedTargetStatuses = ts |> List.filter(t => t.status->List.mem(statuses))
-
-  ts == matchedTargetStatuses
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Team.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Team.res
deleted file mode 100644
index 961537c..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Team.res
+++ /dev/null
@@ -1,24 +0,0 @@
-type t = {
-  @live
-  name: string,
-  levelId: string,
-  accessEndsAt: option<string>,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    name: json |> field("name", string),
-    levelId: json |> field("levelId", string),
-    accessEndsAt: json |> field("accessEndsAt", nullable(string)) |> Js.Null.toOption,
-  }
-}
-
-let levelId = t => t.levelId
-let accessEndsAt = t => t.accessEndsAt
-
-let accessEnded = t =>
-  switch t.accessEndsAt {
-  | Some(date) => date |> DateFns.parseString |> DateFns.isPast
-  | None => false
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Types.res
deleted file mode 100644
index 61304ba..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__Types.res
+++ /dev/null
@@ -1,18 +0,0 @@
-module Course = CoursesCurriculum__Course
-module Level = CoursesCurriculum__Level
-module TargetGroup = CoursesCurriculum__TargetGroup
-module Target = CoursesCurriculum__Target
-module TargetDetails = CoursesCurriculum__TargetDetails
-module LatestSubmission = CoursesCurriculum__LatestSubmission
-module Submission = CoursesCurriculum__Submission
-module Team = CoursesCurriculum__Team
-module Coach = CoursesCurriculum__Coach
-module User = CoursesCurriculum__User
-module QuizQuestion = CoursesCurriculum__QuizQuestion
-module Community = CoursesCurriculum__Community
-module Grade = CoursesCurriculum__Grade
-module TargetStatus = CoursesCurriculum__TargetStatus
-module Feedback = CoursesCurriculum__Feedback
-module Grading = CoursesCurriculum__Grading
-module Notice = CoursesCurriculum__Notice
-module ChecklistItem = CoursesCurriculum__ChecklistItem
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__UndoButton.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__UndoButton.res
deleted file mode 100644
index 1744968..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__UndoButton.res
+++ /dev/null
@@ -1,94 +0,0 @@
-let str = React.string
-
-module DeleteSubmissionQuery = %graphql(`
-  mutation UndoSubmissionMutation($targetId: ID!) {
-    undoSubmission(targetId: $targetId) {
-      success
-    }
-  }
-  `)
-
-type status =
-  | Pending
-  | Undoing
-  | Errored
-
-let handleClick = (targetId, setStatus, undoSubmissionCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  if {
-    open Webapi.Dom
-    window |> Window.confirm("Are you sure you want to delete this submission?")
-  } {
-    setStatus(_ => Undoing)
-
-    DeleteSubmissionQuery.make(~targetId, ())
-    |> GraphqlQuery.sendQuery
-    |> Js.Promise.then_(response => {
-      if response["undoSubmission"]["success"] {
-        undoSubmissionCB()
-      } else {
-        Notification.notice(
-          "Could not undo submission",
-          "Please reload the page and check the status of the submission before trying again.",
-        )
-        setStatus(_ => Errored)
-      }
-      Js.Promise.resolve()
-    })
-    |> Js.Promise.catch(_ => {
-      Notification.error(
-        "Unexpected Error",
-        "An unexpected error occured, and our team has been notified about this. Please reload the page before trying again.",
-      )
-      setStatus(_ => Errored)
-      Js.Promise.resolve()
-    })
-    |> ignore
-  } else {
-    ()
-  }
-}
-
-let buttonContents = status =>
-  switch status {
-  | Undoing => <span> <FaIcon classes="fas fa-spinner fa-spin mr-2" /> {"Undoing..." |> str} </span>
-  | Pending =>
-    <span>
-      <FaIcon classes="fas fa-undo mr-2" />
-      <span className="hidden md:inline"> {"Undo submission" |> str} </span>
-      <span className="md:hidden"> {"Undo" |> str} </span>
-    </span>
-  | Errored =>
-    <span> <FaIcon classes="fas fa-exclamation-triangle mr-2" /> {"Error!" |> str} </span>
-  }
-
-let isDisabled = status =>
-  switch status {
-  | Undoing
-  | Errored => true
-  | Pending => false
-  }
-
-let buttonClasses = status => {
-  let classes = "btn btn-small btn-danger cursor-"
-
-  classes ++
-  switch status {
-  | Undoing => "wait"
-  | Errored => "not-allowed"
-  | Pending => "pointer"
-  }
-}
-
-@react.component
-let make = (~undoSubmissionCB, ~targetId) => {
-  let (status, setStatus) = React.useState(() => Pending)
-  <button
-    title="Delete this submission"
-    disabled={status |> isDisabled}
-    className={buttonClasses(status)}
-    onClick={handleClick(targetId, setStatus, undoSubmissionCB)}>
-    {buttonContents(status)}
-  </button>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__UrlForm.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__UrlForm.res
deleted file mode 100644
index da531fa..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__UrlForm.res
+++ /dev/null
@@ -1,78 +0,0 @@
-let str = React.string
-
-type state = {
-  url: string,
-  errors: list<string>,
-}
-
-let initialState = {url: "", errors: list{}}
-
-type action =
-  | UpdateUrl(string)
-  | ResetForm
-
-let validate = url => {
-  let urlLength = url |> String.length
-
-  if url |> UrlUtils.isInvalid(false) && urlLength > 0 {
-    list{"does not look like a valid URL"}
-  } else {
-    list{}
-  }
-}
-
-let reducer = (_state, action) =>
-  switch action {
-  | UpdateUrl(url) => {url: url, errors: validate(url)}
-  | ResetForm => initialState
-  }
-
-let updateUrl = (send, typingCB, event) => {
-  let value = ReactEvent.Form.target(event)["value"] |> Js.String.trim
-  typingCB(value |> String.length > 0)
-  send(UpdateUrl(value))
-}
-
-let isDisabled = state =>
-  switch state.url {
-  | "" => true
-  | _someUrl => state.errors |> ListUtils.isNotEmpty
-  }
-
-let attachUrl = (state, send, attachUrlCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  !isDisabled(state) ? attachUrlCB(state.url) : ()
-  send(ResetForm)
-}
-
-@react.component
-let make = (~attachUrlCB, ~typingCB) => {
-  let (state, send) = React.useReducer(reducer, initialState)
-
-  <div>
-    <div className="flex items-center flex-wrap">
-      <input
-        id="attachment_url"
-        value=state.url
-        type_="text"
-        placeholder="Type full URL starting with https://..."
-        className="mt-2 cursor-pointer truncate h-10 border border-grey-400 flex px-4 items-center font-semibold rounded text-sm flex-grow mr-2"
-        onChange={updateUrl(send, typingCB)}
-      />
-      <button
-        onClick={attachUrl(state, send, attachUrlCB)}
-        disabled={isDisabled(state)}
-        className="mt-2 bg-indigo-600 hover:bg-gray-500 text-white text-sm font-semibold py-2 px-6 focus:outline-none">
-        {"Attach link" |> str}
-      </button>
-    </div>
-    {state.errors
-    |> List.map(error =>
-      <div className="mt-2 text-red-600 text-sm" key=error>
-        <i className="fas fa-exclamation-circle mr-2" /> <span> {error |> str} </span>
-      </div>
-    )
-    |> Array.of_list
-    |> React.array}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__User.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__User.res
deleted file mode 100644
index 12df38f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesCurriculum__User.res
+++ /dev/null
@@ -1,21 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  avatarUrl: string,
-  title: option<string>,
-}
-
-let id = t => t.id
-let name = t => t.name
-let avatarUrl = t => t.avatarUrl
-let title = t => t.title
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    avatarUrl: json |> field("avatarUrl", string),
-    title: json |> field("title", nullable(string)) |> Js.Null.toOption,
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Checklist.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Checklist.res
deleted file mode 100644
index c842587..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Checklist.res
+++ /dev/null
@@ -1,73 +0,0 @@
-type state =
-  | Edit
-  | Show
-
-let str = React.string
-
-let closeEditMode = (setState, ()) => setState(_ => Show)
-
-let showEditor = (setState, ()) => setState(_ => Edit)
-
-let updateReviewChecklist = (setState, updateReviewChecklistCB, reviewChecklist) => {
-  setState(_ => Show)
-  updateReviewChecklistCB(reviewChecklist)
-}
-
-let handleEmpty = setState =>
-  <button
-    className="bg-gray-100 border border-primary-500 border-dashed rounded-lg p-3 md:p-5 flex items-center w-full hover:bg-gray-200 hover:border-primary-600 hover:shadow-lg focus:outline-none"
-    onClick={_ => setState(_ => Edit)}>
-    <span
-      className="inline-flex flex-shrink-0 bg-white w-14 h-14 border border-dashed border-primary-500 rounded-full items-center justify-center shadow-md">
-      <span
-        className="inline-flex items-center justify-center flex-shrink-0 w-10 h-10 rounded-full bg-primary-500 text-white">
-        <i className="fa fa-plus" />
-      </span>
-    </span>
-    <span className="block text-left ml-4">
-      <span className="block text-base font-semibold text-primary-500">
-        {"Create a review checklist" |> str}
-      </span>
-      <span className="text-sm block">
-        {"Prepare for your review by creating a checklist" |> str}
-      </span>
-    </span>
-  </button>
-
-@react.component
-let make = (
-  ~reviewChecklist,
-  ~updateFeedbackCB,
-  ~feedback,
-  ~updateReviewChecklistCB,
-  ~targetId,
-) => {
-  let (state, setState) = React.useState(() => Show)
-  <div className="px-4 pt-4 md:px-6 md:pt-6">
-    <div className="flex h-7 items-end">
-      <h5 className="font-semibold text-sm flex items-center">
-        <PfIcon
-          className="if i-check-square-alt-regular text-gray-800 text-base md:text-lg inline-block"
-        />
-        <span className="ml-2 md:ml-3 tracking-wide"> {"Review Checklist" |> str} </span>
-      </h5>
-    </div>
-    <div className="mt-2 md:ml-7">
-      {switch state {
-      | Edit =>
-        <CoursesReview__ChecklistEditor
-          reviewChecklist
-          updateReviewChecklistCB={updateReviewChecklist(setState, updateReviewChecklistCB)}
-          closeEditModeCB={closeEditMode(setState)}
-          targetId
-        />
-      | Show =>
-        reviewChecklist |> ArrayUtils.isEmpty
-          ? handleEmpty(setState)
-          : <CoursesReview__ChecklistShow
-              reviewChecklist feedback updateFeedbackCB showEditorCB={showEditor(setState)}
-            />
-      }}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ChecklistEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ChecklistEditor.res
deleted file mode 100644
index ac2a40d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ChecklistEditor.res
+++ /dev/null
@@ -1,292 +0,0 @@
-%raw(`require("./CoursesReview__ChecklistEditor.css")`)
-
-open CoursesReview__Types
-
-type state = {
-  reviewChecklist: array<ReviewChecklistItem.t>,
-  saving: bool,
-}
-
-let str = React.string
-
-module UpdateReviewChecklistMutation = %graphql(`
-    mutation UpdateReviewChecklistMutation($targetId: ID!, $reviewChecklist: JSON!) {
-      updateReviewChecklist(targetId: $targetId, reviewChecklist: $reviewChecklist){
-        success
-      }
-    }
-  `)
-
-let updateReviewChecklist = (targetId, reviewChecklist, setState, updateReviewChecklistCB) => {
-  setState(state => {...state, saving: true})
-
-  let trimmedChecklist = reviewChecklist |> Array.map(ReviewChecklistItem.trim)
-
-  UpdateReviewChecklistMutation.make(
-    ~targetId,
-    ~reviewChecklist=ReviewChecklistItem.encodeArray(trimmedChecklist),
-    (),
-  )
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    if response["updateReviewChecklist"]["success"] {
-      updateReviewChecklistCB(trimmedChecklist)
-    }
-
-    setState(state => {...state, saving: false})
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let updateChecklistItem = (checklistItem, itemIndex, setState) =>
-  setState(state => {
-    ...state,
-    reviewChecklist: state.reviewChecklist |> ReviewChecklistItem.replace(checklistItem, itemIndex),
-  })
-
-let updateChecklistItemTitle = (itemIndex, title, checklistItem, setState) =>
-  updateChecklistItem(ReviewChecklistItem.updateTitle(title, checklistItem), itemIndex, setState)
-
-let updateChecklistResultTitle = (
-  itemIndex,
-  resultIndex,
-  title,
-  reviewChecklistItem,
-  resultItem,
-  setState,
-) => {
-  let newReviewChecklistItem =
-    reviewChecklistItem |> ReviewChecklistItem.updateChecklist(
-      reviewChecklistItem
-      |> ReviewChecklistItem.result
-      |> ReviewChecklistResult.updateTitle(title, resultItem, resultIndex),
-    )
-  updateChecklistItem(newReviewChecklistItem, itemIndex, setState)
-}
-
-let updateChecklistResultFeedback = (
-  itemIndex,
-  resultIndex,
-  feedback,
-  reviewChecklistItem,
-  resultItem,
-  setState,
-) => {
-  let newReviewChecklistItem =
-    reviewChecklistItem |> ReviewChecklistItem.updateChecklist(
-      reviewChecklistItem
-      |> ReviewChecklistItem.result
-      |> ReviewChecklistResult.updateFeedback(feedback, resultItem, resultIndex),
-    )
-  updateChecklistItem(newReviewChecklistItem, itemIndex, setState)
-}
-
-let addEmptyResultItem = (reviewChecklistItem, itemIndex, setState) =>
-  updateChecklistItem(
-    reviewChecklistItem |> ReviewChecklistItem.appendEmptyChecklistItem,
-    itemIndex,
-    setState,
-  )
-
-let addEmptyChecklistItem = setState =>
-  setState(state => {
-    ...state,
-    reviewChecklist: ReviewChecklistItem.empty() |> Array.append(state.reviewChecklist),
-  })
-
-let removeChecklistResult = (itemIndex, resultIndex, reviewChecklistItem, setState) =>
-  updateChecklistItem(
-    reviewChecklistItem |> ReviewChecklistItem.deleteResultItem(resultIndex),
-    itemIndex,
-    setState,
-  )
-
-let removeChecklistItem = (itemIndex, setState) =>
-  setState(state => {
-    ...state,
-    reviewChecklist: state.reviewChecklist |> Js.Array.filteri((_el, i) => i != itemIndex),
-  })
-
-let initialStateForReviewChecklist = reviewChecklist =>
-  reviewChecklist |> ArrayUtils.isEmpty ? ReviewChecklistItem.emptyTemplate() : reviewChecklist
-
-let invalidTitle = title => title |> String.trim == ""
-
-let invalidChecklist = reviewChecklist =>
-  reviewChecklist
-  |> Array.map(reviewChecklistItem =>
-    reviewChecklistItem |> ReviewChecklistItem.title |> invalidTitle ||
-      reviewChecklistItem
-      |> ReviewChecklistItem.result
-      |> Js.Array.filter(resultItem => resultItem |> ReviewChecklistResult.title |> invalidTitle)
-      |> ArrayUtils.isNotEmpty
-  )
-  |> Js.Array.filter(valid => valid)
-  |> ArrayUtils.isNotEmpty
-
-@react.component
-let make = (~reviewChecklist, ~updateReviewChecklistCB, ~closeEditModeCB, ~targetId) => {
-  let (state, setState) = React.useState(() => {
-    reviewChecklist: reviewChecklist |> initialStateForReviewChecklist,
-    saving: false,
-  })
-  <div
-    className="bg-gray-100 border border-primary-200 shadow-inner rounded-lg p-2 pt-0 md:p-4 md:pt-0">
-    <DisablingCover disabled=state.saving>
-      {state.reviewChecklist
-      |> Array.mapi((itemIndex, reviewChecklistItem) =>
-        <div
-          className="pt-5"
-          key={itemIndex |> string_of_int}
-          ariaLabel={"checklist-item-" ++ (itemIndex |> string_of_int)}>
-          <div className="flex">
-            <div className="w-full">
-              <input
-                className="checklist-editor__checklist-item-title h-11 text-sm focus:outline-none focus:bg-white focus:border-primary-300"
-                id="checklist_title"
-                type_="text"
-                placeholder="Add an item to the checklist"
-                value={reviewChecklistItem |> ReviewChecklistItem.title}
-                onChange={event =>
-                  updateChecklistItemTitle(
-                    itemIndex,
-                    ReactEvent.Form.target(event)["value"],
-                    reviewChecklistItem,
-                    setState,
-                  )}
-              />
-              <School__InputGroupError
-                message="A checklist item cannot be blank"
-                active={reviewChecklistItem |> ReviewChecklistItem.title |> invalidTitle}
-              />
-            </div>
-            <button
-              title="Remove checklist item"
-              className="bg-gray-200 p-2 w-11 border border-gray-400 text-gray-700 rounded ml-2 hover:text-red-600 hover:bg-red-100 focus:outline-none"
-              onClick={_ => removeChecklistItem(itemIndex, setState)}>
-              <i className="fas fa-trash-alt" />
-            </button>
-          </div>
-          <div>
-            {reviewChecklistItem
-            |> ReviewChecklistItem.result
-            |> Array.mapi((resultIndex, resultItem) => {
-              let feedback = switch resultItem |> ReviewChecklistResult.feedback {
-              | Some(f) => f
-              | None => ""
-              }
-              <div
-                ariaLabel={"result-item-" ++ (resultIndex |> string_of_int)}
-                className="pl-2 md:pl-4 mt-2"
-                key={(itemIndex |> string_of_int) ++ (resultIndex |> string_of_int)}>
-                <div className="flex">
-                  <label
-                    title="Disabled"
-                    className="flex-shrink-0 rounded border border-gray-400 bg-gray-100 w-4 h-4 mr-2 mt-3 cursor-not-allowed"
-                  />
-                  <div className="w-full bg-gray-100 relative">
-                    <div className="relative">
-                      <input
-                        className="checklist-editor__checklist-result-item-title h-10 pr-12 focus:outline-none focus:bg-white focus:border-primary-300"
-                        id={"result_" ++ ((resultIndex |> string_of_int) ++ "_title")}
-                        type_="text"
-                        placeholder="Add a result for this check"
-                        value={resultItem |> ReviewChecklistResult.title}
-                        onChange={event =>
-                          updateChecklistResultTitle(
-                            itemIndex,
-                            resultIndex,
-                            ReactEvent.Form.target(event)["value"],
-                            reviewChecklistItem,
-                            resultItem,
-                            setState,
-                          )}
-                      />
-                      <div
-                        className="flex w-10 h-10 absolute top-0 right-0 mr-1 items-center justify-center">
-                        <button
-                          title="Remove checklist result"
-                          className="flex items-center justify-center bg-gray-100 w-7 h-7 mt-px text-sm text-gray-700 hover:text-red-600 hover:bg-red-100 rounded-full ml-2 border border-transparent text-center"
-                          onClick={_ =>
-                            removeChecklistResult(
-                              itemIndex,
-                              resultIndex,
-                              reviewChecklistItem,
-                              setState,
-                            )}>
-                          <Icon className="if i-times-regular" />
-                        </button>
-                      </div>
-                    </div>
-                    <textarea
-                      rows=2
-                      cols=33
-                      className="appearance-none border border-gray-400 bg-transparent rounded-b text-xs align-top py-2 px-4 leading-relaxed w-full focus:outline-none focus:bg-white focus:border-primary-300"
-                      id={"result_" ++ ((resultIndex |> string_of_int) ++ "_feedback")}
-                      type_="text"
-                      placeholder="Add feedback (optional)"
-                      value=feedback
-                      onChange={event =>
-                        updateChecklistResultFeedback(
-                          itemIndex,
-                          resultIndex,
-                          ReactEvent.Form.target(event)["value"],
-                          reviewChecklistItem,
-                          resultItem,
-                          setState,
-                        )}
-                    />
-                    <School__InputGroupError
-                      message="A check's result cannot be blank"
-                      active={resultItem |> ReviewChecklistResult.title |> invalidTitle}
-                    />
-                  </div>
-                </div>
-              </div>
-            })
-            |> React.array}
-            <button
-              onClick={_ => addEmptyResultItem(reviewChecklistItem, itemIndex, setState)}
-              className="checklist-editor__add-result-btn ml-2 md:ml-4 mt-3 flex items-center focus:outline-none">
-              <span
-                title="Add Result"
-                className="checklist-editor__add-result-btn-check flex-shrink-0 rounded border border-gray-400 bg-gray-100 w-4 h-4 mr-2"
-              />
-              <span
-                className="checklist-editor__add-result-btn-text flex items-center text-sm font-semibold bg-gray-200 px-3 py-1 rounded border border-dashed border-gray-600">
-                <i className="fas fa-plus text-xs mr-2" /> {"Add Result" |> str}
-              </span>
-            </button>
-          </div>
-        </div>
-      )
-      |> React.array}
-      <div className="pt-5">
-        <button
-          className="flex items-center text-sm font-semibold bg-gray-200 rounded border border-dashed border-gray-600 w-full hover:text-primary-500 hover:bg-white hover:border-primary-500 hover:shadow-md focus:outline-none"
-          onClick={_ => addEmptyChecklistItem(setState)}>
-          <span className="bg-gray-300 py-2 w-10"> <i className="fas fa-plus text-sm" /> </span>
-          <span className="px-3 py-2"> {"Add Checklist Item" |> str} </span>
-        </button>
-      </div>
-      <div className="py-2 mt-4 flex flex-row-reverse">
-        <button
-          disabled={state.saving || invalidChecklist(state.reviewChecklist)}
-          onClick={_ =>
-            updateReviewChecklist(
-              targetId,
-              state.reviewChecklist,
-              setState,
-              updateReviewChecklistCB,
-            )}
-          className="btn btn-success w-1/2 md:w-auto">
-          {"Save Checklist" |> str}
-        </button>
-        <button className="btn btn-subtle w-1/2 md:w-auto mr-4" onClick={_ => closeEditModeCB()}>
-          {"Cancel" |> str}
-        </button>
-      </div>
-    </DisablingCover>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ChecklistShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ChecklistShow.res
deleted file mode 100644
index 749a0fb..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ChecklistShow.res
+++ /dev/null
@@ -1,128 +0,0 @@
-open CoursesReview__Types
-
-type selectionItem = {
-  itemIndex: int,
-  resultIndex: int,
-}
-
-type selection = list<selectionItem>
-
-let str = React.string
-
-let selectChecklist = (itemIndex, resultIndex, setSelecton) =>
-  setSelecton(selection =>
-    selection |> List.append(list{{itemIndex: itemIndex, resultIndex: resultIndex}})
-  )
-
-let unSelectChecklist = (itemIndex, resultIndex, setSelecton) =>
-  setSelecton(selection =>
-    selection |> List.filter(item =>
-      !(item.itemIndex == itemIndex && item.resultIndex == resultIndex)
-    )
-  )
-
-let checkboxOnChange = (itemIndex, resultIndex, setSelecton, event) =>
-  ReactEvent.Form.target(event)["checked"]
-    ? selectChecklist(itemIndex, resultIndex, setSelecton)
-    : unSelectChecklist(itemIndex, resultIndex, setSelecton)
-
-let generateFeedback = (reviewChecklist, selection, feedback, updateFeedbackCB) => {
-  let newFeedback =
-    feedback ++
-    ("\n\n" ++
-    (reviewChecklist
-    |> Array.mapi((i, reviewChecklistItem) => {
-      let resultIndexList =
-        selection
-        |> List.filter(selectionItem => selectionItem.itemIndex == i)
-        |> List.map(item => item.resultIndex)
-
-      reviewChecklistItem
-      |> ReviewChecklistItem.result
-      |> Array.mapi((index, resultItem) =>
-        resultIndexList |> List.mem(index)
-          ? switch resultItem |> ReviewChecklistResult.feedback {
-            | Some(feedback) => list{feedback}
-            | None => list{}
-            }
-          : list{}
-      )
-      |> Array.to_list
-      |> List.flatten
-    })
-    |> Array.to_list
-    |> List.flatten
-    |> Array.of_list
-    |> Js.Array.joinWith("\n\n")))
-  updateFeedbackCB(newFeedback)
-}
-let checklistItemCheckedClasses = (itemIndex, selection) =>
-  "mb-4 px-2 pb-2 md:px-4 border-l-2 border-transparent " ++ (
-    selection |> List.filter(s => s.itemIndex == itemIndex) |> ListUtils.isNotEmpty
-      ? "border-green-400"
-      : ""
-  )
-
-let checklistItemChecked = (itemIndex, resultIndex, selection) =>
-  selection
-  |> List.filter(s => s.itemIndex == itemIndex && s.resultIndex == resultIndex)
-  |> ListUtils.isNotEmpty
-
-@react.component
-let make = (~reviewChecklist, ~feedback, ~updateFeedbackCB, ~showEditorCB) => {
-  let (selection, setSelecton) = React.useState(() => list{})
-  let (id, _setId) = React.useState(() => DateTime.randomId() ++ "-review-checkbox-")
-
-  <div className="relative border bg-gray-100 rounded-lg py-2 md:py-4">
-    <div className="absolute right-0 top-0 -mt-9">
-      <button
-        className="flex items-center btn btn-small btn-primary-ghost" onClick={_ => showEditorCB()}>
-        <i className="far fa-edit" />
-        <span className="ml-2 leading-tight"> {"Edit Checklist" |> str} </span>
-      </button>
-    </div>
-    {reviewChecklist
-    |> Array.mapi((itemIndex, reviewChecklistItem) =>
-      <div
-        className={checklistItemCheckedClasses(itemIndex, selection)}
-        key={itemIndex |> string_of_int}
-        ariaLabel={"checklist-item-" ++ (itemIndex |> string_of_int)}>
-        <h4 className="text-base font-semibold mt-2 md:mt-0 w-full md:w-4/5">
-          {reviewChecklistItem |> ReviewChecklistItem.title |> str}
-        </h4>
-        <div>
-          {reviewChecklistItem
-          |> ReviewChecklistItem.result
-          |> Array.mapi((resultIndex, checklistItem) =>
-            <div
-              className="px-2 md:px-4 mt-2"
-              ariaLabel={"result-item-" ++ (resultIndex |> string_of_int)}
-              key={(itemIndex |> string_of_int) ++ (resultIndex |> string_of_int)}>
-              <Checkbox
-                id={id ++ ((itemIndex |> string_of_int) ++ (resultIndex |> string_of_int))}
-                label={checklistItem |> ReviewChecklistResult.title}
-                onChange={checkboxOnChange(itemIndex, resultIndex, setSelecton)}
-                checked={checklistItemChecked(itemIndex, resultIndex, selection)}
-              />
-              <div className="pl-7">
-                <CoursesReview__ChecklistShowFeedback
-                  feedback={checklistItem |> ReviewChecklistResult.feedback}
-                />
-              </div>
-            </div>
-          )
-          |> React.array}
-        </div>
-      </div>
-    )
-    |> React.array}
-    <div className="text-center max-w-xs mx-2 md:mx-auto">
-      <button
-        className="btn btn-primary btn-large w-full "
-        disabled={selection |> ListUtils.isEmpty}
-        onClick={_ => generateFeedback(reviewChecklist, selection, feedback, updateFeedbackCB)}>
-        {"Generate Feedback" |> str}
-      </button>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ChecklistShowFeedback.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ChecklistShowFeedback.res
deleted file mode 100644
index c59b688..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ChecklistShowFeedback.res
+++ /dev/null
@@ -1,35 +0,0 @@
-%raw(`require("./CoursesReview__ChecklistShowFeedback.css")`)
-
-let str = React.string
-
-let feedbackClasses = truncated => truncated ? "relative overflow-hidden h-12" : "relative h-auto"
-
-let optionalStringLength = feedback =>
-  switch feedback {
-  | Some(f) => f |> String.length
-  | None => 0
-  }
-
-@react.component
-let make = (~feedback) => {
-  let truncationRequired = feedback |> optionalStringLength > 150
-
-  let (truncated, setTruncated) = React.useState(() => truncationRequired)
-
-  switch feedback {
-  | Some(feedback) =>
-    <div className={feedbackClasses(truncated)}>
-      <MarkdownBlock markdown=feedback className="text-sm" profile=Markdown.Permissive />
-      {truncationRequired && truncated
-        ? <div className="checklist-show-feedback__show-all-button absolute bottom-0 w-full">
-            <button
-              className="block w-full text-center rounded-lg text-primary-500 text-xs font-semibold focus:outline-none hover:text-primary-400"
-              onClick={_ => setTruncated(_ => false)}>
-              <span className="inline-block bg-gray-100 px-2"> {"Show All" |> str} </span>
-            </button>
-          </div>
-        : React.null}
-    </div>
-  | None => React.null
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Feedback.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Feedback.res
deleted file mode 100644
index 49cdce1..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Feedback.res
+++ /dev/null
@@ -1,20 +0,0 @@
-type t = {
-  createdAt: Js.Date.t,
-  value: string,
-  coachName: string,
-  coachAvatarUrl: option<string>,
-  coachTitle: string,
-}
-let value = t => t.value
-let coachName = t => t.coachName
-let coachAvatarUrl = t => t.coachAvatarUrl
-let coachTitle = t => t.coachTitle
-let createdAtPretty = t => t.createdAt |> DateFns.format("MMMM D, YYYY")
-
-let make = (~coachName, ~coachAvatarUrl, ~coachTitle, ~createdAt, ~value) => {
-  coachName: coachName,
-  coachAvatarUrl: coachAvatarUrl,
-  coachTitle: coachTitle,
-  createdAt: createdAt,
-  value: value,
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__FeedbackEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__FeedbackEditor.res
deleted file mode 100644
index c8d671f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__FeedbackEditor.res
+++ /dev/null
@@ -1,56 +0,0 @@
-let str = React.string
-
-@react.component
-let make = (
-  ~feedback,
-  ~updateFeedbackCB,
-  ~label,
-  ~reviewChecklist,
-  ~updateReviewChecklistCB,
-  ~checklistVisible,
-  ~targetId,
-) => {
-  let (checklistVisible, setChecklistVisible) = React.useState(() => checklistVisible)
-  let reviewChecklistIsNotEmpty = reviewChecklist |> ArrayUtils.isNotEmpty
-  <div>
-    <div>
-      {switch (checklistVisible, reviewChecklistIsNotEmpty) {
-      | (true, _)
-      | (false, false) =>
-        <CoursesReview__Checklist
-          reviewChecklist updateFeedbackCB feedback updateReviewChecklistCB targetId
-        />
-
-      | (false, true) =>
-        <div className="px-4 pt-4 md:px-6 pt-6">
-          <button
-            className="flex items-center bg-gray-100 border p-4 rounded-lg w-full text-left text-primary-500 font-semibold hover:bg-gray-200 hover:border-primary-300 focus:outline-none"
-            onClick={_ => setChecklistVisible(_ => true)}>
-            <span
-              className="inline-flex w-10 h-10 border border-white items-center justify-center rounded-full bg-primary-100 text-primary-500">
-              <i className="fas fa-list" />
-            </span>
-            <span className="ml-3"> {"Show Review Checklist" |> str} </span>
-          </button>
-        </div>
-      }}
-    </div>
-    <div className="px-4 pt-4 md:px-6 md:pt-6 course-review__feedback-editor text-sm">
-      <h5 className="font-semibold text-sm flex items-center">
-        <PfIcon
-          className="if i-comment-alt-regular text-gray-800 text-base md:text-lg inline-block"
-        />
-        <span className="ml-2 md:ml-3 tracking-wide"> {label |> str} </span>
-      </h5>
-      <div className="mt-2 md:ml-7" ariaLabel="feedback">
-        <MarkdownEditor
-          onChange=updateFeedbackCB
-          value=feedback
-          profile=Markdown.Permissive
-          maxLength=10000
-          placeholder="This feedback will be emailed to students when you finish grading."
-        />
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Grade.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Grade.res
deleted file mode 100644
index 92b539e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Grade.res
+++ /dev/null
@@ -1,36 +0,0 @@
-type t = {
-  evaluationCriterionId: string,
-  value: int,
-}
-
-let make = (~evaluationCriterionId, ~value) => {
-  evaluationCriterionId: evaluationCriterionId,
-  value: value,
-}
-
-let sort = (criteria, grades) =>
-  grades |> ArrayUtils.copyAndSort((g1, g2) => {
-    let ec1 =
-      criteria |> ArrayUtils.unsafeFind(
-        ec => EvaluationCriterion.id(ec) == g1.evaluationCriterionId,
-        "Unable to find evaluation criterion with ID: " ++
-        (g1.evaluationCriterionId ++
-        " in CoursesReview__Grade"),
-      )
-    let ec2 =
-      criteria |> ArrayUtils.unsafeFind(
-        ec => EvaluationCriterion.id(ec) == g2.evaluationCriterionId,
-        "Unable to find evaluation criterion with ID: " ++
-        (g2.evaluationCriterionId ++
-        " in CoursesReview__Grade"),
-      )
-    String.compare(ec1 |> EvaluationCriterion.name, ec2 |> EvaluationCriterion.name)
-  })
-
-let evaluationCriterionId = t => t.evaluationCriterionId
-let value = t => t.value
-let asJsType = t =>
-  {
-    "evaluationCriterionId": t.evaluationCriterionId,
-    "grade": t.value,
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__GradeCard.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__GradeCard.res
deleted file mode 100644
index 9c5f7a9..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__GradeCard.res
+++ /dev/null
@@ -1,555 +0,0 @@
-%raw(`require("./CoursesReview__GradeCard.css")`)
-
-open CoursesReview__Types
-let str = React.string
-
-type status =
-  | Graded(bool)
-  | Grading
-  | Ungraded
-
-type state = {
-  grades: array<Grade.t>,
-  newFeedback: string,
-  saving: bool,
-  checklist: array<SubmissionChecklistItem.t>,
-  note: option<string>,
-}
-
-type action =
-  | BeginSaving
-  | FinishSaving
-  | UpdateFeedback(string)
-  | UpdateGrades(array<Grade.t>)
-  | UpdateChecklist(array<SubmissionChecklistItem.t>)
-  | UpdateNote(string)
-
-let reducer = (state, action) =>
-  switch action {
-  | BeginSaving => {...state, saving: true}
-  | FinishSaving => {...state, saving: false}
-  | UpdateFeedback(newFeedback) => {...state, newFeedback: newFeedback}
-  | UpdateGrades(grades) => {...state, grades: grades}
-  | UpdateChecklist(checklist) => {...state, checklist: checklist}
-  | UpdateNote(note) => {...state, note: Some(note)}
-  }
-
-let passed = (grades, evaluationCriteria) =>
-  grades
-  |> Js.Array.filter(g => {
-    let passGrade =
-      evaluationCriteria
-      |> ArrayUtils.unsafeFind(
-        ec => EvaluationCriterion.id(ec) == (g |> Grade.evaluationCriterionId),
-        "CoursesReview__GradeCard: Unable to find evaluation criterion with id - " ++
-        (g |> Grade.evaluationCriterionId),
-      )
-      |> EvaluationCriterion.passGrade
-
-    g |> Grade.value < passGrade
-  })
-  |> ArrayUtils.isEmpty
-
-module CreateGradingMutation = %graphql(`
-    mutation CreateGradingMutation($submissionId: ID!, $feedback: String, $grades: [GradeInput!]!, $note: String,  $checklist: JSON!) {
-      createGrading(submissionId: $submissionId, feedback: $feedback, grades: $grades, note: $note, checklist: $checklist){
-        success
-      }
-    }
-  `)
-
-module UndoGradingMutation = %graphql(`
-    mutation UndoGradingMutation($submissionId: ID!) {
-      undoGrading(submissionId: $submissionId){
-        success
-      }
-    }
-  `)
-
-let undoGrading = (submissionId, send) => {
-  send(BeginSaving)
-
-  UndoGradingMutation.make(~submissionId, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["undoGrading"]["success"] ? DomUtils.reload() |> ignore : send(FinishSaving)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let trimToOption = s =>
-  switch s |> String.trim {
-  | "" => None
-  | s => Some(s)
-  }
-
-let gradeSubmissionQuery = (submissionId, state, send, evaluationCriteria, addGradingCB) => {
-  let jsGradesArray = state.grades |> Array.map(g => g |> Grade.asJsType)
-
-  let checklist = state.checklist |> SubmissionChecklistItem.encodeArray
-  send(BeginSaving)
-
-  let feedback = state.newFeedback |> trimToOption
-  let note = state.note |> OptionUtils.flatMap(trimToOption)
-
-  CreateGradingMutation.make(
-    ~submissionId,
-    ~feedback?,
-    ~note?,
-    ~grades=jsGradesArray,
-    ~checklist,
-    (),
-  )
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["createGrading"]["success"]
-      ? addGradingCB(
-          ~newFeedback=state.newFeedback,
-          ~passed=passed(state.grades, evaluationCriteria),
-          ~grades=state.grades,
-          ~checklist=state.checklist,
-        )
-      : ()
-    send(FinishSaving)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let updateGrading = (grade, state, send) => {
-  let newGrades =
-    state.grades
-    |> Js.Array.filter(g =>
-      g |> Grade.evaluationCriterionId != (grade |> Grade.evaluationCriterionId)
-    )
-    |> Array.append([grade])
-
-  send(UpdateGrades(newGrades))
-}
-
-let handleGradePillClick = (evaluationCriterionId, value, state, send, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  switch send {
-  | Some(send) => updateGrading(Grade.make(~evaluationCriterionId, ~value), state, send)
-  | None => ()
-  }
-}
-
-let findEvaluationCriterion = (evaluationCriteria, evaluationCriterionId) =>
-  switch evaluationCriteria |> Js.Array.find(ec =>
-    ec |> EvaluationCriterion.id == evaluationCriterionId
-  ) {
-  | Some(ec) => ec
-  | None =>
-    Rollbar.error(
-      "Unable to find evaluation Criterion with id: " ++
-      (evaluationCriterionId ++
-      "in CoursesRevew__GradeCard"),
-    )
-    evaluationCriteria[0]
-  }
-
-let gradePillHeader = (evaluationCriteriaName, selectedGrade, gradeLabels) =>
-  <div className="flex justify-between">
-    <p className="text-xs font-semibold"> {evaluationCriteriaName |> str} </p>
-    <p className="text-xs font-semibold">
-      {(selectedGrade |> string_of_int) ++
-        ("/" ++
-        (GradeLabel.maxGrade(gradeLabels |> Array.to_list) |> string_of_int)) |> str}
-    </p>
-  </div>
-
-let gradePillClasses = (selectedGrade, currentGrade, passgrade, send) => {
-  let defaultClasses =
-    "course-review-grade-card__grade-pill border-gray-400 py-1 px-2 text-sm flex-1 font-semibold " ++
-    switch send {
-    | Some(_) =>
-      "cursor-pointer hover:shadow-lg focus:outline-none " ++ (
-        currentGrade >= passgrade
-          ? "hover:bg-green-500 hover:text-white "
-          : "hover:bg-red-500 hover:text-white "
-      )
-
-    | None => ""
-    }
-
-  defaultClasses ++ (
-    currentGrade <= selectedGrade
-      ? selectedGrade >= passgrade
-          ? "bg-green-500 text-white shadow-lg"
-          : "bg-red-500 text-white shadow-lg"
-      : "bg-white text-gray-900"
-  )
-}
-
-let showGradePill = (key, evaluationCriterion, gradeValue, passGrade, state, send) =>
-  <div
-    ariaLabel={"evaluation-criterion-" ++ (evaluationCriterion |> EvaluationCriterion.id)}
-    key={key |> string_of_int}
-    className="md:pr-8 mt-4">
-    {gradePillHeader(
-      evaluationCriterion |> EvaluationCriterion.name,
-      gradeValue,
-      evaluationCriterion |> EvaluationCriterion.gradesAndLabels,
-    )}
-    <div className="course-review-grade-card__grade-bar inline-flex w-full text-center mt-1">
-      {evaluationCriterion
-      |> EvaluationCriterion.gradesAndLabels
-      |> Array.map(gradeLabel => {
-        let gradeLabelGrade = gradeLabel |> GradeLabel.grade
-
-        <div
-          key={gradeLabelGrade |> string_of_int}
-          onClick={handleGradePillClick(
-            evaluationCriterion |> EvaluationCriterion.id,
-            gradeLabelGrade,
-            state,
-            send,
-          )}
-          title={gradeLabel |> GradeLabel.label}
-          className={gradePillClasses(gradeValue, gradeLabelGrade, passGrade, send)}>
-          {switch send {
-          | Some(_) => gradeLabelGrade |> string_of_int |> str
-          | None => React.null
-          }}
-        </div>
-      })
-      |> React.array}
-    </div>
-  </div>
-
-let showGrades = (grades, evaluationCriteria, state) =>
-  <div>
-    {grades
-    |> Grade.sort(evaluationCriteria)
-    |> Array.mapi((key, grade) => {
-      let gradeEcId = Grade.evaluationCriterionId(grade)
-      let ec =
-        evaluationCriteria |> ArrayUtils.unsafeFind(
-          ec => ec |> EvaluationCriterion.id == gradeEcId,
-          "Unable to find evaluation Criterion with id: " ++
-          (gradeEcId ++
-          "in CoursesRevew__GradeCard"),
-        )
-
-      showGradePill(key, ec, grade |> Grade.value, ec |> EvaluationCriterion.passGrade, state, None)
-    })
-    |> React.array}
-  </div>
-let renderGradePills = (evaluationCriteria, targetEvaluationCriteriaIds, state, send) =>
-  targetEvaluationCriteriaIds
-  |> Array.mapi((key, evaluationCriterionId) => {
-    let ec =
-      evaluationCriteria |> ArrayUtils.unsafeFind(
-        e => e |> EvaluationCriterion.id == evaluationCriterionId,
-        "CoursesReview__GradeCard: Unable to find evaluation criterion with id - " ++
-        evaluationCriterionId,
-      )
-    let grade =
-      state.grades |> Js.Array.find(g =>
-        g |> Grade.evaluationCriterionId == (ec |> EvaluationCriterion.id)
-      )
-    let gradeValue = switch grade {
-    | Some(g) => g |> Grade.value
-    | None => 0
-    }
-
-    let passGrade = ec |> EvaluationCriterion.passGrade
-
-    showGradePill(key, ec, gradeValue, passGrade, state, Some(send))
-  })
-  |> React.array
-let gradeStatusClasses = (color, status) =>
-  "w-12 h-10 p-1 mr-2 md:mr-0 md:w-24 md:h-20 rounded md:rounded-lg border flex justify-center items-center bg-" ++
-  (color ++
-  ("-100 " ++
-  ("border-" ++
-  (color ++
-  ("-400 " ++
-  switch status {
-  | Grading => "course-review-grade-card__status-pulse"
-  | Graded(_)
-  | Ungraded => ""
-  })))))
-
-let submissionStatusIcon = (status, overlaySubmission, send) => {
-  let (text, color) = switch status {
-  | Graded(passed) => passed ? ("Passed", "green") : ("Failed", "red")
-  | Grading => ("Reviewing", "orange")
-  | Ungraded => ("Not Reviewed", "gray")
-  }
-
-  <div
-    ariaLabel="submission-status"
-    className="flex w-full md:w-3/6 flex-col items-center justify-center md:border-l mt-4 md:mt-0">
-    <div
-      className="flex flex-col-reverse md:flex-row items-start md:items-stretch justify-center w-full md:pl-6">
-      {switch (overlaySubmission |> OverlaySubmission.evaluatedAt, status) {
-      | (Some(date), Graded(_)) =>
-        <div
-          className="bg-gray-200 block md:flex flex-col w-full justify-between rounded-lg pt-3 mr-2 mt-4 md:mt-0">
-          <div>
-            <p className="text-xs px-3"> {"Evaluated By" |> str} </p>
-            <p className="text-sm font-semibold px-3 pb-3">
-              {switch overlaySubmission |> OverlaySubmission.evaluatorName {
-              | Some(name) => name |> str
-              | None => <em> {"Deleted Coach" |> str} </em>
-              }}
-            </p>
-          </div>
-          <div
-            className="text-xs bg-gray-300 flex items-center rounded-b-lg px-3 py-2 md:px-3 md:py-1">
-            {"on " ++ (date |> DateFns.format("MMMM D, YYYY")) |> str}
-          </div>
-        </div>
-      | (None, Graded(_))
-      | (_, Grading)
-      | (_, Ungraded) => React.null
-      }}
-      <div className="w-full md:w-24 flex flex-row md:flex-col md:items-center justify-center">
-        <div className={gradeStatusClasses(color, status)}>
-          {switch status {
-          | Graded(passed) =>
-            passed
-              ? <Icon className="if i-badge-check-solid text-xl md:text-5xl text-green-500" />
-              : <FaIcon classes="fas fa-exclamation-triangle text-xl md:text-4xl text-red-500" />
-          | Grading =>
-            <Icon className="if i-writing-pad-solid text-xl md:text-5xl text-orange-300" />
-          | Ungraded => <Icon className="if i-eye-solid text-xl md:text-4xl text-gray-400" />
-          }}
-        </div>
-        <p
-          className={"text-xs flex items-center justify-center md:block text-center w-full border rounded px-1 py-px font-semibold md:mt-1 " ++
-          ("border-" ++
-          (color ++
-          ("-400 " ++
-          ("bg-" ++ (color ++ ("-100 " ++ ("text-" ++ (color ++ "-800 "))))))))}>
-          {text |> str}
-        </p>
-      </div>
-    </div>
-    {switch (overlaySubmission |> OverlaySubmission.evaluatedAt, status) {
-    | (Some(_), Graded(_)) =>
-      <div className="mt-4 md:pl-6 w-full">
-        <button
-          onClick={_ => undoGrading(overlaySubmission |> OverlaySubmission.id, send)}
-          className="btn btn-danger btn-small">
-          <i className="fas fa-undo" /> <span className="ml-2"> {"Undo Grading" |> str} </span>
-        </button>
-      </div>
-    | (None, Graded(_))
-    | (_, Grading)
-    | (_, Ungraded) => React.null
-    }}
-  </div>
-}
-
-let gradeSubmission = (
-  submissionId,
-  state,
-  send,
-  evaluationCriteria,
-  addGradingCB,
-  status,
-  event,
-) => {
-  event |> ReactEvent.Mouse.preventDefault
-  switch status {
-  | Graded(_) => gradeSubmissionQuery(submissionId, state, send, evaluationCriteria, addGradingCB)
-  | Grading
-  | Ungraded => ()
-  }
-}
-
-let showFeedbackForm = (grades, reviewChecklist, updateReviewChecklistCB, state, send, targetId) =>
-  switch grades {
-  | [] =>
-    <CoursesReview__FeedbackEditor
-      feedback=state.newFeedback
-      label="Add Your Feedback"
-      updateFeedbackCB={feedback => send(UpdateFeedback(feedback))}
-      reviewChecklist
-      updateReviewChecklistCB
-      checklistVisible=true
-      targetId
-    />
-  | _ => React.null
-  }
-let reviewButtonDisabled = status =>
-  switch status {
-  | Graded(_) => false
-  | Grading
-  | Ungraded => true
-  }
-
-let computeStatus = (overlaySubmission, selectedGrades, evaluationCriteria) =>
-  switch (
-    overlaySubmission |> OverlaySubmission.passedAt,
-    overlaySubmission |> OverlaySubmission.grades |> ArrayUtils.isNotEmpty,
-  ) {
-  | (Some(_), _) => Graded(true)
-  | (None, true) => Graded(false)
-  | (_, _) =>
-    if selectedGrades == [] {
-      Ungraded
-    } else if selectedGrades |> Array.length != (evaluationCriteria |> Array.length) {
-      Grading
-    } else {
-      Graded(passed(selectedGrades, evaluationCriteria))
-    }
-  }
-
-let submitButtonText = (feedback, grades) =>
-  switch (feedback != "", grades |> ArrayUtils.isNotEmpty) {
-  | (false, false)
-  | (false, true) => "Save grades"
-  | (true, false)
-  | (true, true) => "Save grades & send feedback"
-  }
-
-let noteForm = (overlaySubmission, teamSubmission, note, send) =>
-  switch overlaySubmission |> OverlaySubmission.grades {
-  | [] =>
-    let (noteAbout, additionalHelp) = teamSubmission
-      ? (
-          "team",
-          " This submission is from a team, so a note added here will be posted to the report of all students in the team.",
-        )
-      : ("student", "")
-
-    let help =
-      <HelpIcon className="ml-1">
-        {"Notes can be used to keep track of a " ++
-        (noteAbout ++
-        ("'s progress. These notes are shown only to coaches in a student's report." ++
-        additionalHelp)) |> str}
-      </HelpIcon>
-
-    let textareaId = "note-for-submission-" ++ (overlaySubmission |> OverlaySubmission.id)
-
-    <div className="text-sm">
-      <h5 className="font-semibold text-sm flex items-center">
-        <i className="far fa-sticky-note text-gray-800 text-base" />
-        {switch note {
-        | Some(_) =>
-          <span className="ml-2 md:ml-3 tracking-wide">
-            <label htmlFor=textareaId> {"Write a Note" |> str} </label> help
-          </span>
-        | None =>
-          <div className="ml-2 md:ml-3 tracking-wide flex justify-between items-center w-full">
-            <span>
-              <span>
-                {"Would you like to write a note about this " ++ (noteAbout ++ "?") |> str}
-              </span>
-              help
-            </span>
-            <button
-              className="btn btn-small btn-primary-ghost ml-1" onClick={_ => send(UpdateNote(""))}>
-              {"Write a Note" |> str}
-            </button>
-          </div>
-        }}
-      </h5>
-      {switch note {
-      | Some(note) =>
-        <div className="ml-6 md:ml-7 mt-2">
-          <MarkdownEditor
-            maxLength=10000
-            textareaId
-            value=note
-            onChange={value => send(UpdateNote(value))}
-            profile=Markdown.Permissive
-            placeholder="Did you notice something while reviewing this submission?"
-          />
-        </div>
-      | None => React.null
-      }}
-    </div>
-  | _someGrades => React.null
-  }
-
-@react.component
-let make = (
-  ~overlaySubmission,
-  ~teamSubmission,
-  ~evaluationCriteria,
-  ~reviewChecklist,
-  ~addGradingCB,
-  ~updateReviewChecklistCB,
-  ~targetId,
-  ~targetEvaluationCriteriaIds,
-) => {
-  let (state, send) = React.useReducer(
-    reducer,
-    {
-      grades: [],
-      newFeedback: "",
-      saving: false,
-      note: None,
-      checklist: overlaySubmission |> OverlaySubmission.checklist,
-    },
-  )
-
-  let status = computeStatus(overlaySubmission, state.grades, evaluationCriteria)
-
-  let updateChecklistCB = switch overlaySubmission |> OverlaySubmission.grades {
-  | [] => Some(checklist => send(UpdateChecklist(checklist)))
-  | _ => None
-  }
-  let pending = overlaySubmission |> OverlaySubmission.grades |> ArrayUtils.isEmpty
-
-  <DisablingCover disabled=state.saving>
-    <div>
-      <div className="pt-2 pb-6 px-4 md:px-6 bg-gray-100 border-b">
-        <SubmissionChecklistShow checklist=state.checklist updateChecklistCB pending />
-      </div>
-      {showFeedbackForm(
-        overlaySubmission |> OverlaySubmission.grades,
-        reviewChecklist,
-        updateReviewChecklistCB,
-        state,
-        send,
-        targetId,
-      )}
-      <div className="w-full px-4 pt-4 md:px-6 md:pt-6">
-        {noteForm(overlaySubmission, teamSubmission, state.note, send)}
-        <h5 className="font-semibold text-sm flex items-center mt-4 md:mt-6">
-          <Icon className="if i-tachometer-regular text-gray-800 text-base" />
-          <span className="ml-2 md:ml-3 tracking-wide"> {"Grade Card" |> str} </span>
-        </h5>
-        <div
-          className="flex md:flex-row flex-col border md:ml-7 bg-gray-100 p-2 md:p-4 rounded-lg mt-2">
-          <div className="w-full md:w-3/6">
-            {switch overlaySubmission |> OverlaySubmission.grades {
-            | [] => renderGradePills(evaluationCriteria, targetEvaluationCriteriaIds, state, send)
-
-            | grades => showGrades(grades, evaluationCriteria, state)
-            }}
-          </div>
-          {submissionStatusIcon(status, overlaySubmission, send)}
-        </div>
-      </div>
-    </div>
-    {switch overlaySubmission |> OverlaySubmission.grades {
-    | [] =>
-      <div className="bg-white pt-4 mr-4 ml-4 md:mr-6 md:ml-13">
-        <button
-          disabled={reviewButtonDisabled(status)}
-          className="btn btn-success btn-large w-full border border-green-600"
-          onClick={gradeSubmission(
-            overlaySubmission |> OverlaySubmission.id,
-            state,
-            send,
-            evaluationCriteria,
-            addGradingCB,
-            status,
-          )}>
-          {submitButtonText(state.newFeedback, state.grades) |> str}
-        </button>
-      </div>
-
-    | _ => React.null
-    }}
-  </DisablingCover>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__IndexSubmission.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__IndexSubmission.res
deleted file mode 100644
index 4683262..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__IndexSubmission.res
+++ /dev/null
@@ -1,95 +0,0 @@
-type status = {
-  passedAt: option<Js.Date.t>,
-  feedbackSent: bool,
-}
-
-type t = {
-  id: string,
-  title: string,
-  createdAt: Js.Date.t,
-  levelId: string,
-  userNames: string,
-  status: option<status>,
-  coachIds: array<string>,
-}
-
-let id = t => t.id
-let title = t => t.title
-let levelId = t => t.levelId
-let userNames = t => t.userNames
-let coachIds = t => t.coachIds
-
-let failed = t =>
-  switch t.status {
-  | None => false
-  | Some(status) => status.passedAt |> OptionUtils.mapWithDefault(_ => false, true)
-  }
-
-let pendingReview = t => t.status |> OptionUtils.mapWithDefault(_ => false, true)
-
-let feedbackSent = t => t.status |> OptionUtils.mapWithDefault(status => status.feedbackSent, false)
-
-let createdAtPretty = t => t.createdAt |> DateFns.format("MMMM D, YYYY")
-
-let timeDistance = t => t.createdAt |> DateFns.distanceInWordsToNow(~addSuffix=true)
-
-let sortArray = (sortDirection, submissions) => {
-  let sortDescending =
-    submissions |> ArrayUtils.copyAndSort((x, y) =>
-      DateFns.differenceInSeconds(y.createdAt, x.createdAt) |> int_of_float
-    )
-  switch sortDirection {
-  | #Descending => sortDescending
-  | #Ascending => sortDescending |> Js.Array.reverseInPlace
-  }
-}
-
-let make = (~id, ~title, ~createdAt, ~levelId, ~userNames, ~status, ~coachIds) => {
-  id: id,
-  title: title,
-  createdAt: createdAt,
-  levelId: levelId,
-  userNames: userNames,
-  status: status,
-  coachIds: coachIds,
-}
-
-let makeStatus = (~passedAt, ~feedbackSent) => {passedAt: passedAt, feedbackSent: feedbackSent}
-
-let decodeJs = details =>
-  details |> Js.Array.map(s =>
-    switch s {
-    | Some(submission) =>
-      let status =
-        submission["evaluatedAt"] |> OptionUtils.map(_ =>
-          makeStatus(
-            ~passedAt=submission["passedAt"] |> OptionUtils.map(DateFns.parseString),
-            ~feedbackSent=submission["feedbackSent"],
-          )
-        )
-
-      list{
-        make(
-          ~id=submission["id"],
-          ~title=submission["title"],
-          ~createdAt=submission["createdAt"] |> DateFns.parseString,
-          ~levelId=submission["levelId"],
-          ~userNames=submission["userNames"],
-          ~status,
-          ~coachIds=submission["coachIds"],
-        ),
-      }
-    | None => list{}
-    }
-  )
-
-let replace = (e, l) => l |> Array.map(s => s.id == e.id ? e : s)
-
-let statusEq = (overlaySubmission, t) =>
-  switch (t.status, overlaySubmission |> CoursesReview__OverlaySubmission.evaluatedAt) {
-  | (None, None) => true
-  | (Some({passedAt}), Some(_)) =>
-    passedAt == CoursesReview__OverlaySubmission.passedAt(overlaySubmission)
-  | (Some(_), None)
-  | (None, Some(_)) => false
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Level.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Level.res
deleted file mode 100644
index e6328c5..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Level.res
+++ /dev/null
@@ -1,30 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  number: int,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    number: json |> field("number", int),
-  }
-}
-
-let id = t => t.id
-let name = t => t.name
-let number = t => t.number
-
-let sort = levels => levels |> ArrayUtils.copyAndSort((x, y) => x.number - y.number)
-
-let unsafeLevelNumber = (levels, componentName, levelId) =>
-  "Level " ++
-  (levels
-  |> ArrayUtils.unsafeFind(
-    l => l.id == levelId,
-    "Unable to find level with id: " ++ (levelId ++ ("in CoursesRevew__" ++ componentName)),
-  )
-  |> number
-  |> string_of_int)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__OverlaySubmission.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__OverlaySubmission.res
deleted file mode 100644
index c550ba6..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__OverlaySubmission.res
+++ /dev/null
@@ -1,71 +0,0 @@
-type t = {
-  id: string,
-  createdAt: Js.Date.t,
-  passedAt: option<Js.Date.t>,
-  evaluatorName: option<string>,
-  evaluatedAt: option<Js.Date.t>,
-  feedback: array<CoursesReview__Feedback.t>,
-  grades: array<CoursesReview__Grade.t>,
-  checklist: array<SubmissionChecklistItem.t>,
-}
-let id = t => t.id
-let createdAt = t => t.createdAt
-let passedAt = t => t.passedAt
-let evaluatorName = t => t.evaluatorName
-let evaluatedAt = t => t.evaluatedAt
-let grades = t => t.grades
-let feedback = t => t.feedback
-let checklist = t => t.checklist
-
-let make = (
-  ~id,
-  ~createdAt,
-  ~passedAt,
-  ~evaluatorName,
-  ~feedback,
-  ~grades,
-  ~evaluatedAt,
-  ~checklist,
-) => {
-  id: id,
-  createdAt: createdAt,
-  passedAt: passedAt,
-  evaluatorName: evaluatorName,
-  feedback: feedback,
-  grades: grades,
-  evaluatedAt: evaluatedAt,
-  checklist: checklist,
-}
-
-let makeFromJs = details =>
-  details |> Js.Array.map(s =>
-    make(
-      ~id=s["id"],
-      ~createdAt=s["createdAt"] |> DateFns.parseString,
-      ~passedAt=s["passedAt"] |> OptionUtils.map(DateFns.parseString),
-      ~evaluatorName=s["evaluatorName"],
-      ~evaluatedAt=s["evaluatedAt"] |> OptionUtils.map(DateFns.parseString),
-      ~feedback=s["feedback"] |> Js.Array.map(f =>
-        CoursesReview__Feedback.make(
-          ~coachName=f["coachName"],
-          ~coachAvatarUrl=f["coachAvatarUrl"],
-          ~coachTitle=f["coachTitle"],
-          ~createdAt=f["createdAt"] |> DateFns.parseString,
-          ~value=f["value"],
-        )
-      ),
-      ~grades=s["grades"] |> Js.Array.map(g =>
-        CoursesReview__Grade.make(
-          ~evaluationCriterionId=g["evaluationCriterionId"],
-          ~value=g["grade"],
-        )
-      ),
-      ~checklist=s["checklist"] |> Json.Decode.array(
-        SubmissionChecklistItem.decode(SubmissionChecklistItem.makeFiles(s["files"])),
-      ),
-    )
-  )
-
-let feedbackSent = t => t.feedback |> ArrayUtils.isNotEmpty
-
-let updateFeedback = (feedback, t) => {...t, feedback: feedback}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ReviewChecklistItem.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ReviewChecklistItem.res
deleted file mode 100644
index 9fed311..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ReviewChecklistItem.res
+++ /dev/null
@@ -1,57 +0,0 @@
-type t = {
-  title: string,
-  result: array<CoursesReview__ReviewChecklistResult.t>,
-}
-let title = t => t.title
-let result = t => t.result
-
-let make = (~title, ~result) => {title: title, result: result}
-
-let makeFromJs = data =>
-  data |> Js.Array.map(rc =>
-    make(
-      ~title=rc["title"],
-      ~result=rc["result"] |> CoursesReview__ReviewChecklistResult.makeFromJs,
-    )
-  )
-
-let empty = () => [make(~title="", ~result=[CoursesReview__ReviewChecklistResult.empty()])]
-
-let emptyTemplate = () => [
-  make(~title="Default checklist", ~result=CoursesReview__ReviewChecklistResult.emptyTemplate()),
-]
-
-let updateTitle = (title, t) => make(~title, ~result=t.result)
-
-let updateChecklist = (result, t) => make(~title=t.title, ~result)
-
-let replace = (t, itemIndex, result) =>
-  result |> Array.mapi((index, item) => index == itemIndex ? t : item)
-
-let appendEmptyChecklistItem = t =>
-  make(
-    ~title=t.title,
-    ~result=[CoursesReview__ReviewChecklistResult.empty()] |> Array.append(t.result),
-  )
-
-let deleteResultItem = (index, t) =>
-  make(~title=t.title, ~result=t.result |> Js.Array.filteri((_el, i) => i != index))
-
-let trim = t => {
-  title: t.title |> String.trim,
-  result: t.result |> Array.map(CoursesReview__ReviewChecklistResult.trim),
-}
-
-let encode = t => {
-  open Json.Encode
-  object_(list{
-    ("title", t.title |> string),
-    ("result", t.result |> array(CoursesReview__ReviewChecklistResult.encode)),
-  })
-}
-
-let encodeArray = checklist =>
-  checklist |> {
-    open Json.Encode
-    array(encode)
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ReviewChecklistResult.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ReviewChecklistResult.res
deleted file mode 100644
index 6605919..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ReviewChecklistResult.res
+++ /dev/null
@@ -1,43 +0,0 @@
-type t = {
-  title: string,
-  feedback: option<string>,
-}
-let title = t => t.title
-let feedback = t => t.feedback
-
-let make = (~title, ~feedback) => {title: title, feedback: feedback}
-
-let makeFromJs = data => data |> Js.Array.map(r => make(~title=r["title"], ~feedback=r["feedback"]))
-
-let emptyTemplate = () => [
-  make(~title="Yes", ~feedback=Some("Sample feedback for yes")),
-  make(~title="No", ~feedback=Some("Sample feedback for no")),
-]
-
-let empty = () => make(~title="", ~feedback=None)
-
-let replace = (t, index, checklist) =>
-  checklist |> Array.mapi((resultIndex, result) => resultIndex == index ? t : result)
-
-let updateTitle = (title, t, index, checklist) =>
-  checklist |> replace(make(~title, ~feedback=t.feedback), index)
-
-let updateFeedback = (feedback, t, index, checklist) => {
-  let optionalFeedback = feedback |> Js.String.trim == "" ? None : Some(feedback)
-
-  checklist |> replace(make(~title=t.title, ~feedback=optionalFeedback), index)
-}
-
-let trim = t => {...t, title: t.title |> String.trim}
-
-let encode = t => {
-  let title = list{("title", t.title |> Json.Encode.string)}
-
-  let feedback = switch t.feedback {
-  | Some(f) => list{("feedback", f |> Json.Encode.string)}
-  | None => list{}
-  }
-
-  open Json.Encode
-  object_(\"@"(title, feedback))
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Root.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Root.res
deleted file mode 100644
index baa18e3..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Root.res
+++ /dev/null
@@ -1,445 +0,0 @@
-%raw(`require("./CoursesReview__Root.css")`)
-
-open CoursesReview__Types
-let str = React.string
-
-type sortBy = {
-  criterion: string,
-  criterionType: [#String | #Number],
-}
-
-type selectedTab = [#Reviewed | #Pending]
-
-type state = {
-  pendingSubmissions: Submissions.t,
-  reviewedSubmissions: Submissions.t,
-  selectedTab: selectedTab,
-  selectedLevel: option<Level.t>,
-  selectedCoach: option<Coach.t>,
-  filterString: string,
-  sortBy: sortBy,
-  sortDirection: [#Ascending | #Descending],
-  reloadAt: Js.Date.t,
-}
-
-type action =
-  | SelectLevel(Level.t)
-  | DeselectLevel
-  | ReloadSubmissions
-  | SetSubmissions(array<IndexSubmission.t>, selectedTab, bool, option<string>, int)
-  | UpdateReviewedSubmission(IndexSubmission.t)
-  | SelectPendingTab
-  | SelectReviewedTab
-  | SelectCoach(Coach.t)
-  | DeselectCoach
-  | UpdateFilterString(string)
-  | UpdateSortDirection([#Ascending | #Descending])
-  | SyncSubmissionStatus(OverlaySubmission.t)
-
-let reducer = (state, action) =>
-  switch action {
-  | SelectLevel(level) => {
-      ...state,
-      selectedLevel: Some(level),
-      filterString: "",
-    }
-  | DeselectLevel => {...state, selectedLevel: None}
-  | ReloadSubmissions => {
-      ...state,
-      pendingSubmissions: Unloaded,
-      reviewedSubmissions: Unloaded,
-      reloadAt: Js.Date.make(),
-    }
-  | SetSubmissions(submissions, selectedTab, hasNextPage, endCursor, totalCount) =>
-    let filter = Submissions.makeFilter(state.selectedLevel, state.selectedCoach)
-
-    let updatedSubmissions = switch (hasNextPage, endCursor) {
-    | (_, None)
-    | (false, Some(_)) =>
-      Submissions.fullyLoaded(
-        ~submissions,
-        ~filter,
-        ~sortDirection=state.sortDirection,
-        ~totalCount,
-      )
-    | (true, Some(cursor)) =>
-      Submissions.partiallyLoaded(
-        ~submissions,
-        ~filter,
-        ~sortDirection=state.sortDirection,
-        ~totalCount,
-        ~cursor,
-      )
-    }
-
-    switch selectedTab {
-    | #Pending => {...state, pendingSubmissions: updatedSubmissions}
-    | #Reviewed => {...state, reviewedSubmissions: updatedSubmissions}
-    }
-  | UpdateReviewedSubmission(submission) =>
-    let filter = Submissions.makeFilter(state.selectedLevel, state.selectedCoach)
-
-    {
-      ...state,
-      reviewedSubmissions: switch state.reviewedSubmissions {
-      | Unloaded => Unloaded
-      | PartiallyLoaded({submissions, totalCount}, cursor) =>
-        Submissions.partiallyLoaded(
-          ~submissions=submissions |> IndexSubmission.replace(submission),
-          ~filter,
-          ~sortDirection=state.sortDirection,
-          ~totalCount,
-          ~cursor,
-        )
-      | FullyLoaded({submissions, totalCount}) =>
-        Submissions.fullyLoaded(
-          ~submissions=submissions |> IndexSubmission.replace(submission),
-          ~filter,
-          ~totalCount,
-          ~sortDirection=state.sortDirection,
-        )
-      },
-    }
-  | SelectPendingTab => {...state, selectedTab: #Pending}
-  | SelectReviewedTab => {...state, selectedTab: #Reviewed}
-  | SelectCoach(coach) => {
-      ...state,
-      selectedCoach: Some(coach),
-      filterString: "",
-    }
-  | DeselectCoach => {...state, selectedCoach: None}
-  | UpdateFilterString(filterString) => {...state, filterString: filterString}
-  | UpdateSortDirection(sortDirection) => {...state, sortDirection: sortDirection}
-  | SyncSubmissionStatus(overlaySubmission) =>
-    let skipReload =
-      state.pendingSubmissions
-      |> Submissions.toArray
-      |> Array.append(state.reviewedSubmissions |> Submissions.toArray)
-      |> Js.Array.find(indexSubmission =>
-        indexSubmission |> IndexSubmission.id == OverlaySubmission.id(overlaySubmission)
-      )
-      |> OptionUtils.mapWithDefault(
-        indexSubmission => indexSubmission |> IndexSubmission.statusEq(overlaySubmission),
-        true,
-      )
-
-    skipReload
-      ? state
-      : {
-          ...state,
-          pendingSubmissions: Unloaded,
-          reviewedSubmissions: Unloaded,
-          reloadAt: Js.Date.make(),
-        }
-  }
-
-let computeInitialState = currentTeamCoach => {
-  pendingSubmissions: Unloaded,
-  reviewedSubmissions: Unloaded,
-  selectedTab: #Pending,
-  selectedLevel: None,
-  selectedCoach: currentTeamCoach,
-  filterString: "",
-  sortBy: {
-    criterion: "Submitted At",
-    criterionType: #Number,
-  },
-  sortDirection: #Descending,
-  reloadAt: Js.Date.make(),
-}
-
-let openOverlay = (submissionId, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  ReasonReactRouter.push("/submissions/" ++ submissionId)
-}
-
-let dropdownElementClasses = (level, selectedLevel) =>
-  "p-3 w-full text-left font-semibold focus:outline-none " ++
-  switch (selectedLevel, level) {
-  | (Some(sl), Some(l)) if l |> Level.id == (sl |> Level.id) => "bg-gray-200 text-primary-500"
-  | (None, None) => "bg-gray-200 text-primary-500"
-  | _ => ""
-  }
-
-let buttonClasses = selected =>
-  "w-1/2 md:w-auto py-2 px-3 md:px-6 font-semibold text-sm focus:outline-none " ++ (
-    selected
-      ? "bg-primary-100 shadow-inner text-primary-500"
-      : "bg-white shadow-md hover:shadow hover:text-primary-500 hover:bg-gray-100"
-  )
-
-module Selectable = {
-  type t =
-    | Level(Level.t)
-    | AssignedToCoach(Coach.t, string)
-
-  let label = t =>
-    switch t {
-    | Level(level) => Some("Level " ++ (level |> Level.number |> string_of_int))
-    | AssignedToCoach(_) => Some("Assigned to")
-    }
-
-  let value = t =>
-    switch t {
-    | Level(level) => level |> Level.name
-    | AssignedToCoach(coach, currentCoachId) =>
-      coach |> Coach.id == currentCoachId ? "Me" : coach |> Coach.name
-    }
-
-  let searchString = t =>
-    switch t {
-    | Level(level) =>
-      "level " ++ ((level |> Level.number |> string_of_int) ++ (" " ++ (level |> Level.name)))
-    | AssignedToCoach(coach, currentCoachId) =>
-      if coach |> Coach.id == currentCoachId {
-        (coach |> Coach.name) ++ " assigned to me"
-      } else {
-        "assigned to " ++ (coach |> Coach.name)
-      }
-    }
-
-  let color = _t => "gray"
-  let level = level => Level(level)
-  let assignedToCoach = (coach, currentCoachId) => AssignedToCoach(coach, currentCoachId)
-}
-
-module Multiselect = MultiselectDropdown.Make(Selectable)
-
-let unselected = (levels, coaches, currentCoachId, state) => {
-  let unselectedLevels =
-    levels
-    |> Js.Array.filter(level =>
-      state.selectedLevel |> OptionUtils.mapWithDefault(
-        selectedLevel => level |> Level.id != (selectedLevel |> Level.id),
-        true,
-      )
-    )
-    |> Array.map(Selectable.level)
-
-  let unselectedCoaches =
-    coaches
-    |> Js.Array.filter(coach =>
-      state.selectedCoach |> OptionUtils.mapWithDefault(
-        selectedCoach => coach |> Coach.id != Coach.id(selectedCoach),
-        true,
-      )
-    )
-    |> Array.map(coach => Selectable.assignedToCoach(coach, currentCoachId))
-
-  unselectedLevels |> Array.append(unselectedCoaches)
-}
-
-let selected = (state, currentCoachId) => {
-  let selectedLevel =
-    state.selectedLevel |> OptionUtils.mapWithDefault(
-      selectedLevel => [Selectable.level(selectedLevel)],
-      [],
-    )
-
-  let selectedCoach =
-    state.selectedCoach |> OptionUtils.mapWithDefault(
-      selectedCoach => [Selectable.assignedToCoach(selectedCoach, currentCoachId)],
-      [],
-    )
-
-  selectedLevel |> Array.append(selectedCoach)
-}
-
-let onSelectFilter = (send, selectable) =>
-  switch selectable {
-  | Selectable.AssignedToCoach(coach, _currentCoachId) => send(SelectCoach(coach))
-  | Level(level) => send(SelectLevel(level))
-  }
-
-let onDeselectFilter = (send, selectable) =>
-  switch selectable {
-  | Selectable.AssignedToCoach(_) => send(DeselectCoach)
-  | Level(_) => send(DeselectLevel)
-  }
-
-let filterPlaceholder = state =>
-  switch (state.selectedLevel, state.selectedCoach) {
-  | (None, Some(_)) => "Filter by level"
-  | (None, None) => "Filter by level, or only show submissions assigned to a coach"
-  | (Some(_), Some(_)) => "Filter by another level"
-  | (Some(_), None) => "Filter by another level, or only show submissions assigned to a coach"
-  }
-
-let restoreFilterNotice = (send, currentCoach, message) =>
-  <div
-    className="mb-4 text-sm italic flex flex-col md:flex-row items-center justify-between p-3 border border-gray-300 bg-white rounded-lg">
-    <span> {message |> str} </span>
-    <button
-      className="px-2 py-1 rounded text-xs overflow-hidden border border-gray-300 bg-gray-200 text-gray-800 border-gray-300 bg-gray-200 hover:bg-gray-300 mt-1 md:mt-0"
-      onClick={_ => send(SelectCoach(currentCoach))}>
-      {"Assigned to: Me" |> str} <i className="fas fa-level-up-alt ml-2" />
-    </button>
-  </div>
-
-let restoreAssignedToMeFilter = (state, send, currentTeamCoach) =>
-  currentTeamCoach |> OptionUtils.mapWithDefault(currentCoach =>
-    switch state.selectedCoach {
-    | None =>
-      restoreFilterNotice(
-        send,
-        currentCoach,
-        "Now showing submissions from all students in this course.",
-      )
-    | Some(selectedCoach) if selectedCoach |> Coach.id == Coach.id(currentCoach) => React.null
-    | Some(selectedCoach) =>
-      restoreFilterNotice(
-        send,
-        currentCoach,
-        "Now showing submissions assigned to " ++ ((selectedCoach |> Coach.name) ++ "."),
-      )
-    }
-  , React.null)
-
-let filterSubmissions = (selectedLevel, selectedCoach, submissions) => {
-  let levelFiltered =
-    selectedLevel |> OptionUtils.mapWithDefault(
-      level =>
-        submissions |> Js.Array.filter(l => l |> IndexSubmission.levelId == (level |> Level.id)),
-      submissions,
-    )
-
-  selectedCoach |> OptionUtils.mapWithDefault(
-    coach =>
-      levelFiltered |> Js.Array.filter(l =>
-        l |> IndexSubmission.coachIds |> Array.mem(coach |> Coach.id)
-      ),
-    levelFiltered,
-  )
-}
-
-module Sortable = {
-  type t = sortBy
-
-  let criterion = t => t.criterion
-  let criterionType = t => t.criterionType
-}
-
-module SubmissionsSorter = Sorter.Make(Sortable)
-
-let submissionsSorter = (state, send) => {
-  let criteria = [{criterion: "Submitted At", criterionType: #Number}]
-  <div ariaLabel="Change submissions sorting" className="flex-shrink-0 mt-3 md:mt-0 md:ml-2">
-    <label className="block text-tiny font-semibold uppercase"> {"Sort by:" |> str} </label>
-    <SubmissionsSorter
-      criteria
-      selectedCriterion=state.sortBy
-      direction=state.sortDirection
-      onDirectionChange={sortDirection => send(UpdateSortDirection(sortDirection))}
-      onCriterionChange={_ => ()}
-    />
-  </div>
-}
-
-let displayedSubmissions = state =>
-  switch state.selectedTab {
-  | #Pending => state.pendingSubmissions
-  | #Reviewed => state.reviewedSubmissions
-  }
-
-let submissionsCount = submissions =>
-  submissions
-  |> Submissions.totalCount
-  |> OptionUtils.mapWithDefault(
-    count =>
-      <span
-        className="course-review__status-tab-badge ml-2 text-white text-xs bg-red-500 w-auto h-5 px-1 inline-flex items-center justify-center rounded-full">
-        {count |> string_of_int |> str}
-      </span>,
-    React.null,
-  )
-
-@react.component
-let make = (~levels, ~courseId, ~teamCoaches, ~currentCoach) => {
-  let (currentTeamCoach, _) = React.useState(() =>
-    teamCoaches->Belt.Array.some(coach => coach |> Coach.id == (currentCoach |> Coach.id))
-      ? Some(currentCoach)
-      : None
-  )
-
-  let (state, send) = React.useReducerWithMapState(reducer, currentTeamCoach, computeInitialState)
-
-  let url = ReasonReactRouter.useUrl()
-
-  <div>
-    {switch url.path {
-    | list{"submissions", submissionId, ..._} =>
-      <CoursesReview__SubmissionOverlay
-        courseId
-        submissionId
-        currentCoach
-        teamCoaches
-        syncSubmissionCB={submission => send(SyncSubmissionStatus(submission))}
-        removePendingSubmissionCB={() => send(ReloadSubmissions)}
-        updateReviewedSubmissionCB={submission => send(UpdateReviewedSubmission(submission))}
-      />
-    | _ => React.null
-    }}
-    <div className="bg-gray-100 pt-9 pb-8 px-3 -mt-7">
-      <div className="bg-gray-100 static md:sticky md:top-0">
-        <div className="max-w-3xl mx-auto">
-          <div className="flex flex-col md:flex-row items-end lg:items-center py-4">
-            <div
-              ariaLabel="status-tab"
-              className="course-review__status-tab w-full md:w-auto flex rounded-lg border border-gray-400">
-              <button
-                className={buttonClasses(state.selectedTab == #Pending)}
-                onClick={_ => send(SelectPendingTab)}>
-                {"Pending" |> str} {submissionsCount(state.pendingSubmissions)}
-              </button>
-              <button
-                className={buttonClasses(state.selectedTab == #Reviewed)}
-                onClick={_ => send(SelectReviewedTab)}>
-                {"Reviewed" |> str}
-              </button>
-            </div>
-          </div>
-          <div className="md:flex w-full items-start pb-4">
-            <div className="flex-1">
-              <label className="block text-tiny font-semibold uppercase">
-                {"Filter by:" |> str}
-              </label>
-              <Multiselect
-                id="filter"
-                unselected={unselected(levels, teamCoaches, currentCoach |> Coach.id, state)}
-                selected={selected(state, currentCoach |> Coach.id)}
-                onSelect={onSelectFilter(send)}
-                onDeselect={onDeselectFilter(send)}
-                value=state.filterString
-                onChange={filterString => send(UpdateFilterString(filterString))}
-                placeholder={filterPlaceholder(state)}
-              />
-            </div>
-            {submissionsSorter(state, send)}
-          </div>
-        </div>
-      </div>
-      <div className="max-w-3xl mx-auto">
-        {restoreAssignedToMeFilter(state, send, currentTeamCoach)}
-      </div>
-      <div className="max-w-3xl mx-auto">
-        <CoursesReview__SubmissionsTab
-          courseId
-          selectedTab=state.selectedTab
-          selectedLevel=state.selectedLevel
-          selectedCoach=state.selectedCoach
-          sortDirection=state.sortDirection
-          levels
-          submissions={displayedSubmissions(state)}
-          reloadAt=state.reloadAt
-          updateSubmissionsCB={(
-            ~submissions,
-            ~selectedTab,
-            ~hasNextPage,
-            ~totalCount,
-            ~endCursor,
-          ) => send(SetSubmissions(submissions, selectedTab, hasNextPage, endCursor, totalCount))}
-        />
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ShowFeedback.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ShowFeedback.res
deleted file mode 100644
index 87c69fd..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__ShowFeedback.res
+++ /dev/null
@@ -1,132 +0,0 @@
-open CoursesReview__Types
-
-let str = React.string
-
-type state = {
-  saving: bool,
-  newFeedback: string,
-  showFeedbackEditor: bool,
-}
-
-module CreateFeedbackMutation = %graphql(`
-    mutation CreateFeedbackMutation($submissionId: ID!, $feedback: String!) {
-      createFeedback(submissionId: $submissionId, feedback: $feedback){
-        success
-      }
-    }
-  `)
-
-let createFeedback = (submissionId, feedback, setState, addFeedbackCB) => {
-  setState(state => {...state, saving: true})
-
-  CreateFeedbackMutation.make(~submissionId, ~feedback, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["createFeedback"]["success"]
-      ? {
-          addFeedbackCB(feedback)
-          setState(_ => {saving: false, newFeedback: "", showFeedbackEditor: false})
-        }
-      : setState(state => {...state, saving: false})
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let showFeedback = feedback =>
-  feedback
-  |> Array.mapi((index, f) =>
-    <div key={index |> string_of_int} className="border-t p-4 md:p-6">
-      <div className="flex items-center">
-        <div
-          className="flex-shrink-0 w-12 h-12 bg-gray-300 rounded-full overflow-hidden mr-3 object-cover">
-          {switch f |> Feedback.coachAvatarUrl {
-          | Some(avatarUrl) => <img src=avatarUrl />
-          | None => <Avatar name={f |> Feedback.coachName} />
-          }}
-        </div>
-        <div>
-          <p className="text-xs leading-tight"> {"Feedback from:" |> str} </p>
-          <div>
-            <h4 className="font-semibold text-base leading-tight block md:inline-flex self-end">
-              {f |> Feedback.coachName |> str}
-            </h4>
-            <span
-              className="block md:inline-flex text-xs text-gray-800 md:ml-2 leading-tight self-end">
-              {"(" ++ ((f |> Feedback.coachTitle) ++ ")") |> str}
-            </span>
-          </div>
-        </div>
-      </div>
-      <div className="md:ml-15">
-        <p
-          className="text-xs leading-tight font-semibold inline-block p-1 bg-gray-200 rounded mt-3">
-          {f |> Feedback.createdAtPretty |> str}
-        </p>
-        <MarkdownBlock
-          className="pt-1 text-sm" profile=Markdown.Permissive markdown={f |> Feedback.value}
-        />
-      </div>
-    </div>
-  )
-  |> React.array
-
-let updateFeedbackCB = (setState, newFeedback) =>
-  setState(state => {...state, newFeedback: newFeedback})
-
-@react.component
-let make = (
-  ~feedback,
-  ~reviewed,
-  ~submissionId,
-  ~reviewChecklist,
-  ~addFeedbackCB,
-  ~updateReviewChecklistCB,
-  ~targetId,
-) => {
-  let (state, setState) = React.useState(() => {
-    saving: false,
-    newFeedback: "",
-    showFeedbackEditor: false,
-  })
-  <div className="pt-6" ariaLabel="feedback-section">
-    {showFeedback(feedback)}
-    {reviewed
-      ? <div className="bg-white rounded-b-lg">
-          {state.showFeedbackEditor
-            ? <div>
-                <DisablingCover disabled=state.saving>
-                  <CoursesReview__FeedbackEditor
-                    feedback=state.newFeedback
-                    label="Add feedback"
-                    updateFeedbackCB={updateFeedbackCB(setState)}
-                    reviewChecklist
-                    updateReviewChecklistCB
-                    checklistVisible=false
-                    targetId
-                  />
-                </DisablingCover>
-                <div className="flex justify-end pr-4 pl-10 pt-2 pb-4 md:px-6 md:pb-6">
-                  <button
-                    disabled={state.newFeedback == "" || state.saving}
-                    className="btn btn-success border border-green-600 w-full md:w-auto"
-                    onClick={_ =>
-                      createFeedback(submissionId, state.newFeedback, setState, addFeedbackCB)}>
-                    {"Share Feedback" |> str}
-                  </button>
-                </div>
-              </div>
-            : <div className="bg-gray-200 px-3 py-5 shadow-inner rounded-b-lg text-center">
-                <button
-                  onClick={_ => setState(state => {...state, showFeedbackEditor: true})}
-                  className="btn btn-primary-ghost cursor-pointer shadow hover:shadow-lg w-full md:w-auto">
-                  {switch feedback {
-                  | [] => "Add feedback"
-                  | _ => "Add another feedback"
-                  } |> str}
-                </button>
-              </div>}
-        </div>
-      : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Student.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Student.res
deleted file mode 100644
index 9a9a360..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Student.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-}
-
-let id = t => t.id
-let name = t => t.name
-
-let makeFromJs = jsObject => {id: jsObject["id"], name: jsObject["name"]}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionDetails.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionDetails.res
deleted file mode 100644
index e600486..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionDetails.res
+++ /dev/null
@@ -1,106 +0,0 @@
-module OverlaySubmission = CoursesReview__OverlaySubmission
-module IndexSubmission = CoursesReview__IndexSubmission
-module Student = CoursesReview__Student
-module ReviewChecklistItem = CoursesReview__ReviewChecklistItem
-
-type t = {
-  submissions: array<OverlaySubmission.t>,
-  targetId: string,
-  targetTitle: string,
-  students: array<Student.t>,
-  levelNumber: string,
-  levelId: string,
-  evaluationCriteria: array<EvaluationCriterion.t>,
-  reviewChecklist: array<ReviewChecklistItem.t>,
-  targetEvaluationCriteriaIds: array<string>,
-  inactiveStudents: bool,
-  coachIds: array<string>,
-}
-let submissions = t => t.submissions
-let targetId = t => t.targetId
-let targetTitle = t => t.targetTitle
-let levelNumber = t => t.levelNumber
-let students = t => t.students
-let evaluationCriteria = t => t.evaluationCriteria
-let reviewChecklist = t => t.reviewChecklist
-let targetEvaluationCriteriaIds = t => t.targetEvaluationCriteriaIds
-let inactiveStudents = t => t.inactiveStudents
-let coachIds = t => t.coachIds
-
-let make = (
-  ~submissions,
-  ~targetId,
-  ~targetTitle,
-  ~students,
-  ~levelNumber,
-  ~evaluationCriteria,
-  ~levelId,
-  ~reviewChecklist,
-  ~targetEvaluationCriteriaIds,
-  ~inactiveStudents,
-  ~coachIds,
-) => {
-  submissions: submissions,
-  targetId: targetId,
-  targetTitle: targetTitle,
-  students: students,
-  levelNumber: levelNumber,
-  evaluationCriteria: evaluationCriteria,
-  levelId: levelId,
-  reviewChecklist: reviewChecklist,
-  targetEvaluationCriteriaIds: targetEvaluationCriteriaIds,
-  inactiveStudents: inactiveStudents,
-  coachIds: coachIds,
-}
-
-let decodeJs = details =>
-  make(
-    ~submissions=details["submissions"] |> OverlaySubmission.makeFromJs,
-    ~targetId=details["targetId"],
-    ~targetTitle=details["targetTitle"],
-    ~students=details["students"] |> Array.map(Student.makeFromJs),
-    ~levelNumber=details["levelNumber"],
-    ~levelId=details["levelId"],
-    ~targetEvaluationCriteriaIds=details["targetEvaluationCriteriaIds"],
-    ~inactiveStudents=details["inactiveStudents"],
-    ~evaluationCriteria=details["evaluationCriteria"] |> Js.Array.map(ec =>
-      EvaluationCriterion.make(
-        ~id=ec["id"],
-        ~name=ec["name"],
-        ~maxGrade=ec["maxGrade"],
-        ~passGrade=ec["passGrade"],
-        ~gradesAndLabels=ec["gradeLabels"] |> Array.map(gradeAndLabel =>
-          GradeLabel.makeFromJs(gradeAndLabel)
-        ),
-      )
-    ),
-    ~reviewChecklist=details["reviewChecklist"] |> ReviewChecklistItem.makeFromJs,
-    ~coachIds=details["coachIds"],
-  )
-
-let updateSubmission = (submission, t) => {
-  ...t,
-  submissions: t.submissions
-  |> Js.Array.filter(s => s |> OverlaySubmission.id != (submission |> OverlaySubmission.id))
-  |> Array.append([submission]),
-}
-
-let makeIndexSubmission = (overlaySubmission, t) =>
-  IndexSubmission.make(
-    ~id=overlaySubmission |> OverlaySubmission.id,
-    ~title=t.targetTitle,
-    ~createdAt=overlaySubmission |> OverlaySubmission.createdAt,
-    ~levelId=t.levelId,
-    ~userNames=t.students
-    |> Array.map(student => student |> CoursesReview__Student.name)
-    |> Js.Array.joinWith(", "),
-    ~status=Some(
-      IndexSubmission.makeStatus(
-        ~passedAt=overlaySubmission |> OverlaySubmission.passedAt,
-        ~feedbackSent=overlaySubmission |> OverlaySubmission.feedbackSent,
-      ),
-    ),
-    ~coachIds=t.coachIds,
-  )
-
-let updateReviewChecklist = (reviewChecklist, t) => {...t, reviewChecklist: reviewChecklist}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionOverlay.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionOverlay.res
deleted file mode 100644
index 37a4a54..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionOverlay.res
+++ /dev/null
@@ -1,267 +0,0 @@
-%raw(`require("./CoursesReview__SubmissionOverlay.css")`)
-
-open CoursesReview__Types
-let str = React.string
-
-type state =
-  | Loading
-  | Loaded(SubmissionDetails.t)
-
-module SubmissionDetailsQuery = %graphql(`
-    query SubmissionDetailsQuery($submissionId: ID!) {
-      submissionDetails(submissionId: $submissionId) {
-        targetId, targetTitle, levelNumber, levelId, inactiveStudents
-        students {
-          id
-          name
-        },
-        evaluationCriteria{
-          id, name, maxGrade, passGrade, gradeLabels { grade label}
-        },
-        reviewChecklist{
-          title
-          result{
-            title
-            feedback
-          }
-        },
-        targetEvaluationCriteriaIds,
-        submissions{
-          id, evaluatorName, passedAt, createdAt, evaluatedAt
-          files{
-            url, title, id
-          },
-          grades {
-            evaluationCriterionId, grade
-          },
-          feedback{
-            id, coachName, coachAvatarUrl, coachTitle, createdAt,value
-          },
-          checklist
-        }
-        coachIds
-      }
-    }
-  `)
-
-/*
- * Use the sync submission callback to allow the index to reload its data if
- * state of this submission is different from the one on the index.
- *
- * Then, set the state of this component to Loaded.
- */
-let updateSubmissionDetails = (setState, submissionId, syncSubmissionCB, details) => {
-  let submissionDetails = details |> SubmissionDetails.decodeJs
-
-  submissionDetails
-  |> SubmissionDetails.submissions
-  |> ArrayUtils.unsafeFind(
-    submission => submission |> OverlaySubmission.id == submissionId,
-    "Could not find overlaySubmission with ID " ++ (submissionId ++ " in loaded submissions"),
-  )
-  |> syncSubmissionCB
-
-  setState(_ => Loaded(submissionDetails))
-}
-
-let getSubmissionDetails = (submissionId, setState, syncSubmissionCB, ()) => {
-  setState(_ => Loading)
-  SubmissionDetailsQuery.make(~submissionId, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["submissionDetails"] |> updateSubmissionDetails(
-      setState,
-      submissionId,
-      syncSubmissionCB,
-    )
-    Js.Promise.resolve()
-  })
-  |> ignore
-
-  None
-}
-
-let closeOverlay = courseId => ReasonReactRouter.push("/courses/" ++ (courseId ++ "/review"))
-
-let headerSection = (submissionDetails, courseId, assignedCoaches) =>
-  <div
-    ariaLabel="submissions-overlay-header"
-    className="bg-gray-100 border-b border-gray-300 px-3 pt-12 xl:pt-10 flex justify-center">
-    <div
-      className="relative bg-white border lg:border-transparent p-4 lg:px-6 lg:py-5 flex flex-wrap items-center justify-between rounded-lg shadow container max-w-3xl -mb-12">
-      <div
-        ariaLabel="submissions-overlay-close"
-        onClick={_ => closeOverlay(courseId)}
-        className="review-submission-overlay__close flex flex-col items-center justify-center absolute rounded-t-lg lg:rounded-lg leading-tight px-4 py-1 h-8 lg:h-full cursor-pointer border border-b-0 border-gray-400 lg:border-0 lg:shadow lg:border-gray-300 bg-white text-gray-700 hover:text-gray-900 hover:bg-gray-100">
-        <Icon className="if i-times-regular text-xl lg:text-2xl mt-1 lg:mt-0" />
-        <span className="text-xs hidden lg:inline-block mt-px"> {"close" |> str} </span>
-      </div>
-      <div>
-        <div className="block text-sm md:pr-2">
-          <span className="bg-gray-300 text-xs font-semibold px-2 py-px rounded">
-            {"Level " ++ (submissionDetails |> SubmissionDetails.levelNumber) |> str}
-          </span>
-          <a
-            href={"/targets/" ++ (submissionDetails |> SubmissionDetails.targetId)}
-            target="_blank"
-            className="ml-2 font-semibold underline text-gray-900 hover:bg-primary-100 hover:text-primary-600 text-sm md:text-lg">
-            {submissionDetails |> SubmissionDetails.targetTitle |> str}
-          </a>
-        </div>
-        <div className="text-left mt-1 text-xs text-gray-800">
-          <span> {"Submitted by " |> str} </span>
-          {
-            let studentCount = submissionDetails |> SubmissionDetails.students |> Array.length
-
-            submissionDetails
-            |> SubmissionDetails.students
-            |> Array.mapi((index, student) => {
-              let commaRequired = index + 1 != studentCount
-              <span key={student |> Student.id}>
-                <a
-                  className="font-semibold underline"
-                  href={"/students/" ++ ((student |> Student.id) ++ "/report")}
-                  target="_blank">
-                  {student |> Student.name |> str}
-                </a>
-                {(commaRequired ? ", " : "") |> str}
-              </span>
-            })
-            |> React.array
-          }
-        </div>
-      </div>
-      <CoursesStudents__TeamCoaches
-        tooltipPosition=#Bottom
-        defaultAvatarSize="8"
-        mdAvatarSize="8"
-        title={<span className="mr-2"> {"Assigned Coaches" |> str} </span>}
-        className="mt-2 flex w-full md:w-auto items-center flex-shrink-0"
-        coaches=assignedCoaches
-      />
-    </div>
-  </div>
-
-let updateSubmissionDetails = (setState, submissionDetails, overlaySubmission) => {
-  // Create new details for overlay with updated overlaySubmission.
-  let newSubmissionDetails =
-    submissionDetails |> SubmissionDetails.updateSubmission(overlaySubmission)
-
-  // Re-render the overlay with the updated submission details.
-  setState(_ => Loaded(newSubmissionDetails))
-
-  newSubmissionDetails
-}
-
-let addGrading = (setState, removePendingSubmissionCB, submissionDetails, overlaySubmission) => {
-  updateSubmissionDetails(setState, submissionDetails, overlaySubmission) |> ignore
-
-  removePendingSubmissionCB()
-}
-
-let addFeedbackToReviewedSubmission = (
-  setState,
-  updateReviewedSubmissionCB,
-  submissionDetails,
-  overlaySubmission,
-) =>
-  updateSubmissionDetails(setState, submissionDetails, overlaySubmission)
-  |> SubmissionDetails.makeIndexSubmission(overlaySubmission)
-  |> updateReviewedSubmissionCB
-
-let updateReviewChecklist = (submissionDetails, setState, reviewChecklist) =>
-  setState(_ => Loaded(
-    submissionDetails |> SubmissionDetails.updateReviewChecklist(reviewChecklist),
-  ))
-
-let inactiveWarning = submissionDetails =>
-  if submissionDetails |> SubmissionDetails.inactiveStudents {
-    let warning = if submissionDetails |> SubmissionDetails.students |> Array.length > 1 {
-      "This submission is linked to one or more students whose access to the course has ended, or have dropped out."
-    } else {
-      "This submission is from a student whose access to the course has ended, or has dropped out."
-    }
-
-    <div className="border border-yellow-400 rounded bg-yellow-400 py-2 px-3">
-      <i className="fas fa-exclamation-triangle" /> <span className="ml-2"> {warning |> str} </span>
-    </div>
-  } else {
-    React.null
-  }
-
-@react.component
-let make = (
-  ~courseId,
-  ~submissionId,
-  ~teamCoaches,
-  ~currentCoach,
-  ~syncSubmissionCB,
-  ~removePendingSubmissionCB,
-  ~updateReviewedSubmissionCB,
-) => {
-  let (state, setState) = React.useState(() => Loading)
-
-  React.useEffect(() => {
-    ScrollLock.activate()
-    Some(() => ScrollLock.deactivate())
-  })
-
-  React.useEffect1(getSubmissionDetails(submissionId, setState, syncSubmissionCB), [submissionId])
-  <div className="fixed z-30 top-0 left-0 w-full h-full overflow-y-scroll bg-white">
-    {switch state {
-    | Loaded(submissionDetails) =>
-      let assignedCoaches =
-        teamCoaches |> Js.Array.filter(coach =>
-          submissionDetails |> SubmissionDetails.coachIds |> Array.mem(coach |> Coach.id)
-        )
-
-      <div>
-        {headerSection(submissionDetails, courseId, assignedCoaches)}
-        <div className="container mx-auto mt-16 md:mt-18 max-w-3xl px-3 lg:px-0">
-          {inactiveWarning(submissionDetails)}
-        </div>
-        <div
-          className="review-submission-overlay__submission-container relative container mx-auto max-w-3xl px-3 lg:px-0 pb-8">
-          {submissionDetails
-          |> SubmissionDetails.submissions
-          |> Array.mapi((index, overlaySubmission) =>
-            <CoursesReview__SubmissionsList
-              key={index |> string_of_int}
-              overlaySubmission
-              teamSubmission={submissionDetails |> SubmissionDetails.students |> Array.length > 1}
-              targetEvaluationCriteriaIds={submissionDetails |> SubmissionDetails.targetEvaluationCriteriaIds}
-              addGradingCB={addGrading(setState, removePendingSubmissionCB, submissionDetails)}
-              addFeedbackCB={addFeedbackToReviewedSubmission(
-                setState,
-                updateReviewedSubmissionCB,
-                submissionDetails,
-              )}
-              submissionNumber={(submissionDetails
-              |> SubmissionDetails.submissions
-              |> Array.length) - index}
-              currentCoach
-              evaluationCriteria={submissionDetails |> SubmissionDetails.evaluationCriteria}
-              reviewChecklist={submissionDetails |> SubmissionDetails.reviewChecklist}
-              updateReviewChecklistCB={updateReviewChecklist(submissionDetails, setState)}
-              targetId={submissionDetails |> SubmissionDetails.targetId}
-            />
-          )
-          |> React.array}
-        </div>
-      </div>
-
-    | Loading =>
-      <div>
-        <div className="bg-gray-100 py-4">
-          <div className="max-w-3xl mx-auto"> {SkeletonLoading.card()} </div>
-        </div>
-        <div className="max-w-3xl mx-auto">
-          {SkeletonLoading.heading()}
-          {SkeletonLoading.paragraph()}
-          {SkeletonLoading.profileCard()}
-          {SkeletonLoading.paragraph()}
-        </div>
-      </div>
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Submissions.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Submissions.res
deleted file mode 100644
index 95b8c1d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Submissions.res
+++ /dev/null
@@ -1,74 +0,0 @@
-module Level = CoursesReview__Level
-
-type filter = {
-  level: option<Level.t>,
-  coach: option<UserProxy.t>,
-}
-
-let makeFilter = (level, coach) => {level: level, coach: coach}
-
-let filterLevelId = level => level |> OptionUtils.mapWithDefault(Level.id, "none")
-let filterCoachId = coach => coach |> OptionUtils.mapWithDefault(UserProxy.id, "none")
-
-let filterEq = (level, coach, filter) =>
-  filter.level |> filterLevelId == filterLevelId(level) &&
-    filter.coach |> filterCoachId == filterCoachId(coach)
-
-type sortDirection = [#Ascending | #Descending]
-
-type data = {
-  submissions: array<CoursesReview__IndexSubmission.t>,
-  filter: filter,
-  sortDirection: sortDirection,
-  totalCount: int,
-}
-
-type cursor = string
-
-type t =
-  | Unloaded
-  | PartiallyLoaded(data, cursor)
-  | FullyLoaded(data)
-
-let totalCount = t =>
-  switch t {
-  | Unloaded => None
-  | PartiallyLoaded({totalCount}, _)
-  | FullyLoaded({totalCount}) =>
-    Some(totalCount)
-  }
-
-let unloaded = Unloaded
-
-let partiallyLoaded = (
-  ~submissions,
-  ~filter,
-  ~sortDirection,
-  ~totalCount,
-  ~cursor,
-) => PartiallyLoaded(
-  {submissions: submissions, filter: filter, sortDirection: sortDirection, totalCount: totalCount},
-  cursor,
-)
-
-let fullyLoaded = (~submissions, ~filter, ~sortDirection, ~totalCount) => FullyLoaded({
-  submissions: submissions,
-  filter: filter,
-  sortDirection: sortDirection,
-  totalCount: totalCount,
-})
-
-let needsReloading = (selectedLevel, selectedCoach, sortDirection, t) =>
-  switch t {
-  | Unloaded => true
-  | FullyLoaded(data)
-  | PartiallyLoaded(data, _) =>
-    !(data.filter |> filterEq(selectedLevel, selectedCoach) && data.sortDirection == sortDirection)
-  }
-
-let toArray = t =>
-  switch t {
-  | Unloaded => []
-  | PartiallyLoaded(data, _cursor) => data.submissions
-  | FullyLoaded(data) => data.submissions
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionsList.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionsList.res
deleted file mode 100644
index 06734ef..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionsList.res
+++ /dev/null
@@ -1,197 +0,0 @@
-open CoursesReview__Types
-let str = React.string
-
-let showSubmissionStatus = overlaySubmission => {
-  let (text, classes) = switch (
-    overlaySubmission |> OverlaySubmission.passedAt,
-    overlaySubmission |> OverlaySubmission.evaluatorName,
-  ) {
-  | (None, None) => ("Pending", "bg-orange-100 border border-orange-500 text-orange-800 ")
-  | (None, Some(_)) => ("Failed", "bg-red-100 border border-red-500 text-red-700")
-  | (Some(_), None)
-  | (Some(_), Some(_)) => ("Passed", "bg-green-100 border border-green-500 text-green-800")
-  }
-  <div className={"font-semibold px-3 py-px rounded " ++ classes}> {text |> str} </div>
-}
-
-let showFeedbackSent = feedbackSent =>
-  feedbackSent
-    ? <div
-        className="bg-primary-100 text-primary-600 border border-transparent font-semibold px-3 py-px rounded mr-3">
-        {"Feedback Sent" |> str}
-      </div>
-    : React.null
-
-let cardClasses = overlaySubmission =>
-  "mt-6 rounded-b-lg bg-white border-t-3 " ++
-  switch (
-    overlaySubmission |> OverlaySubmission.passedAt,
-    overlaySubmission |> OverlaySubmission.evaluatorName,
-  ) {
-  | (None, None) => "border-orange-300"
-  | (None, Some(_)) => "border-red-500"
-  | (Some(_), None)
-  | (Some(_), Some(_)) => "border-green-500"
-  }
-
-let updateSubmission = (
-  ~feedbackUpdate,
-  ~grades,
-  ~passed,
-  ~newFeedback,
-  ~overlaySubmission,
-  ~currentCoach,
-  ~addGradingCB,
-  ~checklist,
-) => {
-  let feedback = switch newFeedback {
-  | Some(f) =>
-    f |> String.trim == ""
-      ? overlaySubmission |> OverlaySubmission.feedback
-      : overlaySubmission
-        |> OverlaySubmission.feedback
-        |> Array.append([
-          Feedback.make(
-            ~coachName=currentCoach |> Coach.name,
-            ~coachAvatarUrl=currentCoach |> Coach.avatarUrl,
-            ~coachTitle=currentCoach |> Coach.title,
-            ~createdAt=Js.Date.make(),
-            ~value=f,
-          ),
-        ])
-  | None => overlaySubmission |> OverlaySubmission.feedback
-  }
-
-  let (passedAt, evaluatedAt, newGrades) = switch passed {
-  | Some(p) => (p ? Some(Js.Date.make()) : None, Some(Js.Date.make()), grades)
-  | None => (
-      overlaySubmission |> OverlaySubmission.passedAt,
-      overlaySubmission |> OverlaySubmission.evaluatedAt,
-      overlaySubmission |> OverlaySubmission.grades,
-    )
-  }
-
-  let newSubmission = OverlaySubmission.make(
-    ~id=overlaySubmission |> OverlaySubmission.id,
-    ~createdAt=overlaySubmission |> OverlaySubmission.createdAt,
-    ~passedAt,
-    ~evaluatorName=if feedbackUpdate {
-      overlaySubmission |> OverlaySubmission.evaluatorName
-    } else {
-      Some(currentCoach |> Coach.name)
-    },
-    ~feedback,
-    ~grades=newGrades,
-    ~evaluatedAt,
-    ~checklist,
-  )
-
-  addGradingCB(newSubmission)
-}
-
-let updateFeedbackArray = (currentCoach, overlaySubmission, newFeedback) =>
-  newFeedback |> String.trim == ""
-    ? overlaySubmission |> OverlaySubmission.feedback
-    : overlaySubmission
-      |> OverlaySubmission.feedback
-      |> Array.append([
-        Feedback.make(
-          ~coachName=currentCoach |> Coach.name,
-          ~coachAvatarUrl=currentCoach |> Coach.avatarUrl,
-          ~coachTitle=currentCoach |> Coach.title,
-          ~createdAt=Js.Date.make(),
-          ~value=newFeedback,
-        ),
-      ])
-
-let addGrading = (
-  ~addGradingCB,
-  ~currentCoach,
-  ~overlaySubmission,
-  ~newFeedback,
-  ~passed,
-  ~grades,
-  ~checklist,
-) => {
-  let feedback = updateFeedbackArray(currentCoach, overlaySubmission, newFeedback)
-
-  let passedAt = passed ? Some(Js.Date.make()) : None
-  let evaluatedAt = Some(Js.Date.make())
-
-  OverlaySubmission.make(
-    ~id=overlaySubmission |> OverlaySubmission.id,
-    ~createdAt=overlaySubmission |> OverlaySubmission.createdAt,
-    ~passedAt,
-    ~evaluatorName=Some(currentCoach |> Coach.name),
-    ~feedback,
-    ~grades,
-    ~evaluatedAt,
-    ~checklist,
-  ) |> addGradingCB
-}
-
-let addFeedback = (addFeedbackCB, currentCoach, overlaySubmission, newFeedback) => {
-  let feedback = updateFeedbackArray(currentCoach, overlaySubmission, newFeedback)
-
-  overlaySubmission |> OverlaySubmission.updateFeedback(feedback) |> addFeedbackCB
-}
-
-@react.component
-let make = (
-  ~overlaySubmission,
-  ~teamSubmission,
-  ~addGradingCB,
-  ~addFeedbackCB,
-  ~submissionNumber,
-  ~currentCoach,
-  ~evaluationCriteria,
-  ~reviewChecklist,
-  ~updateReviewChecklistCB,
-  ~targetId,
-  ~targetEvaluationCriteriaIds,
-) =>
-  <div
-    ariaLabel={"submissions-overlay-card-" ++ (overlaySubmission |> OverlaySubmission.id)}
-    className={cardClasses(overlaySubmission)}>
-    <div className="rounded-b-lg shadow">
-      <div
-        className="p-4 md:px-6 md:py-5 border-b bg-white flex flex-col sm:flex-row items-center justify-between">
-        <div className="flex flex-col w-full sm:w-auto">
-          <h2 className="font-semibold text-sm lg:text-base leading-tight">
-            {"Submission #" ++ (submissionNumber |> string_of_int) |> str}
-          </h2>
-          <span className="text-xs text-gray-800 pt-px">
-            {overlaySubmission
-            |> OverlaySubmission.createdAt
-            |> DateFns.format("MMMM D, YYYY")
-            |> str}
-          </span>
-        </div>
-        <div className="text-xs flex w-full sm:w-auto mt-2 sm:mt-0">
-          {showFeedbackSent(
-            overlaySubmission |> OverlaySubmission.feedback |> ArrayUtils.isNotEmpty,
-          )}
-          {showSubmissionStatus(overlaySubmission)}
-        </div>
-      </div>
-      <CoursesReview__GradeCard
-        overlaySubmission
-        teamSubmission
-        evaluationCriteria
-        targetEvaluationCriteriaIds
-        reviewChecklist
-        addGradingCB={addGrading(~addGradingCB, ~currentCoach, ~overlaySubmission)}
-        updateReviewChecklistCB
-        targetId
-      />
-      <CoursesReview__ShowFeedback
-        feedback={overlaySubmission |> OverlaySubmission.feedback}
-        reviewed={overlaySubmission |> OverlaySubmission.grades |> ArrayUtils.isNotEmpty}
-        submissionId={overlaySubmission |> OverlaySubmission.id}
-        reviewChecklist
-        addFeedbackCB={addFeedback(addFeedbackCB, currentCoach, overlaySubmission)}
-        updateReviewChecklistCB
-        targetId
-      />
-    </div>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionsTab.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionsTab.res
deleted file mode 100644
index ce68ee9..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__SubmissionsTab.res
+++ /dev/null
@@ -1,269 +0,0 @@
-@module("../../shared/images/reviewed-empty.svg")
-external reviewedEmptyImage: string = "default"
-
-@module("../images/pending-empty.svg")
-external pendingEmptyImage: string = "default"
-
-open CoursesReview__Types
-
-let str = React.string
-
-type state =
-  | Loading
-  | Reloading
-  | Loaded
-
-module SubmissionsQuery = %graphql(`
-    query SubmissionsQuery($courseId: ID!, $status: SubmissionStatus!, $sortDirection: SortDirection!, $levelId: ID, $coachId: ID, $after: String) {
-      submissions(courseId: $courseId, status: $status, sortDirection: $sortDirection, levelId: $levelId, coachId: $coachId, first: 20, after: $after) {
-        nodes {
-          id,
-          title,
-          userNames,
-          evaluatedAt,
-          passedAt,
-          feedbackSent,
-          levelId,
-          createdAt,
-          targetId,
-          coachIds
-        }
-        pageInfo {
-          endCursor,
-          hasNextPage
-        }
-        totalCount
-      }
-    }
-  `)
-
-let updateSubmissions = (
-  setState,
-  endCursor,
-  hasNextPage,
-  totalCount,
-  submissions,
-  selectedTab,
-  updateSubmissionsCB,
-  nodes,
-) => {
-  updateSubmissionsCB(
-    ~submissions=submissions |> Array.append(
-      switch nodes {
-      | None => []
-      | Some(submissionsArray) => submissionsArray |> IndexSubmission.decodeJs
-      }
-      |> Array.to_list
-      |> List.flatten
-      |> Array.of_list,
-    ),
-    ~selectedTab,
-    ~hasNextPage,
-    ~totalCount,
-    ~endCursor,
-  )
-
-  setState(_ => Loaded)
-}
-
-let getSubmissions = (
-  courseId,
-  cursor,
-  setState,
-  selectedLevel,
-  selectedCoach,
-  sortDirection,
-  selectedTab,
-  submissions,
-  updateSubmissionsCB,
-) => {
-  setState(state =>
-    switch state {
-    | Loaded
-    | Reloading =>
-      Reloading
-    | Loading => Loading
-    }
-  )
-
-  let levelId = selectedLevel |> OptionUtils.map(level => level |> Level.id)
-  let coachId = selectedCoach |> OptionUtils.map(coach => coach |> Coach.id)
-
-  SubmissionsQuery.make(
-    ~courseId,
-    ~status=selectedTab,
-    ~sortDirection,
-    ~levelId?,
-    ~coachId?,
-    ~after=?cursor,
-    (),
-  )
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["submissions"]["nodes"] |> updateSubmissions(
-      setState,
-      response["submissions"]["pageInfo"]["endCursor"],
-      response["submissions"]["pageInfo"]["hasNextPage"],
-      response["submissions"]["totalCount"],
-      submissions,
-      selectedTab,
-      updateSubmissionsCB,
-    )
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let submissionStatus = submission => {
-  let classes = "border flex-shrink-0 leading-normal font-semibold px-3 py-px rounded "
-
-  let (className, text) = if submission |> IndexSubmission.pendingReview {
-    (classes ++ "bg-orange-100 text-orange-600", submission |> IndexSubmission.timeDistance)
-  } else if submission |> IndexSubmission.failed {
-    (classes ++ "bg-red-100 border-red-500 text-red-800", "Failed")
-  } else {
-    ("bg-green-100 border-green-500 text-green-800", "Passed")
-  }
-
-  <div className> {text |> str} </div>
-}
-
-let feedbackSentNotice = feedbackSent =>
-  feedbackSent
-    ? <div
-        className="bg-primary-100 text-primary-600 border border-transparent flex-shrink-0 leading-normal font-semibold px-3 py-px rounded mr-3">
-        {"Feedback Sent" |> str}
-      </div>
-    : React.null
-
-let submissionCardClasses = submission =>
-  "flex flex-col md:flex-row items-start md:items-center justify-between bg-white border-l-3 p-3 md:py-6 md:px-5 mb-4 cursor-pointer rounded-r-lg shadow hover:border-primary-500 hover:text-primary-500 hover:shadow-md " ++ if (
-    submission |> IndexSubmission.pendingReview
-  ) {
-    "border-orange-400"
-  } else if submission |> IndexSubmission.failed {
-    "border-red-500"
-  } else {
-    "border-green-500"
-  }
-
-let showSubmission = (submissions, levels, sortDirection) =>
-  <div id="submissions">
-    {submissions
-    |> IndexSubmission.sortArray(sortDirection)
-    |> Array.map(submission =>
-      <Link
-        href={"/submissions/" ++ (submission |> IndexSubmission.id)}
-        key={submission |> IndexSubmission.id}
-        ariaLabel={"Submission " ++ (submission |> IndexSubmission.id)}
-        className={submissionCardClasses(submission)}>
-        <div className="w-full md:w-3/4">
-          <div className="block text-sm md:pr-2">
-            <span className="bg-gray-300 text-xs font-semibold px-2 py-px rounded">
-              {submission
-              |> IndexSubmission.levelId
-              |> Level.unsafeLevelNumber(levels, "SubmissionsTab")
-              |> str}
-            </span>
-            <span className="ml-2 font-semibold text-base">
-              {submission |> IndexSubmission.title |> str}
-            </span>
-          </div>
-          <div className="mt-1 ml-px text-xs text-gray-900">
-            <span> {"Submitted by " |> str} </span>
-            <span className="font-semibold">
-              {submission |> IndexSubmission.userNames |> str}
-            </span>
-            <span className="ml-1">
-              {"on " ++ (submission |> IndexSubmission.createdAtPretty) |> str}
-            </span>
-          </div>
-        </div>
-        <div className="w-auto md:w-1/4 text-xs flex justify-end mt-2 md:mt-0">
-          {feedbackSentNotice(submission |> IndexSubmission.feedbackSent)}
-          {submissionStatus(submission)}
-        </div>
-      </Link>
-    )
-    |> React.array}
-  </div>
-
-let showSubmissions = (submissions, selectedTab, levels, sortDirection) => {
-  let imageSrc = switch selectedTab {
-  | #Pending => pendingEmptyImage
-  | #Reviewed => reviewedEmptyImage
-  }
-
-  submissions |> ArrayUtils.isEmpty
-    ? <div className="course-review__submissions-empty text-lg font-semibold text-center py-4">
-        <h5 className="py-4 mt-4 bg-gray-200 text-gray-800 font-semibold">
-          {"No submissions found" |> str}
-        </h5>
-        <img className="w-3/4 md:w-1/2 mx-auto mt-2" src=imageSrc />
-      </div>
-    : showSubmission(submissions, levels, sortDirection)
-}
-
-@react.component
-let make = (
-  ~courseId,
-  ~selectedTab,
-  ~selectedLevel,
-  ~selectedCoach,
-  ~sortDirection,
-  ~levels,
-  ~submissions,
-  ~updateSubmissionsCB,
-  ~reloadAt,
-) => {
-  let (state, setState) = React.useState(() => Loading)
-  React.useEffect5(() => {
-    if submissions |> Submissions.needsReloading(selectedLevel, selectedCoach, sortDirection) {
-      setState(_ => Reloading)
-
-      getSubmissions(
-        courseId,
-        None,
-        setState,
-        selectedLevel,
-        selectedCoach,
-        sortDirection,
-        selectedTab,
-        [],
-        updateSubmissionsCB,
-      )
-    }
-
-    None
-  }, (selectedLevel, selectedCoach, sortDirection, selectedTab, reloadAt))
-
-  <div>
-    <LoadingSpinner loading={state == Reloading} />
-    {switch (submissions: Submissions.t) {
-    | Unloaded => SkeletonLoading.multiple(~count=10, ~element=SkeletonLoading.card())
-    | PartiallyLoaded({submissions}, cursor) =>
-      <div>
-        {showSubmissions(submissions, selectedTab, levels, sortDirection)}
-        {state == Loading
-          ? SkeletonLoading.multiple(~count=3, ~element=SkeletonLoading.card())
-          : <button
-              className="btn btn-primary-ghost cursor-pointer w-full mt-4"
-              onClick={_ =>
-                getSubmissions(
-                  courseId,
-                  Some(cursor),
-                  setState,
-                  selectedLevel,
-                  selectedCoach,
-                  sortDirection,
-                  selectedTab,
-                  submissions,
-                  updateSubmissionsCB,
-                )}>
-              {"Load More..." |> str}
-            </button>}
-      </div>
-    | FullyLoaded({submissions}) => showSubmissions(submissions, selectedTab, levels, sortDirection)
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Types.res
deleted file mode 100644
index 6a554bf..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesReview__Types.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module Level = CoursesReview__Level
-module IndexSubmission = CoursesReview__IndexSubmission
-module SubmissionDetails = CoursesReview__SubmissionDetails
-module OverlaySubmission = CoursesReview__OverlaySubmission
-module Feedback = CoursesReview__Feedback
-module Grade = CoursesReview__Grade
-module Coach = UserProxy
-module Submissions = CoursesReview__Submissions
-module ReviewChecklistItem = CoursesReview__ReviewChecklistItem
-module ReviewChecklistResult = CoursesReview__ReviewChecklistResult
-module Student = CoursesReview__Student
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__CoachNote.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__CoachNote.res
deleted file mode 100644
index c6b6e90..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__CoachNote.res
+++ /dev/null
@@ -1,36 +0,0 @@
-type t = {
-  id: string,
-  author: option<User.t>,
-  note: string,
-  createdAt: Js.Date.t,
-}
-
-let make = (~id, ~note, ~createdAt, ~author) => {
-  id: id,
-  note: note,
-  createdAt: createdAt,
-  author: author,
-}
-
-let id = t => t.id
-
-let note = t => t.note
-
-let createdAt = t => t.createdAt
-
-let author = t => t.author
-
-let noteOn = t => t.createdAt |> DateFns.format("MMMM D, YYYY")
-
-let sort = notes =>
-  notes |> ArrayUtils.copyAndSort((x, y) =>
-    DateFns.differenceInSeconds(y.createdAt, x.createdAt) |> int_of_float
-  )
-
-let makeFromJs = note =>
-  make(
-    ~id=note["id"],
-    ~note=note["note"],
-    ~createdAt=note["createdAt"] |> DateFns.parseString,
-    ~author=note["author"] |> OptionUtils.map(User.makeFromJs),
-  )
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__CoachNoteShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__CoachNoteShow.res
deleted file mode 100644
index d6b220e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__CoachNoteShow.res
+++ /dev/null
@@ -1,109 +0,0 @@
-open CoursesStudents__Types
-
-let str = React.string
-
-type state = {archiving: bool}
-
-module ArchiveCoachNoteMutation = %graphql(`
-   mutation ArchiveCoachNoteMutation($id: ID!) {
-    archiveCoachNote(id: $id) {
-       success
-      }
-    }
-   `)
-
-let removeCoachNote = (id, removeNoteCB, setArchiving, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  setArchiving(_ => true)
-  if {
-    open Webapi.Dom
-    window |> Window.confirm("Are you sure you want to delete this note?")
-  } {
-    ArchiveCoachNoteMutation.make(~id, ())
-    |> GraphqlQuery.sendQuery
-    |> Js.Promise.then_(response => {
-      if response["archiveCoachNote"]["success"] {
-        removeNoteCB(id)
-      } else {
-        setArchiving(_ => false)
-      }
-      Js.Promise.resolve()
-    })
-    |> ignore
-  } else {
-    ()
-  }
-}
-
-let deleteIcon = (note, removeCoachNote, removeNoteCB, setArchiving, archiving) =>
-  <button
-    className="w-10 text-sm text-gray-700 hover:text-gray-900 cursor-pointer flex items-center justify-center rounded hover:bg-gray-200 focus:outline-none "
-    disabled=archiving
-    title={"Delete " ++ (note |> CoachNote.id)}
-    onClick={removeCoachNote(note |> CoachNote.id, removeNoteCB, setArchiving)}>
-    <FaIcon classes={archiving ? "fas fa-spinner fa-spin" : "fas fa-trash-alt"} />
-  </button>
-
-@react.component
-let make = (~note, ~userId, ~removeNoteCB) => {
-  let (archiving, setArchiving) = React.useState(() => false)
-  <div className="mt-4" key={note |> CoachNote.id} ariaLabel={"Note " ++ (note |> CoachNote.id)}>
-    <div className="flex justify-between">
-      <div className="flex">
-        {switch note |> CoachNote.author {
-        | Some(user) =>
-          switch user |> User.avatarUrl {
-          | Some(avatarUrl) =>
-            <img
-              className="w-8 h-8 md:w-10 md:h-10 text-xs border border-gray-400 rounded-full overflow-hidden flex-shrink-0 mt-1 md:mt-0 mr-2 md:mr-3 object-cover"
-              src=avatarUrl
-            />
-          | None =>
-            <Avatar
-              name={user |> User.name}
-              className="w-8 h-8 md:w-10 md:h-10 text-xs border border-gray-400 rounded-full overflow-hidden flex-shrink-0 mt-1 md:mt-0 mr-2 md:mr-3 object-cover"
-            />
-          }
-
-        | None =>
-          <Avatar
-            name="?"
-            className="w-8 h-8 md:w-10 md:h-10 text-xs border rounded-full overflow-hidden flex-shrink-0 mt-1 md:mt-0 mr-2 md:mr-3 object-cover"
-          />
-        }}
-        <div>
-          <p className="text-sm font-semibold inline-block leading-snug">
-            {switch note |> CoachNote.author {
-            | Some(user) => user |> User.name
-            | None => "Deleted Coach"
-            } |> str}
-          </p>
-          <p className="text-gray-600 font-semibold text-xs mt-px leading-snug">
-            {switch note |> CoachNote.author {
-            | Some(user) => user |> User.title
-            | None => "Unknown"
-            } |> str}
-          </p>
-        </div>
-      </div>
-      {
-        let showDeleteIcon = switch note |> CoachNote.author {
-        | None => false
-        | Some(user) => User.id(user) == userId
-        }
-        showDeleteIcon
-          ? deleteIcon(note, removeCoachNote, removeNoteCB, setArchiving, archiving)
-          : React.null
-      }
-    </div>
-    <div className="ml-10 md:ml-13 mt-2">
-      <p
-        className="inline-block text-xs font-semibold leading-tight bg-gray-300 text-gray-800 mt-px px-1 py-px rounded">
-        {"on " ++ (note |> CoachNote.noteOn) |> str}
-      </p>
-      <MarkdownBlock
-        className="pt-1 text-sm" profile=Markdown.Permissive markdown={note |> CoachNote.note}
-      />
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__CoachNotes.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__CoachNotes.res
deleted file mode 100644
index 5926b08..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__CoachNotes.res
+++ /dev/null
@@ -1,98 +0,0 @@
-%raw(`require("./CoursesStudents__StudentOverlay.css")`)
-
-open CoursesStudents__Types
-
-type state = {
-  newNote: string,
-  saving: bool,
-}
-
-let str = React.string
-
-module CreateCoachNotesMutation = %graphql(`
-   mutation CreateCoachNoteMutation($studentId: ID!, $note: String!) {
-    createCoachNote(studentId: $studentId, note: $note ) {
-       coachNote {
-         id
-         note
-         createdAt
-         author {
-            id
-            avatarUrl
-            name
-            title
-         }
-       }
-      }
-    }
-  `)
-
-let saveNote = (studentId, setState, state, addNoteCB) => {
-  setState(state => {...state, saving: true})
-  CreateCoachNotesMutation.make(~studentId, ~note=state.newNote, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    switch response["createCoachNote"]["coachNote"] {
-    | Some(note) =>
-      let newNote = CoachNote.makeFromJs(note)
-      addNoteCB(newNote)
-      setState(_ => {newNote: "", saving: false})
-    | None => setState(state => {...state, saving: false})
-    }
-    Js.Promise.resolve()
-  })
-  |> Js.Promise.catch(_error => {
-    setState(state => {...state, saving: false})
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let updateCoachNoteCB = (setState, newNote) => setState(state => {...state, newNote: newNote})
-
-let saveNoteButtonText = (title, iconClasses) =>
-  <span> <FaIcon classes={iconClasses ++ " mr-2"} /> {title |> str} </span>
-
-@react.component
-let make = (~studentId, ~coachNotes, ~addNoteCB, ~removeNoteCB, ~userId) => {
-  let (state, setState) = React.useState(() => {newNote: "", saving: false})
-  <div className="mt-3 text-sm">
-    <label
-      htmlFor="course-students__coach-notes-new-note" className="font-semibold text-sm block mb-1">
-      {"Add a New Note" |> str}
-    </label>
-    <DisablingCover disabled=state.saving message="Saving...">
-      <MarkdownEditor
-        textareaId="course-students__coach-notes-new-note"
-        onChange={updateCoachNoteCB(setState)}
-        value=state.newNote
-        profile=Markdown.Permissive
-        maxLength=10000
-      />
-    </DisablingCover>
-    <button
-      disabled={state.newNote |> String.length < 1 || state.saving}
-      onClick={_ => saveNote(studentId, setState, state, addNoteCB)}
-      className="btn btn-primary mt-2">
-      {state.saving
-        ? saveNoteButtonText("Saving", "fas fa-spinner")
-        : saveNoteButtonText("Save Note", "")}
-    </button>
-    <div>
-      <h6 className="font-semibold mt-6"> {"All Notes" |> str} </h6>
-      {coachNotes |> ArrayUtils.isEmpty
-        ? <div
-            className="bg-gray-200 rounded text-center p-4 md:p-6 items-center justify-center mt-2">
-            <i className="fas fa-sticky-note text-gray-400 text-4xl" />
-            <p className="text-xs font-semibold text-gray-700 mt-2"> {"No notes here!" |> str} </p>
-          </div>
-        : React.null}
-      {coachNotes
-      |> CoachNote.sort
-      |> Array.map(note =>
-        <CoursesStudents__CoachNoteShow key={note |> CoachNote.id} note userId removeNoteCB />
-      )
-      |> React.array}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Course.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Course.res
deleted file mode 100644
index c5f64e7..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Course.res
+++ /dev/null
@@ -1,8 +0,0 @@
-type t = {id: string}
-
-let id = t => t.id
-
-let decode = json => {
-  open Json.Decode
-  {id: json |> field("id", string)}
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__EvaluationCriterion.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__EvaluationCriterion.res
deleted file mode 100644
index d24d11a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__EvaluationCriterion.res
+++ /dev/null
@@ -1,24 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  passGrade: int,
-  maxGrade: int,
-}
-
-let id = t => t.id
-
-let name = t => t.name
-
-let passGrade = t => t.passGrade
-
-let make = (~id, ~name, ~maxGrade, ~passGrade) => {
-  id: id,
-  name: name,
-  maxGrade: maxGrade,
-  passGrade: passGrade,
-}
-
-let makeFromJs = ecData =>
-  ecData |> Js.Array.map(ec =>
-    make(~id=ec["id"], ~name=ec["name"], ~maxGrade=ec["maxGrade"], ~passGrade=ec["passGrade"])
-  )
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Grade.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Grade.res
deleted file mode 100644
index 4bc6f75..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Grade.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type t = {
-  timelineEventId: string,
-  evaluationCriterionId: string,
-  grade: int,
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Level.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Level.res
deleted file mode 100644
index 23e27df..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Level.res
+++ /dev/null
@@ -1,64 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  number: int,
-  studentsInLevel: int,
-  teamsInLevel: int,
-  unlocked: bool,
-}
-
-let id = t => t.id
-let name = t => t.name
-
-let number = t => t.number
-
-let unlocked = t => t.unlocked
-
-let studentsInLevel = t => t.studentsInLevel
-
-let teamsInLevel = t => t.teamsInLevel
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    number: json |> field("number", int),
-    studentsInLevel: json |> field("studentsInLevel", int),
-    teamsInLevel: json |> field("teamsInLevel", int),
-    unlocked: json |> field("unlocked", bool),
-  }
-}
-
-let percentageStudents = (t, totalStudents) =>
-  float_of_int(t.studentsInLevel) /. float_of_int(totalStudents) *. 100.0
-
-let shortName = t => "L" ++ (t.number |> string_of_int)
-
-let sort = levels => levels |> ArrayUtils.copyAndSort((x, y) => x.number - y.number)
-
-let unsafeLevelNumber = (levels, componentName, levelId) =>
-  "Level " ++
-  (levels
-  |> ArrayUtils.unsafeFind(
-    l => l.id == levelId,
-    "Unable to find level with id: " ++ (levelId ++ (" in CoursesStudents__" ++ componentName)),
-  )
-  |> number
-  |> string_of_int)
-
-let levelsCompletedByAllStudents = levels => {
-  let rec aux = (completedLevels, levels) =>
-    switch levels {
-    | list{} => completedLevels
-    | list{head, ...tail} =>
-      if head.studentsInLevel == 0 {
-        aux(Array.append(completedLevels, [head]), tail)
-      } else {
-        completedLevels
-      }
-    }
-
-  let ls = levels |> sort |> Array.to_list |> aux([])
-  ls |> Array.length == (levels |> Array.length) ? [] : ls
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__LevelDistribution.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__LevelDistribution.res
deleted file mode 100644
index 3b4ccd0..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__LevelDistribution.res
+++ /dev/null
@@ -1,95 +0,0 @@
-%raw(`require("./CoursesStudents__LevelDistribution.css")`)
-
-open CoursesStudents__Types
-let str = React.string
-
-let stylingForLevelPills = percentageStudents => {
-  let emptyStyle = ReactDOMRe.Style.make()
-  let styleWithWidth = ReactDOMRe.Style.make(
-    ~width=(percentageStudents |> Js.Float.toString) ++ "%",
-    (),
-  )
-  if 0.0 <= percentageStudents && percentageStudents < 5.0 {
-    ("w-8 flex-shrink-0", emptyStyle, "bg-green-200 text-green-800")
-  } else if 5.0 <= percentageStudents && percentageStudents < 20.0 {
-    ("", styleWithWidth, "bg-green-300 text-green-800")
-  } else if 20.0 <= percentageStudents && percentageStudents < 40.0 {
-    ("", styleWithWidth, "bg-green-400 text-green-900")
-  } else if 40.0 <= percentageStudents && percentageStudents < 60.0 {
-    ("", styleWithWidth, "bg-green-500 text-white")
-  } else if 60.0 <= percentageStudents && percentageStudents < 80.0 {
-    ("", styleWithWidth, "bg-green-600 text-white")
-  } else {
-    ("", styleWithWidth, "bg-green-700 text-white")
-  }
-}
-
-@react.component
-let make = (~levels, ~selectLevelCB) => {
-  let totalStudentsInCourse = levels |> Array.fold_left((x, y) => x + Level.studentsInLevel(y), 0)
-  let completedLevels = Level.levelsCompletedByAllStudents(levels)
-  totalStudentsInCourse > 0
-    ? <div
-        ariaLabel="Students level-wise distribution"
-        className="w-full pt-8 max-w-3xl mx-auto hidden md:block">
-        <div className="flex w-full border bg-gray-100 rounded font-semibold ">
-          {levels
-          |> Js.Array.filter(level => Level.number(level) != 0)
-          |> Level.sort
-          |> Array.map(level => {
-            let percentageStudents = Level.percentageStudents(level, totalStudentsInCourse)
-            let (pillClass, style, pillColor) = stylingForLevelPills(percentageStudents)
-            let tip =
-              <div className="text-left">
-                <p> {"Level: " ++ string_of_int(Level.number(level)) |> str} </p>
-                <p> {"Students: " ++ string_of_int(Level.studentsInLevel(level)) |> str} </p>
-                {Level.studentsInLevel(level) != Level.teamsInLevel(level)
-                  ? <p> {"Teams: " ++ string_of_int(Level.teamsInLevel(level)) |> str} </p>
-                  : React.null}
-                <p>
-                  {"Percentage: " ++ Js.Float.toFixedWithPrecision(percentageStudents, ~digits=1)
-                    |> str}
-                </p>
-              </div>
-            <div
-              ariaLabel={"Students in level " ++ (Level.number(level) |> string_of_int)}
-              className={"level-distribution__container text-center relative " ++ pillClass}
-              style>
-              <label
-                className="absolute -mt-5 left-0 right-0 inline-block text-xs text-gray-700 text-center">
-                {level |> Level.shortName |> str}
-              </label>
-              <Tooltip className="w-full" tip position=#Bottom>
-                <div
-                  onClick={_ => selectLevelCB(level)}
-                  className={"level-distribution__pill hover:shadow-inner focus:shadow-inner relative cursor-pointer border-white text-xs leading-none text-center " ++ (
-                    completedLevels |> Array.mem(level)
-                      ? "bg-yellow-300 text-yellow-900"
-                      : Level.unlocked(level)
-                      ? pillColor
-                      : "level-distribution__pill--locked cursor-default bg-gray-300" ++ " text-gray-800"
-                  )}>
-                  {completedLevels |> Array.mem(level)
-                    ? <PfIcon className="if i-check-solid text-tiny" />
-                    : <div>
-                        <div
-                          className={level |> Level.unlocked
-                            ? ""
-                            : "level-distribution__team-count-value"}>
-                          {level |> Level.teamsInLevel |> string_of_int |> str}
-                        </div>
-                        {level |> Level.unlocked
-                          ? React.null
-                          : <div className="level-distribution__locked-icon">
-                              <i className="fas fa-lock text-tiny" />
-                            </div>}
-                      </div>}
-                </div>
-              </Tooltip>
-            </div>
-          })
-          |> React.array}
-        </div>
-      </div>
-    : React.null
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Root.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Root.res
deleted file mode 100644
index 07d8d5d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Root.res
+++ /dev/null
@@ -1,385 +0,0 @@
-%raw(`require("./CoursesStudents__Root.css")`)
-
-open CoursesStudents__Types
-let str = React.string
-
-type filter = {
-  nameOrEmail: option<string>,
-  level: option<Level.t>,
-  coach: option<Coach.t>,
-}
-
-type loading =
-  | NotLoading
-  | Reloading
-  | LoadingMore
-
-type state = {
-  loading: loading,
-  teams: Teams.t,
-  filterString: string,
-  filter: filter,
-}
-
-type action =
-  | SelectLevel(Level.t)
-  | DeselectLevel
-  | SelectCoach(Coach.t)
-  | DeselectCoach
-  | SetNameOrEmail(string)
-  | UnsetNameOrEmail
-  | UpdateFilterString(string)
-  | LoadTeams(option<string>, bool, array<TeamInfo.t>)
-  | BeginLoadingMore
-  | BeginReloading
-
-let reducer = (state, action) =>
-  switch action {
-  | SelectLevel(level) => {
-      ...state,
-      filter: {
-        ...state.filter,
-        level: Some(level),
-      },
-      filterString: "",
-    }
-  | DeselectLevel => {
-      ...state,
-      filter: {
-        ...state.filter,
-        level: None,
-      },
-    }
-  | SelectCoach(coach) => {
-      ...state,
-      filter: {
-        ...state.filter,
-        coach: Some(coach),
-      },
-      filterString: "",
-    }
-  | DeselectCoach => {
-      ...state,
-      filter: {
-        ...state.filter,
-        coach: None,
-      },
-    }
-  | SetNameOrEmail(search) => {
-      ...state,
-      filter: {
-        ...state.filter,
-        nameOrEmail: Some(search),
-      },
-      filterString: "",
-    }
-  | UnsetNameOrEmail => {
-      ...state,
-      filter: {
-        ...state.filter,
-        nameOrEmail: None,
-      },
-    }
-  | UpdateFilterString(filterString) => {...state, filterString: filterString}
-  | LoadTeams(endCursor, hasNextPage, newTeams) =>
-    let updatedTeams = switch state.loading {
-    | LoadingMore => newTeams |> Array.append(state.teams |> Teams.toArray)
-    | Reloading => newTeams
-    | NotLoading => newTeams
-    }
-
-    {
-      ...state,
-      teams: switch (hasNextPage, endCursor) {
-      | (_, None)
-      | (false, Some(_)) =>
-        FullyLoaded(updatedTeams)
-      | (true, Some(cursor)) => PartiallyLoaded(updatedTeams, cursor)
-      },
-      loading: NotLoading,
-    }
-  | BeginLoadingMore => {...state, loading: LoadingMore}
-  | BeginReloading => {...state, loading: Reloading}
-  }
-
-module TeamsQuery = %graphql(`
-    query TeamsFromCoursesStudentsRootQuery($courseId: ID!, $levelId: ID, $coachId: ID, $search: String, $after: String) {
-      teams(courseId: $courseId, levelId: $levelId,coachId: $coachId, search: $search, first: 10, after: $after) {
-        nodes {
-          id,
-          name,
-          levelId,
-          students {
-            id,
-            name
-            title
-            avatarUrl
-          }
-          coachUserIds
-          accessEndsAt
-          droppedOutAt
-        }
-        pageInfo{
-          endCursor,hasNextPage
-        }
-      }
-    }
-  `)
-
-let getTeams = (send, courseId, cursor, filter) => {
-  let levelId = filter.level |> OptionUtils.map(Level.id)
-  let coachId = filter.coach |> OptionUtils.map(Coach.id)
-
-  TeamsQuery.make(~courseId, ~after=?cursor, ~levelId?, ~coachId?, ~search=?filter.nameOrEmail, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    let newTeams = switch response["teams"]["nodes"] {
-    | None => []
-    | Some(teamsArray) => teamsArray |> TeamInfo.makeArrayFromJs
-    }
-
-    send(
-      LoadTeams(
-        response["teams"]["pageInfo"]["endCursor"],
-        response["teams"]["pageInfo"]["hasNextPage"],
-        newTeams,
-      ),
-    )
-
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let applicableLevels = levels => levels |> Js.Array.filter(level => Level.number(level) != 0)
-
-module Selectable = {
-  type t =
-    | Level(Level.t)
-    | AssignedToCoach(Coach.t, string)
-    | NameOrEmail(string)
-
-  let label = t =>
-    switch t {
-    | Level(level) => Some("Level " ++ (level |> Level.number |> string_of_int))
-    | AssignedToCoach(_) => Some("Assigned to")
-    | NameOrEmail(_) => Some("Name or Email")
-    }
-
-  let value = t =>
-    switch t {
-    | Level(level) => level |> Level.name
-    | AssignedToCoach(coach, currentCoachId) =>
-      coach |> Coach.id == currentCoachId ? "Me" : coach |> Coach.name
-    | NameOrEmail(search) => search
-    }
-
-  let searchString = t =>
-    switch t {
-    | Level(level) =>
-      "level " ++ ((level |> Level.number |> string_of_int) ++ (" " ++ (level |> Level.name)))
-    | AssignedToCoach(coach, currentCoachId) =>
-      if coach |> Coach.id == currentCoachId {
-        (coach |> Coach.name) ++ " assigned to me"
-      } else {
-        "assigned to " ++ (coach |> Coach.name)
-      }
-    | NameOrEmail(search) => search
-    }
-
-  let color = _t => "gray"
-  let level = level => Level(level)
-  let assignedToCoach = (coach, currentCoachId) => AssignedToCoach(coach, currentCoachId)
-  let nameOrEmail = search => NameOrEmail(search)
-}
-
-module Multiselect = MultiselectDropdown.Make(Selectable)
-
-let unselected = (levels, coaches, currentCoachId, state) => {
-  let unselectedLevels =
-    levels
-    |> Js.Array.filter(level =>
-      state.filter.level |> OptionUtils.mapWithDefault(
-        selectedLevel => level |> Level.id != (selectedLevel |> Level.id),
-        true,
-      )
-    )
-    |> Array.map(Selectable.level)
-
-  let unselectedCoaches =
-    coaches
-    |> Js.Array.filter(coach =>
-      state.filter.coach |> OptionUtils.mapWithDefault(
-        selectedCoach => coach |> Coach.id != Coach.id(selectedCoach),
-        true,
-      )
-    )
-    |> Array.map(coach => Selectable.assignedToCoach(coach, currentCoachId))
-
-  let trimmedFilterString = state.filterString |> String.trim
-  let nameOrEmail = trimmedFilterString == "" ? [] : [Selectable.nameOrEmail(trimmedFilterString)]
-
-  unselectedLevels |> Array.append(unselectedCoaches) |> Array.append(nameOrEmail)
-}
-
-let selected = (state, currentCoachId) => {
-  let selectedLevel =
-    state.filter.level |> OptionUtils.mapWithDefault(
-      selectedLevel => [Selectable.level(selectedLevel)],
-      [],
-    )
-
-  let selectedCoach =
-    state.filter.coach |> OptionUtils.mapWithDefault(
-      selectedCoach => [Selectable.assignedToCoach(selectedCoach, currentCoachId)],
-      [],
-    )
-
-  let selectedSearchString =
-    state.filter.nameOrEmail |> OptionUtils.mapWithDefault(
-      nameOrEmail => [Selectable.nameOrEmail(nameOrEmail)],
-      [],
-    )
-
-  selectedLevel |> Array.append(selectedCoach) |> Array.append(selectedSearchString)
-}
-
-let onSelectFilter = (send, selectable) =>
-  switch selectable {
-  | Selectable.AssignedToCoach(coach, _currentCoachId) => send(SelectCoach(coach))
-  | Level(level) => send(SelectLevel(level))
-  | NameOrEmail(nameOrEmail) => send(SetNameOrEmail(nameOrEmail))
-  }
-
-let onDeselectFilter = (send, selectable) =>
-  switch selectable {
-  | Selectable.AssignedToCoach(_) => send(DeselectCoach)
-  | Level(_) => send(DeselectLevel)
-  | NameOrEmail(_) => send(UnsetNameOrEmail)
-  }
-
-let filterPlaceholder = state =>
-  switch (state.filter.level, state.filter.coach, state.filter.nameOrEmail) {
-  | (None, None, None) => "Filter by level, assigned coach, or search by name or email address"
-  | _ => ""
-  }
-
-let restoreFilterNotice = (send, currentCoach, message) =>
-  <div
-    className="mt-2 text-sm italic flex flex-col md:flex-row items-center justify-between p-3 border border-gray-300 bg-white rounded-lg">
-    <span> {message |> str} </span>
-    <button
-      className="px-2 py-1 rounded text-xs overflow-hidden border border-gray-300 bg-gray-200 text-gray-800 border-gray-300 bg-gray-200 hover:bg-gray-300 mt-1 md:mt-0"
-      onClick={_ => send(SelectCoach(currentCoach))}>
-      {"Assigned to: Me" |> str} <i className="fas fa-level-up-alt ml-2" />
-    </button>
-  </div>
-
-let restoreAssignedToMeFilter = (state, send, currentTeamCoach) =>
-  currentTeamCoach |> OptionUtils.mapWithDefault(currentCoach =>
-    switch state.filter.coach {
-    | None => restoreFilterNotice(send, currentCoach, "Now showing all students in this course.")
-    | Some(selectedCoach) if selectedCoach |> Coach.id == Coach.id(currentCoach) => React.null
-    | Some(selectedCoach) =>
-      restoreFilterNotice(
-        send,
-        currentCoach,
-        "Now showing students assigned to " ++ ((selectedCoach |> Coach.name) ++ "."),
-      )
-    }
-  , React.null)
-
-let computeInitialState = currentTeamCoach => {
-  loading: NotLoading,
-  teams: Unloaded,
-  filterString: "",
-  filter: {
-    nameOrEmail: None,
-    level: None,
-    coach: currentTeamCoach,
-  },
-}
-
-@react.component
-let make = (~levels, ~course, ~userId, ~teamCoaches, ~currentCoach) => {
-  let (currentTeamCoach, _) = React.useState(() =>
-    teamCoaches->Belt.Array.some(coach => coach |> Coach.id == (currentCoach |> Coach.id))
-      ? Some(currentCoach)
-      : None
-  )
-
-  let (state, send) = React.useReducerWithMapState(reducer, currentTeamCoach, computeInitialState)
-
-  let courseId = course |> Course.id
-
-  let url = ReasonReactRouter.useUrl()
-
-  React.useEffect1(() => {
-    send(BeginReloading)
-    getTeams(send, courseId, None, state.filter)
-
-    None
-  }, [state.filter])
-
-  <div>
-    {switch url.path {
-    | list{"students", studentId, "report"} =>
-      <CoursesStudents__StudentOverlay courseId studentId levels userId teamCoaches />
-    | _ => React.null
-    }}
-    <div className="bg-gray-100 pt-8 pb-8 px-3 -mt-7">
-      <CoursesStudents__LevelDistribution
-        levels selectLevelCB={level => send(SelectLevel(level))}
-      />
-      <div className="w-full py-4 bg-gray-100 relative md:sticky md:top-0 z-10">
-        <div className="max-w-3xl mx-auto bg-gray-100 sticky md:static md:top-0">
-          <Multiselect
-            id="filter"
-            unselected={unselected(levels, teamCoaches, currentCoach |> Coach.id, state)}
-            selected={selected(state, currentCoach |> Coach.id)}
-            onSelect={onSelectFilter(send)}
-            onDeselect={onDeselectFilter(send)}
-            value=state.filterString
-            onChange={filterString => send(UpdateFilterString(filterString))}
-            placeholder={filterPlaceholder(state)}
-          />
-          {restoreAssignedToMeFilter(state, send, currentTeamCoach)}
-        </div>
-      </div>
-      <div className=" max-w-3xl mx-auto">
-        {switch state.teams {
-        | Unloaded => SkeletonLoading.multiple(~count=10, ~element=SkeletonLoading.userCard())
-        | PartiallyLoaded(teams, cursor) =>
-          <div>
-            <CoursesStudents__TeamsList levels teams teamCoaches />
-            {switch state.loading {
-            | LoadingMore => SkeletonLoading.multiple(~count=3, ~element=SkeletonLoading.card())
-            | NotLoading =>
-              <button
-                className="btn btn-primary-ghost cursor-pointer w-full mt-4"
-                onClick={_ => {
-                  send(BeginLoadingMore)
-                  getTeams(send, courseId, Some(cursor), state.filter)
-                }}>
-                {"Load More..." |> str}
-              </button>
-            | Reloading => React.null
-            }}
-          </div>
-        | FullyLoaded(teams) => <CoursesStudents__TeamsList levels teams teamCoaches />
-        }}
-      </div>
-    </div>
-    {switch state.teams {
-    | Unloaded => React.null
-
-    | _ =>
-      let loading = switch state.loading {
-      | NotLoading => false
-      | Reloading => true
-      | LoadingMore => false
-      }
-      <LoadingSpinner loading />
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__StudentDetails.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__StudentDetails.res
deleted file mode 100644
index 3f04c2c..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__StudentDetails.res
+++ /dev/null
@@ -1,124 +0,0 @@
-type averageGrade = {
-  evaluationCriterionId: string,
-  grade: float,
-}
-
-type t = {
-  id: string,
-  email: string,
-  phone: option<string>,
-  coachNotes: array<CoursesStudents__CoachNote.t>,
-  evaluationCriteria: array<CoursesStudents__EvaluationCriterion.t>,
-  socialLinks: array<string>,
-  totalTargets: int,
-  targetsCompleted: int,
-  quizScores: array<string>,
-  averageGrades: array<averageGrade>,
-  completedLevelIds: array<string>,
-  team: CoursesStudents__TeamInfo.t,
-}
-
-let team = t => t.team
-
-let student = t => t.team |> CoursesStudents__TeamInfo.studentWithId(t.id)
-
-let name = t => t |> student |> CoursesStudents__TeamInfo.studentName
-
-let title = t => t |> student |> CoursesStudents__TeamInfo.studentTitle
-
-let email = t => t.email
-
-let levelId = t => t.team |> CoursesStudents__TeamInfo.levelId
-
-let phone = t => t.phone
-
-let socialLinks = t => t.socialLinks
-
-let avatarUrl = t => t |> student |> CoursesStudents__TeamInfo.studentAvatarUrl
-
-let coachNotes = t => t.coachNotes
-
-let teamCoachUserIds = t => t.team |> CoursesStudents__TeamInfo.coachUserIds
-
-let makeAverageGrade = gradesData =>
-  gradesData |> Js.Array.map(gradeData => {
-    evaluationCriterionId: gradeData["evaluationCriterionId"],
-    grade: gradeData["averageGrade"],
-  })
-
-let totalTargets = t => t.totalTargets |> float_of_int
-
-let gradeAsPercentage = (
-  averageGrade: averageGrade,
-  evaluationCriterion: CoursesStudents__EvaluationCriterion.t,
-) => {
-  let maxGrade = evaluationCriterion.maxGrade |> float_of_int
-  averageGrade.grade /. maxGrade *. 100.0 |> int_of_float |> string_of_int
-}
-
-let targetsCompleted = t => t.targetsCompleted |> float_of_int
-
-let quizzesAttempted = t => t.quizScores |> Array.length |> string_of_int
-
-let evaluationCriteria = t => t.evaluationCriteria
-
-let averageGrades = t => t.averageGrades
-
-let completedLevelIds = t => t.completedLevelIds
-
-let gradeValue = averageGrade => averageGrade.grade
-
-let evaluationCriterionForGrade = (grade, evaluationCriteria, componentName) =>
-  evaluationCriteria |> ArrayUtils.unsafeFind(
-    ec => CoursesStudents__EvaluationCriterion.id(ec) == grade.evaluationCriterionId,
-    "Unable to find evaluation criterion with id: " ++
-    (grade.evaluationCriterionId ++
-    (" in component: " ++ componentName)),
-  )
-
-let addNewNote = (note, t) => {
-  let notes = Array.append(t.coachNotes, [note])
-  {...t, coachNotes: notes}
-}
-
-let removeNote = (noteId, t) => {
-  let notes = t.coachNotes |> Js.Array.filter(note => CoursesStudents__CoachNote.id(note) != noteId)
-  {...t, coachNotes: notes}
-}
-
-let computeAverageQuizScore = quizScores => {
-  let sumOfPercentageScores =
-    quizScores
-    |> Array.map(quizScore => {
-      let fractionArray = quizScore |> String.split_on_char('/') |> Array.of_list
-      let (numerator, denominator) = (
-        fractionArray[0] |> float_of_string,
-        fractionArray[1] |> float_of_string,
-      )
-      numerator /. denominator *. 100.0
-    })
-    |> Js.Array.reduce((a, b) => a +. b, 0.0)
-  sumOfPercentageScores /. (quizScores |> Array.length |> float_of_int)
-}
-
-let averageQuizScore = t =>
-  t.quizScores |> ArrayUtils.isEmpty ? None : Some(computeAverageQuizScore(t.quizScores))
-
-let makeFromJs = (id, studentDetails) => {
-  id: id,
-  email: studentDetails["email"],
-  phone: studentDetails["phone"],
-  coachNotes: studentDetails["coachNotes"] |> Js.Array.map(note =>
-    note |> CoursesStudents__CoachNote.makeFromJs
-  ),
-  evaluationCriteria: studentDetails["evaluationCriteria"] |> CoursesStudents__EvaluationCriterion.makeFromJs,
-  socialLinks: studentDetails["socialLinks"],
-  totalTargets: studentDetails["totalTargets"],
-  targetsCompleted: studentDetails["targetsCompleted"],
-  quizScores: studentDetails["quizScores"],
-  averageGrades: studentDetails["averageGrades"] |> makeAverageGrade,
-  completedLevelIds: studentDetails["completedLevelIds"],
-  team: studentDetails["team"] |> CoursesStudents__TeamInfo.makeFromJS,
-}
-
-let teamHasManyStudents = t => t.team |> CoursesStudents__TeamInfo.students |> Array.length > 1
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__StudentOverlay.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__StudentOverlay.res
deleted file mode 100644
index c80f8a1..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__StudentOverlay.res
+++ /dev/null
@@ -1,546 +0,0 @@
-%raw(`require("./CoursesStudents__StudentOverlay.css")`)
-
-open CoursesStudents__Types
-let str = React.string
-
-type selectedTab =
-  | Notes
-  | Submissions
-
-type studentData =
-  | Loading
-  | Loaded(StudentDetails.t)
-
-type state = {
-  selectedTab: selectedTab,
-  studentData: studentData,
-  submissions: Submissions.t,
-}
-
-let initialState = {
-  studentData: Loading,
-  selectedTab: Notes,
-  submissions: Unloaded,
-}
-
-let closeOverlay = courseId => ReasonReactRouter.push("/courses/" ++ (courseId ++ "/students"))
-
-module StudentDetailsQuery = %graphql(`
-    query StudentDetailsQuery($studentId: ID!) {
-      studentDetails(studentId: $studentId) {
-        email, phone, socialLinks,
-        evaluationCriteria {
-          id, name, maxGrade, passGrade
-        },
-        coachNotes {
-          id
-          note
-          createdAt
-          author {
-            id
-            name
-            title
-            avatarUrl
-          }
-        },
-        team {
-          id
-          name
-          levelId
-          droppedOutAt
-          accessEndsAt
-          students {
-            id
-            name
-            title
-            avatarUrl
-          }
-          coachUserIds
-        }
-        socialLinks
-        totalTargets
-        targetsCompleted
-        completedLevelIds
-        quizScores
-        averageGrades {
-          evaluationCriterionId
-          averageGrade
-        }
-      }
-    }
-  `)
-
-let updateStudentDetails = (setState, studentId, details) =>
-  setState(state => {
-    ...state,
-    studentData: Loaded(details |> StudentDetails.makeFromJs(studentId)),
-  })
-
-let getStudentDetails = (studentId, setState, ()) => {
-  setState(state => {...state, studentData: Loading})
-  StudentDetailsQuery.make(~studentId, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["studentDetails"] |> updateStudentDetails(setState, studentId)
-    Js.Promise.resolve()
-  })
-  |> ignore
-
-  None
-}
-
-let updateSubmissions = (setState, submissions) =>
-  setState(state => {...state, submissions: submissions})
-
-let doughnutChart = (color, percentage) =>
-  <svg viewBox="0 0 36 36" className={"student-overlay__doughnut-chart " ++ color}>
-    <path
-      className="student-overlay__doughnut-chart-bg"
-      d="M18 2.0845 a 15.9155 15.9155 0 0 1 0 31.831 a 15.9155 15.9155 0 0 1 0 -31.831"
-    />
-    <path
-      className="student-overlay__doughnut-chart-stroke"
-      strokeDasharray={percentage ++ ", 100"}
-      d="M18 2.0845 a 15.9155 15.9155 0 0 1 0 31.831 a 15.9155 15.9155 0 0 1 0 -31.831"
-    />
-    <text x="50%" y="58%" className="student-overlay__doughnut-chart-text font-semibold">
-      {percentage ++ "%" |> str}
-    </text>
-  </svg>
-
-let targetsCompletionStatus = (targetsCompleted, totalTargets) => {
-  let targetCompletionPercent =
-    targetsCompleted /. totalTargets *. 100.0 |> int_of_float |> string_of_int
-  <div ariaLabel="target-completion-status" className="w-full lg:w-1/2 px-2">
-    <div className="student-overlay__doughnut-chart-container">
-      {doughnutChart("purple", targetCompletionPercent)}
-      <p className="text-sm font-semibold text-center mt-3"> {"Total Targets Completed" |> str} </p>
-      <p className="text-sm text-gray-700 font-semibold text-center mt-1">
-        {(targetsCompleted |> int_of_float |> string_of_int) ++
-          ("/" ++
-          ((totalTargets |> int_of_float |> string_of_int) ++ " Targets")) |> str}
-      </p>
-    </div>
-  </div>
-}
-
-let quizPerformanceChart = (averageQuizScore, quizzesAttempted) =>
-  switch averageQuizScore {
-  | Some(score) =>
-    <div ariaLabel="quiz-performance-chart" className="w-full lg:w-1/2 px-2 mt-2 lg:mt-0">
-      <div className="student-overlay__doughnut-chart-container">
-        {doughnutChart("pink", score |> int_of_float |> string_of_int)}
-        <p className="text-sm font-semibold text-center mt-3"> {"Average Quiz Score" |> str} </p>
-        <p className="text-sm text-gray-700 font-semibold text-center leading-tight mt-1">
-          {quizzesAttempted ++ " Quizzes Attempted" |> str}
-        </p>
-      </div>
-    </div>
-  | None => React.null
-  }
-
-let averageGradeCharts = (
-  evaluationCriteria: array<CoursesStudents__EvaluationCriterion.t>,
-  averageGrades: array<StudentDetails.averageGrade>,
-) =>
-  averageGrades
-  |> Array.map(grade => {
-    let criterion = StudentDetails.evaluationCriterionForGrade(
-      grade,
-      evaluationCriteria,
-      "CoursesStudents__StudentOverlay",
-    )
-    let passGrade = criterion |> CoursesStudents__EvaluationCriterion.passGrade |> float_of_int
-    let averageGrade = grade |> StudentDetails.gradeValue
-    <div
-      ariaLabel={"average-grade-for-criterion-" ++
-      (criterion |> CoursesStudents__EvaluationCriterion.id)}
-      key={criterion |> CoursesStudents__EvaluationCriterion.id}
-      className="flex w-full lg:w-1/2 px-2 mt-2">
-      <div className="student-overlay__pie-chart-container">
-        <div className="flex px-5 pt-4 text-center items-center">
-          <svg
-            className={"student-overlay__pie-chart " ++ (
-              averageGrade < passGrade
-                ? "student-overlay__pie-chart--fail"
-                : "student-overlay__pie-chart--pass"
-            )}
-            viewBox="0 0 32 32">
-            <circle
-              className={"student-overlay__pie-chart-circle " ++ (
-                averageGrade < passGrade
-                  ? "student-overlay__pie-chart-circle--fail"
-                  : "student-overlay__pie-chart-circle--pass"
-              )}
-              strokeDasharray={StudentDetails.gradeAsPercentage(grade, criterion) ++ ", 100"}
-              r="16"
-              cx="16"
-              cy="16"
-            />
-          </svg>
-          <span className="ml-3 text-lg font-semibold">
-            {(grade.grade |> Js.Float.toString) ++ ("/" ++ (criterion.maxGrade |> string_of_int))
-              |> str}
-          </span>
-        </div>
-        <p className="text-sm font-semibold px-5 pt-3 pb-4">
-          {criterion |> CoursesStudents__EvaluationCriterion.name |> str}
-        </p>
-      </div>
-    </div>
-  })
-  |> React.array
-
-let test = (value, url) => {
-  let tester = Js.Re.fromString(value)
-  url |> Js.Re.test_(tester)
-}
-
-let socialLinkIconClass = url =>
-  switch url {
-  | url if url |> test("twitter") => "fab fa-twitter"
-  | url if url |> test("facebook") => "fab fa-facebook-f"
-  | url if url |> test("instagram") => "fab fa-instagram"
-  | url if url |> test("youtube") => "fab fa-youtube"
-  | url if url |> test("linkedin") => "fab fa-linkedin"
-  | url if url |> test("reddit") => "fab fa-reddit"
-  | url if url |> test("flickr") => "fab fa-flickr"
-  | url if url |> test("github") => "fab fa-github"
-  | _unknownUrl => "fas fa-users"
-  }
-
-let showSocialLinks = socialLinks =>
-  <div
-    className="inline-flex flex-wrap justify-center text-lg text-gray-800 mt-3 bg-gray-100 px-2 rounded-lg">
-    {socialLinks
-    |> Array.mapi((index, link) =>
-      <a
-        className="px-2 py-1 inline-block hover:text-primary-500"
-        key={index |> string_of_int}
-        target="_blank"
-        href=link>
-        <i className={socialLinkIconClass(link)} />
-      </a>
-    )
-    |> React.array}
-  </div>
-
-let personalInfo = studentDetails =>
-  <div className="mt-2 text-center">
-    <div className="flex flex-wrap justify-center text-xs font-semibold text-gray-800">
-      <div className="flex items-center px-2">
-        <i className="fas fa-envelope" />
-        <p className="ml-2 tracking-wide"> {studentDetails |> StudentDetails.email |> str} </p>
-      </div>
-      {switch studentDetails |> StudentDetails.phone {
-      | Some(phone) =>
-        <div className="flex items-center px-2">
-          <i className="fas fa-phone" /> <p className="ml-2 tracking-wide"> {phone |> str} </p>
-        </div>
-      | None => React.null
-      }}
-    </div>
-    {
-      let socialLinks = studentDetails |> StudentDetails.socialLinks
-      socialLinks |> ArrayUtils.isNotEmpty ? showSocialLinks(socialLinks) : React.null
-    }
-  </div>
-
-let setSelectedTab = (selectedTab, setState) =>
-  setState(state => {...state, selectedTab: selectedTab})
-
-let studentLevelClasses = (levelNumber, levelCompleted, currentLevelNumber) => {
-  let reached = levelNumber <= currentLevelNumber ? "student-overlay__student-level--reached" : ""
-
-  let current = levelNumber == currentLevelNumber ? " student-overlay__student-level--current" : ""
-
-  let completed = levelCompleted ? " student-overlay__student-level--completed" : ""
-
-  reached ++ (current ++ completed)
-}
-
-let levelProgressBar = (levelId, levels, levelsCompleted) => {
-  let applicableLevels = levels |> Js.Array.filter(level => Level.number(level) != 0)
-
-  let courseCompleted =
-    applicableLevels |> Array.for_all(level => levelsCompleted |> Array.mem(level |> Level.id))
-
-  let currentLevelNumber =
-    applicableLevels
-    |> ArrayUtils.unsafeFind(
-      level => Level.id(level) == levelId,
-      "Unable to find level with id" ++ (levelId ++ "in StudentOverlay"),
-    )
-    |> Level.number
-
-  <div className="mb-8">
-    <div className="flex justify-between items-end">
-      <h6 className="text-sm font-semibold"> {"Level Progress" |> str} </h6>
-      {courseCompleted
-        ? <p className="text-green-600 font-semibold">
-            {`🎉` |> str} <span className="text-xs ml-px"> {"Course Completed!" |> str} </span>
-          </p>
-        : React.null}
-    </div>
-    <div className="h-12 flex items-center">
-      <ul
-        className={"student-overlay__student-level-progress flex w-full " ++ (
-          courseCompleted ? "student-overlay__student-level-progress--completed" : ""
-        )}>
-        {applicableLevels
-        |> Level.sort
-        |> Array.map(level => {
-          let levelNumber = level |> Level.number
-          let levelCompleted = levelsCompleted |> Array.mem(level |> Level.id)
-
-          <li
-            key={level |> Level.id}
-            className={"flex-1 student-overlay__student-level " ++
-            studentLevelClasses(levelNumber, levelCompleted, currentLevelNumber)}>
-            <span className="student-overlay__student-level-count">
-              {levelNumber |> string_of_int |> str}
-            </span>
-          </li>
-        })
-        |> React.array}
-      </ul>
-    </div>
-  </div>
-}
-
-let addNoteCB = (setState, studentDetails, note) =>
-  setState(state => {
-    ...state,
-    studentData: Loaded(StudentDetails.addNewNote(note, studentDetails)),
-  })
-
-let removeNoteCB = (setState, studentDetails, noteId) =>
-  setState(state => {
-    ...state,
-    studentData: Loaded(StudentDetails.removeNote(noteId, studentDetails)),
-  })
-
-let userInfo = (~key, ~avatarUrl, ~name, ~title) =>
-  <div key className="shadow rounded-lg p-4 flex items-center mt-2">
-    {CoursesStudents__TeamCoaches.avatar(avatarUrl, name)}
-    <div className="ml-2 md:ml-3">
-      <div className="text-sm font-semibold"> {name |> str} </div>
-      <div className="text-xs"> {title |> str} </div>
-    </div>
-  </div>
-
-let coachInfo = (teamCoaches, studentDetails) => {
-  let coaches = studentDetails |> StudentDetails.team |> TeamInfo.coaches(teamCoaches)
-
-  let title =
-    studentDetails |> StudentDetails.teamHasManyStudents ? "Team Coaches" : "Personal Coaches"
-
-  coaches |> ArrayUtils.isNotEmpty
-    ? <div className="mb-8">
-        <h6 className="font-semibold"> {title |> str} </h6>
-        {coaches
-        |> Array.map(coach =>
-          userInfo(
-            ~key=coach |> Coach.userId,
-            ~avatarUrl=coach |> Coach.avatarUrl,
-            ~name=coach |> Coach.name,
-            ~title=coach |> Coach.title,
-          )
-        )
-        |> React.array}
-      </div>
-    : React.null
-}
-
-let navigateToStudent = (setState, _event) => setState(_ => initialState)
-
-let otherTeamMembers = (setState, studentId, studentDetails) =>
-  if studentDetails |> StudentDetails.teamHasManyStudents {
-    <div className="block mb-8">
-      <h6 className="font-semibold"> {"Other Team Members" |> str} </h6>
-      {studentDetails
-      |> StudentDetails.team
-      |> TeamInfo.otherStudents(studentId)
-      |> Array.map(student => {
-        let path = "/students/" ++ ((student |> TeamInfo.studentId) ++ "/report")
-
-        <Link
-          className="block"
-          href=path
-          onClick={navigateToStudent(setState)}
-          key={student |> TeamInfo.studentId}>
-          {userInfo(
-            ~key=student |> TeamInfo.studentId,
-            ~avatarUrl=student |> TeamInfo.studentAvatarUrl,
-            ~name=student |> TeamInfo.studentName,
-            ~title=student |> TeamInfo.studentTitle,
-          )}
-        </Link>
-      })
-      |> React.array}
-    </div>
-  } else {
-    React.null
-  }
-
-let inactiveWarning = teamInfo => {
-  let warning = switch (teamInfo |> TeamInfo.droppedOutAt, teamInfo |> TeamInfo.accessEndsAt) {
-  | (Some(droppedOutAt), _) =>
-    Some(
-      "This student dropped out of the course on " ++
-      ((droppedOutAt |> DateTime.format(DateTime.OnlyDate)) ++
-      "."),
-    )
-  | (None, Some(accessEndsAt)) =>
-    accessEndsAt |> DateFns.isPast
-      ? Some(
-          "This student's access to the course ended on " ++
-          ((accessEndsAt |> DateTime.format(DateTime.OnlyDate)) ++
-          "."),
-        )
-      : None
-  | (None, None) => None
-  }
-
-  warning |> OptionUtils.mapWithDefault(
-    warning =>
-      <div className="border border-yellow-400 rounded bg-yellow-400 py-2 px-3 mt-3">
-        <i className="fas fa-exclamation-triangle" />
-        <span className="ml-2"> {warning |> str} </span>
-      </div>,
-    React.null,
-  )
-}
-
-@react.component
-let make = (~courseId, ~studentId, ~levels, ~userId, ~teamCoaches) => {
-  let (state, setState) = React.useState(() => initialState)
-
-  React.useEffect0(() => {
-    ScrollLock.activate()
-    Some(() => ScrollLock.deactivate())
-  })
-
-  React.useEffect1(getStudentDetails(studentId, setState), [studentId])
-
-  <div
-    className="fixed z-30 top-0 left-0 w-full h-full overflow-y-scroll md:overflow-hidden bg-white">
-    {switch state.studentData {
-    | Loaded(studentDetails) =>
-      <div className="flex flex-col md:flex-row md:h-screen">
-        <div
-          className="w-full md:w-2/5 bg-white p-4 md:p-8 md:py-6 2xl:px-16 2xl:py-12 md:overflow-y-auto">
-          <div className="student-overlay__student-details relative pb-8">
-            <div
-              onClick={_ => closeOverlay(courseId)}
-              className="absolute z-50 left-0 cursor-pointer top-0 inline-flex p-1 rounded-full bg-gray-200 h-10 w-10 justify-center items-center text-gray-700 hover:text-gray-900 hover:bg-gray-300">
-              <Icon className="if i-times-regular text-xl lg:text-2xl" />
-            </div>
-            <div
-              className="student-overlay__student-avatar mx-auto w-18 h-18 md:w-24 md:h-24 text-xs border border-yellow-500 rounded-full overflow-hidden flex-shrink-0">
-              {switch studentDetails |> StudentDetails.avatarUrl {
-              | Some(avatarUrl) => <img className="w-full object-cover" src=avatarUrl />
-              | None =>
-                <Avatar name={studentDetails |> StudentDetails.name} className="object-cover" />
-              }}
-            </div>
-            <h2 className="text-lg text-center mt-3">
-              {studentDetails |> StudentDetails.name |> str}
-            </h2>
-            <p className="text-sm font-semibold text-center mt-1">
-              {studentDetails |> StudentDetails.title |> str}
-            </p>
-            {personalInfo(studentDetails)}
-            {inactiveWarning(studentDetails |> StudentDetails.team)}
-          </div>
-          {levelProgressBar(
-            studentDetails |> StudentDetails.levelId,
-            levels,
-            studentDetails |> StudentDetails.completedLevelIds,
-          )}
-          <div className="mb-8">
-            <h6 className="font-semibold"> {"Targets Overview" |> str} </h6>
-            <div className="flex -mx-2 flex-wrap mt-2">
-              {targetsCompletionStatus(
-                studentDetails |> StudentDetails.targetsCompleted,
-                studentDetails |> StudentDetails.totalTargets,
-              )}
-              {quizPerformanceChart(
-                studentDetails |> StudentDetails.averageQuizScore,
-                studentDetails |> StudentDetails.quizzesAttempted,
-              )}
-            </div>
-          </div>
-          {studentDetails |> StudentDetails.averageGrades |> ArrayUtils.isNotEmpty
-            ? <div className="mb-8">
-                <h6 className="font-semibold"> {"Average Grades" |> str} </h6>
-                <div className="flex -mx-2 flex-wrap">
-                  {averageGradeCharts(
-                    studentDetails |> StudentDetails.evaluationCriteria,
-                    studentDetails |> StudentDetails.averageGrades,
-                  )}
-                </div>
-              </div>
-            : React.null}
-          {coachInfo(teamCoaches, studentDetails)}
-          {otherTeamMembers(setState, studentId, studentDetails)}
-        </div>
-        <div
-          className="w-full relative md:w-3/5 bg-gray-100 md:border-l pb-6 2xl:pb-12 md:overflow-y-auto">
-          <div
-            className="sticky top-0 bg-gray-100 pt-2 md:pt-4 px-4 md:px-8 2xl:px-16 2xl:pt-10 z-30">
-            <ul className="flex font-semibold border-b text-sm">
-              <li
-                onClick={_event => setSelectedTab(Notes, setState)}
-                className={"px-3 py-3 md:py-2 cursor-pointer text-gray-800 rounded-t-lg " ++
-                switch state.selectedTab {
-                | Notes => "border-b-3 border-primary-500 text-primary-500 -mb-px"
-                | Submissions => "hover:bg-gray-200 hover:text-gray-900"
-                }}>
-                {"Notes" |> str}
-              </li>
-              <li
-                onClick={_event => setSelectedTab(Submissions, setState)}
-                className={"px-3 py-3 md:py-2 cursor-pointer text-gray-800 " ++
-                switch state.selectedTab {
-                | Submissions => "border-b-3 border-primary-500 text-primary-500 -mb-px"
-                | Notes => "hover:bg-gray-200 hover:text-gray-900"
-                }}>
-                {"Submissions" |> str}
-              </li>
-            </ul>
-          </div>
-          <div className="pt-2 px-4 md:px-8 2xl:px-16">
-            {switch state.selectedTab {
-            | Notes =>
-              <CoursesStudents__CoachNotes
-                studentId
-                coachNotes={studentDetails |> StudentDetails.coachNotes}
-                addNoteCB={addNoteCB(setState, studentDetails)}
-                userId
-                removeNoteCB={removeNoteCB(setState, studentDetails)}
-              />
-            | Submissions =>
-              <CoursesStudents__SubmissionsList
-                studentId
-                levels
-                submissions=state.submissions
-                updateSubmissionsCB={updateSubmissions(setState)}
-              />
-            }}
-          </div>
-        </div>
-      </div>
-    | Loading =>
-      <div className="flex flex-col md:flex-row md:h-screen">
-        <div className="w-full md:w-2/5 bg-white p-4 md:p-8 2xl:p-16">
-          {SkeletonLoading.image()}
-          {SkeletonLoading.multiple(~count=2, ~element=SkeletonLoading.profileCard())}
-        </div>
-        <div className="w-full relative md:w-3/5 bg-gray-100 md:border-l p-4 md:p-8 2xl:p-16">
-          {SkeletonLoading.contents()} {SkeletonLoading.profileCard()}
-        </div>
-      </div>
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Submission.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Submission.res
deleted file mode 100644
index 2430d39..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Submission.res
+++ /dev/null
@@ -1,56 +0,0 @@
-type t = {
-  id: string,
-  title: string,
-  createdAt: Js.Date.t,
-  passedAt: option<Js.Date.t>,
-  levelId: string,
-}
-
-let make = (~id, ~title, ~createdAt, ~passedAt, ~levelId) => {
-  id: id,
-  title: title,
-  createdAt: createdAt,
-  passedAt: passedAt,
-  levelId: levelId,
-}
-
-let id = t => t.id
-
-let levelId = t => t.levelId
-
-let title = t => t.title
-
-let sort = submissions =>
-  submissions |> ArrayUtils.copyAndSort((x, y) =>
-    DateFns.differenceInSeconds(y.createdAt, x.createdAt) |> int_of_float
-  )
-
-let failed = t =>
-  switch t.passedAt {
-  | Some(_passedAt) => false
-  | None => true
-  }
-
-let createdAtPretty = t => t.createdAt |> DateFns.format("MMMM D, YYYY")
-
-let makeFromJs = submissions =>
-  submissions |> Js.Array.map(submission =>
-    switch submission {
-    | Some(submission) =>
-      let createdAt = submission["createdAt"] |> Json.Decode.string |> DateFns.parseString
-      let passedAt = switch submission["passedAt"] {
-      | Some(passedAt) => Some(passedAt |> Json.Decode.string |> DateFns.parseString)
-      | None => None
-      }
-      list{
-        make(
-          ~id=submission["id"],
-          ~title=submission["title"],
-          ~createdAt,
-          ~passedAt,
-          ~levelId=submission["levelId"],
-        ),
-      }
-    | None => list{}
-    }
-  )
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Submissions.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Submissions.res
deleted file mode 100644
index 80c930e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Submissions.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type rec t =
-  | Unloaded
-  | PartiallyLoaded(array<CoursesStudents__Submission.t>, cursor)
-  | FullyLoaded(array<CoursesStudents__Submission.t>)
-and cursor = string
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__SubmissionsList.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__SubmissionsList.res
deleted file mode 100644
index 0cc571c..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__SubmissionsList.res
+++ /dev/null
@@ -1,179 +0,0 @@
-%raw(`require("./CoursesStudents__StudentOverlay.css")`)
-
-@module("../../shared/images/reviewed-empty.svg")
-external reviewedEmptyImage: string = "default"
-
-open CoursesStudents__Types
-
-type state = {loading: bool}
-
-let str = React.string
-
-module StudentSubmissionsQuery = %graphql(`
-   query StudentSubmissionsQuery($studentId: ID!, $after: String) {
-    studentSubmissions(studentId: $studentId, after: $after, first: 20 ) {
-       nodes {
-         id
-        createdAt
-        levelId
-        passedAt
-        title
-       }
-       pageInfo {
-         hasNextPage
-         endCursor
-       }
-      }
-    }
-   `)
-
-let updateStudentSubmissions = (
-  setState,
-  updateSubmissionsCB,
-  endCursor,
-  hasNextPage,
-  submissions,
-  nodes,
-) => {
-  let updatedSubmissions = Array.append(
-    switch nodes {
-    | None => []
-    | Some(submissionsArray) => submissionsArray |> Submission.makeFromJs
-    } |> ArrayUtils.flatten,
-    submissions,
-  )
-
-  let submissionsData: Submissions.t = switch (hasNextPage, endCursor) {
-  | (true, None)
-  | (false, _) =>
-    FullyLoaded(updatedSubmissions)
-  | (true, Some(cursor)) => PartiallyLoaded(updatedSubmissions, cursor)
-  }
-
-  updateSubmissionsCB(submissionsData)
-  setState(_ => {loading: false})
-}
-
-let getStudentSubmissions = (studentId, cursor, setState, submissions, updateSubmissionsCB) => {
-  setState(_ => {loading: true})
-  switch cursor {
-  | Some(cursor) => StudentSubmissionsQuery.make(~studentId, ~after=cursor, ())
-  | None => StudentSubmissionsQuery.make(~studentId, ())
-  }
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["studentSubmissions"]["nodes"] |> updateStudentSubmissions(
-      setState,
-      updateSubmissionsCB,
-      response["studentSubmissions"]["pageInfo"]["endCursor"],
-      response["studentSubmissions"]["pageInfo"]["hasNextPage"],
-      submissions,
-    )
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let showSubmissionStatus = failed =>
-  failed
-    ? <div
-        className="bg-red-100 border border-red-500 flex-shrink-0 leading-normal text-red-800 font-semibold px-3 py-px rounded">
-        {"Failed" |> str}
-      </div>
-    : <div
-        className="bg-green-100 border border-green-500 flex-shrink-0 leading-normal text-green-800 font-semibold px-3 py-px rounded">
-        {"Passed" |> str}
-      </div>
-
-let submissionCardClasses = submission =>
-  "flex flex-col md:flex-row items-start md:items-center justify-between bg-white border-l-3 p-3 md:py-6 md:px-5 mt-4 cursor-pointer rounded-r-lg shadow hover:border-primary-500 hover:text-primary-500 hover:shadow-md " ++ (
-    submission |> Submission.failed ? "border-red-500" : "border-green-500"
-  )
-
-let showSubmission = (submissions, levels) =>
-  <div>
-    {submissions
-    |> Submission.sort
-    |> Array.map(submission =>
-      <a
-        key={submission |> Submission.id}
-        href={"/submissions/" ++ (submission |> Submission.id)}
-        target="_blank">
-        <div
-          key={submission |> Submission.id}
-          ariaLabel={"student-submission-card-" ++ (submission |> Submission.id)}
-          className={submissionCardClasses(submission)}>
-          <div className="w-full md:w-3/4">
-            <div className="block text-sm md:pr-2">
-              <span className="bg-gray-300 text-xs font-semibold px-2 py-px rounded">
-                {submission
-                |> Submission.levelId
-                |> Level.unsafeLevelNumber(levels, "StudentSubmissionsList")
-                |> str}
-              </span>
-              <span className="ml-2 font-semibold text-base">
-                {submission |> Submission.title |> str}
-              </span>
-            </div>
-            <div className="mt-1 ml-px text-xs text-gray-900">
-              <span className="ml-1">
-                {"Submitted on " ++ (submission |> Submission.createdAtPretty) |> str}
-              </span>
-            </div>
-          </div>
-          <div className="w-auto md:w-1/4 text-xs flex justify-end mt-2 md:mt-0">
-            {showSubmissionStatus(submission |> Submission.failed)}
-          </div>
-        </div>
-      </a>
-    )
-    |> React.array}
-  </div>
-
-let showSubmissions = (submissions, levels) =>
-  submissions |> ArrayUtils.isEmpty
-    ? <div className="course-review__reviewed-empty text-lg font-semibold text-center py-4">
-        <h5 className="py-4 mt-4 bg-gray-200 text-gray-800 font-semibold">
-          {"No Reviewed Submission" |> str}
-        </h5>
-        <img className="w-3/4 md:w-1/2 mx-auto mt-2" src=reviewedEmptyImage />
-      </div>
-    : showSubmission(submissions, levels)
-
-@react.component
-let make = (~studentId, ~levels, ~submissions, ~updateSubmissionsCB) => {
-  let (state, setState) = React.useState(() => {loading: false})
-  React.useEffect1(() => {
-    switch submissions {
-    | Submissions.Unloaded =>
-      getStudentSubmissions(studentId, None, setState, [], updateSubmissionsCB)
-    | FullyLoaded(_)
-    | PartiallyLoaded(_) => ()
-    }
-    None
-  }, [studentId])
-  <div ariaLabel="student-submissions">
-    {switch (submissions: Submissions.t) {
-    | Unloaded => SkeletonLoading.multiple(~count=3, ~element=SkeletonLoading.card())
-    | PartiallyLoaded(submissions, cursor) =>
-      <div>
-        {showSubmissions(submissions, levels)}
-        {state.loading
-          ? SkeletonLoading.multiple(~count=3, ~element=SkeletonLoading.card())
-          : <button
-              className="btn btn-primary-ghost cursor-pointer w-full mt-4"
-              onClick={_ =>
-                getStudentSubmissions(
-                  studentId,
-                  Some(cursor),
-                  setState,
-                  submissions,
-                  updateSubmissionsCB,
-                )}>
-              {"Load More..." |> str}
-            </button>}
-      </div>
-    | FullyLoaded(submissions) => showSubmissions(submissions, levels)
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__TeamCoaches.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__TeamCoaches.res
deleted file mode 100644
index 5c5b284..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__TeamCoaches.res
+++ /dev/null
@@ -1,83 +0,0 @@
-let str = React.string
-
-let avatarClasses = size => {
-  let (defaultSize, mdSize) = size
-  "w-" ++
-  (defaultSize ++
-  (" h-" ++
-  (defaultSize ++
-  (" md:w-" ++
-  (mdSize ++
-  (" md:h-" ++
-  (mdSize ++
-  " text-xs border border-gray-400 rounded-full overflow-hidden flex-shrink-0 object-cover")))))))
-}
-
-let avatar = (~size=("8", "10"), avatarUrl, name) =>
-  switch avatarUrl {
-  | Some(avatarUrl) => <img className={avatarClasses(size)} src=avatarUrl />
-  | None => <Avatar name className={avatarClasses(size)} />
-  }
-
-@react.component
-let make = (
-  ~tooltipPosition=#Top,
-  ~defaultAvatarSize="6",
-  ~mdAvatarSize="8",
-  ~title,
-  ~className,
-  ~coaches,
-) =>
-  if coaches |> ArrayUtils.isNotEmpty {
-    let listedCoaches =
-      coaches |> Array.length <= 4 ? coaches : coaches |> Js.Array.slice(~start=0, ~end_=3)
-
-    let otherCoaches = if coaches |> Array.length > 4 {
-      let names =
-        coaches
-        |> Js.Array.sliceFrom(3)
-        |> Js.Array.map(coach =>
-          <div key={coach |> UserProxy.userId}> {coach |> UserProxy.name |> str} </div>
-        )
-        |> React.array
-
-      let count = (coaches |> Array.length) - 3
-      Some((names, count))
-    } else {
-      None
-    }
-
-    <div className>
-      <div className="text-xs"> title </div>
-      <div className="inline-flex">
-        {listedCoaches
-        |> Array.map(coach =>
-          <Tooltip
-            position=tooltipPosition
-            tip={coach |> UserProxy.name |> str}
-            className="-mr-1"
-            key={coach |> UserProxy.userId}>
-            {avatar(
-              ~size=(defaultAvatarSize, mdAvatarSize),
-              coach |> UserProxy.avatarUrl,
-              coach |> UserProxy.name,
-            )}
-          </Tooltip>
-        )
-        |> React.array}
-        {otherCoaches |> OptionUtils.mapWithDefault(
-          ((names, count)) =>
-            <Tooltip tip=names className="-mr-1">
-              <Avatar
-                name={"+ " ++ (count |> string_of_int)}
-                className={avatarClasses((defaultAvatarSize, mdAvatarSize))}
-                colors=("#EEE", "#000")
-              />
-            </Tooltip>,
-          React.null,
-        )}
-      </div>
-    </div>
-  } else {
-    <div />
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__TeamInfo.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__TeamInfo.res
deleted file mode 100644
index c936cb8..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__TeamInfo.res
+++ /dev/null
@@ -1,95 +0,0 @@
-type student = {
-  id: string,
-  name: string,
-  title: string,
-  avatarUrl: option<string>,
-}
-
-type t = {
-  id: string,
-  name: string,
-  levelId: string,
-  students: array<student>,
-  coachUserIds: array<string>,
-  droppedOutAt: option<Js.Date.t>,
-  accessEndsAt: option<Js.Date.t>,
-}
-
-let id = t => t.id
-let levelId = t => t.levelId
-
-let name = t => t.name
-
-let title = t => t.title
-
-let students = t => t.students
-
-let coachUserIds = t => t.coachUserIds
-
-let studentId = (student: student) => student.id
-
-let studentName = (student: student) => student.name
-
-let studentTitle = (student: student) => student.title
-
-let studentAvatarUrl = student => student.avatarUrl
-
-let droppedOutAt = t => t.droppedOutAt
-
-let accessEndsAt = t => t.accessEndsAt
-
-let studentWithId = (studentId, t) =>
-  t.students |> ArrayUtils.unsafeFind(
-    (student: student) => student.id == studentId,
-    "Could not find student with ID " ++ (studentId ++ (" in team with ID " ++ t.id)),
-  )
-
-let makeStudent = (~id, ~name, ~title, ~avatarUrl) => {
-  id: id,
-  name: name,
-  title: title,
-  avatarUrl: avatarUrl,
-}
-
-let make = (~id, ~name, ~levelId, ~students, ~coachUserIds, ~droppedOutAt, ~accessEndsAt) => {
-  id: id,
-  name: name,
-  levelId: levelId,
-  students: students,
-  coachUserIds: coachUserIds,
-  droppedOutAt: droppedOutAt,
-  accessEndsAt: accessEndsAt,
-}
-
-let makeFromJS = teamDetails => {
-  let students =
-    teamDetails["students"] |> Array.map(student =>
-      makeStudent(
-        ~id=student["id"],
-        ~name=student["name"],
-        ~title=student["title"],
-        ~avatarUrl=student["avatarUrl"],
-      )
-    )
-
-  make(
-    ~id=teamDetails["id"],
-    ~name=teamDetails["name"],
-    ~levelId=teamDetails["levelId"],
-    ~students,
-    ~coachUserIds=teamDetails["coachUserIds"],
-    ~droppedOutAt=teamDetails["droppedOutAt"] |> OptionUtils.map(DateTime.decode),
-    ~accessEndsAt=teamDetails["accessEndsAt"] |> OptionUtils.map(DateTime.decode),
-  )
-}
-
-let makeArrayFromJs = detailsOfTeams =>
-  detailsOfTeams->Belt.Array.keepMap(OptionUtils.map(makeFromJS))
-
-let otherStudents = (studentId, t) =>
-  t.students |> Js.Array.filter((student: student) => student.id != studentId)
-
-let coaches = (allTeamCoaches, t) =>
-  allTeamCoaches |> Js.Array.filter(teamCoach =>
-    t |> coachUserIds |> Array.mem(teamCoach |> UserProxy.userId)
-  )
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Teams.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Teams.res
deleted file mode 100644
index 9babd81..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Teams.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type t =
-  | Unloaded
-  | PartiallyLoaded(array<CoursesStudents__TeamInfo.t>, string)
-  | FullyLoaded(array<CoursesStudents__TeamInfo.t>)
-
-let toArray = t =>
-  switch t {
-  | Unloaded => []
-  | PartiallyLoaded(teams, _) => teams
-  | FullyLoaded(teams) => teams
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__TeamsList.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__TeamsList.res
deleted file mode 100644
index 37428a3..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__TeamsList.res
+++ /dev/null
@@ -1,128 +0,0 @@
-%raw(`require("./CoursesStudents__Root.css")`)
-
-open CoursesStudents__Types
-
-let str = React.string
-
-let levelInfo = (levelId, levels) =>
-  <span
-    className="inline-flex flex-col items-center rounded bg-orange-100 border border-orange-300 px-2 pt-2 pb-1 border">
-    <div className="text-xs font-semibold"> {"Level" |> str} </div>
-    <div className="font-bold">
-      {levels
-      |> ArrayUtils.unsafeFind(
-        (l: Level.t) => l.id == levelId,
-        "Unable to find level with id: " ++ (levelId ++ "in CoursesStudents__TeamsList"),
-      )
-      |> Level.number
-      |> string_of_int
-      |> str}
-    </div>
-  </span>
-
-let showStudent = (team, levels, teamCoaches) => {
-  let student = TeamInfo.students(team)[0]
-  <Link
-    href={"/students/" ++ ((student |> TeamInfo.studentId) ++ "/report")}
-    key={student |> TeamInfo.studentId}
-    ariaLabel={"student-card-" ++ (student |> TeamInfo.studentId)}
-    className="flex md:flex-row justify-between bg-white mt-4 rounded-lg shadow cursor-pointer hover:border-primary-500 hover:text-primary-500 hover:shadow-md">
-    <div className="flex flex-1 flex-col justify-center md:flex-row md:w-3/5">
-      <div className="flex w-full items-start md:items-center p-3 md:px-4 md:py-5">
-        {CoursesStudents__TeamCoaches.avatar(
-          student |> TeamInfo.studentAvatarUrl,
-          student |> TeamInfo.studentName,
-        )}
-        <div className="ml-2 md:ml-3 block text-sm md:pr-2">
-          <p className="font-semibold inline-block leading-snug">
-            {student |> TeamInfo.studentName |> str}
-          </p>
-          <p className="text-gray-600 font-semibold text-xs mt-px leading-snug">
-            {student |> TeamInfo.studentTitle |> str}
-          </p>
-        </div>
-      </div>
-    </div>
-    <div
-      ariaLabel={"team-level-info-" ++ (team |> TeamInfo.id)}
-      className="w-2/5 flex items-center justify-end md:justify-between p-3 md:p-4">
-      <CoursesStudents__TeamCoaches
-        title={<div className="mb-1"> {"Personal Coaches" |> str} </div>}
-        className="hidden md:inline-block"
-        coaches=teamCoaches
-      />
-      {levelInfo(team |> TeamInfo.levelId, levels)}
-    </div>
-  </Link>
-}
-
-let showTeam = (team, levels, teamCoaches) =>
-  <div
-    key={team |> TeamInfo.id}
-    ariaLabel={"Info of team " ++ (team |> TeamInfo.id)}
-    className="flex shadow bg-white rounded-lg mt-4 overflow-hidden flex-col-reverse md:flex-row">
-    <div className="flex flex-col flex-1 w-full md:w-3/5">
-      {team
-      |> TeamInfo.students
-      |> Array.map(student =>
-        <Link
-          href={"/students/" ++ ((student |> TeamInfo.studentId) ++ "/report")}
-          key={student |> TeamInfo.studentId}
-          ariaLabel={"student-card-" ++ (student |> TeamInfo.studentId)}
-          className="flex items-center bg-white cursor-pointer hover:border-primary-500 hover:text-primary-500 hover:bg-gray-100">
-          <div className="flex w-full md:flex-1 p-3 md:px-4 md:py-5">
-            {CoursesStudents__TeamCoaches.avatar(
-              student |> TeamInfo.studentAvatarUrl,
-              student |> TeamInfo.studentName,
-            )}
-            <div className="ml-2 md:ml-3 text-sm flex flex-col">
-              <p className="font-semibold inline-block leading-snug ">
-                {student |> TeamInfo.studentName |> str}
-              </p>
-              <p className="text-gray-600 font-semibold text-xs mt-px leading-snug ">
-                {student |> TeamInfo.studentTitle |> str}
-              </p>
-            </div>
-          </div>
-        </Link>
-      )
-      |> React.array}
-    </div>
-    <div
-      className="flex w-full md:w-2/5 items-center bg-gray-200 md:bg-white border-l py-2 md:py-0 px-3 md:px-4">
-      <div className="flex-1 pb-3 md:py-3 pr-3">
-        <div>
-          <p className="text-xs inline-block leading-tight"> {"Team" |> str} </p>
-          <h3 className="text-base font-semibold leading-snug"> {team |> TeamInfo.name |> str} </h3>
-          <CoursesStudents__TeamCoaches
-            title={<div className="mb-1"> {"Team Coaches" |> str} </div>}
-            className="hidden md:inline-block mt-3"
-            coaches=teamCoaches
-          />
-        </div>
-      </div>
-      <div ariaLabel={"team-level-info-" ++ (team |> TeamInfo.id)} className="flex-shrink-0">
-        {levelInfo(team |> TeamInfo.levelId, levels)}
-      </div>
-    </div>
-  </div>
-
-@react.component
-let make = (~levels, ~teams, ~teamCoaches) =>
-  <div>
-    {teams |> ArrayUtils.isEmpty
-      ? <div className="course-review__reviewed-empty text-lg font-semibold text-center py-4">
-          <h5 className="py-4 mt-4 bg-gray-200 text-gray-800 font-semibold">
-            {"No teams to show" |> str}
-          </h5>
-        </div>
-      : teams
-        |> Array.map(team => {
-          let coaches = team |> TeamInfo.coaches(teamCoaches)
-
-          Array.length(team |> TeamInfo.students) == 1
-            ? showStudent(team, levels, coaches)
-            : showTeam(team, levels, coaches)
-        })
-        |> React.array}
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Types.res
deleted file mode 100644
index 9774054..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/CoursesStudents__Types.res
+++ /dev/null
@@ -1,9 +0,0 @@
-module Level = CoursesStudents__Level
-module Course = CoursesStudents__Course
-module Coach = UserProxy
-module Teams = CoursesStudents__Teams
-module TeamInfo = CoursesStudents__TeamInfo
-module StudentDetails = CoursesStudents__StudentDetails
-module Submission = CoursesStudents__Submission
-module Submissions = CoursesStudents__Submissions
-module CoachNote = CoursesStudents__CoachNote
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistItem.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistItem.res
deleted file mode 100644
index 2b26118..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistItem.res
+++ /dev/null
@@ -1,141 +0,0 @@
-type file = {
-  id: string,
-  name: string,
-  url: string,
-}
-
-type result =
-  | ShortText(string)
-  | LongText(string)
-  | Link(string)
-  | Files(array<file>)
-  | MultiChoice(string)
-
-type status =
-  | Passed
-  | Failed
-  | NoAnswer
-
-type t = {
-  title: string,
-  result: result,
-  status: status,
-}
-
-let title = t => t.title
-let result = t => t.result
-let status = t => t.status
-let fileName = file => file.name
-let fileUrl = file => file.url
-
-let make = (~title, ~result, ~status) => {title: title, result: result, status: status}
-
-let makeFile = (~name, ~url, ~id) => {name: name, url: url, id: id}
-
-let makeFiles = data =>
-  data |> Js.Array.map(a => makeFile(~url=a["url"], ~name=a["title"], ~id=a["id"]))
-
-let makeResult = (result, kind, files) =>
-  switch kind {
-  | "shortText" => ShortText(result)
-  | "longText" => LongText(result)
-  | "link" => Link(result)
-  | "multiChoice" => MultiChoice(result)
-  | "files" => Files(files)
-  | randomKind =>
-    Rollbar.error(
-      "Unkown kind: " ++ (randomKind ++ "recived in CurriculumEditor__TargetChecklistItem"),
-    )
-    ShortText("Error")
-  }
-
-let makeStatus = data =>
-  switch data {
-  | "noAnswer" => NoAnswer
-  | "passed" => Passed
-  | "failed" => Failed
-  | unkownStatus =>
-    Rollbar.error(
-      "Unkown status:" ++ (unkownStatus ++ "recived in CourseReview__SubmissionChecklist"),
-    )
-    NoAnswer
-  }
-
-let makeArrayFromJs = (files, checklist) =>
-  checklist |> Js.Array.map(c =>
-    make(
-      ~title=c["title"],
-      ~result=makeResult(c["result"], c["kind"], makeFiles(files)),
-      ~status=makeStatus(c["status"]),
-    )
-  )
-
-let decodeFile = json => {
-  open Json.Decode
-  {
-    name: json |> field("name", string),
-    url: json |> field("url", string),
-    id: json |> field("id", string),
-  }
-}
-
-let decode = (files, json) => {
-  open Json.Decode
-  {
-    result: makeResult(json |> field("result", string), json |> field("kind", string), files),
-    status: makeStatus(json |> field("status", string)),
-    title: json |> field("title", string),
-  }
-}
-
-let updateStatus = (checklist, index, status) =>
-  checklist |> Array.mapi((i, t) =>
-    i == index ? make(~title=t.title, ~result=t.result, ~status) : t
-  )
-
-let makeNoAnswer = (index, checklist) => updateStatus(checklist, index, NoAnswer)
-
-let makeFailed = (index, checklist) => updateStatus(checklist, index, Failed)
-
-let makePassed = (index, checklist) => updateStatus(checklist, index, Passed)
-
-let encodeKind = t =>
-  switch t.result {
-  | ShortText(_) => "shortText"
-  | LongText(_) => "longText"
-  | Link(_) => "link"
-  | Files(_) => "files"
-  | MultiChoice(_) => "multiChoice"
-  }
-
-let encodeResult = t =>
-  switch t.result {
-  | ShortText(t)
-  | LongText(t)
-  | Link(t) => t
-  | MultiChoice(_)
-  | Files(_) => "files"
-  }
-
-let encodeStatus = t =>
-  switch t.status {
-  | NoAnswer => "noAnswer"
-  | Passed => "passed"
-  | Failed => "failed"
-  }
-
-let encode = t => {
-  open Json.Encode
-  object_(list{
-    ("title", t.title |> string),
-    ("kind", encodeKind(t) |> string),
-    ("status", encodeStatus(t) |> string),
-    ("result", encodeResult(t) |> string),
-  })
-}
-
-let encodeArray = checklist =>
-  checklist |> {
-    open Json.Encode
-    array(encode)
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistItemShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistItemShow.res
deleted file mode 100644
index 8f9024a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistItemShow.res
+++ /dev/null
@@ -1,170 +0,0 @@
-@@bs.config({jsx: 3})
-
-module ChecklistItem = SubmissionChecklistItem
-
-let str = React.string
-
-let kindIconClasses = result =>
-  switch (result: ChecklistItem.result) {
-  | ShortText(_text) => "if i-short-text-regular md:text-base text-gray-800 if-fw"
-  | LongText(_markdown) => "if i-long-text-regular md:text-base text-gray-800 if-fw"
-  | Link(_link) => "if i-link-regular md:text-base text-gray-800 if-fw"
-  | MultiChoice(_text) => "if i-check-circle-alt-regular md:text-base text-gray-800 if-fw"
-  | Files(_files) => "if i-file-regular md:text-base text-gray-800 if-fw"
-  }
-
-let showFiles = files =>
-  <div className="flex flex-wrap">
-    {files
-    |> Array.map(file =>
-      <a
-        key={"file-" ++ (file |> ChecklistItem.fileUrl)}
-        href={file |> ChecklistItem.fileUrl}
-        target="_blank"
-        className="mt-1 mr-3 flex border overflow-hidden rounded hover:shadow-md border-pink-400 bg-white text-pink-700 hover:border-pink-600 hover:text-pink-700">
-        <span
-          className="course-show-attachments__attachment-title rounded text-xs font-semibold inline-block whitespace-normal truncate w-32 md:w-42 h-full px-3 py-2 leading-loose">
-          {file |> ChecklistItem.fileName |> str}
-        </span>
-        <span className="flex w-10 justify-center items-center p-2 bg-pink-700 text-white">
-          <PfIcon className="if i-download-regular" />
-        </span>
-      </a>
-    )
-    |> React.array}
-  </div>
-
-let showlink = link =>
-  <a
-    href=link
-    target="_blank"
-    className="max-w-fc mt-1 mr-3 flex border overflow-hidden rounded hover:shadow-md border-indigo-400 bg-white text-indigo-700 hover:border-blue-600 hover:text-indigo-800">
-    <span
-      className="course-show-attachments__attachment-title rounded text-xs font-semibold inline-block whitespace-normal truncate w-32 md:w-42 h-full px-3 py-2 leading-loose">
-      {link |> str}
-    </span>
-    <span className="flex w-10 justify-center items-center p-2 bg-indigo-700 text-white">
-      <PfIcon className="if i-external-link-regular" />
-    </span>
-  </a>
-
-let statusIcon = (updateChecklistCB, status) =>
-  switch (updateChecklistCB, (status: ChecklistItem.status)) {
-  | (None, Passed) =>
-    <PfIcon className="if i-check-square-solid text-green-500 text-lg mr-3 -ml-6 mt-1 bg-white" />
-  | (None, Failed) =>
-    <PfIcon className="if i-times-square-solid text-red-500 text-lg mr-3 -ml-6 mt-1 bg-white" />
-  | (_, _) => React.null
-  }
-
-let showStatus = status =>
-  switch (status: ChecklistItem.status) {
-  | Passed =>
-    <div className="bg-green-200 rounded px-1 py-px text-green-800 text-tiny">
-      {"Correct" |> str}
-    </div>
-  | Failed =>
-    <div className="bg-red-200 rounded px-1 py-px text-red-800 text-tiny">
-      {"Incorrect" |> str}
-    </div>
-  | NoAnswer => React.null
-  }
-
-let statusButtonSelectedClasses = (status, currentStatus) =>
-  "inline-flex items-center cursor-pointer leading-tight font-semibold inline-block text-xs relative hover:bg-gray-100 hover:text-gray-700 " ++
-  switch ((currentStatus: ChecklistItem.status), (status: ChecklistItem.status)) {
-  | (
-      Passed,
-      Passed,
-    ) => "bg-green-100 hover:bg-green-100 text-green-800 hover:text-green-800 border-green-500 z-10"
-  | (
-      Failed,
-      Failed,
-    ) => "bg-red-100 hover:bg-red-100 text-red-700 hover:text-red-700 border-red-500 z-10"
-  | (_, _) => "bg-white"
-  }
-
-let statusButtonIcon = bool =>
-  bool
-    ? "if i-times-square-solid text-base if-fw"
-    : "if i-square-regular text-base if-fw text-gray-500"
-
-let statusButtonOnClick = (bool, callback, checklist, index, _event) =>
-  bool
-    ? callback(checklist |> ChecklistItem.makeNoAnswer(index))
-    : callback(checklist |> ChecklistItem.makeFailed(index))
-
-let statusButton = (index, status, callback, checklist) =>
-  <div className="mt-2">
-    <button
-      onClick={statusButtonOnClick(status == ChecklistItem.Failed, callback, checklist, index)}
-      className={"border border-gray-500 rounded " ++
-      statusButtonSelectedClasses(ChecklistItem.Failed, status)}>
-      <span className="w-8 p-2 border-r border-gray-500 flex items-center justify-center">
-        <PfIcon className={statusButtonIcon(status == ChecklistItem.Failed)} />
-      </span>
-      <span className="p-2"> {"Mark as incorrect" |> str} </span>
-    </button>
-  </div>
-
-let computeShowResult = (pending, checklistItem) =>
-  switch (pending, checklistItem |> ChecklistItem.status) {
-  | (true, NoAnswer | Passed | Failed) => true
-  | (false, Failed) => true
-  | (false, NoAnswer | Passed) => false
-  }
-
-let cardClasses = pending => pending ? "mt-3" : "rounded shadow mt-4 "
-
-let cardHeaderClasses = pending =>
-  "text-sm font-semibold flex items-center justify-between " ++ (
-    pending ? "" : "p-4 bg-white rounded cursor-pointer"
-  )
-
-let cardBodyClasses = pending =>
-  "pl-5 md:pl-7 p-3 pb-4 " ++ (pending ? "" : "border-t bg-gray-200 rounded-b")
-
-@react.component
-let make = (~index, ~checklistItem, ~updateChecklistCB, ~checklist, ~pending) => {
-  let (showResult, setShowResult) = React.useState(() => computeShowResult(pending, checklistItem))
-
-  React.useEffect1(() => {
-    let newShowResult = computeShowResult(pending, checklistItem)
-    newShowResult == showResult ? () : setShowResult(_ => newShowResult)
-    None
-  }, [updateChecklistCB])
-  let status = checklistItem |> ChecklistItem.status
-
-  <div
-    className={cardClasses(pending)}
-    ariaLabel={checklistItem |> ChecklistItem.title}
-    onClick={_ => setShowResult(_ => true)}>
-    <div className={cardHeaderClasses(pending)}>
-      <div className="inline-flex items-center">
-        {statusIcon(updateChecklistCB, status)}
-        <PfIcon className={kindIconClasses(checklistItem |> ChecklistItem.result)} />
-        <p className="pl-2 tracking-wide"> {checklistItem |> ChecklistItem.title |> str} </p>
-      </div>
-      <div className="inline-block">
-        {showResult ? showStatus(status) : <button> <i className="fas fa-chevron-down" /> </button>}
-      </div>
-    </div>
-    {showResult
-      ? <div className={cardBodyClasses(pending)}>
-          <div>
-            {switch checklistItem |> ChecklistItem.result {
-            | ShortText(text) => <div> {text |> str} </div>
-            | LongText(markdown) => <MarkdownBlock profile=Markdown.Permissive markdown />
-            | Link(link) => showlink(link)
-            | MultiChoice(text) => <div> {text |> str} </div>
-            | Files(files) => showFiles(files)
-            }}
-          </div>
-          {switch updateChecklistCB {
-          | Some(callback) => statusButton(index, status, callback, checklist)
-          | None => React.null
-          }}
-        </div>
-      : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistShow.res
deleted file mode 100644
index 405b2ea..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/courses/SubmissionChecklistShow.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let str = React.string
-
-@react.component
-let make = (~checklist, ~updateChecklistCB, ~pending) =>
-  <div>
-    {checklist |> ArrayUtils.isEmpty
-      ? <div> {"Target was marked as complete." |> str} </div>
-      : checklist
-        |> Array.mapi((index, checklistItem) =>
-          <SubmissionChecklistItemShow
-            key={index |> string_of_int} index checklistItem updateChecklistCB checklist pending
-          />
-        )
-        |> React.array}
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/home/HomeStyleguide__MarkdownSyntaxHighlightingPreview.res b/jscomp/syntax/tests/idempotency/pupilfirst/home/HomeStyleguide__MarkdownSyntaxHighlightingPreview.res
deleted file mode 100644
index 394d611..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/home/HomeStyleguide__MarkdownSyntaxHighlightingPreview.res
+++ /dev/null
@@ -1,171 +0,0 @@
-let str = React.string
-
-let reasonCode = `
-\`\`\`reason
-/* A sample fizzbuzz implementation. */
-let fizzbuzz = (num) =>
-  switch (num mod 3, num mod 5) {
-  | (0, 0) => "FizzBuzz"
-  | (0, _) => "Fizz"
-  | (_, 0) => "Buzz"
-  | _ => string_of_int(num)
-  };
-
-for (i in 1 to 100) {
-  Js.log(fizzbuzz(i))
-};
-\`\`\``
-
-let rubyCode = `\`\`\`ruby
-# A sample fizzbuzz implementation.
-def fizzbuzz(num)
-  a = String.new
-  a << "Fizz" if num%3 == 0
-  a << "Buzz" if num%5 == 0
-  a << num.to_s if a.empty?
-  a
-end
-
-(1..100).each do |i|
-  puts fizzbuzz(i)
-end
-\`\`\``
-
-let jsCode = `\`\`\`js
-// A sample fizzbuzz implementation.
-const fizzbuzz = (num) => {
-  if (i % (15) === 0){
-    return('fizzbuzz');
-  } else if (i % 3 === 0){
-    return('fizz');
-  } else if (i % 5 === 0){
-    return('buzz');
-  } else {
-    return(i);
-  }
-};
-
-for(var i = 1; i <= 100; i++) {
-  console.log(fizzbuzz(i));
-}
-\`\`\``
-
-let htmlCode = `\`\`\`html
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Fizzbuzz Demo</title>
-  </head>
-
-  <body>
-    <!-- Display for a JS implementation -->
-  </body>
-</html>
-`
-
-let scssCode = `\`\`\`scss
-/* Fizzbuzz with SCSS! */
-
-@import "compass/css3";
-
-ul {
-  list-style-type:none;
-}
-
-li:nth-child(3n), li:nth-child(5n){
-  font-size:0px;
-}
-
-li:nth-child(3n):before{
-  font-size:16px;
-  content:"Fizz";
-}
-
-li:nth-child(5n):after{
-  font-size:16px;
-  content:"Buzz";
-}
-`
-
-let cssCode = `\`\`\`css
-/* Fizzbuzz with CSS! */
-
-.fizz-buzz {
-  counter-reset: fizzbuzz;
-}
-
-.fizz-buzz > div::before {
-  content: counter(fizzbuzz);
-  counter-increment: fizzbuzz;
-}
-
-.fizz-buzz > div:nth-of-type(3n+3)::before {
-  content: "Fizz";
-}
-
-.fizz-buzz > div:nth-of-type(5n+5)::before {
-  content: "Buzz";
-}
-
-.fizz-buzz > div:nth-of-type(3n+3):nth-of-type(5n+5)::before {
-  content: "FizzBuzz";
-}
-`
-
-type language =
-  | ReasonML
-  | Ruby
-  | Javascript
-  | Html
-  | Css
-  | Scss
-
-let renderedMarkdown = language => {
-  let (title, markdown) = switch language {
-  | ReasonML => ("ReasonML", reasonCode)
-  | Ruby => ("Ruby", rubyCode)
-  | Javascript => ("Javascript", jsCode)
-  | Html => ("HTML", htmlCode)
-  | Css => ("CSS", cssCode)
-  | Scss => ("SCSS", scssCode)
-  }
-
-  <div className="mt-4">
-    <p className="text-xs font-semibold"> {title |> str} </p>
-    <MarkdownBlock markdown className="mt-2" profile=Markdown.Permissive />
-  </div>
-}
-
-let handleChange = (setLanguage, event) => {
-  let language = switch ReactEvent.Form.target(event)["value"] {
-  | "reasonml" => ReasonML
-  | "ruby" => Ruby
-  | "javascript" => Javascript
-  | "html" => Html
-  | "css" => Css
-  | "scss" => Scss
-  | _ => ReasonML
-  }
-
-  setLanguage(_ => language)
-}
-
-@react.component
-let make = () => {
-  let (language, setLanguage) = React.useState(() => ReasonML)
-
-  <div>
-    <span> {"Select a language to preview:" |> str} </span>
-    <select className="ml-2" onChange={handleChange(setLanguage)}>
-      <option value="reasonml"> {"ReasonML" |> str} </option>
-      <option value="ruby"> {"Ruby" |> str} </option>
-      <option value="javascript"> {"Javascript" |> str} </option>
-      <option value="html"> {"HTML" |> str} </option>
-      <option value="css"> {"CSS" |> str} </option>
-      <option value="scss"> {"SCSS" |> str} </option>
-    </select>
-    {renderedMarkdown(language)}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__Course.res b/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__Course.res
deleted file mode 100644
index 45559f8..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__Course.res
+++ /dev/null
@@ -1,19 +0,0 @@
-type id = string
-
-type t = {
-  id: id,
-  name: string,
-}
-
-let id = t => t.id
-let name = t => t.name
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-  }
-}
-
-let sort = courses =>
-  courses |> List.sort((c1, c2) => Js.String.localeCompare(c2 |> name, c1 |> name) |> int_of_float)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__CourseDropdown.res b/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__CourseDropdown.res
deleted file mode 100644
index 6b6fc39..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__CourseDropdown.res
+++ /dev/null
@@ -1,51 +0,0 @@
-open SchoolAdminNavbar__Types
-
-let str = React.string
-
-let handleClick = (setShowDropdown, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  setShowDropdown(showDropdown => !showDropdown)
-}
-
-@react.component
-let make = (~courses, ~currentCourseId) => {
-  let (showDropdown, setShowDropdown) = React.useState(() => false)
-  let currentCourse =
-    courses |> ListUtils.unsafeFind(
-      course => course |> Course.id == currentCourseId,
-      "Could not find currentCourse with ID " ++ currentCourseId,
-    )
-
-  <div className="flex-1 flex flex-col bg-transparent mb-3">
-    <div className="inline-block relative border-b border-gray-400 rounded">
-      <button
-        onClick={handleClick(setShowDropdown)}
-        title={currentCourse |> Course.name}
-        className="appearance-none flex items-center justify-between hover:bg-primary-100 hover:text-primary-500 focus:outline-none focus:bg-white focus:text-primary-500 font-semibold relative px-2 py-2 rounded w-full">
-        <span className="w-5/6 flex items-center">
-          <i className="fas fa-book" />
-          <span className="truncate ml-2 text-left"> {currentCourse |> Course.name |> str} </span>
-        </span>
-        <span className="w-1/6 text-right"> <i className="fas fa-chevron-down text-sm" /> </span>
-      </button>
-      {showDropdown
-        ? <div
-            className="bg-white shadow-lg rounded-b-lg border absolute overflow-hidden min-w-full w-auto z-50">
-            {courses
-            |> Course.sort
-            |> List.filter(course => course |> Course.id != (currentCourse |> Course.id))
-            |> List.map(course =>
-              <a
-                className="block px-4 py-3 text-xs font-semibold text-gray-900 border-b border-gray-200 bg-white hover:text-primary-500 hover:bg-gray-200 whitespace-no-wrap"
-                key={course |> Course.id}
-                href={"/school/courses/" ++ ((course |> Course.id) ++ "/curriculum")}>
-                {course |> Course.name |> str}
-              </a>
-            )
-            |> Array.of_list
-            |> React.array}
-          </div>
-        : React.null}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__Root.res b/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__Root.res
deleted file mode 100644
index 419c20e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__Root.res
+++ /dev/null
@@ -1,313 +0,0 @@
-exception UnknownPathEncountered(list<string>)
-
-%raw(`require("./SchoolAdminNavbar__Root.css")`)
-
-open SchoolAdminNavbar__Types
-
-type courseSelection =
-  | Students
-  | CourseCoaches
-  | Curriculum
-  | EvaluationCriteria
-  | CourseExports
-  | Authors
-
-type settingsSelection =
-  | Customization
-  | Admins
-
-type userRole =
-  | SchoolAdmin
-  | CourseAuthor
-
-type selection =
-  | Overview
-  | SchoolCoaches
-  | Settings(settingsSelection)
-  | Courses
-  | SelectedCourse(Course.id, courseSelection)
-  | Communities
-
-let str = React.string
-
-let containerClasses = shrunk => {
-  let defaultClasses = "bg-gradient-primary-600-to-primary-800-to-bottom school-admin-navbar__primary-nav flex flex-col justify-between "
-
-  defaultClasses ++ (shrunk ? "school-admin-navbar__primary-nav--shrunk" : "overflow-y-auto")
-}
-
-let headerclasses = shrunk => {
-  let defaultClasses = "school-admin-navbar__header "
-  defaultClasses ++ (
-    shrunk
-      ? "mx-auto"
-      : "px-5 py-2 relative z-20 border-r border-b border-gray-400 bg-white flex h-16 items-center"
-  )
-}
-
-let imageContainerClasses = shrunk => {
-  let defaultClasses = "school-admin-navbar__school-logo-container flex items-center "
-  defaultClasses ++ (shrunk ? "justify-center w-16 h-16" : "bg-white h-8 w-3/5 rounded")
-}
-
-let bottomLinkClasses = shrunk => {
-  let defaultClasses = "flex text-white text-sm py-4 px-5 hover:bg-primary-900 font-semibold items-center "
-  defaultClasses ++ (shrunk ? "justify-center" : "")
-}
-
-let bottomLink = (path, shrunk, iconClasses, text) => {
-  let title = shrunk ? Some(text) : None
-
-  <li>
-    <a ?title href=path className={bottomLinkClasses(shrunk)}>
-      <i className={iconClasses ++ " fa-fw"} />
-      {shrunk ? React.null : <span className="ml-2"> {text |> str} </span>}
-    </a>
-  </li>
-}
-
-let topLink = (selectedOption, currentOption, path, shrunk, iconClasses, text) => {
-  let defaultClasses = "school-admin-navbar__primary-nav-link py-4 px-5"
-  let classes =
-    defaultClasses ++ (
-      selectedOption == currentOption ? " school-admin-navbar__primary-nav-link--active" : ""
-    )
-  let title = shrunk ? Some(text) : None
-  <a href=path className=classes ?title>
-    <i className={iconClasses ++ " fa-fw text-lg"} />
-    {shrunk ? React.null : <span className="ml-2"> {text |> str} </span>}
-  </a>
-}
-
-let secondaryNavOption = (path, currentSelection, inspectedSelection, text) => {
-  let defaultClasses = "flex text-indigo-800 text-sm py-3 px-4 hover:bg-gray-400 focus:bg-gray-400 font-semibold rounded items-center my-1"
-  let classes = defaultClasses ++ (currentSelection == inspectedSelection ? " bg-gray-400" : "")
-
-  <li key=text> <a href=path className=classes> {text |> str} </a> </li>
-}
-
-let secondaryNav = (courses, userRole, selectedOption) =>
-  switch selectedOption {
-  | Settings(settingsSelection) =>
-    <div
-      key="secondary-nav"
-      className="bg-gray-200 school-admin-navbar__secondary-nav w-full border-r border-gray-400 pb-6 overflow-y-auto">
-      <ul className="p-4">
-        {secondaryNavOption("/school/customize", settingsSelection, Customization, "Customization")}
-        {secondaryNavOption("/school/admins", settingsSelection, Admins, "Admins")}
-      </ul>
-    </div>
-  | SelectedCourse(courseId, courseSelection) =>
-    <div
-      key="secondary-nav"
-      className="bg-gray-200 school-admin-navbar__secondary-nav w-full border-r border-gray-400 pb-6 overflow-y-auto">
-      <ul className="p-4">
-        <li> <SchoolAdminNavbar__CourseDropdown courses currentCourseId=courseId /> </li>
-        {secondaryNavOption(
-          "/school/courses/" ++ (courseId ++ "/curriculum"),
-          courseSelection,
-          Curriculum,
-          "Curriculum",
-        )}
-        {switch userRole {
-        | SchoolAdmin =>
-          [
-            secondaryNavOption(
-              "/school/courses/" ++ (courseId ++ "/students"),
-              courseSelection,
-              Students,
-              "Students",
-            ),
-            secondaryNavOption(
-              "/school/courses/" ++ (courseId ++ "/coaches"),
-              courseSelection,
-              CourseCoaches,
-              "Coaches",
-            ),
-            secondaryNavOption(
-              "/school/courses/" ++ (courseId ++ "/exports"),
-              courseSelection,
-              CourseExports,
-              "Exports",
-            ),
-            secondaryNavOption(
-              "/school/courses/" ++ (courseId ++ "/authors"),
-              courseSelection,
-              Authors,
-              "Authors",
-            ),
-          ] |> React.array
-        | CourseAuthor => React.null
-        }}
-        {secondaryNavOption(
-          "/school/courses/" ++ (courseId ++ "/evaluation_criteria"),
-          courseSelection,
-          EvaluationCriteria,
-          "Evaluation Criteria",
-        )}
-      </ul>
-    </div>
-  | _ => React.null
-  }
-
-@react.component
-let make = (~schoolName, ~schoolLogoPath, ~schoolIconPath, ~courses, ~isCourseAuthor) => {
-  let url = ReasonReactRouter.useUrl()
-
-  let userRole = isCourseAuthor ? CourseAuthor : SchoolAdmin
-
-  let (selectedOption, shrunk) = switch url.path {
-  | list{"school"} => (Overview, false)
-  | list{"school", "coaches"} => (SchoolCoaches, false)
-  | list{"school", "customize"} => (Settings(Customization), true)
-  | list{"school", "courses"} => (Courses, false)
-  | list{"school", "courses", courseId, "students"}
-  | list{"school", "courses", courseId, "inactive_students"} => (
-      SelectedCourse(courseId, Students),
-      true,
-    )
-  | list{"school", "courses", courseId, "coaches"} => (
-      SelectedCourse(courseId, CourseCoaches),
-      true,
-    )
-  | list{"school", "courses", courseId, "curriculum"} => (
-      SelectedCourse(courseId, Curriculum),
-      true,
-    )
-  | list{
-      "school",
-      "courses",
-      courseId,
-      "targets",
-      _targetId,
-      "content" | "versions" | "details",
-    } => (SelectedCourse(courseId, Curriculum), true)
-  | list{"school", "courses", courseId, "exports"} => (
-      SelectedCourse(courseId, CourseExports),
-      true,
-    )
-  | list{"school", "courses", courseId, "authors"} => (SelectedCourse(courseId, Authors), true)
-  | list{"school", "courses", courseId, "authors", _authorId} => (
-      SelectedCourse(courseId, Authors),
-      true,
-    )
-  | list{"school", "courses", courseId, "evaluation_criteria"} => (
-      SelectedCourse(courseId, EvaluationCriteria),
-      true,
-    )
-  | list{"school", "communities"} => (Communities, false)
-  | list{"school", "admins"} => (Settings(Admins), true)
-  | _ =>
-    Rollbar.critical(
-      "Unknown path encountered by SA navbar: " ++
-      (url.path |> Array.of_list |> Js.Array.joinWith("/")),
-    )
-    raise(UnknownPathEncountered(url.path))
-  }
-
-  [
-    <div key="main-nav" className={containerClasses(shrunk)}>
-      <div>
-        <div className={headerclasses(shrunk)}>
-          <div className={imageContainerClasses(shrunk)}>
-            {shrunk
-              ? <div className="p-2 bg-white flex items-center justify-center p-2 m-2 rounded">
-                  {isCourseAuthor
-                    ? <img src=schoolIconPath alt=schoolName />
-                    : <a className="text-xs" href="/school">
-                        <img src=schoolIconPath alt=schoolName />
-                      </a>}
-                </div>
-              : <img className="h-full object-contain" src=schoolLogoPath alt=schoolName />}
-          </div>
-        </div>
-        {/* <div
-             className="flex school-admin-navbar__school-search rounded justify-end w-1/2">
-             <div
-               className="school-admin-navbar__school-search__icon-box flex items-center justify-center border rounded w-16">
-               <i className="fas fa-search" />
-             </div>
-           </div> */
-        switch userRole {
-        | SchoolAdmin =>
-          <ul>
-            <li>
-              {topLink(selectedOption, Overview, "/school", shrunk, "fas fa-eye", "Overview")}
-            </li>
-            <li>
-              {topLink(
-                selectedOption,
-                SchoolCoaches,
-                "/school/coaches",
-                shrunk,
-                "fas fa-chalkboard-teacher",
-                "Coaches",
-              )}
-            </li>
-            <li>
-              {topLink(
-                selectedOption,
-                Settings(Customization),
-                "/school/customize",
-                shrunk,
-                "fas fa-cog",
-                "Settings",
-              )}
-            </li>
-            <li>
-              {topLink(
-                selectedOption,
-                Courses,
-                "/school/courses",
-                shrunk,
-                "fas fa-book",
-                "Courses",
-              )}
-              {shrunk
-                ? React.null
-                : <ul className="pr-4 pb-4 ml-10 mt-1">
-                    {courses
-                    |> List.map(course =>
-                      <li key={course |> Course.id}>
-                        <a
-                          href={"/school/courses/" ++ ((course |> Course.id) ++ "/curriculum")}
-                          className="block text-white py-3 px-4 hover:bg-primary-800 rounded font-semibold text-xs">
-                          {course |> Course.name |> str}
-                        </a>
-                      </li>
-                    )
-                    |> Array.of_list
-                    |> React.array}
-                  </ul>}
-            </li>
-            <li>
-              {topLink(
-                selectedOption,
-                Communities,
-                "/school/communities",
-                shrunk,
-                "fas fa-users",
-                "Communities",
-              )}
-            </li>
-          </ul>
-        | CourseAuthor => React.null
-        }}
-      </div>
-      <ul>
-        {bottomLink("/home", shrunk, "fas fa-home", "Home")}
-        <li>
-          <a
-            title=?{shrunk ? Some("Sign Out") : None}
-            className={bottomLinkClasses(shrunk)}
-            rel="nofollow"
-            href="/users/sign_out">
-            <i className="fas fa-sign-out-alt fa-fw" />
-            {shrunk ? React.null : <span className="ml-2"> {"Sign Out" |> str} </span>}
-          </a>
-        </li>
-      </ul>
-    </div>,
-    selectedOption |> secondaryNav(courses, userRole),
-  ] |> React.array
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__Types.res
deleted file mode 100644
index 4355544..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/SchoolAdminNavbar__Types.res
+++ /dev/null
@@ -1 +0,0 @@
-module Course = SchoolAdminNavbar__Course
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentCourse__Course.res b/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentCourse__Course.res
deleted file mode 100644
index ea97fd1..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentCourse__Course.res
+++ /dev/null
@@ -1,15 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-  }
-}
-
-let id = t => t.id
-let name = t => t.name
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentCourse__Header.res b/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentCourse__Header.res
deleted file mode 100644
index 2137304..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentCourse__Header.res
+++ /dev/null
@@ -1,127 +0,0 @@
-let str = React.string
-%raw(`require("./StudentCourse__Header.css")`)
-%raw(`require("courses/shared/background_patterns.css")`)
-
-module Course = StudentCourse__Course
-
-let courseOptions = courses =>
-  courses
-  |> List.map(course => {
-    let courseId = course |> Course.id
-    <a
-      key={"course-" ++ courseId}
-      href={"/courses/" ++ (courseId ++ "/curriculum")}
-      className="cursor-pointer block p-3 text-xs font-semibold text-gray-900 border-b border-gray-200 bg-white hover:text-primary-500 hover:bg-gray-200 whitespace-no-wrap">
-      <span> {course |> Course.name |> str} </span>
-    </a>
-  })
-  |> Array.of_list
-
-let courseDropdown = (currentCourse, otherCourses) =>
-  <div>
-    {switch otherCourses {
-    | list{} =>
-      <div
-        className="flex max-w-xs md:max-w-xl mx-auto items-center relative justify-between font-semibold relative rounded w-full text-lg md:text-2xl leading-tight text-white">
-        <span className="sm:truncate w-full text-left">
-          {currentCourse |> Course.name |> str}
-        </span>
-      </div>
-    | otherCourses =>
-      let selected =
-        <button
-          className="dropdown__btn max-w-xs md:max-w-lg mx-auto text-white appearance-none flex items-center relative justify-between focus:outline-none font-semibold w-full text-lg md:text-2xl leading-tight">
-          <span className="sm:truncate w-full text-left">
-            {currentCourse |> Course.name |> str}
-          </span>
-          <div
-            className="student-course__dropdown-btn ml-3 hover:bg-primary-100 hover:text-primary-500 flex items-center justify-between px-3 py-2 rounded">
-            <i className="fas fa-chevron-down text-xs font-semibold" />
-          </div>
-        </button>
-
-      <Dropdown
-        selected
-        contents={courseOptions(otherCourses)}
-        className="student-course__dropdown relative mx-auto"
-      />
-    }}
-  </div>
-
-let courseNameContainerClasses = additionalLinks =>
-  "student-course__name-container w-full absolute bottom-0 " ++ (
-    additionalLinks |> ListUtils.isEmpty
-      ? "pt-2 pb-3 md:pt-4 md:pb-6"
-      : "pt-2 pb-3 md:pt-4 md:pb-12"
-  )
-
-let renderCourseSelector = (currentCourseId, courses, coverImage, additionalLinks) => {
-  let currentCourse =
-    courses |> ListUtils.unsafeFind(
-      c => c |> Course.id == currentCourseId,
-      "Could not find current course with ID " ++ (currentCourseId ++ " in StudentCourse__Header"),
-    )
-  let otherCourses = courses |> List.filter(c => c |> Course.id != currentCourseId)
-  <div className="relative bg-primary-900">
-    <div className="relative pb-1/2 md:pb-1/5 2xl:pb-1/6">
-      {switch coverImage {
-      | Some(src) => <img className="absolute h-full w-full object-cover" src />
-      | None =>
-        <div className="student-course__cover-default absolute h-full w-full svg-bg-pattern-1" />
-      }}
-    </div>
-    <div className={courseNameContainerClasses(additionalLinks)}>
-      <div className="student-course__name relative px-4 lg:px-0 flex h-full mx-auto lg:max-w-3xl">
-        {courseDropdown(currentCourse, otherCourses)}
-      </div>
-    </div>
-  </div>
-}
-
-let tabClasses = (url: ReasonReactRouter.url, linkTitle) => {
-  let defaultClasses = "student-course__nav-tab py-4 px-2 text-center flex-1 font-semibold text-sm "
-  switch url.path {
-  | list{"courses", _targetId, pageTitle, ..._} if pageTitle == linkTitle =>
-    defaultClasses ++ "student-course__nav-tab--active"
-  | _ => defaultClasses
-  }
-}
-
-@react.component
-let make = (~currentCourseId, ~courses, ~additionalLinks, ~coverImage) => {
-  let url = ReasonReactRouter.useUrl()
-
-  <div>
-    {renderCourseSelector(currentCourseId, courses, coverImage, additionalLinks)}
-    {switch additionalLinks {
-    | list{} => React.null
-    | additionalLinks =>
-      <div className="md:px-3">
-        <div
-          className="bg-white border-transparent flex justify-between overflow-x-auto md:overflow-hidden lg:max-w-3xl mx-auto shadow md:rounded-lg mt-0 md:-mt-7 z-10 relative">
-          {additionalLinks
-          |> List.append(list{"curriculum"})
-          |> List.map(l => {
-            let (title, suffix) = switch l {
-            | "curriculum" => ("Curriculum", "curriculum")
-            | "calendar" => ("Calendar", "calendar")
-            | "leaderboard" => ("Leaderboard", "leaderboard")
-            | "review" => ("Review", "review")
-            | "students" => ("Students", "students")
-            | _unknown => ("Unknown", "")
-            }
-
-            <a
-              key=title
-              href={"/courses/" ++ (currentCourseId ++ ("/" ++ suffix))}
-              className={tabClasses(url, suffix)}>
-              {title |> str}
-            </a>
-          })
-          |> Array.of_list
-          |> React.array}
-        </div>
-      </div>
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav.res b/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav.res
deleted file mode 100644
index f467bba..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav.res
+++ /dev/null
@@ -1,119 +0,0 @@
-%raw(`require("./StudentTopNav.css")`)
-
-let str = React.string
-
-open StudentTopNav__Types
-
-let headerLink = (key, link) =>
-  <div
-    key
-    className="md:ml-5 text-sm font-semibold text-center cursor-default flex w-1/2 sm:w-1/3 md:w-auto justify-center border-r border-b md:border-0">
-    <a
-      className="no-underline bg-gray-100 md:bg-white text-black hover:text-primary-500 w-full p-4 md:p-2"
-      href={link |> NavLink.url}>
-      {link |> NavLink.title |> str}
-    </a>
-  </div>
-
-let signOutLink = () =>
-  <div
-    key="Logout-button"
-    className="md:ml-6 text-sm font-semibold cursor-default flex w-1/2 sm:w-1/3 md:w-auto justify-center border-r border-b md:border-0">
-    <div className="flex items-center justify-center">
-      <a
-        href="/users/sign_out"
-        rel="nofollow"
-        className="border border-primary-500 rounded px-2 py-1 text-primary-500 text-xs md:text-sm md:leading-normal m-4 md:m-0 no-underline font-semibold text-black">
-        <FaIcon classes="fas fa-power-off" /> <span className="ml-2"> {"Sign Out" |> str} </span>
-      </a>
-    </div>
-  </div>
-
-let signInLink = () =>
-  <div
-    key="SignIn-button"
-    className="md:ml-6 text-sm font-semibold cursor-default flex w-1/2 sm:w-1/3 md:w-auto justify-center border-r border-b md:border-0">
-    <div className="flex items-center justify-center">
-      <a
-        className="border border-primary-500 rounded px-2 py-1 text-primary-500 text-xs md:text-sm md:leading-normal m-4 md:m-0 no-underline font-semibold text-black"
-        href="/users/sign_in">
-        <FaIcon classes="fas fa-power-off" /> <span className="ml-2"> {"Sign In" |> str} </span>
-      </a>
-    </div>
-  </div>
-let isMobile = () => Webapi.Dom.window |> Webapi.Dom.Window.innerWidth < 768
-
-let headerLinks = (links, isLoggedIn) => {
-  let (visibleLinks, dropdownLinks) = switch (links, isMobile()) {
-  | (links, true) => (links, list{})
-  | (list{l1, l2, l3, l4, l5, ...rest}, false) => (list{l1, l2, l3}, list{l4, l5, ...rest})
-  | (fourOrLessLinks, false) => (fourOrLessLinks, list{})
-  }
-
-  switch visibleLinks {
-  | visibleLinks =>
-    (visibleLinks |> List.mapi((index, l) => headerLink(index |> string_of_int, l)))
-    ->List.append(list{<StudentTopNav__DropDown links=dropdownLinks key="more-links" />})
-    ->List.append(list{isLoggedIn ? signOutLink() : signInLink()})
-    |> Array.of_list
-    |> ReasonReact.array
-  }
-}
-
-@react.component
-let make = (~schoolName, ~logoUrl, ~links, ~isLoggedIn) => {
-  let (menuHidden, toggleMenuHidden) = React.useState(() => isMobile())
-
-  React.useEffect(() => {
-    let resizeCB = _ => toggleMenuHidden(_ => isMobile())
-    Webapi.Dom.Window.asEventTarget(Webapi.Dom.window) |> Webapi.Dom.EventTarget.addEventListener(
-      "resize",
-      resizeCB,
-    )
-    None
-  })
-
-  <div className="border-b">
-    <div className="container mx-auto px-3 max-w-5xl">
-      <nav className="flex justify-between items-center h-20">
-        <div className="flex w-full items-center justify-between">
-          <a className="max-w-sm" href="/">
-            {switch logoUrl {
-            | Some(url) =>
-              <img className="h-9 md:h-12 object-contain" src=url alt={"Logo of " ++ schoolName} />
-            | None =>
-              <div
-                className="p-2 rounded-lg bg-white text-gray-900 hover:bg-gray-100 hover:text-primary-600">
-                <span className="text-xl font-bold leading-tight"> {schoolName |> str} </span>
-              </div>
-            }}
-          </a>
-          {isMobile()
-            ? <div onClick={_ => toggleMenuHidden(menuHidden => !menuHidden)}>
-                <div
-                  className={"student-navbar__menu-btn w-8 h-8 text-center relative focus:outline-none rounded-full " ++ (
-                    menuHidden ? "" : "open"
-                  )}>
-                  <span className="student-navbar__menu-icon">
-                    <span className="student-navbar__menu-icon-bar" />
-                  </span>
-                </div>
-              </div>
-            : React.null}
-        </div>
-        {!menuHidden && !isMobile()
-          ? <div
-              className="student-navbar__links-container flex justify-end items-center w-3/5 lg:w-3/4 flex-no-wrap flex-shrink-0">
-              {headerLinks(links, isLoggedIn)}
-            </div>
-          : React.null}
-      </nav>
-    </div>
-    {isMobile() && !menuHidden
-      ? <div
-          className="student-navbar__links-container flex flex-row border-t w-full flex-wrap shadow-lg">
-          {headerLinks(links, isLoggedIn)}
-        </div>
-      : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav__DropDown.res b/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav__DropDown.res
deleted file mode 100644
index 4625ed0..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav__DropDown.res
+++ /dev/null
@@ -1,42 +0,0 @@
-let str = React.string
-
-open StudentTopNav__Types
-
-let handleToggle = (setLinksVisible, _) => setLinksVisible(linksVisible => !linksVisible)
-
-let additionalLinks = (linksVisible, links) =>
-  linksVisible
-    ? <div
-        className="dropdown__list dropdown__list-right bg-white shadow-lg rounded mt-3 border absolute w-40 z-50">
-        {links
-        |> List.mapi((index, link) =>
-          <div key={index |> string_of_int} className="">
-            <a
-              className="cursor-pointer block p-3 text-xs font-semibold text-gray-900 border-b border-gray-200 bg-white hover:text-primary-500 hover:bg-gray-200"
-              href={link |> NavLink.url}>
-              {link |> NavLink.title |> str}
-            </a>
-          </div>
-        )
-        |> Array.of_list
-        |> ReasonReact.array}
-      </div>
-    : ReasonReact.null
-
-@react.component
-let make = (~links) => {
-  let (linksVisible, setLinksVisible) = React.useState(() => false)
-  switch links {
-  | list{} => ReasonReact.null
-  | moreLinks =>
-    <div
-      title="Show more links"
-      className="ml-6 font-semibold text-sm cursor-pointer relative text-black"
-      onClick={handleToggle(setLinksVisible)}
-      key="more-links">
-      <span> {"More" |> str} </span>
-      <i className="fas fa-caret-down ml-1" />
-      {additionalLinks(linksVisible, moreLinks)}
-    </div>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav__NavLink.res b/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav__NavLink.res
deleted file mode 100644
index 021273d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav__NavLink.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type t = {
-  title: string,
-  url: string,
-}
-
-let title = t => t.title
-
-let url = t => t.url
-
-let decode = json => {
-  open Json.Decode
-  {
-    title: json |> field("title", string),
-    url: json |> field("url", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav__Types.res
deleted file mode 100644
index 5d1f315..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/layouts/StudentTopNav__Types.res
+++ /dev/null
@@ -1 +0,0 @@
-module NavLink = StudentTopNav__NavLink
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectDropdown.res b/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectDropdown.res
deleted file mode 100644
index f00df12..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectDropdown.res
+++ /dev/null
@@ -1,177 +0,0 @@
-%raw(`require("./MultiselectDropdown.css")`)
-
-let str = React.string
-
-module DomUtils = {
-  exception RootElementMissing(string)
-
-  open Webapi.Dom
-
-  let focus = id =>
-    (switch document |> Document.getElementById(id) {
-    | Some(el) => el
-    | None => raise(RootElementMissing(id))
-    } |> Element.asHtmlElement)->Belt.Option.map(HtmlElement.focus) |> ignore
-}
-
-module type Selectable = {
-  type t
-  let label: t => option<string>
-  let value: t => string
-  let searchString: t => string
-  let color: t => string
-}
-
-module Make = (Selectable: Selectable) => {
-  let search = (searchString, selections) =>
-    (selections |> Js.Array.filter(selection =>
-      selection
-      |> Selectable.searchString
-      |> String.lowercase_ascii
-      |> Js.String.includes(searchString |> String.lowercase_ascii)
-    ))
-      ->Belt.SortArray.stableSortBy((x, y) =>
-        String.compare(x |> Selectable.value, y |> Selectable.value)
-      )
-
-  let selectionTitle = selection => {
-    let value = selection |> Selectable.value
-    switch selection |> Selectable.label {
-    | Some(label) => "Pick " ++ (label ++ (": " ++ value))
-    | None => "Pick " ++ value
-    }
-  }
-
-  let tagPillClasses = (color, showHover) => {
-    let bgColor200 = "bg-" ++ (color ++ "-200 ")
-    let bgColor300 = "bg-" ++ (color ++ "-300 ")
-    let textColor800 = "text-" ++ (color ++ "-800 ")
-    let textColor900 = "text-" ++ (color ++ "-900 ")
-
-    "rounded text-xs overflow-hidden " ++
-    (bgColor200 ++
-    (textColor800 ++ (
-      showHover ? "px-2 py-px hover:" ++ (bgColor300 ++ ("hover:" ++ textColor900)) : "inline-flex"
-    )))
-  }
-
-  let applyFilter = (selection, onSelect, id, event) => {
-    event |> ReactEvent.Mouse.preventDefault
-
-    onSelect(selection)
-    DomUtils.focus(id)
-  }
-
-  let searchResult = (searchInput, unselected, labelSuffix, id, onSelect) => {
-    // Remove all excess space characters from the user input.
-    let normalizedString =
-      searchInput
-      |> Js.String.trim
-      |> Js.String.replaceByRe(Js.Re.fromStringWithFlags("\\s+", ~flags="g"), " ")
-
-    switch normalizedString {
-    | "" => []
-    | searchString =>
-      let matchingSelections = unselected |> search(searchString)
-
-      matchingSelections |> Array.mapi((index, selection) =>
-        <button
-          key={index |> string_of_int}
-          title={selectionTitle(selection)}
-          className="flex text-xs py-1 items-center w-full hover:bg-gray-200 focus:outline-none focus:bg-gray-200"
-          onClick={applyFilter(selection, onSelect, id)}>
-          {switch selection |> Selectable.label {
-          | Some(label) =>
-            <span className="mr-2 w-1/6 text-right"> {label ++ labelSuffix |> str} </span>
-          | None => React.null
-          }}
-          <span className={tagPillClasses(selection |> Selectable.color, true)}>
-            {selection |> Selectable.value |> str}
-          </span>
-        </button>
-      )
-    }
-  }
-
-  let removeSelection = (onDeselect, selection, event) => {
-    event |> ReactEvent.Mouse.preventDefault
-
-    onDeselect(selection)
-  }
-
-  let showSelected = (onDeselect, labelSuffix, selected) =>
-    selected |> Array.mapi((index, selection) => {
-      let value = selection |> Selectable.value
-      <div key={index |> string_of_int} className="inline-flex py-1 mr-2">
-        <div className={tagPillClasses(selection |> Selectable.color, false)}>
-          <span className="pl-2 py-px">
-            {switch selection |> Selectable.label {
-            | Some(label) => label ++ (labelSuffix ++ value)
-            | None => value
-            } |> str}
-          </span>
-          <button
-            title={"Remove selection: " ++ value}
-            className="ml-1 text-red-700 px-2 py-px focus:outline-none hover:bg-red-400 hover:text-white flex items-center"
-            onClick={removeSelection(onDeselect, selection)}>
-            <PfIcon className="if i-times-light" />
-          </button>
-        </div>
-      </div>
-    })
-
-  @react.component
-  let make = (
-    ~id=?,
-    ~placeholder="Search",
-    ~onChange,
-    ~value,
-    ~unselected,
-    ~selected,
-    ~onSelect,
-    ~onDeselect,
-    ~labelSuffix=": ",
-    ~emptyMessage="No results found",
-  ) => {
-    let (inputId, _setId) = React.useState(() =>
-      switch id {
-      | Some(id) => id
-      | None =>
-        "re-multiselect-" ++
-        ((Js.Date.now() |> Js.Float.toString) ++
-        ("-" ++ (Js.Math.random_int(100000, 999999) |> string_of_int)))
-      }
-    )
-
-    let results = searchResult(value, unselected, labelSuffix, inputId, onSelect)
-    <div className="w-full relative">
-      <div>
-        <div
-          className="flex flex-wrap items-center text-sm bg-white border border-gray-400 rounded w-full py-1 px-3 mt-1 focus:outline-none focus:bg-white focus:border-primary-300">
-          {selected |> showSelected(onDeselect, labelSuffix) |> React.array}
-          <input
-            autoComplete="off"
-            value
-            onChange={e => onChange(ReactEvent.Form.target(e)["value"])}
-            className="flex-grow appearance-none bg-transparent border-none text-gray-700 mr-3 py-1 leading-snug focus:outline-none"
-            id=inputId
-            type_="text"
-            placeholder
-          />
-        </div>
-      </div>
-      <div />
-      {if value |> String.trim != "" {
-        <div
-          className="multiselect-dropdown__search-dropdown w-full absolute border border-gray-400 bg-white mt-1 rounded-lg shadow-lg px-4 py-2 z-50">
-          {switch results {
-          | [] => <div> {emptyMessage |> str} </div>
-          | results => results |> React.array
-          }}
-        </div>
-      } else {
-        React.null
-      }}
-    </div>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectDropdown__Example.res b/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectDropdown__Example.res
deleted file mode 100644
index 053de95..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectDropdown__Example.res
+++ /dev/null
@@ -1,206 +0,0 @@
-let str = React.string
-
-module DetailedExample = {
-  module Selectable = {
-    type rec t =
-      | City(name)
-      | State(name)
-      | Country(name)
-      | Search(string)
-    and name = string
-
-    let label = t => {
-      let labelString = switch t {
-      | City(_) => "City"
-      | State(_) => "State"
-      | Country(_) => "Country"
-      | Search(_) => "Search"
-      }
-      Some(labelString)
-    }
-
-    let value = t =>
-      switch t {
-      | City(name) => name
-      | State(name) => name
-      | Country(name) => name
-      | Search(input) => input
-      }
-
-    let searchString = t =>
-      switch t {
-      | City(name) => "city " ++ name
-      | State(name) => "state" ++ name
-      | Country(name) => "country" ++ name
-      | Search(input) => input
-      }
-
-    let color = t =>
-      switch t {
-      | City(_) => "orange"
-      | State(_) => "green"
-      | Country(_) => "blue"
-      | Search(_) => "purple"
-      }
-
-    let makeCity = name => City(name)
-    let makeState = name => State(name)
-    let makeCountry = name => Country(name)
-    let makeSearch = input => Search(input)
-  }
-
-  module Multiselect = MultiselectDropdown.Make(Selectable)
-
-  type state = {
-    searchInput: string,
-    selected: array<Selectable.t>,
-  }
-
-  let unselected = searchInput => {
-    let citySuggestions =
-      [
-        "Chicago",
-        "San Francisco",
-        "Los Angeles",
-        "Busan",
-        "Jerusalem",
-        "Bangalore",
-        "Cochin",
-        "Chennai",
-      ] |> Array.map(t => Selectable.makeCity(t))
-
-    let stateSuggestions =
-      [
-        "Washington",
-        "California",
-        "Mississippi",
-        "Kuala Lumpur",
-        "Kerala",
-        "Karnataka",
-        "Tamil Nadu",
-      ] |> Array.map(l => Selectable.makeState(l))
-
-    let countrySuggestions =
-      ["India", "USA", "Canada", "China", "Japan", "Egypt", "Korea"] |> Array.map(l =>
-        Selectable.makeCountry(l)
-      )
-
-    let searchSuggestion =
-      searchInput |> Js.String.trim == "" ? [] : [Selectable.makeSearch(searchInput)]
-
-    searchSuggestion
-    |> Array.append(citySuggestions)
-    |> Array.append(stateSuggestions)
-    |> Array.append(countrySuggestions)
-  }
-
-  let select = (setState, selectable) =>
-    setState(s => {
-      searchInput: "",
-      selected: [selectable] |> Array.append(s.selected),
-    })
-
-  let deselect = (selected, setState, selectable) => {
-    let newSelected = selected |> Js.Array.filter(s => s != selectable)
-    setState(_ => {searchInput: "", selected: newSelected})
-  }
-
-  let updateSearchInput = (setState, searchInput) => setState(s => {...s, searchInput: searchInput})
-
-  @react.component
-  let make = () => {
-    let (state, setState) = React.useState(() => {searchInput: "", selected: []})
-    <div className="mt-4">
-      <h2 className="text-xl font-semibold"> {"Detailed Example" |> str} </h2>
-      <div className="mt-4">
-        <label
-          className="block text-xs font-semibold"
-          htmlFor="MultiselectDropdown__search-input-detailed-example">
-          {"Filter by:" |> str}
-        </label>
-      </div>
-      <Multiselect
-        unselected={unselected(state.searchInput)}
-        selected=state.selected
-        onSelect={select(setState)}
-        onDeselect={deselect(state.selected, setState)}
-        value=state.searchInput
-        onChange={updateSearchInput(setState)}
-        placeholder="Type city, state or country"
-      />
-    </div>
-  }
-}
-
-module MinimalExample = {
-  module Selectable = {
-    type rec t =
-      | City(pincode, name)
-      | Country(countryCode, name)
-    and pincode = string
-    and countryCode = string
-    and name = string
-
-    let label = _t => None
-
-    let value = t =>
-      switch t {
-      | City(_pincode, name) => name
-      | Country(_countryCode, name) => name
-      }
-
-    let searchString = t => t |> value
-    let color = _t => "gray"
-
-    let makeCountry = (~name, ~countryCode) => Country(countryCode, name)
-    let makeCity = (~name, ~pincode) => City(pincode, name)
-  }
-
-  // create a Multiselect
-  module Multiselect = MultiselectDropdown.Make(Selectable)
-
-  type state = {
-    selected: array<Selectable.t>,
-    searchString: string,
-  }
-
-  let unselected = [
-    Selectable.makeCity(~name="Delhi", ~pincode=""),
-    Selectable.makeCountry(~name="India", ~countryCode="91"),
-    Selectable.makeCity(~name="Washington D.C", ~pincode=""),
-    Selectable.makeCountry(~name="USA", ~countryCode="1"),
-  ]
-
-  let deselect = (selected, setState, selectable) => {
-    let newSelected = selected |> Js.Array.filter(s => s != selectable)
-    setState(_ => {searchString: "", selected: newSelected})
-  }
-
-  @react.component
-  let make = () => {
-    let (state, setState) = React.useState(() => {searchString: "", selected: []})
-    <div className="mt-4">
-      <h2 className="text-xl font-semibold"> {"Minimal Example" |> str} </h2>
-      <div className="mt-4">
-        <label className="block text-xs font-semibold" htmlFor="MultiselectDropdown__search-input">
-          {"Filter by:" |> str}
-        </label>
-      </div>
-      <Multiselect
-        unselected
-        selected=state.selected
-        onSelect={selectable =>
-          setState(s => {
-            searchString: "",
-            selected: [selectable] |> Array.append(s.selected),
-          })}
-        onDeselect={deselect(state.selected, setState)}
-        value=state.searchString
-        onChange={searchString => setState(s => {...s, searchString: searchString})}
-      />
-    </div>
-  }
-}
-
-ReactDOMRe.renderToElementWithId(<DetailedExample />, "DetailedExample")
-ReactDOMRe.renderToElementWithId(<MinimalExample />, "MinimalExample")
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectInline.res b/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectInline.res
deleted file mode 100644
index 38038b5..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectInline.res
+++ /dev/null
@@ -1,153 +0,0 @@
-%raw(`require("./MultiselectInline.css")`)
-
-let str = React.string
-
-module type Selectable = {
-  type t
-  let value: t => string
-  let searchString: t => string
-}
-
-module Make = (Selectable: Selectable) => {
-  let search = (searchString, selections) =>
-    (selections |> Js.Array.filter(selection =>
-      selection
-      |> Selectable.searchString
-      |> String.lowercase_ascii
-      |> Js.String.includes(searchString |> String.lowercase_ascii)
-    ))
-      ->Belt.SortArray.stableSortBy((x, y) =>
-        String.compare(x |> Selectable.value, y |> Selectable.value)
-      )
-
-  let searchUnselected = (searchInput, unselectedData) => {
-    let normalizedString =
-      searchInput
-      |> Js.String.trim
-      |> Js.String.replaceByRe(Js.Re.fromStringWithFlags("\\s+", ~flags="g"), " ")
-    switch normalizedString {
-    | "" => unselectedData
-    | searchString => unselectedData |> search(searchString)
-    }
-  }
-
-  let borderColor = colorForSelected => "border border-" ++ (colorForSelected ++ "-500")
-
-  let selectedItemClasses = colorForSelected =>
-    "bg-" ++ (colorForSelected ++ ("-200 " ++ borderColor(colorForSelected)))
-
-  let searchVisible = (unselected, value) => value != "" || unselected |> Array.length > 3
-
-  @react.component
-  let make = (
-    ~id=?,
-    ~placeholder="Search",
-    ~onChange,
-    ~value,
-    ~unselected,
-    ~selected,
-    ~onSelect,
-    ~onDeselect,
-    ~emptySelectionMessage="No items selected",
-    ~allItemsSelectedMessage="You have selected all items!",
-    ~colorForSelected="orange",
-  ) => {
-    let (inputId, _setId) = React.useState(() =>
-      switch id {
-      | Some(id) => id
-      | None =>
-        "re-multiselect-" ++
-        ((Js.Date.now() |> Js.Float.toString) ++
-        ("-" ++ (Js.Math.random_int(100000, 999999) |> string_of_int)))
-      }
-    )
-
-    let searchResults = searchUnselected(value, unselected)
-    let showSearchForm = searchVisible(unselected, value)
-
-    <div className="p-6 border rounded bg-gray-100">
-      <div>
-        {selected |> Array.length > 0
-          ? selected
-            |> Array.mapi((index, selected) =>
-              <span
-                key={index |> string_of_int}
-                className="inline-flex font-semibold text-xs rounded mb-2 mr-2">
-                <span
-                  className={"px-2 py-1 flex-1 rounded-l " ++
-                  selectedItemClasses(colorForSelected)}>
-                  {selected |> Selectable.value |> str}
-                </span>
-                <button
-                  className={"inline-flex flex-shrink-0 px-2 py-1 text-sm border-l-0 rounded-r items-center text-gray-800 hover:bg-gray-200 hover:text-gray-900 focus:outline-none " ++
-                  borderColor(colorForSelected)}
-                  title="Remove"
-                  onClick={event => {
-                    ReactEvent.Mouse.preventDefault(event)
-
-                    onDeselect(selected)
-                  }}>
-                  <PfIcon className="if i-times-light" />
-                </button>
-              </span>
-            )
-            |> React.array
-          : <div
-              className="flex flex-col items-center justify-center bg-gray-100 text-gray-800 rounded px-3 pt-3 ">
-              <i className="fas fa-inbox text-3xl" />
-              <h5 className="mt-1 font-semibold"> {emptySelectionMessage |> str} </h5>
-            </div>}
-        <div className="text-xs font-semibold mt-2">
-          {(
-            unselected |> Array.length > 0
-              ? "Add more from the list below:"
-              : allItemsSelectedMessage
-          ) |> str}
-        </div>
-      </div>
-      {unselected |> Array.length > 0
-        ? <div className="flex relative pt-3">
-            <div
-              className={"text-sm bg-white rounded shadow w-full" ++ (
-                showSearchForm ? " pb-2" : ""
-              )}>
-              {showSearchForm
-                ? <div className="px-3 pt-3 pb-2">
-                    <input
-                      id=inputId
-                      className="appearance-none bg-transparent border-b w-full text-gray-700 pb-3 px-2 pl-0 leading-normal focus:outline-none"
-                      type_="text"
-                      value
-                      placeholder
-                      onChange={event => onChange(ReactEvent.Form.target(event)["value"])}
-                    />
-                  </div>
-                : React.null}
-              <div className={showSearchForm ? "multiselect-inline__list overflow-y-scroll" : ""}>
-                {searchResults
-                |> Array.mapi((index, item) =>
-                  <div
-                    key={index |> string_of_int}
-                    onClick={_event => {
-                      ReactEvent.Mouse.preventDefault(_event)
-                      onSelect(item)
-                    }}
-                    title={"Select " ++ (item |> Selectable.value)}
-                    className="flex multiselect-inline__list-item  items-center px-3 py-2 font-semibold hover:bg-primary-100 hover:text-primary-500 cursor-pointer">
-                    <i
-                      className="far fa-square multiselect-inline__list-item-select-icon-unselected text-gray-400 text-xl"
-                    />
-                    <i
-                      className="far fa-plus-square multiselect-inline__list-item-select-icon-selected text-xl"
-                    />
-                    <span className="ml-2"> {item |> Selectable.value |> str} </span>
-                  </div>
-                )
-                |> React.array}
-              </div>
-            </div>
-          </div>
-        : React.null}
-    </div>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectInline__Example.res b/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectInline__Example.res
deleted file mode 100644
index 88cd874..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packages/MultiselectInline__Example.res
+++ /dev/null
@@ -1,81 +0,0 @@
-let str = React.string
-
-module Example = {
-  module Selectable = {
-    type rec t = Sport(name)
-    and name = string
-
-    let value = t =>
-      switch t {
-      | Sport(name) => name
-      }
-
-    let searchString = value
-
-    let makeSport = name => Sport(name)
-  }
-
-  module MultiSelect = MultiselectInline.Make(Selectable)
-
-  type state = {
-    searchInput: string,
-    selected: array<Selectable.t>,
-  }
-
-  let unselected = selected => {
-    let searchCollection =
-      [
-        "Badminton",
-        "Tennis",
-        "Baseball",
-        "Swimming",
-        "Volleyball",
-        "Football",
-        "Formula 1",
-        "Squash",
-        "Boxing",
-      ] |> Array.map(sportName => Selectable.makeSport(sportName))
-    searchCollection |> Js.Array.filter(sport => !(selected |> Array.mem(sport)))
-  }
-
-  let setSportSearch = (setState, value) => setState(state => {...state, searchInput: value})
-
-  let select = (setState, state, sport) => {
-    let selected = state.selected |> Js.Array.concat([sport])
-    setState(_state => {searchInput: "", selected: selected})
-  }
-
-  let deSelect = (setState, state, sport) => {
-    let selected =
-      state.selected |> Js.Array.filter(selected =>
-        Selectable.value(sport) != Selectable.value(selected)
-      )
-    setState(_state => {searchInput: "", selected: selected})
-  }
-
-  @react.component
-  let make = () => {
-    let (state, setState) = React.useState(() => {searchInput: "", selected: []})
-    <div className="mt-4">
-      <h2 className="text-xl font-semibold"> {"Example" |> str} </h2>
-      <div className="mt-4">
-        <label
-          className="block text-xs font-semibold" htmlFor="MultiselectInline__search-input-example">
-          {"Select your sports:" |> str}
-        </label>
-      </div>
-      <MultiSelect
-        placeholder="Search sport"
-        emptySelectionMessage="No sport selected"
-        allItemsSelectedMessage="You have selected all sports!"
-        selected=state.selected
-        unselected={unselected(state.selected)}
-        onChange={setSportSearch(setState)}
-        value=state.searchInput
-        onSelect={select(setState, state)}
-        onDeselect={deSelect(setState, state)}
-      />
-    </div>
-  }
-}
-ReactDOMRe.renderToElementWithId(<Example />, "Example")
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packages/PfIcon.res b/jscomp/syntax/tests/idempotency/pupilfirst/packages/PfIcon.res
deleted file mode 100644
index 0e2a998..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packages/PfIcon.res
+++ /dev/null
@@ -1,11 +0,0 @@
-@module("./iconFirst")
-external transformIcons: unit => unit = "transformIcons"
-
-@react.component
-let make = (~className) => {
-  React.useEffect1(() => {
-    transformIcons()
-    None
-  }, [className])
-  <span className="inline-flex" key=className> <i className /> </span>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packages/PfIcon__Example.res b/jscomp/syntax/tests/idempotency/pupilfirst/packages/PfIcon__Example.res
deleted file mode 100644
index 4a9f465..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packages/PfIcon__Example.res
+++ /dev/null
@@ -1,155 +0,0 @@
-%raw(`require("./PfIcon__Example.css")`)
-
-let str = React.string
-
-let copyAndSort = (f, t) => {
-  let cp = t |> Array.copy
-  cp |> Array.sort(f)
-  cp
-}
-
-module Example = {
-  let icons = [
-    "plus-circle-solid",
-    "plus-circle-regular",
-    "plus-circle-light",
-    "lamp-solid",
-    "check-light",
-    "times-light",
-    "badge-check-solid",
-    "badge-check-regular",
-    "badge-check-light",
-    "writing-pad-solid",
-    "eye-solid",
-    "users-solid",
-    "users-regular",
-    "users-light",
-    "ellipsis-h-solid",
-    "ellipsis-h-regular",
-    "ellipsis-h-light",
-    "check-square-alt-solid",
-    "check-square-alt-regular",
-    "check-square-alt-light",
-    "check-square-solid",
-    "check-square-regular",
-    "check-square-light",
-    "comment-alt-solid",
-    "comment-alt-regular",
-    "comment-alt-light",
-    "tachometer-solid",
-    "tachometer-regular",
-    "tachometer-light",
-    "user-check-solid",
-    "user-check-regular",
-    "user-check-light",
-    "users-check-solid",
-    "users-check-regular",
-    "users-check-light",
-    "sort-alpha-down-solid",
-    "sort-alpha-down-regular",
-    "sort-alpha-down-light",
-    "clock-solid",
-    "clock-regular",
-    "clock-light",
-    "scroll-solid",
-    "scroll-regular",
-    "scroll-light",
-    "book-open-solid",
-    "book-open-regular",
-    "book-open-light",
-    "long-text-solid",
-    "long-text-regular",
-    "long-text-light",
-    "short-text-solid",
-    "short-text-regular",
-    "short-text-light",
-    "check-circle-alt-solid",
-    "check-circle-alt-regular",
-    "check-circle-alt-light",
-    "file-solid",
-    "file-regular",
-    "file-light",
-    "link-solid",
-    "link-regular",
-    "link-light",
-    "download-solid",
-    "download-regular",
-    "download-light",
-    "external-link-solid",
-    "external-link-regular",
-    "external-link-light",
-    "upload-solid",
-    "upload-regular",
-    "upload-light",
-    "question-circle-solid",
-    "question-circle-regular",
-    "question-circle-light",
-    "question-square-solid",
-    "question-square-regular",
-    "question-square-light",
-  ]
-
-  let search = searchString => {
-    let normalizedString =
-      searchString
-      |> Js.String.trim
-      |> Js.String.replaceByRe(Js.Re.fromStringWithFlags("\\s+", ~flags="g"), " ")
-
-    switch normalizedString {
-    | "" => icons
-    | searchString =>
-      icons
-      |> Js.Array.filter(icon => icon |> String.lowercase_ascii |> Js.String.includes(searchString))
-      |> copyAndSort(String.compare)
-    }
-  }
-
-  let onChange = (setSearchString, event) => {
-    let searchString = ReactEvent.Form.target(event)["value"]
-    setSearchString(_ => searchString)
-  }
-
-  @react.component
-  let make = () => {
-    let (searchString, setSearchString) = React.useState(() => "")
-    <div className="max-w-5xl mx-auto">
-      <h1 className="text-center text-2xl font-bold pt-4"> {"pf-icon" |> str} </h1>
-      <div>
-        <div className="mt-4">
-          <input
-            autoComplete="off"
-            value=searchString
-            onChange={onChange(setSearchString)}
-            type_="text"
-            placeholder="Search"
-            className="mx-2 text-sm bg-white border border-gray-400 rounded py-2 px-3 mt-1 focus:outline-none focus:bg-white focus:border-primary-300 appearance-none text-gray-700 focus:outline-none md:w-2/5"
-          />
-        </div>
-        <div className="mx-2 mt-4 flex md:flex-row flex-col flex-wrap bg-white border rounded p-2">
-          {switch search(searchString) {
-          | [] => <div className="p-4 text-sm text-center w-full"> {"Icon not found" |> str} </div>
-          | resultIcons =>
-            resultIcons
-            |> Array.map(icon => {
-              let iconClasses = "if i-" ++ icon
-              <div key=icon className="flex items-center mt-4 md:w-1/2 w-full px-2 my-2">
-                <PfIcon className={iconClasses ++ " if-fw text-2xl"} />
-                <div className="ml-4 overflow-x-auto">
-                  <div className="font-semibold text-xl"> {icon |> str} </div>
-                  <div className="overflow-x-auto">
-                    <code
-                      className="inline-block text-gray-900 text-xs bg-red-100 p-1 mt-px whitespace-no-wrap">
-                      {"<PfIcon className=\"" ++ (iconClasses ++ " if-fw\" />") |> str}
-                    </code>
-                  </div>
-                </div>
-              </div>
-            })
-            |> React.array
-          }}
-        </div>
-      </div>
-    </div>
-  }
-}
-ReactDOMRe.renderToElementWithId(<Example />, "root")
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/ConvertMarkdownPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/ConvertMarkdownPack.res
deleted file mode 100644
index ca192b3..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/ConvertMarkdownPack.res
+++ /dev/null
@@ -1,51 +0,0 @@
-exception RootAttributeMissing(string)
-exception InvalidProfile(string)
-
-open Webapi.Dom
-
-type props = {
-  markdown: string,
-  profile: string,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    markdown: json |> field("markdown", string),
-    profile: json |> field("profile", string),
-  }
-}
-
-let parseElement = (element, attribute) =>
-  switch element |> Element.getAttribute(attribute) {
-  | Some(props) => props
-  | None => raise(RootAttributeMissing(attribute))
-  }
-  |> Json.parseOrRaise
-  |> decodeProps
-
-let profileType = profile =>
-  switch profile {
-  | "comment" => Markdown.Comment
-  | "questionAndAnswer" => Markdown.QuestionAndAnswer
-  | "permissive" => Markdown.Permissive
-  | "areaOfText" => Markdown.AreaOfText
-  | profile => raise(InvalidProfile(profile))
-  }
-
-let parseMarkdown = (~attributeName="convert-markdown", ~attribute="data-json-props", ()) =>
-  document
-  |> Document.getElementsByClassName(attributeName)
-  |> HtmlCollection.toArray
-  |> Array.map(element => {
-    let props = parseElement(element, attribute)
-    element |> ReactDOMRe.render(
-      <MarkdownBlock
-        markdown=props.markdown
-        className="leading-normal text-sm"
-        profile={profileType(props.profile)}
-      />,
-    )
-  })
-
-parseMarkdown()
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesApplyPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesApplyPack.res
deleted file mode 100644
index 9d73d1d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesApplyPack.res
+++ /dev/null
@@ -1,37 +0,0 @@
-type props = {
-  courseName: string,
-  courseId: string,
-  thumbnailUrl: option<string>,
-  email: option<string>,
-  name: option<string>,
-  privacyPolicy: bool,
-  termsOfUse: bool,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    courseName: json |> field("courseName", string),
-    courseId: json |> field("courseId", string),
-    thumbnailUrl: json |> field("thumbnailUrl", optional(string)),
-    email: json |> field("email", optional(string)),
-    name: json |> field("name", optional(string)),
-    privacyPolicy: json |> field("privacyPolicy", bool),
-    termsOfUse: json |> field("termsOfUse", bool),
-  }
-}
-
-let props = DomUtils.parseJsonTag() |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <CoursesApply__Root
-    courseName=props.courseName
-    courseId=props.courseId
-    thumbnailUrl=props.thumbnailUrl
-    email=props.email
-    name=props.name
-    privacyPolicy=props.privacyPolicy
-    termsOfUse=props.termsOfUse
-  />,
-  "react-root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesCurriculumPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesCurriculumPack.res
deleted file mode 100644
index e98918d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesCurriculumPack.res
+++ /dev/null
@@ -1,50 +0,0 @@
-open CoursesCurriculum__Types
-
-let decodeProps = json => {
-  open Json.Decode
-  (
-    json |> field("course", Course.decode),
-    json |> field("levels", list(Level.decode)),
-    json |> field("targetGroups", list(TargetGroup.decode)),
-    json |> field("targets", list(Target.decode)),
-    json |> field("submissions", list(LatestSubmission.decode)),
-    json |> field("team", Team.decode),
-    json |> field("coaches", list(Coach.decode)),
-    json |> field("users", list(User.decode)),
-    json |> field("evaluationCriteria", list(EvaluationCriterion.decode)),
-    json |> field("preview", bool),
-    json |> field("accessLockedLevels", bool),
-  )
-}
-
-let (
-  course,
-  levels,
-  targetGroups,
-  targets,
-  submissions,
-  team,
-  coaches,
-  users,
-  evaluationCriteria,
-  preview,
-  accessLockedLevels,
-) =
-  DomUtils.parseJsonTag() |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <CoursesCurriculum
-    course
-    levels
-    targetGroups
-    targets
-    submissions
-    team
-    coaches
-    users
-    evaluationCriteria
-    preview
-    accessLockedLevels
-  />,
-  "react-root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesReviewPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesReviewPack.res
deleted file mode 100644
index b03786d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesReviewPack.res
+++ /dev/null
@@ -1,18 +0,0 @@
-open CoursesReview__Types
-
-let decodeProps = json => {
-  open Json.Decode
-  (
-    json |> field("levels", array(Level.decode)),
-    json |> field("courseId", string),
-    json |> field("teamCoaches", array(Coach.decode)),
-    json |> field("currentCoach", Coach.decode),
-  )
-}
-
-let (levels, courseId, teamCoaches, currentCoach) = DomUtils.parseJsonAttribute() |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <CoursesReview__Root levels courseId teamCoaches currentCoach />,
-  "react-root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesStudentsPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesStudentsPack.res
deleted file mode 100644
index f443b6b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/CoursesStudentsPack.res
+++ /dev/null
@@ -1,20 +0,0 @@
-open CoursesStudents__Types
-
-let decodeProps = json => {
-  open Json.Decode
-  (
-    json |> field("levels", array(Level.decode)),
-    json |> field("course", Course.decode),
-    json |> field("userId", string),
-    json |> field("teamCoaches", array(Coach.decode)),
-    json |> field("currentCoach", Coach.decode),
-  )
-}
-
-let (levels, course, userId, teamCoaches, currentCoach) =
-  DomUtils.parseJsonTag(~id="school-course-students__props", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <CoursesStudents__Root levels course userId teamCoaches currentCoach />,
-  "react-root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/HomeStyleguidePack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/HomeStyleguidePack.res
deleted file mode 100644
index 117bbe5..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/HomeStyleguidePack.res
+++ /dev/null
@@ -1,15 +0,0 @@
-ReactDOMRe.renderToElementWithId(
-  <HomeStyleguide__MarkdownSyntaxHighlightingPreview />,
-  "styleguide__markdown-syntax-highlighting-root",
-)
-
-let stringRepeat = (n, s) => s |> Array.make(n) |> Array.to_list |> String.concat("")
-
-ReactDOMRe.renderToElementWithId(
-  <DisablingCover disabled=true message="This element is disabled, and this is a custom message.">
-    <div className="m-2 p-2 border-2 border-red-500">
-      {"This is the element being disabled. " |> stringRepeat(10) |> React.string}
-    </div>
-  </DisablingCover>,
-  "styleguide__disabling-cover-root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/QuestionsEditorPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/QuestionsEditorPack.res
deleted file mode 100644
index 9f5e1cd..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/QuestionsEditorPack.res
+++ /dev/null
@@ -1,26 +0,0 @@
-open QuestionsShow__Types
-
-type props = {
-  communityId: string,
-  target: option<LinkedTarget.t>,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    communityId: json |> field("communityId", string),
-    target: json |> field("target", nullable(LinkedTarget.decode)) |> Js.Null.toOption,
-  }
-}
-
-let props =
-  DomUtils.parseJsonAttribute(
-    ~id="questions-editor",
-    ~attribute="data-json-props",
-    (),
-  ) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <QuestionsShow__QuestionEditor communityId=props.communityId target=props.target />,
-  "questions-editor",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/QuestionsShowPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/QuestionsShowPack.res
deleted file mode 100644
index 519063b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/QuestionsShowPack.res
+++ /dev/null
@@ -1,48 +0,0 @@
-open QuestionsShow__Types
-
-type props = {
-  question: Question.t,
-  answers: list<Answer.t>,
-  comments: list<Comment.t>,
-  users: list<User.t>,
-  likes: list<Like.t>,
-  currentUserId: string,
-  communityPath: string,
-  isCoach: bool,
-  communityId: string,
-  target: option<Target.t>,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    question: json |> field("questions", Question.decode),
-    answers: json |> field("answers", list(Answer.decode)),
-    comments: json |> field("comments", list(Comment.decode)),
-    users: json |> field("users", list(User.decode)),
-    likes: json |> field("likes", list(Like.decode)),
-    currentUserId: json |> field("currentUserId", string),
-    communityPath: json |> field("communityPath", string),
-    isCoach: json |> field("isCoach", bool),
-    communityId: json |> field("communityId", string),
-    target: json |> field("target", nullable(Target.decode)) |> Js.Null.toOption,
-  }
-}
-
-let props = DomUtils.parseJsonAttribute() |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <QuestionsShow
-    question=props.question
-    answers=props.answers
-    comments=props.comments
-    users=props.users
-    likes=props.likes
-    currentUserId=props.currentUserId
-    communityPath=props.communityPath
-    isCoach=props.isCoach
-    communityId=props.communityId
-    target=props.target
-  />,
-  "react-root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolAdminsPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolAdminsPack.res
deleted file mode 100644
index e3a8509..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolAdminsPack.res
+++ /dev/null
@@ -1,19 +0,0 @@
-type props = {
-  currentSchoolAdminId: string,
-  admins: array<SchoolAdmin.t>,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    currentSchoolAdminId: json |> field("currentSchoolAdminId", string),
-    admins: json |> field("admins", array(SchoolAdmin.decode)),
-  }
-}
-
-let props = DomUtils.parseJsonTag(~id="school-admins-data", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <SchoolAdmins__Editor currentSchoolAdminId=props.currentSchoolAdminId admins=props.admins />,
-  "school-admins",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolCommunitiesPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolCommunitiesPack.res
deleted file mode 100644
index c9395df..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolCommunitiesPack.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type props = {
-  communities: list<SchoolCommunities__Community.t>,
-  courses: list<SchoolCommunities__Course.t>,
-  connections: list<SchoolCommunities__Connection.t>,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    communities: json |> field("communities", list(SchoolCommunities__Community.decode)),
-    courses: json |> field("courses", list(SchoolCommunities__Course.decode)),
-    connections: json |> field("connections", list(SchoolCommunities__Connection.decode)),
-  }
-}
-
-let props =
-  DomUtils.parseJsonAttribute(
-    ~id="school-communities",
-    ~attribute="data-json-props",
-    (),
-  ) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <SchoolCommunities__Index
-    communities=props.communities courses=props.courses connections=props.connections
-  />,
-  "school-communities",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolLayoutPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolLayoutPack.res
deleted file mode 100644
index 49e040b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolLayoutPack.res
+++ /dev/null
@@ -1,18 +0,0 @@
-let decodeProps = json => {
-  open Json.Decode
-  (
-    json |> field("schoolName", string),
-    json |> field("schoolLogoPath", string),
-    json |> field("schoolIconPath", string),
-    json |> field("courses", list(SchoolAdminNavbar__Course.decode)),
-    json |> field("isCourseAuthor", bool),
-  )
-}
-
-let (schoolName, schoolLogoPath, schoolIconPath, courses, isCourseAuthor) =
-  DomUtils.parseJsonAttribute(~id="school-admin-navbar__root", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <SchoolAdminNavbar__Root schoolName schoolLogoPath schoolIconPath courses isCourseAuthor />,
-  "school-admin-navbar__root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoachesCourseIndexPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoachesCourseIndexPack.res
deleted file mode 100644
index 9f6be34..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoachesCourseIndexPack.res
+++ /dev/null
@@ -1,30 +0,0 @@
-open CourseCoaches__Types
-
-type props = {
-  courseCoaches: array<CourseCoach.t>,
-  schoolCoaches: array<SchoolCoach.t>,
-  authenticityToken: string,
-  courseId: string,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    courseCoaches: json |> field("courseCoaches", array(CourseCoach.decode)),
-    schoolCoaches: json |> field("schoolCoaches", array(SchoolCoach.decode)),
-    courseId: json |> field("courseId", string),
-    authenticityToken: json |> field("authenticityToken", string),
-  }
-}
-
-let props = DomUtils.parseJsonTag(~id="course-coaches__props", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <CourseCoaches__Root
-    courseCoaches=props.courseCoaches
-    schoolCoaches=props.schoolCoaches
-    courseId=props.courseId
-    authenticityToken=props.authenticityToken
-  />,
-  "sa-coaches-enrollment-panel",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoachesSchoolIndexPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoachesSchoolIndexPack.res
deleted file mode 100644
index e1d159a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoachesSchoolIndexPack.res
+++ /dev/null
@@ -1,22 +0,0 @@
-open CoachesSchoolIndex__Types
-
-type props = {
-  coaches: list<Coach.t>,
-  authenticityToken: string,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    coaches: json |> field("coaches", list(Coach.decode)),
-    authenticityToken: json |> field("authenticityToken", string),
-  }
-}
-
-let props =
-  DomUtils.parseJsonAttribute(~id="sa-coaches-panel", ~attribute="data-props", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <SA_Coaches_SchoolIndex coaches=props.coaches authenticityToken=props.authenticityToken />,
-  "sa-coaches-panel",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesAuthorsPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesAuthorsPack.res
deleted file mode 100644
index 0b92c01..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesAuthorsPack.res
+++ /dev/null
@@ -1,14 +0,0 @@
-open CourseAuthors__Types
-
-let decodeProps = json => {
-  open Json.Decode
-  (json |> field("courseId", string), json |> field("authors", array(Author.decode)))
-}
-
-let (courseId, authors) =
-  DomUtils.parseJsonTag(~id="schools-courses-authors__props", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <CourseAuthors__Root courseId authors />,
-  "schools-courses-authors__root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesCurriculumPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesCurriculumPack.res
deleted file mode 100644
index ecde00a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesCurriculumPack.res
+++ /dev/null
@@ -1,37 +0,0 @@
-open CurriculumEditor__Types
-
-type props = {
-  course: Course.t,
-  evaluationCriteria: list<EvaluationCriteria.t>,
-  levels: list<Level.t>,
-  targetGroups: list<TargetGroup.t>,
-  targets: list<Target.t>,
-  authenticityToken: string,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    course: json |> field("course", Course.decode),
-    evaluationCriteria: json |> field("evaluationCriteria", list(EvaluationCriteria.decode)),
-    levels: json |> field("levels", list(Level.decode)),
-    targetGroups: json |> field("targetGroups", list(TargetGroup.decode)),
-    targets: json |> field("targets", list(Target.decode)),
-    authenticityToken: json |> field("authenticityToken", string),
-  }
-}
-
-let props =
-  DomUtils.parseJsonAttribute(~id="curriculum-editor", ~attribute="data-props", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <CurriculumEditor
-    course=props.course
-    evaluationCriteria=props.evaluationCriteria
-    levels=props.levels
-    targetGroups=props.targetGroups
-    targets=props.targets
-    authenticityToken=props.authenticityToken
-  />,
-  "curriculum-editor",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesEvaluationCriteriaPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesEvaluationCriteriaPack.res
deleted file mode 100644
index f5ec845..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesEvaluationCriteriaPack.res
+++ /dev/null
@@ -1,20 +0,0 @@
-type props = {
-  courseId: string,
-  evaluationCriteria: array<EvaluationCriterion.t>,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    courseId: json |> field("courseId", string),
-    evaluationCriteria: json |> field("evaluationCriteria", array(EvaluationCriterion.decode)),
-  }
-}
-
-let props =
-  DomUtils.parseJsonTag(~id="schools-courses-evaluation-criteria__props", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <EvaluationCriteria__Index courseId=props.courseId evaluationCriteria=props.evaluationCriteria />,
-  "schools-courses-evaluation-criteria__root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesExportsPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesExportsPack.res
deleted file mode 100644
index 9a94d0d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesExportsPack.res
+++ /dev/null
@@ -1,18 +0,0 @@
-open CourseExports__Types
-
-let decodeProps = json => {
-  open Json.Decode
-  (
-    json |> field("course", Course.decode),
-    json |> field("exports", array(CourseExport.decode)),
-    json |> field("tags", array(Tag.decode)),
-  )
-}
-
-let (course, exports, tags) =
-  DomUtils.parseJsonTag(~id="schools-courses-exports__props", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <CourseExports__Root course exports tags />,
-  "schools-courses-exports__root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesInactiveStudentsPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesInactiveStudentsPack.res
deleted file mode 100644
index 3dc6f44..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesInactiveStudentsPack.res
+++ /dev/null
@@ -1,37 +0,0 @@
-open InactiveStudentsPanel__Types
-
-type props = {
-  teams: list<Team.t>,
-  courseId: string,
-  students: list<Student.t>,
-  authenticityToken: string,
-  isLastPage: bool,
-  currentPage: int,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    teams: json |> field("teams", list(Team.decode)),
-    courseId: json |> field("courseId", string),
-    students: json |> field("students", list(Student.decode)),
-    authenticityToken: json |> field("authenticityToken", string),
-    currentPage: json |> field("currentPage", int),
-    isLastPage: json |> field("isLastPage", bool),
-  }
-}
-
-let props =
-  DomUtils.parseJsonAttribute(~id="sa-students-panel", ~attribute="data-props", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <SA_InactiveStudentsPanel
-    teams=props.teams
-    courseId=props.courseId
-    currentPage=props.currentPage
-    isLastPage=props.isLastPage
-    students=props.students
-    authenticityToken=props.authenticityToken
-  />,
-  "sa-students-panel",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesIndexPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesIndexPack.res
deleted file mode 100644
index 82c9f31..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesIndexPack.res
+++ /dev/null
@@ -1 +0,0 @@
-ReactDOMRe.renderToElementWithId(<CourseEditor />, "course-editor")
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesStudentsPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesStudentsPack.res
deleted file mode 100644
index 89e9d21..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCoursesStudentsPack.res
+++ /dev/null
@@ -1,33 +0,0 @@
-open StudentsEditor__Types
-
-type props = {
-  courseId: string,
-  courseCoachIds: array<string>,
-  schoolCoaches: array<Coach.t>,
-  levels: array<Level.t>,
-  studentTags: array<string>,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    courseId: json |> field("courseId", string),
-    courseCoachIds: json |> field("courseCoachIds", array(string)),
-    schoolCoaches: json |> field("schoolCoaches", array(Coach.decode)),
-    levels: json |> field("levels", array(Level.decode)),
-    studentTags: json |> field("studentTags", array(string)),
-  }
-}
-
-let props = DomUtils.parseJsonTag(~id="sa-students-panel-data", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <StudentsEditor__Root
-    courseId=props.courseId
-    courseCoachIds=props.courseCoachIds
-    schoolCoaches=props.schoolCoaches
-    levels=props.levels
-    studentTags=props.studentTags
-  />,
-  "sa-students-panel",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCustomizePack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCustomizePack.res
deleted file mode 100644
index 5afb6c0..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/SchoolsCustomizePack.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type props = {
-  authenticityToken: string,
-  customizations: SchoolCustomize__Customizations.t,
-  schoolName: string,
-  schoolAbout: option<string>,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    authenticityToken: json |> field("authenticityToken", string),
-    customizations: json |> field("customizations", SchoolCustomize__Customizations.decode),
-    schoolName: json |> field("schoolName", string),
-    schoolAbout: json |> field("schoolAbout", optional(string)),
-  }
-}
-
-let props = DomUtils.parseJsonTag(~id="school-customize-data", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <SchoolCustomize__Root
-    authenticityToken=props.authenticityToken
-    customizations=props.customizations
-    schoolName=props.schoolName
-    schoolAbout=props.schoolAbout
-  />,
-  "school-customize",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/StudentCourseLayoutPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/StudentCourseLayoutPack.res
deleted file mode 100644
index 7093b5b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/StudentCourseLayoutPack.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let decodeProps = json => {
-  open Json.Decode
-  (
-    json |> field("currentCourseId", string),
-    json |> field("courses", list(StudentCourse__Course.decode)),
-    json |> field("additionalLinks", list(string)),
-    json |> field("coverImage", optional(string)),
-  )
-}
-
-let (currentCourseId, courses, additionalLinks, coverImage) =
-  DomUtils.parseJsonAttribute(~id="course-header-root", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <StudentCourse__Header currentCourseId courses additionalLinks coverImage />,
-  "course-header-root",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/StudentTopNavPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/StudentTopNavPack.res
deleted file mode 100644
index b5cc6b4..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/StudentTopNavPack.res
+++ /dev/null
@@ -1,27 +0,0 @@
-open StudentTopNav__Types
-
-type props = {
-  schoolName: string,
-  logoUrl: option<string>,
-  links: list<NavLink.t>,
-  isLoggedIn: bool,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    schoolName: json |> field("schoolName", string),
-    logoUrl: json |> field("logoUrl", nullable(string)) |> Js.Null.toOption,
-    links: json |> field("links", list(NavLink.decode)),
-    isLoggedIn: json |> field("isLoggedIn", bool),
-  }
-}
-
-let props = DomUtils.parseJsonTag(~id="student-top-nav-props", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <StudentTopNav
-    schoolName=props.schoolName logoUrl=props.logoUrl links=props.links isLoggedIn=props.isLoggedIn
-  />,
-  "student-top-nav",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/UserSessionNewPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/UserSessionNewPack.res
deleted file mode 100644
index faca7e5..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/UserSessionNewPack.res
+++ /dev/null
@@ -1,33 +0,0 @@
-type props = {
-  schoolName: string,
-  authenticityToken: string,
-  fqdn: string,
-  oauthHost: string,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    schoolName: json |> field("schoolName", string),
-    authenticityToken: json |> field("authenticityToken", string),
-    fqdn: json |> field("fqdn", string),
-    oauthHost: json |> field("oauthHost", string),
-  }
-}
-
-let props =
-  DomUtils.parseJsonAttribute(
-    ~id="user-session-new",
-    ~attribute="data-json-props",
-    (),
-  ) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <UserSessionNew
-    schoolName=props.schoolName
-    authenticityToken=props.authenticityToken
-    fqdn=props.fqdn
-    oauthHost=props.oauthHost
-  />,
-  "user-session-new",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/UserSessionResetPasswordPack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/UserSessionResetPasswordPack.res
deleted file mode 100644
index bb2edbd..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/UserSessionResetPasswordPack.res
+++ /dev/null
@@ -1,24 +0,0 @@
-type props = {
-  token: string,
-  authenticityToken: string,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    token: json |> field("token", string),
-    authenticityToken: json |> field("authenticityToken", string),
-  }
-}
-
-let props =
-  DomUtils.parseJsonAttribute(
-    ~id="user-session-reset-password",
-    ~attribute="data-json-props",
-    (),
-  ) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <UserSessionResetPassword token=props.token authenticityToken=props.authenticityToken />,
-  "user-session-reset-password",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/packs/UsersHomePack.res b/jscomp/syntax/tests/idempotency/pupilfirst/packs/UsersHomePack.res
deleted file mode 100644
index d7f566b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/packs/UsersHomePack.res
+++ /dev/null
@@ -1,37 +0,0 @@
-type props = {
-  currentSchoolAdmin: bool,
-  courses: array<UsersHome__Course.t>,
-  communities: array<UsersHome__Community.t>,
-  showUserEdit: bool,
-  userName: string,
-  userTitle: string,
-  avatarUrl: option<string>,
-}
-
-let decodeProps = json => {
-  open Json.Decode
-  {
-    currentSchoolAdmin: json |> field("currentSchoolAdmin", bool),
-    showUserEdit: json |> field("showUserEdit", bool),
-    userName: json |> field("userName", string),
-    userTitle: json |> field("userTitle", string),
-    avatarUrl: json |> optional(field("avatarUrl", string)),
-    courses: json |> field("courses", array(UsersHome__Course.decode)),
-    communities: json |> field("communities", array(UsersHome__Community.decode)),
-  }
-}
-
-let props = DomUtils.parseJsonTag(~id="users-home-data", ()) |> decodeProps
-
-ReactDOMRe.renderToElementWithId(
-  <UsersHome__Root
-    currentSchoolAdmin=props.currentSchoolAdmin
-    courses=props.courses
-    communities=props.communities
-    showUserEdit=props.showUserEdit
-    userName=props.userName
-    userTitle=props.userTitle
-    avatarUrl=props.avatarUrl
-  />,
-  "users-home",
-)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow.res
deleted file mode 100644
index 73d8fc2..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow.res
+++ /dev/null
@@ -1,320 +0,0 @@
-%raw(`require("./QuestionsShow.css")`)
-
-open QuestionsShow__Types
-
-let str = React.string
-
-type action =
-  | AddComment(Comment.t)
-  | AddAnswer(Answer.t, bool)
-  | AddLike(Like.t)
-  | RemoveLike(string)
-  | UpdateShowAnswerCreate(bool)
-  | UpdateShowQuestionEdit(bool)
-  | UpdateQuestion(Question.t)
-  | UpdateAnswer(Answer.t)
-  | RemoveAnswer(string)
-  | RemoveComment(string)
-
-type state = {
-  question: Question.t,
-  answers: list<Answer.t>,
-  comments: list<Comment.t>,
-  likes: list<Like.t>,
-  showAnswerCreate: bool,
-  showQuestionEdit: bool,
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | AddComment(comment) => {
-      ...state,
-      comments: Comment.addComment(state.comments, comment),
-    }
-  | AddAnswer(answer, bool) => {
-      ...state,
-      answers: Answer.addAnswer(state.answers, answer),
-      showAnswerCreate: bool,
-    }
-
-  | AddLike(like) => {...state, likes: state.likes |> Like.addLike(like)}
-  | RemoveLike(id) => {...state, likes: state.likes |> Like.removeLike(id)}
-  | UpdateShowAnswerCreate(bool) => {...state, showAnswerCreate: bool}
-  | UpdateShowQuestionEdit(bool) => {...state, showQuestionEdit: bool}
-  | UpdateQuestion(question) => {...state, question: question, showQuestionEdit: false}
-  | RemoveAnswer(id) => {
-      ...state,
-      answers: state.answers |> Answer.delete(id),
-    }
-  | RemoveComment(id) => {
-      ...state,
-      comments: state.comments |> Comment.delete(id),
-    }
-  | UpdateAnswer(answer) => {
-      ...state,
-      answers: Answer.updateAnswer(state.answers, answer),
-    }
-  }
-
-let showAnswersCreateComponent = (answers, showAnswerCreate, currentUserId) =>
-  if showAnswerCreate {
-    true
-  } else {
-    answers |> Answer.answerFromUser(currentUserId) |> ListUtils.isEmpty
-  }
-
-let likesForAnswer = (likes, answerId) => likes |> Like.likesForAnswer(answerId) |> List.length
-
-let handleUpdateQuestion = (title, description, currentUserId, question, dispatch) => {
-  let newQuestion = Question.create(
-    question |> Question.id,
-    title,
-    description,
-    question |> Question.creatorId,
-    Some(currentUserId),
-    question |> Question.createdAt,
-    question |> Question.updatedAt,
-  )
-  dispatch(UpdateQuestion(newQuestion))
-}
-
-@react.component
-let make = (
-  ~question,
-  ~answers,
-  ~comments,
-  ~users,
-  ~likes,
-  ~currentUserId,
-  ~communityPath,
-  ~isCoach,
-  ~communityId,
-  ~target,
-) => {
-  let (state, dispatch) = React.useReducer(
-    reducer,
-    {
-      question: question,
-      answers: answers,
-      comments: comments,
-      likes: likes,
-      showAnswerCreate: false,
-      showQuestionEdit: false,
-    },
-  )
-  let addCommentCB = comment => dispatch(AddComment(comment))
-  let handleAnswerCB = (answer, newAnswer) =>
-    newAnswer ? dispatch(AddAnswer(answer, false)) : dispatch(UpdateAnswer(answer))
-  let addLikeCB = like => dispatch(AddLike(like))
-  let removeLikeCB = id => dispatch(RemoveLike(id))
-  let updateQuestionCB = (title, description) =>
-    handleUpdateQuestion(title, description, currentUserId, question, dispatch)
-  let archiveCB = (id, resourceType) =>
-    switch resourceType {
-    | "Question" => communityPath |> Webapi.Dom.Window.setLocation(Webapi.Dom.window)
-    | "Answer" => dispatch(RemoveAnswer(id))
-    | "Comment" => dispatch(RemoveComment(id))
-    | _ => Notification.error("Something went wrong", "Please refresh the page and try again")
-    }
-  let filteredAnswers = state.answers |> List.filter(answer => !(answer |> Answer.archived))
-
-  <div className="bg-gray-100">
-    <div className="flex-col items-center justify-between">
-      {state.showQuestionEdit
-        ? <div>
-            <div className="max-w-3xl w-full mx-auto mt-5 pb-2 px-3 lg:px-0">
-              <a
-                id="close-button"
-                className="btn btn-subtle cursor-default"
-                onClick={event => {
-                  event |> ReactEvent.Mouse.preventDefault
-                  dispatch(UpdateShowQuestionEdit(false))
-                }}>
-                <i className="fas fa-arrow-left" /> <span className="ml-2"> {"Close" |> str} </span>
-              </a>
-            </div>
-            <QuestionsShow__QuestionEditor
-              communityId target=None showBackButton=false question=state.question updateQuestionCB
-            />
-          </div>
-        : <div className="flex flex-col px-3 lg:px-0">
-            <div className="max-w-3xl w-full mx-auto mt-5 pb-2">
-              <a className="btn btn-subtle" href=communityPath>
-                <i className="fas fa-arrow-left" /> <span className="ml-2"> {"Back" |> str} </span>
-              </a>
-            </div>
-            {switch target {
-            | Some(target) =>
-              <div className="max-w-3xl w-full mt-5 mx-auto">
-                <div
-                  className="flex py-4 px-4 md:px-5 w-full bg-white border border-primary-500 shadow-md rounded-lg justify-between items-center mb-2">
-                  <p className="w-3/5 md:w-4/5 text-sm">
-                    <span className="font-semibold block text-xs">
-                      {"Linked Target: " |> str}
-                    </span>
-                    <span> {target |> Target.title |> str} </span>
-                  </p>
-                  {switch target |> Target.id {
-                  | Some(id) =>
-                    <a href={"/targets/" ++ id} className="btn btn-default">
-                      {"View Target" |> str}
-                    </a>
-                  | None => React.null
-                  }}
-                </div>
-              </div>
-            | None => React.null
-            }}
-            <div
-              className="max-w-3xl w-full flex mx-auto items-center justify-center relative border-t border-b md:border-0 bg-white rounded md:rounded-lg shadow overflow-hidden z-10">
-              <div className="flex w-full">
-                <div title="Question block" className="flex flex-col w-full relative">
-                  <div
-                    className="absolute right-0 top-0 flex border border-t-0 border-r-0 border-gray-400 bg-gray-200 rounded-bl">
-                    {switch state.question |> Question.editorId {
-                    | Some(_) =>
-                      <a
-                        href={"/questions/" ++ ((state.question |> Question.id) ++ "/versions")}
-                        title="Edit History"
-                        className="inline-flex items-center whitespace-no-wrap text-xs font-semibold py-1 px-3 bg-transparent hover:bg-primary-100 hover:text-primary-500 cursor-pointer text-gray-800 border-r border-gray-400">
-                        <i className="fas fa-history text-sm" />
-                        <span className="ml-2"> {"History" |> str} </span>
-                      </a>
-                    | None => React.null
-                    }}
-                    {state.question |> Question.creatorId == currentUserId || isCoach
-                      ? <div className="flex">
-                          <a
-                            onClick={_ => dispatch(UpdateShowQuestionEdit(true))}
-                            title="Edit Question"
-                            className="inline-flex items-center whitespace-no-wrap text-xs font-semibold py-1 px-3 bg-transparent hover:bg-primary-100 hover:text-primary-500 text-gray-800 border-r border-gray-400 cursor-pointer">
-                            <i className="fas fa-edit text-sm" />
-                            <span className="ml-2"> {"Edit" |> str} </span>
-                          </a>
-                          <QuestionsShow__ArchiveManager
-                            id={question |> Question.id} resourceType="Question" archiveCB
-                          />
-                        </div>
-                      : React.null}
-                  </div>
-                  <div className="pt-7 px-3 md:px-6 flex flex-col">
-                    <h1 className="text-base md:text-xl text-black font-semibold break-words">
-                      {state.question |> Question.title |> str}
-                    </h1>
-                  </div>
-                  <div className="pb-4 pt-2 px-3 md:px-6 flex flex-col">
-                    <MarkdownBlock
-                      markdown={state.question |> Question.description}
-                      className="leading-normal text-sm"
-                      profile=Markdown.QuestionAndAnswer
-                    />
-                    {switch state.question |> Question.editorId {
-                    | Some(editorId) =>
-                      <div>
-                        <div
-                          className="text-xs mt-2 inline-block px-2 py-1 rounded bg-orange-100 text-orange-900">
-                          <span> {"Last edited by " |> str} </span>
-                          <span className="font-semibold">
-                            {users |> User.findById(editorId) |> User.name |> str}
-                          </span>
-                          <span>
-                            {" on " ++
-                            (state.question
-                            |> Question.updatedAt
-                            |> DateTime.stingToFormatedTime(DateTime.DateWithYearAndTime)) |> str}
-                          </span>
-                        </div>
-                      </div>
-                    | None => React.null
-                    }}
-                  </div>
-                  <div className="flex flex-row justify-between px-3 md:px-6 pb-6">
-                    <div className="pr-2 pt-6 text-center">
-                      <i className="far fa-comments text-xl text-gray-600" />
-                      <p className="text-xs py-1">
-                        {state.comments
-                        |> Comment.commentsForQuestion
-                        |> List.length
-                        |> string_of_int
-                        |> str}
-                      </p>
-                    </div>
-                    <QuestionsShow__UserShow
-                      user={users |> User.findById(state.question |> Question.creatorId)}
-                      createdAt={state.question |> Question.createdAt}
-                      textForTimeStamp="Asked"
-                    />
-                  </div>
-                </div>
-              </div>
-            </div>
-            <QuestionsShow__CommentShow
-              comments={state.comments |> Comment.commentsForQuestion}
-              users
-              commentableType="Question"
-              commentableId={state.question |> Question.id}
-              addCommentCB
-              currentUserId
-              archiveCB
-              isCoach
-            />
-            <div className="max-w-3xl w-full justify-center mx-auto pt-8 pb-2 border-b">
-              <div className="flex items-end">
-                <span className="text-lg font-semibold">
-                  {
-                    let numberOfAnswers = filteredAnswers |> List.length
-                    (numberOfAnswers |> string_of_int) ++ (
-                        numberOfAnswers == 1 ? " Answer" : " Answers"
-                      ) |> str
-                  }
-                </span>
-              </div>
-            </div>
-            <div className="community-answer-container">
-              {filteredAnswers
-              |> List.sort((answerA, answerB) =>
-                DateFns.differenceInSeconds(
-                  answerB |> Answer.createdAt |> DateFns.parseString,
-                  answerA |> Answer.createdAt |> DateFns.parseString,
-                ) |> int_of_float
-              )
-              |> List.stable_sort((answerA, answerB) =>
-                likesForAnswer(likes, answerB |> Answer.id) -
-                likesForAnswer(likes, answerA |> Answer.id)
-              )
-              |> List.map(answer =>
-                <QuestionsShow__AnswerShow
-                  key={answer |> Answer.id}
-                  answer
-                  question=state.question
-                  addCommentCB
-                  currentUserId
-                  addLikeCB
-                  removeLikeCB
-                  users
-                  comments=state.comments
-                  likes=state.likes
-                  handleAnswerCB
-                  isCoach
-                  archiveCB
-                />
-              )
-              |> Array.of_list
-              |> ReasonReact.array}
-            </div>
-            {showAnswersCreateComponent(state.answers, state.showAnswerCreate, currentUserId)
-              ? <QuestionsShow__AnswerEditor question=state.question currentUserId handleAnswerCB />
-              : <div
-                  className="community-ask-button-container mt-4 my-8 max-w-3xl w-full flex mx-auto justify-center">
-                  <div className="bg-gray-100 px-1 z-10">
-                    <button
-                      className="btn btn-primary"
-                      onClick={_ => dispatch(UpdateShowAnswerCreate(true))}>
-                      {"Add another answer" |> str}
-                    </button>
-                  </div>
-                </div>}
-          </div>}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__AddComment.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__AddComment.res
deleted file mode 100644
index 4f3146a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__AddComment.res
+++ /dev/null
@@ -1,106 +0,0 @@
-@val external currentTime: unit => string = "Date.now"
-
-open QuestionsShow__Types
-
-let str = React.string
-
-module CreateCommentQuery = %graphql(`
-  mutation CreateCommentMutation($value: String!, $commentableId: ID!, $commentableType: String!) {
-    createComment(value: $value, commentableId: $commentableId, commentableType: $commentableType) @bsVariant {
-      commentId
-      errors
-    }
-  }
-`)
-
-module CreateCommentError = {
-  type t = [
-    | #InvalidCommentableType
-    | #InvalidLengthValue
-    | #BlankCommentableId
-  ]
-
-  let notification = error =>
-    switch error {
-    | #InvalidCommentableType => (
-        "InvalidCommentableType",
-        "Supplied type must be one of Question or Answer",
-      )
-    | #InvalidLengthValue => (
-        "InvalidLengthValue",
-        "Supplied comment must be greater than 1 characters in length",
-      )
-    | #BlankCommentableId => (
-        "BlankCommentableId",
-        "Commentable id is required for creating a Comment",
-      )
-    }
-}
-
-module CreateCommentErrorHandler = GraphqlErrorHandler.Make(CreateCommentError)
-
-@react.component
-let make = (~commentableType, ~commentableId, ~addCommentCB, ~currentUserId) => {
-  let (value, setValue) = React.useState(() => "")
-  let (saving, setSaving) = React.useState(() => false)
-  let validComment = value != ""
-
-  let handleResponseCB = id => {
-    let comment = Comment.create(
-      id,
-      value,
-      currentUserId,
-      commentableId,
-      commentableType,
-      currentTime(),
-    )
-    setValue(_ => "")
-    setSaving(_ => false)
-    addCommentCB(comment)
-  }
-
-  let handleCreateComment = event => {
-    event |> ReactEvent.Mouse.preventDefault
-
-    if validComment {
-      setSaving(_ => true)
-
-      CreateCommentQuery.make(~value, ~commentableId, ~commentableType, ())
-      |> GraphqlQuery.sendQuery
-      |> Js.Promise.then_(response =>
-        switch response["createComment"] {
-        | #CommentId(commentId) =>
-          handleResponseCB(commentId)
-          Notification.success("Done!", "Comment has been saved.")
-          Js.Promise.resolve()
-        | #Errors(errors) => Js.Promise.reject(CreateCommentErrorHandler.Errors(errors))
-        }
-      )
-      |> CreateCommentErrorHandler.catch(() => setSaving(_ => false))
-      |> ignore
-    } else {
-      ()
-    }
-  }
-  <div className="w-full flex flex-col mx-auto items-center justify-center">
-    <div
-      className="w-full border rounded-b border-dashed border-gray-500 border-t-0 overflow-hidden focus:border-gray-600">
-      <DisablingCover disabled=saving containerClasses="flex flex-row">
-        <input
-          title={"Add your comment for " ++ commentableType}
-          placeholder="Add your comment"
-          value
-          onChange={event => setValue(ReactEvent.Form.target(event)["value"])}
-          className="community-qa-comment__input text-xs text-left bg-gray-200 py-3 px-4 rounded-b appearance-none block w-full leading-tight hover:bg-gray-100 focus:outline-none focus:bg-white"
-        />
-        {validComment
-          ? <button
-              onClick=handleCreateComment
-              className="flex items-center whitespace-no-wrap text-sm font-semibold py-2 px-4 btn-primary appearance-none focus:outline-none text-center">
-              {"Comment" |> str}
-            </button>
-          : ReasonReact.null}
-      </DisablingCover>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Answer.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Answer.res
deleted file mode 100644
index d30d0c5..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Answer.res
+++ /dev/null
@@ -1,56 +0,0 @@
-type t = {
-  id: string,
-  description: string,
-  creatorId: string,
-  editorId: option<string>,
-  createdAt: string,
-  archived: bool,
-  updatedAt: string,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    description: json |> field("description", string),
-    creatorId: json |> field("creatorId", string),
-    editorId: json |> field("editorId", nullable(string)) |> Js.Null.toOption,
-    createdAt: json |> field("createdAt", string),
-    archived: json |> field("archived", bool),
-    updatedAt: json |> field("updatedAt", string),
-  }
-}
-
-let id = t => t.id
-
-let description = t => t.description
-
-let createdAt = t => t.createdAt
-
-let creatorId = t => t.creatorId
-
-let editorId = t => t.editorId
-
-let updatedAt = t => t.updatedAt
-
-let addAnswer = (answers, answer) => list{answer, ...answers}
-
-let updateAnswer = (answers, newAnswer) =>
-  answers |> List.map(answer => answer.id == newAnswer.id ? newAnswer : answer)
-
-let answerFromUser = (userId, answers) =>
-  answers |> List.filter(answer => answer.creatorId == userId)
-
-let archived = t => t.archived
-
-let delete = (id, answers) => answers |> List.filter(a => a.id != id)
-
-let create = (id, description, creatorId, editorId, createdAt, updatedAt, archived) => {
-  id: id,
-  description: description,
-  creatorId: creatorId,
-  editorId: editorId,
-  createdAt: createdAt,
-  updatedAt: updatedAt,
-  archived: archived,
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__AnswerEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__AnswerEditor.res
deleted file mode 100644
index a692530..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__AnswerEditor.res
+++ /dev/null
@@ -1,218 +0,0 @@
-open QuestionsShow__Types
-
-let str = React.string
-
-@val external currentTime: unit => string = "Date.now"
-
-module CreateAnswerQuery = %graphql(`
-  mutation CreateAnswerMutation($description: String!, $questionId: ID!) {
-    createAnswer(description: $description, questionId: $questionId) @bsVariant {
-      answerId
-      errors
-    }
-  }
-`)
-
-module UpdateAnswerQuery = %graphql(`
-  mutation UpdateAnswerMutation($id: ID!, $description: String!) {
-    updateAnswer(id: $id, description: $description) @bsVariant {
-      success
-      errors
-    }
-  }
-`)
-
-module CreateAnswerError = {
-  type t = [#InvalidLengthDescription | #BlankQuestionId]
-
-  let notification = error =>
-    switch error {
-    | #InvalidLengthDescription => (
-        "InvalidLengthDescription",
-        "Supplied description must be greater than 1 characters in length",
-      )
-    | #BlankQuestionId => ("BlankQuestionId", "Question id is required for creating Answer")
-    }
-}
-
-module UpdateAnswerError = {
-  type t = [#InvalidLengthDescription]
-
-  let notification = error =>
-    switch error {
-    | #InvalidLengthDescription => (
-        "InvalidLengthDescription",
-        "Supplied description must be greater than 1 characters in length",
-      )
-    }
-}
-
-module CreateAnswerErrorHandler = GraphqlErrorHandler.Make(CreateAnswerError)
-module UpdateAnswerErrorHandler = GraphqlErrorHandler.Make(UpdateAnswerError)
-
-let dateTime = currentTime()
-
-let handleAnswerCreateCB = (
-  id,
-  description,
-  currentUserId,
-  setDescription,
-  setSaving,
-  handleAnswerCB,
-) => {
-  let answer = Answer.create(id, description, currentUserId, None, dateTime, dateTime, false)
-  setDescription(_ => "")
-  setSaving(_ => false)
-  handleAnswerCB(answer, true)
-}
-
-let handleAnswerUpdateResponseCB = (
-  id,
-  description,
-  currentUserId,
-  setDescription,
-  setSaving,
-  handleAnswerCB,
-  answer,
-) => {
-  let newAnswer = Answer.create(
-    id,
-    description,
-    answer |> Answer.creatorId,
-    Some(currentUserId),
-    answer |> Answer.createdAt,
-    dateTime,
-    false,
-  )
-  setDescription(_ => "")
-  setSaving(_ => false)
-  handleAnswerCB(newAnswer, false)
-}
-
-let handleAnswer = (
-  description,
-  question,
-  setSaving,
-  currentUserId,
-  setDescription,
-  handleAnswerCB,
-  answer,
-  event,
-) => {
-  event |> ReactEvent.Mouse.preventDefault
-  if description != "" {
-    setSaving(_ => true)
-
-    switch answer {
-    | Some(answer) =>
-      let answerId = answer |> Answer.id
-
-      UpdateAnswerQuery.make(~description, ~id=answerId, ())
-      |> GraphqlQuery.sendQuery
-      |> Js.Promise.then_(response =>
-        switch response["updateAnswer"] {
-        | #Success(answerUpdated) =>
-          answerUpdated
-            ? handleAnswerUpdateResponseCB(
-                answerId,
-                description,
-                currentUserId,
-                setDescription,
-                setSaving,
-                handleAnswerCB,
-                answer,
-              )
-            : Notification.error("Something went wrong", "Please refresh the page and try again")
-          Notification.success("Success", "Answer updated successfully")
-          Js.Promise.resolve()
-        | #Errors(errors) => Js.Promise.reject(UpdateAnswerErrorHandler.Errors(errors))
-        }
-      )
-      |> UpdateAnswerErrorHandler.catch(() => setSaving(_ => false))
-      |> ignore
-    | None =>
-      CreateAnswerQuery.make(~description, ~questionId=question |> Question.id, ())
-      |> GraphqlQuery.sendQuery
-      |> Js.Promise.then_(response =>
-        switch response["createAnswer"] {
-        | #AnswerId(answerId) =>
-          handleAnswerCreateCB(
-            answerId,
-            description,
-            currentUserId,
-            setDescription,
-            setSaving,
-            handleAnswerCB,
-          )
-          Notification.success("Done!", "Answer has been saved.")
-          Js.Promise.resolve()
-        | #Errors(errors) => Js.Promise.reject(CreateAnswerErrorHandler.Errors(errors))
-        }
-      )
-      |> CreateAnswerErrorHandler.catch(() => setSaving(_ => false))
-      |> ignore
-    }
-  } else {
-    Notification.error("Empty", "Answer cant be blank")
-  }
-}
-
-@react.component
-let make = (~question, ~currentUserId, ~handleAnswerCB, ~answer=?, ~handleCloseCB=?) => {
-  let (description, setDescription) = React.useState(() =>
-    switch answer {
-    | Some(answer) => answer |> Answer.description
-    | None => ""
-    }
-  )
-  let (saving, setSaving) = React.useState(() => false)
-  let updateMarkdownCB = description => setDescription(_ => description)
-  <DisablingCover disabled=saving>
-    <div className="py-2 max-w-3xl w-full flex mx-auto items-center justify-center relative">
-      <div className="flex w-full pb-4">
-        <div className="w-full flex flex-col">
-          <label
-            className="inline-block tracking-wide text-gray-900 text-lg font-semibold mb-2"
-            htmlFor="new-answer">
-            {"Your Answer" |> str}
-          </label>
-          <MarkdownEditor
-            placeholder="Type in your answer. You can use Markdown to format your response."
-            textareaId="new-answer"
-            onChange=updateMarkdownCB
-            value=description
-            profile=Markdown.QuestionAndAnswer
-            maxLength=10000
-          />
-          <div className="flex justify-end pt-3 border-t">
-            {switch handleCloseCB {
-            | Some(handleCloseCB) =>
-              <button
-                disabled=saving onClick={_ => handleCloseCB()} className="btn btn-default mr-2">
-                {"Cancel" |> str}
-              </button>
-            | None => React.null
-            }}
-            <button
-              disabled={saving || description == ""}
-              onClick={handleAnswer(
-                description,
-                question,
-                setSaving,
-                currentUserId,
-                setDescription,
-                handleAnswerCB,
-                answer,
-              )}
-              className="btn btn-primary">
-              {switch answer {
-              | Some(_) => "Update Your Answer"
-              | None => "Post Your Answer"
-              } |> str}
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </DisablingCover>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__AnswerShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__AnswerShow.res
deleted file mode 100644
index 5c69ea2..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__AnswerShow.res
+++ /dev/null
@@ -1,133 +0,0 @@
-open QuestionsShow__Types
-
-let str = React.string
-
-@react.component
-let make = (
-  ~answer,
-  ~question,
-  ~addCommentCB,
-  ~currentUserId,
-  ~addLikeCB,
-  ~removeLikeCB,
-  ~users,
-  ~comments,
-  ~likes,
-  ~handleAnswerCB,
-  ~isCoach,
-  ~archiveCB,
-) => {
-  let user = users |> User.findById(answer |> Answer.creatorId)
-  let commentsForAnswer = comments |> Comment.commentsForAnswer(answer |> Answer.id)
-  let (showAnswerEdit, toggleShowAnswerEdit) = React.useState(() => false)
-
-  let handleCloseCB = () => toggleShowAnswerEdit(_ => false)
-
-  let handleAnswerEditCB = (answer, bool) => {
-    toggleShowAnswerEdit(_ => false)
-    handleAnswerCB(answer, bool)
-  }
-
-  <div className="flex flex-col relative pt-2" key={answer |> Answer.id}>
-    {showAnswerEdit
-      ? <div>
-          <QuestionsShow__AnswerEditor
-            question currentUserId handleAnswerCB=handleAnswerEditCB answer handleCloseCB
-          />
-        </div>
-      : <div title={"Answer " ++ (answer |> Answer.id)}>
-          <div
-            className="max-w-3xl w-full flex mx-auto items-center justify-center relative border-t border-b md:border-0 bg-white rounded md:rounded-lg shadow mt-2 z-10">
-            <div className="flex w-full">
-              <div className="flex flex-col w-full relative">
-                <div
-                  className="absolute right-0 top-0 flex border border-t-0 border-r-0 border-gray-400 bg-gray-200 rounded-bl">
-                  {switch answer |> Answer.editorId {
-                  | Some(_) =>
-                    <a
-                      href={"/answers/" ++ ((answer |> Answer.id) ++ "/versions")}
-                      title="Edit History"
-                      className="inline-flex items-center whitespace-no-wrap text-xs font-semibold py-1 px-3 bg-transparent hover:bg-primary-100 hover:text-primary-500 cursor-pointer text-gray-800 border-r border-gray-400">
-                      <i className="fas fa-history text-sm" />
-                      <span className="ml-2"> {"History" |> str} </span>
-                    </a>
-                  | None => React.null
-                  }}
-                  {answer |> Answer.creatorId == currentUserId || isCoach
-                    ? <div className="flex">
-                        <a
-                          title="Edit Answer"
-                          onClick={_ => toggleShowAnswerEdit(_ => true)}
-                          className="inline-flex items-center whitespace-no-wrap text-xs font-semibold py-1 px-3 bg-transparent hover:bg-primary-100 hover:text-primary-500 text-gray-800 border-r border-gray-400 cursor-pointer">
-                          <i className="fas fa-edit text-sm" />
-                          <span className="ml-2"> {"Edit" |> str} </span>
-                        </a>
-                        <QuestionsShow__ArchiveManager
-                          id={answer |> Answer.id} resourceType="Answer" archiveCB
-                        />
-                      </div>
-                    : React.null}
-                </div>
-                <div className="pt-8 pb-4 px-3 md:px-6 flex flex-col">
-                  <MarkdownBlock
-                    markdown={answer |> Answer.description}
-                    className="leading-normal text-sm "
-                    profile=Markdown.QuestionAndAnswer
-                  />
-                  {switch answer |> Answer.editorId {
-                  | Some(editorId) =>
-                    <div>
-                      <div
-                        className="text-xs mt-1 inline-block px-2 py-1 rounded bg-orange-100 text-orange-900">
-                        <span> {"Last edited by " |> str} </span>
-                        <span className="font-semibold">
-                          {users |> User.findById(editorId) |> User.name |> str}
-                        </span>
-                        <span>
-                          {" on " ++
-                          (answer
-                          |> Answer.updatedAt
-                          |> DateTime.stingToFormatedTime(DateTime.DateWithYearAndTime)) |> str}
-                        </span>
-                      </div>
-                    </div>
-                  | None => React.null
-                  }}
-                </div>
-                <div className="flex flex-row justify-between items-center pl-2 px-3 md:px-6 pb-4">
-                  <div className="text-center">
-                    <div className="flex flex-row">
-                      <QuestionsShow__LikeManager
-                        likes answerId={answer |> Answer.id} currentUserId addLikeCB removeLikeCB
-                      />
-                      <div className="mr-1 md:mr-2">
-                        <div
-                          className="flex items-end justify-center h-8 w-8 md:h-10 md:w-10 p-1 md:p-2">
-                          <i className="far fa-comments text-xl text-gray-600" />
-                        </div>
-                        <p className="text-xs pb-1">
-                          {commentsForAnswer |> List.length |> string_of_int |> str}
-                        </p>
-                      </div>
-                    </div>
-                  </div>
-                  <QuestionsShow__UserShow
-                    user createdAt={answer |> Answer.createdAt} textForTimeStamp="Answered"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-          <QuestionsShow__CommentShow
-            comments=commentsForAnswer
-            users
-            commentableType="Answer"
-            commentableId={answer |> Answer.id}
-            addCommentCB
-            currentUserId
-            archiveCB
-            isCoach
-          />
-        </div>}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__ArchiveManager.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__ArchiveManager.res
deleted file mode 100644
index 78c8fac..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__ArchiveManager.res
+++ /dev/null
@@ -1,45 +0,0 @@
-let str = React.string
-
-module ArchiveQuery = %graphql(`
-   mutation ArchiveCommunityResourceMutation($id: ID!, $resourceType: String!) {
-    archiveCommunityResource(id: $id, resourceType: $resourceType){
-       success
-     }
-   }
- `)
-
-let archive = (id, resourceType, archiveCB, setSaving, event) =>
-  Webapi.Dom.window |> Webapi.Dom.Window.confirm(
-    "Are you sure you want to delete this " ++
-    ((resourceType |> Js.String.toLowerCase) ++
-    ". You cannot undo this."),
-  )
-    ? {
-        event |> ReactEvent.Mouse.preventDefault
-        setSaving(_ => true)
-        ArchiveQuery.make(~id, ~resourceType, ())
-        |> GraphqlQuery.sendQuery
-        |> Js.Promise.then_(response => {
-          response["archiveCommunityResource"]["success"]
-            ? {
-                Notification.success("Success", resourceType ++ " archived successfully")
-                archiveCB(id, resourceType)
-              }
-            : Notification.error("Something went wrong", "Please refresh the page and try again")
-          Js.Promise.resolve()
-        })
-        |> ignore
-      }
-    : ()
-
-@react.component
-let make = (~id, ~resourceType, ~archiveCB) => {
-  let (saving, setSaving) = React.useState(() => false)
-  <a
-    title={"Archive " ++ resourceType}
-    onClick={archive(id, resourceType, archiveCB, setSaving)}
-    className="flex items-center justify-center whitespace-no-wrap text-xs font-semibold py-1 px-3 flex-shrink-0 bg-transparent text-gray-700 hover:bg-red-100 hover:text-red-700 cursor-pointer">
-    {saving ? <FaIcon classes="fas fa-spinner fa-spin" /> : <FaIcon classes="fas fa-trash-alt" />}
-    {resourceType == "Comment" ? React.null : <span className="ml-1"> {"Delete" |> str} </span>}
-  </a>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Comment.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Comment.res
deleted file mode 100644
index c488cbe..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Comment.res
+++ /dev/null
@@ -1,52 +0,0 @@
-type t = {
-  id: string,
-  value: string,
-  commentableId: string,
-  commentableType: string,
-  creatorId: string,
-  createdAt: string,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    value: json |> field("value", string),
-    creatorId: json |> field("creatorId", string),
-    commentableId: json |> field("commentableId", string),
-    commentableType: json |> field("commentableType", string),
-    createdAt: json |> field("createdAt", string),
-  }
-}
-
-let creatorId = t => t.creatorId
-
-let value = t => t.value
-
-let id = t => t.id
-
-let createdAt = t => t.createdAt
-let commentsForQuestion = comments =>
-  comments |> List.filter(comment => comment.commentableType == "Question")
-
-let commentsForAnswer = (answerId, comments) =>
-  comments
-  |> List.filter(comment => comment.commentableType == "Answer")
-  |> List.filter(comment => comment.commentableId == answerId)
-
-let addComment = (comments, comment) =>
-  comments |> List.rev |> List.append(list{comment}) |> List.rev
-
-let delete = (id, comments) => comments |> List.filter(c => c.id != id)
-
-let create = (id, value, creatorId, commentableId, commentableType, createdAt) => {
-  id: id,
-  value: value,
-  creatorId: creatorId,
-  commentableId: commentableId,
-  commentableType: commentableType,
-  createdAt: createdAt,
-}
-
-let sort = comments =>
-  comments |> List.sort((c1, c2) => (c1.id |> int_of_string) - (c2.id |> int_of_string))
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__CommentShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__CommentShow.res
deleted file mode 100644
index 3de5fa0..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__CommentShow.res
+++ /dev/null
@@ -1,70 +0,0 @@
-open QuestionsShow__Types
-
-let str = React.string
-
-@react.component
-let make = (
-  ~comments,
-  ~users,
-  ~commentableType,
-  ~commentableId,
-  ~addCommentCB,
-  ~currentUserId,
-  ~archiveCB,
-  ~isCoach,
-) => {
-  let (showAll, setShowAll) = React.useState(() => comments |> List.length <= 3)
-
-  let (commentsToShow, allCommentsShown) = switch (showAll, comments |> Comment.sort) {
-  | (false, list{e1, e2, e3, _e4, ..._rest}) => (list{e1, e2, e3}, false)
-  | (_, comments) => (comments, true)
-  }
-
-  <ul
-    className="list-reset max-w-3xl w-full flex flex-col mx-auto items-center justify-center px-3 lg:px-6">
-    {commentsToShow
-    |> List.sort((commentA, commentB) =>
-      DateFns.differenceInSeconds(
-        commentA |> Comment.createdAt |> DateFns.parseString,
-        commentB |> Comment.createdAt |> DateFns.parseString,
-      ) |> int_of_float
-    )
-    |> List.map(comment => {
-      let commentText =
-        (comment |> Comment.value) ++
-          (" - **" ++
-          ((users |> User.findById(comment |> Comment.creatorId) |> User.name) ++
-            ("** on " ++
-            (comment
-            |> Comment.createdAt
-            |> DateFns.parseString
-            |> DateFns.format("Do MMMM, YYYY")))))
-
-      <li
-        key={comment |> Comment.id} className="w-full text-left border border-gray-400 border-t-0">
-        <div className="flex w-full leading-normal text-xs bg-white justify-between">
-          <span className="flex items-center px-2 py-1 md:px-4 md:py-2">
-            <MarkdownBlock markdown=commentText profile=Markdown.Comment />
-          </span>
-          {isCoach || comment |> Comment.creatorId == currentUserId
-            ? <QuestionsShow__ArchiveManager
-                id={comment |> Comment.id} resourceType="Comment" archiveCB
-              />
-            : React.null}
-        </div>
-      </li>
-    })
-    |> Array.of_list
-    |> ReasonReact.array}
-    {allCommentsShown
-      ? <QuestionsShow__AddComment commentableType commentableId addCommentCB currentUserId />
-      : React.null}
-    {!allCommentsShown
-      ? <a
-          onClick={_ => setShowAll(_ => true)}
-          className="bg-gray-200 rounded-full cursor-pointer border py-1 px-3 flex mx-auto appearance-none text-xs font-semibold hover:bg-primary-100 hover:text-primary-500 -mt-3">
-          {"Show More" |> str}
-        </a>
-      : ReasonReact.null}
-  </ul>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Like.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Like.res
deleted file mode 100644
index 88cc1af..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Like.res
+++ /dev/null
@@ -1,30 +0,0 @@
-type t = {
-  id: string,
-  userId: string,
-  answerId: string,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    userId: json |> field("userId", string),
-    answerId: json |> field("answerId", string),
-  }
-}
-
-let id = t => t.id
-
-let likesForAnswer = (answerId, likes) => likes |> List.filter(like => like.answerId == answerId)
-
-let likeByCurrentUser = (answerId, currentUserId, likes) =>
-  likesForAnswer(answerId, likes) |> List.filter(like => like.userId == currentUserId)
-
-let currentUserLiked = (answerId, currentUserId, likes) =>
-  likeByCurrentUser(answerId, currentUserId, likes) |> ListUtils.isNotEmpty
-
-let addLike = (like, likes) => likes |> List.append(list{like})
-
-let removeLike = (id, likes) => likes |> List.filter(like => like.id != id)
-
-let create = (id, userId, answerId) => {id: id, userId: userId, answerId: answerId}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__LikeManager.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__LikeManager.res
deleted file mode 100644
index 1a46d19..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__LikeManager.res
+++ /dev/null
@@ -1,123 +0,0 @@
-open QuestionsShow__Types
-
-let str = React.string
-
-module CreateAnswerLikeQuery = %graphql(`
-  mutation CreateAnswerLikeMutation($answerId: ID!) {
-    createAnswerLike(answerId: $answerId) @bsVariant {
-      answerLikeId
-      errors
-    }
-  }
-`)
-
-module DestroyAnswerLikeQuery = %graphql(`
-  mutation DestroyAnswerLikeMutation($id: ID!) {
-    destroyAnswerLike(id: $id) {
-      success
-    }
-  }
-  `)
-
-module CreateAnswerLikeError = {
-  type t = [#LikeExists | #BlankAnswerId]
-
-  let notification = error =>
-    switch error {
-    | #LikeExists => ("Oops!", "You have already liked the answer.")
-    | #BlankAnswerId => ("Oops!", "Answer ID is required for adding a like.")
-    }
-}
-
-module CreateAnswerLikeErrorHandler = GraphqlErrorHandler.Make(CreateAnswerLikeError)
-
-let iconClasses = (liked, saving) => {
-  let classes = "text-xl text-gray-600"
-  classes ++ if saving {
-    " fas fa-thumbs-up cursor-pointer text-primary-200"
-  } else if liked {
-    " fas fa-thumbs-up cursor-pointer text-primary-400"
-  } else {
-    " far fa-thumbs-up cursor-pointer"
-  }
-}
-let handleCreateResponse = (id, currentUserId, answerId, setSaving, addLikeCB) => {
-  let like = Like.create(id, currentUserId, answerId)
-  setSaving(_ => false)
-  addLikeCB(like)
-}
-let handleAnswerLike = (
-  saving,
-  liked,
-  setSaving,
-  answerId,
-  currentUserId,
-  likes,
-  removeLikeCB,
-  handleCreateResponse,
-  addLikeCB,
-  event,
-) => {
-  event |> ReactEvent.Mouse.preventDefault
-  saving
-    ? ()
-    : {
-        setSaving(_ => true)
-        if liked {
-          let id = Like.likeByCurrentUser(answerId, currentUserId, likes) |> List.hd |> Like.id
-          DestroyAnswerLikeQuery.make(~id, ())
-          |> GraphqlQuery.sendQuery
-          |> Js.Promise.then_(_response => {
-            removeLikeCB(id)
-            setSaving(_ => false)
-            Js.Promise.resolve()
-          })
-          |> ignore
-        } else {
-          CreateAnswerLikeQuery.make(~answerId, ())
-          |> GraphqlQuery.sendQuery
-          |> Js.Promise.then_(response =>
-            switch response["createAnswerLike"] {
-            | #AnswerLikeId(answerLikeId) =>
-              handleCreateResponse(answerLikeId, currentUserId, answerId, setSaving, addLikeCB)
-              Js.Promise.resolve()
-            | #Errors(errors) => Js.Promise.reject(CreateAnswerLikeErrorHandler.Errors(errors))
-            }
-          )
-          |> CreateAnswerLikeErrorHandler.catch(() => setSaving(_ => false))
-          |> ignore
-        }
-      }
-}
-
-@react.component
-let make = (~likes, ~answerId, ~currentUserId, ~addLikeCB, ~removeLikeCB) => {
-  let liked = likes |> Like.currentUserLiked(answerId, currentUserId)
-  let (saving, setSaving) = React.useState(() => false)
-
-  <div className="mr-1 md:mr-2">
-    <div
-      className="cursor-pointer"
-      title={(liked ? "Unlike" : "Like") ++ " Answer"}
-      onClick={handleAnswerLike(
-        saving,
-        liked,
-        setSaving,
-        answerId,
-        currentUserId,
-        likes,
-        removeLikeCB,
-        handleCreateResponse,
-        addLikeCB,
-      )}>
-      <div
-        className="flex items-center justify-center rounded-full hover:bg-gray-100 h-8 w-8 md:h-10 md:w-10 p-1 md:p-2"
-        key={iconClasses(liked, saving)}>
-        <i className={iconClasses(liked, saving)} />
-      </div>
-      <p className="text-xs pb-1">
-        {likes |> Like.likesForAnswer(answerId) |> List.length |> string_of_int |> str}
-      </p>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__LinkedTarget.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__LinkedTarget.res
deleted file mode 100644
index bb6da8f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__LinkedTarget.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type t = {
-  id: string,
-  title: string,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    title: json |> field("title", string),
-  }
-}
-
-let id = t => t.id
-
-let title = t => t.title
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Question.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Question.res
deleted file mode 100644
index 325ee01..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Question.res
+++ /dev/null
@@ -1,46 +0,0 @@
-type t = {
-  id: string,
-  title: string,
-  description: string,
-  creatorId: string,
-  editorId: option<string>,
-  createdAt: string,
-  updatedAt: string,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    title: json |> field("title", string),
-    description: json |> field("description", string),
-    creatorId: json |> field("creatorId", string),
-    editorId: json |> field("editorId", nullable(string)) |> Js.Null.toOption,
-    createdAt: json |> field("createdAt", string),
-    updatedAt: json |> field("updatedAt", string),
-  }
-}
-
-let id = t => t.id
-
-let description = t => t.description
-
-let title = t => t.title
-
-let creatorId = t => t.creatorId
-
-let editorId = t => t.editorId
-
-let createdAt = t => t.createdAt
-
-let updatedAt = t => t.updatedAt
-
-let create = (id, title, description, creatorId, editorId, createdAt, updatedAt) => {
-  id: id,
-  title: title,
-  description: description,
-  creatorId: creatorId,
-  editorId: editorId,
-  createdAt: createdAt,
-  updatedAt: updatedAt,
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__QuestionEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__QuestionEditor.res
deleted file mode 100644
index 8efd113..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__QuestionEditor.res
+++ /dev/null
@@ -1,420 +0,0 @@
-let str = React.string
-
-open QuestionsShow__Types
-
-type similar = {
-  search: string,
-  suggestions: array<QuestionSuggestion.t>,
-}
-
-type state = {
-  title: string,
-  titleTimeoutId: option<Js.Global.timeoutId>,
-  similar: similar,
-  searching: bool,
-  description: string,
-  saving: bool,
-}
-
-let computeInitialState = question => {
-  let (title, description) = switch question {
-  | Some(question) => (question |> Question.title, question |> Question.description)
-  | None => ("", "")
-  }
-
-  {
-    title: title,
-    description: description,
-    titleTimeoutId: None,
-    similar: {
-      search: "",
-      suggestions: [],
-    },
-    searching: false,
-    saving: false,
-  }
-}
-
-type action =
-  | UpdateTitle(string)
-  | UpdateTitleAndTimeout(string, Js.Global.timeoutId)
-  | UpdateDescription(string)
-  | BeginSaving
-  | FailSaving
-  | BeginSearching
-  | FinishSearching(string, array<QuestionSuggestion.t>)
-  | FailSearching
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateTitle(title) =>
-    let similar = title |> String.trim == "" ? {search: "", suggestions: []} : state.similar
-
-    {...state, title: title, similar: similar}
-  | UpdateTitleAndTimeout(title, timeoutId) => {
-      ...state,
-      title: title,
-      titleTimeoutId: Some(timeoutId),
-    }
-  | UpdateDescription(description) => {...state, description: description}
-  | BeginSaving => {...state, saving: true}
-  | FailSaving => {...state, saving: false}
-  | BeginSearching => {...state, searching: true}
-  | FinishSearching(search, suggestions) => {
-      ...state,
-      searching: false,
-      similar: {
-        search: search,
-        suggestions: suggestions,
-      },
-    }
-  | FailSearching => {...state, searching: false}
-  }
-
-module SimilarQuestionsQuery = %graphql(`
-    query SimilarQuestionsQuery($communityId: ID!, $title: String!) {
-      similarQuestions(communityId: $communityId, title: $title) {
-        id
-        title
-        createdAt
-        answersCount
-      }
-    }
-  `)
-
-let searchForSimilarQuestions = (send, title, communityId, ()) => {
-  send(BeginSearching)
-
-  let trimmedTitle = title |> String.trim
-
-  SimilarQuestionsQuery.make(~communityId, ~title=trimmedTitle, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result => {
-    let suggestions = result["similarQuestions"] |> Array.map(QuestionSuggestion.makeFromJs)
-    send(FinishSearching(trimmedTitle, suggestions))
-    Js.Promise.resolve()
-  })
-  |> Js.Promise.catch(e => {
-    Js.log(e)
-    Notification.warn(
-      "Oops!",
-      "We failed to fetch similar questions from the server! Our team has been notified about this error.",
-    )
-    send(FailSaving)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let isInvalidString = s => s |> String.trim == ""
-
-let updateTitleAndSearch = (state, send, communityId, title) => {
-  state.titleTimeoutId->Belt.Option.forEach(Js.Global.clearTimeout)
-
-  let trimmedTitle = title |> String.trim
-
-  if title |> isInvalidString || trimmedTitle == state.similar.search {
-    send(UpdateTitle(title))
-  } else {
-    let timeoutId = Js.Global.setTimeout(
-      searchForSimilarQuestions(send, trimmedTitle, communityId),
-      1500,
-    )
-
-    send(UpdateTitleAndTimeout(title, timeoutId))
-  }
-}
-
-module CreateQuestionQuery = %graphql(`
-  mutation CreateQuestionQuery($title: String!, $description: String!, $communityId: ID!, $targetId: ID) {
-    createQuestion(description: $description, title: $title, communityId: $communityId, targetId: $targetId) @bsVariant {
-      questionId
-      errors
-    }
-  }
-`)
-
-module UpdateQuestionQuery = %graphql(`
-  mutation UpdateQuestionQuery($id: ID!, $title: String!, $description: String!) {
-    updateQuestion(id: $id, title: $title, description: $description) @bsVariant {
-      success
-      errors
-    }
-  }
-`)
-
-module CreateQuestionError = {
-  type t = [
-    | #InvalidLengthTitle
-    | #InvalidLengthDescription
-    | #BlankCommunityID
-  ]
-
-  let notification = error =>
-    switch error {
-    | #InvalidLengthTitle => (
-        "InvalidLengthTitle",
-        "Supplied title must be between 1 and 250 characters in length",
-      )
-    | #InvalidLengthDescription => (
-        "InvalidLengthDescription",
-        "Supplied description must be greater than 1 characters in length",
-      )
-    | #BlankCommunityID => ("BlankCommunityID", "Community id is required for creating Answer")
-    }
-}
-
-module UpdateQuestionError = {
-  type t = [#InvalidLengthTitle | #InvalidLengthDescription]
-
-  let notification = error =>
-    switch error {
-    | #InvalidLengthTitle => (
-        "InvalidLengthTitle",
-        "Supplied title must be between 1 and 250 characters in length",
-      )
-    | #InvalidLengthDescription => (
-        "InvalidLengthDescription",
-        "Supplied description must be greater than 1 characters in length",
-      )
-    }
-}
-
-let handleResponseCB = (id, title) => {
-  let window = Webapi.Dom.window
-  let parameterizedTitle =
-    title |> Js.String.toLowerCase |> Js.String.replaceByRe(%re("/[^0-9a-zA-Z]+/gi"), "-")
-  let redirectPath = "/questions/" ++ (id ++ ("/" ++ parameterizedTitle))
-  redirectPath |> Webapi.Dom.Window.setLocation(window)
-}
-
-let handleBack = () => Webapi.Dom.window |> Webapi.Dom.Window.history |> Webapi.Dom.History.back
-
-module CreateQuestionErrorHandler = GraphqlErrorHandler.Make(CreateQuestionError)
-
-module UpdateQuestionErrorHandler = GraphqlErrorHandler.Make(UpdateQuestionError)
-
-let saveDisabled = state => state.description |> isInvalidString || state.title |> isInvalidString
-
-let handleCreateOrUpdateQuestion = (
-  state,
-  send,
-  communityId,
-  target,
-  question,
-  updateQuestionCB,
-  event,
-) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  if !saveDisabled(state) {
-    send(BeginSaving)
-
-    switch question {
-    | Some(question) =>
-      let id = question |> Question.id
-      UpdateQuestionQuery.make(~id, ~title=state.title, ~description=state.description, ())
-      |> GraphqlQuery.sendQuery
-      |> Js.Promise.then_(response =>
-        switch response["updateQuestion"] {
-        | #Success(updated) =>
-          switch (updated, updateQuestionCB) {
-          | (true, Some(questionCB)) =>
-            questionCB(state.title, state.description)
-            Notification.success("Done!", "Question Updated sucessfully")
-          | (_, _) =>
-            Notification.error("Something went wrong", "Please refresh the page and try again")
-          }
-          Js.Promise.resolve()
-        | #Errors(errors) => Js.Promise.reject(UpdateQuestionErrorHandler.Errors(errors))
-        }
-      )
-      |> UpdateQuestionErrorHandler.catch(() => send(FailSaving))
-      |> ignore
-    | None =>
-      let targetId = target |> OptionUtils.map(LinkedTarget.id)
-
-      CreateQuestionQuery.make(
-        ~description=state.description,
-        ~title=state.title,
-        ~communityId,
-        ~targetId?,
-        (),
-      )
-      |> GraphqlQuery.sendQuery
-      |> Js.Promise.then_(response =>
-        switch response["createQuestion"] {
-        | #QuestionId(questionId) =>
-          handleResponseCB(questionId, state.title)
-          Notification.success("Done!", "Question has been saved.")
-          Js.Promise.resolve()
-        | #Errors(errors) => Js.Promise.reject(CreateQuestionErrorHandler.Errors(errors))
-        }
-      )
-      |> CreateQuestionErrorHandler.catch(() => send(FailSaving))
-      |> ignore
-    }
-  } else {
-    Notification.error("Error!", "Question title and description must be present.")
-  }
-}
-
-let suggestions = state => {
-  let suggestions = state.similar.suggestions
-
-  suggestions |> ArrayUtils.isNotEmpty
-    ? <div className="pt-3">
-        <span className="tracking-wide text-gray-900 text-xs font-semibold">
-          {"Similar Questions" |> str}
-        </span>
-        {state.searching
-          ? <span className="ml-2"> <FaIcon classes="fa fa-spinner fa-pulse" /> </span>
-          : React.null}
-        {suggestions
-        |> Array.map(suggestion => {
-          let askedOn =
-            suggestion |> QuestionSuggestion.createdAt |> DateTime.format(DateTime.OnlyDate)
-          let (answersText, answersClasses) = switch suggestion |> QuestionSuggestion.answersCount {
-          | 0 => ("No answers", "bg-gray-300 text-gray-700")
-          | 1 => ("1 answer", "bg-green-500 text-white")
-          | n => ((n |> string_of_int) ++ " answers", "bg-green-500 text-white")
-          }
-
-          <a
-            href={"/questions/" ++ (suggestion |> QuestionSuggestion.id)}
-            target="_blank"
-            key={suggestion |> QuestionSuggestion.id}
-            className="flex w-full items-center justify-between mt-1 p-3 rounded cursor-pointer border bg-gray-100 hover:text-primary-500 hover:bg-gray-200">
-            <div className="flex flex-col min-w-0">
-              <h5
-                title={suggestion |> QuestionSuggestion.title}
-                className="font-semibold text-sm leading-snug md:text-base pr-1 truncate flex-1">
-                {suggestion |> QuestionSuggestion.title |> str}
-              </h5>
-              <p className="text-xs mt-1 leading-tight text-gray-800">
-                {"Asked on " ++ askedOn |> str}
-              </p>
-            </div>
-            <div
-              className={"text-xs px-1 py-px ml-2 rounded font-semibold flex-shrink-0 " ++
-              answersClasses}>
-              {answersText |> str}
-            </div>
-          </a>
-        })
-        |> React.array}
-      </div>
-    : React.null
-}
-
-let searchingIndicator = state =>
-  state.similar.suggestions |> ArrayUtils.isEmpty && state.searching
-    ? <div className="md:flex-1 pl-1 pb-3 md:p-0">
-        <FaIcon classes="fas fa-spinner fa-pulse" />
-      </div>
-    : React.null
-
-@react.component
-let make = (~communityId, ~showBackButton=true, ~target, ~question=?, ~updateQuestionCB=?) => {
-  let (state, send) = React.useReducerWithMapState(reducer, question, computeInitialState)
-  <DisablingCover disabled=state.saving>
-    <div className="bg-gray-100">
-      <div className="flex-1 flex flex-col">
-        <div className="px-3 lg:px-0">
-          {showBackButton
-            ? <div className="max-w-3xl w-full mx-auto mt-5 pb-2">
-                <a className="btn btn-subtle" onClick={_ => handleBack()}>
-                  <i className="fas fa-arrow-left" />
-                  <span className="ml-2"> {"Back" |> str} </span>
-                </a>
-              </div>
-            : React.null}
-        </div>
-        {switch target {
-        | Some(target) =>
-          <div className="max-w-3xl w-full mt-5 mx-auto px-3 lg:px-0">
-            <div
-              className="flex py-4 px-4 md:px-5 w-full bg-white border border-primary-500  shadow-md rounded-lg justify-between items-center mb-2">
-              <p className="w-3/5 md:w-4/5 text-sm">
-                <span className="font-semibold block text-xs"> {"Linked Target: " |> str} </span>
-                <span> {target |> LinkedTarget.title |> str} </span>
-              </p>
-              <a href="./new_question" className="btn btn-default"> {"Clear" |> str} </a>
-            </div>
-          </div>
-        | None => React.null
-        }}
-        <h4 className="max-w-3xl w-full mx-auto pb-2 mt-2 px-3 lg:px-0">
-          {switch question {
-          | Some(_) => "Edit question"
-          | None => "Ask a new question"
-          } |> str}
-        </h4>
-        <div className="md:px-3">
-          <div
-            className="mb-8 max-w-3xl w-full mx-auto relative border-t border-b md:border-0 bg-white md:shadow md:rounded-lg">
-            <div className="flex w-full flex-col p-3 md:p-6">
-              <label
-                className="inline-block tracking-wide text-gray-900 text-xs font-semibold mb-2"
-                htmlFor="title">
-                {"Question" |> str}
-              </label>
-              <input
-                id="title"
-                value=state.title
-                className="appearance-none block w-full bg-white text-gray-900 font-semibold border border-gray-400 rounded py-3 px-4 mb-4 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                onChange={event => {
-                  let newTitle = ReactEvent.Form.target(event)["value"]
-
-                  switch question {
-                  | Some(_) => send(UpdateTitle(newTitle))
-                  | None => updateTitleAndSearch(state, send, communityId, newTitle)
-                  }
-                }}
-                placeholder="Ask your question here briefly."
-              />
-              <label
-                className="inline-block tracking-wide text-gray-900 text-xs font-semibold mb-2"
-                htmlFor="description">
-                {"Description" |> str}
-              </label>
-              <div className="w-full flex flex-col">
-                <MarkdownEditor
-                  textareaId="description"
-                  onChange={markdown => send(UpdateDescription(markdown))}
-                  value=state.description
-                  placeholder="Your description gives people the information they need to help you answer your question. You can use Markdown to format this text."
-                  profile=Markdown.QuestionAndAnswer
-                  maxLength=10000
-                />
-                <div>
-                  {suggestions(state)}
-                  <div
-                    className="flex flex-col md:flex-row justify-end mt-3 items-center md:items-start">
-                    {searchingIndicator(state)}
-                    <button
-                      disabled={saveDisabled(state)}
-                      onClick={handleCreateOrUpdateQuestion(
-                        state,
-                        send,
-                        communityId,
-                        target,
-                        question,
-                        updateQuestionCB,
-                      )}
-                      className="btn btn-primary border border-transparent w-full md:w-auto">
-                      {switch question {
-                      | Some(_) => "Update Question"
-                      | None => "Post Your Question"
-                      } |> str}
-                    </button>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </DisablingCover>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__QuestionSuggestion.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__QuestionSuggestion.res
deleted file mode 100644
index 1b9f508..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__QuestionSuggestion.res
+++ /dev/null
@@ -1,18 +0,0 @@
-type t = {
-  id: string,
-  title: string,
-  createdAt: Js.Date.t,
-  answersCount: int,
-}
-
-let id = t => t.id
-let title = t => t.title
-let createdAt = t => t.createdAt
-let answersCount = t => t.answersCount
-
-let makeFromJs = jsObject => {
-  id: jsObject["id"],
-  title: jsObject["title"],
-  createdAt: jsObject["createdAt"] |> Json.Decode.string |> DateFns.parseString,
-  answersCount: jsObject["answersCount"],
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Target.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Target.res
deleted file mode 100644
index 7610934..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Target.res
+++ /dev/null
@@ -1,15 +0,0 @@
-type t = {
-  id: option<string>,
-  title: string,
-}
-
-let id = t => t.id
-let title = t => t.title
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", nullable(string)) |> Js.Null.toOption,
-    title: json |> field("title", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Types.res
deleted file mode 100644
index 550b050..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__Types.res
+++ /dev/null
@@ -1,8 +0,0 @@
-module Answer = QuestionsShow__Answer
-module Comment = QuestionsShow__Comment
-module Question = QuestionsShow__Question
-module User = QuestionsShow__User
-module Like = QuestionsShow__Like
-module Target = QuestionsShow__Target
-module LinkedTarget = QuestionsShow__LinkedTarget
-module QuestionSuggestion = QuestionsShow__QuestionSuggestion
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__User.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__User.res
deleted file mode 100644
index 7c9f009..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__User.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  avatarUrl: string,
-  title: string,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    avatarUrl: json |> field("avatarUrl", string),
-    title: json |> field("title", string),
-  }
-}
-
-let name = t => t.name
-
-let avatarUrl = t => t.avatarUrl
-
-let title = t => t.title
-
-let findById = (id, users) =>
-  users |> ListUtils.unsafeFind(
-    user => user.id == id,
-    "Unable to find user with id " ++ (id ++ "in QuestionShow__UserData"),
-  )
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__UserShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__UserShow.res
deleted file mode 100644
index 6a0284a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/questions/QuestionsShow__UserShow.res
+++ /dev/null
@@ -1,24 +0,0 @@
-open QuestionsShow__Types
-
-let str = React.string
-
-@react.component
-let make = (~user, ~createdAt, ~textForTimeStamp) =>
-  <div>
-    <p className="text-xs text-gray-800">
-      {textForTimeStamp ++
-      (" on " ++
-      (createdAt |> DateFns.parseString |> DateFns.format("Do MMMM, YYYY HH:mm"))) |> str}
-    </p>
-    <div
-      className="p-2 flex flex-row items-center bg-orange-100 text-orange-900 border border-orange-200 rounded-lg mt-1">
-      <div
-        className="w-10 h-10 rounded-full bg-gray-500 text-white border border-yellow-400 flex items-center justify-center flex-shrink-0 overflow-hidden">
-        <img src={user |> User.avatarUrl} />
-      </div>
-      <div className="pl-2">
-        <p className="font-semibold text-xs"> {user |> User.name |> str} </p>
-        <p className="text-xs leadig-normal"> {user |> User.title |> str} </p>
-      </div>
-    </div>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CoachesSchoolIndex__Coach.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CoachesSchoolIndex__Coach.res
deleted file mode 100644
index 01102f3..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CoachesSchoolIndex__Coach.res
+++ /dev/null
@@ -1,83 +0,0 @@
-type t = {
-  id: int,
-  name: string,
-  imageUrl: string,
-  email: string,
-  title: string,
-  linkedinUrl: option<string>,
-  public: bool,
-  exited: bool,
-  connectLink: option<string>,
-  imageFileName: option<string>,
-  affiliation: option<string>,
-}
-
-let name = t => t.name
-
-let id = t => t.id
-
-let email = t => t.email
-
-let imageUrl = t => t.imageUrl
-
-let title = t => t.title
-
-let linkedinUrl = t => t.linkedinUrl
-
-let public = t => t.public
-
-let connectLink = t => t.connectLink
-
-let exited = t => t.exited
-
-let imageFileName = t => t.imageFileName
-
-let affiliation = t => t.affiliation
-
-let decode = json => {
-  open Json.Decode
-  {
-    name: json |> field("name", string),
-    id: json |> field("id", int),
-    imageUrl: json |> field("imageUrl", string),
-    email: json |> field("email", string),
-    title: json |> field("title", string),
-    linkedinUrl: json |> field("linkedinUrl", nullable(string)) |> Js.Null.toOption,
-    public: json |> field("public", bool),
-    connectLink: json |> field("connectLink", nullable(string)) |> Js.Null.toOption,
-    exited: json |> field("exited", bool),
-    imageFileName: json |> field("imageFileName", nullable(string)) |> Js.Null.toOption,
-    affiliation: json |> field("affiliation", nullable(string)) |> Js.Null.toOption,
-  }
-}
-
-let make = (
-  ~id,
-  ~name,
-  ~imageUrl,
-  ~email,
-  ~title,
-  ~linkedinUrl,
-  ~public,
-  ~connectLink,
-  ~exited,
-  ~imageFileName,
-  ~affiliation,
-) => {
-  id: id,
-  name: name,
-  imageUrl: imageUrl,
-  email: email,
-  title: title,
-  linkedinUrl: linkedinUrl,
-  public: public,
-  connectLink: connectLink,
-  exited: exited,
-  imageFileName: imageFileName,
-  affiliation: affiliation,
-}
-
-let updateList = (coaches, coach) => {
-  let oldList = coaches |> List.filter(t => t.id !== coach.id)
-  oldList |> List.rev |> List.append(list{coach}) |> List.rev |> List.sort((x, y) => x.id - y.id)
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CoachesSchoolIndex__Coach.resi b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CoachesSchoolIndex__Coach.resi
deleted file mode 100644
index 19f03c3..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CoachesSchoolIndex__Coach.resi
+++ /dev/null
@@ -1,41 +0,0 @@
-type t
-
-let decode: Js.Json.t => t
-
-let name: t => string
-
-let id: t => int
-
-let imageUrl: t => string
-
-let email: t => string
-
-let title: t => string
-
-let linkedinUrl: t => option<string>
-
-let public: t => bool
-
-let connectLink: t => option<string>
-
-let exited: t => bool
-
-let updateList: (list<t>, t) => list<t>
-
-let affiliation: t => option<string>
-
-let imageFileName: t => option<string>
-
-let make: (
-  ~id: int,
-  ~name: string,
-  ~imageUrl: string,
-  ~email: string,
-  ~title: string,
-  ~linkedinUrl: option<string>,
-  ~public: bool,
-  ~connectLink: option<string>,
-  ~exited: bool,
-  ~imageFileName: option<string>,
-  ~affiliation: option<string>,
-) => t
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CoachesSchoolIndex__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CoachesSchoolIndex__Types.res
deleted file mode 100644
index 88d7535..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CoachesSchoolIndex__Types.res
+++ /dev/null
@@ -1 +0,0 @@
-module Coach = CoachesSchoolIndex__Coach
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Author.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Author.res
deleted file mode 100644
index 78f0756..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Author.res
+++ /dev/null
@@ -1,32 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  avatarUrl: option<string>,
-  email: string,
-}
-
-let name = t => t.name
-let avatarUrl = t => t.avatarUrl
-let id = t => t.id
-let email = t => t.email
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    email: json |> field("email", string),
-    name: json |> field("name", string),
-    avatarUrl: json |> optional(field("avatarUrl", string)),
-  }
-}
-
-let create = (~id, ~name, ~email, ~avatarUrl) => {
-  id: id,
-  name: name,
-  email: email,
-  avatarUrl: avatarUrl,
-}
-
-let sort = l => l |> ArrayUtils.copyAndSort((x, y) => x.name < y.name ? -1 : 1)
-
-let updateName = (name, t) => {...t, name: name}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Form.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Form.res
deleted file mode 100644
index a4ff6fc..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Form.res
+++ /dev/null
@@ -1,208 +0,0 @@
-let str = React.string
-
-open CourseAuthors__Types
-
-module CreateCourseAuthorQuery = %graphql(`
-  mutation CreateCourseAuthorMutation($courseId: ID!, $name: String!, $email: String!) {
-    createCourseAuthor(courseId: $courseId, name: $name, email: $email){
-      courseAuthor{
-        id,
-        avatarUrl
-      }
-    }
-  }
-`)
-
-module UpdateCourseAuthorQuery = %graphql(`
-  mutation UpdateCourseAuthorMutation($id: ID!, $name: String!) {
-    updateCourseAuthor(id: $id, name: $name) {
-      success
-    }
-  }
-`)
-
-let createCourseAuthorQuery = (courseId, rootPath, email, name, setSaving, addAuthorCB) => {
-  setSaving(_ => true)
-  CreateCourseAuthorQuery.make(~courseId, ~email, ~name, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    switch response["createCourseAuthor"]["courseAuthor"] {
-    | Some(courseAuthor) =>
-      addAuthorCB(
-        Author.create(~id=courseAuthor["id"], ~name, ~email, ~avatarUrl=courseAuthor["avatarUrl"]),
-      )
-
-      ReasonReactRouter.push(rootPath)
-    | None => setSaving(_ => false)
-    }
-    Js.Promise.resolve()
-  })
-  |> Js.Promise.catch(_ => {
-    setSaving(_ => false)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let updateCourseAuthorQuery = (rootPath, author, name, setSaving, updateAuthorCB) => {
-  setSaving(_ => true)
-  let id = author |> Author.id
-  UpdateCourseAuthorQuery.make(~id, ~name, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    if response["updateCourseAuthor"]["success"] {
-      updateAuthorCB(author |> Author.updateName(name))
-      ReasonReactRouter.push(rootPath)
-    } else {
-      setSaving(_ => false)
-    }
-
-    Js.Promise.resolve()
-  })
-  |> Js.Promise.catch(_ => {
-    setSaving(_ => false)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let handleButtonClick = (
-  courseId,
-  rootPath,
-  author,
-  setSaving,
-  name,
-  email,
-  addAuthorCB,
-  updateAuthorCB,
-  event,
-) => {
-  event |> ReactEvent.Mouse.preventDefault
-  switch author {
-  | Some(author) => updateCourseAuthorQuery(rootPath, author, name, setSaving, updateAuthorCB)
-  | None => createCourseAuthorQuery(courseId, rootPath, email, name, setSaving, addAuthorCB)
-  }
-}
-
-let isInvalidEmail = email => email |> EmailUtils.isInvalid(false)
-
-let showInvalidEmailError = (email, author) =>
-  switch author {
-  | Some(_) => isInvalidEmail(email)
-  | None => email == "" ? false : isInvalidEmail(email)
-  }
-
-let showInvalidNameError = (name, author) =>
-  switch author {
-  | Some(_) => name == ""
-  | None => false
-  }
-let saveDisabled = (email, name, saving, author) =>
-  isInvalidEmail(email) ||
-  (saving ||
-  (name == "" ||
-    switch author {
-    | Some(author) => author |> Author.name == name && author |> Author.email == email
-    | None => false
-    }))
-
-let buttonText = (saving, author) =>
-  switch (saving, author) {
-  | (true, _) => "Saving"
-  | (false, Some(_)) => "Update Author"
-  | (false, None) => "Create Author"
-  }
-
-let emailInputDisabled = author =>
-  switch author {
-  | Some(_) => true
-  | None => false
-  }
-
-@react.component
-let make = (~courseId, ~rootPath, ~author, ~addAuthorCB, ~updateAuthorCB) => {
-  let (saving, setSaving) = React.useState(() => false)
-
-  let (name, setName) = React.useState(() =>
-    switch author {
-    | Some(author) => author |> Author.name
-    | None => ""
-    }
-  )
-
-  let (email, setEmail) = React.useState(() =>
-    switch author {
-    | Some(author) => author |> Author.email
-    | None => ""
-    }
-  )
-
-  <div className="w-full">
-    <DisablingCover disabled=saving>
-      <div className="mx-auto bg-white">
-        <div className="max-w-2xl p-6 mx-auto">
-          <h5 className="uppercase text-center border-b border-gray-400 pb-2 mb-4">
-            {switch author {
-            | Some(author) => author |> Author.name
-            | None => "Add new author"
-            } |> str}
-          </h5>
-          <div>
-            <label
-              className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-              htmlFor="email">
-              {"Email" |> str}
-            </label>
-            <input
-              value=email
-              onChange={event => setEmail(ReactEvent.Form.target(event)["value"])}
-              className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-              id="email"
-              type_="email"
-              placeholder="Add email here"
-              disabled={emailInputDisabled(author)}
-            />
-            <School__InputGroupError
-              message="Enter a valid Email" active={showInvalidEmailError(email, author)}
-            />
-          </div>
-          <div className="mt-5">
-            <label
-              className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-              htmlFor="name">
-              {"Name" |> str}
-            </label>
-            <input
-              value=name
-              onChange={event => setName(ReactEvent.Form.target(event)["value"])}
-              className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-              id="name"
-              type_="text"
-              placeholder="Add name here"
-            />
-            <School__InputGroupError
-              message="Enter a valid name" active={showInvalidNameError(name, author)}
-            />
-          </div>
-          <div className="w-auto mt-8">
-            <button
-              disabled={saveDisabled(email, name, saving, author)}
-              onClick={handleButtonClick(
-                courseId,
-                rootPath,
-                author,
-                setSaving,
-                name,
-                email,
-                addAuthorCB,
-                updateAuthorCB,
-              )}
-              className="w-full btn btn-large btn-primary">
-              {buttonText(saving, author) |> str}
-            </button>
-          </div>
-        </div>
-      </div>
-    </DisablingCover>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Root.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Root.res
deleted file mode 100644
index 3ac4d24..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Root.res
+++ /dev/null
@@ -1,174 +0,0 @@
-exception UnexpectedPathOnAuthorsInterface(list<string>)
-
-let str = React.string
-
-open CourseAuthors__Types
-
-type state = {
-  authors: array<Author.t>,
-  deleting: bool,
-}
-
-type action =
-  | BeginDeleting
-  | FailToDelete
-  | FinishDeleting(Author.t)
-  | AddAuthor(Author.t)
-  | UpdateAuthor(Author.t)
-
-let reducer = (state, action) =>
-  switch action {
-  | BeginDeleting => {...state, deleting: true}
-  | FailToDelete => {...state, deleting: false}
-  | FinishDeleting(author) => {
-      deleting: false,
-      authors: state.authors |> Js.Array.filter(a => a |> Author.id != (author |> Author.id)),
-    }
-  | AddAuthor(author) => {
-      ...state,
-      authors: state.authors |> Js.Array.concat([author]),
-    }
-  | UpdateAuthor(author) => {
-      ...state,
-      authors: state.authors |> Array.map(a =>
-        a |> Author.id == (author |> Author.id) ? author : a
-      ),
-    }
-  }
-
-module DeleteCourseAuthorQuery = %graphql(`
-  mutation DeleteCourseAuthorMutation($id: ID!) {
-    deleteCourseAuthor(id: $id) {
-      success
-    }
-  }
-`)
-
-let removeCourseAuthor = (send, author, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  WindowUtils.confirm(
-    "Are you sure you want to remove " ++ ((author |> Author.name) ++ " from the list of authors?"),
-    () => {
-      send(BeginDeleting)
-
-      DeleteCourseAuthorQuery.make(~id=author |> Author.id, ())
-      |> GraphqlQuery.sendQuery
-      |> Js.Promise.then_(response => {
-        if response["deleteCourseAuthor"]["success"] {
-          send(FinishDeleting(author))
-        } else {
-          send(FailToDelete)
-        }
-
-        Js.Promise.resolve()
-      })
-      |> Js.Promise.catch(_ => {
-        send(FailToDelete)
-        Js.Promise.resolve()
-      })
-      |> ignore
-    },
-  )
-}
-
-let renderAuthor = (rootPath, author, send) => {
-  let authorPath = rootPath ++ ("/" ++ (author |> Author.id))
-  <div key={author |> Author.id} className="flex w-1/2 flex-shrink-0 mb-5 px-3">
-    <div
-      className="shadow bg-white rounded-lg flex w-full border border-transparent overflow-hidden hover:border-primary-400 hover:bg-gray-100">
-      <a
-        className="w-full cursor-pointer p-4 overflow-hidden"
-        href=authorPath
-        onClick={event => {
-          ReactEvent.Mouse.preventDefault(event)
-          ReasonReactRouter.push(authorPath)
-        }}>
-        <div className="flex">
-          <span className="mr-4 flex-shrink-0">
-            {switch author |> Author.avatarUrl {
-            | Some(avatarUrl) =>
-              <img className="w-10 h-10 rounded-full object-cover" src=avatarUrl />
-            | None => <Avatar name={author |> Author.name} className="w-10 h-10 rounded-full" />
-            }}
-          </span>
-          <div className="flex flex-col">
-            <span className="text-black font-semibold text-sm">
-              {author |> Author.name |> str}
-            </span>
-            <span className="text-black font-normal text-xs">
-              {author |> Author.email |> str}
-            </span>
-          </div>
-        </div>
-      </a>
-      <div
-        className="w-10 text-sm course-faculty__list-item-remove text-gray-700 hover:text-gray-900 cursor-pointer flex items-center justify-center hover:bg-gray-200 hover:text-red-600"
-        title={"Delete " ++ (author |> Author.name)}
-        onClick={removeCourseAuthor(send, author)}>
-        <i className="fas fa-trash-alt" />
-      </div>
-    </div>
-  </div>
-}
-
-@react.component
-let make = (~courseId, ~authors) => {
-  let (state, send) = React.useReducer(reducer, {authors: authors, deleting: false})
-  let rootPath = "/school/courses/" ++ (courseId ++ "/authors")
-
-  <div className="flex flex-1 h-full overflow-y-scroll bg-gray-100">
-    <div className="flex-1 flex flex-col">
-      {
-        let url = ReasonReactRouter.useUrl()
-        switch url.path {
-        | list{"school", "courses", _courseId, "authors"} => React.null
-        | list{"school", "courses", _courseId, "authors", authorId} =>
-          let author = if authorId == "new" {
-            None
-          } else {
-            Some(
-              state.authors |> ArrayUtils.unsafeFind(
-                author => author |> Author.id == authorId,
-                "Could not find author with ID " ++
-                (authorId ++
-                (" in the list of known authors for course with ID " ++ courseId)),
-              ),
-            )
-          }
-
-          <SchoolAdmin__EditorDrawer closeDrawerCB={_ => ReasonReactRouter.push(rootPath)}>
-            <CourseAuthors__Form
-              courseId
-              rootPath
-              author
-              addAuthorCB={author => send(AddAuthor(author))}
-              updateAuthorCB={author => send(UpdateAuthor(author))}
-            />
-          </SchoolAdmin__EditorDrawer>
-        | otherPath => raise(UnexpectedPathOnAuthorsInterface(otherPath))
-        }
-      }
-      <DisablingCover disabled=state.deleting message="Deleting...">
-        <div className="flex px-6 py-2 items-center justify-between">
-          <button
-            onClick={_ => ReasonReactRouter.push(rootPath ++ "/new")}
-            className="max-w-2xl w-full flex mx-auto items-center justify-center relative bg-white text-primary-500 hover:bg-gray-100 hover:text-primary-600 hover:shadow-lg focus:outline-none border-2 border-gray-400 border-dashed hover:border-primary-300 p-6 rounded-lg mt-8 cursor-pointer">
-            <i className="fas fa-plus-circle" />
-            <h5 className="font-semibold ml-2"> {"Add New Author" |> str} </h5>
-          </button>
-        </div>
-        <div className="px-6 pb-4 mt-5 flex">
-          <div className="max-w-2xl w-full mx-auto">
-            <div className="flex -mx-3 flex-wrap">
-              {state.authors
-              |> Author.sort
-              |> Array.map(author => renderAuthor(rootPath, author, send))
-              |> ReasonReact.array}
-            </div>
-          </div>
-        </div>
-      </DisablingCover>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Types.res
deleted file mode 100644
index ed43fb6..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseAuthors__Types.res
+++ /dev/null
@@ -1 +0,0 @@
-module Author = CourseAuthors__Author
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__CourseCoach.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__CourseCoach.res
deleted file mode 100644
index 6ba5c95..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__CourseCoach.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  email: string,
-  avatarUrl: option<string>,
-  title: string,
-}
-
-let name = t => t.name
-
-let email = t => t.email
-
-let id = t => t.id
-
-let avatarUrl = t => t.avatarUrl
-
-let title = t => t.title
-
-let decode = json => {
-  open Json.Decode
-  {
-    name: json |> field("name", string),
-    email: json |> field("email", string),
-    id: json |> field("id", string),
-    avatarUrl: json |> optional(field("avatarUrl", string)),
-    title: json |> field("title", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__EnrollmentForm.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__EnrollmentForm.res
deleted file mode 100644
index f9a2770..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__EnrollmentForm.res
+++ /dev/null
@@ -1,143 +0,0 @@
-open CourseCoaches__Types
-
-let str = React.string
-
-type action =
-  | UpdateCoachesList(array<string>)
-  | UpdateCoachSearchInput(string)
-  | ToggleSaving
-
-type state = {
-  courseCoaches: array<string>,
-  coachSearchInput: string,
-  saving: bool,
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateCoachesList(courseCoaches) => {...state, courseCoaches: courseCoaches}
-  | ToggleSaving => {...state, saving: !state.saving}
-  | UpdateCoachSearchInput(coachSearchInput) => {...state, coachSearchInput: coachSearchInput}
-  }
-
-let makePayload = state => {
-  let payload = Js.Dict.empty()
-
-  Js.Dict.set(payload, "authenticity_token", AuthenticityToken.fromHead() |> Js.Json.string)
-
-  Js.Dict.set(
-    payload,
-    "coach_ids",
-    state.courseCoaches |> {
-      open Json.Encode
-      array(string)
-    },
-  )
-
-  payload
-}
-
-module SelectableCourseCoaches = {
-  type t = SchoolCoach.t
-
-  let value = t => t |> SchoolCoach.name
-  let searchString = value
-}
-
-let setCoachSearchInput = (send, value) => send(UpdateCoachSearchInput(value))
-
-let selectCoach = (send, state, coach) => {
-  let updatedCoaches = state.courseCoaches |> Js.Array.concat([coach |> SchoolCoach.id])
-  send(UpdateCoachesList(updatedCoaches))
-}
-
-let deSelectCoach = (send, state, coach) => {
-  let updatedCoaches =
-    state.courseCoaches |> Js.Array.filter(coachId => coachId != SchoolCoach.id(coach))
-  send(UpdateCoachesList(updatedCoaches))
-}
-
-module MultiselectForCourseCoaches = MultiselectInline.Make(SelectableCourseCoaches)
-
-let courseCoachEditor = (coaches, state, send) => {
-  let selected =
-    coaches |> Js.Array.filter(coach => state.courseCoaches |> Array.mem(SchoolCoach.id(coach)))
-  let unselected =
-    coaches |> Js.Array.filter(coach => !(state.courseCoaches |> Array.mem(SchoolCoach.id(coach))))
-  <MultiselectForCourseCoaches
-    placeholder="Search coaches"
-    emptySelectionMessage="No coaches selected"
-    allItemsSelectedMessage="You have selected all coaches!"
-    selected
-    unselected
-    onChange={setCoachSearchInput(send)}
-    value=state.coachSearchInput
-    onSelect={selectCoach(send, state)}
-    onDeselect={deSelectCoach(send, state)}
-  />
-}
-
-let handleResponseCB = (updateCoachesCB, json) => {
-  let courseCoaches = json |> {
-    open Json.Decode
-    field("course_coaches", array(CourseCoach.decode))
-  }
-  updateCoachesCB(courseCoaches)
-  Notification.success("Success", "Coach enrollments updated successfully")
-}
-
-let updateCourseCoaches = (state, send, courseId, updateCoachesCB) => {
-  send(ToggleSaving)
-
-  let payload = makePayload(state)
-  let url = "/school/courses/" ++ (courseId ++ "/update_coach_enrollments")
-
-  Api.create(url, payload, handleResponseCB(updateCoachesCB), () => send(ToggleSaving))
-}
-
-let computeAvailableCoaches = (schoolCoaches, courseCoaches) => {
-  let courseCoachIds = courseCoaches |> Array.map(CourseCoach.id)
-  schoolCoaches |> Js.Array.filter(coach => !(courseCoachIds |> Array.mem(coach |> SchoolCoach.id)))
-}
-
-@react.component
-let make = (~schoolCoaches, ~courseCoaches, ~courseId, ~updateCoachesCB) => {
-  let (state, send) = React.useReducer(
-    reducer,
-    {courseCoaches: [], coachSearchInput: "", saving: false},
-  )
-
-  let coaches = computeAvailableCoaches(schoolCoaches, courseCoaches)
-
-  let saveDisabled = state.courseCoaches |> ArrayUtils.isEmpty || state.saving
-
-  <div className="w-full">
-    <div className="w-full">
-      <div className="mx-auto bg-white">
-        <div className="max-w-2xl pt-6 px-6 mx-auto">
-          <h5 className="uppercase text-center border-b border-gray-400 pb-2 mb-4">
-            {"ASSIGN COACHES TO THE COURSE" |> str}
-          </h5>
-          {coaches |> Array.length > 0
-            ? <div>
-                <div id="course_coaches">
-                  <span className="inline-block mr-1 mb-2 text-xs font-semibold">
-                    {"Select coaches:" |> str}
-                  </span>
-                  {courseCoachEditor(coaches, state, send)}
-                </div>
-              </div>
-            : React.null}
-        </div>
-        <div className="flex max-w-2xl w-full mt-5 px-6 pb-5 mx-auto">
-          <button
-            disabled=saveDisabled
-            onClick={_e => updateCourseCoaches(state, send, courseId, updateCoachesCB)}
-            className="w-full btn btn-primary btn-large">
-            {"Add Course Coaches" |> str}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__InfoForm.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__InfoForm.res
deleted file mode 100644
index 3ebcef3..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__InfoForm.res
+++ /dev/null
@@ -1,146 +0,0 @@
-open CourseCoaches__Types
-
-let str = React.string
-
-type rec state = {
-  teams: array<Team.t>,
-  loading: bool,
-  stats: stats,
-}
-and stats = {
-  reviewedSubmissions: int,
-  pendingSubmissions: int,
-}
-
-let initialStats = {reviewedSubmissions: 0, pendingSubmissions: 0}
-let initialState = {teams: [], loading: true, stats: initialStats}
-
-type action =
-  | LoadCoachInfo(array<Team.t>, stats)
-  | RemoveTeam(string)
-
-let reducer = (state, action) =>
-  switch action {
-  | LoadCoachInfo(teams, stats) => {teams: teams, stats: stats, loading: false}
-  | RemoveTeam(id) => {
-      ...state,
-      teams: state.teams |> Js.Array.filter(team => Team.id(team) != id),
-    }
-  }
-
-module CoachInfoQuery = %graphql(`
-    query CoachInfoQuery($courseId: ID!, $coachId: ID!) {
-      teams(courseId: $courseId, coachId: $coachId, first: 100) {
-        nodes {
-          id,
-          name,
-          students {
-            name
-          }
-        }
-      }
-
-      coachStats(courseId: $courseId, coachId: $coachId) {
-        reviewedSubmissions
-        pendingSubmissions
-      }
-    }
-  `)
-
-let loadCoachTeams = (courseId, coachId, send) =>
-  CoachInfoQuery.make(~courseId, ~coachId, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result => {
-    let coachTeams =
-      result["teams"]["nodes"] |> OptionUtils.mapWithDefault(Team.makeArrayFromJs, [])
-
-    let stats = {
-      reviewedSubmissions: result["coachStats"]["reviewedSubmissions"],
-      pendingSubmissions: result["coachStats"]["pendingSubmissions"],
-    }
-
-    send(LoadCoachInfo(coachTeams, stats))
-    Js.Promise.resolve()
-  })
-  |> ignore
-
-let removeTeamEnrollment = (send, teamId) => send(RemoveTeam(teamId))
-
-@react.component
-let make = (~courseId, ~coach) => {
-  let (state, send) = React.useReducer(reducer, initialState)
-
-  React.useEffect1(() => {
-    loadCoachTeams(courseId, coach |> CourseCoach.id, send)
-    None
-  }, [courseId])
-  <div className="mx-auto">
-    <div className="py-6 border-b border-gray-400 bg-gray-100">
-      <div className="max-w-2xl mx-auto">
-        <div className="flex">
-          {switch coach |> CourseCoach.avatarUrl {
-          | Some(avatarUrl) => <img className="w-12 h-12 rounded-full mr-4" src=avatarUrl />
-          | None => <Avatar name={coach |> CourseCoach.name} className="w-12 h-12 mr-4" />
-          }}
-          <div className="text-sm flex flex-col justify-center">
-            <div className="text-black font-bold inline-block">
-              {coach |> CourseCoach.name |> str}
-            </div>
-            <div className="text-gray-600 inline-block"> {coach |> CourseCoach.email |> str} </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div className="max-w-2xl mx-auto">
-      {state.loading
-        ? <div className="py-3 flex">
-            {SkeletonLoading.card(~className="w-full mr-2", ())}
-            {SkeletonLoading.card(~className="w-full ml-2", ())}
-          </div>
-        : <div className="py-3 flex mt-4">
-            <div
-              className="w-full mr-2 rounded-lg shadow px-5 py-6" ariaLabel="Reviewed Submissions">
-              <div className="flex justify-between items-center">
-                <span> {"Reviewed submissions" |> str} </span>
-                <span className="text-2xl font-semibold">
-                  {state.stats.reviewedSubmissions |> string_of_int |> str}
-                </span>
-              </div>
-            </div>
-            <div
-              className="w-full ml-2 rounded-lg shadow px-5 py-6" ariaLabel="Pending Submissions">
-              <div className="flex justify-between items-center">
-                <span> {"Pending submissions" |> str} </span>
-                <span className="text-2xl font-semibold">
-                  {state.stats.pendingSubmissions |> string_of_int |> str}
-                </span>
-              </div>
-            </div>
-          </div>}
-      <span className="inline-block mr-1 my-2 text-sm font-semibold pt-5">
-        {"Students assigned to coach:" |> str}
-      </span>
-      {state.loading
-        ? <div className="max-w-2xl mx-auto p-3">
-            {SkeletonLoading.multiple(~count=2, ~element=SkeletonLoading.paragraph())}
-          </div>
-        : <div>
-            {state.teams |> ArrayUtils.isEmpty
-              ? <div
-                  className="border border-gray-400 rounded italic text-gray-600 text-xs cursor-default mt-2 p-3">
-                  {"There are no students assigned to this coach. You can assign coaches directly while editing the student details." |> str}
-                </div>
-              : state.teams
-                |> Array.map(team =>
-                  <CourseCoaches__InfoFormTeam
-                    key={Team.id(team)}
-                    team
-                    coach
-                    removeTeamEnrollmentCB={removeTeamEnrollment(send)}
-                  />
-                )
-                |> React.array}
-          </div>}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__InfoFormTeam.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__InfoFormTeam.res
deleted file mode 100644
index 8d662cc..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__InfoFormTeam.res
+++ /dev/null
@@ -1,71 +0,0 @@
-open CourseCoaches__Types
-
-let str = React.string
-
-let deleteIconClasses = deleting => deleting ? "fas fa-spinner fa-pulse" : "far fa-trash-alt"
-
-module DeleteCoachTeamEnrollmentQuery = %graphql(`
-  mutation($teamId: ID!, $coachId: ID!) {
-    deleteCoachTeamEnrollment(teamId: $teamId, coachId: $coachId) {
-      success
-    }
-  }
-`)
-
-let deleteTeamEnrollment = (team, coach, setDeleting, removeTeamEnrollmentCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  WindowUtils.confirm(
-    "Are you sure you want to remove " ++
-    ((team |> Team.name) ++
-    " from the list of assigned teams?"),
-    () => {
-      setDeleting(_ => true)
-      DeleteCoachTeamEnrollmentQuery.make(~teamId=Team.id(team), ~coachId=CourseCoach.id(coach), ())
-      |> GraphqlQuery.sendQuery
-      |> Js.Promise.then_(response => {
-        if response["deleteCoachTeamEnrollment"]["success"] {
-          removeTeamEnrollmentCB(Team.id(team))
-        } else {
-          setDeleting(_ => false)
-        }
-        response |> Js.Promise.resolve
-      })
-      |> ignore
-    },
-  )
-}
-
-@react.component
-let make = (~team, ~coach, ~removeTeamEnrollmentCB) => {
-  let (deleting, setDeleting) = React.useState(() => false)
-  <div
-    ariaLabel={"Team " ++ (team |> Team.name)}
-    className="flex items-center justify-between bg-gray-100 text-xs text-gray-900 border rounded pl-3 mt-2"
-    key={team |> Team.id}>
-    <div className="flex flex-1 justify-between items-center">
-      <div className="font-semibold w-1/2">
-        {team
-        |> Team.students
-        |> Js.Array.mapi((student, index) =>
-          <div className="p-1" key={index |> string_of_int}> {student |> str} </div>
-        )
-        |> React.array}
-      </div>
-      {team |> Team.students |> Array.length > 1
-        ? <div className="w-1/2">
-            <p className="text-tiny"> {"Team" |> str} </p>
-            <p className="font-semibold"> {team |> Team.name |> str} </p>
-          </div>
-        : React.null}
-    </div>
-    <div className="w-10 text-center flex-shrink-0 hover:text-gray-900 hover:bg-gray-200">
-      <button
-        title={"Delete " ++ Team.name(team)}
-        onClick={deleteTeamEnrollment(team, coach, setDeleting, removeTeamEnrollmentCB)}
-        className="p-3">
-        <FaIcon classes={deleteIconClasses(deleting)} />
-      </button>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__Root.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__Root.res
deleted file mode 100644
index 54541f9..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__Root.res
+++ /dev/null
@@ -1,177 +0,0 @@
-open CourseCoaches__Types
-
-let str = React.string
-
-type formVisible =
-  | None
-  | CoachEnrollmentForm
-  | CoachInfoForm(CourseCoach.t)
-
-type state = {
-  courseCoaches: array<CourseCoach.t>,
-  formVisible: formVisible,
-  saving: bool,
-}
-
-type action =
-  | UpdateFormVisible(formVisible)
-  | AddCourseCoaches(array<CourseCoach.t>)
-  | RemoveCoach(string)
-  | UpdateSaving
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateFormVisible(formVisible) => {...state, formVisible: formVisible}
-  | AddCourseCoaches(courseCoaches) => {
-      ...state,
-      courseCoaches: state.courseCoaches |> Array.append(courseCoaches),
-    }
-  | RemoveCoach(coachId) => {
-      ...state,
-      courseCoaches: state.courseCoaches |> Js.Array.filter(courseCoach =>
-        CourseCoach.id(courseCoach) !== coachId
-      ),
-    }
-  | UpdateSaving => {...state, saving: !state.saving}
-  }
-
-let handleErrorCB = (send, ()) => {
-  send(UpdateSaving)
-  Notification.error("Coach enrollment could not be deleted", "Please try again")
-}
-
-let handleResponseCB = (send, json) => {
-  send(UpdateSaving)
-  let coachId = json |> {
-    open Json.Decode
-    field("coach_id", string)
-  }
-  send(RemoveCoach(coachId))
-  Notification.success("Success", "Coach enrollment deleted successfully")
-}
-
-let removeCoach = (send, courseId, authenticityToken, coach, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  if {
-    open Webapi.Dom
-    window |> Window.confirm(
-      "Are you sure you want to remove " ++ ((coach |> CourseCoach.name) ++ " from this course?"),
-    )
-  } {
-    send(UpdateSaving)
-    let url = "/school/courses/" ++ (courseId ++ "/delete_coach_enrollment")
-    let payload = Js.Dict.empty()
-    Js.Dict.set(payload, "authenticity_token", authenticityToken |> Js.Json.string)
-    Js.Dict.set(payload, "coach_id", coach |> CourseCoach.id |> Js.Json.string)
-    Api.create(url, payload, handleResponseCB(send), handleErrorCB(send))
-  } else {
-    ()
-  }
-}
-
-@react.component
-let make = (~courseCoaches, ~schoolCoaches, ~courseId, ~authenticityToken) => {
-  let (state, send) = React.useReducer(
-    reducer,
-    {courseCoaches: courseCoaches, formVisible: None, saving: false},
-  )
-
-  let closeFormCB = () => send(UpdateFormVisible(None))
-
-  let updateCoachesCB = courseCoaches => {
-    send(AddCourseCoaches(courseCoaches))
-    send(UpdateFormVisible(None))
-  }
-
-  <DisablingCover containerClasses="w-full" disabled=state.saving>
-    <div
-      key="School admin coaches course index"
-      className="flex flex-1 h-full overflow-y-scroll bg-gray-100">
-      {switch state.formVisible {
-      | None => React.null
-      | CoachEnrollmentForm =>
-        <SchoolAdmin__EditorDrawer closeDrawerCB={_ => closeFormCB()}>
-          <CourseCoaches__EnrollmentForm
-            courseId schoolCoaches courseCoaches=state.courseCoaches updateCoachesCB
-          />
-        </SchoolAdmin__EditorDrawer>
-      | CoachInfoForm(coach) =>
-        <SchoolAdmin__EditorDrawer closeDrawerCB={_ => closeFormCB()}>
-          <CourseCoaches__InfoForm courseId coach />
-        </SchoolAdmin__EditorDrawer>
-      }}
-      <div className="flex-1 flex flex-col">
-        {Array.length(schoolCoaches) == Array.length(state.courseCoaches) ||
-          ArrayUtils.isEmpty(schoolCoaches)
-          ? React.null
-          : <div className="flex px-6 py-2 items-center justify-between">
-              <button
-                onClick={_event => {
-                  ReactEvent.Mouse.preventDefault(_event)
-                  send(UpdateFormVisible(CoachEnrollmentForm))
-                }}
-                className="max-w-2xl w-full flex mx-auto items-center justify-center relative bg-white text-primary-500 hove:bg-gray-100 hover:text-primary-600 hover:shadow-lg focus:outline-none border-2 border-gray-400 border-dashed hover:border-primary-300 p-6 rounded-lg mt-8 cursor-pointer">
-                <i className="fas fa-user-plus text-lg" />
-                <h5 className="font-semibold ml-2"> {"Assign Coaches to Course" |> str} </h5>
-              </button>
-            </div>}
-        {state.courseCoaches |> ArrayUtils.isEmpty
-          ? <div
-              className="flex justify-center bg-gray-100 border rounded p-3 italic mx-auto max-w-2xl w-full mt-8">
-              {"The course has no coaches assigned!" |> str}
-            </div>
-          : React.null}
-        <div className="px-6 pb-4 mt-5 flex flex-1">
-          <div className="max-w-2xl w-full mx-auto relative">
-            <div className="flex mt-4 -mx-3 flex-wrap" ariaLabel="List of course coaches">
-              {state.courseCoaches->Belt.SortArray.stableSortBy((a, b) =>
-                String.compare(a |> CourseCoach.name, b |> CourseCoach.name)
-              )
-              |> Array.map(coach =>
-                <div key={coach |> CourseCoach.id} className="flex w-1/2 flex-shrink-0 mb-5 px-3">
-                  <div
-                    id={coach |> CourseCoach.name}
-                    className="shadow bg-whzite cursor-pointer rounded-lg flex w-full border border-transparent overflow-hidden hover:border-primary-400 hover:bg-gray-100">
-                    <div className="flex flex-1 justify-between">
-                      <div
-                        ariaLabel={"coach-card-" ++ CourseCoach.id(coach)}
-                        onClick={_ => send(UpdateFormVisible(CoachInfoForm(coach)))}
-                        className="flex flex-1 py-4 px-4 items-center">
-                        <span className="mr-4 flex-shrink-0">
-                          {switch coach |> CourseCoach.avatarUrl {
-                          | Some(avatarUrl) =>
-                            <img className="w-10 h-10 rounded-full object-cover" src=avatarUrl />
-                          | None =>
-                            <Avatar
-                              name={coach |> CourseCoach.name} className="w-10 h-10 rounded-full"
-                            />
-                          }}
-                        </span>
-                        <div className="text-sm">
-                          <p className="text-black font-semibold mt-1">
-                            {coach |> CourseCoach.name |> str}
-                          </p>
-                          <p className="text-gray-600 font-semibold text-xs mt-px">
-                            {coach |> CourseCoach.title |> str}
-                          </p>
-                        </div>
-                      </div>
-                      <div
-                        className="w-10 text-sm course-faculty__list-item-remove text-gray-700 hover:text-gray-900 cursor-pointer flex items-center justify-center hover:bg-gray-200"
-                        ariaLabel={"Delete " ++ (coach |> CourseCoach.name)}
-                        onClick={removeCoach(send, courseId, authenticityToken, coach)}>
-                        <i className="fas fa-trash-alt" />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              )
-              |> React.array}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </DisablingCover>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__SchoolCoach.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__SchoolCoach.res
deleted file mode 100644
index 632c5dd..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__SchoolCoach.res
+++ /dev/null
@@ -1,15 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-}
-
-let id = t => t.id
-let name = t => t.name
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__Team.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__Team.res
deleted file mode 100644
index c903780..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__Team.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  students: array<string>,
-}
-
-let name = t => t.name
-let id = t => t.id
-
-let students = t => t.students
-
-let makeFromJS = teamData => {
-  id: teamData["id"],
-  name: teamData["name"],
-  students: teamData["students"] |> Array.map(student => student["name"]),
-}
-
-let makeArrayFromJs = detailsOfTeams =>
-  detailsOfTeams->Belt.Array.keepMap(OptionUtils.map(makeFromJS))
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    students: json |> field("students", array(string)),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__Types.res
deleted file mode 100644
index 19cb674..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseCoaches__Types.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module CourseCoach = CourseCoaches__CourseCoach
-module SchoolCoach = CourseCoaches__SchoolCoach
-module Team = CourseCoaches__Team
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor.res
deleted file mode 100644
index 930e6ae..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor.res
+++ /dev/null
@@ -1,181 +0,0 @@
-open CourseEditor__Types
-
-%raw(`require("courses/shared/background_patterns.css")`)
-
-let str = React.string
-
-module CoursesQuery = %graphql(`
-  query CoursesQuery {
-    courses{
-      id
-      name
-      description
-      endsAt
-      enableLeaderboard
-      about
-      publicSignup
-      featured
-      cover{
-        url
-        filename
-      }
-      thumbnail{
-        url
-        filename
-      }
-    }
-  }
-`)
-
-type editorAction =
-  | Hidden
-  | ShowForm(option<Course.t>)
-  | ShowCoverImageForm(Course.t)
-
-type state = {
-  editorAction: editorAction,
-  courses: list<Course.t>,
-}
-
-type action =
-  | UpdateEditorAction(editorAction)
-  | UpdateCourse(Course.t)
-  | UpdateCourses(list<Course.t>)
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateEditorAction(editorAction) => {...state, editorAction: editorAction}
-  | UpdateCourses(courses) => {...state, courses: courses}
-  | UpdateCourse(course) =>
-    let newCourses = course |> Course.updateList(state.courses)
-    {courses: newCourses, editorAction: Hidden}
-  }
-
-let hideEditorAction = (send, ()) => send(UpdateEditorAction(Hidden))
-
-let updateCourse = (send, course) => send(UpdateCourse(course))
-
-let courseLinks = course =>
-  <div className="flex">
-    <a
-      href={"/school/courses/" ++ ((course |> Course.id) ++ "/curriculum")}
-      className="text-primary-500 bg-gray-100 hover:bg-gray-200 border-l text-sm font-semibold items-center p-4 flex cursor-pointer">
-      {"Curriculum" |> str}
-    </a>
-    <a
-      href={"/school/courses/" ++ ((course |> Course.id) ++ "/students")}
-      className="text-primary-500 bg-gray-100 hover:bg-gray-200 border-l text-sm font-semibold items-center p-4 flex cursor-pointer">
-      {"Students" |> str}
-    </a>
-    <a
-      href={"/school/courses/" ++ ((course |> Course.id) ++ "/coaches")}
-      className="text-primary-500 bg-gray-100 hover:bg-gray-200 border-l text-sm font-semibold items-center p-4 flex cursor-pointer">
-      {"Coaches" |> str}
-    </a>
-    <a
-      href={"/school/courses/" ++ ((course |> Course.id) ++ "/exports")}
-      className="text-primary-500 bg-gray-100 hover:bg-gray-200 border-l text-sm font-semibold items-center p-4 flex cursor-pointer">
-      {"Exports" |> str}
-    </a>
-  </div>
-
-@react.component
-let make = () => {
-  let (state, send) = React.useReducer(reducer, {editorAction: Hidden, courses: list{}})
-
-  React.useEffect0(() => {
-    CoursesQuery.make()
-    |> GraphqlQuery.sendQuery
-    |> Js.Promise.then_(result => {
-      let courses =
-        result["courses"]
-        |> Js.Array.map(rawCourse => Course.makeFromJs(rawCourse))
-        |> Array.to_list
-      send(UpdateCourses(courses))
-      Js.Promise.resolve()
-    })
-    |> ignore
-
-    None
-  })
-
-  <div className="flex flex-1 h-full bg-gray-200 overflow-y-scroll">
-    {switch state.editorAction {
-    | Hidden => React.null
-    | ShowForm(course) =>
-      <CourseEditor__Form
-        course hideEditorActionCB={hideEditorAction(send)} updateCourseCB={updateCourse(send)}
-      />
-    | ShowCoverImageForm(course) =>
-      <CourseEditor__ImagesForm
-        course updateCourseCB={updateCourse(send)} closeDrawerCB={hideEditorAction(send)}
-      />
-    }}
-    <div className="flex-1 flex flex-col">
-      <div className="flex px-6 py-2 items-center justify-between">
-        <button
-          className="max-w-2xl w-full flex mx-auto items-center justify-center relative bg-white text-primary-500 hover:bg-gray-100 hover:text-primary-600 hover:shadow-md focus:outline-none border-2 border-gray-400 border-dashed hover:border-primary-300 p-6 rounded-lg mt-8 cursor-pointer"
-          onClick={_ => send(UpdateEditorAction(ShowForm(None)))}>
-          <i className="fas fa-plus-circle text-lg" />
-          <span className="font-semibold ml-2"> {"Add New Course" |> str} </span>
-        </button>
-      </div>
-      <div className="px-6 pb-4 mt-5 flex flex-1">
-        <div className="max-w-3xl flex flex-wrap mx-auto">
-          {state.courses
-          |> Course.sort
-          |> List.map(course =>
-            <div className="px-2 w-1/2" key={course |> Course.id}>
-              <div
-                key={course |> Course.id}
-                className="flex items-center overflow-hidden shadow bg-white rounded-lg mb-4">
-                <div className="w-full">
-                  <div>
-                    {switch course |> Course.thumbnail {
-                    | Some(image) =>
-                      <img className="object-cover h-48 w-full" src={image |> Course.imageUrl} />
-                    | None => <div className="h-48 svg-bg-pattern-1" />
-                    }}
-                  </div>
-                  <div className="flex w-full" key={course |> Course.id}>
-                    <a
-                      title={"Edit " ++ (course |> Course.name)}
-                      className="cursor-pointer flex flex-1 items-center py-6 px-4 hover:bg-gray-100"
-                      onClick={_ => send(UpdateEditorAction(ShowForm(Some(course))))}>
-                      <div>
-                        <span className="text-black font-semibold">
-                          {course |> Course.name |> str}
-                        </span>
-                      </div>
-                    </a>
-                    <a
-                      title={"Edit images for " ++ (course |> Course.name)}
-                      onClick={_ => send(UpdateEditorAction(ShowCoverImageForm(course)))}
-                      className="text-primary-500 bg-gray-100 hover:bg-gray-200 border-l text-sm font-semibold items-center p-4 flex cursor-pointer">
-                      {"Edit Images" |> str}
-                    </a>
-                  </div>
-                  <div className="text-gray-800 bg-gray-300 text-sm font-semibold p-4 w-full">
-                    <span> {course |> Course.description |> str} </span>
-                    <div className="mt-2">
-                      <i className="fas fa-external-link-square-alt" />
-                      <a
-                        href={"/courses/" ++ (course |> Course.id)}
-                        target="_blank"
-                        className="text-sm font-semibold cursor-pointer ml-2 text-primary-500">
-                        {"View public page" |> str}
-                      </a>
-                    </div>
-                  </div>
-                  {courseLinks(course)}
-                </div>
-              </div>
-            </div>
-          )
-          |> Array.of_list
-          |> React.array}
-        </div>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__Course.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__Course.res
deleted file mode 100644
index 67791c0..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__Course.res
+++ /dev/null
@@ -1,113 +0,0 @@
-module Image = {
-  type t = {
-    url: string,
-    filename: string,
-  }
-
-  let url = t => t.url
-  let filename = t => t.filename
-
-  let make = (url, filename) => {url: url, filename: filename}
-}
-
-type t = {
-  id: string,
-  name: string,
-  description: string,
-  endsAt: option<Js.Date.t>,
-  about: option<string>,
-  publicSignup: bool,
-  thumbnail: option<Image.t>,
-  cover: option<Image.t>,
-  featured: bool,
-}
-
-let name = t => t.name
-
-let id = t => t.id
-
-let endsAt = t => t.endsAt
-
-let about = t => t.about
-
-let publicSignup = t => t.publicSignup
-
-let description = t => t.description
-
-let featured = t => t.featured
-
-let cover = t => t.cover
-
-let thumbnail = t => t.thumbnail
-
-let imageUrl = image => image |> Image.url
-
-let filename = image => image |> Image.filename
-
-let sort = courses =>
-  courses |> List.sort((x, y) => (x.id |> int_of_string) - (y.id |> int_of_string))
-
-let updateList = (courses, course) => {
-  let oldCourses = courses |> List.filter(c => c.id !== course.id)
-  oldCourses |> List.rev |> List.append(list{course}) |> List.rev
-}
-
-let makeImageFromJs = data =>
-  switch data {
-  | Some(image) => Some(Image.make(image["url"], image["filename"]))
-  | None => None
-  }
-
-let addImages = (~coverUrl, ~thumbnailUrl, ~coverFilename, ~thumbnailFilename, t) => {
-  ...t,
-  cover: switch coverUrl {
-  | Some(coverUrl) => Some(Image.make(coverUrl, coverFilename))
-  | None => None
-  },
-  thumbnail: switch thumbnailUrl {
-  | Some(thumbnailUrl) => Some(Image.make(thumbnailUrl, thumbnailFilename))
-  | None => None
-  },
-}
-
-let create = (
-  ~id,
-  ~name,
-  ~description,
-  ~endsAt,
-  ~about,
-  ~publicSignup,
-  ~cover,
-  ~thumbnail,
-  ~featured,
-) => {
-  id: id,
-  name: name,
-  description: description,
-  endsAt: endsAt,
-  about: about,
-  publicSignup: publicSignup,
-  cover: cover,
-  thumbnail: thumbnail,
-  featured: featured,
-}
-
-let replaceImages = (cover, thumbnail, t) => {...t, cover: cover, thumbnail: thumbnail}
-
-let makeFromJs = rawCourse => {
-  let endsAt = switch rawCourse["endsAt"] {
-  | Some(endsAt) => Some(endsAt |> Json.Decode.string) |> OptionUtils.map(DateFns.parseString)
-  | None => None
-  }
-  create(
-    ~id=rawCourse["id"],
-    ~name=rawCourse["name"],
-    ~description=rawCourse["description"],
-    ~endsAt,
-    ~about=rawCourse["about"],
-    ~publicSignup=rawCourse["publicSignup"],
-    ~thumbnail=makeImageFromJs(rawCourse["thumbnail"]),
-    ~cover=makeImageFromJs(rawCourse["cover"]),
-    ~featured=rawCourse["featured"],
-  )
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__Form.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__Form.res
deleted file mode 100644
index 0381163..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__Form.res
+++ /dev/null
@@ -1,352 +0,0 @@
-open CourseEditor__Types
-
-let str = ReasonReact.string
-
-type state = {
-  name: string,
-  description: string,
-  endsAt: option<Js.Date.t>,
-  hasNameError: bool,
-  hasDescriptionError: bool,
-  hasDateError: bool,
-  about: string,
-  publicSignup: bool,
-  dirty: bool,
-  saving: bool,
-  featured: bool,
-}
-
-type action =
-  | UpdateName(string, bool)
-  | UpdateDescription(string, bool)
-  | UpdateEndsAt(option<Js.Date.t>)
-  | UpdateSaving
-  | UpdateAbout(string)
-  | UpdatePublicSignup(bool)
-  | UpdateFeatured(bool)
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateSaving => {...state, saving: !state.saving}
-  | UpdateName(name, hasNameError) => {
-      ...state,
-      name: name,
-      hasNameError: hasNameError,
-      dirty: true,
-    }
-  | UpdateDescription(description, hasDescriptionError) => {
-      ...state,
-      description: description,
-      hasDescriptionError: hasDescriptionError,
-      dirty: true,
-    }
-  | UpdateEndsAt(date) => {...state, endsAt: date, dirty: true}
-  | UpdatePublicSignup(publicSignup) => {...state, publicSignup: publicSignup, dirty: true}
-  | UpdateAbout(about) => {...state, about: about, dirty: true}
-  | UpdateFeatured(featured) => {...state, featured: featured, dirty: true}
-  }
-
-module CreateCourseQuery = %graphql(`
-   mutation CreateCourseMutation($name: String!, $description: String!, $endsAt: Date, $about: String!,$publicSignup: Boolean!,$featured: Boolean!) {
-     createCourse(name: $name, description: $description, endsAt: $endsAt, about: $about,publicSignup: $publicSignup,featured: $featured) {
-       course {
-         id
-       }
-     }
-   }
-   `)
-
-module UpdateCourseQuery = %graphql(`
-   mutation UpdateCourseMutation($id: ID!, $description: String!, $name: String!, $endsAt: Date, $about: String!, $publicSignup: Boolean!, $featured: Boolean!) {
-    updateCourse(id: $id, name: $name, description: $description, endsAt: $endsAt, about: $about, publicSignup: $publicSignup, featured: $featured){
-       course {
-         id
-       }
-      }
-   }
-   `)
-
-let updateName = (send, name) => {
-  let hasError = name |> String.trim |> String.length < 2
-  send(UpdateName(name, hasError))
-}
-
-let updateDescription = (send, description) => {
-  let lengthOfDescription = description |> String.trim |> String.length
-  let hasError = lengthOfDescription < 2 || lengthOfDescription >= 150
-  send(UpdateDescription(description, hasError))
-}
-
-let saveDisabled = state =>
-  state.hasDateError ||
-  (state.hasDescriptionError ||
-  (state.description == "" ||
-    (state.hasNameError ||
-    (state.name == "" || (!state.dirty || state.saving)))))
-
-let formClasses = value =>
-  value ? "drawer-right-form w-full opacity-50" : "drawer-right-form w-full"
-
-let handleResponseCB = (id, state, updateCourseCB, course) => {
-  let (thumbnail, cover) = switch course {
-  | Some(c) => (c |> Course.thumbnail, c |> Course.cover)
-  | None => (None, None)
-  }
-
-  let course = Course.create(
-    ~id,
-    ~name=state.name,
-    ~description=state.description,
-    ~endsAt=state.endsAt,
-    ~about=Some(state.about),
-    ~publicSignup=state.publicSignup,
-    ~thumbnail,
-    ~cover,
-    ~featured=state.featured,
-  )
-
-  updateCourseCB(course)
-}
-
-let createCourse = (state, send, updateCourseCB) => {
-  send(UpdateSaving)
-
-  let createCourseQuery = CreateCourseQuery.make(
-    ~name=state.name,
-    ~description=state.description,
-    ~endsAt=?state.endsAt |> OptionUtils.map(Date.iso8601) |> OptionUtils.map(Js.Json.string),
-    ~about=state.about,
-    ~publicSignup=state.publicSignup,
-    ~featured=state.featured,
-    (),
-  )
-
-  createCourseQuery
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result => {
-    handleResponseCB(result["createCourse"]["course"]["id"], state, updateCourseCB, None)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let updateCourse = (state, send, updateCourseCB, course) => {
-  send(UpdateSaving)
-
-  let updateCourseQuery = UpdateCourseQuery.make(
-    ~id=course |> Course.id,
-    ~name=state.name,
-    ~description=state.description,
-    ~endsAt=?state.endsAt |> OptionUtils.map(Date.iso8601) |> OptionUtils.map(Js.Json.string),
-    ~about=state.about,
-    ~publicSignup=state.publicSignup,
-    ~featured=state.featured,
-    (),
-  )
-
-  updateCourseQuery
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result => {
-    handleResponseCB(result["updateCourse"]["course"]["id"], state, updateCourseCB, Some(course))
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let booleanButtonClasses = bool => {
-  let classes = "toggle-button__button"
-  classes ++ (bool ? " toggle-button__button--active" : "")
-}
-
-let enablePublicSignupButton = (publicSignup, send) =>
-  <div className="flex items-center mt-5">
-    <label className="block tracking-wide text-xs font-semibold mr-6" htmlFor="public-signup">
-      {"Enable public signup for this course?" |> str}
-    </label>
-    <div
-      id="public-signup"
-      className="flex toggle-button__group flex-shrink-0 rounded-lg overflow-hidden">
-      <button
-        className={booleanButtonClasses(publicSignup)}
-        onClick={_ => send(UpdatePublicSignup(true))}>
-        {"Yes" |> str}
-      </button>
-      <button
-        className={booleanButtonClasses(!publicSignup)}
-        onClick={_ => send(UpdatePublicSignup(false))}>
-        {"No" |> str}
-      </button>
-    </div>
-  </div>
-
-let featuredButton = (featured, send) =>
-  <div className="flex items-center mt-5">
-    <label className="block tracking-wide text-xs font-semibold mr-6" htmlFor="featured">
-      {"Feature course in school homepage?" |> str}
-    </label>
-    <div
-      id="featured" className="flex toggle-button__group flex-shrink-0 rounded-lg overflow-hidden">
-      <button className={booleanButtonClasses(featured)} onClick={_ => send(UpdateFeatured(true))}>
-        {"Yes" |> str}
-      </button>
-      <button
-        className={booleanButtonClasses(!featured)} onClick={_ => send(UpdateFeatured(false))}>
-        {"No" |> str}
-      </button>
-    </div>
-  </div>
-
-let about = course =>
-  switch course |> Course.about {
-  | Some(about) => about
-  | None => ""
-  }
-
-let updateAboutCB = (send, about) => send(UpdateAbout(about))
-
-let computeInitialState = course =>
-  switch course {
-  | Some(course) => {
-      name: course |> Course.name,
-      description: course |> Course.description,
-      endsAt: course |> Course.endsAt,
-      hasNameError: false,
-      hasDateError: false,
-      hasDescriptionError: false,
-      dirty: false,
-      saving: false,
-      about: about(course),
-      publicSignup: course |> Course.publicSignup,
-      featured: course |> Course.featured,
-    }
-  | None => {
-      name: "",
-      description: "",
-      endsAt: None,
-      hasNameError: false,
-      hasDateError: false,
-      hasDescriptionError: false,
-      dirty: false,
-      saving: false,
-      about: "",
-      publicSignup: false,
-      featured: true,
-    }
-  }
-
-@react.component
-let make = (~course, ~hideEditorActionCB, ~updateCourseCB) => {
-  let (state, send) = React.useReducerWithMapState(reducer, course, computeInitialState)
-  <div>
-    <div className="blanket" />
-    <div className="drawer-right">
-      <div className="drawer-right__close absolute">
-        <button
-          title="close"
-          onClick={_ => hideEditorActionCB()}
-          className="flex items-center justify-center bg-white text-gray-600 font-bold py-3 px-5 rounded-l-full rounded-r-none hover:text-gray-700 focus:outline-none mt-4">
-          <i className="fas fa-times text-xl" />
-        </button>
-      </div>
-      <div className={formClasses(state.saving)}>
-        <div className="w-full">
-          <div className="mx-auto bg-white">
-            <div className="max-w-2xl p-6 mx-auto">
-              <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-                {(course == None ? "Add New Course" : "Edit Course Details") |> str}
-              </h5>
-              <div className="mt-5">
-                <label className="inline-block tracking-wide text-xs font-semibold " htmlFor="name">
-                  {"Course name" |> str}
-                </label>
-                <input
-                  className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                  id="name"
-                  type_="text"
-                  placeholder="Type course name here"
-                  maxLength=50
-                  value=state.name
-                  onChange={event => updateName(send, ReactEvent.Form.target(event)["value"])}
-                />
-                <School__InputGroupError
-                  message="A name is required (2-50 characters)" active=state.hasNameError
-                />
-              </div>
-              <div className="mt-5">
-                <label
-                  className="inline-block tracking-wide text-xs font-semibold"
-                  htmlFor="description">
-                  {"Course description" |> str}
-                </label>
-                <input
-                  className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                  id="description"
-                  type_="text"
-                  placeholder="Short description for this course"
-                  value=state.description
-                  maxLength=150
-                  onChange={event =>
-                    updateDescription(send, ReactEvent.Form.target(event)["value"])}
-                />
-              </div>
-              <School__InputGroupError
-                message="A description is required (2-150 characters)"
-                active=state.hasDescriptionError
-              />
-              <div className="mt-5">
-                <label
-                  className="tracking-wide text-xs font-semibold" htmlFor="course-ends-at-input">
-                  {"Course end date" |> str}
-                </label>
-                <span className="ml-1 text-xs"> {"(optional)" |> str} </span>
-                <HelpIcon className="ml-2" link="https://docs.pupilfirst.com/#/courses">
-                  {"If specified, course will appear as closed to students on this date. Students will not be able to make any more submissions." |> str}
-                </HelpIcon>
-                <DatePicker
-                  onChange={date => send(UpdateEndsAt(date))}
-                  selected=?state.endsAt
-                  id="course-ends-at-input"
-                />
-              </div>
-              <School__InputGroupError message="Enter a valid date" active=state.hasDateError />
-              <div id="About" className="mt-5">
-                <MarkdownEditor
-                  onChange={updateAboutCB(send)}
-                  value=state.about
-                  placeholder="Add more details about the course."
-                  profile=Markdown.Permissive
-                  maxLength=10000
-                />
-              </div>
-              {featuredButton(state.featured, send)}
-              {enablePublicSignupButton(state.publicSignup, send)}
-            </div>
-          </div>
-          <div className="mx-auto">
-            <div className="max-w-2xl p-6 mx-auto">
-              <div className="flex">
-                {switch course {
-                | Some(course) =>
-                  <button
-                    disabled={saveDisabled(state)}
-                    onClick={_ => updateCourse(state, send, updateCourseCB, course)}
-                    className="w-full btn btn-large btn-primary mt-3">
-                    {"Update Course" |> str}
-                  </button>
-
-                | None =>
-                  <button
-                    disabled={saveDisabled(state)}
-                    onClick={_ => createCourse(state, send, updateCourseCB)}
-                    className="w-full btn btn-large btn-primary mt-3">
-                    {"Create Course" |> str}
-                  </button>
-                }}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__ImagesForm.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__ImagesForm.res
deleted file mode 100644
index eb298ec..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__ImagesForm.res
+++ /dev/null
@@ -1,233 +0,0 @@
-open CourseEditor__Types
-
-let str = ReasonReact.string
-
-type action =
-  | SelectCover(string, bool)
-  | SelectThumb(string, bool)
-  | BeginUpdate
-  | ErrorOccured
-  | DoneUpdating
-
-type state = {
-  filenameThumb: option<string>,
-  filenameCover: option<string>,
-  invalidThumb: bool,
-  invalidCover: bool,
-  updating: bool,
-  formDirty: bool,
-}
-
-let updateButtonText = updating => updating ? "Updating..." : "Update Images"
-
-let formId = "course-editor-form-image-form"
-
-let filename = optionalFilename => optionalFilename |> OptionUtils.default("unknown")
-
-let handleUpdateCB = (json, state, course, updateCourseCB) => {
-  let coverUrl = json |> {
-    open Json.Decode
-    field("cover_url", optional(string))
-  }
-  let thumbnailUrl = json |> {
-    open Json.Decode
-    field("thumbnail_url", optional(string))
-  }
-
-  let newCourse =
-    course |> Course.addImages(
-      ~coverUrl,
-      ~thumbnailUrl,
-      ~coverFilename=filename(state.filenameCover),
-      ~thumbnailFilename=filename(state.filenameThumb),
-    )
-
-  updateCourseCB(newCourse)
-}
-
-let handleUpdateImages = (send, state, course, updateCourseCB, event) => {
-  event |> ReactEvent.Form.preventDefault
-  send(BeginUpdate)
-
-  let element = ReactDOMRe._getElementById(formId)
-  switch element {
-  | Some(element) =>
-    Api.sendFormData(
-      "courses/" ++ ((course |> Course.id) ++ "/attach_images"),
-      DomUtils.FormData.create(element),
-      json => {
-        Notification.success("Done!", "Images have been updated successfully.")
-        handleUpdateCB(json, state, course, updateCourseCB)
-        send(DoneUpdating)
-      },
-      () => send(ErrorOccured),
-    )
-  | None => ()
-  }
-}
-
-let updateButtonDisabled = state =>
-  if state.updating {
-    true
-  } else {
-    !state.formDirty || (state.invalidThumb || state.invalidCover)
-  }
-
-let optionalImageLabelText = (image, selectedFilename) =>
-  switch selectedFilename {
-  | Some(name) =>
-    <span>
-      {"You have selected " |> str}
-      <code className="mr-1"> {name |> str} </code>
-      {". Click to replace the current image." |> str}
-    </span>
-  | None =>
-    switch image {
-    | Some(existingImage) =>
-      <span>
-        {"Please pick a file to replace " |> str}
-        <code> {existingImage |> Course.filename |> str} </code>
-      </span>
-    | None => "Please choose an image file." |> str
-    }
-  }
-
-let maxAllowedSize = 2 * 1024 * 1024
-
-let isInvalidImageFile = image =>
-  switch image["_type"] {
-  | "image/jpeg"
-  | "image/png" => false
-  | _ => true
-  } ||
-  image["size"] > maxAllowedSize
-
-let updateImage = (send, isCover, event) => {
-  let imageFile = ReactEvent.Form.target(event)["files"][0]
-  isCover
-    ? send(SelectCover(imageFile["name"], imageFile |> isInvalidImageFile))
-    : send(SelectThumb(imageFile["name"], imageFile |> isInvalidImageFile))
-}
-
-let initialState = () => {
-  filenameThumb: None,
-  filenameCover: None,
-  invalidThumb: false,
-  invalidCover: false,
-  updating: false,
-  formDirty: false,
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | SelectThumb(name, invalid) => {
-      ...state,
-      filenameThumb: Some(name),
-      invalidThumb: invalid,
-      formDirty: true,
-    }
-  | SelectCover(name, invalid) => {
-      ...state,
-      filenameCover: Some(name),
-      invalidCover: invalid,
-      formDirty: true,
-    }
-  | BeginUpdate => {...state, updating: true}
-  | DoneUpdating => {...state, updating: false, formDirty: false}
-  | ErrorOccured => {...state, updating: false}
-  }
-
-@react.component
-let make = (~course, ~updateCourseCB, ~closeDrawerCB) => {
-  let (state, send) = React.useReducer(reducer, initialState())
-
-  let thumbnail = course |> Course.thumbnail
-  let cover = course |> Course.cover
-  <SchoolAdmin__EditorDrawer closeDrawerCB>
-    <form
-      id=formId
-      className="mx-8 pt-8"
-      key="sc-images-editor__form"
-      onSubmit={handleUpdateImages(send, state, course, updateCourseCB)}>
-      <input name="authenticity_token" type_="hidden" value={AuthenticityToken.fromHead()} />
-      <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-        {"Course Images" |> str}
-      </h5>
-      <DisablingCover disabled=state.updating>
-        <div key="course-images-editor__thumbnail" className="mt-4">
-          <label
-            className="tracking-wide text-gray-800 text-xs font-semibold"
-            htmlFor="sc-images-editor__logo-on-400-bg-input">
-            {"Thumbnail" |> str}
-          </label>
-          <HelpIcon
-            className="text-xs ml-1"
-            responsiveAlignment=HelpIcon.NonResponsive(AlignLeft)
-            link="https://docs.pupilfirst.com/#/courses?id=course-images">
-            {"The thumbnail will be displayed on the homepage, and here in the admin courses list." |> str}
-          </HelpIcon>
-          <input
-            disabled=state.updating
-            className="hidden"
-            name="course_thumbnail"
-            type_="file"
-            accept=".jpg,.jpeg,.png,.gif,image/x-png,image/gif,image/jpeg"
-            id="course-images-editor__thumbnail"
-            required=false
-            multiple=false
-            onChange={updateImage(send, false)}
-          />
-          <label className="file-input-label mt-2" htmlFor="course-images-editor__thumbnail">
-            <i className="fas fa-upload" />
-            <span className="ml-2 truncate">
-              {optionalImageLabelText(thumbnail, state.filenameThumb)}
-            </span>
-          </label>
-          <School__InputGroupError
-            message="must be a JPEG / PNG under 2 MB in size" active=state.invalidThumb
-          />
-        </div>
-        <div key="course-images-editor__cover" className="mt-4">
-          <label
-            className="tracking-wide text-gray-800 text-xs font-semibold"
-            htmlFor="sc-images-editor__logo-on-400-bg-input">
-            {"Cover Image" |> str}
-          </label>
-          <HelpIcon
-            className="text-xs ml-1"
-            responsiveAlignment=HelpIcon.NonResponsive(AlignLeft)
-            link="https://docs.pupilfirst.com/#/courses?id=course-images">
-            {"The cover image for a course will be displayed at the top of all student pages within the course." |> str}
-          </HelpIcon>
-          <input
-            disabled=state.updating
-            className="hidden"
-            name="course_cover"
-            type_="file"
-            accept=".jpg,.jpeg,.png,.gif,image/x-png,image/gif,image/jpeg"
-            id="course-images-editor__cover"
-            required=false
-            multiple=false
-            onChange={updateImage(send, true)}
-          />
-          <label className="file-input-label mt-2" htmlFor="course-images-editor__cover">
-            <i className="fas fa-upload" />
-            <span className="ml-2 truncate">
-              {optionalImageLabelText(cover, state.filenameCover)}
-            </span>
-          </label>
-          <School__InputGroupError
-            message="must be a JPEG / PNG under 2 MB in size" active=state.invalidCover
-          />
-        </div>
-        <button
-          type_="submit"
-          key="sc-images-editor__update-button"
-          disabled={updateButtonDisabled(state)}
-          className="btn btn-primary btn-large mt-6">
-          {updateButtonText(state.updating) |> str}
-        </button>
-      </DisablingCover>
-    </form>
-  </SchoolAdmin__EditorDrawer>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__Types.res
deleted file mode 100644
index 7d9a937..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseEditor__Types.res
+++ /dev/null
@@ -1 +0,0 @@
-module Course = CourseEditor__Course
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Course.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Course.res
deleted file mode 100644
index 4b2f1af..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Course.res
+++ /dev/null
@@ -1,10 +0,0 @@
-type id = string
-
-type t = {id: id}
-
-let id = t => t.id
-
-let decode = json => {
-  open Json.Decode
-  {id: json |> field("id", string)}
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__CourseExport.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__CourseExport.res
deleted file mode 100644
index 96a9090..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__CourseExport.res
+++ /dev/null
@@ -1,78 +0,0 @@
-exception UnexpectedExportType(string)
-
-type id = string
-
-type file = {
-  path: string,
-  createdAt: string,
-}
-
-type exportType =
-  | Teams
-  | Students
-
-type t = {
-  id: id,
-  tags: array<string>,
-  createdAt: string,
-  file: option<file>,
-  reviewedOnly: bool,
-  exportType: exportType,
-}
-
-let id = t => t.id
-let createdAt = (t: t) => t.createdAt
-let tags = t => t.tags
-let file = t => t.file
-let exportType = t => t.exportType
-let reviewedOnly = t => t.reviewedOnly
-let fileCreatedAt = (file: file) => file.createdAt
-let filePath = file => file.path
-
-let decodeFile = json => {
-  open Json.Decode
-  {
-    path: json |> field("path", string),
-    createdAt: json |> field("createdAt", string),
-  }
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    createdAt: json |> field("createdAt", string),
-    file: json |> field("file", nullable(decodeFile)) |> Js.Null.toOption,
-    tags: json |> field("tags", array(string)),
-    exportType: switch json |> field("exportType", string) {
-    | "Students" => Students
-    | "Teams" => Teams
-    | otherExportType =>
-      Rollbar.error("Unexpected exportType encountered: " ++ otherExportType)
-      raise(UnexpectedExportType(otherExportType))
-    },
-    reviewedOnly: json |> field("reviewedOnly", bool),
-  }
-}
-
-let make = (~id, ~exportType, ~createdAt, ~tags, ~reviewedOnly) => {
-  let finalTags = switch exportType {
-  | Students => tags
-  | Teams => []
-  }
-
-  {
-    id: id,
-    createdAt: createdAt,
-    tags: finalTags,
-    exportType: exportType,
-    reviewedOnly: reviewedOnly,
-    file: None,
-  }
-}
-
-let exportTypeToString = t =>
-  switch t.exportType {
-  | Students => "Students"
-  | Teams => "Teams"
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Root.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Root.res
deleted file mode 100644
index bb2498a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Root.res
+++ /dev/null
@@ -1,343 +0,0 @@
-open CourseExports__Types
-
-let str = React.string
-
-type state = {
-  drawerOpen: bool,
-  selectedTags: array<Tag.t>,
-  saving: bool,
-  reviewedOnly: bool,
-  tagSearch: string,
-  courseExports: array<CourseExport.t>,
-  exportType: CourseExport.exportType,
-}
-
-let computeInitialState = exports => {
-  drawerOpen: false,
-  selectedTags: [],
-  saving: false,
-  reviewedOnly: false,
-  tagSearch: "",
-  courseExports: exports,
-  exportType: CourseExport.Students,
-}
-
-type action =
-  | OpenDrawer
-  | CloseDrawer
-  | BeginSaving
-  | FinishSaving(CourseExport.t)
-  | FailSaving
-  | SetReviewedOnly(bool)
-  | SelectTag(Tag.t)
-  | DeselectTag(Tag.t)
-  | SelectExportType(CourseExport.exportType)
-  | UpdateTagSearch(string)
-
-let reducer = (state, action) =>
-  switch action {
-  | OpenDrawer => {...state, drawerOpen: true}
-  | CloseDrawer => {...state, drawerOpen: false}
-  | BeginSaving => {...state, saving: true}
-  | FinishSaving(courseExport) => {
-      ...state,
-      saving: false,
-      courseExports: state.courseExports |> Array.append([courseExport]),
-      drawerOpen: false,
-    }
-  | FailSaving => {...state, saving: false}
-  | SetReviewedOnly(reviewedOnly) => {...state, reviewedOnly: reviewedOnly}
-  | SelectTag(tag) => {
-      ...state,
-      selectedTags: state.selectedTags |> Array.append([tag]),
-    }
-  | DeselectTag(tag) => {
-      ...state,
-      selectedTags: state.selectedTags |> Js.Array.filter(t => t |> Tag.id != Tag.id(tag)),
-    }
-  | SelectExportType(exportType) => {...state, exportType: exportType}
-  | UpdateTagSearch(tagSearch) => {...state, tagSearch: tagSearch}
-  }
-
-let readinessString = courseExport =>
-  switch courseExport |> CourseExport.file {
-  | None =>
-    let timeDistance =
-      courseExport
-      |> CourseExport.createdAt
-      |> DateFns.parseString
-      |> DateFns.distanceInWordsToNow(~addSuffix=true)
-    "Requested " ++ timeDistance
-  | Some(file) =>
-    let timeDistance =
-      file
-      |> CourseExport.fileCreatedAt
-      |> DateFns.parseString
-      |> DateFns.distanceInWordsToNow(~addSuffix=true)
-    "Prepared " ++ timeDistance
-  }
-
-module Selectable = {
-  type t = Tag.t
-  let value = t => t |> Tag.name
-  let searchString = t => t |> Tag.name
-}
-
-module TagsSelector = MultiselectInline.Make(Selectable)
-
-let unselected = (allTags, selectedTags) => {
-  let selectedTagIds = selectedTags |> Array.map(Tag.id)
-  allTags |> Js.Array.filter(t => !(selectedTagIds |> Array.mem(t |> Tag.id)))
-}
-
-module CreateCourseExportQuery = %graphql(`
- mutation CreateCourseExportMutation ($courseId: ID!, $tagIds: [ID!]!, $reviewedOnly: Boolean!, $exportType: Export!) {
-  createCourseExport(courseId: $courseId, tagIds: $tagIds, reviewedOnly: $reviewedOnly, exportType: $exportType){
-    courseExport {
-      id
-      createdAt
-      tags
-      reviewedOnly
-    }
-   }
- }
-`)
-
-let createCourseExport = (state, send, course, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  send(BeginSaving)
-
-  let (tagIds, exportType) = switch state.exportType {
-  | CourseExport.Students => (state.selectedTags |> Array.map(Tag.id), #Students)
-  | Teams => ([], #Teams)
-  }
-
-  CreateCourseExportQuery.make(
-    ~courseId=course |> Course.id,
-    ~tagIds,
-    ~reviewedOnly=state.reviewedOnly,
-    ~exportType,
-    (),
-  )
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    switch response["createCourseExport"]["courseExport"] {
-    | Some(\"export") =>
-      /* Add the new course export to the list of exports known by this component. */
-      let courseExport = CourseExport.make(
-        ~id=\"export"["id"],
-        ~exportType=state.exportType,
-        ~createdAt=\"export"["createdAt"],
-        ~tags=\"export"["tags"],
-        ~reviewedOnly=\"export"["reviewedOnly"],
-      )
-
-      send(FinishSaving(courseExport))
-    | None => send(FailSaving)
-    }
-
-    Js.Promise.resolve()
-  })
-  |> Js.Promise.catch(e => {
-    Js.log(e)
-    send(FailSaving)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let toggleChoiceClasses = value => {
-  let defaultClasses = "relative flex flex-col items-center bg-white border border-gray-400 hover:bg-gray-200 text-sm font-semibold focus:outline-none rounded p-4 w-full"
-  value
-    ? defaultClasses ++ " bg-gray-200 text-primary-500 border-primary-500"
-    : defaultClasses ++ " opacity-75 text-gray-900"
-}
-
-@react.component
-let make = (~course, ~exports, ~tags) => {
-  let (state, send) = React.useReducerWithMapState(reducer, exports, computeInitialState)
-
-  <div key="School admin coaches course index" className="flex flex-1 h-screen overflow-y-scroll">
-    {state.drawerOpen
-      ? <SchoolAdmin__EditorDrawer
-          closeDrawerCB={() => send(CloseDrawer)} closeButtonTitle="Close Export Form">
-          <div className="mx-auto bg-white">
-            <div className="max-w-2xl pt-6 px-6 mx-auto">
-              <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-                {"Export course data" |> str}
-              </h5>
-              <div className="mt-4">
-                <label className="block tracking-wide text-xs font-semibold mr-6 mb-2">
-                  {"Please select the kind of export you need:" |> str}
-                </label>
-                <div className="flex -mx-2">
-                  <div className="w-1/2 px-2">
-                    <button
-                      onClick={_ => send(SelectExportType(CourseExport.Students))}
-                      className={toggleChoiceClasses(state.exportType == CourseExport.Students)}>
-                      <i className="fas fa-user" />
-                      <div className="mt-1"> {"Students" |> str} </div>
-                    </button>
-                  </div>
-                  <div className="w-1/2 px-2">
-                    <button
-                      onClick={_ => send(SelectExportType(CourseExport.Teams))}
-                      className={toggleChoiceClasses(state.exportType == CourseExport.Teams)}>
-                      <i className="fas fa-user-friends" />
-                      <div className="mt-1"> {"Teams" |> str} </div>
-                    </button>
-                  </div>
-                </div>
-              </div>
-              {switch state.exportType {
-              | CourseExport.Students =>
-                <div className="mt-4">
-                  <label className="block tracking-wide text-xs font-semibold mb-2">
-                    {"Export only students with the following tags:" |> str}
-                  </label>
-                  <TagsSelector
-                    placeholder="Search for a tag"
-                    emptySelectionMessage="No tags selected"
-                    selected=state.selectedTags
-                    unselected={unselected(tags, state.selectedTags)}
-                    onChange={tagSearch => send(UpdateTagSearch(tagSearch))}
-                    value=state.tagSearch
-                    onSelect={tag => send(SelectTag(tag))}
-                    onDeselect={tag => send(DeselectTag(tag))}
-                  />
-                </div>
-              | Teams => React.null
-              }}
-              <div className="mt-5">
-                <label
-                  className="block tracking-wide text-xs font-semibold mr-6 mb-2"
-                  htmlFor="targets_filter">
-                  {"Which targets should the export include?" |> str}
-                </label>
-                <div id="targets_filter" className="flex -mx-2">
-                  <div className="w-1/2 px-2">
-                    <button
-                      onClick={_ => send(SetReviewedOnly(false))}
-                      className={toggleChoiceClasses(!state.reviewedOnly)}>
-                      <i className="fas fa-list" />
-                      <div className="mt-1"> {"All targets" |> str} </div>
-                    </button>
-                  </div>
-                  <div className="w-1/2 px-2">
-                    <button
-                      onClick={_event => send(SetReviewedOnly(true))}
-                      className={toggleChoiceClasses(state.reviewedOnly)}>
-                      <i className="fas fa-tasks" />
-                      <div className="mt-1">
-                        {"Only targets with reviewed submissions" |> str}
-                      </div>
-                    </button>
-                  </div>
-                </div>
-              </div>
-              <div className="flex max-w-2xl w-full mt-5 pb-5 mx-auto">
-                <button
-                  disabled=state.saving
-                  className="w-full btn btn-primary btn-large"
-                  onClick={createCourseExport(state, send, course)}>
-                  {if state.saving {
-                    <span>
-                      <FaIcon classes="fas fa-spinner fa-pulse" />
-                      <span className="ml-2"> {"Setting up an export..." |> str} </span>
-                    </span>
-                  } else {
-                    "Create Export" |> str
-                  }}
-                </button>
-              </div>
-            </div>
-          </div>
-        </SchoolAdmin__EditorDrawer>
-      : React.null}
-    <div className="flex-1 flex flex-col bg-gray-100">
-      <div className="flex px-6 py-2 items-center justify-between">
-        <button
-          onClick={_ => send(OpenDrawer)}
-          className="max-w-2xl w-full flex mx-auto items-center justify-center relative bg-white text-primary-500 hover:bg-gray-100 hover:text-primary-600 hover:shadow-lg focus:outline-none border-2 border-gray-400 border-dashed hover:border-primary-300 p-6 rounded-lg mt-20 cursor-pointer">
-          <i className="fas fa-file-export text-lg" />
-          <h5 className="font-semibold ml-2"> {"Create a new export" |> str} </h5>
-        </button>
-      </div>
-      {state.courseExports |> ArrayUtils.isEmpty
-        ? <div
-            className="flex justify-center bg-gray-100 border rounded p-3 italic mx-auto max-w-2xl w-full">
-            {"You haven't exported anything yet!" |> str}
-          </div>
-        : <div className="px-6 pb-4 mt-5 flex flex-1 bg-gray-100">
-            <div className="max-w-2xl w-full mx-auto relative">
-              <h4 className="mt-5 w-full"> {"Exports" |> str} </h4>
-              <div className="flex mt-4 -mx-3 items-start flex-wrap">
-                {state.courseExports
-                |> ArrayUtils.copyAndSort((x, y) =>
-                  DateFns.differenceInSeconds(
-                    y |> CourseExport.createdAt |> DateFns.parseString,
-                    x |> CourseExport.createdAt |> DateFns.parseString,
-                  ) |> int_of_float
-                )
-                |> Array.map(courseExport =>
-                  <div
-                    key={courseExport |> CourseExport.id}
-                    ariaLabel={"Export " ++ (courseExport |> CourseExport.id)}
-                    className="flex w-1/2 items-center mb-4 px-3">
-                    <div
-                      className="course-faculty__list-item shadow bg-white overflow-hidden rounded-lg flex flex-col w-full">
-                      <div className="flex flex-1 justify-between">
-                        <div className="pt-4 pb-3 px-4">
-                          <div className="text-sm">
-                            <p className="text-black font-semibold">
-                              {courseExport |> CourseExport.exportTypeToString |> str}
-                            </p>
-                            <p className="text-gray-600 font-semibold text-xs mt-px">
-                              {courseExport |> readinessString |> str}
-                            </p>
-                          </div>
-                          <div className="flex flex-wrap text-gray-600 font-semibold text-xs mt-1">
-                            {courseExport |> CourseExport.reviewedOnly
-                              ? <span
-                                  className="px-2 py-1 border rounded bg-secondary-100 text-primary-600 mt-1 mr-1">
-                                  {"Reviewed Submissions Only" |> str}
-                                </span>
-                              : React.null}
-                            {switch courseExport |> CourseExport.exportType {
-                            | Teams => ReasonReact.null
-                            | Students =>
-                              courseExport
-                              |> CourseExport.tags
-                              |> Array.map(tag =>
-                                <span
-                                  key=tag
-                                  className="px-2 py-1 border rounded bg-primary-100 text-primary-600 mt-1 mr-1">
-                                  {tag |> str}
-                                </span>
-                              )
-                              |> React.array
-                            }}
-                          </div>
-                        </div>
-                        {switch courseExport |> CourseExport.file {
-                        | None => ReasonReact.null
-                        | Some(file) =>
-                          <a
-                            ariaLabel={"Download Course Export " ++
-                            (courseExport |> CourseExport.id)}
-                            className="w-10 text-xs text-sm course-faculty__list-item-remove text-gray-700 hover:text-gray-900 cursor-pointer flex items-center justify-center hover:bg-gray-200"
-                            href={file |> CourseExport.filePath}>
-                            <FaIcon classes="fas fa-file-download" />
-                          </a>
-                        }}
-                      </div>
-                    </div>
-                  </div>
-                )
-                |> React.array}
-              </div>
-            </div>
-          </div>}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Tag.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Tag.res
deleted file mode 100644
index d8af2f5..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Tag.res
+++ /dev/null
@@ -1,17 +0,0 @@
-type id = string
-
-type t = {
-  id: id,
-  name: string,
-}
-
-let id = t => t.id
-let name = t => t.name
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Types.res
deleted file mode 100644
index 3802d38..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CourseExports__Types.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module Course = CourseExports__Course
-module CourseExport = CourseExports__CourseExport
-module Tag = CourseExports__Tag
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor.res
deleted file mode 100644
index e9ea347..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor.res
+++ /dev/null
@@ -1,275 +0,0 @@
-let str = ReasonReact.string
-
-open CurriculumEditor__Types
-
-type editorAction =
-  | Hidden
-  | ShowTargetGroupEditor(option<TargetGroup.t>)
-  | ShowLevelEditor(option<Level.t>)
-
-type state = {
-  selectedLevel: Level.t,
-  editorAction: editorAction,
-  levels: list<Level.t>,
-  targetGroups: list<TargetGroup.t>,
-  targets: list<Target.t>,
-  showArchived: bool,
-}
-
-type action =
-  | SelectLevel(Level.t)
-  | UpdateEditorAction(editorAction)
-  | UpdateLevels(Level.t)
-  | UpdateTargetGroup(TargetGroup.t)
-  | UpdateTargetGroups(list<TargetGroup.t>)
-  | UpdateTarget(Target.t)
-  | UpdateTargets(list<Target.t>)
-  | ToggleShowArchived
-
-let reducer = (state, action) =>
-  switch action {
-  | SelectLevel(selectedLevel) => {...state, selectedLevel: selectedLevel}
-  | UpdateEditorAction(editorAction) => {...state, editorAction: editorAction}
-  | UpdateLevels(level) =>
-    let newLevels = level |> Level.updateList(state.levels)
-    {...state, levels: newLevels, editorAction: Hidden, selectedLevel: level}
-  | UpdateTargetGroup(targetGroup) =>
-    let newtargetGroups = targetGroup |> TargetGroup.updateList(state.targetGroups)
-    {...state, targetGroups: newtargetGroups}
-  | UpdateTargetGroups(targetGroups) => {...state, targetGroups: targetGroups}
-  | UpdateTarget(target) =>
-    let newtargets = target |> Target.updateList(state.targets)
-    {...state, targets: newtargets}
-  | ToggleShowArchived => {...state, showArchived: !state.showArchived}
-  | UpdateTargets(targets) => {...state, targets: targets}
-  }
-
-let showArchivedButton = (targetGroupsInLevel, targets) => {
-  let tgIds = targetGroupsInLevel |> List.map(tg => tg |> TargetGroup.id)
-
-  let numberOfArchivedTargetGroupsInLevel =
-    targetGroupsInLevel |> List.filter(tg => tg |> TargetGroup.archived) |> List.length
-  let numberOfArchivedTargetsInLevel =
-    targets
-    |> List.filter(target => tgIds |> List.mem(target |> Target.targetGroupId))
-    |> List.filter(target => target |> Target.visibility === Archived)
-    |> List.length
-
-  numberOfArchivedTargetGroupsInLevel > 0 || numberOfArchivedTargetsInLevel > 0
-}
-
-let updateTargetSortIndex = (state, send, sortedTargets) => {
-  let oldTargets = state.targets |> List.filter(t => !(sortedTargets |> List.mem(t)))
-  send(UpdateTargets(oldTargets |> List.append(sortedTargets |> Target.updateSortIndex)))
-}
-
-let updateTargetGroupSortIndex = (state, send, sortedTargetGroups) => {
-  let oldTargetGroups = state.targetGroups |> List.filter(t => !(sortedTargetGroups |> List.mem(t)))
-  send(
-    UpdateTargetGroups(
-      oldTargetGroups |> List.append(sortedTargetGroups |> TargetGroup.updateSortIndex),
-    ),
-  )
-}
-
-let levelOfTarget = (targetId, targets, levels, targetGroups) => {
-  let target =
-    targets |> ListUtils.unsafeFind(
-      target => Target.id(target) == targetId,
-      "Unable to find target with ID:" ++ (targetId ++ " in CurriculumEditor"),
-    )
-  let targetGroup =
-    targetGroups |> ListUtils.unsafeFind(
-      tg => TargetGroup.id(tg) == Target.targetGroupId(target),
-      "Unable to find target group with ID:" ++
-      (Target.targetGroupId(target) ++
-      " in CurriculumEditor"),
-    )
-  levels |> ListUtils.unsafeFind(
-    level => Level.id(level) == TargetGroup.levelId(targetGroup),
-    "Unable to find level with ID:" ++ (TargetGroup.levelId(targetGroup) ++ " in CurriculumEditor"),
-  )
-}
-
-let computeIntialState = ((levels, targetGroups, targets, path)) => {
-  let maxLevel =
-    levels |> List.sort((l1, l2) => (l2 |> Level.number) - (l1 |> Level.number)) |> List.hd
-
-  let selectedLevel = switch path {
-  | list{"school", "courses", _courseId, "curriculum"} => maxLevel
-  | list{"school", "courses", _courseId, "targets", targetId, ..._} =>
-    levelOfTarget(targetId, targets, levels, targetGroups)
-  | _ => maxLevel
-  }
-
-  {
-    selectedLevel: selectedLevel,
-    editorAction: Hidden,
-    targetGroups: targetGroups,
-    levels: levels,
-    targets: targets,
-    showArchived: false,
-  }
-}
-
-@react.component
-let make = (~course, ~evaluationCriteria, ~levels, ~targetGroups, ~targets, ~authenticityToken) => {
-  let path = ReasonReactRouter.useUrl().path
-  let (state, send) = React.useReducerWithMapState(
-    reducer,
-    (levels, targetGroups, targets, path),
-    computeIntialState,
-  )
-
-  let hideEditorActionCB = () => send(UpdateEditorAction(Hidden))
-  let currentLevel = state.selectedLevel
-  let currentLevelId = Level.id(currentLevel)
-  let updateLevelsCB = level => send(UpdateLevels(level))
-  let targetGroupsInLevel =
-    state.targetGroups
-    |> List.filter(targetGroup => targetGroup |> TargetGroup.levelId == currentLevelId)
-    |> TargetGroup.sort
-  let targetGroupsToDisplay = state.showArchived
-    ? targetGroupsInLevel
-    : targetGroupsInLevel |> List.filter(tg => !(tg |> TargetGroup.archived))
-  let showTargetGroupEditorCB = targetGroup =>
-    send(UpdateEditorAction(ShowTargetGroupEditor(targetGroup)))
-
-  let updateTargetCB = target => {
-    let targetGroup =
-      state.targetGroups |> ListUtils.unsafeFind(
-        tg => TargetGroup.id(tg) == Target.targetGroupId(target),
-        "Unabltge to find target group with ID: " ++ Target.targetGroupId(target),
-      )
-
-    let updatedTargetGroup = switch target |> Target.visibility {
-    | Archived => targetGroup
-    | Draft
-    | Live =>
-      targetGroup |> TargetGroup.unarchive
-    }
-
-    send(UpdateTarget(target))
-    send(UpdateTargetGroup(updatedTargetGroup))
-  }
-
-  let updateTargetGroupsCB = targetGroup => {
-    targetGroup |> TargetGroup.archived
-      ? {
-          let targetIdsInTargerGroup =
-            state.targets |> Target.targetIdsInTargetGroup(targetGroup |> TargetGroup.id)
-          let newTargets =
-            state.targets |> List.map(target =>
-              targetIdsInTargerGroup |> List.mem(target |> Target.id)
-                ? Target.archive(target)
-                : target
-            )
-          send(UpdateTargets(newTargets))
-        }
-      : ()
-    send(UpdateTargetGroup(targetGroup))
-    send(UpdateEditorAction(Hidden))
-  }
-
-  <div className="flex-1 flex flex-col">
-    <div className="bg-white p-4 md:hidden shadow border-b">
-      <button
-        className="sa-toggle__menu-btn sa-toggle__menu-btn--arrow hover:bg-gray-200 focus:outline-none">
-        <span className="sa-toggle__menu-btn-box">
-          <span className="sa-toggle__menu-btn-inner" />
-        </span>
-      </button>
-    </div>
-    <CurriculumEditor__TargetDrawer
-      targets=state.targets targetGroups evaluationCriteria course updateTargetCB
-    />
-    {switch state.editorAction {
-    | Hidden => ReasonReact.null
-    | ShowTargetGroupEditor(targetGroup) =>
-      <CurriculumEditor__TargetGroupEditor
-        targetGroup currentLevelId authenticityToken updateTargetGroupsCB hideEditorActionCB
-      />
-    | ShowLevelEditor(level) =>
-      <CurriculumEditor__LevelEditor
-        level course authenticityToken hideEditorActionCB updateLevelsCB
-      />
-    }}
-    <div className="px-6 pb-4 flex-1 bg-gray-100 relative overflow-y-scroll">
-      <div className="w-full py-4 relative md:sticky top-0 z-20 bg-gray-100 border-b">
-        <div className="max-w-3xl flex items-center justify-between mx-auto">
-          <div className="flex">
-            <div className="inline-block relative w-auto md:w-64">
-              <select
-                onChange={event => {
-                  let level_name = ReactEvent.Form.target(event)["value"]
-                  send(SelectLevel(Level.selectLevel(state.levels, level_name)))
-                }}
-                value={currentLevel |> Level.name}
-                className="block appearance-none w-full bg-white border text-sm border-gray-400 hover:border-gray-500 px-4 py-3 pr-8 rounded-r-none leading-tight focus:outline-none">
-                {state.levels
-                |> Level.sort
-                |> List.map(level =>
-                  <option key={Level.id(level)} value={level |> Level.name}>
-                    {"Level " ++
-                    ((level |> Level.number |> string_of_int) ++
-                    (": " ++ (level |> Level.name))) |> str}
-                  </option>
-                )
-                |> Array.of_list
-                |> ReasonReact.array}
-              </select>
-              <div
-                className="pointer-events-none absolute inset-y-0 right-0 flex items-center px-3 text-gray-800">
-                <i className="fas fa-chevron-down text-xs" />
-              </div>
-            </div>
-            <button
-              className="flex text-gray-600 hover:text-gray-900 text-sm font-bold border border-gray-400 border-l-0 py-1 px-2 rounded-r focus:outline-none"
-              onClick={_ => send(UpdateEditorAction(ShowLevelEditor(Some(state.selectedLevel))))}>
-              <i title="edit" className="fas fa-pencil-alt" />
-            </button>
-            <button
-              className="btn btn-primary ml-4"
-              onClick={_ => send(UpdateEditorAction(ShowLevelEditor(None)))}>
-              <i className="fas fa-plus-square mr-2 text-lg" />
-              <span> {"Create Level" |> str} </span>
-            </button>
-          </div>
-          {showArchivedButton(targetGroupsInLevel, state.targets)
-            ? <button className="btn btn-default" onClick={_ => send(ToggleShowArchived)}>
-                {(state.showArchived ? "Hide Archived" : "Show Archived") |> str}
-              </button>
-            : ReasonReact.null}
-        </div>
-      </div>
-      <div className="target-group__container max-w-3xl mt-5 mx-auto relative">
-        {targetGroupsToDisplay
-        |> List.mapi((index, targetGroup) =>
-          <CurriculumEditor__TargetGroupShow
-            key={targetGroup |> TargetGroup.id}
-            targetGroup
-            targetGroups=targetGroupsToDisplay
-            targets=state.targets
-            showTargetGroupEditorCB
-            updateTargetCB
-            showArchived=state.showArchived
-            updateTargetSortIndexCB={updateTargetSortIndex(state, send)}
-            updateTargetGroupSortIndexCB={updateTargetGroupSortIndex(state, send)}
-            index
-            course
-          />
-        )
-        |> Array.of_list
-        |> ReasonReact.array}
-        <div
-          onClick={_ => send(UpdateEditorAction(ShowTargetGroupEditor(None)))}
-          className="target-group__create flex flex-col items-center justify-center relative bg-white border-2 border-dashed border-gray-400 p-6 z-10 hover:text-primary-500 hover:shadow-lg hover:border-primary-400 hover:border-primary-400 rounded-lg mt-12 cursor-pointer">
-          <span className="flex bg-gray-200 p-2 rounded-full">
-            <i className="fas fa-plus-circle text-2xl" />
-          </span>
-          <h4 className="font-semibold ml-2"> {"Create a target group" |> str} </h4>
-        </div>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__AnswerOption.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__AnswerOption.res
deleted file mode 100644
index 45ff2c9..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__AnswerOption.res
+++ /dev/null
@@ -1,32 +0,0 @@
-type id = string
-
-type t = {
-  id: id,
-  answer: string,
-  correctAnswer: bool,
-}
-
-let id = t => t.id
-
-let answer = t => t.answer
-
-let correctAnswer = t => t.correctAnswer
-
-let empty = (id, correctAnswer) => {id: id, answer: "", correctAnswer: correctAnswer}
-
-let updateAnswer = (answer, t) => {...t, answer: answer}
-
-let markAsCorrect = t => {...t, correctAnswer: true}
-
-let markAsIncorrect = t => {...t, correctAnswer: false}
-
-let isValidAnswerOption = t => t.answer |> Js.String.trim |> Js.String.length >= 1
-
-let makeFromJs = answerData => {
-  id: answerData["id"],
-  answer: answerData["answer"],
-  correctAnswer: answerData["correctAnswer"],
-}
-
-let quizAnswersAsJsObject = quizAnswers =>
-  quizAnswers |> Array.map(qa => {"answer": qa.answer, "correctAnswer": qa.correctAnswer})
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentBlockCreator.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentBlockCreator.res
deleted file mode 100644
index 6e05ca2..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentBlockCreator.res
+++ /dev/null
@@ -1,436 +0,0 @@
-exception FormNotFound(string)
-
-%raw(`require("./CurriculumEditor__ContentBlockCreator.css")`)
-
-open CurriculumEditor__Types
-
-let str = React.string
-
-module CreateMarkdownContentBlock = %graphql(`
-    mutation CreateMarkdownContentBlockMutation($targetId: ID!, $aboveContentBlockId: ID) {
-      createMarkdownContentBlock(targetId: $targetId, aboveContentBlockId: $aboveContentBlockId) {
-        contentBlock {
-          ...ContentBlock.Fragments.AllFields
-        }
-      }
-    }
-  `)
-
-module CreateEmbedContentBlock = %graphql(`
-    mutation CreateEmbedContentBlockMutation($targetId: ID!, $aboveContentBlockId: ID, $url: String!) {
-      createEmbedContentBlock(targetId: $targetId, aboveContentBlockId: $aboveContentBlockId, url: $url) {
-        contentBlock {
-          ...ContentBlock.Fragments.AllFields
-        }
-      }
-    }
-  `)
-
-type ui =
-  | Hidden
-  | BlockSelector
-  | EmbedForm(string)
-
-type state = {
-  ui: ui,
-  saving: bool,
-  error: option<string>,
-}
-
-type action =
-  | ToggleVisibility
-  | ToggleSaving
-  | FinishSaving(bool)
-  | SetError(string)
-  | FailedToCreate
-  | FailToUpload
-  | ShowEmbedForm
-  | HideEmbedForm
-  | UpdateEmbedUrl(string)
-
-let computeInitialState = isAboveTarget => {
-  ui: isAboveTarget ? Hidden : BlockSelector,
-  saving: false,
-  error: None,
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | ToggleVisibility =>
-    let ui = switch state.ui {
-    | Hidden => BlockSelector
-    | BlockSelector
-    | EmbedForm(_) =>
-      Hidden
-    }
-
-    {...state, ui: ui}
-  | ToggleSaving => {...state, saving: !state.saving, error: None}
-  | FinishSaving(isAboveTarget) => computeInitialState(isAboveTarget)
-  | SetError(error) => {...state, error: Some(error)}
-  | FailedToCreate => {
-      ...state,
-      saving: false,
-      error: Some("An unexpected error occured. Please reload the page and try again."),
-    }
-  | FailToUpload => {
-      ...state,
-      saving: false,
-      error: Some("Failed to upload file. Please check message in notification, and try again."),
-    }
-  | ShowEmbedForm => {...state, ui: EmbedForm("")}
-  | HideEmbedForm => {...state, ui: BlockSelector}
-  | UpdateEmbedUrl(url) => {...state, ui: EmbedForm(url)}
-  }
-
-let containerClasses = (visible, isAboveTarget) => {
-  let classes = "content-block-creator py-3"
-  classes ++ (visible || !isAboveTarget ? " content-block-creator--open" : "")
-}
-
-let handleGraphqlCreateResponse = (aboveContentBlock, send, addContentBlockCB, contentBlock) => {
-  switch contentBlock {
-  | Some(contentBlock) =>
-    contentBlock |> ContentBlock.makeFromJs |> addContentBlockCB
-    send(FinishSaving(aboveContentBlock != None))
-  | None => send(ToggleSaving)
-  }
-
-  Js.Promise.resolve()
-}
-
-let createMarkdownContentBlock = (target, aboveContentBlock, send, addContentBlockCB) => {
-  send(ToggleSaving)
-  let aboveContentBlockId = aboveContentBlock |> OptionUtils.map(ContentBlock.id)
-  let targetId = target |> Target.id
-  CreateMarkdownContentBlock.make(~targetId, ~aboveContentBlockId?, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result =>
-    handleGraphqlCreateResponse(
-      aboveContentBlock,
-      send,
-      addContentBlockCB,
-      result["createMarkdownContentBlock"]["contentBlock"],
-    )
-  )
-  |> Js.Promise.catch(_ => {
-    send(FailedToCreate)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let elementId = (prefix, aboveContentBlock) =>
-  prefix ++
-  switch aboveContentBlock {
-  | Some(contentBlock) => contentBlock |> ContentBlock.id
-  | None => "bottom"
-  }
-
-let fileInputId = aboveContentBlock => aboveContentBlock |> elementId("markdown-block-file-input-")
-let imageInputId = aboveContentBlock =>
-  aboveContentBlock |> elementId("markdown-block-image-input-")
-let fileFormId = aboveContentBlock => aboveContentBlock |> elementId("markdown-block-file-form-")
-let imageFormId = aboveContentBlock => aboveContentBlock |> elementId("markdown-block-image-form-")
-
-let onBlockTypeSelect = (target, aboveContentBlock, send, addContentBlockCB, blockType, _event) =>
-  switch blockType {
-  | #Markdown => createMarkdownContentBlock(target, aboveContentBlock, send, addContentBlockCB)
-  | #File => ()
-  | #Image => ()
-  | #Embed => send(ShowEmbedForm)
-  }
-
-let button = (target, aboveContentBlock, send, addContentBlockCB, blockType) => {
-  let fileId = aboveContentBlock |> fileInputId
-  let imageId = aboveContentBlock |> imageInputId
-
-  let (faIcon, buttonText, htmlFor) = switch blockType {
-  | #Markdown => ("fab fa-markdown", "Markdown", None)
-  | #File => ("far fa-file-alt", "File", Some(fileId))
-  | #Image => ("far fa-image", "Image", Some(imageId))
-  | #Embed => ("fas fa-code", "Embed", None)
-  }
-
-  <label
-    ?htmlFor
-    key=buttonText
-    className="content-block-creator__block-content-type-picker px-3 pt-4 pb-3 flex-1 text-center text-primary-200"
-    onClick={onBlockTypeSelect(target, aboveContentBlock, send, addContentBlockCB, blockType)}>
-    <i className={faIcon ++ " text-2xl"} /> <p className="font-semibold"> {buttonText |> str} </p>
-  </label>
-}
-
-let maxAllowedFileSize = 5 * 1024 * 1024
-let isInvalidFile = file => file["size"] > maxAllowedFileSize
-
-let isInvalidImageFile = image =>
-  switch image["_type"] {
-  | "image/jpeg"
-  | "image/gif"
-  | "image/png" => false
-  | _ => true
-  } ||
-  image |> isInvalidFile
-
-let uploadFile = (target, send, addContentBlockCB, isAboveContentBlock, formData) =>
-  Api.sendFormData(
-    "/school/targets/" ++ ((target |> Target.id) ++ "/content_block"),
-    formData,
-    json => {
-      Notification.success("Done!", "File uploaded successfully.")
-      let contentBlock = json |> ContentBlock.decode
-      addContentBlockCB(contentBlock)
-      send(FinishSaving(isAboveContentBlock))
-    },
-    () => send(FailToUpload),
-  )
-
-let submitForm = (target, aboveContentBlock, send, addContentBlockCB, blockType) => {
-  let formId = switch blockType {
-  | #File => fileFormId(aboveContentBlock)
-  | #Image => imageFormId(aboveContentBlock)
-  }
-
-  let element = ReactDOMRe._getElementById(formId)
-
-  switch element {
-  | Some(element) =>
-    DomUtils.FormData.create(element) |> uploadFile(
-      target,
-      send,
-      addContentBlockCB,
-      aboveContentBlock != None,
-    )
-  | None =>
-    Rollbar.error("Could not find form to upload file for content block: " ++ formId)
-    raise(FormNotFound(formId))
-  }
-}
-
-let handleFileInputChange = (
-  target,
-  aboveContentBlock,
-  send,
-  addContentBlockCB,
-  blockType,
-  event,
-) => {
-  event |> ReactEvent.Form.preventDefault
-
-  switch ReactEvent.Form.target(event)["files"] {
-  | [] => ()
-  | files =>
-    let file = files[0]
-
-    let error = switch blockType {
-    | #File =>
-      file |> isInvalidFile ? Some("Please select a file with a size less than 5 MB.") : None
-    | #Image =>
-      file |> isInvalidImageFile
-        ? Some(
-            "Please select an image (PNG, JPEG, GIF) with a size less than 5 MB, and less than 4096px wide or high.",
-          )
-        : None
-    }
-
-    switch error {
-    | Some(error) => send(SetError(error))
-    | None =>
-      // let filename = file##name;
-      send(ToggleSaving)
-      submitForm(target, aboveContentBlock, send, addContentBlockCB, blockType)
-    }
-  }
-}
-
-let uploadForm = (target, aboveContentBlock, send, addContentBlockCB, blockType) => {
-  let fileSelectionHandler = handleFileInputChange(
-    target,
-    aboveContentBlock,
-    send,
-    addContentBlockCB,
-  )
-
-  let (fileId, formId, onChange, fileType) = switch blockType {
-  | #File => (
-      fileInputId(aboveContentBlock),
-      fileFormId(aboveContentBlock),
-      fileSelectionHandler(#File),
-      "file",
-    )
-  | #Image => (
-      imageInputId(aboveContentBlock),
-      imageFormId(aboveContentBlock),
-      fileSelectionHandler(#Image),
-      "image",
-    )
-  }
-
-  <form className="hidden" id=formId>
-    <input name="authenticity_token" type_="hidden" value={AuthenticityToken.fromHead()} />
-    <input type_="hidden" name="block_type" value=fileType />
-    <input type_="file" name="file" id=fileId onChange required=true multiple=false />
-    {switch aboveContentBlock {
-    | Some(contentBlock) =>
-      <input type_="hidden" name="above_content_block_id" value={contentBlock |> ContentBlock.id} />
-    | None => React.null
-    }}
-  </form>
-}
-
-let visible = state =>
-  switch state.ui {
-  | Hidden => false
-  | BlockSelector
-  | EmbedForm(_) => true
-  }
-
-let updateEmbedUrl = (send, event) => {
-  let value = ReactEvent.Form.target(event)["value"]
-  send(UpdateEmbedUrl(value))
-}
-
-let embedUrlRegexes = [
-  %re("/https:\\/\\/.*slideshare\\.net/"),
-  %re("/https:\\/\\/.*vimeo\\.com/"),
-  %re("/https:\\/\\/.*youtube\\.com/"),
-  %re("/https:\\/\\/.*youtu\\.be/"),
-]
-
-let validEmbedUrl = url => Belt.Array.some(embedUrlRegexes, regex => regex->Js.Re.test_(url))
-
-let onEmbedFormSave = (target, aboveContentBlock, url, send, addContentBlockCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  if url |> validEmbedUrl {
-    send(ToggleSaving)
-
-    let aboveContentBlockId = aboveContentBlock |> OptionUtils.map(ContentBlock.id)
-
-    let targetId = target |> Target.id
-
-    CreateEmbedContentBlock.make(~targetId, ~aboveContentBlockId?, ~url, ())
-    |> GraphqlQuery.sendQuery
-    |> Js.Promise.then_(result =>
-      handleGraphqlCreateResponse(
-        aboveContentBlock,
-        send,
-        addContentBlockCB,
-        result["createEmbedContentBlock"]["contentBlock"],
-      )
-    )
-    |> Js.Promise.catch(_ => {
-      send(FailedToCreate)
-      Js.Promise.resolve()
-    })
-    |> ignore
-  } else {
-    send(
-      SetError(
-        "The URL doesn't look valid. Please make sure that it starts with 'https://' and that it's one of the accepted websites.",
-      ),
-    )
-  }
-}
-
-let topButton = (handler, id, title, icon) =>
-  <div
-    className="content-block-creator__top-button-container relative cursor-pointer" onClick=handler>
-    <div
-      id={"top-button-" ++ id}
-      title
-      className="content-block-creator__top-button bg-gray-200 hover:bg-gray-300 relative rounded-lg border border-gray-500 w-10 h-10 flex justify-center items-center mx-auto z-20">
-      <FaIcon classes={"text-base fas " ++ icon} />
-    </div>
-  </div>
-
-let closeEmbedFormButton = (send, aboveContentBlock) => {
-  let id = aboveContentBlock |> OptionUtils.map(ContentBlock.id) |> OptionUtils.default("bottom")
-
-  topButton(_e => send(HideEmbedForm), id, "Close Embed Form", "fa-level-up-alt")
-}
-
-let toggleVisibilityButton = (send, contentBlock) =>
-  topButton(
-    _e => send(ToggleVisibility),
-    contentBlock |> ContentBlock.id,
-    "Toggle Content Block Form",
-    "fa-plus content-block-creator__plus-button-icon",
-  )
-
-let buttonAboveContentBlock = (state, send, aboveContentBlock) =>
-  switch (state.ui, aboveContentBlock) {
-  | (EmbedForm(_), Some(_) | None) => closeEmbedFormButton(send, aboveContentBlock)
-  | (Hidden, None)
-  | (BlockSelector, None) =>
-    <div className="h-10" /> // Spacer.
-  | (Hidden | BlockSelector, Some(contentBlock)) => toggleVisibilityButton(send, contentBlock)
-  }
-
-@react.component
-let make = (~target, ~aboveContentBlock=?, ~addContentBlockCB) => {
-  let (embedInputId, isAboveContentBlock) = switch aboveContentBlock {
-  | Some(contentBlock) =>
-    let id = "embed-" ++ (contentBlock |> ContentBlock.id)
-    (id, true)
-  | None => ("embed-bottom", false)
-  }
-
-  let (state, send) = React.useReducerWithMapState(
-    reducer,
-    isAboveContentBlock,
-    computeInitialState,
-  )
-
-  <DisablingCover disabled=state.saving message="Creating...">
-    {uploadForm(target, aboveContentBlock, send, addContentBlockCB, #File)}
-    {uploadForm(target, aboveContentBlock, send, addContentBlockCB, #Image)}
-    <div className={containerClasses(state |> visible, isAboveContentBlock)}>
-      {buttonAboveContentBlock(state, send, aboveContentBlock)}
-      <div className="content-block-creator__inner-container">
-        {switch state.ui {
-        | Hidden => React.null
-        | BlockSelector =>
-          <div
-            className="content-block-creator__block-content-type text-sm hidden shadow-lg mx-auto relative bg-primary-900 rounded-lg -mt-4 z-10">
-            {[#Markdown, #Image, #Embed, #File]
-            |> Array.map(button(target, aboveContentBlock, send, addContentBlockCB))
-            |> React.array}
-          </div>
-        | EmbedForm(url) =>
-          <div
-            className="clearfix border-2 border-gray-400 bg-gray-200 border-dashed rounded-lg px-3 pb-3 pt-2 -mt-4 z-10">
-            <label htmlFor=embedInputId className="text-xs font-semibold">
-              {"URL to Embed" |> str}
-            </label>
-            <HelpIcon
-              className="ml-2 text-xs"
-              link="https://docs.pupilfirst.com/#/curriculum_editor?id=content-block-types">
-              {"We support YouTube, Vimeo, and Slideshare URLs. Just copy & paste the full URL to the page that contains the resource that you'd like to embed." |> str}
-            </HelpIcon>
-            <div className="flex mt-1">
-              <input
-                id=embedInputId
-                placeholder="https://www.youtube.com/watch?v="
-                className="w-full py-1 px-2 border rounded"
-                type_="text"
-                value=url
-                onChange={updateEmbedUrl(send)}
-              />
-              <button
-                className="ml-2 btn btn-success"
-                onClick={onEmbedFormSave(target, aboveContentBlock, url, send, addContentBlockCB)}>
-                {"Save" |> str}
-              </button>
-            </div>
-          </div>
-        }}
-      </div>
-      {switch state.error {
-      | Some(error) => <School__InputGroupError message=error active={state |> visible} />
-      | None => React.null
-      }}
-    </div>
-  </DisablingCover>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentBlockEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentBlockEditor.res
deleted file mode 100644
index a3c6b98..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentBlockEditor.res
+++ /dev/null
@@ -1,273 +0,0 @@
-exception InvalidBlockTypeForUpdate
-
-let str = React.string
-
-type state = {
-  dirty: bool,
-  saving: option<string>,
-  contentBlock: ContentBlock.t,
-}
-
-let computeInitialState = contentBlock => {
-  saving: None,
-  contentBlock: contentBlock,
-  dirty: false,
-}
-
-type action =
-  | StartSaving(string)
-  | FinishSaving
-  | UpdateContentBlock(ContentBlock.t, bool)
-  | FailSaving
-
-let reducer = (state, action) =>
-  switch action {
-  | StartSaving(message) => {...state, saving: Some(message)}
-  | FinishSaving => {...state, saving: None, dirty: false}
-  | UpdateContentBlock(contentBlock, dirty) => {
-      ...state,
-      contentBlock: contentBlock,
-      dirty: dirty,
-    }
-  | FailSaving => {...state, saving: None}
-  }
-
-module DeleteContentBlockMutation = %graphql(`
-    mutation DeleteContentBlockMutation($id: ID!) {
-      deleteContentBlock(id: $id) {
-        success
-      }
-    }
-  `)
-
-module MoveContentBlockMutation = %graphql(`
-    mutation MoveContentBlockMutation($id: ID!, $direction: MoveDirection!) {
-      moveContentBlock(id: $id, direction: $direction) {
-        success
-      }
-    }
-  `)
-
-module UpdateFileBlockMutation = %graphql(`
-    mutation UpdateFileBlockMutation($id: ID!, $title: String!) {
-      updateFileBlock(id: $id, title: $title) {
-        contentBlock {
-          ...ContentBlock.Fragments.AllFields
-        }
-      }
-    }
-  `)
-
-module UpdateMarkdownBlockMutation = %graphql(`
-    mutation UpdateMarkdownBlockMutation($id: ID!, $markdown: String!) {
-      updateMarkdownBlock(id: $id, markdown: $markdown) {
-        contentBlock {
-          ...ContentBlock.Fragments.AllFields
-        }
-      }
-    }
-  `)
-
-module UpdateImageBlockMutation = %graphql(`
-    mutation UpdateImageBlockMutation($id: ID!, $caption: String!) {
-      updateImageBlock(id: $id, caption: $caption) {
-        contentBlock {
-          ...ContentBlock.Fragments.AllFields
-        }
-      }
-    }
-  `)
-
-let controlIcon = (~icon, ~title, ~color, ~handler) => {
-  let buttonClasses = switch color {
-  | #Grey => "hover:bg-gray-200"
-  | #Green => "bg-green-600 hover:bg-green-700 text-white rounded-b"
-  }
-
-  handler == None
-    ? React.null
-    : <button
-        title
-        disabled={handler == None}
-        className={"p-2 focus:outline-none " ++ buttonClasses}
-        onClick=?handler>
-        <i className={"fas fa-fw " ++ icon} />
-      </button>
-}
-
-let onMove = (contentBlock, cb, direction, _event) => {
-  // We don't actually handle the response for this query.
-  MoveContentBlockMutation.make(~id=contentBlock |> ContentBlock.id, ~direction, ())
-  |> GraphqlQuery.sendQuery
-  |> ignore
-
-  cb(contentBlock)
-}
-
-let onDelete = (contentBlock, removeContentBlockCB, send, _event) =>
-  WindowUtils.confirm("Are you sure you want to delete this block?", () => {
-    send(StartSaving("Deleting..."))
-    let id = contentBlock |> ContentBlock.id
-
-    DeleteContentBlockMutation.make(~id, ())
-    |> GraphqlQuery.sendQuery
-    |> Js.Promise.then_(result => {
-      if result["deleteContentBlock"]["success"] {
-        removeContentBlockCB(id)
-      } else {
-        send(FinishSaving)
-      }
-
-      Js.Promise.resolve()
-    })
-    |> Js.Promise.catch(_error => {
-      send(FinishSaving)
-      Js.Promise.resolve()
-    })
-    |> ignore
-  })
-
-let onUndo = (originalContentBlock, setDirtyCB, send, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  WindowUtils.confirm("Are you sure you want to undo your changes to this block?", () => {
-    setDirtyCB(false)
-    send(UpdateContentBlock(originalContentBlock, false))
-  })
-}
-
-let handleUpdateResult = (updateContentBlockCB, setDirtyCB, send, contentBlock) => {
-  switch contentBlock {
-  | Some(contentBlock) =>
-    contentBlock |> ContentBlock.makeFromJs |> updateContentBlockCB
-    send(FinishSaving)
-    setDirtyCB(false)
-  | None => send(FailSaving)
-  }
-  Js.Promise.resolve()
-}
-
-let updateContentBlockBlock = (
-  mutation,
-  contentBlockExtractor,
-  updateContentBlockCB,
-  setDirtyCB,
-  send,
-) => {
-  send(StartSaving("Updating..."))
-
-  mutation
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result =>
-    result |> contentBlockExtractor |> handleUpdateResult(updateContentBlockCB, setDirtyCB, send)
-  )
-  |> Js.Promise.catch(_error => {
-    send(FinishSaving)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let onSave = (contentBlock, updateContentBlockCB, setDirtyCB, send, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  let id = contentBlock |> ContentBlock.id
-
-  switch contentBlock |> ContentBlock.blockType {
-  | ContentBlock.File(_url, title, _filename) =>
-    let mutation = UpdateFileBlockMutation.make(~id, ~title, ())
-    let extractor = result => result["updateFileBlock"]["contentBlock"]
-    updateContentBlockBlock(mutation, extractor, updateContentBlockCB, setDirtyCB, send)
-  | Markdown(markdown) =>
-    let mutation = UpdateMarkdownBlockMutation.make(~id, ~markdown, ())
-    let extractor = result => result["updateMarkdownBlock"]["contentBlock"]
-    updateContentBlockBlock(mutation, extractor, updateContentBlockCB, setDirtyCB, send)
-  | Image(_url, caption) =>
-    let mutation = UpdateImageBlockMutation.make(~id, ~caption, ())
-    let extractor = result => result["updateImageBlock"]["contentBlock"]
-    updateContentBlockBlock(mutation, extractor, updateContentBlockCB, setDirtyCB, send)
-  | Embed(_) => raise(InvalidBlockTypeForUpdate)
-  }
-}
-
-let updateContentBlockCB = (originalContentBlock, setDirtyCB, state, send, newContentBlock) => {
-  let dirty = newContentBlock != originalContentBlock
-
-  if state.dirty != dirty {
-    setDirtyCB(dirty)
-  }
-
-  send(UpdateContentBlock(newContentBlock, dirty))
-}
-
-let innerEditor = (originalContentBlock, contentBlock, setDirtyCB, state, send) => {
-  let updateContentBlockCB = updateContentBlockCB(originalContentBlock, setDirtyCB, state, send)
-
-  switch contentBlock |> ContentBlock.blockType {
-  | ContentBlock.Embed(_url, embedCode) => TargetContentView.embedContentBlock("", embedCode)
-  | Markdown(markdown) =>
-    <CurriculumEditor__MarkdownBlockEditor markdown contentBlock updateContentBlockCB />
-  | File(url, title, filename) =>
-    <CurriculumEditor__FileBlockEditor url title filename contentBlock updateContentBlockCB />
-  | Image(url, caption) =>
-    <CurriculumEditor__ImageBlockEditor url caption contentBlock updateContentBlockCB />
-  }
-}
-
-@react.component
-let make = (
-  ~contentBlock,
-  ~setDirtyCB,
-  ~removeContentBlockCB=?,
-  ~moveContentBlockUpCB=?,
-  ~moveContentBlockDownCB=?,
-  ~updateContentBlockCB=?,
-) => {
-  let (state, send) = React.useReducerWithMapState(reducer, contentBlock, computeInitialState)
-
-  <DisablingCover disabled={state.saving != None} message=?state.saving>
-    <div
-      className="flex items-start"
-      ariaLabel={"Editor for content block " ++ (contentBlock |> ContentBlock.id)}>
-      <div className="flex-grow self-stretch">
-        {innerEditor(contentBlock, state.contentBlock, setDirtyCB, state, send)}
-      </div>
-      <div
-        className="ml-2 flex-shrink-0 border-transparent bg-gray-100 border rounded flex flex-col text-xs">
-        {controlIcon(
-          ~icon="fa-arrow-up",
-          ~title="Move Up",
-          ~color=#Grey,
-          ~handler=moveContentBlockUpCB |> OptionUtils.map(cb => onMove(contentBlock, cb, #Up)),
-        )}
-        {controlIcon(
-          ~icon="fa-arrow-down",
-          ~title="Move Down",
-          ~color=#Grey,
-          ~handler=moveContentBlockDownCB |> OptionUtils.map(cb => onMove(contentBlock, cb, #Down)),
-        )}
-        {controlIcon(
-          ~icon="fa-trash-alt",
-          ~title="Delete",
-          ~color=#Grey,
-          ~handler=removeContentBlockCB |> OptionUtils.map(cb => onDelete(contentBlock, cb, send)),
-        )}
-        {controlIcon(
-          ~icon="fa-undo-alt",
-          ~title="Undo Changes",
-          ~color=#Grey,
-          ~handler=updateContentBlockCB |> OptionUtils.map(_cb =>
-            onUndo(contentBlock, setDirtyCB, send)
-          ),
-        )}
-        {controlIcon(
-          ~icon="fa-check",
-          ~title="Save Changes",
-          ~color=#Green,
-          ~handler=updateContentBlockCB |> OptionUtils.map(cb =>
-            onSave(state.contentBlock, cb, setDirtyCB, send)
-          ),
-        )}
-      </div>
-    </div>
-  </DisablingCover>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentEditor.res
deleted file mode 100644
index 458985f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentEditor.res
+++ /dev/null
@@ -1,193 +0,0 @@
-let str = React.string
-
-open CurriculumEditor__Types
-
-type state = {
-  loading: bool,
-  contentBlocks: array<ContentBlock.t>,
-  versions: array<Version.t>,
-  dirtyContentBlockIds: Belt.Set.String.t,
-}
-
-type action =
-  | LoadContent(array<ContentBlock.t>, array<Version.t>)
-  | AddContentBlock(ContentBlock.t)
-  | UpdateContentBlock(ContentBlock.t)
-  | RemoveContentBlock(ContentBlock.id)
-  | MoveContentBlockUp(ContentBlock.t)
-  | MoveContentBlockDown(ContentBlock.t)
-  | SetDirty(ContentBlock.id, bool)
-
-let reducer = (state, action) =>
-  switch action {
-  | LoadContent(contentBlocks, versions) => {
-      loading: false,
-      contentBlocks: contentBlocks,
-      versions: versions,
-      dirtyContentBlockIds: Belt.Set.String.empty,
-    }
-  | AddContentBlock(newContentBlock) =>
-    let newBlockSortIndex = newContentBlock |> ContentBlock.sortIndex
-    {
-      ...state,
-      contentBlocks: state.contentBlocks
-      |> Array.map(contentBlock => {
-        let sortIndex = contentBlock |> ContentBlock.sortIndex
-
-        if sortIndex < newBlockSortIndex {
-          contentBlock
-        } else {
-          contentBlock |> ContentBlock.incrementSortIndex
-        }
-      })
-      |> Array.append([newContentBlock]),
-    }
-  | UpdateContentBlock(updatedContentBlock) => {
-      ...state,
-      contentBlocks: state.contentBlocks |> Array.map(contentBlock =>
-        contentBlock |> ContentBlock.id == (updatedContentBlock |> ContentBlock.id)
-          ? updatedContentBlock
-          : contentBlock
-      ),
-      dirtyContentBlockIds: state.dirtyContentBlockIds->Belt.Set.String.remove(
-        updatedContentBlock |> ContentBlock.id,
-      ),
-    }
-  | RemoveContentBlock(contentBlockId) => {
-      ...state,
-      contentBlocks: state.contentBlocks |> Js.Array.filter(contentBlock =>
-        contentBlock |> ContentBlock.id != contentBlockId
-      ),
-    }
-  | MoveContentBlockUp(contentBlock) => {
-      ...state,
-      contentBlocks: state.contentBlocks |> ContentBlock.moveUp(contentBlock),
-    }
-  | MoveContentBlockDown(contentBlock) => {
-      ...state,
-      contentBlocks: state.contentBlocks |> ContentBlock.moveDown(contentBlock),
-    }
-  | SetDirty(contentBlockId, dirty) =>
-    let operation = dirty ? Belt.Set.String.add : Belt.Set.String.remove
-    {
-      ...state,
-      dirtyContentBlockIds: operation(state.dirtyContentBlockIds, contentBlockId),
-    }
-  }
-
-let loadContentBlocks = (targetId, send) =>
-  ContentBlock.Query.make(~targetId, ())
-  |> GraphqlQuery.sendQuery(~notify=true)
-  |> Js.Promise.then_(result => {
-    let contentBlocks = result["contentBlocks"] |> Js.Array.map(ContentBlock.makeFromJs)
-
-    let versions = Version.makeArrayFromJs(result["versions"])
-
-    send(LoadContent(contentBlocks, versions))
-
-    Js.Promise.resolve()
-  })
-  |> ignore
-
-let addContentBlock = (send, contentBlock) => send(AddContentBlock(contentBlock))
-
-let removeContentBlock = (send, contentBlockId) => send(RemoveContentBlock(contentBlockId))
-
-let moveContentBlockUp = (send, contentBlock) => send(MoveContentBlockUp(contentBlock))
-
-let moveContentBlockDown = (send, contentBlock) => send(MoveContentBlockDown(contentBlock))
-
-let setDirty = (contentBlockId, send, dirty) => send(SetDirty(contentBlockId, dirty))
-
-let updateContentBlock = (send, contentBlock) => send(UpdateContentBlock(contentBlock))
-
-let editor = (target, state, send) => {
-  let currentVersion = switch state.versions {
-  | [] => <span className="italic"> {"Not Versioned" |> str} </span>
-  | versions =>
-    let latestVersion =
-      versions->Array.unsafe_get(0) |> Version.updatedAt |> DateFns.format("MMM D, YYYY HH:MM")
-
-    latestVersion |> str
-  }
-
-  let sortedContentBlocks = state.contentBlocks |> ContentBlock.sort
-  let numberOfContentBlocks = state.contentBlocks |> Array.length
-
-  let removeContentBlockCB = numberOfContentBlocks > 1 ? Some(removeContentBlock(send)) : None
-
-  <div className="mt-2">
-    <div className="flex justify-between items-end">
-      {switch target |> Target.visibility {
-      | Live =>
-        <a
-          href={"/targets/" ++ (target |> Target.id)}
-          target="_blank"
-          className="py-2 px-3 font-semibold rounded-lg text-sm focus:outline-none bg-primary-100 text-primary-500">
-          <FaIcon classes="fas fa-external-link-alt" />
-          <span className="ml-2"> {"View as Student" |> str} </span>
-        </a>
-      | Draft
-      | Archived => React.null
-      }}
-      <div className="w-1/6">
-        <label className="text-xs block text-gray-600 mb-1"> {"Last Updated" |> str} </label>
-        <span className="truncate text-left"> currentVersion </span>
-      </div>
-    </div>
-    {sortedContentBlocks
-    |> Array.mapi((index, contentBlock) => {
-      let moveContentBlockUpCB = index == 0 ? None : Some(moveContentBlockUp(send))
-      let moveContentBlockDownCB =
-        index + 1 == numberOfContentBlocks ? None : Some(moveContentBlockDown(send))
-      let isDirty = state.dirtyContentBlockIds->Belt.Set.String.has(contentBlock |> ContentBlock.id)
-      let updateContentBlockCB = isDirty ? Some(updateContentBlock(send)) : None
-
-      <div key={contentBlock |> ContentBlock.id}>
-        <CurriculumEditor__ContentBlockCreator
-          target aboveContentBlock=contentBlock addContentBlockCB={addContentBlock(send)}
-        />
-        <CurriculumEditor__ContentBlockEditor
-          setDirtyCB={setDirty(contentBlock |> ContentBlock.id, send)}
-          contentBlock
-          ?removeContentBlockCB
-          ?moveContentBlockUpCB
-          ?moveContentBlockDownCB
-          ?updateContentBlockCB
-        />
-      </div>
-    })
-    |> React.array}
-    <CurriculumEditor__ContentBlockCreator target addContentBlockCB={addContentBlock(send)} />
-  </div>
-}
-
-@react.component
-let make = (~target, ~setDirtyCB) => {
-  let (state, send) = React.useReducer(
-    reducer,
-    {
-      loading: true,
-      contentBlocks: [],
-      versions: [],
-      dirtyContentBlockIds: Belt.Set.String.empty,
-    },
-  )
-
-  React.useEffect0(() => {
-    loadContentBlocks(target |> Target.id, send)
-    None
-  })
-
-  React.useEffect1(() => {
-    let dirty = !(state.dirtyContentBlockIds |> Belt.Set.String.isEmpty)
-    setDirtyCB(dirty)
-    None
-  }, [state.dirtyContentBlockIds])
-
-  <div className="max-w-3xl py-6 px-3 mx-auto">
-    {state.loading
-      ? SkeletonLoading.multiple(~count=2, ~element=SkeletonLoading.contents())
-      : editor(target, state, send)}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentTypePicker.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentTypePicker.res
deleted file mode 100644
index be531ed..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ContentTypePicker.res
+++ /dev/null
@@ -1,58 +0,0 @@
-let str = React.string
-
-type kindOfButton =
-  | MarkdownButton
-  | FileButton
-  | ImageButton
-  | EmbedButton
-
-let buttonClasses = (visibility, staticMode) => {
-  let classes = "add-content-block py-3 cursor-pointer"
-  classes ++ (visibility || staticMode ? " add-content-block--open" : " ")
-}
-
-let button = (sortIndex, newContentBlockCB, kindOfButton) => {
-  let (faIcon, buttonText, newBlock) = switch kindOfButton {
-  | MarkdownButton => ("fab fa-markdown", "Markdown", () => ContentBlock.makeMarkdownBlock(""))
-  | FileButton => ("far fa-file-alt", "File", () => ContentBlock.makeFileBlock("", "", ""))
-  | ImageButton => ("far fa-image", "Image", () => ContentBlock.makeImageBlock("", ""))
-  | EmbedButton => ("fas fa-code", "Embed", () => ContentBlock.makeEmbedBlock("", ""))
-  }
-
-  <div
-    key=buttonText
-    className="add-content-block__block-content-type-picker px-3 pt-4 pb-3 flex-1 text-center text-primary-200"
-    onClick={event => {
-      event |> ReactEvent.Mouse.preventDefault
-      newContentBlockCB(sortIndex, newBlock())
-    }}>
-    <i className={faIcon ++ " text-2xl"} /> <p className="font-semibold"> {buttonText |> str} </p>
-  </div>
-}
-
-@react.component
-let make = (~sortIndex, ~staticMode, ~newContentBlockCB) => {
-  let (visibility, setVisibility) = React.useState(() => false)
-  <div className={buttonClasses(visibility, staticMode)}>
-    {staticMode
-    /* Spacer for add-content-block section */
-      ? <div className="h-10" />
-      : <div
-          className="add-content-block__plus-button-container relative"
-          onClick={_event => setVisibility(_ => !visibility)}>
-          <div
-            id={"add-block-" ++ (sortIndex |> string_of_int)}
-            title="Add block"
-            className="add-content-block__plus-button bg-gray-200 hover:bg-gray-300 relative rounded-lg border border-gray-500 w-10 h-10 flex justify-center items-center mx-auto z-20">
-            <i className="fas fa-plus text-base add-content-block__plus-button-icon" />
-          </div>
-        </div>}
-    <div
-      className="add-content-block__block-content-type text-sm hidden shadow-lg mx-auto relative bg-primary-900 rounded-lg -mt-4 z-10"
-      id={"content-type-picker-" ++ (sortIndex |> string_of_int)}>
-      {[MarkdownButton, ImageButton, EmbedButton, FileButton]
-      |> Array.map(button(sortIndex, newContentBlockCB))
-      |> React.array}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Course.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Course.res
deleted file mode 100644
index c5f64e7..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Course.res
+++ /dev/null
@@ -1,8 +0,0 @@
-type t = {id: string}
-
-let id = t => t.id
-
-let decode = json => {
-  open Json.Decode
-  {id: json |> field("id", string)}
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__EvaluationCriteria.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__EvaluationCriteria.res
deleted file mode 100644
index f73eaa6..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__EvaluationCriteria.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-}
-
-let name = t => t.name
-
-let id = t => t.id
-
-let decode = json => {
-  open Json.Decode
-  {
-    name: json |> field("name", string),
-    id: json |> field("id", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__FileBlockEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__FileBlockEditor.res
deleted file mode 100644
index ceff97c..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__FileBlockEditor.res
+++ /dev/null
@@ -1,48 +0,0 @@
-let str = React.string
-
-let onChange = (contentBlock, updateContentBlockCB, event) => {
-  event |> ReactEvent.Form.preventDefault
-  let newTitle = ReactEvent.Form.target(event)["value"]
-  let newContentBlock = contentBlock |> ContentBlock.updateFile(newTitle)
-  updateContentBlockCB(newContentBlock)
-}
-
-@react.component
-let make = (~url, ~title, ~filename, ~contentBlock, ~updateContentBlockCB) => {
-  let titleInputId = "title-" ++ (contentBlock |> ContentBlock.id)
-
-  <div className="relative border border-gray-400 rounded-lg">
-    <div
-      className="content-block__content text-base bg-gray-200 flex justify-center items-center rounded-t-lg">
-      <div className="w-full">
-        <a
-          className="flex justify-between items-center bg-white rounded-t-lg px-6 py-4 hover:bg-gray-100 hover:text-primary-500"
-          target="_blank"
-          href=url>
-          <div className="flex items-center">
-            <FaIcon classes="text-4xl text-gray-800 far fa-file-alt" />
-            <div className="pl-4 leading-tight h-12 flex flex-col justify-center">
-              <div className="text-lg font-semibold"> {title |> str} </div>
-              <div className="text-sm italic text-gray-600"> {filename |> str} </div>
-            </div>
-          </div>
-        </a>
-      </div>
-    </div>
-    <div className="flex border-t justify-end">
-      <div className="flex-1 content-block__action-bar-input p-3">
-        <label htmlFor=titleInputId className="text-sm font-semibold"> {"Title" |> str} </label>
-        <span className="text-sm ml-1"> {"(optional)" |> str} </span>
-        <input
-          id=titleInputId
-          className="mt-1 appearance-none block w-full h-10 bg-white text-gray-800 border rounded py-3 px-3 focus:border-gray-400 leading-tight focus:outline-none focus:bg-white focus:border-gray"
-          onChange={onChange(contentBlock, updateContentBlockCB)}
-          maxLength=60
-          type_="text"
-          value=title
-          placeholder="A title for this file"
-        />
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ImageBlockEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ImageBlockEditor.res
deleted file mode 100644
index f5d0041..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__ImageBlockEditor.res
+++ /dev/null
@@ -1,45 +0,0 @@
-let str = React.string
-
-let onChange = (contentBlock, updateContentBlockCB, event) => {
-  event |> ReactEvent.Form.preventDefault
-  let newCaption = ReactEvent.Form.target(event)["value"]
-  let newContentBlock = contentBlock |> ContentBlock.updateImage(newCaption)
-  updateContentBlockCB(newContentBlock)
-}
-
-@react.component
-let make = (~url, ~caption, ~contentBlock, ~updateContentBlockCB) => {
-  let captionInputId = "caption-" ++ (contentBlock |> ContentBlock.id)
-
-  <div className="relative border border-gray-400 rounded-lg">
-    <div
-      className="content-block__content text-base bg-gray-200 flex justify-center items-center rounded-t-lg">
-      <div className="w-full">
-        <div className="rounded-t-lg bg-white">
-          <img className="mx-auto" src=url alt=caption />
-          {switch caption {
-          | "" => React.null
-
-          | caption =>
-            <div className="px-4 py-2 text-sm italic text-center"> {caption |> str} </div>
-          }}
-        </div>
-      </div>
-    </div>
-    <div className="flex border-t justify-end">
-      <div className="flex-1 content-block__action-bar-input p-3">
-        <label htmlFor=captionInputId className="text-sm font-semibold"> {"Caption" |> str} </label>
-        <span className="text-sm ml-1"> {"(optional)" |> str} </span>
-        <input
-          id=captionInputId
-          className="mt-1 appearance-none block w-full h-10 bg-white text-gray-800 border rounded py-3 px-3 focus:border-gray-400 leading-tight focus:outline-none focus:bg-white focus:border-gray"
-          onChange={onChange(contentBlock, updateContentBlockCB)}
-          maxLength=250
-          type_="text"
-          value=caption
-          placeholder="A caption for the image"
-        />
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Level.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Level.res
deleted file mode 100644
index 15d4225..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Level.res
+++ /dev/null
@@ -1,40 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  number: int,
-  unlockOn: option<Js.Date.t>,
-}
-
-let id = t => t.id
-
-let name = t => t.name
-
-let number = t => t.number
-
-let unlockOn = t => t.unlockOn
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    number: json |> field("number", int),
-    unlockOn: json |> optional(field("unlockOn", string)) |> OptionUtils.map(DateFns.parseString),
-  }
-}
-
-let selectLevel = (levels, level_name) => levels |> List.find(q => q.name == level_name)
-
-let create = (id, name, number, unlockOn) => {
-  id: id,
-  name: name,
-  number: number,
-  unlockOn: unlockOn,
-}
-
-let updateList = (levels, level) => {
-  let oldLevels = levels |> List.filter(l => l.id !== level.id)
-  oldLevels |> List.rev |> List.append(list{level}) |> List.rev
-}
-
-let sort = levels => levels |> List.sort((x, y) => x.number - y.number)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__LevelEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__LevelEditor.res
deleted file mode 100644
index 524a9ba..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__LevelEditor.res
+++ /dev/null
@@ -1,178 +0,0 @@
-open CurriculumEditor__Types
-
-let str = ReasonReact.string
-
-type state = {
-  name: string,
-  unlockOn: option<Js.Date.t>,
-  hasNameError: bool,
-  dirty: bool,
-  saving: bool,
-}
-
-type action =
-  | UpdateName(string, bool)
-  | UpdateUnlockOn(option<Js.Date.t>)
-  | UpdateSaving
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateName(name, hasNameError) => {
-      ...state,
-      name: name,
-      hasNameError: hasNameError,
-      dirty: true,
-    }
-  | UpdateUnlockOn(date) => {...state, unlockOn: date, dirty: true}
-  | UpdateSaving => {...state, saving: !state.saving}
-  }
-
-let updateName = (send, name) => {
-  let hasError = name |> String.trim |> String.length < 2
-  send(UpdateName(name, hasError))
-}
-
-let saveDisabled = state => state.hasNameError || (!state.dirty || state.saving)
-
-let setPayload = (authenticityToken, state) => {
-  let payload = Js.Dict.empty()
-
-  Js.Dict.set(payload, "authenticity_token", authenticityToken |> Js.Json.string)
-  Js.Dict.set(payload, "name", state.name |> Js.Json.string)
-
-  switch state.unlockOn {
-  | Some(date) => Js.Dict.set(payload, "unlock_on", date |> Date.iso8601 |> Js.Json.string)
-  | None => Js.Dict.set(payload, "unlock_on", "" |> Js.Json.string)
-  }
-  payload
-}
-let formClasses = value =>
-  value ? "drawer-right-form w-full opacity-50" : "drawer-right-form w-full"
-
-let computeInitialState = level =>
-  switch level {
-  | Some(level) => {
-      name: level |> Level.name,
-      unlockOn: level |> Level.unlockOn,
-      hasNameError: false,
-      dirty: false,
-      saving: false,
-    }
-  | None => {
-      name: "",
-      unlockOn: None,
-      hasNameError: false,
-      dirty: false,
-      saving: false,
-    }
-  }
-
-@react.component
-let make = (~level, ~course, ~authenticityToken, ~hideEditorActionCB, ~updateLevelsCB) => {
-  let (state, send) = React.useReducerWithMapState(reducer, level, computeInitialState)
-  let handleErrorCB = () => send(UpdateSaving)
-  let handleResponseCB = json => {
-    let id = json |> {
-      open Json.Decode
-      field("id", string)
-    }
-    let number = json |> {
-      open Json.Decode
-      field("number", int)
-    }
-    let newLevel = Level.create(id, state.name, number, state.unlockOn)
-    switch level {
-    | Some(_) => Notification.success("Success", "Level updated successfully")
-    | None => Notification.success("Success", "Level created successfully")
-    }
-    updateLevelsCB(newLevel)
-  }
-
-  let createLevel = (authenticityToken, course, state) => {
-    send(UpdateSaving)
-    let course_id = course |> Course.id
-    let url = "/school/courses/" ++ (course_id ++ "/levels")
-    Api.create(url, setPayload(authenticityToken, state), handleResponseCB, handleErrorCB)
-  }
-
-  let updateLevel = (authenticityToken, levelId, state) => {
-    send(UpdateSaving)
-    let url = "/school/levels/" ++ levelId
-    Api.update(url, setPayload(authenticityToken, state), handleResponseCB, handleErrorCB)
-  }
-
-  <div>
-    <div className="blanket" />
-    <div className="drawer-right">
-      <div className="drawer-right__close absolute">
-        <button
-          title="close"
-          onClick={_ => hideEditorActionCB()}
-          className="flex items-center justify-center bg-white text-gray-600 font-bold py-3 px-5 rounded-l-full rounded-r-none hover:text-gray-700 focus:outline-none mt-4">
-          <i className="fas fa-times text-xl" />
-        </button>
-      </div>
-      <div className={formClasses(state.saving)}>
-        <div className="w-full">
-          <div className="mx-auto bg-white">
-            <div className="max-w-2xl p-6 mx-auto">
-              <h5 className="uppercase text-center border-b pb-2 mb-4">
-                {"Level Details" |> str}
-              </h5>
-              <div className="mt-5">
-                <label className="inline-block tracking-wide text-xs font-semibold" htmlFor="name">
-                  {"Level Name" |> str}
-                </label>
-                <span> {"*" |> str} </span>
-                <input
-                  className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                  id="name"
-                  type_="text"
-                  placeholder="Type level name here"
-                  value=state.name
-                  onChange={event => updateName(send, ReactEvent.Form.target(event)["value"])}
-                />
-                {state.hasNameError
-                  ? <div className="drawer-right-form__error-msg">
-                      {"not a valid name" |> str}
-                    </div>
-                  : ReasonReact.null}
-              </div>
-              <div className="mt-5">
-                <label
-                  className="block tracking-wide text-xs font-semibold" htmlFor="unlock-on-input">
-                  {"Unlock level on" |> str}
-                </label>
-                <DatePicker
-                  id="unlock-on-input"
-                  selected=?state.unlockOn
-                  onChange={date => send(UpdateUnlockOn(date))}
-                />
-              </div>
-              <div className="flex mt-5">
-                {switch level {
-                | Some(level) =>
-                  let id = level |> Level.id
-                  <button
-                    disabled={saveDisabled(state)}
-                    onClick={_event => updateLevel(authenticityToken, id, state)}
-                    className="w-full btn btn-large btn-primary">
-                    {"Update Level" |> str}
-                  </button>
-
-                | None =>
-                  <button
-                    disabled={saveDisabled(state)}
-                    onClick={_event => createLevel(authenticityToken, course, state)}
-                    className="w-full btn btn-large btn-primary">
-                    {"Create New Level" |> str}
-                  </button>
-                }}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__MarkdownBlockEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__MarkdownBlockEditor.res
deleted file mode 100644
index e8599ad..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__MarkdownBlockEditor.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let str = React.string
-
-let onChange = (contentBlock, updateContentBlockCB, value) => {
-  let newContentBlock = contentBlock |> ContentBlock.updateMarkdown(value)
-  updateContentBlockCB(newContentBlock)
-}
-
-@react.component
-let make = (~markdown, ~contentBlock, ~updateContentBlockCB) =>
-  <MarkdownEditor
-    value=markdown
-    profile=Markdown.Permissive
-    maxLength=10000
-    onChange={onChange(contentBlock, updateContentBlockCB)}
-  />
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__QuizQuestion.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__QuizQuestion.res
deleted file mode 100644
index d631d96..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__QuizQuestion.res
+++ /dev/null
@@ -1,87 +0,0 @@
-type id = string
-
-type t = {
-  id: id,
-  question: string,
-  answerOptions: array<CurriculumEditor__AnswerOption.t>,
-}
-
-let id = t => t.id
-
-let question = t => t.question
-
-let answerOptions = t => t.answerOptions
-
-let empty = id => {
-  id: id,
-  question: "",
-  answerOptions: [
-    CurriculumEditor__AnswerOption.empty("0", true),
-    CurriculumEditor__AnswerOption.empty("1", false),
-  ],
-}
-
-let updateQuestion = (question, t) => {...t, question: question}
-
-let newAnswerOption = (id, t) => {
-  let answerOption = CurriculumEditor__AnswerOption.empty(id, false)
-  let newAnswerOptions = t.answerOptions |> ArrayUtils.copyAndPush(answerOption)
-  {...t, answerOptions: newAnswerOptions}
-}
-
-let removeAnswerOption = (id, t) => {
-  let newAnswerOptions =
-    t.answerOptions |> Js.Array.filter(a => a |> CurriculumEditor__AnswerOption.id !== id)
-  {...t, answerOptions: newAnswerOptions}
-}
-
-let replace = (id, answerOptionB, t) => {
-  let newAnswerOptions =
-    t.answerOptions |> Array.map(a =>
-      a |> CurriculumEditor__AnswerOption.id == id ? answerOptionB : a
-    )
-  {...t, answerOptions: newAnswerOptions}
-}
-
-let markAsCorrect = (id, t) => {
-  let newAnswerOptions =
-    t.answerOptions |> Array.map(a =>
-      a |> CurriculumEditor__AnswerOption.id == id
-        ? CurriculumEditor__AnswerOption.markAsCorrect(a)
-        : CurriculumEditor__AnswerOption.markAsIncorrect(a)
-    )
-  {...t, answerOptions: newAnswerOptions}
-}
-
-let isValidQuizQuestion = t => {
-  let validQuestion = t.question |> Js.String.trim |> Js.String.length >= 1
-  let hasZeroInvalidAnswerOptions =
-    t.answerOptions
-    |> Js.Array.filter(answerOption =>
-      answerOption |> CurriculumEditor__AnswerOption.isValidAnswerOption != true
-    )
-    |> ArrayUtils.isEmpty
-  let hasOnlyOneCorrectAnswerOption =
-    t.answerOptions
-    |> Js.Array.filter(answerOption =>
-      answerOption |> CurriculumEditor__AnswerOption.correctAnswer == true
-    )
-    |> Array.length == 1
-  validQuestion && (hasZeroInvalidAnswerOptions && hasOnlyOneCorrectAnswerOption)
-}
-
-let makeFromJs = quizData => {
-  id: quizData["id"],
-  question: quizData["question"],
-  answerOptions: quizData["answerOptions"] |> Array.map(answerOption =>
-    answerOption |> CurriculumEditor__AnswerOption.makeFromJs
-  ),
-}
-
-let quizAsJsObject = quiz =>
-  quiz |> Array.map(quiz =>
-    {
-      "question": quiz.question,
-      "answerOptions": CurriculumEditor__AnswerOption.quizAnswersAsJsObject(quiz.answerOptions),
-    }
-  )
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__SortResourcesMutation.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__SortResourcesMutation.res
deleted file mode 100644
index 18cf770..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__SortResourcesMutation.res
+++ /dev/null
@@ -1,23 +0,0 @@
-type resourceType =
-  | Target
-  | TargetGroup
-
-module SortResourceMutation = %graphql(`
-   mutation SortCurriculumResourcesMutation($resourceIds: [ID!]!, $resourceType: String!) {
-    sortCurriculumResources(resourceIds: $resourceIds, resourceType: $resourceType){
-      success
-    }
-  }
-   `)
-
-let resourceTypeToString = resourceType =>
-  switch resourceType {
-  | Target => "Target"
-  | TargetGroup => "TargetGroup"
-  }
-
-let sort = (resourceType, resourceIds) =>
-  SortResourceMutation.make(~resourceIds, ~resourceType=resourceTypeToString(resourceType), ())
-  |> GraphqlQuery.sendQuery(~notify=false)
-  |> Js.Promise.then_(_response => Js.Promise.resolve())
-  |> ignore
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Target.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Target.res
deleted file mode 100644
index 575707f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Target.res
+++ /dev/null
@@ -1,86 +0,0 @@
-exception InvalidVisibilityValue(string)
-
-type visibility =
-  | Draft
-  | Live
-  | Archived
-
-type t = {
-  id: string,
-  targetGroupId: string,
-  title: string,
-  sortIndex: int,
-  visibility: visibility,
-}
-
-let id = t => t.id
-
-let title = t => t.title
-
-let targetGroupId = t => t.targetGroupId
-
-let sortIndex = t => t.sortIndex
-
-let visibility = t => t.visibility
-
-let decodeVisbility = visibilityString =>
-  switch visibilityString {
-  | "draft" => Draft
-  | "live" => Live
-  | "archived" => Archived
-  | _ => raise(InvalidVisibilityValue("Unknown Value"))
-  }
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    targetGroupId: json |> field("targetGroupId", string),
-    title: json |> field("title", string),
-    sortIndex: json |> field("sortIndex", int),
-    visibility: decodeVisbility(json |> field("visibility", string)),
-  }
-}
-
-let updateList = (targets, target) => {
-  let oldTargets = targets |> List.filter(t => t.id !== target.id)
-  oldTargets |> List.rev |> List.append(list{target}) |> List.rev
-}
-
-let create = (~id, ~targetGroupId, ~title, ~sortIndex, ~visibility) => {
-  id: id,
-  targetGroupId: targetGroupId,
-  title: title,
-  sortIndex: sortIndex,
-  visibility: visibility,
-}
-
-let sort = targets => targets |> List.sort((x, y) => x.sortIndex - y.sortIndex)
-
-let archive = t => {...t, visibility: Archived}
-
-let archived = t =>
-  switch t.visibility {
-  | Archived => true
-  | Live => false
-  | Draft => false
-  }
-
-let removeTarget = (target, targets) => targets |> List.filter(t => t.id != target.id)
-
-let targetIdsInTargetGroup = (id, targets) =>
-  targets |> List.filter(t => t.targetGroupId == id) |> List.map(t => t.id)
-
-let updateSortIndex = sortedTargets =>
-  sortedTargets |> List.mapi((sortIndex, t) =>
-    create(
-      ~id=t.id,
-      ~targetGroupId=t.targetGroupId,
-      ~title=t.title,
-      ~sortIndex,
-      ~visibility=t.visibility,
-    )
-  )
-
-let template = (id, targetGroupId, title) =>
-  create(~id, ~targetGroupId, ~title, ~sortIndex=999, ~visibility=Draft)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetChecklistItemEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetChecklistItemEditor.res
deleted file mode 100644
index faf609a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetChecklistItemEditor.res
+++ /dev/null
@@ -1,260 +0,0 @@
-@@bs.config({jsx: 3})
-
-open CurriculumEditor__Types
-
-let str = React.string
-
-let updateTitle = (checklistItem, updateChecklistItemCB, event) => {
-  let title = ReactEvent.Form.target(event)["value"]
-  let newChecklistItem = checklistItem |> ChecklistItem.updateTitle(title)
-  updateChecklistItemCB(newChecklistItem)
-}
-
-let updateKind = (checklistItem, updateChecklistItemCB, kind) => {
-  let newChecklistItem = checklistItem |> ChecklistItem.updateKind(kind)
-  updateChecklistItemCB(newChecklistItem)
-}
-
-let updateOptional = (checklistItem, updateChecklistItemCB, event) => {
-  let optional = ReactEvent.Form.target(event)["checked"]
-  let newChecklistItem = checklistItem |> ChecklistItem.updateOptional(optional)
-  updateChecklistItemCB(newChecklistItem)
-}
-
-let buttonColorClasses = color =>
-  "border-" ++
-  (color ++
-  ("-500 " ++ ("bg-" ++ (color ++ ("-100 " ++ ("text-" ++ (color ++ "-800")))))))
-let iconColorClasses = color => "bg-" ++ (color ++ "-500 ")
-let selectedButtonIcon = kind =>
-  switch kind {
-  | ChecklistItem.LongText => "i-long-text-regular"
-  | ShortText => "i-short-text-regular"
-  | Files => "i-file-regular"
-  | Link => "i-link-regular"
-  | MultiChoice(_choices) => "i-check-circle-alt-regular"
-  }
-let checklistDropdown = (checklistItem, allowFileKind, updateChecklistItemCB) => {
-  let selectedKind = checklistItem |> ChecklistItem.kind
-  let selectedButtonColor = switch selectedKind {
-  | LongText => "blue"
-  | ShortText => "orange"
-  | Files => "pink"
-  | Link => "indigo"
-  | MultiChoice(_choices) => "teal"
-  }
-  let selected =
-    <button
-      className={"border focus:outline-none appearance-none flex items-center rounded " ++
-      buttonColorClasses(selectedButtonColor)}>
-      <div className="flex">
-        <span
-          className={"flex items-center justify-center rounded text-white p-1 m-1 " ++
-          iconColorClasses(selectedButtonColor)}>
-          <PfIcon className={"if if-fw " ++ selectedButtonIcon(selectedKind)} />
-        </span>
-        <span className="inline-flex items-center px-1 py-1 font-semibold text-xs">
-          {selectedKind |> ChecklistItem.actionStringForKind |> str}
-        </span>
-      </div>
-      <span className="px-2 py-1 flex items-center">
-        <i className="fas fa-caret-down text-xs" />
-      </span>
-    </button>
-
-  let defaultKindTypes = [ChecklistItem.LongText, ShortText, Link, MultiChoice(["Yes", "No"])]
-
-  let allowedKindTypes = allowFileKind
-    ? defaultKindTypes |> Array.append([ChecklistItem.Files])
-    : defaultKindTypes
-
-  let contents =
-    allowedKindTypes
-    |> Js.Array.filter(kind => kind != selectedKind)
-    |> Array.mapi((index, kind) =>
-      <button
-        key={index |> string_of_int}
-        className="w-full px-2 py-1 focus:outline-none appearance-none text-left"
-        onClick={_ => updateKind(checklistItem, updateChecklistItemCB, kind)}>
-        <PfIcon className={"mr-2 if if-fw " ++ selectedButtonIcon(kind)} />
-        {kind |> ChecklistItem.actionStringForKind |> str}
-      </button>
-    )
-  <Dropdown selected contents />
-}
-
-let removeMultichoiceOption = (choiceIndex, checklistItem, updateChecklistItemCB) => {
-  let newChecklistItem = checklistItem |> ChecklistItem.removeMultichoiceOption(choiceIndex)
-  updateChecklistItemCB(newChecklistItem)
-}
-let addMultichoiceOption = (checklistItem, updateChecklistItemCB) => {
-  let newChecklistItem = checklistItem |> ChecklistItem.addMultichoiceOption
-  updateChecklistItemCB(newChecklistItem)
-}
-
-let updateChoiceText = (choiceIndex, checklistItem, updateChecklistItemCB, event) => {
-  let choice = ReactEvent.Form.target(event)["value"]
-  let newChecklistItem = checklistItem |> ChecklistItem.updateMultichoiceOption(choiceIndex, choice)
-  updateChecklistItemCB(newChecklistItem)
-}
-
-let multiChoiceEditor = (choices, checklistItem, removeMultichoiceOption, updateChecklistItemCB) =>
-  <div className="ml-3 mt-3">
-    <div className="text-xs font-semibold mb-2"> {"Choices:" |> str} </div>
-    {
-      let showRemoveIcon = Array.length(choices) > 2
-      choices
-      |> Array.mapi((index, choice) =>
-        <div key={index |> string_of_int}>
-          <div className="flex items-center text-sm rounded mt-2">
-            <span className="text-gray-400"> <i className="far fa-circle text-base" /> </span>
-            <div
-              className="flex flex-1 py-2 px-3 ml-3 justify-between items-center focus:outline-none bg-white focus:bg-white focus:border-primary-300 border border-gray-400 rounded">
-              <input
-                name={"multichoice-input-" ++ (index + 1 |> string_of_int)}
-                className="flex-1 appearance-none bg-transparent border-none leading-snug focus:outline-none"
-                onChange={updateChoiceText(index, checklistItem, updateChecklistItemCB)}
-                type_="text"
-                value=choice
-              />
-              <button
-                title={"Remove Choice " ++ (index + 1 |> string_of_int)}
-                onClick={_ => removeMultichoiceOption(index, checklistItem, updateChecklistItemCB)}>
-                {showRemoveIcon ? <PfIcon className="if i-times-regular if-fw" /> : React.null}
-              </button>
-            </div>
-          </div>
-          <div className="ml-6">
-            <School__InputGroupError
-              message="Not a valid choice" active={choice |> String.trim == ""}
-            />
-          </div>
-        </div>
-      )
-      |> React.array
-    }
-    <button
-      onClick={_ => addMultichoiceOption(checklistItem, updateChecklistItemCB)}
-      className="flex mt-2 ml-7 p-2 text-sm appearance-none bg-white border rounded items-center justify-between outline-none border-gray-400 hover:border-gray-100 hover:shadow-lg focus:outline-none">
-      <PfIcon className="fas fa-plus-circle if-fw" />
-      <span className="font-semibold ml-2"> {"Add a choice" |> str} </span>
-    </button>
-  </div>
-
-let controlIcon = (~icon, ~title, ~handler) =>
-  handler == None
-    ? React.null
-    : <button
-        title
-        disabled={handler == None}
-        className="px-2 py-1 focus:outline-none text-sm text-gray-700 hover:bg-gray-300 hover:text-gray-900 overflow-hidden"
-        onClick=?handler>
-        <i className={"fas fa-fw " ++ icon} />
-      </button>
-
-let filesNotice =
-  <div className="mt-2 text-sm">
-    <strong> {"Note:" |> str} </strong>
-    <span className="ml-1">
-      {"Students can submit up to 3 files, limited to 5 MB each." |> str}
-    </span>
-  </div>
-
-let isRequiredStepTitleDuplicated = (checklist, item) => {
-  let trimmedTitle = item |> ChecklistItem.title |> String.trim
-
-  if trimmedTitle == "" {
-    false
-  } else {
-    checklist
-    |> Js.Array.filter(item => !ChecklistItem.optional(item))
-    |> Js.Array.filter(checklistItem =>
-      checklistItem |> ChecklistItem.title |> String.trim == trimmedTitle
-    )
-    |> Array.length > 1
-  }
-}
-
-@react.component
-let make = (
-  ~checklist,
-  ~checklistItem,
-  ~index,
-  ~updateChecklistItemCB,
-  ~removeChecklistItemCB,
-  ~moveChecklistItemUpCB=?,
-  ~moveChecklistItemDownCB=?,
-  ~copyChecklistItemCB,
-  ~allowFileKind,
-) =>
-  <div
-    key={index |> string_of_int}
-    ariaLabel={"Editor for checklist item " ++ (index + 1 |> string_of_int)}
-    className="flex items-start py-2 relative">
-    <div className="w-full bg-gray-100 border rounded-lg p-5 mr-1">
-      <div className="flex justify-between items-center">
-        <div> {checklistDropdown(checklistItem, allowFileKind, updateChecklistItemCB)} </div>
-        <div className="items-center">
-          <input
-            className="leading-tight"
-            type_="checkbox"
-            onChange={updateOptional(checklistItem, updateChecklistItemCB)}
-            id={index |> string_of_int}
-            checked={checklistItem |> ChecklistItem.optional}
-          />
-          <label className="text-xs text-gray-600 ml-2" htmlFor={index |> string_of_int}>
-            {"Optional" |> str}
-          </label>
-        </div>
-      </div>
-      <div
-        className="flex items-center text-sm bg-white border border-gray-400 rounded py-2 px-3 mt-2 focus:outline-none focus:bg-white focus:border-primary-300">
-        <input
-          name={"checklist-item-" ++ ((index + 1 |> string_of_int) ++ "-title")}
-          className="flex-grow appearance-none bg-transparent border-none leading-relaxed focus:outline-none"
-          placeholder="Describe this step"
-          onChange={updateTitle(checklistItem, updateChecklistItemCB)}
-          type_="text"
-          value={checklistItem |> ChecklistItem.title}
-        />
-      </div>
-      <div>
-        <School__InputGroupError
-          message="Step cannot be empty"
-          active={checklistItem |> ChecklistItem.title |> String.trim == ""}
-        />
-        <School__InputGroupError
-          message="Not a unique step; required steps must be unique"
-          active={isRequiredStepTitleDuplicated(checklist, checklistItem)}
-        />
-      </div>
-      {switch checklistItem |> ChecklistItem.kind {
-      | MultiChoice(choices) =>
-        multiChoiceEditor(choices, checklistItem, removeMultichoiceOption, updateChecklistItemCB)
-      | Files => filesNotice
-      | ShortText
-      | LongText
-      | Link => React.null
-      }}
-    </div>
-    <div
-      ariaLabel={"Controls for checklist item " ++ (index + 1 |> string_of_int)}
-      className="-mr-10 flex-shrink-0 border bg-gray-100 border rounded-lg flex flex-col text-xs sticky top-0">
-      {controlIcon(
-        ~icon="fa-arrow-up",
-        ~title="Move Up",
-        ~handler=moveChecklistItemUpCB |> OptionUtils.map((cb, _) => cb()),
-      )}
-      {controlIcon(
-        ~icon="fa-arrow-down",
-        ~title="Move Down",
-        ~handler=moveChecklistItemDownCB |> OptionUtils.map((cb, _) => cb()),
-      )}
-      {controlIcon(~icon="fa-copy", ~title="Copy", ~handler=Some(_ => copyChecklistItemCB()))}
-      {controlIcon(
-        ~icon="fa-trash-alt",
-        ~title="Delete",
-        ~handler=Some(_ => removeChecklistItemCB()),
-      )}
-    </div>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetDetails.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetDetails.res
deleted file mode 100644
index 16b864f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetDetails.res
+++ /dev/null
@@ -1,80 +0,0 @@
-exception InvalidVisibilityValue(string)
-exception InvalidRoleValue(string)
-
-type role =
-  | Student
-  | Team
-
-type visibility =
-  | Draft
-  | Live
-  | Archived
-
-type t = {
-  title: string,
-  role: role,
-  evaluationCriteria: array<string>,
-  prerequisiteTargets: array<string>,
-  targetGroupId: string,
-  quiz: array<CurriculumEditor__QuizQuestion.t>,
-  checklist: array<TargetChecklistItem.t>,
-  linkToComplete: option<string>,
-  visibility: visibility,
-  completionInstructions: option<string>,
-}
-
-let title = t => t.title
-let role = t => t.role
-
-let targetGroupId = t => t.targetGroupId
-
-let visibility = t => t.visibility
-
-let quiz = t => t.quiz
-
-let prerequisiteTargets = t => t.prerequisiteTargets
-
-let evaluationCriteria = t => t.evaluationCriteria
-
-let visibilityFromJs = visibilityString =>
-  switch visibilityString {
-  | "draft" => Draft
-  | "live" => Live
-  | "archived" => Archived
-  | _ => raise(InvalidVisibilityValue("Unknown Value"))
-  }
-
-let visibilityAsString = visibility =>
-  switch visibility {
-  | Draft => "draft"
-  | Live => "live"
-  | Archived => "archived"
-  }
-
-let roleAsString = role =>
-  switch role {
-  | Student => "student"
-  | Team => "team"
-  }
-
-let roleFromJs = roleString =>
-  switch roleString {
-  | "student" => Student
-  | "team" => Team
-  | role => raise(InvalidRoleValue("Unknown Value :" ++ role))
-  }
-
-let makeFromJs = targetData => {
-  title: targetData["title"],
-  role: roleFromJs(targetData["role"]),
-  targetGroupId: targetData["targetGroupId"],
-  evaluationCriteria: targetData["evaluationCriteria"],
-  prerequisiteTargets: targetData["prerequisiteTargets"],
-  quiz: targetData["quiz"] |> Array.map(quizQuestion =>
-    quizQuestion |> CurriculumEditor__QuizQuestion.makeFromJs
-  ),
-  linkToComplete: targetData["linkToComplete"],
-  completionInstructions: targetData["completionInstructions"],
-  checklist: targetData["checklist"] |> Json.Decode.array(TargetChecklistItem.decode),
-  visibility: visibilityFromJs(targetData["visibility"]),
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetDetailsEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetDetailsEditor.res
deleted file mode 100644
index a86d699..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetDetailsEditor.res
+++ /dev/null
@@ -1,961 +0,0 @@
-open CurriculumEditor__Types
-
-@module("./images/target-complete-mark-icon.svg")
-external markIcon: string = "default"
-@module("./images/target-complete-link-icon.svg")
-external linkIcon: string = "default"
-@module("./images/target-complete-quiz-icon.svg")
-external quizIcon: string = "default"
-
-let str = React.string
-
-type methodOfCompletion =
-  | Evaluated
-  | VisitLink
-  | TakeQuiz
-  | MarkAsComplete
-
-type evaluationCriterion = (int, string, bool)
-
-type state = {
-  title: string,
-  targetGroupId: string,
-  role: TargetDetails.role,
-  evaluationCriteria: array<string>,
-  prerequisiteTargets: array<string>,
-  prerequisiteSearchInput: string,
-  evaluationCriteriaSearchInput: string,
-  methodOfCompletion: methodOfCompletion,
-  quiz: array<QuizQuestion.t>,
-  linkToComplete: string,
-  dirty: bool,
-  saving: bool,
-  loading: bool,
-  visibility: TargetDetails.visibility,
-  checklist: array<ChecklistItem.t>,
-  completionInstructions: string,
-}
-
-type action =
-  | SaveTargetDetails(TargetDetails.t)
-  | UpdateTitle(string)
-  | UpdatePrerequisiteTargets(array<string>)
-  | UpdateMethodOfCompletion(methodOfCompletion)
-  | UpdateEvaluationCriteria(array<string>)
-  | UpdatePrerequisiteSearchInput(string)
-  | UpdateEvaluationCriteriaSearchInput(string)
-  | UpdateLinkToComplete(string)
-  | UpdateCompletionInstructions(string)
-  | UpdateTargetRole(TargetDetails.role)
-  | AddQuizQuestion
-  | UpdateQuizQuestion(QuizQuestion.id, QuizQuestion.t)
-  | RemoveQuizQuestion(QuizQuestion.id)
-  | UpdateVisibility(TargetDetails.visibility)
-  | UpdateChecklistItem(int, ChecklistItem.t)
-  | AddNewChecklistItem
-  | RemoveChecklistItem(int)
-  | MoveChecklistItemUp(int)
-  | MoveChecklistItemDown(int)
-  | CopyChecklistItem(int)
-  | UpdateSaving
-  | ResetEditor
-
-module TargetDetailsQuery = %graphql(`
-    query TargetDetailsQuery($targetId: ID!) {
-      targetDetails(targetId: $targetId) {
-        title
-        targetGroupId
-        evaluationCriteria
-        prerequisiteTargets
-        quiz {
-          id
-          question
-          answerOptions {
-            id
-            answer
-            hint
-            correctAnswer
-          }
-        }
-        completionInstructions
-        visibility
-        linkToComplete
-        role
-        checklist
-      }
-  }
-`)
-
-let loadTargetDetails = (targetId, send) =>
-  TargetDetailsQuery.make(~targetId, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result => {
-    let targetDetails = TargetDetails.makeFromJs(result["targetDetails"])
-    send(SaveTargetDetails(targetDetails))
-    Js.Promise.resolve()
-  })
-  |> ignore
-
-let defaultChecklist = [
-  ChecklistItem.make(~title="Describe your submission", ~kind=LongText, ~optional=false),
-]
-
-let computeMethodOfCompletion = targetDetails => {
-  let hasQuiz = targetDetails |> TargetDetails.quiz |> ArrayUtils.isNotEmpty
-  let hasEvaluationCriteria = targetDetails.evaluationCriteria |> ArrayUtils.isNotEmpty
-  let hasLinkToComplete = switch targetDetails.linkToComplete {
-  | Some(_) => true
-  | None => false
-  }
-  switch (hasEvaluationCriteria, hasQuiz, hasLinkToComplete) {
-  | (true, _y, _z) => Evaluated
-  | (_x, true, _z) => TakeQuiz
-  | (_x, _y, true) => VisitLink
-  | (false, false, false) => MarkAsComplete
-  }
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | SaveTargetDetails(targetDetails) =>
-    let methodOfCompletion = computeMethodOfCompletion(targetDetails)
-    let checklist =
-      targetDetails.checklist |> ArrayUtils.isNotEmpty ? targetDetails.checklist : defaultChecklist
-    let quiz =
-      targetDetails.quiz |> ArrayUtils.isNotEmpty ? targetDetails.quiz : [QuizQuestion.empty("0")]
-    {
-      ...state,
-      title: targetDetails.title,
-      role: targetDetails.role,
-      targetGroupId: targetDetails.targetGroupId,
-      evaluationCriteria: targetDetails.evaluationCriteria,
-      prerequisiteTargets: targetDetails.prerequisiteTargets,
-      methodOfCompletion: methodOfCompletion,
-      linkToComplete: switch targetDetails.linkToComplete {
-      | Some(link) => link
-      | None => ""
-      },
-      quiz: quiz,
-      completionInstructions: switch targetDetails.completionInstructions {
-      | Some(instructions) => instructions
-      | None => ""
-      },
-      visibility: targetDetails.visibility,
-      checklist: checklist,
-      loading: false,
-    }
-  | UpdateTitle(title) => {...state, title: title, dirty: true}
-  | UpdatePrerequisiteTargets(prerequisiteTargets) => {
-      ...state,
-      prerequisiteTargets: prerequisiteTargets,
-      prerequisiteSearchInput: "",
-      dirty: true,
-    }
-  | UpdatePrerequisiteSearchInput(prerequisiteSearchInput) => {
-      ...state,
-      prerequisiteSearchInput: prerequisiteSearchInput,
-    }
-  | UpdateMethodOfCompletion(methodOfCompletion) => {
-      ...state,
-      methodOfCompletion: methodOfCompletion,
-      dirty: true,
-    }
-  | UpdateEvaluationCriteria(evaluationCriteria) => {
-      ...state,
-      evaluationCriteria: evaluationCriteria,
-      evaluationCriteriaSearchInput: "",
-      dirty: true,
-    }
-  | UpdateEvaluationCriteriaSearchInput(evaluationCriteriaSearchInput) => {
-      ...state,
-      evaluationCriteriaSearchInput: evaluationCriteriaSearchInput,
-    }
-  | UpdateLinkToComplete(linkToComplete) => {
-      ...state,
-      linkToComplete: linkToComplete,
-      dirty: true,
-    }
-  | UpdateCompletionInstructions(instruction) => {
-      ...state,
-      completionInstructions: instruction,
-      dirty: true,
-    }
-  | UpdateTargetRole(role) => {...state, role: role, dirty: true}
-  | AddQuizQuestion =>
-    let quiz = Array.append(state.quiz, [QuizQuestion.empty(Js.Date.now() |> Js.Float.toString)])
-    {...state, quiz: quiz, dirty: true}
-  | UpdateQuizQuestion(id, quizQuestion) =>
-    let quiz = state.quiz |> Array.map(q => QuizQuestion.id(q) == id ? quizQuestion : q)
-    {...state, quiz: quiz, dirty: true}
-  | RemoveQuizQuestion(id) =>
-    let quiz = state.quiz |> Js.Array.filter(q => QuizQuestion.id(q) != id)
-    {...state, quiz: quiz, dirty: true}
-  | UpdateVisibility(visibility) => {...state, visibility: visibility, dirty: true}
-  | UpdateChecklistItem(indexToChange, newItem) => {
-      ...state,
-      checklist: state.checklist |> Array.mapi((index, checklistItem) =>
-        index == indexToChange ? newItem : checklistItem
-      ),
-      dirty: true,
-    }
-  | AddNewChecklistItem => {
-      ...state,
-      checklist: Array.append(state.checklist, [ChecklistItem.longText]),
-      dirty: true,
-    }
-  | RemoveChecklistItem(index) => {
-      ...state,
-      checklist: state.checklist |> ChecklistItem.removeItem(index),
-      dirty: true,
-    }
-  | MoveChecklistItemUp(index) => {
-      ...state,
-      checklist: state.checklist |> ChecklistItem.moveUp(index),
-      dirty: true,
-    }
-  | MoveChecklistItemDown(index) => {
-      ...state,
-      checklist: state.checklist |> ChecklistItem.moveDown(index),
-      dirty: true,
-    }
-  | CopyChecklistItem(index) => {
-      ...state,
-      checklist: state.checklist |> ChecklistItem.copy(index),
-      dirty: true,
-    }
-  | UpdateSaving => {...state, saving: !state.saving}
-  | ResetEditor => {...state, saving: false, dirty: false}
-  }
-
-let updateTitle = (send, event) => {
-  let title = ReactEvent.Form.target(event)["value"]
-  send(UpdateTitle(title))
-}
-
-let eligiblePrerequisiteTargets = (targetId, targets, targetGroups) => {
-  let targetGroupId =
-    targets
-    |> ListUtils.unsafeFind(
-      target => targetId == Target.id(target),
-      "Unable to find target with ID: " ++ targetId,
-    )
-    |> Target.targetGroupId
-  let targetGroup =
-    targetGroups
-    |> Array.of_list
-    |> ArrayUtils.unsafeFind(
-      tg => TargetGroup.id(tg) == targetGroupId,
-      "Cannot find target group with ID: " ++ targetGroupId,
-    )
-  let levelId = targetGroup |> TargetGroup.levelId
-  let targetGroupsInSameLevel =
-    targetGroups
-    |> List.filter(tg => TargetGroup.levelId(tg) == levelId)
-    |> List.map(tg => TargetGroup.id(tg))
-  targets
-  |> List.filter(target => !(target |> Target.archived))
-  |> List.filter(target => targetGroupsInSameLevel |> List.mem(Target.targetGroupId(target)))
-  |> List.filter(target => Target.id(target) != targetId)
-  |> Array.of_list
-}
-
-let setPrerequisiteSearch = (send, value) => send(UpdatePrerequisiteSearchInput(value))
-
-let selectPrerequisiteTarget = (send, state, target) => {
-  let updatedPrerequisites = state.prerequisiteTargets |> Js.Array.concat([target |> Target.id])
-  send(UpdatePrerequisiteTargets(updatedPrerequisites))
-}
-
-let deSelectPrerequisiteTarget = (send, state, target) => {
-  let updatedPrerequisites =
-    state.prerequisiteTargets |> Js.Array.filter(targetId => targetId != Target.id(target))
-  send(UpdatePrerequisiteTargets(updatedPrerequisites))
-}
-
-module SelectablePrerequisiteTargets = {
-  type t = Target.t
-
-  let value = t => t |> Target.title
-  let searchString = value
-}
-
-module MultiSelectForPrerequisiteTargets = MultiselectInline.Make(SelectablePrerequisiteTargets)
-
-let prerequisiteTargetEditor = (send, eligiblePrerequisiteTargets, state) => {
-  let selected =
-    eligiblePrerequisiteTargets |> Js.Array.filter(target =>
-      state.prerequisiteTargets |> Array.mem(Target.id(target))
-    )
-  let unselected =
-    eligiblePrerequisiteTargets |> Js.Array.filter(target =>
-      !(state.prerequisiteTargets |> Array.mem(Target.id(target)))
-    )
-  eligiblePrerequisiteTargets |> ArrayUtils.isNotEmpty
-    ? <div className="mb-6">
-        <label
-          className="block tracking-wide text-sm font-semibold mb-2" htmlFor="prerequisite_targets">
-          <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-          {"Are there any prerequisite targets?" |> str}
-        </label>
-        <div id="prerequisite_targets" className="mb-6 ml-6">
-          <MultiSelectForPrerequisiteTargets
-            placeholder="Search targets"
-            emptySelectionMessage="No targets selected"
-            allItemsSelectedMessage="You have selected all targets!"
-            selected
-            unselected
-            onChange={setPrerequisiteSearch(send)}
-            value=state.prerequisiteSearchInput
-            onSelect={selectPrerequisiteTarget(send, state)}
-            onDeselect={deSelectPrerequisiteTarget(send, state)}
-          />
-        </div>
-      </div>
-    : ReasonReact.null
-}
-
-let booleanButtonClasses = bool => {
-  let classes = "toggle-button__button"
-  classes ++ (bool ? " toggle-button__button--active" : "")
-}
-
-let targetRoleClasses = selected =>
-  "w-1/2 target-editor__completion-button relative flex border text-sm font-semibold focus:outline-none rounded px-5 py-4 md:px-8 md:py-5 items-center cursor-pointer text-left " ++ (
-    selected
-      ? "target-editor__completion-button--selected bg-gray-200 text-primary-500 border-primary-500"
-      : "border-gray-400 hover:bg-gray-200 bg-white"
-  )
-
-let targetEvaluated = methodOfCompletion =>
-  switch methodOfCompletion {
-  | Evaluated => true
-  | VisitLink => false
-  | TakeQuiz => false
-  | MarkAsComplete => false
-  }
-
-let validNumberOfEvaluationCriteria = state => state.evaluationCriteria |> ArrayUtils.isNotEmpty
-
-let setEvaluationCriteriaSearch = (send, value) => send(UpdateEvaluationCriteriaSearchInput(value))
-
-let selectEvaluationCriterion = (send, state, evaluationCriterion) => {
-  let updatedEvaluationCriteria =
-    state.evaluationCriteria |> Js.Array.concat([evaluationCriterion |> EvaluationCriteria.id])
-  send(UpdateEvaluationCriteria(updatedEvaluationCriteria))
-}
-
-let deSelectEvaluationCriterion = (send, state, evaluationCriterion) => {
-  let updatedEvaluationCriteria =
-    state.evaluationCriteria |> Js.Array.filter(ecId =>
-      ecId != EvaluationCriteria.id(evaluationCriterion)
-    )
-  send(UpdateEvaluationCriteria(updatedEvaluationCriteria))
-}
-module SelectableEvaluationCriteria = {
-  type t = EvaluationCriteria.t
-
-  let value = t => t |> EvaluationCriteria.name
-  let searchString = value
-
-  let make = (evaluationCriterion): t => evaluationCriterion
-}
-
-module MultiSelectForEvaluationCriteria = MultiselectInline.Make(SelectableEvaluationCriteria)
-
-let evaluationCriteriaEditor = (state, evaluationCriteria, send) => {
-  let selected =
-    evaluationCriteria
-    |> Js.Array.filter(ec => state.evaluationCriteria |> Array.mem(EvaluationCriteria.id(ec)))
-    |> Array.map(ec => SelectableEvaluationCriteria.make(ec))
-  let unselected =
-    evaluationCriteria
-    |> Js.Array.filter(ec => !(state.evaluationCriteria |> Array.mem(EvaluationCriteria.id(ec))))
-    |> Array.map(ec => SelectableEvaluationCriteria.make(ec))
-  <div id="evaluation_criteria" className="mb-6">
-    <label
-      className="block tracking-wide text-sm font-semibold mr-6 mb-2" htmlFor="evaluation_criteria">
-      <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-      {"Choose evaluation criteria from your list" |> str}
-    </label>
-    <div className="ml-6">
-      {validNumberOfEvaluationCriteria(state)
-        ? React.null
-        : <div className="drawer-right-form__error-msg mb-2">
-            {"Atleast one has to be selected" |> str}
-          </div>}
-      <MultiSelectForEvaluationCriteria
-        placeholder="Search evaluation criteria"
-        emptySelectionMessage="No criteria selected"
-        allItemsSelectedMessage="You have selected all evaluation criteria!"
-        selected
-        unselected
-        onChange={setEvaluationCriteriaSearch(send)}
-        value=state.evaluationCriteriaSearchInput
-        onSelect={selectEvaluationCriterion(send, state)}
-        onDeselect={deSelectEvaluationCriterion(send, state)}
-      />
-    </div>
-  </div>
-}
-
-let updateLinkToComplete = (send, event) =>
-  send(UpdateLinkToComplete(ReactEvent.Form.target(event)["value"]))
-
-let updateCompletionInstructions = (send, event) =>
-  send(UpdateCompletionInstructions(ReactEvent.Form.target(event)["value"]))
-
-let updateMethodOfCompletion = (methodOfCompletion, send, event) => {
-  ReactEvent.Mouse.preventDefault(event)
-  send(UpdateMethodOfCompletion(methodOfCompletion))
-}
-
-let updateTargetRole = (role, send, event) => {
-  ReactEvent.Mouse.preventDefault(event)
-  send(UpdateTargetRole(role))
-}
-
-let updateVisibility = (visibility, send, event) => {
-  ReactEvent.Mouse.preventDefault(event)
-  send(UpdateVisibility(visibility))
-}
-
-let linkEditor = (state, send) =>
-  <div className="mb-6">
-    <label className="inline-block tracking-wide text-sm font-semibold" htmlFor="link_to_complete">
-      <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-      {"Link to complete" |> str}
-    </label>
-    <div className="ml-6">
-      <input
-        className="appearance-none block text-sm w-full bg-white border border-gray-400 rounded px-4 py-2 my-2 leading-relaxed focus:outline-none focus:bg-white focus:border-gray-500"
-        id="link_to_complete"
-        type_="text"
-        placeholder="Paste link to complete"
-        value=state.linkToComplete
-        onChange={updateLinkToComplete(send)}
-      />
-      {state.linkToComplete |> UrlUtils.isInvalid(false)
-        ? <School__InputGroupError message="Enter a valid link" active=true />
-        : React.null}
-    </div>
-  </div>
-
-let methodOfCompletionButtonClasses = value => {
-  let defaultClasses = "target-editor__completion-button relative flex flex-col items-center bg-white border border-gray-400 hover:bg-gray-200 text-sm font-semibold focus:outline-none rounded p-4"
-  value
-    ? defaultClasses ++ " target-editor__completion-button--selected bg-gray-200 text-primary-500 border-primary-500"
-    : defaultClasses ++ " opacity-75 text-gray-900"
-}
-
-let methodOfCompletionSelection = polyMethodOfCompletion =>
-  switch polyMethodOfCompletion {
-  | #TakeQuiz => TakeQuiz
-  | #VisitLink => VisitLink
-  | #MarkAsComplete => MarkAsComplete
-  }
-
-let methodOfCompletionButton = (methodOfCompletion, state, send, index) => {
-  let buttonString = switch methodOfCompletion {
-  | #TakeQuiz => "Take a quiz to complete the target."
-  | #VisitLink => "Visit a link to complete the target."
-  | #MarkAsComplete => "Simply mark the target as completed."
-  }
-
-  let selected = switch (state.methodOfCompletion, methodOfCompletion) {
-  | (TakeQuiz, #TakeQuiz) => true
-  | (VisitLink, #VisitLink) => true
-  | (MarkAsComplete, #MarkAsComplete) => true
-  | _anyOtherCombo => false
-  }
-
-  let icon = switch methodOfCompletion {
-  | #TakeQuiz => quizIcon
-  | #VisitLink => linkIcon
-  | #MarkAsComplete => markIcon
-  }
-
-  <div key={index |> string_of_int} className="w-1/3 px-2">
-    <button
-      onClick={updateMethodOfCompletion(methodOfCompletion |> methodOfCompletionSelection, send)}
-      className={methodOfCompletionButtonClasses(selected)}>
-      <div className="mb-1"> <img className="w-12 h-12" src=icon /> </div> {buttonString |> str}
-    </button>
-  </div>
-}
-
-let methodOfCompletionSelector = (state, send) =>
-  <div>
-    <div className="mb-6">
-      <label
-        className="block tracking-wide text-sm font-semibold mr-6 mb-3"
-        htmlFor="method_of_completion">
-        <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-        {"How do you want the student to complete the target?" |> str}
-      </label>
-      <div id="method_of_completion" className="flex -mx-2 pl-6">
-        {[#MarkAsComplete, #VisitLink, #TakeQuiz]
-        |> Array.mapi((index, methodOfCompletion) =>
-          methodOfCompletionButton(methodOfCompletion, state, send, index)
-        )
-        |> React.array}
-      </div>
-    </div>
-  </div>
-
-let isValidQuiz = quiz =>
-  quiz
-  |> Js.Array.filter(quizQuestion => quizQuestion |> QuizQuestion.isValidQuizQuestion != true)
-  |> ArrayUtils.isEmpty
-
-let isValidChecklist = checklist =>
-  checklist
-  |> Js.Array.filter(checklistItem => checklistItem |> ChecklistItem.isValidChecklistItem != true)
-  |> ArrayUtils.isEmpty
-
-let addQuizQuestion = (send, event) => {
-  ReactEvent.Mouse.preventDefault(event)
-  send(AddQuizQuestion)
-}
-let updateQuizQuestionCB = (send, id, quizQuestion) => send(UpdateQuizQuestion(id, quizQuestion))
-
-let removeQuizQuestionCB = (send, id) => send(RemoveQuizQuestion(id))
-let questionCanBeRemoved = state => state.quiz |> Array.length > 1
-
-let quizEditor = (state, send) =>
-  <div>
-    <label
-      className="block tracking-wide text-sm font-semibold mr-6 mb-3" htmlFor="Quiz question 1">
-      <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-      {"Prepare the quiz now." |> str}
-    </label>
-    <div className="ml-6">
-      {isValidQuiz(state.quiz)
-        ? ReasonReact.null
-        : <School__InputGroupError
-            message="All questions must be filled in, and all questions should have at least two answers."
-            active=true
-          />}
-      {state.quiz
-      |> Array.mapi((index, quizQuestion) =>
-        <CurriculumEditor__TargetQuizQuestion
-          key={quizQuestion |> QuizQuestion.id}
-          questionNumber={index + 1 |> string_of_int}
-          quizQuestion
-          updateQuizQuestionCB={updateQuizQuestionCB(send)}
-          removeQuizQuestionCB={removeQuizQuestionCB(send)}
-          questionCanBeRemoved={questionCanBeRemoved(state)}
-        />
-      )
-      |> ReasonReact.array}
-      <a
-        onClick={addQuizQuestion(send)}
-        className="flex items-center bg-gray-200 border border-dashed border-primary-400 hover:bg-white hover:text-primary-500 hover:shadow-md rounded-lg p-3 cursor-pointer my-5">
-        <i className="fas fa-plus-circle text-lg" />
-        <h5 className="font-semibold ml-2"> {"Add another Question" |> str} </h5>
-      </a>
-    </div>
-  </div>
-
-let doRequiredStepsHaveUniqueTitles = checklist => {
-  let requiredSteps = checklist |> Js.Array.filter(item => !(item |> ChecklistItem.optional))
-
-  requiredSteps
-  |> Array.map(ChecklistItem.title)
-  |> Array.map(String.trim)
-  |> ArrayUtils.distinct
-  |> Array.length == Array.length(requiredSteps)
-}
-
-let isValidTitle = title => title |> String.trim |> String.length > 0
-
-let isValidMethodOfCompletion = state =>
-  switch state.methodOfCompletion {
-  | TakeQuiz => isValidQuiz(state.quiz)
-  | MarkAsComplete => true
-  | Evaluated =>
-    state.evaluationCriteria |> ArrayUtils.isNotEmpty && isValidChecklist(state.checklist)
-  | VisitLink => !(state.linkToComplete |> UrlUtils.isInvalid(false))
-  }
-
-let saveDisabled = (
-  ~hasValidTitle,
-  ~hasValidMethodOfCompletion,
-  ~requiredStepsHaveUniqueTitles,
-  ~dirty,
-  ~saving,
-) =>
-  !requiredStepsHaveUniqueTitles ||
-  (!hasValidTitle ||
-  (!hasValidMethodOfCompletion || (!dirty || saving)))
-
-module UpdateTargetQuery = %graphql(`
-   mutation UpdateTargetMutation($id: ID!, $targetGroupId: ID!, $title: String!, $role: String!, $evaluationCriteria: [ID!]!,$prerequisiteTargets: [ID!]!, $quiz: [TargetQuizInput!]!, $completionInstructions: String, $linkToComplete: String, $visibility: String!, $checklist: JSON! ) {
-     updateTarget(id: $id, targetGroupId: $targetGroupId, title: $title, role: $role, evaluationCriteria: $evaluationCriteria,prerequisiteTargets: $prerequisiteTargets, quiz: $quiz, completionInstructions: $completionInstructions, linkToComplete: $linkToComplete, visibility: $visibility, checklist: $checklist  ) {
-        success
-       }
-     }
-   `)
-
-let updateTarget = (target, state, send, updateTargetCB, event) => {
-  ReactEvent.Mouse.preventDefault(event)
-  send(UpdateSaving)
-  let id = target |> Target.id
-  let sortIndex = target |> Target.sortIndex
-  let role = state.role |> TargetDetails.roleAsString
-  let visibilityAsString = state.visibility |> TargetDetails.visibilityAsString
-  let quizAsJs =
-    state.quiz
-    |> Js.Array.filter(question => QuizQuestion.isValidQuizQuestion(question))
-    |> QuizQuestion.quizAsJsObject
-
-  let (quiz, evaluationCriteria, linkToComplete, checklist) = switch state.methodOfCompletion {
-  | Evaluated => ([], state.evaluationCriteria, "", state.checklist)
-  | VisitLink => ([], [], state.linkToComplete, [])
-  | TakeQuiz => (quizAsJs, [], "", [])
-  | MarkAsComplete => ([], [], "", [])
-  }
-
-  let visibility = switch state.visibility {
-  | Live => Target.Live
-  | Archived => Archived
-  | Draft => Draft
-  }
-
-  let newTarget = Target.create(
-    ~id,
-    ~targetGroupId=state.targetGroupId,
-    ~title=state.title,
-    ~sortIndex,
-    ~visibility,
-  )
-
-  UpdateTargetQuery.make(
-    ~id,
-    ~targetGroupId=state.targetGroupId,
-    ~title=state.title,
-    ~role,
-    ~evaluationCriteria,
-    ~prerequisiteTargets=state.prerequisiteTargets,
-    ~quiz,
-    ~completionInstructions=state.completionInstructions,
-    ~linkToComplete,
-    ~visibility=visibilityAsString,
-    ~checklist=checklist |> ChecklistItem.encodeChecklist,
-    (),
-  )
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result => {
-    result["updateTarget"]["success"]
-      ? {
-          send(ResetEditor)
-          updateTargetCB(newTarget)
-        }
-      : send(UpdateSaving)
-    Js.Promise.resolve()
-  })
-  |> ignore
-  ()
-}
-
-@react.component
-let make = (
-  ~target,
-  ~targets,
-  ~targetGroups,
-  ~evaluationCriteria,
-  ~updateTargetCB,
-  ~setDirtyCB,
-) => {
-  let (state, send) = React.useReducer(
-    reducer,
-    {
-      title: "",
-      targetGroupId: "",
-      role: TargetDetails.Student,
-      evaluationCriteria: [],
-      evaluationCriteriaSearchInput: "",
-      prerequisiteTargets: [],
-      prerequisiteSearchInput: "",
-      methodOfCompletion: Evaluated,
-      quiz: [],
-      linkToComplete: "",
-      dirty: false,
-      saving: false,
-      loading: true,
-      checklist: [],
-      visibility: TargetDetails.Draft,
-      completionInstructions: "",
-    },
-  )
-  let targetId = target |> Target.id
-  React.useEffect1(() => {
-    loadTargetDetails(targetId, send)
-    None
-  }, [targetId])
-
-  React.useEffect1(() => {
-    setDirtyCB(state.dirty)
-    None
-  }, [state.dirty])
-
-  let requiredStepsHaveUniqueTitles = doRequiredStepsHaveUniqueTitles(state.checklist)
-  let hasValidTitle = isValidTitle(state.title)
-  let hasValidMethodOfCompletion = isValidMethodOfCompletion(state)
-
-  <div className="pt-6" id="target-properties">
-    {state.loading
-      ? <div className="max-w-3xl mx-auto px-3">
-          {SkeletonLoading.multiple(~count=2, ~element=SkeletonLoading.contents())}
-        </div>
-      : <DisablingCover message="Saving..." disabled=state.saving>
-          <div className="mt-2">
-            <div className="max-w-3xl mx-auto px-3">
-              <div className="mb-6">
-                <label
-                  className="flex items-center inline-block tracking-wide text-sm font-semibold mb-2"
-                  htmlFor="title">
-                  <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-                  {"Title" |> str}
-                </label>
-                <div className="ml-6">
-                  <input
-                    className="appearance-none block text-sm w-full bg-white border border-gray-400 rounded px-4 py-2 my-2 leading-relaxed focus:outline-none focus:bg-white focus:border-gray-500"
-                    id="title"
-                    type_="text"
-                    placeholder="Type target title here"
-                    onChange={updateTitle(send)}
-                    value=state.title
-                  />
-                  <School__InputGroupError message="Enter a valid title" active={!hasValidTitle} />
-                </div>
-              </div>
-              {prerequisiteTargetEditor(
-                send,
-                eligiblePrerequisiteTargets(targetId, targets, targetGroups),
-                state,
-              )}
-              <div className="flex items-center mb-6">
-                <label
-                  className="block tracking-wide text-sm font-semibold mr-6" htmlFor="evaluated">
-                  <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-                  {"Will a coach review submissions on this target?" |> str}
-                </label>
-                <div
-                  id="evaluated"
-                  className="flex toggle-button__group flex-shrink-0 rounded-lg overflow-hidden">
-                  <button
-                    onClick={updateMethodOfCompletion(Evaluated, send)}
-                    className={booleanButtonClasses(targetEvaluated(state.methodOfCompletion))}>
-                    {"Yes" |> str}
-                  </button>
-                  <button
-                    onClick={updateMethodOfCompletion(MarkAsComplete, send)}
-                    className={booleanButtonClasses(!targetEvaluated(state.methodOfCompletion))}>
-                    {"No" |> str}
-                  </button>
-                </div>
-              </div>
-              {switch state.methodOfCompletion {
-              | Evaluated =>
-                <div className="mb-6">
-                  <label className="tracking-wide text-sm font-semibold" htmlFor="target_checklist">
-                    <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-                    {"What steps should the student take to complete this target?" |> str}
-                  </label>
-                  <HelpIcon
-                    className="ml-1"
-                    link="https://docs.pupilfirst.com/#/curriculum_editor?id=defining-steps-to-complete-a-target">
-                    {"These are the steps that a student must complete to submit work on a target. This information will be shown to the coach for review." |> str}
-                  </HelpIcon>
-                  <div className="ml-6 mb-6">
-                    {
-                      let allowFileKind =
-                        state.checklist
-                        |> Js.Array.filter(item => item |> ChecklistItem.isFilesKind)
-                        |> ArrayUtils.isEmpty
-                      state.checklist
-                      |> Array.mapi((index, checklistItem) => {
-                        let moveChecklistItemUpCB =
-                          index > 0 ? Some(() => send(MoveChecklistItemUp(index))) : None
-
-                        let moveChecklistItemDownCB =
-                          index != Array.length(state.checklist) - 1
-                            ? Some(() => send(MoveChecklistItemDown(index)))
-                            : None
-
-                        <CurriculumEditor__TargetChecklistItemEditor
-                          checklist=state.checklist
-                          key={index |> string_of_int}
-                          checklistItem
-                          index
-                          updateChecklistItemCB={newChecklistItem =>
-                            send(UpdateChecklistItem(index, newChecklistItem))}
-                          removeChecklistItemCB={() => send(RemoveChecklistItem(index))}
-                          ?moveChecklistItemUpCB
-                          ?moveChecklistItemDownCB
-                          copyChecklistItemCB={() => send(CopyChecklistItem(index))}
-                          allowFileKind
-                        />
-                      })
-                      |> React.array
-                    }
-                    {state.checklist |> ArrayUtils.isEmpty
-                      ? <div
-                          className="border border-orange-500 bg-orange-100 text-orange-800 px-2 py-1 rounded my-2 text-sm text-center">
-                          <i className="fas fa-info-circle mr-2" />
-                          {"This target has no steps. Students will be able to submit target without any action!" |> str}
-                        </div>
-                      : React.null}
-                    {state.checklist |> Array.length >= 15
-                      ? <div
-                          className="border border-orange-500 bg-orange-100 text-orange-800 px-2 py-1 rounded my-2 text-sm text-center">
-                          <i className="fas fa-info-circle mr-2" />
-                          {"Maximum allowed checklist items is 15!" |> str}
-                        </div>
-                      : React.null}
-                    <button
-                      className="flex justify-center items-center w-full rounded-lg border border-dashed border-primary-500 mt-2 p-2 text-sm text-primary-500 focus:outline-none hover:shadow-lg"
-                      disabled={state.checklist |> Array.length >= 15}
-                      onClick={_ => send(AddNewChecklistItem)}>
-                      <PfIcon className="fas fa-plus-circle text-lg" />
-                      <span className="font-semibold ml-2"> {"Add a Step" |> str} </span>
-                    </button>
-                  </div>
-                </div>
-              | VisitLink
-              | TakeQuiz
-              | MarkAsComplete => React.null
-              }}
-              {targetEvaluated(state.methodOfCompletion)
-                ? React.null
-                : methodOfCompletionSelector(state, send)}
-              {switch state.methodOfCompletion {
-              | Evaluated =>
-                evaluationCriteriaEditor(state, evaluationCriteria |> Array.of_list, send)
-              | MarkAsComplete => React.null
-              | TakeQuiz => quizEditor(state, send)
-              | VisitLink => linkEditor(state, send)
-              }}
-              <div className="mb-6">
-                <label className="inline-block tracking-wide text-sm font-semibold" htmlFor="role">
-                  <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-                  {"How should teams tackle this target?" |> str}
-                </label>
-                <HelpIcon
-                  className="ml-1"
-                  link="https://docs.pupilfirst.com/#/curriculum_editor?id=setting-the-method-of-completion">
-                  {"Should students in a team submit work on a target individually, or together?" |> str}
-                </HelpIcon>
-                <div id="role" className="flex mt-4 ml-6">
-                  <button
-                    onClick={updateTargetRole(TargetDetails.Student, send)}
-                    className={"mr-4 " ++
-                    targetRoleClasses(
-                      switch state.role {
-                      | TargetDetails.Student => true
-                      | Team => false
-                      },
-                    )}>
-                    <span className="mr-4">
-                      <Icon className="if i-users-check-light text-3xl" />
-                    </span>
-                    <span className="text-sm">
-                      {"All students must submit individually." |> str}
-                    </span>
-                  </button>
-                  <button
-                    onClick={updateTargetRole(TargetDetails.Team, send)}
-                    className={targetRoleClasses(
-                      switch state.role {
-                      | TargetDetails.Team => true
-                      | Student => false
-                      },
-                    )}>
-                    <span className="mr-4">
-                      <Icon className="if i-user-check-light text-2xl" />
-                    </span>
-                    <span className="text-sm">
-                      {"Only one student in a team" |> str} <br /> {" needs to submit." |> str}
-                    </span>
-                  </button>
-                </div>
-              </div>
-              <div className="mb-6">
-                <label
-                  className="tracking-wide text-sm font-semibold" htmlFor="completion-instructions">
-                  <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-                  {"Do you have any completion instructions for the student?" |> str}
-                  <span className="ml-1 text-xs font-normal"> {"(optional)" |> str} </span>
-                </label>
-                <HelpIcon
-                  link="https://docs.pupilfirst.com/#/curriculum_editor?id=setting-the-method-of-completion"
-                  className="ml-1">
-                  {"Use this to remind the student about something important. These instructions will be displayed close to where students complete the target." |> str}
-                </HelpIcon>
-                <div className="ml-6">
-                  <input
-                    className="appearance-none block text-sm w-full bg-white border border-gray-400 rounded px-4 py-2 my-2 leading-relaxed focus:outline-none focus:bg-white focus:border-gray-500"
-                    id="completion-instructions"
-                    type_="text"
-                    maxLength=255
-                    value=state.completionInstructions
-                    onChange={updateCompletionInstructions(send)}
-                  />
-                </div>
-              </div>
-            </div>
-            <div className="bg-white border-t sticky bottom-0 py-5">
-              <div className="flex max-w-3xl mx-auto px-3 justify-between items-center">
-                <div className="flex items-center flex-shrink-0">
-                  <label
-                    className="block tracking-wide text-sm font-semibold mr-3" htmlFor="archived">
-                    <span className="mr-2"> <i className="fas fa-list text-base" /> </span>
-                    {"Target Visibility" |> str}
-                  </label>
-                  <div
-                    id="visibility"
-                    className="flex toggle-button__group flex-shrink-0 rounded-lg overflow-hidden">
-                    {[TargetDetails.Live, Archived, Draft]
-                    |> Array.mapi((index, visibility) =>
-                      <button
-                        key={index |> string_of_int}
-                        onClick={updateVisibility(visibility, send)}
-                        className={booleanButtonClasses(
-                          switch (state.visibility, visibility) {
-                          | (Live, TargetDetails.Live) => true
-                          | (Archived, Archived) => true
-                          | (Draft, Draft) => true
-                          | _anyOtherCombo => false
-                          },
-                        )}>
-                        {switch visibility {
-                        | Live => "Live"
-                        | Archived => "Archived"
-                        | Draft => "Draft"
-                        } |> str}
-                      </button>
-                    )
-                    |> React.array}
-                  </div>
-                </div>
-                <div className="w-auto">
-                  <button
-                    key="target-actions-step"
-                    disabled={saveDisabled(
-                      ~hasValidTitle,
-                      ~hasValidMethodOfCompletion,
-                      ~requiredStepsHaveUniqueTitles,
-                      ~dirty=state.dirty,
-                      ~saving=state.saving,
-                    )}
-                    onClick={updateTarget(target, state, send, updateTargetCB)}
-                    className="btn btn-primary w-full text-white font-bold py-3 px-6 shadow rounded focus:outline-none">
-                    {"Update Target" |> str}
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </DisablingCover>}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetDrawer.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetDrawer.res
deleted file mode 100644
index 18ce8ca..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetDrawer.res
+++ /dev/null
@@ -1,106 +0,0 @@
-%raw(`require("./CurriculumEditor__TargetDrawer.css")`)
-
-let str = React.string
-
-open CurriculumEditor__Types
-
-type page =
-  | Content
-  | Details
-  | Versions
-
-let confirmDirtyAction = (dirty, action) =>
-  if dirty {
-    WindowUtils.confirm("There are unsaved changes. Are you sure you want to discard them?", () =>
-      action()
-    )
-  } else {
-    action()
-  }
-
-let tab = (page, selectedPage, pathPrefix, dirty, setDirty) => {
-  let defaultClasses = "curriculum-editor__target-drawer-tab cursor-pointer"
-
-  let (title, pathSuffix, iconClass) = switch page {
-  | Content => ("Content", "content", "fa-pen-nib")
-  | Details => ("Details", "details", "fa-list-alt")
-  | Versions => ("Versions", "versions", "fa-code-branch")
-  }
-
-  let path = pathPrefix ++ pathSuffix
-  let selected = page == selectedPage
-
-  let classes = selected
-    ? defaultClasses ++ " curriculum-editor__target-drawer-tab--selected"
-    : defaultClasses
-
-  let confirm = dirty
-    ? Some("There are unsaved changes. Are you sure you want to discard them?")
-    : None
-
-  <Link href=path ?confirm onClick={_e => setDirty(_ => false)} className=classes>
-    <i className={"fas " ++ iconClass} /> <span className="ml-2"> {title |> str} </span>
-  </Link>
-}
-
-let closeDrawer = course =>
-  ReasonReactRouter.push("/school/courses/" ++ ((course |> Course.id) ++ "/curriculum"))
-
-@react.component
-let make = (~targets, ~targetGroups, ~evaluationCriteria, ~course, ~updateTargetCB) => {
-  let url = ReasonReactRouter.useUrl()
-  let (dirty, setDirty) = React.useState(() => false)
-
-  switch url.path {
-  | list{"school", "courses", _courseId, "targets", targetId, pageName} =>
-    let target =
-      targets |> ListUtils.unsafeFind(
-        t => t |> Target.id == targetId,
-        "Could not find target for editor drawer with the ID " ++ targetId,
-      )
-
-    let pathPrefix =
-      "/school/courses/" ++ ((course |> Course.id) ++ ("/targets/" ++ (targetId ++ "/")))
-
-    let (innerComponent, selectedPage) = switch pageName {
-    | "content" => (
-        <CurriculumEditor__ContentEditor target setDirtyCB={dirty => setDirty(_ => dirty)} />,
-        Content,
-      )
-    | "details" => (
-        <CurriculumEditor__TargetDetailsEditor
-          target
-          targets
-          targetGroups
-          evaluationCriteria
-          updateTargetCB
-          setDirtyCB={dirty => setDirty(_ => dirty)}
-        />,
-        Details,
-      )
-    | "versions" => (<CurriculumEditor__VersionsEditor targetId />, Versions)
-    | otherPage =>
-      Rollbar.warning("Unexpected page requested for target editor drawer: " ++ otherPage)
-      (<div> {"Unexpected error. Please reload the page." |> str} </div>, Content)
-    }
-
-    <SchoolAdmin__EditorDrawer
-      size=SchoolAdmin__EditorDrawer.Large
-      closeDrawerCB={() => confirmDirtyAction(dirty, () => closeDrawer(course))}>
-      <div>
-        <div className="bg-gray-200 pt-6">
-          <div className="max-w-3xl px-3 mx-auto"> <h3> {target |> Target.title |> str} </h3> </div>
-          <div className="flex w-full max-w-3xl mx-auto px-3 text-sm -mb-px mt-2">
-            {tab(Content, selectedPage, pathPrefix, dirty, setDirty)}
-            {tab(Details, selectedPage, pathPrefix, dirty, setDirty)}
-            {tab(Versions, selectedPage, pathPrefix, dirty, setDirty)}
-          </div>
-        </div>
-        <div className="bg-white">
-          <div className="mx-auto border-t border-gray-400"> innerComponent </div>
-        </div>
-      </div>
-    </SchoolAdmin__EditorDrawer>
-  | _otherRoutes => React.null
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetGroup.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetGroup.res
deleted file mode 100644
index 2f258e1..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetGroup.res
+++ /dev/null
@@ -1,60 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  description: option<string>,
-  milestone: bool,
-  levelId: string,
-  sortIndex: int,
-  archived: bool,
-}
-
-let id = t => t.id
-
-let name = t => t.name
-
-let description = t => t.description
-
-let milestone = t => t.milestone
-
-let levelId = t => t.levelId
-
-let archived = t => t.archived
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    description: json |> field("description", nullable(string)) |> Js.Null.toOption,
-    levelId: json |> field("levelId", string),
-    milestone: json |> field("milestone", bool),
-    sortIndex: json |> field("sortIndex", int),
-    archived: json |> field("archived", bool),
-  }
-}
-
-let create = (id, name, description, milestone, levelId, sortIndex, archived) => {
-  id: id,
-  name: name,
-  description: description,
-  milestone: milestone,
-  levelId: levelId,
-  sortIndex: sortIndex,
-  archived: archived,
-}
-
-let updateList = (targetGroups, targetGroup) => {
-  let oldTargetGroups = targetGroups |> List.filter(tg => tg.id !== targetGroup.id)
-  oldTargetGroups |> List.rev |> List.append(list{targetGroup}) |> List.rev
-}
-
-let sort = targetGroups => targetGroups |> List.sort((x, y) => x.sortIndex - y.sortIndex)
-
-let unarchive = t => {...t, archived: false}
-
-let find = (id, targetGroups) => targetGroups |> List.find(tg => tg.id == id)
-
-let updateSortIndex = sortedTargetGroups =>
-  sortedTargetGroups |> List.mapi((sortIndex, t) =>
-    create(t.id, t.name, t.description, t.milestone, t.levelId, sortIndex, t.archived)
-  )
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetGroupEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetGroupEditor.res
deleted file mode 100644
index 060c2df..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetGroupEditor.res
+++ /dev/null
@@ -1,273 +0,0 @@
-open CurriculumEditor__Types
-
-let str = ReasonReact.string
-type state = {
-  name: string,
-  description: string,
-  milestone: bool,
-  hasNameError: bool,
-  dirty: bool,
-  isArchived: bool,
-  saving: bool,
-}
-
-type action =
-  | UpdateName(string, bool)
-  | UpdateDescription(string)
-  | UpdateMilestone(bool)
-  | UpdateIsArchived(bool)
-  | UpdateSaving
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateName(name, hasNameError) => {
-      ...state,
-      name: name,
-      hasNameError: hasNameError,
-      dirty: true,
-    }
-  | UpdateDescription(description) => {...state, description: description, dirty: true}
-  | UpdateMilestone(milestone) => {...state, milestone: milestone, dirty: true}
-  | UpdateIsArchived(isArchived) => {...state, isArchived: isArchived, dirty: true}
-  | UpdateSaving => {...state, saving: !state.saving}
-  }
-
-let updateName = (send, name) => {
-  let hasError = name |> String.length < 2
-  send(UpdateName(name, hasError))
-}
-
-let saveDisabled = state => state.hasNameError || (!state.dirty || state.saving)
-
-let setPayload = (authenticityToken, state) => {
-  let payload = Js.Dict.empty()
-  let milestone = state.milestone == true ? "true" : "false"
-  Js.Dict.set(payload, "authenticity_token", authenticityToken |> Js.Json.string)
-  Js.Dict.set(payload, "archived", state.isArchived |> Js.Json.boolean)
-  Js.Dict.set(payload, "name", state.name |> Js.Json.string)
-  Js.Dict.set(payload, "description", state.description |> Js.Json.string)
-  Js.Dict.set(payload, "milestone", milestone |> Js.Json.string)
-  payload
-}
-
-let booleanButtonClasses = selected => {
-  let classes = "toggle-button__button"
-  classes ++ (selected ? " toggle-button__button--active" : "")
-}
-let formClasses = value =>
-  value ? "drawer-right-form w-full opacity-50" : "drawer-right-form w-full"
-
-let computeInitialState = targetGroup =>
-  switch targetGroup {
-  | Some(targetGroup) => {
-      name: targetGroup |> TargetGroup.name,
-      description: switch targetGroup |> TargetGroup.description {
-      | Some(description) => description
-      | None => ""
-      },
-      milestone: targetGroup |> TargetGroup.milestone,
-      hasNameError: false,
-      dirty: false,
-      isArchived: targetGroup |> TargetGroup.archived,
-      saving: false,
-    }
-  | None => {
-      name: "",
-      description: "",
-      milestone: true,
-      hasNameError: false,
-      dirty: false,
-      isArchived: false,
-      saving: false,
-    }
-  }
-
-@react.component
-let make = (
-  ~targetGroup,
-  ~currentLevelId,
-  ~authenticityToken,
-  ~updateTargetGroupsCB,
-  ~hideEditorActionCB,
-) => {
-  let (state, send) = React.useReducerWithMapState(reducer, targetGroup, computeInitialState)
-  let handleErrorCB = () => send(UpdateSaving)
-  let handleResponseCB = json => {
-    let id = json |> {
-      open Json.Decode
-      field("id", string)
-    }
-    let sortIndex = json |> {
-      open Json.Decode
-      field("sortIndex", int)
-    }
-    let newTargetGroup = TargetGroup.create(
-      id,
-      state.name,
-      Some(state.description),
-      state.milestone,
-      currentLevelId,
-      sortIndex,
-      state.isArchived,
-    )
-    switch targetGroup {
-    | Some(_) => Notification.success("Success", "Target Group updated successfully")
-    | None => Notification.success("Success", "Target Group created successfully")
-    }
-    updateTargetGroupsCB(newTargetGroup)
-  }
-
-  let createTargetGroup = () => {
-    send(UpdateSaving)
-    let level_id = currentLevelId
-    let payload = setPayload(authenticityToken, state)
-    let url = "/school/levels/" ++ (level_id ++ "/target_groups")
-    Api.create(url, payload, handleResponseCB, handleErrorCB)
-  }
-
-  let updateTargetGroup = targetGroupId => {
-    send(UpdateSaving)
-    let payload = setPayload(authenticityToken, state)
-    let url = "/school/target_groups/" ++ targetGroupId
-    Api.update(url, payload, handleResponseCB, handleErrorCB)
-  }
-  <div>
-    <div className="blanket" />
-    <div className="drawer-right">
-      <div className="drawer-right__close absolute">
-        <button
-          title="close"
-          onClick={_ => hideEditorActionCB()}
-          className="flex items-center justify-center bg-white text-gray-600 font-bold py-3 px-5 rounded-l-full rounded-r-none hover:text-gray-600 focus:outline-none mt-4">
-          <i className="fas fa-times text-xl" />
-        </button>
-      </div>
-      <div className={formClasses(state.saving)}>
-        <div className="w-full">
-          <div className="mx-auto bg-white">
-            <div className="max-w-2xl pt-6 px-6 mx-auto">
-              <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-                {"Target Group Details" |> str}
-              </h5>
-              <div className="mt-5">
-                <label className="inline-block tracking-wide text-xs font-semibold" htmlFor="name">
-                  {"Title" |> str}
-                </label>
-                <span> {"*" |> str} </span>
-                <input
-                  className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                  id="name"
-                  type_="text"
-                  placeholder="Type target group name here"
-                  value=state.name
-                  onChange={event => updateName(send, ReactEvent.Form.target(event)["value"])}
-                />
-                {state.hasNameError
-                  ? <div className="drawer-right-form__error-msg">
-                      <span className="mr-2"> <i className="fas fa-exclamation-triangle" /> </span>
-                      <span> {"not a valid Title" |> str} </span>
-                    </div>
-                  : ReasonReact.null}
-              </div>
-              <div className="mt-5">
-                <label className="block tracking-wide text-xs font-semibold" htmlFor="description">
-                  {" Description" |> str}
-                </label>
-                <textarea
-                  className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                  id="description"
-                  placeholder="Type target group description"
-                  value=state.description
-                  onChange={event =>
-                    send(UpdateDescription(ReactEvent.Form.target(event)["value"]))}
-                  rows=5
-                  cols=33
-                />
-              </div>
-              <div className="mt-5">
-                <div className="flex items-center flex-shrink-0">
-                  <label className="block tracking-wide text-xs font-semibold mr-3">
-                    {"Is this a milestone target group?" |> str}
-                  </label>
-                  <div
-                    className="milestone flex-shrink-0 rounded-lg overflow-hidden border border-gray-400">
-                    <button
-                      onClick={_event => {
-                        ReactEvent.Mouse.preventDefault(_event)
-                        send(UpdateMilestone(true))
-                      }}
-                      className={booleanButtonClasses(state.milestone == true)}>
-                      {"Yes" |> str}
-                    </button>
-                    <button
-                      onClick={_event => {
-                        ReactEvent.Mouse.preventDefault(_event)
-                        send(UpdateMilestone(false))
-                      }}
-                      className={booleanButtonClasses(state.milestone == false)}>
-                      {"No" |> str}
-                    </button>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div className="border-t bg-gray-100 mt-5">
-              <div className="max-w-2xl p-6 mx-auto flex w-full justify-between items-center">
-                {switch targetGroup {
-                | Some(_) =>
-                  <div className="flex items-center mr-2">
-                    <label className="block tracking-wide text-xs font-semibold mr-6">
-                      {"Is this target group archived?" |> str}
-                    </label>
-                    <div
-                      className="toggle-button__group archived inline-flex flex-shrink-0 rounded-lg overflow-hidden">
-                      <button
-                        onClick={_event => {
-                          ReactEvent.Mouse.preventDefault(_event)
-                          send(UpdateIsArchived(true))
-                        }}
-                        className={booleanButtonClasses(state.isArchived == true)}>
-                        {"Yes" |> str}
-                      </button>
-                      <button
-                        onClick={_event => {
-                          ReactEvent.Mouse.preventDefault(_event)
-                          send(UpdateIsArchived(false))
-                        }}
-                        className={booleanButtonClasses(state.isArchived == false)}>
-                        {"No" |> str}
-                      </button>
-                    </div>
-                  </div>
-                | None => ReasonReact.null
-                }}
-                {switch targetGroup {
-                | Some(targetGroup) =>
-                  let id = targetGroup |> TargetGroup.id
-                  <div className="w-auto">
-                    <button
-                      disabled={saveDisabled(state)}
-                      onClick={_e => updateTargetGroup(id)}
-                      className="btn btn-primary btn-large">
-                      {"Update Target Group" |> str}
-                    </button>
-                  </div>
-
-                | None =>
-                  <div className="w-full">
-                    <button
-                      disabled={saveDisabled(state)}
-                      onClick={_e => createTargetGroup()}
-                      className="w-full btn btn-primary btn-large">
-                      {"Create Target Group" |> str}
-                    </button>
-                  </div>
-                }}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetGroupShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetGroupShow.res
deleted file mode 100644
index 95ddd25..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetGroupShow.res
+++ /dev/null
@@ -1,195 +0,0 @@
-open CurriculumEditor__Types
-
-let str = ReasonReact.string
-
-type state = {
-  targetTitle: string,
-  savingNewTarget: bool,
-  validTargetTitle: bool,
-}
-
-module CreateTargetMutation = %graphql(`
-   mutation CreateTargetMutation($title: String!, $targetGroupId: String!) {
-     createTarget(title: $title, targetGroupId: $targetGroupId ) {
-       target {
-         id
-         contentBlockId
-         sampleContent
-       }
-     }
-   }
-   `)
-
-type action =
-  | UpdateTargetTitle(string)
-  | UpdateTargetSaving
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateTargetTitle(targetTitle) => {
-      ...state,
-      targetTitle: targetTitle,
-      validTargetTitle: targetTitle |> String.length > 1,
-    }
-  | UpdateTargetSaving => {...state, savingNewTarget: !state.savingNewTarget}
-  }
-
-let archivedClasses = archived =>
-  "target-group__header flex flex-col items-center justify-center relative cursor-pointer px-20 pb-7 text-center rounded-lg rounded-b-none overflow-hidden w-full " ++ (
-    archived ? "target-group__header--archived" : ""
-  )
-
-let updateSortIndex = (targetGroups, targetGroup, up, updateTargetGroupSortIndexCB) => {
-  let newTargetGroups = targetGroups |> ListUtils.swap(up, targetGroup)
-
-  let targetGroupIds = newTargetGroups |> List.map(t => t |> TargetGroup.id) |> Array.of_list
-  targetGroupIds |> CurriculumEditor__SortResourcesMutation.sort(
-    CurriculumEditor__SortResourcesMutation.TargetGroup,
-  )
-  updateTargetGroupSortIndexCB(newTargetGroups)
-}
-
-let sortIndexHiddenClass = bool => bool ? " invisible" : ""
-
-@react.component
-let make = (
-  ~targetGroup,
-  ~targetGroups,
-  ~targets,
-  ~showTargetGroupEditorCB,
-  ~updateTargetCB,
-  ~showArchived,
-  ~updateTargetSortIndexCB,
-  ~updateTargetGroupSortIndexCB,
-  ~index,
-  ~course,
-) => {
-  let (state, send) = React.useReducer(
-    reducer,
-    {targetTitle: "", savingNewTarget: false, validTargetTitle: false},
-  )
-  let milestone = targetGroup |> TargetGroup.milestone
-  let targetGroupArchived = targetGroup |> TargetGroup.archived
-  let targetsInTG =
-    targets
-    |> List.filter(target => target |> Target.targetGroupId == (targetGroup |> TargetGroup.id))
-    |> Target.sort
-
-  let targetsToDisplay = showArchived
-    ? targetsInTG
-    : targetsInTG |> List.filter(target => !(target |> Target.visibility === Archived))
-  let handleResponseCB = target => {
-    let targetId = target["id"]
-    let targetGroupId = targetGroup |> TargetGroup.id
-    /* let sortIndex = json |> Json.Decode.(field("sortIndex", int)); */
-    let newTarget = Target.template(targetId, targetGroupId, state.targetTitle)
-    send(UpdateTargetSaving)
-    send(UpdateTargetTitle(""))
-    updateTargetCB(newTarget)
-  }
-  let handleCreateTarget = (title, targetGroupId) => {
-    send(UpdateTargetSaving)
-
-    CreateTargetMutation.make(~title, ~targetGroupId, ())
-    |> GraphqlQuery.sendQuery
-    |> Js.Promise.then_(response => {
-      switch response["createTarget"]["target"] {
-      | Some(target) => handleResponseCB(target)
-      | None => ()
-      }
-      Js.Promise.resolve()
-    })
-    |> ignore
-  }
-
-  <div
-    className="target-group__box relative mt-12 rounded-lg border border-b-0 border-gray-300 shadow-md">
-    <div
-      className="w-full target-group__header-container rounded-lg rounded-b-none relative bg-white hover:bg-gray-100 hover:text-primary-500">
-      <div
-        id="target_group"
-        className={archivedClasses(targetGroup |> TargetGroup.archived)}
-        onClick={_event => showTargetGroupEditorCB(Some(targetGroup))}>
-        {milestone
-          ? <div
-              className="inline-block px-3 py-2 bg-orange-400 font-bold text-xs rounded-b-lg leading-tight text-white uppercase">
-              {"Milestone Targets" |> str}
-            </div>
-          : ReasonReact.null}
-        <div className="target-group__title pt-6">
-          <h4> {targetGroup |> TargetGroup.name |> str} </h4>
-        </div>
-        <div className="target-group__description">
-          <p className="pt-px text-sm">
-            {switch targetGroup |> TargetGroup.description {
-            | Some(description) => description
-            | None => ""
-            } |> str}
-          </p>
-        </div>
-      </div>
-      {targetGroups |> List.length == 1
-        ? React.null
-        : <div
-            className="target-group__group-reorder flex flex-col shadow rounded-l-lg absolute h-full border border-r-0 overflow-hidden text-gray-700 justify-between items-center bg-white">
-            <div
-              title="Move Up"
-              id={"target-group-move-up-" ++ (targetGroup |> TargetGroup.id)}
-              className={"target-group__group-reorder-up flex items-center justify-center cursor-pointer w-9 h-9 p-1 text-gray-400 hover:bg-gray-200" ++
-              sortIndexHiddenClass(index == 0)}
-              onClick={_ =>
-                updateSortIndex(targetGroups, targetGroup, true, updateTargetGroupSortIndexCB)}>
-              <i className="fas fa-arrow-up text-sm" />
-            </div>
-            <div
-              title="Move Down"
-              id={"target-group-move-down-" ++ (targetGroup |> TargetGroup.id)}
-              className={"target-group__group-reorder-down flex items-center justify-center cursor-pointer w-9 h-9 p-1 text-gray-400 hover:bg-gray-200" ++
-              sortIndexHiddenClass(index + 1 == (targetGroups |> List.length))}
-              onClick={_ =>
-                updateSortIndex(targetGroups, targetGroup, false, updateTargetGroupSortIndexCB)}>
-              <i className="fas fa-arrow-down text-sm" />
-            </div>
-          </div>}
-    </div>
-    {targetsToDisplay
-    |> List.mapi((index, target) =>
-      <CurriculumEditor__TargetShow
-        key={target |> Target.id}
-        target
-        targets=targetsToDisplay
-        updateTargetSortIndexCB
-        index
-        course
-      />
-    )
-    |> Array.of_list
-    |> ReasonReact.array}
-    {targetGroupArchived
-      ? ReasonReact.null
-      : <div
-          className="target-group__target-create relative bg-gray-100 flex items-center border border-dashed border-gray-400 text-gray-700 hover:text-gray-900 active:text-gray-900 focus:text-gray-900 hover:shadow-lg hover:border-gray-500 rounded-lg rounded-t-none overflow-hidden">
-          <label
-            htmlFor={"create-target-input" ++ (targetGroup |> TargetGroup.id)}
-            className="absolute flex items-center h-full cursor-pointer pl-4">
-            <i className="fas fa-plus-circle text-2xl" />
-          </label>
-          <input
-            id={"create-target-input" ++ (targetGroup |> TargetGroup.id)}
-            title="Create target"
-            value=state.targetTitle
-            onChange={event => send(UpdateTargetTitle(ReactEvent.Form.target(event)["value"]))}
-            placeholder="Create a target"
-            className="target-create__input text-xs text-left bg-gray-100 pr-5 pl-12 py-6 rounded-b appearance-none block w-full text-sm text-gray-900 font-semibold leading-tight hover:bg-gray-100 focus:outline-none focus:bg-white focus:border-gray-500"
-          />
-          {state.validTargetTitle
-            ? <button
-                onClick={_e => handleCreateTarget(state.targetTitle, targetGroup |> TargetGroup.id)}
-                disabled=state.savingNewTarget
-                className="flex items-center whitespace-no-wrap text-sm font-semibold py-2 px-4 mr-4 rounded btn-primary appearance-none focus:outline-none text-center">
-                {"Create" |> str}
-              </button>
-            : ReasonReact.null}
-        </div>}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetQuizAnswer.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetQuizAnswer.res
deleted file mode 100644
index 0e40ee6..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetQuizAnswer.res
+++ /dev/null
@@ -1,76 +0,0 @@
-let str = React.string
-
-let correctAnswerOptionClasses = bool =>
-  "relative mb-2 overflow-hidden " ++ (bool ? "quiz-maker__answer-option-correct" : "")
-
-@react.component
-let make = (
-  ~answerOption: CurriculumEditor__AnswerOption.t,
-  ~updateAnswerOptionCB,
-  ~removeAnswerOptionCB,
-  ~canBeDeleted,
-  ~markAsCorrectCB,
-  ~answerOptionId,
-) =>
-  <div
-    className={correctAnswerOptionClasses(
-      answerOption |> CurriculumEditor__AnswerOption.correctAnswer,
-    )}>
-    {answerOption |> CurriculumEditor__AnswerOption.correctAnswer
-      ? <div
-          className="quiz-maker__answer-option-pointer flex justify-center items-center quiz-maker__answer-option-pointer--correct">
-          <Icon className="if i-check-light text-xs" />
-        </div>
-      : <div
-          onClick={_event => {
-            ReactEvent.Mouse.preventDefault(_event)
-            markAsCorrectCB(answerOption |> CurriculumEditor__AnswerOption.id)
-          }}
-          className="quiz-maker__answer-option-pointer cursor-pointer">
-          ReasonReact.null
-        </div>}
-    <div
-      id={answerOptionId ++ "-block"}
-      className="quiz-maker__answer-option-answer flex flex-col bg-white border border-gray-400 rounded-lg ml-12">
-      <div className="flex">
-        <textarea
-          id=answerOptionId
-          className="appearance-none block w-full bg-white text-gray-800 text-sm rounded-lg px-4 py-3 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-          placeholder="Answer option (supports markdown)"
-          value={answerOption |> CurriculumEditor__AnswerOption.answer}
-          onChange={event =>
-            updateAnswerOptionCB(
-              answerOption |> CurriculumEditor__AnswerOption.id,
-              answerOption |> CurriculumEditor__AnswerOption.updateAnswer(
-                ReactEvent.Form.target(event)["value"],
-              ),
-            )}
-        />
-        <button
-          className={answerOption |> CurriculumEditor__AnswerOption.correctAnswer
-            ? "w-28 flex-shrink-0 border-l border-gray-400 text-green-600 font-semibold cursor-default focus:outline-none text-xs py-1 px-2"
-            : "w-28 flex-shrink-0 border-l border-gray-400 text-gray-800 hover:text-gray-900 focus:outline-none text-xs py-1 px-2"}
-          type_="button"
-          onClick={_event => {
-            ReactEvent.Mouse.preventDefault(_event)
-            markAsCorrectCB(answerOption |> CurriculumEditor__AnswerOption.id)
-          }}>
-          {answerOption |> CurriculumEditor__AnswerOption.correctAnswer
-            ? "Correct Answer" |> str
-            : "Mark as correct" |> str}
-        </button>
-        {canBeDeleted
-          ? <button
-              className="flex-shrink-0 border-l border-gray-400 text-gray-600 hover:text-gray-900 focus:outline-none text-xs py-1 px-3"
-              type_="button"
-              title="Remove this answer option"
-              onClick={event => {
-                ReactEvent.Mouse.preventDefault(event)
-                removeAnswerOptionCB(answerOption |> CurriculumEditor__AnswerOption.id)
-              }}>
-              <i className="fas fa-trash-alt text-sm" />
-            </button>
-          : ReasonReact.null}
-      </div>
-    </div>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetQuizQuestion.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetQuizQuestion.res
deleted file mode 100644
index df15170..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetQuizQuestion.res
+++ /dev/null
@@ -1,110 +0,0 @@
-let str = React.string
-
-@react.component
-let make = (
-  ~questionNumber,
-  ~quizQuestion,
-  ~updateQuizQuestionCB,
-  ~removeQuizQuestionCB,
-  ~questionCanBeRemoved,
-) => {
-  let answerOptionId = (questionId, index) =>
-    questionId ++ ("-answer-option-" ++ (index + 1 |> string_of_int))
-
-  let updateQuestion = question =>
-    updateQuizQuestionCB(
-      quizQuestion |> CurriculumEditor__QuizQuestion.id,
-      quizQuestion |> CurriculumEditor__QuizQuestion.updateQuestion(question),
-    )
-
-  let updateAnswerOptionCB = (id, answer) =>
-    updateQuizQuestionCB(
-      quizQuestion |> CurriculumEditor__QuizQuestion.id,
-      quizQuestion |> CurriculumEditor__QuizQuestion.replace(id, answer),
-    )
-  let removeAnswerOptionCB = id =>
-    updateQuizQuestionCB(
-      quizQuestion |> CurriculumEditor__QuizQuestion.id,
-      quizQuestion |> CurriculumEditor__QuizQuestion.removeAnswerOption(id),
-    )
-  let markAsCorrectCB = id =>
-    updateQuizQuestionCB(
-      quizQuestion |> CurriculumEditor__QuizQuestion.id,
-      quizQuestion |> CurriculumEditor__QuizQuestion.markAsCorrect(id),
-    )
-
-  let addAnswerOption = () =>
-    updateQuizQuestionCB(
-      quizQuestion |> CurriculumEditor__QuizQuestion.id,
-      quizQuestion |> CurriculumEditor__QuizQuestion.newAnswerOption(
-        Js.Date.now() |> Js.Float.toString,
-      ),
-    )
-  let canBeDeleted =
-    quizQuestion |> CurriculumEditor__QuizQuestion.answerOptions |> Array.length > 2
-  let questionId = "quiz-question-" ++ questionNumber
-
-  <div className="quiz-maker__question-container p-4 bg-gray-100 rounded-lg border mt-4">
-    <div className="flex items-center justify-between">
-      <label
-        className="block tracking-wide uppercase text-gray-800 text-sm font-bold"
-        htmlFor=questionId>
-        {"Question " ++ questionNumber |> str}
-      </label>
-      <div className="quiz-maker__question-remove-button invisible">
-        {questionCanBeRemoved
-          ? <button
-              className="flex items-center flex-shrink-0 bg-white p-2 rounded-lg text-gray-600 hover:text-gray-700 text-xs"
-              type_="button"
-              title="Remove Quiz Question"
-              onClick={event => {
-                ReactEvent.Mouse.preventDefault(event)
-                removeQuizQuestionCB(quizQuestion |> CurriculumEditor__QuizQuestion.id)
-              }}>
-              <i className="fas fa-trash-alt text-lg" />
-            </button>
-          : ReasonReact.null}
-      </div>
-    </div>
-    <div className="my-2 bg-white">
-      <MarkdownEditor
-        textareaId=questionId
-        placeholder="Type the question here (supports markdown)"
-        value={quizQuestion |> CurriculumEditor__QuizQuestion.question}
-        onChange=updateQuestion
-        profile=Markdown.Permissive
-      />
-    </div>
-    <div className="quiz-maker__answers-container relative">
-      {quizQuestion
-      |> CurriculumEditor__QuizQuestion.answerOptions
-      |> Array.mapi((index, answerOption) =>
-        <CurriculumEditor__TargetQuizAnswer
-          key={answerOption |> CurriculumEditor__AnswerOption.id}
-          answerOption
-          updateAnswerOptionCB
-          removeAnswerOptionCB
-          canBeDeleted
-          markAsCorrectCB
-          answerOptionId={answerOptionId(questionId, index)}
-        />
-      )
-      |> React.array}
-      <div
-        onClick={_event => {
-          ReactEvent.Mouse.preventDefault(_event)
-          addAnswerOption()
-        }}
-        className="quiz-maker__add-answer-option cursor-pointer relative">
-        <div
-          className="flex items-center border border-dashed border-primary-500 justify-center text-gray-600 quiz-maker__add-answer-option-pointer quiz-maker__add-answer-option-pointer">
-          <i className="fas fa-plus" />
-        </div>
-        <a
-          className="quiz-maker__add-answer-option-button flex items-center h-11 text-gray-900 bg-gray-200 border border-dashed border-primary-400 hover:bg-white hover:text-primary-500 hover:shadow-md rounded-lg ml-12 py-3 px-4">
-          <p className="text-xs"> {"Add another Answer Option" |> str} </p>
-        </a>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetShow.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetShow.res
deleted file mode 100644
index d3a2361..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetShow.res
+++ /dev/null
@@ -1,87 +0,0 @@
-%raw(`require("./CurriculumEditor__TargetShow.css")`)
-
-open CurriculumEditor__Types
-
-let str = ReasonReact.string
-
-let targetClasses = (target, targets) =>
-  "target-group__target flex justify-between items-center pl-2 pr-5 " ++
-  switch (targets |> List.length == 1, target |> Target.visibility) {
-  | (true, Archived) => "target-group__target--archived py-4 pl-5"
-  | (false, Archived) => "target-group__target--archived py-4"
-  | (true, _) => "py-6 pl-5"
-  | (false, _) => "py-6"
-  }
-
-let updateSortIndex = (targets, target, up, updateTargetSortIndexCB) => {
-  let newTargets = targets |> ListUtils.swap(up, target)
-  let targetIds = newTargets |> List.map(t => t |> Target.id) |> Array.of_list
-  targetIds |> CurriculumEditor__SortResourcesMutation.sort(
-    CurriculumEditor__SortResourcesMutation.Target,
-  )
-  updateTargetSortIndexCB(newTargets)
-}
-
-let sortIndexHiddenClass = bool => bool ? " invisible" : ""
-
-let editorLink = (linkPrefix, linkSuffix, target, iconClass) => {
-  let link = linkPrefix ++ linkSuffix
-
-  <Link
-    title={"Edit " ++ (linkSuffix ++ (" of target " ++ (target |> Target.title)))}
-    href=link
-    className="curriculum-editor__target-show-quick-link text-gray-400 border-l border-transparent py-6 px-3 hover:bg-gray-200">
-    <i className={"fas fa-fw " ++ iconClass} />
-  </Link>
-}
-
-@react.component
-let make = (~target, ~targets, ~updateTargetSortIndexCB, ~index, ~course) => {
-  let linkPrefix =
-    "/school/courses/" ++ ((course |> Course.id) ++ ("/targets/" ++ ((target |> Target.id) ++ "/")))
-
-  <div
-    className="flex target-group__target-container border-t bg-white overflow-hidden relative hover:bg-gray-100 hover:text-primary-500">
-    {targets |> List.length == 1
-      ? React.null
-      : <div
-          className="target-group__target-reorder relative flex flex-col z-10 h-full border-r border-transparent text-gray-700 justify-between items-center">
-          <div
-            title="Move Up"
-            id={"target-move-up-" ++ (target |> Target.id)}
-            className={"target-group__target-reorder-up flex items-center justify-center cursor-pointer w-9 h-9 p-1 text-gray-400 hover:bg-gray-200" ++
-            sortIndexHiddenClass(index == 0)}
-            onClick={_ => updateSortIndex(targets, target, true, updateTargetSortIndexCB)}>
-            <i className="fas fa-arrow-up text-sm" />
-          </div>
-          <div
-            title="Move Down"
-            id={"target-move-down-" ++ (target |> Target.id)}
-            className={"target-group__target-reorder-down flex items-center justify-center cursor-pointer w-9 h-9 p-1 border-t border-transparent text-gray-400 hover:bg-gray-200" ++
-            sortIndexHiddenClass(index + 1 == (targets |> List.length))}
-            onClick={_ => updateSortIndex(targets, target, false, updateTargetSortIndexCB)}>
-            <i className="fas fa-arrow-down text-sm" />
-          </div>
-        </div>}
-    <Link
-      id={"target-show-" ++ (target |> Target.id)}
-      title={"Edit content of target " ++ (target |> Target.title)}
-      className={targetClasses(target, targets)}
-      href={linkPrefix ++ "content"}>
-      <p className="font-semibold text-sm"> {target |> Target.title |> str} </p>
-      <div className="items-center">
-        {switch target |> Target.visibility {
-        | Draft =>
-          <span
-            className="target-group__target-draft-pill leading-tight text-xs py-1 px-2 font-semibold rounded-lg border bg-blue-100 text-blue-700 border-blue-400 mr-2 whitespace-no-wrap">
-            <i className="fas fa-file-signature text-sm" />
-            <span className="ml-1"> {"Draft" |> str} </span>
-          </span>
-        | _ => React.null
-        }}
-      </div>
-    </Link>
-    {editorLink(linkPrefix, "details", target, "fa-list-alt")}
-    {editorLink(linkPrefix, "versions", target, "fa-code-branch")}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetVersionSelector.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetVersionSelector.res
deleted file mode 100644
index d4140f7..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__TargetVersionSelector.res
+++ /dev/null
@@ -1,121 +0,0 @@
-let str = React.string
-
-let handleClick = (setShowDropdown, versions, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  if versions |> Array.length > 1 {
-    setShowDropdown(showDropdown => !showDropdown)
-  }
-}
-
-let handleVersionSelect = (setShowDropdown, selectVersionCB, selectedVersion, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  setShowDropdown(showDropdown => !showDropdown)
-  selectVersionCB(selectedVersion)
-}
-
-let handleViewMode = (switchViewModeCB, previewMode, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  switchViewModeCB(previewMode)
-}
-
-let handleRestoreVersion = (handleRestoreVersionCB, versionOn, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  handleRestoreVersionCB(versionOn)
-}
-
-let previewModeButtonEnableClass = "bg-primary-100 shadow-inner text-primary-500"
-
-@react.component
-let make = (
-  ~versions,
-  ~selectedVersion,
-  ~selectVersionCB,
-  ~previewMode,
-  ~switchViewModeCB,
-  ~handleRestoreVersionCB,
-) => {
-  let (showDropdown, setShowDropdown) = React.useState(() => false)
-  <div className="flex justify-between items-end">
-    <div className="w-2/6">
-      {selectedVersion == versions[0]
-        ? <div className="flex rounded-lg border border-gray-400">
-            <button
-              onClick={handleViewMode(switchViewModeCB, true)}
-              className={"w-1/2 py-2 px-3 font-semibold rounded-l-lg text-sm focus:outline-none " ++ (
-                previewMode
-                  ? previewModeButtonEnableClass
-                  : "bg-white shadow-md hover:shadow hover:text-primary-500 hover:bg-gray-100"
-              )}>
-              {"Preview" |> str}
-            </button>
-            <button
-              onClick={handleViewMode(switchViewModeCB, false)}
-              className={"w-1/2 py-2 px-3 font-semibold rounded-r-lg text-sm focus:outline-none " ++ (
-                previewMode
-                  ? "bg-white shadow-md hover:shadow hover:text-primary-500 hover:bg-gray-100"
-                  : previewModeButtonEnableClass
-              )}>
-              {"Edit" |> str}
-            </button>
-          </div>
-        : React.null}
-    </div>
-    <div className="w-4/6 flex justify-end items-end">
-      {selectedVersion == versions[0]
-        ? React.null
-        : <button
-            onClick={handleRestoreVersion(
-              handleRestoreVersionCB,
-              selectedVersion |> Js.Json.string,
-            )}
-            className="btn btn-warning border border-orange-500 mr-4">
-            {"Restore this version" |> str}
-          </button>}
-      <div className="relative">
-        <div className="inline-block">
-          <label className="text-xs block text-gray-600 mb-1">
-            {(versions |> Array.length > 1 ? "Versions" : "Version") |> str}
-          </label>
-          <button
-            onClick={handleClick(setShowDropdown, versions)}
-            className={"target-editor__version-dropdown-button text-sm appearance-none bg-white border inline-flex items-center justify-between focus:outline-none font-semibold relative rounded " ++ (
-              versions |> Array.length > 1
-                ? "px-3 border-gray-400 hover:bg-gray-100 hover:shadow-lg"
-                : "border-transparent cursor-auto"
-            )}>
-            <span className="flex items-center py-2">
-              <span className="truncate text-left">
-                {selectedVersion |> DateTime.stingToFormatedTime(DateTime.OnlyDate) |> str}
-              </span>
-            </span>
-            {versions |> Array.length > 1
-              ? <span className="text-right pl-3 py-2 border-l border-gray-400">
-                  <i className="fas fa-chevron-down text-sm" />
-                </span>
-              : React.null}
-          </button>
-        </div>
-        {showDropdown
-          ? <ul
-              id="version-selection-list"
-              className="target-editor__version-dropdown-list text-sm bg-white font-semibold border border-gray-400 mt-1 shadow-lg rounded-lg border absolute overflow-auto h-auto w-full z-20">
-              {versions
-              |> Array.to_list
-              |> List.filter(version => version != selectedVersion)
-              |> List.map(version =>
-                <li
-                  id=version
-                  key=version
-                  onClick={handleVersionSelect(setShowDropdown, selectVersionCB, version)}
-                  className="target-editor__version-dropdown-list-item flex justify-between whitespace-no-wrap px-3 py-2 cursor-pointer hover:bg-gray-100 hover:text-primary-500">
-                  {version |> DateTime.stingToFormatedTime(DateTime.OnlyDate) |> str}
-                </li>
-              )
-              |> Array.of_list
-              |> React.array}
-            </ul>
-          : React.null}
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Types.res
deleted file mode 100644
index 4dc26fc..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Types.res
+++ /dev/null
@@ -1,10 +0,0 @@
-module Course = CurriculumEditor__Course
-module EvaluationCriteria = CurriculumEditor__EvaluationCriteria
-module Level = CurriculumEditor__Level
-module TargetGroup = CurriculumEditor__TargetGroup
-module Target = CurriculumEditor__Target
-module AnswerOption = CurriculumEditor__AnswerOption
-module QuizQuestion = CurriculumEditor__QuizQuestion
-module TargetDetails = CurriculumEditor__TargetDetails
-module Version = CurriculumEditor__Version
-module ChecklistItem = TargetChecklistItem
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Version.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Version.res
deleted file mode 100644
index 0b879ed..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__Version.res
+++ /dev/null
@@ -1,47 +0,0 @@
-type t = {
-  id: string,
-  number: int,
-  createdAt: Js.Date.t,
-  updatedAt: Js.Date.t,
-}
-
-let id = t => t.id
-
-let createdAt = t => t.createdAt
-
-let updatedAt = t => t.updatedAt
-
-let number = t => t.number
-
-let make = (id, number, createdAt, updatedAt) => {
-  id: id,
-  number: number,
-  createdAt: createdAt,
-  updatedAt: updatedAt,
-}
-
-let makeArrayFromJs = js => {
-  let length = js |> Array.length
-  js
-  |> ArrayUtils.copyAndSort((x, y) =>
-    DateFns.differenceInSeconds(
-      y["createdAt"] |> Json.Decode.string |> DateFns.parseString,
-      x["createdAt"] |> Json.Decode.string |> DateFns.parseString,
-    ) |> int_of_float
-  )
-  |> Array.mapi((number, c) =>
-    make(
-      c["id"],
-      length - number,
-      c["createdAt"] |> Json.Decode.string |> DateFns.parseString,
-      c["updatedAt"] |> Json.Decode.string |> DateFns.parseString,
-    )
-  )
-}
-
-let versionAt = t => t.createdAt |> DateFns.format("MMM D, YYYY HH:MM")
-
-let isLatestTargetVersion = (versions, t) => {
-  let length = versions |> Array.length
-  t.number == length
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__VersionsEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__VersionsEditor.res
deleted file mode 100644
index 414cb50..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/CurriculumEditor__VersionsEditor.res
+++ /dev/null
@@ -1,174 +0,0 @@
-let str = React.string
-
-open CurriculumEditor__Types
-
-type rec state =
-  | Loading
-  | Loaded(contentBlocks, selectedVersion, versions)
-and contentBlocks = array<ContentBlock.t>
-and selectedVersion = Version.t
-and versions = array<Version.t>
-
-type action =
-  | LoadContent(array<ContentBlock.t>, versions, selectedVersion)
-  | SetLoading
-
-let reducer = (_state, action) =>
-  switch action {
-  | LoadContent(contentBlocks, versions, selectedVersion) =>
-    Loaded(contentBlocks, selectedVersion, versions)
-  | SetLoading => Loading
-  }
-
-module CreateTargetVersionMutation = %graphql(`
-   mutation CreateTargetVersionMutation($targetVersionId: ID!) {
-    createTargetVersion(targetVersionId: $targetVersionId) {
-       success
-     }
-   }
-   `)
-
-let loadContentBlocks = (targetId, send, version) => {
-  let targetVersionId = version |> OptionUtils.map(Version.id)
-
-  send(SetLoading)
-
-  ContentBlock.Query.make(~targetId, ~targetVersionId?, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result => {
-    let contentBlocks = result["contentBlocks"] |> Js.Array.map(ContentBlock.makeFromJs)
-
-    let versions = result["versions"] |> Version.makeArrayFromJs
-
-    let selectedVersion = switch version {
-    | Some(v) => v
-    | None => versions[0]
-    }
-    send(LoadContent(contentBlocks, versions, selectedVersion))
-
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let createTargetVersion = (targetId, targetVersion, send) => {
-  let targetVersionId = targetVersion |> Version.id
-
-  send(SetLoading)
-
-  CreateTargetVersionMutation.make(~targetVersionId, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(_result => {
-    loadContentBlocks(targetId, send, None)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let versionText = version =>
-  <div>
-    <span className="font-semibold text-lg">
-      {"#" ++ ((version |> Version.number |> string_of_int) ++ " ") |> str}
-    </span>
-    <span className="text-xs"> {version |> Version.versionAt |> str} </span>
-  </div>
-
-let showDropdown = (versions, selectedVersion, loadContentBlocksCB) => {
-  let contents =
-    versions
-    |> Js.Array.filter(version => version != selectedVersion)
-    |> Array.map(version => {
-      let id = version |> Version.id
-
-      <button
-        id
-        key=id
-        title={"Select version " ++ id}
-        onClick={_ => loadContentBlocksCB(Some(version))}
-        className="whitespace-no-wrap px-3 py-2 cursor-pointer hover:bg-gray-100 hover:text-primary-500 w-full text-left">
-        {versionText(version)}
-      </button>
-    })
-
-  let selected =
-    <button
-      title={"Select version " ++ (selectedVersion |> Version.id)}
-      className="text-sm appearance-none bg-white inline-flex items-center justify-between focus:outline-none hover:bg-gray-100 hover:shadow-lg px-3 h-full">
-      <span> {versionText(selectedVersion)} </span>
-      <span className="border-l border-gray-400 ml-2 pl-2">
-        <i className="fas fa-chevron-down text-sm" />
-      </span>
-    </button>
-
-  versions |> Array.length == 1
-    ? <div className="text-sm appearance-none bg-white px-3">
-        <span className="font-semibold text-lg"> {"#1 " |> str} </span>
-        {selectedVersion |> Version.versionAt |> str}
-      </div>
-    : <Dropdown selected contents right=true className="h-full" />
-}
-
-let showContentBlocks = (
-  contentBlocks,
-  versions,
-  selectedVersion,
-  loadContentBlocksCB,
-  targetId,
-  send,
-) =>
-  <div>
-    <div>
-      <label className="text-xs inline-block text-gray-600 mb-1">
-        {(versions |> Array.length > 1 ? "Versions" : "Version") |> str}
-      </label>
-      <HelpIcon
-        className="ml-1"
-        link="https://docs.pupilfirst.com/#/curriculum_editor?id=target-content-versions">
-        {"Use the versions feature to preserve the existing state of a target's content, to browse earlier stored versions, and to restore them, if required." |> str}
-      </HelpIcon>
-    </div>
-    <div className="flex">
-      <div className="border border-gray-400 flex items-center">
-        {showDropdown(versions, selectedVersion, loadContentBlocksCB)}
-      </div>
-      <div className="ml-2">
-        <button
-          className="text-sm appearance-none bg-white border inline-flex items-center justify-between focus:outline-none border-gray-400 hover:bg-gray-100 hover:shadow-lg px-2 py-3"
-          onClick={_ => createTargetVersion(targetId, selectedVersion, send)}>
-          {(
-            selectedVersion |> Version.isLatestTargetVersion(versions)
-              ? "Save this version"
-              : "Restore this version"
-          ) |> str}
-        </button>
-      </div>
-    </div>
-    <TargetContentView contentBlocks />
-  </div>
-
-@react.component
-let make = (~targetId) => {
-  let (state, send) = React.useReducer(reducer, Loading)
-
-  let loadContentBlocksCB = loadContentBlocks(targetId, send)
-
-  React.useEffect0(() => {
-    loadContentBlocksCB(None)
-    None
-  })
-
-  <div className="max-w-3xl py-6 px-3 mx-auto">
-    {switch state {
-    | Loading => SkeletonLoading.multiple(~count=2, ~element=SkeletonLoading.contents())
-    | Loaded(contentBlocks, selectedVersion, versions) =>
-      showContentBlocks(
-        contentBlocks,
-        versions,
-        selectedVersion,
-        loadContentBlocksCB,
-        targetId,
-        send,
-      )
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/EvaluationCriteria__Index.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/EvaluationCriteria__Index.res
deleted file mode 100644
index d64dc94..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/EvaluationCriteria__Index.res
+++ /dev/null
@@ -1,84 +0,0 @@
-let str = React.string
-
-type editorAction =
-  | ShowEditor(option<EvaluationCriterion.t>)
-  | Hidden
-
-type state = {
-  editorAction: editorAction,
-  evaluationCriteria: array<EvaluationCriterion.t>,
-}
-
-let openEditor = (event, evaluationCriterion, setState) => {
-  event |> ReactEvent.Mouse.preventDefault
-  setState(state => {...state, editorAction: ShowEditor(Some(evaluationCriterion))})
-}
-
-let showEvaluationCriterion = (evaluationCriterion, setState) =>
-  <div
-    key={evaluationCriterion |> EvaluationCriterion.id}
-    className="flex items-center shadow bg-white rounded-lg mb-4">
-    <div className="course-faculty__list-item flex w-full items-center">
-      <a
-        title={"Edit " ++ (evaluationCriterion |> EvaluationCriterion.name)}
-        onClick={event => openEditor(event, evaluationCriterion, setState)}
-        className="course-faculty__list-item-details flex flex-1 items-center justify-between border border-transparent cursor-pointer rounded-l-lg hover:bg-gray-100 hover:text-primary-500 hover:border-primary-400">
-        <div className="flex w-full text-sm justify-between">
-          <span className="flex-1 font-semibold py-5 px-5">
-            {evaluationCriterion |> EvaluationCriterion.name |> str}
-          </span>
-          <span className="ml-2 py-5 px-5 font-semibold text-gray-700 hover:text-primary-500">
-            <i className="fas fa-edit text-normal" />
-            <span className="ml-1"> {"Edit" |> str} </span>
-          </span>
-        </div>
-      </a>
-    </div>
-  </div>
-
-let addOrUpdateCriterionCB = (state, setState, criterion) => {
-  let updatedCriteria =
-    state.evaluationCriteria
-    |> Js.Array.filter(ec => EvaluationCriterion.id(ec) != EvaluationCriterion.id(criterion))
-    |> Array.append([criterion])
-  setState(_ => {evaluationCriteria: updatedCriteria, editorAction: Hidden})
-}
-
-@react.component
-let make = (~courseId, ~evaluationCriteria) => {
-  let (state, setState) = React.useState(() => {
-    editorAction: Hidden,
-    evaluationCriteria: evaluationCriteria,
-  })
-
-  <div className="flex-1 flex flex-col overflow-y-scroll bg-gray-200">
-    {switch state.editorAction {
-    | Hidden => React.null
-    | ShowEditor(evaluationCriterion) =>
-      <SchoolAdmin__EditorDrawer
-        closeDrawerCB={() => setState(state => {...state, editorAction: Hidden})}>
-        <EvaluationCriterionEditor__Form
-          evaluationCriterion
-          courseId
-          addOrUpdateCriterionCB={addOrUpdateCriterionCB(state, setState)}
-        />
-      </SchoolAdmin__EditorDrawer>
-    }}
-    <div className="flex px-6 py-2 items-center justify-between">
-      <button
-        onClick={_ => setState(state => {...state, editorAction: ShowEditor(None)})}
-        className="max-w-2xl w-full flex mx-auto items-center justify-center relative bg-white text-primary-500 hover:bg-gray-100 hover:text-primary-600 hover:shadow-lg focus:outline-none border-2 border-gray-400 border-dashed hover:border-primary-300 p-6 rounded-lg mt-8 cursor-pointer">
-        <i className="fas fa-plus-circle" />
-        <h5 className="font-semibold ml-2"> {"Add New Evaluation Criterion" |> str} </h5>
-      </button>
-    </div>
-    <div className="px-6 pb-4 mt-5 flex flex-1">
-      <div className="max-w-2xl w-full mx-auto relative">
-        {state.evaluationCriteria
-        |> EvaluationCriterion.sort
-        |> Array.map(ec => showEvaluationCriterion(ec, setState))
-        |> React.array}
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/EvaluationCriterionEditor__Form.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/EvaluationCriterionEditor__Form.res
deleted file mode 100644
index a55460d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/EvaluationCriterionEditor__Form.res
+++ /dev/null
@@ -1,367 +0,0 @@
-%raw(`require("./EvaluationCriterionEditor__Form.css")`)
-
-let str = React.string
-
-type state = {
-  name: string,
-  maxGrade: int,
-  passGrade: int,
-  gradesAndLabels: array<GradeLabel.t>,
-  saving: bool,
-  dirty: bool,
-}
-
-module CreateEvaluationCriterionQuery = %graphql(`
-   mutation CreateEvaluationCriterionMutation($name: String!, $courseId: ID!, $maxGrade: Int!, $passGrade: Int!, $gradesAndLabels: [GradeAndLabelInput!]!) {
-     createEvaluationCriterion(courseId: $courseId, name: $name, maxGrade: $maxGrade, passGrade: $passGrade, gradesAndLabels: $gradesAndLabels ) {
-       evaluationCriterion {
-        id
-        name
-        maxGrade
-        passGrade
-        gradeLabels {
-          grade
-          label
-        }
-       }
-     }
-   }
-   `)
-
-module UpdateEvaluationCriterionQuery = %graphql(`
-   mutation UpdateEvaluationCriterionMutation($id: ID!, $name: String!, $gradesAndLabels: [GradeAndLabelInput!]!) {
-    updateEvaluationCriterion(id: $id, name: $name, gradesAndLabels: $gradesAndLabels){
-       evaluationCriterion {
-        id
-        name
-        maxGrade
-        passGrade
-        gradeLabels {
-          grade
-          label
-        }
-       }
-      }
-   }
-   `)
-
-let formClasses = value =>
-  value ? "drawer-right-form w-full opacity-50" : "drawer-right-form w-full"
-
-let possibleGradeValues: list<int> = list{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
-
-let gradeBarBulletClasses = (selected, passed, empty) => {
-  let classes = selected ? " grade-bar__pointer--selected" : " "
-  if empty {
-    classes ++ " grade-bar__pointer--pulse"
-  } else if passed {
-    classes ++ " grade-bar__pointer--passed"
-  } else {
-    classes ++ " grade-bar__pointer--failed"
-  }
-}
-
-let updateMaxGrade = (value, state, setState) =>
-  if value < state.passGrade {
-    setState(state => {...state, passGrade: value, maxGrade: value})
-  } else {
-    setState(state => {...state, maxGrade: value})
-  }
-
-let updatePassGrade = (value, setState) => setState(state => {...state, passGrade: value})
-
-let updateGradeLabel = (value, gradeAndLabel, state, setState) => {
-  let updatedGradeAndLabel = GradeLabel.update(value, gradeAndLabel)
-  let gradesAndLabels =
-    state.gradesAndLabels |> Array.map(gl =>
-      gl |> GradeLabel.grade == (updatedGradeAndLabel |> GradeLabel.grade)
-        ? updatedGradeAndLabel
-        : gl
-    )
-  setState(state => {...state, gradesAndLabels: gradesAndLabels, dirty: true})
-}
-
-let updateEvaluationCriterion = (state, setState, addOrUpdateCriterionCB, criterion) => {
-  setState(state => {...state, saving: true})
-
-  let jsGradeAndLabelArray =
-    state.gradesAndLabels
-    |> Js.Array.filter(gradesAndLabel => gradesAndLabel |> GradeLabel.grade <= state.maxGrade)
-    |> Array.map(gl => gl |> GradeLabel.asJsObject)
-
-  UpdateEvaluationCriterionQuery.make(
-    ~id=criterion |> EvaluationCriterion.id,
-    ~name=state.name,
-    ~gradesAndLabels=jsGradeAndLabelArray,
-    (),
-  )
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result => {
-    switch result["updateEvaluationCriterion"]["evaluationCriterion"] {
-    | Some(criterion) =>
-      let updatedCriterion = EvaluationCriterion.makeFromJs(criterion)
-      addOrUpdateCriterionCB(updatedCriterion)
-      setState(state => {...state, saving: false})
-    | None => setState(state => {...state, saving: false})
-    }
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let createEvaluationCriterion = (state, setState, addOrUpdateCriterionCB, courseId) => {
-  setState(state => {...state, saving: true})
-
-  let jsGradeAndLabelArray =
-    state.gradesAndLabels
-    |> Js.Array.filter(gradesAndLabel => gradesAndLabel |> GradeLabel.grade <= state.maxGrade)
-    |> Array.map(gl => gl |> GradeLabel.asJsObject)
-
-  CreateEvaluationCriterionQuery.make(
-    ~name=state.name,
-    ~maxGrade=state.maxGrade,
-    ~passGrade=state.passGrade,
-    ~courseId,
-    ~gradesAndLabels=jsGradeAndLabelArray,
-    (),
-  )
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result => {
-    switch result["createEvaluationCriterion"]["evaluationCriterion"] {
-    | Some(criterion) =>
-      let newCriterion = EvaluationCriterion.makeFromJs(criterion)
-      addOrUpdateCriterionCB(newCriterion)
-      setState(state => {...state, saving: false})
-    | None => setState(state => {...state, saving: false})
-    }
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let updateName = (setState, value) => setState(state => {...state, dirty: true, name: value})
-
-let saveDisabled = state => {
-  let hasValidName = state.name |> String.trim |> String.length > 0
-  !state.dirty || (state.saving || !hasValidName)
-}
-
-let labelClasses = (grade, passGrade) => {
-  let failGradeClasses = "bg-red-300 text-red-700 border-red-500"
-  let passGradeClasses = "bg-green-300 text-green-700 border-green-500"
-  "w-12 p-3 text-center  mr-3 rounded-lg border  leading-tight " ++ (
-    grade < passGrade ? failGradeClasses : passGradeClasses
-  )
-}
-
-let labels = (state, setState) =>
-  state.gradesAndLabels
-  |> Js.Array.filter(gnl => gnl |> GradeLabel.grade <= state.maxGrade)
-  |> Array.map(gradeAndLabel => {
-    let grade = gradeAndLabel |> GradeLabel.grade
-
-    <div key={grade |> string_of_int} className="flex flex-wrap mt-2">
-      <div className={labelClasses(grade, state.passGrade)}> {grade |> string_of_int |> str} </div>
-      <div className="flex-1">
-        <input
-          id={"grade-label-for-" ++ (grade |> string_of_int)}
-          className=" appearance-none border rounded w-full p-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
-          type_="text"
-          maxLength=40
-          value={gradeAndLabel |> GradeLabel.label}
-          onChange={event =>
-            updateGradeLabel(
-              ReactEvent.Form.target(event)["value"],
-              gradeAndLabel,
-              state,
-              setState,
-            )}
-          placeholder={"Label for grade " ++ (gradeAndLabel |> GradeLabel.grade |> string_of_int)}
-        />
-      </div>
-    </div>
-  })
-
-@react.component
-let make = (~evaluationCriterion, ~courseId, ~addOrUpdateCriterionCB) => {
-  let (state, setState) = React.useState(() =>
-    switch evaluationCriterion {
-    | None => {
-        name: "",
-        maxGrade: 5,
-        passGrade: 2,
-        gradesAndLabels: possibleGradeValues |> List.map(i => GradeLabel.empty(i)) |> Array.of_list,
-        saving: false,
-        dirty: false,
-      }
-    | Some(ec) => {
-        name: ec |> EvaluationCriterion.name,
-        maxGrade: ec |> EvaluationCriterion.maxGrade,
-        passGrade: ec |> EvaluationCriterion.passGrade,
-        gradesAndLabels: ec |> EvaluationCriterion.gradesAndLabels,
-        saving: false,
-        dirty: false,
-      }
-    }
-  )
-  <div className="mx-auto bg-white">
-    <div className="max-w-2xl p-6 mx-auto">
-      <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-        {switch evaluationCriterion {
-        | None => "Add Evaluation Criterion"
-        | Some(ec) => ec |> EvaluationCriterion.name
-        } |> str}
-      </h5>
-      <DisablingCover
-        disabled=state.saving
-        message={switch evaluationCriterion {
-        | Some(_ec) => "Updating..."
-        | None => "Saving..."
-        }}>
-        <div key="evaluation-criterion-editor" className="mt-3">
-          <div className="mt-5">
-            <label className="inline-block tracking-wide text-xs font-semibold " htmlFor="name">
-              {"Name" |> str}
-            </label>
-            <input
-              className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-              id="name"
-              onChange={event => updateName(setState, ReactEvent.Form.target(event)["value"])}
-              type_="text"
-              placeholder="Evaluation criterion name"
-              maxLength=50
-              value=state.name
-            />
-            <School__InputGroupError
-              message="Enter a valid name"
-              active={state.dirty && state.name |> String.trim |> String.length < 1}
-            />
-          </div>
-        </div>
-        <div className="mx-auto">
-          <div className="max-w-2xl pt-6 mx-auto">
-            <div className="mb-4">
-              <span
-                className="inline-block tracking-wide text-sm font-semibold mr-2"
-                htmlFor="max_grades">
-                {"Maximum grade is" |> str}
-              </span>
-              {switch evaluationCriterion {
-              | Some(_) =>
-                <span
-                  className="cursor-not-allowed inline-block bg-white border-b-2 text-2xl font-semibold text-center border-blue px-3 py-2 leading-tight rounded-none focus:outline-none">
-                  {state.maxGrade |> string_of_int |> str}
-                </span>
-              | None =>
-                <select
-                  onChange={event =>
-                    updateMaxGrade(
-                      ReactEvent.Form.target(event)["value"] |> int_of_string,
-                      state,
-                      setState,
-                    )}
-                  id="max_grade"
-                  value={state.maxGrade |> string_of_int}
-                  className="cursor-pointer inline-block appearance-none bg-white border-b-2 text-2xl font-semibold text-center border-blue hover:border-gray-500 px-3 py-2 leading-tight rounded-none focus:outline-none">
-                  {possibleGradeValues
-                  |> List.filter(g => g != 1)
-                  |> List.map(possibleGradeValue =>
-                    <option
-                      key={possibleGradeValue |> string_of_int}
-                      value={possibleGradeValue |> string_of_int}>
-                      {possibleGradeValue |> string_of_int |> str}
-                    </option>
-                  )
-                  |> Array.of_list
-                  |> ReasonReact.array}
-                </select>
-              }}
-              <span
-                className="inline-block tracking-wide text-sm font-semibold mx-2"
-                htmlFor="pass_grades">
-                {"and the passing grade is" |> str}
-              </span>
-              {switch evaluationCriterion {
-              | Some(_) =>
-                <span
-                  className="cursor-not-allowed inline-block appearance-none bg-white border-b-2 text-2xl font-semibold text-center border-blue px-3 py-2 leading-tight rounded-none">
-                  {state.passGrade |> string_of_int |> str}
-                </span>
-              | None =>
-                <select
-                  onChange={event =>
-                    updatePassGrade(
-                      ReactEvent.Form.target(event)["value"] |> int_of_string,
-                      setState,
-                    )}
-                  id="pass_grade"
-                  value={state.passGrade |> string_of_int}
-                  className="cursor-pointer inline-block appearance-none bg-white border-b-2 text-2xl font-semibold text-center border-blue hover:border-gray-500 px-3 py-2 rounded-none leading-tight focus:outline-none">
-                  {possibleGradeValues
-                  |> List.filter(g => g <= state.maxGrade)
-                  |> List.map(possibleGradeValue =>
-                    <option
-                      key={possibleGradeValue |> string_of_int}
-                      value={possibleGradeValue |> string_of_int}>
-                      {possibleGradeValue |> string_of_int |> str}
-                    </option>
-                  )
-                  |> Array.of_list
-                  |> ReasonReact.array}
-                </select>
-              }}
-            </div>
-            <div className="flex justify-between">
-              <div className="flex items-center">
-                <label className="block tracking-wide text-xs font-semibold" htmlFor="grades">
-                  {"Grade and Labels" |> str}
-                </label>
-                <HelpIcon className="ml-2" link="https://docs.pupilfirst.com/#/evaluation_criteria">
-                  {"Assign labels for each grade, to reflect in grade cards for students and coaches" |> str}
-                </HelpIcon>
-              </div>
-              <div className="flex">
-                <div className="flex justify-center items-center ml-4">
-                  <span className="grade-bar__pointer-legend grade-bar__pointer-legend-failed" />
-                  <span className="ml-2 text-xs"> {"Fail" |> str} </span>
-                </div>
-                <div className="flex justify-center items-center ml-4">
-                  <span className="grade-bar__pointer-legend grade-bar__pointer-legend-passed" />
-                  <span className="ml-2 text-xs"> {"Pass" |> str} </span>
-                </div>
-              </div>
-            </div>
-            <div ariaLabel="label-editor"> {labels(state, setState) |> React.array} </div>
-            <div className="mt-3 mb-3 text-xs">
-              <span className="leading-normal">
-                <strong> {"Important:" |> str} </strong>
-                {" The values for maximum and passing grades cannot be modified once a criterion is created. Labels given to each grade can be edited later on." |> str}
-              </span>
-            </div>
-            <div className="flex">
-              {switch evaluationCriterion {
-              | Some(criterion) =>
-                <button
-                  disabled={saveDisabled(state)}
-                  onClick={_ =>
-                    updateEvaluationCriterion(state, setState, addOrUpdateCriterionCB, criterion)}
-                  className="w-full btn btn-large btn-primary mt-3">
-                  {"Update Criterion" |> str}
-                </button>
-
-              | None =>
-                <button
-                  disabled={saveDisabled(state)}
-                  onClick={_ =>
-                    createEvaluationCriterion(state, setState, addOrUpdateCriterionCB, courseId)}
-                  className="w-full btn btn-large btn-primary mt-3">
-                  {"Create Criterion" |> str}
-                </button>
-              }}
-            </div>
-          </div>
-        </div>
-      </DisablingCover>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Student.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Student.res
deleted file mode 100644
index 2ebd598..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Student.res
+++ /dev/null
@@ -1,24 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  avatarUrl: string,
-  teamId: string,
-}
-
-let id = t => t.id
-
-let teamId = t => t.teamId
-
-let name = t => t.name
-
-let avatarUrl = t => t.avatarUrl
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    teamId: json |> field("teamId", string),
-    name: json |> field("name", string),
-    avatarUrl: json |> field("avatarUrl", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Student.resi b/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Student.resi
deleted file mode 100644
index 3bca4ea..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Student.resi
+++ /dev/null
@@ -1,9 +0,0 @@
-type t
-
-let id: t => string
-
-let name: t => string
-let avatarUrl: t => string
-let teamId: t => string
-
-let decode: Js.Json.t => t
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Team.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Team.res
deleted file mode 100644
index e8245ed..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Team.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-}
-
-let id = t => t.id
-
-let name = t => t.name
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Team.resi b/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Team.resi
deleted file mode 100644
index 249da7a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Team.resi
+++ /dev/null
@@ -1,7 +0,0 @@
-type t
-
-let id: t => string
-
-let name: t => string
-
-let decode: Js.Json.t => t
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Types.res
deleted file mode 100644
index b3c724c..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/InactiveStudentsPanel__Types.res
+++ /dev/null
@@ -1,2 +0,0 @@
-module Team = InactiveStudentsPanel__Team
-module Student = InactiveStudentsPanel__Student
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SA_Coaches_CoachEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SA_Coaches_CoachEditor.res
deleted file mode 100644
index 30ece3d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SA_Coaches_CoachEditor.res
+++ /dev/null
@@ -1,523 +0,0 @@
-open CoachesSchoolIndex__Types
-
-exception UnexpectedResponse(int)
-
-let handleApiError = x =>
-  switch x {
-  | UnexpectedResponse(code) => code
-  }
-
-type state = {
-  name: string,
-  email: string,
-  title: string,
-  linkedinUrl: string,
-  public: bool,
-  exited: bool,
-  connectLink: string,
-  imageFileName: string,
-  dirty: bool,
-  saving: bool,
-  hasNameError: bool,
-  hasTitleError: bool,
-  hasEmailError: bool,
-  hasLinkedInUrlError: bool,
-  hasConnectLinkError: bool,
-  affiliation: string,
-}
-
-type action =
-  | UpdateName(string, bool)
-  | UpdateEmail(string, bool)
-  | UpdateTitle(string, bool)
-  | UpdateLinkedInUrl(string, bool)
-  | UpdateConnectLink(string, bool)
-  | UpdatePublic(bool)
-  | UpdateImageFileName(string)
-  | UpdateExited(bool)
-  | UpdateAffiliation(string)
-  | UpdateSaving
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateName(name, hasNameError) => {
-      ...state,
-      name: name,
-      hasNameError: hasNameError,
-      dirty: true,
-    }
-  | UpdateTitle(title, hasTitleError) => {
-      ...state,
-      title: title,
-      hasTitleError: hasTitleError,
-      dirty: true,
-    }
-  | UpdateEmail(email, hasEmailError) => {
-      ...state,
-      email: email,
-      hasEmailError: hasEmailError,
-      dirty: true,
-    }
-  | UpdateLinkedInUrl(linkedinUrl, hasLinkedInUrlError) => {
-      ...state,
-      linkedinUrl: linkedinUrl,
-      hasLinkedInUrlError: hasLinkedInUrlError,
-      dirty: true,
-    }
-  | UpdateConnectLink(connectLink, hasConnectLinkError) => {
-      ...state,
-      connectLink: connectLink,
-      hasConnectLinkError: hasConnectLinkError,
-      dirty: true,
-    }
-  | UpdatePublic(public) => {...state, public: public, dirty: true}
-  | UpdateSaving => {...state, saving: !state.saving}
-  | UpdateImageFileName(imageFileName) => {
-      ...state,
-      imageFileName: imageFileName,
-      dirty: true,
-    }
-  | UpdateExited(exited) => {...state, exited: exited, dirty: true}
-  | UpdateAffiliation(affiliation) => {...state, affiliation: affiliation, dirty: true}
-  }
-
-let str = React.string
-
-let nameOrTitleInvalid = name => name |> String.length < 2
-
-let updateName = (send, name) => send(UpdateName(name, name |> nameOrTitleInvalid))
-
-let emailInvalid = email => email |> EmailUtils.isInvalid(false)
-
-let updateEmail = (send, email) => send(UpdateEmail(email, email |> emailInvalid))
-
-let updateTitle = (send, title) => send(UpdateTitle(title, title |> nameOrTitleInvalid))
-
-let updateLinkedInUrl = (send, linkedinUrl) => {
-  let regex = %re(`/(https?)?:?(\\/\\/)?(([w]{3}||\\w\\w)\\.)?linkedin.com(\\w+:{0,1}\\w*@)?(\\S+)(:([0-9])+)?(\\/|\\/([\\w#!:.?+=&%@!\\-\\/]))?/`)
-  let hasError = linkedinUrl |> String.length < 1 ? false : !Js.Re.test_(regex, linkedinUrl)
-  send(UpdateLinkedInUrl(linkedinUrl, hasError))
-}
-
-let updateConnectLink = (send, connectLink) =>
-  send(UpdateConnectLink(connectLink, connectLink |> UrlUtils.isInvalid(true)))
-
-let booleanButtonClasses = selected => {
-  let classes = "toggle-button__button"
-  classes ++ (selected ? " toggle-button__button--active" : "")
-}
-
-let saveDisabled = state =>
-  state.title |> nameOrTitleInvalid ||
-    (state.name |> nameOrTitleInvalid ||
-    (state.email |> emailInvalid ||
-      (state.hasLinkedInUrlError ||
-      (state.connectLink |> UrlUtils.isInvalid(true) || (!state.dirty || state.saving)))))
-
-let computeInitialState = coach =>
-  switch coach {
-  | None => {
-      name: "",
-      email: "",
-      title: "",
-      linkedinUrl: "",
-      public: false,
-      connectLink: "",
-      exited: false,
-      dirty: false,
-      saving: false,
-      hasNameError: false,
-      hasEmailError: false,
-      hasTitleError: false,
-      hasLinkedInUrlError: false,
-      hasConnectLinkError: false,
-      imageFileName: "",
-      affiliation: "",
-    }
-  | Some(coach) => {
-      name: coach |> Coach.name,
-      email: coach |> Coach.email,
-      title: coach |> Coach.title,
-      linkedinUrl: switch coach |> Coach.linkedinUrl {
-      | Some(linkedinUrl) => linkedinUrl
-      | None => ""
-      },
-      public: coach |> Coach.public,
-      connectLink: switch coach |> Coach.connectLink {
-      | Some(connectLink) => connectLink
-      | None => ""
-      },
-      exited: coach |> Coach.exited,
-      dirty: false,
-      saving: false,
-      hasNameError: false,
-      hasEmailError: false,
-      hasTitleError: false,
-      hasLinkedInUrlError: false,
-      hasConnectLinkError: false,
-      imageFileName: switch coach |> Coach.imageFileName {
-      | Some(imageFileName) => imageFileName
-      | None => ""
-      },
-      affiliation: coach |> Coach.affiliation |> OptionUtils.toString,
-    }
-  }
-
-@react.component
-let make = (~coach, ~closeFormCB, ~updateCoachCB, ~authenticityToken) => {
-  let (state, send) = React.useReducerWithMapState(reducer, coach, computeInitialState)
-
-  let formId = "coach-create-form"
-  let addCoach = json => {
-    let id = json |> {
-      open Json.Decode
-      field("id", int)
-    }
-    let imageUrl = json |> {
-      open Json.Decode
-      field("image_url", string)
-    }
-    let newCoach = Coach.make(
-      ~id,
-      ~name=state.name,
-      ~imageUrl,
-      ~email=state.email,
-      ~title=state.title,
-      ~linkedinUrl=Some(state.linkedinUrl),
-      ~public=state.public,
-      ~connectLink=Some(state.connectLink),
-      ~exited=state.exited,
-      ~imageFileName=Some(state.imageFileName),
-      ~affiliation=Some(state.affiliation),
-    )
-    switch coach {
-    | Some(_) => Notification.success("Success", "Coach updated successfully")
-    | None => Notification.success("Success", "Coach created successfully")
-    }
-    updateCoachCB(newCoach)
-    closeFormCB()
-  }
-  let avatarUploaderText = () =>
-    switch state.imageFileName {
-    | "" => "Upload an avatar"
-    | _ => "Replace avatar: " ++ state.imageFileName
-    }
-  let handleResponseJSON = json => {
-    let error =
-      json
-      |> {
-        open Json.Decode
-        field("error", nullable(string))
-      }
-      |> Js.Null.toOption
-    switch error {
-    | Some(err) =>
-      send(UpdateSaving)
-      Notification.error("Something went wrong!", err)
-    | None => addCoach(json)
-    }
-  }
-  let sendCoach = formData => {
-    let endPoint = switch coach {
-    | Some(coach) => "/school/coaches/" ++ (coach |> Coach.id |> string_of_int)
-    | None => "/school/coaches/"
-    }
-    let httpMethod = switch coach {
-    | Some(_coach) => Fetch.Patch
-    | None => Fetch.Post
-    }
-    open Js.Promise
-    Fetch.fetchWithInit(
-      endPoint,
-      Fetch.RequestInit.make(
-        ~method_=httpMethod,
-        ~body=Fetch.BodyInit.makeWithFormData(formData),
-        ~credentials=Fetch.SameOrigin,
-        (),
-      ),
-    )
-    |> then_(response =>
-      if Fetch.Response.ok(response) || Fetch.Response.status(response) == 422 {
-        response |> Fetch.Response.json
-      } else {
-        Js.Promise.reject(UnexpectedResponse(response |> Fetch.Response.status))
-      }
-    )
-    |> then_(json => handleResponseJSON(json) |> resolve)
-    |> catch(error =>
-      switch error |> handleApiError {
-      | Some(code) =>
-        send(UpdateSaving)
-        Notification.error(code |> string_of_int, "Please try again")
-      | None =>
-        send(UpdateSaving)
-        Notification.error("Something went wrong!", "Please try again")
-      } |> resolve
-    )
-    |> ignore
-  }
-  let submitForm = event => {
-    ReactEvent.Form.preventDefault(event)
-    send(UpdateSaving)
-    let element = ReactDOMRe._getElementById(formId)
-    switch element {
-    | Some(element) => sendCoach(DomUtils.FormData.create(element))
-    | None => ()
-    }
-  }
-  <div className="blanket">
-    <div className="drawer-right">
-      <div className="drawer-right__close absolute">
-        <button
-          title="close"
-          onClick={_e => closeFormCB()}
-          className="flex items-center justify-center bg-white text-gray-600 font-bold py-3 px-5 rounded-l-full rounded-r-none hover:text-gray-700 focus:outline-none mt-4">
-          <i className="fas fa-times text-xl" />
-        </button>
-      </div>
-      <div className="drawer-right-form w-full">
-        <div className="w-full">
-          <div className="mx-auto bg-white">
-            <div className="max-w-2xl px-6 pt-5 mx-auto">
-              <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-                {switch coach {
-                | Some(coach) => coach |> Coach.name
-                | None => "Add New Coach"
-                } |> str}
-              </h5>
-            </div>
-            <form key="xxx" id=formId onSubmit={event => submitForm(event)}>
-              <input name="authenticity_token" type_="hidden" value=authenticityToken />
-              <div className="max-w-2xl px-6 pb-6 mx-auto">
-                <div className="mt-5">
-                  <label
-                    className="inline-block tracking-wide text-gray-900 text-xs font-semibold"
-                    htmlFor="name">
-                    {"Name" |> str}
-                  </label>
-                  <span> {"*" |> str} </span>
-                  <input
-                    className="appearance-none block w-full bg-white text-gray-800 border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                    id="name"
-                    type_="text"
-                    name="faculty[name]"
-                    placeholder="Coach Name"
-                    value=state.name
-                    onChange={event => updateName(send, ReactEvent.Form.target(event)["value"])}
-                  />
-                  <School__InputGroupError
-                    message="is not a valid name" active=state.hasNameError
-                  />
-                </div>
-                {switch coach {
-                | Some(_coach) => React.null
-                | None =>
-                  <div className="mt-5">
-                    <label
-                      className="inline-block tracking-wide text-xs font-semibold" htmlFor="email">
-                      {"Email" |> str}
-                    </label>
-                    <span> {"*" |> str} </span>
-                    <input
-                      className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                      id="email"
-                      type_="email"
-                      name="faculty[email]"
-                      placeholder="Coach email address"
-                      value=state.email
-                      onChange={event => updateEmail(send, ReactEvent.Form.target(event)["value"])}
-                    />
-                    <School__InputGroupError
-                      message="is not a valid email address" active=state.hasEmailError
-                    />
-                  </div>
-                }}
-                <div className="mt-5">
-                  <label
-                    className="inline-block tracking-wide text-xs font-semibold" htmlFor="title">
-                    {"Title" |> str}
-                  </label>
-                  <span> {"*" |> str} </span>
-                  <input
-                    className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                    id="title"
-                    type_="text"
-                    name="faculty[title]"
-                    placeholder="Coach Title/Expertise"
-                    value=state.title
-                    onChange={event => updateTitle(send, ReactEvent.Form.target(event)["value"])}
-                  />
-                  <School__InputGroupError
-                    message="is not a valid title" active=state.hasTitleError
-                  />
-                </div>
-                <div className="mt-5">
-                  <label
-                    className="inline-block tracking-wide text-xs font-semibold"
-                    htmlFor="affiliation">
-                    {"Affiliation" |> str}
-                  </label>
-                  <input
-                    value=state.affiliation
-                    onChange={event =>
-                      send(UpdateAffiliation(ReactEvent.Form.target(event)["value"]))}
-                    className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                    id="affiliation"
-                    name="faculty[affiliation]"
-                    type_="text"
-                    placeholder="Acme Inc., Acme University, etc."
-                  />
-                </div>
-                <div className="mt-5">
-                  <label
-                    className="inline-block tracking-wide text-xs font-semibold" htmlFor="linkedIn">
-                    {"LinkedIn" |> str}
-                  </label>
-                  <input
-                    className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                    id="linkedIn"
-                    type_="text"
-                    name="faculty[linkedin_url]"
-                    placeholder="LinkedIn Profile URL"
-                    value=state.linkedinUrl
-                    onChange={event =>
-                      updateLinkedInUrl(send, ReactEvent.Form.target(event)["value"])}
-                  />
-                  <School__InputGroupError
-                    message="is not a valid LinkedIn URL" active=state.hasLinkedInUrlError
-                  />
-                </div>
-                <div className="mt-5">
-                  <label
-                    className="inline-block tracking-wide text-xs font-semibold"
-                    htmlFor="connectLink">
-                    {"Connect Link" |> str}
-                  </label>
-                  <input
-                    className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                    id="connectLink"
-                    type_="text"
-                    name="faculty[connect_link]"
-                    placeholder="Student connect request link for the coach"
-                    value=state.connectLink
-                    onChange={event =>
-                      updateConnectLink(send, ReactEvent.Form.target(event)["value"])}
-                  />
-                  <School__InputGroupError
-                    message="is not a valid connect url" active=state.hasConnectLinkError
-                  />
-                </div>
-                <div className="mt-5">
-                  <div className="flex items-center flex-shrink-0">
-                    <label
-                      className="block tracking-wide text-xs font-semibold mr-3"
-                      htmlFor="evaluated">
-                      {"Should the coach profile be public?" |> str}
-                    </label>
-                    <div
-                      id="notification"
-                      className="flex flex-shrink-0 rounded-lg overflow-hidden border border-gray-400">
-                      <button
-                        type_="submit"
-                        onClick={_event => {
-                          ReactEvent.Mouse.preventDefault(_event)
-                          send(UpdatePublic(true))
-                        }}
-                        name="faculty[public]"
-                        value="true"
-                        className={booleanButtonClasses(state.public)}>
-                        {"Yes" |> str}
-                      </button>
-                      <button
-                        onClick={_event => {
-                          ReactEvent.Mouse.preventDefault(_event)
-                          send(UpdatePublic(false))
-                        }}
-                        className={booleanButtonClasses(!state.public)}>
-                        {"No" |> str}
-                      </button>
-                      <input
-                        type_="hidden" name="faculty[public]" value={state.public |> string_of_bool}
-                      />
-                    </div>
-                  </div>
-                </div>
-                <div className="mt-5">
-                  <label
-                    className="block tracking-wide text-xs font-semibold" htmlFor="avatarUploader">
-                    {"Avatar" |> str}
-                  </label>
-                  <input
-                    disabled=state.saving
-                    className="hidden"
-                    name="faculty[image]"
-                    type_="file"
-                    id="sa-coach-editor__file-input"
-                    required=false
-                    multiple=false
-                    onChange={event =>
-                      send(UpdateImageFileName(ReactEvent.Form.target(event)["files"][0]["name"]))}
-                  />
-                  <label className="file-input-label mt-2" htmlFor="sa-coach-editor__file-input">
-                    <i className="fas fa-upload mr-2 text-gray-600 text-lg" />
-                    <span className="truncate"> {avatarUploaderText() |> str} </span>
-                  </label>
-                </div>
-              </div>
-              <div className="p-6 bg-gray-200">
-                <div className="max-w-2xl px-6 mx-auto">
-                  <div className="flex max-w-2xl w-full justify-between items-center mx-auto">
-                    {switch coach {
-                    | Some(_coach) =>
-                      <div className="flex items-center flex-shrink-0">
-                        <label
-                          className="block tracking-wide  text-xs font-semibold mr-3"
-                          htmlFor="evaluated">
-                          {"Has the coach left the school?" |> str}
-                        </label>
-                        <div
-                          id="exited"
-                          className="flex flex-shrink-0 rounded-lg overflow-hidden border border-gray-400">
-                          <button
-                            onClick={_event => {
-                              ReactEvent.Mouse.preventDefault(_event)
-                              send(UpdateExited(true))
-                            }}
-                            name="faculty[exited]"
-                            className={booleanButtonClasses(state.exited)}>
-                            {"Yes" |> str}
-                          </button>
-                          <button
-                            onClick={_event => {
-                              ReactEvent.Mouse.preventDefault(_event)
-                              send(UpdateExited(false))
-                            }}
-                            className={booleanButtonClasses(!state.exited)}>
-                            {"No" |> str}
-                          </button>
-                          <input
-                            type_="hidden"
-                            name="faculty[exited]"
-                            value={state.exited |> string_of_bool}
-                          />
-                        </div>
-                      </div>
-                    | None => React.null
-                    }}
-                    <button
-                      disabled={saveDisabled(state)} className="w-auto btn btn-large btn-primary">
-                      {switch coach {
-                      | Some(_coach) => "Update Coach"
-                      | None => "Add Coach"
-                      } |> str}
-                    </button>
-                  </div>
-                </div>
-              </div>
-            </form>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SA_Coaches_SchoolIndex.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SA_Coaches_SchoolIndex.res
deleted file mode 100644
index 0e70716..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SA_Coaches_SchoolIndex.res
+++ /dev/null
@@ -1,93 +0,0 @@
-open CoachesSchoolIndex__Types
-
-let str = React.string
-
-type formVisible =
-  | None
-  | CoachEditor(option<Coach.t>)
-
-type state = {
-  coaches: list<Coach.t>,
-  formVisible: formVisible,
-}
-
-type action =
-  | UpdateFormVisible(formVisible)
-  | UpdateCoaches(Coach.t)
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateFormVisible(formVisible) => {...state, formVisible: formVisible}
-  | UpdateCoaches(coach) =>
-    let newCoachesList = coach |> Coach.updateList(state.coaches)
-    {...state, coaches: newCoachesList}
-  }
-
-@react.component
-let make = (~coaches, ~authenticityToken) => {
-  let (state, send) = React.useReducer(reducer, {coaches: coaches, formVisible: None})
-
-  let closeFormCB = () => send(UpdateFormVisible(None))
-  let updateCoachCB = coach => send(UpdateCoaches(coach))
-  <div className="flex flex-1 h-full overflow-y-scroll">
-    {switch state.formVisible {
-    | None => React.null
-    | CoachEditor(coach) =>
-      <SA_Coaches_CoachEditor coach closeFormCB updateCoachCB authenticityToken />
-    }}
-    <div className="flex-1 flex flex-col">
-      <div className="flex px-6 py-2 items-center justify-between">
-        <button
-          onClick={_event => {
-            ReactEvent.Mouse.preventDefault(_event)
-            send(UpdateFormVisible(CoachEditor(None)))
-          }}
-          className="max-w-2xl w-full flex mx-auto items-center justify-center relative bg-white text-primary-500 hove:bg-gray-100 hover:text-primary-600 hover:shadow-lg focus:outline-none border-2 border-gray-400 border-dashed hover:border-primary-300 p-6 rounded-lg mt-8 cursor-pointer">
-          <i className="fas fa-plus-circle text-lg" />
-          <h5 className="font-semibold ml-2"> {"Add New Coach" |> str} </h5>
-        </button>
-      </div>
-      <div className="px-6 pb-4 mt-5 flex flex-1">
-        <div className="max-w-2xl w-full mx-auto relative">
-          {state.coaches
-          |> List.sort((x, y) => (x |> Coach.id) - (y |> Coach.id))
-          |> List.map(coach =>
-            <div
-              key={coach |> Coach.id |> string_of_int}
-              className="flex items-center shadow bg-white rounded-lg mb-4 overflow-hidden">
-              <div className="course-faculty__list-item flex w-full">
-                <div
-                  className="course-faculty__list-item-details flex flex-1 items-center justify-between cursor-pointer hover:bg-gray-100 hover:text-primary-500"
-                  onClick={_event => {
-                    ReactEvent.Mouse.preventDefault(_event)
-                    send(UpdateFormVisible(CoachEditor(Some(coach))))
-                  }}>
-                  <div className="flex flex-1 py-4 px-4">
-                    <img
-                      className="w-10 h-10 rounded-full mr-4 object-cover"
-                      src={coach |> Coach.imageUrl}
-                      alt={"Avatar of " ++ (coach |> Coach.name)}
-                    />
-                    <div className="text-sm">
-                      <p className="font-semibold"> {coach |> Coach.name |> str} </p>
-                      <p className="text-gray-600 font-semibold text-xs mt-px">
-                        {coach |> Coach.title |> str}
-                      </p>
-                    </div>
-                  </div>
-                  <span
-                    className="flex items-center flex-shrink-0 ml-2 py-4 px-4 font-semibold text-gray-700 hover:text-primary-500 text-sm">
-                    <i className="fas fa-edit text-normal" />
-                    <span className="ml-1"> {"Edit" |> str} </span>
-                  </span>
-                </div>
-              </div>
-            </div>
-          )
-          |> Array.of_list
-          |> React.array}
-        </div>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SA_InactiveStudentsPanel.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SA_InactiveStudentsPanel.res
deleted file mode 100644
index cf49bf8..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SA_InactiveStudentsPanel.res
+++ /dev/null
@@ -1,227 +0,0 @@
-open InactiveStudentsPanel__Types
-
-let str = React.string
-
-type state = {
-  teams: list<Team.t>,
-  students: list<Student.t>,
-  selectedTeams: list<Team.t>,
-  searchString: string,
-}
-
-type action =
-  | RefreshData(list<Team.t>)
-  | SelectTeam(Team.t)
-  | DeselectTeam(Team.t)
-  | UpdateSearchString(string)
-
-let reducer = (state, action) =>
-  switch action {
-  | RefreshData(teams) => {...state, teams: teams, selectedTeams: list{}}
-  | SelectTeam(team) => {
-      ...state,
-      selectedTeams: list{team, ...state.selectedTeams},
-    }
-  | DeselectTeam(team) => {
-      ...state,
-      selectedTeams: state.selectedTeams |> List.filter(s => Team.id(s) !== Team.id(team)),
-    }
-  | UpdateSearchString(searchString) => {...state, searchString: searchString}
-  }
-
-let studentsInTeam = (students, team) =>
-  students |> List.filter(student => Student.teamId(student) === Team.id(team))
-
-let markActive = (teams, courseId, responseCB, authenticityToken) => {
-  let payload = Js.Dict.empty()
-  Js.Dict.set(payload, "authenticity_token", authenticityToken |> Js.Json.string)
-  Js.Dict.set(
-    payload,
-    "team_ids",
-    teams
-    |> List.map(s => s |> Team.id |> int_of_string)
-    |> {
-      open Json.Encode
-      list(int)
-    },
-  )
-  let url = "/school/courses/" ++ (courseId ++ "/mark_teams_active")
-  Api.create(url, payload, responseCB, () => ())
-}
-
-let handleActiveTeamResponse = (send, state, json) => {
-  let message = json |> {
-    open Json.Decode
-    field("message", string)
-  }
-  let updatedTeams =
-    state.teams |> List.filter(team =>
-      !(state.selectedTeams |> List.exists(removedTeam => Team.id(team) === Team.id(removedTeam)))
-    )
-  send(RefreshData(updatedTeams))
-  Notification.success("Success!", message)
-}
-
-@react.component
-let make = (~teams, ~courseId, ~students, ~authenticityToken, ~isLastPage, ~currentPage) => {
-  let (state, send) = React.useReducer(
-    reducer,
-    {teams: teams, students: students, selectedTeams: list{}, searchString: ""},
-  )
-
-  <div className="flex flex-1 px-6 pb-4 flex-col bg-gray-100 overflow-y-scroll">
-    <div className="max-w-3xl w-full mx-auto flex justify-between border-b mt-4">
-      <ul className="flex font-semibold text-sm">
-        <li
-          className="rounded-t-lg cursor-pointer border-b-3 border-transparent hover:bg-gray-200 hover:text-gray-900">
-          <a
-            className="block px-3 py-3 md:py-2 text-gray-800"
-            href={"/school/courses/" ++ (courseId ++ "/students")}>
-            {"All Students" |> str}
-          </a>
-        </li>
-        <li className="px-3 py-3 md:py-2 text-primary-500 border-b-3 border-primary-500 -mb-px">
-          <span> {"Inactive Students" |> str} </span>
-        </li>
-      </ul>
-    </div>
-    <div className="bg-gray-100 sticky top-0 py-3">
-      <div className="border rounded-lg mx-auto max-w-3xl bg-white ">
-        <div className="flex w-full items-center justify-between p-4">
-          <div className="flex flex-1">
-            <input
-              id="search"
-              type_="search"
-              className="text-sm bg-white border border-gray-400 rounded leading-relaxed max-w-xs w-full py-2 px-3 mr-2 focus:outline-none focus:bg-white focus:border-primary-300"
-              placeholder="Search by student or team name..."
-              value=state.searchString
-              onChange={event => send(UpdateSearchString(ReactEvent.Form.target(event)["value"]))}
-            />
-            <a
-              className="btn btn-default no-underline"
-              href={"/school/courses/" ++
-              (courseId ++
-              ("/inactive_students?search=" ++ state.searchString))}>
-              {"Search" |> str}
-            </a>
-          </div>
-          {state.selectedTeams |> ListUtils.isEmpty
-            ? React.null
-            : <button
-                onClick={_e =>
-                  markActive(
-                    state.selectedTeams,
-                    courseId,
-                    handleActiveTeamResponse(send, state),
-                    authenticityToken,
-                  )}
-                className="btn btn-success ml-3 mr-3 focus:outline-none">
-                {"Reactivate Students" |> str}
-              </button>}
-        </div>
-      </div>
-    </div>
-    <div className="max-w-3xl mx-auto w-full">
-      {state.teams |> List.length > 0
-        ? state.teams
-          |> List.sort((team1, team2) =>
-            (team2 |> Team.id |> int_of_string) - (team1 |> Team.id |> int_of_string)
-          )
-          |> List.map(team => {
-            let isSingleFounder = team |> studentsInTeam(state.students) |> List.length == 1
-
-            <div
-              key={team |> Team.id}
-              id={team |> Team.name}
-              className="student-team-container flex items-center shadow bg-white rounded-lg mb-4 overflow-hidden">
-              {
-                let isChecked = state.selectedTeams |> List.mem(team)
-                let checkboxId = "select-team-" ++ (team |> Team.id)
-                <label
-                  className="flex self-stretch items-center text-grey leading-tight font-bold px-4 py-5 hover:bg-gray-100"
-                  htmlFor=checkboxId>
-                  <input
-                    className="leading-tight"
-                    type_="checkbox"
-                    id=checkboxId
-                    checked=isChecked
-                    onChange={isChecked
-                      ? _e => send(DeselectTeam(team))
-                      : _e => send(SelectTeam(team))}
-                  />
-                </label>
-              }
-              <div className="flex-1 w-3/5 order-last border-l">
-                {team
-                |> studentsInTeam(state.students)
-                |> List.map(student =>
-                  <div
-                    key={student |> Student.id}
-                    id={student |> Student.name}
-                    className="student-team__card flex items-center bg-white pl-4">
-                    <div className="flex-1 w-3/5">
-                      <div className="flex items-center">
-                        <a
-                          className="flex flex-1 self-stretch items-center py-4 pr-4"
-                          id={(student |> Student.name) ++ "_edit"}>
-                          <img
-                            className="w-10 h-10 rounded-full mr-4 object-cover"
-                            src={student |> Student.avatarUrl}
-                          />
-                          <div className="text-sm flex flex-col">
-                            <p className="text-black font-semibold inline-block ">
-                              {student |> Student.name |> str}
-                            </p>
-                          </div>
-                        </a>
-                      </div>
-                    </div>
-                  </div>
-                )
-                |> Array.of_list
-                |> React.array}
-              </div>
-              {isSingleFounder
-                ? React.null
-                : <div className="flex w-2/5 items-center">
-                    <div className="w-3/5 py-4 px-3">
-                      <div className="students-team--name mb-5">
-                        <p className="mb-1 text-xs"> {"Team" |> str} </p>
-                        <h4> {team |> Team.name |> str} </h4>
-                      </div>
-                    </div>
-                  </div>}
-            </div>
-          })
-          |> Array.of_list
-          |> React.array
-        : <div className="shadow bg-white rounded-lg mb-4 p-4">
-            {"No inactive student matches your search criteria." |> str}
-          </div>}
-      {teams |> ListUtils.isNotEmpty
-        ? <div className="max-w-3xl w-full flex flex-row mx-auto justify-center pb-8">
-            {currentPage > 1
-              ? <a
-                  className="block btn btn-default no-underline border shadow mx-2"
-                  href={"/school/courses/" ++
-                  (courseId ++
-                  ("/inactive_students?page=" ++ (currentPage - 1 |> string_of_int)))}>
-                  <i className="fas fa-arrow-left" />
-                  <span className="ml-2"> {"Prev" |> str} </span>
-                </a>
-              : React.null}
-            {isLastPage
-              ? React.null
-              : <a
-                  className="block btn btn-default no-underline border shadow mx-2"
-                  href={"/school/courses/" ++
-                  (courseId ++
-                  ("/inactive_students?page=" ++ (currentPage + 1 |> string_of_int)))}>
-                  <span className="mr-2"> {"Next" |> str} </span>
-                  <i className="fas fa-arrow-right" />
-                </a>}
-          </div>
-        : React.null}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmin.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmin.res
deleted file mode 100644
index 57835c6..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmin.res
+++ /dev/null
@@ -1,35 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  avatarUrl: option<string>,
-  email: string,
-}
-
-let name = t => t.name
-let avatarUrl = t => t.avatarUrl
-let id = t => t.id
-let email = t => t.email
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    email: json |> field("email", string),
-    name: json |> field("name", string),
-    avatarUrl: json |> optional(field("avatarUrl", string)),
-  }
-}
-
-let create = (~id, ~name, ~email, ~avatarUrl) => {
-  id: id,
-  name: name,
-  email: email,
-  avatarUrl: avatarUrl,
-}
-
-let update = (admin, admins) =>
-  admins |> Js.Array.filter(a => a.id != admin.id) |> Array.append([admin])
-
-let sort = l => l |> ArrayUtils.copyAndSort((x, y) => x.name < y.name ? -1 : 1)
-
-let updateName = (name, t) => {...t, name: name}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmin__EditorDrawer.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmin__EditorDrawer.res
deleted file mode 100644
index 60bcda7..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmin__EditorDrawer.res
+++ /dev/null
@@ -1,33 +0,0 @@
-type size =
-  | Normal
-  | Large
-
-let drawerClasses = size => {
-  let defaultClasses = "drawer-right"
-
-  defaultClasses ++
-  switch size {
-  | Normal => ""
-  | Large => " drawer-right-large"
-  }
-}
-
-@react.component
-let make = (~closeDrawerCB, ~closeButtonTitle="Close Editor", ~size=Normal, ~children) =>
-  <div>
-    <div className="blanket" />
-    <div className={drawerClasses(size)}>
-      <div className="drawer-right__close absolute">
-        <button
-          onClick={e => {
-            e |> ReactEvent.Mouse.preventDefault
-            closeDrawerCB()
-          }}
-          title=closeButtonTitle
-          className="flex items-center justify-center bg-white text-gray-600 font-bold py-3 px-5 rounded-l-full rounded-r-none hover:text-gray-700 focus:outline-none mt-4">
-          <i className="fas fa-times text-xl" />
-        </button>
-      </div>
-      <div className="w-full overflow-y-scroll"> children </div>
-    </div>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmins__Editor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmins__Editor.res
deleted file mode 100644
index 3ccf95f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmins__Editor.res
+++ /dev/null
@@ -1,154 +0,0 @@
-let str = React.string
-
-type editorAction =
-  | ShowEditor(option<SchoolAdmin.t>)
-  | Hidden
-
-type state = {
-  editorAction: editorAction,
-  admins: array<SchoolAdmin.t>,
-  deleting: bool,
-}
-
-module DeleteSchoolAdminQuery = %graphql(`
-  mutation DeleteSchoolAdminMutation($id: ID!) {
-    deleteSchoolAdmin(id: $id) {
-      success
-    }
-  }
-`)
-
-let removeSchoolAdmin = (setState, admin, currentSchoolAdminId, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  if {
-    open Webapi.Dom
-    window |> Window.confirm(
-      "Are you sure you want to remove " ++
-      ((admin |> SchoolAdmin.name) ++
-      " from the list of admins?"),
-    )
-  } {
-    setState(state => {...state, deleting: true})
-
-    DeleteSchoolAdminQuery.make(~id=admin |> SchoolAdmin.id, ())
-    |> GraphqlQuery.sendQuery
-    |> Js.Promise.then_(response => {
-      if response["deleteSchoolAdmin"]["success"] {
-        if (
-          /*
-           * If the school admin who was removed is the current user, redirect her to
-           * the home page. Otherwise, just remove the entry from the list.
-           */
-          admin |> SchoolAdmin.id == currentSchoolAdminId
-        ) {
-          DomUtils.redirect("/home")
-        } else {
-          setState(state => {
-            ...state,
-            deleting: false,
-            admins: state.admins |> Js.Array.filter(a =>
-              a |> SchoolAdmin.id != (admin |> SchoolAdmin.id)
-            ),
-          })
-        }
-      } else {
-        setState(state => {...state, deleting: false})
-      }
-      response |> Js.Promise.resolve
-    })
-    |> ignore
-  }
-}
-
-let renderAdmin = (currentSchoolAdminId, admin, admins, setState) =>
-  <div
-    key={(admin |> SchoolAdmin.id) ++ (admin |> SchoolAdmin.name)}
-    className="flex w-1/2 flex-shrink-0 mb-5 px-3">
-    <div
-      className="shadow bg-white rounded-lg flex w-full border border-transparent overflow-hidden hover:border-primary-400 hover:bg-gray-100">
-      <a
-        className="w-full cursor-pointer p-4"
-        onClick={_event => {
-          ReactEvent.Mouse.preventDefault(_event)
-          setState(state => {...state, editorAction: ShowEditor(Some(admin))})
-        }}>
-        <div className="flex">
-          <span className="mr-4 flex-shrink-0">
-            {switch admin |> SchoolAdmin.avatarUrl {
-            | Some(avatarUrl) =>
-              <img className="w-10 h-10 rounded-full object-cover" src=avatarUrl />
-            | None => <Avatar name={admin |> SchoolAdmin.name} className="w-10 h-10 rounded-full" />
-            }}
-          </span>
-          <div className="flex flex-col">
-            <span className="text-black font-semibold text-sm">
-              {admin |> SchoolAdmin.name |> str}
-            </span>
-            <span className="text-black font-normal text-xs">
-              {admin |> SchoolAdmin.email |> str}
-            </span>
-          </div>
-        </div>
-      </a>
-      {admins |> Array.length > 1
-        ? <div
-            className="w-10 text-sm course-faculty__list-item-remove text-gray-700 hover:text-gray-900 cursor-pointer flex items-center justify-center hover:bg-gray-200 hover:text-red-600"
-            title={"Delete " ++ (admin |> SchoolAdmin.name)}
-            onClick={removeSchoolAdmin(setState, admin, currentSchoolAdminId)}>
-            <i className="fas fa-trash-alt" />
-          </div>
-        : React.null}
-    </div>
-  </div>
-
-let handleUpdate = (setState, admin) =>
-  setState(state => {
-    ...state,
-    admins: state.admins |> SchoolAdmin.update(admin),
-    editorAction: Hidden,
-  })
-
-@react.component
-let make = (~currentSchoolAdminId, ~admins) => {
-  let (state, setState) = React.useState(() => {
-    editorAction: Hidden,
-    admins: admins,
-    deleting: false,
-  })
-
-  <div className="flex flex-1 h-full overflow-y-scroll bg-gray-100">
-    <div className="flex-1 flex flex-col">
-      {switch state.editorAction {
-      | Hidden => React.null
-      | ShowEditor(admin) =>
-        <SchoolAdmin__EditorDrawer
-          closeDrawerCB={_ => setState(state => {...state, editorAction: Hidden})}>
-          <SchoolAdmins__Form admin updateCB={handleUpdate(setState)} />
-        </SchoolAdmin__EditorDrawer>
-      }}
-      <DisablingCover disabled=state.deleting message="Deleting...">
-        <div className="flex px-6 py-2 items-center justify-between">
-          <button
-            onClick={_ => setState(state => {...state, editorAction: ShowEditor(None)})}
-            className="max-w-2xl w-full flex mx-auto items-center justify-center relative bg-white text-primary-500 hover:bg-gray-100 hover:text-primary-600 hover:shadow-lg focus:outline-none border-2 border-gray-400 border-dashed hover:border-primary-300 p-6 rounded-lg mt-8 cursor-pointer">
-            <i className="fas fa-plus-circle" />
-            <h5 className="font-semibold ml-2"> {"Add New School Admin" |> str} </h5>
-          </button>
-        </div>
-        <div className="px-6 pb-4 mt-5 flex">
-          <div className="max-w-2xl w-full mx-auto">
-            <div className="flex -mx-3 flex-wrap">
-              {state.admins
-              |> SchoolAdmin.sort
-              |> Array.map(admin =>
-                renderAdmin(currentSchoolAdminId, admin, state.admins, setState)
-              )
-              |> ReasonReact.array}
-            </div>
-          </div>
-        </div>
-      </DisablingCover>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmins__Form.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmins__Form.res
deleted file mode 100644
index 5b15f4b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolAdmins__Form.res
+++ /dev/null
@@ -1,183 +0,0 @@
-let str = React.string
-
-module CreateSchoolAdminQuery = %graphql(`
-  mutation CreateSchoolAdminMutation($name: String!, $email: String!) {
-    createSchoolAdmin(name: $name, email: $email){
-      schoolAdmin{
-        id,
-        avatarUrl
-      }
-    }
-  }
-`)
-
-module UpdateSchoolAdminQuery = %graphql(`
-  mutation UpdateSchoolAdminMutation($id: ID!, $name: String!) {
-    updateSchoolAdmin(id: $id, name: $name) {
-      success
-    }
-  }
-`)
-
-let createSchoolAdminQuery = (email, name, setSaving, updateCB) => {
-  setSaving(_ => true)
-  CreateSchoolAdminQuery.make(~email, ~name, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    switch response["createSchoolAdmin"]["schoolAdmin"] {
-    | Some(schoolAdmin) =>
-      updateCB(
-        SchoolAdmin.create(
-          ~id=schoolAdmin["id"],
-          ~name,
-          ~email,
-          ~avatarUrl=schoolAdmin["avatarUrl"],
-        ),
-      )
-      Notification.success("Success", "School Admin created successfully.")
-    | None => setSaving(_ => false)
-    }
-    Js.Promise.resolve()
-  })
-  |> ignore
-  ()
-}
-
-let updateSchoolAdminQuery = (admin, name, setSaving, updateCB) => {
-  setSaving(_ => true)
-  let id = admin |> SchoolAdmin.id
-  UpdateSchoolAdminQuery.make(~id, ~name, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["updateSchoolAdmin"]["success"]
-      ? {
-          updateCB(admin |> SchoolAdmin.updateName(name))
-          Notification.success("Success", "School Admin updated successfully.")
-        }
-      : setSaving(_ => false)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let handleButtonClick = (admin, setSaving, name, email, updateCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  switch admin {
-  | Some(admin) => updateSchoolAdminQuery(admin, name, setSaving, updateCB)
-  | None => createSchoolAdminQuery(email, name, setSaving, updateCB)
-  }
-}
-
-let isInvalidEmail = email => email |> EmailUtils.isInvalid(false)
-
-let showInvalidEmailError = (email, admin) =>
-  switch admin {
-  | Some(_) => isInvalidEmail(email)
-  | None => email == "" ? false : isInvalidEmail(email)
-  }
-
-let showInvalidNameError = (name, admin) =>
-  switch admin {
-  | Some(_) => name == ""
-  | None => false
-  }
-let saveDisabled = (email, name, saving, admin) =>
-  isInvalidEmail(email) ||
-  (saving ||
-  (name == "" ||
-    switch admin {
-    | Some(admin) => admin |> SchoolAdmin.name == name && admin |> SchoolAdmin.email == email
-    | None => false
-    }))
-
-let buttonText = (saving, admin) =>
-  switch (saving, admin) {
-  | (true, _) => "Saving"
-  | (false, Some(_)) => "Update School Admin"
-  | (false, None) => "Create School Admin"
-  }
-
-let emailInputDisabled = admin =>
-  switch admin {
-  | Some(_) => true
-  | None => false
-  }
-
-@react.component
-let make = (~admin, ~updateCB) => {
-  let (saving, setSaving) = React.useState(() => false)
-
-  let (name, setName) = React.useState(() =>
-    switch admin {
-    | Some(admin) => admin |> SchoolAdmin.name
-    | None => ""
-    }
-  )
-
-  let (email, setEmail) = React.useState(() =>
-    switch admin {
-    | Some(admin) => admin |> SchoolAdmin.email
-    | None => ""
-    }
-  )
-
-  <div className="w-full">
-    <DisablingCover disabled=saving>
-      <div className="mx-auto bg-white">
-        <div className="max-w-2xl p-6 mx-auto">
-          <h5 className="uppercase text-center border-b border-gray-400 pb-2 mb-4">
-            {switch admin {
-            | Some(admin) => admin |> SchoolAdmin.name
-            | None => "Add new school admin"
-            } |> str}
-          </h5>
-          <div>
-            <label
-              className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-              htmlFor="email">
-              {"Email" |> str}
-            </label>
-            <input
-              value=email
-              onChange={event => setEmail(ReactEvent.Form.target(event)["value"])}
-              className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-              id="email"
-              type_="email"
-              placeholder="Add email here"
-              disabled={emailInputDisabled(admin)}
-            />
-            <School__InputGroupError
-              message="Enter a valid Email" active={showInvalidEmailError(email, admin)}
-            />
-          </div>
-          <div className="mt-5">
-            <label
-              className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-              htmlFor="name">
-              {"Name" |> str}
-            </label>
-            <input
-              value=name
-              onChange={event => setName(ReactEvent.Form.target(event)["value"])}
-              className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-              id="name"
-              type_="text"
-              placeholder="Add name here"
-            />
-            <School__InputGroupError
-              message="Enter a valid name" active={showInvalidNameError(name, admin)}
-            />
-          </div>
-          <div className="w-auto mt-8">
-            <button
-              disabled={saveDisabled(email, name, saving, admin)}
-              onClick={handleButtonClick(admin, setSaving, name, email, updateCB)}
-              className="w-full btn btn-large btn-primary">
-              {buttonText(saving, admin) |> str}
-            </button>
-          </div>
-        </div>
-      </div>
-    </DisablingCover>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCommunities__Editor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCommunities__Editor.res
deleted file mode 100644
index 6a81dc8..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCommunities__Editor.res
+++ /dev/null
@@ -1,331 +0,0 @@
-let str = React.string
-
-open SchoolCommunities__IndexTypes
-
-module CreateCommunityQuery = %graphql(`
-  mutation CreateCommunityMutation($name: String!, $targetLinkable: Boolean!, $courseIds: [ID!]!) {
-    createCommunity(name: $name, targetLinkable: $targetLinkable, courseIds: $courseIds) @bsVariant {
-      communityId
-      errors
-    }
-  }
-`)
-
-module UpdateCommunityQuery = %graphql(`
-  mutation UpdateCommunityMutation($id: ID!, $name: String!, $targetLinkable: Boolean!, $courseIds: [ID!]!) {
-    updateCommunity(id: $id, name: $name, targetLinkable: $targetLinkable, courseIds: $courseIds) @bsVariant {
-      communityId
-      errors
-    }
-  }
-`)
-
-module CreateCommunityError = {
-  type t = [#InvalidLengthName | #IncorrectCourseIds]
-
-  let notification = error =>
-    switch error {
-    | #InvalidLengthName => (
-        "InvalidLengthName",
-        "Course name should be between 1 and 50 characters long.",
-      )
-    | #IncorrectCourseIds => ("IncorrectCourseIds", "Could not find courses with the supplied IDs.")
-    }
-}
-
-module UpdateCommunityError = {
-  type t = [
-    | #InvalidLengthName
-    | #IncorrectCourseIds
-    | #IncorrectCommunityId
-  ]
-
-  let notification = error =>
-    switch error {
-    | #InvalidLengthName => (
-        "InvalidLengthName",
-        "Course name should be between 1 and 50 characters long.",
-      )
-    | #IncorrectCourseIds => ("IncorrectCourseIds", "Could not find courses with the supplied IDs.")
-    | #IncorrectCommunityId => ("IncorrectCommunityId", "Community does not exist.")
-    }
-}
-
-module CreateCommunityErrorHandler = GraphqlErrorHandler.Make(CreateCommunityError)
-
-module UpdateCommunityErrorHandler = GraphqlErrorHandler.Make(UpdateCommunityError)
-
-type state = {
-  saving: bool,
-  dirty: bool,
-  name: string,
-  targetLinkable: bool,
-  selectedCourseIds: Belt.Set.String.t,
-  courseSearch: string,
-}
-
-let computeInitialState = ((community, connections)) => {
-  let (name, targetLinkable, selectedCourseIds) = switch community {
-  | Some(community) => (
-      community |> Community.name,
-      community |> Community.targetLinkable,
-      connections
-      |> List.filter(connection =>
-        connection |> Connection.communityId == (community |> Community.id)
-      )
-      |> List.map(connection => connection |> Connection.courseId)
-      |> Array.of_list
-      |> Belt.Set.String.fromArray,
-    )
-  | None => ("", false, Belt.Set.String.empty)
-  }
-
-  {
-    saving: false,
-    dirty: false,
-    name: name,
-    targetLinkable: targetLinkable,
-    selectedCourseIds: selectedCourseIds,
-    courseSearch: "",
-  }
-}
-
-type action =
-  | UpdateName(string)
-  | SetTargetLinkable(bool)
-  | SelectCourse(string)
-  | DeselectCourse(string)
-  | BeginSaving
-  | FailSaving
-  | FinishSaving
-  | UpdateCourseSearch(string)
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateName(name) => {...state, name: name, dirty: true}
-  | SetTargetLinkable(targetLinkable) => {
-      ...state,
-      targetLinkable: targetLinkable,
-      dirty: true,
-    }
-  | SelectCourse(courseId) => {
-      ...state,
-      dirty: true,
-      selectedCourseIds: state.selectedCourseIds->Belt.Set.String.add(courseId),
-    }
-  | DeselectCourse(courseId) => {
-      ...state,
-      dirty: true,
-      selectedCourseIds: state.selectedCourseIds->Belt.Set.String.remove(courseId),
-    }
-  | BeginSaving => {...state, saving: true}
-  | FailSaving => {...state, saving: false}
-  | FinishSaving => {...state, saving: false, dirty: false}
-  | UpdateCourseSearch(courseSearch) => {...state, courseSearch: courseSearch}
-  }
-
-let handleConnections = (communityId, connections, courseIds) => {
-  let oldConnections =
-    connections |> List.filter(connection => connection |> Connection.communityId != communityId)
-  let newConnectionsForCommunity =
-    courseIds |> Array.map(courseId => Connection.create(communityId, courseId)) |> Array.to_list
-  oldConnections |> List.append(newConnectionsForCommunity)
-}
-
-let handleQuery = (
-  community,
-  connections,
-  state,
-  send,
-  addCommunityCB,
-  updateCommunitiesCB,
-  event,
-) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  let {name, targetLinkable} = state
-  let courseIds = state.selectedCourseIds |> Belt.Set.String.toArray
-
-  if name != "" {
-    send(BeginSaving)
-
-    switch community {
-    | Some(community) =>
-      UpdateCommunityQuery.make(
-        ~id=community |> Community.id,
-        ~name,
-        ~targetLinkable,
-        ~courseIds,
-        (),
-      )
-      |> GraphqlQuery.sendQuery
-      |> Js.Promise.then_(response =>
-        switch response["updateCommunity"] {
-        | #CommunityId(communityId) =>
-          send(FinishSaving)
-          updateCommunitiesCB(
-            Community.create(communityId, name, targetLinkable),
-            handleConnections(communityId, connections, courseIds),
-          )
-          Notification.success("Success", "Community updated successfully.")
-          Js.Promise.resolve()
-        | #Errors(errors) => Js.Promise.reject(UpdateCommunityErrorHandler.Errors(errors))
-        }
-      )
-      |> UpdateCommunityErrorHandler.catch(() => send(FailSaving))
-      |> ignore
-    | None =>
-      CreateCommunityQuery.make(~name, ~targetLinkable, ~courseIds, ())
-      |> GraphqlQuery.sendQuery
-      |> Js.Promise.then_(response =>
-        switch response["createCommunity"] {
-        | #CommunityId(communityId) =>
-          send(FinishSaving)
-          addCommunityCB(
-            Community.create(communityId, name, targetLinkable),
-            handleConnections(communityId, connections, courseIds),
-          )
-          Notification.success("Success", "Community created successfully.")
-          Js.Promise.resolve()
-        | #Errors(errors) => Js.Promise.reject(CreateCommunityErrorHandler.Errors(errors))
-        }
-      )
-      |> CreateCommunityErrorHandler.catch(() => send(FailSaving))
-      |> ignore
-    }
-  } else {
-    Notification.error("Empty", "Answer cant be blank")
-  }
-}
-
-let booleanButtonClasses = bool => {
-  let classes = "toggle-button__button"
-  classes ++ (bool ? " toggle-button__button--active" : "")
-}
-
-module Selectable = {
-  type t = Course.t
-  let value = t => t |> Course.name
-  let searchString = value
-}
-
-module CourseSelector = MultiselectInline.Make(Selectable)
-
-let selectedCourses = (~invert=false, courses, selectedCourseIds) =>
-  courses
-  |> Array.of_list
-  |> Js.Array.filter(course => {
-    let condition = selectedCourseIds->Belt.Set.String.has(course |> Course.id)
-    invert ? !condition : condition
-  })
-
-let unselectedCourses = (courses, selectedCourseIds) =>
-  selectedCourses(~invert=true, courses, selectedCourseIds)
-
-let onChangeCourseSearch = (send, value) => send(UpdateCourseSearch(value))
-
-let onSelectCourse = (send, course) => send(SelectCourse(course |> Course.id))
-
-let onDeselectCourse = (send, course) => send(DeselectCourse(course |> Course.id))
-
-@react.component
-let make = (~courses, ~community, ~connections, ~addCommunityCB, ~updateCommunitiesCB) => {
-  let (state, send) = React.useReducerWithMapState(
-    reducer,
-    (community, connections),
-    computeInitialState,
-  )
-
-  let saveDisabled = state.name |> String.trim == "" || !state.dirty
-
-  <div className="mx-8 pt-8">
-    <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-      {"Community Editor" |> str}
-    </h5>
-    <DisablingCover disabled=state.saving>
-      <div key="communities-editor" className="mt-3">
-        <div className="mt-2">
-          <label
-            className="inline-block tracking-wide text-gray-700 text-xs font-semibold"
-            htmlFor="communities-editor__name">
-            {"What do you want to call this community?" |> str}
-          </label>
-          <input
-            placeholder="This community needs a name!"
-            value=state.name
-            onChange={event => {
-              let name = ReactEvent.Form.target(event)["value"]
-              send(UpdateName(name))
-            }}
-            id="communities-editor__name"
-            className="appearance-none h-10 mt-2 block w-full text-gray-700 border border-gray-400 rounded py-2 px-4 text-sm bg-gray-100 hover:bg-gray-200 focus:outline-none focus:bg-white focus:border-primary-400"
-          />
-          <School__InputGroupError
-            message="is not a valid name"
-            active={state.dirty ? state.name |> String.trim == "" : false}
-          />
-        </div>
-        <div className="flex items-center mt-6">
-          <label
-            className="inline-block tracking-wide text-gray-700 text-xs font-semibold"
-            htmlFor="communities-editor__course-list">
-            {"Should students be allowed to discuss targets in this community?" |> str}
-          </label>
-          <div className="flex toggle-button__group flex-no-shrink rounded-lg overflow-hidden ml-2">
-            <button
-              onClick={_ => send(SetTargetLinkable(true))}
-              className={booleanButtonClasses(state.targetLinkable)}>
-              {"Yes" |> str}
-            </button>
-            <button
-              onClick={_ => send(SetTargetLinkable(false))}
-              className={booleanButtonClasses(!state.targetLinkable)}>
-              {"No" |> str}
-            </button>
-          </div>
-        </div>
-        <div className="mt-4">
-          <label
-            className="inline-block tracking-wide text-gray-700 text-xs font-semibold mb-2"
-            htmlFor="communities-editor__course-targetLinkable">
-            {"Give access to students from:" |> str}
-          </label>
-          <CourseSelector
-            placeholder="Search for a course"
-            emptySelectionMessage="No courses selected"
-            allItemsSelectedMessage="You have selected all available courses"
-            selected={selectedCourses(courses, state.selectedCourseIds)}
-            unselected={unselectedCourses(courses, state.selectedCourseIds)}
-            onChange={onChangeCourseSearch(send)}
-            value=state.courseSearch
-            onSelect={onSelectCourse(send)}
-            onDeselect={onDeselectCourse(send)}
-          />
-        </div>
-      </div>
-      <button
-        disabled=saveDisabled
-        onClick={handleQuery(
-          community,
-          connections,
-          state,
-          send,
-          addCommunityCB,
-          updateCommunitiesCB,
-        )}
-        key="communities-editor__update-button"
-        className="w-full btn btn-large btn-primary mt-3">
-        {switch community {
-        | Some(_) => "Update Community"
-        | None => "Create a new community"
-        } |> str}
-      </button>
-    </DisablingCover>
-    <div className="mt-3 mb-3 text-xs">
-      <span className="leading-normal">
-        <strong> {"Note:" |> str} </strong>
-        {" Coaches in your school have access to all communities." |> str}
-      </span>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCommunities__Index.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCommunities__Index.res
deleted file mode 100644
index fa0d9e4..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCommunities__Index.res
+++ /dev/null
@@ -1,84 +0,0 @@
-let str = React.string
-
-open SchoolCommunities__IndexTypes
-
-type editorAction =
-  | ShowEditor(option<Community.t>)
-  | Hidden
-
-@react.component
-let make = (~communities, ~courses, ~connections) => {
-  let (editorAction, setEditorAction) = React.useState(() => Hidden)
-  let (stateConnections, setStateConnections) = React.useState(() => connections)
-  let (stateCommunities, setStateCommunities) = React.useState(() => communities)
-
-  let updateCommunitiesCB = (community, connections) => {
-    setStateCommunities(_ => stateCommunities |> Community.updateList(community))
-    setStateConnections(_ => connections)
-    setEditorAction(_ => Hidden)
-  }
-
-  let addCommunityCB = (community, connections) => {
-    setStateCommunities(_ => communities |> List.append(list{community}))
-    setStateConnections(_ => connections)
-    setEditorAction(_ => Hidden)
-  }
-  <div className="flex-1 flex flex-col overflow-y-scroll bg-gray-200">
-    {switch editorAction {
-    | Hidden => React.null
-    | ShowEditor(community) =>
-      <SchoolAdmin__EditorDrawer closeDrawerCB={() => setEditorAction(_ => Hidden)}>
-        <SchoolCommunities__Editor
-          courses community connections=stateConnections addCommunityCB updateCommunitiesCB
-        />
-      </SchoolAdmin__EditorDrawer>
-    }}
-    <div className="flex px-6 py-2 items-center justify-between">
-      <button
-        onClick={_ => setEditorAction(_ => ShowEditor(None))}
-        className="max-w-2xl w-full flex mx-auto items-center justify-center relative bg-white text-primary-500 hover:bg-gray-100 hover:text-primary-600 hover:shadow-lg focus:outline-none border-2 border-gray-400 border-dashed hover:border-primary-300 p-6 rounded-lg mt-8 cursor-pointer">
-        <i className="fas fa-plus-circle" />
-        <h5 className="font-semibold ml-2"> {"Add New Community" |> str} </h5>
-      </button>
-    </div>
-    <div className="px-6 pb-4 mt-5 flex flex-1">
-      <div className="max-w-2xl w-full mx-auto relative">
-        {stateCommunities
-        |> List.map(community =>
-          <div
-            key={community |> Community.id}
-            className="flex items-center shadow bg-white rounded-lg mb-4">
-            <div className="course-faculty__list-item flex w-full items-center">
-              <a
-                onClick={_event => {
-                  ReactEvent.Mouse.preventDefault(_event)
-                  setEditorAction(_ => ShowEditor(Some(community)))
-                }}
-                className="course-faculty__list-item-details flex flex-1 items-center justify-between border border-transparent cursor-pointer rounded-l-lg hover:bg-gray-100 hover:text-primary-500 hover:border-primary-400">
-                <div className="flex w-full text-sm justify-between">
-                  <span className="flex-1 font-semibold py-5 px-5">
-                    {community |> Community.name |> str}
-                  </span>
-                  <span
-                    className="ml-2 py-5 px-5 font-semibold text-gray-700 hover:text-primary-500">
-                    <i className="fas fa-edit text-normal" />
-                    <span className="ml-1"> {"Edit" |> str} </span>
-                  </span>
-                </div>
-              </a>
-              <a
-                target="_blank"
-                href={"/communities/" ++ (community |> Community.id)}
-                className="text-sm flex items-center border-l text-gray-700 hover:bg-gray-100 hover:text-primary-500 font-semibold px-5 py-5">
-                <i className="fas fa-external-link-alt text-normal" />
-                <span className="ml-1"> {"View" |> str} </span>
-              </a>
-            </div>
-          </div>
-        )
-        |> Array.of_list
-        |> ReasonReact.array}
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCommunities__IndexTypes.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCommunities__IndexTypes.res
deleted file mode 100644
index e9816fb..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCommunities__IndexTypes.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module Course = SchoolCommunities__Course
-module Community = SchoolCommunities__Community
-module Connection = SchoolCommunities__Connection
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__AgreementsEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__AgreementsEditor.res
deleted file mode 100644
index 6952317..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__AgreementsEditor.res
+++ /dev/null
@@ -1,150 +0,0 @@
-open SchoolCustomize__Types
-
-%raw(`require("./SchoolCustomize__AgreementsEditor.css")`)
-
-let str = ReasonReact.string
-
-type kind =
-  | PrivacyPolicy
-  | TermsOfUse
-
-type action =
-  | UpdateAgreement(string)
-  | BeginUpdate
-  | ErrorOccured
-  | DoneUpdating
-
-type state = {
-  agreement: string,
-  updating: bool,
-  formDirty: bool,
-}
-
-let kindToString = kind =>
-  switch kind {
-  | PrivacyPolicy => "Privacy Policy"
-  | TermsOfUse => "Terms of Use"
-  }
-
-let kindToKey = kind =>
-  switch kind {
-  | PrivacyPolicy => "privacy_policy"
-  | TermsOfUse => "terms_of_use"
-  }
-
-let handleAgreementChange = (send, event) => {
-  let agreement = ReactEvent.Form.target(event)["value"]
-  send(UpdateAgreement(agreement))
-}
-
-let updateAgreementText = (updating, kind) =>
-  updating ? "Updating..." : "Update " ++ kindToString(kind)
-
-module UpdateSchoolStringQuery = %graphql(`
-   mutation UpdateSchoolStringMutation($key: String!, $value: String!) {
-     updateSchoolString(key: $key, value: $value) {
-       errors
-     }
-   }
-  `)
-
-module UpdateSchoolStringErrorHandler = GraphqlErrorHandler.Make(
-  SchoolCustomize__UpdateSchoolStringError,
-)
-
-let handleUpdateAgreement = (
-  state,
-  send,
-  kind,
-  updatePrivacyPolicyCB,
-  updateTermsOfUseCB,
-  event,
-) => {
-  event |> ReactEvent.Mouse.preventDefault
-  send(BeginUpdate)
-
-  UpdateSchoolStringQuery.make(~key=kind |> kindToKey, ~value=state.agreement, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result =>
-    switch result["updateSchoolString"]["errors"] {
-    | [] =>
-      Notification.success("Done!", kindToString(kind) ++ " has been updated.")
-      switch kind {
-      | PrivacyPolicy => updatePrivacyPolicyCB(state.agreement)
-      | TermsOfUse => updateTermsOfUseCB(state.agreement)
-      }
-      send(DoneUpdating)
-      Js.Promise.resolve()
-    | errors => Js.Promise.reject(UpdateSchoolStringErrorHandler.Errors(errors))
-    }
-  )
-  |> UpdateSchoolStringErrorHandler.catch(() => send(ErrorOccured))
-  |> ignore
-  ()
-}
-
-let updateAgreementDisabled = state => !state.formDirty
-
-let initialState = (kind, customizations) => {
-  let agreement = switch kind {
-  | PrivacyPolicy => customizations |> Customizations.privacyPolicy
-  | TermsOfUse => customizations |> Customizations.termsOfUse
-  }
-
-  {
-    agreement: switch agreement {
-    | Some(agreement) => agreement
-    | None => ""
-    },
-    updating: false,
-    formDirty: false,
-  }
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateAgreement(agreement) => {...state, agreement: agreement, formDirty: true}
-  | BeginUpdate => {...state, updating: true}
-  | ErrorOccured => {...state, updating: false}
-  | DoneUpdating => {...state, updating: false, formDirty: false}
-  }
-
-@react.component
-let make = (~kind, ~customizations, ~updatePrivacyPolicyCB, ~updateTermsOfUseCB) => {
-  let (state, send) = React.useReducer(reducer, initialState(kind, customizations))
-  <div className="mx-8 pt-8 flex flex-col agreements-editor__container">
-    <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-      {"Manage " ++ (kind |> kindToString) |> str}
-    </h5>
-    <DisablingCover disabled=state.updating containerClasses="flex flex-col flex-1">
-      <div key="agreements-editor__input-group" className="mt-3 flex flex-col flex-1">
-        <label
-          className="inline-block tracking-wide text-xs font-semibold"
-          htmlFor="agreements-editor__value">
-          {"Body of Agreement " |> str} <i className="fab fa-markdown text-base" />
-        </label>
-        <textarea
-          maxLength=10000
-          className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500 flex-1"
-          id="agreements-editor__value"
-          placeholder="Leave the agreement body empty to hide the footer link."
-          onChange={handleAgreementChange(send)}
-          value=state.agreement
-        />
-      </div>
-      <button
-        key="agreements-editor__update-button"
-        disabled={updateAgreementDisabled(state)}
-        onClick={handleUpdateAgreement(
-          state,
-          send,
-          kind,
-          updatePrivacyPolicyCB,
-          updateTermsOfUseCB,
-        )}
-        className="w-full btn btn-large btn-primary mt-4">
-        {updateAgreementText(state.updating, kind) |> str}
-      </button>
-    </DisablingCover>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__ContactsEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__ContactsEditor.res
deleted file mode 100644
index bd733f5..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__ContactsEditor.res
+++ /dev/null
@@ -1,156 +0,0 @@
-open SchoolCustomize__Types
-
-let str = ReasonReact.string
-
-type action =
-  | UpdateAddress(string)
-  | UpdateEmailAddress(string, bool)
-  | BeginUpdate
-  | ErrorOccured
-  | DoneUpdating
-
-type state = {
-  address: string,
-  emailAddress: string,
-  emailAddressInvalid: bool,
-  updating: bool,
-  formDirty: bool,
-}
-
-let handleInputChange = (callback, event) => {
-  let value = ReactEvent.Form.target(event)["value"]
-  callback(value)
-}
-
-let updateContactDetailsButtonText = updating => updating ? "Updating..." : "Update Contact Details"
-
-module UpdateContactDetailsQuery = %graphql(`
-   mutation UpdateAddressAndEmailMutation($address: String!, $emailAddress: String!) {
-     updateAddress: updateSchoolString(key: "address", value: $address) {
-       errors
-     }
-
-     updateEmailAddress: updateSchoolString(key: "email_address", value: $emailAddress) {
-       errors
-     }
-   }
-  `)
-
-module UpdateSchoolStringErrorHandler = GraphqlErrorHandler.Make(
-  SchoolCustomize__UpdateSchoolStringError,
-)
-
-let handleUpdateContactDetails = (state, send, updateAddressCB, updateEmailAddressCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  send(BeginUpdate)
-
-  UpdateContactDetailsQuery.make(~address=state.address, ~emailAddress=state.emailAddress, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(result =>
-    switch (result["updateAddress"]["errors"], result["updateEmailAddress"]["errors"]) {
-    | ([], []) =>
-      Notification.success("Done!", "Contact details have been updated.")
-      updateAddressCB(state.address)
-      updateEmailAddressCB(state.emailAddress)
-      send(DoneUpdating)
-      Js.Promise.resolve()
-    | ([], errors) =>
-      Notification.notice("Partial success!", "We were only able to update the address.")
-      Js.Promise.reject(UpdateSchoolStringErrorHandler.Errors(errors))
-    | (errors, []) =>
-      Notification.notice("Partial success!", "We were only able to update the email address.")
-      Js.Promise.reject(UpdateSchoolStringErrorHandler.Errors(errors))
-    | (addressErrors, emailAddressErrors) =>
-      let errors = addressErrors |> Array.append(emailAddressErrors)
-      Js.Promise.reject(UpdateSchoolStringErrorHandler.Errors(errors))
-    }
-  )
-  |> UpdateSchoolStringErrorHandler.catch(() => send(ErrorOccured))
-  |> ignore
-  ()
-}
-
-let updateButtonDisabled = state =>
-  if state.updating {
-    true
-  } else {
-    !state.formDirty || state.emailAddressInvalid
-  }
-
-let initialState = customizations => {
-  address: customizations |> Customizations.address |> OptionUtils.default(""),
-  emailAddress: customizations |> Customizations.emailAddress |> OptionUtils.default(""),
-  emailAddressInvalid: false,
-  updating: false,
-  formDirty: false,
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateAddress(address) => {...state, address: address, formDirty: true}
-  | UpdateEmailAddress(emailAddress, invalid) => {
-      ...state,
-      emailAddress: emailAddress,
-      emailAddressInvalid: invalid,
-      formDirty: true,
-    }
-  | BeginUpdate => {...state, updating: true}
-  | ErrorOccured => {...state, updating: false}
-  | DoneUpdating => {...state, updating: false, formDirty: false}
-  }
-
-@react.component
-let make = (~customizations, ~updateAddressCB, ~updateEmailAddressCB) => {
-  let (state, send) = React.useReducer(reducer, initialState(customizations))
-
-  <div className="mx-8 pt-8">
-    <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-      {"Manage Contact Details" |> str}
-    </h5>
-    <DisablingCover disabled=state.updating>
-      <div key="contacts-editor__address-input-group" className="mt-3">
-        <label
-          className="inline-block tracking-wide text-xs font-semibold"
-          htmlFor="contacts-editor__address">
-          {"Contact Address " |> str} <i className="fab fa-markdown text-base" />
-        </label>
-        <textarea
-          maxLength=1000
-          className="appearance-none block w-full bg-white text-gray-800 border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-          id="contacts-editor__address"
-          placeholder="Leave the address empty to hide the footer section."
-          onChange={handleInputChange(address => send(UpdateAddress(address)))}
-          value=state.address
-        />
-      </div>
-      <div key="contacts-editor__email-address-input-group" className="mt-3">
-        <label
-          className="inline-block tracking-wide text-xs font-semibold"
-          htmlFor="contacts-editor__email-address">
-          {"Email Address" |> str}
-        </label>
-        <input
-          type_="text"
-          maxLength=250
-          className="appearance-none block w-full bg-white text-gray-800 border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-          id="contacts-editor__email-address"
-          placeholder="Leave the email address empty to hide the footer link."
-          onChange={handleInputChange(emailAddress =>
-            send(UpdateEmailAddress(emailAddress, emailAddress |> EmailUtils.isInvalid(true)))
-          )}
-          value=state.emailAddress
-        />
-        <School__InputGroupError
-          message="is not a valid email address" active=state.emailAddressInvalid
-        />
-      </div>
-      <button
-        key="contacts-editor__update-button"
-        disabled={updateButtonDisabled(state)}
-        onClick={handleUpdateContactDetails(state, send, updateAddressCB, updateEmailAddressCB)}
-        className="w-full bg-indigo-600 hover:bg-blue-600 text-white font-bold py-3 px-6 rounded focus:outline-none mt-3">
-        {updateContactDetailsButtonText(state.updating) |> str}
-      </button>
-    </DisablingCover>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__Customizations.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__Customizations.res
deleted file mode 100644
index c7c5e3a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__Customizations.res
+++ /dev/null
@@ -1,194 +0,0 @@
-exception UnknownKindOfLink(string)
-
-type schoolStrings = {
-  address: option<string>,
-  emailAddress: option<string>,
-  privacyPolicy: option<string>,
-  termsOfUse: option<string>,
-}
-
-type file = {
-  url: string,
-  filename: string,
-}
-
-type schoolImages = {
-  logoOnLightBg: option<file>,
-  coverImage: option<file>,
-  icon: file,
-}
-
-type linkId = string
-type title = string
-type url = string
-
-type link =
-  | HeaderLink(linkId, title, url)
-  | FooterLink(linkId, title, url)
-  | SocialLink(linkId, url)
-
-type t = {
-  schoolStrings: schoolStrings,
-  schoolImages: schoolImages,
-  links: list<link>,
-}
-
-let logoOnLightBg = t => t.schoolImages.logoOnLightBg
-let icon = t => t.schoolImages.icon
-let coverImage = t => t.schoolImages.coverImage
-
-let url = file => file.url
-let filename = file => file.filename
-
-let address = t => t.schoolStrings.address
-let emailAddress = t => t.schoolStrings.emailAddress
-let privacyPolicy = t => t.schoolStrings.privacyPolicy
-let termsOfUse = t => t.schoolStrings.termsOfUse
-
-let headerLinks = t =>
-  t.links |> List.filter(l =>
-    switch l {
-    | HeaderLink(_, _, _) => true
-    | FooterLink(_, _, _) => false
-    | SocialLink(_, _) => false
-    }
-  )
-
-let footerLinks = t =>
-  t.links |> List.filter(l =>
-    switch l {
-    | HeaderLink(_, _, _) => false
-    | FooterLink(_, _, _) => true
-    | SocialLink(_, _) => false
-    }
-  )
-
-let socialLinks = t =>
-  t.links |> List.filter(l =>
-    switch l {
-    | HeaderLink(_, _, _) => false
-    | FooterLink(_, _, _) => false
-    | SocialLink(_, _) => true
-    }
-  )
-
-let unpackLinks = links =>
-  links |> List.map(l =>
-    switch l {
-    | HeaderLink(id, title, url)
-    | FooterLink(id, title, url) => (id, title, url)
-    | SocialLink(id, url) => (id, "", url)
-    }
-  )
-
-let addLink = (link, t) => {...t, links: \"@"(t.links, list{link})}
-
-let removeLink = (linkId, t) => {
-  ...t,
-  links: t.links |> List.filter(l =>
-    switch l {
-    | HeaderLink(id, _, _)
-    | FooterLink(id, _, _) =>
-      id != linkId
-    | SocialLink(id, _) => id != linkId
-    }
-  ),
-}
-
-let optionalString = s =>
-  switch s |> String.trim {
-  | "" => None
-  | nonEmptyString => Some(nonEmptyString)
-  }
-
-let updatePrivacyPolicy = (privacyPolicy, t) => {
-  ...t,
-  schoolStrings: {
-    ...t.schoolStrings,
-    privacyPolicy: privacyPolicy |> optionalString,
-  },
-}
-
-let updateTermsOfUse = (termsOfUse, t) => {
-  ...t,
-  schoolStrings: {
-    ...t.schoolStrings,
-    termsOfUse: termsOfUse |> optionalString,
-  },
-}
-
-let updateAddress = (address, t) => {
-  ...t,
-  schoolStrings: {
-    ...t.schoolStrings,
-    address: address |> optionalString,
-  },
-}
-
-let updateEmailAddress = (emailAddress, t) => {
-  ...t,
-  schoolStrings: {
-    ...t.schoolStrings,
-    emailAddress: emailAddress |> optionalString,
-  },
-}
-
-let decodeFile = json => {
-  open Json.Decode
-  {
-    url: json |> field("url", string),
-    filename: json |> field("filename", string),
-  }
-}
-
-let decodeImages = json => {
-  open Json.Decode
-  {
-    logoOnLightBg: json |> field("logoOnLightBg", optional(decodeFile)),
-    coverImage: json |> field("coverImage", optional(decodeFile)),
-    icon: json |> field("icon", decodeFile),
-  }
-}
-
-let updateImages = (json, t) => {...t, schoolImages: json |> decodeImages}
-
-let decodeStrings = json => {
-  open Json.Decode
-  {
-    address: json |> field("address", optional(string)),
-    emailAddress: json |> field("emailAddress", optional(string)),
-    privacyPolicy: json |> field("privacyPolicy", optional(string)),
-    termsOfUse: json |> field("termsOfUse", optional(string)),
-  }
-}
-
-let decodeLink = json => {
-  let (kind, id, url) = {
-    open Json.Decode
-    (field("kind", string, json), field("id", string, json), field("url", string, json))
-  }
-
-  let title = switch kind {
-  | "header"
-  | "footer" =>
-    open Json.Decode
-    field("title", string, json)
-  | _ => ""
-  }
-
-  switch kind {
-  | "header" => HeaderLink(id, title, url)
-  | "footer" => FooterLink(id, title, url)
-  | "social" => SocialLink(id, url)
-  | unknownKind => raise(UnknownKindOfLink(unknownKind))
-  }
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    schoolStrings: json |> field("strings", decodeStrings),
-    schoolImages: json |> field("images", decodeImages),
-    links: json |> field("links", list(decodeLink)),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__DetailsEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__DetailsEditor.res
deleted file mode 100644
index 0f00de8..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__DetailsEditor.res
+++ /dev/null
@@ -1,117 +0,0 @@
-let str = ReasonReact.string
-
-type action =
-  | UpdateName(string)
-  | UpdateAbout(string)
-  | UpdateSaving(bool)
-
-type state = {
-  name: string,
-  about: string,
-  saving: bool,
-  formDirty: bool,
-}
-let updateButtonText = saving => saving ? "Updating..." : "Update"
-
-module UpdateSchoolQuery = %graphql(`
-  mutation UpdateSchoolMutation($name: String!, $about: String!) {
-    updateSchool(about: $about, name: $name) {
-      success
-    }
-  }
-`)
-
-let optionAbout = about => about == "" ? None : Some(about)
-
-let updateSchoolQuery = (state, send, updateDetailsCB) => {
-  send(UpdateSaving(true))
-
-  UpdateSchoolQuery.make(~name=state.name, ~about=state.about, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["updateSchool"]["success"]
-      ? updateDetailsCB(state.name, optionAbout(state.about))
-      : send(UpdateSaving(false))
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let updateButtonDisabled = state =>
-  !state.formDirty || (state.saving || state.name |> String.length < 1)
-
-let initialState = (name, about) => {
-  name: name,
-  about: about |> OptionUtils.default(""),
-  saving: false,
-  formDirty: false,
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateName(name) => {...state, name: name, formDirty: true}
-  | UpdateAbout(about) => {...state, about: about, formDirty: true}
-  | UpdateSaving(saving) => {...state, saving: saving}
-  }
-
-let handleInputChange = (callback, event) => {
-  let value = ReactEvent.Form.target(event)["value"]
-  callback(value)
-}
-
-@react.component
-let make = (~name, ~about, ~updateDetailsCB) => {
-  let (state, send) = React.useReducer(reducer, initialState(name, about))
-
-  <div className="mx-8 pt-8">
-    <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-      {"Update Details" |> str}
-    </h5>
-    <DisablingCover disabled=state.saving>
-      <div className="mt-3">
-        <label
-          className="inline-block tracking-wide text-xs font-semibold"
-          htmlFor="details-editor__name">
-          {"School Name" |> str}
-        </label>
-        <input
-          type_="text"
-          maxLength=50
-          placeholder="Type school name here"
-          className="appearance-none block w-full bg-white text-gray-800 border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-          id="details-editor__name"
-          onChange={handleInputChange(name => send(UpdateName(name)))}
-          value=state.name
-        />
-        <School__InputGroupError
-          message="name should be greater than 2 characters in length"
-          active={state.name |> String.length < 2}
-        />
-      </div>
-      <div className="mt-3">
-        <label
-          className="inline-block tracking-wide text-xs font-semibold"
-          htmlFor="details-editor__about">
-          {"About" |> str}
-          <span className="font-normal"> {" (Maximum 500 characters)" |> str} </span>
-        </label>
-        <textarea
-          maxLength=500
-          rows=7
-          placeholder="Add more details about the school."
-          className="appearance-none block w-full bg-white text-gray-800 border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-          id="details-editor__about"
-          onChange={handleInputChange(about => send(UpdateAbout(about)))}
-          value=state.about
-        />
-      </div>
-      <button
-        key="details-editor__update-button"
-        onClick={_ => updateSchoolQuery(state, send, updateDetailsCB)}
-        disabled={updateButtonDisabled(state)}
-        className="w-full bg-indigo-600 hover:bg-blue-600 text-white font-bold py-3 px-6 rounded focus:outline-none mt-3">
-        {updateButtonText(state.saving) |> str}
-      </button>
-    </DisablingCover>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__ImageFileInput.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__ImageFileInput.res
deleted file mode 100644
index a305556..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__ImageFileInput.res
+++ /dev/null
@@ -1,50 +0,0 @@
-let str = ReasonReact.string
-
-let imageLabel = (imageName, selectedImageName) =>
-  switch selectedImageName {
-  | Some(name) =>
-    <span>
-      {"You have selected " |> str}
-      <code className="mr-1"> {name |> str} </code>
-      {" to replace the current image." |> str}
-    </span>
-  | None =>
-    switch imageName {
-    | Some(existingName) => <span> {"Please pick a file to replace " ++ existingName |> str} </span>
-    | None => "Please choose an image file to customize" |> str
-    }
-  }
-
-@react.component
-let make = (
-  ~id,
-  ~disabled,
-  ~name,
-  ~onChange,
-  ~labelText,
-  ~imageName,
-  ~selectedImageName,
-  ~errorState,
-  ~errorMessage="must be a JPEG / PNG under 2 MB in size",
-) =>
-  <div key=id className="mt-4">
-    <label className="block tracking-wide text-gray-800 text-xs font-semibold" htmlFor=id>
-      {labelText |> str}
-    </label>
-    <input
-      disabled
-      className="hidden"
-      name
-      type_="file"
-      accept=".jpg,.jpeg,.png,.gif,image/x-png,image/gif,image/jpeg"
-      id
-      required=false
-      multiple=false
-      onChange
-    />
-    <label className="file-input-label mt-2" htmlFor=id>
-      <i className="fas fa-upload" />
-      <span className="ml-2 truncate"> {imageLabel(imageName, selectedImageName)} </span>
-    </label>
-    <School__InputGroupError message=errorMessage active=errorState />
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__ImagesEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__ImagesEditor.res
deleted file mode 100644
index eb65b94..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__ImagesEditor.res
+++ /dev/null
@@ -1,206 +0,0 @@
-open SchoolCustomize__Types
-
-let str = ReasonReact.string
-
-type action =
-  | SelectLogoOnLightBgFile(string, bool)
-  | SelectCoverImageFile(string, bool)
-  | SelectIconFile(string, bool)
-  | BeginUpdate
-  | ErrorOccured
-  | DoneUpdating
-
-type state = {
-  logoOnLightBgFilename: option<string>,
-  logoOnLightBgInvalid: bool,
-  coverImageFilename: option<string>,
-  coverImageInvalid: bool,
-  iconFilename: option<string>,
-  iconInvalid: bool,
-  updating: bool,
-  formDirty: bool,
-}
-
-let updateButtonText = updating => updating ? "Updating..." : "Update Images"
-
-let formId = "sc-images-editor__form"
-
-let handleUpdateImages = (send, updateImagesCB, event) => {
-  event |> ReactEvent.Form.preventDefault
-  send(BeginUpdate)
-
-  let element = ReactDOMRe._getElementById(formId)
-  switch element {
-  | Some(element) =>
-    Api.sendFormData(
-      "/school/images",
-      DomUtils.FormData.create(element),
-      json => {
-        Notification.success("Done!", "Images have been updated successfully.")
-        updateImagesCB(json)
-        send(DoneUpdating)
-      },
-      () => send(ErrorOccured),
-    )
-  | None => ()
-  }
-}
-
-let updateButtonDisabled = state =>
-  if state.updating {
-    true
-  } else {
-    !state.formDirty || (state.logoOnLightBgInvalid || state.iconInvalid)
-  }
-
-let maxAllowedSize = 2 * 1024 * 1024
-
-let isInvalidImageFile = image =>
-  switch image["_type"] {
-  | "image/jpeg"
-  | "image/png" => false
-  | _ => true
-  } ||
-  image["size"] > maxAllowedSize
-
-let updateLogoOnLightBg = (send, event) => {
-  let imageFile = ReactEvent.Form.target(event)["files"][0]
-  send(SelectLogoOnLightBgFile(imageFile["name"], imageFile |> isInvalidImageFile))
-}
-
-let updateCoverImage = (send, event) => {
-  let imageFile = ReactEvent.Form.target(event)["files"][0]
-  send(SelectCoverImageFile(imageFile["name"], imageFile |> isInvalidImageFile))
-}
-
-let updateIcon = (send, event) => {
-  let imageFile = ReactEvent.Form.target(event)["files"][0]
-  send(SelectIconFile(imageFile["name"], imageFile |> isInvalidImageFile))
-}
-
-let imageUploader = (
-  ~id,
-  ~disabled,
-  ~name,
-  ~onChange,
-  ~labelText,
-  ~optionalImageLabel,
-  ~errorState,
-  ~errorMessage,
-) =>
-  <div key=id className="mt-4">
-    <label className="block tracking-wide text-gray-800 text-xs font-semibold" htmlFor=id>
-      {labelText |> str}
-    </label>
-    <input
-      disabled
-      className="hidden"
-      name
-      type_="file"
-      accept=".jpg,.jpeg,.png,.gif,image/x-png,image/gif,image/jpeg"
-      id
-      required=false
-      multiple=false
-      onChange
-    />
-    <label className="file-input-label mt-2" htmlFor=id>
-      <i className="fas fa-upload" /> <span className="ml-2 truncate"> optionalImageLabel </span>
-    </label>
-    <School__InputGroupError message=errorMessage active=errorState />
-  </div>
-
-let initialState = () => {
-  logoOnLightBgFilename: None,
-  logoOnLightBgInvalid: false,
-  coverImageFilename: None,
-  coverImageInvalid: false,
-  iconFilename: None,
-  iconInvalid: false,
-  updating: false,
-  formDirty: false,
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | SelectLogoOnLightBgFile(name, invalid) => {
-      ...state,
-      logoOnLightBgFilename: Some(name),
-      logoOnLightBgInvalid: invalid,
-      formDirty: true,
-    }
-  | SelectIconFile(name, invalid) => {
-      ...state,
-      iconFilename: Some(name),
-      iconInvalid: invalid,
-      formDirty: true,
-    }
-  | SelectCoverImageFile(name, invalid) => {
-      ...state,
-      coverImageFilename: Some(name),
-      coverImageInvalid: invalid,
-      formDirty: true,
-    }
-  | BeginUpdate => {...state, updating: true}
-  | ErrorOccured => {...state, updating: false}
-  | DoneUpdating => initialState()
-  }
-
-@react.component
-let make = (~customizations, ~updateImagesCB, ~authenticityToken) => {
-  let (state, send) = React.useReducer(reducer, initialState())
-  let logoOnLightBg = customizations |> Customizations.logoOnLightBg
-  let coverImage = customizations |> Customizations.coverImage
-  let icon = customizations |> Customizations.icon
-
-  <form
-    className="mx-8 pt-8"
-    id=formId
-    key="sc-images-editor__form"
-    onSubmit={handleUpdateImages(send, updateImagesCB)}>
-    <input name="authenticity_token" type_="hidden" value=authenticityToken />
-    <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-      {"Manage Images" |> str}
-    </h5>
-    <DisablingCover disabled=state.updating>
-      <SchoolCustomize__ImageFileInput
-        id="sc-images-editor__logo-on-400-bg-input"
-        disabled=state.updating
-        name="logo_on_light_bg"
-        onChange={updateLogoOnLightBg(send)}
-        labelText="Logo on a light background"
-        imageName={logoOnLightBg |> OptionUtils.map(Customizations.filename)}
-        selectedImageName=state.logoOnLightBgFilename
-        errorState=state.logoOnLightBgInvalid
-      />
-      <SchoolCustomize__ImageFileInput
-        id="sc-images-editor__icon-input"
-        disabled=state.updating
-        name="icon"
-        onChange={updateIcon(send)}
-        labelText="Icon"
-        imageName=Some(icon |> Customizations.filename)
-        selectedImageName=state.iconFilename
-        errorState=state.iconInvalid
-      />
-      <SchoolCustomize__ImageFileInput
-        id="sc-images-editor__cover-image-input"
-        disabled=state.updating
-        name="cover_image"
-        onChange={updateCoverImage(send)}
-        labelText="Cover image"
-        imageName={coverImage |> OptionUtils.map(Customizations.filename)}
-        selectedImageName=state.coverImageFilename
-        errorState=state.coverImageInvalid
-      />
-      <div className="flex justify-end">
-        <button
-          type_="submit"
-          key="sc-images-editor__update-button"
-          disabled={updateButtonDisabled(state)}
-          className="btn btn-primary btn-large mt-6">
-          {updateButtonText(state.updating) |> str}
-        </button>
-      </div>
-    </DisablingCover>
-  </form>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__LinksEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__LinksEditor.res
deleted file mode 100644
index be8c087..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__LinksEditor.res
+++ /dev/null
@@ -1,349 +0,0 @@
-open SchoolCustomize__Types
-
-%raw(`require("./SchoolCustomize__LinksEditor.css")`)
-
-let str = ReasonReact.string
-
-type kind =
-  | HeaderLink
-  | FooterLink
-  | SocialLink
-
-type state = {
-  kind: kind,
-  title: string,
-  url: string,
-  titleInvalid: bool,
-  urlInvalid: bool,
-  formDirty: bool,
-  adding: bool,
-  deleting: list<Customizations.linkId>,
-}
-
-type action =
-  | UpdateKind(kind)
-  | UpdateTitle(string, bool)
-  | UpdateUrl(string, bool)
-  | DisableForm
-  | EnableForm
-  | ClearForm
-  | DisableDelete(Customizations.linkId)
-
-let handleKindChange = (send, kind, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  send(UpdateKind(kind))
-}
-
-let isTitleInvalid = title => title |> String.trim |> String.length == 0
-
-let handleTitleChange = (send, event) => {
-  let title = ReactEvent.Form.target(event)["value"]
-  send(UpdateTitle(title, isTitleInvalid(title)))
-}
-
-let handleUrlChange = (send, event) => {
-  let url = ReactEvent.Form.target(event)["value"]
-  send(UpdateUrl(url, url |> UrlUtils.isInvalid(false)))
-}
-
-module DestroySchoolLinkQuery = %graphql(`
-  mutation DestroySchoolLinkMutation($id: ID!) {
-    destroySchoolLink(id: $id) {
-      success
-    }
-  }
-  `)
-
-let handleDelete = (state, send, removeLinkCB, id, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  if state.deleting |> List.mem(id) {
-    ()
-  } else {
-    send(DisableDelete(id))
-
-    DestroySchoolLinkQuery.make(~id, ())
-    |> GraphqlQuery.sendQuery
-    |> Js.Promise.then_(_response => {
-      removeLinkCB(id)
-      Js.Promise.resolve()
-    })
-    |> ignore
-  }
-}
-
-let deleteIconClasses = deleting => deleting ? "fas fa-spinner fa-pulse" : "far fa-trash-alt"
-
-let showLinks = (state, send, removeLinkCB, kind, links) =>
-  switch links {
-  | list{} =>
-    <div
-      className="border border-gray-400 rounded italic text-gray-600 text-xs cursor-default mt-2 p-3">
-      {"There are no custom links here. Add some?" |> str}
-    </div>
-  | links =>
-    links
-    |> List.map(((id, title, url)) =>
-      <div
-        className="flex items-center justify-between bg-gray-100 text-xs text-gray-900 border rounded pl-3 mt-2"
-        key=id>
-        <div className="flex items-center">
-          {switch kind {
-          | HeaderLink
-          | FooterLink =>
-            [
-              <span key="link-editor-entry__title"> {title |> str} </span>,
-              <i key="link-editor-entry__icon" className="fas fa-link mx-2" />,
-              <code key="link-editor-entry__url"> {url |> str} </code>,
-            ] |> ReasonReact.array
-          | SocialLink => <code> {url |> str} </code>
-          }}
-        </div>
-        <button
-          title={"Delete " ++ url}
-          onClick={handleDelete(state, send, removeLinkCB, id)}
-          className="p-3">
-          <FaIcon classes={deleteIconClasses(state.deleting |> List.mem(id))} />
-        </button>
-      </div>
-    )
-    |> Array.of_list
-    |> ReasonReact.array
-  }
-
-let titleInputVisible = state =>
-  switch state.kind {
-  | HeaderLink
-  | FooterLink => true
-  | SocialLink => false
-  }
-
-let kindClasses = selected => {
-  let classes = "nav-tab-item border-t cursor-pointer w-1/3 appearance-none flex justify-center items-center w-full text-sm text-center text-gray-800 bg-white hover:bg-gray-200 hover:text-gray-900 py-3 px-4 font-semibold leading-tight focus:outline-none"
-  classes ++ (
-    selected
-      ? " nav-tab-item--selected text-primary-500 bg-white hover:bg-white hover:text-primary-500"
-      : " text-gray-600"
-  )
-}
-
-let addLinkText = adding => adding ? "Adding new link..." : "Add a New Link"
-
-let addLinkDisabled = state =>
-  if state.adding {
-    true
-  } else if state.formDirty {
-    switch state.kind {
-    | HeaderLink
-    | FooterLink =>
-      isTitleInvalid(state.title) || state.url |> UrlUtils.isInvalid(false)
-    | SocialLink => state.url |> UrlUtils.isInvalid(false)
-    }
-  } else {
-    true
-  }
-
-module CreateSchoolLinkQuery = %graphql(`
-  mutation CreateSchoolLinkMutation($kind: String!, $title: String, $url: String!) {
-    createSchoolLink(kind: $kind, title: $title, url: $url) @bsVariant {
-      schoolLink {
-        id
-      }
-      errors
-    }
-  }
-`)
-
-let displayNewLink = (state, addLinkCB, id) =>
-  switch state.kind {
-  | HeaderLink => Customizations.HeaderLink(id, state.title, state.url)
-  | FooterLink => Customizations.FooterLink(id, state.title, state.url)
-  | SocialLink => Customizations.SocialLink(id, state.url)
-  } |> addLinkCB
-
-module CreateLinkError = {
-  type t = [#InvalidUrl | #InvalidLengthTitle | #InvalidKind | #BlankTitle]
-
-  let notification = error =>
-    switch error {
-    | #InvalidUrl => (
-        "Invalid URL",
-        "It looks like the URL you've entered isn't valid. Please check, and try again.",
-      )
-    | #InvalidKind => ("InvalidKind", "")
-    | #InvalidLengthTitle => ("InvalidLengthTitle", "")
-    | #BlankTitle => ("BlankTitle", "")
-    }
-}
-
-module CreateLinkErrorHandler = GraphqlErrorHandler.Make(CreateLinkError)
-
-let handleAddLink = (state, send, addLinkCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-
-  if addLinkDisabled(state) {
-    ()
-  } else {
-    send(DisableForm)
-    switch state.kind {
-    | HeaderLink =>
-      CreateSchoolLinkQuery.make(~kind="header", ~title=state.title, ~url=state.url, ())
-    | FooterLink =>
-      CreateSchoolLinkQuery.make(~kind="footer", ~title=state.title, ~url=state.url, ())
-    | SocialLink => CreateSchoolLinkQuery.make(~kind="social", ~url=state.url, ())
-    }
-    |> GraphqlQuery.sendQuery
-    |> Js.Promise.then_(response =>
-      switch response["createSchoolLink"] {
-      | #SchoolLink(schoolLink) =>
-        schoolLink["id"] |> displayNewLink(state, addLinkCB)
-        send(ClearForm)
-        Notification.success("Done!", "A custom link has been added.")
-        Js.Promise.resolve()
-      | #Errors(errors) => Js.Promise.reject(CreateLinkErrorHandler.Errors(errors))
-      }
-    )
-    |> CreateLinkErrorHandler.catch(() => send(EnableForm))
-    |> ignore
-  }
-}
-
-let linksTitle = kind =>
-  switch kind {
-  | HeaderLink => "Current Header Links"
-  | FooterLink => "Current Sitemap Links"
-  | SocialLink => "Current Social Media Links"
-  } |> str
-
-let unpackLinks = (kind, customizations) =>
-  customizations
-  |> switch kind {
-  | HeaderLink => Customizations.headerLinks
-  | FooterLink => Customizations.footerLinks
-  | SocialLink => Customizations.socialLinks
-  }
-  |> Customizations.unpackLinks
-
-let initialState = kind => {
-  kind: kind,
-  title: "",
-  url: "",
-  titleInvalid: false,
-  urlInvalid: false,
-  formDirty: false,
-  adding: false,
-  deleting: list{},
-}
-let reducer = (state, action) =>
-  switch action {
-  | UpdateKind(kind) => {...state, kind: kind, formDirty: true}
-  | UpdateTitle(title, invalid) => {
-      ...state,
-      title: title,
-      titleInvalid: invalid,
-      formDirty: true,
-    }
-  | UpdateUrl(url, invalid) => {
-      ...state,
-      url: url,
-      urlInvalid: invalid,
-      formDirty: true,
-    }
-  | DisableForm => {...state, adding: true}
-  | EnableForm => {...state, adding: false}
-  | ClearForm => {...state, adding: false, title: "", url: ""}
-  | DisableDelete(linkId) => {
-      ...state,
-      deleting: list{linkId, ...state.deleting},
-    }
-  }
-
-@react.component
-let make = (~kind, ~customizations, ~addLinkCB, ~removeLinkCB) => {
-  let (state, send) = React.useReducer(reducer, initialState(kind))
-
-  <div className="mt-8 mx-8 pb-6">
-    <h5 className="uppercase text-center border-b border-gray-400 pb-2">
-      {"Manage custom links" |> str}
-    </h5>
-    <div className="mt-3">
-      <label className="inline-block tracking-wide text-xs font-semibold">
-        {"Location of Link" |> str}
-      </label>
-      <div className="flex bg-white border border-t-0 rounded-t mt-2">
-        <div
-          title="Show header links"
-          className={kindClasses(state.kind == HeaderLink)}
-          onClick={handleKindChange(send, HeaderLink)}>
-          {"Header" |> str}
-        </div>
-        <div
-          title="Show footer links"
-          className={kindClasses(state.kind == FooterLink) ++ " border-l"}
-          onClick={handleKindChange(send, FooterLink)}>
-          {"Footer Sitemap" |> str}
-        </div>
-        <div
-          title="Show social media links"
-          className={kindClasses(state.kind == SocialLink) ++ " border-l"}
-          onClick={handleKindChange(send, SocialLink)}>
-          {"Social" |> str}
-        </div>
-      </div>
-    </div>
-    <div className="p-5 border border-t-0 rounded-b">
-      <label className="inline-block tracking-wide text-xs font-semibold mt-4">
-        {linksTitle(state.kind)}
-      </label>
-      {showLinks(state, send, removeLinkCB, state.kind, unpackLinks(state.kind, customizations))}
-      <DisablingCover disabled=state.adding>
-        <div className="flex mt-3" key="sc-links-editor__form-body">
-          {if state |> titleInputVisible {
-            <div className="flex-grow mr-4">
-              <label
-                className="inline-block tracking-wide text-xs font-semibold" htmlFor="link-title">
-                {"Title" |> str}
-              </label>
-              <input
-                className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-                id="link-title"
-                type_="text"
-                placeholder="A short title for a new link"
-                onChange={handleTitleChange(send)}
-                value=state.title
-                maxLength=24
-              />
-              <School__InputGroupError message="can't be empty" active=state.titleInvalid />
-            </div>
-          } else {
-            ReasonReact.null
-          }}
-          <div className="flex-grow">
-            <label
-              className="inline-block tracking-wide text-xs font-semibold" htmlFor="link-full-url">
-              {"Full URL" |> str}
-            </label>
-            <input
-              className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-              id="link-full-url"
-              type_="text"
-              placeholder="Full URL, staring with https://"
-              onChange={handleUrlChange(send)}
-              value=state.url
-            />
-            <School__InputGroupError message="is not a valid URL" active=state.urlInvalid />
-          </div>
-        </div>
-        <div className="flex justify-end">
-          <button
-            key="sc-links-editor__form-button"
-            disabled={addLinkDisabled(state)}
-            onClick={handleAddLink(state, send, addLinkCB)}
-            className="btn btn-primary btn-large mt-6">
-            {state.adding |> addLinkText |> str}
-          </button>
-        </div>
-      </DisablingCover>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__MoreLinks.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__MoreLinks.res
deleted file mode 100644
index 19f8416..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__MoreLinks.res
+++ /dev/null
@@ -1,43 +0,0 @@
-let str = ReasonReact.string
-
-type state = bool
-
-let toggleState = (send, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  send()
-}
-
-let additionalLinks = (linksVisible, links) =>
-  if linksVisible {
-    <div className="border-2 border-gray-200 rounded-lg absolute w-48 bg-white mt-2">
-      {links
-      |> List.map(((id, title, _)) =>
-        <div key=id className="p-2 cursor-default"> <span> {title |> str} </span> </div>
-      )
-      |> Array.of_list
-      |> ReasonReact.array}
-    </div>
-  } else {
-    ReasonReact.null
-  }
-
-let initialState = () => false
-let reducer = (linksVisible, _action) => !linksVisible
-
-@react.component
-let make = (~links) => {
-  let (state, send) = React.useReducer(reducer, initialState())
-  switch links {
-  | list{} => ReasonReact.null
-  | moreLinks =>
-    <div
-      title="Show more links"
-      className="ml-6 font-semibold text-sm cursor-pointer relative"
-      onClick={toggleState(send)}
-      key="more-links">
-      <span> {"More" |> str} </span>
-      <i className="fas fa-angle-down ml-1" />
-      {additionalLinks(state, moreLinks)}
-    </div>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__Root.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__Root.res
deleted file mode 100644
index 7b6d9de..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__Root.res
+++ /dev/null
@@ -1,455 +0,0 @@
-open SchoolCustomize__Types
-
-%raw(`require("./SchoolCustomize__Root.css")`)
-
-let str = ReasonReact.string
-
-type editor =
-  | LinksEditor(SchoolCustomize__LinksEditor.kind)
-  | DetailsEditor
-  | ImagesEditor
-  | ContactsEditor
-  | AgreementsEditor(SchoolCustomize__AgreementsEditor.kind)
-
-type state = {
-  visibleEditor: option<editor>,
-  customizations: Customizations.t,
-  schoolName: string,
-  schoolAbout: option<string>,
-}
-
-type rec action =
-  | ShowEditor(editor)
-  | CloseEditor
-  | AddLink(Customizations.link)
-  | RemoveLink(Customizations.linkId)
-  | UpdateTermsOfUse(string)
-  | UpdatePrivacyPolicy(string)
-  | UpdateAddress(string)
-  | UpdateEmailAddress(string)
-  | UpdateSchoolDetails(name, about)
-  | UpdateImages(Js.Json.t)
-and name = string
-and about = option<string>
-
-let headerLogo = (schoolName, logoOnLightBg) =>
-  switch logoOnLightBg {
-  | Some(logo) =>
-    <div className="max-w-xs"> <img className="h-12" src={logo |> Customizations.url} /> </div>
-  | None => <span className="text-2xl font-bold"> {schoolName |> str} </span>
-  }
-
-let headerLink = ((id, title, _)) =>
-  <div className="ml-6 text-sm font-semibold cursor-default" key=id>
-    <span> {title |> str} </span>
-  </div>
-
-let headerLinks = links => {
-  let (visibleLinks, dropdownLinks) = switch links {
-  | list{l1, l2, l3, l4, l5, ...rest} => (list{l1, l2, l3}, list{l4, l5, ...rest})
-  | fourOrLessLinks => (fourOrLessLinks, list{})
-  }
-
-  switch visibleLinks {
-  | list{} =>
-    <div
-      className="border border-gray-400 rounded-lg italic text-gray-600 cursor-default text-sm py-2 px-4">
-      {"You can customize links on the header." |> str}
-    </div>
-  | visibleLinks =>
-    (visibleLinks |> List.map(l => headerLink(l)))
-      ->List.append(list{<SchoolCustomize__MoreLinks links=dropdownLinks key="more-links" />})
-    |> Array.of_list
-    |> ReasonReact.array
-  }
-}
-
-let sitemap = links =>
-  switch links {
-  | list{} =>
-    <div
-      className="border border-gray-500 rounded-lg italic text-gray-400 cursor-default text-sm max-w-fc mt-3 py-2 px-4">
-      {"You can customize links in the footer." |> str}
-    </div>
-  | links =>
-    <div className="flex flex-wrap">
-      {links
-      |> List.map(((id, title, _)) =>
-        <div className="w-1/3 pr-4 mt-3 text-xs font-semibold" key=id> {title |> str} </div>
-      )
-      |> Array.of_list
-      |> ReasonReact.array}
-    </div>
-  }
-
-let socialLinks = links =>
-  switch links {
-  | list{} =>
-    <div
-      className="border border-gray-500 rounded-lg italic text-gray-400 cursor-default text-sm max-w-fc mt-3 py-2 px-4">
-      {"Add social media links?" |> str}
-    </div>
-  | links =>
-    <div className="flex flex-wrap">
-      {links
-      |> List.map(((id, _title, url)) => <SchoolCustomize__SocialLink url key=id />)
-      |> Array.of_list
-      |> ReasonReact.array}
-    </div>
-  }
-
-let address = a =>
-  switch a {
-  | Some(a) =>
-    <div
-      className="text-xs font-semibold mt-3 leading-normal"
-      dangerouslySetInnerHTML={
-        "__html": a |> Markdown.parse(Markdown.Permissive),
-      }
-    />
-  | None =>
-    <div
-      className="border border-gray-500 rounded-lg italic text-gray-400 cursor-default text-sm max-w-fc mt-3 py-2 px-4">
-      {"Add an address?" |> str}
-    </div>
-  }
-
-let emailAddress = email =>
-  switch email {
-  | Some(email) =>
-    <div className="text-xs font-semibold mt-4">
-      {"React us at " |> str} <span className="font-bold"> {email |> str} </span>
-    </div>
-  | None =>
-    <div
-      className="border border-gray-500 rounded-lg italic text-gray-400 cursor-default text-sm max-w-fc mt-4 py-2 px-4">
-      {"Add a contact email?" |> str}
-    </div>
-  }
-
-let footerLogo = (schoolName, logoOnDarkBg) =>
-  switch logoOnDarkBg {
-  | Some(logo) => <img className="h-8" src={logo |> Customizations.url} />
-  | None => <span className="text-lg font-bold"> {schoolName |> str} </span>
-  }
-
-let editIcon = (additionalClasses, clickHandler, title) =>
-  <div
-    className={"cursor-pointer bg-primary-100 border border-primary-400 text-primary-500 hover:bg-primary-200 hover:border-primary-500 hover:text-primary-600 px-2 py-1 rounded flex items-center " ++
-    additionalClasses}
-    title
-    onClick=clickHandler>
-    <i className="fas fa-pencil-alt text-xs" />
-    <span className="text-xs font-semibold ml-2"> {"Edit" |> str} </span>
-  </div>
-
-let showEditor = (editor, send, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  send(ShowEditor(editor))
-}
-
-let editor = (state, send, authenticityToken) =>
-  switch state.visibleEditor {
-  | Some(editor) =>
-    <SchoolAdmin__EditorDrawer closeDrawerCB={() => send(CloseEditor)}>
-      {switch editor {
-      | LinksEditor(kind) =>
-        <SchoolCustomize__LinksEditor
-          key="sc-drawer__links-editor"
-          kind
-          customizations=state.customizations
-          addLinkCB={link => send(AddLink(link))}
-          removeLinkCB={linkId => send(RemoveLink(linkId))}
-        />
-      | AgreementsEditor(kind) =>
-        <SchoolCustomize__AgreementsEditor
-          key="sc-drawer__agreements-editor"
-          kind
-          customizations=state.customizations
-          updatePrivacyPolicyCB={agreement => send(UpdatePrivacyPolicy(agreement))}
-          updateTermsOfUseCB={agreement => send(UpdateTermsOfUse(agreement))}
-        />
-      | ContactsEditor =>
-        <SchoolCustomize__ContactsEditor
-          key="sc-drawer__contacts-editor"
-          customizations=state.customizations
-          updateAddressCB={address => send(UpdateAddress(address))}
-          updateEmailAddressCB={emailAddress => send(UpdateEmailAddress(emailAddress))}
-        />
-      | ImagesEditor =>
-        <SchoolCustomize__ImagesEditor
-          key="sc-drawer__images-editor"
-          customizations=state.customizations
-          updateImagesCB={json => send(UpdateImages(json))}
-          authenticityToken
-        />
-      | DetailsEditor =>
-        <SchoolCustomize__DetailsEditor
-          name=state.schoolName
-          about=state.schoolAbout
-          updateDetailsCB={(name, about) => send(UpdateSchoolDetails(name, about))}
-        />
-      }}
-    </SchoolAdmin__EditorDrawer>
-
-  | None => ReasonReact.null
-  }
-
-let initialState = (customizations, schoolName, schoolAbout) => {
-  visibleEditor: None,
-  customizations: customizations,
-  schoolName: schoolName,
-  schoolAbout: schoolAbout,
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | ShowEditor(editor) => {...state, visibleEditor: Some(editor)}
-  | CloseEditor => {...state, visibleEditor: None}
-  | AddLink(link) => {
-      ...state,
-      customizations: state.customizations |> Customizations.addLink(link),
-    }
-  | RemoveLink(linkId) => {
-      ...state,
-      customizations: state.customizations |> Customizations.removeLink(linkId),
-    }
-  | UpdatePrivacyPolicy(agreement) => {
-      ...state,
-      customizations: state.customizations |> Customizations.updatePrivacyPolicy(agreement),
-    }
-  | UpdateTermsOfUse(agreement) => {
-      ...state,
-      customizations: state.customizations |> Customizations.updateTermsOfUse(agreement),
-    }
-  | UpdateAddress(address) => {
-      ...state,
-      customizations: state.customizations |> Customizations.updateAddress(address),
-    }
-  | UpdateEmailAddress(emailAddress) => {
-      ...state,
-      customizations: state.customizations |> Customizations.updateEmailAddress(emailAddress),
-    }
-  | UpdateImages(json) => {
-      ...state,
-      customizations: state.customizations |> Customizations.updateImages(json),
-      visibleEditor: None,
-    }
-  | UpdateSchoolDetails(schoolName, schoolAbout) => {
-      ...state,
-      schoolName: schoolName,
-      schoolAbout: schoolAbout,
-      visibleEditor: None,
-    }
-  }
-
-let about = state =>
-  switch state.schoolAbout {
-  | Some(about) => about
-  | None => "Add more details about the school."
-  }
-
-@react.component
-let make = (~authenticityToken, ~customizations, ~schoolName, ~schoolAbout) => {
-  let (state, send) = React.useReducer(
-    reducer,
-    initialState(customizations, schoolName, schoolAbout),
-  )
-  <div>
-    <div className="px-6 py-6 w-full xl:max-w-6xl mx-auto">
-      <div className="font-bold"> {"Home Page" |> str} </div>
-      <div className="border rounded-t-lg px-5 py-4 flex justify-between mt-3">
-        <div className="flex items-center bg-gray-200 rounded p-2">
-          {headerLogo(schoolName, state.customizations |> Customizations.logoOnLightBg)}
-          {editIcon("ml-6", showEditor(ImagesEditor, send), "Edit logo (on light backgrounds)")}
-        </div>
-        <div className="flex items-center">
-          <div
-            className="school-customize__header-links flex items-center bg-gray-200 rounded px-3 py-2 h-full">
-            {headerLinks(
-              state.customizations |> Customizations.headerLinks |> Customizations.unpackLinks,
-            )}
-            {editIcon(
-              "ml-3",
-              showEditor(LinksEditor(SchoolCustomize__LinksEditor.HeaderLink), send),
-              "Edit header links",
-            )}
-          </div>
-        </div>
-      </div>
-      <div className="relative bg-gray-300">
-        <div className="absolute right-0 z-10 pt-3 pr-3">
-          <button
-            className="flex items-center text-xs bg-primary-100 text-primary-500 border border-primary-400 hover:bg-primary-200 hover:border-primary-500 hover:text-primary-600 px-2 py-1 cursor-pointer rounded"
-            onClick={showEditor(ImagesEditor, send)}>
-            <i className="fas fa-pencil-alt" />
-            <span className="font-semibold ml-2"> {"Change cover" |> str} </span>
-          </button>
-        </div>
-        <div className="relative pb-1/2 md:pb-1/4 rounded-b-lg overflow-hidden">
-          {switch state.customizations |> Customizations.coverImage {
-          | Some(image) =>
-            <img
-              className="absolute h-full w-full object-cover" src={image |> Customizations.url}
-            />
-          | None =>
-            <div
-              className="school-customize__cover-default absolute h-full w-full svg-bg-pattern-6"
-            />
-          }}
-        </div>
-      </div>
-      <div className="max-w-3xl relative mx-auto bg-primary-900 shadow-xl rounded-lg -mt-7">
-        <div
-          className="relative mx-auto flex flex-col justify-center items-center text-white p-10 text-center">
-          <p> {"Hello, welcome to" |> str} </p>
-          <div onClick={showEditor(DetailsEditor, send)}>
-            <h1
-              className="flex items-center border border-dashed border-gray-800 hover:border-primary-300 hover:text-primary-200 cursor-text rounded px-2 py-1 text-3xl mt-1">
-              <span> {state.schoolName |> str} </span>
-              <button
-                className="flex items-center text-xs bg-primary-100 text-primary-500 border border-primary-400 hover:bg-primary-200 hover:border-primary-500 hover:text-primary-600 p-1 ml-1 cursor-pointer rounded"
-                onClick={showEditor(DetailsEditor, send)}>
-                <i className="fas fa-pencil-alt" />
-              </button>
-            </h1>
-          </div>
-          <div
-            ariaLabel="Edit school details"
-            onClick={showEditor(DetailsEditor, send)}
-            className="w-full max-w-2xl mt-2 relative flex items-center justify-center border border-dashed border-gray-800 rounded px-8 py-5 hover:border-primary-300 hover:text-primary-200 cursor-text">
-            <div className="absolute right-0 top-0 z-10 pt-2 pr-2">
-              <button
-                className="flex items-center text-xs bg-primary-100 text-primary-500 border border-primary-400 hover:bg-primary-200 hover:border-primary-500 hover:text-primary-600 p-1 cursor-pointer rounded">
-                <i className="fas fa-pencil-alt" />
-              </button>
-            </div>
-            <div className="text-sm">
-              <MarkdownBlock profile=Markdown.AreaOfText markdown={about(state)} />
-            </div>
-          </div>
-        </div>
-      </div>
-      <div className="mx-auto text-center pt-8 mt-8">
-        <h2 className="school-customize__featured-courses-header relative text-2xl font-bold">
-          {"Featured Courses" |> str}
-        </h2>
-        <div className="text-sm"> {"Featured courses will be listed here" |> str} </div>
-        <div className="max-w-2xl bg-gray-100 rounded-lg mx-auto p-3 mt-4">
-          <div className="school-customize__featured-courses-empty-placeholder" />
-        </div>
-      </div>
-      <div className="mt-8 w-full">
-        <div className="school-customize__footer-top-container rounded-t-lg p-6 flex">
-          <div className="w-2/5">
-            <div
-              className="p-3 bg-gray-300 border border-dashed border-gray-500 rounded h-full mr-2">
-              <div className="flex items-center">
-                <span className="uppercase font-bold text-sm"> {"Sitemap" |> str} </span>
-                {editIcon(
-                  "ml-3",
-                  showEditor(LinksEditor(SchoolCustomize__LinksEditor.FooterLink), send),
-                  "Edit footer links",
-                )}
-              </div>
-              {sitemap(
-                state.customizations |> Customizations.footerLinks |> Customizations.unpackLinks,
-              )}
-            </div>
-          </div>
-          <div className="w-3/5">
-            <div className="flex">
-              <div className="w-3/5">
-                <div
-                  className="p-3 bg-gray-300 border border-dashed border-gray-500 rounded h-full mr-2">
-                  <div className="flex items-center">
-                    <span className="uppercase font-bold text-sm"> {"Social" |> str} </span>
-                    {editIcon(
-                      "ml-3",
-                      showEditor(LinksEditor(SchoolCustomize__LinksEditor.SocialLink), send),
-                      "Edit social media links",
-                    )}
-                  </div>
-                  {socialLinks(
-                    state.customizations
-                    |> Customizations.socialLinks
-                    |> Customizations.unpackLinks,
-                  )}
-                </div>
-              </div>
-              <div className="w-2/5">
-                <div
-                  className="p-3 bg-gray-300 border border-dashed border-gray-500 rounded h-full">
-                  <div className="flex items-center">
-                    <span className="uppercase font-bold text-sm"> {"Contact" |> str} </span>
-                    {editIcon("ml-3", showEditor(ContactsEditor, send), "Edit contact details")}
-                  </div>
-                  {address(state.customizations |> Customizations.address)}
-                  {emailAddress(state.customizations |> Customizations.emailAddress)}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          className="school-customize__footer-bottom-container rounded-b-lg p-6 flex justify-between">
-          <div
-            className="flex items-center bg-gray-300 border border-dashed border-gray-500 rounded p-2">
-            {footerLogo(schoolName, state.customizations |> Customizations.logoOnLightBg)}
-            {editIcon("ml-3", showEditor(ImagesEditor, send), "Edit logo (on dark backgrounds)")}
-          </div>
-          <div className="flex items-center text-sm">
-            <div
-              className="flex items-center bg-gray-300 border border-dashed border-gray-500 rounded p-2 text-xs">
-              <div> {"Privacy Policy" |> str} </div>
-              {editIcon(
-                "ml-3",
-                showEditor(AgreementsEditor(SchoolCustomize__AgreementsEditor.PrivacyPolicy), send),
-                "Edit privacy policy",
-              )}
-            </div>
-            <div
-              className="flex items-center bg-gray-300 border border-dashed border-gray-500 rounded p-2 ml-6 text-xs">
-              <div> {"Terms of Use" |> str} </div>
-              {editIcon(
-                "ml-3",
-                showEditor(AgreementsEditor(SchoolCustomize__AgreementsEditor.TermsOfUse), send),
-                "Edit terms of use",
-              )}
-            </div>
-            <div className="ml-6 flex items-center text-xs text-gray-600">
-              <i className="far fa-copyright" />
-              <span className="ml-1">
-                {(Js.Date.make() |> Js.Date.getFullYear |> int_of_float |> string_of_int) ++
-                  (" " ++
-                  schoolName) |> str}
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div className="mt-6 font-bold"> {"Icon" |> str} </div>
-      <div className="mt-3 w-2/4 max-w-sm">
-        <div className="bg-gray-400 rounded-t-lg h-12 flex items-end">
-          <div className="w-full flex items-center pr-3">
-            <div className="h-3 w-3 rounded-full bg-gray-500 ml-4" />
-            <div className="h-3 w-3 rounded-full bg-gray-500 ml-2" />
-            <div className="h-3 w-3 rounded-full bg-gray-500 ml-2" />
-            <div className="p-3 ml-4 bg-gray-100 rounded-t-lg flex items-center">
-              <img
-                src={state.customizations |> Customizations.icon |> Customizations.url}
-                className="h-5 w-5"
-              />
-              <span className="ml-1 text-xs font-semibold max-w-xs truncate">
-                {schoolName |> str}
-              </span>
-            </div>
-            {editIcon("ml-2", showEditor(ImagesEditor, send), "Edit icon")}
-          </div>
-        </div>
-        <div className="bg-gray-100 border border-t-0 h-16 rounded-b-lg" />
-      </div>
-    </div>
-    {editor(state, send, authenticityToken)}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__SocialLink.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__SocialLink.res
deleted file mode 100644
index e95aa3d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__SocialLink.res
+++ /dev/null
@@ -1,25 +0,0 @@
-let test = (value, url) => {
-  let tester = Js.Re.fromString(value)
-  url |> Js.Re.test_(tester)
-}
-
-let iconClass = url =>
-  switch url {
-  | url if url |> test("twitter") => "fab fa-twitter"
-  | url if url |> test("facebook") => "fab fa-facebook-f"
-  | url if url |> test("instagram") => "fab fa-instagram"
-  | url if url |> test("youtube") => "fab fa-youtube"
-  | url if url |> test("linkedin") => "fab fa-linkedin"
-  | url if url |> test("snapchat") => "fab fa-snapchat"
-  | url if url |> test("tumblr") => "fab fa-tumblr"
-  | url if url |> test("pinterest") => "fab fa-pinterest"
-  | url if url |> test("reddit") => "fab fa-reddit"
-  | url if url |> test("flickr") => "fab fa-flickr"
-  | _unknownUrl => "fas fa-users"
-  }
-
-@react.component
-let make = (~url) =>
-  <div className="h-8 w-8 mr-2 mt-2 flex items-center justify-center">
-    <i className={"text-xl " ++ iconClass(url)} />
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__Types.res
deleted file mode 100644
index 5086599..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__Types.res
+++ /dev/null
@@ -1 +0,0 @@
-module Customizations = SchoolCustomize__Customizations
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__UpdateSchoolStringError.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__UpdateSchoolStringError.res
deleted file mode 100644
index 998d158..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/SchoolCustomize__UpdateSchoolStringError.res
+++ /dev/null
@@ -1,8 +0,0 @@
-type t = [#InvalidKey | #InvalidLengthValue | #InvalidValue]
-
-let notification = error =>
-  switch error {
-  | #InvalidKey => ("InvalidKey", "")
-  | #InvalidValue => ("InvalidValue", "")
-  | #InvalidLengthValue => ("InvalidLengthValue", "")
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/School__InputGroupError.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/School__InputGroupError.res
deleted file mode 100644
index 084f759..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/School__InputGroupError.res
+++ /dev/null
@@ -1,13 +0,0 @@
-let str = React.string
-
-@react.component
-let make = (~message, ~active) =>
-  if active {
-    <div
-      className="mt-1 px-1 py-px rounded text-xs font-semibold text-red-600 bg-red-100 inline-flex items-center">
-      <span className="mr-2"> <i className="fas fa-exclamation-triangle" /> </span>
-      <span> {message |> str} </span>
-    </div>
-  } else {
-    ReasonReact.null
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/School__SelectBox.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/School__SelectBox.res
deleted file mode 100644
index 1a52201..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/School__SelectBox.res
+++ /dev/null
@@ -1,98 +0,0 @@
-let str = React.string
-
-type key = string
-type value = string
-type selected = bool
-type item = (key, value, selected)
-
-let convertOldItems = items =>
-  items |> List.map(((key, value, selected)) => (key |> string_of_int, value, selected))
-
-let convertOldCallback = (cb, key, value, selected) => cb(key |> int_of_string, value, selected)
-
-@react.component
-let make = (
-  ~items: list<item>,
-  ~selectCB: (key, value, selected) => unit,
-  ~noSelectionHeading="None Selected",
-  ~noSelectionDescription="Select from the following list.",
-  ~emptyListDescription="There are no items to select.",
-) => {
-  let (searchString, setSearchString) = React.useState(() => "")
-  let selectedList = items |> List.filter(((_, _, selected)) => selected == true)
-  let nonSelectedList = items |> List.filter(((_, _, selected)) => selected == false)
-  let filteredList = switch nonSelectedList {
-  | list{} => list{}
-  | someList =>
-    someList |> List.filter(((_, value, _)) =>
-      Js.String.includes(String.lowercase_ascii(searchString), String.lowercase_ascii(value))
-    )
-  }
-
-  <div className="p-6 border rounded bg-gray-100">
-    {selectedList |> List.length > 0
-      ? selectedList
-        |> List.rev
-        |> List.map(((key, value, _)) =>
-          <div
-            key
-            className="select-list__item-selected flex items-center justify-between bg-white font-semibold text-xs border rounded mb-2">
-            <div className="p-3 flex-1"> {value |> str} </div>
-            <button
-              className="flex p-3 text-gray-800 hover:bg-gray-200 hover:text-gray-900 focus:outline-none"
-              title="Remove"
-              onClick={_event => {
-                ReactEvent.Mouse.preventDefault(_event)
-                setSearchString(_ => "")
-                selectCB(key, value, false)
-              }}>
-              <i className="fas fa-trash-alt text-base" />
-            </button>
-          </div>
-        )
-        |> Array.of_list
-        |> React.array
-      : <div
-          className="flex flex-col items-center justify-center bg-gray-100 text-gray-800 rounded px-3 pt-3 ">
-          <i className="fas fa-inbox text-3xl" />
-          <h5 className="mt-1 font-semibold"> {noSelectionHeading |> str} </h5>
-          <span className="text-xs">
-            {(items |> ListUtils.isEmpty ? emptyListDescription : noSelectionDescription) |> str}
-          </span>
-        </div>}
-    {nonSelectedList |> List.length > 0
-      ? <div className="flex relative pt-4">
-          <div className="select-list__group text-sm bg-white rounded shadow pb-2 w-full">
-            {nonSelectedList |> List.length > 3
-              ? <div className="px-3 pt-3 pb-2">
-                  <input
-                    className="appearance-none bg-transparent border-b w-full text-gray-700 pb-3 px-2 pl-0 leading-normal focus:outline-none"
-                    type_="text"
-                    placeholder="Type to Search"
-                    onChange={event => setSearchString(ReactEvent.Form.target(event)["value"])}
-                  />
-                </div>
-              : React.null}
-            <div className={nonSelectedList |> List.length > 3 ? "h-28 overflow-y-scroll" : ""}>
-              {filteredList
-              |> List.map(((key, value, _)) =>
-                <div
-                  key
-                  onClick={_event => {
-                    ReactEvent.Mouse.preventDefault(_event)
-                    setSearchString(_ => "")
-                    selectCB(key, value, true)
-                  }}
-                  title={"Select " ++ value}
-                  className="px-3 py-2 font-semibold hover:bg-primary-100 hover:text-primary-500 cursor-pointer">
-                  {value |> str}
-                </div>
-              )
-              |> Array.of_list
-              |> React.array}
-            </div>
-          </div>
-        </div>
-      : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__ActionsForm.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__ActionsForm.res
deleted file mode 100644
index 66a1df1..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__ActionsForm.res
+++ /dev/null
@@ -1,49 +0,0 @@
-open StudentsEditor__Types
-
-module DropoutStudentQuery = %graphql(`
-   mutation DropoutStudentMutation($id: ID!) {
-    dropoutStudent(id: $id){
-      success
-     }
-   }
- `)
-
-let dropoutStudent = (id, setSaving, reloadTeamsCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  setSaving(_ => true)
-
-  DropoutStudentQuery.make(~id, ())
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["dropoutStudent"]["success"] ? reloadTeamsCB() : setSaving(_ => false)
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let str = ReasonReact.string
-
-let submitButtonIcons = saving => saving ? "fas fa-spinner fa-spin" : "fa fa-exclamation-triangle"
-
-@react.component
-let make = (~student, ~reloadTeamsCB) => {
-  let (saving, setSaving) = React.useState(() => false)
-
-  <div className="mt-5">
-    <label className="tracking-wide text-xs font-semibold" htmlFor="access-ends-at-input">
-      {"Has this student dropped out?" |> str}
-    </label>
-    <HelpIcon className="ml-2" link="https://docs.pupilfirst.com/#/students?id=student-actions">
-      {"Marking a student as dropped out will remove all of their access to the course." |> str}
-    </HelpIcon>
-    <div className="mt-2">
-      <button
-        disabled=saving
-        className="btn btn-danger btn-large"
-        onClick={dropoutStudent(student |> Student.id, setSaving, reloadTeamsCB)}>
-        <FaIcon classes={submitButtonIcons(saving)} />
-        <span className="ml-2"> {"Dropout Student" |> str} </span>
-      </button>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Coach.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Coach.res
deleted file mode 100644
index 3f7dbf0..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Coach.res
+++ /dev/null
@@ -1,15 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-}
-
-let name = t => t.name
-let id = t => t.id
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Coach.resi b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Coach.resi
deleted file mode 100644
index e1fab3a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Coach.resi
+++ /dev/null
@@ -1,7 +0,0 @@
-type t
-
-let decode: Js.Json.t => t
-
-let id: t => string
-
-let name: t => string
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__CreateForm.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__CreateForm.res
deleted file mode 100644
index e16f94b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__CreateForm.res
+++ /dev/null
@@ -1,237 +0,0 @@
-open StudentsEditor__Types
-
-type state = {
-  studentsToAdd: array<StudentInfo.t>,
-  saving: bool,
-}
-
-type action =
-  | AddStudentInfo(StudentInfo.t)
-  | RemoveStudentInfo(StudentInfo.t)
-  | SetSaving(bool)
-
-let str = React.string
-
-let formInvalid = state => state.studentsToAdd |> ArrayUtils.isEmpty
-let handleErrorCB = (send, ()) => send(SetSaving(false))
-
-/* Get the tags applied to a list of students. */
-let appliedTags = students =>
-  students
-  |> Array.map(student => student |> StudentInfo.tags |> Array.to_list)
-  |> Array.to_list
-  |> List.flatten
-  |> ListUtils.distinct
-  |> Array.of_list
-
-/*
- * This is a union of tags reported by the parent component, and tags currently applied to students listed in the form. This allows the
- * form to suggest tags that haven't yet been persisted, but have been applied to at least one of the students in the list.
- */
-let allKnownTags = (incomingTags, appliedTags) =>
-  incomingTags |> Array.append(appliedTags) |> ArrayUtils.distinct
-
-let handleResponseCB = (submitCB, state, json) => {
-  let (studentsAdded, studentsRequested) = json |> {
-    open Json.Decode
-    field("studentCount", pair(int, int))
-  }
-  let tags = state.studentsToAdd |> appliedTags
-
-  submitCB(tags)
-
-  if studentsAdded == studentsRequested {
-    Notification.success("Success", "All students were created successfully.")
-  } else {
-    let message =
-      (studentsAdded |> string_of_int) ++
-        (" of " ++
-        ((studentsRequested |> string_of_int) ++ " students were added. Remaining students are already a part of the course."))
-    Notification.notice("Partially successful", message)
-  }
-}
-
-let saveStudents = (state, send, courseId, responseCB, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  send(SetSaving(true))
-  let payload = Js.Dict.empty()
-  Js.Dict.set(payload, "authenticity_token", AuthenticityToken.fromHead() |> Js.Json.string)
-  Js.Dict.set(
-    payload,
-    "students",
-    state.studentsToAdd |> {
-      open Json.Encode
-      array(StudentInfo.encode)
-    },
-  )
-
-  let url = "/school/courses/" ++ (courseId ++ "/students")
-  Api.create(url, payload, responseCB, handleErrorCB(send))
-}
-
-let teamHeader = (teamName, studentsCount) =>
-  <div className="flex justify-between mb-1">
-    <span className="text-tiny font-semibold">
-      {teamName |> OptionUtils.mapWithDefault(
-        teamName => <span> {"TEAM: " ++ teamName |> str} </span>,
-        React.null,
-      )}
-    </span>
-    {studentsCount > 1
-      ? React.null
-      : <span className="text-tiny">
-          <i className="fas fa-exclamation-triangle text-orange-600 mr-1" />
-          {"Add more team members!" |> str}
-        </span>}
-  </div>
-
-let renderTitleAndAffiliation = (title, affiliation) => {
-  let text = switch (title == "", affiliation == "") {
-  | (true, true) => None
-  | (true, false) => Some(affiliation)
-  | (false, true) => Some(title)
-  | (false, false) => Some(title ++ (", " ++ affiliation))
-  }
-
-  switch text {
-  | Some(text) =>
-    <div className="flex items-center">
-      <div className="mr-1 text-xs text-gray-600"> {text |> str} </div>
-    </div>
-  | None => React.null
-  }
-}
-
-let initialState = () => {studentsToAdd: [], saving: false}
-
-let reducer = (state, action) =>
-  switch action {
-  | AddStudentInfo(studentInfo) => {
-      ...state,
-      studentsToAdd: state.studentsToAdd |> Array.append([studentInfo]),
-    }
-  | RemoveStudentInfo(studentInfo) => {
-      ...state,
-      studentsToAdd: state.studentsToAdd |> Js.Array.filter(s =>
-        StudentInfo.email(s) !== StudentInfo.email(studentInfo)
-      ),
-    }
-  | SetSaving(saving) => {...state, saving: saving}
-  }
-
-let studentCard = (studentInfo, send) =>
-  <div key={studentInfo |> StudentInfo.email} className="flex justify-between">
-    <div className="flex flex-col flex-1 flex-wrap p-3">
-      <div className="flex items-center">
-        <div className="mr-1 font-semibold"> {studentInfo |> StudentInfo.name |> str} </div>
-        <div className="text-xs text-gray-600">
-          {" (" ++ ((studentInfo |> StudentInfo.email) ++ ")") |> str}
-        </div>
-      </div>
-      {renderTitleAndAffiliation(
-        studentInfo |> StudentInfo.title,
-        studentInfo |> StudentInfo.affiliation,
-      )}
-      <div className="flex flex-wrap">
-        {studentInfo
-        |> StudentInfo.tags
-        |> Array.map(tag =>
-          <div
-            key=tag
-            className="flex items-center bg-gray-200 border border-gray-500 rounded-lg px-2 py-px mt-1 mr-1 text-xs text-gray-900 overflow-hidden">
-            {tag |> str}
-          </div>
-        )
-        |> React.array}
-      </div>
-    </div>
-    <button
-      className="p-3 text-gray-700 hover:text-gray-900 hover:bg-gray-100"
-      onClick={_event => send(RemoveStudentInfo(studentInfo))}>
-      <i className="fas fa-trash-alt" />
-    </button>
-  </div>
-
-let teamNames = studentsToAdd =>
-  studentsToAdd
-  |> Array.map(student => student |> StudentInfo.teamName)
-  |> Js.Array.filter(teamName => teamName |> OptionUtils.mapWithDefault(_ => true, false))
-  |> ArrayUtils.distinct
-
-let findStudentsInTeam = (teamName, studentsToAdd) =>
-  studentsToAdd |> Js.Array.filter(s => s |> StudentInfo.teamName == teamName)
-
-let loneStudents = (studentsToAdd, send) => {
-  let students =
-    studentsToAdd |> Js.Array.filter(s =>
-      s |> StudentInfo.teamName |> OptionUtils.mapWithDefault(_ => false, true)
-    )
-  students |> ArrayUtils.isNotEmpty
-    ? <div>
-        {students
-        |> Array.map(studentInfo =>
-          <div className="bg-white-100 border shadow rounded-lg mt-2 px-2">
-            {studentCard(studentInfo, send)}
-          </div>
-        )
-        |> React.array}
-      </div>
-    : React.null
-}
-
-@react.component
-let make = (~courseId, ~submitFormCB, ~studentTags) => {
-  let (state, send) = React.useReducer(reducer, initialState())
-
-  <div className="mx-auto bg-white">
-    <div className="max-w-2xl p-6 mx-auto">
-      <h5 className="uppercase text-center border-b border-gray-400 pb-2 mb-4">
-        {"Student Details" |> str}
-      </h5>
-      <StudentsEditor__StudentInfoForm
-        addToListCB={studentInfo => send(AddStudentInfo(studentInfo))}
-        studentTags={allKnownTags(studentTags, state.studentsToAdd |> appliedTags)}
-        emailsToAdd={state.studentsToAdd |> Array.map(student => student |> StudentInfo.email)}
-      />
-      <div>
-        <div className="mt-5">
-          <div className="inline-block tracking-wide text-xs font-semibold">
-            {"These new students will be added to the course:" |> str}
-          </div>
-          {switch state.studentsToAdd {
-          | [] =>
-            <div
-              className="flex items-center justify-between bg-gray-100 border rounded p-3 italic mt-2">
-              {"This list is empty! Add some students using the form above." |> str}
-            </div>
-          | studentInfos =>
-            teamNames(studentInfos)
-            |> Array.map(teamName => {
-              let studentsInTeam = findStudentsInTeam(teamName, studentInfos)
-              <div className="mt-3">
-                {teamHeader(teamName, studentsInTeam |> Array.length)}
-                <div className="bg-white-100 border shadow rounded-lg">
-                  {studentsInTeam
-                  |> Array.map(studentInfo => studentCard(studentInfo, send))
-                  |> React.array}
-                </div>
-              </div>
-            })
-            |> Array.append([loneStudents(studentInfos, send)])
-            |> React.array
-          }}
-        </div>
-      </div>
-      <div className="flex mt-4">
-        <button
-          disabled={state.saving || state.studentsToAdd |> ArrayUtils.isEmpty}
-          onClick={saveStudents(state, send, courseId, handleResponseCB(submitFormCB, state))}
-          className={"w-full btn btn-primary btn-large mt-3" ++ (
-            formInvalid(state) ? " disabled" : ""
-          )}>
-          {(state.saving ? "Saving..." : "Save List") |> str}
-        </button>
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Filter.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Filter.res
deleted file mode 100644
index bde45b7..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Filter.res
+++ /dev/null
@@ -1,79 +0,0 @@
-type sortBy =
-  | Name
-  | CreatedAt
-  | UpdatedAt
-
-type t = {
-  searchString: option<string>,
-  tags: array<string>,
-  levelId: option<string>,
-  sortBy: sortBy,
-}
-
-let searchString = t => t.searchString
-
-let tags = t => t.tags
-
-let levelId = t => t.levelId
-
-let sortBy = t => t.sortBy
-
-let empty = () => {
-  searchString: None,
-  tags: [],
-  levelId: None,
-  sortBy: Name,
-}
-
-let addTag = (tag, t) => {...t, tags: t.tags |> Array.append([tag])}
-
-let changeLevelId = (levelId, t) => {...t, levelId: levelId}
-
-let changeSearchString = (searchString, t) => {...t, searchString: searchString}
-
-let removeTag = (tag, t) => {
-  ...t,
-  tags: t.tags |> Js.Array.filter(ts => ts != tag),
-}
-
-let removeLevelId = t => {...t, levelId: None}
-
-let removeSearchString = t => {...t, searchString: None}
-
-let updateSortBy = (sortBy, t) => {...t, sortBy: sortBy}
-
-let sortByToString = t =>
-  switch t.sortBy {
-  | Name => "name"
-  | CreatedAt => "created_at"
-  | UpdatedAt => "updated_at"
-  }
-
-let dropdownOptionsForSortBy = t =>
-  switch t.sortBy {
-  | Name => [CreatedAt, UpdatedAt]
-  | CreatedAt => [Name, UpdatedAt]
-  | UpdatedAt => [Name, CreatedAt]
-  }
-
-let sortByTitle = sortBy =>
-  switch sortBy {
-  | Name => "Name"
-  | CreatedAt => "Last Created"
-  | UpdatedAt => "Last Updated"
-  }
-
-let sortByIcon = sortBy =>
-  switch sortBy {
-  | Name => "if i-sort-alpha-down-solid text-sm if-fw text-gray-700"
-  | CreatedAt => "if i-clock-regular text-sm if-fw text-gray-700"
-  | UpdatedAt => "if i-user-check-regular text-sm if-fw text-gray-700"
-  }
-
-let isEmpty = t =>
-  switch (t.searchString, t.levelId, t.tags |> ArrayUtils.isEmpty) {
-  | (None, None, true) => true
-  | (_, _, _) => false
-  }
-
-let clear = t => {...t, searchString: None, levelId: None, tags: []}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Level.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Level.res
deleted file mode 100644
index b42bbc3..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Level.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type t = {
-  name: string,
-  number: int,
-  id: string,
-}
-
-let name = t => t.name
-
-let number = t => t.number
-
-let id = t => t.id
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    number: json |> field("number", int),
-  }
-}
-
-let unsafeFind = (levels, componentName, levelId) =>
-  levels |> ArrayUtils.unsafeFind(
-    l => l.id == levelId,
-    "Unable to find level with id: " ++ (levelId ++ ("in StudentdEditor__" ++ componentName)),
-  )
-
-let title = t => "Level " ++ ((t.number |> string_of_int) ++ (": " ++ t.name))
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Level.resi b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Level.resi
deleted file mode 100644
index 2a46e9b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Level.resi
+++ /dev/null
@@ -1,13 +0,0 @@
-type t
-
-let name: t => string
-
-let number: t => int
-
-let id: t => string
-
-let decode: Js.Json.t => t
-
-let title: t => string
-
-let unsafeFind: (array<t>, string, string) => t
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Page.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Page.res
deleted file mode 100644
index 336a43e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Page.res
+++ /dev/null
@@ -1,20 +0,0 @@
-type rec t =
-  | Unloaded
-  | PartiallyLoaded(array<StudentsEditor__Team.t>, cursor)
-  | FullyLoaded(array<StudentsEditor__Team.t>)
-and cursor = string
-
-let updateTeam = (team, t) =>
-  switch t {
-  | Unloaded => Unloaded
-  | PartiallyLoaded(teams, cursor) =>
-    PartiallyLoaded(teams |> StudentsEditor__Team.replaceTeam(team), cursor)
-  | FullyLoaded(teams) => FullyLoaded(teams |> StudentsEditor__Team.replaceTeam(team))
-  }
-
-let teams = t =>
-  switch t {
-  | Unloaded => []
-  | PartiallyLoaded(teams, _cursor) => teams
-  | FullyLoaded(teams) => teams
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Root.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Root.res
deleted file mode 100644
index 7a6e7a1..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Root.res
+++ /dev/null
@@ -1,328 +0,0 @@
-open StudentsEditor__Types
-
-let str = React.string
-
-type teamId = string
-
-type tags = array<string>
-
-type formVisible =
-  | None
-  | CreateForm
-  | UpdateForm(Student.t, teamId)
-
-type state = {
-  pagedTeams: Page.t,
-  filter: Filter.t,
-  selectedStudents: array<SelectedStudent.t>,
-  formVisible: formVisible,
-  tags: tags,
-  loading: Loading.t,
-  refreshTeams: bool,
-}
-
-type action =
-  | SelectStudent(SelectedStudent.t)
-  | DeselectStudent(string)
-  | UpdateFormVisible(formVisible)
-  | UpdateTeams(Page.t)
-  | UpdateFilter(Filter.t)
-  | RefreshData(tags)
-  | UpdateTeam(Team.t, tags)
-  | SetLoading(Loading.t)
-
-let handleTeamUpResponse = (send, _json) => {
-  send(RefreshData([]))
-  Notification.success("Success!", "Teams updated successfully")
-}
-
-let handleErrorCB = () => ()
-
-let addTags = (oldtags, newTags) =>
-  oldtags |> Array.append(newTags) |> ArrayUtils.sort_uniq(String.compare)
-
-let teamUp = (selectedStudents, responseCB) => {
-  let studentIds = selectedStudents |> Array.map(s => s |> SelectedStudent.id)
-  let payload = Js.Dict.empty()
-  Js.Dict.set(payload, "authenticity_token", AuthenticityToken.fromHead() |> Js.Json.string)
-  Js.Dict.set(
-    payload,
-    "founder_ids",
-    studentIds |> {
-      open Json.Encode
-      array(string)
-    },
-  )
-  let url = "/school/students/team_up"
-  Api.create(url, payload, responseCB, handleErrorCB)
-}
-
-let initialState = tags => {
-  pagedTeams: Unloaded,
-  selectedStudents: [],
-  filter: Filter.empty(),
-  formVisible: None,
-  tags: tags,
-  loading: Loading.NotLoading,
-  refreshTeams: false,
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | SelectStudent(selectedStudent) => {
-      ...state,
-      selectedStudents: state.selectedStudents |> Array.append([selectedStudent]),
-    }
-
-  | DeselectStudent(id) => {
-      ...state,
-      selectedStudents: state.selectedStudents |> Js.Array.filter(s =>
-        s |> SelectedStudent.id != id
-      ),
-    }
-
-  | UpdateFormVisible(formVisible) => {...state, formVisible: formVisible}
-  | UpdateTeams(pagedTeams) => {
-      ...state,
-      pagedTeams: pagedTeams,
-      loading: Loading.NotLoading,
-    }
-  | UpdateFilter(filter) => {
-      ...state,
-      filter: filter,
-      refreshTeams: !state.refreshTeams,
-    }
-  | RefreshData(tags) => {
-      ...state,
-      refreshTeams: !state.refreshTeams,
-      tags: addTags(state.tags, tags),
-      formVisible: None,
-      selectedStudents: [],
-    }
-  | UpdateTeam(team, tags) => {
-      ...state,
-      pagedTeams: state.pagedTeams |> Page.updateTeam(team),
-      tags: addTags(state.tags, tags),
-      formVisible: None,
-      selectedStudents: [],
-    }
-  | SetLoading(loading) => {...state, loading: loading}
-  }
-
-let selectStudent = (send, student, team) => {
-  let selectedStudent = SelectedStudent.make(
-    ~name=student |> Student.name,
-    ~id=student |> Student.id,
-    ~teamId=team |> Team.id,
-    ~avatarUrl=student.avatarUrl,
-    ~levelId=team |> Team.levelId,
-    ~teamSize=team |> Team.students |> Array.length,
-  )
-
-  send(SelectStudent(selectedStudent))
-}
-
-let deselectStudent = (send, studentId) => send(DeselectStudent(studentId))
-
-let updateFilter = (send, filter) => send(UpdateFilter(filter))
-
-let dropDownContents = (updateFilterCB, filter) =>
-  filter
-  |> Filter.dropdownOptionsForSortBy
-  |> Array.map(sortBy => {
-    let title = sortBy |> Filter.sortByTitle
-    <button
-      key=title
-      title={"Order by " ++ title}
-      onClick={_ => updateFilterCB(filter |> Filter.updateSortBy(sortBy))}
-      className="inline-flex items-center w-full font-semibold text-xs p-3 text-left focus:outline-none ">
-      <Icon className={sortBy |> Filter.sortByIcon} />
-      <span className="ml-2"> {title |> str} </span>
-    </button>
-  })
-
-let dropDownSelected = filter => {
-  let title = filter |> Filter.sortBy |> Filter.sortByTitle
-  <button
-    title={"Order by " ++ title}
-    className="inline-flex items-center bg-white leading-relaxed font-semibold border border-gray-400 rounded focus:outline-none focus:bg-white focus:border-gray-500 px-3 py-2 text-xs ">
-    <Icon className={filter |> Filter.sortBy |> Filter.sortByIcon} />
-    <span className="ml-2"> {title |> str} </span>
-    <i className="fas fa-caret-down ml-3" />
-  </button>
-}
-
-let updateTeams = (send, pagedTeams) => send(UpdateTeams(pagedTeams))
-
-let showEditForm = (send, student, teamId) => send(UpdateFormVisible(UpdateForm(student, teamId)))
-
-let submitForm = (send, tagsToApply) => send(RefreshData(tagsToApply))
-
-let updateForm = (send, tagsToApply, team) =>
-  switch team {
-  | Some(t) => send(UpdateTeam(t, tagsToApply))
-  | None => send(RefreshData(tagsToApply))
-  }
-
-let reloadTeams = (send, ()) => send(RefreshData([]))
-
-let setLoading = (send, loading) => send(SetLoading(loading))
-
-@react.component
-let make = (~courseId, ~courseCoachIds, ~schoolCoaches, ~levels, ~studentTags) => {
-  let (state, send) = React.useReducer(reducer, initialState(studentTags))
-
-  <div className="flex flex-1 flex-col">
-    {switch state.formVisible {
-    | None => ReasonReact.null
-    | CreateForm =>
-      <SchoolAdmin__EditorDrawer closeDrawerCB={() => send(UpdateFormVisible(None))}>
-        <StudentsEditor__CreateForm
-          courseId submitFormCB={submitForm(send)} studentTags=state.tags
-        />
-      </SchoolAdmin__EditorDrawer>
-
-    | UpdateForm(student, teamId) =>
-      let team = teamId |> Team.unsafeFind(state.pagedTeams |> Page.teams, "Root")
-      let courseCoaches =
-        schoolCoaches |> Js.Array.filter(coach => courseCoachIds |> Array.mem(Coach.id(coach)))
-      <SchoolAdmin__EditorDrawer closeDrawerCB={() => send(UpdateFormVisible(None))}>
-        <StudentsEditor__UpdateForm
-          student
-          team
-          studentTags=state.tags
-          courseCoaches
-          updateFormCB={updateForm(send)}
-          reloadTeamsCB={reloadTeams(send)}
-        />
-      </SchoolAdmin__EditorDrawer>
-    }}
-    <div className="px-6 pb-4 flex-1 bg-gray-100 relative overflow-y-scroll">
-      <div className="max-w-3xl w-full mx-auto flex justify-between items-center border-b mt-4">
-        <ul className="flex font-semibold text-sm">
-          <li className="px-3 py-3 md:py-2 text-primary-500 border-b-3 border-primary-500 -mb-px">
-            <span> {"All Students" |> str} </span>
-          </li>
-          <li
-            className="rounded-t-lg cursor-pointer border-b-3 border-transparent hover:bg-gray-200 hover:text-gray-900">
-            <a
-              className="block px-3 py-3 md:py-2 text-gray-800"
-              href={"/school/courses/" ++ (courseId ++ "/inactive_students")}>
-              {"Inactive Students" |> str}
-            </a>
-          </li>
-        </ul>
-        {state.selectedStudents |> Array.length > 0
-          ? React.null
-          : <button
-              onClick={_e => send(UpdateFormVisible(CreateForm))} className="btn btn-primary ml-4">
-              <i className="fas fa-user-plus mr-2" /> <span> {"Add New Students" |> str} </span>
-            </button>}
-      </div>
-      <div className="bg-gray-100 sticky top-0 py-3">
-        <div className="border rounded-lg mx-auto max-w-3xl bg-white ">
-          <div>
-            <div className="flex w-full items-start p-4">
-              <StudentsEditor__Search
-                filter=state.filter updateFilterCB={updateFilter(send)} tags=state.tags levels
-              />
-              <div className="ml-2 flex-shrink-0">
-                <label className="block text-tiny uppercase font-semibold">
-                  {"Sort by:" |> str}
-                </label>
-                <div className="mt-1">
-                  <Dropdown
-                    right=true
-                    selected={dropDownSelected(state.filter)}
-                    contents={dropDownContents(updateFilter(send), state.filter)}
-                  />
-                </div>
-              </div>
-            </div>
-            {state.selectedStudents |> ArrayUtils.isEmpty
-              ? React.null
-              : <div className="flex justify-between bg-gray-100 px-4 pb-3 pt-1 rounded-b-lg">
-                  <div className="flex flex-wrap">
-                    {state.selectedStudents
-                    |> Array.map(selectedStudent =>
-                      <div
-                        className="flex items-center bg-white border border-gray-400 rounded-full mr-2 mt-2 overflow-hidden">
-                        {switch selectedStudent |> SelectedStudent.avatarUrl {
-                        | Some(avatarUrl) =>
-                          <img
-                            className="w-5 h-5 rounded-full mr-2 ml-px my-px object-cover"
-                            src=avatarUrl
-                          />
-                        | None =>
-                          <Avatar
-                            name={selectedStudent |> SelectedStudent.name}
-                            className="w-5 h-5 mr-2 ml-px my-px"
-                          />
-                        }}
-                        <div className="flex h-full items-center">
-                          <span className="text-xs font-semibold pr-2 leading-tight ">
-                            {selectedStudent |> SelectedStudent.name |> str}
-                          </span>
-                          <button
-                            className="flex h-full text-xs text-red-700 px-2 py-px border-l focus:outline-none bg-gray-100 hover:bg-red-400 hover:text-white "
-                            onClick={_ =>
-                              deselectStudent(send, selectedStudent |> SelectedStudent.id)}>
-                            <Icon className="if i-times-regular" />
-                          </button>
-                        </div>
-                      </div>
-                    )
-                    |> React.array}
-                  </div>
-                  <div className="pt-1">
-                    {state.selectedStudents |> SelectedStudent.isGroupable
-                      ? <button
-                          onClick={_e => teamUp(state.selectedStudents, handleTeamUpResponse(send))}
-                          className="btn btn-small btn-primary">
-                          {"Group as Team" |> str}
-                        </button>
-                      : React.null}
-                    {state.selectedStudents |> SelectedStudent.isMoveOutable
-                      ? <button
-                          onClick={_e => teamUp(state.selectedStudents, handleTeamUpResponse(send))}
-                          className="btn btn-small btn-danger">
-                          {"Move out from Team" |> str}
-                        </button>
-                      : React.null}
-                  </div>
-                </div>}
-          </div>
-        </div>
-      </div>
-      <div>
-        <StudentsEditor__TeamsList
-          levels
-          courseId
-          filter=state.filter
-          pagedTeams=state.pagedTeams
-          selectedStudentIds={state.selectedStudents |> Array.map(s => s |> SelectedStudent.id)}
-          selectStudentCB={selectStudent(send)}
-          deselectStudentCB={deselectStudent(send)}
-          showEditFormCB={showEditForm(send)}
-          updateTeamsCB={updateTeams(send)}
-          loading=state.loading
-          setLoadingCB={setLoading(send)}
-          updateFilterCB={updateFilter(send)}
-          refreshTeams=state.refreshTeams
-        />
-      </div>
-    </div>
-    {
-      let loading = switch state.pagedTeams {
-      | Unloaded => false
-      | _ =>
-        switch state.loading {
-        | NotLoading => false
-        | Reloading => true
-        | LoadingMore => false
-        }
-      }
-      <LoadingSpinner loading />
-    }
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Search.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Search.res
deleted file mode 100644
index 7037bfe..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Search.res
+++ /dev/null
@@ -1,120 +0,0 @@
-open StudentsEditor__Types
-
-let str = React.string
-
-module Selectable = {
-  type t =
-    | Level(Level.t)
-    | Tag(string)
-    | NameOrEmail(string)
-
-  let label = t => {
-    let labelString = switch t {
-    | Level(level) => "Level " ++ (level |> Level.number |> string_of_int)
-    | Tag(_) => "Tag"
-    | NameOrEmail(_) => "Name or Email"
-    }
-    Some(labelString)
-  }
-
-  let value = t =>
-    switch t {
-    | Level(level) => level |> Level.name
-    | Tag(tag) => tag
-    | NameOrEmail(input) => input
-    }
-
-  let searchString = t =>
-    switch t {
-    | Level(level) => level |> Level.title
-    | Tag(tag) => "tag " ++ tag
-    | NameOrEmail(input) => input
-    }
-
-  let color = t =>
-    switch t {
-    | Level(_level) => "orange"
-    | Tag(_tag) => "gray"
-    | NameOrEmail(_input) => "purple"
-    }
-
-  let makeLevel = level => Level(level)
-  let makeTag = tag => Tag(tag)
-  let makeNameOrEmail = input => NameOrEmail(input)
-}
-
-module MultiselectDropdown = MultiselectDropdown.Make(Selectable)
-
-let updateFilter = (setSearchInput, updateFilterCB, filter) => {
-  updateFilterCB(filter)
-  setSearchInput(_ => "")
-}
-
-let selected = (filter, levels) => {
-  let level = switch filter |> Filter.levelId {
-  | Some(id) => [Selectable.makeLevel(id |> Level.unsafeFind(levels, "Search"))]
-  | None => []
-  }
-  let searchString = switch filter |> Filter.searchString {
-  | Some(s) => s |> Js.String.trim == "" ? [] : [Selectable.makeNameOrEmail(s)]
-  | None => []
-  }
-
-  let tags = filter |> Filter.tags |> Array.map(t => Selectable.makeTag(t))
-
-  searchString |> Array.append(tags) |> Array.append(level)
-}
-
-let unselected = (tags, levels, filter, searchInput) => {
-  let tagSuggestions =
-    tags
-    |> Js.Array.filter(t => !(filter |> Filter.tags |> Array.mem(t)))
-    |> Array.map(t => Selectable.makeTag(t))
-  let levelSuggestions = switch filter |> Filter.levelId {
-  | Some(levelId) => levels |> Js.Array.filter(l => l |> Level.id != levelId)
-  | None => levels
-  } |> Array.map(l => Selectable.makeLevel(l))
-  let searchSuggestion =
-    searchInput |> Js.String.trim == "" ? [] : [Selectable.makeNameOrEmail(searchInput)]
-
-  searchSuggestion |> Array.append(tagSuggestions) |> Array.append(levelSuggestions)
-}
-
-let select = (filter, updateFilterCB, setSearchInput, selectable) =>
-  switch (selectable: Selectable.t) {
-  | Level(level) => filter |> Filter.changeLevelId(Some(level |> Level.id))
-  | Tag(tag) => filter |> Filter.addTag(tag)
-  | NameOrEmail(input) => filter |> Filter.changeSearchString(Some(input))
-  } |> updateFilter(setSearchInput, updateFilterCB)
-
-let deselect = (filter, updateFilterCB, selectable) => {
-  let newFilter = switch (selectable: Selectable.t) {
-  | Level(_level) => filter |> Filter.removeLevelId
-  | Tag(tag) => filter |> Filter.removeTag(tag)
-  | NameOrEmail(_) => filter |> Filter.removeSearchString
-  }
-
-  updateFilterCB(newFilter)
-}
-let updateSearchInput = (setSearchInput, searchInput) => setSearchInput(_ => searchInput)
-
-@react.component
-let make = (~filter, ~updateFilterCB, ~tags, ~levels) => {
-  let (searchInput, setSearchInput) = React.useState(() => "")
-  let id = "search"
-  <div className="inline-block w-full">
-    <label className="block text-tiny font-semibold uppercase" htmlFor=id>
-      {"Filter by:" |> str}
-    </label>
-    <MultiselectDropdown
-      unselected={unselected(tags, levels, filter, searchInput)}
-      selected={selected(filter, levels)}
-      onSelect={select(filter, updateFilterCB, setSearchInput)}
-      onDeselect={deselect(filter, updateFilterCB)}
-      value=searchInput
-      onChange={updateSearchInput(setSearchInput)}
-      id
-      placeholder="Type name, tag or level"
-    />
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__SearchableTagList.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__SearchableTagList.res
deleted file mode 100644
index b327d89..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__SearchableTagList.res
+++ /dev/null
@@ -1,102 +0,0 @@
-let str = ReasonReact.string
-
-type state = string
-
-let handleClick = (tag, send, clickCB) => {
-  clickCB(tag)
-  send("")
-}
-
-let search = (state, send, allowNewTags, selectedTags, unselectedTags, addTagCB) => {
-  // Remove all excess space characters from the user input.
-  let normalizedString =
-    state
-    |> Js.String.trim
-    |> Js.String.replaceByRe(Js.Re.fromStringWithFlags("\\s+", ~flags="g"), " ")
-
-  switch normalizedString {
-  | "" => []
-  | searchString =>
-    let allTags = Array.append(selectedTags, unselectedTags) |> Array.map(String.lowercase_ascii)
-    /* If addition of tag is allowed, and it IS new, then display that option at the front. */
-    let initial = if (
-      allowNewTags && !(allTags |> Array.mem(searchString |> String.lowercase_ascii))
-    ) {
-      [
-        <span
-          title={"Add new tag " ++ searchString}
-          key=searchString
-          onMouseDown={_e => handleClick(searchString, send, addTagCB)}
-          className="inline-flex cursor-pointer items-center bg-primary-100 border border-dashed border-primary-500 text-primary-700 hover:shadow-md hover:text-primary-800 rounded-lg px-2 py-px mt-1 mr-2 text-xs overflow-hidden">
-          {searchString |> str} <i className="fas fa-plus ml-1 text-sm text-primary-600" />
-        </span>,
-      ]
-    } else {
-      []
-    }
-    let searchResults =
-      unselectedTags
-      |> Js.Array.filter(tag =>
-        tag |> String.lowercase_ascii |> Js.String.includes(searchString |> String.lowercase_ascii)
-      )
-      |> ArrayUtils.copyAndSort(String.compare)
-      |> Array.map(tag =>
-        <span
-          title={"Pick tag " ++ tag}
-          key=tag
-          className="inline-flex cursor-pointer items-center bg-gray-200 border border-gray-500 text-gray-900 hover:shadow hover:border-primary-500 hover:bg-primary-100 hover:text-primary-600 rounded-lg px-2 py-px mt-1 mr-1 text-xs overflow-hidden"
-          onMouseDown={_e => handleClick(tag, send, addTagCB)}>
-          {tag |> str}
-        </span>
-      )
-    initial |> Array.append(searchResults)
-  }
-}
-
-let reducer = (_state, searchString) => searchString
-
-@react.component
-let make = (~unselectedTags, ~selectedTags, ~addTagCB, ~removeTagCB, ~allowNewTags) => {
-  let (state, send) = React.useReducer(reducer, "")
-  let results = search(state, send, allowNewTags, selectedTags, unselectedTags, addTagCB)
-  <div className="mt-2">
-    {if selectedTags |> ArrayUtils.isNotEmpty {
-      <div className="flex flex-wrap">
-        {selectedTags
-        |> ArrayUtils.copyAndSort(String.compare)
-        |> Array.map(tag =>
-          <div
-            key=tag
-            className="flex items-center bg-gray-200 border border-gray-500 rounded-lg mt-1 mr-1 text-xs text-gray-900 overflow-hidden">
-            <span className="px-2 py-px"> {tag |> str} </span>
-            <span
-              title={"Remove tag " ++ tag}
-              className="flex items-center px-2 h-full cursor-pointer px-2 text-gray-700 hover:text-black hover:bg-gray-300 border-l border-gray-400"
-              onClick={_e => handleClick(tag, send, removeTagCB)}>
-              <i className="fas fa-times" />
-            </span>
-          </div>
-        )
-        |> React.array}
-      </div>
-    } else {
-      React.null
-    }}
-    <input
-      value=state
-      onChange={event => send(ReactEvent.Form.target(event)["value"])}
-      className="appearance-none block bg-white leading-snug border border-gray-400 rounded w-full py-3 px-4 mt-2 focus:outline-none focus:bg-white focus:border-gray-500"
-      id="tags"
-      type_="text"
-      placeholder={allowNewTags ? "Search for, or add new tags" : "Select tags"}
-    />
-    {if results |> ArrayUtils.isNotEmpty {
-      <div
-        className="flex flex-wrap border border-gray-400 bg-white mt-1 rounded-lg shadow-lg searchable-tag-list__dropdown relative px-4 pt-2 pb-3">
-        {results |> React.array}
-      </div>
-    } else {
-      React.null
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Student.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Student.res
deleted file mode 100644
index f92342e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Student.res
+++ /dev/null
@@ -1,88 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  avatarUrl: option<string>,
-  email: string,
-  tags: array<string>,
-  excludedFromLeaderboard: bool,
-  title: string,
-  affiliation: option<string>,
-}
-
-let name = t => t.name
-
-let avatarUrl = t => t.avatarUrl
-
-let id = t => t.id
-
-let title = t => t.title
-
-let affiliation = t => t.affiliation
-
-let email = t => t.email
-
-let tags = t => t.tags
-
-let excludedFromLeaderboard = t => t.excludedFromLeaderboard
-
-let updateInfo = (~name, ~excludedFromLeaderboard, ~title, ~affiliation, ~student) => {
-  ...student,
-  name: name,
-  excludedFromLeaderboard: excludedFromLeaderboard,
-  title: title,
-  affiliation: affiliation,
-}
-
-let make = (
-  ~id,
-  ~name,
-  ~avatarUrl,
-  ~email,
-  ~tags,
-  ~excludedFromLeaderboard,
-  ~title,
-  ~affiliation,
-) => {
-  id: id,
-  name: name,
-  avatarUrl: avatarUrl,
-  email: email,
-  tags: tags,
-  excludedFromLeaderboard: excludedFromLeaderboard,
-  title: title,
-  affiliation: affiliation,
-}
-
-let makeFromJS = studentDetails =>
-  make(
-    ~id=studentDetails["id"],
-    ~name=studentDetails["name"],
-    ~avatarUrl=studentDetails["avatarUrl"],
-    ~email=studentDetails["email"],
-    ~tags=studentDetails["tags"],
-    ~excludedFromLeaderboard=studentDetails["excludedFromLeaderboard"],
-    ~title=studentDetails["title"],
-    ~affiliation=studentDetails["affiliation"],
-  )
-
-let update = (~name, ~tags, ~excludedFromLeaderboard, ~title, ~affiliation, ~student) => {
-  ...student,
-  name: name,
-  tags: tags,
-  excludedFromLeaderboard: excludedFromLeaderboard,
-  title: title,
-  affiliation: affiliation,
-}
-
-let encode = (teamName, t) => {
-  open Json.Encode
-  object_(list{
-    ("id", t.id |> string),
-    ("name", t.name |> string),
-    ("team_name", teamName |> string),
-    ("email", t.email |> string),
-    ("excluded_from_leaderboard", t.excludedFromLeaderboard |> bool),
-    ("title", t.title |> string),
-    ("affiliation", t.affiliation |> OptionUtils.toString |> string),
-  })
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__StudentInfo.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__StudentInfo.res
deleted file mode 100644
index 35ea56b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__StudentInfo.res
+++ /dev/null
@@ -1,41 +0,0 @@
-type t = {
-  name: string,
-  email: string,
-  tags: array<string>,
-  title: string,
-  affiliation: string,
-  teamName: option<string>,
-}
-
-let name = t => t.name
-
-let email = t => t.email
-
-let tags = t => t.tags
-
-let title = t => t.title
-
-let teamName = t => t.teamName
-
-let affiliation = t => t.affiliation
-
-let encode = t => {
-  open Json.Encode
-  object_(list{
-    ("name", t.name |> string),
-    ("email", t.email |> string),
-    ("title", t.title |> string),
-    ("affiliation", t.affiliation |> string),
-    ("tags", t.tags |> array(string)),
-    ("team_name", t.teamName |> nullable(string)),
-  })
-}
-
-let make = (~name, ~email, ~title, ~affiliation, ~tags, ~teamName) => {
-  name: name,
-  email: email,
-  title: title,
-  affiliation: affiliation,
-  tags: tags,
-  teamName: teamName,
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__StudentInfo.resi b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__StudentInfo.resi
deleted file mode 100644
index 680c5ea..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__StudentInfo.resi
+++ /dev/null
@@ -1,24 +0,0 @@
-type t
-
-let name: t => string
-
-let email: t => string
-
-let tags: t => array<string>
-
-let title: t => string
-
-let affiliation: t => string
-
-let teamName: t => option<string>
-
-let encode: t => Js.Json.t
-
-let make: (
-  ~name: string,
-  ~email: string,
-  ~title: string,
-  ~affiliation: string,
-  ~tags: array<string>,
-  ~teamName: option<string>,
-) => t
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__StudentInfoForm.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__StudentInfoForm.res
deleted file mode 100644
index 6c79582..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__StudentInfoForm.res
+++ /dev/null
@@ -1,209 +0,0 @@
-open StudentsEditor__Types
-
-type state = {
-  name: string,
-  email: string,
-  title: string,
-  affiliation: string,
-  hasNameError: bool,
-  hasEmailError: bool,
-  tagsToApply: array<string>,
-  teamName: string,
-}
-
-type action =
-  | UpdateName(string, bool)
-  | UpdateEmail(string, bool)
-  | UpdateTitle(string)
-  | UpdateTeamName(string)
-  | UpdateAffiliation(string)
-  | ResetForm
-  | AddTag(string)
-  | RemoveTag(string)
-
-let str = React.string
-
-let updateName = (send, name) => {
-  let hasError = name |> String.length < 2
-  send(UpdateName(name, hasError))
-}
-
-let updateEmail = (send, email) => {
-  let regex = %re(`/.+@.+\\..+/i`)
-  let hasError = !Js.Re.test_(regex, email)
-  send(UpdateEmail(email, hasError))
-}
-
-let hasEmailDuplication = (email, emailsToAdd) =>
-  emailsToAdd |> Array.exists(emailToAdd => email == emailToAdd)
-
-let formInvalid = (state, emailsToAdd) =>
-  state.name == "" ||
-    (state.email == "" ||
-    (state.hasNameError || (state.hasEmailError || hasEmailDuplication(state.email, emailsToAdd))))
-
-let handleAdd = (state, send, emailsToAdd, addToListCB) => {
-  let teamName = state.teamName |> String.trim == "" ? None : Some(state.teamName)
-
-  if !formInvalid(state, emailsToAdd) {
-    addToListCB(
-      StudentInfo.make(
-        ~name=state.name,
-        ~email=state.email,
-        ~title=state.title,
-        ~affiliation=state.affiliation,
-        ~tags=state.tagsToApply,
-        ~teamName,
-      ),
-    )
-    send(ResetForm)
-  }
-}
-
-let initialState = () => {
-  name: "",
-  email: "",
-  title: "",
-  affiliation: "",
-  hasNameError: false,
-  hasEmailError: false,
-  tagsToApply: [],
-  teamName: "",
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateName(name, hasNameError) => {...state, name: name, hasNameError: hasNameError}
-  | UpdateEmail(email, hasEmailError) => {...state, email: email, hasEmailError: hasEmailError}
-  | UpdateTitle(title) => {...state, title: title}
-  | UpdateTeamName(teamName) => {...state, teamName: teamName}
-  | UpdateAffiliation(affiliation) => {...state, affiliation: affiliation}
-  | ResetForm => {
-      ...state,
-      name: "",
-      email: "",
-      hasNameError: false,
-      hasEmailError: false,
-    }
-  | AddTag(tag) => {
-      ...state,
-      tagsToApply: state.tagsToApply |> Array.append([tag]),
-    }
-  | RemoveTag(tag) => {
-      ...state,
-      tagsToApply: state.tagsToApply |> Js.Array.filter(t => t != tag),
-    }
-  }
-
-@react.component
-let make = (~addToListCB, ~studentTags, ~emailsToAdd) => {
-  let (state, send) = React.useReducer(reducer, initialState())
-  <div className="bg-gray-100 p-4">
-    <div>
-      <label className="inline-block tracking-wide text-xs font-semibold" htmlFor="name">
-        {"Name" |> str}
-      </label>
-      <input
-        value=state.name
-        onChange={event => updateName(send, ReactEvent.Form.target(event)["value"])}
-        className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-        id="name"
-        type_="text"
-        placeholder="Student name here"
-      />
-      <School__InputGroupError message="is not valid" active=state.hasNameError />
-    </div>
-    <div className="mt-5">
-      <label className="inline-block tracking-wide text-xs font-semibold" htmlFor="email">
-        {"Email" |> str}
-      </label>
-      <input
-        value=state.email
-        onChange={event => updateEmail(send, ReactEvent.Form.target(event)["value"])}
-        className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 mt-2 leading-tight focus:outline-none focus:bg-white focus:border-gray-500"
-        id="email"
-        type_="email"
-        placeholder="Student email here"
-      />
-      <School__InputGroupError
-        message={state.hasEmailError
-          ? "invalid email"
-          : hasEmailDuplication(state.email, emailsToAdd)
-          ? "email address not unique for student"
-          : ""}
-        active={state.hasEmailError || hasEmailDuplication(state.email, emailsToAdd)}
-      />
-    </div>
-    <div className="mt-5">
-      <label
-        className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-        htmlFor="title">
-        {"Title" |> str}
-      </label>
-      <span className="text-xs ml-1"> {"(optional)" |> str} </span>
-      <input
-        value=state.title
-        onChange={event => send(UpdateTitle(ReactEvent.Form.target(event)["value"]))}
-        className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-        id="title"
-        type_="text"
-        placeholder="Student, Coach, CEO, etc."
-      />
-    </div>
-    <div className="mt-5">
-      <label
-        className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-        htmlFor="affiliation">
-        {"Affiliation" |> str}
-      </label>
-      <span className="text-xs ml-1"> {"(optional)" |> str} </span>
-      <input
-        value=state.affiliation
-        onChange={event => send(UpdateAffiliation(ReactEvent.Form.target(event)["value"]))}
-        className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-        id="affiliation"
-        type_="text"
-        placeholder="Acme Inc., Acme University, etc."
-      />
-    </div>
-    <div className="mt-5">
-      <label
-        className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-        htmlFor="team_name">
-        {"Team Name" |> str}
-      </label>
-      <span className="text-xs ml-1"> {"(optional)" |> str} </span>
-      <HelpIcon className="ml-1">
-        {"Students with same team name will be grouped together; this will not affect existing teams in the course." |> str}
-      </HelpIcon>
-      <input
-        value=state.teamName
-        onChange={event => send(UpdateTeamName(ReactEvent.Form.target(event)["value"]))}
-        className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-        id="team_name"
-        maxLength=50
-        type_="text"
-        placeholder="Avengers, Fantastic Four, etc."
-      />
-    </div>
-    <div className="mt-5">
-      <label className="inline-block tracking-wide text-xs font-semibold" htmlFor="tags">
-        {"Tags" |> str}
-      </label>
-      <span className="text-xs ml-1"> {"(optional)" |> str} </span>
-    </div>
-    <StudentsEditor__SearchableTagList
-      unselectedTags={studentTags |> Js.Array.filter(tag => !(state.tagsToApply |> Array.mem(tag)))}
-      selectedTags=state.tagsToApply
-      addTagCB={tag => send(AddTag(tag))}
-      removeTagCB={tag => send(RemoveTag(tag))}
-      allowNewTags=true
-    />
-    <button
-      onClick={_e => handleAdd(state, send, emailsToAdd, addToListCB)}
-      disabled={formInvalid(state, emailsToAdd)}
-      className={"btn btn-primary mt-5" ++ (formInvalid(state, emailsToAdd) ? " disabled" : "")}>
-      {"Add to List" |> str}
-    </button>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Team.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Team.res
deleted file mode 100644
index dcd51cf..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Team.res
+++ /dev/null
@@ -1,77 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  coachIds: array<string>,
-  levelId: string,
-  accessEndsAt: option<Js.Date.t>,
-  students: array<StudentsEditor__Student.t>,
-}
-
-let id = t => t.id
-
-let name = t => t.name
-
-let coachIds = t => t.coachIds
-
-let accessEndsAt = t => t.accessEndsAt
-
-let levelId = t => t.levelId
-
-let students = t => t.students
-
-let isSingleStudent = t => t.students |> Array.length == 1
-
-let make = (~id, ~name, ~students, ~coachIds, ~levelId, ~accessEndsAt) => {
-  id: id,
-  name: name,
-  students: students,
-  coachIds: coachIds,
-  levelId: levelId,
-  accessEndsAt: accessEndsAt,
-}
-
-let makeFromJS = teamDetails =>
-  teamDetails |> Js.Array.map(team =>
-    switch team {
-    | Some(team) =>
-      let students =
-        team["students"] |> Array.map(studentDetails =>
-          StudentsEditor__Student.makeFromJS(studentDetails)
-        )
-      let coachIds = team["coachIds"] |> Array.map(cids => cids)
-      list{
-        make(
-          ~id=team["id"],
-          ~name=team["name"],
-          ~levelId=team["levelId"],
-          ~students,
-          ~coachIds,
-          ~accessEndsAt=team["accessEndsAt"] |> OptionUtils.map(DateFns.parseString),
-        ),
-      }
-    | None => list{}
-    }
-  )
-
-let update = (~name, ~student, ~coachIds, ~accessEndsAt, ~team) => {
-  let students =
-    team.students |> Array.map(s =>
-      s |> StudentsEditor__Student.id == (student |> StudentsEditor__Student.id) ? student : s
-    )
-
-  {...team, name: name, coachIds: coachIds, accessEndsAt: accessEndsAt, students: students}
-}
-
-let replaceTeam = (team, teams) => teams |> Array.map(t => t.id == team.id ? team : t)
-
-let unsafeFind = (teams, componentName, teamId) =>
-  teams |> ArrayUtils.unsafeFind(
-    team => team.id == teamId,
-    "Unable to find team with id: " ++ (teamId ++ ("in StudentdEditor__" ++ componentName)),
-  )
-
-let active = t =>
-  switch t.accessEndsAt {
-  | Some(date) => date |> DateFns.isAfter(Js.Date.make())
-  | None => true
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__TeamsList.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__TeamsList.res
deleted file mode 100644
index e61f5d4..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__TeamsList.res
+++ /dev/null
@@ -1,310 +0,0 @@
-@module("./images/no-students-found.svg")
-external notFoundIcon: string = "default"
-
-let str = React.string
-
-open StudentsEditor__Types
-
-module CourseTeamsQuery = %graphql(`
-    query CourseTeamsQuery($courseId: ID!, $levelId: ID, $search: String, $after: String, $tags: [String!], $sortBy: String!) {
-      courseTeams(courseId: $courseId, levelId: $levelId, search: $search, first: 20, after: $after, tags: $tags, sortBy: $sortBy) {
-        nodes {
-        id,
-        name,
-        levelId,
-        coachIds,
-        levelId,
-        accessEndsAt
-        students {
-          id,
-          name,
-          title,
-          avatarUrl,
-          email, tags, excludedFromLeaderboard, affiliation
-          }
-        }
-        pageInfo {
-          endCursor,hasNextPage
-        }
-      }
-    }
-  `)
-
-let updateTeams = (updateTeamsCB, endCursor, hasNextPage, teams, nodes) => {
-  let updatedTeams =
-    switch nodes {
-    | None => []
-    | Some(teamsArray) => teamsArray |> Team.makeFromJS
-    }
-    |> ArrayUtils.flatten
-    |> Array.append(teams)
-
-  let teams = switch (hasNextPage, endCursor) {
-  | (_, None)
-  | (false, Some(_)) =>
-    Page.FullyLoaded(updatedTeams)
-  | (true, Some(cursor)) => Page.PartiallyLoaded(updatedTeams, cursor)
-  }
-
-  updateTeamsCB(teams)
-}
-
-let getTeams = (courseId, cursor, updateTeamsCB, teams, filter, setLoadingCB, loading) => {
-  let tags = filter |> Filter.tags
-  let selectedLevelId = filter |> Filter.levelId
-  let search = filter |> Filter.searchString
-  let sortBy = filter |> Filter.sortByToString
-  setLoadingCB(loading)
-  switch (selectedLevelId, search, cursor) {
-  | (Some(levelId), Some(search), Some(cursor)) =>
-    CourseTeamsQuery.make(~courseId, ~levelId, ~search, ~after=cursor, ~tags, ~sortBy, ())
-  | (Some(levelId), Some(search), None) =>
-    CourseTeamsQuery.make(~courseId, ~levelId, ~search, ~tags, ~sortBy, ())
-  | (None, Some(search), Some(cursor)) =>
-    CourseTeamsQuery.make(~courseId, ~search, ~after=cursor, ~tags, ~sortBy, ())
-  | (Some(levelId), None, Some(cursor)) =>
-    CourseTeamsQuery.make(~courseId, ~levelId, ~after=cursor, ~tags, ~sortBy, ())
-  | (Some(levelId), None, None) => CourseTeamsQuery.make(~courseId, ~levelId, ~tags, ~sortBy, ())
-  | (None, Some(search), None) => CourseTeamsQuery.make(~courseId, ~search, ~tags, ~sortBy, ())
-  | (None, None, Some(cursor)) =>
-    CourseTeamsQuery.make(~courseId, ~after=cursor, ~tags, ~sortBy, ())
-  | (None, None, None) => CourseTeamsQuery.make(~courseId, ~tags, ~sortBy, ())
-  }
-  |> GraphqlQuery.sendQuery
-  |> Js.Promise.then_(response => {
-    response["courseTeams"]["nodes"] |> updateTeams(
-      updateTeamsCB,
-      response["courseTeams"]["pageInfo"]["endCursor"],
-      response["courseTeams"]["pageInfo"]["hasNextPage"],
-      teams,
-    )
-    Js.Promise.resolve()
-  })
-  |> ignore
-}
-
-let studentAvatar = student =>
-  switch student |> Student.avatarUrl {
-  | Some(avatarUrl) =>
-    <img
-      className="w-8 h-8 md:w-10 md:h-10 text-xs border rounded-full overflow-hidden flex-shrink-0 mt-1 md:mt-0 mr-2 md:mr-3 object-cover"
-      src=avatarUrl
-    />
-  | None =>
-    <Avatar
-      name={student |> Student.name}
-      className="w-8 h-8 md:w-10 md:h-10 text-xs border rounded-full overflow-hidden flex-shrink-0 mt-1 md:mt-0 mr-2 md:mr-3 object-cover"
-    />
-  }
-
-let levelInfo = (levels, team) =>
-  <span
-    className="inline-flex flex-col items-center rounded bg-orange-100 border border-orange-300 px-2 pt-2 pb-1 border">
-    <div className="text-xs font-semibold"> {"Level" |> str} </div>
-    <div className="font-bold">
-      {team
-      |> Team.levelId
-      |> Level.unsafeFind(levels, "TeamsList")
-      |> Level.number
-      |> string_of_int
-      |> str}
-    </div>
-  </span>
-
-let teamCard = (
-  team,
-  selectedStudentIds,
-  selectStudentCB,
-  deselectStudentCB,
-  showEditFormCB,
-  levels,
-) => {
-  let isSingleStudent = team |> Team.isSingleStudent
-  let teamId = team |> Team.id
-  <div
-    key=teamId
-    id={team |> Team.name}
-    className="student-team-container flex items-strecth shadow bg-white rounded-lg mb-3 overflow-hidden">
-    <div className="flex flex-col flex-1 w-3/5">
-      {team
-      |> Team.students
-      |> Array.map(student => {
-        let studentId = student |> Student.id
-        let isChecked = selectedStudentIds |> Array.mem(studentId)
-        let checkboxId = "select-student-" ++ studentId
-
-        <div
-          key=studentId
-          id={student |> Student.name}
-          className="student-team__card h-full cursor-pointer flex items-center bg-white">
-          <div className="flex flex-1 w-3/5 h-full">
-            <div className="flex items-center w-full">
-              <label
-                className="flex items-center h-full text-gray-500 leading-tight font-bold px-4 py-5 hover:bg-gray-100"
-                htmlFor=checkboxId>
-                <input
-                  className="leading-tight"
-                  type_="checkbox"
-                  id=checkboxId
-                  checked=isChecked
-                  onChange={isChecked
-                    ? _e => deselectStudentCB(studentId)
-                    : _e => selectStudentCB(student, team)}
-                />
-              </label>
-              <a
-                className="flex flex-1 items-center py-4 px-4 hover:bg-gray-100 justify-between"
-                id={(student |> Student.name) ++ "_edit"}
-                onClick={_e => showEditFormCB(student, teamId)}>
-                <div className="flex">
-                  {studentAvatar(student)}
-                  <div className="text-sm flex flex-col">
-                    <p className="text-black font-semibold inline-block ">
-                      {student |> Student.name |> str}
-                    </p>
-                    <div className="flex flex-wrap">
-                      {student
-                      |> Student.tags
-                      |> Array.map(tag =>
-                        <div
-                          key=tag
-                          className="bg-gray-300 rounded mt-1 mr-1 py-px px-2 text-xs text-gray-900">
-                          {tag |> str}
-                        </div>
-                      )
-                      |> React.array}
-                    </div>
-                  </div>
-                </div>
-                {isSingleStudent ? team |> levelInfo(levels) : React.null}
-              </a>
-            </div>
-          </div>
-        </div>
-      })
-      |> React.array}
-    </div>
-    {isSingleStudent
-      ? React.null
-      : <div className="flex w-2/5 items-center border-l border-gray-200">
-          <div className="w-4/6 py-4 pl-5 pr-4">
-            <div className="students-team--name mb-5">
-              <p className="inline-block text-xs bg-green-200 leading-tight px-1 py-px rounded">
-                {"Team" |> str}
-              </p>
-              <h4> {team |> Team.name |> str} </h4>
-            </div>
-          </div>
-          <div className="w-2/6 text-right pr-4"> {team |> levelInfo(levels)} </div>
-        </div>}
-  </div>
-}
-
-let showEmpty = (filter, loading, updateFilterCB) =>
-  loading == Loading.NotLoading && filter |> Filter.isEmpty
-    ? <div className="text-center"> {"No students here." |> str} </div>
-    : <div className="flex">
-        <div className="w-1/2 px-3">
-          <p className="text-xl font-semibold mt-4"> {"Sorry, no results found." |> str} </p>
-          <ul className="list-disc text-gray-800 text-sm ml-5 mt-2">
-            <li className="py-1"> {"Make sure the spelling is correct." |> str} </li>
-            <li className="py-1"> {"Try removing the search filter options." |> str} </li>
-          </ul>
-          <button
-            className="btn btn-default mt-4" onClick={_ => updateFilterCB(filter |> Filter.clear)}>
-            {"Clear Filter" |> str}
-          </button>
-        </div>
-        <div className="w-1/2"> <img className="w-full" src=notFoundIcon /> </div>
-      </div>
-
-let showTeams = (
-  selectedStudentIds,
-  selectStudentCB,
-  deselectStudentCB,
-  showEditFormCB,
-  levels,
-  filter,
-  updateFilterCB,
-  loading,
-  teams,
-) =>
-  switch teams {
-  | [] => showEmpty(filter, loading, updateFilterCB)
-  | teams =>
-    teams
-    |> Array.map(team =>
-      teamCard(team, selectedStudentIds, selectStudentCB, deselectStudentCB, showEditFormCB, levels)
-    )
-    |> React.array
-  }
-
-@react.component
-let make = (
-  ~levels,
-  ~courseId,
-  ~updateTeamsCB,
-  ~filter,
-  ~pagedTeams,
-  ~selectedStudentIds,
-  ~selectStudentCB,
-  ~deselectStudentCB,
-  ~showEditFormCB,
-  ~loading,
-  ~setLoadingCB,
-  ~updateFilterCB,
-  ~refreshTeams,
-) => {
-  React.useEffect1(() => {
-    getTeams(courseId, None, updateTeamsCB, [], filter, setLoadingCB, Loading.Reloading)
-
-    None
-  }, [refreshTeams])
-
-  <div className="pb-6">
-    <div className="max-w-3xl mx-auto w-full">
-      <div>
-        {switch (pagedTeams: Page.t) {
-        | Unloaded => SkeletonLoading.multiple(~count=3, ~element=SkeletonLoading.card())
-        | PartiallyLoaded(_, _)
-        | FullyLoaded(_) =>
-          pagedTeams
-          |> Page.teams
-          |> showTeams(
-            selectedStudentIds,
-            selectStudentCB,
-            deselectStudentCB,
-            showEditFormCB,
-            levels,
-            filter,
-            updateFilterCB,
-            loading,
-          )
-        }}
-      </div>
-      {switch (pagedTeams: Page.t) {
-      | Unloaded
-      | FullyLoaded(_) => React.null
-      | PartiallyLoaded(teams, cursor) =>
-        loading == Loading.LoadingMore
-          ? SkeletonLoading.multiple(~count=3, ~element=SkeletonLoading.card())
-          : <div className="pt-4">
-              <button
-                className="btn btn-primary-ghost cursor-pointer w-full"
-                onClick={_ =>
-                  getTeams(
-                    courseId,
-                    Some(cursor),
-                    updateTeamsCB,
-                    teams,
-                    filter,
-                    setLoadingCB,
-                    Loading.LoadingMore,
-                  )}>
-                {"Load More" |> str}
-              </button>
-            </div>
-      }}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Types.res
deleted file mode 100644
index 895f8f8..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__Types.res
+++ /dev/null
@@ -1,8 +0,0 @@
-module Team = StudentsEditor__Team
-module Student = StudentsEditor__Student
-module Coach = StudentsEditor__Coach
-module StudentInfo = StudentsEditor__StudentInfo
-module Level = StudentsEditor__Level
-module Page = StudentsEditor__Page
-module Filter = StudentsEditor__Filter
-module SelectedStudent = StudentsEditor__SelectedStudent
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__UpdateDetailsForm.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__UpdateDetailsForm.res
deleted file mode 100644
index 66d0301..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__UpdateDetailsForm.res
+++ /dev/null
@@ -1,407 +0,0 @@
-open StudentsEditor__Types
-
-type rec teamCoachlist = (coachId, coachName, selected)
-and coachId = string
-and coachName = string
-and selected = bool
-
-type state = {
-  name: string,
-  teamName: string,
-  tagsToApply: array<string>,
-  teamCoaches: array<string>,
-  teamCoachSearchInput: string,
-  excludedFromLeaderboard: bool,
-  title: string,
-  affiliation: string,
-  saving: bool,
-  accessEndsAt: option<Js.Date.t>,
-}
-
-type action =
-  | UpdateName(string)
-  | UpdateTeamName(string)
-  | AddTag(string)
-  | RemoveTag(string)
-  | UpdateCoachesList(array<string>)
-  | UpdateCoachSearchInput(string)
-  | UpdateExcludedFromLeaderboard(bool)
-  | UpdateTitle(string)
-  | UpdateAffiliation(string)
-  | UpdateSaving(bool)
-  | UpdateAccessEndsAt(option<Js.Date.t>)
-
-let str = ReasonReact.string
-
-let stringInputInvalid = s => s |> String.length < 2
-
-let updateName = (send, name) => send(UpdateName(name))
-
-let updateTeamName = (send, teamName) => send(UpdateTeamName(teamName))
-
-let updateTitle = (send, title) => send(UpdateTitle(title))
-
-let formInvalid = state =>
-  state.name |> stringInputInvalid ||
-    (state.teamName |> stringInputInvalid ||
-    state.title |> stringInputInvalid)
-
-let handleErrorCB = (send, ()) => send(UpdateSaving(false))
-
-let successMessage = (accessEndsAt, isSingleFounder) =>
-  switch accessEndsAt {
-  | Some(date) =>
-    switch (date |> DateFns.isBefore(Js.Date.make()), isSingleFounder) {
-    | (true, true) => "Student has been updated, and moved to list of inactive students"
-    | (true, false) => "Team has been updated, and moved to list of inactive students"
-    | (false, true)
-    | (false, false) => "Student updated successfully"
-    }
-  | None => "Student updated successfully"
-  }
-
-let enrolledCoachIds = teamCoaches =>
-  teamCoaches
-  |> Js.Array.filter(((_, _, selected)) => selected == true)
-  |> Array.map(((key, _, _)) => key)
-
-let handleResponseCB = (updateFormCB, state, student, oldTeam, _json) => {
-  let affiliation = switch state.affiliation |> String.trim {
-  | "" => None
-  | text => Some(text)
-  }
-  let newStudent = Student.update(
-    ~name=state.name,
-    ~tags=state.tagsToApply,
-    ~excludedFromLeaderboard=state.excludedFromLeaderboard,
-    ~title=state.title,
-    ~affiliation,
-    ~student,
-  )
-  let newTeam = Team.update(
-    ~name=state.teamName,
-    ~student=newStudent,
-    ~coachIds=state.teamCoaches,
-    ~accessEndsAt=state.accessEndsAt,
-    ~team=oldTeam,
-  )
-
-  // Remove inactive teams from the list
-  let team = newTeam |> Team.active ? Some(newTeam) : None
-
-  updateFormCB(state.tagsToApply, team)
-  Notification.success(
-    "Success",
-    successMessage(state.accessEndsAt, newTeam |> Team.isSingleStudent),
-  )
-}
-
-let updateStudent = (student, state, send, responseCB) => {
-  send(UpdateSaving(true))
-  let payload = Js.Dict.empty()
-
-  Js.Dict.set(payload, "authenticity_token", AuthenticityToken.fromHead() |> Js.Json.string)
-
-  let updatedStudent = Student.updateInfo(
-    ~name=state.name,
-    ~excludedFromLeaderboard=state.excludedFromLeaderboard,
-    ~title=state.title,
-    ~affiliation=Some(state.affiliation),
-    ~student,
-  )
-  Js.Dict.set(payload, "founder", Student.encode(state.teamName, updatedStudent))
-  Js.Dict.set(
-    payload,
-    "tags",
-    state.tagsToApply |> {
-      open Json.Encode
-      array(string)
-    },
-  )
-  Js.Dict.set(
-    payload,
-    "coach_ids",
-    state.teamCoaches |> {
-      open Json.Encode
-      array(string)
-    },
-  )
-
-  Js.Dict.set(
-    payload,
-    "access_ends_at",
-    state.accessEndsAt
-    |> OptionUtils.map(Js.Date.toString)
-    |> OptionUtils.default("")
-    |> {
-      open Json.Encode
-      string
-    },
-  )
-
-  let url = "/school/students/" ++ (student |> Student.id)
-  Api.update(url, payload, responseCB, handleErrorCB(send))
-}
-
-let boolBtnClasses = selected => {
-  let classes = "toggle-button__button"
-  classes ++ (selected ? " toggle-button__button--active" : "")
-}
-
-let handleTeamCoachList = (schoolCoaches, team) => {
-  let selectedTeamCoachIds = team |> Team.coachIds
-  schoolCoaches |> Array.map(coach => {
-    let coachId = coach |> Coach.id
-    let selected =
-      selectedTeamCoachIds |> Js.Array.findIndex(selectedCoachId => coachId == selectedCoachId) > -1
-
-    (coach |> Coach.id, coach |> Coach.name, selected)
-  })
-}
-
-module SelectablePrerequisiteTargets = {
-  type t = Coach.t
-
-  let value = t => t |> Coach.name
-  let searchString = value
-
-  let make = (coach): t => coach
-}
-
-let setTeamCoachSearch = (send, value) => send(UpdateCoachSearchInput(value))
-
-let selectTeamCoach = (send, state, coach) => {
-  let updatedTeamCoaches = state.teamCoaches |> Js.Array.concat([coach |> Coach.id])
-  send(UpdateCoachesList(updatedTeamCoaches))
-}
-
-let deSelectTeamCoach = (send, state, coach) => {
-  let updatedTeamCoaches =
-    state.teamCoaches |> Js.Array.filter(coachId => coachId != Coach.id(coach))
-  send(UpdateCoachesList(updatedTeamCoaches))
-}
-
-module MultiselectForTeamCoaches = MultiselectInline.Make(SelectablePrerequisiteTargets)
-
-let teamCoachesEditor = (courseCoaches, state, send) => {
-  let selected =
-    courseCoaches
-    |> Js.Array.filter(coach => state.teamCoaches |> Array.mem(Coach.id(coach)))
-    |> Array.map(coach => SelectablePrerequisiteTargets.make(coach))
-
-  let unselected =
-    courseCoaches
-    |> Js.Array.filter(coach => !(state.teamCoaches |> Array.mem(Coach.id(coach))))
-    |> Array.map(coach => SelectablePrerequisiteTargets.make(coach))
-  <div className="mt-2">
-    <MultiselectForTeamCoaches
-      placeholder="Search coaches"
-      emptySelectionMessage="No coaches selected"
-      allItemsSelectedMessage="You have selected all available coaches!"
-      selected
-      unselected
-      onChange={setTeamCoachSearch(send)}
-      value=state.teamCoachSearchInput
-      onSelect={selectTeamCoach(send, state)}
-      onDeselect={deSelectTeamCoach(send, state)}
-    />
-  </div>
-}
-
-let initialState = (student, team) => {
-  name: student |> Student.name,
-  teamName: team |> Team.name,
-  tagsToApply: student |> Student.tags,
-  teamCoaches: team |> Team.coachIds,
-  teamCoachSearchInput: "",
-  excludedFromLeaderboard: student |> Student.excludedFromLeaderboard,
-  title: student |> Student.title,
-  affiliation: student |> Student.affiliation |> OptionUtils.toString,
-  saving: false,
-  accessEndsAt: team |> Team.accessEndsAt,
-}
-
-let reducer = (state, action) =>
-  switch action {
-  | UpdateName(name) => {...state, name: name}
-  | UpdateTeamName(teamName) => {...state, teamName: teamName}
-  | AddTag(tag) => {
-      ...state,
-      tagsToApply: state.tagsToApply |> Array.append([tag]),
-    }
-  | RemoveTag(tag) => {
-      ...state,
-      tagsToApply: state.tagsToApply |> Js.Array.filter(t => t !== tag),
-    }
-  | UpdateCoachesList(teamCoaches) => {...state, teamCoaches: teamCoaches}
-  | UpdateCoachSearchInput(teamCoachSearchInput) => {
-      ...state,
-      teamCoachSearchInput: teamCoachSearchInput,
-    }
-  | UpdateExcludedFromLeaderboard(excludedFromLeaderboard) => {
-      ...state,
-      excludedFromLeaderboard: excludedFromLeaderboard,
-    }
-  | UpdateTitle(title) => {...state, title: title}
-  | UpdateAffiliation(affiliation) => {...state, affiliation: affiliation}
-  | UpdateSaving(bool) => {...state, saving: bool}
-  | UpdateAccessEndsAt(accessEndsAt) => {...state, accessEndsAt: accessEndsAt}
-  }
-
-@react.component
-let make = (~student, ~team, ~studentTags, ~courseCoaches, ~updateFormCB) => {
-  let (state, send) = React.useReducer(reducer, initialState(student, team))
-
-  let isSingleStudent = team |> Team.isSingleStudent
-
-  <DisablingCover disabled=state.saving>
-    <div>
-      <div className="pt-5">
-        <label
-          className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-          htmlFor="name">
-          {"Name" |> str}
-        </label>
-        <input
-          value=state.name
-          onChange={event => updateName(send, ReactEvent.Form.target(event)["value"])}
-          className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-          id="name"
-          type_="text"
-          placeholder="Student name here"
-        />
-        <School__InputGroupError
-          message="Name must have at least two characters" active={state.name |> stringInputInvalid}
-        />
-      </div>
-      {isSingleStudent
-        ? ReasonReact.null
-        : <div className="mt-5">
-            <label
-              className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-              htmlFor="team_name">
-              {"Team Name" |> str}
-            </label>
-            <input
-              value=state.teamName
-              onChange={event => updateTeamName(send, ReactEvent.Form.target(event)["value"])}
-              maxLength=50
-              className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-              id="team_name"
-              type_="text"
-              placeholder="Team name here"
-            />
-            <School__InputGroupError
-              message="Team Name must have at least two characters"
-              active={state.teamName |> stringInputInvalid}
-            />
-          </div>}
-      <div className="mt-5">
-        <label
-          className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-          htmlFor="title">
-          {"Title" |> str}
-        </label>
-        <input
-          value=state.title
-          onChange={event => updateTitle(send, ReactEvent.Form.target(event)["value"])}
-          className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-          id="title"
-          type_="text"
-          placeholder="Student, Coach, CEO, etc."
-        />
-        <School__InputGroupError
-          message="Title must have at least two characters"
-          active={state.title |> stringInputInvalid}
-        />
-      </div>
-      <div className="mt-5">
-        <label
-          className="inline-block tracking-wide text-xs font-semibold mb-2 leading-tight"
-          htmlFor="affiliation">
-          {"Affiliation" |> str}
-        </label>
-        <span className="text-xs ml-1"> {"(optional)" |> str} </span>
-        <input
-          value=state.affiliation
-          onChange={event => send(UpdateAffiliation(ReactEvent.Form.target(event)["value"]))}
-          className="appearance-none block w-full bg-white border border-gray-400 rounded py-3 px-4 leading-snug focus:outline-none focus:bg-white focus:border-gray-500"
-          id="affiliation"
-          type_="text"
-          placeholder="Acme Inc., Acme University, etc."
-        />
-      </div>
-      <div className="mt-5">
-        <div className="border-b pb-4 mb-2 mt-5 ">
-          <span className="inline-block mr-1 text-xs font-semibold">
-            {(isSingleStudent ? "Personal Coaches" : "Team Coaches") |> str}
-          </span>
-          {teamCoachesEditor(courseCoaches, state, send)}
-        </div>
-      </div>
-      <div className="mt-5">
-        <div className="mb-2 text-xs font-semibold"> {"Tags applied:" |> str} </div>
-        <StudentsEditor__SearchableTagList
-          unselectedTags={studentTags |> Js.Array.filter(tag =>
-            !(state.tagsToApply |> Array.mem(tag))
-          )}
-          selectedTags=state.tagsToApply
-          addTagCB={tag => send(AddTag(tag))}
-          removeTagCB={tag => send(RemoveTag(tag))}
-          allowNewTags=true
-        />
-      </div>
-      <div className="mt-5">
-        <div className="flex items-center flex-shrink-0">
-          <label className="block tracking-wide text-xs font-semibold mr-3">
-            {"Should this student be excluded from leaderboards?" |> str}
-          </label>
-          <div className="flex flex-shrink-0 rounded-lg overflow-hidden border border-gray-400">
-            <button
-              title="Exclude this student from the leaderboard"
-              onClick={event => {
-                ReactEvent.Mouse.preventDefault(event)
-                send(UpdateExcludedFromLeaderboard(true))
-              }}
-              className={boolBtnClasses(state.excludedFromLeaderboard)}>
-              {"Yes" |> str}
-            </button>
-            <button
-              title="Include this student in the leaderboard"
-              onClick={_event => {
-                ReactEvent.Mouse.preventDefault(_event)
-                send(UpdateExcludedFromLeaderboard(false))
-              }}
-              className={boolBtnClasses(!state.excludedFromLeaderboard)}>
-              {"No" |> str}
-            </button>
-          </div>
-        </div>
-      </div>
-      <div className="mt-5">
-        <label className="tracking-wide text-xs font-semibold" htmlFor="access-ends-at-input">
-          {(isSingleStudent ? "Student's" : "Team's") ++ " Access Ends On" |> str}
-        </label>
-        <span className="ml-1 text-xs"> {"(optional)" |> str} </span>
-        <HelpIcon
-          className="ml-2" link="https://docs.pupilfirst.com/#/students?id=editing-student-details">
-          {"If set, students will not be able to complete targets after this date." |> str}
-        </HelpIcon>
-        <DatePicker
-          onChange={date => send(UpdateAccessEndsAt(date))}
-          selected=?state.accessEndsAt
-          id="access-ends-at-input"
-        />
-      </div>
-    </div>
-    <div className="my-5 w-auto">
-      <button
-        disabled={formInvalid(state)}
-        onClick={_e =>
-          updateStudent(student, state, send, handleResponseCB(updateFormCB, state, student, team))}
-        className="w-full btn btn-large btn-primary">
-        {"Update Student" |> str}
-      </button>
-    </div>
-  </DisablingCover>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__UpdateForm.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__UpdateForm.res
deleted file mode 100644
index dc852d9..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/StudentsEditor__UpdateForm.res
+++ /dev/null
@@ -1,61 +0,0 @@
-open StudentsEditor__Types
-
-type teamCoachlist = (string, string, bool)
-
-type view =
-  | DetailsTab
-  | ActionsTab
-
-let str = ReasonReact.string
-
-let selectedTabClasses = selected =>
-  "flex items-center focus:outline-none justify-center w-1/2 p-3 font-semibold rounded-t-lg leading-relaxed border border-gray-400 text-gray-600 cursor-pointer " ++ (
-    selected ? "text-primary-500 bg-white border-b-0" : "bg-gray-100"
-  )
-
-let tabItemsClasses = selected => selected ? "" : "hidden"
-
-@react.component
-let make = (~student, ~team, ~studentTags, ~courseCoaches, ~updateFormCB, ~reloadTeamsCB) => {
-  let (view, setView) = React.useState(() => DetailsTab)
-  <div className="mx-auto bg-white">
-    <div className="pt-6 border-b border-gray-400 bg-gray-100">
-      <div className="max-w-2xl mx-auto">
-        <div className="flex">
-          {switch student |> Student.avatarUrl {
-          | Some(avatarUrl) => <img className="w-12 h-12 rounded-full mr-4" src=avatarUrl />
-          | None => <Avatar name={student |> Student.name} className="w-12 h-12 mr-4" />
-          }}
-          <div className="text-sm flex flex-col justify-center">
-            <div className="text-black font-bold inline-block">
-              {student |> Student.name |> str}
-            </div>
-            <div className="text-gray-600 inline-block"> {student |> Student.email |> str} </div>
-          </div>
-        </div>
-        <div className="w-full pt-6">
-          <div className="flex flex-wrap w-full max-w-3xl mx-auto text-sm px-3 -mb-px">
-            <button
-              className={selectedTabClasses(view == DetailsTab)}
-              onClick={_ => setView(_ => DetailsTab)}>
-              <i className="fa fa-edit" /> <span className="ml-2"> {"Details" |> str} </span>
-            </button>
-            <button
-              className={"-ml-px " ++ selectedTabClasses(view == ActionsTab)}
-              onClick={_ => setView(_ => ActionsTab)}>
-              <i className="fa fa-cog" /> <span className="ml-2"> {"Actions" |> str} </span>
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div className="max-w-2xl mx-auto">
-      <div className={tabItemsClasses(view == DetailsTab)}>
-        <StudentsEditor__UpdateDetailsForm student team studentTags courseCoaches updateFormCB />
-      </div>
-      <div className={tabItemsClasses(view == ActionsTab)}>
-        <StudentsEditor__ActionsForm student reloadTeamsCB />
-      </div>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/TargetChecklistItem.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/TargetChecklistItem.res
deleted file mode 100644
index 28b931e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/TargetChecklistItem.res
+++ /dev/null
@@ -1,185 +0,0 @@
-type choices = array<string>
-
-type kind =
-  | Files
-  | Link
-  | ShortText
-  | LongText
-  | MultiChoice(choices)
-
-type t = {
-  title: string,
-  kind: kind,
-  optional: bool,
-}
-
-let title = t => t.title
-let kind = t => t.kind
-let optional = t => t.optional
-
-let actionStringForKind = kind =>
-  switch kind {
-  | Files => "Upload Files"
-  | Link => "Attach a Link"
-  | ShortText => "Write Short Text"
-  | LongText => "Write Long Text"
-  | MultiChoice(_choices) => "Choose from a list"
-  }
-
-let kindAsString = kind =>
-  switch kind {
-  | Files => "files"
-  | Link => "link"
-  | ShortText => "shortText"
-  | LongText => "longText"
-  | MultiChoice(_choices) => "multiChoice"
-  }
-
-let make = (~title, ~kind, ~optional) => {
-  title: title,
-  kind: kind,
-  optional: optional,
-}
-
-let updateTitle = (title, t) => {
-  ...t,
-  title: title,
-}
-
-let updateKind = (kind, t) => {
-  ...t,
-  kind: kind,
-}
-
-let updateOptional = (optional, t) => {
-  ...t,
-  optional: optional,
-}
-
-let removeItem = (index, list) => list |> Js.Array.filteri((_item, i) => i != index)
-
-let moveUp = (index, list) => list |> ArrayUtils.swapUp(index)
-
-let moveDown = (index, list) => list |> ArrayUtils.swapDown(index)
-
-let copy = (i, list) =>
-  list
-  |> Array.mapi((index, item) => i == index ? list{item, item} : list{item})
-  |> ArrayUtils.flatten
-
-let removeMultichoiceOption = (choiceIndex, t) =>
-  switch t.kind {
-  | MultiChoice(choices) =>
-    let updatedChoices =
-      choices
-      |> Array.mapi((i, choice) => i == choiceIndex ? list{} : list{choice})
-      |> ArrayUtils.flatten
-    t |> updateKind(MultiChoice(updatedChoices))
-  | Files
-  | Link
-  | ShortText
-  | LongText => t
-  }
-
-let addMultichoiceOption = t =>
-  switch t.kind {
-  | MultiChoice(choices) =>
-    let updatedChoices = [""] |> Array.append(choices)
-    t |> updateKind(MultiChoice(updatedChoices))
-  | Files
-  | Link
-  | ShortText
-  | LongText => t
-  }
-
-let updateMultichoiceOption = (choiceIndex, newOption, t) =>
-  switch t.kind {
-  | MultiChoice(choices) =>
-    let updatedChoices = choices |> Array.mapi((i, choice) => i == choiceIndex ? newOption : choice)
-    t |> updateKind(MultiChoice(updatedChoices))
-  | Files
-  | Link
-  | ShortText
-  | LongText => t
-  }
-
-let longText = {title: "", kind: LongText, optional: false}
-
-let isFilesKind = t =>
-  switch t.kind {
-  | Files => true
-  | MultiChoice(_choices) => false
-  | Link
-  | ShortText
-  | LongText => false
-  }
-
-let isValidChecklistItem = t =>
-  switch t.kind {
-  | MultiChoice(choices) =>
-    choices |> Js.Array.filter(choice => choice |> String.trim == "") |> ArrayUtils.isEmpty &&
-      t.title |> String.trim |> String.length >= 1
-  | Files
-  | Link
-  | ShortText
-  | LongText =>
-    t.title |> String.trim |> String.length >= 1
-  }
-
-let decodeMetadata = (kind, json) =>
-  switch kind {
-  | #MultiChoice =>
-    json |> {
-      open Json.Decode
-      field("choices", array(string))
-    }
-  }
-
-let decode = json => {
-  open Json.Decode
-  {
-    kind: switch json |> field("kind", string) {
-    | "files" => Files
-    | "link" => Link
-    | "shortText" => ShortText
-    | "longText" => LongText
-    | "multiChoice" => MultiChoice(json |> field("metadata", decodeMetadata(#MultiChoice)))
-    | otherKind =>
-      Rollbar.error(
-        "Unkown kind: " ++ (otherKind ++ "received in CurriculumEditor__TargetChecklistItem"),
-      )
-      LongText
-    },
-    optional: json |> field("optional", bool),
-    title: json |> field("title", string),
-  }
-}
-
-let encodeMetadata = kind =>
-  switch kind {
-  | MultiChoice(choices) =>
-    open Json.Encode
-    object_(list{("choices", choices |> stringArray)})
-  | Files
-  | Link
-  | ShortText
-  | LongText =>
-    open Json.Encode
-    object_(list{})
-  }
-
-let encode = t => {
-  open Json.Encode
-  object_(list{
-    ("kind", t.kind |> kindAsString |> string),
-    ("title", t.title |> string),
-    ("optional", t.optional |> bool),
-    ("metadata", t.kind |> encodeMetadata),
-  })
-}
-
-let encodeChecklist = checklist =>
-  checklist |> {
-    open Json.Encode
-    array(encode)
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/schools/studentsEditor__SelectedStudent.res b/jscomp/syntax/tests/idempotency/pupilfirst/schools/studentsEditor__SelectedStudent.res
deleted file mode 100644
index 723e07b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/schools/studentsEditor__SelectedStudent.res
+++ /dev/null
@@ -1,51 +0,0 @@
-type t = {
-  name: string,
-  id: string,
-  teamId: string,
-  avatarUrl: option<string>,
-  levelId: string,
-  teamSize: int,
-}
-
-let id = t => t.id
-
-let avatarUrl = t => t.avatarUrl
-
-let name = t => t.name
-
-let selectedAcrossTeams = selectedStudents =>
-  selectedStudents |> Array.map(s => s.teamId) |> ArrayUtils.distinct |> Array.length > 1
-
-let partOfTeamSelected = selectedStudents => {
-  let selectedTeamSize = selectedStudents |> Array.length
-
-  selectedStudents
-  |> Js.Array.filter(s => s.teamSize > selectedTeamSize)
-  |> Array.length == selectedTeamSize
-}
-
-let selectedWithinLevel = selectedStudents =>
-  selectedStudents
-  |> Array.map(s => s.levelId)
-  |> ArrayUtils.sort_uniq(String.compare)
-  |> Array.length == 1
-
-let isGroupable = selectedStudents =>
-  if selectedStudents |> Array.length > 1 {
-    (selectedWithinLevel(selectedStudents) && selectedAcrossTeams(selectedStudents)) ||
-      partOfTeamSelected(selectedStudents)
-  } else {
-    false
-  }
-
-let isMoveOutable = selectedStudents =>
-  selectedStudents |> Array.length == 1 && selectedStudents |> Array.map(s => s.teamSize) != [1]
-
-let make = (~name, ~id, ~teamId, ~avatarUrl, ~levelId, ~teamSize) => {
-  name: name,
-  id: id,
-  teamId: teamId,
-  avatarUrl: avatarUrl,
-  levelId: levelId,
-  teamSize: teamSize,
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Api.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Api.res
deleted file mode 100644
index 78c5444..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Api.res
+++ /dev/null
@@ -1,78 +0,0 @@
-exception UnexpectedResponse(int)
-
-let handleApiError = x =>
-  switch x {
-  | UnexpectedResponse(code) => code
-  }
-
-let acceptOrRejectResponse = response =>
-  if Fetch.Response.ok(response) || Fetch.Response.status(response) == 422 {
-    response |> Fetch.Response.json
-  } else {
-    Js.Promise.reject(UnexpectedResponse(response |> Fetch.Response.status))
-  }
-
-let handleResponseError = error => {
-  let message = "Our team has been notified of this error. Please reload the page and try again."
-
-  switch error |> handleApiError {
-  | Some(code) => Notification.error(code |> string_of_int, message)
-  | None => Notification.error("An unexpected error occurred", message)
-  }
-}
-
-let handleResponseJSON = (json, responseCB, errorCB) => {
-  let error = json |> {
-    open Json.Decode
-    optional(field("error", string))
-  }
-
-  switch error {
-  | Some(error) =>
-    Notification.error("Something went wrong!", error)
-    errorCB()
-  | None => responseCB(json)
-  }
-}
-
-let handleResponse = (responseCB, errorCB, promise) => {
-  open Js.Promise
-  promise
-  |> then_(response => acceptOrRejectResponse(response))
-  |> then_(json => handleResponseJSON(json, responseCB, errorCB) |> resolve)
-  |> catch(error => {
-    errorCB()
-    Js.log(error)
-    handleResponseError(error |> handleApiError) |> resolve
-  })
-  |> ignore
-}
-
-let sendPayload = (url, payload, responseCB, errorCB, method_) =>
-  Fetch.fetchWithInit(
-    url,
-    Fetch.RequestInit.make(
-      ~method_,
-      ~body=Fetch.BodyInit.make(Js.Json.stringify(Js.Json.object_(payload))),
-      ~headers=Fetch.HeadersInit.make({"Content-Type": "application/json"}),
-      ~credentials=Fetch.SameOrigin,
-      (),
-    ),
-  ) |> handleResponse(responseCB, errorCB)
-
-let sendFormData = (url, formData, responseCB, errorCB) =>
-  Fetch.fetchWithInit(
-    url,
-    Fetch.RequestInit.make(
-      ~method_=Post,
-      ~body=Fetch.BodyInit.makeWithFormData(formData),
-      ~credentials=Fetch.SameOrigin,
-      (),
-    ),
-  ) |> handleResponse(responseCB, errorCB)
-
-let create = (url, payload, responseCB, errorCB) =>
-  sendPayload(url, payload, responseCB, errorCB, Post)
-
-let update = (url, payload, responseCB, errorCB) =>
-  sendPayload(url, payload, responseCB, errorCB, Patch)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/ArrayUtils.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/ArrayUtils.res
deleted file mode 100644
index dab7fbe..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/ArrayUtils.res
+++ /dev/null
@@ -1,57 +0,0 @@
-exception UnsafeFindFailed(string)
-
-let copyAndSort = (f, t) => {
-  let cp = t |> Array.copy
-  cp |> Array.sort(f)
-  cp
-}
-
-let copyAndPush = (e, t) => {
-  let copy = t |> Array.copy
-  copy |> Js.Array.push(e) |> ignore
-  copy
-}
-
-let isEmpty = a =>
-  switch a {
-  | [] => true
-  | _ => false
-  }
-
-let isNotEmpty = a => !(a |> isEmpty)
-
-let unsafeFind = (p, message, l) =>
-  switch Js.Array.find(p, l) {
-  | Some(e) => e
-  | None =>
-    Rollbar.error(message)
-    Notification.error(
-      "An unexpected error occurred",
-      "Our team has been notified about this error. Please try reloading this page.",
-    )
-    raise(UnsafeFindFailed(message))
-  }
-
-let flatten = t => t |> Array.to_list |> List.flatten |> Array.of_list
-
-let distinct = t => t |> Array.to_list |> ListUtils.distinct |> Array.of_list
-
-let sort_uniq = (f, t) => t |> Array.to_list |> List.sort_uniq(f) |> Array.of_list
-
-let getOpt = (a, i) =>
-  try Some(a |> Array.get(i)) catch {
-  | Not_found => None
-  }
-
-let swapUp = (i, t) =>
-  if i <= 0 || i >= (t |> Array.length) {
-    Rollbar.warning("Index to swap out of bounds in array!")
-    t
-  } else {
-    let copy = t |> Array.copy
-    copy[i] = t[i - 1]
-    copy[i - 1] = t[i]
-    copy
-  }
-
-let swapDown = (i, t) => swapUp(i + 1, t)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/AuthenticityToken.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/AuthenticityToken.res
deleted file mode 100644
index 1085be0..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/AuthenticityToken.res
+++ /dev/null
@@ -1,17 +0,0 @@
-exception CSRFTokenMissing
-exception CSRFTokenEmpty
-
-open Webapi.Dom
-
-let fromHead = () => {
-  let metaTag = document |> Document.querySelector("meta[name='csrf-token']")
-
-  switch metaTag {
-  | None => raise(CSRFTokenMissing)
-  | Some(tag) =>
-    switch tag |> Element.getAttribute("content") {
-    | None => raise(CSRFTokenEmpty)
-    | Some(token) => token
-    }
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Avatar.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Avatar.res
deleted file mode 100644
index f13e7bc..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Avatar.res
+++ /dev/null
@@ -1,93 +0,0 @@
-let colors = [
-  ("#ff4040", false),
-  ("#7f2020", false),
-  ("#cc5c33", false),
-  ("#734939", false),
-  ("#bf9c8f", false),
-  ("#995200", false),
-  ("#4c2900", false),
-  ("#f2a200", false),
-  ("#ffd580", true),
-  ("#332b1a", false),
-  ("#4c3d00", false),
-  ("#ffee00", true),
-  ("#b0b386", false),
-  ("#64664d", false),
-  ("#6c8020", false),
-  ("#c3d96c", true),
-  ("#143300", false),
-  ("#19bf00", false),
-  ("#53a669", false),
-  ("#bfffd9", true),
-  ("#40ffbf", true),
-  ("#1a332e", false),
-  ("#00b3a7", false),
-  ("#165955", false),
-  ("#00b8e6", false),
-  ("#69818c", false),
-  ("#005ce6", false),
-  ("#6086bf", false),
-  ("#000e66", false),
-  ("#202440", false),
-  ("#393973", false),
-  ("#4700b3", false),
-  ("#2b0d33", false),
-  ("#aa86b3", false),
-  ("#ee00ff", false),
-  ("#bf60b9", false),
-  ("#4d3949", false),
-  ("#ff00aa", false),
-  ("#7f0044", false),
-  ("#f20061", false),
-  ("#330007", false),
-  ("#d96c7b", false),
-]
-
-let initials = name =>
-  name
-  |> Js.String.split(" ")
-  |> Js.Array.slice(~start=0, ~end_=2)
-  |> Js.Array.map(word => word |> Js.String.slice(~from=0, ~to_=1))
-  |> Js.Array.joinWith("")
-
-let stringToInt = name => {
-  let rec aux = (sum, remains) =>
-    switch remains {
-    | "" => sum
-    | remains =>
-      let firstCharacter = remains |> Js.String.slice(~from=0, ~to_=1)
-      let remains = remains |> Js.String.sliceToEnd(~from=1)
-      aux(sum +. (firstCharacter |> Js.String.charCodeAt(0)), remains)
-    }
-
-  aux(0.0, name) |> int_of_float
-}
-
-let computeColors = name => {
-  let index = mod(name |> stringToInt, 42)
-  let (backgroundColor, blackText) = colors[index]
-  (backgroundColor, blackText ? "#000000" : "#FFFFFF")
-}
-
-@react.component
-let make = (~colors=?, ~name, ~className=?) => {
-  let (bgColor, fgColor) = switch colors {
-  | Some((bgColor, fgColor)) => (bgColor, fgColor)
-  | None => computeColors(name)
-  }
-
-  <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 100 100" title=name ?className>
-    <circle cx="50" cy="50" r="50" fill=bgColor />
-    <text
-      fill=fgColor
-      fontSize="42"
-      fontFamily="sans-serif"
-      x="50"
-      y="54"
-      textAnchor="middle"
-      dominantBaseline="middle"
-      alignmentBaseline="middle">
-      {initials(name) |> React.string}
-    </text>
-  </svg>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Checkbox.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Checkbox.res
deleted file mode 100644
index f2ef7e1..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Checkbox.res
+++ /dev/null
@@ -1,17 +0,0 @@
-%raw(`require("./Checkbox.css")`)
-
-let str = React.string
-
-@react.component
-let make = (~id, ~label, ~onChange, ~checked=false) =>
-  <div>
-    <input className="hidden checkbox__input" id type_="checkbox" onChange checked />
-    <label className="checkbox__label flex items-center" htmlFor=id>
-      <span>
-        <svg width="11px" height="11px" viewBox="0 0 13 13">
-          <polyline points="1.5 6 4.5 9 10.5 1" />
-        </svg>
-      </span>
-      <span className="text-sm flex-1 font-semibold leading-loose"> {label |> str} </span>
-    </label>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/ContentBlock.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/ContentBlock.res
deleted file mode 100644
index 1a7c52a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/ContentBlock.res
+++ /dev/null
@@ -1,194 +0,0 @@
-exception UnexpectedBlockType(string)
-
-type markdown = string
-type url = string
-type title = string
-type caption = string
-type embedCode = string
-type filename = string
-
-type blockType =
-  | Markdown(markdown)
-  | File(url, title, filename)
-  | Image(url, caption)
-  | Embed(url, embedCode)
-
-type rec t = {
-  id: id,
-  blockType: blockType,
-  sortIndex: int,
-}
-and id = string
-
-let decodeMarkdownContent = json => {
-  open Json.Decode
-  json |> field("markdown", string)
-}
-let decodeFileContent = json => {
-  open Json.Decode
-  json |> field("title", string)
-}
-let decodeImageContent = json => {
-  open Json.Decode
-  json |> field("caption", string)
-}
-let decodeEmbedContent = json => {
-  open Json.Decode
-  (json |> field("url", string), json |> field("embedCode", string))
-}
-
-let decode = json => {
-  open Json.Decode
-
-  let blockType = switch json |> field("blockType", string) {
-  | "markdown" => Markdown(json |> field("content", decodeMarkdownContent))
-  | "file" =>
-    let title = json |> field("content", decodeFileContent)
-    let url = json |> field("fileUrl", string)
-    let filename = json |> field("filename", string)
-    File(url, title, filename)
-  | "image" =>
-    let caption = json |> field("content", decodeImageContent)
-    let url = json |> field("fileUrl", string)
-    Image(url, caption)
-  | "embed" =>
-    let (url, embedCode) = json |> field("content", decodeEmbedContent)
-    Embed(url, embedCode)
-  | unknownBlockType => raise(UnexpectedBlockType(unknownBlockType))
-  }
-
-  {
-    id: json |> field("id", string),
-    blockType: blockType,
-    sortIndex: json |> field("sortIndex", int),
-  }
-}
-
-let sort = blocks => blocks |> ArrayUtils.copyAndSort((x, y) => x.sortIndex - y.sortIndex)
-
-let id = t => t.id
-let blockType = t => t.blockType
-let sortIndex = t => t.sortIndex
-
-let makeMarkdownBlock = markdown => Markdown(markdown)
-let makeImageBlock = (fileUrl, caption) => Image(fileUrl, caption)
-let makeFileBlock = (fileUrl, title, fileName) => File(fileUrl, title, fileName)
-let makeEmbedBlock = (url, embedCode) => Embed(url, embedCode)
-
-let make = (id, blockType, sortIndex) => {id: id, blockType: blockType, sortIndex: sortIndex}
-
-let makeFromJs = js => {
-  let id = js["id"]
-  let sortIndex = js["sortIndex"]
-  let blockType = switch js["content"] {
-  | #MarkdownBlock(content) => Markdown(content["markdown"])
-  | #FileBlock(content) => File(content["url"], content["title"], content["filename"])
-  | #ImageBlock(content) => Image(content["url"], content["caption"])
-  | #EmbedBlock(content) => Embed(content["url"], content["embedCode"])
-  }
-
-  make(id, blockType, sortIndex)
-}
-
-let blockTypeAsString = blockType =>
-  switch blockType {
-  | Markdown(_markdown) => "markdown"
-  | File(_url, _title, _filename) => "file"
-  | Image(_url, _caption) => "image"
-  | Embed(_url, _embedCode) => "embed"
-  }
-
-let incrementSortIndex = t => {...t, sortIndex: t.sortIndex + 1}
-
-let reindex = ts => ts |> List.mapi((sortIndex, t) => {...t, sortIndex: sortIndex})
-
-let moveUp = (t, ts) =>
-  ts |> sort |> Array.to_list |> ListUtils.swapUp(t) |> reindex |> Array.of_list
-
-let moveDown = (t, ts) =>
-  ts |> sort |> Array.to_list |> ListUtils.swapDown(t) |> reindex |> Array.of_list
-
-let updateFile = (title, t) =>
-  switch t.blockType {
-  | File(url, _, filename) => {...t, blockType: File(url, title, filename)}
-  | Markdown(_)
-  | Image(_)
-  | Embed(_) => t
-  }
-
-let updateImage = (caption, t) =>
-  switch t.blockType {
-  | Image(url, _) => {...t, blockType: Image(url, caption)}
-  | Markdown(_)
-  | File(_)
-  | Embed(_) => t
-  }
-
-let updateMarkdown = (markdown, t) =>
-  switch t.blockType {
-  | Markdown(_) => {...t, blockType: Markdown(markdown)}
-  | File(_)
-  | Image(_)
-  | Embed(_) => t
-  }
-
-module Fragments = %graphql(`
-  fragment allFields on ContentBlock {
-    id
-    blockType
-    sortIndex
-    content {
-      ... on ImageBlock {
-        caption
-        url
-        filename
-      }
-      ... on FileBlock {
-        title
-        url
-        filename
-      }
-      ... on MarkdownBlock {
-        markdown
-      }
-      ... on EmbedBlock {
-        url
-        embedCode
-      }
-    }
-  }
-`)
-
-module Query = %graphql(`
-    query ContentBlocksWithVersionsQuery($targetId: ID!, $targetVersionId: ID) {
-      contentBlocks(targetId: $targetId, targetVersionId: $targetVersionId) {
-        id
-        blockType
-        sortIndex
-        content {
-          ... on ImageBlock {
-            caption
-            url
-            filename
-          }
-          ... on FileBlock {
-            title
-            url
-            filename
-          }
-          ... on MarkdownBlock {
-            markdown
-          }
-          ... on EmbedBlock {
-            url
-            embedCode
-          }
-        }
-      }
-      versions(targetId: $targetId){
-        id
-        createdAt
-        updatedAt
-      }
-  }
-`)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Date.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Date.res
deleted file mode 100644
index 0f28f4f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Date.res
+++ /dev/null
@@ -1 +0,0 @@
-let iso8601 = t => t |> DateFns.format("YYYY-MM-DD")
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/DatePicker.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/DatePicker.res
deleted file mode 100644
index 89b07dd..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/DatePicker.res
+++ /dev/null
@@ -1,12 +0,0 @@
-module JsComponent = {
-  @module("./DatePicker") @react.component
-  external make: (
-    ~id: string=?,
-    ~onChange: Js.Nullable.t<Js.Date.t> => unit,
-    ~selected: Js.Date.t=?,
-  ) => React.element = "default"
-}
-
-@react.component
-let make = (~onChange, ~selected=?, ~id=?) =>
-  <JsComponent ?id onChange={date => onChange(date |> Js.Nullable.toOption)} ?selected />
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/DateTime.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/DateTime.res
deleted file mode 100644
index b902ba4..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/DateTime.res
+++ /dev/null
@@ -1,30 +0,0 @@
-type t = Js.Date.t
-
-@val @module("date-fns")
-external dateFormat: (t, string) => string = "format"
-
-@val @module("date-fns") external dateParse: string => t = "parse"
-
-let parse = s => s |> dateParse
-
-type format =
-  | OnlyDate
-  | DateWithYearAndTime
-
-let format = (f, t) => {
-  let formatString = switch f {
-  | OnlyDate => "MMM D, YYYY"
-  | DateWithYearAndTime => "Do MMM YYYY HH:mm"
-  }
-  dateFormat(t, formatString)
-}
-
-let stingToFormatedTime = (f, t) => format(f, parse(t))
-
-let randomId = () => {
-  let number = Js.Math.random() |> Js.Float.toString
-  let time = Js.Date.now() |> Js.Float.toString
-  "I" ++ (time ++ number) |> Js.String.replace(".", "-")
-}
-
-let decode = json => json |> Json.Decode.string |> DateFns.parseString
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/DateTime.resi b/jscomp/syntax/tests/idempotency/pupilfirst/shared/DateTime.resi
deleted file mode 100644
index 0bcbd37..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/DateTime.resi
+++ /dev/null
@@ -1,15 +0,0 @@
-type t = Js.Date.t
-
-type format =
-  | OnlyDate
-  | DateWithYearAndTime
-
-let parse: string => t
-
-let format: (format, t) => string
-
-let stingToFormatedTime: (format, string) => string
-
-let randomId: unit => string
-
-let decode: Js.Json.t => t
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/DisablingCover.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/DisablingCover.res
deleted file mode 100644
index 3ac7690..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/DisablingCover.res
+++ /dev/null
@@ -1,31 +0,0 @@
-%raw(`require("./DisablingCover.css")`)
-
-@react.component
-let make = (~disabled, ~message="Loading...", ~containerClasses="", ~children) =>
-  <div className={"relative " ++ containerClasses}>
-    {if disabled {
-      [
-        <div
-          key="school-admin-disabling-cover__blanket"
-          className="absolute w-full h-full bg-white opacity-75 z-20 flex items-center justify-center"
-        />,
-        <div
-          key="school-admin-disabling-cover__body"
-          className="absolute w-full h-full z-20 flex items-center justify-center">
-          <div className="disabling-cover__loading-container bg-white rounded-lg shadow-xl p-4">
-            <div className="disabling-cover__loading-animation-box mx-auto">
-              <div className="disabling-cover__loading-box-1" />
-              <div className="disabling-cover__loading-box-2" />
-              <div className="disabling-cover__loading-box-3" />
-            </div>
-            <span className="block pt-2 font-semibold max-w-sm text-center text-sm">
-              {message |> React.string}
-            </span>
-          </div>
-        </div>,
-      ] |> React.array
-    } else {
-      React.null
-    }}
-    children
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/DomUtils.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/DomUtils.res
deleted file mode 100644
index 2ac537d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/DomUtils.res
+++ /dev/null
@@ -1,54 +0,0 @@
-exception DataElementMissing(string)
-exception RootElementMissing(string)
-exception RootAttributeMissing(string)
-
-open Webapi.Dom
-
-let parseJsonTag = (~id="react-root-data", ()) =>
-  switch document |> Document.getElementById(id) {
-  | Some(rootElement) => rootElement |> Element.innerHTML
-  | None => raise(DataElementMissing(id))
-  } |> Json.parseOrRaise
-
-let parseJsonAttribute = (~id="react-root", ~attribute="data-json-props", ()) =>
-  switch document |> Document.getElementById(id) {
-  | Some(rootElement) =>
-    switch rootElement |> Element.getAttribute(attribute) {
-    | Some(props) => props
-    | None => raise(RootAttributeMissing(attribute))
-    }
-  | None => raise(RootElementMissing(id))
-  } |> Json.parseOrRaise
-
-let redirect = path => path |> Webapi.Dom.Window.setLocation(window)
-
-let reload = () => location |> Location.reload
-
-let isDevelopment = () =>
-  switch document |> Document.documentElement |> Element.getAttribute("data-env") {
-  | Some(props) if props == "development" => true
-  | Some(_)
-  | None => false
-  }
-
-module FormData = {
-  type t = Fetch.formData
-
-  @new external create: Dom.element => t = "FormData"
-  @send external append: (t, 'a) => unit = "append"
-}
-
-module EventTarget = {
-  type t = {.}
-
-  /* Be careful when using this function. Event targets need not be an 'element'. */
-
-  external unsafeToElement: t => Dom.element = "%identity"
-  external unsafeToHtmlInputElement: t => Dom.htmlInputElement = "%identity"
-}
-
-module Element = {
-  type t = Dom.element
-
-  external unsafeToHtmlInputElement: t => Dom.htmlInputElement = "%identity"
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Dropdown.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Dropdown.res
deleted file mode 100644
index 8fe591f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Dropdown.res
+++ /dev/null
@@ -1,54 +0,0 @@
-open Webapi.Dom
-
-let onWindowClick = (showDropdown, setShowDropdown, _event) =>
-  if showDropdown {
-    setShowDropdown(_ => false)
-  } else {
-    ()
-  }
-
-let toggleDropdown = (setShowDropdown, event) => {
-  event |> ReactEvent.Mouse.stopPropagation
-  setShowDropdown(showDropdown => !showDropdown)
-}
-
-let containerClasses = className => "dropdown inline-block relative text-sm " ++ className
-
-@react.component
-let make = (~selected, ~contents, ~right=false, ~className="w-full md:w-auto") => {
-  let (showDropdown, setShowDropdown) = React.useState(() => false)
-
-  React.useEffect1(() => {
-    let curriedFunction = onWindowClick(showDropdown, setShowDropdown)
-
-    let removeEventListener = () => Window.removeEventListener("click", curriedFunction, window)
-
-    if showDropdown {
-      Window.addEventListener("click", curriedFunction, window)
-      Some(removeEventListener)
-    } else {
-      removeEventListener()
-      None
-    }
-  }, [showDropdown])
-
-  <div className={containerClasses(className)} onClick={toggleDropdown(setShowDropdown)}>
-    selected
-    {showDropdown
-      ? <ul
-          className={"dropdown__list bg-white overflow-y-auto shadow-lg rounded mt-1 border border-gray-400 absolute overflow-hidden min-w-full md:w-auto z-30 " ++ (
-            right ? "right-0" : "left-0"
-          )}>
-          {contents
-          |> Array.mapi((index, content) =>
-            <li
-              key={"dropdown-" ++ (index |> string_of_int)}
-              className="cursor-pointer block text-sm font-semibold text-gray-900 border-b border-gray-200 bg-white hover:text-primary-500 hover:bg-gray-200 md:whitespace-no-wrap">
-              content
-            </li>
-          )
-          |> React.array}
-        </ul>
-      : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/EmailUtils.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/EmailUtils.res
deleted file mode 100644
index 505c86e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/EmailUtils.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let regularExpression = %re(
-  "/^(([^<>()\\[\\]\\.,;:\\s@\"]+(\\.[^<>()\\[\\]\\.,;:\\s@\"]+)*)|(\".+\"))@(([^<>()[\\]\\.,;:\\s@\"]+\\.)+[^<>()[\\]\\.,;:\\s@\"]{2,})$/i"
-)
-
-let isInvalid = (allowBlank, email) =>
-  if email |> String.trim |> String.length > 0 {
-    !(email |> Js.Re.test_(regularExpression))
-  } else {
-    !allowBlank
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/EvaluationCriterion.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/EvaluationCriterion.res
deleted file mode 100644
index f9d58ac..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/EvaluationCriterion.res
+++ /dev/null
@@ -1,49 +0,0 @@
-type t = {
-  name: string,
-  id: string,
-  maxGrade: int,
-  passGrade: int,
-  gradesAndLabels: array<GradeLabel.t>,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    gradesAndLabels: json |> field("gradeLabels", array(GradeLabel.decode)),
-    maxGrade: json |> field("maxGrade", int),
-    passGrade: json |> field("passGrade", int),
-  }
-}
-
-let id = t => t.id
-
-let maxGrade = t => t.maxGrade
-
-let sort = evaluationCriteria =>
-  evaluationCriteria |> ArrayUtils.copyAndSort((x, y) => String.compare(x.name, y.name))
-
-let name = t => t.name
-
-let gradesAndLabels = t => t.gradesAndLabels
-
-let passGrade = t => t.passGrade
-
-let makeFromJs = evaluationCriterion => {
-  name: evaluationCriterion["name"],
-  id: evaluationCriterion["id"],
-  maxGrade: evaluationCriterion["maxGrade"],
-  passGrade: evaluationCriterion["passGrade"],
-  gradesAndLabels: evaluationCriterion["gradeLabels"] |> Js.Array.map(gL =>
-    gL |> GradeLabel.makeFromJs
-  ),
-}
-
-let make = (~id, ~name, ~maxGrade, ~passGrade, ~gradesAndLabels) => {
-  id: id,
-  name: name,
-  maxGrade: maxGrade,
-  passGrade: passGrade,
-  gradesAndLabels: gradesAndLabels,
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/FaIcon.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/FaIcon.res
deleted file mode 100644
index 8c306cd..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/FaIcon.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@react.component
-let make = (~classes) => <span key=classes> <i className=classes /> </span>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/GradeLabel.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/GradeLabel.res
deleted file mode 100644
index da11b8e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/GradeLabel.res
+++ /dev/null
@@ -1,50 +0,0 @@
-exception GradeLabelsEmpty
-
-type t = {
-  label: string,
-  grade: int,
-}
-
-let decode = json => {
-  open Json.Decode
-  {
-    label: json |> field("label", string),
-    grade: json |> field("grade", int),
-  }
-}
-
-let grade = t => t.grade
-let label = t => t.label
-
-let labelFor = (gradeLabels, grade) =>
-  gradeLabels |> List.find(gradeLabel => gradeLabel.grade == grade) |> label
-
-let create = (grade, label) => {grade: grade, label: label}
-
-let empty = grade => {grade: grade, label: ""}
-
-let update = (label, t) => {...t, label: label}
-
-let asJsObject = t => {"grade": t.grade, "label": t.label}
-
-let valid = t => t.label |> Js.String.trim |> Js.String.length >= 1
-
-let makeFromJs = rawGradeLabel => {
-  label: rawGradeLabel["label"],
-  grade: rawGradeLabel["grade"],
-}
-
-let maxGrade = gradeLabels => {
-  let rec aux = (max, remains) =>
-    switch remains {
-    | list{} => max
-    | list{head, ...tail} => aux(Js.Math.max_int(head.grade, max), tail)
-    }
-
-  switch aux(0, gradeLabels) {
-  | 0 =>
-    Rollbar.error("GradeLabel.maxGrade received an empty list of gradeLabels")
-    raise(GradeLabelsEmpty)
-  | validGrade => validGrade
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/GraphqlErrorHandler.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/GraphqlErrorHandler.res
deleted file mode 100644
index a9ecb76..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/GraphqlErrorHandler.res
+++ /dev/null
@@ -1,31 +0,0 @@
-module type Error = {
-  type t
-  let notification: t => (string, string)
-}
-
-module Make = (Error: Error) => {
-  exception Errors(array<Error.t>)
-
-  let handler = ((), x) =>
-    switch x {
-    | Errors(errors) =>
-      errors |> Array.iter(error => {
-        let (title, message) = Error.notification(error)
-        Notification.error(title, message)
-      })
-    }
-
-  let catch = (callback, promise) =>
-    promise |> Js.Promise.catch(error => {
-      switch error |> handler() {
-      | Some(_x) => callback()
-      | None =>
-        Notification.error(
-          "Something went wrong!",
-          "An unexpected error has occurred, and our team has been notified about this. Please reload the page and try again.",
-        )
-        callback()
-      }
-      Js.Promise.resolve()
-    })
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/GraphqlQuery.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/GraphqlQuery.res
deleted file mode 100644
index b0412d4..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/GraphqlQuery.res
+++ /dev/null
@@ -1,85 +0,0 @@
-exception Graphql_error(string)
-
-type notification = {
-  kind: string,
-  title: string,
-  body: string,
-}
-
-let decodeNotification = json => {
-  open Json.Decode
-  {
-    kind: json |> field("kind", string),
-    title: json |> field("title", string),
-    body: json |> field("body", string),
-  }
-}
-
-let decodeNotifications = json => json |> Json.Decode.list(decodeNotification)
-
-let flashNotifications = obj =>
-  switch Js.Dict.get(obj, "notifications") {
-  | Some(notifications) =>
-    notifications
-    |> decodeNotifications
-    |> List.iter(n => {
-      let notify = switch n.kind {
-      | "success" => Notification.success
-      | "error" => Notification.error
-      | _ => Notification.notice
-      }
-
-      notify(n.title, n.body)
-    })
-  | None => ()
-  }
-
-let sendQuery = (~notify=true, q) => {
-  open Bs_fetch
-  fetchWithInit(
-    "/graphql",
-    RequestInit.make(
-      ~method_=Post,
-      ~body=Js.Dict.fromList(list{
-        ("query", Js.Json.string(q["query"])),
-        ("variables", q["variables"]),
-      })
-      |> Js.Json.object_
-      |> Js.Json.stringify
-      |> BodyInit.make,
-      ~credentials=Include,
-      ~headers=HeadersInit.makeWithArray([
-        ("X-CSRF-Token", AuthenticityToken.fromHead()),
-        ("Content-Type", "application/json"),
-      ]),
-      (),
-    ),
-  )
-  |> Js.Promise.then_(resp =>
-    if Response.ok(resp) {
-      Response.json(resp)
-    } else {
-      if notify {
-        let statusCode = resp |> Fetch.Response.status |> string_of_int
-
-        Notification.error(
-          "Error " ++ statusCode,
-          "Our team has been notified of this error. Please reload the page and try again.",
-        )
-      }
-
-      Js.Promise.reject(Graphql_error("Request failed: " ++ Response.statusText(resp)))
-    }
-  )
-  |> Js.Promise.then_(json =>
-    switch Js.Json.decodeObject(json) {
-    | Some(obj) =>
-      if notify {
-        obj |> flashNotifications
-      }
-
-      Js.Dict.unsafeGet(obj, "data") |> q["parse"] |> Js.Promise.resolve
-    | None => Js.Promise.reject(Graphql_error("Response is not an object"))
-    }
-  )
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/GraphqlQuery.resi b/jscomp/syntax/tests/idempotency/pupilfirst/shared/GraphqlQuery.resi
deleted file mode 100644
index c1d5f97..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/GraphqlQuery.resi
+++ /dev/null
@@ -1,4 +0,0 @@
-let sendQuery: (
-  ~notify: bool=?,
-  {.."parse": Js.Json.t => 'a, "query": string, "variables": Js.Json.t},
-) => Js.Promise.t<'a>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/HelpIcon.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/HelpIcon.res
deleted file mode 100644
index ae2f22a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/HelpIcon.res
+++ /dev/null
@@ -1,83 +0,0 @@
-let str = React.string
-
-%raw(`require("./HelpIcon.css")`)
-
-let onWindowClick = (helpVisible, setHelpVisible, _event) =>
-  if helpVisible {
-    setHelpVisible(_ => false)
-  } else {
-    ()
-  }
-
-let toggleHelp = (setHelpVisible, _event) => setHelpVisible(helpVisible => !helpVisible)
-
-type rec responsiveAlignment =
-  | NonResponsive(alignment)
-  | Responsive(alignment, alignment)
-and alignment =
-  | AlignLeft
-  | AlignRight
-  | AlignCenter
-
-let alignmentClass = alignment =>
-  switch alignment {
-  | AlignLeft => " left-0"
-  | AlignRight => " right-0"
-  | AlignCenter => " help-icon__help-container--center"
-  }
-
-let responsiveAlignmentClass = responsiveAlignment =>
-  switch responsiveAlignment {
-  | NonResponsive(alignment) => alignmentClass(alignment)
-  | Responsive(mobileAlignment, desktopAlignment) =>
-    let mobileClass = mobileAlignment |> alignmentClass
-
-    let desktopClass = switch desktopAlignment {
-    | AlignLeft => " md:right-auto md:left-0"
-    | AlignRight => " md:left-auto md:right-0"
-    | AlignCenter => " help-icon__help-container--md-center"
-    }
-
-    mobileClass ++ (" " ++ desktopClass)
-  }
-
-@react.component
-let make = (~className="", ~link=?, ~responsiveAlignment=NonResponsive(AlignCenter), ~children) => {
-  let (helpVisible, setHelpVisible) = React.useState(() => false)
-
-  React.useEffect1(() => {
-    let curriedFunction = onWindowClick(helpVisible, setHelpVisible)
-    let window = Webapi.Dom.window
-
-    let removeEventListener = () =>
-      Webapi.Dom.Window.removeEventListener("click", curriedFunction, window)
-
-    if helpVisible {
-      Webapi.Dom.Window.addEventListener("click", curriedFunction, window)
-      Some(removeEventListener)
-    } else {
-      removeEventListener()
-      None
-    }
-  }, [helpVisible])
-
-  <div className={"inline-block relative " ++ className} onClick={toggleHelp(setHelpVisible)}>
-    <FaIcon classes="fas fa-question-circle hover:text-gray-700 cursor-pointer" />
-    {helpVisible
-      ? <div
-          onClick={event => event |> ReactEvent.Mouse.stopPropagation}
-          className={"help-icon__help-container overflow-y-auto mt-1 border border-gray-900 absolute z-50 px-4 py-3 shadow-lg leading-snug rounded-lg bg-gray-900 text-white max-w-xs text-center" ++
-          (responsiveAlignment |> responsiveAlignmentClass)}>
-          children
-          {link
-          |> OptionUtils.map(link =>
-            <a href=link target="_blank" className="block mt-1 text-blue-300 hover:text-blue:200">
-              <FaIcon classes="fas fa-external-link-square-alt" />
-              <span className="ml-1"> {"Read more" |> str} </span>
-            </a>
-          )
-          |> OptionUtils.default(React.null)}
-        </div>
-      : React.null}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Icon.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Icon.res
deleted file mode 100644
index c310684..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Icon.res
+++ /dev/null
@@ -1 +0,0 @@
-include PfIcon
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Link.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Link.res
deleted file mode 100644
index f811bf8..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Link.res
+++ /dev/null
@@ -1,43 +0,0 @@
-let ctrlKey = Webapi.Dom.KeyboardEvent.ctrlKey
-let metaKey = Webapi.Dom.KeyboardEvent.metaKey
-
-external unsafeAsKeyboardEvent: ReactEvent.Mouse.t => Webapi.Dom.KeyboardEvent.t = "%identity"
-
-let onConfirm = (href, onClick, event) => {
-  event |> ReactEvent.Mouse.preventDefault
-  ReasonReactRouter.push(href)
-  onClick |> OptionUtils.mapWithDefault(onClick => onClick(event), ())
-}
-
-let onCancel = event => event |> ReactEvent.Mouse.preventDefault
-
-let handleOnClick = (href, confirm, onClick, event) => {
-  let keyboardEvent = event |> unsafeAsKeyboardEvent
-  let modifierPressed = keyboardEvent |> ctrlKey || keyboardEvent |> metaKey
-
-  switch (modifierPressed, confirm) {
-  | (true, _) => ()
-  | (false, Some(confirmationText)) =>
-    WindowUtils.confirm(
-      ~onCancel=() => onCancel(event),
-      confirmationText,
-      () => onConfirm(href, onClick, event),
-    )
-  | (false, None) => onConfirm(href, onClick, event)
-  }
-}
-
-@react.component
-let make = (
-  ~href,
-  ~ariaLabel=?,
-  ~className=?,
-  ~confirm=?,
-  ~id=?,
-  ~onClick=?,
-  ~title=?,
-  ~children,
-) =>
-  <a href ?ariaLabel ?className ?id ?title onClick={handleOnClick(href, confirm, onClick)}>
-    children
-  </a>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/ListUtils.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/ListUtils.res
deleted file mode 100644
index e84383b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/ListUtils.res
+++ /dev/null
@@ -1,51 +0,0 @@
-exception UnsafeFindFailed(string)
-
-let isEmpty = l =>
-  switch l {
-  | list{_h, ..._t} => false
-  | list{} => true
-  }
-
-let isNotEmpty = l => !(l |> isEmpty)
-
-let findOpt = (p, l) =>
-  try Some(List.find(p, l)) catch {
-  | Not_found => None
-  }
-
-let unsafeFind = (p, message, l) =>
-  try List.find(p, l) catch {
-  | Not_found =>
-    Rollbar.error(message)
-    raise(UnsafeFindFailed(message))
-  }
-
-let distinct = l => {
-  let rec aux = (l, d) =>
-    switch l {
-    | list{head, ...tail} =>
-      if d |> List.exists(u => u == head) {
-        aux(tail, d)
-      } else {
-        aux(tail, list{head, ...d})
-      }
-    | list{} => d
-    }
-
-  aux(l, list{})
-}
-
-let swapDown = (e, l) => {
-  let rec aux = (prev, l, e) =>
-    switch l {
-    | list{head, next, ...tail} if head == e => \"@"(prev, list{next, head, ...tail})
-    | list{head, ...tail} => aux(\"@"(prev, list{head}), tail, e)
-    | list{} => prev
-    }
-
-  aux(list{}, l, e)
-}
-
-let swapUp = (e, l) => l |> List.rev |> swapDown(e) |> List.rev
-
-let swap = (up, e, l) => up ? l |> swapUp(e) : l |> swapDown(e)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Loading.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Loading.res
deleted file mode 100644
index 83d915f..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Loading.res
+++ /dev/null
@@ -1,4 +0,0 @@
-type t =
-  | NotLoading
-  | Reloading
-  | LoadingMore
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/LoadingSpinner.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/LoadingSpinner.res
deleted file mode 100644
index eced649..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/LoadingSpinner.res
+++ /dev/null
@@ -1,48 +0,0 @@
-%raw(`require("./LoadingSpinner.css")`)
-
-let str = React.string
-
-let onAnimationEnd = (loading, setRender) =>
-  if !loading {
-    setRender(_ => false)
-  }
-
-let animationClass = loading =>
-  loading ? "loading-spinner__slide-up" : "loading-spinner__slide-down"
-
-@react.component
-let make = (~loading, ~message="Loading...") => {
-  let (shouldRender, setRender) = React.useState(() => loading)
-  let initialRender = React.useRef(true)
-  React.useEffect1(() => {
-    if initialRender |> React.Ref.current {
-      initialRender->React.Ref.setCurrent(false)
-    } else if loading {
-      setRender(_ => true)
-    }
-    None
-  }, [loading])
-  shouldRender
-    ? <div className="fixed bottom-0 z-50 w-full left-0 right-0 flex justify-center w-full">
-        <div
-          className={"loading-spinner__container " ++ animationClass(loading)}
-          onAnimationEnd={_ => onAnimationEnd(loading, setRender)}>
-          <div className="loading-spinner__xs">
-            <svg className="loading-spinner__svg" viewBox="0 0 50 50">
-              <circle
-                className="loading-spinner__svg-path"
-                cx="25"
-                cy="25"
-                r="20"
-                fill="none"
-                strokeWidth="5"
-              />
-            </svg>
-          </div>
-          <span className="inline-block ml-2 text-xs text-white font-semibold tracking-wide">
-            {message |> str}
-          </span>
-        </div>
-      </div>
-    : React.null
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Markdown.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Markdown.res
deleted file mode 100644
index c28131e..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Markdown.res
+++ /dev/null
@@ -1,19 +0,0 @@
-@module("./markdownIt") external markdownIt: string => string = "default"
-@module("./sanitize")
-external sanitize: (string, string) => string = "default"
-
-type profile =
-  | Comment
-  | QuestionAndAnswer
-  | Permissive
-  | AreaOfText
-
-let profileString = profile =>
-  switch profile {
-  | Comment => "comment"
-  | QuestionAndAnswer => "questionAndAnswer"
-  | Permissive => "permissive"
-  | AreaOfText => "areaOfText"
-  }
-
-let parse = (profile, markdown) => markdown |> markdownIt |> sanitize(profileString(profile))
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/MarkdownBlock.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/MarkdownBlock.res
deleted file mode 100644
index 6078d8d..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/MarkdownBlock.res
+++ /dev/null
@@ -1,38 +0,0 @@
-%raw(`require("./MarkdownBlock.css")`)
-
-let randomId = () => {
-  let randomComponent = Js.Math.random() |> Js.Float.toString |> Js.String.substr(~from=2)
-  "markdown-block-" ++ randomComponent
-}
-
-let profileClasses = (profile: Markdown.profile) =>
-  switch profile {
-  | Comment => "markdown-block__comment "
-  | QuestionAndAnswer => "markdown-block__question-and-answer "
-  | Permissive => "markdown-block__permissive "
-  | AreaOfText => "markdown-block__area-of-text "
-  }
-
-let markdownBlockClasses = (profile, className) => {
-  let defaultClasses = "markdown-block " ++ profileClasses(profile)
-  switch className {
-  | Some(className) => defaultClasses ++ className
-  | None => defaultClasses
-  }
-}
-
-@react.component
-let make = (~markdown, ~className=?, ~profile) => {
-  let (id, _setId) = React.useState(() => randomId())
-
-  React.useEffect1(() => {
-    PrismJs.highlightAllUnder(id)
-    None
-  }, [markdown])
-
-  <div
-    className={markdownBlockClasses(profile, className)}
-    id
-    dangerouslySetInnerHTML={"__html": markdown |> Markdown.parse(profile)}
-  />
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/MarkdownEditor.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/MarkdownEditor.res
deleted file mode 100644
index 16a5eff..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/MarkdownEditor.res
+++ /dev/null
@@ -1,670 +0,0 @@
-exception InvalidModeForPreview
-
-%raw(`require("./MarkdownEditor.css")`)
-
-let str = React.string
-
-type fullscreenMode = [#Editor | #Preview | #Split]
-
-type windowedMode = [#Editor | #Preview]
-
-type mode =
-  | Fullscreen(fullscreenMode)
-  | Windowed(windowedMode)
-
-type rec selection = (selectionStart, selectionEnd)
-and selectionStart = int
-and selectionEnd = int
-
-type rec uploadState =
-  | Uploading
-  | ReadyToUpload(uploadError)
-and uploadError = option<string>
-
-type state = {
-  id: string,
-  mode: mode,
-  selection: selection,
-  uploadState: uploadState,
-}
-
-type action =
-  | ClickPreview
-  | ClickSplit
-  | ClickFullscreen
-  | SetSelection(selection)
-  | BumpSelection(int)
-  | PressEscapeKey
-  | SetUploadError(uploadError)
-  | SetUploading
-  | FinishUploading
-
-let reducer = (state, action) =>
-  switch action {
-  | ClickPreview =>
-    let mode = switch state.mode {
-    | Windowed(#Preview) => Windowed(#Editor)
-    | Windowed(#Editor) => Windowed(#Preview)
-    | Fullscreen(#Editor)
-    | Fullscreen(#Split) =>
-      Fullscreen(#Preview)
-    | Fullscreen(#Preview) => Fullscreen(#Editor)
-    }
-    {...state, mode: mode}
-  | ClickSplit =>
-    let mode = switch state.mode {
-    | Windowed(_) => Fullscreen(#Split)
-    | Fullscreen(#Editor)
-    | Fullscreen(#Preview) =>
-      Fullscreen(#Split)
-    | Fullscreen(#Split) => Fullscreen(#Editor)
-    }
-    {...state, mode: mode}
-  | ClickFullscreen =>
-    let mode = switch state.mode {
-    | Windowed(#Editor) => Fullscreen(#Editor)
-    | Windowed(#Preview) => Fullscreen(#Preview)
-    | Fullscreen(#Editor) => Windowed(#Editor)
-    | Fullscreen(#Preview) => Windowed(#Preview)
-    | Fullscreen(#Split) => Windowed(#Editor)
-    }
-    {...state, mode: mode}
-  | SetSelection(selection) => {...state, selection: selection}
-  | BumpSelection(offset) =>
-    let (selectionStart, selectionEnd) = state.selection
-    {...state, selection: (selectionStart + offset, selectionEnd + offset)}
-  | PressEscapeKey =>
-    let mode = switch state.mode {
-    | Fullscreen(#Editor) => Windowed(#Editor)
-    | Windowed(#Preview)
-    | Fullscreen(#Preview) =>
-      Windowed(#Preview)
-    | Windowed(#Editor)
-    | Fullscreen(#Split) =>
-      Windowed(#Editor)
-    }
-    {...state, mode: mode}
-  | SetUploadError(error) => {...state, uploadState: ReadyToUpload(error)}
-  | SetUploading => {...state, uploadState: Uploading}
-  | FinishUploading => {...state, uploadState: ReadyToUpload(None)}
-  }
-
-let computeInitialState = ((value, textareaId, mode)) => {
-  let id = switch textareaId {
-  | Some(id) => id
-  | None => DateTime.randomId()
-  }
-
-  let length = value |> String.length
-
-  {id: id, mode: mode, selection: (length, length), uploadState: ReadyToUpload(None)}
-}
-
-let containerClasses = mode =>
-  switch mode {
-  | Windowed(_) => "relative bg-white"
-  | Fullscreen(_) => "bg-white fixed z-50 top-0 left-0 h-screen w-screen flex flex-col"
-  }
-
-let modeIcon = (desiredMode, currentMode) => {
-  let icon = switch (desiredMode, currentMode) {
-  | (#Preview, Windowed(#Editor) | Fullscreen(#Editor) | Fullscreen(#Split)) => "fas fa-eye"
-  | (#Preview, Windowed(#Preview) | Fullscreen(#Preview)) => "fas fa-pen-nib"
-  | (#Split, Windowed(_) | Fullscreen(#Editor) | Fullscreen(#Preview)) => "fas fa-columns"
-  | (#Split, Fullscreen(#Split)) => "far fa-window-maximize"
-  | (#Fullscreen, Windowed(_)) => "fas fa-expand"
-  | (#Fullscreen, Fullscreen(_)) => "fas fa-compress"
-  }
-
-  <FaIcon classes={"fa-fw " ++ icon} />
-}
-
-let onClickFullscreen = (state, send, _event) => {
-  switch state.mode {
-  | Windowed(_) => TextareaAutosize.destroy(state.id)
-  | Fullscreen(_) => () // Do nothing here. We'll fix this in an effect.
-  }
-
-  send(ClickFullscreen)
-}
-
-let onClickPreview = (state, send, _event) => {
-  switch state.mode {
-  | Windowed(#Editor) => TextareaAutosize.destroy(state.id)
-  | Windowed(#Preview)
-  | Fullscreen(_) => () // Do nothing here. We'll fix this in an effect.
-  }
-
-  send(ClickPreview)
-}
-
-let onClickSplit = (state, send, _event) => {
-  switch state.mode {
-  | Windowed(_) => TextareaAutosize.destroy(state.id)
-  | Fullscreen(_) => () // This should have no effect on textarea autosizing in full-screen mode.
-  }
-
-  send(ClickSplit)
-}
-
-let insertAt = (textToInsert, position, sourceText) => {
-  let head = sourceText->String.sub(0, position)
-  let tail = sourceText->String.sub(position, (sourceText |> String.length) - position)
-
-  head ++ (textToInsert ++ tail)
-}
-
-let wrapWith = (wrapper, selectionStart, selectionEnd, sourceText) => {
-  let head = sourceText->String.sub(0, selectionStart)
-  let selection = sourceText->String.sub(selectionStart, selectionEnd - selectionStart)
-  let tail = sourceText->String.sub(selectionEnd, (sourceText |> String.length) - selectionEnd)
-
-  head ++ (wrapper ++ (selection ++ (wrapper ++ tail)))
-}
-
-@ocaml.doc("
-  * After changing the Markdown using any of the controls or key commands, the
-  * textarea element will need to be manually \"synced\" in two ways:
-  *
-  * 1. The autosize update function needs to be called to let it know that we
-  *    have changed the value of the textare from the outside.
-  * 2. The cursor position will have jumped to the end of the text-area because
-  *    of the manual change of value of the controlled component; we'll need to
-  *    manually set the cursor position after the component has had a change to
-  *    re-render.
-  *
-  * This function is making an assumption that re-render can happen in 25ms.
-  * The need for these manual adjustments can be visibly seen by increasing the
-  * renderDelay to something like 1000ms.
- *")
-let updateTextareaAfterDelay = (state, cursorPosition) => {
-  let renderDelay = 25 //ms
-
-  switch state.mode {
-  | Windowed(_) =>
-    Js.Global.setTimeout(() => TextareaAutosize.update(state.id), renderDelay) |> ignore
-  | Fullscreen(_) => () // Autosizing is turned off in full-screen mode.
-  }
-
-  open Webapi.Dom
-  switch document |> Document.getElementById(state.id) {
-  | Some(element) =>
-    Js.Global.setTimeout(
-      () =>
-        element
-        |> DomUtils.Element.unsafeToHtmlInputElement
-        |> HtmlInputElement.setSelectionRange(cursorPosition, cursorPosition),
-      renderDelay,
-    ) |> ignore
-  | None => () // Avoid messing with the DOM if the textarea can't be found.
-  }
-}
-
-let finalizeChange = (~oldValue, ~newValue, ~state, ~send, ~onChange) => {
-  let offset = (newValue |> String.length) - (oldValue |> String.length)
-  let (_, selectionEnd) = state.selection
-
-  // The cursor needs to be bumped to account for changed value.
-  send(BumpSelection(offset / 2))
-
-  // Report the modified value to the parent.
-  onChange(newValue)
-
-  // Update the textarea after state changes are applied. Read more in function's documentation.
-  updateTextareaAfterDelay(state, selectionEnd + offset)
-}
-
-type phraseModifer =
-  | Bold
-  | Italic
-  | Strikethrough
-
-let insertAndWrapper = phraseModifer =>
-  switch phraseModifer {
-  | Bold => ("**bold**", "**")
-  | Italic => ("*italics*", "*")
-  | Strikethrough => ("~~strikethrough~~", "~~")
-  }
-
-let modifyPhrase = (oldValue, state, send, onChange, phraseModifer) => {
-  let (selectionStart, selectionEnd) = state.selection
-  let (insert, wrapper) = phraseModifer |> insertAndWrapper
-
-  let newValue = if selectionStart == selectionEnd {
-    oldValue |> insertAt(insert, selectionStart)
-  } else {
-    oldValue |> wrapWith(wrapper, selectionStart, selectionEnd)
-  }
-
-  finalizeChange(~oldValue, ~newValue, ~state, ~send, ~onChange)
-}
-
-let controlsContainerClasses = mode =>
-  "border bg-gray-100 text-sm px-2 flex justify-between items-end " ++
-  switch mode {
-  | Windowed(_) => "rounded-t border-gray-400 sticky top-0 z-20"
-  | Fullscreen(_) => "border-gray-400 "
-  }
-
-let controls = (value, state, send, onChange) => {
-  let buttonClasses = "px-2 py-1 hover:bg-gray-300 hover:text-primary-500 focus:outline-none "
-  let {mode} = state
-  let curriedModifyPhrase = modifyPhrase(value, state, send, onChange)
-
-  <div className={controlsContainerClasses(state.mode)}>
-    {switch mode {
-    | Windowed(#Preview)
-    | Fullscreen(#Preview) =>
-      <div />
-    | Windowed(#Editor)
-    | Fullscreen(#Editor | #Split) =>
-      <div className="bg-white border border-gray-400 rounded-t border-b-0">
-        <button className=buttonClasses onClick={_ => curriedModifyPhrase(Bold)}>
-          <i className="fas fa-bold fa-fw" />
-        </button>
-        <button
-          className={buttonClasses ++ "border-l border-gray-400"}
-          onClick={_ => curriedModifyPhrase(Italic)}>
-          <i className="fas fa-italic fa-fw" />
-        </button>
-        <button
-          className={buttonClasses ++ "border-l border-gray-400"}
-          onClick={_ => curriedModifyPhrase(Strikethrough)}>
-          <i className="fas fa-strikethrough fa-fw" />
-        </button>
-      </div>
-    }}
-    <div className="py-1">
-      <button className={"rounded " ++ buttonClasses} onClick={onClickPreview(state, send)}>
-        {modeIcon(#Preview, mode)}
-      </button>
-      <button
-        className={buttonClasses ++ "rounded ml-1 hidden md:inline"}
-        onClick={onClickSplit(state, send)}>
-        {modeIcon(#Split, mode)}
-      </button>
-      <button
-        className={buttonClasses ++ "rounded  ml-1 hidden md:inline"}
-        onClick={onClickFullscreen(state, send)}>
-        {modeIcon(#Fullscreen, mode)}
-        {switch mode {
-        | Fullscreen(_) =>
-          <span className="ml-2 text-xs font-semibold"> {"Exit full-screen" |> str} </span>
-        | Windowed(_) => React.null
-        }}
-      </button>
-    </div>
-  </div>
-}
-
-let modeClasses = mode =>
-  switch mode {
-  | Windowed(_) => ""
-  | Fullscreen(_) => "flex flex-grow"
-  }
-
-let editorContainerClasses = mode =>
-  "border-r border-gray-400 " ++
-  switch mode {
-  | Windowed(#Editor) => "border-l"
-  | Windowed(#Preview) => "hidden"
-  | Fullscreen(#Editor) => "w-full"
-  | Fullscreen(#Preview) => "hidden"
-  | Fullscreen(#Split) => "w-1/2"
-  }
-
-let previewType = mode =>
-  switch mode {
-  | Windowed(#Editor)
-  | Fullscreen(#Editor) =>
-    raise(InvalidModeForPreview)
-  | Windowed(#Preview) => #WindowedPreview
-  | Fullscreen(#Split) => #FullscreenSplit
-  | Fullscreen(#Preview) => #FullscreenPreview
-  }
-
-let previewContainerClasses = mode =>
-  "border-gray-400 bg-gray-100 " ++
-  switch mode |> previewType {
-  | #WindowedPreview => "markdown-editor__windowed-preview-container border-l border-r border-b rounded-b px-2 md:px-3"
-  | #FullscreenPreview => "w-screen mx-auto"
-  | #FullscreenSplit => "w-1/2 relative"
-  }
-
-let previewClasses = mode =>
-  switch mode {
-  | Fullscreen(#Split | #Preview) => "absolute max-h-full overflow-auto w-full px-4 pb-8"
-  | Fullscreen(#Editor)
-  | Windowed(_) => ""
-  }
-
-let focusOnEditor = id => {
-  open Webapi.Dom
-  document
-  |> Document.getElementById(id)
-  |> OptionUtils.flatMap(HtmlElement.ofElement)
-  |> OptionUtils.mapWithDefault(element => element |> HtmlElement.focus, ())
-}
-
-let handleUploadFileResponse = (oldValue, state, send, onChange, json) => {
-  let errors = json |> {
-    open Json.Decode
-    field("errors", array(string))
-  }
-
-  if errors == [] {
-    let markdownEmbedCode = json |> {
-      open Json.Decode
-      field("markdownEmbedCode", string)
-    }
-
-    let insert = "\n" ++ (markdownEmbedCode ++ "\n")
-    let (_, selectionEnd) = state.selection
-    let newValue = oldValue |> insertAt(insert, selectionEnd)
-    finalizeChange(~oldValue, ~newValue, ~state, ~send, ~onChange)
-    send(FinishUploading)
-  } else {
-    send(SetUploadError(Some("Failed to attach file! " ++ (errors |> Js.Array.joinWith(", ")))))
-  }
-}
-
-let submitForm = (formId, oldValue, state, send, onChange) =>
-  ReactDOMRe._getElementById(formId) |> OptionUtils.mapWithDefault(element => {
-    let formData = DomUtils.FormData.create(element)
-
-    Api.sendFormData(
-      "/markdown_attachments/",
-      formData,
-      handleUploadFileResponse(oldValue, state, send, onChange),
-      () =>
-        send(
-          SetUploadError(
-            Some("An unexpected error occured! Please reload the page before trying again."),
-          ),
-        ),
-    )
-  }, ())
-
-let attachFile = (fileFormId, oldValue, state, send, onChange, event) =>
-  switch ReactEvent.Form.target(event)["files"] {
-  | [] => ()
-  | files =>
-    let file = files[0]
-    let maxFileSize = 5 * 1024 * 1024
-
-    let error =
-      file["size"] > maxFileSize
-        ? Some("The maximum file size is 5 MB. Please select another file.")
-        : None
-
-    switch error {
-    | Some(_) => send(SetUploadError(error))
-    | None =>
-      send(SetUploading)
-      submitForm(fileFormId, oldValue, state, send, onChange)
-    }
-  }
-
-let footerContainerClasses = mode =>
-  "markdown-editor__footer-container border bg-gray-100 flex justify-between items-center " ++
-  switch mode {
-  | Windowed(_) => "rounded-b border-gray-400"
-  | Fullscreen(_) => "border-gray-400"
-  }
-
-let footer = (oldValue, state, send, onChange) => {
-  let {id} = state
-  let fileFormId = id ++ "-file-form"
-  let fileInputId = id ++ "-file-input"
-
-  switch state.mode {
-  | Windowed(#Preview)
-  | Fullscreen(#Preview) => React.null
-  | Windowed(#Editor)
-  | Fullscreen(#Editor | #Split) =>
-    <div className={footerContainerClasses(state.mode)}>
-      <form
-        className="flex items-center flex-wrap flex-1 text-sm font-semibold hover:bg-gray-300 hover:text-primary-500"
-        id=fileFormId>
-        <input name="authenticity_token" type_="hidden" value={AuthenticityToken.fromHead()} />
-        <input
-          className="hidden"
-          type_="file"
-          name="markdown_attachment[file]"
-          id=fileInputId
-          multiple=false
-          onChange={attachFile(fileFormId, oldValue, state, send, onChange)}
-        />
-        {switch state.uploadState {
-        | ReadyToUpload(error) =>
-          <label className="text-xs px-3 py-2 flex-grow cursor-pointer" htmlFor=fileInputId>
-            {switch error {
-            | Some(error) =>
-              <span className="text-red-500">
-                <i className="fas fa-exclamation-triangle mr-2" /> {error |> str}
-              </span>
-            | None =>
-              <span>
-                <i className="far fa-file-image mr-2" /> {"Click here to attach a file." |> str}
-              </span>
-            }}
-          </label>
-        | Uploading =>
-          <span className="text-xs px-3 py-2 flex-grow cursor-wait">
-            <i className="fas fa-spinner fa-pulse mr-2" />
-            {"Please wait for the file to upload..." |> str}
-          </span>
-        }}
-      </form>
-      <a
-        href="/help/markdown_editor"
-        target="_blank"
-        className="flex items-center px-3 py-2 hover:bg-gray-300 hover:text-secondary-500 cursor-pointer">
-        <i className="fab fa-markdown text-sm" />
-        <span className="text-xs ml-1 font-semibold hidden sm:inline"> {"Need help?" |> str} </span>
-      </a>
-    </div>
-  }
-}
-
-let textareaClasses = mode =>
-  "w-full outline-none font-mono " ++
-  switch mode {
-  | Windowed(_) => "p-3"
-  | Fullscreen(_) => "px-3 pt-4 pb-8 h-full resize-none"
-  }
-
-let onChangeWrapper = (onChange, event) => {
-  let value = ReactEvent.Form.target(event)["value"]
-  onChange(value)
-}
-
-let onSelect = (send, event) => {
-  let htmlInputElement =
-    ReactEvent.Selection.target(event) |> DomUtils.EventTarget.unsafeToHtmlInputElement
-
-  let selection = {
-    open Webapi.Dom
-    (
-      htmlInputElement |> HtmlInputElement.selectionStart,
-      htmlInputElement |> HtmlInputElement.selectionEnd,
-    )
-  }
-
-  send(SetSelection(selection))
-}
-
-let handleEscapeKey = (send, event) =>
-  switch event |> Webapi.Dom.KeyboardEvent.key {
-  | "Escape" => send(PressEscapeKey)
-  | _anyOtherKey => ()
-  }
-
-let handleKeyboardControls = (value, state, send, onChange, event) => {
-  let ctrlKey = Webapi.Dom.KeyboardEvent.ctrlKey
-  let metaKey = Webapi.Dom.KeyboardEvent.metaKey
-  let curriedModifyPhrase = modifyPhrase(value, state, send, onChange)
-
-  switch event |> Webapi.Dom.KeyboardEvent.key {
-  | "b" if event |> ctrlKey || event |> metaKey => curriedModifyPhrase(Bold)
-  | "i" if event |> ctrlKey || event |> metaKey => curriedModifyPhrase(Italic)
-  | _anyOtherKey => ()
-  }
-}
-
-module ScrollSync = {
-  open Webapi.Dom
-
-  /*
-   * There's a tiny bit of math involved in correctly mapping the source
-   * element's scroll position to the desired scroll of the target element.
-   * The source's scrollTop varies from zero to a number that's the difference
-   * between its scrollHeight and its offsetHeight; the same applies for the
-   * target. This needs to be taken into account when mapping one scroll
-   * position to the other.
-   */
-  let scrollTargetToSource = (~source, ~target, _event) => {
-    let sourceScrollTop = source |> Element.scrollTop
-    let sourceOffsetHeight = source |> Element.unsafeAsHtmlElement |> HtmlElement.offsetHeight
-    let sourceScrollHeight = source |> Element.scrollHeight
-
-    let scrollFraction =
-      sourceScrollTop /. (sourceScrollHeight - sourceOffsetHeight |> float_of_int)
-
-    let maxTargetScrollTop =
-      (target |> Element.scrollHeight) -
-        (target |> Element.unsafeAsHtmlElement |> HtmlElement.offsetHeight) |> float_of_int
-
-    target->Element.setScrollTop(scrollFraction *. maxTargetScrollTop)
-  }
-}
-
-@react.component
-let make = (
-  ~value,
-  ~onChange,
-  ~profile,
-  ~textareaId=?,
-  ~maxLength=1000,
-  ~defaultMode=Windowed(#Editor),
-  ~placeholder=?,
-) => {
-  let (state, send) = React.useReducerWithMapState(
-    reducer,
-    (value, textareaId, defaultMode),
-    computeInitialState,
-  )
-
-  // Reset autosize when switching from full-screen mode.
-  React.useEffect1(() => {
-    switch state.mode {
-    | Windowed(#Editor) => TextareaAutosize.create(state.id)
-    | Windowed(#Preview)
-    | Fullscreen(_) => () // Do nothing. This was handled in the click handler.
-    }
-
-    Some(() => TextareaAutosize.destroy(state.id))
-  }, [state.mode])
-
-  // Use Escape key to close full-screen mode.
-  React.useEffect0(() => {
-    let curriedHandler = handleEscapeKey(send)
-    let documentEventTarget = {
-      open Webapi.Dom
-      document |> Document.asEventTarget
-    }
-
-    documentEventTarget |> Webapi.Dom.EventTarget.addKeyDownEventListener(curriedHandler)
-
-    Some(
-      () =>
-        documentEventTarget |> Webapi.Dom.EventTarget.removeKeyDownEventListener(curriedHandler),
-    )
-  })
-
-  // Handle keyboard shortcuts for Bold and Italics buttons.
-  React.useEffect(() => {
-    let curriedHandler = handleKeyboardControls(value, state, send, onChange)
-    let textareaEventTarget = {
-      open Webapi.Dom
-      document |> Document.getElementById(state.id) |> OptionUtils.map(Element.asEventTarget)
-    }
-
-    textareaEventTarget |> OptionUtils.mapWithDefault(
-      Webapi.Dom.EventTarget.addKeyDownEventListener(curriedHandler),
-      (),
-    )
-
-    Some(
-      () =>
-        textareaEventTarget |> OptionUtils.mapWithDefault(
-          Webapi.Dom.EventTarget.removeKeyDownEventListener(curriedHandler),
-          (),
-        ),
-    )
-  })
-
-  React.useEffect1(() => {
-    let textarea = {
-      open Webapi.Dom
-      document |> Document.getElementById(state.id)
-    }
-    let preview = {
-      open Webapi.Dom
-      document |> Document.getElementById(state.id ++ "-preview")
-    }
-
-    switch (textarea, preview) {
-    | (Some(textarea), Some(preview)) =>
-      let scrollCallback = ScrollSync.scrollTargetToSource(~source=textarea, ~target=preview)
-
-      switch state.mode {
-      | Fullscreen(#Split) =>
-        textarea |> Webapi.Dom.Element.addEventListener("scroll", scrollCallback)
-
-        Some(() => textarea |> Webapi.Dom.Element.removeEventListener("scroll", scrollCallback))
-      | _anyOtherMode =>
-        textarea |> Webapi.Dom.Element.removeEventListener("scroll", scrollCallback)
-        None
-      }
-    | (_, _) => None
-    }
-  }, [state.mode])
-
-  <div className={containerClasses(state.mode)}>
-    {controls(value, state, send, onChange)}
-    <div className={modeClasses(state.mode)}>
-      <div className={editorContainerClasses(state.mode)}>
-        <DisablingCover
-          containerClasses="h-full"
-          disabled={state.uploadState == Uploading}
-          message="Uploading...">
-          <textarea
-            ?placeholder
-            ariaLabel="Markdown editor"
-            rows=4
-            maxLength
-            onSelect={onSelect(send)}
-            onChange={onChangeWrapper(onChange)}
-            id=state.id
-            value
-            className={textareaClasses(state.mode)}
-          />
-        </DisablingCover>
-      </div>
-      {switch state.mode {
-      | Windowed(#Editor)
-      | Fullscreen(#Editor) => React.null
-      | Windowed(#Preview)
-      | Fullscreen(#Preview)
-      | Fullscreen(#Split) =>
-        <div className={previewContainerClasses(state.mode)}>
-          <div id={state.id ++ "-preview"} className={previewClasses(state.mode)}>
-            <MarkdownBlock markdown=value profile className="max-w-3xl mx-auto" />
-          </div>
-        </div>
-      }}
-    </div>
-    {footer(value, state, send, onChange)}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Notification.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Notification.res
deleted file mode 100644
index cd57d63..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Notification.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type jsNotify
-
-@module("./notifier")
-external jsNotify: (string, string, string) => unit = "default"
-
-/* [@bs.send]
- external notify: (jsNotify, string, string, string) => unit = "notify"; */
-
-let success = (title, text) => jsNotify(title, text, "success")
-let error = (title, text) => jsNotify(title, text, "error")
-let notice = (title, text) => jsNotify(title, text, "notice")
-let warn = notice
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/OptionUtils.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/OptionUtils.res
deleted file mode 100644
index c671817..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/OptionUtils.res
+++ /dev/null
@@ -1,18 +0,0 @@
-let default = (e, v) =>
-  switch v {
-  | Some(v) => v
-  | None => e
-  }
-
-// TODO: Remove all use of toString. Use `default("")` instead.
-let toString = option => option |> default("")
-
-let map = (f, v) =>
-  switch v {
-  | Some(v) => Some(f(v))
-  | None => None
-  }
-
-let flatMap = (f, v) => v |> map(f) |> default(None)
-
-let mapWithDefault = (f, d, v) => v |> map(f) |> default(d)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/PrismJs.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/PrismJs.res
deleted file mode 100644
index 0cad877..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/PrismJs.res
+++ /dev/null
@@ -1,13 +0,0 @@
-open Webapi.Dom
-
-@module("./prismjsWrapper")
-external highlightAllUnderJs: Dom.element => unit = "default"
-
-let highlightAllUnder = elementId => {
-  let wrapperElement = document |> Document.getElementById(elementId)
-
-  switch wrapperElement {
-  | Some(element) => highlightAllUnderJs(element)
-  | None => ()
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Radio.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Radio.res
deleted file mode 100644
index 8c01857..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Radio.res
+++ /dev/null
@@ -1,17 +0,0 @@
-%raw(`require("./Radio.css")`)
-
-let str = React.string
-
-@react.component
-let make = (~id, ~label, ~onChange, ~checked=false) =>
-  <div>
-    <input className="hidden radio-input" id type_="radio" onChange checked />
-    <label className="radio-label flex items-center" htmlFor=id>
-      <span>
-        <svg width="14px" height="14px" viewBox="0 0 14 14">
-          <circle cx="8" cy="8" r="3" fill="white" />
-        </svg>
-      </span>
-      <span className="text-sm flex-1 font-semibold leading-loose"> {label |> str} </span>
-    </label>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Rollbar.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Rollbar.res
deleted file mode 100644
index c615258..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Rollbar.res
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Rollbar.critical("Connection error from remote Payments API"); */
-@val @scope("Rollbar") external critical: string => unit = "critical"
-
-/* Rollbar.error("Some unexpected condition"); */
-@val @scope("Rollbar") external error: string => unit = "error"
-
-/* Rollbar.warning("Connection error from Twitter API"); */
-@val @scope("Rollbar") external warning: string => unit = "warning"
-
-/* Rollbar.info("User opened the purchase dialog"); */
-@val @scope("Rollbar") external info: string => unit = "info"
-
-/* Rollbar.debug("Purchase dialog finished rendering"); */
-@val @scope("Rollbar") external debug: string => unit = "debug"
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/ScrollLock.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/ScrollLock.res
deleted file mode 100644
index 79eb994..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/ScrollLock.res
+++ /dev/null
@@ -1,11 +0,0 @@
-open Webapi.Dom
-
-let handleScrollLock = add => {
-  let classes = add ? "overflow-hidden" : ""
-
-  let body = document |> Document.getElementsByTagName("body") |> HtmlCollection.toArray
-
-  body[0]->Element.setClassName(classes)
-}
-let activate = () => handleScrollLock(true)
-let deactivate = () => handleScrollLock(false)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/SkeletonLoading.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/SkeletonLoading.res
deleted file mode 100644
index 69a0011..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/SkeletonLoading.res
+++ /dev/null
@@ -1,119 +0,0 @@
-%raw(`require("./SkeletonLoading.css")`)
-
-let card = (~className="", ()) =>
-  <div className={"skeleton-body-container pt-4 w-full mx-auto" ++ className}>
-    <div className="skeleton-body-wrapper px-3 lg:px-0">
-      <div className="skeleton-placeholder__card px-5 py-6 bg-white rounded-lg shadow">
-        <div className="flex items-center">
-          <div className="flex-1">
-            <div className="skeleton-placeholder__line-sm w-5/6 skeleton-animate" />
-            <div className="skeleton-placeholder__line-sm mt-4 w-4/6 skeleton-animate" />
-          </div>
-          <div className="skeleton-placeholder__line-sm w-1/6 skeleton-animate" />
-        </div>
-      </div>
-    </div>
-  </div>
-
-let userCard = () =>
-  <div className="skeleton-body-container pt-4 w-full mx-auto">
-    <div className="skeleton-body-wrapper px-2 lg:px-0">
-      <div className="skeleton-placeholder__card px-5 py-6 bg-white rounded-lg shadow">
-        <div className="flex items-center">
-          <div className="w-14 h-14 bg-gray-100 rounded-full mr-4 skeleton-animate" />
-          <div className="flex-1">
-            <div className="skeleton-placeholder__line-sm w-2/6 skeleton-animate" />
-            <div className="skeleton-placeholder__line-sm mt-4 w-3/6 skeleton-animate" />
-          </div>
-          <div className="skeleton-placeholder__line-sm w-1/6 skeleton-animate" />
-        </div>
-      </div>
-    </div>
-  </div>
-
-let heading = () =>
-  <div className="skeleton-body-container w-full pb-4 mx-auto">
-    <div className="skeleton-body-wrapper mt-8 px-3 lg:px-0">
-      <div className="skeleton-placeholder__line-md mt-4 w-3/6 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mt-4 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mt-4 w-4/6 skeleton-animate" />
-    </div>
-  </div>
-
-@live
-let codeBlock = () =>
-  <div className="skeleton-body-container w-full pb-4 mx-auto">
-    <div className="skeleton-body-wrapper max-w-xs mt-8 px-3 lg:px-0">
-      <div className="flex">
-        <div className="skeleton-placeholder__line-sm mr-3 w-2/6 skeleton-animate" />
-        <div className="skeleton-placeholder__line-sm mr-3 w-2/6 skeleton-animate" />
-        <div className="skeleton-placeholder__line-sm mr-3 w-4 skeleton-animate" />
-      </div>
-      <div className="flex ml-6">
-        <div className="skeleton-placeholder__line-sm mt-4 mr-3 w-3/6 skeleton-animate" />
-        <div className="skeleton-placeholder__line-sm mt-4 mr-3 w-3/6 skeleton-animate" />
-      </div>
-      <div className="flex ml-6">
-        <div className="skeleton-placeholder__line-sm mt-4 mr-3 w-2/6 skeleton-animate" />
-        <div className="skeleton-placeholder__line-sm mt-4 mr-3 w-1/6 skeleton-animate" />
-        <div className="skeleton-placeholder__line-sm mt-4 mr-3 w-2/6 skeleton-animate" />
-      </div>
-      <div className="flex">
-        <div className="skeleton-placeholder__line-sm mt-4 mr-3 w-16 skeleton-animate" />
-        <div className="skeleton-placeholder__line-sm mt-4 mr-3 w-6 skeleton-animate" />
-      </div>
-    </div>
-  </div>
-
-let profileCard = () =>
-  <div className="skeleton-body-container w-full pb-4 mx-auto">
-    <div className="skeleton-body-wrapper max-w-sm mt-8 px-3 lg:px-0">
-      <div className="flex items-center">
-        <div className="w-14 h-14 bg-gray-100 rounded-full mr-4 skeleton-animate" />
-        <div className="flex-1">
-          <div className="skeleton-placeholder__line-sm w-3/6 skeleton-animate" />
-          <div className="skeleton-placeholder__line-sm mt-4 skeleton-animate" />
-        </div>
-      </div>
-    </div>
-  </div>
-
-let image = () =>
-  <div className="skeleton-body-container w-full pb-4 mx-auto">
-    <div className="skeleton-body-wrapper mt-8 px-3 lg:px-0">
-      <div className="skeleton-placeholder__image mt-5 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mx-auto mt-4 w-3/6 skeleton-animate" />
-    </div>
-  </div>
-
-let paragraph = () =>
-  <div className="skeleton-body-container w-full pb-4 mx-auto">
-    <div className="skeleton-body-wrapper mt-8 px-3 lg:px-0">
-      <div className="skeleton-placeholder__line-sm mt-4 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mt-4 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mt-4 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mt-4 w-4/6 skeleton-animate" />
-    </div>
-  </div>
-
-let contents = () =>
-  <div className="skeleton-body-container w-full pb-4 mx-auto">
-    <div className="skeleton-body-wrapper mt-8 px-3 lg:px-0">
-      <div className="skeleton-placeholder__line-md mt-4 w-3/6 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mt-4 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mt-4 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mt-4 w-4/6 skeleton-animate" />
-      <div className="skeleton-placeholder__image mt-5 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mx-auto mt-4 w-3/6 skeleton-animate" />
-    </div>
-    <div className="skeleton-body-wrapper mt-8 px-3 lg:px-0">
-      <div className="skeleton-placeholder__line-sm mt-4 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mt-4 skeleton-animate" />
-      <div className="skeleton-placeholder__line-sm mt-4 w-4/6 skeleton-animate" />
-    </div>
-  </div>
-
-let multiple = (~count, ~element) =>
-  Array.make(count, element)
-  |> Array.mapi((key, element) => <div key={key |> string_of_int}> element </div>)
-  |> React.array
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Sorter.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Sorter.res
deleted file mode 100644
index d939658..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Sorter.res
+++ /dev/null
@@ -1,70 +0,0 @@
-let str = React.string
-module type Sortable = {
-  type t
-  let criterion: t => string
-  let criterionType: t => [#String | #Number]
-}
-
-module Make = (Sortable: Sortable) => {
-  let dropdown = (criteria, selectedCriterion, onCriterionChange) => {
-    let selectedForDropdown =
-      <button
-        title={"Order by " ++ (selectedCriterion |> Sortable.criterion)}
-        className="inline-flex flex-1 md:flex-auto items-center bg-white leading-relaxed font-semibold border border-gray-400 rounded focus:outline-none focus:bg-white focus:border-gray-500 px-3 py-2 text-xs ">
-        <span className="ml-2"> {selectedCriterion |> Sortable.criterion |> str} </span>
-        <i className="fas fa-caret-down ml-3" />
-      </button>
-    let dropDownContents =
-      criteria
-      |> Js.Array.filter(criterion =>
-        Sortable.criterion(criterion) != Sortable.criterion(selectedCriterion)
-      )
-      |> Array.map(criterion =>
-        <button
-          key={Sortable.criterion(criterion)}
-          title={"Order by " ++ Sortable.criterion(criterion)}
-          onClick={_ => onCriterionChange(criterion)}
-          className="inline-flex items-center w-full font-semibold text-xs p-3 text-left focus:outline-none ">
-          <Icon className="if i-clock-regular text-sm if-fw text-gray-700" />
-          <span className="ml-2"> {Sortable.criterion(criterion) |> str} </span>
-        </button>
-      )
-    <Dropdown selected=selectedForDropdown contents=dropDownContents />
-  }
-
-  let directionIconClasses = (criterionType, direction) =>
-    switch (criterionType, direction) {
-    | (#String, #Ascending) => "fas fa-sort-alpha-down"
-    | (#String, #Descending) => "fas fa-sort-alpha-down-alt"
-    | (#Number, #Ascending) => "fas fa-sort-amount-up-alt"
-    | (#Number, #Descending) => "fas fa-sort-amount-down-alt"
-    }
-
-  @react.component
-  let make = (~criteria, ~selectedCriterion, ~direction, ~onDirectionChange, ~onCriterionChange) =>
-    <div className="flex mt-1">
-      {criteria |> Array.length > 1
-        ? dropdown(criteria, selectedCriterion, onCriterionChange)
-        : <div
-            title={"Order by " ++ (selectedCriterion |> Sortable.criterion)}
-            className="inline-flex flex-1 md:flex-auto items-center bg-gray-100 leading-relaxed font-semibold text-gray-700 border border-gray-400 rounded focus:outline-none px-3 py-2 text-xs ">
-            <span> {selectedCriterion |> Sortable.criterion |> str} </span>
-          </div>}
-      <span className="flex ml-1">
-        <button
-          title="toggle-sort-order"
-          className="bg-white px-3 py-1 rounded border border-gray-400 text-gray-800 hover:bg-gray-200 hover:text-primary-500 text-sm"
-          onClick={_ => {
-            let swappedDirection = switch direction {
-            | #Ascending => #Descending
-            | #Descending => #Ascending
-            }
-            onDirectionChange(swappedDirection)
-          }}>
-          <FaIcon
-            classes={directionIconClasses(Sortable.criterionType(selectedCriterion), direction)}
-          />
-        </button>
-      </span>
-    </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/TargetContentView.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/TargetContentView.res
deleted file mode 100644
index 7b23999..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/TargetContentView.res
+++ /dev/null
@@ -1,57 +0,0 @@
-%raw(`require("./TargetContentView.css")`)
-
-let str = React.string
-
-let renderBlockClasses = block =>
-  switch block |> ContentBlock.blockType {
-  | Markdown(_) => "mt-6"
-  | File(_) => "mt-6"
-  | Image(_) => "mt-6"
-  | Embed(_) => "mt-6 pb-7"
-  }
-
-let markdownContentBlock = markdown => <MarkdownBlock markdown profile=Markdown.Permissive />
-
-let fileContentBlock = (url, title, filename) =>
-  <a
-    className="flex justify-between bg-white border rounded-lg px-6 py-4 items-center shadow hover:border-gray-500 hover:bg-gray-100 hover:text-primary-500 hover:shadow-md"
-    target="_blank"
-    href=url>
-    <div className="flex items-center">
-      <FaIcon classes="text-4xl text-gray-800 far fa-file-alt" />
-      <div className="pl-4 leading-tight">
-        <div className="text-lg font-semibold"> {title |> str} </div>
-        <div className="text-sm italic text-gray-600"> {filename |> str} </div>
-      </div>
-    </div>
-    <div> <FaIcon classes="text-2xl fas fa-download" /> </div>
-  </a>
-
-let imageContentBlock = (url, caption) =>
-  <div className="rounded-lg bg-white text-center">
-    <img className="mx-auto" src=url alt=caption />
-    <div className="px-4 py-2 text-sm italic"> {caption |> str} </div>
-  </div>
-
-let embedContentBlock = (_url, embedCode) =>
-  <div className="learn-content-block__embed" dangerouslySetInnerHTML={"__html": embedCode} />
-
-@react.component
-let make = (~contentBlocks) =>
-  <div className="text-base" id="learn-component">
-    {contentBlocks
-    |> ContentBlock.sort
-    |> Array.map(block => {
-      let renderedBlock = switch block |> ContentBlock.blockType {
-      | Markdown(markdown) => markdownContentBlock(markdown)
-      | File(url, title, filename) => fileContentBlock(url, title, filename)
-      | Image(url, caption) => imageContentBlock(url, caption)
-      | Embed(url, embedCode) => embedContentBlock(url, embedCode)
-      }
-
-      <div className={renderBlockClasses(block)} key={block |> ContentBlock.id}>
-        renderedBlock
-      </div>
-    })
-    |> React.array}
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/TextareaAutosize.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/TextareaAutosize.res
deleted file mode 100644
index e77d590..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/TextareaAutosize.res
+++ /dev/null
@@ -1,14 +0,0 @@
-open Webapi.Dom
-
-@module external autosize: Dom.element => unit = "autosize"
-@module("autosize")
-external autosizeDestroy: Dom.element => unit = "destroy"
-@module("autosize")
-external autosizeUpdate: Dom.element => unit = "update"
-
-let perform = (f, id) =>
-  document |> Document.getElementById(id) |> OptionUtils.mapWithDefault(element => element |> f, ())
-
-let create = id => id |> perform(autosize)
-let update = id => id |> perform(autosizeUpdate)
-let destroy = id => id |> perform(autosizeDestroy)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Tooltip.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/Tooltip.res
deleted file mode 100644
index c718f64..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/Tooltip.res
+++ /dev/null
@@ -1,28 +0,0 @@
-let str = React.string
-
-%raw(`require("./Tooltip.css")`)
-
-let bubbleClasses = position => {
-  let positionClass = switch position {
-  | #Top => "tooltip__bubble--top"
-  | #Right => "tooltip__bubble--right"
-  | #Bottom => "tooltip__bubble--bottom"
-  | #Left => "tooltip__bubble--left"
-  }
-
-  "tooltip__bubble " ++ positionClass
-}
-
-@react.component
-let make = (~tip, ~className="", ~position=#Top, ~disabled=false, ~children) =>
-  disabled
-    ? children
-    : <div className={"tooltip " ++ className}>
-        <div className="tooltip__trigger"> children </div>
-        <div className={bubbleClasses(position)}>
-          <div
-            className="text-white text-xs p-2 text-center leading-snug rounded bg-gray-900 whitespace-no-wrap">
-            tip
-          </div>
-        </div>
-      </div>
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/UrlUtils.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/UrlUtils.res
deleted file mode 100644
index 072b960..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/UrlUtils.res
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Source: https://gist.github.com/dperini/729294 */
-let urlRegex = Js.Re.fromStringWithFlags(
-  "^" ++
-  ("(?:(?:(?:https?|ftp):)?\\/\\/)" ++
-  ("(?:\\S+(?::\\S*)?@)?" ++
-  ("(?:" ++
-  ("(?!(?:10|127)(?:\\.\\d{1,3}){3})" ++
-  ("(?!(?:169\\.254|192\\.168)(?:\\.\\d{1,3}){2})" ++
-  ("(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})" ++
-  ("(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])" ++
-  ("(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}" ++
-  ("(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))" ++
-  ("|" ++
-  ("(?:" ++
-  ("(?:" ++
-  ("[a-z0-9\\u00a1-\\uffff]" ++
-  ("[a-z0-9\\u00a1-\\uffff_-]{0,62}" ++
-  (")?" ++
-  ("[a-z0-9\\u00a1-\\uffff]\\." ++
-  (")+" ++
-  ("(?:[a-z\\u00a1-\\uffff]{2,}\\.?)" ++
-  (")" ++
-  ("(?::\\d{2,5})?" ++ ("(?:[/?#]\\S*)?" ++ "$"))))))))))))))))))))),
-  ~flags="i",
-)
-
-let isInvalid = (allowBlank, url) =>
-  if url |> String.trim |> String.length > 0 {
-    !Js.Re.test_(urlRegex, url)
-  } else {
-    !allowBlank
-  }
-
-let isValid = (allowBlank, url) => !isInvalid(allowBlank, url)
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/User.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/User.res
deleted file mode 100644
index 3f7a9dc..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/User.res
+++ /dev/null
@@ -1,39 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  avatarUrl: option<string>,
-  title: string,
-}
-
-let id = t => t.id
-let name = t => t.name
-let avatarUrl = t => t.avatarUrl
-let title = t => t.title
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    avatarUrl: json |> optional(field("avatarUrl", string)),
-    title: json |> field("title", string),
-  }
-}
-
-let findById = (id, proxies) =>
-  proxies |> ListUtils.unsafeFind(proxy => proxy.id == id, "Unable to find a User with ID " ++ id)
-
-let make = (~id, ~name, ~avatarUrl, ~title) => {
-  id: id,
-  name: name,
-  avatarUrl: avatarUrl,
-  title: title,
-}
-
-let makeFromJs = jsObject =>
-  make(
-    ~id=jsObject["id"],
-    ~name=jsObject["name"],
-    ~avatarUrl=jsObject["avatarUrl"],
-    ~title=jsObject["title"],
-  )
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/UserProxy.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/UserProxy.res
deleted file mode 100644
index 69574e8..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/UserProxy.res
+++ /dev/null
@@ -1,47 +0,0 @@
-type t = {
-  id: string,
-  userId: string,
-  name: string,
-  avatarUrl: option<string>,
-  title: string,
-}
-
-let id = t => t.id
-let userId = t => t.userId
-let name = t => t.name
-let avatarUrl = t => t.avatarUrl
-let title = t => t.title
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    userId: json |> field("userId", string),
-    name: json |> field("name", string),
-    avatarUrl: json |> optional(field("avatarUrl", string)),
-    title: json |> field("title", string),
-  }
-}
-
-let findById = (id, proxies) =>
-  proxies |> ListUtils.unsafeFind(
-    proxy => proxy.id == id,
-    "Unable to find a UserProxy with ID " ++ id,
-  )
-
-let make = (~id, ~userId, ~name, ~avatarUrl, ~title) => {
-  id: id,
-  userId: userId,
-  name: name,
-  avatarUrl: avatarUrl,
-  title: title,
-}
-
-let makeFromJs = jsObject =>
-  make(
-    ~id=jsObject["id"],
-    ~userId=jsObject["userId"],
-    ~name=jsObject["name"],
-    ~avatarUrl=jsObject["avatarUrl"],
-    ~title=jsObject["title"],
-  )
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/shared/WindowUtils.res b/jscomp/syntax/tests/idempotency/pupilfirst/shared/WindowUtils.res
deleted file mode 100644
index 52eeb0b..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/shared/WindowUtils.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let confirm = (~onCancel=?, message, f) =>
-  if {
-    open Webapi.Dom
-    window |> Window.confirm(message)
-  } {
-    f()
-  } else {
-    onCancel |> OptionUtils.mapWithDefault(onCancel => onCancel(), ())
-  }
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/users/UserSessionNew.res b/jscomp/syntax/tests/idempotency/pupilfirst/users/UserSessionNew.res
deleted file mode 100644
index 388a58a..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/users/UserSessionNew.res
+++ /dev/null
@@ -1,349 +0,0 @@
-%raw(`require("./UserSessionNew.css")`)
-
-@module("./images/federated-sign-in-icon.svg")
-external federatedSignInIcon: string = "default"
-
-@module("./images/continue-with-email-icon.svg")
-external signInWithPasswordIcon: string = "default"
-
-@module("./images/email-sent-icon.svg")
-external signInEmailSentIcon: string = "default"
-
-@module("./images/reset-password-icon.svg")
-external forgotPasswordIcon: string = "default"
-
-let str = React.string
-
-type views =
-  | FederatedSignIn
-  | SignInWithPassword
-  | SignInEmailSent
-  | ForgotPassword
-
-type omniauthProvider =
-  | Google
-  | Facebook
-  | Github
-  | Developer
-
-let handleErrorCB = (setSaving, ()) => setSaving(_ => false)
-let handleSignInWithPasswordCB = response => {
-  let path =
-    response
-    |> {
-      open Json.Decode
-      field("path", nullable(string))
-    }
-    |> Js.Null.toOption
-  switch path {
-  | Some(path) => DomUtils.redirect(path)
-  | None => ()
-  }
-}
-let handleSignInWithEmailCB = (setView, _) => setView(_ => SignInEmailSent)
-
-let signInWithPassword = (authenticityToken, email, password, setSaving, sharedDevice) => {
-  let payload = Js.Dict.empty()
-  Js.Dict.set(payload, "authenticity_token", authenticityToken |> Js.Json.string)
-  Js.Dict.set(payload, "email", email |> Js.Json.string)
-  Js.Dict.set(payload, "shared_device", (sharedDevice ? "1" : "0") |> Js.Json.string)
-  Js.Dict.set(payload, "password", password |> Js.Json.string)
-  let url = "/users/sign_in"
-  setSaving(_ => true)
-
-  Api.create(url, payload, handleSignInWithPasswordCB, handleErrorCB(setSaving))
-}
-
-let sendSignInEmail = (authenticityToken, email, setView, setSaving, sharedDevice) => {
-  let payload = Js.Dict.empty()
-  Js.Dict.set(payload, "authenticity_token", authenticityToken |> Js.Json.string)
-  Js.Dict.set(payload, "email", email |> Js.Json.string)
-  Js.Dict.set(payload, "referer", "" |> Js.Json.string)
-  Js.Dict.set(payload, "shared_device", (sharedDevice ? "1" : "0") |> Js.Json.string)
-  Js.Dict.set(payload, "username", "" |> Js.Json.string)
-  setSaving(_ => true)
-  let url = "/users/send_login_email"
-
-  Api.create(url, payload, handleSignInWithEmailCB(setView), handleErrorCB(setSaving))
-}
-
-let sendResetPasswordEmail = (authenticityToken, email, setView, setSaving) => {
-  let payload = Js.Dict.empty()
-  Js.Dict.set(payload, "authenticity_token", authenticityToken |> Js.Json.string)
-  Js.Dict.set(payload, "email", email |> Js.Json.string)
-  Js.Dict.set(payload, "username", "" |> Js.Json.string)
-  setSaving(_ => true)
-  let url = "/users/send_reset_password_email"
-
-  Api.create(url, payload, handleSignInWithEmailCB(setView), handleErrorCB(setSaving))
-}
-
-let renderIcon = view => {
-  let iconUrl = switch view {
-  | FederatedSignIn => federatedSignInIcon
-  | SignInWithPassword => signInWithPasswordIcon
-  | SignInEmailSent => signInEmailSentIcon
-  | ForgotPassword => forgotPasswordIcon
-  }
-  <img className="mx-auto w-32 sm:w-42" src=iconUrl />
-}
-
-let headerText = (view, schoolName) =>
-  switch view {
-  | FederatedSignIn => "Sign in to " ++ schoolName
-  | SignInWithPassword => "Continue with email"
-  | SignInEmailSent => "We've sent you a magic link!"
-  | ForgotPassword => "Reset password"
-  }
-
-let federatedLoginUrl = (oauthHost, fqdn, provider) =>
-  "//" ++
-  (oauthHost ++
-  ("/oauth/" ++
-  (switch provider {
-  | Google => "google"
-  | Facebook => "facebook"
-  | Github => "github"
-  | Developer => "developer"
-  } ++
-  ("?fqdn=" ++ fqdn))))
-
-let buttonText = provider =>
-  "Continue " ++
-  switch provider {
-  | Google => "with Google"
-  | Facebook => "with Facebook"
-  | Github => "with Github"
-  | Developer => "as Developer"
-  }
-
-let buttonClasses = provider =>
-  "flex justify-center items-center px-3 py-2 leading-snug border border-transparent rounded-lg cursor-pointer font-semibold mt-4 w-full " ++
-  switch provider {
-  | Facebook => "federated-sigin-in__facebook-btn hover:bg-blue-800 text-white"
-  | Github => "federated-sigin-in__github-btn hover:bg-black text-white"
-  | Google => "federated-sigin-in__google-btn hover:bg-red-600 text-white"
-  | Developer => "bg-green-100 border-green-400 text-green-800 hover:bg-green-200"
-  }
-
-let iconClasses = provider =>
-  switch provider {
-  | Google => "fab fa-google"
-  | Facebook => "fab fa-facebook-f mr-1"
-  | Github => "fab fa-github"
-  | Developer => "fas fa-laptop-code"
-  }
-
-let providers = () => {
-  let defaultProvides = [Google, Facebook, Github]
-  DomUtils.isDevelopment() ? defaultProvides |> Array.append([Developer]) : defaultProvides
-}
-let renderFederatedlogin = (fqdn, oauthHost) =>
-  <div className="flex flex-col pb-5 md:px-9 items-center max-w-sm mx-auto">
-    {providers()
-    |> Array.map(provider =>
-      <a
-        key={buttonText(provider)}
-        className={buttonClasses(provider)}
-        href={federatedLoginUrl(oauthHost, fqdn, provider)}>
-        <span className="w-1/5 text-right text-lg">
-          <FaIcon classes={iconClasses(provider)} />
-        </span>
-        <span className="w-4/5 pl-3 text-left"> {buttonText(provider) |> str} </span>
-      </a>
-    )
-    |> React.array}
-  </div>
-
-let validPassword = password => password != ""
-
-let validEmail = email => email |> EmailUtils.isInvalid(false)
-
-let renderSignInWithEmail = (
-  email,
-  setEmail,
-  password,
-  setPassword,
-  authenticityToken,
-  setView,
-  saving,
-  setSaving,
-  sharedDevice,
-  setSharedDevice,
-) =>
-  <div className="pt-4 pb-5 md:px-9 items-center max-w-sm mx-auto">
-    <div>
-      <label
-        className="inline-block tracking-wide text-gray-900 text-xs font-semibold" htmlFor="email">
-        {"Email Address" |> str}
-      </label>
-      <input
-        className="appearance-none h-10 mt-1 block w-full text-gray-800 border border-gray-400 rounded py-2 px-4 text-sm bg-gray-100 hover:bg-gray-200 focus:outline-none focus:bg-white focus:border-primary-400"
-        id="email"
-        value=email
-        disabled=saving
-        type_="text"
-        onChange={event => setEmail(ReactEvent.Form.target(event)["value"])}
-        placeholder="john@example.com"
-      />
-    </div>
-    <div className="mt-4">
-      <div className="flex justify-between">
-        <label
-          className="inline-block tracking-wide text-gray-900 text-xs font-semibold"
-          htmlFor="password">
-          {"Password" |> str}
-        </label>
-        <button
-          disabled=saving
-          onClick={_ => saving ? () : setView(_ => ForgotPassword)}
-          className="text-primary-400 text-center text-xs font-semibold hover:text-primary-600 cursor-pointer whitespace-no-wrap hover:underline inline">
-          {"Set a New Password" |> str}
-        </button>
-      </div>
-      <input
-        className="appearance-none h-10 mt-1 block w-full text-gray-800 border border-gray-400 rounded py-2 px-4 text-sm bg-gray-100 hover:bg-gray-200 focus:outline-none focus:bg-white focus:border-primary-400"
-        id="password"
-        value=password
-        disabled=saving
-        type_="password"
-        onChange={event => setPassword(ReactEvent.Form.target(event)["value"])}
-        placeholder="Type your password"
-      />
-    </div>
-    <div
-      className="flex justify-between items-center leading-snug mt-4 flex-col flex-col-reverse sm:flex-row">
-      <div className="flex items-strecth text-gray-700 hover:text-gray-900">
-        <input
-          onChange={_ => setSharedDevice(sharedDevice => !sharedDevice)}
-          id="sharedDevice"
-          checked=sharedDevice
-          disabled=saving
-          type_="checkbox"
-        />
-        <label
-          className="block pl-2 font-semibold cursor-pointer text-xs select-none whitespace-no-wrap"
-          htmlFor="sharedDevice">
-          {"Are you using a shared device?" |> str}
-        </label>
-      </div>
-    </div>
-    <div className="mt-6">
-      {validPassword(password)
-        ? <button
-            disabled={saving || validEmail(email)}
-            onClick={_ =>
-              signInWithPassword(authenticityToken, email, password, setSaving, sharedDevice)}
-            className="btn btn-success btn-large text-center w-full">
-            {saving ? <FaIcon classes="fas fa-spinner fa-spin mr-2" /> : ReasonReact.null}
-            <span> {(saving ? "Signing in" : "Sign in with password") |> str} </span>
-          </button>
-        : <button
-            disabled={saving || validEmail(email)}
-            onClick={_ =>
-              sendSignInEmail(authenticityToken, email, setView, setSaving, sharedDevice)}
-            className="btn btn-primary btn-large text-center w-full">
-            {saving ? <FaIcon classes="fas fa-spinner fa-spin mr-2" /> : ReasonReact.null}
-            <span> {(saving ? "Signing in" : "Email me a link to sign in") |> str} </span>
-          </button>}
-    </div>
-  </div>
-
-let renderSignInEmailSent = () =>
-  <div className="max-w-sm mx-auto">
-    <p className="mt-4 text-center">
-      {"It should reach you in less than a minute. Click the link in the email, and you'll be signed in." |> str}
-    </p>
-  </div>
-
-let renderForgotPassword = (authenticityToken, email, saving, setEmail, setSaving, setView) =>
-  <div className="max-w-sm mx-auto md:px-9 pb-4">
-    <div className="text-sm mt-2 text-center pb-3">
-      {"Enter your email for password recovery" |> str}
-    </div>
-    <label
-      className="inline-block tracking-wide text-gray-900 text-xs font-semibold" htmlFor="email">
-      {"Email" |> str}
-    </label>
-    <input
-      className="appearance-none h-10 mt-1 block w-full text-gray-800 border border-gray-400 rounded py-2 px-4 text-sm bg-gray-100 hover:bg-gray-200 focus:outline-none focus:bg-white focus:border-primary-400"
-      id="email"
-      value=email
-      type_="text"
-      disabled=saving
-      onChange={event => setEmail(ReactEvent.Form.target(event)["value"])}
-      placeholder="john@example.com"
-    />
-    <button
-      disabled={saving || validEmail(email)}
-      onClick={_ => sendResetPasswordEmail(authenticityToken, email, setView, setSaving)}
-      className="btn btn-primary btn-large text-center w-full mt-4 mr-2">
-      {saving ? <FaIcon classes="fas fa-spinner fa-spin mr-2" /> : ReasonReact.null}
-      <span> {(saving ? "Dispatching email" : "Send Email") |> str} </span>
-    </button>
-  </div>
-
-@react.component
-let make = (~schoolName, ~authenticityToken, ~fqdn, ~oauthHost) => {
-  let (view, setView) = React.useState(() => FederatedSignIn)
-  let (email, setEmail) = React.useState(() => "")
-  let (password, setPassword) = React.useState(() => "")
-  let (sharedDevice, setSharedDevice) = React.useState(() => false)
-  let (saving, setSaving) = React.useState(() => false)
-
-  <div className="bg-gray-100 sm:py-10">
-    <div className="container mx-auto max-w-lg px-4 py-6 sm:py-8 bg-white rounded-lg shadow">
-      {renderIcon(view)}
-      <div className="max-w-sm mx-auto text-lg sm:text-2xl font-bold text-center mt-4">
-        {headerText(view, schoolName) |> str}
-      </div>
-      {switch view {
-      | FederatedSignIn => renderFederatedlogin(fqdn, oauthHost)
-      | SignInWithPassword =>
-        renderSignInWithEmail(
-          email,
-          setEmail,
-          password,
-          setPassword,
-          authenticityToken,
-          setView,
-          saving,
-          setSaving,
-          sharedDevice,
-          setSharedDevice,
-        )
-      | SignInEmailSent => renderSignInEmailSent()
-      | ForgotPassword =>
-        renderForgotPassword(authenticityToken, email, saving, setEmail, setSaving, setView)
-      }}
-      {switch view {
-      | FederatedSignIn =>
-        <div className="max-w-sm mx-auto md:px-9">
-          <span
-            className="federated-signin-in__seperator block relative z-10 text-center text-xs text-gray-600 font-semibold">
-            <span className="bg-white px-2"> {"OR" |> str} </span>
-          </span>
-          <button
-            disabled=saving
-            onClick={_ => setView(_ => SignInWithPassword)}
-            className="flex justify-center items-center px-3 py-2 leading-snug border border-gray-400 text-primary-500 hover:bg-gray-100 hover:border-primary-500 focus:bg-gray-200 focus::border-primary-500 focus:outline-none rounded-lg cursor-pointer font-semibold mt-4 w-full">
-            <span className="w-1/5 text-right text-lg"> <FaIcon classes="fas fa-envelope" /> </span>
-            <span className="w-4/5 pl-3 text-left"> {"Continue with email" |> str} </span>
-          </button>
-        </div>
-      | SignInWithPassword
-      | ForgotPassword =>
-        <div className="max-w-sm mx-auto md:px-9">
-          <button
-            disabled=saving
-            onClick={_ => setView(_ => FederatedSignIn)}
-            className="w-full p-3 text-primary-500 leading-snug rounded-lg underline cursor-pointer text-sm text-center font-semibold hover:bg-gray-200 focus:bg-gray-200 focus:outline-none">
-            {"Sign in with Google, Facebook, or Github" |> str}
-          </button>
-        </div>
-
-      | SignInEmailSent => React.null
-      }}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/users/UserSessionResetPassword.res b/jscomp/syntax/tests/idempotency/pupilfirst/users/UserSessionResetPassword.res
deleted file mode 100644
index 64abbea..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/users/UserSessionResetPassword.res
+++ /dev/null
@@ -1,130 +0,0 @@
-@module("./images/set-new-password-icon.svg")
-external resetPasswordIcon: string = "default"
-
-let str = React.string
-
-let handleErrorCB = (setSaving, ()) => setSaving(_ => false)
-
-let handleUpdatePasswordCB = response => {
-  let path =
-    response
-    |> {
-      open Json.Decode
-      field("path", nullable(string))
-    }
-    |> Js.Null.toOption
-  switch path {
-  | Some(path) => DomUtils.redirect(path)
-  | None => ()
-  }
-}
-
-let validPassword = password => {
-  let length = password |> String.length
-  length >= 8 && length < 128
-}
-let updatePassword = (authenticityToken, token, newPassword, confirmPassword, setSaving) => {
-  let payload = Js.Dict.empty()
-  Js.Dict.set(payload, "authenticity_token", authenticityToken |> Js.Json.string)
-  Js.Dict.set(payload, "token", token |> Js.Json.string)
-  Js.Dict.set(payload, "new_password", newPassword |> Js.Json.string)
-  Js.Dict.set(payload, "confirm_password", confirmPassword |> Js.Json.string)
-
-  let url = "/users/update_password"
-  setSaving(_ => true)
-  Api.create(url, payload, handleUpdatePasswordCB, handleErrorCB(setSaving))
-}
-let isDisabled = (saving, newPassword, confirmPassword) =>
-  !validPassword(newPassword) || (newPassword != confirmPassword || saving)
-
-let submitButtonText = (saving, newPassword, confirmPassword) =>
-  switch (
-    saving,
-    newPassword == "",
-    !validPassword(newPassword),
-    confirmPassword == "",
-    newPassword != confirmPassword,
-  ) {
-  | (true, _, _, _, _) => "Updating password..."
-  | (_, true, _, _, _) => "Enter new password"
-  | (_, _, true, _, _) => "Password is too short"
-  | (_, _, _, true, _) => "Confirm your password"
-  | (_, _, _, _, true) => "Passwords do not match"
-  | _ => "Update Password"
-  }
-let renderUpdatePassword = (
-  authenticityToken,
-  token,
-  newPassword,
-  setNewPassword,
-  confirmPassword,
-  setConfirmPassword,
-  saving,
-  setSaving,
-) => {
-  let inputClasses = "appearance-none h-10 mt-1 block w-full text-gray-800 border border-gray-400 rounded py-2 px-4 text-sm bg-gray-100 hover:bg-gray-200 focus:outline-none focus:bg-white focus:border-primary-400"
-  let labelClasses = "inline-block tracking-wide text-gray-900 text-xs font-semibold"
-  <div className="pt-4 pb-5 md:px-9 items-center max-w-sm mx-auto">
-    <div>
-      <label className=labelClasses htmlFor="new-password"> {"New Password" |> str} </label>
-      <input
-        className=inputClasses
-        id="new-password"
-        value=newPassword
-        type_="password"
-        maxLength=128
-        placeholder="Enter a strong password"
-        onChange={event => setNewPassword(ReactEvent.Form.target(event)["value"])}
-      />
-    </div>
-    <div className="mt-4">
-      <label className={labelClasses ++ " mt-2"} htmlFor="confirm password">
-        {"Confirm Password" |> str}
-      </label>
-      <input
-        className=inputClasses
-        id="confirm password"
-        value=confirmPassword
-        type_="password"
-        maxLength=128
-        placeholder="Please re-enter your password"
-        onChange={event => setConfirmPassword(ReactEvent.Form.target(event)["value"])}
-      />
-    </div>
-    <button
-      disabled={isDisabled(saving, newPassword, confirmPassword)}
-      onClick={_ =>
-        updatePassword(authenticityToken, token, newPassword, confirmPassword, setSaving)}
-      className="btn btn-success btn-large text-center w-full mt-4">
-      <FaIcon classes={saving ? "fas fa-spinner fa-spin" : "fas fa-lock"} />
-      <span className="ml-2">
-        {submitButtonText(saving, newPassword, confirmPassword) |> str}
-      </span>
-    </button>
-  </div>
-}
-
-@react.component
-let make = (~token, ~authenticityToken) => {
-  let (newPassword, setNewPassword) = React.useState(() => "")
-  let (confirmPassword, setConfirmPassword) = React.useState(() => "")
-  let (saving, setSaving) = React.useState(() => false)
-  <div className="bg-gray-100 sm:py-10">
-    <div className="container mx-auto max-w-lg px-4 py-6 sm:py-8 bg-white rounded-lg shadow">
-      <img className="mx-auto h-20 sm:h-32" src=resetPasswordIcon />
-      <div className="text-lg sm:text-2xl font-bold text-center mt-4">
-        {"Set new password" |> str}
-      </div>
-      {renderUpdatePassword(
-        authenticityToken,
-        token,
-        newPassword,
-        setNewPassword,
-        confirmPassword,
-        setConfirmPassword,
-        saving,
-        setSaving,
-      )}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Community.res b/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Community.res
deleted file mode 100644
index 3f7dbf0..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Community.res
+++ /dev/null
@@ -1,15 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-}
-
-let name = t => t.name
-let id = t => t.id
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Course.res b/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Course.res
deleted file mode 100644
index 2cca66c..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Course.res
+++ /dev/null
@@ -1,39 +0,0 @@
-type t = {
-  id: string,
-  name: string,
-  review: bool,
-  author: bool,
-  enableLeaderboard: bool,
-  description: string,
-  exited: bool,
-  thumbnailUrl: option<string>,
-  linkedCommunities: array<string>,
-  ended: bool,
-}
-
-let name = t => t.name
-let id = t => t.id
-let review = t => t.review
-let author = t => t.author
-let description = t => t.description
-let exited = t => t.exited
-let thumbnailUrl = t => t.thumbnailUrl
-let linkedCommunities = t => t.linkedCommunities
-let ended = t => t.ended
-let enableLeaderboard = t => t.enableLeaderboard
-
-let decode = json => {
-  open Json.Decode
-  {
-    id: json |> field("id", string),
-    name: json |> field("name", string),
-    description: json |> field("description", string),
-    exited: json |> field("exited", bool),
-    review: json |> field("review", bool),
-    author: json |> field("author", bool),
-    enableLeaderboard: json |> field("enableLeaderboard", bool),
-    thumbnailUrl: json |> field("thumbnailUrl", nullable(string)) |> Js.Null.toOption,
-    linkedCommunities: json |> field("linkedCommunities", array(string)),
-    ended: json |> field("ended", bool),
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Root.res b/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Root.res
deleted file mode 100644
index 9d28e14..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Root.res
+++ /dev/null
@@ -1,264 +0,0 @@
-%raw(`require("courses/shared/background_patterns.css")`)
-%raw(`require("./UserHome__Root.css")`)
-
-open UsersHome__Types
-
-let str = React.string
-
-type view =
-  | ShowCourses
-  | ShowCommunities
-
-let headerSectiom = (userName, userTitle, avatarUrl, showUserEdit) =>
-  <div className="max-w-4xl mx-auto pt-12 flex items-center justify-between px-3 lg:px-0">
-    <div className="flex">
-      {switch avatarUrl {
-      | Some(src) =>
-        <img
-          className="w-16 h-16 rounded-full border object-cover border-gray-400 rounded-full overflow-hidden flex-shrink-0 mr-4"
-          src
-        />
-      | None =>
-        <Avatar
-          name=userName
-          className="w-16 h-16 mr-4 border border-gray-400 rounded-full overflow-hidden flex-shrink-0"
-        />
-      }}
-      <div className="text-sm flex flex-col justify-center">
-        <div className="text-black font-bold inline-block"> {userName |> str} </div>
-        <div className="text-gray-600 inline-block"> {userTitle |> str} </div>
-      </div>
-    </div>
-    {showUserEdit
-      ? <a className="btn" href="/user/edit">
-          <i className="fas fa-edit text-xs md:text-sm mr-2" />
-          <span> {"Edit Profile" |> str} </span>
-        </a>
-      : React.null}
-  </div>
-
-let navButtonClasses = selected =>
-  "font-semibold border-b-2 border-transparent text-sm py-4 mr-6 focus:outline-none " ++ (
-    selected ? "text-primary-500 border-primary-500" : ""
-  )
-
-let navSection = (view, setView, communities) =>
-  <div className="border-b mt-6">
-    <div className="flex max-w-4xl mx-auto px-3 lg:px-0">
-      <button
-        className={navButtonClasses(view == ShowCourses)} onClick={_ => setView(_ => ShowCourses)}>
-        <i className="fas fa-book text-xs md:text-sm mr-2" /> <span> {"My Courses" |> str} </span>
-      </button>
-      {communities |> ArrayUtils.isNotEmpty
-        ? <button
-            className={navButtonClasses(view == ShowCommunities)}
-            onClick={_ => setView(_ => ShowCommunities)}>
-            <i className="fas fa-users text-xs md:text-sm mr-2" />
-            <span> {"Communities" |> str} </span>
-          </button>
-        : React.null}
-    </div>
-  </div>
-
-let courseLink = (href, title, icon) =>
-  <a
-    key=href
-    href
-    className="px-2 py-1 mr-2 mt-2 rounded text-sm bg-gray-100 text-gray-800 hover:bg-gray-200 hover:text-primary-500">
-    <i className=icon /> <span className="font-semibold ml-2"> {title |> str} </span>
-  </a>
-
-let ctaButton = (title, href) =>
-  <a
-    href
-    className="w-full bg-gray-200 mt-4 px-6 py-4 flex text-sm font-semibold justify-between items-center cursor-pointer text-primary-500 hover:bg-gray-300">
-    <span> <i className="fas fa-book" /> <span className="ml-2"> {title |> str} </span> </span>
-    <i className="fas fa-arrow-right" />
-  </a>
-
-let ctaText = (message, icon) =>
-  <div
-    className="w-full bg-red-100 text-red-600 mt-4 px-6 py-4 flex text-sm font-semibold justify-center items-center ">
-    <span> <i className=icon /> <span className="ml-2"> {message |> str} </span> </span>
-  </div>
-
-let studentLink = (courseId, suffix) => "/courses/" ++ (courseId ++ ("/" ++ suffix))
-
-let callToAction = (course, currentSchoolAdmin) =>
-  if currentSchoolAdmin {
-    #ViewCourse
-  } else if course |> Course.author {
-    #EditCourse
-  } else if course |> Course.review {
-    #ReviewSubmissions
-  } else if course |> Course.exited {
-    #DroppedOut
-  } else if course |> Course.ended {
-    #CourseEnded
-  } else {
-    #ViewCourse
-  }
-
-let ctaFooter = (course, currentSchoolAdmin) => {
-  let courseId = course |> Course.id
-
-  switch callToAction(course, currentSchoolAdmin) {
-  | #ViewCourse => ctaButton("View Course", studentLink(courseId, "curriculum"))
-  | #EditCourse => ctaButton("Edit Curriculum", "/school/courses/" ++ (courseId ++ "/curriculum"))
-  | #ReviewSubmissions => ctaButton("Review Submissions", studentLink(courseId, "review"))
-  | #DroppedOut => ctaText("Dropped out", "fas fa-user-slash")
-  | #CourseEnded => ctaText("Course Ended", "fas fa-history")
-  }
-}
-
-let communityLinks = (communityIds, communities) =>
-  communityIds
-  |> Array.map(id => {
-    let community = communities |> Js.Array.find(c => c |> Community.id == id)
-    switch community {
-    | Some(c) =>
-      <a
-        key={c |> Community.id}
-        href={"/communities/" ++ (c |> Community.id)}
-        className="px-2 py-1 mr-2 mt-2 rounded text-sm bg-gray-100 text-gray-800 hover:bg-gray-200 hover:text-primary-500">
-        <i className="fas fa-users" />
-        <span className="font-semibold ml-2"> {c |> Community.name |> str} </span>
-      </a>
-    | None => React.null
-    }
-  })
-  |> React.array
-
-let courseLinks = (course, currentSchoolAdmin, communities) => {
-  let courseId = course |> Course.id
-  let cta = callToAction(course, currentSchoolAdmin)
-
-  <div className="flex flex-wrap px-4 mt-2">
-    {course |> Course.author && cta != #EditCourse
-      ? courseLink(
-          "/school/courses/" ++ (courseId ++ "/curriculum"),
-          "Edit Curriculum",
-          "fas fa-check-square",
-        )
-      : React.null}
-    {cta != #ViewCourse
-      ? courseLink(studentLink(courseId, "curriculum"), "View Curriculum", "fas fa-book")
-      : React.null}
-    {course |> Course.enableLeaderboard
-      ? courseLink(studentLink(courseId, "leaderboard"), "Leaderboard", "fas fa-calendar-alt")
-      : React.null}
-    {course |> Course.review && cta != #ReviewSubmissions
-      ? courseLink(studentLink(courseId, "review"), "Review Submissions", "fas fa-check-square")
-      : React.null}
-    {course |> Course.review
-      ? courseLink(studentLink(courseId, "students"), "My Students", "fas fa-user-friends")
-      : React.null}
-    {communityLinks(course |> Course.linkedCommunities, communities)}
-  </div>
-}
-
-let coursesSection = (courses, communities, currentSchoolAdmin) =>
-  <div className="w-full max-w-4xl mx-auto">
-    <div className="flex flex-wrap flex-1 lg:-mx-5">
-      {courses
-      |> Array.map(course =>
-        <div
-          key={course |> Course.id}
-          ariaLabel={course |> Course.name}
-          className="w-full px-3 lg:px-5 md:w-1/2 mt-6 md:mt-10">
-          <div
-            key={course |> Course.id}
-            className="flex overflow-hidden shadow bg-white rounded-lg flex flex-col justify-between h-full">
-            <div>
-              <div className="relative">
-                <div className="relative pb-1/2 bg-gray-800">
-                  {switch course |> Course.thumbnailUrl {
-                  | Some(url) => <img className="absolute h-full w-full object-cover" src=url />
-                  | None =>
-                    <div
-                      className="user-home-course__cover absolute h-full w-full svg-bg-pattern-1"
-                    />
-                  }}
-                </div>
-                <div
-                  className="user-home-course__title-container absolute w-full flex items-center h-16 bottom-0 z-50"
-                  key={course |> Course.id}>
-                  <h4
-                    className="user-home-course__title text-white font-semibold leading-tight pl-6 pr-4 text-lg md:text-xl">
-                    {course |> Course.name |> str}
-                  </h4>
-                </div>
-              </div>
-              <div
-                className="user-home-course__description text-sm px-6 pt-4 w-full leading-relaxed">
-                {course |> Course.description |> str}
-              </div>
-              {if course |> Course.exited {
-                <div className="text-sm py-4 bg-red-100 rounded mt-2 px-6">
-                  {"Your student profile for this course is locked, and cannot be updated." |> str}
-                </div>
-              } else {
-                <div> {courseLinks(course, currentSchoolAdmin, communities)} </div>
-              }}
-            </div>
-            <div> {ctaFooter(course, currentSchoolAdmin)} </div>
-          </div>
-        </div>
-      )
-      |> React.array}
-    </div>
-  </div>
-
-let communitiesSection = communities =>
-  <div className="w-full max-w-4xl mx-auto">
-    <div className="flex flex-wrap flex-1 lg:-mx-5">
-      {communities
-      |> Array.map(community =>
-        <div
-          key={community |> Community.id}
-          className="flex w-full px-3 lg:px-5 md:w-1/2 mt-6 md:mt-10">
-          <a
-            className="w-full h-full shadow rounded-lg hover:shadow-lg"
-            href={"communities/" ++ (community |> Community.id)}>
-            <div
-              className="user-home-community__cover flex w-full bg-gray-600 h-40 svg-bg-pattern-5 items-center justify-center p-4 shadow rounded-t-lg"
-            />
-            <div className="w-full flex justify-between items-center flex-wrap px-4 pt-2 pb-4">
-              <h4 className="font-bold text-sm pt-2 leading-tight">
-                {community |> Community.name |> str}
-              </h4>
-              <div className="btn btn-small btn-primary-ghost mt-2">
-                {"Visit Community" |> str}
-              </div>
-            </div>
-          </a>
-        </div>
-      )
-      |> React.array}
-    </div>
-  </div>
-
-@react.component
-let make = (
-  ~currentSchoolAdmin,
-  ~courses,
-  ~communities,
-  ~showUserEdit,
-  ~userName,
-  ~userTitle,
-  ~avatarUrl,
-) => {
-  let (view, setView) = React.useState(() => ShowCourses)
-  <div className="bg-gray-100">
-    <div className="bg-white">
-      {headerSectiom(userName, userTitle, avatarUrl, showUserEdit)}
-      {navSection(view, setView, communities)}
-    </div>
-    <div className="pb-8">
-      {switch view {
-      | ShowCourses => coursesSection(courses, communities, currentSchoolAdmin)
-      | ShowCommunities => communitiesSection(communities)
-      }}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Types.res b/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Types.res
deleted file mode 100644
index dc5d0c0..0000000
--- a/jscomp/syntax/tests/idempotency/pupilfirst/users/UsersHome__Types.res
+++ /dev/null
@@ -1,2 +0,0 @@
-module Course = UsersHome__Course
-module Community = UsersHome__Community
diff --git a/jscomp/syntax/tests/idempotency/reason-react-hackernews/CommentList.res b/jscomp/syntax/tests/idempotency/reason-react-hackernews/CommentList.res
deleted file mode 100644
index ae2ee17..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react-hackernews/CommentList.res
+++ /dev/null
@@ -1,97 +0,0 @@
-open Belt
-
-open Utils
-
-requireCSS("src/CommentList.css")
-
-type action = Toggle(option<string>)
-
-type state = {collapsed_comments: Set.Int.t}
-let initialState = {collapsed_comments: Set.Int.empty}
-let toggleComment = (collapsed, idMaybe: option<string>) =>
-  switch idMaybe {
-  | Some(idString) =>
-    let id = int_of_string(idString)
-    if Set.Int.has(collapsed, id) {
-      Set.Int.remove(collapsed, id)
-    } else {
-      Set.Int.add(collapsed, id)
-    }
-  | None => collapsed
-  }
-@react.component
-let make = (~story: StoryData.story_with_comments) => {
-  let (state, dispatch) = React.useReducer((state, action) =>
-    switch action {
-    | Toggle(commentId) => {
-        collapsed_comments: toggleComment(state.collapsed_comments, commentId),
-      }
-    }
-  , initialState)
-
-  let getCommentIdFromEvent = (event: ReactEvent.Mouse.t) =>
-    getAttribute(ReactEvent.Mouse.currentTarget(event), "name")
-  let renderCommentText = (textMaybe: option<string>) =>
-    switch textMaybe {
-    | Some(text) => <div dangerouslySetInnerHTML={dangerousHtml(text)} />
-    | None => React.string("missing comment")
-    }
-  let rec renderCommentKids = (comment: StoryData.comment_present) =>
-    renderCommentList(comment.kids)
-  and renderComment = (id: int) => {
-    let commentMaybe = Map.Int.get(story.comments, id)
-    <div key={string_of_int(id)}>
-      {switch commentMaybe {
-      | Some(commentPresentOrDeleted) =>
-        switch commentPresentOrDeleted {
-        | StoryData.CommentPresent(comment) =>
-          let openComment = !Set.Int.has(state.collapsed_comments, comment.id)
-          <div className="CommentList_comment">
-            <div
-              className="CommentList_disclosureRow CommentList_inline"
-              name={string_of_int(comment.id)}
-              onClick={event => dispatch(Toggle(getCommentIdFromEvent(event)))}>
-              <img
-                alt={openComment ? "hide" : "show"}
-                src={openComment
-                  ? requireAssetURI("src/disclosure90.png")
-                  : requireAssetURI("src/disclosure.png")}
-                className="CommentList_disclosure CommentList_muted"
-              />
-              <span className="CommentList_muted">
-                {
-                  let time = fromNow(comment.time)
-                  let by = comment.by
-                  React.string(j` $time by $by`)
-                }
-              </span>
-            </div>
-            {if openComment {
-              <div className="CommentList_commentBody">
-                {renderCommentText(comment.text)} {renderCommentKids(comment)}
-              </div>
-            } else {
-              <noscript />
-            }}
-          </div>
-        | StoryData.CommentDeleted(_) =>
-          <div className="CommentList_error">
-            {React.string("[comment deleted (id=" ++ (string_of_int(id) ++ ")]"))}
-          </div>
-        }
-      | None =>
-        <div className="CommentList_error">
-          {React.string("[comment not loaded (id=" ++ (string_of_int(id) ++ ")]"))}
-        </div>
-      }}
-    </div>
-  }
-  and renderCommentList = (commentIds: option<array<int>>) =>
-    switch commentIds {
-    | Some(ids) =>
-      let commentList = Array.map(ids, id => renderComment(id))
-      <div> {React.array(commentList)} </div>
-    | None => <div />
-    }
-  renderCommentList(story.kids)
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react-hackernews/CommentsPage.res b/jscomp/syntax/tests/idempotency/reason-react-hackernews/CommentsPage.res
deleted file mode 100644
index f785b6b..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react-hackernews/CommentsPage.res
+++ /dev/null
@@ -1,51 +0,0 @@
-open Utils
-
-requireCSS("src/CommentsPage.css")
-
-type state = {story_with_comments: option<StoryData.story_with_comments>}
-
-type action = Loaded(StoryData.story_with_comments)
-
-@react.component
-let make = (~id) => {
-  let (state, dispatch) = React.useReducer((_state, action) =>
-    switch action {
-    | Loaded(data) => {story_with_comments: Some(data)}
-    }
-  , {story_with_comments: None})
-
-  let renderTitle = (story: StoryData.story_with_comments) => {
-    let title = <h2 className="CommentsPage_title"> {React.string(story.title)} </h2>
-    <div>
-      {switch story.url {
-      | Some(url) => <a href=url className="CommentsPage_titleLink"> title </a>
-      | None => title
-      }}
-    </div>
-  }
-  let renderByline = (story: StoryData.story_with_comments) =>
-    <div>
-      <span> {React.string(string_of_int(story.score))} </span>
-      {React.string(" points")}
-      <span>
-        <span>
-          {
-            let time = story.time
-            let by = story.by
-            React.string(j` submitted $time by $by`)
-          }
-        </span>
-      </span>
-    </div>
-  React.useEffect0(() => {
-    StoryData.fetchStoryWithComments(id, data => dispatch(Loaded(data))) |> ignore
-    None
-  })
-
-  <div className="CommentsPage_container">
-    {switch state.story_with_comments {
-    | Some(story) => <div> {renderTitle(story)} {renderByline(story)} <CommentList story /> </div>
-    | None => React.string("loading")
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react-hackernews/NotFound.res b/jscomp/syntax/tests/idempotency/reason-react-hackernews/NotFound.res
deleted file mode 100644
index a72243c..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react-hackernews/NotFound.res
+++ /dev/null
@@ -1,15 +0,0 @@
-open Utils
-
-requireCSS("src/NotFound.css")
-
-let notFoundImage = requireAssetURI("src/notfound404.png")
-
-@react.component
-let make = () =>
-  <div className="NotFound_container">
-    <div className="NotFound_image"> <img alt="Page not found" src=notFoundImage /> </div>
-    <div className="NotFound_text">
-      <span> {React.string("The page you're looking for can't be found. Go home by ")} </span>
-      <Link href="/"> {React.string("clicking here!")} </Link>
-    </div>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/reason-react-hackernews/StoryData.res b/jscomp/syntax/tests/idempotency/reason-react-hackernews/StoryData.res
deleted file mode 100644
index 3cf06c3..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react-hackernews/StoryData.res
+++ /dev/null
@@ -1,158 +0,0 @@
-open Belt
-
-let apiBaseUrl = "https://serverless-api.hackernewsmobile.com"
-
-let topStoriesUrl = page => j`$apiBaseUrl/topstories-25-$page.json`
-
-let storyUrl = id => j`$apiBaseUrl/stories/$id.json`
-
-type story = {
-  by: string,
-  descendants: int,
-  id: int,
-  score: int,
-  time: int,
-  title: string,
-  url: option<string>,
-}
-
-type comment_deleted = {id: int}
-
-type comment_present = {
-  by: string,
-  id: int,
-  kids: option<array<int>>,
-  parent: int,
-  text: option<string>,
-  time: int,
-}
-
-type comment =
-  | CommentPresent(comment_present)
-  | CommentDeleted(comment_deleted)
-
-type comments_map = Map.Int.t<comment>
-
-type story_with_comments = {
-  by: string,
-  descendants: int,
-  id: int,
-  kids: option<array<int>>,
-  score: int,
-  time: int,
-  title: string,
-  url: option<string>,
-  descendentIds: array<int>,
-  comments: comments_map,
-}
-
-type topstories = array<story>
-
-module Decode = {
-  let idsArray = (json): array<int> => {
-    open Json.Decode
-    json |> array(int)
-  }
-  let getCommentId = comment =>
-    switch comment {
-    | CommentDeleted(c) => c.id
-    | CommentPresent(c) => c.id
-    }
-  let comment = (json): comment => {
-    let deletedMaybe = {
-      open Json.Decode
-      json |> optional(field("deleted", bool))
-    }
-    let deleted = switch deletedMaybe {
-    | Some(v) => v == true
-    | None => false
-    }
-    if deleted {
-      CommentDeleted({
-        open Json.Decode
-        {id: json |> field("id", int)}
-      })
-    } else {
-      CommentPresent({
-        open Json.Decode
-        {
-          by: json |> field("by", string),
-          id: json |> field("id", int),
-          parent: json |> field("parent", int),
-          kids: json |> optional(field("kids", idsArray)),
-          text: json |> optional(field("text", string)),
-          time: json |> field("time", int),
-        }
-      })
-    }
-  }
-  let commentsArray = (json): comments_map =>
-    Json.Decode.array(comment, json)
-    ->Array.map(comment => (getCommentId(comment), comment))
-    ->Map.Int.fromArray
-  let storyWithComments = (json): story_with_comments => {
-    open Json.Decode
-    {
-      by: json |> field("by", string),
-      descendants: json |> field("descendants", int),
-      descendentIds: json |> field("descendentIds", idsArray),
-      comments: json |> field("comments", commentsArray),
-      id: json |> field("id", int),
-      kids: json |> optional(field("kids", idsArray)),
-      score: json |> field("score", int),
-      time: json |> field("time", int),
-      title: json |> field("title", string),
-      url: json |> optional(field("url", string)),
-    }
-  }
-  let story = (json): story => {
-    open Json.Decode
-    {
-      by: json |> field("by", string),
-      descendants: json |> field("descendants", int),
-      id: json |> field("id", int),
-      score: json |> field("score", int),
-      time: json |> field("time", int),
-      title: json |> field("title", string),
-      url: json |> optional(field("url", string)),
-    }
-  }
-  let stories = (json): array<story> => {
-    open Json.Decode
-    json |> array(story)
-  }
-}
-
-let fetchTopStories = (page, callback) => {
-  open Js.Promise
-  Fetch.fetch(topStoriesUrl(page))
-  |> then_(Fetch.Response.json)
-  |> then_(json =>
-    json
-    |> Decode.stories
-    |> (
-      stories => {
-        callback((page, stories))
-        resolve()
-      }
-    )
-  )
-  |> ignore
-} /* TODO: error handling */
-
-let fetchStoryWithComments = (id, callback) => {
-  open Js.Promise
-  Fetch.fetch(storyUrl(id))
-  |> then_(Fetch.Response.json)
-  |> then_(json =>
-    json
-    |> Decode.storyWithComments
-    |> (
-      stories => {
-        callback(stories)
-        resolve()
-      }
-    )
-  )
-  |> ignore
-} /* TODO: error handling */
diff --git a/jscomp/syntax/tests/idempotency/reason-react-hackernews/StoryListItem.res b/jscomp/syntax/tests/idempotency/reason-react-hackernews/StoryListItem.res
deleted file mode 100644
index 3438d1f..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react-hackernews/StoryListItem.res
+++ /dev/null
@@ -1,56 +0,0 @@
-open Utils
-
-requireCSS("src/StoryListItem.css")
-
-let commentIcon = requireAssetURI("src/comment.png")
-
-@react.component
-let make = (~story: StoryData.story, ~index: int, ()) => {
-  let renderIndex = () =>
-    <aside className="StoryListItem_storyIndex"> {React.string(string_of_int(index + 1))} </aside>
-  let renderTitle = () => {
-    let content = React.string(story.title)
-    <header className="StoryListItem_storyTitle">
-      {switch story.url {
-      | Some(url) => <a href=url className="StoryListItem_link" target="_blank"> content </a>
-      | None =>
-        <Link href={"/comments/" ++ string_of_int(story.id)} className="StoryListItem_link">
-          content
-        </Link>
-      }}
-    </header>
-  }
-  let renderByline = () =>
-    <div className="StoryListItem_row StoryListItem_byline">
-      <span className="StoryListItem_number">
-        <b> {React.string(string_of_int(story.score))} </b> {React.string(" points")}
-      </span>
-      <span className="StoryListItem_storyTime">
-        {
-          let time = story.time
-          let by = story.by
-          React.string(j` submitted $time by $by`)
-        }
-      </span>
-    </div>
-  let renderArticleButton = () =>
-    <div className="StoryListItem_flexRow">
-      {renderIndex()}
-      <div className="StoryListItem_storyCell"> {renderTitle()} {renderByline()} </div>
-    </div>
-  let renderCommentsButton = () =>
-    <div className="StoryListItem_commentsCell">
-      <Link href={"/comments/" ++ string_of_int(story.id)} className="StoryListItem_link">
-        <div> <img alt="comments" className="StoryListItem_icon" src=commentIcon /> </div>
-        <div>
-          <span className="StoryListItem_commentsText">
-            <span className="StoryListItem_number">
-              {React.string(string_of_int(story.descendants))}
-            </span>
-            {React.string(" comments")}
-          </span>
-        </div>
-      </Link>
-    </div>
-  <div className="StoryListItem_itemRow"> {renderArticleButton()} {renderCommentsButton()} </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react-hackernews/TopStoriesPage.res b/jscomp/syntax/tests/idempotency/reason-react-hackernews/TopStoriesPage.res
deleted file mode 100644
index bff3c54..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react-hackernews/TopStoriesPage.res
+++ /dev/null
@@ -1,61 +0,0 @@
-open Belt
-open Utils
-
-type state = {
-  topstories: StoryData.topstories,
-  page: int,
-  loading: bool,
-}
-
-type action =
-  | Loaded((int, StoryData.topstories))
-  | Loading
-
-let initialState = {topstories: [], page: 0, loading: false}
-
-@react.component
-let make = () => {
-  let (state, dispatch) = React.useReducer((state, action) =>
-    switch action {
-    | Loading => {...state, loading: true}
-    | Loaded((page, data)) =>
-      let updatedTopstories = Array.concat(state.topstories, data)
-      {topstories: updatedTopstories, page: page + 1, loading: false}
-    }
-  , initialState)
-  // Using useEffect0 to run this effect one time and prevent multiple reloads of same data which crashes browser
-  React.useEffect0(() => {
-    StoryData.fetchTopStories(state.page, payload => dispatch(Loaded(payload))) |> ignore
-    None
-  })
-
-  React.useEffect(() => {
-    let nearTheBottom = () => distanceFromBottom() < 100
-    let loadNextPage = () =>
-      if state.page < 4 {
-        StoryData.fetchTopStories(state.page, payload => dispatch(Loaded(payload))) |> ignore
-        dispatch(Loading)
-      }
-    let scrollHander = _e =>
-      if nearTheBottom() && !state.loading {
-        loadNextPage()
-      }
-    Webapi.Dom.window |> Webapi.Dom.Window.addEventListener("scroll", scrollHander)
-
-    Some(() => Webapi.Dom.window |> Webapi.Dom.Window.removeEventListener("scroll", scrollHander))
-  })
-
-  <div>
-    {if Array.length(state.topstories) > 0 {
-      state.topstories
-      ->Array.mapWithIndex((index, story) =>
-        /* key must be a unique string attached to the story, DO NOT use index. Using just the story.id get error in browser for duplicate keys */
-
-        <StoryListItem key={string_of_int(story.id + index)} index story />
-      )
-      ->React.array
-    } else {
-      ReasonReact.null
-    }}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react-hackernews/Utils.res b/jscomp/syntax/tests/idempotency/reason-react-hackernews/Utils.res
deleted file mode 100644
index 117fe6f..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react-hackernews/Utils.res
+++ /dev/null
@@ -1,34 +0,0 @@
-/* require css file for side effect only */
-@val external requireCSS: string => unit = "require"
-
-/* require an asset (eg. an image) and return exported string value (image URI) */
-@val external requireAssetURI: string => string = "require"
-
-@val external currentTime: unit => int = "Date.now"
-
-/* format a timestamp in seconds as relative humanised time sentence */
-let fromNow = unixtime => {
-  let delta = currentTime() / 1000 - unixtime
-  if delta < 3600 {
-    string_of_int(delta / 60) ++ " minutes ago"
-  } else if delta < 86400 {
-    string_of_int(delta / 3600) ++ " hours ago"
-  } else {
-    string_of_int(delta / 86400) ++ " days ago"
-  }
-}
-
-@send @return(nullable)
-external getAttribute: ('a, string) => option<string> = "getAttribute"
-
-let dangerousHtml: string => 'a = html => {"__html": html}
-
-let distanceFromBottom: unit => int = () => {
-  let bodyClientHeight = %raw("document.body.clientHeight")
-  let windowScrollY = %raw("window.scrollY")
-  let windowInnerHeight = %raw("window.innerHeight")
-  bodyClientHeight - (windowScrollY + windowInnerHeight)
-}
-
-@module
-external registerServiceWorker: unit => unit = "src/registerServiceWorker"
diff --git a/jscomp/syntax/tests/idempotency/reason-react-hackernews/app.res b/jscomp/syntax/tests/idempotency/reason-react-hackernews/app.res
deleted file mode 100644
index 5171816..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react-hackernews/app.res
+++ /dev/null
@@ -1,10 +0,0 @@
-@react.component
-let make = () => {
-  let url = ReasonReact.Router.useUrl()
-
-  switch url.path {
-  | list{} => <TopStoriesPage />
-  | list{"comments", id} => <CommentsPage id={int_of_string(id)} />
-  | _ => <NotFound />
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react-hackernews/index.res b/jscomp/syntax/tests/idempotency/reason-react-hackernews/index.res
deleted file mode 100644
index c31f685..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react-hackernews/index.res
+++ /dev/null
@@ -1,7 +0,0 @@
-open Utils
-
-registerServiceWorker()
-
-ReactDOMRe.renderToElementWithId(<App />, "root")
-
-ReasonReact.Router.push("")
diff --git a/jscomp/syntax/tests/idempotency/reason-react-hackernews/link.res b/jscomp/syntax/tests/idempotency/reason-react-hackernews/link.res
deleted file mode 100644
index d10ac27..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react-hackernews/link.res
+++ /dev/null
@@ -1,8 +0,0 @@
-let handleClick = (href, event) =>
-  if !ReactEvent.Mouse.defaultPrevented(event) {
-    ReactEvent.Mouse.preventDefault(event)
-    ReasonReact.Router.push(href)
-  }
-@react.component
-let make = (~href, ~className="", ~children) =>
-  <a href className onClick={event => handleClick(href, event)}> children </a>
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/React.res b/jscomp/syntax/tests/idempotency/reason-react/src/React.res
deleted file mode 100644
index cba448a..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/React.res
+++ /dev/null
@@ -1,292 +0,0 @@
-type element
-
-@val external null: element = "null"
-
-external string: string => element = "%identity"
-
-external array: array<element> => element = "%identity"
-
-type componentLike<'props, 'return> = 'props => 'return
-
-type component<'props> = componentLike<'props, element>
-
-@module("react")
-external createElement: (component<'props>, 'props) => element = "createElement"
-
-@module("react")
-external cloneElement: (component<'props>, 'props) => element = "cloneElement"
-
-@variadic @module("react")
-external createElementVariadic: (component<'props>, 'props, array<element>) => element =
-  "createElement"
-
-module Ref = {
-  type t<'value>
-
-  @get external current: t<'value> => 'value = "current"
-  @set external setCurrent: (t<'value>, 'value) => unit = "current"
-}
-
-@module("react") external createRef: unit => Ref.t<Js.nullable<'a>> = "createRef"
-
-module Children = {
-  @module("react") @scope("Children") @val
-  external map: (element, element => element) => element = "map"
-  @module("react") @scope("Children") @val
-  external forEach: (element, element => unit) => unit = "forEach"
-  @module("react") @scope("Children") @val
-  external count: element => int = "count"
-  @module("react") @scope("Children") @val
-  external only: element => element = "only"
-  @module("react") @scope("Children") @val
-  external toArray: element => array<element> = "toArray"
-}
-
-module Context = {
-  type t<'props>
-
-  @get
-  external provider: t<'props> => component<{"value": 'props, "children": element}> = "Provider"
-}
-
-@module("react") external createContext: 'a => Context.t<'a> = "createContext"
-
-@module("react")
-external forwardRef: (@uncurry ('props, Js.Nullable.t<Ref.t<'a>>) => element) => component<'props> =
-  "forwardRef"
-
-@module("react")
-external memo: component<'props> => component<'props> = "memo"
-
-@module("react")
-external memoCustomCompareProps: (
-  component<'props>,
-  @uncurry ('props, 'props) => bool,
-) => component<'props> = "memo"
-
-module Fragment = {
-  @obj
-  external makeProps: (~children: element, ~key: 'key=?, unit) => {"children": element} = ""
-  @module("react")
-  external make: component<{
-    "children": element,
-  }> = "Fragment"
-}
-
-module Suspense = {
-  @obj
-  external makeProps: (
-    ~children: element=?,
-    ~fallback: element=?,
-    ~maxDuration: int=?,
-    ~key: 'key=?,
-    unit,
-  ) => {"children": option<element>, "fallback": option<element>, "maxDuration": option<int>} = ""
-  @module("react")
-  external make: component<{
-    "children": option<element>,
-    "fallback": option<element>,
-    "maxDuration": option<int>,
-  }> = "Suspense"
-}
-
-/* HOOKS */
-
-/*
- * Yeah, we know this api isn't great. tl;dr: useReducer instead.
- * It's because useState can take functions or non-function values and treats
- * them differently. Lazy initializer + callback which returns state is the
- * only way to safely have any type of state and be able to update it correctly.
- */
-@module("react")
-external useState: (@uncurry (unit => 'state)) => ('state, ('state => 'state) => unit) = "useState"
-
-@module("react")
-external useReducer: (@uncurry ('state, 'action) => 'state, 'state) => ('state, 'action => unit) =
-  "useReducer"
-
-@module("react")
-external useReducerWithMapState: (
-  @uncurry ('state, 'action) => 'state,
-  'initialState,
-  'initialState => 'state,
-) => ('state, 'action => unit) = "useReducer"
-
-@module("react")
-external useEffect: (@uncurry (unit => option<unit => unit>)) => unit = "useEffect"
-@module("react")
-external useEffect0: (@uncurry (unit => option<unit => unit>), @as(json`[]`) _) => unit =
-  "useEffect"
-@module("react")
-external useEffect1: (@uncurry (unit => option<unit => unit>), array<'a>) => unit = "useEffect"
-@module("react")
-external useEffect2: (@uncurry (unit => option<unit => unit>), ('a, 'b)) => unit = "useEffect"
-@module("react")
-external useEffect3: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c)) => unit = "useEffect"
-@module("react")
-external useEffect4: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd)) => unit =
-  "useEffect"
-@module("react")
-external useEffect5: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd, 'e)) => unit =
-  "useEffect"
-@module("react")
-external useEffect6: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd, 'e, 'f)) => unit =
-  "useEffect"
-@module("react")
-external useEffect7: (
-  @uncurry (unit => option<unit => unit>),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => unit = "useEffect"
-
-@module("react")
-external useLayoutEffect: (@uncurry (unit => option<unit => unit>)) => unit = "useLayoutEffect"
-@module("react")
-external useLayoutEffect0: (@uncurry (unit => option<unit => unit>), @as(json`[]`) _) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect1: (@uncurry (unit => option<unit => unit>), array<'a>) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect2: (@uncurry (unit => option<unit => unit>), ('a, 'b)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect3: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect4: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect5: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd, 'e)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect6: (
-  @uncurry (unit => option<unit => unit>),
-  ('a, 'b, 'c, 'd, 'e, 'f),
-) => unit = "useLayoutEffect"
-@module("react")
-external useLayoutEffect7: (
-  @uncurry (unit => option<unit => unit>),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => unit = "useLayoutEffect"
-
-@module("react")
-external useMemo: (@uncurry (unit => 'any)) => 'any = "useMemo"
-@module("react")
-external useMemo0: (@uncurry (unit => 'any), @as(json`[]`) _) => 'any = "useMemo"
-@module("react")
-external useMemo1: (@uncurry (unit => 'any), array<'a>) => 'any = "useMemo"
-@module("react")
-external useMemo2: (@uncurry (unit => 'any), ('a, 'b)) => 'any = "useMemo"
-@module("react")
-external useMemo3: (@uncurry (unit => 'any), ('a, 'b, 'c)) => 'any = "useMemo"
-@module("react")
-external useMemo4: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd)) => 'any = "useMemo"
-@module("react")
-external useMemo5: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd, 'e)) => 'any = "useMemo"
-@module("react")
-external useMemo6: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd, 'e, 'f)) => 'any = "useMemo"
-@module("react")
-external useMemo7: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd, 'e, 'f, 'g)) => 'any = "useMemo"
-
-/* This is used as return values */
-type callback<'input, 'output> = 'input => 'output
-
-@module("react")
-external useCallback: (@uncurry ('input => 'output)) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback0: (
-  @uncurry ('input => 'output),
-  @as(json`[]`) _,
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback1: (@uncurry ('input => 'output), array<'a>) => callback<'input, 'output> =
-  "useCallback"
-@module("react")
-external useCallback2: (@uncurry ('input => 'output), ('a, 'b)) => callback<'input, 'output> =
-  "useCallback"
-@module("react")
-external useCallback3: (@uncurry ('input => 'output), ('a, 'b, 'c)) => callback<'input, 'output> =
-  "useCallback"
-@module("react")
-external useCallback4: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd),
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback5: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd, 'e),
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback6: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd, 'e, 'f),
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback7: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => callback<'input, 'output> = "useCallback"
-
-@module("react") external useContext: Context.t<'any> => 'any = "useContext"
-
-@module("react") external useRef: 'value => Ref.t<'value> = "useRef"
-
-@module("react")
-external useImperativeHandle0: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  @as(json`[]`) _,
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle1: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  array<'a>,
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle2: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle3: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle4: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle5: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd, 'e),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle6: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd, 'e, 'f),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle7: (
-  Js.Nullable.t<Ref.t<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => unit = "useImperativeHandle"
-
-@set
-external setDisplayName: (component<'props>, string) => unit = "displayName"
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReactDOMRe.res b/jscomp/syntax/tests/idempotency/reason-react/src/ReactDOMRe.res
deleted file mode 100644
index 16e71e2..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReactDOMRe.res
+++ /dev/null
@@ -1,2556 +0,0 @@
-/* First time reading an OCaml/Reason/BuckleScript file? */
-/* `external` is the foreign function call in OCaml. */
-/* here we're saying `I guarantee that on the JS side, we have a `render` function in the module "react-dom"
- that takes in a reactElement, a dom element, and returns unit (nothing) */
-/* It's like `let`, except you're pointing the implementation to the JS side. The compiler will inline these
- calls and add the appropriate `require("react-dom")` in the file calling this `render` */
-@val @module("react-dom")
-external render: (React.element, Dom.element) => unit = "render"
-
-@val
-external _getElementsByClassName: string => array<Dom.element> = "document.getElementsByClassName"
-
-@val @return(nullable)
-external _getElementById: string => option<Dom.element> = "document.getElementById"
-
-let renderToElementWithClassName = (reactElement, className) =>
-  switch _getElementsByClassName(className) {
-  | [] =>
-    raise(
-      Invalid_argument(
-        "ReactDOMRe.renderToElementWithClassName: no element of class " ++
-        (className ++
-        " found in the HTML."),
-      ),
-    )
-  | elements => render(reactElement, Array.unsafe_get(elements, 0))
-  }
-
-let renderToElementWithId = (reactElement, id) =>
-  switch _getElementById(id) {
-  | None =>
-    raise(
-      Invalid_argument(
-        "ReactDOMRe.renderToElementWithId : no element of id " ++ (id ++ " found in the HTML."),
-      ),
-    )
-  | Some(element) => render(reactElement, element)
-  }
-
-@val @module("react-dom")
-external hydrate: (React.element, Dom.element) => unit = "hydrate"
-
-let hydrateToElementWithClassName = (reactElement, className) =>
-  switch _getElementsByClassName(className) {
-  | [] =>
-    raise(
-      Invalid_argument(
-        "ReactDOMRe.hydrateToElementWithClassName: no element of class " ++
-        (className ++
-        " found in the HTML."),
-      ),
-    )
-  | elements => hydrate(reactElement, Array.unsafe_get(elements, 0))
-  }
-
-let hydrateToElementWithId = (reactElement, id) =>
-  switch _getElementById(id) {
-  | None =>
-    raise(
-      Invalid_argument(
-        "ReactDOMRe.hydrateToElementWithId : no element of id " ++ (id ++ " found in the HTML."),
-      ),
-    )
-  | Some(element) => hydrate(reactElement, element)
-  }
-
-@val @module("react-dom")
-external createPortal: (React.element, Dom.element) => React.element = "createPortal"
-
-@val @module("react-dom")
-external unmountComponentAtNode: Dom.element => unit = "unmountComponentAtNode"
-
-@val @module("react-dom")
-external findDOMNode: ReasonReact.reactRef => Dom.element = "findDOMNode"
-
-external domElementToObj: Dom.element => {..} = "%identity"
-
-type style
-
-type domRef
-
-module Ref = {
-  type t = domRef
-  type currentDomRef = React.Ref.t<Js.nullable<Dom.element>>
-  type callbackDomRef = Js.nullable<Dom.element> => unit
-
-  external domRef: currentDomRef => domRef = "%identity"
-  external callbackDomRef: callbackDomRef => domRef = "%identity"
-}
-
-/* This list isn't exhaustive. We'll add more as we go. */
-/*
- * Watch out! There are two props types and the only difference is the type of ref.
- * Please keep in sync.
- */
-@deriving(abstract)
-type domProps = {
-  @optional
-  key: string,
-  @optional
-  ref: domRef,
-  /* accessibility */
-  /* https://www.w3.org/TR/wai-aria-1.1/ */
-  /* https://accessibilityresources.org/<aria-tag> is a great resource for these */
-  /* [@bs.optional] [@bs.as "aria-current"] ariaCurrent: page|step|location|date|time|true|false, */
-  @optional @as("aria-details")
-  ariaDetails: string,
-  @optional @as("aria-disabled")
-  ariaDisabled: bool,
-  @optional @as("aria-hidden")
-  ariaHidden: bool,
-  /* [@bs.optional] [@bs.as "aria-invalid"] ariaInvalid: grammar|false|spelling|true, */
-  @optional @as("aria-keyshortcuts")
-  ariaKeyshortcuts: string,
-  @optional @as("aria-label")
-  ariaLabel: string,
-  @optional @as("aria-roledescription")
-  ariaRoledescription: string,
-  /* Widget Attributes */
-  /* [@bs.optional] [@bs.as "aria-autocomplete"] ariaAutocomplete: inline|list|both|none, */
-  /* [@bs.optional] [@bs.as "aria-checked"] ariaChecked: true|false|mixed, /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */ */
-  @optional @as("aria-expanded")
-  ariaExpanded: bool,
-  /* [@bs.optional] [@bs.as "aria-haspopup"] ariaHaspopup: false|true|menu|listbox|tree|grid|dialog, */
-  @optional @as("aria-level")
-  ariaLevel: int,
-  @optional @as("aria-modal")
-  ariaModal: bool,
-  @optional @as("aria-multiline")
-  ariaMultiline: bool,
-  @optional @as("aria-multiselectable")
-  ariaMultiselectable: bool,
-  /* [@bs.optional] [@bs.as "aria-orientation"] ariaOrientation: horizontal|vertical|undefined, */
-  @optional @as("aria-placeholder")
-  ariaPlaceholder: string,
-  /* [@bs.optional] [@bs.as "aria-pressed"] ariaPressed: true|false|mixed, /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */ */
-  @optional @as("aria-readonly")
-  ariaReadonly: bool,
-  @optional @as("aria-required")
-  ariaRequired: bool,
-  @optional @as("aria-selected")
-  ariaSelected: bool,
-  @optional @as("aria-sort")
-  ariaSort: string,
-  @optional @as("aria-valuemax")
-  ariaValuemax: float,
-  @optional @as("aria-valuemin")
-  ariaValuemin: float,
-  @optional @as("aria-valuenow")
-  ariaValuenow: float,
-  @optional @as("aria-valuetext")
-  ariaValuetext: string,
-  /* Live Region Attributes */
-  @optional @as("aria-atomic")
-  ariaAtomic: bool,
-  @optional @as("aria-busy")
-  ariaBusy: bool,
-  /* [@bs.optional] [@bs.as "aria-live"] ariaLive: off|polite|assertive|rude, */
-  @optional @as("aria-relevant")
-  ariaRelevant: string,
-  /* Drag-and-Drop Attributes */
-  /* [@bs.optional] [@bs.as "aria-dropeffect"] ariaDropeffect: copy|move|link|execute|popup|none, */
-  @optional @as("aria-grabbed")
-  ariaGrabbed: bool,
-  /* Relationship Attributes */
-  @optional @as("aria-activedescendant")
-  ariaActivedescendant: string,
-  @optional @as("aria-colcount")
-  ariaColcount: int,
-  @optional @as("aria-colindex")
-  ariaColindex: int,
-  @optional @as("aria-colspan")
-  ariaColspan: int,
-  @optional @as("aria-controls")
-  ariaControls: string,
-  @optional @as("aria-describedby")
-  ariaDescribedby: string,
-  @optional @as("aria-errormessage")
-  ariaErrormessage: string,
-  @optional @as("aria-flowto")
-  ariaFlowto: string,
-  @optional @as("aria-labelledby")
-  ariaLabelledby: string,
-  @optional @as("aria-owns")
-  ariaOwns: string,
-  @optional @as("aria-posinset")
-  ariaPosinset: int,
-  @optional @as("aria-rowcount")
-  ariaRowcount: int,
-  @optional @as("aria-rowindex")
-  ariaRowindex: int,
-  @optional @as("aria-rowspan")
-  ariaRowspan: int,
-  @optional @as("aria-setsize")
-  ariaSetsize: int,
-  /* react textarea/input */
-  @optional
-  defaultChecked: bool,
-  @optional
-  defaultValue: string,
-  /* global html attributes */
-  @optional
-  accessKey: string,
-  @optional
-  className: string /* substitute for "class" */,
-  @optional
-  contentEditable: bool,
-  @optional
-  contextMenu: string,
-  @optional
-  dir: string /* "ltr", "rtl" or "auto" */,
-  @optional
-  draggable: bool,
-  @optional
-  hidden: bool,
-  @optional
-  id: string,
-  @optional
-  lang: string,
-  @optional
-  role: string /* ARIA role */,
-  @optional
-  style: style,
-  @optional
-  spellCheck: bool,
-  @optional
-  tabIndex: int,
-  @optional
-  title: string,
-  /* html5 microdata */
-  @optional
-  itemID: string,
-  @optional
-  itemProp: string,
-  @optional
-  itemRef: string,
-  @optional
-  itemScope: bool,
-  @optional
-  itemType: string /* uri */,
-  /* tag-specific html attributes */
-  @optional
-  accept: string,
-  @optional
-  acceptCharset: string,
-  @optional
-  action: string /* uri */,
-  @optional
-  allowFullScreen: bool,
-  @optional
-  alt: string,
-  @optional
-  async: bool,
-  @optional
-  autoComplete: string /* has a fixed, but large-ish, set of possible values */,
-  @optional
-  autoFocus: bool,
-  @optional
-  autoPlay: bool,
-  @optional
-  challenge: string,
-  @optional
-  charSet: string,
-  @optional
-  checked: bool,
-  @optional
-  cite: string /* uri */,
-  @optional
-  crossorigin: bool,
-  @optional
-  cols: int,
-  @optional
-  colSpan: int,
-  @optional
-  content: string,
-  @optional
-  controls: bool,
-  @optional
-  coords: string /* set of values specifying the coordinates of a region */,
-  @optional
-  data: string /* uri */,
-  @optional
-  dateTime: string /* "valid date string with optional time" */,
-  @optional
-  default: bool,
-  @optional
-  defer: bool,
-  @optional
-  disabled: bool,
-  @optional
-  download: string /* should really be either a boolean, signifying presence, or a string */,
-  @optional
-  encType: string /* "application/x-www-form-urlencoded", "multipart/form-data" or "text/plain" */,
-  @optional
-  form: string,
-  @optional
-  formAction: string /* uri */,
-  @optional
-  formTarget: string /* "_blank", "_self", etc. */,
-  @optional
-  formMethod: string /* "post", "get", "put" */,
-  @optional
-  headers: string,
-  @optional
-  height: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  @optional
-  high: int,
-  @optional
-  href: string /* uri */,
-  @optional
-  hrefLang: string,
-  @optional
-  htmlFor: string /* substitute for "for" */,
-  @optional
-  httpEquiv: string /* has a fixed set of possible values */,
-  @optional
-  icon: string /* uri? */,
-  @optional
-  inputMode: string /* "verbatim", "latin", "numeric", etc. */,
-  @optional
-  integrity: string,
-  @optional
-  keyType: string,
-  @optional
-  kind: string /* has a fixed set of possible values */,
-  @optional
-  label: string,
-  @optional
-  list: string,
-  @optional
-  loop: bool,
-  @optional
-  low: int,
-  @optional
-  manifest: string /* uri */,
-  @optional
-  max: string /* should be int or Js.Date.t */,
-  @optional
-  maxLength: int,
-  @optional
-  media: string /* a valid media query */,
-  @optional
-  mediaGroup: string,
-  @optional
-  method: string /* "post" or "get" */,
-  @optional
-  min: int,
-  @optional
-  minLength: int,
-  @optional
-  multiple: bool,
-  @optional
-  muted: bool,
-  @optional
-  name: string,
-  @optional
-  nonce: string,
-  @optional
-  noValidate: bool,
-  @optional @as("open")
-  open_: bool /* use this one. Previous one is deprecated */,
-  @optional
-  optimum: int,
-  @optional
-  pattern: string /* valid Js RegExp */,
-  @optional
-  placeholder: string,
-  @optional
-  poster: string /* uri */,
-  @optional
-  preload: string /* "none", "metadata" or "auto" (and "" as a synonym for "auto") */,
-  @optional
-  radioGroup: string,
-  @optional
-  readOnly: bool,
-  @optional
-  rel: string /* a space- or comma-separated (depending on the element) list of a fixed set of "link types" */,
-  @optional
-  required: bool,
-  @optional
-  reversed: bool,
-  @optional
-  rows: int,
-  @optional
-  rowSpan: int,
-  @optional
-  sandbox: string /* has a fixed set of possible values */,
-  @optional
-  scope: string /* has a fixed set of possible values */,
-  @optional
-  scoped: bool,
-  @optional
-  scrolling: string /* html4 only, "auto", "yes" or "no" */,
-  /* seamless - supported by React, but removed from the html5 spec */
-  @optional
-  selected: bool,
-  @optional
-  shape: string,
-  @optional
-  size: int,
-  @optional
-  sizes: string,
-  @optional
-  span: int,
-  @optional
-  src: string /* uri */,
-  @optional
-  srcDoc: string,
-  @optional
-  srcLang: string,
-  @optional
-  srcSet: string,
-  @optional
-  start: int,
-  @optional
-  step: float,
-  @optional
-  summary: string /* deprecated */,
-  @optional
-  target: string,
-  @optional @as("type")
-  type_: string /* has a fixed but large-ish set of possible values */ /* use this one. Previous one is deprecated */,
-  @optional
-  useMap: string,
-  @optional
-  value: string,
-  @optional
-  width: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  @optional
-  wrap: string /* "hard" or "soft" */,
-  /* Clipboard events */
-  @optional
-  onCopy: ReactEvent.Clipboard.t => unit,
-  @optional
-  onCut: ReactEvent.Clipboard.t => unit,
-  @optional
-  onPaste: ReactEvent.Clipboard.t => unit,
-  /* Composition events */
-  @optional
-  onCompositionEnd: ReactEvent.Composition.t => unit,
-  @optional
-  onCompositionStart: ReactEvent.Composition.t => unit,
-  @optional
-  onCompositionUpdate: ReactEvent.Composition.t => unit,
-  /* Keyboard events */
-  @optional
-  onKeyDown: ReactEvent.Keyboard.t => unit,
-  @optional
-  onKeyPress: ReactEvent.Keyboard.t => unit,
-  @optional
-  onKeyUp: ReactEvent.Keyboard.t => unit,
-  /* Focus events */
-  @optional
-  onFocus: ReactEvent.Focus.t => unit,
-  @optional
-  onBlur: ReactEvent.Focus.t => unit,
-  /* Form events */
-  @optional
-  onChange: ReactEvent.Form.t => unit,
-  @optional
-  onInput: ReactEvent.Form.t => unit,
-  @optional
-  onSubmit: ReactEvent.Form.t => unit,
-  /* Mouse events */
-  @optional
-  onClick: ReactEvent.Mouse.t => unit,
-  @optional
-  onContextMenu: ReactEvent.Mouse.t => unit,
-  @optional
-  onDoubleClick: ReactEvent.Mouse.t => unit,
-  @optional
-  onDrag: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragEnd: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragEnter: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragExit: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragLeave: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragOver: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragStart: ReactEvent.Mouse.t => unit,
-  @optional
-  onDrop: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseDown: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseEnter: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseLeave: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseMove: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseOut: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseOver: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseUp: ReactEvent.Mouse.t => unit,
-  /* Selection events */
-  @optional
-  onSelect: ReactEvent.Selection.t => unit,
-  /* Touch events */
-  @optional
-  onTouchCancel: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchEnd: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchMove: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchStart: ReactEvent.Touch.t => unit,
-  /* UI events */
-  @optional
-  onScroll: ReactEvent.UI.t => unit,
-  /* Wheel events */
-  @optional
-  onWheel: ReactEvent.Wheel.t => unit,
-  /* Media events */
-  @optional
-  onAbort: ReactEvent.Media.t => unit,
-  @optional
-  onCanPlay: ReactEvent.Media.t => unit,
-  @optional
-  onCanPlayThrough: ReactEvent.Media.t => unit,
-  @optional
-  onDurationChange: ReactEvent.Media.t => unit,
-  @optional
-  onEmptied: ReactEvent.Media.t => unit,
-  @optional
-  onEncrypetd: ReactEvent.Media.t => unit,
-  @optional
-  onEnded: ReactEvent.Media.t => unit,
-  @optional
-  onError: ReactEvent.Media.t => unit,
-  @optional
-  onLoadedData: ReactEvent.Media.t => unit,
-  @optional
-  onLoadedMetadata: ReactEvent.Media.t => unit,
-  @optional
-  onLoadStart: ReactEvent.Media.t => unit,
-  @optional
-  onPause: ReactEvent.Media.t => unit,
-  @optional
-  onPlay: ReactEvent.Media.t => unit,
-  @optional
-  onPlaying: ReactEvent.Media.t => unit,
-  @optional
-  onProgress: ReactEvent.Media.t => unit,
-  @optional
-  onRateChange: ReactEvent.Media.t => unit,
-  @optional
-  onSeeked: ReactEvent.Media.t => unit,
-  @optional
-  onSeeking: ReactEvent.Media.t => unit,
-  @optional
-  onStalled: ReactEvent.Media.t => unit,
-  @optional
-  onSuspend: ReactEvent.Media.t => unit,
-  @optional
-  onTimeUpdate: ReactEvent.Media.t => unit,
-  @optional
-  onVolumeChange: ReactEvent.Media.t => unit,
-  @optional
-  onWaiting: ReactEvent.Media.t => unit,
-  /* Image events */
-  @optional
-  onLoad: ReactEvent.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */,
-  /* Animation events */
-  @optional
-  onAnimationStart: ReactEvent.Animation.t => unit,
-  @optional
-  onAnimationEnd: ReactEvent.Animation.t => unit,
-  @optional
-  onAnimationIteration: ReactEvent.Animation.t => unit,
-  /* Transition events */
-  @optional
-  onTransitionEnd: ReactEvent.Transition.t => unit,
-  /* svg */
-  @optional
-  accentHeight: string,
-  @optional
-  accumulate: string,
-  @optional
-  additive: string,
-  @optional
-  alignmentBaseline: string,
-  @optional
-  allowReorder: string,
-  @optional
-  alphabetic: string,
-  @optional
-  amplitude: string,
-  @optional
-  arabicForm: string,
-  @optional
-  ascent: string,
-  @optional
-  attributeName: string,
-  @optional
-  attributeType: string,
-  @optional
-  autoReverse: string,
-  @optional
-  azimuth: string,
-  @optional
-  baseFrequency: string,
-  @optional
-  baseProfile: string,
-  @optional
-  baselineShift: string,
-  @optional
-  bbox: string,
-  @optional @as("begin")
-  begin_: string /* use this one. Previous one is deprecated */,
-  @optional
-  bias: string,
-  @optional
-  by: string,
-  @optional
-  calcMode: string,
-  @optional
-  capHeight: string,
-  @optional
-  clip: string,
-  @optional
-  clipPath: string,
-  @optional
-  clipPathUnits: string,
-  @optional
-  clipRule: string,
-  @optional
-  colorInterpolation: string,
-  @optional
-  colorInterpolationFilters: string,
-  @optional
-  colorProfile: string,
-  @optional
-  colorRendering: string,
-  @optional
-  contentScriptType: string,
-  @optional
-  contentStyleType: string,
-  @optional
-  cursor: string,
-  @optional
-  cx: string,
-  @optional
-  cy: string,
-  @optional
-  d: string,
-  @optional
-  decelerate: string,
-  @optional
-  descent: string,
-  @optional
-  diffuseConstant: string,
-  @optional
-  direction: string,
-  @optional
-  display: string,
-  @optional
-  divisor: string,
-  @optional
-  dominantBaseline: string,
-  @optional
-  dur: string,
-  @optional
-  dx: string,
-  @optional
-  dy: string,
-  @optional
-  edgeMode: string,
-  @optional
-  elevation: string,
-  @optional
-  enableBackground: string,
-  @optional @as("end")
-  end_: string /* use this one. Previous one is deprecated */,
-  @optional
-  exponent: string,
-  @optional
-  externalResourcesRequired: string,
-  @optional
-  fill: string,
-  @optional
-  fillOpacity: string,
-  @optional
-  fillRule: string,
-  @optional
-  filter: string,
-  @optional
-  filterRes: string,
-  @optional
-  filterUnits: string,
-  @optional
-  floodColor: string,
-  @optional
-  floodOpacity: string,
-  @optional
-  focusable: string,
-  @optional
-  fontFamily: string,
-  @optional
-  fontSize: string,
-  @optional
-  fontSizeAdjust: string,
-  @optional
-  fontStretch: string,
-  @optional
-  fontStyle: string,
-  @optional
-  fontVariant: string,
-  @optional
-  fontWeight: string,
-  @optional
-  fomat: string,
-  @optional
-  from: string,
-  @optional
-  fx: string,
-  @optional
-  fy: string,
-  @optional
-  g1: string,
-  @optional
-  g2: string,
-  @optional
-  glyphName: string,
-  @optional
-  glyphOrientationHorizontal: string,
-  @optional
-  glyphOrientationVertical: string,
-  @optional
-  glyphRef: string,
-  @optional
-  gradientTransform: string,
-  @optional
-  gradientUnits: string,
-  @optional
-  hanging: string,
-  @optional
-  horizAdvX: string,
-  @optional
-  horizOriginX: string,
-  @optional
-  ideographic: string,
-  @optional
-  imageRendering: string,
-  @optional @as("in")
-  in_: string /* use this one. Previous one is deprecated */,
-  @optional
-  in2: string,
-  @optional
-  intercept: string,
-  @optional
-  k: string,
-  @optional
-  k1: string,
-  @optional
-  k2: string,
-  @optional
-  k3: string,
-  @optional
-  k4: string,
-  @optional
-  kernelMatrix: string,
-  @optional
-  kernelUnitLength: string,
-  @optional
-  kerning: string,
-  @optional
-  keyPoints: string,
-  @optional
-  keySplines: string,
-  @optional
-  keyTimes: string,
-  @optional
-  lengthAdjust: string,
-  @optional
-  letterSpacing: string,
-  @optional
-  lightingColor: string,
-  @optional
-  limitingConeAngle: string,
-  @optional
-  local: string,
-  @optional
-  markerEnd: string,
-  @optional
-  markerHeight: string,
-  @optional
-  markerMid: string,
-  @optional
-  markerStart: string,
-  @optional
-  markerUnits: string,
-  @optional
-  markerWidth: string,
-  @optional
-  mask: string,
-  @optional
-  maskContentUnits: string,
-  @optional
-  maskUnits: string,
-  @optional
-  mathematical: string,
-  @optional
-  mode: string,
-  @optional
-  numOctaves: string,
-  @optional
-  offset: string,
-  @optional
-  opacity: string,
-  @optional
-  operator: string,
-  @optional
-  order: string,
-  @optional
-  orient: string,
-  @optional
-  orientation: string,
-  @optional
-  origin: string,
-  @optional
-  overflow: string,
-  @optional
-  overflowX: string,
-  @optional
-  overflowY: string,
-  @optional
-  overlinePosition: string,
-  @optional
-  overlineThickness: string,
-  @optional
-  paintOrder: string,
-  @optional
-  panose1: string,
-  @optional
-  pathLength: string,
-  @optional
-  patternContentUnits: string,
-  @optional
-  patternTransform: string,
-  @optional
-  patternUnits: string,
-  @optional
-  pointerEvents: string,
-  @optional
-  points: string,
-  @optional
-  pointsAtX: string,
-  @optional
-  pointsAtY: string,
-  @optional
-  pointsAtZ: string,
-  @optional
-  preserveAlpha: string,
-  @optional
-  preserveAspectRatio: string,
-  @optional
-  primitiveUnits: string,
-  @optional
-  r: string,
-  @optional
-  radius: string,
-  @optional
-  refX: string,
-  @optional
-  refY: string,
-  @optional
-  renderingIntent: string,
-  @optional
-  repeatCount: string,
-  @optional
-  repeatDur: string,
-  @optional
-  requiredExtensions: string,
-  @optional
-  requiredFeatures: string,
-  @optional
-  restart: string,
-  @optional
-  result: string,
-  @optional
-  rotate: string,
-  @optional
-  rx: string,
-  @optional
-  ry: string,
-  @optional
-  scale: string,
-  @optional
-  seed: string,
-  @optional
-  shapeRendering: string,
-  @optional
-  slope: string,
-  @optional
-  spacing: string,
-  @optional
-  specularConstant: string,
-  @optional
-  specularExponent: string,
-  @optional
-  speed: string,
-  @optional
-  spreadMethod: string,
-  @optional
-  startOffset: string,
-  @optional
-  stdDeviation: string,
-  @optional
-  stemh: string,
-  @optional
-  stemv: string,
-  @optional
-  stitchTiles: string,
-  @optional
-  stopColor: string,
-  @optional
-  stopOpacity: string,
-  @optional
-  strikethroughPosition: string,
-  @optional
-  strikethroughThickness: string,
-  @optional
-  string: string,
-  @optional
-  stroke: string,
-  @optional
-  strokeDasharray: string,
-  @optional
-  strokeDashoffset: string,
-  @optional
-  strokeLinecap: string,
-  @optional
-  strokeLinejoin: string,
-  @optional
-  strokeMiterlimit: string,
-  @optional
-  strokeOpacity: string,
-  @optional
-  strokeWidth: string,
-  @optional
-  surfaceScale: string,
-  @optional
-  systemLanguage: string,
-  @optional
-  tableValues: string,
-  @optional
-  targetX: string,
-  @optional
-  targetY: string,
-  @optional
-  textAnchor: string,
-  @optional
-  textDecoration: string,
-  @optional
-  textLength: string,
-  @optional
-  textRendering: string,
-  @optional @as("to")
-  to_: string /* use this one. Previous one is deprecated */,
-  @optional
-  transform: string,
-  @optional
-  u1: string,
-  @optional
-  u2: string,
-  @optional
-  underlinePosition: string,
-  @optional
-  underlineThickness: string,
-  @optional
-  unicode: string,
-  @optional
-  unicodeBidi: string,
-  @optional
-  unicodeRange: string,
-  @optional
-  unitsPerEm: string,
-  @optional
-  vAlphabetic: string,
-  @optional
-  vHanging: string,
-  @optional
-  vIdeographic: string,
-  @optional
-  vMathematical: string,
-  @optional
-  values: string,
-  @optional
-  vectorEffect: string,
-  @optional
-  version: string,
-  @optional
-  vertAdvX: string,
-  @optional
-  vertAdvY: string,
-  @optional
-  vertOriginX: string,
-  @optional
-  vertOriginY: string,
-  @optional
-  viewBox: string,
-  @optional
-  viewTarget: string,
-  @optional
-  visibility: string,
-  /* width::string? => */
-  @optional
-  widths: string,
-  @optional
-  wordSpacing: string,
-  @optional
-  writingMode: string,
-  @optional
-  x: string,
-  @optional
-  x1: string,
-  @optional
-  x2: string,
-  @optional
-  xChannelSelector: string,
-  @optional
-  xHeight: string,
-  @optional
-  xlinkActuate: string,
-  @optional
-  xlinkArcrole: string,
-  @optional
-  xlinkHref: string,
-  @optional
-  xlinkRole: string,
-  @optional
-  xlinkShow: string,
-  @optional
-  xlinkTitle: string,
-  @optional
-  xlinkType: string,
-  @optional
-  xmlns: string,
-  @optional
-  xmlnsXlink: string,
-  @optional
-  xmlBase: string,
-  @optional
-  xmlLang: string,
-  @optional
-  xmlSpace: string,
-  @optional
-  y: string,
-  @optional
-  y1: string,
-  @optional
-  y2: string,
-  @optional
-  yChannelSelector: string,
-  @optional
-  z: string,
-  @optional
-  zoomAndPan: string,
-  /* RDFa */
-  @optional
-  about: string,
-  @optional
-  datatype: string,
-  @optional
-  inlist: string,
-  @optional
-  prefix: string,
-  @optional
-  property: string,
-  @optional
-  resource: string,
-  @optional
-  typeof: string,
-  @optional
-  vocab: string,
-  /* react-specific */
-  @optional
-  dangerouslySetInnerHTML: {"__html": string},
-  @optional
-  suppressContentEditableWarning: bool,
-}
-
-@variadic @module("react")
-external createDOMElementVariadic: (
-  string,
-  ~props: domProps=?,
-  array<React.element>,
-) => React.element = "createElement"
-
-/* This list isn't exhaustive. We'll add more as we go. */
-/*
- * Watch out! There are two props types and the only difference is the type of ref.
- * Please keep in sync.
- */
-@deriving(abstract)
-type props = {
-  @optional
-  key: string,
-  @optional
-  ref: Js.nullable<Dom.element> => unit,
-  /* accessibility */
-  /* https://www.w3.org/TR/wai-aria-1.1/ */
-  /* https://accessibilityresources.org/<aria-tag> is a great resource for these */
-  /* [@bs.optional] [@bs.as "aria-current"] ariaCurrent: page|step|location|date|time|true|false, */
-  @optional @as("aria-details")
-  ariaDetails: string,
-  @optional @as("aria-disabled")
-  ariaDisabled: bool,
-  @optional @as("aria-hidden")
-  ariaHidden: bool,
-  /* [@bs.optional] [@bs.as "aria-invalid"] ariaInvalid: grammar|false|spelling|true, */
-  @optional @as("aria-keyshortcuts")
-  ariaKeyshortcuts: string,
-  @optional @as("aria-label")
-  ariaLabel: string,
-  @optional @as("aria-roledescription")
-  ariaRoledescription: string,
-  /* Widget Attributes */
-  /* [@bs.optional] [@bs.as "aria-autocomplete"] ariaAutocomplete: inline|list|both|none, */
-  /* [@bs.optional] [@bs.as "aria-checked"] ariaChecked: true|false|mixed, /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */ */
-  @optional @as("aria-expanded")
-  ariaExpanded: bool,
-  /* [@bs.optional] [@bs.as "aria-haspopup"] ariaHaspopup: false|true|menu|listbox|tree|grid|dialog, */
-  @optional @as("aria-level")
-  ariaLevel: int,
-  @optional @as("aria-modal")
-  ariaModal: bool,
-  @optional @as("aria-multiline")
-  ariaMultiline: bool,
-  @optional @as("aria-multiselectable")
-  ariaMultiselectable: bool,
-  /* [@bs.optional] [@bs.as "aria-orientation"] ariaOrientation: horizontal|vertical|undefined, */
-  @optional @as("aria-placeholder")
-  ariaPlaceholder: string,
-  /* [@bs.optional] [@bs.as "aria-pressed"] ariaPressed: true|false|mixed, /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */ */
-  @optional @as("aria-readonly")
-  ariaReadonly: bool,
-  @optional @as("aria-required")
-  ariaRequired: bool,
-  @optional @as("aria-selected")
-  ariaSelected: bool,
-  @optional @as("aria-sort")
-  ariaSort: string,
-  @optional @as("aria-valuemax")
-  ariaValuemax: float,
-  @optional @as("aria-valuemin")
-  ariaValuemin: float,
-  @optional @as("aria-valuenow")
-  ariaValuenow: float,
-  @optional @as("aria-valuetext")
-  ariaValuetext: string,
-  /* Live Region Attributes */
-  @optional @as("aria-atomic")
-  ariaAtomic: bool,
-  @optional @as("aria-busy")
-  ariaBusy: bool,
-  /* [@bs.optional] [@bs.as "aria-live"] ariaLive: off|polite|assertive|rude, */
-  @optional @as("aria-relevant")
-  ariaRelevant: string,
-  /* Drag-and-Drop Attributes */
-  /* [@bs.optional] [@bs.as "aria-dropeffect"] ariaDropeffect: copy|move|link|execute|popup|none, */
-  @optional @as("aria-grabbed")
-  ariaGrabbed: bool,
-  /* Relationship Attributes */
-  @optional @as("aria-activedescendant")
-  ariaActivedescendant: string,
-  @optional @as("aria-colcount")
-  ariaColcount: int,
-  @optional @as("aria-colindex")
-  ariaColindex: int,
-  @optional @as("aria-colspan")
-  ariaColspan: int,
-  @optional @as("aria-controls")
-  ariaControls: string,
-  @optional @as("aria-describedby")
-  ariaDescribedby: string,
-  @optional @as("aria-errormessage")
-  ariaErrormessage: string,
-  @optional @as("aria-flowto")
-  ariaFlowto: string,
-  @optional @as("aria-labelledby")
-  ariaLabelledby: string,
-  @optional @as("aria-owns")
-  ariaOwns: string,
-  @optional @as("aria-posinset")
-  ariaPosinset: int,
-  @optional @as("aria-rowcount")
-  ariaRowcount: int,
-  @optional @as("aria-rowindex")
-  ariaRowindex: int,
-  @optional @as("aria-rowspan")
-  ariaRowspan: int,
-  @optional @as("aria-setsize")
-  ariaSetsize: int,
-  /* react textarea/input */
-  @optional
-  defaultChecked: bool,
-  @optional
-  defaultValue: string,
-  /* global html attributes */
-  @optional
-  accessKey: string,
-  @optional
-  className: string /* substitute for "class" */,
-  @optional
-  contentEditable: bool,
-  @optional
-  contextMenu: string,
-  @optional
-  dir: string /* "ltr", "rtl" or "auto" */,
-  @optional
-  draggable: bool,
-  @optional
-  hidden: bool,
-  @optional
-  id: string,
-  @optional
-  lang: string,
-  @optional
-  role: string /* ARIA role */,
-  @optional
-  style: style,
-  @optional
-  spellCheck: bool,
-  @optional
-  tabIndex: int,
-  @optional
-  title: string,
-  /* html5 microdata */
-  @optional
-  itemID: string,
-  @optional
-  itemProp: string,
-  @optional
-  itemRef: string,
-  @optional
-  itemScope: bool,
-  @optional
-  itemType: string /* uri */,
-  /* tag-specific html attributes */
-  @optional
-  accept: string,
-  @optional
-  acceptCharset: string,
-  @optional
-  action: string /* uri */,
-  @optional
-  allowFullScreen: bool,
-  @optional
-  alt: string,
-  @optional
-  async: bool,
-  @optional
-  autoComplete: string /* has a fixed, but large-ish, set of possible values */,
-  @optional
-  autoFocus: bool,
-  @optional
-  autoPlay: bool,
-  @optional
-  challenge: string,
-  @optional
-  charSet: string,
-  @optional
-  checked: bool,
-  @optional
-  cite: string /* uri */,
-  @optional
-  crossorigin: bool,
-  @optional
-  cols: int,
-  @optional
-  colSpan: int,
-  @optional
-  content: string,
-  @optional
-  controls: bool,
-  @optional
-  coords: string /* set of values specifying the coordinates of a region */,
-  @optional
-  data: string /* uri */,
-  @optional
-  dateTime: string /* "valid date string with optional time" */,
-  @optional
-  default: bool,
-  @optional
-  defer: bool,
-  @optional
-  disabled: bool,
-  @optional
-  download: string /* should really be either a boolean, signifying presence, or a string */,
-  @optional
-  encType: string /* "application/x-www-form-urlencoded", "multipart/form-data" or "text/plain" */,
-  @optional
-  form: string,
-  @optional
-  formAction: string /* uri */,
-  @optional
-  formTarget: string /* "_blank", "_self", etc. */,
-  @optional
-  formMethod: string /* "post", "get", "put" */,
-  @optional
-  headers: string,
-  @optional
-  height: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  @optional
-  high: int,
-  @optional
-  href: string /* uri */,
-  @optional
-  hrefLang: string,
-  @optional
-  htmlFor: string /* substitute for "for" */,
-  @optional
-  httpEquiv: string /* has a fixed set of possible values */,
-  @optional
-  icon: string /* uri? */,
-  @optional
-  inputMode: string /* "verbatim", "latin", "numeric", etc. */,
-  @optional
-  integrity: string,
-  @optional
-  keyType: string,
-  @optional
-  kind: string /* has a fixed set of possible values */,
-  @optional
-  label: string,
-  @optional
-  list: string,
-  @optional
-  loop: bool,
-  @optional
-  low: int,
-  @optional
-  manifest: string /* uri */,
-  @optional
-  max: string /* should be int or Js.Date.t */,
-  @optional
-  maxLength: int,
-  @optional
-  media: string /* a valid media query */,
-  @optional
-  mediaGroup: string,
-  @optional
-  method: string /* "post" or "get" */,
-  @optional
-  min: int,
-  @optional
-  minLength: int,
-  @optional
-  multiple: bool,
-  @optional
-  muted: bool,
-  @optional
-  name: string,
-  @optional
-  nonce: string,
-  @optional
-  noValidate: bool,
-  @optional @as("open")
-  open_: bool /* use this one. Previous one is deprecated */,
-  @optional
-  optimum: int,
-  @optional
-  pattern: string /* valid Js RegExp */,
-  @optional
-  placeholder: string,
-  @optional
-  poster: string /* uri */,
-  @optional
-  preload: string /* "none", "metadata" or "auto" (and "" as a synonym for "auto") */,
-  @optional
-  radioGroup: string,
-  @optional
-  readOnly: bool,
-  @optional
-  rel: string /* a space- or comma-separated (depending on the element) list of a fixed set of "link types" */,
-  @optional
-  required: bool,
-  @optional
-  reversed: bool,
-  @optional
-  rows: int,
-  @optional
-  rowSpan: int,
-  @optional
-  sandbox: string /* has a fixed set of possible values */,
-  @optional
-  scope: string /* has a fixed set of possible values */,
-  @optional
-  scoped: bool,
-  @optional
-  scrolling: string /* html4 only, "auto", "yes" or "no" */,
-  /* seamless - supported by React, but removed from the html5 spec */
-  @optional
-  selected: bool,
-  @optional
-  shape: string,
-  @optional
-  size: int,
-  @optional
-  sizes: string,
-  @optional
-  span: int,
-  @optional
-  src: string /* uri */,
-  @optional
-  srcDoc: string,
-  @optional
-  srcLang: string,
-  @optional
-  srcSet: string,
-  @optional
-  start: int,
-  @optional
-  step: float,
-  @optional
-  summary: string /* deprecated */,
-  @optional
-  target: string,
-  @optional @as("type")
-  type_: string /* has a fixed but large-ish set of possible values */ /* use this one. Previous one is deprecated */,
-  @optional
-  useMap: string,
-  @optional
-  value: string,
-  @optional
-  width: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  @optional
-  wrap: string /* "hard" or "soft" */,
-  /* Clipboard events */
-  @optional
-  onCopy: ReactEvent.Clipboard.t => unit,
-  @optional
-  onCut: ReactEvent.Clipboard.t => unit,
-  @optional
-  onPaste: ReactEvent.Clipboard.t => unit,
-  /* Composition events */
-  @optional
-  onCompositionEnd: ReactEvent.Composition.t => unit,
-  @optional
-  onCompositionStart: ReactEvent.Composition.t => unit,
-  @optional
-  onCompositionUpdate: ReactEvent.Composition.t => unit,
-  /* Keyboard events */
-  @optional
-  onKeyDown: ReactEvent.Keyboard.t => unit,
-  @optional
-  onKeyPress: ReactEvent.Keyboard.t => unit,
-  @optional
-  onKeyUp: ReactEvent.Keyboard.t => unit,
-  /* Focus events */
-  @optional
-  onFocus: ReactEvent.Focus.t => unit,
-  @optional
-  onBlur: ReactEvent.Focus.t => unit,
-  /* Form events */
-  @optional
-  onChange: ReactEvent.Form.t => unit,
-  @optional
-  onInput: ReactEvent.Form.t => unit,
-  @optional
-  onSubmit: ReactEvent.Form.t => unit,
-  /* Mouse events */
-  @optional
-  onClick: ReactEvent.Mouse.t => unit,
-  @optional
-  onContextMenu: ReactEvent.Mouse.t => unit,
-  @optional
-  onDoubleClick: ReactEvent.Mouse.t => unit,
-  @optional
-  onDrag: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragEnd: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragEnter: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragExit: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragLeave: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragOver: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragStart: ReactEvent.Mouse.t => unit,
-  @optional
-  onDrop: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseDown: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseEnter: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseLeave: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseMove: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseOut: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseOver: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseUp: ReactEvent.Mouse.t => unit,
-  /* Selection events */
-  @optional
-  onSelect: ReactEvent.Selection.t => unit,
-  /* Touch events */
-  @optional
-  onTouchCancel: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchEnd: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchMove: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchStart: ReactEvent.Touch.t => unit,
-  /* UI events */
-  @optional
-  onScroll: ReactEvent.UI.t => unit,
-  /* Wheel events */
-  @optional
-  onWheel: ReactEvent.Wheel.t => unit,
-  /* Media events */
-  @optional
-  onAbort: ReactEvent.Media.t => unit,
-  @optional
-  onCanPlay: ReactEvent.Media.t => unit,
-  @optional
-  onCanPlayThrough: ReactEvent.Media.t => unit,
-  @optional
-  onDurationChange: ReactEvent.Media.t => unit,
-  @optional
-  onEmptied: ReactEvent.Media.t => unit,
-  @optional
-  onEncrypetd: ReactEvent.Media.t => unit,
-  @optional
-  onEnded: ReactEvent.Media.t => unit,
-  @optional
-  onError: ReactEvent.Media.t => unit,
-  @optional
-  onLoadedData: ReactEvent.Media.t => unit,
-  @optional
-  onLoadedMetadata: ReactEvent.Media.t => unit,
-  @optional
-  onLoadStart: ReactEvent.Media.t => unit,
-  @optional
-  onPause: ReactEvent.Media.t => unit,
-  @optional
-  onPlay: ReactEvent.Media.t => unit,
-  @optional
-  onPlaying: ReactEvent.Media.t => unit,
-  @optional
-  onProgress: ReactEvent.Media.t => unit,
-  @optional
-  onRateChange: ReactEvent.Media.t => unit,
-  @optional
-  onSeeked: ReactEvent.Media.t => unit,
-  @optional
-  onSeeking: ReactEvent.Media.t => unit,
-  @optional
-  onStalled: ReactEvent.Media.t => unit,
-  @optional
-  onSuspend: ReactEvent.Media.t => unit,
-  @optional
-  onTimeUpdate: ReactEvent.Media.t => unit,
-  @optional
-  onVolumeChange: ReactEvent.Media.t => unit,
-  @optional
-  onWaiting: ReactEvent.Media.t => unit,
-  /* Image events */
-  @optional
-  onLoad: ReactEvent.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */,
-  /* Animation events */
-  @optional
-  onAnimationStart: ReactEvent.Animation.t => unit,
-  @optional
-  onAnimationEnd: ReactEvent.Animation.t => unit,
-  @optional
-  onAnimationIteration: ReactEvent.Animation.t => unit,
-  /* Transition events */
-  @optional
-  onTransitionEnd: ReactEvent.Transition.t => unit,
-  /* svg */
-  @optional
-  accentHeight: string,
-  @optional
-  accumulate: string,
-  @optional
-  additive: string,
-  @optional
-  alignmentBaseline: string,
-  @optional
-  allowReorder: string,
-  @optional
-  alphabetic: string,
-  @optional
-  amplitude: string,
-  @optional
-  arabicForm: string,
-  @optional
-  ascent: string,
-  @optional
-  attributeName: string,
-  @optional
-  attributeType: string,
-  @optional
-  autoReverse: string,
-  @optional
-  azimuth: string,
-  @optional
-  baseFrequency: string,
-  @optional
-  baseProfile: string,
-  @optional
-  baselineShift: string,
-  @optional
-  bbox: string,
-  @optional @as("begin")
-  begin_: string /* use this one. Previous one is deprecated */,
-  @optional
-  bias: string,
-  @optional
-  by: string,
-  @optional
-  calcMode: string,
-  @optional
-  capHeight: string,
-  @optional
-  clip: string,
-  @optional
-  clipPath: string,
-  @optional
-  clipPathUnits: string,
-  @optional
-  clipRule: string,
-  @optional
-  colorInterpolation: string,
-  @optional
-  colorInterpolationFilters: string,
-  @optional
-  colorProfile: string,
-  @optional
-  colorRendering: string,
-  @optional
-  contentScriptType: string,
-  @optional
-  contentStyleType: string,
-  @optional
-  cursor: string,
-  @optional
-  cx: string,
-  @optional
-  cy: string,
-  @optional
-  d: string,
-  @optional
-  decelerate: string,
-  @optional
-  descent: string,
-  @optional
-  diffuseConstant: string,
-  @optional
-  direction: string,
-  @optional
-  display: string,
-  @optional
-  divisor: string,
-  @optional
-  dominantBaseline: string,
-  @optional
-  dur: string,
-  @optional
-  dx: string,
-  @optional
-  dy: string,
-  @optional
-  edgeMode: string,
-  @optional
-  elevation: string,
-  @optional
-  enableBackground: string,
-  @optional @as("end")
-  end_: string /* use this one. Previous one is deprecated */,
-  @optional
-  exponent: string,
-  @optional
-  externalResourcesRequired: string,
-  @optional
-  fill: string,
-  @optional
-  fillOpacity: string,
-  @optional
-  fillRule: string,
-  @optional
-  filter: string,
-  @optional
-  filterRes: string,
-  @optional
-  filterUnits: string,
-  @optional
-  floodColor: string,
-  @optional
-  floodOpacity: string,
-  @optional
-  focusable: string,
-  @optional
-  fontFamily: string,
-  @optional
-  fontSize: string,
-  @optional
-  fontSizeAdjust: string,
-  @optional
-  fontStretch: string,
-  @optional
-  fontStyle: string,
-  @optional
-  fontVariant: string,
-  @optional
-  fontWeight: string,
-  @optional
-  fomat: string,
-  @optional
-  from: string,
-  @optional
-  fx: string,
-  @optional
-  fy: string,
-  @optional
-  g1: string,
-  @optional
-  g2: string,
-  @optional
-  glyphName: string,
-  @optional
-  glyphOrientationHorizontal: string,
-  @optional
-  glyphOrientationVertical: string,
-  @optional
-  glyphRef: string,
-  @optional
-  gradientTransform: string,
-  @optional
-  gradientUnits: string,
-  @optional
-  hanging: string,
-  @optional
-  horizAdvX: string,
-  @optional
-  horizOriginX: string,
-  @optional
-  ideographic: string,
-  @optional
-  imageRendering: string,
-  @optional @as("in")
-  in_: string /* use this one. Previous one is deprecated */,
-  @optional
-  in2: string,
-  @optional
-  intercept: string,
-  @optional
-  k: string,
-  @optional
-  k1: string,
-  @optional
-  k2: string,
-  @optional
-  k3: string,
-  @optional
-  k4: string,
-  @optional
-  kernelMatrix: string,
-  @optional
-  kernelUnitLength: string,
-  @optional
-  kerning: string,
-  @optional
-  keyPoints: string,
-  @optional
-  keySplines: string,
-  @optional
-  keyTimes: string,
-  @optional
-  lengthAdjust: string,
-  @optional
-  letterSpacing: string,
-  @optional
-  lightingColor: string,
-  @optional
-  limitingConeAngle: string,
-  @optional
-  local: string,
-  @optional
-  markerEnd: string,
-  @optional
-  markerHeight: string,
-  @optional
-  markerMid: string,
-  @optional
-  markerStart: string,
-  @optional
-  markerUnits: string,
-  @optional
-  markerWidth: string,
-  @optional
-  mask: string,
-  @optional
-  maskContentUnits: string,
-  @optional
-  maskUnits: string,
-  @optional
-  mathematical: string,
-  @optional
-  mode: string,
-  @optional
-  numOctaves: string,
-  @optional
-  offset: string,
-  @optional
-  opacity: string,
-  @optional
-  operator: string,
-  @optional
-  order: string,
-  @optional
-  orient: string,
-  @optional
-  orientation: string,
-  @optional
-  origin: string,
-  @optional
-  overflow: string,
-  @optional
-  overflowX: string,
-  @optional
-  overflowY: string,
-  @optional
-  overlinePosition: string,
-  @optional
-  overlineThickness: string,
-  @optional
-  paintOrder: string,
-  @optional
-  panose1: string,
-  @optional
-  pathLength: string,
-  @optional
-  patternContentUnits: string,
-  @optional
-  patternTransform: string,
-  @optional
-  patternUnits: string,
-  @optional
-  pointerEvents: string,
-  @optional
-  points: string,
-  @optional
-  pointsAtX: string,
-  @optional
-  pointsAtY: string,
-  @optional
-  pointsAtZ: string,
-  @optional
-  preserveAlpha: string,
-  @optional
-  preserveAspectRatio: string,
-  @optional
-  primitiveUnits: string,
-  @optional
-  r: string,
-  @optional
-  radius: string,
-  @optional
-  refX: string,
-  @optional
-  refY: string,
-  @optional
-  renderingIntent: string,
-  @optional
-  repeatCount: string,
-  @optional
-  repeatDur: string,
-  @optional
-  requiredExtensions: string,
-  @optional
-  requiredFeatures: string,
-  @optional
-  restart: string,
-  @optional
-  result: string,
-  @optional
-  rotate: string,
-  @optional
-  rx: string,
-  @optional
-  ry: string,
-  @optional
-  scale: string,
-  @optional
-  seed: string,
-  @optional
-  shapeRendering: string,
-  @optional
-  slope: string,
-  @optional
-  spacing: string,
-  @optional
-  specularConstant: string,
-  @optional
-  specularExponent: string,
-  @optional
-  speed: string,
-  @optional
-  spreadMethod: string,
-  @optional
-  startOffset: string,
-  @optional
-  stdDeviation: string,
-  @optional
-  stemh: string,
-  @optional
-  stemv: string,
-  @optional
-  stitchTiles: string,
-  @optional
-  stopColor: string,
-  @optional
-  stopOpacity: string,
-  @optional
-  strikethroughPosition: string,
-  @optional
-  strikethroughThickness: string,
-  @optional
-  string: string,
-  @optional
-  stroke: string,
-  @optional
-  strokeDasharray: string,
-  @optional
-  strokeDashoffset: string,
-  @optional
-  strokeLinecap: string,
-  @optional
-  strokeLinejoin: string,
-  @optional
-  strokeMiterlimit: string,
-  @optional
-  strokeOpacity: string,
-  @optional
-  strokeWidth: string,
-  @optional
-  surfaceScale: string,
-  @optional
-  systemLanguage: string,
-  @optional
-  tableValues: string,
-  @optional
-  targetX: string,
-  @optional
-  targetY: string,
-  @optional
-  textAnchor: string,
-  @optional
-  textDecoration: string,
-  @optional
-  textLength: string,
-  @optional
-  textRendering: string,
-  @optional @as("to")
-  to_: string /* use this one. Previous one is deprecated */,
-  @optional
-  transform: string,
-  @optional
-  u1: string,
-  @optional
-  u2: string,
-  @optional
-  underlinePosition: string,
-  @optional
-  underlineThickness: string,
-  @optional
-  unicode: string,
-  @optional
-  unicodeBidi: string,
-  @optional
-  unicodeRange: string,
-  @optional
-  unitsPerEm: string,
-  @optional
-  vAlphabetic: string,
-  @optional
-  vHanging: string,
-  @optional
-  vIdeographic: string,
-  @optional
-  vMathematical: string,
-  @optional
-  values: string,
-  @optional
-  vectorEffect: string,
-  @optional
-  version: string,
-  @optional
-  vertAdvX: string,
-  @optional
-  vertAdvY: string,
-  @optional
-  vertOriginX: string,
-  @optional
-  vertOriginY: string,
-  @optional
-  viewBox: string,
-  @optional
-  viewTarget: string,
-  @optional
-  visibility: string,
-  /* width::string? => */
-  @optional
-  widths: string,
-  @optional
-  wordSpacing: string,
-  @optional
-  writingMode: string,
-  @optional
-  x: string,
-  @optional
-  x1: string,
-  @optional
-  x2: string,
-  @optional
-  xChannelSelector: string,
-  @optional
-  xHeight: string,
-  @optional
-  xlinkActuate: string,
-  @optional
-  xlinkArcrole: string,
-  @optional
-  xlinkHref: string,
-  @optional
-  xlinkRole: string,
-  @optional
-  xlinkShow: string,
-  @optional
-  xlinkTitle: string,
-  @optional
-  xlinkType: string,
-  @optional
-  xmlns: string,
-  @optional
-  xmlnsXlink: string,
-  @optional
-  xmlBase: string,
-  @optional
-  xmlLang: string,
-  @optional
-  xmlSpace: string,
-  @optional
-  y: string,
-  @optional
-  y1: string,
-  @optional
-  y2: string,
-  @optional
-  yChannelSelector: string,
-  @optional
-  z: string,
-  @optional
-  zoomAndPan: string,
-  /* RDFa */
-  @optional
-  about: string,
-  @optional
-  datatype: string,
-  @optional
-  inlist: string,
-  @optional
-  prefix: string,
-  @optional
-  property: string,
-  @optional
-  resource: string,
-  @optional
-  typeof: string,
-  @optional
-  vocab: string,
-  /* react-specific */
-  @optional
-  dangerouslySetInnerHTML: {"__html": string},
-  @optional
-  suppressContentEditableWarning: bool,
-}
-
-external objToDOMProps: {..} => props = "%identity"
-
-@deprecated("Please use ReactDOMRe.props instead")
-type reactDOMProps = props
-
-@variadic @val @module("react")
-external createElement: (string, ~props: props=?, array<React.element>) => React.element =
-  "createElement"
-
-/* Only wanna expose createElementVariadic here. Don't wanna write an interface file */
-include (
-  /* Use varargs to avoid the ReactJS warning for duplicate keys in children */
-  {
-    @val @module("react")
-    external createElementInternalHack: 'a = "createElement"
-    @send
-    external apply: ('theFunction, 'theContext, 'arguments) => 'returnTypeOfTheFunction = "apply"
-
-    let createElementVariadic = (domClassName, ~props=?, children) => {
-      let variadicArguments =
-        [Obj.magic(domClassName), Obj.magic(props)] |> Js.Array.concat(children)
-      createElementInternalHack->apply(Js.Nullable.null, variadicArguments)
-    }
-  }: {
-    let createElementVariadic: (string, ~props: props=?, array<React.element>) => React.element
-  }
-)
-
-module Style = {
-  type t = style
-  @obj
-  external make: (
-    ~azimuth: string=?,
-    ~background: string=?,
-    ~backgroundAttachment: string=?,
-    ~backgroundColor: string=?,
-    ~backgroundImage: string=?,
-    ~backgroundPosition: string=?,
-    ~backgroundRepeat: string=?,
-    ~border: string=?,
-    ~borderCollapse: string=?,
-    ~borderColor: string=?,
-    ~borderSpacing: string=?,
-    ~borderStyle: string=?,
-    ~borderTop: string=?,
-    ~borderRight: string=?,
-    ~borderBottom: string=?,
-    ~borderLeft: string=?,
-    ~borderTopColor: string=?,
-    ~borderRightColor: string=?,
-    ~borderBottomColor: string=?,
-    ~borderLeftColor: string=?,
-    ~borderTopStyle: string=?,
-    ~borderRightStyle: string=?,
-    ~borderBottomStyle: string=?,
-    ~borderLeftStyle: string=?,
-    ~borderTopWidth: string=?,
-    ~borderRightWidth: string=?,
-    ~borderBottomWidth: string=?,
-    ~borderLeftWidth: string=?,
-    ~borderWidth: string=?,
-    ~bottom: string=?,
-    ~captionSide: string=?,
-    ~clear: string=?,
-    ~clip: string=?,
-    ~color: string=?,
-    ~content: string=?,
-    ~counterIncrement: string=?,
-    ~counterReset: string=?,
-    ~cue: string=?,
-    ~cueAfter: string=?,
-    ~cueBefore: string=?,
-    ~cursor: string=?,
-    ~direction: string=?,
-    ~display: string=?,
-    ~elevation: string=?,
-    ~emptyCells: string=?,
-    ~float: string=?,
-    ~font: string=?,
-    ~fontFamily: string=?,
-    ~fontSize: string=?,
-    ~fontSizeAdjust: string=?,
-    ~fontStretch: string=?,
-    ~fontStyle: string=?,
-    ~fontVariant: string=?,
-    ~fontWeight: string=?,
-    ~height: string=?,
-    ~left: string=?,
-    ~letterSpacing: string=?,
-    ~lineHeight: string=?,
-    ~listStyle: string=?,
-    ~listStyleImage: string=?,
-    ~listStylePosition: string=?,
-    ~listStyleType: string=?,
-    ~margin: string=?,
-    ~marginTop: string=?,
-    ~marginRight: string=?,
-    ~marginBottom: string=?,
-    ~marginLeft: string=?,
-    ~markerOffset: string=?,
-    ~marks: string=?,
-    ~maxHeight: string=?,
-    ~maxWidth: string=?,
-    ~minHeight: string=?,
-    ~minWidth: string=?,
-    ~orphans: string=?,
-    ~outline: string=?,
-    ~outlineColor: string=?,
-    ~outlineStyle: string=?,
-    ~outlineWidth: string=?,
-    ~overflow: string=?,
-    ~overflowX: string=?,
-    ~overflowY: string=?,
-    ~padding: string=?,
-    ~paddingTop: string=?,
-    ~paddingRight: string=?,
-    ~paddingBottom: string=?,
-    ~paddingLeft: string=?,
-    ~page: string=?,
-    ~pageBreakAfter: string=?,
-    ~pageBreakBefore: string=?,
-    ~pageBreakInside: string=?,
-    ~pause: string=?,
-    ~pauseAfter: string=?,
-    ~pauseBefore: string=?,
-    ~pitch: string=?,
-    ~pitchRange: string=?,
-    ~playDuring: string=?,
-    ~position: string=?,
-    ~quotes: string=?,
-    ~richness: string=?,
-    ~right: string=?,
-    ~size: string=?,
-    ~speak: string=?,
-    ~speakHeader: string=?,
-    ~speakNumeral: string=?,
-    ~speakPunctuation: string=?,
-    ~speechRate: string=?,
-    ~stress: string=?,
-    ~tableLayout: string=?,
-    ~textAlign: string=?,
-    ~textDecoration: string=?,
-    ~textIndent: string=?,
-    ~textShadow: string=?,
-    ~textTransform: string=?,
-    ~top: string=?,
-    ~unicodeBidi: string=?,
-    ~verticalAlign: string=?,
-    ~visibility: string=?,
-    ~voiceFamily: string=?,
-    ~volume: string=?,
-    ~whiteSpace: string=?,
-    ~widows: string=?,
-    ~width: string=?,
-    ~wordSpacing: string=?,
-    ~zIndex: string=?,
-    ~opacity: /* Below properties based on https://www.w3.org/Style/CSS/all-properties */
-    /* Color Level 3 - REC */
-    string=?,
-    ~backgroundOrigin: /* Backgrounds and Borders Level 3 - CR */
-    /* backgroundRepeat - already defined by CSS2Properties */
-    /* backgroundAttachment - already defined by CSS2Properties */
-    string=?,
-    ~backgroundSize: string=?,
-    ~backgroundClip: string=?,
-    ~borderRadius: string=?,
-    ~borderTopLeftRadius: string=?,
-    ~borderTopRightRadius: string=?,
-    ~borderBottomLeftRadius: string=?,
-    ~borderBottomRightRadius: string=?,
-    ~borderImage: string=?,
-    ~borderImageSource: string=?,
-    ~borderImageSlice: string=?,
-    ~borderImageWidth: string=?,
-    ~borderImageOutset: string=?,
-    ~borderImageRepeat: string=?,
-    ~boxShadow: string=?,
-    ~columns: /* Multi-column Layout - CR */
-    string=?,
-    ~columnCount: string=?,
-    ~columnFill: string=?,
-    ~columnGap: string=?,
-    ~columnRule: string=?,
-    ~columnRuleColor: string=?,
-    ~columnRuleStyle: string=?,
-    ~columnRuleWidth: string=?,
-    ~columnSpan: string=?,
-    ~columnWidth: string=?,
-    ~breakAfter: string=?,
-    ~breakBefore: string=?,
-    ~breakInside: string=?,
-    ~rest: /* Speech - CR */
-    string=?,
-    ~restAfter: string=?,
-    ~restBefore: string=?,
-    ~speakAs: string=?,
-    ~voiceBalance: string=?,
-    ~voiceDuration: string=?,
-    ~voicePitch: string=?,
-    ~voiceRange: string=?,
-    ~voiceRate: string=?,
-    ~voiceStress: string=?,
-    ~voiceVolume: string=?,
-    ~objectFit: /* Image Values and Replaced Content Level 3 - CR */
-    string=?,
-    ~objectPosition: string=?,
-    ~imageResolution: string=?,
-    ~imageOrientation: string=?,
-    ~alignContent: /* Flexible Box Layout - CR */
-    string=?,
-    ~alignItems: string=?,
-    ~alignSelf: string=?,
-    ~flex: string=?,
-    ~flexBasis: string=?,
-    ~flexDirection: string=?,
-    ~flexFlow: string=?,
-    ~flexGrow: string=?,
-    ~flexShrink: string=?,
-    ~flexWrap: string=?,
-    ~justifyContent: string=?,
-    ~order: string=?,
-    ~textDecorationColor: /* Text Decoration Level 3 - CR */
-    /* textDecoration - already defined by CSS2Properties */
-    string=?,
-    ~textDecorationLine: string=?,
-    ~textDecorationSkip: string=?,
-    ~textDecorationStyle: string=?,
-    ~textEmphasis: string=?,
-    ~textEmphasisColor: string=?,
-    ~textEmphasisPosition: string=?,
-    ~textEmphasisStyle: string=?,
-    ~textUnderlinePosition: /* textShadow - already defined by CSS2Properties */
-    string=?,
-    ~fontFeatureSettings: /* Fonts Level 3 - CR */
-    string=?,
-    ~fontKerning: string=?,
-    ~fontLanguageOverride: string=?,
-    ~fontSynthesis: /* fontSizeAdjust - already defined by CSS2Properties */
-    /* fontStretch - already defined by CSS2Properties */
-    string=?,
-    ~forntVariantAlternates: string=?,
-    ~fontVariantCaps: string=?,
-    ~fontVariantEastAsian: string=?,
-    ~fontVariantLigatures: string=?,
-    ~fontVariantNumeric: string=?,
-    ~fontVariantPosition: string=?,
-    ~all: /* Cascading and Inheritance Level 3 - CR */
-    string=?,
-    ~glyphOrientationVertical: /* Writing Modes Level 3 - CR */
-    string=?,
-    ~textCombineUpright: string=?,
-    ~textOrientation: string=?,
-    ~writingMode: string=?,
-    ~shapeImageThreshold: /* Shapes Level 1 - CR */
-    string=?,
-    ~shapeMargin: string=?,
-    ~shapeOutside: string=?,
-    ~clipPath: /* Masking Level 1 - CR */
-    string=?,
-    ~clipRule: string=?,
-    ~mask: string=?,
-    ~maskBorder: string=?,
-    ~maskBorderMode: string=?,
-    ~maskBorderOutset: string=?,
-    ~maskBorderRepeat: string=?,
-    ~maskBorderSlice: string=?,
-    ~maskBorderSource: string=?,
-    ~maskBorderWidth: string=?,
-    ~maskClip: string=?,
-    ~maskComposite: string=?,
-    ~maskImage: string=?,
-    ~maskMode: string=?,
-    ~maskOrigin: string=?,
-    ~maskPosition: string=?,
-    ~maskRepeat: string=?,
-    ~maskSize: string=?,
-    ~maskType: string=?,
-    ~backgroundBlendMode: /* Compositing and Blending Level 1 - CR */
-    string=?,
-    ~isolation: string=?,
-    ~mixBlendMode: string=?,
-    ~boxDecorationBreak: /* Fragmentation Level 3 - CR */
-    string=?,
-    ~boxSizing: /* breakAfter - already defined by Multi-column Layout */
-    /* breakBefore - already defined by Multi-column Layout */
-    /* breakInside - already defined by Multi-column Layout */
-    /* Basic User Interface Level 3 - CR */
-    string=?,
-    ~caretColor: string=?,
-    ~navDown: string=?,
-    ~navLeft: string=?,
-    ~navRight: string=?,
-    ~navUp: string=?,
-    ~outlineOffset: string=?,
-    ~resize: string=?,
-    ~textOverflow: string=?,
-    ~grid: /* Grid Layout Level 1 - CR */
-    string=?,
-    ~gridArea: string=?,
-    ~gridAutoColumns: string=?,
-    ~gridAutoFlow: string=?,
-    ~gridAutoRows: string=?,
-    ~gridColumn: string=?,
-    ~gridColumnEnd: string=?,
-    ~gridColumnGap: string=?,
-    ~gridColumnStart: string=?,
-    ~gridGap: string=?,
-    ~gridRow: string=?,
-    ~gridRowEnd: string=?,
-    ~gridRowGap: string=?,
-    ~gridRowStart: string=?,
-    ~gridTemplate: string=?,
-    ~gridTemplateAreas: string=?,
-    ~gridTemplateColumns: string=?,
-    ~gridTemplateRows: string=?,
-    ~willChange: /* Will Change Level 1 - CR */
-    string=?,
-    ~hangingPunctuation: /* Text Level 3 - LC */
-    string=?,
-    ~hyphens: string=?,
-    ~lineBreak: /* letterSpacing - already defined by CSS2Properties */
-    string=?,
-    ~overflowWrap: string=?,
-    ~tabSize: string=?,
-    ~textAlignLast: /* textAlign - already defined by CSS2Properties */
-    string=?,
-    ~textJustify: string=?,
-    ~wordBreak: string=?,
-    ~wordWrap: string=?,
-    ~animation: /* Animations - WD */
-    string=?,
-    ~animationDelay: string=?,
-    ~animationDirection: string=?,
-    ~animationDuration: string=?,
-    ~animationFillMode: string=?,
-    ~animationIterationCount: string=?,
-    ~animationName: string=?,
-    ~animationPlayState: string=?,
-    ~animationTimingFunction: string=?,
-    ~transition: /* Transitions - WD */
-    string=?,
-    ~transitionDelay: string=?,
-    ~transitionDuration: string=?,
-    ~transitionProperty: string=?,
-    ~transitionTimingFunction: string=?,
-    ~backfaceVisibility: /* Transforms Level 1 - WD */
-    string=?,
-    ~perspective: string=?,
-    ~perspectiveOrigin: string=?,
-    ~transform: string=?,
-    ~transformOrigin: string=?,
-    ~transformStyle: string=?,
-    ~justifyItems: /* Box Alignment Level 3 - WD */
-    /* alignContent - already defined by Flexible Box Layout */
-    /* alignItems - already defined by Flexible Box Layout */
-    string=?,
-    ~justifySelf: string=?,
-    ~placeContent: string=?,
-    ~placeItems: string=?,
-    ~placeSelf: string=?,
-    ~appearance: /* Basic User Interface Level 4 - FPWD */
-    string=?,
-    ~caret: string=?,
-    ~caretAnimation: string=?,
-    ~caretShape: string=?,
-    ~userSelect: string=?,
-    ~maxLines: /* Overflow Level 3 - WD */
-    string=?,
-    ~marqueeDirection: /* Basix Box Model - WD */
-    string=?,
-    ~marqueeLoop: string=?,
-    ~marqueeSpeed: string=?,
-    ~marqueeStyle: string=?,
-    ~overflowStyle: string=?,
-    ~rotation: string=?,
-    ~rotationPoint: string=?,
-    ~alignmentBaseline: /* SVG 1.1 - REC */
-    string=?,
-    ~baselineShift: string=?,
-    ~clip: string=?,
-    ~clipPath: string=?,
-    ~clipRule: string=?,
-    ~colorInterpolation: string=?,
-    ~colorInterpolationFilters: string=?,
-    ~colorProfile: string=?,
-    ~colorRendering: string=?,
-    ~cursor: string=?,
-    ~dominantBaseline: string=?,
-    ~fill: string=?,
-    ~fillOpacity: string=?,
-    ~fillRule: string=?,
-    ~filter: string=?,
-    ~floodColor: string=?,
-    ~floodOpacity: string=?,
-    ~glyphOrientationHorizontal: string=?,
-    ~glyphOrientationVertical: string=?,
-    ~imageRendering: string=?,
-    ~kerning: string=?,
-    ~lightingColor: string=?,
-    ~markerEnd: string=?,
-    ~markerMid: string=?,
-    ~markerStart: string=?,
-    ~pointerEvents: string=?,
-    ~shapeRendering: string=?,
-    ~stopColor: string=?,
-    ~stopOpacity: string=?,
-    ~stroke: string=?,
-    ~strokeDasharray: string=?,
-    ~strokeDashoffset: string=?,
-    ~strokeLinecap: string=?,
-    ~strokeLinejoin: string=?,
-    ~strokeMiterlimit: string=?,
-    ~strokeOpacity: string=?,
-    ~strokeWidth: string=?,
-    ~textAnchor: string=?,
-    ~textRendering: string=?,
-    ~rubyAlign: /* Ruby Layout Level 1 - WD */
-    string=?,
-    ~rubyMerge: string=?,
-    ~rubyPosition: string=?,
-    /* Lists and Counters Level 3 - WD */
-    /* listStyle - already defined by CSS2Properties */
-    /* listStyleImage - already defined by CSS2Properties */
-    /* listStylePosition - already defined by CSS2Properties */
-    /* listStyleType - already defined by CSS2Properties */
-    /* counterIncrement - already defined by CSS2Properties */
-    /* counterReset - already defined by CSS2Properties */
-    /* Not added yet
-     * -------------
-     * Generated Content for Paged Media - WD
-     * Generated Content Level 3 - WD
-     * Line Grid Level 1 - WD
-     * Regions - WD
-     * Inline Layout Level 3 - WD
-     * Round Display Level 1 - WD
-     * Image Values and Replaced Content Level 4 - WD
-     * Positioned Layout Level 3 - WD
-     * Filter Effects Level 1 -  -WD
-     * Exclusions Level 1 - WD
-     * Text Level 4 - FPWD
-     * SVG Markers - FPWD
-     * Motion Path Level 1 - FPWD
-     * Color Level 4 - FPWD
-     * SVG Strokes - FPWD
-     * Table Level 3 - FPWD
-     */
-    unit,
-  ) => style = ""
-  /* CSS2Properties: https://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSS2Properties */
-  let combine: (style, style) => style = (a, b) => {
-    let a: Js.t<{..}> = Obj.magic(a)
-    let b: Js.t<{..}> = Obj.magic(b)
-    Js.Obj.assign(Js.Obj.assign(Js.Obj.empty(), a), b) |> Obj.magic
-  }
-  let unsafeAddProp: (style, string, string) => style = (style, property, value) => {
-    let propStyle: style = {
-      let dict = Js.Dict.empty()
-      Js.Dict.set(dict, property, value)
-      Obj.magic(dict)
-    }
-    combine(style, propStyle)
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReactDOMServerRe.res b/jscomp/syntax/tests/idempotency/reason-react/src/ReactDOMServerRe.res
deleted file mode 100644
index 8758a6d..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReactDOMServerRe.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@val @module("react-dom/server")
-external renderToString: React.element => string = "renderToString"
-
-@val @module("react-dom/server")
-external renderToStaticMarkup: React.element => string = "renderToStaticMarkup"
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReactEvent.res b/jscomp/syntax/tests/idempotency/reason-react/src/ReactEvent.res
deleted file mode 100644
index 1a5a72c..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReactEvent.res
+++ /dev/null
@@ -1,224 +0,0 @@
-type synthetic<'a>
-
-module MakeEventWithType = (
-  Type: {
-    type t
-  },
-) => {
-  @get external bubbles: Type.t => bool = "bubbles"
-  @get external cancelable: Type.t => bool = "cancelable"
-  @get external currentTarget: Type.t => {..} = "currentTarget" /* Should return Dom.eventTarget */
-  @get external defaultPrevented: Type.t => bool = "defaultPrevented"
-  @get external eventPhase: Type.t => int = "eventPhase"
-  @get external isTrusted: Type.t => bool = "isTrusted"
-  @get external nativeEvent: Type.t => {..} = "nativeEvent" /* Should return Dom.event */
-  @send external preventDefault: Type.t => unit = "preventDefault"
-  @send
-  external isDefaultPrevented: Type.t => bool = "isDefaultPrevented"
-  @send external stopPropagation: Type.t => unit = "stopPropagation"
-  @send
-  external isPropagationStopped: Type.t => bool = "isPropagationStopped"
-  @get external target: Type.t => {..} = "target" /* Should return Dom.eventTarget */
-  @get external timeStamp: Type.t => float = "timeStamp"
-  @get external type_: Type.t => string = "type"
-  @send external persist: Type.t => unit = "persist"
-}
-
-module Synthetic = {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: synthetic<'a> => bool = "bubbles"
-  @get external cancelable: synthetic<'a> => bool = "cancelable"
-  @get
-  external currentTarget: synthetic<'a> => {..} =
-    "currentTarget" /* Should return Dom.eventTarget */
-  @get
-  external defaultPrevented: synthetic<'a> => bool = "defaultPrevented"
-  @get external eventPhase: synthetic<'a> => int = "eventPhase"
-  @get external isTrusted: synthetic<'a> => bool = "isTrusted"
-  @get
-  external nativeEvent: synthetic<'a> => {..} = "nativeEvent" /* Should return Dom.event */
-  @send
-  external preventDefault: synthetic<'a> => unit = "preventDefault"
-  @send
-  external isDefaultPrevented: synthetic<'a> => bool = "isDefaultPrevented"
-  @send
-  external stopPropagation: synthetic<'a> => unit = "stopPropagation"
-  @send
-  external isPropagationStopped: synthetic<'a> => bool = "isPropagationStopped"
-  @get external target: synthetic<'a> => {..} = "target" /* Should return Dom.eventTarget */
-  @get external timeStamp: synthetic<'a> => float = "timeStamp"
-  @get external type_: synthetic<'a> => string = "type"
-  @send external persist: synthetic<'a> => unit = "persist"
-}
-
-/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */
-external toSyntheticEvent: synthetic<'a> => Synthetic.t = "%identity"
-
-module Clipboard = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external clipboardData: t => {..} = "clipboardData" /* Should return Dom.dataTransfer */
-}
-
-module Composition = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external data: t => string = "data"
-}
-
-module Keyboard = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external altKey: t => bool = "altKey"
-  @get external charCode: t => int = "charCode"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external key: t => string = "key"
-  @get external keyCode: t => int = "keyCode"
-  @get external locale: t => string = "locale"
-  @get external location: t => int = "location"
-  @get external metaKey: t => bool = "metaKey"
-  @get external repeat: t => bool = "repeat"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external which: t => int = "which"
-}
-
-module Focus = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get
-  external relatedTarget: t => Js.nullable<{..}> =
-    "relatedTarget" /* Should return Dom.eventTarget */
-}
-
-module Form = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Mouse = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external altKey: t => bool = "altKey"
-  @get external button: t => int = "button"
-  @get external buttons: t => int = "buttons"
-  @get external clientX: t => int = "clientX"
-  @get external clientY: t => int = "clientY"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external metaKey: t => bool = "metaKey"
-  @get external pageX: t => int = "pageX"
-  @get external pageY: t => int = "pageY"
-  @get
-  external relatedTarget: t => Js.nullable<{..}> =
-    "relatedTarget" /* Should return Dom.eventTarget */
-  @get external screenX: t => int = "screenX"
-  @get external screenY: t => int = "screenY"
-  @get external shiftKey: t => bool = "shiftKey"
-}
-
-module Selection = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Touch = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external altKey: t => bool = "altKey"
-  @get external changedTouches: t => {..} = "changedTouches" /* Should return Dom.touchList */
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external metaKey: t => bool = "metaKey"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external targetTouches: t => {..} = "targetTouches" /* Should return Dom.touchList */
-  @get external touches: t => {..} = "touches" /* Should return Dom.touchList */
-}
-
-module UI = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external detail: t => int = "detail"
-  @get external view: t => Dom.window = "view" /* Should return DOMAbstractView/WindowProxy */
-}
-
-module Wheel = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external deltaMode: t => int = "deltaMode"
-  @get external deltaX: t => float = "deltaX"
-  @get external deltaY: t => float = "deltaY"
-  @get external deltaZ: t => float = "deltaZ"
-}
-
-module Media = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Image = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Animation = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external animationName: t => string = "animationName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
-
-module Transition = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external propertyName: t => string = "propertyName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReactEvent.resi b/jscomp/syntax/tests/idempotency/reason-react/src/ReactEvent.resi
deleted file mode 100644
index dab40bb..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReactEvent.resi
+++ /dev/null
@@ -1,405 +0,0 @@
-/* This is the whole synthetic event system of ReactJS/ReasonReact. The first module `Synthetic` represents
-   the generic synthetic event. The rest are the specific ones.
-
-   In each module, the type `t` commonly means "the type of that module" (OCaml convention). In our case, e.g.
-   `ReactEvent.Mouse.t` represents a ReactJS synthetic mouse event. You'd use it to type your props:
-
-   ```
-   type props = {
-     onClick: ReactEvent.Mouse.t => unit
-   };
-   ```
-
-   All the methods and properties of a type of event are in the module, as seen below.
-
-   Each module also has a `tag` type. You can ignore it; they're only needed by their `t` type. This way, we
-   get to allow a base `Synthetic` event module with generic methods. So e.g. even a mouse event (`Mouse.t`)
-   get to be passed to a generic handler:
-
-   ```
-   let handleClick = ({state, props}, event) => {
-     ReactEvent.Mouse.preventDefault(event);
-     ...
-   };
-   let handleSubmit = ({state, props}, event) => {
-     /* this handler can be triggered by either a Keyboard or a Mouse event; conveniently use the generic
-        preventDefault */
-     ReactEvent.Synthetic.preventDefault(event);
-     ...
-   };
-
-   let render = (_) => <Foo onSubmit=handleSubmit onEnter=handleSubmit .../>;
-   ```
-
-   How to translate idioms from ReactJS:
-
-   1. myMouseEvent.preventDefault() -> ReactEvent.Mouse.preventDefault(myMouseEvent)
-   2. myKeyboardEvent.which -> ReactEvent.Keyboard.which(myKeyboardEvent)
- */
-type synthetic<'a>
-
-module Synthetic: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: synthetic<'a> => bool = "bubbles"
-  @get external cancelable: synthetic<'a> => bool = "cancelable"
-  @get
-  external currentTarget: synthetic<'a> => {..} = "currentTarget"
-  @get
-  external defaultPrevented: synthetic<'a> => bool = "defaultPrevented"
-  @get external eventPhase: synthetic<'a> => int = "eventPhase"
-  @get external isTrusted: synthetic<'a> => bool = "isTrusted"
-  @get
-  external nativeEvent: synthetic<'a> => {..} = "nativeEvent"
-  @send
-  external preventDefault: synthetic<'a> => unit = "preventDefault"
-  @send
-  external isDefaultPrevented: synthetic<'a> => bool = "isDefaultPrevented"
-  @send
-  external stopPropagation: synthetic<'a> => unit = "stopPropagation"
-  @send
-  external isPropagationStopped: synthetic<'a> => bool = "isPropagationStopped"
-  @get external target: synthetic<'a> => {..} = "target"
-  @get external timeStamp: synthetic<'a> => float = "timeStamp"
-  @get external type_: synthetic<'a> => string = "type"
-  @send external persist: synthetic<'a> => unit = "persist"
-}
-
-/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */
-external toSyntheticEvent: synthetic<'a> => Synthetic.t = "%identity"
-
-module Clipboard: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external clipboardData: t => {..} = "clipboardData" /* Should return Dom.dataTransfer */
-}
-
-module Composition: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external data: t => string = "data"
-}
-
-module Keyboard: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external altKey: t => bool = "altKey"
-  @get external charCode: t => int = "charCode"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external key: t => string = "key"
-  @get external keyCode: t => int = "keyCode"
-  @get external locale: t => string = "locale"
-  @get external location: t => int = "location"
-  @get external metaKey: t => bool = "metaKey"
-  @get external repeat: t => bool = "repeat"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external which: t => int = "which"
-}
-
-module Focus: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get
-  external relatedTarget: t => Js.nullable<{..}> =
-    "relatedTarget" /* Should return Dom.eventTarget */
-}
-
-module Form: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-}
-
-module Mouse: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external altKey: t => bool = "altKey"
-  @get external button: t => int = "button"
-  @get external buttons: t => int = "buttons"
-  @get external clientX: t => int = "clientX"
-  @get external clientY: t => int = "clientY"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external metaKey: t => bool = "metaKey"
-  @get external pageX: t => int = "pageX"
-  @get external pageY: t => int = "pageY"
-  @get
-  external relatedTarget: t => Js.nullable<{..}> =
-    "relatedTarget" /* Should return Dom.eventTarget */
-  @get external screenX: t => int = "screenX"
-  @get external screenY: t => int = "screenY"
-  @get external shiftKey: t => bool = "shiftKey"
-}
-
-module Selection: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-}
-
-module Touch: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external altKey: t => bool = "altKey"
-  @get external changedTouches: t => {..} = "changedTouches" /* Should return Dom.touchList */
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external metaKey: t => bool = "metaKey"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external targetTouches: t => {..} = "targetTouches" /* Should return Dom.touchList */
-  @get external touches: t => {..} = "touches" /* Should return Dom.touchList */
-}
-
-module UI: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external detail: t => int = "detail"
-  @get external view: t => Dom.window = "view" /* Should return DOMAbstractView/WindowProxy */
-}
-
-module Wheel: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external deltaMode: t => int = "deltaMode"
-  @get external deltaX: t => float = "deltaX"
-  @get external deltaY: t => float = "deltaY"
-  @get external deltaZ: t => float = "deltaZ"
-}
-
-module Media: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-}
-
-module Image: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-}
-
-module Animation: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external animationName: t => string = "animationName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
-
-module Transition: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external propertyName: t => string = "propertyName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReactEventRe.res b/jscomp/syntax/tests/idempotency/reason-react/src/ReactEventRe.res
deleted file mode 100644
index ac17964..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReactEventRe.res
+++ /dev/null
@@ -1,223 +0,0 @@
-type synthetic<'a> = ReactEvent.synthetic<'a>
-
-module MakeSyntheticWrapper = (
-  Type: {
-    type t
-  },
-) => {
-  @get external bubbles: Type.t => bool = "bubbles"
-  @get external cancelable: Type.t => bool = "cancelable"
-  @get
-  external currentTarget: Type.t => Dom.element = "currentTarget" /* Should return Dom.evetTarget */
-  @get external defaultPrevented: Type.t => bool = "defaultPrevented"
-  @get external eventPhase: Type.t => int = "eventPhase"
-  @get external isTrusted: Type.t => bool = "isTrusted"
-  @get external nativeEvent: Type.t => {..} = "nativeEvent" /* Should return Dom.event */
-  @bs.send.pipe(: Type.t) external preventDefault: unit = "preventDefault"
-  @bs.send.pipe(: Type.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @bs.send.pipe(: Type.t) external stopPropagation: unit = "stopPropagation"
-  @bs.send.pipe(: Type.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @get external target: Type.t => Dom.element = "target" /* Should return Dom.evetTarget */
-  @get external timeStamp: Type.t => float = "timeStamp"
-  @get external _type: Type.t => string = "type"
-  @bs.send.pipe(: Type.t) external persist: unit = "persist"
-}
-
-module Synthetic = {
-  type tag = ReactEvent.Synthetic.tag
-  type t = ReactEvent.Synthetic.t
-  @get external bubbles: synthetic<'a> => bool = "bubbles"
-  @get external cancelable: synthetic<'a> => bool = "cancelable"
-  @get
-  external currentTarget: synthetic<'a> => Dom.element =
-    "currentTarget" /* Should return Dom.evetTarget */
-  @get
-  external defaultPrevented: synthetic<'a> => bool = "defaultPrevented"
-  @get external eventPhase: synthetic<'a> => int = "eventPhase"
-  @get external isTrusted: synthetic<'a> => bool = "isTrusted"
-  @get
-  external nativeEvent: synthetic<'a> => {..} = "nativeEvent" /* Should return Dom.event */
-  @bs.send.pipe(: synthetic<'a>)
-  external preventDefault: unit = "preventDefault"
-  @bs.send.pipe(: synthetic<'a>)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @bs.send.pipe(: synthetic<'a>)
-  external stopPropagation: unit = "stopPropagation"
-  @bs.send.pipe(: synthetic<'a>)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @get external target: synthetic<'a> => Dom.element = "target" /* Should return Dom.evetTarget */
-  @get external timeStamp: synthetic<'a> => float = "timeStamp"
-  @get external _type: synthetic<'a> => string = "type"
-  @bs.send.pipe(: synthetic<'a>) external persist: unit = "persist"
-}
-
-/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */
-external toSyntheticEvent: synthetic<'a> => Synthetic.t = "%identity"
-
-module Clipboard = {
-  type tag = ReactEvent.Clipboard.tag
-  type t = ReactEvent.Clipboard.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-  @get external clipboardData: t => {..} = "clipboardData" /* Should return Dom.dataTransfer */
-}
-
-module Composition = {
-  type tag = ReactEvent.Composition.tag
-  type t = ReactEvent.Composition.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-  @get external data: t => string = "data"
-}
-
-module Keyboard = {
-  type tag = ReactEvent.Keyboard.tag
-  type t = ReactEvent.Keyboard.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-  @get external altKey: t => bool = "altKey"
-  @get external charCode: t => int = "charCode"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @bs.send.pipe(: t)
-  external getModifierState: string => bool = "getModifierState"
-  @get external key: t => string = "key"
-  @get external keyCode: t => int = "keyCode"
-  @get external locale: t => string = "locale"
-  @get external location: t => int = "location"
-  @get external metaKey: t => bool = "metaKey"
-  @get external repeat: t => bool = "repeat"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external which: t => int = "which"
-}
-
-module Focus = {
-  type tag = ReactEvent.Focus.tag
-  type t = ReactEvent.Focus.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-  @get
-  external relatedTarget: t => Dom.element = "relatedTarget" /* Should return Dom.eventTarget */
-}
-
-module Form = {
-  type tag = ReactEvent.Form.tag
-  type t = ReactEvent.Form.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-}
-
-module Mouse = {
-  type tag = ReactEvent.Mouse.tag
-  type t = ReactEvent.Mouse.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-  @get external altKey: t => bool = "altKey"
-  @get external button: t => int = "button"
-  @get external buttons: t => int = "buttons"
-  @get external clientX: t => int = "clientX"
-  @get external clientY: t => int = "clientY"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @bs.send.pipe(: t)
-  external getModifierState: string => bool = "getModifierState"
-  @get external metaKey: t => bool = "metaKey"
-  @get external pageX: t => int = "pageX"
-  @get external pageY: t => int = "pageY"
-  @get
-  external relatedTarget: t => Dom.element = "relatedTarget" /* Should return Dom.eventTarget */
-  @get external screenX: t => int = "screenX"
-  @get external screenY: t => int = "screenY"
-  @get external shiftKey: t => bool = "shiftKey"
-}
-
-module Selection = {
-  type tag = ReactEvent.Selection.tag
-  type t = ReactEvent.Selection.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-}
-
-module Touch = {
-  type tag = ReactEvent.Touch.tag
-  type t = ReactEvent.Touch.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-  @get external altKey: t => bool = "altKey"
-  @get external changedTouches: t => {..} = "changedTouches" /* Should return Dom.touchList */
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @bs.send.pipe(: t)
-  external getModifierState: string => bool = "getModifierState"
-  @get external metaKey: t => bool = "metaKey"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external targetTouches: t => {..} = "targetTouches" /* Should return Dom.touchList */
-  @get external touches: t => {..} = "touches" /* Should return Dom.touchList */
-}
-
-module UI = {
-  type tag = ReactEvent.UI.tag
-  type t = ReactEvent.UI.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-  @get external detail: t => int = "detail"
-  @get external view: t => Dom.window = "view" /* Should return DOMAbstractView/WindowProxy */
-}
-
-module Wheel = {
-  type tag = ReactEvent.Wheel.tag
-  type t = ReactEvent.Wheel.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-  @get external deltaMode: t => int = "deltaMode"
-  @get external deltaX: t => float = "deltaX"
-  @get external deltaY: t => float = "deltaY"
-  @get external deltaZ: t => float = "deltaZ"
-}
-
-module Media = {
-  type tag = ReactEvent.Media.tag
-  type t = ReactEvent.Media.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-}
-
-module Image = {
-  type tag = ReactEvent.Image.tag
-  type t = ReactEvent.Image.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-}
-
-module Animation = {
-  type tag = ReactEvent.Animation.tag
-  type t = ReactEvent.Animation.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-  @get external animationName: t => string = "animationName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
-
-module Transition = {
-  type tag = ReactEvent.Transition.tag
-  type t = ReactEvent.Transition.t
-  include MakeSyntheticWrapper({
-    type t = t
-  })
-  @get external propertyName: t => string = "propertyName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReactEventRe.resi b/jscomp/syntax/tests/idempotency/reason-react/src/ReactEventRe.resi
deleted file mode 100644
index 77a29c0..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReactEventRe.resi
+++ /dev/null
@@ -1,830 +0,0 @@
-/* Old code. See ReactEvent.re for documentation. */
-@deprecated("Please use ReactEvent.synthetic")
-type synthetic<'a> = ReactEvent.synthetic<'a>
-
-module Synthetic: {
-  @deprecated("Please use ReactEvent.Synthetic.tag")
-  type tag = ReactEvent.Synthetic.tag
-  @deprecated("Please use ReactEvent.Synthetic.t")
-  type t = ReactEvent.Synthetic.t
-  @deprecated("Please use ReactEvent.Synthetic.bubbles") @get
-  external bubbles: ReactEvent.synthetic<'a> => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Synthetic.cancelable") @get
-  external cancelable: ReactEvent.synthetic<'a> => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Synthetic.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.synthetic<'a> => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Synthetic.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.synthetic<'a> => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Synthetic.eventPhase") @get
-  external eventPhase: ReactEvent.synthetic<'a> => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Synthetic.isTrusted") @get
-  external isTrusted: ReactEvent.synthetic<'a> => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Synthetic.nativeEvent") @get
-  external nativeEvent: ReactEvent.synthetic<'a> => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Synthetic.preventDefault")
-  @bs.send.pipe(: ReactEvent.synthetic<'a>)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Synthetic.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.synthetic<'a>)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Synthetic.stopPropagation")
-  @bs.send.pipe(: ReactEvent.synthetic<'a>)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Synthetic.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.synthetic<'a>)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Synthetic.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.synthetic<'a> => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Synthetic.timeStamp") @get
-  external timeStamp: ReactEvent.synthetic<'a> => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Synthetic.type_") @get
-  external _type: ReactEvent.synthetic<'a> => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Synthetic.persist")
-  @bs.send.pipe(: ReactEvent.synthetic<'a>)
-  external persist: unit = "persist"
-}
-
-/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */
-@deprecated("Please use ReactEvent.toSyntheticEvent")
-external toSyntheticEvent: ReactEvent.synthetic<'a> => ReactEvent.Synthetic.t = "%identity"
-
-module Clipboard: {
-  @deprecated("Please use ReactEvent.Clipboard.tag")
-  type tag = ReactEvent.Clipboard.tag
-  @deprecated("Please use ReactEvent.Clipboard.tag")
-  type t = ReactEvent.Clipboard.t
-  @deprecated("Please use ReactEvent.Clipboard.bubbles") @get
-  external bubbles: ReactEvent.Clipboard.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Clipboard.cancelable") @get
-  external cancelable: ReactEvent.Clipboard.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Clipboard.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Clipboard.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Clipboard.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Clipboard.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Clipboard.eventPhase") @get
-  external eventPhase: ReactEvent.Clipboard.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Clipboard.isTrusted") @get
-  external isTrusted: ReactEvent.Clipboard.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Clipboard.nativeEvent") @get
-  external nativeEvent: ReactEvent.Clipboard.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Clipboard.preventDefault")
-  @bs.send.pipe(: ReactEvent.Clipboard.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Clipboard.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Clipboard.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Clipboard.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Clipboard.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Clipboard.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Clipboard.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Clipboard.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Clipboard.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Clipboard.timeStamp") @get
-  external timeStamp: ReactEvent.Clipboard.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Clipboard.type_") @get
-  external _type: ReactEvent.Clipboard.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Clipboard.persist")
-  @bs.send.pipe(: ReactEvent.Clipboard.t)
-  external persist: unit = "persist"
-  @deprecated("Please use ReactEvent.Clipboard.clipboardData") @get
-  external clipboardData: ReactEvent.Clipboard.t => {..} =
-    "clipboardData" /* Should return Dom.dataTransfer */
-}
-
-module Composition: {
-  @deprecated("Please use ReactEvent.Composition.tag")
-  type tag = ReactEvent.Composition.tag
-  @deprecated("Please use ReactEvent.Composition.t")
-  type t = ReactEvent.Composition.t
-  @deprecated("Please use ReactEvent.Composition.bubbles") @get
-  external bubbles: ReactEvent.Composition.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Composition.cancelable") @get
-  external cancelable: ReactEvent.Composition.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Composition.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Composition.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Composition.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Composition.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Composition.eventPhase") @get
-  external eventPhase: ReactEvent.Composition.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Composition.isTrusted") @get
-  external isTrusted: ReactEvent.Composition.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Composition.nativeEvent") @get
-  external nativeEvent: ReactEvent.Composition.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Composition.preventDefault")
-  @bs.send.pipe(: ReactEvent.Composition.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Composition.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Composition.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Composition.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Composition.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Composition.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Composition.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Composition.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Composition.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Composition.timeStamp") @get
-  external timeStamp: ReactEvent.Composition.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Composition.type_") @get
-  external _type: ReactEvent.Composition.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Composition.persist")
-  @bs.send.pipe(: ReactEvent.Composition.t)
-  external persist: unit = "persist"
-  @deprecated("Please use ReactEvent.Composition.data") @get
-  external data: ReactEvent.Composition.t => string = "data"
-}
-
-module Keyboard: {
-  @deprecated("Please use ReactEvent.Keyboard.tag")
-  type tag = ReactEvent.Keyboard.tag
-  @deprecated("Please use ReactEvent.Keyboard.t")
-  type t = ReactEvent.Keyboard.t
-  @deprecated("Please use ReactEvent.Keyboard.bubbles") @get
-  external bubbles: ReactEvent.Keyboard.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Keyboard.cancelable") @get
-  external cancelable: ReactEvent.Keyboard.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Keyboard.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Keyboard.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Keyboard.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Keyboard.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Keyboard.eventPhase") @get
-  external eventPhase: ReactEvent.Keyboard.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Keyboard.isTrusted") @get
-  external isTrusted: ReactEvent.Keyboard.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Keyboard.nativeEvent") @get
-  external nativeEvent: ReactEvent.Keyboard.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Keyboard.preventDefault")
-  @bs.send.pipe(: ReactEvent.Keyboard.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Keyboard.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Keyboard.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Keyboard.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Keyboard.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Keyboard.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Keyboard.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Keyboard.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Keyboard.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Keyboard.timeStamp") @get
-  external timeStamp: ReactEvent.Keyboard.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Keyboard.type_") @get
-  external _type: ReactEvent.Keyboard.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Keyboard.persist")
-  @bs.send.pipe(: ReactEvent.Keyboard.t)
-  external persist: unit = "persist"
-  @deprecated("Please use ReactEvent.Keyboard.altKey") @get
-  external altKey: ReactEvent.Keyboard.t => bool = "altKey"
-  @deprecated("Please use ReactEvent.Keyboard.charCode") @get
-  external charCode: ReactEvent.Keyboard.t => int = "charCode"
-  @deprecated("Please use ReactEvent.Keyboard.ctrlKey") @get
-  external ctrlKey: ReactEvent.Keyboard.t => bool = "ctrlKey"
-  @deprecated("Please use myEvent->ReactEvent.Keyboard.getModifierState")
-  @bs.send.pipe(: ReactEvent.Keyboard.t)
-  external getModifierState: string => bool = "getModifierState"
-  @deprecated("Please use ReactEvent.Keyboard.key") @get
-  external key: ReactEvent.Keyboard.t => string = "key"
-  @deprecated("Please use ReactEvent.Keyboard.keyCode") @get
-  external keyCode: ReactEvent.Keyboard.t => int = "keyCode"
-  @deprecated("Please use ReactEvent.Keyboard.locale") @get
-  external locale: ReactEvent.Keyboard.t => string = "locale"
-  @deprecated("Please use ReactEvent.Keyboard.location") @get
-  external location: ReactEvent.Keyboard.t => int = "location"
-  @deprecated("Please use ReactEvent.Keyboard.metaKey") @get
-  external metaKey: ReactEvent.Keyboard.t => bool = "metaKey"
-  @deprecated("Please use ReactEvent.Keyboard.repeat") @get
-  external repeat: ReactEvent.Keyboard.t => bool = "repeat"
-  @deprecated("Please use ReactEvent.Keyboard.shiftKey") @get
-  external shiftKey: ReactEvent.Keyboard.t => bool = "shiftKey"
-  @deprecated("Please use ReactEvent.Keyboard.which") @get
-  external which: ReactEvent.Keyboard.t => int = "which"
-}
-
-module Focus: {
-  @deprecated("Please use ReactEvent.Focus.tag")
-  type tag = ReactEvent.Focus.tag
-  @deprecated("Please use ReactEvent.Focus.t")
-  type t = ReactEvent.Focus.t
-  @deprecated("Please use ReactEvent.Focus.bubbles") @get
-  external bubbles: ReactEvent.Focus.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Focus.cancelable") @get
-  external cancelable: ReactEvent.Focus.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Focus.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Focus.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Focus.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Focus.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Focus.eventPhase") @get
-  external eventPhase: ReactEvent.Focus.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Focus.isTrusted") @get
-  external isTrusted: ReactEvent.Focus.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Focus.nativeEvent") @get
-  external nativeEvent: ReactEvent.Focus.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Focus.preventDefault")
-  @bs.send.pipe(: ReactEvent.Focus.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Focus.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Focus.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Focus.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Focus.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Focus.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Focus.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Focus.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Focus.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Focus.timeStamp") @get
-  external timeStamp: ReactEvent.Focus.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Focus.type_") @get
-  external _type: ReactEvent.Focus.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Focus.persist") @bs.send.pipe(: ReactEvent.Focus.t)
-  external persist: unit = "persist"
-  @deprecated(
-    "Please use ReactEvent.Focus.relatedTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external relatedTarget: ReactEvent.Focus.t => Dom.element =
-    "relatedTarget" /* Should return Dom.eventTarget */
-}
-
-module Form: {
-  @deprecated("Please use ReactEvent.Form.tag")
-  type tag = ReactEvent.Form.tag
-  @deprecated("Please use ReactEvent.Form.t")
-  type t = ReactEvent.Form.t
-  @deprecated("Please use ReactEvent.Form.bubbles") @get
-  external bubbles: ReactEvent.Form.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Form.cancelable") @get
-  external cancelable: ReactEvent.Form.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Form.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Form.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Form.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Form.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Form.eventPhase") @get
-  external eventPhase: ReactEvent.Form.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Form.isTrusted") @get
-  external isTrusted: ReactEvent.Form.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Form.nativeEvent") @get
-  external nativeEvent: ReactEvent.Form.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Form.preventDefault")
-  @bs.send.pipe(: ReactEvent.Form.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Form.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Form.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Form.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Form.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Form.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Form.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Form.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Form.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Form.timeStamp") @get
-  external timeStamp: ReactEvent.Form.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Form.type_") @get
-  external _type: ReactEvent.Form.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Form.persist") @bs.send.pipe(: ReactEvent.Form.t)
-  external persist: unit = "persist"
-}
-
-module Mouse: {
-  @deprecated("Please use ReactEvent.Mouse.tag")
-  type tag = ReactEvent.Mouse.tag
-  @deprecated("Please use ReactEvent.Mouse.t")
-  type t = ReactEvent.Mouse.t
-  @deprecated("Please use ReactEvent.Mouse.bubbles") @get
-  external bubbles: ReactEvent.Mouse.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Mouse.cancelable") @get
-  external cancelable: ReactEvent.Mouse.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Mouse.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Mouse.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Mouse.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Mouse.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Mouse.eventPhase") @get
-  external eventPhase: ReactEvent.Mouse.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Mouse.isTrusted") @get
-  external isTrusted: ReactEvent.Mouse.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Mouse.nativeEvent") @get
-  external nativeEvent: ReactEvent.Mouse.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Mouse.preventDefault")
-  @bs.send.pipe(: ReactEvent.Mouse.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Mouse.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Mouse.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Mouse.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Mouse.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Mouse.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Mouse.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Mouse.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Mouse.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Mouse.timeStamp") @get
-  external timeStamp: ReactEvent.Mouse.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Mouse.type_") @get
-  external _type: ReactEvent.Mouse.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Mouse.persist") @bs.send.pipe(: ReactEvent.Mouse.t)
-  external persist: unit = "persist"
-  @deprecated("Please use ReactEvent.Mouse.altKey") @get
-  external altKey: ReactEvent.Mouse.t => bool = "altKey"
-  @deprecated("Please use ReactEvent.Mouse.button") @get
-  external button: ReactEvent.Mouse.t => int = "button"
-  @deprecated("Please use ReactEvent.Mouse.buttons") @get
-  external buttons: ReactEvent.Mouse.t => int = "buttons"
-  @deprecated("Please use ReactEvent.Mouse.clientX") @get
-  external clientX: ReactEvent.Mouse.t => int = "clientX"
-  @deprecated("Please use ReactEvent.Mouse.clientY") @get
-  external clientY: ReactEvent.Mouse.t => int = "clientY"
-  @deprecated("Please use ReactEvent.Mouse.ctrlKey") @get
-  external ctrlKey: ReactEvent.Mouse.t => bool = "ctrlKey"
-  @deprecated("Please use myEvent->ReactEvent.Mouse.getModifierState")
-  @bs.send.pipe(: ReactEvent.Mouse.t)
-  external getModifierState: string => bool = "getModifierState"
-  @deprecated("Please use ReactEvent.Mouse.metaKey") @get
-  external metaKey: ReactEvent.Mouse.t => bool = "metaKey"
-  @deprecated("Please use ReactEvent.Mouse.pageX") @get
-  external pageX: ReactEvent.Mouse.t => int = "pageX"
-  @deprecated("Please use ReactEvent.Mouse.pageY") @get
-  external pageY: ReactEvent.Mouse.t => int = "pageY"
-  @deprecated(
-    "Please use ReactEvent.Mouse.relatedTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external relatedTarget: ReactEvent.Mouse.t => Dom.element =
-    "relatedTarget" /* Should return Dom.eventTarget */
-  @deprecated("Please use ReactEvent.Mouse.screenX") @get
-  external screenX: ReactEvent.Mouse.t => int = "screenX"
-  @deprecated("Please use ReactEvent.Mouse.screenY") @get
-  external screenY: ReactEvent.Mouse.t => int = "screenY"
-  @deprecated("Please use ReactEvent.Mouse.shiftKey") @get
-  external shiftKey: ReactEvent.Mouse.t => bool = "shiftKey"
-}
-
-module Selection: {
-  @deprecated("Please use ReactEvent.Selection.tag")
-  type tag = ReactEvent.Selection.tag
-  @deprecated("Please use ReactEvent.Selection.t")
-  type t = ReactEvent.Selection.t
-  @deprecated("Please use ReactEvent.Selection.bubbles") @get
-  external bubbles: ReactEvent.Selection.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Selection.cancelable") @get
-  external cancelable: ReactEvent.Selection.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Selection.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Selection.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Selection.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Selection.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Selection.eventPhase") @get
-  external eventPhase: ReactEvent.Selection.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Selection.isTrusted") @get
-  external isTrusted: ReactEvent.Selection.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Selection.nativeEvent") @get
-  external nativeEvent: ReactEvent.Selection.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Selection.preventDefault")
-  @bs.send.pipe(: ReactEvent.Selection.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Selection.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Selection.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Selection.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Selection.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Selection.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Selection.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Selection.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Selection.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Selection.timeStamp") @get
-  external timeStamp: ReactEvent.Selection.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Selection.type_") @get
-  external _type: ReactEvent.Selection.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Selection.persist")
-  @bs.send.pipe(: ReactEvent.Selection.t)
-  external persist: unit = "persist"
-}
-
-module Touch: {
-  @deprecated("Please use ReactEvent.Touch.tag")
-  type tag = ReactEvent.Touch.tag
-  @deprecated("Please use ReactEvent.Touch.t")
-  type t = ReactEvent.Touch.t
-  @deprecated("Please use ReactEvent.Touch.bubbles") @get
-  external bubbles: ReactEvent.Touch.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Touch.cancelable") @get
-  external cancelable: ReactEvent.Touch.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Touch.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Touch.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Touch.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Touch.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Touch.eventPhase") @get
-  external eventPhase: ReactEvent.Touch.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Touch.isTrusted") @get
-  external isTrusted: ReactEvent.Touch.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Touch.nativeEvent") @get
-  external nativeEvent: ReactEvent.Touch.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Touch.preventDefault")
-  @bs.send.pipe(: ReactEvent.Touch.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Touch.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Touch.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Touch.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Touch.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Touch.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Touch.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Touch.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Touch.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Touch.timeStamp") @get
-  external timeStamp: ReactEvent.Touch.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Touch.type_") @get
-  external _type: ReactEvent.Touch.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Touch.persist") @bs.send.pipe(: ReactEvent.Touch.t)
-  external persist: unit = "persist"
-  @deprecated("Please use ReactEvent.Touch.altKey") @get
-  external altKey: ReactEvent.Touch.t => bool = "altKey"
-  @deprecated("Please use ReactEvent.Touch.changedTouches") @get
-  external changedTouches: ReactEvent.Touch.t => {..} =
-    "changedTouches" /* Should return Dom.touchList */
-  @deprecated("Please use ReactEvent.Touch.ctrlKey") @get
-  external ctrlKey: ReactEvent.Touch.t => bool = "ctrlKey"
-  @deprecated("Please use myEvent->ReactEvent.Touch.getModifierState")
-  @bs.send.pipe(: ReactEvent.Touch.t)
-  external getModifierState: string => bool = "getModifierState"
-  @deprecated("Please use ReactEvent.Touch.metaKey") @get
-  external metaKey: ReactEvent.Touch.t => bool = "metaKey"
-  @deprecated("Please use ReactEvent.Touch.shiftKey") @get
-  external shiftKey: ReactEvent.Touch.t => bool = "shiftKey"
-  @deprecated("Please use ReactEvent.Touch.targetTouches") @get
-  external targetTouches: ReactEvent.Touch.t => {..} =
-    "targetTouches" /* Should return Dom.touchList */
-  @deprecated("Please use ReactEvent.Touch.touches") @get
-  external touches: ReactEvent.Touch.t => {..} = "touches" /* Should return Dom.touchList */
-}
-
-module UI: {
-  @deprecated("Please use ReactEvent.UI.tag")
-  type tag = ReactEvent.UI.tag
-  @deprecated("Please use ReactEvent.UI.t")
-  type t = ReactEvent.UI.t
-  @deprecated("Please use ReactEvent.UI.bubbles") @get
-  external bubbles: ReactEvent.UI.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.UI.cancelable") @get
-  external cancelable: ReactEvent.UI.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.UI.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.UI.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.UI.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.UI.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.UI.eventPhase") @get
-  external eventPhase: ReactEvent.UI.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.UI.isTrusted") @get
-  external isTrusted: ReactEvent.UI.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.UI.nativeEvent") @get
-  external nativeEvent: ReactEvent.UI.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.UI.preventDefault") @bs.send.pipe(: ReactEvent.UI.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.UI.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.UI.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.UI.stopPropagation") @bs.send.pipe(: ReactEvent.UI.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.UI.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.UI.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.UI.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.UI.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.UI.timeStamp") @get
-  external timeStamp: ReactEvent.UI.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.UI.type_") @get
-  external _type: ReactEvent.UI.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.UI.persist") @bs.send.pipe(: ReactEvent.UI.t)
-  external persist: unit = "persist"
-  @deprecated("Please use ReactEvent.UI.detail") @get
-  external detail: ReactEvent.UI.t => int = "detail"
-  @deprecated("Please use ReactEvent.UI.view") @get
-  external view: ReactEvent.UI.t => Dom.window =
-    "view" /* Should return DOMAbstractView/WindowProxy */
-}
-
-module Wheel: {
-  @deprecated("Please use ReactEvent.Wheel.tag")
-  type tag = ReactEvent.Wheel.tag
-  @deprecated("Please use ReactEvent.Wheel.t")
-  type t = ReactEvent.Wheel.t
-  @deprecated("Please use ReactEvent.Wheel.bubbles") @get
-  external bubbles: ReactEvent.Wheel.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Wheel.cancelable") @get
-  external cancelable: ReactEvent.Wheel.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Wheel.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Wheel.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Wheel.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Wheel.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Wheel.eventPhase") @get
-  external eventPhase: ReactEvent.Wheel.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Wheel.isTrusted") @get
-  external isTrusted: ReactEvent.Wheel.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Wheel.nativeEvent") @get
-  external nativeEvent: ReactEvent.Wheel.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Wheel.preventDefault")
-  @bs.send.pipe(: ReactEvent.Wheel.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Wheel.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Wheel.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Wheel.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Wheel.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Wheel.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Wheel.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Wheel.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Wheel.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Wheel.timeStamp") @get
-  external timeStamp: ReactEvent.Wheel.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Wheel.type_") @get
-  external _type: ReactEvent.Wheel.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Wheel.persist") @bs.send.pipe(: ReactEvent.Wheel.t)
-  external persist: unit = "persist"
-  @deprecated("Please use ReactEvent.Wheel.deltaMode") @get
-  external deltaMode: ReactEvent.Wheel.t => int = "deltaMode"
-  @deprecated("Please use ReactEvent.Wheel.deltaX") @get
-  external deltaX: ReactEvent.Wheel.t => float = "deltaX"
-  @deprecated("Please use ReactEvent.Wheel.deltaY") @get
-  external deltaY: ReactEvent.Wheel.t => float = "deltaY"
-  @deprecated("Please use ReactEvent.Wheel.deltaZ") @get
-  external deltaZ: ReactEvent.Wheel.t => float = "deltaZ"
-}
-
-module Media: {
-  @deprecated("Please use ReactEvent.Media.tag")
-  type tag = ReactEvent.Media.tag
-  @deprecated("Please use ReactEvent.Media.t")
-  type t = ReactEvent.Media.t
-  @deprecated("Please use ReactEvent.Media.bubbles") @get
-  external bubbles: ReactEvent.Media.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Media.cancelable") @get
-  external cancelable: ReactEvent.Media.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Media.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Media.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Media.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Media.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Media.eventPhase") @get
-  external eventPhase: ReactEvent.Media.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Media.isTrusted") @get
-  external isTrusted: ReactEvent.Media.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Media.nativeEvent") @get
-  external nativeEvent: ReactEvent.Media.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Media.preventDefault")
-  @bs.send.pipe(: ReactEvent.Media.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Media.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Media.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Media.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Media.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Media.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Media.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Media.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Media.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Media.timeStamp") @get
-  external timeStamp: ReactEvent.Media.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Media.type_") @get
-  external _type: ReactEvent.Media.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Media.persist") @bs.send.pipe(: ReactEvent.Media.t)
-  external persist: unit = "persist"
-}
-
-module Image: {
-  @deprecated("Please use ReactEvent.Image.tag")
-  type tag = ReactEvent.Image.tag
-  @deprecated("Please use ReactEvent.Image.t")
-  type t = ReactEvent.Image.t
-  @deprecated("Please use ReactEvent.Image.bubbles") @get
-  external bubbles: ReactEvent.Image.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Image.cancelable") @get
-  external cancelable: ReactEvent.Image.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Image.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Image.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Image.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Image.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Image.eventPhase") @get
-  external eventPhase: ReactEvent.Image.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Image.isTrusted") @get
-  external isTrusted: ReactEvent.Image.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Image.nativeEvent") @get
-  external nativeEvent: ReactEvent.Image.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Image.preventDefault")
-  @bs.send.pipe(: ReactEvent.Image.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Image.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Image.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Image.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Image.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Image.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Image.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Image.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Image.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Image.timeStamp") @get
-  external timeStamp: ReactEvent.Image.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Image.type_") @get
-  external _type: ReactEvent.Image.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Image.persist") @bs.send.pipe(: ReactEvent.Image.t)
-  external persist: unit = "persist"
-}
-
-module Animation: {
-  @deprecated("Please use ReactEvent.Animation.tag")
-  type tag = ReactEvent.Animation.tag
-  @deprecated("Please use ReactEvent.Animation.t")
-  type t = ReactEvent.Animation.t
-  @deprecated("Please use ReactEvent.Animation.bubbles") @get
-  external bubbles: ReactEvent.Animation.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Animation.cancelable") @get
-  external cancelable: ReactEvent.Animation.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Animation.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Animation.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Animation.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Animation.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Animation.eventPhase") @get
-  external eventPhase: ReactEvent.Animation.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Animation.isTrusted") @get
-  external isTrusted: ReactEvent.Animation.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Animation.nativeEvent") @get
-  external nativeEvent: ReactEvent.Animation.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Animation.preventDefault")
-  @bs.send.pipe(: ReactEvent.Animation.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Animation.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Animation.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Animation.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Animation.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Animation.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Animation.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Animation.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Animation.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Animation.timeStamp") @get
-  external timeStamp: ReactEvent.Animation.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Animation.type_") @get
-  external _type: ReactEvent.Animation.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Animation.persist")
-  @bs.send.pipe(: ReactEvent.Animation.t)
-  external persist: unit = "persist"
-  @deprecated("Please use ReactEvent.Animation.animationName") @get
-  external animationName: ReactEvent.Animation.t => string = "animationName"
-  @deprecated("Please use ReactEvent.Animation.pseudoElement") @get
-  external pseudoElement: ReactEvent.Animation.t => string = "pseudoElement"
-  @deprecated("Please use ReactEvent.Animation.elapsedTime") @get
-  external elapsedTime: ReactEvent.Animation.t => float = "elapsedTime"
-}
-
-module Transition: {
-  @deprecated("Please use ReactEvent.Transition.tag")
-  type tag = ReactEvent.Transition.tag
-  @deprecated("Please use ReactEvent.Transition.t")
-  type t = ReactEvent.Transition.t
-  @deprecated("Please use ReactEvent.Transition.bubbles") @get
-  external bubbles: ReactEvent.Transition.t => bool = "bubbles"
-  @deprecated("Please use ReactEvent.Transition.cancelable") @get
-  external cancelable: ReactEvent.Transition.t => bool = "cancelable"
-  @deprecated(
-    "Please use ReactEvent.Transition.currentTarget and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external currentTarget: ReactEvent.Transition.t => Dom.element = "currentTarget"
-  @deprecated("Please use ReactEvent.Transition.defaultPrevented") @get
-  external defaultPrevented: ReactEvent.Transition.t => bool = "defaultPrevented"
-  @deprecated("Please use ReactEvent.Transition.eventPhase") @get
-  external eventPhase: ReactEvent.Transition.t => int = "eventPhase"
-  @deprecated("Please use ReactEvent.Transition.isTrusted") @get
-  external isTrusted: ReactEvent.Transition.t => bool = "isTrusted"
-  @deprecated("Please use ReactEvent.Transition.nativeEvent") @get
-  external nativeEvent: ReactEvent.Transition.t => {..} = "nativeEvent"
-  @deprecated("Please use myEvent->ReactEvent.Transition.preventDefault")
-  @bs.send.pipe(: ReactEvent.Transition.t)
-  external preventDefault: unit = "preventDefault"
-  @deprecated("Please use myEvent->ReactEvent.Transition.isDefaultPrevented")
-  @bs.send.pipe(: ReactEvent.Transition.t)
-  external isDefaultPrevented: bool = "isDefaultPrevented"
-  @deprecated("Please use myEvent->ReactEvent.Transition.stopPropagation")
-  @bs.send.pipe(: ReactEvent.Transition.t)
-  external stopPropagation: unit = "stopPropagation"
-  @deprecated("Please use myEvent->ReactEvent.Transition.isPropagationStopped")
-  @bs.send.pipe(: ReactEvent.Transition.t)
-  external isPropagationStopped: bool = "isPropagationStopped"
-  @deprecated(
-    "Please use ReactEvent.Transition.target and remove the surrounding ReactDOMRe.domElementToObj wrapper if any (no longer needed)"
-  )
-  @get
-  external target: ReactEvent.Transition.t => Dom.element = "target"
-  @deprecated("Please use ReactEvent.Transition.timeStamp") @get
-  external timeStamp: ReactEvent.Transition.t => float = "timeStamp"
-  @deprecated("Please use ReactEvent.Transition.type_") @get
-  external _type: ReactEvent.Transition.t => string = "type"
-  @deprecated("Please use myEvent->ReactEvent.Transition.persist")
-  @bs.send.pipe(: ReactEvent.Transition.t)
-  external persist: unit = "persist"
-  @deprecated("Please use ReactEvent.Transition.propertyName") @get
-  external propertyName: ReactEvent.Transition.t => string = "propertyName"
-  @deprecated("Please use ReactEvent.Transition.pseudoElement") @get
-  external pseudoElement: ReactEvent.Transition.t => string = "pseudoElement"
-  @deprecated("Please use ReactEvent.Transition.elapsedTime") @get
-  external elapsedTime: ReactEvent.Transition.t => float = "elapsedTime"
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReact.resi b/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReact.resi
deleted file mode 100644
index f4ca15a..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReact.resi
+++ /dev/null
@@ -1,214 +0,0 @@
-/* **
- * This API assumes that JSX will desugar <Foo key ref attr1=val1 attrn=valn /> into:
- *
- * ReasonReact.element(
- *   Foo.make(~key, ~ref, ~attr1=val1, ~attrn=valn, [| |]
- * )
- */
-
-type reactClass
-
-type reactElement = React.element
-
-type reactRef
-
-@val external null: reactElement = "null"
-
-external string: string => reactElement = "%identity"
-
-external array: array<reactElement> => reactElement = "%identity"
-
-external refToJsObj: reactRef => {..} = "%identity"
-
-/* This should _not_ be used directly, unless you're passing a class like this:
-
-   switch (actionsClass) {
-   | Some(actions) =>
-       ReasonReact.createElement(
-         actions,
-         ~props={
-           "className": "hi"
-         },
-         [|whatever|],
-       )
-   }
-
-   In every other case, you should be using the JSX
- */
-@variadic @val @module("react")
-external createElement: (reactClass, ~props: {..}=?, array<reactElement>) => reactElement =
-  "createElement"
-
-@variadic @module("react")
-external cloneElement: (reactElement, ~props: {..}=?, array<reactElement>) => reactElement =
-  "cloneElement"
-
-type renderNotImplemented = RenderNotImplemented
-
-/* **
- * A stateless component is a component with state of type unit. This cannot be
- * abstract for now, because a stateless component's willReceiveProps needs to
- * return the state, aka unit. We can provide a helper
- * ReasonReact.statelessReturn that's of type `stateless`, but that's verbose
- */
-type stateless = unit
-
-type noRetainedProps
-
-/* ** An actionless component is a component with actions of type unit */
-type actionless = unit
-
-/* Control how a state update is performed.
-   The state can be updated of left unchanged.
-   Side effects can be specified and are scheduled for later execution.
-   Note: when a side effect is scheduled, it's added to a queue of existing pending side effects.
-   All the side effects are performed in batch after all the state updates have been performed,
-   in the same order in which they were scheduled, just before shouldUpdate is called. */
-type rec update<'state, 'retainedProps, 'action> =
-  | /* Don't update the state. */
-  NoUpdate
-  /* Update the state with the given one. */
-  | Update('state)
-  /* Perform side effects without updating state, and don't trigger a re-render.
-     Do not prevent a re-render either, if one was scheduled to happen.
-     The side effects function is invoked when all the updates have completed. */
-  | SideEffects(self<'state, 'retainedProps, 'action> => unit)
-  /* Update the state and perform side effects.
-   The side effects function is invoked when all the updates have completed. */
-  | UpdateWithSideEffects('state, self<'state, 'retainedProps, 'action> => unit)
-and self<'state, 'retainedProps, 'action> = {
-  /* **
-   * Call a handler function.
-   *
-   * The callback is passed the payload and current state immediately.
-   * Note: the callback typically performs side effects, since it returns nothing.
-   */
-  handle: 'payload. (('payload, self<'state, 'retainedProps, 'action>) => unit, 'payload) => unit,
-  state: 'state,
-  retainedProps: 'retainedProps,
-  send: 'action => unit,
-  onUnmount: (unit => unit) => unit,
-}
-
-type reactClassInternal
-
-/* ** For internal use only */
-type jsElementWrapped
-
-type oldNewSelf<'state, 'retainedProps, 'action> = {
-  oldSelf: self<'state, 'retainedProps, 'action>,
-  newSelf: self<'state, 'retainedProps, 'action>,
-}
-
-type rec componentSpec<'state, 'initialState, 'retainedProps, 'initialRetainedProps, 'action> = {
-  debugName: string,
-  reactClassInternal: reactClassInternal,
-  /* Keep here as a way to prove that the API may be implemented soundly */
-  mutable handedOffState: ref<option<'state>>,
-  /* ** Callback invoked when the component receives new props or state.
-   * Note: this callback must not perform side effects.
-   */
-  willReceiveProps: self<'state, 'retainedProps, 'action> => 'state,
-  didMount: self<'state, 'retainedProps, 'action> => unit,
-  didUpdate: oldNewSelf<'state, 'retainedProps, 'action> => unit,
-  willUnmount: self<'state, 'retainedProps, 'action> => unit,
-  willUpdate: oldNewSelf<'state, 'retainedProps, 'action> => unit,
-  shouldUpdate: oldNewSelf<'state, 'retainedProps, 'action> => bool,
-  render: self<'state, 'retainedProps, 'action> => reactElement,
-  initialState: unit => 'initialState,
-  retainedProps: 'initialRetainedProps,
-  /* ** Reducer callback.
-   *
-   * The callback is invoked by the reduce function contained in self.
-   * A state update is scheduled based on the action passed, and added to the queue of pending updates.
-   * The state received will be the resulting one after the pending updates have been executed.
-   *
-   * Note: this callback must not perform side effects.
-   * If side effects are required, they should be contained in a
-   * side-effectful function specified in the returned update.
-   */
-  reducer: ('action, 'state) => update<'state, 'retainedProps, 'action>,
-  jsElementWrapped: jsElementWrapped,
-}
-and component<'state, 'retainedProps, 'action> = componentSpec<
-  'state,
-  'state,
-  'retainedProps,
-  'retainedProps,
-  'action,
->
-
-/* ** Create a stateless component: i.e. a component where state has type stateless. */
-let statelessComponent: string => componentSpec<
-  stateless,
-  stateless,
-  noRetainedProps,
-  noRetainedProps,
-  actionless,
->
-
-let statelessComponentWithRetainedProps: string => componentSpec<
-  stateless,
-  stateless,
-  'retainedProps,
-  noRetainedProps,
-  actionless,
->
-
-let reducerComponent: string => componentSpec<
-  'state,
-  stateless,
-  noRetainedProps,
-  noRetainedProps,
-  'action,
->
-
-let reducerComponentWithRetainedProps: string => componentSpec<
-  'state,
-  stateless,
-  'retainedProps,
-  noRetainedProps,
-  'action,
->
-
-let element: (
-  ~key: string=?,
-  ~ref: Js.nullable<reactRef> => unit=?,
-  component<'state, 'retainedProps, 'action>,
-) => reactElement
-
-type jsPropsToReason<'jsProps, 'state, 'retainedProps, 'action> = 'jsProps => component<
-  'state,
-  'retainedProps,
-  'action,
->
-
-/* **
- * We *under* constrain the kind of component spec this accepts because we actually extend the *originally*
- * defined component. It uses mutation on the original component, so that even if it is extended with
- * {...component}, all extensions will also see the underlying js class. I can sleep at night because js
- * interop is integrating with untyped, code and it is *possible* to create pure-ReasonReact apps without JS
- * interop entirely. */
-let wrapReasonForJs: (
-  ~component: componentSpec<'state, 'initialState, 'retainedProps, 'initialRetainedProps, 'action>,
-  jsPropsToReason<_>,
-) => reactClass
-
-@deprecated("
-Were you using this because you needed to pass a children array reference to a DOM element?  We now support children spread for DOM elements: `<div> ...children </div>`.
-Alternatively, if you're using this because the prop name contains a hyphen, please use `ReactDOMRe.createElementVariadic` instead.")
-let createDomElement: (string, ~props: {..}, array<reactElement>) => reactElement
-
-@ocaml.doc("
- * Wrap props into a JS component
- * Use for interop when Reason components use JS components
- ")
-let wrapJsForReason: (
-  ~reactClass: reactClass,
-  ~props: 'a,
-  'b,
-) => component<stateless, noRetainedProps, actionless>
-
-@module("react") external fragment: 'a = "Fragment"
-
-module Router = ReasonReactRouter
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactCompat.res b/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactCompat.res
deleted file mode 100644
index 3118ab1..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactCompat.res
+++ /dev/null
@@ -1,10 +0,0 @@
-external componentToReasonReactClass: React.component<'props> => ReasonReact.reactClass =
-  "%identity"
-
-external reasonReactClassToComponent: ReasonReact.reactClass => React.component<'props> =
-  "%identity"
-let wrapReactForReasonReact = (component, props, children) =>
-  ReasonReact.wrapJsForReason(~reactClass=componentToReasonReactClass(component), ~props, children)
-
-let wrapReasonReactForReact = (~component, propsConverter) =>
-  reasonReactClassToComponent(ReasonReact.wrapReasonForJs(~component, propsConverter))
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactCompat.resi b/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactCompat.resi
deleted file mode 100644
index bb6e9c2..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactCompat.resi
+++ /dev/null
@@ -1,14 +0,0 @@
-let wrapReactForReasonReact: (
-  React.component<'props>,
-  'props,
-  'children,
-) => ReasonReact.component<
-  ReasonReact.stateless,
-  ReasonReact.noRetainedProps,
-  ReasonReact.actionless,
->
-
-let wrapReasonReactForReact: (
-  ~component: ReasonReact.componentSpec<'a, 'b, 'c, 'd, 'e>,
-  ReasonReact.jsPropsToReason<'props, 'g, 'h, 'i>,
-) => React.component<'props>
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactOptimizedCreateClass.res b/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactOptimizedCreateClass.res
deleted file mode 100644
index 147046c..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactOptimizedCreateClass.res
+++ /dev/null
@@ -1,888 +0,0 @@
-let _assign = Js.Obj.assign
-
-let emptyObject = Js.Obj.empty()
-
-%%raw(`
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-
-// 'use strict';
-
-// var _assign = require('object-assign');
-
-// var emptyObject = require('emptyObject');
-// var _invariant = require('invariant');
-
-// if (process.env.NODE_ENV !== 'production') {
-//   var warning = require('fbjs/lib/warning');
-// }
-
-var MIXINS_KEY = 'mixins';
-
-// Helper function to allow the creation of anonymous functions which do not
-// have .name set to the name of the variable being assigned to.
-function identity(fn) {
-  return fn;
-}
-
-var ReactPropTypeLocationNames;
-// if (process.env.NODE_ENV !== 'production') {
-//   ReactPropTypeLocationNames = {
-//     prop: 'prop',
-//     context: 'context',
-//     childContext: 'child context'
-//   };
-// } else {
-  ReactPropTypeLocationNames = {};
-// }
-`)
-
-let factory = %raw(`
-function factory(ReactComponent, isValidElement, ReactNoopUpdateQueue) {
-  /**
-   * Policies that describe methods in \`ReactClassInterface\`.
-   */
-
-  var injectedMixins = [];
-
-  /**
-   * Composite components are higher-level components that compose other composite
-   * or host components.
-   *
-   * To create a new type of \`ReactClass\`, pass a specification of
-   * your new class to \`React.createClass\`. The only requirement of your class
-   * specification is that you implement a \`render\` method.
-   *
-   *   var MyComponent = React.createClass({
-   *     render: function() {
-   *       return <div>Hello World</div>;
-   *     }
-   *   });
-   *
-   * The class specification supports a specific protocol of methods that have
-   * special meaning (e.g. \`render\`). See \`ReactClassInterface\` for
-   * more the comprehensive protocol. Any other properties and methods in the
-   * class specification will be available on the prototype.
-   *
-   * @interface ReactClassInterface
-   * @internal
-   */
-  var ReactClassInterface = {
-    /**
-     * An array of Mixin objects to include when defining your component.
-     *
-     * @type {array}
-     * @optional
-     */
-    mixins: 'DEFINE_MANY',
-
-    /**
-     * An object containing properties and methods that should be defined on
-     * the component's constructor instead of its prototype (static methods).
-     *
-     * @type {object}
-     * @optional
-     */
-    statics: 'DEFINE_MANY',
-
-    /**
-     * Definition of prop types for this component.
-     *
-     * @type {object}
-     * @optional
-     */
-    propTypes: 'DEFINE_MANY',
-
-    /**
-     * Definition of context types for this component.
-     *
-     * @type {object}
-     * @optional
-     */
-    contextTypes: 'DEFINE_MANY',
-
-    /**
-     * Definition of context types this component sets for its children.
-     *
-     * @type {object}
-     * @optional
-     */
-    childContextTypes: 'DEFINE_MANY',
-
-    // ==== Definition methods ====
-
-    /**
-     * Invoked when the component is mounted. Values in the mapping will be set on
-     * \`this.props\` if that prop is not specified (i.e. using an \`in\` check).
-     *
-     * This method is invoked before \`getInitialState\` and therefore cannot rely
-     * on \`this.state\` or use \`this.setState\`.
-     *
-     * @return {object}
-     * @optional
-     */
-    getDefaultProps: 'DEFINE_MANY_MERGED',
-
-    /**
-     * Invoked once before the component is mounted. The return value will be used
-     * as the initial value of \`this.state\`.
-     *
-     *   getInitialState: function() {
-     *     return {
-     *       isOn: false,
-     *       fooBaz: new BazFoo()
-     *     }
-     *   }
-     *
-     * @return {object}
-     * @optional
-     */
-    getInitialState: 'DEFINE_MANY_MERGED',
-
-    /**
-     * @return {object}
-     * @optional
-     */
-    getChildContext: 'DEFINE_MANY_MERGED',
-
-    /**
-     * Uses props from \`this.props\` and state from \`this.state\` to render the
-     * structure of the component.
-     *
-     * No guarantees are made about when or how often this method is invoked, so
-     * it must not have side effects.
-     *
-     *   render: function() {
-     *     var name = this.props.name;
-     *     return <div>Hello, {name}!</div>;
-     *   }
-     *
-     * @return {ReactComponent}
-     * @required
-     */
-    render: 'DEFINE_ONCE',
-
-    // ==== Delegate methods ====
-
-    /**
-     * Invoked when the component is initially created and about to be mounted.
-     * This may have side effects, but any external subscriptions or data created
-     * by this method must be cleaned up in \`componentWillUnmount\`.
-     *
-     * @optional
-     */
-    componentWillMount: 'DEFINE_MANY',
-
-    /**
-     * Invoked when the component has been mounted and has a DOM representation.
-     * However, there is no guarantee that the DOM node is in the document.
-     *
-     * Use this as an opportunity to operate on the DOM when the component has
-     * been mounted (initialized and rendered) for the first time.
-     *
-     * @param {DOMElement} rootNode DOM element representing the component.
-     * @optional
-     */
-    componentDidMount: 'DEFINE_MANY',
-
-    /**
-     * Invoked before the component receives new props.
-     *
-     * Use this as an opportunity to react to a prop transition by updating the
-     * state using \`this.setState\`. Current props are accessed via \`this.props\`.
-     *
-     *   componentWillReceiveProps: function(nextProps, nextContext) {
-     *     this.setState({
-     *       likesIncreasing: nextProps.likeCount > this.props.likeCount
-     *     });
-     *   }
-     *
-     * NOTE: There is no equivalent \`componentWillReceiveState\`. An incoming prop
-     * transition may cause a state change, but the opposite is not true. If you
-     * need it, you are probably looking for \`componentWillUpdate\`.
-     *
-     * @param {object} nextProps
-     * @optional
-     */
-    componentWillReceiveProps: 'DEFINE_MANY',
-
-    /**
-     * Invoked while deciding if the component should be updated as a result of
-     * receiving new props, state and/or context.
-     *
-     * Use this as an opportunity to \`return false\` when you're certain that the
-     * transition to the new props/state/context will not require a component
-     * update.
-     *
-     *   shouldComponentUpdate: function(nextProps, nextState, nextContext) {
-     *     return !equal(nextProps, this.props) ||
-     *       !equal(nextState, this.state) ||
-     *       !equal(nextContext, this.context);
-     *   }
-     *
-     * @param {object} nextProps
-     * @param {?object} nextState
-     * @param {?object} nextContext
-     * @return {boolean} True if the component should update.
-     * @optional
-     */
-    shouldComponentUpdate: 'DEFINE_ONCE',
-
-    /**
-     * Invoked when the component is about to update due to a transition from
-     * \`this.props\`, \`this.state\` and \`this.context\` to \`nextProps\`, \`nextState\`
-     * and \`nextContext\`.
-     *
-     * Use this as an opportunity to perform preparation before an update occurs.
-     *
-     * NOTE: You **cannot** use \`this.setState()\` in this method.
-     *
-     * @param {object} nextProps
-     * @param {?object} nextState
-     * @param {?object} nextContext
-     * @param {ReactReconcileTransaction} transaction
-     * @optional
-     */
-    componentWillUpdate: 'DEFINE_MANY',
-
-    /**
-     * Invoked when the component's DOM representation has been updated.
-     *
-     * Use this as an opportunity to operate on the DOM when the component has
-     * been updated.
-     *
-     * @param {object} prevProps
-     * @param {?object} prevState
-     * @param {?object} prevContext
-     * @param {DOMElement} rootNode DOM element representing the component.
-     * @optional
-     */
-    componentDidUpdate: 'DEFINE_MANY',
-
-    /**
-     * Invoked when the component is about to be removed from its parent and have
-     * its DOM representation destroyed.
-     *
-     * Use this as an opportunity to deallocate any external resources.
-     *
-     * NOTE: There is no \`componentDidUnmount\` since your component will have been
-     * destroyed by that point.
-     *
-     * @optional
-     */
-    componentWillUnmount: 'DEFINE_MANY',
-
-    // ==== Advanced methods ====
-
-    /**
-     * Updates the component's currently mounted DOM representation.
-     *
-     * By default, this implements React's rendering and reconciliation algorithm.
-     * Sophisticated clients may wish to override this.
-     *
-     * @param {ReactReconcileTransaction} transaction
-     * @internal
-     * @overridable
-     */
-    updateComponent: 'OVERRIDE_BASE'
-  };
-
-  /**
-   * Mapping from class specification keys to special processing functions.
-   *
-   * Although these are declared like instance properties in the specification
-   * when defining classes using \`React.createClass\`, they are actually static
-   * and are accessible on the constructor instead of the prototype. Despite
-   * being static, they must be defined outside of the "statics" key under
-   * which all other static methods are defined.
-   */
-  var RESERVED_SPEC_KEYS = {
-    displayName: function(Constructor, displayName) {
-      Constructor.displayName = displayName;
-    },
-    mixins: function(Constructor, mixins) {
-      if (mixins) {
-        for (var i = 0; i < mixins.length; i++) {
-          mixSpecIntoComponent(Constructor, mixins[i]);
-        }
-      }
-    },
-    childContextTypes: function(Constructor, childContextTypes) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   validateTypeDef(Constructor, childContextTypes, 'childContext');
-      // }
-      Constructor.childContextTypes = _assign(
-        {},
-        Constructor.childContextTypes,
-        childContextTypes
-      );
-    },
-    contextTypes: function(Constructor, contextTypes) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   validateTypeDef(Constructor, contextTypes, 'context');
-      // }
-      Constructor.contextTypes = _assign(
-        {},
-        Constructor.contextTypes,
-        contextTypes
-      );
-    },
-    /**
-     * Special case getDefaultProps which should move into statics but requires
-     * automatic merging.
-     */
-    getDefaultProps: function(Constructor, getDefaultProps) {
-      if (Constructor.getDefaultProps) {
-        Constructor.getDefaultProps = createMergedResultFunction(
-          Constructor.getDefaultProps,
-          getDefaultProps
-        );
-      } else {
-        Constructor.getDefaultProps = getDefaultProps;
-      }
-    },
-    propTypes: function(Constructor, propTypes) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   validateTypeDef(Constructor, propTypes, 'prop');
-      // }
-      Constructor.propTypes = _assign({}, Constructor.propTypes, propTypes);
-    },
-    statics: function(Constructor, statics) {
-      mixStaticSpecIntoComponent(Constructor, statics);
-    },
-    autobind: function() {}
-  };
-
-  function validateTypeDef(Constructor, typeDef, location) {
-    for (var propName in typeDef) {
-      // if (typeDef.hasOwnProperty(propName)) {
-      //   // use a warning instead of an _invariant so components
-      //   // don't show up in prod but only in __DEV__
-      //   // if (process.env.NODE_ENV !== 'production') {
-      //   //   warning(
-      //   //     typeof typeDef[propName] === 'function',
-      //   //     '%s: %s type \`%s\` is invalid; it must be a function, usually from ' +
-      //   //       'React.PropTypes.',
-      //   //     Constructor.displayName || 'ReactClass',
-      //   //     ReactPropTypeLocationNames[location],
-      //   //     propName
-      //   //   );
-      //   // }
-      // }
-    }
-  }
-
-  function validateMethodOverride(isAlreadyDefined, name) {
-    var specPolicy = ReactClassInterface.hasOwnProperty(name)
-      ? ReactClassInterface[name]
-      : null;
-
-    // Disallow overriding of base class methods unless explicitly allowed.
-    if (ReactClassMixin.hasOwnProperty(name)) {
-      // _invariant(
-      //   specPolicy === 'OVERRIDE_BASE',
-      //   'ReactClassInterface: You are attempting to override ' +
-      //     '\`%s\` from your class specification. Ensure that your method names ' +
-      //     'do not overlap with React methods.',
-      //   name
-      // );
-    }
-
-    // Disallow defining methods more than once unless explicitly allowed.
-    if (isAlreadyDefined) {
-      // _invariant(
-      //   specPolicy === 'DEFINE_MANY' || specPolicy === 'DEFINE_MANY_MERGED',
-      //   'ReactClassInterface: You are attempting to define ' +
-      //     '\`%s\` on your component more than once. This conflict may be due ' +
-      //     'to a mixin.',
-      //   name
-      // );
-    }
-  }
-
-  /**
-   * Mixin helper which handles policy validation and reserved
-   * specification keys when building React classes.
-   */
-  function mixSpecIntoComponent(Constructor, spec) {
-    if (!spec) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   var typeofSpec = typeof spec;
-      //   var isMixinValid = typeofSpec === 'object' && spec !== null;
-      //
-      //   if (process.env.NODE_ENV !== 'production') {
-      //     warning(
-      //       isMixinValid,
-      //       "%s: You're attempting to include a mixin that is either null " +
-      //         'or not an object. Check the mixins included by the component, ' +
-      //         'as well as any mixins they include themselves. ' +
-      //         'Expected object but got %s.',
-      //       Constructor.displayName || 'ReactClass',
-      //       spec === null ? null : typeofSpec
-      //     );
-      //   }
-      // }
-
-      return;
-    }
-
-    // _invariant(
-    //   typeof spec !== 'function',
-    //   "ReactClass: You're attempting to " +
-    //     'use a component class or function as a mixin. Instead, just use a ' +
-    //     'regular object.'
-    // );
-    // _invariant(
-    //   !isValidElement(spec),
-    //   "ReactClass: You're attempting to " +
-    //     'use a component as a mixin. Instead, just use a regular object.'
-    // );
-
-    var proto = Constructor.prototype;
-    var autoBindPairs = proto.__reactAutoBindPairs;
-
-    // By handling mixins before any other properties, we ensure the same
-    // chaining order is applied to methods with DEFINE_MANY policy, whether
-    // mixins are listed before or after these methods in the spec.
-    if (spec.hasOwnProperty(MIXINS_KEY)) {
-      RESERVED_SPEC_KEYS.mixins(Constructor, spec.mixins);
-    }
-
-    for (var name in spec) {
-      if (!spec.hasOwnProperty(name)) {
-        continue;
-      }
-
-      if (name === MIXINS_KEY) {
-        // We have already handled mixins in a special case above.
-        continue;
-      }
-
-      var property = spec[name];
-      var isAlreadyDefined = proto.hasOwnProperty(name);
-      validateMethodOverride(isAlreadyDefined, name);
-
-      if (RESERVED_SPEC_KEYS.hasOwnProperty(name)) {
-        RESERVED_SPEC_KEYS[name](Constructor, property);
-      } else {
-        // Setup methods on prototype:
-        // The following member methods should not be automatically bound:
-        // 1. Expected ReactClass methods (in the "interface").
-        // 2. Overridden methods (that were mixed in).
-        var isReactClassMethod = ReactClassInterface.hasOwnProperty(name);
-        var isFunction = typeof property === 'function';
-        var shouldAutoBind =
-          isFunction &&
-          !isReactClassMethod &&
-          !isAlreadyDefined &&
-          spec.autobind !== false;
-
-        if (shouldAutoBind) {
-          autoBindPairs.push(name, property);
-          proto[name] = property;
-        } else {
-          if (isAlreadyDefined) {
-            var specPolicy = ReactClassInterface[name];
-
-            // These cases should already be caught by validateMethodOverride.
-            // _invariant(
-            //   isReactClassMethod &&
-            //     (specPolicy === 'DEFINE_MANY_MERGED' ||
-            //       specPolicy === 'DEFINE_MANY'),
-            //   'ReactClass: Unexpected spec policy %s for key %s ' +
-            //     'when mixing in component specs.',
-            //   specPolicy,
-            //   name
-            // );
-
-            // For methods which are defined more than once, call the existing
-            // methods before calling the new property, merging if appropriate.
-            if (specPolicy === 'DEFINE_MANY_MERGED') {
-              proto[name] = createMergedResultFunction(proto[name], property);
-            } else if (specPolicy === 'DEFINE_MANY') {
-              proto[name] = createChainedFunction(proto[name], property);
-            }
-          } else {
-            proto[name] = property;
-            // if (process.env.NODE_ENV !== 'production') {
-            //   // Add verbose displayName to the function, which helps when looking
-            //   // at profiling tools.
-            //   if (typeof property === 'function' && spec.displayName) {
-            //     proto[name].displayName = spec.displayName + '_' + name;
-            //   }
-            // }
-          }
-        }
-      }
-    }
-  }
-
-  function mixStaticSpecIntoComponent(Constructor, statics) {
-    if (!statics) {
-      return;
-    }
-    for (var name in statics) {
-      var property = statics[name];
-      if (!statics.hasOwnProperty(name)) {
-        continue;
-      }
-
-      var isReserved = name in RESERVED_SPEC_KEYS;
-      // _invariant(
-      //   !isReserved,
-      //   'ReactClass: You are attempting to define a reserved ' +
-      //     'property, \`%s\`, that shouldn\\'t be on the "statics" key. Define it ' +
-      //     'as an instance property instead; it will still be accessible on the ' +
-      //     'constructor.',
-      //   name
-      // );
-
-      var isInherited = name in Constructor;
-      // _invariant(
-      //   !isInherited,
-      //   'ReactClass: You are attempting to define ' +
-      //     '\`%s\` on your component more than once. This conflict may be ' +
-      //     'due to a mixin.',
-      //   name
-      // );
-      Constructor[name] = property;
-    }
-  }
-
-  /**
-   * Merge two objects, but throw if both contain the same key.
-   *
-   * @param {object} one The first object, which is mutated.
-   * @param {object} two The second object
-   * @return {object} one after it has been mutated to contain everything in two.
-   */
-  function mergeIntoWithNoDuplicateKeys(one, two) {
-    // _invariant(
-    //   one && two && typeof one === 'object' && typeof two === 'object',
-    //   'mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.'
-    // );
-
-    for (var key in two) {
-      if (two.hasOwnProperty(key)) {
-        // _invariant(
-        //   one[key] === undefined,
-        //   'mergeIntoWithNoDuplicateKeys(): ' +
-        //     'Tried to merge two objects with the same key: \`%s\`. This conflict ' +
-        //     'may be due to a mixin; in particular, this may be caused by two ' +
-        //     'getInitialState() or getDefaultProps() methods returning objects ' +
-        //     'with clashing keys.',
-        //   key
-        // );
-        one[key] = two[key];
-      }
-    }
-    return one;
-  }
-
-  /**
-   * Creates a function that invokes two functions and merges their return values.
-   *
-   * @param {function} one Function to invoke first.
-   * @param {function} two Function to invoke second.
-   * @return {function} Function that invokes the two argument functions.
-   * @private
-   */
-  function createMergedResultFunction(one, two) {
-    return function mergedResult() {
-      var a = one.apply(this, arguments);
-      var b = two.apply(this, arguments);
-      if (a == null) {
-        return b;
-      } else if (b == null) {
-        return a;
-      }
-      var c = {};
-      mergeIntoWithNoDuplicateKeys(c, a);
-      mergeIntoWithNoDuplicateKeys(c, b);
-      return c;
-    };
-  }
-
-  /**
-   * Creates a function that invokes two functions and ignores their return vales.
-   *
-   * @param {function} one Function to invoke first.
-   * @param {function} two Function to invoke second.
-   * @return {function} Function that invokes the two argument functions.
-   * @private
-   */
-  function createChainedFunction(one, two) {
-    return function chainedFunction() {
-      one.apply(this, arguments);
-      two.apply(this, arguments);
-    };
-  }
-
-  /**
-   * Binds a method to the component.
-   *
-   * @param {object} component Component whose method is going to be bound.
-   * @param {function} method Method to be bound.
-   * @return {function} The bound method.
-   */
-  function bindAutoBindMethod(component, method) {
-    var boundMethod = method.bind(component);
-    // if (process.env.NODE_ENV !== 'production') {
-    //   boundMethod.__reactBoundContext = component;
-    //   boundMethod.__reactBoundMethod = method;
-    //   boundMethod.__reactBoundArguments = null;
-    //   var componentName = component.constructor.displayName;
-    //   var _bind = boundMethod.bind;
-    //   boundMethod.bind = function(newThis) {
-    //     for (
-    //       var _len = arguments.length,
-    //         args = Array(_len > 1 ? _len - 1 : 0),
-    //         _key = 1;
-    //       _key < _len;
-    //       _key++
-    //     ) {
-    //       args[_key - 1] = arguments[_key];
-    //     }
-    //
-    //     // User is trying to bind() an autobound method; we effectively will
-    //     // ignore the value of "this" that the user is trying to use, so
-    //     // let's warn.
-    //     if (newThis !== component && newThis !== null) {
-    //       if (process.env.NODE_ENV !== 'production') {
-    //         warning(
-    //           false,
-    //           'bind(): React component methods may only be bound to the ' +
-    //             'component instance. See %s',
-    //           componentName
-    //         );
-    //       }
-    //     } else if (!args.length) {
-    //       if (process.env.NODE_ENV !== 'production') {
-    //         warning(
-    //           false,
-    //           'bind(): You are binding a component method to the component. ' +
-    //             'React does this for you automatically in a high-performance ' +
-    //             'way, so you can safely remove this call. See %s',
-    //           componentName
-    //         );
-    //       }
-    //       return boundMethod;
-    //     }
-    //     var reboundMethod = _bind.apply(boundMethod, arguments);
-    //     reboundMethod.__reactBoundContext = component;
-    //     reboundMethod.__reactBoundMethod = method;
-    //     reboundMethod.__reactBoundArguments = args;
-    //     return reboundMethod;
-    //   };
-    // }
-    return boundMethod;
-  }
-
-  /**
-   * Binds all auto-bound methods in a component.
-   *
-   * @param {object} component Component whose method is going to be bound.
-   */
-  function bindAutoBindMethods(component) {
-    var pairs = component.__reactAutoBindPairs;
-    for (var i = 0; i < pairs.length; i += 2) {
-      var autoBindKey = pairs[i];
-      var method = pairs[i + 1];
-      component[autoBindKey] = bindAutoBindMethod(component, method);
-    }
-  }
-
-  var IsMountedPreMixin = {
-    componentDidMount: function() {
-      this.__isMounted = true;
-    }
-  };
-
-  var IsMountedPostMixin = {
-    componentWillUnmount: function() {
-      this.__isMounted = false;
-    }
-  };
-
-  /**
-   * Add more to the ReactClass base class. These are all legacy features and
-   * therefore not already part of the modern ReactComponent.
-   */
-  var ReactClassMixin = {
-    /**
-     * TODO: This will be deprecated because state should always keep a consistent
-     * type signature and the only use case for this, is to avoid that.
-     */
-    replaceState: function(newState, callback) {
-      this.updater.enqueueReplaceState(this, newState, callback);
-    },
-
-    /**
-     * Checks whether or not this composite component is mounted.
-     * @return {boolean} True if mounted, false otherwise.
-     * @protected
-     * @final
-     */
-    isMounted: function() {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   warning(
-      //     this.__didWarnIsMounted,
-      //     '%s: isMounted is deprecated. Instead, make sure to clean up ' +
-      //       'subscriptions and pending requests in componentWillUnmount to ' +
-      //       'prevent memory leaks.',
-      //     (this.constructor && this.constructor.displayName) ||
-      //       this.name ||
-      //       'Component'
-      //   );
-      //   this.__didWarnIsMounted = true;
-      // }
-      return !!this.__isMounted;
-    }
-  };
-
-  var ReactClassComponent = function() {};
-  _assign(
-    ReactClassComponent.prototype,
-    ReactComponent.prototype,
-    ReactClassMixin
-  );
-
-  /**
-   * Creates a composite component class given a class specification.
-   * See https://facebook.github.io/react/docs/top-level-api.html#react.createclass
-   *
-   * @param {object} spec Class specification (which must define \`render\`).
-   * @return {function} Component constructor function.
-   * @public
-   */
-  function createClass(spec) {
-    // To keep our warnings more understandable, we'll use a little hack here to
-    // ensure that Constructor.name !== 'Constructor'. This makes sure we don't
-    // unnecessarily identify a class without displayName as 'Constructor'.
-    var Constructor = identity(function(props, context, updater) {
-      // This constructor gets overridden by mocks. The argument is used
-      // by mocks to assert on what gets mounted.
-
-      // if (process.env.NODE_ENV !== 'production') {
-      //   warning(
-      //     this instanceof Constructor,
-      //     'Something is calling a React component directly. Use a factory or ' +
-      //       'JSX instead. See: https://fb.me/react-legacyfactory'
-      //   );
-      // }
-
-      // Wire up auto-binding
-      if (this.__reactAutoBindPairs.length) {
-        bindAutoBindMethods(this);
-      }
-
-      this.props = props;
-      this.context = context;
-      this.refs = emptyObject;
-      this.updater = updater || ReactNoopUpdateQueue;
-
-      this.state = null;
-
-      // ReactClasses doesn't have constructors. Instead, they use the
-      // getInitialState and componentWillMount methods for initialization.
-
-      var initialState = this.getInitialState ? this.getInitialState() : null;
-      // if (process.env.NODE_ENV !== 'production') {
-      //   // We allow auto-mocks to proceed as if they're returning null.
-      //   if (
-      //     initialState === undefined &&
-      //     this.getInitialState._isMockFunction
-      //   ) {
-      //     // This is probably bad practice. Consider warning here and
-      //     // deprecating this convenience.
-      //     initialState = null;
-      //   }
-      // }
-      // _invariant(
-      //   typeof initialState === 'object' && !Array.isArray(initialState),
-      //   '%s.getInitialState(): must return an object or null',
-      //   Constructor.displayName || 'ReactCompositeComponent'
-      // );
-
-      this.state = initialState;
-    });
-    Constructor.prototype = new ReactClassComponent();
-    Constructor.prototype.constructor = Constructor;
-    Constructor.prototype.__reactAutoBindPairs = [];
-
-    injectedMixins.forEach(mixSpecIntoComponent.bind(null, Constructor));
-
-    mixSpecIntoComponent(Constructor, IsMountedPreMixin);
-    mixSpecIntoComponent(Constructor, spec);
-    mixSpecIntoComponent(Constructor, IsMountedPostMixin);
-
-    // Initialize the defaultProps property after all mixins have been merged.
-    if (Constructor.getDefaultProps) {
-      Constructor.defaultProps = Constructor.getDefaultProps();
-    }
-
-    // if (process.env.NODE_ENV !== 'production') {
-    //   // This is a tag to indicate that the use of these method names is ok,
-    //   // since it's used with createClass. If it's not, then it's likely a
-    //   // mistake so we'll warn you to use the static property, property
-    //   // initializer or constructor respectively.
-    //   if (Constructor.getDefaultProps) {
-    //     Constructor.getDefaultProps.isReactClassApproved = {};
-    //   }
-    //   if (Constructor.prototype.getInitialState) {
-    //     Constructor.prototype.getInitialState.isReactClassApproved = {};
-    //   }
-    // }
-
-    // _invariant(
-    //   Constructor.prototype.render,
-    //   'createClass(...): Class specification must implement a \`render\` method.'
-    // );
-
-    // if (process.env.NODE_ENV !== 'production') {
-    //   warning(
-    //     !Constructor.prototype.componentShouldUpdate,
-    //     '%s has a method called ' +
-    //       'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
-    //       'The name is phrased as a question because the function is ' +
-    //       'expected to return a value.',
-    //     spec.displayName || 'A component'
-    //   );
-    //   warning(
-    //     !Constructor.prototype.componentWillRecieveProps,
-    //     '%s has a method called ' +
-    //       'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
-    //     spec.displayName || 'A component'
-    //   );
-    // }
-
-    // Reduce time spent doing lookups by setting these on the prototype.
-    for (var methodName in ReactClassInterface) {
-      if (!Constructor.prototype[methodName]) {
-        Constructor.prototype[methodName] = null;
-      }
-    }
-
-    return Constructor;
-  }
-
-  return createClass;
-}
-`)
-
-@module("react") external reactComponent: 'a = "Component"
-
-@module("react") external reactIsValidElement: bool = "isValidElement"
-
-@module("react") @new external newReactComponent: unit => {"updater": 'a} = "Component"
-
-let reactNoopUpdateQueue = newReactComponent()["updater"]
-
-let createClass = factory(. reactComponent, reactIsValidElement, reactNoopUpdateQueue)
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactRouter.res b/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactRouter.res
deleted file mode 100644
index a6784e7..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactRouter.res
+++ /dev/null
@@ -1,183 +0,0 @@
-@get external location: Dom.window => Dom.location = "location"
-
-@send
-external /* actually the cb is Dom.event => unit, but let's restrict the access for now */
-addEventListener: (Dom.window, string, unit => unit) => unit = "addEventListener"
-
-@send
-external removeEventListener: (Dom.window, string, unit => unit) => unit = "removeEventListener"
-
-@send
-external dispatchEvent: (Dom.window, Dom.event) => unit = "dispatchEvent"
-
-@get external pathname: Dom.location => string = "pathname"
-
-@get external hash: Dom.location => string = "hash"
-
-@get external search: Dom.location => string = "search"
-
-@send
-external pushState: (Dom.history, @as(json`null`) _, @as("") _, ~href: string) => unit = "pushState"
-
-@send
-external replaceState: (Dom.history, @as(json`null`) _, @as("") _, ~href: string) => unit =
-  "replaceState"
-
-@val external event: 'a = "Event"
-
-@new external makeEventIE11Compatible: string => Dom.event = "Event"
-
-@val @scope("document")
-external createEventNonIEBrowsers: string => Dom.event = "createEvent"
-
-@send
-external initEventNonIEBrowsers: (Dom.event, string, bool, bool) => unit = "initEvent"
-
-let safeMakeEvent = eventName =>
-  if Js.typeof(event) == "function" {
-    makeEventIE11Compatible(eventName)
-  } else {
-    let event = createEventNonIEBrowsers("Event")
-    initEventNonIEBrowsers(event, eventName, true, true)
-    event
-  }
-
-/* This is copied from array.ml. We want to cut dependencies for ReasonReact so
- that it's friendlier to use in size-constrained codebases */
-let arrayToList = a => {
-  let rec tolist = (i, res) =>
-    if i < 0 {
-      res
-    } else {
-      tolist(i - 1, list{Array.unsafe_get(a, i), ...res})
-    }
-  tolist(Array.length(a) - 1, list{})
-}
-/* if we ever roll our own parser in the future, make sure you test all url combinations
-    e.g. foo.com/?#bar
- */
-/* sigh URLSearchParams doesn't work on IE11, edge16, etc. */
-/* actually you know what, not gonna provide search for now. It's a mess.
- We'll let users roll their own solution/data structure for now */
-let path = () =>
-  switch %external(window) {
-  | None => list{}
-  | Some(window: Dom.window) =>
-    switch window |> location |> pathname {
-    | ""
-    | "/" => list{}
-    | raw =>
-      /* remove the preceeding /, which every pathname seems to have */
-      let raw = Js.String.sliceToEnd(~from=1, raw)
-      /* remove the trailing /, which some pathnames might have. Ugh */
-      let raw = switch Js.String.get(raw, Js.String.length(raw) - 1) {
-      | "/" => Js.String.slice(~from=0, ~to_=-1, raw)
-      | _ => raw
-      }
-      raw |> Js.String.split("/") |> arrayToList
-    }
-  }
-let hash = () =>
-  switch %external(window) {
-  | None => ""
-  | Some(window: Dom.window) =>
-    switch window |> location |> hash {
-    | ""
-    | "#" => ""
-    | raw =>
-      /* remove the preceeding #, which every hash seems to have.
-       Why is this even included in location.hash?? */
-      raw |> Js.String.sliceToEnd(~from=1)
-    }
-  }
-let search = () =>
-  switch %external(window) {
-  | None => ""
-  | Some(window: Dom.window) =>
-    switch window |> location |> search {
-    | ""
-    | "?" => ""
-    | raw =>
-      /* remove the preceeding ?, which every search seems to have. */
-      raw |> Js.String.sliceToEnd(~from=1)
-    }
-  }
-let push = path =>
-  switch (%external(history), %external(window)) {
-  | (None, _)
-  | (_, None) => ()
-  | (Some(history: Dom.history), Some(window: Dom.window)) =>
-    pushState(history, ~href=path)
-    dispatchEvent(window, safeMakeEvent("popstate"))
-  }
-let replace = path =>
-  switch (%external(history), %external(window)) {
-  | (None, _)
-  | (_, None) => ()
-  | (Some(history: Dom.history), Some(window: Dom.window)) =>
-    replaceState(history, ~href=path)
-    dispatchEvent(window, safeMakeEvent("popstate"))
-  }
-type url = {
-  path: list<string>,
-  hash: string,
-  search: string,
-}
-let urlNotEqual = (a, b) => {
-  let rec listNotEqual = (aList, bList) =>
-    switch (aList, bList) {
-    | (list{}, list{}) => false
-    | (list{}, list{_, ..._})
-    | (list{_, ..._}, list{}) => true
-    | (list{aHead, ...aRest}, list{bHead, ...bRest}) =>
-      if aHead !== bHead {
-        true
-      } else {
-        listNotEqual(aRest, bRest)
-      }
-    }
-  a.hash !== b.hash || (a.search !== b.search || listNotEqual(a.path, b.path))
-}
-type watcherID = unit => unit
-let url = () => {path: path(), hash: hash(), search: search()}
-/* alias exposed publicly */
-let dangerouslyGetInitialUrl = url
-let watchUrl = callback =>
-  switch %external(window) {
-  | None => () => ()
-  | Some(window: Dom.window) =>
-    let watcherID = () => callback(url())
-    addEventListener(window, "popstate", watcherID)
-    watcherID
-  }
-let unwatchUrl = watcherID =>
-  switch %external(window) {
-  | None => ()
-  | Some(window: Dom.window) => removeEventListener(window, "popstate", watcherID)
-  }
-
-let useUrl = (~serverUrl=?, ()) => {
-  let (url, setUrl) = React.useState(() =>
-    switch serverUrl {
-    | Some(url) => url
-    | None => dangerouslyGetInitialUrl()
-    }
-  )
-
-  React.useEffect0(() => {
-    let watcherId = watchUrl(url => setUrl(_ => url))
-
-    @ocaml.doc("
-      * check for updates that may have occured between
-      * the initial state and the subscribe above
-      ")
-    let newUrl = dangerouslyGetInitialUrl()
-    if urlNotEqual(newUrl, url) {
-      setUrl(_ => newUrl)
-    }
-
-    Some(() => unwatchUrl(watcherId))
-  })
-
-  url
-}
diff --git a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactRouter.resi b/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactRouter.resi
deleted file mode 100644
index 84800e0..0000000
--- a/jscomp/syntax/tests/idempotency/reason-react/src/ReasonReactRouter.resi
+++ /dev/null
@@ -1,39 +0,0 @@
-@ocaml.doc(
-  " update the url with the string path. Example: `push(\"/book/1\")`, `push(\"/books#title\")` "
-)
-let push: string => unit
-@ocaml.doc(
-  " update the url with the string path. modifies the current history entry instead of creating a new one. Example: `replace(\"/book/1\")`, `replace(\"/books#title\")` "
-)
-let replace: string => unit
-type watcherID
-type url = {
-  /* path takes window.location.path, like "/book/title/edit" and turns it into `["book", "title", "edit"]` */
-  path: list<string>,
-  /* the url's hash, if any. The # symbol is stripped out for you */
-  hash: string,
-  /* the url's query params, if any. The ? symbol is stripped out for you */
-  search: string,
-}
-@ocaml.doc(
-  " start watching for URL changes. Returns a subscription token. Upon url change, calls the callback and passes it the url record "
-)
-let watchUrl: (url => unit) => watcherID
-@ocaml.doc(" stop watching for URL changes ")
-let unwatchUrl: watcherID => unit
-@ocaml.doc(" this is marked as \"dangerous\" because you technically shouldn't be accessing the URL outside of watchUrl's callback;
-      you'd read a potentially stale url, instead of the fresh one inside watchUrl.
-
-      But this helper is sometimes needed, if you'd like to initialize a page whose display/state depends on the URL,
-      instead of reading from it in watchUrl's callback, which you'd probably have put inside didMount (aka too late,
-      the page's already rendered).
-
-      So, the correct (and idiomatic) usage of this helper is to only use it in a component that's also subscribed to
-      watchUrl. Please see https://github.com/reasonml-community/reason-react-example/blob/master/src/todomvc/TodoItem.re
-      for an example.
-      ")
-let dangerouslyGetInitialUrl: unit => url
-@ocaml.doc(" hook for watching url changes.
- * serverUrl is used for ssr. it allows you to specify the url without relying on browser apis existing/working as expected
- ")
-let useUrl: (~serverUrl: url=?, unit) => url
diff --git a/jscomp/syntax/tests/idempotency/reasongl/RGLConstants.res b/jscomp/syntax/tests/idempotency/reasongl/RGLConstants.res
deleted file mode 100644
index 6b8dcfc..0000000
--- a/jscomp/syntax/tests/idempotency/reasongl/RGLConstants.res
+++ /dev/null
@@ -1,187 +0,0 @@
-let triangles = 4
-
-let triangle_strip = 5
-
-let texture0 = 33984
-
-let texture1 = 33985
-
-let texture2 = 33986
-
-let texture_2d = 3553
-
-let blend = 3042
-
-let texture_wrap_s = 10242
-
-let texture_wrap_t = 10243
-
-let clamp_to_edge = 33071
-
-let src_alpha = 770
-
-let one_minus_src_alpha = 771
-
-let dst_alpha = 772
-
-let depth_test = 2929
-
-let cull_face = 2884
-
-let rgb = 6407
-
-let rgba = 6408
-
-let triangle_fan = 6
-
-let array_buffer = 34962
-
-let element_array_buffer = 34963
-
-let array_buffer_binding = 34964
-
-let element_array_buffer_binding = 34965
-
-let stream_draw = 35040
-
-let static_draw = 35044
-
-let dynamic_draw = 35048
-
-let buffer_size = 34660
-
-let buffer_usage = 34661
-
-let float_ = 5126
-
-let unsigned_int = 5125
-
-let current_vertex_attrib = 34342
-
-let fragment_shader = 35632
-
-let vertex_shader = 35633
-
-let max_vertex_attribs = 34921
-
-let max_vertex_uniform_vectors = 36347
-
-let max_varying_vectors = 36348
-
-let max_combined_texture_image_units = 35661
-
-let max_vertex_texture_image_units = 35660
-
-let max_texture_image_units = 34930
-
-let max_fragment_uniform_vectors = 36349
-
-let shader_type = 35663
-
-let delete_status = 35712
-
-let link_status = 35714
-
-let validate_status = 35715
-
-let attached_shaders = 35717
-
-let active_uniforms = 35718
-
-let active_attributes = 35721
-
-let shading_language_version = 35724
-
-let current_program = 35725
-
-let compile_status = 35713
-
-let vendor = 7936
-
-let renderer = 7937
-
-let version = 7938
-
-let float_vec2 = 35664
-
-let float_vec3 = 35665
-
-let float_vec4 = 35666
-
-let int_vec2 = 35667
-
-let int_vec3 = 35668
-
-let int_vec4 = 35669
-
-let bool_ = 35670
-
-let bool_vec2 = 35671
-
-let bool_vec3 = 35672
-
-let bool_vec4 = 35673
-
-let float_mat2 = 35674
-
-let float_mat3 = 35675
-
-let float_mat4 = 35676
-
-let sampler_2d = 35678
-
-let sampler_cube = 35680
-
-let unpack_flip_y_webgl = 37440
-
-let unpack_premultiply_alpha_webgl = 37441
-
-let context_lost_webgl = 37442
-
-let unpack_colorspace_conversion_webgl = 37443
-
-let browser_default_webgl = 37444
-
-let vertex_attrib_array_enabled = 34338
-
-let vertex_attrib_array_size = 34339
-
-let vertex_attrib_array_stride = 34340
-
-let vertex_attrib_array_type = 34341
-
-let vertex_attrib_array_normalized = 34922
-
-let vertex_attrib_array_pointer = 34373
-
-let vertex_attrib_array_buffer_binding = 34975
-
-let depth_buffer_bit = 256
-
-let stencil_buffer_bit = 1024
-
-let color_buffer_bit = 16384
-
-let unsigned_short = 5123
-
-let unsigned_byte = 5121
-
-let texture_mag_filter = 10240
-
-let texture_min_filter = 10241
-
-let nearest = 9728
-
-let linear = 9729
-
-let nearest_mipmap_nearest = 9984
-
-let linear_mipmap_nearest = 9985
-
-let nearest_mipmap_linear = 9986
-
-let linear_mipmap_linear = 9987
-
-let framebuffer = 36160
-
-let color_attachment0 = 36064
diff --git a/jscomp/syntax/tests/idempotency/reasongl/RGLEvents.res b/jscomp/syntax/tests/idempotency/reasongl/RGLEvents.res
deleted file mode 100644
index f091acd..0000000
--- a/jscomp/syntax/tests/idempotency/reasongl/RGLEvents.res
+++ /dev/null
@@ -1,78 +0,0 @@
-module type t = {
-  type buttonStateT =
-    | LeftButton
-    | MiddleButton
-    | RightButton
-  type stateT =
-    | MouseDown
-    | MouseUp
-  type keycodeT =
-    | Backspace
-    | Delete
-    | Tab
-    | Enter
-    | Escape
-    | Space
-    | Quote
-    | Comma
-    | Minus
-    | Period
-    | Slash
-    | Num_0
-    | Num_1
-    | Num_2
-    | Num_3
-    | Num_4
-    | Num_5
-    | Num_6
-    | Num_7
-    | Num_8
-    | Num_9
-    | Semicolon
-    | Equals
-    | OpenBracket
-    | Backslash
-    | CloseBracket
-    | A
-    | B
-    | C
-    | D
-    | E
-    | F
-    | G
-    | H
-    | I
-    | J
-    | K
-    | L
-    | M
-    | N
-    | O
-    | P
-    | Q
-    | R
-    | S
-    | T
-    | U
-    | V
-    | W
-    | X
-    | Y
-    | Z
-    | Right
-    | Left
-    | Down
-    | Up
-    | LeftCtrl
-    | LeftShift
-    | LeftAlt
-    | LeftOsKey
-    | RightCtrl
-    | RightShift
-    | RightAlt
-    | RightOsKey
-    | CapsLock
-    | Backtick
-    | Nothing
-  let keycodeMap: Int32.t => keycodeT
-}
diff --git a/jscomp/syntax/tests/idempotency/reasongl/RGLInterface.res b/jscomp/syntax/tests/idempotency/reasongl/RGLInterface.res
deleted file mode 100644
index 0ea5971..0000000
--- a/jscomp/syntax/tests/idempotency/reasongl/RGLInterface.res
+++ /dev/null
@@ -1,260 +0,0 @@
-module type t = {
-  let target: string
-  type contextT
-  module type FileT = {
-    type t
-    let readFile: (~filename: string, ~cb: string => unit) => unit
-  }
-  module File: FileT
-  module type WindowT = {
-    type t
-    let getWidth: t => int
-    let getHeight: t => int
-    let getPixelWidth: t => int
-    let getPixelHeight: t => int
-    let getPixelScale: t => float
-    let init: (~screen: string=?, ~argv: array<string>) => t
-    let setWindowSize: (~window: t, ~width: int, ~height: int) => unit
-    let setWindowTitle: (~window: t, ~title: string) => unit
-    let getContext: t => contextT
-  }
-  module Window: WindowT
-  module type AudioT = {
-    type t
-    let loadSound: (Window.t, string, t => unit) => unit
-    let playSound: (Window.t, t, ~volume: float, ~loop: bool) => unit
-  }
-  module Audio: AudioT
-  module Events: RGLEvents.t
-
-  /* ** We're currently mimicking the JS asynchronous event handling allowing the user to register callbacks.
-   * Instead of mutating global state in the Events module, we simply force the user to register all events
-   * handlers at once, allowing us to use the closure to keep track of the data for us.
-   * For native, the easiest way to handle events is in the render loop, so we force the user to also
-   * register the draw call `displayFunc` which will effectively do all of the rendering.
-   */
-  let render: (
-    ~window: Window.t,
-    ~mouseDown: (~button: Events.buttonStateT, ~state: Events.stateT, ~x: int, ~y: int) => unit=?,
-    ~mouseUp: (~button: Events.buttonStateT, ~state: Events.stateT, ~x: int, ~y: int) => unit=?,
-    ~mouseMove: (~x: int, ~y: int) => unit=?,
-    ~keyDown: (~keycode: Events.keycodeT, ~repeat: bool) => unit=?,
-    ~keyUp: (~keycode: Events.keycodeT) => unit=?,
-    ~windowResize: unit => unit=?,
-    ~displayFunc: float => unit,
-    unit,
-    bool,
-  ) => bool
-  type programT
-  type shaderT
-  let clearColor: (~context: contextT, ~r: float, ~g: float, ~b: float, ~a: float) => unit
-  let createProgram: (~context: contextT) => programT
-  let createShader: (~context: contextT, int) => shaderT
-  let attachShader: (~context: contextT, ~program: programT, ~shader: shaderT) => unit
-  let deleteShader: (~context: contextT, shaderT) => unit
-  let shaderSource: (~context: contextT, ~shader: shaderT, ~source: string) => unit
-  let compileShader: (~context: contextT, shaderT) => unit
-  let linkProgram: (~context: contextT, programT) => unit
-  let useProgram: (~context: contextT, programT) => unit
-  type bufferT
-  type attributeT
-  type uniformT
-  let createBuffer: (~context: contextT) => bufferT
-  let bindBuffer: (~context: contextT, ~target: int, ~buffer: bufferT) => unit
-  type textureT
-  let createTexture: (~context: contextT) => textureT
-  let activeTexture: (~context: contextT, int) => unit
-  let bindTexture: (~context: contextT, ~target: int, ~texture: textureT) => unit
-  let texParameteri: (~context: contextT, ~target: int, ~pname: int, ~param: int) => unit
-  type framebufferT
-  let createFramebuffer: (~context: contextT) => framebufferT
-  let bindFramebuffer: (~context: contextT, ~target: int, ~framebuffer: framebufferT) => unit
-  let bindDefaultFramebuffer: (~context: contextT, ~target: int) => unit
-  let framebufferTexture2D: (
-    ~context: contextT,
-    ~target: int,
-    ~attachment: int,
-    ~texTarget: int,
-    ~texture: textureT,
-  ) => unit
-  /* let drawBuffers : (~context : contextT, ~target: int) => unit; */
-  /* type rawTextureDataT;
-   let toTextureData: array int => rawTextureDataT; */
-  let enable: (~context: contextT, int) => unit
-  let disable: (~context: contextT, int) => unit
-  let blendFunc: (~context: contextT, int, int) => unit
-  module type Bigarray = {
-    type t<'a, 'b>
-    type float64_elt
-    type float32_elt
-    type int16_unsigned_elt
-    type int16_signed_elt
-    type int8_unsigned_elt
-    type int8_signed_elt
-    type int_elt
-    type int32_elt
-    type int64_elt
-    type rec kind<'a, 'b> =
-      | Float64: kind<float, float64_elt>
-      | Float32: kind<float, float32_elt>
-      | Int16: kind<int, int16_signed_elt>
-      | Uint16: kind<int, int16_unsigned_elt>
-      | Int8: kind<int, int8_signed_elt>
-      | Uint8: kind<int, int8_unsigned_elt>
-      | Char: kind<char, int8_unsigned_elt>
-      | Int: kind<int, int_elt>
-      | Int64: kind<int64, int64_elt>
-      | Int32: kind<int32, int32_elt>
-    let create: (kind<'a, 'b>, int) => t<'a, 'b>
-    let of_array: (kind<'a, 'b>, array<'a>) => t<'a, 'b>
-    let dim: t<'a, 'b> => int
-    let blit: (t<'a, 'b>, t<'a, 'b>) => unit
-    let unsafe_blit: (t<'a, 'b>, t<'a, 'b>, ~offset: int, ~numOfBytes: int) => unit
-    let get: (t<'a, 'b>, int) => 'a
-    let unsafe_get: (t<'a, 'b>, int) => 'a
-    let set: (t<'a, 'b>, int, 'a) => unit
-    let unsafe_set: (t<'a, 'b>, int, 'a) => unit
-    let sub: (t<'a, 'b>, ~offset: int, ~len: int) => t<'a, 'b>
-  }
-  module Bigarray: Bigarray
-  let texSubImage2D: (
-    ~context: contextT,
-    ~target: int,
-    ~level: int,
-    ~xoffset: int,
-    ~yoffset: int,
-    ~width: int,
-    ~height: int,
-    ~format: int,
-    ~type_: int,
-    ~pixels: Bigarray.t<'a, 'b>,
-  ) => unit
-  let readPixels_RGBA: (
-    ~context: contextT,
-    ~x: int,
-    ~y: int,
-    ~width: int,
-    ~height: int,
-  ) => Bigarray.t<int, Bigarray.int8_unsigned_elt>
-  type imageT
-  let getImageWidth: imageT => int
-  let getImageHeight: imageT => int
-  type loadOptionT =
-    | LoadAuto
-    | LoadL
-    | LoadLA
-    | LoadRGB
-    | LoadRGBA
-  let loadImage: (
-    ~filename: string,
-    ~loadOption: loadOptionT=?,
-    ~callback: option<imageT> => unit,
-    unit,
-  ) => unit
-  let loadImageFromMemory: (
-    ~data: string,
-    ~loadOption: loadOptionT=?,
-    ~callback: option<imageT> => unit,
-    unit,
-  ) => unit
-  let texImage2DWithImage: (~context: contextT, ~target: int, ~level: int, ~image: imageT) => unit
-  let uniform1i: (~context: contextT, ~location: uniformT, ~value: int) => unit
-  let uniform1f: (~context: contextT, ~location: uniformT, ~value: float) => unit
-  let uniform2f: (~context: contextT, ~location: uniformT, ~v1: float, ~v2: float) => unit
-  let uniform3f: (
-    ~context: contextT,
-    ~location: uniformT,
-    ~v1: float,
-    ~v2: float,
-    ~v3: float,
-  ) => unit
-  let uniform4f: (
-    ~context: contextT,
-    ~location: uniformT,
-    ~v1: float,
-    ~v2: float,
-    ~v3: float,
-    ~v4: float,
-  ) => unit
-  let texImage2D_RGBA: (
-    ~context: contextT,
-    ~target: int,
-    ~level: int,
-    ~width: int,
-    ~height: int,
-    ~border: int,
-    ~data: Bigarray.t<'a, 'b>,
-  ) => unit
-  let texImage2D_null: (
-    ~context: contextT,
-    ~target: int,
-    ~level: int,
-    ~width: int,
-    ~height: int,
-  ) => unit
-  let bufferData: (~context: contextT, ~target: int, ~data: Bigarray.t<'a, 'b>, ~usage: int) => unit
-  let viewport: (~context: contextT, ~x: int, ~y: int, ~width: int, ~height: int) => unit
-  let clear: (~context: contextT, ~mask: int) => unit
-  let getUniformLocation: (~context: contextT, ~program: programT, ~name: string) => uniformT
-  let getAttribLocation: (~context: contextT, ~program: programT, ~name: string) => attributeT
-  let enableVertexAttribArray: (~context: contextT, ~attribute: attributeT) => unit
-  let vertexAttribPointer: (
-    ~context: contextT,
-    ~attribute: attributeT,
-    ~size: int,
-    ~type_: int,
-    ~normalize: bool,
-    ~stride: int,
-    ~offset: int,
-  ) => unit
-  let vertexAttribDivisor: (~context: contextT, ~attribute: attributeT, ~divisor: int) => unit
-  module type Mat4T = {
-    type t
-    let to_array: t => array<float>
-    let create: unit => t
-    let identity: (~out: t) => unit
-    let translate: (~out: t, ~matrix: t, ~vec: array<float>) => unit
-    let scale: (~out: t, ~matrix: t, ~vec: array<float>) => unit
-    let rotate: (~out: t, ~matrix: t, ~rad: float, ~vec: array<float>) => unit
-    let ortho: (
-      ~out: t,
-      ~left: float,
-      ~right: float,
-      ~bottom: float,
-      ~top: float,
-      ~near: float,
-      ~far: float,
-    ) => unit
-    let perspective: (~out: t, ~fovy: float, ~aspect: float, ~near: float, ~far: float) => unit
-    let lookAt: (~out: t, ~eye: array<float>, ~center: array<float>, ~up: array<float>) => unit
-  }
-  module Mat4: Mat4T
-  let uniformMatrix4fv: (~context: contextT, ~location: uniformT, ~value: Mat4.t) => unit
-  type shaderParamsT =
-    | Shader_delete_status
-    | Compile_status
-    | Shader_type
-  type programParamsT =
-    | Program_delete_status
-    | Link_status
-    | Validate_status
-  let getProgramParameter: (
-    ~context: contextT,
-    ~program: programT,
-    ~paramName: programParamsT,
-  ) => int
-  let getShaderParameter: (~context: contextT, ~shader: shaderT, ~paramName: shaderParamsT) => int
-  let getShaderInfoLog: (~context: contextT, shaderT) => string
-  let getProgramInfoLog: (~context: contextT, programT) => string
-  let getShaderSource: (~context: contextT, shaderT) => string
-  let drawArrays: (~context: contextT, ~mode: int, ~first: int, ~count: int) => unit
-  let drawElements: (~context: contextT, ~mode: int, ~count: int, ~type_: int, ~offset: int) => unit
-  let drawElementsInstanced: (
-    ~context: contextT,
-    ~mode: int,
-    ~count: int,
-    ~type_: int,
-    ~indices: int,
-    ~primcount: int,
-  ) => unit
-}
diff --git a/jscomp/syntax/tests/idempotency/reasongl/ReasonglInterface.res b/jscomp/syntax/tests/idempotency/reasongl/ReasonglInterface.res
deleted file mode 100644
index 08e9b7a..0000000
--- a/jscomp/syntax/tests/idempotency/reasongl/ReasonglInterface.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module Gl = RGLInterface
-
-module Constants = RGLConstants
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/bindings/Next.res b/jscomp/syntax/tests/idempotency/reasonml.org/bindings/Next.res
deleted file mode 100644
index caf5f45..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/bindings/Next.res
+++ /dev/null
@@ -1,65 +0,0 @@
-type getInitialPropsFn<'a> = {"query": Js.Dict.t<string>, "req": Js.Nullable.t<'a>} => Js.Promise.t<
-  'a,
->
-
-module Link = {
-  @module("next/link") @react.component
-  external make: (
-    ~href: string=?,
-    ~_as: string=?,
-    ~prefetch: bool=?,
-    ~replace: option<bool>=?,
-    ~shallow: option<bool>=?,
-    ~passHref: option<bool>=?,
-    ~children: React.element,
-  ) => React.element = "default"
-}
-
-module Router = {
-  /*
-      Make sure to only register events via a useEffect hook!
- */
-  module Events = {
-    type t
-
-    @send
-    external on: (
-      t,
-      @string
-      [
-        | #routeChangeStart(string => unit)
-        | #routeChangeComplete(string => unit)
-        | #hashChangeComplete(string => unit)
-      ],
-    ) => unit = "on"
-
-    @send
-    external off: (
-      t,
-      @string
-      [
-        | #routeChangeStart(string => unit)
-        | #routeChangeComplete(string => unit)
-        | #hashChangeComplete(string => unit)
-      ],
-    ) => unit = "off"
-  }
-
-  type router = {
-    route: string,
-    asPath: string,
-    events: Events.t,
-  }
-
-  @module("next/router") external useRouter: unit => router = "useRouter"
-}
-
-module Head = {
-  @module("next/head") @react.component
-  external make: (~children: React.element) => React.element = "default"
-}
-
-module Error = {
-  @module("next/head") @react.component
-  external make: (~statusCode: int, ~children: React.element) => React.element = "default"
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/common/App.res b/jscomp/syntax/tests/idempotency/reasonml.org/common/App.res
deleted file mode 100644
index aad0b27..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/common/App.res
+++ /dev/null
@@ -1,164 +0,0 @@
-// This is the implementation of the _app.js file
-
-// Resources:
-// --------------
-// Really good article on state persistence within layouts:
-// https://adamwathan.me/2019/10/17/persistent-layout-patterns-in-nextjs/
-
-%%raw("require('../styles/main.css')")
-
-// Register all the highlightjs stuff for the whole application
-%%raw(`
-  let hljs = require('highlight.js/lib/highlight');
-  let js = require('highlight.js/lib/languages/javascript');
-  let ocaml = require('highlight.js/lib/languages/ocaml');
-  let reason = require('reason-highlightjs');
-  let bash = require('highlight.js/lib/languages/bash');
-  let json = require('highlight.js/lib/languages/json');
-  let ts = require('highlight.js/lib/languages/typescript');
-  let text = require('highlight.js/lib/languages/plaintext');
-
-  hljs.registerLanguage('reason', reason);
-  hljs.registerLanguage('javascript', js);
-  hljs.registerLanguage('ts', ts);
-  hljs.registerLanguage('ocaml', ocaml);
-  hljs.registerLanguage('sh', bash);
-  hljs.registerLanguage('json', json);
-  hljs.registerLanguage('text', text);
-`)
-
-type pageComponent = React.component<{.}>
-type pageProps = {.}
-
-type props = {"Component": pageComponent, "pageProps": pageProps}
-
-module Url = {
-  type version =
-    | Latest
-    | NoVersion
-    | Version(string)
-
-  /*
-    Example 1:
-    Url: "/docs/manual/latest/advanced/introduction"
-
-    Results in:
-    fullpath: ["docs", "manual", "latest", "advanced", "introduction"]
-    base: ["docs", "manual"]
-    version: Latest
-    pagepath: ["advanced", "introduction"]
- */
-
-  /*
-    Example 2:
-    Url: "/apis/"
-
-    Results in:
-    fullpath: ["apis"]
-    base: ["apis"]
-    version: None
-    pagepath: []
- */
-
-  /*
-    Example 3:
-    Url: "/apis/javascript/v7.1.1/node"
-
-    Results in:
-    fullpath: ["apis", "javascript", "v7.1.1", "node"]
-    base: ["apis", "javascript"]
-    version: Version("v7.1.1"),
-    pagepath: ["node"]
- */
-
-  type t = {
-    fullpath: array<string>,
-    base: array<string>,
-    version: version,
-    pagepath: array<string>,
-  }
-
-  let isVersion = str =>
-    Js.String2.match_(str, %re("/latest|v\\d+(\\.\\d+)?(\\.\\d+)?/"))->Belt.Option.isSome
-
-  let parse = (route: string): t => {
-    let fullpath = {
-      open Js.String2
-      route->split("/")->Belt.Array.keep(s => s !== "")
-    }
-
-    let (base, version, pagepath) = Belt.Array.reduce(fullpath, ([], NoVersion, []), (
-      acc,
-      next,
-    ) => {
-      let (base, version, pagepath) = acc
-
-      if version === NoVersion {
-        if isVersion(next) {
-          let version = if next === "latest" {
-            Latest
-          } else {
-            Version(next)
-          }
-          (base, version, pagepath)
-        } else {
-          let base = Belt.Array.concat(base, [next])
-          (base, version, pagepath)
-        }
-      } else {
-        let pagepath = Belt.Array.concat(pagepath, [next])
-
-        (base, version, pagepath)
-      }
-    })
-
-    {fullpath: fullpath, base: base, version: version, pagepath: pagepath}
-  }
-}
-
-@obj
-external makeProps: (
-  ~component: pageComponent,
-  ~pageProps: pageProps,
-  ~key: string=?,
-  unit,
-) => props = ""
-
-let make = (props: props): React.element => {
-  let component = props["Component"]
-  let pageProps = props["pageProps"]
-
-  let router = Next.Router.useRouter()
-
-  let content = React.createElement(component, pageProps)
-
-  let url = router.route->Url.parse
-
-  switch url {
-  // docs routes
-  | {base: ["docs", "manual"], version: Latest} =>
-    <ManualDocsLayout.Prose> content </ManualDocsLayout.Prose>
-  | {base: ["docs", "reason-compiler"], version: Latest} =>
-    <ReasonCompilerDocsLayout> content </ReasonCompilerDocsLayout>
-  | {base: ["docs", "reason-react"], version: Latest} =>
-    <ReasonReactDocsLayout> content </ReasonReactDocsLayout>
-  | {base: ["docs", "gentype"], version: Latest} => <GenTypeDocsLayout> content </GenTypeDocsLayout>
-  // apis routes
-  | {base: ["apis", "javascript"], version: Latest, pagepath} =>
-    switch (Belt.Array.length(pagepath), Belt.Array.get(pagepath, 0)) {
-    | (0, _) => <JavaScriptApiLayout.Docs> content </JavaScriptApiLayout.Docs>
-    | (1, Some("js")) => <JsDocsLayout.Prose> content </JsDocsLayout.Prose>
-    | (1, Some("belt")) => <BeltDocsLayout.Prose> content </BeltDocsLayout.Prose>
-    | (_, Some("js")) => <JsDocsLayout.Docs> content </JsDocsLayout.Docs>
-    | (_, Some("belt")) => <BeltDocsLayout.Docs> content </BeltDocsLayout.Docs>
-    | _ => React.null
-    }
-  // common routes
-  | {base} =>
-    switch Belt.List.fromArray(base) {
-    | list{"community", ..._rest} => <CommunityLayout> content </CommunityLayout>
-    | _ => <MainLayout> content </MainLayout>
-    }
-  | _ => <MainLayout> content </MainLayout>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/common/BeltData.res b/jscomp/syntax/tests/idempotency/reasonml.org/common/BeltData.res
deleted file mode 100644
index 3ef4848..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/common/BeltData.res
+++ /dev/null
@@ -1 +0,0 @@
-let beltCtx: webpackCtx = %raw("require.context('../pages/belt_docs', true, /^\.\/.*\.mdx$/)")
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/common/ColorTheme.res b/jscomp/syntax/tests/idempotency/reasonml.org/common/ColorTheme.res
deleted file mode 100644
index 5153e39..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/common/ColorTheme.res
+++ /dev/null
@@ -1,9 +0,0 @@
-// Equivalent to styles/_theme.css
-
-@deriving(jsConverter)
-type t = [
-  | @as("theme-reason") #Reason
-  | @as("theme-js") #Js
-]
-
-let toCN = value => tToJs(value)
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/common/HighlightJs.res b/jscomp/syntax/tests/idempotency/reasonml.org/common/HighlightJs.res
deleted file mode 100644
index a9f9086..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/common/HighlightJs.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@deriving(abstract)
-type highlightResult = {value: string}
-
-@module("highlight.js/lib/highlight")
-external highlight: (~lang: string, ~value: string) => highlightResult = "highlight"
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/common/Mdx.res b/jscomp/syntax/tests/idempotency/reasonml.org/common/Mdx.res
deleted file mode 100644
index 7dbff2b..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/common/Mdx.res
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-  Abstract type for representing mdx
-  components mostly passed as children to
-  the component context API
- */
-type mdxComponent
-
-external fromReactElement: React.element => mdxComponent = "%identity"
-external toReactElement: mdxComponent => React.element = "%identity"
-
-external arrToReactElement: array<mdxComponent> => React.element = "%identity"
-
-/* Useful for getting the type of a certain mdx component, such as
-   "inlineCode" | "p" | "ul" | etc.
-
-   Will return "unknown" if either given element is not an mdx component,
-   or if there is no mdxType property found */
-let getMdxType: mdxComponent => string = %raw(
-  element =>
-    "{
-      if(element == null || element.props == null) {
-        return 'unknown';
-      }
-      return element.props.mdxType;
-    }"
-)
-
-module MdxChildren: {
-  type unknown
-  type t
-  type case =
-    | String(string)
-    | Element(mdxComponent)
-    | Array(array<mdxComponent>)
-    | Unknown(unknown)
-  let classify: t => case
-  let getMdxChildren: mdxComponent => t
-  let flatten: mdxComponent => array<string>
-  let toReactElement: t => React.element
-} = {
-  type unknown
-
-  @unboxed
-  type rec t = Any('a): t
-
-  type case =
-    | String(string)
-    | Element(mdxComponent)
-    | Array(array<mdxComponent>)
-    | Unknown(unknown)
-
-  let classify = (Any(v): t): case =>
-    if %raw(`function (a) { return  a instanceof Array}`)(v) {
-      Array((Obj.magic(v): array<mdxComponent>))
-    } else if Js.typeof(v) == "string" {
-      String((Obj.magic(v): string))
-    } else if Js.typeof(v) == "object" {
-      Element((Obj.magic(v): mdxComponent))
-    } else {
-      Unknown((Obj.magic(v): unknown))
-    }
-
-  external toReactElement: t => React.element = "%identity"
-
-  let getMdxChildren: mdxComponent => t = %raw(
-    element =>
-      "{
-      if(element == null || element.props == null || element.props.children == null) {
-        return;
-      }
-      return element.props.children;
-    }"
-  )
-
-  // Flattens a tree of a mdx component to an array of leaf strings
-  let rec flatten = (mdxComp: mdxComponent): array<string> =>
-    switch getMdxChildren(mdxComp)->classify {
-    | String(str) => [str]
-    | Array(arr) => Belt.Array.reduce(arr, [], (acc, next) => Belt.Array.concat(acc, flatten(next)))
-    | Element(el) => flatten(el)
-    | Unknown(_) => []
-    }
-}
-
-module Components = {
-  type props = {"children": ReasonReact.reactElement}
-
-  type headerProps = {
-    "id": string,
-    "children": // Used for anchor tags
-    React.element,
-  }
-
-  // Used for reflection based logic in
-  // components such as `code` or `ul`
-  // with runtime reflection
-  type unknown
-
-  @deriving(abstract)
-  type t = {
-    /* MDX shortnames for more advanced components */
-    @as("Cite") @optional
-    cite: React.component<{
-      "author": option<string>,
-      "children": React.element,
-    }>,
-    @as("Info") @optional
-    info: React.component<props>,
-    @as("Warn") @optional
-    warn: React.component<props>,
-    @as("Intro") @optional
-    intro: React.component<props>,
-    @as("UrlBox") @optional
-    urlBox: React.component<{
-      "text": string,
-      "href": string,
-      "children": MdxChildren.t,
-    }>,
-    /* Common markdown elements */
-    @optional
-    p: React.component<props>,
-    @optional
-    li: React.component<props>,
-    @optional
-    h1: React.component<props>,
-    @optional
-    h2: React.component<headerProps>,
-    @optional
-    h3: React.component<headerProps>,
-    @optional
-    h4: React.component<headerProps>,
-    @optional
-    h5: React.component<headerProps>,
-    @optional
-    ul: React.component<props>,
-    @optional
-    ol: React.component<props>,
-    @optional
-    table: React.component<props>,
-    @optional
-    thead: React.component<props>,
-    @optional
-    th: React.component<props>,
-    @optional
-    td: React.component<props>,
-    @optional
-    blockquote: React.component<props>,
-    @optional
-    inlineCode: React.component<props>,
-    @optional
-    hr: React.component<{.}>,
-    @optional
-    code: React.component<{
-      "className": option<string>,
-      "metastring": option<string>,
-      "children": unknown,
-    }>,
-    @optional
-    pre: React.component<props>,
-    @optional
-    a: React.component<{
-      "children": ReasonReact.reactElement,
-      "href": string,
-    }>,
-  }
-}
-
-module Provider = {
-  @module("@mdx-js/react") @react.component
-  external make: (
-    ~components: Components.t,
-    ~children: ReasonReact.reactElement=?,
-  ) => React.element = "MDXProvider"
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/common/Util.res b/jscomp/syntax/tests/idempotency/reasonml.org/common/Util.res
deleted file mode 100644
index cd2c2fe..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/common/Util.res
+++ /dev/null
@@ -1,38 +0,0 @@
-module ReactStuff = {
-  let s = ReasonReact.string
-  let ate = ReasonReact.array
-
-  module Unsafe = {
-    external elementAsString: React.element => string = "%identity"
-  }
-  module Style = ReactDOMRe.Style
-}
-
-module String = {
-  let camelCase: string => string = %raw(
-    str =>
-      "{
-     return str.replace(/-([a-z])/g, function (g) { return g[1].toUpperCase(); });
-    }"
-  )
-
-  let capitalize: string => string = %raw(
-    str =>
-      "{
-      return str && str.charAt(0).toUpperCase() + str.substring(1);
-    }"
-  )
-}
-
-module Url = {
-  let isAbsolute: string => bool = %raw(`
-    function(str) {
-      var r = new RegExp('^(?:[a-z]+:)?//', 'i');
-      if (r.test(str))
-      {
-        return true
-      }
-      return false;
-    }
-  `)
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/components/ApiIntro.res b/jscomp/syntax/tests/idempotency/reasonml.org/components/ApiIntro.res
deleted file mode 100644
index f74f3fc..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/components/ApiIntro.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@react.component
-let make = (~children) => <div className="my-10"> children </div>
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/components/ApiMarkdown.res b/jscomp/syntax/tests/idempotency/reasonml.org/components/ApiMarkdown.res
deleted file mode 100644
index 04566f9..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/components/ApiMarkdown.res
+++ /dev/null
@@ -1,53 +0,0 @@
-open Util.ReactStuff
-
-/*
-   This module is intended for the ODOC like documentation layout.
-   It hides the h2 tags and does
- */
-open Markdown
-
-module InvisibleAnchor = {
-  @react.component
-  let make = (~id: string) => {
-    let style = ReactDOMRe.Style.make(~position="absolute", ~top="-1rem", ())
-    <span className="relative" ariaHidden=true> <a id style /> </span>
-  }
-}
-
-module H1 = {
-  @react.component
-  let make = (~children) =>
-    <h1 className="text-6xl leading-1 mb-2 font-sans font-medium text-night-dark"> children </h1>
-}
-
-module H2 = {
-  // We will currently hide the headline, to keep the structure,
-  // but having an Elm like documentation
-  @react.component
-  let make = (~id, ~children as _) => <>
-    // Here we know that children is always a string (## headline)
-    <InvisibleAnchor id />
-    <div className="border-b border-gray-200 my-20" />
-  </>
-}
-
-let default = Mdx.Components.t(
-  ~intro=Intro.make,
-  ~p=P.make,
-  ~li=Li.make,
-  ~h1=H1.make,
-  ~h2=H2.make,
-  ~h3=H3.make,
-  ~h4=H4.make,
-  ~h5=H5.make,
-  ~ul=Ul.make,
-  ~ol=Ol.make,
-  ~a=A.make,
-  ~thead=Thead.make,
-  ~th=Th.make,
-  ~td=Td.make,
-  ~pre=Pre.make,
-  ~inlineCode=InlineCode.make,
-  ~code=Code.make,
-  (),
-)
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/components/CodeExample.res b/jscomp/syntax/tests/idempotency/reasonml.org/components/CodeExample.res
deleted file mode 100644
index 6c6615b..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/components/CodeExample.res
+++ /dev/null
@@ -1,36 +0,0 @@
-open Util.ReactStuff
-
-@react.component
-let make = (~code: string, ~lang="text") => {
-  let highlighted = {
-    open HighlightJs
-    highlight(~lang, ~value=code)->valueGet
-  }
-
-  let children = ReactDOMRe.createElementVariadic(
-    "code",
-    ~props=ReactDOMRe.objToDOMProps({
-      "className": "wrap hljs lang-" ++ lang,
-      "dangerouslySetInnerHTML": {
-        "__html": highlighted,
-      },
-    }),
-    [],
-  )
-
-  let langShortname = switch lang {
-  | "ocaml" => "ml"
-  | "reason" => "re"
-  | "bash" => "sh"
-  | "text" => ""
-  | rest => rest
-  }
-
-  <div
-    className="flex flex-col -mx-8 xs:mx-0 rounded-none xs:rounded border border-snow-dark bg-snow-light px-5 py-2 text-night-dark">
-    <div className="flex self-end font-sans mb-4 text-sm font-bold text-night-light">
-      {Js.String2.toUpperCase(langShortname)->s}
-    </div>
-    <div className="px-5 text-base pb-6 overflow-x-auto"> children </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/components/CodeSignature.res b/jscomp/syntax/tests/idempotency/reasonml.org/components/CodeSignature.res
deleted file mode 100644
index 5da91d7..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/components/CodeSignature.res
+++ /dev/null
@@ -1,21 +0,0 @@
-open Util.ReactStuff
-
-@react.component
-let make = (~code, ~lang) => {
-  let highlighted = {
-    open HighlightJs
-    highlight(~lang, ~value=code)->valueGet
-  }
-
-  ReactDOMRe.createElementVariadic(
-    "code",
-    ~props=ReactDOMRe.objToDOMProps({
-      "className": "text-lg font-bold md:texxt-xl whitespace-pre-line text-night-dark hljs sig lang-" ++
-      lang,
-      "dangerouslySetInnerHTML": {
-        "__html": highlighted,
-      },
-    }),
-    [],
-  )
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/components/Icon.res b/jscomp/syntax/tests/idempotency/reasonml.org/components/Icon.res
deleted file mode 100644
index 2d7837b..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/components/Icon.res
+++ /dev/null
@@ -1,178 +0,0 @@
-open Util.ReactStuff
-
-module Github = {
-  @react.component
-  let make = (~className: string) =>
-    <svg
-      className={"fill-current " ++ className}
-      width="18.236"
-      height="17.79"
-      viewBox="0 0 18.236 17.79">
-      <g transform="translate(8 -5.365)">
-        <path
-          d="M17.013,9.906a9.078,9.078,0,0,0-3.318-3.318A8.918,8.918,0,0,0,9.118,5.365,8.919,8.919,0,0,0,4.541,6.588,9.077,9.077,0,0,0,1.223,9.906,8.919,8.919,0,0,0,0,14.483a8.861,8.861,0,0,0,1.739,5.36,8.93,8.93,0,0,0,4.493,3.294.531.531,0,0,0,.475-.083.464.464,0,0,0,.154-.356q0-.036-.006-.641T6.85,21l-.273.047a3.484,3.484,0,0,1-.659.042,5.02,5.02,0,0,1-.825-.083,1.844,1.844,0,0,1-.8-.356,1.506,1.506,0,0,1-.522-.73l-.119-.273a2.966,2.966,0,0,0-.374-.605,1.432,1.432,0,0,0-.516-.451l-.083-.06a.871.871,0,0,1-.154-.143.651.651,0,0,1-.107-.166q-.036-.083.059-.137a.77.77,0,0,1,.344-.053l.237.035a1.733,1.733,0,0,1,.588.285,1.916,1.916,0,0,1,.576.617,2.093,2.093,0,0,0,.659.742,1.4,1.4,0,0,0,.778.255,3.376,3.376,0,0,0,.677-.059,2.362,2.362,0,0,0,.534-.178,1.924,1.924,0,0,1,.582-1.223,8.129,8.129,0,0,1-1.217-.214,4.845,4.845,0,0,1-1.116-.463,3.2,3.2,0,0,1-.956-.8,3.822,3.822,0,0,1-.623-1.247A5.928,5.928,0,0,1,3.3,14.007a3.463,3.463,0,0,1,.938-2.446A3.192,3.192,0,0,1,4.321,9.14a1.664,1.664,0,0,1,1.021.16,7.138,7.138,0,0,1,.991.457q.315.19.5.321a8.574,8.574,0,0,1,4.559,0l.451-.285a6.389,6.389,0,0,1,1.092-.522,1.556,1.556,0,0,1,.962-.13A3.161,3.161,0,0,1,14,11.562a3.463,3.463,0,0,1,.938,2.446,5.994,5.994,0,0,1-.243,1.787,3.674,3.674,0,0,1-.629,1.247,3.319,3.319,0,0,1-.962.789,4.855,4.855,0,0,1-1.116.463,8.121,8.121,0,0,1-1.217.214,2.115,2.115,0,0,1,.617,1.686v2.5a.473.473,0,0,0,.149.356.516.516,0,0,0,.469.083A8.929,8.929,0,0,0,16.5,19.842a8.863,8.863,0,0,0,1.739-5.36A8.926,8.926,0,0,0,17.013,9.906Z"
-          transform="translate(-8 0)"
-        />
-      </g>
-    </svg>
-}
-
-module Twitter = {
-  @react.component
-  let make = (~className: string) =>
-    <svg className={"fill-current " ++ className} viewBox="0 0 15.53 12.71">
-      <path
-        d="M5.794,12.711a13.325,13.325,0,0,1-2.058-.163A9.659,9.659,0,0,1,.92,11.523L0,11.02l1-.328c1.089-.358,1.751-.58,2.571-.928A3.421,3.421,0,0,1,1.809,7.726l-.232-.7.19.029a3.456,3.456,0,0,1-.433-.534A3.276,3.276,0,0,1,.779,4.57l.044-.614L1.19,4.1a3.437,3.437,0,0,1-.333-.934A3.552,3.552,0,0,1,1.235.774l.32-.588L1.984.7A7.883,7.883,0,0,0,7.091,3.575a3.054,3.054,0,0,1,.185-1.623A3.038,3.038,0,0,1,8.511.536,3.71,3.71,0,0,1,10.664.008a3.439,3.439,0,0,1,2.114.872,7.1,7.1,0,0,0,.774-.258c.17-.064.362-.136.6-.219L15.042.1l-.579,1.652.119-.008L15.53,1.7l-.56.765c-.032.044-.04.056-.052.073-.045.068-.1.153-.87,1.179a1.448,1.448,0,0,0-.271.943,8.916,8.916,0,0,1-.487,3.586,6.346,6.346,0,0,1-1.7,2.524,7.524,7.524,0,0,1-3.566,1.724A10.979,10.979,0,0,1,5.794,12.711Zm0,0"
-        transform="translate(0 -0.001)"
-      />
-    </svg>
-}
-
-module Discord = {
-  @react.component
-  let make = (~className: string) =>
-    <svg
-      className={"fill-current " ++ className}
-      width="18.122"
-      height="12.407"
-      viewBox="0 0 18.122 12.407">
-      <path
-        d="M111.914,121.211l-.015.014.041-.014Zm4.253,1.569a7.584,7.584,0,0,0-4.275-1.548l-.229.225a10.137,10.137,0,0,1,3.837,1.888,14.031,14.031,0,0,0-11.518-.493c-.565.241-.9.4-.916.412a8.958,8.958,0,0,1,4.005-1.888l-.169-.166a7.58,7.58,0,0,0-4.34,1.56,19.015,19.015,0,0,0-2.252,8.626,5.464,5.464,0,0,0,4.672,2.219s.5-.655,1.005-1.232a4.94,4.94,0,0,1-2.671-1.725l.642.326a11.951,11.951,0,0,0,7.413,1.15,11.658,11.658,0,0,0,2.246-.657,18.189,18.189,0,0,0,1.743-.9,4.975,4.975,0,0,1-2.752,1.725c.413.573.993,1.229.993,1.229a6.548,6.548,0,0,0,4.83-2.121A18.969,18.969,0,0,0,116.166,122.78Zm-9.727,7.141a1.643,1.643,0,0,1,0-3.283l.005,0a1.645,1.645,0,0,1-.005,3.287Zm5.675,0a1.643,1.643,0,0,1,0-3.283v0a1.645,1.645,0,0,1,0,3.287Z"
-        transform="translate(-100.31 -121.209)"
-      />
-    </svg>
-}
-
-module MagnifierGlass = {
-  @react.component
-  let make = (~className: string) =>
-    <svg
-      className={"stroke-current " ++ className}
-      width="19.203"
-      height="19.203"
-      viewBox="0 0 19.203 19.203">
-      <g fill="none" strokeLinecap="round" strokeWidth="2px" transform="translate(-2 -2)">
-        <path
-          d="M6.479,0A6.479,6.479,0,1,1,0,6.479,6.479,6.479,0,0,1,6.479,0Z"
-          transform="translate(3 3)"
-        />
-        <line strokeLinejoin="round" x1="5.734" y1="5.734" transform="translate(14.055 14.055)" />
-      </g>
-    </svg>
-}
-
-module Caret = {
-  type direction = [#Up | #Down]
-
-  type size = [#Sm | #Md]
-
-  @react.component
-  let make = (~className: string="", ~size=#Sm, ~direction: direction) => {
-    let width = switch size {
-    | #Sm => "10"
-    | #Md => "14"
-    }
-    <svg
-      className={"stroke-current " ++ className}
-      viewBox="0 0 10 5"
-      width
-      fill="none"
-      strokeMiterlimit="10"
-      strokeWidth="2">
-      {switch direction {
-      | #Up => <path d="M.6,4.022,4.509.8,8.476,4.087" fill="none" />
-      | #Down => <path d="M.6.866,4.509,4.087,8.476.8" />
-      }}
-    </svg>
-  }
-}
-
-module DrawerDots = {
-  @react.component
-  let make = (~className: string="") =>
-    <svg
-      className={"fill-current " ++ className}
-      stroke="none"
-      width="22"
-      height="4"
-      viewBox="0 0 22 4">
-      <circle cx="2" cy="2" r="2" />
-      <circle cx="2" cy="2" r="2" transform="translate(9)" />
-      <circle cx="2" cy="2" r="2" transform="translate(18)" />
-    </svg>
-}
-
-module CornerLeftUp = {
-  @react.component
-  let make = (~className: string="") =>
-    <svg
-      className={"stroke-current " ++ className}
-      width="18.414"
-      height="18"
-      fill="none"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      strokeWidth="2px">
-      <path d="M11.414 6l-5-5-5 5" /> <path d="M17.414 17h-7a4 4 0 01-4-4V1" />
-    </svg>
-}
-
-module Table = {
-  @react.component
-  let make = (~className: string="") =>
-    <svg className={"stroke-current " ++ className} width="25" height="23">
-      <defs>
-        <style>
-          {".prefix__a,.prefix__b,.prefix__d{fill:none}.prefix__a,.prefix__b{stroke-width:1.5px}.prefix__c{stroke:none}"->s}
-        </style>
-      </defs>
-      <g className="prefix__a">
-        <rect className="prefix__c" width="10" height="23" rx="2" />
-        <rect className="prefix__d" x="0.75" y="0.75" width="8.5" height="21.5" rx="1.25" />
-      </g>
-      <g className="prefix__a">
-        <rect className="prefix__c" width="25" height="23" rx="2" />
-        <rect className="prefix__d" x="0.75" y="0.75" width="23.5" height="21.5" rx="1.25" />
-      </g>
-      <path className="prefix__b" d="M2.5 6.5h5M2.5 10.5h5" />
-    </svg>
-}
-
-module Close = {
-  @react.component
-  let make = (~className: string="") =>
-    <svg className={"fill-current " ++ className} width="12.728" height="12.728">
-      <path d="M12.728 11.313l-1.414 1.414L0 1.414 1.414-.001z" />
-      <path d="M11.314 0l1.414 1.414L1.415 12.728 0 11.314z" />
-    </svg>
-}
-
-module ArrowRight = {
-  @react.component
-  let make = (~className: string="") =>
-    <svg
-      className={"fill-current " ++ className} width="18" height="11.769" viewBox="0 0 18 11.769">
-      <defs>
-        <clipPath id="prefix__a">
-          <path
-            d="M12.121-16.823a.67.67 0 00-.907 0 .566.566 0 000 .835l4.6 4.277H.635A.611.611 0 000-11.12a.617.617 0 00.635.6h15.179l-4.6 4.269a.576.576 0 000 .844.67.67 0 00.907 0L17.81-10.7a.553.553 0 000-.835z"
-            transform="translate(0 17)"
-            clipRule="evenodd"
-            fill="current"
-          />
-        </clipPath>
-        <clipPath id="prefix__b">
-          <path
-            className="prefix__b"
-            d="M-297 336.231h747.692V-534H-297z"
-            transform="translate(297 534)"
-          />
-        </clipPath>
-      </defs>
-      <g clipPath="url(#prefix__a)">
-        <g transform="translate(-205.615 -357.923)" clipPath="url(#prefix__b)">
-          <path className="prefix__b" d="M202.154 354.462h24.923v18.692h-24.923z" />
-        </g>
-      </g>
-    </svg>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/components/Markdown.res b/jscomp/syntax/tests/idempotency/reasonml.org/components/Markdown.res
deleted file mode 100644
index 425a4fc..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/components/Markdown.res
+++ /dev/null
@@ -1,445 +0,0 @@
-open Util.ReactStuff
-
-module P = {
-  @react.component
-  let make = (~children) => <p className="md-p leading-4"> children </p>
-}
-
-// Used for hero like introduction text in
-// e.g Doc sections
-module Intro = {
-  @react.component
-  let make = (~children) => <div className="text-xl mt-8 mb-4"> children </div>
-}
-
-module Cite = {
-  @react.component
-  let make = (~author: option<string>, ~children) =>
-    // For semantics, check out
-    // https://css-tricks.com/quoting-in-html-quotations-citations-and-blockquotes/
-    <div
-      className="my-10 border-l-2 border-fire font-normal pl-10 py-1 text-fire"
-      style={ReactDOMRe.Style.make(~maxWidth="30rem", ())}>
-      <blockquote className="text-3xl italic mb-2"> children </blockquote>
-      {Belt.Option.mapWithDefault(author, React.null, author =>
-        <figcaption className="font-semibold text-sm"> {author->s} </figcaption>
-      )}
-    </div>
-}
-
-module Info = {
-  @react.component
-  let make = (~children) =>
-    <div className="border-l-2 border-sky my-5 py-6 pl-8 pr-10 bg-sky-10"> children </div>
-}
-
-module Warn = {
-  @react.component
-  let make = (~children) =>
-    <div className="border-l-2 border-gold my-6 py-6 pl-8 pr-10 bg-gold-10"> children </div>
-}
-
-module UrlBox = {
-  open Mdx.MdxChildren
-
-  let imgEl = <img src="/static/hyperlink.svg" className="mr-2 inline-block" />
-
-  @react.component
-  let make = (~text: string, ~href: string, ~children: Mdx.MdxChildren.t) => {
-    let content = switch classify(children) {
-    | String(str) => <p> imgEl {str->s} </p>
-    | Element(el) =>
-      let subChildren = el->getMdxChildren
-      <p> imgEl {subChildren->toReactElement} </p>
-    | Array(arr) =>
-      // Scenario: Take the first element, rewrap its children with the hyperlink img
-      let length = Belt.Array.length(arr)
-      if length >= 1 {
-        let head = Belt.Array.getExn(arr, 0)
-        let headChildren = head->getMdxChildren
-
-        <>
-          <P> imgEl {headChildren->toReactElement} </P>
-          {if length > 1 {
-            arr->Js.Array2.slice(~start=1, ~end_=length)->Mdx.arrToReactElement
-          } else {
-            React.null
-          }}
-        </>
-      } else {
-        React.null
-      }
-    | Unknown(el) =>
-      Js.log2("Received unknown", el)
-      React.null
-    }
-
-    // Next.Link doesn't allow any absolute URLs, so we need to render
-    // a plain <a> component when there is an absolute href
-    let link = if Util.Url.isAbsolute(href) {
-      <a href rel="noopener noreferrer" className="flex items-center">
-        {text->s} <Icon.ArrowRight className="ml-1" />
-      </a>
-    } else {
-      <Next.Link href>
-        <a className="flex items-center"> {text->s} <Icon.ArrowRight className="ml-1" /> </a>
-      </Next.Link>
-    }
-    <div
-      className="md-url-box text-base border-l-2 border-night-light my-6 py-6 pl-8 pr-10 bg-snow">
-      content <div className="mt-4 text-sky hover:text-sky-80"> link </div>
-    </div>
-  }
-}
-
-// Used for creating invisible, hoverable <a> anchors for url linking
-module Anchor = {
-  // Todo: Headers with nested components don't pass a string, we need to flatten
-  // everything to a single string first before we are able to use this id transformation
-  // function
-  let idFormat = (id: string): string =>
-    id /* Js.String2.(id->toLowerCase->Js.String2.replaceByRe([%re "/\\s/g"], "-")); */
-  @react.component
-  let make = (~id: string) => {
-    let style = ReactDOMRe.Style.make(~position="absolute", ~top="-7rem", ())
-    <span className="inline group relative">
-      <a
-        className="invisible text-night-light opacity-50 text-inherit hover:opacity-100 hover:text-night-light hover:cursor-pointer group-hover:visible"
-        href={"#" ++ id}>
-        {j`#`->s}
-      </a>
-      <a style id />
-    </span>
-  }
-}
-
-module H1 = {
-  @react.component
-  let make = (~children) =>
-    <h1 className="text-6xl leading-1 mb-5 font-sans font-medium text-night-dark"> children </h1>
-}
-
-module H2 = {
-  @react.component
-  let make = (~id, ~children) => <>
-    // Here we know that children is always a string (## headline)
-    <h2 className="group mt-12 mb-3 text-3xl leading-1 font-sans font-medium text-night-dark">
-      <span className="-ml-8 pr-2"> <Anchor id /> </span> children
-    </h2>
-  </>
-}
-
-module H3 = {
-  @react.component
-  let make = (~id, ~children) =>
-    <h3 className="group text-xl mt-12 mb-3 leading-3 font-sans font-semibold text-night-darker">
-      <span className="-ml-6 pr-2"> <Anchor id /> </span> children
-    </h3>
-}
-
-module H4 = {
-  @react.component
-  let make = (~id, ~children) =>
-    <h4 className="group text-lg mt-12 mb-3 leading-2 font-sans font-semibold text-night-dark">
-      <span className="-ml-5 pr-2"> <Anchor id /> </span> children
-    </h4>
-}
-
-module H5 = {
-  @react.component
-  let make = (~id, ~children) =>
-    <h5
-      className="group mt-12 mb-3 text-xs leading-2 font-sans font-semibold uppercase tracking-wide">
-      <span className="-ml-5 pr-2"> <Anchor id /> </span> children
-    </h5>
-}
-
-module Pre = {
-  @react.component
-  let make = (~children) => <pre className="mt-2 mb-4 block"> children </pre>
-}
-
-module InlineCode = {
-  @react.component
-  let make = (~children) =>
-    <code className="md-inline-code px-1 text-smaller-1 rounded-sm font-mono bg-snow">
-      children
-    </code>
-}
-
-module Table = {
-  @react.component
-  let make = (~children) =>
-    <div className="overflow-x-auto mt-10 mb-16">
-      <table className="md-table"> children </table>
-    </div>
-}
-
-module Thead = {
-  @react.component
-  let make = (~children) => <thead> children </thead>
-}
-
-module Th = {
-  @react.component
-  let make = (~children) =>
-    <th
-      className="py-2 pr-8 text-sm uppercase font-medium tracking-wide text-left border-b-2 border-snow-darker">
-      children
-    </th>
-}
-
-module Td = {
-  @react.component
-  let make = (~children) => <td className="border-b border-snow-darker py-3 pr-8"> children </td>
-}
-
-module Code = {
-  // TODO: Might be refactorable with the new @unboxed feature
-  type unknown = Mdx.Components.unknown
-
-  let typeOf: unknown => string = %raw(thing => "{ return typeof thing; }")
-  let isArray: unknown => bool = %raw(thing => "{ return thing instanceof Array; }")
-  let isObject: unknown => bool = %raw(thing => "{ return thing instanceof Object; }")
-  let isString: unknown => bool = %raw(thing => "{ return thing instanceof String; }")
-  external asStringArray: unknown => array<string> = "%identity"
-  external asElement: unknown => React.element = "%identity"
-
-  external unknownAsString: unknown => string = "%identity"
-
-  let makeCodeElement = (~code, ~metastring, ~lang) => {
-    let baseClass = "md-code font-mono block leading-tight mt-4 mb-10"
-    let codeElement = switch metastring {
-    | None => <CodeExample code lang />
-    | Some(metastring) =>
-      let metaSplits = Js.String.split(" ", metastring)->Belt.List.fromArray
-
-      if Belt.List.has(metaSplits, "example", \"=") {
-        <CodeExample code lang />
-      } else if Belt.List.has(metaSplits, "sig", \"=") {
-        <CodeSignature code lang />
-      } else {
-        <CodeExample code lang />
-      }
-    }
-
-    <div className=baseClass> codeElement </div>
-  }
-
-  @react.component
-  let make = (~className: option<string>=?, ~metastring: option<string>, ~children: unknown) => {
-    let lang = switch className {
-    | None => "text"
-    | Some(str) =>
-      switch Js.String.split("-", str) {
-      | ["language", ""] => "text"
-      | ["language", lang] => lang
-      | _ => "text"
-      }
-    }
-
-    /*
-      Converts the given children provided by remark, depending on
-      given scenarios.
-
-      Scenario 1 (children = array(string):
-      Someone is using a literal <code> tag with some source in it
-      e.g. <code> hello world </code>
-
-      Then remark would call this component with children = [ "hello", "world" ].
-      In this case we need to open the Array,
-
-      Scenario 2 (children = React element / object):
-      Children is an element, so we will need to render the given
-      React element without adding our own components.
-
-      Scenario 3 (children = string):
-      Children is already a string, we don't need to anything special
- */
-    if isArray(children) {
-      // Scenario 1
-      let code = children->asStringArray->Js.Array2.joinWith("")
-      <InlineCode> {code->s} </InlineCode>
-    } else if isObject(children) {
-      // Scenario 2
-      children->asElement
-    } else {
-      // Scenario 3
-      let code = unknownAsString(children)
-      makeCodeElement(~code, ~metastring, ~lang)
-    }
-  }
-}
-
-module Blockquote = {
-  @react.component
-  let make = (~children) =>
-    <blockquote className="md-blockquote"> <Info> children </Info> </blockquote>
-}
-
-module Hr = {
-  @react.component
-  let make = () => <hr className="my-4" />
-}
-
-/*
-    This will map either to an external link, or
-    an anchor / reference link.
-
-    TODO: Remark / Markdown actually has its own syntax
-          for references: e.g. [my article][1]
-          but it seems MDX doesn't map this to anything
-          specific (It seems as if it was represented as a text
-          node inside a <p> tag).
-
-          Example for the AST:
-          https://astexplorer.net/#/gist/2befce6edce1475eb4bbec001356b222/cede33d4c7545b8b2d759ded256802036ec3551c
-
-          Possible solution could be to write our own plugin to categorize those
-          specific component.
- */
-module A = {
-  @react.component
-  let make = (~href, ~children) =>
-    // In case we are handling a relative URL, we will use the Next routing
-    if Util.Url.isAbsolute(href) {
-      <a href rel="noopener noreferrer" className="no-underline text-fire hover:underline">
-        children
-      </a>
-    } else {
-      // We drop any .md / .mdx / .html extensions on every href...
-      // Ideally one would check if this link is relative first,
-      // but it's very unlikely we'd refer to an absolute URL ending
-      // with .md
-      let regex = %re("/\\.md(x)?|\\.html$/")
-      let href = switch Js.String2.split(href, "#") {
-      | [pathname, anchor] => Js.String2.replaceByRe(pathname, regex, "") ++ ("#" ++ anchor)
-      | [pathname] => Js.String2.replaceByRe(pathname, regex, "")
-      | _ => href
-      }
-      <Next.Link href>
-        <a rel="noopener noreferrer" className="no-underline text-fire hover:underline">
-          children
-        </a>
-      </Next.Link>
-    }
-}
-
-module Ul = {
-  @react.component
-  let make = (~children) => <ul className="md-ul"> children </ul>
-}
-
-module Ol = {
-  @react.component
-  let make = (~children) => <ol className="md-ol ml-2"> children </ol>
-}
-
-module Li = {
-  let typeOf: 'a => string = %raw(thing => "{ return typeof thing; }")
-  let isArray: 'a => bool = %raw(thing => "{ return thing instanceof Array; }")
-  external asArray: 'a => array<ReasonReact.reactElement> = "%identity"
-
-  @react.component
-  let make = (~children) => {
-    /*
-     There are 3 value scenarios for `children`
-
-     1) string (if bullet point is standalone text)
-     2) array(<p>, <ul>|<ol>) (if nested list)
-     3) array(<p>,<inlineCode>,...,<p>) (if text with nested content)
-     4) array(<strong>, <inlineCode>, string,...) (if nested content without wrapping <p>)
-
-     We are iterating on these here with quite some bailout JS
- */
-
-    let elements: ReasonReact.reactElement = if isArray(children) {
-      let arr = children->asArray
-      let last: ReasonReact.reactElement = {
-        open Belt.Array
-        arr->getExn(arr->length - 1)
-      }
-
-      let head = Js.Array2.slice(arr, ~start=0, ~end_=arr->Belt.Array.length - 1)
-
-      let first = Belt.Array.getExn(head, 0)
-
-      switch {
-        open Mdx
-        last->fromReactElement->getMdxType
-      } {
-      | "ul"
-      | "li"
-      | "pre" =>
-        switch {
-          open Mdx
-          first->fromReactElement->getMdxType
-        } {
-        | "p" => <> {head->ate} last </>
-        | _ => <> <p> {head->ate} </p> last </>
-        }
-      | _ => <p> children </p>
-      /* Scenario 3 */
-      }
-    } else if typeOf(children) === "string" {
-      <p> {children->Unsafe.elementAsString->ReasonReact.string} </p>
-    } else {
-      switch {
-        /* Unknown Scenario */
-        open Mdx
-        children->fromReactElement->getMdxType
-      } {
-      | "pre" => children
-      | "p" => children
-      | _ => <p> children </p>
-      }
-    }
-
-    <li className="md-li mt-3 leading-4 ml-4 text-lg"> elements </li>
-  }
-}
-
-// Useful for debugging injected values in props
-/*
- let mdxTestComponent: React.component(Js.t({.})) = [%raw
-   {|
- function(children) {
-   console.log(children);
-   return React.createElement("div");
- }
- |}
- ];
- */
-
-// Used for the MdxJS Provider
-
-/* Sets our preferred branded styles
-   We most likely will never need a different ~components
-   option on our website. */
-let default = Mdx.Components.t(
-  ~cite=Cite.make,
-  ~info=Info.make,
-  ~intro=Intro.make,
-  ~warn=Warn.make,
-  ~urlBox=UrlBox.make,
-  ~p=P.make,
-  ~li=Li.make,
-  ~h1=H1.make,
-  ~h2=H2.make,
-  ~h3=H3.make,
-  ~h4=H4.make,
-  ~h5=H5.make,
-  ~ul=Ul.make,
-  ~ol=Ol.make,
-  ~table=Table.make,
-  ~thead=Thead.make,
-  ~th=Th.make,
-  ~td=Td.make,
-  ~hr=Hr.make,
-  ~a=A.make,
-  ~pre=Pre.make,
-  ~blockquote=Blockquote.make,
-  ~inlineCode=InlineCode.make,
-  ~code=Code.make,
-  (),
-)
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/components/Meta.res b/jscomp/syntax/tests/idempotency/reasonml.org/components/Meta.res
deleted file mode 100644
index 06d5f7d..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/components/Meta.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module Head = Next.Head
-
-@react.component
-let make = () =>
-  <Head>
-    <meta charSet="ISO-8859-1" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, minimal-ui"
-    />
-  </Head>
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/components/Navigation.res b/jscomp/syntax/tests/idempotency/reasonml.org/components/Navigation.res
deleted file mode 100644
index f43f1eb..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/components/Navigation.res
+++ /dev/null
@@ -1,515 +0,0 @@
-open Util.ReactStuff
-module Link = Next.Link
-
-let link = "no-underline block text-inherit hover:cursor-pointer hover:text-white text-white-80 mb-px"
-let activeLink = "text-inherit font-normal text-fire border-b border-fire"
-
-let linkOrActiveLink = (~target, ~route) => target === route ? activeLink : link
-
-module CollapsibleLink = {
-  // KeepOpen = Menu has been opened and should stay open
-  type state =
-    | KeepOpen
-    | HoverOpen
-    | Closed
-
-  @react.component
-  let make = (
-    ~title: string,
-    ~onStateChange: (~id: string, state) => unit,
-    ~allowHover=true,
-    ~allowInteraction=true,
-    ~id: string,
-    ~state: state,
-    ~active=false,
-    ~children,
-  ) => {
-    // This is not onClick, because we want to prevent
-    // text selection on multiple clicks
-    let onMouseDown = evt => {
-      ReactEvent.Mouse.preventDefault(evt)
-      ReactEvent.Mouse.stopPropagation(evt)
-
-      onStateChange(
-        ~id,
-        switch state {
-        | Closed => KeepOpen
-        | HoverOpen => Closed
-        | KeepOpen => Closed
-        },
-      )
-    }
-
-    let onMouseEnter = evt => {
-      ReactEvent.Mouse.preventDefault(evt)
-      if allowHover {
-        onStateChange(~id, HoverOpen)
-      }
-    }
-
-    let isOpen = switch state {
-    | Closed => false
-    | KeepOpen
-    | HoverOpen => true
-    }
-
-    // This onClick is required for iOS12 safari.
-    // There seems to be a bug where mouse events
-    // won't be registered, unless an onClick event
-    // is attached
-    // DO NOT REMOVE, OTHERWISE THE COLLAPSIBLE WON'T WORK
-    let onClick = _ => ()
-
-    let direction = isOpen ? #Up : #Down
-
-    <div className="relative" onMouseEnter>
-      <div className="flex items-center">
-        <a
-          onMouseDown
-          onClick
-          className={(active ? activeLink : link) ++
-          (" border-none flex items-center hover:cursor-pointer " ++
-          (isOpen ? " text-white" : ""))}>
-          <span className={active ? "border-b border-fire" : ""}> {title->s} </span>
-          <span className="fill-current flex-no-wrap inline-block ml-2 w-2">
-            <Icon.Caret direction className={active ? "text-inherit" : "text-night-light"} />
-          </span>
-        </a>
-      </div>
-      <div
-        className={(
-          isOpen ? "flex" : "hidden"
-        ) ++ " fixed left-0 mt-4 border-night border-t bg-night-dark min-w-20 w-full h-full sm:h-auto sm:justify-center"}>
-        <div className="max-w-xl w-full"> children </div>
-      </div>
-    </div>
-  }
-}
-
-let useOutsideClick: (ReactDOMRe.Ref.t, unit => unit) => unit = %raw(
-  (outerRef, trigger) =>
-    j`{
-      function handleClickOutside(event) {
-        if (outerRef.current && !outerRef.current.contains(event.target)) {
-          trigger();
-        }
-      }
-
-      React.useEffect(() => {
-        document.addEventListener("mousedown", handleClickOutside);
-        return () => {
-          document.removeEventListener("mousedown", handleClickOutside);
-        };
-      });
-
-    }`
-)
-
-let useWindowWidth: unit => option<int> = %raw(
-  () =>
-    j`{
-  const isClient = typeof window === 'object';
-
-  function getSize() {
-    return {
-      width: isClient ? window.innerWidth : undefined,
-      height: isClient ? window.innerHeight : undefined
-    };
-  }
-
-  const [windowSize, setWindowSize] = React.useState(getSize);
-
-  React.useEffect(() => {
-    if (!isClient) {
-      return false;
-    }
-
-    function handleResize() {
-      setWindowSize(getSize());
-    }
-
-    window.addEventListener('resize', handleResize);
-    return () => window.removeEventListener('resize', handleResize);
-  }, []); // Empty array ensures that effect is only run on mount and unmount
-
-  if(windowSize) {
-    return windowSize.width;
-  }
-  return null;
-  }`
-)
-
-type collapsible = {
-  title: string,
-  children: string => React.element,
-  href: string,
-  state: CollapsibleLink.state,
-}
-
-module SubNav = {
-  module DocsLinks = {
-    @react.component
-    let make = (~route: string) => {
-      let jsTheme = ColorTheme.toCN(#Js)
-      let reTheme = ColorTheme.toCN(#Reason)
-
-      let languageItems = [
-        ("Introduction", "/docs/manual/latest/introduction"),
-        ("Cheatsheet", "/docs/manual/latest/syntax-cheatsheet"),
-      ]
-
-      let recompItems = [
-        ("Reason Compiler", "/docs/reason-compiler/latest/introduction"),
-        ("ReasonReact", "/docs/reason-react/latest/introduction"),
-        ("GenType", "/docs/gentype/latest/introduction"),
-      ]
-
-      let activeThemeLink = "font-normal text-primary border-b border-primary"
-
-      let sectionClass = "pb-12 mt-12 border-b border-night last:border-b-0 lg:w-1/3"
-      let overlineClass = "font-black uppercase text-sm tracking-wide text-primary-80"
-
-      let sectionUl = "flex flex-wrap mt-8 list-primary list-inside lg:w-auto max-w-md"
-
-      <div className="lg:flex lg:flex-row px-4 max-w-xl">
-        <div className={reTheme ++ (" " ++ sectionClass)}>
-          <Link href="/docs/manual/latest/introduction">
-            <a className=overlineClass> {"Language Manual"->s} </a>
-          </Link>
-          <ul className=sectionUl>
-            {languageItems
-            ->Belt.Array.mapWithIndex((idx, (title, href)) => {
-              let active = route == href ? activeThemeLink ++ " hover:text-primary cursor-auto" : ""
-              <li className="w-1/2 xs:w-1/2 h-10" key={Belt.Int.toString(idx)}>
-                <Link href>
-                  <a className={"text-white-80 hover:text-white hover:cursor-pointer " ++ active}>
-                    {title->s}
-                  </a>
-                </Link>
-              </li>
-            })
-            ->ate}
-          </ul>
-        </div>
-        <div className={jsTheme ++ (" " ++ sectionClass)}>
-          <Link href="/docs/reason-compiler/latest/introduction">
-            <a className=overlineClass> {"JavaScript"->s} </a>
-          </Link>
-          <ul className=sectionUl>
-            {recompItems
-            ->Belt.Array.mapWithIndex((idx, (title, href)) => {
-              let active = route == href ? activeThemeLink ++ " hover:text-primary cursor-auto" : ""
-              <li className="w-1/2 xs:w-1/2 h-10" key={Belt.Int.toString(idx)}>
-                <Link href>
-                  <a className={"text-white-80 hover:text-white hover:cursor-pointer " ++ active}>
-                    {title->s}
-                  </a>
-                </Link>
-              </li>
-            })
-            ->ate}
-          </ul>
-        </div>
-      </div>
-    }
-  }
-
-  module ApiLinks = {
-    @react.component
-    let make = (~route: string) => {
-      let jsTheme = ColorTheme.toCN(#Js)
-      let reTheme = ColorTheme.toCN(#Reason)
-
-      let jsItems = [
-        ("Belt Stdlib", "/apis/javascript/latest/belt"),
-        ("Js Module", "/apis/javascript/latest/js"),
-        /* ("Module 3", "/apis/javascript/latest/mod3"), */
-        /* ("Module 4", "/apis/javascript/latest/mod4"), */
-      ]
-
-      let sectionClass = "pb-12 mt-12 border-b border-night last:border-b-0 lg:w-1/4"
-      let overlineClass = "font-black uppercase text-sm tracking-wide text-primary-80"
-
-      let sectionUl = "flex flex-wrap mt-8 list-primary list-inside lg:w-auto max-w-md"
-
-      <div className="lg:flex lg:flex-row px-4 max-w-xl">
-        <div className={reTheme ++ (" " ++ sectionClass)}>
-          <Link href="/apis"> <a className=overlineClass> {"Overview"->s} </a> </Link>
-        </div>
-        <div className={jsTheme ++ (" " ++ sectionClass)}>
-          <Link href="/apis/javascript/latest">
-            <a className=overlineClass> {"JavaScript"->s} </a>
-          </Link>
-          <ul className=sectionUl>
-            {jsItems
-            ->Belt.Array.mapWithIndex((idx, (title, href)) => {
-              let active = Js.String2.startsWith(route, href) ? "text-primary" : ""
-              <li className="w-1/2 xs:w-1/2 h-10" key={Belt.Int.toString(idx)}>
-                <Link href>
-                  <a className={"text-white-80 hover:text-white hover:cursor-pointer " ++ active}>
-                    {title->s}
-                  </a>
-                </Link>
-              </li>
-            })
-            ->ate}
-          </ul>
-        </div>
-      </div>
-    }
-  }
-}
-
-module MobileNav = {
-  @react.component
-  let make = (~route: string) => {
-    let base = "font-light mx-4 py-5 text-white-80 border-b border-night"
-    let extLink = "block hover:cursor-pointer hover:text-white text-night-light"
-    <div className="border-night border-t">
-      <ul>
-        <li className=base>
-          <Link href="/try">
-            <a className={linkOrActiveLink(~target="/try", ~route)}> {"Playground"->s} </a>
-          </Link>
-        </li>
-        <li className=base>
-          <Link href="/blog">
-            <a className={linkOrActiveLink(~target="/blog", ~route)}> {"Blog"->s} </a>
-          </Link>
-        </li>
-        <li className=base>
-          <Link href="/community">
-            <a className={linkOrActiveLink(~target="/community", ~route)}> {"Community"->s} </a>
-          </Link>
-        </li>
-        <li className=base>
-          <a
-            href="https://twitter.com/reasonml"
-            rel="noopener noreferrer"
-            target="_blank"
-            className=extLink>
-            {"Twitter"->s}
-          </a>
-        </li>
-        <li className=base>
-          <a
-            href="https://discord.gg/reasonml"
-            rel="noopener noreferrer"
-            target="_blank"
-            className=extLink>
-            {"Discord"->s}
-          </a>
-        </li>
-        <li className=base>
-          <a
-            href="https://github.com/reason-association/reasonml.org"
-            rel="noopener noreferrer"
-            target="_blank"
-            className=extLink>
-            {"Github"->s}
-          </a>
-        </li>
-      </ul>
-    </div>
-  }
-}
-
-/* isOverlayOpen: if the mobile overlay is toggled open */
-@react.component
-let make = (~overlayState: (bool, (bool => bool) => unit)) => {
-  let minWidth = "20rem"
-  let router = Next.Router.useRouter()
-
-  let route = router.route
-
-  let (collapsibles, setCollapsibles) = React.useState(_ => [
-    {
-      title: "Docs",
-      href: "/docs",
-      children: route => <SubNav.DocsLinks route />,
-      state: Closed,
-    },
-    {
-      title: "API",
-      href: "/apis",
-      children: route => <SubNav.ApiLinks route />,
-      state: Closed,
-    },
-  ])
-
-  let (isOverlayOpen, setOverlayOpen) = overlayState
-
-  let toggleOverlay = () => setOverlayOpen(prev => !prev)
-
-  let resetCollapsibles = () =>
-    setCollapsibles(prev => Belt.Array.map(prev, c => {...c, state: Closed}))
-
-  let outerRef = React.useRef(Js.Nullable.null)
-  useOutsideClick(ReactDOMRe.Ref.domRef(outerRef), resetCollapsibles)
-
-  let windowWidth = useWindowWidth()
-
-  // Don't allow hover behavior for collapsibles if mobile navigation is on
-  let allowHover = switch windowWidth {
-  | Some(width) => width > 576 // Value noted in tailwind config
-  | None => true
-  }
-
-  let nonCollapsibleOnMouseEnter = evt => {
-    ReactEvent.Mouse.preventDefault(evt)
-    resetCollapsibles()
-  }
-
-  // Client side navigation requires us to reset the collapsibles
-  // whenever a route change had occurred, otherwise the collapsible
-  // will stay open, even though you clicked a link
-  React.useEffect1(() => {
-    open Next.Router.Events
-    let {Next.Router.events: events} = router
-
-    let onChangeComplete = _url => {
-      resetCollapsibles()
-      setOverlayOpen(_ => false)
-    }
-
-    events->on(#routeChangeComplete(onChangeComplete))
-    events->on(#hashChangeComplete(onChangeComplete))
-
-    Some(
-      () => {
-        events->off(#routeChangeComplete(onChangeComplete))
-        events->off(#hashChangeComplete(onChangeComplete))
-      },
-    )
-  }, [])
-
-  <nav
-    ref={ReactDOMRe.Ref.domRef(outerRef)}
-    id="header"
-    style={Style.make(~minWidth, ())}
-    className="fixed flex justify-center z-20 top-0 w-full h-16 bg-night-dark shadow text-white-80 text-base">
-    <div className="flex justify-between pl-4 items-center h-full w-full max-w-xl">
-      <div className="h-8 w-8 md:w-20 md:mb-3 ">
-        <a href="/">
-          <picture>
-            <source srcSet="/static/reason_logo_full.svg" media="(min-width: 768px)" />
-            <img className="h-8 w-auto inline-block" src="/static/reason_logo.svg" />
-          </picture>
-        </a>
-      </div>
-      /* Desktop horizontal navigation */
-      <div
-        className="flex sm:justify-between bg-night-dark w-10/12 sm:w-9/12 sm:h-auto sm:relative">
-        <div
-          className="flex justify-between w-2/4 xs:w-3/4 sm:w-full max-w-sm"
-          style={Style.make(~minWidth="12rem", ())}>
-          <button className="sm:hidden px-4 flex items-center justify-center h-full">
-            <Icon.MagnifierGlass className="w-5 h-5 hover:text-white" />
-          </button>
-          {Belt.Array.mapWithIndex(collapsibles, (idx, c) => {
-            let {href, title, children, state} = c
-            let onStateChange = (~id, state) =>
-              setCollapsibles(prev => {
-                /* This is important to close the nav overlay, before showing the subnavigation */
-                if isOverlayOpen {
-                  toggleOverlay()
-                }
-                Belt.Array.map(prev, c =>
-                  if c.title === id {
-                    {
-                      ...c,
-                      state: state,
-                    }
-                  } else {
-                    {
-                      ...c,
-                      state: Closed,
-                    }
-                  }
-                )
-              })
-            <CollapsibleLink
-              id=title
-              onStateChange
-              key={idx->Belt.Int.toString}
-              allowHover
-              title
-              active={Js.String2.startsWith(route, href)}
-              state>
-              {children(route)}
-            </CollapsibleLink>
-          })->ate}
-          <Link href="/try">
-            <a
-              className={"hidden xs:block " ++ linkOrActiveLink(~target="/try", ~route)}
-              onMouseEnter=nonCollapsibleOnMouseEnter>
-              {"Playground"->s}
-            </a>
-          </Link>
-          <Link href="/blog">
-            <a
-              className={"hidden sm:block " ++ linkOrActiveLink(~target="/blog", ~route)}
-              onMouseEnter=nonCollapsibleOnMouseEnter>
-              {"Blog"->s}
-            </a>
-          </Link>
-          <Link href="/community">
-            <a
-              className={"hidden sm:block " ++ linkOrActiveLink(~target="/community", ~route)}
-              onMouseEnter=nonCollapsibleOnMouseEnter>
-              {"Community"->s}
-            </a>
-          </Link>
-        </div>
-        <div className="hidden lg:-mr-6 lg:flex lg:justify-between lg:w-20 ">
-          <a
-            href="https://github.com/reason-association/reasonml.org"
-            rel="noopener noreferrer"
-            target="_blank"
-            className=link
-            onMouseEnter=nonCollapsibleOnMouseEnter>
-            <Icon.Github className="w-5 h-5" />
-          </a>
-          <a
-            href="https://twitter.com/reasonml"
-            rel="noopener noreferrer"
-            target="_blank"
-            className=link
-            onMouseEnter=nonCollapsibleOnMouseEnter>
-            <Icon.Twitter className="w-5 h-5" />
-          </a>
-          <a
-            href="https://discord.gg/reasonml"
-            rel="noopener noreferrer"
-            target="_blank"
-            className=link
-            onMouseEnter=nonCollapsibleOnMouseEnter>
-            <Icon.Discord className="w-5 h-5" />
-          </a>
-        </div>
-      </div>
-      <button
-        className="hidden sm:flex sm:px-4 sm:items-center sm:justify-center sm:border-l sm:border-r sm:border-night sm:h-full">
-        <Icon.MagnifierGlass className="w-5 h-5 hover:text-white" />
-      </button>
-    </div>
-    /* Burger Button */
-    <button
-      className="h-full px-4 sm:hidden flex items-center hover:text-white"
-      onClick={evt => {
-        ReactEvent.Mouse.preventDefault(evt)
-        resetCollapsibles()
-        toggleOverlay()
-      }}>
-      <Icon.DrawerDots className={"h-1 w-auto block " ++ (isOverlayOpen ? "text-fire" : "")} />
-    </button>
-    /* Mobile overlay */
-    <div
-      style={Style.make(~minWidth, ~top="4rem", ())}
-      className={(
-        isOverlayOpen ? "flex" : "hidden"
-      ) ++ " sm:hidden flex-col fixed top-0 left-0 h-full w-full sm:w-9/12 bg-night-dark sm:h-auto sm:flex sm:relative sm:flex-row sm:justify-between"}>
-      <MobileNav route />
-    </div>
-  </nav>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/components/Tag.res b/jscomp/syntax/tests/idempotency/reasonml.org/components/Tag.res
deleted file mode 100644
index 01aa9dc..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/components/Tag.res
+++ /dev/null
@@ -1,11 +0,0 @@
-open Util.ReactStuff
-
-type kind = [#Subtle]
-
-@react.component
-let make = (~text, ~kind=#Subtle) => {
-  let className = switch kind {
-  | #Subtle => "px-1 bg-snow-dark text-night-60 font-semibold rounded text-sm"
-  }
-  <div> <span className> {text->s} </span> </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/components/Text.res b/jscomp/syntax/tests/idempotency/reasonml.org/components/Text.res
deleted file mode 100644
index d7fc907..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/components/Text.res
+++ /dev/null
@@ -1,4 +0,0 @@
-module Link = {
-  let inline = "no-underline border-b border-night-dark hover:border-bs-purple text-inherit"
-  let standalone = "no-underline text-fire"
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ApiLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ApiLayout.res
deleted file mode 100644
index 308b41c..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ApiLayout.res
+++ /dev/null
@@ -1,111 +0,0 @@
-open Util.ReactStuff
-module Link = Next.Link
-
-module MainMd = {
-  open Markdown
-  module P = {
-    @react.component
-    let make = (~children) => <p className="text-xl mt-3 leading-4 text-night-dark"> children </p>
-  }
-
-  module H1 = {
-    @react.component
-    let make = (~children) =>
-      <h1 className="text-7xl font-sans font-black text-night-dark"> children </h1>
-  }
-
-  let components = Mdx.Components.t(
-    ~p=P.make,
-    ~li=Li.make,
-    ~h1=H1.make,
-    ~h2=H2.make,
-    ~h3=H3.make,
-    ~h4=H4.make,
-    ~h5=H5.make,
-    ~ul=Ul.make,
-    ~ol=Ol.make,
-    ~a=A.make,
-    ~pre=Pre.make,
-    ~inlineCode=InlineCode.make,
-    ~code=Code.make,
-    (),
-  )
-}
-module Category = {
-  module Card = {
-    type t = {
-      title: string,
-      descr: string,
-      href: option<string>,
-      src: string,
-    }
-    @react.component
-    let make = (~card: t) => {
-      let element =
-        <>
-          <img src=card.src className="w-full mb-2" />
-          <h3 className="font-sans font-black text-3xl text-night-dark"> {card.title->s} </h3>
-          <div className="text-base leading-5 text-night"> {card.descr->s} </div>
-        </>
-
-      <div className="w-2/4 sm:w-1/4 mb-12">
-        {switch card.href {
-        | Some(href) => <Link href> <a> element </a> </Link>
-        | None => <div className="opacity-50" title="Not available yet"> element </div>
-        }}
-      </div>
-    }
-  }
-
-  type t = {
-    name: string,
-    cards: array<Card.t>,
-  }
-
-  @react.component
-  let make = (~category: t) =>
-    <div className="border-t border-snow-dark pt-8">
-      <h2 className="mb-8 font-black text-6xl text-night-dark"> {category.name->s} </h2>
-      <div className="flex flex-col sm:flex-row flex-wrap justify-between">
-        {Belt.Array.map(category.cards, card => <Card key=card.title card />)->ate}
-      </div>
-    </div>
-}
-
-let categories: array<Category.t> = [
-  {
-    name: "JavaScript",
-    cards: [
-      {
-        title: "Js Module",
-        descr: "Bindings for Common Browser APIs",
-        src: "/static/api-img-js.svg",
-        href: Some("/apis/javascript/latest/js"),
-      },
-      {
-        title: "Belt Module",
-        descr: "The Reason Standard Library for the Web",
-        src: "/static/api-img-belt.svg",
-        href: Some("/apis/javascript/latest/belt"),
-      },
-      {
-        title: "Node Module",
-        descr: "Simple Bindings for the NodeJS API",
-        src: "/static/api-img-nodejs.svg",
-        href: None,
-      },
-    ],
-  },
-]
-
-/* Used for API docs (structured data) */
-@react.component
-let make = (~children) =>
-  <div className="flex flex-col">
-    <div className="max-w-md mb-32 text-lg"> children </div>
-    <div>
-      {Belt.Array.map(categories, category =>
-        <div key=category.name className="pb-16"> <Category category /> </div>
-      )->ate}
-    </div>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/BeltDocsLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/BeltDocsLayout.res
deleted file mode 100644
index 0b51805..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/BeltDocsLayout.res
+++ /dev/null
@@ -1,213 +0,0 @@
-module Link = Next.Link
-
-// Structure defined by `scripts/extract-indices.js`
-let indexData: Js.Dict.t<{
-  "moduleName": string,
-  "headers": array<{
-    "name": string,
-    "href": string,
-  }>,
-}> = %raw("require('../index_data/belt_api_index.json')")
-
-// Retrieve package.json to access the version of bs-platform.
-let package: Js.t<{"dependencies": {"bs-platform": string}}> = %raw("require('../package.json')")
-
-module Sidebar = SidebarLayout.Sidebar
-module UrlPath = SidebarLayout.UrlPath
-module NavItem = Sidebar.NavItem
-module Category = Sidebar.Category
-
-let overviewNavs = [
-  {
-    open NavItem
-    {name: "Introduction", href: "/apis/javascript/latest/belt"}
-  },
-]
-
-let setNavs = [
-  {
-    open NavItem
-    {name: "HashSet", href: "/apis/javascript/latest/belt/hash-set"}
-  },
-  {name: "HashSetInt", href: "/apis/javascript/latest/belt/hash-set-int"},
-  {
-    name: "HashSetString",
-    href: "/apis/javascript/latest/belt/hash-set-string",
-  },
-  {name: "Set", href: "/apis/javascript/latest/belt/set"},
-  {name: "SetDict", href: "/apis/javascript/latest/belt/set-dict"},
-  {name: "SetInt", href: "/apis/javascript/latest/belt/set-int"},
-  {name: "SetString", href: "/apis/javascript/latest/belt/set-string"},
-]
-
-let mapNavs = [
-  {
-    open NavItem
-    {name: "HashMap", href: "/apis/javascript/latest/belt/hash-map"}
-  },
-  {name: "HashMapInt", href: "/apis/javascript/latest/belt/hash-map-int"},
-  {
-    name: "HashMapString",
-    href: "/apis/javascript/latest/belt/hash-map-string",
-  },
-  {name: "Map", href: "/apis/javascript/latest/belt/map"},
-  {name: "MapDict", href: "/apis/javascript/latest/belt/map-dict"},
-  {name: "MapInt", href: "/apis/javascript/latest/belt/map-int"},
-  {name: "MapString", href: "/apis/javascript/latest/belt/map-string"},
-]
-
-let mutableCollectionsNavs = [
-  {
-    open NavItem
-    {
-      name: "MutableMap",
-      href: "/apis/javascript/latest/belt/mutable-map",
-    }
-  },
-  {
-    name: "MutableMapInt",
-    href: "/apis/javascript/latest/belt/mutable-map-int",
-  },
-  {
-    name: "MutableMapString",
-    href: "/apis/javascript/latest/belt/mutable-map-string",
-  },
-  {name: "MutableQueue", href: "/apis/javascript/latest/belt/mutable-queue"},
-  {name: "MutableSet", href: "/apis/javascript/latest/belt/mutable-set"},
-  {
-    name: "MutableSetInt",
-    href: "/apis/javascript/latest/belt/mutable-set-int",
-  },
-  {
-    name: "MutableSetString",
-    href: "/apis/javascript/latest/belt/mutable-set-string",
-  },
-  {name: "MutableStack", href: "/apis/javascript/latest/belt/mutable-stack"},
-]
-
-let basicNavs = [
-  {
-    open NavItem
-    {name: "List", href: "/apis/javascript/latest/belt/list"}
-  },
-  {name: "Array", href: "/apis/javascript/latest/belt/array"},
-  {name: "Float", href: "/apis/javascript/latest/belt/float"},
-  {name: "Int", href: "/apis/javascript/latest/belt/int"},
-  {name: "Range", href: "/apis/javascript/latest/belt/range"},
-  {name: "Id", href: "/apis/javascript/latest/belt/id"},
-  {name: "Option", href: "/apis/javascript/latest/belt/option"},
-  {name: "Result", href: "/apis/javascript/latest/belt/result"},
-]
-
-let sortNavs = [
-  {
-    open NavItem
-    {
-      name: "SortArray",
-      href: "/apis/javascript/latest/belt/sort-array",
-    }
-  },
-  {name: "SortArrayInt", href: "/apis/javascript/latest/belt/sort-array-int"},
-  {
-    name: "SortArrayString",
-    href: "/apis/javascript/latest/belt/sort-array-string",
-  },
-]
-
-let utilityNavs = [
-  {
-    open NavItem
-    {name: "Debug", href: "/apis/javascript/latest/belt/debug"}
-  },
-]
-
-let categories = [
-  {
-    open Category
-    {name: "Overview", items: overviewNavs}
-  },
-  {name: "Basics", items: basicNavs},
-  {name: "Set", items: setNavs},
-  {name: "Map", items: mapNavs},
-  {name: "Mutable Collections", items: mutableCollectionsNavs},
-  {name: "Sort Collections", items: sortNavs},
-  {name: "Utilities", items: utilityNavs},
-]
-
-module Docs = {
-  @react.component
-  let make = (~components=ApiMarkdown.default, ~children) => {
-    let router = Next.Router.useRouter()
-    let route = router.route
-
-    // Gather data for the CollapsibleSection
-    let headers = {
-      open Belt.Option
-      Js.Dict.get(indexData, route)
-      ->map(data =>
-        data["headers"]->Belt.Array.map(header => (header["name"], "#" ++ header["href"]))
-      )
-      ->getWithDefault([])
-    }
-
-    let moduleName = {
-      open Belt.Option
-      Js.Dict.get(indexData, route)->map(data => data["moduleName"])->getWithDefault("?")
-    }
-
-    let (isSidebarOpen, setSidebarOpen) = React.useState(_ => false)
-    let toggleSidebar = () => setSidebarOpen(prev => !prev)
-
-    let urlPath = UrlPath.parse(~base="/apis/javascript", route)
-
-    let breadcrumbs = Belt.Option.map(urlPath, v => {
-      let {UrlPath.version: version} = v
-      let prefix = {
-        open UrlPath
-        list{
-          {name: "API", href: "/apis"},
-          {name: "JavaScript", href: "/apis/javascript/" ++ version},
-        }
-      }
-      UrlPath.toBreadCrumbs(~prefix, v)
-    })
-
-    let toplevelNav = switch urlPath {
-    | Some(urlPath) =>
-      let version = {
-        open UrlPath
-        urlPath.version
-      }
-      let backHref = Some(UrlPath.fullUpLink(urlPath))
-      <Sidebar.ToplevelNav title="Belt" version ?backHref />
-    | None => React.null
-    }
-
-    // Todo: We need to introduce router state to be able to
-    //       listen to anchor changes (#get, #map,...)
-    let preludeSection =
-      route !== "/apis/javascript/latest/belt"
-        ? <Sidebar.CollapsibleSection headers moduleName />
-        : React.null
-
-    let sidebar =
-      <Sidebar
-        isOpen=isSidebarOpen
-        toggle=toggleSidebar
-        categories
-        route=router.route
-        toplevelNav
-        preludeSection
-      />
-
-    <SidebarLayout
-      theme=#Js components sidebarState=(isSidebarOpen, setSidebarOpen) sidebar ?breadcrumbs>
-      children
-    </SidebarLayout>
-  }
-}
-
-module Prose = {
-  @react.component
-  let make = (~children) => <Docs components=Markdown.default> children </Docs>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/CommunityLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/CommunityLayout.res
deleted file mode 100644
index dbcc4fd..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/CommunityLayout.res
+++ /dev/null
@@ -1,71 +0,0 @@
-module Link = Next.Link
-
-// Structure defined by `scripts/extract-tocs.js`
-let tocData: Js.Dict.t<{
-  "title": string,
-  "headers": array<{
-    "name": string,
-    "href": string,
-  }>,
-}> = %raw("require('../index_data/community_toc.json')")
-
-module UrlPath = DocsLayout.UrlPath
-module NavItem = DocsLayout.NavItem
-module Category = DocsLayout.Category
-module Toc = DocsLayout.Toc
-
-let overviewNavs = [
-  {
-    open NavItem
-    {name: "Overview", href: "/community"}
-  },
-  {name: "Code of Conduct", href: "/community/code-of-conduct"},
-  {name: "Events & Meetups", href: "/community/events"},
-  {name: "Articles & Videos", href: "/community/articles-and-videos"},
-  {name: "Get involved", href: "/community/get-involved"},
-]
-
-let categories = [
-  {
-    open Category
-    {name: "Resources", items: overviewNavs}
-  },
-]
-
-@react.component
-let make = (~components=Markdown.default, ~children) => {
-  let router = Next.Router.useRouter()
-  let route = router.route
-
-  let activeToc: option<Toc.t> = {
-    open Belt.Option
-    Js.Dict.get(tocData, route)->map(data => {
-      let title = data["title"]
-      let entries = Belt.Array.map(data["headers"], header => {
-        Toc.header: header["name"],
-        href: "#" ++ header["href"],
-      })
-      {Toc.title: title, entries: entries}
-    })
-  }
-
-  let urlPath = UrlPath.parse(~base="/docs/reason-react", route)
-
-  // Todo: improve this bit (UrlPath should go away at some point)
-  let breadcrumbs = if route === "/community" {
-    Some({
-      open UrlPath
-      list{{name: "Community", href: "/community"}, {name: "Overview", href: ""}}
-    })
-  } else {
-    Belt.Option.map(urlPath, v => UrlPath.toBreadCrumbs(~prefix=list{}, v))
-  }
-
-  Js.log(breadcrumbs)
-
-  let title = "Community"
-
-  <DocsLayout theme=#Reason components categories title ?activeToc ?breadcrumbs>
-    children
-  </DocsLayout>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/DocsLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/DocsLayout.res
deleted file mode 100644
index 8d49d93..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/DocsLayout.res
+++ /dev/null
@@ -1,310 +0,0 @@
-// This module is used for all plain prose text related
-// Docs, mostly /docs/manual/latest and similar sections
-
-open Util.ReactStuff
-module Link = Next.Link
-
-module Toc = {
-  type entry = {
-    header: string,
-    href: string,
-  }
-
-  type t = {
-    title: string,
-    entries: array<entry>,
-  }
-
-  @react.component
-  let make = (~entries: array<entry>) =>
-    <ul className="mt-2 mb-6 border-l border-primary">
-      {Belt.Array.map(entries, ({header, href}) =>
-        <li key=header className="pl-2 mt-1">
-          <Link href>
-            <a className="font-medium block text-sm text-night-light hover:text-primary">
-              {header->s}
-            </a>
-          </Link>
-        </li>
-      )->ate}
-    </ul>
-}
-
-module Sidebar = {
-  module Title = {
-    @react.component
-    let make = (~children) => {
-      let className = "font-sans font-black text-night-light tracking-wide text-xs uppercase mt-5"
-
-      <div className> children </div>
-    }
-  }
-
-  module NavItem = {
-    // Navigation point information
-    type t = {
-      name: string,
-      href: string,
-    }
-    @react.component
-    let make = (
-      ~getActiveToc: option<t => option<Toc.t>>=?,
-      ~isItemActive: t => bool=_nav => false,
-      ~isHidden=false,
-      ~items: array<t>,
-    ) =>
-      <ul className="mt-2 text-sm font-medium">
-        {Belt.Array.map(items, m => {
-          let hidden = isHidden ? "hidden" : "block"
-          let active = isItemActive(m)
-            ? j` bg-primary-15 text-primary-dark rounded -mx-2 px-2 font-bold block `
-            : ""
-
-          let activeToc = switch getActiveToc {
-          | Some(getActiveToc) => getActiveToc(m)
-          | None => None
-          }
-
-          <li key=m.name className={hidden ++ " mt-2 leading-5 w-4/5"}>
-            <Link href=m.href>
-              <a
-                className={"truncate block py-1 md:h-auto text-night-darker hover:text-primary " ++
-                active}>
-                {m.name->s}
-              </a>
-            </Link>
-            {switch activeToc {
-            | Some({entries}) =>
-              if Belt.Array.length(entries) === 0 {
-                React.null
-              } else {
-                <Toc entries />
-              }
-            | None => React.null
-            }}
-          </li>
-        })->ate}
-      </ul>
-  }
-
-  module Category = {
-    type t = {
-      name: string,
-      items: array<NavItem.t>,
-    }
-
-    @react.component
-    let make = (~getActiveToc=?, ~isItemActive: option<NavItem.t => bool>=?, ~category: t) =>
-      <div key=category.name className="my-12">
-        <Title> {category.name->s} </Title>
-        <NavItem ?isItemActive ?getActiveToc items=category.items />
-      </div>
-  }
-
-  module ToplevelNav = {
-    @react.component
-    let make = (~title="", ~backHref=?, ~version=?) => {
-      let back = switch backHref {
-      | Some(href) =>
-        <Link href>
-          <a className="w-5 h-5"> <Icon.CornerLeftUp className="w-full h-full" /> </a>
-        </Link>
-      | None => React.null
-      }
-
-      let versionTag = switch version {
-      | Some(version) => <Tag kind=#Subtle text=version />
-      | None => React.null
-      }
-
-      <div className="flex items-center justify-between my-4 w-full">
-        <div className="flex items-center w-2/3">
-          back
-          <span className="ml-2 font-sans font-black text-night-dark text-xl"> {title->s} </span>
-        </div>
-        <div className="ml-auto"> versionTag </div>
-      </div>
-    }
-  }
-
-  module CollapsibleSection = {
-    module NavUl = {
-      // Navigation point information
-      type t = {
-        name: string,
-        href: string,
-      }
-
-      @react.component
-      let make = (
-        ~onItemClick: option<ReactEvent.Mouse.t => unit>=?,
-        ~isItemActive: t => bool=_nav => false,
-        ~items: array<t>,
-      ) =>
-        <ul className="mt-3 text-night">
-          {Belt.Array.map(items, m => {
-            let active = isItemActive(m)
-              ? j` bg-primary-15 text-primary-dark -ml-1 px-2 font-bold block `
-              : ""
-            <li key=m.name className="leading-5 w-4/5">
-              <Link href=m.href>
-                <a
-                  onClick=?onItemClick
-                  className={"truncate block pl-3 h-8 md:h-auto border-l-2 border-night-10 block text-night hover:pl-4 hover:text-night-dark" ++
-                  active}>
-                  {m.name->s}
-                </a>
-              </Link>
-            </li>
-          })->ate}
-        </ul>
-    }
-    @react.component
-    let make = (
-      ~onHeaderClick: option<ReactEvent.Mouse.t => unit>=?,
-      ~isItemActive=?,
-      ~headers: array<string>,
-      ~moduleName: string,
-    ) => {
-      let (collapsed, setCollapsed) = React.useState(() => false)
-      let items = Belt.Array.map(headers, header => {
-        open NavUl
-        {name: header, href: "#" ++ header}
-      })
-
-      let direction = collapsed ? #Down : #Up
-
-      <div className="py-3 px-3 bg-primary-15 rounded-lg">
-        <a
-          className="flex justify-between items-center cursor-pointer text-primary hover:text-primary text-night-dark text-base"
-          href="#"
-          onClick={evt => {
-            ReactEvent.Mouse.preventDefault(evt)
-            setCollapsed(isCollapsed => !isCollapsed)
-          }}>
-          {moduleName->s}
-          <span className="ml-2 block text-primary"> <Icon.Caret size=#Md direction /> </span>
-        </a>
-        {if !collapsed {
-          <NavUl ?isItemActive onItemClick=?onHeaderClick items />
-        } else {
-          React.null
-        }}
-      </div>
-    }
-  }
-
-  // subitems: list of functions inside given module (defined by route)
-  @react.component
-  let make = (
-    ~categories: array<Category.t>,
-    ~route: string,
-    ~toplevelNav=React.null,
-    ~title: option<string>=?,
-    ~preludeSection=React.null,
-    ~activeToc: option<Toc.t>=?,
-    ~isOpen: bool,
-    ~toggle: unit => unit,
-  ) => {
-    let isItemActive = (navItem: NavItem.t) => navItem.href === route
-
-    let getActiveToc = (navItem: NavItem.t) =>
-      if navItem.href === route {
-        activeToc
-      } else {
-        None
-      }
-
-    <>
-      <div
-        className={(
-          isOpen ? "fixed w-full left-0 h-full z-10 min-w-20" : "hidden "
-        ) ++ " md:block md:w-1/4 md:h-auto md:relative overflow-y-visible bg-white md:relative"}>
-        <aside
-          className="relative top-0 px-4 w-full block md:top-16 md:pt-10 md:sticky border-r border-snow-dark overflow-y-auto scrolling-touch pb-24"
-          style={Style.make(~height="calc(100vh - 4rem", ())}>
-          <div className="flex justify-between">
-            <div className="w-3/4 md:w-full"> toplevelNav </div>
-            <button
-              onClick={evt => {
-                ReactEvent.Mouse.preventDefault(evt)
-                toggle()
-              }}
-              className="md:hidden h-16">
-              <Icon.Close />
-            </button>
-          </div>
-          preludeSection
-          /* Firefox ignores padding in scroll containers, so we need margin
-               to make a bottom gap for the sidebar.
-               See https://stackoverflow.com/questions/29986977/firefox-ignores-padding-when-using-overflowscroll
- */
-          <div className="mb-56">
-            {categories
-            ->Belt.Array.map(category =>
-              <div key=category.name> <Category getActiveToc isItemActive category /> </div>
-            )
-            ->ate}
-          </div>
-        </aside>
-      </div>
-    </>
-  }
-}
-
-module UrlPath = SidebarLayout.UrlPath
-module NavItem = Sidebar.NavItem
-module Category = Sidebar.Category
-
-@react.component
-let make = (
-  ~breadcrumbs: option<list<UrlPath.breadcrumb>>=?,
-  ~title: string,
-  ~version: option<string>=?,
-  ~activeToc: option<Toc.t>=?,
-  ~categories: array<Category.t>,
-  ~components=Markdown.default,
-  ~theme=#Reason,
-  ~children,
-) => {
-  let router = Next.Router.useRouter()
-  let route = router.route
-
-  let (isSidebarOpen, setSidebarOpen) = React.useState(_ => false)
-  let toggleSidebar = () => setSidebarOpen(prev => !prev)
-
-  React.useEffect1(() => {
-    open Next.Router.Events
-    let {Next.Router.events: events} = router
-
-    let onChangeComplete = _url => setSidebarOpen(_ => false)
-
-    events->on(#routeChangeComplete(onChangeComplete))
-    events->on(#hashChangeComplete(onChangeComplete))
-
-    Some(
-      () => {
-        events->off(#routeChangeComplete(onChangeComplete))
-        events->off(#hashChangeComplete(onChangeComplete))
-      },
-    )
-  }, [])
-
-  let preludeSection =
-    <div className="flex justify-between text-primary font-medium items-baseline">
-      {title->s}
-      {switch version {
-      | Some(version) => <span className="font-mono text-sm"> {version->s} </span>
-      | None => React.null
-      }}
-    </div>
-
-  let sidebar =
-    <Sidebar
-      isOpen=isSidebarOpen toggle=toggleSidebar preludeSection title ?activeToc categories route
-    />
-
-  <SidebarLayout theme components sidebarState=(isSidebarOpen, setSidebarOpen) sidebar ?breadcrumbs>
-    children
-  </SidebarLayout>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/GenTypeDocsLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/GenTypeDocsLayout.res
deleted file mode 100644
index 484144a..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/GenTypeDocsLayout.res
+++ /dev/null
@@ -1,107 +0,0 @@
-%%raw(`
-let hljs = require('highlight.js/lib/highlight');
-let javascriptHighlightJs = require('highlight.js/lib/languages/javascript');
-let ocamlHighlightJs = require('highlight.js/lib/languages/ocaml');
-let reasonHighlightJs = require('reason-highlightjs');
-let bashHighlightJs = require('highlight.js/lib/languages/bash');
-let jsonHighlightJs = require('highlight.js/lib/languages/json');
-hljs.registerLanguage('reason', reasonHighlightJs);
-hljs.registerLanguage('javascript', javascriptHighlightJs);
-hljs.registerLanguage('ocaml', ocamlHighlightJs);
-hljs.registerLanguage('sh', bashHighlightJs);
-hljs.registerLanguage('json', jsonHighlightJs);
-`)
-
-module Link = Next.Link
-
-// Structure defined by `scripts/extract-tocs.js`
-let tocData: Js.Dict.t<{
-  "title": string,
-  "headers": array<{
-    "name": string,
-    "href": string,
-  }>,
-}> = %raw("require('../index_data/gentype_toc.json')")
-
-module UrlPath = DocsLayout.UrlPath
-module NavItem = DocsLayout.NavItem
-module Category = DocsLayout.Category
-module Toc = DocsLayout.Toc
-
-let overviewNavs = [
-  {
-    open NavItem
-    {name: "Introduction", href: "/docs/gentype/latest/introduction"}
-  },
-  {
-    open NavItem
-    {
-      name: "Getting Started",
-      href: "/docs/gentype/latest/getting-started",
-    }
-  },
-  {
-    open NavItem
-    {name: "Usage", href: "/docs/gentype/latest/usage"}
-  },
-]
-
-let advancedNavs = [
-  {
-    open NavItem
-    {
-      name: "Supported Types",
-      href: "/docs/gentype/latest/supported-types",
-    }
-  },
-]
-
-let categories = [
-  {
-    open Category
-    {name: "Overview", items: overviewNavs}
-  },
-  {name: "Advanced", items: advancedNavs},
-]
-
-@react.component
-let make = (~components=Markdown.default, ~children) => {
-  let router = Next.Router.useRouter()
-  let route = router.route
-
-  let activeToc: option<Toc.t> = {
-    open Belt.Option
-    Js.Dict.get(tocData, route)->map(data => {
-      let title = data["title"]
-      let entries = Belt.Array.map(data["headers"], header => {
-        Toc.header: header["name"],
-        href: "#" ++ header["href"],
-      })
-      {Toc.title: title, entries: entries}
-    })
-  }
-
-  let urlPath = UrlPath.parse(~base="/docs/gentype", route)
-
-  let breadcrumbs = Belt.Option.map(urlPath, v => {
-    let {UrlPath.version: version} = v
-    let prefix = {
-      open UrlPath
-      list{
-        {name: "Docs", href: "/docs"},
-        {
-          name: "GenType",
-          href: "/docs/gentype/" ++ (version ++ "/introduction"),
-        },
-      }
-    }
-    UrlPath.toBreadCrumbs(~prefix, v)
-  })
-
-  let title = "GenType"
-  let version = "v3"
-
-  <DocsLayout theme=#Js components categories version title ?activeToc ?breadcrumbs>
-    children
-  </DocsLayout>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/JavaScriptApiLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/JavaScriptApiLayout.res
deleted file mode 100644
index 70eb652..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/JavaScriptApiLayout.res
+++ /dev/null
@@ -1,47 +0,0 @@
-module Link = Next.Link
-
-module Sidebar = SidebarLayout.Sidebar
-
-/* Used for API docs (structured data) */
-module Docs = {
-  @react.component
-  let make = (~theme=#Reason, ~components=ApiMarkdown.default, ~children) => {
-    let router = Next.Router.useRouter()
-    let theme = ColorTheme.toCN(#Js)
-
-    let categories: array<Sidebar.Category.t> = [
-      {
-        name: "Introduction",
-        items: [{name: "Overview", href: "/apis/javascript/latest"}],
-      },
-      {
-        name: "JavaScript",
-        items: [
-          {name: "Js Module", href: "/apis/javascript/latest/js"},
-          {name: "Belt Stdlib", href: "/apis/javascript/latest/belt"},
-        ],
-      },
-    ]
-
-    let (isSidebarOpen, setSidebarOpen) = React.useState(_ => false)
-    let toggleSidebar = () => setSidebarOpen(prev => !prev)
-
-    let sidebar =
-      <Sidebar isOpen=isSidebarOpen toggle=toggleSidebar categories route=router.route />
-
-    <SidebarLayout theme=#Js components sidebarState=(isSidebarOpen, setSidebarOpen) sidebar>
-      children
-    </SidebarLayout>
-  }
-}
-
-/*
- This layout is used for structured prose text with proper H2 headings.
- We cannot really use the same layout as with the Docs module, since they
- have different semantic styling and do things such as hiding the text
- of H2 nodes.
- */
-module Prose = {
-  @react.component
-  let make = (~children) => <Docs components=Markdown.default> children </Docs>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/JsDocsLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/JsDocsLayout.res
deleted file mode 100644
index 33225d1..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/JsDocsLayout.res
+++ /dev/null
@@ -1,235 +0,0 @@
-module Link = Next.Link
-
-// Structure defined by `scripts/extract-indices.js`
-let indexData: Js.Dict.t<{
-  "moduleName": string,
-  "headers": array<{
-    "name": string,
-    "href": string,
-  }>,
-}> = %raw("require('../index_data/js_api_index.json')")
-
-// Retrieve package.json to access the version of bs-platform.
-let package: Js.t<{"dependencies": {"bs-platform": string}}> = %raw("require('../package.json')")
-
-module Sidebar = SidebarLayout.Sidebar
-module UrlPath = SidebarLayout.UrlPath
-module NavItem = Sidebar.NavItem
-module Category = Sidebar.Category
-
-let overviewNavs = [
-  {
-    open NavItem
-    {name: "Introduction", href: "/apis/javascript/latest/js"}
-  },
-]
-
-let apiNavs = [
-  {
-    open NavItem
-    {name: "Array2", href: "/apis/javascript/latest/js/array-2"}
-  },
-  {name: "Array", href: "/apis/javascript/latest/js/array"},
-  {name: "Console", href: "/apis/javascript/latest/js/console"},
-  {name: "Date", href: "/apis/javascript/latest/js/date"},
-  {name: "Dict", href: "/apis/javascript/latest/js/dict"},
-  {name: "Exn", href: "/apis/javascript/latest/js/exn"},
-  {name: "Float", href: "/apis/javascript/latest/js/float"},
-  {name: "Global", href: "/apis/javascript/latest/js/global"},
-  {name: "Int", href: "/apis/javascript/latest/js/int"},
-  {name: "Json", href: "/apis/javascript/latest/js/json"},
-  {name: "List", href: "/apis/javascript/latest/js/list"},
-  {name: "Math", href: "/apis/javascript/latest/js/math"},
-  {name: "NullUndefined", href: "/apis/javascript/latest/js/null-undefined"},
-  {name: "Null", href: "/apis/javascript/latest/js/null"},
-  {name: "Nullable", href: "/apis/javascript/latest/js/nullable"},
-  {name: "Obj", href: "/apis/javascript/latest/js/obj"},
-  {name: "Option", href: "/apis/javascript/latest/js/option"},
-  {name: "Promise", href: "/apis/javascript/latest/js/promise"},
-  {name: "Re", href: "/apis/javascript/latest/js/re"},
-  {name: "Result", href: "/apis/javascript/latest/js/result"},
-  {name: "String2", href: "/apis/javascript/latest/js/string-2"},
-  {name: "String", href: "/apis/javascript/latest/js/string"},
-  {
-    name: "TypedArrayArrayBuffer",
-    href: "/apis/javascript/latest/js/typed-array_array-buffer",
-  },
-  {
-    name: "TypedArrayDataView",
-    href: "/apis/javascript/latest/js/typed-array_data-view",
-  },
-  {
-    name: "TypedArrayFloat32Array",
-    href: "/apis/javascript/latest/js/typed-array_float-32-array",
-  },
-  {
-    name: "TypedArrayFloat64Array",
-    href: "/apis/javascript/latest/js/typed-array_float-64-array",
-  },
-  {
-    name: "TypedArrayInt8Array",
-    href: "/apis/javascript/latest/js/typed-array_int-8-array",
-  },
-  {
-    name: "TypedArrayInt16Array",
-    href: "/apis/javascript/latest/js/typed-array_int-16-array",
-  },
-  {
-    name: "TypedArrayInt32Array",
-    href: "/apis/javascript/latest/js/typed-array_int-32-array",
-  },
-  {
-    name: "TypedArrayTypeS",
-    href: "/apis/javascript/latest/js/typed-array_type-s",
-  },
-  {
-    name: "TypedArrayUint8Array",
-    href: "/apis/javascript/latest/js/typed-array_uint-8-array",
-  },
-  {
-    name: "TypedArrayUint8ClampedArray",
-    href: "/apis/javascript/latest/js/typed-array_uint-8-clamped-array",
-  },
-  {
-    name: "TypedArrayUint16Array",
-    href: "/apis/javascript/latest/js/typed-array_uint-16-array",
-  },
-  {
-    name: "TypedArrayUint32Array",
-    href: "/apis/javascript/latest/js/typed-array_uint-32-array",
-  },
-  {
-    name: "TypedArray2ArrayBuffer",
-    href: "/apis/javascript/latest/js/typed-array-2_array-buffer",
-  },
-  {
-    name: "TypedArray2DataView",
-    href: "/apis/javascript/latest/js/typed-array-2_data-view",
-  },
-  {
-    name: "TypedArray2Float32Array",
-    href: "/apis/javascript/latest/js/typed-array-2_float-32-array",
-  },
-  {
-    name: "TypedArray2Float64Array",
-    href: "/apis/javascript/latest/js/typed-array-2_float-64-array",
-  },
-  {
-    name: "TypedArray2Int8Array",
-    href: "/apis/javascript/latest/js/typed-array-2_int-8-array",
-  },
-  {
-    name: "TypedArray2Int16Array",
-    href: "/apis/javascript/latest/js/typed-array-2_int-16-array",
-  },
-  {
-    name: "TypedArray2Int32Array",
-    href: "/apis/javascript/latest/js/typed-array-2_int-32-array",
-  },
-  {
-    name: "TypedArray2Uint8Array",
-    href: "/apis/javascript/latest/js/typed-array-2_uint-8-array",
-  },
-  {
-    name: "TypedArray2Uint8ClampedArray",
-    href: "/apis/javascript/latest/js/typed-array-2_uint-8-clamped-array",
-  },
-  {
-    name: "TypedArray2Uint16Array",
-    href: "/apis/javascript/latest/js/typed-array-2_uint-16-array",
-  },
-  {
-    name: "TypedArray2Uint32Array",
-    href: "/apis/javascript/latest/js/typed-array-2_uint-32-array",
-  },
-  {name: "TypedArray2", href: "/apis/javascript/latest/js/typed-array-2"},
-  {name: "TypedArray", href: "/apis/javascript/latest/js/typed-array"},
-  {name: "Types", href: "/apis/javascript/latest/js/types"},
-  {name: "Undefined", href: "/apis/javascript/latest/js/undefined"},
-  {name: "Vector", href: "/apis/javascript/latest/js/vector"},
-]
-
-let categories = [
-  {
-    open Category
-    {name: "Overview", items: overviewNavs}
-  },
-  {name: "API", items: apiNavs},
-]
-
-module Docs = {
-  @react.component
-  let make = (~components=ApiMarkdown.default, ~children) => {
-    let router = Next.Router.useRouter()
-    let route = router.route
-
-    // Gather data for the CollapsibleSection
-    let headers = {
-      open Belt.Option
-      Js.Dict.get(indexData, route)
-      ->map(data =>
-        data["headers"]->Belt.Array.map(header => (header["name"], "#" ++ header["href"]))
-      )
-      ->getWithDefault([])
-    }
-
-    let moduleName = {
-      open Belt.Option
-      Js.Dict.get(indexData, route)->map(data => data["moduleName"])->getWithDefault("?")
-    }
-
-    let (isSidebarOpen, setSidebarOpen) = React.useState(_ => false)
-    let toggleSidebar = () => setSidebarOpen(prev => !prev)
-    let urlPath = UrlPath.parse(~base="/apis/javascript", route)
-
-    let breadcrumbs = Belt.Option.map(urlPath, v => {
-      let {UrlPath.version: version} = v
-      let prefix = {
-        open UrlPath
-        list{
-          {name: "API", href: "/apis"},
-          {name: "JavaScript", href: "/apis/javascript/" ++ version},
-        }
-      }
-      UrlPath.toBreadCrumbs(~prefix, v)
-    })
-
-    let toplevelNav = switch urlPath {
-    | Some(urlPath) =>
-      let version = {
-        open UrlPath
-        urlPath.version
-      }
-      let backHref = Some(UrlPath.fullUpLink(urlPath))
-      <Sidebar.ToplevelNav title="Js Module" version ?backHref />
-    | None => React.null
-    }
-
-    // Todo: We need to introduce router state to be able to
-    //       listen to anchor changes (#get, #map,...)
-    let preludeSection =
-      route !== "/apis/javascript/latest/js"
-        ? <Sidebar.CollapsibleSection headers moduleName />
-        : React.null
-
-    let sidebar =
-      <Sidebar
-        isOpen=isSidebarOpen
-        toggle=toggleSidebar
-        categories
-        route=router.route
-        preludeSection
-        toplevelNav
-      />
-
-    <SidebarLayout
-      theme=#Js components sidebarState=(isSidebarOpen, setSidebarOpen) sidebar ?breadcrumbs>
-      children
-    </SidebarLayout>
-  }
-}
-
-module Prose = {
-  @react.component
-  let make = (~children) => <Docs components=Markdown.default> children </Docs>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/MainLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/MainLayout.res
deleted file mode 100644
index 6bd181a..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/MainLayout.res
+++ /dev/null
@@ -1,25 +0,0 @@
-module Link = Next.Link
-
-@react.component
-let make = (~children, ~components=Markdown.default) => {
-  let minWidth = ReactDOMRe.Style.make(~minWidth="20rem", ())
-  let overlayState = React.useState(() => false)
-
-  <>
-    <Meta />
-    <div className="mb-32 mt-16">
-      <div className="text-night text-lg">
-        <Navigation overlayState />
-        <div className="flex justify-center overflow-hidden">
-          <main
-            style=minWidth
-            className="mt-32 lg:align-center w-full px-4 max-w-xl " /* ++ (isOpen ? " hidden" : "") */>
-            <Mdx.Provider components>
-              <div className="w-full max-w-lg"> children </div>
-            </Mdx.Provider>
-          </main>
-        </div>
-      </div>
-    </div>
-  </>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ManualDocsLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ManualDocsLayout.res
deleted file mode 100644
index e321ad5..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ManualDocsLayout.res
+++ /dev/null
@@ -1,149 +0,0 @@
-module Link = Next.Link
-
-// Structure defined by `scripts/extract-tocs.js`
-let tocData: Js.Dict.t<{
-  "title": string,
-  "headers": array<{
-    "name": string,
-    "href": string,
-  }>,
-}> = %raw("require('../index_data/manual_toc.json')")
-
-module UrlPath = DocsLayout.UrlPath
-module NavItem = DocsLayout.NavItem
-module Category = DocsLayout.Category
-module Toc = DocsLayout.Toc
-
-let overviewNavs = [
-  {
-    open NavItem
-    {name: "Introduction", href: "/docs/manual/latest/introduction"}
-  },
-  {name: "Installation", href: "/docs/manual/latest/installation"},
-  {name: "Editor Plugins", href: "/docs/manual/latest/editor-plugins"},
-  {name: "Extra Goodies", href: "/docs/manual/latest/extra-goodies"},
-]
-
-let basicNavs = [
-  {
-    open NavItem
-    {name: "Overview", href: "/docs/manual/latest/overview"}
-  },
-  {name: "Let Binding", href: "/docs/manual/latest/let-binding"},
-  {name: "Type", href: "/docs/manual/latest/type"},
-  {name: "String & Char", href: "/docs/manual/latest/string-and-char"},
-  {name: "Boolean", href: "/docs/manual/latest/boolean"},
-  {name: "Integer & Float", href: "/docs/manual/latest/integer-and-float"},
-  {name: "Tuple", href: "/docs/manual/latest/tuple"},
-  {name: "Record", href: "/docs/manual/latest/record"},
-  {name: "Variant", href: "/docs/manual/latest/variant"},
-  {
-    name: "Null, Undefined & Option",
-    href: "/docs/manual/latest/null-undefined-option",
-  },
-  {name: "List & Array", href: "/docs/manual/latest/list-and-array"},
-  {name: "Function", href: "/docs/manual/latest/function"},
-  {name: "If-Else", href: "/docs/manual/latest/if-else"},
-  {name: "Pipe First", href: "/docs/manual/latest/pipe-first"},
-  {name: "More on Type", href: "/docs/manual/latest/more-on-type"},
-  {name: "Destructuring", href: "/docs/manual/latest/destructuring"},
-  {name: "Pattern Matching", href: "/docs/manual/latest/pattern-matching"},
-  {name: "Mutation", href: "/docs/manual/latest/mutation"},
-  {name: "Imperative Loops", href: "/docs/manual/latest/imperative-loops"},
-  {name: "JSX", href: "/docs/manual/latest/jsx"},
-  {name: "External", href: "/docs/manual/latest/external"},
-  {name: "Exception", href: "/docs/manual/latest/exception"},
-  {name: "Object", href: "/docs/manual/latest/object"},
-  {name: "Module", href: "/docs/manual/latest/module"},
-  {name: "Promise", href: "/docs/manual/latest/promise"},
-]
-
-let javascriptNavs = [
-  {
-    open NavItem
-    {name: "Interop", href: "/docs/manual/latest/interop"}
-  },
-  {name: "Syntax Cheatsheet", href: "/docs/manual/latest/syntax-cheatsheet"},
-  {name: "Libraries", href: "/docs/manual/latest/libraries"},
-  {
-    name: "Converting from JS",
-    href: "/docs/manual/latest/converting-from-js",
-  },
-]
-
-let nativeNavs = [
-  {
-    open NavItem
-    {name: "Native", href: "/docs/manual/latest/native"}
-  },
-  {name: "Native Quickstart", href: "/docs/manual/latest/native-quickstart"},
-]
-
-let extraNavs = [
-  {
-    open NavItem
-    {name: "FAQ", href: "/docs/manual/latest/faq"}
-  },
-  {name: "Newcomer Examples", href: "/docs/manual/latest/newcomer-examples"},
-  {name: "Project Structure", href: "/docs/manual/latest/project-structure"},
-]
-
-let categories = [
-  {
-    open Category
-    {name: "Overview", items: overviewNavs}
-  },
-  {name: "Basics", items: basicNavs},
-  {name: "JavaScript", items: javascriptNavs},
-  {name: "Native", items: nativeNavs},
-  {name: "Extra", items: extraNavs},
-]
-
-module Docs = {
-  @react.component
-  let make = (~components=Markdown.default, ~children) => {
-    let router = Next.Router.useRouter()
-    let route = router.route
-
-    let activeToc: option<Toc.t> = {
-      open Belt.Option
-      Js.Dict.get(tocData, route)->map(data => {
-        let title = data["title"]
-        let entries = Belt.Array.map(data["headers"], header => {
-          Toc.header: header["name"],
-          href: "#" ++ header["href"],
-        })
-        {Toc.title: title, entries: entries}
-      })
-    }
-
-    let urlPath = UrlPath.parse(~base="/docs/manual", route)
-
-    let breadcrumbs = Belt.Option.map(urlPath, v => {
-      let {UrlPath.version: version} = v
-      let prefix = {
-        open UrlPath
-        list{
-          {name: "Docs", href: "/docs"},
-          {
-            name: "Language Manual",
-            href: "/docs/manual/" ++ (version ++ "/introduction"),
-          },
-        }
-      }
-      UrlPath.toBreadCrumbs(~prefix, v)
-    })
-
-    let title = "Language Manual"
-    let version = "v3.6"
-
-    <DocsLayout theme=#Reason components categories version title ?activeToc ?breadcrumbs>
-      children
-    </DocsLayout>
-  }
-}
-
-module Prose = {
-  @react.component
-  let make = (~children) => <Docs components=Markdown.default> children </Docs>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ReasonCompilerDocsLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ReasonCompilerDocsLayout.res
deleted file mode 100644
index 833a224..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ReasonCompilerDocsLayout.res
+++ /dev/null
@@ -1,231 +0,0 @@
-module Link = Next.Link
-
-// Structure defined by `scripts/extract-tocs.js`
-let tocData: Js.Dict.t<{
-  "title": string,
-  "headers": array<{
-    "name": string,
-    "href": string,
-  }>,
-}> = %raw("require('../index_data/reason_compiler_toc.json')")
-
-module UrlPath = DocsLayout.UrlPath
-module NavItem = DocsLayout.NavItem
-module Category = DocsLayout.Category
-module Toc = DocsLayout.Toc
-
-let overviewNavs = [
-  {
-    open NavItem
-    {
-      name: "Introduction",
-      href: "/docs/reason-compiler/latest/introduction",
-    }
-  },
-  {name: "Installation", href: "/docs/reason-compiler/latest/installation"},
-  {name: "New Project", href: "/docs/reason-compiler/latest/new-project"},
-  {name: "Try", href: "/docs/reason-compiler/latest/try"},
-  {
-    name: "Concepts Overview",
-    href: "/docs/reason-compiler/latest/concepts-overview",
-  },
-  {
-    name: "Upgrade Guide to v7",
-    href: "/docs/reason-compiler/latest/upgrade-to-v7",
-  },
-]
-
-let interopNavs = [
-  {
-    open NavItem
-    {
-      name: "Overview",
-      href: "/docs/reason-compiler/latest/interop-overview",
-    }
-  },
-  {
-    name: "Cheatsheet",
-    href: "/docs/reason-compiler/latest/interop-cheatsheet",
-  },
-  {
-    name: "Embed Raw JavaScript",
-    href: "/docs/reason-compiler/latest/embed-raw-javascript",
-  },
-  {
-    name: "Common Data Types",
-    href: "/docs/reason-compiler/latest/common-data-types",
-  },
-  {
-    name: "Intro to External",
-    href: "/docs/reason-compiler/latest/intro-to-external",
-  },
-  {
-    name: "Bind to Global Values",
-    href: "/docs/reason-compiler/latest/bind-to-global-values",
-  },
-  {
-    name: "Null, Undefined & Option",
-    href: "/docs/reason-compiler/latest/null-undefined-option",
-  },
-  {name: "Object", href: "/docs/reason-compiler/latest/object"},
-  {name: "Object 2", href: "/docs/reason-compiler/latest/object-2"},
-  {name: "Class", href: "/docs/reason-compiler/latest/class"},
-  {name: "Function", href: "/docs/reason-compiler/latest/function"},
-  {
-    name: "Property access",
-    href: "/docs/reason-compiler/latest/property-access",
-  },
-  {
-    name: "Return Value Wrapping",
-    href: "/docs/reason-compiler/latest/return-value-wrapping",
-  },
-  {
-    name: "Import & Export",
-    href: "/docs/reason-compiler/latest/import-export",
-  },
-  {
-    name: "Regular Expression",
-    href: "/docs/reason-compiler/latest/regular-expression",
-  },
-  {name: "Exceptions", href: "/docs/reason-compiler/latest/exceptions"},
-  {name: "JSON", href: "/docs/reason-compiler/latest/json"},
-  {name: "Pipe First", href: "/docs/reason-compiler/latest/pipe-first"},
-  {
-    name: "Generate Converters & Helpers",
-    href: "/docs/reason-compiler/latest/generate-converters-accessors",
-  },
-  {
-    name: "Better Data Structures Printing (Debug Mode)",
-    href: "/docs/reason-compiler/latest/better-data-structures-printing-debug-mode",
-  },
-  {
-    name: "NodeJS Special Variables",
-    href: "/docs/reason-compiler/latest/nodejs-special-variables",
-  },
-  {name: "Miscellaneous", href: "/docs/reason-compiler/latest/interop-misc"},
-  {
-    name: "Browser Support & Polyfills",
-    href: "/docs/reason-compiler/latest/browser-support-polyfills",
-  },
-  {name: "Decorators", href: "/docs/reason-compiler/latest/decorators"},
-]
-
-let buildsystemNavs = [
-  {
-    open NavItem
-    {
-      name: "Overview",
-      href: "/docs/reason-compiler/latest/build-overview",
-    }
-  },
-  {
-    name: "Configuration",
-    href: "/docs/reason-compiler/latest/build-configuration",
-  },
-  {
-    name: "Automatic Interface Generation",
-    href: "/docs/reason-compiler/latest/automatic-interface-generation",
-  },
-  {
-    name: "Interop with Other Build System",
-    href: "/docs/reason-compiler/latest/interop-with-js-build-systems",
-  },
-  {
-    name: "Performance",
-    href: "/docs/reason-compiler/latest/build-performance",
-  },
-  {name: "Advanced", href: "/docs/reason-compiler/latest/build-advanced"},
-]
-
-let stdlibNavs = [
-  {
-    open NavItem
-    {
-      name: "Overview",
-      href: "/docs/reason-compiler/latest/stdlib-overview",
-    }
-  },
-]
-
-let advancedNavs = [
-  {
-    open NavItem
-    {
-      name: "Conditional Compilation",
-      href: "/docs/reason-compiler/latest/conditional-compilation",
-    }
-  },
-  {
-    name: "Extended Compiler Options",
-    href: "/docs/reason-compiler/latest/extended-compiler-options",
-  },
-  {
-    name: "Use Existing OCaml Libraries",
-    href: "/docs/reason-compiler/latest/use-existing-ocaml-libraries",
-  },
-  {
-    name: "Difference from Native OCaml",
-    href: "/docs/reason-compiler/latest/difference-from-native-ocaml",
-  },
-  {
-    name: "Compiler Architecture & Principles",
-    href: "/docs/reason-compiler/latest/compiler-architecture-principles",
-  },
-  {
-    name: "Comparison to Js_of_ocaml",
-    href: "/docs/reason-compiler/latest/comparison-to-jsoo",
-  },
-]
-
-let categories = [
-  {
-    open Category
-    {name: "Overview", items: overviewNavs}
-  },
-  {name: "Interop", items: interopNavs},
-  {name: "Build System", items: buildsystemNavs},
-  {name: "Standard Library", items: stdlibNavs},
-  {name: "Advanced", items: advancedNavs},
-]
-
-@react.component
-let make = (~components=Markdown.default, ~children) => {
-  let router = Next.Router.useRouter()
-  let route = router.route
-
-  let activeToc: option<Toc.t> = {
-    open Belt.Option
-    Js.Dict.get(tocData, route)->map(data => {
-      let title = data["title"]
-      let entries = Belt.Array.map(data["headers"], header => {
-        Toc.header: header["name"],
-        href: "#" ++ header["href"],
-      })
-      {Toc.title: title, entries: entries}
-    })
-  }
-
-  let urlPath = UrlPath.parse(~base="/docs/reason-compiler", route)
-
-  let breadcrumbs = Belt.Option.map(urlPath, v => {
-    let {UrlPath.version: version} = v
-    let prefix = {
-      open UrlPath
-      list{
-        {name: "Docs", href: "/docs"},
-        {
-          name: "BuckleScript",
-          href: "/docs/reason-compiler/" ++ (version ++ "/introduction"),
-        },
-      }
-    }
-    UrlPath.toBreadCrumbs(~prefix, v)
-  })
-
-  let title = "BuckleScript"
-  let version = "v7"
-
-  <DocsLayout theme=#Js components categories version title ?activeToc ?breadcrumbs>
-    children
-  </DocsLayout>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ReasonReactDocsLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ReasonReactDocsLayout.res
deleted file mode 100644
index 7b97e34..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/ReasonReactDocsLayout.res
+++ /dev/null
@@ -1,164 +0,0 @@
-module Link = Next.Link
-
-// Structure defined by `scripts/extract-tocs.js`
-let tocData: Js.Dict.t<{
-  "title": string,
-  "headers": array<{
-    "name": string,
-    "href": string,
-  }>,
-}> = %raw("require('../index_data/reason_react_toc.json')")
-
-module UrlPath = DocsLayout.UrlPath
-module NavItem = DocsLayout.NavItem
-module Category = DocsLayout.Category
-module Toc = DocsLayout.Toc
-
-let overviewNavs = [
-  {
-    open NavItem
-    {
-      name: "Introduction",
-      href: "/docs/reason-react/latest/introduction",
-    }
-  },
-  {name: "Installation", href: "/docs/reason-react/latest/installation"},
-  {name: "Intro Example", href: "/docs/reason-react/latest/intro-example"},
-]
-
-let coreNavs = [
-  {
-    open NavItem
-    {name: "Components", href: "/docs/reason-react/latest/components"}
-  },
-  {name: "JSX (Version 3)", href: "/docs/reason-react/latest/jsx"},
-  {name: "Event", href: "/docs/reason-react/latest/event"},
-  {name: "Style", href: "/docs/reason-react/latest/style"},
-  {name: "Router", href: "/docs/reason-react/latest/router"},
-  {name: "Working with DOM", href: "/docs/reason-react/latest/dom"},
-  {name: "Refs in React", href: "/docs/reason-react/latest/refs"},
-]
-
-let idiomNavs = [
-  {
-    open NavItem
-    {
-      name: "Invalid Prop Name",
-      href: "/docs/reason-react/latest/invalid-prop-name",
-    }
-  },
-  {name: "Props Spread", href: "/docs/reason-react/latest/props-spread"},
-  {
-    name: "Component as Prop",
-    href: "/docs/reason-react/latest/component-as-prop",
-  },
-  {
-    name: "Ternary Shortcut",
-    href: "/docs/reason-react/latest/ternary-shortcut",
-  },
-  {
-    name: "Context & Mixins",
-    href: "/docs/reason-react/latest/context-mixins",
-  },
-  {
-    name: "Custom Class / Component Property",
-    href: "/docs/reason-react/latest/custom-class-component-property",
-  },
-]
-
-let recordApiNavs = [
-  {
-    open NavItem
-    {name: "JSX (Old, v2)", href: "/docs/reason-react/latest/jsx-2"}
-  },
-  {
-    name: "Creation, Props & Self",
-    href: "/docs/reason-react/latest/creation-props-self",
-  },
-  {name: "Render", href: "/docs/reason-react/latest/render"},
-  {
-    name: "Callback Handlers",
-    href: "/docs/reason-react/latest/callback-handlers",
-  },
-  {
-    name: "State, Action & Reducer",
-    href: "/docs/reason-react/latest/state-actions-reducer",
-  },
-  {name: "Lifecycles", href: "/docs/reason-react/latest/lifecycles"},
-  {
-    name: "Instance Variables",
-    href: "/docs/reason-react/latest/instance-variables",
-  },
-  {name: "React Ref", href: "/docs/reason-react/latest/react-ref"},
-  {
-    name: "Talk to Existing ReactJS Code",
-    href: "/docs/reason-react/latest/interop",
-  },
-  {name: "cloneElement", href: "/docs/reason-react/latest/clone-element"},
-  {name: "Children", href: "/docs/reason-react/latest/children"},
-  {
-    name: "Subscriptions Helper",
-    href: "/docs/reason-react/latest/subscriptions-helper",
-  },
-  {name: "Router", href: "/docs/reason-react/latest/router-2"},
-]
-
-let miscNavs = [
-  {
-    open NavItem
-    {name: "FAQ", href: "/docs/reason-react/latest/faq"}
-  },
-]
-
-let categories = [
-  {
-    open Category
-    {name: "Getting Started", items: overviewNavs}
-  },
-  {name: "Core", items: coreNavs},
-  {name: "ReactJS Idiom Equivalents", items: idiomNavs},
-  {name: "Record API (deprecated)", items: recordApiNavs},
-  {name: "Miscellaneous", items: miscNavs},
-]
-
-@react.component
-let make = (~components=Markdown.default, ~children) => {
-  let router = Next.Router.useRouter()
-  let route = router.route
-
-  let activeToc: option<Toc.t> = {
-    open Belt.Option
-    Js.Dict.get(tocData, route)->map(data => {
-      let title = data["title"]
-      let entries = Belt.Array.map(data["headers"], header => {
-        Toc.header: header["name"],
-        href: "#" ++ header["href"],
-      })
-      {Toc.title: title, entries: entries}
-    })
-  }
-
-  let urlPath = UrlPath.parse(~base="/docs/reason-react", route)
-
-  let breadcrumbs = Belt.Option.map(urlPath, v => {
-    let {UrlPath.version: version} = v
-    let prefix = {
-      open UrlPath
-      list{
-        {name: "Docs", href: "/docs"},
-        {
-          name: "ReasonReact",
-          href: "/docs/reason-react/" ++ (version ++ "/introduction"),
-        },
-      }
-    }
-    UrlPath.toBreadCrumbs(~prefix, v)
-  })
-
-  let title = "ReasonReact"
-  let version = "v0.7"
-
-  <DocsLayout theme=#Js components categories version title ?activeToc ?breadcrumbs>
-    children
-  </DocsLayout>
-}
diff --git a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/SidebarLayout.res b/jscomp/syntax/tests/idempotency/reasonml.org/layouts/SidebarLayout.res
deleted file mode 100644
index 8189898..0000000
--- a/jscomp/syntax/tests/idempotency/reasonml.org/layouts/SidebarLayout.res
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
-    This is the master layout for displaying sidebar based API docs.
-    Most of the modules defined in here are here to be reused
-    in other API related layouts, such as the Markdown representation
-    or the Sidebar component.
- */
-open Util.ReactStuff
-module Link = Next.Link
-
-module UrlPath = {
-  /*
-      Example base: /apis/javascript
-      Example route: /apis/javascript/latest/belt/something/mutable-map-int
-
-      would parse into following `t`:
-      {
-       base: "/apis/javascript",
-       version: "latest",
-       relPaths: [|"something"|],
-       up: Some("belt"),
-       current: "mutable-map-int"
-      }
- */
-  type t = {
-    base: string,
-    version: string,
-    relPaths: array<string>,
-    up: option<string>,
-    current: option<string>,
-  }
-
-  let parse = (~base: string, route: string): option<t> => {
-    let allPaths = Js.String2.replace(route, base ++ "/", "")->Js.String2.split("/")
-
-    let total = Belt.Array.length(allPaths)
-    if total < 2 {
-      None
-    } else {
-      let version = Belt.Array.getExn(allPaths, 0)
-      let (up, current) = switch Js.Array2.slice(allPaths, ~end_=total, ~start=-2) {
-      | [up, current] =>
-        let up = up === version ? None : Some(up)
-        (up, Some(current))
-      | _ => (None, None)
-      }
-
-      let relPaths = Js.Array.slice(allPaths, ~start=1, ~end_=-2)
-
-      Some({base: base, relPaths: relPaths, version: version, up: up, current: current})
-    }
-  }
-
-  /* Beautifies current titles from the url representation */
-  let prettyString = (str: string) => {
-    open Util.String
-    str->camelCase->capitalize
-  }
-
-  let fullUpLink = (urlPath: t): string => {
-    let {base, up, version} = urlPath
-    base ++ ("/" ++ (version ++ up->Belt.Option.mapWithDefault("", str => "/" ++ str)))
-  }
-
-  type breadcrumb = {
-    name: string,
-    href: string,
-  }
-
-  /*
-      Example to represent:
-      Api / JavaScript / latest / Belt / Array
-
-      ~prefix=[{name: "API", href="apis"}, {name: "JavaScript", href="apis/javascript/latest"}]
-
- */
-  let toBreadCrumbs = (~prefix: list<breadcrumb>=list{}, urlPath: t): list<breadcrumb> => {
-    let {base, version, relPaths, up} = urlPath
-
-    let upCrumb = Belt.Option.mapWithDefault(up, list{}, up => list{
-      {name: prettyString(up), href: fullUpLink(urlPath)},
-    })
-
-    let calculatedCrumbs = {
-      open Belt.List
-      concat(
-        fromArray(relPaths),
-        urlPath.current->Belt.Option.mapWithDefault(list{}, current => list{current}),
-      )->map(path => {
-        let upPath = Belt.Option.mapWithDefault(up, "", up => up ++ "/")
-        {
-          name: prettyString(path),
-          href: base ++ ("/" ++ (version ++ ("/" ++ (upPath ++ path)))),
-        }
-      })
-    }
-    open Belt.List
-    concatMany([prefix, upCrumb, calculatedCrumbs])
-  }
-}
-
-module BreadCrumbs = {
-  // See UrlPath for more details on the parameters
-  @react.component
-  let make = (~crumbs: list<UrlPath.breadcrumb>) =>
-    <div className="w-full overflow-x-auto text-xs text-night">
-      {Belt.List.mapWithIndex(crumbs, (i, crumb) => {
-        let item = if i === Belt.List.length(crumbs) - 1 {
-          <span key={Belt.Int.toString(i)}> {crumb.name->s} </span>
-        } else {
-          <Link key={Belt.Int.toString(i)} href=crumb.href> <a> {crumb.name->s} </a> </Link>
-        }
-        if i > 0 {
-          <span key={Belt.Int.toString(i)}> {" / "->s} item </span>
-        } else {
-          item
-        }
-      })
-      ->Belt.List.toArray
-      ->ate}
-    </div>
-}
-
-module Sidebar = {
-  module Title = {
-    @react.component
-    let make = (~children) => {
-      let className = "font-sans font-black text-night-dark text-xl mt-5"
-
-      <div className> children </div>
-    }
-  }
-
-  module NavItem = {
-    // Navigation point information
-    type t = {
-      name: string,
-      href: string,
-    }
-    @react.component
-    let make = (~isItemActive: t => bool=_nav => false, ~isHidden=false, ~items: array<t>) =>
-      <ul className="ml-2 mt-1 text-night">
-        {Belt.Array.map(items, m => {
-          let hidden = isHidden ? "hidden" : "block"
-          let active = isItemActive(m)
-            ? j` bg-primary-15 text-primary-dark rounded -mx-2 px-2 font-bold block `
-            : ""
-          <li
-            key=m.name
-            className={hidden ++ " leading-5 w-4/5"}
-            tabIndex=// to make non-interactive elements (like div, span or li) tab-able
-            // see https://developer.mozilla.org/en-US/docs/Web/Accessibility/Keyboard-navigable_JavaScript_widgets
-            0>
-            <Link href=m.href>
-              <a
-                className={"truncate block h-8 md:h-auto text-night hover:text-primary " ++ active}>
-                {m.name->s}
-              </a>
-            </Link>
-          </li>
-        })->ate}
-      </ul>
-  }
-
-  module Category = {
-    type t = {
-      name: string,
-      items: array<NavItem.t>,
-    }
-
-    @react.component
-    let make = (~isItemActive: option<NavItem.t => bool>=?, ~category: t) =>
-      <div key=category.name className="my-12">
-        <Title> {category.name->s} </Title> <NavItem ?isItemActive items=category.items />
-      </div>
-  }
-
-  module ToplevelNav = {
-    @react.component
-    let make = (~title="", ~backHref=?, ~version=?) => {
-      let back = switch backHref {
-      | Some(href) =>
-        <Link href>
-          <a className="w-5 h-5"> <Icon.CornerLeftUp className="w-full h-full" /> </a>
-        </Link>
-      | None => React.null
-      }
-
-      let versionTag = switch version {
-      | Some(version) => <Tag kind=#Subtle text=version />
-      | None => React.null
-      }
-
-      <div className="flex items-center justify-between mb-4 w-full">
-        <div className="flex items-center w-2/3">
-          back
-          <span className="ml-2 font-sans font-black text-night-dark text-xl"> {title->s} </span>
-        </div>
-        <div className="ml-auto"> versionTag </div>
-      </div>
-    }
-  }
-
-  module CollapsibleSection = {
-    module NavUl = {
-      // Navigation point information
-      type t = {
-        name: string,
-        href: string,
-      }
-
-      @react.component
-      let make = (~isItemActive: t => bool=_nav => false, ~items: array<t>) =>
-        <ul className="mt-3 text-night">
-          {Belt.Array.mapWithIndex(items, (idx, m) => {
-            let active = isItemActive(m)
-              ? j` bg-primary-15 text-primary-dark -ml-1 px-2 font-bold block `
-              : ""
-            <li
-              key=m.href
-              className="leading-5 w-4/5"
-              tabIndex=// to make non-interactive elements (like div, span or li) tab-able
-              // see https://developer.mozilla.org/en-US/docs/Web/Accessibility/Keyboard-navigable_JavaScript_widgets
-              idx>
-              <Link href=m.href>
-                <a
-                  className={"truncate block pl-3 h-8 md:h-auto border-l-2 border-night-10 block text-night hover:pl-4 hover:text-night-dark" ++
-                  active}>
-                  {m.name->s}
-                </a>
-              </Link>
-            </li>
-          })->ate}
-        </ul>
-    }
-    @react.component
-    let make = (
-      ~isItemActive=?,
-      // array((name, href))
-      ~headers: array<(string, string)>,
-      ~moduleName: string,
-    ) => {
-      let (collapsed, setCollapsed) = React.useState(() => false)
-      let items = Belt.Array.map(headers, ((name, href)) => {
-        open NavUl
-        {name: name, href: href}
-      })
-
-      let direction = collapsed ? #Down : #Up
-
-      <div className="py-3 px-3 bg-primary-15 rounded-lg">
-        <a
-          className="flex justify-between items-center cursor-pointer text-primary hover:text-primary text-night-dark text-base"
-          href="#"
-          onClick={evt => {
-            ReactEvent.Mouse.preventDefault(evt)
-            setCollapsed(isCollapsed => !isCollapsed)
-          }}>
-          {moduleName->s}
-          <span className="ml-2 block text-primary"> <Icon.Caret size=#Md direction /> </span>
-        </a>
-        {if !collapsed {
-          <NavUl ?isItemActive items />
-        } else {
-          React.null
-        }}
-      </div>
-    }
-  }
-
-  // subitems: list of functions inside given module (defined by route)
-  @react.component
-  let make = (
-    ~categories: array<Category.t>,
-    ~route: string,
-    ~toplevelNav=React.null,
-    ~preludeSection=React.null,
-    ~isOpen: bool,
-    ~toggle: unit => unit,
-  ) => {
-    let isItemActive = (navItem: NavItem.t) => navItem.href === route
-
-    <>
-      <div
-        className={(
-          isOpen ? "fixed w-full left-0 h-full z-10 min-w-20" : "hidden "
-        ) ++ " md:block md:w-1/4 md:h-auto md:relative overflow-y-visible bg-white md:relative"}>
-        <aside
-          className="relative top-0 px-4 w-full block md:top-16 md:sticky border-r border-snow-dark overflow-y-auto scrolling-touch pb-24 pt-8"
-          style={Style.make(~height="calc(100vh - 4rem", ())}>
-          <div className="flex justify-between">
-            <div className="w-3/4 md:w-full"> toplevelNav </div>
-            <button
-              onClick={evt => {
-                ReactEvent.Mouse.preventDefault(evt)
-                toggle()
-              }}
-              className="md:hidden h-8">
-              <Icon.Close />
-            </button>
-          </div>
-          preludeSection
-          /* Firefox ignores padding in scroll containers, so we need margin
-               to make a bottom gap for the sidebar.
-               See https://stackoverflow.com/questions/29986977/firefox-ignores-padding-when-using-overflowscroll
- */
-          <div className="mb-56">
-            {categories
-            ->Belt.Array.map(category =>
-              <div key=category.name> <Category isItemActive category /> </div>
-            )
-            ->ate}
-          </div>
-        </aside>
-      </div>
-    </>
-  }
-}
-
-module MobileDrawerButton = {
-  @react.component
-  let make = (~hidden: bool, ~onClick) =>
-    <button className={(hidden ? "hidden" : "") ++ " md:hidden mr-3"} onMouseDown=onClick>
-      <img className="h-4" src="/static/ic_sidebar_drawer.svg" />
-    </button>
-}
-
-@react.component
-let make = (
-  ~theme: ColorTheme.t,
-  ~components: Mdx.Components.t,
-  ~sidebarState: (bool, (bool => bool) => unit),
-  // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
-  ~sidebar: React.element,
-  ~breadcrumbs: option<list<UrlPath.breadcrumb>>=?,
-  ~children,
-) => {
-  let (isNavOpen, setNavOpen) = React.useState(() => false)
-  let router = Next.Router.useRouter()
-
-  let theme = ColorTheme.toCN(theme)
-
-  let breadcrumbs =
-    breadcrumbs->Belt.Option.mapWithDefault(React.null, crumbs => <BreadCrumbs crumbs />)
-
-  let (isSidebarOpen, setSidebarOpen) = sidebarState
-  let toggleSidebar = () => setSidebarOpen(prev => !prev)
-
-  React.useEffect1(() => {
-    open Next.Router.Events
-    let {Next.Router.events: events} = router
-
-    let onChangeComplete = _url => setSidebarOpen(_ => false)
-
-    events->on(#routeChangeComplete(onChangeComplete))
-    events->on(#hashChangeComplete(onChangeComplete))
-
-    Some(
-      () => {
-        events->off(#routeChangeComplete(onChangeComplete))
-        events->off(#hashChangeComplete(onChangeComplete))
-      },
-    )
-  }, [])
-
-  <>
-    <Meta />
-    <div className={"mt-16 min-w-20 " ++ theme}>
-      <div className="w-full text-night font-base">
-        <Navigation overlayState=(isNavOpen, setNavOpen) />
-        <div className="flex justify-center">
-          <div className="lg:align-center w-full max-w-xl">
-            <Mdx.Provider components>
-              <div className="flex">
-                sidebar
-                <div className="flex justify-center w-full md:w-3/4 overflow-hidden">
-                  <main className="w-5/6 pt-10 mb-32 text-lg">
-                    <div
-                      className="fixed border-b shadow top-16 left-0 pl-4 bg-white w-full py-4 md:relative md:border-none md:shadow-none md:p-0 md:top-auto flex items-center">
-                      <MobileDrawerButton
-                        hidden=isNavOpen
-                        onClick={evt => {
-                          ReactEvent.Mouse.preventDefault(evt)
-                          toggleSidebar()
-                        }}
-                      />
-                      <div className="truncate overflow-x-auto touch-scroll"> breadcrumbs </div>
-                    </div>
-                    <div className="mt-10"> children </div>
-                  </main>
-                </div>
-              </div>
-            </Mdx.Provider>
-          </div>
-        </div>
-      </div>
-    </div>
-  </>
-}
diff --git a/jscomp/syntax/tests/idempotency/reductive/reductive.res b/jscomp/syntax/tests/idempotency/reductive/reductive.res
deleted file mode 100644
index 739d63c..0000000
--- a/jscomp/syntax/tests/idempotency/reductive/reductive.res
+++ /dev/null
@@ -1,138 +0,0 @@
-module Store = {
-  type rec t<'action, 'state> = {
-    mutable state: 'state,
-    mutable reducer: ('state, 'action) => 'state,
-    mutable listeners: list<unit => unit>,
-    customDispatcher: option<(t<'action, 'state>, 'action => unit, 'action) => unit>,
-  }
-  let create = (~reducer, ~preloadedState, ~enhancer=?, ()) =>
-    switch (preloadedState, enhancer, reducer) {
-    | (preloadedState, None, reducer) => {
-        state: preloadedState,
-        listeners: list{},
-        reducer: reducer,
-        customDispatcher: None,
-      }
-    | (preloadedState, Some(enhancer), reducer) => {
-        state: preloadedState,
-        listeners: list{},
-        reducer: reducer,
-        customDispatcher: Some(enhancer),
-      }
-    }
-  let unsubscribe = (store, listener, ()) =>
-    store.listeners = List.filter(l => listener !== l, store.listeners)
-  let subscribe = (store, listener) => {
-    store.listeners = list{listener, ...store.listeners}
-    unsubscribe(store, listener)
-  }
-  let nativeDispatch = (store, action) => {
-    store.state = store.reducer(store.state, action)
-    List.iter(listener => listener(), store.listeners)
-  }
-  let dispatch = (store, action) =>
-    switch store.customDispatcher {
-    | Some(customDispatcher) => customDispatcher(store, nativeDispatch(store), action)
-    | None => nativeDispatch(store, action)
-    }
-  let getState = store => store.state
-  let replaceReducer = (store, reducer) => store.reducer = reducer
-}
-
-/* deprecated, use hooks API instead */
-module Lense = {
-  type state<'reductiveState> = {
-    reductiveState: option<'reductiveState>,
-    unsubscribe: option<unit => unit>,
-  }
-  type rec action =
-    | UpdateState
-    | AddListener(action => unit)
-  let createMake = (~name="Lense", ~lense: 'state => 'lense, store: Store.t<'action, 'state>) => {
-    let innerComponent = ReasonReact.reducerComponent(name)
-    let make = (
-      ~component: (
-        ~state: 'lense,
-        ~dispatch: 'action => unit,
-        array<ReasonReact.reactElement>,
-      ) => ReasonReact.component<'a, 'b, 'c>,
-      _children: array<ReasonReact.reactElement>,
-    ): ReasonReact.component<state<'lense>, ReasonReact.noRetainedProps, action> => {
-      ...innerComponent,
-      initialState: () => {
-        reductiveState: Some(lense(Store.getState(store))),
-        unsubscribe: None,
-      },
-      reducer: (action, state) =>
-        switch action {
-        | AddListener(send) =>
-          ReasonReact.Update({
-            unsubscribe: Some(Store.subscribe(store, _ => send(UpdateState))),
-            reductiveState: Some(lense(Store.getState(store))),
-          })
-        | UpdateState =>
-          lense(Store.getState(store))
-          ->Some
-          ->Belt.Option.eq(state.reductiveState, (a, b) => a === b)
-            ? ReasonReact.NoUpdate
-            : ReasonReact.Update({
-                ...state,
-                reductiveState: Some(lense(Store.getState(store))),
-              })
-        },
-      didMount: ({send}) => send(AddListener(send)),
-      willUnmount: ({state}) =>
-        switch state.unsubscribe {
-        | Some(unsubscribe) => unsubscribe()
-        | None => ()
-        },
-      render: ({state}) =>
-        switch state.reductiveState {
-        | None => ReasonReact.null
-        | Some(state) => ReasonReact.element(component(~state, ~dispatch=Store.dispatch(store), []))
-        },
-    }
-    make
-  }
-}
-
-/* deprecated, use provider from reductiveContext.re */
-module Provider = {
-  type state<'reductiveState> = Lense.state<'reductiveState>
-  type action = Lense.action
-  let createMake = (~name="Provider", store: Store.t<'action, 'state>) =>
-    Lense.createMake(~name, ~lense=s => s, store)
-}
-
-/* ** These are all visible apis of Redux that aren't needed in Reason.
- * When used, build tools will provide explanation of alternatives.
- * (see .rei for those)
- */
-let compose = _ => ()
-
-let combineReducers = _ => ()
-
-let applyMiddleware = _ => ()
-
-let bindActionCreators = (actions, dispatch) => List.map((action, ()) => dispatch(action), actions)
-
-type store<'action, 'state> = Store.t<'action, 'state>
-type reducer<'action, 'state> = ('state, 'action) => 'state
-
-type middleware<'action, 'state> = (store<'action, 'state>, 'action => unit, 'action) => unit
-
-type storeCreator<'action, 'state> = (
-  ~reducer: reducer<'action, 'state>,
-  ~preloadedState: 'state,
-  ~enhancer: middleware<'action, 'state>=?,
-  unit,
-) => store<'action, 'state>
-
-type storeEnhancer<'action, 'state> = storeCreator<'action, 'state> => storeCreator<'action, 'state>
-
-type liftedStoreEnhancer<'action, 'state, 'enhancedAction, 'enhancedState> = (
-  ~reducer: reducer<'action, 'state>,
-  ~preloadedState: 'enhancedState,
-  ~enhancer: middleware<'enhancedAction, 'enhancedState>=?,
-  unit,
-) => store<'enhancedAction, 'enhancedState>
diff --git a/jscomp/syntax/tests/idempotency/reductive/reductive.resi b/jscomp/syntax/tests/idempotency/reductive/reductive.resi
deleted file mode 100644
index dbdbc79..0000000
--- a/jscomp/syntax/tests/idempotency/reductive/reductive.resi
+++ /dev/null
@@ -1,140 +0,0 @@
-module Store: {
-  type t<'action, 'state>
-  let create: (
-    ~reducer: ('state, 'action) => 'state,
-    ~preloadedState: 'state,
-    ~enhancer: (t<'action, 'state>, 'action => unit, 'action) => unit=?,
-    unit,
-  ) => t<'action, 'state>
-  let unsubscribe: (t<'action, 'state>, unit => unit, unit) => unit
-  let subscribe: (t<'action, 'state>, unit => unit, unit) => unit
-  /* skips all middleware and applies an update directly to the store */
-  let nativeDispatch: (t<'action, 'state>, 'action) => unit
-  let dispatch: (t<'action, 'state>, 'action) => unit
-  let getState: t<'action, 'state> => 'state
-  let replaceReducer: (t<'action, 'state>, ('state, 'action) => 'state) => unit
-}
-
-module Lense: {
-  type state<'reductiveState>
-  type rec action =
-    | UpdateState
-    | AddListener(action => unit)
-
-  @deprecated("Legacy API, prefer the new hooks API with jsx 3")
-  let createMake: (
-    ~name: string=?,
-    ~lense: 'state => 'lense,
-    Store.t<'action, 'state>,
-    ~component: (
-      ~state: 'lense,
-      ~dispatch: 'action => unit,
-      array<ReasonReact.reactElement>,
-    ) => ReasonReact.component<'a, 'b, 'c>,
-    array<ReasonReact.reactElement>,
-  ) => ReasonReact.component<state<'lense>, ReasonReact.noRetainedProps, action>
-}
-
-module Provider: {
-  type state<'reductiveState> = Lense.state<'reductiveState>
-  type action = Lense.action
-
-  @deprecated("Legacy API, prefer the new hooks API with jsx 3")
-  let createMake: (
-    ~name: string=?,
-    Store.t<'action, 'state>,
-    ~component: (
-      ~state: 'state,
-      ~dispatch: 'action => unit,
-      array<ReasonReact.reactElement>,
-    ) => ReasonReact.component<'a, 'b, 'c>,
-    array<ReasonReact.reactElement>,
-  ) => ReasonReact.component<state<'state>, ReasonReact.noRetainedProps, action>
-}
-
-/* ** These are all visible apis of Redux that aren't needed in Reason.
- * When used, build tools will provide explanation of alternatives.
- */
-@ocaml.deprecated(`
-Use the |> as an infix operator to chain the
-result of one function into another:
-
-\`compose(f, g, h)(x)\`
-in JS goes to
-\`x |> h |> g |> f\`
-in Reason.
-`)
-let compose: _ => unit
-
-@ocaml.deprecated(`
-combineReducers uses some introspection to determine
-the shape of your state. Instead, consider a declarative pattern like:
-
-type counterAction =
-| Increment
-| Decrement;
-type stringAction =
-| A
-| B;
-type action =
-| StringAction stringAction
-| CounterAction counterAction;
-type state = {string, counter};
-
-let combinedReducer state action => {
-| StringAction action => {...state, string: stringReducer state action}
-| CounterAction action => {...state, counter: counterReducer state action}
-};
-
-this pattern gives you full control over the shape of your state.
-`)
-let combineReducers: _ => unit
-
-@ocaml.deprecated(`
-The enhancer attribute in Redux allows you
-to provide a custom dispatch method (to perform more
-actions before or after the dispatch function). You can simply pass in
-a function directly which handles the exact actions you're looking for.
-
-To chain middlewares you can do something like:
-
-let thunkedLoggedTimeTravelLogger store next =>
-  Middleware.thunk store @@
-  Middleware.logger store @@
-  Middleware.timeTravel store @@
-  next;
-`)
-let applyMiddleware: _ => unit
-
-@ocaml.deprecated(`
-bindActionCreators is not as useful in Reason,
-since action creators are types, not functions.
-The code is implemented as:
-
-let bindActionCreators actions dispatch =>
-List.map (fun action () => dispatch action) actions;
-
-Instead - you are free to build the action data type at dispatch time.
-`)
-let bindActionCreators: (list<'a>, 'a => 'b) => list<unit => 'b>
-
-type store<'action, 'state> = Store.t<'action, 'state>
-type reducer<'action, 'state> = ('state, 'action) => 'state
-
-type middleware<'action, 'state> = (store<'action, 'state>, 'action => unit, 'action) => unit
-
-type storeCreator<'action, 'state> = (
-  ~reducer: reducer<'action, 'state>,
-  ~preloadedState: 'state,
-  ~enhancer: middleware<'action, 'state>=?,
-  unit,
-) => store<'action, 'state>
-
-type storeEnhancer<'action, 'state> = storeCreator<'action, 'state> => storeCreator<'action, 'state>
-
-type liftedStoreEnhancer<'action, 'state, 'enhancedAction, 'enhancedState> = (
-  ~reducer: reducer<'action, 'state>,
-  ~preloadedState: 'enhancedState,
-  ~enhancer: middleware<'enhancedAction, 'enhancedState>=?,
-  unit,
-) => store<'enhancedAction, 'enhancedState>
diff --git a/jscomp/syntax/tests/idempotency/reductive/reductiveContext.res b/jscomp/syntax/tests/idempotency/reductive/reductiveContext.res
deleted file mode 100644
index 0d994d2..0000000
--- a/jscomp/syntax/tests/idempotency/reductive/reductiveContext.res
+++ /dev/null
@@ -1,58 +0,0 @@
-@@bs.config({jsx: 3})
-module type Config = {
-  type state
-  type action
-}
-
-module Make = (Config: Config) => {
-  open Subscription
-  let storeContext = React.createContext(None)
-
-  module ContextProvider = {
-    let make = React.Context.provider(storeContext)
-    let makeProps = (
-      ~value: option<Reductive.Store.t<Config.action, Config.state>>,
-      ~children,
-      (),
-    ) =>
-      {
-        "value": value,
-        "children": children,
-      }
-  }
-
-  module Provider = {
-    @react.component
-    let make = (~children, ~store) =>
-      <ContextProvider value=Some(store)> children </ContextProvider>
-  }
-
-  let useStore = () => {
-    let storeFromContext = React.useContext(storeContext)
-    switch storeFromContext {
-    | None =>
-      failwith(
-        "Could not find reductive context value; please ensure the component is wrapped in a <Provider>",
-      )
-    | Some(store) => store
-    }
-  }
-
-  let useSelector = selector => {
-    let store = useStore()
-
-    let source = React.useMemo2(() => {
-      subscribe: Reductive.Store.subscribe(store),
-      getCurrentValue: () => selector(Reductive.Store.getState(store)),
-    }, (selector, store))
-
-    let selectedState = useSubscription(source)
-
-    selectedState
-  }
-
-  let useDispatch = () => {
-    let store = useStore()
-    React.useCallback1(Reductive.Store.dispatch(store), [store])
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/reductive/reductiveContext.resi b/jscomp/syntax/tests/idempotency/reductive/reductiveContext.resi
deleted file mode 100644
index e3193a8..0000000
--- a/jscomp/syntax/tests/idempotency/reductive/reductiveContext.resi
+++ /dev/null
@@ -1,23 +0,0 @@
-module type Config = {
-  type state
-  type action
-}
-module Make: (Config: Config) =>
-{
-  module Provider: {
-    @obj
-    external makeProps: (
-      ~children: 'children,
-      ~store: Reductive.Store.t<Config.action, Config.state>,
-      ~key: string=?,
-      unit,
-    ) => {"children": 'children, "store": Reductive.Store.t<Config.action, Config.state>} = ""
-    let make: {
-      "children": React.element,
-      "store": Reductive.Store.t<Config.action, Config.state>,
-    } => React.element
-  }
-  let useSelector: (Config.state => 'selectedState) => 'selectedState
-  let useDispatch: (unit, Config.action) => unit
-  let useStore: unit => Reductive.Store.t<Config.action, Config.state>
-}
diff --git a/jscomp/syntax/tests/idempotency/reductive/subscription.res b/jscomp/syntax/tests/idempotency/reductive/subscription.res
deleted file mode 100644
index d87978b..0000000
--- a/jscomp/syntax/tests/idempotency/reductive/subscription.res
+++ /dev/null
@@ -1,15 +0,0 @@
-@@bs.config({jsx: 3})
-
-@deriving({jsConverter: newType})
-type source<'a> = {
-  subscribe: (unit => unit, unit) => unit,
-  getCurrentValue: unit => 'a,
-}
-
-@module("use-subscription")
-external useSubscriptionJs: abs_source<'a> => 'a = "useSubscription"
-
-let useSubscription = source => {
-  let sourceJs = React.useMemo1(() => sourceToJs(source), [source])
-  useSubscriptionJs(sourceJs)
-}
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing.res
deleted file mode 100644
index 7801ce0..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing.res
+++ /dev/null
@@ -1,339 +0,0 @@
-open Reasongl
-
-open Reprocessing_Internal
-
-module Utils = Reprocessing_Utils
-
-module Constants = Reprocessing_Constants
-
-module Draw = Reprocessing_Draw
-
-module Env = Reprocessing_Env
-
-module Common = Reprocessing_Common
-
-module Events = Reprocessing_Events
-
-include Reprocessing_Types.Types
-
-type hotreloadT<'a> = {
-  mutable started: bool,
-  mutable justHotReloaded: bool,
-  mutable filename: string,
-  mutable previousInitialStateHash: int,
-  mutable draw: ('a, Reprocessing_Common.glEnv) => 'a,
-  mutable setup: Reprocessing_Common.glEnv => 'a,
-  mutable mouseMove: ('a, Reprocessing_Common.glEnv) => 'a,
-  mutable mouseDragged: ('a, Reprocessing_Common.glEnv) => 'a,
-  mutable mouseDown: ('a, Reprocessing_Common.glEnv) => 'a,
-  mutable mouseUp: ('a, Reprocessing_Common.glEnv) => 'a,
-  mutable keyPressed: ('a, Reprocessing_Common.glEnv) => 'a,
-  mutable keyReleased: ('a, Reprocessing_Common.glEnv) => 'a,
-  mutable keyTyped: ('a, Reprocessing_Common.glEnv) => 'a,
-}
-
-let hotreloadData = Obj.magic(Hashtbl.create(10))
-
-let afterDraw = (f, env: Common.glEnv) => {
-  open Common
-  let rate = int_of_float(1000. /. f)
-  env.mouse.prevPos = env.mouse.pos
-  env.frame = {count: env.frame.count + 1, rate: rate, deltaTime: f /. 1000.}
-  env.keyboard.released = Common.KeySet.empty
-  env.keyboard.pressed = Common.KeySet.empty
-  Matrix.copyInto(~src=Matrix.identity, ~dst=env.matrix)
-  /* Flush the batching buffer at the end of every frame. */
-  if env.batch.elementPtr > 0 {
-    flushGlobalBatch(env)
-  }
-}
-
-let unwrapOrDefault = (default, opt) =>
-  switch opt {
-  | Some(a) => a
-  | None => default
-  }
-
-let identity = (a, _) => a
-
-let defaultScreen = "reprocessing-default"
-
-let currentScreen = ref(defaultScreen)
-let setScreenId = id => currentScreen := id
-let clearScreenId = () => currentScreen := defaultScreen
-
-let pauseFns = Hashtbl.create(10)
-
-let playPause = (id, play) =>
-  switch Hashtbl.find(pauseFns, id) {
-  | exception Not_found => None
-  | fn => Some(fn(play))
-  }
-
-let hotreload = (~screen=defaultScreen, filename) => {
-  /* ... */
-  let _a = Reprocessing_Draw.translate
-  let _b = Reprocessing_Utils.color
-  let _c = Reprocessing_Constants.red
-  let _d = Reprocessing_Common.circularBufferSize
-  let _e = Reprocessing_Events.keycodeMap
-  Hashtbl.replace(
-    hotreloadData,
-    screen,
-    {
-      started: false,
-      justHotReloaded: false,
-      previousInitialStateHash: 0,
-      filename: filename,
-      draw: identity,
-      setup: (type a, _: a) => (),
-      keyPressed: identity,
-      keyReleased: identity,
-      keyTyped: identity,
-      mouseMove: identity,
-      mouseDragged: identity,
-      mouseDown: identity,
-      mouseUp: identity,
-    },
-  )
-  Reprocessing_Hotreload.checkRebuild(true, filename)
-}
-
-let run = (
-  ~setup,
-  ~screen=?,
-  ~draw=?,
-  ~mouseMove=?,
-  ~mouseDragged=?,
-  ~mouseDown=?,
-  ~mouseUp=?,
-  ~keyPressed=?,
-  ~keyReleased=?,
-  ~keyTyped=?,
-  (),
-) => {
-  let screen = switch screen {
-  | None => currentScreen.contents
-  | Some(screen) => screen
-  }
-  let unwrap = unwrapOrDefault(identity)
-  let fns = switch Hashtbl.find(hotreloadData, screen) {
-  | exception Not_found => {
-      started: false,
-      justHotReloaded: false,
-      previousInitialStateHash: 0,
-      filename: "",
-      setup: setup,
-      draw: unwrap(draw),
-      keyPressed: unwrap(keyPressed),
-      keyReleased: unwrap(keyReleased),
-      keyTyped: unwrap(keyTyped),
-      mouseMove: unwrap(mouseMove),
-      mouseDragged: unwrap(mouseDragged),
-      mouseDown: unwrap(mouseDown),
-      mouseUp: unwrap(mouseUp),
-    }
-  | hr =>
-    hr.justHotReloaded = true
-    hr.draw = unwrap(draw)
-    hr.setup = setup
-    hr.keyPressed = unwrap(keyPressed)
-    hr.keyReleased = unwrap(keyReleased)
-    hr.keyTyped = unwrap(keyTyped)
-    hr.mouseMove = unwrap(mouseMove)
-    hr.mouseDragged = unwrap(mouseDragged)
-    hr.mouseDown = unwrap(mouseDown)
-    hr.mouseUp = unwrap(mouseUp)
-    print_endline("Successfully changed functions")
-    hr
-  }
-  if !fns.started {
-    fns.started = true
-    Random.self_init()
-    Reprocessing_Utils.noiseSeed(Random.int(Reprocessing_Utils.pow(~base=2, ~exp=30 - 1)))
-    let env = Reprocessing_Internal.createCanvas(
-      Reasongl.Gl.Window.init(~screen, ~argv=Sys.argv),
-      200,
-      200,
-    )
-    Reprocessing_Font.Font.loadDefaultFont(env)
-    let userState = ref(setup(env))
-    fns.previousInitialStateHash = Hashtbl.hash(userState.contents)
-
-    /* ** This is a basically a hack to get around the default behavior of drawing something inside setup.
-         Because OpenGL uses double buffering, drawing in setup will result in a flickering shape, as the data
-         will only be in one buffer. To circumvent this we draw, read the pixel data and store that array, advance
-         one frame and then paint that array as a texture on top before calling draw for the 2nd time. This ensures
-         that both internal buffers contain the same data. **/
-    let reDrawPreviousBufferOnSecondFrame = {
-      open Common
-      let width = Gl.Window.getWidth(env.window)
-      let height = Gl.Window.getHeight(env.window)
-      let data = Gl.readPixels_RGBA(~context=env.gl, ~x=0, ~y=0, ~width, ~height)
-      let textureBuffer = Gl.createTexture(~context=env.gl)
-      Gl.bindTexture(~context=env.gl, ~target=RGLConstants.texture_2d, ~texture=textureBuffer)
-      Gl.texImage2D_RGBA(
-        ~context=env.gl,
-        ~target=RGLConstants.texture_2d,
-        ~level=0,
-        ~width,
-        ~height,
-        ~border=0,
-        ~data,
-      )
-      Gl.texParameteri(
-        ~context=env.gl,
-        ~target=RGLConstants.texture_2d,
-        ~pname=RGLConstants.texture_mag_filter,
-        ~param=RGLConstants.linear,
-      )
-      Gl.texParameteri(
-        ~context=env.gl,
-        ~target=RGLConstants.texture_2d,
-        ~pname=RGLConstants.texture_min_filter,
-        ~param=RGLConstants.linear,
-      )
-      Gl.texParameteri(
-        ~context=env.gl,
-        ~target=RGLConstants.texture_2d,
-        ~pname=RGLConstants.texture_wrap_s,
-        ~param=RGLConstants.clamp_to_edge,
-      )
-      Gl.texParameteri(
-        ~context=env.gl,
-        ~target=RGLConstants.texture_2d,
-        ~pname=RGLConstants.texture_wrap_t,
-        ~param=RGLConstants.clamp_to_edge,
-      )
-      () => {
-        let (x, y) = (0, 0)
-        let (x1, y1) = (\"@@"(float_of_int, x + width), \"@@"(float_of_int, y))
-        let (x2, y2) = (float_of_int(x), \"@@"(float_of_int, y))
-        let (x3, y3) = (\"@@"(float_of_int, x + width), \"@@"(float_of_int, y + height))
-        let (x4, y4) = (float_of_int(x), \"@@"(float_of_int, y + height))
-        let verticesColorAndTexture = [
-          x1,
-          y1,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          1.,
-          1.0,
-          1.0,
-          x2,
-          y2,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          1.,
-          0.0,
-          1.0,
-          x3,
-          y3,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          1.,
-          1.0,
-          0.0,
-          x4,
-          y4,
-          0.0,
-          0.0,
-          0.0,
-          0.0,
-          1.,
-          0.0,
-          0.0,
-        ]
-        drawGeometry(
-          ~vertexArray=Gl.Bigarray.of_array(Gl.Bigarray.Float32, verticesColorAndTexture),
-          ~elementArray=Gl.Bigarray.of_array(Gl.Bigarray.Uint16, [0, 1, 2, 1, 2, 3]),
-          ~mode=RGLConstants.triangles,
-          ~count=6,
-          ~textureBuffer,
-          env,
-        )
-      }
-    }
-
-    /* ** Start the render loop. * */
-    let playPauseFn = Gl.render(
-      ~window=env.window,
-      ~displayFunc=f => {
-        if env.frame.count === 2 {
-          reDrawPreviousBufferOnSecondFrame()
-
-          /* @Hack Workaround for https://github.com/Schmavery/reprocessing/issues/117.
-              Seems like we need to set the window size at the first frame for Mojave to behave.
-
-                      Ben — September 26th 2018
- */
-          let height = Gl.Window.getHeight(env.window)
-          let width = Gl.Window.getWidth(env.window)
-          Reasongl.Gl.Window.setWindowSize(~window=env.window, ~width, ~height)
-        }
-        if fns.filename != "" {
-          \"@@"(ignore, Reprocessing_Hotreload.checkRebuild(false, fns.filename))
-        }
-        if fns.justHotReloaded {
-          let newInitialState = fns.setup(env)
-          let newHash = Hashtbl.hash(newInitialState)
-          if newHash != fns.previousInitialStateHash {
-            userState := newInitialState
-            fns.previousInitialStateHash = newHash
-          }
-          fns.justHotReloaded = false
-        }
-        userState := fns.draw(userState.contents, env)
-        afterDraw(f, env)
-      },
-      ~mouseDown=(~button as _, ~state as _, ~x, ~y) => {
-        env.mouse.pos = (x, y)
-        env.mouse.pressed = true
-        userState := fns.mouseDown(userState.contents, env)
-      },
-      ~mouseUp=(~button as _, ~state as _, ~x, ~y) => {
-        env.mouse.pos = (x, y)
-        env.mouse.pressed = false
-        userState := fns.mouseUp(userState.contents, env)
-      },
-      ~mouseMove=(~x, ~y) => {
-        env.mouse.pos = (x, y)
-        if env.mouse.pressed {
-          userState := fns.mouseDragged(userState.contents, env)
-        } else {
-          userState := fns.mouseMove(userState.contents, env)
-        }
-      },
-      ~windowResize=() =>
-        if env.size.resizeable {
-          let height = Gl.Window.getHeight(env.window)
-          let width = Gl.Window.getWidth(env.window)
-          resetSize(env, width, height)
-        } else {
-          Env.size(~width=Env.width(env), ~height=Env.height(env), env)
-        },
-      ~keyDown=(~keycode, ~repeat) => {
-        env.keyboard.keyCode = keycode
-        if !repeat {
-          userState := fns.keyPressed(userState.contents, env)
-          env.keyboard.pressed = Common.KeySet.add(keycode, env.keyboard.pressed)
-          env.keyboard.down = Common.KeySet.add(keycode, env.keyboard.down)
-        }
-        userState := fns.keyTyped(userState.contents, env)
-      },
-      ~keyUp=(~keycode) => {
-        env.keyboard.keyCode = keycode
-        env.keyboard.released = Common.KeySet.add(keycode, env.keyboard.released)
-        env.keyboard.down = Common.KeySet.remove(keycode, env.keyboard.down)
-        userState := fns.keyReleased(userState.contents, env)
-      },
-      (),
-    )
-    Hashtbl.replace(pauseFns, screen, playPauseFn)
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing.resi b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing.resi
deleted file mode 100644
index c2ba446..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing.resi
+++ /dev/null
@@ -1,99 +0,0 @@
-@@ocaml.doc(" # Reprocessing
- *
- * ## The Run Function
- *
- * This is how all of your programs start. At minimum you need a setup function, but it also doesn't make much sense to not have a draw function.
- *
- * @doc run
- *
- * ## Hot reloading
- *
- * Put the following in an `indexhot.re`
- *
- * ```reason;no-run
- * Reprocessing.hotreload(\"./index.re\")
- * ```
- *
- * @doc hotreload
- *
- * ## Misc helpers
- *
- * The following modules are included here as a psuedo namespacing function. It is common to `open Reprocessing` and then access them as `Draw.rect`, etc.
- *
- * @doc Utils, Constants, Draw, Env, Events
- *
- * ## Handling Multiple Canvases
- *
- * (only supported on web target)
- *
- * @doc setScreenId, clearScreenId, playPause
- *
- * @includes
-")
-
-/* ** Contains functions having to do with drawing to the screen */
-module Draw = Reprocessing_Draw
-
-/* ** Contains functions having to do with the environment:
- * ie window properties, user input
- */
-module Env = Reprocessing_Env
-
-/* ** Contains types for events. */
-module Events = Reprocessing_Events
-
-/* ** Contains utility functions */
-module Utils = Reprocessing_Utils
-
-/* ** Contains useful constants */
-module Constants = Reprocessing_Constants
-
-include Reprocessing_Types.TypesT
-
-let hotreload: (~screen: string=?, string) => bool
-
-@ocaml.doc(" Set the ID that will be used by subsequent calls to `run()` that don't have an explicitly-passed `~screen`.
- *
- * If a canvas exists on the document with the given ID, then that canvas will be used. Otherwise a canvas will be created & appended to the body.
- *
- * ```no-run
- * # let _ = (setup, draw) => {
- * Reprocessing.setScreenId(\"my-fancy-id\");
- * /* This will render to the canvas with id \"my-fancy-id\" */
- * Reprocessing.run(~setup, ~draw, ());
- * # }
- * ```
-")
-let setScreenId: string => unit
-let clearScreenId: unit => unit
-
-@ocaml.doc(" Play/pause the screen specified by the given ID. If you pass true, it will try to play it, otherwise pause.
- *
- * The return value indicates the status:
- * - None: no screen found
- * - Some(true): the screen is (now/still) playing
- * - Some(false): the screen is (now/still) paused
- *
- * Calling this function will not necessarily change the state. Inspect the result to determine success.
- ")
-let playPause: (string, bool) => option<bool>
-
-/* ** Entrypoint to the graphics library. The system
- * is designed for you to return a self-defined 'state'
- * object from setup, which will then be passed to every
- * callback you choose to implement. Updating the state
- * is done by returning a different value from the callback.
- */
-let run: (
-  ~setup: glEnvT => 'a,
-  ~screen: string=?,
-  ~draw: ('a, glEnvT) => 'a=?,
-  ~mouseMove: ('a, glEnvT) => 'a=?,
-  ~mouseDragged: ('a, glEnvT) => 'a=?,
-  ~mouseDown: ('a, glEnvT) => 'a=?,
-  ~mouseUp: ('a, glEnvT) => 'a=?,
-  ~keyPressed: ('a, glEnvT) => 'a=?,
-  ~keyReleased: ('a, glEnvT) => 'a=?,
-  ~keyTyped: ('a, glEnvT) => 'a=?,
-  unit,
-) => unit
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Common.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Common.res
deleted file mode 100644
index 75cbf7b..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Common.res
+++ /dev/null
@@ -1,204 +0,0 @@
-open Reasongl
-
-module Constants = RGLConstants
-
-type strokeCapT =
-  | Round
-  | Square
-  | Project
-
-type rectModeT =
-  | Corner
-  | Center
-  | Radius
-
-type glState = Gl.Window.t
-
-type glCamera = {projectionMatrix: Gl.Mat4.t}
-
-type colorT = {
-  r: float,
-  g: float,
-  b: float,
-  a: float,
-}
-
-type styleT = {
-  strokeColor: option<colorT>,
-  strokeWeight: int,
-  strokeCap: strokeCapT,
-  fillColor: option<colorT>,
-  tintColor: option<colorT>,
-  rectMode: rectModeT,
-}
-
-type mouseT = {
-  mutable pos: (int, int),
-  mutable prevPos: (int, int),
-  mutable pressed: bool,
-}
-
-module KeySet = Set.Make({
-  type t = Reprocessing_Events.keycodeT
-  let compare = compare
-})
-
-type keyboardT = {
-  mutable keyCode: Reprocessing_Events.keycodeT,
-  mutable pressed: KeySet.t,
-  mutable released: KeySet.t,
-  mutable down: KeySet.t,
-}
-
-type frameT = {
-  count: int,
-  rate: int,
-  deltaTime: float,
-}
-
-type sizeT = {
-  mutable height: int,
-  mutable width: int,
-  mutable resizeable: bool,
-}
-
-let circularBufferSize = 6 * 10000
-
-let vertexSize = 8
-
-type _imageT = {
-  framebuffer: option<Gl.framebufferT>,
-  texture: Gl.textureT,
-  /* both redundant with tgls, maybe make Gl expose functions to get the width/height */
-  height: int,
-  width: int,
-}
-
-type imageT = {
-  mutable glData: option<_imageT>,
-  mutable drawnTo: bool,
-}
-
-type soundLoadStatusT =
-  | Loading
-  | ShouldPlay(float, bool)
-  | Loaded(Gl.Audio.t)
-
-type soundT = ref<soundLoadStatusT>
-
-type batchT = {
-  vertexArray: Gl.Bigarray.t<float, Gl.Bigarray.float32_elt>,
-  elementArray: Gl.Bigarray.t<int, Gl.Bigarray.int16_unsigned_elt>,
-  mutable vertexPtr: int,
-  mutable elementPtr: int,
-  mutable currTex: option<Gl.textureT>,
-  nullTex: Gl.textureT,
-}
-
-type glEnv = {
-  camera: glCamera,
-  window: Gl.Window.t,
-  gl: Gl.contextT,
-  vertexBuffer: Gl.bufferT,
-  elementBuffer: Gl.bufferT,
-  aVertexColor: Gl.attributeT,
-  aTextureCoord: Gl.attributeT,
-  aVertexPosition: Gl.attributeT,
-  pMatrixUniform: Gl.uniformT,
-  uSampler: Gl.uniformT,
-  batch: batchT,
-  keyboard: keyboardT,
-  mouse: mouseT,
-  mutable style: styleT,
-  mutable styleStack: list<styleT>,
-  mutable frame: frameT,
-  mutable matrix: array<float>,
-  mutable matrixStack: list<array<float>>,
-  size: sizeT,
-}
-
-module type ReProcessorT = {
-  type t
-  let run: (
-    ~setup: glEnv => 'a,
-    ~draw: ('a, glEnv) => 'a=?,
-    ~mouseMove: ('a, glEnv) => 'a=?,
-    ~mouseDragged: ('a, glEnv) => 'a=?,
-    ~mouseDown: ('a, glEnv) => 'a=?,
-    ~mouseUp: ('a, glEnv) => 'a=?,
-    ~keyPressed: ('a, glEnv) => 'a=?,
-    ~keyReleased: ('a, glEnv) => 'a=?,
-    ~keyTyped: ('a, glEnv) => 'a=?,
-    unit,
-  ) => unit
-}
-
-module Stream = {
-  type t = (string, int)
-  let empty = list{}
-  let peekch = ((str, i): t): option<char> =>
-    if i < String.length(str) {
-      Some(String.get(str, i))
-    } else {
-      None
-    }
-  let popch = ((str, i): t): t => (str, i + 1)
-  let peekn = ((str, i), len) =>
-    if i + len < String.length(str) {
-      Some(String.sub(str, i, len))
-    } else {
-      None
-    }
-  let skipWhite = ((str, i): t): t => {
-    let len = String.length(str)
-    let rec loop = n =>
-      if n >= len {
-        (str, n)
-      } else if String.get(str, n) === ' ' {
-        loop(n + 1)
-      } else {
-        (str, n)
-      }
-    loop(i)
-  }
-  let popn = ((str, i), len) => (str, i + len)
-  let match_ = (stream, matchstr) => {
-    let len = String.length(matchstr)
-    switch peekn(stream, len) {
-    | Some(peek) if peek == matchstr => popn(stream, len)
-    | Some(peek) =>
-      failwith("Could not match '" ++ (matchstr ++ ("', got '" ++ (peek ++ "' instead."))))
-    | None => failwith("Could not match " ++ matchstr)
-    }
-  }
-  let charsRemaining = ((str, i)) => String.length(str) - i
-  let create = (str: string): t => (str, 0)
-}
-
-let read = (name: string) => {
-  let ic = open_in(name)
-  let try_read = () =>
-    switch input_line(ic) {
-    | exception End_of_file => None
-    | x => Some(x)
-    }
-  let rec loop = acc =>
-    switch try_read() {
-    | Some(s) => loop(list{String.make(1, '\n'), s, ...acc})
-    | None =>
-      close_in(ic)
-      List.rev(acc)
-    }
-  loop(list{}) |> String.concat("")
-}
-
-let append_char = (s: string, c: char): string => s ++ String.make(1, c)
-
-let rec split = (stream, sep, accstr, acc) =>
-  switch Stream.peekch(stream) {
-  | Some(c) if c == sep => split(Stream.popch(stream), sep, "", list{accstr, ...acc})
-  | Some(c) => split(Stream.popch(stream), sep, append_char(accstr, c), acc)
-  | None => List.rev(list{accstr, ...acc})
-  }
-
-let split = (str, ~sep) => split(Stream.create(str), sep, "", list{})
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Constants.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Constants.res
deleted file mode 100644
index 2198c58..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Constants.res
+++ /dev/null
@@ -1,21 +0,0 @@
-open Reprocessing_Common
-
-let white = {r: 1., g: 1., b: 1., a: 1.}
-
-let black = {r: 0., g: 0., b: 0., a: 1.}
-
-let red = {r: 1., g: 0., b: 0., a: 1.}
-
-let green = {r: 0., g: 1., b: 0., a: 1.}
-
-let blue = {r: 0., g: 0., b: 1., a: 1.}
-
-let pi = 4.0 *. atan(1.0)
-
-let two_pi = 2.0 *. pi
-
-let half_pi = 0.5 *. pi
-
-let quarter_pi = 0.25 *. pi
-
-let tau = two_pi
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Constants.resi b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Constants.resi
deleted file mode 100644
index 87cac9f..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Constants.resi
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ** Convenience constant for the color white */
-let white: Reprocessing_Common.colorT
-
-/* ** Convenience constant for the color black */
-let black: Reprocessing_Common.colorT
-
-/* ** Convenience constant for the color red */
-let red: Reprocessing_Common.colorT
-
-/* ** Convenience constant for the color green */
-let green: Reprocessing_Common.colorT
-
-/* ** Convenience constant for the color blue */
-let blue: Reprocessing_Common.colorT
-
-/* ** pi is a mathematical constant with the value 3.1415927. It is the ratio of
- * the circumference of a circle to its diameter. It is useful in combination
- * with the trigonometric functions `sin` and `cos`.
- */
-let pi: float
-
-/* ** half_pi is a mathematical constant with the value 1.5707964. It is half
- * the ratio of the circumference of a circle to its diameter
- */
-let half_pi: float
-
-/* ** quarter_pi is a mathematical constant with the value 0.7853982. It is one
- * quarter the ratio of the circumference of a circle to its diameter.
- */
-let quarter_pi: float
-
-/* ** two_pi is a mathematical constant with the value 6.2831855. It is twice the
- * ratio of the circumference of a circle to its diameter.
- */
-let two_pi: float
-
-/* ** tau is a mathematical constant with the value 6.2831855. It is the circle
- * constant relating the circumference of a circle to its linear dimension, the
- * ratio of the circumference of a circle to its radius. It has the same value
- * as two_pi.
- */
-let tau: float
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Draw.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Draw.res
deleted file mode 100644
index 108efe8..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Draw.res
+++ /dev/null
@@ -1,570 +0,0 @@
-open Reprocessing_Common
-
-@@ocaml.doc("
- * The Draw module
- *
- * This is where all the fancy things happen.
- *
- * ```reason;shared(sandbox)
- * [@bs.val] external sandboxCanvasId: string = \"\";
- * [@bs.val] external sandboxCanvas: 'canvas = \"\";
- * [@bs.val] external containerDiv: 'node = \"\";
- * [@bs.send] external addEventListener: ('node, string, 'eventT => unit) => unit = \"addEventListener\";
- * let id = sandboxCanvasId;
- * addEventListener(containerDiv, \"mouseleave\", (_) => Reprocessing.playPause(id, false) |> ignore);
- * addEventListener(containerDiv, \"mouseenter\", (_) => Reprocessing.playPause(id, true) |> ignore);
- * Reprocessing.setScreenId(sandboxCanvasId);
- * ```
- *
- * ```reason;shared(draw);use(sandbox)
- * open Reprocessing;
- * run(~setup=(_) => (), ~draw=((), env) => {
- * %{code}%
- * })
- * ```
- *
- * ```canvas;use(draw)
- * fill(Constants.red, env);
- * rect(~pos=Env.mouse(env), ~width=5, ~height=5, env);
- * ```
- ")
-
-module Internal = Reprocessing_Internal
-
-module Matrix = Reprocessing_Matrix
-
-module Env = Reprocessing_Env
-
-module Font = Reprocessing_Font.Font
-
-let translate = (~x, ~y, env) => {
-  open Matrix
-  matmatmul(env.matrix, createTranslation(x, y))
-}
-
-let rotate = (theta, env) => {
-  open Matrix
-  matmatmul(env.matrix, createRotation(theta))
-}
-
-let scale = (~x, ~y, env) => {
-  open Matrix
-  matmatmul(env.matrix, createScaling(x, y))
-}
-
-let shear = (~x, ~y, env) => {
-  open Matrix
-  matmatmul(env.matrix, createShearing(x, y))
-}
-
-let fill = (color, env: glEnv) => env.style = {...env.style, fillColor: Some(color)}
-
-let noFill = (env: glEnv) => env.style = {...env.style, fillColor: None}
-
-let tint = (color, env: glEnv) => env.style = {...env.style, tintColor: Some(color)}
-
-let noTint = (env: glEnv) => env.style = {...env.style, tintColor: None}
-
-let stroke = (color, env) => env.style = {...env.style, strokeColor: Some(color)}
-
-let noStroke = env => env.style = {...env.style, strokeColor: None}
-
-let strokeWeight = (weight, env) => env.style = {...env.style, strokeWeight: weight}
-
-let strokeCap = (cap, env) => env.style = {...env.style, strokeCap: cap}
-
-let rectMode = (rm, env) => env.style = {...env.style, rectMode: rm}
-
-let pushStyle = env => env.styleStack = list{env.style, ...env.styleStack}
-
-let popStyle = env =>
-  switch env.styleStack {
-  /* Matches Processing error message */
-  | list{} => failwith("Too many `popStyle` without enough `pushStyle`.")
-  | list{hd, ...tl} =>
-    env.style = hd
-    env.styleStack = tl
-  }
-
-let pushMatrix = env => {
-  let copy = Matrix.createIdentity()
-  Matrix.copyInto(~src=env.matrix, ~dst=copy)
-  env.matrixStack = list{copy, ...env.matrixStack}
-}
-
-let popMatrix = env =>
-  switch env.matrixStack {
-  | list{} => failwith("Too many `popMatrix` without enough `pushMatrix`.")
-  | list{hd, ...tl} =>
-    env.matrix = hd
-    env.matrixStack = tl
-  }
-
-let loadImage = (~filename, ~isPixel=false, env) => Internal.loadImage(env, filename, isPixel)
-
-let subImage = (
-  img,
-  ~pos as (x, y),
-  ~width,
-  ~height,
-  ~texPos as (subx, suby),
-  ~texWidth as subw,
-  ~texHeight as subh,
-  env,
-) =>
-  switch img.glData {
-  | None => print_endline("image not ready yet, just doing nothing :D")
-  | Some(i) =>
-    Internal.drawImageWithMatrix(i, ~x, ~y, ~width, ~height, ~subx, ~suby, ~subw, ~subh, env)
-  }
-
-let subImagef = (
-  img,
-  ~pos as (x, y),
-  ~width,
-  ~height,
-  ~texPos as (subx, suby),
-  ~texWidth as subw,
-  ~texHeight as subh,
-  env,
-) =>
-  switch img.glData {
-  | None => print_endline("image not ready yet, just doing nothing :D")
-  | Some(i) =>
-    Internal.drawImageWithMatrixf(i, ~x, ~y, ~width, ~height, ~subx, ~suby, ~subw, ~subh, env)
-  }
-
-let imagef = (img, ~pos as (x, y), ~width=?, ~height=?, env: glEnv) =>
-  switch img.glData {
-  | None => print_endline("image not ready yet, just doing nothing :D")
-  | Some({width: imgw, height: imgh} as img) =>
-    let imgwf = float_of_int(imgw)
-    let imghf = float_of_int(imgh)
-    switch (width, imgwf, height, imghf) {
-    | (None, w, None, h)
-    | (None, w, Some(h), _)
-    | (Some(w), _, None, h)
-    | (Some(w), _, Some(h), _) =>
-      Internal.drawImageWithMatrixf(
-        img,
-        ~x,
-        ~y,
-        ~width=w,
-        ~height=h,
-        ~subx=0,
-        ~suby=0,
-        ~subw=imgw,
-        ~subh=imgh,
-        env,
-      )
-    }
-  }
-
-let image = (img, ~pos as (x, y), ~width=?, ~height=?, env: glEnv) =>
-  switch img.glData {
-  | None => print_endline("image not ready yet, just doing nothing :D")
-  | Some({width: imgw, height: imgh} as img) =>
-    switch (width, imgw, height, imgh) {
-    | (None, w, None, h)
-    | (None, w, Some(h), _)
-    | (Some(w), _, None, h)
-    | (Some(w), _, Some(h), _) =>
-      Internal.drawImageWithMatrix(
-        img,
-        ~x,
-        ~y,
-        ~width=w,
-        ~height=h,
-        ~subx=0,
-        ~suby=0,
-        ~subw=imgw,
-        ~subh=imgh,
-        env,
-      )
-    }
-  }
-
-let linef = (~p1, ~p2, env: glEnv) => {
-  let color = switch env.style.strokeColor {
-  | None => Reprocessing_Constants.black /* default color black */
-  | Some(color) => color
-  }
-  let width = float_of_int(env.style.strokeWeight)
-  let radius = width /. 2.
-  let project = env.style.strokeCap == Project
-  Internal.drawLineWithMatrix(~p1, ~p2, ~matrix=env.matrix, ~color, ~width, ~project, env)
-  if env.style.strokeCap == Round {
-    Internal.drawEllipse(env, p1, radius, radius, env.matrix, color)
-    Internal.drawEllipse(env, p2, radius, radius, env.matrix, color)
-  }
-}
-
-let line = (~p1 as (x1, y1), ~p2 as (x2, y2), env: glEnv) =>
-  linef(~p1=(float_of_int(x1), float_of_int(y1)), ~p2=(float_of_int(x2), float_of_int(y2)), env)
-
-let ellipsef = (~center, ~radx, ~rady, env: glEnv) => {
-  switch env.style.fillColor {
-  | None => () /* Don't draw fill */
-  | Some(fill) => Internal.drawEllipse(env, center, radx, rady, env.matrix, fill)
-  }
-  switch env.style.strokeColor {
-  | None => () /* Don't draw stroke */
-  | Some(stroke) =>
-    Internal.drawArcStroke(
-      env,
-      center,
-      radx,
-      rady,
-      0.,
-      Reprocessing_Constants.tau,
-      true,
-      false,
-      env.matrix,
-      stroke,
-      env.style.strokeWeight,
-    )
-  }
-}
-
-let ellipse = (~center as (cx, cy), ~radx, ~rady, env: glEnv) =>
-  ellipsef(
-    ~center=(float_of_int(cx), float_of_int(cy)),
-    ~radx=float_of_int(radx),
-    ~rady=float_of_int(rady),
-    env,
-  )
-
-let quadf = (~p1, ~p2, ~p3, ~p4, env: glEnv) => {
-  let transform = Matrix.matptmul(env.matrix)
-  let (tp1, tp2, tp3, tp4) = (transform(p1), transform(p2), transform(p3), transform(p4))
-  switch env.style.fillColor {
-  | None => () /* Don't draw fill */
-  | Some(fill) =>
-    Internal.addRectToGlobalBatch(
-      env,
-      ~topLeft=tp1,
-      ~topRight=tp2,
-      ~bottomRight=tp3,
-      ~bottomLeft=tp4,
-      ~color=fill,
-    )
-  }
-  switch env.style.strokeColor {
-  | None => () /* don't draw stroke */
-  | Some(color) =>
-    let width = float_of_int(env.style.strokeWeight)
-    let project = false
-    let matrix = env.matrix
-    Internal.drawLineWithMatrix(~p1, ~p2, ~matrix, ~color, ~width, ~project, env)
-    Internal.drawLineWithMatrix(~p1=p2, ~p2=p3, ~matrix, ~color, ~width, ~project, env)
-    Internal.drawLineWithMatrix(~p1=p3, ~p2=p4, ~matrix, ~color, ~width, ~project, env)
-    Internal.drawLineWithMatrix(~p1, ~p2=p4, ~matrix, ~color, ~width, ~project, env)
-    let r = width /. 2.
-    Internal.drawEllipse(env, p1, r, r, matrix, color)
-    Internal.drawEllipse(env, p2, r, r, matrix, color)
-    Internal.drawEllipse(env, p3, r, r, matrix, color)
-    Internal.drawEllipse(env, p4, r, r, matrix, color)
-  }
-}
-
-let quad = (~p1 as (x1, y1), ~p2 as (x2, y2), ~p3 as (x3, y3), ~p4 as (x4, y4), env: glEnv) =>
-  quadf(
-    ~p1=(float_of_int(x1), float_of_int(y1)),
-    ~p2=(float_of_int(x2), float_of_int(y2)),
-    ~p3=(float_of_int(x3), float_of_int(y3)),
-    ~p4=(float_of_int(x4), float_of_int(y4)),
-    env,
-  )
-
-let rectf = (~pos as (x, y), ~width, ~height, env: glEnv) =>
-  switch env.style.rectMode {
-  | Corner =>
-    quadf(~p1=(x, y), ~p2=(x +. width, y), ~p3=(x +. width, y +. height), ~p4=(x, y +. height), env)
-  | Center =>
-    let x = x -. width /. 2.
-    let y = y -. height /. 2.
-    quadf(~p1=(x, y), ~p2=(x +. width, y), ~p3=(x +. width, y +. height), ~p4=(x, y +. height), env)
-  | Radius =>
-    let x = x -. width
-    let y = y -. height
-    let width = width *. 2.
-    let height = height *. 2.
-    quadf(~p1=(x, y), ~p2=(x +. width, y), ~p3=(x +. width, y +. height), ~p4=(x, y +. height), env)
-  }
-
-let rect = (~pos as (x, y), ~width, ~height, env: glEnv) =>
-  rectf(
-    ~pos=(float_of_int(x), float_of_int(y)),
-    ~width=float_of_int(width),
-    ~height=float_of_int(height),
-    env,
-  )
-
-let bezierPoint = ((xx1, yy1), (xx2, yy2), (xx3, yy3), (xx4, yy4), t) => (
-  (1. -. t) ** 3. *. xx1 +.
-  3. *. (1. -. t) ** 2. *. t *. xx2 +.
-  3. *. (1. -. t) *. t ** 2. *. xx3 +.
-  t ** 3. *. xx4,
-  (1. -. t) ** 3. *. yy1 +.
-  3. *. (1. -. t) ** 2. *. t *. yy2 +.
-  3. *. (1. -. t) *. t ** 2. *. yy3 +.
-  t ** 3. *. yy4,
-)
-
-let bezierTangent = ((xx1, yy1), (xx2, yy2), (xx3, yy3), (xx4, yy4), t) => (
-  -3. *. (1. -. t) ** 2. *. xx1 +.
-  3. *. (1. -. t) ** 2. *. xx2 -.
-  6. *. t *. (1. -. t) *. xx2 -.
-  3. *. t ** 2. *. xx3 +.
-  6. *. t *. (1. -. t) *. xx3 +.
-  3. *. t ** 2. *. xx4,
-  -3. *. (1. -. t) ** 2. *. yy1 +.
-  3. *. (1. -. t) ** 2. *. yy2 -.
-  6. *. t *. (1. -. t) *. yy2 -.
-  3. *. t ** 2. *. yy3 +.
-  6. *. t *. (1. -. t) *. yy3 +.
-  3. *. t ** 2. *. yy4,
-)
-
-let bezier = (
-  ~p1 as (xx1, yy1),
-  ~p2 as (xx2, yy2),
-  ~p3 as (xx3, yy3),
-  ~p4 as (xx4, yy4),
-  env: glEnv,
-) =>
-  /* @speed this thing can reuse points */
-  for i in 0 to 19 {
-    let (x1, y1) = bezierPoint(
-      (xx1, yy1),
-      (xx2, yy2),
-      (xx3, yy3),
-      (xx4, yy4),
-      float_of_int(i) /. 20.0,
-    )
-    let (x2, y2) = bezierPoint(
-      (xx1, yy1),
-      (xx2, yy2),
-      (xx3, yy3),
-      (xx4, yy4),
-      float_of_int(i + 1) /. 20.0,
-    )
-    let (tangent_x1, tangent_y1) = bezierTangent(
-      (xx1, yy1),
-      (xx2, yy2),
-      (xx3, yy3),
-      (xx4, yy4),
-      float_of_int(i) /. 20.0,
-    )
-    let (tangent_x2, tangent_y2) = bezierTangent(
-      (xx1, yy1),
-      (xx2, yy2),
-      (xx3, yy3),
-      (xx4, yy4),
-      float_of_int(i + 1) /. 20.0,
-    )
-    let a1 = atan2(tangent_y1, tangent_x1) -. Reprocessing_Constants.half_pi
-    let a2 = atan2(tangent_y2, tangent_x2) -. Reprocessing_Constants.half_pi
-    let strokeWeightf = float_of_int(env.style.strokeWeight)
-    quadf(
-      ~p1=(x1 +. cos(a1) *. strokeWeightf /. 2., y1 +. sin(a1) *. strokeWeightf /. 2.),
-      ~p2=(x1 -. cos(a1) *. strokeWeightf /. 2., y1 -. sin(a1) *. strokeWeightf /. 2.),
-      ~p3=(x2 -. cos(a2) *. strokeWeightf /. 2., y2 -. sin(a2) *. strokeWeightf /. 2.),
-      ~p4=(x2 +. cos(a2) *. strokeWeightf /. 2., y2 +. sin(a2) *. strokeWeightf /. 2.),
-      env,
-    )
-  }
-
-let curvePoint = ((xx1, yy1), (xx2, yy2), (xx3, yy3), (xx4, yy4), t) => {
-  let mx0 = (1. -. 0.5) *. (xx3 -. xx1) /* @feature tightness will be defined as the 0 here */
-  let my0 = (1. -. 0.5) *. (yy3 -. yy1)
-  let mx1 = (1. -. 0.5) *. (xx4 -. xx2)
-  let my1 = (1. -. 0.5) *. (yy4 -. yy2)
-  (
-    (2. *. t ** 3. -. 3. *. t ** 2. +. 1.) *. xx2 +.
-    (t ** 3. -. 2. *. t ** 2. +. t) *. mx0 +.
-    (-2. *. t ** 3. +. 3. *. t ** 2.) *. xx3 +.
-    (t ** 3. -. t ** 2.) *. mx1,
-    (2. *. t ** 3. -. 3. *. t ** 2. +. 1.) *. yy2 +.
-    (t ** 3. -. 2. *. t ** 2. +. t) *. my0 +.
-    (-2. *. t ** 3. +. 3. *. t ** 2.) *. yy3 +.
-    (t ** 3. -. t ** 2.) *. my1,
-  )
-}
-
-let curveTangent = ((xx1, yy1), (xx2, yy2), (xx3, yy3), (xx4, yy4), t) => {
-  let mx0 = (1. -. 0.5) *. (xx3 -. xx1) /* @feature tightness will be defined as the 0 here */
-  let my0 = (1. -. 0.5) *. (yy3 -. yy1)
-  let mx1 = (1. -. 0.5) *. (xx4 -. xx2)
-  let my1 = (1. -. 0.5) *. (yy4 -. yy2)
-  (
-    (6. *. t ** 2. -. 6. *. t) *. xx2 +.
-    (3. *. t ** 2. -. 4. *. t +. 1.) *. mx0 +.
-    (-6. *. t ** 2. +. 6. *. t) *. xx3 +.
-    (3. *. t ** 2. -. 2. *. t) *. mx1,
-    (6. *. t ** 2. -. 6. *. t) *. yy2 +.
-    (3. *. t ** 2. -. 4. *. t +. 1.) *. my0 +.
-    (-6. *. t ** 2. +. 6. *. t) *. yy3 +.
-    (3. *. t ** 2. -. 2. *. t) *. my1,
-  )
-}
-
-let curve = ((xx1, yy1), (xx2, yy2), (xx3, yy3), (xx4, yy4), env: glEnv) =>
-  for i in 0 to 19 {
-    let (x1, y1) = curvePoint(
-      (xx1, yy1),
-      (xx2, yy2),
-      (xx3, yy3),
-      (xx4, yy4),
-      float_of_int(i) /. 20.0,
-    )
-    let (x2, y2) = curvePoint(
-      (xx1, yy1),
-      (xx2, yy2),
-      (xx3, yy3),
-      (xx4, yy4),
-      float_of_int(i + 1) /. 20.0,
-    )
-    let (tangent_x1, tangent_y1) = curveTangent(
-      (xx1, yy1),
-      (xx2, yy2),
-      (xx3, yy3),
-      (xx4, yy4),
-      float_of_int(i) /. 20.0,
-    )
-    let (tangent_x2, tangent_y2) = curveTangent(
-      (xx1, yy1),
-      (xx2, yy2),
-      (xx3, yy3),
-      (xx4, yy4),
-      float_of_int(i + 1) /. 20.0,
-    )
-    let a1 = atan2(tangent_y1, tangent_x1) -. Reprocessing_Constants.half_pi
-    let a2 = atan2(tangent_y2, tangent_x2) -. Reprocessing_Constants.half_pi
-    let strokeWeightf = float_of_int(env.style.strokeWeight)
-    quadf(
-      ~p1=(x1 +. cos(a1) *. strokeWeightf /. 2., y1 +. sin(a1) *. strokeWeightf /. 2.),
-      ~p2=(x1 -. cos(a1) *. strokeWeightf /. 2., y1 -. sin(a1) *. strokeWeightf /. 2.),
-      ~p3=(x2 -. cos(a2) *. strokeWeightf /. 2., y2 -. sin(a2) *. strokeWeightf /. 2.),
-      ~p4=(x2 +. cos(a2) *. strokeWeightf /. 2., y2 +. sin(a2) *. strokeWeightf /. 2.),
-      env,
-    )
-  }
-
-let pixelf = (~pos as (x, y), ~color, env: glEnv) => {
-  let w = float_of_int(env.style.strokeWeight)
-  Internal.addRectToGlobalBatch(
-    env,
-    ~bottomRight=(x +. w, y +. w),
-    ~bottomLeft=(x, y +. w),
-    ~topRight=(x +. w, y),
-    ~topLeft=(x, y),
-    ~color,
-  )
-}
-
-let pixel = (~pos as (x, y), ~color, env: glEnv) =>
-  pixelf(~pos=(float_of_int(x), float_of_int(y)), ~color, env)
-
-let trianglef = (~p1, ~p2, ~p3, env: glEnv) => {
-  let transform = Matrix.matptmul(env.matrix)
-  let (tp1, tp2, tp3) = (transform(p1), transform(p2), transform(p3))
-  switch env.style.fillColor {
-  | None => () /* don't draw fill */
-  | Some(color) => Internal.drawTriangle(env, tp1, tp2, tp3, ~color)
-  }
-  switch env.style.strokeColor {
-  | None => () /* don't draw stroke */
-  | Some(color) =>
-    let width = float_of_int(env.style.strokeWeight)
-    let project = false
-    let matrix = env.matrix
-    Internal.drawLineWithMatrix(~p1, ~p2, ~matrix, ~color, ~width, ~project, env)
-    Internal.drawLineWithMatrix(~p1=p2, ~p2=p3, ~matrix, ~color, ~width, ~project, env)
-    Internal.drawLineWithMatrix(~p1, ~p2=p3, ~matrix, ~color, ~width, ~project, env)
-    let r = width /. 2.
-    Internal.drawEllipse(env, p1, r, r, matrix, color)
-    Internal.drawEllipse(env, p2, r, r, matrix, color)
-    Internal.drawEllipse(env, p3, r, r, matrix, color)
-  }
-}
-
-let triangle = (~p1 as (x1, y1), ~p2 as (x2, y2), ~p3 as (x3, y3), env: glEnv) =>
-  trianglef(
-    ~p1=(float_of_int(x1), float_of_int(y1)),
-    ~p2=(float_of_int(x2), float_of_int(y2)),
-    ~p3=(float_of_int(x3), float_of_int(y3)),
-    env,
-  )
-
-let arcf = (~center, ~radx, ~rady, ~start, ~stop, ~isOpen, ~isPie, env: glEnv) => {
-  switch env.style.fillColor {
-  | None => () /* don't draw fill */
-  | Some(color) => Internal.drawArc(env, center, radx, rady, start, stop, isPie, env.matrix, color)
-  }
-  switch env.style.strokeColor {
-  | None => () /* don't draw stroke */
-  | Some(stroke) =>
-    Internal.drawArcStroke(
-      env,
-      center,
-      radx,
-      rady,
-      start,
-      stop,
-      isOpen,
-      isPie,
-      env.matrix,
-      stroke,
-      env.style.strokeWeight,
-    )
-  }
-}
-
-let arc = (~center as (cx, cy), ~radx, ~rady, ~start, ~stop, ~isOpen, ~isPie, env: glEnv) =>
-  arcf(
-    ~center=(float_of_int(cx), float_of_int(cy)),
-    ~radx=float_of_int(radx),
-    ~rady=float_of_int(rady),
-    ~start,
-    ~stop,
-    ~isOpen,
-    ~isPie,
-    env,
-  )
-
-let loadFont = (~filename, ~isPixel=false, env: glEnv) =>
-  Font.parseFontFormat(env, filename, isPixel)
-
-let text = (~font=?, ~body, ~pos as (x, y), env: glEnv) =>
-  Font.drawString(env, font, body, float_of_int(x), float_of_int(y))
-
-let textWidth = (~font=?, ~body, env) => int_of_float(Font.calcStringWidth(env, font, body))
-
-let clear = env =>
-  Reasongl.Gl.clear(
-    ~context=env.gl,
-    ~mask=lor(Constants.color_buffer_bit, Constants.depth_buffer_bit),
-  )
-
-let background = (color, env: glEnv) => {
-  clear(env)
-  let w = float_of_int(Env.width(env))
-  let h = float_of_int(Env.height(env))
-  Internal.addRectToGlobalBatch(
-    env,
-    ~bottomRight=(w, h),
-    ~bottomLeft=(0., h),
-    ~topRight=(w, 0.),
-    ~topLeft=(0., 0.),
-    ~color,
-  )
-}
-
-let createImage = (~width, ~height, env) => Internal.createImage(width, height, env)
-
-let withImage = (image, env, cb) => Internal.drawOnImage(image, env, cb)
-
-let isImageDrawnTo = image => image.drawnTo
-
-let clearImage = (image, env) => Internal.clearImage(image, env)
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Draw.resi b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Draw.resi
deleted file mode 100644
index a8f9d61..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Draw.resi
+++ /dev/null
@@ -1,542 +0,0 @@
-@@ocaml.doc(" # The Draw module
- *
- * This is where all the fancy things happen.
- *
- * ```reason;shared(sandbox)
- * [@bs.val] external sandboxCanvasId: string = \"\";
- * [@bs.val] external sandboxCanvas: 'canvas = \"\";
- * [@bs.val] external containerDiv: 'node = \"\";
- * [@bs.send] external addEventListener: ('node, string, 'eventT => unit) => unit = \"addEventListener\";
- * let id = sandboxCanvasId;
- * addEventListener(containerDiv, \"mouseleave\", (_) => Reprocessing.playPause(id, false) |> ignore);
- * addEventListener(containerDiv, \"mouseenter\", (_) => Reprocessing.playPause(id, true) |> ignore);
- * Reprocessing.setScreenId(sandboxCanvasId);
- * ```
- *
- * ```reason;shared(draw);use(sandbox)
- * open Reprocessing;
- * open Draw;
- * run(~setup=env => Env.size(~width=200, ~height=200, env), ~draw=((), env) => {
- * %{code}%
- * }, ())
- * ```
- *
- * ```canvas;use(draw)
- * fill(Constants.red, env);
- * rect(~pos=Env.mouse(env), ~width=5, ~height=5, env);
- * ```
- *
- * ## Core drawing operations
- *
- * @doc rect, rectf, clear, background, line, linef, ellipse, ellipsef, quad, quadf, pixel, pixelf, triangle, trianglef, bexier, arc, arcf, curve
- *
- * ## Style operations
- *
- * @doc fill, noFill, stroke, noStroke, strokeWeight, strokeCap, tint, noTint, pushStyle, popStyle
- *
- * ## Text
- *
- * @doc loadFont, text
- *
- * ## Images
- *
- * @doc loadImage, image, subImage, subImagef
- *
- * ## Matrix/transform operations
- *
- * @doc translate, rotate, scale, shear, pushMatrix, popMatrix, rectMode
- *
- ")
-
-@ocaml.doc(" Specifies an amount to displace objects within the display window.
-   * The dx parameter specifies left/right translation, the dy parameter
-   * specifies up/down translation.
-   *
-   * Transformations are cumulative and apply to everything that happens
-   * after and subsequent calls to the function accumulates the effect.
-   * For example, calling `translate dx::50 dy::0 env` and then
-   * `translate dx::20 dy::0 env` is the same as `translate dx::70 dy::0 env`.
-   * If `translate` is called within `draw`, the transformation is reset
-   * when the loop begins again. This function can be further controlled
-   * by using `pushMatrix` and `popMatrix`.
- ")
-let translate: (~x: float, ~y: float, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Rotates the amount specified by the angle parameter. Angles must be
- * specified in radians (values from 0 to two_pi), or they can be converted
- * from degrees to radians with the `radians` function.
-
- * The coordinates are always rotated around their relative position to the
- * origin. Positive numbers rotate objects in a clockwise direction and
- * negative numbers rotate in the couterclockwise direction. Transformations
- * apply to everything that happens afterward, and subsequent calls to the
- * function compound the effect. For example, calling
- * `rotate Constants.pi/2. env` once and then calling `rotate Constants.pi/2. env`
- * a second time is the same as a single `rotate Constants.pi env`. All
- * tranformations are reset when `draw` begins again.
-
- * Technically, `rotate` multiplies the current transformation matrix by a
- * rotation matrix. This function can be further controlled by `pushMatrix`
- * and `popMatrix`.
- ")
-let rotate: (float, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" The scale() function increases or decreases the size of a shape by expanding
- * and contracting vertices.
- ")
-let scale: (~x: float, ~y: float, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" The shear() function shears the matrix along the axes the amount
- * specified by the angle parameters. Angles should be specified in radians
- * (values from 0 to PI*2) or converted to radians with the Utils.radians()
- * function.
- ")
-let shear: (~x: float, ~y: float, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Sets the color used to fill shapes.")
-let fill: (Reprocessing_Types.Types.colorT, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Disables filling geometry. If both `noStroke` and `noFill` are called,
-   * nothing will be drawn to the screen.
- ")
-let noFill: Reprocessing_Types.Types.glEnvT => unit
-
-@ocaml.doc(" Sets the fill value for displaying images. Images can be tinted to specified colors
-   * or made transparent by including an alpha value.
- ")
-let tint: (Reprocessing_Types.Types.colorT, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Removes the current fill value for displaying images and reverts to displaying
-   * images with their original hues.
- ")
-let noTint: Reprocessing_Types.Types.glEnvT => unit
-
-@ocaml.doc(" Sets the color used to draw lines and borders around shapes. ")
-let stroke: (Reprocessing_Types.Types.colorT, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Disables drawing the stroke (outline). If both noStroke() and noFill()
-   * are called, nothing will be drawn to the screen.
- ")
-let noStroke: Reprocessing_Types.Types.glEnvT => unit
-
-@ocaml.doc(" Sets the width of the stroke used for lines, points, and the border around
-   * shapes. All widths are set in units of pixels.
- ")
-let strokeWeight: (int, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Sets the style for rendering line endings. These ends are either squared,
-  * extended, or rounded.
- ")
-let strokeCap: (Reprocessing_Types.Types.strokeCapT, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Sets the style to modify the location from which rectangles are drawn by
-  * changing the way in which parameters given to rect() and rectf() are intepreted.
-  *
-  * The default mode is rectMode(Corner), which interprets the position of rect()
-  * as the upper-left corner of the shape, while the third and fourth parameters
-  * are its width and height.
-  *
-  * rectMode(Center) interprets the position of rect() as the shape's center point,
-  * while the third and fourth parameters are its width and height.
-  *
-  * rectMode(Radius) also uses the position of rect() as the shape's center point,
-  * but uses the third and fourth parameters to specify half of the shapes's width
-  * and height.
- ")
-let rectMode: (Reprocessing_Types.Types.rectModeT, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" The `pushStyle` function saves the current style settings and `popStyle`
-   * restores the prior settings. Note that these functions are always used
-   * together. They allow you to change the style settings and later return to
-   * what you had. When a new style is started with `pushStyle`, it builds on the
-   * current style information. The `pushStyle` and `popStyle` functions can be
-   * embedded to provide more control.
-   *
-   * The style information controlled by the following functions are included in
-   * the style: fill, stroke, strokeWeight
- ")
-let pushStyle: Reprocessing_Types.Types.glEnvT => unit
-
-@ocaml.doc(" The `pushStyle` function saves the current style settings and
-   * `popStyle` restores the prior settings; these functions are always used
-   * together. They allow you to change the style settings and later return to
-   * what you had. When a new style is started with `pushStyle`, it builds on the
-   * current style information. The `pushStyle` and `popStyle` functions can be
-   * embedded to provide more control.
-   *
-   * The style information controlled by the following functions are included in
-   * the style: fill, stroke, strokeWeight
- ")
-let popStyle: Reprocessing_Types.Types.glEnvT => unit
-
-@ocaml.doc(" Pushes the current transformation matrix onto the matrix stack. Understanding pushMatrix() and popMatrix()
-  * requires understanding the concept of a matrix stack. The pushMatrix() function saves the current coordinate
-  * system to the stack and popMatrix() restores the prior coordinate system. pushMatrix() and popMatrix() are
-  * used in conjuction with the other transformation methods and may be embedded to control the scope of
-  * the transformations.
- ")
-let pushMatrix: Reprocessing_Types.Types.glEnvT => unit
-
-@ocaml.doc(" Pops the current transformation matrix off the matrix stack. Understanding pushing and popping requires
-  * understanding the concept of a matrix stack. The pushMatrix() function saves the current coordinate system to
-  * the stack and popMatrix() restores the prior coordinate system. pushMatrix() and popMatrix() are used in
-  * conjuction with the other transformation methods and may be embedded to control the scope of the transformations.
- ")
-let popMatrix: Reprocessing_Types.Types.glEnvT => unit
-
-@ocaml.doc(" Loads an image and returns a handle to it. This will lazily load and
-   * attempting to draw an image that has not finished loading will result
-   * in nothing being drawn.
-   * In general, all images should be loaded in `setup` to preload them at
-   * the start of the program.
-   * If isPixel is set to true, then when scaling the image, it will use
-   * GL_NEAREST (you want this setting if your image is meant to look
-   * pixelated)
- ")
-let loadImage: (
-  ~filename: string,
-  ~isPixel: bool=?,
-  Reprocessing_Types.Types.glEnvT,
-) => Reprocessing_Types.Types.imageT
-
-@ocaml.doc(" The `imagef` function draws an image to the display window.
-   * The image should be loaded using the `loadImage` function.
-   * The image is displayed at its original size unless width and
-   * height are optionally specified.
- ")
-let imagef: (
-  Reprocessing_Types.Types.imageT,
-  ~pos: (float, float),
-  ~width: float=?,
-  ~height: float=?,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" The `image` function draws an image to the display window.
-   * The image should be loaded using the `loadImage` function.
-   * The image is displayed at its original size unless width and
-   * height are optionally specified.
-   * 
-   * This is the same as `imagef` but takes in integers instead of floats for convenience.
- ")
-let image: (
-  Reprocessing_Types.Types.imageT,
-  ~pos: (int, int),
-  ~width: int=?,
-  ~height: int=?,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" The `subImage` function draws a section of an image to the
-   * display window. The image should be loaded using the
-   * `loadImage` function. The image is displayed at the size
-   * specified by width and height.  texPos, texWidth, and
-   * texHeight describe the section of the full image that
-   * should be drawn.
-   *
-   * This function is useful for a spritesheet-style of
-   * drawing strategy.
- ")
-let subImage: (
-  Reprocessing_Types.Types.imageT,
-  ~pos: (int, int),
-  ~width: int,
-  ~height: int,
-  ~texPos: (int, int),
-  ~texWidth: int,
-  ~texHeight: int,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" The `subImagef` function draws a section of an image to the
-   * display window. The image should be loaded using the
-   * `loadImage` function. The image is displayed at the size
-   * specified by width and height.  texPos, texWidth, and
-   * texHeight describe the section of the full image that
-   * should be drawn.
-   *
-   * This function is useful for a spritesheet-style of
-   * drawing strategy.
- ")
-let subImagef: (
-  Reprocessing_Types.Types.imageT,
-  ~pos: (float, float),
-  ~width: float,
-  ~height: float,
-  ~texPos: (int, int),
-  ~texWidth: int,
-  ~texHeight: int,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" Draws a rectangle to the screen. A rectangle is a four-sided shape with
-   * every angle at ninety degrees.
- ")
-let rectf: (
-  ~pos: (float, float),
-  ~width: float,
-  ~height: float,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" Draws a rectangle to the screen. A rectangle is a four-sided shape with
-   * every angle at ninety degrees.
-   *
-   * This is the same as `rectf` but takes in integers instead of floats for convenience.
- ")
-let rect: (~pos: (int, int), ~width: int, ~height: int, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Draws a curved line on the screen. The first parameter specifies
-   * the beginning control point and the last parameter specifies the ending
-   * control point. The middle parameters specify the start and stop of the curve.
- ")
-let curve: (
-  (float, float),
-  (float, float),
-  (float, float),
-  (float, float),
-  Reprocessing_Common.glEnv,
-) => unit
-
-@ocaml.doc(" Draws a line (a direct path between two points) to the screen.
-   * To color a line, use the `stroke` function. A line cannot be filled,
-   * therefore the `fill` function will not affect the color of a line. Lines are
-   * drawn with a width of one pixel by default, but this can be changed with
-   * the `strokeWeight` function.
- ")
-let linef: (~p1: (float, float), ~p2: (float, float), Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Draws a line (a direct path between two points) to the screen.
-   * To color a line, use the `stroke` function. A line cannot be filled,
-   * therefore the `fill` function will not affect the color of a line. Lines are
-   * drawn with a width of one pixel by default, but this can be changed with
-   * the `strokeWeight` function.
-   *
-   * This is the same as `linef`, but converts all its integer arguments to floats
-   * as a convenience.
- ")
-let line: (~p1: (int, int), ~p2: (int, int), Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Draws an ellipse (oval) to the screen. An ellipse with equal width and
-   * height is a circle.
- ")
-let ellipsef: (
-  ~center: (float, float),
-  ~radx: float,
-  ~rady: float,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" Draws an ellipse (oval) to the screen. An ellipse with equal width and
-   * height is a circle.
-   *
-   * This is the same as `ellipsef`, but converts all its integer arguments to
-   * floats as a convenience.
- ")
-let ellipse: (~center: (int, int), ~radx: int, ~rady: int, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc("  A quad is a quadrilateral, a four sided polygon. It is similar to a
-   * rectangle, but the angles between its edges are not constrained to ninety
-   * degrees. The parameter p1 sets the first vertex and the subsequest points
-   * should proceed clockwise or counter-clockwise around the defined shape.
- ")
-let quadf: (
-  ~p1: (float, float),
-  ~p2: (float, float),
-  ~p3: (float, float),
-  ~p4: (float, float),
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc("  A quad is a quadrilateral, a four sided polygon. It is similar to a
-   * rectangle, but the angles between its edges are not constrained to ninety
-   * degrees. The parameter p1 sets the first vertex and the subsequest points
-   * should proceed clockwise or counter-clockwise around the defined shape.
-   *
-   * This is the same as `quadf`, but converts all its integer arguments to
-   * floats as a convenience.
- ")
-let quad: (
-  ~p1: (int, int),
-  ~p2: (int, int),
-  ~p3: (int, int),
-  ~p4: (int, int),
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" Adds a single point with a radius defined by strokeWeight ")
-let pixelf: (
-  ~pos: (float, float),
-  ~color: Reprocessing_Types.Types.colorT,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" Adds a single point with a radius defined by strokeWeight
-   *
-   * This is the same as `pixelf`, but converts all its integer arguments to
-   * floats as a convenience.
- ")
-let pixel: (
-  ~pos: (int, int),
-  ~color: Reprocessing_Types.Types.colorT,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" A triangle is a plane created by connecting three points. ")
-let trianglef: (
-  ~p1: (float, float),
-  ~p2: (float, float),
-  ~p3: (float, float),
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" A triangle is a plane created by connecting three points.
-   *
-   * This is the same as `trianglef`, but converts all its integer arguments to
-   * floats as a convenience.
- ")
-let triangle: (
-  ~p1: (int, int),
-  ~p2: (int, int),
-  ~p3: (int, int),
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" Draws a Bezier curve on the screen. These curves are defined by a
-   * series of anchor and control points. The parameter p1 specifies the
-   * first anchor point and the last parameter specifies the other anchor
-   * point. The middle parameters p2 and p3 specify the control points
-   * which define the shape of the curve. Bezier curves were developed
-   * by French engineer Pierre Bezier.
- ")
-let bezier: (
-  ~p1: (float, float),
-  ~p2: (float, float),
-  ~p3: (float, float),
-  ~p4: (float, float),
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" Draws an arc to the screen. Arcs are drawn along the outer edge of an
-   * ellipse defined by the center, radx, and rady parameters. Use the
-   * start and stop parameters to specify the angles (in radians) at which
-   * to draw the arc. isPie defines whether or not lines should be drawn to
-   * the center at the start and stop points of the arc rather than simply
-   * connecting the points.  If isOpen is true, no line will be drawn other
-   * than the arc between start and stop.
- ")
-let arcf: (
-  ~center: (float, float),
-  ~radx: float,
-  ~rady: float,
-  ~start: float,
-  ~stop: float,
-  ~isOpen: bool,
-  ~isPie: bool,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" Draws an arc to the screen. Arcs are drawn along the outer edge of an
-   * ellipse defined by the center, radx, and rady parameters. Use the
-   * start and stop parameters to specify the angles (in radians) at which
-   * to draw the arc. isPie defines whether or not lines should be drawn to
-   * the center at the start and stop points of the arc rather than simply
-   * connecting the points.  If isOpen is true, no line will be drawn other
-   * than the arc between start and stop.
-   *
-   * This is the same as `arcf`, but converts all its integer arguments to
-   * floats as a convenience.
- ")
-let arc: (
-  ~center: (int, int),
-  ~radx: int,
-  ~rady: int,
-  ~start: float,
-  ~stop: float,
-  ~isOpen: bool,
-  ~isPie: bool,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" Loads a font and returns a handle to it. This will lazily load and
-   * attempting to draw an font that has not finished loading will result
-   * in nothing being drawn.
-   * In general, all fonts should be loaded in `setup` to preload them at
-   * the start of the program.
-   * If isPixel is set to true, then when scaling the font, it will use
-   * GL_NEAREST (you want this setting if your font is meant to look
-   * pixelated)
- ")
-let loadFont: (
-  ~filename: string,
-  ~isPixel: bool=?,
-  Reprocessing_Types.Types.glEnvT,
-) => Reprocessing_Font.fontT
-
-@ocaml.doc(" Draws text to the screen.
- *
- * To use a font, use [loadFont](#value-loadFont) in your `setup()` function. If you don't specify a font, the default font is used.
- *
- * ```canvas;use(draw)
- * Draw.background(Constants.white, env);
- * text(~body=\"Hello folks\", ~pos=(5, 40), env);
- * ```
- ")
-let text: (
-  ~font: Reprocessing_Font.fontT=?,
-  ~body: string,
-  ~pos: (int, int),
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-@ocaml.doc(" Calculates width of text using a specific font.
-  * The font should be loaded using the `loadFont` function.
- ")
-let textWidth: (
-  ~font: Reprocessing_Font.fontT=?,
-  ~body: string,
-  Reprocessing_Types.Types.glEnvT,
-) => int
-
-@ocaml.doc(" Clears the entire screen. Normally, background is used for this purpose,
-  * clear will have different results in web and native.
- ")
-let clear: Reprocessing_Types.Types.glEnvT => unit
-
-@ocaml.doc(" The `background` function sets the color used for the background of the
-   * Processing window. The default background is black. This function is
-   * typically used within `draw` to clear the display window at the beginning of
-   * each frame, but it can be used inside `setup` to set the background on the
-   * first frame of animation or if the backgound need only be set once.
- ")
-let background: (Reprocessing_Types.Types.colorT, Reprocessing_Types.Types.glEnvT) => unit
-
-@ocaml.doc(" Makes draw calls inside the callback draw to the given image instead of to the screen.
-  * The callback is called with a new env which will make all draw calls done inside the callback
-  * draw on the image instead of the main canvas.
-  * This is useful to basically cache draw calls onto an image which can then be drawn to the
-  * screen very cheaply at any point after.
- ")
-let withImage: (
-  Reprocessing_Types.Types.imageT,
-  Reprocessing_Types.Types.glEnvT,
-  Reprocessing_Types.Types.glEnvT => unit,
-) => unit
-
-@ocaml.doc(" Returns a new image which can be drawn to.
- ")
-let createImage: (
-  ~width: int,
-  ~height: int,
-  Reprocessing_Types.Types.glEnvT,
-) => Reprocessing_Types.Types.imageT
-
-@ocaml.doc(" Checks whether the given image has been drawn to since created or since last time clearImage
-  * was called. This is useful when using images as a caching mechanism, to check if the image is
-  * up to date.
- ")
-let isImageDrawnTo: Reprocessing_Types.Types.imageT => bool
-
-@ocaml.doc(" Clears image such that `isImageDrawnTo` returns false.
- ")
-let clearImage: (Reprocessing_Types.Types.imageT, Reprocessing_Types.Types.glEnvT) => unit
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Env.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Env.res
deleted file mode 100644
index 50d4bec..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Env.res
+++ /dev/null
@@ -1,69 +0,0 @@
-open Reprocessing_Common
-
-module Matrix = Reprocessing_Matrix
-
-let width = env => env.size.width
-
-let height = env => env.size.height
-
-let mouse = env => env.mouse.pos
-
-let pmouse = env => env.mouse.prevPos
-
-let mousePressed = env => env.mouse.pressed
-
-let keyCode = env => env.keyboard.keyCode
-
-let key = (key, env) => Reprocessing_Common.KeySet.mem(key, env.keyboard.down)
-
-let keyPressed = (key, env) => Reprocessing_Common.KeySet.mem(key, env.keyboard.pressed)
-
-let keyReleased = (key, env) => Reprocessing_Common.KeySet.mem(key, env.keyboard.released)
-
-let size = (~width, ~height, env: glEnv) => {
-  Reasongl.Gl.Window.setWindowSize(~window=env.window, ~width, ~height)
-  Reprocessing_Internal.resetSize(env, width, height)
-}
-
-let title = (title, env: glEnv) => Reasongl.Gl.Window.setWindowTitle(~window=env.window, ~title)
-
-let resizeable = (resizeable, env: glEnv) => env.size.resizeable = resizeable
-
-let frameRate = (env: glEnv) => env.frame.rate
-
-let frameCount = (env: glEnv) => env.frame.count
-
-let deltaTime = (env: glEnv) => env.frame.deltaTime
-
-let localizePointf = (p: (float, float), env: glEnv) => {
-  open Matrix
-  matptmul(matinv(env.matrix), p)
-}
-
-let localizePoint = ((x, y): (int, int), env: glEnv) => {
-  let (lx, ly) = {
-    open Matrix
-    matptmul(matinv(env.matrix), (float_of_int(x), float_of_int(y)))
-  }
-  (int_of_float(lx), int_of_float(ly))
-}
-
-let loadSound = (path, env) => {
-  let sound = ref(Loading)
-  Reasongl.Gl.Audio.loadSound(env.window, path, v => {
-    switch sound.contents {
-    | ShouldPlay(volume, loop) => Reasongl.Gl.Audio.playSound(env.window, v, ~volume, ~loop)
-    | _ => ()
-    }
-    sound := Loaded(v)
-  })
-  sound
-}
-
-let playSound = (sound, ~volume=1.0, ~loop=false, env) =>
-  switch sound.contents {
-  | Loading
-  | ShouldPlay(_, _) =>
-    sound := ShouldPlay(volume, loop)
-  | Loaded(sound) => Reasongl.Gl.Audio.playSound(env.window, sound, ~volume, ~loop)
-  }
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Env.resi b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Env.resi
deleted file mode 100644
index 257a8d7..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Env.resi
+++ /dev/null
@@ -1,47 +0,0 @@
-let width: Reprocessing_Types.Types.glEnvT => int
-
-let height: Reprocessing_Types.Types.glEnvT => int
-
-let mouse: Reprocessing_Types.Types.glEnvT => (int, int)
-
-let pmouse: Reprocessing_Types.Types.glEnvT => (int, int)
-
-let mousePressed: Reprocessing_Types.Types.glEnvT => bool
-
-let keyCode: Reprocessing_Types.Types.glEnvT => Reprocessing_Events.keycodeT
-
-let key: (Reprocessing_Common.KeySet.elt, Reprocessing_Common.glEnv) => bool
-
-let keyPressed: (Reprocessing_Common.KeySet.elt, Reprocessing_Common.glEnv) => bool
-
-let keyReleased: (Reprocessing_Common.KeySet.elt, Reprocessing_Common.glEnv) => bool
-
-let size: (~width: int, ~height: int, Reprocessing_Types.Types.glEnvT) => unit
-
-let title: (string, Reprocessing_Types.Types.glEnvT) => unit
-
-let resizeable: (bool, Reprocessing_Types.Types.glEnvT) => unit
-
-let frameRate: Reprocessing_Types.Types.glEnvT => int
-
-let frameCount: Reprocessing_Types.Types.glEnvT => int
-
-let loadSound: (string, Reprocessing_Types.Types.glEnvT) => Reprocessing_Types.Types.soundT
-
-let playSound: (
-  Reprocessing_Types.Types.soundT,
-  ~volume: float=?,
-  ~loop: bool=?,
-  Reprocessing_Types.Types.glEnvT,
-) => unit
-
-/* ** Time in seconds since the last frame */
-let deltaTime: Reprocessing_Types.Types.glEnvT => float
-
-/* **
- Localize a point in canvas coordinates to the current env's
- transformed coordinates
- */
-let localizePoint: ((int, int), Reprocessing_Types.Types.glEnvT) => (int, int)
-
-let localizePointf: ((float, float), Reprocessing_Types.Types.glEnvT) => (float, float)
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Events.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Events.res
deleted file mode 100644
index 936849b..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Events.res
+++ /dev/null
@@ -1,139 +0,0 @@
-type buttonStateT = Reasongl.Gl.Events.buttonStateT = LeftButton | MiddleButton | RightButton
-
-type stateT = Reasongl.Gl.Events.stateT = MouseDown | MouseUp
-
-type keycodeT = Reasongl.Gl.Events.keycodeT =
-  | Backspace
-  | Delete
-  | Tab
-  | Enter
-  | Escape
-  | Space
-  | Quote
-  | Comma
-  | Minus
-  | Period
-  | Slash
-  | Num_0
-  | Num_1
-  | Num_2
-  | Num_3
-  | Num_4
-  | Num_5
-  | Num_6
-  | Num_7
-  | Num_8
-  | Num_9
-  | Semicolon
-  | Equals
-  | OpenBracket
-  | Backslash
-  | CloseBracket
-  | A
-  | B
-  | C
-  | D
-  | E
-  | F
-  | G
-  | H
-  | I
-  | J
-  | K
-  | L
-  | M
-  | N
-  | O
-  | P
-  | Q
-  | R
-  | S
-  | T
-  | U
-  | V
-  | W
-  | X
-  | Y
-  | Z
-  | Right
-  | Left
-  | Down
-  | Up
-  | LeftCtrl
-  | LeftShift
-  | LeftAlt
-  | LeftOsKey
-  | RightCtrl
-  | RightShift
-  | RightAlt
-  | RightOsKey
-  | CapsLock
-  | Backtick
-  | Nothing
-
-let keycodeMap: int => keycodeT = x =>
-  switch x {
-  | 8 => Backspace
-  | 9 => Tab
-  | 13 => Enter
-  | 16 => LeftShift /* There is no RightShift :( */
-  | 17 => LeftCtrl /* There is no RightCtrl :( */
-  | 18 => LeftAlt /* There is no RightAlt :( */
-  | 20 => CapsLock
-  | 27 => Escape
-  | 32 => Space
-  | 37 => Left
-  | 38 => Up
-  | 39 => Right
-  | 40 => Down
-  | 48 => Num_0
-  | 49 => Num_1
-  | 50 => Num_2
-  | 51 => Num_3
-  | 52 => Num_4
-  | 53 => Num_5
-  | 54 => Num_6
-  | 55 => Num_7
-  | 56 => Num_8
-  | 57 => Num_9
-  | 65 => A
-  | 66 => B
-  | 67 => C
-  | 68 => D
-  | 69 => E
-  | 70 => F
-  | 71 => G
-  | 72 => H
-  | 73 => I
-  | 74 => J
-  | 75 => K
-  | 76 => L
-  | 77 => M
-  | 78 => N
-  | 79 => O
-  | 80 => P
-  | 81 => Q
-  | 82 => R
-  | 83 => S
-  | 84 => T
-  | 85 => U
-  | 86 => V
-  | 87 => W
-  | 88 => X
-  | 89 => Y
-  | 90 => Z
-  | 91 => LeftOsKey
-  | 93 => RightOsKey
-  | 186 => Semicolon
-  | 187 => Equals
-  | 188 => Comma
-  | 189 => Minus
-  | 190 => Period
-  | 191 => Slash
-  | 192 => Backtick
-  | 219 => OpenBracket
-  | 220 => Backslash
-  | 221 => CloseBracket
-  | 222 => Quote
-  | _ => Nothing
-  }
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Font.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Font.res
deleted file mode 100644
index 8f3469b..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Font.res
+++ /dev/null
@@ -1,303 +0,0 @@
-open Reasongl
-
-@ocaml.doc(" # Fonts & Text
- *
- * This module is internal - you probably shouldn't depend on any implementation details.
- *
- * Take a look at [Draw.text](./Reprocessing_Draw.html#value-text) for information on drawing text.
- *
- ")
-module Internal = Reprocessing_Internal
-
-open Reprocessing_Common
-
-/* Mostly to suppress the bsc warning */
-let intCompare = (i: int, j: int) => i == j ? 0 : i < j ? -1 : 1
-
-module Font = {
-  module IntMap = Map.Make({
-    type t = int
-    let compare = intCompare
-  })
-  module IntPairMap = Map.Make({
-    type t = (int, int)
-    let compare = ((a1, a2), (b1, b2)) => {
-      let first = intCompare(a1, b1)
-      if first != 0 {
-        first
-      } else {
-        intCompare(a2, b2)
-      }
-    }
-  })
-  type charT = {
-    x: float,
-    y: float,
-    width: float,
-    height: float,
-    xoffset: float,
-    yoffset: float,
-    xadvance: float,
-  }
-  type internalType = {
-    chars: IntMap.t<charT>,
-    kerning: IntPairMap.t<float>,
-    res: float,
-    lineHeight: float,
-    image: imageT,
-  }
-  type t = ref<option<internalType>>
-  let defaultFont = ref(None)
-  let rec parse_num = (stream: Stream.t, acc): (Stream.t, float) =>
-    switch Stream.peekch(stream) {
-    | Some('-' as c)
-    | Some('.' as c)
-    | Some('0' .. '9' as c) =>
-      parse_num(Stream.popch(stream), append_char(acc, c))
-    | _ =>
-      try (stream, float_of_string(acc)) catch {
-      | _ => failwith("Could not parse number [" ++ (acc ++ "]."))
-      }
-    }
-  let parse_num = stream => parse_num(stream, "")
-  let rec parse_string = (stream: Stream.t, acc: string): (Stream.t, string) =>
-    switch Stream.peekch(stream) {
-    | Some('"') => (Stream.popch(stream), acc)
-    | Some(c) => parse_string(Stream.popch(stream), append_char(acc, c))
-    | None => failwith("Unterminated string.")
-    }
-  let parse_string = stream => parse_string(stream, "")
-  let rec pop_line = stream =>
-    switch Stream.peekch(stream) {
-    | Some('\n') => Stream.popch(stream)
-    | Some(_) => pop_line(Stream.popch(stream))
-    | None => failwith("could not pop line")
-    }
-  let rec parse_char_fmt = (stream, num, map) =>
-    if num < 0 {
-      (stream, map)
-    } else if Stream.peekn(stream, 4) != Some("char") {
-      prerr_string("Warning: encountered end of char sequence early when loading font.\n")
-      (stream, map)
-    } else {
-      let stream = Stream.match_(stream, "char id=")
-      let (stream, char_id) = parse_num(stream)
-      let stream = Stream.match_(Stream.skipWhite(stream), "x=")
-      let (stream, x) = parse_num(stream)
-      let stream = Stream.match_(Stream.skipWhite(stream), "y=")
-      let (stream, y) = parse_num(stream)
-      let stream = Stream.match_(Stream.skipWhite(stream), "width=")
-      let (stream, width) = parse_num(stream)
-      let stream = Stream.match_(Stream.skipWhite(stream), "height=")
-      let (stream, height) = parse_num(stream)
-      let stream = Stream.match_(Stream.skipWhite(stream), "xoffset=")
-      let (stream, xoffset) = parse_num(stream)
-      let stream = Stream.match_(Stream.skipWhite(stream), "yoffset=")
-      let (stream, yoffset) = parse_num(stream)
-      let stream = Stream.match_(Stream.skipWhite(stream), "xadvance=")
-      let (stream, xadvance) = parse_num(stream)
-      let stream = pop_line(stream)
-      let new_map = IntMap.add(
-        int_of_float(char_id),
-        {
-          x: x,
-          y: y,
-          width: width,
-          height: height,
-          xoffset: xoffset,
-          yoffset: yoffset,
-          xadvance: xadvance,
-        },
-        map,
-      )
-      parse_char_fmt(stream, num - 1, new_map)
-    }
-  let rec parse_kern_fmt = (stream, num, map) =>
-    if num == 0 {
-      (stream, map)
-    } else {
-      let stream = Stream.match_(stream, "kerning first=")
-      let (stream, first) = parse_num(stream)
-      let stream = Stream.match_(Stream.skipWhite(stream), "second=")
-      let (stream, second) = parse_num(stream)
-      let stream = Stream.match_(Stream.skipWhite(stream), "amount=")
-      let (stream, amount) = parse_num(stream)
-      let stream = pop_line(stream)
-      let new_map = IntPairMap.add((int_of_float(first), int_of_float(second)), amount, map)
-      parse_kern_fmt(stream, num - 1, new_map)
-    }
-  let replaceFilename = (path, filename) => {
-    let splitStr = Reprocessing_Common.split(path, ~sep='/')
-    let revLst = List.rev(splitStr)
-    let newRevLst = switch revLst {
-    | list{_, ...tl} => list{filename, ...tl}
-    | list{} => list{}
-    }
-    let newLst = List.rev(newRevLst)
-    String.concat("/", newLst)
-  }
-  let getCharMapAndKernMap = str => {
-    let stream = Stream.create(str ++ "\n")
-    let (stream, res) = switch Stream.peekn(stream, 9) {
-    | Some("info res=") =>
-      let stream = Stream.match_(stream, "info res=")
-      parse_num(stream)
-    | Some(_)
-    | None => (stream, 1.)
-    }
-    let stream = pop_line(stream)
-    let stream = Stream.match_(stream, "common lineHeight=")
-    let (stream, lineHeight) = parse_num(stream)
-    let stream = pop_line(stream)
-    let stream = Stream.match_(stream, "page id=0 file=\"")
-    let (stream, filename) = parse_string(stream)
-    let stream = pop_line(stream)
-    let stream = Stream.match_(stream, "chars count=")
-    let (stream, num_chars) = parse_num(stream)
-    let stream = pop_line(stream)
-    let (stream, char_map) = parse_char_fmt(stream, int_of_float(num_chars), IntMap.empty)
-    let stream = Stream.match_(stream, "kernings count=")
-    let (stream, num_kerns) = parse_num(stream)
-    let stream = pop_line(stream)
-    let (_, kern_map) = parse_kern_fmt(stream, int_of_float(num_kerns), IntPairMap.empty)
-    (char_map, kern_map, filename, res, lineHeight)
-  }
-  let parseFontFormat = (env, path, isPixel) => {
-    let ret = ref(None)
-    Gl.File.readFile(~filename=path, ~cb=str => {
-      let (char_map, kern_map, filename, res, lineHeight) = getCharMapAndKernMap(str)
-      let img_filename = replaceFilename(path, filename)
-      ret :=
-        Some({
-          chars: char_map,
-          kerning: kern_map,
-          res: res,
-          lineHeight: lineHeight,
-          image: Internal.loadImage(env, img_filename, isPixel),
-        })
-    })
-    ret
-  }
-  let getChar = (fnt, ch) => {
-    let code = Char.code(ch)
-    try IntMap.find(code, fnt.chars) catch {
-    | _ => failwith("Could not find character " ++ (string_of_int(code) ++ " in font."))
-    }
-  }
-  let drawChar = (env: glEnv, fnt, image, ch: char, last: option<char>, x, y) => {
-    let c = getChar(fnt, ch)
-    let kernAmount = switch last {
-    | Some(lastCh) =>
-      let first = Char.code(lastCh)
-      let second = Char.code(ch)
-      try IntPairMap.find((first, second), fnt.kerning) catch {
-      | _ => 0.
-      }
-    | None => 0.
-    }
-    switch image {
-    | Some(img) =>
-      Internal.drawImageWithMatrixf(
-        img,
-        ~x=x +. (c.xoffset +. kernAmount) /. fnt.res,
-        ~y=y +. c.yoffset /. fnt.res,
-        ~width=c.width /. fnt.res,
-        ~height=c.height /. fnt.res,
-        ~subx=int_of_float(c.x),
-        ~suby=int_of_float(c.y),
-        ~subw=int_of_float(c.width),
-        ~subh=int_of_float(c.height),
-        env,
-      )
-      (c.xadvance +. kernAmount) /. fnt.res
-    | None => (c.xadvance +. kernAmount) /. fnt.res
-    }
-  }
-  let drawString = (env: glEnv, fnt, str: string, x, y) => {
-    let fnt = switch fnt {
-    | None => defaultFont
-    | Some(fnt) => fnt
-    }
-    switch fnt.contents {
-    | None => ()
-    | Some(fnt) =>
-      switch fnt.image.glData {
-      | Some(img) =>
-        let xOffset = ref(x)
-        let yOffset = ref(y)
-        let lastChar = ref(None)
-        String.iter(c =>
-          switch c {
-          | '\r' =>
-            xOffset := x
-            lastChar := None
-          | '\n' =>
-            xOffset := x
-            yOffset := yOffset.contents +. fnt.lineHeight
-            lastChar := None
-          | c =>
-            let advance = drawChar(
-              env,
-              fnt,
-              Some(img),
-              c,
-              lastChar.contents,
-              xOffset.contents,
-              yOffset.contents,
-            )
-            xOffset := xOffset.contents +. advance
-            lastChar := Some(c)
-          }
-        , str)
-      | None => print_endline("loading font.")
-      }
-    }
-  }
-  let calcStringWidth = (env, fnt, str: string) => {
-    let fnt = switch fnt {
-    | None => defaultFont
-    | Some(fnt) => fnt
-    }
-    switch fnt.contents {
-    | None => 0.
-    | Some(fnt) =>
-      let offset = ref(0.)
-      let maxOffset = ref(0.)
-      let lastChar = ref(None)
-      String.iter(c =>
-        switch c {
-        | '\r' | '\n' =>
-          maxOffset := max(maxOffset.contents, offset.contents)
-          offset := 0.
-          lastChar := None
-        | c =>
-          offset :=
-            offset.contents +. drawChar(env, fnt, None, c, lastChar.contents, offset.contents, 0.)
-          lastChar := Some(c)
-        }
-      , str)
-      max(maxOffset.contents, offset.contents)
-    }
-  }
-  let loadDefaultFont = env => {
-    let data = switch Reprocessing_DefaultFont.read("font.fnt") {
-    | None => failwith("Failed to load default font. This shouldn't happen.")
-    | Some(data) => data
-    }
-    let imageData = switch Reprocessing_DefaultFont.read("font.png") {
-    | None => failwith("Failed to load default font image. This shouldn't happen")
-    | Some(data) => data
-    }
-    let (char_map, kern_map, _, res, lineHeight) = getCharMapAndKernMap(data)
-    defaultFont :=
-      Some({
-        chars: char_map,
-        kerning: kern_map,
-        res: res,
-        lineHeight: lineHeight,
-        image: Internal.loadImageFromMemory(env, imageData, false),
-      })
-  }
-}
-
-type fontT = ref<option<Font.internalType>>
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Internal.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Internal.res
deleted file mode 100644
index 663bdbc..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Internal.res
+++ /dev/null
@@ -1,1032 +0,0 @@
-open Reprocessing_Common
-
-open Reasongl
-
-module Matrix = Reprocessing_Matrix
-
-let getProgram = (
-  ~context,
-  ~vertexShader as vertexShaderSource: string,
-  ~fragmentShader as fragmentShaderSource: string,
-): option<Gl.programT> => {
-  let vertexShader = Gl.createShader(~context, RGLConstants.vertex_shader)
-  Gl.shaderSource(~context, ~shader=vertexShader, ~source=vertexShaderSource)
-  Gl.compileShader(~context, vertexShader)
-  let compiledCorrectly =
-    Gl.getShaderParameter(~context, ~shader=vertexShader, ~paramName=Gl.Compile_status) == 1
-  if compiledCorrectly {
-    let fragmentShader = Gl.createShader(~context, RGLConstants.fragment_shader)
-    Gl.shaderSource(~context, ~shader=fragmentShader, ~source=fragmentShaderSource)
-    Gl.compileShader(~context, fragmentShader)
-    let compiledCorrectly =
-      Gl.getShaderParameter(~context, ~shader=fragmentShader, ~paramName=Gl.Compile_status) == 1
-    if compiledCorrectly {
-      let program = Gl.createProgram(~context)
-      Gl.attachShader(~context, ~program, ~shader=vertexShader)
-      Gl.deleteShader(~context, vertexShader)
-      Gl.attachShader(~context, ~program, ~shader=fragmentShader)
-      Gl.deleteShader(~context, fragmentShader)
-      Gl.linkProgram(~context, program)
-      let linkedCorrectly =
-        Gl.getProgramParameter(~context, ~program, ~paramName=Gl.Link_status) == 1
-      if linkedCorrectly {
-        Some(program)
-      } else {
-        \"@@"(print_endline, "Linking error: " ++ Gl.getProgramInfoLog(~context, program))
-        None
-      }
-    } else {
-      \"@@"(
-        print_endline,
-        "Fragment shader error: " ++ Gl.getShaderInfoLog(~context, fragmentShader),
-      )
-      None
-    }
-  } else {
-    \"@@"(print_endline, "Vertex shader error: " ++ Gl.getShaderInfoLog(~context, vertexShader))
-    None
-  }
-}
-
-let createCanvas = (window, height: int, width: int): glEnv => {
-  Gl.Window.setWindowSize(~window, ~width, ~height)
-  let context = Gl.Window.getContext(window)
-  Gl.viewport(~context, ~x=-1, ~y=-1, ~width, ~height)
-  Gl.clearColor(~context, ~r=0., ~g=0., ~b=0., ~a=1.)
-  Gl.clear(~context, ~mask=lor(RGLConstants.color_buffer_bit, RGLConstants.depth_buffer_bit))
-
-  /* ** Camera is a simple record containing one matrix used to project a point in 3D onto the screen. * */
-  let camera = {projectionMatrix: Gl.Mat4.create()}
-  let vertexBuffer = Gl.createBuffer(~context)
-  let elementBuffer = Gl.createBuffer(~context)
-  let program = switch getProgram(
-    ~context,
-    ~vertexShader=Reprocessing_Shaders.vertexShaderSource,
-    ~fragmentShader=Reprocessing_Shaders.fragmentShaderSource,
-  ) {
-  | None => failwith("Could not create the program and/or the shaders. Aborting.")
-  | Some(program) => program
-  }
-  Gl.useProgram(~context, program)
-
-  /* ** Get the attribs ahead of time to be used inside the render function * */
-  let aVertexPosition = Gl.getAttribLocation(~context, ~program, ~name="aVertexPosition")
-  Gl.enableVertexAttribArray(~context, ~attribute=aVertexPosition)
-  let aVertexColor = Gl.getAttribLocation(~context, ~program, ~name="aVertexColor")
-  Gl.enableVertexAttribArray(~context, ~attribute=aVertexColor)
-  let pMatrixUniform = Gl.getUniformLocation(~context, ~program, ~name="uPMatrix")
-  Gl.uniformMatrix4fv(~context, ~location=pMatrixUniform, ~value=camera.projectionMatrix)
-
-  /* ** Get attribute and uniform locations for later usage in the draw code. * */
-  let aTextureCoord = Gl.getAttribLocation(~context, ~program, ~name="aTextureCoord")
-  Gl.enableVertexAttribArray(~context, ~attribute=aTextureCoord)
-
-  /* ** Generate texture buffer that we'll use to pass image data around. * */
-  let texture = Gl.createTexture(~context)
-
-  /* ** This tells OpenGL that we're going to be using texture0. OpenGL imposes a limit on the number of
-       texture we can manipulate at the same time. That limit depends on the device. We don't care as we'll just
-       always use texture0. **/
-  Gl.activeTexture(~context, RGLConstants.texture0)
-
-  /* ** Bind `texture` to `texture_2d` to modify it's magnification and minification params. * */
-  Gl.bindTexture(~context, ~target=RGLConstants.texture_2d, ~texture)
-  let uSampler = Gl.getUniformLocation(~context, ~program, ~name="uSampler")
-
-  /* ** Load a dummy texture. This is because we're using the same shader for things with and without a texture */
-  Gl.texImage2D_RGBA(
-    ~context,
-    ~target=RGLConstants.texture_2d,
-    ~level=0,
-    ~width=1,
-    ~height=1,
-    ~border=0,
-    ~data=Gl.Bigarray.of_array(Gl.Bigarray.Uint8, [255, 255, 255, 255]),
-  )
-  Gl.texParameteri(
-    ~context,
-    ~target=RGLConstants.texture_2d,
-    ~pname=RGLConstants.texture_mag_filter,
-    ~param=RGLConstants.linear,
-  )
-  Gl.texParameteri(
-    ~context,
-    ~target=RGLConstants.texture_2d,
-    ~pname=RGLConstants.texture_min_filter,
-    ~param=RGLConstants.linear_mipmap_nearest,
-  )
-
-  /* ** Enable blend and tell OpenGL how to blend. */
-  Gl.enable(~context, RGLConstants.blend)
-  Gl.blendFunc(~context, RGLConstants.src_alpha, RGLConstants.one_minus_src_alpha)
-
-  /* **
-   * Will mutate the projectionMatrix to be an ortho matrix with the given boundaries.
-   * See this link for quick explanation of what this is.
-   * https://shearer12345.github.io/graphics/assets/projectionPerspectiveVSOrthographic.png
-   */
-  Gl.Mat4.ortho(
-    ~out=camera.projectionMatrix,
-    ~left=0.,
-    ~right=float_of_int(width),
-    ~bottom=float_of_int(height),
-    ~top=0.,
-    ~near=0.,
-    ~far=1.,
-  )
-  {
-    camera: camera,
-    window: window,
-    gl: context,
-    batch: {
-      vertexArray: Gl.Bigarray.create(Gl.Bigarray.Float32, circularBufferSize * vertexSize),
-      elementArray: Gl.Bigarray.create(Gl.Bigarray.Uint16, circularBufferSize),
-      vertexPtr: 0,
-      elementPtr: 0,
-      currTex: None,
-      nullTex: texture,
-    },
-    vertexBuffer: vertexBuffer,
-    elementBuffer: elementBuffer,
-    aVertexPosition: aVertexPosition,
-    aTextureCoord: aTextureCoord,
-    aVertexColor: aVertexColor,
-    pMatrixUniform: pMatrixUniform,
-    uSampler: uSampler,
-    keyboard: {
-      keyCode: Reprocessing_Events.Nothing,
-      pressed: Reprocessing_Common.KeySet.empty,
-      released: Reprocessing_Common.KeySet.empty,
-      down: Reprocessing_Common.KeySet.empty,
-    },
-    mouse: {
-      pos: (0, 0),
-      prevPos: (0, 0),
-      pressed: false,
-    },
-    style: {
-      fillColor: Some({r: 0., g: 0., b: 0., a: 1.}),
-      strokeWeight: 3,
-      strokeCap: Round,
-      strokeColor: None,
-      tintColor: None,
-      rectMode: Corner,
-    },
-    styleStack: list{},
-    matrix: Matrix.createIdentity(),
-    matrixStack: list{},
-    frame: {
-      count: 1,
-      rate: 10,
-      deltaTime: 0.001,
-    },
-    size: {
-      height: height,
-      width: width,
-      resizeable: true,
-    },
-  }
-}
-
-let makeLocalBatch = env => {
-  vertexArray: Gl.Bigarray.create(Gl.Bigarray.Float32, circularBufferSize * vertexSize),
-  elementArray: Gl.Bigarray.create(Gl.Bigarray.Uint16, circularBufferSize),
-  vertexPtr: 0,
-  elementPtr: 0,
-  currTex: None,
-  nullTex: env.batch.nullTex,
-}
-
-let drawGeometry = (
-  ~vertexArray: Gl.Bigarray.t<float, Gl.Bigarray.float32_elt>,
-  ~elementArray: Gl.Bigarray.t<int, Gl.Bigarray.int16_unsigned_elt>,
-  ~mode,
-  ~count,
-  ~textureBuffer,
-  env,
-) => {
-  /* Bind `vertexBuffer`, a pointer to chunk of memory to be sent to the GPU to the "register" called
-   `array_buffer` */
-  Gl.bindBuffer(~context=env.gl, ~target=RGLConstants.array_buffer, ~buffer=env.vertexBuffer)
-
-  /* ** Copy all of the data over into whatever's in `array_buffer` (so here it's `vertexBuffer`) * */
-  Gl.bufferData(
-    ~context=env.gl,
-    ~target=RGLConstants.array_buffer,
-    ~data=vertexArray,
-    ~usage=RGLConstants.stream_draw,
-  )
-
-  /* ** Tell the GPU about the shader attribute called `aVertexPosition` so it can access the data per vertex */
-  Gl.vertexAttribPointer(
-    ~context=env.gl,
-    ~attribute=env.aVertexPosition,
-    ~size=2,
-    ~type_=RGLConstants.float_,
-    ~normalize=false,
-    ~stride=vertexSize * 4,
-    ~offset=0,
-  )
-
-  /* ** Same as above but for `aVertexColor` * */
-  Gl.vertexAttribPointer(
-    ~context=env.gl,
-    ~attribute=env.aVertexColor,
-    ~size=4,
-    ~type_=RGLConstants.float_,
-    ~normalize=false,
-    ~stride=vertexSize * 4,
-    ~offset=2 * 4,
-  )
-
-  /* ** Same as above but for `aTextureCoord` * */
-  Gl.vertexAttribPointer(
-    ~context=env.gl,
-    ~attribute=env.aTextureCoord,
-    ~size=2,
-    ~type_=RGLConstants.float_,
-    ~normalize=false,
-    ~stride=vertexSize * 4,
-    ~offset=6 * 4,
-  )
-
-  /* ** Tell OpenGL about what the uniform called `uSampler` is pointing at, here it's given 0 which is what
-   texture0 represent.  * */
-  Gl.uniform1i(~context=env.gl, ~location=env.uSampler, ~value=0)
-
-  /* ** Bind `elementBuffer`, a pointer to GPU memory to `element_array_buffer`. That "register" is used for
-   the data representing the indices of the vertex. * */
-  Gl.bindBuffer(
-    ~context=env.gl,
-    ~target=RGLConstants.element_array_buffer,
-    ~buffer=env.elementBuffer,
-  )
-
-  /* ** Copy the `elementArray` into whatever buffer is in `element_array_buffer` * */
-  Gl.bufferData(
-    ~context=env.gl,
-    ~target=RGLConstants.element_array_buffer,
-    ~data=elementArray,
-    ~usage=RGLConstants.stream_draw,
-  )
-
-  /* ** We bind `texture` to texture_2d, like we did for the vertex buffers in some ways (I think?) * */
-  Gl.bindTexture(~context=env.gl, ~target=RGLConstants.texture_2d, ~texture=textureBuffer)
-
-  /* ** Final call which actually tells the GPU to draw. * */
-  Gl.drawElements(~context=env.gl, ~mode, ~count, ~type_=RGLConstants.unsigned_short, ~offset=0)
-}
-
-/*
- * Helper that will send the currently available data inside globalVertexArray.
- * This function assumes that the vertex data is stored as simple triangles.
- *
- * That function creates a new big array with a new size given the offset and len but does NOT copy the
- * underlying array of memory. So mutation done to that sub array will be reflected in the original one.
- */
-let flushGlobalBatch = env =>
-  if env.batch.elementPtr > 0 {
-    let textureBuffer = switch env.batch.currTex {
-    | None => env.batch.nullTex
-    | Some(textureBuffer) => textureBuffer
-    }
-    drawGeometry(
-      ~vertexArray=Gl.Bigarray.sub(env.batch.vertexArray, ~offset=0, ~len=env.batch.vertexPtr),
-      ~elementArray=Gl.Bigarray.sub(env.batch.elementArray, ~offset=0, ~len=env.batch.elementPtr),
-      ~mode=RGLConstants.triangles,
-      ~count=env.batch.elementPtr,
-      ~textureBuffer,
-      env,
-    )
-    env.batch.currTex = None
-    env.batch.vertexPtr = 0
-    env.batch.elementPtr = 0
-  }
-
-let maybeFlushBatch = (~texture, ~el, ~vert, env) =>
-  if (
-    env.batch.elementPtr + el >= circularBufferSize ||
-      (env.batch.vertexPtr + vert >= circularBufferSize ||
-      env.batch.elementPtr > 0 && env.batch.currTex !== texture)
-  ) {
-    flushGlobalBatch(env)
-  }
-
-/*
- * This array packs all of the values that the shaders need: vertices, colors and texture coordinates.
- * We put them all in one as an optimization, so there are less back and forths between us and the GPU.
- *
- * The vertex array looks like:
- *
- * |<--------  8 * 4 bytes  ------->|
- *  --------------------------------
- * |  x  y  |  r  g  b  a  |  s  t  |  x2  y2  |  r2  g2  b2  a2  |  s2  t2  | ....
- *  --------------------------------
- * |           |              |
- * +- offset: 0 bytes, stride: 8 * 4 bytes (because we need to move by 8*4 bytes to get to the next x)
- *             |              |
- *             +- offset: 3 * 4 bytes, stride: 8 * 4 bytes
- *                            |
- *                            +- offset: (3 + 4) * 4 bytes, stride: 8 * 4 bytes
- *
- *
- * The element array is just an array of indices of vertices given that each vertex takes 8 * 4 bytes.
- * For example, if the element array looks like [|0, 1, 2, 1, 2, 3|], we're telling the GPU to draw 2
- * triangles: one with the vertices 0, 1 and 2 from the vertex array, and one with the vertices 1, 2 and 3.
- * We can "point" to duplicated vertices in our geometry to avoid sending those vertices.
- */
-let addRectToGlobalBatch = (
-  env,
-  ~bottomRight as (x1, y1),
-  ~bottomLeft as (x2, y2),
-  ~topRight as (x3, y3),
-  ~topLeft as (x4, y4),
-  ~color as {r, g, b, a},
-) => {
-  maybeFlushBatch(~texture=None, ~el=6, ~vert=32, env)
-  let set = Gl.Bigarray.set
-  let i = env.batch.vertexPtr
-  let vertexArrayToMutate = env.batch.vertexArray
-  set(vertexArrayToMutate, i + 0, x1)
-  set(vertexArrayToMutate, i + 1, y1)
-  set(vertexArrayToMutate, i + 2, r)
-  set(vertexArrayToMutate, i + 3, g)
-  set(vertexArrayToMutate, i + 4, b)
-  set(vertexArrayToMutate, i + 5, a)
-  set(vertexArrayToMutate, i + 6, 0.0)
-  set(vertexArrayToMutate, i + 7, 0.0)
-  set(vertexArrayToMutate, i + 8, x2)
-  set(vertexArrayToMutate, i + 9, y2)
-  set(vertexArrayToMutate, i + 10, r)
-  set(vertexArrayToMutate, i + 11, g)
-  set(vertexArrayToMutate, i + 12, b)
-  set(vertexArrayToMutate, i + 13, a)
-  set(vertexArrayToMutate, i + 14, 0.0)
-  set(vertexArrayToMutate, i + 15, 0.0)
-  set(vertexArrayToMutate, i + 16, x3)
-  set(vertexArrayToMutate, i + 17, y3)
-  set(vertexArrayToMutate, i + 18, r)
-  set(vertexArrayToMutate, i + 19, g)
-  set(vertexArrayToMutate, i + 20, b)
-  set(vertexArrayToMutate, i + 21, a)
-  set(vertexArrayToMutate, i + 22, 0.0)
-  set(vertexArrayToMutate, i + 23, 0.0)
-  set(vertexArrayToMutate, i + 24, x4)
-  set(vertexArrayToMutate, i + 25, y4)
-  set(vertexArrayToMutate, i + 26, r)
-  set(vertexArrayToMutate, i + 27, g)
-  set(vertexArrayToMutate, i + 28, b)
-  set(vertexArrayToMutate, i + 29, a)
-  set(vertexArrayToMutate, i + 30, 0.0)
-  set(vertexArrayToMutate, i + 31, 0.0)
-  let ii = i / vertexSize
-  let j = env.batch.elementPtr
-  let elementArrayToMutate = env.batch.elementArray
-  set(elementArrayToMutate, j + 0, ii)
-  set(elementArrayToMutate, j + 1, ii + 1)
-  set(elementArrayToMutate, j + 2, ii + 2)
-  set(elementArrayToMutate, j + 3, ii + 1)
-  set(elementArrayToMutate, j + 4, ii + 2)
-  set(elementArrayToMutate, j + 5, ii + 3)
-  env.batch.vertexPtr = i + 4 * vertexSize
-  env.batch.elementPtr = j + 6
-}
-
-let drawTriangle = (env, (x1, y1), (x2, y2), (x3, y3), ~color as {r, g, b, a}) => {
-  maybeFlushBatch(~texture=None, ~vert=3, ~el=24, env)
-  let set = Gl.Bigarray.set
-  let i = env.batch.vertexPtr
-  let vertexArrayToMutate = env.batch.vertexArray
-  set(vertexArrayToMutate, i + 0, x1)
-  set(vertexArrayToMutate, i + 1, y1)
-  set(vertexArrayToMutate, i + 2, r)
-  set(vertexArrayToMutate, i + 3, g)
-  set(vertexArrayToMutate, i + 4, b)
-  set(vertexArrayToMutate, i + 5, a)
-  set(vertexArrayToMutate, i + 6, 0.0)
-  set(vertexArrayToMutate, i + 7, 0.0)
-  set(vertexArrayToMutate, i + 8, x2)
-  set(vertexArrayToMutate, i + 9, y2)
-  set(vertexArrayToMutate, i + 10, r)
-  set(vertexArrayToMutate, i + 11, g)
-  set(vertexArrayToMutate, i + 12, b)
-  set(vertexArrayToMutate, i + 13, a)
-  set(vertexArrayToMutate, i + 14, 0.0)
-  set(vertexArrayToMutate, i + 15, 0.0)
-  set(vertexArrayToMutate, i + 16, x3)
-  set(vertexArrayToMutate, i + 17, y3)
-  set(vertexArrayToMutate, i + 18, r)
-  set(vertexArrayToMutate, i + 19, g)
-  set(vertexArrayToMutate, i + 20, b)
-  set(vertexArrayToMutate, i + 21, a)
-  set(vertexArrayToMutate, i + 22, 0.0)
-  set(vertexArrayToMutate, i + 23, 0.0)
-  let ii = i / vertexSize
-  let j = env.batch.elementPtr
-  let elementArrayToMutate = env.batch.elementArray
-  set(elementArrayToMutate, j + 0, ii)
-  set(elementArrayToMutate, j + 1, ii + 1)
-  set(elementArrayToMutate, j + 2, ii + 2)
-  env.batch.vertexPtr = i + 3 * vertexSize
-  env.batch.elementPtr = j + 3
-}
-
-let drawLineWithMatrix = (
-  ~p1 as (xx1, yy1),
-  ~p2 as (xx2, yy2),
-  ~matrix,
-  ~color,
-  ~width,
-  ~project,
-  env,
-) => {
-  let transform = Matrix.matptmul(matrix)
-  let dx = xx2 -. xx1
-  let dy = yy2 -. yy1
-  let mag = sqrt(dx *. dx +. dy *. dy)
-  let radius = width /. 2.
-  let xthing = dy /. mag *. radius
-  let ything = -.dx /. mag *. radius
-  let (projectx, projecty) = project ? (dx /. mag *. radius, xthing) : (0., 0.)
-  let x1 = xx2 +. xthing +. projectx
-  let y1 = yy2 +. ything +. projecty
-  let x2 = xx1 +. xthing -. projectx
-  let y2 = yy1 +. ything -. projecty
-  let x3 = xx2 -. xthing +. projectx
-  let y3 = yy2 -. ything +. projecty
-  let x4 = xx1 -. xthing -. projectx
-  let y4 = yy1 -. ything -. projecty
-  addRectToGlobalBatch(
-    env,
-    ~bottomRight=transform((x1, y1)),
-    ~bottomLeft=transform((x2, y2)),
-    ~topRight=transform((x3, y3)),
-    ~topLeft=transform((x4, y4)),
-    ~color,
-  )
-}
-
-let drawArc = (
-  env,
-  (xCenterOfCircle: float, yCenterOfCircle: float),
-  radx: float,
-  rady: float,
-  start: float,
-  stop: float,
-  isPie: bool,
-  matrix: array<float>,
-  {r, g, b, a},
-) => {
-  let transform = Matrix.matptmul(matrix)
-  let noOfFans = int_of_float(radx +. rady) / 2 + 10
-  maybeFlushBatch(~texture=None, ~vert=vertexSize * (noOfFans + 3), ~el=3 * noOfFans, env)
-  let (start, stop) = stop < start ? (stop, start) : (start, stop)
-  let pi = 4.0 *. atan(1.0)
-  let anglePerFan = 2. *. pi /. float_of_int(noOfFans)
-  let verticesData = env.batch.vertexArray
-  let elementData = env.batch.elementArray
-  let set = Gl.Bigarray.set
-  let get = Gl.Bigarray.get
-  let vertexArrayOffset = env.batch.vertexPtr
-  let elementArrayOffset = env.batch.elementPtr
-  let start_i = if isPie {
-    /* Start one earlier and force the first point to be the center */
-    int_of_float(start /. anglePerFan) - 3
-  } else {
-    int_of_float(start /. anglePerFan) - 2
-  }
-  let stop_i = int_of_float(stop /. anglePerFan) + 1
-  for i in start_i to stop_i {
-    let (xCoordinate, yCoordinate) = transform(
-      if isPie && i - start_i == 0 {
-        (
-          /* force the first point to be the center */
-          xCenterOfCircle,
-          yCenterOfCircle,
-        )
-      } else {
-        let angle = max(min(anglePerFan *. float_of_int(i + 1), stop), start)
-        (xCenterOfCircle +. cos(angle) *. radx, yCenterOfCircle +. sin(angle) *. rady)
-      },
-    )
-    let ii = (i - start_i) * vertexSize + vertexArrayOffset
-    set(verticesData, ii + 0, xCoordinate)
-    set(verticesData, ii + 1, yCoordinate)
-    set(verticesData, ii + 2, r)
-    set(verticesData, ii + 3, g)
-    set(verticesData, ii + 4, b)
-    set(verticesData, ii + 5, a)
-    set(verticesData, ii + 6, 0.0)
-    set(verticesData, ii + 7, 0.0)
-    /* For the first three vertices, we don't do any deduping. Then for the subsequent ones, we'll actually
-       have 3 elements, one pointing at the first vertex, one pointing at the previously added vertex and one
-       pointing at the current vertex. This mimicks the behavior of triangle_fan. */
-    if i - start_i < 3 {
-      set(elementData, i - start_i + elementArrayOffset, ii / vertexSize)
-    } else {
-      /* We've already added 3 elements, for i = 0, 1 and 2. From now on, we'll add 3 elements _per_ i.
-         To calculate the correct offset in `elementData` we remove 3 from i as if we're starting from 0 (the
-         first time we enter this loop i = 3), then for each i we'll add 3 elements (so multiply by 3) BUT for
-         i = 3 we want `jj` to be 3 so we shift everything by 3 (so add 3). Everything's also shifted by
-         `elementArrayOffset` */
-      let jj = (i - start_i - 3) * 3 + elementArrayOffset + 3
-      set(elementData, jj, vertexArrayOffset / vertexSize)
-      set(elementData, jj + 1, get(elementData, jj - 1))
-      set(elementData, jj + 2, ii / vertexSize)
-    }
-  }
-  env.batch.vertexPtr = env.batch.vertexPtr + (noOfFans + 3) * vertexSize
-  env.batch.elementPtr = env.batch.elementPtr + (stop_i - start_i - 3) * 3 + 3
-}
-
-let drawEllipse = (env, center, radx: float, rady: float, matrix: array<float>, c) =>
-  drawArc(env, center, radx, rady, 0., Reprocessing_Constants.tau, false, matrix, c)
-
-let drawArcStroke = (
-  env,
-  (xCenterOfCircle: float, yCenterOfCircle: float),
-  radx: float,
-  rady: float,
-  start: float,
-  stop: float,
-  isOpen: bool,
-  isPie: bool,
-  matrix: array<float>,
-  {r, g, b, a} as strokeColor,
-  strokeWidth,
-) => {
-  let transform = Matrix.matptmul(matrix)
-  let verticesData = env.batch.vertexArray
-  let elementData = env.batch.elementArray
-  let noOfFans = int_of_float(radx +. rady) / 2 + 10
-  let set = Gl.Bigarray.set
-  maybeFlushBatch(~texture=None, ~vert=noOfFans * 2 * vertexSize, ~el=noOfFans * 6, env)
-  let (start, stop) = stop < start ? (stop, start) : (start, stop)
-  let pi = 4.0 *. atan(1.0)
-  let anglePerFan = 2. *. pi /. float_of_int(noOfFans)
-  /* I calculated this roughly by doing:
-     anglePerFan *. float_of_int (i + 1) == start
-     i+1 == start /. anglePerFan
- */
-  let start_i = int_of_float(start /. anglePerFan) - 2
-  let stop_i = int_of_float(stop /. anglePerFan)
-  let prevEl: ref<option<(int, int)>> = ref(None)
-  let strokeWidth = float_of_int(strokeWidth)
-  let halfStrokeWidth = strokeWidth /. 2.
-  for i in start_i to stop_i {
-    let angle = max(start, min(anglePerFan *. float_of_int(i + 1), stop))
-    let (xCoordinateInner, yCoordinateInner) = transform((
-      xCenterOfCircle +. cos(angle) *. (radx -. halfStrokeWidth),
-      yCenterOfCircle +. sin(angle) *. (rady -. halfStrokeWidth),
-    ))
-    let (xCoordinateOuter, yCoordinateOuter) = transform((
-      xCenterOfCircle +. cos(angle) *. (radx +. halfStrokeWidth),
-      yCenterOfCircle +. sin(angle) *. (rady +. halfStrokeWidth),
-    ))
-    let ii = env.batch.vertexPtr
-    set(verticesData, ii + 0, xCoordinateInner)
-    set(verticesData, ii + 1, yCoordinateInner)
-    set(verticesData, ii + 2, r)
-    set(verticesData, ii + 3, g)
-    set(verticesData, ii + 4, b)
-    set(verticesData, ii + 5, a)
-    set(verticesData, ii + 6, 0.0)
-    set(verticesData, ii + 7, 0.0)
-    let ii = ii + vertexSize
-    set(verticesData, ii + 0, xCoordinateOuter)
-    set(verticesData, ii + 1, yCoordinateOuter)
-    set(verticesData, ii + 2, r)
-    set(verticesData, ii + 3, g)
-    set(verticesData, ii + 4, b)
-    set(verticesData, ii + 5, a)
-    set(verticesData, ii + 6, 0.0)
-    set(verticesData, ii + 7, 0.0)
-    env.batch.vertexPtr = env.batch.vertexPtr + vertexSize * 2
-    let currOuter = ii / vertexSize
-    let currInner = ii / vertexSize - 1
-    let currEl = Some((currInner, currOuter))
-    switch prevEl.contents {
-    | None => prevEl := currEl
-    | Some((prevInner, prevOuter)) =>
-      let elementArrayOffset = env.batch.elementPtr
-      set(elementData, elementArrayOffset, prevInner)
-      set(elementData, elementArrayOffset + 1, prevOuter)
-      set(elementData, elementArrayOffset + 2, currOuter)
-      set(elementData, elementArrayOffset + 3, currOuter)
-      set(elementData, elementArrayOffset + 4, prevInner)
-      set(elementData, elementArrayOffset + 5, currInner)
-      env.batch.elementPtr = env.batch.elementPtr + 6
-      prevEl := currEl
-    }
-  }
-  if !isOpen {
-    let startPt = (xCenterOfCircle +. cos(start) *. radx, yCenterOfCircle +. sin(start) *. rady)
-    let stopPt = (xCenterOfCircle +. cos(stop) *. radx, yCenterOfCircle +. sin(stop) *. rady)
-    let centerOfCircle = (xCenterOfCircle, yCenterOfCircle)
-    if isPie {
-      drawLineWithMatrix(
-        ~p1=startPt,
-        ~p2=centerOfCircle,
-        ~matrix,
-        ~color=strokeColor,
-        ~width=strokeWidth,
-        ~project=false,
-        env,
-      )
-      drawLineWithMatrix(
-        ~p1=stopPt,
-        ~p2=centerOfCircle,
-        ~matrix,
-        ~color=strokeColor,
-        ~width=strokeWidth,
-        ~project=false,
-        env,
-      )
-      drawEllipse(env, centerOfCircle, halfStrokeWidth, halfStrokeWidth, matrix, strokeColor)
-    } else {
-      drawLineWithMatrix(
-        ~p1=startPt,
-        ~p2=stopPt,
-        ~matrix,
-        ~color=strokeColor,
-        ~width=strokeWidth,
-        ~project=false,
-        env,
-      )
-    }
-    drawEllipse(env, startPt, halfStrokeWidth, halfStrokeWidth, matrix, strokeColor)
-    drawEllipse(env, stopPt, halfStrokeWidth, halfStrokeWidth, matrix, strokeColor)
-  }
-}
-
-let loadImage = (env: glEnv, filename, isPixel): imageT => {
-  let imageRef = {glData: None, drawnTo: false}
-  Gl.loadImage(
-    ~filename,
-    ~loadOption=LoadRGBA,
-    ~callback=imageData =>
-      switch imageData {
-      | None =>
-        failwith("Could not load image '" ++ (filename ++ "'.")) /* TODO: handle this better? */
-      | Some(img) =>
-        let context = env.gl
-        let texture = Gl.createTexture(~context)
-        let height = Gl.getImageHeight(img)
-        let width = Gl.getImageWidth(img)
-        let filter = isPixel ? Constants.nearest : Constants.linear
-        imageRef.glData = Some({texture: texture, height: height, width: width, framebuffer: None})
-        Gl.bindTexture(~context, ~target=Constants.texture_2d, ~texture)
-        Gl.texImage2DWithImage(~context, ~target=Constants.texture_2d, ~level=0, ~image=img)
-        Gl.texParameteri(
-          ~context,
-          ~target=Constants.texture_2d,
-          ~pname=Constants.texture_mag_filter,
-          ~param=filter,
-        )
-        Gl.texParameteri(
-          ~context,
-          ~target=Constants.texture_2d,
-          ~pname=Constants.texture_min_filter,
-          ~param=filter,
-        )
-        Gl.texParameteri(
-          ~context,
-          ~target=Constants.texture_2d,
-          ~pname=Constants.texture_wrap_s,
-          ~param=Constants.clamp_to_edge,
-        )
-        Gl.texParameteri(
-          ~context,
-          ~target=Constants.texture_2d,
-          ~pname=Constants.texture_wrap_t,
-          ~param=Constants.clamp_to_edge,
-        )
-      },
-    (),
-  )
-  imageRef
-}
-
-let loadImageFromMemory = (env: glEnv, data, isPixel): imageT => {
-  let imageRef = {glData: None, drawnTo: false}
-  Gl.loadImageFromMemory(
-    ~data,
-    ~loadOption=LoadRGBA,
-    ~callback=imageData =>
-      switch imageData {
-      | None => failwith("Could not load image") /* TODO: handle this better? */
-      | Some(img) =>
-        let env = env
-        let texture = Gl.createTexture(~context=env.gl)
-        let height = Gl.getImageHeight(img)
-        let width = Gl.getImageWidth(img)
-        let filter = isPixel ? Constants.nearest : Constants.linear
-        imageRef.glData = Some({texture: texture, height: height, width: width, framebuffer: None})
-        Gl.bindTexture(~context=env.gl, ~target=Constants.texture_2d, ~texture)
-        Gl.texImage2DWithImage(~context=env.gl, ~target=Constants.texture_2d, ~level=0, ~image=img)
-        Gl.texParameteri(
-          ~context=env.gl,
-          ~target=Constants.texture_2d,
-          ~pname=Constants.texture_mag_filter,
-          ~param=filter,
-        )
-        Gl.texParameteri(
-          ~context=env.gl,
-          ~target=Constants.texture_2d,
-          ~pname=Constants.texture_min_filter,
-          ~param=filter,
-        )
-        Gl.texParameteri(
-          ~context=env.gl,
-          ~target=Constants.texture_2d,
-          ~pname=Constants.texture_wrap_s,
-          ~param=Constants.clamp_to_edge,
-        )
-        Gl.texParameteri(
-          ~context=env.gl,
-          ~target=Constants.texture_2d,
-          ~pname=Constants.texture_wrap_t,
-          ~param=Constants.clamp_to_edge,
-        )
-      },
-    (),
-  )
-  imageRef
-}
-
-let drawImage = (
-  {width: imgw, height: imgh, texture},
-  ~p1 as (x1, y1),
-  ~p2 as (x2, y2),
-  ~p3 as (x3, y3),
-  ~p4 as (x4, y4),
-  ~subx,
-  ~suby,
-  ~subw,
-  ~subh,
-  env,
-) => {
-  let {r, g, b, a} = switch env.style.tintColor {
-  | Some(c) => c
-  | None => {r: 1., g: 1., b: 1., a: 1.}
-  }
-  maybeFlushBatch(~texture=Some(texture), ~vert=32, ~el=6, env)
-  let (fsubx, fsuby, fsubw, fsubh) = (
-    float_of_int(subx) /. float_of_int(imgw),
-    float_of_int(suby) /. float_of_int(imgh),
-    float_of_int(subw) /. float_of_int(imgw),
-    float_of_int(subh) /. float_of_int(imgh),
-  )
-  let set = Gl.Bigarray.set
-  let ii = env.batch.vertexPtr
-  let vertexArray = env.batch.vertexArray
-  set(vertexArray, ii + 0, x1)
-  set(vertexArray, ii + 1, y1)
-  set(vertexArray, ii + 2, r)
-  set(vertexArray, ii + 3, g)
-  set(vertexArray, ii + 4, b)
-  set(vertexArray, ii + 5, a)
-  set(vertexArray, ii + 6, fsubx +. fsubw)
-  set(vertexArray, ii + 7, fsuby +. fsubh)
-  set(vertexArray, ii + 8, x2)
-  set(vertexArray, ii + 9, y2)
-  set(vertexArray, ii + 10, r)
-  set(vertexArray, ii + 11, g)
-  set(vertexArray, ii + 12, b)
-  set(vertexArray, ii + 13, a)
-  set(vertexArray, ii + 14, fsubx)
-  set(vertexArray, ii + 15, fsuby +. fsubh)
-  set(vertexArray, ii + 16, x3)
-  set(vertexArray, ii + 17, y3)
-  set(vertexArray, ii + 18, r)
-  set(vertexArray, ii + 19, g)
-  set(vertexArray, ii + 20, b)
-  set(vertexArray, ii + 21, a)
-  set(vertexArray, ii + 22, fsubx +. fsubw)
-  set(vertexArray, ii + 23, fsuby)
-  set(vertexArray, ii + 24, x4)
-  set(vertexArray, ii + 25, y4)
-  set(vertexArray, ii + 26, r)
-  set(vertexArray, ii + 27, g)
-  set(vertexArray, ii + 28, b)
-  set(vertexArray, ii + 29, a)
-  set(vertexArray, ii + 30, fsubx)
-  set(vertexArray, ii + 31, fsuby)
-  let jj = env.batch.elementPtr
-  let elementArray = env.batch.elementArray
-  set(elementArray, jj, ii / vertexSize)
-  set(elementArray, jj + 1, ii / vertexSize + 1)
-  set(elementArray, jj + 2, ii / vertexSize + 2)
-  set(elementArray, jj + 3, ii / vertexSize + 1)
-  set(elementArray, jj + 4, ii / vertexSize + 2)
-  set(elementArray, jj + 5, ii / vertexSize + 3)
-  env.batch.vertexPtr = ii + 4 * vertexSize
-  env.batch.elementPtr = jj + 6
-  env.batch.currTex = Some(texture)
-}
-
-let drawImageWithMatrixf = (image, ~x, ~y, ~width, ~height, ~subx, ~suby, ~subw, ~subh, env) => {
-  let transform = Matrix.matptmul(env.matrix)
-  let p1 = transform((x +. width, y +. height))
-  let p2 = transform((x, y +. height))
-  let p3 = transform((x +. width, y))
-  let p4 = transform((x, y))
-  drawImage(image, ~p1, ~p2, ~p3, ~p4, ~subx, ~suby, ~subw, ~subh, env)
-}
-
-let drawImageWithMatrix = (image, ~x, ~y, ~width, ~height, ~subx, ~suby, ~subw, ~subh, env) =>
-  drawImageWithMatrixf(
-    image,
-    ~x=float_of_int(x),
-    ~y=float_of_int(y),
-    ~width=float_of_int(width),
-    ~height=float_of_int(height),
-    ~subx,
-    ~suby,
-    ~subw,
-    ~subh,
-    env,
-  )
-
-/* ** Recomputes matrices while resetting size of window */
-let resetSize = (env, width, height) => {
-  env.size.width = width
-  env.size.height = height
-  let (pixelWidth, pixelHeight) = {
-    open Gl.Window
-    (getPixelWidth(env.window), getPixelHeight(env.window))
-  }
-  Gl.viewport(~context=env.gl, ~x=0, ~y=0, ~width=pixelWidth, ~height=pixelHeight)
-  Gl.clearColor(~context=env.gl, ~r=0., ~g=0., ~b=0., ~a=1.)
-  Gl.Mat4.ortho(
-    ~out=env.camera.projectionMatrix,
-    ~left=0.,
-    ~right=float_of_int(width),
-    ~bottom=float_of_int(height),
-    ~top=0.,
-    ~near=0.,
-    ~far=1.,
-  )
-
-  /* ** Tell OpenGL about what the uniform called `pMatrixUniform` is, here it's the projectionMatrix. * */
-  Gl.uniformMatrix4fv(
-    ~context=env.gl,
-    ~location=env.pMatrixUniform,
-    ~value=env.camera.projectionMatrix,
-  )
-}
-
-let createImage = (width, height, env) => {
-  let context = env.gl
-  let texture = Gl.createTexture(~context)
-  let isPixel = true
-  let filter = isPixel ? Constants.nearest : Constants.linear
-  Gl.bindTexture(~context, ~target=Constants.texture_2d, ~texture)
-  Gl.texImage2D_null(~context, ~target=Constants.texture_2d, ~level=0, ~width, ~height)
-  Gl.texParameteri(
-    ~context,
-    ~target=Constants.texture_2d,
-    ~pname=Constants.texture_mag_filter,
-    ~param=filter,
-  )
-  Gl.texParameteri(
-    ~context,
-    ~target=Constants.texture_2d,
-    ~pname=Constants.texture_min_filter,
-    ~param=filter,
-  )
-  Gl.texParameteri(
-    ~context,
-    ~target=Constants.texture_2d,
-    ~pname=Constants.texture_wrap_s,
-    ~param=Constants.clamp_to_edge,
-  )
-  Gl.texParameteri(
-    ~context,
-    ~target=Constants.texture_2d,
-    ~pname=Constants.texture_wrap_t,
-    ~param=Constants.clamp_to_edge,
-  )
-  let framebuffer = Gl.createFramebuffer(~context)
-  Gl.bindFramebuffer(~context, ~target=Constants.framebuffer, ~framebuffer)
-
-  /* ** Enable blend and tell OpenGL how to blend. */
-  /* Gl.enable(~context, Constants.blend); */
-  /* Gl.blendFunc(~context, Constants.src_alpha, Constants.one_minus_src_alpha); */
-  Gl.framebufferTexture2D(
-    ~context,
-    ~target=Constants.framebuffer,
-    ~attachment=Constants.color_attachment0,
-    ~texTarget=Constants.texture_2d,
-    ~texture,
-  )
-  Gl.bindDefaultFramebuffer(~context, ~target=Constants.framebuffer)
-  {
-    glData: Some({framebuffer: Some(framebuffer), texture: texture, width: width, height: height}),
-    drawnTo: false,
-  }
-}
-
-let drawOnImage = (image, env, cb) =>
-  switch image.glData {
-  | None => ()
-  | Some(glData) =>
-    let context = env.gl
-    /* Create the framebuffer on the fly if it wasn't created (when you start drawing to an image
-         you loaded from a file for example).
- */
-    let framebuffer = switch glData.framebuffer {
-    | None =>
-      Gl.bindTexture(~context, ~target=Constants.texture_2d, ~texture=glData.texture)
-      let framebuffer = Gl.createFramebuffer(~context)
-      Gl.bindFramebuffer(~context, ~target=Constants.framebuffer, ~framebuffer)
-      Gl.framebufferTexture2D(
-        ~context,
-        ~target=Constants.framebuffer,
-        ~attachment=Constants.color_attachment0,
-        ~texTarget=Constants.texture_2d,
-        ~texture=glData.texture,
-      )
-      framebuffer
-    | Some(framebuffer) => framebuffer
-    }
-    Gl.bindFramebuffer(~context, ~target=Constants.framebuffer, ~framebuffer)
-    /* Create a new env that we pass to the callback */
-    let newEnv = {
-      ...env,
-      batch: makeLocalBatch(env),
-      camera: {
-        projectionMatrix: Gl.Mat4.create(),
-      },
-      style: {
-        ...env.style,
-        strokeWeight: env.style.strokeWeight /* we need this because ocaml doesn't support record spread without any value added */,
-      },
-      matrix: Matrix.createIdentity(),
-      matrixStack: List.map(m => {
-        let mm = Matrix.createIdentity()
-        Matrix.copyInto(~src=m, ~dst=mm)
-        mm
-      }, env.matrixStack),
-      styleStack: List.map(s => {...s, strokeWeight: s.strokeWeight}, env.styleStack),
-      size: {
-        ...env.size,
-        width: glData.width,
-        height: glData.height,
-      },
-    }
-    Matrix.copyInto(~src=env.matrix, ~dst=newEnv.matrix)
-    /* Set the size of the viewport.
-         This may be wrong on retina screens... I'm not 100% sure.
-
-         Also calculate a new ortho matrix and send it to the GPU immediately.
-
-                      Ben - March 25th 2018
- */
-    Gl.viewport(~context, ~x=0, ~y=0, ~width=glData.width, ~height=glData.height)
-    Gl.Mat4.ortho(
-      ~out=newEnv.camera.projectionMatrix,
-      ~left=0.,
-      ~right=float_of_int(glData.width),
-      ~bottom=0.,
-      ~top=float_of_int(glData.height),
-      ~near=0.,
-      ~far=1.,
-    )
-    Gl.uniformMatrix4fv(
-      ~context=newEnv.gl,
-      ~location=newEnv.pMatrixUniform,
-      ~value=newEnv.camera.projectionMatrix,
-    )
-    Gl.clearColor(~context, ~r=0., ~g=0., ~b=0., ~a=0.)
-    cb(newEnv)
-    flushGlobalBatch(newEnv)
-    image.drawnTo = true
-    Gl.clearColor(~context, ~r=0., ~g=0., ~b=0., ~a=1.)
-    /* Reset everything back to normal */
-    Gl.bindDefaultFramebuffer(~context, ~target=Constants.framebuffer)
-    let (pixelWidth, pixelHeight) = {
-      open Gl.Window
-      (getPixelWidth(env.window), getPixelHeight(env.window))
-    }
-    Gl.viewport(~context, ~x=0, ~y=0, ~width=pixelWidth, ~height=pixelHeight)
-    Gl.uniformMatrix4fv(~context, ~location=env.pMatrixUniform, ~value=env.camera.projectionMatrix)
-  }
-
-let clearImage = (image, env) => {
-  image.drawnTo = false
-  switch image.glData {
-  | None => ()
-  | Some(glData) =>
-    switch glData.framebuffer {
-    | None => ()
-    | Some(framebuffer) =>
-      Gl.bindFramebuffer(~context=env.gl, ~target=Constants.framebuffer, ~framebuffer)
-      Reasongl.Gl.clear(
-        ~context=env.gl,
-        ~mask=lor(Constants.color_buffer_bit, Constants.depth_buffer_bit),
-      )
-      Gl.bindDefaultFramebuffer(~context=env.gl, ~target=Constants.framebuffer)
-    }
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Matrix.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Matrix.res
deleted file mode 100644
index d82b06b..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Matrix.res
+++ /dev/null
@@ -1,105 +0,0 @@
-let identity = [1., 0., 0., 0., 1., 0., 0., 0., 1.]
-
-let createIdentity = () => [1., 0., 0., 0., 1., 0., 0., 0., 1.]
-
-let createTranslation = (dx, dy) => [1., 0., dx, 0., 1., dy, 0., 0., 1.]
-
-let createRotation = theta => [cos(theta), -.sin(theta), 0., sin(theta), cos(theta), 0., 0., 0., 1.]
-
-let createScaling = (sx, sy) => [sx, 0., 0., 0., sy, 0., 0., 0., 1.]
-
-let createShearing = (sx, sy) => [1., sx, 0., sy, 1., 0., 0., 0., 1.]
-
-let copyInto = (~src, ~dst) => {
-  dst[0] = src[0]
-  dst[1] = src[1]
-  dst[2] = src[2]
-  dst[3] = src[3]
-  dst[4] = src[4]
-  dst[5] = src[5]
-  dst[6] = src[6]
-  dst[7] = src[7]
-  dst[8] = src[8]
-}
-
-/* **
- [0 1 2]   [a b c]   [a0 + d1 + g2, b0 + e1 + h2, c0 + f1 + i2]
- [3 4 5] * [d e f] = [a3 + d4 + g5, b3 + e4 + h5, c3 + f4 + i5]
- [6 7 8]   [g h i]   [a6 + d7 + g8, b6 + e7 + h8, c6 + f7 + i8]
- */
-let matmatmul = (mat1: array<float>, mat2: array<float>) =>
-  switch (mat1, mat2) {
-  | ([m0, m1, m2, m3, m4, m5, m6, m7, m8], [ma, mb, mc, md, me, mf, mg, mh, mi]) =>
-    mat1[0] = ma *. m0 +. md *. m1 +. mg *. m2
-    mat1[1] = mb *. m0 +. me *. m1 +. mh *. m2
-    mat1[2] = mc *. m0 +. mf *. m1 +. mi *. m2
-    mat1[3] = ma *. m3 +. md *. m4 +. mg *. m5
-    mat1[4] = mb *. m3 +. me *. m4 +. mh *. m5
-    mat1[5] = mc *. m3 +. mf *. m4 +. mi *. m5
-    mat1[6] = ma *. m6 +. md *. m7 +. mg *. m8
-    mat1[7] = mb *. m6 +. me *. m7 +. mh *. m8
-    mat1[8] = mc *. m6 +. mf *. m7 +. mi *. m8
-  | _ => assert(false)
-  }
-
-/* **
- [0 1 2]   [a]   [a0 + b1 + c2]
- [3 4 5] * [b] = [a3 + b4 + c5]
- [6 7 8]   [c]   [a6 + b7 + c8]
- */
-let matvecmul = (m, v) => {
-  let a = v[0]
-  let b = v[1]
-  let c = v[2]
-  v[0] = a *. m[0] +. b *. m[1] +. c *. m[2]
-  v[1] = a *. m[3] +. b *. m[4] +. c *. m[5]
-  v[2] = a *. m[6] +. b *. m[7] +. c *. m[8]
-}
-
-/* **
- [0 1 2]   [x]   [x0 + y1 + 2]
- [3 4 5] * [y] = [x3 + y4 + 5]
- [6 7 8]   [1]   [ who cares ]
- */
-let matptmul = (m, (x, y)) => (x *. m[0] +. y *. m[1] +. m[2], x *. m[3] +. y *. m[4] +. m[5])
-
-/* **
- Invert a matrix
- https://www.geometrictools.com/Documentation/LaplaceExpansionTheorem.pdf
- */
-let matinv = mat =>
-  switch mat {
-  | [m00, m01, m02, m10, m11, m12, m20, m21, m22] =>
-    let det =
-      m00 *. m11 *. m22 +.
-      m01 *. m12 *. m20 +.
-      m02 *. m10 *. m21 -.
-      m00 *. m12 *. m21 -.
-      m01 *. m10 *. m22 -.
-      m02 *. m11 *. m20
-    if det == 0. {
-      invalid_arg("The current transform matrix cannot be inverted")
-    }
-    let invdet = 1. /. det
-    let adj00 = m11 *. m22 -. m12 *. m21
-    let adj01 = -.(m01 *. m22 -. m02 *. m21)
-    let adj02 = m01 *. m12 -. m02 *. m11
-    let adj10 = -.(m10 *. m22 -. m12 *. m20)
-    let adj11 = m00 *. m22 -. m02 *. m20
-    let adj12 = -.(m00 *. m12 -. m02 *. m10)
-    let adj20 = m10 *. m21 -. m11 *. m20
-    let adj21 = -.(m00 *. m21 -. m01 *. m20)
-    let adj22 = m00 *. m11 -. m01 *. m10
-    [
-      invdet *. adj00,
-      invdet *. adj01,
-      invdet *. adj02,
-      invdet *. adj10,
-      invdet *. adj11,
-      invdet *. adj12,
-      invdet *. adj20,
-      invdet *. adj21,
-      invdet *. adj22,
-    ]
-  | _ => assert(false)
-  }
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Shaders.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Shaders.res
deleted file mode 100644
index 87b208b..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Shaders.res
+++ /dev/null
@@ -1,27 +0,0 @@
-let vertexShaderSource = `
-  attribute vec2 aVertexPosition;
-  attribute vec4 aVertexColor;
-  attribute vec2 aTextureCoord;
-
-  uniform mat4 uPMatrix;
-
-  varying vec4 vColor;
-  varying vec2 vTextureCoord;
-
-  void main(void) {
-    gl_Position = uPMatrix * vec4(aVertexPosition, 0.0, 1.0);
-    vColor = aVertexColor;
-    vTextureCoord = aTextureCoord;
-  }
-`
-
-let fragmentShaderSource = `
-  varying vec4 vColor;
-  varying vec2 vTextureCoord;
-
-  uniform sampler2D uSampler;
-
-  void main(void) {
-    gl_FragColor = texture2D(uSampler, vTextureCoord) * vColor;
-  }
-`
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Types.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Types.res
deleted file mode 100644
index 666acb2..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Types.res
+++ /dev/null
@@ -1,19 +0,0 @@
-module type TypesT = {
-  type glEnvT = Reprocessing_Common.glEnv
-  type colorT = Reprocessing_Common.colorT
-  type imageT = Reprocessing_Common.imageT
-  type fontT = Reprocessing_Font.fontT
-  type strokeCapT = Reprocessing_Common.strokeCapT
-  type rectModeT = Reprocessing_Common.rectModeT
-  type soundT = Reprocessing_Common.soundT
-}
-
-module Types: TypesT = {
-  type glEnvT = Reprocessing_Common.glEnv
-  type colorT = Reprocessing_Common.colorT
-  type imageT = Reprocessing_Common.imageT
-  type fontT = Reprocessing_Font.fontT
-  type strokeCapT = Reprocessing_Common.strokeCapT
-  type rectModeT = Reprocessing_Common.rectModeT
-  type soundT = Reprocessing_Common.soundT
-}
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Utils.res b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Utils.res
deleted file mode 100644
index f1392f2..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Utils.res
+++ /dev/null
@@ -1,211 +0,0 @@
-open Reprocessing_Common
-
-let foi = float_of_int
-
-let lookup_table: ref<array<int>> = ref([])
-
-/* Calculation Functions */
-let round = i => floor(i +. 0.5)
-
-let sq = x => x * x
-
-let rec pow = (~base, ~exp) =>
-  switch exp {
-  | 0 => 1
-  | 1 => base
-  | n =>
-    let b = pow(~base, ~exp=n / 2)
-    b *
-    b * if mod(n, 2) == 0 {
-      1
-    } else {
-      base
-    }
-  }
-
-let constrain = (~amt, ~low, ~high) => max(min(amt, high), low)
-
-let remapf = (~value, ~low1, ~high1, ~low2, ~high2) =>
-  low2 +. (high2 -. low2) *. ((value -. low1) /. (high1 -. low1))
-
-let remap = (~value, ~low1, ~high1, ~low2, ~high2) =>
-  int_of_float(
-    remapf(
-      ~value=foi(value),
-      ~low1=foi(low1),
-      ~high1=foi(high1),
-      ~low2=foi(low2),
-      ~high2=foi(high2),
-    ),
-  )
-
-let norm = (~value, ~low, ~high) => remapf(~value, ~low1=low, ~high1=high, ~low2=0., ~high2=1.)
-
-let randomf = (~min, ~max) => Random.float(max -. min) +. min
-
-let random = (~min, ~max) => Random.int(max - min) + min
-
-let randomSeed = seed => Random.init(seed)
-
-let randomGaussian = () => {
-  let u1 = ref(0.0)
-  let u2 = ref(0.0)
-  while u1.contents <= min_float {
-    u1 := Random.float(1.0)
-    u2 := Random.float(1.0)
-  }
-  sqrt(-2.0 *. log(u1.contents)) *. cos(Reprocessing_Constants.two_pi *. u2.contents)
-}
-
-let lerpf = (~low, ~high) => remapf(~low1=0., ~high1=1., ~low2=low, ~high2=high)
-
-let lerp = (~low, ~high, ~value) => int_of_float(lerpf(~low=foi(low), ~high=foi(high), ~value))
-
-let distf = (~p1 as (x1: float, y1: float), ~p2 as (x2: float, y2: float)) => {
-  let dx = x2 -. x1
-  let dy = y2 -. y1
-  sqrt(dx *. dx +. dy *. dy)
-}
-
-let dist = (~p1 as (x1, y1), ~p2 as (x2, y2)) =>
-  distf(~p1=(foi(x1), foi(y1)), ~p2=(foi(x2), foi(y2)))
-
-let magf = vec => distf(~p1=(0., 0.), ~p2=vec)
-
-let mag = vec => dist(~p1=(0, 0), ~p2=vec)
-
-let lerpColor = (~low, ~high, ~value) => {
-  r: lerpf(~low=low.r, ~high=high.r, ~value),
-  g: lerpf(~low=low.g, ~high=high.g, ~value),
-  b: lerpf(~low=low.b, ~high=high.b, ~value),
-  a: lerpf(~low=low.a, ~high=high.a, ~value),
-}
-
-let degrees = x => 180.0 /. Reprocessing_Constants.pi *. x
-
-let radians = x => Reprocessing_Constants.pi /. 180.0 *. x
-
-let noise = (x, y, z) => {
-  let p = lookup_table.contents
-  let fade = t => t *. t *. t *. (t *. (t *. 6.0 -. 15.0) +. 10.0)
-  let grad = (hash, x, y, z) =>
-    switch land(hash, 15) {
-    | 0 => x +. y
-    | 1 => -.x +. y
-    | 2 => x -. y
-    | 3 => -.x -. y
-    | 4 => x +. z
-    | 5 => -.x +. z
-    | 6 => x -. z
-    | 7 => -.x -. z
-    | 8 => y +. z
-    | 9 => -.y +. z
-    | 10 => y -. z
-    | 11 => -.y -. z
-    | 12 => y +. x
-    | 13 => -.y +. z
-    | 14 => y -. x
-    | 15 => -.y -. z
-    | _ => 0.0
-    }
-  let xi = land(int_of_float(x), 255)
-  let yi = land(int_of_float(y), 255)
-  let zi = land(int_of_float(z), 255)
-  let xf = x -. floor(x)
-  let yf = y -. floor(y)
-  let zf = z -. floor(z)
-  let u = fade(xf)
-  let v = fade(yf)
-  let w = fade(zf)
-  let aaa = p[p[p[xi] + yi] + zi]
-  let aba = p[p[p[xi] + (yi + 1)] + zi]
-  let aab = p[p[p[xi] + yi] + (zi + 1)]
-  let abb = p[p[p[xi] + (yi + 1)] + (zi + 1)]
-  let baa = p[p[p[xi + 1] + yi] + zi]
-  let bba = p[p[p[xi + 1] + (yi + 1)] + zi]
-  let bab = p[p[p[xi + 1] + yi] + (zi + 1)]
-  let bbb = p[p[p[xi + 1] + (yi + 1)] + (zi + 1)]
-  let x1 = lerpf(~low=grad(aaa, xf, yf, zf), ~high=grad(baa, xf -. 1.0, yf, zf), ~value=u)
-  let x2 = lerpf(
-    ~low=grad(aba, xf, yf -. 1.0, zf),
-    ~high=grad(bba, xf -. 1.0, yf -. 1.0, zf),
-    ~value=u,
-  )
-  let y1 = lerpf(~low=x1, ~high=x2, ~value=v)
-  let x1 = lerpf(
-    ~low=grad(aab, xf, yf, zf -. 1.0),
-    ~high=grad(bab, xf -. 1.0, yf, zf -. 1.0),
-    ~value=u,
-  )
-  let x2 = lerpf(
-    ~low=grad(abb, xf, yf -. 1.0, zf -. 1.0),
-    ~high=grad(bbb, xf -. 1.0, yf -. 1.0, zf -. 1.0),
-    ~value=u,
-  )
-  let y2 = lerpf(~low=x1, ~high=x2, ~value=v)
-  (lerpf(~low=y1, ~high=y2, ~value=w) +. 1.0) /. 2.0
-}
-
-let shuffle = array => {
-  let array = Array.copy(array)
-  let length = Array.length(array)
-  for i in 0 to 256 - 1 {
-    let j = Random.int(length - i)
-    let tmp = array[i]
-    array[i] = array[i + j]
-    array[i + j] = tmp
-  }
-  array
-}
-
-let noiseSeed = seed => {
-  let state = Random.get_state()
-  Random.init(seed)
-  let array = Array.make(256, 0)
-  let array = Array.mapi((i, _) => i, array)
-  let array = shuffle(array)
-  let double_array = Array.append(array, array)
-  lookup_table := double_array
-  Random.set_state(state)
-}
-
-let split = Reprocessing_Common.split
-
-let color = (~r, ~g, ~b, ~a): colorT => {
-  r: foi(r) /. 255.,
-  g: foi(g) /. 255.,
-  b: foi(b) /. 255.,
-  a: foi(a) /. 255.,
-}
-
-let colorf = (~r, ~g, ~b, ~a): colorT => {r: r, g: g, b: b, a: a}
-
-let intersectRectCircle = (
-  ~rectPos as (rx, ry),
-  ~rectW,
-  ~rectH,
-  ~circlePos as (cx, cy),
-  ~circleRad,
-) => {
-  let halfW = rectW /. 2.
-  let halfH = rectH /. 2.
-  let cdistX = abs_float(cx -. (rx +. halfW))
-  let cdistY = abs_float(cy -. (ry +. halfH))
-  if cdistX > halfW +. circleRad || cdistY > halfH +. circleRad {
-    false
-  } else if cdistX <= halfW || cdistY <= halfH {
-    true
-  } else {
-    let cornerDistSq = (cdistX -. halfW) ** 2. +. (cdistY -. halfH) ** 2.
-    cornerDistSq <= circleRad ** 2.
-  }
-}
-
-let intersectRectRect = (
-  ~rect1Pos as (rx1, ry1),
-  ~rect1W,
-  ~rect1H,
-  ~rect2Pos as (rx2, ry2),
-  ~rect2W,
-  ~rect2H,
-) => !(rx2 > rx1 +. rect1W || (rx2 +. rect2W < rx1 || (ry2 > ry1 +. rect1H || ry2 +. rect2H < ry1)))
diff --git a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Utils.resi b/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Utils.resi
deleted file mode 100644
index 804dbfb..0000000
--- a/jscomp/syntax/tests/idempotency/reprocessing/Reprocessing_Utils.resi
+++ /dev/null
@@ -1,221 +0,0 @@
-/* ** Creates colors for storing in variables of the color datatype.
- *
- * Components should be in the range 0 to 255 (or 0x00 to 0xFF).
- */
-let color: (~r: int, ~g: int, ~b: int, ~a: int) => Reprocessing_Types.Types.colorT
-
-/* ** Creates colors for storing in variables of the color datatype.
- *
- * Components should be in the range 0.0 to 1.0.
- */
-let colorf: (~r: float, ~g: float, ~b: float, ~a: float) => Reprocessing_Types.Types.colorT
-
-/* ** Calculates the integer closest to the input. For example,
- * `round 133.8` returns the value 134.
- */
-let round: float => float
-
-/* ** Squares a number (multiplies a number by itself). The result is always a
- * positive number, as multiplying two negative numbers always yields a
- * positive result.
- */
-let sq: int => int
-
-/* ** Facilitates exponential expressions. The pow() function is an efficient
- * way of multiplying numbers by themselves (or their reciprocals) in large
- * quantities.
- */
-let pow: (~base: int, ~exp: int) => int
-
-/* ** Constrains a value to not exceed a maximum and minimum value. */
-let constrain: (~amt: 'a, ~low: 'a, ~high: 'a) => 'a
-
-/* ** Re-maps a number from one range to another.
- * i.e. `remapf value::5. start1::0. stop1::10. start2::10. stop2::20.`
- * would give 15.
- * Useful for scaling values.
- */
-let remapf: (~value: float, ~low1: float, ~high1: float, ~low2: float, ~high2: float) => float
-
-/* ** Re-maps a number from one range to another.
- * i.e. `remapf value::5. start1::0. stop1::10. start2::10. stop2::20.`
- * would give 15.
- * Useful for scaling values.
- *
- * This is the same as `remapf`, but converts all its integer arguments to floats
- * as a convenience.
- */
-let remap: (~value: int, ~low1: int, ~high1: int, ~low2: int, ~high2: int) => int
-
-/* ** Normalizes a number from another range into a value between 0 and 1.
- * Identical to `remap ::value ::low ::high 0. 1.`
- */
-let norm: (~value: float, ~low: float, ~high: float) => float
-
-/* ** Generates random numbers. Each time the `randomf` function is called, it
- * returns an unexpected value within the specified range. The top number is
- * not included.
- */
-let randomf: (~min: float, ~max: float) => float
-
-/* ** Generates random numbers. Each time the `random` function is called, it
- * returns an unexpected value within the specified range. The top number is
- * not included.
- *
- * This is the same as `randomf`, but converts all its integer arguments to floats
- * as a convenience.
- */
-let random: (~min: int, ~max: int) => int
-
-/* ** Sets the seed value for `random` and `randomf`. By default, `random`
- * produces different results each time the program is run. Set the
- * seed parameter to a constant to return the same pseudo-random
- * numbers each time the software is run.
- * This is equivalent to setting Random.init in ocaml/reason.
- */
-let randomSeed: int => unit
-
-/* ** Returns a float from a random series of numbers having a mean of 0 and
- * standard deviation of 1. Each time the `randomGaussian` function is called,
- * it returns a number fitting a Gaussian, or normal, distribution. There is
- * theoretically no minimum or maximum value that `randomGaussian might
- * return. Rather, there is just a very low probability that values far from
- * the mean will be returned; and a higher probability that numbers near the
- * mean will be returned.
- */
-let randomGaussian: unit => float
-
-/* ** Calculates a number between two numbers at a specific increment. The
- * amt parameter is the amount to interpolate between the two values where 0.0
- * equal to the `low` point, 0.1 is very near the `low` point, 0.5 is half-way
- * in between, etc. The lerp function is convenient for creating motion along a
- * straight path and for drawing dotted lines.
- */
-let lerpf: (~low: float, ~high: float, ~value: float) => float
-
-/* ** Calculates a number between two numbers at a specific increment. The
- * amt parameter is the amount to interpolate between the two values where 0.0
- * equal to the `low` point, 0.1 is very near the `low` point, 0.5 is half-way
- * in between, etc. The lerp function is convenient for creating motion along a
- * straight path and for drawing dotted lines.
- *
- * This is the same as `lerpf`, but converts all its integer arguments to floats
- * as a convenience.
- */
-let lerp: (~low: int, ~high: int, ~value: float) => int
-
-let lerpColor: (
-  ~low: Reprocessing_Types.Types.colorT,
-  ~high: Reprocessing_Types.Types.colorT,
-  ~value: float,
-) => Reprocessing_Types.Types.colorT
-
-/* ** Calculates the distance between two points. */
-let distf: (~p1: (float, float), ~p2: (float, float)) => float
-
-/* ** Calculates the distance between two points.
- *
- * This is the same as `distf`, but converts all its integer arguments to floats
- * as a convenience.
- */
-let dist: (~p1: (int, int), ~p2: (int, int)) => float
-
-/* ** Calculates the magnitude (or length) of a vector. A vector is a direction
- * in space commonly used in computer graphics and linear algebra. Because it
- * has no "start" position, the magnitude of a vector can be thought of as the
- * distance from the coordinate 0,0 to its x,y value. Therefore, `mag` is a
- * shortcut for writing `dist (0, 0) (x, y)`.
- */
-let magf: ((float, float)) => float
-
-/* ** Calculates the magnitude (or length) of a vector. A vector is a direction
- * in space commonly used in computer graphics and linear algebra. Because it
- * has no "start" position, the magnitude of a vector can be thought of as the
- * distance from the coordinate 0,0 to its x,y value. Therefore, `mag` is a
- * shortcut for writing `dist (0, 0) (x, y)`.
- *
- * This is the same as `magf`, but converts all its integer arguments to floats
- * as a convenience.
- */
-let mag: ((int, int)) => float
-
-/* ** Converts a radian measurement to its corresponding value in degrees.
- * Radians and degrees are two ways of measuring the same thing. There are 360
- * degrees in a circle and 2*PI radians in a circle. For example, 90° = PI/2 =
- * 1.5707964. All trigonometric functions require their parameters to be
- * specified in radians.
- */
-let degrees: float => float
-
-/* ** Converts a degree measurement to its corresponding value in radians.
- * Radians and degrees are two ways of measuring the same thing. There are 360
- * degrees in a circle and 2*PI radians in a circle. For example, 90° = PI/2 =
- * 1.5707964. All trigonometric functions require their parameters to be
- * specified in radians.
- */
-let radians: float => float
-
-/* ** Returns the Perlin noise value at specified coordinates. Perlin noise is a
- * random sequence generator producing a more natural, harmonic succession of
- * numbers than that of the standard random() function. It was developed by Ken
- * Perlin in the 1980s and has been used in graphical applications to generate
- * procedural textures, shapes, terrains, and other seemingly organic forms.
- *
- * In contrast to the random() function, Perlin noise is defined in an infinite
- * n-dimensional space, in which each pair of coordinates corresponds to a
- * fixed semi-random value (fixed only for the lifespan of the program). The
- * resulting value will always be between 0.0 and 1.0. The noise value can be
- * animated by moving through the noise space.
- *
- * The actual noise structure is similar to that of an audio signal, in respect
- * to the function's use of frequencies. Similar to the concept of harmonics in
- * physics, Perlin noise is computed over several octaves which are added together
- * for the final result.
- *
- * Another way to adjust the character of the resulting sequence is the scale of
- * the input coordinates. As the function works within an infinite space, the
- * value of the coordinates doesn't matter as such; only the distance between
- * successive coordinates is important (such as when using noise() within a loop).
- * As a general rule, the smaller the difference between coordinates, the smoother the resulting noise sequence. Steps of 0.005-0.03 work best for most applications, but this will differ depending on use.
- */
-let noise: (float, float, float) => float
-
-/* ** Sets the seed value for `noise`.  This will also affect the
- * seed value for `random` and `randomf`.
- */
-let noiseSeed: int => unit
-
-/* ** The `split` function breaks a string into pieces using a character
- * as the delimiter. The sep parameter specifies the character
- * that mark the boundaries between each piece. A list is returned
- * that contains each of the pieces.
- */
-let split: (string, ~sep: char) => list<string>
-
-/* ** Determines if there is an intersection between a rectangle and a circle.
- * rectPos refers to the top left of the rect and circlePos to the center of
- * the circle. rectW and rectH are the width and height of the rectangle and
- * circleRad is the radius of the circle.
- * Returns true if the two shapes overlap.
- */
-let intersectRectCircle: (
-  ~rectPos: (float, float),
-  ~rectW: float,
-  ~rectH: float,
-  ~circlePos: (float, float),
-  ~circleRad: float,
-) => bool
-
-/* ** Determines if there is an intersection between two axis-aligned rectangles.
- * rect1Pos and rect2Pos refer to the top left of the rectangles.
- * rectW and rectH are the width and height of the rectangle.
- * Returns true if the two shapes overlap.
- */
-let intersectRectRect: (
-  ~rect1Pos: (float, float),
-  ~rect1W: float,
-  ~rect1H: float,
-  ~rect2Pos: (float, float),
-  ~rect2W: float,
-  ~rect2H: float,
-) => bool
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp.res b/jscomp/syntax/tests/idempotency/warp/Warp.res
deleted file mode 100644
index c6f1e01..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp.res
+++ /dev/null
@@ -1,164 +0,0 @@
-module Client = Warp_Client
-module Header = Warp_Header
-module Method = Warp_Method
-module QueryString = Warp_QueryString
-module FormData = Warp_FormData
-module ResponseType = Warp_ResponseType
-module Types = Warp_Types
-module Event = Warp_Event
-module Settings = Warp_Settings
-
-let send:
-  type a. Types.Client.t<Types.ResponseType.payload<a>> => option<unit => unit> =
-  client => {
-    let xhr = Warp_XHR.make()
-
-    let url = switch client.queryString {
-    | Some(queryString) => client.url ++ ("?" ++ queryString)
-    | None => client.url
-    }
-
-    let method_ = switch client.method {
-    | OPTIONS => "OPTIONS"
-    | GET => "GET"
-    | HEAD => "HEAD"
-    | POST => "POST"
-    | PUT => "PUT"
-    | DELETE => "DELETE"
-    | TRACE => "TRACE"
-    | CONNECT => "CONNECT"
-    }
-
-    switch (client.username, client.password) {
-    | (Some(user), Some(password)) =>
-      xhr->Warp_XHR.open_(~url, ~method=method_, ~async=client.async, ~user, ~password, ())
-    | _ => xhr->Warp_XHR.open_(~url, ~method=method_, ~async=client.async, ())
-    }
-
-    let _ = xhr->Warp_XHR.setWithCredentials(client.withCredentials)
-    let _ = xhr->Warp_XHR.setTimeout(client.timeout)
-    switch client.overrideMimeType {
-    | Some(mimeType) => xhr->Warp_XHR.overrideMimeType(mimeType)
-    | None => ()
-    }
-
-    Belt.List.forEach(client.headers, ((key, value)) => xhr->Warp_XHR.setRequestHeader(key, value))
-
-    switch client.responseType {
-    | Types.ResponseType.TextResponse(_) => xhr->Warp_XHR.setResponseType(#text)->ignore
-    | Types.ResponseType.ArrayBufferResponse(_) =>
-      xhr->Warp_XHR.setResponseType(#arrayBuffer)->ignore
-    | Types.ResponseType.JSONResponse(_) => xhr->Warp_XHR.setResponseType(#json)->ignore
-    | Types.ResponseType.DocumentResponse(_) => xhr->Warp_XHR.setResponseType(#document)->ignore
-    }
-
-    switch client.onProgess {
-    | Some(onProgress) => xhr->Warp_XHR.onProgress(evt => onProgress(evt))
-    | None => ()
-    }
-
-    switch client.onAbort {
-    | Some(onAbort) => xhr->Warp_XHR.onAbort(_ => onAbort())
-    | None => ()
-    }
-
-    switch client.onLoad {
-    | Some(onLoad) =>
-      xhr->Warp_XHR.onError(_ => onLoad(Belt.Result.Error(xhr->Warp_XHR.statusText)))
-      xhr->Warp_XHR.onTimeout(_ => onLoad(Belt.Result.Error(xhr->Warp_XHR.statusText)))
-
-      xhr->Warp_XHR.onLoad(_ =>
-        switch client.responseType {
-        | Types.ResponseType.TextResponse(_) =>
-          onLoad(
-            Belt.Result.Ok(
-              Types.ResponseType.TextResponse(xhr->Warp_XHR.responseText->Js.Nullable.toOption),
-            ),
-          )
-        | Types.ResponseType.JSONResponse(_) =>
-          onLoad(
-            Belt.Result.Ok(
-              Types.ResponseType.JSONResponse(xhr->Warp_XHR.responseJson->Js.Nullable.toOption),
-            ),
-          )
-        | Types.ResponseType.DocumentResponse(_) =>
-          onLoad(
-            Belt.Result.Ok(
-              Types.ResponseType.DocumentResponse(
-                xhr->Warp_XHR.responseDocument->Js.Nullable.toOption,
-              ),
-            ),
-          )
-        | Types.ResponseType.ArrayBufferResponse(_) =>
-          onLoad(
-            Belt.Result.Ok(
-              Types.ResponseType.ArrayBufferResponse(
-                xhr->Warp_XHR.responseArrayBuffer->Js.Nullable.toOption,
-              ),
-            ),
-          )
-        }
-      )
-    | None => ()
-    }
-
-    switch client.onLoadWithStatusCode {
-    | Some(onLoad) =>
-      xhr->Warp_XHR.onError(_ =>
-        onLoad(Belt.Result.Error(xhr->Warp_XHR.statusText), xhr->Warp_XHR.status)
-      )
-      xhr->Warp_XHR.onTimeout(_ =>
-        onLoad(Belt.Result.Error(xhr->Warp_XHR.statusText), xhr->Warp_XHR.status)
-      )
-
-      xhr->Warp_XHR.onLoad(_ =>
-        switch client.responseType {
-        | Types.ResponseType.TextResponse(_) =>
-          onLoad(
-            Belt.Result.Ok(
-              Types.ResponseType.TextResponse(xhr->Warp_XHR.responseText->Js.Nullable.toOption),
-            ),
-            xhr->Warp_XHR.status,
-          )
-        | Types.ResponseType.JSONResponse(_) =>
-          onLoad(
-            Belt.Result.Ok(
-              Types.ResponseType.JSONResponse(xhr->Warp_XHR.responseJson->Js.Nullable.toOption),
-            ),
-            xhr->Warp_XHR.status,
-          )
-        | Types.ResponseType.DocumentResponse(_) =>
-          onLoad(
-            Belt.Result.Ok(
-              Types.ResponseType.DocumentResponse(
-                xhr->Warp_XHR.responseDocument->Js.Nullable.toOption,
-              ),
-            ),
-            xhr->Warp_XHR.status,
-          )
-        | Types.ResponseType.ArrayBufferResponse(_) =>
-          onLoad(
-            Belt.Result.Ok(
-              Types.ResponseType.ArrayBufferResponse(
-                xhr->Warp_XHR.responseArrayBuffer->Js.Nullable.toOption,
-              ),
-            ),
-            xhr->Warp_XHR.status,
-          )
-        }
-      )
-    | None => ()
-    }
-
-    switch (client.method, client.formData) {
-    | (GET, _)
-    | (HEAD, _)
-    | (_, None) =>
-      xhr->Warp_XHR.send
-    | (_, Some(formData)) =>
-      xhr->Warp_XHR.setRequestHeader("content-type", client.requestType)
-      xhr->Warp_XHR.sendString(formData)
-    }
-
-    Some(() => Warp_XHR.abort(xhr))
-  }
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp.resi b/jscomp/syntax/tests/idempotency/warp/Warp.resi
deleted file mode 100644
index 9be6179..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp.resi
+++ /dev/null
@@ -1,11 +0,0 @@
-module Client = Warp_Client
-module Header = Warp_Header
-module Method = Warp_Method
-module QueryString = Warp_QueryString
-module FormData = Warp_FormData
-module ResponseType = Warp_ResponseType
-module Types = Warp_Types
-module Event = Warp_Event
-module Settings = Warp_Settings
-
-let send: Types.Client.t<Types.ResponseType.payload<'a>> => option<unit => unit>
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Client.res b/jscomp/syntax/tests/idempotency/warp/Warp_Client.res
deleted file mode 100644
index bc1539c..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Client.res
+++ /dev/null
@@ -1,21 +0,0 @@
-open Warp_Types_Client
-
-let make = (~url, ~method as method_) => {
-  url: url,
-  method: method_,
-  timeout: 0,
-  async: true,
-  withCredentials: false,
-  username: None,
-  password: None,
-  overrideMimeType: None,
-  queryString: None,
-  responseType: Warp_Types_ResponseType.TextResponse(None),
-  requestType: "application/x-www-form-urlencoded",
-  formData: None,
-  headers: list{},
-  onLoad: None,
-  onLoadWithStatusCode: None,
-  onProgess: None,
-  onAbort: None,
-}
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Client.resi b/jscomp/syntax/tests/idempotency/warp/Warp_Client.resi
deleted file mode 100644
index e6b84e0..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Client.resi
+++ /dev/null
@@ -1,4 +0,0 @@
-let make: (
-  ~url: string,
-  ~method: Warp_Types_Method.t,
-) => Warp_Types_Client.t<Warp_Types_ResponseType.payload<option<string>>>
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Event.res b/jscomp/syntax/tests/idempotency/warp/Warp_Event.res
deleted file mode 100644
index beeef8f..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Event.res
+++ /dev/null
@@ -1,67 +0,0 @@
-open Warp_Types_Client
-
-let onLoad:
-  type a. (
-    Warp_Types_Client.t<Warp_Types_ResponseType.payload<a>>,
-    Belt.Result.t<a, string> => unit,
-  ) => Warp_Types_Client.t<Warp_Types_ResponseType.payload<a>> =
-  (client, callback) => {
-    let eval:
-      type a. Warp_Types_ResponseType.payload<a> => a =
-      x =>
-        switch x {
-        | Warp_Types_ResponseType.ArrayBufferResponse(b) => b
-        | Warp_Types_ResponseType.DocumentResponse(d) => d
-        | Warp_Types_ResponseType.JSONResponse(j) => j
-        | Warp_Types_ResponseType.TextResponse(t) => t
-        }
-
-    {
-      ...client,
-      onLoad: Some(
-        data =>
-          switch data {
-          | Belt.Result.Ok(data) => callback(Ok(eval(data)))
-          | Belt.Result.Error(message) => callback(Error(message))
-          },
-      ),
-    }
-  }
-
-let onLoadWithStatusCode:
-  type a. (
-    Warp_Types_Client.t<Warp_Types_ResponseType.payload<a>>,
-    (Belt.Result.t<a, string>, int) => unit,
-  ) => Warp_Types_Client.t<Warp_Types_ResponseType.payload<a>> =
-  (client, callback) => {
-    let eval:
-      type a. Warp_Types_ResponseType.payload<a> => a =
-      x =>
-        switch x {
-        | Warp_Types_ResponseType.ArrayBufferResponse(b) => b
-        | Warp_Types_ResponseType.DocumentResponse(d) => d
-        | Warp_Types_ResponseType.JSONResponse(j) => j
-        | Warp_Types_ResponseType.TextResponse(t) => t
-        }
-
-    {
-      ...client,
-      onLoadWithStatusCode: Some(
-        (data, statusCode) =>
-          switch data {
-          | Belt.Result.Ok(data) => callback(Ok(eval(data)), statusCode)
-          | Belt.Result.Error(message) => callback(Error(message), statusCode)
-          },
-      ),
-    }
-  }
-
-let onProgress = (client, callback) => {
-  ...client,
-  onProgess: Some(callback),
-}
-
-let onAbort = (client, callback) => {
-  ...client,
-  onAbort: Some(callback),
-}
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Event.resi b/jscomp/syntax/tests/idempotency/warp/Warp_Event.resi
deleted file mode 100644
index 88b501e..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Event.resi
+++ /dev/null
@@ -1,13 +0,0 @@
-let onLoad: (
-  Warp_Types_Client.t<Warp_Types_ResponseType.payload<'a>>,
-  Belt.Result.t<'a, string> => unit,
-) => Warp_Types_Client.t<Warp_Types_ResponseType.payload<'a>>
-
-let onLoadWithStatusCode: (
-  Warp_Types_Client.t<Warp_Types_ResponseType.payload<'a>>,
-  (Belt.Result.t<'a, string>, int) => unit,
-) => Warp_Types_Client.t<Warp_Types_ResponseType.payload<'a>>
-
-let onProgress: (Warp_Types_Client.t<'a>, Dom.progressEvent => unit) => Warp_Types_Client.t<'a>
-
-let onAbort: (Warp_Types_Client.t<'a>, unit => unit) => Warp_Types_Client.t<'a>
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_FormData.res b/jscomp/syntax/tests/idempotency/warp/Warp_FormData.res
deleted file mode 100644
index f923b69..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_FormData.res
+++ /dev/null
@@ -1,44 +0,0 @@
-open Warp_Types_Client
-
-let add = (client, key, value) => {
-  ...client,
-  formData: switch client.formData {
-  | Some(formData) => Some(formData ++ ("&" ++ (key ++ ("=" ++ value))))
-  | None => Some(key ++ ("=" ++ value))
-  },
-  requestType: "application/x-www-form-urlencoded",
-}
-
-let set = (client, formData) => {
-  ...client,
-  formData: Belt.List.map(formData, ((key, value)) => key ++ ("=" ++ value))
-  ->Belt.List.toArray
-  ->Js.Array2.joinWith("&")
-  ->Some,
-  requestType: "application/x-www-form-urlencoded",
-}
-
-let remove = (client, keyToRemove) => {
-  ...client,
-  formData: switch client.formData {
-  | Some(formData) =>
-    formData
-    ->Js.String2.split("&")
-    ->Belt.Array.keep(item =>
-      switch item->Js.String2.split("=") {
-      | [key, _value] => key !== keyToRemove
-      | _ => true
-      }
-    )
-    ->Js.Array2.joinWith("&")
-    ->Some
-  | None => None
-  },
-  requestType: "application/x-www-form-urlencoded",
-}
-
-let setJson = (client, formData) => {
-  ...client,
-  formData: Some(formData),
-  requestType: "application/json",
-}
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_FormData.resi b/jscomp/syntax/tests/idempotency/warp/Warp_FormData.resi
deleted file mode 100644
index cac279d..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_FormData.resi
+++ /dev/null
@@ -1,7 +0,0 @@
-let add: (Warp_Types_Client.t<'a>, string, string) => Warp_Types_Client.t<'a>
-
-let set: (Warp_Types_Client.t<'a>, list<(string, string)>) => Warp_Types_Client.t<'a>
-
-let remove: (Warp_Types_Client.t<'a>, string) => Warp_Types_Client.t<'a>
-
-let setJson: (Warp_Types_Client.t<'a>, string) => Warp_Types_Client.t<'a>
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Header.res b/jscomp/syntax/tests/idempotency/warp/Warp_Header.res
deleted file mode 100644
index b74ad99..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Header.res
+++ /dev/null
@@ -1,19 +0,0 @@
-open Warp_Types_Client
-
-let add = (client, key, value) => {
-  ...client,
-  headers: list{(key, value), ...client.headers},
-}
-
-let set = (client, headers) => {
-  ...client,
-  headers: headers,
-}
-
-let remove = (client, headerToRemove) => {
-  ...client,
-  headers: Belt.List.keep(client.headers, header => {
-    let (key, _value) = header
-    key !== headerToRemove
-  }),
-}
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Header.resi b/jscomp/syntax/tests/idempotency/warp/Warp_Header.resi
deleted file mode 100644
index 4b49ff3..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Header.resi
+++ /dev/null
@@ -1,5 +0,0 @@
-let add: (Warp_Types_Client.t<'a>, string, string) => Warp_Types_Client.t<'a>
-
-let set: (Warp_Types_Client.t<'a>, list<(string, string)>) => Warp_Types_Client.t<'a>
-
-let remove: (Warp_Types_Client.t<'a>, string) => Warp_Types_Client.t<'a>
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Method.res b/jscomp/syntax/tests/idempotency/warp/Warp_Method.res
deleted file mode 100644
index 51bf267..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Method.res
+++ /dev/null
@@ -1,17 +0,0 @@
-open Warp_Types_Method
-
-let options = (url: string) => Warp_Client.make(~url, ~method=OPTIONS)
-
-let get = (url: string) => Warp_Client.make(~url, ~method=GET)
-
-let head = (url: string) => Warp_Client.make(~url, ~method=HEAD)
-
-let post = (url: string) => Warp_Client.make(~url, ~method=POST)
-
-let put = (url: string) => Warp_Client.make(~url, ~method=PUT)
-
-let delete = (url: string) => Warp_Client.make(~url, ~method=DELETE)
-
-let trace = (url: string) => Warp_Client.make(~url, ~method=TRACE)
-
-let connect = (url: string) => Warp_Client.make(~url, ~method=CONNECT)
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Method.resi b/jscomp/syntax/tests/idempotency/warp/Warp_Method.resi
deleted file mode 100644
index 810ec1b..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Method.resi
+++ /dev/null
@@ -1,15 +0,0 @@
-let options: string => Warp_Types_Client.t<Warp_Types_ResponseType.payload<option<string>>>
-
-let get: string => Warp_Types_Client.t<Warp_Types_ResponseType.payload<option<string>>>
-
-let head: string => Warp_Types_Client.t<Warp_Types_ResponseType.payload<option<string>>>
-
-let post: string => Warp_Types_Client.t<Warp_Types_ResponseType.payload<option<string>>>
-
-let put: string => Warp_Types_Client.t<Warp_Types_ResponseType.payload<option<string>>>
-
-let delete: string => Warp_Types_Client.t<Warp_Types_ResponseType.payload<option<string>>>
-
-let trace: string => Warp_Types_Client.t<Warp_Types_ResponseType.payload<option<string>>>
-
-let connect: string => Warp_Types_Client.t<Warp_Types_ResponseType.payload<option<string>>>
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_QueryString.res b/jscomp/syntax/tests/idempotency/warp/Warp_QueryString.res
deleted file mode 100644
index 84a569a..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_QueryString.res
+++ /dev/null
@@ -1,35 +0,0 @@
-open Warp_Types_Client
-
-let add = (client, key, value) => {
-  ...client,
-  queryString: switch client.queryString {
-  | Some(queryString) => Some(queryString ++ ("&" ++ (key ++ ("=" ++ value))))
-  | None => Some(key ++ ("=" ++ value))
-  },
-}
-
-let set = (client, queryString) => {
-  ...client,
-  queryString: Belt.List.map(queryString, ((key, value)) => key ++ ("=" ++ value))
-  ->Belt.List.toArray
-  ->Js.Array2.joinWith("&")
-  ->Some,
-}
-
-let remove = (client, keyToRemove) => {
-  ...client,
-  queryString: switch client.queryString {
-  | Some(queryString) =>
-    queryString
-    ->Js.String2.split("&")
-    ->Belt.Array.keep(item =>
-      switch item->Js.String2.split("=") {
-      | [key, _value] => key !== keyToRemove
-      | _ => true
-      }
-    )
-    ->Js.Array2.joinWith("&")
-    ->Some
-  | None => None
-  },
-}
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_QueryString.resi b/jscomp/syntax/tests/idempotency/warp/Warp_QueryString.resi
deleted file mode 100644
index 4b49ff3..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_QueryString.resi
+++ /dev/null
@@ -1,5 +0,0 @@
-let add: (Warp_Types_Client.t<'a>, string, string) => Warp_Types_Client.t<'a>
-
-let set: (Warp_Types_Client.t<'a>, list<(string, string)>) => Warp_Types_Client.t<'a>
-
-let remove: (Warp_Types_Client.t<'a>, string) => Warp_Types_Client.t<'a>
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_ResponseType.res b/jscomp/syntax/tests/idempotency/warp/Warp_ResponseType.res
deleted file mode 100644
index 2c45a88..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_ResponseType.res
+++ /dev/null
@@ -1,29 +0,0 @@
-open Warp_Types_Client
-
-let setText = client => {
-  ...client,
-  responseType: Warp_Types_ResponseType.TextResponse(None),
-  onLoad: None,
-  onLoadWithStatusCode: None,
-}
-
-let setDocument = client => {
-  ...client,
-  responseType: Warp_Types_ResponseType.DocumentResponse(None),
-  onLoad: None,
-  onLoadWithStatusCode: None,
-}
-
-let setJson = client => {
-  ...client,
-  responseType: Warp_Types_ResponseType.JSONResponse(None),
-  onLoad: None,
-  onLoadWithStatusCode: None,
-}
-
-let setArrayBuffer = client => {
-  ...client,
-  responseType: Warp_Types_ResponseType.ArrayBufferResponse(None),
-  onLoad: None,
-  onLoadWithStatusCode: None,
-}
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_ResponseType.resi b/jscomp/syntax/tests/idempotency/warp/Warp_ResponseType.resi
deleted file mode 100644
index c2bbc88..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_ResponseType.resi
+++ /dev/null
@@ -1,15 +0,0 @@
-let setText: Warp_Types_Client.t<'a> => Warp_Types_Client.t<
-  Warp_Types_ResponseType.payload<option<string>>,
->
-
-let setDocument: Warp_Types_Client.t<'a> => Warp_Types_Client.t<
-  Warp_Types_ResponseType.payload<option<Dom.document>>,
->
-
-let setJson: Warp_Types_Client.t<'a> => Warp_Types_Client.t<
-  Warp_Types_ResponseType.payload<option<Js.Json.t>>,
->
-
-let setArrayBuffer: Warp_Types_Client.t<'a> => Warp_Types_Client.t<
-  Warp_Types_ResponseType.payload<option<Js.Typed_array.ArrayBuffer.t>>,
->
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Settings.res b/jscomp/syntax/tests/idempotency/warp/Warp_Settings.res
deleted file mode 100644
index 0fb5165..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Settings.res
+++ /dev/null
@@ -1,27 +0,0 @@
-open Warp_Types_Client
-
-let withCredentials = (client, withCredentials) => {
-  ...client,
-  withCredentials: withCredentials,
-}
-
-let async = (client, async) => {
-  ...client,
-  async: async,
-}
-
-let timeout = (client, timeout) => {
-  ...client,
-  timeout: timeout,
-}
-
-let auth = (client, username, password) => {
-  ...client,
-  username: Some(username),
-  password: Some(password),
-}
-
-let overrideMimeType = (client, mimeType) => {
-  ...client,
-  overrideMimeType: Some(mimeType),
-}
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Settings.resi b/jscomp/syntax/tests/idempotency/warp/Warp_Settings.resi
deleted file mode 100644
index fea336a..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Settings.resi
+++ /dev/null
@@ -1,9 +0,0 @@
-let withCredentials: (Warp_Types_Client.t<'a>, bool) => Warp_Types_Client.t<'a>
-
-let async: (Warp_Types_Client.t<'a>, bool) => Warp_Types_Client.t<'a>
-
-let timeout: (Warp_Types_Client.t<'a>, int) => Warp_Types_Client.t<'a>
-
-let auth: (Warp_Types_Client.t<'a>, string, string) => Warp_Types_Client.t<'a>
-
-let overrideMimeType: (Warp_Types_Client.t<'a>, string) => Warp_Types_Client.t<'a>
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Types.res b/jscomp/syntax/tests/idempotency/warp/Warp_Types.res
deleted file mode 100644
index d94228d..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Types.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module Client = Warp_Types_Client
-module Method = Warp_Types_Method
-module ResponseType = Warp_Types_ResponseType
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Types.resi b/jscomp/syntax/tests/idempotency/warp/Warp_Types.resi
deleted file mode 100644
index d94228d..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Types.resi
+++ /dev/null
@@ -1,3 +0,0 @@
-module Client = Warp_Types_Client
-module Method = Warp_Types_Method
-module ResponseType = Warp_Types_ResponseType
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Types_Client.res b/jscomp/syntax/tests/idempotency/warp/Warp_Types_Client.res
deleted file mode 100644
index c2a36d1..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Types_Client.res
+++ /dev/null
@@ -1,19 +0,0 @@
-type t<'a> = {
-  url: string,
-  method: Warp_Types_Method.t,
-  timeout: int,
-  async: bool,
-  withCredentials: bool,
-  username: option<string>,
-  password: option<string>,
-  overrideMimeType: option<string>,
-  queryString: option<string>,
-  formData: option<string>,
-  headers: list<(string, string)>,
-  responseType: 'a,
-  requestType: string,
-  onLoad: option<Belt.Result.t<'a, string> => unit>,
-  onLoadWithStatusCode: option<(Belt.Result.t<'a, string>, int) => unit>,
-  onProgess: option<Dom.progressEvent => unit>,
-  onAbort: option<unit => unit>,
-}
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Types_Method.res b/jscomp/syntax/tests/idempotency/warp/Warp_Types_Method.res
deleted file mode 100644
index 916e839..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Types_Method.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type t =
-  | OPTIONS
-  | GET
-  | HEAD
-  | POST
-  | PUT
-  | DELETE
-  | TRACE
-  | CONNECT
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_Types_ResponseType.res b/jscomp/syntax/tests/idempotency/warp/Warp_Types_ResponseType.res
deleted file mode 100644
index a639c93..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_Types_ResponseType.res
+++ /dev/null
@@ -1,7 +0,0 @@
-type rec payload<'a> =
-  | ArrayBufferResponse(option<Js.Typed_array.ArrayBuffer.t>): payload<
-      option<Js.Typed_array.ArrayBuffer.t>,
-    >
-  | DocumentResponse(option<Dom.document>): payload<option<Dom.document>>
-  | JSONResponse(option<Js.Json.t>): payload<option<Js.Json.t>>
-  | TextResponse(option<string>): payload<option<string>>
diff --git a/jscomp/syntax/tests/idempotency/warp/Warp_XHR.res b/jscomp/syntax/tests/idempotency/warp/Warp_XHR.res
deleted file mode 100644
index 2438083..0000000
--- a/jscomp/syntax/tests/idempotency/warp/Warp_XHR.res
+++ /dev/null
@@ -1,186 +0,0 @@
-type t
-
-type readyState =
-  | Unsent
-  | Opened
-  | HeadersReceived
-  | Loading
-  | Done
-  | Unknown
-
-let decodeReadyState = readyState =>
-  switch readyState {
-  | 0 => Unsent
-  | 1 => Opened
-  | 2 => HeadersReceived
-  | 3 => Loading
-  | 4 => Done
-  | _ => Unknown
-  }
-
-@new external make: unit => t = "XMLHttpRequest"
-
-@get external readyStateExternal: t => int = "readyState"
-
-let readyState = (xhr: t) => decodeReadyState(readyStateExternal(xhr))
-
-@get
-external responseArrayBuffer: t => Js.Nullable.t<Js.Typed_array.array_buffer> = "response"
-
-@get
-external responseDocument: t => Js.Nullable.t<Dom.document> = "response"
-
-@get external responseJson: t => Js.Nullable.t<Js.Json.t> = "response"
-
-@get external responseText: t => Js.Nullable.t<string> = "responseText"
-
-@get external responseType: t => string = "responseType"
-
-@get external responseUrl: t => Js.Nullable.t<string> = "responseUrl"
-
-@get
-external responseXml: t => Js.Nullable.t<Dom.xmlDocument> = "responseXml"
-
-@set
-external setResponseType: (
-  t,
-  @string
-  [
-    | @as("arraybuffer") #arrayBuffer
-    | #document
-    | #json
-    | #text
-  ],
-) => string = "responseType"
-
-@get external status: t => int = "status"
-
-@get external statusText: t => string = "statusText"
-
-@get external timeout: t => int = "timeout"
-
-@set external setTimeout: (t, int) => int = "timeout"
-
-@get external withCredentials: t => bool = "withCredentials"
-
-@set external setWithCredentials: (t, bool) => bool = "withCredentials"
-
-@send external abort: t => unit = "abort"
-
-@send
-external getAllResponseHeaders: t => Js.Nullable.t<string> = "getAllResponseHeaders"
-
-@send
-external getResponseHeader: (t, string) => Js.Nullable.t<string> = "getResponseHeader"
-
-@send
-external open_: (
-  t,
-  ~method: string,
-  ~url: string,
-  ~async: bool=?,
-  ~user: string=?,
-  ~password: string=?,
-  unit,
-) => unit = "open"
-
-@send external overrideMimeType: (t, string) => unit = "overrideMimeType"
-
-@send external send: t => unit = "send"
-
-@send
-external sendArrayBuffer: (t, Js.Typed_array.array_buffer) => unit = "send"
-
-@send external sendDocument: (t, Dom.document) => unit = "send"
-
-@send external sendString: (t, string) => unit = "send"
-
-@send
-external setRequestHeader: (t, string, string) => unit = "setRequestHeader"
-
-@set
-external onReadyStateChange: (t, Dom.event => unit) => unit = "onreadystatechange"
-
-@set external onAbort: (t, Dom.progressEvent => unit) => unit = "onabort"
-
-@set external onError: (t, Dom.progressEvent => unit) => unit = "onerror"
-
-@set external onLoad: (t, Dom.progressEvent => unit) => unit = "onload"
-
-@set
-external onLoadEnd: (t, Dom.progressEvent => unit) => unit = "onloadend"
-
-@set
-external onLoadStart: (t, Dom.progressEvent => unit) => unit = "onloadstart"
-
-@set
-external onProgress: (t, Dom.progressEvent => unit) => unit = "onprogress"
-
-@set
-external onTimeout: (t, Dom.progressEvent => unit) => unit = "ontimeout"
-
-@send
-external addEventListener: (
-  t,
-  @string
-  [
-    | #abort(Dom.progressEvent => unit)
-    | #error(Dom.progressEvent => unit)
-    | #load(Dom.progressEvent => unit)
-    | @as("loadend") #loadEnd(Dom.progressEvent => unit)
-    | @as("loadstart") #loadStart(Dom.progressEvent => unit)
-    | #progress(Dom.progressEvent => unit)
-    | @as("readystatechange") #readyStateChange(Dom.event => unit)
-    | #timeout(Dom.progressEvent => unit)
-  ],
-) => unit = "addEventListener"
-
-@send
-external addEventListenerWithOptions: (
-  t,
-  @string
-  [
-    | #abort(Dom.progressEvent => unit)
-    | #error(Dom.progressEvent => unit)
-    | #load(Dom.progressEvent => unit)
-    | @as("loadend") #loadEnd(Dom.progressEvent => unit)
-    | @as("loadstart") #loadStart(Dom.progressEvent => unit)
-    | #progress(Dom.progressEvent => unit)
-    | @as("readystatechange") #readyStateChange(Dom.event => unit)
-    | #timeout(Dom.progressEvent => unit)
-  ],
-  {"capture": bool, "once": bool, "passive": bool},
-) => unit = "addEventListener"
-
-@send
-external removeEventListener: (
-  t,
-  @string
-  [
-    | #abort(Dom.progressEvent => unit)
-    | #error(Dom.progressEvent => unit)
-    | #load(Dom.progressEvent => unit)
-    | @as("loadend") #loadEnd(Dom.progressEvent => unit)
-    | @as("loadstart") #loadStart(Dom.progressEvent => unit)
-    | #progress(Dom.progressEvent => unit)
-    | @as("readystatechange") #readyStateChange(Dom.event => unit)
-    | #timeout(Dom.progressEvent => unit)
-  ],
-) => unit = "removeEventListener"
-
-@send
-external removeEventListenerWithOptions: (
-  t,
-  @string
-  [
-    | #abort(Dom.progressEvent => unit)
-    | #error(Dom.progressEvent => unit)
-    | #load(Dom.progressEvent => unit)
-    | @as("loadend") #loadEnd(Dom.progressEvent => unit)
-    | @as("loadstart") #loadStart(Dom.progressEvent => unit)
-    | #progress(Dom.progressEvent => unit)
-    | @as("readystatechange") #readyStateChange(Dom.event => unit)
-    | #timeout(Dom.progressEvent => unit)
-  ],
-  {"capture": bool, "passive": bool},
-) => unit = "removeEventListener"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/About.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/About.res
deleted file mode 100644
index 573824e..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/About.res
+++ /dev/null
@@ -1,14 +0,0 @@
-open Globals
-
-@react.component
-let make = () =>
-  <Rimble.Box className=Styles.horizantalBlueTile>
-    <p className=Styles.explainerMediumText>
-      <span className=Styles.boldExplainerText> {"Wildcards"->restr} </span>
-      {" is an idea born out of the "->restr}
-      <a href="https://ethcapetown.com/"> {"#ETHCapeTown2019"->restr} </a>
-      {" hackathon which saw team Wildcards as overall "->restr}
-      <a href="https://devpost.com/software/ethcapetown_wildcards"> {"winners"->restr} </a>
-      {". The focus of the project is raising funds for at risk animals."->restr}
-    </p>
-  </Rimble.Box>
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Accounting.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Accounting.res
deleted file mode 100644
index 2a66bf3..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Accounting.res
+++ /dev/null
@@ -1,7 +0,0 @@
-open Belt.Option
-
-let defaultZeroF = maybeFloat => mapWithDefault(maybeFloat, 0., a => a)
-let defaultZeroI = maybeInt => mapWithDefault(maybeInt, -1, a => a)
-let defaultZeroS = maybeString => mapWithDefault(maybeString, "0", a => a)
-
-let dummyTimes2 = (a: int) => a * 2
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Accounting_test.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Accounting_test.res
deleted file mode 100644
index e42e304..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Accounting_test.res
+++ /dev/null
@@ -1,6 +0,0 @@
-open Jest
-
-describe("Expect", () => {
-  open Expect
-  test("toBe", () => expect(Accounting.dummyTimes2(5)) |> toBe(10))
-})
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ActionButtons.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ActionButtons.res
deleted file mode 100644
index 77b1922..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ActionButtons.res
+++ /dev/null
@@ -1,78 +0,0 @@
-module Buy = {
-  @react.component
-  let make = (~chain, ~animal: TokenId.t, ~isExplorer: bool=false) => {
-    let currentPriceWei = QlHooks.usePrice(~chain, animal)
-
-    let goToBuy = RootProvider.useGoToBuy()
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-    let buttonText = switch currentPriceWei {
-    | Price(_price) => "Buy"
-    | Foreclosed(_) => "Adopt"
-    | Loading => "loading"
-    }
-
-    <React.Fragment>
-      <Rimble.Button
-        onClick={_e => {
-          clearAndPush(
-            "#" ++
-            (InputHelp.getPagePrefix(isExplorer) ++
-            ("details/" ++ animal->TokenId.toString)),
-          )
-          goToBuy(animal)
-        }}>
-        {React.string(buttonText)}
-      </Rimble.Button>
-    </React.Fragment>
-  }
-}
-
-module Auction = {
-  @react.component
-  let make = (~animal: TokenId.t, ~isExplorer: bool=false) => {
-    let goToBuy = RootProvider.useGoToBuy()
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-    <React.Fragment>
-      <Rimble.Button
-        onClick={_e => {
-          clearAndPush(
-            "#" ++
-            (InputHelp.getPagePrefix(isExplorer) ++
-            ("details/" ++ animal->TokenId.toString)),
-          )
-          goToBuy(animal)
-        }}>
-        {React.string("Auction")}
-      </Rimble.Button>
-    </React.Fragment>
-  }
-}
-
-module UpdateDeposit = {
-  @react.component
-  let make = () => {
-    // TODO: if the token is foreclosed handle that logic... (say something like -- "add deposit quick! to keep your token")
-    let goToDepositUpdate = RootProvider.useGoToDepositUpdate()
-
-    <React.Fragment>
-      <Rimble.Button onClick={_e => goToDepositUpdate()}> {"Deposit"->React.string} </Rimble.Button>
-    </React.Fragment>
-  }
-}
-module UpdatePrice = {
-  @react.component
-  let make = (~animal: TokenId.t) => {
-    // TODO: if the token is foreclosed handle that logic... (say something like -- "add deposit quick! to keep your token")
-    let goToPriceUpdate = RootProvider.useGoToPriceUpdate()
-
-    <React.Fragment>
-      <Rimble.Box p=1>
-        <Rimble.Button onClick={_e => goToPriceUpdate(animal)}>
-          {"Price"->React.string}
-        </Rimble.Button>
-      </Rimble.Box>
-    </React.Fragment>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Animal.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Animal.res
deleted file mode 100644
index daa6afc..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Animal.res
+++ /dev/null
@@ -1,168 +0,0 @@
-open Globals
-
-let getAnimal: string => option<
-  TokenId.t,
-> = // TODO: add a lookup to the `deprecated_id` field (or just let old links be broken...)
-animal => TokenId.make(animal)
-
-let useAvatar = animal =>
-  \"||||"(
-    QlHooks.useWildcardAvatar(animal)->Option.map(a => CONSTANTS.cdnBase ++ a),
-    "./img/animals/comingsoon.png", // TODO: use the loading gif as default (but with better resolution! As svg?)
-    // |||| "./img/loading.gif";
-  )
-
-// let getAlternateImage: t => array(string) = // TODO: I want to turn this into an array in the future, show a carousel of images instead.
-let useAlternateImage: TokenId.t => option<string> = animal =>
-  QlHooks.useRealImages(animal)
-  ->Option.map(animalImages => animalImages->Array.map(info => info.image))
-  ->Option.flatMap(images => images[0])
-
-let useGetOrgImage: string => string = org =>
-  \"||||"(
-    QlHooks.useLoadOrganisationLogo(org)->Option.map(path => CONSTANTS.cdnBase ++ path),
-    "https://dd2wadt5nc0o7.cloudfront.net/conservations/OGBage.png",
-  )
-
-let useGetOrgBadge: string => string = org =>
-  \"||||"(
-    QlHooks.useLoadOrganisationLogo(org)->Option.map(path => CONSTANTS.cdnBase ++ path),
-    "https://dd2wadt5nc0o7.cloudfront.net/conservations/OGBage.png",
-  )
-
-let useGetOrgBadgeImage = (~tokenId) => {
-  let org = \"||||"(QlHooks.useWildcardOrgId(~tokenId), "")
-  useGetOrgBadge(org)
-}
-
-type launchStatus =
-  | Launched
-  | Loading
-  | LaunchDate(MomentRe.Moment.t)
-
-// TODO: remove this variable...
-let nextLaunchDate = MomentRe.momentUtcDefaultFormat("2020-07-30T17:00:00")
-
-let useIsLaunched: (~chain: Client.context, TokenId.t) => launchStatus = (~chain, animal) => {
-  let optLaunchTime = QlHooks.useLaunchTimeBN(~chain, animal)
-  let currentTime = QlHooks.useCurrentTimestampBn()
-
-  switch animal->TokenId.toInt {
-  | Some(id) if id > 29 =>
-    // LaunchDate(nextLaunchDate)
-    switch optLaunchTime {
-    | Some(launchTime) =>
-      if launchTime->BN.gt(currentTime) {
-        LaunchDate(launchTime->BN.toNumber->MomentRe.momentWithUnix)
-      } else {
-        Launched
-      }
-    | None => Loading
-    }
-  | _ => Launched
-  }
-}
-
-type tokenStatus =
-  | Loading
-  | WaitingForLaunch(MomentRe.Moment.t)
-  | Launched(MomentRe.Moment.t)
-  | Owned(Eth.t) // TODO put the owner and price as a parameter here
-  | Foreclosed(MomentRe.Moment.t)
-
-let useTokenStatus: (~chain: Client.context, TokenId.t) => tokenStatus = (~chain, animal) => {
-  let optLaunchTime = QlHooks.useLaunchTimeBN(~chain, animal)
-  let currentTime = QlHooks.useCurrentTimestampBn()
-  let currentPriceWei = QlHooks.usePrice(~chain, animal)
-
-  switch optLaunchTime {
-  | Some(launchTime) =>
-    if launchTime->BN.gt(currentTime) {
-      WaitingForLaunch(launchTime->BN.toNumber->MomentRe.momentWithUnix)
-    } else {
-      switch currentPriceWei {
-      | Price(price) =>
-        if price->BN.gt(BN.new_("0")) {
-          Owned(price)
-        } else {
-          Launched(launchTime->BN.toNumber->MomentRe.momentWithUnix)
-        }
-      | Foreclosed(foreclosureTime) => Foreclosed(foreclosureTime->Helper.bnToMoment)
-      | Loading => Loading
-      }
-    }
-  | None => Loading
-  }
-}
-
-let useIsOnAuction: (~chain: Client.context, TokenId.t) => bool = (~chain, animal) => {
-  let tokenStatus = useTokenStatus(~chain, animal)
-
-  switch tokenStatus {
-  | Owned(_) => false
-  | Loading
-  | WaitingForLaunch(_)
-  | Launched(_)
-  | Foreclosed(_) => true
-  }
-}
-
-let useAuctionPriceWei = (~chain, animal, launchTime) => {
-  let tokenStatus = useTokenStatus(~chain, animal)
-  let auctionStartPrice = QlHooks.useAuctionStartPrice(~chain, animal)
-  let auctionEndPrice = QlHooks.useAuctionEndPrice(~chain, animal)
-  let auctionLength = QlHooks.useAuctioLength(~chain, animal)
-  let currentTime = QlHooks.useCurrentTime()
-
-  switch (auctionStartPrice, auctionEndPrice, auctionLength) {
-  | (Some(auctionStartPrice), Some(auctionEndPrice), Some(auctionLength)) =>
-    @warning("-4")
-    Some(
-      switch tokenStatus {
-      | Foreclosed(foreclosureTime) =>
-        let auctionStartTime = foreclosureTime->MomentRe.Moment.toUnix->BN.newInt_
-
-        if \"|<|"(BN.new_(currentTime), \"|+|"(auctionStartTime, auctionLength)) {
-          \"|-|"(
-            auctionStartPrice,
-            \"|/|"(
-              \"|*|"(
-                \"|-|"(auctionStartPrice, auctionEndPrice),
-                \"|-|"(BN.new_(currentTime), auctionStartTime),
-              ),
-              auctionLength,
-            ),
-          )
-        } else {
-          auctionEndPrice
-        }
-      | Launched(_) =>
-        if \"|<|"(BN.new_(currentTime), \"|+|"(launchTime, auctionLength)) {
-          \"|-|"(
-            auctionStartPrice,
-            \"|/|"(
-              \"|*|"(
-                \"|-|"(auctionStartPrice, auctionEndPrice),
-                \"|-|"(BN.new_(currentTime), launchTime),
-              ),
-              auctionLength,
-            ),
-          )
-        } else {
-          auctionEndPrice
-        }
-      | _ => auctionEndPrice
-      },
-    )
-  | _ => None
-  }
-}
-
-let getChainIdFromAnimalId = animalId =>
-  switch \"||||"(animalId->TokenId.toInt, 0) {
-  | a if a < 26 || a == 42 => Client.MainnetQuery
-  | _ => Client.MaticQuery
-  }
-
-let useChainIdFromAnimalId = animalId =>
-  React.useMemo1(() => animalId->getChainIdFromAnimalId, [animalId])
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/AnimalAnnouncement.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/AnimalAnnouncement.res
deleted file mode 100644
index 0b05c59..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/AnimalAnnouncement.res
+++ /dev/null
@@ -1,52 +0,0 @@
-open Globals
-open Css
-
-let linkToAnimal = style(list{
-  color(white),
-  textDecoration(underline),
-  selector(":visited", list{color(hex("ffffff"))}),
-  selector(":hover", list{important(color(hex("6CAD3D")))}),
-})
-
-@react.component
-let make = (~nextReleasedAnimals: array<TokenId.t>, ~announcementBannerColor: string) => {
-  let nextLaunchDate = Animal.nextLaunchDate
-
-  let isLaunched = MomentRe.diff(nextLaunchDate, MomentRe.momentNow(), #seconds) < 0.
-
-  let closeButton = style(list{position(absolute), right(px(10))})
-
-  let (showAnnouncement, setShowAnnouncement) = React.useState(() => #block)
-  let numberOfAnimalsToLaunch = nextReleasedAnimals->Array.length
-  let isPlural = numberOfAnimalsToLaunch > 1
-  <div className={Announcement.announcementStyle(showAnnouncement, announcementBannerColor)}>
-    {("New Wildcard" ++ ((isPlural ? "s" : "") ++ " "))->restr}
-    {React.array(
-      nextReleasedAnimals->Array.mapWithIndex((index, animal) => {
-        let name = \"||||"(QlHooks.useWildcardName(animal), "Loading")
-        <span key={animal->TokenId.toString}>
-          <a href={"/#details/" ++ animal->TokenId.toString} className=linkToAnimal>
-            {name->restr}
-          </a>
-          {(
-            index == numberOfAnimalsToLaunch - 1
-              ? " "
-              : index == numberOfAnimalsToLaunch - 2
-              ? " and "
-              : ", "
-          )->restr}
-        </span>
-      }),
-    )}
-    {isLaunched
-      ? ((isPlural ? "have" : "has") ++ " just been launched!")->restr
-      : <>
-          {"coming in "->restr}
-          <CountDown endDateMoment=nextLaunchDate displayUnits=true />
-          {"!"->restr}
-        </>}
-    <span className=closeButton onClick={_ => setShowAnnouncement(_ => #none)}>
-      {`×`->restr}
-    </span>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Animal_test.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Animal_test.res
deleted file mode 100644
index c6c05b7..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Animal_test.res
+++ /dev/null
@@ -1,6 +0,0 @@
-open Jest
-
-describe("Expect", () => {
-  open Expect
-  test("toBe", () => expect(true) |> toEqual(true))
-})
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Announcement.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Announcement.res
deleted file mode 100644
index bdec50c..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Announcement.res
+++ /dev/null
@@ -1,30 +0,0 @@
-open Globals
-open Css
-
-let announcementStyle = (displayVal, announcementBannerColor) =>
-  style(list{
-    display(displayVal),
-    position(relative),
-    padding2(~v=rem(0.4), ~h=rem(1.)),
-    color(white),
-    backgroundColor(hex(announcementBannerColor)),
-    textAlign(#center),
-    zIndex(2),
-    fontSize(px(14)),
-    // textTransform(uppercase),
-    letterSpacing(px(2)),
-  })
-
-@react.component
-let make = (~announcementBannerColor: string, ~children) => {
-  let closeButton = style(list{position(absolute), right(px(10))})
-
-  let (showAnnouncement, setShowAnnouncement) = React.useState(() => #block)
-
-  <div className={announcementStyle(showAnnouncement, announcementBannerColor)}>
-    children
-    <span className=closeButton onClick={_ => setShowAnnouncement(_ => #none)}>
-      {`×`->restr}
-    </span>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ArtistProfiles.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ArtistProfiles.res
deleted file mode 100644
index 8bd631f..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ArtistProfiles.res
+++ /dev/null
@@ -1,275 +0,0 @@
-open Globals
-
-let centreAlignOnMobile = {
-  open Css
-  style(list{media("(max-width: 831px)", list{alignItems(center), justifyContent(center)})})
-}
-
-module ArtistDetails = {
-  @react.component
-  let make = (
-    ~optArtistEthAddress,
-    ~optArtistName,
-    ~optArtistWebsite,
-    ~optArtistLaunchedWildcards,
-    ~optArtistUnlaunchedWildcards,
-    ~optArtistOrgs,
-  ) => {
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-    let artistEthAddress =
-      \"||||"(optArtistEthAddress, CONSTANTS.nullEthAddress)->Js.String.toLowerCase
-    let userInfoContext = UserProvider.useUserInfoContext()
-    let reloadUser = forceReload => userInfoContext.update(artistEthAddress, forceReload)
-    reloadUser(false)
-    let optThreeBoxData = UserProvider.use3BoxUserData(artistEthAddress)
-    let optProfile = \">>="(optThreeBoxData, a => a.profile)
-
-    let image: string =
-      \">>="(
-        \"<$>"(\">>="(\">>="(optProfile, a => a.image), img => img->Array.get(0)), a =>
-          a.contentUrl
-        ),
-        content => Js.Dict.get(content, "/"),
-      )->Option.mapWithDefault(Blockie.makeBlockie(. artistEthAddress), hash =>
-        "https://ipfs.infura.io/ipfs/" ++ hash
-      )
-    let optName = \">>="(optProfile, a => a.name)
-    let optDescription = \">>="(optProfile, a => a.description)
-    let optTwitter = {
-      open UserProvider
-      \"<$>"(\">>="(\">>="(optThreeBoxData, a => a.verifications), a => a.twitter), a => a.username)
-    }
-    let etherScanUrl = RootProvider.useEtherscanUrl()
-
-    let artistsAnimalsArrayLaunched =
-      optArtistLaunchedWildcards->Option.mapWithDefault([], (
-        tokens: array<QlHooks.ArtistQuery.ArtistQuery_inner.t_artist_by_pk_launchedWildcards>,
-      ) =>
-        tokens->Array.map(token => token.id->Option.getWithDefault("_")->TokenId.fromStringUnsafe)
-      )
-    Js.log(optArtistUnlaunchedWildcards)
-
-    let currentUsdEthPrice = UsdPriceProvider.useUsdPrice()
-    let (totalCollectedMainnetEth, totalCollectMaticDai) = QlHooks.useTotalRaisedAnimalGroup(
-      artistsAnimalsArrayLaunched,
-    )
-
-    let (totalPatronageUsd, totalBreakdownString) = switch (
-      totalCollectedMainnetEth,
-      totalCollectMaticDai,
-    ) {
-    | (Some(mainnetEth), Some(maticDai)) => (
-        (currentUsdEthPrice->Option.mapWithDefault(0., usdEthRate =>
-          mainnetEth->Eth.getFloat(Eth.Usd(usdEthRate, 2))
-        ) +. maticDai->Eth.getFloat(Eth.Eth(#ether)))->Js.Float.toFixedWithPrecision(~digits=6),
-        mainnetEth->Web3Utils.fromWeiBNToEthPrecision(~digits=4) ++
-          (" ETH + " ++
-          (maticDai->Web3Utils.fromWeiBNToEthPrecision(~digits=2) ++ " DAI")),
-      )
-    | _ => ("loading", "loading")
-    }
-
-    let nonUrlState = RootProvider.useNonUrlState()
-    let clearNonUrlState = RootProvider.useClearNonUrlState()
-
-    <div
-      className={
-        open Css
-        style(list{width(#percent(100.))})
-      }>
-      <Rimble.Flex flexWrap="wrap" alignItems="start">
-        <Rimble.Box
-          p=1
-          width=[1., 1., 0.3333]
-          className={
-            open Css
-            style(list{textAlign(#center)})
-          }>
-          {optArtistEthAddress->reactMap(_ => <>
-            <img
-              className={
-                open Css
-                style(list{
-                  borderRadius(#percent(100.)),
-                  width(#vh(25.)),
-                  height(#vh(25.)),
-                  objectFit(#cover),
-                })
-              }
-              src=image
-            />
-            <br />
-          </>)}
-          {switch nonUrlState {
-          | UserVerificationScreen =>
-            <div
-              className={
-                open Css
-                style(list{position(#relative)})
-              }>
-              <Rimble.Button.Text
-                icononly=true
-                icon="Close"
-                color="moon-gray"
-                position="absolute"
-                top=0
-                right=0
-                m=1
-                onClick={_ => clearNonUrlState()}
-              />
-              <React.Suspense fallback={<Rimble.Loader />}> <LazyThreeBoxUpdate /> </React.Suspense>
-            </div>
-          | UpdateDepositScreen
-          | LoginScreen(_)
-          | UpdatePriceScreen(_)
-          | BuyScreen(_)
-          | AuctionScreen(_)
-          | NoExtraState => <>
-              <h2>
-                {optName
-                ->Option.getWithDefault(\"||||"(optArtistName, "Loading artist name"))
-                ->React.string}
-              </h2>
-              {optTwitter->reactMap(twitterHandle =>
-                <a
-                  className=Styles.navListText
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  href={"https://twitter.com/" ++ twitterHandle}>
-                  {("@" ++ twitterHandle)->React.string}
-                </a>
-              )}
-              <br />
-              {optDescription->reactMap(description =>
-                <p> {BadWords.make()->BadWords.clean(description)->React.string} </p>
-              )}
-              {optArtistWebsite->Option.mapWithDefault(React.null, website =>
-                <a
-                  className=Styles.navListText
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  href=website>
-                  {(\"||||"(optArtistName, "Artist") ++ "'s website")->React.string}
-                </a>
-              )}
-              <br />
-              <br />
-              {optArtistEthAddress->reactMap(_ => <>
-                <a
-                  className=Styles.navListText
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  href={"https://" ++ (etherScanUrl ++ ("/address/" ++ artistEthAddress))}>
-                  {Helper.elipsify(artistEthAddress, 10)->React.string}
-                </a>
-                <br />
-              </>)}
-            </>
-          }}
-        </Rimble.Box>
-        <Rimble.Box p=1 width=[1., 1., 0.3333]>
-          <h2> {"Total contributed by artist"->React.string} </h2>
-          {(totalPatronageUsd ++ "USD")->React.string}
-          <br />
-          <small> {totalBreakdownString->React.string} </small>
-          {switch optArtistOrgs {
-          | None => <h2> {"Loading orgs"->React.string} </h2>
-          | Some([]) => React.null
-          | Some(orgList) => <>
-              <br />
-              <br />
-              <h4> {"Organisations this artist has contributed to:"->React.string} </h4>
-              {orgList
-              ->Array.map(org => {
-                open QlHooks
-                <div
-                  className={
-                    open Css
-                    style(list{width(vh(12.)), cursor(#pointer)})
-                  }>
-                  <img
-                    className={
-                      open Css
-                      style(list{width(#percent(100.))})
-                    }
-                    onClick={_e => clearAndPush("/#org/" ++ org.id)}
-                    src={CONSTANTS.cdnBase ++ org.logo}
-                  />
-                </div>
-              })
-              ->React.array}
-            </>
-          }}
-        </Rimble.Box>
-        <Rimble.Box p=1 width=[1., 1., 0.3333]>
-          {switch optArtistLaunchedWildcards {
-          | None => <p> {"loading artists wildcards"->React.string} </p>
-          | Some([]) => <p> {"Artist doesn't have any launched wildcards"->React.string} </p>
-          | Some(_) =>
-            <React.Fragment>
-              <Rimble.Heading> {"Wildcards created by artist"->React.string} </Rimble.Heading>
-              <Rimble.Flex flexWrap="wrap" className=centreAlignOnMobile>
-                {React.array(
-                  artistsAnimalsArrayLaunched->Array.map(token => {
-                    let id = token->TokenId.toString
-                    <UserProfile.Token key=id tokenId=token />
-                  }),
-                )}
-              </Rimble.Flex>
-              <br />
-              <br />
-              <br />
-            </React.Fragment>
-          }}
-          {switch optArtistUnlaunchedWildcards {
-          | None
-          | Some([]) => React.null
-          | Some(unlaunchedWildcards) =>
-            <React.Fragment>
-              <Rimble.Heading> {"Coming soon"->React.string} </Rimble.Heading>
-              <Rimble.Flex flexWrap="wrap" className=centreAlignOnMobile>
-                {React.array(
-                  unlaunchedWildcards->Array.map((
-                    token: QlHooks.ArtistQuery.ArtistQuery_inner.t_artist_by_pk_unlaunchedWildcards,
-                  ) =>
-                    token.image->Option.mapWithDefault(React.null, image =>
-                      <OrgProfile.ComingSoonAnimal
-                        key={token.key->string_of_int}
-                        image={CONSTANTS.cdnBase ++ image}
-                        onClick={() => ()}
-                      />
-                    )
-                  ),
-                )}
-              </Rimble.Flex>
-            </React.Fragment>
-          }}
-        </Rimble.Box>
-      </Rimble.Flex>
-    </div>
-  }
-}
-
-@react.component
-let make = (~artistIdentifier: string) => {
-  // let artistAddress =
-  Js.log(artistIdentifier)
-
-  let optArtistEthAddress = QlHooks.useArtistEthAddress(~artistIdentifier)
-  let optArtistName = QlHooks.useArtistName(~artistIdentifier)
-  let optArtistWebsite = QlHooks.useArtistWebsite(~artistIdentifier)
-  let optArtistLaunchedWildcards = QlHooks.useArtistLaunchedWildcards(~artistIdentifier)
-  let optArtistUnlaunchedWildcards = QlHooks.useArtistUnlaunchedWildcards(~artistIdentifier)
-  let optArtistOrgs = QlHooks.useArtistOrgs(~artistIdentifier)
-
-  <Rimble.Flex flexWrap="wrap" alignItems="center" className=Styles.topBody>
-    <ArtistDetails
-      optArtistEthAddress
-      optArtistName
-      optArtistWebsite
-      optArtistLaunchedWildcards
-      optArtistUnlaunchedWildcards
-      optArtistOrgs
-    />
-  </Rimble.Flex>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Async.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Async.res
deleted file mode 100644
index d4652c5..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Async.res
+++ /dev/null
@@ -1,43 +0,0 @@
-// This is coppied directly from: https://github.com/mrmurphy/serbet/blob/master/src/Async.re
-// This file is designed to be opened for entire modules.
-
-// Using Bluebird for the global promise implementation allows actually useful
-// stack traces to be generated for debugging runtime issues.
-%%raw(`global.Promise = require('bluebird')`)
-%%raw(`
-Promise.config({
-  warnings: false
-})
-`)
-
-let let_ = (p, cb) => Js.Promise.then_(cb, p)
-
-let mapAsync = (p, cb) => Js.Promise.then_(a => cb(a)->Js.Promise.resolve, p)
-
-let async = a => Js.Promise.resolve(a)
-
-type promise<'a> = Js.Promise.t<'a>
-
-let catchAsync = (p, cb) => Js.Promise.catch(cb, p)
-
-let asyncFromResult = result =>
-  // Lift it into a promise in case the original caller wasn't already in the promise. We want to use Promise's error catching behavior, and not Javascript's error catching behavior.
-  result
-  ->async
-  ->mapAsync(a =>
-    switch a {
-    | Ok(b) => b
-    | Error(err) => Js.Exn.raiseError(err->Obj.magic)
-    }
-  )
-
-let attemptMapAsync = (
-  promise: Js.Promise.t<'a>,
-  attempter: 'a => result<'b, 'error>,
-): Js.Promise.t<'b> =>
-  promise->mapAsync(a =>
-    switch attempter(a) {
-    | Ok(b) => b
-    | Error(err) => Js.Exn.raiseError(err->Obj.magic)
-    }
-  )
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/BN.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/BN.res
deleted file mode 100644
index 7ce3869..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/BN.res
+++ /dev/null
@@ -1,23 +0,0 @@
-type t
-
-@send external add: (t, t) => t = "add"
-@send external sub: (t, t) => t = "sub"
-@send external mul: (t, t) => t = "mul"
-@send external div: (t, t) => t = "div"
-@send external gt: (t, t) => bool = "gt"
-@send external lt: (t, t) => bool = "lt"
-@send external eq: (t, t) => bool = "eq"
-@send external cmp: (t, t) => int = "cmp"
-@send external sqr: t => t = "sqr"
-@send external toString: t => string = "toString"
-@send external toStringRad: (t, int) => string = "toString"
-
-@send external toNumber: t => int = "toNumber"
-@send external toNumberFloat: t => float = "toNumber"
-
-@new @module("bn.js") external new_: string => t = "default"
-@new @module("bn.js") external newInt_: int => t = "default"
-
-// [@bs.module "@polkadot/util"] external tSqrt: (. t) => t = "tSqrt";
-
-// let test = tSqrt(. new_("50"));
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/BadWords.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/BadWords.res
deleted file mode 100644
index 70873a0..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/BadWords.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type t
-@new @module("bad-words") external make: unit => t = "default"
-@send external clean: (t, string) => string = "clean"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Blockie.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Blockie.res
deleted file mode 100644
index 826d545..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Blockie.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@module("./blockie-default.js")
-external makeBlockie: (. string) => string = "default"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Buy.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Buy.res
deleted file mode 100644
index ffc1858..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Buy.res
+++ /dev/null
@@ -1,353 +0,0 @@
-open Globals
-open Accounting
-
-let calcPricePerSecond = (price, numerator, denominator) => {
-  let priceBn = BN.new_(price)
-  let numeratorBn = BN.new_(numerator)
-  let denominatorBn = BN.new_(denominator)
-  let fullYearSeconds = BN.new_("31536000")
-
-  priceBn->BN.mul(numeratorBn)->BN.div(denominatorBn)->BN.div(fullYearSeconds)
-}
-
-// TODO: Could cached and stored so that all values don't need to be culculated each time!
-// this calculates pricePerSecondEach time.
-let calculateDepositDuration = (deposit, price, numerator, denominator) => {
-  let depositBn = BN.new_(deposit)
-  let pricePerSecond = calcPricePerSecond(price, numerator, denominator)
-
-  depositBn
-  ->BN.div(
-    if pricePerSecond->BN.gt(BN.new_("0")) {
-      pricePerSecond
-    } else {
-      BN.new_("1")
-    },
-  )
-  ->BN.toString
-  ->Int.fromString
-  ->defaultZeroI
-  // Check, 9007199254740992 is the largest integer available to javascript.
-}
-
-let calcRequiredDepositForTime = (time, price, numerator, denominator) => {
-  let timeBn = BN.new_(string_of_int(time))
-  let pricePerSecond = calcPricePerSecond(price, numerator, denominator)
-
-  let requiredDeposit = timeBn->BN.mul(pricePerSecond)->BN.toString
-
-  requiredDeposit->Web3Utils.fromWeiToEth
-}
-
-module Buy = {
-  @react.component
-  let make = (~chain, ~tokenId: TokenId.t, ~availableBalance: option<Eth.t>=?) => {
-    let web3Context = RootProvider.useWeb3React()
-    let (buyFunc, txBuyState) = ContractActions.useBuy(
-      ~chain,
-      tokenId,
-      web3Context.library,
-      web3Context.account,
-      web3Context.chainId->Option.getWithDefault(1),
-    )
-    let (buyFuncAuction, txBuyAuctionState) = ContractActions.useBuyAuction(
-      ~chain,
-      tokenId,
-      web3Context.library,
-      web3Context.account,
-      web3Context.chainId->Option.getWithDefault(1),
-    )
-
-    let userBalance = Belt.Option.mapWithDefault(RootProvider.useEthBalance(), BN.new_("0"), a => a)
-
-    let (numerator, denominator, ratio, _ratioInverse) = QlHooks.usePledgeRateDetailed(
-      ~chain,
-      tokenId,
-    )
-    let priceStatus: QlHooks.animalPrice = QlHooks.usePrice(~chain, tokenId)
-    let isOnAuction = Animal.useIsOnAuction(~chain, tokenId)
-    let launchTimeOpt = QlHooks.useLaunchTimeBN(~chain, tokenId)
-    let currentPriceWei = Animal.useAuctionPriceWei(
-      ~chain,
-      tokenId,
-      launchTimeOpt->Option.getWithDefault(BN.new_("5000")),
-    )
-
-    let currentPriceWei = isOnAuction
-      ? currentPriceWei->Option.getWithDefault(BN.new_("0"))
-      : switch priceStatus {
-        | Price(price) => price
-        | Loading
-        | Foreclosed(_) =>
-          BN.new_("0")
-        }
-
-    let tokenIdName = "token#" ++ tokenId->TokenId.toString
-
-    let paymentTokenBalance =
-      availableBalance
-      ->Option.getWithDefault(userBalance)
-      ->Web3Utils.fromWeiBNToEthPrecision(~digits=4)
-
-    let maxAvailableDepositBN =
-      availableBalance->Option.getWithDefault(
-        userBalance->BN.sub(BN.new_("3000000000000000"))->BN.sub(currentPriceWei), // 0.003 eth as gas
-      )
-    let maxAvailableDeposit = maxAvailableDepositBN->BN.toString->Web3Utils.fromWeiToEth
-
-    let isAbleToBuy = maxAvailableDepositBN->BN.gt(BN.new_("0"))
-
-    let currentPriceEth = Web3Utils.fromWeiBNToEth(currentPriceWei)
-    let currentPriceFloat = Float.fromString(currentPriceEth)->defaultZeroF
-    let currentPriceFloatWithMinimum = Js.Math.max_float(currentPriceFloat, 0.005)
-    let defaultPriceValue = toFixedWithPrecisionNoTrailingZeros(
-      currentPriceFloatWithMinimum *. 1.5,
-      ~digits=2,
-    )
-    let defaultMonthlyPatronage = toFixedWithPrecisionNoTrailingZeros(
-      currentPriceFloatWithMinimum *. 1.5 *. ratio,
-      ~digits=3,
-    )
-    let defaultPriceWei = defaultPriceValue->Web3Utils.toWeiFromEth
-    let depositForAYear = calcRequiredDepositForTime(
-      31536000,
-      defaultPriceWei,
-      numerator,
-      denominator,
-    )
-    let (
-      defaultDepositTime,
-      defaultDeposit,
-    ) = // TODO: these 'float_of_string' s can throw errors, rather use the Belt library.
-    if depositForAYear->float_of_string < maxAvailableDeposit->float_of_string {
-      (31536000, depositForAYear)
-    } else {
-      (
-        calculateDepositDuration(
-          maxAvailableDeposit->Web3Utils.toWeiFromEth,
-          defaultPriceWei,
-          numerator,
-          denominator,
-        ),
-        Js.Math.max_float(0., maxAvailableDeposit->float_of_string)->Js.Float.toString,
-      )
-    }
-
-    let (newPrice, setInitialPrice) = React.useState(() => defaultPriceValue)
-    let (patronage, setPatronage) = React.useState(() => defaultMonthlyPatronage)
-
-    let (deposit, setInitialDeposit) = React.useState(() => defaultDeposit)
-    let (depositTimeInSeconds, setDepositTimeInSeconds) = React.useState(() => defaultDepositTime)
-
-    let onSubmitBuy = () => {
-      let amountToSend = currentPriceWei->BN.add(BN.new_(Web3Utils.toWei(deposit, "ether")))
-      switch priceStatus {
-      | Foreclosed(_)
-      | Loading =>
-        buyFuncAuction(
-          newPrice,
-          "150000",
-          amountToSend
-          // Add 0.001 ETH as a buffer...
-          ->BN.add(BN.new_("1000000000000000"))
-          ->BN.toString,
-        )
-      | Price(price) =>
-        if price->BN.gt(BN.new_("0")) {
-          buyFunc(newPrice, currentPriceWei->BN.toString, "150000", amountToSend->BN.toString)
-        } else {
-          buyFuncAuction(
-            newPrice,
-            "150000",
-            amountToSend
-            // Add 0.001 ETH as a buffer...
-            ->BN.add(BN.new_("1000000000000000"))
-            ->BN.toString,
-          )
-        }
-      }
-    }
-
-    let setNewPrice = value => {
-      let (value, didUpdate) = InputHelp.onlyUpdateValueIfPositiveFloat(
-        newPrice,
-        setInitialPrice,
-        value,
-      )
-      if didUpdate {
-        let patronage = Js.Float.toString(Float.fromString(value)->defaultZeroF *. ratio)
-        setPatronage(_ => patronage)
-        let timeInSeconds = calculateDepositDuration(
-          deposit->Web3Utils.toWeiFromEth,
-          value->Web3Utils.toWeiFromEth,
-          numerator,
-          denominator,
-        )
-        setDepositTimeInSeconds(_ => timeInSeconds)
-      } else {
-        ()
-      }
-    }
-
-    // let updatePatronage = value => {
-    //   let (value, didUpdate) =
-    //     InputHelp.onlyUpdateValueIfPositiveFloat(
-    //       patronage,
-    //       setPatronage,
-    //       value,
-    //     );
-    //   if (didUpdate) {
-    //     let price =
-    //       Js.Float.toString(
-    //         Float.fromString(value)->defaultZeroF *. ratioInverse,
-    //       );
-    //     setInitialPrice(_ => price);
-
-    //     let timeInSeconds =
-    //       calculateDepositDuration(
-    //         deposit->Web3Utils.toWeiFromEth,
-    //         price->Web3Utils.toWeiFromEth,
-    //         numerator,
-    //         denominator,
-    //       );
-    //     setDepositTimeInSeconds(_ => timeInSeconds);
-    //   } else {
-    //     ();
-    //   };
-    // };
-    let setDeposit = value => {
-      let (value, didUpdate) = InputHelp.onlyUpdateValueIfInRangeFloat(
-        0.,
-        float_of_string(maxAvailableDeposit),
-        deposit,
-        setInitialDeposit,
-        value,
-      )
-      if didUpdate {
-        let timeInSeconds = calculateDepositDuration(
-          value->Web3Utils.toWeiFromEth,
-          newPrice->Web3Utils.toWeiFromEth,
-          numerator,
-          denominator,
-        )
-
-        setDepositTimeInSeconds(_ => timeInSeconds)
-      } else {
-        ()
-      }
-    }
-    let currency = switch chain {
-    | Client.Neither
-    | Client.MainnetQuery => "ether"
-    | Client.MaticQuery => "DAI"
-    }
-
-    let openTransak = _ => {
-      Js.log(Config.Transak.getConfig(~chain, web3Context))
-      let transak = Transak.new_(Config.Transak.getConfig(~chain, web3Context))
-      transak->Transak.init()
-    }
-
-    let (showTransakWarning, setShowTransakWarning) = React.useState(_ => false)
-
-    let transakSteps = defaultView =>
-      showTransakWarning
-        ? <>
-            <p> {"This service currently only works for pure ethereum wallets."->React.string} </p>
-            <p>
-              {"The following wallets are safe: Metamask, Portis, Torus, any wallet that uses words as a passphrase."->React.string}
-            </p>
-            <p>
-              {"The following wallets aren't safe: Argent, Authereum, gnosis safe."->React.string}
-            </p>
-            <p> {"If you are unsure, please contact us."->React.string} </p>
-            <button onClick=openTransak> {"Continue"->React.string} </button>
-            <button onClick={_ => setShowTransakWarning(_ => false)}>
-              {"Cancel"->React.string}
-            </button>
-          </>
-        : defaultView
-
-    <TxTemplate chain txState=txBuyAuctionState closeButtonText="Back to view Animal">
-      <TxTemplate chain txState=txBuyState closeButtonText="Back to view Animal">
-        <p> {("This wildcard uses " ++ currency)->React.string} </p>
-        {
-          // TODO: add link to an explainer of what "ether" or "DAI" is.
-          isAbleToBuy
-            ? <>
-                <p>
-                  {("Your available balance is: " ++ (paymentTokenBalance ++ (" " ++ currency)))
-                    ->React.string}
-                </p>
-                {transakSteps(
-                  <Rimble.Button onClick={_ => setShowTransakWarning(_ => true)}>
-                    {("Buy More " ++ currency)->React.string}
-                  </Rimble.Button>,
-                )}
-                <BuyInput
-                  onSubmitBuy
-                  setNewPrice
-                  newPrice
-                  deposit
-                  depositTimeInSeconds
-                  setDeposit
-                  patronage
-                  tokenIdName
-                  maxAvailableDeposit
-                />
-              </>
-            : <Rimble.Box>
-                <p className=Styles.textOnlyModalText>
-                  {React.string(
-                    "You do not have enough " ++ (currency ++ (" to buy " ++ (tokenIdName ++ "."))),
-                  )}
-                </p>
-                <p>
-                  {("Your current balance is: " ++ (paymentTokenBalance ++ (" " ++ currency)))
-                    ->React.string}
-                </p>
-                {transakSteps(
-                  <Rimble.Button onClick={_ => setShowTransakWarning(_ => true)}>
-                    {("Buy " ++ currency)->React.string}
-                  </Rimble.Button>,
-                )}
-              </Rimble.Box>
-        }
-      </TxTemplate>
-    </TxTemplate>
-  }
-}
-
-@react.component
-let make = (~chain, ~tokenId) => {
-  let web3Context = RootProvider.useWeb3React()
-  let optMaticState =
-    web3Context.account
-    ->Option.getWithDefault(CONSTANTS.nullEthAddress)
-    ->QlHooks.useMaticState(
-      ~forceRefetch=false,
-      web3Context.chainId
-      ->Option.getWithDefault(1)
-      ->ContractActions.getChildChainId
-      ->ContractActions.getMaticNetworkName,
-    )
-
-  switch chain {
-  | Client.Neither
-  | Client.MainnetQuery =>
-    <Buy chain tokenId />
-  | Client.MaticQuery =>
-    switch optMaticState {
-    | Some(maticState) =>
-      switch maticState.error {
-      | Some(error) =>
-        Js.log2("matic state fetch error", error)
-        <p>
-          {"Error: Unable to get matic state - please try again or contact the Wildcards Team."->React.string}
-        </p>
-      | None => <Buy chain tokenId availableBalance={maticState.balance->BN.new_} />
-      }
-    | None => <p> {"Updating latest state."->React.string} </p>
-    }
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/BuyGrid.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/BuyGrid.res
deleted file mode 100644
index fbe0394..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/BuyGrid.res
+++ /dev/null
@@ -1,70 +0,0 @@
-open Globals
-
-let backgroundStyle = {
-  open Css
-  style(list{
-    paddingTop(rem(1.)),
-    unsafe("backgroundImage", "linear-gradient(to top, #74C7D7 0%, white 100%)"),
-  })
-}
-let headingStyle = {
-  open Css
-  style(list{paddingTop(rem(5.)), textAlign(#center)})
-}
-
-module Grid = {
-  @react.component
-  let make = (~chain) => {
-    let allAnimals = QlHooks.useAnimalList(~chain)
-
-    <Rimble.Flex flexWrap="wrap" justifyContent="space-around" alignItems="stretch" px=50>
-      {allAnimals
-      ->Array.map(animal =>
-        <Rimble.Box key={animal->TokenId.toString} fontSize=4 p=3 width=[1., 1., 0.3]>
-          <Rimble.Card> <Dapp.CarouselAnimal chain animal scalar=1. /> </Rimble.Card>
-        </Rimble.Box>
-      )
-      ->React.array}
-      ///* Always empty to ensure grid structure */}
-      <Rimble.Box fontSize=4 p=3 width=[1., 1., 0.3]> React.null </Rimble.Box>
-      <Rimble.Box fontSize=4 p=3 width=[1., 1., 0.3]> React.null </Rimble.Box>
-    </Rimble.Flex>
-  }
-}
-
-let indexToType = tabIndex =>
-  switch tabIndex {
-  | 0 => "1st-edition"
-  | 1 => "2nd-edition"
-  // | 2 => "coming-soon"
-  | _ => "unknown"
-  }
-
-@react.component
-let make = (~wildcardsEdition) => {
-  let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-  let index = switch wildcardsEdition {
-  | Router.Gen1 => 0
-  | Router.Gen2 => 1
-  }
-  let selectLeaderBoard = (newIndex, _oldIndex) => {
-    clearAndPush("#explorer/" ++ indexToType(newIndex))
-
-    true
-  }
-
-  <div className=backgroundStyle>
-    <div>
-      <h1 className=headingStyle> {"Wildcards Kingdom"->restr} </h1>
-      <ReactTabs selectedIndex=index onSelect=selectLeaderBoard>
-        <ReactTabs.TabList>
-          <ReactTabs.Tab> {"First edition"->React.string} </ReactTabs.Tab>
-          <ReactTabs.Tab> {"Second edition"->React.string} </ReactTabs.Tab>
-        </ReactTabs.TabList>
-        <ReactTabs.TabPanel> <Grid chain=Client.MainnetQuery /> </ReactTabs.TabPanel>
-        <ReactTabs.TabPanel> <Grid chain=Client.MaticQuery /> </ReactTabs.TabPanel>
-      </ReactTabs>
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/BuyInput.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/BuyInput.res
deleted file mode 100644
index 40e62cd..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/BuyInput.res
+++ /dev/null
@@ -1,143 +0,0 @@
-type debounceOptions = {
-  maxWait: option<int>,
-  leading: option<bool>,
-  trailing: option<bool>,
-}
-
-@module("use-debounce")
-external useDebouncedCallback: (
-  . 'callback,
-  int,
-  debounceOptions,
-) => ('callback, unit => unit, unit => unit) = "useDebouncedCallback"
-
-let inputStyle = {
-  open Css
-  style(list{width(#percent(100.))})
-}
-let rightAlignText = {
-  open Css
-  style(list{textAlign(#right)})
-}
-let infoTooltipStyle = {
-  open Css
-  style(list{display(#inlineBlock)})
-}
-let infoIcon =
-  <div className=infoTooltipStyle> <Rimble.Icon color="green" name="Info" size="16" /> </div>
-
-open Globals
-
-@react.component
-let make = (
-  ~patronage,
-  ~onSubmitBuy,
-  ~newPrice,
-  ~deposit,
-  ~depositTimeInSeconds,
-  ~maxAvailableDeposit,
-  ~setNewPrice,
-  ~setDeposit,
-  ~tokenIdName,
-) => {
-  // ~updatePatronage: string => unit,
-  // ~priceSliderInitialMax: string,
-  // ~depositForAYear,
-
-  let (depositSlider, setDepositSlider) = React.useState(_ => newPrice)
-
-  React.useEffect2(() => {
-    setDepositSlider(_ => deposit)
-    None
-  }, (deposit, setDepositSlider))
-
-  let (debouncedSetDeposit, _, _) = useDebouncedCallback(.
-    // debounced function
-    setDeposit,
-    // delay in ms
-    50,
-    {maxWait: Some(500), leading: None, trailing: None},
-  )
-  <>
-    <Rimble.Flex>
-      <Rimble.Box p=2 mb=2>
-        <Rimble.Heading> {("Purchase " ++ tokenIdName)->restr} </Rimble.Heading>
-      </Rimble.Box>
-    </Rimble.Flex>
-    <Rimble.Flex>
-      <Rimble.Box p=2 mb=2 width=[1., 0.5]>
-        <Rimble.Tooltip
-          message=j`This is the amount of money you will receive if someone purchases $tokenIdName from you.`
-          placement="top">
-          <Rimble.Text>
-            {("Set " ++ (tokenIdName ++ "'s new for sale price:"))->restr} infoIcon
-          </Rimble.Text>
-        </Rimble.Tooltip>
-        <Rimble.Input
-          className=inputStyle
-          _type="number"
-          placeholder="Your Initial Sale Price"
-          onChange={event => {
-            let value = ReactEvent.Form.target(event)["value"]->Belt.Option.getWithDefault("")
-            setNewPrice(value)
-          }}
-          value=newPrice
-        />
-      </Rimble.Box>
-      <Rimble.Box p=2 mb=2 width=[1., 0.5]>
-        <Rimble.Tooltip
-          message="This is the monthly contribution that will go towards conservation of at risk animals. This will be deducted continuously from your deposit"
-          placement="top">
-          <Rimble.Text className=rightAlignText>
-            {"Your monthly contribution:"->restr} infoIcon
-          </Rimble.Text>
-        </Rimble.Tooltip>
-        <br />
-        <Rimble.Text className=rightAlignText> {patronage->restr} </Rimble.Text>
-      </Rimble.Box>
-    </Rimble.Flex>
-    <Rimble.Flex alignItems="center" justifyContent="center">
-      <Rimble.Box p=2 mb=2 width=[1., 0.3]>
-        <Rimble.Tooltip
-          message="The deposit is the funds that will be used to cover your monthly contribution."
-          placement="top">
-          <Rimble.Text> {"Set your deposit:"->restr} infoIcon </Rimble.Text>
-        </Rimble.Tooltip>
-        <Rimble.Input
-          _type="number"
-          className=inputStyle
-          placeholder="Your Initial Deposit"
-          onChange={event => {
-            let value = ReactEvent.Form.target(event)["value"]->Belt.Option.getWithDefault("")
-            setDeposit(value)
-          }}
-          value=deposit
-        />
-      </Rimble.Box>
-      <Rimble.Box p=2 mb=2 width=[1., 0.7]>
-        <Rimble.Slider
-          value=depositSlider
-          className=inputStyle
-          onChange={event => {
-            let value = ReactEvent.Form.target(event)["value"]->Belt.Option.getWithDefault("")
-            setDepositSlider(_ => value)
-            debouncedSetDeposit(value)
-          }}
-          min="0.0001"
-          max=maxAvailableDeposit
-          step="0.0000001"
-        />
-      </Rimble.Box>
-    </Rimble.Flex>
-    <p>
-      {("This deposit will last " ++
-      (depositTimeInSeconds->CountDown.displayTimeLeftHours ++
-      " for your monthly contribution"))->restr}
-    </p>
-    <Rimble.Flex>
-      <Rimble.Box p=2 mb=2 width=[1., 0.7]>
-        <Rimble.Button onClick={_ => onSubmitBuy()}> {"Buy"->restr} </Rimble.Button>
-      </Rimble.Box>
-    </Rimble.Flex>
-  </>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/CONSTANTS.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/CONSTANTS.res
deleted file mode 100644
index 69a15bb..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/CONSTANTS.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let cdnBase = "https://dd2wadt5nc0o7.cloudfront.net"
-
-let nullEthAddress = "0x0000000000000000000000000000000000000000"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Carousel.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Carousel.res
deleted file mode 100644
index b14d754..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Carousel.res
+++ /dev/null
@@ -1,24 +0,0 @@
-@module("@wildcards/react-carousel") @react.component
-external make: (
-  ~children: React.element,
-  ~slidesPerPage: int=?,
-  ~centered: bool=?,
-  ~value: int=?,
-  ~animationSpeed: int=?,
-  ~className: string=?,
-  ~onChange: int => unit=?,
-  ~infinite: bool=?,
-  ~autoPlay: int=?,
-  ~arrowLeft: React.element=?,
-  ~arrowRight: React.element=?,
-  ~addArrowClickHandler: bool=?,
-  ~arrows: bool=?,
-) => React.element = "default"
-
-// ~arrowLeft: React.element=?,
-// ~arrowRight: React.element=?,
-
-module Dots = {
-  @module("@wildcards/react-carousel") @react.component
-  external make: (~onChange: int => unit, ~value: int, ~number: int) => React.element = "Dots"
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Client.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Client.res
deleted file mode 100644
index e8df8f5..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Client.res
+++ /dev/null
@@ -1,80 +0,0 @@
-type dataObject = {"__typename": string, "id": string}
-// createInMemoryCache(~dataIdFromObject=(obj: dataObject) => obj##id, ());
-
-/* Create an InMemoryCache */
-// let inMemoryCache = () => ApolloInMemoryCache.createInMemoryCache();
-
-/* Create an HTTP Link */
-let httpLink = (~uri) => ApolloClient.Link.HttpLink.make(~uri=_ => uri, ())
-/* Create an WS Link */
-let wsLink = (~uri) => {
-  open ApolloClient.Link.WebSocketLink
-  make(~uri, ~options=ClientOptions.make(~reconnect=true, ()), ())
-}
-
-type context =
-  | Neither
-  | MaticQuery
-  | MainnetQuery
-let chainContextToStr = chain =>
-  switch chain {
-  | Neither => "neither"
-  | MaticQuery => "matic"
-  | MainnetQuery => "mainnet"
-  }
-type queryContext = {context: context}
-
-@send
-external getContext: ApolloClient__Link_Core_ApolloLink.Operation.Js_.t => option<queryContext> =
-  "getContext"
-
-/* based on test, execute left or right */
-let webSocketHttpLink = (~uri, ~matic, ~subscriptions) =>
-  ApolloClient.Link.split(
-    ~test=({query, _}) => {
-      let definition = ApolloClient.Utilities.getOperationDefinition(query)
-      switch definition {
-      | Some({kind, operation, _}) => kind === "OperationDefinition" && operation === "subscription"
-      | None => false
-      }
-    },
-    ~whenTrue=wsLink(~uri=subscriptions),
-    ~whenFalse=ApolloClient.Link.split(~test=operation => {
-      let context = operation->getContext
-
-      let usingMatic = switch context {
-      | Some({context}) =>
-        switch context {
-        | MaticQuery => true
-        | Neither => false
-        | MainnetQuery => false
-        }
-      | None => false
-      }
-      usingMatic
-    }, ~whenTrue=httpLink(~uri=matic), ~whenFalse=httpLink(~uri)),
-  )
-
-type qlEndpoints = {
-  mainnet: string,
-  matic: string,
-  ws: string,
-}
-
-let instance = (~getGraphEndpoints: unit => qlEndpoints) => {
-  let {mainnet, matic, ws} = getGraphEndpoints()
-
-  open ApolloClient
-  make(
-    ~cache=Cache.InMemoryCache.make(),
-    ~connectToDevTools=true,
-    ~defaultOptions=DefaultOptions.make(
-      ~mutate=DefaultMutateOptions.make(~awaitRefetchQueries=true, ~errorPolicy=All, ()),
-      ~query=DefaultQueryOptions.make(~fetchPolicy=NetworkOnly, ~errorPolicy=All, ()),
-      ~watchQuery=DefaultWatchQueryOptions.make(~fetchPolicy=NetworkOnly, ~errorPolicy=All, ()),
-      (),
-    ),
-    ~link=webSocketHttpLink(~uri=mainnet, ~matic, ~subscriptions=ws),
-    (),
-  )
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Components.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Components.res
deleted file mode 100644
index 351f14f..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Components.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module HoverToggle = {
-  @module("./HoverToggle.js") @react.component
-  external make: (
-    ~_ComponentHover: React.element,
-    ~_ComponentNoHover: React.element,
-  ) => React.element = "default"
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Config.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Config.res
deleted file mode 100644
index f6f0974..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Config.res
+++ /dev/null
@@ -1,56 +0,0 @@
-@val @scope(("window", "location"))
-external windowLocation: string = "origin"
-
-module Transak = {
-  let getConfig = (~chain, web3Context: RootProvider.web3reactContext) => {
-    let (defaultCryptoCurrency, defaultNetwork) = switch chain {
-    | Client.Neither
-    | Client.MainnetQuery => ("ETH", "mainnet")
-    | Client.MaticQuery => ("DAI", "matic")
-    }
-    let (environment, apiKey) = switch web3Context.chainId {
-    | Some(1) => ("PRODUCTION", "03e872c1-35c8-436a-8577-134c87912956")
-    | Some(_)
-    | None => ("STAGING", "95d4e321-7e4e-4a87-92ea-7daac496de7e")
-    }
-
-    let transakConfig: Transak.initParams = {
-      environment: environment,
-      apiKey: apiKey,
-      // apiKey: "e7f543f7-e12e-4257-ad04-682679f0404c",
-      hostURL: windowLocation,
-      defaultCryptoCurrency: Some(defaultCryptoCurrency),
-      walletAddress: web3Context.account,
-      defaultNetwork: Some(defaultNetwork),
-      themeColor: Some("#6BAD3E"),
-      exchangeScreenTitle: Some("Top up your balance for Wildcards"),
-      isDisableCrypto: Some(true), // This could be interesting... Doesn't work unless other parameters are correct though.
-      cryptoCurrencyCode: None,
-      cryptoCurrencyList: None,
-      networks: None,
-      walletAddressesData: None,
-      fiatCurrency: None, // TODO
-      countryCode: None,
-      fiatAmount: None,
-      defaultFiatAmount: None,
-      paymentMethod: None,
-      defaultPaymentMethod: None,
-      disablePaymentMethods: None,
-      email: None,
-      userData: None,
-      partnerOrderId: None,
-      partnerCustomerId: None,
-      accessToken: None,
-      redirectURL: None,
-      disableWalletAddressForm: None,
-      isAutoFillUserData: None,
-      height: None,
-      width: None,
-      hideMenu: None,
-      hideExchangeScreen: None,
-      isFeeCalculationHidden: None,
-    }
-
-    transakConfig
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ContractActions.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ContractActions.res
deleted file mode 100644
index 9f5244e..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ContractActions.res
+++ /dev/null
@@ -1,834 +0,0 @@
-open Globals
-open Ethers
-
-type txHash = string
-type tx = {
-  hash: txHash,
-  wait: (. unit) => Promise.Js.t<txResult, txError>,
-}
-type parsedUnits
-type txOptions = {
-  gasLimit: string,
-  value: parsedUnits,
-}
-type tokenIdString = string
-type estimateBuy = {
-  buy: // (. string, parsedUnits, txOptions) =>
-  (. string, parsedUnits, parsedUnits, txOptions) => Promise.Js.t<string, string>,
-}
-type stewardContract = {
-  estimate: estimateBuy,
-  buy: (. tokenIdString, parsedUnits, parsedUnits, string, txOptions) => Promise.Js.t<tx, txError>,
-  buyAuction: (. tokenIdString, parsedUnits, string, txOptions) => Promise.Js.t<tx, txError>,
-  depositWei: (. txOptions) => Promise.Js.t<tx, txError>,
-  withdrawDeposit: (. parsedUnits, txOptions) => Promise.Js.t<tx, txError>,
-  _collectPatronagePatron: (. string, txOptions) => Promise.Js.t<tx, txError>,
-  changePrice: (. tokenIdString, parsedUnits, txOptions) => Promise.Js.t<tx, txError>,
-}
-
-type ethersBnFormat
-@send external ethersBnToString: ethersBnFormat => string = "toString"
-
-type loyaltyTokenContract = {
-  // approve(address to, uint256 tokenId)
-  allowance: (. Web3.ethAddress, Web3.ethAddress) => Js.Promise.t<ethersBnFormat>,
-  balanceOf: (. Web3.ethAddress) => Js.Promise.t<ethersBnFormat>,
-  approve: (. Web3.ethAddress, string, txOptions) => Promise.Js.t<tx, txError>,
-}
-
-@new @module("ethers")
-external getContract: (Web3.ethAddress, Web3.abi, Web3.web3Library) => stewardContract = "Contract"
-
-@new @module("ethers")
-external getLoyaltyTokenContract: (
-  Web3.ethAddress,
-  Web3.abi,
-  Web3.web3Library,
-) => loyaltyTokenContract = "Contract"
-
-@module("./abi/loyaltyToken.json")
-external loyaltyTokenAbi: Web3.abi = "loyaltyToken"
-
-@module("ethers") @scope("utils")
-external parseUnits: (. string, int) => parsedUnits = "parseUnits"
-
-let getExchangeContract = (stewardAddress, stewardAbi, library, account) =>
-  getContract(stewardAddress, stewardAbi, ContractUtil.getProviderOrSigner(library, account))
-let getLoyaltyTokenContract = (stewardAddress, library, account) =>
-  getLoyaltyTokenContract(
-    stewardAddress,
-    loyaltyTokenAbi,
-    ContractUtil.getProviderOrSigner(library, account),
-  )
-
-let stewardAddressMainnet = "0x6D47CF86F6A490c6410fC082Fd1Ad29CF61492d0"
-let stewardAddressGoerli = "0x0C00CFE8EbB34fE7C31d4915a43Cde211e9F0F3B"
-let stewardAddressRinkeby = "0x229Cb219F056A9097b2744594Bc37597380854E8"
-
-let loyaltyTokenAddressMainnet = "0x773c75c2277eD3e402BDEfd28Ec3b51A3AfbD8a4"
-let loyaltyTokenAddressGoerli = "0xd7d8c42ab5b83aa3d4114e5297989dc27bdfb715"
-// let loyaltyTokenAddressRinkbey = "0xd7d8c42ab5b83aa3d4114e5297989dc27bdfb715";
-
-let stewardAddressMaticMain = "0x6D47CF86F6A490c6410fC082Fd1Ad29CF61492d0"
-let stewardAddressMumbai = "0x0C00CFE8EbB34fE7C31d4915a43Cde211e9F0F3B"
-
-let loyaltyTokenAddressMaticMain = "0x773c75c2277eD3e402BDEfd28Ec3b51A3AfbD8a4"
-let loyaltyTokenAddressMumbai = "0xd7d8c42ab5b83aa3d4114e5297989dc27bdfb715"
-// let loyaltyTokenAddressRinkbey = "0xd7d8c42ab5b83aa3d4114e5297989dc27bdfb715";
-
-let getDaiContractAddress = (chain: Client.context, chainId) =>
-  switch chain {
-  | Neither
-  | MaticQuery =>
-    switch chainId {
-    | 137 => "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063"
-    | 80001 => "0xeb37A6dF956F1997085498aDd98b25a2f633d83F"
-    | 5
-    | _ => "0xba97BeC8d359D73c81D094421803D968A9FBf676"
-    }
-  | MainnetQuery => "NEVER"
-  }
-
-let getStewardAddress = (chain: Client.context, chainId) =>
-  switch chain {
-  | Neither
-  | MaticQuery =>
-    switch chainId {
-    | 137 => "0x69895ba53B4CB7afaea2Ab519409F3d3C613a562"
-    | 80001 => "0xE44056eff470b1e505c3776601685c97A6966887"
-    | 5
-    | _ => "0xF26F8B2c178a0DeBB176c6b18e3F6d243fEEf828"
-    }
-  | MainnetQuery => "TODO"
-  }
-
-let getMaticNetworkName = chainId =>
-  switch chainId {
-  | 137 => "matic"
-  | 80001 => "mumbai"
-  | 5
-  | _ => "goerli"
-  }
-
-let getChildChainId = parentChainId =>
-  switch parentChainId {
-  | 1 => 137
-  | 5 => 80001
-  | 4
-  | _ => 5
-  }
-
-let useStewardAbi = () =>
-  switch RootProvider.useStewardAbi() {
-  | Some(abi) => abi
-  | None => %raw(`require("./abi/steward.json").stewardAbi`)
-  }
-
-let defaultStewardAddressFromChainId = x =>
-  switch x {
-  | 1 => Some(stewardAddressMainnet)
-  | 4 => Some(stewardAddressRinkeby)
-  | 5 => Some(stewardAddressGoerli)
-  | _ => None
-  }
-let useStewardAddress = () => {
-  let externallySetAddress = RootProvider.useStewardContractAddress()
-  chainId =>
-    externallySetAddress->Belt.Option.mapWithDefault(
-      defaultStewardAddressFromChainId(chainId),
-      a => Some(a),
-    )
-}
-let loyaltyTokenAddressFromChainId = x =>
-  switch x {
-  | 1 => Some(loyaltyTokenAddressMainnet)
-  | 5 => Some(loyaltyTokenAddressGoerli)
-  | _ => None
-  }
-
-let useStewardContract = () => {
-  let context = RootProvider.useWeb3React()
-  let stewardContractAddress = useStewardAddress()
-  let stewardAbi = useStewardAbi()
-
-  React.useMemo3(() =>
-    switch (context.library, context.chainId) {
-    | (Some(library), Some(chainId)) =>
-      stewardContractAddress(chainId)->oMap(
-        getExchangeContract(_, stewardAbi, library, context.account),
-      )
-
-    | _ => None
-    }
-  , (context.library, context.account, context.chainId))
-}
-
-let useLoyaltyTokenContract = () => {
-  let context = RootProvider.useWeb3React()
-
-  React.useMemo3(() =>
-    switch (context.library, context.chainId) {
-    | (Some(library), Some(chainId)) =>
-      chainId
-      ->loyaltyTokenAddressFromChainId
-      ->oMap(getLoyaltyTokenContract(_, library, context.account))
-
-    | _ => None
-    }
-  , (context.library, context.account, context.chainId))
-}
-
-type transactionState =
-  | UnInitialised
-  | DaiPermit(BN.t)
-  | SignMetaTx
-  | Created
-  | SubmittedMetaTx
-  | SignedAndSubmitted(txHash)
-  // TODO: get the error message when it is declined.
-  //      4001 - means the transaction was declined by the signer
-  //      -32000 - means the transaction is always failing (exceeds gas allowance)
-  | Declined(string)
-  // | DaiPermitDclined(string)
-  // | SignMetaTxDclined(string)
-  | ServerError(string)
-  | Complete(txResult)
-  | Failed
-
-module ExecuteMetaTxMutation = %graphql(`
-    mutation (
-      $network: String!,
-      $r: String!,
-      $s: String!,
-      $v: Int!,
-      $userAddress: String!,
-      $functionSignature: String!
-    ) {
-      metaTx(
-        functionSignature: $functionSignature,
-        network: $network ,
-        r: $r,
-        s: $s,
-        userAddress: $userAddress,
-        v: $v
-      ) {
-        txHash
-        success
-        errorMsg
-      }
-    }
-  `)
-
-let execDaiPermitMetaTx = (
-  daiNonce,
-  networkName,
-  stewardNonce,
-  setTxState,
-  sendMetaTx: ApolloClient__React_Hooks_UseMutation.MutationTuple.t_mutationFn<
-    ExecuteMetaTxMutation.ExecuteMetaTxMutation_inner.t,
-    ExecuteMetaTxMutation.ExecuteMetaTxMutation_inner.t_variables,
-    ExecuteMetaTxMutation.ExecuteMetaTxMutation_inner.Raw.t_variables,
-  >,
-  userAddress,
-  spender,
-  lib: Web3.web3Library,
-  generateFunctionSignature: (
-    Web3.Contract.MaticSteward.steward,
-    DaiPermit.v,
-    DaiPermit.r,
-    DaiPermit.s,
-  ) => string,
-  chainId,
-  verifyingContract,
-) =>
-  DaiPermit.createPermitSig(
-    lib.provider,
-    verifyingContract,
-    daiNonce,
-    chainId,
-    userAddress,
-    spender,
-  )
-  ->Js.Promise.then_(rsvSig => {
-    setTxState(_ => SignMetaTx)
-    open ContractUtil
-    let {r, s, v} = rsvSig
-
-    let web3 = Web3.new_(lib.provider)
-
-    let steward = Web3.Contract.MaticSteward.getStewardContract(web3, spender)
-
-    let functionSignature = generateFunctionSignature(steward, v, r, s)
-
-    let messageToSign = ContractUtil.constructMetaTransactionMessage(
-      stewardNonce,
-      chainId->BN.toString,
-      functionSignature,
-      spender,
-    )
-
-    web3
-    ->Web3.personalSign(messageToSign, userAddress)
-    ->Js.Promise.then_(signature => Js.Promise.resolve((functionSignature, signature)), _)
-  }, _)
-  ->Js.Promise.then_(((functionSignature, signature)) => {
-    open ContractUtil
-    let {r, s, v} = getEthSig(signature)
-    sendMetaTx(
-      ExecuteMetaTxMutation.makeVariables(
-        ~network=networkName,
-        ~r,
-        ~s,
-        ~v,
-        ~functionSignature,
-        ~userAddress,
-        (),
-      ),
-    )->Js.Promise.resolve
-  }, _)
-  ->Js.Promise.catch(err => {
-    Js.log2("this error was caught", err)
-    Js.Promise.resolve(""->Obj.magic)
-  }, _)
-  ->ignore
-
-let handleMetaTxSumbissionState = (
-  result: ApolloClient__React_Types.MutationResult.t<
-    ExecuteMetaTxMutation.ExecuteMetaTxMutation_inner.t,
-  >,
-  setTxState,
-  currentState,
-) => {
-  let networkId = RootProvider.useNetworkId()
-
-  switch result {
-  | {called: false, _} => ()
-  //  | {loading: true} =>
-  | {data: Some(data), error: None, _} =>
-    let success = data.metaTx.success
-    let errorMsg = data.metaTx.errorMsg
-    let txHash = data.metaTx.txHash
-    if success {
-      @warning("-4")
-      switch currentState {
-      | SignedAndSubmitted(_txHash) => ()
-      | _ => setTxState(_ => SignedAndSubmitted(txHash))
-      }
-
-      let providerUrl = switch networkId {
-      | Some(1) => "https://rpc-mainnet.matic.network"
-      | Some(4) => "https://goerli.infura.io/v3/c401b8ee3a324619a453f2b5b2122d7a"
-      | Some(5) => "https://rpc-mumbai.matic.today"
-      | Some(_)
-      | None => "No Network"
-      }
-      let maticProvider = Ethers.makeProvider(providerUrl)
-
-      let waitForTx = maticProvider->Ethers.waitForTransaction(txHash)->Promise.Js.toResult
-
-      waitForTx->Promise.getOk(tx => setTxState(_ => Complete(tx)))
-      waitForTx->Promise.getError(error => {
-        setTxState(_ => Failed)
-        Js.log("GOT AN ERROR")
-        Js.log(error)
-      })
-    } else {
-      @warning("-4")
-      switch currentState {
-      | ServerError(_txHash) => ()
-      | _ => setTxState(_ => ServerError(errorMsg->Option.getWithDefault("Unknown error")))
-      }
-    }
-  | {data: None, _}
-  | {error: _, _} =>
-    @warning("-4")
-    switch currentState {
-    | ServerError(_txHash) => ()
-    | _ => setTxState(_ => ServerError("Query Error"))
-    }
-  }
-}
-let useBuy = (
-  ~chain,
-  animal: TokenId.t,
-  library: option<Web3.web3Library>,
-  account,
-  parentChainId,
-) => {
-  let animalId = animal->TokenId.toString
-
-  let optSteward = useStewardContract()
-  let (txState, setTxState) = React.useState(() => UnInitialised)
-
-  let (mutate, result) = ExecuteMetaTxMutation.use()
-  handleMetaTxSumbissionState(result, setTxState, txState)
-
-  let chainIdInt = parentChainId->getChildChainId
-  let chainId = chainIdInt->BN.newInt_
-  let verifyingContract = getDaiContractAddress(chain, chainIdInt)
-  let spender = getStewardAddress(chain, chainIdInt)
-  let networkName = chainIdInt->getMaticNetworkName
-
-  let maticState =
-    account
-    ->Option.getWithDefault(CONSTANTS.nullEthAddress)
-    ->QlHooks.useMaticState(~forceRefetch=false, networkName)
-
-  switch chain {
-  | Client.Neither
-  | Client.MaticQuery => (
-      (newPrice, oldPrice, wildcardsPercentage, value: string) =>
-        switch (library, account, maticState) {
-        // TODO: This function should not take in options of these values, they should be defined
-        | (Some(lib), Some(userAddress), Some(maticState)) =>
-          let daiNonce = maticState.daiNonce
-          let stewardNonce = maticState.stewardNonce
-
-          setTxState(_ => DaiPermit(value->BN.new_))
-          execDaiPermitMetaTx(
-            daiNonce,
-            networkName,
-            stewardNonce,
-            setTxState,
-            mutate,
-            userAddress,
-            spender,
-            lib,
-            (steward, v, r, s) =>
-              (
-                steward->Web3.Contract.MaticSteward.buyWithPermit(
-                  BN.new_(daiNonce),
-                  BN.new_("0"),
-                  true,
-                  v,
-                  r,
-                  s,
-                  animalId,
-                  newPrice->Web3Utils.toWeiFromEth,
-                  oldPrice,
-                  wildcardsPercentage,
-                  value,
-                )
-              ).encodeABI(),
-            chainId,
-            verifyingContract,
-          )
-        | _ => ()
-        },
-      txState,
-    )
-  | Client.MainnetQuery => (
-      (newPrice, oldPrice, wildcardsPercentage, value: string) => {
-        let newPriceEncoded = parseUnits(. newPrice, 18)
-
-        let value = parseUnits(. value, 0)
-        let oldPriceParsed = parseUnits(. oldPrice, 0)
-
-        setTxState(_ => Created)
-        switch optSteward {
-        | Some(steward) =>
-          let buyPromise = steward.buy(.
-            animalId,
-            newPriceEncoded,
-            oldPriceParsed,
-            wildcardsPercentage,
-            {
-              gasLimit: "500302", //calculateGasMargin(estimatedGasLimit, GAS_MARGIN),
-              value: value,
-            },
-          )->Promise.Js.toResult
-          buyPromise->Promise.getOk(tx => {
-            setTxState(_ => SignedAndSubmitted(tx.hash))
-            let txMinedPromise = tx.wait(.)->Promise.Js.toResult
-            txMinedPromise->Promise.getOk(txOutcome => {
-              Js.log(txOutcome)
-              setTxState(_ => Complete(txOutcome))
-            })
-            txMinedPromise->Promise.getError(error => {
-              setTxState(_ => Failed)
-              Js.log(error)
-            })
-            ()
-          })
-          buyPromise->Promise.getError(error => setTxState(_ => Declined(error.message)))
-          ()
-        | None => ()
-        }
-      },
-      txState,
-    )
-  }
-}
-
-let useBuyAuction = (~chain, animal, library: option<Web3.web3Library>, account, parentChainId) => {
-  let (txState, setTxState) = React.useState(() => UnInitialised)
-
-  let animalId = animal->TokenId.toString
-
-  let optSteward = useStewardContract()
-
-  let (mutate, result) = ExecuteMetaTxMutation.use()
-  handleMetaTxSumbissionState(result, setTxState, txState)
-
-  let chainIdInt = parentChainId->getChildChainId
-  let chainId = chainIdInt->BN.newInt_
-  let verifyingContract = getDaiContractAddress(chain, chainIdInt)
-  let spender = getStewardAddress(chain, chainIdInt)
-  let networkName = chainIdInt->getMaticNetworkName
-
-  let maticState =
-    account
-    ->Option.getWithDefault(CONSTANTS.nullEthAddress)
-    ->QlHooks.useMaticState(~forceRefetch=false, networkName)
-
-  switch chain {
-  | Client.Neither
-  | Client.MaticQuery => (
-      (newPrice, wildcardsPercentage, value: string) =>
-        switch (library, account, maticState) {
-        | (Some(lib), Some(userAddress), Some(maticState)) =>
-          let daiNonce = maticState.daiNonce
-          let stewardNonce = maticState.stewardNonce
-          setTxState(_ => DaiPermit(value->BN.new_))
-          execDaiPermitMetaTx(
-            daiNonce,
-            networkName,
-            stewardNonce,
-            setTxState,
-            mutate,
-            userAddress,
-            spender,
-            lib,
-            (steward, v, r, s) =>
-              (
-                steward->Web3.Contract.MaticSteward.buyAuctionWithPermit(
-                  BN.new_(daiNonce),
-                  BN.new_("0"),
-                  true,
-                  v,
-                  r,
-                  s,
-                  animalId,
-                  newPrice->Web3Utils.toWeiFromEth,
-                  wildcardsPercentage,
-                  value,
-                )
-              ).encodeABI(),
-            chainId,
-            verifyingContract,
-          )
-
-        | _ =>
-          Js.log("something important is null")
-          Js.log3(library, account, maticState)
-          ()
-        },
-      txState,
-    )
-  | Client.MainnetQuery => (
-      (newPrice, wildcardsPercentage, value: string) => {
-        let newPriceEncoded = parseUnits(. newPrice, 18)
-
-        let value = parseUnits(. value, 0)
-
-        setTxState(_ => Created)
-        switch optSteward {
-        | Some(steward) =>
-          // let buyPromise =
-          let buyPromise = steward.buyAuction(.
-            animalId,
-            newPriceEncoded,
-            wildcardsPercentage,
-            {
-              gasLimit: "500302", //calculateGasMargin(estimatedGasLimit, GAS_MARGIN),
-              value: value,
-            },
-          )->Promise.Js.toResult
-          buyPromise->Promise.getOk(tx => {
-            setTxState(_ => SignedAndSubmitted(tx.hash))
-            let txMinedPromise = tx.wait(.)->Promise.Js.toResult
-            txMinedPromise->Promise.getOk(txOutcome => {
-              Js.log(txOutcome)
-              setTxState(_ => Complete(txOutcome))
-            })
-            txMinedPromise->Promise.getError(error => {
-              setTxState(_ => Failed)
-              Js.log(error)
-            })
-            ()
-          })
-          buyPromise->Promise.getError(error => setTxState(_ => Declined(error.message)))
-          ()
-        | None => ()
-        }
-      },
-      txState,
-    )
-  }
-}
-
-let useRedeemLoyaltyTokens = (patron: string) => {
-  let (txState, setTxState) = React.useState(() => UnInitialised)
-  let optSteward = useStewardContract()
-  let buyFunction = () => {
-    let value = parseUnits(. "0", 0)
-
-    setTxState(_ => Created)
-    switch optSteward {
-    | Some(steward) =>
-      let claimLoyaltyTokenPromise = steward._collectPatronagePatron(.
-        patron,
-        {
-          gasLimit: "500302", //calculateGasMargin(estimatedGasLimit, GAS_MARGIN),
-          value: value,
-        },
-      )->Promise.Js.toResult
-      claimLoyaltyTokenPromise->Promise.getOk(tx => {
-        setTxState(_ => SignedAndSubmitted(tx.hash))
-        let txMinedPromise = tx.wait(.)->Promise.Js.toResult
-        txMinedPromise->Promise.getOk(txOutcome => {
-          Js.log(txOutcome)
-          setTxState(_ => Complete(txOutcome))
-        })
-        txMinedPromise->Promise.getError(error => {
-          setTxState(_ => Failed)
-          Js.log(error)
-        })
-        ()
-      })
-      claimLoyaltyTokenPromise->Promise.getError(error => setTxState(_ => Declined(error.message)))
-      ()
-    | None => ()
-    }
-  }
-
-  (buyFunction, txState)
-}
-
-let useUpdateDeposit = (~chain, library: option<Web3.web3Library>, account, parentChainId) => {
-  let (txState, setTxState) = React.useState(() => UnInitialised)
-
-  let optSteward = useStewardContract()
-
-  let (mutate, result) = ExecuteMetaTxMutation.use()
-  handleMetaTxSumbissionState(result, setTxState, txState)
-
-  let chainIdInt = parentChainId->getChildChainId
-  let chainId = chainIdInt->BN.newInt_
-  let verifyingContract = getDaiContractAddress(chain, chainIdInt)
-  let spender = getStewardAddress(chain, chainIdInt)
-  let networkName = chainIdInt->getMaticNetworkName
-
-  let maticState =
-    account
-    ->Option.getWithDefault(CONSTANTS.nullEthAddress)
-    ->QlHooks.useMaticState(~forceRefetch=false, networkName)
-
-  switch chain {
-  | Client.Neither
-  | Client.MaticQuery => (
-      amountToAdd =>
-        switch (library, account, maticState) {
-        | (Some(lib), Some(userAddress), Some(maticState)) =>
-          let daiNonce = maticState.daiNonce
-          let stewardNonce = maticState.stewardNonce
-          setTxState(_ => DaiPermit(amountToAdd->BN.new_))
-          execDaiPermitMetaTx(
-            daiNonce,
-            networkName,
-            stewardNonce,
-            setTxState,
-            mutate,
-            userAddress,
-            spender,
-            lib,
-            (steward, v, r, s) =>
-              (
-                steward->Web3.Contract.MaticSteward.depositWithPermit(
-                  BN.new_(daiNonce),
-                  BN.new_("0"),
-                  true,
-                  v,
-                  r,
-                  s,
-                  userAddress,
-                  BN.new_(amountToAdd),
-                )
-              ).encodeABI(),
-            chainId,
-            verifyingContract,
-          )
-
-        | _ =>
-          Js.log("something important is null")
-          Js.log3(library, account, maticState)
-          ()
-        },
-      txState,
-    )
-  | Client.MainnetQuery => (
-      (value: string) => {
-        let value = parseUnits(. value, 0)
-
-        setTxState(_ => Created)
-        switch optSteward {
-        | Some(steward) =>
-          let updateDepositPromise = steward.depositWei(. {
-            gasLimit: "500302", //calculateGasMargin(estimatedGasLimit, GAS_MARGIN),
-            value: value,
-          })->Promise.Js.toResult
-          updateDepositPromise->Promise.getOk(tx => {
-            setTxState(_ => SignedAndSubmitted(tx.hash))
-            let txMinedPromise = tx.wait(.)->Promise.Js.toResult
-            txMinedPromise->Promise.getOk(txOutcome => setTxState(_ => Complete(txOutcome)))
-            txMinedPromise->Promise.getError(_error => setTxState(_ => Failed))
-            ()
-          })
-          updateDepositPromise->Promise.getError(error =>
-            Js.log("error processing transaction: " ++ error.message)
-          )
-          ()
-        | None => ()
-        }
-      },
-      txState,
-    )
-  }
-}
-
-let useWithdrawDeposit = (~chain, library: option<Web3.web3Library>, account, parentChainId) => {
-  let (txState, setTxState) = React.useState(() => UnInitialised)
-
-  let optSteward = useStewardContract()
-
-  let chainIdInt = parentChainId->getChildChainId
-  let spender = getStewardAddress(chain, chainIdInt)
-
-  switch chain {
-  | Client.Neither
-  | Client.MaticQuery => (
-      amountToWithdraw =>
-        switch (library, account) {
-        | (Some(lib), Some(account)) =>
-          {
-            let web3 = Web3.new_(lib.provider)
-
-            let steward = Web3.Contract.MaticSteward.getStewardContract(web3, spender)
-
-            (steward->Web3.Contract.MaticSteward.withdrawDeposit(amountToWithdraw)).send({
-              from: account,
-            })
-          }
-          ->Js.Promise.catch(err => {
-            Js.log2("this error was caught", err)
-            Js.Promise.resolve(""->Obj.magic)
-          }, _)
-          ->ignore
-        | _ => ()
-        },
-      txState,
-    )
-  | Client.MainnetQuery => (
-      amountToWithdraw => {
-        let value = parseUnits(. "0", 0)
-        let amountToWithdrawEncoded = parseUnits(. amountToWithdraw, 0)
-
-        setTxState(_ => Created)
-        switch optSteward {
-        | Some(steward) =>
-          let updateDepositPromise = steward.withdrawDeposit(.
-            amountToWithdrawEncoded,
-            {
-              gasLimit: "500302", //calculateGasMargin(estimatedGasLimit, GAS_MARGIN),
-              value: value,
-            },
-          )->Promise.Js.toResult
-          updateDepositPromise->Promise.getOk(tx => {
-            setTxState(_ => SignedAndSubmitted(tx.hash))
-            let txMinedPromise = tx.wait(.)->Promise.Js.toResult
-            txMinedPromise->Promise.getOk(txOutcome => {
-              Js.log(txOutcome)
-              setTxState(_ => Complete(txOutcome))
-            })
-            txMinedPromise->Promise.getError(error => {
-              setTxState(_ => Failed)
-              Js.log(error)
-            })
-            ()
-          })
-          updateDepositPromise->Promise.getError(error => setTxState(_ => Declined(error.message)))
-          ()
-        | None => ()
-        }
-      },
-      txState,
-    )
-  }
-}
-
-let useUserLoyaltyTokenBalance = (address: Web3.ethAddress) => {
-  let (result, setResult) = React.useState(() => None)
-  let (counter, setCounter) = React.useState(() => 0)
-
-  let optSteward = useLoyaltyTokenContract()
-
-  React.useEffect4(() => {
-    switch optSteward {
-    | Some(steward) =>
-      let _ = %Async({
-        let balance = steward.balanceOf(. address)
-        let balanceString = balance->ethersBnToString
-        setResult(_ => Some(BN.new_(balanceString)))
-        ()->async
-      })
-    | None => ()
-    }
-    None
-  }, (counter, setResult, optSteward, address))
-
-  (result, () => setCounter(_ => counter + 1))
-}
-
-let useChangePrice = animal => {
-  let animalId = TokenId.toString(animal)
-  let (txState, setTxState) = React.useState(() => UnInitialised)
-
-  let optSteward = useStewardContract()
-
-  (
-    newPrice => {
-      let value = parseUnits(. "0", 0)
-      let newPriceEncoded = parseUnits(. newPrice, 0)
-
-      setTxState(_ => Created)
-      switch optSteward {
-      | Some(steward) =>
-        let updatePricePromise = steward.changePrice(.
-          animalId,
-          newPriceEncoded,
-          {
-            gasLimit: "500302", //calculateGasMargin(estimatedGasLimit, GAS_MARGIN),
-            value: value,
-          },
-        )->Promise.Js.toResult
-        updatePricePromise->Promise.getOk(tx => {
-          setTxState(_ => SignedAndSubmitted(tx.hash))
-          let txMinedPromise = tx.wait(.)->Promise.Js.toResult
-          txMinedPromise->Promise.getOk(txOutcome => {
-            Js.log(txOutcome)
-            setTxState(_ => Complete(txOutcome))
-          })
-          txMinedPromise->Promise.getError(error => {
-            setTxState(_ => Failed)
-            Js.log(error)
-          })
-          ()
-        })
-        updatePricePromise->Promise.getError(error => setTxState(_ => Declined(error.message)))
-        ()
-      | None => ()
-      }
-    },
-    txState,
-  )
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ContractUtil.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ContractUtil.res
deleted file mode 100644
index 9e9f665..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ContractUtil.res
+++ /dev/null
@@ -1,42 +0,0 @@
-let getProviderOrSigner = (library: Web3.web3Library, account: option<Web3.ethAddress>) =>
-  switch account {
-  | Some(account) => library.getSigner(. account)
-  | None => library
-  }
-
-type arrayOfValues
-type sha3Result
-@send external sha3ToString: (sha3Result, string) => string = "toString"
-@module("ethereumjs-abi")
-external soliditySHA3: (array<string>, arrayOfValues) => sha3Result = "soliditySHA3"
-
-type buffer
-@module("ethereumjs-util")
-external toBuffer: string => buffer = "toBuffer"
-
-let constructMetaTransactionMessage: (string, string, string, string) => string = (
-  nonce,
-  chainId,
-  functionSignature,
-  contractAddress,
-) =>
-  "0x" ++
-  soliditySHA3(
-    ["uint256", "address", "uint256", "bytes"],
-    (nonce, contractAddress, chainId, toBuffer(functionSignature))->Obj.magic,
-  )->sha3ToString("hex")
-
-type ethSig = {
-  r: string,
-  s: string,
-  v: int,
-}
-
-@send external slice: (string, int, int) => string = "slice"
-@val external parseInt: (string, int) => int = "parseInt"
-
-let getEthSig = sigString => {
-  r: sigString->slice(0, 66),
-  s: "0x" ++ sigString->slice(66, 130),
-  v: parseInt(sigString->slice(130, 132), 16),
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/CoreConcepts.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/CoreConcepts.res
deleted file mode 100644
index 91fac82..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/CoreConcepts.res
+++ /dev/null
@@ -1,53 +0,0 @@
-let gorillaOnVine = "/img/wildcardsimages/gorilla-on-vine.png"
-
-open Globals
-open Rimble
-
-module CoreConcepts = {
-  @react.component
-  let make = () => {
-    let usedtranslationModeContext = ReactTranslate.useTranslationModeContext()
-    let translation = ReactTranslate.useTranslate(. usedtranslationModeContext.translationMode)
-
-    <Box className=Styles.infoBackground>
-      <Flex flexWrap="wrap">
-        <Box width=[0.28] className=Styles.animalImage>
-          <img src=gorillaOnVine width="100%" />
-        </Box>
-        <Box width=[1., 1., 0.59] className=Styles.infoCardContainer>
-          <Card className=Styles.infoCardStyles>
-            <Heading className=Styles.centerText _as="h2" fontSize=5>
-              {"Core Concepts"->restr}
-            </Heading>
-            <br />
-            <hr />
-            <br />
-            <Heading _as="h3"> {translation(. "nft")->restr} </Heading>
-            <br />
-            <Text>
-              {"A "->restr}
-              <strong> {translation(. "nft")->restr} </strong>
-              {translation(. "whatIsANFT")->restr}
-            </Text>
-            <br />
-            <Heading _as="h3"> {"Always for Sale"->restr} </Heading>
-            <br />
-            <Text>
-              {"When an asset is bought a new selling price is stipulated by the buyer. Assets are "->restr}
-              <strong> {"Always for Sale"->restr} </strong>
-              {", forever!"->restr}
-            </Text>
-            <br />
-            <Heading _as="h3"> {translation(. "harbergerTax")->restr} </Heading>
-            <br />
-            <Text>
-              {"The owner of an asset pays a "->restr}
-              <strong> {translation(. "harbergerTax")->restr} </strong>
-              {"  which is a percentage of the selling price they stipulate."->restr}
-            </Text>
-          </Card>
-        </Box>
-      </Flex>
-    </Box>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/CountDown.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/CountDown.res
deleted file mode 100644
index 3ba4668..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/CountDown.res
+++ /dev/null
@@ -1,90 +0,0 @@
-open Globals
-
-type timeUnit = {
-  decimal: int,
-  unit: string,
-}
-
-@send external padStart: (string, int, int) => string = "padStart"
-
-let culculateUnitAmount = ((remainingSeconds, timeStructure), secondsInUnit, unitStr): (
-  int,
-  list<timeUnit>,
-) =>
-  if remainingSeconds >= secondsInUnit {
-    let unitCount = remainingSeconds / secondsInUnit
-    let remainingSeconds = remainingSeconds - unitCount * secondsInUnit
-    (remainingSeconds, timeStructure->List.add({decimal: unitCount, unit: unitStr}))
-  } else {
-    (remainingSeconds, timeStructure)
-  }
-
-// NOTE: this rounds off the solar year to the nearest day (ie it is off by 5 hours 48 minutes 46 seconds)
-// 365 * 24 * 60 * 60
-let secondsInAYear = 31536000
-// (365 * 24 * 60 * 60) / 12
-let secondsInAMonth = 2628000
-// 24 * 60 * 60
-let secondsInADay = 86400
-let secondsInAHour = 3600
-let secondsInAMinute = 60
-
-let calculateTimeRemainingTillHoursFromSeconds = numSeconds =>
-  (numSeconds, list{})
-  ->culculateUnitAmount(secondsInAYear, "year")
-  ->culculateUnitAmount(secondsInAMonth, "month")
-  ->culculateUnitAmount(secondsInADay, "day")
-  ->culculateUnitAmount(secondsInAHour, "hour")
-
-let calculateTimeRemainingFromSeconds = numSeconds => {
-  let (_, durationStructure) =
-    numSeconds
-    ->calculateTimeRemainingTillHoursFromSeconds
-    ->culculateUnitAmount(secondsInAMinute, "minute")
-    ->culculateUnitAmount(1, "second")
-  durationStructure
-}
-
-let displayTimeLeft = durationStructure =>
-  durationStructure->Belt.List.reduce("", (acc, item) => {
-    let display =
-      item.decimal->string_of_int ++ (" " ++ (item.unit ++ (item.decimal > 1 ? "s " : " ")))
-    display ++ acc
-  })
-
-let displayTimeLeftSimple = durationStructure => {
-  let (displayStr, _) = durationStructure->Belt.List.reduce(("", ""), ((acc, spacer), item) => {
-    let display = item.decimal->string_of_int->padStart(0, 2)
-    (display ++ (spacer ++ acc), ":")
-  })
-  displayStr
-}
-
-let displayTimeLeftHours = remainingTime => {
-  let (_, durationStructure) = remainingTime->calculateTimeRemainingTillHoursFromSeconds
-  durationStructure->displayTimeLeft
-}
-
-let calculateCountdown = endDateMoment =>
-  Int.fromFloat(MomentRe.diff(endDateMoment, MomentRe.momentNow(), #seconds))
-
-@react.component
-let make = (~endDateMoment, ~displayUnits=true) => {
-  let (countDown, setCountdown) = React.useState(() => 0)
-
-  React.useEffect2(() => {
-    let date = calculateCountdown(endDateMoment)
-    setCountdown(_ => date)
-    let interval = Js.Global.setInterval(() => {
-      let date = calculateCountdown(endDateMoment)
-      setCountdown(_ => date)
-    }, 1000)
-    Some(() => Js.Global.clearInterval(interval))
-  }, (endDateMoment, setCountdown))
-
-  <React.Fragment>
-    {displayUnits
-      ? countDown->calculateTimeRemainingFromSeconds->displayTimeLeft->restr
-      : countDown->calculateTimeRemainingFromSeconds->displayTimeLeftSimple->restr}
-  </React.Fragment>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/CustomerBenefit.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/CustomerBenefit.res
deleted file mode 100644
index e3fa891..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/CustomerBenefit.res
+++ /dev/null
@@ -1,13 +0,0 @@
-open Globals
-
-@react.component
-let make = () =>
-  <Rimble.Box className=Styles.horizantalBlueTile>
-    <p className=Styles.explainerLargeText>
-      <span className=Styles.boldExplainerText> {"Wildcards"->restr} </span>
-      {" connects global conservation organisations to users. "->restr}
-    </p>
-    <p className=Styles.explainerMediumText>
-      {"Social, gamified and transparent giving makes wildcards the perfect platform to start making your difference."->restr}
-    </p>
-  </Rimble.Box>
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Dai.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Dai.res
deleted file mode 100644
index f7de311..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Dai.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type daiContract
-@send
-external getNonce: (daiContract, Web3.ethAddress) => Js.Promise.t<BN.t> = "getNonce"
-
-@new @module("ethers")
-external getContract: (Web3.ethAddress, Web3.abi, Web3.web3Library) => daiContract = "Contract"
-
-let getDaiContract = (daiAddress, stewardAbi, library, account) =>
-  getContract(daiAddress, stewardAbi, ContractUtil.getProviderOrSigner(library, account))
-
-@module("./abi/dai.json") external daiAbi: Web3.abi = "dai"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/DaiPermit.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/DaiPermit.res
deleted file mode 100644
index 4a89bf6..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/DaiPermit.res
+++ /dev/null
@@ -1,61 +0,0 @@
-@send external padStart: (string, int, string) => string = "padStart"
-let createPermitSig = (provider, verifyingContract, nonce, chainId, holder, spender) => {
-  open Web3
-  open Erc712
-
-  let domain = {
-    name: "(PoS) Dai Stablecoin",
-    // name: "Dai Stablecoin",
-    version: "1",
-    verifyingContract: verifyingContract,
-    salt: "0x" ++ chainId->BN.toStringRad(16)->padStart(64, "0"),
-  }
-
-  let message = {
-    "holder": holder,
-    "spender": spender,
-    "nonce": nonce,
-    "expiry": 0,
-    // "expiry": deadline,
-    "allowed": true,
-  }
-
-  let data = {
-    "types": {
-      "EIP712Domain": eip712Domain,
-      "Permit": permit,
-    },
-    "domain": domain,
-    "primaryType": "Permit",
-    "message": message,
-  }
-  let dataString = data->Obj.magic->Js.Json.stringifyAny->Option.getWithDefault("")
-
-  let exampleRpcDefinition = {
-    // method: "eth_signTypedData",
-    method: "eth_signTypedData_v3",
-    // params: [|from, data|],
-    params: [holder, dataString],
-    from: holder,
-  }
-
-  Js.Promise.make((~resolve, ~reject) =>
-    provider
-    ->Web3.sendAsync(exampleRpcDefinition, (. err, result) =>
-      switch err->Js.Nullable.toOption {
-      | Some(err) =>
-        Js.log2("There was an error", err)
-        reject(. err->Obj.magic)
-      | None =>
-        let sigString = result.result->Obj.magic
-
-        resolve(. ContractUtil.getEthSig(sigString))
-      }
-    )
-    ->ignore
-  )
-}
-
-type v = int
-type r = string
-type s = string
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Dapp.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Dapp.res
deleted file mode 100644
index 521b693..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Dapp.res
+++ /dev/null
@@ -1,822 +0,0 @@
-open Globals
-
-let flameImg = "/img/streak-flame.png"
-
-module ShareSocial = {
-  @module("./components/shareSocialMedia") @react.component
-  external make: unit => React.element = "default"
-}
-module EditButton = {
-  @react.component
-  let make = (~animal: TokenId.t) => {
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-    let isExplorer = Router.useIsExplorer()
-
-    <Rimble.Button
-      onClick={event => {
-        ReactEvent.Form.preventDefault(event)
-        clearAndPush(
-          "#" ++ (InputHelp.getPagePrefix(isExplorer) ++ ("details/" ++ animal->TokenId.toString)),
-        )
-      }}>
-      {React.string("Edit")}
-    </Rimble.Button>
-  }
-}
-
-module Streak = {
-  @react.component
-  let make = (~chain, ~animal: TokenId.t) => {
-    let animalName = \"||||"(QlHooks.useWildcardName(animal), "Loading")
-
-    let daysHeld = QlHooks.useDaysHeld(~chain, animal)
-
-    switch daysHeld {
-    | Some((daysHeldFloat, _timeAquired)) =>
-      let numDaysStr = daysHeldFloat->Js.Float.toFixed
-
-      <Rimble.Tooltip message=j`$animalName has been held for $numDaysStr days by the same owner.`>
-        <div id="inner" className=Styles.positionRelative>
-          <img className=Styles.flameImg src=flameImg />
-          <p className=Styles.streakText> <strong> {React.string(numDaysStr)} </strong> </p>
-        </div>
-      </Rimble.Tooltip>
-    | None => React.null
-    }
-  }
-}
-
-module DisplayAfterDate = {
-  @react.component
-  let make = (~endDateMoment, ~beforeComponent, ~afterComponent) => {
-    let isBeforeDate = React.useCallback1(
-      () => MomentRe.diff(endDateMoment, MomentRe.momentNow(), #seconds) > 0.,
-      [endDateMoment],
-    )
-
-    let (beforeDate, setIsBeforeDate) = React.useState(() => isBeforeDate())
-    React.useEffect2(() => {
-      let timeout = Js.Global.setTimeout(() => setIsBeforeDate(_ => isBeforeDate()), 1500)
-      Some(() => Js.Global.clearTimeout(timeout))
-    }, (setIsBeforeDate, isBeforeDate))
-
-    beforeDate ? beforeComponent : afterComponent
-  }
-}
-
-module AuctionDisplay = {
-  @react.component
-  let make = (~chain, ~launchTime, ~animal) => {
-    let currentPriceWei = Animal.useAuctionPriceWei(~chain, animal, launchTime)
-
-    let optCurrentUsdEthPrice = UsdPriceProvider.useUsdPrice()
-
-    <>
-      <ActionButtons.Auction animal />
-      <br />
-      <br />
-      {switch chain {
-      | Client.MaticQuery =>
-        <p className={Styles.noMarginTop ++ (" " ++ Styles.noMarginBottom)}>
-          {currentPriceWei->Option.mapWithDefault("Loading"->React.string, price => <>
-            {(price->Web3Utils.fromWeiBNToEthPrecision(~digits=4) ++ " USD")->React.string}
-            <small> {" (DAI)"->React.string} </small>
-          </>)}
-        </p>
-      | Client.Neither
-      | Client.MainnetQuery =>
-        let (priceEth, optPriceUsd) = PriceDisplay.priceWeiToTuple(
-          currentPriceWei->Option.getWithDefault(BN.new_("0")),
-          optCurrentUsdEthPrice,
-        )
-        <PriceDisplay.PurePriceDisplay priceEth optPriceUsd />
-      }}
-    </>
-  }
-}
-module AuctionDetails = {
-  @react.component
-  let make = (~chain, ~animal: TokenId.t) => {
-    let launchTimeOpt = QlHooks.useLaunchTimeBN(~chain, animal)
-    let foreclosureTimeOpt = QlHooks.useForeclosureTimeBn(~chain, animal->TokenId.toString)
-
-    switch (launchTimeOpt, foreclosureTimeOpt) {
-    | (Some(launchTime), Some(foreclosurTime)) =>
-      if foreclosurTime->BN.lt(launchTime) {
-        <AuctionDisplay chain animal launchTime />
-      } else {
-        <AuctionDisplay chain animal launchTime=foreclosurTime />
-      }
-    | (Some(launchTime), None) => <AuctionDisplay chain animal launchTime />
-    | (None, Some(foreclosureTime)) => <AuctionDisplay chain animal launchTime=foreclosureTime />
-    | (None, None) => <p> {"Loading"->React.string} </p>
-    }
-  }
-}
-
-module BasicAnimalDisplay = {
-  @react.component
-  let make = (~chain, ~animal: TokenId.t) => {
-    let owned = animal->QlHooks.useIsAnimalOwened(~chain)
-    let currentPatron = \"||||"(QlHooks.usePatron(~chain, animal), "Loading")
-    let displayName = UserProvider.useDisplayName(currentPatron)
-
-    let displayNameStr = UserProvider.displayNameToString(displayName)
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-    let nonUrlRouting = RootProvider.useNonUrlState()
-
-    let isOnAuction = Animal.useIsOnAuction(~chain, animal)
-
-    isOnAuction
-      ? <AuctionDetails chain animal />
-      : <>
-          {switch nonUrlRouting {
-          | UserVerificationScreen
-          | UpdateDepositScreen
-          | UpdatePriceScreen(_)
-          | BuyScreen(_)
-          | AuctionScreen(_) => React.null
-          | LoginScreen(_)
-          | NoExtraState =>
-            owned ? <EditButton animal /> : <ActionButtons.Buy animal chain />
-          }}
-          <br />
-          <br />
-          <PriceDisplay chain animal />
-          <a
-            onClick={e => {
-              ReactEvent.Mouse.preventDefault(e)
-              clearAndPush(j`/#user/$currentPatron`)
-            }}>
-            {displayNameStr->restr}
-          </a>
-        </>
-  }
-}
-
-module SquareBox = {
-  // Css taken from here: https://spin.atomicobject.com/2015/07/14/css-responsive-square/
-  @react.component
-  let make = (~children) =>
-    <div
-      className={
-        open Css
-        style(list{
-          width(#percent(100.)),
-          position(relative),
-          after(list{unsafe("content", "\"\""), display(block), paddingBottom(#percent(100.))}),
-        })
-      }>
-      <div
-        className={
-          open Css
-          style(list{position(absolute), width(#percent(100.)), height(#percent(100.))})
-        }>
-        children
-      </div>
-    </div>
-}
-
-module AnimalOnLandingPage = {
-  @react.component
-  let make = (
-    ~animal: TokenId.t,
-    ~scalar: float=1.,
-    ~chain,
-    ~enlargement: float=1.,
-    ~optionEndDateMoment: option<MomentRe.Moment.t>,
-    ~isGqlLoaded,
-  ) => {
-    let name = \"||||"(QlHooks.useWildcardName(animal), "Loading")
-    let isExplorer = Router.useIsExplorer()
-
-    let orgBadge = Animal.useGetOrgBadgeImage(~tokenId=animal)
-    let orgId = \"||||"(QlHooks.useWildcardOrgId(~tokenId=animal), "")
-
-    let currentPriceWei = QlHooks.usePrice(~chain, animal)
-
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-    let image = Animal.useAvatar(animal)
-
-    let normalImage = () =>
-      <SquareBox>
-        <img
-          className={
-            open Css
-            style(list{width(#percent(100.)), height(#percent(100.)), objectFit(#contain)})
-          }
-          src=image
-        />
-      </SquareBox>
-
-    let isOnAuction = Animal.useIsOnAuction(~chain, animal)
-
-    let componentWithoutImg = (img, ~hideBadges: bool) =>
-      <SquareBox>
-        <div className={Styles.headerImg(enlargement, scalar)}> {img()} </div>
-        {if hideBadges {
-          React.null
-        } else {
-          <>
-            {isGqlLoaded
-              ? switch optionEndDateMoment {
-                | Some(_endDateMoment) => React.null
-                | None =>
-                  isOnAuction
-                    ? React.null
-                    : switch currentPriceWei {
-                      | Price(_) =>
-                        <div className=Styles.overlayFlameImg> <Streak chain animal /> </div>
-                      | Loading
-                      | Foreclosed(_) => React.null
-                      }
-                }
-              : React.null}
-            <div
-              onClick={e => {
-                ReactEvent.Mouse.stopPropagation(e)
-                ReactEvent.Mouse.preventDefault(e)
-                clearAndPush("#org/" ++ orgId)
-              }}
-              className={Styles.overlayBadgeImg(~x=100., ~y=80.)}>
-              <img className=Styles.flameImg src=orgBadge />
-            </div>
-          </>
-        }}
-      </SquareBox>
-
-    <div
-      id="animalBox"
-      className={
-        open Css
-        style(list{textAlign(center)})
-      }>
-      <a
-        className=Styles.clickableLink
-        onClick={event => {
-          ReactEvent.Mouse.preventDefault(event)
-          clearAndPush(
-            "#" ++
-            (InputHelp.getPagePrefix(isExplorer) ++
-            ("details/" ++ animal->TokenId.toString)),
-          )
-        }}>
-        {componentWithoutImg(normalImage, ~hideBadges=false)}
-        <div> <h2> {React.string(name)} </h2> </div>
-      </a>
-      {switch optionEndDateMoment {
-      | Some(endDateMoment) =>
-        <div>
-          <h3 className=Styles.colorGreen> {React.string("COMING IN")} </h3>
-          <CountDown endDateMoment displayUnits=false />
-        </div>
-      | None => isGqlLoaded ? <div> <BasicAnimalDisplay chain animal /> </div> : React.null
-      }}
-    </div>
-  }
-}
-
-module CarouselAnimal = {
-  @react.component
-  let make = (~animal: TokenId.t, ~scalar, ~enlargement: float=1., ~isGqlLoaded=true, ~chain) => {
-    let isLaunched = animal->Animal.useIsLaunched(~chain)
-
-    let makeAnimalOnLandingPage = optionEndDateMoment =>
-      <AnimalOnLandingPage animal chain scalar optionEndDateMoment enlargement isGqlLoaded />
-    switch isLaunched {
-    | Animal.LaunchDate(endDateMoment) =>
-      <DisplayAfterDate
-        endDateMoment
-        afterComponent={makeAnimalOnLandingPage(None)}
-        beforeComponent={makeAnimalOnLandingPage(Some(endDateMoment))}
-      />
-    | Animal.Launched => makeAnimalOnLandingPage(None)
-    | Animal.Loading => makeAnimalOnLandingPage(None)
-    }
-  }
-}
-
-module AnimalCarousel = {
-  @react.component
-  let make = (~isGqlLoaded) => {
-    let (carouselIndex, setCarouselIndex) = React.useState(() => 17)
-    let homePageAnimals = QlHooks.useHomePageAnimalArray()
-    let numItems = homePageAnimals->Array.length
-    // let numItems = Animal.orderedArray->Array.length;
-
-    <Rimble.Box className=Styles.positionRelative>
-      <Carousel
-        className=Styles.carousel
-        slidesPerPage=5
-        centered=true
-        value=carouselIndex
-        animationSpeed=1000
-        infinite=true
-        autoPlay=5000
-        arrowLeft={<span
-          className={Styles.carouselArrow(true)}
-          onClick={event => {
-            ReactEvent.Mouse.preventDefault(event)
-            setCarouselIndex(_ => carouselIndex - 1)
-            ReactEvent.Mouse.stopPropagation(event)
-          }}>
-          {`◄`->React.string}
-        </span>}
-        arrowRight={<span
-          className={Styles.carouselArrow(false)}
-          onClick={event => {
-            ReactEvent.Mouse.preventDefault(event)
-            setCarouselIndex(_ => carouselIndex + 1)
-            ReactEvent.Mouse.stopPropagation(event)
-          }}>
-          {`►`->React.string}
-        </span>}
-        arrows=true
-        onChange={test => setCarouselIndex(_ => test)}>
-        {React.array(
-          homePageAnimals->Array.mapWithIndex((index, animalInfo) => {
-            let (opacity, scalar) = switch index {
-            | x if x == mod(carouselIndex, numItems) => (1., 1.0)
-            | x
-              if x == mod(carouselIndex - 1, numItems) || x == mod(carouselIndex + 1, numItems) => (
-                0.8,
-                0.8,
-              )
-            | x
-              if x == mod(carouselIndex - 2, numItems) || x == mod(carouselIndex + 2, numItems) => (
-                0.1,
-                0.7,
-              )
-            | _ => (0., 0.6)
-            }
-
-            <div key={animalInfo.id->TokenId.toString} className={Styles.fadeOut(opacity)}>
-              <CarouselAnimal
-                animal=animalInfo.id
-                chain={animalInfo.id->Animal.getChainIdFromAnimalId}
-                isGqlLoaded
-                scalar
-                enlargement=1.
-              />
-            </div>
-          }),
-        )}
-      </Carousel>
-    </Rimble.Box>
-  }
-}
-
-module AnimalActionsOnDetailsPage = {
-  module Unowned = {
-    @react.component
-    let make = (~chain, ~animal, ~price) => <>
-      {switch animal->Animal.useIsLaunched(~chain) {
-      | LaunchDate(endDateMoment) =>
-        <DisplayAfterDate
-          endDateMoment
-          afterComponent={price()}
-          beforeComponent={<React.Fragment> <CountDown endDateMoment /> </React.Fragment>}
-        />
-      | Launched => price()
-      | Loading => <Rimble.Loader />
-      }}
-    </>
-  }
-
-  @react.component
-  let make = (~chain, ~animal) => {
-    let owned = animal->QlHooks.useIsAnimalOwened(~chain)
-    // let currentAccount =
-    //   RootProvider.useCurrentUser()->mapWithDefault("loading", a => a);
-    let currentPatron = \"||||"(QlHooks.usePatron(~chain, animal), "Loading")
-    let displayName = UserProvider.useDisplayName(currentPatron)
-    let displayNameStr = UserProvider.displayNameToString(displayName)
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-    let nonUrlRouting = RootProvider.useNonUrlState()
-    let isOnAuction = Animal.useIsOnAuction(~chain, animal)
-
-    let price = () =>
-      isOnAuction
-        ? <AuctionDetails chain animal />
-        : <React.Fragment>
-            <a
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                clearAndPush(j`/#user/$currentPatron`)
-              }}>
-              {displayNameStr->restr}
-            </a>
-            <PriceDisplay chain animal />
-            {switch nonUrlRouting {
-            | UserVerificationScreen
-            | UpdateDepositScreen
-            | UpdatePriceScreen(_)
-            | BuyScreen(_)
-            | AuctionScreen(_) => React.null
-            | LoginScreen(_)
-            | NoExtraState =>
-              <ActionButtons.Buy chain animal />
-            }}
-          </React.Fragment>
-
-    if owned {
-      <React.Fragment>
-        <PriceDisplay animal chain />
-        <ActionButtons.UpdatePrice animal />
-        <br />
-        <ActionButtons.UpdateDeposit />
-        <br />
-        // {UserProvider.useIsUserValidated(currentAccount)
-        //    ? <ShareSocial /> : <Validate />}
-        <Validate />
-      </React.Fragment>
-    } else {
-      <Unowned chain animal price />
-    }
-  }
-}
-
-module DetailsViewAnimal = {
-  @react.component
-  let make = (~chain, ~animal: TokenId.t) => {
-    let orgId = \"||||"(QlHooks.useWildcardOrgId(~tokenId=animal), "")
-
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-    let image = Animal.useAvatar(animal)
-    let optArtistInfo = QlHooks.useWildcardArtist(animal)
-
-    let ownedAnimalImg = {
-      open Css
-      style(list{
-        position(absolute),
-        zIndex(1),
-        maxWidth(#percent(100.)),
-        top(#percent(50.)),
-        transform(translate(#percent(-50.), #percent(-50.))),
-        left(#percent(50.)),
-      })
-    }
-
-    let normalImage = () => <img className=ownedAnimalImg src=image />
-    let orgBadge = Animal.useGetOrgBadgeImage(~tokenId=animal)
-
-    let displayAnimal = animalImage =>
-      <SquareBox>
-        {animalImage()}
-        {optArtistInfo->Option.mapWithDefault(React.null, artistInfo =>
-          <p
-            className={
-              open Css
-              style(list{
-                position(absolute),
-                bottom(#percent(2.)),
-                textAlign(center),
-                width(#percent(100.)),
-              })
-            }>
-            {"Art by: "->React.string}
-            <a
-              onClick={e => {
-                ReactEvent.Mouse.preventDefault(e)
-                clearAndPush("/#artist/" ++ artistInfo.id)
-              }}>
-              {artistInfo.name->React.string}
-            </a>
-          </p>
-        )}
-        <div
-          onClick={e => {
-            ReactEvent.Mouse.stopPropagation(e)
-            ReactEvent.Mouse.preventDefault(e)
-            clearAndPush("#org/" ++ orgId)
-          }}
-          className={Styles.overlayBadgeImg(~x=80., ~y=80.)}>
-          <img className=Styles.flameImg src=orgBadge />
-        </div>
-      </SquareBox>
-
-    <React.Fragment>
-      {displayAnimal(() => normalImage())}
-      <h2> {\"||||"(QlHooks.useWildcardName(animal), "Loading")->restr} </h2>
-      <AnimalActionsOnDetailsPage chain animal />
-    </React.Fragment>
-  }
-}
-
-module DetailsView = {
-  @react.component
-  let make = (~chain, ~optionAnimal: option<TokenId.t>) => {
-    %log.info(
-      "optionAnimal"
-      ("a", optionAnimal)
-    )
-
-    switch optionAnimal {
-    | None =>
-      <div>
-        <h1> {React.string("We are unable to find that animal in our system.")} </h1>
-        <p> {"Please check the spelling and try again."->restr} </p>
-      </div>
-    | Some(animal) => <DetailsViewAnimal chain animal />
-    }
-  }
-}
-
-module DefaultLook = {
-  @react.component
-  let make = (~isGqlLoaded) => {
-    let url = ReasonReactRouter.useUrl()
-
-    <div className=Styles.centerText>
-      {switch Js.String.split("/", url.hash) {
-      | ["details", animalStr]
-      | ["explorer", "details", animalStr]
-      | ["explorer", "details", animalStr, ""] =>
-        %log.info(
-          "the animalString"
-          ("a", animalStr)
-        )
-        let optionAnimal = TokenId.make(animalStr)
-        let chain =
-          optionAnimal->Option.mapWithDefault(Client.MainnetQuery, Animal.getChainIdFromAnimalId)
-
-        <DetailsView chain optionAnimal={TokenId.make(animalStr)} />
-      | _ =>
-        <React.Fragment>
-          <AnimalCarousel isGqlLoaded />
-          <Rimble.Box className=Styles.dappImagesCounteractOffset>
-            {isGqlLoaded ? <TotalRaised /> : React.null}
-          </Rimble.Box>
-        </React.Fragment>
-      }}
-    </div>
-  }
-}
-
-module DefaultLeftPanel = {
-  @react.component
-  let make = () => {
-    let translationModeContext = ReactTranslate.useTranslationModeContext()
-    let translation = ReactTranslate.useTranslate(. translationModeContext.translationMode)
-    <React.Fragment>
-      <h1 className=Styles.heading>
-        <span className=Styles.colorBlue> {translation(. "bluetext")->restr} </span>
-        <br />
-        {translation(. "ethereum")->restr}
-        <br />
-        <span className=Styles.colorGreen> {"conservation"->restr} </span>
-        {(" " ++ translation(. "tokens"))->restr}
-      </h1>
-      <hr />
-      <h3 className=Styles.subHeading> {translation(. "subHeading")->restr} </h3>
-    </React.Fragment>
-  }
-}
-
-module UnlaunchedAnimalInfo = {
-  @react.component
-  let make = (~chain, ~endDateMoment, ~animal: TokenId.t) => {
-    let animalName = \"||||"(QlHooks.useWildcardName(animal), "Loading")
-
-    let ratio = QlHooks.usePledgeRate(~chain, animal)
-    let monthlyRate = Js.Float.toString(ratio *. 100.)
-
-    <DisplayAfterDate
-      endDateMoment
-      afterComponent={<Info chain tokenId=animal />}
-      beforeComponent={<React.Fragment>
-        <h2> {"This animal will launch in:"->React.string} </h2>
-        <CountDown endDateMoment />
-        <br />
-        <br />
-        <br />
-        {if ratio == 0. {
-          <p> {"The monthly pledge rate will be revealed at launch."->restr} </p>
-        } else {
-          <>
-            <small>
-              <strong>
-                {"Monthly Pledge Rate:"->restr}
-                <Rimble.Tooltip
-                  message={"This is the monthly percentage contribution of " ++
-                  (animalName ++
-                  "'s sale price that will go towards conservation of at risk animals. This is deducted continuously from the deposit and paid by the owner of the animal")}
-                  placement="top">
-                  <span> {`ⓘ`->restr} </span>
-                </Rimble.Tooltip>
-              </strong>
-            </small>
-            <br />
-            {(monthlyRate ++ " %")->restr}
-          </>
-        }}
-      </React.Fragment>}
-    />
-  }
-}
-
-module AnimalInfo = {
-  @react.component
-  let make = (~chain, ~animal: TokenId.t) => {
-    let animalDescription = \"||||"(QlHooks.useWildcardDescription(animal), ["Loading"])
-    let optAnimalMedia = animal->Animal.useAlternateImage
-
-    let animalStatus = animal->Animal.useTokenStatus(~chain)
-
-    // TODO: the ethereum address is really terribly displayed. But the default in Rimble UI includes a QR code scanner (which is really ugly).
-    // https://rimble.consensys.design/components/rimble-ui/EthAddress#props
-    // https://github.com/ConsenSys/rimble-ui/blob/dd470f00374a05c860b558a2cb9317861e4a0d89/src/EthAddress/index.js (maybe make a PR here with some changes)
-    <Rimble.Box m=5>
-      <ReactTabs>
-        <ReactTabs.TabList>
-          <ReactTabs.Tab> {"Story"->React.string} </ReactTabs.Tab>
-          <ReactTabs.Tab> {"Details"->React.string} </ReactTabs.Tab>
-          {optAnimalMedia->mapd(React.null, _ =>
-            <ReactTabs.Tab> {"Media"->React.string} </ReactTabs.Tab>
-          )}
-        </ReactTabs.TabList>
-        <ReactTabs.TabPanel>
-          <h2> {"Story"->React.string} </h2>
-          <div
-            className={
-              open Css
-              style(list{maxHeight(#em(26.)), overflow(#scroll)})
-            }>
-            {React.array(
-              animalDescription->Array.mapWithIndex((i, paragraphText) =>
-                <p key={i->string_of_int}> {paragraphText->React.string} </p>
-              ),
-            )}
-          </div>
-          {animal->TokenId.toString == "13"
-          // Glen
-            ? <a href="/#dao">
-                <span
-                  className={
-                    open Css
-                    style(list{color(hex("72c7d7"))})
-                  }>
-                  {"Vote for your favourite conservation"->restr}
-                </span>
-              </a>
-            : React.null}
-        </ReactTabs.TabPanel>
-        // [@warning "-102"]
-        <ReactTabs.TabPanel>
-          {switch animalStatus {
-          | Loading => <Rimble.Loader />
-          | WaitingForLaunch(endDateMoment) => <UnlaunchedAnimalInfo chain endDateMoment animal />
-          | Launched(auctionStartTime) =>
-            <Info.Auction chain auctionStartTime abandoned=false tokenId=animal />
-          | Foreclosed(auctionStartTime) =>
-            <Info.Auction chain auctionStartTime abandoned=true tokenId=animal />
-          | Owned(_) => <Info chain tokenId=animal />
-          }}
-        </ReactTabs.TabPanel>
-        <ReactTabs.TabPanel>
-          {optAnimalMedia->mapd(React.null, media =>
-            <img
-              className={
-                open Css
-                style(list{width(#percent(100.))})
-              }
-              src={CONSTANTS.cdnBase ++ media}
-            />
-          )}
-        </ReactTabs.TabPanel>
-      </ReactTabs>
-    </Rimble.Box>
-  }
-}
-
-@react.component
-let make = (~currentAnimal) => {
-  // let isGqlLoaded = QlStateManager.useIsInitialized();
-  let isGqlLoaded = true
-  let nonUrlRouting = RootProvider.useNonUrlState()
-  let clearNonUrlState = RootProvider.useClearNonUrlState()
-  let isDetailView = Router.useIsDetails()
-  let optAnimalForDetails = Router.useAnimalForDetails()
-
-  <Rimble.Flex flexWrap={isDetailView ? "wrap-reverse" : "wrap"} alignItems="start">
-    <Rimble.Box p=1 width=[1., 1., 0.5]>
-      <React.Fragment>
-        {switch nonUrlRouting {
-        | LoginScreen(_followOnAction) => <Login />
-        | BuyScreen(animal) =>
-          <div
-            className={
-              open Css
-              style(list{position(#relative)})
-            }>
-            <Rimble.Button.Text
-              icononly=true
-              icon="Close"
-              color="moon-gray"
-              position="absolute"
-              top=0
-              right=0
-              m=1
-              onClick={_ => clearNonUrlState()}
-            />
-            <Buy chain={Animal.getChainIdFromAnimalId(animal)} tokenId=animal />
-          </div>
-        | AuctionScreen(animal) =>
-          <div
-            className={
-              open Css
-              style(list{position(#relative)})
-            }>
-            <Rimble.Button.Text
-              icononly=true
-              icon="Close"
-              color="moon-gray"
-              position="absolute"
-              top=0
-              right=0
-              m=1
-              onClick={_ => clearNonUrlState()}
-            />
-            <Buy chain={Animal.getChainIdFromAnimalId(animal)} tokenId=animal />
-          </div>
-        | UserVerificationScreen =>
-          <div
-            className={
-              open Css
-              style(list{position(#relative)})
-            }>
-            <Rimble.Button.Text
-              icononly=true
-              icon="Close"
-              color="moon-gray"
-              position="absolute"
-              top=0
-              right=0
-              m=1
-              onClick={_ => clearNonUrlState()}
-            />
-            <React.Suspense fallback={<Rimble.Loader />}> <LazyThreeBoxUpdate /> </React.Suspense>
-          </div>
-        | UpdateDepositScreen =>
-          <div
-            className={
-              open Css
-              style(list{position(#relative)})
-            }>
-            <Rimble.Button.Text
-              icononly=true
-              icon="Close"
-              color="moon-gray"
-              position="absolute"
-              top=0
-              right=0
-              m=1
-              onClick={_ => clearNonUrlState()}
-            />
-            <UpdateDeposit
-              chain={currentAnimal->Option.mapWithDefault(
-                Client.MainnetQuery,
-                Animal.getChainIdFromAnimalId,
-              )}
-              closeButtonText="Back to animal view"
-            />
-          </div>
-        | UpdatePriceScreen(animal) =>
-          <div
-            className={
-              open Css
-              style(list{position(#relative)})
-            }>
-            <Rimble.Button.Text
-              icononly=true
-              icon="Close"
-              color="moon-gray"
-              position="absolute"
-              top=0
-              right=0
-              m=1
-              onClick={_ => clearNonUrlState()}
-            />
-            <UpdatePrice chain={Animal.getChainIdFromAnimalId(animal)} tokenId=animal />
-          </div>
-        | NoExtraState =>
-          switch optAnimalForDetails {
-          | Some(animal) => <AnimalInfo chain={Animal.getChainIdFromAnimalId(animal)} animal />
-          | None => <DefaultLeftPanel />
-          }
-        }}
-      </React.Fragment>
-    </Rimble.Box>
-    <Rimble.Box
-      p=1
-      className={
-        open Css
-        style(list{media("(max-width: 831px)", list{overflow(#hidden)})})
-      }
-      width=[1., 1., 0.5]>
-      <DefaultLook isGqlLoaded />
-    </Rimble.Box>
-  </Rimble.Flex>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/DiscordChat.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/DiscordChat.res
deleted file mode 100644
index 2064529..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/DiscordChat.res
+++ /dev/null
@@ -1,63 +0,0 @@
-@react.component
-let make = () => {
-  let (showChat, setShowChat) = React.useState(_ => false)
-  <div
-    className={
-      open Css
-      style(list{position(#fixed), bottom(px(10)), right(px(10)), zIndex(1000)})
-    }>
-    {showChat
-      ? <div
-          className={
-            open Css
-            style(list{position(#relative)})
-          }>
-          <div
-            className={
-              open Css
-              style(list{
-                height(px(50)),
-                width(px(50)),
-                marginLeft(#auto),
-                backgroundColor(hex("CCCCCCCC")),
-                borderRadius(#percent(50.)),
-                marginBottom(0.2->rem),
-                selector(":hover", list{important(backgroundColor(hex("6CAD3DCC")))}),
-              })
-            }
-            onClick={_ => setShowChat(_ => false)}>
-            <div
-              className={
-                open Css
-                style(list{
-                  padding(1.->rem),
-                  fontSize(16->px),
-                  transform(translateX(px(3))),
-                  color(white),
-                })
-              }>
-              {`✖`->React.string}
-            </div>
-          </div>
-          <iframe
-            src="https://discordapp.com/widget?id=723502058426073108&theme=dark"
-            width="350"
-            height="500"
-            sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"
-            className={
-              open Css
-              style(list{borderWidth(px(0))})
-            }
-          />
-        </div>
-        //Add close button above here
-      : <img
-          src="/img/icons/discord.svg"
-          className={
-            open Css
-            style(list{height(px(50)), width(px(50)), marginLeft(#auto)})
-          }
-          onClick={_ => setShowChat(_ => true)}
-        />}
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/EmailSignup.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/EmailSignup.res
deleted file mode 100644
index bc18e69..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/EmailSignup.res
+++ /dev/null
@@ -1,42 +0,0 @@
-let gorillaOnVine = "/img/wildcardsimages/gorilla-on-vine.png"
-
-open Globals
-open Rimble
-
-@react.component
-let make = () =>
-  <div className=Styles.horizantalBlueTile id="signup">
-    <Box className=Styles.floatingSignupBox>
-      <Flex flexWrap="wrap" alignItems="center" className=Styles.floatingSignupBoxInner>
-        <Box className=Styles.emailTextBox width=[1., 1., 0.4]>
-          <p className=Styles.emailSignupHeader>
-            <strong> {"Want to stay in the loop?"->restr} </strong>
-          </p>
-          <span> {"Sign up for our newsletter"->restr} </span>
-          <br />
-          <br />
-        </Box>
-        <Box width=[1., 1., 0.55]>
-          <Rimble.Form
-            action="https://world.us20.list-manage.com/subscribe/post?u=11056167825e6c3d276b0a362&id=66d23199dd"
-            _method="post">
-            <Flex flexWrap="wrap">
-              <Box width=[1., 0.6] className=Styles.inputElements>
-                <Form.Input
-                  _type="email"
-                  name="EMAIL"
-                  width=1.
-                  onChange={(e: ReactEvent.Form.t) =>
-                    @warning("-20")
-                    ReactEvent.Form.target(e)["parentNode"]["classList"]["add"]("was-validated")}
-                />
-              </Box>
-              <Box width=[1., 0.4] className=Styles.inputElements>
-                <Button width=1.> {"Submit"->restr} </Button>
-              </Box>
-            </Flex>
-          </Rimble.Form>
-        </Box>
-      </Flex>
-    </Box>
-  </div>
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Erc712.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Erc712.res
deleted file mode 100644
index 014a6aa..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Erc712.res
+++ /dev/null
@@ -1,29 +0,0 @@
-type structProperty = {
-  name: string,
-  @as("type")
-  _type: string,
-}
-type typedStruct = array<structProperty>
-
-let permit = [
-  {name: "holder", _type: "address"},
-  {name: "spender", _type: "address"},
-  {name: "nonce", _type: "uint256"},
-  {name: "expiry", _type: "uint256"},
-  {name: "allowed", _type: "bool"},
-]
-
-let eip712Domain = [
-  {name: "name", _type: "string"},
-  {name: "version", _type: "string"},
-  // {name: "chainId", _type: "uint256"},
-  {name: "verifyingContract", _type: "address"},
-  {name: "salt", _type: "bytes32"},
-]
-type domain = {
-  name: string,
-  version: string,
-  // chainId: string,
-  verifyingContract: string,
-  salt: string,
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Eth.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Eth.res
deleted file mode 100644
index df81331..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Eth.res
+++ /dev/null
@@ -1,63 +0,0 @@
-open Globals
-
-type t = BN.t
-
-@deriving(jsConverter)
-type ethUnit = [
-  | #wei
-  | #kwei
-  | #mwei
-  | #gwei
-  | #microether
-  | #milliether
-  | #ether
-  | #kether
-  | #mether
-  | #geher
-  | #tether
-]
-
-@module("web3-utils") external fromWei: (t, string) => string = "fromWei"
-@module("web3-utils") external toWei: (string, string) => string = "toWei"
-
-let fromWeiEth: t => string = value => fromWei(value, ethUnitToJs(#ether))
-
-type getUnit =
-  | Eth(ethUnit)
-  | Usd(float, int)
-
-let getFloat = (value, unit) =>
-  switch unit {
-  | Eth(unit) => fromWei(value, unit->ethUnitToJs)->Js.Float.fromString
-  | Usd(conversion, _) => fromWei(value, #ether->ethUnitToJs)->Js.Float.fromString *. conversion
-  }
-let get = (value, unit) =>
-  switch unit {
-  | Eth(unit) => fromWei(value, unit->ethUnitToJs)
-  | Usd(conversion, digits) =>
-    (fromWei(value, #ether->ethUnitToJs)->Js.Float.fromString *. conversion)
-      ->toFixedWithPrecisionNoTrailingZeros(~digits)
-  }
-
-let make: string => option<t> = wei => {
-  let result = Helper.isPositiveStringInteger(wei) ? Some(BN.new_(wei)) : None
-  result
-}
-let makeWithDefault: (string, int) => t = (tokenId, default) =>
-  switch make(tokenId) {
-  | Some(wei) => wei
-  | None => default->Belt.Int.toString->BN.new_
-  }
-let makeFromInt: int => t = tokenId => tokenId->Belt.Int.toString->BN.new_
-
-let makeFromEthStr: string => option<t> = eth =>
-  Float.fromString(eth)->Belt.Option.flatMap(ethFloat => Some(
-    BN.new_(toWei(Belt.Float.toString(ethFloat), "ether")),
-  ))
-
-let toFixedWithPrecisionNoTrailingZeros = (~digits=9, eth) =>
-  eth
-  ->fromWeiEth
-  ->Float.fromString
-  ->Option.getWithDefault(0.)
-  ->toFixedWithPrecisionNoTrailingZeros(~digits)
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Ethers.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Ethers.res
deleted file mode 100644
index 0fbea61..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Ethers.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type txResult = {
-  blockHash: string,
-  blockNumber: int,
-  byzantium: bool,
-  confirmations: int,
-  // contractAddress: null,
-  // cumulativeGasUsed: Object { _hex: "0x26063", … },
-  // events: Array(4) [ {…}, {…}, {…}, … ],
-  from: Web3.ethAddress,
-  // gasUsed: Object { _hex: "0x26063", … },
-  // logs: Array(4) [ {…}, {…}, {…}, … ],
-  // logsBloom: "0x00200000000000008000000000000000000020000001000000000000400020000000000000002000000000000000000000000002800010000000008000000000000000000000000000000008000000000040000000000000000000000000000000000000020000014000000000000800024000000000000000000010000000000000000000000000000000000000000000008000000000000000000000000200000008000000000000000000000000000000000800000000000000000000000000001002000000000000000000000000000000000000000020000000040020000000000000000080000000000000000000000000000000080000000000200000"
-  status: int,
-  _to: Web3.ethAddress,
-  transactionHash: string,
-  transactionIndex: int,
-}
-type txError = {
-  code: int, // -32000 = always failing tx ;  4001 = Rejected by signer.
-  message: string,
-  stack: option<string>,
-}
-@new @module("ethers") @scope("providers")
-external makeProvider: string => Web3.rawProvider = "JsonRpcProvider"
-
-@send
-external waitForTransaction: (Web3.rawProvider, string) => Promise.Js.t<txResult, txError> =
-  "waitForTransaction"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/FAQs.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/FAQs.res
deleted file mode 100644
index 269bca7..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/FAQs.res
+++ /dev/null
@@ -1,163 +0,0 @@
-open Rimble
-open Globals
-open React
-
-// FAQ Styles
-
-let faqExplainerText = {
-  open Css
-  style(list{paddingTop(#px(10)), paddingBottom(#px(10)), lineHeight(#rem(1.6))})
-}
-
-let accordionContent = {
-  open Css
-  style(list{overflow(hidden), transition(~duration=800, ~delay=0, ~timingFunction=ease, "all")})
-}
-
-let rotate = angle => {
-  open Css
-  style(list{
-    transform(#rotate(deg(angle))),
-    transition(~duration=400, ~delay=0, ~timingFunction=ease, "all"),
-  })
-}
-
-let accordionSection = {
-  open Css
-  style(list{display(#flex), flexDirection(column)})
-}
-
-/* FAQ Styles End */
-
-let inlineStyle = ReactDOMRe.Style.make
-
-module Chevron = {
-  @react.component
-  let make = (~className) =>
-    <svg className height="14px" width="14px" viewBox="0 0 320 512">
-      <path
-        fill="#777"
-        d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"
-      />
-    </svg>
-}
-
-@get external scrollHeight: Dom.element => int = "scrollHeight"
-
-module FaqItem = {
-  @react.component
-  let make = (~isOpen, ~toggleAccordion, ~title, ~content) => {
-    let (height, setHeight) = useState(_ => "0px")
-    let accordianContentRef = useRef(Js.Nullable.null)
-
-    useEffect2(() => {
-      let optHeight =
-        accordianContentRef.current |> Js.Nullable.toOption |> Belt.Option.map(_, scrollHeight)
-
-      let height = switch optHeight {
-      | Some(height) => string_of_int(height) ++ "px"
-      | None => "0px"
-      }
-      setHeight(_ => !isOpen ? "0px" : height)
-      None
-    }, (isOpen, setHeight))
-
-    <Fragment>
-      <div onClick={_ => toggleAccordion()}>
-        <Text className="accordion-title">
-          {title->restr} <Chevron className={rotate(isOpen ? 90. : 0.)} />
-        </Text>
-      </div>
-      <div
-        className=accordionContent
-        ref={ReactDOMRe.Ref.domRef(accordianContentRef)}
-        style={inlineStyle(~maxHeight=height, ())}>
-        <div>
-          <div className=faqExplainerText> <Text className=Styles.colorGrey> content </Text> </div>
-        </div>
-      </div>
-    </Fragment>
-  }
-}
-
-type faqContentItem = {
-  title: string,
-  content: element,
-}
-let content = [
-  {
-    title: "Do the different wildcards represent real animals?",
-    content: "Some wildcards do represent real animals, while other wildcards are symoblic of the coservation efforts of that organisation. When partnering with a conservation organisation, if that organisation has specific ainimals they track and care for, we aim to list those real animals. In other cases, conservation efforts can occur on a more macro level (without specific animals). To raise funds for these efforts we create an animal representative of that organisation. In both cases, an animal will simply represent an organisation, and funds generated from that animal will flow to the organisation it represents."->restr,
-  },
-  {
-    title: "How do I know my funds are going to the organization?",
-    content: <Fragment>
-      {"Our platform uses ethereum (a blockchain), which is essentially a public transaction ledger. This means that every single action happening on this platform is completely public, verifiable and auditable. If you would like to learn more, "->restr}
-      <a
-        href="https://blog.wildcards.world/where-is-the-money-going/"
-        target="_blank"
-        rel="noopener noreferrer">
-        {"read our blog post"->restr}
-      </a>
-      {"  which details how funds are transparently recieved by our conservation partners."->restr}
-    </Fragment>,
-  },
-  {
-    title: "Can I only buy a wildcard using cryptocurrency?",
-    content: <Fragment>
-      {"Unfortunately, for now cryptocurrency is the only way to buy a wildcard. We are actively working on FIAT currency solutions. In the mean time, we have intergrated with Torus, allowing you to use your credit card easily to buy the required ETH necessary to purchase a wildcard."->restr}
-      <a
-        href="https://blog.wildcards.world/how-to-buy-a-wildcard-web3-ethereum/"
-        target="_blank"
-        rel="noopener noreferrer">
-        {" Read our guide"->restr}
-      </a>
-      {" to find out more about how to buy a wildcard."->restr}
-    </Fragment>,
-  },
-  {
-    title: "What is a non-fungible token?",
-    content: "A non-fungible token (NFT), is simply put, a token that is unique. This is in contrast to bitcoin (which is fungible), as each bitcoin is always equivalent to another one in value. Every wildcard is an NFT representing a unique animal. Since wildcards are non-fungible (unique), every wildcard has a unique history and independant value."->restr,
-  },
-  {
-    title: "What does 'always for sale' mean?",
-    content: "Always for sale means exactly what it says, the asset or thing in question can be bought by any person at anytime, and is hence, always for sale. How this functions in practice is very interesting. The owner of the asset is required to always have a listed selling price for this asset at which anyone could buy this asset from them at any point in time. The owner won’t set the selling price too high because they are required to continually pay a percentage of the selling price in order to keep ownership of the asset."->restr,
-  },
-  {
-    title: "What is a deposit and what happens if my deposit runs out?",
-    content: "Your deposit is used to contiually pay the percentage fee of the selling price you set, in order for you to continue your ownership of the asset. If your deposit runs out then anyone can claim the asset for free and set a new selling price."->restr,
-  },
-  {
-    title: "Can I join wildcards and raise funds for my animal conservation project?",
-    content: "Yes! Please send an email to jonjon@wildcards.world"->restr,
-  },
-]
-
-@react.component
-let make = () => {
-  let (activeIndex, setActiveIndex) = useState(() => -1)
-  let toggleAccordion = (faqItemIndex, ()) =>
-    setActiveIndex(_ => faqItemIndex == activeIndex ? -1 : faqItemIndex)
-  <div className=Styles.infoBackground>
-    <Rimble.Box className=Styles.floatingSignupBox>
-      <Rimble.Flex flexWrap="wrap" alignItems="center" className=Styles.floatingSignupBoxInner>
-        <Rimble.Box width=[1.]>
-          <Rimble.Card>
-            <Heading> {"Frequently Asked Questions (FAQs)"->restr} </Heading>
-            <div className=accordionSection>
-              {Array.mapWithIndex(content, (index, {title, content}) =>
-                <FaqItem
-                  key={index->string_of_int}
-                  isOpen={index == activeIndex}
-                  toggleAccordion={toggleAccordion(index)}
-                  title
-                  content
-                />
-              )->array}
-            </div>
-          </Rimble.Card>
-        </Rimble.Box>
-      </Rimble.Flex>
-    </Rimble.Box>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/FeaturedIn.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/FeaturedIn.res
deleted file mode 100644
index 0e750ed..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/FeaturedIn.res
+++ /dev/null
@@ -1,59 +0,0 @@
-open Globals
-
-type featuredMediaItemType = {
-  imagePath: string,
-  link: string,
-}
-
-let featuredMediaContent: array<featuredMediaItemType> = [
-  {
-    imagePath: "/img/featured-media/hackernoon.svg",
-    link: "https://hackernoon.com/connecting-the-dots-between-blockchain-and-sustainability-6ncc3234",
-  },
-  {
-    imagePath: "/img/featured-media/ubisoft.svg",
-    link: "https://news.ubisoft.com/en-us/article/0fbsdbsFNL5T0vTDkx924/how-the-ubisoft-entrepreneurs-lab-empowers-communities",
-  },
-  {
-    imagePath: "/img/featured-media/decrypt.svg",
-    link: "https://decrypt.co/10561/ubisoft-picks-eight-blockchain-startups-for-entrepreneur-lab",
-  },
-  {
-    imagePath: "/img/featured-media/ventureburn.svg",
-    link: "https://ventureburn.com/2020/01/sa-crypto-startup-wildcards-cv-vc-investment/",
-  },
-  {
-    imagePath: "/img/featured-media/cointelegraph.svg",
-    link: "https://cointelegraph.com/news/wildcards-purports-to-save-endangered-species-with-technical-first-for-ethereum",
-  },
-  {
-    imagePath: "/img/featured-media/coindesk.svg",
-    link: "https://www.coindesk.com/nfts-boring-make-fun",
-  },
-]
-
-let featuredItemImgStyle = {
-  open Css
-  style(list{width(#percent(80.)), minWidth(#px(30)), padding(#rem(1.))})
-}
-
-let featuredContainerStyles = {
-  open Css
-  style(list{maxWidth(px(1200)), margin(auto)})
-}
-
-@react.component
-let make = () =>
-  <Rimble.Box className=Styles.horizantalBlueTile>
-    <p className=Styles.explainerLargeText> {"Featured in "->restr} </p>
-    <Rimble.Flex
-      alignItems="center" justifyContent="center" flexWrap="wrap" className=featuredContainerStyles>
-      {React.array(
-        featuredMediaContent->Array.mapWithIndex((index, x) =>
-          <Rimble.Box key={index->string_of_int} p=2 mb=2 width=[0.5, 0.5, 0.16]>
-            <a href=x.link> <img src=x.imagePath className=featuredItemImgStyle /> </a>
-          </Rimble.Box>
-        ),
-      )}
-    </Rimble.Flex>
-  </Rimble.Box>
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/FinalNote.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/FinalNote.res
deleted file mode 100644
index 3b9ad89..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/FinalNote.res
+++ /dev/null
@@ -1,33 +0,0 @@
-let raisingHandsEmoji = "/img/emoji/raising_hands.png"
-
-module FinalNote = {
-  open Globals
-  open Rimble
-
-  @react.component
-  let make = () =>
-    <Box className=Styles.infoBackground>
-      <Flex>
-        <Box className=Styles.extraInfoFooterBox>
-          <Box className=Styles.emoticonHeader>
-            <img className=Styles.emojiStyles src=raisingHandsEmoji alt="Emoji" />
-          </Box>
-          <Box className=Styles.finalNoteContent>
-            <Heading className=Styles.whiteText>
-              {"Wildcards is currently under active development."->restr}
-            </Heading>
-            <br />
-            <a
-              className=Styles.linkPillBox
-              href="https://youtu.be/ibBAlrrwjp0?t=322"
-              target="_blank"
-              rel="noopener noreferrer">
-              <span className=Styles.linkPillText>
-                {"Watch presentation at the EthCapeTown hackathon."->restr}
-              </span>
-            </a>
-          </Box>
-        </Box>
-      </Flex>
-    </Box>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Footer.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Footer.res
deleted file mode 100644
index a79bc9a..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Footer.res
+++ /dev/null
@@ -1,164 +0,0 @@
-let transparency_link = "https://blog.wildcards.world/where-is-the-money-going/"
-let privacy_policy_link = "https://wildcards.world/privacy_policy.html"
-let terms_and_conditions_link = "https://wildcards.world/terms_and_conditions.html"
-
-open Globals
-
-let footer = {
-  open Css
-  style(list{
-    backgroundColor(hex("303030")),
-    height(vh(12.)),
-    media("(max-width: 831px)", list{height(vh(20.))}),
-  })
-}
-
-let footerWrapper = {
-  open Css
-  style(list{
-    margin(auto),
-    maxWidth(px(1080)),
-    display(#flex),
-    justifyContent(spaceAround),
-    alignItems(center),
-    flexWrap(#wrap),
-    height(#percent(100.)),
-  })
-}
-
-let footerText = {
-  open Css
-  style(list{
-    marginTop(auto),
-    marginBottom(auto),
-    color(hex("919797")),
-    media("(max-width: 831px)", list{width(#percent(100.)), textAlign(#center)}),
-  })
-}
-
-let footerLink = {
-  open Css
-  style(list{textDecoration(none), important(color(hex("919797")))})
-}
-
-let footerSocialButtons = {
-  open Css
-  style(list{
-    padding(px(0)),
-    media("(min-width: 831px)", list{marginRight(em(6.))}), // This is needed to cater for the 'crisp' chat help.
-    listStyle(#none, #inside, #none),
-    display(#flex),
-    justifyContent(center),
-    alignItems(center),
-    flexWrap(wrap),
-    media("(max-width: 831px)", list{width(#percent(100.))}),
-  })
-}
-
-let footerSocialButton = {
-  open Css
-  style(list{})
-}
-
-let footerSocailButtonLink = {
-  open Css
-  style(list{maxWidth(px(32)), maxHeight(px(32))})
-}
-
-@react.component
-let make = () =>
-  <Rimble.Box className=footer>
-    <div className=footerWrapper>
-      <div className=footerText>
-        <div>
-          {`©`->restr}
-          <a
-            className=footerLink
-            target="_blank"
-            rel="noopener noreferrer"
-            href="https://wildcards.world">
-            {"Wildcards"->restr}
-          </a>
-        </div>
-      </div>
-      <div className=footerText>
-        <a className=footerLink target="_blank" rel="noopener noreferrer" href=transparency_link>
-          {"Transparency"->restr}
-        </a>
-      </div>
-      <div className=footerText>
-        <a className=footerLink rel="noopener noreferrer" href="/#team"> {"Team"->restr} </a>
-      </div>
-      <div className=footerText>
-        <a className=footerLink target="_blank" rel="noopener noreferrer" href=privacy_policy_link>
-          {"Privacy Policy"->restr}
-        </a>
-      </div>
-      <div className=footerText>
-        <a
-          className=footerLink
-          target="_blank"
-          rel="noopener noreferrer"
-          href=terms_and_conditions_link>
-          {"Terms and Conditions"->restr}
-        </a>
-      </div>
-      <ul className=footerSocialButtons>
-        <li className=footerSocialButton>
-          <SocialButtons
-            url="https://twitter.com/wildcards_world"
-            bgColor="transparent"
-            fgColor="#aaa"
-            target="_blank"
-            rel="noopener noreferrer"
-            network="twitter"
-            className=footerSocailButtonLink
-          />
-        </li>
-        <li className=footerSocialButton>
-          <SocialButtons
-            className=footerSocailButtonLink
-            url="https://www.facebook.com/wildcards.conservation"
-            bgColor="transparent"
-            target="_blank"
-            rel="noopener noreferrer"
-            network="facebook"
-            fgColor="#aaa"
-          />
-        </li>
-        <li className=footerSocialButton>
-          <SocialButtons
-            className=footerSocailButtonLink
-            url="https://www.youtube.com/channel/UCW8T1lOHWs3klEJ36N9DyCA"
-            bgColor="transparent"
-            target="_blank"
-            rel="noopener noreferrer"
-            network="youtube"
-            fgColor="#aaa"
-          />
-        </li>
-        <li className=footerSocialButton>
-          <SocialButtons
-            className=footerSocailButtonLink
-            url="https://github.com/wildcards-world"
-            bgColor="transparent"
-            target="_blank"
-            rel="noopener noreferrer"
-            network="github"
-            fgColor="#aaa"
-          />
-        </li>
-        <li className=footerSocialButton>
-          <SocialButtons
-            className=footerSocailButtonLink
-            url="https://www.linkedin.com/company/wildcards-world/"
-            bgColor="transparent"
-            target="_blank"
-            rel="noopener noreferrer"
-            network="linkedin"
-            fgColor="#aaa"
-          />
-        </li>
-      </ul>
-    </div>
-  </Rimble.Box>
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Globals.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Globals.res
deleted file mode 100644
index 573af5d..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Globals.res
+++ /dev/null
@@ -1,40 +0,0 @@
-// A collection of functions to make code cleaner.
-include Async
-
-// From here: https://dev.to/johnridesabike/optional-chaining-in-reason-1im6
-let oMap = Belt.Option.map
-let \"<$>" = oMap
-let oFlatMap = Belt.Option.flatMap
-let \">>=" = oFlatMap
-let mapd = Option.mapWithDefault
-let \"||||" = Option.getWithDefault
-
-let \"|+|" = (a, b) => a->BN.add(b)
-let \"|*|" = (a, b) => a->BN.mul(b)
-let \"|-|" = (a, b) => a->BN.sub(b)
-let \"|/|" = (a, b) => a->BN.div(b)
-let \"|==|" = (a, b) => a->BN.eq(b)
-let \"|<|" = (a, b) => a->BN.lt(b)
-let \"|>|" = (a, b) => a->BN.gt(b)
-
-// Float
-let toFixedWithPrecisionNoTrailingZeros = (number: float, ~digits) =>
-  number->Js.Float.toFixedWithPrecision(~digits)->float_of_string->Float.toString
-
-// React components
-let restr = React.string
-let reactMapWithDefault: (option<'a>, React.element, 'a => React.element) => React.element = (
-  opt,
-  default,
-  f,
-) =>
-  switch opt {
-  | None => default
-  | Some(item) => f(item)
-  }
-let reactMap = (opt, f) => reactMapWithDefault(opt, React.null, f)
-
-// For use with: https://github.com/reasonml-labs/bs-let
-module Opt = {
-  let let_ = Belt.Option.flatMap
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Header.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Header.res
deleted file mode 100644
index 50ac458..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Header.res
+++ /dev/null
@@ -1,226 +0,0 @@
-let hambergerMenu = {
-  open Css
-  style(list{
-    display(#none),
-    textAlign(#center),
-    media("(max-width: 1126px)", list{display(#block)}),
-  })
-}
-
-let fullScreenMenu = {
-  open Css
-  style(list{
-    display(#block),
-    textAlign(#center),
-    media("(max-width: 1126px)", list{display(#none)}),
-  })
-}
-
-let headerNav = {
-  open Css
-  style(list{textDecoration(none), marginRight(em(2.))})
-}
-
-let navItemStyles = {
-  open Css
-  style(list{
-    display(#inlineBlock),
-    margin2(~h=rem(0.8), ~v=px(0)),
-    borderBottom(px(1), #solid, #transparent),
-    selector(":hover", list{borderBottom(px(1), #solid, Styles.wildCardGreen)}),
-    selector(
-      "a",
-      list{
-        fontStyle(#italic),
-        fontSize(rem(1.4)),
-        color(Styles.wildCardGreen),
-        fontWeight(#num(200)),
-        selector(":hover", list{borderBottom(px(1), #solid, #transparent)}),
-      },
-    ),
-  })
-}
-
-let floatingMenu = shouldDisplay => {
-  open Css
-  style(list{
-    position(#fixed),
-    top(px(0)),
-    left(px(0)),
-    width(#percent(100.)),
-    height(vh(100.)),
-    visibility(shouldDisplay ? #visible : #hidden),
-    backgroundColor(rgba(255, 255, 255, shouldDisplay ? 0.5 : 0.)),
-    display(#flex),
-    alignItems(#center),
-    justifyContent(#center),
-    overflow(#hidden),
-    zIndex(1000),
-    transition(~duration=600, ~delay=0, ~timingFunction=ease, "all"),
-    selector(
-      ".zoom-in-effect",
-      list{
-        background(rgba(107, 173, 62, 0.3)),
-        width(vw(100.)),
-        height(vh(100.)),
-        borderRadius(#percent(50.)),
-        border(px(1), #solid, Styles.wildCardGreen),
-        display(#flex),
-        flex(#none),
-        alignItems(#center),
-        justifyContent(#center),
-        transform(shouldDisplay ? scale(1., 1.) : scale(0., 0.)),
-        transition(~duration=300, ~delay=0, ~timingFunction=ease, "all"),
-      },
-    ),
-  })
-}
-
-let hamburgerSvg = () =>
-  <svg
-    className={
-      open Css
-      style(list{
-        zIndex(1001),
-        transition(~duration=500, ~delay=0, ~timingFunction=ease, "transform"),
-        selector(":hover", list{transform(rotate(deg(180.)))}),
-      })
-    }
-    height="32px"
-    id="Layer_1"
-    version="1.1"
-    fill={"#" ++ "555555"}
-    width="32px">
-    <path
-      d="M4,10h24c1.104,0,2-0.896,2-2s-0.896-2-2-2H4C2.896,6,2,6.896,2,8S2.896,10,4,10z M28,14H4c-1.104,0-2,0.896-2,2  s0.896,2,2,2h24c1.104,0,2-0.896,2-2S29.104,14,28,14z M28,22H4c-1.104,0-2,0.896-2,2s0.896,2,2,2h24c1.104,0,2-0.896,2-2  S29.104,22,28,22z"
-    />
-  </svg>
-
-let closeSvg = () =>
-  <svg
-    height="32px"
-    className={
-      open Css
-      style(list{
-        zIndex(1002),
-        transition(~duration=500, ~delay=0, ~timingFunction=ease, "transform"),
-        selector(":hover", list{transform(rotate(deg(180.)))}),
-      })
-    }
-    viewBox="0 0 512 512"
-    fill={"#" ++ "222222"}
-    width="32px">
-    <path
-      d="M437.5,386.6L306.9,256l130.6-130.6c14.1-14.1,14.1-36.8,0-50.9c-14.1-14.1-36.8-14.1-50.9,0L256,205.1L125.4,74.5  c-14.1-14.1-36.8-14.1-50.9,0c-14.1,14.1-14.1,36.8,0,50.9L205.1,256L74.5,386.6c-14.1,14.1-14.1,36.8,0,50.9  c14.1,14.1,36.8,14.1,50.9,0L256,306.9l130.6,130.6c14.1,14.1,36.8,14.1,50.9,0C451.5,423.4,451.5,400.6,437.5,386.6z"
-    />
-  </svg>
-
-type closeModal = unit => unit
-type isMobile = bool
-type navItem = {
-  shouldDisplay: bool,
-  shouldDisplayMobile: bool,
-  component: (closeModal, isMobile) => React.element,
-}
-
-@react.component
-let make = (~navItems: array<navItem>) => {
-  let (isOpen, setIsOpen) = React.useState(_ => false)
-
-  let menuItems = isMobile =>
-    <ul
-      className={isMobile
-        ? {
-            open Css
-            style(list{
-              display(#flex),
-              flexDirection(#column),
-              alignItems(#center),
-              padding(px(0)),
-              margin(px(0)),
-            })
-          }
-        : Styles.navList}>
-      {navItems
-      ->Array.mapWithIndex((index, {shouldDisplay, shouldDisplayMobile, component}) =>
-        (shouldDisplay && !isMobile) || (shouldDisplayMobile && isMobile)
-          ? <li
-              key={index->string_of_int}
-              className={
-                open Cn
-                make(list{
-                  ifTrue(navItemStyles, isMobile),
-                  ifTrue(
-                    {
-                      open Css
-                      style(list{
-                        backgroundColor(white),
-                        borderBottom(px(1), #solid, Styles.wildCardGreen),
-                        display(#block),
-                        width(#percent(100.)),
-                        selector(":hover", list{backgroundColor(Styles.wildCardBlue)}),
-                        selector(":focus", list{backgroundColor(Styles.wildCardBlue)}),
-                        selector(
-                          ":active",
-                          list{
-                            backgroundColor(Styles.wildCardGreen),
-                            selector("a", list{color(white)}),
-                          },
-                        ),
-                        // I have to put the padding inside the child element here because the whole surface of the button needs to be clickable
-                        selector(" > *", list{display(#block), width(#auto), padding(em(2.))}),
-                      })
-                    },
-                    isMobile,
-                  ),
-                })
-              }>
-              {component(() => setIsOpen(_ => false), isMobile)}
-            </li>
-          : React.null
-      )
-      ->React.array}
-    </ul>
-
-  let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-  <header className=Styles.header>
-    <div className=Styles.navBox>
-      <a
-        className={Cn.make(list{
-          Styles.clickableLink,
-          {
-            open Css
-            style(list{marginLeft(#px(80)), zIndex(1001)})
-          },
-        })}
-        onClick={event => {
-          ReactEvent.Mouse.preventDefault(event)
-          clearAndPush("#")
-        }}>
-        <div className=Styles.headerLogo> <WildcardsLogo maxWidth="258px" /> </div>
-      </a>
-      <nav className={Cn.make(list{headerNav, fullScreenMenu})}> {menuItems(false)} </nav>
-      <nav className={Cn.make(list{headerNav, hambergerMenu})}>
-        <div
-          className={
-            open Css
-            style(list{
-              zIndex(1010),
-              // NOTE: this needs to have absolute position so that it appears on top of the 'fixed' positioned overlay.
-              position(#absolute),
-              top(px(0)),
-              right(px(0)),
-              padding(px(30)),
-            })
-          }
-          onClick={_ => setIsOpen(isOpen => !isOpen)}>
-          {isOpen ? <> {closeSvg()} </> : hamburgerSvg()}
-        </div>
-        <div className={floatingMenu(isOpen)}>
-          <div className="zoom-in-effect"> {menuItems(true)} </div>
-        </div>
-      </nav>
-    </div>
-  </header>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Helper.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Helper.res
deleted file mode 100644
index be8a97b..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Helper.res
+++ /dev/null
@@ -1,34 +0,0 @@
-let isPositiveStringInteger = str => {
-  // TODO: this should possibly use something like - https://stackoverflow.com/a/48569311/3103033 ?
-
-  // NOTE: This allows leading 0s (which seams to not be a problem for web3 or truffle)
-  //       This doesn't check if the number is smaller than 2^256 which is the largest integer ethereum can handle
-  let f = %re("/^([0-9]\d*)$/")
-
-  Js.Re.test_(f, str)
-}
-
-let elipsify: (string, int) => string = (inputString, maxLength) =>
-  if inputString->String.length > maxLength {
-    String.sub(inputString, 0, maxLength - 3) ++ "..."
-  } else {
-    inputString
-  }
-
-let elipsifyMiddle: (string, int, int) => string = (inputString, maxLength, trailingCharacters) => {
-  let stringLength = inputString->String.length
-
-  if stringLength > maxLength && trailingCharacters + maxLength < stringLength {
-    String.sub(inputString, 0, maxLength - 3) ++
-    ("..." ++
-    String.sub(inputString, Js.Math.abs_int(stringLength - trailingCharacters), trailingCharacters))
-  } else {
-    inputString
-  }
-}
-
-let bnToMoment = bn =>
-  bn
-  ->BN.toString
-  ->int_of_string /* trusting that gql will be reliable here */
-  ->MomentRe.momentWithUnix
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/HomepageLeaderBoard.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/HomepageLeaderBoard.res
deleted file mode 100644
index 860d07b..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/HomepageLeaderBoard.res
+++ /dev/null
@@ -1,31 +0,0 @@
-let gorillaOnVine = "/img/wildcardsimages/gorilla-on-vine.png"
-
-open Rimble
-open Globals
-
-@react.component
-let make = () => {
-  let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-  <Box className=Styles.infoBackground>
-    <Flex flexWrap="wrap">
-      <Box width=[0.28] className=Styles.animalImage> <img src=gorillaOnVine width="100%" /> </Box>
-      <Box width=[1., 1., 0.59] className=Styles.infoCardContainer>
-        <Card className=Styles.infoCardStyles>
-          <MonthlyContribution numberOfLeaders=6 />
-          <br />
-          <Rimble.Box width=[1.]>
-            <Button
-              className=Styles.centerItemsMargin
-              onClick={e => {
-                ReactEvent.Form.preventDefault(e)
-                clearAndPush(j`/#leaderboards/monthly-contribution`)
-              }}>
-              {"View Other Leaderboards"->restr}
-            </Button>
-          </Rimble.Box>
-        </Card>
-      </Box>
-    </Flex>
-  </Box>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/HowItWorks.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/HowItWorks.res
deleted file mode 100644
index ba0a761..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/HowItWorks.res
+++ /dev/null
@@ -1,79 +0,0 @@
-let gorillaOnVine = "/img/wildcardsimages/hanging-gorilla-from-vine.png"
-
-open Globals
-open Rimble
-
-module YoutubeVid = {
-  @module("./YoutubeVideo.js") @react.component
-  external make: (~videoCode: string) => React.element = "default"
-}
-
-let infoModalStyle = {
-  open Css
-  style(list{padding(rem(3.)), borderRadius(px(5)), width(px(640)), maxWidth(#vw(100.))})
-}
-
-@react.component
-let make = () => {
-  let (isModalOpen, setModalOpen) = React.useState(() => false)
-
-  <Rimble.Box className=Styles.infoBackground>
-    <Rimble.Flex flexWrap="wrap">
-      <Rimble.Box width=[1., 1., 0.59] className=Styles.infoCardContainer>
-        <Rimble.Card className=Styles.infoCardStyles>
-          <YoutubeVid videoCode="n7GBm6ruVaQ" />
-          <br />
-          <Rimble.Box width=[1.]>
-            <Rimble.Button
-              className=Styles.centerItemsMargin onClick={_ => setModalOpen(_ => true)}>
-              {"Click here for a simple text explanation"->restr}
-            </Rimble.Button>
-          </Rimble.Box>
-          <Rimble.Modal isOpen=isModalOpen>
-            <Rimble.Card className=infoModalStyle>
-              <Rimble.Button.Text
-                icononly=true
-                icon="Close"
-                color="moon-gray"
-                position="absolute"
-                top=0
-                right=0
-                m=3
-                onClick={_ => setModalOpen(_ => false)}
-              />
-              <Heading className=Styles.centerText> {"How it works"->restr} </Heading>
-              <br />
-              <hr />
-              <Text>
-                {"You can become the guardian of a wildcard by simply clicking buy on any of the listed wildcards. Wildcards are "->restr}
-                <strong> {"always for sale"->restr} </strong>
-                {" since anyone can purchase them at anytime for their current sale price. When someone purchases a wildcard, they are required to immediately set a sale price for that wildcard. This ensures wildcards are "->restr}
-                <strong> {"always for sale"->restr} </strong>
-              </Text>
-              <br />
-              <Text>
-                {"As the gaurdian of a wildcard, you pay a "->restr}
-                <strong> {"Harberger tax"->restr} </strong>
-                {" (percentage based fee) on your newly set sale price. This fee goes towards supporting wildlife conservation. "->restr}
-              </Text>
-              <br />
-              <Text>
-                <strong> {"Here's where it gets interesting."->restr} </strong>
-                {" When someone purchases your wildcard from you, you will receive the sale price you set for that wildcard. Depending on what sale price you set and the harberger tax you have already paid, you may make a profit. The only constant is that the conservation organisation will continually receive funding based on the current selling price of each wildcard."->restr}
-              </Text>
-              <br />
-              <Text>
-                <span className=Styles.redDisclaimer>
-                  {"The first wildcard we released, Vitalik, has a 2.5% Harberger tax rate per month. Other wildcards have different harberger tax rates ranging from 2.5% to 100% per month."->restr}
-                </span>
-              </Text>
-            </Rimble.Card>
-          </Rimble.Modal>
-        </Rimble.Card>
-      </Rimble.Box>
-      <Rimble.Box width=[0.41] className=Styles.animalImage>
-        <img src=gorillaOnVine width="100%" />
-      </Rimble.Box>
-    </Rimble.Flex>
-  </Rimble.Box>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/IncreaseIterationPage.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/IncreaseIterationPage.res
deleted file mode 100644
index f574ba2..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/IncreaseIterationPage.res
+++ /dev/null
@@ -1,13 +0,0 @@
-open Globals
-
-@react.component
-let make = () => {
-  let (increaseIteration, _increaseIterationTxState) = ContractActions.useIncreaseVoteIteration()
-  <Rimble.Box className=Styles.topBody>
-    <Rimble.Box>
-      <Rimble.Button onClick={_ => increaseIteration()}>
-        {"Increase iteration"->restr}
-      </Rimble.Button>
-    </Rimble.Box>
-  </Rimble.Box>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Index.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Index.res
deleted file mode 100644
index b8a2dd5..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Index.res
+++ /dev/null
@@ -1,65 +0,0 @@
-%raw(`require("react-tabs/style/react-tabs.css")`)
-
-open Globals
-
-module Router = {
-  @react.component
-  let make = () => {
-    let url = ReasonReactRouter.useUrl()
-    switch url.path {
-    | list{_} => <p> {React.string("Unknown page")} </p>
-    | _ => <ReactTranslate> <Layout /> </ReactTranslate>
-    }
-  }
-}
-
-@val
-external mainnetApi: option<string> = "process.env.REACT_APP_MAINNET_BE"
-@val
-external goerliApi: option<string> = "process.env.REACT_APP_GOERLI_BE"
-@val
-external maticTestnetApi: option<string> = "process.env.REACT_APP_MATIC_TESTNET"
-@val
-external maticAltTestnetApi: option<string> = "process.env.REACT_APP_MATIC_TESTNET_ALT"
-@val
-external maticApi: option<string> = "process.env.REACT_APP_MATIC_BE"
-@val
-external rinkebyApi: option<string> = "process.env.REACT_APP_RINKEBY_BE"
-
-ReactDOMRe.renderToElementWithId(
-  <WildcardsProvider
-    getGraphEndpoints={(networkId, ()) => {
-      open Client
-
-      let endpoints = switch networkId {
-      | 5 => {
-          mainnet: \"||||"(goerliApi, "https://goerli.api.wildcards.world/v1/graphq"),
-          matic: \"||||"(
-            maticTestnetApi,
-            "https://mumbai.graph.wildcards.world/subgraphs/name/wildcards-world/wildcards-matic",
-          ),
-          ws: "wss://api.thegraph.com/subgraphs/name/wildcards-world/wildcards-goerli",
-        }
-      | 4 => {
-          mainnet: \"||||"(rinkebyApi, "https://rinkeby.api.wildcards.world/v1/graphq"),
-          matic: \"||||"(
-            maticAltTestnetApi,
-            "https://api.thegraph.com/subgraphs/name/wildcards-world/wildcards-testnet",
-          ),
-          ws: "wss://api.thegraph.com/subgraphs/name/wildcards-world/wildcards-goerli",
-        }
-      | _ => {
-          mainnet: \"||||"(mainnetApi, "https://api.wildcards.world/v1/graphq"),
-          matic: \"||||"(
-            maticApi,
-            "https://matic.graph.wildcards.world/subgraphs/name/wildcards-world/wildcards-matic",
-          ),
-          ws: "wss://api.thegraph.com/subgraphs/name/wildcards-world/wildcards",
-        }
-      }
-      endpoints
-    }}>
-    <UsdPriceProvider> <Router /> </UsdPriceProvider> <DiscordChat />
-  </WildcardsProvider>,
-  "root",
-)
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Info.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Info.res
deleted file mode 100644
index e94296b..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Info.res
+++ /dev/null
@@ -1,542 +0,0 @@
-open Globals
-
-module ExpertView = {
-  @react.component
-  let make = (
-    ~monthlyRate,
-    ~tokenName,
-    ~optMonthlyPledgeEth,
-    ~unit,
-    ~showEthWithUsdConversion,
-    ~optMonthlyPledgeUsd,
-    ~userIdType,
-    ~currentPatron,
-    ~displayNameStr,
-    ~depositAvailableToWithdrawEth,
-    ~depositAvailableToWithdrawUsd,
-    ~totalPatronage,
-    ~totalPatronageUsd,
-    ~definiteTime,
-    ~daysHeld,
-  ) => {
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-    <React.Fragment>
-      <div>
-        <small>
-          <strong>
-            {("Monthly Pledge (at " ++ (monthlyRate ++ "%): "))->restr}
-            <Rimble.Tooltip
-              message={"This is the monthly percentage contribution of " ++
-              (tokenName ++
-              "'s sale price that will go towards conservation of at risk animals. This is deducted continuously from the deposit and paid by the owner of the animal")}
-              placement="top">
-              <span> {`ⓘ`->restr} </span>
-            </Rimble.Tooltip>
-          </strong>
-        </small>
-        <br />
-        {switch optMonthlyPledgeEth {
-        | Some(monthlyPledgeEth) => (monthlyPledgeEth ++ (" " ++ unit))->restr
-        | None => <Rimble.Loader />
-        }}
-        <br />
-        {switch (showEthWithUsdConversion, optMonthlyPledgeUsd) {
-        | (true, Some(monthlyPledgeUsd)) =>
-          <small> {("(" ++ (monthlyPledgeUsd ++ " USD)"))->restr} </small>
-        | _ => React.null
-        }}
-      </div>
-      <p>
-        <small>
-          <strong>
-            {"Current Patron: "->restr}
-            <Rimble.Tooltip message=j`This is the $userIdType of the current owner` placement="top">
-              <span> {`ⓘ`->restr} </span>
-            </Rimble.Tooltip>
-          </strong>
-        </small>
-        <br />
-        <a
-          onClick={e => {
-            ReactEvent.Mouse.preventDefault(e)
-            clearAndPush(j`/#user/$currentPatron`)
-          }}>
-          {displayNameStr->restr}
-        </a>
-      </p>
-      <p>
-        <small>
-          <strong>
-            {"Available Deposit: "->restr}
-            <Rimble.Tooltip
-              message="This is the amount the owner has deposited to pay their monthly contribution"
-              placement="top">
-              <span> {`ⓘ`->restr} </span>
-            </Rimble.Tooltip>
-          </strong>
-        </small>
-        <br />
-        {(depositAvailableToWithdrawEth ++ (" " ++ unit))->restr}
-        <br />
-        {showEthWithUsdConversion
-          ? <small> {("(" ++ (depositAvailableToWithdrawUsd ++ " USD)"))->restr} </small>
-          : React.null}
-      </p>
-      <p>
-        <small>
-          <strong>
-            {(tokenName ++ "'s Patronage: ")->restr}
-            <Rimble.Tooltip
-              message={"This is the total contribution that has been raised thanks to the wildcard, " ++
-              tokenName}
-              placement="top">
-              <span> {`ⓘ`->restr} </span>
-            </Rimble.Tooltip>
-          </strong>
-        </small>
-        <br />
-        {(totalPatronage ++ (" " ++ unit))->restr}
-        <br />
-        {showEthWithUsdConversion
-          ? <small> {("(" ++ (totalPatronageUsd ++ " USD)"))->restr} </small>
-          : React.null}
-      </p>
-      {switch definiteTime {
-      | Some(date) =>
-        <p>
-          <small>
-            <strong>
-              {"Foreclosure date: "->restr}
-              <Rimble.Tooltip
-                message={"This is the date the deposit will run out and the current owner will lose guardianship of " ++
-                tokenName}
-                placement="top">
-                <span> {`ⓘ`->restr} </span>
-              </Rimble.Tooltip>
-            </strong>
-          </small>
-          <br />
-          {MomentRe.Moment.format("LLLL", date)->restr}
-          <br />
-          <small> {"( "->restr} <CountDown endDateMoment=date /> {")"->restr} </small>
-        </p>
-      | None => React.null
-      }}
-      {switch daysHeld {
-      | Some((daysHeldFloat, timeAquired)) =>
-        let timeAcquiredString = timeAquired->MomentRe.Moment.toISOString
-        <p>
-          <small>
-            <strong>
-              {"Days Held: "->restr}
-              <Rimble.Tooltip
-                message={"This is the amount of time " ++
-                (tokenName ++
-                (" has been held. It was acquired on the " ++ (timeAcquiredString ++ ".")))}
-                placement="top">
-                <span> {`ⓘ`->restr} </span>
-              </Rimble.Tooltip>
-            </strong>
-          </small>
-          <br />
-          {daysHeldFloat->Js.Float.toFixed->restr}
-          <br />
-        </p>
-      | None => React.null
-      }}
-    </React.Fragment>
-  }
-}
-module SimpleView = {
-  @react.component
-  let make = (
-    ~monthlyRate,
-    ~tokenName,
-    ~optMonthlyPledgeEth,
-    ~unit,
-    ~currentPatron,
-    ~displayNameStr,
-    ~totalPatronage,
-    ~definiteTime,
-    ~daysHeld,
-    ~orgId,
-    ~orgName,
-    ~priceString,
-    ~optionalSpecies,
-  ) => {
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-    let linkStyle = {
-      open Css
-      style(list{textDecoration(underline)})
-    }
-    let userLink =
-      <a
-        className=linkStyle
-        onClick={e => {
-          ReactEvent.Mouse.preventDefault(e)
-          clearAndPush(j`/#user/$currentPatron`)
-        }}>
-        {displayNameStr->restr}
-      </a>
-
-    let orgLink =
-      <a
-        className=linkStyle
-        onClick={e => {
-          ReactEvent.Mouse.preventDefault(e)
-          clearAndPush(j`/#org/$orgId`)
-        }}>
-        {orgName->restr}
-      </a>
-
-    <React.Fragment>
-      <p>
-        {(tokenName ++ " is currently protected by ")->React.string}
-        userLink
-        {(" who values their guardianship of " ++
-        (tokenName ++
-        (" at " ++
-        (priceString ++
-        (". " ++
-        (tokenName ++
-        (" has a monthly pledge rate of " ++ (monthlyRate ++ "%. This means "))))))))->React.string}
-        userLink
-        {(" has to contribute " ++
-        (switch optMonthlyPledgeEth {
-        | Some(monthlyPledgeEth) => monthlyPledgeEth ++ (" " ++ unit)
-        | None => "Loading"
-        } ++
-        " monthly to "))->React.string}
-        orgLink
-        {(" for the protection of " ++
-        (tokenName ++
-        (optionalSpecies->Option.mapWithDefault("", species => " the " ++ species) ++ ".")))
-          ->React.string}
-      </p>
-      {switch daysHeld {
-      | Some((daysHeldFloat, _timeAquired)) =>
-        <p>
-          userLink
-          {(" has been the guardian of " ++
-          (tokenName ++
-          (" for " ++ (daysHeldFloat->Js.Float.toFixed ++ " days "))))->React.string}
-          {switch definiteTime {
-          | Some(date) => <>
-              {"and has enough deposit to last "->React.string}
-              <CountDown endDateMoment=date />
-              {j` - remember to keep topping up that deposit 😉.`->React.string}
-            </>
-          | None => React.null
-          }}
-        </p>
-      | None => React.null
-      }}
-      <p>
-        {("" ++ (tokenName ++ (" has earned " ++ (totalPatronage ++ (" " ++ (unit ++ " for "))))))
-          ->React.string}
-        orgLink
-        {(". Congratulations to all the honourable and loyal patrons of " ++ (tokenName ++ "!"))
-          ->React.string}
-      </p>
-    </React.Fragment>
-    // let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute();
-  }
-}
-
-@react.component
-let make = (~chain, ~tokenId: TokenId.t) => {
-  let daysHeld = QlHooks.useDaysHeld(~chain, tokenId)
-
-  let currentPatron = \"||||"(QlHooks.usePatron(~chain, tokenId), "Loading")
-  let userId = UserProvider.useDisplayName(currentPatron)
-  let displayName = UserProvider.useDisplayName(currentPatron)
-  let displayNameStr = UserProvider.displayNameToString(displayName)
-  let tokenName = \"||||"(tokenId->QlHooks.useWildcardName, "loading name")
-  let userIdType = switch userId {
-  | EthAddress(_) => "public address"
-  | TwitterHandle(_) => "verified twitter account"
-  | ThreeBoxName(_) => "3box name"
-  }
-
-  let currentUsdEthPrice = UsdPriceProvider.useUsdPrice()
-  let (depositAvailableToWithdrawEth, depositAvailableToWithdrawUsd) =
-    QlHooks.useRemainingDepositEth(~chain, currentPatron)->mapd(("Loading", "Loading"), a => (
-      \"||||"(
-        a->Eth.get(Eth.Eth(#ether))->Float.fromString,
-        0.0,
-      )->toFixedWithPrecisionNoTrailingZeros(~digits=9),
-      currentUsdEthPrice->mapd("Loading", usdEthRate => a->Eth.get(Eth.Usd(usdEthRate, 2))),
-    ))
-
-  let (totalPatronage, totalPatronageUsd) =
-    QlHooks.useAmountRaisedToken(~chain, tokenId)->mapd(("Loading", "Loading"), a => (
-      \"||||"(
-        a->Eth.get(Eth.Eth(#ether))->Float.fromString,
-        0.0,
-      )->toFixedWithPrecisionNoTrailingZeros(~digits=9),
-      currentUsdEthPrice->mapd("Loading", usdEthRate => a->Eth.get(Eth.Usd(usdEthRate, 2))),
-    ))
-  let foreclosureTime = QlHooks.useForeclosureTime(~chain, currentPatron)
-  let definiteTime = foreclosureTime->mapd(None, a => Some(a))
-
-  let ratio = QlHooks.usePledgeRate(~chain, tokenId)
-
-  let optCurrentPrice = PriceDisplay.usePrice(~chain, tokenId)
-
-  let (optMonthlyPledgeEth, optMonthlyPledgeUsd) = switch optCurrentPrice {
-  | Some((priceEth, optPriceUsd)) => (
-      Some(
-        toFixedWithPrecisionNoTrailingZeros(
-          Float.fromString(priceEth)->Accounting.defaultZeroF *. ratio,
-          ~digits=4,
-        ),
-      ),
-      switch optPriceUsd {
-      | Some(_priceUsd) => None
-
-      | None => None
-      },
-    )
-  | None => (None, None)
-  }
-
-  let monthlyRate = Js.Float.toString(ratio *. 100.)
-
-  let showEthWithUsdConversion = switch chain {
-  | Client.MaticQuery => false
-  | Client.Neither
-  | Client.MainnetQuery => true
-  }
-  let unit = showEthWithUsdConversion ? "ETH" : "USD"
-  let translationModeContext = ReactTranslate.useTranslationModeContext()
-  let orgName = \"||||"(QlHooks.useWildcardOrgName(~tokenId), " the organisation")
-  let orgId = \"||||"(QlHooks.useWildcardOrgId(~tokenId), " the organisation")
-
-  let currentPriceWei = QlHooks.usePrice(~chain, tokenId)
-  let priceString = switch currentPriceWei {
-  | Foreclosed(price)
-  | Price(price) =>
-    price->Web3Utils.fromWeiBNToEthPrecision(~digits=2) ++ (" " ++ unit)
-  | Loading => "Loading"
-  }
-
-  <>
-    <div
-      className={
-        open Css
-        style(list{
-          color(grey),
-          cursor(#pointer),
-          display(#flex),
-          justifyContent(#right),
-          alignItems(#right),
-        })
-      }>
-      <small
-        onClick={event => {
-          event->ReactEvent.Mouse.preventDefault
-          translationModeContext.setTranslationModeCrypto(
-            !translationModeContext.translationModeCrypto,
-          )
-        }}>
-        {(translationModeContext.translationModeCrypto ? "EXPERT MODE " : "DEFAULT MODE ")->restr}
-      </small>
-      <ReactSwitch
-        onChange=translationModeContext.setTranslationModeCrypto
-        checked=translationModeContext.translationModeCrypto
-        height=16
-        handleDiameter=18
-        width=30
-        onColor="#6BAD3F"
-        onHandleColor="#346D4C"
-        offHandleColor="#aaaaaa"
-        uncheckedIcon=false
-        checkedIcon=false
-        className=Styles.translationSwitch
-      />
-    </div>
-    {translationModeContext.translationModeCrypto
-      ? <ExpertView
-          monthlyRate
-          tokenName
-          optMonthlyPledgeEth
-          unit
-          showEthWithUsdConversion
-          optMonthlyPledgeUsd
-          userIdType
-          currentPatron
-          displayNameStr
-          depositAvailableToWithdrawEth
-          depositAvailableToWithdrawUsd
-          totalPatronage
-          totalPatronageUsd
-          definiteTime
-          daysHeld
-        />
-      : <SimpleView
-          monthlyRate
-          tokenName
-          optMonthlyPledgeEth
-          unit
-          currentPatron
-          displayNameStr
-          totalPatronage
-          definiteTime
-          daysHeld
-          orgName
-          orgId
-          priceString
-          optionalSpecies=None
-        />}
-  </>
-}
-
-module Auction = {
-  @react.component
-  let make = (~chain, ~tokenId: TokenId.t, ~abandoned: bool, ~auctionStartTime) => {
-    let currentPatron = \"||||"(QlHooks.usePatron(~chain, tokenId), "Loading")
-    let displayName = UserProvider.useDisplayName(currentPatron)
-    let displayNameStr = UserProvider.displayNameToString(displayName)
-
-    let tokenName = \"||||"(tokenId->QlHooks.useWildcardName, "loading name")
-
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-    let currentUsdEthPrice = UsdPriceProvider.useUsdPrice()
-    let (totalPatronage, totalPatronageUsd) =
-      QlHooks.useAmountRaisedToken(~chain, tokenId)->mapd(("Loading", "Loading"), a => (
-        \"||||"(
-          a->Eth.get(Eth.Eth(#ether))->Float.fromString,
-          0.0,
-        )->toFixedWithPrecisionNoTrailingZeros(~digits=9),
-        currentUsdEthPrice->mapd("Loading", usdEthRate => a->Eth.get(Eth.Usd(usdEthRate, 2))),
-      ))
-
-    let ratio = QlHooks.usePledgeRate(~chain, tokenId)
-
-    let monthlyRate = Js.Float.toString(ratio *. 100.)
-
-    let showEthWithUsdConversion = switch chain {
-    | Client.MaticQuery => false
-    | Client.Neither
-    | Client.MainnetQuery => true
-    }
-    let unit = showEthWithUsdConversion ? "ETH" : "USD"
-
-    <React.Fragment>
-      <div>
-        {if ratio == 0. {
-          <p> {"The monthly pledge rate will be revealed at launch."->restr} </p>
-        } else {
-          <>
-            <small>
-              <strong>
-                {"Monthly Pledge Rate:"->restr}
-                <Rimble.Tooltip
-                  message={"This is the monthly percentage contribution of " ++
-                  (tokenName ++
-                  "'s sale price that will go towards conservation of at risk animals. This is deducted continuously from the deposit and paid by the guardian of the animal")}
-                  placement="top">
-                  <span> {`ⓘ`->restr} </span>
-                </Rimble.Tooltip>
-              </strong>
-            </small>
-            <br />
-            {(monthlyRate ++ " %")->restr}
-          </>
-        }}
-      </div>
-      {abandoned
-        ? <p>
-            <strong>
-              {"The previous guardian was "->restr}
-              <a
-                onClick={e => {
-                  ReactEvent.Mouse.preventDefault(e)
-                  clearAndPush(j`/#user/$currentPatron`)
-                }}>
-                {displayNameStr->restr}
-              </a>
-              <Rimble.Tooltip
-                message=j`This happens when the user's deposit runs out for the wildcard.`
-                placement="top">
-                <span> {`ⓘ`->restr} </span>
-              </Rimble.Tooltip>
-            </strong>
-            <br />
-          </p>
-        : <p>
-            {(tokenName ++ " has never had a guardian - you can be the first.")->React.string}
-          </p>}
-      <p>
-        <small>
-          <strong>
-            {(tokenName ++ "'s Patronage: ")->restr}
-            <Rimble.Tooltip
-              message={"This is the total contribution that has been raised thanks to " ++
-              tokenName}
-              placement="top">
-              <span> {`ⓘ`->restr} </span>
-            </Rimble.Tooltip>
-          </strong>
-        </small>
-        <br />
-        {(totalPatronage ++ (" " ++ unit))->restr}
-        <br />
-        {showEthWithUsdConversion
-          ? <small> {("(" ++ (totalPatronageUsd ++ " USD)"))->restr} </small>
-          : React.null}
-      </p>
-      {abandoned
-        ? <>
-            <p>
-              <small>
-                <strong>
-                  {"Abandoned since: "->restr}
-                  <Rimble.Tooltip
-                    message={"This is the date the deposit ran out and the current guardian will lose guardianship of " ++
-                    tokenName}
-                    placement="top">
-                    <span> {`ⓘ`->restr} </span>
-                  </Rimble.Tooltip>
-                </strong>
-              </small>
-              <br />
-              {MomentRe.Moment.format("LLLL", auctionStartTime)->restr}
-              <br />
-            </p>
-            // TODO: show how long it was held by the previous patron
-            //  {switch (daysHeld) {
-            //   | Some((daysHeldFloat, timeAquired)) =>
-            //     let timeAcquiredString =
-            //       timeAquired->MomentRe.Moment.toISOString;
-            //     <p>
-            //       <small>
-            //         <strong>
-            //           "Days Held: "->restr
-            //           <Rimble.Tooltip
-            //             message={
-            //               "This is the amount of time "
-            //               ++ tokenName
-            //               ++ " has been held. It was acquired on the "
-            //               ++ timeAcquiredString
-            //               ++ "."
-            //             }
-            //             placement="top">
-            //             <span> {js|ⓘ|js}->restr </span>
-            //           </Rimble.Tooltip>
-            //         </strong>
-            //       </small>
-            //       <br />
-            //       {daysHeldFloat->Js.Float.toFixed->restr}
-            //       <br />
-            //     </p>;
-            //   | None => React.null
-            //   }}
-          </>
-        : React.null}
-    </React.Fragment>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/InputHelp.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/InputHelp.res
deleted file mode 100644
index 794274e..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/InputHelp.res
+++ /dev/null
@@ -1,69 +0,0 @@
-// This function returns a prefix based on the page state. Now it is a boolean, in the future it may be more complicated.
-let getPagePrefix = isExplorer => isExplorer ? "explorer/" : ""
-
-let handleEvent = (action, event) => {
-  ReactEvent.Form.preventDefault(event)
-  action()
-}
-let handleMouseEvent = (action, event) => {
-  ReactEvent.Mouse.preventDefault(event)
-  action()
-}
-
-let onlyUpdateValueIfPositiveFloat = (currentValue, updateFunction, value) => {
-  let (newValue, didUpdate: bool) = // IF the new number isn't a float, don't update.
-  switch Float.fromString(value) {
-  | Some(valueFloat) =>
-    // IF the new number isn't positive, don't update.
-    if valueFloat >= 0. {
-      (value, true)
-    } else {
-      (currentValue, false)
-    }
-  | None =>
-    // If the new value is an empty string let it through.
-    if value == "" {
-      ("0", true)
-    } else {
-      (currentValue, false)
-    }
-  }
-  updateFunction(_ => newValue)
-  (newValue, didUpdate)
-}
-
-let onlyUpdateValueIfInRangeFloat = (min, max, currentValue, updateFunction, value) => {
-  let (newValue, didUpdate: bool) = // IF the new number isn't a float, don't update.
-  switch Float.fromString(value) {
-  | Some(valueFloat) =>
-    // IF the new number isn't positive, don't update.
-    if valueFloat >= min && valueFloat <= max {
-      (value, true)
-    } else {
-      (currentValue, false)
-    }
-  | None =>
-    // If the new value is empty, set it to the minimum
-    if value == "" {
-      (min->Js.Float.toString, true)
-    } else {
-      (currentValue, false)
-    }
-  }
-  updateFunction(_ => newValue)
-  (newValue, didUpdate)
-}
-
-let onlyUpdateIfPositiveFloat = (currentValue, updateFunction, event) => {
-  ReactEvent.Form.preventDefault(event)
-
-  let value = ReactEvent.Form.target(event)["value"]->Option.getWithDefault("")
-  onlyUpdateValueIfPositiveFloat(currentValue, updateFunction, value)
-}
-
-let onlyUpdateIfInRangeFloat = (min, max, currentValue, updateFunction, event) => {
-  ReactEvent.Form.preventDefault(event)
-
-  let value = ReactEvent.Form.target(event)["value"]->Option.getWithDefault("")
-  onlyUpdateValueIfInRangeFloat(min, max, currentValue, updateFunction, value)
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Layout.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Layout.res
deleted file mode 100644
index 26858cd..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Layout.res
+++ /dev/null
@@ -1,299 +0,0 @@
-open Globals
-
-// TODO: there must be a better way of importing images in reason react...
-let betaBanner = "/img/beta-banner.png"
-
-module AnimalFocusDetails = {
-  @react.component
-  let make = (~currentAnimal: option<TokenId.t>, ~showForwardBackButtons) => {
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-    let animalDetails = QlHooks.useDetailsPageNextPrevious(
-      \"||||"(currentAnimal, TokenId.fromStringUnsafe("0")),
-    )
-    <div
-      className={Cn.make(list{
-        Styles.topBody,
-        {
-          open Css
-          style(list{position(relative)})
-        },
-      })}>
-      {currentAnimal->mapd(false, _ => true)
-        ? <Rimble.Button.Text
-            icononly=true
-            icon="Close"
-            color="black"
-            className={
-              open Css
-              style(list{zIndex(10000)})
-            }
-            position="absolute"
-            top=0
-            right=0
-            m=1
-            size="large"
-            onClick={_ => clearAndPush("#" ++ (showForwardBackButtons ? "" : "explorer"))}
-          />
-        : React.null}
-      <Rimble.Flex flexWrap="wrap" alignItems="center">
-        {showForwardBackButtons
-          ? <div
-              className={
-                open Css
-                style(list{width(#percent(5.))})
-              }>
-              <span
-                className={Styles.carouselArrow(true, ~absolutePosition=false)}
-                onClick={InputHelp.handleMouseEvent(() =>
-                  clearAndPush("#details/" ++ animalDetails.prev->TokenId.toString)
-                )}>
-                {`◄`->React.string}
-              </span>
-            </div>
-          : React.null}
-        <div
-          className={
-            open Css
-            style(list{
-              width(showForwardBackButtons ? #percent(90.) : #percent(100.)),
-              // style([width(`percent(animalCarousel->mapd(100., _ => 90.)))])
-            })
-          }>
-          <Dapp currentAnimal />
-        </div>
-        {showForwardBackButtons
-          ? <div
-              className={
-                open Css
-                style(list{width(#percent(5.))})
-              }>
-              <span
-                className={Styles.carouselArrow(false, ~absolutePosition=false) ++
-                (" " ++
-                {
-                  open Css
-                  style(list{width(#percent(3.))})
-                })}
-                onClick={InputHelp.handleMouseEvent(() =>
-                  clearAndPush("#details/" ++ animalDetails.next->TokenId.toString)
-                )}>
-                {`►`->React.string}
-              </span>
-            </div>
-          : React.null}
-      </Rimble.Flex>
-    </div>
-  }
-}
-
-@react.component
-let make = () => {
-  let urlState = Router.useUrlState()
-
-  // TODO: add code that scrolls to the correct height on mobile (to buy etc).
-  // let ref = React.useRef(Js.Nullable.null);
-  // ref.current.scrollHeight;
-  // ReactDOMRe.Ref.domRef(ref);
-  /* ref={ReactDOMRe.Ref.domRef(ref)} */
-
-  let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-  let isExplorer = Router.useIsExplorer()
-  let isDetails = Router.useIsDetails()
-  let isHome = Router.useIsHome()
-  let translationModeContext = ReactTranslate.useTranslationModeContext()
-
-  <div className=Styles.app>
-    <div
-      className={
-        open Css
-        style(list{minHeight(vh(88.))})
-      }>
-      <Announcement announcementBannerColor="72D6B5">
-        <span>
-          <a href="/#explorer/2nd-edition" className=AnimalAnnouncement.linkToAnimal>
-            {"New wildcards"->restr}
-          </a>
-          {" launched on the "->React.string}
-          <a
-            href="https://matic.network"
-            rel="noopener noreferrer"
-            className=AnimalAnnouncement.linkToAnimal>
-            {"MATIC network. "->restr}
-          </a>
-        </span>
-      </Announcement>
-      // <AnimalAnnouncement
-      //   nextReleasedAnimals=[|TokenId.makeFromInt(25)|]
-      //   announcementBannerColor="f49229" //next color
-      //   // FFCD47 - Pendo
-      //   // 2493AD - Star
-      //   // D6564B - whacky
-      //   // 0624a6 - Arthur
-      //   // DE4C38
-      //   // f49229
-      //   // 2493AD
-      //   // 72D6B5
-      //   // AEE79A
-      // />
-      <div
-        className={
-          open Css
-          style(list{position(relative)})
-        }>
-        <img src=betaBanner className=Styles.betaBanner />
-      </div>
-      <Header
-        navItems=[
-          {
-            shouldDisplay: isHome,
-            shouldDisplayMobile: false,
-            component: (_, _) =>
-              <div className=Styles.navListItemToggle>
-                <span className=Styles.someMarginRight>
-                  {(
-                    translationModeContext.translationModeCrypto ? "EXPERT MODE" : "DEFAULT MODE"
-                  )->restr}
-                </span>
-                <ReactSwitch
-                  onChange=translationModeContext.setTranslationModeCrypto
-                  checked=translationModeContext.translationModeCrypto
-                  height=16
-                  handleDiameter=18
-                  width=30
-                  onColor="#6BAD3F"
-                  onHandleColor="#346D4C"
-                  offHandleColor="#aaaaaa"
-                  uncheckedIcon=false
-                  checkedIcon=false
-                  className=Styles.translationSwitch
-                />
-              </div>,
-          },
-          {
-            shouldDisplay: !isHome,
-            shouldDisplayMobile: !isHome,
-            component: (closeModal, _) =>
-              <a
-                className=Styles.navListText
-                href=""
-                onClick={event => {
-                  closeModal()
-                  ReactEvent.Mouse.preventDefault(event)
-                  clearAndPush("#")
-                }}>
-                {"HOME"->restr}
-              </a>,
-          },
-          {
-            shouldDisplay: true,
-            shouldDisplayMobile: true,
-            component: (closeModal, _) =>
-              <a
-                className=Styles.navListText
-                onClick={event => {
-                  closeModal()
-                  ReactEvent.Mouse.preventDefault(event)
-                  clearAndPush(j`/#leaderboards/monthly-contribution`)
-                }}>
-                {"LEADERBOARDS"->restr}
-              </a>,
-          },
-          {
-            shouldDisplay: true,
-            shouldDisplayMobile: true,
-            component: (closeModal, _) =>
-              <a
-                className=Styles.navListText
-                onClick={event => {
-                  closeModal()
-                  ReactEvent.Mouse.preventDefault(event)
-                  clearAndPush(j`/#dao`)
-                }}>
-                {"DAO"->restr}
-              </a>,
-          },
-          {
-            shouldDisplay: true,
-            shouldDisplayMobile: true,
-            component: (closeModal, _) =>
-              <a
-                className=Styles.navListText
-                target="_blank"
-                onClick={_ => closeModal()}
-                rel="noopener noreferrer"
-                href="https://blog.wildcards.world/">
-                {"BLOG"->restr}
-              </a>,
-          },
-          {
-            shouldDisplay: !isExplorer || isDetails,
-            shouldDisplayMobile: !isExplorer || isDetails,
-            component: (closeModal, _) =>
-              <div>
-                <Rimble.Button
-                  onClick={event => {
-                    closeModal()
-                    ReactEvent.Form.preventDefault(event)
-                    clearAndPush("#explorer")
-                  }}
-                  className=Styles.whiteText>
-                  {"VIEW WILDCARDS"->restr}
-                </Rimble.Button>
-              </div>,
-          },
-          {
-            shouldDisplay: true,
-            shouldDisplayMobile: true,
-            component: (clickAction, _) => <Web3Connect clickAction />,
-          },
-          {
-            shouldDisplay: true,
-            shouldDisplayMobile: true,
-            component: (clickAction, isMobile) => <ProfileIcon clickAction isMobile />,
-          },
-        ]
-      />
-      {switch urlState {
-      | VotePage => <VotePage chain=Client.MainnetQuery />
-      | Team => <Team />
-      | IncreaseVoteIteration => React.null // DEPRECATED FUNCTIONALITY. // <IncreaseIterationPage />
-      | Explorer(wildcardsEdition, subState) =>
-        switch subState {
-        | DetailView(currentAnimal) =>
-          <AnimalFocusDetails currentAnimal showForwardBackButtons=false />
-        | NormalView => <BuyGrid wildcardsEdition />
-        }
-      | Home(animalPageState) =>
-        switch animalPageState {
-        | DetailView(currentAnimal) =>
-          <AnimalFocusDetails currentAnimal showForwardBackButtons=true />
-        | NormalView =>
-          <React.Fragment>
-            <AnimalFocusDetails currentAnimal=None showForwardBackButtons=false />
-            <FeaturedIn />
-            <HomepageLeaderBoard />
-            <CustomerBenefit />
-            <HowItWorks />
-            <EmailSignup />
-            <FAQs />
-            <Partners />
-          </React.Fragment>
-        }
-      | User(userAddress) => <UserProfile chain=Client.MainnetQuery userAddress />
-      | Artist(artistIdentifier) => <ArtistProfiles artistIdentifier />
-      | Org(orgId) => <OrgProfile orgId />
-      | Leaderboards(leaderboardType) =>
-        <Rimble.Flex
-          flexWrap="wrap"
-          alignItems="center"
-          className={
-            open Css
-            style(list{padding(em(2.))})
-          }>
-          <LeaderBoards leaderboardType />
-        </Rimble.Flex>
-      }}
-    </div>
-    <Footer />
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/LazyThreeBoxUpdate.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/LazyThreeBoxUpdate.res
deleted file mode 100644
index 937e973..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/LazyThreeBoxUpdate.res
+++ /dev/null
@@ -1,15 +0,0 @@
-module type T = module type of ThreeBoxUpdate.Main
-
-/*
-   Needed for ReScript to not import the original component :
-   See https://github.com/rescript-lang/rescript-compiler/issues/3543
- */
-let unsafePlaceholder: module(T) = %raw(`{}`)
-
-module UnsafePlaceholder = unpack(unsafePlaceholder)
-
-let makeProps = UnsafePlaceholder.makeProps
-
-let make = ReLoadable.lazy_(() =>
-  ReLoadable.\"import"(UnsafePlaceholder.make, "./ThreeBoxUpdate.bs.js")
-)
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/LeaderBoards.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/LeaderBoards.res
deleted file mode 100644
index 62ed575..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/LeaderBoards.res
+++ /dev/null
@@ -1,35 +0,0 @@
-let indexToType = tabIndex =>
-  switch tabIndex {
-  | 0 => "monthly-contribution"
-  | 1 => "total-contribution"
-  | 2 => "days-held"
-  | _ => "unknown"
-  }
-
-@react.component
-let make = (~leaderboardType) => {
-  let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-  let index = switch leaderboardType {
-  | Router.MonthlyContribution => 0
-  | Router.TotalContribution => 1
-  | Router.TotalDaysHeld => 2
-  | Router.Unknown => -1
-  }
-  let selectLeaderBoard = (newIndex, _oldIndex) => {
-    clearAndPush("#leaderboards/" ++ indexToType(newIndex))
-
-    true
-  }
-
-  <ReactTabs selectedIndex=index onSelect=selectLeaderBoard>
-    <ReactTabs.TabList>
-      <ReactTabs.Tab> {"Monthly Contribution"->React.string} </ReactTabs.Tab>
-      <ReactTabs.Tab> {"Total Contribution"->React.string} </ReactTabs.Tab>
-      <ReactTabs.Tab> {"Days Held"->React.string} </ReactTabs.Tab>
-    </ReactTabs.TabList>
-    <ReactTabs.TabPanel> <MonthlyContribution numberOfLeaders=10 /> </ReactTabs.TabPanel>
-    <ReactTabs.TabPanel> <TotalContribution numberOfLeaders=10 /> </ReactTabs.TabPanel>
-    <ReactTabs.TabPanel> <TotalDaysHeld numberOfLeaders=10 /> </ReactTabs.TabPanel>
-  </ReactTabs>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Login.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Login.res
deleted file mode 100644
index 00bd746..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Login.res
+++ /dev/null
@@ -1,97 +0,0 @@
-type connectorObj = {
-  name: string,
-  connector: Web3Connectors.injectedType,
-  img: string,
-  connectionPhrase: string,
-}
-
-@module("./bindings/web3-react/connectors")
-external connectors: Js.Array.t<connectorObj> = "default"
-
-@react.component
-let make = () => {
-  let (_connectionStatus, activateConnector) = RootProvider.useActivateConnector()
-
-  <div>
-    <p>
-      {"Use one of the wallet providers below. "->React.string}
-      <small>
-        {"(Not sure where to go from here? "->React.string}
-        <a
-          href="https://blog.wildcards.world/how-to-buy-a-wildcard-web3-ethereum/"
-          target=// Decided to leave this wildcard braning in here ;)
-          "_blank"
-          rel="noopener noreferrer">
-          <span className=Styles.colorGreen> {"Read this guide"->React.string} </span>
-        </a>
-        {")"->React.string}
-      </small>
-    </p>
-    <div
-      className={
-        open Css
-        style(list{
-          display(#grid),
-          gridTemplateColumns(list{#repeat(#autoFit, #minmax(px(176), fr(0.6)))}),
-          maxWidth(px(800)),
-        })
-      }>
-      {connectors
-      ->Belt.Array.mapWithIndex((index, connector) =>
-        <div
-          key={index->string_of_int}
-          onClick={_e => activateConnector(connector.connector)}
-          className={
-            open Css
-            style(list{border(px(1), #solid, rgba(195, 195, 195, 0.14)), hover(list{})})
-          }>
-          <div
-            className={
-              open Css
-              style(list{
-                margin(px(8)),
-                display(#flex),
-                justifyContent(#center),
-                alignItems(#center),
-                flexDirection(column),
-                cursor(#pointer),
-                borderRadius(px(12)),
-                hover(list{backgroundColor(rgba(195, 195, 195, 0.14))}),
-                transition(~duration=200, ~delay=0, ~timingFunction=easeInOut, "background-color"),
-              })
-            }>
-            <div
-              className={
-                open Css
-                style(list{width(px(45)), height(px(45))})
-              }>
-              <img
-                src=connector.img
-                alt="MetaMask"
-                className={
-                  open Css
-                  style(list{width(#percent(100.)), height(#percent(100.))})
-                }
-              />
-            </div>
-            <div
-              className={
-                open Css
-                style(list{fontSize(px(24)), fontWeight(#num(700)), marginTop(em(0.5))})
-              }>
-              {connector.name->React.string}
-            </div>
-            <div
-              className={
-                open Css
-                style(list{fontSize(px(15)), marginTop(em(0.35)), color(rgb(169, 169, 188))})
-              }>
-              {connector.connectionPhrase->React.string}
-            </div>
-          </div>
-        </div>
-      )
-      ->React.array}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/MonthlyContribution.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/MonthlyContribution.res
deleted file mode 100644
index 6551f1c..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/MonthlyContribution.res
+++ /dev/null
@@ -1,136 +0,0 @@
-// Todo
-// - Streak Score
-// - Move to components
-
-open Css
-open Globals
-
-let flameImg = "/img/streak-flame.png"
-let goldTrophyImg = "/img/icons/gold-trophy.png"
-let silverTrophyImg = "/img/icons/silver-trophy.png"
-let bronzeTrophyImg = "/img/icons/bronze-trophy.png"
-
-let leaderboardTable = style(list{
-  width(#percent(100.)),
-  tableLayout(#fixed),
-  overflowWrap(#breakWord),
-})
-
-let leaderboardHeader = style(list{backgroundColor(#hex("73c7d7ff"))})
-
-let streakTextLeaderboard = style(list{
-  position(absolute),
-  zIndex(100),
-  bottom(#percent(-10.)),
-  right(#percent(50.)),
-  transform(translateX(#px(-5))),
-})
-let flameImgLeaderboard = style(list{width(#percent(100.)), maxWidth(px(50))})
-
-let rankText = style(list{
-  position(absolute),
-  zIndex(100),
-  bottom(#percent(-10.)),
-  right(#percent(50.)),
-  transform(translate(#px(-4), #px(-15))),
-})
-
-let trophyImg = style(list{width(#percent(100.)), width(px(50)), height(px(50))})
-
-let centerFlame = style(list{display(block), margin(auto), width(#px(70)), position(relative)})
-
-let rankMetric = style(list{fontSize(#px(16))})
-
-let rankingColor = index =>
-  style(list{backgroundColor(#hex(mod(index, 2) == 1 ? "b5b5bd22" : "ffffffff"))})
-
-module ContributorName = {
-  @react.component
-  let make = (~contributor) => {
-    UserProvider.useUserInfoContext().update(contributor, false)
-
-    let optThreeBoxData = UserProvider.use3BoxUserData(contributor)
-    let optUserName = {
-      open Belt.Option
-      optThreeBoxData
-      ->flatMap(threeBoxData => threeBoxData.profile)
-      ->flatMap(threeBoxData => threeBoxData.name)
-    }
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-    <span>
-      <a
-        onClick={e => {
-          ReactEvent.Mouse.preventDefault(e)
-          clearAndPush(j`/#user/$contributor`)
-        }}>
-        {switch optUserName {
-        | Some(name) => <span> {name->React.string} </span>
-        | None => <span> {Helper.elipsify(contributor, 20)->React.string} </span>
-        }}
-      </a>
-    </span>
-  }
-}
-
-@react.component
-let make = (~numberOfLeaders) => {
-  let topContributorsOpt = QlHooks.useLoadTopContributorsData(numberOfLeaders)
-
-  <div>
-    <Rimble.Heading> {"Wildcards Monthly Contribution Leaderboard"->React.string} </Rimble.Heading>
-    <br />
-    <Rimble.Table className=leaderboardTable>
-      <thead className=leaderboardHeader>
-        <tr>
-          <th> {"Rank"->React.string} </th>
-          <th> {"Guardian"->React.string} </th>
-          // <th> "Longest Streak"->React.string </th>
-          <th> {"Monthly Contribution"->React.string} </th>
-        </tr>
-      </thead>
-      <tbody>
-        {switch topContributorsOpt {
-        | Some(topContributors) =>
-          React.array(
-            topContributors->Array.mapWithIndex((index, (contributor, amount)) => {
-              let amountRaisedFloat = \"||||"(amount->Float.fromString, 0.)
-
-              amountRaisedFloat < 0.0000001
-                ? React.null
-                : <tr key=contributor className={rankingColor(index)}>
-                    <td>
-                      <span className=centerFlame>
-                        {index == 0
-                          ? <img className=trophyImg src=goldTrophyImg />
-                          : index == 1
-                          ? <img className=trophyImg src=silverTrophyImg />
-                          : index == 2
-                          ? <img className=trophyImg src=bronzeTrophyImg />
-                          : <div className=trophyImg />}
-                        <p className=rankText>
-                          <strong>
-                            {"#"->React.string} {(index + 1)->string_of_int->React.string}
-                          </strong>
-                        </p>
-                      </span>
-                    </td>
-                    <td> <ContributorName contributor /> </td>
-                    //  <td>
-                    //    <span className=centerFlame>
-                    //      <img className=flameImgLeaderboard src=flameImg />
-                    //      <p className=streakTextLeaderboard>
-                    //        <strong> "1"->React.string </strong>
-                    //      </p>
-                    //    </span>
-                    //  </td>
-                    <td className=rankMetric> {(amount ++ " ETH")->React.string} </td>
-                  </tr>
-            }),
-          )
-        | None => React.null
-        }}
-      </tbody>
-    </Rimble.Table>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/OrgProfile.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/OrgProfile.res
deleted file mode 100644
index a884d1b..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/OrgProfile.res
+++ /dev/null
@@ -1,353 +0,0 @@
-open Globals
-
-@decco.decode
-type orgDescriptionArray = array<string>
-
-module YoutubeVid = {
-  @module("./StaticContent//YoutubeVideo.js") @react.component
-  external make: (~videoCode: string) => React.element = "default"
-}
-
-module ComingSoonAnimal = {
-  @react.component
-  let make = (~image, ~onClick) =>
-    <div
-      className={
-        open Css
-        style(list{width(#percent(32.))})
-      }>
-      <img
-        className={
-          open Css
-          style(list{width(#percent(100.))})
-        }
-        onClick={_e => onClick()}
-        src=image
-      />
-    </div>
-}
-
-module ImageCarousel = {
-  @react.component
-  let make = (
-    ~orgComingSoon: array<
-      QlHooks.LoadOrganisationData.LoadOrganisationData_inner.t_organisations_by_pk_unlaunched,
-    >,
-    ~selectedIndex,
-  ) =>
-    <ResponsiveCarousel
-      showArrows=true
-      showStatus=true
-      showIndicators=true
-      infiniteLoop=true
-      showThumbs=false
-      useKeyboardArrows=true
-      autoPlay=true
-      stopOnHover=true
-      swipeable=true
-      dynamicHeight=true
-      emulateTouch=true
-      selectedItem=selectedIndex>
-      {React.array(
-        orgComingSoon->Array.mapWithIndex((key, animal) =>
-          animal.real_wc_photos[0]->Option.mapWithDefault(React.null, photos =>
-            <img key={key->string_of_int} src={CONSTANTS.cdnBase ++ photos.image} />
-          )
-        ),
-      )}
-    </ResponsiveCarousel>
-}
-
-module ComingSoonModal = {
-  @react.component
-  let make = (
-    ~selectedComingSoonAnimal,
-    ~setSelectedComingSoonAnimal,
-    ~orgComingSoon: array<
-      QlHooks.LoadOrganisationData.LoadOrganisationData_inner.t_organisations_by_pk_unlaunched,
-    >,
-  ) => {
-    let (openImage, setOpenImage) = React.useState(_ => None)
-
-    <Rimble.Modal isOpen={selectedComingSoonAnimal->Option.isSome}>
-      <Rimble.Card width=Rimble.AnyStr("80vw") p=0>
-        <Rimble.Button.Text
-          icononly=true
-          icon="Close"
-          color="moon-gray"
-          position="absolute"
-          right=0
-          m=1
-          top=0
-          onClick={_ =>
-            switch openImage {
-            | Some(_) => setOpenImage(_ => None)
-            | None => setSelectedComingSoonAnimal(_ => None)
-            }}
-        />
-        <Rimble.Box p=1 mb=1>
-          {switch selectedComingSoonAnimal {
-          | Some(selectedComingSoonAnimal) =>
-            switch openImage {
-            | Some(selectedIndex) => <ImageCarousel orgComingSoon selectedIndex />
-            | None =>
-              let animal = orgComingSoon->Array.getUnsafe(selectedComingSoonAnimal)
-
-              <div>
-                <h3
-                  className={
-                    open Css
-                    style(list{textAlign(center)})
-                  }>
-                  {(animal.name->Option.getWithDefault("Unamed") ++
-                    animal.commonName->Option.mapWithDefault("", commonName => " - " ++ commonName))
-                    ->React.string}
-                </h3>
-                <Rimble.Flex flexWrap="wrap" alignItems="start" alignContent="space-arround">
-                  <Rimble.Box
-                    width=[1., 1., 0.49]
-                    className={
-                      open Css
-                      style(list{textAlign(#center), alignSelf(center), padding(em(0.5))})
-                    }>
-                    <div
-                      className={
-                        open Css
-                        style(list{maxHeight(#em(26.)), overflow(#scroll)})
-                      }>
-                      {React.array(
-                        animal.description
-                        ->QlHooks.animalDescription_decode
-                        ->Belt.Result.getWithDefault([])
-                        ->Array.mapWithIndex((i, paragraphText) =>
-                          <p key={i->string_of_int}> {paragraphText->React.string} </p>
-                        ),
-                      )}
-                    </div>
-                  </Rimble.Box>
-                  <Rimble.Box
-                    width=[1., 1., 0.45]
-                    className={
-                      open Css
-                      style(list{textAlign(#center), alignSelf(center), padding(em(2.))})
-                    }>
-                    <div
-                      className={
-                        open Css
-                        style(list{maxHeight(#vh(80.))})
-                      }>
-                      <PhotoGallery
-                        onClick={(_, photoData) => setOpenImage(_ => Some(photoData.index))}
-                        targetRowHeight=30
-                        photos={animal.real_wc_photos->Array.map(photo => {
-                          open PhotoGallery
-                          {
-                            src: CONSTANTS.cdnBase ++ photo.image,
-                            width: 4,
-                            height: 3,
-                          }
-                        })}
-                      />
-                    </div>
-                  </Rimble.Box>
-                </Rimble.Flex>
-              </div>
-            }
-          | None => React.null
-          }}
-        </Rimble.Box>
-      </Rimble.Card>
-    </Rimble.Modal>
-  }
-}
-
-module OrgPage = {
-  @react.component
-  let make = (
-    ~orgData: QlHooks.LoadOrganisationData.LoadOrganisationData_inner.t_organisations_by_pk,
-    ~orgId,
-  ) => {
-    let orgName = orgData.name
-    let orgDescription = orgData.description->orgDescriptionArray_decode
-    let orgAnimals = orgData.wildcard
-    let orgComingSoon = orgData.unlaunched
-    let (selectedComingSoonAnimal, setSelectedComingSoonAnimal) = React.useState(() => None)
-    let orgAnimalsArray =
-      orgAnimals->Array.map(animal => animal.id->Option.getWithDefault(TokenId.makeFromInt(99999)))
-    let currentUsdEthPrice = UsdPriceProvider.useUsdPrice()
-    let (totalCollectedMainnetEth, totalCollectMaticDai) = QlHooks.useTotalRaisedAnimalGroup(
-      orgAnimalsArray,
-    )
-
-    let (totalPatronageUsd, totalBreakdownString) = switch (
-      totalCollectedMainnetEth,
-      totalCollectMaticDai,
-    ) {
-    | (Some(mainnetEth), Some(maticDai)) => (
-        (currentUsdEthPrice->Option.mapWithDefault(0., usdEthRate =>
-          mainnetEth->Eth.getFloat(Eth.Usd(usdEthRate, 2))
-        ) +. maticDai->Eth.getFloat(Eth.Eth(#ether)))->Js.Float.toFixedWithPrecision(~digits=6),
-        mainnetEth->Web3Utils.fromWeiBNToEthPrecision(~digits=4) ++
-          (" ETH + " ++
-          (maticDai->Web3Utils.fromWeiBNToEthPrecision(~digits=2) ++ " DAI")),
-      )
-    | _ => ("loading", "loading")
-    }
-
-    let orgWebsite = orgData.website
-    let optOrgYoutubeVid = orgData.youtube_vid
-    let orgImage = Animal.useGetOrgImage(orgId)
-
-    <div>
-      <ComingSoonModal selectedComingSoonAnimal setSelectedComingSoonAnimal orgComingSoon />
-      <div
-        className={
-          open Css
-          style(list{width(#percent(100.))})
-        }>
-        <Rimble.Flex flexWrap="wrap" alignItems="start" alignContent="space-arround">
-          <Rimble.Box
-            width=[1., 1., 0.3333]
-            className={
-              open Css
-              style(list{textAlign(#center), alignSelf(center), padding(em(2.))})
-            }>
-            <a
-              className={Cn.make(list{
-                Styles.navListText,
-                {
-                  open Css
-                  style(list{fontSize(em(3.))})
-                },
-              })}
-              target="_blank"
-              rel="noopener noreferrer"
-              href=orgWebsite>
-              <img
-                className={
-                  open Css
-                  style(list{
-                    // borderRadius(`percent(100.)),
-                    width(#vh(25.)),
-                    height(#vh(25.)),
-                    objectFit(#contain),
-                    // objectFit(`cover),
-                  })
-                }
-                src=orgImage
-              />
-            </a>
-            <br />
-            <a
-              className={Cn.make(list{
-                Styles.navListText,
-                {
-                  open Css
-                  style(list{fontSize(em(3.))})
-                },
-              })}
-              target="_blank"
-              rel="noopener noreferrer"
-              href=orgWebsite>
-              {orgName->restr}
-            </a>
-            <br />
-            <div
-              className={
-                open Css
-                style(list{maxHeight(#em(15.)), overflow(#scroll)})
-              }>
-              {switch orgDescription {
-              | Ok(descriptionArray) =>
-                React.array(
-                  descriptionArray->Array.mapWithIndex((i, paragraphText) =>
-                    <p key={i->string_of_int}> {paragraphText->React.string} </p>
-                  ),
-                )
-              | Error(_) => <p> {"error loading description"->restr} </p>
-              }}
-            </div>
-            <br />
-          </Rimble.Box>
-          <Rimble.Box
-            width=[1., 1., 0.3333]
-            className={
-              open Css
-              style(list{alignSelf(center), padding(em(2.))})
-            }>
-            {switch optOrgYoutubeVid {
-            | Some(videoCode) => <YoutubeVid videoCode />
-            | None => React.null
-            }}
-            <h2> {"Total Raised"->restr} </h2>
-            {(totalPatronageUsd ++ "USD")->restr}
-            <br />
-            <small> {totalBreakdownString->restr} </small>
-          </Rimble.Box>
-          <Rimble.Box
-            width=[1., 1., 0.3333]
-            className={
-              open Css
-              style(list{alignSelf(center), padding(em(2.))})
-            }>
-            {switch orgAnimals {
-            | [] => <p> {"This organisation doesn't have any wildcards yet"->React.string} </p>
-            | uniquePreviouslyOwnedTokens =>
-              <React.Fragment>
-                <Rimble.Heading> {"Organisations animals"->React.string} </Rimble.Heading>
-                <Rimble.Flex flexWrap="wrap" className=UserProfile.centreAlignOnMobile>
-                  {React.array(
-                    uniquePreviouslyOwnedTokens->Array.map(animal => {
-                      let tokenId = animal.id->Option.getWithDefault(TokenId.makeFromInt(99999))
-                      <UserProfile.Token key={tokenId->TokenId.toString} tokenId />
-                    }),
-                  )}
-                </Rimble.Flex>
-              </React.Fragment>
-            }}
-            {switch orgComingSoon {
-            | [] => React.null
-            | _orgAnimals =>
-              <React.Fragment>
-                <Rimble.Heading> {"Coming soon"->React.string} </Rimble.Heading>
-                <Rimble.Flex flexWrap="wrap" className=UserProfile.centreAlignOnMobile>
-                  React.null
-                  {React.array(
-                    orgComingSoon->Array.mapWithIndex((key, animal) =>
-                      animal.real_wc_photos[0]->Option.mapWithDefault(React.null, photos =>
-                        <ComingSoonAnimal
-                          key={key->string_of_int}
-                          image={CONSTANTS.cdnBase ++ photos.image}
-                          onClick={() => setSelectedComingSoonAnimal(_ => Some(key))}
-                        />
-                      )
-                    ),
-                  )}
-                </Rimble.Flex>
-              </React.Fragment>
-            }}
-          </Rimble.Box>
-        </Rimble.Flex>
-      </div>
-    </div>
-    //  {animal->Array.map(animal => animal##)}
-  }
-}
-
-@react.component
-let make = (~orgId: string) => {
-  let orgData = QlHooks.useLoadOrganisationQuery(orgId)
-
-  <Rimble.Flex flexWrap="wrap" alignItems="center" className=Styles.topBody>
-    {switch orgData {
-    | Some(organisations_by_pk) =>
-      let orgData = organisations_by_pk
-      <OrgPage orgId orgData />
-    | None =>
-      <div>
-        <Rimble.Heading> {"Loading Organisation Profile"->React.string} </Rimble.Heading>
-        <Rimble.Loader />
-      </div>
-    }}
-  </Rimble.Flex>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Partners.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Partners.res
deleted file mode 100644
index 51162e9..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Partners.res
+++ /dev/null
@@ -1,186 +0,0 @@
-open Globals
-
-let ubisoftLogo = "/img/logos/Ubisoft.png"
-let ethCapeTownLogo = "/img/logos/EthCapeTown.png"
-let cvLabsLogo = "/img/logos/cvlabszug.jpg"
-let kernelLogo = "/img/logos/kernel.gif"
-
-module LoadPatronNoDecode = %graphql(`
-query ActivePartners {
-  organisations(where: {onboarding_status: {_in: [live,signed,listed]}}) {
-    logo
-    id
-    name
-  }
-}
-  `)
-type partner = {
-  logo: string,
-  id: string,
-  name: string,
-}
-let usePartners = () =>
-  // let (simple, _) = ApolloHooks.useQuery(LoadPatronNoDecode.definition);
-  // switch (simple) {
-  // | Data(orgs) =>
-  //   orgs##organisations
-  //   ->Array.map(org => {logo: org##logo, id: org##id, name: org##name})
-  //   ->Some
-  // | Error(_)
-  // | Loading
-  // | NoData => None
-  // };
-  /* TODO: fix me */
-  None
-
-let blueBackground = {
-  open Css
-  style(list{backgroundColor(#hex("73C8D7"))})
-}
-let cardStyle = {
-  open Css
-  style(list{height(#percent(100.)), display(#flex), important(padding(#percent(0.)))})
-}
-let logoStyle = {
-  open Css
-  style(list{marginLeft(#percent(10.)), width(#percent(80.))})
-}
-let centerText = {
-  open Css
-  style(list{textAlign(#center)})
-}
-
-module OrgDetails = {
-  @react.component
-  let make = (~conservation) => {
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-    // let orgImage = Animal.useGetOrgImage(conservationId);
-    let {logo, id, name} = conservation
-
-    <Rimble.Card className=cardStyle>
-      <a
-        className={
-          open Css
-          style(list{display(#flex), width(#percent(100.)), height(#percent(100.))})
-        }
-        onClick={e => {
-          ReactEvent.Mouse.stopPropagation(e)
-          ReactEvent.Mouse.preventDefault(e)
-          clearAndPush("#org/" ++ id)
-        }}>
-        <img
-          className={
-            open Css
-            style(list{
-              margin(#percent(1.)),
-              objectFit(#contain),
-              width(#percent(98.)),
-              justifyContent(#center),
-              alignItems(#center),
-              hover(list{
-                filter(list{#saturate(150.), #brightness(110.)}),
-                overflow(visible),
-                boxShadow(Shadow.box(~blur=px(20), ~spread=px(20), rgba(121, 181, 80, 0.5))),
-                transform(scale(1.01, 1.01)),
-                transition(~duration=100, ~delay=0, ~timingFunction=ease, "all"),
-              }),
-            })
-          }
-          src={CONSTANTS.cdnBase ++ logo}
-          alt=name
-        />
-      </a>
-    </Rimble.Card>
-  }
-}
-
-@react.component
-let make = () => {
-  let newConservationPartners = usePartners()
-
-  let orgBox = (content, ~key) =>
-    <Rimble.Box key mt=20 mb=20 width=[0.45, 0.45, 0.18] color="black"> content </Rimble.Box>
-
-  <div width="100%">
-    <Rimble.Flex
-      flexWrap="wrap"
-      justifyContent="space-around"
-      alignItems="stretch"
-      pt=50
-      px=50
-      className=blueBackground>
-      <h1> {"Conservation Partners"->restr} </h1>
-    </Rimble.Flex>
-    <Rimble.Flex
-      flexWrap="wrap"
-      justifyContent="space-around"
-      alignItems="stretch"
-      className=blueBackground
-      pb=50
-      px=50>
-      {switch newConservationPartners {
-      | Some(conservationPartners) => <>
-          {conservationPartners
-          ->Array.map(conservation => orgBox(<OrgDetails conservation />, ~key=conservation.id))
-          ->React.array}
-          {
-            // These empty org boxes keep positioning in a uniform grid
-            orgBox(React.null, ~key="a")
-          }
-          {orgBox(React.null, ~key="b")}
-          {orgBox(React.null, ~key="c")}
-          {orgBox(React.null, ~key="d")}
-        </>
-      //  "helloWorld"->React.string;
-      | None => React.null
-      }}
-    </Rimble.Flex>
-    <Rimble.Flex
-      flexWrap="wrap"
-      justifyContent="space-around"
-      alignItems="stretch"
-      className=Styles.infoBackground
-      px=50>
-      <Rimble.Box mt=70 mb=70 width=[1., 1., 0.2] color="black">
-        <Rimble.Card className=cardStyle>
-          <a href="https://www.ubisoft.com/en-us/company/start-ups/station-f.aspx">
-            <img src=ubisoftLogo alt="ubisoft" className=logoStyle />
-            <Rimble.Text className=centerText>
-              {"Ubisoft's Entrepreneurs Lab, Season 4, participants"->restr}
-            </Rimble.Text>
-          </a>
-        </Rimble.Card>
-      </Rimble.Box>
-      <Rimble.Box mt=70 mb=70 width=[1., 1., 0.2] color="black">
-        <Rimble.Card className=cardStyle>
-          <a href="https://ethcapetown.com/">
-            <img src=ethCapeTownLogo alt="eth-cape-town" className=logoStyle />
-            <Rimble.Text className=centerText>
-              {"Overall winners of EthCapeTown hackathon"->restr}
-            </Rimble.Text>
-          </a>
-        </Rimble.Card>
-      </Rimble.Box>
-      <Rimble.Box mt=70 mb=70 width=[1., 1., 0.2] color="black">
-        <Rimble.Card className=cardStyle>
-          <a href="https://cvvc.com/index.php">
-            <img src=cvLabsLogo alt="cv-labs" className=logoStyle />
-            <Rimble.Text className=centerText>
-              {"CV Labs Incubator Program, Batch 2"->restr}
-            </Rimble.Text>
-          </a>
-        </Rimble.Card>
-      </Rimble.Box>
-      <Rimble.Box mt=70 mb=70 width=[1., 1., 0.2] color="black">
-        <Rimble.Card className=cardStyle>
-          <a href="https://kernel.community/">
-            <img src=kernelLogo alt="Kernel Gitcoin" className=logoStyle />
-            <Rimble.Text className=centerText>
-              {"Gitcoin Kernel genesis block participants"->restr}
-            </Rimble.Text>
-          </a>
-        </Rimble.Card>
-      </Rimble.Box>
-    </Rimble.Flex>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/PhotoGallery.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/PhotoGallery.res
deleted file mode 100644
index 9218485..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/PhotoGallery.res
+++ /dev/null
@@ -1,19 +0,0 @@
-type photo = {
-  src: string,
-  width: int,
-  height: int,
-}
-type selectedPhoto = {
-  photo: photo,
-  index: int,
-  // next: photo,
-  // previous: photo,
-}
-
-@module("react-photo-gallery") @react.component
-external // onClick:
-make: (
-  ~photos: array<photo>,
-  ~targetRowHeight: int,
-  ~onClick: (ReactEvent.Mouse.t, selectedPhoto) => unit,
-) => React.element = "default"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/PriceDisplay.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/PriceDisplay.res
deleted file mode 100644
index 5e2a65e..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/PriceDisplay.res
+++ /dev/null
@@ -1,78 +0,0 @@
-open Globals
-
-let priceWeiToTuple = (wei, optCurrentUsdEthPrice) => {
-  let totalPatronageEth = wei->Eth.toFixedWithPrecisionNoTrailingZeros
-
-  let optTotaPatronageUsd =
-    optCurrentUsdEthPrice->Option.map(currentUsdEthPrice =>
-      toFixedWithPrecisionNoTrailingZeros(
-        Float.fromString(totalPatronageEth)->mapd(0., a => a) *. currentUsdEthPrice,
-        ~digits=2,
-      )
-    )
-
-  (totalPatronageEth, optTotaPatronageUsd)
-}
-
-let usePrice = (~chain, animal) => {
-  let optPriceWei = QlHooks.usePrice(~chain, animal)
-  let optCurrentUsdEthPrice = UsdPriceProvider.useUsdPrice()
-
-  switch optPriceWei {
-  | Price(totalPatronageWei) => priceWeiToTuple(totalPatronageWei, optCurrentUsdEthPrice)->Some
-  | Foreclosed(_) => Some(("0", Some("0")))
-  | Loading => None
-  }
-}
-
-module PurePriceDisplay = {
-  @react.component
-  let make = (~priceEth, ~optPriceUsd) => <>
-    <p className={Styles.noMarginTop ++ (" " ++ Styles.noMarginBottom)}>
-      {(priceEth ++ " ETH")->restr}
-    </p>
-    {switch optPriceUsd {
-    | Some(priceUsd) =>
-      <p className=Styles.noMarginTop> <small> {("(" ++ (priceUsd ++ " USD)"))->restr} </small> </p>
-    | None => React.null
-    }}
-  </>
-}
-
-module InUSD = {
-  @react.component
-  let make = (~chain, ~animal: TokenId.t) => {
-    let optPriceWei = QlHooks.usePrice(~chain, animal)
-
-    switch optPriceWei {
-    | Price(totalPatronageWei) =>
-      <p className={Styles.noMarginTop ++ (" " ++ Styles.noMarginBottom)}>
-        {(totalPatronageWei->Eth.toFixedWithPrecisionNoTrailingZeros ++ " USD")->restr}
-      </p>
-    | Foreclosed(_) =>
-      <p className={Styles.noMarginTop ++ (" " ++ Styles.noMarginBottom)}> {"0 USD"->restr} </p>
-
-    | Loading => <Rimble.Loader />
-    }
-  }
-}
-
-module InEth = {
-  @react.component
-  let make = (~chain, ~animal: TokenId.t) => {
-    let optCurrentPrice = usePrice(~chain, animal)
-
-    switch optCurrentPrice {
-    | Some((priceEth, optPriceUsd)) => <PurePriceDisplay priceEth optPriceUsd />
-    | None => <Rimble.Loader />
-    }
-  }
-}
-@react.component
-let make = (~chain, ~animal: TokenId.t) =>
-  switch chain {
-  | Client.MainnetQuery => <InEth chain animal />
-  | Client.Neither
-  | Client.MaticQuery =>
-    <InUSD chain animal />
-  }
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ProfileIcon.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ProfileIcon.res
deleted file mode 100644
index 0e7f313..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ProfileIcon.res
+++ /dev/null
@@ -1,78 +0,0 @@
-open Globals
-
-@react.component
-let make = (~clickAction=() => (), ~isMobile=false) => {
-  let currentUser = RootProvider.useCurrentUser()
-  let networkIdOpt = RootProvider.useNetworkId()
-
-  let displayName = UserProvider.useDisplayName(
-    currentUser->Option.mapWithDefault("loading", a => a),
-  )
-  let displayNameStr = UserProvider.displayNameToString(displayName)
-
-  let userAddressLowerCase = switch currentUser {
-  | Some(currentUser) => currentUser->Js.String.toLowerCase //TODO - check with zuck this cant be a 3box name name
-  | _ => CONSTANTS.nullEthAddress
-  }
-
-  let optThreeBoxData = UserProvider.use3BoxUserData(userAddressLowerCase)
-  let optProfile = \">>="(optThreeBoxData, a => a.profile)
-  let profileImage: string =
-    \">>="(
-      \"<$>"(\">>="(\">>="(optProfile, a => a.image), img => img->Array.get(0)), a => a.contentUrl),
-      content => Js.Dict.get(content, "/"),
-    )->Option.mapWithDefault(Blockie.makeBlockie(. userAddressLowerCase), hash =>
-      "https://ipfs.infura.io/ipfs/" ++ hash
-    )
-
-  let message = switch (networkIdOpt, currentUser) {
-  | (None, _) => "Connect to network"
-  | (Some(_), None) => "Loading user"
-  | (Some(_), Some(_)) => displayNameStr
-  }
-
-  let profileIcon =
-    <img
-      className={
-        open Css
-        style(list{
-          borderRadius(#percent(50.)),
-          width(#px(40)),
-          height(#px(40)),
-          marginLeft(#px(10)),
-        })
-      }
-      src=profileImage
-    />
-
-  let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-  switch networkIdOpt {
-  | None => React.null
-  | Some(_) =>
-    isMobile
-      ? <div
-          onClick={_ => {
-            clickAction()
-            clearAndPush("#user/" ++ userAddressLowerCase)
-          }}
-          className={
-            open Css
-            style(list{display(#flex), flexDirection(#row)})
-          }>
-          <div>
-            <p> <strong> {"View Your Profile:"->restr} </strong> </p> <p> {message->restr} </p>
-          </div>
-          profileIcon
-        </div>
-      : <Rimble.Tooltip message placement="bottom">
-          <div
-            onClick={_ => {
-              clickAction()
-              clearAndPush("#user/" ++ userAddressLowerCase)
-            }}>
-            profileIcon
-          </div>
-        </Rimble.Tooltip>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/QVSelect.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/QVSelect.res
deleted file mode 100644
index 419bb96..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/QVSelect.res
+++ /dev/null
@@ -1,93 +0,0 @@
-open Globals
-
-let hasDecimals = value => value -. value->Float.toInt->Float.fromInt > 0.
-
-@react.component
-let make = (~submitVoteFunction: float => unit, ~maxVote: float) => {
-  let (voteValue, setVoteValue) = React.useState(_ => maxVote)
-  let (voteText, setVoteText) = React.useState(_ =>
-    maxVote->toFixedWithPrecisionNoTrailingZeros(~digits=9)
-  )
-  let customVote: string => unit = voteValueString => {
-    let optVoteValue = Float.fromString(voteValueString)
-
-    switch optVoteValue {
-    | None =>
-      if voteValueString == "" {
-        setVoteText(_ => voteValueString)
-      } else {
-        ()
-      }
-    | Some(voteValue) =>
-      setVoteText(_ => voteValueString)
-      if voteValue < 0. {
-        // If negative set to 0
-        setVoteValue(_ => 0.)
-      } else if voteValue >= maxVote {
-        // If above max, set to max
-        setVoteText(_ => maxVote->toFixedWithPrecisionNoTrailingZeros(~digits=9))
-        setVoteValue(_ => maxVote)
-      } else {
-        setVoteValue(_ => voteValue)
-      }
-    }
-  }
-
-  <Rimble.Flex flexWrap="wrap" alignItems="space-between">
-    {React.array(
-      [1., 2., 3., 4., 5.]->Array.map(x => {
-        let disabled = x >= maxVote
-        <Rimble.Box key={x->Js.Float.toString} width=[1., 0.32]>
-          <Rimble.Button
-            className={
-              open Css
-              style(list{width(#percent(90.)), margin(#percent(5.))})
-            }
-            key={x->Float.toString}
-            onClick={_ => submitVoteFunction(x)}
-            disabled>
-            {(x->Float.toString ++ (" Vote = " ++ ((x *. x)->Float.toString ++ " WLT")))->restr}
-          </Rimble.Button>
-        </Rimble.Box>
-      }),
-    )}
-    <Rimble.Box width=[1., 0.32]>
-      <form
-        className={
-          open Css
-          style(list{width(#percent(90.)), margin(#percent(5.))})
-        }>
-        <input
-          value=voteText
-          type_="number"
-          min=0
-          max={maxVote->Float.toString}
-          onChange={event => {
-            let voteString = ReactEvent.Form.target(event)["value"]
-            customVote(voteString)
-          }}
-          className={
-            open Css
-            style(list{
-              width(#calc(#sub, #percent(94.), #px(2))),
-              padding(#percent(3.)),
-              borderWidth(#px(1)),
-              borderRadius(#px(3)),
-            })
-          }
-        />
-        <button
-          onClick={_ => submitVoteFunction(voteValue)}
-          className={
-            open Css
-            style(list{width(#percent(100.)), marginTop(#px(2)), fontSize(#px(11))})
-          }>
-          {(voteValue->toFixedWithPrecisionNoTrailingZeros(~digits=9) ++
-            (" votes = " ++
-            ((voteValue *. voteValue)->toFixedWithPrecisionNoTrailingZeros(~digits=3) ++ " WLT")))
-            ->restr}
-        </button>
-      </form>
-    </Rimble.Box>
-  </Rimble.Flex>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/QlHooks.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/QlHooks.res
deleted file mode 100644
index 93d96d6..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/QlHooks.res
+++ /dev/null
@@ -1,975 +0,0 @@
-open Globals
-module QueryFetchPolicy = ApolloClient__React_Hooks_UseQuery.WatchQueryFetchPolicy
-
-type owner = {"address": Js.Json.t}
-
-type price = {"price": Eth.t}
-
-type wildcard = {
-  id: string,
-  tokenId: TokenId.t,
-  patronageNumerator: Js.Json.t,
-  owner: owner,
-  price: price,
-}
-
-let decodeBN: Js.Json.t => BN.t = number =>
-  number
-  ->Js.Json.decodeString
-  ->Belt.Option.mapWithDefault("0", a => a) /* trusting that gql will be reliable here */
-  ->BN.new_
-
-open GqlConverters
-
-module InitialLoad = %graphql(`
-       query($amount: Int!, $globalId: String!) {
-         wildcards(first: $amount) {
-           id
-           animal: tokenId @ppxCustom(module: "GqlTokenId")
-           owner {
-             address
-             id
-           }
-           price {
-             price @ppxCustom(module: "Price")
-             id
-           }
-           totalCollected @ppxCustom(module: "Price")
-           timeCollected @ppxCustom(module: "BigInt")
-           patronageNumeratorPriceScaled @ppxCustom(module: "BigInt")
-           timeAcquired @ppxCustom(module: "GqlMoment")
-           auctionStartPrice @ppxCustom(module: "BigInt")
-           launchTime @ppxCustom(module: "BigInt")
-         }
-         global(id: $globalId) {
-           id
-           totalCollectedOrDueAccurate @ppxCustom(module: "BigInt")
-           timeLastCollected @ppxCustom(module: "BigInt")
-           totalTokenCostScaledNumeratorAccurate @ppxCustom(module: "BigInt")
-           defaultAuctionLength @ppxCustom(module: "BigInt")
-           defaultAuctionEndPrice @ppxCustom(module: "BigInt")
-           defaultAuctionStartPrice @ppxCustom(module: "BigInt")
-         }
-       }
-     `)
-
-let createContext: Client.queryContext => Js.Json.t = Obj.magic
-
-let useInitialDataLoad = (~chain) => {
-  let initLoadQuery = InitialLoad.use(
-    ~notifyOnNetworkStatusChange=true,
-    ~fetchPolicy=QueryFetchPolicy.CacheFirst,
-    ~context={context: chain}->createContext,
-    InitialLoad.makeVariables(
-      ~amount=switch chain {
-      | Client.MaticQuery => 31
-      | Client.Neither
-      | Client.MainnetQuery => 30
-      },
-      ~globalId=switch chain {
-      | Client.MaticQuery => "Matic-Global"
-      | Client.Neither
-      | Client.MainnetQuery => "1"
-      },
-      (),
-    ),
-  )
-
-  switch initLoadQuery {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data, _} => data
-  }
-}
-
-let useAnimalList = (~chain) => {
-  let allData = useInitialDataLoad(~chain)
-  React.useMemo2(
-    () => \"||||"(allData->oMap(data => data.wildcards->Array.map(wc => wc.animal)), []),
-    (allData, chain),
-  )
-}
-
-module SubWildcardQuery = %graphql(`
-       query ($tokenId: String!) {
-         wildcard(id: $tokenId) {
-           id
-           animal: tokenId @ppxCustom(module: "GqlTokenId")
-           timeAcquired @ppxCustom(module: "GqlMoment")
-           totalCollected @ppxCustom(module: "Price")
-           patronageNumerator @ppxCustom(module: "BigInt")
-           patronageNumeratorPriceScaled @ppxCustom(module: "BigInt")
-           timeCollected @ppxCustom(module: "BigInt")
-           # timeCollected @ppxCustom(module: "GqlMoment")
-           price {
-             id
-             price @ppxCustom(module: "Price")
-           }
-           owner {
-             address @ppxCustom(module: "GqlAddress")
-             id
-           }
-           auctionStartPrice @ppxCustom(module: "BigInt")
-           launchTime @ppxCustom(module: "BigInt")
-         }
-       }
-     `)
-
-module WildcardDataQuery = %graphql(`
-    query ($tokenId: String!) {
-      launchedWildcards_by_pk(id: $tokenId) {
-        wildcard {
-          id
-          name
-          description
-          organization {
-            name
-            id
-          }
-          image
-          real_wc_photos {
-            image
-            photographer
-          }
-          artistOfWildcard {
-            name
-            id
-          }
-        }
-      }
-    }
-  `)
-
-module MaticStateQuery = %graphql(`
-    query ($address: String!, $network: String!) {
-      maticState(address: $address, network: $network) {
-        balance
-        daiNonce
-        error
-        stewardNonce
-      }
-    }
-  `)
-module HomeAnimalsQuery = %graphql(`
-    {
-      homeAnimals {
-        id
-        next
-        prev
-        wildcardData {
-          description
-          id
-          name
-          organisationId
-        }
-      }
-    }
-  `)
-
-module ArtistQuery = %graphql(`
-    query ($artistIdentifier: String!) {
-      artist_by_pk(id: $artistIdentifier) {
-        eth_address
-        id
-        name
-        website
-        launchedWildcards: wildcardData (where: {id: { _is_null: false}}) {
-          key
-          id
-          name
-          image
-          organization {
-            id
-            name
-            logo
-          }
-        }
-        unlaunchedWildcards: wildcardData (where: {id: { _is_null: true}}) {
-          key
-          name
-          image
-          organization {
-            id
-            name
-            logo
-          }
-        }
-      }
-    }
-  `)
-// // NOTE: If multiple transactions happen in the same block they may get missed, maybe one day that will be a problem for us ;)
-// module SubStateChangeEvents = [%graphql
-//   {|
-//        subscription {
-//          stateChanges(first: 1, orderBy: timestamp, orderDirection: desc) {
-//            id
-//            timestamp
-//            wildcardChanges {
-//              id
-//              tokenId
-//              timeAcquired
-//              totalCollected
-//              patronageNumeratorPriceScaled
-//              timeCollected
-//              price {
-//                id
-//                price
-//              }
-//              owner {
-//                address
-//                id
-//              }
-//            }
-//            patronChanges {
-//              id
-//              address
-//              lastUpdated
-//              # lastUpdated @ppxCustom(module: "GqlMoment")
-//              previouslyOwnedTokens {
-//                id
-//              }
-//              tokens {
-//                id
-//              }
-//              availableDeposit
-//              patronTokenCostScaledNumerator
-//              foreclosureTime
-//            }
-//          }
-//        }
-//      |}
-// ];
-
-module LoadPatron = %graphql(`
-       query ($patronId: String!) {
-         patron(id: $patronId) {
-           id
-           previouslyOwnedTokens {
-             id
-           }
-           tokens {
-             id
-           }
-           availableDeposit  @ppxCustom(module: "Price")
-           patronTokenCostScaledNumerator  @ppxCustom(module: "BigInt")
-           foreclosureTime  @ppxCustom(module: "BigInt")
-           address @ppxCustom(module: "GqlAddress")
-           lastUpdated @ppxCustom(module: "BigInt")
-           totalLoyaltyTokens @ppxCustom(module: "BigInt")
-           totalLoyaltyTokensIncludingUnRedeemed @ppxCustom(module: "BigInt")
-         }
-       }
-     `)
-
-module LoadTokenDataArray = %graphql(`
-        query ($wildcardIdArray: [String!]!) {
-          wildcards (where: {id_in: $wildcardIdArray}) {
-            # totalCollected
-            # patronageNumeratorPriceScaled
-            # timeCollected
-            id
-            totalCollected @ppxCustom(module: "Price")
-            patronageNumeratorPriceScaled @ppxCustom(module: "BigInt")
-            timeCollected @ppxCustom(module: "BigInt")
-          }
-        }
-     `)
-
-module LoadOrganisationData = %graphql(`
-      query ($orgId: String!) {
-        organisations_by_pk(id: $orgId) {
-          description
-          name
-          website
-          wildcard (where: {id: {_is_null: false}}) {
-            id @ppxCustom(module: "GqlTokenIdStr")
-          }
-          unlaunched: wildcard(where: {id: {_is_null: true}, real_wc_photos: {image: {_is_null: false}}}) {
-            key
-            real_wc_photos {
-              image
-              photographer
-            }
-            name
-            commonName
-            description
-          }
-          logo
-          logo_badge
-          youtube_vid
-        }
-      }
-     `)
-
-module LoadTopContributors = %graphql(`
-      query ($numberOfLeaders: Int!) {
-        patrons(first: $numberOfLeaders, orderBy: patronTokenCostScaledNumerator, orderDirection: desc, where: {id_not: "NO_OWNER"}) {
-          id
-          patronTokenCostScaledNumerator  @ppxCustom(module: "BigInt")
-        }
-      }
-  `)
-
-module SubTotalRaisedOrDueQuery = %graphql(`
-       query {
-         global(id: "1") {
-           id
-           totalCollectedOrDueAccurate @ppxCustom(module: "BigInt")
-           timeLastCollected @ppxCustom(module: "BigInt")
-           totalTokenCostScaledNumeratorAccurate @ppxCustom(module: "BigInt")
-         }
-       }
-     `)
-
-let getQueryPrefix = (chain: Client.context) =>
-  switch chain {
-  | MainnetQuery
-  | Neither => ""
-  | MaticQuery => "matic"
-  }
-
-type data = {tokenId: string}
-
-let useWildcardQuery = (~chain, tokenId) => {
-  let wildcardQuery = SubWildcardQuery.use(
-    ~context={context: chain}->createContext,
-    SubWildcardQuery.makeVariables(~tokenId=chain->getQueryPrefix ++ tokenId->TokenId.toString, ()),
-  )
-
-  switch wildcardQuery {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data, _} => data
-  }
-}
-
-let useLoadTokenDataArrayQuery = (~chain, tokenIdArray) => {
-  let tokenDataQuery = LoadTokenDataArray.use(
-    ~context={context: chain}->createContext,
-    LoadTokenDataArray.makeVariables(
-      ~wildcardIdArray=tokenIdArray->Array.map(id => id->TokenId.toString),
-      (),
-    ),
-  )
-  switch tokenDataQuery {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data, _} => data
-  }
-}
-let useWildcardDataQuery = tokenId => {
-  let wildcardQuery = WildcardDataQuery.use(
-    WildcardDataQuery.makeVariables(~tokenId=tokenId->TokenId.toString, ()),
-  )
-  switch wildcardQuery {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data: Some({launchedWildcards_by_pk}), _} => launchedWildcards_by_pk
-  | {data: None, _} => None
-  }
-}
-
-let useHomeAnimalsQuery = () =>
-  switch HomeAnimalsQuery.use() {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data: Some({homeAnimals}), _} => Some(homeAnimals)
-  | {data: None, _} => None
-  }
-
-let useLoadOrganisationQuery = orgId => {
-  let orgQuery = LoadOrganisationData.use(LoadOrganisationData.makeVariables(~orgId, ()))
-  switch orgQuery {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data: Some({organisations_by_pk}), _} => organisations_by_pk
-  | {data: None, _} => None
-  }
-}
-let useLoadOrganisationLogo = orgId =>
-  switch useLoadOrganisationQuery(orgId) {
-  | Some({logo, _}) => Some(logo)
-  | None => None
-  }
-let useLoadOrganisationLogoBadge = orgId =>
-  switch useLoadOrganisationQuery(orgId) {
-  | Some({logo_badge: Some(badge), _}) => Some(badge)
-  | Some({logo, _}) => Some(logo)
-  | None => None
-  }
-
-type homePageAnimal = {
-  id: TokenId.t,
-  prev: TokenId.t,
-  next: TokenId.t,
-}
-
-let useHomePageAnimalArray = () =>
-  switch useHomeAnimalsQuery() {
-  | Some(homeAnimals) =>
-    homeAnimals->Array.map(animal => {
-      id: TokenId.fromStringUnsafe(animal.id),
-      prev: TokenId.fromStringUnsafe(animal.prev),
-      next: TokenId.fromStringUnsafe(animal.next),
-    })
-  | None => []
-  }
-let useDetailsPageNextPrevious = (currentToken: TokenId.t) => {
-  let homepageAnimalData = useHomePageAnimalArray()
-  let defaultValue = {
-    id: TokenId.fromStringUnsafe("2"),
-    next: TokenId.fromStringUnsafe("1"),
-    prev: TokenId.fromStringUnsafe("0"),
-  }
-  let forwardNextLookup = React.useMemo1(() =>
-    homepageAnimalData->Array.reduce(Js.Dict.empty(), (dict, item) => {
-      dict->Js.Dict.set(item.id->TokenId.toString, item)
-      dict
-    })
-  , [homepageAnimalData])
-
-  \"||||"(forwardNextLookup->Js.Dict.get(currentToken->TokenId.toString), defaultValue)
-}
-
-@decco.decode
-type animalDescription = array<string>
-let useWildcardDescription = tokenId =>
-  switch useWildcardDataQuery(tokenId) {
-  | Some({wildcard: {description, _}, _}) =>
-    description
-    ->animalDescription_decode
-    ->Belt.Result.mapWithDefault(None, descriptionArray => Some(descriptionArray))
-  | None => None
-  }
-
-let useWildcardName = tokenId =>
-  switch useWildcardDataQuery(tokenId) {
-  | Some({wildcard: {name, _}, _}) => name
-  | None => None
-  }
-let useWildcardAvatar = tokenId =>
-  switch useWildcardDataQuery(tokenId) {
-  | Some({wildcard: {image, _}, _}) => image
-  | None => None
-  }
-let useWildcardArtist = tokenId =>
-  switch useWildcardDataQuery(tokenId) {
-  | Some({wildcard: {artistOfWildcard, _}, _}) => artistOfWildcard
-  | None => None
-  }
-let useRealImages = tokenId =>
-  switch useWildcardDataQuery(tokenId) {
-  | Some({wildcard: {real_wc_photos, _}, _}) => Some(real_wc_photos)
-  | None => None
-  }
-let useWildcardOrgId = (~tokenId) =>
-  switch useWildcardDataQuery(tokenId) {
-  | Some({wildcard: {organization: Some({id, _}), _}, _}) => Some(id)
-  | _ => None
-  }
-let useWildcardOrgName = (~tokenId) =>
-  switch useWildcardDataQuery(tokenId) {
-  | Some({wildcard: {organization: Some({name, _}), _}, _}) => Some(name)
-  | _ => None
-  }
-
-let useLoadTopContributors = numberOfLeaders => {
-  let topContributorsQuery = LoadTopContributors.use(
-    LoadTopContributors.makeVariables(~numberOfLeaders, ()),
-  )
-  switch topContributorsQuery {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data: Some({patrons}), _} => Some(patrons)
-  | {data: None, _} => None
-  }
-}
-let useLoadTopContributorsData = numberOfLeaders =>
-  switch useLoadTopContributors(numberOfLeaders) {
-  | Some(topContributors) =>
-    topContributors
-    ->Array.map(patron => {
-      let monthlyContribution =
-        patron.patronTokenCostScaledNumerator
-        ->BN.mul(BN.new_("2592000")) // A month with 30 days has 2592000 seconds
-        ->BN.div(
-          // BN.new_("1000000000000")->BN.mul( BN.new_("31536000")),
-          BN.new_("31536000000000000000"),
-        )
-        ->Web3Utils.fromWeiBNToEthPrecision(~digits=4)
-      (patron.id, monthlyContribution)
-    })
-    ->Some
-  | None => None
-  }
-let usePatron: (~chain: Client.context, TokenId.t) => option<string> = (~chain, animal) =>
-  switch useWildcardQuery(~chain, animal) {
-  | Some({wildcard: Some({owner: {address, _}, _})}) => Some(address)
-  | Some({wildcard: None})
-  | None =>
-    None
-  }
-
-let useIsAnimalOwened = (~chain, ownedAnimal) => {
-  let currentAccount = RootProvider.useCurrentUser()->Belt.Option.mapWithDefault("loading", a => a)
-
-  let currentPatron =
-    usePatron(~chain, ownedAnimal)->Belt.Option.mapWithDefault("no-patron-defined", a => a)
-
-  currentAccount->Js.String.toLowerCase == currentPatron->Js.String.toLocaleLowerCase
-}
-
-let useTimeAcquired: (~chain: Client.context, TokenId.t) => option<MomentRe.Moment.t> = (
-  ~chain,
-  animal,
-) =>
-  switch useWildcardQuery(~chain, animal) {
-  | Some({wildcard: Some({timeAcquired, _})}) => Some(timeAcquired)
-  | Some({wildcard: None})
-  | None =>
-    None
-  }
-
-let useQueryPatron = (~chain, patron) => {
-  let loadPatronQuery = LoadPatron.use(
-    ~context={context: chain}->createContext,
-    LoadPatron.makeVariables(~patronId=chain->getQueryPrefix ++ patron, ()),
-  )
-  switch loadPatronQuery {
-  | {data: Some({patron}), _} => patron
-  | {data: None, _} => None
-  // | {error: Some(_error), _} => None
-  // | {loading: true, _} => None
-  }
-}
-
-let useForeclosureTimeBn = (~chain, patron) =>
-  switch useQueryPatron(~chain, patron) {
-  | Some({foreclosureTime, _}) => Some(foreclosureTime)
-  | None => None
-  }
-
-let useForeclosureTime = (~chain, patron) =>
-  useForeclosureTimeBn(~chain, patron)->Option.map(Helper.bnToMoment)
-
-let useTimeAcquiredWithDefault = (~chain, animal, default: MomentRe.Moment.t) =>
-  \"||||"(useTimeAcquired(~chain, animal), default)
-let useDaysHeld = (~chain, tokenId) =>
-  useTimeAcquired(~chain, tokenId)->oMap(moment => (
-    MomentRe.diff(MomentRe.momentNow(), moment, #days),
-    moment,
-  ))
-let useTotalCollectedOrDue = () => {
-  let subTotalRaisedQuery = SubTotalRaisedOrDueQuery.use()
-  switch subTotalRaisedQuery {
-  | {error: Some(_error), _} => None
-  | {data: None, _} => None
-  | {data: Some({global}), _} => global
-  }
-}
-
-let getCurrentTimestamp = () => string_of_int(Js.Math.floor(Js.Date.now() /. 1000.))
-
-let useCurrentTime = () => {
-  let (currentTime, setTimeLeft) = React.useState(() => getCurrentTimestamp())
-
-  React.useEffect1(() => {
-    let interval = Js.Global.setInterval(() => setTimeLeft(_ => getCurrentTimestamp()), 2000)
-    Some(() => Js.Global.clearInterval(interval))
-  }, [setTimeLeft])
-  currentTime
-}
-let useCurrentTimestampBn = () => useCurrentTime()->BN.new_
-let useAmountRaised = () => {
-  let currentTimestamp = useCurrentTime()
-
-  useTotalCollectedOrDue()->oMap(({
-    totalCollectedOrDueAccurate,
-    timeLastCollected,
-    totalTokenCostScaledNumeratorAccurate,
-    _,
-  }) => {
-    let timeElapsed = BN.new_(currentTimestamp)->BN.sub(timeLastCollected)
-
-    let amountRaisedSinceLastCollection =
-      totalTokenCostScaledNumeratorAccurate
-      ->BN.mul(timeElapsed)
-      ->BN.div(
-        // BN.new_("1000000000000")->BN.mul( BN.new_("31536000")),
-        BN.new_("31536000000000000000"),
-      )
-    totalCollectedOrDueAccurate->BN.add(amountRaisedSinceLastCollection)
-  })
-}
-
-let useTotalCollectedToken: (~chain: Client.context, TokenId.t) => option<(Eth.t, BN.t, BN.t)> = (
-  ~chain,
-  animal,
-) =>
-  switch useWildcardQuery(~chain, animal) {
-  | Some({wildcard: Some({totalCollected, timeCollected, patronageNumeratorPriceScaled, _})}) =>
-    Some((totalCollected, timeCollected, patronageNumeratorPriceScaled))
-  | Some({wildcard: None})
-  | None =>
-    None
-  }
-
-let usePatronageNumerator = (~chain, tokenId: TokenId.t) =>
-  switch useWildcardQuery(~chain, tokenId) {
-  | Some({wildcard: Some({patronageNumerator, _})}) => Some(patronageNumerator)
-  | Some({wildcard: None})
-  | None =>
-    None
-  }
-
-// TODO: fix this, this is a hardcoded pledgerate. It should be fetched from the graph!
-let usePledgeRate = (~chain, tokenId) => {
-  let optPatronageNumerator = usePatronageNumerator(~chain, tokenId)
-  React.useMemo1(() =>
-    switch optPatronageNumerator {
-    | Some(patronageNumerator) =>
-      let result = \"|/|"(patronageNumerator, BN.new_("12000000000"))
-      result->BN.toNumberFloat /. 1000.
-    | None => 0.
-    }
-  , [optPatronageNumerator])
-}
-
-let usePledgeRateDetailed = (~chain, tokenId) => {
-  let pledgeRate = usePledgeRate(~chain, tokenId)
-  let inversePledgeRate = 1. /. pledgeRate
-  let numeratorOverYear = (pledgeRate *. 1200.)->Float.toInt->string_of_int
-  (numeratorOverYear, "100", pledgeRate, inversePledgeRate)
-}
-
-type patronLoyaltyTokenDetails = {
-  currentLoyaltyTokens: Eth.t,
-  currentLoyaltyTokensIncludingUnredeemed: Eth.t,
-  lastCollected: BN.t,
-  numberOfAnimalsOwned: BN.t,
-}
-let usePatronLoyaltyTokenDetails = (~chain, address) =>
-  switch useQueryPatron(~chain, address) {
-  | Some(patron) =>
-    Some({
-      currentLoyaltyTokens: patron.totalLoyaltyTokens,
-      currentLoyaltyTokensIncludingUnredeemed: patron.totalLoyaltyTokensIncludingUnRedeemed,
-      lastCollected: patron.lastUpdated,
-      numberOfAnimalsOwned: BN.new_(patron.tokens->Obj.magic->Array.length->string_of_int),
-    })
-  | _ => None
-  }
-
-// TODO:: Take min of total deposit and amount raised
-let useAmountRaisedToken: (~chain: Client.context, TokenId.t) => option<Eth.t> = (
-  ~chain,
-  animal,
-) => {
-  let currentTimestamp = useCurrentTime()
-
-  switch useTotalCollectedToken(~chain, animal) {
-  | Some((amountCollectedOrDue, timeCalculated, patronageNumeratorPriceScaled)) =>
-    let timeElapsed = BN.new_(currentTimestamp)->BN.sub(timeCalculated)
-
-    let amountRaisedSinceLastCollection =
-      patronageNumeratorPriceScaled
-      ->BN.mul(timeElapsed)
-      ->BN.div(
-        // BN.new_("1000000000000")->BN.mul( BN.new_("31536000")),
-        BN.new_("31536000000000000000"),
-      )
-
-    Some(amountCollectedOrDue->BN.add(amountRaisedSinceLastCollection))
-  | None => None
-  }
-}
-let calculateTotalRaised = (
-  currentTimestamp,
-  (amountCollectedOrDue, timeCalculated, patronageNumeratorPriceScaled),
-) => {
-  let timeElapsed = BN.new_(currentTimestamp)->BN.sub(timeCalculated)
-
-  let amountRaisedSinceLastCollection =
-    patronageNumeratorPriceScaled
-    ->BN.mul(timeElapsed)
-    ->BN.div(
-      // BN.new_("1000000000000")->BN.mul( BN.new_("31536000")),
-      BN.new_("31536000000000000000"),
-    )
-
-  amountCollectedOrDue->BN.add(amountRaisedSinceLastCollection)
-}
-let useTotalRaisedAnimalGroup: array<TokenId.t> => (option<Eth.t>, option<Eth.t>) = animals => {
-  let currentTimestamp = useCurrentTime()
-
-  let detailsMainnet = useLoadTokenDataArrayQuery(~chain=Client.MainnetQuery, animals)
-  let detailsMatic = useLoadTokenDataArrayQuery(
-    ~chain=Client.MaticQuery,
-    animals->Array.map(id => ("matic" ++ id->Obj.magic)->Obj.magic),
-  )
-
-  (
-    switch detailsMainnet {
-    | Some(detailsArray) =>
-      Some(
-        detailsArray.wildcards->Array.reduce(BN.new_("0"), (acc, animalDetails) =>
-          \"|+|"(
-            calculateTotalRaised(
-              currentTimestamp,
-              (
-                animalDetails.totalCollected,
-                animalDetails.timeCollected,
-                animalDetails.patronageNumeratorPriceScaled,
-              ),
-            ),
-            acc,
-          )
-        ),
-      )
-    | None => None
-    },
-    switch detailsMatic {
-    | Some(detailsArray) =>
-      Some(
-        detailsArray.wildcards->Array.reduce(BN.new_("0"), (acc, animalDetails) =>
-          \"|+|"(
-            calculateTotalRaised(
-              currentTimestamp,
-              (
-                animalDetails.totalCollected,
-                animalDetails.timeCollected,
-                animalDetails.patronageNumeratorPriceScaled,
-              ),
-            ),
-            acc,
-          )
-        ),
-      )
-    | None => None
-    },
-  )
-}
-
-let useTimeSinceTokenWasLastSettled: (~chain: Client.context, TokenId.t) => option<BN.t> = (
-  ~chain,
-  animal,
-) => {
-  let currentTimestamp = useCurrentTime()
-
-  switch useTotalCollectedToken(~chain, animal) {
-  | Some((_, timeCalculated, _)) =>
-    let timeElapsed = BN.new_(currentTimestamp)->BN.sub(timeCalculated)
-
-    Some(timeElapsed)
-  | None => None
-  }
-}
-
-let useUnredeemedLoyaltyTokenDueForUser: (
-  ~chain: Client.context,
-  TokenId.t,
-  int,
-) => option<Eth.t> = (~chain, animal, numberOfTokens) =>
-  switch useTimeSinceTokenWasLastSettled(~chain, animal) {
-  | Some(timeSinceTokenWasLastSettled) =>
-    let totalLoyaltyTokensPerSecondPerAnimal = BN.new_("11574074074074")
-    let totalLoyaltyTokensForAllAnimals = \"|*|"(
-      \"|*|"(timeSinceTokenWasLastSettled, totalLoyaltyTokensPerSecondPerAnimal),
-      BN.newInt_(numberOfTokens),
-    )
-    Some(totalLoyaltyTokensForAllAnimals)
-  | None => None
-  }
-let useTotalLoyaltyToken: (~chain: Client.context, Web3.ethAddress) => option<(Eth.t, Eth.t)> = (
-  ~chain,
-  patron,
-) => {
-  let currentTimestamp = useCurrentTime()
-
-  switch usePatronLoyaltyTokenDetails(~chain, patron) {
-  | Some({
-      currentLoyaltyTokens,
-      currentLoyaltyTokensIncludingUnredeemed,
-      lastCollected,
-      numberOfAnimalsOwned,
-    }) =>
-    let timeElapsed = \"|-|"(BN.new_(currentTimestamp), lastCollected)
-    // Reference: https://github.com/wild-cards/contracts-private/blob/v2testing/migrations/7_receipt_tokens.js#L6
-    let totalLoyaltyTokensPerSecondPerAnimal = BN.new_("11574074074074")
-    let totalLoyaltyTokensFor1Animal = \"|*|"(totalLoyaltyTokensPerSecondPerAnimal, timeElapsed)
-    let totalLoyaltyTokensForAllAnimals = \"|*|"(numberOfAnimalsOwned, totalLoyaltyTokensFor1Animal)
-    let totalLoyaltyTokensForUser = \"|+|"(
-      currentLoyaltyTokensIncludingUnredeemed,
-      totalLoyaltyTokensForAllAnimals,
-    )
-    Some((totalLoyaltyTokensForUser, currentLoyaltyTokens))
-  | None => None
-  }
-}
-
-// TODO:: Take min of total deposit and amount raised
-let useRemainingDepositEth: (~chain: Client.context, string) => option<Eth.t> = (
-  ~chain,
-  patron,
-) => {
-  let currentTimestamp = useCurrentTime()
-
-  switch useQueryPatron(~chain, patron) {
-  | Some({availableDeposit, lastUpdated, patronTokenCostScaledNumerator, _}) =>
-    let timeElapsed = BN.new_(currentTimestamp)->BN.sub(lastUpdated)
-
-    let amountRaisedSinceLastCollection =
-      patronTokenCostScaledNumerator
-      ->BN.mul(timeElapsed)
-      ->BN.div(
-        // BN.new_("1000000000000")->BN.mul( BN.new_("31536000")),
-        BN.new_("31536000000000000000"),
-      )
-    Some(availableDeposit->BN.sub(amountRaisedSinceLastCollection))
-  | None => None
-  }
-}
-
-type animalPrice =
-  | Foreclosed(BN.t)
-  | Price(Eth.t)
-  | Loading
-
-let usePrice: (~chain: Client.context, TokenId.t) => animalPrice = (~chain, tokenId) => {
-  let wildcardData = useWildcardQuery(~chain, tokenId)
-  let optCurrentPatron = usePatron(~chain, tokenId)
-  let currentPatron = optCurrentPatron->Belt.Option.mapWithDefault("no-patron-defined", a => a)
-  let currentTime = useCurrentTime()
-  let foreclosureTime = useForeclosureTimeBn(~chain, currentPatron)
-
-  switch (wildcardData, optCurrentPatron, foreclosureTime) {
-  | (Some({wildcard: Some({price: {price, _}, _})}), Some(_currentPatron), Some(foreclosureTime)) =>
-    if foreclosureTime->BN.lt(currentTime->BN.new_) {
-      Foreclosed(foreclosureTime)
-    } else {
-      Price(price)
-    }
-  | (Some({wildcard: Some({price: {price, _}, _})}), Some(_currentPatron), None) => Price(price)
-  | _ => Loading
-  }
-}
-
-let useIsForeclosed = (~chain, currentPatron) => {
-  let optAvailableDeposit = useRemainingDepositEth(~chain, currentPatron)
-
-  optAvailableDeposit->Option.mapWithDefault(true, availableDeposit =>
-    !(availableDeposit->BN.gt(BN.new_("0")))
-  )
-}
-
-let useAuctionStartPrice = (~chain, _tokenId: TokenId.t) => {
-  let optData = useInitialDataLoad(~chain)
-
-  optData
-  ->Option.flatMap(data => data.global)
-  ->Option.map(global => global.defaultAuctionStartPrice)
-}
-let useAuctionEndPrice = (~chain, _tokenId: TokenId.t) => {
-  let optData = useInitialDataLoad(~chain)
-
-  optData->Option.flatMap(data => data.global)->Option.map(global => global.defaultAuctionEndPrice)
-}
-let useAuctioLength = (~chain, _tokenId: TokenId.t) => {
-  let optData = useInitialDataLoad(~chain)
-
-  optData->Option.flatMap(data => data.global)->Option.map(global => global.defaultAuctionLength)
-}
-let useLaunchTimeBN = (~chain, tokenId: TokenId.t) =>
-  switch useWildcardQuery(~chain, tokenId) {
-  | Some({wildcard: Some({launchTime, _})}) => Some(launchTime)
-  | Some({wildcard: None})
-  | None =>
-    None
-  }
-
-let useMaticState = (~forceRefetch, address, network) => {
-  let query = MaticStateQuery.use(
-    ~fetchPolicy=forceRefetch ? QueryFetchPolicy.CacheAndNetwork : QueryFetchPolicy.CacheFirst,
-    MaticStateQuery.makeVariables(~address, ~network, ()),
-  )
-  switch query {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data: Some({maticState}), _} => Some(maticState)
-  | _ => None
-  }
-}
-
-let useArtistData = (~artistIdentifier) => {
-  let artistQuery = ArtistQuery.use(ArtistQuery.makeVariables(~artistIdentifier, ()))
-
-  switch artistQuery {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data: Some({artist_by_pk}), _} => artist_by_pk
-  | _ => None
-  }
-}
-
-let useArtistEthAddress = (~artistIdentifier) => {
-  let artistData = useArtistData(~artistIdentifier)
-  artistData->Option.flatMap(data => data.eth_address)
-}
-let useArtistName = (~artistIdentifier) => {
-  let artistData = useArtistData(~artistIdentifier)
-  artistData->Option.map(data => data.name)
-}
-let useArtistWebsite = (~artistIdentifier) => {
-  let artistData = useArtistData(~artistIdentifier)
-  artistData->Option.flatMap(data => data.website)
-}
-let useArtistLaunchedWildcards = (~artistIdentifier) => {
-  let artistData = useArtistData(~artistIdentifier)
-  artistData->Option.map(data => data.launchedWildcards)
-}
-let useArtistUnlaunchedWildcards = (~artistIdentifier) => {
-  let artistData = useArtistData(~artistIdentifier)
-  artistData->Option.map(data => data.unlaunchedWildcards)
-}
-type wildcardKey = int
-type artistOrg = {
-  id: string,
-  name: string,
-  logo: string,
-  wildcards: array<wildcardKey>,
-}
-let useArtistOrgs = (~artistIdentifier) => {
-  let artistData = useArtistData(~artistIdentifier)
-  artistData->Option.map(data => {
-    let dict = Js.Dict.empty()
-    data.launchedWildcards
-    ->Array.map(wildcard =>
-      switch wildcard.organization {
-      | Some(org) =>
-        let orgId = org.id
-        switch dict->Js.Dict.get(orgId) {
-        | Some(orgObj) =>
-          let newOrgObj = {
-            ...orgObj,
-            wildcards: orgObj.wildcards->Array.concat([wildcard.key]),
-          }
-          dict->Js.Dict.set(orgId, newOrgObj)
-        | None =>
-          dict->Js.Dict.set(
-            orgId,
-            {
-              id: orgId,
-              name: org.name,
-              logo: org.logo,
-              wildcards: [wildcard.key],
-            },
-          )
-        }
-
-      | None => ()
-      }
-    )
-    ->ignore
-    dict->Js.Dict.values
-  })
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ReactSwitch.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ReactSwitch.res
deleted file mode 100644
index d250bd1..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ReactSwitch.res
+++ /dev/null
@@ -1,14 +0,0 @@
-@module("react-switch") @react.component
-external make: (
-  ~onChange: bool => unit=?,
-  ~checked: bool=?,
-  ~onColor: string=?,
-  ~onHandleColor: string=?,
-  ~offHandleColor: string=?,
-  ~uncheckedIcon: bool=?,
-  ~checkedIcon: bool=?,
-  ~height: int=?,
-  ~width: int=?,
-  ~handleDiameter: int=?,
-  ~className: string=?,
-) => React.element = "default"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ReactTabs.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ReactTabs.res
deleted file mode 100644
index 1dfefab..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ReactTabs.res
+++ /dev/null
@@ -1,19 +0,0 @@
-@module("react-tabs") @react.component
-external make: (
-  ~selectedIndex: int=?,
-  ~onSelect: (int, int) => bool=?,
-  ~children: React.element,
-) => React.element = "Tabs"
-
-module Tab = {
-  @module("react-tabs") @react.component
-  external make: (~children: React.element) => React.element = "Tab"
-}
-module TabList = {
-  @module("react-tabs") @react.component
-  external make: (~children: React.element) => React.element = "TabList"
-}
-module TabPanel = {
-  @module("react-tabs") @react.component
-  external make: (~children: React.element) => React.element = "TabPanel"
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ReactTranslate.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ReactTranslate.res
deleted file mode 100644
index 2927a6d..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ReactTranslate.res
+++ /dev/null
@@ -1,76 +0,0 @@
-type translations
-
-@module("react-translate")
-external useTranslate: (. string, . string) => string = "useTranslate"
-
-type translationModeContext = {
-  translationMode: string,
-  translationModeCrypto: bool,
-  setTranslationModeCrypto: bool => unit,
-}
-
-module TranslatorProvider = {
-  @module("react-translate") @react.component
-  external make: (~children: React.element, ~translations: translations) => React.element =
-    "TranslatorProvider"
-}
-
-let cryptoMuggleTranslations: translations = %raw(`
-    {
-      locale: "en",
-      crypto: {
-        bluetext: "Always for sale",
-        ethereum: "ethereum based",
-        tokens: "tokens",
-        subHeading:
-          "Link your social profile to your address and showcase your giving.",
-        nft: "Non-Fungible Token",
-        whatIsANFT:
-          " is a way to ensure digital assets are unique and easily tradable on a blockchain.",
-        harbergerTax: "Harberger Tax"
-      },
-      muggle: {
-        bluetext: "Always",
-        ethereum: "raising funds for",
-        tokens: "",
-        subHeading: "Adopt an animal to start giving today. ",
-        nft: "Blockchain Animal",
-        whatIsANFT:
-          " is a digital animal that is completely unique and easily tradable on a blockchain.",
-        harbergerTax: "Monthly Pledge"
-      }
-    }
-`)
-
-module TranslationContext = {
-  let translationContext = React.createContext({
-    translationMode: "undefined",
-    translationModeCrypto: false,
-    setTranslationModeCrypto: _ => (),
-  })
-
-  let makeProps = (~value, ~children, ()) =>
-    {
-      "value": value,
-      "children": children,
-    }
-
-  let make = React.Context.provider(translationContext)
-}
-let useTranslationModeContext = () => React.useContext(TranslationContext.translationContext)
-
-@react.component
-let make = (~children) => {
-  let (translationModeCrypto, setTranslationModeCrypto) = React.useState(_ => false)
-
-  <TranslatorProvider translations=cryptoMuggleTranslations>
-    <TranslationContext
-      value={
-        translationMode: translationModeCrypto ? "crypto" : "muggle",
-        translationModeCrypto: translationModeCrypto,
-        setTranslationModeCrypto: newMode => setTranslationModeCrypto(_ => newMode),
-      }>
-      children
-    </TranslationContext>
-  </TranslatorProvider>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ResponsiveCarousel.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ResponsiveCarousel.res
deleted file mode 100644
index 1df9d63..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ResponsiveCarousel.res
+++ /dev/null
@@ -1,20 +0,0 @@
-@module("react-responsive-carousel") @react.component
-external make: (
-  ~children: React.element,
-  ~showArrows: bool,
-  ~showStatus: bool,
-  ~showIndicators: bool,
-  ~infiniteLoop: bool,
-  ~showThumbs: bool,
-  ~useKeyboardArrows: bool,
-  ~autoPlay: bool,
-  ~stopOnHover: bool,
-  ~swipeable: bool,
-  ~dynamicHeight: bool,
-  ~emulateTouch: bool,
-  ~thumbWidth: int=?,
-  ~selectedItem: int=?,
-  ~interval: int=?,
-  ~transitionTime: int=?,
-  ~swipeScrollTolerance: int=?,
-) => React.element = "default"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Rimble.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Rimble.res
deleted file mode 100644
index 3893694..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Rimble.res
+++ /dev/null
@@ -1,202 +0,0 @@
-type width =
-  | AnyStr(string)
-  | AnyStryArray(array<string>)
-  | Float(float)
-  | FloatArray(array<float>)
-
-type wcColourString = [#green]
-
-module Button = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~_as: string=?,
-    ~className: string=?,
-    ~href: string=?,
-    ~target: string=?,
-    ~mainColor: string=?,
-    ~disabled: bool=?,
-    ~children: React.element,
-    ~m: int=?,
-    ~onClick: ReactEvent.Form.t => unit=?,
-    ~width: float=?,
-  ) => React.element = "Button"
-
-  module Text = {
-    @module("rimble-ui") @scope("Button") @react.component
-    external make: (
-      ~_as: string=?,
-      ~className: string=?,
-      ~href: string=?,
-      ~target: string=?,
-      ~children: React.element=?,
-      ~onClick: ReactEvent.Form.t => unit=?,
-      ~icononly: bool=?,
-      ~icon: string=?,
-      ~color: string,
-      ~position: string,
-      ~top: int,
-      ~right: int,
-      ~height: string=?,
-      ~size: string=?,
-      ~m: int,
-    ) => React.element = "Text"
-  }
-}
-
-module Tooltip = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~message: string=?,
-    ~placement: string=?,
-    ~className: string=?,
-    ~children: React.element,
-    ~offset: string=?,
-    ~onClick: ReactEvent.Form.t => unit=?,
-  ) => React.element = "Tooltip"
-}
-
-module Icon = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~name: string=?,
-    ~color: string=?,
-    ~size: string=?,
-    ~className: string=?,
-  ) => React.element = "Icon"
-}
-
-module Input = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~_type: string,
-    ~required: bool=?,
-    ~placeholder: string=?,
-    ~className: string=?,
-    ~onChange: ReactEvent.Form.t => unit=?,
-    ~value: string=?,
-  ) => React.element = "Input"
-}
-
-module Loader = {
-  @module("rimble-ui") @react.component
-  external make: (~className: string=?, ~color: [#green]=?, ~size: string=?) => React.element =
-    "Loader"
-}
-
-module Modal = {
-  @module("rimble-ui") @react.component
-  external make: (~isOpen: bool, ~children: React.element) => React.element = "Modal"
-}
-module Card = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~width: width=?,
-    ~className: string=?,
-    ~p: int=?,
-    ~children: React.element,
-  ) => React.element = "Card"
-}
-module Heading = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~_as: string=?,
-    ~fontSize: int=?,
-    ~children: React.element,
-    ~className: string=?,
-  ) => React.element = "Heading"
-}
-module HeadingS = {
-  @module("rimble-ui") @react.component
-  external make: (~_as: string=?, ~fontSize: int=?, ~children: string) => React.element = "Heading"
-}
-module Box = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~p: int=?,
-    ~m: int=?,
-    ~mb: int=?,
-    ~mt: int=?,
-    ~fontSize: int=?,
-    ~children: React.element,
-    ~width: array<float>=?,
-    ~color: string=?,
-    ~bg: string=?,
-    ~className: string=?,
-    ~onClickEvent: ReactEvent.Mouse.t => unit=?,
-    ~onClick: unit => unit=?,
-  ) => React.element = "Box"
-}
-module Text = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~children: React.element,
-    ~className: string=?,
-    ~color: string=?,
-    ~fontFamily: string=?,
-    ~fontSize: string=?,
-    ~fontWeight: string=?,
-    ~lineHeight: string=?,
-    ~textAlign: string=?,
-  ) => React.element = "Text"
-}
-module TextS = {
-  @module("rimble-ui") @react.component
-  external make: (~children: string) => React.element = "Text"
-}
-
-module Flex = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~children: React.element,
-    ~flexWrap: string=?,
-    ~flexDirection: string=?,
-    ~alignItems: string=?,
-    ~alignContent: string=?,
-    ~justifyContent: string=?,
-    ~px: int=?,
-    ~pb: int=?,
-    ~pt: int=?,
-    ~className: string=?,
-  ) => React.element = "Flex"
-}
-
-module Table = {
-  @module("rimble-ui") @react.component
-  external make: (~children: React.element, ~className: string=?) => React.element = "Table"
-}
-
-module Slider = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~value: string,
-    ~className: string,
-    ~onChange: ReactEvent.Form.t => unit=?,
-    ~min: string,
-    ~max: string,
-    ~step: string,
-  ) => React.element = "Slider"
-}
-
-module Form = {
-  @module("rimble-ui") @react.component
-  external make: (
-    ~onSubmit: ReactEvent.Form.t => unit=?,
-    ~children: React.element,
-    ~action: string=?,
-    ~_method: string=?,
-  ) => React.element = "Form"
-
-  module Input = {
-    @module("rimble-ui") @scope("Form") @react.component
-    external make: (
-      ~_type: string,
-      ~required: bool=?,
-      ~placeholder: string=?,
-      ~name: string=?,
-      ~className: string=?,
-      ~onChange: ReactEvent.Form.t => unit=?,
-      ~value: string=?,
-      ~width: float=?,
-    ) => React.element = "Input"
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/RootProvider.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/RootProvider.res
deleted file mode 100644
index e0b2d0e..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/RootProvider.res
+++ /dev/null
@@ -1,401 +0,0 @@
-open RootProviderTypes
-
-type web3reactContext = {
-  active: bool,
-  activate: (Web3Connectors.injectedType, unit => unit, bool) => Promise.promise<unit>,
-  account: option<Web3.ethAddress>,
-  library: option<Web3.web3Library>,
-  chainId: option<int>,
-  deactivate: unit => unit,
-}
-@module("@web3-react/core")
-external useWeb3React: unit => web3reactContext = "useWeb3React"
-@module("@web3-react/core")
-external useWeb3ReactId: string => web3reactContext = "useWeb3React"
-
-module Web3ReactProvider = {
-  @module("@web3-react/core") @react.component
-  external make: (
-    ~getLibrary: Web3.rawProvider => Web3.web3Library,
-    ~children: React.element,
-  ) => React.element = "Web3ReactProvider"
-}
-
-@module("ethers") @scope("providers") @new
-external createWeb3Provider: Web3.rawProvider => Web3.web3Library = "Web3Provider"
-
-let getLibrary = provider => {
-  let library = createWeb3Provider(provider)
-
-  let setPollingInterval: Web3.web3Library => Web3.web3Library = %raw(
-    "lib => {lib.pollingInterval = 8000; return lib; }"
-  )
-  setPollingInterval(library)
-}
-
-let initialState = {
-  nonUrlState: NoExtraState,
-  ethState: Disconnected,
-  config: {
-    stewardContractAddress: None,
-    stewardAbi: None,
-  },
-}
-
-let rec reducer = (prevState, action) =>
-  switch action {
-  | ClearNonUrlState => {...prevState, nonUrlState: NoExtraState}
-  | LoadAddress(address, optBalance) =>
-    let newState = {...prevState, ethState: Connected(address, optBalance)}
-    switch prevState.nonUrlState {
-    | LoginScreen(followOnAction) => reducer(newState, followOnAction)
-    | UserVerificationScreen
-    | UpdateDepositScreen
-    | UpdatePriceScreen(_)
-    | BuyScreen(_)
-    | AuctionScreen(_)
-    | NoExtraState => newState
-    }
-  | GoToWeb3Connect(action) =>
-    switch prevState.ethState {
-    | Connected(_, _) => reducer(prevState, action)
-    | Disconnected => {...prevState, nonUrlState: LoginScreen(action)}
-    }
-  | GoToBuy(animal) =>
-    switch prevState.ethState {
-    | Connected(_, _) => {...prevState, nonUrlState: BuyScreen(animal)}
-    | Disconnected => {...prevState, nonUrlState: LoginScreen(action)}
-    }
-  | GoToAuction(animal) =>
-    switch prevState.ethState {
-    | Connected(_, _) => {...prevState, nonUrlState: AuctionScreen(animal)}
-    | Disconnected => {...prevState, nonUrlState: LoginScreen(action)}
-    }
-  | GoToDepositUpdate =>
-    switch prevState.ethState {
-    | Connected(_, _) => {...prevState, nonUrlState: UpdateDepositScreen}
-    | Disconnected => {...prevState, nonUrlState: LoginScreen(action)}
-    }
-  | GoToPriceUpdate(animal) =>
-    switch prevState.ethState {
-    | Connected(_, _) => {
-        ...prevState,
-        nonUrlState: UpdatePriceScreen(animal),
-      }
-    | Disconnected => {...prevState, nonUrlState: LoginScreen(action)}
-    }
-  | GoToUserVerification =>
-    switch prevState.ethState {
-    | Connected(_, _) => {...prevState, nonUrlState: UserVerificationScreen}
-    | Disconnected => {...prevState, nonUrlState: LoginScreen(action)}
-    }
-  | Logout => {
-      ...prevState,
-      ethState: Disconnected,
-      nonUrlState: NoExtraState,
-    }
-  | NoAction => {...prevState, nonUrlState: NoExtraState}
-  // | _ => prevState
-  }
-module RootContext = {
-  let context = React.createContext((initialState, _ => ()))
-  // Create a provider component
-  let make = React.Context.provider(context)
-
-  // Tell bucklescript how to translate props into JS
-  let makeProps = (~value, ~children, ()) =>
-    {
-      "value": value,
-      "children": children,
-    }
-}
-
-module RootWithWeb3 = {
-  @react.component
-  let make = (
-    ~children,
-    ~stewardContractAddress: option<Web3.ethAddress>,
-    ~stewardAbi: option<Web3.abi>,
-  ) => {
-    let (rootState, dispatch) = React.useReducer(
-      reducer,
-      {
-        ...initialState,
-        config: {
-          stewardContractAddress: stewardContractAddress,
-          stewardAbi: stewardAbi,
-        },
-      },
-    )
-    let context = useWeb3React()
-
-    // This prevents repeated tries at logging in (or re-login after logout)
-    let (triedLoginAlready, setTriedLoginAlready) = React.useState(() => false)
-    React.useEffect5(() => {
-      Web3Connectors.injected.isAuthorized()->Promise.get(authorised =>
-        if authorised && !triedLoginAlready {
-          ignore(
-            context.activate(Web3Connectors.injected, () => (), true)->Promise.Js.catch(_ => {
-              setTriedLoginAlready(_ => true)
-              Promise.resolved()
-            }),
-          )
-          ()
-        } else {
-          setTriedLoginAlready(_ => true)
-        }
-      )
-      switch context.chainId {
-      | None => dispatch(Logout)
-      | _ => ()
-      }
-      None
-    }, (context.activate, context.chainId, dispatch, setTriedLoginAlready, triedLoginAlready))
-
-    // React.useEffect3(
-    //   () => {
-    //     let maticChainId =
-    //       switch (context.chainId) {
-    //       | Some(4)
-    //       | Some(5) => 80001
-    //       | _ => 137
-    //       };
-    //     contextMatic.activate(
-    //       // Web3Connectors.injected,
-    //       Web3Connectors.sideChainNetwork(maticChainId),
-    //       () => (),
-    //       true,
-    //     )
-    //     ->Promise.Js.catch(e => {
-    //         Js.log("ERROR ACTIVATING MATIC CONNECTION");
-    //         Js.log(e);
-    //         Promise.resolved();
-    //       })
-    //     ->ignore;
-    //     None;
-    //   },
-    //   // intentionally only running on mount (make sure it's only mounted once :))
-    //   (contextMatic.activate, context.chainId, contextMatic.chainId),
-    // );
-
-    //// This will never fire when metamask logs out unfortunately https://stackoverflow.com/a/59215775/3103033
-    // React.useEffect1(
-    //   () => {
-    //     if (context.active) {
-    //       ();
-    //     } else {
-    //       dispatch(Logout);
-    //     };
-    //     None;
-    //   },
-    //   // run this if the status of "active" ever changes
-    //   [|rootState.ethState|],
-    // );
-
-    // if the connection worked, wait until we get confirmation of that to flip the flag
-    React.useEffect3(() => {
-      !triedLoginAlready && context.active ? setTriedLoginAlready(_ => true) : ()
-
-      None
-    }, (triedLoginAlready, context.active, setTriedLoginAlready))
-
-    React.useEffect4(() =>
-      switch (context.library, context.account) {
-      | (Some(library), Some(account)) =>
-        library.getBalance(. account)
-        ->Promise.Js.catch(_ => Promise.resolved(None))
-        ->Promise.get(newBalance =>
-          dispatch(
-            LoadAddress(
-              account,
-              newBalance->Belt.Option.flatMap(balance => Eth.make(balance.toString(.))),
-            ),
-          )
-        )
-
-        None
-      | _ => None
-      }
-    , (context.library, context.account, context.chainId, dispatch))
-
-    <RootContext value=(rootState, dispatch)> children </RootContext>
-  }
-}
-let useRootContext: unit => RootProviderTypes.state = () => {
-  let (state, _) = React.useContext(RootContext.context)
-  state
-}
-let useStewardContractAddress: unit => option<Web3.ethAddress> = () => {
-  let (state, _) = React.useContext(RootContext.context)
-  state.config.stewardContractAddress
-}
-
-let useStewardAbi: unit => option<Web3.abi> = () => {
-  let (state, _) = React.useContext(RootContext.context)
-  state.config.stewardAbi
-}
-
-let useCurrentUser: unit => option<Web3.ethAddress> = () => {
-  let (state, _) = React.useContext(RootContext.context)
-  switch state.ethState {
-  | Connected(address, _balance) => Some(address)
-  | Disconnected => None
-  }
-}
-
-let useIsAddressCurrentUser: Web3.ethAddress => bool = address => {
-  let currentUser = useCurrentUser()
-  switch currentUser {
-  | Some(currentUserAddress) =>
-    address->Js.String.toLowerCase == currentUserAddress->Js.String.toLowerCase
-  | None => false
-  }
-}
-
-let useIsProviderSelected: unit => bool = () => {
-  let (state, _) = React.useContext(RootContext.context)
-  switch state.ethState {
-  | Connected(_address, _balance) => true
-  | Disconnected => false
-  }
-}
-let useEthBalance: unit => option<Eth.t> = () => {
-  let (state, _) = React.useContext(RootContext.context)
-  switch state.ethState {
-  | Connected(_address, balance) => balance
-  | Disconnected => None
-  }
-}
-let useNonUrlState: unit => nonUrlState = () => {
-  let (state, _) = React.useContext(RootContext.context)
-  state.nonUrlState
-}
-let useShowLogin: unit => bool = () => {
-  let nonUrlRouting = useNonUrlState()
-  switch nonUrlRouting {
-  | LoginScreen(_) => true
-  | UserVerificationScreen
-  | UpdateDepositScreen
-  | UpdatePriceScreen(_)
-  | BuyScreen(_)
-  | AuctionScreen(_)
-  | NoExtraState => false
-  }
-}
-let useNetworkId: unit => option<int> = () => {
-  let context = useWeb3React()
-
-  context.chainId
-}
-let useEtherscanUrl: unit => string = () => {
-  let networkId = useNetworkId()
-
-  switch networkId {
-  | Some(5) => "goerli.etherscan.io"
-  | Some(4) => "rinkeby.etherscan.io"
-  | _ => "etherscan.io"
-  }
-}
-let useSidechainEtherscanUrl: unit => string = () => {
-  let networkId = useNetworkId()
-
-  switch networkId {
-  | Some(5) => "mumbai-explorer.matic.today"
-  | Some(4) => "goerli.etherscan.io"
-  | _ => "explorer.matic.network"
-  }
-}
-let useDeactivateWeb3: (unit, unit) => unit = () => {
-  let context = useWeb3React()
-
-  context.deactivate
-}
-let useWeb3: unit => option<Web3.web3Library> = () => {
-  let context = useWeb3React()
-
-  context.library
-}
-
-// TODO:: refactor `useGoToBuy`, `useGoToDepositUpdate`, `useGoToDepositUpdate` to come from a single function (basically do the same thing)
-let useGoToBuy: (unit, TokenId.t) => unit = () => {
-  let (_, dispatch) = React.useContext(RootContext.context)
-  animal => dispatch(GoToBuy(animal))
-}
-let useGoToAuction: (unit, TokenId.t) => unit = () => {
-  let (_, dispatch) = React.useContext(RootContext.context)
-  animal => dispatch(GoToAuction(animal))
-}
-let useGoToDepositUpdate: (unit, unit) => unit = () => {
-  let (_, dispatch) = React.useContext(RootContext.context)
-  () => dispatch(GoToDepositUpdate)
-}
-let useGoToPriceUpdate: (unit, TokenId.t) => unit = () => {
-  let (_, dispatch) = React.useContext(RootContext.context)
-  animal => dispatch(GoToPriceUpdate(animal))
-}
-let useVerifyUser: (unit, unit) => unit = () => {
-  let (_, dispatch) = React.useContext(RootContext.context)
-  () => dispatch(GoToUserVerification)
-}
-let useClearNonUrlState: (unit, unit) => unit = () => {
-  let (_, dispatch) = React.useContext(RootContext.context)
-  () => dispatch(ClearNonUrlState)
-}
-let useConnectWeb3: (unit, RootProviderTypes.rootActions) => unit = () => {
-  let (_, dispatch) = React.useContext(RootContext.context)
-  action => dispatch(GoToWeb3Connect(action))
-}
-let useCloseWeb3Login: (unit, unit) => unit = () => {
-  let (_, dispatch) = React.useContext(RootContext.context)
-
-  () => dispatch(ClearNonUrlState)
-}
-
-let useClearNonUrlStateAndPushRoute: (unit, string) => unit = () => {
-  let clearNonUrlState = useClearNonUrlState()
-  url => {
-    clearNonUrlState()
-    ReasonReactRouter.push(url)
-  }
-}
-
-type connection =
-  | Standby
-  | Connected
-  | Connecting
-  | ErrorConnecting
-
-let useActivateConnector: unit => (connection, Web3Connectors.injectedType => unit) = () => {
-  let context = useWeb3React()
-  let (connectionStatus, setConnectionStatus) = React.useState(() => Standby)
-  (
-    connectionStatus,
-    provider => {
-      context.activate(provider, () => (), true)
-      ->Promise.Js.catch(error => {
-        Js.log("Error connecting to network:")
-        Js.log(error)
-        setConnectionStatus(_ => ErrorConnecting)
-        Promise.resolved()
-      })
-      ->Promise.get(() => setConnectionStatus(_ => Connected))
-      setConnectionStatus(_ => Connecting)
-    },
-  )
-}
-
-@react.component
-let make = (
-  ~children,
-  ~stewardContractAddress: option<Web3.ethAddress>,
-  ~stewardAbi: option<Web3.abi>,
-) =>
-  <Web3ReactProvider getLibrary>
-    <RootWithWeb3 stewardContractAddress stewardAbi>
-      <UserProvider> <ThemeProvider> children </ThemeProvider> </UserProvider>
-    </RootWithWeb3>
-  </Web3ReactProvider>
-
-// Used to create matic provider
-// </Web3Connectors.Custom>
-// <Web3Connectors.Custom id="matic" getLibrary>
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/RootProviderTypes.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/RootProviderTypes.res
deleted file mode 100644
index c05c255..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/RootProviderTypes.res
+++ /dev/null
@@ -1,41 +0,0 @@
-type injectedType = {isAuthorized: unit => Promise.promise<bool>}
-type web3reactContext = {
-  active: bool,
-  activate: (injectedType, unit => unit, bool) => Promise.promise<unit>,
-  account: option<Web3.ethAddress>,
-  library: option<Web3.web3Library>,
-  chainId: option<int>,
-}
-
-type rec rootActions =
-  | NoAction
-  | GoToBuy(TokenId.t)
-  | GoToAuction(TokenId.t)
-  | GoToDepositUpdate
-  | GoToPriceUpdate(TokenId.t)
-  | GoToUserVerification
-  | ClearNonUrlState
-  | GoToWeb3Connect(rootActions)
-  | Logout
-  | LoadAddress(Web3.ethAddress, option<Eth.t>)
-type nonUrlState =
-  | LoginScreen(rootActions)
-  | UserVerificationScreen
-  | UpdateDepositScreen
-  | UpdatePriceScreen(TokenId.t)
-  | BuyScreen(TokenId.t)
-  | AuctionScreen(TokenId.t)
-  | NoExtraState
-type ethState =
-  | Disconnected
-  | Connected(Web3.ethAddress, option<Eth.t>)
-
-type config = {
-  stewardContractAddress: option<Web3.ethAddress>,
-  stewardAbi: option<Web3.abi>,
-}
-type state = {
-  nonUrlState: nonUrlState,
-  ethState: ethState,
-  config: config,
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Router.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Router.res
deleted file mode 100644
index 1776d58..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Router.res
+++ /dev/null
@@ -1,167 +0,0 @@
-open Globals
-
-type previousNextAnimal = option<(TokenId.t, TokenId.t)>
-type animalPageState =
-  | DetailView(option<TokenId.t>)
-  | NormalView
-type explorerTab =
-  | Gen1
-  | Gen2
-type leaderBoard =
-  | TotalContribution
-  | TotalDaysHeld
-  | Unknown
-  | MonthlyContribution
-type artistId = string
-type urlState =
-  | User(Web3.ethAddress)
-  | Artist(artistId)
-  | Org(string)
-  | Explorer(explorerTab, animalPageState)
-  | Team
-  | Leaderboards(leaderBoard)
-  // | Unknown
-  | Home(animalPageState)
-  | IncreaseVoteIteration
-  | VotePage
-
-let useUrlState = () => {
-  let url = ReasonReactRouter.useUrl()
-
-  React.useMemo1(() =>
-    switch Js.String.split("/", url.hash) {
-    | ["user", address] => User(address->Js.String.toLowerCase)
-    | ["artist", id] => Artist(id)
-    | ["org", orgId] => Org(orgId->Js.String.toLowerCase)
-    | ["leaderboards", leaderboardType] =>
-      switch leaderboardType {
-      | "monthly-contribution" => Leaderboards(MonthlyContribution)
-      | "days-held" => Leaderboards(TotalDaysHeld)
-      | "total-contribution" => Leaderboards(TotalContribution)
-      | _ => Leaderboards(Unknown)
-      }
-    // | [|"explorer"|] => Explorer(NormalView)
-    | ["explorer", "details", animalStr]
-    | ["explorer", "details", animalStr, ""] =>
-      let optionAnimal = Animal.getAnimal(animalStr)
-      Explorer(Gen2, DetailView(optionAnimal))
-    | ["explorer", tab, "details", animalStr]
-    | ["explorer", tab, "details", animalStr, ""] =>
-      let optionAnimal = Animal.getAnimal(animalStr)
-      Explorer(
-        switch tab {
-        | "2nd-edition" => Gen2
-        | "1st-edition"
-        | _ =>
-          /* Default is Gen1 */
-          Gen1
-        },
-        DetailView(optionAnimal),
-      )
-    | ["details", animalStr] =>
-      let optionAnimal = Animal.getAnimal(animalStr)
-      Home(DetailView(optionAnimal))
-    | ["dao"] => VotePage
-    | ["increase-iteration"] => IncreaseVoteIteration
-    | urlArray =>
-      switch \"||||"(urlArray[0], "") {
-      | "explorer" =>
-        Explorer(
-          switch \"||||"(urlArray[1], "") {
-          | "1st-edition" => Gen1
-          | "2nd-edition"
-          | _ =>
-            /* Default is Gen1 */
-            Gen2
-          },
-          NormalView,
-        )
-      | "team" => Team
-      | _ => Home(NormalView)
-      // | _ => Unknown
-      }
-    }
-  , [url.hash])
-}
-let useIsExplorer = () => {
-  let urlState = useUrlState()
-
-  React.useMemo1(() =>
-    switch urlState {
-    | Explorer(_) => true
-    | User(_)
-    | Artist(_)
-    | Leaderboards(_)
-    | Home(_)
-    | Org(_)
-    | IncreaseVoteIteration
-    | Team
-    | VotePage => false
-    }
-  , [urlState])
-}
-let isDetailsAnimalPage: animalPageState => bool = animalPageState =>
-  switch animalPageState {
-  | DetailView(_) => true
-  | NormalView => false
-  }
-let useIsDetails = () => {
-  let urlState = useUrlState()
-
-  React.useMemo1(() =>
-    switch urlState {
-    | Explorer(_, inside) => isDetailsAnimalPage(inside)
-    | Home(inside) => isDetailsAnimalPage(inside)
-    | User(_)
-    | Artist(_)
-    | Org(_)
-    | Leaderboards(_)
-    | IncreaseVoteIteration
-    | Team
-    | VotePage => false
-    }
-  , [urlState])
-}
-let useIsHome = () => {
-  let urlState = useUrlState()
-
-  React.useMemo1(() =>
-    switch urlState {
-    | Home(NormalView) => true
-    | Home(DetailView(_))
-    | User(_)
-    | Artist(_)
-    | Org(_)
-    | Explorer(_)
-    | Leaderboards(_)
-    | IncreaseVoteIteration
-    | Team
-    | VotePage => false
-    }
-  , [urlState])
-}
-let getAnimalFormAnimalPageState: animalPageState => option<TokenId.t> = animalPageState =>
-  switch animalPageState {
-  | DetailView(optAnimal) => optAnimal
-  | NormalView => None
-  }
-
-let useAnimalForDetails = () => {
-  let urlState = useUrlState()
-
-  React.useMemo1(() =>
-    switch urlState {
-    | Explorer(_, animalPageState) => getAnimalFormAnimalPageState(animalPageState)
-    | Home(animalPageState) => getAnimalFormAnimalPageState(animalPageState)
-    // | DetailView(_, optAnimal) => optAnimal
-    | User(_)
-    | Artist(_)
-    | Org(_)
-    | Leaderboards(_)
-    | Team
-    | IncreaseVoteIteration
-    | VotePage =>
-      None
-    }
-  , [urlState])
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/SocialButtons.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/SocialButtons.res
deleted file mode 100644
index 40b711b..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/SocialButtons.res
+++ /dev/null
@@ -1,10 +0,0 @@
-@module("@wildcards/react-social-icons") @react.component
-external make: (
-  ~url: string=?,
-  ~bgColor: string=?,
-  ~fgColor: string=?,
-  ~target: string=?,
-  ~className: string=?,
-  ~rel: string=?,
-  ~network: string=?,
-) => React.element = "SocialIcon"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/SsrEntryPoint.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/SsrEntryPoint.res
deleted file mode 100644
index f85b346..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/SsrEntryPoint.res
+++ /dev/null
@@ -1,48 +0,0 @@
-// [%bs.raw {|require("./custom.css")|}];
-open Globals
-
-module Router = {
-  @react.component
-  let make = () => {
-    let url = ReasonReactRouter.useUrl()
-    switch url.path {
-    // | ["new-data"] => <QlHooks />
-    | list{_} => <p> {React.string("Unknown page")} </p>
-    | _ => <Layout />
-    }
-  }
-}
-
-module ApolloProvider = {
-  @react.component
-  let make = (~children, ~client) =>
-    <ApolloClient.React.ApolloProvider client> children </ApolloClient.React.ApolloProvider>
-}
-
-@val
-external mainnetApi: option<string> = "process.env.REACT_APP_MAINNET_BE"
-@val
-external goerliApi: option<string> = "process.env.REACT_APP_GOERLI_BE"
-
-// TODO: SSR doesn't work correctly here, need to use the external apollo client
-@react.component
-let make = () =>
-  <WildcardsProvider
-    getGraphEndpoints={(networkId, ()) => {
-      open Client
-      let endpoints = switch networkId {
-      | 5 => {
-          mainnet: \"||||"(goerliApi, "https://goerli.api.wildcards.world/v1/graphq"),
-          matic: "https://mumbai.graph.wildcards.world/subgraphs/name/wildcards-world/wildcards-matic/graphql",
-          ws: "wss://api.thegraph.com/subgraphs/name/wildcards-world/wildcards-goerli",
-        }
-      | _ => {
-          mainnet: \"||||"(mainnetApi, "https://api.wildcards.world/v1/graphql"),
-          matic: "https://mumbai.graph.wildcards.world/subgraphs/name/wildcards-world/wildcards-matic/graphql",
-          ws: "wss://api.thegraph.com/subgraphs/name/wildcards-world/wildcards",
-        }
-      }
-      endpoints
-    }}>
-    <Router />
-  </WildcardsProvider>
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Styles.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Styles.res
deleted file mode 100644
index b43969e..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Styles.res
+++ /dev/null
@@ -1,337 +0,0 @@
-// module Styles = {
-/* Open the Css module, so we can access the style properties below without prefixing them with Css. */
-open Css
-
-let backgroundImageGorilla = "/img/wildcardsimages/wild-jungle-background.jpg"
-
-global(
-  "body",
-  list{
-    margin(#px(0)),
-    fontFamily(#custom("Lato, Helvetica, sans-serif")),
-    overflowX(hidden),
-    width(#percent(100.)),
-    position(#relative),
-  },
-)
-global("a", list{color(hex("303030")), textDecoration(none)})
-global("a:hover", list{textDecoration(underline)})
-global("a:active", list{color(hex("303030"))})
-global("a:visited", list{color(hex("303030"))})
-
-let app = style(list{
-  boxSizing(#borderBox),
-  // Make a global default font size
-  fontSize(px(16)),
-})
-
-let textOnlyModalText = style(list{padding(em(2.))})
-let totalRaisedText = size => style(list{fontSize(em(size))})
-
-let copyButton = style(list{Css.float(#right), zIndex(50)})
-
-// Use flex box to center
-let centerItems = style(list{display(#flex), alignItems(center), width(#percent(100.))})
-// Use margin to center
-let centerItemsMargin = style(list{display(block), margin(auto)})
-
-let translationSwitch = style(list{padding(rem(0.))})
-
-let topBody = style(list{
-  // zIndex(50),
-  // display(`flex),
-  // flexDirection(`row),
-  justifyContent(#spaceBetween),
-  // alignItems(center),
-  media("(max-width: 831px)", list{textAlign(center)}),
-  // flexWrap(`wrap),
-  paddingLeft(px(15)),
-  paddingRight(px(15)),
-  // paddingBottom(px(120)),
-  maxWidth(px(1200)),
-  margin(auto),
-})
-
-let header = style(list{position(relative)})
-let noMarginBottom = style(list{marginBottom(px(0))})
-let noMarginTop = style(list{marginTop(px(0))})
-
-let headerLogo = style(list{media("(max-width: 630px)", list{textAlign(center), display(#block)})})
-
-let nav = style(list{
-  position(absolute),
-  maxWidth(px(1200)),
-  zIndex(200),
-  top(px(0)),
-  right(px(0)),
-  left(px(0)),
-  margin2(~v=em(0.), ~h=auto),
-})
-
-let navBox = style(list{display(#flex), justifyContent(#spaceBetween), alignItems(center)})
-
-let navList = style(list{
-  display(#flex),
-  alignItems(#center),
-  media("(max-width: 630px)", list{display(none)}),
-  marginLeft(#auto),
-  listStyle(#none, #inside, #none),
-})
-
-let positionRelative = style(list{position(relative)})
-let overlayImg = (topPosition, leftPosition) =>
-  style(list{
-    position(absolute),
-    zIndex(2),
-    top(#percent(topPosition)),
-    left(#percent(leftPosition)),
-    width(#percent(20.)),
-    height(#percent(20.)),
-    minWidth(px(50)),
-    minHeight(px(50)),
-  })
-let overlayFlameImg = overlayImg(20., 0.)
-let prettyTransparent = rgba(255, 255, 255, 0.5)
-let imageHoverStyle = hover(list{
-  filter(list{#saturate(150.), #brightness(110.)}),
-  overflow(visible),
-  backgroundColor(prettyTransparent),
-  boxShadow(Shadow.box(~blur=px(20), ~spread=px(20), prettyTransparent)),
-  transform(scale(1.3, 1.3)),
-  transition(~duration=100, ~delay=0, ~timingFunction=ease, "all"),
-})
-let overlayBadgeImg = (~x, ~y) =>
-  Cn.make(list{overlayImg(x, y), style(list{borderRadius(#percent(100.)), imageHoverStyle})})
-
-let streakText = style(list{
-  position(absolute),
-  zIndex(100),
-  bottom(#percent(-30.)),
-  right(#percent(50.)),
-  transform(translateX(#percent(50.))),
-})
-let flameImg = style(list{width(#percent(100.)), maxWidth(em(2.1))})
-
-let navListItem = style(list{display(inlineBlock)})
-
-let navListItemToggle = style(list{display(#flex), justifyContent(center), alignItems(center)})
-
-let someMarginRight = style(list{marginRight(px(6))})
-
-let navListText = style(list{color(rgb(136, 136, 136)), padding(rem(1.)), fontWeight(bold)})
-
-let leftTopHeader = style(list{
-  position(relative),
-  width(px(550)),
-  maxWidth(px(550)),
-  paddingTop(px(70)),
-  paddingBottom(px(70)),
-  // boxSizing(`borderBox),
-  // margin(px(0)),
-  // padding(px(0)),
-})
-
-let centerText = style(list{textAlign(center)})
-
-/// NOTE: the padding of 4% is calculated as 12/3 since there is a right padding of 12% and 3 animal images shown.
-let dappImagesCounteractOffset = style(list{marginLeft(#percent(4.))})
-
-let heading = style(list{fontSize(em(3.)), media("(min-width: 768px)", list{paddingTop(#rem(3.))})})
-
-let subHeading = style(list{fontSize(em(1.8)), fontWeight(#num(200))})
-
-let wildCardGreen = rgb(107, 173, 62)
-let wildCardBlue = rgb(114, 199, 215)
-let wildCardGrey = rgb(100, 100, 100)
-let colorGreen = style(list{color(wildCardGreen)})
-let colorBlue = style(list{color(wildCardBlue)})
-let colorGrey = style(list{color(wildCardGrey)})
-
-let animalBox = style(list{marginRight(#percent(12.))})
-
-let clickableLink = style(list{
-  media("(max-width: 630px)", list{width(#percent(100.))}),
-  cursor(#pointer),
-})
-
-let mainImageHoverStyle = scalar =>
-  hover(list{
-    filter(list{#saturate(150.), #brightness(110.)}),
-    zIndex(2),
-    overflow(visible),
-    transform(scale(1.1 *. scalar, 1.1 *. scalar)),
-    transition(~duration=100, ~delay=0, ~timingFunction=ease, "all"),
-  })
-let headerImg = (enlargement, scalar) =>
-  style(list{
-    position(#relative),
-    zIndex(1),
-    maxHeight(px(500)),
-    width(#percent(100. *. enlargement)),
-    left(#percent(-50. *. (enlargement -. 1.))),
-    transform(scale(scalar, scalar)),
-    textAlign(center),
-    transition(~duration=1000, ~delay=0, ~timingFunction=ease, "all"),
-    mainImageHoverStyle(scalar),
-  })
-
-let horizantalBlueTile = style(list{
-  width(#percent(100.)),
-  padding2(~v=em(2.), ~h=em(0.)),
-  backgroundColor(#hex("73c7d7ff")),
-  // media("(max-width: 831px)", [padding2(~v=rem(2.), ~h=rem(2.4))]),
-  textAlign(#center),
-})
-
-let explainerLargeText = style(list{
-  fontSize(rem(2.)),
-  color(#hex("486269")),
-  padding2(~v=em(0.), ~h=em(6.)),
-  margin2(~v=em(0.), ~h=auto),
-  maxWidth(px(1200)),
-  media("(max-width: 760px)", list{fontSize(rem(1.2)), padding2(~v=em(0.), ~h=em(2.))}),
-})
-let explainerMediumText = style(list{
-  media("(max-width: 760px)", list{fontSize(rem(1.1)), padding2(~v=em(0.), ~h=em(2.))}),
-  padding2(~v=em(0.), ~h=em(3.)),
-  margin2(~v=em(0.), ~h=auto),
-  maxWidth(px(1200)),
-  fontSize(rem(1.6)),
-  color(#hex("486269")),
-  textAlign(#center),
-})
-
-let boldExplainerText = style(list{color(#hex("303030")), fontWeight(#bold)})
-
-let infoBackground = style(list{
-  backgrounds(list{
-    #linearGradient(
-      deg(0.),
-      list{(zero, #rgba(255, 255, 255, 0.2)), (zero, #rgba(255, 255, 255, 0.2))},
-    ),
-    #url(backgroundImageGorilla),
-  }),
-  backgroundSize(#cover),
-  backgroundRepeat(#noRepeat),
-  height(#percent(100.)),
-})
-
-let infoCardContainer = style(list{padding(#rem(1.))})
-
-let infoCardStyles = style(list{
-  margin(#rem(4.)),
-  media("(max-width: 831px)", list{margin(#rem(0.)), textAlign(center)}),
-})
-
-let animalImage = style(list{media("(max-width: 831px)", list{display(none)})})
-
-let redDisclaimer = style(list{fontSize(#rem(0.9)), color(#hex("e85723"))})
-
-let floatingSignupBox = style(list{
-  maxWidth(px(900)),
-  margin2(~v=em(0.), ~h=auto),
-  // backgroundColor(`hex("fff")),
-  // boxShadow10(px(0), px(2), px(4), px(0), `rgba((136,144,195,0.2)), px(0), px(5), px(15), px(0), `rgba((37,44,97,0.15)))
-})
-let floatingSignupBoxInner = style(list{padding(em(3.))})
-let emailSignupHeader = style(list{fontSize(px(24))})
-let emailTextBox = style(list{})
-
-let inputElements = style(list{padding(em(0.1))})
-
-let extraInfoFooterBox = style(list{
-  textAlign(center),
-  maxWidth(px(600)),
-  backgroundColor(rgb(107, 173, 62)),
-  margin2(~v=em(6.), ~h=auto),
-  position(relative),
-})
-
-let emoticonHeader = style(list{
-  position(absolute),
-  left(px(0)),
-  right(px(0)),
-  top(px(0)),
-  margin(auto),
-  transform(translateY(#percent(-50.))),
-  textAlign(center),
-})
-
-let emojiStyles = style(list{
-  height(px(55)),
-  maxHeight(#percent(100.)),
-  position(relative),
-  verticalAlign(middle),
-  bottom(px(1)),
-})
-
-let finalNoteContent = style(list{padding(rem(1.5)), margin(ex(4.))})
-
-let whiteText = style(list{important(color(white))})
-
-let linkPillBox = style(list{
-  marginTop(px(25)),
-  boxSizing(borderBox),
-  minHeight(px(25)),
-  fontSize(px(14)),
-  borderRadius(px(25)),
-  color(hex("fff")),
-  backgroundColor(rgba(48, 48, 48, 0.12)),
-})
-let linkPillText = style(list{margin(px(10)), marginBottom(px(1)), color(hex("fff"))})
-
-let betaBanner = style(list{position(#absolute), left(#px(0)), top(#px(0)), width(#px(80))})
-
-let loginButton = style(list{paddingLeft(#px(10))})
-
-let forwardBackButton = style(list{width(#percent(100.)), height(#em(5.))})
-
-// let mapStylesFunction = [%raw (prev, next) => "`${prev} ${next}`"];
-let mergeStyles: list<string> => string = styles =>
-  /* styles->Belt.List.reduce("", mapStylesFunction); */
-  styles->Belt.List.reduce("", (prev, next) => prev ++ (" " ++ next))
-
-let wrapText = style(list{overflowWrap(#breakWord), wordWrap(#breakWord)})
-
-let fiftyPercentWidth = style(list{width(#percent(50.))})
-
-let carousel = style(list{position(#relative), width(#percent(150.)), left(#percent(-25.))})
-
-let invisibleGorilla = style(list{display(#none)})
-
-let fadeOut = targetOpacity =>
-  style(
-    list{
-      width(#percent(100.)),
-      transition(~duration=2000, ~delay=0, ~timingFunction=ease, "opacity"),
-    }->List.concat(list{opacity(targetOpacity)}),
-  )
-
-let carouselArrow = (~absolutePosition=true, onLeft) =>
-  style(
-    \"@"(
-      list{
-        cursor(#pointer),
-        padding(#px(20)),
-        color(white),
-        backgroundColor(hex("72c7d7")),
-        hover(
-          \"@"(
-            list{backgroundColor(hex("40b2c9"))},
-            onLeft
-              ? list{paddingLeft(#px(15)), paddingRight(#px(25))}
-              : list{paddingRight(#px(15)), paddingLeft(#px(25))},
-          ),
-        ),
-        borderRadius(px(4)),
-        zIndex(3),
-      },
-      absolutePosition
-        ? list{
-            position(absolute),
-            transform(translateX(#percent(-50.))),
-            onLeft ? left(#percent(20.)) : left(#percent(80.)),
-          }
-        : list{},
-    ),
-  )
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Team.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Team.res
deleted file mode 100644
index a7a0aa5..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Team.res
+++ /dev/null
@@ -1,134 +0,0 @@
-open Globals
-
-type teamMember = {
-  name: string,
-  img: string,
-  title: string,
-  linkedIn: option<string>,
-  twitterHandle: option<string>,
-  githubHandle: option<string>,
-}
-
-let cardStyle = {
-  open Css
-  style(list{height(#percent(100.)), backgroundColor(#hex("73C8D7"))})
-}
-
-let titleStyle = {
-  open Css
-  style(list{color(#hex("cccccc"))})
-}
-
-let profileImageStyle = {
-  open Css
-  style(list{
-    borderWidth(px(6)),
-    borderStyle(#solid),
-    borderColor(#hex("73C8D7")),
-    width(#percent(100.)),
-  })
-}
-
-let plantStyle = {
-  open Css
-  style(list{width(#percent(100.)), transform(translateY(px(30)))})
-}
-
-let iconStyle = {
-  open Css
-  style(list{height(px(20)), paddingRight(px(3)), margin(#auto)})
-}
-
-@react.component
-let make = () => {
-  // Can maybe move this to the db, although overkill at this point
-  let teamMembers: array<teamMember> = [
-    {
-      name: "JonJon Clark",
-      img: "https://dd2wadt5nc0o7.cloudfront.net/team/jonjon.jpg",
-      title: "Co-founder",
-      linkedIn: Some("https://www.linkedin.com/in/jonathan-clark-637344143/"),
-      twitterHandle: Some("jonjonclark"),
-      githubHandle: Some("moose-code"),
-    },
-    {
-      name: "Jason Smythe",
-      img: "https://dd2wadt5nc0o7.cloudfront.net/team/jason.jpg",
-      title: "Co-founder",
-      linkedIn: Some("https://www.linkedin.com/in/jason-smythe-0501ab88/"),
-      twitterHandle: Some("jasoonsmythe"),
-      githubHandle: Some("jasoons"),
-    },
-    {
-      name: "Denham Preen",
-      img: "https://dd2wadt5nc0o7.cloudfront.net/team/denham.jpg",
-      title: "Co-founder",
-      linkedIn: Some("https://www.linkedin.com/in/denhampreen/"),
-      twitterHandle: Some("denhampreen"),
-      githubHandle: Some("DenhamPreen"),
-    },
-    {
-      name: "Rio Button",
-      img: "https://dd2wadt5nc0o7.cloudfront.net/team/rio.jpg",
-      title: "Lead conservationist",
-      linkedIn: Some("https://www.linkedin.com/in/riob/"),
-      twitterHandle: Some("biologistbutton"),
-      githubHandle: None,
-    },
-    {
-      name: "Luke Gillott",
-      img: "https://dd2wadt5nc0o7.cloudfront.net/team/luke.jpg",
-      title: "Executive board",
-      linkedIn: Some("https://www.linkedin.com/in/luke-gillott/"),
-      twitterHandle: None,
-      githubHandle: None,
-    },
-  ]
-  <div>
-    <Rimble.Flex
-      flexWrap="wrap" justifyContent="space-around" alignItems="stretch" pt=20 pb=20 px=50>
-      <h1> {"Wildcards Team"->restr} </h1>
-    </Rimble.Flex>
-    <Rimble.Flex flexWrap="wrap" justifyContent="space-around" alignItems="stretch" pb=50 px=50>
-      {React.array(
-        teamMembers->Array.mapWithIndex((i, member) =>
-          <Rimble.Box key={i->string_of_int} mt=20 mb=20 width=[0.45, 0.45, 0.18]>
-            <Rimble.Card className=cardStyle>
-              <img className=profileImageStyle src=member.img alt=member.name />
-              <p>
-                {member.name->React.string}
-                <br />
-                <span className=titleStyle> <small> {member.title->React.string} </small> </span>
-              </p>
-              {switch member.linkedIn {
-              | Some(link) =>
-                <a target="_blank" rel="noopener noreferrer" href=link>
-                  <img className=iconStyle src="/img/socials/linkedin.svg" alt=member.name />
-                </a>
-              | None => React.null
-              }}
-              {switch member.twitterHandle {
-              | Some(handle) =>
-                <a
-                  target="_blank" rel="noopener noreferrer" href={"https://twitter.com/" ++ handle}>
-                  <img className=iconStyle src="/img/socials/twitter.svg" alt=handle />
-                </a>
-              | None => React.null
-              }}
-              {switch member.githubHandle {
-              | Some(handle) =>
-                <a target="_blank" rel="noopener noreferrer" href={"https://github.com/" ++ handle}>
-                  <img className=iconStyle src="/img/socials/github.svg" alt=handle />
-                </a>
-              | None => React.null
-              }}
-            </Rimble.Card>
-          </Rimble.Box>
-        ),
-      )}
-    </Rimble.Flex>
-    <Rimble.Flex flexWrap="wrap" justifyContent="space-around" alignItems="stretch" pt=2 pb=2 px=50>
-      <img className=plantStyle src="/img/wildcardsimages/plants.png" alt="wildcards plants" />
-    </Rimble.Flex>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ThemeProvider.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ThemeProvider.res
deleted file mode 100644
index e88caad..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ThemeProvider.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@module("./ThemeProvider") @react.component
-external make: (~children: React.element) => React.element = "default"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ThreeBoxUpdate.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/ThreeBoxUpdate.res
deleted file mode 100644
index 54c1d98..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/ThreeBoxUpdate.res
+++ /dev/null
@@ -1,510 +0,0 @@
-// This is a very big component because it contains full 3box. They should be lazy loaded!
-type threeBoxError
-type boxSpaceFunctions = {
-  get: (. string) => Promise.Js.t<string, threeBoxError>,
-  remove: (. string) => Promise.Js.t<string, threeBoxError>,
-  set: (. string, string) => Promise.Js.t<unit, threeBoxError>,
-  all: (. unit) => Promise.Js.t<string, threeBoxError>,
-}
-type space = {
-  syncDone: Promise.Js.t<bool, threeBoxError>,
-  public: boxSpaceFunctions,
-}
-type verified3Box = {addTwitter: (. string) => Promise.Js.t<string, threeBoxError>}
-type threeBox = {
-  syncDone: Promise.Js.t<bool, threeBoxError>,
-  openSpace: (. string) => Promise.Js.t<space, threeBoxError>,
-  public: boxSpaceFunctions,
-  verified: verified3Box,
-  @as("DID")
-  _DID: string,
-}
-type defaultViewSubstate =
-  | NoState
-  | Saved
-  | FailedToSave
-type threeBoxStatus =
-  | DefaultView(defaultViewSubstate)
-  | Loading3Box
-  | Load3BoxError
-  | LoggedIn(threeBox, bool) // the boolean here is if the `Space` needs to be synced too.
-  | SyncedBox(threeBox)
-  | SyncedBoxWithSpace(threeBox, space)
-  | SyncedSpace(threeBox, space)
-
-@module("3box")
-external openBox: (. Web3.ethAddress, Web3.rawProvider) => Promise.Js.t<threeBox, threeBoxError> =
-  "openBox"
-
-module ProfileItem = {
-  @react.component
-  let make = (~fieldName, ~fieldTitle, ~fieldDescription, ~fieldValue, ~onEdit) => {
-    let (isEdit, setIsEdit) = React.useState(_ => fieldValue->String.trim->String.length == 0)
-
-    <React.Fragment>
-      {if isEdit {
-        <div>
-          <Rimble.Input
-            _type="string"
-            value=fieldValue
-            placeholder=fieldName
-            onChange={event => {
-              let value = ReactEvent.Form.target(event)["value"]->Belt.Option.getWithDefault("")
-              onEdit(_ => value)
-            }}
-          />
-        </div>
-      } else {
-        <div
-          onClick={e => {
-            e->ReactEvent.Mouse.preventDefault
-            setIsEdit(_ => true)
-          }}>
-          <small>
-            <strong>
-              {fieldTitle->React.string}
-              <Rimble.Tooltip message=fieldDescription placement="top">
-                <span> {`ⓘ`->React.string} </span>
-              </Rimble.Tooltip>
-            </strong>
-          </small>
-          <br />
-          {fieldValue->React.string}
-          <br />
-        </div>
-      }}
-    </React.Fragment>
-  }
-}
-
-module ProfileDetails = {
-  @react.component
-  let make = (
-    ~profileName,
-    ~profileDescription,
-    ~reloadUser,
-    ~setThreeBoxState,
-    ~threeBoxState,
-  ) => {
-    let (editedName, setEditedName) = React.useState(_ => profileName)
-    let (editedDescription, setEditedDescription) = React.useState(_ => profileDescription)
-
-    let nameChange = editedName != profileName
-    let descriptionChange = editedDescription != profileDescription
-    let areChanges = nameChange || descriptionChange
-
-    let undoChanges = () => {
-      setEditedName(_ => profileName)
-      setEditedDescription(_ => profileDescription)
-    }
-
-    let optEthereumWallet = RootProvider.useCurrentUser()
-    let optWeb3Provider = RootProvider.useWeb3()
-
-    let saveChanges = () => {
-      setThreeBoxState(_ => Loading3Box)
-      switch (optEthereumWallet, optWeb3Provider) {
-      | (Some(ethereumWallet), Some(web3Provider)) =>
-        openBox(. ethereumWallet, web3Provider.provider)
-        ->Promise.Js.toResult
-        ->Promise.getOk(threeBoxInstance => {
-          setThreeBoxState(_ => LoggedIn(threeBoxInstance, true))
-          threeBoxInstance.syncDone
-          ->Promise.Js.toResult
-          ->Promise.get(isBoxLoaded => {
-            let state = switch isBoxLoaded {
-            | Ok(_finishedBoxSync) =>
-              let namePromise = if profileName == editedName {
-                Promise.resolved(Ok())
-              } else {
-                threeBoxInstance.public.set(. "name", editedName)->Promise.Js.toResult
-              }
-              let descriptionPromise = if profileDescription == editedDescription {
-                Promise.resolved(Ok())
-              } else {
-                threeBoxInstance.public.set(. "description", editedDescription)->Promise.Js.toResult
-              }
-              Promise.all2(namePromise, descriptionPromise)->Promise.get(a => {
-                let (nameSet, descriptionSet) = a
-                switch (nameSet, descriptionSet) {
-                | (Ok(), Ok()) =>
-                  reloadUser(true)
-                  setThreeBoxState(_ => DefaultView(Saved))
-                | _ => setThreeBoxState(_ => DefaultView(FailedToSave))
-                }
-              })
-              SyncedBox(threeBoxInstance)
-            | Error(_) => Load3BoxError
-            }
-            setThreeBoxState(_ => state)
-          })
-          // NOTE: The below code is if we also require the wildcards space.
-          // Promise.all2(
-          //   threeBoxInstance.syncDone->Promise.Js.toResult,
-          //   threeBoxInstance.openSpace(. "wildcards")->Promise.Js.toResult,
-          // )
-          // ->Promise.get(isBoxLoaded => {
-          //     let (finishedBoxSyncResult, wildcardsSpaceResult) = isBoxLoaded;
-          //     let state =
-          //       switch (finishedBoxSyncResult, wildcardsSpaceResult) {
-          //       | (Ok(_finishedBoxSync), Ok(wildcardsSpace)) =>
-          //         wildcardsSpace.syncDone
-          //         ->Promise.Js.toResult
-          //         ->Promise.getOk(_isSpaceLoaded => {
-          //             setThreeBoxState(_ =>
-          //               SyncedSpace(threeBoxInstance, wildcardsSpace)
-          //             )
-          //           });
-          //         SyncedBoxWithSpace(threeBoxInstance, wildcardsSpace);
-          //       | _ => Load3BoxError
-          //       };
-          //     setThreeBoxState(_ => state);
-          //   });
-        })
-        ()
-      | _ => ()
-      }
-    }
-
-    <Rimble.Box p=1>
-      {switch threeBoxState {
-      | DefaultView(_) =>
-        <React.Fragment>
-          <p> {"click on any item to edit it"->React.string} </p>
-          <ProfileItem
-            fieldDescription="Your 3box name"
-            fieldName="name"
-            fieldTitle="Name"
-            fieldValue=editedName
-            onEdit=setEditedName
-          />
-          <ProfileItem
-            fieldDescription="Your 3box description"
-            fieldName="description"
-            fieldTitle="Description"
-            fieldValue=editedDescription
-            onEdit=setEditedDescription
-          />
-          {areChanges
-            ? <React.Fragment>
-                <Rimble.Button
-                  onClick={e => {
-                    e->ReactEvent.Form.preventDefault
-                    saveChanges()
-                  }}>
-                  {"Save"->React.string}
-                </Rimble.Button>
-                <Rimble.Button
-                  onClick={e => {
-                    e->ReactEvent.Form.preventDefault
-                    undoChanges()
-                  }}>
-                  {"Cancel"->React.string}
-                </Rimble.Button>
-              </React.Fragment>
-            : React.null}
-        </React.Fragment>
-      | Loading3Box => <Rimble.Heading> {"Loading 3Box..."->React.string} </Rimble.Heading>
-      | LoggedIn(_threeBoxInstance, _requiresSpace) =>
-        <Rimble.Heading> {"3 box is loaded - syncing profile"->React.string} </Rimble.Heading>
-      | SyncedBox(_threeBoxInstance) =>
-        <Rimble.Heading> {"3 box is synced, SAVING profile data"->React.string} </Rimble.Heading>
-      | SyncedBoxWithSpace(_box, _space) =>
-        <React.Fragment>
-          <Rimble.Heading>
-            {"3 box is synced, loading 'wildcards' space"->React.string}
-          </Rimble.Heading>
-        </React.Fragment>
-      | SyncedSpace(_box, _space) =>
-        <React.Fragment>
-          <Rimble.Heading> {"3 box and 'wildcards' space is synced"->React.string} </Rimble.Heading>
-        </React.Fragment>
-      | Load3BoxError =>
-        <React.Fragment>
-          <Rimble.Heading> {"There was an error loading your box"->React.string} </Rimble.Heading>
-        </React.Fragment>
-      }}
-    </Rimble.Box>
-  }
-}
-
-type registerRequestData = {
-  did: string,
-  twitterHandle: string,
-}
-type did = string
-type twitterVerificationSteps =
-  | Uninitialized
-  | PreparePostToTwitter
-  | PostToTwitter(did)
-  | VerifyWithServer(did)
-
-let getResult: string => option<string> = %raw(`
-  function(result) {
-    const parsedResult = JSON.parse(result);
-    if (parsedResult.status === "success") {
-      return parsedResult.data.verification
-    } else {
-      return undefined
-    }
-  }
-`)
-
-module TwitterVerification = {
-  @react.component
-  let make = (~twitterVerification, ~threeBoxState, ~setThreeBoxState, ~reloadUser) => {
-    let currentUser = RootProvider.useCurrentUser()->Belt.Option.mapWithDefault("", a => a)
-
-    let optEthereumWallet = RootProvider.useCurrentUser()
-    let optWeb3Provider = RootProvider.useWeb3()
-    let (twitterVerificationStep, setTwitterVerificationStep) = React.useState(_ => Uninitialized)
-
-    let verifyTwitter = () => {
-      setThreeBoxState(_ => Loading3Box)
-      let _ = switch (optEthereumWallet, optWeb3Provider) {
-      | (Some(ethereumWallet), Some(web3Provider)) =>
-        setTwitterVerificationStep(_ => PreparePostToTwitter)
-        openBox(. ethereumWallet, web3Provider.provider)
-        ->Promise.Js.toResult
-        ->Promise.getOk(threeBoxInstance => {
-          setThreeBoxState(_ => LoggedIn(threeBoxInstance, true))
-          setTwitterVerificationStep(_ => PostToTwitter(threeBoxInstance._DID))
-          threeBoxInstance.syncDone
-          ->Promise.Js.toResult
-          ->Promise.get(isBoxLoaded => {
-            let state = switch isBoxLoaded {
-            | Ok(_finishedBoxSync) => SyncedBox(threeBoxInstance)
-            | Error(_) => Load3BoxError
-            }
-            setThreeBoxState(_ => state)
-          })
-        })
-      | _ => ()
-      }
-    }
-
-    let removeTwitter = () => {
-      setThreeBoxState(_ => Loading3Box)
-      let _ = switch (optEthereumWallet, optWeb3Provider) {
-      | (Some(ethereumWallet), Some(web3Provider)) =>
-        setTwitterVerificationStep(_ => PreparePostToTwitter)
-        openBox(. ethereumWallet, web3Provider.provider)
-        ->Promise.Js.toResult
-        ->Promise.getOk(threeBoxInstance => {
-          setThreeBoxState(_ => LoggedIn(threeBoxInstance, true))
-          setTwitterVerificationStep(_ => PostToTwitter(threeBoxInstance._DID))
-          threeBoxInstance.syncDone
-          ->Promise.Js.toResult
-          ->Promise.get(isBoxLoaded => {
-            let state = switch isBoxLoaded {
-            | Ok(_finishedBoxSync) =>
-              let _ = threeBoxInstance.public.remove(. "proof_twitter")
-              reloadUser(true)
-              SyncedBox(threeBoxInstance)
-            | Error(_) => Load3BoxError
-            }
-            setThreeBoxState(_ => state)
-          })
-        })
-      | _ => ()
-      }
-    }
-
-    let submitTwitterVerification = (did, twitterHandle) => {
-      setTwitterVerificationStep(_ => VerifyWithServer(did))
-      let _ = {
-        open Js.Promise
-        Fetch.fetchWithInit(
-          "https://wildcards.xyz/verification3boxTwitter",
-          Fetch.RequestInit.make(
-            ~method_=Post,
-            ~headers=Fetch.HeadersInit.make({"Content-Type": "application/json"}),
-            ~body=Fetch.BodyInit.make(
-              Js.Json.stringifyAny({
-                did: did,
-                twitterHandle: twitterHandle,
-              })->Belt.Option.mapWithDefault("{}", a => a),
-            ),
-            (),
-          ),
-        )
-        |> then_(Fetch.Response.text)
-        |> then_(text => {
-          let optTwitterProof = getResult(text)
-          switch optTwitterProof {
-          | Some(twitterProof) =>
-            switch threeBoxState {
-            | SyncedBox(threeBoxInstance)
-            | SyncedBoxWithSpace(threeBoxInstance, _)
-            | SyncedSpace(threeBoxInstance, _) =>
-              threeBoxInstance.verified.addTwitter(. twitterProof)
-              ->Promise.Js.toResult
-              ->Promise.getOk(_result => {
-                reloadUser(true)
-                setTwitterVerificationStep(_ => Uninitialized)
-              })
-              ()
-            | DefaultView(_)
-            | Loading3Box
-            | Load3BoxError
-            | LoggedIn(_, _) => ()
-            }
-          | _ => ()
-          }
-          Js.Promise.resolve()
-        })
-      }
-    }
-
-    let (twitterHandle, setTwitterHandle) = React.useState(_ => "")
-    switch twitterVerification {
-    | Some(_) =>
-      <React.Fragment>
-        <p> {"Your twitter is verified"->React.string} </p>
-        <Rimble.Button
-          onClick={e => {
-            e->ReactEvent.Form.preventDefault
-            let _ = removeTwitter()
-          }}>
-          {"Remove Verification"->React.string}
-        </Rimble.Button>
-      </React.Fragment>
-    | None =>
-      switch twitterVerificationStep {
-      | Uninitialized =>
-        <React.Fragment>
-          <Rimble.Heading> {"verify your twitter"->React.string} </Rimble.Heading>
-          <Rimble.Input
-            _type="string"
-            value=twitterHandle
-            placeholder="twitter_handle"
-            onChange={event => {
-              let value = ReactEvent.Form.target(event)["value"]->Belt.Option.getWithDefault("")
-              setTwitterHandle(_ => value)
-            }}
-          />
-          <Rimble.Button
-            onClick={e => {
-              e->ReactEvent.Form.preventDefault
-              let _ = verifyTwitter()
-            }}>
-            {"Verify"->React.string}
-          </Rimble.Button>
-        </React.Fragment>
-      | PreparePostToTwitter => <p> {"Please login to 3box!"->React.string} </p>
-      | PostToTwitter(did) =>
-        let link = j`https://twitter.com/intent/tweet?text=This Tweet links my Twitter account to my 3Box profile!\\n%0D%0A%0D%0Ahttps://wildcards.world/%23user/$currentUser\\n%0D%0A%0D%0ASupport Animal conservation @wildcards_world\\n%0D%0A✅\\n%0D%0A$did\\n%0D%0A✅`
-
-        <React.Fragment>
-          <p> {"Post the following proof to twitter"->React.string} </p>
-          <p> {did->React.string} </p>
-          <button>
-            <a
-              href=link
-              target="_blank"
-              rel="noopener noreferrer"
-              className="modal__github__description__copy__tweet">
-              {"Tweet this"->React.string}
-            </a>
-          </button>
-          {switch threeBoxState {
-          | SyncedBox(_threeBoxInstance) =>
-            <Rimble.Button
-              onClick={e => {
-                e->ReactEvent.Form.preventDefault
-                let _ = submitTwitterVerification(did, twitterHandle)
-              }}>
-              {"NEXT"->React.string}
-            </Rimble.Button>
-          | DefaultView(_)
-          | Loading3Box
-          | Load3BoxError
-          | LoggedIn(_, _)
-          | SyncedBoxWithSpace(_, _)
-          | SyncedSpace(_, _) =>
-            <p> {"waiting to sync 3box before continuing"->React.string} </p>
-          }}
-        </React.Fragment>
-      | VerifyWithServer(_did) => <p> {"Verifying with server!"->React.string} </p>
-      }
-    }
-  }
-}
-
-module ThreeBoxUpdate = {
-  @react.component
-  let make = () => {
-    let currentUser = RootProvider.useCurrentUser()->Belt.Option.mapWithDefault("", a => a)
-
-    let userInfoContext = UserProvider.useUserInfoContext()
-    let reloadUser = forceReload => userInfoContext.update(currentUser, forceReload) // double check that data is loaded.
-    reloadUser(false)
-
-    let optThreeBoxData = UserProvider.use3BoxUserData(currentUser)
-
-    let (threeBoxState, setThreeBoxState) = React.useState(() => DefaultView(NoState))
-
-    switch optThreeBoxData {
-    | Some(threeBoxData) =>
-      <React.Fragment>
-        {switch threeBoxData.profile {
-        | Some(profile) =>
-          <div>
-            <ProfileDetails
-              profileName={profile.name->Belt.Option.mapWithDefault("", a => a)}
-              profileDescription={profile.description->Belt.Option.mapWithDefault("", a => a)}
-              reloadUser
-              threeBoxState
-              setThreeBoxState
-            />
-          </div>
-        | None => <Rimble.Loader />
-        }}
-        {switch threeBoxData.verifications {
-        | Some(verification) =>
-          <TwitterVerification
-            twitterVerification=verification.twitter threeBoxState setThreeBoxState reloadUser
-          />
-        | None =>
-          <TwitterVerification twitterVerification=None threeBoxState setThreeBoxState reloadUser />
-        }}
-      </React.Fragment>
-    | None => <Rimble.Loader />
-    }
-  }
-}
-module Main = {
-  @react.component
-  let make = () => {
-    let currentUser = RootProvider.useCurrentUser()->Belt.Option.mapWithDefault("", a => a)
-    let (isIntegrated3Box, setIsIntegarted3Box) = React.useState(_ => false)
-    <div>
-      <Rimble.Heading> {"Verify your identity"->React.string} </Rimble.Heading>
-      <br />
-      {if isIntegrated3Box {
-        <ThreeBoxUpdate />
-      } else {
-        <React.Fragment>
-          <Rimble.Text>
-            {"Please use"->React.string}
-            <strong>
-              <a target="_blank" rel="noopener noreferrer" href={"https://3box.io/" ++ currentUser}>
-                {" 3Box.io "->React.string}
-              </a>
-            </strong>
-            {"to validate your identity on twitter."->React.string}
-          </Rimble.Text>
-          <br />
-          <Rimble.Text>
-            <a onClick={_e => setIsIntegarted3Box(_ => true)}>
-              {React.string("Try our experimental 3box integration")}
-            </a>
-            {React.string(" - but if in doubt go to the official 3box website.")}
-          </Rimble.Text>
-        </React.Fragment>
-      }}
-    </div>
-  }
-}
-
-let default = Main.make
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/TokenId.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/TokenId.res
deleted file mode 100644
index 1e0637a..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/TokenId.res
+++ /dev/null
@@ -1,19 +0,0 @@
-type t
-
-let fromStringUnsafe: string => t = Obj.magic
-
-// TODO: check that the string is the correct type
-let make: string => option<t> = tokenId =>
-  Helper.isPositiveStringInteger(tokenId) ? Some(tokenId->fromStringUnsafe) : None
-
-let makeWithDefault: (string, int) => t = (tokenId, default) =>
-  switch make(tokenId) {
-  | Some(id) => id
-  | None => default->Js.Math.abs_int->Belt.Int.toString->fromStringUnsafe
-  }
-
-// NOTE: I run abs on this int because negative integers are invalid
-let makeFromInt: int => t = tokenId => tokenId->Js.Math.abs_int->Belt.Int.toString->fromStringUnsafe
-
-let toString: t => string = Obj.magic
-let toInt: t => option<int> = token => token->toString->int_of_string_opt
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/TotalContribution.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/TotalContribution.res
deleted file mode 100644
index fad4a63..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/TotalContribution.res
+++ /dev/null
@@ -1,182 +0,0 @@
-open GqlConverters
-
-module LoadMostContributed = %graphql(`
-    query {
-      patrons(first: 30, orderBy: totalContributed, orderDirection: desc, where: {id_not: "0x6d47cf86f6a490c6410fc082fd1ad29cf61492d0"}) {
-        id
-        patronTokenCostScaledNumerator  @ppxCustom(module: "BigInt")
-        totalContributed @ppxCustom(module: "BigInt")
-        lastUpdated @ppxCustom(module: "BigInt")
-      }
-    }
-  `)
-
-let useLoadMostContributed = () => Obj.magic
-// ApolloHooks.useSubscription(LoadMostContributed.definition);
-let useLoadMostContributedData = () => {
-  let currentTimestamp = QlHooks.useCurrentTime()
-
-  switch LoadMostContributed.use() {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data: Some({patrons}), _} =>
-    patrons
-    ->Array.map(patron => {
-      let timeElapsed = BN.new_(currentTimestamp)->BN.sub(patron.lastUpdated)
-
-      let amountContributedSinceLastUpdate =
-        patron.patronTokenCostScaledNumerator
-        ->BN.mul(timeElapsed) // A month with 30 days has 2592000 seconds
-        ->BN.div(
-          // BN.new_("1000000000000")->BN.mul( BN.new_("31536000")),
-          BN.new_("31536000000000000000"),
-        )
-
-      let totalContributedWei = patron.totalContributed->BN.add(amountContributedSinceLastUpdate)
-
-      (patron.id, totalContributedWei)
-    })
-    ->Js.Array2.sortInPlaceWith(((_, first), (_, second)) => second->BN.cmp(first))
-    ->Some
-  | _ => None
-  }
-}
-
-open Css
-
-let flameImg = "/img/streak-flame.png"
-let goldTrophyImg = "/img/icons/gold-trophy.png"
-let silverTrophyImg = "/img/icons/silver-trophy.png"
-let bronzeTrophyImg = "/img/icons/bronze-trophy.png"
-
-let leaderboardTable = style(list{
-  width(#percent(100.)),
-  tableLayout(#fixed),
-  overflowWrap(#breakWord),
-})
-
-let leaderboardHeader = style(list{backgroundColor(#hex("73c7d7ff"))})
-
-let streakTextLeaderboard = style(list{
-  position(absolute),
-  zIndex(100),
-  bottom(#percent(-10.)),
-  right(#percent(50.)),
-  transform(translateX(#px(-5))),
-})
-let flameImgLeaderboard = style(list{width(#percent(100.)), maxWidth(px(50))})
-
-let rankText = style(list{
-  position(absolute),
-  zIndex(100),
-  bottom(#percent(-10.)),
-  right(#percent(50.)),
-  transform(translate(#px(-4), #px(-15))),
-})
-
-let trophyImg = style(list{width(#percent(100.)), width(px(50)), height(px(50))})
-
-let centerFlame = style(list{display(block), margin(auto), width(#px(70)), position(relative)})
-
-let rankMetric = style(list{fontSize(#px(16))})
-
-let rankingColor = index =>
-  style(list{backgroundColor(#hex(mod(index, 2) == 1 ? "b5b5bd22" : "ffffffff"))})
-
-module ContributorsRow = {
-  @react.component
-  let make = (~contributor, ~amount, ~index) => {
-    UserProvider.useUserInfoContext().update(contributor, false)
-
-    let optThreeBoxData = UserProvider.use3BoxUserData(contributor)
-    let optUserName = {
-      open Belt.Option
-      optThreeBoxData
-      ->flatMap(threeBoxData => threeBoxData.profile)
-      ->flatMap(threeBoxData => threeBoxData.name)
-    }
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-    <tr key=contributor className={rankingColor(index)}>
-      <td>
-        <span className=centerFlame>
-          {index == 0
-            ? <img className=trophyImg src=goldTrophyImg />
-            : index == 1
-            ? <img className=trophyImg src=silverTrophyImg />
-            : index == 2
-            ? <img className=trophyImg src=bronzeTrophyImg />
-            : <div className=trophyImg />}
-          <p className=rankText>
-            <strong> {"#"->React.string} {(index + 1)->string_of_int->React.string} </strong>
-          </p>
-        </span>
-      </td>
-      <td>
-        <a
-          onClick={e => {
-            ReactEvent.Mouse.preventDefault(e)
-            clearAndPush(j`/#user/$contributor`)
-          }}>
-          {switch optUserName {
-          | Some(name) => <span> {name->React.string} </span>
-          | None => <span> {Helper.elipsify(contributor, 20)->React.string} </span>
-          }}
-        </a>
-      </td>
-      //  <td>
-      //    <span className=centerFlame>
-      //      <img className=flameImgLeaderboard src=flameImg />
-      //      <p className=streakTextLeaderboard>
-      //        <strong> "1"->React.string </strong>
-      //      </p>
-      //    </span>
-      //  </td>
-      <td className=rankMetric> {(amount ++ " ETH")->React.string} </td>
-    </tr>
-  }
-}
-
-module MostContributed = {
-  @react.component
-  let make = (~highestContributors) =>
-    React.array(
-      Array.mapWithIndex(highestContributors, (index, (contributor, amount)) =>
-        <ContributorsRow
-          contributor amount={amount->Web3Utils.fromWeiBNToEthPrecision(~digits=4)} index
-        />
-      ),
-    )
-}
-
-@react.component
-let make = (~numberOfLeaders) => {
-  let highestContributorsOpt = useLoadMostContributedData()
-
-  <div>
-    <Rimble.Heading> {"Wildcards Total Contribution Leaderboard"->React.string} </Rimble.Heading>
-    <br />
-    <Rimble.Table className=leaderboardTable>
-      <thead className=leaderboardHeader>
-        <tr>
-          <th> {"Rank"->React.string} </th>
-          <th> {"Guardian"->React.string} </th>
-          // <th> "Longest Streak"->React.string </th>
-          <th> {"Total Contribution"->React.string} </th>
-        </tr>
-      </thead>
-      <tbody>
-        {switch highestContributorsOpt {
-        | Some(highestContributorsFull) =>
-          let highestContributors = Belt.Array.slice(
-            highestContributorsFull,
-            ~offset=0,
-            ~len=numberOfLeaders,
-          )
-          <MostContributed highestContributors />
-        | None => React.null
-        }}
-      </tbody>
-    </Rimble.Table>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/TotalDaysHeld.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/TotalDaysHeld.res
deleted file mode 100644
index 3233e70..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/TotalDaysHeld.res
+++ /dev/null
@@ -1,172 +0,0 @@
-open GqlConverters
-
-module LoadMostDaysHeld = %graphql(`
-    query {
-      patrons(first: 20, orderBy: totalTimeHeld, orderDirection: desc,  where: {id_not: "NO_OWNER"}) {
-        id
-        totalTimeHeld @ppxCustom(module: "BigInt")
-        tokens{
-          id
-        }
-        lastUpdated @ppxCustom(module: "BigInt")
-      }
-    }
-  `)
-
-let useLoadMostDaysHeldData = () => {
-  let currentTimestamp = QlHooks.useCurrentTime()
-
-  switch LoadMostDaysHeld.use() {
-  | {loading: true, _} => None
-  | {error: Some(_error), _} => None
-  | {data: Some({patrons}), _} =>
-    patrons
-    ->Array.map(patron => {
-      let numberOfTokens = patron.tokens->Js.Array.length->string_of_int
-      let timeElapsed = BN.new_(currentTimestamp)->BN.sub(patron.lastUpdated)
-
-      let totalTimeHeldWei =
-        patron.totalTimeHeld->BN.add(timeElapsed->BN.mul(BN.new_(numberOfTokens)))
-
-      (patron.id, totalTimeHeldWei)
-    })
-    ->Js.Array2.sortInPlaceWith(((_, first), (_, second)) => second->BN.cmp(first))
-    ->Some
-  | _ => None
-  }
-}
-
-open Css
-
-let flameImg = "/img/streak-flame.png"
-let goldTrophyImg = "/img/icons/gold-trophy.png"
-let silverTrophyImg = "/img/icons/silver-trophy.png"
-let bronzeTrophyImg = "/img/icons/bronze-trophy.png"
-
-let leaderboardTable = style(list{
-  width(#percent(100.)),
-  tableLayout(#fixed),
-  overflowWrap(#breakWord),
-})
-
-let leaderboardHeader = style(list{backgroundColor(#hex("73c7d7ff"))})
-
-let streakTextLeaderboard = style(list{
-  position(absolute),
-  zIndex(100),
-  bottom(#percent(-10.)),
-  right(#percent(50.)),
-  transform(translateX(#px(-5))),
-})
-let flameImgLeaderboard = style(list{width(#percent(100.)), maxWidth(px(50))})
-
-let rankText = style(list{
-  position(absolute),
-  zIndex(100),
-  bottom(#percent(-10.)),
-  right(#percent(50.)),
-  transform(translate(#px(-4), #px(-15))),
-})
-
-let trophyImg = style(list{width(#percent(100.)), width(px(50)), height(px(50))})
-
-let centerFlame = style(list{display(block), margin(auto), width(#px(70)), position(relative)})
-
-let rankMetric = style(list{fontSize(#px(16))})
-
-let rankingColor = index =>
-  style(list{backgroundColor(#hex(mod(index, 2) == 1 ? "b5b5bd22" : "ffffffff"))})
-
-module ContributorsRow = {
-  @react.component
-  let make = (~contributor, ~amount, ~index) => {
-    UserProvider.useUserInfoContext().update(contributor, false)
-
-    let optThreeBoxData = UserProvider.use3BoxUserData(contributor)
-    let optUserName = {
-      open Belt.Option
-      optThreeBoxData
-      ->flatMap(threeBoxData => threeBoxData.profile)
-      ->flatMap(threeBoxData => threeBoxData.name)
-    }
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-
-    <tr key=contributor className={rankingColor(index)}>
-      <td>
-        <span className=centerFlame>
-          {index == 0
-            ? <img className=trophyImg src=goldTrophyImg />
-            : index == 1
-            ? <img className=trophyImg src=silverTrophyImg />
-            : index == 2
-            ? <img className=trophyImg src=bronzeTrophyImg />
-            : <div className=trophyImg />}
-          <p className=rankText>
-            <strong> {"#"->React.string} {(index + 1)->string_of_int->React.string} </strong>
-          </p>
-        </span>
-      </td>
-      <td>
-        <a
-          onClick={e => {
-            ReactEvent.Mouse.preventDefault(e)
-            clearAndPush(j`/#user/$contributor`)
-          }}>
-          {switch optUserName {
-          | Some(name) => <span> {name->React.string} </span>
-          | None => <span> {Helper.elipsify(contributor, 20)->React.string} </span>
-          }}
-        </a>
-      </td>
-      //  <td>
-      //    <span className=centerFlame>
-      //      <img className=flameImgLeaderboard src=flameImg />
-      //      <p className=streakTextLeaderboard>
-      //        <strong> "1"->React.string </strong>
-      //      </p>
-      //    </span>
-      //  </td>
-      <td className=rankMetric> {(amount ++ " Days")->React.string} </td>
-    </tr>
-  }
-}
-
-module MostDaysHeld = {
-  @react.component
-  let make = (~mostDaysHeld) =>
-    React.array(
-      Array.mapWithIndex(mostDaysHeld, (index, (contributor, amount)) =>
-        <ContributorsRow contributor amount={amount->BN.div(BN.new_("86400"))->BN.toString} index />
-      ),
-    )
-}
-
-@react.component
-let make = (~numberOfLeaders) => {
-  let mostDaysHeldOpt = useLoadMostDaysHeldData()
-
-  <div>
-    <Rimble.Heading>
-      {"Wildcards Accumulative Days Held Leaderboard"->React.string}
-    </Rimble.Heading>
-    <br />
-    <Rimble.Table className=leaderboardTable>
-      <thead className=leaderboardHeader>
-        <tr>
-          <th> {"Rank"->React.string} </th>
-          <th> {"Guardian"->React.string} </th>
-          // <th> "Longest Streak"->React.string </th>
-          <th> {"Accumulative Days Held"->React.string} </th>
-        </tr>
-      </thead>
-      <tbody>
-        {switch mostDaysHeldOpt {
-        | Some(mostDaysHeldFull) =>
-          let mostDaysHeld = Belt.Array.slice(mostDaysHeldFull, ~offset=0, ~len=numberOfLeaders)
-          <MostDaysHeld mostDaysHeld />
-        | None => React.null
-        }}
-      </tbody>
-    </Rimble.Table>
-  </div>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/TotalRaised.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/TotalRaised.res
deleted file mode 100644
index 7f2fbf4..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/TotalRaised.res
+++ /dev/null
@@ -1,87 +0,0 @@
-open UsdPriceProvider
-open Globals
-
-module TotalRaisedEtherCountup = {
-  @module("./TotalRaisedEtherCountup.js") @react.component
-  external make: (~totalRaised: string) => React.element = "default"
-}
-
-type patronageRaised =
-  | Loaded(string, option<string>)
-  | Loading
-
-let uesTotalPatronage = () => {
-  let optTotalPatronageWei = QlHooks.useAmountRaised() //->Web3Utils.fromWeiBNToEth;
-  let optCurrentUsdEthPrice = useUsdPrice() //->mapd(0., a => a);
-  // let optCurrentUsdEthPrice = Some(0.5); //->mapd(0., a => a);
-
-  switch optTotalPatronageWei {
-  | Some(totalPatronageWei) =>
-    let totalPatronageEth = totalPatronageWei->BN.toString->Web3Utils.fromWeiToEth
-
-    let optTotaPatronageUsd =
-      optCurrentUsdEthPrice->Belt.Option.flatMap(currentUsdEthPrice => Some(
-        Js.Float.toFixedWithPrecision(
-          Float.fromString(totalPatronageEth)->mapd(0., a => a) *. currentUsdEthPrice,
-          ~digits=2,
-        ),
-      ))
-
-    Loaded(totalPatronageEth, optTotaPatronageUsd)
-  | _ => Loading
-  }
-}
-
-@react.component
-let make = () => {
-  let totalPatronageRaised = uesTotalPatronage()
-
-  switch totalPatronageRaised {
-  | Loaded(totalRaised, optTotaPatronageUsd) =>
-    <div
-      className={
-        open Css
-        style(list{
-          // These styles make the total raised counter always display in the centre.
-          display(#flex),
-          alignItems(#center),
-          justifyContent(#center),
-          flexDirection(#column),
-        })
-      }>
-      <p
-        className={
-          open Css
-          style(list{display(#table)})
-        }>
-        <small>
-          <span className={Styles.totalRaisedText(1.5)}>
-            {React.string("Wildcards has currently raised ")}
-          </span>
-          <br />
-          <span className={Styles.totalRaisedText(4.)}>
-            <TotalRaisedEtherCountup totalRaised /> <strong> {React.string(" ETH ")} </strong>
-          </span>
-          <br />
-          {switch optTotaPatronageUsd {
-          | Some(totalPatronageUsd) =>
-            <React.Fragment>
-              <span className={Styles.totalRaisedText(2.5)}>
-                {React.string("(")}
-                {React.string(totalPatronageUsd)}
-                <strong> {React.string(" USD")} </strong>
-                {React.string(")")}
-              </span>
-              <br />
-              <span className={Styles.totalRaisedText(1.5)}>
-                {React.string(" for conservation.")}
-              </span>
-            </React.Fragment>
-          | None => React.null
-          }}
-        </small>
-      </p>
-    </div>
-  | Loading => <Rimble.Loader />
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Transak.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Transak.res
deleted file mode 100644
index d90e879..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Transak.res
+++ /dev/null
@@ -1,184 +0,0 @@
-///// TODO: make use of these event handlers.
-// // To get all the events
-// transak.on(transak.ALL_EVENTS, (data) => {
-// 		console.log(data)
-// });
-// // This will trigger when the user marks payment is made.
-// transak.on(transak.EVENTS.TRANSAK_ORDER_SUCCESSFUL, (orderData) => {
-//     console.log(orderData);
-//     transak.close();
-// });
-type t
-
-type walletAddressesData
-/*
- EXAMPLE:
- {
- 	networks : {
- 		'erc20' : {address : '0xfF21f4F75ea2BbEf96bC999fEB5Efec98bB3f6F4'},
- 		'bep2' : {address : 'bnb1dv5ps9vpj6clar79gkd0jrfmg8c0knrd6m090h', addressAdditionalData : '123456'}
- 	},
- 	coins : {
- 		'BTC' : {address : 'bc1qlah8pucrmw8l3evszn8a7ay62gpyg00rzl7p2m'},
- 		'DAI' : {address : '0xfF21f4F75ea2BbEf96bC999fEB5Efec98bB3f6F4'},
- 		'BNB' : {address : 'bnb1dv5ps9vpj6clar79gkd0jrfmg8c0knrd6m090h', addressAdditionalData : '123456'}
- 	}
- }
- */
-
-type userData
-/*
- EXAMPLE:
- {
-   "firstName": "Satoshi",
-   "lastName": "Nakamoto",
-   "email": "email@gmail.com",
-   "mobileNumber": "+19692154942",
-   "dob": "1994-11-26",
-   "address": {
-     "addressLine1": "170 Pine St",
-     "addressLine2": "San Francisco",
-     "city": "San Francisco",
-     "state": "CA",
-     "postCode": "94111",
-     "countryCode": "US",
-   },
- };
- */
-
-type initParams = {
-  environment: string,
-  apiKey: string,
-  // Description: Your Transak API Key.
-  // Example Value: 4fcd6904-706b-4aff-bd9d-77422813bbb7
-  // Default Value:
-  hostURL: string,
-  // Description: Your domain name. The default value is window.location.origin. Our SDK requires this field to communicate with our system.
-  // Example Value: https://yourCompany.com
-  // Default Value:
-  cryptoCurrencyCode: option<string>,
-  // Description: "The code of the cryptocurrency you want the customer to purchase. If you pass a cryptoCurrencyCode, the currency will be selected by default and the customer won't be able to select another currency."
-  // Example Value: CDAI
-  // Default Value: ETH
-  defaultCryptoCurrency: option<string>,
-  // Description: "The default cryptocurrency you would prefer the customer to purchase. If you pass a defaultCryptoCurrency, the currency will be selected by default, but the customer will still be able to select another cryptocurrency. "
-  // Example Value: CDAI
-  // Default Value:
-  cryptoCurrencyList: option<string>,
-  // Description: A comma-separated list of cryptoCurrencies that you would allow your customers to buy. Only these cryptoCurrencies will be shown in the widget. This will be a string of comma separated values each of which will represent a valid cryptoCurrency code,"ETH,CDAI
-  // Example Value: USDT"
-  // Default Value:
-  networks: option<string>,
-  // Description: A comma-separated list of crypto networks that you would allow your customers to buy. Only these networks' cryptocurrencies will be shown in the widget. This will be a string of comma-separated values each of which will represent a valid network name. You can get the supporting networks by opening global.transak.com and then go to cryptocurrencies select screen. ,"ethereum,matic
-  // Example Value: mainnet"
-  // Default Value:
-  walletAddress: option<string>,
-  // Description: "The wallet public address that the purchased funds will be sent to. If you pass a valid wallet address, the customer won't be prompted to enter one. This parameter will be ignored if cryptoCurrencyCode is not passed. "
-  // Example Value: 0x86349020e9394b2BE1b1262531B0C3335fc32F20
-  // Default Value:
-  walletAddressesData: option<walletAddressesData>,
-  // Description: "Here you can pass multiple wallet addresses of the different cryptocurrencies & networks in the JSON object format. Use this query parameter if you are allowing multiple options to your users to buy a cryptocurrency. If you pass the valid wallet addresses, the customer won't be prompted to enter one. If walletAddress is passed, then this field will be ignored. "
-  // Example Value:
-  // Default Value:
-  fiatCurrency: option<string>,
-  // Description: The code of the fiat currency you want the customer to buy/sell cryptocurrency.
-  // Example Value: INR
-  // Default Value:
-  countryCode: option<string>,
-  // Description: The country's ISO 3166-1 alpha-2 code. The fiat currency will be display as per the country code. This parameter will be skipped if fiatCurrency is passed.
-  // Example Value: IN
-  // Default Value:
-  fiatAmount: option<int>,
-  // Description: An integer amount representing how much the customer wants to spend. Users can't change the fiat amount if this is passed. This parameter will be skipped if fiatCurrency is not passed.
-  // Example Value: 1100
-  // Default Value:
-  defaultNetwork: option<string>,
-  // Description: "The default network you would prefer the customer to purchase. If you pass a defaultNetwork, the network will be selected by default, but the customer will still be able to select another network. "
-  // Example Value: matic
-  // Default Value:
-  defaultFiatAmount: option<int>,
-  // Description: An integer amount representing how much the customer wants to spend. Users can change the fiat amount if this is passed. This parameter will be skipped if fiatCurrency is not passed.
-  // Example Value: 1100
-  // Default Value:
-  paymentMethod: option<string>,
-  // Description: "The payment method you want to show to the customer with purchasing. If you pass a paymentMethod, the payment method will be selected by default and the customer won't be able to select another payment method. This parameter will be skipped if fiatCurrency is not passed. Open this doc to get the possible values."
-  // Example Value: upi Open this document to see more examples
-  // Default Value:
-  defaultPaymentMethod: option<string>,
-  // Description: "The default payment method you would prefer the customer to purchase with. If you pass a defaultPaymentMethod, the payment method will be selected by default and the customer can also select another payment method.  This parameter will be skipped if fiatCurrency is not passed. Open this doc to get the possible values."
-  // Example Value: upi Open this document to see more examples
-  // Default Value:
-  disablePaymentMethods: option<string>,
-  // Description: A comma-separated list of payment methods you want to disable and hide from the customers. Open this doc to get the possible values.,"credit_debit_card
-  // Example Value: upi Open this document to see more examples"
-  // Default Value:
-  email: option<string>,
-  // Description: The email that will be used to identify your customer and their order (usually the email that they registered with your app).
-  // Example Value: customer@mail.com
-  // Default Value:
-  userData: option<userData>,
-  // Description: "Here you can pass your user's data like their name, address, date of birth in the object format. If you will pass all the basic user's data, the customer won't be prompted to enter it. "
-  // Example Value:
-  // Default Value:
-  partnerOrderId: option<string>,
-  // Description: An order ID that will be used to identify the transaction once a webhook is called back to your app. This can be your identifier to track your customers.
-  // Example Value: 5e2f559511a9de73d364eeaf
-  // Default Value:
-  partnerCustomerId: option<string>,
-  // Description: A customer ID that will be used to identify the customer that made the transaction once a webhook is called back to your app.
-  // Example Value: 23487492
-  // Default Value:
-  accessToken: option<string>,
-  // Description: "Pass the user's accessToken. Using this parameter, you can do widget + API integration easily by passing the user's KYC data via API and then show our widget for the payment."
-  // Example Value: D8W3jTY1e7GNRMEOI3UJeQZ3j40lbl7NojyS8UkUrFb2BAnviy8kEPEB85WfkqFg
-  // Default Value:
-  redirectURL: option<string>,
-  // Description: Transak will redirect back to this URL once the customer's has completed their purchase process. Please pass the valid URL otherwise it will not work.
-  // Example Value: https://google.com
-  // Default Value:
-  disableWalletAddressForm: option<bool>,
-  // Description: "When true, the customer will not be able to change the destination address of where the cryptocurrency is sent to."
-  // Example Value: TRUE
-  // Default Value: FALSE
-  isAutoFillUserData: option<bool>,
-  // Description: "When true, then the email address will be auto-filled, but the screen will not be skipped. User can edit their email address, basic data like first name & the address. This parameter will be ignored if email or userData are not passed."
-  // Example Value: TRUE
-  // Default Value: FALSE
-  themeColor: option<string>,
-  // Description: "The theme color code for the widget main color. It is used for buttons, links and highlighted text. Only hexadecimal codes are accepted."
-  // Example Value: #000000
-  // Default Value:
-  height: option<string>,
-  // Description: Height of the widget iFrame.
-  // Example Value: 100.00%
-  // Default Value: 100.00%
-  width: option<string>,
-  // Description: Width of the widget iFrame.
-  // Example Value: 100.00%
-  // Default Value: 100.00%
-  hideMenu: option<bool>,
-  // Description: "When true, then the customer will not see the menu options. This will hide the menu completely."
-  // Example Value: TRUE
-  // Default Value: FALSE
-  hideExchangeScreen: option<bool>,
-  // Description: "When true, then the customer will not see the home screen (exchange screen). This will hide the exchange screen completely, then the customer can't change the payment method, cryptocurrency, fiat amount. This parameter will be ignored if fiatAmount, fiatCurrency, cryptoCurrencyCode and paymentMethod are not passed. "
-  // Example Value: TRUE
-  // Default Value: FALSE
-  isDisableCrypto: option<bool>,
-  // Description: "When true, then the customer will not see anything about the cryptocurrency. This will hide all the information related to crypto completely. This parameter will be ignored if cryptoCurrencyCode, walletAddress is not passed. This parameter is helpful if you are creating an app for the users who do not know much about the cryptocurrencies."
-  // Example Value: TRUE
-  // Default Value: FALSE
-  isFeeCalculationHidden: option<bool>,
-  // Description: "When true, then the customer will not see our fee breakdown. The customer will only see the total fee. This parameter will be ignored if your fee (on top of us) is more than 1%. "
-  // Example Value: TRUE
-  // Default Value: FALSE
-  exchangeScreenTitle: option<string>,
-  // Description: To change the exchange screen title.
-  // Example Value: Buy Crypto Instantly
-  // Default Value: Buy crypto to your wallet
-}
-
-@new @module("@transak/transak-sdk")
-external new_: initParams => t = "default"
-
-@send external init: (t, unit) => unit = "init"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/TxTemplate.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/TxTemplate.res
deleted file mode 100644
index 027ad19..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/TxTemplate.res
+++ /dev/null
@@ -1,97 +0,0 @@
-open Globals
-
-@react.component
-let make = (
-  ~children: React.element,
-  ~txState: ContractActions.transactionState,
-  ~closeButtonText: string,
-  ~chain,
-) => {
-  let etherscanUrl = RootProvider.useEtherscanUrl()
-  let sidechainUrl = RootProvider.useSidechainEtherscanUrl()
-  let clearNonUrlState = RootProvider.useClearNonUrlState()
-
-  let isSideChainTx = switch chain {
-  | Client.Neither
-  | Client.MainnetQuery => false
-  | Client.MaticQuery => true
-  }
-  let txExplererUrl = isSideChainTx ? sidechainUrl : etherscanUrl
-  switch txState {
-  | ContractActions.UnInitialised => children
-  | DaiPermit(value) =>
-    <React.Fragment>
-      <Rimble.Heading>
-        {("Please sign the message to allow use of " ++
-        (value->Web3Utils.fromWeiBNToEthPrecision(~digits=2) ++
-        " DAI."))->restr}
-        <WildcardsLoader />
-      </Rimble.Heading>
-      <Rimble.Flex justifyContent="center"> <Rimble.Loader size="80px" /> </Rimble.Flex>
-    </React.Fragment>
-  | SignMetaTx =>
-    <React.Fragment>
-      <Rimble.Heading>
-        {"Please sign the message to submit this transaction."->restr} <WildcardsLoader />
-      </Rimble.Heading>
-      <Rimble.Flex justifyContent="center"> <Rimble.Loader size="80px" /> </Rimble.Flex>
-    </React.Fragment>
-  | SubmittedMetaTx =>
-    <React.Fragment>
-      <Rimble.Heading> {"Transaction Submitted "->restr} <WildcardsLoader /> </Rimble.Heading>
-      <Rimble.Text> {"Awaiting transaction details."->restr} </Rimble.Text>
-      <Rimble.Flex justifyContent="center"> <Rimble.Loader size="80px" /> </Rimble.Flex>
-    </React.Fragment>
-  | ContractActions.Created =>
-    <React.Fragment>
-      <Rimble.Heading> {"Processing Transaction "->restr} <WildcardsLoader /> </Rimble.Heading>
-      <Rimble.Text> {"Tx created."->restr} </Rimble.Text>
-      <Rimble.Flex justifyContent="center"> <Rimble.Loader size="80px" /> </Rimble.Flex>
-    </React.Fragment>
-  | ContractActions.SignedAndSubmitted(txHash) =>
-    <React.Fragment>
-      <Rimble.Heading> {"Processing Transaction "->restr} <WildcardsLoader /> </Rimble.Heading>
-      <Rimble.Text>
-        <a href=j`https://$txExplererUrl/tx/$txHash` target="_blank" rel="noopener noreferrer">
-          {("View the transaction on " ++ txExplererUrl)->restr}
-        </a>
-      </Rimble.Text>
-      <Rimble.Loader className=Styles.centerItems size="80px" />
-    </React.Fragment>
-  | ContractActions.Complete(result) =>
-    let txHash = result.transactionHash
-    <React.Fragment>
-      <Rimble.Heading> {"Transaction Complete "->restr} <WildcardsLoader /> </Rimble.Heading>
-      <Rimble.Text>
-        <a href=j`https://$txExplererUrl/tx/$txHash` target="_blank" rel="noopener noreferrer">
-          {("View the transaction on " ++ txExplererUrl)->restr}
-        </a>
-      </Rimble.Text>
-      <Rimble.Button onClick={_e => clearNonUrlState()}> {closeButtonText->restr} </Rimble.Button>
-    </React.Fragment>
-  | ContractActions.Declined(message) =>
-    <React.Fragment>
-      <Rimble.Heading>
-        {"The transaction was declined by your wallet, please try again."->restr}
-      </Rimble.Heading>
-      <p> {("Failure reason: " ++ message)->restr} </p>
-      children
-    </React.Fragment>
-  | ServerError(message) =>
-    <React.Fragment>
-      <Rimble.Heading>
-        {"There was a server error when submitting your transaction."->restr}
-      </Rimble.Heading>
-      <p> {("Failure reason: " ++ message)->restr} </p>
-      children
-    </React.Fragment>
-  | ContractActions.Failed =>
-    <React.Fragment>
-      <Rimble.Heading> {"The transaction failed."->restr} <WildcardsLoader /> </Rimble.Heading>
-      <Rimble.Text>
-        {"It is possible that someone else bought the token before you, or the price changed. If you are unsure please feel free to contact our support."->restr}
-      </Rimble.Text>
-      children
-    </React.Fragment>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/UpdateDeposit.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/UpdateDeposit.res
deleted file mode 100644
index fd8d095..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/UpdateDeposit.res
+++ /dev/null
@@ -1,64 +0,0 @@
-module UpdateDepositInput = {
-  @module("./UpdateDepositInput") @react.component
-  external make: (
-    ~depositChange: string,
-    ~updateDepositChange: ReactEvent.Form.t => (string, bool),
-    ~isAddDeposit: bool,
-    ~updateIsAddDeposit: bool => unit,
-    ~onSubmitDepositChange: ReactEvent.Form.t => unit,
-  ) => React.element = "default"
-}
-
-let getToDisplay = (label, value) =>
-  React.string(label ++ (": " ++ value->Belt.Option.mapWithDefault("loading", a => a)))
-
-@react.component
-let make = (~closeButtonText, ~chain) => {
-  // TODO: We must use the correct chain client for updating the deposit
-
-  let (depositChange, setDepositChange) = React.useState(() => "")
-  let (isAddDeposit, setIsAddDeposit) = React.useState(() => true)
-
-  let web3Context = RootProvider.useWeb3React()
-
-  let (depositFunc, txWithdrawObject) = ContractActions.useUpdateDeposit(
-    ~chain,
-    web3Context.library,
-    web3Context.account,
-    web3Context.chainId->Option.getWithDefault(1),
-  )
-  let (withdrawFunc, txDepositObject) = ContractActions.useWithdrawDeposit(
-    ~chain,
-    web3Context.library,
-    web3Context.account,
-    web3Context.chainId->Option.getWithDefault(1),
-  )
-
-  // let _availableDeposit =
-  //   useDepositAbleToWithdrawWeiNew(currentUser)
-  //   ->mapWithDefault("0", price => price);
-
-  let onSubmitDepositChange = event => {
-    ReactEvent.Form.preventDefault(event)
-    let depositChangeWei = Web3Utils.toWei(depositChange, "ether")
-
-    if isAddDeposit {
-      depositFunc(depositChangeWei)
-    } else {
-      withdrawFunc(depositChangeWei)
-    }
-  }
-
-  let updateDepositChange = event => {
-    ReactEvent.Form.preventDefault(event)
-    InputHelp.onlyUpdateIfPositiveFloat(depositChange, setDepositChange, event)
-  }
-  let updateIsAddDeposit = isDeposit => setIsAddDeposit(_ => isDeposit)
-  <TxTemplate chain txState=txDepositObject closeButtonText>
-    <TxTemplate chain txState=txWithdrawObject closeButtonText>
-      <UpdateDepositInput
-        depositChange updateDepositChange isAddDeposit updateIsAddDeposit onSubmitDepositChange
-      />
-    </TxTemplate>
-  </TxTemplate>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/UpdatePrice.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/UpdatePrice.res
deleted file mode 100644
index 6b22df0..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/UpdatePrice.res
+++ /dev/null
@@ -1,36 +0,0 @@
-open Belt.Option
-
-let getToDisplay = (label, value) =>
-  React.string(label ++ (": " ++ value->mapWithDefault("loading", a => a)))
-
-@react.component
-let make = (~tokenId: TokenId.t, ~chain) => {
-  // TODO: We must use the correct client for updating the deposit
-
-  let (newBuyPrice, setNewBuyPrice) = React.useState(() => "")
-
-  let (updatePriceFunc, txState) = ContractActions.useChangePrice(tokenId)
-
-  let onSubmitBuy = event => {
-    ReactEvent.Form.preventDefault(event)
-
-    updatePriceFunc(Web3Utils.toWei(newBuyPrice, "ether"))
-  }
-
-  <TxTemplate chain txState closeButtonText="Back to animal view">
-    <Rimble.Box p=4 mb=3>
-      <Rimble.HeadingS> "Update Price" </Rimble.HeadingS>
-      <Rimble.Input
-        _type="number"
-        placeholder="New Sale Price"
-        onChange={event => {
-          let value = ReactEvent.Form.target(event)["value"]->getWithDefault("")
-          let _ = InputHelp.onlyUpdateValueIfPositiveFloat(newBuyPrice, setNewBuyPrice, value)
-        }}
-        value=newBuyPrice
-      />
-      <br />
-      <Rimble.Button onClick=onSubmitBuy> {React.string("Update")} </Rimble.Button>
-    </Rimble.Box>
-  </TxTemplate>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/UsdPriceProvider.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/UsdPriceProvider.res
deleted file mode 100644
index 87a7025..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/UsdPriceProvider.res
+++ /dev/null
@@ -1,69 +0,0 @@
-open Globals
-
-type usdPrice = {usdPrice: option<float>}
-
-let initialState = {usdPrice: None}
-
-// TODO: this should move to using a graphql based price feed (preferably from thegraph (via uniswap or makers oracles?))
-module PriceProvider = {
-  let context: React.Context.t<option<float>> = React.createContext(None)
-  let make = React.Context.provider(context)
-
-  @ocaml.doc(" Tell bucklescript how to translate props into JS ")
-  let makeProps = (~value, ~children, ()) =>
-    {
-      "value": value,
-      "children": children,
-    }
-}
-
-@decco @deriving(accessors)
-type price = {c: array<string>}
-@decco @deriving(accessors)
-type ethUsdPrice = {
-  @decco.key("XETHZUSD")
-  ethUsd: option<price>,
-}
-@decco @deriving(accessors)
-type krakenPriceResponse = {result: option<ethUsdPrice>}
-
-let getPrice = () => {
-  open Fetch
-  %Async({
-    let result = fetch("https://api.kraken.com/0/public/Ticker?pair=ETHUSD")
-    %Async({
-      let response = result->Response.json
-      let krakenPriceObj = response->krakenPriceResponse_decode
-
-      let usdEthPrice = switch krakenPriceObj {
-      | Ok(priceObj) =>
-        let getPriceFromArray = a => a->Array.get(0)
-        \">>="(\"<$>"(\">>="(priceObj.result, ethUsd), c), getPriceFromArray)
-      | Result.Error(error) =>
-        Js.log(error)
-        None
-      }
-
-      usdEthPrice->async
-    })
-  })
-}
-
-@react.component
-let make = (~children) => {
-  let (etherUsdPrice, setEtherUsdPrice) = React.useState(_ => None)
-
-  React.useEffect2(() => {
-    if etherUsdPrice == None {
-      let _ =
-        getPrice()->mapAsync(newPrice => setEtherUsdPrice(_ => \">>="(newPrice, Float.fromString)))
-    } else {
-      ()
-    }
-    None
-  }, (setEtherUsdPrice, etherUsdPrice))
-
-  <PriceProvider value=etherUsdPrice> children </PriceProvider>
-}
-
-let useUsdPrice = () => React.useContext(PriceProvider.context)
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/UserProfile.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/UserProfile.res
deleted file mode 100644
index 4a6b0e1..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/UserProfile.res
+++ /dev/null
@@ -1,409 +0,0 @@
-open Globals
-
-let centreAlignOnMobile = {
-  open Css
-  style(list{media("(max-width: 831px)", list{alignItems(center), justifyContent(center)})})
-}
-
-// TODO:: check that the address is valid:
-// Something like this maybe? https://docs.ethers.io/ethers.js/html/api-utils.html
-module Token = {
-  @react.component
-  let make = (~tokenId: TokenId.t) => {
-    let clearAndPush = RootProvider.useClearNonUrlStateAndPushRoute()
-    let image = Animal.useAvatar(tokenId)
-
-    <div
-      className={
-        open Css
-        style(list{width(vh(12.)), cursor(#pointer)})
-      }>
-      <img
-        className={
-          open Css
-          style(list{width(#percent(100.))})
-        }
-        onClick={_e => clearAndPush("/#details/" ++ tokenId->TokenId.toString)}
-        src=image
-      />
-    </div>
-  }
-}
-
-module ClaimLoyaltyTokenButtons = {
-  @react.component
-  let make = (
-    ~chain,
-    ~userAddress: string,
-    ~id: string,
-    ~refreshLoyaltyTokenBalance,
-    ~numberOfTokens,
-  ) => {
-    let tokenId = id->TokenId.fromStringUnsafe
-
-    let (redeemLoyaltyTokens, transactionStatus) = ContractActions.useRedeemLoyaltyTokens(
-      userAddress,
-    )
-    let balanceAvailableOnTokens = QlHooks.useUnredeemedLoyaltyTokenDueForUser(
-      ~chain,
-      tokenId,
-      numberOfTokens,
-    )
-
-    let etherScanUrl = RootProvider.useEtherscanUrl()
-
-    React.useEffect2(() => {
-      switch transactionStatus {
-      | Complete(_) => refreshLoyaltyTokenBalance()
-      | UnInitialised
-      | Created
-      | DaiPermit(_)
-      | SubmittedMetaTx
-      | SignMetaTx
-      | ServerError(_)
-      | SignedAndSubmitted(_)
-      | Declined(_)
-      | Failed => ()
-      }
-      None
-    }, (transactionStatus, refreshLoyaltyTokenBalance))
-
-    switch balanceAvailableOnTokens {
-    | None => React.null
-    | Some(balanceAvailableOnTokens) =>
-      <small>
-        {switch transactionStatus {
-        | UnInitialised =>
-          <p>
-            <a onClick={_ => redeemLoyaltyTokens()}>
-              {("Redeem " ++
-              (balanceAvailableOnTokens->Web3Utils.fromWeiBNToEthPrecision(~digits=5) ++
-              " loyalty tokens"))->restr}
-            </a>
-          </p>
-        | DaiPermit(_)
-        | SignMetaTx
-        | ServerError(_)
-        | SubmittedMetaTx
-        | Created =>
-          <p> {"Transaction Created"->restr} </p>
-        | SignedAndSubmitted(txHash) =>
-          <p>
-            {"Processing: "->restr}
-            <a
-              target="_blank"
-              rel="noopener noreferrer"
-              href={"https://" ++ (etherScanUrl ++ ("/tx/" ++ txHash))}>
-              {"view transaction"->restr}
-            </a>
-          </p>
-        | Declined(message) => <p> {("Submitting transaction failed: " ++ message)->restr} </p>
-        | Complete(_txResult) =>
-          <p> {"Tokens claimed (please reload the page, this will be improved soon)"->restr} </p>
-        | Failed => <p> {"Transaction failed"->restr} </p>
-        }}
-      </small>
-    }
-  }
-}
-
-module UserDetails = {
-  @react.component
-  let make = (
-    ~chain,
-    ~patronQueryResult: QlHooks.LoadPatron.LoadPatron_inner.t_patron,
-    ~optThreeBoxData: option<UserProvider.threeBoxUserInfo>,
-    ~userAddress: string,
-  ) => {
-    let isForeclosed = QlHooks.useIsForeclosed(~chain=Client.MainnetQuery, userAddress)
-    let isAddressCurrentUser = RootProvider.useIsAddressCurrentUser(userAddress)
-
-    @ocaml.doc("
-     * 1 of four scenarios for each user:
-     * User has never owned a wildcard.
-     * User owns a wildcard(s), hasn't owned others in the past.
-     * User owns a wildcard(s), has owned others in the past.
-     * User owned (past tense) wildcards, but they have foreclosed / been bought from them.
-     *
-     * TODO: It might make the code more readable to encode the above for options into an variant.
-     *       It is hard to reason about if we are just checking if the array is null, or not etc.
-     ")
-    let currentlyOwnedTokens = isForeclosed
-      ? []
-      : patronQueryResult.tokens->Array.map(token => token.id)
-
-    let allPreviouslyOwnedTokens =
-      patronQueryResult.previouslyOwnedTokens->Array.map(token => token.id)
-
-    let uniquePreviouslyOwnedTokens = isForeclosed
-      ? allPreviouslyOwnedTokens
-      : Set.String.fromArray(allPreviouslyOwnedTokens)
-        ->Set.String.removeMany(currentlyOwnedTokens)
-        ->Set.String.toArray
-
-    let optProfile = \">>="(optThreeBoxData, a => a.profile)
-    let image: string =
-      \">>="(
-        \"<$>"(\">>="(\">>="(optProfile, a => a.image), img => img->Array.get(0)), a =>
-          a.contentUrl
-        ),
-        content => Js.Dict.get(content, "/"),
-      )->Option.mapWithDefault(Blockie.makeBlockie(. userAddress), hash =>
-        "https://ipfs.infura.io/ipfs/" ++ hash
-      )
-    let optName = \">>="(optProfile, a => a.name)
-    let optDescription = \">>="(optProfile, a => a.description)
-    let optTwitter = {
-      open UserProvider
-      \"<$>"(\">>="(\">>="(optThreeBoxData, a => a.verifications), a => a.twitter), a => a.username)
-    }
-    let etherScanUrl = RootProvider.useEtherscanUrl()
-
-    let optUsdPrice = UsdPriceProvider.useUsdPrice()
-
-    let monthlyCotributionWei =
-      patronQueryResult.patronTokenCostScaledNumerator
-      ->BN.mul(BN.new_("2592000")) // A month with 30 days has 2592000 seconds
-      ->BN.div(
-        // BN.new_("1000000000000")->BN.mul( BN.new_("31536000")),
-        BN.new_("31536000000000000000"),
-      )
-
-    let monthlyContributionEth = monthlyCotributionWei->Web3Utils.fromWeiBNToEthPrecision(~digits=4)
-    let optMonthlyContributionUsd = \"<$>"(optUsdPrice, currentUsdEthPrice =>
-      toFixedWithPrecisionNoTrailingZeros(
-        Float.fromString(monthlyContributionEth)->Option.mapWithDefault(0., a => a) *.
-          currentUsdEthPrice,
-        ~digits=2,
-      )
-    )
-
-    // This is the value of tokens that are currently in the users account (IE their spendable balance)
-    let (totalLoyaltyTokensOpt, updateFunction) = ContractActions.useUserLoyaltyTokenBalance(
-      userAddress,
-    )
-
-    // This is the value of ALL tokens that this address has ever claimed, or is able to claim (even if they have spent those tokens)!
-    let totalLoyaltyTokensAvailableAndClaimedOpt = QlHooks.useTotalLoyaltyToken(
-      ~chain=Client.MainnetQuery,
-      userAddress,
-    )
-
-    let nonUrlState = RootProvider.useNonUrlState()
-    let clearNonUrlState = RootProvider.useClearNonUrlState()
-
-    <div
-      className={
-        open Css
-        style(list{width(#percent(100.))})
-      }>
-      <Rimble.Flex flexWrap="wrap" alignItems="start">
-        <Rimble.Box
-          p=1
-          width=[1., 1., 0.3333]
-          className={
-            open Css
-            style(list{textAlign(#center)})
-          }>
-          <img
-            className={
-              open Css
-              style(list{
-                borderRadius(#percent(100.)),
-                width(#vh(25.)),
-                height(#vh(25.)),
-                objectFit(#cover),
-              })
-            }
-            src=image
-          />
-          <br />
-          {switch nonUrlState {
-          | UserVerificationScreen =>
-            <div
-              className={
-                open Css
-                style(list{position(#relative)})
-              }>
-              <Rimble.Button.Text
-                icononly=true
-                icon="Close"
-                color="moon-gray"
-                position="absolute"
-                top=0
-                right=0
-                m=1
-                onClick={_ => clearNonUrlState()}
-              />
-              <React.Suspense fallback={<Rimble.Loader />}> <LazyThreeBoxUpdate /> </React.Suspense>
-            </div>
-          | UpdateDepositScreen =>
-            <div
-              className={
-                open Css
-                style(list{position(#relative)})
-              }>
-              <Rimble.Button.Text
-                icononly=true
-                icon="Close"
-                color="moon-gray"
-                position="absolute"
-                top=0
-                right=0
-                m=1
-                onClick={_ => clearNonUrlState()}
-              />
-              <UpdateDeposit chain=Client.MainnetQuery closeButtonText="Close" />
-            </div>
-          | LoginScreen(_)
-          | UpdatePriceScreen(_)
-          | BuyScreen(_)
-          | AuctionScreen(_)
-          | NoExtraState => <>
-              {optName->reactMap(name => <h2> {name->restr} </h2>)}
-              {optTwitter->reactMap(twitterHandle =>
-                <a
-                  className=Styles.navListText
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  href={"https://twitter.com/" ++ twitterHandle}>
-                  {("@" ++ twitterHandle)->restr}
-                </a>
-              )}
-              <br />
-              {optDescription->reactMap(description => <p> {description->restr} </p>)}
-              <a
-                className=Styles.navListText
-                target="_blank"
-                rel="noopener noreferrer"
-                href={"https://" ++ (etherScanUrl ++ ("/address/" ++ userAddress))}>
-                {Helper.elipsify(userAddress, 10)->restr}
-              </a>
-              <br />
-              {
-                // NOTE: the number of loyalty tokens of a user currently will always show.
-                //       We are thinking of making this "private" only to the current logged in user. To enable this remove the `|| true` from the line below
-                isAddressCurrentUser
-                  ? <>
-                      <small>
-                        <p>
-                          {("Claimed Loyalty Token Balance: " ++
-                          (totalLoyaltyTokensOpt->Option.mapWithDefault(
-                            "Loading",
-                            claimedLoyaltyTokens =>
-                              claimedLoyaltyTokens->Web3Utils.fromWeiBNToEthPrecision(~digits=6),
-                          ) ++
-                          " WLT"))->restr}
-                        </p>
-                      </small>
-                      {switch currentlyOwnedTokens {
-                      | [] => React.null
-                      | currentlyOwnedTokens =>
-                        <ClaimLoyaltyTokenButtons
-                          id={currentlyOwnedTokens->Array.getUnsafe(0)}
-                          chain
-                          refreshLoyaltyTokenBalance=updateFunction
-                          userAddress
-                          numberOfTokens={currentlyOwnedTokens->Array.length}
-                        />
-                      }}
-                      <a href="/#ethturin-quadratic-voting"> {"vote"->restr} </a>
-                    </>
-                  : <small>
-                      <p>
-                        {("Loyalty Token Balance Generated: " ++
-                        (totalLoyaltyTokensAvailableAndClaimedOpt->Option.mapWithDefault(
-                          "Loading",
-                          ((totalLoyaltyTokens, _)) =>
-                            totalLoyaltyTokens->Web3Utils.fromWeiBNToEthPrecision(~digits=5),
-                        ) ++
-                        " WLT"))->restr}
-                      </p>
-                    </small>
-              }
-              {if isAddressCurrentUser {
-                <React.Fragment>
-                  <br />
-                  <ActionButtons.UpdateDeposit />
-                  <br />
-                  // {UserProvider.useIsUserValidated(currentAccount)
-                  //    ? <ShareSocial /> : <Validate />}
-                  <Validate />
-                </React.Fragment>
-              } else {
-                React.null
-              }}
-            </>
-          }}
-        </Rimble.Box>
-        <Rimble.Box p=1 width=[1., 1., 0.3333]>
-          <h2> {"Monthly Contribution"->restr} </h2>
-          <p>
-            <React.Fragment>
-              {j`$monthlyContributionEth ETH\\xa0`->restr}
-              {optMonthlyContributionUsd->reactMap(usdValue =>
-                <small> {j`($usdValue USD)`->restr} </small>
-              )}
-            </React.Fragment>
-          </p>
-        </Rimble.Box>
-        <Rimble.Box p=1 width=[1., 1., 0.3333]>
-          {switch currentlyOwnedTokens {
-          | [] =>
-            uniquePreviouslyOwnedTokens->Array.length > 0
-              ? <p> {"User currently doesn't currently own a wildcard."->restr} </p>
-              : <p> {"User has never owned a wildcard."->restr} </p>
-          | currentlyOwnedTokens =>
-            <React.Fragment>
-              <Rimble.Heading> {"Currently owned tokens"->React.string} </Rimble.Heading>
-              <Rimble.Flex flexWrap="wrap" className=centreAlignOnMobile>
-                {React.array(
-                  currentlyOwnedTokens->Array.map(tokenId =>
-                    <Token key=tokenId tokenId={TokenId.fromStringUnsafe(tokenId)} />
-                  ),
-                )}
-              </Rimble.Flex>
-              <br />
-              <br />
-              <br />
-            </React.Fragment>
-          }}
-          {switch uniquePreviouslyOwnedTokens {
-          | [] => React.null
-          | uniquePreviouslyOwnedTokens =>
-            <React.Fragment>
-              <Rimble.Heading> {"Previously owned tokens"->React.string} </Rimble.Heading>
-              <Rimble.Flex flexWrap="wrap" className=centreAlignOnMobile>
-                {React.array(
-                  uniquePreviouslyOwnedTokens->Array.map(tokenId =>
-                    <Token key=tokenId tokenId={TokenId.fromStringUnsafe(tokenId)} />
-                  ),
-                )}
-              </Rimble.Flex>
-            </React.Fragment>
-          }}
-        </Rimble.Box>
-      </Rimble.Flex>
-    </div>
-  }
-}
-
-@react.component
-let make = (~chain, ~userAddress: string) => {
-  let userAddressLowerCase = userAddress->Js.String.toLowerCase
-  let patronQuery = QlHooks.useQueryPatron(~chain=Client.MainnetQuery, userAddressLowerCase)
-  let userInfoContext = UserProvider.useUserInfoContext()
-  let reloadUser = forceReload => userInfoContext.update(userAddressLowerCase, forceReload) // double check that data is loaded.
-  reloadUser(false)
-  let optThreeBoxData = UserProvider.use3BoxUserData(userAddressLowerCase)
-
-  <Rimble.Flex flexWrap="wrap" alignItems="center" className=Styles.topBody>
-    {switch patronQuery {
-    | Some(patronQueryResult) => <UserDetails chain optThreeBoxData patronQueryResult userAddress />
-    | None =>
-      <div>
-        <Rimble.Heading> {"Loading user profile:"->React.string} </Rimble.Heading> <Rimble.Loader />
-      </div>
-    }}
-  </Rimble.Flex>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/UserProvider.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/UserProvider.res
deleted file mode 100644
index 57021e7..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/UserProvider.res
+++ /dev/null
@@ -1,87 +0,0 @@
-@module("./UserProvider") @react.component
-external make: (~children: React.element) => React.element = "UserInfoProvider"
-
-open Globals
-
-type threeBoxImageData = {
-  @as("@type")
-  imageType: string,
-  contentUrl: Js.Dict.t<string>,
-}
-type threeBoxImage = array<threeBoxImageData>
-type threeBoxTwitterVerification = {
-  username: string,
-  proof: string,
-  verifiedBy: string,
-}
-type threeBoxProfile = {
-  coverPhoto: option<threeBoxImage>,
-  description: option<string>,
-  image: option<threeBoxImage>,
-  name: option<string>,
-}
-type threeBoxVerifications = {
-  did: string,
-  twitter: option<threeBoxTwitterVerification>,
-}
-type threeBoxUserInfo = {
-  profile: option<threeBoxProfile>,
-  wildcardsSpace: option<string>,
-  verifications: option<threeBoxVerifications>,
-}
-type userVerification = {threeBox: threeBoxUserInfo}
-
-type userInfo = {
-  userInfo: Js.Dict.t<userVerification>,
-  update: (string, bool) => unit,
-}
-
-@module("./UserProvider")
-external useUserInfoContext: unit => userInfo = "useUserInfoContext"
-
-type displayName =
-  | TwitterHandle(string)
-  | ThreeBoxName(string)
-  | EthAddress(string)
-
-let useDisplayName: Web3.ethAddress => displayName = ethAddress => {
-  let userContext = useUserInfoContext()
-  let ethAddressLower = Js.String.toLowerCase(ethAddress)
-
-  let opt3box = \"<$>"(Js.Dict.get(userContext.userInfo, ethAddressLower), a => a.threeBox)
-
-  let opt3boxName = \">>="(\">>="(opt3box, a => a.profile), a => a.name)
-
-  let name =
-    opt3boxName->Option.mapWithDefault(
-      \"<$>"(\">>="(\">>="(opt3box, a => a.verifications), a => a.twitter), a =>
-        a.username
-      )->Option.mapWithDefault(EthAddress(ethAddress), a => TwitterHandle(a)),
-      a => ThreeBoxName(a),
-    )
-  name
-}
-
-let use3BoxUserData: string => option<threeBoxUserInfo> = ethAddress => {
-  let userContext = useUserInfoContext()
-  let ethAddressLower = Js.String.toLowerCase(ethAddress)
-
-  switch Js.Dict.get(userContext.userInfo, ethAddressLower) {
-  | None => None
-  | Some(userInfo) => Some(userInfo.threeBox)
-  }
-}
-
-let useIsUserValidated: string => bool = ethAddress =>
-  switch useDisplayName(ethAddress) {
-  | TwitterHandle(_) => true
-  | ThreeBoxName(_)
-  | EthAddress(_) => false
-  }
-
-let displayNameToString = displayName =>
-  switch displayName {
-  | EthAddress(addr) => addr->Helper.elipsifyMiddle(8, 2)
-  | TwitterHandle(handle) => handle
-  | ThreeBoxName(name) => name
-  }
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Util_test.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Util_test.res
deleted file mode 100644
index 07779e0..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Util_test.res
+++ /dev/null
@@ -1,18 +0,0 @@
-open Jest
-
-describe("Expect", () => {
-  open Expect
-  testAll(
-    "isPositiveStringInteger",
-    list{
-      ("003", true),
-      ("302", true),
-      ("3546674266447602", true),
-      ("1250000000000000000", true),
-      ("302.2", false),
-      ("-5", false),
-      ("", false),
-    },
-    ((num, result)) => expect(Helper.isPositiveStringInteger(num)) |> toBe(result),
-  )
-})
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Validate.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Validate.res
deleted file mode 100644
index e980649..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Validate.res
+++ /dev/null
@@ -1,10 +0,0 @@
-@react.component
-let make = () => {
-  let goToVerifyUser = RootProvider.useVerifyUser()
-
-  <React.Fragment>
-    <Rimble.Box p=1>
-      <Rimble.Button onClick={_e => goToVerifyUser()}> {React.string("Profile")} </Rimble.Button>
-    </Rimble.Box>
-  </React.Fragment>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/VotePage.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/VotePage.res
deleted file mode 100644
index cf8d70f..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/VotePage.res
+++ /dev/null
@@ -1,259 +0,0 @@
-open Globals
-
-let dragonImg = "/img/animals/Glen.svg"
-let refreshImg = "/img/icons/refresh.svg"
-
-let wildTomorrowFundImg = "/img/conservation-partners/wild-tomorrow-fund.png"
-
-let laSendaVerdeImg = "/img/conservation-partners/senda-verde.png"
-
-let greatWhaleConservancyImg = "/img/conservation-partners/great-whale-conservancy-small.png"
-
-let darwinAnimalDoctorsImg = "/img/conservation-partners/darwin-animal-doctors.svg"
-
-type conservationPartnerType = {
-  name: string,
-  image: string,
-  link: string,
-  index: int,
-}
-
-let conservationPartners: array<conservationPartnerType> = [
-  {
-    name: "Wild Tomorrow Fund",
-    image: wildTomorrowFundImg,
-    link: "https://www.wildtomorrowfund.org/",
-    index: 1,
-  },
-  {
-    name: "La Senda Verde",
-    image: laSendaVerdeImg,
-    link: "http://www.sendaverde.org/",
-    index: 2,
-  },
-  {
-    name: "The Great Whale Conservancy",
-    image: greatWhaleConservancyImg,
-    link: "http://greatwhaleconservancy.org/",
-    index: 3,
-  },
-  {
-    name: "Darwin Animal Doctors",
-    image: darwinAnimalDoctorsImg,
-    link: "http://darwinanimaldoctors.org/",
-    index: 4,
-  },
-]
-
-type organisationArrayIndex = int
-
-type voteStep =
-  | DefaultView // sub-states can either be loading data, ready, or user is not eligible to vote
-  | SelectedOrganisationToVote(organisationArrayIndex, float => unit)
-  | // | SelectedOrganisationToVote(organisationArrayIndex, currentVote)
-  ProcessTransaction
-  | ViewResults
-
-module HackyComponentThatCallsAFunctionOnce = {
-  @react.component
-  let make = (~reloadFunction) => {
-    let (hasCalledFunction, setHasCalledFunction) = React.useState(_ => false)
-    if !hasCalledFunction {
-      reloadFunction()
-      setHasCalledFunction(_ => true)
-    } else {
-      ()
-    }
-
-    React.null
-  }
-}
-
-// TODO: this shouldn't be done using a component, it should be done with a 'useEffect'
-module HackyComponentThatReloadsOnTimeout = {
-  @react.component
-  let make = (~reloadFunction: unit => unit, ~timeoutTime) => {
-    let (hasCalledFunction, setHasCalledFunction) = React.useState(_ => false)
-
-    React.useEffect4(() => {
-      let timeout = Js.Global.setTimeout(() =>
-        if !hasCalledFunction {
-          reloadFunction()
-          setHasCalledFunction(_ => true)
-        } else {
-          ()
-        }
-      , timeoutTime)
-      Some(() => Js.Global.clearTimeout(timeout))
-    }, (reloadFunction, hasCalledFunction, setHasCalledFunction, timeoutTime))
-
-    React.null
-  }
-}
-
-module OrganisationVote = {
-  @react.component
-  let make = (~conservationPartner, ~selectConservation, ~index) =>
-    <Rimble.Box width=[1., 0.25]>
-      <a href=conservationPartner.link target="_blank">
-        <img
-          className={
-            open Css
-            style(list{display(#block), width(#percent(70.)), maxWidth(#px(800)), margin(auto)})
-          }
-          src=conservationPartner.image
-        />
-      </a>
-      <Rimble.Button
-        className={
-          open Css
-          style(list{display(#block), margin(auto), width(#percent(90.))})
-        }
-        disabled=true
-        onClick={_ => selectConservation(index)}>
-        {"Voting Disabled"->restr}
-      </Rimble.Button>
-    </Rimble.Box>
-}
-
-@react.component
-let make = (~chain) => {
-  let (voteStep, setVoteStep) = React.useState(() => DefaultView)
-
-  let selectConservation = conservationArrayIndex => {
-    let submitVoteFunction: float => unit = _ => setVoteStep(_ => ProcessTransaction)
-
-    setVoteStep(_ => SelectedOrganisationToVote(conservationArrayIndex, submitVoteFunction))
-  }
-
-  let resetVoting = () => setVoteStep(_ => DefaultView)
-
-  let glen = TokenId.makeFromInt(13)
-  let optCurrentPrice = PriceDisplay.usePrice(~chain, glen)
-  let (_, _, ratio, _) = QlHooks.usePledgeRateDetailed(~chain, glen)
-  // TODO: investigate why the USD price doesn't load here.
-  let (optMonthlyPledgeEth, optMonthlyPledgeUsd) = switch optCurrentPrice {
-  | Some((priceEth, optPriceUsd)) => (
-      Some(
-        toFixedWithPrecisionNoTrailingZeros(
-          Float.fromString(priceEth)->Accounting.defaultZeroF *. ratio,
-          ~digits=5,
-        ),
-      ),
-      switch optPriceUsd {
-      | Some(_priceUsd) => None
-      | None => None
-      },
-    )
-  | None => (None, None)
-  }
-
-  <Rimble.Box className=Styles.topBody>
-    <Rimble.Box>
-      <Rimble.Flex flexWrap="wrap">
-        <Rimble.Box width=[1., 1., 0.3]>
-          <img
-            className={
-              open Css
-              style(list{maxWidth(#px(800)), margin(auto)})
-            }
-            src=dragonImg
-          />
-          <a href="/#details/13">
-            <h3
-              className={
-                open Css
-                style(list{textAlign(#center)})
-              }>
-              {"Glen the Dragon from Turin"->restr}
-            </h3>
-          </a>
-          <p
-            className={
-              open Css
-              style(list{textAlign(#center)})
-            }>
-            {"Monthly contribution: "->restr}
-            {switch optMonthlyPledgeEth {
-            | Some(monthlyPledgeEth) => (monthlyPledgeEth ++ " ETH")->restr
-            | None =>
-              <Rimble.Loader
-                className={
-                  open Css
-                  style(list{margin(auto)})
-                }
-              />
-            }}
-            <br />
-            <small>
-              {switch optMonthlyPledgeUsd {
-              | Some(monthlyPledgeUsd) => ("(" ++ (monthlyPledgeUsd ++ " USD)"))->restr
-              | None => React.null
-              }}
-            </small>
-          </p>
-          <br />
-          <br />
-          <br />
-          <h4
-            className={
-              open Css
-              style(list{width(#percent(100.)), textAlign(center)})
-            }>
-            {"Voting coming again soon!"->restr}
-          </h4>
-        </Rimble.Box>
-        <Rimble.Box width=[1., 1., 0.7]>
-          <h3
-            className={
-              open Css
-              style(list{textDecoration(#underline)})
-            }>
-            {"How it works"->restr}
-          </h3>
-          <p>
-            {"Glen is a special Wildcard, this mystical creature is not tied to a specific conservation but rather each month the owners of Wildcards vote for a conservation they think should receive the funds raised by Glen."->restr}
-          </p>
-          <p>
-            {"The voting mechanism uses quadratic voting. Wildcards owners vote using Wildcards Loyalty tokens which they earn from holding a Wildcard. Quadratic voting means that the number of loyalty tokens don't represent the exact number of votes but rather the number of loyalty tokens is square rooted to represent the number of votes."->restr}
-          </p>
-          <h3
-            className={
-              open Css
-              style(list{textDecoration(#underline)})
-            }>
-            {"Quadratic Voting    "->restr}
-            {voteStep != DefaultView
-              ? <img
-                  onClick={_ => resetVoting()}
-                  src=refreshImg
-                  className={
-                    open Css
-                    style(list{maxHeight(#px(16)), paddingLeft(#rem(1.))})
-                  }
-                />
-              : React.null}
-          </h3>
-          <small>
-            <p>
-              {"Unfortunately we have decided to stop running our DAO on mainnet ethereum. We are moving all of this code to Matic where voting will be much cheaper and more frictionless"->restr}
-            </p>
-          </small>
-          <Rimble.Flex flexWrap="wrap" alignItems="center">
-            {conservationPartners
-            ->Array.mapWithIndex((index, conservationPartner) =>
-              <OrganisationVote
-                conservationPartner
-                index
-                selectConservation
-                key=//  currentIteration=1
-                conservationPartner.name
-              />
-            )
-            ->React.array}
-          </Rimble.Flex>
-        </Rimble.Box>
-      </Rimble.Flex>
-    </Rimble.Box>
-  </Rimble.Box>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/VotePageOriginal.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/VotePageOriginal.res
deleted file mode 100644
index af2dba2..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/VotePageOriginal.res
+++ /dev/null
@@ -1,693 +0,0 @@
-open Globals
-
-let dragonImg = "/img/animals/Glen.svg"
-let refreshImg = "/img/icons/refresh.svg"
-
-let wildTomorrowFundImg = "/img/conservation-partners/wild-tomorrow-fund.png"
-
-let laSendaVerdeImg = "/img/conservation-partners/senda-verde.png"
-
-let greatWhaleConservancyImg = "/img/conservation-partners/great-whale-conservancy-small.png"
-
-let darwinAnimalDoctorsImg = "/img/conservation-partners/darwin-animal-doctors.svg"
-
-type conservationPartnerType = {
-  name: string,
-  image: string,
-  link: string,
-  index: int,
-}
-
-let conservationPartners: array<conservationPartnerType> = [
-  {
-    name: "Wild Tomorrow Fund",
-    image: wildTomorrowFundImg,
-    link: "https://www.wildtomorrowfund.org/",
-    index: 1,
-  },
-  {
-    name: "La Senda Verde",
-    image: laSendaVerdeImg,
-    link: "http://www.sendaverde.org/",
-    index: 2,
-  },
-  {
-    name: "The Great Whale Conservancy",
-    image: greatWhaleConservancyImg,
-    link: "http://greatwhaleconservancy.org/",
-    index: 3,
-  },
-  {
-    name: "Darwin Animal Doctors",
-    image: darwinAnimalDoctorsImg,
-    link: "http://darwinanimaldoctors.org/",
-    index: 4,
-  },
-]
-
-// type reasonUneligeableToVote =
-//   | DontOwnAWildcard
-//   | EligeableToVote;
-type organisationArrayIndex = int
-// type currentVote = {
-//   vote: BN.t,
-//   maxPossibleVote: BN.t // This should be calculated at the beginning
-// };
-type voteStep =
-  | DefaultView // sub-states can either be loading data, ready, or user is not eligible to vote
-  | SelectedOrganisationToVote(organisationArrayIndex, float => unit)
-  | // | SelectedOrganisationToVote(organisationArrayIndex, currentVote)
-  ProcessTransaction
-  | ViewResults
-
-// TODO: this shouldn't be done using a component, it should be done with a 'useEffect'
-module HackyComponentThatCallsAFunctionOnce = {
-  @react.component
-  let make = (~reloadFunction) => {
-    let (hasCalledFunction, setHasCalledFunction) = React.useState(_ => false)
-    if !hasCalledFunction {
-      reloadFunction()
-      setHasCalledFunction(_ => true)
-    } else {
-      ()
-    }
-
-    React.null
-  }
-}
-
-// TODO: this shouldn't be done using a component, it should be done with a 'useEffect'
-module HackyComponentThatReloadsOnTimeout = {
-  @react.component
-  let make = (~reloadFunction: unit => unit, ~timeoutTime) => {
-    let (hasCalledFunction, setHasCalledFunction) = React.useState(_ => false)
-
-    React.useEffect4(() => {
-      let timeout = Js.Global.setTimeout(() =>
-        if !hasCalledFunction {
-          reloadFunction()
-          setHasCalledFunction(_ => true)
-        } else {
-          ()
-        }
-      , timeoutTime)
-      Some(() => Js.Global.clearTimeout(timeout))
-    }, (reloadFunction, hasCalledFunction, setHasCalledFunction, timeoutTime))
-
-    React.null
-  }
-}
-
-module OrganisationVote = {
-  @react.component
-  let make = (
-    ~currentIteration,
-    ~conservationPartner,
-    ~cannotVote,
-    ~selectConservation,
-    ~index,
-    ~currentUser,
-  ) => {
-    // TODO: add a reload on timeout if this doesn't load
-    let (
-      hasVotedForProposal1Votes,
-      _reloadHasVoted,
-    ) = ContractActions.useHasUserVotedForProposalIteration(
-      currentIteration->string_of_int,
-      currentUser,
-      conservationPartner.index->string_of_int,
-    )
-
-    <Rimble.Box width=[1., 0.25]>
-      <a href=conservationPartner.link target="_blank">
-        <img
-          className={
-            open Css
-            style(list{display(#block), width(#percent(70.)), maxWidth(#px(800)), margin(auto)})
-          }
-          src=conservationPartner.image
-        />
-      </a>
-      <Rimble.Button
-        className={
-          open Css
-          style(list{display(#block), margin(auto), width(#percent(90.))})
-        }
-        disabled={\"||||"(hasVotedForProposal1Votes, true) || cannotVote}
-        onClick={_ => selectConservation(index)}>
-        {\"||||"(
-          \">>="(hasVotedForProposal1Votes, hasVoted =>
-            hasVoted ? Some("Cannot Vote Twice") : None
-          ),
-          "Vote",
-        )->restr}
-      </Rimble.Button>
-    </Rimble.Box>
-  }
-}
-module OrganisationVoteResult = {
-  @react.component
-  let make = (~conservationPartner, ~currentIteration, ~totalVotes) => {
-    // TODO: add a reload on timeout (incase this value doesn't load first time)
-    let (proposal1Votes, _reload) = ContractActions.useProposalVotes(
-      currentIteration,
-      conservationPartner.index->string_of_int,
-    )
-
-    let displayText = switch proposal1Votes {
-    | Some(proposalVotes) =>
-      ((\"||||"(
-        \"|/|"(\"|*|"(proposalVotes, BN.new_("10000")), totalVotes)->BN.toString->Float.fromString,
-        0.,
-      ) /. 100.)->Float.toString ++ "%")->restr
-    | None => <Rimble.Loader />
-    }
-    let numberOfVotes = switch proposal1Votes {
-    | Some(proposalVotes) =>
-      "with " ++
-      (\"|*|"(proposalVotes, BN.new_("1000000000"))->Web3Utils.fromWeiBNToEthPrecision(~digits=2) ++
-      " votes in total")
-    | None => ""
-    }
-
-    <Rimble.Box width=[1., 0.25]>
-      <a href=conservationPartner.link target="_blank">
-        <img
-          className={
-            open Css
-            style(list{display(#block), width(#percent(70.)), maxWidth(#px(800)), margin(auto)})
-          }
-          src=conservationPartner.image
-        />
-      </a>
-      <p> displayText </p>
-      <p> {numberOfVotes->restr} </p>
-    </Rimble.Box>
-  }
-}
-
-module VoteResults = {
-  @react.component
-  let make = (~currentIteration) => {
-    // TODO: add a reload on timeout (incase this value doesn't load first time)
-    let (totalVotes, _reload) = ContractActions.useTotalVotes()
-    let currentIteration = currentIteration->string_of_int
-    let (currentWinner, _reload) = ContractActions.useCurrentWinner()
-
-    <>
-      {switch totalVotes {
-      | Some(totalVotes) =>
-        <Rimble.Flex flexWrap="wrap" alignItems="center">
-          {conservationPartners
-          ->Array.map(conservationPartner =>
-            <OrganisationVoteResult
-              key=conservationPartner.name currentIteration totalVotes conservationPartner
-            />
-          )
-          ->React.array}
-        </Rimble.Flex>
-      | None => <p> <Rimble.Loader /> {"loading current standings"->restr} </p>
-      }}
-      {switch currentWinner {
-      | Some(currentWinner) =>
-        <p
-          className={
-            open Css
-            style(list{fontSize(em(2.))})
-          }>
-          <strong>
-            {\"||||"(
-              \"<$>"(conservationPartners[currentWinner - 1], partner => partner.name),
-              "Unknown",
-            )->restr}
-          </strong>
-          {" is currently winning"->restr}
-        </p>
-      //  <h2> {currentWinner->string_of_int->restr} </h2>
-      | None => React.null
-      }}
-    </>
-  }
-}
-
-module ApproveLoyaltyTokens = {
-  @react.component
-  let make = (~reloadFunction) => {
-    let (approveLoyaltyTokens, transactionStatus) = ContractActions.useApproveLoyaltyTokens()
-    let etherScanUrl = RootProvider.useEtherscanUrl()
-
-    <div>
-      {switch transactionStatus {
-      | UnInitialised => <>
-          <Rimble.Loader />
-          <p>
-            <a onClick={_ => approveLoyaltyTokens()}>
-              {">>Click here to enable wildcards vote with your tokens<<"->restr}
-            </a>
-          </p>
-        </>
-      | DaiPermit(_)
-      | SignMetaTx
-      | ServerError(_)
-      | SubmittedMetaTx
-      | Created => <>
-          <Rimble.Loader />
-          <p> {"Transaction Created - please check the details and confirm."->restr} </p>
-        </>
-      | SignedAndSubmitted(txHash) => <>
-          <Rimble.Loader />
-          <p>
-            {"Processing: "->restr}
-            <a
-              target="_blank"
-              rel="noopener noreferrer"
-              href={"https://" ++ (etherScanUrl ++ ("/tx/" ++ txHash))}>
-              {"view transaction"->restr}
-            </a>
-          </p>
-        </>
-      | Declined(message) => <p> {("Submitting transaction failed: " ++ message)->restr} </p>
-      | Complete(_txResult) =>
-        <p>
-          <HackyComponentThatCallsAFunctionOnce reloadFunction />
-          {"You are now ready to vote :)"->restr}
-        </p>
-      | Failed => <p> {"Transaction failed"->restr} </p>
-      }}
-    </div>
-  }
-}
-
-@react.component
-let make = (~chain) => {
-  let (voteStep, setVoteStep) = React.useState(() => DefaultView)
-  // let (voteStep, setVoteStep) = React.useState(() => ViewResults);
-
-  let (voteForProject, transactionStatus) = ContractActions.useVoteForProject()
-  let selectConservation = conservationArrayIndex => {
-    let submitVoteFunction: float => unit = votes => {
-      let conservationVotedContractIndex = (
-        conservationPartners->Array.getUnsafe(conservationArrayIndex)
-      ).index
-
-      // NOTE: if they vote with more than about 300000 there will be an overflow here...
-      let numberOfVotes =
-        (votes *. 100000.)->int_of_float->Int.toString->BN.new_->BN.mul(BN.new_("10000"))
-
-      voteForProject(conservationVotedContractIndex->string_of_int, numberOfVotes)
-
-      setVoteStep(_ => ProcessTransaction)
-    }
-
-    setVoteStep(_ => SelectedOrganisationToVote(conservationArrayIndex, submitVoteFunction))
-  }
-
-  let resetVoting = () => setVoteStep(_ => DefaultView)
-
-  let networkIdOpt = RootProvider.useNetworkId()
-
-  let currentUser = RootProvider.useCurrentUser()
-
-  let userAddressLowerCase = switch currentUser {
-  | Some(currentUser) => currentUser->Js.String.toLowerCase
-  | _ => CONSTANTS.nullEthAddress
-  }
-
-  let patronQueryOpt = QlHooks.usePatronQuery(~chain=Client.MainnetQuery, userAddressLowerCase)
-
-  let (optProposalDeadline, _reloadProposalDeadline) = ContractActions.useProposalDeadline()
-
-  let currentlyOwnedTokens = switch patronQueryOpt {
-  | Some(patronQueryResult) =>
-    \"||||"(
-      patronQueryResult["patron"]->oMap(patron =>
-        patron["tokens"]->Array.map(token => token["id"])
-      ),
-      [],
-    )
-  | None => []
-  }
-
-  let isProviderSelucted = RootProvider.useIsProviderSelected()
-
-  let (cannotVote, incorrectNetworkWarning) = {
-    let cannotVote: bool = currentlyOwnedTokens->Array.length <= 0
-
-    switch isProviderSelucted {
-    | false => (
-        false,
-        <>
-          <h4
-            className={
-              open Css
-              style(list{color(red)})
-            }>
-            {"You need to be logged in to vote"->restr}
-          </h4>
-        </>,
-      )
-    | true =>
-      switch networkIdOpt {
-      | Some(5) => (cannotVote, React.null)
-      | Some(1) =>
-        let launchTime = MomentRe.momentUtcDefaultFormat("2020-05-08T08:00:00")
-        let isBeforeDate = MomentRe.diff(launchTime, MomentRe.momentNow(), #seconds) > 0.
-        isBeforeDate
-          ? (
-              true,
-              <>
-                <h4
-                  className={
-                    open Css
-                    style(list{color(red)})
-                  }>
-                  {"Voting is currently only available on the Goerli testnet right."->restr}
-                </h4>
-                <h2
-                  className={
-                    open Css
-                    style(list{color(red)})
-                  }>
-                  {"Launching in: "->restr} <CountDown endDateMoment=launchTime />
-                </h2>
-              </>,
-            )
-          : (cannotVote, React.null)
-      | _ => (
-          true,
-          <>
-            <h4
-              className={
-                open Css
-                style(list{color(red)})
-              }>
-              {"We only support mainnet and goerli testnet."->restr}
-            </h4>
-          </>,
-        )
-      }
-    }
-  }
-
-  let glen = TokenId.makeFromInt(13)
-  let optCurrentPrice = PriceDisplay.usePrice(~chain, glen)
-  let (_, _, ratio, _) = QlHooks.usePledgeRateDetailed(~chain, glen)
-  // TODO: investigate why the USD price doesn't load here.
-  let (optMonthlyPledgeEth, optMonthlyPledgeUsd) = switch optCurrentPrice {
-  | Some((priceEth, optPriceUsd)) => (
-      Some(
-        toFixedWithPrecisionNoTrailingZeros(
-          Float.fromString(priceEth)->Accounting.defaultZeroF *. ratio,
-          ~digits=5,
-        ),
-      ),
-      switch optPriceUsd {
-      | Some(_priceUsd) => None
-      | None => None
-      },
-    )
-  | None => (None, None)
-  }
-
-  let etherScanUrl = RootProvider.useEtherscanUrl()
-
-  let (
-    redeemedLoyaltyTokenBalanceBn,
-    resetLoyaltyTokenBalance,
-  ) = ContractActions.useUserLoyaltyTokenBalance(userAddressLowerCase)
-  let (optCurrentIteration, reloadCurrentIteration) = ContractActions.useCurrentIteration()
-
-  let redeemedLoyaltyTokenBalanceOpt =
-    redeemedLoyaltyTokenBalanceBn->oFlatMap(balance =>
-      balance->Web3Utils.fromWeiBNToEthPrecision(~digits=3)->Float.fromString
-    )
-
-  let txStateDisplay =
-    <div>
-      {switch transactionStatus {
-      | UnInitialised => <> <Rimble.Loader /> <p> {"Starting Transaction"->restr} </p> </>
-      | DaiPermit(_)
-      | SignMetaTx
-      | ServerError(_)
-      | SubmittedMetaTx
-      | Created => <> <Rimble.Loader /> <p> {"Transaction Created"->restr} </p> </>
-      | SignedAndSubmitted(txHash) => <>
-          <Rimble.Loader />
-          <p>
-            {"Processing: "->restr}
-            <a
-              target="_blank"
-              rel="noopener noreferrer"
-              href={"https://" ++ (etherScanUrl ++ ("/tx/" ++ txHash))}>
-              {"view transaction"->restr}
-            </a>
-          </p>
-        </>
-      | Declined(message) => <p> {("Submitting transaction failed: " ++ message)->restr} </p>
-      | Complete(_txResult) => <>
-          <HackyComponentThatCallsAFunctionOnce reloadFunction=resetLoyaltyTokenBalance />
-          <p> {"Congratulations for voting"->restr} </p>
-          <Rimble.Button
-            className={
-              open Css
-              style(list{display(#block), margin(auto), width(#percent(90.))})
-            }
-            onClick={_ => setVoteStep(_ => ViewResults)}>
-            {"Reveal Rankings"->restr}
-          </Rimble.Button>
-        </>
-      | Failed => <p> {"Transaction failed"->restr} </p>
-      }}
-    </div>
-
-  let (amountApproved, resetAmountApproved) = ContractActions.useVoteApprovedTokens(
-    userAddressLowerCase,
-  )
-  // let hasApprovedFullBalance =
-  //   amountApproved
-  //   |||| BN.new_("0")
-  //   |>| (
-  //     redeemedLoyaltyTokenBalanceBn |||| BN.new_("10000000000000000000000")
-  //   );
-
-  // TODO: This gets the value from the graph rather - use this in the future rather than querying the chain.
-  // let totalLoyaltyTokensOpt =
-  //   QlHooks.useTotalLoyaltyToken(userAddressLowerCase);
-  // let redeemedLoyaltyTokenBalance: float =
-  //   totalLoyaltyTokensOpt->oFlatMap(((_, claimedLoyaltyTokens)) =>
-  //     claimedLoyaltyTokens
-  //     ->Web3Utils.fromWeiBNToEthPrecision(~digits=3)
-  //     ->Float.fromString
-  //   )
-  //   |||| 0.;
-
-  <Rimble.Box className=Styles.topBody>
-    <Rimble.Box>
-      <Rimble.Flex flexWrap="wrap">
-        <Rimble.Box width=[1., 1., 0.3]>
-          <img
-            className={
-              open Css
-              style(list{maxWidth(#px(800)), margin(auto)})
-            }
-            src=dragonImg
-          />
-          <a href="/#details/13">
-            <h3
-              className={
-                open Css
-                style(list{textAlign(#center)})
-              }>
-              {"Glen the Dragon from Turin"->restr}
-            </h3>
-          </a>
-          <p
-            className={
-              open Css
-              style(list{textAlign(#center)})
-            }>
-            {"Monthly contribution: "->restr}
-            {switch optMonthlyPledgeEth {
-            | Some(monthlyPledgeEth) => (monthlyPledgeEth ++ " ETH")->restr
-            | None =>
-              <Rimble.Loader
-                className={
-                  open Css
-                  style(list{margin(auto)})
-                }
-              />
-            }}
-            <br />
-            <small>
-              {switch optMonthlyPledgeUsd {
-              | Some(monthlyPledgeUsd) => ("(" ++ (monthlyPledgeUsd ++ " USD)"))->restr
-              | None => React.null
-              }}
-            </small>
-          </p>
-          <br />
-          <br />
-          <br />
-          {switch optProposalDeadline {
-          | Some(proposalDeadline) =>
-            let proposalDeadlineMoment = proposalDeadline->MomentRe.momentWithUnix
-            let isBeforeDate =
-              MomentRe.diff(proposalDeadlineMoment, MomentRe.momentNow(), #seconds) > 0.
-            isBeforeDate
-              ? <>
-                  <h4> {"Winner will be paid out in:"->restr} </h4>
-                  <CountDown endDateMoment=proposalDeadlineMoment />
-                </>
-              : <h4>
-                  {"This voting cycle is over, the winner will be paid out shortly."->restr}
-                </h4> /* TODO:
-                          this should say who the winner is. But in general we need think about the flow of this,
-                              because technically users can still vote here.
-                              Should the vote buttons be disabled in the UI?
- */
-
-          // TODO: when the voting interval is over, it should re-request every few seconds to update the page if it does come back.
-          | None => React.null
-          }}
-        </Rimble.Box>
-        <Rimble.Box width=[1., 1., 0.7]>
-          <h3
-            className={
-              open Css
-              style(list{textDecoration(#underline)})
-            }>
-            {"How it works"->restr}
-          </h3>
-          <p>
-            {"Glen is a special Wildcard, this mystical creature is not tied to a specific conservation but rather each month the owners of Wildcards vote for a conservation they think should receive the funds raised by Glen."->restr}
-          </p>
-          <p>
-            {"The voting mechanism uses quadratic voting. Wildcards owners vote using Wildcards Loyalty tokens which they earn from holding a Wildcard. Quadratic voting means that the number of loyalty tokens don't represent the exact number of votes but rather the number of loyalty tokens is square rooted to represent the number of votes."->restr}
-          </p>
-          <h3
-            className={
-              open Css
-              style(list{textDecoration(#underline)})
-            }>
-            {"Quadratic Voting    "->restr}
-            {voteStep != DefaultView
-              ? <img
-                  onClick={_ => resetVoting()}
-                  src=refreshImg
-                  className={
-                    open Css
-                    style(list{maxHeight(#px(16)), paddingLeft(#rem(1.))})
-                  }
-                />
-              : React.null}
-          </h3>
-          <small>
-            {currentlyOwnedTokens->Array.length <= 0
-              ? <p
-                  className={
-                    open Css
-                    style(list{color(red)})
-                  }>
-                  {"You can only vote if you are the owner of a wildcard"->restr}
-                </p>
-              : switch redeemedLoyaltyTokenBalanceOpt {
-                | Some(redeemedLoyaltyTokenBalance) =>
-                  <p>
-                    {("Redeemed loyalty token balance: " ++
-                    (redeemedLoyaltyTokenBalance->Float.toString ++
-                    " WLT"))->restr}
-                  </p>
-                | None => <Rimble.Loader />
-                }}
-            incorrectNetworkWarning
-          </small>
-          <Rimble.Flex flexWrap="wrap" alignItems="center">
-            {switch voteStep {
-            | DefaultView =>
-              switch optCurrentIteration {
-              | Some(currentIteration) =>
-                conservationPartners
-                ->Array.mapWithIndex((index, conservationPartner) =>
-                  <OrganisationVote
-                    currentUser=userAddressLowerCase
-                    currentIteration
-                    conservationPartner
-                    cannotVote
-                    index
-                    selectConservation
-                    key=conservationPartner.name
-                  />
-                )
-                ->React.array
-              | None => <>
-                  <HackyComponentThatReloadsOnTimeout
-                  // If the loyalty token balance or the amountApproved are still not loaded after 1 second, attempt to reload them.
-                    reloadFunction=reloadCurrentIteration timeoutTime=1000
-                  />
-                  <Rimble.Loader />
-                  <p> {"loading vote data"->restr} </p>
-                </>
-              }
-            | SelectedOrganisationToVote(conservationVotedArrayIndex, submitVoteFunction) =>
-              let selectedConservationPartner =
-                conservationPartners->Array.getUnsafe(conservationVotedArrayIndex)
-              <>
-                <Rimble.Box width=[1., 0.25]>
-                  <a href=selectedConservationPartner.link target="_blank">
-                    <img
-                      className={
-                        open Css
-                        style(list{
-                          display(#block),
-                          width(#percent(70.)),
-                          maxWidth(#px(800)),
-                          margin(auto),
-                        })
-                      }
-                      src=selectedConservationPartner.image
-                    />
-                  </a>
-                </Rimble.Box>
-                <Rimble.Box width=[1., 0.75]>
-                  {switch (amountApproved, redeemedLoyaltyTokenBalanceBn) {
-                  | (Some(amountApproved), Some(redeemedLoyaltyTokenBalanceBn)) =>
-                    let hasApprovedFullBalance = \"|>|"(
-                      amountApproved,
-                      redeemedLoyaltyTokenBalanceBn,
-                    )
-                    hasApprovedFullBalance
-                      ? switch redeemedLoyaltyTokenBalanceOpt {
-                        | Some(redeemedLoyaltyTokenBalance) =>
-                          let maxVote = Js.Math.sqrt(redeemedLoyaltyTokenBalance)
-                          <QVSelect submitVoteFunction maxVote />
-                        | None => <> <Rimble.Loader /> <p> {"Loading your balance"->restr} </p> </>
-                        }
-                      : <ApproveLoyaltyTokens reloadFunction=resetAmountApproved />
-                  | _ => <>
-                      <HackyComponentThatReloadsOnTimeout
-                      // If the loyalty token balance or the amountApproved are still not loaded after 1 second, attempt to reload them.
-                        reloadFunction={() => {
-                          resetLoyaltyTokenBalance()
-                          resetAmountApproved()
-                        }}
-                        timeoutTime=1000
-                      />
-                      <Rimble.Loader />
-                    </>
-                  }}
-                </Rimble.Box>
-              </>
-            | ProcessTransaction => txStateDisplay
-            | ViewResults =>
-              switch optCurrentIteration {
-              | Some(currentIteration) => <VoteResults currentIteration />
-              // NOTE: it is logically impossible that this is null here since it needs to be defined to go through the previous steps.
-              | None => <p> {"loading vote data"->restr} </p>
-              }
-            }}
-          </Rimble.Flex>
-        </Rimble.Box>
-      </Rimble.Flex>
-    </Rimble.Box>
-  </Rimble.Box>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3.res
deleted file mode 100644
index 065de0c..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3.res
+++ /dev/null
@@ -1,137 +0,0 @@
-type provider
-
-type t
-
-type abi
-
-type ethAddress = string
-type ethersBigNumber = {toString: (. unit) => string}
-
-type rawProvider
-
-type rec web3Library = {
-  getBalance: (. ethAddress) => Promise.promise<option<ethersBigNumber>>,
-  getSigner: (. ethAddress) => web3Library,
-  provider: rawProvider,
-}
-
-type rpcDefinition = {
-  method: string,
-  params: array<string>,
-  from: ethAddress,
-}
-
-type error
-type result
-type rpcResult = {result: result}
-
-@send
-external sendAsync: (
-  rawProvider,
-  rpcDefinition,
-  (. Js.Nullable.t<error>, rpcResult) => unit,
-) => unit = "sendAsync"
-
-@new @module("web3") external new_: rawProvider => t = "default"
-
-@send @scope(("eth", "personal"))
-external personalSign: (t, string, ethAddress) => Js.Promise.t<string> = "sign"
-
-module Contract = {
-  type sendParams = {from: ethAddress}
-  type txSendResult
-  type contractMethod = {
-    encodeABI: unit => string,
-    send: sendParams => Js.Promise.t<txSendResult>,
-  }
-
-  type contract
-
-  type dai
-
-  // [@bs.send] [@bs.new] [@bs.scope "eth"]
-  // external getContract: (t, abi, ethAddress) => contract = "Contract";
-
-  // Temporary code until I work out how to make the above binding work...
-  let getContract: (. t, abi, ethAddress) => contract = %raw(`
-      (web3, abi, contractAddress) => new web3.eth.Contract(abi, contractAddress)
-    `)
-
-  module MaticSteward = {
-    type steward
-
-    @send @scope("methods")
-    external depositWithPermit: (
-      steward,
-      BN.t,
-      BN.t,
-      bool,
-      int,
-      string,
-      string,
-      ethAddress,
-      BN.t,
-    ) => contractMethod = "depositWithPermit"
-
-    @send @scope("methods")
-    external buyWithPermit: (
-      steward,
-      //   nonce,
-      BN.t,
-      //   expiry,
-      BN.t,
-      //   allowed,
-      bool,
-      //   v,
-      int,
-      //   r,
-      string,
-      //   s,
-      string,
-      //   tokenId,
-      string,
-      //   _newPrice,
-      string,
-      //   previousPrice,
-      string,
-      //   serviceProviderPercentage,
-      string,
-      //   depositAmount,
-      string,
-    ) => contractMethod = "buyWithPermit"
-
-    @send @scope("methods")
-    external buyAuctionWithPermit: (
-      steward,
-      //   nonce,
-      BN.t,
-      //   expiry,
-      BN.t,
-      //   allowed,
-      bool,
-      //   v,
-      int,
-      //   r,
-      string,
-      //   s,
-      string,
-      //   tokenId,
-      string,
-      //   _newPrice,
-      string,
-      //   serviceProviderPercentage,
-      string,
-      //   depositAmount,
-      string,
-    ) => contractMethod = "buyAuctionWithPermit"
-
-    @send @scope("methods")
-    external withdrawDeposit: (steward, ethAddress) => contractMethod = "withdrawDeposit"
-
-    @module("./abis/abis.json")
-    external stewardMaticAbi: abi = "stewardMatic"
-
-    let getStewardContract = (web3, address): steward =>
-      getContract(. web3, stewardMaticAbi, address)->Obj.magic
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3Connect.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3Connect.res
deleted file mode 100644
index 2e0364d..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3Connect.res
+++ /dev/null
@@ -1,72 +0,0 @@
-open Globals
-
-let infoModalStyle = {
-  open Css
-  style(list{padding(rem(3.)), borderRadius(px(5)), width(px(640)), maxWidth(#vw(100.))})
-}
-
-@react.component
-let make = (~clickAction=() => ()) => {
-  let connectWeb3 = RootProvider.useConnectWeb3()
-  let deactivateWeb3 = RootProvider.useDeactivateWeb3()
-  let networkIdOpt = RootProvider.useNetworkId()
-
-  let connectedNetworkName = networkId =>
-    switch networkId {
-    | 1 => j`MAINNET\\xa0`->React.string
-    | 3 => j`ROPSTEN\\xa0`->React.string
-    | 4 => j`RINKEBY\\xa0`->React.string
-    | 5 => j`GOERLI\\xa0`->React.string
-    | 42 => j`KOVAN\\xa0`->React.string
-    | _ => j`Unknown\\xa0`->React.string
-    }
-
-  let web3Button = switch networkIdOpt {
-  | Some(networkId) =>
-    <Rimble.Button
-      mainColor="#72C7D7"
-      onClick={_e => {
-        clickAction()
-        deactivateWeb3()
-      }}>
-      {connectedNetworkName(networkId)} <Rimble.Icon name="ExitToApp" size="16px" />
-    </Rimble.Button>
-  | None =>
-    <Rimble.Button
-      mainColor="#72C7D7"
-      onClick={_e => {
-        clickAction()
-        ReasonReactRouter.push("#")
-        connectWeb3(RootProviderTypes.NoAction)
-      }}>
-      {"Connect"->React.string}
-    </Rimble.Button>
-  }
-
-  <div className=Styles.loginButton> web3Button </div>
-}
-
-module Modal = {
-  @react.component
-  let make = () => {
-    let showLogin = RootProvider.useShowLogin()
-    let closeLogin = RootProvider.useCloseWeb3Login()
-
-    <Rimble.Modal isOpen=showLogin>
-      <Rimble.Card className=infoModalStyle>
-        <Rimble.Button.Text
-          icononly=true
-          icon="Close"
-          color="moon-gray"
-          position="absolute"
-          top=0
-          right=0
-          m=3
-          onClick={_ => closeLogin()}
-        />
-        <Rimble.Heading className=Styles.centerText> {"Login"->restr} </Rimble.Heading>
-        <Login />
-      </Rimble.Card>
-    </Rimble.Modal>
-  }
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3Connectors.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3Connectors.res
deleted file mode 100644
index fae938d..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3Connectors.res
+++ /dev/null
@@ -1,13 +0,0 @@
-type injectedType = {isAuthorized: unit => Promise.promise<bool>}
-
-@module("./connectors") external injected: injectedType = "injected"
-@module("./connectors")
-external sideChainNetwork: int => injectedType = "sideChainNetwork"
-module Custom = {
-  @module("./web3CustomRoot") @react.component
-  external make: (
-    ~id: string,
-    ~getLibrary: Web3.rawProvider => Web3.web3Library,
-    ~children: React.element,
-  ) => React.element = "default"
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3Utils.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3Utils.res
deleted file mode 100644
index 75cb4af..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/Web3Utils.res
+++ /dev/null
@@ -1,22 +0,0 @@
-open Globals
-
-@module("web3-utils")
-external fromWei: (string, string) => string = "fromWei"
-
-@module("web3-utils")
-external fromWeiBN: (BN.t, string) => string = "fromWei"
-
-@module("web3-utils") external isBN: string => bool = "isBN"
-
-@module("web3-utils") external toWei: (string, string) => string = "toWei"
-
-let fromWeiToEth = value => fromWei(value, "ether")
-let fromWeiBNToEth = value => fromWeiBN(value, "ether")
-let fromWeiBNToEthPrecision = (value, ~digits) =>
-  value
-  ->fromWeiBNToEth
-  ->Float.fromString
-  ->Belt.Option.mapWithDefault(0., a => a)
-  ->toFixedWithPrecisionNoTrailingZeros(~digits)
-
-let toWeiFromEth = value => toWei(value, "ether")
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/WildcardsLoader.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/WildcardsLoader.res
deleted file mode 100644
index 9844354..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/WildcardsLoader.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@module("./WildcardsLoader") @react.component
-external make: unit => React.element = "default"
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/WildcardsLogo.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/WildcardsLogo.res
deleted file mode 100644
index 5f0c844..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/WildcardsLogo.res
+++ /dev/null
@@ -1,35 +0,0 @@
-@react.component
-let make = (~maxWidth: string) => {
-  let style = ReactDOMRe.Style.make(~width="100%", ~maxWidth, ())
-  <svg style version="1.1" id="Layer_1" x="0" y="0" viewBox="0 0 566.9 158.7">
-    <path
-      d="M214.5 64.4C227.2 43.2 239.9 22 253 0c5.6 8.6 10.8 16.4 16.1 24.2 1.8-2.2 3.2-4 5.1-6.5 10 16.6 19.7 32.8 29.5 49-2.4 0-4.7 0-7.1-.1-5.8-.2-11.3 0-16.3 3.2-2.8 1.8-5.5 3.7-8.5 5.5-3.2-2.1-6.1-4.1-9.2-6.3-5.9-4-12.5-6.7-19.5-7.1-8.3-.5-16.8-1.1-24.9 2.1-1.2.7-2.5.4-3.7.4zm26.5-35c2.7-1.3 5.5-2.7 8.2-4 2.2 2.5 4.2 4.7 6.5 7.3 1.2-2.8 2.2-5.1 3.2-7.3 2.6.8 4.8 1.7 7.1 2.4-4-6.9-8-13.3-13-19.8-4.6 7.6-8.6 14.3-12.7 20.9-.2.4-.5.7-.7 1.1.5-.3.9-.4 1.4-.6zm30.8 6.1c.4 2.1.6 3.9 1.1 7.1 1.5-2.6 2.5-4 3.2-5.3 2.9 1.4 4.8 2.4 6.8 3.3.4-.2.6-.6.9-.8-3.2-5.2-6.3-10.4-9.9-16.2-2.5 3.9-4.7 7.2-7.1 10.9 1.9.4 3.2.7 5 1z"
-      fill="#333"
-    />
-    <path
-      d="M214.5 64.4c1.2 0 2.5.2 3.5-.2 8.1-3.2 16.6-2.6 24.9-2.1 7.1.4 13.6 3.2 19.5 7.1 3.1 2 6.1 4.1 9.2 6.3 2.9-1.9 5.6-3.8 8.5-5.5 5.1-3.2 10.7-3.4 16.3-3.2 2.4.1 4.7.1 7.1.1 2.1 3.1 4.1 6.1 6.7 9.8C293 87 276.1 97 259 107.4c-17.3-10.3-34.3-20.4-52-30.8 2.6-4.3 5.1-8.1 7.5-12.2z"
-      fill="#6cad3f"
-    />
-    <path
-      d="M258.2 116.5c16.3-9.7 32.4-19.1 49-28.9-1.4 4.7-40.8 61.4-49.4 71.2-16.6-23.4-32.9-46.7-49.4-70 .2-.4.5-.6.7-.9 8.5 4 16.2 9.4 24.3 14.2 8.4 4.5 16.4 9.3 24.8 14.4z"
-      fill="#6dae42"
-    />
-    <path
-      d="M66.2 57.4h8.5c-5.3 16.2-10.6 32-15.8 47.9h-9.6C45.5 94.2 41.7 83 37.6 70.6c-5.1 11.9-8 23.6-12.3 34.8h-9.5C10.6 89.7 5.4 73.8 0 57.5h9.3c3.8 11.6 7.6 23.3 11.9 36 4.3-12.7 8.3-24.3 12.3-36.1h8.3C45.7 69 49.7 80.8 54 93.8c4.3-13 8.2-24.6 12.2-36.4zM461.6 89.9c3.1 4.5 6 8.9 8.9 13-.2 3.1-2.4 2.8-4.3 2.8-2.4 0-4.6.4-6.1-2.2-2.5-4-5.3-7.8-7.9-11.4h-11.8v13.3h-10V57.5c1.5-.1 3.1-.5 4.6-.5 5.5 0 10.9-.1 16.5 0 1.8 0 3.5.1 5.3.5 7.3 1.2 13.2 6 14.2 12.3 1.8 10-1.5 15.8-7.5 19.4-.7 0-1.2.4-1.9.7zm-21.3-6.3h7.3c2 0 3.9 0 5.9-.4 5.1-.7 8.2-4.4 8-9.2-.1-4.5-3.2-8-8.1-8.4-4.2-.4-8.5-.1-13-.1-.1 5.9-.1 11.6-.1 18.1zM477.9 104.6v-46l1.2-1.2c8-.1 16-.5 24-.1 13.3.6 22.8 10.9 22.8 24.2s-10 24-23.4 24.3c-7.8.2-15.6-.1-23.4-.1-.5-.5-.8-.9-1.2-1.1zm9.8-7.2c4.8 0 9.2.2 13.4 0 8.8-.6 14.7-7.1 14.8-15.9 0-9-5.6-15.2-14.6-15.9-4.5-.4-8.8 0-13.5 0-.1 10.5-.1 20.8-.1 31.8zM141.1 105.5c-.1-1.4-.4-2.1-.4-2.8V57.6c1.4-.2 2.7-.5 4-.5 6.6 0 13.3-.1 19.9.2 16.1.8 26.8 13.6 22.6 31-1.9 7.8-7.3 12.9-14.8 15.3-2.9.9-6.1 1.7-9.2 1.8-7.1.3-14.4.1-22.1.1zm9-8c5.3 0 10.1.4 14.9-.1 7.8-.7 13.6-6.8 14.1-14.8.4-8.1-3.2-15.2-12-17-5.4-1.1-11-.9-16.9-1.3-.1 11.5-.1 22-.1 33.2zM383.4 105.4h-9.6c.7-2.1 1.2-3.8 1.9-5.3 5.6-12.6 11.4-25.3 17-38 1.4-3.1 3.1-5.1 6.7-5.2 3.9-.1 5.9 1.7 7.4 5.1 5.5 12.5 11.3 24.9 16.8 37.4 2.4 5.3 1.8 6.3-3.9 6.4h-3.6c-1.6-3.5-3.1-7-4.7-10.6h-23.5c-1.4 3.2-2.8 6.5-4.5 10.2zM408 86.5c-2.8-6.5-5.4-12.5-8.2-19.1-2.8 6.7-5.4 12.7-8.1 19.1H408zM527.2 100.8c1.4-3 2.5-5.2 3.4-7.1 4.7 1.5 8.8 3.3 13.2 4.1 2.9.6 6.2 0 9.3-.5 2.2-.4 4.2-2.1 3.8-4.5a6.3 6.3 0 00-3.1-4.5c-2.4-1.3-5.2-1.8-7.8-2.6-3.3-1.1-6.8-1.8-10-3.2-9.3-4.4-10.2-16.5-1.9-22.5 7.8-5.5 21.9-5.1 30.6 1.2-.9 2.2-1.8 4.6-2.7 7-2.8-.9-5.3-2-7.9-2.6-2.5-.6-4.9-.9-7.5-.9-4.6.1-7.8 2.4-8.2 5.3-.4 2.7 2 5 6.6 6.4 4.1 1.2 8.3 2.1 12.3 3.5 6.3 2.1 9.8 6.5 9.6 11.9-.1 6-3.1 10.7-8.6 12.9-10.7 3.9-20.9 2.3-31.1-3.9zM366.4 92.1c1.9 2 3.6 3.9 5.3 5.7-4.8 7.7-16 11-26.7 8-10.5-2.8-17.9-11.7-18.5-22.4-.7-11.3 5.4-20.9 15.5-25.3 9.2-3.9 24.6-2.1 30.1 6.8-1.9 1.8-3.8 3.5-6 5.7-4.2-4-9.1-6.3-14.8-5.7-4.2.5-8 2-10.8 5.2-5.4 6-5.2 16.8.4 22.7 6.1 6.6 15.4 6.6 25.5-.7zM135.3 97.4v7.3c-4 1.2-25.9 1.4-34 .5V57.5c1.3-.1 2.6-.4 4-.5 1.3-.1 2.7 0 4.8 0v40.5c8.4-.1 16.5-.1 25.2-.1zM82.3 57.2h8.3v47.9h-8.3V57.2z"
-      fill="#333"
-    />
-    <path
-      d="M479.1 57.2l-1.2 1.2c.4-.3.9-.7 1.2-1.2zM477.9 104.6c.4.4.7.7 1.2.9-.5-.3-.8-.7-1.2-.9z"
-      fill="#252525"
-    />
-    <path
-      d="M240.4 28.9c4-6.6 8-13.3 12.7-20.9 5.1 6.5 9.1 12.9 12.9 19.7-2.2-.7-4.5-1.5-7.1-2.4-1.1 2.4-2 4.6-3.2 7.3-2.4-2.6-4.3-4.8-6.5-7.3-2.8 1.3-5.5 2.7-8.2 4-.3 0-.4-.3-.6-.4z"
-      fill="#f1f1f1"
-    />
-    <path
-      d="M271.8 35.5c-1.8-.4-3.1-.6-5.1-.9 2.4-3.7 4.6-7.1 7.1-10.9 3.5 5.8 6.7 11 9.9 16.2-.4.2-.6.6-.9.8-2-.9-4-1.9-6.8-3.3-.7 1.3-1.6 2.7-3.2 5.3-.4-3.3-.8-5.1-1-7.2z"
-      fill="#f1f1f1"
-    />
-    <path d="M241 29.4c-.4.1-.8.4-1.2.5.2-.4.5-.7.7-1.1.1.2.2.5.5.6z" fill="#f4f4f4" />
-  </svg>
-}
diff --git a/jscomp/syntax/tests/idempotency/wildcards-world-ui/WildcardsProvider.res b/jscomp/syntax/tests/idempotency/wildcards-world-ui/WildcardsProvider.res
deleted file mode 100644
index 3197521..0000000
--- a/jscomp/syntax/tests/idempotency/wildcards-world-ui/WildcardsProvider.res
+++ /dev/null
@@ -1,23 +0,0 @@
-module GraphQl = {
-  @react.component
-  let make = (~getGraphEndpoints: (int, unit) => Client.qlEndpoints, ~children) => {
-    let networkId = RootProvider.useNetworkId()->Belt.Option.mapWithDefault(1, a => a)
-    let client = React.useMemo2(
-      () => Client.instance(~getGraphEndpoints=getGraphEndpoints(networkId)),
-      (getGraphEndpoints, networkId),
-    )
-
-    <ApolloClient.React.ApolloProvider client> children </ApolloClient.React.ApolloProvider>
-  }
-}
-
-@react.component
-let make = (
-  ~getGraphEndpoints: (int, unit) => Client.qlEndpoints,
-  ~children,
-  ~stewardContractAddress: option<Web3.ethAddress>=?,
-  ~stewardAbi: option<Web3.abi>=?,
-) =>
-  <RootProvider stewardContractAddress stewardAbi>
-    <GraphQl getGraphEndpoints> children </GraphQl>
-  </RootProvider>
diff --git a/jscomp/syntax/tests/oprint/expected/oprint.resi.txt b/jscomp/syntax/tests/oprint/expected/oprint.resi.txt
deleted file mode 100644
index d2cce10..0000000
--- a/jscomp/syntax/tests/oprint/expected/oprint.resi.txt
+++ /dev/null
@@ -1,242 +0,0 @@
-module Set: {
-  module type OrderedType = {
-    type rec t
-    let compare: (t, t) => int
-  }
-  module type S = {
-    type rec elt
-    type rec t
-    let empty: t
-    let compare: (t, t) => int
-  }
-  module Make: (Ord: OrderedType) => {
-    type rec elt = Ord.t
-    type rec t
-    let empty: t
-    let compare: (t, t) => int
-  }
-}
-module Hashtbl: {
-  type t<'a, 'b>
-  let create: int => t<'a, 'b>
-}
-let name: string
-let x: int
-let pi: float
-let numbersArray: array<int>
-let numbersTuple: (int, int, int, int, int)
-let numbersList: list<int>
-let add: (int, int) => int
-type s = string
-type user = {name: string, age: int}
-type user2 = {
-  naaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame: string,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaage: int,
-  emaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaail: string,
-}
-module Diff: {
-  let string: (string, string) => bool
-}
-module Diff2 = Diff
-type rec tree<'value> = Nil | Node(tree<'value>, 'value, tree<'value>)
-type intTree = tree<int>
-type rec tree2<'value> =
-  | Niiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiil2
-  | Noooooooooooooooooooooooooooooooooooode2(
-      tree2<'value>,
-      'value,
-      tree2<'value>,
-    )
-type rec tree3<'value> =
-  | Nil3
-  | Node3({left: tree3<'value>, value: 'value, right: tree3<'value>})
-type rec tree4<'value> =
-  | Nil4
-  | Node4({
-      leeeeeeeeeeeeeeeeeeeeeeeeeeeeft: tree3<'value>,
-      vaaaaaaaaaaaaaaaaaaaaalue: 'value,
-      riiiiiiiiiiiiiiiiiiiiiiight: tree3<'value>,
-    })
-type color = ..
-type color += Blue
-type color += Red | Green
-type color +=
-  | Blaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaack
-  | Oraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaange
-  | Reeeeeeeeeeeeeeeeeeeed
-module Expr: {
-  type attr = ..
-  type attr += private Str(string)
-  type attr += Int(int) | Float(float)
-}
-module User: {
-  type t = {name: string, age: int}
-}
-type userT = User.t = {name: string, age: int}
-type veeeeeeeeeeeeeeeeeeeeeeeeryLongTypeAlias = string
-type rgb = [#Blue | #Green | #Red]
-type longRgb = [
-  | #Blueeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-  | #Greeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeen
-  | #Reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed
-  | #Rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrgb(float, float, float)
-  | #Rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrgb2(
-      veeeeeeeeeeeeeeeeeeeeeeeeryLongTypeAlias,
-      veeeeeeeeeeeeeeeeeeeeeeeeryLongTypeAlias,
-      veeeeeeeeeeeeeeeeeeeeeeeeryLongTypeAlias,
-    )
-]
-let red: [> #Red]
-let red2: rgb
-let int: [> #Int(int)]
-let int2: [> #Int(string, bool)]
-let int3: [> #Int(float, float, float)]
-type customRgb = [#Rbg(float, float, float)]
-let color: [> #Rbg(float, float, float)]
-let tupleAsSingleArg: [> #tuple(float, float)]
-let oneArg: [> #One(string)]
-type redColor = [#Red]
-type greenColor = [#Green]
-type blueColor = [#Blue]
-type rgbColor = [#Blue | #Green | #Red]
-module M: {
-  type data = [#IntData(int) | #StrData(string)]
-  let stringOfData: data => string
-}
-let y: string
-type rgbw = [#Blue | #Green | #Red | #White]
-let id: ([> #Blue | #Green | #Red] as 'a) => 'a
-let id: ([> rgb] as 'a) => 'a
-type point = [#Point(float, float)]
-type shape = [#Circle(point, float) | #Rectangle(point, point)]
-let pi: float
-let computeArea: shape => float
-let shoelaceFormula: (
-  [< #Point(float, float)],
-  [< #Point(float, float)],
-  [< #Point(float, float)],
-) => float
-type shapePlus = [
-  | #Circle(point, float)
-  | #Rectangle(point, point)
-  | #Triangle(point, point, point)
-]
-let computeAreaPlus: shapePlus => float
-let computeAreaExotic: [<
-  | #Circle(point, float)
-  | #"R-Triangle+"('a, 'b, 'c)
-  | #Rectangle(point, point)
-] => unit
-let top: [> #Point(float, float)]
-let left: [> #Point(float, float)]
-let right: [> #Point(float, float)]
-let circ: [> #Circle([> #Point(float, float)], float)]
-let tri: [>
-  | #Triangle(
-      [> #Point(float, float)],
-      [> #Point(float, float)],
-      [> #Point(float, float)],
-    )
-]
-let x: float
-let y: float
-let basic_color_to_int: [<
-  | #Black
-  | #Blue
-  | #Cyan
-  | #Green
-  | #Magenta
-  | #Red
-  | #White
-  | #Yellow
-] => int
-let color_to_int: [<
-  | #Basic(
-      [< #Black | #Blue | #Cyan | #Green | #Magenta | #Red | #White | #Yellow],
-      [< #Bold | #Regular],
-    )
-  | #Gray(int)
-  | #RGB(int, int, int)
-] => int
-module type Conjunctive = {
-  type u1 = [#A | #B]
-  type u2 = [#A | #B | #C]
-  let f: [< #T([< u2]) & ([< u2]) & ([< u1])] => unit
-  let g: [< #S & ([< u2]) & ([< u2]) & ([< u1])] => unit
-}
-type t20 = [#"type"]
-type t21 = [#"va r ia nt"]
-type t22 = [#"Variant ⛰"]
-type \"let" = int
-type \"type" = [#"Point🗿"(\"let", float)]
-type t23 = [#1 | #"10space" | #123]
-type exoticUser = {\"let": string, \"type": float}
-type arity1a = unit => int
-type arity1b = int => int
-type arity2 = (int, int) => int
-type obj1<'a> = option<{"a": int}>
-type obj2 = {"a": int}
-type obj3 = {"a": int}
-type obj4 = {"a": int}
-type obj5<'a> = 'a
-  constraint 'a = {..}
-type obj6 = {"a": int}
-type obj7 = {"a": int}
-type obj8<'a> = 'a
-  constraint 'a = {.."a": int}
-type objUser = {"age": int, "name": string}
-type objUserWithLongFields = {
-  "age": int,
-  "anoooooooooooooooootherLongFiiiiiieeeeeeeldName": int,
-  "looooooongFiiiiiiiieeeeeeeldName": string,
-  "name": string,
-  "x": int,
-}
-type objectCoordinate = {"x": float, "y": float}
-type threeDimensionalCoordinate = {"x": float, "y": float, "z": float}
-type differentSpreadedCoordinate = {
-  "alpha": int,
-  "x": float,
-  "y": float,
-  "z": float,
-}
-type multiSpreadedCoordinate = {
-  "a": int,
-  "alpha": int,
-  "b": int,
-  "x": float,
-  "y": float,
-  "z": float,
-}
-type dotdotObjectCoordinate<'a> = 'a
-  constraint 'a = {..
-    "suuuuuuuuuuuperLooooooooooooongFieldNaaaaaaaaaaaame": float,
-    "suuuuuuuuuuuperLooooooooooooongFieldNaaaaaaaaaaaame2222222222222": float,
-  }
-type permissions = [#644 | #777]
-type numericPolyVarWithPayload = [#1(string) | #2(int, string)]
-let numericPolyVarMatch: [> #1(string) | #2(int, string)]
-let sort: (module(Set.S with type elt = 'a), list<'a>) => list<'a>
-let make_set: (('a, 'a) => int) => module(Set.S with type elt = 'a)
-type picture = string
-module type DEVICE = {
-  let draw: picture => unit
-}
-let devices: Hashtbl.t<string, module(DEVICE)>
-module rec A: {
-  type t = Leaf(string) | Node(ASet.t)
-  let compare: (t, t) => int
-}
-and ASet: {
-  type rec elt = A.t
-  type rec t
-  let empty: t
-  let compare: (t, t) => int
-}
-type emptyObject = {.}
-let f: (~x: 'a=?, ~y: 'b) => option<'a>
-type call = CleanStart
-let f: (~a: int=?, unit) => int
-type opt = {x: int, y?: option<string>}
-let secondOrder: (unit => 'a) => 'a
-let thirdOrder: ((unit => unit) => 'a) => 'a
\ No newline at end of file
diff --git a/jscomp/syntax/tests/oprint/oprint.res b/jscomp/syntax/tests/oprint/oprint.res
deleted file mode 100644
index 3af354a..0000000
--- a/jscomp/syntax/tests/oprint/oprint.res
+++ /dev/null
@@ -1,313 +0,0 @@
-module Set = {
-  module type OrderedType = {
-    type rec t
-    let compare : (t, t) => int
-  }
-  module type S = {
-    type rec elt
-    type rec t
-    let empty : t
-    let compare : (t, t) => int
-  }
-  module Make = (Ord:OrderedType) : (S with type elt = Ord.t) => {
-    type rec elt = Ord.t
-    type rec t
-    let compare = assert(false)
-    let empty = assert(false)
-  }
-}
-
-module Hashtbl = {
-  type t<'a, 'b>
-  let create = (x:int) : t<_, _> => assert(false)
-}
-
-let name = "Steve"
-let x = 42
-let pi = 3.14
-
-let numbersArray = [1, 2, 3, 4, 5]
-let numbersTuple = (1, 2, 3, 4, 5)
-let numbersList = list{1, 2, 3, 4, 5}
-
-let add = (a:int, b:int) => 3
-
-type s = string
-
-type user = {
-  name: string,
-  age: int,
-}
-
-type user2 = {
-  naaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame: string,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaage: int,
-  emaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaail: string
-}
-
-module Diff = {
-  let string = (s1: string, s2: string) => true
-}
-
-module Diff2 = Diff
-
-type rec tree<'value> =
-  | Nil
-  | Node(tree<'value>, 'value, tree<'value>)
-
-type intTree = tree<int>
-
-type rec tree2<'value> =
-  | Niiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiil2
-  | Noooooooooooooooooooooooooooooooooooode2(tree2<'value>, 'value, tree2<'value>)
-
-type rec tree3<'value> =
-  | Nil3
-  | Node3({left: tree3<'value>, value: 'value, right: tree3<'value>})
-
-type rec tree4<'value> =
-  | Nil4
-  | Node4({leeeeeeeeeeeeeeeeeeeeeeeeeeeeft: tree3<'value>, vaaaaaaaaaaaaaaaaaaaaalue: 'value, riiiiiiiiiiiiiiiiiiiiiiight: tree3<'value>})
-
-type color = ..
-
-type color += Blue
-type color += | Red | Green
-
-type color += | Blaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaack | Oraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaange | Reeeeeeeeeeeeeeeeeeeed
-
-module Expr = {
-  type attr = ..
-
-  type attr += private Str(string)
-
-  type attr +=
-    | Int(int)
-    | Float(float)
-}
-
-module User = {
-  type t = {name: string, age: int}
-}
-
-type userT = User.t = {name: string, age: int}
-
-type veeeeeeeeeeeeeeeeeeeeeeeeryLongTypeAlias = string
-
-type rgb = [#Red | #Green | #Blue]
-type longRgb = [#Reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed | #Greeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeen | #Blueeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee | #Rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrgb(float, float, float) | #Rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrgb2(veeeeeeeeeeeeeeeeeeeeeeeeryLongTypeAlias, veeeeeeeeeeeeeeeeeeeeeeeeryLongTypeAlias, veeeeeeeeeeeeeeeeeeeeeeeeryLongTypeAlias)]
-let red = #Red
-let red2: rgb = #Red
-
-let int = #Int(123)
-let int2 = #Int("abc", true)
-let int3 = #Int(1.0, 2.0, 3.0)
-
-type customRgb = [#Rbg(float, float, float)]
-let color = #Rbg(1.0, 0.6, 0.2)
-let tupleAsSingleArg = #tuple((1.3, 4.2))
-let oneArg = #One("oneArgument")
-
-type redColor = [ #Red ]
-type greenColor = [ #Green ]
-type blueColor = [ #Blue ]
-type rgbColor = [ redColor | greenColor | blueColor ]
-
-module M = {
-  type data = [#IntData(int) | #StrData(string)]
-  let stringOfData = (x: data) =>
-    switch x {
-    | #IntData(i) => ""
-    | #StrData(s) => s
-    }
-}
-let y = M.stringOfData(#IntData(123))
-
-type rgbw = [#Red | #Green | #Blue | #White ]
-
-let id = (x: [> #Red | #Green | #Blue]) => x
-let id = (x: [> rgb]) => x
-
-type point = [ | #Point(float, float) ]
-type shape = [ | #Rectangle(point, point) | #Circle(point, float) ]
-
-let pi = 4.0
-let computeArea = (s: shape) =>
-  switch s {
-  | #Rectangle(#Point(x1, y1), #Point(x2, y2)) => 1.0
-  | #Circle(_, radius) => 1.0
-  }
-
-let shoelaceFormula = (#Point(x1:float, y1:float), #Point(x2:float, y2:float), #Point(x3:float, y3:float)) =>
-  1.0
-
-type shapePlus = [
-| #Rectangle(point, point)
-| #Circle(point, float)
-| #Triangle(point, point, point)
-]
-
-let computeAreaPlus = (sp: shapePlus) =>
-  switch sp {
-  | #Triangle(p1, p2, p3) => shoelaceFormula(p1, p2, p3)
-  | #...shape as s => computeArea(s)
-  }
-
-let computeAreaExotic = (sp) =>
-  switch sp {
-  | #"R-Triangle+"(_p1, _p2, _p3) => ()
-  | #...shape as s => ()
-  }
-
-let top = #Point(3.0, 5.0)
-let left = #Point(0.0, 0.0)
-let right = #Point(3.0, 0.0)
-
-let circ = #Circle(top, 3.0)
-let tri = #Triangle(top, left, right)
-
-let x = computeAreaPlus(circ)
-let y = computeAreaPlus(tri)
-
-let basic_color_to_int = color =>
-  switch color {
-  | #Black => 0
-  | #Red => 1
-  | #Green => 2
-  | #Yellow => 3
-  | #Blue => 4
-  | #Magenta => 5
-  | #Cyan => 6
-  | #White => 7
-  }
-
-let color_to_int = color =>
-  switch color {
-  | #Basic(basic_color, weight) =>
-    let base = switch weight {
-    | #Bold => 8
-    | #Regular => 0
-    }
-    basic_color_to_int(basic_color)
-  | #RGB(r:int, g:int, b:int) => 16
-  | #Gray(i:int) => 232
-  }
-
-module type Conjunctive = {
-  type u1 = [ | #A | #B]
-  type u2 = [ | #A | #B | #C]
-
-  let f: [< | #T([< u2]) & ([< u2]) & ([< u1])] => unit
-  let g: [< | #S&([< u2]) & ([< u2]) & ([< u1])] => unit
-};
-
-// exotic idents in poly-vars
-type t20 = [#"type"]
-type t21 = [#"va r ia nt"]
-type t22 = [#"Variant ⛰"]
-type \"let" = int
-type \"type" = [ #"Point🗿"(\"let", float) ]
-type t23 = [
-  | #"1"
-  | #"10space"
-  | #"123"
-]
-
-type exoticUser = {
-  \"let": string,
-  \"type": float
-}
-
-type arity1a = (. ()) => int
-type arity1b = (. int) => int
-type arity2 = (. int, int) => int
-
-type obj1<'a> = option<{"a": int}>
-type obj2 = {"a": int}
-type obj3 = {. "a": int}
-type obj4 = {"a": int}
-type obj5<'a> = {..} as 'a
-type obj6 = {"a": int}
-type obj7 = {. "a": int}
-type obj8<'a> = {.. "a": int} as 'a
-
-type objUser = {"name": string, "age": int}
-type objUserWithLongFields = {"name": string, "x": int, "age": int, "looooooongFiiiiiiiieeeeeeeldName": string, "anoooooooooooooooootherLongFiiiiiieeeeeeeldName": int}
-
-type objectCoordinate =  {"x": float, "y": float}
-type threeDimensionalCoordinate = {...objectCoordinate, "z": float}
-type differentSpreadedCoordinate = {"z": float, ...objectCoordinate, "alpha": int}
-
-type multiSpreadedCoordinate = {
-  ...threeDimensionalCoordinate,
-  "a": int,
-  ...differentSpreadedCoordinate,
-  "b": int
-}
-
-type dotdotObjectCoordinate<'a> =  {.. "suuuuuuuuuuuperLooooooooooooongFieldNaaaaaaaaaaaame": float, "suuuuuuuuuuuperLooooooooooooongFieldNaaaaaaaaaaaame2222222222222": float} as 'a
-
-type permissions = [
-   | #777
-   | #644
- ]
-
- type numericPolyVarWithPayload = [
-   | #1(string)
-   | #2(int, string)
- ]
-
- let numericPolyVarMatch = switch #644 {
-   | #777 => #1("payload")
-   | #644 => #2(42, "test")
- }
-
-let sort = (type s, module(Set: Set.S with type elt = s), l:list<s>) => l
-
-let make_set = (type s, cmp) => {
-  module S = Set.Make({
-    type t = s
-    let compare = cmp
-  })
-  module(S: Set.S with type elt = s)
-}
-
-type picture = string
-
-module type DEVICE = {
-  let draw: picture => unit
-}
-
-let devices: Hashtbl.t<string, module(DEVICE)> = Hashtbl.create(17)
-
-module rec A: {
-  type t =
-    | Leaf(string)
-    | Node(ASet.t)
-  let compare: (t, t) => int
-} = {
-  type t =
-    | Leaf(string)
-    | Node(ASet.t)
-  let compare = (t1, t2) =>
-    switch (t1, t2) {
-    | (Leaf(s1), Leaf(s2)) => 3
-    | (Leaf(_), Node(_)) => 1
-    | (Node(_), Leaf(_)) => -1
-    | (Node(n1), Node(n2)) => 12
-    }
-}
-and ASet: Set.S with type elt = A.t = Set.Make(A)
-
-type emptyObject = {.}
-
-let f = (~x=?, ~y as _) => x
-
-type call = CleanStart
-
-let f = (~a=1, ()) => 1
-
-type opt = {x:int, y?: option<string>}
-
-let secondOrder = f => f()
-let thirdOrder = f => f(() => ())
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/ambiguousArrow.res b/jscomp/syntax/tests/parsing/errors/expressions/ambiguousArrow.res
deleted file mode 100644
index ba01116..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/ambiguousArrow.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let a = b:int => "hi"
-
-let x = {
-  let a = 1
-  let b = 2
-  a + b : int => "test"
-}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/array.res b/jscomp/syntax/tests/parsing/errors/expressions/array.res
deleted file mode 100644
index aa9397a..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/array.res
+++ /dev/null
@@ -1,2 +0,0 @@
-// missing ] before )
-let xs = x.map(key => [key, predicates[key])
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/arrow.res b/jscomp/syntax/tests/parsing/errors/expressions/arrow.res
deleted file mode 100644
index b26f670..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/arrow.res
+++ /dev/null
@@ -1,5 +0,0 @@
-Object.keys(providers).reduce((elements, providerId] => {
-  let x = 1
-  let b = 2
-  x + b
-})
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/block.res b/jscomp/syntax/tests/parsing/errors/expressions/block.res
deleted file mode 100644
index 1beaf84..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/block.res
+++ /dev/null
@@ -1,32 +0,0 @@
-let findThreadByIdLinearScan = (~threads, ~id) => {
-  Js.Array2.findi(ThreadsModel.threads, (thread, i) => {
-    let thisId = switch (thread) {
-    | ServerData.OneToOne({otherPersonIDWhichIsAlsoThreadID}) =>
-      otherPersonIDWhichIsAlsoThreadID
-    | Group({id}) =>
-      id
-    | Unknown({id}) =>
-      // TODO: this is stupidly dangerous
-      unknown.id->Js.String.make->FBID.ofStringUnsafe
-    }
-
-    thisId === id
-  }
-}
-
-let x = {
-  loop(0, Nil->push(doc)
-} // closing ) above is missing
-
-switch stack {
-| Empty =>
-| Cons(doc, rest) => ()
-| Join(doc1, doc2) =>
-	buffer->Buffer.add_string(indentation)
-	loop(
-}
-
-let pipeline = switch scheduler {
-| Some =>
-| None => ()
-}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/consecutive.res b/jscomp/syntax/tests/parsing/errors/expressions/consecutive.res
deleted file mode 100644
index 7e2e939..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/consecutive.res
+++ /dev/null
@@ -1,14 +0,0 @@
-let f = (a,b) => a + 3b;
-
-let f = (g, h) => {
- a + 3b
-}
-
-let () = {
-  sideEffect1() sideEffect2()
-}
-
-let () = {
-  open Foo exception End
-  x()
-}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/emptyBlock.res b/jscomp/syntax/tests/parsing/errors/expressions/emptyBlock.res
deleted file mode 100644
index d01edaf..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/emptyBlock.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let x = {}
-
-let f = (a, b) => {}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/emptyeof.res b/jscomp/syntax/tests/parsing/errors/expressions/emptyeof.res
deleted file mode 100644
index 1e8f45d..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/emptyeof.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = "
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/ambiguousArrow.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/ambiguousArrow.res.txt
deleted file mode 100644
index b602418..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/ambiguousArrow.res.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/ambiguousArrow.res:1:9-21
-
-  1 │ let a = b:int => "hi"
-  2 │ 
-  3 │ let x = {
-
-  Did you mean to annotate the parameter type or the return type?
-  1) (b): int => "hi"
-  2) (b: int) => "hi"
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/ambiguousArrow.res:6:3-23
-
-  4 │   let a = 1
-  5 │   let b = 2
-  6 │   a + b : int => "test"
-  7 │ }
-  8 │ 
-
-  Did you mean to annotate the parameter type or the return type?
-  1) (pattern): int => "test"
-  2) (pattern: int) => "test"
-
-let a b = ({js|hi|js} : int)
-let x = ((let a = 1 in let b = 2 in fun pattern -> ({js|test|js} : int))
-  [@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/array.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/array.res.txt
deleted file mode 100644
index e73c7a9..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/array.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/array.res:2:44
-
-  1 │ // missing ] before )
-  2 │ let xs = x.map(key => [key, predicates[key])
-  3 │ 
-
-  Did you forget a `]` here?
-
-let xs = x.map (fun key -> [|key;(predicates.(key))|])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/arrow.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/arrow.res.txt
deleted file mode 100644
index bbd0f16..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/arrow.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/arrow.res:1:52
-
-  1 │ Object.keys(providers).reduce((elements, providerId] => {
-  2 │   let x = 1
-  3 │   let b = 2
-
-  Did you forget a `,` here?
-
-;;(Object.keys providers).reduce
-    (fun elements ->
-       fun providerId -> ((let x = 1 in let b = 2 in x + b)[@res.braces ]))
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/block.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/block.res.txt
deleted file mode 100644
index 96fa794..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/block.res.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/block.res:14:4-15:1
-
-  12 │ 
-  13 │     thisId === id
-  14 │   }
-  15 │ }
-  16 │ 
-  17 │ let x = {
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/block.res:18:25-19:1
-
-  16 │ 
-  17 │ let x = {
-  18 │   loop(0, Nil->push(doc)
-  19 │ } // closing ) above is missing
-  20 │ 
-  21 │ switch stack {
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/block.res:22:11-23:1
-
-  20 │ 
-  21 │ switch stack {
-  22 │ | Empty =>
-  23 │ | Cons(doc, rest) => ()
-  24 │ | Join(doc1, doc2) =>
-  25 │ 	buffer->Buffer.add_string(indentation)
-
-  Looks like there might be an expression missing here
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/block.res:26:7-27:1
-
-  24 │ | Join(doc1, doc2) =>
-  25 │ 	buffer->Buffer.add_string(indentation)
-  26 │ 	loop(
-  27 │ }
-  28 │ 
-  29 │ let pipeline = switch scheduler {
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/block.res:30:10-31:1
-
-  28 │ 
-  29 │ let pipeline = switch scheduler {
-  30 │ | Some =>
-  31 │ | None => ()
-  32 │ }
-  33 │ 
-
-  Looks like there might be an expression missing here
-
-let findThreadByIdLinearScan ~threads:((threads)[@res.namedArgLoc ]) 
-  ~id:((id)[@res.namedArgLoc ])  =
-  ((Js.Array2.findi ThreadsModel.threads
-      (fun thread ->
-         fun i ->
-           ((let thisId =
-               match thread with
-               | ServerData.OneToOne { otherPersonIDWhichIsAlsoThreadID } ->
-                   otherPersonIDWhichIsAlsoThreadID
-               | Group { id } -> id
-               | Unknown { id } ->
-                   (unknown.id |. Js.String.make) |. FBID.ofStringUnsafe in
-             thisId == id)
-           [@res.braces ])))
-  [@res.braces ])
-let x = ((loop 0 (Nil |. (push doc)))[@res.braces ])
-;;match stack with
-  | Empty -> [%rescript.exprhole ]
-  | Cons (doc, rest) -> ()
-  | Join (doc1, doc2) -> (buffer |. (Buffer.add_string indentation); loop ())
-let pipeline =
-  match scheduler with | Some -> [%rescript.exprhole ] | None -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/consecutive.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/consecutive.res.txt
deleted file mode 100644
index 054e9d9..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/consecutive.res.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/consecutive.res:1:23
-
-  1 │ let f = (a,b) => a + 3b;
-  2 │ 
-  3 │ let f = (g, h) => {
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/consecutive.res:4:7
-
-  2 │ 
-  3 │ let f = (g, h) => {
-  4 │  a + 3b
-  5 │ }
-  6 │ 
-
-  consecutive expressions on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/consecutive.res:8:16-27
-
-   6 │ 
-   7 │ let () = {
-   8 │   sideEffect1() sideEffect2()
-   9 │ }
-  10 │ 
-
-  consecutive expressions on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/consecutive.res:12:11-20
-
-  10 │ 
-  11 │ let () = {
-  12 │   open Foo exception End
-  13 │   x()
-  14 │ }
-
-  consecutive expressions on a line must be separated by ';' or a newline
-
-let f a b = a + 3
-;;b
-let f g h = ((a + 3; b)[@res.braces ])
-let () = ((sideEffect1 (); sideEffect2 ())[@res.braces ])
-let () = ((let open Foo in let exception End  in x ())[@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/emptyBlock.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/emptyBlock.res.txt
deleted file mode 100644
index 36cfe2e..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/emptyBlock.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = {  }
-let f a b = {  }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/emptyeof.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/emptyeof.res.txt
deleted file mode 100644
index 4d299be..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/emptyeof.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/emptyeof.res:1:9-2:0
-
-  1 │ let x = "
-  2 │ 
-
-  This string is missing a double quote at the end
-
-let x = {js|
-|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/id.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/id.res.txt
deleted file mode 100644
index c589698..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/id.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/id.res:1:5
-
-  1 │ n.R.
-
-  I'm not sure what to parse here when looking at "eof".
-
-;;n.R._
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/if.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/if.res.txt
deleted file mode 100644
index eee86b5..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/if.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/if.res:2:11-3:5
-
-  1 │ // missing brace below
-  2 │ if (match)
-  3 │   let a = 1
-  4 │   a + 1
-  5 │ }
-
-  Did you forget a `{` here?
-
-;;if match then let a = 1 in a + 1
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/ifLet.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/ifLet.res.txt
deleted file mode 100644
index c76f8aa..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/ifLet.res.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/ifLet.res:1:1-3:1
-
-  1 │ if let Some(x) = result {
-  2 │   Js.log("The sky is blue")
-  3 │ }
-  4 │ 
-  5 │ if let Error(x) = result {
-
-  If-let is currently highly experimental. Use a regular `switch` with pattern matching instead:
-
-switch result {
-| Some(x) => Js.log("The sky is blue")
-| _ => ()
-}
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/ifLet.res:7:8-11:1
-
-   5 │ if let Error(x) = result {
-   6 │   Js.log("The sky is red")
-   7 │ } else if let Ok(y) = result {
-   8 │   Js.log("The sky is blue")
-   9 │ } else {
-  10 │   ()
-  11 │ }
-  12 │ 
-
-  If-let is currently highly experimental. Use a regular `switch` with pattern matching instead:
-
-switch result {
-| Ok(y) => Js.log("The sky is blue")
-| _ => ()
-}
-
-;;((match result with | Some x -> Js.log {js|The sky is blue|js} | _ -> ())
-  [@res.iflet ][@warning "-4"])
-;;((match result with
-    | Error x -> Js.log {js|The sky is red|js}
-    | _ ->
-        (((match result with
-           | Ok y -> Js.log {js|The sky is blue|js}
-           | _ -> ()))
-        [@res.iflet ][@warning "-4"]))[@res.iflet ][@warning "-4"])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/implementation.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/implementation.res.txt
deleted file mode 100644
index ceb0c00..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/implementation.res.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/implementation.res:7:1
-
-  5 │   }
-  6 │ }
-  7 │ }
-  8 │ module LicenseList = {
-  9 │ 
-
-  I'm not sure what to parse here when looking at "}".
-
-module InstallerDownload =
-  struct
-    let make () = ((div ~children:[] ())[@res.braces ][@JSX ])[@@react.component
-                                                                ]
-  end
-module LicenseList = struct  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/jsx.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/jsx.res.txt
deleted file mode 100644
index 02c96a2..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/jsx.res.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/jsx.res:2:20
-
-  1 │ let x = <di-v />
-  2 │ let x = <Unclosed >;
-  3 │ let x = <Foo.Bar></Free.Will>;
-  4 │ let x = <Foo.Bar.Baz></Foo.Bar.Boo>
-
-  Did you forget a `</` here?
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/jsx.res:3:9-28
-
-  1 │ let x = <di-v />
-  2 │ let x = <Unclosed >;
-  3 │ let x = <Foo.Bar></Free.Will>;
-  4 │ let x = <Foo.Bar.Baz></Foo.Bar.Boo>
-  5 │ let x = <Foo.bar> </Foo.baz>
-
-  Missing </Foo.Bar>
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/jsx.res:4:9-34
-
-  2 │ let x = <Unclosed >;
-  3 │ let x = <Foo.Bar></Free.Will>;
-  4 │ let x = <Foo.Bar.Baz></Foo.Bar.Boo>
-  5 │ let x = <Foo.bar> </Foo.baz>
-  6 │ let x = <Foo.bar.baz />
-
-  Missing </Foo.Bar.Baz>
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/jsx.res:5:9-27
-
-  3 │ let x = <Foo.Bar></Free.Will>;
-  4 │ let x = <Foo.Bar.Baz></Foo.Bar.Boo>
-  5 │ let x = <Foo.bar> </Foo.baz>
-  6 │ let x = <Foo.bar.baz />
-  7 │ 
-
-  Missing </Foo.bar>
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/jsx.res:6:17
-
-  4 │ let x = <Foo.Bar.Baz></Foo.Bar.Boo>
-  5 │ let x = <Foo.bar> </Foo.baz>
-  6 │ let x = <Foo.bar.baz />
-  7 │ 
-
-  I'm not sure what to parse here when looking at ".".
-
-let x = ((di-v ~children:[] ())[@JSX ])
-let x = ((Unclosed.createElement ~children:[] ())[@JSX ])
-let x =
-  ((Foo.Bar.createElement ~children:[] ())[@JSX ]) > ([%rescript.exprhole ])
-let x =
-  ((Foo.Bar.Baz.createElement ~children:[] ())[@JSX ]) >
-    ([%rescript.exprhole ])
-let x =
-  ((Foo.bar.createElement ~children:[] ())[@JSX ]) > ([%rescript.exprhole ])
-let x =
-  ((Foo.bar.createElement ~baz:((baz)[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/letBinding.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/letBinding.res.txt
deleted file mode 100644
index 941de47..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/letBinding.res.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/letBinding.res:1:10-11
-
-  1 │ let foo = '2.
-  2 │ 
-  3 │ let foo = }true
-
-  This let-binding misses an expression
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/letBinding.res:3:10-11
-
-  1 │ let foo = '2.
-  2 │ 
-  3 │ let foo = }true
-  4 │ 
-  5 │ let foo = )2
-
-  This let-binding misses an expression
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/letBinding.res:5:10-11
-
-  3 │ let foo = }true
-  4 │ 
-  5 │ let foo = )2
-  6 │ 
-  7 │ let foo = }f()
-
-  This let-binding misses an expression
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/letBinding.res:7:10-11
-
-  5 │ let foo = )2
-  6 │ 
-  7 │ let foo = }f()
-  8 │ 
-  9 │ let foo = }}{2}
-
-  This let-binding misses an expression
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/letBinding.res:9:10-11
-
-   7 │ let foo = }f()
-   8 │ 
-   9 │ let foo = }}{2}
-  10 │ 
-  11 │ let foo = == {
-
-  This let-binding misses an expression
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/letBinding.res:11:10-12
-
-   9 │ let foo = }}{2}
-  10 │ 
-  11 │ let foo = == {
-  12 │   "foo"
-  13 │ }
-
-  This let-binding misses an expression
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/letBinding.res:15:12
-
-  13 │ }
-  14 │ 
-  15 │ let foo as 'x = ()
-  16 │ 
-
-  I'm expecting a lowercase name like `user or `age`
-
-let foo = 2.
-let foo = true
-let foo = 2
-let foo = f ()
-let foo = ((2)[@res.braces ])
-let foo = (({js|foo|js})[@res.braces ])
-let foo as x = ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/misc.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/misc.res.txt
deleted file mode 100644
index 0ae9fa5..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/misc.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/misc.res:1:9
-
-  1 │ let x = _ + 1
-  2 │ 
-
-  `_` isn't a valid name.
-
-let x = ([%rescript.exprhole ]) + 1
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/object.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/object.res.txt
deleted file mode 100644
index ee71fe5..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/object.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-let obj =
-  [%obj { \x37 = {js|octal escape|js}; \x7b = {js|another octal escape|js} }]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/record.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/record.res.txt
deleted file mode 100644
index 6939140..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/record.res.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/record.res:2:10-3:7
-
-  1 │ let newWrapper = {
-  2 │   updateF
-  3 │   value: f(xWrapper.currentValue),
-  4 │ }
-  5 │ 
-
-  Did you forget a `,` here?
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/record.res:8:10-18
-
-   6 │ 
-   7 │ let newWrapper = {
-   8 │   updateF updateF2
-   9 │   value: f(xWrapper.currentValue),
-  10 │ }
-
-  Did you forget a `:` here?
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/record.res:13:9-14:1
-
-  11 │ 
-  12 │ let record = {
-  13 │   field:
-  14 │ }
-  15 │ 
-  16 │ 
-
-  Missing expression
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/record.res:18:9-19:2
-
-  16 │ 
-  17 │ let record = {
-  18 │   field: 
-  19 │  }
-  20 │  2
-  21 │ }
-
-  Missing expression
-
-let newWrapper = { updateF; value = (f xWrapper.currentValue) }
-let newWrapper = { updateF; updateF2; value = (f xWrapper.currentValue) }
-let record = { field = ([%rescript.exprhole ]) }
-let record = { field = 2 }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/setField.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/setField.res.txt
deleted file mode 100644
index 12f3225..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/setField.res.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/setField.res:4:30-5:1
-
-  2 │   let a = 1
-  3 │ 	// notice missing expression after = 
-  4 │   m.left.compatibleTypeArgs =
-  5 │ } else {
-  6 │   sideEffect()
-  7 │ }
-
-  It seems that this record field mutation misses an expression
-
-;;if match
-  then let a = 1 in (m.left).compatibleTypeArgs <- ([%rescript.exprhole ])
-  else sideEffect ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/stringLiteral.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/stringLiteral.res.txt
deleted file mode 100644
index 2c67c99..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/stringLiteral.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-;;match x with | {js|\x37|js} -> () | {js|\x7b|js} -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/taggedTemplateLiterals.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/taggedTemplateLiterals.res.txt
deleted file mode 100644
index 3711a2c..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/taggedTemplateLiterals.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/taggedTemplateLiterals.res:1:1-5
-
-  1 │ foo()`null`
-  2 │ 
-
-  Tagged template literals are currently restricted to names like: json`null`.
-
-;;(({js|null|js})[@res.template ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/try.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/try.res.txt
deleted file mode 100644
index 1e024f9..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/try.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/try.res:2:37-38
-
-  1 ┆ let parsedPayload =
-  2 ┆   try (Js.Json.parseExn(response)) {
-  3 ┆   | _ => Js.Json.null
-  4 ┆   }
-
-  Did you forget a `catch` here?
-
-let parsedPayload = try Js.Json.parseExn response with | _ -> Js.Json.null
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/expected/unexpectedConstraint.res.txt b/jscomp/syntax/tests/parsing/errors/expressions/expected/unexpectedConstraint.res.txt
deleted file mode 100644
index b905d9c..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/expected/unexpectedConstraint.res.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/expressions/unexpectedConstraint.res:4:3-13
-
-  2 │   let a = 1
-  3 │   let b = 2
-  4 │   a + b : int
-  5 │ }
-  6 │ 
-
-  Expressions with type constraints need to be wrapped in parens:
-  (a + b: int)
-
-
-  Syntax error!
-  tests/parsing/errors/expressions/unexpectedConstraint.res:7:9-20
-
-  5 │ }
-  6 │ 
-  7 │ let x = "hi": string 
-  8 │ 
-
-  Expressions with type constraints need to be wrapped in parens:
-  ("hi": string)
-
-let x = ((let a = 1 in let b = 2 in (a + b : int))[@res.braces ])
-let x = ({js|hi|js} : string)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/id.res b/jscomp/syntax/tests/parsing/errors/expressions/id.res
deleted file mode 100644
index 7401499..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/id.res
+++ /dev/null
@@ -1 +0,0 @@
-n.R.
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/if.res b/jscomp/syntax/tests/parsing/errors/expressions/if.res
deleted file mode 100644
index 4569cb0..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/if.res
+++ /dev/null
@@ -1,5 +0,0 @@
-// missing brace below
-if (match)
-  let a = 1
-  a + 1
-}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/ifLet.res b/jscomp/syntax/tests/parsing/errors/expressions/ifLet.res
deleted file mode 100644
index 1e63a12..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/ifLet.res
+++ /dev/null
@@ -1,11 +0,0 @@
-if let Some(x) = result {
-  Js.log("The sky is blue")
-}
-
-if let Error(x) = result {
-  Js.log("The sky is red")
-} else if let Ok(y) = result {
-  Js.log("The sky is blue")
-} else {
-  ()
-}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/implementation.res b/jscomp/syntax/tests/parsing/errors/expressions/implementation.res
deleted file mode 100644
index 137ac87..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/implementation.res
+++ /dev/null
@@ -1,10 +0,0 @@
-module InstallerDownload = {
-  @react.component
-  let make = () => {
-    <div />
-  }
-}
-}
-module LicenseList = {
-
-}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/jsx.res b/jscomp/syntax/tests/parsing/errors/expressions/jsx.res
deleted file mode 100644
index b0fc1e8..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/jsx.res
+++ /dev/null
@@ -1,6 +0,0 @@
-let x = <di-v />
-let x = <Unclosed >;
-let x = <Foo.Bar></Free.Will>;
-let x = <Foo.Bar.Baz></Foo.Bar.Boo>
-let x = <Foo.bar> </Foo.baz>
-let x = <Foo.bar.baz />
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/letBinding.res b/jscomp/syntax/tests/parsing/errors/expressions/letBinding.res
deleted file mode 100644
index 8417237..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/letBinding.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let foo = '2.
-
-let foo = }true
-
-let foo = )2
-
-let foo = }f()
-
-let foo = }}{2}
-
-let foo = == {
-  "foo"
-}
-
-let foo as 'x = ()
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/misc.res b/jscomp/syntax/tests/parsing/errors/expressions/misc.res
deleted file mode 100644
index 69f94c6..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/misc.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = _ + 1
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/object.res b/jscomp/syntax/tests/parsing/errors/expressions/object.res
deleted file mode 100644
index 6253800..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/object.res
+++ /dev/null
@@ -1 +0,0 @@
-let obj = {"\055": "octal escape", "\123": "another octal escape"}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/record.res b/jscomp/syntax/tests/parsing/errors/expressions/record.res
deleted file mode 100644
index acc6f65..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/record.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let newWrapper = {
-  updateF
-  value: f(xWrapper.currentValue),
-}
-
-
-let newWrapper = {
-  updateF updateF2
-  value: f(xWrapper.currentValue),
-}
-
-let record = {
-  field:
-}
-
-
-let record = {
-  field: 
- }
- 2
-}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/setField.res b/jscomp/syntax/tests/parsing/errors/expressions/setField.res
deleted file mode 100644
index 90fa6be..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/setField.res
+++ /dev/null
@@ -1,7 +0,0 @@
-if (match) {
-  let a = 1
-	// notice missing expression after = 
-  m.left.compatibleTypeArgs =
-} else {
-  sideEffect()
-}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/stringLiteral.res b/jscomp/syntax/tests/parsing/errors/expressions/stringLiteral.res
deleted file mode 100644
index b9865d6..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/stringLiteral.res
+++ /dev/null
@@ -1,4 +0,0 @@
-switch x {
-| "\055" => ()
-| "\123" => ()
-}
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/taggedTemplateLiterals.res b/jscomp/syntax/tests/parsing/errors/expressions/taggedTemplateLiterals.res
deleted file mode 100644
index 7842ddb..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/taggedTemplateLiterals.res
+++ /dev/null
@@ -1 +0,0 @@
-foo()`null`
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/try.res b/jscomp/syntax/tests/parsing/errors/expressions/try.res
deleted file mode 100644
index e266f4a..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/try.res
+++ /dev/null
@@ -1,4 +0,0 @@
-  let parsedPayload =
-    try (Js.Json.parseExn(response)) {
-    | _ => Js.Json.null
-    }
diff --git a/jscomp/syntax/tests/parsing/errors/expressions/unexpectedConstraint.res b/jscomp/syntax/tests/parsing/errors/expressions/unexpectedConstraint.res
deleted file mode 100644
index 7cbd041..0000000
--- a/jscomp/syntax/tests/parsing/errors/expressions/unexpectedConstraint.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let x = {
-  let a = 1
-  let b = 2
-  a + b : int
-}
-
-let x = "hi": string 
diff --git a/jscomp/syntax/tests/parsing/errors/other/breadcrumbs170.res b/jscomp/syntax/tests/parsing/errors/other/breadcrumbs170.res
deleted file mode 100644
index 6adf9a3..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/breadcrumbs170.res
+++ /dev/null
@@ -1,10 +0,0 @@
-// it should report an error on the `}` on line 9
-let l = Some(list{1, 2, 3}) |> Obj.magic
-module M = {
-  switch l {
-  | None => list{}
-  | Some(l) => l["prop"]
-  }
-}
-}from now on all syntax is "valid", 
-it compiles and will be ignored in js/ removed on format
diff --git a/jscomp/syntax/tests/parsing/errors/other/expected/breadcrumbs170.res.txt b/jscomp/syntax/tests/parsing/errors/other/expected/breadcrumbs170.res.txt
deleted file mode 100644
index 25b2291..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/expected/breadcrumbs170.res.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/other/breadcrumbs170.res:9:1
-
-   7 │   }
-   8 │ }
-   9 │ }from now on all syntax is "valid", 
-  10 │ it compiles and will be ignored in js/ removed on format
-  11 │ 
-
-  I'm not sure what to parse here when looking at "}".
-
-let l = (Some [1; 2; 3]) |> Obj.magic
-module M = struct ;;match l with | None -> [] | Some l -> l#prop end
-;;from
-;;now
-;;on
-;;all
-;;syntax
-;;is
-;;{js|valid|js}
-;;it
-;;compiles
-;;will
-;;be
-;;ignored
-;;js / removed
-;;on
-;;format
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/other/expected/for.res.txt b/jscomp/syntax/tests/parsing/errors/other/expected/for.res.txt
deleted file mode 100644
index de41bea..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/expected/for.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/other/for.res:1:6-2:0
-
-  1 │ for x
-  2 │ 
-
-  Did you forget a `in` here?
-
-;;for x = [%rescript.exprhole ] to [%rescript.exprhole ] do
-    [%rescript.exprhole ]
-  done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/other/expected/hashIdent.res.txt b/jscomp/syntax/tests/parsing/errors/other/expected/hashIdent.res.txt
deleted file mode 100644
index 7d410d5..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/expected/hashIdent.res.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/other/hashIdent.res:1:10-12
-
-  1 │ let x = #10s
-  2 │ 
-  3 │ type t = [ #red | #10s ] 
-
-  A numeric polymorphic variant cannot be followed by a letter. Did you mean `#10`?
-
-
-  Syntax error!
-  tests/parsing/errors/other/hashIdent.res:3:20-22
-
-  1 │ let x = #10s
-  2 │ 
-  3 │ type t = [ #red | #10s ] 
-  4 │ 
-  5 │ switch x {
-
-  A numeric polymorphic variant cannot be followed by a letter. Did you mean `#10`?
-
-
-  Syntax error!
-  tests/parsing/errors/other/hashIdent.res:6:4-6
-
-  4 │ 
-  5 │ switch x {
-  6 │ | #10s => ()
-  7 │ }
-  8 │ 
-
-  A numeric polymorphic variant cannot be followed by a letter. Did you mean `#10`?
-
-let x = `10
-type nonrec t = [ `red  | `10 ]
-;;match x with | `10 -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/other/expected/labelledParameters.res.txt b/jscomp/syntax/tests/parsing/errors/other/expected/labelledParameters.res.txt
deleted file mode 100644
index 162d9ed..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/expected/labelledParameters.res.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/other/labelledParameters.res:1:13-14
-
-  1 │ let f = (x, y=2, z) => x + y + z
-  2 │ 
-  3 │ let g = (~?x, ~y=2, ~z) => x + y + z
-
-  A labeled parameter starts with a `~`. Did you mean: `~y`?
-
-
-  Syntax error!
-  tests/parsing/errors/other/labelledParameters.res:3:11
-
-  1 │ let f = (x, y=2, z) => x + y + z
-  2 │ 
-  3 │ let g = (~?x, ~y=2, ~z) => x + y + z
-  4 │ 
-  5 │ type f = (x: int, y: int) => int
-
-  I'm expecting a lowercase name like `user or `age`
-
-
-  Syntax error!
-  tests/parsing/errors/other/labelledParameters.res:5:11
-
-  3 │ let g = (~?x, ~y=2, ~z) => x + y + z
-  4 │ 
-  5 │ type f = (x: int, y: int) => int
-  6 │ 
-
-  A labeled parameter starts with a `~`. Did you mean: `~x`?
-
-let f x ?(y= 2)  z = (x + y) + z
-let g ~x:((x)[@res.namedArgLoc ])  ?y:(((y)[@res.namedArgLoc ])= 2) 
-  ~z:((z)[@res.namedArgLoc ])  = (x + y) + z
-type nonrec f = x:int -> y:int -> int
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/other/expected/oneElementTuple.res.txt b/jscomp/syntax/tests/parsing/errors/other/expected/oneElementTuple.res.txt
deleted file mode 100644
index 7125425..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/expected/oneElementTuple.res.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/other/oneElementTuple.res:1:19-23
-
-  1 │ let faultyTuple = (a, )
-  2 │ 
-  3 │ switch faultyTuple {
-
-  A tuple needs at least two elements
-
-
-  Syntax error!
-  tests/parsing/errors/other/oneElementTuple.res:4:3-7
-
-  2 │ 
-  3 │ switch faultyTuple {
-  4 │ | (a, ) => ()
-  5 │ | _ => ()
-  6 │ }
-
-  A tuple needs at least two elements
-
-
-  Syntax error!
-  tests/parsing/errors/other/oneElementTuple.res:8:20-29
-
-  6 │ }
-  7 │ 
-  8 │ type faultyTuple = (string, )
-  9 │ 
-
-  A tuple needs at least two elements
-
-let faultyTuple = (a)
-;;match faultyTuple with | (a) -> () | _ -> ()
-type nonrec faultyTuple = (string)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/other/expected/patternMatching.res.txt b/jscomp/syntax/tests/parsing/errors/other/expected/patternMatching.res.txt
deleted file mode 100644
index bcc0cd0..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/expected/patternMatching.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/other/patternMatching.res:1:14-2:1
-
-  1 │ switch expr {
-  2 │ }
-  3 │ 
-
-  Pattern matching needs at least one case
-
-;;match expr with
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/other/expected/regionMissingComma.res.txt b/jscomp/syntax/tests/parsing/errors/other/expected/regionMissingComma.res.txt
deleted file mode 100644
index 11ff698..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/expected/regionMissingComma.res.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/other/regionMissingComma.res:2:31
-
-  1 │ external make: (
-  2 │   ~style: ReactDOMRe.Style.t=?.
-  3 │   ~image: bool=?,
-  4 │ ) => React.element = "ModalContent"
-
-  Did you forget a `,` here?
-
-
-  Syntax error!
-  tests/parsing/errors/other/regionMissingComma.res:8:11-9:11
-
-   6 │ type student<'extraInfo> = {
-   7 │   name: string,
-   8 │   age: int
-   9 │   otherInfo: 'extraInfo
-  10 │ }
-  11 │ 
-
-  Did you forget a `,` here?
-
-external make :
-  ?style:((ReactDOMRe.Style.t)[@res.namedArgLoc ]) ->
-    (?image:((bool)[@res.namedArgLoc ]) -> React.element, [ `Has_arity1 ])
-      function$ = "ModalContent"
-type nonrec 'extraInfo student =
-  {
-  name: string ;
-  age: int ;
-  otherInfo: 'extraInfo }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/other/expected/spread.res.txt b/jscomp/syntax/tests/parsing/errors/other/expected/spread.res.txt
deleted file mode 100644
index 5eb3924..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/expected/spread.res.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/other/spread.res:1:6-8
-
-  1 │ let [...arr, _] = [1, 2, 3]
-  2 │ 
-  3 │ let record = {...x, ...y}
-
-  Array's `...` spread is not supported in pattern matches.
-Explanation: such spread would create a subarray; out of performance concern, our pattern matching currently guarantees to never create new intermediate data.
-Solution: if it's to validate the first few elements, use a `when` clause + Array size check + `get` checks on the current pattern. If it's to obtain a subarray, use `Array.sub` or `Belt.Array.slice`.
-
-
-  Syntax error!
-  tests/parsing/errors/other/spread.res:3:21-23
-
-  1 │ let [...arr, _] = [1, 2, 3]
-  2 │ 
-  3 │ let record = {...x, ...y}
-  4 │ let {...x, ...y} = myRecord
-  5 │ 
-
-  Records can only have one `...` spread, at the beginning.
-Explanation: since records have a known, fixed shape, a spread like `{a, ...b}` wouldn't make sense, as `b` would override every field of `a` anyway.
-
-
-  Syntax error!
-  tests/parsing/errors/other/spread.res:4:15-18
-
-  2 │ 
-  3 │ let record = {...x, ...y}
-  4 │ let {...x, ...y} = myRecord
-  5 │ 
-  6 │ let list{...x, ...y} = myList
-
-  Record's `...` spread is not supported in pattern matches.
-Explanation: you can't collect a subset of a record's field into its own record, since a record needs an explicit declaration and that subset wouldn't have one.
-Solution: you need to pull out each field you want explicitly.
-
-
-  Syntax error!
-  tests/parsing/errors/other/spread.res:6:13-22
-
-  4 │ let {...x, ...y} = myRecord
-  5 │ 
-  6 │ let list{...x, ...y} = myList
-  7 │ 
-  8 │ type t = {...a}
-
-  List pattern matches only supports one `...` spread, at the end.
-Explanation: a list spread at the tail is efficient, but a spread in the middle would create new lists; out of performance concern, our pattern matching currently guarantees to never create new intermediate data.
-
-
-  Syntax error!
-  tests/parsing/errors/other/spread.res:9:20
-
-   7 │ 
-   8 │ type t = {...a}
-   9 │ type t = Foo({...a})
-  10 │ type t = option<foo, {...x}>
-  11 │ 
-
-  I'm not sure what to parse here when looking at ")".
-
-let [|arr;_|] = [|1;2;3|]
-let record = { x with y }
-let { x; y } = myRecord
-let x::y = myList
-type nonrec t = {
-  ...: a }
-type nonrec t =
-  | Foo of < a  >  
-type nonrec t = (foo, < x  > ) option
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/other/for.res b/jscomp/syntax/tests/parsing/errors/other/for.res
deleted file mode 100644
index 5c8c39b..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/for.res
+++ /dev/null
@@ -1 +0,0 @@
-for x
diff --git a/jscomp/syntax/tests/parsing/errors/other/hashIdent.res b/jscomp/syntax/tests/parsing/errors/other/hashIdent.res
deleted file mode 100644
index f7c78e2..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/hashIdent.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let x = #10s
-
-type t = [ #red | #10s ] 
-
-switch x {
-| #10s => ()
-}
diff --git a/jscomp/syntax/tests/parsing/errors/other/labelledParameters.res b/jscomp/syntax/tests/parsing/errors/other/labelledParameters.res
deleted file mode 100644
index 63cceaf..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/labelledParameters.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let f = (x, y=2, z) => x + y + z
-
-let g = (~?x, ~y=2, ~z) => x + y + z
-
-type f = (x: int, y: int) => int
diff --git a/jscomp/syntax/tests/parsing/errors/other/oneElementTuple.res b/jscomp/syntax/tests/parsing/errors/other/oneElementTuple.res
deleted file mode 100644
index 02d9c35..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/oneElementTuple.res
+++ /dev/null
@@ -1,8 +0,0 @@
-let faultyTuple = (a, )
-
-switch faultyTuple {
-| (a, ) => ()
-| _ => ()
-}
-
-type faultyTuple = (string, )
diff --git a/jscomp/syntax/tests/parsing/errors/other/patternMatching.res b/jscomp/syntax/tests/parsing/errors/other/patternMatching.res
deleted file mode 100644
index ebc49d3..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/patternMatching.res
+++ /dev/null
@@ -1,2 +0,0 @@
-switch expr {
-}
diff --git a/jscomp/syntax/tests/parsing/errors/other/regionMissingComma.res b/jscomp/syntax/tests/parsing/errors/other/regionMissingComma.res
deleted file mode 100644
index eb1acea..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/regionMissingComma.res
+++ /dev/null
@@ -1,10 +0,0 @@
-external make: (
-  ~style: ReactDOMRe.Style.t=?.
-  ~image: bool=?,
-) => React.element = "ModalContent"
-
-type student<'extraInfo> = {
-  name: string,
-  age: int
-  otherInfo: 'extraInfo
-}
diff --git a/jscomp/syntax/tests/parsing/errors/other/spread.res b/jscomp/syntax/tests/parsing/errors/other/spread.res
deleted file mode 100644
index b6fa643..0000000
--- a/jscomp/syntax/tests/parsing/errors/other/spread.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let [...arr, _] = [1, 2, 3]
-
-let record = {...x, ...y}
-let {...x, ...y} = myRecord
-
-let list{...x, ...y} = myList
-
-type t = {...a}
-type t = Foo({...a})
-type t = option<foo, {...x}>
diff --git a/jscomp/syntax/tests/parsing/errors/pattern/expected/missing.res.txt b/jscomp/syntax/tests/parsing/errors/pattern/expected/missing.res.txt
deleted file mode 100644
index a6a10a2..0000000
--- a/jscomp/syntax/tests/parsing/errors/pattern/expected/missing.res.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/pattern/missing.res:1:5
-
-  1 │ let = 2
-  2 │ let = 4
-  3 │ 
-
-  I was expecting a name for this let-binding. Example: `let message = "hello"`
-
-
-  Syntax error!
-  tests/parsing/errors/pattern/missing.res:2:5
-
-  1 │ let = 2
-  2 │ let = 4
-  3 │ 
-  4 │ for in 0 to 10 {
-
-  I was expecting a name for this let-binding. Example: `let message = "hello"`
-
-
-  Syntax error!
-  tests/parsing/errors/pattern/missing.res:4:5-6
-
-  2 │ let = 4
-  3 │ 
-  4 │ for in 0 to 10 {
-  5 │   Js.log("for")
-  6 │ }
-
-  A for-loop has the following form: `for i in 0 to 10`. Did you forget to supply a name before `in`?
-
-
-  Syntax error!
-  tests/parsing/errors/pattern/missing.res:9:3-4
-
-   7 │ 
-   8 │ switch x {
-   9 │ | => ()
-  10 │ }
-  11 │ 
-
-  I was expecting a pattern to match on before the `=>`
-
-let 2 = [%rescript.exprhole ]
-let 4 = for [%rescript.patternhole ] = 0 to 10 do Js.log {js|for|js} done
-;;match x with | () -> [%rescript.exprhole ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/pattern/expected/templateLiteral.res.txt b/jscomp/syntax/tests/parsing/errors/pattern/expected/templateLiteral.res.txt
deleted file mode 100644
index 1412c74..0000000
--- a/jscomp/syntax/tests/parsing/errors/pattern/expected/templateLiteral.res.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/pattern/templateLiteral.res:4:3-27
-
-  2 │ 
-  3 │ switch l {
-  4 │ | `zero coord ${zeroCoord}` => ()
-  5 │ | `first coord ${zeroCoord} snd ${zeroCoord} ` => ()
-  6 │ | _ => ()
-
-  String interpolation is not supported in pattern matching.
-
-
-  Syntax error!
-  tests/parsing/errors/pattern/templateLiteral.res:5:33
-
-  3 │ switch l {
-  4 │ | `zero coord ${zeroCoord}` => ()
-  5 │ | `first coord ${zeroCoord} snd ${zeroCoord} ` => ()
-  6 │ | _ => ()
-  7 │ }
-
-  Not sure what to do with this character.
-
-
-  Syntax error!
-  tests/parsing/errors/pattern/templateLiteral.res:5:3-46
-
-  3 │ switch l {
-  4 │ | `zero coord ${zeroCoord}` => ()
-  5 │ | `first coord ${zeroCoord} snd ${zeroCoord} ` => ()
-  6 │ | _ => ()
-  7 │ }
-
-  String interpolation is not supported in pattern matching.
-
-let zeroCoord = {js|0.0|js}
-;;match l with
-  | (("")[@res.template ]) -> ()
-  | (("")[@res.template ]) -> ()
-  | _ -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/pattern/missing.res b/jscomp/syntax/tests/parsing/errors/pattern/missing.res
deleted file mode 100644
index 5ddb62c..0000000
--- a/jscomp/syntax/tests/parsing/errors/pattern/missing.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let = 2
-let = 4
-
-for in 0 to 10 {
-  Js.log("for")
-}
-
-switch x {
-| => ()
-}
diff --git a/jscomp/syntax/tests/parsing/errors/pattern/templateLiteral.res b/jscomp/syntax/tests/parsing/errors/pattern/templateLiteral.res
deleted file mode 100644
index 5ad54e9..0000000
--- a/jscomp/syntax/tests/parsing/errors/pattern/templateLiteral.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let zeroCoord = "0.0" 
-
-switch l {
-| `zero coord ${zeroCoord}` => ()
-| `first coord ${zeroCoord} snd ${zeroCoord} ` => ()
-| _ => ()
-}
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/badCharacter.res b/jscomp/syntax/tests/parsing/errors/scanner/badCharacter.res
deleted file mode 100644
index a3183c8..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/badCharacter.res
+++ /dev/null
@@ -1 +0,0 @@
-let $ = 1
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/bigint.res b/jscomp/syntax/tests/parsing/errors/scanner/bigint.res
deleted file mode 100644
index 2e8a029..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/bigint.res
+++ /dev/null
@@ -1 +0,0 @@
-let bigint = 3n
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/escapeSequence.res b/jscomp/syntax/tests/parsing/errors/scanner/escapeSequence.res
deleted file mode 100644
index eca04d3..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/escapeSequence.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let x = "\055"
-
-let x = "\123"
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/exoticIdent.res b/jscomp/syntax/tests/parsing/errors/scanner/exoticIdent.res
deleted file mode 100644
index 8330692..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/exoticIdent.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let \"a
-b
-c" = 1
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/expected/badCharacter.res.txt b/jscomp/syntax/tests/parsing/errors/scanner/expected/badCharacter.res.txt
deleted file mode 100644
index 9f2770e..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/expected/badCharacter.res.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/scanner/badCharacter.res:1:5
-
-  1 │ let $ = 1
-
-  Not sure what to do with this character.
-
-
-  Syntax error!
-  tests/parsing/errors/scanner/badCharacter.res:1:5-7
-
-  1 │ let $ = 1
-
-  I was expecting a name for this let-binding. Example: `let message = "hello"`
-
-let 1 = [%rescript.exprhole ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/expected/bigint.res.txt b/jscomp/syntax/tests/parsing/errors/scanner/expected/bigint.res.txt
deleted file mode 100644
index cf8eb47..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/expected/bigint.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-let bigint = 3n
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/expected/escapeSequence.res.txt b/jscomp/syntax/tests/parsing/errors/scanner/expected/escapeSequence.res.txt
deleted file mode 100644
index 5088caa..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/expected/escapeSequence.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = {js|\x37|js}
-let x = {js|\x7b|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/expected/exoticIdent.res.txt b/jscomp/syntax/tests/parsing/errors/scanner/expected/exoticIdent.res.txt
deleted file mode 100644
index 6e8f274..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/expected/exoticIdent.res.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/scanner/exoticIdent.res:1:7
-
-  1 │ let \"a
-  2 │ b
-  3 │ c" = 1
-
-  A quoted identifier can't contain line breaks.
-
-
-  Syntax error!
-  tests/parsing/errors/scanner/exoticIdent.res:2:1
-
-  1 │ let \"a
-  2 │ b
-  3 │ c" = 1
-  4 │ 
-
-  Did you forget a `=` here?
-
-
-  Syntax error!
-  tests/parsing/errors/scanner/exoticIdent.res:3:2-4:0
-
-  1 │ let \"a
-  2 │ b
-  3 │ c" = 1
-  4 │ 
-
-  This string is missing a double quote at the end
-
-
-  Syntax error!
-  tests/parsing/errors/scanner/exoticIdent.res:3:2-4:0
-
-  1 │ let \"a
-  2 │ b
-  3 │ c" = 1
-  4 │ 
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-let a = b
-;;c
-;;{js| = 1
-|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/expected/oldDerefOp.res.txt b/jscomp/syntax/tests/parsing/errors/scanner/expected/oldDerefOp.res.txt
deleted file mode 100644
index f974b4e..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/expected/oldDerefOp.res.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/scanner/oldDerefOp.res:1:50
-
-  1 │ let newVelocity = velocity +. a *. secondPerFrame^;
-  2 │ let newX = x +. newVelocity *. secondPerFrame^;
-  3 │ 
-
-  Not sure what to do with this character.
-  If you're trying to dereference a mutable value, use `myValue.contents` instead.
-  To concatenate strings, use `"a" ++ "b"` instead.
-
-
-  Syntax error!
-  tests/parsing/errors/scanner/oldDerefOp.res:2:46
-
-  1 │ let newVelocity = velocity +. a *. secondPerFrame^;
-  2 │ let newX = x +. newVelocity *. secondPerFrame^;
-  3 │ 
-
-  Not sure what to do with this character.
-  If you're trying to dereference a mutable value, use `myValue.contents` instead.
-  To concatenate strings, use `"a" ++ "b"` instead.
-
-let newVelocity = velocity +. (a *. secondPerFrame)
-let newX = x +. (newVelocity *. secondPerFrame)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/expected/unclosedComment.res.txt b/jscomp/syntax/tests/parsing/errors/scanner/expected/unclosedComment.res.txt
deleted file mode 100644
index 481e2f4..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/expected/unclosedComment.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/scanner/unclosedComment.res:1:1-3:0
-
-  1 │ /* eof
-  2 │  * reached
-  3 │ 
-
-  This comment seems to be missing a closing `*/`
-
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/expected/unclosedString.res.txt b/jscomp/syntax/tests/parsing/errors/scanner/expected/unclosedString.res.txt
deleted file mode 100644
index 059735c..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/expected/unclosedString.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/scanner/unclosedString.res:1:9-2:0
-
-  1 │ let z = "eof
-  2 │ 
-
-  This string is missing a double quote at the end
-
-let z = {js|eof
-|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/oldDerefOp.res b/jscomp/syntax/tests/parsing/errors/scanner/oldDerefOp.res
deleted file mode 100644
index 539e183..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/oldDerefOp.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let newVelocity = velocity +. a *. secondPerFrame^;
-let newX = x +. newVelocity *. secondPerFrame^;
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/unclosedComment.res b/jscomp/syntax/tests/parsing/errors/scanner/unclosedComment.res
deleted file mode 100644
index f833a31..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/unclosedComment.res
+++ /dev/null
@@ -1,2 +0,0 @@
-/* eof
- * reached
diff --git a/jscomp/syntax/tests/parsing/errors/scanner/unclosedString.res b/jscomp/syntax/tests/parsing/errors/scanner/unclosedString.res
deleted file mode 100644
index b2ea6b2..0000000
--- a/jscomp/syntax/tests/parsing/errors/scanner/unclosedString.res
+++ /dev/null
@@ -1 +0,0 @@
-let z = "eof
diff --git a/jscomp/syntax/tests/parsing/errors/signature/attributes.resi b/jscomp/syntax/tests/parsing/errors/signature/attributes.resi
deleted file mode 100644
index 0b0afa7..0000000
--- a/jscomp/syntax/tests/parsing/errors/signature/attributes.resi
+++ /dev/null
@@ -1,5 +0,0 @@
-module type MissingItem = {
-  @attr
-}
-
-@attrWithoutItem
diff --git a/jscomp/syntax/tests/parsing/errors/signature/closingBraces.resi b/jscomp/syntax/tests/parsing/errors/signature/closingBraces.resi
deleted file mode 100644
index f4436f6..0000000
--- a/jscomp/syntax/tests/parsing/errors/signature/closingBraces.resi
+++ /dev/null
@@ -1,5 +0,0 @@
-let x: int
-
-}}}
-
-let y: int
diff --git a/jscomp/syntax/tests/parsing/errors/signature/expected/attributes.resi.txt b/jscomp/syntax/tests/parsing/errors/signature/expected/attributes.resi.txt
deleted file mode 100644
index fad6f3d..0000000
--- a/jscomp/syntax/tests/parsing/errors/signature/expected/attributes.resi.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/signature/attributes.resi:2:3-7
-
-  1 │ module type MissingItem = {
-  2 │   @attr
-  3 │ }
-  4 │ 
-
-  Did you forget to attach `attr` to an item?
-  Standalone attributes start with `@@` like: `@@attr`
-
-
-  Syntax error!
-  tests/parsing/errors/signature/attributes.resi:5:1-16
-
-  3 │ }
-  4 │ 
-  5 │ @attrWithoutItem
-  6 │ 
-
-  Did you forget to attach `attrWithoutItem` to an item?
-  Standalone attributes start with `@@` like: `@@attrWithoutItem`
-
-module type MissingItem  = sig [%%rescript.sigitemhole ] end
-[%%rescript.sigitemhole ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/signature/expected/closingBraces.resi.txt b/jscomp/syntax/tests/parsing/errors/signature/expected/closingBraces.resi.txt
deleted file mode 100644
index 451ce61..0000000
--- a/jscomp/syntax/tests/parsing/errors/signature/expected/closingBraces.resi.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/signature/closingBraces.resi:3:1
-
-  1 │ let x: int
-  2 │ 
-  3 │ }}}
-  4 │ 
-  5 │ let y: int
-
-  I'm not sure what to parse here when looking at "}".
-
-val x : int
-val y : int
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/structure/attributes.res b/jscomp/syntax/tests/parsing/errors/structure/attributes.res
deleted file mode 100644
index dda617c..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/attributes.res
+++ /dev/null
@@ -1,5 +0,0 @@
-module MissingExpression = {
-  @attr
-}
-
-@attrWithNoExpression
diff --git a/jscomp/syntax/tests/parsing/errors/structure/closingBraces.res b/jscomp/syntax/tests/parsing/errors/structure/closingBraces.res
deleted file mode 100644
index 9307629..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/closingBraces.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let x = 1
-
-}}}
-
-let y = 2
diff --git a/jscomp/syntax/tests/parsing/errors/structure/consecutive.res b/jscomp/syntax/tests/parsing/errors/structure/consecutive.res
deleted file mode 100644
index 0ccd59d..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/consecutive.res
+++ /dev/null
@@ -1 +0,0 @@
-open Foo exception Bar
diff --git a/jscomp/syntax/tests/parsing/errors/structure/expected/attributes.res.txt b/jscomp/syntax/tests/parsing/errors/structure/expected/attributes.res.txt
deleted file mode 100644
index c9a6636..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/expected/attributes.res.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/structure/attributes.res:2:3-7
-
-  1 │ module MissingExpression = {
-  2 │   @attr
-  3 │ }
-  4 │ 
-
-  Did you forget to attach `attr` to an item?
-  Standalone attributes start with `@@` like: `@@attr`
-
-
-  Syntax error!
-  tests/parsing/errors/structure/attributes.res:5:1-21
-
-  3 │ }
-  4 │ 
-  5 │ @attrWithNoExpression
-  6 │ 
-
-  Did you forget to attach `attrWithNoExpression` to an item?
-  Standalone attributes start with `@@` like: `@@attrWithNoExpression`
-
-module MissingExpression = struct ;;[%rescript.exprhole ][@@attr ] end
-;;[%rescript.exprhole ][@@attrWithNoExpression ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/structure/expected/closingBraces.res.txt b/jscomp/syntax/tests/parsing/errors/structure/expected/closingBraces.res.txt
deleted file mode 100644
index 726e434..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/expected/closingBraces.res.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/structure/closingBraces.res:3:1
-
-  1 │ let x = 1
-  2 │ 
-  3 │ }}}
-  4 │ 
-  5 │ let y = 2
-
-  I'm not sure what to parse here when looking at "}".
-
-let x = 1
-let y = 2
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/structure/expected/consecutive.res.txt b/jscomp/syntax/tests/parsing/errors/structure/expected/consecutive.res.txt
deleted file mode 100644
index c18f5df..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/expected/consecutive.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/structure/consecutive.res:1:9-18
-
-  1 │ open Foo exception Bar
-  2 │ 
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-open Foo
-exception Bar 
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/structure/expected/external.res.txt b/jscomp/syntax/tests/parsing/errors/structure/expected/external.res.txt
deleted file mode 100644
index 5d9f438..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/expected/external.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/structure/external.res:2:51
-
-  1 │ // missing JS value name
-  2 │ external setTimeout: (unit => unit, int) => float =
-  3 │ 
-
-  An external requires the name of the JS value you're referring to, like "setTimeout".
-
-external setTimeout : (unit -> unit) -> int -> float
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/structure/expected/gh16A.res.txt b/jscomp/syntax/tests/parsing/errors/structure/expected/gh16A.res.txt
deleted file mode 100644
index 4e8d983..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/expected/gh16A.res.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/structure/gh16A.res:6:1
-
-  4 │   })
-  5 │ }
-  6 │ )
-  7 │ Js.log("test"); // Is omitted from the compiled JS
-  8 │ 
-
-  I'm not sure what to parse here when looking at ")".
-
-module C = struct module T = (Fun)(struct ;;foo (a + c) (b + d) end) end
-;;Js.log {js|test|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/structure/expected/gh16B.res.txt b/jscomp/syntax/tests/parsing/errors/structure/expected/gh16B.res.txt
deleted file mode 100644
index e35185e..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/expected/gh16B.res.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/structure/gh16B.res:19:2
-
-  17 │ 
-  18 │ 
-  19 │ })))))))))))))))))))))))))))))); // this ")" here, this can even be "))
-     │ ))))))))))))))" and should error
-  20 │ 
-  21 │ Js.log("test") // should not be omitted
-
-  I'm not sure what to parse here when looking at ")".
-
-open Ws
-let wss = Server.make { port = 82 }
-let address = wss |. Server.address
-let log msg =
-  Js.log
-    (((((({js|> Server: |js})[@res.template ]) ^ msg)[@res.template ]) ^
-        (({js||js})[@res.template ]))[@res.template ])
-;;log
-    (((((((((((((({js|Running on: |js})[@res.template ]) ^ address.address)
-                [@res.template ]) ^ (({js|:|js})[@res.template ]))
-              [@res.template ]) ^ (address.port |. string_of_int))
-            [@res.template ]) ^ (({js| (|js})[@res.template ]))
-          [@res.template ]) ^ address.family)
-        [@res.template ]) ^ (({js|)|js})[@res.template ]))[@res.template ])
-module ClientSet =
-  struct
-    module T =
-      (Belt.Id.MakeComparable)(struct
-                                 type nonrec t = Client.t
-                                 let cmp a b =
-                                   ((compare (a |. Client.getUniqueId)
-                                       (b |. Client.getUniqueId))
-                                   [@res.braces ])
-                               end)
-    let empty = Belt.Set.make ~id:(((module T))[@res.namedArgLoc ])
-  end
-;;Js.log {js|test|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/structure/expected/letBinding.res.txt b/jscomp/syntax/tests/parsing/errors/structure/expected/letBinding.res.txt
deleted file mode 100644
index c71ead7..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/expected/letBinding.res.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/structure/letBinding.res:2:18-20
-
-  1 │ // missing =
-  2 │ let rightResource ur.resources.find(
-  3 │   r => r.account_id === connection.left.account.id
-  4 │ )
-
-  Did you forget a `=` here?
-
-
-  Syntax error!
-  tests/parsing/errors/structure/letBinding.res:8:12-13
-
-   6 │ let x = {
-   7 │   // missing =
-   8 │   let field p->parseFieldDeclaration 
-   9 │   field
-  10 │ }
-
-  Did you forget a `=` here?
-
-
-  Syntax error!
-  tests/parsing/errors/structure/letBinding.res:14:19-26
-
-  12 │ let t = {
-  13 │ 	// missing =
-  14 │ 	let (_, _, token) scanner->scan
-  15 │   token
-  16 │ }
-
-  Did you forget a `=` here?
-
-
-  Syntax error!
-  tests/parsing/errors/structure/letBinding.res:18:39-20:3
-
-  16 │ }
-  17 │ 
-  18 │ let keyTable: Belt.Map.String.t<int> =
-  19 │ 
-  20 │ let foo = 
-  21 │ 
-  22 │ // no magic in the syntax
-
-  This let-binding misses an expression
-
-
-  Syntax error!
-  tests/parsing/errors/structure/letBinding.res:20:10-23:3
-
-  18 │ let keyTable: Belt.Map.String.t<int> =
-  19 │ 
-  20 │ let foo = 
-  21 │ 
-  22 │ // no magic in the syntax
-  23 │ let x: int :> string = y
-  24 │ 
-  25 │ // no magic in the syntax
-
-  This let-binding misses an expression
-
-
-  Syntax error!
-  tests/parsing/errors/structure/letBinding.res:23:11-13
-
-  21 │ 
-  22 │ // no magic in the syntax
-  23 │ let x: int :> string = y
-  24 │ 
-  25 │ // no magic in the syntax
-
-  Did you forget a `=` here?
-
-
-  Syntax error!
-  tests/parsing/errors/structure/letBinding.res:26:6-8
-
-  24 │ 
-  25 │ // no magic in the syntax
-  26 │ let x :> string = y
-  27 │ 
-  28 │ // no magic in the syntax
-
-  Did you forget a `=` here?
-
-
-  Syntax error!
-  tests/parsing/errors/structure/letBinding.res:29:13-15
-
-  27 │ 
-  28 │ // no magic in the syntax
-  29 │ let x : int1 :> int2 = 3 :> int3
-  30 │ 
-
-  Did you forget a `=` here?
-
-let rightResource =
-  (ur.resources).find
-    (fun r -> r.account_id == ((connection.left).account).id)
-let x = ((let field = p |. parseFieldDeclaration in field)[@res.braces ])
-let t = ((let (_, _, token) = scanner |. scan in token)[@res.braces ])
-let (keyTable : int Belt.Map.String.t) = [%rescript.exprhole ]
-let foo = [%rescript.exprhole ]
-let (x : int) = string = y
-let x = string = y
-let (x : int1) = (int2 = 3 :> int3)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/structure/expected/letBindingPatternKeyword.res.txt b/jscomp/syntax/tests/parsing/errors/structure/expected/letBindingPatternKeyword.res.txt
deleted file mode 100644
index 58bac84..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/expected/letBindingPatternKeyword.res.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/structure/letBindingPatternKeyword.res:1:5-8
-
-  1 │ let open = 1
-  2 │ let for = 3
-  3 │ 
-
-  `open` is a reserved keyword. Keywords need to be escaped: \"open"
-
-
-  Syntax error!
-  tests/parsing/errors/structure/letBindingPatternKeyword.res:2:5-7
-
-  1 │ let open = 1
-  2 │ let for = 3
-  3 │ 
-
-  `for` is a reserved keyword. Keywords need to be escaped: \"for"
-
-let [%rescript.patternhole ] = 1
-let [%rescript.patternhole ] = 3
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/structure/external.res b/jscomp/syntax/tests/parsing/errors/structure/external.res
deleted file mode 100644
index 3a77e90..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/external.res
+++ /dev/null
@@ -1,2 +0,0 @@
-// missing JS value name
-external setTimeout: (unit => unit, int) => float =
diff --git a/jscomp/syntax/tests/parsing/errors/structure/gh16A.res b/jscomp/syntax/tests/parsing/errors/structure/gh16A.res
deleted file mode 100644
index a395fdc..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/gh16A.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module C = {
-  module T = Fun({
-      foo(a + c, b + d)
-  })
-}
-)
-Js.log("test"); // Is omitted from the compiled JS
diff --git a/jscomp/syntax/tests/parsing/errors/structure/gh16B.res b/jscomp/syntax/tests/parsing/errors/structure/gh16B.res
deleted file mode 100644
index 90b872e..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/gh16B.res
+++ /dev/null
@@ -1,21 +0,0 @@
-open Ws
-
-let wss = Server.make({port: 82})
-let address = wss->Server.address
-let log = msg => Js.log(`> Server: ${msg}`)
-log(`Running on: ${address.address}:${address.port->string_of_int} (${address.family})`)
-
-module ClientSet = {
-  module T = Belt.Id.MakeComparable({
-    type t = Client.t;
-    let cmp = (a, b) => {
-      compare(a->Client.getUniqueId, b->Client.getUniqueId);
-    };
-  });
-
-  let empty = Belt.Set.make(~id=module (T));
-
-
-})))))))))))))))))))))))))))))); // this ")" here, this can even be "))))))))))))))))" and should error
-
-Js.log("test") // should not be omitted
diff --git a/jscomp/syntax/tests/parsing/errors/structure/letBinding.res b/jscomp/syntax/tests/parsing/errors/structure/letBinding.res
deleted file mode 100644
index 4e47c2b..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/letBinding.res
+++ /dev/null
@@ -1,29 +0,0 @@
-// missing =
-let rightResource ur.resources.find(
-  r => r.account_id === connection.left.account.id
-)
-
-let x = {
-  // missing =
-  let field p->parseFieldDeclaration 
-  field
-}
-
-let t = {
-	// missing =
-	let (_, _, token) scanner->scan
-  token
-}
-
-let keyTable: Belt.Map.String.t<int> =
-
-let foo = 
-
-// no magic in the syntax
-let x: int :> string = y
-
-// no magic in the syntax
-let x :> string = y
-
-// no magic in the syntax
-let x : int1 :> int2 = 3 :> int3
diff --git a/jscomp/syntax/tests/parsing/errors/structure/letBindingPatternKeyword.res b/jscomp/syntax/tests/parsing/errors/structure/letBindingPatternKeyword.res
deleted file mode 100644
index 7558f08..0000000
--- a/jscomp/syntax/tests/parsing/errors/structure/letBindingPatternKeyword.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let open = 1
-let for = 3
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/emptyInlineRecord.res b/jscomp/syntax/tests/parsing/errors/typeDef/emptyInlineRecord.res
deleted file mode 100644
index 4f2c0e2..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/emptyInlineRecord.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type node<'a> =
-  | Nil
-  | Node({})
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/emptyRecord.res b/jscomp/syntax/tests/parsing/errors/typeDef/emptyRecord.res
deleted file mode 100644
index f2b5233..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/emptyRecord.res
+++ /dev/null
@@ -1 +0,0 @@
-type record = {}
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/emptyInlineRecord.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/emptyInlineRecord.res.txt
deleted file mode 100644
index 78d9c4d..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/emptyInlineRecord.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-type nonrec 'a node =
-  | Nil 
-  | Node of {
-  } 
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/emptyRecord.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/emptyRecord.res.txt
deleted file mode 100644
index a6f4d8f..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/emptyRecord.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-type nonrec record = {
-  }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/inlineRecord.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/inlineRecord.res.txt
deleted file mode 100644
index 0aeade9..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/inlineRecord.res.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typeDef/inlineRecord.res:6:9-15
-
-  4 ┆ name: string,
-  5 ┆ reportCard: {
-  6 ┆   passing: bool,
-  7 ┆   score: int
-  8 ┆ }
-
-  An inline record type declaration is only allowed in a variant constructor's declaration
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/inlineRecord.res:14:5-10
-
-  12 ┆ name: string,
-  13 ┆ address: {
-  14 ┆   street: string,
-  15 ┆   country: string,
-  16 ┆ }
-
-  An inline record type declaration is only allowed in a variant constructor's declaration
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/inlineRecord.res:19:21-31
-
-  17 │ }
-  18 │ 
-  19 │ let make = (props: {handleClick: Click.t => unit, value: string}) => re
-     │ nder(props)
-  20 │ 
-
-  An inline record type declaration is only allowed in a variant constructor's declaration
-
-type nonrec entity =
-  | Director 
-  | Student of {
-  name: string ;
-  reportCard: < passing: bool  ;score: int   >  } 
-type nonrec user =
-  {
-  name: string ;
-  address: < street: string  ;country: string   >  }
-let make (props : < handleClick: Click.t -> unit  ;value: string   > ) =
-  render props
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/keywordOnly.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/keywordOnly.res.txt
deleted file mode 100644
index e15e02a..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/keywordOnly.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typeDef/keywordOnly.res:1:5
-
-  1 │ type
-
-  I'm not sure what to parse here when looking at "eof".
-
-type nonrec _
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/namedParameters.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/namedParameters.res.txt
deleted file mode 100644
index bb5b731..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/namedParameters.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typeDef/namedParameters.res:1:15-20
-
-  1 │ type  draw = (stroke: pencil) => unit
-  2 │ 
-
-  A labeled parameter starts with a `~`. Did you mean: `~stroke`?
-
-type nonrec draw = stroke:pencil -> unit
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/polyvariant.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/polyvariant.res.txt
deleted file mode 100644
index 3629e66..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/polyvariant.res.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typeDef/polyvariant.res:1:13
-
-  1 │ type t = [< ]
-  2 │ 
-  3 │ type z = [< | #A | #B > ]
-
-  I'm not sure what to parse here when looking at "]".
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/polyvariant.res:5:15
-
-  3 │ type z = [< | #A | #B > ]
-  4 │ 
-  5 │ type rec t = []
-  6 │ 
-  7 │ 
-
-  I'm not sure what to parse here when looking at "]".
-
-type nonrec t = [< [%rescript.typehole ]]
-type nonrec z = [< `A  | `B ]
-type t = [ [%rescript.typehole ] | [%rescript.typehole ]]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/record.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/record.res.txt
deleted file mode 100644
index 77ce9d2..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/record.res.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typeDef/record.res:4:1
-
-  2 │   observed: int,
-  3 │   observer:
-  4 │ }
-  5 │ 
-
-  I'm missing a type here
-
-type nonrec observation = {
-  observed: int ;
-  observer: [%rescript.typehole ] }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/recordDocComment.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/recordDocComment.res.txt
deleted file mode 100644
index 134e41f..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/recordDocComment.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typeDef/recordDocComment.res:2:16-3:1
-
-  1 │ type a = {
-  2 │   foo: string, /** here */
-  3 │ }
-  4 │ 
-
-  Attributes and doc comments can only be used at the beginning of a field declaration
-
-type nonrec a = {
-  foo: string }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/recordMutable.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/recordMutable.res.txt
deleted file mode 100644
index 0e362f5..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/recordMutable.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typeDef/recordMutable.res:2:16-3:1
-
-  1 │ type d = {
-  2 │   foo: string, mutable
-  3 │ }
-  4 │ 
-
-  The `mutable` qualifier can only be used at the beginning of a field declaration
-
-type nonrec d = {
-  foo: string }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/typeDef.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/typeDef.res.txt
deleted file mode 100644
index 01feac4..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/typeDef.res.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:1:15-2:3
-
-  1 │ type rec stack
-  2 │   | Empty
-  3 │ 
-  4 │ // name cannot contain module access paths
-
-  Did you forget a `=` here?
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:5:6-12
-
-  3 │ 
-  4 │ // name cannot contain module access paths
-  5 │ type Foo.bar = string
-  6 │ 
-  7 │ // missing type
-
-  A type declaration's name cannot contain a module access. Did you mean `bar`?
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:11:1-4
-
-   9 │ 
-  10 │ // missing type
-  11 │ type state =
-  12 │ 
-  13 │ // prevent last error
-
-  Missing a type here
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:14:1
-
-  12 │ 
-  13 │ // prevent last error
-  14 │ ;
-  15 │ 
-  16 │ // The name must start with a lowercase
-
-  I'm not sure what to parse here when looking at ";".
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:17:6-7
-
-  15 │ 
-  16 │ // The name must start with a lowercase
-  17 │ type T1 = D1
-  18 │ 
-  19 │ type M.T2 += D2
-
-  Did you mean `t1` instead of `T1`?
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:19:8-9
-
-  17 │ type T1 = D1
-  18 │ 
-  19 │ type M.T2 += D2
-  20 │ 
-  21 │ type M1.M2.T3 += D3
-
-  Did you mean `t2` instead of `T2`?
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:21:12-13
-
-  19 │ type M.T2 += D2
-  20 │ 
-  21 │ type M1.M2.T3 += D3
-  22 │ 
-  23 │ type T3 += Tid: Tid.t<t>
-
-  Did you mean `t3` instead of `T3`?
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:23:6-7
-
-  21 │ type M1.M2.T3 += D3
-  22 │ 
-  23 │ type T3 += Tid: Tid.t<t>
-  24 │ 
-  25 │ type T4<_> = D4
-
-  Did you mean `t3` instead of `T3`?
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:23:15
-
-  21 │ type M1.M2.T3 += D3
-  22 │ 
-  23 │ type T3 += Tid: Tid.t<t>
-  24 │ 
-  25 │ type T4<_> = D4
-
-  I'm not sure what to parse here when looking at ":".
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:25:6-7
-
-  23 │ type T3 += Tid: Tid.t<t>
-  24 │ 
-  25 │ type T4<_> = D4
-  26 │ 
-  27 │ type M1.M2.T5<_> += D5
-
-  Did you mean `t4` instead of `T4`?
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:27:12-13
-
-  25 │ type T4<_> = D4
-  26 │ 
-  27 │ type M1.M2.T5<_> += D5
-  28 │ 
-  29 │ type X.Y z += D6
-
-  Did you mean `t5` instead of `T5`?
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeDef.res:29:8
-
-  27 │ type M1.M2.T5<_> += D5
-  28 │ 
-  29 │ type X.Y z += D6
-  30 │ 
-
-  Did you mean `y` instead of `Y`?
-
-type stack =
-  | Empty 
-type nonrec bar = string
-type nonrec t = [%rescript.typehole ]
-type nonrec state = [%rescript.typehole ]
-type nonrec T1
-;;D1
-type nonrec T2
-;;D2
-type nonrec T3
-;;D3
-type nonrec T3
-;;Tid
-;;(Tid.t < t) > ([%rescript.exprhole ])
-type nonrec T4
-;;([%rescript.exprhole ]) > D4
-type nonrec T5
-;;([%rescript.exprhole ]) > D5
-type X.Y +=  
-  | D6 
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/expected/typeParams.res.txt b/jscomp/syntax/tests/parsing/errors/typeDef/expected/typeParams.res.txt
deleted file mode 100644
index 511070b..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/expected/typeParams.res.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeParams.res:1:10-13
-
-  1 │ type node('a) = {
-  2 │   _value: Js.Nullable.value<'a>
-  3 │ }
-
-  Type parameters require angle brackets:
-  node<'a>
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeParams.res:5:26-28
-
-  3 │ }
-  4 │ 
-  5 │ type derivedNode<'from, 'for> = {
-  6 │   mutable value: 'to_,
-  7 │   updateF: 'from => 'to_,
-
-  `for` is a reserved keyword. Keywords need to be escaped: \"for"
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeParams.res:10:26
-
-   8 │ }
-   9 │ 
-  10 │ type derivedNode<'from, '+> = {
-  11 │   mutable value: 'to_,
-  12 │   updateF: 'from => 'to_,
-
-  A type param consists of a singlequote followed by a name like `'a` or `'A`
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeParams.res:15:26
-
-  13 │ }
-  14 │ 
-  15 │ type derivedNode<'from, '_> = {
-  16 │   mutable value: 'to_,
-  17 │   updateF: 'from => 'to_,
-
-  A type param consists of a singlequote followed by a name like `'a` or `'A`
-
-
-  Syntax error!
-  tests/parsing/errors/typeDef/typeParams.res:21:25-27
-
-  19 │ 
-  20 │ 
-  21 │ type derivedNode<'from, foo> = {
-  22 │   mutable value: 'to_,
-  23 │   updateF: 'from => 'to_,
-
-  Type params start with a singlequote: 'foo
-
-type nonrec 'a node = {
-  _value: 'a Js.Nullable.value }
-type nonrec ('from, 'for) derivedNode =
-  {
-  mutable value: 'to_ ;
-  updateF: 'from -> 'to_ }
-type nonrec ('from, ') derivedNode =
-  {
-  mutable value: 'to_ ;
-  updateF: 'from -> 'to_ }
-type nonrec ('from, ') derivedNode =
-  {
-  mutable value: 'to_ ;
-  updateF: 'from -> 'to_ }
-type nonrec ('from, 'foo) derivedNode =
-  {
-  mutable value: 'to_ ;
-  updateF: 'from -> 'to_ }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/inlineRecord.res b/jscomp/syntax/tests/parsing/errors/typeDef/inlineRecord.res
deleted file mode 100644
index 6c7540f..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/inlineRecord.res
+++ /dev/null
@@ -1,19 +0,0 @@
-type entity =
-  | Director
-  | Student({
-      name: string,
-      reportCard: {
-        passing: bool,
-        score: int
-      }
-    })
-
-type user = {
-  name: string,
-  address: {
-    street: string,
-    country: string,
-  }
-}
-
-let make = (props: {handleClick: Click.t => unit, value: string}) => render(props)
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/keywordOnly.res b/jscomp/syntax/tests/parsing/errors/typeDef/keywordOnly.res
deleted file mode 100644
index c3dc052..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/keywordOnly.res
+++ /dev/null
@@ -1 +0,0 @@
-type
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/namedParameters.res b/jscomp/syntax/tests/parsing/errors/typeDef/namedParameters.res
deleted file mode 100644
index 649b144..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/namedParameters.res
+++ /dev/null
@@ -1 +0,0 @@
-type  draw = (stroke: pencil) => unit
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/polyvariant.res b/jscomp/syntax/tests/parsing/errors/typeDef/polyvariant.res
deleted file mode 100644
index 7e384a5..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/polyvariant.res
+++ /dev/null
@@ -1,6 +0,0 @@
-type t = [< ]
-
-type z = [< | #A | #B > ]
-
-type rec t = []
-
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/record.res b/jscomp/syntax/tests/parsing/errors/typeDef/record.res
deleted file mode 100644
index 60dac73..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/record.res
+++ /dev/null
@@ -1,4 +0,0 @@
-type observation = {
-  observed: int,
-  observer:
-}
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/recordDocComment.res b/jscomp/syntax/tests/parsing/errors/typeDef/recordDocComment.res
deleted file mode 100644
index ada0efe..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/recordDocComment.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type a = {
-  foo: string, /** here */
-}
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/recordMutable.res b/jscomp/syntax/tests/parsing/errors/typeDef/recordMutable.res
deleted file mode 100644
index a7c991e..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/recordMutable.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type d = {
-  foo: string, mutable
-}
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/typeDef.res b/jscomp/syntax/tests/parsing/errors/typeDef/typeDef.res
deleted file mode 100644
index 07c1ef0..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/typeDef.res
+++ /dev/null
@@ -1,29 +0,0 @@
-type rec stack
-  | Empty
-
-// name cannot contain module access paths
-type Foo.bar = string
-
-// missing type
-type t =
-
-// missing type
-type state =
-
-// prevent last error
-;
-
-// The name must start with a lowercase
-type T1 = D1
-
-type M.T2 += D2
-
-type M1.M2.T3 += D3
-
-type T3 += Tid: Tid.t<t>
-
-type T4<_> = D4
-
-type M1.M2.T5<_> += D5
-
-type X.Y z += D6
diff --git a/jscomp/syntax/tests/parsing/errors/typeDef/typeParams.res b/jscomp/syntax/tests/parsing/errors/typeDef/typeParams.res
deleted file mode 100644
index c3c5dd5..0000000
--- a/jscomp/syntax/tests/parsing/errors/typeDef/typeParams.res
+++ /dev/null
@@ -1,24 +0,0 @@
-type node('a) = {
-  _value: Js.Nullable.value<'a>
-}
-
-type derivedNode<'from, 'for> = {
-  mutable value: 'to_,
-  updateF: 'from => 'to_,
-}
-
-type derivedNode<'from, '+> = {
-  mutable value: 'to_,
-  updateF: 'from => 'to_,
-}
-
-type derivedNode<'from, '_> = {
-  mutable value: 'to_,
-  updateF: 'from => 'to_,
-}
-
-
-type derivedNode<'from, foo> = {
-  mutable value: 'to_,
-  updateF: 'from => 'to_,
-}
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/arrow.res b/jscomp/syntax/tests/parsing/errors/typexpr/arrow.res
deleted file mode 100644
index e47ac7b..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/arrow.res
+++ /dev/null
@@ -1,16 +0,0 @@
-// notice usage of -> instead of =>
-external add_nat: nat -> int = "add_nat_bytecode"
-
-module Error2 = {
-  type observation ={
-    observed: int,
-    onStep: (~currentValue   ) => unit
-  }
-}
-
-module Error3 = {
-  type observation ={
-    observed: int,
-    onStep: ~currentValue  => unit
-  }
-}
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/bsObjSugar.res b/jscomp/syntax/tests/parsing/errors/typexpr/bsObjSugar.res
deleted file mode 100644
index 7c19baf..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/bsObjSugar.res
+++ /dev/null
@@ -1,50 +0,0 @@
-type state = {
-  "url"
-  "protocols": array<string>
-}
-
-type state = {
-  @attr "url"
-  "protocols": array<string>
-}
-
-type state = {
-  "url": string,
-  "protocols"
-  "websocket": Websocket.t,
-}
-
-type state = {
-  "url": string,
-  "protocols"
-}
-
-type state = {
-  @bs.meth
-  "send": string =>
-}
-
-type state = {
-  "age": ,
-  "name": string
-}
-
-type state = {
-  @bs.set "age": ,
-  "name": string
-}
-
-type state = {.. "age": }
-type state = {
-  ..
-  "age" 
-  "name": string
-}
-
-type websocket = {
-  "id":
-  "channel": channelTyp
-}
-
-type websocket = {
-  "id"
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/expected/arrow.res.txt b/jscomp/syntax/tests/parsing/errors/typexpr/expected/arrow.res.txt
deleted file mode 100644
index 264001c..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/expected/arrow.res.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typexpr/arrow.res:2:22-24
-
-  1 │ // notice usage of -> instead of =>
-  2 │ external add_nat: nat -> int = "add_nat_bytecode"
-  3 │ 
-  4 │ module Error2 = {
-
-  Did you forget a `=>` here?
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/arrow.res:7:27-30
-
-  5 │   type observation ={
-  6 │     observed: int,
-  7 │     onStep: (~currentValue   ) => unit
-  8 │   }
-  9 │ }
-
-  Did you forget a `:` here? It signals the start of a type
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/arrow.res:14:26-29
-
-  12 │   type observation ={
-  13 │     observed: int,
-  14 │     onStep: ~currentValue  => unit
-  15 │   }
-  16 │ }
-
-  Did you forget a `:` here? It signals the start of a type
-
-external add_nat : nat -> int = "add_nat_bytecode"
-module Error2 =
-  struct
-    type nonrec observation =
-      {
-      observed: int ;
-      onStep:
-        currentValue:((unit)[@res.namedArgLoc ]) -> [%rescript.typehole ] }
-  end
-module Error3 =
-  struct
-    type nonrec observation =
-      {
-      observed: int ;
-      onStep:
-        currentValue:((unit)[@res.namedArgLoc ]) -> [%rescript.typehole ] }
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/expected/bsObjSugar.res.txt b/jscomp/syntax/tests/parsing/errors/typexpr/expected/bsObjSugar.res.txt
deleted file mode 100644
index af90bdf..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/expected/bsObjSugar.res.txt
+++ /dev/null
@@ -1,152 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:2:8-3:13
-
-  1 │ type state = {
-  2 │   "url"
-  3 │   "protocols": array<string>
-  4 │ }
-  5 │ 
-
-  Did you forget a `:` here? It signals the start of a type
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:7:14-8:13
-
-   5 │ 
-   6 │ type state = {
-   7 │   @attr "url"
-   8 │   "protocols": array<string>
-   9 │ }
-  10 │ 
-
-  Did you forget a `:` here? It signals the start of a type
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:13:14-14:13
-
-  11 │ type state = {
-  12 │   "url": string,
-  13 │   "protocols"
-  14 │   "websocket": Websocket.t,
-  15 │ }
-  16 │ 
-
-  Did you forget a `:` here? It signals the start of a type
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:19:14-20:1
-
-  17 │ type state = {
-  18 │   "url": string,
-  19 │   "protocols"
-  20 │ }
-  21 │ 
-  22 │ type state = {
-
-  Did you forget a `:` here? It signals the start of a type
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:25:1
-
-  23 │   @bs.meth
-  24 │   "send": string =>
-  25 │ }
-  26 │ 
-  27 │ type state = {
-
-  I'm missing a type here
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:28:10
-
-  26 │ 
-  27 │ type state = {
-  28 │   "age": ,
-  29 │   "name": string
-  30 │ }
-
-  I'm missing a type here
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:33:18
-
-  31 │ 
-  32 │ type state = {
-  33 │   @bs.set "age": ,
-  34 │   "name": string
-  35 │ }
-
-  I'm missing a type here
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:37:25
-
-  35 │ }
-  36 │ 
-  37 │ type state = {.. "age": }
-  38 │ type state = {
-  39 │   ..
-
-  I'm missing a type here
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:40:8-41:8
-
-  38 │ type state = {
-  39 │   ..
-  40 │   "age" 
-  41 │   "name": string
-  42 │ }
-  43 │ 
-
-  Did you forget a `:` here? It signals the start of a type
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:46:3-11
-
-  44 │ type websocket = {
-  45 │   "id":
-  46 │   "channel": channelTyp
-  47 │ }
-  48 │ 
-
-  I'm missing a type here
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/bsObjSugar.res:50:7-51:0
-
-  48 │ 
-  49 │ type websocket = {
-  50 │   "id"
-  51 │ 
-
-  Did you forget a `:` here? It signals the start of a type
-
-type nonrec state =
-  < url: [%rescript.typehole ]  ;protocols: string array   > 
-type nonrec state =
-  < url: [%rescript.typehole ] [@attr ] ;protocols: string array   > 
-type nonrec state =
-  < url: string  ;protocols: [%rescript.typehole ]  ;websocket: Websocket.t  
-    > 
-type nonrec state = < url: string  ;protocols: [%rescript.typehole ]   > 
-type nonrec state = < send: string -> [%rescript.typehole ] [@bs.meth ]  > 
-type nonrec state = < age: [%rescript.typehole ]  ;name: string   > 
-type nonrec state =
-  < age: [%rescript.typehole ] [@bs.set ] ;name: string   > 
-type nonrec state = < age: [%rescript.typehole ]   ;.. > 
-type nonrec state = < age: [%rescript.typehole ]  ;name: string   ;.. > 
-type nonrec websocket =
-  < id: [%rescript.typehole ]  ;channel: channelTyp   > 
-type nonrec websocket = < id: [%rescript.typehole ]   > 
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/expected/garbage.res.txt b/jscomp/syntax/tests/parsing/errors/typexpr/expected/garbage.res.txt
deleted file mode 100644
index 9c72278..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/expected/garbage.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typexpr/garbage.res:2:28
-
-  1 │ @bs.module("moduleName")
-  2 │ external printName: (~name:?, unit) => unit = "printName"
-  3 │ 
-
-  I'm not sure what to parse here when looking at "?".
-
-external printName : name:((unit)[@res.namedArgLoc ]) -> unit = "printName"
-[@@bs.module {js|moduleName|js}]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/expected/objectSpread.res.txt b/jscomp/syntax/tests/parsing/errors/typexpr/expected/objectSpread.res.txt
deleted file mode 100644
index 1f4a1a7..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/expected/objectSpread.res.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typexpr/objectSpread.res:5:16-18
-
-  3 │ type u = private {...a, u: int}
-  4 │ 
-  5 │ type x = Type({...a, u: int})
-  6 │ 
-  7 │ type u = {...a, "u": int, v: int}
-
-  A record type declaration doesn't support the ... spread. Only an object (with quoted field names) does.
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/objectSpread.res:9:14
-
-   7 │ type u = {...a, "u": int, v: int}
-   8 │ 
-   9 │ let f = (x: {a: int, b: int}) => ()
-  10 │ 
-
-  An inline record type declaration is only allowed in a variant constructor's declaration
-
-type nonrec u = {
-  ...: a ;
-  u: int }
-type nonrec u = private {
-  ...: a ;
-  u: int }
-type nonrec x =
-  | Type of < a ;u: int   >  
-type nonrec u = < a ;u: int  ;v: int   > 
-let f (x : < a: int  ;b: int   > ) = ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/expected/typeConstructorArgs.res.txt b/jscomp/syntax/tests/parsing/errors/typexpr/expected/typeConstructorArgs.res.txt
deleted file mode 100644
index 25fef57..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/expected/typeConstructorArgs.res.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typexpr/typeConstructorArgs.res:2:28-31
-
-  1 │ type node<'a> = {
-  2 │   _value: Js.Nullable.value('a)
-  3 │ }
-  4 │ 
-
-  Type parameters require angle brackets:
-  Js.Nullable.value<'a>
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/typeConstructorArgs.res:5:24-27
-
-  3 │ }
-  4 │ 
-  5 │ type t<'a> = Belt.Map.t('a)
-  6 │ type t<'a> = private Belt.Map.t('a)
-  7 │ 
-
-  Type parameters require angle brackets:
-  Belt.Map.t<'a>
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/typeConstructorArgs.res:6:32-35
-
-  4 │ 
-  5 │ type t<'a> = Belt.Map.t('a)
-  6 │ type t<'a> = private Belt.Map.t('a)
-  7 │ 
-  8 │ type t = option<<node<int>>
-
-  Type parameters require angle brackets:
-  Belt.Map.t<'a>
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/typeConstructorArgs.res:9:28
-
-   7 │ 
-   8 │ type t = option<<node<int>>
-   9 │ type t = option(<node<int>>)
-  10 │ 
-
-  I'm not sure what to parse here when looking at ")".
-
-type nonrec 'a node = {
-  _value: 'a Js.Nullable.value }
-type nonrec 'a t = 'a Belt.Map.t
-type nonrec 'a t = private 'a Belt.Map.t
-type nonrec t = int node option
-type nonrec t = int node option
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/expected/typeVar.res.txt b/jscomp/syntax/tests/parsing/errors/typexpr/expected/typeVar.res.txt
deleted file mode 100644
index 0fdfd2c..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/expected/typeVar.res.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-  Syntax error!
-  tests/parsing/errors/typexpr/typeVar.res:1:15
-
-  1 │ type x<'A> = '_
-  2 │ type x<'A> = 'let
-  3 │ 
-
-  A type variable consists of a singlequote followed by a name like `'a` or `'A`
-
-
-  Syntax error!
-  tests/parsing/errors/typexpr/typeVar.res:2:15-17
-
-  1 │ type x<'A> = '_
-  2 │ type x<'A> = 'let
-  3 │ 
-
-  `let` is a reserved keyword. Keywords need to be escaped: \"let"
-
-type nonrec 'A x = '
-type nonrec 'A x = 'let
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/garbage.res b/jscomp/syntax/tests/parsing/errors/typexpr/garbage.res
deleted file mode 100644
index 678cf96..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/garbage.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@bs.module("moduleName")
-external printName: (~name:?, unit) => unit = "printName"
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/objectSpread.res b/jscomp/syntax/tests/parsing/errors/typexpr/objectSpread.res
deleted file mode 100644
index c4e7db7..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/objectSpread.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type u = {...a, u: int}
-
-type u = private {...a, u: int}
-
-type x = Type({...a, u: int})
-
-type u = {...a, "u": int, v: int}
-
-let f = (x: {a: int, b: int}) => ()
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/typeConstructorArgs.res b/jscomp/syntax/tests/parsing/errors/typexpr/typeConstructorArgs.res
deleted file mode 100644
index a8afa30..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/typeConstructorArgs.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type node<'a> = {
-  _value: Js.Nullable.value('a)
-}
-
-type t<'a> = Belt.Map.t('a)
-type t<'a> = private Belt.Map.t('a)
-
-type t = option<<node<int>>
-type t = option(<node<int>>)
diff --git a/jscomp/syntax/tests/parsing/errors/typexpr/typeVar.res b/jscomp/syntax/tests/parsing/errors/typexpr/typeVar.res
deleted file mode 100644
index e2c6662..0000000
--- a/jscomp/syntax/tests/parsing/errors/typexpr/typeVar.res
+++ /dev/null
@@ -1,2 +0,0 @@
-type x<'A> = '_
-type x<'A> = 'let
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/UncurriedAlways.res b/jscomp/syntax/tests/parsing/grammar/expressions/UncurriedAlways.res
deleted file mode 100644
index 9ddd985..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/UncurriedAlways.res
+++ /dev/null
@@ -1,13 +0,0 @@
-@@uncurried
-
-let foo = (x, y) => x + y
-
-let z = foo(. 3, 4)
-
-let bar = (. x, y) => x + y
-
-let b = bar(3, 4)
-
-let w = 3->foo(4)
-
-let a = 3->foo(. 4)
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/UncurriedByDefault.res b/jscomp/syntax/tests/parsing/grammar/expressions/UncurriedByDefault.res
deleted file mode 100644
index 521b201..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/UncurriedByDefault.res
+++ /dev/null
@@ -1,121 +0,0 @@
-let cApp = foo(3)
-let uApp = foo(. 3)
-
-let cFun = x => 3
-let uFun = (.x) => 3
-let mixFun = (a, .b, c) => (d, e, f) => (g, .h) => 4
-let bracesFun = (. x) => y => x+y
-let cFun2 = (x, y) => 3
-let uFun2 = (. x, y) => 3
-
-type cTyp = string => int
-type uTyp = (. string) => int
-type mixTyp = (string, .string, string) => (string, string, string) => (string, .string) => int
-type bTyp = (. string) => string => int
-type cTyp2 = (string, string) => int
-type uTyp2 = (.string, string) => int
-type cu = unit => int
-type cp = () => int
-type cuu = unit => unit => int
-type cpu = () => unit => int
-type cup = unit => () => int
-type cpp = () => () => int
-type cu2 = (unit, unit) => unit
-type cp2 = ((), ()) => unit
-type uu = (. unit) => int
-type up = (. ()) => int
-type uuu = (. unit) => (. unit) => int
-type upu = (. ()) => (. unit) => int
-type uup = (. unit) => (. ()) => int
-type upp = (. ()) => (. ()) => int
-type uu2 = (. unit, unit) => unit
-type up2 = (. (), ()) => unit
-
-type cnested = (string => unit) => unit
-type unested = (. (. string) => unit) => unit
-
-let uannpoly: (. 'a) => string = xx
-let uannint: (. int) => string = xx
-
-let _ = @att (. x)  => 34
-let _ = @att async (. x)  => 34
-let _ = preserveAttr(@att (. x)  => 34)
-let _ = preserveAttr(@att async (. x)  => 34)
-
-let t0 = (type a b, l: list<a>, x: a) => list{x, ...l}
-let t1 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-let t2 = (type a b, . l: list<a>, x: a) => list{x, ...l}
-let t3 = (. type a b, . l: list<a>, x: a) => list{x, ...l}
-let t4 = (. type a b) => (l: list<a>, x: a) => list{x, ...l}
-let t5 = (type a b) => (. l: list<a>, x: a) => list{x, ...l}
-let t6 = (. type a b) => (. l: list<a>, x: a) => list{x, ...l}
-
-type arrowPath1 = (. int) => string
-type arrowPath2 = (. I.t) => string
-type arrowPath3 = int => string
-type arrowPath4 = I.t => string
-type callback1 = (. ReactEvent.Mouse.t) => unit as 'callback
-type callback2 = (. ReactEvent.Mouse.t) => (unit as 'u)
-type callback3 = ((. ReactEvent.Mouse.t) => unit) as 'callback
-
-@@uncurried.swap
-
-let cApp = foo(. 3)
-let uApp = foo(3)
-
-let cFun = (. x) => 3
-let uFun = x => 3
-let mixFun = (.a) => (b, c) => (.d, e, f) => (.g) => h => 4
-let bracesFun = x => (. y) => x+y
-let cFun2 = (. x, y) => 3
-let uFun2 = (x, y) => 3
-let cFun2Dots = (.x, .y) => 3 // redundant dot on y
-
-type cTyp = (. string) => int
-type uTyp = string => int
-type mixTyp = (.string) => (string, string) => (.string, string, string, string) => string => int
-type bTyp = string => (. string) => int
-type cTyp2 = (.string, string) => int
-type uTyp2 = (string, string) => int
-type cu = (. unit) => int
-type cp = (. ()) => int
-type cuu = (. unit) => (. unit) => int
-type cpu = (. ()) => (. unit) => int
-type cup = (. unit) => (. ()) => int
-type cpp = (. ()) => (. ()) => int
-type cu2 = (. unit, unit) => unit
-type cp2 = (. (), ()) => unit
-type uu = unit => int
-type up = () => int
-type uuu = unit => unit => int
-type upu = () => unit => int
-type uup = unit => () => int
-type upp = () => () => int
-type uu2 = (unit, unit) => unit
-type up2 = ((), ()) => unit
-
-type cnested = (. (. string) => unit) => unit
-type unested = (string => unit) => unit
-
-let pipe1 = 3->f
-
-let uannpoly: 'a => string = xx
-let uannint: int => string = xx
-
-let _ = @att x  => 34
-let _ = @att async x  => 34
-let _ = preserveAttr(@att x => 34)
-let _ = preserveAttr(@att async x => 34)
-
-let t0 = (type a b, l: list<a>, x: a) => list{x, ...l}
-let t1 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-let t2 = (type a b, . l: list<a>, x: a) => list{x, ...l}
-let t3 = (. type a b, . l: list<a>, x: a) => list{x, ...l}
-
-type arrowPath1 = int => string
-type arrowPath2 = I.t => string
-type arrowPath3 = (. int) => string
-type arrowPath4 = (. I.t) => string
-type callback1 = ReactEvent.Mouse.t => unit as 'callback
-type callback2 = ReactEvent.Mouse.t => (unit as 'u)
-type callback3 = (ReactEvent.Mouse.t => unit) as 'callback
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/apply.res b/jscomp/syntax/tests/parsing/grammar/expressions/apply.res
deleted file mode 100644
index 260a5fd..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/apply.res
+++ /dev/null
@@ -1,11 +0,0 @@
-foo(_ => bla, blaz)
-foo((_) => bla, blaz)
-foo((. _) => bla, blaz)
-foo(_ => bla, _ => blaz)
-
-List.map(x => x + 1, myList)
-List.reduce((acc, curr) => acc + curr, 0, myList)
-
-let unitUncurried = apply(.)
-
-call(~a: int)
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/argument.res b/jscomp/syntax/tests/parsing/grammar/expressions/argument.res
deleted file mode 100644
index 23e997b..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/argument.res
+++ /dev/null
@@ -1,13 +0,0 @@
-let foo = (~a) => a(. ()) +. 1.
-let a = (. ()) => 2
-let bar = foo(~a)
-let comparisonResult = compare(. currentNode.value, ~targetValue)
-callback(. firstNode, ~y)
-
-document.createElementWithOptions(. "div", elementProps(~onClick=_ =>
-    Js.log("hello world")
-  ))
-
-
-resolve(.)
-resolve(. ())
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/array.res b/jscomp/syntax/tests/parsing/grammar/expressions/array.res
deleted file mode 100644
index 40afab8..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/array.res
+++ /dev/null
@@ -1,22 +0,0 @@
-let x = [1, 2, 3]
-
-// trailing comma
-let x = [1, 2, 3,]
-
-// with constrained expressions
-let x = [1 :int, (2: int), 3 : int]
-
-// spread
-let x = [4, 5, ...y]
-
-// spread anywhere
-let x = [4, 5, ...y, 7, ...y]
-
-// spread constrained expressions
-let x = [4, 5, ...y: array<int>]
-
-// spread with other variable
-let x = [4, 5, k, ...y]
-
-// the only spread
-let x = [...y]
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/arrow.res b/jscomp/syntax/tests/parsing/grammar/expressions/arrow.res
deleted file mode 100644
index 3b48ffa..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/arrow.res
+++ /dev/null
@@ -1,110 +0,0 @@
-let f = x => x + 1
-
-let f = _ => Js.log("test")
-
-let f = () => Js.log("unit")
-
-// pattern
-let f = (Reducer(inst, comp)) => inst.render(comp)
-let f = (Instance) => ()
-let f = (a, b) => a + b
-let f = (1, 2) => ()
-let f = ("stringPattern") => ()
-let f = ("stringPattern", "stringPattern") => ()
-let f = (()) => ()
-let f = ((a: int), (b: int)) => a + b
-let f = (_, _) => ()
-let f = ([a, b], [c, d]) => a + b  + c + d
-let f = ({a}) => a + 1
-let f = ({a, b}, {c, d}) => a + b + c + d
-// let f = ((a,)) => a + 1
-let f = ((a, b)) => a + b
-let f = ((a, b), (c, d)) => a + b + c + d
-let f = (exception Terminate) => ()
-let f = (exception Terminate, exception Exit) => ()
-let f = (lazy x) => ()
-let f = (lazy x, lazy y) => ()
-let f = (list{}) => ()
-let f = (list{x, ...xs}) => x + xs->Belt.List.length
-
-// constrained pattern
-let f = (x: int, y: int) => x + y
-
-// ~labelName
-let f = (~a, ~b) => a + b
-
-// ~labelName as pattern
-let f = (~a as x, ~b as y) => x + y
-
-// ~ labelName as pattern : type
-let f = (~a as x : int , ~b as y : int) => x + y
-
-// ~ labelName = expr
-let f = (~a=1, ~b=2, c) => a + b + c
-
-// ~ labelName as pattern = expr
-let f = (~a as x=1, ~b as y=2, c) => x + y + c
-
-// ~ labelName as pattern : type = expr
-let f = (~a as x: int=1, ~b as y: int=2, c) => x + y + c
-
-// ~ labelName = ?
-let f = (~a=?, ~b=?, c) => switch (a, b) {
-| (Some(a), Some(b)) => a + b + c
-| _ => 3
-}
-
-// ~ labelName as pattern = ?
-let f = (~a as x=?, ~b as y=?, c) => switch (x, y) {
-| (Some(a), Some(b)) => a + b + c
-| _ => 3
-}
-
-// ~ labelName as pattern : type = ?
-let f = (~a as x : option<int>=?, ~b as y : option<int>=?, c) => switch (x, y) {
-| (Some(a), Some(b)) => a + b + c
-| _ => 3
-}
-
-// trailing comma
-let f = (a, b,) => a + b
-
-let f = (.) => ()
-let f = (. ()) => ()
-let f = (. a, b, c) => ()
-let f = (. a, b, . c, d) => ()
-let f = (. a, . b, .c) => ()
-let f = (. @attr ~a, b, . @attr ~c, d) => ()
-let f = (. @attr ~a, @attrOnB b, . @attr ~c, @attrOnD d) => ()
-
-let f = list => list()
-
-switch colour {
-| Red
-  // don't pick this up as es6 arrow
-  when l == l' || (Clflags.classic.contents && (l == Nolabel && !is_optional(l'))) => (t1, t2)
-| _ => ()
-}
-
-let arr = [_ => doThings(), _ => doThings(), _ => doThings()]
-let list = list{_ => doThings(), _ => doThings(), _ => doThings()}
-let tuple = (_ => doThings(), _ => doThings(), _ => doThings())
-
-_ => doThings()
-
-let x = Constructore(_ => copyChecklistItemCB(), _ => copyChecklistItemCB())
-let y = #Constructore(_ => copyChecklistItemCB(), _ => copyChecklistItemCB())
-
-let f = (list) => list + 1
-
-let foo = ((): unit)
-
-type u = unit
-let un = (():u)
-
-type d<'a,'b> = ('a,'b)
-let c = (): d<'a,'b> => (1,2)
-
-let fn = f => f;
-type f = int => unit;
-let a = fn(_ => (): f);
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/async.res b/jscomp/syntax/tests/parsing/grammar/expressions/async.res
deleted file mode 100644
index 0a499ba..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/async.res
+++ /dev/null
@@ -1,37 +0,0 @@
-let greetUser = async (userId) => {
-  let name = await getUserName(. userId)  
-  "Hello " ++ name ++ "!"
-}
-
-async () => 123
-
-let fetch = {
-    async (. url) => browserFetch(. url)
-}
-
-let fetch2 = {
-    async (. url) => browserFetch(. url)
-    async (. url) => browserFetch2(. url)
-}
-
-// don't parse async es6 arrow
-let async = {
-    let f = async()
-    ()->async
-    async()
-    async.async
-
-    {async: async[async]}
-
-    result->async->mapAsync(a => doStuff(a))
-}
-
-let f = isPositive ? (async (a, b) : int => a + b) : async (c, d) : int => c - d
-
-let foo = async(~a=34)
-let bar = async(~a)=>a+1
-
-let ex1 = await 3 + await 4
-let ex2 = await 3 ** await 4
-let ex3 = await foo->bar(~arg)
-let ex4 = await foo.bar.baz
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/await.res b/jscomp/syntax/tests/parsing/grammar/expressions/await.res
deleted file mode 100644
index 71224c5..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/await.res
+++ /dev/null
@@ -1,52 +0,0 @@
-await wait(2)
-
-let maybeSomeValue = switch await fetchData(url) {    
-| data => Some(data)
-| exception JsError(_) => None
-}
-
-let x = await 1 + 2
-
-let x = await wait(1) + await wait(2)
-
-let () = {
-  let response = await fetch("/users.json"); // get users list
-  let users = await response.json(); // parse JSON
-  let comments = (await (await fetch("comment.json")).json())[0];
-  Js.log2(users, comments)
-}
-
-let () = {
-    await delay(10)
-}
-
-let () = {
-    await delay(10)
-    await delay(20)
-}
-
-let forEach = await @a @b Js.Import(Belt.List.forEach)
-
-module M = await @a @b Belt.List
-
-let f = () => {
-  module M = await @a @b Belt.List
-  M.forEach
-}
-
-let () = {
-  module M = await @a @b Belt.List
-  M.forEach
-}
-
-module type BeltList = module type of Belt.List
-
-let f = () => {
-  module M = await @a @b (Belt.List: BeltList)
-  M.forEach
-}
-
-let () = {
-  module M = await @a @b (Belt.List: BeltList)
-  M.forEach
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/bigint.res b/jscomp/syntax/tests/parsing/grammar/expressions/bigint.res
deleted file mode 100644
index e1fbc64..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/bigint.res
+++ /dev/null
@@ -1,13 +0,0 @@
-1n / 2n
-
-3n * 4n
-
-2n ** 2n
-
-10n + 54
-
-289n - 138n
-
-0100n
-001_000_000n
--000100n
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/binary.res b/jscomp/syntax/tests/parsing/grammar/expressions/binary.res
deleted file mode 100644
index 32cc091..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/binary.res
+++ /dev/null
@@ -1,47 +0,0 @@
-node := if newBalance === 2 {
-  avl->rotateRight(node)
-} else {
-  node 
-}
-
-
-// with attributes
-node :=
-  @attr
-  if newBalance === 2 {
-    avl->rotateRight(node)
-  } else {
-    node 
-  }
-
-let x = z |> switch z {| _ => false} 
-let x = z |> @attr switch z {| _ => false} 
-let x = z |> assert(z)
-let x = z |> @attr assert(z)
-let x = z |> lazy z
-let x = z |> @attr lazy z
-let x = z |> try sideEffect() catch { | _ => f() }
-let x = z |> @attr try sideEffect() catch { | _ => f() }
-let x = z |> for i in 0 to 10 { () }
-let x = z |> @attr for i in 0 to 10 { () }
-let x = z |> while condition { () }
-let x = z |> @attr while condition { () }
-
-let x = a + -1 + -2
-let x = a + @attr -1 + @attr -2
-
-// should be interpreted as binary expression not prefix op
-let x = a -b
-let x = a -.b
-
-// not binary expr
-Constructor(a, b)
-#Constructor(a, b)
-
-let _ = {
-  Constructor(a, b)
-  #Constructor(a, b)
-}
-
-library.getBalance(. account)
-->Promise.Js.catch(_ => {Promise.resolved(None)})
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/binaryNoEs6Arrow.res b/jscomp/syntax/tests/parsing/grammar/expressions/binaryNoEs6Arrow.res
deleted file mode 100644
index 59988ac..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/binaryNoEs6Arrow.res
+++ /dev/null
@@ -1,48 +0,0 @@
-// es6 arrow shouldn't be picked up here
-if color === Black && (sibling === None || parent === None) {
-  ()
-}
-
-if color === Black && color !== Red && (sibling === None || parent === None) {
-  ()
-}
-
-switch color === Black && (sibling === None || parent === None) {
-| _ =>  ()
-}
-
-switch color === Black && color !== Red && (sibling === None || parent === None) {
-| _ =>  ()
-}
-
-try color === Black && (sibling === None || parent === None) catch {
-| _ =>  ()
-}
-
-try color === Black && color === Red && (sibling === None || parent === None) catch {
-| _ =>  ()
-}
-
-while color === Black && (sibling === None || parent === None) {
-  ()
-}
-
-while color === Black && color === Red && (sibling === None || parent === None) {
-  ()
-}
-
-<div
-  onClick={event => {
-    switch videoContainerRect {
-    | Some(videoContainerRect) =>
-      // should not be picked up as es6 function
-      let newChapter = ({startTime: percent *. duration}: Video.chapter)
-      {a, b}->onChange
-    | _ => ()
-    }
-  }}
-/>
-
-if inclusions[index] = (uid, url) {
-  onChange(inclusions)
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/block.res b/jscomp/syntax/tests/parsing/grammar/expressions/block.res
deleted file mode 100644
index f652eca..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/block.res
+++ /dev/null
@@ -1,159 +0,0 @@
-let b = {
-  module Array = Belt.Array
-  [1, 2]
-  ->Array.map(x => x + 1)
-  ->Js.log
-}
-
-let b = {
-  open Belt.Array
-  [1, 2]
-  ->map(x => x + 1)
-  ->Js.log
-}
-
-let b = {
-  exception QuitEarly
-  raise(QuitEarly)
-}
-
-// let-bindings
-let b = {
-  let a = 1
-  let b = 2
-  a + b
-}
-
-let b = {
-  let _ = sideEffect();
-}
-
-let b = {
-  let _ = sideEffect() // no semi
-}
-
-let b = {
-  a()
-  b()
-  c()
-}
-
-let b = {
-  a()
-  b()
-  let a = 1
-  f(a)
-}
-
-let b = {
-  let a = 1
-  let b = 2
-}
-
-// parse semicolons
-let b = {
-  module Array = Belt.Array;
-  open Array;
-  exception Terminate(int);
-  let a = 1;
-  let b = 2;
-  sideEffect();
-  let x = (1 + 2)->(x => x + 1);
-  raise(Terminate(x)); 
-}
-
-let b = {
-  f()
-  g()
-  h()
-  let arr = [1, 2, 3]
-}
-
-let res = {
-  let a = "a starts out as"
-  {
-    print_string(a)
-    let a = 20
-    print_int(a)
-  }
-  print_string(a)
-}
-
-let res = {
-  let a = "first its a string"
-  let a = 20
-  print_int(a)
-  print_int(a)
-  print_int(a)
-}
-
-let res = {
-  let a = "a is always a string"
-  print_string(a)
-  let b = 30
-  print_int(b)
-}
-
-let nestedLet = {
-  let _ = 1
-  ()
-}
-
-let nestedLet = {
-  let _ = 1
-  2
-}
-
-let init = () => {
-  foo(
-    1===1
-  )
-  %assert(1 === 2)
-}
-
-let init = () => {
-  %assert(1 === 2)
-  foo(
-    1===1
-  )
-  %assert(1 === 2)
-}
-
-let f = () => {
-  let x = 1
-  _ => ()
-}
-
-let reifyStyle = (type a, x: 'a): (style<a>, a) => {
-  module Internal = {
-    type rec constructor
-    @bs.val external canvasGradient: constructor = "CanvasGradient" /* internal */
-    @bs.val external canvasPattern: constructor = "CanvasPattern" /* internal */
-    let instanceOf = (
-      %bs.raw(`function(x,y) {return +(x instanceof y)}`): ('a, constructor) => bool
-    ) /* internal */
-  }
-
-  // This not a module application
-  (
-    if Js.typeof(x) == "string" {
-      Obj.magic(String)
-    } else if Internal.instanceOf(x, Internal.canvasGradient) {
-      Obj.magic(Gradient)
-    } else if Internal.instanceOf(x, Internal.canvasPattern) {
-      Obj.magic(Pattern)
-    } else {
-      raise(
-        Invalid_argument(
-          "Unknown canvas style kind. Known values are: String, CanvasGradient, CanvasPattern",
-        ),
-      )
-    },
-    Obj.magic(x),
-  )
-}
-
-let calc_fps = (t0, t1) => {
-  let delta = (t1 -. t0) /. 1000.
-  1. /. delta
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/bracedOrRecord.res b/jscomp/syntax/tests/parsing/grammar/expressions/bracedOrRecord.res
deleted file mode 100644
index 65f2dfa..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/bracedOrRecord.res
+++ /dev/null
@@ -1,57 +0,0 @@
-// record
-let r = {...expr, pexp_attributes: []}
-let r = {a,}
-let r = {a: expr}
-let r = {a: expr,}
-let r = {a: expr, b: expr2}
-let r = {f: x => x + b}
-
-// expression
-let e = {a}
-let e = {a;}
-let e = {a; b()}
-
-// unary expr
-let e = {-a}
-// binary expr
-let e = {a + b}
-// ternary
-let e = {a ? true : false}
-let e = {a |> computation ? true : false}
-// primary expr
-let e = {a[0]}
-let e = {f(b)}
-let e = {a.b.c}
-let e = {arr[x] = 20}
-
-// es6 arrow
-let e = {
-  x => x + 1 |> doStuff(config)
-}
-
-let e = {
-  (x => x + 1) |> doStuff(config)
-}
-
-let e = {
-  (x => x + 1) ? true : false
-}
-
-
-let e = {
-  (x => x + 1) |> sideEffect
-  logToAnalytics(Shady.ml)
-}
-
-let f = {(event) => event.target.value}
-let f = {(event) :string => event.target.value}
-
-// block expression
-let x = {
-  let a = 1
-  let b = 2
-  a + b
-}
-
-// interpret strings correct
-<> {"\n"->React.string} </>
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/bsObject.res b/jscomp/syntax/tests/parsing/grammar/expressions/bsObject.res
deleted file mode 100644
index 4acc413..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/bsObject.res
+++ /dev/null
@@ -1,31 +0,0 @@
-let zero = 0
-
-let x = {"age": 30}
-let y = {"age": 30,}
-let y = {"age": 30, "name": "steve"}
-let y = {"age": 30, "name": "steve",}
-let z = {"\xff": 1, "\u2212": "two", "\0": zero, "\o123": "o123"}
-
-// don't confuse with start of block expr
-let x = {"age"}
-let x = {"age"[0] } // doesn't make sense in practise
-let x = {"age"->Js.log}
-let x = {"age" ? true : false}
-let x = {
-  "age"->Js.log
-  let foo = 1
-  let bar = 2
-  foo + bar
-}
-let x = {
-  "age" ? true : false
-  let foo = 1
-  let bar = 2
-  foo + bar
-}
-let x = {
-  "age"[0] // doesn't make sense in practise
-  let foo = 1
-  let bar = 2
-  foo + bar
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/coerce.res b/jscomp/syntax/tests/parsing/grammar/expressions/coerce.res
deleted file mode 100644
index f2bd210..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/coerce.res
+++ /dev/null
@@ -1,11 +0,0 @@
-let foo = (x:int) => (x :> int)
-
-let foo = x => (x : t :> int)
-
-let _ = (x : int)
-
-let foo = (x : int, y :> float)
-
-let foo = (x : int, y :> float, z :> int)
-
-let foo = (x : int, y, z :> int)
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/constants.res b/jscomp/syntax/tests/parsing/grammar/expressions/constants.res
deleted file mode 100644
index d26f6c3..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/constants.res
+++ /dev/null
@@ -1,90 +0,0 @@
-let x = true
-let y = false
-
-let txt = "a string"
-
-let txtWithEscapedChar = "foo\nbar"
-
-let number = 1
-
-let template = `amazing
-  multine
-  template
-     string
-`
-
-
-let complexNumber = 1.6
-let x = 0b0000_0001
-
-let int32 = 42l
-let int64 = 42L
-
-let x = -44.20e99
-let x = -44.20_34e99
-let x = -44.20e+9
-let x = -44.20e-9
-let x = -44.20e-99_99
-let x = -444_444.20e99
-let x = 44.20e99
-let x = 44.20_34e99
-let x = 44.20e+9
-let x = 44.20e-9
-let x = 44.20e-99_99
-let x = 44e99
-let x = 44_44e99
-
-let x = 0x0
-let x = 0X0
-
-let x = 0xAA
-let x = 0XA_A
-let x = 0xAA.ff
-let x = 0xAA.ff_ff
-let x = 0xAA.ff_ffp10
-let x = 0xAA.ff_ffp+10
-let x = 0xAA.ff_ffp-10
-let x = 0xAA.ff_ffp100_00
-let x = 0xAA.ff_ffp+100_00
-let x = 0xAA.ff_ffp-100_00
-
-let x = 'a' // char
-let x = '\\'
-let x = '\''
-let x = '\n'
-let x = '\t'
-let x = '\b'
-let x = '\r'
-let x = ' '
-let x = '\xAA'
-
-let () = {
-  getResult()
-  -10
-}
-
-let x = "foo\0bar"
-let x = "foo\x0Abar"
-let x = "\\abc"
-let x = "\'bar"
-let x = "\nbar"
-let x = "\tbar"
-let x = "\bbar"
-let x = "\rbar"
-let x = "\ bar"
-let x = "\u00A9"
-let x = "\u00a9"
-let x = "\u2665"
-let a = "\u{000000000061}"
-let x = "\u{00A9}"
-let x = "\u{00a9}"
-let x = "\oAAA" // same as "oAAA" since \o is not a valid escape
-let x = "\m" // same as "m" since \m is not a valid escape
-let smile = "\u{1F600}"
-let smile = "\u{1f600}"
-
-// represent the same thing
-let u = "日本語" 
-let u = "\u65e5\u672c\u8a9e"
-let u = "\u{000065e5}\u{0000672c}\u{00008a9e}"
-let u = "\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e"
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/constructor.res b/jscomp/syntax/tests/parsing/grammar/expressions/constructor.res
deleted file mode 100644
index fe47a0d..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/constructor.res
+++ /dev/null
@@ -1,12 +0,0 @@
-let x = Red
-
-let y = Colors.Blue
-
-// sugar for Rgb(())
-let z = Rgb()
-
-let v = Vertex(1., 2., 3., 4.)
-
-let colour = Shades.Colors.White
-
-let u = ()
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/es6template.res b/jscomp/syntax/tests/parsing/grammar/expressions/es6template.res
deleted file mode 100644
index a110baf..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/es6template.res
+++ /dev/null
@@ -1,54 +0,0 @@
-let s = `foo`
-
-let s = `multi
-  line
-
-string
-`
-
-let s = `${foo}`
-
-let s = `before${foo}`
-let s = `before ${foo}`
-let s = `before  ${foo}`
-
-let s = `${foo}after`
-let s = `${foo} after`
-let s = `${foo}  after`
-
-let s = `${foo}${bar}`
-let s = `${foo}${bar}${baz}`
-
-let s = `${foo} ${bar}`
-let s = `${foo} ${bar} ${baz}`
-
-let s = ` before ${foo} ${bar} after `
-let s = `before ${foo} middle ${bar} ${baz} wow `
-
-let s = `
-  multiline
-
-  es6
-
-  template
-
-  expression
-
-  so convenient
-
-  :)
-`
-
-let s = `$dollar without $braces $interpolation`
-
-let s = json`null`
-
-let x = `foo\`bar\$\\foo`
-let x = `foo\`bar\$\\foo${a} \` ${b} \` xx`
-
-let thisIsFine = `$something`
-let thisIsAlsoFine = `fine\$`
-let isThisFine = `shouldBeFine$`
-
-`$${dollarAmountInt}`
-`\$${dollarAmountInt}`
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/UncurriedAlways.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/UncurriedAlways.res.txt
deleted file mode 100644
index da66696..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/UncurriedAlways.res.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-[@@@uncurried ]
-let foo = ((Function$ (fun x -> fun y -> x + y))[@res.arity 2])
-let z = ((foo 3 4)[@res.uapp ])
-let bar = ((Function$ (fun x -> fun y -> x + y))[@res.arity 2])
-let b = ((bar 3 4)[@res.uapp ])
-let w = 3 |.u ((foo 4)[@res.uapp ])
-let a = 3 |.u ((foo 4)[@res.uapp ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/UncurriedByDefault.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/UncurriedByDefault.res.txt
deleted file mode 100644
index 189d34b..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/UncurriedByDefault.res.txt
+++ /dev/null
@@ -1,174 +0,0 @@
-let cApp = foo 3
-let uApp = ((foo 3)[@res.uapp ])
-let cFun x = 3
-let uFun = ((Function$ (fun x -> 3))[@res.arity 1])
-let mixFun a =
-  ((Function$
-      (fun b ->
-         fun c ->
-           ((fun d ->
-               fun e ->
-                 fun f -> fun g -> ((Function$ (fun h -> 4))[@res.arity 1]))
-           [@res.braces ])))
-  [@res.arity 2])
-let bracesFun = ((Function$ (fun x -> ((fun y -> x + y)[@res.braces ])))
-  [@res.arity 1])
-let cFun2 x y = 3
-let uFun2 = ((Function$ (fun x -> fun y -> 3))[@res.arity 2])
-type nonrec cTyp = string -> int
-type nonrec uTyp = (string -> int, [ `Has_arity1 ]) function$
-type nonrec mixTyp =
-  string ->
-    (string ->
-       string ->
-         string ->
-           string ->
-             string -> string -> (string -> int, [ `Has_arity1 ]) function$,
-      [ `Has_arity2 ]) function$
-type nonrec bTyp = (string -> string -> int, [ `Has_arity1 ]) function$
-type nonrec cTyp2 = string -> string -> int
-type nonrec uTyp2 = (string -> string -> int, [ `Has_arity2 ]) function$
-type nonrec cu = unit -> int
-type nonrec cp = unit -> int
-type nonrec cuu = unit -> unit -> int
-type nonrec cpu = unit -> unit -> int
-type nonrec cup = unit -> unit -> int
-type nonrec cpp = unit -> unit -> int
-type nonrec cu2 = unit -> unit -> unit
-type nonrec cp2 = unit -> unit -> unit
-type nonrec uu = (unit -> int, [ `Has_arity1 ]) function$
-type nonrec up = (unit -> int, [ `Has_arity1 ]) function$
-type nonrec uuu =
-  (unit -> (unit -> int, [ `Has_arity1 ]) function$, [ `Has_arity1 ])
-    function$
-type nonrec upu =
-  (unit -> (unit -> int, [ `Has_arity1 ]) function$, [ `Has_arity1 ])
-    function$
-type nonrec uup =
-  (unit -> (unit -> int, [ `Has_arity1 ]) function$, [ `Has_arity1 ])
-    function$
-type nonrec upp =
-  (unit -> (unit -> int, [ `Has_arity1 ]) function$, [ `Has_arity1 ])
-    function$
-type nonrec uu2 = (unit -> unit -> unit, [ `Has_arity2 ]) function$
-type nonrec up2 = (unit -> unit -> unit, [ `Has_arity2 ]) function$
-type nonrec cnested = (string -> unit) -> unit
-type nonrec unested =
-  ((string -> unit, [ `Has_arity1 ]) function$ -> unit, [ `Has_arity1 ])
-    function$
-let (uannpoly : ('a -> string, [ `Has_arity1 ]) function$) = xx
-let (uannint : (int -> string, [ `Has_arity1 ]) function$) = xx
-let _ = ((Function$ ((fun x -> 34)[@att ]))[@res.arity 1])
-let _ = ((Function$ ((fun x -> 34)[@res.async ][@att ]))[@res.arity 1])
-let _ = preserveAttr ((Function$ ((fun x -> 34)[@att ]))[@res.arity 1])
-let _ =
-  preserveAttr ((Function$ ((fun x -> 34)[@res.async ][@att ]))
-    [@res.arity 1])
-let t0 (type a) (type b) (l : a list) (x : a) = x :: l
-let t1 (type a) (type b) =
-  ((Function$ (fun (l : a list) -> fun (x : a) -> x :: l))[@res.arity 2])
-let t2 (type a) (type b) =
-  ((Function$ (fun (l : a list) -> fun (x : a) -> x :: l))[@res.arity 2])
-let t3 (type a) (type b) =
-  ((Function$ (fun (l : a list) -> fun (x : a) -> x :: l))[@res.arity 2])
-let t4 (type a) (type b) (l : a list) (x : a) = x :: l
-let t5 (type a) (type b) =
-  ((Function$ (fun (l : a list) -> fun (x : a) -> x :: l))[@res.arity 2])
-let t6 (type a) (type b) =
-  ((Function$ (fun (l : a list) -> fun (x : a) -> x :: l))[@res.arity 2])
-type nonrec arrowPath1 = (int -> string, [ `Has_arity1 ]) function$
-type nonrec arrowPath2 = (I.t -> string, [ `Has_arity1 ]) function$
-type nonrec arrowPath3 = int -> string
-type nonrec arrowPath4 = I.t -> string
-type nonrec callback1 =
-  (ReactEvent.Mouse.t -> unit, [ `Has_arity1 ]) function$ as 'callback
-type nonrec callback2 =
-  (ReactEvent.Mouse.t -> unit as 'u, [ `Has_arity1 ]) function$
-type nonrec callback3 =
-  (ReactEvent.Mouse.t -> unit, [ `Has_arity1 ]) function$ as 'callback
-[@@@uncurried.swap ]
-let cApp = foo 3
-let uApp = ((foo 3)[@res.uapp ])
-let cFun x = 3
-let uFun = ((Function$ (fun x -> 3))[@res.arity 1])
-let mixFun a =
-  ((Function$
-      (fun b ->
-         fun c ->
-           ((fun d ->
-               fun e ->
-                 fun f -> fun g -> ((Function$ (fun h -> 4))[@res.arity 1]))
-           [@res.braces ])))
-  [@res.arity 2])
-let bracesFun = ((Function$ (fun x -> ((fun y -> x + y)[@res.braces ])))
-  [@res.arity 1])
-let cFun2 x y = 3
-let uFun2 = ((Function$ (fun x -> fun y -> 3))[@res.arity 2])
-let cFun2Dots x y = 3
-type nonrec cTyp = string -> int
-type nonrec uTyp = (string -> int, [ `Has_arity1 ]) function$
-type nonrec mixTyp =
-  string ->
-    (string ->
-       string ->
-         string ->
-           string ->
-             string -> string -> (string -> int, [ `Has_arity1 ]) function$,
-      [ `Has_arity2 ]) function$
-type nonrec bTyp = (string -> string -> int, [ `Has_arity1 ]) function$
-type nonrec cTyp2 = string -> string -> int
-type nonrec uTyp2 = (string -> string -> int, [ `Has_arity2 ]) function$
-type nonrec cu = unit -> int
-type nonrec cp = unit -> int
-type nonrec cuu = unit -> unit -> int
-type nonrec cpu = unit -> unit -> int
-type nonrec cup = unit -> unit -> int
-type nonrec cpp = unit -> unit -> int
-type nonrec cu2 = unit -> unit -> unit
-type nonrec cp2 = unit -> unit -> unit
-type nonrec uu = (unit -> int, [ `Has_arity1 ]) function$
-type nonrec up = (unit -> int, [ `Has_arity1 ]) function$
-type nonrec uuu =
-  (unit -> (unit -> int, [ `Has_arity1 ]) function$, [ `Has_arity1 ])
-    function$
-type nonrec upu =
-  (unit -> (unit -> int, [ `Has_arity1 ]) function$, [ `Has_arity1 ])
-    function$
-type nonrec uup =
-  (unit -> (unit -> int, [ `Has_arity1 ]) function$, [ `Has_arity1 ])
-    function$
-type nonrec upp =
-  (unit -> (unit -> int, [ `Has_arity1 ]) function$, [ `Has_arity1 ])
-    function$
-type nonrec uu2 = (unit -> unit -> unit, [ `Has_arity2 ]) function$
-type nonrec up2 = (unit -> unit -> unit, [ `Has_arity2 ]) function$
-type nonrec cnested = (string -> unit) -> unit
-type nonrec unested =
-  ((string -> unit, [ `Has_arity1 ]) function$ -> unit, [ `Has_arity1 ])
-    function$
-let pipe1 = 3 |.u f
-let (uannpoly : ('a -> string, [ `Has_arity1 ]) function$) = xx
-let (uannint : (int -> string, [ `Has_arity1 ]) function$) = xx
-let _ = ((Function$ ((fun x -> 34)[@att ]))[@res.arity 1])
-let _ = ((Function$ ((fun x -> 34)[@res.async ][@att ]))[@res.arity 1])
-let _ = ((preserveAttr ((Function$ ((fun x -> 34)[@att ]))[@res.arity 1]))
-  [@res.uapp ])
-let _ =
-  ((preserveAttr ((Function$ ((fun x -> 34)[@res.async ][@att ]))
-      [@res.arity 1]))
-  [@res.uapp ])
-let t0 (type a) (type b) =
-  ((Function$ (fun (l : a list) -> fun (x : a) -> x :: l))[@res.arity 2])
-let t1 (type a) (type b) (l : a list) (x : a) = x :: l
-let t2 (type a) (type b) (l : a list) (x : a) = x :: l
-let t3 (type a) (type b) (l : a list) (x : a) = x :: l
-type nonrec arrowPath1 = (int -> string, [ `Has_arity1 ]) function$
-type nonrec arrowPath2 = (I.t -> string, [ `Has_arity1 ]) function$
-type nonrec arrowPath3 = int -> string
-type nonrec arrowPath4 = I.t -> string
-type nonrec callback1 =
-  (ReactEvent.Mouse.t -> unit, [ `Has_arity1 ]) function$ as 'callback
-type nonrec callback2 =
-  (ReactEvent.Mouse.t -> unit as 'u, [ `Has_arity1 ]) function$
-type nonrec callback3 =
-  (ReactEvent.Mouse.t -> unit, [ `Has_arity1 ]) function$ as 'callback
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/apply.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/apply.res.txt
deleted file mode 100644
index e6a0aa7..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/apply.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-;;foo (fun _ -> bla) blaz
-;;foo (fun _ -> bla) blaz
-;;foo ((Function$ (fun _ -> bla))[@res.arity 1]) blaz
-;;foo (fun _ -> bla) (fun _ -> blaz)
-;;List.map (fun x -> x + 1) myList
-;;List.reduce (fun acc -> fun curr -> acc + curr) 0 myList
-let unitUncurried = ((apply ())[@res.uapp ])
-;;call ~a:(((((a)[@res.namedArgLoc ]) : int))[@res.namedArgLoc ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/argument.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/argument.res.txt
deleted file mode 100644
index 5e176ba..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/argument.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-let foo ~a:((a)[@res.namedArgLoc ])  =
-  ((a (let __res_unit = () in __res_unit))[@res.uapp ]) +. 1.
-let a = ((Function$ (fun () -> 2))[@res.arity 1])
-let bar = foo ~a:((a)[@res.namedArgLoc ])
-let comparisonResult =
-  ((compare currentNode.value ~targetValue:((targetValue)[@res.namedArgLoc ]))
-  [@res.uapp ])
-;;((callback firstNode ~y:((y)[@res.namedArgLoc ]))[@res.uapp ])
-;;((document.createElementWithOptions {js|div|js}
-      (elementProps ~onClick:((fun _ -> Js.log {js|hello world|js})
-         [@res.namedArgLoc ])))[@res.uapp ])
-;;((resolve ())[@res.uapp ])
-;;((resolve (let __res_unit = () in __res_unit))[@res.uapp ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/array.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/array.res.txt
deleted file mode 100644
index 3c21a9a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/array.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-let x = [|1;2;3|]
-let x = [|1;2;3|]
-let x = [|(1 : int);(2 : int);(3 : int)|]
-let x = ((Belt.Array.concatMany)[@res.spread ]) [|[|4;5|];y|]
-let x = ((Belt.Array.concatMany)[@res.spread ]) [|[|4;5|];y;[|7|];y|]
-let x = ((Belt.Array.concatMany)[@res.spread ]) [|[|4;5|];(y : int array)|]
-let x = ((Belt.Array.concatMany)[@res.spread ]) [|[|4;5;k|];y|]
-let x = ((Belt.Array.concatMany)[@res.spread ]) [|y|]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/arrow.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/arrow.res.txt
deleted file mode 100644
index c907472..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/arrow.res.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-let f x = x + 1
-let f _ = Js.log {js|test|js}
-let f () = Js.log {js|unit|js}
-let f (Reducer (inst, comp)) = inst.render comp
-let f (Instance) = ()
-let f a b = a + b
-let f 1 2 = ()
-let f {js|stringPattern|js} = ()
-let f {js|stringPattern|js} {js|stringPattern|js} = ()
-let f () = ()
-let f (a : int) (b : int) = a + b
-let f _ _ = ()
-let f [|a;b|] [|c;d|] = ((a + b) + c) + d
-let f { a } = a + 1
-let f { a; b } { c; d } = ((a + b) + c) + d
-let f (a, b) = a + b
-let f (a, b) (c, d) = ((a + b) + c) + d
-let f exception Terminate = ()
-let f exception Terminate exception Exit = ()
-let f (lazy x) = ()
-let f (lazy x) (lazy y) = ()
-let f [] = ()
-let f (x::xs) = x + (xs |. Belt.List.length)
-let f (x : int) (y : int) = x + y
-let f ~a:((a)[@res.namedArgLoc ])  ~b:((b)[@res.namedArgLoc ])  = a + b
-let f ~a:((x)[@res.namedArgLoc ])  ~b:((y)[@res.namedArgLoc ])  = x + y
-let f ~a:(((x : int))[@res.namedArgLoc ]) 
-  ~b:(((y : int))[@res.namedArgLoc ])  = x + y
-let f ?a:(((a)[@res.namedArgLoc ])= 1)  ?b:(((b)[@res.namedArgLoc ])= 2)  c =
-  (a + b) + c
-let f ?a:(((x)[@res.namedArgLoc ])= 1)  ?b:(((y)[@res.namedArgLoc ])= 2)  c =
-  (x + y) + c
-let f ?a:((((x : int))[@res.namedArgLoc ])= 1) 
-  ?b:((((y : int))[@res.namedArgLoc ])= 2)  c = (x + y) + c
-let f ?a:((a)[@res.namedArgLoc ])  ?b:((b)[@res.namedArgLoc ])  c =
-  match (a, b) with | (Some a, Some b) -> (a + b) + c | _ -> 3
-let f ?a:((x)[@res.namedArgLoc ])  ?b:((y)[@res.namedArgLoc ])  c =
-  match (x, y) with | (Some a, Some b) -> (a + b) + c | _ -> 3
-let f ?a:(((x : int option))[@res.namedArgLoc ]) 
-  ?b:(((y : int option))[@res.namedArgLoc ])  c =
-  match (x, y) with | (Some a, Some b) -> (a + b) + c | _ -> 3
-let f a b = a + b
-let f = ((Function$ (fun () -> ()))[@res.arity 1])
-let f = ((Function$ (fun () -> ()))[@res.arity 1])
-let f = ((Function$ (fun a -> fun b -> fun c -> ()))[@res.arity 3])
-let f =
-  ((Function$
-      (fun a -> fun b -> ((Function$ (fun c -> fun d -> ()))[@res.arity 2])))
-  [@res.arity 2])
-let f =
-  ((Function$
-      (fun a ->
-         ((Function$ (fun b -> ((Function$ (fun c -> ()))[@res.arity 1])))
-         [@res.arity 1])))
-  [@res.arity 1])
-let f =
-  ((Function$
-      (fun ~a:((a)[@res.namedArgLoc ][@attr ]) ->
-         fun b ->
-           ((Function$
-               (fun ~c:((c)[@res.namedArgLoc ][@attr ]) -> fun d -> ()))
-           [@res.arity 2])))
-  [@res.arity 2])
-let f =
-  ((Function$
-      (fun ~a:((a)[@res.namedArgLoc ][@attr ]) ->
-         fun ((b)[@attrOnB ]) ->
-           ((Function$
-               (fun ~c:((c)[@res.namedArgLoc ][@attr ]) ->
-                  fun ((d)[@attrOnD ]) -> ()))
-           [@res.arity 2])))
-  [@res.arity 2])
-let f list = list ()
-;;match colour with
-  | Red when
-      (l = l') ||
-        (Clflags.classic.contents &&
-           ((l = Nolabel) && (not (is_optional l'))))
-      -> (t1, t2)
-  | _ -> ()
-let arr =
-  [|((fun _ -> doThings ()));((fun _ -> doThings ()));((fun _ -> doThings ()))|]
-let list =
-  [(fun _ -> doThings ()); (fun _ -> doThings ()); (fun _ -> doThings ())]
-let tuple =
-  ((fun _ -> doThings ()), (fun _ -> doThings ()), (fun _ -> doThings ()))
-;;fun _ -> doThings ()
-let x =
-  Constructore
-    ((fun _ -> copyChecklistItemCB ()), (fun _ -> copyChecklistItemCB ()))
-let y =
-  `Constructore
-    ((fun _ -> copyChecklistItemCB ()), (fun _ -> copyChecklistItemCB ()))
-let f list = list + 1
-let foo = (() : unit)
-type nonrec u = unit
-let un = (() : u)
-type nonrec ('a, 'b) d = ('a * 'b)
-let c () = ((1, 2) : ('a, 'b) d)
-let fn f = f
-type nonrec f = int -> unit
-let a = fn (fun _ -> () : f)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/async.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/async.res.txt
deleted file mode 100644
index 585d613..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/async.res.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-let greetUser =
-  ((fun userId ->
-      ((let name = ((getUserName userId)[@res.await ][@res.uapp ]) in
-        ({js|Hello |js} ^ name) ^ {js|!|js})
-      [@res.braces ]))
-  [@res.async ])
-;;((fun () -> 123)[@res.async ])
-let fetch =
-  ((Function$ ((fun url -> ((browserFetch url)[@res.uapp ]))[@res.async ]))
-  [@res.braces ][@res.arity 1])
-let fetch2 =
-  ((((Function$ (((fun url -> ((browserFetch url)[@res.uapp ])))
-        [@res.async ]))
-    [@res.arity 1]);
-    ((Function$ (((fun url -> ((browserFetch2 url)[@res.uapp ])))
-        [@res.async ]))
-    [@res.arity 1]))
-  [@res.braces ])
-let async =
-  ((let f = async () in
-    () |. async;
-    async ();
-    async.async;
-    { async = (async.(async)) };
-    (result |. async) |. (mapAsync (fun a -> doStuff a)))
-  [@res.braces ])
-let f =
-  ((if isPositive
-    then ((fun a -> fun b -> (a + b : int))[@res.async ])
-    else (((fun c -> fun d -> (c - d : int)))[@res.async ]))
-  [@res.ternary ])
-let foo = async ~a:((34)[@res.namedArgLoc ])
-let bar = ((fun ~a:((a)[@res.namedArgLoc ]) -> a + 1)[@res.async ])
-let ex1 = ((3)[@res.await ]) + ((4)[@res.await ])
-let ex2 = ((3)[@res.await ]) ** ((4)[@res.await ])
-let ex3 = ((foo |. (bar ~arg:((arg)[@res.namedArgLoc ])))[@res.await ])
-let ex4 = (((foo.bar).baz)[@res.await ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/await.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/await.res.txt
deleted file mode 100644
index 5dead70..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/await.res.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-;;((wait 2)[@res.await ])
-let maybeSomeValue =
-  match ((fetchData url)[@res.await ]) with
-  | data -> Some data
-  | exception JsError _ -> None
-let x = ((1)[@res.await ]) + 2
-let x = ((wait 1)[@res.await ]) + ((wait 2)[@res.await ])
-let () =
-  ((let response = ((fetch {js|/users.json|js})[@res.await ]) in
-    let users = ((response.json ())[@res.await ]) in
-    let comments =
-      ((((fetch {js|comment.json|js})[@res.await ]).json ())
-      [@res.await ]).(0) in
-    Js.log2 users comments)
-  [@res.braces ])
-let () = ((delay 10)[@res.braces ][@res.await ])
-let () = ((((delay 10)[@res.await ]); ((delay 20)[@res.await ]))
-  [@res.braces ])
-let forEach = ((Js.Import Belt.List.forEach)[@res.await ][@a ][@b ])
-module M = ((Belt.List)[@res.await ][@a ][@b ])
-let f () =
-  ((let module M = ((Belt.List)[@res.await ][@a ][@b ]) in M.forEach)
-  [@res.braces ])
-let () = ((let module M = ((Belt.List)[@res.await ][@a ][@b ]) in M.forEach)
-  [@res.braces ])
-module type BeltList  = module type of Belt.List
-let f () =
-  ((let module M = (((Belt.List : BeltList))[@res.await ][@a ][@b ]) in
-      M.forEach)
-  [@res.braces ])
-let () =
-  ((let module M = (((Belt.List : BeltList))[@res.await ][@a ][@b ]) in
-      M.forEach)
-  [@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/bigint.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/bigint.res.txt
deleted file mode 100644
index eea35a4..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/bigint.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-;;1n / 2n
-;;3n * 4n
-;;2n ** 2n
-;;10n + 54
-;;289n - 138n
-;;0100n
-;;001_000_000n
-;;(-000100n)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/binary.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/binary.res.txt
deleted file mode 100644
index 81e51b8..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/binary.res.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-;;node := (if newBalance == 2 then avl |. (rotateRight node) else node)
-;;node := ((if newBalance == 2 then avl |. (rotateRight node) else node)
-    [@attr ])
-let x = z |> (match z with | _ -> false)
-let x = z |> ((match z with | _ -> false)[@attr ])
-let x = z |> (assert z)
-let x = z |> ((assert z)[@attr ])
-let x = z |> (lazy z)
-let x = z |> ((lazy z)[@attr ])
-let x = z |> (try sideEffect () with | _ -> f ())
-let x = z |> ((try sideEffect () with | _ -> f ())[@attr ])
-let x = z |> for i = 0 to 10 do () done
-let x = z |> ((for i = 0 to 10 do () done)[@attr ])
-let x = z |> while condition do () done
-let x = z |> ((while condition do () done)[@attr ])
-let x = (a + (-1)) + (-2)
-let x = (a + (((-1))[@attr ])) + (((-2))[@attr ])
-let x = a - b
-let x = a -. b
-;;Constructor (a, b)
-;;`Constructor (a, b)
-let _ = ((Constructor (a, b); `Constructor (a, b))[@res.braces ])
-;;((library.getBalance account)[@res.uapp ]) |.
-    (Promise.Js.catch (fun _ -> ((Promise.resolved None)[@res.braces ])))
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/binaryNoEs6Arrow.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/binaryNoEs6Arrow.res.txt
deleted file mode 100644
index aa35b4d..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/binaryNoEs6Arrow.res.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-;;if (color == Black) && ((sibling == None) || (parent == None)) then ()
-;;if
-    ((color == Black) && (color != Red)) &&
-      ((sibling == None) || (parent == None))
-  then ()
-;;match (color == Black) && ((sibling == None) || (parent == None)) with
-  | _ -> ()
-;;match ((color == Black) && (color != Red)) &&
-          ((sibling == None) || (parent == None))
-  with
-  | _ -> ()
-;;try (color == Black) && ((sibling == None) || (parent == None))
-  with | _ -> ()
-;;try
-    ((color == Black) && (color == Red)) &&
-      ((sibling == None) || (parent == None))
-  with | _ -> ()
-;;while (color == Black) && ((sibling == None) || (parent == None)) do ()
-    done
-;;while
-    ((color == Black) && (color == Red)) &&
-      ((sibling == None) || (parent == None))
-    do () done
-;;((div
-      ~onClick:((fun event ->
-                   ((match videoContainerRect with
-                     | Some videoContainerRect ->
-                         let newChapter =
-                           ({ startTime = (percent *. duration) } : Video.chapter) in
-                         { a; b } |. onChange
-                     | _ -> ())
-                   [@res.braces ]))[@res.namedArgLoc ][@res.braces ])
-      ~children:[] ())[@JSX ])
-;;if inclusions.(index) <- (uid, url) then onChange inclusions
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/block.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/block.res.txt
deleted file mode 100644
index 0cce867..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/block.res.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-let b =
-  ((let module Array = Belt.Array in
-      ([|1;2|] |. (Array.map (fun x -> x + 1))) |. Js.log)
-  [@res.braces ])
-let b =
-  ((let open Belt.Array in ([|1;2|] |. (map (fun x -> x + 1))) |. Js.log)
-  [@res.braces ])
-let b = ((let exception QuitEarly  in raise QuitEarly)[@res.braces ])
-let b = ((let a = 1 in let b = 2 in a + b)[@res.braces ])
-let b = ((let _ = sideEffect () in ())[@res.braces ])
-let b = ((let _ = sideEffect () in ())[@res.braces ])
-let b = ((a (); b (); c ())[@res.braces ])
-let b = ((a (); b (); (let a = 1 in f a))[@res.braces ])
-let b = ((let a = 1 in let b = 2 in ())[@res.braces ])
-let b =
-  ((let module Array = Belt.Array in
-      let open Array in
-        let exception Terminate of int  in
-          let a = 1 in
-          let b = 2 in
-          sideEffect ();
-          (let x = (1 + 2) |. (fun x -> x + 1) in raise (Terminate x)))
-  [@res.braces ])
-let b = ((f (); g (); h (); (let arr = [|1;2;3|] in ()))[@res.braces ])
-let res =
-  ((let a = {js|a starts out as|js} in
-    (((print_string a; (let a = 20 in print_int a)))
-    [@res.braces ]);
-    print_string a)
-  [@res.braces ])
-let res =
-  ((let a = {js|first its a string|js} in
-    let a = 20 in print_int a; print_int a; print_int a)
-  [@res.braces ])
-let res =
-  ((let a = {js|a is always a string|js} in
-    print_string a; (let b = 30 in print_int b))
-  [@res.braces ])
-let nestedLet = ((let _ = 1 in ())[@res.braces ])
-let nestedLet = ((let _ = 1 in 2)[@res.braces ])
-let init () = ((foo (1 == 1); [%assert 1 == 2])[@res.braces ])
-let init () = (([%assert 1 == 2]; foo (1 == 1); [%assert 1 == 2])
-  [@res.braces ])
-let f () = ((let x = 1 in fun _ -> ())[@res.braces ])
-let reifyStyle (type a) (x : 'a) =
-  (((let module Internal =
-       struct
-         type constructor
-         external canvasGradient : constructor = "CanvasGradient"[@@bs.val ]
-         external canvasPattern : constructor = "CanvasPattern"[@@bs.val ]
-         let instanceOf =
-           ([%bs.raw
-              (({js|function(x,y) {return +(x instanceof y)}|js})
-                [@res.template ])] : 'a -> constructor -> bool)
-       end in
-       ((if (Js.typeof x) = {js|string|js}
-         then Obj.magic String
-         else
-           if Internal.instanceOf x Internal.canvasGradient
-           then Obj.magic Gradient
-           else
-             if Internal.instanceOf x Internal.canvasPattern
-             then Obj.magic Pattern
-             else
-               raise
-                 (Invalid_argument
-                    {js|Unknown canvas style kind. Known values are: String, CanvasGradient, CanvasPattern|js})),
-         (Obj.magic x)))
-  [@res.braces ]) : (a style * a))
-let calc_fps t0 t1 = ((let delta = (t1 -. t0) /. 1000. in 1. /. delta)
-  [@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/bracedOrRecord.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/bracedOrRecord.res.txt
deleted file mode 100644
index e84520a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/bracedOrRecord.res.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-let r = { expr with pexp_attributes = [||] }
-let r = { a }
-let r = { a = expr }
-let r = { a = expr }
-let r = { a = expr; b = expr2 }
-let r = { f = (fun x -> x + b) }
-let e = ((a)[@res.braces ])
-let e = ((a)[@res.braces ])
-let e = ((a; b ())[@res.braces ])
-let e = ((- a)[@res.braces ])
-let e = ((a + b)[@res.braces ])
-let e = ((if a then true else false)[@res.braces ][@res.ternary ])
-let e = ((if a |> computation then true else false)
-  [@res.braces ][@res.ternary ])
-let e = ((a.(0))[@res.braces ])
-let e = ((f b)[@res.braces ])
-let e = (((a.b).c)[@res.braces ])
-let e = ((arr.(x) <- 20)[@res.braces ])
-let e = ((fun x -> (x + 1) |> (doStuff config))[@res.braces ])
-let e = (((fun x -> x + 1) |> (doStuff config))[@res.braces ])
-let e = ((if fun x -> x + 1 then true else false)
-  [@res.braces ][@res.ternary ])
-let e = (((fun x -> x + 1) |> sideEffect; logToAnalytics Shady.ml)
-  [@res.braces ])
-let f = ((fun event -> (event.target).value)[@res.braces ])
-let f = ((fun event -> ((event.target).value : string))[@res.braces ])
-let x = ((let a = 1 in let b = 2 in a + b)[@res.braces ])
-;;(([(({js|\n|js} |. React.string)[@res.braces ])])[@JSX ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/bsObject.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/bsObject.res.txt
deleted file mode 100644
index ba0778d..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/bsObject.res.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-let zero = 0
-let x = [%obj { age = 30 }]
-let y = [%obj { age = 30 }]
-let y = [%obj { age = 30; name = {js|steve|js} }]
-let y = [%obj { age = 30; name = {js|steve|js} }]
-let z =
-  [%obj { \xff = 1; \u2212 = {js|two|js}; \0 = zero; \o123 = {js|o123|js} }]
-let x = (({js|age|js})[@res.braces ])
-let x = (({js|age|js}.(0))[@res.braces ])
-let x = (({js|age|js} |. Js.log)[@res.braces ])
-let x = ((if {js|age|js} then true else false)[@res.braces ][@res.ternary ])
-let x = (({js|age|js} |. Js.log; (let foo = 1 in let bar = 2 in foo + bar))
-  [@res.braces ])
-let x =
-  ((((if {js|age|js} then true else false)
-    [@res.ternary ]);
-    (let foo = 1 in let bar = 2 in foo + bar))
-  [@res.braces ])
-let x = (({js|age|js}.(0); (let foo = 1 in let bar = 2 in foo + bar))
-  [@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/coerce.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/coerce.res.txt
deleted file mode 100644
index f87fc15..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/coerce.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-let foo (x : int) = (x :> int)
-let foo x = ((x : t) :> int)
-let _ = (x : int)
-let foo = ((x : int), (y :> float))
-let foo = ((x : int), (y :> float), (z :> int))
-let foo = ((x : int), y, (z :> int))
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/constants.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/constants.res.txt
deleted file mode 100644
index dac7ad4..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/constants.res.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-let x = true
-let y = false
-let txt = {js|a string|js}
-let txtWithEscapedChar = {js|foo\nbar|js}
-let number = 1
-let template = (({js|amazing
-  multine
-  template
-     string
-|js})
-  [@res.template ])
-let complexNumber = 1.6
-let x = 0b0000_0001
-let int32 = 42l
-let int64 = 42L
-let x = (-44.20e99)
-let x = (-44.20_34e99)
-let x = (-44.20e+9)
-let x = (-44.20e-9)
-let x = (-44.20e-99_99)
-let x = (-444_444.20e99)
-let x = 44.20e99
-let x = 44.20_34e99
-let x = 44.20e+9
-let x = 44.20e-9
-let x = 44.20e-99_99
-let x = 44e99
-let x = 44_44e99
-let x = 0x0
-let x = 0X0
-let x = 0xAA
-let x = 0XA_A
-let x = 0xAA.ff
-let x = 0xAA.ff_ff
-let x = 0xAA.ff_ffp10
-let x = 0xAA.ff_ffp+10
-let x = 0xAA.ff_ffp-10
-let x = 0xAA.ff_ffp100_00
-let x = 0xAA.ff_ffp+100_00
-let x = 0xAA.ff_ffp-100_00
-let x = 'a'
-let x = '\\'
-let x = '\''
-let x = '\n'
-let x = '\t'
-let x = '\b'
-let x = '\r'
-let x = ' '
-let x = '\170'
-let () = ((getResult (); (-10))[@res.braces ])
-let x = {js|foo\0bar|js}
-let x = {js|foo\x0Abar|js}
-let x = {js|\\abc|js}
-let x = {js|\'bar|js}
-let x = {js|\nbar|js}
-let x = {js|\tbar|js}
-let x = {js|\bbar|js}
-let x = {js|\rbar|js}
-let x = {js|\ bar|js}
-let x = {js|\u00A9|js}
-let x = {js|\u00a9|js}
-let x = {js|\u2665|js}
-let a = {js|\u{000000000061}|js}
-let x = {js|\u{00A9}|js}
-let x = {js|\u{00a9}|js}
-let x = {js|\oAAA|js}
-let x = {js|\m|js}
-let smile = {js|\u{1F600}|js}
-let smile = {js|\u{1f600}|js}
-let u = {js|日本語|js}
-let u = {js|\u65e5\u672c\u8a9e|js}
-let u = {js|\u{000065e5}\u{0000672c}\u{00008a9e}|js}
-let u = {js|\xe6\x97\xa5\xe6\x9c\xac\xe8\xaa\x9e|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/constructor.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/constructor.res.txt
deleted file mode 100644
index 3b7e8da..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/constructor.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-let x = Red
-let y = Colors.Blue
-let z = Rgb ()
-let v = Vertex (1., 2., 3., 4.)
-let colour = Shades.Colors.White
-let u = ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/es6template.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/es6template.res.txt
deleted file mode 100644
index b84d1fc..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/es6template.res.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-let s = (({js|foo|js})[@res.template ])
-let s = (({js|multi
-  line
-
-string
-|js})[@res.template ])
-let s =
-  (((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^ (({js||js})
-      [@res.template ]))
-  [@res.template ])
-let s =
-  (((((({js|before|js})[@res.template ]) ^ foo)[@res.template ]) ^
-      (({js||js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((({js|before |js})[@res.template ]) ^ foo)[@res.template ]) ^
-      (({js||js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((({js|before  |js})[@res.template ]) ^ foo)[@res.template ]) ^
-      (({js||js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^ (({js|after|js})
-      [@res.template ]))
-  [@res.template ])
-let s =
-  (((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^
-      (({js| after|js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^
-      (({js|  after|js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^ (({js||js})
-          [@res.template ]))
-        [@res.template ]) ^ bar)
-      [@res.template ]) ^ (({js||js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((((((((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^
-              (({js||js})[@res.template ]))
-            [@res.template ]) ^ bar)
-          [@res.template ]) ^ (({js||js})[@res.template ]))
-        [@res.template ]) ^ baz)
-      [@res.template ]) ^ (({js||js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^ (({js| |js})
-          [@res.template ]))
-        [@res.template ]) ^ bar)
-      [@res.template ]) ^ (({js||js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((((((((((({js||js})[@res.template ]) ^ foo)[@res.template ]) ^
-              (({js| |js})[@res.template ]))
-            [@res.template ]) ^ bar)
-          [@res.template ]) ^ (({js| |js})[@res.template ]))
-        [@res.template ]) ^ baz)
-      [@res.template ]) ^ (({js||js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((((((({js| before |js})[@res.template ]) ^ foo)[@res.template ]) ^
-          (({js| |js})[@res.template ]))
-        [@res.template ]) ^ bar)
-      [@res.template ]) ^ (({js| after |js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((((((((((({js|before |js})[@res.template ]) ^ foo)[@res.template ]) ^
-              (({js| middle |js})[@res.template ]))
-            [@res.template ]) ^ bar)
-          [@res.template ]) ^ (({js| |js})[@res.template ]))
-        [@res.template ]) ^ baz)
-      [@res.template ]) ^ (({js| wow |js})[@res.template ]))
-  [@res.template ])
-let s =
-  (({js|
-  multiline
-
-  es6
-
-  template
-
-  expression
-
-  so convenient
-
-  :)
-|js})
-  [@res.template ])
-let s = (({js|$dollar without $braces $interpolation|js})[@res.template ])
-let s = (({json|null|json})[@res.template ])
-let x = (({js|foo\`bar\$\\foo|js})[@res.template ])
-let x =
-  (((((((((({js|foo\`bar\$\\foo|js})[@res.template ]) ^ a)[@res.template ]) ^
-          (({js| \` |js})[@res.template ]))
-        [@res.template ]) ^ b)
-      [@res.template ]) ^ (({js| \` xx|js})[@res.template ]))
-  [@res.template ])
-let thisIsFine = (({js|$something|js})[@res.template ])
-let thisIsAlsoFine = (({js|fine\$|js})[@res.template ])
-let isThisFine = (({js|shouldBeFine$|js})[@res.template ])
-;;(((((({js|$|js})[@res.template ]) ^ dollarAmountInt)[@res.template ]) ^
-      (({js||js})[@res.template ]))[@res.template ])
-;;(((((({js|\$|js})[@res.template ]) ^ dollarAmountInt)[@res.template ]) ^
-      (({js||js})[@res.template ]))[@res.template ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/extension.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/extension.res.txt
deleted file mode 100644
index b97d310..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/extension.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-;;[%expr ]
-;;[%expr.extension ]
-;;[%expr.extension.with.args {js|argument|js}]
-;;[%expr.extension.with.args fun x -> f x]
-let x = ([%bs.raw {js|1|js}]) + ([%bs.raw {js|2|js}])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/firstClassModule.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/firstClassModule.res.txt
deleted file mode 100644
index 478dfe3..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/firstClassModule.res.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-let makeSet (type s) cmp =
-  ((let module S = (Set.Make)(struct type nonrec t = s
-                                     let compare = cmp end) in ((module
-      S) : (module Set.S with type elt = s)))
-  [@res.braces ])
-let three = ((module Three) : (module X_int))
-let numbers = [|three;(module Four)|]
-let numbers = (three, (module Four))
-let numbers = [three; (module Four)]
-let numbers = [|three;(module struct let x = 4 end)|]
-let numbers = (three, (module struct let x = 4 end))
-let numbers = [three; (module struct let x = 4 end)]
-let plus m1 m2 = ((((module
-  struct let x = (to_int m1) + (to_int m2) end) : (module X_int)))
-  [@res.braces ])
-let plus m1 m2 = ((module
-  struct let x = (to_int m1) + (to_int m2) end) : (module X_int))
-let unique_instance = ((module
-  struct module Query_handler = Unique
-         let this = Unique.create 0 end) : (module Query_handler_instance))
-let build_instance (type a)
-  ((module Q)  : (module Query_handler with type config = a)) config =
-  ((module
-  struct module Query_handler = Q
-         let this = Q.create config end) : (module Query_handler_instance))
-let build_instance (type a)
-  ((module Q)  : (module Query_handler with type config = a)) config =
-  ((((module
-  struct module Query_handler = Q
-         let this = Q.create config end) : (module Query_handler_instance)))
-  [@res.braces ])
-let unique_instance = build_instance (module Unique) 0
-let build_dispatch_table handlers =
-  ((let table = Hashtbl.create (module String) in
-    List.iter handlers
-      ~f:((fun (((module I)  : (module Query_handler_instance)) as instance)
-             ->
-             Hashtbl.set table ~key:((I.Query_handler.name)
-               [@res.namedArgLoc ]) ~data:((instance)[@res.namedArgLoc ]))
-      [@res.namedArgLoc ]) table)
-  [@res.braces ])
-;;(module Three)
-;;((module Three) : (module X_int))
-;;(module Teenager).(0)
-;;((module Teenager) |. age) |. Js.log
-;;((module Teenager).(0)) |. Js.log
-;;((if ((module Teenager) |. age) |. isAdult
-    then Js.log {js|has responsibilities|js}
-    else Js.log {js|can play in the playground|js})[@res.ternary ])
-;;((if ((module Streets).(0)) |. isExpensive
-    then Js.log {js|big money|js}
-    else Js.log {js|affordable|js})[@res.ternary ])
-let () = ((((module Teenager) |. age) |. Js.log)[@res.braces ])
-let () = (((module Teenager).(0))[@res.braces ])
-let () =
-  ((if ((module Teenager) |. age) |. isAdult
-    then Js.log {js|has responsibilities|js}
-    else Js.log {js|can play in the playground|js})
-  [@res.braces ][@res.ternary ])
-let () =
-  ((if ((module Streets).(0)) |. isExpensive
-    then Js.log {js|big money|js}
-    else Js.log {js|affordable|js})
-  [@res.braces ][@res.ternary ])
-let () =
-  ((let a = 1 in
-    let b = 2 in (module Teenager).(0); ((module Teenager) |. age) |. Js.log)
-  [@res.braces ])
-let () =
-  ((let a = 1 in
-    let b = 2 in
-    ((module Teenager) |. age) |. Js.log;
-    ((if (((module Teenager).(0)) |. age) |. isAdult
-      then Js.log {js|has responsibilities|js}
-      else Js.log {js|can play in the playground|js})
-    [@res.ternary ]))
-  [@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/float.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/float.res.txt
deleted file mode 100644
index ad1e280..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/float.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-;;1. /. 2.
-;;3. *. 4.
-;;2. ** 2.
-;;10.2 +. 5.4
-;;28.9 -. 13.8
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/for.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/for.res.txt
deleted file mode 100644
index a2ee9e8..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/for.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-;;for p = 0 to 10 do () done
-;;for p = 10 downto 0 do () done
-;;for p = a to b do () done
-;;for p = a to b do let a = 1 in let b = 2 in a + b done
-;;for p = 0 to x + 1 do () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/ident.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/ident.res.txt
deleted file mode 100644
index d19893a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/ident.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-let x = foo
-let y = Foo.Bar.x
-let x = _identWithUnderscore
-let x = _ident_ident
-let x = _ident_ident_
-let x = __ident__
-let x = list
-let x = Foo.Bar.list
-let with = with
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/if.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/if.res.txt
deleted file mode 100644
index da4cf19..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/if.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-;;if foo then true else false
-;;if foo = 2 then let bar = 1 in let foo = 2 in bar + foo
-let ifThenElse = if foo then lala else doStuff x y z
-let ifElseIfThen =
-  if foo = bar
-  then f ()
-  else if foo = bar2 then f1 () else if foo = bar3 then f2 () else f3 ()
-let x = (if true then 1 else 2) + (if false then 2 else 3)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/infix.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/infix.res.txt
deleted file mode 100644
index 0d8bbd2..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/infix.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-;;a |. (f b)
-;;{js|string1|js} ^ {js|string2|js}
-;;a <> b
-;;a != b
-;;a = b
-;;a == b
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/jsx.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/jsx.res.txt
deleted file mode 100644
index 908cbf7..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/jsx.res.txt
+++ /dev/null
@@ -1,593 +0,0 @@
-let _ = ((div ~children:[] ())[@JSX ])
-let _ = ((div ~children:[] ())[@JSX ])
-let _ = ((div ~className:(({js|menu|js})[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let _ = ((div ~className:(({js|menu|js})[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let _ = ((div ~className:(({js|menu|js})[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let _ = ((div ~className:(({js|menu|js})[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div ~className:(({js|menu|js})[@res.namedArgLoc ])
-      ~onClick:((fun _ -> Js.log {js|click|js})
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div ~className:(({js|menu|js})[@res.namedArgLoc ])
-      ~onClick:((fun _ -> Js.log {js|click|js})
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ = ((Navbar.createElement ~children:[] ())[@JSX ])
-let _ = ((Navbar.createElement ~children:[] ())[@JSX ])
-let _ = ((Navbar.createElement ~children:[] ())[@JSX ])
-let _ =
-  ((Navbar.createElement ~className:(({js|menu|js})[@res.namedArgLoc ])
-      ~children:[] ())
-  [@JSX ])
-let _ = ((Dot.Up.createElement ~children:[] ())[@JSX ])
-let _ = ((Dot.Up.createElement ~children:[] ())[@JSX ])
-let _ = ((Dot.Up.createElement ~children:[] ())[@JSX ])
-let _ =
-  ((Dot.Up.createElement
-      ~children:[((Dot.low.createElement ~children:[] ())[@JSX ])] ())
-  [@JSX ])
-let _ =
-  ((Dot.Up.createElement
-      ~children:[((Dot.Up.createElement ~children:[] ())[@JSX ])] ())
-  [@JSX ])
-let _ =
-  ((Dot.Up.createElement ~className:(({js|menu|js})[@res.namedArgLoc ])
-      ~children:[] ())
-  [@JSX ])
-let _ = ((Dot.low.createElement ~children:[] ())[@JSX ])
-let _ = ((Dot.low.createElement ~children:[] ())[@JSX ])
-let _ = ((Dot.low.createElement ~children:[] ())[@JSX ])
-let _ =
-  ((Dot.low.createElement
-      ~children:[((Dot.Up.createElement ~children:[] ())[@JSX ])] ())
-  [@JSX ])
-let _ =
-  ((Dot.low.createElement
-      ~children:[((Dot.low.createElement ~children:[] ())[@JSX ])] ())
-  [@JSX ])
-let _ =
-  ((Dot.low.createElement ~className:(({js|menu|js})[@res.namedArgLoc ])
-      ~children:[] ())
-  [@JSX ])
-let _ = ((el ~punned:((punned)[@res.namedArgLoc ]) ~children:[] ())[@JSX ])
-let _ = ((el ?punned:((punned)[@res.namedArgLoc ]) ~children:[] ())[@JSX ])
-let _ = ((el ~punned:((punned)[@res.namedArgLoc ]) ~children:[] ())[@JSX ])
-let _ = ((el ?punned:((punned)[@res.namedArgLoc ]) ~children:[] ())[@JSX ])
-let _ = ((el ?a:((b)[@res.namedArgLoc ]) ~children:[] ())[@JSX ])
-let _ = ((el ?a:((b)[@res.namedArgLoc ]) ~children:[] ())[@JSX ])
-let _ = (([])[@JSX ])
-let _ = (([])[@JSX ])
-let _ =
-  ((div ~className:(({js|menu|js})[@res.namedArgLoc ])
-      ~children:[((div ~className:(({js|submenu|js})[@res.namedArgLoc ])
-                     ~children:[sub1] ())
-                [@JSX ]);
-                ((div ~className:(({js|submenu|js})[@res.namedArgLoc ])
-                    ~children:[sub2] ())
-                [@JSX ])] ())
-  [@JSX ])
-let _ =
-  ((div ~className:(({js|menu|js})[@res.namedArgLoc ])
-      ~children:[((div ~className:(({js|submenu|js})[@res.namedArgLoc ])
-                     ~children:[sub1] ())
-                [@JSX ]);
-                ((div ~className:(({js|submenu|js})[@res.namedArgLoc ])
-                    ~children:[sub2] ())
-                [@JSX ])] ())
-  [@JSX ])
-let _ = ((div ~children:child ())[@JSX ])
-let _ = ((Foo.createElement ~children:(fun a -> 1) ())[@JSX ])
-let _ =
-  ((Foo.createElement ~children:((Foo2.createElement ~children:[] ())
-      [@JSX ]) ())
-  [@JSX ])
-let _ = ((Foo.createElement ~children:[|a|] ())[@JSX ])
-let _ = ((Foo.createElement ~children:(1, 2) ())[@JSX ])
-let _ = ((Foo.createElement ~children:(1, 2) ())[@JSX ])
-let _ =
-  ((div ~children:[ident; [|1;2;3|]; ((call a b)[@res.braces ]); (x.y).z] ())
-  [@JSX ])
-let _ =
-  ((Outer.createElement ~inner:((Inner.createElement ~children:[] ())
-      [@res.namedArgLoc ][@JSX ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div ~onClick:((onClickHandler)[@res.namedArgLoc ])
-      ~children:[(([{js|foobar|js}])[@JSX ])] ())
-  [@JSX ])
-let _ =
-  ((Window.createElement
-      ~style:(({
-                 width = 10;
-                 height = 10;
-                 paddingTop = 10;
-                 paddingLeft = 10;
-                 paddingRight = 10;
-                 paddingBottom = 10
-               })[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((OverEager.createElement ~fiber:((Metal.fiber)[@res.namedArgLoc ])
-      ~children:[] ())
-  [@JSX ])
-let arrayOfListOfJsx = [|(([])[@JSX ])|]
-let arrayOfListOfJsx =
-  [|(([((Foo.createElement ~children:[] ())[@JSX ])])[@JSX ])|]
-let arrayOfListOfJsx =
-  [|(([((Foo.createElement ~children:[] ())[@JSX ])])
-    [@JSX ]);(([((Bar.createElement ~children:[] ())[@JSX ])])[@JSX ])|]
-let sameButWithSpaces = [|(([])[@JSX ])|]
-let sameButWithSpaces =
-  [|(([((Foo.createElement ~children:[] ())[@JSX ])])[@JSX ])|]
-let sameButWithSpaces =
-  [|(([((Foo.createElement ~children:[] ())[@JSX ])])
-    [@JSX ]);(([((Bar.createElement ~children:[] ())[@JSX ])])[@JSX ])|]
-let sameButWithSpaces =
-  [|(([((Foo.createElement ~children:[] ())[@JSX ])])
-    [@JSX ]);(([((Bar.createElement ~children:[] ())[@JSX ])])[@JSX ])|]
-let arrayOfJsx = [||]
-let arrayOfJsx = [|((Foo.createElement ~children:[] ())[@JSX ])|]
-let arrayOfJsx =
-  [|((Foo.createElement ~children:[] ())
-    [@JSX ]);((Bar.createElement ~children:[] ())[@JSX ])|]
-let sameButWithSpaces = [||]
-let sameButWithSpaces = [|((Foo.createElement ~children:[] ())[@JSX ])|]
-let sameButWithSpaces =
-  [|((Foo.createElement ~children:[] ())
-    [@JSX ]);((Bar.createElement ~children:[] ())[@JSX ])|]
-let _ = ((a ~children:[] ())[@JSX ]) < ((b ~children:[] ())[@JSX ])
-let _ = ((a ~children:[] ())[@JSX ]) > ((b ~children:[] ())[@JSX ])
-let _ = ((a ~children:[] ())[@JSX ]) < ((b ~children:[] ())[@JSX ])
-let _ = ((a ~children:[] ())[@JSX ]) > ((b ~children:[] ())[@JSX ])
-let y =
-  ((Routes.createElement ~path:((Routes.stateToPath state)
-      [@res.namedArgLoc ]) ~isHistorical:((true)[@res.namedArgLoc ])
-      ~onHashChange:((fun _oldPath ->
-                        fun _oldUrl ->
-                          fun newUrl ->
-                            updater
-                              (fun latestComponentBag ->
-                                 fun _ ->
-                                   ((let currentActualPath =
-                                       Routes.hashOfUri newUrl in
-                                     let pathFromState =
-                                       Routes.stateToPath
-                                         latestComponentBag.state in
-                                     ((if currentActualPath = pathFromState
-                                       then None
-                                       else
-                                         dispatchEventless
-                                           (State.UriNavigated
-                                              currentActualPath)
-                                           latestComponentBag ())
-                                       [@res.ternary ]))
-                                   [@res.braces ])) ())
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let z =
-  ((div
-      ~style:((ReactDOMRe.Style.make ~width:((width)[@res.namedArgLoc ])
-                 ~height:((height)[@res.namedArgLoc ]) ~color:((color)
-                 [@res.namedArgLoc ]) ~backgroundColor:((backgroundColor)
-                 [@res.namedArgLoc ]) ~margin:((margin)[@res.namedArgLoc ])
-                 ~padding:((padding)[@res.namedArgLoc ]) ~border:((border)
-                 [@res.namedArgLoc ]) ~borderColor:((borderColor)
-                 [@res.namedArgLoc ])
-                 ~someOtherAttribute:((someOtherAttribute)
-                 [@res.namedArgLoc ]) ())[@res.namedArgLoc ])
-      ~key:((string_of_int 1)[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let omega =
-  ((div
-      ~aList:(([width;
-               height;
-               color;
-               backgroundColor;
-               margin;
-               padding;
-               border;
-               borderColor;
-               someOtherAttribute])[@res.namedArgLoc ])
-      ~key:((string_of_int 1)[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let someArray =
-  ((div
-      ~anArray:(([|width;height;color;backgroundColor;margin;padding;border;borderColor;someOtherAttribute|])
-      [@res.namedArgLoc ]) ~key:((string_of_int 1)[@res.namedArgLoc ])
-      ~children:[] ())
-  [@JSX ])
-let tuples =
-  ((div
-      ~aTuple:(((width, height, color, backgroundColor, margin, padding,
-                  border, borderColor, someOtherAttribute,
-                  definitelyBreakere))[@res.namedArgLoc ])
-      ~key:((string_of_int 1)[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let icon =
-  ((Icon.createElement
-      ~name:((match state.volume with
-              | v when v < 0.1 -> {js|sound-off|js}
-              | v when v < 0.11 -> {js|sound-min|js}
-              | v when v < 0.51 -> {js|sound-med|js}
-              | _ -> {js|sound-max|js})[@res.namedArgLoc ][@res.braces ])
-      ~children:[] ())
-  [@JSX ])
-let _ =
-  ((MessengerSharedPhotosAlbumViewPhotoReact.createElement
-      ?ref:((if foo#bar == baz
-             then Some (foooooooooooooooooooooooo setRefChild)
-             else None)[@res.namedArgLoc ][@res.ternary ])
-      ~key:((node#legacy_attachment_id)[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let _ = ((Foo.createElement ~bar:((bar)[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let _ = ((Foo.createElement ?bar:((bar)[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((Foo.createElement ?bar:((Baz.bar)[@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
-let x = ((div ~children:[] ())[@JSX ])
-let _ = ((div ~asd:((1)[@res.namedArgLoc ]) ~children:[] ())[@JSX ])
-;;foo#bar #= ((bar ~children:[] ())[@JSX ])
-;;foo #= ((bar ~children:[] ())[@JSX ])
-;;foo #= ((bar ~children:[] ())[@JSX ])
-let x = [|((div ~children:[] ())[@JSX ])|]
-let z = ((div ~children:[] ())[@JSX ])
-let z =
-  (((Button.createElement ~onClick:((handleStaleClick)[@res.namedArgLoc ])
-       ~children:[] ())[@JSX ]),
-    ((Button.createElement ~onClick:((handleStaleClick)[@res.namedArgLoc ])
-        ~children:[] ())[@JSX ]))
-let y = [|((div ~children:[] ())[@JSX ]);((div ~children:[] ())[@JSX ])|]
-let y =
-  [|((Button.createElement ~onClick:((handleStaleClick)[@res.namedArgLoc ])
-        ~children:[] ())
-    [@JSX ]);((Button.createElement ~onClick:((handleStaleClick)
-                 [@res.namedArgLoc ]) ~children:[] ())
-    [@JSX ])|]
-let _ =
-  ((Description.createElement
-      ~term:((Text.createElement ~text:(({js|Age|js})[@res.namedArgLoc ])
-                ~children:[] ())[@res.namedArgLoc ][@res.braces ][@JSX ])
-      ~children:[child] ())
-  [@JSX ])
-let _ =
-  ((Description.createElement
-      ~term:((Text.createElement ~text:(({js|Age|js})[@res.namedArgLoc ])
-                ~children:(([||])[@res.namedArgLoc ]) ())
-      [@res.namedArgLoc ][@res.braces ]) ~children:[child] ())
-  [@JSX ])
-let _ =
-  ((Description.createElement
-      ~term:((Text.createElement ~text:(({js|Age|js})[@res.namedArgLoc ]) ())
-      [@res.namedArgLoc ][@res.braces ][@JSX ]) ~children:[child] ())
-  [@JSX ])
-let _ =
-  ((Description.createElement
-      ~term:((Text.createElement ~superLongPunnedProp:((superLongPunnedProp)
-                [@res.namedArgLoc ])
-                ~anotherSuperLongOneCrazyLongThingHere:((anotherSuperLongOneCrazyLongThingHere)
-                [@res.namedArgLoc ]) ~text:(({js|Age|js})[@res.namedArgLoc ])
-                ~children:[] ())[@res.namedArgLoc ][@res.braces ][@JSX ])
-      ~children:[child] ())
-  [@JSX ])
-let _ =
-  ((Foo.createElement
-      ~bar:((Baz.createElement ~superLongPunnedProp:((superLongPunnedProp)
-               [@res.namedArgLoc ])
-               ~anotherSuperLongOneCrazyLongThingHere:((anotherSuperLongOneCrazyLongThingHere)
-               [@res.namedArgLoc ]) ~children:[] ())
-      [@res.namedArgLoc ][@res.braces ][@JSX ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div ~children:[((span ~children:[str {js|hello|js}] ())[@JSX ])] ())
-  [@JSX ])
-let _ =
-  ((description
-      ~term:((text ~text:(({js|Age|js})[@res.namedArgLoc ]) ~children:[] ())
-      [@res.namedArgLoc ][@res.braces ][@JSX ]) ~children:[child] ())
-  [@JSX ])
-let _ =
-  ((description
-      ~term:((text ~text:(({js|Age|js})[@res.namedArgLoc ]) ~children:((
-                [||])[@res.namedArgLoc ]) ())
-      [@res.namedArgLoc ][@res.braces ]) ~children:[child] ())
-  [@JSX ])
-let _ =
-  ((description
-      ~term:((text ~text:(({js|Age|js})[@res.namedArgLoc ]) ~children:((
-                [||])[@res.namedArgLoc ]))
-      [@res.namedArgLoc ][@res.braces ][@JSX ]) ~children:[child] ())
-  [@JSX ])
-let _ =
-  ((description ~term:((text ~text:(({js|Age|js})[@res.namedArgLoc ]) ())
-      [@res.namedArgLoc ][@res.braces ][@JSX ]) ~children:[child] ())
-  [@JSX ])
-let _ =
-  ((description
-      ~term:((div ~superLongPunnedProp:((superLongPunnedProp)
-                [@res.namedArgLoc ])
-                ~anotherSuperLongOneCrazyLongThingHere:((anotherSuperLongOneCrazyLongThingHere)
-                [@res.namedArgLoc ]) ~text:(({js|Age|js})[@res.namedArgLoc ])
-                ~children:[] ())[@res.namedArgLoc ][@res.braces ][@JSX ])
-      ~children:[child] ())
-  [@JSX ])
-let _ =
-  ((div ~onClick:((fun event -> handleChange event)
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div ~onClick:((fun eventWithLongIdent -> handleChange eventWithLongIdent)
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div
-      ~onClick:((fun event -> ((Js.log event; handleChange event)
-                   [@res.braces ]))[@res.namedArgLoc ][@res.braces ])
-      ~children:[] ())
-  [@JSX ])
-let _ =
-  ((StaticDiv.createElement
-      ~onClick:((fun foo ->
-                   fun bar ->
-                     fun baz ->
-                       fun lineBreak ->
-                         fun identifier ->
-                           ((doStuff foo bar baz; bar lineBreak identifier)
-                           [@res.braces ]))[@res.namedArgLoc ][@res.braces ])
-      ~children:[] ())
-  [@JSX ])
-let _ =
-  ((AttrDiv.createElement ~onClick:((fun event -> handleChange event)
-      [@res.namedArgLoc ][@res.braces ][@bar ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((AttrDiv.createElement
-      ~onClick:((fun eventLongIdentifier -> handleChange eventLongIdentifier)
-      [@res.namedArgLoc ][@res.braces ][@bar ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((StaticDivNamed.createElement
-      ~onClick:((fun ~foo:((foo)[@res.namedArgLoc ]) ->
-                   fun ~bar:((bar)[@res.namedArgLoc ]) ->
-                     fun ~baz:((baz)[@res.namedArgLoc ]) ->
-                       fun ~lineBreak:((lineBreak)[@res.namedArgLoc ]) ->
-                         fun ~identifier:((identifier)[@res.namedArgLoc ]) ->
-                           fun () -> bar lineBreak identifier)
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div ~onClick:((fun e -> (((doStuff (); bar foo)[@res.braces ]) : event))
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div
-      ~onClick:((fun e ->
-                   fun e2 -> (((doStuff (); bar foo)[@res.braces ]) : event))
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div
-      ~onClick:((fun foo ->
-                   fun bar ->
-                     fun baz ->
-                       fun superLongIdent ->
-                         fun breakLine -> (((doStuff (); bar foo)
-                           [@res.braces ]) : (event * event2 * event3 *
-                                               event4 * event5)))
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div
-      ~onClick:((fun foo ->
-                   fun bar ->
-                     fun baz ->
-                       fun superLongIdent ->
-                         fun breakLine ->
-                           (doStuff () : (event * event2 * event3 * event4 *
-                                           event5)))
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div
-      ~children:[(((match color with
-                    | Black -> ReasonReact.string {js|black|js}
-                    | Red -> ReasonReact.string {js|red|js}))
-                [@res.braces ])] ())
-  [@JSX ])
-let _ =
-  ((div
-      ~style:((ReactDOMRe.Style.make ~width:(({js|20px|js})
-                 [@res.namedArgLoc ]) ~height:(({js|20px|js})
-                 [@res.namedArgLoc ]) ~borderRadius:(({js|100%|js})
-                 [@res.namedArgLoc ]) ~backgroundColor:(({js|red|js})
-                 [@res.namedArgLoc ]))
-      [@res.namedArgLoc ][@res.braces ][@foo ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((Animated.createElement ~initialValue:((0.0)[@res.namedArgLoc ])
-      ~value:((value)[@res.namedArgLoc ])
-      ~children:((ReactDOMRe.Style.make ~width:(({js|20px|js})
-                    [@res.namedArgLoc ]) ~height:(({js|20px|js})
-                    [@res.namedArgLoc ]) ~borderRadius:(({js|100%|js})
-                    [@res.namedArgLoc ]) ~backgroundColor:(({js|red|js})
-                    [@res.namedArgLoc ]))[@res.braces ]) ())
-  [@JSX ])
-let _ =
-  ((Animated.createElement ~initialValue:((0.0)[@res.namedArgLoc ])
-      ~value:((value)[@res.namedArgLoc ])
-      ~children:((fun value ->
-                    ((div
-                        ~style:((ReactDOMRe.Style.make ~width:(({js|20px|js})
-                                   [@res.namedArgLoc ])
-                                   ~height:(({js|20px|js})
-                                   [@res.namedArgLoc ])
-                                   ~borderRadius:(({js|100%|js})
-                                   [@res.namedArgLoc ])
-                                   ~backgroundColor:(({js|red|js})
-                                   [@res.namedArgLoc ]))
-                        [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-                    [@JSX ]))[@res.braces ]) ())
-  [@JSX ])
-let _ =
-  ((Animated.createElement ~initialValue:((0.0)[@res.namedArgLoc ])
-      ~value:((value)[@res.namedArgLoc ])
-      ~children:((fun value ->
-                    (((div
-                         ~style:((ReactDOMRe.Style.make
-                                    ~width:(({js|20px|js})
-                                    [@res.namedArgLoc ])
-                                    ~height:(({js|20px|js})
-                                    [@res.namedArgLoc ])
-                                    ~borderRadius:(({js|100%|js})
-                                    [@res.namedArgLoc ])
-                                    ~backgroundColor:(({js|red|js})
-                                    [@res.namedArgLoc ]))
-                         [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-                    [@JSX ]) : ReasonReact.element))[@res.braces ]) ())
-  [@JSX ])
-let _ =
-  ((Animated.createElement ~initialValue:((0.0)[@res.namedArgLoc ])
-      ~value:((value)[@res.namedArgLoc ])
-      ~children:((fun value ->
-                    ((div
-                        ~style:((ReactDOMRe.Style.make ~width:(({js|20px|js})
-                                   [@res.namedArgLoc ])
-                                   ~height:(({js|20px|js})
-                                   [@res.namedArgLoc ])
-                                   ~borderRadius:(({js|100%|js})
-                                   [@res.namedArgLoc ])
-                                   ~backgroundColor:(({js|red|js})
-                                   [@res.namedArgLoc ]))
-                        [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-                    [@res.braces ][@JSX ]))[@res.braces ][@foo ]) ())
-  [@JSX ])
-let _ =
-  ((Animated.createElement ~initialValue:((0.0)[@res.namedArgLoc ])
-      ~value:((value)[@res.namedArgLoc ])
-      ~children:((fun value ->
-                    ((let width = {js|20px|js} in
-                      let height = {js|20px|js} in
-                      ((div
-                          ~style:((ReactDOMRe.Style.make ~width:((width)
-                                     [@res.namedArgLoc ]) ~height:((height)
-                                     [@res.namedArgLoc ])
-                                     ~borderRadius:(({js|100%|js})
-                                     [@res.namedArgLoc ])
-                                     ~backgroundColor:(({js|red|js})
-                                     [@res.namedArgLoc ]))
-                          [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-                        [@JSX ]))
-                    [@res.braces ]))[@res.braces ]) ())
-  [@JSX ])
-let _ =
-  ((div ~callback:((reduce (fun () -> not state))
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((button ?id:((id)[@res.namedArgLoc ])
-      ~className:((Cn.make [|{js|button|js};{js|is-fullwidth|js}|])
-      [@res.namedArgLoc ][@res.braces ]) ~onClick:((onClick)
-      [@res.namedArgLoc ])
-      ~children:[(({js|Submit|js} |> ste)[@res.braces ])] ())
-  [@JSX ])
-let _ =
-  ((button ?id:((id)[@res.namedArgLoc ])
-      ~className:((Cn.make [{js|button|js}; {js|is-fullwidth|js}])
-      [@res.namedArgLoc ][@res.braces ]) ~onClick:((onClick)
-      [@res.namedArgLoc ])
-      ~children:[(({js|Submit|js} |> ste)[@res.braces ])] ())
-  [@JSX ])
-let _ =
-  ((button ?id:((id)[@res.namedArgLoc ])
-      ~className:((Cn.make ({js|button|js}, {js|is-fullwidth|js}))
-      [@res.namedArgLoc ][@res.braces ]) ~onClick:((onClick)
-      [@res.namedArgLoc ])
-      ~children:[(({js|Submit|js} |> ste)[@res.braces ])] ())
-  [@JSX ])
-let _ =
-  ((button ?id:((id)[@res.namedArgLoc ]) ~className:((Cn.make { a = b })
-      [@res.namedArgLoc ][@res.braces ]) ~onClick:((onClick)
-      [@res.namedArgLoc ])
-      ~children:[(({js|Submit|js} |> ste)[@res.braces ])] ())
-  [@JSX ])
-let _ =
-  ((X.createElement ~y:((z |. (Belt.Option.getWithDefault {js||js}))
-      [@res.namedArgLoc ][@res.braces ]) ~children:[] ())
-  [@JSX ])
-let _ =
-  ((div ~style:((getStyle ())[@res.namedArgLoc ][@res.braces ])
-      ~children:[((ReasonReact.string {js|BugTest|js})[@res.braces ])] ())
-  [@JSX ])
-let _ =
-  ((div
-      ~children:[(((let left = limit |. Int.toString in
-                    (((((({js||js})[@res.template ]) ^ left)[@res.template ])
-                        ^ (({js| characters left|js})[@res.template ]))
-                      [@res.template ]) |. React.string))
-                [@res.braces ])] ())
-  [@JSX ])
-let _ =
-  ((View.createElement ~style:((styles#backgroundImageWrapper)
-      [@res.namedArgLoc ])
-      ~children:[(((let uri = {js|/images/header-background.png|js} in
-                    ((Image.createElement ~resizeMode:((Contain)
-                        [@res.namedArgLoc ]) ~style:((styles#backgroundImage)
-                        [@res.namedArgLoc ]) ~uri:((uri)[@res.namedArgLoc ])
-                        ~children:[] ())
-                      [@JSX ])))
-                [@res.braces ])] ())
-  [@JSX ])
-;;((div
-      ~children:[(((((possibleGradeValues |>
-                        (List.filter (fun g -> g <= state.maxGrade)))
-                       |>
-                       (List.map
-                          (fun possibleGradeValue ->
-                             ((option
-                                 ~key:((possibleGradeValue |> string_of_int)
-                                 [@res.namedArgLoc ][@res.braces ])
-                                 ~value:((possibleGradeValue |> string_of_int)
-                                 [@res.namedArgLoc ][@res.braces ])
-                                 ~children:[(((possibleGradeValue |>
-                                                 string_of_int)
-                                                |> str)
-                                           [@res.braces ])] ())
-                             [@JSX ]))))
-                      |> Array.of_list)
-                     |> ReasonReact.array)
-                [@res.braces ])] ())[@JSX ])
-;;((div ~children:[((Js.log (a <= 10))[@res.braces ])] ())[@JSX ])
-;;((div
-      ~children:[((div ~children:[((Js.log (a <= 10))[@res.braces ])] ())
-                [@JSX ])] ())[@JSX ])
-;;((div
-      ~children:[((div ~onClick:((fun _ -> Js.log (a <= 10))
-                     [@res.namedArgLoc ][@res.braces ])
-                     ~children:[((div
-                                    ~children:[((Js.log (a <= 10))
-                                              [@res.braces ])] ())
-                               [@JSX ])] ())
-                [@JSX ])] ())[@JSX ])
-;;((div ~children:element ())[@JSX ])
-;;((div ~children:((fun a -> 1)[@res.braces ]) ())[@JSX ])
-;;((div ~children:((span ~children:[] ())[@JSX ]) ())[@JSX ])
-;;((div ~children:[|a|] ())[@JSX ])
-;;((div ~children:(1, 2) ())[@JSX ])
-;;((div ~children:((array |. f)[@res.braces ]) ())[@JSX ])
-;;(([element])[@JSX ])
-;;(([(((fun a -> 1))[@res.braces ])])[@JSX ])
-;;(([((span ~children:[] ())[@JSX ])])[@JSX ])
-;;(([[|a|]])[@JSX ])
-;;(([(1, 2)])[@JSX ])
-;;(([((array |. f)[@res.braces ])])[@JSX ])
-let _ =
-  ((A.createElement ~x:(({js|y|js})[@res.namedArgLoc ]) ~_spreadProps:((str)
-      [@res.namedArgLoc ]) ~children:[] ())
-  [@JSX ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/list.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/list.res.txt
deleted file mode 100644
index 4205548..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/list.res.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-let x = []
-let x = [1; 2; 3]
-let x = [1; 2; 3]
-let x = [(1 : int); (2 : int); (3 : int)]
-let x = 4 :: 5 :: y
-let x = ((Belt.List.concatMany)[@res.spread ]) [|(1 :: x);(2 :: 3 :: x)|]
-let x = 1 :: 2 :: (y : int list)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/locallyAbstractTypes.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/locallyAbstractTypes.res.txt
deleted file mode 100644
index 836a783..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/locallyAbstractTypes.res.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-let f (type t) (xs : t list) = ()
-let f (type t) (xs : t list) (type s) (ys : s list) = ()
-let f (type t) (type u) (type v) (xs : (t * u * v) list) = ()
-let f (type t) (type u) (type v) (xs : (t * u * v) list) (type s) (type w)
-  (type z) (ys : (s * w * z) list) = ()
-let f = ((fun (type t) -> fun (type u) -> fun (type v) ->
-  fun (xs : (t * u * v) list) -> ((fun (type s) -> fun (type w) -> fun (type
-    z) -> fun (ys : (s * w * z) list) -> ())[@attr2 ]))
-  [@attr ])
-let f = ((fun (type t) -> ((fun (type s) ->
-  fun (xs : (t * s) list) -> ((fun (type u) -> ((fun (type v) -> fun (type w)
-    -> fun (ys : (u * v * w) list) -> ())[@attr ]))[@attr ]))
-  [@attr ]))[@attr ])
-let cancel_and_collect_callbacks :
-  'a 'u 'c .
-    packed_callbacks list -> ('a, 'u, 'c) promise -> packed_callbacks list
-  = fun (type x) ->
-  fun callbacks_accumulator -> fun (p : (_, _, c) promise) -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/parenthesized.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/parenthesized.res.txt
deleted file mode 100644
index 4b873ec..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/parenthesized.res.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-let x = 1
-let f = 1.3
-let truth = true
-let truth = false
-let constructor = None
-let longidentConstructor = Option.None
-let txt = {js|a string|js}
-let otherTxt =
-  (((((({js|foo bar |js})[@res.template ]) ^ txt)[@res.template ]) ^
-      (({js||js})[@res.template ]))
-  [@res.template ])
-let ident = myIdent
-let aList = [1; 2]
-let anArray = [|1;2|]
-let aTuple = (1, 2)
-let aRecord = { name = {js|steve|js}; age = 30 }
-let blockExpression = ((let a = 1 in let b = 2 in a + b)[@res.braces ])
-let assertSmthing = assert true
-let lazyThing = lazy true
-let jsx =
-  ((div ~className:(({js|cx|js})[@res.namedArgLoc ]) ~children:[foo] ())
-  [@JSX ])
-let ifExpr = if true then Js.log true else Js.log false
-let forExpr = for p = 0 to 10 do () done
-let whileExpr = while true do doSomeImperativeThing () done
-let switchExpr = match myVar with | Blue -> {js|blue|js} | Red -> {js|red|js}
-let constrainedExpr = (x : int)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/polyvariant.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/polyvariant.res.txt
deleted file mode 100644
index 5de14a9..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/polyvariant.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-let x = `Red
-let z = `Rgb ()
-let v = `Vertex (1., 2., 3., 4.)
-let animation = `ease-in
-let one = `1
-let fortyTwo = `42
-let long = `42444
-let oneString = `1 {js|payload|js}
-let twoIntString = `2 (3, {js|payload|js})
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/primary.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/primary.res.txt
deleted file mode 100644
index f7aabdd..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/primary.res.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-let x = a.b
-let x = (a.b).c
-let x = H20.Water.water.h
-let x = p.Parser.token
-let x = (p.Lang.Parser.token).pos
-;;lexbuf.lnum <- (lexbuf.lnum + 1)
-;;(parser.lexbuf).lnum <- ((parser.lexbuf).lnum + 1)
-let x = arr.(0)
-let x = arr.((x : int))
-let x = (arr.(0)).(1)
-let x = (arr.((x : int))).((y : int))
-;;arr.(0) <- (a + b)
-;;f ()
-;;(f ()) ()
-;;f a
-;;(f a) a
-;;f a
-;;f (x : int)
-;;f a b c
-;;f a b c
-;;f ~a:((a)[@res.namedArgLoc ]) ~b:((bArg)[@res.namedArgLoc ]) ?c:((c)
-    [@res.namedArgLoc ]) ?d:((expr)[@res.namedArgLoc ])
-;;((f ~a:((a)[@res.namedArgLoc ]) ~b:((bArg)[@res.namedArgLoc ]) ?c:((c)
-      [@res.namedArgLoc ]) ?d:((expr)[@res.namedArgLoc ])) ~a:((a)
-     [@res.namedArgLoc ]) ~b:((bArg)[@res.namedArgLoc ]) ?c:((c)
-     [@res.namedArgLoc ]) ?d:((expr)[@res.namedArgLoc ])) ~a:((a)
-    [@res.namedArgLoc ]) ~b:((bArg)[@res.namedArgLoc ]) ?c:((c)
-    [@res.namedArgLoc ]) ?d:((expr)[@res.namedArgLoc ])
-;;f ~a:(((x : int))[@res.namedArgLoc ]) ?b:(((y : int))[@res.namedArgLoc ])
-;;connection#platformId
-;;((connection#left)#account)#accountName
-;;john#age #= 99
-;;(john#son)#age #= (steve#age - 5)
-;;dict#\n #= abc
-;;dict#\" #= dict2#\"
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/record.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/record.res.txt
deleted file mode 100644
index a15646a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/record.res.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-let r = { a = expr }
-let r = { a = expr }
-let r = { Parsetree.pexp_attributes = [||]; Parsetree.loc = loc }
-let r = { a; b; c }
-let r = { A.a = a; b }
-let r = { A.a = a; b; C.c = c }
-let r = { Parsetree.pexp_attributes = pexp_attributes; Parsetree.loc = loc }
-let r = { Parsetree.pexp_attributes = pexp_attributes; Parsetree.loc = loc }
-let r = { a = (expr : int); b = (x : string) }
-let r = { expr with pexp_attributes = [||] }
-let r = { expr with pexp_attributes = [||]; pexp_loc = loc }
-let r = { expr with pexp_attributes = [||] }
-let r = { (make () : myRecord) with foo = bar }
-let r = { (make () : myRecord) with foo = bar }
-let r =
-  {
-    x = ((None)[@res.optional ]);
-    y = ((None)[@res.optional ]);
-    z = (((None : tt))[@res.optional ])
-  }
-let z name = { name = ((name)[@res.optional ]); x = 3 }
-let z name = { name = ((name)[@res.optional ]); x = 3 }
-let z name = { name; x = ((x)[@res.optional ]) }
-let zz name = { name; x = ((x)[@res.optional ]) }
-let _ =
-  match z with
-  | { x = ((None)[@res.optional ]); y = ((None)[@res.optional ]);
-      z = (((None : tt))[@res.optional ]) } -> 11
-  | { name = ((name)[@res.optional ]); x = 3 } -> 42
-  | { name = ((name)[@res.optional ]); x = 3 } -> 4242
-  | { x = ((None)[@res.optional ]); y = ((None)[@res.optional ]);
-      z = (((None : tt))[@res.optional ]) } -> 11
-  | { name = ((name)[@res.optional ]); x = 3 } -> 42
-  | { name = ((name)[@res.optional ]); x = 3 } -> 4242
-type nonrec tt = {
-  x: int ;
-  y: string [@ns.opttinal ]}
-type nonrec ttt = {
-  x: int ;
-  y: string [@res.optional ]}
-type nonrec multipleWithAttrs = {
-  x: int ;
-  y: string [@res.optional ][@attr ]}
-type nonrec singleWithAttrs = {
-  y: string [@res.optional ][@attr ]}
-type nonrec inlineWithAttrs =
-  | A of {
-  value: string [@as {js|VALUE|js}]} 
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/sideEffects.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/sideEffects.res.txt
deleted file mode 100644
index aaa9b7e..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/sideEffects.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-;;foo ()
-;;bar ()
-let () = ((foo (); bar ())[@res.braces ])
-let () =
-  ((let x = 1 in
-    sideEffect ();
-    (let y = 2 in sideEffect2 (); (let z = 3 in sideEffect3 ())))
-  [@res.braces ])
-;;while true do
-    sideEffect1 ();
-    (let x = 1 in sideEffect2 (); (let y = 2 in sideEffect3 ())) done
-;;match color with
-  | Blue -> (getResult (); sideEffect (); (let x = 1 in sideEffect2 ()))
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/switch.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/switch.res.txt
deleted file mode 100644
index 520fe4f..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/switch.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-;;match x with | A -> () | B -> ()
-;;match a + b with | _ -> ()
-;;match a + b with | _ -> ()
-;;match (a, b) with | (Some a, Some b) -> (a + b) + c | _ -> 3
-;;match person1 with
-  | Teacher _ -> ()
-  | Student { reportCard = { gpa } } when gpa < 0.5 ->
-      Js.log {js|What's happening|js}
-  | Student { reportCard = { gpa } } when gpa > 0.9 ->
-      Js.log {js|Take more free time, you study too much.|js}
-  | Student _ -> Js.log {js|Heyo|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/try.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/try.res.txt
deleted file mode 100644
index 5516982..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/try.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-;;try ((let x = 1 in let y = 2 in dangerousCall (x + y))[@res.braces ])
-  with | Foo -> Js.log {js|catched Foo|js}
-  | Exit -> Js.log {js|catched exit|js}
-;;try myDangerousFn () with | Foo -> Js.log {js|catched Foo|js}[@@attr ]
-let x = ((let y = 1 in try ((apply y)[@res.braces ]) with | _ -> 2)
-  [@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/tuple.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/tuple.res.txt
deleted file mode 100644
index c4d9728..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/tuple.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-let x = (1, 2, 3)
-let x = (1, 2, 3)
-let x = ((1 : int), (2 : int), (3 : int))
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/tupleVsDivision.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/tupleVsDivision.res.txt
deleted file mode 100644
index 1901988..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/tupleVsDivision.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-;;(foo ()) / 1
-;;foo ()
-;;(1, 2) |. printTuple
-let f () = (((foo ()) / 1; foo (); (1, 2) |. printTuple)[@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/unary.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/unary.res.txt
deleted file mode 100644
index c919555..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/unary.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-let x = not true
-let m = (-1)
-let m = (-2.5)
-let x = 5
-let x = 5.4
-let b = (-1n)
-let b = 1n
-let sum = (- a) - (- b)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/unaryOrBinary.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/unaryOrBinary.res.txt
deleted file mode 100644
index 517a93d..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/unaryOrBinary.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-;;- x
-let width =
-  (((w -. innerLeft) -. imageWidth) -. imageRightGap) -. rowInnerRight
-let width = (((w - innerLeft) - imageWidth) - imageRightGap) - rowInnerRight
-let width =
-  ((w; -. innerLeft; -. imageWidth; -. imageRightGap; -. rowInnerRight)
-  [@res.braces ])
-let width = ((w; - innerLeft; - imageWidth; - imageRightGap; - rowInnerRight)
-  [@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/uncurried.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/uncurried.res.txt
deleted file mode 100644
index 49f5b00..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/uncurried.res.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-let f = ((Function$ (fun a -> fun b -> a + b))[@res.arity 2])
-let f = ((Function$ (fun a -> ((Function$ (fun b -> a + b))[@res.arity 1])))
-  [@res.arity 1])
-let f =
-  ((Function$
-      (fun a ->
-         fun b -> ((Function$ (fun c -> fun d -> ((a + b) + c) + d))
-           [@res.arity 2])))
-  [@res.arity 2])
-let f =
-  ((Function$
-      ((fun a ->
-          ((fun b ->
-              ((Function$ ((fun c -> ((fun d -> ())[@res.braces ][@attr4 ]))
-                  [@attr3 ]))
-              [@res.arity 1]))
-          [@res.braces ][@attr2 ]))
-      [@attr ]))
-  [@res.arity 1])
-let f =
-  ((Function$
-      (fun ((a)[@attr ]) ->
-         fun ((b)[@attr2 ]) ->
-           ((Function$ (fun ((c)[@attr3 ]) -> fun ((d)[@attr4 ]) -> ()))
-           [@res.arity 2])))
-  [@res.arity 2])
-let f =
-  ((Function$
-      (fun ((a)[@attr ]) ->
-         fun ((b)[@attr2 ]) ->
-           ((Function$ (fun ((c)[@attr3 ]) -> fun ((d)[@attr4 ]) -> ()))
-           [@res.arity 2])))
-  [@res.arity 2])
-;;((add 1 2)[@res.uapp ])
-;;((((((add 2 3 4)[@res.uapp ]) 5 6 7)[@res.uapp ]) 8 9 10)[@res.uapp ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/underscoreApply.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/underscoreApply.res.txt
deleted file mode 100644
index dc26968..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/underscoreApply.res.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-let l =
-  ([1; 2; 3] |. (fun __x -> List.map (fun i -> i + 1) __x)) |.
-    (fun __x -> List.filter (fun i -> i > 0) __x)
-let l = (fun i -> i + 1) |. (fun __x -> List.map __x [1; 2; 3])
-let x __x = List.length __x
-let nested x __x = List.length __x
-let incr ~v:((v)[@res.namedArgLoc ])  = v + 1
-let l1 = ([1; 2; 3] |> (List.map (fun __x -> incr ~v:__x))) |> List.length
-let l2 = ([1; 2; 3] |> (List.map (fun __x -> incr ~v:__x))) |> List.length
-let optParam ?v:((v)[@res.namedArgLoc ])  () = ((if v = None then 0 else 1)
-  [@res.ternary ])
-let l1 =
-  ([Some 1; None; Some 2] |> (List.map (fun __x -> optParam ?v:__x ()))) |>
-    List.length
-let l2 =
-  ([Some 1; None; Some 2] |> (List.map (fun __x -> optParam ?v:__x ()))) |>
-    List.length
-;;fun __x ->
-    underscoreWithComments (fun x -> ((something ())[@res.braces ])) __x
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/expected/while.res.txt b/jscomp/syntax/tests/parsing/grammar/expressions/expected/while.res.txt
deleted file mode 100644
index bb1652c..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/expected/while.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-;;while not eofReached do
-    let a = 1 in let b = 2 in Lexbuf.next (); (a + b) |. Js.log done
-;;while (not (isLineEnding buf)) && true do foo (); next () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/extension.res b/jscomp/syntax/tests/parsing/grammar/expressions/extension.res
deleted file mode 100644
index 8f363f4..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/extension.res
+++ /dev/null
@@ -1,9 +0,0 @@
-%expr
-
-%expr.extension
-
-%expr.extension.with.args("argument")
-
-%expr.extension.with.args(x => f(x))
-
-let x = %bs.raw("1") + %bs.raw("2")
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/firstClassModule.res b/jscomp/syntax/tests/parsing/grammar/expressions/firstClassModule.res
deleted file mode 100644
index e4c732b..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/firstClassModule.res
+++ /dev/null
@@ -1,95 +0,0 @@
-let makeSet = (type s, cmp) => {
-  module S = Set.Make({
-    type t = s
-    let compare = cmp
-  })
-  module(S : Set.S with type elt = s) // <- here
-}
-
-let three = module(Three : X_int)
-let numbers = [three, module(Four)]
-let numbers = (three, module(Four))
-let numbers = list{three, module( Four )}
-
-let numbers = [three, module({let x = 4})]
-let numbers = (three, module({let x = 4}))
-let numbers = list{three, module({let x = 4})}
-
-let plus = (m1, m2) => {
-  module({
-    let x = to_int(m1) + to_int(m2)
-  }: X_int)
-}
-
-let plus = (m1, m2) => module({
-  let x = to_int(m1) + to_int(m2)
-}: X_int)
-
-let unique_instance = module({
-  module Query_handler = Unique
-  let this = Unique.create(0)
-} : Query_handler_instance)
-
-let build_instance = (
-  type a,
-  module(Q: Query_handler with type config = a),
-  config
-) => module({
-  module Query_handler = Q
-  let this = Q.create(config)
-}: Query_handler_instance)
-let build_instance = (
-  type a,
-  module(Q: Query_handler with type config = a),
-  config
-) => {
-  module({
-    module Query_handler = Q
-    let this = Q.create(config)
-  }: Query_handler_instance)
-}
-
-let unique_instance = build_instance(module(Unique), 0)
-
-let build_dispatch_table = handlers => {
-  let table = Hashtbl.create(module(String))
-  List.iter(handlers, ~f=(module(I: Query_handler_instance) as instance) =>
-    Hashtbl.set(table, ~key=I.Query_handler.name, ~data=instance), table
-  )
-}
-
-module(Three)
-module(Three: X_int)
-
-module(Teenager)[0]
-module(Teenager)->age->Js.log
-module(Teenager)[0]->Js.log
-module(Teenager)->age->isAdult ? Js.log("has responsibilities")  : Js.log("can play in the playground")
-module(Streets)[0]->isExpensive ? Js.log("big money") : Js.log("affordable")
-
-let () = {
-  module(Teenager)->age->Js.log
-}
-let () = {
-  module(Teenager)[0]
-}
-let () = {
-  module(Teenager)->age->isAdult ? Js.log("has responsibilities")  : Js.log("can play in the playground")
-}
-let () = {
-  module(Streets)[0]->isExpensive ? Js.log("big money") : Js.log("affordable")
-}
-
-let () = {
-  let a = 1
-  let b = 2
-  module(Teenager)[0]
-  module(Teenager)->age->Js.log
-}
-
-let () = {
-  let a = 1
-  let b = 2
-  module(Teenager)->age->Js.log
-  module(Teenager)[0]->age->isAdult ? Js.log("has responsibilities")  : Js.log("can play in the playground")
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/float.res b/jscomp/syntax/tests/parsing/grammar/expressions/float.res
deleted file mode 100644
index f827334..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/float.res
+++ /dev/null
@@ -1,9 +0,0 @@
-1. /. 2.
-
-3. *. 4.
-
-2. ** 2.
-
-10.2 +. 5.4
-
-28.9 -. 13.8
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/for.res b/jscomp/syntax/tests/parsing/grammar/expressions/for.res
deleted file mode 100644
index 036a4cb..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/for.res
+++ /dev/null
@@ -1,22 +0,0 @@
-for p in 0 to 10 {
-   () 
-}
-
-for p in 10 downto 0 {
-   () 
-}
-
-for (p in a to b) {
-  ()
-}
-
-for (p in a to b) {
-  let a = 1
-  let b = 2
-  a + b
-}
-
-// (x +1) { -> not an arrow expression
-for p in 0 to (x + 1) {
-  ()
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/ident.res b/jscomp/syntax/tests/parsing/grammar/expressions/ident.res
deleted file mode 100644
index 41ee4a2..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/ident.res
+++ /dev/null
@@ -1,13 +0,0 @@
-let x = foo
-
-let y = Foo.Bar.x
-
-let x = _identWithUnderscore
-let x = _ident_ident
-let x = _ident_ident_
-let x = __ident__
-
-let x = list
-let x = Foo.Bar.list
-
-let with = with
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/if.res b/jscomp/syntax/tests/parsing/grammar/expressions/if.res
deleted file mode 100644
index acb45a1..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/if.res
+++ /dev/null
@@ -1,138 +0,0 @@
-if (foo) {
-  true
-} else {
-  false
-}
-
-if foo == 2 {
-  let bar = 1
-  let foo = 2
-  bar + foo
-}
-
-let ifThenElse = if foo {
-   lala
-} else {
-  doStuff(x, y, z,)
-}
-
-let ifElseIfThen =
-  if foo == bar {
-    f()
-  } else if foo == bar2 {
-    f1()
-  } else if foo == bar3 {
-    f2()
-  } else {
-    f3()
-  }
-
-let x = if true { 1 } else { 2 } + if false { 2 } else { 3 }
-
-// Basic
-// if let Some(x) = foo() {
-  // doSomethingWithX(x)
-// }
-
-// Else branch
-// if let Some(x) = foo(){
-  // doSomethingWithX(x)
-// } else {
-  // doSomethingElse()
-// }
-
-// Else-if support
-// if let Some(x) = foo(){
-  // doSomethingWithX(x)
-// } else if let Some(y) = bar(){
-  // doSomethingWithY(y)
-// } else {
-  // doSomethingElse()
-// }
-
-// Mixed conditions, pattern start
-// if let Some(x) = foo(){
-  // doSomethingWithX(x)
-// } else if n > 10 {
-  // doSomethingWithForN()
-// } else {
-  // doSomethingElse()
-// }
-
-// Mixed conditions, condition start
-// if n > 10 {
-  // doSomethingWithForN()
-// } else if let Some(x) = foo() {
-  // doSomethingWithX(x)
-// } else {
-  // doSomethingElse()
-// }
-
-// Maintains attrs correctly
-// if n > 10 {
-  // @aa
-  // doSomethingWithForN()
-// } else if let @bb Some(@cc x) = @dd foo() {
-  // @ee
-  // doSomethingWithY(x)
-// } else {
-  // @ff
-  // doSomethingElse()
-// }
-
-// if let Some(x) = foo() {
-  // doSomethingWithX(x)
-// } else if let Some(y) = bar() {
-  // doSomethingWithY(y)
-// } else if let Some(z) = baz() {
-  // doSomethingWithZ(z)
-// }
-
-// full destructuring
-// if let Some(Thing(With({
-  // many: Internal([Components, q]),
-// }))) as p = foo() {
-  // doSomethingWithE(e)
-// }
-
-// Assignment
-// let a = if let Some(x) = foo() {
-  // x
-// } else {
-  // 123
-// }
-
-// Nesting
-// let getZ = nested =>
-  // if let Some(point) = nested.origin {
-    // if let Some(z) = point.z {
-      // z
-    // } else {
-      // 0
-    // }
-  // } else {
-    // 0
-  // }
-
-// Complex nesting
-// if let Some(Thing(With({many: Internal([Components, q])}))) as p = foo() {
-  // if let Other(Thing(With({many: Internal([Components, q])}))) as p = foo() {
-    // doSomethingElse(e)
-  // }
-  // doSomethingWithE(e)
-// } else if let Some(Thing(With({
-  // many: Internal([Components, q]),
-// }))) as p = foo() {
-  // doSomethingWithE(e)
-// } else if let Some(Thing(With({
-  // many: Internal([Components, q]),
-// }))) as p = foo() {
-  // doSomethingWithE(e)
-// }
-
-// Mixed with ternary
-// let a = b ? if let Some(x) = foo() {
-  // 1
-// } else {
-  // 2
-// } : 3
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/infix.res b/jscomp/syntax/tests/parsing/grammar/expressions/infix.res
deleted file mode 100644
index 569fb4f..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/infix.res
+++ /dev/null
@@ -1,9 +0,0 @@
-a->f(b)
-
-"string1" ++ "string2"
-
-a != b
-a !== b
-
-a == b
-a === b
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/jsx.res b/jscomp/syntax/tests/parsing/grammar/expressions/jsx.res
deleted file mode 100644
index e712324..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/jsx.res
+++ /dev/null
@@ -1,519 +0,0 @@
-let _ = <div> </div>
-let _ = <div></div>
-let _ = <div className="menu"> </div>
-// handle weird whitespace
-let _ = <   div className   =   "menu"  > <   /    div>
-// handle weird whitespace
-let _ = < 
-  div
-className 
-  = 
-  "menu" 
-  >
-  <
-  / 
-  div
->
-let _ = <div className="menu"></div>
-let _ = <div className="menu" onClick={_ => Js.log("click")}> </div>
-let _ = <div className="menu" onClick={_ => Js.log("click")}></div>
-
-let _ = <Navbar />
-let _ = <Navbar> </Navbar>
-let _ = <Navbar></Navbar>
-let _ = <Navbar className="menu"> </Navbar>
-
-let _ = <Dot.Up />
-let _ = <Dot.Up> </Dot.Up>
-let _ = <Dot.Up></Dot.Up>
-let _ = <Dot.Up><Dot.low /></Dot.Up>
-let _ = <Dot.Up><Dot.Up /></Dot.Up>
-let _ = <Dot.Up className="menu"> </Dot.Up>
-
-let _ = <Dot.low />
-let _ = <Dot.low> </Dot.low>
-let _ = <Dot.low></Dot.low>
-let _ = <Dot.low><Dot.Up /></Dot.low>
-let _ = <Dot.low><Dot.low /></Dot.low>
-let _ = <Dot.low className="menu"> </Dot.low>
-
-// punning
-let _ = <el punned> </el>
-let _ = <el ?punned> </el>
-let _ = <el punned />
-let _ = <el ?punned />
-
-// optional jsx-expr
-let _ = <el a=?b> </el>
-let _ = <el a=?b />
-
-// fragment
-let _ = <> </>
-// weird whitespace
-let _ = <
-  > 
-<
-  /
-  >
-
-// parse nested jsx
-let _ =
-  <div className="menu">
-    <div className="submenu"> sub1 </div>
-    <div className="submenu"> sub2 </div>
-  </div>
-  
-// parse nested jsx with weird whitespace
-let _ =
-  < div className="menu">
-    <       div className="submenu"> sub1 <  /   div>
-    <     div className="submenu"> sub2 <   /  div>
-  <    /    div>
-
-// spread
-let _ = <div> ...child </div>
-let _ = <Foo> ...(a => 1) </Foo>
-let _ = <Foo> ...<Foo2 /> </Foo>
-let _ = <Foo> ...[a] </Foo>
-let _ = <Foo> ...(1, 2) </Foo>
-let _ = <Foo> ...(1, 2)</Foo> // no whitespace between / & </
-
-// children
-let _ = <div> ident [1, 2, 3] {call(a, b)} x.y.z </div>
-
-// jsx as prop
-let _ = <Outer inner=<Inner /> />
-
-let _ = <div onClick=onClickHandler> <> "foobar" </> </div>
-
-
-let _ =
-   <Window
-      style={
-        width: 10,
-        height: 10,
-        paddingTop: 10,
-        paddingLeft: 10,
-        paddingRight: 10,
-        paddingBottom: 10,
-      }
-  />
-
-let _ = <OverEager fiber=Metal.fiber />
-
-
-let arrayOfListOfJsx = [<> </>]
-let arrayOfListOfJsx = [<> <Foo> </Foo> </>]
-let arrayOfListOfJsx = [<> <Foo /> </>, <> <Bar /> </> ]
-
-
-let sameButWithSpaces = [ <> </>]
-let sameButWithSpaces = [ <> <Foo /> </>]
-let sameButWithSpaces = [ <> <Foo /> </>, <> <Bar /> </>]
-let sameButWithSpaces = [ <> <Foo /> </>, <> <Bar /> </>]
-
-/*
- * Test named tag right next to an open bracket.
- */
-let arrayOfJsx = [];
-let arrayOfJsx = [<Foo> </Foo>];
-let arrayOfJsx = [<Foo />, <Bar /> ]
-
-let sameButWithSpaces = []
-let sameButWithSpaces = [<Foo />]
-let sameButWithSpaces = [<Foo />, <Bar />]
-
-
-// doesn't make sense, make sure we have test coverage
-let _ = <a /> < <b />
-let _ = <a /> > <b />
-let _ = <a> </a> < <b> </b>
-let _ = <a> </a> > <b> </b>
-
-let y =
-  <Routes
-    path=Routes.stateToPath(state)
-    isHistorical=true
-    onHashChange={(_oldPath,_oldUrl,newUrl) =>
-      updater((latestComponentBag,_) => {
-         let currentActualPath = Routes.hashOfUri(newUrl);
-         let pathFromState = Routes.stateToPath(latestComponentBag.state);
-         currentActualPath == pathFromState ?
-           None : dispatchEventless(State.UriNavigated(currentActualPath),latestComponentBag,())
-       },
-       ()
-     )
-   }
-  />
-
-let z =
-  <div
-    style=ReactDOMRe.Style.make(
-              ~width,
-              ~height,
-              ~color,
-              ~backgroundColor,
-              ~margin,
-              ~padding,
-              ~border,
-              ~borderColor,
-              ~someOtherAttribute,
-              ())
-    key=string_of_int(1)
-  />
-
-let omega =
-  <div
-    aList=list{
-      width,
-      height,
-      color,
-      backgroundColor,
-      margin,
-      padding,
-      border,
-      borderColor,
-      someOtherAttribute
-    }
-    key=string_of_int(1)
-  />
-
-let someArray = <div
- anArray=[width, height, color, backgroundColor, margin, padding, border,borderColor,someOtherAttribute] key=string_of_int(1) />
-
-let tuples =
-  <div
-    aTuple=(width,
-            height,
-            color,
-            backgroundColor,
-            margin,
-            padding,
-            border,
-            borderColor,
-            someOtherAttribute,
-            definitelyBreakere)
-    key=string_of_int(1)
-  />
-
-let icon =
-  <Icon
-    name={switch (state.volume) {
-     | v when v < 0.1 => "sound-off"
-     | v when v < 0.11 => "sound-min"
-     | v when v < 0.51 => "sound-med"
-     | _ => "sound-max"
-     }
-   }
-  />
-
-let _ = <MessengerSharedPhotosAlbumViewPhotoReact
-  ref=?(
-         foo["bar"] === baz ?
-           Some(foooooooooooooooooooooooo(setRefChild)) : None
-       )
-  key=node["legacy_attachment_id"]
-/>
-
-/* punning */
-let _ = <Foo bar />
-
-/* punning for explicitly passed optional */
-let _ = <Foo bar=?bar />
-
-/* don't pun explicitly passed optional with module identifier */
-let _ = <Foo bar=?Baz.bar />
-
-let x = <div />
-
-let _ = <div asd=1></div>
-
-foo["bar"] = <bar />
-foo #= <bar />
-foo #=<bar />
-
-let x =[<div />]
-
-
-let z = (<div />)
-
-let z = (<Button onClick=handleStaleClick />, <Button onClick=handleStaleClick />)
-
-let y = [<div />, <div />];
-
-let y = [<Button onClick=handleStaleClick />, <Button onClick=handleStaleClick />]
-
-let _ = <Description term={<Text text="Age" />}> child </Description>
-let _ = <Description term={Text.createElement(~text="Age", ~children=[], ())}> child </Description>
-let _ = <Description term={@JSX Text.createElement(~text="Age", ())}> child </Description>
-
-let _ = <Description term={<Text superLongPunnedProp anotherSuperLongOneCrazyLongThingHere text="Age" />}> child </Description>
-
-let _ = <Foo bar={<Baz superLongPunnedProp anotherSuperLongOneCrazyLongThingHere/>}/>
-
-let _ = <div><span>(str("hello"))</span></div>
-
-let _ =<description term={<text text="Age" />}>child</description>
-
-let _ = <description term={text(~text="Age",~children=[], ())}>child</description>
-let _ = <description term={@JSX text(~text="Age",~children=[])}>child</description>
-let _ = <description term={@JSX text(~text="Age", ())}>child</description>
-
-let _ = <description term={<div superLongPunnedProp anotherSuperLongOneCrazyLongThingHere text="Age" />}> child </description>
-
-let _ = <div onClick={(event) => handleChange(event)} />
-let _ = <div onClick={(eventWithLongIdent) => handleChange(eventWithLongIdent)} />
-let _ = <div
-  onClick={(event) => {
-    Js.log(event)
-    handleChange(event)
-  }}
-/>
-
-let _ = <StaticDiv
-  onClick={(foo, bar, baz, lineBreak, identifier) => {
-    doStuff(foo, bar, baz);
-    bar(lineBreak, identifier);
-  }}
-/>
-
-let _ = <AttrDiv onClick={@bar (event) => handleChange(event)} />
-let _ = <AttrDiv onClick={@bar (eventLongIdentifier) => handleChange(eventLongIdentifier)} />
-
-let _ = <StaticDivNamed
-  onClick={(
-    ~foo,
-    ~bar,
-    ~baz,
-    ~lineBreak,
-    ~identifier,
-    ()
-  ) =>
-    bar(lineBreak, identifier)
-  }
-/>
-
-let _ = <div
-  onClick={(e): event => {
-    doStuff()
-    bar(foo)
-  }}
-/>
-
-let _ = <div
-  onClick={(e, e2): event => {
-    doStuff()
-    bar(foo)
-  }}
-/>
-
-let _ = <div
-  onClick={(
-    foo,
-    bar,
-    baz,
-    superLongIdent,
-    breakLine,
-  ): (
-    event,
-    event2,
-    event3,
-    event4,
-    event5
-  ) => {
-    doStuff()
-    bar(foo)
-  }}
-/>
-
-let _ = <div
-  onClick={(
-    foo,
-    bar,
-    baz,
-    superLongIdent,
-    breakLine,
-  ): (
-    event,
-    event2,
-    event3,
-    event4,
-    event5
-  ) =>
-    doStuff()
-  }
-/>;
-
-let _ = <div>
-  {switch(color) {
-    | Black => ReasonReact.string("black")
-    | Red => ReasonReact.string("red")
-    }}
-</div>
-
-let _ = <div
- style={
-   @foo
-   ReactDOMRe.Style.make(
-     ~width="20px",
-     ~height="20px",
-     ~borderRadius="100%",
-     ~backgroundColor="red",
-   )
- }
-/>
-
-let _ = <Animated initialValue=0.0 value>
-  ...{
-       ReactDOMRe.Style.make(
-         ~width="20px",
-         ~height="20px",
-         ~borderRadius="100%",
-         ~backgroundColor="red",
-       )
-     }
-</Animated>
-
-let _ = <Animated initialValue=0.0 value>
-  ...{ value =>
-         <div
-           style={
-             ReactDOMRe.Style.make(
-               ~width="20px",
-               ~height="20px",
-               ~borderRadius="100%",
-               ~backgroundColor="red",
-             )
-           }
-         />
-     }
-</Animated>
-
-let _ = <Animated initialValue=0.0 value>
-  ...{(value) :ReasonReact.element =>
-       <div
-         style={
-           ReactDOMRe.Style.make(
-             ~width="20px",
-             ~height="20px",
-             ~borderRadius="100%",
-             ~backgroundColor="red",
-           )
-         }
-       />
-   }
-</Animated>
-
-let _ = <Animated initialValue=0.0 value>
-  ...{@foo value => {
-       <div
-         style={
-           ReactDOMRe.Style.make(
-             ~width="20px",
-             ~height="20px",
-             ~borderRadius="100%",
-             ~backgroundColor="red",
-           )
-         }
-       />
-   }
- }
-</Animated>
-
-let _ = <Animated initialValue=0.0 value>
-  ...{value => {
-       let width = "20px";
-       // TODO: check semi
-       let height = "20px";
-
-       <div
-         style={
-           ReactDOMRe.Style.make(
-             ~width,
-             ~height,
-             ~borderRadius="100%",
-             ~backgroundColor="red",
-           )
-         }
-       />
-     }
-  }
-</Animated>
-
-let _ = <div callback={reduce(() => !state)} />
-
-let _ = <button ?id className={Cn.make(["button", "is-fullwidth"])} onClick>
-  {"Submit" |> ste}
-</button>
-
-let _ = <button ?id className={Cn.make(list{"button", "is-fullwidth"})} onClick>
-  {"Submit" |> ste}
-</button>
-
-let _ = <button ?id className={Cn.make(("button", "is-fullwidth"))} onClick>
-  {"Submit" |> ste}
-</button>
-
-let _ = <button ?id className={Cn.make({a: b})} onClick>
-  {"Submit" |> ste}
-</button>
-
-let _ = <X y={z->Belt.Option.getWithDefault("")} />
-
-let _ = <div style={getStyle()}> {ReasonReact.string("BugTest")} </div>;
-
-let _ = <div>
-  {
-    let left = limit->Int.toString
-    `${left} characters left`->React.string
-  }
-</div>
-
-let _ = <View style=styles["backgroundImageWrapper"]>
-  {
-    // TODO: semicolon
-    let uri = "/images/header-background.png";
-    <Image
-      resizeMode=Contain
-      style=styles["backgroundImage"]
-      uri
-    />
-  }
-</View>
-
-<div>
-  {possibleGradeValues
-  |> List.filter(g => g <= state.maxGrade)
-  |> List.map(possibleGradeValue =>
-      <option
-        key={possibleGradeValue |> string_of_int}
-        value={possibleGradeValue |> string_of_int}>
-        {possibleGradeValue |> string_of_int |> str}
-      </option>
-    )
-  |> Array.of_list
-  |> ReasonReact.array}
-</div>;
-
-// https://github.com/rescript-lang/syntax/issues/113
-// <= should be scanned as <=
-<div>  {Js.log(a <= 10)} </div>
-<div> <div> {Js.log(a <= 10)} </div> </div>
-<div> <div onClick={_ => Js.log(a <= 10) }> <div> {Js.log(a <= 10)} </div> </div> </div>
-
-
-<div> ...element </div>
-<div> ...{(a) => 1} </div>
-<div> ...<span /> </div>
-<div> ...[a] </div>
-<div> ...(1, 2) </div>
-<div> ...{array->f} </div>
-
-<> ...element </>
-<> ...{(a) => 1} </>
-<> ...<span /> </>
-<> ...[a] </>
-<> ...(1, 2) </>
-<> ...{array->f} </>
-
-let _ = <A x="y" {...str} />
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/list.res b/jscomp/syntax/tests/parsing/grammar/expressions/list.res
deleted file mode 100644
index 376db1a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/list.res
+++ /dev/null
@@ -1,19 +0,0 @@
-// empty list
-let x = list{}
-
-let x = list{1, 2, 3}
-
-// trailing comma
-let x = list{1, 2, 3,}
-
-// with constrained expressions
-let x = list{1: int, (2: int), 3: int}
-
-// spread
-let x = list{4, 5, ...y}
-
-// spread anywhere
-let x = list{1, ...x, 2, 3, ...x}
-
-// spread constrained expression
-let x = list{1, 2, ...y: list<int>}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/locallyAbstractTypes.res b/jscomp/syntax/tests/parsing/grammar/expressions/locallyAbstractTypes.res
deleted file mode 100644
index 60a0a94..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/locallyAbstractTypes.res
+++ /dev/null
@@ -1,13 +0,0 @@
-let f = (type t, xs : list<t>) => ()
-let f = (type t, xs : list<t>, type s, ys : list<s>) => ()
-let f = (type t u v, xs : list<(t, u, v)>) => ()
-let f = (type t u v, xs : list<(t, u, v)>, type s w z, ys : list<(s, w, z)>) => ()
-let f = @attr (type t u v, xs : list<(t, u, v)>, @attr2 type s w z, ys : list<(s, w, z)>) => ()
-let f = (@attr type t, @attr type s, xs: list<(t, s)>,  @attr type u, @attr type v w, ys: list<(u, v, w)>) => ()
-
-
-let cancel_and_collect_callbacks:
-  'a 'u 'c.
-  (list<packed_callbacks>, promise<'a, 'u, 'c>) => list<packed_callbacks>
- =
-  (type x, callbacks_accumulator, p: promise<_, _, c>) => ();
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/parenthesized.res b/jscomp/syntax/tests/parsing/grammar/expressions/parenthesized.res
deleted file mode 100644
index 5efe5ba..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/parenthesized.res
+++ /dev/null
@@ -1,54 +0,0 @@
-let x = (1)
-let f = (1.3)
-
-let truth = (true)
-let truth = (false)
-
-let constructor = (None)
-
-let longidentConstructor = (Option.None)
-
-let txt = ("a string") 
-
-let otherTxt = (`foo bar ${txt}`)
-
-let ident = (myIdent)
-
-let aList = (list{1, 2})
-
-let anArray = ([1, 2])
-
-let aTuple = ((1, 2))
-
-let aRecord = ({name: "steve", age: 30})
-
-let blockExpression = ({
-  let a = 1
-  let b = 2
-  a + b
-})
-
-let assertSmthing = (assert(true))
-
-let lazyThing = (lazy true)
-
-let jsx = (<div className="cx"> foo </div>)
-
-let ifExpr = (if true {
-  Js.log(true)
-} else {
-  Js.log(false)
-})
-
-let forExpr = (for p in 0 to 10 { () })
-
-let whileExpr = (while true {
-  doSomeImperativeThing()
-})
-
-let switchExpr = (switch myVar {
-  | Blue => "blue"
-  | Red => "red"
-})
-
-let constrainedExpr = (x :int)
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/polyvariant.res b/jscomp/syntax/tests/parsing/grammar/expressions/polyvariant.res
deleted file mode 100644
index 83d6602..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/polyvariant.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let x = #Red
-
-// sugar for Rgb(())
-let z = #Rgb()
-
-let v = #Vertex(1., 2., 3., 4.)
-
-let animation = #"ease-in"
-
-let one = #1
-let fortyTwo = #42
-let long = #42444
-
-let oneString = #1("payload")
-let twoIntString = #2(3, "payload")
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/primary.res b/jscomp/syntax/tests/parsing/grammar/expressions/primary.res
deleted file mode 100644
index 1d016a7..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/primary.res
+++ /dev/null
@@ -1,49 +0,0 @@
-// field expressions
-let x = a.b
-let x = a.b.c
-let x = H20.Water.water.h
-let x = p.Parser.token
-let x = p.Lang.Parser.token.pos
-
-// set field
-lexbuf.lnum = lexbuf.lnum + 1
-parser.lexbuf.lnum = parser.lexbuf.lnum + 1
-
-// array access sugar
-let x = arr[0]
-let x = arr[x: int]
-// multiple
-let x = arr[0][1]
-let x = arr[x: int][y: int]
-
-// array mutation sugar
-arr[0] = a + b
-
-// call expressions
-f()
-f()()
-f(a)
-f(a)(a)
-f(a,) // trailing comma
-f(x : int)
-f(a, b, c)
-f(a, b, c,) // trailing comma
-
-// labelled arguments
-f(~a, ~b=bArg, ~c?, ~d=?expr,)
-f(~a, ~b=bArg, ~c?, ~d=?expr,)(~a, ~b=bArg, ~c?, ~d=?expr,)(~a, ~b=bArg, ~c?, ~d=?expr,)
-
-// labelled argumetns with constraints
-f(~a=x :int, ~b=? y: int)
-
-// Bucklescript ## sugar
-connection["platformId"]
-connection["left"]["account"]["accountName"]
-
-// Bucklescript #= sugar
-john["age"] = 99
-john["son"]["age"] = steve["age"] - 5
-
-// interpret strings correct
-dict["\n"] = abc
-dict["\""] = dict2["\""]
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/record.res b/jscomp/syntax/tests/parsing/grammar/expressions/record.res
deleted file mode 100644
index 8a78964..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/record.res
+++ /dev/null
@@ -1,54 +0,0 @@
-let r = {a: expr}
-let r = {a: expr,} // trailing comma
-
-let r = {Parsetree.pexp_attributes: [], Parsetree.loc: loc}
-
-// punning
-let r = {a, b, c} 
-let r = {A.a, b}
-let r = {A.a, b, C.c}
-
-let r = {Parsetree.pexp_attributes, Parsetree.loc}
-// trailing comma
-let r = {Parsetree.pexp_attributes, Parsetree.loc,}
-
-// with constraint
-let r = {a: (expr : int), b: (x : string)}
-
-// spread
-let r = {...expr, pexp_attributes: []}
-let r = {...expr, pexp_attributes: [], pexp_loc: loc}
-let r = {...expr, pexp_attributes: [],} // trailing comma
-
-// with type constraint on spread
-let r = {...make() : myRecord, foo: bar}
-let r = {...(make() : myRecord), foo: bar} // parens optional
-
-let r = {x: ? None, y: ?None, z: ? (None:tt)}
-
-let z = name => { name : ? name, x: 3}
-
-let z = name => { ? name, x: 3}
-
-let z = name => { name, ? x }
-
-let zz = name => { name, ? x }
-
-let _ = switch z {
-  | {x: ? None, y: ? None, z: ? (None:tt)} => 11
-  | {name:  ? name, x: 3} => 42
-  | {? name, x: 3} => 4242
-  | {x: ? None, y: ? None, z: ? (None:tt)} => 11
-  | {name: ? name, x: 3} => 42
-  | {? name, x: 3} => 4242
-}
-
-type tt = {x:int, @ns.opttinal y : string}
-
-type ttt = {x:int, y?: string}
-
-type multipleWithAttrs = {x:int, @attr y?: string}
-
-type singleWithAttrs = {@attr y?: string}
-
-type inlineWithAttrs = | A({@as("VALUE") value: string})
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/sideEffects.res b/jscomp/syntax/tests/parsing/grammar/expressions/sideEffects.res
deleted file mode 100644
index 7d1144d..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/sideEffects.res
+++ /dev/null
@@ -1,32 +0,0 @@
-foo()
-bar()
-
-let () = {
-  foo()
-  bar()
-}
-
-let () = {
-  let x = 1
-  sideEffect()
-  let y = 2
-  sideEffect2()
-  let z = 3
-  sideEffect3()
-}
-
-while true {
-  sideEffect1()
-  let x = 1
-  sideEffect2()
-  let y = 2
-  sideEffect3()
-}
-
-switch color  {
-  | Blue =>
-    getResult()
-    sideEffect()
-    let x = 1
-    sideEffect2()
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/switch.res b/jscomp/syntax/tests/parsing/grammar/expressions/switch.res
deleted file mode 100644
index f997bbc..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/switch.res
+++ /dev/null
@@ -1,29 +0,0 @@
-switch x {
-| A => ()
-| B => ()
-}
-
-// parens optional
-switch (a + b) {
-| _ => ()
-}
-
-switch a + b {
-| _ => ()
-}
-
-switch (a, b) {
-| (Some(a), Some(b)) => a + b + c
-| _ => 3
-}
-
-switch person1 {
-| Teacher(_) => () // do nothing
-| Student({reportCard: {gpa}}) if gpa < 0.5 =>
-  Js.log("What's happening")
-| Student({reportCard: {gpa}}) if gpa > 0.9 =>
-  Js.log("Take more free time, you study too much.")
-| Student(_) =>
-  // fall-through, catch-all case
-  Js.log("Heyo")
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/try.res b/jscomp/syntax/tests/parsing/grammar/expressions/try.res
deleted file mode 100644
index a61cc70..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/try.res
+++ /dev/null
@@ -1,22 +0,0 @@
-try {
-  let x = 1
-  let y = 2
-  dangerousCall(x + y)
-} catch {
-| Foo => Js.log("catched Foo")
-| Exit => Js.log("catched exit")
-}
-
-@attr
-try myDangerousFn() catch {
-| Foo => Js.log("catched Foo")
-}
-
-let x = {
-  let y = 1
-  try {
-    apply(y)
-  } catch {
-  | _ => 2
-  }
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/tuple.res b/jscomp/syntax/tests/parsing/grammar/expressions/tuple.res
deleted file mode 100644
index b824902..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/tuple.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let x = (1, 2, 3)
-
-// trailing comma
-let x = (1, 2, 3,)
-
-// with constrained expression
-let x = (1 : int, (2: int), 3 : int)
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/tupleVsDivision.res b/jscomp/syntax/tests/parsing/grammar/expressions/tupleVsDivision.res
deleted file mode 100644
index 26eff64..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/tupleVsDivision.res
+++ /dev/null
@@ -1,11 +0,0 @@
-foo() / 1
-
-foo()
-(1, 2)->printTuple
-
-let f = () => {
-  foo() / 1
-
-  foo()
-  (1, 2)->printTuple
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/unary.res b/jscomp/syntax/tests/parsing/grammar/expressions/unary.res
deleted file mode 100644
index b675fba..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/unary.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let x = !true
-
-let m = -1
-let m = -.2.5
-let x = +5
-let x = +.5.4
-let b = -1n
-let b = +1n
-
-let sum = -a - -b
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/unaryOrBinary.res b/jscomp/syntax/tests/parsing/grammar/expressions/unaryOrBinary.res
deleted file mode 100644
index 271ef9d..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/unaryOrBinary.res
+++ /dev/null
@@ -1,35 +0,0 @@
--x
-
-// binary
-let width =
-  w
-  -. innerLeft
-  -. imageWidth
-  -. imageRightGap
-  -. rowInnerRight
-
-// binary
-let width =
-  w
-  - innerLeft
-  - imageWidth
-  - imageRightGap
-  - rowInnerRight
-
-// unary
-let width = {
-  w
-  -.innerLeft
-  -.imageWidth
-  -.imageRightGap
-  -.rowInnerRight
-}
-
-// unary
-let width = {
-  w
-  -innerLeft
-  -imageWidth
-  -imageRightGap
-  -rowInnerRight
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/uncurried.res b/jscomp/syntax/tests/parsing/grammar/expressions/uncurried.res
deleted file mode 100644
index ea82d05..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/uncurried.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let f = (. a, b) => a + b
-let f = (. a, . b) => a + b
-let f = (. a, b, . c, d) => a + b + c + d
-
-let f = @attr (. a) => @attr2 b => @attr3 (. c) => @attr4 d => ()
-let f = (. @attr a, @attr2 b, . @attr3 c, @attr4 d) => ()
-let f = (. (@attr a), (@attr2 b), . (@attr3 c), (@attr4 d)) => ()
-
-add(. 1, 2)
-add(. 2, 3, 4, . 5, 6, 7, . 8, 9, 10);
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/underscoreApply.res b/jscomp/syntax/tests/parsing/grammar/expressions/underscoreApply.res
deleted file mode 100644
index e19bd9c..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/underscoreApply.res
+++ /dev/null
@@ -1,30 +0,0 @@
-let l = list{1, 2, 3}->List.map (i => i+1, _)->List.filter(i => i > 0, _)
-
-let l = (i => i+1)->List.map(_, list{1,2,3})
-
-let x = List.length(_)
-
-let nested = x => List.length(_)
-
-let incr = (~v) => v+1
-
-let l1 = list{1, 2, 3} |> List.map(incr(~v=_)) |> List.length
-
-let l2 = list{1, 2, 3} |>List.map(incr(~v=_)) |> List.length
-
-let optParam = (~v=?, ()) => v == None ? 0 : 1
-
-let l1 =
-  list{Some(1), None, Some(2)} |> List.map(optParam(~v=?_, ())) |> List.length
-
-let l2 =
-  list{Some(1), None, Some(2)} |> List.map(optParam(~v=?_, ())) |> List.length
-
-underscoreWithComments(
-  // Comment 1
-  x => {
-    // Comment 2
-    something()
-  },
-  _,
-)
diff --git a/jscomp/syntax/tests/parsing/grammar/expressions/while.res b/jscomp/syntax/tests/parsing/grammar/expressions/while.res
deleted file mode 100644
index 7cc4844..0000000
--- a/jscomp/syntax/tests/parsing/grammar/expressions/while.res
+++ /dev/null
@@ -1,11 +0,0 @@
-while !eofReached {
-  let a = 1
-  let b = 2
-  Lexbuf.next();
-  (a + b)->Js.log
-}
-
-while (!isLineEnding(buf) && true) {
-  foo()
-  next()
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/ffi/expected/export.res.txt b/jscomp/syntax/tests/parsing/grammar/ffi/expected/export.res.txt
deleted file mode 100644
index f95dc33..0000000
--- a/jscomp/syntax/tests/parsing/grammar/ffi/expected/export.res.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-
-  Syntax error!
-  tests/parsing/grammar/ffi/export.res:1:7-11
-
-  1 │ export type callback = ReactEvent.Mouse.t => unit
-  2 │ 
-  3 │ export type t = int and export s = string
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/parsing/grammar/ffi/export.res:3:31-32
-
-  1 │ export type callback = ReactEvent.Mouse.t => unit
-  2 │ 
-  3 │ export type t = int and export s = string
-  4 │ export type t = int and s = string
-  5 │ type t = int and export s = string
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/parsing/grammar/ffi/export.res:5:24-25
-
-  3 │ export type t = int and export s = string
-  4 │ export type t = int and s = string
-  5 │ type t = int and export s = string
-  6 │ 
-  7 │ export let callback = _ => Js.log("Clicked")
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/parsing/grammar/ffi/export.res:10:40-41
-
-   8 │ export callback = _ => Js.log("Clicked")
-   9 │ 
-  10 │ export let x = "hello world" and export y = 2
-  11 │ export x = "hello world" and export y = 2
-  12 │ let x = "hello world" and export y = 2
-
-  Did you forget a `=` here?
-
-
-  Syntax error!
-  tests/parsing/grammar/ffi/export.res:12:33-34
-
-  10 │ export let x = "hello world" and export y = 2
-  11 │ export x = "hello world" and export y = 2
-  12 │ let x = "hello world" and export y = 2
-  13 │ 
-
-  Did you forget a `=` here?
-
diff --git a/jscomp/syntax/tests/parsing/grammar/ffi/export.res b/jscomp/syntax/tests/parsing/grammar/ffi/export.res
deleted file mode 100644
index da2f54e..0000000
--- a/jscomp/syntax/tests/parsing/grammar/ffi/export.res
+++ /dev/null
@@ -1,12 +0,0 @@
-export type callback = ReactEvent.Mouse.t => unit
-
-export type t = int and export s = string
-export type t = int and s = string
-type t = int and export s = string
-
-export let callback = _ => Js.log("Clicked")
-export callback = _ => Js.log("Clicked")
-
-export let x = "hello world" and export y = 2
-export x = "hello world" and export y = 2
-let x = "hello world" and export y = 2
diff --git a/jscomp/syntax/tests/parsing/grammar/interface/expected/interface.resi.txt b/jscomp/syntax/tests/parsing/grammar/interface/expected/interface.resi.txt
deleted file mode 100644
index 3ea38ed..0000000
--- a/jscomp/syntax/tests/parsing/grammar/interface/expected/interface.resi.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-val x : int
-val s : string
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/interface/interface.resi b/jscomp/syntax/tests/parsing/grammar/interface/interface.resi
deleted file mode 100644
index fc64a72..0000000
--- a/jscomp/syntax/tests/parsing/grammar/interface/interface.resi
+++ /dev/null
@@ -1,3 +0,0 @@
-let x: int
-
-let s: string
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/apply.res b/jscomp/syntax/tests/parsing/grammar/modexpr/apply.res
deleted file mode 100644
index b00589a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/apply.res
+++ /dev/null
@@ -1,21 +0,0 @@
-module X = F(A)
-module X = F(Arg1, Arg2, Arg3)
-// trailing comma
-module X = F(Arg1, Arg2, Arg3,)
-// attributes
-module X = @apply (@ident F)(@attr Arg1, @attr2 Arg2, @attr3 Arg3)
-// curried style syntax
-module X = F(Arg1)(Arg2)(Arg3,)
-
-// generative functors
-module X = F()
-module X = F()()
-module X = F((), ())
-
-// constrained args
-module X = F(A : SetLike)
-module X = F(A : SetLike, B: TreeLike)
-// trailing comma
-module X = F(A : SetLike, B: TreeLike,)
-
-let someFunctorAsFunction = (x: module(MT)): module(ResT) => module(SomeFunctor(unpack(x)))
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/constrained.res b/jscomp/syntax/tests/parsing/grammar/modexpr/constrained.res
deleted file mode 100644
index b4cd566..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/constrained.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module X = (A: MyMod)
-
-include (X : MyMod)
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/apply.res.txt b/jscomp/syntax/tests/parsing/grammar/modexpr/expected/apply.res.txt
deleted file mode 100644
index b5320ee..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/apply.res.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-module X = (F)(A)
-module X = (((F)(Arg1))(Arg2))(Arg3)
-module X = (((F)(Arg1))(Arg2))(Arg3)
-module X =
-  (((((((F)[@ident ]))(((Arg1)[@attr ])))(((Arg2)[@attr2 ])))(((Arg3)
-  [@attr3 ])))[@apply ])
-module X = (((F)(Arg1))(Arg2))(Arg3)
-module X = (F)(struct  end)
-module X = ((F)(struct  end))(struct  end)
-module X = ((F)(struct  end))(struct  end)
-module X = (F)((A : SetLike))
-module X = ((F)((A : SetLike)))((B : TreeLike))
-module X = ((F)((A : SetLike)))((B : TreeLike))
-let someFunctorAsFunction (x : (module MT)) = ((module (SomeFunctor)((val
-  x))) : (module ResT))
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/constrained.res.txt b/jscomp/syntax/tests/parsing/grammar/modexpr/expected/constrained.res.txt
deleted file mode 100644
index 681d74d..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/constrained.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module X : MyMod = A 
-include (X : MyMod)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/firstClassModules.res.txt b/jscomp/syntax/tests/parsing/grammar/modexpr/expected/firstClassModules.res.txt
deleted file mode 100644
index e2f7de7..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/firstClassModules.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-module Device = (val
-  (((let deviceName = parseCmdline () in
-     try Hashtbl.find devices deviceName with | Not_found -> exit 2)
-  [@res.braces ]) : (module Device)))
-let draw_using_device device_name picture =
-  ((let module Device = (val
-      (Hashtbl.find devices device_name : (module DEVICE))) in
-      Device.draw picture)
-  [@res.braces ])
-module New_three = (val (three : (module X_int)))
-let to_int m = ((let module M = (val (m : (module X_int))) in M.x)
-  [@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/functor.res.txt b/jscomp/syntax/tests/parsing/grammar/modexpr/expected/functor.res.txt
deleted file mode 100644
index b8c0280..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/functor.res.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-module F(A:X)(B:Y) = A
-module F(A:X)(B:Y) = A
-module F = ((functor (A : X) -> ((functor (B : Y) -> A)[@attr2 ]))[@attr1 ])
-include functor (X : Map) -> functor (Y : Set) -> Z
-include functor (X : Map) -> functor (Y : Set) -> Z
-module F = ((functor (A : X) -> functor (B : Y) -> A)[@functorAttr ])
-include ((functor (X : Map) -> functor (Y : Set) -> Z)[@functorAttr ])
-include ((functor (X : Map) -> ((functor (Y : Set) ->
-  Z)[@attr3 ]))[@functorAttr2 ][@functorAttr ])
-module Make(A:X)(B:Y) : Set = struct let a = A.a + B.b end 
-module Make = ((functor (A : X) -> functor (B : Y) ->
-  (struct let a = A.a + B.b end : Set))[@functorAttr ])
-module F() = Map
-module F = ((functor () -> Map)[@functorAttr ])
-include functor () -> Map
-include ((functor () -> Map)[@functorAttr ])
-module Make(Cmp:sig type nonrec t val eq : t -> t -> bool end) :
-  sig
-    type nonrec key = Cmp.t
-    type nonrec coll
-    val empty : coll
-    val add : coll -> key -> coll
-  end =
-  struct
-    open Cmp
-    type nonrec key = t
-    type nonrec coll = key list
-    let empty = []
-    let add (y : coll) (e : key) =
-      if List.exists (fun x -> eq x e) y then y else e :: y
-  end 
-module Gen1(P:Primitive)() =
-  struct type nonrec t = P.t
-         type nonrec internal = P.t
-         let inject t = t end
-module DistinctString() : StringBased =
-  struct type nonrec t = string
-         let inject t = t end 
-module DistinctString() : StringBased =
-  struct type nonrec t = string
-         let inject t = t end 
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/ident.res.txt b/jscomp/syntax/tests/parsing/grammar/modexpr/expected/ident.res.txt
deleted file mode 100644
index 3994380..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/ident.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-module A = Array
-module A = Belt.Array
-include Array
-include Belt.Array
-module A = ((Array)[@attr ])
-module A = ((Belt.Array)[@attr ])
-include ((Array)[@attr ])
-include ((Belt.Array)[@attr ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/parenthesized.res.txt b/jscomp/syntax/tests/parsing/grammar/modexpr/expected/parenthesized.res.txt
deleted file mode 100644
index fdf623a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/parenthesized.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-module A = ParenthesizedModule
-module A = DoubleParenthesizedModule
-module A = ((ParenthesizedModule)[@attr ])
-module F(A:X) = A
-module A = struct let a = 1 end
-module A = (ModApply)(MyMod)
-module A : X = A 
-include ParenthesizedModule
-include ((ParenthesizedModule)[@attr ])
-module A = ((ParenthesizedModule)[@attr2 ][@attr ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/structure.res.txt b/jscomp/syntax/tests/parsing/grammar/modexpr/expected/structure.res.txt
deleted file mode 100644
index e29583c..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/expected/structure.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module X = struct let a = 1 end
-include struct let b = 2 end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/firstClassModules.res b/jscomp/syntax/tests/parsing/grammar/modexpr/firstClassModules.res
deleted file mode 100644
index db68f90..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/firstClassModules.res
+++ /dev/null
@@ -1,18 +0,0 @@
-module Device = unpack({
-  let deviceName = parseCmdline()
-  try Hashtbl.find(devices, deviceName) catch {
-  | Not_found => exit(2)
-  }
-} : Device)
-
-let draw_using_device = (device_name, picture) => {
-  module Device = unpack(Hashtbl.find(devices, device_name): DEVICE)
-  Device.draw(picture)
-}
-
-module New_three = unpack(three: X_int)
-
-let to_int = (m) => {
-  module M = unpack(m : X_int)
-  M.x
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/functor.res b/jscomp/syntax/tests/parsing/grammar/modexpr/functor.res
deleted file mode 100644
index 01f6a1e..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/functor.res
+++ /dev/null
@@ -1,59 +0,0 @@
-module F = (A: X, B: Y) => A 
-// trailing comma
-module F = (A: X, B: Y,) => A 
-module F = (@attr1 A: X, @attr2 B: Y) => A 
-include (X: Map, Y: Set) => Z
-// trailing comma
-include (X: Map, Y: Set,) => Z
-
-module F = @functorAttr (A: X, B: Y) => A 
-include @functorAttr (X: Map, Y: Set) => Z
-include @functorAttr (@functorAttr2 X: Map, @attr3 Y: Set) => Z
-
-// constraint on return type
-module Make = (A: X, B: Y) :Set => {let a = A.a + B.b}
-// with attributes
-module Make = @functorAttr (A: X, B: Y) :Set => {let a = A.a + B.b}
-
-module F = () => Map
-module F = @functorAttr () => Map
-include () => Map
-include @functorAttr () => Map
-
-module Make = (
-  Cmp: {
-    type t;
-    let eq: (t, t) => bool;
-  }) : {
- type key = Cmp.t;
- type coll;
- let empty: coll;
- let add: (coll, key) => coll;
-} => {
-  open Cmp;
-  type key = t;
-  type coll = list<key>;
-  let empty = list{};
-  let add = (y: coll, e: key) =>
-    if (List.exists(x => eq(x, e), y)) {
-      y;
-    } else {
-      list{e, ...y};
-    };
-}
-
-module Gen1 = (P: Primitive, ()) => {
-  type t = P.t
-  type internal = P.t
-  let inject = t => t
-}
-
-module DistinctString = (()) : StringBased  => {
-  type t = string
-  let inject = t => t
-}
-
-module DistinctString = (): StringBased  => {
-  type t = string
-  let inject = t => t
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/ident.res b/jscomp/syntax/tests/parsing/grammar/modexpr/ident.res
deleted file mode 100644
index a497b82..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/ident.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module A = Array
-module A = Belt.Array
-
-include Array
-include Belt.Array
-
-module A = @attr Array
-module A = @attr Belt.Array
-
-include @attr Array
-include @attr Belt.Array
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/parenthesized.res b/jscomp/syntax/tests/parsing/grammar/modexpr/parenthesized.res
deleted file mode 100644
index 2418123..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/parenthesized.res
+++ /dev/null
@@ -1,14 +0,0 @@
-module A = (ParenthesizedModule)
-module A = ((DoubleParenthesizedModule))
-module A = @attr (ParenthesizedModule)
-
-module F = ((A: X) => A)
-
-module A = ({ let a = 1 })
-module A = (ModApply(MyMod))
-module A = ((A: X))
-
-include (ParenthesizedModule)
-include @attr (ParenthesizedModule)
-
-module A = @attr (@attr2 ParenthesizedModule)
diff --git a/jscomp/syntax/tests/parsing/grammar/modexpr/structure.res b/jscomp/syntax/tests/parsing/grammar/modexpr/structure.res
deleted file mode 100644
index 5a2511b..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modexpr/structure.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module X = {
-  let a = 1
-}
-
-include {
-  let b = 2
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/expected/extension.res.txt b/jscomp/syntax/tests/parsing/grammar/modtype/expected/extension.res.txt
deleted file mode 100644
index 78109f1..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/expected/extension.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-module type T  = [%ext ]
-module type T  = [%ext.with.args {js|argument|js}]
-module type T  = (([%ext ])[@attr ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/expected/functor.res.txt b/jscomp/syntax/tests/parsing/grammar/modtype/expected/functor.res.txt
deleted file mode 100644
index a8a7caf..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/expected/functor.res.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-module type Functor  = SetLike -> Set
-module type Functor  =
-  functor (S : SetLike) -> functor (B : BtreeLike) -> NeoTree
-module type Functor  = SetLike -> BtreeLike -> NeoTree
-module type Functor  = SetLike -> BtreeLike -> NeoTree
-module type Functor  = SetLike -> BtreeLike -> NeoTree
-module type Functor  =
-  ((SetLike -> ((BtreeLike -> NeoTree)[@attr2 ]))[@attr1 ])
-module type Functor  =
-  ((SetLike -> ((BtreeLike -> NeoTree)[@attr2 ]))[@attr1 ][@attr0 ])
-module type Functor  =
-  ((SetLike -> ((BtreeLike -> ((NeoTree)[@attr3 ]))[@attr2 ]))[@attr1 ])
-module type Functor  =
-  ((SetLike -> ((BtreeLike -> ((NeoTree)[@attr3 ]))[@attr2 ]))[@attr1 ])
-module type Functor  = (SetLike -> Set with type  t =  A.t)
-module type Functor  = SetLike -> (Set with type  t =  A.t)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/expected/ident.res.txt b/jscomp/syntax/tests/parsing/grammar/modtype/expected/ident.res.txt
deleted file mode 100644
index 1f95238..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/expected/ident.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-module type BT  = BTree
-module type BT  = MultiCore.BTree
-module type BT  = Std.MultiCore.BTree
-module type BT  = ((BTree)[@attr ])
-module type BT  = ((MultiCore.BTree)[@attr ][@attr2 ])
-module type BT  = ((Std.MultiCore.BTree)[@attr ][@attr2 ][@attr3 ])
-module type list  = list
-module type t  = s
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/expected/parenthesized.res.txt b/jscomp/syntax/tests/parsing/grammar/modtype/expected/parenthesized.res.txt
deleted file mode 100644
index c74e031..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/expected/parenthesized.res.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-module type Bt  = Btree
-module type Bt  = Std.Btree
-module type Bt  = ((Btree)[@attrIdent ][@attrParens ])
-module type MyHash  =
-  sig
-    include module type of struct include Hashtbl end
-    val replace : ('a, 'b) t -> 'a -> 'b -> unit
-  end
-module type MyHash  =
-  sig
-    include
-      ((module type of struct include Hashtbl end)[@onModTypeOf ][@onParens ])
-    val replace : ('a, 'b) t -> 'a -> 'b -> unit
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/expected/signature.res.txt b/jscomp/syntax/tests/parsing/grammar/modtype/expected/signature.res.txt
deleted file mode 100644
index 2dd2e25..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/expected/signature.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-module type BT  = sig val x : int end
-module type BT  = sig val x : int val y : int end
-module type BT  = ((sig val x : int end)[@attr ])
-module type BT  = ((sig val x : int val y : int end)[@attr1 ][@attr2 ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/expected/typeof.res.txt b/jscomp/syntax/tests/parsing/grammar/modtype/expected/typeof.res.txt
deleted file mode 100644
index fd46150..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/expected/typeof.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-module type MyHash  =
-  sig
-    include module type of struct include Hashtbl end
-    val replace : ('a, 'b) t -> 'a -> 'b -> unit
-  end
-module type MyHash  =
-  sig
-    include ((module type of struct include Hashtbl end)[@onModuleTypeOf ])
-    val replace : ('a, 'b) t -> 'a -> 'b -> unit
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/expected/with.res.txt b/jscomp/syntax/tests/parsing/grammar/modtype/expected/with.res.txt
deleted file mode 100644
index 20440e5..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/expected/with.res.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-module type A  = (Foo with type  t =  string)
-module type A  = (Foo with type  Bar.t =  string)
-module type A  = (Foo with type 'a t =  string)
-module type A  = (Foo with type ('a,'b) t =  string)
-module type A  = (Foo with type  t =  'st constraint 'st = int)
-module type A  =
-  (Foo with type  t =  'st constraint 'st = int constraint 'x = int)
-module type A  =
-  (Foo with type  t =  'st constraint 'st = int constraint 'x = int and type
-     t =  'st constraint 'st = int constraint 'x = int and type  t = 
-    'st constraint 'st = int constraint 'x = int)
-module type A  = (Foo with type  t :=  string)
-module type A  = (Foo with type 'a t :=  string)
-module type A  = (Foo with type ('a,'b) t :=  string)
-module type A  = (Foo with type ('a,'b) Bar.t :=  string)
-module type A  =
-  (Foo with type ('a,'b) Bar.t :=  string and type ('a,'b) Bar.t :=  
-    string and type ('a,'b) Bar.t :=  string)
-module type A  = (Foo with module Bar = Array)
-module type A  = (Foo with module Bar = Belt.Array)
-module type A  = (Foo with module X.Bar = Belt.Array)
-module type A  =
-  (Foo with module X.Bar = Belt.Array and module X.Bar = Belt.Array and
-    module X.Bar = Belt.Array)
-module type A  = (Foo with module Bar := Array)
-module type A  = (Foo with module Bar := Belt.Array)
-module type A  =
-  (Foo with module X.Bar := Belt.Array and module X.Bar := Belt.Array and
-    module X.Bar := Belt.Array)
-module type Printable  =
-  sig type nonrec t val print : Format.formatter -> t -> unit end
-module type Comparable  = sig type nonrec t val compare : t -> t -> int end
-module type PrintableComparable  =
-  sig include Printable include (Comparable with type  t :=  t) end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/extension.res b/jscomp/syntax/tests/parsing/grammar/modtype/extension.res
deleted file mode 100644
index a921e4a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/extension.res
+++ /dev/null
@@ -1,4 +0,0 @@
-module type T = %ext
-module type T = %ext.with.args("argument")
-
-module type T = @attr %ext
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/functor.res b/jscomp/syntax/tests/parsing/grammar/modtype/functor.res
deleted file mode 100644
index 1e7aec4..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/functor.res
+++ /dev/null
@@ -1,14 +0,0 @@
-module type Functor = SetLike => Set
-module type Functor = (S: SetLike, B: BtreeLike) => NeoTree
-module type Functor = (_: SetLike, _: BtreeLike) => NeoTree
-module type Functor = (SetLike, BtreeLike) => NeoTree
-module type Functor = SetLike => BtreeLike => NeoTree
-
-module type Functor = (@attr1 _: SetLike, @attr2 _: BtreeLike) => NeoTree
-module type Functor = @attr0 (@attr1 _: SetLike, @attr2 _: BtreeLike) => NeoTree
-
-module type Functor = @attr1 SetLike => @attr2 BtreeLike => @attr3 NeoTree
-module type Functor = @attr1 (SetLike) => @attr2 (BtreeLike) => @attr3 NeoTree
-
-module type Functor = SetLike => Set with type t = A.t
-module type Functor = SetLike => (Set with type t = A.t)
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/ident.res b/jscomp/syntax/tests/parsing/grammar/modtype/ident.res
deleted file mode 100644
index 1fa3441..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/ident.res
+++ /dev/null
@@ -1,10 +0,0 @@
-module type BT = BTree 
-module type BT = MultiCore.BTree 
-module type BT = Std.MultiCore.BTree 
-
-module type BT = @attr BTree 
-module type BT = @attr @attr2 MultiCore.BTree 
-module type BT = @attr @attr2 @attr3 Std.MultiCore.BTree 
-
-module type list = list
-module type t = s
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/parenthesized.res b/jscomp/syntax/tests/parsing/grammar/modtype/parenthesized.res
deleted file mode 100644
index a975cdb..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/parenthesized.res
+++ /dev/null
@@ -1,14 +0,0 @@
-module type Bt = (Btree)
-module type Bt = (Std.Btree)
-
-module type Bt = @attrParens (@attrIdent Btree)
-
-module type MyHash = {
-  include (module type of { include Hashtbl })
-  let replace: (t<'a, 'b>, 'a, 'b) => unit
-}
-
-module type MyHash = {
-  include @onParens (@onModTypeOf module type of { include Hashtbl })
-  let replace: (t<'a, 'b>, 'a, 'b) => unit
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/signature.res b/jscomp/syntax/tests/parsing/grammar/modtype/signature.res
deleted file mode 100644
index f32a439..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/signature.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module type BT = { let x: int } 
-module type BT = {
-  let x: int
-  let y: int
-}
-
-module type BT = @attr { let x: int } 
-module type BT = @attr1 @attr2 {
-  let x: int
-  let y: int
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/typeof.res b/jscomp/syntax/tests/parsing/grammar/modtype/typeof.res
deleted file mode 100644
index 1edd231..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/typeof.res
+++ /dev/null
@@ -1,9 +0,0 @@
-module type MyHash = {
-  include module type of { include Hashtbl }
-  let replace: (t<'a, 'b>, 'a, 'b) => unit
-}
-
-module type MyHash = {
-  include @onModuleTypeOf module type of { include Hashtbl }
-  let replace: (t<'a, 'b>, 'a, 'b) => unit
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/modtype/with.res b/jscomp/syntax/tests/parsing/grammar/modtype/with.res
deleted file mode 100644
index aba2570..0000000
--- a/jscomp/syntax/tests/parsing/grammar/modtype/with.res
+++ /dev/null
@@ -1,49 +0,0 @@
-module type A = Foo with type t = string
-module type A = Foo with type Bar.t = string
-module type A = Foo with type t<'a> = string
-module type A = Foo with type t<'a, 'b> = string
-module type A = Foo with type t = 'st constraint 'st = int
-module type A = Foo with type t = 'st constraint 'st = int constraint 'x = int
-module type A = Foo
-  with type t = 'st constraint 'st = int constraint 'x = int
-   and type t = 'st constraint 'st = int constraint 'x = int
-   and type t = 'st constraint 'st = int constraint 'x = int
-
-module type A = Foo with type t := string
-module type A = Foo with type t<'a> := string
-module type A = Foo with type t<'a, 'b> := string
-module type A = Foo with type Bar.t<'a, 'b> := string
-module type A = Foo
-  with type Bar.t<'a, 'b> := string
-   and type Bar.t<'a, 'b> := string
-   and type Bar.t<'a, 'b> := string
-
-module type A = Foo with module Bar = Array
-module type A = Foo with module Bar = Belt.Array
-module type A = Foo with module X.Bar = Belt.Array
-module type A = Foo
-  with module X.Bar = Belt.Array
-   and module X.Bar = Belt.Array
-   and module X.Bar = Belt.Array
-
-module type A = Foo with module Bar := Array
-module type A = Foo with module Bar := Belt.Array
-module type A = Foo
-  with module X.Bar := Belt.Array
-   and module X.Bar := Belt.Array
-   and module X.Bar := Belt.Array
-
-module type Printable = {
-  type t
-  let print: (Format.formatter, t) => unit
-}
-
-module type Comparable = {
-  type t
-  let compare: (t, t) => int
-}
-
-module type PrintableComparable = {
-  include Printable
-  include Comparable with type t := t
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/any.res b/jscomp/syntax/tests/parsing/grammar/pattern/any.res
deleted file mode 100644
index a1fa3fc..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/any.res
+++ /dev/null
@@ -1,39 +0,0 @@
-let _ = 1;
-let _ | _ = 1;
-let (_ : int) = 1;
-let (_ | _ : int) = 1;
-let ((_ | _) : int) = 1; // note: same ast as line above
-let (_ :unit) | (_ : unit) = 1;
-let _ as _x = 1;
-let _ | _ as _x = 1;
-let _ | (_ as _x) = 1;
-let (_ | _) as _x = 1;
-let _ as _y | _ as _x = 1;
-let (_ as _y) | (_ as _x) = 1; // note: same ast as line above
-
-switch () {
-| _ => ()
-| _ | _ => ()
-| _ as _x => ()
-| _ as _x | _ as _x => ()
-| (_ : unit) => ()
-| (_ : unit) | (_ : unit) => ()
-}
-
-let f = (_) => ()
-let f = (_ as _x) => ()
-let f = (_ : unit) => ()
-let f = (_ : unit) => ()
-let f = ((_ : unit) as _x) => ()
-
-let g = (a, _) => ()
-let g = (_, a) => ()
-
-for _ in 0 to 10 { () }
-for _ as _x in 0 to 10 { () }
-
-for (_ in 0 to 10) { () }
-for (_ as _x in 0 to 10) { () }
-
-for ((_ : int) in 0 to 10) { () }
-for ((_ : int) as _x in 0 to 10) { () }
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/array.res b/jscomp/syntax/tests/parsing/grammar/pattern/array.res
deleted file mode 100644
index 5c98658..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/array.res
+++ /dev/null
@@ -1,50 +0,0 @@
-let [] = ()
-let [1, 2] = ()
-let [1, 2,] = ()
-let [1 : int, 2 : int] = ()
-let ([1 : int, 2 : int] : array<int>) = ()
-
-switch x {
-| [] => ()
-| [1, 2] => () 
-| [1, 2,] => () 
-| [1: int, 2 : int] => () 
-| ([1: int, 2 : int] : int) => () 
-}
-
-let f = ([]) => ()
-let f = ([x]) => ()
-let f = ([x, y]) => x + y
-let f = ([x] : int) => ()
-let f = (([x] : int)) => ()
-
-for [] in 0 to 10 {
-  ()
-}
-for ([] in 0 to 10) {
-  ()
-}
-for (([]) in 0 to 10) {
-  ()
-}
-for [x] in 0 to 10 {
-  ()
-}
-for ([x] in 0 to 10) {
-  ()
-}
-for (([x]) in 0 to 10) {
-  ()
-}
-for [x, y] in 0 to 10 {
-  ()
-}
-for ([x, y] in 0 to 10) {
-  ()
-}
-for (([x, y]) in 0 to 10) {
-  ()
-}
-for (([x] : array<int>) in 0 to 10) {
-  ()
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/constant.res b/jscomp/syntax/tests/parsing/grammar/pattern/constant.res
deleted file mode 100644
index e81f4a3..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/constant.res
+++ /dev/null
@@ -1,109 +0,0 @@
-let "stringPattern" = ()
-let "stringPattern" as s = ()
-let ("stringPattern" : string) = ()
-let ("stringPattern" : string) as s = ()
-
-switch x {
-| "stringPattern" => ()
-| "stringPattern" as s => ()
-| ("stringPattern" : string) as s => ()
-| "\xff" => ()
-| "\u2212" => ()
-| "\0" => ()
-| "\o123" => ()
-}
-
-for "stringPattern" in 0 to 10 { () }
-for "stringPattern" as s in 0 to 10 { () }
-
-for (("stringPattern") in 0 to 10) { () }
-for (("stringPattern") as s in 0 to 10) { () }
-for (("stringPattern" as s) in 0 to 10) { () }
-
-let f = ("stringPattern") => ()
-let f = ("stringPattern" as s) => ()
-let f = (("stringPattern" as s)) => ()
-let f = (("stringPattern" : string)) => ()
-let f = (("stringPattern" : string) as s) => ()
-let f = ("stringPattern" : string) => ()
-
-let 1 = ()
-let 1 as x = ()
-let (1: int) = ()
-let (1: int) as x = ()
-
-switch x {
-| 1 => ()
-| 1 as x => ()
-| (1 : int) => ()
-| (1 : int) as x => ()
-}
-
-let f = (1) => ()
-let f = (1 as x) => ()
-let f = ((1: int)) => ()
-let f = ((1: int) as x) => ()
-let f = (1: int) => ()
-
-for i in 0 to 10 { () }
-for i as x in 0 to 10 { () }
-for ((i) in 0 to 10) { () }
-for ((i) as x in 0 to 10) { () }
-for ((i as x) in 0 to 10) { () }
-
-switch listPatterns {
-| list{(true, pattern), ...patterns} =>
-  let patterns = patterns |> List.map(filterSpread) |> List.rev
-  makeListPattern(loc, patterns, Some(pattern))
-| patterns =>
-  let patterns = patterns |> List.map(filterSpread) |> List.rev
-  makeListPattern(loc, patterns, None)
-}
-
-let _0 = 0x9A
-
-let print = (ppf, i) =>
-  switch i.stamp {
-  | 0 => fprintf(ppf, "%s!", i.name)
-  | -1 => fprintf(ppf, "%s#", i.name)
-  | +1 => fprintf(ppf, "%s#", i.name)
-  | -1. => fprintf(ppf, "%s#", i.name)
-  | +1. => fprintf(ppf, "%s#", i.name)
-  }
-
-let -1 .. -1. = x
-
-switch science {
-| (1.12, -3.13) => true
-| [1.12, -3.13] => true
-| list{1.12, -3.13} => true
-| {x: 1.12, y: -3.13} => true
-| Constructor(1.12, -2.45) => true
-| #Constuctor(1.12, -2.45) => true
-| -4.15 as x => true
-| -4.15 | +4.15 => true
-| (-3.14 : float) => true
-| lazy 5.678 => true
-| exception 19.34 => true
-| _ => false
-}
-
-switch literal {
-| `literal` => true
-| (`literal1`, `literal2`) => true
-| [`literal1`, `literal2`] => true
-| list{`literal1`, `literal2`} => true
-| {x: `literal1`, y: `literal2`} => true
-| Constructor(`literal1`, `literal2`) => true
-| #Constuctor(`literal1`, `literal2`) => true
-| `literal` as x => true
-| `literal` | `literal` => true
-| (`literal` : string) => true
-| lazy `literal`  => true
-| exception `literal` => true
-| _ => false
-}
-
-let `literal constant` = x
-
-for `literal constant` in 0 to 10 { () }
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/constraint.res b/jscomp/syntax/tests/parsing/grammar/pattern/constraint.res
deleted file mode 100644
index 13355d3..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/constraint.res
+++ /dev/null
@@ -1,10 +0,0 @@
-switch thing {
-| Some((node: node)) => ()
-| Some(node: Feature.node) => ()
-| list{(child: node), ...rest} => ()
-| list{child: node, ...rest} => ()
-| (Some(_), Some((menuItem: Menu.item))) => ()
-| (Some(_), Some(menuItem: Menu.item)) => ()
-| SettingChanged(({fullName, value, _}: Nova.Setting.t)) => ()
-| SettingChanged({fullName, value, _}: Nova.Setting.t) => ()
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/constructor.res b/jscomp/syntax/tests/parsing/grammar/pattern/constructor.res
deleted file mode 100644
index 096d090..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/constructor.res
+++ /dev/null
@@ -1,93 +0,0 @@
-let Instance = i; 
-let Instance as inst = i; 
-let React.Instance = i; 
-let React.Instance as inst = i; 
-
-let Instance(component) = i
-let Instance(component) as inst = i
-let Instance(component,) = i // trailing comma
-
-let Instance({render, subtree}) = i
-let Instance({render, subtree}) as x = i
-let Instance({render, subtree} as inst) = i
-let Instance({render, subtree}, inst) = i
-let Instance({render, subtree} : Instance.t) = i
-let Instance({render, subtree} : Instance.t) as inst = i
-let Instance(({render, subtree} : Instance.t)) = i
-
-let Instance(component, tree) = i
-let Instance(component, tree) as x = i
-let Instance(component as x, tree as y) = i
-let Instance(component, tree) as inst = i
-let Instance(component, tree,) = i // trailing comma
-
-let (Instance : React.t) = i;
-let ((Instance : React.t) as t) = i;
-let (Instance : React.t) as x = i;
-// constraints
-let (Instance(component : comp) : React.t) = i
-let (Instance(component : comp,) : React.t) = i
-
-switch x {
-| Instance => ()
-| Instance as inst => ()
-| Instance(comp) => ()
-| Instance(comp) as inst => ()
-| Instance({render, subtree}) => () 
-| Instance({render, subtree}, inst) => () 
-| Instance({render, subtree} : Instance.t) => ()
-| Instance(({render, subtree} : Instance.t)) => ()
-| Instance(comp, tree) => ()
-| React.Instance(comp, tree,) => ()
-| (Instance(comp: Component.t) : React.t) => ()
-}
-
-
-let f = (Instance) => i; 
-let f = (Instance as i) => i; 
-let f = (React.Instance) => i; 
-let f = ((React.Instance as x)) => i; 
-
-let f = (Instance(component)) => i
-let f = (Instance(component,)) => i // trailing comma
-
-let f = (Instance({render, subtree})) => i
-let f = (Instance({render, subtree}, inst)) => i
-let f = (Instance({render, subtree} : Instance.t)) => i
-let f = (Instance(({render, subtree} : Instance.t))) => i
-
-let f = (Instance(component, tree)) => i
-let f = (Instance(component, tree,)) => i // trailing comma
-
-let f = ((Instance : React.t)) => i;
-let f = (Instance : React.t) => i;
-let f = (Instance(comp: Component.t) : React.t) => ()
-
-for Blue in x to y { () }
-for Blue as c in x to y { () }
-for (Blue in x to y) { () }
-for (Blue as c in x to y) { () }
-for ((Blue: Color.t) in x to y) { () }
-for ((Blue: Color.t) as c in x to y) { () }
-for (((Blue: Color.t) as c) in x to y) { () }
-
-for Rgba(r, g, b) in x to y { () }
-for Rgba(r, g, b) as c in x to y { () }
-for (Rgba(r : float, g : float, b : float) in x to y) { () }
-for (Rgba(r : float, g : float, b : float) as c in x to y) { () }
-for ((Rgba(r, g, b) : Rgb.t) in x to y) { () }
-for ((Rgba(r, g, b) : Rgb.t) as c in x to y) { () }
-for (((Rgba(r, g, b) : Rgb.t) as c) in x to y) { () }
-
-for Colour.Rgba(r, g, b) in x to y { () }
-for (Colour.Rgba(r : float, g : float, b : float) in x to y) { () }
-for ((Colour.Rgba(r, g, b) : Rgb.t) in x to y) { () }
-
-for Point({x, y, z}) in x to y { () }
-for (Point({x, y, z}) in x to y) { () }
-for (Point({x, y, z}) as p in x to y) { () }
-
-switch truth {
-| true => Js.log("true")
-| false => Js.log("false")
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/exception.res b/jscomp/syntax/tests/parsing/grammar/pattern/exception.res
deleted file mode 100644
index 5e768e2..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/exception.res
+++ /dev/null
@@ -1,47 +0,0 @@
-let exception Foo = ()
-let exception Foo as e = ()
-let exception (Foo as e) = ()
-let exception Foo(a, b) = ()
-let exception Foo(a, b) as e = ()
-let exception (Foo(a, b) as e) = ()
-let (exception Foo) = ()
-let (exception Foo) as e = ()
-let (exception Foo as e) = ()
-let (exception (Foo as e)) = ()
-let (exception Foo(a, b)) = ()
-let (exception Foo(a, b)) as e = ()
-let (exception Foo(a, b) as e) = ()
-let (exception Foo : exc<t>) = ()
-let (exception Foo : exc<t>) as e = ()
-let (exception (Foo : exc<t>) as e) = ()
-let (exception ((Foo : exc<t>) as e)) = ()
-
-switch x {
-| exception Foo => ()
-| exception Foo as e => ()
-| exception (Foo as e) => ()
-| exception Foo(a, b) => ()
-| (exception Foo) => ()
-| (exception Foo as e) => ()
-| (exception (Foo as e)) => ()
-| (exception Foo(a, b)) => ()
-| (exception Foo : exc<t>) => ()
-}
-
-let f = (exception Foo) => ()
-let f = (exception Foo as e) => ()
-let f = (exception (Foo as e)) => ()
-let f = (exception Foo(a, b)) => ()
-let f = ((exception Foo)) => ()
-let f = ((exception Foo) as e) => ()
-let f = (exception Foo(a, b)) => ()
-let f = (exception Foo : exc<t>) => ()
-
-for exception Foo in 0 to 10 { () }
-for exception Foo as e in 0 to 10 { () }
-for (exception Foo in 0 to 10) { () }
-for (exception Foo as e in 0 to 10) { () }
-for ((exception Foo) in 0 to 10) { () }
-for exception Foo(a, b) in 0 to 10 { () }
-for (exception Foo(a, b) in 0 to 10) { () }
-for ((exception Foo(a, b): exc<t>) in 0 to 10) { () } 
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/any.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/any.res.txt
deleted file mode 100644
index 158df88..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/any.res.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-let _ = 1
-let _|_ = 1
-let (_ : int) = 1
-let ((_|_) : int) = 1
-let ((_|_) : int) = 1
-let (_ : unit)|(_ : unit) = 1
-let _ as _x = 1
-let _|_ as _x = 1
-let _|_ as _x = 1
-let _|_ as _x = 1
-let _ as _y|_ as _x = 1
-let _ as _y|_ as _x = 1
-;;match () with
-  | _ -> ()
-  | _|_ -> ()
-  | _ as _x -> ()
-  | _ as _x|_ as _x -> ()
-  | (_ : unit) -> ()
-  | (_ : unit)|(_ : unit) -> ()
-let f _ = ()
-let f (_ as _x) = ()
-let f (_ : unit) = ()
-let f (_ : unit) = ()
-let f ((_ : unit) as _x) = ()
-let g a _ = ()
-let g _ a = ()
-;;for _ = 0 to 10 do () done
-;;for _ as _x = 0 to 10 do () done
-;;for _ = 0 to 10 do () done
-;;for _ as _x = 0 to 10 do () done
-;;for (_ : int) = 0 to 10 do () done
-;;for (_ : int) as _x = 0 to 10 do () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/array.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/array.res.txt
deleted file mode 100644
index 9ef2998..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/array.res.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-let [||] = ()
-let [|1;2|] = ()
-let [|1;2|] = ()
-let [|(1 : int);(2 : int)|] = ()
-let ([|(1 : int);(2 : int)|] : int array) = ()
-;;match x with
-  | [||] -> ()
-  | [|1;2|] -> ()
-  | [|1;2|] -> ()
-  | [|(1 : int);(2 : int)|] -> ()
-  | ([|(1 : int);(2 : int)|] : int) -> ()
-let f [||] = ()
-let f [|x|] = ()
-let f [|x;y|] = x + y
-let f ([|x|] : int) = ()
-let f ([|x|] : int) = ()
-;;for [||] = 0 to 10 do () done
-;;for [||] = 0 to 10 do () done
-;;for [||] = 0 to 10 do () done
-;;for [|x|] = 0 to 10 do () done
-;;for [|x|] = 0 to 10 do () done
-;;for [|x|] = 0 to 10 do () done
-;;for [|x;y|] = 0 to 10 do () done
-;;for [|x;y|] = 0 to 10 do () done
-;;for [|x;y|] = 0 to 10 do () done
-;;for ([|x|] : int array) = 0 to 10 do () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/constant.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/constant.res.txt
deleted file mode 100644
index 376b534..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/constant.res.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-let {js|stringPattern|js} = ()
-let {js|stringPattern|js} as s = ()
-let ({js|stringPattern|js} : string) = ()
-let ({js|stringPattern|js} : string) as s = ()
-;;match x with
-  | {js|stringPattern|js} -> ()
-  | {js|stringPattern|js} as s -> ()
-  | ({js|stringPattern|js} : string) as s -> ()
-  | {js|\xff|js} -> ()
-  | {js|\u2212|js} -> ()
-  | {js|\0|js} -> ()
-  | {js|\o123|js} -> ()
-;;for {js|stringPattern|js} = 0 to 10 do () done
-;;for {js|stringPattern|js} as s = 0 to 10 do () done
-;;for {js|stringPattern|js} = 0 to 10 do () done
-;;for {js|stringPattern|js} as s = 0 to 10 do () done
-;;for {js|stringPattern|js} as s = 0 to 10 do () done
-let f {js|stringPattern|js} = ()
-let f ({js|stringPattern|js} as s) = ()
-let f ({js|stringPattern|js} as s) = ()
-let f ({js|stringPattern|js} : string) = ()
-let f (({js|stringPattern|js} : string) as s) = ()
-let f ({js|stringPattern|js} : string) = ()
-let 1 = ()
-let 1 as x = ()
-let (1 : int) = ()
-let (1 : int) as x = ()
-;;match x with
-  | 1 -> ()
-  | 1 as x -> ()
-  | (1 : int) -> ()
-  | (1 : int) as x -> ()
-let f 1 = ()
-let f (1 as x) = ()
-let f (1 : int) = ()
-let f ((1 : int) as x) = ()
-let f (1 : int) = ()
-;;for i = 0 to 10 do () done
-;;for i as x = 0 to 10 do () done
-;;for i = 0 to 10 do () done
-;;for i as x = 0 to 10 do () done
-;;for i as x = 0 to 10 do () done
-;;match listPatterns with
-  | (true, pattern)::patterns ->
-      let patterns = (patterns |> (List.map filterSpread)) |> List.rev in
-      makeListPattern loc patterns (Some pattern)
-  | patterns ->
-      let patterns = (patterns |> (List.map filterSpread)) |> List.rev in
-      makeListPattern loc patterns None
-let _0 = 0x9A
-let print ppf i =
-  match i.stamp with
-  | 0 -> fprintf ppf {js|%s!|js} i.name
-  | (-1) -> fprintf ppf {js|%s#|js} i.name
-  | 1 -> fprintf ppf {js|%s#|js} i.name
-  | (-1.) -> fprintf ppf {js|%s#|js} i.name
-  | 1. -> fprintf ppf {js|%s#|js} i.name
-let (-1)..(-1.) = x
-;;match science with
-  | (1.12, (-3.13)) -> true
-  | [|1.12;(-3.13)|] -> true
-  | 1.12::(-3.13)::[] -> true
-  | { x = 1.12; y = (-3.13) } -> true
-  | Constructor (1.12, (-2.45)) -> true
-  | `Constuctor (1.12, (-2.45)) -> true
-  | (-4.15) as x -> true
-  | (-4.15)|4.15 -> true
-  | ((-3.14) : float) -> true
-  | (lazy 5.678) -> true
-  | exception 19.34 -> true
-  | _ -> false
-;;match literal with
-  | (({js|literal|js})[@res.template ]) -> true
-  | ((({js|literal1|js})[@res.template ]),
-     (({js|literal2|js})[@res.template ])) -> true
-  | [|(({js|literal1|js})[@res.template ]);(({js|literal2|js})[@res.template
-                                                                ])|]
-      -> true
-  | (({js|literal1|js})[@res.template ])::(({js|literal2|js})[@res.template ])::[]
-      -> true
-  | { x = (({js|literal1|js})[@res.template ]);
-      y = (({js|literal2|js})[@res.template ]) } -> true
-  | Constructor
-      ((({js|literal1|js})[@res.template ]),
-       (({js|literal2|js})[@res.template ]))
-      -> true
-  | `Constuctor
-      ((({js|literal1|js})[@res.template ]),
-       (({js|literal2|js})[@res.template ]))
-      -> true
-  | (({js|literal|js})[@res.template ]) as x -> true
-  | (({js|literal|js})[@res.template ])|(({js|literal|js})[@res.template ])
-      -> true
-  | ((({js|literal|js})[@res.template ]) : string) -> true
-  | (lazy (({js|literal|js})[@res.template ])) -> true
-  | exception (({js|literal|js})[@res.template ]) -> true
-  | _ -> false
-let (({js|literal constant|js})[@res.template ]) = x
-;;for (({js|literal constant|js})[@res.template ]) = 0 to 10 do () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/constraint.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/constraint.res.txt
deleted file mode 100644
index fa8c436..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/constraint.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-;;match thing with
-  | Some (node : node) -> ()
-  | Some (node : Feature.node) -> ()
-  | (child : node)::rest -> ()
-  | (child : node)::rest -> ()
-  | (Some _, Some (menuItem : Menu.item)) -> ()
-  | (Some _, Some (menuItem : Menu.item)) -> ()
-  | SettingChanged ({ fullName; value;_} : Nova.Setting.t) -> ()
-  | SettingChanged ({ fullName; value;_} : Nova.Setting.t) -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/constructor.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/constructor.res.txt
deleted file mode 100644
index 45783c9..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/constructor.res.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-let Instance = i
-let Instance as inst = i
-let React.Instance = i
-let React.Instance as inst = i
-let Instance component = i
-let Instance component as inst = i
-let Instance component = i
-let Instance { render; subtree } = i
-let Instance { render; subtree } as x = i
-let Instance ({ render; subtree } as inst) = i
-let Instance ({ render; subtree }, inst) = i
-let Instance ({ render; subtree } : Instance.t) = i
-let Instance ({ render; subtree } : Instance.t) as inst = i
-let Instance ({ render; subtree } : Instance.t) = i
-let Instance (component, tree) = i
-let Instance (component, tree) as x = i
-let Instance ((component as x), (tree as y)) = i
-let Instance (component, tree) as inst = i
-let Instance (component, tree) = i
-let ((Instance) : React.t) = i
-let (Instance : React.t) as t = i
-let (Instance : React.t) as x = i
-let ((Instance (component : comp)) : React.t) = i
-let ((Instance (component : comp)) : React.t) = i
-;;match x with
-  | Instance -> ()
-  | Instance as inst -> ()
-  | Instance comp -> ()
-  | Instance comp as inst -> ()
-  | Instance { render; subtree } -> ()
-  | Instance ({ render; subtree }, inst) -> ()
-  | Instance ({ render; subtree } : Instance.t) -> ()
-  | Instance ({ render; subtree } : Instance.t) -> ()
-  | Instance (comp, tree) -> ()
-  | React.Instance (comp, tree) -> ()
-  | (Instance (comp : Component.t) : React.t) -> ()
-let f (Instance) = i
-let f (Instance as i) = i
-let f (React.Instance) = i
-let f (React.Instance as x) = i
-let f (Instance component) = i
-let f (Instance component) = i
-let f (Instance { render; subtree }) = i
-let f (Instance ({ render; subtree }, inst)) = i
-let f (Instance ({ render; subtree } : Instance.t)) = i
-let f (Instance ({ render; subtree } : Instance.t)) = i
-let f (Instance (component, tree)) = i
-let f (Instance (component, tree)) = i
-let f (Instance : React.t) = i
-let f (Instance : React.t) = i
-let f (Instance (comp : Component.t) : React.t) = ()
-;;for Blue = x to y do () done
-;;for Blue as c = x to y do () done
-;;for Blue = x to y do () done
-;;for Blue as c = x to y do () done
-;;for (Blue : Color.t) = x to y do () done
-;;for (Blue : Color.t) as c = x to y do () done
-;;for (Blue : Color.t) as c = x to y do () done
-;;for Rgba (r, g, b) = x to y do () done
-;;for Rgba (r, g, b) as c = x to y do () done
-;;for Rgba ((r : float), (g : float), (b : float)) = x to y do () done
-;;for Rgba ((r : float), (g : float), (b : float)) as c = x to y do () done
-;;for (Rgba (r, g, b) : Rgb.t) = x to y do () done
-;;for (Rgba (r, g, b) : Rgb.t) as c = x to y do () done
-;;for (Rgba (r, g, b) : Rgb.t) as c = x to y do () done
-;;for Colour.Rgba (r, g, b) = x to y do () done
-;;for Colour.Rgba ((r : float), (g : float), (b : float)) = x to y do () done
-;;for (Colour.Rgba (r, g, b) : Rgb.t) = x to y do () done
-;;for Point { x; y; z } = x to y do () done
-;;for Point { x; y; z } = x to y do () done
-;;for Point { x; y; z } as p = x to y do () done
-;;match truth with
-  | true -> Js.log {js|true|js}
-  | false -> Js.log {js|false|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/exception.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/exception.res.txt
deleted file mode 100644
index f605551..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/exception.res.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-let exception Foo = ()
-let exception Foo as e = ()
-let exception (Foo as e) = ()
-let exception Foo (a, b) = ()
-let exception Foo (a, b) as e = ()
-let exception (Foo (a, b) as e) = ()
-let exception Foo = ()
-let exception Foo as e = ()
-let exception Foo as e = ()
-let exception (Foo as e) = ()
-let exception Foo (a, b) = ()
-let exception Foo (a, b) as e = ()
-let exception Foo (a, b) as e = ()
-let (exception Foo : t exc) = ()
-let (exception Foo : t exc) as e = ()
-let exception (Foo : t exc) as e = ()
-let exception ((Foo : t exc) as e) = ()
-;;match x with
-  | exception Foo -> ()
-  | exception Foo as e -> ()
-  | exception (Foo as e) -> ()
-  | exception Foo (a, b) -> ()
-  | exception Foo -> ()
-  | exception Foo as e -> ()
-  | exception (Foo as e) -> ()
-  | exception Foo (a, b) -> ()
-  | (exception Foo : t exc) -> ()
-let f exception Foo = ()
-let f (exception Foo as e) = ()
-let f exception (Foo as e) = ()
-let f exception Foo (a, b) = ()
-let f exception Foo = ()
-let f (exception Foo as e) = ()
-let f exception Foo (a, b) = ()
-let f (exception Foo : t exc) = ()
-;;for exception Foo = 0 to 10 do () done
-;;for exception Foo as e = 0 to 10 do () done
-;;for exception Foo = 0 to 10 do () done
-;;for exception Foo as e = 0 to 10 do () done
-;;for exception Foo = 0 to 10 do () done
-;;for exception Foo (a, b) = 0 to 10 do () done
-;;for exception Foo (a, b) = 0 to 10 do () done
-;;for (exception Foo (a, b) : t exc) = 0 to 10 do () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/extension.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/extension.res.txt
deleted file mode 100644
index 1f14e53..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/extension.res.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-let [%patternExtension ] = ()
-let [%pattern.extension ] = ()
-let [%bs.raw {js|x|js}] = ()
-let ([%bs.raw {js|x|js}] : unit) = ()
-let [%bs.raw {js|x|js}] as y = ()
-let [%patExt1 ]|[%patExt2 ] = ()
-;;match x with
-  | [%patternExtension ] -> ()
-  | [%pattern.extension ] -> ()
-  | [%pat.stuff test] -> ()
-  | [%pat.stuff test] as _x -> ()
-  | ([%pat.stuff test] : unit) -> ()
-  | [%patExt1 ]|[%patExt2 ] -> ()
-let f [%patternExtension ] = ()
-let f [%pattern.extension ] = ()
-let f [%bs.raw {js|x|js}] = ()
-let f [%bs.raw {js|x|js}] [%bs.raw {js|y|js}] = ()
-let f ([%bs.raw {js|x|js}] as _y) = ()
-let f ([%bs.raw {js|x|js}] : unit) = ()
-let f ([%patExt1 ]|[%patExt2 ]) = ()
-;;for [%ext ] = x to y do () done
-;;for [%ext1 ]|[%ext2 ] = x to y do () done
-;;for [%ext ] = x to y do () done
-;;for [%ext ] as e = x to y do () done
-;;for [%ext.pattern ] = x to y do () done
-;;for [%ext.pattern ] as e = x to y do () done
-;;for [%ext.pattern ] = x to y do () done
-;;for [%ext.pattern ] as e = x to y do () done
-;;for [%ext.pattern payload] = x to y do () done
-;;for [%ext.pattern payload] as e = x to y do () done
-;;for [%ext.pattern payload] = x to y do () done
-;;for [%ext.pattern payload] as e = x to y do () done
-;;for [%ext.pattern payload] as e|[%ext2 ] as bar = x to y do () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/firstClassModules.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/firstClassModules.res.txt
deleted file mode 100644
index f09c044..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/firstClassModules.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-let sort (type s) (module Set)  l = ()
-let sort (type s) ((module Set)  : (module Set.S with type elt = s)) l = ()
-let sort (type s)
-  ((module Set)  : (module Set.S with type elt = s and type elt2 = t)) l = ()
-let foo (module Foo)  baz = Foo.bar baz
-let bump_list (type a) ((module B)  : (module Bumpable with type t = a))
-  (l : a list) = List.map ~f:((B.bump l)[@res.namedArgLoc ])
-;;match x with
-  | (module Set)  -> ()
-  | ((module Set)  : (module Set.S with type elt = s)) -> ()
-  | ((module Set)  : (module Set.S with type elt = s and type elt2 = t)) ->
-      ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/lazy.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/lazy.res.txt
deleted file mode 100644
index 2087441..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/lazy.res.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-let (lazy x) = ()
-let (lazy x) as l = ()
-let (lazy (x as l)) = ()
-let (lazy x) = ()
-let (lazy x) as l = ()
-let (lazy x) as l = ()
-let (lazy (x as l)) = ()
-let (lazy (x : int)) = ()
-let (lazy (x : int)) = ()
-let ((lazy x) : int Lazy.t) = ()
-let ((lazy x) : int Lazy.t) as l = ()
-let ((lazy (x as l)) : int Lazy.t) = ()
-let (lazy exception x) = ()
-let (lazy exception x) = ()
-;;match x with
-  | (lazy foo) -> ()
-  | (lazy foo) as l -> ()
-  | (lazy (foo as l)) -> ()
-  | ((lazy x) : int Lazy.t) -> ()
-let f (lazy x) = ()
-let f ((lazy x) as l) = ()
-let f (lazy (x as l)) = ()
-let f (lazy x) = ()
-let f ((lazy x) as l) = ()
-let f (lazy (x as l)) = ()
-let f ((lazy x) : int Lazy.t) = ()
-let f (((lazy x) : int Lazy.t) as x) = ()
-let f ((lazy (x : int Lazy.t)) as x) = ()
-let f (lazy ((x : int Lazy.t) as l)) = ()
-let f ((lazy x) : int Lazy.t) = ()
-;;for (lazy x) = z to g do () done
-;;for (lazy x) as l = z to g do () done
-;;for (lazy (x as l)) = z to g do () done
-;;for (lazy x) = z to g do () done
-;;for (lazy x) as l = z to g do () done
-;;for (lazy (x as l)) = z to g do () done
-;;for (lazy x) = z to g do () done
-;;for (lazy x) as l = z to g do () done
-;;for (lazy x) as l = z to g do () done
-;;for (lazy (x as l)) = z to g do () done
-;;for ((lazy x) : int Lazy.t) = z to g do () done
-;;for ((lazy x) : int Lazy.t) as l = z to g do () done
-;;for (lazy (x : int Lazy.t)) as l = z to g do () done
-;;for (lazy ((x : int Lazy.t) as l)) = z to g do () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/list.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/list.res.txt
deleted file mode 100644
index f5b33cd..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/list.res.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-let [] = ()
-let [] as l = ()
-let x::[] = ()
-let (x as p1)::[] as l = ()
-let x::xs = ()
-let x::(xs as tail) = ()
-let x::y::tail = ()
-let x::y::[] = ()
-let (x as p1)::(y as p2)::[] = ()
-let x::y::[] = ()
-let x::xs = ()
-let x::y::tail = ()
-let x::(y::ys)::xs = ()
-let (x as p1)::((y as p2)::(ys as tail1) as l2)::(xs as tail2) = ()
-let (x : int)::((y : int)::(ys : int list))::xs = ()
-let ((x::xs) : int list) = ()
-let (x::xs : int list) as constrainedList = ()
-let (x::xs : int list) as clist = ()
-let ((x::xs : int list) : int list) = ()
-;;match x with
-  | [] -> ()
-  | [] as l -> ()
-  | (x as p1)::[] -> ()
-  | (x : int)::[] -> ()
-  | x::xs -> ()
-  | ((x : int)::(xs : int list) : int list) -> ()
-  | (x as p1)::(xs as p2) as l -> ()
-  | x::y::tail -> ()
-  | x::y::[] -> ()
-  | x::y::[] -> ()
-  | x::xs -> ()
-  | x::y::tail -> ()
-  | x::(y::ys)::xs -> ()
-  | (x as p1)::((y as p2)::(ys as tail1))::(xs as tail2) as l -> ()
-  | (x::xs : int list) -> ()
-let f [] = ()
-let f ([] as p) = ()
-let f (x::[]) = ()
-let f (((x : int) as p)::[]) = ()
-let f ((x as p)::[] as p2) = ()
-let f (x::xs) = ()
-let f (x::(xs as tail)) = ()
-let f (x::y::tail) = ()
-let f (x::y::[]) = ()
-let f (x::y::[]) = ()
-let f (x::xs) = ()
-let f (x::y::tail) = ()
-let f (x::(y::ys)::xs) = ()
-let f ((x as p1)::((y as p2)::(ys as tail1))::(xs as tail2) as l) = ()
-let f (x::xs : int list) = ()
-;;for [] = x to y do () done
-;;for [] as l = x to y do () done
-;;for [] = x to y do () done
-;;for [] as l = x to y do () done
-;;for [] = x to y do () done
-;;for [] as l = x to y do () done
-;;for [] as l = x to y do () done
-;;for x::[] = x to y do () done
-;;for (x as p)::[] = x to y do () done
-;;for ((x : int) as p)::[] = x to y do () done
-;;for ((x as p) : int)::[] = x to y do () done
-;;for x::[] = x to y do () done
-;;for x::[] = x to y do () done
-;;for x::xs = x to y do () done
-;;for x::xs = x to y do () done
-;;for x::xs = x to y do () done
-;;for (x as p1)::((y as p2)::(ys as tail1))::(xs as tail2) as l = x to y do
-    ()
-  done
-;;for (x::xs : int list) = x to y do () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/or.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/or.res.txt
deleted file mode 100644
index f7e4704..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/or.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-;;match x with
-  | Blue|Red -> ()
-  | Blue|Red as colour -> ()
-  | Blue as c1|Red as c2 -> ()
-  | Blue as c1|Red as c2 -> ()
-  | exception Exit|exception Continue -> ()
-  | exception (Exit|exception Continue) -> ()
-  | (lazy x)|(lazy y) -> ()
-  | (lazy (x|(lazy y))) -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/polyvariants.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/polyvariants.res.txt
deleted file mode 100644
index 2f39ab9..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/polyvariants.res.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-let `Instance = i
-let `Instance as inst = i
-let `Instance component = i
-let `Instance component as inst = i
-let `Instance component = i
-let `Instance { render; subtree } = i
-let `Instance { render; subtree } as x = i
-let `Instance ({ render; subtree } as inst) = i
-let `Instance ({ render; subtree }, inst) = i
-let `Instance ({ render; subtree } : Instance.t) = i
-let `Instance ({ render; subtree } : Instance.t) as inst = i
-let `Instance ({ render; subtree } : Instance.t) = i
-let `Instance (component, tree) = i
-let `Instance (component, tree) as x = i
-let `Instance ((component as x), (tree as y)) = i
-let `Instance (component, tree) as inst = i
-let `Instance (component, tree) = i
-let (`Instance : React.t) = i
-let (`Instance : React.t) as t = i
-let (`Instance : React.t) as x = i
-let ((`Instance (component : comp)) : React.t) = i
-let ((`Instance (component : comp)) : React.t) = i
-;;match x with
-  | `Instance -> ()
-  | `Instance as inst -> ()
-  | `Instance comp -> ()
-  | `Instance comp as inst -> ()
-  | `Instance { render; subtree } -> ()
-  | `Instance ({ render; subtree }, inst) -> ()
-  | `Instance ({ render; subtree } : Instance.t) -> ()
-  | `Instance ({ render; subtree } : Instance.t) -> ()
-  | `Instance (comp, tree) -> ()
-  | (`Instance (comp : Component.t) : React.t) -> ()
-let f `Instance = i
-let f (`Instance as i) = i
-let f (`Instance component) = i
-let f (`Instance component) = i
-let f (`Instance { render; subtree }) = i
-let f (`Instance ({ render; subtree }, inst)) = i
-let f (`Instance ({ render; subtree } : Instance.t)) = i
-let f (`Instance ({ render; subtree } : Instance.t)) = i
-let f (`Instance (component, tree)) = i
-let f (`Instance (component, tree)) = i
-let f (`Instance : React.t) = i
-let f (`Instance : React.t) = i
-let f (`Instance (comp : Component.t) : React.t) = ()
-;;for `Blue = x to y do () done
-;;for `Blue as c = x to y do () done
-;;for `Blue = x to y do () done
-;;for `Blue as c = x to y do () done
-;;for (`Blue : Color.t) = x to y do () done
-;;for (`Blue : Color.t) as c = x to y do () done
-;;for (`Blue : Color.t) as c = x to y do () done
-;;for `Rgba (r, g, b) = x to y do () done
-;;for `Rgba (r, g, b) as c = x to y do () done
-;;for Rgba ((r : float), (g : float), (b : float)) = x to y do () done
-;;for `Rgba ((r : float), (g : float), (b : float)) as c = x to y do () done
-;;for (`Rgba (r, g, b) : Rgb.t) = x to y do () done
-;;for (`Rgba (r, g, b) : Rgb.t) as c = x to y do () done
-;;for (`Rgba (r, g, b) : Rgb.t) as c = x to y do () done
-;;for `Point { x; y; z } = x to y do () done
-;;for `Point { x; y; z } = x to y do () done
-;;for `Point { x; y; z } as p = x to y do () done
-;;match x with | #typeVar -> () | `lowercase -> ()
-let cmp selectedChoice value =
-  match (selectedChoice, value) with
-  | (#a, #a) -> true
-  | [|#b;#b|] -> true
-  | #b::#b::[] -> true
-  | { x = #c; y = #c } -> true
-  | Constructor (#a, #a) -> true
-  | `Constuctor (#a, #a) -> true
-  | #a as x -> true
-  | #a|#b -> true
-  | (#a : typ) -> true
-  | (lazy #a) -> true
-  | exception #a -> true
-  | _ -> false
-;;match polyVar with
-  | `ease-in -> ()
-  | `ease-out⛰ -> ()
-  | `ease+++ (`1Blue, `r+) -> ()
-  | _ -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/record.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/record.res.txt
deleted file mode 100644
index 646a08c..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/record.res.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-let { a } = x
-let { a } as p = x
-let { a } = x
-let { a; b } = x
-let { a = p1; b = p2 } = x
-let { a; b } = x
-let { ReasonReact.state = state } = x
-let { ReasonReact.state = (state as prevState) } = x
-let { ReasonReact.state = theState } = x
-let { a = u } = x
-let { a = (u : int) } = x
-let { a = ((u as p) : int) } = x
-let { a = { x; y } } = x
-let { a = { x = p1; y = p2 } } = x
-let { a;_} = x
-let { a;_} = x
-let ({ a } : myRecord) = x
-;;match x with
-  | { a } -> ()
-  | { a } as r -> ()
-  | { a } -> ()
-  | { a; b } -> ()
-  | { a; b } -> ()
-  | { ReasonReact.state = state } -> ()
-  | { ReasonReact.state = (state as prevState) } -> ()
-  | { ReasonReact.state = theState } -> ()
-  | { a = u } -> ()
-  | { a = (u : int) } -> ()
-  | { a = (((u as p) : int) as p2) } as p3 -> ()
-  | { a = { x; y } } -> ()
-  | { a = ({ x = p1; y = p2 } as p3) } -> ()
-  | { a;_} -> ()
-  | { a;_} -> ()
-  | ({ a } : myRecord) -> ()
-let f { a } = ()
-let f ({ a } as r) = ()
-let f { a } = ()
-let f { a; b } = ()
-let f { a; b } = ()
-let f { ReasonReact.state = state } = ()
-let f { ReasonReact.state = (state as prevState) } = ()
-let f { ReasonReact.state = theState } = ()
-let f { a = u } = ()
-let f { a = (u : int) } = ()
-let f { a = (((u as x) : int) as r) } = ()
-let f { a = { x; y } } = ()
-let f { a = { x = r; y = r2 } } = ()
-let f { a;_} = ()
-let f { a;_} = ()
-let f ({ a } : myRecord) = ()
-let f ({ a } : myRecord) = ()
-let f (({ a } : myRecord) as p) = ()
-;;for { a } = 0 to 10 do () done
-;;for { a } as p = 0 to 10 do () done
-;;for { a } = 0 to 10 do () done
-;;for { a } as p = 0 to 10 do () done
-;;for { a } = 0 to 10 do () done
-;;for { a } as p = 0 to 10 do () done
-;;for { ReasonReact.state = state } = 0 to 10 do () done
-;;for { ReasonReact.state = state } = 0 to 10 do () done
-;;for { ReasonReact.state = state } = 0 to 10 do () done
-;;for { ReasonReact.state = (state as prevState) } = 0 to 10 do () done
-;;for { ReasonReact.state = (state as prevState) } = 0 to 10 do () done
-;;for { ReasonReact.state = (state as prevState) } = 0 to 10 do () done
-;;for { ReasonReact.state = theState } = 0 to 10 do () done
-;;for { ReasonReact.state = theState } = 0 to 10 do () done
-;;for { ReasonReact.state = theState } = 0 to 10 do () done
-;;for { a = u } = 0 to 10 do () done
-;;for { a = u } = 0 to 10 do () done
-;;for { a = u } = 0 to 10 do () done
-;;for { a = (u : int) } = 0 to 10 do () done
-;;for { a = (((u as sp) : int) as p) } = 0 to 10 do () done
-;;for { a = (u : int) } = 0 to 10 do () done
-;;for { a = (u : int) } = 0 to 10 do () done
-;;for { a = { x; y } } = 0 to 10 do () done
-;;for { a = ({ x = p1; y = p2 } as p3) } = 0 to 10 do () done
-;;for { a = { x; y } } = 0 to 10 do () done
-;;for { a = { x; y } } as p as p2 = 0 to 10 do () done
-;;for { a = { x; y } } = 0 to 10 do () done
-;;for { a;_} = 0 to 10 do () done
-;;for { a;_} = 0 to 10 do () done
-;;for { a;_} = 0 to 10 do () done
-;;for ({ a } : myRecord) = 0 to 10 do () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/tuple.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/tuple.res.txt
deleted file mode 100644
index a8f85ee..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/tuple.res.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-let (1, 2) = ()
-let (1, 2) as tup = ()
-let ((1 as p1), (2 as p2)) = ()
-let (1, 2) = ()
-let ((1 : int), (2 : int)) = ()
-let ((1 : int), (2 : int)) as tup = ()
-let (((1 : int), (2 : int)) : (int * int)) = ()
-let ((((1 : int), (2 : int)) as tup) : (int * int)) = ()
-let (((1 : int), (2 : int)) : (int * int)) as tup = ()
-;;match x with
-  | (1, 2) -> ()
-  | (1, 2) as tup -> ()
-  | (1, 2) -> ()
-  | ((1 : int), (2 : int)) -> ()
-  | (((1 as p1) : int), ((2 as p2) : int)) as tup -> ()
-  | (((1 : int), (2 : int)) : (int * int)) -> ()
-  | (((1 : int), (2 : int)) : (int * int)) as tup -> ()
-let f x = ()
-let f x = ()
-let f (x, y) = x + y
-let f (((x as p1), (y as p2)) as tup) = x + y
-let f ((x, y) : (int * int)) = ()
-let f ((x, y) : (int * int)) = ()
-let f ((((x, y) as tup1) : (int * int)) as tup) = ()
-;;for (x, y) = 0 to 10 do () done
-;;for (x, y) as tup = 0 to 10 do () done
-;;for (x, y) = 0 to 10 do () done
-;;for ((x as p1), (y as p2)) = 0 to 10 do () done
-;;for (x, y) as tup = 0 to 10 do () done
-;;for (x, y) = 0 to 10 do () done
-;;for (x, y) as tup = 0 to 10 do () done
-;;for ((x as p1), (y as p2)) as tup = 0 to 10 do () done
-;;for ((x, y) : (int * int)) = 0 to 10 do () done
-;;for ((x, y) : (int * int)) as ctup = 0 to 10 do () done
-;;for ((x, y) : (int * int)) as ctup = 0 to 10 do () done
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/unit.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/unit.res.txt
deleted file mode 100644
index 64895da..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/unit.res.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-let () = ()
-let () as x = ()
-let () = ()
-let () as x = ()
-let () as x = ()
-let (() : unit) = ()
-let (() : unit) as x = ()
-let (() : unit) as x = ()
-;;match x with
-  | () -> ()
-  | () as _u -> ()
-  | () -> ()
-  | () as _u -> ()
-  | () as _u -> ()
-  | (() : unit) -> ()
-  | (() : unit) as _u -> ()
-  | (() : unit) as _u -> ()
-;;for () = () to () do () done
-;;for () as _u = () to () do () done
-;;for () = () to () do () done
-;;for () as _u = () to () do () done
-;;for () = () to () do () done
-;;for () as _u = () to () do () done
-;;for () as _u = () to () do () done
-;;for (() : unit) = () to () do () done
-;;for (() : unit) as _u = () to () do () done
-;;for ((() as _u) : unit) = () to () do () done
-;;for (() : unit) as _u = () to () do () done
-let f () = ()
-let f () = ()
-let f (() as _u) = ()
-let f () () = ()
-let f (() as _u) (() as _u) = ()
-let f (() : unit) = ()
-let f ((() as _u) : unit) = ()
-let f ((() : unit) as _u) = ()
-let f (() : unit) = ()
-let f ((() : unit) as _u) = ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/var.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/var.res.txt
deleted file mode 100644
index e506589..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/var.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = 1
-let list = 2
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/expected/variants.res.txt b/jscomp/syntax/tests/parsing/grammar/pattern/expected/variants.res.txt
deleted file mode 100644
index d969f01..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/expected/variants.res.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-let `Instance = i
-let `Instance as inst = i
-let `Instance component = i
-let `Instance component as inst = i
-let `Instance component = i
-let `Instance { render; subtree } = i
-let `Instance { render; subtree } as x = i
-let `Instance ({ render; subtree } as inst) = i
-let `Instance ({ render; subtree }, inst) = i
-let `Instance ({ render; subtree } : Instance.t) = i
-let `Instance ({ render; subtree } : Instance.t) as inst = i
-let `Instance ({ render; subtree } : Instance.t) = i
-let `Instance (component, tree) = i
-let `Instance (component, tree) as x = i
-let `Instance ((component as x), (tree as y)) = i
-let `Instance (component, tree) as inst = i
-let `Instance (component, tree) = i
-let (`Instance : React.t) = i
-let (`Instance : React.t) as t = i
-let (`Instance : React.t) as x = i
-let ((`Instance (component : comp)) : React.t) = i
-let ((`Instance (component : comp)) : React.t) = i
-;;match x with
-  | `Instance -> ()
-  | `Instance as inst -> ()
-  | `Instance comp -> ()
-  | `Instance comp as inst -> ()
-  | `Instance { render; subtree } -> ()
-  | `Instance ({ render; subtree }, inst) -> ()
-  | `Instance ({ render; subtree } : Instance.t) -> ()
-  | `Instance ({ render; subtree } : Instance.t) -> ()
-  | `Instance (comp, tree) -> ()
-  | (`Instance (comp : Component.t) : React.t) -> ()
-let f `Instance = i
-let f (`Instance as i) = i
-let f (`Instance component) = i
-let f (`Instance component) = i
-let f (`Instance { render; subtree }) = i
-let f (`Instance ({ render; subtree }, inst)) = i
-let f (`Instance ({ render; subtree } : Instance.t)) = i
-let f (`Instance ({ render; subtree } : Instance.t)) = i
-let f (`Instance (component, tree)) = i
-let f (`Instance (component, tree)) = i
-let f (`Instance : React.t) = i
-let f (`Instance : React.t) = i
-let f (`Instance (comp : Component.t) : React.t) = ()
-;;for `Blue = x to y do () done
-;;for `Blue as c = x to y do () done
-;;for `Blue = x to y do () done
-;;for `Blue as c = x to y do () done
-;;for (`Blue : Color.t) = x to y do () done
-;;for (`Blue : Color.t) as c = x to y do () done
-;;for (`Blue : Color.t) as c = x to y do () done
-;;for `Rgba (r, g, b) = x to y do () done
-;;for `Rgba (r, g, b) as c = x to y do () done
-;;for Rgba ((r : float), (g : float), (b : float)) = x to y do () done
-;;for `Rgba ((r : float), (g : float), (b : float)) as c = x to y do () done
-;;for (`Rgba (r, g, b) : Rgb.t) = x to y do () done
-;;for (`Rgba (r, g, b) : Rgb.t) as c = x to y do () done
-;;for (`Rgba (r, g, b) : Rgb.t) as c = x to y do () done
-;;for `Point { x; y; z } = x to y do () done
-;;for `Point { x; y; z } = x to y do () done
-;;for `Point { x; y; z } as p = x to y do () done
-;;match x with | #typeVar -> () | `lowercase -> ()
-;;match numericPolyVar with
-  | `1 -> ()
-  | `42 -> ()
-  | `42444 -> ()
-  | `3 (x, y, z) -> Js.log3 x y z
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/extension.res b/jscomp/syntax/tests/parsing/grammar/pattern/extension.res
deleted file mode 100644
index a24db1a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/extension.res
+++ /dev/null
@@ -1,40 +0,0 @@
-let %patternExtension = ()
-
-let %pattern.extension = ()
-
-let %bs.raw("x") = ()
-let (%bs.raw("x") : unit) = ()
-let %bs.raw("x") as y = ()
-
-let %patExt1 | %patExt2 = ()
-
-switch x {
-| %patternExtension => ()
-| %pattern.extension => ()
-| %pat.stuff(test) => ()
-| %pat.stuff(test) as _x => ()
-| (%pat.stuff(test) : unit) => ()
-| %patExt1 | %patExt2 => ()
-}
-
-let f = (%patternExtension) => ()
-let f = (%pattern.extension) => ()
-let f = (%bs.raw("x")) => ()
-let f = (%bs.raw("x"), %bs.raw("y")) => ()
-let f = (%bs.raw("x") as _y) => ()
-let f = (%bs.raw("x") : unit) => ()
-let f = (%patExt1 | %patExt2) => ()
-
-for %ext in x to y { () }
-for %ext1 | %ext2 in x to y { () }
-for (%ext in x to y) { () }
-for (%ext as e in x to y) { () }
-for %ext.pattern in x to y { () }
-for %ext.pattern as e in x to y { () }
-for (%ext.pattern in x to y) { () }
-for (%ext.pattern as e in x to y) { () }
-for %ext.pattern(payload) in x to y { () }
-for %ext.pattern(payload) as e  in x to y { () }
-for (%ext.pattern(payload) in x to y) { () }
-for (%ext.pattern(payload) as e in x to y) { () }
-for (%ext.pattern(payload) as e | %ext2 as bar in x to y) { () }
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/firstClassModules.res b/jscomp/syntax/tests/parsing/grammar/pattern/firstClassModules.res
deleted file mode 100644
index 5e17586..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/firstClassModules.res
+++ /dev/null
@@ -1,12 +0,0 @@
-let sort = (type s, module(Set), l) => ()
-let sort = (type s, module(Set : Set.S with type elt = s), l) => ()
-let sort = (type s, module(Set : Set.S with type elt = s and type elt2 = t), l) => ()
-let foo = (module(Foo), baz) => Foo.bar(baz);
-let bump_list = (type a, module(B : Bumpable with type t = a), l : list<a>) =>
-  List.map(~f=B.bump(l))
-
-switch x {
-| module(Set) => ()
-| module(Set : Set.S with type elt = s) => ()
-| module(Set : Set.S with type elt = s and type elt2 = t) => ()
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/lazy.res b/jscomp/syntax/tests/parsing/grammar/pattern/lazy.res
deleted file mode 100644
index cf500ee..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/lazy.res
+++ /dev/null
@@ -1,49 +0,0 @@
-let lazy x = ()
-let lazy x as l = ()
-let lazy (x as l) = ()
-let (lazy x) = ()
-let (lazy x) as l = ()
-let (lazy x as l)  = ()
-let (lazy (x as l))  = ()
-let (lazy (x: int)) = ()
-let lazy (x: int) = ()
-let (lazy x: Lazy.t<int>) = ()
-let (lazy x: Lazy.t<int>) as l = ()
-let (lazy (x as l): Lazy.t<int>) = ()
-
-let lazy exception x = ()
-let lazy (exception x) = ()
-
-switch x {
-| lazy foo => ()
-| lazy foo as l => ()
-| lazy (foo as l) => ()
-| (lazy x: Lazy.t<int>) => ()
-}
-
-let f = (lazy x) => ()
-let f = (lazy x as l) => ()
-let f = (lazy (x as l)) => ()
-let f = ((lazy x)) => ()
-let f = ((lazy x) as l) => ()
-let f = ((lazy (x as l))) => ()
-let f = (lazy x: Lazy.t<int>) => ()
-let f = ((lazy x: Lazy.t<int>) as x) => ()
-let f = ((lazy (x: Lazy.t<int>) as x) ) => ()
-let f = ((lazy ((x: Lazy.t<int>) as l) ) ) => ()
-let f = ((lazy x: Lazy.t<int>)) => ()
-
-for lazy x in z to g { () }
-for lazy x as l in z to g { () }
-for lazy (x as l) in z to g { () }
-for (lazy x in z to g) { () }
-for (lazy x as l in z to g) { () }
-for (lazy (x as l) in z to g) { () }
-for ((lazy x) in z to g) { () }
-for ((lazy x) as l in z to g) { () }
-for ((lazy x as l)  in z to g) { () }
-for ((lazy (x as l))  in z to g) { () }
-for ((lazy x: Lazy.t<int>) in z to g) { () }
-for ((lazy x: Lazy.t<int>) as l in z to g) { () }
-for ((lazy (x: Lazy.t<int>) as l) in z to g) { () }
-for ((lazy ((x: Lazy.t<int>) as l)) in z to g) { () }
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/list.res b/jscomp/syntax/tests/parsing/grammar/pattern/list.res
deleted file mode 100644
index c445339..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/list.res
+++ /dev/null
@@ -1,73 +0,0 @@
-let list{} = ()
-let list{} as l = ()
-let list{x} = ()
-let list{x as p1} as l = ()
-let list{x, ...xs} = ()
-let list{x, ...xs as tail} = ()
-let list{x, y, ...tail} = ()
-let list{x, y} = ()
-let list{x as p1, y as p2} = ()
-let list{x, y,} = () // trailing comma
-let list{x, ...xs,} = () // trailing comma
-let list{x, y, ...tail,} = ()// trailing comma
-let list{x, list{y, ...ys}, ...xs} = ()
-let list{x as p1, list{y as p2, ...ys as tail1} as l2, ...xs as tail2} = ()
-let list{x :int, list{y :int, ...ys : list<int>}, ...xs} = ()
-let (list{x, ...xs} : list<int>) = ()
-let (list{x, ...xs} : list<int>) as constrainedList = ()
-let ((list{x, ...xs} : list<int>) as clist) = ()
-let ((list{x, ...xs} : list<int>) : list<int>) = ()
-
-switch x {
-| list{} => ()
-| list{} as l => ()
-| list{x as p1} => ()
-| list{x : int} => ()
-| list{x, ...xs} => ()
-| (list{x : int, ...xs : list<int>} :list<int>) => ()
-| list{x as p1, ...xs as p2} as l => ()
-| list{x, y, ...tail} => ()
-| list{x, y} => ()
-| list{x, y,} => () // trailing comma
-| list{x, ...xs,} => () // trailing comma
-| list{x, y, ...tail,} => ()// trailing comma
-| list{x, list{y, ...ys}, ...xs} => ()
-| list{x as p1, list{y as p2, ...ys as tail1}, ...xs as tail2} as l => ()
-| (list{x, ...xs} : list<int>) => ()
-}
-
-let f = (list{}) => ()
-let f = (list{} as p) => ()
-let f = (list{x}) => ()
-let f = (list{(x : int) as p}) => ()
-let f = (list{x as p} as p2) => ()
-let f = (list{x, ...xs}) => ()
-let f = (list{x, ...xs as tail}) => ()
-let f = (list{x, y, ...tail}) => ()
-let f = (list{x, y}) => ()
-let f = (list{x, y,}) => () // trailing comma
-let f = (list{x, ...xs,}) => () // trailing comma
-let f = (list{x, y, ...tail,}) => ()// trailing comma
-let f = (list{x, list{y, ...ys}, ...xs}) => ()
-let f = (list{x as p1, list{y as p2, ...ys as tail1}, ...xs as tail2} as l) => ()
-let f = (list{x, ...xs} : list<int>) => ()
-
-for list{} in x to y { () }
-for list{} as l in x to y { () }
-for (list{} in x to y) { () }
-for (list{} as l in x to y) { () }
-for ((list{}) in x to y) { () }
-for ((list{}) as l in x to y) { () }
-for ((list{} as l) in x to y) { () }
-for list{x} in x to y { () }
-for list{x as p} in x to y { () }
-for list{(x : int) as p} in x to y { () }
-for list{x as p : int} in x to y { () }
-for (list{x} in x to y) { () }
-for ((list{x}) in x to y) { () }
-for list{x, ...xs} in x to y { () }
-for (list{x, ...xs} in x to y) { () }
-for ((list{x, ...xs}) in x to y) { () }
-for (list{x as p1, list{y as p2, ...ys as tail1}, ...xs as tail2} as l in x to y) { () }
-for ((list{x, ...xs} : list<int>) in x to y) { () }
-
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/or.res b/jscomp/syntax/tests/parsing/grammar/pattern/or.res
deleted file mode 100644
index d7f37cc..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/or.res
+++ /dev/null
@@ -1,10 +0,0 @@
-switch x {
-| Blue | Red => ()
-| (Blue | Red) as colour => ()
-| Blue as c1 | Red as c2 => ()
-| (Blue as c1) | (Red as c2) => ()
-| exception Exit | exception Continue => ()
-| exception (Exit | exception Continue) => ()
-| lazy x | lazy y => ()
-| lazy (x | lazy y) => ()
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/polyvariants.res b/jscomp/syntax/tests/parsing/grammar/pattern/polyvariants.res
deleted file mode 100644
index 44e891b..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/polyvariants.res
+++ /dev/null
@@ -1,107 +0,0 @@
-let #Instance = i;
-let #Instance as inst = i;
-
-let #Instance(component) = i
-let #Instance(component) as inst = i
-let #Instance(component,) = i // trailing comma
-
-let #Instance({render, subtree}) = i
-let #Instance({render, subtree}) as x = i
-let #Instance({render, subtree} as inst) = i
-let #Instance({render, subtree}, inst) = i
-let #Instance({render, subtree} : Instance.t) = i
-let #Instance({render, subtree} : Instance.t) as inst = i
-let #Instance(({render, subtree} : Instance.t)) = i
-
-let #Instance(component, tree) = i
-let #Instance(component, tree) as x = i
-let #Instance(component as x, tree as y) = i
-let #Instance(component, tree) as inst = i
-let #Instance(component, tree,) = i // trailing comma
-
-let (#Instance : React.t) = i;
-let ((#Instance : React.t) as t) = i;
-let (#Instance : React.t) as x = i;
-// constraints
-let (#Instance(component : comp) : React.t) = i
-let (#Instance(component : comp,) : React.t) = i
-
-switch x {
-| #Instance => ()
-| #Instance as inst => ()
-| #Instance(comp) => ()
-| #Instance(comp) as inst => ()
-| #Instance({render, subtree}) => ()
-| #Instance({render, subtree}, inst) => ()
-| #Instance({render, subtree} : Instance.t) => ()
-| #Instance(({render, subtree} : Instance.t)) => ()
-| #Instance(comp, tree) => ()
-| (#Instance(comp: Component.t) : React.t) => ()
-}
-
-
-let f = (#Instance) => i;
-let f = (#Instance as i) => i;
-
-let f = (#Instance(component)) => i
-let f = (#Instance(component,)) => i // trailing comma
-
-let f = (#Instance({render, subtree})) => i
-let f = (#Instance({render, subtree}, inst)) => i
-let f = (#Instance({render, subtree} : Instance.t)) => i
-let f = (#Instance(({render, subtree} : Instance.t))) => i
-
-let f = (#Instance(component, tree)) => i
-let f = (#Instance(component, tree,)) => i // trailing comma
-
-let f = ((#Instance : React.t)) => i;
-let f = (#Instance : React.t) => i;
-let f = (#Instance(comp: Component.t) : React.t) => ()
-
-for #Blue in x to y { () }
-for #Blue as c in x to y { () }
-for (#Blue in x to y) { () }
-for (#Blue as c in x to y) { () }
-for ((#Blue: Color.t) in x to y) { () }
-for ((#Blue: Color.t) as c in x to y) { () }
-for (((#Blue: Color.t) as c) in x to y) { () }
-
-for #Rgba(r, g, b) in x to y { () }
-for #Rgba(r, g, b) as c in x to y { () }
-for (Rgba(r : float, g : float, b : float) in x to y) { () }
-for (#Rgba(r : float, g : float, b : float) as c in x to y) { () }
-for ((#Rgba(r, g, b) : Rgb.t) in x to y) { () }
-for ((#Rgba(r, g, b) : Rgb.t) as c in x to y) { () }
-for (((#Rgba(r, g, b) : Rgb.t) as c) in x to y) { () }
-
-for #Point({x, y, z}) in x to y { () }
-for (#Point({x, y, z}) in x to y) { () }
-for (#Point({x, y, z}) as p in x to y) { () }
-
-switch x {
-    | #...typeVar => ()
-    | #lowercase => ()
-    }
-
-let cmp = (selectedChoice, value) =>
-  switch (selectedChoice, value) {
-  | (#...a, #...a) => true
-  | [#...b, #...b] => true
-  | list{#...b, #...b} => true
-  | {x: #...c, y: #...c} => true
-  | Constructor(#...a, #...a) => true
-  | #Constuctor(#...a, #...a) => true
-  | #...a as x => true
-  | # ...a | # ... b => true
-  | (#...a : typ) => true
-  | lazy #...a => true
-  | exception #...a => true
-  | _ => false
-  }
-
-switch polyVar {
-| #"ease-in" => ()
-| #"ease-out⛰" => ()
-| #"ease+++"(#"1Blue", #"r+") => ()
-| _ => ()
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/record.res b/jscomp/syntax/tests/parsing/grammar/pattern/record.res
deleted file mode 100644
index 424baff..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/record.res
+++ /dev/null
@@ -1,90 +0,0 @@
-let {a} = x
-let {a} as p = x
-let {a,} = x // trailing comma
-let {a, b} = x
-let {a: p1, b: p2} = x
-let {a, b,} = x // trailing comma
-let {ReasonReact.state} = x
-let {ReasonReact.state: state as prevState} = x
-let {ReasonReact.state: theState} = x 
-let {a: u} = x
-let {a: (u: int)} = x
-let {a: (u as p: int)} = x
-let {a: {x, y}} = x
-let {a: {x: p1, y: p2}} = x
-let {a, _ } = x
-let {a, _, } = x
-let ({a} : myRecord) = x
-
-switch x {
-| {a} => ()
-| {a} as r => ()
-| {a,} => () // trailing comma
-| {a, b} => () 
-| {a, b,} => () // trailing comma
-| {ReasonReact.state} => ()
-| {ReasonReact.state: state as prevState} => ()
-| {ReasonReact.state: theState} => ()
-| {a: u} => ()
-| {a: (u: int)} => ()
-| {a: (u as p: int) as p2} as p3 => ()
-| {a: {x, y}} => ()
-| {a: {x: p1, y: p2} as p3} => ()
-| {a, _ } => ()
-| {a, _, } => ()
-| ({a} : myRecord) => () 
-}
-
-let f = ({a}) => ()
-let f = ({a} as r) => ()
-let f = ({a,}) => () // trailing comma
-let f = ({a, b}) => () 
-let f = ({a, b,}) => () // trailing comma
-let f = ({ReasonReact.state}) => () 
-let f = ({ReasonReact.state: state as prevState}) => () 
-let f = ({ReasonReact.state: theState}) => () 
-let f = ({a: u}) => ()
-let f = ({a: (u: int)}) => ()
-let f = ({a: (u as x: int) as r}) => ()
-let f = ({a: {x, y}}) => () 
-let f = ({a: {x: r, y: r2}}) => () 
-let f = ({a, _ }) => () 
-let f = ({a, _,}) => () 
-let f = ({a}: myRecord) => () 
-let f = (({a}: myRecord)) => () 
-let f = (({a}: myRecord) as p) => () 
-
-
-for {a} in 0 to 10 { () }
-for {a} as p in 0 to 10 { () }
-for (({a}) in 0 to 10) { () }
-for (({a} as p) in 0 to 10) { () }
-for ({a} in 0 to 10) { () }
-for ({a} as p in 0 to 10) { () }
-
-for {ReasonReact.state} in 0 to 10 { () }
-for ({ReasonReact.state} in 0 to 10) { () }
-for (({ReasonReact.state}) in 0 to 10) { () }
-
-for {ReasonReact.state: state as prevState} in 0 to 10 { () }
-for ({ReasonReact.state: state as prevState} in 0 to 10) { () }
-for (({ReasonReact.state: state as prevState}) in 0 to 10) { () }
-for {ReasonReact.state: theState} in 0 to 10 { () }
-for ({ReasonReact.state: theState} in 0 to 10) { () }
-for (({ReasonReact.state: theState}) in 0 to 10) { () }
-for {a: u} in 0 to 10 { () }
-for (({a: u}) in 0 to 10) { () }
-for ({a: u} in 0 to 10) { () }
-for {a: (u: int)} in 0 to 10 { () }
-for {a: (u as sp: int) as p} in 0 to 10 { () }
-for (({a: (u: int)}) in 0 to 10) { () }
-for ({a: (u: int)} in 0 to 10) { () }
-for {a: {x, y}} in 0 to 10 { () }
-for {a: {x: p1, y: p2} as p3} in 0 to 10 { () }
-for (({a: {x, y}}) in 0 to 10) { () }
-for (({a: {x, y}} as p) as p2 in 0 to 10) { () }
-for ({a: {x, y}} in 0 to 10) { () }
-for {a, _} in 0 to 10 { () }
-for (({a, _}) in 0 to 10) { () }
-for ({a, _} in 0 to 10) { () }
-for (({a} : myRecord) in 0 to 10) { () }
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/tuple.res b/jscomp/syntax/tests/parsing/grammar/pattern/tuple.res
deleted file mode 100644
index f942fc5..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/tuple.res
+++ /dev/null
@@ -1,39 +0,0 @@
-let (1, 2) = ()
-let ((1, 2) as tup) = ()
-let (1 as p1, 2 as p2) = ()
-let (1, 2) = () // TODO: add trailing comma
-let (1 : int, 2 : int) = ()
-let ((1 : int, 2 : int) as tup) = ()
-let ((1 : int, 2 : int) : (int, int)) = ()
-let ((1 : int, 2 : int) as tup : (int, int)) = ()
-let (((1 : int, 2 : int) : (int, int)) as tup) = ()
-
-switch x {
-| (1, 2) => () 
-| (1, 2) as tup => () 
-| (1, 2) => () // TODO: add trailing comma
-| (1: int, 2 : int) => () 
-| (1 as p1: int, 2 as p2 : int) as tup => () 
-| ((1: int, 2 : int) : (int, int)) => () 
-| ((1: int, 2 : int) : (int, int)) as tup => () 
-}
-
-let f = ((x)) => ()
-let f = ((x)) => ()
-let f = ((x, y)) => x + y // TODO: add trailing comma
-let f = ((x as p1, y as p2) as tup) => x + y // TODO: add trailing comma
-let f = ((x, y) : (int, int)) => ()
-let f = (((x, y) : (int, int))) => ()
-let f = (((x, y) as tup1 : (int, int)) as tup) => ()
-
-for (x, y) in 0 to 10 { () }
-for (x, y) as tup in 0 to 10 { () }
-for ((x, y) in 0 to 10) { () }
-for ((x as p1, y as p2) in 0 to 10) { () }
-for ((x, y) as tup in 0 to 10) { () }
-for (((x, y)) in 0 to 10) { () }
-for (((x, y) as tup) in 0 to 10) { () }
-for (((x as p1, y as p2)) as tup in 0 to 10) { () }
-for (((x, y) : (int, int)) in 0 to 10) { () }
-for (((x, y) : (int, int)) as ctup in 0 to 10) { () }
-for ((((x, y) : (int, int)) as ctup) in 0 to 10) { () }
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/unit.res b/jscomp/syntax/tests/parsing/grammar/pattern/unit.res
deleted file mode 100644
index 4866c42..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/unit.res
+++ /dev/null
@@ -1,42 +0,0 @@
-let () = ()
-let () as x = ()
-let (()) = ()
-let (() as x) = ()
-let (()) as x = ()
-let ((): unit) = ()
-let ((): unit) as x = ()
-let (((): unit) as x)  = ()
-
-switch x {
-| () => ()
-| () as _u => ()
-| (()) => ()
-| (()) as _u => ()
-| (() as _u) => ()
-| ((): unit) => ()
-| ((): unit) as _u => ()
-| (((): unit) as _u) => ()
-}
-
-for () in () to () { () }
-for () as _u in () to () { () }
-for (() in () to ()) { () }
-for (() as _u in () to ()) { () }
-for ((()) in () to ()) { () }
-for ((() as _u) in () to ()) { () }
-for ((()) as _u in () to ()) { () }
-for (((): unit) in () to ()) { () }
-for (((): unit) as _u in () to ()) { () }
-for ((() as _u: unit) in () to ()) { () }
-for (((() : unit) as _u) in () to ()) { () }
-
-let f = () => ()
-let f = (()) => ()
-let f = (() as _u) => ()
-let f = ((), ()) => ()
-let f = (() as _u, () as _u) => ()
-let f = (() : unit) => ()
-let f = (() as _u : unit) => ()
-let f = ((() : unit) as _u) => ()
-let f = ((() : unit)) => ()
-let f = (((() : unit) as _u)) => ()
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/var.res b/jscomp/syntax/tests/parsing/grammar/pattern/var.res
deleted file mode 100644
index edcdd31..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/var.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = 1
-let list = 2
diff --git a/jscomp/syntax/tests/parsing/grammar/pattern/variants.res b/jscomp/syntax/tests/parsing/grammar/pattern/variants.res
deleted file mode 100644
index 24a2ed9..0000000
--- a/jscomp/syntax/tests/parsing/grammar/pattern/variants.res
+++ /dev/null
@@ -1,91 +0,0 @@
-let #Instance = i;
-let #Instance as inst = i;
-
-let #Instance(component) = i
-let #Instance(component) as inst = i
-let #Instance(component,) = i // trailing comma
-
-let #Instance({render, subtree}) = i
-let #Instance({render, subtree}) as x = i
-let #Instance({render, subtree} as inst) = i
-let #Instance({render, subtree}, inst) = i
-let #Instance({render, subtree} : Instance.t) = i
-let #Instance({render, subtree} : Instance.t) as inst = i
-let #Instance(({render, subtree} : Instance.t)) = i
-
-let #Instance(component, tree) = i
-let #Instance(component, tree) as x = i
-let #Instance(component as x, tree as y) = i
-let #Instance(component, tree) as inst = i
-let #Instance(component, tree,) = i // trailing comma
-
-let (#Instance : React.t) = i;
-let ((#Instance : React.t) as t) = i;
-let (#Instance : React.t) as x = i;
-// constraints
-let (#Instance(component : comp) : React.t) = i
-let (#Instance(component : comp,) : React.t) = i
-
-switch x {
-| #Instance => ()
-| #Instance as inst => ()
-| #Instance(comp) => ()
-| #Instance(comp) as inst => ()
-| #Instance({render, subtree}) => ()
-| #Instance({render, subtree}, inst) => ()
-| #Instance({render, subtree} : Instance.t) => ()
-| #Instance(({render, subtree} : Instance.t)) => ()
-| #Instance(comp, tree) => ()
-| (#Instance(comp: Component.t) : React.t) => ()
-}
-
-
-let f = (#Instance) => i;
-let f = (#Instance as i) => i;
-
-let f = (#Instance(component)) => i
-let f = (#Instance(component,)) => i // trailing comma
-
-let f = (#Instance({render, subtree})) => i
-let f = (#Instance({render, subtree}, inst)) => i
-let f = (#Instance({render, subtree} : Instance.t)) => i
-let f = (#Instance(({render, subtree} : Instance.t))) => i
-
-let f = (#Instance(component, tree)) => i
-let f = (#Instance(component, tree,)) => i // trailing comma
-
-let f = ((#Instance : React.t)) => i;
-let f = (#Instance : React.t) => i;
-let f = (#Instance(comp: Component.t) : React.t) => ()
-
-for #Blue in x to y { () }
-for #Blue as c in x to y { () }
-for (#Blue in x to y) { () }
-for (#Blue as c in x to y) { () }
-for ((#Blue: Color.t) in x to y) { () }
-for ((#Blue: Color.t) as c in x to y) { () }
-for (((#Blue: Color.t) as c) in x to y) { () }
-
-for #Rgba(r, g, b) in x to y { () }
-for #Rgba(r, g, b) as c in x to y { () }
-for (Rgba(r : float, g : float, b : float) in x to y) { () }
-for (#Rgba(r : float, g : float, b : float) as c in x to y) { () }
-for ((#Rgba(r, g, b) : Rgb.t) in x to y) { () }
-for ((#Rgba(r, g, b) : Rgb.t) as c in x to y) { () }
-for (((#Rgba(r, g, b) : Rgb.t) as c) in x to y) { () }
-
-for #Point({x, y, z}) in x to y { () }
-for (#Point({x, y, z}) in x to y) { () }
-for (#Point({x, y, z}) as p in x to y) { () }
-
-switch x {
-    | #...typeVar => ()
-    | #lowercase => ()
-    }
-
-switch numericPolyVar {
-| #1 => ()
-| #42 => ()
-| #42444 => ()
-| #3(x, y, z) => Js.log3(x, y, z)
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/exception.res b/jscomp/syntax/tests/parsing/grammar/signature/exception.res
deleted file mode 100644
index 1aeb1d7..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/exception.res
+++ /dev/null
@@ -1,17 +0,0 @@
-module type Signature = {
-  exception Exit
-  exception Exit(int)
-  exception Exit(int, string)
-  // trailing comma
-  exception Exit(int, string,)
-  exception Terminate({time: int, status: int})
-  // trailing comma
-  exception Terminate({time: int, status: int},)
-
-  // attributes
-  @attr
-  exception Exit
-
-  @attr
-  exception Exit(int)
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/exception.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/exception.res.txt
deleted file mode 100644
index 33fceb4..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/exception.res.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-module type Signature  =
-  sig
-    exception Exit 
-    exception Exit of int 
-    exception Exit of int * string 
-    exception Exit of int * string 
-    exception Terminate of {
-      time: int ;
-      status: int } 
-    exception Terminate of {
-      time: int ;
-      status: int } 
-    exception Exit [@attr ]
-    exception Exit of int [@attr ]
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/external.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/external.res.txt
deleted file mode 100644
index 5cba38e..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/external.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-module type Signature  =
-  sig
-    type nonrec t
-    external linkProgram :
-      t -> program:((webGlProgram)[@res.namedArgLoc ]) -> unit =
-        "linkProgram"[@@bs.send ]
-    external add_nat : nat -> int -> int -> int = "add_nat_bytecode"
-    external svg : unit -> React.element = "svg"
-    external svg : unit -> React.element = "svg"
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/include.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/include.res.txt
deleted file mode 100644
index 0ffe798..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/include.res.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-module type Sig  =
-  sig
-    include BtreeType
-    include Ns.BtreeType
-    include ((BtreeType)[@onModType ])[@@onInclude ]
-    include BtreeType
-    include ((BtreeType)[@onModType ])[@@onInclude ]
-    include functor (S : SetLike) -> sig val s : S.t end
-    include SetLike -> sig val s : int end
-    include sig val s : string val y : int end
-    include ((sig val s : string val y : int end)[@onSignature ])[@@onInclude
-                                                                   ]
-    include [%extension ]
-    include [%extension.with.args {js|foo|js}]
-    include (([%extension ])[@onExtension ])[@@onInclude ]
-    include (Foo with type  t =  string)
-    include (((Foo)[@onModType ]) with type  t =  string)[@@onInclude ]
-    include module type of String
-    include ((module type of String)[@onModtype ])[@@onInclude ]
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/itemExtension.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/itemExtension.res.txt
deleted file mode 100644
index db4bcef..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/itemExtension.res.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-module type Ext  =
-  sig
-    [%%item.extension ]
-    [%%item.extension.with.args {js|argument|js}]
-    [%%item.extension.with.args fun x -> f x]
-    [%%item.extension ][@@withAttr ]
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/let.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/let.res.txt
deleted file mode 100644
index fc20399..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/let.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-module type Sig  = sig val x : int val y : string[@@attr ] end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/modDecl.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/modDecl.res.txt
deleted file mode 100644
index 15ba3d5..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/modDecl.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-module type Signature  =
-  sig
-    module Tree : sig val x : int end
-    module Functor : functor () -> sig val x : int end
-    module Functor : Tree -> Map -> sig val x : int end
-    module Functor : Foo -> Bar -> sig val x : int end
-    module Functor : Foo -> Bar -> sig val x : int end[@@attr ]
-    module Tree : sig val x : int end[@@attr ]
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/modtype.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/modtype.res.txt
deleted file mode 100644
index 2b4486a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/modtype.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-module type Signature  =
-  sig
-    module type Belt
-    module type Belt[@@onModTypeDecl ]
-    module type Belt  = sig module type Array module type List end
-    module type Belt  = sig module type Array module type List end[@@onModTypeDecl
-                                                                    ]
-  end
-module type my_module_type  = sig  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/open.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/open.res.txt
deleted file mode 100644
index 22cc1c3..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/open.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-module type Signature  =
-  sig
-    open Belt
-    open! Belt
-    open Belt.Array
-    open! Belt.Array
-    open Belt[@@attr ]
-    open! Belt[@@attr ]
-    open Belt.List[@@attr ]
-    open! Belt.List[@@attr ]
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/recModule.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/recModule.res.txt
deleted file mode 100644
index 9a5e799..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/recModule.res.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-module type Signature  =
-  sig
-    module rec A:
-      sig
-        type nonrec t =
-          | Leaf of string 
-          | Node of ASet.t 
-        val compare : t -> t -> int
-      end
-    and ASet: (Set.S with type  elt =  A.t)
-    and BTree: (Btree.S with type  elt =  A.t)
-    module rec A:
-      sig
-        type nonrec t =
-          | Leaf of string 
-          | Node of ASet.t 
-        val compare : t -> t -> int
-      end[@@onFirstAttr ]
-    and ASet: (Set.S with type  elt =  A.t)[@@onSecondAttr ]
-    module rec A: Btree[@@parsableOnNext ]
-    and ASet: BSet
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/standAloneAttribute.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/standAloneAttribute.res.txt
deleted file mode 100644
index fe0c03b..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/standAloneAttribute.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-module type StandaloneAttribute  =
-  sig
-    [@@@standaloneAttribute ]
-    [@@@standaloneAttribute withPayload]
-    [@@@standaloneAttribute fun x -> x]
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/typLvlModAlias.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/typLvlModAlias.res.txt
deleted file mode 100644
index 2a1bd33..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/typLvlModAlias.res.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-module type Signature  =
-  sig
-    module Tree = Btree
-    module Tree = Ns.Btree
-    module Tree = Btree[@@attr ]
-    module Tree = Ns.Btree[@@attr ]
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/typeDefinition.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/typeDefinition.res.txt
deleted file mode 100644
index e2b852e..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/typeDefinition.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-module type Signature  =
-  sig
-    type nonrec t
-    type nonrec ('a, 'b) t = ('a, 'b) node
-    type nonrec t[@@attr ]
-    type nonrec t = s[@@onFirst ]
-    and s = string[@@onSecond ]
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/expected/typext.res.txt b/jscomp/syntax/tests/parsing/grammar/signature/expected/typext.res.txt
deleted file mode 100644
index 5c59032..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/expected/typext.res.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-type t +=  
-  | Foo 
-type Foo.Bar.t +=  
-  | Foo 
-type ('a,'b) t +=  
-  | Foo of 'a 
-type ('a,'b) Foo.Bar.t +=  
-  | Foo of 'a 
-type t += private  
-  | Foo 
-type t += private  
-  | Foo 
-  | Bar 
-type t += private  
-  | Foo 
-type t += private  
-  | Foo 
-  | Bar 
-type t +=  
-  | Circle of string * int 
-  | Point of {
-  x: int ;
-  y: int } 
-type t +=  
-  | Circle of string * int 
-  | Point of {
-  x: int ;
-  y: int } 
-type t +=  
-  | Foo = Bar
-type t +=  
-  | Foo = Bar
-  | Circle = Circle2
-type t +=  
-  | Foo = Bar
-  | Circle = Geo.Circle2
-type t += private  
-  | Foo = Bar
-type t += private  
-  | Foo = Bar
-  | Circle = Circle2
-type t += private  
-  | Foo = Bar
-  | Circle = Geo.Circle2
-type t +=  
-  | Foo = Bar
-type t +=  
-  | Foo = Bar
-  | Circle = Circle2
-type t +=  
-  | Foo = Bar
-  | Circle = Geo.Circle2
-type t += private  
-  | Foo = Bar
-type t += private  
-  | Foo = Bar
-  | Circle = Circle2
-type t += private  
-  | Foo = Bar
-  | Circle = Geo.Circle2
-type t +=  
-  | Foo = Geo.Metry.Bar
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/external.res b/jscomp/syntax/tests/parsing/grammar/signature/external.res
deleted file mode 100644
index 4b2756e..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/external.res
+++ /dev/null
@@ -1,14 +0,0 @@
-module type Signature = {
-  type t
-
-  @bs.send
-  external linkProgram: (t, ~program: webGlProgram) => unit = "linkProgram"
-
-  external add_nat: (nat, int, int) => int = "add_nat_bytecode"
-
-
-  // with semicolon
-  external svg: () => React.element = "svg";
-  // without semicolon
-  external svg: () => React.element = "svg"
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/include.res b/jscomp/syntax/tests/parsing/grammar/signature/include.res
deleted file mode 100644
index d732240..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/include.res
+++ /dev/null
@@ -1,40 +0,0 @@
-module type Sig = {
-  include BtreeType 
-  include Ns.BtreeType 
-
-  @onInclude
-  include @onModType BtreeType 
-
-  include (BtreeType)
-
-  @onInclude
-  include @onModType (BtreeType)
-
-  include (S: SetLike) => {let s: S.t}
-  include SetLike => {let s: int}
-
-  include {
-    let s: string
-    let y: int
-  }
-
-  @onInclude
-  include @onSignature {
-    let s: string
-    let y: int
-  }
-
-  include %extension
-  include %extension.with.args("foo")
-
-  @onInclude
-  include @onExtension %extension
-
-  include Foo with type t = string
-  @onInclude
-  include @onModType Foo with type t = string
-
-  include module type of String
-  @onInclude
-  include @onModtype module type of String
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/itemExtension.res b/jscomp/syntax/tests/parsing/grammar/signature/itemExtension.res
deleted file mode 100644
index f0436e7..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/itemExtension.res
+++ /dev/null
@@ -1,10 +0,0 @@
-module type Ext = {
-  %%item.extension
-
-  %%item.extension.with.args("argument")
-
-  %%item.extension.with.args(x => f(x))
-
-  @withAttr
-  %%item.extension
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/let.res b/jscomp/syntax/tests/parsing/grammar/signature/let.res
deleted file mode 100644
index 844f4c0..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/let.res
+++ /dev/null
@@ -1,6 +0,0 @@
-module type Sig = {
-  let x: int
-
-  @attr
-  let y: string
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/modDecl.res b/jscomp/syntax/tests/parsing/grammar/signature/modDecl.res
deleted file mode 100644
index 54d7bdf..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/modDecl.res
+++ /dev/null
@@ -1,12 +0,0 @@
-module type Signature = {
-  module Tree: {let x: int}
-
-  module Functor: () => {let x: int}
-  module Functor: Tree => Map => {let x: int}
-  module Functor: (_ : Foo, _ : Bar) => {let x: int}
-  @attr
-  module Functor: (_ : Foo, _ : Bar) => {let x: int}
-
-  @attr
-  module Tree: {let x: int}
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/modtype.res b/jscomp/syntax/tests/parsing/grammar/signature/modtype.res
deleted file mode 100644
index a64842d..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/modtype.res
+++ /dev/null
@@ -1,19 +0,0 @@
-module type Signature = {
-  module type Belt
-
-  @onModTypeDecl
-  module type Belt
-
-  module type Belt = {
-    module type Array
-    module type List
-  }
-
-  @onModTypeDecl
-  module type Belt = {
-    module type Array
-    module type List
-  }
-}
-
-module type my_module_type = {}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/open.res b/jscomp/syntax/tests/parsing/grammar/signature/open.res
deleted file mode 100644
index 848970e..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/open.res
+++ /dev/null
@@ -1,17 +0,0 @@
-module type Signature = {
-  open Belt
-  open! Belt
-
-  open Belt.Array
-  open! Belt.Array
-
-  @attr
-  open Belt
-  @attr
-  open! Belt
-
-  @attr
-  open Belt.List
-  @attr
-  open! Belt.List
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/recModule.res b/jscomp/syntax/tests/parsing/grammar/signature/recModule.res
deleted file mode 100644
index 0b228c2..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/recModule.res
+++ /dev/null
@@ -1,21 +0,0 @@
-module type Signature = {
-  module rec A: {
-    type t = Leaf(string) | Node(ASet.t)
-    let compare: (t, t) => int
-  }
-  // notice the need for the parens on the module_type
-  // otherwise `and` signals the start another with-constraint
-  and ASet: (Set.S with type elt = A.t)
-  and BTree: (Btree.S with type elt = A.t)
-
-  @onFirstAttr
-  module rec A: {
-    type t = Leaf(string) | Node(ASet.t)
-    let compare: (t, t) => int
-  }
-  @onSecondAttr
-  and ASet: Set.S with type elt = A.t
-
-  @parsableOnNext
-  module rec A: Btree and ASet: BSet
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/standAloneAttribute.res b/jscomp/syntax/tests/parsing/grammar/signature/standAloneAttribute.res
deleted file mode 100644
index bf9cced..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/standAloneAttribute.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module type StandaloneAttribute = {
-  @@standaloneAttribute
-
-  @@standaloneAttribute(withPayload)
-
-  @@standaloneAttribute(x => x)
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/typLvlModAlias.res b/jscomp/syntax/tests/parsing/grammar/signature/typLvlModAlias.res
deleted file mode 100644
index fc536fd..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/typLvlModAlias.res
+++ /dev/null
@@ -1,9 +0,0 @@
-module type Signature = {
-  module Tree = Btree
-  module Tree = Ns.Btree
-
-  @attr
-  module Tree = Btree
-  @attr
-  module Tree = Ns.Btree
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/typeDefinition.res b/jscomp/syntax/tests/parsing/grammar/signature/typeDefinition.res
deleted file mode 100644
index 3860fb5..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/typeDefinition.res
+++ /dev/null
@@ -1,13 +0,0 @@
-module type Signature = {
-  type t
-
-  type t<'a, 'b> = node<'a, 'b>
-
-  @attr
-  type t
-
-  @onFirst
-  type t = s 
-  @onSecond
-  and s = string
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/signature/typext.res b/jscomp/syntax/tests/parsing/grammar/signature/typext.res
deleted file mode 100644
index d323327..0000000
--- a/jscomp/syntax/tests/parsing/grammar/signature/typext.res
+++ /dev/null
@@ -1,27 +0,0 @@
-// note: we overparse Pext_rebindg
-type t += Foo
-type Foo.Bar.t += Foo
-type t<'a, 'b> += Foo('a)
-type Foo.Bar.t<'a, 'b> += Foo('a)
-
-type t += private Foo
-type t += private Foo | Bar
-type t += private | Foo
-type t += private | Foo | Bar
-
-type t += Circle(string, int) | Point({x: int, y: int})
-type t += | Circle(string, int) | Point({x: int, y: int})
-
-type t += Foo = Bar
-type t += Foo = Bar | Circle = Circle2
-type t += Foo = Bar | Circle = Geo.Circle2
-type t += private Foo = Bar
-type t += private Foo = Bar | Circle = Circle2
-type t += private Foo = Bar | Circle = Geo.Circle2
-type t += | Foo = Bar
-type t += | Foo = Bar | Circle = Circle2
-type t += | Foo = Bar | Circle = Geo.Circle2
-type t += private | Foo = Bar
-type t += private | Foo = Bar | Circle = Circle2
-type t += private | Foo = Bar | Circle = Geo.Circle2
-type t += Foo = Geo.Metry.Bar
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/exceptionDefinition.res b/jscomp/syntax/tests/parsing/grammar/structure/exceptionDefinition.res
deleted file mode 100644
index 09f42d4..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/exceptionDefinition.res
+++ /dev/null
@@ -1,35 +0,0 @@
-exception ExitEarly
-exception ExitEarly(int)
-exception ExitEarly({x: int})
-exception ExitEarly({"jsExit": int})
-exception ExitEarly({@attr "jsExit": int})
-exception ExitEarly({@attr "jsExit": int,})
-exception ExitEarly({@attr "jsExit": int, @attr "code": int,})
-exception ExitEarly({"jsExit": int},)
-exception ExitEarly({"jsExit": int}, {"code": int})
-exception ExitEarly({"jsExit": int}, int, {"code": int},)
-exception ExitEarly(
-  {@attr "jsExit": int, @attr "code": int,},
-  {@attr "jsExit": int, @attr "code": int,},
-)
-exception ExitJsStyle({..})
-exception ExitJsStyle({.. "code": int})
-exception ExitJsStyle({.. "code": int,})
-exception ExitJsStyle({.. @attr "code": int})
-exception ExitJsStyle({.. @attr "code": int,})
-exception ExitJsStyle({.. "code": int, "time": int,})
-exception ExitJsStyle({.. @attr "code": int, @attr "time": int,})
-
-@onConstructor
-exception ExitEarly
-@onConstructor
-exception ExitEarly(int)
-
-exception Exit = Terminate 
-exception Exit = Lib.Terminate 
-exception Exit = Ns.Lib.Terminate 
-
-@onConstructor
-exception Exit = Terminate 
-@onConstructor
-exception Exit = Lib.Terminate 
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/exceptionDefinition.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/exceptionDefinition.res.txt
deleted file mode 100644
index 10000d0..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/exceptionDefinition.res.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-exception ExitEarly 
-exception ExitEarly of int 
-exception ExitEarly of {
-  x: int } 
-exception ExitEarly of < jsExit: int   >  
-exception ExitEarly of < jsExit: int [@attr ]  >  
-exception ExitEarly of < jsExit: int [@attr ]  >  
-exception ExitEarly of < jsExit: int [@attr ] ;code: int [@attr ]  >  
-exception ExitEarly of < jsExit: int   >  
-exception ExitEarly of < jsExit: int   >  * < code: int   >  
-exception ExitEarly of < jsExit: int   >  * int * < code: int   >  
-exception ExitEarly of < jsExit: int [@attr ] ;code: int [@attr ]  >  *
-  < jsExit: int [@attr ] ;code: int [@attr ]  >  
-exception ExitJsStyle of < .. >  
-exception ExitJsStyle of < code: int   ;.. >  
-exception ExitJsStyle of < code: int   ;.. >  
-exception ExitJsStyle of < code: int [@attr ]  ;.. >  
-exception ExitJsStyle of < code: int [@attr ]  ;.. >  
-exception ExitJsStyle of < code: int  ;time: int   ;.. >  
-exception ExitJsStyle of < code: int [@attr ] ;time: int [@attr ]  ;.. >  
-exception ExitEarly [@onConstructor ]
-exception ExitEarly of int [@onConstructor ]
-exception Exit = Terminate
-exception Exit = Lib.Terminate
-exception Exit = Ns.Lib.Terminate
-exception Exit[@onConstructor ] = Terminate
-exception Exit[@onConstructor ] = Lib.Terminate
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/externalDefinition.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/externalDefinition.res.txt
deleted file mode 100644
index 7c11030..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/externalDefinition.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-external clear : t -> int -> unit = "clear"
-external add_nat : nat -> int = "add_nat_bytecode"
-external attachShader :
-  t ->
-    program:((webGlProgram)[@res.namedArgLoc ]) ->
-      shader:((webGlShader)[@res.namedArgLoc ]) -> unit = "attachShader"
-[@@bs.send ]
-external svg : unit -> React.element = "svg"
-external svg : unit -> React.element = "svg"
-external createDate : unit -> unit -> date = "Date"[@@bs.new ]
-let foobar = (createDate ()) ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/includeStatement.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/includeStatement.res.txt
deleted file mode 100644
index a219eef..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/includeStatement.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-include Belt.Array
-include Belt.Array[@@onInclude ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/itemExtension.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/itemExtension.res.txt
deleted file mode 100644
index ae308fb..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/itemExtension.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[%%itemExtension ]
-[%%item.extension ]
-[%%item.extension.with.args {js|argument|js}]
-[%%item.extension.with.args fun x -> f x]
-[%%itemExtension ][@@attrOnExtension ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/letBinding.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/letBinding.res.txt
deleted file mode 100644
index 9e3dca6..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/letBinding.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-let a = 1
-let a = 1[@@onFirstBinding ]
-let a = 1[@@onFirstBinding ]
-and b = 2[@@onSecondBinding ]
-let f : type t. t foo =
-  fun sideEffect ->
-    ((let module M = struct exception E of t  end in
-        sideEffect (); (fun x -> M.E x))
-    [@res.braces ])
-let f : type t x u. (t * x * y) list = fun l -> f l
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/modExprExtension.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/modExprExtension.res.txt
deleted file mode 100644
index 88d3404..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/modExprExtension.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-module A = [%modExprExtension ]
-module B = [%mod.expr.extension ]
-module C = [%mod.expr.extension.with.args {js|argument|js}]
-module D = [%mod.expr.extension.with.args fun x -> f x]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/modType.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/modType.res.txt
deleted file mode 100644
index 145b595..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/modType.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module type X  = Foo
-module type X  = Foo[@@attr ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/module.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/module.res.txt
deleted file mode 100644
index 3bd1db4..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/module.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-module A : Map = struct let m = 2 end 
-module A = struct let m = 2 end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/moduleTypeExtension.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/moduleTypeExtension.res.txt
deleted file mode 100644
index 7b0932f..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/moduleTypeExtension.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-module type A  = [%modTypeExtension ]
-module type B  = [%mod.type.extension ]
-module type C  = [%mod.type.extension.with.args {js|argument|js}]
-module type D  = [%mod.type.extension.with.args fun x -> f x]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/openDescription.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/openDescription.res.txt
deleted file mode 100644
index e700124..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/openDescription.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-open Belt
-open! Belt
-open Belt[@@onOpen ]
-open Belt.Array
-open! Belt.Array
-open! Belt.Array[@@onOpen ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/recursiveModules.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/recursiveModules.res.txt
deleted file mode 100644
index d9313ca..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/recursiveModules.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-module rec A:Map = struct let m = 2 end  and B:Set = struct let s = 1 end
-module rec A:Map = struct let m = 2 end[@@onFirstBinding ]
- and B:Set = struct let s = 1 end[@@onSecondBinding ]
-module rec A:Map = struct let m = 2 end[@@onFirstBindingOfNext ]
- and B:Set = struct let s = 1 end[@@onSecondBindingOfNext ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/standaloneAttribute.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/standaloneAttribute.res.txt
deleted file mode 100644
index 53adcb3..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/standaloneAttribute.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[@@@standaloneAttribute ]
-[@@@standaloneAttribute {js|with payload|js}]
-[@@@standaloneAttribute fun x -> x + 1]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/expected/typeDefinition.res.txt b/jscomp/syntax/tests/parsing/grammar/structure/expected/typeDefinition.res.txt
deleted file mode 100644
index 534ccab..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/expected/typeDefinition.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-type nonrec t = string
-type nonrec t = string[@@onStructureItem ]
-module X =
-  struct type nonrec t = string
-         type nonrec t = string[@@onStructureItem ] end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/externalDefinition.res b/jscomp/syntax/tests/parsing/grammar/structure/externalDefinition.res
deleted file mode 100644
index 3e9718c..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/externalDefinition.res
+++ /dev/null
@@ -1,18 +0,0 @@
-external clear : (t, int) => unit = "clear"
-
-// multiple primitives
-external add_nat: nat => int = "add_nat_bytecode"
-
-@bs.send
-external attachShader: (t, ~program: webGlProgram, ~shader: webGlShader) => unit = "attachShader"
-
-// with semicolon
-external svg: () => React.element = "svg";
-// without semicolon
-external svg: () => React.element = "svg"
-
-// should not infinite loop
-@bs.new
-external createDate: (unit, unit) => date = "Date"
-
-let foobar = createDate()()
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/includeStatement.res b/jscomp/syntax/tests/parsing/grammar/structure/includeStatement.res
deleted file mode 100644
index 75bb42e..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/includeStatement.res
+++ /dev/null
@@ -1,3 +0,0 @@
-include Belt.Array
-
-@onInclude include Belt.Array
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/itemExtension.res b/jscomp/syntax/tests/parsing/grammar/structure/itemExtension.res
deleted file mode 100644
index c6e5a98..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/itemExtension.res
+++ /dev/null
@@ -1,10 +0,0 @@
-%%itemExtension
-
-%%item.extension
-
-%%item.extension.with.args("argument")
-
-%%item.extension.with.args(x => f(x))
-
-@attrOnExtension
-%%itemExtension
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/letBinding.res b/jscomp/syntax/tests/parsing/grammar/structure/letBinding.res
deleted file mode 100644
index e75bdea..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/letBinding.res
+++ /dev/null
@@ -1,18 +0,0 @@
-let a = 1
-
-@onFirstBinding
-let a = 1
-
-@onFirstBinding
-let a = 1
-@onSecondBinding
-and b = 2
-
-// locally abstract types
-let f: type t. foo<t> = (sideEffect) => {
-  module M = { exception E(t) }
-  sideEffect()
-  x => M.E(x)
-}
-
-let f: type t x u. list<(t, x, y)> = (l) => f(l)
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/modExprExtension.res b/jscomp/syntax/tests/parsing/grammar/structure/modExprExtension.res
deleted file mode 100644
index dc1779b..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/modExprExtension.res
+++ /dev/null
@@ -1,9 +0,0 @@
-module A = %modExprExtension
-
-module B = %mod.expr.extension
-
-module C = %mod.expr.extension.with.args("argument")
-
-module D = %mod.expr.extension.with.args(x => f(x))
-
-
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/modType.res b/jscomp/syntax/tests/parsing/grammar/structure/modType.res
deleted file mode 100644
index 2691503..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/modType.res
+++ /dev/null
@@ -1,4 +0,0 @@
-module type X = Foo
-
-@attr
-module type X = Foo
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/module.res b/jscomp/syntax/tests/parsing/grammar/structure/module.res
deleted file mode 100644
index ac630c6..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/module.res
+++ /dev/null
@@ -1,2 +0,0 @@
-module A: Map = {let m = 2}
-module A = {let m = 2}
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/moduleTypeExtension.res b/jscomp/syntax/tests/parsing/grammar/structure/moduleTypeExtension.res
deleted file mode 100644
index 4a94030..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/moduleTypeExtension.res
+++ /dev/null
@@ -1,9 +0,0 @@
-module type A = %modTypeExtension
-
-module type B = %mod.type.extension
-
-module  type C = %mod.type.extension.with.args("argument")
-
-module type D = %mod.type.extension.with.args(x => f(x))
-
-
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/openDescription.res b/jscomp/syntax/tests/parsing/grammar/structure/openDescription.res
deleted file mode 100644
index ba186a0..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/openDescription.res
+++ /dev/null
@@ -1,7 +0,0 @@
-open Belt 
-open! Belt
-@onOpen open Belt
-
-open Belt.Array
-open! Belt.Array
-@onOpen open! Belt.Array
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/recursiveModules.res b/jscomp/syntax/tests/parsing/grammar/structure/recursiveModules.res
deleted file mode 100644
index 1a40ed0..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/recursiveModules.res
+++ /dev/null
@@ -1,12 +0,0 @@
-module rec A: Map = { let m = 2}
-and B: Set =  {let s = 1}
-
-@onFirstBinding
-module rec A: Map = { let m = 2}
-@onSecondBinding
-and B: Set =  {let s = 1}
-
-@onFirstBindingOfNext
-module rec A: Map = { let m = 2}
-@onSecondBindingOfNext
-and B: Set =  {let s = 1}
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/standaloneAttribute.res b/jscomp/syntax/tests/parsing/grammar/structure/standaloneAttribute.res
deleted file mode 100644
index a635284..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/standaloneAttribute.res
+++ /dev/null
@@ -1,6 +0,0 @@
-@@standaloneAttribute
-
-@@standaloneAttribute("with payload")
-
-@@standaloneAttribute(x => x + 1)
-
diff --git a/jscomp/syntax/tests/parsing/grammar/structure/typeDefinition.res b/jscomp/syntax/tests/parsing/grammar/structure/typeDefinition.res
deleted file mode 100644
index 5c5af2e..0000000
--- a/jscomp/syntax/tests/parsing/grammar/structure/typeDefinition.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type t = string
-
-@onStructureItem
-type t = string
-
-module X = {
-  type t = string
-
-  @onStructureItem
-  type t = string
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/bsObject.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/bsObject.res
deleted file mode 100644
index af57a9a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/bsObject.res
+++ /dev/null
@@ -1,2 +0,0 @@
-type foo<'a> = {.. "foo": int} as 'a
-type foo<'a> = {"foo": int} as 'a
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/constructorDeclaration.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/constructorDeclaration.res
deleted file mode 100644
index f736b50..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/constructorDeclaration.res
+++ /dev/null
@@ -1,93 +0,0 @@
-type t = Rgb
-type t =
-  | Rgb
-
-type t =
-  | White(grayscale)
-  | Black(grayscale,) // trailing comma
-  | Rgb(int, int, int) 
-  | Rgba(int, int, int, int,) // trailing comma
-
-type t =
-  | Rgb({r: int, g: int, b: int})
-  // trailing comma
-  | Rgba({r: int, g: int, b: int, a: int,},)
-  | JsColor({"gradient": int})
-  | JsColor({"gradient": int,})
-  | JsColor({"gradient": int},)
-  | JsColor({@attr "gradient": int,},)
-  | JsColor({"gradient": int}, color)
-  | JsColor({"gradient": int}, color,)
-  | JsColor({"gradient": int}, {"hex": string}, int)
-  | JsColor({@attr "gradient": int}, {@attr "hex": string}, int)
-  | JsT({..}) // Note: this compiles to bucklescript
-  | JsT({.. "gradient": int}) // Note: this compiles to bucklescript
-  | JsT({.. "gradient": int,}) // Note: this compiles to bucklescript
-  | JsT({.. @attr "gradient": int,}) // Note: this compiles to bucklescript
-  | JsT({.. "gradient": int, "hex": string}, {.. "gradient": int, "hex": string}) // Note: this compiles to bucklescript
-  | JsT(
-      {.. @attr "gradient": int, @attr "hex": string,},
-      {.. @attr "gradient": int, @attr "hex": string,},
-    ) // Note: this compiles to bucklescript
-
-// gadt
-type t = Rgb : t
-type t =
-  | Rgb : t
-
-type t =
-  | White(grayscale) : t
-  | Black(grayscale,) : t// trailing comma
-  | Rgb(int, int, int) : t
-  | Rgba(int, int, int, int,) : t // trailing comma
-
-type t =
-  | Rgb({r: int, g: int, b: int}) : t
-  // trailing comma
-  | Rgba({r: int, g: int, b: int, a: int,},) : t
-  | JsColor({"gradient": int}) : t
-  | JsColor({"gradient": int,}) : t
-  | JsColor({"gradient": int},) : t
-  | JsColor({"gradient": int,},) : t
-  | JsColor({@attr "gradient": int,},) : t
-  | JsColor({"gradient": int}, color) : t
-  | JsColor({"gradient": int}, color,) : t
-  | JsColor({"gradient": int}, {"hex": string}, int) : t
-  | JsT({..}) : t // Note: this compiles to bucklescript
-  | JsT({.. "gradient": int}) : t // Note: this compiles to bucklescript
-  | JsT({.. @attr "gradient": int}) : t // Note: this compiles to bucklescript
-  | JsT({.. "gradient": int,}) : t // Note: this compiles to bucklescript
-  | JsT({.. @attr "gradient": int,}) : t // Note: this compiles to bucklescript
-  | JsT({.. "gradient": int,},) : t // Note: this compiles to bucklescript
-  | JsT(
-      {.. "gradient": int, "hex": string},
-      {.. "gradient": int, "hex": string}
-    ) : t // Note: this compiles to bucklescript
-  | JsT(
-      {.. @attr "gradient": int, @attr "hex": string,},
-      {.. @attr "gradient": int, @attr "hex": string,},
-    ) : t // Note: this compiles to bucklescript
-
-// attributes
-// type t = @attr EmptyColor
-type t = 
-  | @attr EmptyColor
-  | @onConstr White(grayscale) : @onGadt t
-
-type node <_, 'value> =
-  | Root({
-      mutable value: 'value,
-      mutable updatedTime: float,
-    }): node<root, 'value>
-  | Derived({
-      mutable cachedValue: 'value,
-      parent: node<_, 'value>,
-      root: node<root, 'value>,
-      updateF: 'value => 'value,
-      mutable updatedTime: float,
-    }): node<derived, 'value>
-
-type delta = Compute({"blocked_ids": unit} => unit)
-type queryDelta =
-  | Compute({"blocked_ids": unit} => unit)
-  | Compute({"blocked_ids": unit} => unit, {"allowed_ids": unit} => unit)
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/diamond.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/diamond.res
deleted file mode 100644
index 90f7071..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/diamond.res
+++ /dev/null
@@ -1,2 +0,0 @@
-// >= shouldn't be picked up as infix op
-type t<'a, 'b>= ..
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/bsObject.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/bsObject.res.txt
deleted file mode 100644
index 65f9590..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/bsObject.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-type nonrec 'a foo = < foo: int   ;.. >  as 'a
-type nonrec 'a foo = < foo: int   >  as 'a
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/constructorDeclaration.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/constructorDeclaration.res.txt
deleted file mode 100644
index 4e9f673..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/constructorDeclaration.res.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-type nonrec t =
-  | Rgb 
-type nonrec t =
-  | Rgb 
-type nonrec t =
-  | White of grayscale 
-  | Black of grayscale 
-  | Rgb of int * int * int 
-  | Rgba of int * int * int * int 
-type nonrec t =
-  | Rgb of {
-  r: int ;
-  g: int ;
-  b: int } 
-  | Rgba of {
-  r: int ;
-  g: int ;
-  b: int ;
-  a: int } 
-  | JsColor of < gradient: int   >  
-  | JsColor of < gradient: int   >  
-  | JsColor of < gradient: int   >  
-  | JsColor of < gradient: int [@attr ]  >  
-  | JsColor of < gradient: int   >  * color 
-  | JsColor of < gradient: int   >  * color 
-  | JsColor of < gradient: int   >  * < hex: string   >  * int 
-  | JsColor of < gradient: int [@attr ]  >  * < hex: string [@attr ]  >  *
-  int 
-  | JsT of < .. >  
-  | JsT of < gradient: int   ;.. >  
-  | JsT of < gradient: int   ;.. >  
-  | JsT of < gradient: int [@attr ]  ;.. >  
-  | JsT of < gradient: int  ;hex: string   ;.. >  *
-  < gradient: int  ;hex: string   ;.. >  
-  | JsT of < gradient: int [@attr ] ;hex: string [@attr ]  ;.. >  *
-  < gradient: int [@attr ] ;hex: string [@attr ]  ;.. >  
-type nonrec t =
-  | Rgb: t 
-type nonrec t =
-  | Rgb: t 
-type nonrec t =
-  | White: grayscale -> t 
-  | Black: grayscale -> t 
-  | Rgb: int * int * int -> t 
-  | Rgba: int * int * int * int -> t 
-type nonrec t =
-  | Rgb: {
-  r: int ;
-  g: int ;
-  b: int } -> t 
-  | Rgba: {
-  r: int ;
-  g: int ;
-  b: int ;
-  a: int } -> t 
-  | JsColor: < gradient: int   >  -> t 
-  | JsColor: < gradient: int   >  -> t 
-  | JsColor: < gradient: int   >  -> t 
-  | JsColor: < gradient: int   >  -> t 
-  | JsColor: < gradient: int [@attr ]  >  -> t 
-  | JsColor: < gradient: int   >  * color -> t 
-  | JsColor: < gradient: int   >  * color -> t 
-  | JsColor: < gradient: int   >  * < hex: string   >  * int -> t 
-  | JsT: < .. >  -> t 
-  | JsT: < gradient: int   ;.. >  -> t 
-  | JsT: < gradient: int [@attr ]  ;.. >  -> t 
-  | JsT: < gradient: int   ;.. >  -> t 
-  | JsT: < gradient: int [@attr ]  ;.. >  -> t 
-  | JsT: < gradient: int   ;.. >  -> t 
-  | JsT: < gradient: int  ;hex: string   ;.. >  *
-  < gradient: int  ;hex: string   ;.. >  -> t 
-  | JsT: < gradient: int [@attr ] ;hex: string [@attr ]  ;.. >  *
-  < gradient: int [@attr ] ;hex: string [@attr ]  ;.. >  -> t 
-type nonrec t =
-  | EmptyColor [@attr ]
-  | White: grayscale -> ((t)[@onGadt ]) [@onConstr ]
-type nonrec (_, 'value) node =
-  | Root: {
-  mutable value: 'value ;
-  mutable updatedTime: float } -> (root, 'value) node 
-  | Derived:
-  {
-  mutable cachedValue: 'value ;
-  parent: (_, 'value) node ;
-  root: (root, 'value) node ;
-  updateF: 'value -> 'value ;
-  mutable updatedTime: float } -> (derived, 'value) node 
-type nonrec delta =
-  | Compute of (< blocked_ids: unit   >  -> unit) 
-type nonrec queryDelta =
-  | Compute of (< blocked_ids: unit   >  -> unit) 
-  | Compute of (< blocked_ids: unit   >  -> unit) *
-  (< allowed_ids: unit   >  -> unit) 
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/diamond.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/diamond.res.txt
deleted file mode 100644
index 4f499b5..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/diamond.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-type nonrec ('a, 'b) t = ..
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/polyvariant.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/polyvariant.res.txt
deleted file mode 100644
index 5a20ac2..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/polyvariant.res.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-type t = [ `X ]
-type t = [>]
-type t = [> s]
-type t = [< s]
-type t = [ s]
-type t = [> s]
-type t = [< s]
-type t = [ `a ]
-type t = [> `a ]
-type t = [< `a ]
-type t = [ `a ]
-type t = [> `a ]
-type t = [< `a ]
-type t = [ s | t]
-type t = [> `a ]
-type t = [> `a ]
-type t = [< `A of int ]
-type t = [< `A of int ]
-type t = [< `A of int ]
-type t = [< `A of int ]
-type t = [< `A of int ]
-type t = [< `A of int&int  | `B ]
-type t = [< `A of int&int  | `B ]
-type t = [ `a  | `b  | `c ]
-type t =
-  [ `aaaaa  | `bbbbb  | `ccccc  | `ddddd  | `eeeee  | `fffff  | `ggggg 
-  | `hhhhh  | `jjjjj  | `kkkkk ]
-type t =
-  | Aaaaaa 
-  | Bbbbbb 
-  | Cccccc 
-  | Dddddd 
-  | Eeeeee 
-  | Ffffff 
-  | Gggggg 
-  | Hhhhhh 
-  | Jjjjjj 
-  | Kkkkkk 
-type t = [ `a of int ]
-type t =
-  [< `A of int  | `B of (int * int)  | `C of float  | `D of int&string 
-  | `E of (int * int)&(string * string * string)&float  | `F of string ]
-type z = [< `A of string&int  | `B ]
-type nonrec z = [< `A  | `B > `X]
-type nonrec z = [< `A  | `B > `X `Y]
-type 'a vlist = [ `Nil  | `Cons of ('a * 'a vlist) ]
-type nonrec t = [ `x of int [@a ][@b ][@c ]]
-type nonrec t = [ `x of int [@a ][@b ][@c ] | ((foo)[@d ][@e ])]
-type nonrec t = [> ((x)[@a ])]
-type nonrec t = [> ((x)[@a ])]
-type nonrec t = [> `x [@a ]]
-type nonrec t = [> `x [@a ]]
-type nonrec t = [< `x [@a ]]
-type nonrec t = [< `x [@a ]]
-type nonrec t =
-  [< `a of ((int * int) * int) [@one ] | ((int)[@two ])
-  | `b of string [@three ]> `w `x `y]
-let f (x : [ `b ]) = x
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/privateTypeEquation.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/privateTypeEquation.res.txt
deleted file mode 100644
index 388fc21..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/privateTypeEquation.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-type nonrec t = private 'a
-type nonrec t = private string
-type nonrec t = private _
-type nonrec t = private int
-type nonrec t = private int -> int
-type nonrec t = private int -> int
-type nonrec t = private int -> int -> int
-type nonrec t = private
-  int -> x:((string)[@res.namedArgLoc ]) -> float -> unit
-type nonrec t = private string as 'x
-type nonrec t = private [%ext ]
-type nonrec t = private [%ext {js|console.log|js}]
-type nonrec t = private React.element
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/recordDeclaration.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/recordDeclaration.res.txt
deleted file mode 100644
index 79a42a0..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/recordDeclaration.res.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-type nonrec t = {
-  x: int }
-type nonrec t = {
-  mutable x: int }
-type nonrec t = {
-  x: int }
-type nonrec t = {
-  mutable x: int }
-type nonrec t = {
-  x: int ;
-  y: int }
-type nonrec t = {
-  mutable x: int ;
-  mutable y: int }
-type nonrec t = {
-  x: int ;
-  y: int }
-type nonrec t = {
-  mutable x: int ;
-  mutable y: int }
-type nonrec t = {
-  x: 'a 'b . polyType }
-type nonrec t = {
-  x: int [@attr ];
-  y: int [@attr2 ]}
-type nonrec t =
-  {
-  x: ((int)[@onInt ]) [@rowAttr ];
-  y: ((int)[@onInt ]) [@rowAttr2 ]}
-type nonrec t = {
-  form: form }
-type nonrec t = {
-  mutable form: form }
-type nonrec t = {
-  form: form ;
-  answers: answers }
-type nonrec t = {
-  mutable form: form ;
-  mutable answers: answers }
-type nonrec t = < age: int   > 
-type nonrec t = < .. > 
-type nonrec t = < age: int   > 
-type nonrec t = < age: int   ;.. > 
-type nonrec t = < age: int  ;name: string   ;.. > 
-type nonrec t = < age: int [@attr ]  ;.. > 
-type nonrec t = < age: int [@attr ]  ;.. > 
-type nonrec t = < age: int [@attr ] ;name: string [@attr ]  ;.. > 
-type nonrec t = < age: int [@attr ]  > 
-type nonrec t = < age: int [@attr ]  > 
-type nonrec t = < age: int [@attr ] ;name: string   > 
-type nonrec t = < age: int [@attr ] ;name: string [@attr2 ]  > 
-type nonrec domProps =
-  {
-  label: string [@bs.optional ];
-  list: string [@bs.optional ];
-  loop: bool [@bs.optional ]}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeConstraint.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeConstraint.res.txt
deleted file mode 100644
index 050fac3..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeConstraint.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-type nonrec t = x constraint 'x = int
-type nonrec t = x constraint 'x = string constraint 'y = unit
-type nonrec t = x constraint 'a = ((typExpr)[@attr ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeDefinition.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeDefinition.res.txt
deleted file mode 100644
index fc945f2..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeDefinition.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-type nonrec t = string
-type nonrec t = string
-and s = int
-type nonrec t = string
-and s = int
-and u = float
-type t = t node
-type t = string
-and s = int
-type t = string
-and s = int
-and u = float
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeInformation.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeInformation.res.txt
deleted file mode 100644
index c684368..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeInformation.res.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-type nonrec t
-type nonrec t = Module.t
-type nonrec t = Module.t constraint 'a = int
-type nonrec t = Module.t constraint 'a = int constraint 'b = string
-type nonrec t = {
-  a: int }
-type nonrec t = {
-  a: int } constraint 'a = int
-type nonrec t = {
-  a: int } constraint 'a = int constraint 'b = string
-type nonrec t = Module.t = {
-  a: int }
-type nonrec t = Module.t = {
-  a: int } constraint 'a = int
-type nonrec t = Module.t =
-  {
-  a: int } constraint 'a = int constraint 'b = string
-type nonrec t = node
-type nonrec t = node constraint 'a = int
-type nonrec t = node constraint 'a = int constraint 'b = string
-type nonrec t = node = {
-  a: int }
-type nonrec t = node = {
-  a: int } constraint 'a = int
-type nonrec t = node = {
-  a: int } constraint 'a = int constraint 'b = string
-type nonrec t =
-  | Red 
-type nonrec t =
-  | Red  constraint 'a = string
-type nonrec t =
-  | Red  constraint 'a = string constraint 'b = int
-type nonrec t =
-  | Red 
-  | Blue 
-type nonrec t =
-  | Red 
-  | Blue  constraint 'a = string constraint 'b = int
-type nonrec t =
-  | Red 
-type nonrec t =
-  | Red  constraint 'a = string
-type nonrec t =
-  | Red  constraint 'a = string constraint 'b = int
-type nonrec t =
-  | Red 
-  | Blue 
-type nonrec t =
-  | Red 
-  | Blue  constraint 'a = string constraint 'b = int
-type nonrec t = ..
-type nonrec t =
-  | Red 
-type nonrec t =
-  | Red  constraint 'a = string
-type nonrec t =
-  | Red  constraint 'a = string constraint 'b = int
-type nonrec t =
-  | Red 
-  | Blue 
-type nonrec t =
-  | Red 
-  | Blue  constraint 'a = string constraint 'b = int
-type nonrec t = private
-  | Green 
-type nonrec t = private
-  | Green  constraint 'a = unit
-type nonrec t = private
-  | Green  constraint 'a = unit constraint 'b = unit
-type nonrec t = {
-  x: int ;
-  y: int }
-type nonrec callback = (ReactEvent.Mouse.t -> unit) as 'callback
-type nonrec callback = ReactEvent.Mouse.t -> unit as 'u
-type nonrec callback = (ReactEvent.Mouse.t -> unit) as 'callback
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeNonrec.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeNonrec.res.txt
deleted file mode 100644
index 47c1f15..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeNonrec.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-type nonrec t =
-  | Water 
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeRepresentation.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeRepresentation.res.txt
deleted file mode 100644
index e17ed2e..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeRepresentation.res.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-type nonrec t = ..
-type nonrec t = private ..
-type nonrec t =
-  | Blue 
-type nonrec t =
-  | Blue 
-type nonrec t =
-  | Blue 
-  | Red 
-type nonrec t =
-  | Blue 
-  | Red 
-type nonrec t =
-  | Blue 
-  | Red 
-  | Green 
-type nonrec t =
-  | Blue 
-  | Red 
-  | Green 
-type nonrec t = private
-  | Blue 
-type nonrec t = private
-  | Blue 
-type nonrec t = private
-  | Blue 
-  | Red 
-type nonrec t = private
-  | Blue 
-  | Red 
-type nonrec t = private
-  | Blue 
-  | Red 
-  | Green 
-type nonrec t = private
-  | Blue 
-  | Red 
-  | Green 
-type nonrec t = {
-  x: int ;
-  y: int }
-type nonrec t = private {
-  x: int ;
-  y: int }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typedef.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typedef.res.txt
deleted file mode 100644
index 738df53..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typedef.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-type nonrec t
-type nonrec t
-and s
-type nonrec 'a t
-type nonrec 'a t
-and 'a s
-type nonrec ('a, 'b) t
-and ('a, 'b) s
-type nonrec 'a t = 'a node
-and 'b s = 'b edge
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeparams.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeparams.res.txt
deleted file mode 100644
index 47bd612..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typeparams.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-type nonrec 'a t
-type nonrec ('a, 'b) t
-type nonrec ('a, 'b, 'c) t
-type nonrec (+'a, -'b, +_, -_) t
-type nonrec _ t
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typext.res.txt b/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typext.res.txt
deleted file mode 100644
index 2e5393d..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/expected/typext.res.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-type t +=  
-  | Foo 
-type Foo.Bar.t +=  
-  | Foo 
-type ('a,'b) t +=  
-  | Foo of 'a 
-type ('a,'b) Foo.Bar.t +=  
-  | Foo of 'a 
-type t += private  
-  | Foo 
-type t += private  
-  | Foo 
-  | Bar 
-type t += private  
-  | Foo 
-type t += private  
-  | Foo 
-  | Bar 
-type t +=  
-  | Circle of string * int 
-  | Point of {
-  x: int ;
-  y: int } 
-type t +=  
-  | Circle of string * int 
-  | Point of {
-  x: int ;
-  y: int } 
-type t +=  
-  | Foo = Bar
-type t +=  
-  | Foo = Bar
-  | Circle = Circle2
-type t +=  
-  | Foo = Bar
-  | Circle = Geo.Circle2
-type t += private  
-  | Foo = Bar
-type t += private  
-  | Foo = Bar
-  | Circle = Circle2
-type t += private  
-  | Foo = Bar
-  | Circle = Geo.Circle2
-type t +=  
-  | Foo = Bar
-type t +=  
-  | Foo = Bar
-  | Circle = Circle2
-type t +=  
-  | Foo = Bar
-  | Circle = Geo.Circle2
-type t += private  
-  | Foo = Bar
-type t += private  
-  | Foo = Bar
-  | Circle = Circle2
-type t += private  
-  | Foo = Bar
-  | Circle = Geo.Circle2
-type t +=  
-  | Foo = Geo.Metry.Bar
-type t +=  
-  | Foo [@attr1 ][@@attr ]
-type t +=  
-  | Foo [@attr1 ][@@attr ]
-type t +=  
-  | Foo [@attr1 ]
-  | Bar [@attr2 ][@@attr ]
-type t +=  
-  | Foo [@attr1 ]
-  | Bar [@attr2 ][@@attr ]
-type t += private  
-  | Foo [@attr1 ][@@attr ]
-type t += private  
-  | Foo [@attr1 ][@@attr ]
-type t += private  
-  | Foo [@attr1 ]
-  | Bar [@attr2 ][@@attr ]
-type t += private  
-  | Foo [@attr1 ]
-  | Bar [@attr2 ][@@attr ]
-type t +=  
-  | Foo[@attr1 ] = Bar[@@attr ]
-type t +=  
-  | Foo[@attr1 ] = Bar[@@attr ]
-type t +=  
-  | Foo[@attr1 ] = Foo2
-  | Bar[@attr2 ] = Bar2[@@attr ]
-type t +=  
-  | Foo[@attr1 ] = Foo2
-  | Bar[@attr2 ] = Bar2[@@attr ]
-type t += private  
-  | Foo[@attr1 ] = Foo2[@@attr ]
-type t += private  
-  | Foo[@attr1 ] = Foo2[@@attr ]
-type t += private  
-  | Foo[@attr1 ] = Foo2
-  | Bar[@attr2 ] = Bar2[@@attr ]
-type t += private  
-  | Foo[@attr1 ] = Foo2
-  | Bar[@attr2 ] = Bar2[@@attr ]
-module Tid =
-  struct type nonrec _ t = ..
-         type nonrec _ s = ..
-         type nonrec _ u = .. end
-module type Tid  =
-  sig
-    type nonrec t
-    type _ Tid.t +=  
-      | Tid: t Tid.t 
-    type _ Tid.s +=  
-      | Tid: t Tid.s 
-    type _ Tid.u +=  
-      | Uid: t Tid.u 
-      | Uid2: t Tid.u 
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/polyvariant.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/polyvariant.res
deleted file mode 100644
index eb8fcb3..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/polyvariant.res
+++ /dev/null
@@ -1,71 +0,0 @@
-type rec t = [ | #X ]
-type rec t = [>  ]
-type rec t = [> s ]
-type rec t = [< s ]
-type rec t = [ | s ]
-type rec t = [> | s ]
-type rec t = [< | s ]
-type rec t = [ | #a ]
-type rec t = [> | #a ]
-type rec t = [< | #a ]
-type rec t = [ | #a ]
-type rec t = [> | #a ]
-type rec t = [< | #a ]
-type rec t = [ | s | t ]
-type rec t = [> | #a ]
-type rec t = [> | #a ]
-type rec t = [< | #A(int) ]
-type rec t = [< #A(int) ]
-type rec t = [< | #A & (int) ]
-type rec t = [< #A & (int) ]
-type rec t = [< | #A & (int) ]
-type rec t = [< | #A(int) & (int) | #B ]
-type rec t = [< | #A & (int) & (int) | #B ]
-
-type rec t = [ | #a | #b | #c ]
-type rec t = [
-| #aaaaa
-| #bbbbb
-| #ccccc
-| #ddddd
-| #eeeee
-| #fffff
-| #ggggg
-| #hhhhh
-| #jjjjj
-| #kkkkk
-]
-type rec t = Aaaaaa | Bbbbbb | Cccccc | Dddddd | Eeeeee | Ffffff | Gggggg | Hhhhhh | Jjjjjj | Kkkkkk
-
-type rec t = [ | #a(int) ]
-type rec t = [<
-| #A(int)
-| #B(int, int)
-| #C(float)
-| #D(int) & (string)
-| #E(int, int) & (string, string, string) & (float)
-| #F & (string)
-]
-
-type rec z = [< | #A(string) & (int) | #B ]
-
-type z = [< | #A | #B > #X ]
-
-type z = [< | #A | #B > #X #Y ]
-
-type rec vlist<'a> = [ | #Nil | #Cons('a, vlist<'a>) ]
-
-type t = [ @a @b @c #x(int) ]
-type t = [ | @a @b @c #x(int) | @d @e foo ]
-type t = [> | @a x]
-type t = [> @a x]
-type t = [> | @a #x]
-type t = [> @a #x]
-type t = [< | @a #x]
-type t = [< @a #x]
-
-type t = [<  @one #a((int, int),int) | @two int | @three #b(string) > #w #x #y  ]
-
-// type z = @q [ @a @b @c #z]
-
-let f = (x: [ | #b]) => x
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/privateTypeEquation.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/privateTypeEquation.res
deleted file mode 100644
index 2e219a2..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/privateTypeEquation.res
+++ /dev/null
@@ -1,13 +0,0 @@
-type t = private 'a
-type t = private string
-type t = private _
-type t = private (int)
-type t = private (int) => int
-type t = private int => int
-type t = private int => int => int
-type t = private (int, ~x:string, float) => unit
-type t = private string as 'x
-type t = private %ext
-type t = private %ext("console.log")
-type t = private React.element
-
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/recordDeclaration.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/recordDeclaration.res
deleted file mode 100644
index c0c1c6c..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/recordDeclaration.res
+++ /dev/null
@@ -1,48 +0,0 @@
-type t = {x: int}
-type t = {mutable x: int}
-// trailing comma
-type t = {x: int,}
-type t = {mutable x: int,}
-
-type t = {x: int, y: int}
-type t = {mutable x: int, mutable y: int}
-// trailing comma
-type t = {x: int, y: int,}
-type t = {mutable x: int, mutable y: int}
-
-// poly-typexpr
-type t = {x: 'a 'b. polyType}
-
-// attributes
-type t = {@attr x: int, @attr2 y: int}
-type t = {@rowAttr x: @onInt int, @rowAttr2 y: @onInt int}
-
-// field-declaration punning
-type t = {form}
-type t = {mutable form}
-type t = {form, answers}
-type t = {mutable form, mutable answers}
-
-// parses bs object type correct
-type t = {"age": int}
-type t = {..}
-type t = {"age": int,}
-type t = {.. "age": int}
-type t = {.. "age": int, "name": string}
-type t = {.. @attr "age": int}
-type t = {.. @attr "age": int,}
-type t = {.. @attr "age": int, @attr "name": string}
-type t = {@attr "age": int}
-type t = {@attr "age": int,}
-type t = {@attr "age": int, "name": string}
-type t = {@attr "age": int, @attr2 "name": string}
-
-// list is accepted as record key
-type domProps = {
-  @bs.optional
-  label: string,
-  @bs.optional
-  list: string,
-  @bs.optional
-  loop: bool,
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeConstraint.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/typeConstraint.res
deleted file mode 100644
index ef34921..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeConstraint.res
+++ /dev/null
@@ -1,4 +0,0 @@
-type t = x constraint 'x = int
-type t = x constraint 'x = string constraint 'y = unit
-
-type t = x constraint 'a = @attr typExpr
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeDefinition.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/typeDefinition.res
deleted file mode 100644
index 3ac75d9..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeDefinition.res
+++ /dev/null
@@ -1,8 +0,0 @@
-type t = string
-type t = string and s = int
-type t = string and s = int and u = float
-
-type rec t = node<t>
-type rec t = string and s = int
-type rec t = string and s = int and u = float
-
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeInformation.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/typeInformation.res
deleted file mode 100644
index dbdb8aa..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeInformation.res
+++ /dev/null
@@ -1,52 +0,0 @@
-// [type-equation]  [type-representation]  { type-constraint } 
-
-// no type-equation, no type-representation
-type t
-
-type t = Module.t
-type t = Module.t constraint 'a = int
-type t = Module.t constraint 'a = int constraint 'b = string
-type t = {a: int}
-type t = {a: int} constraint 'a = int
-type t = {a: int} constraint 'a = int constraint 'b = string
-type t = Module.t = {a: int}
-type t = Module.t = {a: int} constraint 'a = int
-type t = Module.t = {a: int} constraint 'a = int constraint 'b = string
-
-type t = node 
-type t = node constraint 'a = int
-type t = node constraint 'a = int constraint 'b = string
-type t = node = {a: int}
-type t = node = {a: int} constraint 'a = int
-type t = node = {a: int} constraint 'a = int constraint 'b = string
-
-// constructor declaration
-type t = Red
-type t = Red constraint 'a = string
-type t = Red constraint 'a = string constraint 'b = int
-type t = Red | Blue
-type t = Red | Blue constraint 'a = string constraint 'b = int
-
-type t = Red
-type t = Red constraint 'a = string
-type t = Red constraint 'a = string constraint 'b = int
-type t = Red | Blue
-type t = Red | Blue constraint 'a = string constraint 'b = int
-
-type t = ..
-
-type t = | Red
-type t = | Red constraint 'a = string
-type t = | Red constraint 'a = string constraint 'b = int
-type t = | Red | Blue
-type t = | Red | Blue constraint 'a = string constraint 'b = int
-
-type t = private Green 
-type t = private Green  constraint 'a = unit
-type t = private Green  constraint 'a = unit constraint 'b = unit
-
-type t = {x: int, y: int}
-
-type callback = ReactEvent.Mouse.t => unit as 'callback
-type callback = ReactEvent.Mouse.t => (unit as 'u)
-type callback = (ReactEvent.Mouse.t => unit) as 'callback
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeNonrec.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/typeNonrec.res
deleted file mode 100644
index d401a5a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeNonrec.res
+++ /dev/null
@@ -1,2 +0,0 @@
-// just support nonrec for fault tolerance
-type nonrec t = Water
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeRepresentation.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/typeRepresentation.res
deleted file mode 100644
index ef5e784..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeRepresentation.res
+++ /dev/null
@@ -1,28 +0,0 @@
-// extensible variants
-type t = ..
-type t = private ..
-
-// constructor declaration
-type t = Blue
-type t = | Blue
-type t = | Blue | Red
-type t = Blue | Red
-type t = | Blue | Red | Green
-type t = Blue | Red | Green
-
-// private constructor declaration
-type t = private Blue
-type t = private | Blue
-type t = private | Blue | Red
-type t = private Blue | Red
-type t = private | Blue | Red | Green
-type t = private Blue | Red | Green
-
-// empty variant, not implemented
-// type t = |
-// type t = private |
-
-// record declaration
-type t = {x: int, y: int}
-// private record declaration
-type t = private {x: int, y: int}
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/typedef.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/typedef.res
deleted file mode 100644
index e4a9b56..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/typedef.res
+++ /dev/null
@@ -1,8 +0,0 @@
-type t 
-type t and s
-
-type t<'a>
-type t<'a> and s<'a>
-type t<'a, 'b> and s<'a, 'b>
-
-type t<'a> = node<'a> and s<'b> = edge<'b>
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeparams.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/typeparams.res
deleted file mode 100644
index baa4ea7..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/typeparams.res
+++ /dev/null
@@ -1,7 +0,0 @@
-type t<'a>
-type t<'a, 'b>
-type t<'a, 'b, 'c,> // trailing comma
-
-type t<+'a, -'b, +_, -_,>
-
-type t<_>
diff --git a/jscomp/syntax/tests/parsing/grammar/typedefinition/typext.res b/jscomp/syntax/tests/parsing/grammar/typedefinition/typext.res
deleted file mode 100644
index e832ef5..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typedefinition/typext.res
+++ /dev/null
@@ -1,80 +0,0 @@
-type t += Foo
-type Foo.Bar.t += Foo
-type t<'a, 'b> += Foo('a)
-type Foo.Bar.t<'a, 'b> += Foo('a)
-
-type t += private Foo
-type t += private Foo | Bar
-type t += private | Foo
-type t += private | Foo | Bar
-
-type t += Circle(string, int) | Point({x: int, y: int})
-type t += | Circle(string, int) | Point({x: int, y: int})
-
-type t += Foo = Bar
-type t += Foo = Bar | Circle = Circle2
-type t += Foo = Bar | Circle = Geo.Circle2
-type t += private Foo = Bar
-type t += private Foo = Bar | Circle = Circle2
-type t += private Foo = Bar | Circle = Geo.Circle2
-type t += | Foo = Bar
-type t += | Foo = Bar | Circle = Circle2
-type t += | Foo = Bar | Circle = Geo.Circle2
-type t += private | Foo = Bar
-type t += private | Foo = Bar | Circle = Circle2
-type t += private | Foo = Bar | Circle = Geo.Circle2
-type t += Foo = Geo.Metry.Bar
-
-@attr
-type t += @attr1 Foo
-@attr
-type t += | @attr1 Foo
-@attr
-type t += @attr1 Foo | @attr2 Bar
-@attr
-type t += | @attr1 Foo | @attr2 Bar
-
-@attr
-type t += private @attr1 Foo
-@attr
-type t += private | @attr1 Foo
-@attr
-type t += private @attr1 Foo | @attr2 Bar
-@attr
-type t += private | @attr1 Foo | @attr2 Bar
-
-@attr
-type t += @attr1 Foo = Bar
-@attr
-type t += | @attr1 Foo = Bar
-@attr
-type t += @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-@attr
-type t += | @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-
-@attr
-type t += private @attr1 Foo = Foo2
-@attr
-type t += private | @attr1 Foo = Foo2
-@attr
-type t += private @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-@attr
-type t += private | @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-
-module Tid = {
-  type t<_> = ..
-  type s<_> = ..
-  type u<_> = ..
-}
-
-module type Tid = {
-  type t
-  type Tid.t<_> += Tid: Tid.t<t>
-
-  type Tid.s<_> +=
-    | Tid: Tid.s<t>
-
-  type Tid.u<_> +=
-    | Uid: Tid.u<t>
-    | Uid2: Tid.u<t>
-}
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/alias.res b/jscomp/syntax/tests/parsing/grammar/typexpr/alias.res
deleted file mode 100644
index 1e62337..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/alias.res
+++ /dev/null
@@ -1,31 +0,0 @@
-type t = string as 's
-type t = _ as 'underscore
-type t = (parenthesizedType) as 'parens
-type t = int => unit as 'arrow
-type t = int => (unit as 'unitAlias)
-type t = (int, float) => unit as 'arrowAlias
-type t = (int, float) => (unit as 'unitAlias)
-type t = int as 'myNumber
-type t = Mod.Sub.t as 'longidentAlias
-type t = color<int as 'r, int as 'g, int as 'b> as 'rgb
-type t = Color.t<int as 'r, int as 'g, int as 'b> as 'rgb
-type t = %t as 'extension
-type t = %t.typ as 'extension
-type t = %ext.foo("raw") as 'extension
-type tup = (int as 'x, int as 'y) as 'tupleAlias
-
-let t: string as 's = ()
-let t: _ as 'underscore = ()
-let t: (parenthesizedType) as 'parens = ()
-let t: int => unit as 'arrow = ()
-let t: int => (unit as 'unitAlias) = ()
-let t: (int, float) => unit as 'arrowAlias = ()
-let t: (int, float) => (unit as 'unitAlias) = ()
-let t: int as 'myNumber = ()
-let t: Mod.Sub.t as 'longidentAlias = ()
-let t: color<int as 'r, int as 'g, int as 'b> as 'rgb = ()
-let t: Color.t<int as 'r, int as 'g, int as 'b> as 'rgb = ()
-let t: %t as 'extension = ()
-let t: %t.typ as 'extension = ()
-let t: %ext.foo("raw") as 'extension = ()
-let t: (int as 'x, int as 'y) as 'tupleAlias = ()
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/any.res b/jscomp/syntax/tests/parsing/grammar/typexpr/any.res
deleted file mode 100644
index 62a3e62..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/any.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type t = _
-
-let t: _ = x
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/bsObject.res b/jscomp/syntax/tests/parsing/grammar/typexpr/bsObject.res
deleted file mode 100644
index b5581b5..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/bsObject.res
+++ /dev/null
@@ -1,15 +0,0 @@
-type t = {"age": int}
-type t = {"age": int,} // trailing comma
-type t = {"age": int, "name": string}
-type t = {"age": int, "name": string,} // trailing comma
-
-type t = {
-  @attr
-  "age": int,
-  @attr2
-  "name": @onTypeString string,
-}
-
-type t = {.}
-type t = private {.}
-type t = {..}
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/es6Arrow.res b/jscomp/syntax/tests/parsing/grammar/typexpr/es6Arrow.res
deleted file mode 100644
index 82cc495..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/es6Arrow.res
+++ /dev/null
@@ -1,60 +0,0 @@
-type t = x => unit
-type t = (x) => unit
-type t = (int, string) => unit
-
-type t = (~a: int, ~b: int) => int
-type t = (~a: int=?, ~b: int=?) => int
-
-type t = int => int => int => int
-
-type t = (~a: int) => (~b: int) => (~c: int) => int
-
-let f: x => unit = xf
-let f: (x) => unit = xf
-let f: (int, string) => unit = xf
-let t: (~a: int, ~b: int) => int = xf
-let t: (~a: int=?, ~b: int=?) => int = xf
-let t: int => int => int => int = xf
-let t: (~a: int) => (~b: int) => (~c: int) => int = xf
-
-// single type parameter sugar
-type t = ~f:int => string
-type t = ~f:int=? => string
-// single type parameter sugar
-let f: ~f:int => string = fx
-let f: ~f:int=? => string = fx
-
-// different cases
-type t = (~f: int) => string
-type t = ~f: int => string
-type t = (~f: int => string) => float
-type t = ~f: (int => string) => float
-type t = ~f: int => string => float
-
-// if the @attr sits before the labelled arg, it's part of the arrow
-// otherwise it's part of the type_expr itself, like on the last float
-type t = (@attrBeforeLblA ~a: int, @attrBeforeLblB ~b: int, @attr float) => unit
-// above is equivalent too
-type t = @attrBeforeLblA ((~a: int) =>  (@attrBeforeLblB ((~b: int) => (@attr float => unit))) )
-
-type t = @attr ~a: int => unit
-
-type getInitialPropsFn<'a> = {
-  "query": Js.Dict.t<string>,
-  "req": Js.Nullable.t<Js.t<'a>>,
-} => Js.Promise.t<Js.t<'a>>
-
-// type canvas = {
-  // draw: (on: rectangle, stroke: pencil) => unit
-// }
-
-// type stepFn = (value: float, isDone: bool) => unit
-// type stepFn = (. value: float, isDone: bool) => unit
-// type stepFn = (@attr value: float, @attr isDone: bool) => unit
-
-// type f = (constr, constr2) => unit
-// type f = (constr<int, int, int>, constr2<int, int, int>) => unit
-// type f = (@attr constr<int, int, int>, @attr constr2<int, int, int>) => unit
-
-// type f = (constr as 't, constr2 as 's) => unit
-// type f = (constr as 't) => unit
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/alias.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/alias.res.txt
deleted file mode 100644
index 7cfd694..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/alias.res.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-type nonrec t = string as 's
-type nonrec t = _ as 'underscore
-type nonrec t = parenthesizedType as 'parens
-type nonrec t = (int -> unit) as 'arrow
-type nonrec t = int -> unit as 'unitAlias
-type nonrec t = (int -> float -> unit) as 'arrowAlias
-type nonrec t = int -> float -> unit as 'unitAlias
-type nonrec t = int as 'myNumber
-type nonrec t = Mod.Sub.t as 'longidentAlias
-type nonrec t = (int as 'r, int as 'g, int as 'b) color as 'rgb
-type nonrec t = (int as 'r, int as 'g, int as 'b) Color.t as 'rgb
-type nonrec t = [%t ] as 'extension
-type nonrec t = [%t.typ ] as 'extension
-type nonrec t = [%ext.foo {js|raw|js}] as 'extension
-type nonrec tup = ((int as 'x) * (int as 'y)) as 'tupleAlias
-let (t : string as 's) = ()
-let (t : _ as 'underscore) = ()
-let (t : parenthesizedType as 'parens) = ()
-let (t : (int -> unit) as 'arrow) = ()
-let (t : int -> unit as 'unitAlias) = ()
-let (t : (int -> float -> unit) as 'arrowAlias) = ()
-let (t : int -> float -> unit as 'unitAlias) = ()
-let (t : int as 'myNumber) = ()
-let (t : Mod.Sub.t as 'longidentAlias) = ()
-let (t : (int as 'r, int as 'g, int as 'b) color as 'rgb) = ()
-let (t : (int as 'r, int as 'g, int as 'b) Color.t as 'rgb) = ()
-let (t : [%t ] as 'extension) = ()
-let (t : [%t.typ ] as 'extension) = ()
-let (t : [%ext.foo {js|raw|js}] as 'extension) = ()
-let (t : ((int as 'x) * (int as 'y)) as 'tupleAlias) = ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/any.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/any.res.txt
deleted file mode 100644
index d384813..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/any.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-type nonrec t = _
-let (t : _) = x
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/bsObject.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/bsObject.res.txt
deleted file mode 100644
index 0b4feb2..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/bsObject.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-type nonrec t = < age: int   > 
-type nonrec t = < age: int   > 
-type nonrec t = < age: int  ;name: string   > 
-type nonrec t = < age: int  ;name: string   > 
-type nonrec t =
-  < age: int [@attr ] ;name: ((string)[@onTypeString ]) [@attr2 ]  > 
-type nonrec t = <  > 
-type nonrec t = private <  > 
-type nonrec t = < .. > 
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/es6Arrow.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/es6Arrow.res.txt
deleted file mode 100644
index f3f3b4b..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/es6Arrow.res.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-type nonrec t = x -> unit
-type nonrec t = x -> unit
-type nonrec t = int -> string -> unit
-type nonrec t =
-  a:((int)[@res.namedArgLoc ]) -> b:((int)[@res.namedArgLoc ]) -> int
-type nonrec t =
-  ?a:((int)[@res.namedArgLoc ]) -> ?b:((int)[@res.namedArgLoc ]) -> int
-type nonrec t = int -> int -> int -> int
-type nonrec t =
-  a:((int)[@res.namedArgLoc ]) ->
-    b:((int)[@res.namedArgLoc ]) -> c:((int)[@res.namedArgLoc ]) -> int
-let (f : x -> unit) = xf
-let (f : x -> unit) = xf
-let (f : int -> string -> unit) = xf
-let (t : a:((int)[@res.namedArgLoc ]) -> b:((int)[@res.namedArgLoc ]) -> int)
-  = xf
-let (t :
-  ?a:((int)[@res.namedArgLoc ]) -> ?b:((int)[@res.namedArgLoc ]) -> int) = xf
-let (t : int -> int -> int -> int) = xf
-let (t :
-  a:((int)[@res.namedArgLoc ]) ->
-    b:((int)[@res.namedArgLoc ]) -> c:((int)[@res.namedArgLoc ]) -> int)
-  = xf
-type nonrec t = f:((int)[@res.namedArgLoc ]) -> string
-type nonrec t = ?f:((int)[@res.namedArgLoc ]) -> string
-let (f : f:((int)[@res.namedArgLoc ]) -> string) = fx
-let (f : ?f:((int)[@res.namedArgLoc ]) -> string) = fx
-type nonrec t = f:((int)[@res.namedArgLoc ]) -> string
-type nonrec t = f:((int)[@res.namedArgLoc ]) -> string
-type nonrec t = f:((int -> string)[@res.namedArgLoc ]) -> float
-type nonrec t = f:((int -> string)[@res.namedArgLoc ]) -> float
-type nonrec t = f:((int)[@res.namedArgLoc ]) -> string -> float
-type nonrec t =
-  ((a:((int)[@res.namedArgLoc ]) ->
-      ((b:((int)[@res.namedArgLoc ]) -> ((float)[@attr ]) -> unit)[@attrBeforeLblB
-                                                                    ]))
-  [@attrBeforeLblA ])
-type nonrec t =
-  ((a:((int)[@res.namedArgLoc ]) ->
-      ((b:((int)[@res.namedArgLoc ]) -> ((float)[@attr ]) -> unit)[@attrBeforeLblB
-                                                                    ]))
-  [@attrBeforeLblA ])
-type nonrec t = ((a:((int)[@res.namedArgLoc ]) -> unit)[@attr ])
-type nonrec 'a getInitialPropsFn =
-  < query: string Js.Dict.t  ;req: 'a Js.t Js.Nullable.t   >  ->
-    'a Js.t Js.Promise.t
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/extension.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/extension.res.txt
deleted file mode 100644
index 2b99235..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/extension.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-type nonrec t = [%typ ]
-type nonrec t = [%raw.typ ]
-type nonrec t = [%raw.typ {js|existential|js}]
-let (t : [%typ ]) = x
-let (t : [%raw.typ ]) = x
-let (t : [%raw.typ {js|ex|js}]) = x
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/firstClassModules.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/firstClassModules.res.txt
deleted file mode 100644
index 0c21329..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/firstClassModules.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-type nonrec t = (module Hashmap)
-type nonrec t = (module Hashmap with type key = string)
-type nonrec t = (module Hashmap with type key = string and type value = int)
-type nonrec toValueLikeInstance =
-  'a t -> (module RxValueLikeInstance.S with type a = 'a)
-type nonrec 'a t = (module Test with type a = 'a)
-type nonrec t = (module Console) ref
-let (devices : (string, (module DEVICE)) Hastbl.t) = Hashtbl.creat 17
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/objectTypeSpreading.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/objectTypeSpreading.res.txt
deleted file mode 100644
index 32c553f..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/objectTypeSpreading.res.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-type nonrec a = < x: int   > 
-type nonrec u = < a ;u: int   > 
-type nonrec v = < v: int  ;a  > 
-type nonrec w = < j: int  ;a ;k: int  ;v  > 
-type nonrec t = < a ;u: int   >  as 'a
-type nonrec t = < a ;u: int   >  -> unit
-type nonrec t = (< a ;u: int   >  as 'a) -> unit
-type nonrec t = < a ;u: int   >  -> < a ;v: int   >  -> unit
-type nonrec user = < name: string   > 
-let (steve : < user ;age: int   > ) =
-  [%obj { name = {js|Steve|js}; age = 30 }]
-let steve =
-  ([%obj { name = {js|Steve|js}; age = 30 }] : < user ;age: int   > )
-let steve =
-  ((([%obj { name = {js|Steve|js}; age = 30 }] : < user ;age: int   > ))
-  [@res.braces ])
-let printFullUser (steve : < user ;age: int   > ) = Js.log steve
-let printFullUser ~user:(((user : < user ;age: int   > ))[@res.namedArgLoc ])
-   = Js.log steve
-let printFullUser ~user:(((user : < user ;age: int   > ))[@res.namedArgLoc ])
-   = Js.log steve
-let printFullUser ?user:(((user)[@res.namedArgLoc ])=
-  (steve : < user ;age: int   > ))  = Js.log steve
-external steve : < user ;age: int   >  = "steve"[@@val ]
-let makeCeoOf30yearsOld name =
-  ([%obj { name; age = 30 }] : < user ;age: int   > )
-type nonrec optionalUser = < user ;age: int   >  option
-type nonrec optionalTupleUser =
-  (< user ;age: int   >  * < user ;age: int   > ) option
-type nonrec constrUser =
-  (< user ;age: int   > , < user ;age: int   > ) myTypeConstructor
-type nonrec taggedUser =
-  | User of < user ;age: int   >  
-  | Ceo of < user ;age: int  ;direction: bool   >  *
-  < salary ;taxFraud: bool   >  
-type nonrec polyTaggedUser = [ `User of < user ;age: int   >  ]
-type nonrec polyTaggedUser2 =
-  [ `User of < user ;age: int   >  
-  | `Ceo of
-      (< user ;age: int  ;direction: bool   >  *
-        < salary ;taxFraud: bool   > )
-      ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/parenthesized.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/parenthesized.res.txt
deleted file mode 100644
index 4fc6efd..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/parenthesized.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-type nonrec t = ((a:((int)[@res.namedArgLoc ]) -> unit)[@attr ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/poly.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/poly.res.txt
deleted file mode 100644
index efa667d..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/poly.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-external getLogger :
-  unit ->
-    <
-      log: 'a -> unit  ;log2: 'a . int -> int  ;log3: 'a 'b . 'a -> 'b -> int
-                                                    >  =
-    "./src/logger.mock.js"
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/polyVariant.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/polyVariant.res.txt
deleted file mode 100644
index 8d27125..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/polyVariant.res.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-type nonrec animation = [ `ease-in  | `ease-out  | `never ease ✍️ ]
-module type Conjunctive  =
-  sig
-    type nonrec u1 = [ `A  | `B ]
-    type nonrec u2 = [ `A  | `B  | `C ]
-    val f : [< `T of [< u2]&[< u2]&[< u1] ] -> unit
-    val g : [< `S of [< u2]&[< u2]&[< u1] ] -> unit
-    val g :
-      [< `Exotic-S+ of [< `Exotic-u2+ ]&[< `Exotic-u2- ]&[< `Exotic-u1+++ ] ]
-        -> unit
-  end
-type nonrec t = [ s]
-type nonrec t = [ ListStyleType.t]
-type nonrec number = [ `1  | `42  | `4244 ]
-type nonrec complexNumbericPolyVar = [ `1 of string  | `2 of (int * string) ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/tuple.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/tuple.res.txt
deleted file mode 100644
index f26cc41..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/tuple.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-type nonrec t = (string * int)
-type nonrec t = (int option * string option)
-let (t : (string * int)) = x
-let (t : (int option * string option)) = x
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/typeconstr.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/typeconstr.res.txt
deleted file mode 100644
index 96ade72..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/typeconstr.res.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-type nonrec t = string
-type nonrec t = Parser.t
-type nonrec t = Lang.Parser.t
-type nonrec t = string option
-type nonrec t = string option
-type nonrec t = string Option.t
-type nonrec t = string Option.t
-type nonrec t = (a, b, c) Mod.Sub.t
-type nonrec t = (a, b, c) Mod.Sub.t
-type nonrec t = list
-type nonrec t = string list
-type nonrec t = < age: int   >  list
-type nonrec t = (< age: int   > , < name: string   > ) list
-type nonrec t = < .. > 
-type nonrec t = < .. >  list
-type nonrec t = < age: int   ;.. > 
-type nonrec t = < age: int   ;.. >  list
-type nonrec t = < age: int [@attr ]  ;.. > 
-type nonrec t = < age: int [@attr ]  ;.. >  list
-type nonrec t = < age: int [@attr ] ;name: string [@attr ]  ;.. > 
-type nonrec t = < age: int [@attr ] ;name: string [@attr ]  ;.. >  list
-type nonrec t = < age: int   ;.. > 
-type nonrec t = < age: int   ;.. >  list
-type nonrec t = < age: int  ;name: string   ;.. > 
-type nonrec t = < age: int  ;name: string   ;.. >  list
-let (t : string) = x
-let (t : Parser.t) = x
-let (t : Lang.Parser.t) = x
-let (t : string option) = x
-let (t : string option) = x
-let (t : string Option.t) = x
-let (t : string Option.t) = x
-let (t : (a, b, c) Mod.Sub.t) = x
-let (t : (a, b, c) Mod.Sub.t) = x
-let (t : list) = x
-let (t : string list) = x
-let (t : < age: int   >  list) = x
-let (t : < age: int   >  list) = x
-let (t : < age: int [@attr ]  >  list) = x
-let (t : < age: int [@attr ]  >  list) = x
-let (t : < age: int [@attr ] ;name: string [@attr ]  >  list) = x
-let (t : (< age: int   > , < name: string   > ) list) = x
-let (t : (< age: int [@attr ]  > , < name: string [@attr ]  > ) list) = x
-let (t :
-  (< age: int [@attr ] ;name: string [@attr ]  > ,
-    < name: string [@attr ] ;age: int [@attr ]  > ) list)
-  = x
-let (t : < .. >  list) = x
-let (t : <  >  list) = x
-let (t : < age: int   ;.. >  list) = x
-let (t : < age: int   >  list) = x
-let (t : < age: int   ;.. >  list) = x
-let (t : < age: int [@attr ]  ;.. >  list) = x
-let (t : < age: int [@attr ]  >  list) = x
-let (t : < age: int [@attr ]  ;.. >  list) = x
-let (t : < age: int  ;name: string   ;.. >  list) = x
-let (t : < age: int [@attr ] ;name: string [@attr ]  ;.. >  list) = x
-let (t : string list) = x
-type nonrec ('T, 'E) id_6 =
-  | Ok of 'T 
-  | Err of {
-  payload: 'E } 
-let foo (x : int as 'X) = x
-module type A  = (Foo with type  t =  'X constraint 'X = int)
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/uncurried.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/uncurried.res.txt
deleted file mode 100644
index 5097ce6..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/uncurried.res.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-type nonrec t =
-  {
-  mutable field: (float -> int -> bool -> unit, [ `Has_arity3 ]) function$ }
-type nonrec t = (float -> int -> bool -> unit, [ `Has_arity3 ]) function$
-type nonrec t =
-  (((float)[@attr ]) ->
-     ((int)[@attr2 ]) ->
-       (((bool)[@attr3 ]) -> ((string)[@attr4 ]) -> unit, [ `Has_arity2 ])
-         function$,
-    [ `Has_arity2 ]) function$
-type nonrec t =
-  (((float ->
-       ((int)[@attr2 ]) ->
-         (((bool -> ((string)[@attr4 ]) -> unit, [ `Has_arity1 ]) function$)
-         [@attr3 ]),
-      [ `Has_arity1 ]) function$)[@attr ])
-type nonrec t =
-  (((float)[@attr ]) ->
-     ((int)[@attr2 ]) ->
-       (((bool)[@attr3 ]) -> ((string)[@attr4 ]) -> unit, [ `Has_arity2 ])
-         function$,
-    [ `Has_arity2 ]) function$
-external setTimeout :
-  (unit -> unit, [ `Has_arity1 ]) function$ -> int -> timerId = "setTimeout"
-[@@bs.val ]
-external setTimeout :
-  ((unit -> unit) -> int -> timerId, [ `Has_arity2 ]) function$ =
-    "setTimeout"
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/unit.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/unit.res.txt
deleted file mode 100644
index f7db235..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/unit.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-type nonrec t = unit
-type nonrec t = unit -> unit
-type nonrec t = unit -> unit -> unit
-type nonrec t = unit -> unit
-let f (f : unit -> unit) = f ()
-let f (f : unit -> unit) = f ()
-let f (f : unit -> unit -> unit) = f () ()
-external svg : unit -> React.element = "svg"
-external thing : unit -> unit = "svg"
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/var.res.txt b/jscomp/syntax/tests/parsing/grammar/typexpr/expected/var.res.txt
deleted file mode 100644
index 8b9d585..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/expected/var.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-type nonrec t = 'a
-let (t : 'a) = x
-let t : 'a . t = x
-let t : 'a 'b . t = x
-let t : 'a 'b 'c . t = x
-type nonrec 'A x = 'A
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/extension.res b/jscomp/syntax/tests/parsing/grammar/typexpr/extension.res
deleted file mode 100644
index 54b9817..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/extension.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type t = %typ
-
-type t = %raw.typ
-
-type t = %raw.typ("existential")
-
-let t: %typ = x
-let t: %raw.typ = x
-let t: %raw.typ("ex") = x
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/firstClassModules.res b/jscomp/syntax/tests/parsing/grammar/typexpr/firstClassModules.res
deleted file mode 100644
index b434690..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/firstClassModules.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type t = module(Hashmap)
-type t = module(Hashmap with type key = string)
-type t = module(Hashmap with type key = string and type value = int)
-
-type toValueLikeInstance = t<'a> => module(RxValueLikeInstance.S with type a = 'a)
-type t<'a> = module(Test with type a = 'a)
-type t = ref<module(Console)>
-
-let devices: Hastbl.t<string, module(DEVICE)> = Hashtbl.creat(17)
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/objectTypeSpreading.res b/jscomp/syntax/tests/parsing/grammar/typexpr/objectTypeSpreading.res
deleted file mode 100644
index 216d400..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/objectTypeSpreading.res
+++ /dev/null
@@ -1,40 +0,0 @@
-type a = {"x": int}
-type u = {...a, "u": int}
-type v = {"v": int, ...a}
-type w = {"j": int, ...a, "k": int, ...v}
-
-
-type t = {...a, "u": int} as 'a 
-type t = {...a, "u": int} => unit
-type t = {...a, "u": int} as 'a => unit
-type t = ({...a, "u": int}, {...a, "v": int}) => unit
-
-type user = {"name": string} 
-
-let steve: {...user, "age": int} = {"name": "Steve", "age": 30}
-let steve = ({"name": "Steve", "age": 30}: {...user, "age": int})
-let steve = {({"name": "Steve", "age": 30}: {...user, "age": int})}
-
-let printFullUser = (steve: {...user, "age": int}) => Js.log(steve)
-let printFullUser = (~user: {...user, "age": int}) => Js.log(steve)
-let printFullUser = (~user: {...user, "age": int}) => Js.log(steve)
-let printFullUser = (~user = steve : {...user, "age": int}) => Js.log(steve)
-
-@val
-external steve: {...user, "age": int} = "steve"
-
-let makeCeoOf30yearsOld = (name) : {...user, "age": int} => {"name": name, "age": 30}
-
-type optionalUser = option<{...user, "age": int}>
-type optionalTupleUser = option<({...user, "age": int}, {...user, "age": int})>
-type constrUser = myTypeConstructor<{...user, "age": int}, {...user, "age": int}>
-
-type taggedUser =
-  | User({...user, "age": int})
-  | Ceo({...user, "age": int, "direction": bool}, {...salary, "taxFraud": bool}) 
-
-type polyTaggedUser = [ #User({...user, "age": int}) ]
-type polyTaggedUser2 = [ 
-  | #User({...user, "age": int}) 
-  | #Ceo({...user, "age": int, "direction": bool}, {...salary, "taxFraud": bool}) 
-]
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/parenthesized.res b/jscomp/syntax/tests/parsing/grammar/typexpr/parenthesized.res
deleted file mode 100644
index 31eb347..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/parenthesized.res
+++ /dev/null
@@ -1 +0,0 @@
-type t = @attr ((~a: int) => unit)
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/poly.res b/jscomp/syntax/tests/parsing/grammar/typexpr/poly.res
deleted file mode 100644
index 537e4f4..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/poly.res
+++ /dev/null
@@ -1,7 +0,0 @@
-external getLogger:
-  unit => {
-		"log": 'a => unit,
-		"log2": 'a. int => int,
-		"log3": 'a 'b. ('a, 'b) => int
-	} =
-"./src/logger.mock.js"
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/polyVariant.res b/jscomp/syntax/tests/parsing/grammar/typexpr/polyVariant.res
deleted file mode 100644
index f2fb12a..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/polyVariant.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type animation = [
-  | #"ease-in"
-  | #"ease-out"
-  | #"never ease ✍️"
-]
-
-module type Conjunctive = {
-  type u1 = [ | #A | #B]
-  type u2 = [ | #A | #B | #C]
-
-  let f: [< | #T([< u2]) & ([< u2]) & ([< u1])] => unit
-  let g: [< | #S&([< u2]) & ([< u2]) & ([< u1])] => unit
-  let g: [< | #"Exotic-S+"&([< #"Exotic-u2+"]) & ([< #"Exotic-u2-"]) & ([< #"Exotic-u1+++"])] => unit
-};
-
-type t = [s]
-type t = [ListStyleType.t];
-
-type number = [
-  | #1
-  | #42
-  | #4244
-]
-
-type complexNumbericPolyVar = [
-  | #1(string)
-  | #2(int, string)
-]
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/tuple.res b/jscomp/syntax/tests/parsing/grammar/typexpr/tuple.res
deleted file mode 100644
index 0c7f3ea..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/tuple.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type t = (string, int)
-type t = (option<int>, option<string>)
-
-let t: (string, int) = x
-let t: (option<int>, option<string>) = x
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/typeconstr.res b/jscomp/syntax/tests/parsing/grammar/typexpr/typeconstr.res
deleted file mode 100644
index 531de35..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/typeconstr.res
+++ /dev/null
@@ -1,70 +0,0 @@
-type t = string
-type t = Parser.t
-type t = Lang.Parser.t
-type t = option<string>
-type t = option<string,>
-type t = Option.t<string>
-type t = Option.t<string,>
-type t = Mod.Sub.t<a, b, c>
-type t = Mod.Sub.t<a, b, c,>
-type t = list
-type t = list<string>
-type t = list<{"age": int}>
-type t = list<{"age": int}, {"name": string}>
-type t = {..} // Note: this compiles to bucklescript
-type t = list<{..}>
-type t = {.. "age": int} // Note: this compiles to bucklescript
-type t = list<{.. "age": int}>
-type t = {.. @attr "age": int} // Note: this compiles to bucklescript
-type t = list<{.. @attr "age": int}> // Note: this compiles to bucklescript
-type t = {.. @attr "age": int, @attr "name": string}
-type t = list<{.. @attr "age": int, @attr "name": string}>
-type t = {.. "age": int,} // Note: this compiles to bucklescript
-type t = list<{.. "age": int,}> // Note: this compiles to bucklescript
-type t = {.. "age": int, "name": string,} // Note: this compiles to bucklescript
-type t = list<{.. "age": int, "name": string,}> // Note: this compiles to bucklescript
-
-let t: string = x 
-let t: Parser.t = x
-let t: Lang.Parser.t = x
-let t: option<string> = x
-let t: option<string,> = x
-let t: Option.t<string> = x
-let t: Option.t<string,> = x
-let t: Mod.Sub.t<a, b, c> = x
-let t: Mod.Sub.t<a, b, c,> = x
-let t: list = x
-let t: list<string> = x
-let t: list<{"age": int}> = x
-let t: list<{"age": int, }> = x
-let t: list<{@attr "age": int}> = x
-let t: list<{@attr "age": int,}> = x
-let t: list<{@attr "age": int, @attr "name": string}> = x
-let t: list<{"age": int}, {"name": string}> = x
-let t: list<{@attr "age": int}, {@attr "name": string}> = x
-let t: list<
-  {@attr "age": int, @attr "name": string},
-  {@attr "name": string, @attr "age": int}
-> = x
-let t: list<{..}> = x // Note: this compiles to bucklescript
-let t: list<{.}> = x // Note: this compiles to bucklescript
-let t: list<{.. "age": int}> = x// Note: this compiles to bucklescript
-let t: list<{. "age": int}> = x// Note: this compiles to bucklescript
-let t: list<{.. "age": int,}> = x// Note: this compiles to bucklescript
-let t: list<{.. @attr "age": int,}> = x// Note: this compiles to bucklescript
-let t: list<{. @attr "age": int,}> = x// Note: this compiles to bucklescript
-let t: list<{.. @attr "age": int}> = x// Note: this compiles to bucklescript
-let t: list<{.. "age": int, "name": string,}> = x // Note: this compiles to bucklescript
-let t: list<{.. @attr "age": int, @attr "name": string,}> = x // Note: this compiles to bucklescript
-
-// >= isn't an infix op
-let t: list<string>= x
-
-// capitalised type variable in record
-type id_6<'T, 'E> = | Ok('T) | Err({payload: 'E})
-
-// capitalised type variable in as pattern
-let foo = (x: int as 'X) => x
-
-// capitalised type variable in type constraint
-module type A = Foo with type t = 'X constraint 'X = int
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/uncurried.res b/jscomp/syntax/tests/parsing/grammar/typexpr/uncurried.res
deleted file mode 100644
index 7ea7f55..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/uncurried.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type t = {
-  mutable field: (. float, int, bool) => unit
-}
-
-type t = (. float, int, bool) => unit
-
-type t = (. @attr float, @attr2 int, . @attr3 bool, @attr4 string) => unit
-type t = @attr (. float) => @attr2 int => @attr3 (. bool) => @attr4 string => unit
-type t = (. (@attr float), (@attr2 int), . (@attr3 bool), (@attr4 string)) => unit
-
-@bs.val
-external setTimeout : ((. ()) => unit, int) => timerId = "setTimeout"
-// totally different meaning
-external setTimeout : (. unit => unit, int) => timerId = "setTimeout"
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/unit.res b/jscomp/syntax/tests/parsing/grammar/typexpr/unit.res
deleted file mode 100644
index d5d937b..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/unit.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type t = ()
-type t = () => ()
-type t = ((), ()) => ()
-
-type t = (()) => ()
-
-let f = (f: () => ()) => f()
-let f = (f: (()) => ()) => f()
-let f = (f: ((), ()) => ()) => f((), ())
-
-external svg: () => React.element = "svg"
-external thing: () => () = "svg"
diff --git a/jscomp/syntax/tests/parsing/grammar/typexpr/var.res b/jscomp/syntax/tests/parsing/grammar/typexpr/var.res
deleted file mode 100644
index 1461eef..0000000
--- a/jscomp/syntax/tests/parsing/grammar/typexpr/var.res
+++ /dev/null
@@ -1,8 +0,0 @@
-type t = 'a
-
-let t: 'a = x
-let t: 'a. t = x
-let t: 'a 'b. t = x
-let t: 'a 'b 'c. t = x
-
-type x<'A> = 'A
diff --git a/jscomp/syntax/tests/parsing/infiniteLoops/equalAfterBinaryExpr.res b/jscomp/syntax/tests/parsing/infiniteLoops/equalAfterBinaryExpr.res
deleted file mode 100644
index 282ae3c..0000000
--- a/jscomp/syntax/tests/parsing/infiniteLoops/equalAfterBinaryExpr.res
+++ /dev/null
@@ -1,172 +0,0 @@
-let rec _addLoop = (rbt, currentNode) => {
-  // Case 1: node is root. Violates 1. Paint it black.
-  if Some(currentNode) === rbt->root {
-    currentNode.color = Black
-  }
-
-  // Case 2: parent black. No properties violated. After that, parent is sure
-  // to be red.
-  else if (currentNode.parent->castNotOption).color === Black {
-    ()
-  }
-
-  // Case 3: if node's parent and uncle are red, they are painted black.
-  // Their parent (node's grandparent) should be painted red, and the
-  // grandparent red. Note that node certainly has a grandparent, since at
-  // this point, its parent's red, which can't be the root.
-
-  // After the painting, the grandparent might violate 2 or 4.
-  else if({
-      let uncle = uncleOf(currentNode)
-      uncle !== None && (uncle->castNotOption).color === Red
-    }) {
-    (currentNode.parent->castNotOption).color = Black
-    (uncleOf(currentNode)->castNotOption).color = Black
-    (grandParentOf(currentNode)->castNotOption).color = Red
-    _addLoop(rbt, grandParentOf(currentNode)->castNotOption)
-  }
-  else {
-    // At this point, uncle is either black or doesn't exist.
-
-    // Case 4: parent red, uncle black, node is right child, parent is left
-    // child. Do a left rotation. Then, former parent passes through case 5.
-    let currentNode =
-      if !isLeft(currentNode) && isLeft(currentNode.parent->castNotOption) {
-        rotateLeft(rbt, currentNode.parent->castNotOption)
-        currentNode.left->castNotOption
-      } else if isLeft(currentNode) && !isLeft(currentNode.parent->castNotOption) {
-        rotateRight(rbt, currentNode.parent->castNotOption)
-        currentNode.right->castNotOption
-      } else {
-        currentNode
-      }
-
-    // Case 5: parent red, uncle black, node is left child, parent is left
-    // child. Right rotation. Switch parent and grandparent's color.
-    (currentNode.parent->castNotOption).color = Black
-    (grandParentOf(currentNode)->castNotOption).color = Red
-    if isLeft(currentNode) {
-      rotateRight(rbt, grandParentOf(currentNode)->castNotOption)
-    } else {
-      rotateLeft(rbt, grandParentOf(currentNode)->castNotOption)
-    }
-  }
-}
-
-
-let removeNode = (rbt, node) => {
-  if nodeToRemove.color === Black {
-    if successor.color === Red {
-      successor.color = Black
-      if successor.parent === None {
-        rbt->rootSet(Some(successor))
-      }
-    } else {
-      let break = ref(false)
-      let successorRef = ref(successor)
-      while !break.contents {
-        let successor = successorRef.contents
-        // Case 1: node is root. Done.
-        switch successor.parent {
-        | None =>
-          rbt->rootSet(Some(successor))
-          break.contents = true
-        | Some(successorParent) =>
-          // Case 2: sibling red. Flip color of P and S. Left rotate P.
-          let sibling = siblingOf(successor)
-          if sibling !== None && (sibling->castNotOption).color === Red {
-            successorParent.color = Red
-            (sibling->castNotOption).color = Black
-            if isLeft(successor) {
-              rotateLeft(rbt, successorParent)
-            } else {
-              rotateRight(rbt, successorParent)
-            }
-          }
-
-          // Case 3: parent, sibling and sibling children all black. Paint
-          // sibling red. Rebalance parent.
-          let sibling = siblingOf(successor)
-          let siblingNN = sibling->castNotOption
-          if
-            successorParent.color === Black &&
-            ( sibling === None ||
-              ( siblingNN.color === Black &&
-                ( siblingNN.left === None ||
-                  (siblingNN.left->castNotOption).color === Black ) &&
-                ( siblingNN.right === None ||
-                  (siblingNN.right->castNotOption).color === Black)))
-             {
-            if sibling !== None {
-              siblingNN.color = Red
-            }
-            successorRef.contents = successorParent
-            // continue
-          } else if
-            // Case 4: sibling and sibling children black. Node parent red. Swap
-            // color of sibling and node parent.
-            successorParent.color === Red &&
-            ( sibling === None ||
-              ( siblingNN.color === Black &&
-              ( siblingNN.left === None ||
-                (siblingNN.left->castNotOption).color === Black) &&
-              ( siblingNN.right === None ||
-                (siblingNN.right->castNotOption).color === Black)))
-             {
-            if sibling !== None {
-              siblingNN.color = Red
-            }
-            successorParent.color = Black
-            break.contents = true
-          } else if
-            // Case 5: sibling black, sibling left child red, right child black,
-            // node is left child. Rotate right sibling. Swap color of sibling and
-            // its new parent.
-            sibling !== None && (sibling->castNotOption).color === Black
-             {
-            let sibling = sibling->castNotOption
-            if
-              isLeft(successor) &&
-              (sibling.right === None || (sibling.right->castNotOption).color === Black) &&
-              sibling.left !== None &&
-              (sibling.left->castNotOption).color === Red {
-              sibling.color = Red
-              (sibling.left->castNotOption).color = Black
-              rotateRight(rbt, sibling)
-            } else if
-              !isLeft(successor) &&
-              (sibling.left === None || (sibling.left->castNotOption).color === Black) &&
-              sibling.right !== None &&
-              (sibling.right->castNotOption).color === Red
-               {
-              sibling.color = Red
-              (sibling.right->castNotOption).color = Black
-              rotateLeft(rbt, sibling)
-            }
-            break.contents = true
-          } else {
-            // Case 6: sibling black, sibling right child red, node is left child.
-            // Rotate left node parent. Swap color of parent and sibling. Paint
-            // sibling right child black.
-            let sibling = siblingOf(successor)
-            let sibling = sibling->castNotOption
-            sibling.color = successorParent.color
-            if isLeft(successor) {
-              (sibling.right->castNotOption).color = Black
-              rotateRight(rbt, successorParent)
-            } else {
-              (sibling.left->castNotOption).color = Black
-              rotateLeft(rbt, successorParent)
-            }
-          }
-        }
-      }
-    }
-  }
-  // Don't forget to detatch the artificially created leaf.
-  if isLeaf(. successor) {
-    if rbt->root === Some(successor) {
-      rbt->root = None
-    }
-  }
-}
diff --git a/jscomp/syntax/tests/parsing/infiniteLoops/expected/equalAfterBinaryExpr.res.txt b/jscomp/syntax/tests/parsing/infiniteLoops/expected/equalAfterBinaryExpr.res.txt
deleted file mode 100644
index c317935..0000000
--- a/jscomp/syntax/tests/parsing/infiniteLoops/expected/equalAfterBinaryExpr.res.txt
+++ /dev/null
@@ -1,156 +0,0 @@
-
-  Syntax error!
-  tests/parsing/infiniteLoops/equalAfterBinaryExpr.res:169:17
-
-  167 ┆ if isLeaf(. successor) {
-  168 ┆   if rbt->root === Some(successor) {
-  169 ┆     rbt->root = None
-  170 ┆   }
-  171 ┆ }
-
-  Did you mean `==` here?
-
-let rec _addLoop rbt currentNode =
-  ((if (Some currentNode) == (rbt |. root)
-    then currentNode.color <- Black
-    else
-      if (currentNode.parent |. castNotOption).color == Black
-      then ()
-      else
-        if
-          (((let uncle = uncleOf currentNode in
-             (uncle != None) && ((uncle |. castNotOption).color == Red)))
-          [@res.braces ])
-        then
-          ((currentNode.parent |. castNotOption).color <- Black;
-           ((uncleOf currentNode) |. castNotOption).color <- Black;
-           ((grandParentOf currentNode) |. castNotOption).color <- Red;
-           _addLoop rbt ((grandParentOf currentNode) |. castNotOption))
-        else
-          (let currentNode =
-             if
-               (not (isLeft currentNode)) &&
-                 (isLeft (currentNode.parent |. castNotOption))
-             then
-               (rotateLeft rbt (currentNode.parent |. castNotOption);
-                currentNode.left |. castNotOption)
-             else
-               if
-                 (isLeft currentNode) &&
-                   (not (isLeft (currentNode.parent |. castNotOption)))
-               then
-                 (rotateRight rbt (currentNode.parent |. castNotOption);
-                  currentNode.right |. castNotOption)
-               else currentNode in
-           (currentNode.parent |. castNotOption).color <- Black;
-           ((grandParentOf currentNode) |. castNotOption).color <- Red;
-           if isLeft currentNode
-           then
-             rotateRight rbt ((grandParentOf currentNode) |. castNotOption)
-           else rotateLeft rbt ((grandParentOf currentNode) |. castNotOption)))
-  [@res.braces ])
-let removeNode rbt node =
-  ((if nodeToRemove.color == Black
-    then
-      (if successor.color == Red
-       then
-         (successor.color <- Black;
-          if successor.parent == None then rbt |. (rootSet (Some successor)))
-       else
-         (let break = ref false in
-          let successorRef = ref successor in
-          while not break.contents do
-            let successor = successorRef.contents in
-            match successor.parent with
-            | None ->
-                (rbt |. (rootSet (Some successor)); break.contents <- true)
-            | Some successorParent ->
-                let sibling = siblingOf successor in
-                (if
-                   (sibling != None) &&
-                     ((sibling |. castNotOption).color == Red)
-                 then
-                   (successorParent.color <- Red;
-                    (sibling |. castNotOption).color <- Black;
-                    if isLeft successor
-                    then rotateLeft rbt successorParent
-                    else rotateRight rbt successorParent);
-                 (let sibling = siblingOf successor in
-                  let siblingNN = sibling |. castNotOption in
-                  if
-                    (successorParent.color == Black) &&
-                      ((sibling == None) ||
-                         (((siblingNN.color == Black) &&
-                             ((siblingNN.left == None) ||
-                                ((siblingNN.left |. castNotOption).color ==
-                                   Black)))
-                            &&
-                            ((siblingNN.right == None) ||
-                               ((siblingNN.right |. castNotOption).color ==
-                                  Black))))
-                  then
-                    (if sibling != None then siblingNN.color <- Red;
-                     successorRef.contents <- successorParent)
-                  else
-                    if
-                      (successorParent.color == Red) &&
-                        ((sibling == None) ||
-                           (((siblingNN.color == Black) &&
-                               ((siblingNN.left == None) ||
-                                  ((siblingNN.left |. castNotOption).color ==
-                                     Black)))
-                              &&
-                              ((siblingNN.right == None) ||
-                                 ((siblingNN.right |. castNotOption).color ==
-                                    Black))))
-                    then
-                      (if sibling != None then siblingNN.color <- Red;
-                       successorParent.color <- Black;
-                       break.contents <- true)
-                    else
-                      if
-                        (sibling != None) &&
-                          ((sibling |. castNotOption).color == Black)
-                      then
-                        (let sibling = sibling |. castNotOption in
-                         if
-                           (((isLeft successor) &&
-                               ((sibling.right == None) ||
-                                  ((sibling.right |. castNotOption).color ==
-                                     Black)))
-                              && (sibling.left != None))
-                             &&
-                             ((sibling.left |. castNotOption).color == Red)
-                         then
-                           (sibling.color <- Red;
-                            (sibling.left |. castNotOption).color <- Black;
-                            rotateRight rbt sibling)
-                         else
-                           if
-                             (((not (isLeft successor)) &&
-                                 ((sibling.left == None) ||
-                                    ((sibling.left |. castNotOption).color ==
-                                       Black)))
-                                && (sibling.right != None))
-                               &&
-                               ((sibling.right |. castNotOption).color == Red)
-                           then
-                             (sibling.color <- Red;
-                              (sibling.right |. castNotOption).color <- Black;
-                              rotateLeft rbt sibling);
-                         break.contents <- true)
-                      else
-                        (let sibling = siblingOf successor in
-                         let sibling = sibling |. castNotOption in
-                         sibling.color <- (successorParent.color);
-                         if isLeft successor
-                         then
-                           ((sibling.right |. castNotOption).color <- Black;
-                            rotateRight rbt successorParent)
-                         else
-                           ((sibling.left |. castNotOption).color <- Black;
-                            rotateLeft rbt successorParent))))
-            done));
-    if ((isLeaf successor)[@res.uapp ])
-    then (if (rbt |. root) == (Some successor) then (rbt |. root) = None))
-  [@res.braces ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/infiniteLoops/expected/jsxChildren.res.txt b/jscomp/syntax/tests/parsing/infiniteLoops/expected/jsxChildren.res.txt
deleted file mode 100644
index 16a1df1..0000000
--- a/jscomp/syntax/tests/parsing/infiniteLoops/expected/jsxChildren.res.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-  Syntax error!
-  tests/parsing/infiniteLoops/jsxChildren.res:1:22
-
-  1 │ type action = AddUser<string>
-  2 │ 
-  3 │ let a: action = AddUser("test")
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/parsing/infiniteLoops/jsxChildren.res:1:22-29
-
-  1 │ type action = AddUser<string>
-  2 │ 
-  3 │ let a: action = AddUser("test")
-
-  Missing </string>
-
-type nonrec action =
-  | AddUser 
-;;((string ~children:[] ())[@JSX ])
-let (a : action) = AddUser {js|test|js}
-;;etype
-;;s = { x = ((list < i) > ([%rescript.exprhole ])) }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/infiniteLoops/expected/nonRecTypes.res.txt b/jscomp/syntax/tests/parsing/infiniteLoops/expected/nonRecTypes.res.txt
deleted file mode 100644
index 1db620a..0000000
--- a/jscomp/syntax/tests/parsing/infiniteLoops/expected/nonRecTypes.res.txt
+++ /dev/null
@@ -1,452 +0,0 @@
-
-  Syntax error!
-  tests/parsing/infiniteLoops/nonRecTypes.res:4:29-36
-
-  2 ┆ include (
-  3 ┆           {
-  4 ┆             type t('value) = {
-  5 ┆               mutable size: int,
-  6 ┆               mutable root: option(node('value)),
-
-  Type parameters require angle brackets:
-  t<'value>
-
-
-  Syntax error!
-  tests/parsing/infiniteLoops/nonRecTypes.res:19:45-51
-
-  17 ┆   ~size: int,
-  18 ┆   ~root: option(node('value)),
-  19 ┆   ~compare: Js.Internal.fn([ | `Arity_2('value, 'value)], int)
-  20 ┆ ) =>
-  21 ┆ t('value) =
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/parsing/infiniteLoops/nonRecTypes.res:67:26-68:3
-
-  65 │         };
-  66 │ let has = (rbt, value) => _findNode(rbt, rootGet(rbt), value) !== None;
-  67 │ let rec minNode = node =>
-  68 │ let findMin = rbt =>
-  69 │ let removeNode = (rbt, node) => {
-  70 │   let nodeToRemove =
-
-  I'm not sure what to parse here when looking at "let".
-
-
-  Syntax error!
-  tests/parsing/infiniteLoops/nonRecTypes.res:68:21-69:3
-
-  66 │ let has = (rbt, value) => _findNode(rbt, rootGet(rbt), value) !== None;
-  67 │ let rec minNode = node =>
-  68 │ let findMin = rbt =>
-  69 │ let removeNode = (rbt, node) => {
-  70 │   let nodeToRemove =
-  71 │     switch (leftGet(node), rightGet(node)) {
-
-  I'm not sure what to parse here when looking at "let".
-
-
-  Syntax error!
-  tests/parsing/infiniteLoops/nonRecTypes.res:434:31-38
-
-  432 │     updateSum(Some(node), ~delta);
-  433 │   };
-  434 │ type nonrec oldNewVisibleNodes('value) = {
-  435 │   mutable old: array('value),
-  436 │   mutable new_: array('value),
-
-  Type parameters require angle brackets:
-  oldNewVisibleNodes<'value>
-
-include
-  struct
-    include
-      struct
-        type nonrec 'value t =
-          {
-          mutable size: int ;
-          mutable root: 'value node option ;
-          compare: [ [%rescript.typehole ]] Js.Internal.fn }
-        ;;(({js|Arity_2('value, 'value)], int),
-                      };
-                    }: {
-
-                    }
-                  );
-          type t('value);
-          external t:
-            (
-              ~size: int,
-              ~root: option(node('value)),
-              ~compare: Js.Internal.fn([ | |js})
-          [@res.template ])
-        ;;Arity_2 (value, value)
-        ;;int
-        ;;(t value) = {js||js}
-        ;;{js|BS:6.0.1\x84\x95\xa6\xbe\0\0\0#\0\0\0\r\0\0\0&\0\0\0#\x91\xa0\xa0A\xa0$size@\xa0\xa0A\xa0$root@\xa0\xa0A\xa0'compare@@|js}
-        external sizeSet : 'value t -> int -> unit = "size"
-        ;;{js|BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x15\0\0\0\t\0\0\0\x1a\0\0\0\x19\xb0\xa0\xa0A\x91@\xa0\xa0A\x04\x03@E\x97\xa0$size@|js}
-        ;;[|(({js|use sizeGet instead or use {abstract = light} explicitly|js})
-            [@ocaml.deprecated ])|]
-        ;;[|((1)[@internal.arity ])|]
-        external size : 'value t -> int = ""
-        ;;{js|BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x10\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0$size@|js}
-        ;;[|((1)[@internal.arity ])|]
-        external sizeGet : 'value t -> int = ""
-        ;;{js|BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x10\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0$size@|js}
-        external rootSet : 'value t -> 'value node option -> unit = "root"
-        ;;{js|BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x15\0\0\0\t\0\0\0\x1a\0\0\0\x19\xb0\xa0\xa0A\x91@\xa0\xa0A\x04\x03@E\x97\xa0$root@|js}
-        ;;[|(({js|use rootGet instead or use {abstract = light} explicitly|js})
-            [@ocaml.deprecated ])|]
-        ;;[|((1)[@internal.arity ])|]
-        external root : 'value t -> 'value node option = ""
-        ;;{js|BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x10\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0$root@|js}
-        ;;[|((1)[@internal.arity ])|]
-        external rootGet : 'value t -> 'value node option = ""
-        ;;{js|BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x10\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0$root@|js}
-        ;;[|(({js|use compareGet instead or use {abstract = light} explicitly|js})
-            [@ocaml.deprecated ])|]
-        ;;[|((1)[@internal.arity ])|]
-        external compare :
-          'value t -> [ [%rescript.typehole ]] Js.Internal.fn
-        ;;(({js|Arity_2('value, 'value)], int) =
-            ""
-            "BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x13\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0'compare@";
-          [@internal.arity 1]
-          external compareGet:
-            t('value) => Js.Internal.fn([ | |js})
-          [@res.template ])
-        ;;Arity_2 (value, value)
-        ;;int
-        ;;{js||js}
-        ;;{js|BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x13\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0'compare@|js}
-      end
-    let has rbt value = (_findNode rbt (rootGet rbt) value) != None
-    let rec minNode node = [%rescript.exprhole ]
-    let findMin rbt = [%rescript.exprhole ]
-    let removeNode rbt node =
-      ((let nodeToRemove =
-          match ((leftGet node), (rightGet node)) with
-          | (Some _, Some _) ->
-              let successor = castNotOption (minNode (rightGet node)) in
-              (valueSet node (valueGet successor);
-               heightSet node (heightGet successor);
-               successor)
-          | _ -> node in
-        let successor =
-          match leftGet nodeToRemove with
-          | None -> rightGet nodeToRemove
-          | left -> left in
-        let (successor, isLeaf) =
-          match successor with
-          | None ->
-              let leaf =
-                createNode ~value:((Js.Internal.raw_expr {js|0|js})
-                  [@res.namedArgLoc ]) ~color:((Black)[@res.namedArgLoc ])
-                  ~height:((0.)[@res.namedArgLoc ]) in
-              let isLeaf = Js.Internal.fn_mk1 (fun x -> x == leaf) in
-              (leaf, isLeaf)
-          | Some successor ->
-              (successor, (Js.Internal.fn_mk1 (fun _ -> false))) in
-        let nodeParent = parentGet nodeToRemove in
-        parentSet successor nodeParent;
-        (match nodeParent with
-         | None -> ()
-         | Some parent ->
-             leftOrRightSet parent ~node:((nodeToRemove)[@res.namedArgLoc ])
-               (Some successor));
-        updateSumRecursive rbt successor;
-        if (colorGet nodeToRemove) == Black
-        then
-          (if (colorGet successor) == Red
-           then
-             (colorSet successor Black;
-              if (parentGet successor) == None
-              then rootSet rbt (Some successor))
-           else
-             (let break = ref false in
-              let successorRef = ref successor in
-              while not break.contents do
-                let successor = successorRef.contents in
-                match parentGet successor with
-                | None ->
-                    (rootSet rbt (Some successor); break.contents <- true)
-                | Some successorParent ->
-                    let sibling = siblingOf successor in
-                    (if
-                       (sibling != None) &&
-                         ((colorGet (castNotOption sibling)) == Red)
-                     then
-                       (colorSet successorParent Red;
-                        colorSet (castNotOption sibling) Black;
-                        if isLeft successor
-                        then rotateLeft rbt successorParent
-                        else rotateRight rbt successorParent);
-                     (let sibling = siblingOf successor in
-                      let siblingNN = castNotOption sibling in
-                      if
-                        ((colorGet successorParent) == Black) &&
-                          ((sibling == None) ||
-                             ((((colorGet siblingNN) == Black) &&
-                                 (((leftGet siblingNN) == None) ||
-                                    ((colorGet
-                                        (castNotOption (leftGet siblingNN)))
-                                       == Black)))
-                                &&
-                                (((rightGet siblingNN) == None) ||
-                                   ((colorGet
-                                       (castNotOption (rightGet siblingNN)))
-                                      == Black))))
-                      then
-                        (if sibling != None then colorSet siblingNN Red;
-                         successorRef.contents <- successorParent)
-                      else
-                        if
-                          ((colorGet successorParent) == Red) &&
-                            ((sibling == None) ||
-                               ((((colorGet siblingNN) == Black) &&
-                                   (((leftGet siblingNN) == None) ||
-                                      ((colorGet
-                                          (castNotOption (leftGet siblingNN)))
-                                         == Black)))
-                                  &&
-                                  (((rightGet siblingNN) == None) ||
-                                     ((colorGet
-                                         (castNotOption (rightGet siblingNN)))
-                                        == Black))))
-                        then
-                          (if sibling != None then colorSet siblingNN Red;
-                           colorSet successorParent Black;
-                           break.contents <- true)
-                        else
-                          if
-                            (sibling != None) &&
-                              ((colorGet (castNotOption sibling)) == Black)
-                          then
-                            (let sibling = castNotOption sibling in
-                             if
-                               (((isLeft successor) &&
-                                   (((rightGet sibling) == None) ||
-                                      ((colorGet
-                                          (castNotOption (rightGet sibling)))
-                                         == Black)))
-                                  && ((leftGet sibling) != None))
-                                 &&
-                                 ((colorGet (castNotOption (leftGet sibling)))
-                                    == Red)
-                             then
-                               (colorSet sibling Red;
-                                colorSet (castNotOption (leftGet sibling))
-                                  Black;
-                                rotateRight rbt sibling)
-                             else
-                               if
-                                 (((not (isLeft successor)) &&
-                                     (((leftGet sibling) == None) ||
-                                        ((colorGet
-                                            (castNotOption (leftGet sibling)))
-                                           == Black)))
-                                    && ((rightGet sibling) != None))
-                                   &&
-                                   ((colorGet
-                                       (castNotOption (rightGet sibling)))
-                                      == Red)
-                               then
-                                 (colorSet sibling Red;
-                                  colorSet (castNotOption (rightGet sibling))
-                                    Black;
-                                  rotateLeft rbt sibling);
-                             break.contents <- true)
-                          else
-                            (let sibling = siblingOf successor in
-                             let sibling = castNotOption sibling in
-                             colorSet sibling (colorGet successorParent);
-                             if isLeft successor
-                             then
-                               (colorSet (castNotOption (rightGet sibling))
-                                  Black;
-                                rotateRight rbt successorParent)
-                             else
-                               (colorSet (castNotOption (leftGet sibling))
-                                  Black;
-                                rotateLeft rbt successorParent))))
-                done));
-        if Js.Internal.fn_run1 isLeaf successor
-        then
-          (if (rootGet rbt) == (Some successor) then rootSet rbt None;
-           (match parentGet successor with
-            | None -> ()
-            | Some parent ->
-                leftOrRightSet parent ~node:((successor)[@res.namedArgLoc ])
-                  None)))
-      [@res.braces ])
-    let remove rbt value =
-      match _findNode rbt (rootGet rbt) value with
-      | Some node ->
-          (removeNode rbt node;
-           sizeSet rbt ((sizeGet rbt) - 1);
-           Some (heightGet node))
-      | None -> None
-    let findThroughCallback rbt cb =
-      ((let rec findThroughCallback rbt node cb =
-          match node with
-          | None -> None
-          | Some node ->
-              let cmp = Js.Internal.fn_run1 cb (valueGet node) in
-              if cmp == 0
-              then Some node
-              else
-                if cmp < 0
-                then findThroughCallback rbt (leftGet node) cb
-                else findThroughCallback rbt (rightGet node) cb in
-        match findThroughCallback rbt (rootGet rbt) cb with
-        | None -> None
-        | Some node -> Some (valueGet node))
-      [@res.braces ])
-    let make ~compare:((compare)[@res.namedArgLoc ])  =
-      t ~size:((0)[@res.namedArgLoc ]) ~root:((None)[@res.namedArgLoc ])
-        ~compare:((compare)[@res.namedArgLoc ])
-    let rec heightOfInterval rbt node lhs rhs =
-      match node with
-      | None -> 0.
-      | Some n ->
-          if (lhs == None) && (rhs == None)
-          then sumGet n
-          else
-            if
-              (lhs != None) &&
-                ((Js.Internal.fn_run2 (compareGet rbt) (valueGet n)
-                    (castNotOption lhs))
-                   < 0)
-            then heightOfInterval rbt (rightGet n) lhs rhs
-            else
-              if
-                (rhs != None) &&
-                  ((Js.Internal.fn_run2 (compareGet rbt) (valueGet n)
-                      (castNotOption rhs))
-                     > 0)
-              then heightOfInterval rbt (leftGet n) lhs rhs
-              else
-                ((heightGet n) +. (heightOfInterval rbt (leftGet n) lhs None))
-                  +. (heightOfInterval rbt (rightGet n) None rhs)
-    let heightOfInterval rbt lhs rhs =
-      heightOfInterval rbt (rootGet rbt) lhs rhs
-    let rec firstVisibleNode node offset =
-      match node with
-      | None -> None
-      | Some node ->
-          if (sumGet node) <= offset
-          then None
-          else
-            (let nodeHeight = heightGet node in
-             let sumLeft =
-               match leftGet node with
-               | None -> 0.0
-               | Some left -> sumGet left in
-             if sumLeft > offset
-             then firstVisibleNode (leftGet node) offset
-             else
-               if (sumLeft +. nodeHeight) > offset
-               then Some node
-               else
-                 firstVisibleNode (rightGet node)
-                   (offset -. (sumLeft +. nodeHeight)))
-    let lastVisibleNode node offset =
-      match firstVisibleNode node offset with
-      | None -> maxNode node
-      | first -> first
-    let firstVisible rbt ~offset:((offset)[@res.namedArgLoc ])  =
-      match firstVisibleNode (rootGet rbt) offset with
-      | None -> None
-      | Some node -> Some (valueGet node)
-    let rec leftmost node =
-      match leftGet node with | None -> node | Some node -> leftmost node
-    let rec firstRightParent node =
-      match parentGet node with
-      | None -> None
-      | Some parent ->
-          if isLeft node then Some parent else firstRightParent parent
-    let nextNode node =
-      match rightGet node with
-      | None -> firstRightParent node
-      | Some right -> Some (leftmost right)
-    let rec sumLeftSpine node
-      ~fromRightChild:((fromRightChild)[@res.namedArgLoc ])  =
-      ((let leftSpine =
-          match leftGet node with
-          | None -> heightGet node
-          | Some left ->
-              if fromRightChild
-              then (heightGet node) +. (sumGet left)
-              else 0.0 in
-        match parentGet node with
-        | None -> leftSpine
-        | Some parent ->
-            leftSpine +.
-              (sumLeftSpine parent
-                 ~fromRightChild:(((rightGet parent) == (Some node))
-                 [@res.namedArgLoc ])))
-      [@res.braces ])
-    let getY node =
-      (sumLeftSpine node ~fromRightChild:((true)[@res.namedArgLoc ])) -.
-        (heightGet node)
-    let linearSearch rbt callback =
-      ((let rec find node callback =
-          if Js.Internal.fn_run1 callback (valueGet node)
-          then Some (valueGet node)
-          else
-            (match nextNode node with
-             | None -> None
-             | Some node -> find node callback) in
-        match minNode (rootGet rbt) with
-        | None -> None
-        | Some node -> find node callback)
-      [@res.braces ])
-    let rec iterate ~inclusive:((inclusive)[@res.namedArgLoc ])  firstNode
-      lastNode ~callback:((callback)[@res.namedArgLoc ])  =
-      match firstNode with
-      | None -> ()
-      | Some node ->
-          (if inclusive then Js.Internal.fn_run1 callback node;
-           if firstNode != lastNode
-           then
-             (if not inclusive then Js.Internal.fn_run1 callback node;
-              iterate ~inclusive:((inclusive)[@res.namedArgLoc ])
-                (nextNode node) lastNode ~callback:((callback)
-                [@res.namedArgLoc ])))
-    let rec iterateWithY ?y:((y)[@res.namedArgLoc ]) 
-      ~inclusive:((inclusive)[@res.namedArgLoc ])  firstNode lastNode
-      ~callback:((callback)[@res.namedArgLoc ])  =
-      match firstNode with
-      | None -> ()
-      | Some node ->
-          let y = match y with | None -> getY node | Some y -> y in
-          (if inclusive then Js.Internal.fn_run2 callback node y;
-           if firstNode != lastNode
-           then
-             (if not inclusive then Js.Internal.fn_run2 callback node y;
-              iterateWithY ~y:((y +. (heightGet node))[@res.namedArgLoc ])
-                ~inclusive:((inclusive)[@res.namedArgLoc ]) (nextNode node)
-                lastNode ~callback:((callback)[@res.namedArgLoc ])))
-    let rec updateSum node ~delta:((delta)[@res.namedArgLoc ])  =
-      match node with
-      | None -> ()
-      | Some node ->
-          (sumSet node ((sumGet node) +. delta);
-           updateSum (parentGet node) ~delta:((delta)[@res.namedArgLoc ]))
-    let setHeight rbt value ~height:((height)[@res.namedArgLoc ])  =
-      match _findNode rbt (rootGet rbt) value with
-      | None -> ()
-      | Some node ->
-          let delta = height -. (heightGet node) in
-          (heightSet node height;
-           updateSum (Some node) ~delta:((delta)[@res.namedArgLoc ]))
-    type nonrec 'value oldNewVisibleNodes =
-      {
-      mutable old: 'value array ;
-      mutable new_: 'value array }
-  end
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/infiniteLoops/expected/polymorphicVariantType.res.txt b/jscomp/syntax/tests/parsing/infiniteLoops/expected/polymorphicVariantType.res.txt
deleted file mode 100644
index e929528..0000000
--- a/jscomp/syntax/tests/parsing/infiniteLoops/expected/polymorphicVariantType.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-  Syntax error!
-  tests/parsing/infiniteLoops/polymorphicVariantType.res:1:14
-
-  1 │ type x = [<y>
-
-  Did you forget a `]` here?
-
-type nonrec x = [< y]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/infiniteLoops/expected/templateEof.res.txt b/jscomp/syntax/tests/parsing/infiniteLoops/expected/templateEof.res.txt
deleted file mode 100644
index fc64a8d..0000000
--- a/jscomp/syntax/tests/parsing/infiniteLoops/expected/templateEof.res.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-  Syntax error!
-  tests/parsing/infiniteLoops/templateEof.res:1:3-6
-
-  1 │ et foo = x =>
-  2 │   switch x {
-  3 │   | `${
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/parsing/infiniteLoops/templateEof.res:3:5-7
-
-  1 │ et foo = x =>
-  2 │   switch x {
-  3 │   | `${
-
-  String interpolation is not supported in pattern matching.
-
-;;et
-;;foo =
-    (fun x -> match x with | (("")[@res.template ]) -> [%rescript.exprhole ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/infiniteLoops/jsxChildren.res b/jscomp/syntax/tests/parsing/infiniteLoops/jsxChildren.res
deleted file mode 100644
index 3c50a44..0000000
--- a/jscomp/syntax/tests/parsing/infiniteLoops/jsxChildren.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type action = AddUser<string>
-
-let a: action = AddUser("test")
-
-etype s = {x:list<i>}
diff --git a/jscomp/syntax/tests/parsing/infiniteLoops/nonRecTypes.res b/jscomp/syntax/tests/parsing/infiniteLoops/nonRecTypes.res
deleted file mode 100644
index f05582c..0000000
--- a/jscomp/syntax/tests/parsing/infiniteLoops/nonRecTypes.res
+++ /dev/null
@@ -1,437 +0,0 @@
-include {
-          include (
-                    {
-                      type t('value) = {
-                        mutable size: int,
-                        mutable root: option(node('value)),
-                        compare:
-                          Js.Internal.fn([ | `Arity_2('value, 'value)], int),
-                      };
-                    }: {
-
-                    }
-                  );
-          type t('value);
-          external t:
-            (
-              ~size: int,
-              ~root: option(node('value)),
-              ~compare: Js.Internal.fn([ | `Arity_2('value, 'value)], int)
-            ) =>
-            t('value) =
-            ""
-            "BS:6.0.1\x84\x95\xa6\xbe\0\0\0#\0\0\0\r\0\0\0&\0\0\0#\x91\xa0\xa0A\xa0$size@\xa0\xa0A\xa0$root@\xa0\xa0A\xa0'compare@@";
-          external sizeSet: (t('value), int) => unit =
-            "size"
-            "BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x15\0\0\0\t\0\0\0\x1a\0\0\0\x19\xb0\xa0\xa0A\x91@\xa0\xa0A\x04\x03@E\x97\xa0$size@";
-          [@ocaml.deprecated
-            "use sizeGet instead or use {abstract = light} explicitly"
-          ]
-          [@internal.arity 1]
-          external size: t('value) => int =
-            ""
-            "BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x10\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0$size@";
-          [@internal.arity 1]
-          external sizeGet: t('value) => int =
-            ""
-            "BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x10\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0$size@";
-          external rootSet: (t('value), option(node('value))) => unit =
-            "root"
-            "BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x15\0\0\0\t\0\0\0\x1a\0\0\0\x19\xb0\xa0\xa0A\x91@\xa0\xa0A\x04\x03@E\x97\xa0$root@";
-          [@ocaml.deprecated
-            "use rootGet instead or use {abstract = light} explicitly"
-          ]
-          [@internal.arity 1]
-          external root: t('value) => option(node('value)) =
-            ""
-            "BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x10\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0$root@";
-          [@internal.arity 1]
-          external rootGet: t('value) => option(node('value)) =
-            ""
-            "BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x10\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0$root@";
-          [@ocaml.deprecated
-            "use compareGet instead or use {abstract = light} explicitly"
-          ]
-          [@internal.arity 1]
-          external compare:
-            t('value) => Js.Internal.fn([ | `Arity_2('value, 'value)], int) =
-            ""
-            "BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x13\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0'compare@";
-          [@internal.arity 1]
-          external compareGet:
-            t('value) => Js.Internal.fn([ | `Arity_2('value, 'value)], int) =
-            ""
-            "BS:6.0.1\x84\x95\xa6\xbe\0\0\0\x13\0\0\0\x07\0\0\0\x14\0\0\0\x13\xb0\xa0\xa0A\x91@@A\x98\xa0'compare@";
-        };
-let has = (rbt, value) => _findNode(rbt, rootGet(rbt), value) !== None;
-let rec minNode = node =>
-let findMin = rbt =>
-let removeNode = (rbt, node) => {
-  let nodeToRemove =
-    switch (leftGet(node), rightGet(node)) {
-    | (Some(_), Some(_)) =>
-      let successor = castNotOption(minNode(rightGet(node)));
-      valueSet(node, valueGet(successor));
-      heightSet(node, heightGet(successor));
-      successor;
-    | _ => node
-    };
-  let successor =
-    switch (leftGet(nodeToRemove)) {
-    | None => rightGet(nodeToRemove)
-    | left => left
-    };
-  let (successor, isLeaf) =
-    switch (successor) {
-    | None =>
-      let leaf =
-        createNode(
-          ~value=Js.Internal.raw_expr("0"),
-          ~color=Black,
-          ~height=0.,
-        );
-      let isLeaf = Js.Internal.fn_mk1(x => x === leaf);
-      (leaf, isLeaf);
-    | Some(successor) => (successor, Js.Internal.fn_mk1(_ => false))
-    };
-  let nodeParent = parentGet(nodeToRemove);
-  parentSet(successor, nodeParent);
-  switch (nodeParent) {
-  | None => ()
-  | Some(parent) =>
-    leftOrRightSet(parent, ~node=nodeToRemove, Some(successor))
-  };
-  updateSumRecursive(rbt, successor);
-  if (colorGet(nodeToRemove) === Black) {
-    if (colorGet(successor) === Red) {
-      colorSet(successor, Black);
-      if (parentGet(successor) === None) {
-        rootSet(rbt, Some(successor));
-      };
-    } else {
-      let break = ref(false);
-      let successorRef = ref(successor);
-      while (!break.contents) {
-        let successor = successorRef.contents;
-        switch (parentGet(successor)) {
-        | None =>
-          rootSet(rbt, Some(successor));
-          break.contents = true;
-        | Some(successorParent) =>
-          let sibling = siblingOf(successor);
-          if (sibling !== None && colorGet(castNotOption(sibling)) === Red) {
-            colorSet(successorParent, Red);
-            colorSet(castNotOption(sibling), Black);
-            if (isLeft(successor)) {
-              rotateLeft(rbt, successorParent);
-            } else {
-              rotateRight(rbt, successorParent);
-            };
-          };
-          let sibling = siblingOf(successor);
-          let siblingNN = castNotOption(sibling);
-          if (colorGet(successorParent) === Black
-              && (
-                sibling === None
-                || (
-                  colorGet(siblingNN) === Black
-                  && (
-                    leftGet(siblingNN) === None
-                    || colorGet(castNotOption(leftGet(siblingNN))) === Black
-                  )
-                )
-                && (
-                  rightGet(siblingNN) === None
-                  || colorGet(castNotOption(rightGet(siblingNN))) === Black
-                )
-              )) {
-            if (sibling !== None) {
-              colorSet(siblingNN, Red);
-            };
-            successorRef.contents = successorParent;
-          } else if (colorGet(successorParent) === Red
-                     && (
-                       sibling === None
-                       || (
-                         colorGet(siblingNN) === Black
-                         && (
-                           leftGet(siblingNN) === None
-                           || colorGet(castNotOption(leftGet(siblingNN)))
-                           === Black
-                         )
-                       )
-                       && (
-                         rightGet(siblingNN) === None
-                         || colorGet(castNotOption(rightGet(siblingNN)))
-                         === Black
-                       )
-                     )) {
-            if (sibling !== None) {
-              colorSet(siblingNN, Red);
-            };
-            colorSet(successorParent, Black);
-            break.contents = true;
-          } else if (sibling !== None
-                     && colorGet(castNotOption(sibling)) === Black) {
-            let sibling = castNotOption(sibling);
-            if ((
-                  (
-                    isLeft(successor)
-                    && (
-                      rightGet(sibling) === None
-                      || colorGet(castNotOption(rightGet(sibling)))
-                      === Black
-                    )
-                  )
-                  && leftGet(sibling) !== None
-                )
-                && colorGet(castNotOption(leftGet(sibling))) === Red) {
-              colorSet(sibling, Red);
-              colorSet(castNotOption(leftGet(sibling)), Black);
-              rotateRight(rbt, sibling);
-            } else if ((
-                         (
-                           !isLeft(successor)
-                           && (
-                             leftGet(sibling) === None
-                             || colorGet(castNotOption(leftGet(sibling)))
-                             === Black
-                           )
-                         )
-                         && rightGet(sibling) !== None
-                       )
-                       && colorGet(castNotOption(rightGet(sibling))) === Red) {
-              colorSet(sibling, Red);
-              colorSet(castNotOption(rightGet(sibling)), Black);
-              rotateLeft(rbt, sibling);
-            };
-            break.contents = true;
-          } else {
-            let sibling = siblingOf(successor);
-            let sibling = castNotOption(sibling);
-            colorSet(sibling, colorGet(successorParent));
-            if (isLeft(successor)) {
-              colorSet(castNotOption(rightGet(sibling)), Black);
-              rotateRight(rbt, successorParent);
-            } else {
-              colorSet(castNotOption(leftGet(sibling)), Black);
-              rotateLeft(rbt, successorParent);
-            };
-          };
-        };
-      };
-    };
-  };
-  if (Js.Internal.fn_run1(isLeaf, successor)) {
-    if (rootGet(rbt) === Some(successor)) {
-      rootSet(rbt, None);
-    };
-    switch (parentGet(successor)) {
-    | None => ()
-    | Some(parent) => leftOrRightSet(parent, ~node=successor, None)
-    };
-  };
-};
-let remove = (rbt, value) =>
-  switch (_findNode(rbt, rootGet(rbt), value)) {
-  | Some(node) =>
-    removeNode(rbt, node);
-    sizeSet(rbt, sizeGet(rbt) - 1);
-    Some(heightGet(node));
-  | None => None
-  };
-let findThroughCallback = (rbt, cb) => {
-  let rec findThroughCallback = (rbt, node, cb) =>
-    switch (node) {
-    | None => None
-    | Some(node) =>
-      let cmp = Js.Internal.fn_run1(cb, valueGet(node));
-      if (cmp === 0) {
-        Some(node);
-      } else if (cmp < 0) {
-        findThroughCallback(rbt, leftGet(node), cb);
-      } else {
-        findThroughCallback(rbt, rightGet(node), cb);
-      };
-    };
-  switch (findThroughCallback(rbt, rootGet(rbt), cb)) {
-  | None => None
-  | Some(node) => Some(valueGet(node))
-  };
-};
-let make = (~compare) => t(~size=0, ~root=None, ~compare);
-let rec heightOfInterval = (rbt, node, lhs, rhs) =>
-  switch (node) {
-  | None => 0.
-  | Some(n) =>
-    if (lhs === None && rhs === None) {
-      sumGet(n);
-    } else if (lhs !== None
-               && Js.Internal.fn_run2(
-                    compareGet(rbt),
-                    valueGet(n),
-                    castNotOption(lhs),
-                  )
-               < 0) {
-      heightOfInterval(rbt, rightGet(n), lhs, rhs);
-    } else if (rhs !== None
-               && Js.Internal.fn_run2(
-                    compareGet(rbt),
-                    valueGet(n),
-                    castNotOption(rhs),
-                  )
-               > 0) {
-      heightOfInterval(rbt, leftGet(n), lhs, rhs);
-    } else {
-      heightGet(n)
-      +. heightOfInterval(rbt, leftGet(n), lhs, None)
-      +. heightOfInterval(rbt, rightGet(n), None, rhs);
-    }
-  };
-let heightOfInterval = (rbt, lhs, rhs) =>
-  heightOfInterval(rbt, rootGet(rbt), lhs, rhs);
-let rec firstVisibleNode = (node, offset) =>
-  switch (node) {
-  | None => None
-  | Some(node) =>
-    if (sumGet(node) <= offset) {
-      None;
-    } else {
-      let nodeHeight = heightGet(node);
-      let sumLeft =
-        switch (leftGet(node)) {
-        | None => 0.0
-        | Some(left) => sumGet(left)
-        };
-      if (sumLeft > offset) {
-        firstVisibleNode(leftGet(node), offset);
-      } else if (sumLeft +. nodeHeight > offset) {
-        Some(node);
-      } else {
-        firstVisibleNode(rightGet(node), offset -. (sumLeft +. nodeHeight));
-      };
-    }
-  };
-let lastVisibleNode = (node, offset) =>
-  switch (firstVisibleNode(node, offset)) {
-  | None => maxNode(node)
-  | first => first
-  };
-let firstVisible = (rbt, ~offset) =>
-  switch (firstVisibleNode(rootGet(rbt), offset)) {
-  | None => None
-  | Some(node) => Some(valueGet(node))
-  };
-let rec leftmost = node =>
-  switch (leftGet(node)) {
-  | None => node
-  | Some(node) => leftmost(node)
-  };
-let rec firstRightParent = node =>
-  switch (parentGet(node)) {
-  | None => None
-  | Some(parent) =>
-    if (isLeft(node)) {
-      Some(parent);
-    } else {
-      firstRightParent(parent);
-    }
-  };
-let nextNode = node =>
-  switch (rightGet(node)) {
-  | None => firstRightParent(node)
-  | Some(right) => Some(leftmost(right))
-  };
-let rec sumLeftSpine = (node, ~fromRightChild) => {
-  let leftSpine =
-    switch (leftGet(node)) {
-    | None => heightGet(node)
-    | Some(left) =>
-      if (fromRightChild) {
-        heightGet(node) +. sumGet(left);
-      } else {
-        0.0;
-      }
-    };
-  switch (parentGet(node)) {
-  | None => leftSpine
-  | Some(parent) =>
-    leftSpine
-    +. sumLeftSpine(parent, ~fromRightChild=rightGet(parent) === Some(node))
-  };
-};
-let getY = node =>
-  sumLeftSpine(node, ~fromRightChild=true) -. heightGet(node);
-let linearSearch = (rbt, callback) => {
-  let rec find = (node, callback) =>
-    if (Js.Internal.fn_run1(callback, valueGet(node))) {
-      Some(valueGet(node));
-    } else {
-      switch (nextNode(node)) {
-      | None => None
-      | Some(node) => find(node, callback)
-      };
-    };
-  switch (minNode(rootGet(rbt))) {
-  | None => None
-  | Some(node) => find(node, callback)
-  };
-};
-let rec iterate = (~inclusive, firstNode, lastNode, ~callback) =>
-  switch (firstNode) {
-  | None => ()
-  | Some(node) =>
-    if (inclusive) {
-      Js.Internal.fn_run1(callback, node);
-    };
-    if (firstNode !== lastNode) {
-      if (!inclusive) {
-        Js.Internal.fn_run1(callback, node);
-      };
-      iterate(~inclusive, nextNode(node), lastNode, ~callback);
-    };
-  };
-let rec iterateWithY = (~y=?, ~inclusive, firstNode, lastNode, ~callback) =>
-  switch (firstNode) {
-  | None => ()
-  | Some(node) =>
-    let y =
-      switch (y) {
-      | None => getY(node)
-      | Some(y) => y
-      };
-    if (inclusive) {
-      Js.Internal.fn_run2(callback, node, y);
-    };
-    if (firstNode !== lastNode) {
-      if (!inclusive) {
-        Js.Internal.fn_run2(callback, node, y);
-      };
-      iterateWithY(
-        ~y=y +. heightGet(node),
-        ~inclusive,
-        nextNode(node),
-        lastNode,
-        ~callback,
-      );
-    };
-  };
-let rec updateSum = (node, ~delta) =>
-  switch (node) {
-  | None => ()
-  | Some(node) =>
-    sumSet(node, sumGet(node) +. delta);
-    updateSum(parentGet(node), ~delta);
-  };
-let setHeight = (rbt, value, ~height) =>
-  switch (_findNode(rbt, rootGet(rbt), value)) {
-  | None => ()
-  | Some(node) =>
-    let delta = height -. heightGet(node);
-    heightSet(node, height);
-    updateSum(Some(node), ~delta);
-  };
-type nonrec oldNewVisibleNodes('value) = {
-  mutable old: array('value),
-  mutable new_: array('value),
-};
diff --git a/jscomp/syntax/tests/parsing/infiniteLoops/polymorphicVariantType.res b/jscomp/syntax/tests/parsing/infiniteLoops/polymorphicVariantType.res
deleted file mode 100644
index fbc3245..0000000
--- a/jscomp/syntax/tests/parsing/infiniteLoops/polymorphicVariantType.res
+++ /dev/null
@@ -1 +0,0 @@
-type x = [<y>
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/infiniteLoops/templateEof.res b/jscomp/syntax/tests/parsing/infiniteLoops/templateEof.res
deleted file mode 100644
index 1f8ee7c..0000000
--- a/jscomp/syntax/tests/parsing/infiniteLoops/templateEof.res
+++ /dev/null
@@ -1,3 +0,0 @@
-et foo = x =>
-  switch x {
-  | `${
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/other/attributes.res b/jscomp/syntax/tests/parsing/other/attributes.res
deleted file mode 100644
index 5c83f38..0000000
--- a/jscomp/syntax/tests/parsing/other/attributes.res
+++ /dev/null
@@ -1,16 +0,0 @@
-@attr(: int)
-let x = 1
-
-@attr(?var)
-let x = 1
-
-@attr(?var when x === 1)
-let x = 1
-
-%ext(: let x: int)
-%ext(:
-  let x: int
-  let y: float
-) 
-
-%%ext("A"; "B")
diff --git a/jscomp/syntax/tests/parsing/other/comments.res b/jscomp/syntax/tests/parsing/other/comments.res
deleted file mode 100644
index e5999a3..0000000
--- a/jscomp/syntax/tests/parsing/other/comments.res
+++ /dev/null
@@ -1,4 +0,0 @@
-/* nested /* comments */ */
-
-/* lvl 0 /* lvl 1 /* lvl 2 */ */ */
-let x = 1
diff --git a/jscomp/syntax/tests/parsing/other/docComments.res b/jscomp/syntax/tests/parsing/other/docComments.res
deleted file mode 100644
index 793f598..0000000
--- a/jscomp/syntax/tests/parsing/other/docComments.res
+++ /dev/null
@@ -1,21 +0,0 @@
-/*** This is a module comment */
-
-/*** This is another module comment */
-
-/** This is a doc ✅ comment */
-let z = 34
-
-@@res.doc("And this is a res.doc module annotation")
-
-@res.doc("And this is a res.doc ✅ annotation")
-let q = 11
-
-/** This
-  * is a multi-line
-  multiline doc comment
-  */
-type h = int
-
-type pathItem = {}
-/** Issue 6844: doc comment before "and" */
-and operation =  {}
diff --git a/jscomp/syntax/tests/parsing/other/emptyFile.res b/jscomp/syntax/tests/parsing/other/emptyFile.res
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/syntax/tests/parsing/other/emptyInterface.resi b/jscomp/syntax/tests/parsing/other/emptyInterface.resi
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/syntax/tests/parsing/other/expected/attributes.res.txt b/jscomp/syntax/tests/parsing/other/expected/attributes.res.txt
deleted file mode 100644
index d4aa3e7..0000000
--- a/jscomp/syntax/tests/parsing/other/expected/attributes.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-let x = 1[@@attr :int]
-let x = 1[@@attr ?var]
-let x = 1[@@attr ?var when x == 1]
-;;[%ext :val x : int]
-;;[%ext :val x : int
-    val y : float]
-[%%ext ;;{js|A|js}
-  ;;{js|B|js}]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/other/expected/comments.res.txt b/jscomp/syntax/tests/parsing/other/expected/comments.res.txt
deleted file mode 100644
index 3b0c826..0000000
--- a/jscomp/syntax/tests/parsing/other/expected/comments.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-let x = 1
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/other/expected/docComments.res.txt b/jscomp/syntax/tests/parsing/other/expected/docComments.res.txt
deleted file mode 100644
index 004126c..0000000
--- a/jscomp/syntax/tests/parsing/other/expected/docComments.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-[@@@res.doc " This is a module comment "]
-[@@@res.doc " This is another module comment "]
-let z = 34[@@res.doc " This is a doc \226\156\133 comment "]
-[@@@res.doc {js|And this is a res.doc module annotation|js}]
-let q = 11[@@res.doc {js|And this is a res.doc ✅ annotation|js}]
-type nonrec h = int[@@res.doc
-                     " This\n  * is a multi-line\n  multiline doc comment\n  "]
-type nonrec pathItem = {
-  }
-and operation = {
-  }[@@res.doc " Issue 6844: doc comment before \"and\" "]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/other/expected/emptyFile.res.txt b/jscomp/syntax/tests/parsing/other/expected/emptyFile.res.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/syntax/tests/parsing/other/expected/emptyInterface.resi.txt b/jscomp/syntax/tests/parsing/other/expected/emptyInterface.resi.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/syntax/tests/parsing/other/expected/gentype.res.txt b/jscomp/syntax/tests/parsing/other/expected/gentype.res.txt
deleted file mode 100644
index c1f02ad..0000000
--- a/jscomp/syntax/tests/parsing/other/expected/gentype.res.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-  Syntax error!
-  tests/parsing/other/gentype.res:1:12-2:8
-
-  1 │ module M: {
-  2 │   export type t = int
-  3 │   export x: int
-  4 │ } = {
-
-  Did you forget a `}` here?
-
-
-  Syntax error!
-  tests/parsing/other/gentype.res:2:9-13
-
-  1 │ module M: {
-  2 │   export type t = int
-  3 │   export x: int
-  4 │ } = {
-
-  consecutive statements on a line must be separated by ';' or a newline
-
diff --git a/jscomp/syntax/tests/parsing/other/expected/list.res.txt b/jscomp/syntax/tests/parsing/other/expected/list.res.txt
deleted file mode 100644
index 0283da1..0000000
--- a/jscomp/syntax/tests/parsing/other/expected/list.res.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-let list = x
-let x = list + list
-let f = Foo.list
-let x = list.list
-let y = Ok.Bar.list
-;;list a b
-;;list.list <- list
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/other/expected/onlyMultilineComment.res.txt b/jscomp/syntax/tests/parsing/other/expected/onlyMultilineComment.res.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/syntax/tests/parsing/other/expected/onlyMultilineComment.resi.txt b/jscomp/syntax/tests/parsing/other/expected/onlyMultilineComment.resi.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/syntax/tests/parsing/other/expected/onlySinglelineComment.res.txt b/jscomp/syntax/tests/parsing/other/expected/onlySinglelineComment.res.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/syntax/tests/parsing/other/expected/onlySinglinelineComment.resi.txt b/jscomp/syntax/tests/parsing/other/expected/onlySinglinelineComment.resi.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/syntax/tests/parsing/other/expected/semi.res.txt b/jscomp/syntax/tests/parsing/other/expected/semi.res.txt
deleted file mode 100644
index 79c6f19..0000000
--- a/jscomp/syntax/tests/parsing/other/expected/semi.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-type nonrec t =
-  | Red 
-;;Red
-;;foo := 1
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/other/expected/singleLineCommentWithoutNewline.res.txt b/jscomp/syntax/tests/parsing/other/expected/singleLineCommentWithoutNewline.res.txt
deleted file mode 100644
index af7fe8e..0000000
--- a/jscomp/syntax/tests/parsing/other/expected/singleLineCommentWithoutNewline.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-;;RootView.init ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/other/expected/stringLiterals.res.txt b/jscomp/syntax/tests/parsing/other/expected/stringLiterals.res.txt
deleted file mode 100644
index 19fcd7d..0000000
--- a/jscomp/syntax/tests/parsing/other/expected/stringLiterals.res.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-let s = {js|some unicode é £ |js}
-let s = (({js|foo|js})[@res.template ])
-let s =
-  (((((({js|foo |js})[@res.template ]) ^ bar)[@res.template ]) ^
-      (({js| baz|js})[@res.template ]))
-  [@res.template ])
-let s =
-  (((((({js|some unicode é |js})[@res.template ]) ^ bar)[@res.template ]) ^
-      (({js| £ |js})[@res.template ]))
-  [@res.template ])
-let s = ((x [|(({js|foo|js})[@res.template ])|] [||])[@res.taggedTemplate ])
-let s =
-  ((x [|(({js|foo |js})[@res.template ]);(({js| baz|js})[@res.template ])|]
-      [|bar|])
-  [@res.taggedTemplate ])
-let s =
-  ((x
-      [|(({js|some unicode é |js})[@res.template ]);(({js| £ |js})
-        [@res.template ])|] [|bar|])
-  [@res.taggedTemplate ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/other/gentype.res b/jscomp/syntax/tests/parsing/other/gentype.res
deleted file mode 100644
index f460a70..0000000
--- a/jscomp/syntax/tests/parsing/other/gentype.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module M: {
-  export type t = int
-  export x: int
-} = {
-  type t = int
-  let x = 34
-}
diff --git a/jscomp/syntax/tests/parsing/other/list.res b/jscomp/syntax/tests/parsing/other/list.res
deleted file mode 100644
index 7baf08a..0000000
--- a/jscomp/syntax/tests/parsing/other/list.res
+++ /dev/null
@@ -1,13 +0,0 @@
-let list = x
-
-let x = list + list
-
-let f = Foo.list
-
-let x = list.list
-
-let y = Ok.Bar.list
-
-list(a, b)
-
-list.list = list
diff --git a/jscomp/syntax/tests/parsing/other/onlyMultilineComment.res b/jscomp/syntax/tests/parsing/other/onlyMultilineComment.res
deleted file mode 100644
index 7c28977..0000000
--- a/jscomp/syntax/tests/parsing/other/onlyMultilineComment.res
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * one comment
- * here
- */
diff --git a/jscomp/syntax/tests/parsing/other/onlyMultilineComment.resi b/jscomp/syntax/tests/parsing/other/onlyMultilineComment.resi
deleted file mode 100644
index 33f901f..0000000
--- a/jscomp/syntax/tests/parsing/other/onlyMultilineComment.resi
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * multi
- * line
- * comment
- */
diff --git a/jscomp/syntax/tests/parsing/other/onlySinglelineComment.res b/jscomp/syntax/tests/parsing/other/onlySinglelineComment.res
deleted file mode 100644
index 0392380..0000000
--- a/jscomp/syntax/tests/parsing/other/onlySinglelineComment.res
+++ /dev/null
@@ -1 +0,0 @@
-// one single-line comment
diff --git a/jscomp/syntax/tests/parsing/other/onlySinglinelineComment.resi b/jscomp/syntax/tests/parsing/other/onlySinglinelineComment.resi
deleted file mode 100644
index 0392380..0000000
--- a/jscomp/syntax/tests/parsing/other/onlySinglinelineComment.resi
+++ /dev/null
@@ -1 +0,0 @@
-// one single-line comment
diff --git a/jscomp/syntax/tests/parsing/other/semi.res b/jscomp/syntax/tests/parsing/other/semi.res
deleted file mode 100644
index ca752a3..0000000
--- a/jscomp/syntax/tests/parsing/other/semi.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type t = Red
-Red
-(foo) := 1
diff --git a/jscomp/syntax/tests/parsing/other/singleLineCommentWithoutNewline.res b/jscomp/syntax/tests/parsing/other/singleLineCommentWithoutNewline.res
deleted file mode 100644
index e21a8ac..0000000
--- a/jscomp/syntax/tests/parsing/other/singleLineCommentWithoutNewline.res
+++ /dev/null
@@ -1,3 +0,0 @@
-RootView.init()
-
-//int
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/other/stringLiterals.res b/jscomp/syntax/tests/parsing/other/stringLiterals.res
deleted file mode 100644
index b54010b..0000000
--- a/jscomp/syntax/tests/parsing/other/stringLiterals.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let s = "some unicode é £ "
-let s = `foo`
-let s = `foo ${bar} baz`
-let s = `some unicode é ${bar} £ `
-let s = x`foo`
-let s = x`foo ${bar} baz`
-let s = x`some unicode é ${bar} £ `
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/comments/eof.res b/jscomp/syntax/tests/parsing/recovery/comments/eof.res
deleted file mode 100644
index affb97f..0000000
--- a/jscomp/syntax/tests/parsing/recovery/comments/eof.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = 1
-/* eof
diff --git a/jscomp/syntax/tests/parsing/recovery/comments/expected/eof.res.txt b/jscomp/syntax/tests/parsing/recovery/comments/expected/eof.res.txt
deleted file mode 100644
index 807c21f..0000000
--- a/jscomp/syntax/tests/parsing/recovery/comments/expected/eof.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/comments/eof.res:2:1-3:0
-
-  1 │ let x = 1
-  2 │ /* eof
-  3 │ 
-
-  This comment seems to be missing a closing `*/`
-
-let x = 1
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/expression/emptyBlock.res b/jscomp/syntax/tests/parsing/recovery/expression/emptyBlock.res
deleted file mode 100644
index d01edaf..0000000
--- a/jscomp/syntax/tests/parsing/recovery/expression/emptyBlock.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let x = {}
-
-let f = (a, b) => {}
diff --git a/jscomp/syntax/tests/parsing/recovery/expression/expected/emptyBlock.res.txt b/jscomp/syntax/tests/parsing/recovery/expression/expected/emptyBlock.res.txt
deleted file mode 100644
index 36cfe2e..0000000
--- a/jscomp/syntax/tests/parsing/recovery/expression/expected/emptyBlock.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = {  }
-let f a b = {  }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/expression/expected/if.res.txt b/jscomp/syntax/tests/parsing/recovery/expression/expected/if.res.txt
deleted file mode 100644
index 3e4d5bc..0000000
--- a/jscomp/syntax/tests/parsing/recovery/expression/expected/if.res.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/expression/if.res:1:16-18
-
-  1 │ if (foo == bar) Js.log("if-branch") else Js.log("else-branch")
-  2 │ 
-
-  Did you forget a `{` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/expression/if.res:1:41-43
-
-  1 │ if (foo == bar) Js.log("if-branch") else Js.log("else-branch")
-  2 │ 
-
-  Did you forget a `{` here?
-
-;;if foo = bar then Js.log {js|if-branch|js} else Js.log {js|else-branch|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/expression/expected/infinite.res.txt b/jscomp/syntax/tests/parsing/recovery/expression/expected/infinite.res.txt
deleted file mode 100644
index ae2bb48..0000000
--- a/jscomp/syntax/tests/parsing/recovery/expression/expected/infinite.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-let smallest = ((heap.compare ())[@res.uapp ]) < (a |. (f b))
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/expression/expected/jsx.res.txt b/jscomp/syntax/tests/parsing/recovery/expression/expected/jsx.res.txt
deleted file mode 100644
index 428af6e..0000000
--- a/jscomp/syntax/tests/parsing/recovery/expression/expected/jsx.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/expression/jsx.res:1:14
-
-  1 │ let x = <div @ @@@ />
-  2 │ 
-
-  I'm not sure what to parse here when looking at "@".
-
-let x = ((div ~children:[] ())[@JSX ])
-[@@@ ]
-;;[%rescript.exprhole ][@@ ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/expression/expected/list.res.txt b/jscomp/syntax/tests/parsing/recovery/expression/expected/list.res.txt
deleted file mode 100644
index 2032ee0..0000000
--- a/jscomp/syntax/tests/parsing/recovery/expression/expected/list.res.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/expression/list.res:6:26-28
-
-  4 ┆ let rec loop = (items) => {
-  5 ┆   switch(items) {
-  6 ┆     | ["-pp", _ppFlag, ...rest] => loop(rest)
-  7 ┆     | [x, ...rest] => [x, ...loop(rest)]
-  8 ┆     | [] => []
-
-  Array's `...` spread is not supported in pattern matches.
-Explanation: such spread would create a subarray; out of performance concern, our pattern matching currently guarantees to never create new intermediate data.
-Solution: if it's to validate the first few elements, use a `when` clause + Array size check + `get` checks on the current pattern. If it's to obtain a subarray, use `Array.sub` or `Belt.Array.slice`.
-
-
-  Syntax error!
-  tests/parsing/recovery/expression/list.res:7:13-15
-
-  5 ┆ switch(items) {
-  6 ┆   | ["-pp", _ppFlag, ...rest] => loop(rest)
-  7 ┆   | [x, ...rest] => [x, ...loop(rest)]
-  8 ┆   | [] => []
-  9 ┆ }
-
-  Array's `...` spread is not supported in pattern matches.
-Explanation: such spread would create a subarray; out of performance concern, our pattern matching currently guarantees to never create new intermediate data.
-Solution: if it's to validate the first few elements, use a `when` clause + Array size check + `get` checks on the current pattern. If it's to obtain a subarray, use `Array.sub` or `Belt.Array.slice`.
-
-let flags =
-  ((if reasonFormat
-    then
-      ((let parts = Utils.split_on_char ' ' flags in
-        let rec loop items =
-          ((match items with
-            | [|{js|-pp|js};_ppFlag;rest|] -> loop rest
-            | [|x;rest|] ->
-                ((Belt.Array.concatMany)[@res.spread ]) [|[|x|];(loop rest)|]
-            | [||] -> [||])
-          [@res.braces ]) in
-        (loop parts) |> (String.concat {js| |js}))
-      [@res.braces ])
-    else flags)
-  [@res.ternary ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/expression/if.res b/jscomp/syntax/tests/parsing/recovery/expression/if.res
deleted file mode 100644
index caef139..0000000
--- a/jscomp/syntax/tests/parsing/recovery/expression/if.res
+++ /dev/null
@@ -1 +0,0 @@
-if (foo == bar) Js.log("if-branch") else Js.log("else-branch")
diff --git a/jscomp/syntax/tests/parsing/recovery/expression/infinite.res b/jscomp/syntax/tests/parsing/recovery/expression/infinite.res
deleted file mode 100644
index 3546a7c..0000000
--- a/jscomp/syntax/tests/parsing/recovery/expression/infinite.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let smallest =
-  heap.compare(.) < a->f(b)
diff --git a/jscomp/syntax/tests/parsing/recovery/expression/jsx.res b/jscomp/syntax/tests/parsing/recovery/expression/jsx.res
deleted file mode 100644
index c20ee24..0000000
--- a/jscomp/syntax/tests/parsing/recovery/expression/jsx.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = <div @ @@@ />
diff --git a/jscomp/syntax/tests/parsing/recovery/expression/list.res b/jscomp/syntax/tests/parsing/recovery/expression/list.res
deleted file mode 100644
index f66520b..0000000
--- a/jscomp/syntax/tests/parsing/recovery/expression/list.res
+++ /dev/null
@@ -1,12 +0,0 @@
-// ocaml style list with array syntax
-let flags = reasonFormat ? {
-  let parts = Utils.split_on_char(' ', flags)
-  let rec loop = (items) => {
-    switch(items) {
-      | ["-pp", _ppFlag, ...rest] => loop(rest)
-      | [x, ...rest] => [x, ...loop(rest)]
-      | [] => []
-    }
-  };
-  loop(parts) |> String.concat(" ")
-} : flags
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/array.res b/jscomp/syntax/tests/parsing/recovery/pattern/array.res
deleted file mode 100644
index d529baf..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/array.res
+++ /dev/null
@@ -1,4 +0,0 @@
-switch x {
-| [a, b => ()
-| [a, [c, d => ()
-}
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/constrained.res b/jscomp/syntax/tests/parsing/recovery/pattern/constrained.res
deleted file mode 100644
index 4cc57ab..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/constrained.res
+++ /dev/null
@@ -1,4 +0,0 @@
-switch x {
-| (a : int => ()
-  // note that this is not ideal: | (a: int => unit) => exprhole
-}
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/constructor.res b/jscomp/syntax/tests/parsing/recovery/pattern/constructor.res
deleted file mode 100644
index 5c95af4..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/constructor.res
+++ /dev/null
@@ -1,5 +0,0 @@
-switch x {
-| Rgb(r, g, b => ()
-| Rgb(r, g, Color(a, b => ()
-| Rgb(r, g, list{1, 2 => ()
-}
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/expected/array.res.txt b/jscomp/syntax/tests/parsing/recovery/pattern/expected/array.res.txt
deleted file mode 100644
index b568b06..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/expected/array.res.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/pattern/array.res:2:8-10
-
-  1 │ switch x {
-  2 │ | [a, b => ()
-  3 │ | [a, [c, d => ()
-  4 │ }
-
-  Did you forget a `]` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/array.res:3:12-14
-
-  1 │ switch x {
-  2 │ | [a, b => ()
-  3 │ | [a, [c, d => ()
-  4 │ }
-  5 │ 
-
-  Did you forget a `]` here?
-
-;;match x with | [|a;b|] -> () | [|a;[|c;d|]|] -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/expected/constrained.res.txt b/jscomp/syntax/tests/parsing/recovery/pattern/expected/constrained.res.txt
deleted file mode 100644
index 521c657..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/expected/constrained.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/pattern/constrained.res:2:17-4:1
-
-  1 │ switch x {
-  2 │ | (a : int => ()
-  3 │   // note that this is not ideal: | (a: int => unit) => exprhole
-  4 │ }
-  5 │ 
-
-  Did you forget a `)` here?
-
-;;match x with | (a : int -> unit) -> [%rescript.exprhole ]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/expected/constructor.res.txt b/jscomp/syntax/tests/parsing/recovery/pattern/expected/constructor.res.txt
deleted file mode 100644
index 7883178..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/expected/constructor.res.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/pattern/constructor.res:2:14-16
-
-  1 │ switch x {
-  2 │ | Rgb(r, g, b => ()
-  3 │ | Rgb(r, g, Color(a, b => ()
-  4 │ | Rgb(r, g, list{1, 2 => ()
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/constructor.res:3:23-25
-
-  1 │ switch x {
-  2 │ | Rgb(r, g, b => ()
-  3 │ | Rgb(r, g, Color(a, b => ()
-  4 │ | Rgb(r, g, list{1, 2 => ()
-  5 │ }
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/constructor.res:4:22-24
-
-  2 │ | Rgb(r, g, b => ()
-  3 │ | Rgb(r, g, Color(a, b => ()
-  4 │ | Rgb(r, g, list{1, 2 => ()
-  5 │ }
-  6 │ 
-
-  Did you forget a `}` here?
-
-;;match x with
-  | Rgb (r, g, b) -> ()
-  | Rgb (r, g, Color (a, b)) -> ()
-  | Rgb (r, g, 1::2::[]) -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/expected/list.res.txt b/jscomp/syntax/tests/parsing/recovery/pattern/expected/list.res.txt
deleted file mode 100644
index a34e205..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/expected/list.res.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/pattern/list.res:3:17-19
-
-  1 │ switch x {
-  2 │ | list{} => ()
-  3 │ | list{1, list{} => ()
-  4 │ | list{}...1, ...list{3, 4} => ()
-  5 │ }
-
-  Did you forget a `}` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/list.res:4:9-11
-
-  2 │ | list{} => ()
-  3 │ | list{1, list{} => ()
-  4 │ | list{}...1, ...list{3, 4} => ()
-  5 │ }
-  6 │ 
-
-  Did you forget a `=>` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/list.res:4:13
-
-  2 │ | list{} => ()
-  3 │ | list{1, list{} => ()
-  4 │ | list{}...1, ...list{3, 4} => ()
-  5 │ }
-  6 │ 
-
-  I'm not sure what to parse here when looking at ",".
-
-;;match x with | [] -> () | 1::[]::[] -> () | [] -> 1
-;;[3; 4]
-;;()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/expected/parenthesized.res.txt b/jscomp/syntax/tests/parsing/recovery/pattern/expected/parenthesized.res.txt
deleted file mode 100644
index d083dae..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/expected/parenthesized.res.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/pattern/parenthesized.res:2:5-8
-
-  1 │ switch x {
-  2 │ | (a  => ()
-  3 │ | ([a, b => ()
-  4 │ | ({a, ...b => ()
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/parenthesized.res:3:9-11
-
-  1 │ switch x {
-  2 │ | (a  => ()
-  3 │ | ([a, b => ()
-  4 │ | ({a, ...b => ()
-  5 │ | (list{1, => ()
-
-  Did you forget a `]` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/parenthesized.res:4:12-14
-
-  2 │ | (a  => ()
-  3 │ | ([a, b => ()
-  4 │ | ({a, ...b => ()
-  5 │ | (list{1, => ()
-  6 │ | ((1, 2 => ()
-
-  Did you forget a `}` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/parenthesized.res:5:11-13
-
-  3 │ | ([a, b => ()
-  4 │ | ({a, ...b => ()
-  5 │ | (list{1, => ()
-  6 │ | ((1, 2 => ()
-  7 │ }
-
-  Did you forget a `}` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/parenthesized.res:6:9-11
-
-  4 │ | ({a, ...b => ()
-  5 │ | (list{1, => ()
-  6 │ | ((1, 2 => ()
-  7 │ }
-  8 │ 
-
-  Did you forget a `)` here?
-
-;;match x with
-  | a -> ()
-  | [|a;b|] -> ()
-  | { a; b } -> ()
-  | 1::[] -> ()
-  | (1, 2) -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/expected/polyvariant.res.txt b/jscomp/syntax/tests/parsing/recovery/pattern/expected/polyvariant.res.txt
deleted file mode 100644
index 575529a..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/expected/polyvariant.res.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/pattern/polyvariant.res:2:15-17
-
-  1 │ switch x {
-  2 │ | #Rgb(r, g, b => ()
-  3 │ | #Rgb(r, g, Color(a, b => ()
-  4 │ | #Rgb(r, g, list{1, 2 => ()
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/polyvariant.res:3:24-26
-
-  1 │ switch x {
-  2 │ | #Rgb(r, g, b => ()
-  3 │ | #Rgb(r, g, Color(a, b => ()
-  4 │ | #Rgb(r, g, list{1, 2 => ()
-  5 │ }
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/polyvariant.res:4:23-25
-
-  2 │ | #Rgb(r, g, b => ()
-  3 │ | #Rgb(r, g, Color(a, b => ()
-  4 │ | #Rgb(r, g, list{1, 2 => ()
-  5 │ }
-  6 │ 
-
-  Did you forget a `}` here?
-
-;;match x with
-  | `Rgb (r, g, b) -> ()
-  | `Rgb (r, g, Color (a, b)) -> ()
-  | `Rgb (r, g, 1::2::[]) -> ()
-;;match x with | `a () -> () | `a () -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/expected/record.res.txt b/jscomp/syntax/tests/parsing/recovery/pattern/expected/record.res.txt
deleted file mode 100644
index b2f9135..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/expected/record.res.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/pattern/record.res:2:15-17
-
-  1 │ switch x {
-  2 │ | {a, b: {x, y => ()
-  3 │ | {...x, y} => ()
-  4 │ | {a, _, b} => ()
-
-  Did you forget a `}` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/record.res:3:7-14
-
-  1 │ switch x {
-  2 │ | {a, b: {x, y => ()
-  3 │ | {...x, y} => ()
-  4 │ | {a, _, b} => ()
-  5 │ }
-
-  Record's `...` spread is not supported in pattern matches.
-Explanation: you can't collect a subset of a record's field into its own record, since a record needs an explicit declaration and that subset wouldn't have one.
-Solution: you need to pull out each field you want explicitly.
-
-;;match x with | { a; b = { x; y } } -> () | { x; y } -> () | { a; b } -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/expected/tuple.res.txt b/jscomp/syntax/tests/parsing/recovery/pattern/expected/tuple.res.txt
deleted file mode 100644
index 6f05e78..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/expected/tuple.res.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/pattern/tuple.res:2:5-7
-
-  1 │ switch x {
-  2 │ | (a => ()
-  3 │ | (a, (b, c) => ()
-  4 │ | (a, (b, c => ()
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/tuple.res:3:13-15
-
-  1 │ switch x {
-  2 │ | (a => ()
-  3 │ | (a, (b, c) => ()
-  4 │ | (a, (b, c => ()
-  5 │ }
-
-  Did you forget a `)` here?
-
-
-  Syntax error!
-  tests/parsing/recovery/pattern/tuple.res:4:12-14
-
-  2 │ | (a => ()
-  3 │ | (a, (b, c) => ()
-  4 │ | (a, (b, c => ()
-  5 │ }
-  6 │ 
-
-  Did you forget a `)` here?
-
-;;match x with | a -> () | (a, (b, c)) -> () | (a, (b, c)) -> ()
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/list.res b/jscomp/syntax/tests/parsing/recovery/pattern/list.res
deleted file mode 100644
index 37cc434..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/list.res
+++ /dev/null
@@ -1,5 +0,0 @@
-switch x {
-| list{} => ()
-| list{1, list{} => ()
-| list{}...1, ...list{3, 4} => ()
-}
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/parenthesized.res b/jscomp/syntax/tests/parsing/recovery/pattern/parenthesized.res
deleted file mode 100644
index b3ee9a2..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/parenthesized.res
+++ /dev/null
@@ -1,7 +0,0 @@
-switch x {
-| (a  => ()
-| ([a, b => ()
-| ({a, ...b => ()
-| (list{1, => ()
-| ((1, 2 => ()
-}
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/polyvariant.res b/jscomp/syntax/tests/parsing/recovery/pattern/polyvariant.res
deleted file mode 100644
index a69a47f..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/polyvariant.res
+++ /dev/null
@@ -1,10 +0,0 @@
-switch x {
-| #Rgb(r, g, b => ()
-| #Rgb(r, g, Color(a, b => ()
-| #Rgb(r, g, list{1, 2 => ()
-}
-
-switch x {
-| #a(()) => ()
-| #a() => ()
-}
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/record.res b/jscomp/syntax/tests/parsing/recovery/pattern/record.res
deleted file mode 100644
index 5ba174e..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/record.res
+++ /dev/null
@@ -1,5 +0,0 @@
-switch x {
-| {a, b: {x, y => ()
-| {...x, y} => ()
-| {a, _, b} => ()
-}
diff --git a/jscomp/syntax/tests/parsing/recovery/pattern/tuple.res b/jscomp/syntax/tests/parsing/recovery/pattern/tuple.res
deleted file mode 100644
index 5d0ba52..0000000
--- a/jscomp/syntax/tests/parsing/recovery/pattern/tuple.res
+++ /dev/null
@@ -1,5 +0,0 @@
-switch x {
-| (a => ()
-| (a, (b, c) => ()
-| (a, (b, c => ()
-}
diff --git a/jscomp/syntax/tests/parsing/recovery/string/emptyeof.res b/jscomp/syntax/tests/parsing/recovery/string/emptyeof.res
deleted file mode 100644
index 1e8f45d..0000000
--- a/jscomp/syntax/tests/parsing/recovery/string/emptyeof.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = "
diff --git a/jscomp/syntax/tests/parsing/recovery/string/eof.res b/jscomp/syntax/tests/parsing/recovery/string/eof.res
deleted file mode 100644
index 50c3fe9..0000000
--- a/jscomp/syntax/tests/parsing/recovery/string/eof.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = "eof here
diff --git a/jscomp/syntax/tests/parsing/recovery/string/es6template.res b/jscomp/syntax/tests/parsing/recovery/string/es6template.res
deleted file mode 100644
index 22d71a9..0000000
--- a/jscomp/syntax/tests/parsing/recovery/string/es6template.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = `this contains ${foo}, missing closing
diff --git a/jscomp/syntax/tests/parsing/recovery/string/expected/emptyeof.res.txt b/jscomp/syntax/tests/parsing/recovery/string/expected/emptyeof.res.txt
deleted file mode 100644
index 62f60c7..0000000
--- a/jscomp/syntax/tests/parsing/recovery/string/expected/emptyeof.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/string/emptyeof.res:1:9-2:0
-
-  1 │ let x = "
-  2 │ 
-
-  This string is missing a double quote at the end
-
-let x = {js|
-|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/string/expected/eof.res.txt b/jscomp/syntax/tests/parsing/recovery/string/expected/eof.res.txt
deleted file mode 100644
index 3faafc6..0000000
--- a/jscomp/syntax/tests/parsing/recovery/string/expected/eof.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/string/eof.res:1:9-2:0
-
-  1 │ let x = "eof here
-  2 │ 
-
-  This string is missing a double quote at the end
-
-let x = {js|eof here
-|js}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/string/expected/es6template.res.txt b/jscomp/syntax/tests/parsing/recovery/string/expected/es6template.res.txt
deleted file mode 100644
index 858d46e..0000000
--- a/jscomp/syntax/tests/parsing/recovery/string/expected/es6template.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/string/es6template.res:1:30-2:0
-
-  1 │ let x = `this contains ${foo}, missing closing
-  2 │ 
-
-  Did you forget to close this template expression with a backtick?
-
-let x =
-  (((((({js|this contains |js})[@res.template ]) ^ foo)[@res.template ]) ^
-      (({js|, missing closing|js})[@res.template ]))
-  [@res.template ])
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/string/expected/unclosed.res.txt b/jscomp/syntax/tests/parsing/recovery/string/expected/unclosed.res.txt
deleted file mode 100644
index 793509c..0000000
--- a/jscomp/syntax/tests/parsing/recovery/string/expected/unclosed.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-let x = {js|unclosed|js}
-let y = 1
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/string/unclosed.res b/jscomp/syntax/tests/parsing/recovery/string/unclosed.res
deleted file mode 100644
index 9f661de..0000000
--- a/jscomp/syntax/tests/parsing/recovery/string/unclosed.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let x = "unclosed"
-
-let y = 1
diff --git a/jscomp/syntax/tests/parsing/recovery/structure/expected/letBinding.res.txt b/jscomp/syntax/tests/parsing/recovery/structure/expected/letBinding.res.txt
deleted file mode 100644
index 2f07041..0000000
--- a/jscomp/syntax/tests/parsing/recovery/structure/expected/letBinding.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/structure/letBinding.res:1:8-9
-
-  1 │ let x = = doStuff(y)
-  2 │ 
-
-  This let-binding misses an expression
-
-let x = doStuff y
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/structure/letBinding.res b/jscomp/syntax/tests/parsing/recovery/structure/letBinding.res
deleted file mode 100644
index c32a4c7..0000000
--- a/jscomp/syntax/tests/parsing/recovery/structure/letBinding.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = = doStuff(y)
diff --git a/jscomp/syntax/tests/parsing/recovery/typeDef/expected/typeParams.res.txt b/jscomp/syntax/tests/parsing/recovery/typeDef/expected/typeParams.res.txt
deleted file mode 100644
index c1793a3..0000000
--- a/jscomp/syntax/tests/parsing/recovery/typeDef/expected/typeParams.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/typeDef/typeParams.res:1:10-13
-
-  1 │ type node('a) = {
-  2 │   _value: Js.Nullable.value<'a>
-  3 │ }
-
-  Type parameters require angle brackets:
-  node<'a>
-
-type nonrec 'a node = {
-  _value: 'a Js.Nullable.value }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/typeDef/typeParams.res b/jscomp/syntax/tests/parsing/recovery/typeDef/typeParams.res
deleted file mode 100644
index a542c47..0000000
--- a/jscomp/syntax/tests/parsing/recovery/typeDef/typeParams.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type node('a) = {
-  _value: Js.Nullable.value<'a>
-}
diff --git a/jscomp/syntax/tests/parsing/recovery/typexpr/expected/typeConstructorArgs.res.txt b/jscomp/syntax/tests/parsing/recovery/typexpr/expected/typeConstructorArgs.res.txt
deleted file mode 100644
index 21f53aa..0000000
--- a/jscomp/syntax/tests/parsing/recovery/typexpr/expected/typeConstructorArgs.res.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-  Syntax error!
-  tests/parsing/recovery/typexpr/typeConstructorArgs.res:2:28-31
-
-  1 │ type node<'a> = {
-  2 │   _value: Js.Nullable.value('a)
-  3 │ }
-  4 │ 
-
-  Type parameters require angle brackets:
-  Js.Nullable.value<'a>
-
-type nonrec 'a node = {
-  _value: 'a Js.Nullable.value }
\ No newline at end of file
diff --git a/jscomp/syntax/tests/parsing/recovery/typexpr/typeConstructorArgs.res b/jscomp/syntax/tests/parsing/recovery/typexpr/typeConstructorArgs.res
deleted file mode 100644
index 4ff3a40..0000000
--- a/jscomp/syntax/tests/parsing/recovery/typexpr/typeConstructorArgs.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type node<'a> = {
-  _value: Js.Nullable.value('a)
-}
diff --git a/jscomp/syntax/tests/ppx/react/aliasProps.res b/jscomp/syntax/tests/ppx/react/aliasProps.res
deleted file mode 100644
index 8c183b9..0000000
--- a/jscomp/syntax/tests/ppx/react/aliasProps.res
+++ /dev/null
@@ -1,43 +0,0 @@
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module C0 = {
-  @react.component
-  let make = (~priority as _, ~text="Test") => React.string(text)
-}
-
-module C1 = {
-  @react.component
-  let make = (~priority as p, ~text="Test") => React.string(p ++ text)
-}
-
-module C2 = {
-  @react.component
-  let make = (~foo as bar="") => React.string(bar)
-}
-
-module C3 = {
-  @react.component
-  let make = (~foo as bar="", ~a=bar, ~b) => {
-    React.string(bar ++ a ++ b)
-  }
-}
-
-module C4 = {
-  @react.component
-  let make = (~a as b, ~x=true) => <div> b </div>
-}
-
-module C5 = {
-  @react.component
-  let make = (~a as (x, y), ~z=3) => x + y + z
-}
-
-module C6 = {
-  module type Comp = {
-    @react.component
-    let make: unit => React.element
-  }
-
-  @react.component
-  let make = (~comp as module(Comp: Comp), ~x as (a, b)) => <Comp />
-}
diff --git a/jscomp/syntax/tests/ppx/react/asyncAwait.res b/jscomp/syntax/tests/ppx/react/asyncAwait.res
deleted file mode 100644
index 9a253a0..0000000
--- a/jscomp/syntax/tests/ppx/react/asyncAwait.res
+++ /dev/null
@@ -1,19 +0,0 @@
-let f = a => Js.Promise.resolve(a + a)
-
-module C0 = {
-  @react.component
-  let make = async (~a) => {
-    let a = await f(a)
-    <div> {React.int(a)} </div>
-  }
-}
-
-module C1 = {
-  @react.component
-  let make = async (~status) => {
-    switch status {
-    | #on => React.string("on")
-    | #off => React.string("off")
-    }
-  }
-}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/commentAtTop.res b/jscomp/syntax/tests/ppx/react/commentAtTop.res
deleted file mode 100644
index e236abf..0000000
--- a/jscomp/syntax/tests/ppx/react/commentAtTop.res
+++ /dev/null
@@ -1,6 +0,0 @@
-// test React JSX file
-
-@react.component
-let make = (~msg) => {
-  <div> {msg->React.string} </div>
-}
diff --git a/jscomp/syntax/tests/ppx/react/defaultValueProp.res b/jscomp/syntax/tests/ppx/react/defaultValueProp.res
deleted file mode 100644
index ad05126..0000000
--- a/jscomp/syntax/tests/ppx/react/defaultValueProp.res
+++ /dev/null
@@ -1,22 +0,0 @@
-module C0 = {
-  @react.component
-  let make = (~a=2, ~b=a*2) => React.int(a + b)
-}
-
-module C1 = {
-  @react.component
-  let make = (~a=2, ~b) => React.int(a + b)
-}
-
-module C2 = {
-  let a = "foo"
-  @react.component
-  let make = (~a=a) => React.string(a)
-}
-
-module C3 = {
-  @react.component
-  let make = (~disabled as everythingDisabled: bool=false) => {
-    React.string(everythingDisabled ? "true" : "false")
-  }
-}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/expected/aliasProps.res.txt b/jscomp/syntax/tests/ppx/react/expected/aliasProps.res.txt
deleted file mode 100644
index 959ae19..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/aliasProps.res.txt
+++ /dev/null
@@ -1,131 +0,0 @@
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module C0 = {
-  type props<'priority, 'text> = {priority: 'priority, text?: 'text}
-
-  let make = ({priority: _, text: ?__text, _}: props<_, _>) => {
-    let text = switch __text {
-    | Some(text) => text
-    | None => "Test"
-    }
-
-    React.string(text)
-  }
-  let make = {
-    let \"AliasProps$C0" = (props: props<_>) => make(props)
-
-    \"AliasProps$C0"
-  }
-}
-
-module C1 = {
-  type props<'priority, 'text> = {priority: 'priority, text?: 'text}
-
-  let make = ({priority: p, text: ?__text, _}: props<_, _>) => {
-    let text = switch __text {
-    | Some(text) => text
-    | None => "Test"
-    }
-
-    React.string(p ++ text)
-  }
-  let make = {
-    let \"AliasProps$C1" = (props: props<_>) => make(props)
-
-    \"AliasProps$C1"
-  }
-}
-
-module C2 = {
-  type props<'foo> = {foo?: 'foo}
-
-  let make = ({foo: ?__bar, _}: props<_>) => {
-    let bar = switch __bar {
-    | Some(foo) => foo
-    | None => ""
-    }
-
-    React.string(bar)
-  }
-  let make = {
-    let \"AliasProps$C2" = (props: props<_>) => make(props)
-
-    \"AliasProps$C2"
-  }
-}
-
-module C3 = {
-  type props<'foo, 'a, 'b> = {foo?: 'foo, a?: 'a, b: 'b}
-
-  let make = ({foo: ?__bar, a: ?__a, b, _}: props<_, _, _>) => {
-    let bar = switch __bar {
-    | Some(foo) => foo
-    | None => ""
-    }
-    let a = switch __a {
-    | Some(a) => a
-    | None => bar
-    }
-
-    {
-      React.string(bar ++ a ++ b)
-    }
-  }
-  let make = {
-    let \"AliasProps$C3" = (props: props<_>) => make(props)
-
-    \"AliasProps$C3"
-  }
-}
-
-module C4 = {
-  type props<'a, 'x> = {a: 'a, x?: 'x}
-
-  let make = ({a: b, x: ?__x, _}: props<_, _>) => {
-    let x = switch __x {
-    | Some(x) => x
-    | None => true
-    }
-
-    ReactDOM.jsx("div", {children: ?ReactDOM.someElement(b)})
-  }
-  let make = {
-    let \"AliasProps$C4" = (props: props<_>) => make(props)
-
-    \"AliasProps$C4"
-  }
-}
-
-module C5 = {
-  type props<'a, 'z> = {a: 'a, z?: 'z}
-
-  let make = ({a: (x, y), z: ?__z, _}: props<_, _>) => {
-    let z = switch __z {
-    | Some(z) => z
-    | None => 3
-    }
-
-    x + y + z
-  }
-  let make = {
-    let \"AliasProps$C5" = (props: props<_>) => make(props)
-
-    \"AliasProps$C5"
-  }
-}
-
-module C6 = {
-  module type Comp = {
-    type props = {}
-
-    let make: React.componentLike<props, React.element>
-  }
-  type props<'comp, 'x> = {comp: 'comp, x: 'x}
-
-  let make = ({comp: module(Comp: Comp), x: (a, b), _}: props<_, _>) => React.jsx(Comp.make, {})
-  let make = {
-    let \"AliasProps$C6" = (props: props<_>) => make(props)
-
-    \"AliasProps$C6"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/asyncAwait.res.txt b/jscomp/syntax/tests/ppx/react/expected/asyncAwait.res.txt
deleted file mode 100644
index d8d86dc..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/asyncAwait.res.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-let f = a => Js.Promise.resolve(a + a)
-
-module C0 = {
-  type props<'a> = {a: 'a}
-
-  let make = async ({a, _}: props<_>) => {
-    let a = await f(a)
-    ReactDOM.jsx("div", {children: ?ReactDOM.someElement({React.int(a)})})
-  }
-  let make = {
-    let \"AsyncAwait$C0" = (props: props<_>) => JsxPPXReactSupport.asyncComponent(make(props))
-
-    \"AsyncAwait$C0"
-  }
-}
-
-module C1 = {
-  type props<'status> = {status: 'status}
-
-  let make = async ({status, _}: props<_>) => {
-    switch status {
-    | #on => React.string("on")
-    | #off => React.string("off")
-    }
-  }
-  let make = {
-    let \"AsyncAwait$C1" = (props: props<_>) => JsxPPXReactSupport.asyncComponent(make(props))
-
-    \"AsyncAwait$C1"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/commentAtTop.res.txt b/jscomp/syntax/tests/ppx/react/expected/commentAtTop.res.txt
deleted file mode 100644
index d620f69..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/commentAtTop.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-type props<'msg> = {msg: 'msg} // test React JSX file
-
-let make = ({msg, _}: props<_>) => {
-  ReactDOM.jsx("div", {children: ?ReactDOM.someElement({msg->React.string})})
-}
-let make = {
-  let \"CommentAtTop" = (props: props<_>) => make(props)
-
-  \"CommentAtTop"
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/defaultValueProp.res.txt b/jscomp/syntax/tests/ppx/react/expected/defaultValueProp.res.txt
deleted file mode 100644
index 0b4c240..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/defaultValueProp.res.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-module C0 = {
-  type props<'a, 'b> = {a?: 'a, b?: 'b}
-  let make = ({a: ?__a, b: ?__b, _}: props<_, _>) => {
-    let a = switch __a {
-    | Some(a) => a
-    | None => 2
-    }
-    let b = switch __b {
-    | Some(b) => b
-    | None => a * 2
-    }
-
-    React.int(a + b)
-  }
-  let make = {
-    let \"DefaultValueProp$C0" = (props: props<_>) => make(props)
-    \"DefaultValueProp$C0"
-  }
-}
-
-module C1 = {
-  type props<'a, 'b> = {a?: 'a, b: 'b}
-
-  let make = ({a: ?__a, b, _}: props<_, _>) => {
-    let a = switch __a {
-    | Some(a) => a
-    | None => 2
-    }
-
-    React.int(a + b)
-  }
-  let make = {
-    let \"DefaultValueProp$C1" = (props: props<_>) => make(props)
-
-    \"DefaultValueProp$C1"
-  }
-}
-
-module C2 = {
-  let a = "foo"
-  type props<'a> = {a?: 'a}
-
-  let make = ({a: ?__a, _}: props<_>) => {
-    let a = switch __a {
-    | Some(a) => a
-    | None => a
-    }
-
-    React.string(a)
-  }
-  let make = {
-    let \"DefaultValueProp$C2" = (props: props<_>) => make(props)
-
-    \"DefaultValueProp$C2"
-  }
-}
-
-module C3 = {
-  type props<'disabled> = {disabled?: 'disabled}
-
-  let make = ({disabled: ?__everythingDisabled, _}: props<bool>) => {
-    let everythingDisabled = switch __everythingDisabled {
-    | Some(disabled) => disabled
-    | None => false
-    }
-
-    {
-      React.string(everythingDisabled ? "true" : "false")
-    }
-  }
-  let make = {
-    let \"DefaultValueProp$C3" = (props: props<_>) => make(props)
-
-    \"DefaultValueProp$C3"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/externalWithCustomName.res.txt b/jscomp/syntax/tests/ppx/react/expected/externalWithCustomName.res.txt
deleted file mode 100644
index be73710..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/externalWithCustomName.res.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@@jsxConfig({version: 3})
-
-module Foo = {
-  @obj
-  external componentProps: (~a: int, ~b: string, ~key: string=?, unit) => {"a": int, "b": string} =
-    ""
-  @module("Foo")
-  external component: React.componentLike<{"a": int, "b": string}, React.element> = "component"
-}
-
-let t = React.createElement(Foo.component, Foo.componentProps(~a=1, ~b={"1"}, ()))
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module Foo = {
-  @live
-  type props<'a, 'b> = {a: 'a, b: 'b}
-
-  @module("Foo")
-  external component: React.componentLike<props<int, string>, React.element> = "component"
-}
-
-let t = React.createElement(Foo.component, {a: 1, b: "1"})
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module Foo = {
-  @live
-  type props<'a, 'b> = {a: 'a, b: 'b}
-
-  @module("Foo")
-  external component: React.componentLike<props<int, string>, React.element> = "component"
-}
-
-let t = React.jsx(Foo.component, {a: 1, b: "1"})
diff --git a/jscomp/syntax/tests/ppx/react/expected/externalWithRef.res.txt b/jscomp/syntax/tests/ppx/react/expected/externalWithRef.res.txt
deleted file mode 100644
index 036b7cf..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/externalWithRef.res.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @obj
-  external makeProps: (
-    ~x: string,
-    ~ref: ReactDOM.Ref.currentDomRef=?,
-    ~key: string=?,
-    unit,
-  ) => {"x": string, "ref": option<ReactDOM.Ref.currentDomRef>} = ""
-  @module("componentForwardRef")
-  external make: React.componentLike<
-    {"x": string, "ref": option<ReactDOM.Ref.currentDomRef>},
-    React.element,
-  > = "component"
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  @live
-  type props<'x, 'ref> = {
-    x: 'x,
-    ref?: 'ref,
-  }
-
-  @module("componentForwardRef")
-  external make: React.componentLike<props<string, ReactDOM.Ref.currentDomRef>, React.element> =
-    "component"
-}
-
-module type V4CType = {
-  @live
-  type props<'x, 'y> = {
-    x: 'x,
-    y: 'y,
-  }
-
-  @module("someModule")
-  external make: React.componentLike<props<string, string>, React.element> = "component"
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4C = {
-  @live
-  type props<'x, 'ref> = {
-    x: 'x,
-    ref?: 'ref,
-  }
-
-  @module("componentForwardRef")
-  external make: React.componentLike<props<string, ReactDOM.Ref.currentDomRef>, React.element> =
-    "component"
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/externalWithTypeVariables.res.txt b/jscomp/syntax/tests/ppx/react/expected/externalWithTypeVariables.res.txt
deleted file mode 100644
index 1a62c59..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/externalWithTypeVariables.res.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @obj
-  external makeProps: (
-    ~x: t<'a>,
-    ~children: React.element,
-    ~key: string=?,
-    unit,
-  ) => {"x": t<'a>, "children": React.element} = ""
-  @module("c")
-  external make: React.componentLike<{"x": t<'a>, "children": React.element}, React.element> =
-    "component"
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  @live
-  type props<'x, 'children> = {
-    x: 'x,
-    children: 'children,
-  }
-
-  @module("c")
-  external make: React.componentLike<props<t<'a>, React.element>, React.element> = "component"
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4C = {
-  @live
-  type props<'x, 'children> = {
-    x: 'x,
-    children: 'children,
-  }
-
-  @module("c")
-  external make: React.componentLike<props<t<'a>, React.element>, React.element> = "component"
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/fileLevelConfig.res.txt b/jscomp/syntax/tests/ppx/react/expected/fileLevelConfig.res.txt
deleted file mode 100644
index 817461d..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/fileLevelConfig.res.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @obj external makeProps: (~msg: 'msg, ~key: string=?, unit) => {"msg": 'msg} = ""
-
-  @react.component
-  let make =
-    @warning("-16")
-    (~msg) => {
-      ReactDOMRe.createDOMElementVariadic("div", [{msg->React.string}])
-    }
-  let make = {
-    let \"FileLevelConfig$V3" = (\"Props": {"msg": 'msg}) => make(~msg=\"Props"["msg"])
-    \"FileLevelConfig$V3"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  type props<'msg> = {msg: 'msg}
-
-  let make = ({msg, _}: props<_>) => {
-    ReactDOM.createDOMElementVariadic("div", [{msg->React.string}])
-  }
-  let make = {
-    let \"FileLevelConfig$V4C" = (props: props<_>) => make(props)
-
-    \"FileLevelConfig$V4C"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A = {
-  type props<'msg> = {msg: 'msg}
-
-  let make = ({msg, _}: props<_>) => {
-    ReactDOM.jsx("div", {children: ?ReactDOM.someElement({msg->React.string})})
-  }
-  let make = {
-    let \"FileLevelConfig$V4A" = (props: props<_>) => make(props)
-
-    \"FileLevelConfig$V4A"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/firstClassModules.res.txt b/jscomp/syntax/tests/ppx/react/expected/firstClassModules.res.txt
deleted file mode 100644
index d3dd016..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/firstClassModules.res.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-@@jsxConfig({version: 3})
-
-module Select = {
-  module type T = {
-    type key
-    type t
-  }
-  @obj
-  external makeProps: (
-    ~model: module(T with type t = '\"type-a" and type key = '\"type-key"),
-    ~selected: option<'\"type-key">,
-    ~onChange: option<'\"type-key"> => unit,
-    ~items: array<'\"type-a">,
-    ~key: string=?,
-    unit,
-  ) => {
-    "model": module(T with type t = '\"type-a" and type key = '\"type-key"),
-    "selected": option<'\"type-key">,
-    "onChange": option<'\"type-key"> => unit,
-    "items": array<'\"type-a">,
-  } = ""
-
-  @react.component
-  let make = (
-    type a key,
-    ~model as module(T: T with type t = a and type key = key),
-    ~selected: option<key>,
-    ~onChange: option<key> => unit,
-    ~items: array<a>,
-  ) => {
-    let _ = (model, selected, onChange, items)
-    ReactDOMRe.createDOMElementVariadic("div", [])
-  }
-  let make = {
-    let \"FirstClassModules$Select" = (
-      \"Props": {
-        "model": module(T with type t = '\"type-a" and type key = '\"type-key"),
-        "selected": option<'\"type-key">,
-        "onChange": option<'\"type-key"> => unit,
-        "items": array<'\"type-a">,
-      },
-    ) =>
-      make(
-        ~items=\"Props"["items"],
-        ~onChange=\"Props"["onChange"],
-        ~selected=\"Props"["selected"],
-        ~model=\"Props"["model"],
-      )
-    \"FirstClassModules$Select"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module Select = {
-  module type T = {
-    type key
-    type t
-  }
-  type props<'model, 'selected, 'onChange, 'items> = {
-    model: 'model,
-    selected: 'selected,
-    onChange: 'onChange,
-    items: 'items,
-  }
-
-  let make = (
-    type a key,
-    {model: module(T: T with type t = a and type key = key), selected, onChange, items, _}: props<
-      _,
-      option<key>,
-      option<key> => unit,
-      array<a>,
-    >,
-  ) => {
-    let _ = (model, selected, onChange, items)
-    ReactDOM.createDOMElementVariadic("div", [])
-  }
-  let make = {
-    let \"FirstClassModules$Select" = (props: props<_>) => make(props)
-
-    \"FirstClassModules$Select"
-  }
-}
-
-module External = {
-  module type T = {
-    type key
-    type t
-  }
-  @live
-  type props<'model, 'selected, 'onChange, 'items> = {
-    model: 'model,
-    selected: 'selected,
-    onChange: 'onChange,
-    items: 'items,
-  }
-
-  @module("c")
-  external make: React.componentLike<
-    props<
-      module(T with type t = 'a and type key = 'key),
-      option<'key>,
-      (option<'key> => unit),
-      array<'a>,
-    >,
-    React.element,
-  > = "default"
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/firstClassModules.resi.txt b/jscomp/syntax/tests/ppx/react/expected/firstClassModules.resi.txt
deleted file mode 100644
index e5ec53a..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/firstClassModules.resi.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-@@jsxConfig({version: 3})
-
-module Select: {
-  module type T = {
-    type key
-    type t
-  }
-
-  @obj
-  external makeProps: (
-    ~model: module(T with type t = 'a and type key = 'key),
-    ~selected: option<'key>,
-    ~onChange: option<'key> => unit,
-    ~items: array<'a>,
-    ~key: string=?,
-    unit,
-  ) => {
-    "model": module(T with type t = 'a and type key = 'key),
-    "selected": option<'key>,
-    "onChange": (option<'key> => unit),
-    "items": array<'a>,
-  } = ""
-  let make: React.componentLike<
-    {
-      "model": module(T with type t = 'a and type key = 'key),
-      "selected": option<'key>,
-      "onChange": (option<'key> => unit),
-      "items": array<'a>,
-    },
-    React.element,
-  >
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module Select: {
-  module type T = {
-    type key
-    type t
-  }
-  type props<'model, 'selected, 'onChange, 'items> = {
-    model: 'model,
-    selected: 'selected,
-    onChange: 'onChange,
-    items: 'items,
-  }
-
-  let make: React.componentLike<
-    props<
-      module(T with type t = 'a and type key = 'key),
-      option<'key>,
-      (option<'key> => unit),
-      array<'a>,
-    >,
-    React.element,
-  >
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/forwardRef.res.txt b/jscomp/syntax/tests/ppx/react/expected/forwardRef.res.txt
deleted file mode 100644
index 80f843e..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/forwardRef.res.txt
+++ /dev/null
@@ -1,284 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  module FancyInput = {
-    @obj
-    external makeProps: (
-      ~className: 'className=?,
-      ~children: 'children,
-      ~key: string=?,
-      ~ref: 'ref=?,
-      unit,
-    ) => {"className": option<'className>, "children": 'children} = ""
-
-    @react.component
-    let make =
-      @warning("-16")
-      (~className=?) =>
-        @warning("-16")
-        (~children) =>
-          @warning("-16")
-          ref =>
-            ReactDOMRe.createDOMElementVariadic(
-              "div",
-              [
-                ReactDOMRe.createDOMElementVariadic(
-                  "input",
-                  ~props=ReactDOMRe.domProps(
-                    ~type_="text",
-                    ~className?,
-                    ~ref=?{Js.Nullable.toOption(ref)->Belt.Option.map(ReactDOM.Ref.domRef)},
-                    (),
-                  ),
-                  [],
-                ),
-                children,
-              ],
-            )
-    let make = React.forwardRef({
-      let \"ForwardRef$V3$FancyInput" = (
-        \"Props": {"className": option<'className>, "children": 'children},
-        ref,
-      ) => make(~children=\"Props"["children"], ~className=?\"Props"["className"], ref)
-      \"ForwardRef$V3$FancyInput"
-    })
-  }
-  @obj external makeProps: (~key: string=?, unit) => {.} = ""
-
-  @react.component
-  let make = () => {
-    let input = React.useRef(Js.Nullable.null)
-
-    ReactDOMRe.createDOMElementVariadic(
-      "div",
-      [
-        React.createElement(
-          FancyInput.make,
-          FancyInput.makeProps(~ref=input, ~children={React.string("Click to focus")}, ()),
-        ),
-      ],
-    )
-  }
-  let make = {
-    let \"ForwardRef$V3" = (\"Props": {.}) => make()
-    \"ForwardRef$V3"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  module FancyInput = {
-    type props<'className, 'children, 'ref> = {
-      className?: 'className,
-      children: 'children,
-      ref?: 'ref,
-    }
-
-    let make = (
-      {?className, children, _}: props<_, _, ReactRef.currentDomRef>,
-      ref: Js.Nullable.t<ReactRef.currentDomRef>,
-    ) =>
-      ReactDOM.createDOMElementVariadic(
-        "div",
-        [
-          ReactDOM.createDOMElementVariadic(
-            "input",
-            ~props={
-              type_: "text",
-              ?className,
-              ref: ?Js.Nullable.toOption(ref)->Belt.Option.map(React.Ref.domRef),
-            },
-            [],
-          ),
-          children,
-        ],
-      )
-    let make = React.forwardRef({
-      let \"ForwardRef$V4C$FancyInput" = (props: props<_>, ref) => make(props, ref)
-
-      \"ForwardRef$V4C$FancyInput"
-    })
-  }
-  type props = {}
-
-  let make = (_: props) => {
-    let input = React.useRef(Js.Nullable.null)
-
-    ReactDOM.createDOMElementVariadic(
-      "div",
-      [
-        React.createElement(
-          FancyInput.make,
-          {ref: input, children: {React.string("Click to focus")}},
-        ),
-      ],
-    )
-  }
-  let make = {
-    let \"ForwardRef$V4C" = props => make(props)
-
-    \"ForwardRef$V4C"
-  }
-}
-
-module V4CUncurried = {
-  module FancyInput = {
-    type props<'className, 'children, 'ref> = {
-      className?: 'className,
-      children: 'children,
-      ref?: 'ref,
-    }
-
-    let make = (
-      {?className, children, _}: props<_, _, ReactRef.currentDomRef>,
-      ref: Js.Nullable.t<ReactRef.currentDomRef>,
-    ) =>
-      ReactDOM.createDOMElementVariadic(
-        "div",
-        [
-          ReactDOM.createDOMElementVariadic(
-            "input",
-            ~props={
-              type_: "text",
-              ?className,
-              ref: ?Js.Nullable.toOption(ref)->Belt.Option.map(React.Ref.domRef),
-            },
-            [],
-          ),
-          children,
-        ],
-      )
-    let make = React.forwardRef({
-      let \"ForwardRef$V4CUncurried$FancyInput" = (props: props<_>, ref) => make(props, ref)
-
-      \"ForwardRef$V4CUncurried$FancyInput"
-    })
-  }
-  type props = {}
-
-  let make = (_: props) => {
-    let input = React.useRef(Js.Nullable.null)
-
-    ReactDOM.createDOMElementVariadic(
-      "div",
-      [
-        React.createElement(
-          FancyInput.make,
-          {ref: input, children: {React.string("Click to focus")}},
-        ),
-      ],
-    )
-  }
-  let make = {
-    let \"ForwardRef$V4CUncurried" = props => make(props)
-
-    \"ForwardRef$V4CUncurried"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A = {
-  module FancyInput = {
-    type props<'className, 'children, 'ref> = {
-      className?: 'className,
-      children: 'children,
-      ref?: 'ref,
-    }
-
-    let make = ({?className, children, _}: props<_, _, 'ref>, ref: Js.Nullable.t<'ref>) =>
-      ReactDOM.jsxs(
-        "div",
-        {
-          children: React.array([
-            ReactDOM.jsx(
-              "input",
-              {
-                type_: "text",
-                ?className,
-                ref: ?Js.Nullable.toOption(ref)->Belt.Option.map(ReactDOM.Ref.domRef),
-              },
-            ),
-            children,
-          ]),
-        },
-      )
-    let make = React.forwardRef({
-      let \"ForwardRef$V4A$FancyInput" = (props: props<_>, ref) => make(props, ref)
-
-      \"ForwardRef$V4A$FancyInput"
-    })
-  }
-  type props = {}
-
-  let make = (_: props) => {
-    let input = React.useRef(Js.Nullable.null)
-
-    ReactDOM.jsx(
-      "div",
-      {
-        children: ?ReactDOM.someElement(
-          React.jsx(FancyInput.make, {ref: input, children: {React.string("Click to focus")}}),
-        ),
-      },
-    )
-  }
-  let make = {
-    let \"ForwardRef$V4A" = props => make(props)
-
-    \"ForwardRef$V4A"
-  }
-}
-
-module V4AUncurried = {
-  module FancyInput = {
-    type props<'className, 'children, 'ref> = {
-      className?: 'className,
-      children: 'children,
-      ref?: 'ref,
-    }
-
-    let make = ({?className, children, _}: props<_, _, 'ref>, ref: Js.Nullable.t<'ref>) =>
-      ReactDOM.jsxs(
-        "div",
-        {
-          children: React.array([
-            ReactDOM.jsx(
-              "input",
-              {
-                type_: "text",
-                ?className,
-                ref: ?Js.Nullable.toOption(ref)->Belt.Option.map(ReactDOM.Ref.domRef),
-              },
-            ),
-            children,
-          ]),
-        },
-      )
-    let make = React.forwardRef({
-      let \"ForwardRef$V4AUncurried$FancyInput" = (props: props<_>, ref) => make(props, ref)
-
-      \"ForwardRef$V4AUncurried$FancyInput"
-    })
-  }
-  type props = {}
-
-  let make = (_: props) => {
-    let input = React.useRef(Js.Nullable.null)
-
-    ReactDOM.jsx(
-      "div",
-      {
-        children: ?ReactDOM.someElement(
-          React.jsx(FancyInput.make, {ref: input, children: {React.string("Click to focus")}}),
-        ),
-      },
-    )
-  }
-  let make = {
-    let \"ForwardRef$V4AUncurried" = props => make(props)
-
-    \"ForwardRef$V4AUncurried"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/forwardRef.resi.txt b/jscomp/syntax/tests/ppx/react/expected/forwardRef.resi.txt
deleted file mode 100644
index 4b8c51c..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/forwardRef.resi.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3: {
-  module FancyInput: {
-    @obj
-    external makeProps: (
-      ~className: string=?,
-      ~children: React.element,
-      ~ref: ReactDOM.Ref.currentDomRef=?,
-      ~key: string=?,
-      unit,
-    ) => {
-      "className": option<string>,
-      "children": React.element,
-      "ref": option<ReactDOM.Ref.currentDomRef>,
-    } = ""
-    let make: React.componentLike<
-      {
-        "className": option<string>,
-        "children": React.element,
-        "ref": option<ReactDOM.Ref.currentDomRef>,
-      },
-      React.element,
-    >
-  }
-
-  module ForwardRef: {
-    @obj
-    external makeProps: (
-      ~ref: React.ref<Js.Nullable.t<inputRef>>=?,
-      ~key: string=?,
-      unit,
-    ) => {"ref": option<React.ref<Js.Nullable.t<inputRef>>>} = ""
-    let make: React.componentLike<
-      {"ref": option<React.ref<Js.Nullable.t<inputRef>>>},
-      React.element,
-    >
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C: {
-  module FancyInput: {
-    type props<'className, 'children, 'ref> = {
-      className?: 'className,
-      children: 'children,
-      ref?: 'ref,
-    }
-
-    let make: React.componentLike<
-      props<string, React.element, ReactDOM.Ref.currentDomRef>,
-      React.element,
-    >
-  }
-
-  module ForwardRef: {
-    type props<'ref> = {ref?: 'ref}
-
-    let make: React.componentLike<props<React.ref<Js.Nullable.t<inputRef>>>, React.element>
-  }
-}
-
-module V4CUncurried: {
-  module FancyInput: {
-    type props<'className, 'children, 'ref> = {
-      className?: 'className,
-      children: 'children,
-      ref?: 'ref,
-    }
-
-    let make: React.componentLike<
-      props<string, React.element, ReactDOM.Ref.currentDomRef>,
-      React.element,
-    >
-  }
-
-  module ForwardRef: {
-    type props<'ref> = {ref?: 'ref}
-
-    let make: React.componentLike<props<React.ref<Js.Nullable.t<inputRef>>>, React.element>
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A: {
-  module FancyInput: {
-    type props<'className, 'children, 'ref> = {
-      className?: 'className,
-      children: 'children,
-      ref?: 'ref,
-    }
-
-    let make: React.componentLike<
-      props<string, React.element, ReactDOM.Ref.currentDomRef>,
-      React.element,
-    >
-  }
-
-  module ForwardRef: {
-    type props<'ref> = {ref?: 'ref}
-
-    let make: React.componentLike<props<React.ref<Js.Nullable.t<inputRef>>>, React.element>
-  }
-}
-
-module V4AUncurried: {
-  module FancyInput: {
-    type props<'className, 'children, 'ref> = {
-      className?: 'className,
-      children: 'children,
-      ref?: 'ref,
-    }
-
-    let make: React.componentLike<
-      props<string, React.element, ReactDOM.Ref.currentDomRef>,
-      React.element,
-    >
-  }
-
-  module ForwardRef: {
-    type props<'ref> = {ref?: 'ref}
-
-    let make: React.componentLike<props<React.ref<Js.Nullable.t<inputRef>>>, React.element>
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/fragment.res.txt b/jscomp/syntax/tests/ppx/react/expected/fragment.res.txt
deleted file mode 100644
index d1e0f1d..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/fragment.res.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-@@jsxConfig({version: 4, mode: "classic"})
-
-let _ = React.createElement(React.fragment, {})
-let _ = React.createElement(
-  React.fragment,
-  {children: ReactDOM.createDOMElementVariadic("div", [])},
-)
-let _ = React.createElementVariadic(
-  React.fragment,
-  {},
-  [ReactDOM.createDOMElementVariadic("div", []), ReactDOM.createDOMElementVariadic("div", [])],
-)
-let _ = React.createElement(React.fragment, {children: React.createElement(React.fragment, {})})
-let _ = React.createElement(Z.make, {})
-let _ = React.createElement(Z.make, {children: ReactDOM.createDOMElementVariadic("div", [])})
-let _ = React.createElement(
-  Z.make,
-  {a: "a", children: ReactDOM.createDOMElementVariadic("div", [])},
-)
-let _ = React.createElementVariadic(
-  Z.make,
-  {children: React.null},
-  [ReactDOM.createDOMElementVariadic("div", []), ReactDOM.createDOMElementVariadic("div", [])],
-)
-let _ = ReactDOM.createDOMElementVariadic("div", [])
-let _ = ReactDOM.createDOMElementVariadic("div", [ReactDOM.createDOMElementVariadic("div", [])])
-let _ = ReactDOM.createDOMElementVariadic(
-  "div",
-  ~props={id: "id"},
-  [ReactDOM.createDOMElementVariadic("div", [])],
-)
-let _ = ReactDOM.createDOMElementVariadic(
-  "div",
-  [ReactDOM.createDOMElementVariadic("div", []), ReactDOM.createDOMElementVariadic("div", [])],
-)
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-let _ = React.jsx(React.jsxFragment, {})
-let _ = React.jsx(React.jsxFragment, {children: ReactDOM.jsx("div", {})})
-let _ = React.jsxs(
-  React.jsxFragment,
-  {children: React.array([ReactDOM.jsx("div", {}), ReactDOM.jsx("div", {})])},
-)
-let _ = React.jsx(React.jsxFragment, {children: React.jsx(React.jsxFragment, {})})
-let _ = React.jsx(Z.make, {})
-let _ = React.jsx(Z.make, {children: ReactDOM.jsx("div", {})})
-let _ = React.jsx(Z.make, {a: "a", children: ReactDOM.jsx("div", {})})
-let _ = React.jsxs(
-  Z.make,
-  {children: React.array([ReactDOM.jsx("div", {}), ReactDOM.jsx("div", {})])},
-)
-let _ = ReactDOM.jsx("div", {})
-let _ = ReactDOM.jsx("div", {children: ?ReactDOM.someElement(ReactDOM.jsx("div", {}))})
-let _ = ReactDOM.jsx("div", {id: "id", children: ?ReactDOM.someElement(ReactDOM.jsx("div", {}))})
-let _ = ReactDOM.jsxs(
-  "div",
-  {children: React.array([ReactDOM.jsx("div", {}), ReactDOM.jsx("div", {})])},
-)
diff --git a/jscomp/syntax/tests/ppx/react/expected/innerModule.res.txt b/jscomp/syntax/tests/ppx/react/expected/innerModule.res.txt
deleted file mode 100644
index 2a0a1cb..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/innerModule.res.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-@@jsxConfig({version: 3})
-module Bar = {
-  @obj external makeProps: (~a: 'a, ~b: 'b, ~key: string=?, unit) => {"a": 'a, "b": 'b} = ""
-
-  @react.component
-  let make =
-    @warning("-16")
-    (~a) =>
-      @warning("-16")
-      (~b, _) => {
-        Js.log("This function should be named `InnerModule.react$Bar`")
-        ReactDOMRe.createDOMElementVariadic("div", [])
-      }
-  let make = {
-    let \"InnerModule$Bar" = (\"Props": {"a": 'a, "b": 'b}) =>
-      make(~b=\"Props"["b"], ~a=\"Props"["a"], ())
-    \"InnerModule$Bar"
-  }
-  @obj external componentProps: (~a: 'a, ~b: 'b, ~key: string=?, unit) => {"a": 'a, "b": 'b} = ""
-
-  @react.component
-  let component =
-    @warning("-16")
-    (~a) =>
-      @warning("-16")
-      (~b, _) => {
-        Js.log("This function should be named `InnerModule.react$Bar$component`")
-        ReactDOMRe.createDOMElementVariadic("div", [])
-      }
-  let component = {
-    let \"InnerModule$Bar$component" = (\"Props": {"a": 'a, "b": 'b}) =>
-      component(~b=\"Props"["b"], ~a=\"Props"["a"], ())
-    \"InnerModule$Bar$component"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/interface.res.txt b/jscomp/syntax/tests/ppx/react/expected/interface.res.txt
deleted file mode 100644
index 166ed2e..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/interface.res.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-module A = {
-  type props<'x> = {x: 'x}
-  let make = ({x, _}: props<_>) => React.string(x)
-  let make = {
-    let \"Interface$A" = (props: props<_>) => make(props)
-    \"Interface$A"
-  }
-}
-
-module NoProps = {
-  type props = {}
-
-  let make = (_: props) => ReactDOM.jsx("div", {})
-  let make = {
-    let \"Interface$NoProps" = props => make(props)
-
-    \"Interface$NoProps"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/interface.resi.txt b/jscomp/syntax/tests/ppx/react/expected/interface.resi.txt
deleted file mode 100644
index f4ffd9b..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/interface.resi.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-module A: {
-  type props<'x> = {x: 'x}
-  let make: React.componentLike<props<string>, React.element>
-}
-
-module NoProps: {
-  type props = {}
-
-  let make: React.componentLike<props, React.element>
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/interfaceWithRef.res.txt b/jscomp/syntax/tests/ppx/react/expected/interfaceWithRef.res.txt
deleted file mode 100644
index dbb6acf..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/interfaceWithRef.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-type props<'x, 'ref> = {x: 'x, ref?: 'ref}
-let make = (
-  {x, _}: props<string, ReactDOM.Ref.currentDomRef>,
-  ref: Js.Nullable.t<ReactDOM.Ref.currentDomRef>,
-) => {
-  let _ = ref->Js.Nullable.toOption->Belt.Option.map(ReactDOM.Ref.domRef)
-  React.string(x)
-}
-let make = React.forwardRef({
-  let \"InterfaceWithRef" = (props: props<_>, ref) => make(props, ref)
-  \"InterfaceWithRef"
-})
diff --git a/jscomp/syntax/tests/ppx/react/expected/interfaceWithRef.resi.txt b/jscomp/syntax/tests/ppx/react/expected/interfaceWithRef.resi.txt
deleted file mode 100644
index ee5da3c..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/interfaceWithRef.resi.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-type props<'x, 'ref> = {x: 'x, ref?: 'ref}
-let make: React.componentLike<props<string, ReactDOM.Ref.currentDomRef>, React.element>
diff --git a/jscomp/syntax/tests/ppx/react/expected/lowercases.res.txt b/jscomp/syntax/tests/ppx/react/expected/lowercases.res.txt
deleted file mode 100644
index 262c7aa..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/lowercases.res.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-@@jsxConfig({version: 4, mode: "classic"})
-
-let _ = ReactDOM.createDOMElementVariadic("div", [])
-let _ = ReactDOM.createDOMElementVariadic("div", ~props={key: "k"}, [])
-let _ = ReactDOM.createDOMElementVariadic("div", ~props={x: x}, [])
-let _ = ReactDOM.createDOMElementVariadic(
-  "div",
-  [ReactDOM.createDOMElementVariadic("p", [{React.string(x)}])],
-)
-let _ = ReactDOM.createDOMElementVariadic("div", ~props=str, [])
-let _ = ReactDOM.createDOMElementVariadic("div", ~props={...str, x: "x"}, [])
-
-// syntax error
-// let _ = <div x="x" {...str} />
-// let _ = <div {...str} {...str} />
diff --git a/jscomp/syntax/tests/ppx/react/expected/mangleKeyword.res.txt b/jscomp/syntax/tests/ppx/react/expected/mangleKeyword.res.txt
deleted file mode 100644
index d803631..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/mangleKeyword.res.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-@@jsxConfig({version: 3})
-
-module C3A0 = {
-  @obj
-  external makeProps: (
-    ~_open: 'T_open,
-    ~_type: string,
-    ~key: string=?,
-    unit,
-  ) => {"_open": 'T_open, "_type": string} = ""
-
-  @react.component
-  let make =
-    @warning("-16")
-    (@as("open") ~_open) => @warning("-16") (@as("type") ~_type: string) => React.string(_open)
-  let make = {
-    let \"MangleKeyword$C3A0" = (\"Props": {"_open": 'T_open, "_type": string}) =>
-      make(~_type=\"Props"["_type"], ~_open=\"Props"["_open"])
-    \"MangleKeyword$C3A0"
-  }
-}
-module C3A1 = {
-  @obj
-  external makeProps: (
-    ~_open: string,
-    ~_type: string,
-    ~key: string=?,
-    unit,
-  ) => {"_open": string, "_type": string} = ""
-  external make: @as("open")
-  React.componentLike<{"_open": string, "_type": string}, React.element> = "default"
-}
-
-let c3a0 = React.createElement(C3A0.make, C3A0.makeProps(~_open="x", ~_type="t", ()))
-let c3a1 = React.createElement(C3A1.make, C3A1.makeProps(~_open="x", ~_type="t", ()))
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module C4C0 = {
-  type props<'T_open, 'T_type> = {@as("open") _open: 'T_open, @as("type") _type: 'T_type}
-
-  let make = ({@as("open") _open, @as("type") _type, _}: props<_, string>) => React.string(_open)
-  let make = {
-    let \"MangleKeyword$C4C0" = (props: props<_>) => make(props)
-
-    \"MangleKeyword$C4C0"
-  }
-}
-module C4C1 = {
-  @live
-  type props<'T_open, 'T_type> = {@as("open") _open: 'T_open, @as("type") _type: 'T_type}
-
-  external make: @as("open") React.componentLike<props<string, string>, React.element> = "default"
-}
-
-let c4c0 = React.createElement(C4C0.make, {_open: "x", _type: "t"})
-let c4c1 = React.createElement(C4C1.make, {_open: "x", _type: "t"})
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module C4A0 = {
-  type props<'T_open, 'T_type> = {@as("open") _open: 'T_open, @as("type") _type: 'T_type}
-
-  let make = ({@as("open") _open, @as("type") _type, _}: props<_, string>) => React.string(_open)
-  let make = {
-    let \"MangleKeyword$C4A0" = (props: props<_>) => make(props)
-
-    \"MangleKeyword$C4A0"
-  }
-}
-module C4A1 = {
-  @live
-  type props<'T_open, 'T_type> = {@as("open") _open: 'T_open, @as("type") _type: 'T_type}
-
-  external make: @as("open") React.componentLike<props<string, string>, React.element> = "default"
-}
-
-let c4a0 = React.jsx(C4A0.make, {_open: "x", _type: "t"})
-let c4a1 = React.jsx(C4A1.make, {_open: "x", _type: "t"})
diff --git a/jscomp/syntax/tests/ppx/react/expected/nested.res.txt b/jscomp/syntax/tests/ppx/react/expected/nested.res.txt
deleted file mode 100644
index f290915..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/nested.res.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-module Outer = {
-  type props = {}
-  let make = (_: props) => {
-    module Inner = {
-      type props = {}
-
-      let make = (_: props) => ReactDOM.jsx("div", {})
-      let make = {
-        let \"Nested$Outer" = props => make(props)
-
-        \"Nested$Outer"
-      }
-    }
-
-    React.jsx(Inner.make, {})
-  }
-  let make = {
-    let \"Nested$Outer" = props => make(props)
-    \"Nested$Outer"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/newtype.res.txt b/jscomp/syntax/tests/ppx/react/expected/newtype.res.txt
deleted file mode 100644
index ca23fe5..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/newtype.res.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @obj
-  external makeProps: (
-    ~a: '\"type-a",
-    ~b: array<option<[#Foo('\"type-a")]>>,
-    ~c: 'a,
-    ~key: string=?,
-    unit,
-  ) => {"a": '\"type-a", "b": array<option<[#Foo('\"type-a")]>>, "c": 'a} = ""
-
-  @react.component
-  let make = (type a, ~a: a, ~b: array<option<[#Foo(a)]>>, ~c: 'a, _) =>
-    ReactDOMRe.createDOMElementVariadic("div", [])
-  let make = {
-    let \"Newtype$V3" = (
-      \"Props": {"a": '\"type-a", "b": array<option<[#Foo('\"type-a")]>>, "c": 'a},
-    ) => make(~c=\"Props"["c"], ~b=\"Props"["b"], ~a=\"Props"["a"])
-    \"Newtype$V3"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  type props<'a, 'b, 'c> = {a: 'a, b: 'b, c: 'c}
-
-  let make = (type a, {a, b, c, _}: props<a, array<option<[#Foo(a)]>>, 'a>) =>
-    ReactDOM.createDOMElementVariadic("div", [])
-  let make = {
-    let \"Newtype$V4C" = (props: props<_>) => make(props)
-
-    \"Newtype$V4C"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A = {
-  type props<'a, 'b, 'c> = {a: 'a, b: 'b, c: 'c}
-
-  let make = (type a, {a, b, c, _}: props<a, array<option<[#Foo(a)]>>, 'a>) =>
-    ReactDOM.jsx("div", {})
-  let make = {
-    let \"Newtype$V4A" = (props: props<_>) => make(props)
-
-    \"Newtype$V4A"
-  }
-}
-
-module V4A1 = {
-  type props<'a, 'b, 'c> = {a: 'a, b: 'b, c: 'c}
-
-  let make = (type x y, {a, b, c, _}: props<x, array<y>, 'a>) => ReactDOM.jsx("div", {})
-  let make = {
-    let \"Newtype$V4A1" = (props: props<_>) => make(props)
-
-    \"Newtype$V4A1"
-  }
-}
-
-module type T = {
-  type t
-}
-
-module V4A2 = {
-  type props<'foo> = {foo: 'foo}
-
-  let make = (type a, {foo: (foo: module(T with type t = a)), _}: props<_>) => {
-    module T = unpack(foo)
-    ReactDOM.jsx("div", {})
-  }
-  let make = {
-    let \"Newtype$V4A2" = (props: props<_>) => make(props)
-
-    \"Newtype$V4A2"
-  }
-}
-
-module V4A3 = {
-  type props<'foo> = {foo: 'foo}
-
-  let make = (type a, {foo, _}: props<_>) => {
-    module T = unpack(foo: T with type t = a)
-    foo
-  }
-  let make = {
-    let \"Newtype$V4A3" = (props: props<_>) => make(props)
-
-    \"Newtype$V4A3"
-  }
-}
-type props<'x, 'q> = {x: 'x, q: 'q}
-
-let make = ({x, q, _}: props<('a, 'b), 'a>) => [fst(x), q]
-let make = {
-  let \"Newtype" = (props: props<_>) => make(props)
-
-  \"Newtype"
-}
-
-@@uncurried
-
-module Uncurried = {
-  type props<'foo> = {foo?: 'foo}
-
-  let make = (type a, {?foo, _}: props<_>) => React.null
-  let make = {
-    let \"Newtype$Uncurried" = (props: props<_>) => make(props)
-
-    \"Newtype$Uncurried"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/noPropsWithKey.res.txt b/jscomp/syntax/tests/ppx/react/expected/noPropsWithKey.res.txt
deleted file mode 100644
index 90b8603..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/noPropsWithKey.res.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4CA = {
-  type props = {}
-
-  let make = (_: props) => ReactDOM.createDOMElementVariadic("div", [])
-  let make = {
-    let \"NoPropsWithKey$V4CA" = props => make(props)
-
-    \"NoPropsWithKey$V4CA"
-  }
-}
-
-module V4CB = {
-  @live
-  type props = {}
-
-  @module("c")
-  external make: React.componentLike<props, React.element> = "component"
-}
-
-module V4C = {
-  type props = {}
-
-  let make = (_: props) =>
-    React.createElementVariadic(
-      React.fragment,
-      {},
-      [
-        JsxPPXReactSupport.createElementWithKey(~key="k", V4CA.make, {}),
-        JsxPPXReactSupport.createElementWithKey(~key="k", V4CB.make, {}),
-      ],
-    )
-  let make = {
-    let \"NoPropsWithKey$V4C" = props => make(props)
-
-    \"NoPropsWithKey$V4C"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4CA = {
-  type props = {}
-
-  let make = (_: props) => ReactDOM.jsx("div", {})
-  let make = {
-    let \"NoPropsWithKey$V4CA" = props => make(props)
-
-    \"NoPropsWithKey$V4CA"
-  }
-}
-
-module V4CB = {
-  @live
-  type props = {}
-
-  @module("c")
-  external make: React.componentLike<props, React.element> = "component"
-}
-
-module V4C = {
-  type props = {}
-
-  let make = (_: props) =>
-    React.jsxs(
-      React.jsxFragment,
-      {
-        children: React.array([
-          React.jsxKeyed(V4CA.make, {}, ~key="k", ()),
-          React.jsxKeyed(V4CB.make, {}, ~key="k", ()),
-        ]),
-      },
-    )
-  let make = {
-    let \"NoPropsWithKey$V4C" = props => make(props)
-
-    \"NoPropsWithKey$V4C"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/optimizeAutomaticMode.res.txt b/jscomp/syntax/tests/ppx/react/expected/optimizeAutomaticMode.res.txt
deleted file mode 100644
index 18a5a31..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/optimizeAutomaticMode.res.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module User = {
-  type t = {firstName: string, lastName: string}
-
-  let format = user => "Dr." ++ user.lastName
-  type props<'doctor> = {doctor: 'doctor}
-
-  let make = ({doctor, _}: props<_>) => {
-    ReactDOM.jsx("h1", {id: "h1", children: ?ReactDOM.someElement({React.string(format(doctor))})})
-  }
-  let make = {
-    let \"OptimizeAutomaticMode$User" = (props: props<_>) => make(props)
-
-    \"OptimizeAutomaticMode$User"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/optionalKeyType.res.txt b/jscomp/syntax/tests/ppx/react/expected/optionalKeyType.res.txt
deleted file mode 100644
index 6e15939..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/optionalKeyType.res.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-let key = None
-
-@@jsxConfig({version: 3})
-
-let _ = React.createElement(C.make, C.makeProps(~key="k", ()))
-let _ = React.createElement(C.make, C.makeProps(~key=?Some("k"), ()))
-let _ = React.createElement(C.make, C.makeProps(~key?, ()))
-let _ = ReactDOMRe.createDOMElementVariadic("div", ~props=ReactDOMRe.domProps(~key="k", ()), [])
-let _ = ReactDOMRe.createDOMElementVariadic(
-  "div",
-  ~props=ReactDOMRe.domProps(~key=?Some("k"), ()),
-  [],
-)
-let _ = ReactDOMRe.createDOMElementVariadic("div", ~props=ReactDOMRe.domProps(~key?, ()), [])
-let _ = ReactDOMRe.createDOMElementVariadic(
-  "div",
-  ~props=ReactDOMRe.domProps(~key="k", ()),
-  [ReactDOMRe.createDOMElementVariadic("br", []), ReactDOMRe.createDOMElementVariadic("br", [])],
-)
-let _ = ReactDOMRe.createDOMElementVariadic(
-  "div",
-  ~props=ReactDOMRe.domProps(~key=?Some("k"), ()),
-  [ReactDOMRe.createDOMElementVariadic("br", []), ReactDOMRe.createDOMElementVariadic("br", [])],
-)
-let _ = ReactDOMRe.createDOMElementVariadic(
-  "div",
-  ~props=ReactDOMRe.domProps(~key?, ()),
-  [ReactDOMRe.createDOMElementVariadic("br", []), ReactDOMRe.createDOMElementVariadic("br", [])],
-)
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-let _ = JsxPPXReactSupport.createElementWithKey(~key="k", C.make, {})
-let _ = JsxPPXReactSupport.createElementWithKey(~key=?Some("k"), C.make, {})
-let _ = JsxPPXReactSupport.createElementWithKey(~key?, C.make, {})
-let _ = ReactDOM.createDOMElementVariadic("div", ~props={key: "k"}, [])
-let _ = ReactDOM.createDOMElementVariadic("div", ~props={key: ?Some("k")}, [])
-let _ = ReactDOM.createDOMElementVariadic("div", ~props={key: ?key}, [])
-let _ = ReactDOM.createDOMElementVariadic(
-  "div",
-  ~props={key: "k"},
-  [ReactDOM.createDOMElementVariadic("br", []), ReactDOM.createDOMElementVariadic("br", [])],
-)
-let _ = ReactDOM.createDOMElementVariadic(
-  "div",
-  ~props={key: ?Some("k")},
-  [ReactDOM.createDOMElementVariadic("br", []), ReactDOM.createDOMElementVariadic("br", [])],
-)
-let _ = ReactDOM.createDOMElementVariadic(
-  "div",
-  ~props={key: ?key},
-  [ReactDOM.createDOMElementVariadic("br", []), ReactDOM.createDOMElementVariadic("br", [])],
-)
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-let _ = React.jsxKeyed(C.make, {}, ~key="k", ())
-let _ = React.jsxKeyed(C.make, {}, ~key=?Some("k"), ())
-let _ = React.jsxKeyed(C.make, {}, ~key?, ())
-let _ = ReactDOM.jsxKeyed("div", {}, ~key="k", ())
-let _ = ReactDOM.jsxKeyed("div", {}, ~key=?Some("k"), ())
-let _ = ReactDOM.jsxKeyed("div", {}, ~key?, ())
-let _ = ReactDOM.jsxsKeyed(
-  "div",
-  {children: React.array([ReactDOM.jsx("br", {}), ReactDOM.jsx("br", {})])},
-  ~key="k",
-  (),
-)
-let _ = ReactDOM.jsxsKeyed(
-  "div",
-  {children: React.array([ReactDOM.jsx("br", {}), ReactDOM.jsx("br", {})])},
-  ~key=?Some("k"),
-  (),
-)
-let _ = ReactDOM.jsxsKeyed(
-  "div",
-  {children: React.array([ReactDOM.jsx("br", {}), ReactDOM.jsx("br", {})])},
-  ~key?,
-  (),
-)
diff --git a/jscomp/syntax/tests/ppx/react/expected/removedKeyProp.res.txt b/jscomp/syntax/tests/ppx/react/expected/removedKeyProp.res.txt
deleted file mode 100644
index bad43e7..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/removedKeyProp.res.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@@jsxConfig({version: 4, mode: "classic"})
-
-module Foo = {
-  type props<'x, 'y> = {x: 'x, y: 'y}
-
-  let make = ({x, y, _}: props<_, _>) => React.string(x ++ y)
-  let make = {
-    let \"RemovedKeyProp$Foo" = (props: props<_>) => make(props)
-
-    \"RemovedKeyProp$Foo"
-  }
-}
-
-module HasChildren = {
-  type props<'children> = {children: 'children}
-
-  let make = ({children, _}: props<_>) => React.createElement(React.fragment, {children: children})
-  let make = {
-    let \"RemovedKeyProp$HasChildren" = (props: props<_>) => make(props)
-
-    \"RemovedKeyProp$HasChildren"
-  }
-}
-type props = {}
-
-let make = (_: props) =>
-  React.createElementVariadic(
-    React.fragment,
-    {},
-    [
-      JsxPPXReactSupport.createElementWithKey(~key="k", Foo.make, {x: "x", y: "y"}),
-      React.createElement(Foo.make, {x: "x", y: "y"}),
-      JsxPPXReactSupport.createElementWithKey(
-        ~key="k",
-        HasChildren.make,
-        {
-          children: React.createElement(Foo.make, {x: "x", y: "y"}),
-        },
-      ),
-      React.createElement(
-        HasChildren.make,
-        {
-          children: React.createElement(Foo.make, {x: "x", y: "y"}),
-        },
-      ),
-    ],
-  )
-let make = {
-  let \"RemovedKeyProp" = props => make(props)
-
-  \"RemovedKeyProp"
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/sharedProps.res.txt b/jscomp/syntax/tests/ppx/react/expected/sharedProps.res.txt
deleted file mode 100644
index c200b5b..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/sharedProps.res.txt
+++ /dev/null
@@ -1,139 +0,0 @@
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C1 = {
-  type props = sharedProps<string>
-
-  let make = ({x, y, _}: props) => React.string(x ++ y)
-  let make = {
-    let \"SharedProps$V4C1" = props => make(props)
-
-    \"SharedProps$V4C1"
-  }
-}
-
-module V4C2 = {
-  type props<'a> = sharedProps<'a>
-
-  let make = ({x, y, _}: props<_>) => React.string(x ++ y)
-  let make = {
-    let \"SharedProps$V4C2" = (props: props<_>) => make(props)
-
-    \"SharedProps$V4C2"
-  }
-}
-
-module V4C3 = {
-  type props<'a> = sharedProps<string, 'a>
-
-  let make = ({x, y, _}: props<_>) => React.string(x ++ y)
-  let make = {
-    let \"SharedProps$V4C3" = (props: props<_>) => make(props)
-
-    \"SharedProps$V4C3"
-  }
-}
-
-module V4C4 = {
-  type props = sharedProps
-
-  let make = ({x, y, _}: props) => React.string(x ++ y)
-  let make = {
-    let \"SharedProps$V4C4" = props => make(props)
-
-    \"SharedProps$V4C4"
-  }
-}
-
-module V4C5 = {
-  type props = sharedProps<string>
-
-  external make: React.componentLike<props, React.element> = "default"
-}
-
-module V4C6 = {
-  type props<'a> = sharedProps<'a>
-
-  external make: React.componentLike<props<_>, React.element> = "default"
-}
-
-module V4C7 = {
-  type props<'a> = sharedProps<string, 'a>
-
-  external make: React.componentLike<props<_>, React.element> = "default"
-}
-
-module V4C8 = {
-  type props = sharedProps
-
-  external make: React.componentLike<props, React.element> = "default"
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A1 = {
-  type props = sharedProps<string>
-
-  let make = ({x, y, _}: props) => React.string(x ++ y)
-  let make = {
-    let \"SharedProps$V4A1" = props => make(props)
-
-    \"SharedProps$V4A1"
-  }
-}
-
-module V4A2 = {
-  type props<'a> = sharedProps<'a>
-
-  let make = ({x, y, _}: props<_>) => React.string(x ++ y)
-  let make = {
-    let \"SharedProps$V4A2" = (props: props<_>) => make(props)
-
-    \"SharedProps$V4A2"
-  }
-}
-
-module V4A3 = {
-  type props<'a> = sharedProps<string, 'a>
-
-  let make = ({x, y, _}: props<_>) => React.string(x ++ y)
-  let make = {
-    let \"SharedProps$V4A3" = (props: props<_>) => make(props)
-
-    \"SharedProps$V4A3"
-  }
-}
-
-module V4A4 = {
-  type props = sharedProps
-
-  let make = ({x, y, _}: props) => React.string(x ++ y)
-  let make = {
-    let \"SharedProps$V4A4" = props => make(props)
-
-    \"SharedProps$V4A4"
-  }
-}
-
-module V4A5 = {
-  type props = sharedProps<string>
-
-  external make: React.componentLike<props, React.element> = "default"
-}
-
-module V4A6 = {
-  type props<'a> = sharedProps<'a>
-
-  external make: React.componentLike<props<_>, React.element> = "default"
-}
-
-module V4A7 = {
-  type props<'a> = sharedProps<string, 'a>
-
-  external make: React.componentLike<props<_>, React.element> = "default"
-}
-
-module V4A8 = {
-  type props = sharedProps
-
-  external make: React.componentLike<props, React.element> = "default"
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/sharedProps.resi.txt b/jscomp/syntax/tests/ppx/react/expected/sharedProps.resi.txt
deleted file mode 100644
index e87f202..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/sharedProps.resi.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C1: {
-  type props = sharedProps<string>
-
-  let make: React.componentLike<props, React.element>
-}
-
-module V4C2: {
-  type props<'a> = sharedProps<'a>
-
-  let make: React.componentLike<props<_>, React.element>
-}
-
-module V4C3: {
-  type props<'a> = sharedProps<string, 'a>
-
-  let make: React.componentLike<props<_>, React.element>
-}
-
-module V4C4: {
-  type props = sharedProps
-
-  let make: React.componentLike<props, React.element>
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A1: {
-  type props = sharedProps<string>
-
-  let make: React.componentLike<props, React.element>
-}
-
-module V4A2: {
-  type props<'a> = sharedProps<'a>
-
-  let make: React.componentLike<props<_>, React.element>
-}
-
-module V4A3: {
-  type props<'a> = sharedProps<string, 'a>
-
-  let make: React.componentLike<props<_>, React.element>
-}
-
-module V4A4: {
-  type props = sharedProps
-
-  let make: React.componentLike<props, React.element>
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/spreadProps.res.txt b/jscomp/syntax/tests/ppx/react/expected/spreadProps.res.txt
deleted file mode 100644
index 00fba01..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/spreadProps.res.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-@@jsxConfig({version: 4, mode: "classic"})
-// Error: spreadProps should be first in order than other props
-// let c0 = <A x="x" {...p} />
-
-// Error: multiple spreadProps not allowed
-// let c0 = <A x="x" {...p0} {...p1} />
-
-// only spread props
-let c1 = React.createElement(A.make, p)
-
-// reversed order
-let c2 = React.createElement(A.make, {...p, x: "x"})
-
-let c3 = ReactDOM.createDOMElementVariadic("div", ~props=p, [])
-
-let c4 = ReactDOM.createDOMElementVariadic("div", ~props={...p, x: "x", key: "k"}, [])
-
-let c4 = ReactDOM.createDOMElementVariadic(
-  "div",
-  ~props={...p, key: "k"},
-  [ReactDOM.createDOMElementVariadic("br", []), ReactDOM.createDOMElementVariadic("br", [])],
-)
-
-let c5 = ReactDOM.createDOMElementVariadic(
-  "div",
-  ~props={...p, key: "k"},
-  [ReactDOM.createDOMElementVariadic("br", []), ReactDOM.createDOMElementVariadic("br", [])],
-)
-
-// both need to be parsed
-let c6 = React.createElement(A.make, params->Obj.magic)
-let c7 = React.createElement(A.make, params->Obj.magic)
-
-@@jsxConfig({version: 4, mode: "automatic"})
-// Error: spreadProps should be first in order than other props
-// let c0 = <A x="x" {...p} />
-
-// Error: multiple spreadProps not allowed
-// let c0 = <A x="x" {...p0} {...p1} />
-
-// only spread props
-let c1 = React.jsx(A.make, p)
-
-// reversed order
-let c2 = React.jsx(A.make, {...p, x: "x"})
-
-let c3 = ReactDOM.jsx("div", p)
-
-let c4 = ReactDOM.jsxKeyed("div", {...p, x: "x"}, ~key="k", ())
-
-let c5 = ReactDOM.jsxsKeyed(
-  "div",
-  {...p, children: React.array([ReactDOM.jsx("br", {}), ReactDOM.jsx("br", {})])},
-  ~key="k",
-  (),
-)
-
-// both need to be parsed
-let c6 = React.jsx(A.make, params->Obj.magic)
-let c7 = React.jsx(A.make, params->Obj.magic)
diff --git a/jscomp/syntax/tests/ppx/react/expected/topLevel.res.txt b/jscomp/syntax/tests/ppx/react/expected/topLevel.res.txt
deleted file mode 100644
index 36e60ae..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/topLevel.res.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @obj external makeProps: (~a: 'a, ~b: 'b, ~key: string=?, unit) => {"a": 'a, "b": 'b} = ""
-
-  @react.component
-  let make =
-    @warning("-16")
-    (~a) =>
-      @warning("-16")
-      (~b, _) => {
-        Js.log("This function should be named 'TopLevel.react'")
-        ReactDOMRe.createDOMElementVariadic("div", [])
-      }
-  let make = {
-    let \"TopLevel$V3" = (\"Props": {"a": 'a, "b": 'b}) =>
-      make(~b=\"Props"["b"], ~a=\"Props"["a"], ())
-    \"TopLevel$V3"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  type props<'a, 'b> = {a: 'a, b: 'b}
-
-  let make = ({a, b, _}: props<_, _>) => {
-    Js.log("This function should be named 'TopLevel.react'")
-    ReactDOM.createDOMElementVariadic("div", [])
-  }
-  let make = {
-    let \"TopLevel$V4C" = (props: props<_>) => make(props)
-
-    \"TopLevel$V4C"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A = {
-  type props<'a, 'b> = {a: 'a, b: 'b}
-
-  let make = ({a, b, _}: props<_, _>) => {
-    Js.log("This function should be named 'TopLevel.react'")
-    ReactDOM.jsx("div", {})
-  }
-  let make = {
-    let \"TopLevel$V4A" = (props: props<_>) => make(props)
-
-    \"TopLevel$V4A"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/typeConstraint.res.txt b/jscomp/syntax/tests/ppx/react/expected/typeConstraint.res.txt
deleted file mode 100644
index 9cb9635..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/typeConstraint.res.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @obj external makeProps: (~a: 'a, ~b: 'b, ~key: string=?, unit) => {"a": 'a, "b": 'b} = ""
-
-  @react.component
-  let make:
-    type a. (~a: a, ~b: a, a) => React.element =
-    (~a, ~b, _) => ReactDOMRe.createDOMElementVariadic("div", [])
-  let make = {
-    let \"TypeConstraint$V3" = (\"Props": {"a": 'a, "b": 'b}) =>
-      make(~b=\"Props"["b"], ~a=\"Props"["a"])
-    \"TypeConstraint$V3"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  type props<'a, 'b> = {a: 'a, b: 'b}
-
-  let make = (type a, {a, b, _}: props<_, _>) => ReactDOM.createDOMElementVariadic("div", [])
-  let make = {
-    let \"TypeConstraint$V4C" = (props: props<_>) => make(props)
-
-    \"TypeConstraint$V4C"
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A = {
-  type props<'a, 'b> = {a: 'a, b: 'b}
-
-  let make = (type a, {a, b, _}: props<_, _>) => ReactDOM.jsx("div", {})
-  let make = {
-    let \"TypeConstraint$V4A" = (props: props<_>) => make(props)
-
-    \"TypeConstraint$V4A"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/uncurriedProps.res.txt b/jscomp/syntax/tests/ppx/react/expected/uncurriedProps.res.txt
deleted file mode 100644
index a08fc21..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/uncurriedProps.res.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-@@jsxConfig({version: 4})
-type props<'a> = {a?: 'a}
-
-let make = ({a: ?__a, _}: props<(. unit) => unit>) => {
-  let a = switch __a {
-  | Some(a) => a
-  | None => (. ()) => ()
-  }
-
-  React.null
-}
-let make = {
-  let \"UncurriedProps" = (props: props<_>) => make(props)
-
-  \"UncurriedProps"
-}
-
-let func = (~callback: (. string, bool, bool) => unit=(. _, _, _) => (), ()) => {
-  let _ = callback
-}
-
-func(~callback=(. str, a, b) => {
-  let _ = str
-  let _ = a
-  let _ = b
-}, ())
-
-module Foo = {
-  type props<'callback> = {callback?: 'callback}
-
-  let make = ({callback: ?__callback, _}: props<(. string, bool, bool) => unit>) => {
-    let callback = switch __callback {
-    | Some(callback) => callback
-    | None => (. _, _, _) => ()
-    }
-
-    {
-      React.null
-    }
-  }
-  let make = {
-    let \"UncurriedProps$Foo" = (props: props<_>) => make(props)
-
-    \"UncurriedProps$Foo"
-  }
-}
-
-module Bar = {
-  type props = {}
-
-  let make = (_: props) => React.jsx(Foo.make, {callback: (. _, _, _) => ()})
-  let make = {
-    let \"UncurriedProps$Bar" = props => make(props)
-
-    \"UncurriedProps$Bar"
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/expected/v4.res.txt b/jscomp/syntax/tests/ppx/react/expected/v4.res.txt
deleted file mode 100644
index b0f8ded..0000000
--- a/jscomp/syntax/tests/ppx/react/expected/v4.res.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-type props<'x, 'y> = {x: 'x, y: 'y} // Component with type constraint
-let make = ({x, y, _}: props<string, string>) => React.string(x ++ y)
-let make = {
-  let \"V4" = (props: props<_>) => make(props)
-  \"V4"
-}
-
-module AnotherName = {
-  type // Component with another name than "make"
-  props<'x> = {x: 'x}
-
-  let anotherName = ({x, _}: props<_>) => React.string(x)
-  let anotherName = {
-    let \"V4$AnotherName$anotherName" = (props: props<_>) => anotherName(props)
-
-    \"V4$AnotherName$anotherName"
-  }
-}
-
-module Uncurried = {
-  type props<'x> = {x: 'x}
-
-  let make = ({x, _}: props<_>) => React.string(x)
-  let make = {
-    let \"V4$Uncurried" = (props: props<_>) => make(props)
-
-    \"V4$Uncurried"
-  }
-}
-
-module type TUncurried = {
-  type props<'x> = {x: 'x}
-
-  let make: React.componentLike<props<string>, React.element>
-}
-
-module E = {
-  @live
-  type props<'x> = {x: 'x}
-
-  external make: React.componentLike<props<string>, React.element> = "default"
-}
-
-module EUncurried = {
-  @live
-  type props<'x> = {x: 'x}
-
-  external make: React.componentLike<props<string>, React.element> = "default"
-}
-
-module Rec = {
-  type props = {}
-
-  let rec make = {
-    @merlin.focus
-    let \"make$Internal" = (_: props) => {
-      make(({}: props))
-    }
-    let make = {
-      let \"V4$Rec" = props => \"make$Internal"(props)
-
-      \"V4$Rec"
-    }
-    make
-  }
-}
-
-module Rec1 = {
-  type props = {}
-
-  let rec make = {
-    @merlin.focus
-    let \"make$Internal" = (_: props) => {
-      React.null
-    }
-    let make = {
-      let \"V4$Rec1" = props => \"make$Internal"(props)
-
-      \"V4$Rec1"
-    }
-    make
-  }
-}
-
-module Rec2 = {
-  type props = {}
-
-  let rec make = {
-    @merlin.focus
-    let \"make$Internal" = (_: props) => {
-      mm(({}: props))
-    }
-    let make = {
-      let \"V4$Rec2" = props => \"make$Internal"(props)
-
-      \"V4$Rec2"
-    }
-    make
-  }
-  and mm = x => make(x)
-}
diff --git a/jscomp/syntax/tests/ppx/react/externalWithCustomName.res b/jscomp/syntax/tests/ppx/react/externalWithCustomName.res
deleted file mode 100644
index fc3602f..0000000
--- a/jscomp/syntax/tests/ppx/react/externalWithCustomName.res
+++ /dev/null
@@ -1,26 +0,0 @@
-@@jsxConfig({version: 3})
-
-module Foo = {
-  @react.component @module("Foo")
-  external component: (~a: int, ~b: string, _) => React.element = "component"
-}
-
-let t = <Foo.component a=1 b={"1"} />
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module Foo = {
-  @react.component @module("Foo")
-  external component: (~a: int, ~b: string, _) => React.element = "component"
-}
-
-let t = <Foo.component a=1 b={"1"} />
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module Foo = {
-  @react.component @module("Foo")
-  external component: (~a: int, ~b: string, _) => React.element = "component"
-}
-
-let t = <Foo.component a=1 b={"1"} />
diff --git a/jscomp/syntax/tests/ppx/react/externalWithRef.res b/jscomp/syntax/tests/ppx/react/externalWithRef.res
deleted file mode 100644
index 9fa0c3b..0000000
--- a/jscomp/syntax/tests/ppx/react/externalWithRef.res
+++ /dev/null
@@ -1,37 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @module("componentForwardRef") @react.component
-    external make: (
-      ~x: string,
-      ~ref: ReactDOM.Ref.currentDomRef=?,
-    ) => React.element = "component"
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  @module("componentForwardRef") @react.component
-    external make: (
-      ~x: string,
-      ~ref: ReactDOM.Ref.currentDomRef=?,
-    ) => React.element = "component"
-}
-
-module type V4CType = {
-  @module("someModule") @react.component
-    external make: (
-      ~x: string,
-      ~y: string,
-    ) => React.element = "component"
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4C = {
-  @module("componentForwardRef") @react.component
-    external make: (
-      ~x: string,
-      ~ref: ReactDOM.Ref.currentDomRef=?,
-    ) => React.element = "component"
-}
diff --git a/jscomp/syntax/tests/ppx/react/externalWithTypeVariables.res b/jscomp/syntax/tests/ppx/react/externalWithTypeVariables.res
deleted file mode 100644
index 9672252..0000000
--- a/jscomp/syntax/tests/ppx/react/externalWithTypeVariables.res
+++ /dev/null
@@ -1,29 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @module("c") @react.component
-    external make: (
-      ~x: t<'a>,
-      ~children: React.element,
-    ) => React.element = "component"
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  @module("c") @react.component
-    external make: (
-      ~x: t<'a>,
-      ~children: React.element,
-    ) => React.element = "component"
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4C = {
-  @module("c") @react.component
-    external make: (
-      ~x: t<'a>,
-      ~children: React.element,
-    ) => React.element = "component"
-}
diff --git a/jscomp/syntax/tests/ppx/react/fileLevelConfig.res b/jscomp/syntax/tests/ppx/react/fileLevelConfig.res
deleted file mode 100644
index b4e2459..0000000
--- a/jscomp/syntax/tests/ppx/react/fileLevelConfig.res
+++ /dev/null
@@ -1,26 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @react.component
-  let make = (~msg) => {
-    <div> {msg->React.string} </div>
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  @react.component
-  let make = (~msg) => {
-    <div> {msg->React.string} </div>
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A = {
-  @react.component
-  let make = (~msg) => {
-    <div> {msg->React.string} </div>
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/firstClassModules.res b/jscomp/syntax/tests/ppx/react/firstClassModules.res
deleted file mode 100644
index 9567f43..0000000
--- a/jscomp/syntax/tests/ppx/react/firstClassModules.res
+++ /dev/null
@@ -1,56 +0,0 @@
-@@jsxConfig({version: 3})
-
-module Select = {
-  module type T = {
-    type key
-    type t
-  }
-
-  @react.component
-  let make = (
-    type a key,
-    ~model as module(T: T with type t = a and type key = key),
-    ~selected: option<key>,
-    ~onChange: option<key> => unit,
-    ~items: array<a>,
-  ) => {
-    let _ = (model, selected, onChange, items)
-    <div />
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module Select = {
-  module type T = {
-    type key
-    type t
-  }
-
-  @react.component
-  let make = (
-    type a key,
-    ~model as module(T: T with type t = a and type key = key),
-    ~selected: option<key>,
-    ~onChange: option<key> => unit,
-    ~items: array<a>,
-  ) => {
-    let _ = (model, selected, onChange, items)
-    <div />
-  }
-}
-
-module External = {
-  module type T = {
-    type key
-    type t
-  }
-
-  @react.component @module("c")
-  external make: (
-    ~model: module(T with type t = 'a and type key = 'key),
-    ~selected: option<'key>,
-    ~onChange: option<'key> => unit,
-    ~items: array<'a>,
-  ) => React.element = "default"
-}
diff --git a/jscomp/syntax/tests/ppx/react/firstClassModules.resi b/jscomp/syntax/tests/ppx/react/firstClassModules.resi
deleted file mode 100644
index 9f601b3..0000000
--- a/jscomp/syntax/tests/ppx/react/firstClassModules.resi
+++ /dev/null
@@ -1,33 +0,0 @@
-@@jsxConfig({version: 3})
-
-module Select: {
-  module type T = {
-    type key
-    type t
-  }
-
-  @react.component
-  let make: (
-    ~model: module(T with type t = 'a and type key = 'key),
-    ~selected: option<'key>,
-    ~onChange: option<'key> => unit,
-    ~items: array<'a>,
-  ) => React.element
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module Select: {
-  module type T = {
-    type key
-    type t
-  }
-
-  @react.component
-  let make: (
-    ~model: module(T with type t = 'a and type key = 'key),
-    ~selected: option<'key>,
-    ~onChange: option<'key> => unit,
-    ~items: array<'a>,
-  ) => React.element
-}
diff --git a/jscomp/syntax/tests/ppx/react/forwardRef.res b/jscomp/syntax/tests/ppx/react/forwardRef.res
deleted file mode 100644
index b814e14..0000000
--- a/jscomp/syntax/tests/ppx/react/forwardRef.res
+++ /dev/null
@@ -1,130 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  module FancyInput = {
-    @react.component
-    let make = React.forwardRef((~className=?, ~children, ref) =>
-      <div>
-        <input
-          type_="text"
-          ?className
-          ref=?{Js.Nullable.toOption(ref)->Belt.Option.map(ReactDOM.Ref.domRef)}
-        />
-        children
-      </div>
-    )
-  }
-
-  @react.component
-  let make = () => {
-    let input = React.useRef(Js.Nullable.null)
-
-    <div>
-      <FancyInput ref=input> {React.string("Click to focus")} </FancyInput>
-    </div>
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  module FancyInput = {
-    @react.component
-    let make = React.forwardRef((~className=?, ~children, ref: Js.Nullable.t<ReactRef.currentDomRef>) =>
-      <div>
-        <input
-          type_="text"
-          ?className
-          ref=?{Js.Nullable.toOption(ref)->Belt.Option.map(React.Ref.domRef)}
-        />
-        children
-      </div>
-    )
-  }
-
-  @react.component
-  let make = () => {
-    let input = React.useRef(Js.Nullable.null)
-
-    <div>
-      <FancyInput ref=input> {React.string("Click to focus")} </FancyInput>
-    </div>
-  }
-}
-
-module V4CUncurried = {
-  module FancyInput = {
-    @react.component
-    let make = React.forwardRef((. ~className=?, ~children, ref: Js.Nullable.t<ReactRef.currentDomRef>) =>
-      <div>
-        <input
-          type_="text"
-          ?className
-          ref=?{Js.Nullable.toOption(ref)->Belt.Option.map(React.Ref.domRef)}
-        />
-        children
-      </div>
-    )
-  }
-
-  @react.component
-  let make = () => {
-    let input = React.useRef(Js.Nullable.null)
-
-    <div>
-      <FancyInput ref=input> {React.string("Click to focus")} </FancyInput>
-    </div>
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A = {
-  module FancyInput = {
-    @react.component
-    let make = React.forwardRef((~className=?, ~children, ref) =>
-      <div>
-        <input
-          type_="text"
-          ?className
-          ref=?{Js.Nullable.toOption(ref)->Belt.Option.map(ReactDOM.Ref.domRef)}
-        />
-        children
-      </div>
-    )
-  }
-
-  @react.component
-  let make = () => {
-    let input = React.useRef(Js.Nullable.null)
-
-    <div>
-      <FancyInput ref=input> {React.string("Click to focus")} </FancyInput>
-    </div>
-  }
-}
-
-module V4AUncurried = {
-  module FancyInput = {
-    @react.component
-    let make = React.forwardRef((. ~className=?, ~children, ref) =>
-      <div>
-        <input
-          type_="text"
-          ?className
-          ref=?{Js.Nullable.toOption(ref)->Belt.Option.map(ReactDOM.Ref.domRef)}
-        />
-        children
-      </div>
-    )
-  }
-
-  @react.component
-  let make = () => {
-    let input = React.useRef(Js.Nullable.null)
-
-    <div>
-      <FancyInput ref=input> {React.string("Click to focus")} </FancyInput>
-    </div>
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/forwardRef.resi b/jscomp/syntax/tests/ppx/react/forwardRef.resi
deleted file mode 100644
index 5dba516..0000000
--- a/jscomp/syntax/tests/ppx/react/forwardRef.resi
+++ /dev/null
@@ -1,85 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3: {
-  module FancyInput: {
-    @react.component
-    let make: (
-      ~className: string=?,
-      ~children: React.element,
-      ~ref: ReactDOM.Ref.currentDomRef=?,
-    ) => React.element
-  }
-
-  module ForwardRef: {
-    @react.component
-    let make: (~ref: React.ref<Js.Nullable.t<inputRef>>=?) => React.element
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C: {
-  module FancyInput: {
-    @react.component
-    let make: (
-      ~className: string=?,
-      ~children: React.element,
-      ~ref: ReactDOM.Ref.currentDomRef=?,
-    ) => React.element
-  }
-
-  module ForwardRef: {
-    @react.component
-    let make: (~ref: React.ref<Js.Nullable.t<inputRef>>=?) => React.element
-  }
-}
-
-module V4CUncurried: {
-  module FancyInput: {
-    @react.component
-    let make: (
-      ~className: string=?,
-      ~children: React.element,
-      ~ref: ReactDOM.Ref.currentDomRef=?,
-    ) => React.element
-  }
-
-  module ForwardRef: {
-    @react.component
-    let make: (~ref: React.ref<Js.Nullable.t<inputRef>>=?) => React.element
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A: {
-  module FancyInput: {
-    @react.component
-    let make: (
-      ~className: string=?,
-      ~children: React.element,
-      ~ref: ReactDOM.Ref.currentDomRef=?,
-    ) => React.element
-  }
-
-  module ForwardRef: {
-    @react.component
-    let make: (~ref: React.ref<Js.Nullable.t<inputRef>>=?) => React.element
-  }
-}
-
-module V4AUncurried: {
-  module FancyInput: {
-    @react.component
-    let make: (
-      ~className: string=?,
-      ~children: React.element,
-      ~ref: ReactDOM.Ref.currentDomRef=?,
-    ) => React.element
-  }
-
-  module ForwardRef: {
-    @react.component
-    let make: (~ref: React.ref<Js.Nullable.t<inputRef>>=?) => React.element
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/fragment.res b/jscomp/syntax/tests/ppx/react/fragment.res
deleted file mode 100644
index 741e169..0000000
--- a/jscomp/syntax/tests/ppx/react/fragment.res
+++ /dev/null
@@ -1,29 +0,0 @@
-@@jsxConfig({version:4, mode: "classic"})
-
-let _ = <></>
-let _ = <><div /></>
-let _ = <><div /><div /></>
-let _ = <><></></>
-let _ = <Z />
-let _ = <Z><div /></Z>
-let _ = <Z a="a"><div /></Z>
-let _ = <Z><div /><div /></Z>
-let _ = <div />
-let _ = <div><div /></div>
-let _ = <div id="id"><div /></div>
-let _ = <div><div /><div /></div>
-
-@@jsxConfig({version:4, mode: "automatic"})
-
-let _ = <></>
-let _ = <><div /></>
-let _ = <><div /><div /></>
-let _ = <><></></>
-let _ = <Z />
-let _ = <Z><div /></Z>
-let _ = <Z a="a"><div /></Z>
-let _ = <Z><div /><div /></Z>
-let _ = <div />
-let _ = <div><div /></div>
-let _ = <div id="id"><div /></div>
-let _ = <div><div /><div /></div>
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/innerModule.res b/jscomp/syntax/tests/ppx/react/innerModule.res
deleted file mode 100644
index 742f8a6..0000000
--- a/jscomp/syntax/tests/ppx/react/innerModule.res
+++ /dev/null
@@ -1,13 +0,0 @@
-@@jsxConfig({version: 3})
-module Bar = {
-  @react.component
-  let make = (~a, ~b, _) => {
-    Js.log("This function should be named `InnerModule.react$Bar`")
-    <div />
-  }
-  @react.component
-  let component = (~a, ~b, _) => {
-    Js.log("This function should be named `InnerModule.react$Bar$component`")
-    <div />
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/interface.res b/jscomp/syntax/tests/ppx/react/interface.res
deleted file mode 100644
index acf2cc4..0000000
--- a/jscomp/syntax/tests/ppx/react/interface.res
+++ /dev/null
@@ -1,9 +0,0 @@
-module A = {
-  @react.component
-  let make = (~x) => React.string(x)
-}
-
-module NoProps = {
-  @react.component
-  let make = () => <div />
-}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/interface.resi b/jscomp/syntax/tests/ppx/react/interface.resi
deleted file mode 100644
index 0ce4ff3..0000000
--- a/jscomp/syntax/tests/ppx/react/interface.resi
+++ /dev/null
@@ -1,9 +0,0 @@
-module A: {
-  @react.component
-  let make: (~x: string) => React.element
-}
-
-module NoProps: {
-  @react.component
-  let make: unit => React.element
-}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/interfaceWithRef.res b/jscomp/syntax/tests/ppx/react/interfaceWithRef.res
deleted file mode 100644
index ebe84c7..0000000
--- a/jscomp/syntax/tests/ppx/react/interfaceWithRef.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@react.component
-let make = React.forwardRef((~x: string, ref: Js.Nullable.t<ReactDOM.Ref.currentDomRef>) => {
-  let _ = ref->Js.Nullable.toOption->Belt.Option.map(ReactDOM.Ref.domRef)
-  React.string(x)
-})
diff --git a/jscomp/syntax/tests/ppx/react/interfaceWithRef.resi b/jscomp/syntax/tests/ppx/react/interfaceWithRef.resi
deleted file mode 100644
index 998a794..0000000
--- a/jscomp/syntax/tests/ppx/react/interfaceWithRef.resi
+++ /dev/null
@@ -1,2 +0,0 @@
-@react.component
-let make: (~x: string, ~ref: ReactDOM.Ref.currentDomRef=?) => React.element
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/lowercases.res b/jscomp/syntax/tests/ppx/react/lowercases.res
deleted file mode 100644
index 1dba63d..0000000
--- a/jscomp/syntax/tests/ppx/react/lowercases.res
+++ /dev/null
@@ -1,12 +0,0 @@
-@@jsxConfig({version:4, mode:"classic"})
-
-let _ = <div />
-let _ = <div key="k" />
-let _ = <div x />
-let _ = <div><p>{React.string(x)}</p></div>
-let _ = <div {...str} />
-let _ = <div {...str} x="x" />
-
-// syntax error
-// let _ = <div x="x" {...str} />
-// let _ = <div {...str} {...str} />
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/mangleKeyword.res b/jscomp/syntax/tests/ppx/react/mangleKeyword.res
deleted file mode 100644
index 94dad3c..0000000
--- a/jscomp/syntax/tests/ppx/react/mangleKeyword.res
+++ /dev/null
@@ -1,47 +0,0 @@
-@@jsxConfig({version: 3})
-
-module C3A0 = {
-  @react.component
-  let make =
-    (@as("open") ~_open, @as("type") ~_type: string) => React.string(_open)
-}
-module C3A1 = {
-  @react.component
-  external make: (@as("open") ~_open: string, @as("type") ~_type: string) => React.element =
-    "default"
-}
-
-let c3a0 = <C3A0 _open="x" _type="t" />
-let c3a1 = <C3A1 _open="x" _type="t" />
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module C4C0 = {
-  @react.component
-  let make =
-    (@as("open") ~_open, @as("type") ~_type: string) => React.string(_open)
-}
-module C4C1 = {
-  @react.component
-  external make: (@as("open") ~_open: string, @as("type") ~_type: string) => React.element =
-    "default"
-}
-
-let c4c0 = <C4C0 _open="x" _type="t" />
-let c4c1 = <C4C1 _open="x" _type="t" />
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module C4A0 = {
-  @react.component
-  let make =
-    (@as("open") ~_open, @as("type") ~_type: string) => React.string(_open)
-}
-module C4A1 = {
-  @react.component
-  external make: (@as("open") ~_open: string, @as("type") ~_type: string) => React.element =
-    "default"
-}
-
-let c4a0 = <C4A0 _open="x" _type="t" />
-let c4a1 = <C4A1 _open="x" _type="t" />
diff --git a/jscomp/syntax/tests/ppx/react/nested.res b/jscomp/syntax/tests/ppx/react/nested.res
deleted file mode 100644
index c7382d0..0000000
--- a/jscomp/syntax/tests/ppx/react/nested.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module Outer = {
-  @react.component
-  let make = () => {
-    module Inner = {
-      @react.component
-      let make = () => <div />
-    }
-
-    <Inner />
-  }
-}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/newtype.res b/jscomp/syntax/tests/ppx/react/newtype.res
deleted file mode 100644
index e1d859a..0000000
--- a/jscomp/syntax/tests/ppx/react/newtype.res
+++ /dev/null
@@ -1,54 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @react.component
-  let make = (type a, ~a: a, ~b: array<option<[#Foo(a)]>>, ~c: 'a, _) => <div />
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  @react.component
-  let make = (type a, ~a: a, ~b: array<option<[#Foo(a)]>>, ~c: 'a, _) => <div />
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A = {
-  @react.component
-  let make = (type a, ~a: a, ~b: array<option<[#Foo(a)]>>, ~c: 'a, _) => <div />
-}
-
-module V4A1 = {
-  @react.component
-  let make = (type x y, ~a:x, ~b:array<y>, ~c:'a) => <div />
-}
-
-module type T = {
-  type t
-}
-
-module V4A2 = {
-  @react.component
-  let make = (type a, ~foo: module(T with type t = a)) => {
-    module T = unpack(foo)
-    <div />
-  }
-}
-
-module V4A3 = {
-  @react.component
-  let make = (type a, ~foo) => {
-    module T = unpack(foo: T with type t = a)
-    foo
-  }
-}
-
-@react.component
-let make =(~x : ('a,'b), ~q:'a ) => [fst(x), q]
-
-@@uncurried
-
-module Uncurried = {
-  @react.component
-  let make = (type a, ~foo=?) => React.null}
diff --git a/jscomp/syntax/tests/ppx/react/noPropsWithKey.res b/jscomp/syntax/tests/ppx/react/noPropsWithKey.res
deleted file mode 100644
index 9a98630..0000000
--- a/jscomp/syntax/tests/ppx/react/noPropsWithKey.res
+++ /dev/null
@@ -1,33 +0,0 @@
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4CA = {
-  @react.component
-  let make = () => <div />
-}
-
-module V4CB = {
-  @module("c") @react.component
-  external make: unit => React.element = "component"
-}
-
-module V4C = {
-  @react.component
-  let make = () => <><V4CA key="k" /> <V4CB key="k" /></>
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4CA = {
-  @react.component
-  let make = () => <div />
-}
-
-module V4CB = {
-  @module("c") @react.component
-  external make: unit => React.element = "component"
-}
-
-module V4C = {
-  @react.component
-  let make = () => <><V4CA key="k" /> <V4CB key="k" /></>
-}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/optimizeAutomaticMode.res b/jscomp/syntax/tests/ppx/react/optimizeAutomaticMode.res
deleted file mode 100644
index 6470a3b..0000000
--- a/jscomp/syntax/tests/ppx/react/optimizeAutomaticMode.res
+++ /dev/null
@@ -1,12 +0,0 @@
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module User = {
-  type t = {firstName: string, lastName: string}
-
-  let format = user => "Dr." ++ user.lastName
-
-  @react.component
-  let make = (~doctor) => {
-    <h1 id="h1"> {React.string(format(doctor))} </h1>
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/optionalKeyType.res b/jscomp/syntax/tests/ppx/react/optionalKeyType.res
deleted file mode 100644
index bec2add..0000000
--- a/jscomp/syntax/tests/ppx/react/optionalKeyType.res
+++ /dev/null
@@ -1,37 +0,0 @@
-let key = None
-
-@@jsxConfig({version:3})
-
-let _ = <C key="k" />
-let _ = <C key=?Some("k") />
-let _ = <C ?key />
-let _ = <div key="k" />
-let _ = <div key=?Some("k") />
-let _ = <div ?key />
-let _ = <div key="k"> <br /><br /> </div>
-let _ = <div key=?Some("k")> <br /><br /> </div>
-let _ = <div ?key> <br /><br /> </div>
-
-@@jsxConfig({version:4, mode: "classic"})
-
-let _ = <C key="k" />
-let _ = <C key=?Some("k") />
-let _ = <C ?key />
-let _ = <div key="k" />
-let _ = <div key=?Some("k") />
-let _ = <div ?key />
-let _ = <div key="k"> <br /><br /> </div>
-let _ = <div key=?Some("k")> <br /><br /> </div>
-let _ = <div ?key> <br /><br /> </div>
-
-@@jsxConfig({version:4, mode: "automatic"})
-
-let _ = <C key="k" />
-let _ = <C key=?Some("k") />
-let _ = <C ?key />
-let _ = <div key="k" />
-let _ = <div key=?Some("k") />
-let _ = <div ?key />
-let _ = <div key="k"> <br /><br /> </div>
-let _ = <div key=?Some("k")> <br /><br /> </div>
-let _ = <div ?key> <br /><br /> </div>
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/removedKeyProp.res b/jscomp/syntax/tests/ppx/react/removedKeyProp.res
deleted file mode 100644
index 5e60acc..0000000
--- a/jscomp/syntax/tests/ppx/react/removedKeyProp.res
+++ /dev/null
@@ -1,23 +0,0 @@
-@@jsxConfig({version: 4, mode: "classic"})
-
-module Foo = {
-  @react.component
-  let make = (~x, ~y) => React.string(x++y)
-}
-
-module HasChildren = {
-  @react.component
-  let make = (~children) => <> children </>
-}
-
-@react.component
-let make = () => <>
-  <Foo key="k" x="x" y="y" />
-  <Foo x="x" y="y" />
-  <HasChildren key="k">
-    <Foo x="x" y="y" />
-  </HasChildren>
-  <HasChildren>
-    <Foo x="x" y="y" />
-  </HasChildren>
-</>
diff --git a/jscomp/syntax/tests/ppx/react/sharedProps.res b/jscomp/syntax/tests/ppx/react/sharedProps.res
deleted file mode 100644
index 13bcf0d..0000000
--- a/jscomp/syntax/tests/ppx/react/sharedProps.res
+++ /dev/null
@@ -1,83 +0,0 @@
-@@jsxConfig({version:4, mode: "classic"})
-
-module V4C1 = {
-  @react.component(:sharedProps<string>)
-  let make = (~x, ~y) => React.string(x ++ y)
-}
-
-module V4C2 = {
-  @react.component(:sharedProps<'a>)
-  let make = (~x, ~y) => React.string(x ++ y)
-}
-
-module V4C3 = {
-  @react.component(:sharedProps<string, 'a>)
-  let make = (~x, ~y) => React.string(x ++ y)
-}
-
-module V4C4 = {
-  @react.component(:sharedProps)
-  let make = (~x, ~y) => React.string(x ++ y)
-}
-
-module V4C5 = {
-  @react.component(:sharedProps<string>)
-  external make: (~x: string, ~y: 'a) => React.element = "default"
-}
-
-module V4C6 = {
-  @react.component(:sharedProps<'a>)
-  external make: (~x: string, ~y: 'a) => React.element = "default"
-}
-
-module V4C7 = {
-  @react.component(:sharedProps<string, 'a>)
-  external make: (~x: string, ~y: string) => React.element = "default"
-}
-
-module V4C8 = {
-  @react.component(:sharedProps)
-  external make: (~x: string, ~y: string) => React.element = "default"
-}
-
-@@jsxConfig({version:4, mode: "automatic"})
-
-module V4A1 = {
-  @react.component(:sharedProps<string>)
-  let make = (~x, ~y) => React.string(x ++ y)
-}
-
-module V4A2 = {
-  @react.component(:sharedProps<'a>)
-  let make = (~x, ~y) => React.string(x ++ y)
-}
-
-module V4A3 = {
-  @react.component(:sharedProps<string, 'a>)
-  let make = (~x, ~y) => React.string(x ++ y)
-}
-
-module V4A4 = {
-  @react.component(:sharedProps)
-  let make = (~x, ~y) => React.string(x ++ y)
-}
-
-module V4A5 = {
-  @react.component(:sharedProps<string>)
-  external make: (~x: string, ~y: 'a) => React.element = "default"
-}
-
-module V4A6 = {
-  @react.component(:sharedProps<'a>)
-  external make: (~x: string, ~y: 'a) => React.element = "default"
-}
-
-module V4A7 = {
-  @react.component(:sharedProps<string, 'a>)
-  external make: (~x: string, ~y: string) => React.element = "default"
-}
-
-module V4A8 = {
-  @react.component(:sharedProps)
-  external make: (~x: string, ~y: string) => React.element = "default"
-}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/sharedProps.resi b/jscomp/syntax/tests/ppx/react/sharedProps.resi
deleted file mode 100644
index 73025ef..0000000
--- a/jscomp/syntax/tests/ppx/react/sharedProps.resi
+++ /dev/null
@@ -1,43 +0,0 @@
-@@jsxConfig({version:4, mode: "classic"})
-
-module V4C1: {
-  @react.component(:sharedProps<string>)
-  let make: (~x: string) => React.element
-}
-
-module V4C2: {
-  @react.component(:sharedProps<'a>)
-  let make: (~x: string) => React.element
-}
-
-module V4C3: {
-  @react.component(:sharedProps<string, 'a>)
-  let make: (~x: string) => React.element
-}
-
-module V4C4 : {
-  @react.component(:sharedProps)
-  let make: (~x: string) => React.element
-}
-
-@@jsxConfig({version:4, mode: "automatic"})
-
-module V4A1: {
-  @react.component(:sharedProps<string>)
-  let make: (~x: string) => React.element
-}
-
-module V4A2: {
-  @react.component(:sharedProps<'a>)
-  let make: (~x: string) => React.element
-}
-
-module V4A3: {
-  @react.component(:sharedProps<string, 'a>)
-  let make: (~x: string) => React.element
-}
-
-module V4A4: {
-  @react.component(:sharedProps)
-  let make: (~x: string) => React.element
-}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/ppx/react/spreadProps.res b/jscomp/syntax/tests/ppx/react/spreadProps.res
deleted file mode 100644
index c83a1f8..0000000
--- a/jscomp/syntax/tests/ppx/react/spreadProps.res
+++ /dev/null
@@ -1,47 +0,0 @@
-@@jsxConfig({version:4, mode: "classic"})
-// Error: spreadProps should be first in order than other props
-// let c0 = <A x="x" {...p} />
-
-// Error: multiple spreadProps not allowed
-// let c0 = <A x="x" {...p0} {...p1} />
-
-// only spread props
-let c1 = <A {...p} />
-
-// reversed order
-let c2 = <A {...p} x="x" />
-
-let c3 = <div {...p} />
-
-let c4 = <div {...p} x="x" key="k" />
-
-let c4 = <div {...p} key="k"><br /><br /></div>
-
-let c5 = <div {...p} key="k"><br /><br /></div>
-
-// both need to be parsed
-let c6 = <A {...(params->Obj.magic)} />
-let c7 = <A {...params->Obj.magic} />
-
-@@jsxConfig({version:4, mode: "automatic"})
-// Error: spreadProps should be first in order than other props
-// let c0 = <A x="x" {...p} />
-
-// Error: multiple spreadProps not allowed
-// let c0 = <A x="x" {...p0} {...p1} />
-
-// only spread props
-let c1 = <A {...p} />
-
-// reversed order
-let c2 = <A {...p} x="x" />
-
-let c3 = <div {...p} />
-
-let c4 = <div {...p} x="x" key="k" />
-
-let c5 = <div {...p} key="k"><br /><br /></div>
-
-// both need to be parsed
-let c6 = <A {...(params->Obj.magic)} />
-let c7 = <A {...params->Obj.magic} />
diff --git a/jscomp/syntax/tests/ppx/react/topLevel.res b/jscomp/syntax/tests/ppx/react/topLevel.res
deleted file mode 100644
index 6d7a7eb..0000000
--- a/jscomp/syntax/tests/ppx/react/topLevel.res
+++ /dev/null
@@ -1,29 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @react.component
-  let make = (~a, ~b, _) => {
-    Js.log("This function should be named 'TopLevel.react'")
-    <div />
-  }
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  @react.component
-  let make = (~a, ~b, _) => {
-    Js.log("This function should be named 'TopLevel.react'")
-    <div />
-  }
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A = {
-  @react.component
-  let make = (~a, ~b, _) => {
-    Js.log("This function should be named 'TopLevel.react'")
-    <div />
-  }
-}
diff --git a/jscomp/syntax/tests/ppx/react/typeConstraint.res b/jscomp/syntax/tests/ppx/react/typeConstraint.res
deleted file mode 100644
index 9e1fdc1..0000000
--- a/jscomp/syntax/tests/ppx/react/typeConstraint.res
+++ /dev/null
@@ -1,26 +0,0 @@
-@@jsxConfig({version: 3})
-
-module V3 = {
-  @react.component
-  let make:
-    type a. (~a: a, ~b: a, a) => React.element =
-    (~a, ~b, _) => <div />
-}
-
-@@jsxConfig({version: 4, mode: "classic"})
-
-module V4C = {
-  @react.component
-  let make:
-    type a. (~a: a, ~b: a, a) => React.element =
-    (~a, ~b, _) => <div />
-}
-
-@@jsxConfig({version: 4, mode: "automatic"})
-
-module V4A = {
-  @react.component
-  let make:
-    type a. (~a: a, ~b: a, a) => React.element =
-    (~a, ~b, _) => <div />
-}
diff --git a/jscomp/syntax/tests/ppx/react/uncurriedProps.res b/jscomp/syntax/tests/ppx/react/uncurriedProps.res
deleted file mode 100644
index d0bcd3e..0000000
--- a/jscomp/syntax/tests/ppx/react/uncurriedProps.res
+++ /dev/null
@@ -1,26 +0,0 @@
-@@jsxConfig({ version: 4 })
-
-@react.component
-let make = (~a: (. unit) => unit=(. ) => ()) => React.null
-
-let func = (~callback: (. string, bool, bool) => unit=(. _, _, _) => (), ()) => {
-  let _ = callback
-}
-
-func(~callback=(. str, a, b) => {
-  let _ = str
-  let _ = a
-  let _ = b
-}, ())
-
-module Foo = {
-  @react.component
-  let make = (~callback: (. string, bool, bool) => unit=(. _, _, _) => ()) => {
-    React.null
-  }
-}
-
-module Bar = {
-  @react.component
-  let make = () => <Foo callback={(. _, _, _) => ()} />
-}
diff --git a/jscomp/syntax/tests/ppx/react/v4.res b/jscomp/syntax/tests/ppx/react/v4.res
deleted file mode 100644
index 2947fce..0000000
--- a/jscomp/syntax/tests/ppx/react/v4.res
+++ /dev/null
@@ -1,52 +0,0 @@
-// Component with type constraint
-@react.component
-let make = (~x: string, ~y: string) => React.string(x ++ y)
-
-module AnotherName = {
-  // Component with another name than "make"
-  @react.component
-  let anotherName = (~x) => React.string(x)
-}
-
-module Uncurried = {
-  @react.component
-  let make = (. ~x) => React.string(x)
-}
-
-module type TUncurried = {
-  @react.component
-  let make: (. ~x: string) => React.element
-}
-
-module E = {
-  @react.component
-  external make: (~x: string) => React.element = "default"
-}
-
-module EUncurried = {
-  @react.component
-  external make: (. ~x: string) => React.element = "default"
-}
-
-module Rec = {
-  @react.component
-  let rec make = () => {
-   make({}:props)
-  }
-}
-
-module Rec1 = {
-  @react.component
-  let rec make = () => {
-    React.null
-  }
-}
-
-module Rec2 = {
-  @react.component
-  let rec make = () => {
-    mm(({}: props))
-  }
-  and mm = (x) => make(x)
-}
-
diff --git a/jscomp/syntax/tests/printer/comments/array.res b/jscomp/syntax/tests/printer/comments/array.res
deleted file mode 100644
index 8882f17..0000000
--- a/jscomp/syntax/tests/printer/comments/array.res
+++ /dev/null
@@ -1,18 +0,0 @@
-a[ /* zz */ 0 ] =  7 
-
-let _ = (
-  /* zz */ a  
-  )[0]
-
-let _ = (
-  a // zz
-  )[0]
-
- (
-    incidents
-    ->Belt.Array.keep(({status}) => status === #OPEN)
-    // This comment will vanish 
-    ->Belt.SortArray.stableSortBy((a, b) =>
-      compare(a.createdTime, b.createdTime)
-    )
-  )[0]
\ No newline at end of file
diff --git a/jscomp/syntax/tests/printer/comments/binaryExpr.res b/jscomp/syntax/tests/printer/comments/binaryExpr.res
deleted file mode 100644
index 288d074..0000000
--- a/jscomp/syntax/tests/printer/comments/binaryExpr.res
+++ /dev/null
@@ -1,96 +0,0 @@
-/* with comments */
-compilation // after
-/* below compilation */
-->Plugin.buildAssets // trailing
-
-compilation /* same line as compilation */ ->Plugin.buildAssets // trailing
-
-/* with comments */
-compilation
-/* first */
-->Plugin.buildAssets /* first trail */
-/* second */
-->Js.Json.stringify /* second trail */
-/* last */
-->Node.Fs.writeFileAsUtf8Sync(path); /* last trail */
-
-if (
-  // above1
-    a == b && // trailing1
-  // above2
-    c == d && // trailing2
-  // above3
-    e == f && // trailing3
-    x
-) {
-    console.log("foo bar")
-}
-
-
-let truth =
-  a == b && c == d /* cmt */ && e == f
-
-let truth =
-  /* c0 */ a /* c1 */ == /* c2 */ b /* c3 */ &&
- /* c4 */ c /* c5 */ == /* c6 */ d /* c7 */ &&
-  /* c8 */ e /* c9 */ ==  /* c10 */ f  /* c11 */
-
-promise
-// TODO: This comment needs to be here
-->Js.Promise.then(payload => {
-  Js.log2("this payload was received", payload);
-  Js.Promise.resolve(""->Obj.magic);
-})
-
-
-promise
-/* TODO: This comment needs to be here */
-->Js.Promise.then(payload => {
-  Js.log2("this payload was received", payload);
-  Js.Promise.resolve(""->Obj.magic);
-})
-
-promise
-// comment
-->Js.Promise.then(payload => {
-  Js.Promise.resolve(""->Obj.magic);
-})
-// comment 2
-->Js.Promise.catch(err => {
-  Js.log2("this error was caught", err);
-  Js.Promise.resolve(""->Obj.magic);
-})
-
-
-promise
-/* comment */
-->Js.Promise.then(payload => {
-  Js.Promise.resolve(""->Obj.magic);
-})
-/* comment 2 */
-
-// comment 3
-
-/* comment 4 */
-->Js.Promise.catch(err => {
-  Js.log2("this error was caught", err);
-  Js.Promise.resolve(""->Obj.magic);
-})
-
-promise
-// TODO: This comment needs to be here
-|> Js.Promise.then(payload => {
-  Js.log2("this payload was received", payload);
-  Js.Promise.resolve(""->Obj.magic);
-})
-
-promise
-// comment
-|> Js.Promise.then(payload => {
-  Js.Promise.resolve(""->Obj.magic);
-})
-// comment 2
-|> Js.Promise.catch(err => {
-  Js.log2("this error was caught", err);
-  Js.Promise.resolve(""->Obj.magic);
-})
diff --git a/jscomp/syntax/tests/printer/comments/blockExpr.res b/jscomp/syntax/tests/printer/comments/blockExpr.res
deleted file mode 100644
index 665752d..0000000
--- a/jscomp/syntax/tests/printer/comments/blockExpr.res
+++ /dev/null
@@ -1,539 +0,0 @@
-let () = /* c0 */ sideEffect1() /* c1 */
-
-let () = {
-  /* c0 */ sideEffect1() /* c1 */
-}
-
-let () = {
-  /* c0 */ sideEffect1() /* c1 */
-  /* c2 */ sideEffect2() /* c3 */
-}
-
-let () = {
-  /* c0 */ sideEffect1() // c1
-  // c2
-
-  // c3
-  /* c4 */ sideEffect2() // c5
-}
-
-let () = {
-  /* c0 */ sideEffect1() /* c1 */
-  /* c2 */ sideEffect2() /* c3 */
-  /* c4 */ sideEffect3() /* c5 */
-}
-
-let () = {
-  /* c0 */ sideEffect1() /* c1 */
-  // k
-
-  // k2
-  /* k3 */
-  // k4
-
-  // k5
-  /* c2 */ sideEffect2() /* c3 */
-  // k
-  
-  // k2
-  /* k3 */
-  // k4
-
-  // k5
-  /* c4 */ sideEffect3() /* c5 */
-}
-
-let () = {
-  /* c0 */ sideEffect1() /* c1 */
-  /* c2 */ sideEffect2() /* c3 */
-  /* c4 */ sideEffect3() /* c5 */
-  /* c6 */ sideEffect4() /* c7 */
-}
-
-let () = {
-  /* c0 */ let a /* inside */ = 1 /* c1 */
-  /* c2 */ sideEffect2() /* c3 */
-}
-
-
-let () = {
-  /* c0 */ let a /* inside */ = 1 /* c1 */
-  // k
-
-  // k2
-  /* k3 */ /* k4 */
-
-  // k5
-  /* c2 */ sideEffect2() /* c3 */
-}
-
-let () = {
-  /* c0 */ let a /* inside a */ = 1 /* c1 */
-  /* c2 */ let b /* inside b */ = 2 /* c3 */
-  /* c4 */ a + b /* c5 */
-}
-
-let () = {
-  /* c0 */ let a /* inside a */ = 1 /* c1 */
-  // k
-
-  // k2
-  /* k3 */ /* k4 */
-
-  // k5
-  /* c2 */ let b /* inside b */ = 2 /* c3 */
-  // k
-
-  // k2
-  /* k3 */ /* k4 */
-
-  // k5
-  /* c4 */ a + b /* c5 */
-}
-
-let () = {
-  /* c0 */ let a /* inside a */ = 1 /* c1 */
-  /* c2 */ let b /* inside b */ = 2 /* c3 */
-  /* c4 */ let c /* inside c */ = 3  /* c5 */
-  /* c5 */ a + b + c /* c6 */
-}
-
-let () = {
-  /* c0 */ exception /* inside */ Exit /* c1 */
-  /* c2 */ raise(Exit) /* c3 */
-}
-
-let () = {
-  /* c0 */ exception /* inside */ Exit // c1
-  // k
-
-  // k2
-  /* c2 */ raise(Exit) // c3
-}
-
-let () = {
-  /* c0 */ exception /* inside */ Exit /* c1 */
-  /* c2 */ exception /* inside */ Terminate /* c3 */
-  /* c4 */ raise(Exit) /* c5 */
-}
-
-let () = {
-  /* c0 */ exception /* inside */ Exit // c1
-  // k
-
-  // k2
-
-  // k3
-  /* c2 */ exception /* inside */ Terminate // c3
-  // k
-
-  // k2
-
-  // k3
-  /* c4 */ raise(Exit) /* c5 */
-}
-
-let () = {
-  /* c0 */ exception /* inside */ Exit /* c1 */
-  /* c2 */ exception /* inside */ Terminate /* c3 */
-  /* c4 */ exception /* inside */ Oom /* c5 */
-  /* c6 */ raise(Exit) /* c7 */
-}
-
-let () = {
-  /* c0 */ module /* c1 */ L /* c2 */ = /* c3 */ Logger /* c4 */
-  /* c5 */ L.log() /* c6 */
-}
-
-let () = {
-  /* c0 */ module /* c1 */ L /* c2 */ = /* c3 */ Logger // c4
-  // k
-
-  // k2
-
-  // k3
-  /* c5 */ L.log() /* c6 */
-}
-
-let () = {
-  /* c0 */ module /* c1 */ L /* c2 */ = /* c3 */ Logger /* c4 */
-  /* c5 */ module /* c6 */ L2 /* c7 */ = /* c8 */ Logger2 /* c9 */
-  /* c10 */ L.log() /* c11 */
-  /* c12 */ L2.log() /* c13 */
-}
-
-let () = {
-  /* c0 */ module /* c1 */ L /* c2 */ = /* c3 */ Logger /* c4 */
-  // k
-
-  /* k1 */
-
-  // k2
-  /* c5 */ module /* c6 */ L2 /* c7 */ = /* c8 */ Logger2 /* c9 */
-  // k
-
-  /* k1 */
-
-  // k2
-  /* c10 */ L.log() /* c11 */
-  // k
-
-  /* k1 */
-
-  // k2
-  /* c12 */ L2.log() /* c13 */
-}
-
-let () = {
-  /* c0 */ open /* c1 */ Belt /* c2 */
-  /* c3 */ doSomething() /* c4 */
-}
-
-let () = {
-  /* c0 */ open /* c1 */ Belt // c2
-  // k
-
-  /* k2 */
-
-  // k3
-  /* c3 */ doSomething() // c4
-}
-
-let () = {
-  /* c0 */ open /* c1 */ Belt /* c2 */
-  /* c3 */ open /* c4 */ React /* c5 */
-  /* c6 */ doSomething() /* c7 */
-}
-
-let () = {
-  /* c0 */ open /* c1 */ Belt /* c2 */
-  // k
-
-  /* k2 */
-
-  // k3
-  /* c3 */ open /* c4 */ React /* c5 */
-  // k
-
-  /* k2 */
-
-  // k3
-  /* c6 */ doSomething() /* c7 */
-}
-
-while true {
-  /* c0 */ let () = sideEffect1() // c1
-  // c2
-
-  /* c3 */ let () = sideEffect2() // c4
-  // c5
-
-  // c6
-  /* c7 */ sideEffect2() // c8
-
-  // here
-}
-
-for i in 0 to 10 {
-  /* c0 */ let () = sideEffect1() // c1
-  // c2
-
-  /* c3 */ let () = sideEffect2() // c4
-  // c5
-
-  // c6
-  /* c7 */ sideEffect2() // c8
-
-  // here
-}
-
-
-switch color {
-| Blue =>
-  /* c0 */ let () = sideEffect1() // c1
-  // c2
-
-  /* c3 */ let () = sideEffect2() // c4
-  // c5
-
-  // c6
-  /* c7 */ sideEffect2() // c8
-
-| Red =>
-  /* c0 */ let () = sideEffect1() // c1
-  // c2
-
-  /* c3 */ let () = sideEffect2() // c4
-  // c5
-
-  // c6
-  /* c7 */ sideEffect2() // c8
-}
-
-try danger() catch {
-| Exc =>
-
-  /* c0 */ let () = sideEffect1() // c1
-  // c2
-
-  /* c3 */ let () = sideEffect2() // c4
-  // c5
-
-  // c6
-  /* c7 */ sideEffect2() // c8
-}
-
-if {
-  // here
-  let a = true
-  // okok
-
-  // there
-  let /* inside */ b = false // trailing
-
-  // between
-  true // test
-
-  /* ws */
-  // after
-} {
- // here
-  let a = true
-  // okok
-
-  // there
-  let /* inside */ b = false
-  false // here
-} else {
- // here
-  let a = true
-  // okok
-
-  // there
-  let b = false
-  true
-} // trailing
-
-if {
-  // here
-  let a = true
-  // okok
-
-  // there
-  let /* inside */ b = false // trailing
-
-  // between
-  true // test
-
-  /* ws */
-  // after
-} {
- // here
-  let a = true
-  // okok
-
-  // there
-  let /* inside */ b = false
-  false // here
-} else if {
-  let u = universe() // c0
-  // c1
-
-  // c2
-  let /* inside */ gc = forceGc() // stop the world
-  // c3
-
-  // c4
-  f(u, gc) // c5
-  /* c6 */
-  // c7
-} { 
- // here
-  let a = true
-  // okok
-
-  // there
-  let b = false
-  true
-} // trailing
-
-assert({
-  // here 
-  open /* inside */ Matrix
-  // c
-
-  // c2
-  compare(m1, m2)
-  // after
-
-  // test
-})
-
-lazy {
-  // here 
-  open /* inside */ Matrix
-  // c
-
-  // c2
-  compare(m1, m2)
-  // after
-
-  // test
-}
-
-user.name = {
-  // here 
-  open /* inside */ Names
-  // c
-
-  // c2
-  defaultName
-  // after
-
-  // test
-}
-
-switch {
-  // here
-  open Matrix
-  // there
-
-  // test
-  arityCheck()
-  // trailing
-
-  // hmm
-} {
-| One => ()
-| Two => ()
-}
-
-try {
-  // here
-  open Matrix
-  // there
-
-  // test
-  arityCheck()
-  // trailing
-
-  // hmm
-} catch {
-| One => ()
-| Two => ()
-}
-
-let () = {
-  // here
-  open Matrix
-  // there
-
-  // test
-  arityCheck
-  // trailing
-
-  // hmm
-}(arg1, arg2)
-
-let name = {
-  // here
-  open Users
-  // there
-
-  // test
-  defaultUser
-  // trailing
-
-  // hmm
-}.name
-
-let () = {
-  // here
-  open Users
-  // there
-
-  // test
-  defaultUser
-  // trailing
-
-  // hmm
-}.name = {
-  // here
-  open Names
-  // there
-
-  // test
-  defaultName
-  // trailing
-
-  // hmm
-}
-
-while {
-  // comment
-  open Conditions
-  // inside
-
-  // inside2
-  check()
-  // foo
-
-  // bar
-} {
-  Js.log("test")
-}
-
-let multiply = (/* c0 */ m1 /* c1 */, /* c2 */ m2 /* c3 */) => {
-  // here
-  open Matrix4D
-
-  let m3 = makeUninitializedUnsafe()
-  // there
-  
-  // over there
-  m3
-  /* trailing */
-  // test
-}
-
-switch x {
-| Blue when /* c0 */ multicore.enabled /* c1 */ === /* c2 */ true /* c3 */ => ()
-| Red when {
-  // c0
-  open /* c1 */ Multicore // c2
-  // c3
-
-  // c4
-  isEnabled() // c5
-  /* c6 */
-
-  // c7
-
- } => ()
-}
-
-let catch = 34
-
-let promiseCatch = x => Js.Promise.catch(x)
-
-// aggregating intersections
-let () = {
-  let s = Sphere.make()
-  let i1 = make(~t=1., ~sphere=s)
-  let i2 = make(~t=2., ~sphere=s)
-
-//  let is = interesections
-  
-//  assert 
-}
-
-let () = {
-  let s = Sphere.make()
-  let i1 = make(~t=1., ~sphere=s)
-  let i2 = make(~t=2., ~sphere=s)
-
-  ()
-//  let is = interesections
-  
-//  assert 
-}
diff --git a/jscomp/syntax/tests/printer/comments/case.res b/jscomp/syntax/tests/printer/comments/case.res
deleted file mode 100644
index 784e0f3..0000000
--- a/jscomp/syntax/tests/printer/comments/case.res
+++ /dev/null
@@ -1,30 +0,0 @@
-let rec mergeU = (s1, s2, f) =>
-  switch {
-    open N
-    (toOpt(s1), toOpt(s2))
-  } {
-  | (None, None) => N.empty
-  | (Some(n) /* (Node (l1, v1, d1, r1, h1), _) */, _)
-    when {
-      open N
-      heightGet(n) >=
-      switch N.toOpt(s2) {
-      | None => 0
-      | Some(n) => N.heightGet(n)
-      }
-    } =>
-    let (l1, v1, d1, r1) = {
-      open N
-      (leftGet(n), keyGet(n), valueGet(n), rightGet(n))
-    }
-    let (l2, d2, r2) = split(v1, s2)
-    N.concatOrJoin(mergeU(l1, l2, f), v1, f(. v1, Some(d1), d2), mergeU(r1, r2, f))
-  | (_, Some(n)) /* Node (l2, v2, d2, r2, h2) */ =>
-    let (l2, v2, d2, r2) = {
-      open N
-      (leftGet(n), keyGet(n), valueGet(n), rightGet(n))
-    }
-    let (l1, d1, r1) = split(v2, s1)
-    N.concatOrJoin(mergeU(l1, l2, f), v2, f(. v2, d1, Some(d2)), mergeU(r1, r2, f))
-  | _ => assert(false)
-  }
diff --git a/jscomp/syntax/tests/printer/comments/docComments.res b/jscomp/syntax/tests/printer/comments/docComments.res
deleted file mode 100644
index 731ca5d..0000000
--- a/jscomp/syntax/tests/printer/comments/docComments.res
+++ /dev/null
@@ -1,33 +0,0 @@
-/*** This is a module comment */
-
-/*** This is another module comment */
-
-/** This is a doc ✅ comment */
-let z = 34
-
-@@res.doc("And this is a res.doc module annotation")
-
-@res.doc("And this is a res.doc ✅ annotation")
-let q = 11
-
-/** This
-  * is a multi-line
-  multiline doc comment
-  */
-type h = int
-
-/* comment and attribute */
-@foo let x = 10
-
-/** doc comment and attribute */
-@foo let x = 10
-
-/** doc comment and 3 attributes */
-@foo @bar @baz let x = 10
-
-/** doc comment and 0 attributes */
-let x = 10
-
-type pathItem = {}
-/** Issue 6844: doc comment before "and" */
-and operation =  {}
diff --git a/jscomp/syntax/tests/printer/comments/expected/array.res.txt b/jscomp/syntax/tests/printer/comments/expected/array.res.txt
deleted file mode 100644
index 90ed9ed..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/array.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-a[/* zz */ 0] = 7
-
-let _ = /* zz */ a[0]
-
-let _ = a[0] // zz
-
-(
-  incidents
-  ->Belt.Array.keep(({status}) => status === #OPEN)
-  // This comment will vanish
-  ->Belt.SortArray.stableSortBy((a, b) => compare(a.createdTime, b.createdTime))
-)[0]
diff --git a/jscomp/syntax/tests/printer/comments/expected/binaryExpr.res.txt b/jscomp/syntax/tests/printer/comments/expected/binaryExpr.res.txt
deleted file mode 100644
index 3f53365..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/binaryExpr.res.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-/* with comments */
-compilation->Plugin.buildAssets // after
-/* below compilation */ // trailing
-
-compilation /* same line as compilation */->Plugin.buildAssets // trailing
-
-/* with comments */
-compilation
-/* first */
-->Plugin.buildAssets /* first trail */
-/* second */
-->Js.Json.stringify /* second trail */
-/* last */
-->Node.Fs.writeFileAsUtf8Sync(path) /* last trail */
-
-if (
-  // above1
-  a == b &&
-  // trailing1
-  // above2
-  c == d &&
-  // trailing2
-  // above3
-  e == f &&
-  // trailing3
-  x
-) {
-  console.log("foo bar")
-}
-
-let truth = a == b && c == d /* cmt */ && e == f
-
-let truth =
-  /* c0 */ a /* c1 */ == /* c2 */ b /* c3 */ &&
-  /* c4 */ c /* c5 */ == /* c6 */ d /* c7 */ &&
-  /* c8 */ e /* c9 */ == /* c10 */ f /* c11 */
-
-promise
-// TODO: This comment needs to be here
-->Js.Promise.then(payload => {
-  Js.log2("this payload was received", payload)
-  Js.Promise.resolve(""->Obj.magic)
-})
-
-promise
-/* TODO: This comment needs to be here */
-->Js.Promise.then(payload => {
-  Js.log2("this payload was received", payload)
-  Js.Promise.resolve(""->Obj.magic)
-})
-
-promise
-// comment
-->Js.Promise.then(payload => {
-  Js.Promise.resolve(""->Obj.magic)
-})
-// comment 2
-->Js.Promise.catch(err => {
-  Js.log2("this error was caught", err)
-  Js.Promise.resolve(""->Obj.magic)
-})
-
-promise
-/* comment */
-->Js.Promise.then(payload => {
-  Js.Promise.resolve(""->Obj.magic)
-})
-/* comment 2 */
-
-// comment 3
-
-/* comment 4 */
-->Js.Promise.catch(err => {
-  Js.log2("this error was caught", err)
-  Js.Promise.resolve(""->Obj.magic)
-})
-
-promise
-// TODO: This comment needs to be here
-|> Js.Promise.then(payload => {
-  Js.log2("this payload was received", payload)
-  Js.Promise.resolve(""->Obj.magic)
-})
-
-promise
-// comment
-|> Js.Promise.then(payload => {
-  Js.Promise.resolve(""->Obj.magic)
-})
-// comment 2
-|> Js.Promise.catch(err => {
-  Js.log2("this error was caught", err)
-  Js.Promise.resolve(""->Obj.magic)
-})
diff --git a/jscomp/syntax/tests/printer/comments/expected/blockExpr.res.txt b/jscomp/syntax/tests/printer/comments/expected/blockExpr.res.txt
deleted file mode 100644
index 9dbc124..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/blockExpr.res.txt
+++ /dev/null
@@ -1,541 +0,0 @@
-let () = /* c0 */ sideEffect1() /* c1 */
-
-let () = {
-  /* c0 */ sideEffect1() /* c1 */
-}
-
-let () = {
-  /* c0 */ sideEffect1() /* c1 */
-  /* c2 */ sideEffect2() /* c3 */
-}
-
-let () = {
-  /* c0 */ sideEffect1() // c1
-  // c2
-
-  // c3
-  /* c4 */ sideEffect2() // c5
-}
-
-let () = {
-  /* c0 */ sideEffect1() /* c1 */
-  /* c2 */ sideEffect2() /* c3 */
-  /* c4 */ sideEffect3() /* c5 */
-}
-
-let () = {
-  /* c0 */ sideEffect1() /* c1 */
-  // k
-
-  // k2
-  /* k3 */
-  // k4
-
-  // k5
-  /* c2 */ sideEffect2() /* c3 */
-  // k
-
-  // k2
-  /* k3 */
-  // k4
-
-  // k5
-  /* c4 */ sideEffect3() /* c5 */
-}
-
-let () = {
-  /* c0 */ sideEffect1() /* c1 */
-  /* c2 */ sideEffect2() /* c3 */
-  /* c4 */ sideEffect3() /* c5 */
-  /* c6 */ sideEffect4() /* c7 */
-}
-
-let () = {
-  /* c0 */ let a /* inside */ = 1 /* c1 */
-  /* c2 */ sideEffect2() /* c3 */
-}
-
-let () = {
-  /* c0 */ let a /* inside */ = 1 /* c1 */
-  // k
-
-  // k2
-  /* k3 */ /* k4 */
-
-  // k5
-  /* c2 */ sideEffect2() /* c3 */
-}
-
-let () = {
-  /* c0 */ let a /* inside a */ = 1 /* c1 */
-  /* c2 */ let b /* inside b */ = 2 /* c3 */
-  /* c4 */ a + b /* c5 */
-}
-
-let () = {
-  /* c0 */ let a /* inside a */ = 1 /* c1 */
-  // k
-
-  // k2
-  /* k3 */ /* k4 */
-
-  // k5
-  /* c2 */ let b /* inside b */ = 2 /* c3 */
-  // k
-
-  // k2
-  /* k3 */ /* k4 */
-
-  // k5
-  /* c4 */ a + b /* c5 */
-}
-
-let () = {
-  /* c0 */ let a /* inside a */ = 1 /* c1 */
-  /* c2 */ let b /* inside b */ = 2 /* c3 */
-  /* c4 */ let c /* inside c */ = 3 /* c5 */
-  /* c5 */ a + b + c /* c6 */
-}
-
-let () = {
-  /* c0 */ exception /* inside */ Exit /* c1 */
-  /* c2 */ raise(Exit) /* c3 */
-}
-
-let () = {
-  /* c0 */ exception /* inside */ Exit // c1
-  // k
-
-  // k2
-  /* c2 */ raise(Exit) // c3
-}
-
-let () = {
-  /* c0 */ exception /* inside */ Exit /* c1 */
-  /* c2 */ exception /* inside */ Terminate /* c3 */
-  /* c4 */ raise(Exit) /* c5 */
-}
-
-let () = {
-  /* c0 */ exception /* inside */ Exit // c1
-  // k
-
-  // k2
-
-  // k3
-  /* c2 */ exception /* inside */ Terminate // c3
-  // k
-
-  // k2
-
-  // k3
-  /* c4 */ raise(Exit) /* c5 */
-}
-
-let () = {
-  /* c0 */ exception /* inside */ Exit /* c1 */
-  /* c2 */ exception /* inside */ Terminate /* c3 */
-  /* c4 */ exception /* inside */ Oom /* c5 */
-  /* c6 */ raise(Exit) /* c7 */
-}
-
-let () = {
-  /* c0 */ module /* c1 */ L /* c2 */ = /* c3 */ Logger /* c4 */
-  /* c5 */ L.log() /* c6 */
-}
-
-let () = {
-  /* c0 */ module /* c1 */ L /* c2 */ = /* c3 */ Logger // c4
-  // k
-
-  // k2
-
-  // k3
-  /* c5 */ L.log() /* c6 */
-}
-
-let () = {
-  /* c0 */ module /* c1 */ L /* c2 */ = /* c3 */ Logger /* c4 */
-  /* c5 */ module /* c6 */ L2 /* c7 */ = /* c8 */ Logger2 /* c9 */
-  /* c10 */ L.log() /* c11 */
-  /* c12 */ L2.log() /* c13 */
-}
-
-let () = {
-  /* c0 */ module /* c1 */ L /* c2 */ = /* c3 */ Logger /* c4 */
-  // k
-
-  /* k1 */
-
-  // k2
-  /* c5 */ module /* c6 */ L2 /* c7 */ = /* c8 */ Logger2 /* c9 */
-  // k
-
-  /* k1 */
-
-  // k2
-  /* c10 */ L.log() /* c11 */
-  // k
-
-  /* k1 */
-
-  // k2
-  /* c12 */ L2.log() /* c13 */
-}
-
-let () = {
-  /* c0 */ open /* c1 */ Belt /* c2 */
-  /* c3 */ doSomething() /* c4 */
-}
-
-let () = {
-  /* c0 */ open /* c1 */ Belt // c2
-  // k
-
-  /* k2 */
-
-  // k3
-  /* c3 */ doSomething() // c4
-}
-
-let () = {
-  /* c0 */ open /* c1 */ Belt /* c2 */
-  /* c3 */ open /* c4 */ React /* c5 */
-  /* c6 */ doSomething() /* c7 */
-}
-
-let () = {
-  /* c0 */ open /* c1 */ Belt /* c2 */
-  // k
-
-  /* k2 */
-
-  // k3
-  /* c3 */ open /* c4 */ React /* c5 */
-  // k
-
-  /* k2 */
-
-  // k3
-  /* c6 */ doSomething() /* c7 */
-}
-
-while true {
-  /* c0 */ let () = sideEffect1() // c1
-  // c2
-
-  /* c3 */ let () = sideEffect2() // c4
-  // c5
-
-  // c6
-  /* c7 */ sideEffect2() // c8
-
-  // here
-}
-
-for i in 0 to 10 {
-  /* c0 */ let () = sideEffect1() // c1
-  // c2
-
-  /* c3 */ let () = sideEffect2() // c4
-  // c5
-
-  // c6
-  /* c7 */ sideEffect2() // c8
-
-  // here
-}
-
-switch color {
-| Blue =>
-  /* c0 */ let () = sideEffect1() // c1
-  // c2
-
-  /* c3 */ let () = sideEffect2() // c4
-  // c5
-
-  // c6
-  /* c7 */ sideEffect2() // c8
-
-| Red =>
-  /* c0 */ let () = sideEffect1() // c1
-  // c2
-
-  /* c3 */ let () = sideEffect2() // c4
-  // c5
-
-  // c6
-  /* c7 */ sideEffect2() // c8
-}
-
-try danger() catch {
-| Exc =>
-  /* c0 */ let () = sideEffect1() // c1
-  // c2
-
-  /* c3 */ let () = sideEffect2() // c4
-  // c5
-
-  // c6
-  /* c7 */ sideEffect2() // c8
-}
-
-if {
-  // here
-  let a = true
-  // okok
-
-  // there
-  let /* inside */ b = false // trailing
-
-  // between
-  true // test
-
-  /* ws */
-  // after
-} {
-  // here
-  let a = true
-  // okok
-
-  // there
-  let /* inside */ b = false
-  false // here
-} else {
-  // here
-  let a = true
-  // okok
-
-  // there
-  let b = false
-  true
-} // trailing
-
-if {
-  // here
-  let a = true
-  // okok
-
-  // there
-  let /* inside */ b = false // trailing
-
-  // between
-  true // test
-
-  /* ws */
-  // after
-} {
-  // here
-  let a = true
-  // okok
-
-  // there
-  let /* inside */ b = false
-  false // here
-} else if {
-  let u = universe() // c0
-  // c1
-
-  // c2
-  let /* inside */ gc = forceGc() // stop the world
-  // c3
-
-  // c4
-  f(u, gc) // c5
-  /* c6 */
-  // c7
-} {
-  // here
-  let a = true
-  // okok
-
-  // there
-  let b = false
-  true
-} // trailing
-
-assert({
-  // here
-  open /* inside */ Matrix
-  // c
-
-  // c2
-  compare(m1, m2)
-  // after
-
-  // test
-})
-
-lazy {
-  // here
-  open /* inside */ Matrix
-  // c
-
-  // c2
-  compare(m1, m2)
-  // after
-
-  // test
-}
-
-user.name = {
-  // here
-  open /* inside */ Names
-
-  // c
-
-  // c2
-  defaultName
-  // after
-
-  // test
-}
-
-switch {
-  // here
-  open Matrix
-  // there
-
-  // test
-  arityCheck()
-  // trailing
-
-  // hmm
-} {
-| One => ()
-| Two => ()
-}
-
-try {
-  // here
-  open Matrix
-  // there
-
-  // test
-  arityCheck()
-  // trailing
-
-  // hmm
-} catch {
-| One => ()
-| Two => ()
-}
-
-let () = {
-  // here
-  open Matrix
-
-  // there
-
-  // test
-  arityCheck
-  // trailing
-
-  // hmm
-}(arg1, arg2)
-
-let name = {
-  // here
-  open Users
-
-  // there
-
-  // test
-  defaultUser
-  // trailing
-
-  // hmm
-}.name
-
-let () = {
-  // here
-  open Users
-
-  // there
-
-  // test
-  defaultUser
-  // trailing
-
-  // hmm
-}.name = {
-  // here
-  open Names
-
-  // there
-
-  // test
-  defaultName
-  // trailing
-
-  // hmm
-}
-
-while {
-  // comment
-  open Conditions
-  // inside
-
-  // inside2
-  check()
-  // foo
-
-  // bar
-} {
-  Js.log("test")
-}
-
-let multiply = (/* c0 */ m1 /* c1 */, /* c2 */ m2 /* c3 */) => {
-  // here
-  open Matrix4D
-
-  let m3 = makeUninitializedUnsafe()
-
-  // there
-
-  // over there
-  m3
-  /* trailing */
-  // test
-}
-
-switch x {
-| Blue if /* c0 */ multicore.enabled /* c1 */ === /* c2 */ true /* c3 */ => ()
-| Red
-  if {
-    // c0
-    open /* c1 */ Multicore // c2
-    // c3
-
-    // c4
-    isEnabled() // c5
-    /* c6 */
-
-    // c7
-  } => ()
-}
-
-let catch = 34
-
-let promiseCatch = x => Js.Promise.catch(x)
-
-// aggregating intersections
-let () = {
-  let s = Sphere.make()
-  let i1 = make(~t=1., ~sphere=s)
-  let i2 = make(~t=2., ~sphere=s)
-
-  //  let is = interesections
-
-  //  assert
-}
-
-let () = {
-  let s = Sphere.make()
-  let i1 = make(~t=1., ~sphere=s)
-  let i2 = make(~t=2., ~sphere=s)
-
-  //  let is = interesections
-
-  //  assert
-}
diff --git a/jscomp/syntax/tests/printer/comments/expected/case.res.txt b/jscomp/syntax/tests/printer/comments/expected/case.res.txt
deleted file mode 100644
index 469af84..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/case.res.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-let rec mergeU = (s1, s2, f) =>
-  switch {
-    open N
-    (toOpt(s1), toOpt(s2))
-  } {
-  | (None, None) => N.empty
-  | (Some(n) /* (Node (l1, v1, d1, r1, h1), _) */, _)
-    if {
-      open N
-      heightGet(n) >=
-      switch N.toOpt(s2) {
-      | None => 0
-      | Some(n) => N.heightGet(n)
-      }
-    } =>
-    let (l1, v1, d1, r1) = {
-      open N
-      (leftGet(n), keyGet(n), valueGet(n), rightGet(n))
-    }
-    let (l2, d2, r2) = split(v1, s2)
-    N.concatOrJoin(mergeU(l1, l2, f), v1, f(. v1, Some(d1), d2), mergeU(r1, r2, f))
-  | (_, Some(n)) /* Node (l2, v2, d2, r2, h2) */ =>
-    let (l2, v2, d2, r2) = {
-      open N
-      (leftGet(n), keyGet(n), valueGet(n), rightGet(n))
-    }
-    let (l1, d1, r1) = split(v2, s1)
-    N.concatOrJoin(mergeU(l1, l2, f), v2, f(. v2, d1, Some(d2)), mergeU(r1, r2, f))
-  | _ => assert(false)
-  }
diff --git a/jscomp/syntax/tests/printer/comments/expected/docComments.res.txt b/jscomp/syntax/tests/printer/comments/expected/docComments.res.txt
deleted file mode 100644
index bae9ae9..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/docComments.res.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*** This is a module comment */
-
-/*** This is another module comment */
-
-/** This is a doc ✅ comment */
-let z = 34
-
-/***And this is a res.doc module annotation*/
-
-/**And this is a res.doc ✅ annotation*/
-let q = 11
-
-/** This
-  * is a multi-line
-  multiline doc comment
-  */
-type h = int
-
-/* comment and attribute */
-@foo let x = 10
-
-/** doc comment and attribute */
-@foo
-let x = 10
-
-/** doc comment and 3 attributes */
-@foo
-@bar
-@baz
-let x = 10
-
-/** doc comment and 0 attributes */
-let x = 10
-
-type pathItem = {}
-/** Issue 6844: doc comment before "and" */ and operation = {}
diff --git a/jscomp/syntax/tests/printer/comments/expected/expr.res.txt b/jscomp/syntax/tests/printer/comments/expected/expr.res.txt
deleted file mode 100644
index b33fda6..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/expr.res.txt
+++ /dev/null
@@ -1,326 +0,0 @@
-// Pexp_ident
-let pi = /* before */ Math.pi // after
-
-// Pexp_constant
-let one = /* before */ 1 // after
-
-// Pexp_let
-let x = {
-  let /* before a */ a /* after a */ = /* before 1 */ 1 // after 1
-  /* before ident */ Pexp.ident /* after ident */
-}
-
-let x = {
-  let /* before a */ a /* after a */ = /* before 1 */ 1 // after 1
-  let /* before b */ b /* after b */ = /* before 2 */ 2 // after 2
-  /* before ident */ Pexp.ident /* after ident */
-}
-
-let x = {
-  let /* before a */ a /* after a */ = /* before 1 */ 1 // after 1
-  let /* before b */ b /* after b */ = /* before 2 */ 2 // after 2
-  /* before const */ "a string" /* after const */
-}
-
-// Pexp_extension
-let x = /* c0 */ %ext(/* before */ "test" /* after */) /* c1 */
-
-// Pexp_open
-let x = {
-  /* before open */ open /* c0 */ Belt /* c1 */ // after open
-  /* before const */ "a string" /* after const */
-}
-
-let x = {
-  /* before open */ open /* c0 */ Belt /* c1 */ // after open
-  /* before open */ open! /* c0 */ Unsafe /* c1 */ // after open
-  /* before const */ "a string" /* after const */
-}
-
-let x = {
-  /* before let */ let a = 1 // after let
-  open /* before ident */ Belt // after open
-  /* before const */ "test" /* after const */
-}
-
-let x = {
-  open /* before ident */ Belt // after open
-  /* before let */ let a = 1 // after let
-  /* before const */ "test" /* after const */
-}
-
-// Pexp_letexception
-let x = {
-  /* before */ exception /* c0 */ Foo /* c1 */ // after
-  /* before */ "test" /* after */
-}
-
-// Pexp_letmodule
-let x = {
-  /* before */ module /* c0 */ B /* c1 */ = Belt // after
-  /* before */ "test" /* after */
-}
-
-// Pexp_assert
-let x = /* here */ assert(/* c0 */ true /* c1 */)
-
-// Pexp_lazy
-let x = /* here */ lazy /* c0 */ true /* c1 */
-
-// Pexp_constraint
-let x = (/* c0 */ "string" /* c1 */: /* c2 */ string /* c3 */) // after
-
-// Pexp_construct
-let x = /* before */ true /* after */
-let x = /* before */ Red /* after */
-let x = /* before */ Red(/* c0 */ shade /* c1 */) /* after */
-let x = /* before */ Red /* after Red */(
-  /* c0 */ r /* c1 */,
-  /* c2 */ g /* c3 */,
-  /* c4 */ b /* c5 */,
-) /* after */
-
-// lists
-let x = /* c0 */ list{/* c1 */} /* c2 */
-/* c0 */ list{/* c1 */} /* c2 */
-
-let x = /* c0 */ list{/* c1 */ a /* c2 */} /* c3 */
-/* c0 */ list{/* c1 */ a /* c2 */} /* c3 */
-
-let x = /* c0 */ list{/* c1 */ a /* c2 */, /* c3 */ b /* c4 */} /* c5 */
-/* c0 */ list{/* c1 */ a /* c2 */, /* c3 */ b /* c4 */} /* c5 */
-
-let x = /* c0 */ list{/* c1 */ a /* c2 */, /* c3 */ b /* c4 */, /* c5 */ c /* c6 */} /* c7 */
-/* c0 */ list{/* c1 */ a /* c2 */, /* c3 */ b /* c4 */, /* c5 */ c /* c6 */} /* c7 */
-
-// Pexp_array
-let x = [/* c0 */ a /* c1 */, /* c2 */ b /* c3 */, /* c4 */ c /* c5 */]
-let x = [/* a */]
-let x = [
-  // test
-]
-
-// Pexp_record
-let user = /* before */ {
-  // above name
-  /* c0 */ name /* c1 */: /* c2 */ "Steve" /* c3 */,
-  // above age
-  /* c4 */ age /* c5 */: /* c6 */ 31 /* c7 */,
-} // after
-
-// Pexp_record with empty record
-let user = /* before */ {
-  /* comment1 */
-  // comment2
-} // after
-
-let user = /* before */ {/* comment1 */ /* comments2 */} // after
-
-// bs object sugar
-let user = /* before */ {
-  // above name
-  /* c0 */ "name" /* c1 */: /* c2 */ "Steve" /* c3 */,
-  // above age
-  /* c4 */ "age" /* c5 */: /* c6 */ 31 /* c7 */,
-} // after
-
-let spreadUser = {
-  /* before */ ...user1 /* after */,
-  /* c0 */ age /* c1 */: /* c2 */ 32 /* c3 */,
-}
-
-// Pexp_field
-let x = /* before */ user /* c0 */./* c1 */ name /* c2 */
-
-// Pexp_setfield
-/* before */ user /* c0 */./* c1 */ name /* c2 */ = /* c3 */ "Steve" /* c4 */
-
-// Pexp_ifthenelse
-if /* c0 */ user.name === "Steve" /* c1 */ {
-  /* c2 */ Js.log("It's Steve") /* c3 */
-} // trailing
-
-if /* c0 */ user.name === "John" /* c1 */ {
-  /* c2 */ Js.log("It's John…") /* c3 */
-} else {
-  // c4
-  /* c5 */ Js.log("we need John") /* c6 */
-} // trailing
-
-if a {
-  b
-} // test
-else if c {
-  d
-}
-
-let distXToTraverse = if deltaX < 0. {
-  // wizard to the left
-  if minRangeX >= -.deltaX {
-    // already within min range, aka close enough
-    0.
-  } else {
-    deltaX +. minRangeX
-  }
-} // wizard to the right
-else if minRangeX >= deltaX {
-  // already within min range, aka close enough
-  0.
-} else {
-  deltaX -. minRangeX
-}
-
-// Pexp_while
-while /* c0 */ condition.contents /* c1 */ {
-  /* c2 */ doStuff() /* c3 */
-} // trailing
-
-// Pexp_for
-for /* c0 */ i /* c1 */ in /* c2 */ 0 /* c3 */ to /* c4 */ 10 /* c5 */ {
-  /* c6 */ doStuff() /* c7 */
-} // trailing
-
-// Pexp_pack
-/* c0 */ module(/* c1 */ ModExpr /* c2 */) /* c3 */
-/* c0 */ let /* c1 */ three /* c2 */ = /* c3 */ module(/* c4 */ Three /* c5 */) /* c6 */
-
-/* c0 */ module(/* c1 */ ModExpr: /* c4 */ MyModule /* c5 */) /* c6 */
-/* c0 */ let /* c1 */ three /* c2 */ = /* c3 */ module(
-  /* c4 */ Three: /* c6 */ MyModule /* c7 */
-) /* c8 */
-
-/* c0 */ switch /* c1 */ color /* c2 */ {
-// above Red
-/* c0 */ | Red /* c1 */ => /* c2 */ printColor("red") /* ending */
-
-// above Blue
-/* c3 */ | Blue /* c4 */ => /* c5 */ printColor("blue") /* ending */
-}
-
-/* c0 */ try /* c2 */ unsafeIdentifier /* c3 */ catch {
-// Above
-/* before */ | InfiniteLoop /* after */ => /* here */ () /* trailing */
-
-// Above2
-/* before */ | InfiniteLoop2 /* after */ => /* here */ () /* trailing */
-} // trailing
-
-// Pexp_fun
-let f = (/* c0 */ a /* c1 */, /* c2 */ b /* c3 */): /* c4 */ int /* c5 */ => /* c6 */ 20 /* c7 */
-let multiply = (/* c0 */ m1 /* c1 */, /* c2 */ m2 /* c3 */) => {
-  // here
-  open Matrix4D
-
-  let m3 = makeUninitializedUnsafe()
-
-  // there
-
-  // over there
-  m3
-  /* trailing */
-  // test
-}
-
-let multiply = (~x=/* c0 */ m1 /* c1 */, ~y=/* c2 */ m2 /* c3 */) => ()
-
-let f = (
-  /* c0 */ ~greeting /* c1 */,
-  /* c2 */ ~from as /* c3 */ /* c4 */ hometown /* c5 */,
-  /* c6 */ ~x=?,
-) => /* c7 */ ()
-
-let multiply = (type /* c-2 */ t /* c-1 */, /* c0 */ m1 /* c1 */, /* c2 */ m2 /* c3 */) => ()
-let multiply = (
-  type /* c-4 */ t /* c-3 */,
-  /* c0 */ m1 /* c1 */,
-  type /* c-2 */ s /* c-1 */,
-  /* c2 */ m2 /* c3 */,
-) => ()
-
-f(() => 1)
-// c1
-f(_ => 1)
-// c2
-f(a => 1)
-// c3
-f((~a) =>
-  // c4
-  1
-)
-
-// ternary
-let x = /* c0 */ test /* c1 */ ? /* c2 */ true /* c3 */ : /* c4 */ false /* c5 */
-
-// Pexp_if case, don't duplicate comments
-if next == Js.null {
-  /* only one element */
-  clear(q)
-  Some(contentGet(x))
-} else {
-  lengthSet(q, lengthGet(q) - 1)
-  firstSet(q, next)
-  Some(contentGet(x))
-}
-
-// Pexp_if with parenthesized condition
-if (
-  /* Format.eprintf "@[%a@]@." Printtyp.raw_type_expr ty; */
-  switch ty0.desc {
-  | Tconstr(p, _, _) => Path.same(p, path)
-  | _ => false
-  }
-) {
-  ()
-}
-
-// add end of list of nodes
-Doc.concat(
-  privateFlag,
-  rows,
-  /* a */
-)
-Doc.concat(list{
-  privateFlag,
-  rows,
-  /* a */
-})
-
-// More record spread test
-type b = {
-  // spread a
-  ...a,
-  // spread c
-  ...c,
-  // no spread
-  b: string,
-}
-
-type a = {
-  // spread from different module
-  ...M.a,
-  // spread c
-  ...c,
-  // no spread
-  b: string,
-}
-
-let b = {
-  // exotic
-  ...\"let",
-  // foo
-  bar: "foo",
-}
-
-let b = {
-  // quote
-  ..."let",
-  // foo
-  bar: "foo",
-}
-
-let c = {
-  // from different module
-  ...M.a,
-  // foo
-  bar: "foo",
-}
diff --git a/jscomp/syntax/tests/printer/comments/expected/extensionConstructor.res.txt b/jscomp/syntax/tests/printer/comments/expected/extensionConstructor.res.txt
deleted file mode 100644
index e3e13e7..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/extensionConstructor.res.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/* c0 */ exception /* c1 */ Exit /* c2 */ = /* c3 */ Terminate /* c4 */
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */(/* c4 */ int /* c5 */, /* c6 */ int /* c7 */) // after
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */(
-  /* c4 */ int /* c5 */,
-  /* c6 */ int /* c7 */,
-): /* c8 */ gadt // after
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */</* c1.1 */ 'x /* c2.2 */> +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ += /* c3 */ Bar /* c4 */
-
-/* c0 */ type /* c1 */ t /* c2 */ +=
-  | /* c3 */ Foo /* c4 */ = /* c5 */ Bar /* c6 */
diff --git a/jscomp/syntax/tests/printer/comments/expected/fileWithOneSingleLineComment.res.txt b/jscomp/syntax/tests/printer/comments/expected/fileWithOneSingleLineComment.res.txt
deleted file mode 100644
index 0f99a48..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/fileWithOneSingleLineComment.res.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-// retain this comment
-
diff --git a/jscomp/syntax/tests/printer/comments/expected/fileWithOnlyComments.res.txt b/jscomp/syntax/tests/printer/comments/expected/fileWithOnlyComments.res.txt
deleted file mode 100644
index d0df583..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/fileWithOnlyComments.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// test
-
-/* multi
-line
-comment
-*/
-
-// more comments
-
diff --git a/jscomp/syntax/tests/printer/comments/expected/ifLet.res.txt b/jscomp/syntax/tests/printer/comments/expected/ifLet.res.txt
deleted file mode 100644
index 3be5372..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/ifLet.res.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-if /* c0 */ let /* c1 */ Some(/* c2 */ x /* c3 */) /* c4 */ = /* c5 */ makeOpt() /* c6 */ {
-  /* c7 */ foo() /* c8 */
-} else {
-  /* c9 */ bar() /* c10 */
-}
-
-let getZ2 = nested =>
-  if let /* c-4 */ Some(point) /* c-3 */ =  /* c-2 */ nested.origin  /* c-1 */ {
-    if let /* c0 */ Some( /* c1 */ z /* c2 */ ) =/* c3 */ point.z /* c4 */ {
-      let pi /* inside */ = 3.13 *. point.z // trailing1
-      let e /* inside1 */= 42.3 // trailing2
-      pi *. e // trailing3
-    } else {
-      let pi /* inside2 */= 3.13 // trailing4
-      let e /* inside3 */= 42.3 // trailing5
-      pi *. e // trailing6
-    }
-  } else {
-    let pi /* inside4 */ = 3.13 // trailing7
-    let e /* inside5 */ = 42.3 // trailing8
-    pi *. e // trailing9
-  }
- */
diff --git a/jscomp/syntax/tests/printer/comments/expected/ifThenElse.res.txt b/jscomp/syntax/tests/printer/comments/expected/ifThenElse.res.txt
deleted file mode 100644
index 68da4f4..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/ifThenElse.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  // comment
-  if condition() {
-    renderBranch()
-  } else {
-    doSomeOtherThings()
-  }
-}
diff --git a/jscomp/syntax/tests/printer/comments/expected/interfaceWithOneSingleComment.resi.txt b/jscomp/syntax/tests/printer/comments/expected/interfaceWithOneSingleComment.resi.txt
deleted file mode 100644
index 0f99a48..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/interfaceWithOneSingleComment.resi.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-// retain this comment
-
diff --git a/jscomp/syntax/tests/printer/comments/expected/interfaceWithOnlyComments.resi.txt b/jscomp/syntax/tests/printer/comments/expected/interfaceWithOnlyComments.resi.txt
deleted file mode 100644
index de095c0..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/interfaceWithOnlyComments.resi.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// test
-
-/* test */
-
-// ok
-
diff --git a/jscomp/syntax/tests/printer/comments/expected/jsx.res.txt b/jscomp/syntax/tests/printer/comments/expected/jsx.res.txt
deleted file mode 100644
index 98f1bf3..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/jsx.res.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-module Cite = {
-  @react.component
-  let make = (~author: option<string>, ~children) => {
-    // For semantics, check out
-    // https://css-tricks.com/quoting-in-html-quotations-citations-and-blockquotes/
-    <div> foo </div>
-  }
-}
-
-<A
-  value=""
-  // Comment
-/>
-
-<A /* comment */ />
-
-<A>
-  // Comment
-</A>
-
-<A
-// comment1
-// comment 2
-/>
-
-<A
-  // comment1
-  value=""
-  // comment2
->
-  <B /* comment3 */ />
-</A>
-
-<A
-  value=""
-  /* comment */
->
-  <B />
-</A>
-
-<A
-// comment
->
-  <B />
-</A>
-
-<A
-/* comment */
->
-  <B />
-</A>
-
-<A /* comment */>
-  <B />
-</A>
-
-<div>
-  // Must not jump inside braces
-  {React.string("Hello, World!")}
-</div>
-
-<div>
-  // Must not jump inside braces
-  {// But this one is inside
-  React.string("Hello, World!")}
-</div>
-
-let x =
-  <>
-    // before a
-    {a} // after a
-    // before b
-    {b} // after b
-  </>
diff --git a/jscomp/syntax/tests/printer/comments/expected/modExpr.res.txt b/jscomp/syntax/tests/printer/comments/expected/modExpr.res.txt
deleted file mode 100644
index 9f5afa1..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/modExpr.res.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-// Pmod_ident
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ Y /* c4 */
-
-// Pmod_structure
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ {
-  let /* inside1 */ a /* inside2 */ = 2 /* trailing */
-} // trailing
-
-// Pmod_extension
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ %ext(/* c4 */ "test" /* c5 */) /* c6 */
-
-// Pmod_unpack
-/* c0 */ module /* c1 */ New_three /* c2 */ = /* c3 */ unpack(
-  /* c4 */ three /* c5 */: /* c6 */ X_int /* c7 */
-) /* c8 */
-
-// Pmod_constraint
-/* c0 */ module /* c1 */ X /* c2 */: /* c5 */ Int /* c6 */ = /* c3 */ X /* c4 */
-/* c0 */ module /* c1 */ X /* c2 */: /* c4 */ Int /* c5 */ = /* c6 */ X /* c7 */
-
-// Pmod_apply
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ F /* c4 */(
-  /* c4 */ Arg1 /* c5 */,
-  /* c6 */ Arg2 /* c7 */,
-  /* c8 */ Arg3 /* c9 */,
-) /* c10 */
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ F(
-  /* c4 */ A /* c5 */: /* c6 */ SetLike /* c7 */,
-  /* c7 */ B /* c8 */: /* c9 */ TreeLike /* c10 */,
-) /* c11 */
-/* c0 */ module /* c1 */ S0 /* c2 */ = /* c3 */ Make /* c4 */(/* lbrace */ {
-  type t = int /* c5 */
-  let eq /* c6 */ = (x, y) => x == y
-} /* rbrace */) // trailing
-
-// Pmod_functor
-/* c0 */ module /* c1 */ F /* c2 */ = /* before parameters */ (
-  /* c3 */ A /* c4 */: /* c5 */ X /* c6 */,
-  /* c7 */ B /* c8 */: /* c9 */ Y /* c 10 */,
-  /* c7 */ C /* c8 */: /* c9 */ Z /* c 10 */,
-) => /* c11 */ ReturnMod /* c12 */
-
-module Make = /* before parameters */ (
-  /* before A */ A /* after A */: /* before X */ X /* after X */,
-  /* before B */ B /* after B */: /* before Y */ Y /* after Y */,
-): /* c1 */ Set /* c2 */ => {
-  let a /* inside */ = A.a + B.b
-}
-
-module Make = /* before parameters */ (
-  /* before A */ A /* after A */: /* before X */ X /* after X */,
-  /* before B */ B /* after B */: /* before Y */ Y /* after Y */,
-): /* c1 */ Set /* c2 */ => {
-  let a /* inside */ = A.a + B.b
-}
diff --git a/jscomp/syntax/tests/printer/comments/expected/modType.res.txt b/jscomp/syntax/tests/printer/comments/expected/modType.res.txt
deleted file mode 100644
index 7f0ff61..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/modType.res.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-// Pmty_ident
-/* c0 */ module type /* c1 */ T /* c2 */ = /* c3 */ Tree /* c4 */
-
-// Pmty_signature
-/* c0 */ module type /* c1 */ T /* c2 */ = /* c3 */ {
-  let a: int
-} /* c4 */
-
-// Pmty_extension
-/* c0 */ module type /* c1 */ T /* c2 */ = /* c3 */ %ext(/* c4 */ "test" /* c5 */) /* c6 */
-
-// Pmty_typeof
-/* c0 */ module type /* c1 */ A /* c2 */ = /* c3 */ module type of /* c4 */ {
-  let a /* inside */ = 1
-} /* c5 */
-
-// Pmty_with
-/* c0 */ module type /* c1 */ A /* c2 */ = /* c3 */ Foo /* c4 */ with type t = string // end
-
-// Pmty_functor
-/* c0 */ module type /* c1 */ Functor /* c2 */ = /* c3 */ SetLike /* c4 */ => /* c5 */ Set /* c6 */
-module type Functor = /* before */ (
-  /* before S */ S /* after S */: /* before */ SetLike /* after */,
-  /* before B */ B /* after B */: /* before */ BtreeLike /* after */,
-) => /* before NeoTree */ NeoTree // after NeoTree
-module type Functor = (
-  /* c0 */ /* c1 */ /* c2 */ SetLike /* c3 */,
-  /* c4 */ /* c5 */ /* c6 */ BtreeLike /* c7 */,
-) => NeoTree
-
-module type Functor = /* before */ (/* c0 */ SetLike /* c1 */, /* c2 */ BtreeLike /* c3 */) =>
-NeoTree
diff --git a/jscomp/syntax/tests/printer/comments/expected/multiline.res.txt b/jscomp/syntax/tests/printer/comments/expected/multiline.res.txt
deleted file mode 100644
index b1cd20a..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/multiline.res.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-/* first line
- * the leading stars
- * should align here.
- */
-let f = () => ()
-
-/* first line
- * second line
- * third line */
-
-/* first line
- *
- * third line */
-
-/* x */
-/*  */
-/*  */
-/*  */
-
-/*
- * test
- */
-
-/* ReScript outperforms a classic for-loop: 
-   function equals3(m1, m2) {
-    for (var i = 0; i < 4; i++) {
-        for (var j = 0; j < 4; j++) {
-            var x = m1[i][j];
-            var y = m2[i][j];
-            if(!floatEquals(x, y)) {
-                return false
-            }
-        }
-    }
-    return true
-  } */
-let equals = (matrix1, matrix2) => {
-  let rec loop = (i, j) =>
-    if i > 3 {
-      true
-    } else {
-      let x = matrix1->getUnsafe(~row=i, ~col=j)
-      let y = matrix2->getUnsafe(~row=i, ~col=j)
-      if !Float.equals(x, y) {
-        false
-      } else if j < 3 {
-        loop(i, j + 1)
-      } else {
-        loop(i + 1, 0)
-      }
-    }
-
-  loop(0, 0)
-}
-
-/*
-foo
-bar
-*/
-
-/*
-
-
-
-foo
-bar
-*/
-
-/*
-
-
-
-foo
-
-
-
-
-bar
-
-
-
-*/
-
-/* multi
-line
-comment
-*/
-
-/*
-multi
-line
-comment */
diff --git a/jscomp/syntax/tests/printer/comments/expected/namedArgs.res.txt b/jscomp/syntax/tests/printer/comments/expected/namedArgs.res.txt
deleted file mode 100644
index f244d48..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/namedArgs.res.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-let wizard = Wizard.make(
-  ~spriteSheet=wizard,
-  ~hp=999999999999999,
-  ~mp=50,
-  //~coordinates={x: 0., y:0. z: 0.},
-  ~coordinates={x: 40, y: 100., z: 0.},
-  /* c0 */ ~gpuCoordinates=/* c1 */ gpuBuffer[10] /* c2 */, // trailing
-)
-
-apply(
-  // above
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-  // below
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
-  // here
-  ~cccccccccccccccccccccccccccccccc,
-)
-
-applyOptional(
-  // above
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?,
-  // below
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb?,
-  // here
-  ~cccccccccccccccccccccccccccccccc?,
-)
-
-foo(
-  // c0
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int,
-  // c1
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int,
-  // c2
-  ~cccccccccccccccccccccccccccccc: int,
-)
-
-let f = (
-  ~isItemActive=?,
-  // array((name, href))
-  ~headers: array<(string, string)>,
-  ~moduleName: string,
-  // foo
-  ~x,
-  // above
-  /* c0 */ ~d: /* c1 */ e, // end
-  // does it work
-  ~from as hometown,
-) => {
-  let a = 1
-  let b = 2
-  a + b
-}
-
-@react.component
-let make = (
-  ~theme: ColorTheme.t,
-  ~components: Mdx.Components.t,
-  ~sidebarState: (bool, (bool => bool) => unit),
-  // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
-  ~sidebar: React.element,
-  ~breadcrumbs: option<list<UrlPath.breadcrumb>>=?,
-  ~children,
-) => {
-  ()
-}
diff --git a/jscomp/syntax/tests/printer/comments/expected/openDescription.res.txt b/jscomp/syntax/tests/printer/comments/expected/openDescription.res.txt
deleted file mode 100644
index 0f1a994..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/openDescription.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-open /* leading */ React /* trailing */
-open /* leading */ React /* trailing */
-open /* leading */ React // trailing
diff --git a/jscomp/syntax/tests/printer/comments/expected/pattern.res.txt b/jscomp/syntax/tests/printer/comments/expected/pattern.res.txt
deleted file mode 100644
index ed6b8d6..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/pattern.res.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-// Ppat_any
-let /* before */ _ /* after */ = 1
-
-// Ppat_var
-let /* before */ x /* after */ = 1
-
-// Ppat_constant
-let /* before */ 123 /* after */ = 123
-
-// Ppat_interval not supported
-// Ppat_interval of constant * constant
-
-// Ppat_alias
-let /* before pat */ p /* after pat */ as /* before alias */ x /* after alias */ = ()
-let /* c0 */ (/* c1 */ p /* c2 */ as /* c3 */ x /* c4 */) as /* c5 */ y /* c6 */ = ()
-
-// Ppat_array
-let /* c0 */ [/* c1 */ a /* c2 */, /* c3 */ b /* c4 */, /* c5 */ c /* c6 */] /* c7 */ = [1, 2, 3]
-
-// Ppat_construct
-let /* here */ Black /* there */ = color
-
-let /* here */ Black(/* inside */) /* there */ = color
-let Black(/* inside */ /* inside2 */) = color
-let Black(/* inside */ /* inside2 */ /* inside 3 */) = color
-let Black(
-  // singleLineComment
-) = color
-
-let module(/* c0 */ X /* c1 */: /* c2 */ X_int /* c3 */) /* c4 */ = x
-
-let /* before */ Rgb /* after constr */(
-  /* red */ r /* red2 */,
-  /* green */ g /* green2 */,
-  /* blue */ b /* blue2 */,
-) /* after */ = color
-
-switch a {
-| Constr /* after constr */
-| Constr /* after constr */(a, _) => a
-}
-
-let () = ()
-let [/* inside */] = []
-let list{/* inside */} = list{}
-
-let /* before */ list{/* a1 */ a /* a2 */, /* b1 */ b /* b2 */} /* after */ = list{1, 2}
-let /* before */ list{/* a1 */ a /* a2 */, .../* b1 */ b /* b2 */} /* after */ = list{1, 2}
-
-// Ppat_record
-let /* before */ {/* c0 */ name /* c1 */, /* c2 */ age /* c3 */} /* after */ = {
-  name: "steve",
-  age: 31,
-}
-
-let /* before */ {
-  /* c0 */ name /* c1 */: /* c2 */ firstName /* c3 */,
-  /* c3 */ age /* c4 */: /* c5 */ ageInYears /* c6 */,
-} /* after */ = {name: "steve", age: 31}
-
-// Ppat_or
-let /* b1 */ Blue /* b2 */ | /* c1 */ Red /* c2 */ = color
-let /* b1 */ Blue /* b2 */ | /* c1 */ Red /* c2 */ | /* d1 */ Green /* d2 */ = color
-
-// #462: Comments in nested Ppat_or must not disappear.
-// (comment positions not optimal yet because `|` has no AST location)
-let _ = switch "anything" {
-// above 1
-| "1"
-| // below 1
-"2"
-| // below 2
-"3"
-| // below 3
-_ => "4"
-// below 4
-}
-
-// Ppat_constraint
-let /* c0 */ number /* c1 */: /* c2 */ int /* c3 */ = 123
-
-// Ppat_lazy
-let /* before */ lazy /* a */ x /* b */ /* after */ = lazy 1
-
-// Ppat_unpack
-let /* before */ module(/* h1 */ Hashtbl /* h2 */) /* after */ = Hashtbl
-let /* before */ module(/* h1 */ Hashtbl /* h2 */: /* h3 */ MutableTable /* h4 */) /* after */ = Hashtbl
-
-// Ppat_exception
-let /* before */ exception /* c0 */ Exit /* c1 */ /* after */ = exc
-
-// Ppat_extension
-let /* before */ %raw("eval(gc())") /* after */ = stuff
-
-// Ppat_interval
-let /* c0 */ 'a' .. 'z' /* c1 */ = x
diff --git a/jscomp/syntax/tests/printer/comments/expected/signatureItem.resi.txt b/jscomp/syntax/tests/printer/comments/expected/signatureItem.resi.txt
deleted file mode 100644
index 09ebaf3..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/signatureItem.resi.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-// Psig_value
-/* c0 */ external /* c1 */ force_gc /* c2 */: /* c3 */ unit /* c4 */ => /* c5 */ unit /* c6 */ =
-  "gc" // trailing
-
-// Psig_type
-/* c0 */ type /* c1 */ t /* c2 */ = /* c3 */ string /* c4 */
-
-/* c0 */ type /* c1 */ t /* c2 */ = /* c4 */ string /* c5 */
-// above
-and /* c6 */ s /* c7 */ = /* c8 */ int /* c9 */
-
-// Pstr_typext
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */</* c1.1 */ 'x /* c2.2 */> +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ += /* c3 */ Bar /* c4 */
-
-/* c0 */ type /* c1 */ t /* c2 */ +=
-  | /* c3 */ Foo /* c4 */ = /* c5 */ Bar /* c6 */
-
-// Pstr_exception
-/* c0 */ exception /* c1 */ Exit /* c2 */ = /* c3 */ Terminate /* c4 */
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */(/* c4 */ int /* c5 */, /* c6 */ int /* c7 */) // after
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */(
-  /* c4 */ int /* c5 */,
-  /* c6 */ int /* c7 */,
-): /* c8 */ gadt // after
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */({
-  /* c4 */ code /* inside */: /* inside2 */ int /* c5 */,
-  /* c6 */ timeout /* inside */: /* inside2 */ int /* c7 */,
-}): /* c8 */ gadt // after
-
-// Psig_module
-/* c0 */ module /* c1 */ X /* c2 */: /* c3 */ MT /* c4 */
-
-// Psig_module
-/* c0 */ module rec /* c1 */ X1 /* c2 */: /* c3 */ MT1
-// above
-and /* c4 */ Xn /* c5 */: /* c6 */ MTn /* c7 */
-
-// Psig_modtype
-/* c0 */ module type /* c1 */ S /* c2 */ = /* c3 */ MT /* c4 */
-/* c0 */ module type /* c1 */ S /* c2 */
-
-// Psig_open
-/* c0 */ open /* c1 */ Belt /* c2 */
-
-// Psig_include
-/* c0 */ include /* c1 */ {
-  let a /* inside */: int
-} // after
-
-// Psig_attribute
-/* c0 */ @@attr(/* c1 */ payload /* c2 */) /* c3 */
-
-// Psig_extension
-/* c0 */ @@extension(/* c1 */ payload /* c2 */) /* c3 */
diff --git a/jscomp/syntax/tests/printer/comments/expected/structure1.res.txt b/jscomp/syntax/tests/printer/comments/expected/structure1.res.txt
deleted file mode 100644
index ace6fc0..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/structure1.res.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// leading single line 1a
-// leading single line 1b
-/* leading multiline 1c */
-/* leading multiline 1d */
-/* leading multiline attached to node */ let a = 1 // trailing1
-
-// leading2
-/* before */ let b = 2 /* trailing2 */
-/* under b */
-
-/* here */
-
-// lala
-
-/* test */ /* okok */
-
-// above open
-open /* here */ React // after
-// trailing
-/* foo */
-/* bar */
-
-// another
-// ok
-
-// end
diff --git a/jscomp/syntax/tests/printer/comments/expected/structure2.res.txt b/jscomp/syntax/tests/printer/comments/expected/structure2.res.txt
deleted file mode 100644
index 11698a7..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/structure2.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-let b = 2
-/* test */ // sldkfj
-
-// sldkfj
-
-/* help */ /* help2 */
-
-/* test2 */
-open /* before lident */ React
diff --git a/jscomp/syntax/tests/printer/comments/expected/structure3.res.txt b/jscomp/syntax/tests/printer/comments/expected/structure3.res.txt
deleted file mode 100644
index ab49627..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/structure3.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-node.left->peekMinNode
-// same as the above
-node.left->peekMinNode
-
-// field access has higher precedence than unary -
-let x = -a.bar
-
-let a = 1
-
-/* test */
-let b = 2
-// a
-// b
diff --git a/jscomp/syntax/tests/printer/comments/expected/structure4.res.txt b/jscomp/syntax/tests/printer/comments/expected/structure4.res.txt
deleted file mode 100644
index 9f2fa92..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/structure4.res.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-let user = {
-  name: "steve",
-  age: 31,
-}
-
-/* A comment */
-/*
- * A type that can be written to a buffer.
- */
-/*
- * Describes the connection status of a ReactiveSocket/DuplexConnection.
- * - NOT_CONNECTED: no connection established or pending.
- * - CONNECTING: when `connect()` has been called but a connection is not yet
- *   established.
- * - CONNECTED: when a connection is established.
- * - CLOSED: when the connection has been explicitly closed via `close()`.
- * - ERROR: when the connection has been closed for any other reason.
- */
-/*
- * A contract providing different interaction models per the [ReactiveSocket protocol]
- * (https://github.com/ReactiveSocket/reactivesocket/blob/master/Protocol.md).
- */
-/*
- * A single unit of data exchanged between the peers of a `ReactiveSocket`.
- */
diff --git a/jscomp/syntax/tests/printer/comments/expected/structureItem.res.txt b/jscomp/syntax/tests/printer/comments/expected/structureItem.res.txt
deleted file mode 100644
index 5dfc7e1..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/structureItem.res.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-// Pstr_attribute
-@@attr(/* c0 */ "here" /* c1 */)
-
-// Pstr_extension
-%%extension(/* c0 */ "here" /* c1 */)
-
-// Pstr_include
-/* c0 */ include /* c1 */ Belt /* c2 */
-/* c0 */ include /* c1 */ {
-  let a /* inside */ = 2
-} /* c2 */
-
-// Pstr_open
-/* c0 */ open /* c1 */ Belt /* c2 */
-
-// Pstr_modtype
-/* c0 */ module type /* c1 */ T /* c2 */ = /* c3 */ MT /* c4 */
-
-// Pstr_recmodule
-/* c0 */ module rec /* c1 */ X1 /* c2 */ = /* c3 */ ME1 /* c4 */
-// above
-and /* c5 */ Xn /* c6 */ = /* c7 */ MEn /* c8 */
-
-// Pstr_module
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ Y /* c4 */
-
-// Pstr_exception
-/* c0 */ exception /* c1 */ Exit /* c2 */ = /* c3 */ Terminate /* c4 */
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */(/* c4 */ int /* c5 */, /* c6 */ int /* c7 */) // after
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */(
-  /* c4 */ int /* c5 */,
-  /* c6 */ int /* c7 */,
-): /* c8 */ gadt // after
-
-// Pstr_typext
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */</* c1.1 */ 'x /* c2.2 */> +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ += /* c3 */ Bar /* c4 */
-
-/* c0 */ type /* c1 */ t /* c2 */ +=
-  | /* c3 */ Foo /* c4 */ = /* c5 */ Bar /* c6 */
-
-// Pstr_type
-/* c0 */ type /* c1 */ t /* c2 */ = /* c3 */ string /* c4 */
-
-/* c0 */ type /* c1 */ t /* c2 */ = /* c4 */ string /* c5 */
-// above
-and /* c6 */ s /* c7 */ = /* c8 */ int /* c9 */
-
-// Pstr_primitive
-/* c0 */ external /* c1 */ force_gc /* c2 */: /* c3 */ unit /* c4 */ => /* c5 */ unit /* c6 */ =
-  "gc" // trailing
-
-// Pstr_eval
-/* c0 */ user.name /* c1 */ = /* c2 */ "Steve" /* c3 */
diff --git a/jscomp/syntax/tests/printer/comments/expected/trailingComments.res.txt b/jscomp/syntax/tests/printer/comments/expected/trailingComments.res.txt
deleted file mode 100644
index 199dbcb..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/trailingComments.res.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-let user = {
-  name: "steve",
-  age: 31 /* here */, // test
-
-  /* test */
-  /* test2 */
-
-  // test3
-
-  /* test 4 */
-}
-
-/* A */
-/*
- * A type that can be written to a buffer.
- */
-/*
- * Describes the connection status of a ReactiveSocket/DuplexConnection.
- * - NOT_CONNECTED: no connection established or pending.
- * - CONNECTING: when `connect()` has been called but a connection is not yet
- *   established.
- * - CONNECTED: when a connection is established.
- * - CLOSED: when the connection has been explicitly closed via `close()`.
- * - ERROR: when the connection has been closed for any other reason.
- */
-/*
- * A contract providing different interaction models per the [ReactiveSocket protocol]
- * (https://github.com/ReactiveSocket/reactivesocket/blob/master/Protocol.md).
- */
-/*
- * A single unit of data exchanged between the peers of a `ReactiveSocket`.
- */
diff --git a/jscomp/syntax/tests/printer/comments/expected/typeDefinition.res.txt b/jscomp/syntax/tests/printer/comments/expected/typeDefinition.res.txt
deleted file mode 100644
index 87ba674..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/typeDefinition.res.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-/* before */ type t /* after */
-/* before */ type /* before name */ t /* after name */ /* after */
-
-/* before */ type t = .. /* after */
-/* before */ type /* before name */ t /* after name */ = .. /* after */
-
-/* before */ type t</* c0 */ 'err /* c1 */, /* c2 */ 'success /* c3 */> /* after */
-/* before */ type /* before name */ t /* after name */<
-  /* c0 */ 'err /* c1 */,
-  /* c2 */ 'success /* c3 */,
-> /* after */
-
-/* before */ type t = /* before manifest */ string /* after */
-/* before */ type /* before name */ t /* after name */ = /* before manifest */ string /* after */
-/* before */ type /* before name */ t /* after name */<
-  /* c0 */ 'err /* c1 */,
-  /* c2 */ 'success /* c3 */,
-> = /* before manifest */ string /* after */
-
-/* before */ type /* before name */ t /* after name */ =
-  // above Red
-  | Red // trailing Red
-  // above Blue
-  | Blue // trailing Blue
-  // above Green
-  | Green // trailing Green
-
-/* before */ type /* before name */ t /* after name */ = /* before manifest */ Colour.t /* after manifest */ =
-  // above Red
-  | /* before Red */ Red // trailing Red
-  // above Blue
-  | /* before Blue */ Blue // trailing Blue
-  // above Green
-  | /* before Green */ Green /* trailing Green */ // test
-
-type color =
-  | /* before Red */ Red /* after Red */: /* before gadt */ color /* after gadt */
-  | /* before Blue */ Blue /* after Blue */: /* before gadt */ color /* after gadt */
-
-type color = /* before constr */ Rgb /* after constructor */(/* before red */ red, green, blue)
-
-type color =
-  | /* before constr */ Rgb /* after constructor */(
-      /* before red */ red /* after red */,
-      /* before green */ green /* after green */,
-      /* before blue */ blue /* after blue */,
-    )
-
-type color =
-  | /* before constr */ Rgb /* after constructor */({
-      /* before red */ red /* after red */: /* before typ */ someNumber /* after typ */,
-      /* before green */ green /* after green */: /* before typ */ someNumber /* after typ */,
-      /* before blue */ blue /* after blue */: /* before typ */ someNumber /* after typ */,
-    })
-
-type color = {
-  /* before red */ red /* after red */: /* before typ */ someNumber /* after typ */,
-  /* before green */ green /* after green */: /* before typ */ someNumber /* after typ */,
-  /* before blue */ blue /* after blue */: /* before typ */ someNumber /* after typ */,
-}
-
-type /* c0 */ color /* c1 */ = /* before manifest */ Colour.t /* after manifest */ = {
-  /* before red */ red /* after red */: /* before typ */ someNumber /* after typ */,
-  /* before green */ green /* after green */: /* before typ */ someNumber /* after typ */,
-  /* before blue */ blue /* after blue */: /* before typ */ someNumber /* after typ */,
-}
-
-type domProps = {
-  @optional
-  viewTarget: string,
-  @optional
-  visibility: string,
-  /* width::string? => */
-  @optional
-  widths: string,
-  @optional
-  wordSpacing: string,
-  @optional
-  writingMode: string,
-  @optional
-  x: string,
-  @optional
-  x1: string,
-}
-
-@deriving(abstract)
-type t = {
-  /* MDX shortnames for more advanced components */
-  @as("Cite")
-  cite: React.component<{
-    "author": option<string>,
-    "children": React.element,
-  }>,
-  @as("Info") @optional
-  info: React.component<props>,
-}
-
-type rec t = {
-  facing: facing,
-  // frames
-}
diff --git a/jscomp/syntax/tests/printer/comments/expected/typexpr.res.txt b/jscomp/syntax/tests/printer/comments/expected/typexpr.res.txt
deleted file mode 100644
index 5741dde..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/typexpr.res.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-// Ptyp_any
-type t = /* before */ _ /* after */
-
-// Ptyp_var
-type t = /* before */ 'a /* after */
-
-// Ptyp_tuple
-// sigh… conflicts
-
-// Ptyp_constr
-type t = /* before */ string /* after */
-type t = /* before */ option /* c0 */</* c1 */ string /* c2 */> /* after */
-type t = /* before */ result /* c0 */</* c1 */ success /* c2 */, /* c3 */ err /* c4 */> /* after */
-
-// Ptyp_extension
-type t = /* before */ %ext(/* before */ "here" /* after */) /* after */
-
-// Ptyp_package
-type t = /* c0 */ module(/* before */ S /* after */) /* c1 */
-
-type t = /* c0 */ module(/* c1 */ Hashmap /* c2 */ with
-  /* c3 */ type key /* c4 */ = /* c5 */ string /* c6 */
-)
-
-// Ptyp_alias
-type t = /* c0 */ string /* c1 */ as 'x // after
-
-// Ptyp_poly
-type fn = {f: /* c0 */ 'a /* c1 */ 'b /* c2 */. /* c3 */ string /* c4 */}
-
-type fn = {
-  /* comment1 */
-  // comment2
-}
-
-type fn = {/* comment1 */ /* comment2 */}
-
-// Ptyp_arrow
-type add = /* before */ (
-  /* c0 */ int /* c1 */,
-  /* c2 */ int /* c3 */,
-) => /* before return */ int /* after */
-type add = /* before */ (
-  /* c0 */ ~a: int /* c1 */,
-  /* c2 */ ~b: int /* c3 */,
-) => /* before return */ int /* after */
-type multiply = /* before */ (
-  /* c0 */ ~fn: (
-    /* cinner0 */ int /* cinner1 */,
-    /* cinner2 */ int /* cinner3 */,
-  ) => /* cx */ int /* c1 */,
-  /* c2 */ ~b: int /* c3 */,
-) => int /* after */
-type make = (
-  ~activity: ActivityFlow_Activity.t,
-  ~showExpert: (string, string) => unit,
-  ~showCognitiveAspect: string => unit,
-  ~next: (string, string, array<string>) => unit,
-  ~hapticFeedback: unit => unit,
-  ~participants: Belt.Set.String.t,
-  // here
-
-  // above
-  /* c0 */ ~openPhotoFeed: /* c1 */ (
-    /* c2 */ ~feedId: /* c3 */ option<string> /* c4 */,
-    /* c5 */ unit /* c6 */,
-  ) => /* c7 */ unit /* c8 */,
-  // only provide this when it shows a random activity
-  ~getAnother: unit => unit=?,
-) => React.element
-
-type f = /* c0 */ (~a: /* c1 */ int /* c2 */) => /* c3 */ int /* c4 */
-type f = (/* c0 */ ~a: /* c1 */ int /* c2 */) => /* c3 */ int /* c4 */
-
-// Ptyp_object
-type jsUser = /* before */ {
-  // above name
-  /* before name */ "name" /* after name */: /* before typ */ string /* after typ */,
-  // above age
-  /* before age */ "age" /* after age */: /* before int */ int /* after int */,
-} /* after */
-
-external test: (
-  // comment 1
-  ~int: int,
-  // comment 2
-  ~int: int,
-) => unit = "test"
-
-external another_test: (
-  // comment 1
-  int,
-  // comment 2
-  int,
-) => unit = "test"
diff --git a/jscomp/syntax/tests/printer/comments/expected/valueBindingSugar.res.txt b/jscomp/syntax/tests/printer/comments/expected/valueBindingSugar.res.txt
deleted file mode 100644
index 27d5bdb..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/valueBindingSugar.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-let /* before */ x /* after */:
-  type t. (/* a */ int /* b */, /* c */ int /* d */) => /* e */ int =
-  (/* c0 */ a /* c1 */, /* c2 */ b /* c3 */) => {
-    // comment
-    a + b
-  }
diff --git a/jscomp/syntax/tests/printer/comments/expected/valueBindings.res.txt b/jscomp/syntax/tests/printer/comments/expected/valueBindings.res.txt
deleted file mode 100644
index c87a953..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/valueBindings.res.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-let x = 1
-// trailing first value-binding
-
-// leading snd value-binding
-and y = 2
-/* leading snd value-binding */
-
-let walkList: 'node. unit = comments => {
-  open Location
-  let x /* comment */ = 0
-}
-
-let walkList: 'node. (
-  ~prevLoc: Location.t=?,
-  ~getLoc: 'node => Location.t,
-  ~walkNode: ('node, t, list<Comment.t>) => unit,
-  list<'node>,
-  t,
-  list<Comment.t>,
-) => unit = (~prevLoc=?, ~getLoc, ~walkNode, l, t, comments) => {
-  open Location
-  switch l {
-  | _ if comments == list{} => ()
-  | list{} =>
-    switch prevLoc {
-    | Some(loc) => attach(t.trailing, loc, comments)
-    | None => ()
-    }
-  | list{node, ...rest} =>
-    let currLoc = getLoc(node)
-    let (leading, inside, trailing) = partitionByLoc(comments, currLoc)
-    switch prevLoc {
-    | None =>
-      /* first value binding, all leading comments attach here */
-      attach(t.leading, currLoc, leading)
-    | Some(prevLoc) =>
-      /* Same line */
-      if prevLoc.loc_end.pos_lnum === currLoc.loc_start.pos_lnum {
-        let (afterPrev, beforeCurr) = partitionAdjacentTrailing(prevLoc, leading)
-        let () = attach(t.trailing, prevLoc, afterPrev)
-        attach(t.leading, currLoc, beforeCurr)
-      } else {
-        let (onSameLineAsPrev, afterPrev) = partitionByOnSameLine(prevLoc, leading)
-        let () = attach(t.trailing, prevLoc, onSameLineAsPrev)
-        let (leading, _inside, _trailing) = partitionByLoc(afterPrev, currLoc)
-        attach(t.leading, currLoc, leading)
-      }
-    }
-    walkNode(node, t, inside)
-    walkList(~prevLoc=currLoc, ~getLoc, ~walkNode, rest, t, trailing)
-  }
-}
-
-let /* c0 */ number /* c1 */: /* c2 */ int /* c3 */ = /* c4 */ 123 /* c5 */
-
-// some comment
-
-/* leading 3th value-binding */ /* test */
-and z = 3
-/* cmt a */
-/* cmt b */
-/* cmt c */
-and z2 = 4
-// trailing structure
diff --git a/jscomp/syntax/tests/printer/comments/expected/whitespaceCase1.res.txt b/jscomp/syntax/tests/printer/comments/expected/whitespaceCase1.res.txt
deleted file mode 100644
index 783a206..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/whitespaceCase1.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-let x = 1
-// comment
-
-let 123 = 123
-// comment2
-let f = ()
diff --git a/jscomp/syntax/tests/printer/comments/expected/whitespaceCase2.res.txt b/jscomp/syntax/tests/printer/comments/expected/whitespaceCase2.res.txt
deleted file mode 100644
index 751d4e5..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/whitespaceCase2.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-let a = 2 // c2
-
-let b = 1
diff --git a/jscomp/syntax/tests/printer/comments/expected/whitespaceLeadingComment.res.txt b/jscomp/syntax/tests/printer/comments/expected/whitespaceLeadingComment.res.txt
deleted file mode 100644
index 70fb206..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/whitespaceLeadingComment.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// the comment "assert Tuple" should contain whitespace before/after
-let () = {
-  let point = Tuple.makePoint(0., 1., 0.)
-  let halfQuarter = rotationX(Js.Math._PI /. 4.)
-  let fullQuarter = rotationX(Js.Math._PI /. 2.)
-
-  /* assert Tuple.equals(
-    halfQuarter->applyTo(point),
-    Tuple.makePoint(0., Js.Math.sqrt(2.) /. 2., Js.Math.sqrt(2.) /. 2.),
-  ) */
-
-  assert(Tuple.equals(fullQuarter->applyTo(point), Tuple.makePoint(0., 0., 1.)))
-}
diff --git a/jscomp/syntax/tests/printer/comments/expected/whitespaceTrailingLeading.res.txt b/jscomp/syntax/tests/printer/comments/expected/whitespaceTrailingLeading.res.txt
deleted file mode 100644
index 6eba841..0000000
--- a/jscomp/syntax/tests/printer/comments/expected/whitespaceTrailingLeading.res.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-let a = 1 // single line trailing
-// leading
-let b = 2
-
-let a = 1 /* comment */
-// leading
-let b = 2
-
-let a = 1 // single line trailing
-
-// leading
-let b = 2
-
-let a = 1 /* comment */
-
-// leading
-let b = 2
diff --git a/jscomp/syntax/tests/printer/comments/expr.res b/jscomp/syntax/tests/printer/comments/expr.res
deleted file mode 100644
index 2a7f18d..0000000
--- a/jscomp/syntax/tests/printer/comments/expr.res
+++ /dev/null
@@ -1,317 +0,0 @@
-// Pexp_ident
-let pi = /* before */ Math.pi // after
-
-// Pexp_constant
-let one = /* before */ 1 // after
-
-// Pexp_let
-let x = {
-  let /* before a */ a /* after a */ = /* before 1 */ 1 // after 1
-  /* before ident */ Pexp.ident /* after ident */
-}
-
-let x = {
-  let /* before a */ a /* after a */ = /* before 1 */ 1 // after 1
-  let /* before b */ b /* after b */ = /* before 2 */ 2 // after 2
-  /* before ident */ Pexp.ident /* after ident */
-}
-
-let x = {
-  let /* before a */ a /* after a */ = /* before 1 */ 1 // after 1
-  let /* before b */ b /* after b */ = /* before 2 */ 2 // after 2
-  /* before const */ "a string" /* after const */
-}
-
-// Pexp_extension
-let x = /* c0 */ %ext(/* before */ "test" /* after */) /* c1 */
-
-// Pexp_open
-let x = {
-  /* before open */ open /* c0 */ Belt /* c1 */ // after open
-  /* before const */ "a string" /* after const */
-}
-
-let x = {
-  /* before open */ open /* c0 */ Belt /* c1 */ // after open
-  /* before open */ open! /* c0 */ Unsafe /* c1 */ // after open
-  /* before const */ "a string" /* after const */
-}
-
-let x = {
-  /* before let */ let a = 1 // after let
-  open /* before ident */ Belt // after open
-  /* before const */ "test" /* after const */
-}
-
-let x = {
-  open /* before ident */ Belt // after open
-  /* before let */ let a = 1 // after let
-  /* before const */ "test" /* after const */
-}
-
-// Pexp_letexception
-let x = {
-  /* before */ exception /* c0 */ Foo /* c1 */ // after
-  /* before */ "test" /* after */
-}
-
-// Pexp_letmodule
-let x = {
-  /* before */ module /* c0 */ B /* c1 */ = Belt // after
-  /* before */ "test" /* after */
-}
-
-// Pexp_assert
-let x = /* here */ assert( /* c0 */ true /* c1 */)
-
-// Pexp_lazy
-let x = /* here */ lazy /* c0 */ true /* c1 */
-
-// Pexp_constraint
-let x = (/* c0 */ "string" /* c1 */: /* c2 */ string /* c3 */) // after
-
-// Pexp_construct
-let x = /* before */ true /* after */
-let x = /* before */ Red /* after */
-let x = /* before */ Red(/* c0 */ shade /* c1 */) /* after */
-let x = /* before */ Red /* after Red */(/* c0 */ r /* c1 */, /* c2 */ g /* c3 */, /* c4 */ b /* c5 */) /* after */
-
-// lists
-let x = /* c0 */ list{/* c1 */} /* c2 */
-/* c0 */ list{/* c1 */} /* c2 */
-
-let x = /* c0 */ list{/* c1 */ a /* c2 */} /* c3 */
-/* c0 */ list{/* c1 */ a /* c2 */} /* c3 */
-
-let x = /* c0 */ list{/* c1 */ a /* c2 */, /* c3 */ b /* c4 */} /* c5*/
-/* c0 */ list{/* c1 */ a /* c2 */, /* c3 */ b /* c4 */} /* c5*/
-
-let x = /* c0 */ list{/* c1 */ a /* c2 */, /* c3 */ b /* c4 */, /* c5 */ c /* c6 */} /* c7 */
-/* c0 */ list{/* c1 */ a /* c2 */, /* c3 */ b /* c4 */, /* c5 */ c /* c6 */} /* c7 */
-
-
-// Pexp_array
-let x = [/* c0 */ a /* c1 */, /* c2 */ b /* c3 */, /* c4 */ c /* c5 */]
-let x = [/* a */]
-let x = [
-// test
-]
-
-// Pexp_record
-let user = /* before */ {
-  // above name
-  /* c0 */ name /* c1 */ : /* c2 */ "Steve" /* c3 */,
-  // above age
-  /* c4 */ age /* c5 */ : /* c6 */ 31 /* c7 */,
-} // after
-
-// Pexp_record with empty record
-let user = /* before */ {
-  /* comment1 */
-  // comment2
-} // after
-
-let user = /* before */ {/* comment1 */ /* comments2 */} // after
-
-// bs object sugar
-let user = /* before */ {
-  // above name
-  /* c0 */ "name" /* c1 */ : /* c2 */ "Steve" /* c3 */,
-  // above age
-  /* c4 */ "age" /* c5 */ : /* c6 */ 31 /* c7 */,
-} // after
-
-let spreadUser = {/* before */ ...user1 /* after */, /* c0 */age /*c1 */: /* c2 */ 32 /* c3 */
-}
-
-// Pexp_field
-let x = /* before */ user /* c0 */. /* c1 */ name /* c2 */
-
-// Pexp_setfield
-/* before */ user /* c0 */. /* c1 */ name /* c2 */ = /* c3 */ "Steve" /* c4 */
-
-// Pexp_ifthenelse
-if /* c0 */ user.name === "Steve" /* c1 */ {
-  /* c2 */ Js.log("It's Steve") /* c3 */
-} // trailing
-
-if /* c0 */ user.name === "John" /* c1 */ {
-  /* c2 */ Js.log("It's John…") /* c3 */
-} else {
-  // c4
-  /* c5 */ Js.log("we need John") /* c6 */
-} // trailing
-
-if a {
-  b
-} else {
-  // test
-  if c {
-    d
-  }
-}
-
-let distXToTraverse = if deltaX < 0. {
-  // wizard to the left
-  if minRangeX >= -.deltaX {
-    // already within min range, aka close enough
-    0.
-  } else {
-    deltaX +. minRangeX
-  }
-} else {
-  // wizard to the right
-  if minRangeX >= deltaX {
-    // already within min range, aka close enough
-    0.
-  } else {
-    deltaX -. minRangeX
-  }
-}
-
-// Pexp_while
-while /* c0 */ condition.contents /* c1 */ {
-  /* c2 */ doStuff() /* c3 */
-} // trailing
-
-// Pexp_for
-for /* c0 */ i /* c1 */ in /* c2 */ 0 /* c3 */ to /* c4 */ 10  /* c5 */ {
-  /* c6 */ doStuff() /* c7 */
-} // trailing
-
-// Pexp_pack
-/* c0 */ module(/* c1 */ ModExpr /* c2 */) /* c3 */
-/* c0 */ let /* c1 */ three /* c2 */ = /* c3 */ module( /* c4 */Three /* c5 */) /* c6 */
-
-/* c0 */ module(/* c1 */ ModExpr /* c2 */:/* c4 */ MyModule /* c5 */) /* c6 */
-/* c0 */ let /* c1 */ three /* c2 */ = /* c3 */ module(
-  /* c4 */Three /* c5 */: /* c6 */ MyModule /* c7 */
-) /* c8 */
-
-/* c0 */ switch /* c1 */ color /* c2 */ {
-// above Red
-| /* c0 */ Red /* c1 */ => /* c2 */printColor("red") /* ending */ 
-
-// above Blue
-| /* c3 */ Blue /* c4 */ => /* c5 */ printColor("blue") /* ending */ 
-}
-
-/* c0 */ try /* c2 */ unsafeIdentifier /* c3 */ catch {
-// Above
-| /* before */ InfiniteLoop /* after */ => /* here */ () /* trailing */
-
-// Above2
-| /* before */ InfiniteLoop2 /* after */ => /* here */ () /* trailing */
-} // trailing
-
-// Pexp_fun
-let f = (/* c0 */ a /* c1 */, /* c2 */ b /* c3 */) : /* c4 */int  /* c5 */ => /* c6 */ 20 /* c7 */
-let multiply = (/* c0 */ m1 /* c1 */, /* c2 */ m2 /* c3 */) => {
-  // here
-  open Matrix4D
-
-  let m3 = makeUninitializedUnsafe()
-  // there
-  
-  // over there
-  m3
-  /* trailing */
-  // test
-}
-
-let multiply = (~x=/* c0 */ m1 /* c1 */, ~y=/* c2 */ m2 /* c3 */) => () 
-
-let f = (/* c0 */ ~greeting /* c1 */, /* c2 */ ~from /* c3 */ as /* c4 */ hometown /* c5 */, /* c6 */ ~x=? /* c7 */) => ()
-
-let multiply = (/* c-2 */ type t /* c-1 */,/* c0 */ m1 /* c1 */, /* c2 */ m2 /* c3 */) => () 
-let multiply = (/* c-4 */ type t /* c-3 */,/* c0 */ m1 /* c1 */, /* c-2 */ type s /* c-1 */, /* c2 */ m2 /* c3 */) => () 
-
-f(()
-  // c1
-  => 1);
-f(_
-  // c2
-  => 1);
-f(a
-  // c3
-  => 1);
-f((~a)
-  // c4
-  => 1);
-
-// ternary
-let x = /* c0 */ test /* c1 */ ? /* c2 */ true /* c3 */ : /* c4 */ false /* c5 */
-
-// Pexp_if case, don't duplicate comments
-if next == Js.null {
-  /* only one element */
-  clear(q)
-  Some(contentGet(x))
-} else {
-  lengthSet(q, lengthGet(q) - 1)
-  firstSet(q, next)
-  Some(contentGet(x))
-}
-
-// Pexp_if with parenthesized condition
-if ( 
-  /* Format.eprintf "@[%a@]@." Printtyp.raw_type_expr ty; */
-  switch ty0.desc {
-  | Tconstr(p, _, _) => Path.same(p, path)
-  | _ => false
-  }
-) {
-  ()
-}
-
-// add end of list of nodes
-Doc.concat(
-  privateFlag,
-  rows
-  /* a */
-);
-Doc.concat(list{
-  privateFlag,
-  rows,
-  /* a */
-});
-
-// More record spread test
-type b = {
-  // spread a
-  ...a,
-  // spread c
-  ...c,
-  // no spread
-  b: string
-}
-
-type a = {
-  // spread from different module
-  ...M.a,
-  // spread c
-  ...c,
-  // no spread
-  b: string
-}
-
-let b = {
-  // exotic
-  ...\"let",
-  // foo
-  bar: "foo"
-}
-
-let b = {
-  // quote
-  ..."let",
-  // foo
-  bar: "foo"
-}
-
-let c = {
-  // from different module
-  ...M.a,
-  // foo
-  bar: "foo"
-}
diff --git a/jscomp/syntax/tests/printer/comments/extensionConstructor.res b/jscomp/syntax/tests/printer/comments/extensionConstructor.res
deleted file mode 100644
index 42bb8f0..0000000
--- a/jscomp/syntax/tests/printer/comments/extensionConstructor.res
+++ /dev/null
@@ -1,24 +0,0 @@
-/* c0 */ exception /* c1 */ Exit /* c2 */ = /* c3 */ Terminate /* c4 */ 
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */ (
-  /* c4 */ int /* c5 */,
-  /* c6 */ int /* c7 */
-) // after
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */ (
-  /* c4 */ int /* c5 */,
-  /* c6 */ int /* c7 */
-): /* c8 */ gadt // after
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ </* c1.1 */ 'x /* c2.2 */> +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ += /* c3 */ Bar /* c4 */
-
-/* c0 */ type /* c1 */ t /* c2 */ +=
-  | /* c3 */ Foo /* c4 */ =  /* c5 */ Bar /* c6 */
diff --git a/jscomp/syntax/tests/printer/comments/fileWithOneSingleLineComment.res b/jscomp/syntax/tests/printer/comments/fileWithOneSingleLineComment.res
deleted file mode 100644
index 40e1389..0000000
--- a/jscomp/syntax/tests/printer/comments/fileWithOneSingleLineComment.res
+++ /dev/null
@@ -1 +0,0 @@
-// retain this comment
diff --git a/jscomp/syntax/tests/printer/comments/fileWithOnlyComments.res b/jscomp/syntax/tests/printer/comments/fileWithOnlyComments.res
deleted file mode 100644
index 7ebfb94..0000000
--- a/jscomp/syntax/tests/printer/comments/fileWithOnlyComments.res
+++ /dev/null
@@ -1,8 +0,0 @@
-// test
-
-/* multi
-line
-comment
-*/
-
-// more comments
diff --git a/jscomp/syntax/tests/printer/comments/ifLet.res b/jscomp/syntax/tests/printer/comments/ifLet.res
deleted file mode 100644
index d6e294c..0000000
--- a/jscomp/syntax/tests/printer/comments/ifLet.res
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-if /* c0 */ let /* c1 */ Some(/* c2 */ x /* c3 */) /* c4 */ = /* c5 */ makeOpt() /* c6 */ {
-  /* c7 */ foo() /* c8 */
-} else {
-  /* c9 */ bar() /* c10 */
-}
-
-let getZ2 = nested =>
-  if let /* c-4 */ Some(point) /* c-3 */ =  /* c-2 */ nested.origin  /* c-1 */ {
-    if let /* c0 */ Some( /* c1 */ z /* c2 */ ) =/* c3 */ point.z /* c4 */ {
-      let pi /* inside */ = 3.13 *. point.z // trailing1
-      let e /* inside1 */= 42.3 // trailing2
-      pi *. e // trailing3
-    } else {
-      let pi /* inside2 */= 3.13 // trailing4
-      let e /* inside3 */= 42.3 // trailing5
-      pi *. e // trailing6
-    }
-  } else {
-    let pi /* inside4 */ = 3.13 // trailing7
-    let e /* inside5 */ = 42.3 // trailing8
-    pi *. e // trailing9
-  }
-  */
diff --git a/jscomp/syntax/tests/printer/comments/ifThenElse.res b/jscomp/syntax/tests/printer/comments/ifThenElse.res
deleted file mode 100644
index 3d8e193..0000000
--- a/jscomp/syntax/tests/printer/comments/ifThenElse.res
+++ /dev/null
@@ -1,7 +0,0 @@
-{ // comment
-  if condition() {
-    renderBranch()
-  } else {
-    doSomeOtherThings()
-  }
-}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/printer/comments/interfaceWithOneSingleComment.resi b/jscomp/syntax/tests/printer/comments/interfaceWithOneSingleComment.resi
deleted file mode 100644
index 40e1389..0000000
--- a/jscomp/syntax/tests/printer/comments/interfaceWithOneSingleComment.resi
+++ /dev/null
@@ -1 +0,0 @@
-// retain this comment
diff --git a/jscomp/syntax/tests/printer/comments/interfaceWithOnlyComments.resi b/jscomp/syntax/tests/printer/comments/interfaceWithOnlyComments.resi
deleted file mode 100644
index adb8c15..0000000
--- a/jscomp/syntax/tests/printer/comments/interfaceWithOnlyComments.resi
+++ /dev/null
@@ -1,5 +0,0 @@
-// test
-
-/* test */
-
-// ok
diff --git a/jscomp/syntax/tests/printer/comments/jsx.res b/jscomp/syntax/tests/printer/comments/jsx.res
deleted file mode 100644
index d554e24..0000000
--- a/jscomp/syntax/tests/printer/comments/jsx.res
+++ /dev/null
@@ -1,75 +0,0 @@
-module Cite = {
-  @react.component
-  let make = (~author: option<string>, ~children) => {
-    // For semantics, check out
-    // https://css-tricks.com/quoting-in-html-quotations-citations-and-blockquotes/
-    <div>
-      foo
-    </div>
-  }
-}
-
-<A
-  value=""
-  // Comment
-/>
-
-<A /* comment */ />
-
-<A>
-  // Comment
-</A>
-
-<A
-// comment1
-// comment 2
-/>
-
-<A
-// comment1
-value=""
-// comment2
->
-  <B /* comment3 */ />
-</A>
-
-<A
-  value=""
-  /* comment */
->
-  <B/>
-</A>
-
-<A
-// comment
->
-  <B />
-</A>
-
-<A
-/* comment */
->
-  <B />
-</A>
-
-<A /* comment */>
-  <B />
-</A>
-
-<div>
-  // Must not jump inside braces
-  {React.string("Hello, World!")}
-</div>
-
-<div>
-  // Must not jump inside braces
-  {// But this one is inside
-    React.string("Hello, World!")}
-</div>
-
-let x = <>
-  // before a
-  {a} // after a
-  // before b
-  {b} // after b
-</>
diff --git a/jscomp/syntax/tests/printer/comments/modExpr.res b/jscomp/syntax/tests/printer/comments/modExpr.res
deleted file mode 100644
index 92312b6..0000000
--- a/jscomp/syntax/tests/printer/comments/modExpr.res
+++ /dev/null
@@ -1,50 +0,0 @@
-// Pmod_ident
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ Y /* c4 */ 
-
-// Pmod_structure
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ {
-  let /* inside1 */ a /* inside2 */ = 2 /* trailing */
-} // trailing
-
-// Pmod_extension
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ %ext(/* c4 */ "test" /*c5*/) /* c6 */ 
-
-// Pmod_unpack
-/* c0 */ module /* c1 */ New_three /* c2 */ = /* c3 */ unpack(
-  /* c4 */three /* c5 */: /* c6 */ X_int /* c7 */ ) /* c8 */
-
-// Pmod_constraint
-/* c0 */ module /* c1 */ X /* c2 */ = (/* c3 */ X /* c4 */ : /* c5 */ Int /* c6 */)
-/* c0 */ module /* c1 */ X /* c2 */: /* c4 */ Int /* c5 */ = /* c6 */ X /* c7 */
-
-// Pmod_apply
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ F /* c4 */(
-  /* c4 */ Arg1 /* c5 */,
-  /* c6 */ Arg2 /* c7 */,
-  /* c8 */ Arg3 /* c9 */
-) /* c10 */
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */F(
-  /* c4 */ A /* c5 */ : /* c6 */ SetLike /* c7 */,
-  /* c7 */ B /* c8 */: /* c9 */ TreeLike /* c10 */
-) /* c11 */
-/* c0 */ module /* c1 */ S0 /* c2 */ = /* c3 */ Make /* c4 */( /* lbrace */ {
-  type t = int /* c5 */
-  let eq /* c6 */ = (x, y) => x == y
-} /* rbrace */) // trailing
-
-// Pmod_functor
-/* c0 */ module /* c1 */ F /* c2 */ = /* before parameters */ (
-/* c3 */ A /* c4 */: /* c5 */ X /* c6 */,
-/* c7 */ B /* c8 */: /* c9 */ Y /* c 10 */,
-/* c7 */ C /* c8 */: /* c9 */ Z /* c 10 */
-) => /* c11 */ ReturnMod /* c12 */ 
-
-module Make = /* before parameters */ (
-  /* before A */ A /* after A */: /* before X */ X /* after X */,
-  /* before B */ B /* after B */: /* before Y */ Y /* after Y */
-) : /* c1 */ Set /* c2 */ => {let a /* inside */ = A.a + B.b}
-
-module Make = /* before parameters */ (
-  /* before A */ A /* after A */: /* before X */ X /* after X */,
-  /* before B */ B /* after B */: /* before Y */ Y /* after Y */
-)  => ({let a /* inside */ = A.a + B.b}: /* c1 */ Set /* c2 */)
diff --git a/jscomp/syntax/tests/printer/comments/modType.res b/jscomp/syntax/tests/printer/comments/modType.res
deleted file mode 100644
index 4a90405..0000000
--- a/jscomp/syntax/tests/printer/comments/modType.res
+++ /dev/null
@@ -1,35 +0,0 @@
-// Pmty_ident
-/* c0 */ module type /* c1 */ T /* c2 */ = /* c3 */ Tree /* c4 */
-
-// Pmty_signature
-/* c0 */ module type /* c1 */ T /* c2 */ = /* c3 */ {
-  let a: int
-} /* c4 */
-
-// Pmty_extension
-/* c0 */ module type /* c1 */ T /* c2 */ = /* c3 */ %ext(/* c4 */"test" /* c5 */) /* c6 */
-
-// Pmty_typeof 
-/* c0 */ module type /* c1 */ A /* c2 */ =
-  /* c3 */ module type of /* c4 */ {
-    let a /* inside */ = 1
-    } /* c5 */
-
-// Pmty_with
-/* c0 */ module type /* c1 */ A /* c2 */ = /* c3 */ Foo /* c4 */ with type t = string // end
-
-// Pmty_functor
-/* c0 */ module type /* c1 */ Functor /* c2 */ = /* c3 */ SetLike /* c4 */ => /* c5 */ Set /* c6 */
-module type Functor = /* before */ (
-  /* before S */ S /* after S */: /* before */ SetLike /* after */,
-  /* before B */ B /* after B */: /* before */ BtreeLike /* after */
-) => /* before NeoTree */ NeoTree // after NeoTree
-module type Functor = (
- /* c0 */ _ /* c1*/: /* c2 */ SetLike /* c3 */,
- /* c4 */ _ /* c5 */: /* c6 */ BtreeLike /* c7 */
-) => NeoTree
-
-module type Functor = /* before */ (
-  /* c0 */ SetLike /* c1 */,
-  /* c2 */ BtreeLike /* c3 */,
-) => NeoTree
diff --git a/jscomp/syntax/tests/printer/comments/multiline.res b/jscomp/syntax/tests/printer/comments/multiline.res
deleted file mode 100644
index d1c08bc..0000000
--- a/jscomp/syntax/tests/printer/comments/multiline.res
+++ /dev/null
@@ -1,94 +0,0 @@
-/* first line
-* the leading stars
-* should align here.
-*/
-let f = () => ()
-
- /* first line
-* second line
-   * third line */
-
- /* first line
-*
-   * third line */
-
-/* x */
-/* */
-/**/
-/*  */
-
-/*
- * test
-*/
-
-/* ReScript outperforms a classic for-loop: 
-   function equals3(m1, m2) {
-    for (var i = 0; i < 4; i++) {
-        for (var j = 0; j < 4; j++) {
-            var x = m1[i][j];
-            var y = m2[i][j];
-            if(!floatEquals(x, y)) {
-                return false
-            }
-        }
-    }
-    return true
-  } */
-let equals = (matrix1, matrix2) => {
-  let rec loop = (i, j) =>
-    if i > 3 {
-      true
-    } else {
-      let x = matrix1->getUnsafe(~row=i, ~col=j)
-      let y = matrix2->getUnsafe(~row=i, ~col=j)
-      if !Float.equals(x, y) {
-        false
-      } else if j < 3 {
-        loop(i, j + 1)
-      } else {
-        loop(i + 1, 0)
-      }
-    }
-  
-  loop(0, 0)
-}
-
-/*
-foo
-bar
-*/
-
-/*
-
-
-
-foo
-bar
-*/
-
-
-/*
-
-
-
-foo
-
-
-
-
-bar
-
-
-
-*/
-
-/* multi
-line
-comment
-*/
-
-
-/*
-multi
-line
-comment                  */
diff --git a/jscomp/syntax/tests/printer/comments/namedArgs.res b/jscomp/syntax/tests/printer/comments/namedArgs.res
deleted file mode 100644
index d1205c0..0000000
--- a/jscomp/syntax/tests/printer/comments/namedArgs.res
+++ /dev/null
@@ -1,65 +0,0 @@
-let wizard = Wizard.make(
-  ~spriteSheet=wizard,
-  ~hp=999999999999999,
-  ~mp=50,
-  //~coordinates={x: 0., y:0. z: 0.},
-  ~coordinates={x: 40, y:100., z:0.},
-  /* c0 */ ~gpuCoordinates= /* c1 */ gpuBuffer[10] /* c2 */, // trailing
-)
-
-apply(
-  // above
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-  // below
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
-  // here
-  ~cccccccccccccccccccccccccccccccc,
-)
-
-applyOptional(
-  // above
-  ~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa?,
-  // below
-  ~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb?,
-  // here
-  ~cccccccccccccccccccccccccccccccc?,
-)
-
-foo(
-// c0
-~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: int,
-// c1
-~bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb: int,
-// c2
-~cccccccccccccccccccccccccccccc: int,
-)
-
-let f = (
-  ~isItemActive=?,
-  // array((name, href))
-  ~headers: array<(string, string)>,
-  ~moduleName: string,
-  // foo
-  ~x,
-  // above
-  /* c0 */ ~d:/* c1 */ e, // end
-  // does it work
-  ~from as hometown, 
-) => {
-  let a = 1
-  let b = 2
-  a + b
-}
-
-@react.component
-let make = (
-  ~theme: ColorTheme.t,
-  ~components: Mdx.Components.t,
-  ~sidebarState: (bool, (bool => bool) => unit),
-  // (Sidebar, toggleSidebar) ... for toggling sidebar in mobile view
-  ~sidebar: React.element,
-  ~breadcrumbs: option<list<UrlPath.breadcrumb>>=?,
-  ~children,
-) => {
-  ()
-}
diff --git a/jscomp/syntax/tests/printer/comments/openDescription.res b/jscomp/syntax/tests/printer/comments/openDescription.res
deleted file mode 100644
index a0b496a..0000000
--- a/jscomp/syntax/tests/printer/comments/openDescription.res
+++ /dev/null
@@ -1,3 +0,0 @@
-open /* leading */ React /* trailing */;
-open /* leading */ React /* trailing */
-open /* leading */ React // trailing
diff --git a/jscomp/syntax/tests/printer/comments/pattern.res b/jscomp/syntax/tests/printer/comments/pattern.res
deleted file mode 100644
index 230bbaf..0000000
--- a/jscomp/syntax/tests/printer/comments/pattern.res
+++ /dev/null
@@ -1,92 +0,0 @@
-// Ppat_any
-let /* before */ _ /* after */ = 1
-
-// Ppat_var
-let /* before */ x /* after */ = 1
-
-// Ppat_constant
-let /* before */ 123 /* after */ = 123
-
-// Ppat_interval not supported
-// Ppat_interval of constant * constant
-
-// Ppat_alias
-let /* before pat */ p /* after pat */ as /* before alias */ x /* after alias */ = ()
-let /*c0 */ (/* c1 */ p /* c2 */ as /* c3 */x /* c4*/) as /* c5 */ y /* c6 */ = ()
-
-// Ppat_array
-let /* c0 */ [/* c1 */ a /* c2 */, /* c3 */b /* c4 */, /* c5 */ c /* c6 */] /* c7 */ = [1, 2, 3]
-
-// Ppat_construct
-let /* here */ Black /* there */ = color
-
-let /* here */ Black(/* inside */)/* there */ = color
-let Black(/* inside */ /* inside2 */) = color
-let Black(/* inside */ /* inside2 */ /* inside 3 */) = color
-let Black(
-// singleLineComment
-) = color
-
-let module(/* c0 */ X /* c1 */ : /* c2 */ X_int /* c3 */) /* c4 */ = x 
-
-let /* before */ Rgb /* after constr */ (/* red */ r /* red2 */, /* green */ g/* green2 */, /* blue */ b /* blue2 */) /* after */ = color
-
-switch a {
-| Constr /* after constr */ 
-| Constr /* after constr */ (a, _) => a
-}
-
-let () = ()
-let [/* inside */] = []
-let list{/* inside */} = list{}
-
-let /* before */ list{/* a1 */ a /* a2 */, /* b1 */ b /* b2 */} /* after */ = list{1, 2}
-let /* before */ list{/* a1 */ a /* a2 */, /* b1 */ ...b /* b2 */} /* after */ = list{1, 2}
-
-// Ppat_record
-let /* before */ {/* c0 */ name /* c1 */, /* c2 */ age /* c3 */} /* after */ = {
-  name: "steve",
-  age: 31,
-}
-
-let /* before */ {
-  /* c0 */ name /* c1 */: /* c2 */ firstName /* c3 */,
-  /* c3 */ age /* c4 */: /* c5 */ ageInYears /* c6 */,
-} /* after */ = {name: "steve", age: 31}
-
-// Ppat_or
-let /* b1 */ Blue /* b2 */ | /* c1 */ Red /* c2 */ = color
-let /* b1 */ Blue /* b2 */ | /* c1 */ Red /* c2 */ | /* d1 */ Green /* d2 */ = color
-
-// #462: Comments in nested Ppat_or must not disappear.
-// (comment positions not optimal yet because `|` has no AST location)
-let _ = switch "anything" {
-// above 1
-| "1"
-// below 1
-| "2"
-// below 2
-| "3"
-// below 3
-| _ => "4"
-// below 4
-}
-
-// Ppat_constraint
-let /* c0 */ number /* c1 */: /* c2 */ int /* c3 */ = 123
-
-// Ppat_lazy
-let /* before */ lazy /* a */ x /* b */ /* after */ = lazy 1
-
-// Ppat_unpack 
-let /* before */ module(/* h1 */ Hashtbl /* h2 */) /* after */ = Hashtbl
-let /* before */ module(/* h1 */ Hashtbl /* h2 */: /* h3 */ MutableTable /* h4 */) /* after */ = Hashtbl
-
-// Ppat_exception
-let /* before */ exception /* c0 */ Exit /* c1 */ /* after */ = exc
-
-// Ppat_extension
-let /* before */ %raw("eval(gc())") /* after */ = stuff
-
-// Ppat_interval
-let /* c0 */ 'a' .. 'z' /* c1 */ = x
diff --git a/jscomp/syntax/tests/printer/comments/signatureItem.resi b/jscomp/syntax/tests/printer/comments/signatureItem.resi
deleted file mode 100644
index 44feeb0..0000000
--- a/jscomp/syntax/tests/printer/comments/signatureItem.resi
+++ /dev/null
@@ -1,67 +0,0 @@
-// Psig_value
-/* c0 */ external /* c1 */ force_gc /* c2 */: /* c3 */ unit /* c4 */ => /* c5 */ unit /* c6 */ ="gc" // trailing 
-
-// Psig_type
-/* c0 */ type /* c1 */ t /* c2 */ = /* c3 */ string /* c4 */
-
-/* c0 */ type /* c1 */ t /* c2 */ = /* c4 */ string /* c5 */
-// above
-and /* c6 */ s /* c7 */ = /* c8 */ int /* c9 */
-
-// Pstr_typext
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ </* c1.1 */ 'x /* c2.2 */> +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ += /* c3 */ Bar /* c4 */
-
-/* c0 */ type /* c1 */ t /* c2 */ +=
-  | /* c3 */ Foo /* c4 */ =  /* c5 */ Bar /* c6 */
-
-// Pstr_exception
-/* c0 */ exception /* c1 */ Exit /* c2 */ = /* c3 */ Terminate /* c4 */ 
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */ (
-  /* c4 */ int /* c5 */,
-  /* c6 */ int /* c7 */
-) // after
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */ (
-  /* c4 */ int /* c5 */,
-  /* c6 */ int /* c7 */
-): /* c8 */ gadt // after
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */ ({
-  /* c4 */ code /* inside */: /* inside2 */ int /* c5 */,
-  /* c6 */ timeout /* inside */: /* inside2 */ int /* c7 */
-}): /* c8 */ gadt // after
-
-// Psig_module
-/* c0 */ module /* c1 */ X /* c2 */: /* c3 */ MT /* c4 */
-
-// Psig_module
-/* c0 */ module rec /* c1 */ X1 /* c2 */ : /* c3 */ MT1
-// above
-and /* c4 */ Xn /* c5 */ : /* c6 */ MTn /* c7 */
-
-// Psig_modtype
-/* c0 */ module type /* c1 */ S /* c2 */ = /* c3 */ MT /* c4 */
-/* c0 */ module type /* c1 */ S /* c2 */
-
-// Psig_open
-/* c0 */ open /* c1 */ Belt /* c2 */
-
-// Psig_include
-/* c0 */ include /* c1 */ {
-  let a /* inside */: int
-} // after
-
-// Psig_attribute
-/* c0 */ @@attr(/* c1 */ payload /*c2*/) /* c3 */
-
-// Psig_extension
-/* c0 */ @@extension(/* c1 */ payload /*c2*/) /* c3 */
diff --git a/jscomp/syntax/tests/printer/comments/structure1.res b/jscomp/syntax/tests/printer/comments/structure1.res
deleted file mode 100644
index 3b0b6bf..0000000
--- a/jscomp/syntax/tests/printer/comments/structure1.res
+++ /dev/null
@@ -1,25 +0,0 @@
-// leading single line 1a
-// leading single line 1b
-/* leading multiline 1c */
-/* leading multiline 1d */
-/* leading multiline attached to node */ let a = 1 // trailing1 
-
-// leading2
-/* before */ let b = 2 /* trailing2 */
-/* under b */
-
-/* here */
-
-// lala
-
-/* test */ /* okok*/
-
-// above open
-open /* here */ React // after 
-// trailing
-/* foo */ /* bar */
-
-// another
-// ok
-
-// end
diff --git a/jscomp/syntax/tests/printer/comments/structure2.res b/jscomp/syntax/tests/printer/comments/structure2.res
deleted file mode 100644
index 11698a7..0000000
--- a/jscomp/syntax/tests/printer/comments/structure2.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let b = 2
-/* test */ // sldkfj
-
-// sldkfj
-
-/* help */ /* help2 */
-
-/* test2 */
-open /* before lident */ React
diff --git a/jscomp/syntax/tests/printer/comments/structure3.res b/jscomp/syntax/tests/printer/comments/structure3.res
deleted file mode 100644
index ce32219..0000000
--- a/jscomp/syntax/tests/printer/comments/structure3.res
+++ /dev/null
@@ -1,13 +0,0 @@
-node.left->peekMinNode
-// same as the above
-(node.left)->peekMinNode
-
-// field access has higher precedence than unary -
-let x = -a.bar
-
-let a = 1
-
-/* test */
-let b = 2
-// a
-// b
diff --git a/jscomp/syntax/tests/printer/comments/structure4.res b/jscomp/syntax/tests/printer/comments/structure4.res
deleted file mode 100644
index 227742f..0000000
--- a/jscomp/syntax/tests/printer/comments/structure4.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let user = {
-  name: "steve",
-  age: 31
-}
-
-/* A comment */ /*
-* A type that can be written to a buffer.
-*/ /*
-* Describes the connection status of a ReactiveSocket/DuplexConnection.
-* - NOT_CONNECTED: no connection established or pending.
-* - CONNECTING: when `connect()` has been called but a connection is not yet
-*   established.
-* - CONNECTED: when a connection is established.
-* - CLOSED: when the connection has been explicitly closed via `close()`.
-* - ERROR: when the connection has been closed for any other reason.
-*/ /*
-* A contract providing different interaction models per the [ReactiveSocket protocol]
-* (https://github.com/ReactiveSocket/reactivesocket/blob/master/Protocol.md).
-*/ /*
-* A single unit of data exchanged between the peers of a `ReactiveSocket`.
-*/
diff --git a/jscomp/syntax/tests/printer/comments/structureItem.res b/jscomp/syntax/tests/printer/comments/structureItem.res
deleted file mode 100644
index 802849d..0000000
--- a/jscomp/syntax/tests/printer/comments/structureItem.res
+++ /dev/null
@@ -1,65 +0,0 @@
-// Pstr_attribute
-@@attr(/* c0 */ "here" /* c1 */)
-
-// Pstr_extension
-%%extension(/* c0 */ "here" /* c1 */)
-
-// Pstr_include
-/* c0 */ include /* c1 */ Belt /* c2 */
-/* c0 */ include /* c1 */ {
-  let a /* inside */ = 2
-} /* c2 */
-
-// Pstr_open
-/* c0 */ open /* c1 */ Belt /* c2 */
-
-// Pstr_modtype
-/* c0 */ module type /* c1 */ T /* c2 */ = /* c3 */ MT /* c4 */
-
-// Pstr_recmodule
-/* c0 */ module rec /* c1 */ X1 /* c2 */ = /* c3 */ ME1 /* c4 */
-// above
-and /* c5 */ Xn /* c6 */ = /* c7 */ MEn /* c8 */
-
-// Pstr_module
-/* c0 */ module /* c1 */ X /* c2 */ = /* c3 */ Y /* c4 */
-
-// Pstr_exception
-/* c0 */ exception /* c1 */ Exit /* c2 */ = /* c3 */ Terminate /* c4 */ 
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */ (
-  /* c4 */ int /* c5 */,
-  /* c6 */ int /* c7 */
-) // after
-
-/* c0 */ exception /* c1 */ ExitEarly /* c2 */ (
-  /* c4 */ int /* c5 */,
-  /* c6 */ int /* c7 */
-): /* c8 */ gadt // after
-
-// Pstr_typext
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ </* c1.1 */ 'x /* c2.2 */> +=
-  | /* before Foo */ Foo // after Foo
-  | /* before Bar */ Bar // after Bar
-
-/* c0 */ type /* c1 */ Foo.Bar.t /* c2 */ += /* c3 */ Bar /* c4 */
-
-/* c0 */ type /* c1 */ t /* c2 */ +=
-  | /* c3 */ Foo /* c4 */ =  /* c5 */ Bar /* c6 */
-
-// Pstr_type
-/* c0 */ type /* c1 */ t /* c2 */ = /* c3 */ string /* c4 */
-
-/* c0 */ type /* c1 */ t /* c2 */ = /* c4 */ string /* c5 */
-// above
-and /* c6 */ s /* c7 */ = /* c8 */ int /* c9 */
-
-// Pstr_primitive
-/* c0 */ external /* c1 */ force_gc /* c2 */: /* c3 */ unit /* c4 */ => /* c5 */ unit /* c6 */ ="gc" // trailing 
-
-// Pstr_eval
-/* c0 */ user.name /* c1 */ = /* c2 */ "Steve" /* c3 */
diff --git a/jscomp/syntax/tests/printer/comments/trailingComments.res b/jscomp/syntax/tests/printer/comments/trailingComments.res
deleted file mode 100644
index daba6fa..0000000
--- a/jscomp/syntax/tests/printer/comments/trailingComments.res
+++ /dev/null
@@ -1,28 +0,0 @@
-let user = {
-  name: "steve",
-  age: 31 /* here */, // test 
-  
-  /* test */
-  /* test2 */
-
-  // test3 
-
-  /* test 4 */
-}
-
-/* A */ /*
-* A type that can be written to a buffer.
-*/ /*
-* Describes the connection status of a ReactiveSocket/DuplexConnection.
-* - NOT_CONNECTED: no connection established or pending.
-* - CONNECTING: when `connect()` has been called but a connection is not yet
-*   established.
-* - CONNECTED: when a connection is established.
-* - CLOSED: when the connection has been explicitly closed via `close()`.
-* - ERROR: when the connection has been closed for any other reason.
-*/ /*
-* A contract providing different interaction models per the [ReactiveSocket protocol]
-* (https://github.com/ReactiveSocket/reactivesocket/blob/master/Protocol.md).
-*/ /*
-* A single unit of data exchanged between the peers of a `ReactiveSocket`.
-*/
diff --git a/jscomp/syntax/tests/printer/comments/typeDefinition.res b/jscomp/syntax/tests/printer/comments/typeDefinition.res
deleted file mode 100644
index 391a6ee..0000000
--- a/jscomp/syntax/tests/printer/comments/typeDefinition.res
+++ /dev/null
@@ -1,93 +0,0 @@
-/* before */ type t /* after */
-/* before */ type /* before name */ t /* after name */ /* after */
-
-/* before */ type t = .. /* after */
-/* before */ type /* before name */ t /* after name */ = .. /* after */
-
-/* before */ type t</* c0 */'err /* c1 */ , /* c2 */ 'success /* c3 */> /* after */
-/* before */ type /* before name */ t /* after name */ </* c0 */'err /* c1 */ , /* c2 */ 'success /* c3 */> /* after */
-
-/* before */ type t = /* before manifest */ string /* after */
-/* before */ type /* before name */ t /* after name */ = /* before manifest */ string /* after */
-/* before */ type /* before name */ t /* after name */ </* c0 */'err /* c1 */ , /* c2 */ 'success /* c3 */> = /* before manifest */ string /* after */
-
-/* before */ type /* before name */ t /* after name */ =
-  // above Red
-  | Red // trailing Red
-  // above Blue
-  | Blue // trailing Blue
-  // above Green
-  | Green // trailing Green
-
-/* before */ type /* before name */ t /* after name */ = /* before manifest */ Colour.t /* after manifest */ =
-  // above Red
-  | /* before Red */ Red // trailing Red
-  // above Blue
-  | /* before Blue */ Blue // trailing Blue
-  // above Green
-  | /* before Green */ Green /* trailing Green */; // test
-
-type color =
-  | /* before Red */ Red /* after Red */ : /* before gadt */ color /* after gadt */
-  | /* before Blue */ Blue /* after Blue */ : /* before gadt */ color /* after gadt */
-
-type color = /* before constr */ Rgb/*after constructor */( /* before red */ red, green, blue)
-
-type color = | /* before constr */ Rgb/*after constructor */(
-  /* before red */ red /* after red */,
-  /* before green */ green /* after green */,
-  /* before blue */ blue /* after blue */
-)
-
-type color = | /* before constr */ Rgb/*after constructor */({
-  /* before red */ red/* after red */: /* before typ */ someNumber /* after typ */ ,
-  /* before green */ green/* after green */: /* before typ */someNumber /* after typ */,
-  /* before blue */ blue/* after blue */: /* before typ */someNumber  /* after typ */
-})
-
-type color = {
-  /* before red */ red/* after red */: /* before typ */ someNumber /* after typ */ ,
-  /* before green */ green/* after green */: /* before typ */someNumber /* after typ */,
-  /* before blue */ blue/* after blue */: /* before typ */someNumber  /* after typ */
-}
-
-type /* c0 */ color /* c1 */ = /* before manifest */ Colour.t /* after manifest */ = {
-  /* before red */ red/* after red */: /* before typ */ someNumber /* after typ */ ,
-  /* before green */ green/* after green */: /* before typ */someNumber /* after typ */,
-  /* before blue */ blue/* after blue */: /* before typ */someNumber  /* after typ */
-}
-
-type domProps =  {
-  @optional
-  viewTarget: string,
-  @optional
-  visibility: string,
-  /*width::string? =>*/
-  @optional
-  widths: string,
-  @optional
-  wordSpacing: string,
-  @optional
-  writingMode: string,
-  @optional
-  x: string,
-  @optional
-  x1: string,
-}
-
-@deriving(abstract)
-type t = {
-  /* MDX shortnames for more advanced components */
-  @as("Cite")
-  cite: React.component<{
-    "author": option<string>,
-    "children": React.element,
-  }>,
-  @as("Info") @optional
-  info: React.component<props>,
-}
-
-type rec t = {
-  facing: facing,
-  // frames
-}
diff --git a/jscomp/syntax/tests/printer/comments/typexpr.res b/jscomp/syntax/tests/printer/comments/typexpr.res
deleted file mode 100644
index 9cb8c16..0000000
--- a/jscomp/syntax/tests/printer/comments/typexpr.res
+++ /dev/null
@@ -1,80 +0,0 @@
-// Ptyp_any
-type t = /* before */ _ /* after */
-
-// Ptyp_var
-type t = /* before */ 'a /* after */
-
-// Ptyp_tuple
-// sigh… conflicts
-
-// Ptyp_constr
-type t = /* before */ string /* after */
-type t = /* before */ option /* c0 */< /*c1 */string /* c2 */> /* after */ 
-type t = /* before */ result /* c0 */< /*c1 */success /* c2 */, /* c3 */ err /*c4*/> /* after */ 
-
-// Ptyp_extension
-type t = /* before */ %ext(/* before */ "here" /* after */) /* after */
-
-// Ptyp_package
-type t = /* c0 */ module(/* before */ S /* after */) /* c1 */
-
-type t = /* c0 */ module(/* c1 */Hashmap /* c2 */ with type /* c3 */ key /* c4 */ = /* c5 */ string /* c6 */)
-
-// Ptyp_alias
-type t = /* c0 */ string /* c1 */ as 'x // after
-
-// Ptyp_poly
-type fn = {
-  f: /* c0 */ 'a /* c1 */ 'b /* c2*/ . /* c3 */ string /* c4 */
-}
-
-type fn = {
-  /* comment1 */
-  // comment2
-}
-
-type fn = {/* comment1 */ /* comment2 */}
-
-// Ptyp_arrow
-type add = /* before */ ( /* c0 */ int /* c1 */, /* c2 */ int /* c3 */) => /* before return */ int /* after */
-type add = /* before */ ( /* c0 */ ~a:int /* c1 */, /* c2 */ ~b:int /* c3 */) => /* before return */ int /* after */
-type multiply = /* before */ ( /* c0 */ ~fn: (/* cinner0 */ int /* cinner1 */, /* cinner2 */int /*cinner3 */) => /*cx*/ int /* c1 */, /* c2 */ ~b:int /* c3 */) => int /* after */
-type make = (
-  ~activity: ActivityFlow_Activity.t,
-  ~showExpert: (string, string) => unit,
-  ~showCognitiveAspect: string => unit,
-  ~next: (string, string, array<string>) => unit,
-  ~hapticFeedback: unit => unit,
-  ~participants: Belt.Set.String.t,
-  // here
-
-  // above
-  /* c0 */ ~openPhotoFeed: /* c1 */ (/* c2 */~feedId: /* c3 */ option<string> /* c4 */, /* c5 */ unit /* c6 */) => /* c7 */ unit /* c8 */,
-  // only provide this when it shows a random activity
-  ~getAnother: unit => unit=?,
-) => React.element
-
-type f = /* c0 */ ~a: /* c1 */ int /* c2 */ => /* c3 */  int /* c4 */
-type f = (/* c0 */ ~a: /* c1 */ int /* c2 */) => /* c3 */  int /* c4 */
-
-// Ptyp_object
-type jsUser = /* before */ {
-  // above name
-  /* before name */"name" /* after name */: /* before typ */ string /* after typ */,
-  // above age
-  /* before age */"age" /* after age */: /*before int */ int /*after int */
-} /* after */
-
-external test: (
-  // comment 1
-  ~int: int,
-  // comment 2
-  ~int: int,
-) => unit = "test"
-
-external another_test: (
-  // comment 1
-  int,
-  // comment 2
-  int,
-) => unit = "test"
diff --git a/jscomp/syntax/tests/printer/comments/valueBindingSugar.res b/jscomp/syntax/tests/printer/comments/valueBindingSugar.res
deleted file mode 100644
index ac774ab..0000000
--- a/jscomp/syntax/tests/printer/comments/valueBindingSugar.res
+++ /dev/null
@@ -1,6 +0,0 @@
-let /* before */ x /* after */:
-  type t. (/* a */ int /* b */, /* c */ int /* d */) => /* e */ int /* f */ =
-  (/* c0 */ a /* c1 */, /* c2 */ b /* c3 */) => {
-    // comment
-    a + b
-  }
diff --git a/jscomp/syntax/tests/printer/comments/valueBindings.res b/jscomp/syntax/tests/printer/comments/valueBindings.res
deleted file mode 100644
index c47f027..0000000
--- a/jscomp/syntax/tests/printer/comments/valueBindings.res
+++ /dev/null
@@ -1,64 +0,0 @@
-let x = 1
-// trailing first value-binding
-
-// leading snd value-binding
-and y = 2
-/* leading snd value-binding */
-
-let walkList: 'node. unit = comments => {
-  open Location
-  let x /* comment */ = 0
-}
-
-let walkList: 'node. (
-  ~prevLoc: Location.t=?,
-  ~getLoc: 'node => Location.t,
-  ~walkNode: ('node, t, list<Comment.t>) => unit,
-  list<'node>,
-  t,
-  list<Comment.t>,
-) => unit = (~prevLoc=?, ~getLoc, ~walkNode, l, t, comments) => {
-  open Location
-  switch l {
-  | _ when comments == list{} => ()
-  | list{} =>
-    switch prevLoc {
-    | Some(loc) => attach(t.trailing, loc, comments)
-    | None => ()
-    }
-  | list{node, ...rest} =>
-    let currLoc = getLoc(node)
-    let (leading, inside, trailing) = partitionByLoc(comments, currLoc)
-    switch prevLoc {
-    | None =>
-      /* first value binding, all leading comments attach here */
-      attach(t.leading, currLoc, leading)
-    | Some(prevLoc) =>
-      /* Same line */
-      if prevLoc.loc_end.pos_lnum === currLoc.loc_start.pos_lnum {
-        let (afterPrev, beforeCurr) = partitionAdjacentTrailing(prevLoc, leading)
-        let () = attach(t.trailing, prevLoc, afterPrev)
-        attach(t.leading, currLoc, beforeCurr)
-      } else {
-        let (onSameLineAsPrev, afterPrev) = partitionByOnSameLine(prevLoc, leading)
-        let () = attach(t.trailing, prevLoc, onSameLineAsPrev)
-        let (leading, _inside, _trailing) = partitionByLoc(afterPrev, currLoc)
-        attach(t.leading, currLoc, leading)
-      }
-    }
-    walkNode(node, t, inside)
-    walkList(~prevLoc=currLoc, ~getLoc, ~walkNode, rest, t, trailing)
-  }
-}
-
-let /* c0 */ number /* c1 */: /* c2 */ int /* c3 */ = /* c4 */ 123 /* c5 */
-
-// some comment
-
-/* leading 3th value-binding */ /* test */
-and z = 3
-/* cmt a */
-/* cmt b */
-/* cmt c */
-and z2 = 4
-// trailing structure
diff --git a/jscomp/syntax/tests/printer/comments/whitespaceCase1.res b/jscomp/syntax/tests/printer/comments/whitespaceCase1.res
deleted file mode 100644
index 783a206..0000000
--- a/jscomp/syntax/tests/printer/comments/whitespaceCase1.res
+++ /dev/null
@@ -1,6 +0,0 @@
-let x = 1
-// comment
-
-let 123 = 123
-// comment2
-let f = ()
diff --git a/jscomp/syntax/tests/printer/comments/whitespaceCase2.res b/jscomp/syntax/tests/printer/comments/whitespaceCase2.res
deleted file mode 100644
index a53cb61..0000000
--- a/jscomp/syntax/tests/printer/comments/whitespaceCase2.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let a = 
-  2 // c2
-
-let b = 1
diff --git a/jscomp/syntax/tests/printer/comments/whitespaceLeadingComment.res b/jscomp/syntax/tests/printer/comments/whitespaceLeadingComment.res
deleted file mode 100644
index a06f3dc..0000000
--- a/jscomp/syntax/tests/printer/comments/whitespaceLeadingComment.res
+++ /dev/null
@@ -1,13 +0,0 @@
-// the comment "assert Tuple" should contain whitespace before/after
-let () = {
-  let point = Tuple.makePoint(0., 1., 0.)
-  let halfQuarter = rotationX(Js.Math._PI /. 4.)
-  let fullQuarter = rotationX(Js.Math._PI /. 2.)
-  
-  /*  assert Tuple.equals(
-    halfQuarter->applyTo(point),
-    Tuple.makePoint(0., Js.Math.sqrt(2.) /. 2., Js.Math.sqrt(2.) /. 2.),
-  ) */
-  
-  assert(Tuple.equals(fullQuarter->applyTo(point), Tuple.makePoint(0., 0., 1.)))
-}
diff --git a/jscomp/syntax/tests/printer/comments/whitespaceTrailingLeading.res b/jscomp/syntax/tests/printer/comments/whitespaceTrailingLeading.res
deleted file mode 100644
index f5e4f0e..0000000
--- a/jscomp/syntax/tests/printer/comments/whitespaceTrailingLeading.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let a = 1 // single line trailing 
-// leading
-let b = 2
-
-let a = 1 /* comment */
-// leading
-let b = 2
-
-let a = 1 // single line trailing 
-
-// leading
-let b = 2
-
-let a = 1 /* comment */
-
-// leading
-let b = 2
diff --git a/jscomp/syntax/tests/printer/expr/DocComments.res b/jscomp/syntax/tests/printer/expr/DocComments.res
deleted file mode 100644
index d07b491..0000000
--- a/jscomp/syntax/tests/printer/expr/DocComments.res
+++ /dev/null
@@ -1,28 +0,0 @@
-let doc1: (/** ddd */ ~x: int) => int = (~x) => x + 1
-let doc2: @res.doc(" ddd ") int => int = x => x + 1
-let doc3: /** ddd */ int => int = x => x + 1
-let doc4: (/** ddd */ ~x: int, /** eee */ n) => int = (~x) => x + 1
-
-module M : {
-    let foo : (/** xxdoc */ ~x:int, /** yydoc */ ~y:int) => int
-} = {
-    let foo= (~x, ~y) => x+y
-}
-
-@val
-external ex : (/** ddd */ ~x: int, /** eee */ n) => int = "ex"
-
-/** A */
-module rec A : { type t } = {
-  type t
-}
-
-/** B */ 
-and B : { type t } = {
-  type t
-}
-
-@res.doc(" C ")
-and C : { type t} = {
-  type t
-}
diff --git a/jscomp/syntax/tests/printer/expr/RecordOrObject.res b/jscomp/syntax/tests/printer/expr/RecordOrObject.res
deleted file mode 100644
index 24de115..0000000
--- a/jscomp/syntax/tests/printer/expr/RecordOrObject.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type rx = {x: int}
-type ry = {y: string}
-type rxi = {...rx, i?:int}
-type rxy = {...rx, ...ry} // this is a record
-
-let vxy: rxy = {x: 10, y: "abc"}
-let xxi : rxi = {x:10}
-
-type ox = {"x": int}
-type oy = {"y": int}
-type oxz = {...ox, "z": int}
-type oxy = {...ox, ...oy} // this starts as a record but type checking infers that it is an object
diff --git a/jscomp/syntax/tests/printer/expr/Uncurried.res b/jscomp/syntax/tests/printer/expr/Uncurried.res
deleted file mode 100644
index 6520d86..0000000
--- a/jscomp/syntax/tests/printer/expr/Uncurried.res
+++ /dev/null
@@ -1,14 +0,0 @@
-@@uncurried
-
-let add3 = (x,y,z) => x+y+z
-
-let triangle = 3 |> add3(1,2) |> add3(4,5)
-
-let () = 3 |> ignore
-
-let foo = (/* ddd */ x) => x
-
-let f = (
-  // comment
-  ~a,
-) => a
\ No newline at end of file
diff --git a/jscomp/syntax/tests/printer/expr/UncurriedByDefault.res b/jscomp/syntax/tests/printer/expr/UncurriedByDefault.res
deleted file mode 100644
index e967cb6..0000000
--- a/jscomp/syntax/tests/printer/expr/UncurriedByDefault.res
+++ /dev/null
@@ -1,178 +0,0 @@
-let cApp = foo(3)
-let uApp = foo(. 3)
-
-let cFun = x => 3
-let uFun = (.x) => 3
-let mixFun = (a, .b, c) => (d, e, f) => (g, .h) => 4
-let bracesFun = (. x) => y => x+y
-let cFun2 = (x, y) => 3
-let uFun2 = (. x, y) => 3
-
-type cTyp = string => int
-type uTyp = (. string) => int
-type mixTyp = (string, .string, string) => (string, string, string) => (string, .string) => int
-type bTyp = (. string) => string => int
-type cTyp2 = (string, string) => int
-type uTyp2 = (.string, string) => int
-type cu = unit => int
-type cp = () => int
-type cuu = unit => unit => int
-type cpu = () => unit => int
-type cup = unit => () => int
-type cpp = () => () => int
-type cu2 = (unit, unit) => unit
-type cp2 = ((), ()) => unit
-type uu = (. unit) => int
-type up = (. ()) => int
-type uuu = (. unit) => (. unit) => int
-type upu = (. ()) => (. unit) => int
-type uup = (. unit) => (. ()) => int
-type upp = (. ()) => (. ()) => int
-type uu2 = (. unit, unit) => unit
-type up2 = (. (), ()) => unit
-
-type cnested = (string => unit) => unit
-type unested = (. (. string) => unit) => unit
-
-let pipe = a->foo(. b, c)
-
-let _ = setTimeout(. (. ()) => {
-  resolve(. 1)
-}, 100)
-
-let _ = setTimeout(() => {
-  resolve(1)
-}, 100)
-
-let _ = @att (. x)  => 34
-let _ = @att async (. x)  => 34
-let _ = preserveAttr(@att (. x)  => 34)
-let _ = preserveAttr(@att async (. x)  => 34)
-
-let t0 = (type a b, l: list<a>, x: a) => list{x, ...l}
-let t1 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-let t2 = (type a b, . l: list<a>, x: a) => list{x, ...l}
-let t3 = (. type a b, . l: list<a>, x: a) => list{x, ...l}
-let t4 = (. type a b) => (l: list<a>, x: a) => list{x, ...l}
-let t5 = (type a b) => (. l: list<a>, x: a) => list{x, ...l}
-let t6 = (. type a b) => (. l: list<a>, x: a) => list{x, ...l}
-
-let () = (x => ignore(x))(3)
-let () = ((. x) => ignore(x))(. 3)
-
-type arrowPath1 = (. int) => string
-type arrowPath2 = (. I.t) => string
-type arrowPath3 = int => string
-type arrowPath4 = I.t => string
-type callback1 = ReactEvent.Mouse.t => unit as 'callback
-type callback2 = ReactEvent.Mouse.t => (unit as 'u)
-type callback3 = (ReactEvent.Mouse.t => unit) as 'callback
-type callback4 = (. ReactEvent.Mouse.t) => unit as 'callback
-type callback5 = (. ReactEvent.Mouse.t) => (unit as 'u)
-type callback6 = ((. ReactEvent.Mouse.t) => unit) as 'callback
-
-let foo = (. ()) => ()
-let fn = (_x): ((. unit) => unit) => foo
-let fooC = () => ()
-let fnC = (_x): ((unit) => unit) => fooC
-
-let a = ((. ()) => "foo")->Ok
-let aC = (() => "foo")->Ok
-
-@@uncurried.swap
-
-let cApp = foo(. 3)
-let uApp = foo(3)
-
-let cFun = (. x) => 3
-let uFun = x => 3
-let mixFun = (.a) => (b, c) => (.d, e, f) => (.g) => h => 4
-let bracesFun = x => (. y) => x+y
-let cFun2 = (. x, y) => 3
-let uFun2 = (x, y) => 3
-let cFun2Dots = (.x, .y) => 3 // redundant dot on y
-
-type cTyp = (. string) => int
-type uTyp = string => int
-type mixTyp = (.string) => (string, string) => (.string, string, string, string) => string => int
-type bTyp = string => (. string) => int
-type cTyp2 = (. string, string) => int
-type uTyp2 = (string, string) => int
-type cu = (. unit) => int
-type cp = (. ()) => int
-type cuu = (. unit) => (. unit) => int
-type cpu = (. ()) => (. unit) => int
-type cup = (. unit) => (. ()) => int
-type cpp = (. ()) => (. ()) => int
-type cu2 = (. unit, unit) => unit
-type cp2 = (. (), ()) => unit
-type uu = unit => int
-type up = () => int
-type uuu = unit => unit => int
-type upu = () => unit => int
-type uup = unit => () => int
-type upp = () => () => int
-type uu2 = (unit, unit) => unit
-type up2 = ((), ()) => unit
-
-type cnested = (. (. string) => unit) => unit
-type unested = (string => unit) => unit
-
-let pipe = a->foo(b, c)
-
-let _ = setTimeout(() => {
-  resolve(1)
-}, 100)
-
-let _ = setTimeout(. (. ()) => {
-  resolve(. 1)
-}, 100)
-
-let _ = @att x  => 34
-let _ = @att async x  => 34
-let _ = preserveAttr(@att x => 34)
-let _ = preserveAttr(@att async x => 34)
-
-let t0 = (type a b, l: list<a>, x: a) => list{x, ...l}
-let t1 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-let t2 = (type a b, . l: list<a>, x: a) => list{x, ...l}
-let t3 = (. type a b, . l: list<a>, x: a) => list{x, ...l}
-
-let () = (x => ignore(x))(3)
-let () = ((. x) => ignore(x))(. 3)
-
-type arrowPath1 = (. int) => string
-type arrowPath2 = (. I.t) => string
-type arrowPath3 = int => string
-type arrowPath4 = I.t => string
-type callback1 = (. ReactEvent.Mouse.t) => unit as 'callback
-type callback2 = (. ReactEvent.Mouse.t) => (unit as 'u)
-type callback3 = ((. ReactEvent.Mouse.t) => unit) as 'callback
-type callback4 = ReactEvent.Mouse.t => unit as 'callback
-type callback5 = ReactEvent.Mouse.t => (unit as 'u)
-type callback6 = (ReactEvent.Mouse.t => unit) as 'callback
-
-let fooU = () => ()
-let fnU = (_x): ((unit) => unit) => fooC
-let aU = (() => "foo")->Ok
-
-Ok("_")->Belt.Result.map(concatStrings(_, "foo"))
-
-let ptl1 =  add(1, ...)
-
-let fn = (
-  i,
-  ~hello,
-  ~moreGoesHere,
-  ~provikingMultilineFormattingaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-) => {
-  i + hello + moreGoesHere + provikingMultilineFormattingaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-}
-
-let partial =
-  fn(
-    ~hello=1,
-    ~moreGoesHere=1,
-    ~provikingMultilineFormattingaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=1,
-    ...
-  )
\ No newline at end of file
diff --git a/jscomp/syntax/tests/printer/expr/apply.res b/jscomp/syntax/tests/printer/expr/apply.res
deleted file mode 100644
index 3c9d1ae..0000000
--- a/jscomp/syntax/tests/printer/expr/apply.res
+++ /dev/null
@@ -1,109 +0,0 @@
-console.log()
-Js.log("arg1", "arg2")
-let rbt = make(~compare)
-let rbt = make(~compare?)
-let rbt = make(~compare=intCompare)
-let rbt = make(~compare=?intCompare)
-let rbt = make(~compare=?intCompare: (int, int) => int)
-
-let () = applyFunctionToArguments(
-  superLongIdentifierWooooooowThisIsSuchLong,
-  superLongIdentifierWooooooowThisIsSuchLong,
-  superLongIdentifierWooooooowThisIsSuchLong,
-  superLongIdentifierWooooooowThisIsSuchLong,
-)
-
-let cmp = rbt.compare(. Js.Array2.unsafe_get(old, oldIter.contents), node.value)
-let cmp = rbt.compare2(. Js.Array2.unsafe_get(old, oldIter.contents), longerNode.longValue)
-let uncurriedUnit = apply(.)
-
-let coordinate = make2dCoordinate({x: 1, y: 2})
-let coordinate = make3dCoordinate({...base, field1: thisIsAPrettyLongNameHere, field2: thisIsAPrettyLongNameHere, field3: thisIsAPrettyLongNameHere})
-
-let coordinate = make2dCoordinateArray([x, y])
-let coordinate = make3dCoordinateArray([thisIsAPrettyLongNameHere, thisIsAPrettyLongNameHere,thisIsAPrettyLongNameHere])
-
-let coordinate = make2dCoordinateTuple((x, y))
-let coordinate = make3dCoordinateTuple((thisIsAPrettyLongNameHere, thisIsAPrettyLongNameHere,thisIsAPrettyLongNameHere))
-
-let coordinate = make2dCoordinateList(list{x, y})
-let coordinate = make3dCoordinateList(list{thisIsAPrettyLongNameHere, thisIsAPrettyLongNameHere,thisIsAPrettyLongNameHere, ...allCoords})
-
-let coordinate = makeJsCoordinate({"x": 1, "y": 1})
-let user = makeJsUser({
-  "name": "steve",
-  "age":  32
-})
-
-let x = @attr callFunction()
-let x = @attrWithLongName @attrWithLongName @attrWithLongName @attrWithLongName callFunction()
-
-(a |> f)(b, c)
-
-call(~a: int)
-call(~\"let": int)
-
-document.createElementWithOptions(. "div", elementProps(~onClick=_ =>
-    Js.log("hello world")
-  ))
-
-f(. 1)
-f(. [1, 2, 3])
-f(. [suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLong, suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLong, suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLong,])
-f(. (1, 2, 3))
-f(. {"a": 1})
-f(. list{1})
-f(. `
- template
- string
-`)
-f(. `single line`)
-f(. "
- template
- string
-")
-f(. {
-  expr 
-})
-f(. {expr})
-f(. {
-  exception Exit
-  raise(Exit)
-})
-
-resolve(.)
-resolve(. ())
-
-let g =  f(
-  a => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
-  b,
-  c
-)
-
-let g =  f(
-  a => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
-  b,
-  c, 
-  ...
-)
-
-let g =  f(
-  a => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
-  b,
-  c => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(d, ...),
-  ...
-)
-
-let g =  f(
-  a => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a, ...),
-  b,
-  c => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(d),
-  ...
-)
-
-
-let g =  f(
-  a => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
-  b,
-  c => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(d, ...)
-)
diff --git a/jscomp/syntax/tests/printer/expr/array.res b/jscomp/syntax/tests/printer/expr/array.res
deleted file mode 100644
index c004b46..0000000
--- a/jscomp/syntax/tests/printer/expr/array.res
+++ /dev/null
@@ -1,22 +0,0 @@
-let x = []
-let x = [a, b, c]
-let x = [
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-]
-
-let x = @attr [a, b, c]
-let x = @attr [@attr a, @attr b, @attr c]
-
-let x = @attr [
-  @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-]
-
-let x = [biggerThanZero ? 1 : 0, biggerThanZero ? 1 : 0]
diff --git a/jscomp/syntax/tests/printer/expr/arrayGet.res b/jscomp/syntax/tests/printer/expr/arrayGet.res
deleted file mode 100644
index c06038d..0000000
--- a/jscomp/syntax/tests/printer/expr/arrayGet.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let street = streets[0]
-
-let streetWithAVeryVeryVerrrrrrryVeeeeeeeeeryLongName = streetsAddressBookThisIsALongName[0]
-
-let streetWithAVeryVeryVerrrrrrryVeeeeeeeeeryLongName = streetsAddressBookThisIsALongName[streets->Belt.Array.length - 1]
-
-let streetWithAVeryVeryVerrrrrrryVeeeeeeeeeryLongName = streetsAddressBookThisIsALongName[streetsAddressBookThisIsALongName.streets->Belt.Array.length - 1]
-
-let street = @attr streets[0]
diff --git a/jscomp/syntax/tests/printer/expr/arraySet.res b/jscomp/syntax/tests/printer/expr/arraySet.res
deleted file mode 100644
index e2a8f25..0000000
--- a/jscomp/syntax/tests/printer/expr/arraySet.res
+++ /dev/null
@@ -1,3 +0,0 @@
-numbers[20] = 10
-
-streetsAddressBookThisIsALongName[streets->Belt.Array.length - 1] = streetWithAVeryVeryVerrrrrrryVeeeeeeeeeryLongName
diff --git a/jscomp/syntax/tests/printer/expr/assert.res b/jscomp/syntax/tests/printer/expr/assert.res
deleted file mode 100644
index e7501eb..0000000
--- a/jscomp/syntax/tests/printer/expr/assert.res
+++ /dev/null
@@ -1,57 +0,0 @@
-assert false
-
-assert truth
-
-let x = assert true
-let x = assert 12
-let x = assert (12: int)
-let x = assert 12
-let x = assert list{1, 2, ...x}
-let x = assert module(Foo: Bar)
-let x = assert module(Foo)
-let x = assert Rgb(1, 2, 3)
-let x = assert [a, b, c]
-let x = assert {x: 1, y: 3}
-let x = assert (1, 2, 3)
-let x = assert %extension
-let x = assert user.name
-let x = assert streets[0]
-let x = assert apply(arg1, arg2)
-let x = assert apply(. arg1, arg2)
-let x = assert -1
-let x = assert !true
-let x = assert (x => print(x))
-let x = assert (switch x {
-  | Blue => ()
-  | Yello => ()
-})
-
-let x = assert (for i in 0 to 10 {
-  print_int(i)
-})
-
-let x = assert (if i < 10 {
-  print_int(i)
-} else {
-  print_int(1000)
-})
-
-let x = assert (while i < 10 {
-  print_int(i)
-})
-
-let x = assert (lazy false)
-let x = assert (try sideEffect() catch {| Exit => ()})
-
-let x = assert (@attr expr)
-
-let x = assert (a + b)
-
-let x = @attr assert false
-
-assert invariant["fatal"]
-assert invariants[0]
-
-assert address["street"] = "Brusselsestraat"
-
-assert (true ? 0 : 1)
diff --git a/jscomp/syntax/tests/printer/expr/asyncAwait.res b/jscomp/syntax/tests/printer/expr/asyncAwait.res
deleted file mode 100644
index e6cd380..0000000
--- a/jscomp/syntax/tests/printer/expr/asyncAwait.res
+++ /dev/null
@@ -1,126 +0,0 @@
-let sequentialAwait = async () => {
-  let result1 = await paused("first")
-  nodeJsAssert.equal(result1, "first")
-  
-  let result2 = await paused("second")
-  nodeJsAssert.equal(result2, "second")
-}
-
-let f = async () => ()
-let f = async (.) => ()
-let f = async f => f()
-let f = async (a, b) => a + b
-let f = async (. a, b) => a + b
-
-
-let maybeSomeValue = switch await fetchData(url) {    
-| data => Some(data)
-| exception JsError(_) => None
-}
-
-(await f)(a, b) 
--(await f)
-await 1 + await 2
-
-lazy (await f())
-assert(await f())
-
-(await f).json()
-
-user.data = await fetch()
-
-<Navbar promise={await gc()}>{await weirdReactSuspenseApi}</Navbar>
-
-let inBinaryExpression = await x->Js.Promise.resolve + 1
-let inBinaryExpression = await x->Js.Promise.resolve + await y->Js.Promise.resolve
-
-let withCallback = async (. ()) => {
-    async (. x) => await (x->Js.promise.resolve) + 1
-}
-
-let () = await (await fetch(url))->(await resolve)
-
-let _ = await (1 + 1)
-let _ = await 1 + 1
-let _ = await (-1)
-let _ = await - 1
-let _ = await !ref 
-let _ = await f
-let _ = await %extension 
-let _ = await "test"
-let _ = await ((a, b) => a + b)
-let _ = await (async (a, b) => a + b)
-let _ = await (switch x { | A => () | B => ()})
-let _ = await [1, 2, 3]
-let _ = await (1, 2, 3)
-let _ = await {name: "Steve", age: 32}
-let _ = await (user.name = "Steve")
-let _ = await (if 20 { true } else {false})
-let _ = await (condition() ? true : false)
-let _ = await f(x)
-let _ = await f(. x)
-let _ = await (f(x) : Js.Promise.t<unit>)
-let _ = await (while true { infiniteLoop() })
-let _ = await (try ok() catch { | _  =>  logError() })
-let _ = await (for i in 0 to 10 { sideEffect()})
-let _ = await (lazy x)
-let _ = await (assert(x))
-let _ = await promises[0]
-let _ = await promises["resolved"]
-let _ = await (promises["resolved"] = sideEffect())
-let _ = await (@attr expr)
-let _ = await module(Foo)
-let _ = await module(Foo: Bar)
-let _ = await Promise
-let _ = await Promise(status)
-
-// braces are being dropped, because the ast only has space to record braces surrounding the await
-let _ = await {x}
-// here braces stay, because of precedence
-let _ = await {
-    let x = 1
-    Js.Promise.resolve(x)
-}
-
-let f1 = async (~x, ~y) => x + y
-let f2 = async (@foo ~x, @bar ~y) => x + y
-let f3 = @foo async (@bar ~x as @zz z, ~y) => x + y
-let f4 = async x => x
-let f5 = async x => async y => 3
-let f6 = async (~x1, ~x2) => async y => 3
-let f7 = async x => async (~y) => 3
-let f8 = async (~x1, ~x2) => async (~y) => 3
-let f9 = x => async (~y) => 3
-let f10 = x => async y => 3
-let f11 = (. ~x) => (. ~y) => 3
-
-let f12 = @a (@b x) => 3
-let f13 = @a @b (~x) => 3
-
-let aw = (await (server->start))->foo
-let aw = (@foo (server->start))->foo
-let aw = (await (3**4))->foo
-
-let foo = async(~a=34)
-let bar = async(~a)=>a+1
-
-let a1 = await 3 + await 4
-let a2 = await 3 ** await 4
-let a3 = await foo->bar(~arg)
-let a4 = await foo.bar.baz
-
-let b1  = await (3+4)
-let b2 = await (3**4)
-let b3 = await (foo->bar(~arg))
-let b4 = await (foo.bar.baz)
-
-let c1 = @foo x => @bar y => x + y
-let c2 = (. x) => y => x+y
-let c3 = (. x) => @foo y => x+y
-
-type t1 = (. int) => string => bool
-type t2 = (. int, string) => bool
-
-let f = async (type a, ()) => {
-  await Js.Promise.resolve(())
-}
diff --git a/jscomp/syntax/tests/printer/expr/binary.res b/jscomp/syntax/tests/printer/expr/binary.res
deleted file mode 100644
index 4d84f55..0000000
--- a/jscomp/syntax/tests/printer/expr/binary.res
+++ /dev/null
@@ -1,412 +0,0 @@
-let x = a + b
-let x = @attr (a + b)
-let x = @attr (@attr a + @attr b)
-let x = a && b + c
-let x = (a && b) + c
-let x = a && b || c 
-
-let x = (a && b) + (c && d)
-
-while (continuePrefix.contents && aPrefixLen.contents && bPrefixLen.contents && foobarLen.contents) {
-  ()
-}
-
-// uncurried attribute shouldn't result in parens
-while (
-  rbt.compare(. Js.Array2.unsafe_get(old, oldIter.contents), node.value) < 0
-) {
-  ()
-}
-
-// unary expr as child of binary expr doesn't need parens
-let x = !filePath.includes(allMlSuffixesCategory) &&
-  !filePath.endsWith(allScriptDirectoriesCategory)
-
-let name = names[0] ++ names[1]
-let name = user["firstName"] ++ user["lastName"]
-
-let x = foo ++ bar
-let x = foo != bar
-let x = foo !== bar
-
-let x = foo ++ bar
-let x = 1 + 1
-let x = (a => a + 1) + (b => b + 2)
-let x = -1 + -1
-let x = switch z { | Red => 1 } |> switch y { | Blue => 2 }
-let x = try z catch { | Exit => 1 } |> try y catch { | Blue => 2 }
-let x = if true { 1 } else { 2 } + if false { 2 } else { 3 }
-let x = for i in 0 to 10 { () } |> for i in 0 to 10 { () }
-
-let x = (a, b) + (b, c)
-let x = Vec3(a, b, c) + Vec4(a, b, c, d)
-let x = {x: 1, y: 2} + {x: 2, y :3}
-let x = user.firstName ++ user.lastName
-let x = x.left = value |> x.right = value
-let x = (x.left = value) |> x.right = value
-let x = (x.left = value) |> (x.right = value)
-let () = (x.left = value) |> logMutation
-let () = x.left = value |> logMutation
-let () = x.left = (value |> process) |> x.right = value |> process
-let () = (x: int) |> (print_int: int => unit)
-
-// math
-x + y / z
-x / y + z
-100 * x / total
-2 / 3 * 10 / 2 + 2
-let rotateX = ((range / rect.height) * refY - range / 2) * getXMultiplication(rect.width)
-let rotateY = ((range / rect.width) * refX - range / 2) * getYMultiplication(rect.width)
-
-let x = longIdentifier + longIdentifier + longIdentifier;
-let x = longIdentifier + longIdentifier + longIdentifier + longIdentifier - longIdentifier + longIdentifier;
-let x = longIdentifier + longIdentifier * longIdentifier + longIdentifier - longIdentifier + longIdentifier;
-let x = longIdentifier + longIdentifier * longIdentifier * longIdentifier / longIdentifier + longIdentifier;
-
-let x = longIdentifier && longIdentifier && longIdentifier && longIdentifier && longIdentifier && longIdentifier;
-let x = longIdentifier && longIdentifier || longIdentifier && longIdentifier || longIdentifier && longIdentifier;
-
-// exponentiation is right associative
-let x = 2. ** 3. ** 2.
-let x = (2. ** 3.) ** 2.
-let x = 2. ** (3. ** 2.)
-
-if (
-  successorParent.color === Black &&
-    (sibling === None ||
-      (siblingNN.color === Black &&
-      siblingNN.left === None ||
-        (siblingNN.left->castNotOption).color === Black &&
-      (siblingNN.right === None ||
-        (siblingNN.right->castNotOption).color === Black)))
-) {
-  if sibling !== None {
-    siblingNN.color = Red
-  }
-  successorRef.contents = successorParent
-}
-
-let truth = longEqualityExpression.someRecordField ==
-wowThisDoesHaveToBePrettyLong.someRecordField &&
-  longEqualityExpression.someRecordField ==
-  wowThisDoesHaveToBePrettyLong.someRecordField
-
-while (
-  continuePrefix.contents &&
-  aPrefixLen.contents <= aLen &&
-  bPrefixLen.contents <= bLen
-) {
-  let nextNonwhiteA = nextNonWhiteChar(aStr, 1, aPrefixLen.contents - 1)
-  let nextNonwhiteB = nextNonWhiteChar(bStr, 1, bPrefixLen.contents - 1)
-  ()
-}
-let () = {
-  let () = sideEffect()
-  if (
-    (isLeft(successor) && sibling.right === None) ||
-      ((sibling.right->castNotOption).color === Black &&
-      sibling.left !== None &&
-      (sibling.left->castNotOption).color === Red)
-  ) {
-    sibling.color = Red
-    sibling.left->castNotOption.color = Black
-    rotateRight(rbt, sibling)
-  }
-  if (
-    sibling !== None && (sibling->castNotOption).color === Black
-  ) {
-    let sibling = sibling->castNotOption
-    if (
-      isLeft(successor) &&
-      sibling.right === None ||
-        (sibling.right->castNotOption).color === Black &&
-      sibling.left !== None &&
-      (sibling.left->castNotOption).color === Red
-    ) {
-      sibling.color = Red
-      sibling.left->castNotOption.color = Black
-      rotateRight(rbt, sibling)
-    } else if (
-      !isLeft(successor) &&
-      sibling.left === None ||
-        (sibling.left->castNotOption).color === Black &&
-      sibling.right !== None &&
-      (sibling.right->castNotOption).color === Red
-    ) {
-      sibling.color = Red
-      sibling.right->castNotOption.color = Black
-      rotateLeft(rbt, sibling)
-    }
-    break.contents = true
-  } else {
-    let sibling = siblingOf(successor)
-    let sibling = sibling->castNotOption
-    sibling.color = successorParent.color
-    if isLeft(successor) {
-      sibling.right->castNotOption.color = Black
-      rotateRight(rbt, successorParent)
-    } else {
-      sibling.left->castNotOption.color = Black
-      rotateLeft(rbt, successorParent)
-    }
-  }
-}
-
-let x = a && (b || c)
-let x = a && (b || c) && d
-let x = a && b + c
-let x = a && b + c && d
-
-let x = a && @attr b && c
-let x = @attr a && @attr b && @attr c
-let x = a && @attr (b && c)
-let x = a && @attr (b && c) && @attr (d && e)
-
-let x = a && @attr (x |> f(g))
-let x = a && @attr (x |> f(g)) && @attr (y |> f(h))
-
-let x = a && a.b
-let x = a && x.y && g.h
-let x = a && true
-let x = a && true && true
-let x = a && {let a = true; let b = true; a || b}
-let x = a && {let a = true; let b = true; a || b} && {let a = true; let b = true; a || b}
-
-let x = a && x => x->Js.log
-let x = a && (x => x->Js.log) && x => x->Js.log
-
-let x = a && !b
-let x = a && !b && !c
-
-let x = a && f(b)
-let x = a && f(b) && f(c)
-
-let x = a && f(. b)
-let x = a && f(. b) && f(. c)
-
-let x = a && x |> f(g)
-let x = a && x |> f(g) && y |> f(h)
-
-let x = a && switch color {
-  | Blue => "blue"
-  | Red => "red"
-}
-let x = a && switch color {
-  | Blue => "blue"
-  | Red => "red"
-} && switch color {
-  | Blue => "blue"
-  | Red => "red"
-}
-
-let x = a && try unsafe() catch {
-  | Error => ()
-}
-
-let x = a && try unsafe() catch {
-  | Error => ()
-} && try unsafe() catch {
-  | Error => ()
-}
-
-let x = a && (a, b)
-let x = a && (a, b) && (c, d)
-
-let x = a && Foo(x, y)
-let x = a && Foo(x, y) && Foo(x, y, z)
-
-let x = a && {x: 1, y: 2}
-let x = a && {x: 1, y: 2} && {x: 3, y: 3}
-
-let x = a && b.c
-let x = a && b.c && d.e
-
-let x = a && row.id = 1
-let x = a && (row.id = 1) && row2.id = 3
-
-let x = a && [a, b]
-let x = a && [a, b] && [c, d]
-
-let x = a && if true { true } else { false }
-let x = a && if true { true } else { false } && if false { false } else { true}
-
-let x = a && {sideEffect(); do()}
-let x = a && {sideEffect(); do()} && {sideEffect(); do()}
-
-let x = a && while true { do() }
-let x = a && while true { do() } && while true { do() }
-
-let x = a && for i in 0 to 10 { true }
-let x = a && for i in 0 to 10 { true } && for i in 0 to 10 { false }
-
-let x = a && (truth: bool)
-let x = a && (truth: bool) && (otherTruth: bool)
-
-let x = a && {module L = Log; L.log()}
-let x = a && {module L = Log; L.log()} && {module L = Log; L.log()}
-
-let x = a && {exception Exit; raise(Exit)}
-let x = a && {exception Exit; raise(Exit)} && {exception Exit; raise(Exit)}
-
-let x = a && assert(false)
-let x = a && assert(false) && assert(true)
-
-let x = a && lazy false
-let x = a && lazy false && lazy true
-
-let x = a && {open React; killPerform()}
-let x = a && {open React; killPerform()} && {open Dom; regainPerform()}
-
-let x = a && %raw("true")
-let x = a && %raw("true") && %raw("false")
-
-let x = a && module(Foo)
-let x = a && module(Foo) && module(Bar)
-
-let x = a && module(Foo: Bool)
-let x = a && module(Foo: Bool) && module(Bar: Bool)
-
-let x = a && truths[0]
-let x = a && truths[0] && truths[1]
-
-let () = node.left := value |> process |> node.right = value |> process
-let () = (node.left := value |> process) |> node.right = value |> process
-
-let x = (true ? 0 : 1) + (false ? 1 : 0)
-let x = (true ? 0 : 1) + (false ? 1 : 0) +  (false ? 1 : 0)
-
-while (
-  oldIter.contents < oldLen &&
-    rbt.compare(.
-      Js.Array2.unsafe_get(old, oldIter.contents),
-      node.value,
-    )
-) {
-  disappear(. Js.Array2.unsafe_get(old, oldIter.contents))
-  oldIter.contents = oldIter.contents + 1
-}
-
- while (
-    oldIter.contents < oldLen &&
-      rbt.compare(.
-        Js.Array2.unsafe_get(old, oldIter.contents),
-        node.value,
-      ) < 0
-  ) {
-    disappear(. Js.Array2.unsafe_get(old, oldIter.contents))
-    oldIter.contents = oldIter.contents + 1
-  }
-
-let x =
-  oldIter.contents < oldLen &&
-  rbt.compare(Js.Array2.unsafe_get(old, oldIter.contents), node.value) < veryLongIdentifier;
-
-// should be formatted on one line, i.e. NOT break
-let fullCircle = 2. *. pi
-
-a + b + c
-a + b - c
-a < b < c
-
-a + (b + c)
-a + (b + (c + d))
-a + (b - (c - d))
-a < (b < c)
-a < (b < (c < d))
-
-a || b || c
-a || (b || c)
-a || (b || (c || d))
-
-a && b && c
-a && (b && c)
-a && (b && (c && d))
-
-a && b || c
-a && (b || c)
-
-x->(y->z)
-x->(y->(z->w))
-x->(y &&(w && z))
-(x->y)->z
-
-(x |> y) |> z
-x |> (y |> z)
-x |> (y |> (z |> w))
-
-let x = "z" ++ (a |> f) ++ "x"
-let toString = functionArgs => {
-  functionArgs == []
-    ? ""
-    : "<"
-      ++ (functionArgs |> List.map(argToString) |> String.concat(","))
-      ++ ">"
-}
-
-a |> Author.id != (author |> Author.id)
-
-// should indent the switch
-foo :=
-  switch bar.contents {
-  | _ => 1
-  }
-
-<div> {possibleGradeValues |> List.filter(g =>
-    g < state.maxGrade
-  ) |> List.map(possibleGradeValue =>
-    <option key={possibleGradeValue |> string_of_int} value={possibleGradeValue |> string_of_int}>
-      {possibleGradeValue |> string_of_int |> str}
-    </option>
-  ) |> Array.of_list |> ReasonReact.array} </div>
-
-let aggregateTotal = (forecast, ~audienceType) =>
-  Js.Nullable.toOption(forecast["audiences"])
-  ->Option.flatMap(item =>
-    Js.Dict.get(item, audienceType)
-  )
-  ->Option.map(item => {
-    pages: item["reach"]["pages"],
-    views: item["reach"]["views"],
-    sample: item["reach"]["sample"],
-  })
-
-React.useEffect4(
-  () => {
-    switch (context.library, context.account) {
-    | (Some(library), Some(account)) =>
-      library.getBalance(. account)
-      ->Promise.Js.catch(_ => {Promise.resolved(None)})
-      ->Promise.get(newBalance => {
-          dispatch(
-            LoadAddress(
-              account,
-              newBalance->Belt.Option.flatMap(balance =>
-                Eth.make(balance.toString(.))
-              ),
-            ),
-          )
-        })
-
-      None
-    | _ => None
-    }
-  },
-  (context.library, context.account, context.chainId, dispatch),
-)
-
-@react.component
-let make = (~keycap) =>
-  <Kbd keycap="Ctrl" /> +
-  <Kbd keycap="Shift" /> +
-  <Kbd keycap />
-
-
-<Kbd keycap="Cmd" /> +
-<Kbd keycap="Option" /> +
-<Kbd keycap="Shift" /> +
-<Kbd keycap />
-
-// rescript-lang/syntax/issues/499
-(@doesNotRaise [])->Belt.Array.getExn(0)
-@doesNotRaise
-[]->Belt.Array.getExn(0)
diff --git a/jscomp/syntax/tests/printer/expr/block.res b/jscomp/syntax/tests/printer/expr/block.res
deleted file mode 100644
index 1a53984..0000000
--- a/jscomp/syntax/tests/printer/expr/block.res
+++ /dev/null
@@ -1,72 +0,0 @@
-let x = {
-  module Foo = Bar
-  exception Exit
-  open Belt
-  let a = 1
-  let b = 2
-  sideEffect()
-  sideEffect2()
-  ()
-}
-
-let () = {
-  let () = foo() // don't print unit on the next line
-}
-
-let reifyStyle = (type a, x: 'a): (style<a>, a) => {
-  module Internal = {
-    type rec constructor
-    @val external canvasGradient: constructor = "CanvasGradient" /* internal */
-    @val external canvasPattern: constructor = "CanvasPattern" /* internal */
-    let instanceOf = (
-      %raw(`function(x,y) {return +(x instanceof y)}`): ('a, constructor) => bool
-    ) /* internal */
-  }
-
-  (
-    if Js.typeof(x) == "string" {
-      Obj.magic(String)
-    } else if Internal.instanceOf(x, Internal.canvasGradient) {
-      Obj.magic(Gradient)
-    } else if Internal.instanceOf(x, Internal.canvasPattern) {
-      Obj.magic(Pattern)
-    } else {
-      raise(
-        Invalid_argument(
-          "Unknown canvas style kind. Known values are: String, CanvasGradient, CanvasPattern",
-        ),
-      )
-    },
-    Obj.magic(x),
-  )
-}
-
-React.useEffect0(() => {
-  let watcherId = watchUrl(url => setUrl(_ => url));
-
-   @ocaml.doc(
-    "\n      * check for updates that may have occured between\n      * the initial state and the subscribe above\n      "
-  )
-  let newUrl = dangerouslyGetInitialUrl();
-  if (urlNotEqual(newUrl, url)) {
-    setUrl(_ => newUrl);
-  };
-
-  Some(() => unwatchUrl(watcherId));
-});
-
-<div
-  onClick={event => {
-    switch videoContainerRect {
-    | Some(videoContainerRect) =>
-      let newChapter = ({startTime: percent *. duration}: Video.chapter)
-      {a, b}->onChange
-    | _ => ()
-    }
-  }}
-/>
-
-let calc_fps = (t0, t1) => {
-  let delta = (t1 -. t0) /. 1000.
-  1. /. delta
-}
diff --git a/jscomp/syntax/tests/printer/expr/braced.res b/jscomp/syntax/tests/printer/expr/braced.res
deleted file mode 100644
index 93f463c..0000000
--- a/jscomp/syntax/tests/printer/expr/braced.res
+++ /dev/null
@@ -1,219 +0,0 @@
-let f = (a, b) => {a + b}
-let f = (a, b) => { a }
-
-let f = (a, b) => {
-  a + b
-}
-
-let f = (a, b) => {
-  a
-}
-
-let x = { a }
-let x = { a + b }
-
-let x = {
-  // here
-  a
-}
-
-
-let x = {
-  // here
-  a + b
-}
-
-let _ = { a }
-
-let _ = { "constant" }
-
-let _ = { () => Js.log("test") }
-let _ = { switch b { | true => () | false => () } }
-let _ = switch { b } { | true => () | false => () }
-let _ = { apply(a, b) }
-let _ =  {apply}(a, b) 
-
-let _ = { try danger() catch { | Exit => () } }
-let _ = try { danger() } catch { | Exit => () }
-
-let _ = ({a}, {b}, {x + y})
-let _ = { ({a}, {b}, {x + y})}
-
-let _ = { Rgb(r, g, b) }
-let _ = Rgb({r}, {g}, {b})
-let _ = Rgb({
-  r}, {
-    g}, {
-      b})
-
-let _ = { {name:  "steve", age: 30 } }
-let _ =  {name:  {"steve"}, age: {30} } 
-let _ =  {name:  {
-"steve"}, age: {
-  30} } 
-
-let _ = { user.name }.toString()
-let _ = { { user.name }.toString() }
-let _ = { user.name }.first
-let _ = { { user.name }.first }
-
-let _ = { [a, b, c] }
-let _ =  [{a}, {b}, {c}] 
-let _ =  [{
-  a}, {
-    b}, {
-      c}] 
-
-let _ = { list{a, b, c} }
-let _ = { list{{a}, {b}, {c}} }
-let _ = { list{{
-  a}, {
-    b}, {
-      c}} }
-
-let _ = list{1, 2, ...{list2}}
-
-let _ = {true} ? {true} : {false}
-let _ = {{true} ? {true} : {false}}
-
-let _ = { if true { () } else { () } }
-let _ = { if { true } { () } else { () } }
-
-if {
-  true
-} { ()} else if {
-  false
-}  { () } 
-
-if {
-  true
-} { ()} else if {
-  false
-}  { () } else { () }
-
-
-let _ = { while true { () } }
-let _ = while { true } { () }
-while { /* c0 */ true /* c1 */ } { () }
-while { 
-  true
-} { () }
-while { 
-  /* c0 */ true // c1
-} { () }
-
-
-let _ = { for _ in { 0 } to { 10 } { () } }
-for _ in {
-  0 } to {
-    10 } { () }
-
-let _ = {(foo: string)}
-let f = () => {(foo: string)} // equivalent to  (): string => ...
-
-let localToGlobalX = (
-  x: coordinate<localCoordinates>,
-  ~centering: coordinate<localCoordinates>,
-): coordinate<globalCoordinates> => {
-  x +. (Environment.width /. 2. -. centering.x)
-}
-map((
-  arr,
-  i,
-): coordinate<globalCoordinates> => {
-  x +. (Environment.width /. 2. -. centering.x)
-})
-
-let _ = assert({ true })
-let _ = { assert({ true }) }
-let _ = { lazy { true } }
-
-let _ = { %extension }
-let _ = { module(ME) }
-let _ = { module(ME: MyMod) }
-
-{myArray}[{0}]
-{
-  myArray}[{
-    0}]
-{myArray}[{0}] = {20}
-{
-  myArray}[{
-    0}] = {
-      20}
-
-myArray[20] = {
-  a + b
-}
-
-{jsObject}["foo"]
-{jsObject}["foo"] = { "bar" }
-{jsObject}["foo"] = {
-  a + b
-}
-
-{
-  jsObject}["foo"]
-{jsObject}["foo"] = { "bar" }
-
-apply({a}, {b}, {c})
-apply({
-  a}, {
-    b}, {
-      c})
-
-Thing.map(foo,(arg1, arg2) => {MyModuleBlah.toList(argument)})
-Thing.map({foo},(arg1, arg2) => {
-  MyModuleBlah.toList(argument)
-})
-
-Thing.map({fooSuperLongIdentifierName},{fooSuperLongIdentifierName}, {fooSuperLongIdentifierName},(arg1, arg2) => {
-  MyModuleBlah.toList(argument)
-})
-
-arr->Belt.Array.map(x => {
-  a
-})
-
-apply(~a={a})
-apply({
-  a
-})
-apply(.{
-  a
-})
-
-let x = { <div> child </div> }
-
-// not valid jsx
-let x = { @JSX child  }
-
-let x = {
-  // comment1
-  a + b
-}
-
-let x = {
-  // commment2
-  !truth
-}
-
-{
-  /* c0 */
-  x
-  /* c1 */
-}
-
-{
-  // comment
-  a + b
-}
-
-{a} + {b}
-{
-  a} + {
-    b}
-
-// string constant should be printed correct
-<> {"\n"->React.string} </>
-<> {"\""->React.string} </>
diff --git a/jscomp/syntax/tests/printer/expr/bsObj.res b/jscomp/syntax/tests/printer/expr/bsObj.res
deleted file mode 100644
index ee7dc4c..0000000
--- a/jscomp/syntax/tests/printer/expr/bsObj.res
+++ /dev/null
@@ -1,58 +0,0 @@
-let user = {
-  "name": "Steve",
-  "age": 30
-}
-
-let coord = {"x": 1, "y": 2}
-
-let person = {
-  "name": {
-    "first": "Bob",
-    "last": "Zhmith"
-  },
-  "age": 32
-}
-
-// print parens around constrained expr in rhs
-let user = {"name": (ceo.name: string)}
-// braces should be preserved on rhs
-let user = {"name": {ceo.name}}
-let user = {"name": {
-  ceo.name
-}}
-// braced + constrained expr
-let user = {"name": {(ceo.name: string)}}
-
-React.jsx(
-  ReactDOM.stringToComponent("div"),
-  {
-    let ariaCurrent = #page
-    {
-      "aria-current": (ariaCurrent : [
-      | #page
-      | #step
-      | #location
-      | #date
-      | #time
-      | #"true"
-      | #"false"
-      ])
-    }
-  }
-)
-
-React.jsx(
-  ReactDOM.stringToComponent("div"),
-  {
-    let children = {msg->React.string}
-    {"children": (children: React.element)}
-  }
-)
-
-(@warning("-3") React.jsx)(
-  ReactDOM.stringToComponent("div"),
-  {
-    let \"data-foo" = "payload"
-    {"data-foo": (\"data-foo": string)}
-  }
-)
diff --git a/jscomp/syntax/tests/printer/expr/callback.res b/jscomp/syntax/tests/printer/expr/callback.res
deleted file mode 100644
index 4a3dfc6..0000000
--- a/jscomp/syntax/tests/printer/expr/callback.res
+++ /dev/null
@@ -1,390 +0,0 @@
-array->Js.Array2.forEach(((value, height)) =>
-  add(rbt, value, ~height)->ignore
-)
-someArray->Js.Array2.forEach(((value, height)) =>  add(rbt, value, ~height)->ignore)
-someArraaaaaaayWithAVeryLooooooooooooooooooooooooooooooooooooooongName->Js.Array2.forEach(((value, height)) =>  add(rbt, value, ~height)->ignore)
-
-let make = (arr, ~compare) => {
-  let rbt = make(~compare)
-  array->Js.Array2.forEach(((value, height)) => add(rbt,value, ~height)->ignore)
-  rbt
-}
-
-
-Thing.map(foo,(arg1, arg2) => MyModuleBlah.toList(argument))
-Thing.map(foo, bar, baz, (aaaaaaaaaaarg1, aaaaarg2) => MyModuleBlah.toList(argument))
-Thing.map(fooooooooooooooooooo, bar, baz, (abc, z) => MyModuleBlah.toList(argument))
-Thing.map(fooooooooooooooooooo, baaaaaaaaaaaaaaaaaar, baaaaaaaaaaaaaaaaaaaaaaaaaz, (abc, z) => MyModuleBlah.toList(argument))
-Fooooooooooooooooooo.baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(
-  baaaz, quuuuux =>
-  something(here)
-);
-
-
-Fooooooooooooooooooo.baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(
-  baaaz, quuuuux => {
-    let a = 1
-    let b = 2
-    a + b
-  }
-);
-
-let make = (arr, ~compare) => {
-  let rbt = make(~compare)
-  array->Js.Array2.forEach(((value, height)) => add(rbt, value, ~height)->ignore
-  )
-  rbt
-}
-
-let tbl = data->Js.Array2.reduce(
-        (map, curr) => {
-          let (website, user) = curr
-          if map->Belt.Map.String.has(website) {
-            let set =
-              map->Belt.Map.String.getExn(website)->Belt.Set.Int.add(user)
-            map->Belt.Map.String.set(website, set)
-          } else {
-            let set = Belt.Set.Int.empty->Belt.Set.Int.add(user)
-            map->Belt.Map.String.set(website, set)
-          }
-        },
-        Belt.Map.String.empty,
-      )
-
-let _ = {
-  let similarity = (a, b) => {
-      // nbr of users in common/number of users who have visited either in total
-      let tbl =
-        data->Js.Array2.reduce(
-          (map, curr) => {
-            let (website, user) = curr
-            if map->Belt.Map.String.has(website) {
-              let set = map->Belt.Map.String.getExn(website)->Belt.Set.Int.add(user)
-              map->Belt.Map.String.set(website, set)
-            } else {
-              let set = Belt.Set.Int.empty->Belt.Set.Int.add(user)
-              map->Belt.Map.String.set(website, set)
-            }
-          },
-          Belt.Map.String.empty,
-        )
-      ()
-    }
-    ()
-  }
-
-let trees = possibilities->Belt.Array.mapU((. combination) =>
-  combination->Belt.Array.reduceU(Nil, (. tree, curr) => tree->insert(curr))
-)
-
-let set = mapThatHasAVeryLongName->Belt.Map.String.getExn(website)->Belt.Set.Int.add(user)
-
-let add = (y: coll, e: key) =>
-  if (List.exists(x => eq(x, e), y)) {
-    y;
-  } else {
-    list{e, ...y};
-  };
-
-let add2 = (y: coll, e: key) =>
-  if (List.exists(y, x => eq(x, e) )) {
-    y;
-  } else {
-    list{e, ...y};
-  };
-
-
-let add2 = (y: coll, e: key) =>
-  if possibilities->Belt.Array.mapU((. combination) =>
-  combination->Belt.Array.reduceU(Nil, (. tree, curr) => tree->insert(curr))
-) {
-    y;
-  } else {
-    list{e, ...y};
-  };
-
-let test =
-moduleTypeDeclaration |> TranslateSignature.translateModuleTypeDeclaration(
-         ~config,
-         ~outputFileRelative,
-         ~resolver,
-         ~typeEnv,
-       ) |> doStuff(~x, ~y)
-
-// labelled arguments
-// callback in last position
-// case 1
-Thing.map(foo, ~fn=(arg1, arg2) => MyModuleBlah.toList(argument))
-Thing.map(foo, ~fn=?(arg1, arg2) => MyModuleBlah.toList(argument))
-
-// case 2
-Thing.map(longArgument, veryLooooongArgument, ~fn=(arg1, arg2) =>
-  MyModuleBlah.toList(argument)
-)
-Thing.map(longArgument, veryLooooongArgument, ~fn=?(arg1, arg2) =>
-  MyModuleBlah.toList(argument)
-)
-
-// case 3
-Thing.map(
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg1,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg2,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg3,
-  ~fn=(param1, parm2) => doStuff(param1, parm2)
-)
-Thing.map(
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg1,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg2,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg3,
-  ~fn=?(param1, parm2) => doStuff(param1, parm2)
-)
-
-// callback in first position
-// case 1
-Thing.map(~fn=(arg1, arg2) => MyModuleBlah.toList(argument), foo)
-Thing.map(~fn=?(arg1, arg2) => MyModuleBlah.toList(argument), foo)
-
-// case 2
-Thing.map(~fn=(arg1, arg2) => {
-  MyModuleBlah.toList(argument)
-}, longArgument, veryLooooongArgument)
-Thing.map(~fn=?(arg1, arg2) => {
-  MyModuleBlah.toList(argument)
-}, longArgument, veryLooooongArgument)
-
-// case 3
-Thing.map(
-  ~fn=(param1, parm2) => doStuff(param1, parm2),
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg2,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg3,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg4,
-)
-Thing.map(
-  ~fn=?(param1, parm2) => doStuff(param1, parm2),
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg2,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg3,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg4,
-)
-
-List.iter(x => switch x {
-| ({txt: Lident(name)}, x) => field(name, x)
-| _ => ()
-}, fields)
-
-foo(key => {
-  switch bla {
-  // cancellation =D
-  | None => true
-  }
-})
-
-foo(_ => {
-  switch bar {
-    | None => ()
-    | Some(_) =>
-      a := b
-      Js.log("hi")
-  }
-})
-
-foo(list => list())
-foo(\"switch" => \"switch"())
-
-// the [] of the array should break
-[
-  fn(x => {
-    let _ = x
-  }),
-  fn(y => {
-    let _ = y
-  }),
-  fn(z => {
-    let _ = z
-  })
-]
-
-// similar, the jsx tree should be broken over multiple lines
-let f = () => {
-  <div>
-    {switch user.commited {
-    | NotAsked => React.null
-    | Loading => "Loading ..."->React.string
-    | Done(Error(_)) => "Error"->React.string
-    | Done(Ok(users)) => <> <ul> {users->Array.map(user => {
-            <li key=user.id> {user.username->React.string} </li>
-          })->React.array} </ul> {reloadableUser.last->AsyncData.isLoading
-          ? "Loading next page"->React.string
-          : React.null} <button onClick={_ => setPage(x => x + 1)}>
-          {"Load next page"->React.string}
-        </button> </>
-    }}
-  </div>
-}
-
-myPromise->Js.Promise.then_(value => {
-  Js.log(value)
-  Js.Promise.resolve(value + 2)
-}, _)->Js.Promise.then_(value => {
-  Js.log(value)
-  Js.Promise.resolve(value + 3)
-}, _)->Js.Promise.catch(err => {
-  Js.log2("Failure!!", err)
-  Js.Promise.resolve(-2)
-}, _)
-
-let decoratorTags =
-    items->Js.Array2.filter(items => {items.category === Decorators})->Belt.Array.map(item => {
-      <span className="mr-2" key=item.name> <Tag text={item.name} /> </span>
-})
-
-// Comments should still be printed here (callback in last position)
-let makeEntryJobsForJournal = (journalId: string, userId: string) => {
-  let promises = Belt.MutableQueue.make()
-  // We'll return a promise from this function so that the caller can know
-  // whether we've successfully finished creating jobs or not.
-  let (pom, resolve, reject) = Pom.make()
-  _getEntries(
-    ~journalId,
-    ~authHeader=MercuryService.makeAuthToken(userId),
-    // This has got to add a promise to a mutable queue of promises or something.
-    ~onData=onEntryData,
-    ~onComplete=_ => {
-      // When the request is done, we should wait on the queue of promises to be all finished, then we can resolve.
-      resolve()
-    },
-  )
-
-  pom
-}
-
-let make = fn(
-  (
-    ~a: option<string>=?,
-    ~b: option<string>=?,
-    ~c: option<string>=?,
-    ~d: option<string>=?,
-    ~e: option<string>=?,
-    x
-  ) => {
-    Js.log()
-  }
-)
-
-let make = fn(
-  (
-    ~a: option<string>,
-    ~b: option<string>,
-    ~c: option<string>,
-    ~d: option<string>,
-    ~e: option<string>,
-    x
-  ) => {
-    Js.log()
-  }
-)
-
-let make = fn(
-  (
-    ~a: optionstring,
-    ~b: optionstring,
-    ~c: optionstring,
-    ~d: optionstring,
-    ~e: optionstring,
-    x
-  ) => {
-    Js.log()
-  }
-)
-
-let make = fn(
-  (
-     aoptionstring,
-     boptionstring,
-     coptionstring,
-     doptionstring,
-     eoptionstring,
-     foptionstring,
-    x
-  ) => {
-    Js.log()
-  }
-)
-
-// comments should not disappear on the pattern 
-let /* a */ decoratorTags /* b */ = items
-  ->Js.Array2.filter(items => {items.category === Decorators})
-
-let /* a */ decoratorTags /* b */ = items->Js.Array2.filter(items => {
-  items.category === Decorators
-  || items.category === ChristmasLighting
-  || items.category === Unknown
-})
-
-// callback in last position
-showDialog(
-  `
-  Do you really want to leave this workspace?
-  Some more text with detailed explanations...
-  `,
-  ~danger=true,
-  ~confirmText="Yes, I am sure!",
-  ~onConfirm={() => ()},
-)
-
-// callback in first position
-showDialog(
-  ~onConfirm={() => ()},
-  ~danger=true,
-  ~confirmText="Yes, I am sure!",
-  `
-  Do you really want to leave this workspace?
-  Some more text with detailed explanations...
-  `,
-)
-
-// callback in last position, with comment in between args
-showDialog(dialogMessage,
-// comment
- ~danger=true, ~confirmText="Yes, I am sure!", ~onConfirm=() => ())
- 
-// callback in last position, with comment in between args
-showDialog(
-  dialogMessage,
- ~danger=true, 
- /* comment below */
- ~confirmText="Yes, I am sure!",
- ~onConfirm=() => ())
-
-// callback in first position, with single line comment in between args
-showDialog(
-  ~onConfirm=() => (),
-  dialogMessage,
-  // comment
-  ~danger=true,
-  ~confirmText="Yes, I am sure!"
- )
- 
-// callback in first position, with comment in between args
-showDialog(
-  ~onConfirm=() => (),
-  dialogMessage,
-  ~danger=true, 
-  /* comment below */
-  ~confirmText="Yes, I am sure!",
-)
-
-React.useEffect5((
-  context.activate,
-  context.chainId,
-  dispatch,
-  setTriedLoginAlready,
-  triedLoginAlready,
-),
-() => {
-  doThings()
-  None
-}, // intentionally only running on mount (make sure it's only mounted once :))
-)
-
-apply(a, b, c, /* before */ () => () /* after */)
-apply(/* before */ () => () /* after */, a, b, c)
diff --git a/jscomp/syntax/tests/printer/expr/coerce.res b/jscomp/syntax/tests/printer/expr/coerce.res
deleted file mode 100644
index 1d5f309..0000000
--- a/jscomp/syntax/tests/printer/expr/coerce.res
+++ /dev/null
@@ -1,26 +0,0 @@
-let z = x :> int
-
-let z2 = (x :> int)
-
-let foo = (x:int) => (x :> int)
-
-let foo2 = (x:int) => ((x :> int))
-
-let bar = x => (x : t :> int)
-
-let bar2 = x => ((x : t) :> int)
-
-call(~x=y :> int, ~z=w : int :> int, ~a, ~b)
-
-let foo = (~a=(3:int), b) => 34
-
-let foo = (~a=(3:>int), b) => 34
-
-let foo = (~a=(3:int:>int), b) => 34
-
-// THESE SHOULD NOT PARSE: no magic in the syntax
-// let x: int :> string = y
-// let x :> string = y
-// let x : int1 :> int2 = 3 :> int3
-
-let x = (/* c0 */ x /* c1 */ :> /* c2 */ int /* c3 */)
diff --git a/jscomp/syntax/tests/printer/expr/constant.res b/jscomp/syntax/tests/printer/expr/constant.res
deleted file mode 100644
index 1f5b9c9..0000000
--- a/jscomp/syntax/tests/printer/expr/constant.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let x = 1
-
-let x = 3.14
-
-let x = "mystring"
-
-let x = @attr 1
-let x = @attr 3.14 
-let x = @attr "mystring"
diff --git a/jscomp/syntax/tests/printer/expr/constraint.res b/jscomp/syntax/tests/printer/expr/constraint.res
deleted file mode 100644
index 0bf7e9a..0000000
--- a/jscomp/syntax/tests/printer/expr/constraint.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let x = (Numbers.ten: int)
-
-let x = @attr (10: int)
-let x = (@attr 10: int)
-
-let x = (street["number"]: int)
-let x = (streets[0]: int)
-
-let x = (true ? 1 : 0: int)
diff --git a/jscomp/syntax/tests/printer/expr/constructor.res b/jscomp/syntax/tests/printer/expr/constructor.res
deleted file mode 100644
index b72a2db..0000000
--- a/jscomp/syntax/tests/printer/expr/constructor.res
+++ /dev/null
@@ -1,126 +0,0 @@
-let x = true
-let y = false
-
-let r = Reducer()
-let r = Reducer(state, nexState, sideEffect)
-let r = Reducer(superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, superLongIdentiiiiiiiifffffffiiiiieeeeeeeer)
-let r = Reducer([state, nexState, sideEffect])
-let r = Reducer([
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-])
-
-let r = Reducer({state: nextState, sideEffects: []})
-
-let c = Constr({firstField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, secondField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, thirdField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer})
-
-let forceBreak = Cartesian({
-  x: Omega.x,
-  y: Theta.y
-})
-
-let c = Constr(list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  ...superLoooooooooooooooooooooooooooooongListHere,
-})
-
-let c = Constr(list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-})
-
-let c = ConstructorWithASuuuuuuuuuuuuuuuperLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer([])
-let c = ConstructorWithASuuuuuuuuuuuuuuuperLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer(list{})
-
-
-let coordinate = JsCoord({"x": 1, "y": 1})
-let user = JsUser({
-  "name": "steve",
-  "age":  32
-})
-
-let rec peekMinNode = node =>
-  switch node {
-  | None => None
-  | Some(node) =>
-    if node.left === None {
-      // this shouldn't break over multiple lines
-      Some(node)
-    } else {
-      node.left->peekMinNode
-    }
-  }
-
-let rec peekMinNode = node =>
-  switch node {
-  | None => None
-  | Some(node) =>
-    if node.left === None {
-      // this shouldn't break over multiple lines
-      MyConstructor(node, nodeLongIdentifiiiiieeeeeeer1, nodeLongIdentifiiiiieeeeeeer2)
-    } else {
-      node.left->peekMinNode
-    }
-  }
-
-let constructor =
-  @attr Blue
-
-let x =
-  switch (x) {
-  | Bar =>
-    ReasonReact.UpdateWithSideEffects(
-      self => {
-        let _ = 1;
-        apply(bar);
-      },
-    )
-  | Foo => ()
-  };
-
-// tuple as single argument
-let x = Some((1, 2))
-
-let math = if discriminant < 0. {
-  None
-} else {
-  Some((
-    (-.b -. Js.Math.sqrt(discriminant)) /. (2. *. a),
-    (-.b +. Js.Math.sqrt(discriminant)) /. (2. *. a),
-  ))
-}
-
-// hug block expressions
-let first = Some({
-  let uidentLoc = mkLoc(uidentStartPos, uidentEndPos)
-  Ast_helper.Type.constructor(
-    ~loc=mkLoc(uidentStartPos, p.prevEndPos),
-    ~res?,
-    ~args,
-    Location.mkloc(uident, uidentLoc),
-  )
-})
-
-let first = Some({
-  module D = Debug
-  D.log()
-})
-
-let first = Some({
-  exception Exit
-  raise(Exit)
-})
-
-let first = Some({
-  open Debug
-  log()
-})
-
-let first = Some({
-  sideEffect()
-  sideEffect2()
-})
diff --git a/jscomp/syntax/tests/printer/expr/exoticIdent.res b/jscomp/syntax/tests/printer/expr/exoticIdent.res
deleted file mode 100644
index afec5bd..0000000
--- a/jscomp/syntax/tests/printer/expr/exoticIdent.res
+++ /dev/null
@@ -1,56 +0,0 @@
-let x = \"type"
-let x = Extension.Type.\"type"
-
-let \"+++" = (a, b) => a + b 
-
-\"+++"(~a=\"let", \"module", ~\"type")
-
-switch \"type" {
-| () => ()
-}
-
-try \"type" catch {
-| () => ()
-}
-
-for pat in \"type" to \"let" { () }
-
-if \"let" { () } else if \"module\" { () }
-
-while \"let" { () }
-
-let x = (\"type", \"module")
-let x = [\"type", \"module"]
-let x = list{\"type", \"module"}
-let x = list{\"type", \"module", ...\"let"}
-
-Color(\"let", \"module")
-
-let importType = {
-  ...\"let",
-  \"type": \"module"
-}
-
-let userType = user.\"type"
-let m = user.\"type".\"module"
-
-user.\"type" = \"module"
-
-let () = {
-  \"let"()
-  \"module"
-}
-
-let x = (\"type" : \"module")
-
-assert(\"let")
-
-lazy \"let"
-
-%\"let"
-%\"let"(`console.log`)
-
-@\"let"
-let x = 1
-
-let x = <div \"aria-foo"=\"type"> \"module" \"let" </div>;
diff --git a/jscomp/syntax/tests/printer/expr/expected/DocComments.res.txt b/jscomp/syntax/tests/printer/expr/expected/DocComments.res.txt
deleted file mode 100644
index 1ec6c52..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/DocComments.res.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-let doc1: (/** ddd */ ~x: int) => int = (~x) => x + 1
-let doc2: /** ddd */ int => int = x => x + 1
-let doc3: /** ddd */ int => int = x => x + 1
-let doc4: (/** ddd */ ~x: int, /** eee */ n) => int = (~x) => x + 1
-
-module M: {
-  let foo: (/** xxdoc */ ~x: int, /** yydoc */ ~y: int) => int
-} = {
-  let foo = (~x, ~y) => x + y
-}
-
-@val
-external ex: (/** ddd */ ~x: int, /** eee */ n) => int = "ex"
-
-/** A */
-module rec A: {
-  type t
-} = {
-  type t
-}
-
-/** B */
-and B: {
-  type t
-} = {
-  type t
-}
-
-/** C */
-and C: {
-  type t
-} = {
-  type t
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/RecordOrObject.res.txt b/jscomp/syntax/tests/printer/expr/expected/RecordOrObject.res.txt
deleted file mode 100644
index cb4ea68..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/RecordOrObject.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-type rx = {x: int}
-type ry = {y: string}
-type rxi = {...rx, i?: int}
-type rxy = {...rx, ...ry} // this is a record
-
-let vxy: rxy = {x: 10, y: "abc"}
-let xxi: rxi = {x: 10}
-
-type ox = {"x": int}
-type oy = {"y": int}
-type oxz = {...ox, "z": int}
-type oxy = {...ox, ...oy} // this starts as a record but type checking infers that it is an object
diff --git a/jscomp/syntax/tests/printer/expr/expected/Uncurried.res.txt b/jscomp/syntax/tests/printer/expr/expected/Uncurried.res.txt
deleted file mode 100644
index bb73c5c..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/Uncurried.res.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-@@uncurried
-
-let add3 = (x, y, z) => x + y + z
-
-let triangle = add3(4, 5, add3(1, 2, 3))
-
-let () = ignore(3)
-
-let foo = /* ddd */ x => x
-
-let f = (
-  // comment
-  ~a,
-) => a
diff --git a/jscomp/syntax/tests/printer/expr/expected/UncurriedByDefault.res.txt b/jscomp/syntax/tests/printer/expr/expected/UncurriedByDefault.res.txt
deleted file mode 100644
index 018dbe8..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/UncurriedByDefault.res.txt
+++ /dev/null
@@ -1,181 +0,0 @@
-let cApp = foo(3)
-let uApp = foo(. 3)
-
-let cFun = x => 3
-let uFun = (. x) => 3
-let mixFun = a => (. b, c) => {(d, e, f, g) => (. h) => 4}
-let bracesFun = (. x) => {y => x + y}
-let cFun2 = (x, y) => 3
-let uFun2 = (. x, y) => 3
-
-type cTyp = string => int
-type uTyp = (. string) => int
-type mixTyp = string => (. string, string) => (string, string, string, string) => (. string) => int
-type bTyp = (. string) => string => int
-type cTyp2 = (string, string) => int
-type uTyp2 = (. string, string) => int
-type cu = unit => int
-type cp = unit => int
-type cuu = (unit, unit) => int
-type cpu = (unit, unit) => int
-type cup = (unit, unit) => int
-type cpp = (unit, unit) => int
-type cu2 = (unit, unit) => unit
-type cp2 = (unit, unit) => unit
-type uu = (. unit) => int
-type up = (. unit) => int
-type uuu = (. unit) => (. unit) => int
-type upu = (. unit) => (. unit) => int
-type uup = (. unit) => (. unit) => int
-type upp = (. unit) => (. unit) => int
-type uu2 = (. unit, unit) => unit
-type up2 = (. unit, unit) => unit
-
-type cnested = (string => unit) => unit
-type unested = (. (. string) => unit) => unit
-
-let pipe = a->foo(. b, c)
-
-let _ = setTimeout(. (. ()) => {
-  resolve(. 1)
-}, 100)
-
-let _ = setTimeout(() => {
-  resolve(1)
-}, 100)
-
-let _ = @att (. x) => 34
-let _ = @att async (. x) => 34
-let _ = preserveAttr(@att (. x) => 34)
-let _ = preserveAttr(@att async (. x) => 34)
-
-let t0 = (type a b, l: list<a>, x: a) => list{x, ...l}
-let t1 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-let t2 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-let t3 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-let t4 = (type a b, l: list<a>, x: a) => list{x, ...l}
-let t5 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-let t6 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-
-let () = (x => ignore(x))(3)
-let () = ((. x) => ignore(x))(. 3)
-
-type arrowPath1 = (. int) => string
-type arrowPath2 = (. I.t) => string
-type arrowPath3 = int => string
-type arrowPath4 = I.t => string
-type callback1 = (ReactEvent.Mouse.t => unit) as 'callback
-type callback2 = ReactEvent.Mouse.t => (unit as 'u)
-type callback3 = (ReactEvent.Mouse.t => unit) as 'callback
-type callback4 = ((. ReactEvent.Mouse.t) => unit) as 'callback
-type callback5 = (. ReactEvent.Mouse.t) => (unit as 'u)
-type callback6 = ((. ReactEvent.Mouse.t) => unit) as 'callback
-
-let foo = (. ()) => ()
-let fn = (_x): ((. unit) => unit) => foo
-let fooC = () => ()
-let fnC = (_x): (unit => unit) => fooC
-
-let a = ((. ()) => "foo")->Ok
-let aC = (() => "foo")->Ok
-
-@@uncurried.swap
-
-let cApp = foo(. 3)
-let uApp = foo(3)
-
-let cFun = (. x) => 3
-let uFun = x => 3
-let mixFun = (. a) => (b, c) => {(. d, e, f, g) => h => 4}
-let bracesFun = x => {(. y) => x + y}
-let cFun2 = (. x, y) => 3
-let uFun2 = (x, y) => 3
-let cFun2Dots = (. x, y) => 3 // redundant dot on y
-
-type cTyp = (. string) => int
-type uTyp = string => int
-type mixTyp = (. string) => (string, string) => (. string, string, string, string) => string => int
-type bTyp = string => (. string) => int
-type cTyp2 = (. string, string) => int
-type uTyp2 = (string, string) => int
-type cu = (. unit) => int
-type cp = (. unit) => int
-type cuu = (. unit, unit) => int
-type cpu = (. unit, unit) => int
-type cup = (. unit, unit) => int
-type cpp = (. unit, unit) => int
-type cu2 = (. unit, unit) => unit
-type cp2 = (. unit, unit) => unit
-type uu = unit => int
-type up = unit => int
-type uuu = unit => unit => int
-type upu = unit => unit => int
-type uup = unit => unit => int
-type upp = unit => unit => int
-type uu2 = (unit, unit) => unit
-type up2 = (unit, unit) => unit
-
-type cnested = (. (. string) => unit) => unit
-type unested = (string => unit) => unit
-
-let pipe = a->foo(b, c)
-
-let _ = setTimeout(() => {
-  resolve(1)
-}, 100)
-
-let _ = setTimeout(. (. ()) => {
-  resolve(. 1)
-}, 100)
-
-let _ = @att x => 34
-let _ = @att async x => 34
-let _ = preserveAttr(@att x => 34)
-let _ = preserveAttr(@att async x => 34)
-
-let t0 = (type a b, l: list<a>, x: a) => list{x, ...l}
-let t1 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-let t2 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-let t3 = (. type a b, l: list<a>, x: a) => list{x, ...l}
-
-let () = (x => ignore(x))(3)
-let () = ((. x) => ignore(x))(. 3)
-
-type arrowPath1 = (. int) => string
-type arrowPath2 = (. I.t) => string
-type arrowPath3 = int => string
-type arrowPath4 = I.t => string
-type callback1 = ((. ReactEvent.Mouse.t) => unit) as 'callback
-type callback2 = (. ReactEvent.Mouse.t) => (unit as 'u)
-type callback3 = ((. ReactEvent.Mouse.t) => unit) as 'callback
-type callback4 = (ReactEvent.Mouse.t => unit) as 'callback
-type callback5 = ReactEvent.Mouse.t => (unit as 'u)
-type callback6 = (ReactEvent.Mouse.t => unit) as 'callback
-
-let fooU = () => ()
-let fnU = (_x): (unit => unit) => fooC
-let aU = (() => "foo")->Ok
-
-Ok("_")->Belt.Result.map(concatStrings(_, "foo"))
-
-let ptl1 = add(1, ...)
-
-let fn = (
-  i,
-  ~hello,
-  ~moreGoesHere,
-  ~provikingMultilineFormattingaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-) => {
-  i +
-  hello +
-  moreGoesHere +
-  provikingMultilineFormattingaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-}
-
-let partial =
-  fn(
-    ~hello=1,
-    ~moreGoesHere=1,
-    ~provikingMultilineFormattingaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=1,
-    ...
-  )
diff --git a/jscomp/syntax/tests/printer/expr/expected/apply.res.txt b/jscomp/syntax/tests/printer/expr/expected/apply.res.txt
deleted file mode 100644
index 2472c24..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/apply.res.txt
+++ /dev/null
@@ -1,146 +0,0 @@
-console.log()
-Js.log("arg1", "arg2")
-let rbt = make(~compare)
-let rbt = make(~compare?)
-let rbt = make(~compare=intCompare)
-let rbt = make(~compare=?intCompare)
-let rbt = make(~compare=?(intCompare: (int, int) => int))
-
-let () = applyFunctionToArguments(
-  superLongIdentifierWooooooowThisIsSuchLong,
-  superLongIdentifierWooooooowThisIsSuchLong,
-  superLongIdentifierWooooooowThisIsSuchLong,
-  superLongIdentifierWooooooowThisIsSuchLong,
-)
-
-let cmp = rbt.compare(. Js.Array2.unsafe_get(old, oldIter.contents), node.value)
-let cmp = rbt.compare2(. Js.Array2.unsafe_get(old, oldIter.contents), longerNode.longValue)
-let uncurriedUnit = apply(.)
-
-let coordinate = make2dCoordinate({x: 1, y: 2})
-let coordinate = make3dCoordinate({
-  ...base,
-  field1: thisIsAPrettyLongNameHere,
-  field2: thisIsAPrettyLongNameHere,
-  field3: thisIsAPrettyLongNameHere,
-})
-
-let coordinate = make2dCoordinateArray([x, y])
-let coordinate = make3dCoordinateArray([
-  thisIsAPrettyLongNameHere,
-  thisIsAPrettyLongNameHere,
-  thisIsAPrettyLongNameHere,
-])
-
-let coordinate = make2dCoordinateTuple((x, y))
-let coordinate = make3dCoordinateTuple((
-  thisIsAPrettyLongNameHere,
-  thisIsAPrettyLongNameHere,
-  thisIsAPrettyLongNameHere,
-))
-
-let coordinate = make2dCoordinateList(list{x, y})
-let coordinate = make3dCoordinateList(list{
-  thisIsAPrettyLongNameHere,
-  thisIsAPrettyLongNameHere,
-  thisIsAPrettyLongNameHere,
-  ...allCoords,
-})
-
-let coordinate = makeJsCoordinate({"x": 1, "y": 1})
-let user = makeJsUser({
-  "name": "steve",
-  "age": 32,
-})
-
-let x = @attr callFunction()
-let x = @attrWithLongName @attrWithLongName @attrWithLongName @attrWithLongName callFunction()
-
-(a |> f)(b, c)
-
-call(~a: int)
-call(~\"let": int)
-
-document.createElementWithOptions(. "div", elementProps(~onClick=_ => Js.log("hello world")))
-
-f(. 1)
-f(. [1, 2, 3])
-f(. [
-  suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLong,
-  suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLong,
-  suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLong,
-])
-f(. (1, 2, 3))
-f(. {"a": 1})
-f(. list{1})
-f(. `
- template
- string
-`)
-f(. `single line`)
-f(. "
- template
- string
-")
-f(. {
-  expr
-})
-f(. {expr})
-f(. {
-  exception Exit
-  raise(Exit)
-})
-
-resolve(.)
-resolve(. ())
-
-let g = f(
-  a => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
-  b,
-  c,
-)
-
-let g =
-  f(
-    a =>
-      LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
-    b,
-    c,
-    ...
-  )
-
-let g =
-  f(
-    a =>
-      LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
-    b,
-    c =>
-      LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(
-        d,
-        ...
-      ),
-    ...
-  )
-
-let g =
-  f(
-    a =>
-      LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(
-        a,
-        ...
-      ),
-    b,
-    c =>
-      LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(d),
-    ...
-  )
-
-let g = f(
-  a => LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(a),
-  b,
-  c =>
-    LongModuleName.functionWithAlongNameThatWrapsTheEditorToTheNextLinexxxxxxxxxxxxxxxxxxxxxx(
-      d,
-      ...
-    ),
-)
diff --git a/jscomp/syntax/tests/printer/expr/expected/array.res.txt b/jscomp/syntax/tests/printer/expr/expected/array.res.txt
deleted file mode 100644
index f317af7..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/array.res.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-let x = []
-let x = [a, b, c]
-let x = [
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-]
-
-let x = @attr [a, b, c]
-let x = @attr [@attr a, @attr b, @attr c]
-
-let x =
-  @attr
-  [
-    @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-    @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-    @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-    @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-    @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-    @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-    @attr superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  ]
-
-let x = [biggerThanZero ? 1 : 0, biggerThanZero ? 1 : 0]
diff --git a/jscomp/syntax/tests/printer/expr/expected/arrayGet.res.txt b/jscomp/syntax/tests/printer/expr/expected/arrayGet.res.txt
deleted file mode 100644
index 1159e48..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/arrayGet.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-let street = streets[0]
-
-let streetWithAVeryVeryVerrrrrrryVeeeeeeeeeryLongName = streetsAddressBookThisIsALongName[0]
-
-let streetWithAVeryVeryVerrrrrrryVeeeeeeeeeryLongName =
-  streetsAddressBookThisIsALongName[streets->Belt.Array.length - 1]
-
-let streetWithAVeryVeryVerrrrrrryVeeeeeeeeeryLongName =
-  streetsAddressBookThisIsALongName[
-    streetsAddressBookThisIsALongName.streets->Belt.Array.length - 1
-  ]
-
-let street = @attr streets[0]
diff --git a/jscomp/syntax/tests/printer/expr/expected/arraySet.res.txt b/jscomp/syntax/tests/printer/expr/expected/arraySet.res.txt
deleted file mode 100644
index 31d9527..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/arraySet.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-numbers[20] = 10
-
-streetsAddressBookThisIsALongName[
-  streets->Belt.Array.length - 1
-] = streetWithAVeryVeryVerrrrrrryVeeeeeeeeeryLongName
diff --git a/jscomp/syntax/tests/printer/expr/expected/assert.res.txt b/jscomp/syntax/tests/printer/expr/expected/assert.res.txt
deleted file mode 100644
index 593516a..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/assert.res.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-assert(false)
-
-assert(truth)
-
-let x = assert(true)
-let x = assert(12)
-let x = assert(12: int)
-let x = assert(12)
-let x = assert(list{1, 2, ...x})
-let x = assert(module(Foo: Bar))
-let x = assert(module(Foo))
-let x = assert(Rgb(1, 2, 3))
-let x = assert([a, b, c])
-let x = assert({x: 1, y: 3})
-let x = assert((1, 2, 3))
-let x = assert(%extension)
-let x = assert(user.name)
-let x = assert(streets[0])
-let x = assert(apply(arg1, arg2))
-let x = assert(apply(. arg1, arg2))
-let x = assert(-1)
-let x = assert(!true)
-let x = assert(x => print(x))
-let x = assert(switch x {
-| Blue => ()
-| Yello => ()
-})
-
-let x = assert(for i in 0 to 10 {
-  print_int(i)
-})
-
-let x = assert(if i < 10 {
-  print_int(i)
-} else {
-  print_int(1000)
-})
-
-let x = assert(while i < 10 {
-  print_int(i)
-})
-
-let x = assert(lazy false)
-let x = assert(try sideEffect() catch {
-| Exit => ()
-})
-
-let x = assert(@attr expr)
-
-let x = assert(a + b)
-
-let x = @attr assert(false)
-
-assert(invariant["fatal"])
-assert(invariants[0])
-
-assert(address["street"] = "Brusselsestraat")
-
-assert(true ? 0 : 1)
diff --git a/jscomp/syntax/tests/printer/expr/expected/asyncAwait.res.txt b/jscomp/syntax/tests/printer/expr/expected/asyncAwait.res.txt
deleted file mode 100644
index 20da7e3..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/asyncAwait.res.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-let sequentialAwait = async () => {
-  let result1 = await paused("first")
-  nodeJsAssert.equal(result1, "first")
-
-  let result2 = await paused("second")
-  nodeJsAssert.equal(result2, "second")
-}
-
-let f = async () => ()
-let f = async (. ()) => ()
-let f = async f => f()
-let f = async (a, b) => a + b
-let f = async (. a, b) => a + b
-
-let maybeSomeValue = switch await fetchData(url) {
-| data => Some(data)
-| exception JsError(_) => None
-}
-
-(await f)(a, b)
--(await f)
-(await 1) + (await 2)
-
-lazy (await f())
-assert(await f())
-
-(await f).json()
-
-user.data = await fetch()
-
-<Navbar promise={await gc()}> {await weirdReactSuspenseApi} </Navbar>
-
-let inBinaryExpression = await x->Js.Promise.resolve + 1
-let inBinaryExpression = await x->Js.Promise.resolve + await y->Js.Promise.resolve
-
-let withCallback = async (. ()) => {
-  async (. x) => await x->Js.promise.resolve + 1
-}
-
-let () = await (await fetch(url))->(await resolve)
-
-let _ = await (1 + 1)
-let _ = (await 1) + 1
-let _ = await -1
-let _ = await -1
-let _ = await !ref
-let _ = await f
-let _ = await %extension
-let _ = await "test"
-let _ = await ((a, b) => a + b)
-let _ = await (async (a, b) => a + b)
-let _ = await (
-  switch x {
-  | A => ()
-  | B => ()
-  }
-)
-let _ = await [1, 2, 3]
-let _ = await (1, 2, 3)
-let _ = await {name: "Steve", age: 32}
-let _ = await (user.name = "Steve")
-let _ = await (
-  if 20 {
-    true
-  } else {
-    false
-  }
-)
-let _ = await (condition() ? true : false)
-let _ = await f(x)
-let _ = await f(. x)
-let _ = (await (f(x): Js.Promise.t<unit>))
-let _ = await (
-  while true {
-    infiniteLoop()
-  }
-)
-let _ = await (
-  try ok() catch {
-  | _ => logError()
-  }
-)
-let _ = await (
-  for i in 0 to 10 {
-    sideEffect()
-  }
-)
-let _ = await (lazy x)
-let _ = await (assert(x))
-let _ = await promises[0]
-let _ = await promises["resolved"]
-let _ = await promises["resolved"] = sideEffect()
-let _ = @attr await (expr)
-let _ = await module(Foo)
-let _ = await module(Foo: Bar)
-let _ = await Promise
-let _ = await Promise(status)
-
-// braces are being dropped, because the ast only has space to record braces surrounding the await
-let _ = await x
-// here braces stay, because of precedence
-let _ = await {
-  let x = 1
-  Js.Promise.resolve(x)
-}
-
-let f1 = async (~x, ~y) => x + y
-let f2 = async (@foo ~x, @bar ~y) => x + y
-let f3 = @foo async (~x as @bar @zz z, ~y) => x + y
-let f4 = async x => x
-let f5 = async x => async y => 3
-let f6 = async (~x1, ~x2) => async y => 3
-let f7 = async x => async (~y) => 3
-let f8 = async (~x1, ~x2) => async (~y) => 3
-let f9 = x => async (~y) => 3
-let f10 = x => async y => 3
-let f11 = (. ~x) => (. ~y) => 3
-
-let f12 = @a (@b x) => 3
-let f13 = @a @b (~x) => 3
-
-let aw = (await server->start)->foo
-let aw = @foo (server->start)->foo
-let aw = (await (3 ** 4))->foo
-
-let foo = async(~a=34)
-let bar = async (~a) => a + 1
-
-let a1 = (await 3) + (await 4)
-let a2 = (await 3) ** (await 4)
-let a3 = await foo->bar(~arg)
-let a4 = await foo.bar.baz
-
-let b1 = await (3 + 4)
-let b2 = await (3 ** 4)
-let b3 = await foo->bar(~arg)
-let b4 = await foo.bar.baz
-
-let c1 = @foo x => @bar y => x + y
-let c2 = (. x) => {y => x + y}
-let c3 = (. x) => {@foo y => x + y}
-
-type t1 = (. int) => string => bool
-type t2 = (. int, string) => bool
-
-let f = async (type a, ()) => {
-  await Js.Promise.resolve()
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/binary.res.txt b/jscomp/syntax/tests/printer/expr/expected/binary.res.txt
deleted file mode 100644
index a699c32..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/binary.res.txt
+++ /dev/null
@@ -1,528 +0,0 @@
-let x = a + b
-let x = @attr (a + b)
-let x = @attr ((@attr a) + (@attr b))
-let x = a && b + c
-let x = (a && b) + c
-let x = (a && b) || c
-
-let x = (a && b) + (c && d)
-
-while continuePrefix.contents && aPrefixLen.contents && bPrefixLen.contents && foobarLen.contents {
-  ()
-}
-
-// uncurried attribute shouldn't result in parens
-while rbt.compare(. Js.Array2.unsafe_get(old, oldIter.contents), node.value) < 0 {
-  ()
-}
-
-// unary expr as child of binary expr doesn't need parens
-let x =
-  !filePath.includes(allMlSuffixesCategory) && !filePath.endsWith(allScriptDirectoriesCategory)
-
-let name = names[0] ++ names[1]
-let name = user["firstName"] ++ user["lastName"]
-
-let x = foo ++ bar
-let x = foo != bar
-let x = foo !== bar
-
-let x = foo ++ bar
-let x = 1 + 1
-let x = (a => a + 1) + (b => b + 2)
-let x = -1 + -1
-let x = switch z {
-| Red => 1
-} |> switch y {
-| Blue => 2
-}
-let x = try z catch {
-| Exit => 1
-} |> try y catch {
-| Blue => 2
-}
-let x =
-  if true {
-    1
-  } else {
-    2
-  } + if false {
-    2
-  } else {
-    3
-  }
-let x = for i in 0 to 10 {
-  ()
-} |> for i in 0 to 10 {
-  ()
-}
-
-let x = (a, b) + (b, c)
-let x = Vec3(a, b, c) + Vec4(a, b, c, d)
-let x = {x: 1, y: 2} + {x: 2, y: 3}
-let x = user.firstName ++ user.lastName
-let x = x.left = value |> x.right = value
-let x = (x.left = value) |> x.right = value
-let x = (x.left = value) |> x.right = value
-let () = (x.left = value) |> logMutation
-let () = x.left = value |> logMutation
-let () = x.left = value |> process |> x.right = value |> process
-let () = (x: int) |> (print_int: int => unit)
-
-// math
-x + y / z
-x / y + z
-100 * x / total
-2 / 3 * 10 / 2 + 2
-let rotateX = (range / rect.height * refY - range / 2) * getXMultiplication(rect.width)
-let rotateY = (range / rect.width * refX - range / 2) * getYMultiplication(rect.width)
-
-let x = longIdentifier + longIdentifier + longIdentifier
-let x =
-  longIdentifier +
-  longIdentifier +
-  longIdentifier +
-  longIdentifier -
-  longIdentifier +
-  longIdentifier
-let x =
-  longIdentifier +
-  longIdentifier * longIdentifier +
-  longIdentifier -
-  longIdentifier +
-  longIdentifier
-let x =
-  longIdentifier +
-  longIdentifier * longIdentifier * longIdentifier / longIdentifier +
-  longIdentifier
-
-let x =
-  longIdentifier &&
-  longIdentifier &&
-  longIdentifier &&
-  longIdentifier &&
-  longIdentifier &&
-  longIdentifier
-let x =
-  (longIdentifier && longIdentifier) ||
-  longIdentifier && longIdentifier ||
-  (longIdentifier && longIdentifier)
-
-// exponentiation is right associative
-let x = 2. ** 3. ** 2.
-let x = (2. ** 3.) ** 2.
-let x = 2. ** 3. ** 2.
-
-if (
-  successorParent.color === Black &&
-    (sibling === None ||
-      ((siblingNN.color === Black && siblingNN.left === None) ||
-      (siblingNN.left->castNotOption).color === Black &&
-        (siblingNN.right === None || (siblingNN.right->castNotOption).color === Black)))
-) {
-  if sibling !== None {
-    siblingNN.color = Red
-  }
-  successorRef.contents = successorParent
-}
-
-let truth =
-  longEqualityExpression.someRecordField == wowThisDoesHaveToBePrettyLong.someRecordField &&
-    longEqualityExpression.someRecordField == wowThisDoesHaveToBePrettyLong.someRecordField
-
-while continuePrefix.contents && aPrefixLen.contents <= aLen && bPrefixLen.contents <= bLen {
-  let nextNonwhiteA = nextNonWhiteChar(aStr, 1, aPrefixLen.contents - 1)
-  let nextNonwhiteB = nextNonWhiteChar(bStr, 1, bPrefixLen.contents - 1)
-}
-let () = {
-  let () = sideEffect()
-  if (
-    (isLeft(successor) && sibling.right === None) ||
-      ((sibling.right->castNotOption).color === Black &&
-      sibling.left !== None &&
-      (sibling.left->castNotOption).color === Red)
-  ) {
-    sibling.color = Red
-    sibling.left->castNotOption.color = Black
-    rotateRight(rbt, sibling)
-  }
-  if sibling !== None && (sibling->castNotOption).color === Black {
-    let sibling = sibling->castNotOption
-    if (
-      (isLeft(successor) && sibling.right === None) ||
-        ((sibling.right->castNotOption).color === Black &&
-        sibling.left !== None &&
-        (sibling.left->castNotOption).color === Red)
-    ) {
-      sibling.color = Red
-      sibling.left->castNotOption.color = Black
-      rotateRight(rbt, sibling)
-    } else if (
-      (!isLeft(successor) && sibling.left === None) ||
-        ((sibling.left->castNotOption).color === Black &&
-        sibling.right !== None &&
-        (sibling.right->castNotOption).color === Red)
-    ) {
-      sibling.color = Red
-      sibling.right->castNotOption.color = Black
-      rotateLeft(rbt, sibling)
-    }
-    break.contents = true
-  } else {
-    let sibling = siblingOf(successor)
-    let sibling = sibling->castNotOption
-    sibling.color = successorParent.color
-    if isLeft(successor) {
-      sibling.right->castNotOption.color = Black
-      rotateRight(rbt, successorParent)
-    } else {
-      sibling.left->castNotOption.color = Black
-      rotateLeft(rbt, successorParent)
-    }
-  }
-}
-
-let x = a && (b || c)
-let x = a && (b || c) && d
-let x = a && b + c
-let x = a && b + c && d
-
-let x = a && (@attr b) && c
-let x = (@attr a) && (@attr b) && (@attr c)
-let x = a && @attr (b && c)
-let x = a && (@attr (b && c)) && @attr (d && e)
-
-let x = a && @attr (x |> f(g))
-let x = a && (@attr (x |> f(g))) && @attr (y |> f(h))
-
-let x = a && a.b
-let x = a && x.y && g.h
-let x = a && true
-let x = a && true && true
-let x =
-  a && {
-    let a = true
-    let b = true
-    a || b
-  }
-let x =
-  a &&
-  {
-    let a = true
-    let b = true
-    a || b
-  } && {
-    let a = true
-    let b = true
-    a || b
-  }
-
-let x = a && (x => x->Js.log)
-let x = a && (x => x->Js.log) && (x => x->Js.log)
-
-let x = a && !b
-let x = a && !b && !c
-
-let x = a && f(b)
-let x = a && f(b) && f(c)
-
-let x = a && f(. b)
-let x = a && f(. b) && f(. c)
-
-let x = a && x |> f(g)
-let x = a && x |> f(g) && y |> f(h)
-
-let x =
-  a &&
-  switch color {
-  | Blue => "blue"
-  | Red => "red"
-  }
-let x =
-  a &&
-  switch color {
-  | Blue => "blue"
-  | Red => "red"
-  } &&
-  switch color {
-  | Blue => "blue"
-  | Red => "red"
-  }
-
-let x =
-  a && try unsafe() catch {
-  | Error => ()
-  }
-
-let x =
-  a &&
-  try unsafe() catch {
-  | Error => ()
-  } && try unsafe() catch {
-  | Error => ()
-  }
-
-let x = a && (a, b)
-let x = a && (a, b) && (c, d)
-
-let x = a && Foo(x, y)
-let x = a && Foo(x, y) && Foo(x, y, z)
-
-let x = a && {x: 1, y: 2}
-let x = a && {x: 1, y: 2} && {x: 3, y: 3}
-
-let x = a && b.c
-let x = a && b.c && d.e
-
-let x = a && row.id = 1
-let x = a && (row.id = 1) && row2.id = 3
-
-let x = a && [a, b]
-let x = a && [a, b] && [c, d]
-
-let x =
-  a && if true {
-    true
-  } else {
-    false
-  }
-let x =
-  a &&
-  if true {
-    true
-  } else {
-    false
-  } && if false {
-    false
-  } else {
-    true
-  }
-
-let x =
-  a && {
-    sideEffect()
-    do()
-  }
-let x =
-  a &&
-  {
-    sideEffect()
-    do()
-  } && {
-    sideEffect()
-    do()
-  }
-
-let x =
-  a && while true {
-    do()
-  }
-let x =
-  a &&
-  while true {
-    do()
-  } && while true {
-    do()
-  }
-
-let x =
-  a && for i in 0 to 10 {
-    true
-  }
-let x =
-  a &&
-  for i in 0 to 10 {
-    true
-  } && for i in 0 to 10 {
-    false
-  }
-
-let x = a && (truth: bool)
-let x = a && (truth: bool) && (otherTruth: bool)
-
-let x =
-  a && {
-    module L = Log
-    L.log()
-  }
-let x =
-  a &&
-  {
-    module L = Log
-    L.log()
-  } && {
-    module L = Log
-    L.log()
-  }
-
-let x =
-  a && {
-    exception Exit
-    raise(Exit)
-  }
-let x =
-  a &&
-  {
-    exception Exit
-    raise(Exit)
-  } && {
-    exception Exit
-    raise(Exit)
-  }
-
-let x = a && assert(false)
-let x = a && assert(false && assert(true))
-
-let x = a && lazy false
-let x = a && lazy false && lazy true
-
-let x =
-  a && {
-    open React
-    killPerform()
-  }
-let x =
-  a &&
-  {
-    open React
-    killPerform()
-  } && {
-    open Dom
-    regainPerform()
-  }
-
-let x = a && %raw("true")
-let x = a && %raw("true") && %raw("false")
-
-let x = a && module(Foo)
-let x = a && module(Foo) && module(Bar)
-
-let x = a && module(Foo: Bool)
-let x = a && module(Foo: Bool) && module(Bar: Bool)
-
-let x = a && truths[0]
-let x = a && truths[0] && truths[1]
-
-let () = node.left := value |> process |> node.right = value |> process
-let () = (node.left := value |> process) |> node.right = value |> process
-
-let x = (true ? 0 : 1) + (false ? 1 : 0)
-let x = (true ? 0 : 1) + (false ? 1 : 0) + (false ? 1 : 0)
-
-while (
-  oldIter.contents < oldLen &&
-    rbt.compare(. Js.Array2.unsafe_get(old, oldIter.contents), node.value)
-) {
-  disappear(. Js.Array2.unsafe_get(old, oldIter.contents))
-  oldIter.contents = oldIter.contents + 1
-}
-
-while (
-  oldIter.contents < oldLen &&
-    rbt.compare(. Js.Array2.unsafe_get(old, oldIter.contents), node.value) < 0
-) {
-  disappear(. Js.Array2.unsafe_get(old, oldIter.contents))
-  oldIter.contents = oldIter.contents + 1
-}
-
-let x =
-  oldIter.contents < oldLen &&
-    rbt.compare(Js.Array2.unsafe_get(old, oldIter.contents), node.value) < veryLongIdentifier
-
-// should be formatted on one line, i.e. NOT break
-let fullCircle = 2. *. pi
-
-a + b + c
-a + b - c
-a < b < c
-
-a + (b + c)
-a + (b + (c + d))
-a + (b - (c - d))
-a < (b < c)
-a < (b < (c < d))
-
-a || b || c
-a || (b || c)
-a || (b || (c || d))
-
-a && b && c
-a && (b && c)
-a && (b && (c && d))
-
-(a && b) || c
-a && (b || c)
-
-x->(y->z)
-x->(y->(z->w))
-x->(y && (w && z))
-x->y->z
-
-x |> y |> z
-x |> (y |> z)
-x |> (y |> (z |> w))
-
-let x = "z" ++ (a |> f) ++ "x"
-let toString = functionArgs => {
-  functionArgs == []
-    ? ""
-    : "<" ++ (functionArgs |> List.map(argToString) |> String.concat(",")) ++ ">"
-}
-
-a |> Author.id != (author |> Author.id)
-
-// should indent the switch
-foo :=
-  switch bar.contents {
-  | _ => 1
-  }
-
-<div>
-  {possibleGradeValues
-  |> List.filter(g => g < state.maxGrade)
-  |> List.map(possibleGradeValue =>
-    <option key={possibleGradeValue |> string_of_int} value={possibleGradeValue |> string_of_int}>
-      {possibleGradeValue |> string_of_int |> str}
-    </option>
-  )
-  |> Array.of_list
-  |> ReasonReact.array}
-</div>
-
-let aggregateTotal = (forecast, ~audienceType) =>
-  Js.Nullable.toOption(forecast["audiences"])
-  ->Option.flatMap(item => Js.Dict.get(item, audienceType))
-  ->Option.map(item => {
-    pages: item["reach"]["pages"],
-    views: item["reach"]["views"],
-    sample: item["reach"]["sample"],
-  })
-
-React.useEffect4(() => {
-  switch (context.library, context.account) {
-  | (Some(library), Some(account)) =>
-    library.getBalance(. account)
-    ->Promise.Js.catch(_ => {Promise.resolved(None)})
-    ->Promise.get(newBalance => {
-      dispatch(
-        LoadAddress(
-          account,
-          newBalance->Belt.Option.flatMap(balance => Eth.make(balance.toString(.))),
-        ),
-      )
-    })
-
-    None
-  | _ => None
-  }
-}, (context.library, context.account, context.chainId, dispatch))
-
-@react.component
-let make = (~keycap) => <Kbd keycap="Ctrl" /> + <Kbd keycap="Shift" /> + <Kbd keycap />
-
-<Kbd keycap="Cmd" /> + <Kbd keycap="Option" /> + <Kbd keycap="Shift" /> + <Kbd keycap />
-
-// rescript-lang/syntax/issues/499
-(@doesNotRaise [])->Belt.Array.getExn(0)
-@doesNotRaise
-[]->Belt.Array.getExn(0)
diff --git a/jscomp/syntax/tests/printer/expr/expected/block.res.txt b/jscomp/syntax/tests/printer/expr/expected/block.res.txt
deleted file mode 100644
index d7d8068..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/block.res.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-let x = {
-  module Foo = Bar
-  exception Exit
-  open Belt
-  let a = 1
-  let b = 2
-  sideEffect()
-  sideEffect2()
-  ()
-}
-
-let () = {
-  let () = foo() // don't print unit on the next line
-}
-
-let reifyStyle = (type a, x: 'a): (style<a>, a) => {
-  module Internal = {
-    type rec constructor
-    @val external canvasGradient: constructor = "CanvasGradient" /* internal */
-    @val external canvasPattern: constructor = "CanvasPattern" /* internal */
-    let instanceOf = (
-      %raw(`function(x,y) {return +(x instanceof y)}`): ('a, constructor) => bool
-    ) /* internal */
-  }
-
-  (
-    if Js.typeof(x) == "string" {
-      Obj.magic(String)
-    } else if Internal.instanceOf(x, Internal.canvasGradient) {
-      Obj.magic(Gradient)
-    } else if Internal.instanceOf(x, Internal.canvasPattern) {
-      Obj.magic(Pattern)
-    } else {
-      raise(
-        Invalid_argument(
-          "Unknown canvas style kind. Known values are: String, CanvasGradient, CanvasPattern",
-        ),
-      )
-    },
-    Obj.magic(x),
-  )
-}
-
-React.useEffect0(() => {
-  let watcherId = watchUrl(url => setUrl(_ => url))
-
-  @ocaml.doc(
-    "\n      * check for updates that may have occured between\n      * the initial state and the subscribe above\n      "
-  )
-  let newUrl = dangerouslyGetInitialUrl()
-  if urlNotEqual(newUrl, url) {
-    setUrl(_ => newUrl)
-  }
-
-  Some(() => unwatchUrl(watcherId))
-})
-
-<div
-  onClick={event => {
-    switch videoContainerRect {
-    | Some(videoContainerRect) =>
-      let newChapter = ({startTime: percent *. duration}: Video.chapter)
-      {a, b}->onChange
-    | _ => ()
-    }
-  }}
-/>
-
-let calc_fps = (t0, t1) => {
-  let delta = (t1 -. t0) /. 1000.
-  1. /. delta
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/braced.res.txt b/jscomp/syntax/tests/printer/expr/expected/braced.res.txt
deleted file mode 100644
index d60e067..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/braced.res.txt
+++ /dev/null
@@ -1,323 +0,0 @@
-let f = (a, b) => {a + b}
-let f = (a, b) => {a}
-
-let f = (a, b) => {
-  a + b
-}
-
-let f = (a, b) => {
-  a
-}
-
-let x = {a}
-let x = {a + b}
-
-let x = {
-  // here
-  a
-}
-
-let x = {
-  // here
-  a + b
-}
-
-let _ = {a}
-
-let _ = {"constant"}
-
-let _ = {() => Js.log("test")}
-let _ = {
-  switch b {
-  | true => ()
-  | false => ()
-  }
-}
-let _ = switch {b} {
-| true => ()
-| false => ()
-}
-let _ = {apply(a, b)}
-let _ = {apply}(a, b)
-
-let _ = {
-  try danger() catch {
-  | Exit => ()
-  }
-}
-let _ = try {danger()} catch {
-| Exit => ()
-}
-
-let _ = ({a}, {b}, {x + y})
-let _ = {({a}, {b}, {x + y})}
-
-let _ = {Rgb(r, g, b)}
-let _ = Rgb({r}, {g}, {b})
-let _ = Rgb(
-  {
-    r
-  },
-  {
-    g
-  },
-  {
-    b
-  },
-)
-
-let _ = {{name: "steve", age: 30}}
-let _ = {name: {"steve"}, age: {30}}
-let _ = {
-  name: {
-    "steve"
-  },
-  age: {
-    30
-  },
-}
-
-let _ = {user.name}.toString()
-let _ = {{user.name}.toString()}
-let _ = {user.name}.first
-let _ = {{user.name}.first}
-
-let _ = {[a, b, c]}
-let _ = [{a}, {b}, {c}]
-let _ = [
-  {
-    a
-  },
-  {
-    b
-  },
-  {
-    c
-  },
-]
-
-let _ = {list{a, b, c}}
-let _ = {list{{a}, {b}, {c}}}
-let _ = {
-  list{
-    {
-      a
-    },
-    {
-      b
-    },
-    {
-      c
-    },
-  }
-}
-
-let _ = list{1, 2, ...{list2}}
-
-let _ = {true} ? {true} : {false}
-let _ = {{true} ? {true} : {false}}
-
-let _ = {
-  if true {
-    ()
-  } else {
-    ()
-  }
-}
-let _ = {
-  if {true} {
-    ()
-  } else {
-    ()
-  }
-}
-
-if {
-  true
-} {
-  ()
-} else if {
-  false
-} {
-  ()
-}
-
-if {
-  true
-} {
-  ()
-} else if {
-  false
-} {
-  ()
-} else {
-  ()
-}
-
-let _ = {
-  while true {
-    ()
-  }
-}
-let _ = while {true} {
-  ()
-}
-while {/* c0 */ true /* c1 */} {
-  ()
-}
-while (
-  {
-    true
-  }
-) {
-  ()
-}
-while (
-  {
-    /* c0 */ true // c1
-  }
-) {
-  ()
-}
-
-let _ = {
-  for _ in {0} to {10} {
-    ()
-  }
-}
-for _ in {
-  0
-} to {
-  10
-} {
-  ()
-}
-
-let _ = {(foo: string)}
-let f = (): string => {foo} // equivalent to  (): string => ...
-
-let localToGlobalX = (
-  x: coordinate<localCoordinates>,
-  ~centering: coordinate<localCoordinates>,
-): coordinate<globalCoordinates> => {
-  x +. (Environment.width /. 2. -. centering.x)
-}
-map((arr, i): coordinate<globalCoordinates> => {
-  x +. (Environment.width /. 2. -. centering.x)
-})
-
-let _ = assert(true)
-let _ = {assert(true)}
-let _ = {lazy {true}}
-
-let _ = {%extension}
-let _ = {module(ME)}
-let _ = {module(ME: MyMod)}
-
-{myArray}[{0}]
-{
-  myArray
-}[{
-  0
-}]
-{myArray}[{0}] = {20}
-{
-  myArray
-}[{
-  0
-}] = {
-  20
-}
-
-myArray[20] = {
-  a + b
-}
-
-{jsObject}["foo"]
-{jsObject}["foo"] = {"bar"}
-{jsObject}["foo"] = {
-  a + b
-}
-
-{
-  jsObject
-}["foo"]
-{jsObject}["foo"] = {"bar"}
-
-apply({a}, {b}, {c})
-apply(
-  {
-    a
-  },
-  {
-    b
-  },
-  {
-    c
-  },
-)
-
-Thing.map(foo, (arg1, arg2) => {MyModuleBlah.toList(argument)})
-Thing.map({foo}, (arg1, arg2) => {
-  MyModuleBlah.toList(argument)
-})
-
-Thing.map(
-  {fooSuperLongIdentifierName},
-  {fooSuperLongIdentifierName},
-  {fooSuperLongIdentifierName},
-  (arg1, arg2) => {
-    MyModuleBlah.toList(argument)
-  },
-)
-
-arr->Belt.Array.map(x => {
-  a
-})
-
-apply(~a={a})
-apply({
-  a
-})
-apply(. {
-  a
-})
-
-let x = {<div> child </div>}
-
-// not valid jsx
-let x = {@JSX child}
-
-let x = {
-  // comment1
-  a + b
-}
-
-let x = {
-  // commment2
-  !truth
-}
-
-{
-  /* c0 */
-  x
-  /* c1 */
-}
-
-{
-  // comment
-  a +
-  b
-}
-
-{a} + {b}
-{
-  a
-} +
-{
-  b
-}
-
-// string constant should be printed correct
-(<> {"\n"->React.string} </>)
-(<> {"\""->React.string} </>)
diff --git a/jscomp/syntax/tests/printer/expr/expected/bsObj.res.txt b/jscomp/syntax/tests/printer/expr/expected/bsObj.res.txt
deleted file mode 100644
index c25445b..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/bsObj.res.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-let user = {
-  "name": "Steve",
-  "age": 30,
-}
-
-let coord = {"x": 1, "y": 2}
-
-let person = {
-  "name": {
-    "first": "Bob",
-    "last": "Zhmith",
-  },
-  "age": 32,
-}
-
-// print parens around constrained expr in rhs
-let user = {"name": (ceo.name: string)}
-// braces should be preserved on rhs
-let user = {"name": {ceo.name}}
-let user = {
-  "name": {
-    ceo.name
-  },
-}
-// braced + constrained expr
-let user = {"name": {(ceo.name: string)}}
-
-React.jsx(
-  ReactDOM.stringToComponent("div"),
-  {
-    let ariaCurrent = #page
-    {
-      "aria-current": (
-        ariaCurrent: [
-          | #page
-          | #step
-          | #location
-          | #date
-          | #time
-          | #"true"
-          | #"false"
-        ]
-      ),
-    }
-  },
-)
-
-React.jsx(
-  ReactDOM.stringToComponent("div"),
-  {
-    let children = {msg->React.string}
-    {"children": (children: React.element)}
-  },
-)
-
-(@warning("-3") React.jsx)(
-  ReactDOM.stringToComponent("div"),
-  {
-    let \"data-foo" = "payload"
-    {"data-foo": (\"data-foo": string)}
-  },
-)
diff --git a/jscomp/syntax/tests/printer/expr/expected/callback.res.txt b/jscomp/syntax/tests/printer/expr/expected/callback.res.txt
deleted file mode 100644
index 4e04e8a..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/callback.res.txt
+++ /dev/null
@@ -1,383 +0,0 @@
-array->Js.Array2.forEach(((value, height)) => add(rbt, value, ~height)->ignore)
-someArray->Js.Array2.forEach(((value, height)) => add(rbt, value, ~height)->ignore)
-someArraaaaaaayWithAVeryLooooooooooooooooooooooooooooooooooooooongName->Js.Array2.forEach(((
-  value,
-  height,
-)) => add(rbt, value, ~height)->ignore)
-
-let make = (arr, ~compare) => {
-  let rbt = make(~compare)
-  array->Js.Array2.forEach(((value, height)) => add(rbt, value, ~height)->ignore)
-  rbt
-}
-
-Thing.map(foo, (arg1, arg2) => MyModuleBlah.toList(argument))
-Thing.map(foo, bar, baz, (aaaaaaaaaaarg1, aaaaarg2) => MyModuleBlah.toList(argument))
-Thing.map(fooooooooooooooooooo, bar, baz, (abc, z) => MyModuleBlah.toList(argument))
-Thing.map(fooooooooooooooooooo, baaaaaaaaaaaaaaaaaar, baaaaaaaaaaaaaaaaaaaaaaaaaz, (abc, z) =>
-  MyModuleBlah.toList(argument)
-)
-Fooooooooooooooooooo.baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(baaaz, quuuuux =>
-  something(here)
-)
-
-Fooooooooooooooooooo.baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(baaaz, quuuuux => {
-  let a = 1
-  let b = 2
-  a + b
-})
-
-let make = (arr, ~compare) => {
-  let rbt = make(~compare)
-  array->Js.Array2.forEach(((value, height)) => add(rbt, value, ~height)->ignore)
-  rbt
-}
-
-let tbl = data->Js.Array2.reduce((map, curr) => {
-  let (website, user) = curr
-  if map->Belt.Map.String.has(website) {
-    let set = map->Belt.Map.String.getExn(website)->Belt.Set.Int.add(user)
-    map->Belt.Map.String.set(website, set)
-  } else {
-    let set = Belt.Set.Int.empty->Belt.Set.Int.add(user)
-    map->Belt.Map.String.set(website, set)
-  }
-}, Belt.Map.String.empty)
-
-let _ = {
-  let similarity = (a, b) => {
-    // nbr of users in common/number of users who have visited either in total
-    let tbl = data->Js.Array2.reduce((map, curr) => {
-      let (website, user) = curr
-      if map->Belt.Map.String.has(website) {
-        let set = map->Belt.Map.String.getExn(website)->Belt.Set.Int.add(user)
-        map->Belt.Map.String.set(website, set)
-      } else {
-        let set = Belt.Set.Int.empty->Belt.Set.Int.add(user)
-        map->Belt.Map.String.set(website, set)
-      }
-    }, Belt.Map.String.empty)
-  }
-}
-
-let trees =
-  possibilities->Belt.Array.mapU((. combination) =>
-    combination->Belt.Array.reduceU(Nil, (. tree, curr) => tree->insert(curr))
-  )
-
-let set = mapThatHasAVeryLongName->Belt.Map.String.getExn(website)->Belt.Set.Int.add(user)
-
-let add = (y: coll, e: key) =>
-  if List.exists(x => eq(x, e), y) {
-    y
-  } else {
-    list{e, ...y}
-  }
-
-let add2 = (y: coll, e: key) =>
-  if List.exists(y, x => eq(x, e)) {
-    y
-  } else {
-    list{e, ...y}
-  }
-
-let add2 = (y: coll, e: key) =>
-  if (
-    possibilities->Belt.Array.mapU((. combination) =>
-      combination->Belt.Array.reduceU(Nil, (. tree, curr) => tree->insert(curr))
-    )
-  ) {
-    y
-  } else {
-    list{e, ...y}
-  }
-
-let test =
-  moduleTypeDeclaration
-  |> TranslateSignature.translateModuleTypeDeclaration(
-    ~config,
-    ~outputFileRelative,
-    ~resolver,
-    ~typeEnv,
-  )
-  |> doStuff(~x, ~y)
-
-// labelled arguments
-// callback in last position
-// case 1
-Thing.map(foo, ~fn=(arg1, arg2) => MyModuleBlah.toList(argument))
-Thing.map(foo, ~fn=?(arg1, arg2) => MyModuleBlah.toList(argument))
-
-// case 2
-Thing.map(longArgument, veryLooooongArgument, ~fn=(arg1, arg2) => MyModuleBlah.toList(argument))
-Thing.map(longArgument, veryLooooongArgument, ~fn=?(arg1, arg2) => MyModuleBlah.toList(argument))
-
-// case 3
-Thing.map(
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg1,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg2,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg3,
-  ~fn=(param1, parm2) => doStuff(param1, parm2),
-)
-Thing.map(
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg1,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg2,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg3,
-  ~fn=?(param1, parm2) => doStuff(param1, parm2),
-)
-
-// callback in first position
-// case 1
-Thing.map(~fn=(arg1, arg2) => MyModuleBlah.toList(argument), foo)
-Thing.map(~fn=?(arg1, arg2) => MyModuleBlah.toList(argument), foo)
-
-// case 2
-Thing.map(~fn=(arg1, arg2) => {
-  MyModuleBlah.toList(argument)
-}, longArgument, veryLooooongArgument)
-Thing.map(~fn=?(arg1, arg2) => {
-  MyModuleBlah.toList(argument)
-}, longArgument, veryLooooongArgument)
-
-// case 3
-Thing.map(
-  ~fn=(param1, parm2) => doStuff(param1, parm2),
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg2,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg3,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg4,
-)
-Thing.map(
-  ~fn=?(param1, parm2) => doStuff(param1, parm2),
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg2,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg3,
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaarg4,
-)
-
-List.iter(x =>
-  switch x {
-  | ({txt: Lident(name)}, x) => field(name, x)
-  | _ => ()
-  }
-, fields)
-
-foo(key => {
-  switch bla {
-  // cancellation =D
-  | None => true
-  }
-})
-
-foo(_ => {
-  switch bar {
-  | None => ()
-  | Some(_) =>
-    a := b
-    Js.log("hi")
-  }
-})
-
-foo(list => list())
-foo(\"switch" => \"switch"())
-
-// the [] of the array should break
-[
-  fn(x => {
-    let _ = x
-  }),
-  fn(y => {
-    let _ = y
-  }),
-  fn(z => {
-    let _ = z
-  }),
-]
-
-// similar, the jsx tree should be broken over multiple lines
-let f = () => {
-  <div>
-    {switch user.commited {
-    | NotAsked => React.null
-    | Loading => "Loading ..."->React.string
-    | Done(Error(_)) => "Error"->React.string
-    | Done(Ok(users)) =>
-      <>
-        <ul>
-          {users
-          ->Array.map(user => {
-            <li key=user.id> {user.username->React.string} </li>
-          })
-          ->React.array}
-        </ul>
-        {reloadableUser.last->AsyncData.isLoading ? "Loading next page"->React.string : React.null}
-        <button onClick={_ => setPage(x => x + 1)}> {"Load next page"->React.string} </button>
-      </>
-    }}
-  </div>
-}
-
-myPromise
-->Js.Promise.then_(value => {
-  Js.log(value)
-  Js.Promise.resolve(value + 2)
-}, _)
-->Js.Promise.then_(value => {
-  Js.log(value)
-  Js.Promise.resolve(value + 3)
-}, _)
-->Js.Promise.catch(err => {
-  Js.log2("Failure!!", err)
-  Js.Promise.resolve(-2)
-}, _)
-
-let decoratorTags =
-  items
-  ->Js.Array2.filter(items => {items.category === Decorators})
-  ->Belt.Array.map(item => {
-    <span className="mr-2" key=item.name>
-      <Tag text={item.name} />
-    </span>
-  })
-
-// Comments should still be printed here (callback in last position)
-let makeEntryJobsForJournal = (journalId: string, userId: string) => {
-  let promises = Belt.MutableQueue.make()
-  // We'll return a promise from this function so that the caller can know
-  // whether we've successfully finished creating jobs or not.
-  let (pom, resolve, reject) = Pom.make()
-  _getEntries(
-    ~journalId,
-    ~authHeader=MercuryService.makeAuthToken(userId),
-    // This has got to add a promise to a mutable queue of promises or something.
-    ~onData=onEntryData,
-    ~onComplete=_ => {
-      // When the request is done, we should wait on the queue of promises to be all finished, then we can resolve.
-      resolve()
-    },
-  )
-
-  pom
-}
-
-let make = fn((
-  ~a: option<string>=?,
-  ~b: option<string>=?,
-  ~c: option<string>=?,
-  ~d: option<string>=?,
-  ~e: option<string>=?,
-  x,
-) => {
-  Js.log()
-})
-
-let make = fn((
-  ~a: option<string>,
-  ~b: option<string>,
-  ~c: option<string>,
-  ~d: option<string>,
-  ~e: option<string>,
-  x,
-) => {
-  Js.log()
-})
-
-let make = fn((
-  ~a: optionstring,
-  ~b: optionstring,
-  ~c: optionstring,
-  ~d: optionstring,
-  ~e: optionstring,
-  x,
-) => {
-  Js.log()
-})
-
-let make = fn((
-  aoptionstring,
-  boptionstring,
-  coptionstring,
-  doptionstring,
-  eoptionstring,
-  foptionstring,
-  x,
-) => {
-  Js.log()
-})
-
-// comments should not disappear on the pattern
-let /* a */ decoratorTags /* b */ =
-  items->Js.Array2.filter(items => {items.category === Decorators})
-
-let /* a */ decoratorTags /* b */ = items->Js.Array2.filter(items => {
-  items.category === Decorators ||
-  items.category === ChristmasLighting ||
-  items.category === Unknown
-})
-
-// callback in last position
-showDialog(
-  `
-  Do you really want to leave this workspace?
-  Some more text with detailed explanations...
-  `,
-  ~danger=true,
-  ~confirmText="Yes, I am sure!",
-  ~onConfirm={() => ()},
-)
-
-// callback in first position
-showDialog(
-  ~onConfirm={() => ()},
-  ~danger=true,
-  ~confirmText="Yes, I am sure!",
-  `
-  Do you really want to leave this workspace?
-  Some more text with detailed explanations...
-  `,
-)
-
-// callback in last position, with comment in between args
-showDialog(
-  dialogMessage,
-  // comment
-  ~danger=true,
-  ~confirmText="Yes, I am sure!",
-  ~onConfirm=() => (),
-)
-
-// callback in last position, with comment in between args
-showDialog(
-  dialogMessage,
-  ~danger=true,
-  /* comment below */
-  ~confirmText="Yes, I am sure!",
-  ~onConfirm=() => (),
-)
-
-// callback in first position, with single line comment in between args
-showDialog(
-  ~onConfirm=() => (),
-  dialogMessage,
-  // comment
-  ~danger=true,
-  ~confirmText="Yes, I am sure!",
-)
-
-// callback in first position, with comment in between args
-showDialog(
-  ~onConfirm=() => (),
-  dialogMessage,
-  ~danger=true,
-  /* comment below */
-  ~confirmText="Yes, I am sure!",
-)
-
-React.useEffect5(
-  (context.activate, context.chainId, dispatch, setTriedLoginAlready, triedLoginAlready),
-  () => {
-    doThings()
-    None
-  }, // intentionally only running on mount (make sure it's only mounted once :))
-)
-
-apply(a, b, c, /* before */ () => () /* after */)
-apply(/* before */ () => () /* after */, a, b, c)
diff --git a/jscomp/syntax/tests/printer/expr/expected/coerce.res.txt b/jscomp/syntax/tests/printer/expr/expected/coerce.res.txt
deleted file mode 100644
index 92164f2..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/coerce.res.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-let z = (x :> int)
-
-let z2 = (x :> int)
-
-let foo = (x: int) => (x :> int)
-
-let foo2 = (x: int) => (x :> int)
-
-let bar = x => (x: t :> int)
-
-let bar2 = x => (x: t :> int)
-
-call(~x=(y :> int), ~z=(w: int :> int), ~a, ~b)
-
-let foo = (~a=3: int, b) => 34
-
-let foo = (~a=(3 :> int), b) => 34
-
-let foo = (~a=(3: int :> int), b) => 34
-
-// THESE SHOULD NOT PARSE: no magic in the syntax
-// let x: int :> string = y
-// let x :> string = y
-// let x : int1 :> int2 = 3 :> int3
-
-let x = /* c0 */ (x /* c1 */ :> /* c2 */ int) /* c3 */
diff --git a/jscomp/syntax/tests/printer/expr/expected/constant.res.txt b/jscomp/syntax/tests/printer/expr/expected/constant.res.txt
deleted file mode 100644
index 720638c..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/constant.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-let x = 1
-
-let x = 3.14
-
-let x = "mystring"
-
-let x = @attr 1
-let x = @attr 3.14
-let x = @attr "mystring"
diff --git a/jscomp/syntax/tests/printer/expr/expected/constraint.res.txt b/jscomp/syntax/tests/printer/expr/expected/constraint.res.txt
deleted file mode 100644
index e341e13..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/constraint.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-let x = (Numbers.ten: int)
-
-let x = (@attr 10: int)
-let x = (@attr 10: int)
-
-let x = (street["number"]: int)
-let x = (streets[0]: int)
-
-let x = (true ? 1 : 0: int)
diff --git a/jscomp/syntax/tests/printer/expr/expected/constructor.res.txt b/jscomp/syntax/tests/printer/expr/expected/constructor.res.txt
deleted file mode 100644
index 69d4b65..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/constructor.res.txt
+++ /dev/null
@@ -1,131 +0,0 @@
-let x = true
-let y = false
-
-let r = Reducer()
-let r = Reducer(state, nexState, sideEffect)
-let r = Reducer(
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-)
-let r = Reducer([state, nexState, sideEffect])
-let r = Reducer([
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-])
-
-let r = Reducer({state: nextState, sideEffects: []})
-
-let c = Constr({
-  firstField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  secondField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  thirdField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-})
-
-let forceBreak = Cartesian({
-  x: Omega.x,
-  y: Theta.y,
-})
-
-let c = Constr(list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  ...superLoooooooooooooooooooooooooooooongListHere,
-})
-
-let c = Constr(list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-})
-
-let c = ConstructorWithASuuuuuuuuuuuuuuuperLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer([])
-let c = ConstructorWithASuuuuuuuuuuuuuuuperLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer(list{})
-
-let coordinate = JsCoord({"x": 1, "y": 1})
-let user = JsUser({
-  "name": "steve",
-  "age": 32,
-})
-
-let rec peekMinNode = node =>
-  switch node {
-  | None => None
-  | Some(node) =>
-    if node.left === None {
-      // this shouldn't break over multiple lines
-      Some(node)
-    } else {
-      node.left->peekMinNode
-    }
-  }
-
-let rec peekMinNode = node =>
-  switch node {
-  | None => None
-  | Some(node) =>
-    if node.left === None {
-      // this shouldn't break over multiple lines
-      MyConstructor(node, nodeLongIdentifiiiiieeeeeeer1, nodeLongIdentifiiiiieeeeeeer2)
-    } else {
-      node.left->peekMinNode
-    }
-  }
-
-let constructor = @attr Blue
-
-let x = switch x {
-| Bar =>
-  ReasonReact.UpdateWithSideEffects(
-    self => {
-      let _ = 1
-      apply(bar)
-    },
-  )
-| Foo => ()
-}
-
-// tuple as single argument
-let x = Some((1, 2))
-
-let math = if discriminant < 0. {
-  None
-} else {
-  Some((
-    (-.b -. Js.Math.sqrt(discriminant)) /. (2. *. a),
-    (-.b +. Js.Math.sqrt(discriminant)) /. (2. *. a),
-  ))
-}
-
-// hug block expressions
-let first = Some({
-  let uidentLoc = mkLoc(uidentStartPos, uidentEndPos)
-  Ast_helper.Type.constructor(
-    ~loc=mkLoc(uidentStartPos, p.prevEndPos),
-    ~res?,
-    ~args,
-    Location.mkloc(uident, uidentLoc),
-  )
-})
-
-let first = Some({
-  module D = Debug
-  D.log()
-})
-
-let first = Some({
-  exception Exit
-  raise(Exit)
-})
-
-let first = Some({
-  open Debug
-  log()
-})
-
-let first = Some({
-  sideEffect()
-  sideEffect2()
-})
diff --git a/jscomp/syntax/tests/printer/expr/expected/exoticIdent.res.txt b/jscomp/syntax/tests/printer/expr/expected/exoticIdent.res.txt
deleted file mode 100644
index d3dc9ec..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/exoticIdent.res.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-let x = \"type"
-let x = Extension.Type.\"type"
-
-let \"+++" = (a, b) => a + b
-
-\"+++"(~a=\"let", \"module", ~\"type")
-
-switch \"type" {
-| () => ()
-}
-
-try \"type" catch {
-| () => ()
-}
-
-for pat in \"type" to \"let" {
-  ()
-}
-
-if \"let" {
-  ()
-} else if \"module\" {
-  ()
-}
-
-while \"let" {
-  ()
-}
-
-let x = (\"type", \"module")
-let x = [\"type", \"module"]
-let x = list{\"type", \"module"}
-let x = list{\"type", \"module", ...\"let"}
-
-Color(\"let", \"module")
-
-let importType = {
-  ...\"let",
-  \"type": \"module",
-}
-
-let userType = user.\"type"
-let m = user.\"type".\"module"
-
-user.\"type" = \"module"
-
-let () = {
-  \"let"()
-  \"module"
-}
-
-let x = (\"type": \"module")
-
-assert(\"let")
-
-lazy \"let"
-
-%let
-%let(`console.log`)
-
-@let
-let x = 1
-
-let x =
-  <div \"aria-foo"=\"type">
-    \"module"
-    \"let"
-  </div>
diff --git a/jscomp/syntax/tests/printer/expr/expected/extension.res.txt b/jscomp/syntax/tests/printer/expr/expected/extension.res.txt
deleted file mode 100644
index a7ec218..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/extension.res.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-let x = %eval
-let node = %raw("0")
-let node = %raw(@attr ("0"))
-let node = %raw(@attrStructureLvl (@attrOnExpr "0"))
-
-let node = %raw(@attrStructureLvl @attrStructureLvl2 @attrStructureLvl3 (@attrOnExpr "0"))
-let node = %raw(
-  @attrStructureLvl @attrStructureLvl2 @attrStructureLvl3
-  (@attrOnExpr @attrOnExpr2 @attrOnExpr3 @attrOnExpr4 @attrOnExpr5 "unsafe raw js")
-)
-let f: (int, int) => int = %raw((a, b) => "{return a + b}")
-
-let f = (x, y) => {
-  %debugger
-  x + y
-}
-
-switch %external(__DEV__) {
-| Some(_) => Js.log("dev mode")
-| None => Js.log("production mode")
-}
-
-let node = @attr %raw("0")
diff --git a/jscomp/syntax/tests/printer/expr/expected/field.res.txt b/jscomp/syntax/tests/printer/expr/expected/field.res.txt
deleted file mode 100644
index 642e540..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/field.res.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-let n = user.name
-
-(currentNode.parent->castNotOption).color
-
-let x = -a.bar
-
-let x = true.x
-let x = (12: int).x
-let x = list{1, 2, ...x}.x
-let x = module(Foo: Bar).x
-let x = module(Foo).x
-let x = Rgb(1, 2, 3).x
-let x = [a, b, c].x
-let x = {x: 1, y: 3}.x
-let x = (1, 2, 3).x
-let x = (%extension).x
-let x = user.name.last
-let x = streets[0].house
-let x = apply(arg1, arg2).field
-let x = apply(. arg1, arg2).field
-let x = (-1).x
-let x = (!true).x
-let x = (x => print(x)).x
-let x = (
-  switch x {
-  | Blue => ()
-  | Yello => ()
-  }
-).x
-
-let x = (
-  for i in 0 to 10 {
-    print_int(i)
-  }
-).x
-
-let x = (
-  if i < 10 {
-    print_int(i)
-  } else {
-    print_int(1000)
-  }
-).x
-
-let x = (
-  while i < 10 {
-    print_int(i)
-  }
-).x
-
-let x = (assert(false)).x
-let x = (lazy false).x
-let x = (
-  try sideEffect() catch {
-  | Exit => ()
-  }
-).x
-
-let x = (@attr expr).x
-
-let x = (a + b).x
-
-let x = @attr user.name
-let x = (isLeft ? node.left : node.right).color
-let x = (@attrOnTernary (isLeft ? node.left : node.right)).color
diff --git a/jscomp/syntax/tests/printer/expr/expected/firstClassModule.res.txt b/jscomp/syntax/tests/printer/expr/expected/firstClassModule.res.txt
deleted file mode 100644
index 995769b..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/firstClassModule.res.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-module(Three)
-module(Three: X_int)
-
-let three = module(Three: X_int)
-let three = module(Three)
-
-let x = @attr module(Foo)
-let x = @attr module(Foo: FirstClass)
-
-module(Teenager)[0]
-module(Teenager)->age->Js.log
-module(Teenager)[0]->Js.log
-module(Teenager)->age->isAdult
-  ? Js.log("has responsibilities")
-  : Js.log("can play in the playground")
-module(Streets)[0]->isExpensive ? Js.log("big money") : Js.log("affordable")
-
-let () = {
-  module(Teenager)->age->Js.log
-}
-let () = {
-  module(Teenager)[0]
-}
-let () = {
-  module(Teenager)->age->isAdult
-    ? Js.log("has responsibilities")
-    : Js.log("can play in the playground")
-}
-let () = {
-  module(Streets)[0]->isExpensive ? Js.log("big money") : Js.log("affordable")
-}
-
-let () = {
-  let a = 1
-  let b = 2
-  module(Teenager)[0]
-  module(Teenager)->age->Js.log
-}
-
-let () = {
-  let a = 1
-  let b = 2
-  module(Teenager)->age->Js.log
-  module(Teenager)[0]->age->isAdult
-    ? Js.log("has responsibilities")
-    : Js.log("can play in the playground")
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/for.res.txt b/jscomp/syntax/tests/printer/expr/expected/for.res.txt
deleted file mode 100644
index 5d12d7b..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/for.res.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-let () = for i in 0 to 10 {
-  ()
-}
-
-for i in 0 to 10 {
-  let a = 1
-  let b = 2
-  sideEffect()
-}
-
-let x =
-  @attr
-  for i in 0 to 10 {
-    ()
-  }
diff --git a/jscomp/syntax/tests/printer/expr/expected/fun.res.txt b/jscomp/syntax/tests/printer/expr/expected/fun.res.txt
deleted file mode 100644
index a1ff38f..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/fun.res.txt
+++ /dev/null
@@ -1,358 +0,0 @@
-let f = (a, b) => ()
-let greet = (~person, ~from as hometown) => ()
-let greet = (~person="Steve", ~from as hometown="Cupertino") => ()
-
-let onChangedVisible = (
-  ~anchor=None,
-  rbt,
-  ~oldNewVisible,
-  ~top as top_,
-  ~bottom as bottom_,
-  ~appear,
-  ~remained,
-  ~disappear,
-) => ()
-
-let greet = (~person, ~from as hometown) => superLongIdentifiiiiiieeeeeeerExpression()
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown,
-) => superLongIdentifiiiiiieeeeeeerExpression()
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown,
-) => superLongIdentislkdjflksjdfljslkjdflksjdklfjlskdjfklffiiiiiieeeeeeerExpression()
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown,
-) => superLongIdentier
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown,
-) => superLongIdentislkdjflksjdfljslkjdflksjdklfjlskdjfklffiiiiiieeeeeeerExpression
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown,
-) => SuperLongConstructorrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown,
-) => SuperLongConstructorrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
-
-let f = () => ()
-let f = a => ()
-let f = _ => ()
-
-let f = (~a=?) => ()
-let f = (~from as hometown=?) => ()
-
-let f = (. a) => ()
-let f = (. a, b) => ()
-let f = (. ()) => ()
-
-let f = @attr (a, b) => @attr2 (c, d) => ()
-let f = @attr (@attrOnA a, @attrOnB b) => @attr2 (@attrOnC c, @attrOnD d) => ()
-let f = @attr (. a, b) => @attr2 (. c, d) => ()
-
-let f = (@attr ~a, @attr ~b) => ()
-let f = (. @attr ~a) => (. @attr ~b) => ()
-
-let f = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => ()
-
-let coordBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => {x: 1, y: 2}
-
-let coordBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => {x: 1, y: 2}
-
-let recordBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => {
-  ...fields,
-  firstField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  secondField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  thirdField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-}
-
-let arrayBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => [1, 2, 3, 4]
-
-let arrayBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => [
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-]
-
-let tupleBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => (1, 2, 3)
-
-let tupleBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => (
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-)
-
-let constrBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => Cartesian({
-  x: Omega.x,
-  y: Theta.y,
-})
-
-let constrBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => Reducer(
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-)
-
-let genName = () => "Steve"
-
-@react.component
-let make = (~onChange: option<(. {"testing": bool}, array<string>) => unit>=?, children) => {
-  let doSomething = () =>
-    switch onChange {
-    | None => ()
-    | Some(onChange) => onChange(. {"testing": true}, ["hey"])
-    }
-  <input onChange={_ => doSomething()} />
-}
-
-let add = (a, b): int => a + b
-
-let add = (a, b): {"field1": int, "field2": string, "field3": int, "field4": int} => a + b
-let add = (superLongParameterName1, superLongParameterName2, superLongParameterName3): {
-  "field1": int,
-  "field2": string,
-  "field3": int,
-  "field4": int,
-} => a + b
-
-let add = (superLongParameterName1, superLongParameterName2, superLongParameterName3): {
-  "field1": int,
-  "field2": string,
-  "field3": int,
-  "field4": int,
-  "field5": int,
-} => a + b
-
-let add = ((a, b)): (int, string, int, int) => a + b
-let add = ((a, b)): (
-  intWithSuperLongName,
-  stringWithSuperLongName,
-  intWithSuperLongName,
-  intWithSuperLongName,
-) => a + b
-let add = ((
-  superLongParameterName,
-  bsuperLongParameterName,
-  superLongParameterName,
-  superLongParameterName,
-)): (intWithSuperLongName, stringWithSuperLongName, intWithSuperLongName, intWithSuperLongName) =>
-  a + b
-
-let add = (list{a, b}): list<
-  intWithSuperLongName,
-  stringWithSuperLongName,
-  intWithSuperLongName,
-  intWithSuperLongName,
-> => a + b
-let add = (list{
-  superLongParameterName,
-  bsuperLongParameterName,
-  superLongParameterName,
-  superLongParameterName,
-}): list<
-  intWithSuperLongName,
-  stringWithSuperLongName,
-  intWithSuperLongName,
-  intWithSuperLongName,
-> => a + b
-
-let add = ([a, b]): array<
-  intWithSuperLongName,
-  stringWithSuperLongName,
-  intWithSuperLongName,
-  intWithSuperLongName,
-> => a + b
-let add = ([
-  superLongParameterName,
-  bsuperLongParameterName,
-  superLongParameterName,
-  superLongParameterName,
-]): array<
-  intWithSuperLongName,
-  stringWithSuperLongName,
-  intWithSuperLongName,
-  intWithSuperLongName,
-> => a + b
-
-let add = ({x: superLongParameterName, y: superLongParameterName, z: superLongParameterName}) =>
-  x + y + z
-let add = ({x: superLongParameterName, y: superLongParameterName, z: superLongParameterName}) =>
-  x + y + z
-let add = ({
-  x: x as superLongParameterName,
-  y: y as superLongParameterName,
-  z: z as superLongParameterName,
-}) => x + y + z
-
-let add = (Color(superLongParameterName, superLongParameterName, superLongParameterNameeeeeee)) =>
-  x + y + z
-let add = (Color(
-  superLongParameterName,
-  superLongParameterName,
-  superLongParameterNameeeee,
-)): color<
-  superLongTypeIdent,
-  superLongType2,
-  anotherLongOne,
-  woooooooooooooooooooooooooooooooooooow,
-> => x + y + z
-
-let parseExceptionDef = (~attrs, p) => {
-  let startPos = p.Parser.startPos
-  Parser.expect(Token.Exception, p)
-  let (_, name, kind) = parseConstrDef(~parseAttrs=false, p)
-  let loc = mkLoc(startPos, p.prevEndPos)
-  Ast_helper.Te.constructor(~loc, ~attrs, name, kind)
-}
-
-and parseStructure = (p): Parsetree.structure =>
-  parseList(p, ~grammar=Grammar.Structure, ~f=parseStructureItem)
-
-and parseStructureItem = (_): Parsetree.structure_item => {
-  let startPos = p.Parser.startPos
-  let attrs = parseAttributes(p)
-  attrs
-}
-
-// block expressions should have braces on the same line as the =>
-let equals = (c1, c2) => {
-  open Float
-  c1.red->equals(c2.red) && c1.blue->equals(c2.blue) && c1.green->equals(c2.green)
-}
-
-let equals2 = (c1, c2) => {
-  module B = Belt
-  c1.red->equals(c2.red) && c1.blue->equals(c2.blue) && c1.green->equals(c2.green)
-}
-
-let equals3 = (c1, c2) => {
-  let a = 1
-  let b = 2
-  c1.red->equals(c2.red) && c1.blue->equals(c2.blue) && c1.green->equals(c2.green)
-}
-
-let equals4 = (c1, c2) => {
-  exception Foo
-  c1.red->equals(c2.red) && c1.blue->equals(c2.blue) && c1.green->equals(c2.green)
-}
-
-// ~d: e should stay ~d: e
-let a = (~b as c, ~d: e) => 1
-
-let f = list => list()
-let f = \"switch" => \"switch" + 20
-
-<div className="max-w-3xl mx-auto">
-  <CoursesReview__SubmissionsTab
-    updateSubmissionsCB={(~submissions, ~selectedTab, ~hasNextPage, ~totalCount, ~endCursor) =>
-      send(SetSubmissions(submissions, selectedTab, hasNextPage, endCursor, totalCount))}
-  />
-</div>
-
-let f = (~\"aria-b", ~\"aria-c") => {
-  Js.log(\"aria-b", \"aria-c")
-}
-
-let f = (~\"aria-b": string, ~\"aria-d" as \"aria-xyz") => {
-  Js.log(\"aria-b", \"aria-xyz")
-}
-
-let f = (type \"😎", x) => Js.log(x)
-
-let query = (~url, ()): (unit => unit) => {
-  () => Js.log("Queried " ++ url)
-}
-
-let query = (~url, ()): ((unit, unit) => unit) => {
-  ((), ()) => Js.log("Queried " ++ url)
-}
-
-let query = (~url, ()): ((unit, unit, unit) => unit) => {
-  ((), (), ()) => Js.log("Queried " ++ url)
-}
-
-let f = (. a) => (. b) => a + b
-let f = (. a, b) => (. b, c) => a + b + c + d
-let f = (. a, b) => (. b, c) => (. e, f, g) => a + b + c + d + e + f + g
diff --git a/jscomp/syntax/tests/printer/expr/expected/ident.res.txt b/jscomp/syntax/tests/printer/expr/expected/ident.res.txt
deleted file mode 100644
index 7233ec5..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/ident.res.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-let x = a
-
-let c = Configuration.config
-
-let x = @attr identifier
-
-let x = @attributeVeryLong @attributeVeryLong @attributeVeryLong @attributeVeryLong identifier
diff --git a/jscomp/syntax/tests/printer/expr/expected/if.res.txt b/jscomp/syntax/tests/printer/expr/expected/if.res.txt
deleted file mode 100644
index d7ed0b6..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/if.res.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-let name = if true {
-  user.name
-}
-
-let name = if true {
-  user.name
-} else {
-  "steve"
-}
-
-let name = if true {
-  user.name
-} else if false {
-  user.lastName
-} else {
-  defaultName
-}
-
-let () = if true {
-  let a = 1
-  let b = 2
-  open Belt
-  sideEffect()
-  ()
-} else {
-  let a = 5
-  let b = 6
-  open React
-  render()
-  ()
-}
-
-let x =
-  @attr
-  if truth {
-    sideEffect()
-  }
-
-if inclusions[index] = (uid, url) {
-  onChange(inclusions)
-}
-
-// Basic
-// if let Some(x) = foo() {
-// doSomethingWithX(x)
-// }
-
-// Else branch
-// if let Some(x) = foo(){
-// doSomethingWithX(x)
-// } else {
-// doSomethingElse()
-// }
-
-// Else-if support
-// if let Some(x) = foo(){
-// doSomethingWithX(x)
-// } else if let Some(y) = bar(){
-// doSomethingWithY(y)
-// } else {
-// doSomethingElse()
-// }
-
-// Mixed conditions, pattern start
-// if let Some(x) = foo(){
-// doSomethingWithX(x)
-// } else if n > 10 {
-// doSomethingWithForN()
-// } else {
-// doSomethingElse()
-// }
-
-// Mixed conditions, condition start
-// if n > 10 {
-// doSomethingWithForN()
-// } else if let Some(x) = foo() {
-// doSomethingWithX(x)
-// } else {
-// doSomethingElse()
-// }
-
-// Maintains attrs correctly
-// if n > 10 {
-// @aa
-// doSomethingWithForN()
-// } else if let @bb Some(@cc x) = @dd foo() {
-// @ee
-// doSomethingWithY(x)
-// } else {
-// @ff
-// doSomethingElse()
-// }
-
-// if let Some(x) = foo() {
-// doSomethingWithX(x)
-// } else if let Some(y) = bar() {
-// doSomethingWithY(y)
-// } else if let Some(z) = baz() {
-// doSomethingWithZ(z)
-// }
-
-// full destructuring
-// if let Some(Thing(With({
-// many: Internal([Components, q]),
-// }))) as p = foo() {
-// doSomethingWithE(e)
-// }
-
-// Assignment
-// let a = if let Some(x) = foo() {
-// x
-// } else {
-// 123
-// }
-
-// Nesting
-// let getZ = nested =>
-// if let Some(point) = nested.origin {
-// if let Some(z) = point.z {
-// z
-// } else {
-// 0
-// }
-// } else {
-// 0
-// }
-
-// Deep nesting
-// let getZ = nested =>
-// if let Some(nested) = nested.a {
-// if let Some(nested) = nested.b {
-// if let Some(nested) = nested.c {
-// if let Some(nested) = nested.d {
-// if let Some(nested) = nested.e {
-// if let Some(nested) = nested.f {
-// if let Some(nested) = nested.g {
-// z
-// } else {
-// 0
-// }
-// } else {
-// 0
-// }
-// } else if let Some(nested) = nested.g {
-// z
-// } else {
-// 0
-// }
-// } else {
-// a ? b : c
-// }
-// } else {
-// 0
-// }
-// } else {
-// 0
-// }
-// } else {
-// 0
-// }
-
-// Break testing
-// if let Some(suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName) = anotherSuuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName() {
-// foo()
-// }
-
-// if let Some(suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName) = anotherSuuuuuuuuuuuuuuuuuuuuuuuuuuuperLongNameanotherSuuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName(withSomeArgsThatAreAlsoLarge, withManyArgsThatAreAlsoLarge) {
-// foo()
-// }
-
-// if let { suuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName, suuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName2, suuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName3 } = buildMyRecord() {
-// foo()
-// }
-
-// Complex nesting
-// if let Some(Thing(With({many: Internal([Components, q])}))) as p = foo() {
-// if let Other(Thing(With({many: Internal([Components, q])}))) as p = foo() {
-// doSomethingElse(e)
-// }
-// doSomethingWithE(e)
-// } else if let Some(Thing(With({
-// many: Internal([Components, q]),
-// }))) as p = foo() {
-// doSomethingWithE(e)
-// } else if let Some(Thing(With({
-// many: Internal([Components, q]),
-// }))) as p = foo() {
-// doSomethingWithE(e)
-// }
-
-// Ternary
-// let a = b
-// ? if let Some(x) = foo() {
-// 1
-// } else {
-// 2
-// }
-// : 3
-
-// let a = b
-// ? 1
-// : if let Some(x) = foo() {
-// 1
-// } else {
-// 2
-// }
-
-// let a = b
-// ? if let Some(x) = foo() {
-// 1
-// } else {
-// 2
-// }
-// : if let Some(x) = foo() {
-// 1
-// } else {
-// 2
-// }
-
-// print parens correct
-// if let Some(x) = (3: option<int>) {
-// (x: int)
-// } else {
-// (20: int)
-// }
diff --git a/jscomp/syntax/tests/printer/expr/expected/jsObjectAccess.res.txt b/jscomp/syntax/tests/printer/expr/expected/jsObjectAccess.res.txt
deleted file mode 100644
index f5def0f..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/jsObjectAccess.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-let x = address["street"]
-let x = address["street"]["number"]
-let x = @attr address["street"]
-
-longEqualityExpression["someRecordField"] == wowThisDoesHaveToBePrettyLong["someRecordField"] &&
-  longEqualityExpression["someRecordField"] == wowThisDoesHaveToBePrettyLong["someRecordField"]
-
-let component = props["Component"]
diff --git a/jscomp/syntax/tests/printer/expr/expected/jsObjectSet.res.txt b/jscomp/syntax/tests/printer/expr/expected/jsObjectSet.res.txt
deleted file mode 100644
index d66f72b..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/jsObjectSet.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-address["street"] = "Brusselsestraat"
-address["street"] = newYork |> getExpensiveStreet
-
-let () = @attr address["street"] = "Brusselsestraat"
-let () = node["left"] = value |> process |> node["right"] = value |> process
-let () = (node["left"] = value |> process) |> node["right"] = value |> process
diff --git a/jscomp/syntax/tests/printer/expr/expected/jsx.res.txt b/jscomp/syntax/tests/printer/expr/expected/jsx.res.txt
deleted file mode 100644
index 8c689a8..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/jsx.res.txt
+++ /dev/null
@@ -1,462 +0,0 @@
-let x = <div className="container" className2="container2" className3="container3" onClick />
-let x = <Foo className="container" />
-let x = <Foo.Bar className="container" />
-let x = <Foo.Bar.Baz className="container" />
-let x = <Foo.bar className="container" />
-let x = <Foo.baz className="multiline" />
-let x = <custom-tag className="container" />
-let x = <Foo.custom-tag className="container" />
-
-// https://github.com/rescript-lang/syntax/issues/570
-let x =
-  <A>
-    <B>
-      <C>
-        <D />
-        <E />
-      </C>
-      <F>
-        <G />
-        <H />
-      </F>
-    </B>
-  </A>
-let x =
-  <A>
-    {children}
-    <B />
-  </A>
-let x =
-  <A>
-    <B />
-    {children}
-  </A>
-let x = <A> {a} </A>
-let x =
-  <A>
-    {a}
-    {b}
-  </A>
-let x =
-  <custom-tag className="container">
-    {a}
-    <B />
-  </custom-tag>
-let x =
-  <Foo.custom-tag className="container">
-    {a}
-    <B />
-  </Foo.custom-tag>
-
-let x = <div className="container" className2="container2" className3="container3" onClick />
-
-let nav =
-  <Nav isMobile={isMobile} fullScreen={!isMobile ? false : isOpen}>
-    <NavContent>
-      <WidescreenMenu
-        menuItems={props.items} trial={props.trial} user={props.user} viewer={props.viewer}
-      />
-    </NavContent>
-  </Nav>
-
-let nav2 =
-  <Nav isMobile={isMobile} fullScreen={!isMobile ? false : isOpen}>
-    <NavContent>
-      {switch isMobile {
-      | true =>
-        <MobileMenu
-          handleOpenToggle={_ => setOpen(open_ => !open_)}
-          menuItems={props.items}
-          isOpen={isOpen}
-          forceOpen={_ => setOpen(true)}
-          forceClose={_ => setOpen(false)}
-          user={props.user}
-        />
-
-      | false =>
-        <WidescreenMenu
-          menuItems={props.items} trial={props.trial} user={props.user} viewer={props.viewer}
-        />
-      }}
-    </NavContent>
-  </Nav>
-
-let nav3 =
-  <Nav isMobile={isMobile} fullScreen={!isMobile ? false : isOpen}>
-    <NavContent>
-      {isMobile
-        ? <MobileMenu
-            handleOpenToggle={_ => setOpen(open_ => !open_)}
-            menuItems={props.items}
-            isOpen={isOpen}
-            forceOpen={_ => setOpen(true)}
-            forceClose={_ => setOpen(false)}
-            user={props.user}
-          />
-        : <WidescreenMenu
-            menuItems={props.items} trial={props.trial} user={props.user} viewer={props.viewer}
-          />}
-    </NavContent>
-  </Nav>
-
-let avatarSection =
-  <>
-    <div style={{"zIndex": "1", "opacity": opacityUser}}>
-      <Avatar user={user} size={45} />
-    </div>
-    {user.email !== viewer.email
-      ? <div
-          style={{
-            "marginLeft": marginLeft + "em",
-            "opacity": opacityAdmin,
-            "zIndex": "0",
-            "cursor": "pointer",
-          }}
-          onMouseEnter={_ => setHoveringAdmin(true)}
-          onMouseLeave={_ => setHoveringAdmin(false)}
-          onClick={_e => {
-            stopImpersonating(csrfToken)
-          }}>
-          <Avatar user={viewer} size={45} />
-        </div>
-      : React.nullElement}
-  </>
-
-let x = <> </>
-
-let x =
-  <div
-    ident // punned
-    ?ident // punned optional
-    ident=?identifierExpr
-    ident=identifierExpr
-    constant="constant"
-    letExpr={
-      let a = 1
-      let b = 2
-      a + b
-    }
-    onClick={event => handleClick(event)}
-    onClick={(event1, event2, event3) => {
-      Js.log("debug click")
-      handleClick(event)
-    }}
-    onClick={(aaaaaaaaaaaaaaarg1, aaaaaaaaaaaaaaaaaaaaaaarg2, aaaaaaaaaaaaaaarg3) => {
-      sideEffect(aaaaaaaaaaaaaaarg1)
-      sideEffect(aaaaaaaaaaaaaaaaaaaaaaarg2)
-      sideEffect(aaaaaaaaaaaaaaarg3)
-    }}
-    apply={myFunction(x)}
-    applyWithDot={myFunction(. x)}
-    street={streets[0]}
-    binary={a + b}
-    int={-1}
-    float={-1.2}
-    matchExpression={switch color {
-    | Blue => "blue"
-    | Red => "red"
-    }}
-    tryExpression={try sideEffect() catch {
-    | Error => ()
-    }}
-    tuple=(a, b, c)
-    constr=Rgb(red, blue, green)
-    list1=list{}
-    list2=list{a, b}
-    list3=list{a, b, ...x}
-    array=[a, b, c]
-    record={x: 1, y: 2}
-    field=foo.bar
-    setField={user.name = "Steve"}
-    ifThenElse={if true {
-      ()
-    } else {
-      ()
-    }}
-    seq={
-      sideEffect1()
-      sideEffect2()
-    }
-    whileExpr={while true {
-      loop()
-    }}
-    forExpr={for i in 0 to 10 {
-      do(i)
-    }}
-    constraintExpr={(20: int)}
-    letModule={
-      module L = Log
-      L.log()
-    }
-    letException={
-      exception Exit
-      raise(Exit)
-    }
-    lazyExpr={lazy stuff()}
-    assertExpr={assert(true)}
-    pack=module(Foo)
-    pack={module(Foo)}
-    pack=module(Foo: Bar)
-    pack={module(Foo: Bar)}
-    openExpr={
-      open React
-      React.render()
-    }
-    extension=%raw("eval()")
-    jsObject={"x": 1, "y": 2}
-    withAttr={@attr foo}
-  />
-
-let x =
-  <div>
-    ident
-    "constant"
-    {
-      let a = 1
-      let b = 2
-      a + b
-    }
-    {event => handleClick(event)}
-    {(event1, event2, event3) => {
-      Js.log("debug click")
-      handleClick(event)
-    }}
-    {(aaaaaaaaaaaaaaarg1, aaaaaaaaaaaaaaaaaaaaaaarg2, aaaaaaaaaaaaaaarg3) => {
-      sideEffect(aaaaaaaaaaaaaaarg1)
-      sideEffect(aaaaaaaaaaaaaaaaaaaaaaarg2)
-      sideEffect(aaaaaaaaaaaaaaarg3)
-    }}
-    {myFunction(x)}
-    {myFunction(. x)}
-    {streets[0]}
-    {a + b}
-    {-1}
-    {-1.2}
-    {switch color {
-    | Blue => "blue"
-    | Red => "red"
-    }}
-    {try sideEffect() catch {
-    | Error => ()
-    }}
-    {(a, b, c)}
-    Rgb(red, blue, green)
-    list{}
-    list{a, b}
-    list{a, b, ...x}
-    [a, b, c]
-    {x: 1, y: 2}
-    foo.bar
-    {user.name = "Steve"}
-    {if true {
-      ()
-    } else {
-      ()
-    }}
-    {
-      sideEffect1()
-      sideEffect2()
-    }
-    {while true {
-      loop()
-    }}
-    {for i in 0 to 10 {
-      do(i)
-    }}
-    {(20: int)}
-    {
-      module L = Log
-      L.log()
-    }
-    {
-      exception Exit
-      raise(Exit)
-    }
-    {lazy stuff()}
-    {assert(true)}
-    {module(Foo)}
-    module(Foo)
-    {module(Foo: Bar)}
-    module(Foo: Bar)
-    {
-      open React
-      React.render()
-    }
-    %raw("eval()")
-    {"x": 1, "y": 2}
-    {@attr ident}
-  </div>
-
-let x = <MyComponent sidebar={<div> test </div>} nav={<Navbar />} />
-
-<div>
-  {possibleGradeValues
-  |> List.filter(g => g <= state.maxGrade)
-  |> List.map(possibleGradeValue =>
-    <option key={possibleGradeValue |> string_of_int} value={possibleGradeValue |> string_of_int}>
-      {possibleGradeValue |> string_of_int |> str}
-    </option>
-  )
-  |> Array.of_list
-  |> ReasonReact.array}
-</div>
-
-// https://github.com/rescript-lang/syntax/issues/113
-<div> {Js.log(a <= 10)} </div>
-<div>
-  <div> {Js.log(a <= 10)} </div>
-</div>
-<div>
-  <div onClick={_ => Js.log(a <= 10)}>
-    <div> {Js.log(a <= 10)} </div>
-  </div>
-</div>
-
-module App = {
-  @react.component
-  let make = () => {
-    <> 1 </>
-  }
-}
-
-module App = {
-  @react.component
-  let make = () => {
-    <>
-      <div />
-    </>
-  }
-}
-
-// leading line comment on rhs jsx prop should indent nicely
-<ContributorsRow
-  amount={
-    // ->BN.new_("86400")
-    // There are 86400 seconds in a day.
-    amount->BN.div(BN.new_("86400"))->BN.toString
-  }
-/>
-
-// leading line comment on rhs jsx prop should indent nicely
-<ContributorsRow
-  amount={
-    // There are 86400 seconds in a day.
-    compute(amount)
-  }
-/>
-
-// leading line comment on braced children should indent nicely
-<div>
-  {
-    // comment
-    content
-  }
-  {
-    // comment
-    if condition() {
-      renderBranch()
-    } else {
-      doSomeOtherThings()
-    }
-  }
-</div>
-
-<Animated> ...{x => <div />} </Animated>
-<div> ...c </div>
-
-<Animated initialValue=0.0 value>
-  ...{ReactDOMRe.Style.make(
-    ~width="20px",
-    ~height="20px",
-    ~borderRadius="100%",
-    ~backgroundColor="red",
-  )}
-</Animated>
-
-<Animated initialValue=0.0 value>
-  ...{value =>
-    <div
-      style={ReactDOMRe.Style.make(
-        ~width="20px",
-        ~height="20px",
-        ~borderRadius="100%",
-        ~backgroundColor="red",
-      )}
-    />}
-</Animated>
-
-<Animated initialValue=0.0 value>
-  ...{(value): ReasonReact.element =>
-    <div
-      style={ReactDOMRe.Style.make(
-        ~width="20px",
-        ~height="20px",
-        ~borderRadius="100%",
-        ~backgroundColor="red",
-      )}
-    />}
-</Animated>
-
-<Animated initialValue=0.0 value>
-  ...{value => {
-    let width = "20px"
-    let height = "20px"
-
-    <div
-      style={ReactDOMRe.Style.make(~width, ~height, ~borderRadius="100%", ~backgroundColor="red")}
-    />
-  }}
-</Animated>
-
-let v =
-  <A>
-    <B>
-      ...{_ => {
-        let renderX = x => {
-          let y = x ++ x
-          <div key=y />
-        }
-        renderX("foo")
-      }}
-    </B>
-  </A>
-
-let x = <A x="y" {...str} />
-
-// https://github.com/rescript-lang/rescript-compiler/issues/6002
-let x = props =>
-  <A
-    {...props}
-    className="inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight"
-  />
-
-let x = <C> ...{() => msg->React.string} </C>
-
-let x = <C> ...{array->Array.map(React.string)} </C>
-
-let x = <> {array->Array.map(React.string)} </>
-
-let x = {
-  let _ = <div />
-  msg->React.string
-}
-
-let x = {
-  let _ = <div> {children} </div>
-  msg->React.string
-}
-
-let x = {
-  let _ = <> {children} </>
-  msg->React.string
-}
-
-let x = {
-  let _ = <C />
-  msg->React.string
-}
-
-let x = {
-  let _ = <C> {children} </C>
-  msg->React.string
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/lazy.res.txt b/jscomp/syntax/tests/printer/expr/expected/lazy.res.txt
deleted file mode 100644
index ac1a44b..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/lazy.res.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-let x = lazy sideEffect
-
-// parens
-let x = lazy true
-let x = lazy 12
-let x = lazy (12: int)
-let x = lazy 12
-let x = lazy list{1, 2, ...x}
-let x = lazy module(Foo: Bar)
-let x = lazy module(Foo)
-let x = lazy Rgb(1, 2, 3)
-let x = lazy [a, b, c]
-let x = lazy {x: 1, y: 3}
-let x = lazy (1, 2, 3)
-let x = lazy %extension
-let x = lazy user.name
-let x = lazy streets[0]
-let x = lazy apply(arg1, arg2)
-let x = lazy apply(. arg1, arg2)
-let x = lazy -1
-let x = lazy !true
-let x = lazy (x => print(x))
-let x = lazy (
-  switch x {
-  | Blue => ()
-  | Yello => ()
-  }
-)
-
-let x = lazy (
-  for i in 0 to 10 {
-    print_int(i)
-  }
-)
-
-let x = lazy (
-  if i < 10 {
-    print_int(i)
-  } else {
-    print_int(1000)
-  }
-)
-
-let x = lazy (
-  while i < 10 {
-    print_int(i)
-  }
-)
-
-let x = lazy (assert(false))
-let x = lazy (
-  try sideEffect() catch {
-  | Exit => ()
-  }
-)
-
-let x = lazy (@attr expr)
-
-let x = lazy (a + b)
-
-let x = @attr lazy x
-
-let x = lazy street["number"]
-let x = lazy streets[0]
-
-lazy address["street"] = "Brusselsestraat"
-
-lazy (true ? 0 : 1)
diff --git a/jscomp/syntax/tests/printer/expr/expected/let.res.txt b/jscomp/syntax/tests/printer/expr/expected/let.res.txt
deleted file mode 100644
index 879efc2..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/let.res.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-let z = {
-  let a = 1
-  a
-}
-
-let x = {
-  let x = 1 and y = 2 and z = 3
-
-  let x = 1
-  and y = 2
-  and z = 3
-
-  let x = 1
-
-  and y = 2
-
-  and z = 3
-
-  x + y + z
-}
-
-let x = {
-  let a = true
-  let b = false
-  a || b
-}
-
-// don't add whitespace here
-let highlight_dumb = (ppf, lb, loc) => {
-  let line_start = ref(0)
-  and line_end = ref(0)
-  foo
-}
-
-// should contain a newline before foo
-let highlight_dumb = (ppf, lb, loc) => {
-  let line_start = ref(0)
-  and line_end = ref(0)
-
-  foo
-}
-
-let f = x => {
-  let a =
-    x
-    ->Js.Dict.get("wm-received")
-    ->Option.flatMap(Js.Json.decodeString)
-    ->Option.map(Js.Date.fromString)
-
-  let b =
-    x
-    ->Js.Dict.get("wm-property")
-    ->Option.flatMap(Js.Json.decodeString)
-    ->Option.flatMap(x =>
-      switch x {
-      | "like-of" => Some(#like)
-      | "repost-of" => Some(#repost)
-      | _ => None
-      }
-    )
-  (a, b)
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/letexception.res.txt b/jscomp/syntax/tests/printer/expr/expected/letexception.res.txt
deleted file mode 100644
index 848d033..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/letexception.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-let x = {
-  exception Foo
-  sideEffect
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/letmodule.res.txt b/jscomp/syntax/tests/printer/expr/expected/letmodule.res.txt
deleted file mode 100644
index 8063cdb..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/letmodule.res.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-let x = {
-  module M = ME
-  Me.x
-}
-
-let x = {
-  module M = await ME
-  M.x
-}
-
-let x = {
-  module M = await (ME: MT)
-  M.x
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/list.res.txt b/jscomp/syntax/tests/printer/expr/expected/list.res.txt
deleted file mode 100644
index a2d1b7a..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/list.res.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-let x = list{}
-let x = list{1}
-let x = list{1, 2}
-let x = list{1, 2, 3}
-let x = xs
-let x = list{1, ...xs}
-let x = list{xs, ...ys}
-let x = list{...xs, ...ys}
-let x = list{...xs, 1, ...ys}
-let x = list{1, 2, ...xs, 3, ...xs}
-let x = Belt.List.concatMany([list{1, 2, ...x}, [list{3, ...x}]])
-
-let x = list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-}
-
-let x = list{1, ...otherList}
-
-let x = list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  ...superLoooooooooooooooooooooooooooooongListHere,
-}
-
-let x = Belt.List.concatMany([
-  list{
-    superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-    superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-    ...superLoooooooooooooooooooooooooooooongListHere,
-  },
-  list{
-    superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-    ...superLoooooooooooooooooooooooooooooongListHere,
-  },
-])
-
-let x = list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  ...superLoooooooooooooooooooooooooooooongListHere,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  ...superLoooooooooooooooooooooooooooooongListHere,
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/nestedCallbacks.res.txt b/jscomp/syntax/tests/printer/expr/expected/nestedCallbacks.res.txt
deleted file mode 100644
index fb10bdb..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/nestedCallbacks.res.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-let foo = () =>
-  bar(x =>
-    bar(x =>
-      bar(
-        x =>
-          bar(
-            x =>
-              bar(
-                x =>
-                  bar(
-                    x =>
-                      bar(
-                        x =>
-                          bar(
-                            x =>
-                              bar(
-                                x =>
-                                  bar(
-                                    x =>
-                                      bar(
-                                        x =>
-                                          bar(
-                                            x =>
-                                              bar(
-                                                x =>
-                                                  bar(
-                                                    x =>
-                                                      bar(
-                                                        x =>
-                                                          bar(
-                                                            x =>
-                                                              bar(
-                                                                x =>
-                                                                  bar(
-                                                                    x =>
-                                                                      bar(
-                                                                        x =>
-                                                                          bar(
-                                                                            x =>
-                                                                              bar(x => bar(x => x)),
-                                                                          ),
-                                                                      ),
-                                                                  ),
-                                                              ),
-                                                          ),
-                                                      ),
-                                                  ),
-                                              ),
-                                          ),
-                                      ),
-                                  ),
-                              ),
-                          ),
-                      ),
-                  ),
-              ),
-          ),
-      )
-    )
-  )
diff --git a/jscomp/syntax/tests/printer/expr/expected/newtype.res.txt b/jscomp/syntax/tests/printer/expr/expected/newtype.res.txt
deleted file mode 100644
index 39dc430..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/newtype.res.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-let f = (type t, xs: list<t>) => ()
-let f = @attr (type t, xs: list<t>) => ()
-let f = (type t, xs: list<t>, type s, ys: list<s>) => ()
-let f = @attr (type t, xs: list<t>, @attr2 type s, ys: list<s>) => ()
-let f = (type t u v, xs: list<(t, u, v)>) => ()
-let f = @attr (type t u v, xs: list<(t, u, v)>) => ()
-let f = (type t u v, xs: list<(t, u, v)>, type s w z, ys: list<(s, w, z)>) => ()
-let f = @attr (type t u v, xs: list<(t, u, v)>, @attr2 type s w z, ys: list<(s, w, z)>) => ()
-let f = @attr
-(type t, @attr type s, xs: list<(t, s)>, @attr type u, @attr type v w, ys: list<(u, v, w)>) => ()
-
-let mk_formatting_gen:
-  type a b c d e f. formatting_gen<a, b, c, d, e, f> => Parsetree.expression =
-  fmting =>
-    switch fmting {
-    | Open_tag(Format(fmt', str')) => mk_constr("Open_tag", list{mk_format(fmt', str')})
-    }
-
-let cancel_and_collect_callbacks:
-   'a 'u 'c. (list<packed_callbacks>, promise<'a, 'u, 'c>) => list<packed_callbacks> =
-  (type x, callbacks_accumulator, p: promise<_, _, c>) => ()
diff --git a/jscomp/syntax/tests/printer/expr/expected/open.res.txt b/jscomp/syntax/tests/printer/expr/expected/open.res.txt
deleted file mode 100644
index 31ffdaa..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/open.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-let element = {
-  open React
-  element
-}
-
-let element = {
-  open! React
-  element
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/pipe.res.txt b/jscomp/syntax/tests/printer/expr/expected/pipe.res.txt
deleted file mode 100644
index a6ae377..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/pipe.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-let s1 = @ann (x->foo)
-let s1b = (@ann x)->foo
-
-let s2 = @ann (x |> foo)
-let s2b = (@ann x) |> foo
-
-let s3 = @ann (x ** foo)
-let s3b = (@ann x) ** foo
diff --git a/jscomp/syntax/tests/printer/expr/expected/polyvariant.res.txt b/jscomp/syntax/tests/printer/expr/expected/polyvariant.res.txt
deleted file mode 100644
index 51580eb..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/polyvariant.res.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-let r = #Reducer()
-let r = #Reducer(state, nexState, sideEffect)
-let r = #Reducer(
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-)
-let r = #Reducer([state, nexState, sideEffect])
-let r = #Reducer([
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-])
-
-let r = #Reducer({state: nextState, sideEffects: []})
-
-let c = #Constr({
-  firstField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  secondField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  thirdField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-})
-
-let forceBreak = #Cartesian({
-  x: Omega.x,
-  y: Theta.y,
-})
-
-let c = #Constr(list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  ...superLoooooooooooooooooooooooooooooongListHere,
-})
-
-let c = #Constr(list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-})
-
-let c = #ConstructorWithASuuuuuuuuuuuuuuuperLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer([])
-let c = #ConstructorWithASuuuuuuuuuuuuuuuperLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer(list{})
-
-let coordinate = #JsCoord({"x": 1, "y": 1})
-let user = #JsUser({
-  "name": "steve",
-  "age": 32,
-})
-
-let rec peekMinNode = node =>
-  switch node {
-  | #None => #None
-  | #Some(node) =>
-    if node.left === #None {
-      // this shouldn't break over multiple lines
-      #Some(node)
-    } else {
-      node.left->peekMinNode
-    }
-  }
-
-let rec peekMinNode = node =>
-  switch node {
-  | #None => #None
-  | #Some(node) =>
-    if node.left === #None {
-      // this shouldn't break over multiple lines
-      #MyConstructor(node, nodeLongIdentifiiiiieeeeeeer1, nodeLongIdentifiiiiieeeeeeer2)
-    } else {
-      node.left->peekMinNode
-    }
-  }
-
-let constructor = @attr #Blue
-
-let x = switch x {
-| #Bar =>
-  ReasonReact.UpdateWithSideEffects(
-    self => {
-      let _ = 1
-      apply(bar)
-    },
-  )
-| #Foo => ()
-}
-
-// tuple as single argument
-let x = #Some((1, 2))
-
-let math = if discriminant < 0. {
-  #None
-} else {
-  #Some((
-    (-.b -. Js.Math.sqrt(discriminant)) /. (2. *. a),
-    (-.b +. Js.Math.sqrt(discriminant)) /. (2. *. a),
-  ))
-}
-
-switch x {
-| #...typevar => 42
-}
-
-let r = #"Reducer⛪️"
-let r = #"type"(\"module", \"let")
-
-let r = #lident
-let r = #lident(a, b)
-let r = #"exotic lident"
-let r = #"exotic lident"(a, b)
-
-let x = #1
-let x = #123
-let x = #"10space"
-let x = #space10
-
-let a = #1
-let b = #"1a"
-let c = #a2
-let d = #abcd
-
-#BigBlue(#"Shade-of-blue+++", #"Shade-of-blue---")
-
-external openSync: (
-  path,
-  @string
-  [
-    | @as("r") #Read
-    | @as("r+") #Read_write
-    | @as("rs+") #Read_write_sync
-    | @as("w") #Write
-    | @as("wx") #Write_fail_if_exists
-    | @as("w+") #Write_read
-    | @as("wx+") #Write_read_fail_if_exists
-    | @as("a") #Append
-    | @as("ax") #Append_fail_if_exists
-    | @as("a+") #Append_read
-    | @as("ax+") #Append_read_fail_if_exists
-  ],
-) => unit = "openSync"
-
-let x = #a()
-let x = #a()
-
-let oneString = #1("payload")
-let twoIntString = #2(3, "payload")
diff --git a/jscomp/syntax/tests/printer/expr/expected/record.res.txt b/jscomp/syntax/tests/printer/expr/expected/record.res.txt
deleted file mode 100644
index 8b07a35..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/record.res.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-let coord = {x: 3.13, y: 3.14}
-let record = {
-  firstField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  secondField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  thirdField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-}
-
-let forceBreak = {
-  x: Omega.x,
-  y: Theta.y,
-}
-
-let withSpread = {...initialState, time: nextTime}
-let withSpreadAndForceBreak = {
-  ...initialState,
-  time: nextTime,
-}
-
-let withSpreadAndNaturalBreak = {
-  ...fields,
-  firstField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  secondField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  thirdField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-}
-
-let x = @attr {x: 1, y: 2}
-let x = @attr {...initialState, superLongName: 1, superLongName: 2, superLongName: 5}
-let x =
-  @attr {...initialState, superLongName: 1, superLongName: 2, superLongName: 5, superLongName: 20}
-
-// print parens around constrained expr in rhs
-let user = {name: (ceo.name: string)}
-// braces should be preserved on rhs
-let user = {name: {ceo.name}}
-let user = {
-  name: {
-    ceo.name
-  },
-}
-// braced + constrained expr
-let user = {name: {(ceo.name: string)}}
-
-// Punning
-let r = {a} // actually not a record, just an expression in braces
-let r = {a: a} // single-element record, not punned
-let r = {A.a: a} // single-element record, not punned
-let r = {a, b}
-let r = {a, b, c: 42}
-let r = {A.a, b}
-let r = {A.a, b}
-let r = {a, b}
-let r = {a, b}
-
-// Punning + comments
-let r = {
-  // a
-  a,
-  // b
-  b,
-}
-let r = {
-  a, // a
-  b, // b
-}
-let r = {
-  /* a */
-  a,
-  /* b */
-  b,
-}
-let r = {
-  a /* a */,
-  b /* b */,
-}
-let r = {a /* a */, b /* b */}
-
-let r = {x: ?None, y: ?None, z: ?(None: tt)}
-
-let z = name => {?name, x: 3}
-
-let z = name => {?name, x: 3}
-
-let z = name => {name, ?x}
-
-let zz = name => {name, ?x}
-
-let _ = switch z {
-| {x: ?None, y: ?None, z: ?(None: tt)} => 11
-| {?name, x: 3} => 42
-| {name: ?dd, x: 3} => 42
-| {x: ?None, y: ?None, z: ?(None: tt)} => 11
-| {?name, x: 3} => 42
-| {?name, x: 3} => 4242
-}
-
-type tt = {x: int, y?: string}
-
-type ttt = {x: int, y?: string}
-
-let optParen = {x: 3, y: ?(someBool ? Some("") : None)}
-let optParen = {x: 3, y: ?(3 + 4)}
-let optParen = {x: 3, y: ?foo(bar)}
-let optParen = {x: 3, y: ?foo->bar}
-let optParen = {x: 3, y: ?(() => 3)}
diff --git a/jscomp/syntax/tests/printer/expr/expected/sequence.res.txt b/jscomp/syntax/tests/printer/expr/expected/sequence.res.txt
deleted file mode 100644
index b515862..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/sequence.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-let () = {
-  foo()
-  bar()
-}
-
-let () = {
-  (foo(): unit)
-  (bar(): unit)
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/setfield.res.txt b/jscomp/syntax/tests/printer/expr/expected/setfield.res.txt
deleted file mode 100644
index c664720..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/setfield.res.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-user.name = "steve"
-config.shouldSkip =
-  !filePath.includes(allMlSuffixesCategory) && !filePath.endsWith(allScriptDirectoriesCategory)
-
-let () = @attr user.name = "steve"
-
-let () = @attr user.name = "steve" |> @attr user.name = "steve"
-
-user.name = steve["name"]
-user.address = addresses[2]
-
-(currentNode.parent->castNotOption).color = Black
-(isLeft ? node.left : node.right).color = Black
-
-// interpret strings correct
-dict["\n"] = dict2["\""]
diff --git a/jscomp/syntax/tests/printer/expr/expected/sideEffects.res.txt b/jscomp/syntax/tests/printer/expr/expected/sideEffects.res.txt
deleted file mode 100644
index 471ef9e..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/sideEffects.res.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-foo()
-bar()
-
-let () = {
-  foo()
-  bar()
-}
-
-let () = {
-  let x = 1
-  sideEffect()
-  let y = 2
-  sideEffect2()
-  let z = 3
-  sideEffect3()
-}
-
-while true {
-  sideEffect1()
-  let x = 1
-  sideEffect2()
-  let y = 2
-  sideEffect3()
-}
-
-switch color {
-| Blue =>
-  getResult()
-  sideEffect()
-  let x = 1
-  sideEffect2()
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/smartPipe.res.txt b/jscomp/syntax/tests/printer/expr/expected/smartPipe.res.txt
deleted file mode 100644
index 90b24b0..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/smartPipe.res.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-let myFunc = (strA, strB) => strA ++ strB
-
-"expr1"->myFunc("expr2")->myFunc("expr3")
-
-"expr1"
-->myFunc("expr2")
-->myFunc("expr3")
-
-"expr1"
-->myFunc("expr2")
-->myFunc("expr3")
-
-"expr1"
-->myFunc("expr2")
-->myFunc("expr3")
-->myFunc("expr4")
-
-myPromise->Promise.then(v => {
-  Js.log(v)
-  Promise.resolve(v)
-})
-
-myPromise->Promise.then(v => {
-  Js.log(v)
-  Promise.resolve(v)
-})
-
-let messages = React.useMemo(() =>
-  messagesById
-  ->StringMap.valuesToArray
-  ->Array.filter(ChatMessage.isVisibleInSimpleFilter)
-  ->Array.toSorted(ChatMessage.compareByDateAsc)
-, [messagesById])
-
-f->(v => g(x))->g
-
-f->v->g
-
-x->(v => g(x))->f->(v => g(x)->k)->g
-
-f->(v => g(x)->k->(x => s(x)))->g
diff --git a/jscomp/syntax/tests/printer/expr/expected/switch.res.txt b/jscomp/syntax/tests/printer/expr/expected/switch.res.txt
deleted file mode 100644
index da576e4..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/switch.res.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-switch x {
-| A => ()
-| B => ()
-}
-
-switch (a, b) {
-| (Some(a), Some(b)) => 42
-| _ => 3
-}
-
-let rec updateSum = (node, ~delta) =>
-  switch node {
-  | None => ()
-  | Some(node) =>
-    node.sum = node.sum +. delta
-    node.parent->updateSum(~delta)
-  }
-
-let x =
-  @attr
-  switch x {
-  | Universe => ()
-  }
-
-// #441 rescript format sometimes deletes comments
-switch count {
-// String in braces
-| 1 => "one"
-// Int in braces
-| 2 => 2
-// Float in braces
-| 3 => 3.
-// Bool in braces
-| 4 => true
-// Expression in braces
-| 5 => expr
-// Block
-| 6 => {
-    let _ = 123
-    Js.Console.log("Must be block")
-  }
-}
-
-switch route {
-| A =>
-  <div>
-    // div tag moves to the next line
-    <div> {React.string("First A div")} </div>
-    <div> {React.string("Second A div")} </div>
-  </div>
-| B =>
-  <>
-    // fragment tag moves to the next line
-    <div> {React.string("First B div")} </div>
-    <div> {React.string("Second B div")} </div>
-  </>
-}
-
-switch x {
-| A => {
-    let _ = 1
-    let _ = 2
-  } // no blank line below
-| B => ()
-}
diff --git a/jscomp/syntax/tests/printer/expr/expected/templateLiteral.res.txt b/jscomp/syntax/tests/printer/expr/expected/templateLiteral.res.txt
deleted file mode 100644
index f0085b2..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/templateLiteral.res.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-let y = `In winter the sky is never blue`
-let x = `firstname: ${user.firstName} lastname: ${user.lastName}.`
-let z = `${user.name} is his name`
-let o = `His name is ${user.name}`
-
-let s = `multi
-  line
-
-string
-`
-
-let s = `a \ b`
-let s = `a \\ b`
-let s = `a \\\ b`
-
-let s = `${foo}`
-
-let s = `before${foo}`
-let s = `before ${foo}`
-let s = `before  ${foo}`
-
-let s = `${foo}after`
-let s = `${foo} after`
-let s = `${foo}  after`
-
-let s = `${foo}${bar}`
-let s = `${foo}${bar}${baz}`
-
-let s = `${foo} ${bar}`
-let s = `${foo} ${bar} ${baz}`
-
-let s = ` before ${foo} ${bar} after `
-let s = `before ${foo} middle ${bar} ${baz} wow `
-
-let s = `
-  multiline
-
-  es6
-
-  template
-
-  expression
-
-  so convenient
-
-  :)
-          :D
-`
-
-let s = `$dollar without $braces $interpolation`
-
-let s = `${(s: string)}`
-
-// don't sugar to one single template literal, keep the concatenation
-`the sky` ++ `is blue`
-
-`my ${language.name} is ` ++ `Bond, ${jamesbond.firstName}.`
-`my ${language.name} is ` ++ `${jamesbond.lastName}. James Bond.`
-(`my ${language.name} is ` ++ `Bond, ${jamesbond.firstName}.`)->Js.log
-(`my ${name} is ` ++ `Bond`)->Js.log
-`my ${kitchen.quality} kitched` ++ ` is ${language.big} ` ++ ` of the ${kitchen.things}.`
-json`null`->Js.log
-a ++ ` x ` ++ b
-a ++ (` x ` ++ b)
-
-let x = json`null`
-
-let x = sql`select ${column} from ${table}`
-
-module X = %graphql("
-  query 123456789 {
-    x {
-      a
-      b
-      c
-      d
-      e
-    }
-  }
-")
-
-let cn = css`
-  display: block;
-  color: ${Color.text};
-  background-color: ${Color.bg};
-  border: 6px solid ${Color.Border.bg};
-  margin: ${1}px;
-  margin: ${1 + 2}px;
-  margin: ${1 * 2}px;
-  margin: ${1 + 2 / 3 + 4}px;
-  margin: ${1 * 2 / 3 + 4}px;
-  margin: ${1 - 2 / 3 * 4}px;
-  margin: ${1 / 2 + 3 * 4}px;
-  padding: ${Size.md}px;
-  padding: ${1 + Size.md}px;
-  padding: ${1.2 / Size.md}px;
-  padding: ${Size.md + 1 - 2.3 * pad / 4}px;
-`
-
-let box = css`
-  margin: ${ten()}px;
-  padding: ${pad}px;
-  border: 6px solid ${Color.Border.bg->Polished.lighten(0.3)};
-  background-color: ${Color.bg};
-  border-radius: ${Size.md / 2}px;
-`
-
-%graphql(`
-  fragment ActivityBefore_ActivityCategory on ActivityCategory
-  @argumentDefinitions(pixelRatio: {type: "Float!"}) {
-    id
-    title
-    description
-    icon(scaleFactor: $pixelRatio, width: 105, height: 100) {
-      url
-    }
-    iconDarkMode(scaleFactor: $pixelRatio, width: 105, height: 100) {
-      url
-    }
-  }
-`)
diff --git a/jscomp/syntax/tests/printer/expr/expected/ternary.res.txt b/jscomp/syntax/tests/printer/expr/expected/ternary.res.txt
deleted file mode 100644
index 21a26a3..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/ternary.res.txt
+++ /dev/null
@@ -1,264 +0,0 @@
-condition1 ? value1 : value2
-
-let x = condition1 ? value1 : value2
-
-let value = condition1 ? value1 : condition2 ? value2 : condition3 ? value3 : value4
-
-let paymentMessage = condition
-  ? "Payment completed successfully"
-  : state == "processing"
-  ? "Payment processing"
-  : state == "invalid_cvc"
-  ? "There was an issue with your CVC number"
-  : state == "invalid_expiry"
-  ? "Expiry must be sometime in the past."
-  : "There was an issue with the payment.  Please contact support."
-
-let paymentMessage =
-  state == "success"
-    ? "Payment completed successfully"
-    : state == "processing"
-    ? "Payment processing"
-    : state == "invalid_cvc"
-    ? "There was an issue with your CVC number"
-    : state == "invalid_expiry"
-    ? "Expiry must be sometime in the past."
-    : "There was an issue with the payment.  Please contact support."
-
-let record = truth ? {x: 1, y: 2} : {x: 3, y: 5}
-let record = truth
-  ? {
-      thisIsASuperLongFieldHere: loooooooooooooongIdentifier,
-      anotherLongField: superLoooooooooooooooooongIdentifier,
-    }
-  : {
-      thisIsASuperLongFieldHere: loooooooooooooongIdentifier,
-      anotherLongField: superLoooooooooooooooooongIdentifier,
-    }
-
-let arr = truth ? [1, 2, 3, 4] : [4, 5, 6, 7]
-let arr = truth
-  ? [
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    ]
-  : [
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    ]
-
-let lst = truth ? list{1, 2, 3, 4} : list{4, 5, 6, 7}
-let lst = truth
-  ? list{
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    }
-  : list{
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    }
-
-let construct = truth ? Constructor(1, 2, 3, 4) : Constructor(4, 5, 6, 7)
-let construct = truth
-  ? Constructor(
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    )
-  : Constructor(
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    )
-
-let x = truth
-  ? {
-      let a = 1
-      let b = 2
-      a + b
-    }
-  : {
-      let a = 1
-      let b = 2
-      a + b
-    }
-let x = truth
-  ? {
-      let a = 1
-      let b = 2
-      a + b
-    }
-  : {
-      let a = 1
-      let b = 2
-      a + b
-    }
-
-let x = truth ? create(a, b) : create(b, c)
-let x = truth
-  ? create(
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    )
-  : create(
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    )
-let x = truth ? create(. a, b) : create(. b, c)
-let x = truth
-  ? create(.
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    )
-  : create(.
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    )
-
-let street = newYork ? streets[0] : streets[20]
-let street = newYork ? thisIsASuperLongIdentifieeeeeeeer[0] : thisIsASuperLongIdentifieeeeeeeer[20]
-
-let x = isNegative ? -x : y
-
-let x = isGreater ? a + b : z - c
-let x = isGreater ? thisIsASuperLongIdentifieeeeeeeer + 20 : thisIsASuperLongIdentifieeeeeeeer + 200
-
-let x = isColor
-  ? switch color {
-    | Blue => ()
-    | Red => ()
-    }
-  : switch color {
-    | Blue => ()
-    | Red => ()
-    }
-
-let x = exceptionLike
-  ? try dangerousThing() catch {
-    | Exit => ()
-    }
-  : try dangerousThing() catch {
-    | Exit => ()
-    }
-
-let tuple = truth ? (1, 2, 3, 4) : (4, 5, 6, 7)
-let tuple = truth
-  ? (
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    )
-  : (
-      thisIsASuperLongIdentifieeeeeeeer,
-      thisIsASuperLongIdentifieeeeeeeer2,
-      thisIsASuperLongIdentifieeeeeeeer3,
-    )
-
-let x = condition1 ? node.left : node.right
-let x = condition1
-  ? nodeWithVeryLooooooooooooooooongNameHere.left
-  : nodeWithVeryLooooooooooooooooongNameHere.right
-
-let x = condition ? node.left = Some(newNode) : node.right = Some(newNode)
-let x = condition1
-  ? nodeWithVeryLooooooooooooooooongNameHere.left = Some(newNode)
-  : nodeWithVeryLooooooooooooooooongNameHere.right = Some(newNode)
-
-let x = condition1
-  ? if true {
-      ()
-    } else {
-      ()
-    }
-  : if true {
-      ()
-    } else {
-      ()
-    }
-let () = condition1
-  ? {
-      sideEffect()
-      sideEffect2()
-    }
-  : {
-      sideEffect()
-      sideEffect2()
-    }
-
-let () = condition1
-  ? while true {
-      doThing()
-    }
-  : while true {
-      doOtherThing()
-    }
-let () = condition1
-  ? for i in 0 to 10 {
-      ()
-    }
-  : for i in 10 to 20 {
-      ()
-    }
-
-let () = (truth: bool) ? (10: int) : (20: int)
-
-let () = condition
-  ? {
-      module L = Logger
-      L.log()
-    }
-  : {
-      exception Exit
-      raise(Exit)
-    }
-let () = condition ? lazy foo() : assert(false)
-
-let x = condition ? module(Foo) : module(Int: Number)
-let x = condition
-  ? module(ModuleWithVeryLooooooooooooooooongNameHere)
-  : module(ModuleWithVeryLooooooooooooooooongNameHereInt: Number)
-
-let x = condition
-  ? {
-      open React
-      render()
-    }
-  : {
-      open React
-      render()
-    }
-let x = condition ? %eval("console.log") : %eval("console.err")
-let x = condition ? %eval("consoooooooooooooooooooooole.log") : %eval("consoleeeeeeeeeeeeeee.err")
-
-let jsObj = condition ? {"x": 1, "y": 2} : {"x": 20, "y": 100}
-let jsObj = truth
-  ? {
-      "thisIsASuperLongFieldHere": loooooooooooooongIdentifier,
-      "anotherLongField": superLoooooooooooooooooongIdentifier,
-    }
-  : {
-      "thisIsASuperLongFieldHere": loooooooooooooongIdentifier,
-      "anotherLongField": superLoooooooooooooooooongIdentifier,
-    }
-
-let f = isPositive ? x => x + 1 : y => y - 1
-let f = isPositive ? ((a, b): int => a + b) : ((c, d): int => c - d)
-let f = isPositive ? ((a, b): int => a + b) : ((c, d): int => c - d)
-
-a => a ? () => {a} : () => {a}
-a => a ? a : a
-a => a ? aasdasdasdasdasdasdaaasdasdasdasdasdasdasdasdasdasdasdasdasdaaaaaaaaa : a
-
-let x = @attrOnTernary (truth ? true : false)
-let x = @attrOnCondition truth ? true : false
-
-x ? y => () : onChange
-let y = <input value onChange={x ? _ => () : onChange} />
diff --git a/jscomp/syntax/tests/printer/expr/expected/try.res.txt b/jscomp/syntax/tests/printer/expr/expected/try.res.txt
deleted file mode 100644
index b880ec0..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/try.res.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-try {
-  let x = 1
-  let y = 2
-  dangerousCall()
-} catch {
-| Foo => Js.log()
-| Exit => Js.log()
-}
-
-try myDangerousFn() catch {
-| Foo => Js.log()
-}
-
-let x = {
-  let y = 1
-  try {
-    apply()
-  } catch {
-  | _ => 2
-  }
-}
-
-@attr @attr2
-try myDangerousFn() catch {
-| Foo => Js.log()
-}
-
-let () =
-  @attr @attr2
-  try myDangerousFn() catch {
-  | Foo => Js.log()
-  }
diff --git a/jscomp/syntax/tests/printer/expr/expected/tuple.res.txt b/jscomp/syntax/tests/printer/expr/expected/tuple.res.txt
deleted file mode 100644
index 531d8a6..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/tuple.res.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-let x = (1, 2, 3)
-
-let x = (
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-)
-
-let x =
-  @attr
-  (
-    superLongNameThatWillBreak,
-    superLongNameThatWillBreak,
-    superLongNameThatWillBreak,
-    superLongNameThatWillBreak,
-    superLongNameThatWillBreak,
-    superLongNameThatWillBreak,
-  )
diff --git a/jscomp/syntax/tests/printer/expr/expected/unary.res.txt b/jscomp/syntax/tests/printer/expr/expected/unary.res.txt
deleted file mode 100644
index 714deac..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/unary.res.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-let x = -a
-let x = -.a
-let x = !a
-
-let isMale = !user["female"]
-
-!(!a)
-!(!(!a))
-!(a |> f(b))
-
--1->add
--1->add
--(1->add)
-!foo->print_bool
-!foo->print_bool
-!(foo->parseTruth)
-
-node.left->peekMinNode
-// same as the above
-node.left->peekMinNode
-
-// field access has higher precedence than unary -
-let x = -a.bar
-// same as above
-let x = -a.bar
-
-!(lazy x)
-lazy !x
-!(assert(x))
-assert(!x)
-!(@attr expr)
-!(arg => doStuffWith(arg))
-let x = !(truth: bool)
-let x = (!truth: bool)
-
-let z = !(%extension)
-// (!x.left) = value -> this does not parse, lhs of Pexp_setfield can't be a unary expression?
--[a, b, c]
-!module(Foo: Bar)
-!module(Foo)
-let x = -apply(arg)
-let x = -apply(. arg)
-let x = -Foo(a, b, c)
-let x = -{x: 1, y: 2}
-let x = -list{1, 2, 3}
-let x = -(
-  if true {
-    1
-  } else {
-    2
-  }
-)
-let x = -(
-  for i in 0 to 10 {
-    ()
-  }
-)
-let x = -(
-  switch x {
-  | Foo => 1
-  }
-)
-let x = -(
-  while i < 10 {
-    i.contents = 20
-  }
-)
-let x = -(1, 2, 3)
-let x = -{
-  let a = 1
-  let b = 2
-  a + b
-}
-let x = -{
-  sideEffect()
-  generateNumber()
-}
-
--(true ? 0 : 1)
-
-let () = {
-  getResult()
-  -10
-}
-
-let x = (!truths)[0]
-(!streets)[0] = "foo-street"
-
-!(arg => doStuffWith(arg))
diff --git a/jscomp/syntax/tests/printer/expr/expected/underscoreApply.res.txt b/jscomp/syntax/tests/printer/expr/expected/underscoreApply.res.txt
deleted file mode 100644
index 38d4624..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/underscoreApply.res.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-let x = f(a, _, c)
-let x = f(a, g(x, _, z), _)
-let x = f(_, x, c)
-let x = f(_, _, _)
-let x = f(g(_))
-let x = f(~a=1, ~b=_, ~c=2)
-let x = f(~a=_, ~b=_, ~c=_)
-let x = f(~a=_, ~b=_, ~c=g(~x=2, ~y=_, ~z=_))
-
-let nested = x => List.length(_)
-let nested2 = (x, y, z) => List.length(_)
-
-let l = [1, 2, 3] |> List.map(i => i + 1, _) |> List.filter(i => i > 0, _)
-
-let l = (i => i + 1) |> List.map(_, [1, 2, 3])
-
-let x = List.length(_)
-
-let incr = (~v) => v + 1
-
-let l1 = [1, 2, 3] |> List.map(incr(~v=_)) |> List.length
-
-let l2 = [1, 2, 3] |> List.map(incr(~v=_)) |> List.length
-
-let optParam = (~v=?, ()) => v == None ? 0 : 1
-
-let l1 = [Some(1), None, Some(2)] |> List.map(optParam(~v=?_, ())) |> List.length
-
-let l2 = [Some(1), None, Some(2)] |> List.map(optParam(~v=?_, ())) |> List.length
-
-// callback in last position
-f(a, b, (a, b) => List.length(_))
-// callback in first position
-f((a, b) => List.length(_), a, b)
-
-f(a, b, _)(x, y)
--f(a, b, _)
-f(a, b, _) + g(x, _, z)
-f(a, b, _) + g(x, _, z) + h(alpha, beta, _)
-
-assert(f(a, b, _))
-lazy f(a, b, _)
-
-getDirector(a, b, _).name
-
-f(a, b, _) ? g(x, y, _) : h(alpha, beta, _)
-
-<div onClick={f(a, b, _)} />
-<div> {f(a, b, _)} </div>
-
-f(a, b, _)[ix]
-f(a, b, _)[ix] = 2
-
-getDirector(a, b, _).name = "Steve"
-
-filterNone |> Array.get(_, 0)
-filterNone->Array.get(_, 0)
-Array.get(_, 0)
-1 + Array.get(_, 0)
-Array.get(_, 1) + Array.get(_, 0)
-let f = Array.get(_, 0)
-
-let photo = pricedRoom["room"]["photos"] |> filterNone |> Array.get(_, 0)
-
-underscoreWithComments(// Comment 1
-x => {
-  // Comment 2
-  something()
-}, _)
diff --git a/jscomp/syntax/tests/printer/expr/expected/while.res.txt b/jscomp/syntax/tests/printer/expr/expected/while.res.txt
deleted file mode 100644
index 8db23ce..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/while.res.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-let () = while true {
-  ()
-}
-
-while true {
-  let a = 1
-  let b = 2
-  infiniteLoop()
-  ()
-}
-
-// adds parens when condition breaks over multiple lines
-while continuePrefix.contents && aPrefixLen.contents <= aLen && bPrefixLen.contents <= bLen {
-  let nextNonwhiteA = nextNonWhiteChar(aStr, 1, aPrefixLen.contents - 1)
-  let nextNonwhiteB = nextNonWhiteChar(bStr, 1, bPrefixLen.contents - 1)
-}
-
-let x =
-  @attr
-  while true {
-    break()
-  }
diff --git a/jscomp/syntax/tests/printer/expr/expected/whitespace.res.txt b/jscomp/syntax/tests/printer/expr/expected/whitespace.res.txt
deleted file mode 100644
index 86674ce..0000000
--- a/jscomp/syntax/tests/printer/expr/expected/whitespace.res.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-let x = {
-  let a = 1
-  let b = 2
-  sideEffect()
-  sideEffect2()
-}
-
-let x = {
-  let a = 1
-
-  let b = 2
-
-  a + b
-}
-
-let x = {
-  exception Exit
-
-  exception Terminate
-
-  module B = Belt
-
-  sideEffect()
-
-  open React
-
-  sideEffect2()
-}
-
-let x = {
-  exception Exit
-  exception Terminate
-  module B = Belt
-  sideEffect()
-  open React
-  sideEffect2()
-}
diff --git a/jscomp/syntax/tests/printer/expr/extension.res b/jscomp/syntax/tests/printer/expr/extension.res
deleted file mode 100644
index 12e8189..0000000
--- a/jscomp/syntax/tests/printer/expr/extension.res
+++ /dev/null
@@ -1,26 +0,0 @@
-let x = %eval
-let node = %raw("0")
-let node = %raw(@attr "0")
-let node = %raw(@attrStructureLvl (@attrOnExpr "0"))
-
-let node = %raw(@attrStructureLvl @attrStructureLvl2 @attrStructureLvl3 (@attrOnExpr "0"))
-let node = %raw(
-  @attrStructureLvl @attrStructureLvl2 @attrStructureLvl3
-  (
-    @attrOnExpr @attrOnExpr2 @attrOnExpr3 @attrOnExpr4 @attrOnExpr5
-    "unsafe raw js"
-  )
-)
-let f: (int, int) => int = %raw((a, b) => "{return a + b}");
-
-let f = (x, y) => {
-  %debugger
-  x + y
-}
-
-switch %external(__DEV__) {
-| Some(_) => Js.log("dev mode")
-| None => Js.log("production mode")
-}
-
-let node = @attr %raw("0")
diff --git a/jscomp/syntax/tests/printer/expr/field.res b/jscomp/syntax/tests/printer/expr/field.res
deleted file mode 100644
index 918f7c0..0000000
--- a/jscomp/syntax/tests/printer/expr/field.res
+++ /dev/null
@@ -1,55 +0,0 @@
-let n = user.name
-
-(currentNode.parent->castNotOption).color
-
-let x = -a.bar
-
-
-let x = true.x
-let x = (12: int).x
-let x = list{1, 2, ...x}.x
-let x = module(Foo: Bar).x
-let x = module(Foo).x
-let x = Rgb(1, 2, 3).x
-let x = [a, b, c].x
-let x = {x: 1, y: 3}.x
-let x = (1, 2, 3).x
-let x = (%extension).x
-let x = user.name.last
-let x = streets[0].house
-let x = apply(arg1, arg2).field
-let x = apply(. arg1, arg2).field
-let x = (-1).x
-let x = (!true).x
-let x = (x => print(x)).x
-let x = (switch x {
-  | Blue => ()
-  | Yello => ()
-}).x
-
-let x = (for i in 0 to 10 {
-  print_int(i)
-}).x
-
-let x = (if i < 10 {
-  print_int(i)
-} else {
-  print_int(1000)
-}).x
-
-let x = (while i < 10 {
-  print_int(i)
-}).x
-
-let x = (assert(false)).x
-let x = (lazy false).x
-let x = (try sideEffect() catch {| Exit => ()}).x
-
-let x = (@attr expr).x
-
-let x = (a + b).x
-
-let x = @attr user.name
-let x = (isLeft ? node.left : node.right).color
-let x = (@attrOnTernary (isLeft ? node.left : node.right)).color
-
diff --git a/jscomp/syntax/tests/printer/expr/firstClassModule.res b/jscomp/syntax/tests/printer/expr/firstClassModule.res
deleted file mode 100644
index ed6d576..0000000
--- a/jscomp/syntax/tests/printer/expr/firstClassModule.res
+++ /dev/null
@@ -1,43 +0,0 @@
-module(Three)
-module(Three: X_int)
-
-let three = module(Three: X_int)
-let three = module(Three)
-
-let x = @attr module(Foo)
-let x = @attr module(Foo: FirstClass)
-
-module(Teenager)[0]
-module(Teenager)->age->Js.log
-module(Teenager)[0]->Js.log
-module(Teenager)->age->isAdult ? Js.log("has responsibilities")  : Js.log("can play in the playground")
-module(Streets)[0]->isExpensive ? Js.log("big money") : Js.log("affordable")
-
-
-let () = {
-  module(Teenager)->age->Js.log
-}
-let () = {
-  module(Teenager)[0]
-}
-let () = {
-  module(Teenager)->age->isAdult ? Js.log("has responsibilities")  : Js.log("can play in the playground")
-}
-let () = {
-  module(Streets)[0]->isExpensive ? Js.log("big money") : Js.log("affordable")
-}
-
-let () = {
-  let a = 1
-  let b = 2
-  module(Teenager)[0]
-  module(Teenager)->age->Js.log
-}
-
-
-let () = {
-  let a = 1
-  let b = 2
-  module(Teenager)->age->Js.log
-  module(Teenager)[0]->age->isAdult ? Js.log("has responsibilities")  : Js.log("can play in the playground")
-}
diff --git a/jscomp/syntax/tests/printer/expr/for.res b/jscomp/syntax/tests/printer/expr/for.res
deleted file mode 100644
index 5aef955..0000000
--- a/jscomp/syntax/tests/printer/expr/for.res
+++ /dev/null
@@ -1,11 +0,0 @@
-let () = for i in 0 to 10 {
-  ()
-}
-
-for i in 0 to 10 {
-  let a = 1
-  let b = 2
-  sideEffect()
-}
-
-let x = @attr for i in 0 to 10 { () }
diff --git a/jscomp/syntax/tests/printer/expr/fun.res b/jscomp/syntax/tests/printer/expr/fun.res
deleted file mode 100644
index 2c5c500..0000000
--- a/jscomp/syntax/tests/printer/expr/fun.res
+++ /dev/null
@@ -1,299 +0,0 @@
-let f = (a, b) => ()
-let greet = (~person, ~from as hometown) => ()
-let greet = (~person="Steve", ~from as hometown="Cupertino") => ()
-
-let onChangedVisible = (
-  ~anchor=None,
-  rbt,
-  ~oldNewVisible,
-  ~top as top_,
-  ~bottom as bottom_,
-  ~appear,
-  ~remained,
-  ~disappear,
-) => () 
-
-let greet = (~person, ~from as hometown) => superLongIdentifiiiiiieeeeeeerExpression()
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown
-) => superLongIdentifiiiiiieeeeeeerExpression()
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown
-) => superLongIdentislkdjflksjdfljslkjdflksjdklfjlskdjfklffiiiiiieeeeeeerExpression()
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown
-) => superLongIdentier
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown
-) => superLongIdentislkdjflksjdfljslkjdflksjdklfjlskdjfklffiiiiiieeeeeeerExpression
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown
-) => SuperLongConstructorrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
-
-let greet = (
-  ~person,
-  ~superLongIdentifiiiiiieeeeeeer as pat,
-  ~superLongIdentifiiiiiieeeeeeer2 as pat2,
-  ~from as hometown
-) => SuperLongConstructorrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr
-
-let f = () => ()
-let f = a => ()
-let f = _ => ()
-
-let f = (~a=?) => ()
-let f = (~from as hometown=?) => ()
-
-let f = (. a) => ()
-let f = (. a, b) => ()
-let f = (. ()) => ()
-
-let f = @attr (a, b) => @attr2 (c, d) => ()
-let f = @attr (@attrOnA a, @attrOnB b) => @attr2 (@attrOnC c, @attrOnD d) => ()
-let f = @attr (. a, b) => @attr2 (. c, d) => ()
-
-let f = (@attr ~a, @attr ~b) => ()
-let f = (. @attr ~a, . @attr ~b) => ()
-
-let f = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => ()
-
-let coordBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => {x: 1, y: 2}
-
-let coordBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => {x: 1, y: 2}
-
-let recordBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => {...fields, firstField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, secondField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, thirdField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer}
-
-let arrayBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => [1, 2, 3, 4]
-
-let arrayBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => [
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-]
-
-let tupleBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => (1, 2, 3)
-
-let tupleBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => (
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-)
-
-let constrBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => Cartesian({
-  x: Omega.x,
-  y: Theta.y
-})
-
-let constrBuilder = (
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-  thisIsAVeryLongNaaaaaaaaaaaaaaaaaaameeeeeeeeeeeee,
-) => Reducer(superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, superLongIdentiiiiiiiifffffffiiiiieeeeeeeer)
-
-let genName = () => "Steve"
-
-@react.component
-let make = (
-      ~onChange: option<(. { "testing": bool}, array<string>) => unit>=?,
-      children,
-    ) => {
-  let doSomething = () =>
-    switch (onChange) {
-    | None => ()
-    | Some(onChange) => onChange(. {"testing": true}, ["hey"])
-    };
-  <input onChange={_ => doSomething()} />;
-};
-
-let add = (a, b): int => a + b
-
-let add = (a, b): {"field1": int, "field2": string, "field3": int, "field4": int}  => a + b
-let add = (superLongParameterName1, superLongParameterName2, superLongParameterName3): {"field1": int, "field2": string, "field3": int, "field4": int}  => a + b
-
-let add = (superLongParameterName1, superLongParameterName2, superLongParameterName3): {
-  "field1": int,
-  "field2": string,
-  "field3": int,
-  "field4": int,
-  "field5": int,
-  }  => a + b
-
-let add = ((a, b)): (int, string, int, int)  => a + b
-let add = ((a, b)): (intWithSuperLongName, stringWithSuperLongName, intWithSuperLongName, intWithSuperLongName)  => a + b
-let add = ((superLongParameterName, bsuperLongParameterName, superLongParameterName, superLongParameterName)): (intWithSuperLongName, stringWithSuperLongName, intWithSuperLongName, intWithSuperLongName)  => a + b
-
-let add = (list{a, b}): list<intWithSuperLongName, stringWithSuperLongName, intWithSuperLongName, intWithSuperLongName>  => a + b
-let add = (list{superLongParameterName, bsuperLongParameterName, superLongParameterName, superLongParameterName}): list<intWithSuperLongName, stringWithSuperLongName, intWithSuperLongName, intWithSuperLongName>  => a + b
-
-let add = ([a, b]): array<intWithSuperLongName, stringWithSuperLongName, intWithSuperLongName, intWithSuperLongName>  => a + b
-let add = ([superLongParameterName, bsuperLongParameterName, superLongParameterName, superLongParameterName]): array<intWithSuperLongName, stringWithSuperLongName, intWithSuperLongName, intWithSuperLongName>  => a + b
-
-let add = ({x: superLongParameterName, y: superLongParameterName, z: superLongParameterName}) => x + y + z
-let add = ({x: superLongParameterName, y: superLongParameterName, z: superLongParameterName}) => x + y + z
-let add = ({x: x as superLongParameterName, y: y as superLongParameterName, z: z as superLongParameterName}) => x + y + z
-
-
-let add = (Color(superLongParameterName, superLongParameterName, superLongParameterNameeeeeee)) => x + y + z
-let add = (Color(superLongParameterName, superLongParameterName, superLongParameterNameeeee)) : color<superLongTypeIdent, superLongType2, anotherLongOne, woooooooooooooooooooooooooooooooooooow> => x + y + z
-
-let parseExceptionDef = (~attrs, p) => {
-  let startPos = p.Parser.startPos
-  Parser.expect(Token.Exception, p)
-  let (_, name, kind) = parseConstrDef(~parseAttrs=false, p)
-  let loc = mkLoc(startPos, p.prevEndPos)
-  Ast_helper.Te.constructor(~loc, ~attrs, name, kind)
-}
-
-and parseStructure = (p): Parsetree.structure =>
-  parseList(p, ~grammar=Grammar.Structure, ~f=parseStructureItem)
-
-and parseStructureItem = (_): Parsetree.structure_item => {
-  let startPos = p.Parser.startPos
-  let attrs = parseAttributes(p)
-  attrs
-}
-
-// block expressions should have braces on the same line as the =>
-let equals = (c1, c2) => {
-  open Float
-  c1.red->equals(c2.red) &&
-  c1.blue->equals(c2.blue) &&
-  c1.green->equals(c2.green)
-}
-
-let equals2 = (c1, c2) => {
-  module B = Belt
-  c1.red->equals(c2.red) &&
-  c1.blue->equals(c2.blue) &&
-  c1.green->equals(c2.green)
-}
-
-let equals3 = (c1, c2) => {
-  let a = 1
-  let b = 2
-  c1.red->equals(c2.red) &&
-  c1.blue->equals(c2.blue) &&
-  c1.green->equals(c2.green)
-}
-
-let equals4 = (c1, c2) => {
-  exception Foo
-  c1.red->equals(c2.red) &&
-  c1.blue->equals(c2.blue) &&
-  c1.green->equals(c2.green)
-}
-
-// ~d: e should stay ~d: e
-let a = (~b as c, ~d: e) => 1
-
-let f = list => list()
-let f = \"switch" => \"switch" + 20 
-
-<div className="max-w-3xl mx-auto">
-  <CoursesReview__SubmissionsTab
-    updateSubmissionsCB={(~submissions, ~selectedTab, ~hasNextPage, ~totalCount, ~endCursor) =>
-      send(SetSubmissions(submissions, selectedTab, hasNextPage, endCursor, totalCount))}
-  />
-</div>
-
-let f = (~\"aria-b", ~\"aria-c") => {
-  Js.log(\"aria-b", \"aria-c")
-}
-
-let f = (~\"aria-b": string, ~\"aria-d" as \"aria-xyz" ) => {
-  Js.log(\"aria-b", \"aria-xyz")
-}
-
-let f = (type \"😎", x) => Js.log(x)
-
-let query = (~url, ()): (unit => unit) => {
-  () => Js.log("Queried " ++ url)
-}
-
-let query = (~url, ()): (unit => unit => unit) => {
-  () => () => Js.log("Queried " ++ url)
-}
-
-let query = (~url, ()): (unit => unit => unit => unit) => {
-  () => () => () => Js.log("Queried " ++ url)
-}
-
-let f = (. a) => (. b) => a + b
-let f = (. a, b) => (. b, c) => a + b + c + d
-let f = (. a, b) => (. b , c) => (. e , f, g) => a + b + c + d  + e + f + g
diff --git a/jscomp/syntax/tests/printer/expr/ident.res b/jscomp/syntax/tests/printer/expr/ident.res
deleted file mode 100644
index 7233ec5..0000000
--- a/jscomp/syntax/tests/printer/expr/ident.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let x = a
-
-let c = Configuration.config
-
-let x = @attr identifier
-
-let x = @attributeVeryLong @attributeVeryLong @attributeVeryLong @attributeVeryLong identifier
diff --git a/jscomp/syntax/tests/printer/expr/if.res b/jscomp/syntax/tests/printer/expr/if.res
deleted file mode 100644
index 05b594b..0000000
--- a/jscomp/syntax/tests/printer/expr/if.res
+++ /dev/null
@@ -1,224 +0,0 @@
-let name = if true {
-  user.name
-}
-
-let name = if true {
-  user.name
-} else {
-  "steve"
-}
-
-let name = if true {
-  user.name
-} else if false {
-  user.lastName
-} else {
-  defaultName
-}
-
-let () = if true {
-  let a = 1
-  let b = 2
-  open Belt
-  sideEffect()
-  ()
-} else {
-  let a = 5
-  let b = 6
-  open React
-  render()
-  ()
-}
-
-let x = @attr if truth {
-  sideEffect()
-}
-
-if inclusions[index] = (uid, url) {
-  onChange(inclusions)
-}
-
-
-// Basic
-// if let Some(x) = foo() {
-  // doSomethingWithX(x)
-// }
-
-// Else branch
-// if let Some(x) = foo(){
-  // doSomethingWithX(x)
-// } else {
-  // doSomethingElse()
-// }
-
-// Else-if support
-// if let Some(x) = foo(){
-  // doSomethingWithX(x)
-// } else if let Some(y) = bar(){
-  // doSomethingWithY(y)
-// } else {
-  // doSomethingElse()
-// }
-
-// Mixed conditions, pattern start
-// if let Some(x) = foo(){
-  // doSomethingWithX(x)
-// } else if n > 10 {
-  // doSomethingWithForN()
-// } else {
-  // doSomethingElse()
-// }
-
-// Mixed conditions, condition start
-// if n > 10 {
-  // doSomethingWithForN()
-// } else if let Some(x) = foo() {
-  // doSomethingWithX(x)
-// } else {
-  // doSomethingElse()
-// }
-
-// Maintains attrs correctly
-// if n > 10 {
-  // @aa
-  // doSomethingWithForN()
-// } else if let @bb Some(@cc x) = @dd foo() {
-  // @ee
-  // doSomethingWithY(x)
-// } else {
-  // @ff
-  // doSomethingElse()
-// }
-
-// if let Some(x) = foo() {
-  // doSomethingWithX(x)
-// } else if let Some(y) = bar() {
-  // doSomethingWithY(y)
-// } else if let Some(z) = baz() {
-  // doSomethingWithZ(z)
-// }
-
-// full destructuring
-// if let Some(Thing(With({
-  // many: Internal([Components, q]),
-// }))) as p = foo() {
-  // doSomethingWithE(e)
-// }
-
-// Assignment
-// let a = if let Some(x) = foo() {
-  // x
-// } else {
-  // 123
-// }
-
-// Nesting
-// let getZ = nested =>
-  // if let Some(point) = nested.origin {
-    // if let Some(z) = point.z {
-      // z
-    // } else {
-      // 0
-    // }
-  // } else {
-    // 0
-  // }
-
-// Deep nesting
-// let getZ = nested =>
-  // if let Some(nested) = nested.a {
-    // if let Some(nested) = nested.b {
-      // if let Some(nested) = nested.c {
-        // if let Some(nested) = nested.d {
-          // if let Some(nested) = nested.e {
-            // if let Some(nested) = nested.f {
-              // if let Some(nested) = nested.g {
-                // z
-              // } else {
-                // 0
-              // }
-            // } else {
-              // 0
-            // }
-          // } else if let Some(nested) = nested.g {
-            // z
-          // } else {
-            // 0
-          // }
-        // } else {
-          // a ? b : c
-        // }
-      // } else {
-        // 0
-      // }
-    // } else {
-      // 0
-    // }
-  // } else {
-    // 0
-  // }
-
-// Break testing
-// if let Some(suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName) = anotherSuuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName() {
-  // foo()
-// }
-
-// if let Some(suuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName) = anotherSuuuuuuuuuuuuuuuuuuuuuuuuuuuperLongNameanotherSuuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName(withSomeArgsThatAreAlsoLarge, withManyArgsThatAreAlsoLarge) {
-  // foo()
-// }
-
-// if let { suuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName, suuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName2, suuuuuuuuuuuuuuuuuuuuuuuuuuuperLongName3 } = buildMyRecord() {
-  // foo()
-// }
-
-// Complex nesting
-// if let Some(Thing(With({many: Internal([Components, q])}))) as p = foo() {
-  // if let Other(Thing(With({many: Internal([Components, q])}))) as p = foo() {
-    // doSomethingElse(e)
-  // }
-  // doSomethingWithE(e)
-// } else if let Some(Thing(With({
-  // many: Internal([Components, q]),
-// }))) as p = foo() {
-  // doSomethingWithE(e)
-// } else if let Some(Thing(With({
-  // many: Internal([Components, q]),
-// }))) as p = foo() {
-  // doSomethingWithE(e)
-// }
-
-// Ternary
-// let a = b
-  // ? if let Some(x) = foo() {
-      // 1
-    // } else {
-      // 2
-    // }
-  // : 3
-
-// let a = b
-  // ? 1
-  // : if let Some(x) = foo() {
-      // 1
-    // } else {
-      // 2
-    // }
-
-// let a = b
-  // ? if let Some(x) = foo() {
-      // 1
-    // } else {
-      // 2
-    // }
-  // : if let Some(x) = foo() {
-      // 1
-    // } else {
-      // 2
-    // }
-
-// print parens correct
-// if let Some(x) = (3: option<int>) {
-  // (x: int)
-// } else {
-  // (20: int)
-// }
diff --git a/jscomp/syntax/tests/printer/expr/jsObjectAccess.res b/jscomp/syntax/tests/printer/expr/jsObjectAccess.res
deleted file mode 100644
index f42f33e..0000000
--- a/jscomp/syntax/tests/printer/expr/jsObjectAccess.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let x = address["street"]
-let x = address["street"]["number"]
-let x = @attr address["street"]
-
-longEqualityExpression["someRecordField"] ==
-  wowThisDoesHaveToBePrettyLong["someRecordField"] &&
-longEqualityExpression["someRecordField"] ==
-  wowThisDoesHaveToBePrettyLong["someRecordField"]
-
-let component = props["Component"]
diff --git a/jscomp/syntax/tests/printer/expr/jsObjectSet.res b/jscomp/syntax/tests/printer/expr/jsObjectSet.res
deleted file mode 100644
index d66f72b..0000000
--- a/jscomp/syntax/tests/printer/expr/jsObjectSet.res
+++ /dev/null
@@ -1,6 +0,0 @@
-address["street"] = "Brusselsestraat"
-address["street"] = newYork |> getExpensiveStreet
-
-let () = @attr address["street"] = "Brusselsestraat"
-let () = node["left"] = value |> process |> node["right"] = value |> process
-let () = (node["left"] = value |> process) |> node["right"] = value |> process
diff --git a/jscomp/syntax/tests/printer/expr/jsx.res b/jscomp/syntax/tests/printer/expr/jsx.res
deleted file mode 100644
index c86868b..0000000
--- a/jscomp/syntax/tests/printer/expr/jsx.res
+++ /dev/null
@@ -1,447 +0,0 @@
-let x = <div className="container" className2="container2" className3="container3" onClick />
-let x = <Foo className="container" />
-let x = <Foo.Bar className="container" />
-let x = <Foo.Bar.Baz className="container" />
-let x = <Foo.bar className="container" />
-let x = <Foo.baz
- className="multiline"
-/>
-let x = <custom-tag className="container" />
-let x = <Foo.custom-tag className="container" />
-
-// https://github.com/rescript-lang/syntax/issues/570
-let x = <A> <B> <C> <D /> <E /> </C> <F> <G /> <H /> </F> </B> </A>
-let x = <A> {children} <B/> </A>
-let x = <A> <B/> {children} </A>
-let x = <A> {a} </A>
-let x = <A> {a} {b} </A>
-let x = <custom-tag className="container" > {a} <B/> </custom-tag>
-let x = <Foo.custom-tag className="container" > {a} <B/> </Foo.custom-tag>
-
-let x =
-  <div
-  className="container" className2="container2" className3="container3" onClick
-  />
-
-
-let nav = <Nav isMobile={isMobile} fullScreen={!isMobile ? false : isOpen}>
-      <NavContent>
-        <WidescreenMenu
-          menuItems={props.items}
-          trial={props.trial}
-          user={props.user}
-          viewer={props.viewer}
-        />
-      </NavContent>
-    </Nav>
-
-let nav2 =
-  <Nav isMobile={isMobile} fullScreen={!isMobile ? false : isOpen}>
-    <NavContent>
-      {switch isMobile {
-      | true =>  (
-        <MobileMenu
-          handleOpenToggle={_ => setOpen(open_ => !open_)}
-          menuItems={props.items}
-          isOpen={isOpen}
-          forceOpen={_ => setOpen(true)}
-          forceClose={_ => setOpen(false)}
-          user={props.user}
-        />
-      ) 
-      | false => (
-        <WidescreenMenu
-          menuItems={props.items}
-          trial={props.trial}
-          user={props.user}
-          viewer={props.viewer}
-        />
-      )}}
-    </NavContent>
-  </Nav>
-
-let nav3 = (
-  <Nav isMobile={isMobile} fullScreen={!isMobile ? false : isOpen}>
-    <NavContent>
-      {isMobile ? (
-        <MobileMenu
-          handleOpenToggle={_ => setOpen(open_ => !open_)}
-          menuItems={props.items}
-          isOpen={isOpen}
-          forceOpen={_ => setOpen(true)}
-          forceClose={_ => setOpen(false)}
-          user={props.user}
-        />
-      ) : (
-        <WidescreenMenu
-          menuItems={props.items}
-          trial={props.trial}
-          user={props.user}
-          viewer={props.viewer}
-        />
-      )}
-    </NavContent>
-  </Nav>
-)
-
-let avatarSection = (
-    <>
-      <div style={{"zIndex": "1", "opacity": opacityUser}}>
-        <Avatar user={user} size={45} />
-      </div>
-      {user.email !== viewer.email ? (
-        <div
-          style={{
-            "marginLeft": marginLeft + "em",
-            "opacity": opacityAdmin,
-            "zIndex": "0",
-            "cursor": "pointer"
-          }}
-          onMouseEnter={_ => setHoveringAdmin(true)}
-          onMouseLeave={_ => setHoveringAdmin(false)}
-          onClick={_e => {
-            stopImpersonating(csrfToken);
-          }}
-        >
-          <Avatar user={viewer} size={45} />
-        </div>
-      ) : React.nullElement}
-    </>
-  );
-
-let x = <> </>;
-
-let x =
-  <div
-    ident // punned
-    ?ident // punned optional
-    ident=?identifierExpr 
-    ident=identifierExpr
-    constant="constant"
-    letExpr={
-      let a = 1
-      let b = 2
-      a + b
-    }
-    onClick={event => handleClick(event)}
-    onClick={(event1, event2, event3) => {
-      Js.log("debug click")
-      handleClick(event)
-    }}
-    onClick={(aaaaaaaaaaaaaaarg1, aaaaaaaaaaaaaaaaaaaaaaarg2, aaaaaaaaaaaaaaarg3) => {
-      sideEffect(aaaaaaaaaaaaaaarg1)
-      sideEffect(aaaaaaaaaaaaaaaaaaaaaaarg2)
-      sideEffect(aaaaaaaaaaaaaaarg3)
-    }}
-    apply={myFunction(x)}
-    applyWithDot={myFunction(. x)}
-    street={streets[0]}
-    binary={a + b}
-    int={-1}
-    float={-1.2}
-    matchExpression={switch color {
-      | Blue => "blue"
-      | Red => "red"
-    }}
-    tryExpression={try sideEffect() catch {
-      | Error => ()
-    }}
-    tuple=(a, b, c)
-    constr=Rgb(red, blue, green)
-    list1=list{}
-    list2=list{a, b}
-    list3=list{a, b, ...x}
-    array=[a, b, c]
-    record={x: 1, y: 2}
-    field=foo.bar
-    setField={user.name = "Steve"}
-    ifThenElse={if true {
-      ()
-    } else {
-      ()
-    }}
-    seq={{sideEffect1(); sideEffect2()}}
-    whileExpr={while true {
-      loop()
-    }}
-    forExpr={for i in 0 to 10 {
-      do(i)
-    }}
-    constraintExpr={(20: int)}
-    letModule={{
-      module L = Log;
-      L.log()
-    }}
-    letException={{
-      exception Exit;
-      raise(Exit)
-    }}
-    lazyExpr={lazy stuff()}
-    assertExpr={assert(true)}
-    pack=module(Foo)
-    pack={module(Foo)}
-    pack=module(Foo: Bar)
-    pack={module(Foo: Bar)}
-    openExpr={open React; React.render()}
-    extension=%raw("eval()")
-    jsObject={"x": 1, "y": 2} 
-    withAttr={@attr foo}
- />
-
-  let x = <div>
-    ident "constant"
-    {
-      let a = 1
-      let b = 2
-      a + b
-    }
-    {event => handleClick(event)}
-    {(event1, event2, event3) => {
-      Js.log("debug click")
-      handleClick(event)
-    }}
-    {(aaaaaaaaaaaaaaarg1, aaaaaaaaaaaaaaaaaaaaaaarg2, aaaaaaaaaaaaaaarg3) => {
-      sideEffect(aaaaaaaaaaaaaaarg1)
-      sideEffect(aaaaaaaaaaaaaaaaaaaaaaarg2)
-      sideEffect(aaaaaaaaaaaaaaarg3)
-    }}
-    {myFunction(x)}
-    {myFunction(. x)}
-    {streets[0]}
-    {a + b}
-    {-1}
-    {-1.2}
-    {switch color {
-      | Blue => "blue"
-      | Red => "red"
-    }}
-    {try sideEffect() catch {
-      | Error => ()
-    }}
-    {(a, b, c)}
-    Rgb(red, blue, green)
-    list{}
-    list{a, b}
-    list{a, b, ...x}
-    [a, b, c]
-    {x: 1, y: 2}
-    foo.bar
-    {user.name = "Steve"}
-    {if true {
-      ()
-    } else {
-      ()
-    }}
-    {{sideEffect1(); sideEffect2()}}
-    {while true {
-      loop()
-    }}
-    {for i in 0 to 10 {
-      do(i)
-    }}
-    {(20: int)}
-    {{
-      module L = Log;
-      L.log()
-    }}
-    {{
-      exception Exit;
-      raise(Exit)
-    }}
-    {lazy stuff()}
-    {assert(true)}
-    {module(Foo)}
-    module(Foo)
-    {module(Foo: Bar)}
-    module(Foo: Bar)
-    {open React; React.render()}
-    %raw("eval()")
-    {"x": 1, "y": 2} 
-    {@attr ident} 
-  </div>
-
-let x = <MyComponent sidebar=<div> test </div> nav=<Navbar /> />
-
-<div>
-  {possibleGradeValues
-  |> List.filter(g => g <= state.maxGrade)
-  |> List.map(possibleGradeValue =>
-      <option
-        key={possibleGradeValue |> string_of_int}
-        value={possibleGradeValue |> string_of_int}>
-        {possibleGradeValue |> string_of_int |> str}
-      </option>
-    )
-  |> Array.of_list
-  |> ReasonReact.array}
-</div>
-
-// https://github.com/rescript-lang/syntax/issues/113
-<div>  {Js.log(a <= 10)} </div>
-<div> <div> {Js.log(a <= 10)} </div> </div>
-<div> <div onClick={_ => Js.log(a <= 10) }> <div> {Js.log(a <= 10)} </div> </div> </div>
-
-module App = {
-  @react.component
-  let make = () => {
-    <> 1 </>
-  }
-}
-
-module App = {
-  @react.component
-  let make = () => {
-    <> <div /> </>
-  }
-}
-
-// leading line comment on rhs jsx prop should indent nicely
-<ContributorsRow
-  amount={
-    // ->BN.new_("86400")
-    // There are 86400 seconds in a day.
-    amount->BN.div(BN.new_("86400"))->BN.toString
-  }
-/>
-
-// leading line comment on rhs jsx prop should indent nicely
-<ContributorsRow
-  amount={
-    // There are 86400 seconds in a day.
-    compute(amount)
-  }
-/>
-
-// leading line comment on braced children should indent nicely
-<div>
-  {// comment
-    content
-  }
-
-  { // comment
-    if condition() {
-      renderBranch()
-    } else {
-      doSomeOtherThings()
-    }
-  }
-</div>
-
-<Animated> ...{x => <div />} </Animated>
-<div>...c</div>;
-
-<Animated initialValue=0.0 value>
-  ...{
-       ReactDOMRe.Style.make(
-         ~width="20px",
-         ~height="20px",
-         ~borderRadius="100%",
-         ~backgroundColor="red",
-       )
-     }
-</Animated>;
-
-<Animated initialValue=0.0 value>
-  ...{
-       value =>
-         <div
-           style={
-             ReactDOMRe.Style.make(
-               ~width="20px",
-               ~height="20px",
-               ~borderRadius="100%",
-               ~backgroundColor="red",
-             )
-           }
-         />
-     }
-</Animated>
-
-<Animated initialValue=0.0 value>
-  ...{
-     (value) :ReasonReact.element =>
-         <div
-           style={
-             ReactDOMRe.Style.make(
-               ~width="20px",
-               ~height="20px",
-               ~borderRadius="100%",
-               ~backgroundColor="red",
-             )
-           }
-         />
-     }
-</Animated>;
-
-<Animated initialValue=0.0 value>
-  ...{value => {
-       let width = "20px"
-       let height = "20px"
-
-       <div
-         style={
-           ReactDOMRe.Style.make(
-             ~width,
-             ~height,
-             ~borderRadius="100%",
-             ~backgroundColor="red",
-           )
-         }
-       />
-     }
-  }
-</Animated>
-
-
-let v =
-  <A>
-    <B>
-      ...{_ => {
-        let renderX = x => {
-          let y = x ++ x;
-          <div key=y />;
-        }
-        renderX("foo")
-      }}
-    </B>
-  </A>
-
-let x = <A x="y" {...str} />
-
-// https://github.com/rescript-lang/rescript-compiler/issues/6002
-let x = props =>
-  <A
-    {...props}
-    className="inline-block px-6 py-2.5 bg-blue-600 text-white font-medium text-xs leading-tight"
-  />
-
-let x = <C> ...{() => msg->React.string} </C>
-
-let x = <C> ...{array->Array.map(React.string)} </C>
-
-let x = <> ...{array->Array.map(React.string)} </>
-
-let x = {
-  let _ = <div />
-  msg->React.string
-}
-
-let x = {
-  let _ = <div> {children} </div>
-  msg->React.string
-}
-
-let x = {
-  let _ = <> {children} </>
-  msg->React.string
-}
-
-let x = {
-  let _ = <C />
-  msg->React.string
-}
-
-let x = {
-  let _ = <C> {children} </C>
-  msg->React.string
-}
diff --git a/jscomp/syntax/tests/printer/expr/lazy.res b/jscomp/syntax/tests/printer/expr/lazy.res
deleted file mode 100644
index 9d0fd7b..0000000
--- a/jscomp/syntax/tests/printer/expr/lazy.res
+++ /dev/null
@@ -1,56 +0,0 @@
-let x = lazy sideEffect
-
-// parens
-let x = lazy true
-let x = lazy 12
-let x = lazy (12: int)
-let x = lazy 12
-let x = lazy list{1, 2, ...x}
-let x = lazy module(Foo: Bar)
-let x = lazy module(Foo)
-let x = lazy Rgb(1, 2, 3)
-let x = lazy [a, b, c]
-let x = lazy {x: 1, y: 3}
-let x = lazy (1, 2, 3)
-let x = lazy %extension
-let x = lazy user.name
-let x = lazy streets[0]
-let x = lazy apply(arg1, arg2)
-let x = lazy apply(. arg1, arg2)
-let x = lazy -1
-let x = lazy !true
-let x = lazy (x => print(x))
-let x = lazy (switch x {
-  | Blue => ()
-  | Yello => ()
-})
-
-let x = lazy (for i in 0 to 10 {
-  print_int(i)
-})
-
-let x = lazy (if i < 10 {
-  print_int(i)
-} else {
-  print_int(1000)
-})
-
-let x = lazy (while i < 10 {
-  print_int(i)
-})
-
-let x = lazy (assert(false))
-let x = lazy (try sideEffect() catch {| Exit => ()})
-
-let x = lazy (@attr expr)
-
-let x = lazy (a + b)
-
-let x = @attr lazy x
-
-let x = lazy street["number"]
-let x = lazy streets[0]
-
-lazy (address["street"] = "Brusselsestraat")
-
-lazy (true ? 0 : 1)
diff --git a/jscomp/syntax/tests/printer/expr/let.res b/jscomp/syntax/tests/printer/expr/let.res
deleted file mode 100644
index f687ec4..0000000
--- a/jscomp/syntax/tests/printer/expr/let.res
+++ /dev/null
@@ -1,59 +0,0 @@
-let z = {
-  let a = 1
-  a
-}
-
-let x = {
-  let x = 1 and y = 2 and z = 3
-
-  let x = 1
-  and y = 2
-  and z = 3
-
-
-  let x = 1
-
-  and y = 2
-
-  and z = 3
-
-  x + y + z
-}
-
-let x = {let a = true; let b = false; a || b}
-
-// don't add whitespace here
-let highlight_dumb = (ppf, lb, loc) => {
-  let line_start = ref(0)
-  and line_end = ref(0)
-  foo
-}
-
-// should contain a newline before foo
-let highlight_dumb = (ppf, lb, loc) => {
-  let line_start = ref(0)
-  and line_end = ref(0)
-
-  foo
-}
-
-let f = x => {
-  let a =
-    x
-    ->Js.Dict.get("wm-received")
-    ->Option.flatMap(Js.Json.decodeString)
-    ->Option.map(Js.Date.fromString)
-
-  let b =
-    x
-    ->Js.Dict.get("wm-property")
-    ->Option.flatMap(Js.Json.decodeString)
-    ->Option.flatMap(x =>
-      switch x {
-      | "like-of" => Some(#like)
-      | "repost-of" => Some(#repost)
-      | _ => None
-      }
-    )
-  (a, b)
-}
diff --git a/jscomp/syntax/tests/printer/expr/letexception.res b/jscomp/syntax/tests/printer/expr/letexception.res
deleted file mode 100644
index 848d033..0000000
--- a/jscomp/syntax/tests/printer/expr/letexception.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let x = {
-  exception Foo
-  sideEffect
-}
diff --git a/jscomp/syntax/tests/printer/expr/letmodule.res b/jscomp/syntax/tests/printer/expr/letmodule.res
deleted file mode 100644
index 8063cdb..0000000
--- a/jscomp/syntax/tests/printer/expr/letmodule.res
+++ /dev/null
@@ -1,14 +0,0 @@
-let x = {
-  module M = ME
-  Me.x
-}
-
-let x = {
-  module M = await ME
-  M.x
-}
-
-let x = {
-  module M = await (ME: MT)
-  M.x
-}
diff --git a/jscomp/syntax/tests/printer/expr/list.res b/jscomp/syntax/tests/printer/expr/list.res
deleted file mode 100644
index 86b02f0..0000000
--- a/jscomp/syntax/tests/printer/expr/list.res
+++ /dev/null
@@ -1,48 +0,0 @@
-let x = list{}
-let x = list{1}
-let x = list{1, 2}
-let x = list{1, 2, 3}
-let x = list{...xs}
-let x = list{1, ... xs}
-let x = list{xs, ... ys}
-let x = list{...xs, ... ys}
-let x = list{...xs, 1, ...ys}
-let x = list{1, 2, ...xs, 3, ...xs}
-let x = Belt.List.concatMany([list{1, 2, ...x}, [list{3, ...x}]])
-
-
-let x = list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-}
-
-
-let x = list{1, ...otherList}
-
-let x = list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  ...superLoooooooooooooooooooooooooooooongListHere,
-}
-
-let x = Belt.List.concatMany([
-  list{
-    superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-    superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-    ...superLoooooooooooooooooooooooooooooongListHere,
-  },
-  list{
-    superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-    ...superLoooooooooooooooooooooooooooooongListHere,
-  },
-])
-
-
-let x = list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer, ...superLoooooooooooooooooooooooooooooongListHere,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  ...superLoooooooooooooooooooooooooooooongListHere,
-}
diff --git a/jscomp/syntax/tests/printer/expr/nestedCallbacks.res b/jscomp/syntax/tests/printer/expr/nestedCallbacks.res
deleted file mode 100644
index cc2f9c8..0000000
--- a/jscomp/syntax/tests/printer/expr/nestedCallbacks.res
+++ /dev/null
@@ -1,24 +0,0 @@
-let foo = () =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x =>
-  bar(x => x)
-  )))))))))))))))))))))
\ No newline at end of file
diff --git a/jscomp/syntax/tests/printer/expr/newtype.res b/jscomp/syntax/tests/printer/expr/newtype.res
deleted file mode 100644
index c8e30bd..0000000
--- a/jscomp/syntax/tests/printer/expr/newtype.res
+++ /dev/null
@@ -1,22 +0,0 @@
-let f = (type t, xs : list<t>) => ()
-let f = @attr (type t, xs : list<t>) => ()
-let f = (type t, xs : list<t>, type s, ys : list<s>) => ()
-let f = @attr (type t, xs : list<t>, @attr2 type s, ys : list<s>) => ()
-let f = (type t u v, xs : list<(t, u, v)>) => ()
-let f = @attr (type t u v, xs : list<(t, u, v)>) => ()
-let f = (type t u v, xs : list<(t, u, v)>, type s w z, ys : list<(s, w, z)>) => ()
-let f = @attr (type t u v, xs : list<(t, u, v)>, @attr2 type s w z, ys : list<(s, w, z)>) => ()
-let f = (@attr type t, @attr type s, xs: list<(t, s)>,  @attr type u, @attr type v w, ys: list<(u, v, w)>) => ()
-
-let mk_formatting_gen:
-  type a b c d e f. formatting_gen<a, b, c, d, e, f> => Parsetree.expression =
-  fmting =>
-    switch fmting {
-    | Open_tag(Format(fmt', str')) => mk_constr("Open_tag", list{mk_format(fmt', str')})
-    }
-
-let cancel_and_collect_callbacks:
-  'a 'u 'c.
-  (list<packed_callbacks>, promise<'a, 'u, 'c>) => list<packed_callbacks>
- =
-  (type x, callbacks_accumulator, p: promise<_, _, c>) => ();
diff --git a/jscomp/syntax/tests/printer/expr/open.res b/jscomp/syntax/tests/printer/expr/open.res
deleted file mode 100644
index 31ffdaa..0000000
--- a/jscomp/syntax/tests/printer/expr/open.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let element = {
-  open React
-  element
-}
-
-let element = {
-  open! React
-  element
-}
diff --git a/jscomp/syntax/tests/printer/expr/pipe.res b/jscomp/syntax/tests/printer/expr/pipe.res
deleted file mode 100644
index 82289c8..0000000
--- a/jscomp/syntax/tests/printer/expr/pipe.res
+++ /dev/null
@@ -1,8 +0,0 @@
-let s1 = @ann (x->foo)
-let s1b = @ann x->foo
-
-let s2 = @ann (x|>foo)
-let s2b = @ann x|>foo
-
-let s3 = @ann (x**foo)
-let s3b = @ann x**foo
diff --git a/jscomp/syntax/tests/printer/expr/polyvariant.res b/jscomp/syntax/tests/printer/expr/polyvariant.res
deleted file mode 100644
index 1d39505..0000000
--- a/jscomp/syntax/tests/printer/expr/polyvariant.res
+++ /dev/null
@@ -1,140 +0,0 @@
-let r = #Reducer()
-let r = #Reducer(state, nexState, sideEffect)
-let r = #Reducer(superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, superLongIdentiiiiiiiifffffffiiiiieeeeeeeer)
-let r = #Reducer([state, nexState, sideEffect])
-let r = #Reducer([
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-  superLongIdentiiiiiiiifffffffiiiiieeeeeeeer,
-])
-
-let r = #Reducer({state: nextState, sideEffects: []})
-
-let c = #Constr({firstField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, secondField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, thirdField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer})
-
-let forceBreak = #Cartesian({
-  x: Omega.x,
-  y: Theta.y
-})
-
-let c = #Constr(list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  ...superLoooooooooooooooooooooooooooooongListHere,
-})
-
-let c = #Constr(list{
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-  superLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer,
-})
-
-let c = #ConstructorWithASuuuuuuuuuuuuuuuperLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer([])
-let c = #ConstructorWithASuuuuuuuuuuuuuuuperLoooooooooooooooooooooooooooooongIiiiiiiiiideeeentifieeeeeeeeeeeeeeeeer(list{})
-
-
-let coordinate = #JsCoord({"x": 1, "y": 1})
-let user = #JsUser({
-  "name": "steve",
-  "age":  32
-})
-
-let rec peekMinNode = node =>
-  switch node {
-  | #None => #None
-  | #Some(node) =>
-    if node.left === #None {
-      // this shouldn't break over multiple lines
-      #Some(node)
-    } else {
-      node.left->peekMinNode
-    }
-  }
-
-let rec peekMinNode = node =>
-  switch node {
-  | #None => #None
-  | #Some(node) =>
-    if node.left === #None {
-      // this shouldn't break over multiple lines
-      #MyConstructor(node, nodeLongIdentifiiiiieeeeeeer1, nodeLongIdentifiiiiieeeeeeer2)
-    } else {
-      node.left->peekMinNode
-    }
-  }
-
-let constructor =
-  @attr #Blue
-
-let x =
-  switch (x) {
-  | #Bar =>
-    ReasonReact.UpdateWithSideEffects(
-      self => {
-        let _ = 1;
-        apply(bar);
-      },
-    )
-  | #Foo => ()
-  };
-
-// tuple as single argument
-let x = #Some((1, 2))
-
-let math = if discriminant < 0. {
-  #None
-} else {
-  #Some((
-    (-.b -. Js.Math.sqrt(discriminant)) /. (2. *. a),
-    (-.b +. Js.Math.sqrt(discriminant)) /. (2. *. a),
-  ))
-}
-
-switch x {
-| #...typevar => 42
-}
-
-
-let r = #\"Reducer⛪️"
-let r = #\"type"(\"module", \"let")
-
-let r = #lident
-let r = #lident(a, b)
-let r = #\"exotic lident"
-let r = #\"exotic lident"(a, b)
-
-let x = #"1"
-let x = #"123"
-let x = #"10space"
-let x = #space10
-
-let a = #"1"
-let b = #"1a"
-let c = #a2
-let d = #abcd
-
-#"BigBlue"(#"Shade-of-blue+++", #"Shade-of-blue---")
-
-external openSync: (
-  path,
-  @string [
-    | @as("r") #Read
-    | @as("r+") #Read_write
-    | @as("rs+") #Read_write_sync
-    | @as("w") #Write
-    | @as("wx") #Write_fail_if_exists
-    | @as("w+") #Write_read
-    | @as("wx+") #Write_read_fail_if_exists
-    | @as("a") #Append
-    | @as("ax") #Append_fail_if_exists
-    | @as("a+") #Append_read
-    | @as("ax+") #Append_read_fail_if_exists
-  ],
-) => unit = "openSync"
-
-let x = #a(())
-let x = #a()
-
-let oneString = #1("payload")
-let twoIntString = #2(3, "payload")
diff --git a/jscomp/syntax/tests/printer/expr/record.res b/jscomp/syntax/tests/printer/expr/record.res
deleted file mode 100644
index 021a8d9..0000000
--- a/jscomp/syntax/tests/printer/expr/record.res
+++ /dev/null
@@ -1,94 +0,0 @@
-let coord = {x: 3.13, y: 3.14}
-let record = {firstField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, secondField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, thirdField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer}
-
-let forceBreak = {
-  x: Omega.x,
-  y: Theta.y
-}
-
-let withSpread = {...initialState, time: nextTime,}
-let withSpreadAndForceBreak = {
-  ...initialState,
-  time: nextTime,
-}
-
-let withSpreadAndNaturalBreak = {...fields, firstField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, secondField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer, thirdField: superLongIdentiiiiiiiifffffffiiiiieeeeeeeer}
-
-
-let x = @attr {x: 1, y: 2}
-let x = @attr {...initialState, superLongName: 1, superLongName: 2, superLongName: 5}
-let x = @attr {...initialState, superLongName: 1, superLongName: 2, superLongName: 5, superLongName: 20}
-
-// print parens around constrained expr in rhs
-let user = {name: (ceo.name: string)}
-// braces should be preserved on rhs
-let user = {name: {ceo.name}}
-let user = {name: {
-  ceo.name
-}}
-// braced + constrained expr
-let user = {name: {(ceo.name: string)}}
-
-
-// Punning
-let r = {a} // actually not a record, just an expression in braces
-let r = {a: a} // single-element record, not punned
-let r = {A.a: a} // single-element record, not punned
-let r = {a, b}
-let r = {a, b, c: 42}
-let r = {A.a, b}
-let r = {A.a: a, b}
-let r = {a: a, b}
-let r = {a, b: b}
-
-// Punning + comments
-let r = {
-  // a
-  a,
-  // b
-  b,
-}
-let r = {
-  a, // a
-  b, // b
-}
-let r = {
-  /* a */
-  a,
-  /* b */
-  b,
-}
-let r = {
-  a /* a */,
-  b /* b */,
-}
-let r = {a /* a */, b /* b */}
-
-let r = {x: ? None, y: ?None, z: ? (None:tt)}
-
-let z = name => { name : ? name, x: 3}
-
-let z = name => { ? name, x: 3}
-
-let z = name => { name, ? x }
-
-let zz = name => { name, ? x }
-
-let _ = switch z {
-  | {x: ? None, y: ? None, z: ? (None:tt)} => 11
-  | {name:  ? name, x: 3} => 42
-  | {name:  ? dd, x: 3} => 42
-  | {x: ? None, y: ? None, z: ? (None:tt)} => 11
-  | {name: ? name, x: 3} => 42
-  | {? name, x: 3} => 4242
-}
-
-type tt = {x:int, @res.optional y: string}
-
-type ttt = {x:int, y?: string}
-
-let optParen = { x:3, y: ? (someBool ? Some("") : None) }
-let optParen = { x:3, y: ? (3+4) }
-let optParen = { x:3, y: ? (foo(bar)) }
-let optParen = { x:3, y: ? (foo->bar) }
-let optParen = { x:3, y: ? (()=>3) }
diff --git a/jscomp/syntax/tests/printer/expr/sequence.res b/jscomp/syntax/tests/printer/expr/sequence.res
deleted file mode 100644
index aed5a95..0000000
--- a/jscomp/syntax/tests/printer/expr/sequence.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let () = {
-  foo()
-  bar()
-}
-
-
-let () = {
-  (foo(): unit)
-  (bar(): unit)
-}
diff --git a/jscomp/syntax/tests/printer/expr/setfield.res b/jscomp/syntax/tests/printer/expr/setfield.res
deleted file mode 100644
index 9597f09..0000000
--- a/jscomp/syntax/tests/printer/expr/setfield.res
+++ /dev/null
@@ -1,18 +0,0 @@
-user.name = "steve"
-config.shouldSkip = !filePath.includes(allMlSuffixesCategory) &&
-  !filePath.endsWith(allScriptDirectoriesCategory)
-
-let () =
-  @attr user.name = "steve"
-
-let () =
-  @attr user.name = "steve" |> @attr user.name = "steve"
-
-user.name = steve["name"]
-user.address = addresses[2]
-
-(currentNode.parent->castNotOption).color = Black
-(isLeft ? node.left : node.right).color = Black
-
-// interpret strings correct
-dict["\n"] = dict2["\""]
diff --git a/jscomp/syntax/tests/printer/expr/sideEffects.res b/jscomp/syntax/tests/printer/expr/sideEffects.res
deleted file mode 100644
index 7d1144d..0000000
--- a/jscomp/syntax/tests/printer/expr/sideEffects.res
+++ /dev/null
@@ -1,32 +0,0 @@
-foo()
-bar()
-
-let () = {
-  foo()
-  bar()
-}
-
-let () = {
-  let x = 1
-  sideEffect()
-  let y = 2
-  sideEffect2()
-  let z = 3
-  sideEffect3()
-}
-
-while true {
-  sideEffect1()
-  let x = 1
-  sideEffect2()
-  let y = 2
-  sideEffect3()
-}
-
-switch color  {
-  | Blue =>
-    getResult()
-    sideEffect()
-    let x = 1
-    sideEffect2()
-}
diff --git a/jscomp/syntax/tests/printer/expr/smartPipe.res b/jscomp/syntax/tests/printer/expr/smartPipe.res
deleted file mode 100644
index 2bc8183..0000000
--- a/jscomp/syntax/tests/printer/expr/smartPipe.res
+++ /dev/null
@@ -1,38 +0,0 @@
-let myFunc = (strA, strB) => strA ++ strB
-
-"expr1"->myFunc("expr2")->myFunc("expr3")
-
-"expr1"
-->myFunc("expr2")->myFunc("expr3")
-
-"expr1"->myFunc("expr2")
-->myFunc("expr3")
-
-"expr1"->myFunc("expr2")
-->myFunc("expr3")->myFunc("expr4")
-
-myPromise->Promise.then(v => {
-  Js.log(v)
-  Promise.resolve(v)
-})
-
-myPromise
-->Promise.then(v => {
-  Js.log(v)
-  Promise.resolve(v)
-})
-
-let messages = React.useMemo(() =>
-  messagesById
-  ->StringMap.valuesToArray
-  ->Array.filter(ChatMessage.isVisibleInSimpleFilter)
-  ->Array.toSorted(ChatMessage.compareByDateAsc)
-, [messagesById])
-
-f->(v => g(x))->g
-
-f->(v)->g
-
-x->(v => g(x))->f->(v => g(x)->k)->g
-
-f->(v => g(x)->k->(x => s(x)))->g
diff --git a/jscomp/syntax/tests/printer/expr/switch.res b/jscomp/syntax/tests/printer/expr/switch.res
deleted file mode 100644
index 7d4f8aa..0000000
--- a/jscomp/syntax/tests/printer/expr/switch.res
+++ /dev/null
@@ -1,59 +0,0 @@
-switch x {
-| A => ()
-| B => ()
-}
-
-switch (a, b) {
-| (Some(a), Some(b)) => 42
-| _ => 3
-}
-
-let rec updateSum = (node, ~delta) =>
-  switch node {
-  | None => ()
-  | Some(node) =>
-    node.sum = node.sum +. delta
-    node.parent->updateSum(~delta)
-  }
-
-let x = @attr switch x {
-| Universe => ()
-}
-
-// #441 rescript format sometimes deletes comments
-switch count {
-// String in braces
-| 1 => { "one" }
-// Int in braces
-| 2 => {2}
-// Float in braces
-| 3 => {3.}
-// Bool in braces
-| 4 => { true }
-// Expression in braces
-| 5 => { expr }
-// Block
-| 6 => {
-    let _ = 123
-    Js.Console.log("Must be block")
-  }
-}
-
-switch route {
-| A => <div> // div tag moves to the next line
-    <div> {React.string("First A div")} </div>
-    <div> {React.string("Second A div")} </div>
-  </div>
-| B => <> // fragment tag moves to the next line
-    <div> {React.string("First B div")} </div>
-    <div> {React.string("Second B div")} </div>
-  </>
-}
-
-switch x {
-| A => {
-    let _ = 1
-    let _ = 2
-  } // no blank line below
-| B => ()
-}
diff --git a/jscomp/syntax/tests/printer/expr/templateLiteral.res b/jscomp/syntax/tests/printer/expr/templateLiteral.res
deleted file mode 100644
index 5829bee..0000000
--- a/jscomp/syntax/tests/printer/expr/templateLiteral.res
+++ /dev/null
@@ -1,121 +0,0 @@
-let y = `In winter the sky is never blue`
-let x = `firstname: ${user.firstName} lastname: ${user.lastName}.`
-let z = `${user.name} is his name`
-let o = `His name is ${user.name}`
-
-let s = `multi
-  line
-
-string
-`
-
-let s = `a \ b`
-let s = `a \\ b`
-let s = `a \\\ b`
-
-let s = `${foo}`
-
-let s = `before${foo}`
-let s = `before ${foo}`
-let s = `before  ${foo}`
-
-let s = `${foo}after`
-let s = `${foo} after`
-let s = `${foo}  after`
-
-let s = `${foo}${bar}`
-let s = `${foo}${bar}${baz}`
-
-let s = `${foo} ${bar}`
-let s = `${foo} ${bar} ${baz}`
-
-let s = ` before ${foo} ${bar} after `
-let s = `before ${foo} middle ${bar} ${baz} wow `
-
-let s = `
-  multiline
-
-  es6
-
-  template
-
-  expression
-
-  so convenient
-
-  :)
-          :D
-`
-
-let s = `$dollar without $braces $interpolation`
-
-let s = `${(s: string)}`
-
-// don't sugar to one single template literal, keep the concatenation
-`the sky` ++ `is blue`
-
-`my ${language.name} is ` ++ `Bond, ${jamesbond.firstName}.`
-`my ${language.name} is ` ++ `${jamesbond.lastName}. James Bond.`
-(`my ${language.name} is ` ++ `Bond, ${jamesbond.firstName}.`)->Js.log
-(`my ${name} is ` ++ `Bond`)->Js.log
-`my ${kitchen.quality} kitched` ++ ` is ${language.big} ` ++ ` of the ${kitchen.things}.` 
-json`null`->Js.log
-a ++ ` x ` ++ b
-a ++ (` x ` ++ b)
-
-let x = json`null`
-
-let x =  sql`select ${column} from ${table}`
-
-module X = %graphql("
-  query 123456789 {
-    x {
-      a
-      b
-      c
-      d
-      e
-    }
-  }
-")
-
-let cn = css`
-  display: block;
-  color: ${Color.text};
-  background-color: ${Color.bg};
-  border: 6px solid ${Color.Border.bg};
-  margin: ${1}px;
-  margin: ${1 + 2}px;
-  margin: ${1 * 2}px;
-  margin: ${1 + 2 / 3 + 4}px;
-  margin: ${1 * 2 / 3 + 4}px;
-  margin: ${1 - 2 / 3 * 4}px;
-  margin: ${1 / 2 + 3 * 4}px;
-  padding: ${Size.md}px;
-  padding: ${1 + Size.md}px;
-  padding: ${1.2 / Size.md}px;
-  padding: ${Size.md + 1 - 2.3 * pad / 4}px;
-`
-
-let box = css`
-  margin: ${ten()}px;
-  padding: ${pad}px;
-  border: 6px solid ${Color.Border.bg->Polished.lighten(0.3)};
-  background-color: ${Color.bg};
-  border-radius: ${Size.md / 2}px;
-`
-
-%graphql(`
-  fragment ActivityBefore_ActivityCategory on ActivityCategory
-  @argumentDefinitions(pixelRatio: {type: "Float!"}) {
-    id
-    title
-    description
-    icon(scaleFactor: $pixelRatio, width: 105, height: 100) {
-      url
-    }
-    iconDarkMode(scaleFactor: $pixelRatio, width: 105, height: 100) {
-      url
-    }
-  }
-`)
diff --git a/jscomp/syntax/tests/printer/expr/ternary.res b/jscomp/syntax/tests/printer/expr/ternary.res
deleted file mode 100644
index 8476516..0000000
--- a/jscomp/syntax/tests/printer/expr/ternary.res
+++ /dev/null
@@ -1,126 +0,0 @@
-condition1 ? value1 : value2 
-
-let x = condition1 ? value1 : value2 
-
-let value = condition1
-  ? value1
-  : condition2
-  ? value2
-  : condition3
-  ? value3
-  : value4;
-
-let paymentMessage = condition
-    ? "Payment completed successfully"
-    : state == "processing"
-    ? "Payment processing"
-    : state == "invalid_cvc"
-    ? "There was an issue with your CVC number"
-    : state == "invalid_expiry"
-    ? "Expiry must be sometime in the past."
-    : "There was an issue with the payment.  Please contact support.";
-
-let paymentMessage =
-  state == "success"
-    ? "Payment completed successfully"
-    : state == "processing"
-    ? "Payment processing"
-    : state == "invalid_cvc"
-    ? "There was an issue with your CVC number"
-    : state == "invalid_expiry"
-    ? "Expiry must be sometime in the past."
-    : "There was an issue with the payment.  Please contact support.";
-
-let record = truth ? {x: 1, y: 2} : {x: 3, y: 5}
-let record = truth ? {thisIsASuperLongFieldHere: loooooooooooooongIdentifier, anotherLongField: superLoooooooooooooooooongIdentifier} : {thisIsASuperLongFieldHere: loooooooooooooongIdentifier, anotherLongField: superLoooooooooooooooooongIdentifier}
-
-
-let arr = truth ? [1, 2, 3, 4] : [4, 5, 6, 7]
-let arr = truth ? [thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3] : [thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3]
-
-let lst = truth ? list{1, 2, 3, 4} : list{4, 5, 6, 7}
-let lst = truth ? list{thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3} : list{thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3}
-
-
-let construct = truth ? Constructor(1, 2, 3, 4) : Constructor(4, 5, 6, 7)
-let construct = truth ? Constructor(thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3) : Constructor(thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3)
-
-let x = truth ? {let a = 1; let b = 2; a + b} : {let a = 1; let b = 2; a + b}
-let x = truth
-  ? {
-      let a = 1;
-      let b = 2;
-      a + b
-    }
-  : {
-      let a = 1;
-      let b = 2;
-      a + b
-    }
-
-let x = truth ? create(a, b) : create(b, c)
-let x = truth ? create(thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3) : create(thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3)
-let x = truth ? create(. a, b) : create(. b, c)
-let x = truth ? create(. thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3) : create(. thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3)
-
-let street = newYork ? streets[0] : streets[20]
-let street = newYork ? thisIsASuperLongIdentifieeeeeeeer[0] : thisIsASuperLongIdentifieeeeeeeer[20]
-
-let x = isNegative ? -x : y
-
-let x = isGreater ? a + b : z - c
-let x = isGreater ? thisIsASuperLongIdentifieeeeeeeer + 20  : thisIsASuperLongIdentifieeeeeeeer + 200
-
-let x = isColor ? switch color {
-  | Blue => ()
-    | Red => ()
-} : switch color {
-  | Blue => ()
-  | Red => ()
-}
-
-let x = exceptionLike ? try dangerousThing() catch {| Exit => () } : try dangerousThing() catch {| Exit => () }
-
-let tuple = truth ? (1, 2, 3, 4) : (4, 5, 6, 7)
-let tuple = truth ? (thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3) : (thisIsASuperLongIdentifieeeeeeeer, thisIsASuperLongIdentifieeeeeeeer2, thisIsASuperLongIdentifieeeeeeeer3)
-
-let x = condition1 ? node.left : node.right 
-let x = condition1 ? nodeWithVeryLooooooooooooooooongNameHere.left : nodeWithVeryLooooooooooooooooongNameHere.right 
-
-let x = condition ? node.left = Some(newNode) : node.right = Some(newNode)
-let x = condition1 ? nodeWithVeryLooooooooooooooooongNameHere.left = Some(newNode) : nodeWithVeryLooooooooooooooooongNameHere.right = Some(newNode)
-
-let x = condition1 ? if true { () } else { () } : if true { () } else { () }
-let () = condition1 ? {sideEffect(); sideEffect2()} : {sideEffect(); sideEffect2()}
-
-let () = condition1 ? while true { doThing() } : while true { doOtherThing() }
-let () = condition1 ? for i in 0 to 10 { () } : for i in 10 to 20 { () }
-
-let () = (truth : bool) ? (10: int) : (20: int)
-
-let () = condition ? {module L = Logger; L.log()} : {exception Exit; raise(Exit)}
-let () = condition ? lazy foo() : assert(false)
-
-let x = condition ? module(Foo) : module(Int : Number)
-let x = condition ? module(ModuleWithVeryLooooooooooooooooongNameHere) : module(ModuleWithVeryLooooooooooooooooongNameHereInt : Number)
-
-let x = condition ? {open React; render()} : {open React; render() }
-let x = condition ? %eval("console.log") : %eval("console.err")
-let x = condition ? %eval("consoooooooooooooooooooooole.log") : %eval("consoleeeeeeeeeeeeeee.err")
-
-let jsObj = condition ? {"x": 1, "y": 2} : {"x": 20, "y": 100}
-let jsObj = truth ? {"thisIsASuperLongFieldHere": loooooooooooooongIdentifier, "anotherLongField": superLoooooooooooooooooongIdentifier} : {"thisIsASuperLongFieldHere": loooooooooooooongIdentifier, "anotherLongField": superLoooooooooooooooooongIdentifier}
-
-let f = isPositive ? (x => x + 1) : (y => y - 1)
-let f = isPositive ? ((a, b) : int => a + b) : (c, d) : int => c - d
-let f = isPositive ? ((a, b) : int => a + b) : ((c, d) : int => c - d)
-
-a => a ? () => {a} : () => {a}
-a => a ? a : a
-a => a ? aasdasdasdasdasdasdaaasdasdasdasdasdasdasdasdasdasdasdasdasdaaaaaaaaa : a
-
-let x = @attrOnTernary (truth ? true : false)
-let x = @attrOnCondition truth ? true : false
-
-x ? y => () : onChange
-let y = <input value onChange={x ? _ => () : onChange} />
diff --git a/jscomp/syntax/tests/printer/expr/try.res b/jscomp/syntax/tests/printer/expr/try.res
deleted file mode 100644
index 0eb8257..0000000
--- a/jscomp/syntax/tests/printer/expr/try.res
+++ /dev/null
@@ -1,33 +0,0 @@
-try {
-  let x = 1
-  let y = 2
-  dangerousCall()
-} catch {
-| Foo => Js.log()
-| Exit => Js.log()
-}
-
-try myDangerousFn() catch {
-| Foo => Js.log()
-}
-
-let x = {
-  let y = 1
-  try {
-    apply()
-  } catch {
-  | _ => 2
-  }
-}
-
-@attr @attr2
-try myDangerousFn() catch {
-| Foo => Js.log()
-}
-
-
-let () =
-  @attr @attr2
-  try myDangerousFn() catch {
-  | Foo => Js.log()
-  }
diff --git a/jscomp/syntax/tests/printer/expr/tuple.res b/jscomp/syntax/tests/printer/expr/tuple.res
deleted file mode 100644
index 95a1de3..0000000
--- a/jscomp/syntax/tests/printer/expr/tuple.res
+++ /dev/null
@@ -1,19 +0,0 @@
-let x = (1, 2, 3)
-
-let x = (
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-)
-
-let x = @attr (
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-  superLongNameThatWillBreak,
-)
diff --git a/jscomp/syntax/tests/printer/expr/unary.res b/jscomp/syntax/tests/printer/expr/unary.res
deleted file mode 100644
index 684ce64..0000000
--- a/jscomp/syntax/tests/printer/expr/unary.res
+++ /dev/null
@@ -1,72 +0,0 @@
-let x = -a
-let x = -.a
-let x = !a
-
-let isMale = !user["female"]
-
-!(!a)
-!(!(!a))
-!(a |> f(b))
-
-(-1)->add
--1->add
--(1->add)
-!foo->print_bool
-(!foo)->print_bool
-!(foo->parseTruth)
-
-
-node.left->peekMinNode
-// same as the above
-(node.left)->peekMinNode
-
-// field access has higher precedence than unary -
-let x = -a.bar
-// same as above
-let x = -(a.bar)
-
-!(lazy x)
-lazy !x
-!(assert(x))
-assert(!x)
-!(@attr expr)
-!(arg => doStuffWith(arg))
-let x = !(truth: bool)
-let x = (!truth: bool)
-
-let z = !%extension
-// (!x.left) = value -> this does not parse, lhs of Pexp_setfield can't be a unary expression?
--[a, b, c]
-!module(Foo: Bar)
-!module(Foo)
-let x = -apply(arg)
-let x = -apply(. arg)
-let x = -Foo(a, b, c)
-let x = -{x:1, y: 2}
-let x = -list{1, 2, 3}
-let x = -(if true { 1 } else { 2 })
-let x = -(for i in 0 to 10 { () })
-let x = -(switch x {| Foo => 1})
-let x = -(while i < 10 { i.contents = 20 })
-let x = -(1, 2, 3)
-let x = -{
-  let a = 1
-  let b = 2
-  a + b
-}
-let x = -{
-  sideEffect()
-  generateNumber()
-}
-
--(true ? 0 : 1)
-
-let () = {
-  getResult()
-  -10
-}
-
-let x = (!truths)[0]
-(!streets)[0] = "foo-street" 
-
-!(arg => doStuffWith(arg))
diff --git a/jscomp/syntax/tests/printer/expr/underscoreApply.res b/jscomp/syntax/tests/printer/expr/underscoreApply.res
deleted file mode 100644
index 373f365..0000000
--- a/jscomp/syntax/tests/printer/expr/underscoreApply.res
+++ /dev/null
@@ -1,74 +0,0 @@
-let x = f(a, _, c)
-let x = f(a, g(x, _, z), _)
-let x = f(_, x, c)
-let x = f(_, _, _)
-let x = f(g(_))
-let x = f(~a=1, ~b=_, ~c=2)
-let x = f(~a=_, ~b=_, ~c=_)
-let x = f(~a=_, ~b=_, ~c=g(~x=2, ~y=_, ~z=_))
-
-let nested = x => List.length(_);
-let nested2 = (x, y, z) => List.length(_);
-
-let l = [1,2,3] |> List.map (i => i+1, _) |> List.filter (i => i>0, _);
-
-let l = (i => i+1) |> List.map(_, [1,2,3]);
-
-let x = List.length(_);
-
-let incr = (~v) => v+1;
-
-let l1 = [1,2,3] |> List.map(incr(~v=_)) |> List.length;
-
-let l2 = [1,2,3] |> List.map(incr(~v =_)) |> List.length;
-
-let optParam = (~v=?, ()) => v == None ? 0 : 1;
-
-let l1 =
- [Some(1), None, Some(2)] |> List.map(optParam(~v=?_, ())) |> List.length;
-
-let l2 =
- [Some(1), None, Some(2)] |> List.map(optParam(~v =?_, ())) |> List.length;
-
-// callback in last position
-f(a, b, (a, b) => List.length(_))
-// callback in first position
-f((a, b) => List.length(_), a, b)
-
-f(a, b, _)(x, y)
--f(a, b, _)
-f(a, b, _) + g(x, _, z)
-f(a, b, _) + g(x, _, z) + h(alpha, beta, _)
-
-assert(f(a, b, _))
-lazy f(a, b, _)
-
-getDirector(a, b, _).name
-
-f(a, b, _) ? g(x, y, _) : h(alpha, beta, _)
-
-<div onClick=f(a, b, _) />
-<div> {f(a, b, _)} </div>
-
-f(a, b, _)[ix]
-f(a, b, _)[ix] = 2
-
-getDirector(a, b, _).name = "Steve"
-
-filterNone |> Array.get(_, 0)
-filterNone->Array.get(_, 0)
-Array.get(_, 0)
-1 + Array.get(_, 0)
-Array.get(_, 1) + Array.get(_, 0)
-let f = Array.get(_, 0)
-
-let photo = pricedRoom["room"]["photos"] |> filterNone |> Array.get(_, 0)
-
-underscoreWithComments(
-  // Comment 1
-  x => {
-    // Comment 2
-    something()
-  },
-  _,
-)
diff --git a/jscomp/syntax/tests/printer/expr/while.res b/jscomp/syntax/tests/printer/expr/while.res
deleted file mode 100644
index 57298e0..0000000
--- a/jscomp/syntax/tests/printer/expr/while.res
+++ /dev/null
@@ -1,25 +0,0 @@
-let () = while true {
-  ()
-}
-
-while true {
-  let a = 1
-  let b = 2
-  infiniteLoop()
-  ()
-}
-
-// adds parens when condition breaks over multiple lines
-while (
-  continuePrefix.contents &&
-  aPrefixLen.contents <= aLen &&
-  bPrefixLen.contents <= bLen
-) {
-  let nextNonwhiteA = nextNonWhiteChar(aStr, 1, aPrefixLen.contents - 1)
-  let nextNonwhiteB = nextNonWhiteChar(bStr, 1, bPrefixLen.contents - 1)
-  ()
-}
-
-let x = @attr while true {
- break()
-}
diff --git a/jscomp/syntax/tests/printer/expr/whitespace.res b/jscomp/syntax/tests/printer/expr/whitespace.res
deleted file mode 100644
index 86674ce..0000000
--- a/jscomp/syntax/tests/printer/expr/whitespace.res
+++ /dev/null
@@ -1,37 +0,0 @@
-let x = {
-  let a = 1
-  let b = 2
-  sideEffect()
-  sideEffect2()
-}
-
-let x = {
-  let a = 1
-
-  let b = 2
-
-  a + b
-}
-
-let x = {
-  exception Exit
-
-  exception Terminate
-
-  module B = Belt
-
-  sideEffect()
-
-  open React
-
-  sideEffect2()
-}
-
-let x = {
-  exception Exit
-  exception Terminate
-  module B = Belt
-  sideEffect()
-  open React
-  sideEffect2()
-}
diff --git a/jscomp/syntax/tests/printer/ffi/expected/export.res.txt b/jscomp/syntax/tests/printer/ffi/expected/export.res.txt
deleted file mode 100644
index 4066aa0..0000000
--- a/jscomp/syntax/tests/printer/ffi/expected/export.res.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-
-  Syntax error!
-  tests/printer/ffi/export.res:1:7-11
-
-  1 │ export type callback = ReactEvent.Mouse.t => unit
-  2 │ 
-  3 │ export type t = int and export s = string
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/printer/ffi/export.res:3:31-32
-
-  1 │ export type callback = ReactEvent.Mouse.t => unit
-  2 │ 
-  3 │ export type t = int and export s = string
-  4 │ export type t = int and s = string
-  5 │ type t = int and export s = string
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/printer/ffi/export.res:5:24-25
-
-  3 │ export type t = int and export s = string
-  4 │ export type t = int and s = string
-  5 │ type t = int and export s = string
-  6 │ 
-  7 │ export let callback = _ => Js.log("Clicked")
-
-  consecutive statements on a line must be separated by ';' or a newline
-
-
-  Syntax error!
-  tests/printer/ffi/export.res:10:40-41
-
-   8 │ export callback = _ => Js.log("Clicked")
-   9 │ 
-  10 │ export let x = "hello world" and export y = 2
-  11 │ export x = "hello world" and export y = 2
-  12 │ let x = "hello world" and export y = 2
-
-  Did you forget a `=` here?
-
-
-  Syntax error!
-  tests/printer/ffi/export.res:12:33-34
-
-  10 │ export let x = "hello world" and export y = 2
-  11 │ export x = "hello world" and export y = 2
-  12 │ let x = "hello world" and export y = 2
-  13 │ 
-
-  Did you forget a `=` here?
-
diff --git a/jscomp/syntax/tests/printer/modExpr/apply.res b/jscomp/syntax/tests/printer/modExpr/apply.res
deleted file mode 100644
index f363ae7..0000000
--- a/jscomp/syntax/tests/printer/modExpr/apply.res
+++ /dev/null
@@ -1,23 +0,0 @@
-module X = F(A)
-module X = F(Arg1, Arg2, Arg3)
-
-module X = F(A : SetLike)
-module X = F(A : SetLike, B: TreeLike)
-module X = F(A : SetLike, B: TreeLike, C: BtreeLike, D: RedBlackTreeLike, E: AvlTreeLike)
-
-module X = F()
-module X = F()()
-module X = F((), ())
-
-module S0 = Make({
-  type t = int
-  let eq = (x, y) => x == y
-})
-
-module S1 = Make({
-  type t = int
-  let eq = (x, y) => x * x == y * y
-})
-
-
-let someFunctorAsFunction = (x: module(MT)): module(ResT) => module(SomeFunctor(unpack(x)))
diff --git a/jscomp/syntax/tests/printer/modExpr/await.res b/jscomp/syntax/tests/printer/modExpr/await.res
deleted file mode 100644
index 7a27bc2..0000000
--- a/jscomp/syntax/tests/printer/modExpr/await.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module M = await ME
-
-module M = await (ME: MT)
diff --git a/jscomp/syntax/tests/printer/modExpr/expected/apply.res.txt b/jscomp/syntax/tests/printer/modExpr/expected/apply.res.txt
deleted file mode 100644
index ce1b224..0000000
--- a/jscomp/syntax/tests/printer/modExpr/expected/apply.res.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-module X = F(A)
-module X = F(Arg1, Arg2, Arg3)
-
-module X = F(A: SetLike)
-module X = F(A: SetLike, B: TreeLike)
-module X = F(A: SetLike, B: TreeLike, C: BtreeLike, D: RedBlackTreeLike, E: AvlTreeLike)
-
-module X = F()
-module X = F((), ())
-module X = F((), ())
-
-module S0 = Make({
-  type t = int
-  let eq = (x, y) => x == y
-})
-
-module S1 = Make({
-  type t = int
-  let eq = (x, y) => x * x == y * y
-})
-
-let someFunctorAsFunction = (x: module(MT)): module(ResT) => module(SomeFunctor(unpack(x)))
diff --git a/jscomp/syntax/tests/printer/modExpr/expected/await.res.txt b/jscomp/syntax/tests/printer/modExpr/expected/await.res.txt
deleted file mode 100644
index 7a27bc2..0000000
--- a/jscomp/syntax/tests/printer/modExpr/expected/await.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-module M = await ME
-
-module M = await (ME: MT)
diff --git a/jscomp/syntax/tests/printer/modExpr/expected/extension.res.txt b/jscomp/syntax/tests/printer/modExpr/expected/extension.res.txt
deleted file mode 100644
index 2dbb2c1..0000000
--- a/jscomp/syntax/tests/printer/modExpr/expected/extension.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-module React = %import("react")
diff --git a/jscomp/syntax/tests/printer/modExpr/expected/functor.res.txt b/jscomp/syntax/tests/printer/modExpr/expected/functor.res.txt
deleted file mode 100644
index 312c49e..0000000
--- a/jscomp/syntax/tests/printer/modExpr/expected/functor.res.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-module F = (A: X, B: Y) => A
-module F = (@attr1 A: X, @attr2 B: Y) => A
-include (X: Map, Y: Set) => Z
-
-module F = (@functorAttr A: X, B: Y) => A
-include (@functorAttr X: Map, Y: Set) => Z
-include (@functorAttr X: Map, Y: Set, Z: SuperLongModuleTypeName, Foo: Baaaaaaaaar) => Z
-include (@functorAttr2 @functorAttr X: Map, @attr3 Y: Set) => Z
-include (@functorAttr2 @functorAttr X: Map, @attr3 Y: Set) => Zzzzzzzzzzzzzzzzzzz
-
-module Make = (A: X, B: Y) => {
-  let a = A.a + B.b
-}
-// constraint on return type
-module Make = (A: X, B: Y): Set => {
-  let a = A.a + B.b
-}
-include (@functorAttr X: Map, Y: Set, Z: SuperLongModuleTypeName, Foo: Baaaaaaaaar): Set => {
-  let a = A.a + B.b
-}
-// with attributes
-module Make = (@functorAttr A: X, B: Y): Set => {
-  let a = A.a + B.b
-}
-module Make = (@functorAttr A: X, @functorAttr2 B: Y): Set => {
-  let a = A.a + B.b
-}
-
-module F = () => Map
-module F = @functorAttr () => Map
-include () => Map
-include @functorAttr () => Map
-
-module Make = (
-  Cmp: {
-    type t
-    let eq: (t, t) => bool
-  },
-): {
-  type key = Cmp.t
-  type coll
-  let empty: coll
-  let add: (coll, key) => coll
-} => {
-  open Cmp
-  type key = t
-  type coll = list<key>
-  let empty = list{}
-  let add = (y: coll, e: key) =>
-    if List.exists(x => eq(x, e), y) {
-      y
-    } else {
-      list{e, ...y}
-    }
-}
-
-module Make = (A: X, B: Y): ((Set, Set) => Set) => {
-  let a = A.a + B.b
-}
-module Make = (SuperLongNaaaaaaaame: X, SuperLongNaaaaaaaame: Y, SuperLongNaaaaaaaame: Z): (
-  (
-    Seeeeeeeeeeeeeeeeeeeeeeeeeeeeet,
-    Seeeeeeeeeeeeeeeeeeeeeeeeeeeeet,
-    Seeeeeeeeeeeeeeeeeeeeeeeeeeeeet,
-  ) => Set
-) => {
-  let a = A.a + B.b
-}
-
-module Make = (H: Hashtbl.HashedType): (S with type data = H.t) => {
-  type rec weak_t<'a> = t<'a>
-  let weak_create = create
-  let emptybucket = weak_create(0)
-
-  type rec data = H.t
-}
-
-module Gen1 = (P: Primitive, ()) => {
-  type t = P.t
-  type internal = P.t
-  let inject = t => t
-}
-
-module DistinctString = (): StringBased => {
-  type t = string
-  let inject = t => t
-}
diff --git a/jscomp/syntax/tests/printer/modExpr/expected/structure.res.txt b/jscomp/syntax/tests/printer/modExpr/expected/structure.res.txt
deleted file mode 100644
index a958790..0000000
--- a/jscomp/syntax/tests/printer/modExpr/expected/structure.res.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-module StringArray = {
-  type t = array<string>
-
-  let empty = []
-}
-
-module Empty = {}
-
-module Empty = {
-  // TODO: convince management to implement this
-}
-
-module Empty = {/* test */}
-
-module EmptyModule = {
-  /* TODO: management on vacation */
-}
-
-module type T = {}
-
-let g = {
-  module M: T = {}
-  0
-}
-
-module M7: {
-  module N': {
-    let x: int
-  }
-} = (M6: {
-  module N: {
-    let x: int
-  }
-  module N' = N
-})
-
-module M8 = M7
-
-module M5 = G0()
-
-module M7: {
-  let x: int
-} = {
-  let x = 8
-}
-
-module M3: {
-  module N': {
-    let x: int
-  }
-} = {
-  include M'
-}
-
-module G0: (X: {}) =>
-{
-  module N': {
-    let x: int
-  }
-} = F0
-
-module M6 = {
-  module D = {
-    let y = 3
-  }
-  module N = {
-    let x = 1
-  }
-  module N' = N
-}
diff --git a/jscomp/syntax/tests/printer/modExpr/expected/unpack.res.txt b/jscomp/syntax/tests/printer/modExpr/expected/unpack.res.txt
deleted file mode 100644
index 0b5d376..0000000
--- a/jscomp/syntax/tests/printer/modExpr/expected/unpack.res.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-module Device = unpack({
-  let deviceName = parseCmdline()
-  try Hashtbl.find(devices, deviceName) catch {
-  | Not_found => exit(2)
-  }
-})
-
-module Device = unpack({
-  let deviceName = parseCmdline()
-  try Hashtbl.find(devices, deviceName) catch {
-  | Not_found => exit(2)
-  }
-}: Device)
-
-let draw_using_device = (device_name, picture) => {
-  module Device = unpack(
-    Hashtbl.find(devices, device_name, test1, test2, test3, test4, test5, test6):
-      DEVICEEEEEEEEEEEEEEEEEEEE
-  )
-  Device.draw(picture)
-}
-
-module New_three = unpack(three: X_int)
-
-let to_int = m => {
-  module M = unpack(m: X_int)
-  M.x
-}
diff --git a/jscomp/syntax/tests/printer/modExpr/extension.res b/jscomp/syntax/tests/printer/modExpr/extension.res
deleted file mode 100644
index 2dbb2c1..0000000
--- a/jscomp/syntax/tests/printer/modExpr/extension.res
+++ /dev/null
@@ -1 +0,0 @@
-module React = %import("react")
diff --git a/jscomp/syntax/tests/printer/modExpr/functor.res b/jscomp/syntax/tests/printer/modExpr/functor.res
deleted file mode 100644
index 4b4982f..0000000
--- a/jscomp/syntax/tests/printer/modExpr/functor.res
+++ /dev/null
@@ -1,67 +0,0 @@
-module F = (A: X, B: Y) => A 
-module F = (@attr1 A: X, @attr2 B: Y) => A 
-include (X: Map, Y: Set) => Z
-
-module F = @functorAttr (A: X, B: Y) => A 
-include @functorAttr (X: Map, Y: Set) => Z
-include @functorAttr (X: Map, Y: Set, Z: SuperLongModuleTypeName, Foo: Baaaaaaaaar) => Z
-include @functorAttr (@functorAttr2 X: Map, @attr3 Y: Set) => Z
-include @functorAttr (@functorAttr2 X: Map, @attr3 Y: Set) => Zzzzzzzzzzzzzzzzzzz
-
-module Make = (A: X, B: Y) => {let a = A.a + B.b}
-// constraint on return type
-module Make = (A: X, B: Y) :Set => {let a = A.a + B.b}
-include @functorAttr (X: Map, Y: Set, Z: SuperLongModuleTypeName, Foo: Baaaaaaaaar): Set => {let a = A.a + B.b}
-// with attributes
-module Make = @functorAttr (A: X, B: Y) :Set => {let a = A.a + B.b}
-module Make = @functorAttr (A: X, @functorAttr2 B: Y) :Set => {let a = A.a + B.b}
-
-
-module F = () => Map
-module F = @functorAttr () => Map
-include () => Map
-include @functorAttr () => Map
-
-module Make = (
-  Cmp: {
-    type t;
-    let eq: (t, t) => bool;
-  }) : {
- type key = Cmp.t;
- type coll;
- let empty: coll;
- let add: (coll, key) => coll;
-} => {
-  open Cmp;
-  type key = t;
-  type coll = list<key>;
-  let empty = list{};
-  let add = (y: coll, e: key) =>
-    if (List.exists(x => eq(x, e), y)) {
-      y;
-    } else {
-      list{e, ...y};
-    };
-};
-
-module Make = (A: X, B: Y) :((Set, Set) => Set) => {let a = A.a + B.b}
-module Make = (SuperLongNaaaaaaaame: X, SuperLongNaaaaaaaame: Y, SuperLongNaaaaaaaame: Z) :((Seeeeeeeeeeeeeeeeeeeeeeeeeeeeet, Seeeeeeeeeeeeeeeeeeeeeeeeeeeeet, Seeeeeeeeeeeeeeeeeeeeeeeeeeeeet) => Set) => {let a = A.a + B.b}
-
-module Make = (H: Hashtbl.HashedType): (S with type data = H.t) => {
-  type rec weak_t<'a> = t<'a>
-  let weak_create = create
-  let emptybucket = weak_create(0)
-
-  type rec data = H.t
-}
-
-module Gen1 = (P: Primitive, ()) => {
-  type t = P.t
-  type internal = P.t
-  let inject = t => t
-}
-
-module DistinctString = (): StringBased  => {
-  type t = string
-  let inject = t => t
-}
diff --git a/jscomp/syntax/tests/printer/modExpr/structure.res b/jscomp/syntax/tests/printer/modExpr/structure.res
deleted file mode 100644
index 86a882d..0000000
--- a/jscomp/syntax/tests/printer/modExpr/structure.res
+++ /dev/null
@@ -1,71 +0,0 @@
-module StringArray = {
-  type t = array<string>
-
-  let empty = []
-}
-
-module Empty = {}
-
-module Empty = {
-  // TODO: convince management to implement this
-}
-
-module Empty = {/* test */}
-
-module EmptyModule = {
-  /* TODO: management on vacation */
-}
-
-module type T = {}
-
-let g = {
-  module M: T = {}
-  0
-}
-
-module M7: {
-  module N': {
-    let x: int
-  }
-} = (M6: {
-  module N: {
-    let x: int
-  }
-  module N' = N
-})
-
-
-module M8 = M7
-
-module M5 = G0()
-
-module M7: {
-  let x: int
-} = {
-  let x = 8
-}
-
-module M3: {
-  module N': {
-    let x: int
-  }
-} = {
-  include M'
-}
-
-module G0: (X: {}) =>
-{
-  module N': {
-    let x: int
-  }
-} = F0
-
-module M6 = {
-  module D = {
-    let y = 3
-  }
-  module N = {
-    let x = 1
-  }
-  module N' = N
-}
diff --git a/jscomp/syntax/tests/printer/modExpr/unpack.res b/jscomp/syntax/tests/printer/modExpr/unpack.res
deleted file mode 100644
index ce1dabe..0000000
--- a/jscomp/syntax/tests/printer/modExpr/unpack.res
+++ /dev/null
@@ -1,25 +0,0 @@
-module Device = unpack({
-  let deviceName = parseCmdline()
-  try Hashtbl.find(devices, deviceName) catch {
-  | Not_found => exit(2)
-  }
-})
-
-module Device = unpack({
-  let deviceName = parseCmdline()
-  try Hashtbl.find(devices, deviceName) catch {
-  | Not_found => exit(2)
-  }
-} : Device)
-
-let draw_using_device = (device_name, picture) => {
-  module Device = unpack(Hashtbl.find(devices, device_name, test1, test2, test3, test4, test5, test6): DEVICEEEEEEEEEEEEEEEEEEEE)
-  Device.draw(picture)
-}
-
-module New_three = unpack(three: X_int)
-
-let to_int = (m) => {
-  module M = unpack(m : X_int)
-  M.x
-}
diff --git a/jscomp/syntax/tests/printer/modType/exoticIdent.res b/jscomp/syntax/tests/printer/modType/exoticIdent.res
deleted file mode 100644
index 7811a69..0000000
--- a/jscomp/syntax/tests/printer/modType/exoticIdent.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module type A = Foo with type Foo.\"let"<'\"type"> = \"module"
-
-module type A = Foo with type Foo.\"let"<'\"type"> := \"module"
diff --git a/jscomp/syntax/tests/printer/modType/expected/exoticIdent.res.txt b/jscomp/syntax/tests/printer/modType/expected/exoticIdent.res.txt
deleted file mode 100644
index 7811a69..0000000
--- a/jscomp/syntax/tests/printer/modType/expected/exoticIdent.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-module type A = Foo with type Foo.\"let"<'\"type"> = \"module"
-
-module type A = Foo with type Foo.\"let"<'\"type"> := \"module"
diff --git a/jscomp/syntax/tests/printer/modType/expected/extension.res.txt b/jscomp/syntax/tests/printer/modType/expected/extension.res.txt
deleted file mode 100644
index 01688b2..0000000
--- a/jscomp/syntax/tests/printer/modType/expected/extension.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-module type ReactInterface = %import("react-bindings")
diff --git a/jscomp/syntax/tests/printer/modType/expected/functor.res.txt b/jscomp/syntax/tests/printer/modType/expected/functor.res.txt
deleted file mode 100644
index 311a32c..0000000
--- a/jscomp/syntax/tests/printer/modType/expected/functor.res.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-module type Functor = SetLike => Set
-module type Functor = (S: SetLike, B: BtreeLike) => NeoTree
-module type Functor = (SetLike, BtreeLike) => NeoTree
-module type Functor = (SetLike, BtreeLike) => NeoTree
-module type Functor = (SetLike, BtreeLike) => NeoTree
-
-module type Functor = (@attr1 SetLike, @attr2 BtreeLike) => NeoTree
-module type Functor = (@attr1 @attr0 SetLike, @attr2 BtreeLike) => NeoTree
-
-module type Functor = (@attr1 SetLike, @attr2 BtreeLike) => @attr3 NeoTree
-module type Functor = (@attr1 SetLike, @attr2 BtreeLike) => @attr3 NeoTree
-
-module type Functor = (SetLike => Set) with type t = A.t
-module type Functor = SetLike => (Set with type t = A.t)
-
-module type B = () =>
-{
-
-}
diff --git a/jscomp/syntax/tests/printer/modType/expected/ident.res.txt b/jscomp/syntax/tests/printer/modType/expected/ident.res.txt
deleted file mode 100644
index 41ecd0a..0000000
--- a/jscomp/syntax/tests/printer/modType/expected/ident.res.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-module type T = Tree
-
-module type T = @attr
-Tree
-
-module type list = list
-module type t = s
diff --git a/jscomp/syntax/tests/printer/modType/expected/moduleTypeOf.res.txt b/jscomp/syntax/tests/printer/modType/expected/moduleTypeOf.res.txt
deleted file mode 100644
index 2c1f4c8..0000000
--- a/jscomp/syntax/tests/printer/modType/expected/moduleTypeOf.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-module type LinkedList = module type of List
-module type LinkedList = @attr
-module type of List
diff --git a/jscomp/syntax/tests/printer/modType/expected/signature.res.txt b/jscomp/syntax/tests/printer/modType/expected/signature.res.txt
deleted file mode 100644
index 554fadf..0000000
--- a/jscomp/syntax/tests/printer/modType/expected/signature.res.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-module type Printable = {
-  type t
-  let print: (Format.formatter, t) => unit
-}
-
-module type Comparable = {
-  type t
-  let compare: (t, t) => int
-}
-
-module type Foo = {}
-
-module type Foo = {/* rainy clouds */}
-
-module type Foo = {
-  /* rainy clouds */
-}
-
-module type Foo = {
-  // trailing
-}
-
-module type Foo = {
-  // Sunny clouds
-}
diff --git a/jscomp/syntax/tests/printer/modType/expected/withConstraints.res.txt b/jscomp/syntax/tests/printer/modType/expected/withConstraints.res.txt
deleted file mode 100644
index 45b429e..0000000
--- a/jscomp/syntax/tests/printer/modType/expected/withConstraints.res.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-module type A = Foo with type t = string
-module type A = Foo with type Bar.t = string
-module type A = Foo with type t<'a> = string
-module type A = Foo with type t<'a, 'b> = string
-module type A = Foo with type t = 'st constraint 'st = int
-module type A = Foo with type t = 'st constraint 'st = int constraint 'x = int
-module type A = Foo
-  with type t = 'st constraint 'st = int constraint 'x = int
-  and type t = 'st constraint 'st = int constraint 'x = int
-  and type t = 'st constraint 'st = int constraint 'x = int
-
-module type A = Foo with type t := string
-module type A = Foo with type t<'a> := string
-module type A = Foo with type t<'a, 'b> := string
-module type A = Foo with type Bar.t<'a, 'b> := string
-module type A = Foo
-  with type Bar.t<'a, 'b> := string
-  and type Bar.t<'a, 'b> := string
-  and type Bar.t<'a, 'b> := string
-
-module type A = Foo with module Bar = Array
-module type A = Foo with module Bar = Belt.Array
-module type A = Foo with module X.Bar = Belt.Array
-module type A = Foo
-  with module X.Bar = Belt.Array
-  and module X.Bar = Belt.Array
-  and module X.Bar = Belt.Array
-
-module type A = Foo with module Bar := Array
-module type A = Foo with module Bar := Belt.Array
-module type A = Foo
-  with module X.Bar := Belt.Array
-  and module X.Bar := Belt.Array
-  and module X.Bar := Belt.Array
-
-module Same = (Na: N, Nb: N): ((S with type number1 = Na.number) with type number2 = Nb.number) => {
-  type number1 = Na.number
-  type number2 = Nb.number
-  let rec sim = ((n, m)) =>
-    if Na.is_zero(n) {
-      Nb.is_zero(m)
-    } else {
-      sim((Na.pred(n), Nb.pred(m)))
-    }
-  let similar = ((n, m)) =>
-    try sim((n, m)) catch {
-    | Na.Too_small => false
-    | Nb.Too_small => false
-    }
-}
diff --git a/jscomp/syntax/tests/printer/modType/extension.res b/jscomp/syntax/tests/printer/modType/extension.res
deleted file mode 100644
index 01688b2..0000000
--- a/jscomp/syntax/tests/printer/modType/extension.res
+++ /dev/null
@@ -1 +0,0 @@
-module type ReactInterface = %import("react-bindings")
diff --git a/jscomp/syntax/tests/printer/modType/functor.res b/jscomp/syntax/tests/printer/modType/functor.res
deleted file mode 100644
index 9149ed5..0000000
--- a/jscomp/syntax/tests/printer/modType/functor.res
+++ /dev/null
@@ -1,19 +0,0 @@
-module type Functor = SetLike => Set
-module type Functor = (S: SetLike, B: BtreeLike) => NeoTree
-module type Functor = (_: SetLike, _: BtreeLike) => NeoTree
-module type Functor = (SetLike, BtreeLike) => NeoTree
-module type Functor = SetLike => BtreeLike => NeoTree
-
-module type Functor = (@attr1 _: SetLike, @attr2 _: BtreeLike) => NeoTree
-module type Functor = @attr0 (@attr1 _: SetLike, @attr2 _: BtreeLike) => NeoTree
-
-
-module type Functor = @attr1 SetLike => @attr2 BtreeLike => @attr3 NeoTree
-module type Functor = @attr1 (SetLike) => @attr2 (BtreeLike) => @attr3 NeoTree
-
-module type Functor = SetLike => Set with type t = A.t
-module type Functor = SetLike => (Set with type t = A.t)
-
-module type B = () => {
-
-}
\ No newline at end of file
diff --git a/jscomp/syntax/tests/printer/modType/ident.res b/jscomp/syntax/tests/printer/modType/ident.res
deleted file mode 100644
index 2527923..0000000
--- a/jscomp/syntax/tests/printer/modType/ident.res
+++ /dev/null
@@ -1,6 +0,0 @@
-module type T = Tree
-
-module type T = @attr Tree
-
-module type list = list
-module type t = s
diff --git a/jscomp/syntax/tests/printer/modType/moduleTypeOf.res b/jscomp/syntax/tests/printer/modType/moduleTypeOf.res
deleted file mode 100644
index 552e9be..0000000
--- a/jscomp/syntax/tests/printer/modType/moduleTypeOf.res
+++ /dev/null
@@ -1,2 +0,0 @@
-module type LinkedList = module type of List
-module type LinkedList = @attr module type of List
diff --git a/jscomp/syntax/tests/printer/modType/signature.res b/jscomp/syntax/tests/printer/modType/signature.res
deleted file mode 100644
index c2d9aa0..0000000
--- a/jscomp/syntax/tests/printer/modType/signature.res
+++ /dev/null
@@ -1,24 +0,0 @@
-module type Printable = {
-  type t
-  let print: (Format.formatter, t) => unit
-}
-
-module type Comparable = {
-  type t
-  let compare: (t, t) => int
-}
-
-module type Foo = {}
-
-module type Foo = {/* rainy clouds */}
-
-module type Foo = {
-  /* rainy clouds */
-}
-
-module type Foo = { // trailing
-}
-
-module type Foo = {
-  // Sunny clouds
-}
diff --git a/jscomp/syntax/tests/printer/modType/withConstraints.res b/jscomp/syntax/tests/printer/modType/withConstraints.res
deleted file mode 100644
index 492783d..0000000
--- a/jscomp/syntax/tests/printer/modType/withConstraints.res
+++ /dev/null
@@ -1,52 +0,0 @@
-module type A = Foo with type t = string
-module type A = Foo with type Bar.t = string
-module type A = Foo with type t<'a> = string
-module type A = Foo with type t<'a, 'b> = string
-module type A = Foo with type t = 'st constraint 'st = int
-module type A = Foo with type t = 'st constraint 'st = int constraint 'x = int
-module type A = Foo
-  with type t = 'st constraint 'st = int constraint 'x = int
-   and type t = 'st constraint 'st = int constraint 'x = int
-   and type t = 'st constraint 'st = int constraint 'x = int
-
-module type A = Foo with type t := string
-module type A = Foo with type t<'a> := string
-module type A = Foo with type t<'a, 'b> := string
-module type A = Foo with type Bar.t<'a, 'b> := string
-module type A = Foo
-  with type Bar.t<'a, 'b> := string
-   and type Bar.t<'a, 'b> := string
-   and type Bar.t<'a, 'b> := string
-
-module type A = Foo with module Bar = Array
-module type A = Foo with module Bar = Belt.Array
-module type A = Foo with module X.Bar = Belt.Array
-module type A = Foo
-  with module X.Bar = Belt.Array
-   and module X.Bar = Belt.Array
-   and module X.Bar = Belt.Array
-
-module type A = Foo with module Bar := Array
-module type A = Foo with module Bar := Belt.Array
-module type A = Foo
-  with module X.Bar := Belt.Array
-   and module X.Bar := Belt.Array
-   and module X.Bar := Belt.Array
-
-module Same = (Na: N, Nb: N): (
-  (S with type number1 = Na.number) with type number2 = Nb.number
-) => {
-  type number1 = Na.number
-  type number2 = Nb.number
-  let rec sim = ((n, m)) =>
-    if Na.is_zero(n) {
-      Nb.is_zero(m)
-    } else {
-      sim((Na.pred(n), Nb.pred(m)))
-    }
-  let similar = ((n, m)) =>
-    try sim((n, m)) catch {
-    | Na.Too_small => false
-    | Nb.Too_small => false
-    }
-}
diff --git a/jscomp/syntax/tests/printer/other/StaticReactTypes.res b/jscomp/syntax/tests/printer/other/StaticReactTypes.res
deleted file mode 100644
index 713ec2a..0000000
--- a/jscomp/syntax/tests/printer/other/StaticReactTypes.res
+++ /dev/null
@@ -1,88 +0,0 @@
-type empty =
-    | Empty_;
-  /*
-   * Also create another form for splicing in nodes into otherwise fixed length
-   * sets.
-   */
-  type elem<'t> =
-    | Empty: elem<empty>
-    | Element(renderable<('s, 'a) => 'sub>): elem<('s, 'a) => 'sub>
-    | TwoElements(elem<'t1>, elem<'t2>): elem<('t1, 't2)>
-    /*
-     * Not an ordered map yet, but should be.
-     */
-    | ElementMap(list<elem<'t>>): elem<list<'t>>
-  /*
-   * Instance subtree. Mirrors the shape of JSX, instead of just being a List.
-   */
-  and subtree<'t> =
-    | EmptyInstance: subtree<empty>
-    | Instance(inst<('s, 'a) => 'sub>): subtree<('s, 'a) => 'sub>
-    /* Having TwoInstances mirror the fact that TwoElements requires sub
-     * elements, was probably overkill. */
-    | TwoInstances(subtree<'t1>, subtree<'t2>): subtree<('t1, 't2)>
-    | InstanceMap(list<subtree<'t>>): subtree<list<'t>>
-  and reducer<'t> = (inst<'t>, 'a) => 's constraint 't = ('s, 'a) => 'sub
-  /*
-   * These are just convenient shortcuts to specifiying the entire spec.  It just
-   * makes it so you don't have to do a spread onto a record, since in
-   * static-by-default trees, you don't need to define a record beforehand.
-   */
-  and componentSpec<'t> =
-    /* Add more forms here for convenience */
-    | Reducer('s, elem<'sub>, reducer<'t>)
-  constraint 't = ('s, 'a) => 'sub
-  and self<'t> = {
-    reduceEvent: 'e .('e => 'a, 'e) => unit,
-    /*
-     * Implements the ability to cause your node to be swapped out from within
-     * its tree. Not purely functional by design. This is for things like
-     * external subscriptions that don't arive via propagations through the tree.
-     * However, this is better than simple naive mutation. That's because this
-     * "out of nowhere" operation notifies the root of the tree that it should
-     * perform a mutation. That allows the root to create an entirely new
-     * reference, leaving the previous tree completely in tact! There isn't a
-     * single mutable reference cell in the entire tree - only the root node is
-     * mutable, and even then it doesn't have to be.
-     *
-     * This Api takes highly imperative operations like request animation frame,
-     * and allows them to work well with what would otherwise be a purely
-     * functional data structure (aside from the side effects caused by
-     * subscribing upon mount etc).
-     */
-    send: 'a => unit,
-  }
-  constraint 't = ('s, 'a) => 'sub
-  /*
-   * The result of applying props. Now the result is a function that just waits
-   * for React to supply the state, and in turn returns the componentSpec.
-   */
-  and renderable<'t> = (~state: 's=?, self<'t>) => componentSpec<'t>
-  constraint 't = ('s, 'a) => 'sub
-  /*
-   * TODO: Can store the subreplacer in the instance so we don't need to
-   * recompute it every time.
-   */
-  and inst<'t> = {
-    /* Memoized just for performance */
-    replacer: replacer<'t>,
-    /* Memoized just for performance*/
-    subreplacer: subreplacer<'sub>,
-    self: self<'t>,
-    renderable: renderable<'t>,
-    spec: componentSpec<'t>,
-    subtree: subtree<'sub>,
-  }
-  constraint 't = ('s, 'a) => 'sub
-  /*
-   * A series of chained functions that forms a fishing line that each component
-   * has a handle to. When invoked it can cause its own individual instance node
-   * in the tree to be replaced in the *root* tree that it exists in! This is
-   * totally type safe, and requires no dynamic casts, and no searching through
-   * the tree.
-   */
-  /* Make it even more generalized on action than necessary to avoid GADT
-   * errors. */
-  and replacer<'t> = (inst<'t> => inst<'t>) => unit
-  constraint 't = ('s, 'a) => 'sub
-  and subreplacer<'sub> = (subtree<'sub> => subtree<'sub>) => unit;
diff --git a/jscomp/syntax/tests/printer/other/attributes.res b/jscomp/syntax/tests/printer/other/attributes.res
deleted file mode 100644
index 1df3f38..0000000
--- a/jscomp/syntax/tests/printer/other/attributes.res
+++ /dev/null
@@ -1,26 +0,0 @@
-@attr(: int)
-let x = 1
-
-@attr(?var)
-let x = 1
-
-@attr(?var when x === 1)
-let x = 1
-
-%ext(: let x: int)
-%ext(:
-  let x: int
-  let y: float
-) 
-
-%%ext("A"; "B")
-
-@@superPrivate(
-  @module("./logo.svg") external logo: string = "default"
-)
-
-@inlinePrivate(
-  @module("./logo.svg") external logo: string = "default"
-)
-let x = 1
-
diff --git a/jscomp/syntax/tests/printer/other/case.res b/jscomp/syntax/tests/printer/other/case.res
deleted file mode 100644
index c72cc2f..0000000
--- a/jscomp/syntax/tests/printer/other/case.res
+++ /dev/null
@@ -1,126 +0,0 @@
-let printExprFunParameters = (~uncurried, parameters) =>
-  switch parameters {
-  | list{([], Asttypes.Nolabel, None, {Parsetree.ppat_desc: Ppat_any})}
-    when !uncurried =>
-    Doc.text("_")
-  | list{(
-      [],
-      Asttypes.Nolabel,
-      None,
-      {Parsetree.ppat_desc: Ppat_var(stringLoc)}
-    )} when !uncurried =>
-    Doc.text(stringLoc.txt)
-  | list{(
-      [],
-      Nolabel,
-      None,
-      {ppat_desc: Ppat_construct({txt: Longident.Lident("()")}, None)}
-    )} when !uncurried =>
-    Doc.text("()")
-  | parameters =>
-    let lparen = if uncurried {
-      Doc.text("(. ")
-    } else {
-      Doc.lparen
-    }
-    let shouldHug = ParsetreeViewer.parametersShouldHug(parameters)
-    let printedParamaters = Doc.concat(list{
-      if shouldHug {
-        Doc.nil
-      } else {
-        Doc.softLine
-      },
-      Doc.join(
-        ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-        List.map(printExpFunParameter, parameters),
-      ),
-      })
-    Doc.group(
-      Doc.concat(list{
-        lparen,
-        if shouldHug {
-          printedParamaters
-        } else {
-          Doc.indent(printedParamaters)
-        },
-        if shouldHug {
-          Doc.nil
-        } else {
-          Doc.concat(list{Doc.trailingComma, Doc.softLine})
-        },
-        Doc.rparen,
-      }),
-    )
-  }
-
-let isHuggableExpression = (expr) =>
-  switch expr.pexp_desc {
-  | Pexp_array(_)
-  | Pexp_tuple(_)
-  | Pexp_construct ({txt: Longident.Lident("::")}, _)
-  | Pexp_construct ({txt: Longident.Lident("[]")}, _)
-  | Pexp_extension ({txt: "bs.obj"}, _)
-  | Pexp_record(_) => true
-  | _ => false
-  }
-
-  switch colour {
-    | (Red | Blue) | ((Green | Purple) | Rosa) | (Black | White) | AnotherColoooooour => x
-
-  }
-
-let precedence = x => switch x {
-  | HashEqual
-  | ColonEqual => 1
-  | Lor => 2
-  | Land => 3
-  | Equal
-  | EqualEqual
-  | EqualEqualEqual
-  | LessThan
-  | GreaterThan
-  | BangEqual
-  | BangEqualEqual
-  | LessEqual
-  | GreaterEqual
-  | BarGreater => 4
-  | Plus
-  | PlusDot
-  | Minus
-  | MinusDot
-  | PlusPlus => 5
-  | Asterisk
-  | AsteriskDot
-  | Forwardslash
-  | ForwardslashDot => 6
-  | Exponentiation => 7
-  | Hash
-  | HashHash
-  | MinusGreater => 8
-  | Dot => 9
-  | _ => 0
-}
-
-let first = switch first {
-| Some(x) => x
-| None => ("": format6<_>)
-}
-
-// spread over multiple lines, because author used multiple lines
-switch a {
-| B
-| C | D => 1
-| E => 2
-}
-
-// keep on one line, author kept it on one line
-switch a {
-| B | C | D => 1
-| E => 2
-}
-
-// should naturally break over multiple lines
-switch a {
-| Bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | Ccccccccccccccccccccccccccccccccccccccccccccccccccccc | Dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd | Eeeeeeeeeeeeee => 1
-| E => 2
-}
diff --git a/jscomp/syntax/tests/printer/other/char.res b/jscomp/syntax/tests/printer/other/char.res
deleted file mode 100644
index 47ba3a5..0000000
--- a/jscomp/syntax/tests/printer/other/char.res
+++ /dev/null
@@ -1,13 +0,0 @@
-let x = 'a'
-let x = '\\'
-let x = '\''
-let x = '\n'
-let x = '\t'
-let x = '\b'
-let x = '\r'
-let x = ' '
-let x = '\o021'
-let x = '\xAA'
-let x = '\179'
-let heart = '\u2665'
-let smile2 = '\u{1F600}'
diff --git a/jscomp/syntax/tests/printer/other/comments.res b/jscomp/syntax/tests/printer/other/comments.res
deleted file mode 100644
index e5999a3..0000000
--- a/jscomp/syntax/tests/printer/other/comments.res
+++ /dev/null
@@ -1,4 +0,0 @@
-/* nested /* comments */ */
-
-/* lvl 0 /* lvl 1 /* lvl 2 */ */ */
-let x = 1
diff --git a/jscomp/syntax/tests/printer/other/expected/StaticReactTypes.res.txt b/jscomp/syntax/tests/printer/other/expected/StaticReactTypes.res.txt
deleted file mode 100644
index dd479c4..0000000
--- a/jscomp/syntax/tests/printer/other/expected/StaticReactTypes.res.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-type empty = Empty_
-/*
- * Also create another form for splicing in nodes into otherwise fixed length
- * sets.
- */
-type elem<'t> =
-  | Empty: elem<empty>
-  | Element(renderable<('s, 'a) => 'sub>): elem<('s, 'a) => 'sub>
-  | TwoElements(elem<'t1>, elem<'t2>): elem<('t1, 't2)>
-  /*
-   * Not an ordered map yet, but should be.
-   */
-  | ElementMap(list<elem<'t>>): elem<list<'t>>
-/*
- * Instance subtree. Mirrors the shape of JSX, instead of just being a List.
- */
-and subtree<'t> =
-  | EmptyInstance: subtree<empty>
-  | Instance(inst<('s, 'a) => 'sub>): subtree<('s, 'a) => 'sub>
-  /* Having TwoInstances mirror the fact that TwoElements requires sub
-   * elements, was probably overkill. */
-  | TwoInstances(subtree<'t1>, subtree<'t2>): subtree<('t1, 't2)>
-  | InstanceMap(list<subtree<'t>>): subtree<list<'t>>
-and reducer<'t> = (inst<'t>, 'a) => 's constraint 't = ('s, 'a) => 'sub
-/*
- * These are just convenient shortcuts to specifiying the entire spec.  It just
- * makes it so you don't have to do a spread onto a record, since in
- * static-by-default trees, you don't need to define a record beforehand.
- */
-and componentSpec<'t> =
-  /* Add more forms here for convenience */
-  | Reducer('s, elem<'sub>, reducer<'t>) constraint 't = ('s, 'a) => 'sub
-and self<'t> = {
-  reduceEvent: 'e. ('e => 'a, 'e) => unit,
-  /*
-   * Implements the ability to cause your node to be swapped out from within
-   * its tree. Not purely functional by design. This is for things like
-   * external subscriptions that don't arive via propagations through the tree.
-   * However, this is better than simple naive mutation. That's because this
-   * "out of nowhere" operation notifies the root of the tree that it should
-   * perform a mutation. That allows the root to create an entirely new
-   * reference, leaving the previous tree completely in tact! There isn't a
-   * single mutable reference cell in the entire tree - only the root node is
-   * mutable, and even then it doesn't have to be.
-   *
-   * This Api takes highly imperative operations like request animation frame,
-   * and allows them to work well with what would otherwise be a purely
-   * functional data structure (aside from the side effects caused by
-   * subscribing upon mount etc).
-   */
-  send: 'a => unit,
-} constraint 't = ('s, 'a) => 'sub
-/*
- * The result of applying props. Now the result is a function that just waits
- * for React to supply the state, and in turn returns the componentSpec.
- */
-and renderable<'t> = (~state: 's=?, self<'t>) => componentSpec<'t> constraint 't = ('s, 'a) => 'sub
-/*
- * TODO: Can store the subreplacer in the instance so we don't need to
- * recompute it every time.
- */
-and inst<'t> = {
-  /* Memoized just for performance */
-  replacer: replacer<'t>,
-  /* Memoized just for performance */
-  subreplacer: subreplacer<'sub>,
-  self: self<'t>,
-  renderable: renderable<'t>,
-  spec: componentSpec<'t>,
-  subtree: subtree<'sub>,
-} constraint 't = ('s, 'a) => 'sub
-/*
- * A series of chained functions that forms a fishing line that each component
- * has a handle to. When invoked it can cause its own individual instance node
- * in the tree to be replaced in the *root* tree that it exists in! This is
- * totally type safe, and requires no dynamic casts, and no searching through
- * the tree.
- */
-/* Make it even more generalized on action than necessary to avoid GADT
- * errors. */
-and replacer<'t> = (inst<'t> => inst<'t>) => unit constraint 't = ('s, 'a) => 'sub
-and subreplacer<'sub> = (subtree<'sub> => subtree<'sub>) => unit
diff --git a/jscomp/syntax/tests/printer/other/expected/attributes.res.txt b/jscomp/syntax/tests/printer/other/expected/attributes.res.txt
deleted file mode 100644
index 5f35362..0000000
--- a/jscomp/syntax/tests/printer/other/expected/attributes.res.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-@attr(: int)
-let x = 1
-
-@attr(? var)
-let x = 1
-
-@attr(? var if x === 1)
-let x = 1
-
-%ext(: let x: int)
-%ext(:
-  let x: int
-  let y: float
-)
-
-%%ext(
-  "A"
-  "B"
-)
-
-@@superPrivate(@module("./logo.svg") external logo: string = "default")
-
-@inlinePrivate(@module("./logo.svg") external logo: string = "default")
-let x = 1
diff --git a/jscomp/syntax/tests/printer/other/expected/case.res.txt b/jscomp/syntax/tests/printer/other/expected/case.res.txt
deleted file mode 100644
index 38931fc..0000000
--- a/jscomp/syntax/tests/printer/other/expected/case.res.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-let printExprFunParameters = (~uncurried, parameters) =>
-  switch parameters {
-  | list{([], Asttypes.Nolabel, None, {Parsetree.ppat_desc: Ppat_any})} if !uncurried =>
-    Doc.text("_")
-  | list{([], Asttypes.Nolabel, None, {Parsetree.ppat_desc: Ppat_var(stringLoc)})} if !uncurried =>
-    Doc.text(stringLoc.txt)
-  | list{([], Nolabel, None, {ppat_desc: Ppat_construct({txt: Longident.Lident("()")}, None)})}
-    if !uncurried =>
-    Doc.text("()")
-  | parameters =>
-    let lparen = if uncurried {
-      Doc.text("(. ")
-    } else {
-      Doc.lparen
-    }
-    let shouldHug = ParsetreeViewer.parametersShouldHug(parameters)
-    let printedParamaters = Doc.concat(list{
-      if shouldHug {
-        Doc.nil
-      } else {
-        Doc.softLine
-      },
-      Doc.join(
-        ~sep=Doc.concat(list{Doc.comma, Doc.line}),
-        List.map(printExpFunParameter, parameters),
-      ),
-    })
-    Doc.group(
-      Doc.concat(list{
-        lparen,
-        if shouldHug {
-          printedParamaters
-        } else {
-          Doc.indent(printedParamaters)
-        },
-        if shouldHug {
-          Doc.nil
-        } else {
-          Doc.concat(list{Doc.trailingComma, Doc.softLine})
-        },
-        Doc.rparen,
-      }),
-    )
-  }
-
-let isHuggableExpression = expr =>
-  switch expr.pexp_desc {
-  | Pexp_array(_)
-  | Pexp_tuple(_)
-  | Pexp_construct({txt: Longident.Lident("::")}, _)
-  | Pexp_construct({txt: Longident.Lident("[]")}, _)
-  | Pexp_extension({txt: "bs.obj"}, _)
-  | Pexp_record(_) => true
-  | _ => false
-  }
-
-switch colour {
-| Red | Blue | (Green | Purple | Rosa) | (Black | White) | AnotherColoooooour => x
-}
-
-let precedence = x =>
-  switch x {
-  | HashEqual
-  | ColonEqual => 1
-  | Lor => 2
-  | Land => 3
-  | Equal
-  | EqualEqual
-  | EqualEqualEqual
-  | LessThan
-  | GreaterThan
-  | BangEqual
-  | BangEqualEqual
-  | LessEqual
-  | GreaterEqual
-  | BarGreater => 4
-  | Plus
-  | PlusDot
-  | Minus
-  | MinusDot
-  | PlusPlus => 5
-  | Asterisk
-  | AsteriskDot
-  | Forwardslash
-  | ForwardslashDot => 6
-  | Exponentiation => 7
-  | Hash
-  | HashHash
-  | MinusGreater => 8
-  | Dot => 9
-  | _ => 0
-  }
-
-let first = switch first {
-| Some(x) => x
-| None => ("": format6<_>)
-}
-
-// spread over multiple lines, because author used multiple lines
-switch a {
-| B
-| C
-| D => 1
-| E => 2
-}
-
-// keep on one line, author kept it on one line
-switch a {
-| B | C | D => 1
-| E => 2
-}
-
-// should naturally break over multiple lines
-switch a {
-| Bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-| Ccccccccccccccccccccccccccccccccccccccccccccccccccccc
-| Dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
-| Eeeeeeeeeeeeee => 1
-| E => 2
-}
diff --git a/jscomp/syntax/tests/printer/other/expected/char.res.txt b/jscomp/syntax/tests/printer/other/expected/char.res.txt
deleted file mode 100644
index 47ba3a5..0000000
--- a/jscomp/syntax/tests/printer/other/expected/char.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-let x = 'a'
-let x = '\\'
-let x = '\''
-let x = '\n'
-let x = '\t'
-let x = '\b'
-let x = '\r'
-let x = ' '
-let x = '\o021'
-let x = '\xAA'
-let x = '\179'
-let heart = '\u2665'
-let smile2 = '\u{1F600}'
diff --git a/jscomp/syntax/tests/printer/other/expected/comments.res.txt b/jscomp/syntax/tests/printer/other/expected/comments.res.txt
deleted file mode 100644
index e5999a3..0000000
--- a/jscomp/syntax/tests/printer/other/expected/comments.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-/* nested /* comments */ */
-
-/* lvl 0 /* lvl 1 /* lvl 2 */ */ */
-let x = 1
diff --git a/jscomp/syntax/tests/printer/other/expected/fatSlider.res.txt b/jscomp/syntax/tests/printer/other/expected/fatSlider.res.txt
deleted file mode 100644
index 6e065f0..0000000
--- a/jscomp/syntax/tests/printer/other/expected/fatSlider.res.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-open React
-
-module Range = {
-  /* This library's API requires that props be spread on the elements for thumb */
-  /* and track. Not great, but it's what we have. */
-  /* See https://github.com/reasonml/reason-react/blob/master/docs/clone-element.md */
-  /* We'll need to spread both the style inside the props, and the props object itself using ReasonReact.cloneElement. */
-  type rec propsThatNeedSpreading = {style: ReactDOMRe.Style.t}
-  type rec renderTrackParams = {
-    props: propsThatNeedSpreading,
-    children: React.element,
-  }
-
-  @module("react-range") @react.component
-  external make: (
-    ~min: int,
-    ~max: int,
-    ~values: array<int>,
-    ~onChange: array<int> => unit,
-    ~renderTrack: renderTrackParams => React.element,
-    ~renderThumb: renderTrackParams => React.element,
-  ) => React.element = "Range"
-}
-
-@react.component
-let make = (~min=50, ~max=250, ~meterSuffix=?) => {
-  let (values, values_set) = React.useState(_ => [min])
-
-  <div className="w-full flex flex-col items-center">
-    <div className="outer bg-gray-200 rounded-full w-full py-2 px-10">
-      <Range
-        min
-        max
-        values
-        onChange={v => values_set(_ => v)}
-        renderTrack={({props, children}) => {
-          let element = <div className="h-16" style=props.style> children </div>
-
-          ReasonReact.cloneElement(element, ~props=Obj.magic(props), [children])
-        }}
-        renderThumb={({props}) => {
-          let element =
-            <div
-              className="finger h-16 w-16 rounded-full bg-gray-700 cursor-pointer focus:outline-none focus:shadow-outline"
-              style=props.style
-            />
-
-          ReasonReact.cloneElement(element, ~props=Obj.magic(props), [])
-        }}
-      />
-    </div>
-    <div className="meter text-4xl font-bold text-gray-600 mt-4">
-      {values[0]->Js.Int.toString->string}
-      {meterSuffix->Belt.Option.getWithDefault(null)}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/printer/other/expected/home.res.txt b/jscomp/syntax/tests/printer/other/expected/home.res.txt
deleted file mode 100644
index 326697c..0000000
--- a/jscomp/syntax/tests/printer/other/expected/home.res.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-open React
-let logo: string = %raw("require('./assets/logo.png')")
-
-@react.component
-let make = () => {
-  useEffect0(_ => {
-    AudioPlayer.play()->ignore
-    None
-  })
-
-  // Template
-  <div className="h-screen flex justify-between  flex-col p-8">
-    <div className=""> {"Other stuff here"->string} </div>
-    <div id="controls" className="flex flex-col items-center">
-      <SignaturePicker />
-      <div className="h-8" />
-      <FatSlider meterSuffix={<span className="text-lg text-gray-400"> {" BPM"->string} </span>} />
-      <div className="h-8" />
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/printer/other/expected/lor.res.txt b/jscomp/syntax/tests/printer/other/expected/lor.res.txt
deleted file mode 100644
index 39cb639..0000000
--- a/jscomp/syntax/tests/printer/other/expected/lor.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-let lower = ch => lor(32, ch)
diff --git a/jscomp/syntax/tests/printer/other/expected/moduleData.res.txt b/jscomp/syntax/tests/printer/other/expected/moduleData.res.txt
deleted file mode 100644
index ae922d0..0000000
--- a/jscomp/syntax/tests/printer/other/expected/moduleData.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-let module_data: array<string> = Obj.magic(
-  /* Gc */ "\x84\x95\xa6\xbe\x00\x00\x0c\xf6\x00\x00\x02\xae\x00\x00\t\xc3\x00\x00\tH\xc0\"Gc\xa0\xb1\xb0\x01\x04\x1b$stat@\b\x00\x00,\x00@@\xa0\xa0\xd0\xb0\x01\x03\xeb+minor_words@@\xb0\xb3\x90\xb0D%float@@\x90@\x02\x05\xf5\xe1\x00\x00\xfe\xb0\xc0&_none_A@\x00\xff\x04\x02A@\xa0\xd0\xb0\x01\x03\xec.promoted_words@@\xb0\xb3\x90\x04\r@\x90@\x02\x05\xf5\xe1\x00\x00\xfd\x04\x0b@\xa0\xd0\xb0\x01\x03\xed+major_words@@\xb0\xb3\x90\x04\x15@\x90@\x02\x05\xf5\xe1\x00\x00\xfc\x04\x13@\xa0\xd0\xb0\x01\x03\xee1minor_collections@@\xb0\xb3\x90\xb0A#int@@\x90@\x02\x05\xf5\xe1\x00\x00\xfb\x04\x1d@\xa0\xd0\xb0\x01\x03\xef1major_collections@@\xb0\xb3\x90\x04\n@\x90@\x02\x05\xf5\xe1\x00\x00\xfa\x04%@\xa0\xd0\xb0\x01\x03\xf0*heap_words@@\xb0\xb3\x90\x04\x12@\x90@\x02\x05\xf5\xe1\x00\x00\xf9\x04-@\xa0\xd0\xb0\x01\x03\xf1+heap_chunks@@\xb0\xb3\x90\x04\x1a@\x90@\x02\x05\xf5\xe1\x00\x00\xf8\x045@\xa0\xd0\xb0\x01\x03\xf2*live_words@@\xb0\xb3\x90\x04\"@\x90@\x02\x05\xf5\xe1\x00\x00\xf7\x04=@\xa0\xd0\xb0\x01\x03\xf3+live_blocks@@\xb0\xb3\x90\x04*@\x90@\x02\x05\xf5\xe1\x00\x00\xf6\x04E@\xa0\xd0\xb0\x01\x03\xf4*free_words@@\xb0\xb3\x90\x042@\x90@\x02\x05\xf5\xe1\x00\x00\xf5\x04M@\xa0\xd0\xb0\x01\x03\xf5+free_blocks@@\xb0\xb3\x90\x04:@\x90@\x02\x05\xf5\xe1\x00\x00\xf4\x04U@\xa0\xd0\xb0\x01\x03\xf6,largest_free@@\xb0\xb3\x90\x04B@\x90@\x02\x05\xf5\xe1\x00\x00\xf3\x04]@\xa0\xd0\xb0\x01\x03\xf7)fragments@@\xb0\xb3\x90\x04J@\x90@\x02\x05\xf5\xe1\x00\x00\xf2\x04e@\xa0\xd0\xb0\x01\x03\xf8+compactions@@\xb0\xb3\x90\x04R@\x90@\x02\x05\xf5\xe1\x00\x00\xf1\x04m@\xa0\xd0\xb0\x01\x03\xf9.top_heap_words@@\xb0\xb3\x90\x04Z@\x90@\x02\x05\xf5\xe1\x00\x00\xf0\x04u@\xa0\xd0\xb0\x01\x03\xfa*stack_size@@\xb0\xb3\x90\x04b@\x90@\x02\x05\xf5\xe1\x00\x00\xef\x04}@@@A@@@\x04}@@\xa0@@A\xa0\xb1\xb0\x01\x04\x1c'control@\b\x00\x00,\x00@@\xa0\xa0\xd0\xb0\x01\x03\xfc/minor_heap_size@A\xb0\xb3\x90\x04q@\x90@\x02\x05\xf5\xe1\x00\x00\xee\x04\x8c@\xa0\xd0\xb0\x01\x03\xfd4major_heap_increment@A\xb0\xb3\x90\x04y@\x90@\x02\x05\xf5\xe1\x00\x00\xed\x04\x94@\xa0\xd0\xb0\x01\x03\xfe.space_overhead@A\xb0\xb3\x90\x04\x81@\x90@\x02\x05\xf5\xe1\x00\x00\xec\x04\x9c@\xa0\xd0\xb0\x01\x03\xff'verbose@A\xb0\xb3\x90\x04\x89@\x90@\x02\x05\xf5\xe1\x00\x00\xeb\x04\xa4@\xa0\xd0\xb0\x01\x04\x00,max_overhead@A\xb0\xb3\x90\x04\x91@\x90@\x02\x05\xf5\xe1\x00\x00\xea\x04\xac@\xa0\xd0\xb0\x01\x04\x01+stack_limit@A\xb0\xb3\x90\x04\x99@\x90@\x02\x05\xf5\xe1\x00\x00\xe9\x04\xb4@\xa0\xd0\xb0\x01\x04\x021allocation_policy@A\xb0\xb3\x90\x04\xa1@\x90@\x02\x05\xf5\xe1\x00\x00\xe8\x04\xbc@\xa0\xd0\xb0\x01\x04\x03+window_size@@\xb0\xb3\x90\x04\xa9@\x90@\x02\x05\xf5\xe1\x00\x00\xe7\x04\xc4@@@A@@@\x04\xc4@@\x04GA\xa0\xa0\xb0\x01\x04\x1d$stat@\xc0\xb0\xc1@\xb0\xb3\x90\xb0F$unit@@\x90@\x02\x05\xf5\xe1\x00\x00\xe4\xb0\xb3\x90\x04\xe2@\x90@\x02\x05\xf5\xe1\x00\x00\xe5@\x02\x05\xf5\xe1\x00\x00\xe6@\x04\xd5@\xa0\xa0\xb0\x01\x04\x1e*quick_stat@\xc0\xb0\xc1@\xb0\xb3\x90\x04\x11@\x90@\x02\x05\xf5\xe1\x00\x00\xe1\xb0\xb3\x04\x0f@\x90@\x02\x05\xf5\xe1\x00\x00\xe2@\x02\x05\xf5\xe1\x00\x00\xe3@\x04\xe3@\xa0\xa0\xb0\x01\x04\x1f(counters@\xc0\xb0\xc1@\xb0\xb3\x90\x04\x1f@\x90@\x02\x05\xf5\xe1\x00\x00\xdb\xb0\x92\xa0\xb0\xb3\x90\x04\xf7@\x90@\x02\x05\xf5\xe1\x00\x00\xde\xa0\xb0\xb3\x90\x04\xfc@\x90@\x02\x05\xf5\xe1\x00\x00\xdd\xa0\xb0\xb3\x90\x05\x01\x01@\x90@\x02\x05\xf5\xe1\x00\x00\xdc@\x02\x05\xf5\xe1\x00\x00\xdf@\x02\x05\xf5\xe1\x00\x00\xe0\x90\xe00caml_gc_countersAA \xa0@@@\x05\x01\x04@\xa0\xa0\xb0\x01\x04 +minor_words@\xc0\xb0\xc1@\xb0\xb3\x90\x04@@\x90@\x02\x05\xf5\xe1\x00\x00\xd8\xb0\xb3\x90\x05\x01\x15@\x90@\x02\x05\xf5\xe1\x00\x00\xd9@\x02\x05\xf5\xe1\x00\x00\xda\x90\xe03caml_gc_minor_wordsAA;caml_gc_minor_words_unboxed\xa0@@A\x05\x01\x18@\xa0\xa0\xb0\x01\x04!#get@\xc0\xb0\xc1@\xb0\xb3\x90\x04T@\x90@\x02\x05\xf5\xe1\x00\x00\xd5\xb0\xb3\x90\x04\xa6@\x90@\x02\x05\xf5\xe1\x00\x00\xd6@\x02\x05\xf5\xe1\x00\x00\xd7@\x05\x01'@\xa0\xa0\xb0\x01\x04\"#set@\xc0\xb0\xc1@\xb0\xb3\x04\x0b@\x90@\x02\x05\xf5\xe1\x00\x00\xd2\xb0\xb3\x90\x04f@\x90@\x02\x05\xf5\xe1\x00\x00\xd3@\x02\x05\xf5\xe1\x00\x00\xd4\x90\xe0+caml_gc_setAA\x046\xa0@@@\x05\x019@\xa0\xa0\xb0\x01\x04#%minor@\xc0\xb0\xc1@\xb0\xb3\x90\x04u@\x90@\x02\x05\xf5\xe1\x00\x00\xcf\xb0\xb3\x90\x04y@\x90@\x02\x05\xf5\xe1\x00\x00\xd0@\x02\x05\xf5\xe1\x00\x00\xd1\x90\xe0-caml_gc_minorAA\x04I\xa0@@@\x05\x01L@\xa0\xa0\xb0\x01\x04$+major_slice@\xc0\xb0\xc1@\xb0\xb3\x90\x05\x01<@\x90@\x02\x05\xf5\xe1\x00\x00\xcc\xb0\xb3\x90\x05\x01@@\x90@\x02\x05\xf5\xe1\x00\x00\xcd@\x02\x05\xf5\xe1\x00\x00\xce\x90\xe03caml_gc_major_sliceAA\x04\\\xa0@@@\x05\x01_@\xa0\xa0\xb0\x01\x04%%major@\xc0\xb0\xc1@\xb0\xb3\x90\x04\x9b@\x90@\x02\x05\xf5\xe1\x00\x00\xc9\xb0\xb3\x90\x04\x9f@\x90@\x02\x05\xf5\xe1\x00\x00\xca@\x02\x05\xf5\xe1\x00\x00\xcb\x90\xe0-caml_gc_majorAA\x04o\xa0@@@\x05\x01r@\xa0\xa0\xb0\x01\x04&*full_major@\xc0\xb0\xc1@\xb0\xb3\x90\x04\xae@\x90@\x02\x05\xf5\xe1\x00\x00\xc6\xb0\xb3\x90\x04\xb2@\x90@\x02\x05\xf5\xe1\x00\x00\xc7@\x02\x05\xf5\xe1\x00\x00\xc8\x90\xe02caml_gc_full_majorAA\x04\x82\xa0@@@\x05\x01\x85@\xa0\xa0\xb0\x01\x04''compact@\xc0\xb0\xc1@\xb0\xb3\x90\x04\xc1@\x90@\x02\x05\xf5\xe1\x00\x00\xc3\xb0\xb3\x90\x04\xc5@\x90@\x02\x05\xf5\xe1\x00\x00\xc4@\x02\x05\xf5\xe1\x00\x00\xc5\x90\xe02caml_gc_compactionAA\x04\x95\xa0@@@\x05\x01\x98@\xa0\xa0\xb0\x01\x04(*print_stat@\xc0\xb0\xc1@\xb0\xb3\xb1\x90\xb0@*PervasivesA+out_channel\x00\xff@\x90@\x02\x05\xf5\xe1\x00\x00\xc0\xb0\xb3\x90\x04\xdc@\x90@\x02\x05\xf5\xe1\x00\x00\xc1@\x02\x05\xf5\xe1\x00\x00\xc2@\x05\x01\xab@\xa0\xa0\xb0\x01\x04)/allocated_bytes@\xc0\xb0\xc1@\xb0\xb3\x90\x04\xe7@\x90@\x02\x05\xf5\xe1\x00\x00\xbd\xb0\xb3\x90\x05\x01\xbc@\x90@\x02\x05\xf5\xe1\x00\x00\xbe@\x02\x05\xf5\xe1\x00\x00\xbf@\x05\x01\xba@\xa0\xa0\xb0\x01\x04*.get_minor_free@\xc0\xb0\xc1@\xb0\xb3\x90\x04\xf6@\x90@\x02\x05\xf5\xe1\x00\x00\xba\xb0\xb3\x90\x05\x01\xae@\x90@\x02\x05\xf5\xe1\x00\x00\xbb@\x02\x05\xf5\xe1\x00\x00\xbc\x90\xe03caml_get_minor_freeAA\x04\xca\xa0@@@\x05\x01\xcd@\xa0\xa0\xb0\x01\x04+*get_bucket@\xc0\xb0\xc1@\xb0\xb3\x90\x05\x01\xbd@\x90@\x02\x05\xf5\xe1\x00\x00\xb7\xb0\xb3\x90\x05\x01\xc1@\x90@\x02\x05\xf5\xe1\x00\x00\xb8@\x02\x05\xf5\xe1\x00\x00\xb9\x90\xe05caml_get_major_bucketA@\x04\xdd\xa0@@@\x05\x01\xe0\xa0\xa0\xa0'noalloc\x05\x01\xe4\x90@@\xa0\xa0\xb0\x01\x04,*get_credit@\xc0\xb0\xc1@\xb0\xb3\x90\x05\x01!@\x90@\x02\x05\xf5\xe1\x00\x00\xb4\xb0\xb3\x90\x05\x01\xd9@\x90@\x02\x05\xf5\xe1\x00\x00\xb5@\x02\x05\xf5\xe1\x00\x00\xb6\x90\xe05caml_get_major_creditA@\x04\xf5\xa0@@@\x05\x01\xf8\xa0\xa0\xa0'noalloc\x05\x01\xfc\x90@@\xa0\xa0\xb0\x01\x04-3huge_fallback_count@\xc0\xb0\xc1@\xb0\xb3\x90\x05\x019@\x90@\x02\x05\xf5\xe1\x00\x00\xb1\xb0\xb3\x90\x05\x01\xf1@\x90@\x02\x05\xf5\xe1\x00\x00\xb2@\x02\x05\xf5\xe1\x00\x00\xb3\x90\xe0;caml_gc_huge_fallback_countAA\x05\x01\r\xa0@@@\x05\x02\x10@\xa0\xa0\xb0\x01\x04.(finalise@\xc0\xb0\xc1@\xb0\xc1@\xb0\x90\x90!a\x02\x05\xf5\xe1\x00\x00\xad\xb0\xb3\x90\x05\x01R@\x90@\x02\x05\xf5\xe1\x00\x00\xab@\x02\x05\xf5\xe1\x00\x00\xac\xb0\xc1@\x04\n\xb0\xb3\x90\x05\x01X@\x90@\x02\x05\xf5\xe1\x00\x00\xae@\x02\x05\xf5\xe1\x00\x00\xaf@\x02\x05\xf5\xe1\x00\x00\xb0@\x05\x02'@\xa0\xa0\xb0\x01\x04/-finalise_last@\xc0\xb0\xc1@\xb0\xc1@\xb0\xb3\x90\x05\x01e@\x90@\x02\x05\xf5\xe1\x00\x00\xa4\xb0\xb3\x90\x05\x01i@\x90@\x02\x05\xf5\xe1\x00\x00\xa5@\x02\x05\xf5\xe1\x00\x00\xa6\xb0\xc1@\xb0\x90\x90!a\x02\x05\xf5\xe1\x00\x00\xa7\xb0\xb3\x90\x05\x01s@\x90@\x02\x05\xf5\xe1\x00\x00\xa8@\x02\x05\xf5\xe1\x00\x00\xa9@\x02\x05\xf5\xe1\x00\x00\xaa@\x05\x02B@\xa0\xa0\xb0\x01\x0400finalise_release@\xc0\xb0\xc1@\xb0\xb3\x90\x05\x01~@\x90@\x02\x05\xf5\xe1\x00\x00\xa1\xb0\xb3\x90\x05\x01\x82@\x90@\x02\x05\xf5\xe1\x00\x00\xa2@\x02\x05\xf5\xe1\x00\x00\xa3@\x05\x02Q@\xa0\xb1\xb0\x01\x041%alarm@\b\x00\x00,\x00@@@A@@@\x05\x02V@@\x05\x01\xd9A\xa0\xa0\xb0\x01\x042,create_alarm@\xc0\xb0\xc1@\xb0\xc1@\xb0\xb3\x90\x05\x01\x94@\x90@\x02\x05\xf5\xe1\x00\x00\x9c\xb0\xb3\x90\x05\x01\x98@\x90@\x02\x05\xf5\xe1\x00\x00\x9d@\x02\x05\xf5\xe1\x00\x00\x9e\xb0\xb3\x90\x04\x17@\x90@\x02\x05\xf5\xe1\x00\x00\x9f@\x02\x05\xf5\xe1\x00\x00\xa0@\x05\x02k@\xa0\xa0\xb0\x01\x043,delete_alarm@\xc0\xb0\xc1@\xb0\xb3\x04\x0b@\x90@\x02\x05\xf5\xe1\x00\x00\x99\xb0\xb3\x90\x05\x01\xaa@\x90@\x02\x05\xf5\xe1\x00\x00\x9a@\x02\x05\xf5\xe1\x00\x00\x9b@\x05\x02y@@\xa0\xa0\"Gc\x900\xd3\xed\xbc\xad\xdd\x9a\x89\x86}\xfb\xeb\x12`h\xb1\xf6\xa0\xa0*Pervasives\x900\x9c\"[\xd4{\xb1=\x95\xfc\xa0\xd8[\xac\x88\xe1m\xa0\xa0\"Js\x900\xa7\xe4~:\x13\xa7\xc3\x96\xd5|\x02\x8d\xe2\xa6:\xbe\xa0\xa08CamlinternalFormatBasics\x900\xb0\xccG\x132\xe3\x15\x88k\x9f\xea\t\xf5:us\xa0\xa0.Bs_stdlib_mini\x900\xe7_y\xe9Q`\x04\x01\x16\xbc?\xb0\xca\x0e\x85\xe9\xa0\xa0+Belt_Result\x900\xc5\xfc&\xbb\x939\x89\x91?\xb2T\x83\xb8\xc1\xd6\xc0\xa0\xa0$Belt\x900B\xb2r\xe4;\x119\x04\"i\xd2`\x88\x0b\x9f\xd1@@",
-)
diff --git a/jscomp/syntax/tests/printer/other/expected/nesting.res.txt b/jscomp/syntax/tests/printer/other/expected/nesting.res.txt
deleted file mode 100644
index 0cafca8..0000000
--- a/jscomp/syntax/tests/printer/other/expected/nesting.res.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-let unitsCommands = state.units->Js.Array2.mapi((
-  {unit: targetUnit, coordinates: targetCoordinates},
-  i,
-) => {
-  // n^2
-  let res = []
-  state.units->Js.Array2.forEachi((
-    {unit: unitThatMightBeAttacking, coordinates: unitThatMightBeAttackingCoordinates},
-    j,
-  ) => {
-    if i !== j {
-      switch Js.Array2.unsafe_get(
-        unitThatMightBeAttacking.timeline,
-        unitThatMightBeAttacking.currentFrame,
-      ).effect {
-      | Some(UnitAttack({damage, hitBox: _})) =>
-        let unitThatMightBeAttackingHitBox_ = Unit.hitBox(unitThatMightBeAttacking)
-        let unitThatMightBeAttackingHitBox = {
-          ...unitThatMightBeAttackingHitBox_,
-          x: unitThatMightBeAttackingCoordinates.x +. unitThatMightBeAttackingHitBox_.x,
-          y: unitThatMightBeAttackingCoordinates.y +. unitThatMightBeAttackingHitBox_.y,
-        }
-        let targetUnitHitBox_ = Unit.hitBox(targetUnit)
-        let targetUnitHitBox = {
-          ...targetUnitHitBox_,
-          x: targetCoordinates.x +. targetUnitHitBox_.x,
-          y: targetCoordinates.y +. targetUnitHitBox_.y,
-        }
-        let hit = hitTest(unitThatMightBeAttackingHitBox, targetUnitHitBox)
-
-        if hit {
-          // TODO: it's wrong to put this here. We don't know whether wizard resisted the attack or not
-          let sparksX = targetUnitHitBox.x +. targetUnitHitBox.width /. 2.
-          let sparksY = targetUnitHitBox.y +. targetUnitHitBox.height /. 2.
-          let spark = {
-            unit: Spark.make(
-              ~spriteSheet=assets.spark,
-              ~orientation=targetUnit.orientation,
-              ~aspectRatio=1.,
-              ~anchor=Middle,
-            ),
-            coordinates: {x: sparksX, y: sparksY, z: 0.},
-          }
-          particlesToAdd->Js.Array2.push(spark)->ignore
-
-          res->Js.Array2.push(Unit.CommandAttacked({damage: damage}))->ignore
-        }
-      | _ => ()
-      }
-    }
-  })
-  res
-})
diff --git a/jscomp/syntax/tests/printer/other/expected/number.res.txt b/jscomp/syntax/tests/printer/other/expected/number.res.txt
deleted file mode 100644
index c94bc17..0000000
--- a/jscomp/syntax/tests/printer/other/expected/number.res.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-let x = 0b0000_0001
-
-let int32 = 42l
-let int64 = 42L
-
-let x = -44.20e99
-let x = -44.20_34e99
-let x = -44.20e+9
-let x = -44.20e-9
-let x = -44.20e-99_99
-let x = -444_444.20e99
-let x = 44.20e99
-let x = 44.20_34e99
-let x = 44.20e+9
-let x = 44.20e-9
-let x = 44.20e-99_99
-let x = 44e99
-let x = 44_44e99
-
-let x = 0x0
-let x = 0X0
-
-let x = 0xAA
-let x = 0XA_A
-let x = 0xAA.ff
-let x = 0xAA.ff_ff
-let x = 0xAA.ff_ffp10
-let x = 0xAA.ff_ffp+10
-let x = 0xAA.ff_ffp-10
-let x = 0xAA.ff_ffp100_00
-let x = 0xAA.ff_ffp+100_00
-let x = 0xAA.ff_ffp-100_00
diff --git a/jscomp/syntax/tests/printer/other/expected/reasonArity.res.txt b/jscomp/syntax/tests/printer/other/expected/reasonArity.res.txt
deleted file mode 100644
index 799c6d9..0000000
--- a/jscomp/syntax/tests/printer/other/expected/reasonArity.res.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-let _ = Constructor(a, b)
-let _ = Constructor((a, b))
-let _ = #Constructor(a, b)
-let _ = #Constructor(a, b)
-
-switch a {
-| C(c, d) => 1
-| C((c, d)) => 1
-}
-
-switch a {
-| #C(c, d) => 1
-| #C(c, d) => 1
-}
diff --git a/jscomp/syntax/tests/printer/other/expected/reasonFile.res.txt b/jscomp/syntax/tests/printer/other/expected/reasonFile.res.txt
deleted file mode 100644
index 578b028..0000000
--- a/jscomp/syntax/tests/printer/other/expected/reasonFile.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-/* parses reason file */
-let () = {
-  let msg = "test"
-  msg->Js.log
-}
diff --git a/jscomp/syntax/tests/printer/other/expected/reasonInterfaceFile.resi.txt b/jscomp/syntax/tests/printer/other/expected/reasonInterfaceFile.resi.txt
deleted file mode 100644
index e8725f1..0000000
--- a/jscomp/syntax/tests/printer/other/expected/reasonInterfaceFile.resi.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-/* parse reason interface file */
-let x: int
diff --git a/jscomp/syntax/tests/printer/other/expected/reasonString.res.txt b/jscomp/syntax/tests/printer/other/expected/reasonString.res.txt
deleted file mode 100644
index e68fb53..0000000
--- a/jscomp/syntax/tests/printer/other/expected/reasonString.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-let x = j`foo \${bar`
-let x = j`foo \`bar`
-let x = j`foo \\bar`
-let x = j`foo \\\${bar`
diff --git a/jscomp/syntax/tests/printer/other/expected/signaturePicker.res.txt b/jscomp/syntax/tests/printer/other/expected/signaturePicker.res.txt
deleted file mode 100644
index f73d98b..0000000
--- a/jscomp/syntax/tests/printer/other/expected/signaturePicker.res.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-open React
-
-module TimeSignature = {
-  /* Others are 2/2 9/8 3/2 12/8 and 4/2 */
-  type t =
-    | TwoFour
-    | ThreeFour
-    | FourFour
-    | SixEight
-
-  let toString = x =>
-    switch x {
-    | TwoFour => "2/4"
-    | ThreeFour => "3/4"
-    | FourFour => "4/4"
-    | SixEight => "6/8"
-    }
-}
-
-@react.component
-let make = () => {
-  let options = {
-    open TimeSignature
-    list{TwoFour, ThreeFour, FourFour, SixEight}
-  }
-
-  <label className="flex items-center">
-    <div className="pr-2 font-bold text-gray-400 text-lg"> {"Signature"->string} </div>
-    <select
-      id="country"
-      className="transition duration-150 ease-in-out sm:text-sm sm:leading-5 border-none font-bold text-2xl text-gray-600 bg-transparent">
-      {options
-      ->Belt.List.map(option =>
-        <option key={option->TimeSignature.toString}>
-          {option->TimeSignature.toString->string}
-        </option>
-      )
-      ->Belt.List.toArray
-      ->array}
-    </select>
-    <svg
-      viewBox="0 0 24 24"
-      width="24"
-      height="24"
-      stroke="currentColor"
-      strokeWidth="2"
-      fill="none"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      className="text-gray-400">
-      <polyline points="6 9 12 15 18 9" />
-    </svg>
-  </label>
-}
diff --git a/jscomp/syntax/tests/printer/other/expected/string.res.txt b/jscomp/syntax/tests/printer/other/expected/string.res.txt
deleted file mode 100644
index 7a79a96..0000000
--- a/jscomp/syntax/tests/printer/other/expected/string.res.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-let s = "a string with \b \n \r \t abcdef"
-
-let s = "🚀 🤭 🔥 😀 with emojis 😅 👌 test 👀"
-
-let s = "a \"string inside\" a string"
-
-let s = "a double escaped \\ test"
-
-let s = "what happens here \\n"
-
-let s = "\0 \xA0"
-
-let s = "unknown escape \m111 as passed through"
-
-let heart = "\u2665"
-
-let smile = "emoji: \u{1F600}"
-
-let taggedTemplate = sql`select * from ${table} where id = ${id}`
-
-let taggedTemplate = Pg.sql`select * from ${table} where id = ${id}`
diff --git a/jscomp/syntax/tests/printer/other/fatSlider.res b/jscomp/syntax/tests/printer/other/fatSlider.res
deleted file mode 100644
index 8e7fb24..0000000
--- a/jscomp/syntax/tests/printer/other/fatSlider.res
+++ /dev/null
@@ -1,56 +0,0 @@
-open React
-
-module Range = {
-  /* This library's API requires that props be spread on the elements for thumb */
-  /* and track. Not great, but it's what we have. */
-  /* See https://github.com/reasonml/reason-react/blob/master/docs/clone-element.md */
-  /* We'll need to spread both the style inside the props, and the props object itself using ReasonReact.cloneElement. */
-  type rec propsThatNeedSpreading = {style: ReactDOMRe.Style.t}
-  type rec renderTrackParams = {
-    props: propsThatNeedSpreading,
-    children: React.element,
-  }
-  
-  @module("react-range") @react.component
-  external make: (
-    ~min: int,
-    ~max: int,
-    ~values: array<int>,
-    ~onChange: array<int> => unit,
-    ~renderTrack: renderTrackParams => React.element,
-    ~renderThumb: renderTrackParams => React.element,
-  ) => React.element = "Range"
-}
-
-@react.component
-let make = (~min=50, ~max=250, ~meterSuffix=?) => {
-  let (values, values_set) = React.useState(_ => [min])
-  
-  <div className="w-full flex flex-col items-center">
-    <div className="outer bg-gray-200 rounded-full w-full py-2 px-10">
-      <Range
-        min
-        max
-        values
-        onChange={v => values_set(_ => v)}
-        renderTrack={({props, children}) => {
-          let element = <div className="h-16" style=props.style> children </div>
-          
-          ReasonReact.cloneElement(element, ~props=Obj.magic(props), [children])
-        }}
-        renderThumb={({props}) => {
-          let element =
-            <div
-              className="finger h-16 w-16 rounded-full bg-gray-700 cursor-pointer focus:outline-none focus:shadow-outline"
-              style=props.style
-            />
-          
-          ReasonReact.cloneElement(element, ~props=Obj.magic(props), [])
-        }}
-      />
-    </div>
-    <div className="meter text-4xl font-bold text-gray-600 mt-4">
-      {values[0]->Js.Int.toString->string} {meterSuffix->Belt.Option.getWithDefault(null)}
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/printer/other/home.res b/jscomp/syntax/tests/printer/other/home.res
deleted file mode 100644
index ffea505..0000000
--- a/jscomp/syntax/tests/printer/other/home.res
+++ /dev/null
@@ -1,23 +0,0 @@
-open React
-let logo:string = %raw("require('./assets/logo.png')")
-
-@react.component
-let make = () => {
-  useEffect0(_ => {
-    AudioPlayer.play()->ignore
-    None
-  })
-  
-  // Template
-  <div className="h-screen flex justify-between  flex-col p-8">
-    <div className=""> {"Other stuff here"->string} </div>
-    <div id="controls" className="flex flex-col items-center">
-      <SignaturePicker />
-      <div className="h-8" />
-      <FatSlider
-        meterSuffix={<span className="text-lg text-gray-400"> {" BPM"->string} </span>}
-      />
-      <div className="h-8" />
-    </div>
-  </div>
-}
diff --git a/jscomp/syntax/tests/printer/other/lor.res b/jscomp/syntax/tests/printer/other/lor.res
deleted file mode 100644
index 39cb639..0000000
--- a/jscomp/syntax/tests/printer/other/lor.res
+++ /dev/null
@@ -1 +0,0 @@
-let lower = ch => lor(32, ch)
diff --git a/jscomp/syntax/tests/printer/other/moduleData.res b/jscomp/syntax/tests/printer/other/moduleData.res
deleted file mode 100644
index 1cd5fff..0000000
--- a/jscomp/syntax/tests/printer/other/moduleData.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let module_data: array<string> = Obj.magic(
-  /* Gc */ "\132\149\166\190\000\000\012\246\000\000\002\174\000\000\t\195\000\000\tH\192\"Gc\160\177\176\001\004\027$stat@\b\000\000,\000@@\160\160\208\176\001\003\235+minor_words@@\176\179\144\176D%float@@\144@\002\005\245\225\000\000\254\176\192&_none_A@\000\255\004\002A@\160\208\176\001\003\236.promoted_words@@\176\179\144\004\r@\144@\002\005\245\225\000\000\253\004\011@\160\208\176\001\003\237+major_words@@\176\179\144\004\021@\144@\002\005\245\225\000\000\252\004\019@\160\208\176\001\003\2381minor_collections@@\176\179\144\176A#int@@\144@\002\005\245\225\000\000\251\004\029@\160\208\176\001\003\2391major_collections@@\176\179\144\004\n@\144@\002\005\245\225\000\000\250\004%@\160\208\176\001\003\240*heap_words@@\176\179\144\004\018@\144@\002\005\245\225\000\000\249\004-@\160\208\176\001\003\241+heap_chunks@@\176\179\144\004\026@\144@\002\005\245\225\000\000\248\0045@\160\208\176\001\003\242*live_words@@\176\179\144\004\"@\144@\002\005\245\225\000\000\247\004=@\160\208\176\001\003\243+live_blocks@@\176\179\144\004*@\144@\002\005\245\225\000\000\246\004E@\160\208\176\001\003\244*free_words@@\176\179\144\0042@\144@\002\005\245\225\000\000\245\004M@\160\208\176\001\003\245+free_blocks@@\176\179\144\004:@\144@\002\005\245\225\000\000\244\004U@\160\208\176\001\003\246,largest_free@@\176\179\144\004B@\144@\002\005\245\225\000\000\243\004]@\160\208\176\001\003\247)fragments@@\176\179\144\004J@\144@\002\005\245\225\000\000\242\004e@\160\208\176\001\003\248+compactions@@\176\179\144\004R@\144@\002\005\245\225\000\000\241\004m@\160\208\176\001\003\249.top_heap_words@@\176\179\144\004Z@\144@\002\005\245\225\000\000\240\004u@\160\208\176\001\003\250*stack_size@@\176\179\144\004b@\144@\002\005\245\225\000\000\239\004}@@@A@@@\004}@@\160@@A\160\177\176\001\004\028'control@\b\000\000,\000@@\160\160\208\176\001\003\252/minor_heap_size@A\176\179\144\004q@\144@\002\005\245\225\000\000\238\004\140@\160\208\176\001\003\2534major_heap_increment@A\176\179\144\004y@\144@\002\005\245\225\000\000\237\004\148@\160\208\176\001\003\254.space_overhead@A\176\179\144\004\129@\144@\002\005\245\225\000\000\236\004\156@\160\208\176\001\003\255'verbose@A\176\179\144\004\137@\144@\002\005\245\225\000\000\235\004\164@\160\208\176\001\004\000,max_overhead@A\176\179\144\004\145@\144@\002\005\245\225\000\000\234\004\172@\160\208\176\001\004\001+stack_limit@A\176\179\144\004\153@\144@\002\005\245\225\000\000\233\004\180@\160\208\176\001\004\0021allocation_policy@A\176\179\144\004\161@\144@\002\005\245\225\000\000\232\004\188@\160\208\176\001\004\003+window_size@@\176\179\144\004\169@\144@\002\005\245\225\000\000\231\004\196@@@A@@@\004\196@@\004GA\160\160\176\001\004\029$stat@\192\176\193@\176\179\144\176F$unit@@\144@\002\005\245\225\000\000\228\176\179\144\004\226@\144@\002\005\245\225\000\000\229@\002\005\245\225\000\000\230@\004\213@\160\160\176\001\004\030*quick_stat@\192\176\193@\176\179\144\004\017@\144@\002\005\245\225\000\000\225\176\179\004\015@\144@\002\005\245\225\000\000\226@\002\005\245\225\000\000\227@\004\227@\160\160\176\001\004\031(counters@\192\176\193@\176\179\144\004\031@\144@\002\005\245\225\000\000\219\176\146\160\176\179\144\004\247@\144@\002\005\245\225\000\000\222\160\176\179\144\004\252@\144@\002\005\245\225\000\000\221\160\176\179\144\005\001\001@\144@\002\005\245\225\000\000\220@\002\005\245\225\000\000\223@\002\005\245\225\000\000\224\144\2240caml_gc_countersAA \160@@@\005\001\004@\160\160\176\001\004 +minor_words@\192\176\193@\176\179\144\004@@\144@\002\005\245\225\000\000\216\176\179\144\005\001\021@\144@\002\005\245\225\000\000\217@\002\005\245\225\000\000\218\144\2243caml_gc_minor_wordsAA;caml_gc_minor_words_unboxed\160@@A\005\001\024@\160\160\176\001\004!#get@\192\176\193@\176\179\144\004T@\144@\002\005\245\225\000\000\213\176\179\144\004\166@\144@\002\005\245\225\000\000\214@\002\005\245\225\000\000\215@\005\001'@\160\160\176\001\004\"#set@\192\176\193@\176\179\004\011@\144@\002\005\245\225\000\000\210\176\179\144\004f@\144@\002\005\245\225\000\000\211@\002\005\245\225\000\000\212\144\224+caml_gc_setAA\0046\160@@@\005\0019@\160\160\176\001\004#%minor@\192\176\193@\176\179\144\004u@\144@\002\005\245\225\000\000\207\176\179\144\004y@\144@\002\005\245\225\000\000\208@\002\005\245\225\000\000\209\144\224-caml_gc_minorAA\004I\160@@@\005\001L@\160\160\176\001\004$+major_slice@\192\176\193@\176\179\144\005\001<@\144@\002\005\245\225\000\000\204\176\179\144\005\001@@\144@\002\005\245\225\000\000\205@\002\005\245\225\000\000\206\144\2243caml_gc_major_sliceAA\004\\\160@@@\005\001_@\160\160\176\001\004%%major@\192\176\193@\176\179\144\004\155@\144@\002\005\245\225\000\000\201\176\179\144\004\159@\144@\002\005\245\225\000\000\202@\002\005\245\225\000\000\203\144\224-caml_gc_majorAA\004o\160@@@\005\001r@\160\160\176\001\004&*full_major@\192\176\193@\176\179\144\004\174@\144@\002\005\245\225\000\000\198\176\179\144\004\178@\144@\002\005\245\225\000\000\199@\002\005\245\225\000\000\200\144\2242caml_gc_full_majorAA\004\130\160@@@\005\001\133@\160\160\176\001\004''compact@\192\176\193@\176\179\144\004\193@\144@\002\005\245\225\000\000\195\176\179\144\004\197@\144@\002\005\245\225\000\000\196@\002\005\245\225\000\000\197\144\2242caml_gc_compactionAA\004\149\160@@@\005\001\152@\160\160\176\001\004(*print_stat@\192\176\193@\176\179\177\144\176@*PervasivesA+out_channel\000\255@\144@\002\005\245\225\000\000\192\176\179\144\004\220@\144@\002\005\245\225\000\000\193@\002\005\245\225\000\000\194@\005\001\171@\160\160\176\001\004)/allocated_bytes@\192\176\193@\176\179\144\004\231@\144@\002\005\245\225\000\000\189\176\179\144\005\001\188@\144@\002\005\245\225\000\000\190@\002\005\245\225\000\000\191@\005\001\186@\160\160\176\001\004*.get_minor_free@\192\176\193@\176\179\144\004\246@\144@\002\005\245\225\000\000\186\176\179\144\005\001\174@\144@\002\005\245\225\000\000\187@\002\005\245\225\000\000\188\144\2243caml_get_minor_freeAA\004\202\160@@@\005\001\205@\160\160\176\001\004+*get_bucket@\192\176\193@\176\179\144\005\001\189@\144@\002\005\245\225\000\000\183\176\179\144\005\001\193@\144@\002\005\245\225\000\000\184@\002\005\245\225\000\000\185\144\2245caml_get_major_bucketA@\004\221\160@@@\005\001\224\160\160\160'noalloc\005\001\228\144@@\160\160\176\001\004,*get_credit@\192\176\193@\176\179\144\005\001!@\144@\002\005\245\225\000\000\180\176\179\144\005\001\217@\144@\002\005\245\225\000\000\181@\002\005\245\225\000\000\182\144\2245caml_get_major_creditA@\004\245\160@@@\005\001\248\160\160\160'noalloc\005\001\252\144@@\160\160\176\001\004-3huge_fallback_count@\192\176\193@\176\179\144\005\0019@\144@\002\005\245\225\000\000\177\176\179\144\005\001\241@\144@\002\005\245\225\000\000\178@\002\005\245\225\000\000\179\144\224;caml_gc_huge_fallback_countAA\005\001\r\160@@@\005\002\016@\160\160\176\001\004.(finalise@\192\176\193@\176\193@\176\144\144!a\002\005\245\225\000\000\173\176\179\144\005\001R@\144@\002\005\245\225\000\000\171@\002\005\245\225\000\000\172\176\193@\004\n\176\179\144\005\001X@\144@\002\005\245\225\000\000\174@\002\005\245\225\000\000\175@\002\005\245\225\000\000\176@\005\002'@\160\160\176\001\004/-finalise_last@\192\176\193@\176\193@\176\179\144\005\001e@\144@\002\005\245\225\000\000\164\176\179\144\005\001i@\144@\002\005\245\225\000\000\165@\002\005\245\225\000\000\166\176\193@\176\144\144!a\002\005\245\225\000\000\167\176\179\144\005\001s@\144@\002\005\245\225\000\000\168@\002\005\245\225\000\000\169@\002\005\245\225\000\000\170@\005\002B@\160\160\176\001\00400finalise_release@\192\176\193@\176\179\144\005\001~@\144@\002\005\245\225\000\000\161\176\179\144\005\001\130@\144@\002\005\245\225\000\000\162@\002\005\245\225\000\000\163@\005\002Q@\160\177\176\001\0041%alarm@\b\000\000,\000@@@A@@@\005\002V@@\005\001\217A\160\160\176\001\0042,create_alarm@\192\176\193@\176\193@\176\179\144\005\001\148@\144@\002\005\245\225\000\000\156\176\179\144\005\001\152@\144@\002\005\245\225\000\000\157@\002\005\245\225\000\000\158\176\179\144\004\023@\144@\002\005\245\225\000\000\159@\002\005\245\225\000\000\160@\005\002k@\160\160\176\001\0043,delete_alarm@\192\176\193@\176\179\004\011@\144@\002\005\245\225\000\000\153\176\179\144\005\001\170@\144@\002\005\245\225\000\000\154@\002\005\245\225\000\000\155@\005\002y@@\160\160\"Gc\1440\211\237\188\173\221\154\137\134}\251\235\018`h\177\246\160\160*Pervasives\1440\156\"[\212{\177=\149\252\160\216[\172\136\225m\160\160\"Js\1440\167\228~:\019\167\195\150\213|\002\141\226\166:\190\160\1608CamlinternalFormatBasics\1440\176\204G\0192\227\021\136k\159\234\t\245:us\160\160.Bs_stdlib_mini\1440\231_y\233Q`\004\001\022\188?\176\202\014\133\233\160\160+Belt_Result\1440\197\252&\187\1479\137\145?\178T\131\184\193\214\192\160\160$Belt\1440B\178r\228;\0179\004\"i\210`\136\011\159\209@@",
-)
diff --git a/jscomp/syntax/tests/printer/other/nesting.res b/jscomp/syntax/tests/printer/other/nesting.res
deleted file mode 100644
index 70b0798..0000000
--- a/jscomp/syntax/tests/printer/other/nesting.res
+++ /dev/null
@@ -1,53 +0,0 @@
-let unitsCommands = state.units->Js.Array2.mapi(({
-  unit: targetUnit,
-  coordinates: targetCoordinates,
-}, i) => {
-  // n^2
-  let res = []
-  state.units->Js.Array2.forEachi(({
-    unit: unitThatMightBeAttacking,
-    coordinates: unitThatMightBeAttackingCoordinates,
-  }, j) => {
-    if i !== j {
-      switch Js.Array2.unsafe_get(
-        unitThatMightBeAttacking.timeline,
-        unitThatMightBeAttacking.currentFrame,
-      ).effect {
-      | Some(UnitAttack({damage, hitBox: _})) =>
-        let unitThatMightBeAttackingHitBox_ = Unit.hitBox(unitThatMightBeAttacking)
-        let unitThatMightBeAttackingHitBox = {
-          ...unitThatMightBeAttackingHitBox_,
-          x: unitThatMightBeAttackingCoordinates.x +. unitThatMightBeAttackingHitBox_.x,
-          y: unitThatMightBeAttackingCoordinates.y +. unitThatMightBeAttackingHitBox_.y,
-        }
-        let targetUnitHitBox_ = Unit.hitBox(targetUnit)
-        let targetUnitHitBox = {
-          ...targetUnitHitBox_,
-          x: targetCoordinates.x +. targetUnitHitBox_.x,
-          y: targetCoordinates.y +. targetUnitHitBox_.y,
-        }
-        let hit = hitTest(unitThatMightBeAttackingHitBox, targetUnitHitBox)
-
-        if hit {
-          // TODO: it's wrong to put this here. We don't know whether wizard resisted the attack or not
-          let sparksX = targetUnitHitBox.x +. targetUnitHitBox.width /. 2.
-          let sparksY = targetUnitHitBox.y +. targetUnitHitBox.height /. 2.
-          let spark = {
-            unit: Spark.make(
-              ~spriteSheet=assets.spark,
-              ~orientation=targetUnit.orientation,
-              ~aspectRatio=1.,
-              ~anchor=Middle,
-            ),
-            coordinates: {x: sparksX, y: sparksY, z: 0.},
-          }
-          particlesToAdd->Js.Array2.push(spark)->ignore
-
-          res->Js.Array2.push(Unit.CommandAttacked({damage: damage}))->ignore
-        }
-      | _ => ()
-      }
-    }
-  })
-  res
-})
diff --git a/jscomp/syntax/tests/printer/other/number.res b/jscomp/syntax/tests/printer/other/number.res
deleted file mode 100644
index c94bc17..0000000
--- a/jscomp/syntax/tests/printer/other/number.res
+++ /dev/null
@@ -1,32 +0,0 @@
-let x = 0b0000_0001
-
-let int32 = 42l
-let int64 = 42L
-
-let x = -44.20e99
-let x = -44.20_34e99
-let x = -44.20e+9
-let x = -44.20e-9
-let x = -44.20e-99_99
-let x = -444_444.20e99
-let x = 44.20e99
-let x = 44.20_34e99
-let x = 44.20e+9
-let x = 44.20e-9
-let x = 44.20e-99_99
-let x = 44e99
-let x = 44_44e99
-
-let x = 0x0
-let x = 0X0
-
-let x = 0xAA
-let x = 0XA_A
-let x = 0xAA.ff
-let x = 0xAA.ff_ff
-let x = 0xAA.ff_ffp10
-let x = 0xAA.ff_ffp+10
-let x = 0xAA.ff_ffp-10
-let x = 0xAA.ff_ffp100_00
-let x = 0xAA.ff_ffp+100_00
-let x = 0xAA.ff_ffp-100_00
diff --git a/jscomp/syntax/tests/printer/other/reasonArity.res b/jscomp/syntax/tests/printer/other/reasonArity.res
deleted file mode 100644
index 799c6d9..0000000
--- a/jscomp/syntax/tests/printer/other/reasonArity.res
+++ /dev/null
@@ -1,14 +0,0 @@
-let _ = Constructor(a, b)
-let _ = Constructor((a, b))
-let _ = #Constructor(a, b)
-let _ = #Constructor(a, b)
-
-switch a {
-| C(c, d) => 1
-| C((c, d)) => 1
-}
-
-switch a {
-| #C(c, d) => 1
-| #C(c, d) => 1
-}
diff --git a/jscomp/syntax/tests/printer/other/reasonFile.res b/jscomp/syntax/tests/printer/other/reasonFile.res
deleted file mode 100644
index 578b028..0000000
--- a/jscomp/syntax/tests/printer/other/reasonFile.res
+++ /dev/null
@@ -1,5 +0,0 @@
-/* parses reason file */
-let () = {
-  let msg = "test"
-  msg->Js.log
-}
diff --git a/jscomp/syntax/tests/printer/other/reasonInterfaceFile.resi b/jscomp/syntax/tests/printer/other/reasonInterfaceFile.resi
deleted file mode 100644
index e8725f1..0000000
--- a/jscomp/syntax/tests/printer/other/reasonInterfaceFile.resi
+++ /dev/null
@@ -1,2 +0,0 @@
-/* parse reason interface file */
-let x: int
diff --git a/jscomp/syntax/tests/printer/other/reasonString.res b/jscomp/syntax/tests/printer/other/reasonString.res
deleted file mode 100644
index e68fb53..0000000
--- a/jscomp/syntax/tests/printer/other/reasonString.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let x = j`foo \${bar`
-let x = j`foo \`bar`
-let x = j`foo \\bar`
-let x = j`foo \\\${bar`
diff --git a/jscomp/syntax/tests/printer/other/signaturePicker.res b/jscomp/syntax/tests/printer/other/signaturePicker.res
deleted file mode 100644
index 5ca0776..0000000
--- a/jscomp/syntax/tests/printer/other/signaturePicker.res
+++ /dev/null
@@ -1,51 +0,0 @@
-open React
-
-module TimeSignature = {
-  /* Others are 2/2 9/8 3/2 12/8 and 4/2 */
-  type t =
-    | TwoFour
-    | ThreeFour
-    | FourFour
-    | SixEight
-  
-  let toString = x =>
-    switch x {
-    | TwoFour => "2/4"
-    | ThreeFour => "3/4"
-    | FourFour => "4/4"
-    | SixEight => "6/8"
-    }
-}
-
-@react.component
-let make = () => {
-  let options = {
-    open TimeSignature
-    list{TwoFour, ThreeFour, FourFour, SixEight}
-  }
-  
-  <label className="flex items-center">
-    <div className="pr-2 font-bold text-gray-400 text-lg"> {"Signature"->string} </div>
-    <select
-      id="country"
-      className="transition duration-150 ease-in-out sm:text-sm sm:leading-5 border-none font-bold text-2xl text-gray-600 bg-transparent">
-      {options->Belt.List.map(option =>
-        <option key={option->TimeSignature.toString}>
-          {option->TimeSignature.toString->string}
-        </option>
-      )->Belt.List.toArray->array}
-    </select>
-    <svg
-      viewBox="0 0 24 24"
-      width="24"
-      height="24"
-      stroke="currentColor"
-      strokeWidth="2"
-      fill="none"
-      strokeLinecap="round"
-      strokeLinejoin="round"
-      className="text-gray-400">
-      <polyline points="6 9 12 15 18 9" />
-    </svg>
-  </label>
-}
diff --git a/jscomp/syntax/tests/printer/other/string.res b/jscomp/syntax/tests/printer/other/string.res
deleted file mode 100644
index ee6287e..0000000
--- a/jscomp/syntax/tests/printer/other/string.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let s = "a string with \b \n \r \t abcdef"
-
-let s = "🚀 🤭 🔥 😀 with emojis 😅 👌 test 👀"
-
-let s = "a \"string inside\" a string"
-
-let s = "a double escaped \\ test"
-
-let s = "what happens here \\n"
-
-let s = "\0 \xA0"
-
-let s = "unknown escape \m111 as passed through"
-
-let heart = "\u2665"
-
-let smile = "emoji: \u{1F600}"
-
-let taggedTemplate = sql`select * from ${table} where id = ${id}`
-
-let taggedTemplate = Pg.sql`select * from ${table} where id = ${id}`
\ No newline at end of file
diff --git a/jscomp/syntax/tests/printer/pattern/alias.res b/jscomp/syntax/tests/printer/pattern/alias.res
deleted file mode 100644
index f119137..0000000
--- a/jscomp/syntax/tests/printer/pattern/alias.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let x as y = 1
-let (x as y) as z = 1
-let (Foo | Bar) as x = 1
diff --git a/jscomp/syntax/tests/printer/pattern/any.res b/jscomp/syntax/tests/printer/pattern/any.res
deleted file mode 100644
index 7145d23..0000000
--- a/jscomp/syntax/tests/printer/pattern/any.res
+++ /dev/null
@@ -1 +0,0 @@
-let _ = 1
diff --git a/jscomp/syntax/tests/printer/pattern/array.res b/jscomp/syntax/tests/printer/pattern/array.res
deleted file mode 100644
index fd8dc81..0000000
--- a/jscomp/syntax/tests/printer/pattern/array.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let [a, b, c] = 1
-
-let [aaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccc] = 1
diff --git a/jscomp/syntax/tests/printer/pattern/constant.res b/jscomp/syntax/tests/printer/pattern/constant.res
deleted file mode 100644
index caed977..0000000
--- a/jscomp/syntax/tests/printer/pattern/constant.res
+++ /dev/null
@@ -1,60 +0,0 @@
-let 1 = 1
-let "string" = 1
-let 3.14 = 1
-
-let print = (ppf, i) =>
-  switch i.stamp {
-  | 0 => fprintf(ppf, "%s!", i.name)
-  | -1 => fprintf(ppf, "%s#", i.name)
-  | +1 => fprintf(ppf, "%s#", i.name)
-  | -1. => fprintf(ppf, "%s#", i.name)
-  | +1. => fprintf(ppf, "%s#", i.name)
-  }
-
-let [-1, +1, 1] = x
-
-switch science {
-| (1.12, -3.13) => true
-| [1.12, -3.13] => true
-| list{1.12, -3.13} => true
-| {x: 1.12, y: -3.13} => true
-| Constructor(1.12, -2.45) => true
-| #Constuctor(1.12, -2.45) => true
-| -4.15 as x => true
-| -4.15 | +4.15 => true
-| (-3.14 : float) => true
-| lazy 5.678 => true
-| exception 19.34 => true
-| _ => false
-}
-
-<div>
-  {switch state.uploadProgress {
-    | None => React.null
-    | Some(1.0) => React.null
-    | Some(uploadProgress) =>
-      <div className=Styles.fill>
-        <StudioUploadProgressIndicator progress=uploadProgress />
-      </div>
-    }}
-</div>
-
-switch literal {
-| `literal` => true
-| (`literal1`, `literal2`) => true
-| [`literal1`, `literal2`] => true
-| list{`literal1`, `literal2`} => true
-| {x: `literal1`, y: `literal2`} => true
-| Constructor(`literal1`, `literal2`) => true
-| #Constuctor(`literal1`, `literal2`) => true
-| `literal` as x => true
-| `literal` | `literal` => true
-| (`literal` : string) => true
-| lazy `literal`  => true
-| exception `literal` => true
-| _ => false
-}
-
-let `literal constant` = x
-
-for `literal constant` in 0 to 10 { () }
diff --git a/jscomp/syntax/tests/printer/pattern/constraint.res b/jscomp/syntax/tests/printer/pattern/constraint.res
deleted file mode 100644
index 13355d3..0000000
--- a/jscomp/syntax/tests/printer/pattern/constraint.res
+++ /dev/null
@@ -1,10 +0,0 @@
-switch thing {
-| Some((node: node)) => ()
-| Some(node: Feature.node) => ()
-| list{(child: node), ...rest} => ()
-| list{child: node, ...rest} => ()
-| (Some(_), Some((menuItem: Menu.item))) => ()
-| (Some(_), Some(menuItem: Menu.item)) => ()
-| SettingChanged(({fullName, value, _}: Nova.Setting.t)) => ()
-| SettingChanged({fullName, value, _}: Nova.Setting.t) => ()
-}
diff --git a/jscomp/syntax/tests/printer/pattern/construct.res b/jscomp/syntax/tests/printer/pattern/construct.res
deleted file mode 100644
index f2f86f7..0000000
--- a/jscomp/syntax/tests/printer/pattern/construct.res
+++ /dev/null
@@ -1,28 +0,0 @@
-let () = 1 
-
-let Constructor = 1
-
-let Foo() = 1
-let Foo(()) = 1
-
-let Rgb(r, g, b) = 1
-
-let Rgb(rrrrrrrrrrrrrrrrrrrrrrrrr, ggggggggggggggggggggggggg, bbbbbbbbbbbbbbbbbbbbbbbbb) = 1
-let Units((), (), ()) = 1
-
-switch truth {
-| true => Js.log("true")
-| false => Js.log("false")
-}
-
-switch sphere->intersect(~ray) {
-| None => assert(false)
-| Some((x, y)) => assert(true)
-}
-
-
-// huggable patterns
-let Foo({superLongIdent: x, superLongIdent2: y, superLongIdent3: z, superLongIdent4: a}) = x 
-let Foo((superLongIdent, superLongIdent2, superLongIdent, superLongIdent4, superLongIdent5)) = x 
-let Foo([superLongIdent, superLongIdent2, superLongIdent, superLongIdent4, superLongIdent5]) = x 
-let Foo(list{superLongIdent, superLongIdent2, superLongIdent, superLongIdent4, superLongIdent5}) = x 
diff --git a/jscomp/syntax/tests/printer/pattern/exception.res b/jscomp/syntax/tests/printer/pattern/exception.res
deleted file mode 100644
index 09c058b..0000000
--- a/jscomp/syntax/tests/printer/pattern/exception.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let exception Exit = 1
-let exception (Exit | Quit) = 1
-let exception Exit as z = 1
-let exception (Exit as z) = 1
diff --git a/jscomp/syntax/tests/printer/pattern/exoticIdent.res b/jscomp/syntax/tests/printer/pattern/exoticIdent.res
deleted file mode 100644
index beb0380..0000000
--- a/jscomp/syntax/tests/printer/pattern/exoticIdent.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let \"type" = x
-
-let {\"type", \"module"} = x
-let {\"type": \"let", \"module": \"DangerousPattern"} = x
-let {Foo.\"type": \"let", \"module": \"DangerousPattern"} = x
-
-let \"1" = x
diff --git a/jscomp/syntax/tests/printer/pattern/expected/alias.res.txt b/jscomp/syntax/tests/printer/pattern/expected/alias.res.txt
deleted file mode 100644
index f119137..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/alias.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-let x as y = 1
-let (x as y) as z = 1
-let (Foo | Bar) as x = 1
diff --git a/jscomp/syntax/tests/printer/pattern/expected/any.res.txt b/jscomp/syntax/tests/printer/pattern/expected/any.res.txt
deleted file mode 100644
index 7145d23..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/any.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-let _ = 1
diff --git a/jscomp/syntax/tests/printer/pattern/expected/array.res.txt b/jscomp/syntax/tests/printer/pattern/expected/array.res.txt
deleted file mode 100644
index fd8dc81..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/array.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-let [a, b, c] = 1
-
-let [aaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccc] = 1
diff --git a/jscomp/syntax/tests/printer/pattern/expected/constant.res.txt b/jscomp/syntax/tests/printer/pattern/expected/constant.res.txt
deleted file mode 100644
index 895b209..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/constant.res.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-let 1 = 1
-let "string" = 1
-let 3.14 = 1
-
-let print = (ppf, i) =>
-  switch i.stamp {
-  | 0 => fprintf(ppf, "%s!", i.name)
-  | -1 => fprintf(ppf, "%s#", i.name)
-  | 1 => fprintf(ppf, "%s#", i.name)
-  | -1. => fprintf(ppf, "%s#", i.name)
-  | 1. => fprintf(ppf, "%s#", i.name)
-  }
-
-let [-1, 1, 1] = x
-
-switch science {
-| (1.12, -3.13) => true
-| [1.12, -3.13] => true
-| list{1.12, -3.13} => true
-| {x: 1.12, y: -3.13} => true
-| Constructor(1.12, -2.45) => true
-| #Constuctor(1.12, -2.45) => true
-| -4.15 as x => true
-| -4.15 | 4.15 => true
-| (-3.14: float) => true
-| lazy 5.678 => true
-| exception 19.34 => true
-| _ => false
-}
-
-<div>
-  {switch state.uploadProgress {
-  | None => React.null
-  | Some(1.0) => React.null
-  | Some(uploadProgress) =>
-    <div className=Styles.fill>
-      <StudioUploadProgressIndicator progress=uploadProgress />
-    </div>
-  }}
-</div>
-
-switch literal {
-| `literal` => true
-| (`literal1`, `literal2`) => true
-| [`literal1`, `literal2`] => true
-| list{`literal1`, `literal2`} => true
-| {x: `literal1`, y: `literal2`} => true
-| Constructor(`literal1`, `literal2`) => true
-| #Constuctor(`literal1`, `literal2`) => true
-| `literal` as x => true
-| `literal` | `literal` => true
-| (`literal`: string) => true
-| lazy `literal` => true
-| exception `literal` => true
-| _ => false
-}
-
-let `literal constant` = x
-
-for `literal constant` in 0 to 10 {
-  ()
-}
diff --git a/jscomp/syntax/tests/printer/pattern/expected/constraint.res.txt b/jscomp/syntax/tests/printer/pattern/expected/constraint.res.txt
deleted file mode 100644
index 743edef..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/constraint.res.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-switch thing {
-| Some(node: node) => ()
-| Some(node: Feature.node) => ()
-| list{child: node, ...rest} => ()
-| list{child: node, ...rest} => ()
-| (Some(_), Some(menuItem: Menu.item)) => ()
-| (Some(_), Some(menuItem: Menu.item)) => ()
-| SettingChanged({fullName, value, _}: Nova.Setting.t) => ()
-| SettingChanged({fullName, value, _}: Nova.Setting.t) => ()
-}
diff --git a/jscomp/syntax/tests/printer/pattern/expected/construct.res.txt b/jscomp/syntax/tests/printer/pattern/expected/construct.res.txt
deleted file mode 100644
index d464746..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/construct.res.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-let () = 1
-
-let Constructor = 1
-
-let Foo() = 1
-let Foo() = 1
-
-let Rgb(r, g, b) = 1
-
-let Rgb(rrrrrrrrrrrrrrrrrrrrrrrrr, ggggggggggggggggggggggggg, bbbbbbbbbbbbbbbbbbbbbbbbb) = 1
-let Units((), (), ()) = 1
-
-switch truth {
-| true => Js.log("true")
-| false => Js.log("false")
-}
-
-switch sphere->intersect(~ray) {
-| None => assert(false)
-| Some((x, y)) => assert(true)
-}
-
-// huggable patterns
-let Foo({superLongIdent: x, superLongIdent2: y, superLongIdent3: z, superLongIdent4: a}) = x
-let Foo((superLongIdent, superLongIdent2, superLongIdent, superLongIdent4, superLongIdent5)) = x
-let Foo([superLongIdent, superLongIdent2, superLongIdent, superLongIdent4, superLongIdent5]) = x
-let Foo(list{superLongIdent, superLongIdent2, superLongIdent, superLongIdent4, superLongIdent5}) = x
diff --git a/jscomp/syntax/tests/printer/pattern/expected/exception.res.txt b/jscomp/syntax/tests/printer/pattern/expected/exception.res.txt
deleted file mode 100644
index 09c058b..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/exception.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-let exception Exit = 1
-let exception (Exit | Quit) = 1
-let exception Exit as z = 1
-let exception (Exit as z) = 1
diff --git a/jscomp/syntax/tests/printer/pattern/expected/exoticIdent.res.txt b/jscomp/syntax/tests/printer/pattern/expected/exoticIdent.res.txt
deleted file mode 100644
index beb0380..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/exoticIdent.res.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-let \"type" = x
-
-let {\"type", \"module"} = x
-let {\"type": \"let", \"module": \"DangerousPattern"} = x
-let {Foo.\"type": \"let", \"module": \"DangerousPattern"} = x
-
-let \"1" = x
diff --git a/jscomp/syntax/tests/printer/pattern/expected/extension.res.txt b/jscomp/syntax/tests/printer/pattern/expected/extension.res.txt
deleted file mode 100644
index 16a21db..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/extension.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-let %extensionPoint = 1
diff --git a/jscomp/syntax/tests/printer/pattern/expected/firstClassModules.res.txt b/jscomp/syntax/tests/printer/pattern/expected/firstClassModules.res.txt
deleted file mode 100644
index 6712935..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/firstClassModules.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-let module(Set) = z
-let module(Set: Set.S with type elt = s) = y
-let module(Set: Set.S with type elt = s and type elt2 = t) = x
-let module(Set: Set.S with
-  type elt = s
-  and type elt2 = t
-  and type elementWithSuperLongName = thisIsALongTypeOverHere
-) = x
diff --git a/jscomp/syntax/tests/printer/pattern/expected/interval.res.txt b/jscomp/syntax/tests/printer/pattern/expected/interval.res.txt
deleted file mode 100644
index ce6ca70..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/interval.res.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-let 'a' .. 'z' = x
-
-let loop = (i, s) =>
-  switch String.get(s, i) {
-  | '0' .. '9' | '-' => loop(i + 1)
-  | _ => s
-  }
diff --git a/jscomp/syntax/tests/printer/pattern/expected/lazy.res.txt b/jscomp/syntax/tests/printer/pattern/expected/lazy.res.txt
deleted file mode 100644
index 77a8286..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/lazy.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-let lazy x = 1
-let lazy (Foo | Bar) = 1
-let lazy (x as y) = 1
diff --git a/jscomp/syntax/tests/printer/pattern/expected/list.res.txt b/jscomp/syntax/tests/printer/pattern/expected/list.res.txt
deleted file mode 100644
index 66d3131..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/list.res.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-let list{} = 1
-let list{1} = 1
-let list{1, 2} = 1
-let list{1, 2, 3} = 1
-let list{1, 2, ...tail} = 1
-
-let list{aaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccc} = 1
-let list{
-  aaaaaaaaaaaaaaaaaaaaaaaaaa,
-  bbbbbbbbbbbbbbbbbbbbbbbbbb,
-  cccccccccccccccccccccccccc,
-  ...tail,
-} = 1
diff --git a/jscomp/syntax/tests/printer/pattern/expected/or.res.txt b/jscomp/syntax/tests/printer/pattern/expected/or.res.txt
deleted file mode 100644
index 84786bd..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/or.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-let Foo | Bar = 1
-let Red | Blue | Green = 1
-let Red | (Blue | Green) = 1
-let exception Foo | exception Bar = 1
-
-let Red | Blue | Green = x
-
-let Red | (Blue | Green) = x
-let Red | Blue | Green = x
-let Red | Blue | (Green | Purple) | Black = x
-let Red | Blue | (Green | Purple | Rosa) | (Black | White) = x
-let Red | Blue | (Green | Purple | Rosa) | (Black | White) | AnotherColoooooour = x
diff --git a/jscomp/syntax/tests/printer/pattern/expected/record.res.txt b/jscomp/syntax/tests/printer/pattern/expected/record.res.txt
deleted file mode 100644
index 58fae7d..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/record.res.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-let {x} = 1
-let {x, _} = 1
-let {x, y} = 1
-let {x, y, _} = 1
-let {x: xCoord} = 1
-let {x: xCoord, _} = 1
-let {x: xCoord, y: yCoord} = 1
-let {x: xCoord, y: yCoord, _} = 1
-let {xxxxxxxxxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzzzzzzzzzzz} = 1
-let {xxxxxxxxxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzzzzzzzzzzz, _} = 1
-
-let {x: y} = z
-let {x: x as y} = z
-
-let get_age3 = ({age: (age2: int), name: _}) => age2
-let get_age3 = ({age: _, name: _}) => age2
-let get_age3 = ({age: age2, name: _}) => age2
-let get_age3 = ({age: 3.14, name: _}) => age2
-let get_age3 = ({age: 3, name: _}) => age2
-let get_age3 = ({age: true, name: _}) => age2
-let get_age3 = ({age: false, name: _}) => age2
-let get_age3 = ({age: "100", name: _}) => age2
-let get_age3 = ({age: 1 .. 2, name: _}) => age2
-let get_age3 = ({age: 'a' .. 'z', name: _}) => age2
-let get_age3 = ({age: (a, b, c, d), name: _}) => age2
-let get_age3 = ({
-  age: (
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-    bbbbbbbbbbbbbbbbbbbbbbbbb,
-    cccccccccccccccccccccc,
-    ddddddddddddddddddddddddddddddd,
-  ),
-  name: _,
-}) => age2
-let get_age3 = ({age: Rgb(r, g, b), name: _}) => age2
-let get_age3 = ({age: Rgb({r, g, b}), name: _}) => age2
-let get_age3 = ({age: Rgb({r: red, g: green, b: black}), name: _}) => age2
-let get_age3 = ({
-  age: Rgb(
-    rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr,
-    gggggggggggggggggggggggggggggggg,
-    bbbbbbbbbbbbbbbbbbbbbbbbbbbb,
-  ),
-  name: _,
-}) => age2
-let get_age3 = ({
-  age: Rgb({
-    r: rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr,
-    g: gggggggggggggggggggggggggg,
-    b: bbbbbbbbbbbbbbbb,
-  }),
-  name: _,
-}) => age2
-
-let get_age3 = ({age: #red, name: _}) => age2
-let get_age3 = ({age: #Blue, name: _}) => age2
-let get_age3 = ({age: #Rgb(r, g, b), name: _}) => age2
-let get_age3 = ({
-  age: #Rgb(
-    rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr,
-    gggggggggggggggggggggggggggggggg,
-    bbbbbbbbbbbbbbbbbbbbbbbbbbbb,
-  ),
-  name: _,
-}) => age2
-let get_age3 = ({
-  age: #Rgb({
-    r: rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr,
-    g: gggggggggggggggggggggggggggggggg,
-    b: bbbbbbbbbbbbbbbbbbbbbbbbbbbb,
-  }),
-  name: _,
-}) => age2
-let get_age3 = ({age: {birthDay: day, birthMonth: month}, name: _}) => age2
-let get_age3 = ({
-  age: {
-    birthDay: daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay,
-    birthMonth: moooooooooooooooooooooooooooooooooonth,
-  },
-  name: _,
-}) => age2
-
-let get_age3 = ({age: [], name: _}) => age2
-let get_age3 = ({age: [a, b, c, d], name: _}) => age2
-let get_age3 = ({
-  age: [
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-    bbbbbbbbbbbbbbbbbbbbbbbbb,
-    cccccccccccccccccccccc,
-    ddddddddddddddddddddddddddddddd,
-  ],
-  name: _,
-}) => age2
-
-let get_age3 = ({age: list{}, name: _}) => age2
-let get_age3 = ({age: list{a, b, c, d}, name: _}) => age2
-let get_age3 = ({
-  age: list{
-    aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
-    bbbbbbbbbbbbbbbbbbbbbbbbb,
-    cccccccccccccccccccccc,
-    ddddddddddddddddddddddddddddddd,
-  },
-  name: _,
-}) => age2
-
-let get_age3 = ({age: Red | Blue | Green, name: _}) => age2
-
-let get_age3 = ({age: #...ppatType, name: _}) => age2
-
-let get_age3 = ({age: lazy ppatType, name: _}) => age2
-
-let get_age3 = ({age: module(P), name: _}) => age2
-let get_age3 = ({age: module(P: S), name: _}) => age2
-
-let get_age3 = ({age: exception Exit, name: _}) => age2
-
-let get_age3 = ({age: %raw("__GC"), name: _}) => age2
diff --git a/jscomp/syntax/tests/printer/pattern/expected/tuple.res.txt b/jscomp/syntax/tests/printer/pattern/expected/tuple.res.txt
deleted file mode 100644
index b03c033..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/tuple.res.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// let (a,) = 1 -> one-element tuples are not supported
-let (a, b) = 1
-let (aaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccc) = 1
diff --git a/jscomp/syntax/tests/printer/pattern/expected/type.res.txt b/jscomp/syntax/tests/printer/pattern/expected/type.res.txt
deleted file mode 100644
index 560ce89..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/type.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-let #...shape = x
-let #...\"Shape" = x
-let #...\"type" = x
-let #...\"test 🏚" = x
-let #...\"Shape✅" = x
-
-switch (selectedChoice, value) {
-| (#...A.a, #...A.a) => true
-| (#...A.b, #...A.b) => true
-| (#...A.c, #...A.c) => true
-| _ => false
-}
diff --git a/jscomp/syntax/tests/printer/pattern/expected/var.res.txt b/jscomp/syntax/tests/printer/pattern/expected/var.res.txt
deleted file mode 100644
index daf60a1..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/var.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-let foo = 1
-
-let superLongIdentifierLongSoooooooooooooLooooooooooooooooooooooooooooooooooooooong = 1
-
-let list = 3
diff --git a/jscomp/syntax/tests/printer/pattern/expected/variant.res.txt b/jscomp/syntax/tests/printer/pattern/expected/variant.res.txt
deleted file mode 100644
index 74d2f18..0000000
--- a/jscomp/syntax/tests/printer/pattern/expected/variant.res.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-let #shape = x
-let #Shape = x
-let #"type" = x
-let #"test 🏚" = x
-let #"Shape✅" = x
-let #1 = x
-let #123 = x
-let #"10space" = x
-
-let #space10 = x
-
-let #Shape(\"module", \"ExoticIdent") = x
-
-let #"type"(\"module", \"ExoticIdent") = x
-let #"Shape🎡"(\"module", \"ExoticIdent") = x
-
-let cmp = (selectedChoice, value) =>
-  switch (selectedChoice, value) {
-  | (#...a, #...a) => true
-  | [#...b, #...b] => true
-  | list{#...b, #...b} => true
-  | {x: #...c, y: #...c} => true
-  | Constructor(#...a, #...a) => true
-  | #Constuctor(#...a, #...a) => true
-  | #...a as x => true
-  | #...a | #...b => true
-  | (#...a: typ) => true
-  | lazy #...a => true
-  | exception #...a => true
-  | #1 => true
-  | #123 => true
-  | #"10space" => x
-  | #space10 => x
-  | _ => false
-  }
-
-switch x {
-| #a() => ()
-| #a() => ()
-}
-
-switch numericPolyVar {
-| #42 => ()
-| #3(x, y, z) => Js.log3(x, y, z)
-}
-
-let e = #""
diff --git a/jscomp/syntax/tests/printer/pattern/extension.res b/jscomp/syntax/tests/printer/pattern/extension.res
deleted file mode 100644
index 16a21db..0000000
--- a/jscomp/syntax/tests/printer/pattern/extension.res
+++ /dev/null
@@ -1 +0,0 @@
-let %extensionPoint = 1
diff --git a/jscomp/syntax/tests/printer/pattern/firstClassModules.res b/jscomp/syntax/tests/printer/pattern/firstClassModules.res
deleted file mode 100644
index ddd6f26..0000000
--- a/jscomp/syntax/tests/printer/pattern/firstClassModules.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let module(Set) = z 
-let module(Set : Set.S with type elt = s) = y
-let module(Set : Set.S with type elt = s and type elt2 = t) = x 
-let module(Set : Set.S with type elt = s and type elt2 = t and type elementWithSuperLongName = thisIsALongTypeOverHere) = x 
diff --git a/jscomp/syntax/tests/printer/pattern/interval.res b/jscomp/syntax/tests/printer/pattern/interval.res
deleted file mode 100644
index f235dde..0000000
--- a/jscomp/syntax/tests/printer/pattern/interval.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let 'a' .. 'z' = x
-
-let loop = (i, s) =>
-  switch String.get(s, i) {
-  | '0' .. '9' | '-' => loop (i+1)
-  | _ => s
-  }
diff --git a/jscomp/syntax/tests/printer/pattern/lazy.res b/jscomp/syntax/tests/printer/pattern/lazy.res
deleted file mode 100644
index 77a8286..0000000
--- a/jscomp/syntax/tests/printer/pattern/lazy.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let lazy x = 1
-let lazy (Foo | Bar) = 1
-let lazy (x as y) = 1
diff --git a/jscomp/syntax/tests/printer/pattern/list.res b/jscomp/syntax/tests/printer/pattern/list.res
deleted file mode 100644
index c37a48f..0000000
--- a/jscomp/syntax/tests/printer/pattern/list.res
+++ /dev/null
@@ -1,8 +0,0 @@
-let list{} = 1
-let list{1} = 1
-let list{1, 2} = 1
-let list{1, 2, 3} = 1
-let list{1, 2, ...tail} = 1
-
-let list{aaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccc} = 1 
-let list{aaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccc, ...tail} = 1 
diff --git a/jscomp/syntax/tests/printer/pattern/or.res b/jscomp/syntax/tests/printer/pattern/or.res
deleted file mode 100644
index 83c76f2..0000000
--- a/jscomp/syntax/tests/printer/pattern/or.res
+++ /dev/null
@@ -1,12 +0,0 @@
-let Foo | Bar = 1
-let (Red | Blue) | Green = 1
-let Red | (Blue | Green) = 1
-let exception Foo | exception Bar = 1
-
-let Red | Blue | Green = x
-
-let Red | (Blue | Green) = x
-let (Red | Blue) | Green = x
-let (Red | Blue) | (Green | Purple) | Black = x
-let (Red | Blue) | ((Green | Purple) | Rosa) | (Black | White) = x
-let (Red | Blue) | ((Green | Purple) | Rosa) | (Black | White) | AnotherColoooooour = x
diff --git a/jscomp/syntax/tests/printer/pattern/record.res b/jscomp/syntax/tests/printer/pattern/record.res
deleted file mode 100644
index e627e6c..0000000
--- a/jscomp/syntax/tests/printer/pattern/record.res
+++ /dev/null
@@ -1,62 +0,0 @@
-let {x} = 1
-let {x, _} = 1
-let {x, y} = 1
-let {x, y, _} = 1
-let {x: xCoord} = 1
-let {x: xCoord, _} = 1
-let {x: xCoord, y: yCoord} = 1
-let {x: xCoord, y: yCoord, _} = 1
-let {xxxxxxxxxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzzzzzzzzzzz } = 1
-let {xxxxxxxxxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyyyyyyyyy, zzzzzzzzzzzzzzzzzzzzzzzzz, _ } = 1
-
-let {x: y} = z
-let {x: x as y} = z
-
-let get_age3 = ({age: (age2: int), name: _}) => age2
-let get_age3 = ({age: _, name: _}) => age2
-let get_age3 = ({age: age2, name: _}) => age2
-let get_age3 = ({age: 3.14, name: _}) => age2
-let get_age3 = ({age: 3, name: _}) => age2
-let get_age3 = ({age: true, name: _}) => age2
-let get_age3 = ({age: false, name: _}) => age2
-let get_age3 = ({age: "100", name: _}) => age2
-let get_age3 = ({age: 1 .. 2, name: _}) => age2
-let get_age3 = ({age: 'a' .. 'z', name: _}) => age2
-let get_age3 = ({age: (a, b, c, d), name: _}) => age2
-let get_age3 = ({age: (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccc, ddddddddddddddddddddddddddddddd), name: _}) => age2
-let get_age3 = ({age: Rgb(r, g, b), name: _}) => age2
-let get_age3 = ({age: Rgb({r, g, b}), name: _}) => age2
-let get_age3 = ({age: Rgb({r: red, g: green, b: black}), name: _}) => age2
-let get_age3 = ({age: Rgb(rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr, gggggggggggggggggggggggggggggggg, bbbbbbbbbbbbbbbbbbbbbbbbbbbb), name: _}) => age2
-let get_age3 = ({age: Rgb({r: rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr, g: gggggggggggggggggggggggggg, b: bbbbbbbbbbbbbbbb}), name: _}) => age2
-
-
-let get_age3 = ({age: #red, name: _}) => age2
-let get_age3 = ({age: #Blue, name: _}) => age2
-let get_age3 = ({age: #Rgb(r, g, b), name: _}) => age2
-let get_age3 = ({age: #Rgb(rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr, gggggggggggggggggggggggggggggggg, bbbbbbbbbbbbbbbbbbbbbbbbbbbb), name: _}) => age2
-let get_age3 = ({age: #Rgb({r: rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr,g: gggggggggggggggggggggggggggggggg, b: bbbbbbbbbbbbbbbbbbbbbbbbbbbb}), name: _}) => age2
-let get_age3 = ({age: {birthDay: day, birthMonth: month}, name: _}) => age2
-let get_age3 = ({age: {birthDay: daaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaay, birthMonth: moooooooooooooooooooooooooooooooooonth}, name: _}) => age2
-
-let get_age3 = ({age: [], name: _}) => age2
-let get_age3 = ({age: [a, b, c, d], name: _}) => age2
-let get_age3 = ({age: [aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccc, ddddddddddddddddddddddddddddddd], name: _}) => age2
-
-
-let get_age3 = ({age: list{}, name: _}) => age2
-let get_age3 = ({age: list{a, b, c, d}, name: _}) => age2
-let get_age3 = ({age: list{aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccc, ddddddddddddddddddddddddddddddd}, name: _}) => age2
-
-let get_age3 = ({age: Red | Blue | Green, name: _}) => age2
-
-let get_age3 = ({age: #...ppatType, name: _}) => age2
-
-let get_age3 = ({age: lazy ppatType, name: _}) => age2
-
-let get_age3 = ({age: module(P), name: _}) => age2
-let get_age3 = ({age: module(P: S), name: _}) => age2
-
-let get_age3 = ({age: exception Exit, name: _}) => age2
-
-let get_age3 = ({age: %raw("__GC"), name: _}) => age2
diff --git a/jscomp/syntax/tests/printer/pattern/tuple.res b/jscomp/syntax/tests/printer/pattern/tuple.res
deleted file mode 100644
index b03c033..0000000
--- a/jscomp/syntax/tests/printer/pattern/tuple.res
+++ /dev/null
@@ -1,3 +0,0 @@
-// let (a,) = 1 -> one-element tuples are not supported
-let (a, b) = 1
-let (aaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccc) = 1
diff --git a/jscomp/syntax/tests/printer/pattern/type.res b/jscomp/syntax/tests/printer/pattern/type.res
deleted file mode 100644
index 560ce89..0000000
--- a/jscomp/syntax/tests/printer/pattern/type.res
+++ /dev/null
@@ -1,12 +0,0 @@
-let #...shape = x
-let #...\"Shape" = x
-let #...\"type" = x
-let #...\"test 🏚" = x
-let #...\"Shape✅" = x
-
-switch (selectedChoice, value) {
-| (#...A.a, #...A.a) => true
-| (#...A.b, #...A.b) => true
-| (#...A.c, #...A.c) => true
-| _ => false
-}
diff --git a/jscomp/syntax/tests/printer/pattern/var.res b/jscomp/syntax/tests/printer/pattern/var.res
deleted file mode 100644
index 04eafe3..0000000
--- a/jscomp/syntax/tests/printer/pattern/var.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let foo = 1 
-
-let superLongIdentifierLongSoooooooooooooLooooooooooooooooooooooooooooooooooooooong = 1
-
-let list = 3
diff --git a/jscomp/syntax/tests/printer/pattern/variant.res b/jscomp/syntax/tests/printer/pattern/variant.res
deleted file mode 100644
index dce2b21..0000000
--- a/jscomp/syntax/tests/printer/pattern/variant.res
+++ /dev/null
@@ -1,47 +0,0 @@
-let #shape = x
-let #Shape = x
-let #\"type" = x
-let #\"test 🏚" = x
-let #\"Shape✅" = x
-let #"1" = x
-let #"123" = x
-let #"10space" = x
-
-let #space10 = x
-
-let #Shape(\"module", \"ExoticIdent") = x
-
-let #\"type"(\"module", \"ExoticIdent") = x
-let #\"Shape🎡"(\"module", \"ExoticIdent") = x
-
-let cmp = (selectedChoice, value) =>
-  switch (selectedChoice, value) {
-  | (#...a, #...a) => true
-  | [#...b, #...b] => true
-  | list{#...b, #...b} => true
-  | {x: #...c, y: #...c} => true
-  | Constructor(#...a, #...a) => true
-  | #Constuctor(#...a, #...a) => true
-  | #...a as x => true
-  | #...a | #...b => true
-  | (#...a : typ) => true
-  | lazy #...a => true
-  | exception #...a => true
-  | #"1" => true
-  | #"123" => true
-  | #"10space" => x
-  | #space10 => x
-  | _ => false
-  }
-
-switch x {
-| #a(()) => ()
-| #a() => ()
-}
-
-switch numericPolyVar {
-| #42 => ()
-| #3(x, y, z) => Js.log3(x, y, z)
-}
-
-let e = #""
\ No newline at end of file
diff --git a/jscomp/syntax/tests/printer/signature/attributes.resi b/jscomp/syntax/tests/printer/signature/attributes.resi
deleted file mode 100644
index 56baa9c..0000000
--- a/jscomp/syntax/tests/printer/signature/attributes.resi
+++ /dev/null
@@ -1,8 +0,0 @@
-@@attr
-@@standaloneAttribute
-
-@@standaloneAttribute(paylod => f(payload))
-
-@@standalone(debugger)
-
-@@standalone("eval_raw__")
diff --git a/jscomp/syntax/tests/printer/signature/exception.resi b/jscomp/syntax/tests/printer/signature/exception.resi
deleted file mode 100644
index 5f53827..0000000
--- a/jscomp/syntax/tests/printer/signature/exception.resi
+++ /dev/null
@@ -1,8 +0,0 @@
-exception Exit
-
-@onConstructor
-exception ExitEarly
-
-exception Exit = Terminate 
-exception Exit = Lib.Terminate 
-exception Exit = Ns.Lib.Terminate 
diff --git a/jscomp/syntax/tests/printer/signature/expected/attributes.resi.txt b/jscomp/syntax/tests/printer/signature/expected/attributes.resi.txt
deleted file mode 100644
index 56baa9c..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/attributes.resi.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-@@attr
-@@standaloneAttribute
-
-@@standaloneAttribute(paylod => f(payload))
-
-@@standalone(debugger)
-
-@@standalone("eval_raw__")
diff --git a/jscomp/syntax/tests/printer/signature/expected/exception.resi.txt b/jscomp/syntax/tests/printer/signature/expected/exception.resi.txt
deleted file mode 100644
index 98166b1..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/exception.resi.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-exception Exit
-
-@onConstructor exception ExitEarly
-
-exception Exit = Terminate
-exception Exit = Lib.Terminate
-exception Exit = Ns.Lib.Terminate
diff --git a/jscomp/syntax/tests/printer/signature/expected/extension.resi.txt b/jscomp/syntax/tests/printer/signature/expected/extension.resi.txt
deleted file mode 100644
index b1e5023..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/extension.resi.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-%%raw("eval(js)")
-
-@attr
-%%extension(payload)
diff --git a/jscomp/syntax/tests/printer/signature/expected/include.resi.txt b/jscomp/syntax/tests/printer/signature/expected/include.resi.txt
deleted file mode 100644
index 1c91062..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/include.resi.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-include Belt
-
-include {
-  let x: int
-  let y: int
-
-  let add: (int, int) => int
-}
diff --git a/jscomp/syntax/tests/printer/signature/expected/modtype.resi.txt b/jscomp/syntax/tests/printer/signature/expected/modtype.resi.txt
deleted file mode 100644
index bdce15f..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/modtype.resi.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-module type IntSum = {
-  let x: int
-  let y: int
-
-  let add: (int, int) => int
-}
-
-module type LinkedList = module type of List
-
-module type Functoria = (X: Int, Y: Float) => Float
-
-module type Ext = %extension
-
-module type MyInt = Int
-
-module type X = A with type t = string
-
-module type LongNaaaaame = MyModule
-  with module X.Bar = Belt.Array
-  and module X.Bar = Belt.Array
-  and module X.Bar = Belt.Array
-
-@attr
-module type LinkedList = module type of List
diff --git a/jscomp/syntax/tests/printer/signature/expected/module.resi.txt b/jscomp/syntax/tests/printer/signature/expected/module.resi.txt
deleted file mode 100644
index 6ea923c..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/module.resi.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-module IntSum: {
-  let x: int
-  let y: int
-
-  let add: (int, int) => int
-}
-
-module LinkedList: module type of List
-
-module Functoria: (X: Int, Y: Float) => Float
-
-module Ext: %extension
-
-module MyInt = Int
-module MyInt: Int
-
-module X: A with type t = string
-
-module LongNaaaaame: MyModule
-  with module X.Bar = Belt.Array
-  and module X.Bar = Belt.Array
-  and module X.Bar = Belt.Array
-
-@attr
-module LinkedList: module type of List
diff --git a/jscomp/syntax/tests/printer/signature/expected/open.resi.txt b/jscomp/syntax/tests/printer/signature/expected/open.resi.txt
deleted file mode 100644
index 617bb7a..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/open.resi.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-open Belt
-
-open! Belt
-
-@attr
-open Belt
diff --git a/jscomp/syntax/tests/printer/signature/expected/recModule.resi.txt b/jscomp/syntax/tests/printer/signature/expected/recModule.resi.txt
deleted file mode 100644
index 139aee0..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/recModule.resi.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-module type Signature = {
-  module rec A: {
-    type t = Leaf(string) | Node(ASet.t)
-    let compare: (t, t) => int
-  }
-  // notice the need for the parens on the module_type
-  // otherwise `and` signals the start another with-constraint
-  and ASet: (Set.S with type elt = A.t)
-  and BTree: (Btree.S with type elt = A.t)
-
-  @onFirstAttr
-  module rec A: {
-    type t = Leaf(string) | Node(ASet.t)
-    let compare: (t, t) => int
-  }
-  @onSecondAttr
-  and ASet: (Set.S with type elt = A.t)
-
-  @parsableOnNext
-  module rec A: Btree
-  and ASet: BSet
-}
diff --git a/jscomp/syntax/tests/printer/signature/expected/type.resi.txt b/jscomp/syntax/tests/printer/signature/expected/type.resi.txt
deleted file mode 100644
index 898c72e..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/type.resi.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-type s = string
-
-type user = {name: string, age: int}
-
-type color =
-  | Red
-  | Blue
-  | Black
diff --git a/jscomp/syntax/tests/printer/signature/expected/typext.resi.txt b/jscomp/syntax/tests/printer/signature/expected/typext.resi.txt
deleted file mode 100644
index f747df7..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/typext.resi.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-type Rgb.color +=
-  | Red
-  | Blue
-  | Green
diff --git a/jscomp/syntax/tests/printer/signature/expected/value.resi.txt b/jscomp/syntax/tests/printer/signature/expected/value.resi.txt
deleted file mode 100644
index 33a7f34..0000000
--- a/jscomp/syntax/tests/printer/signature/expected/value.resi.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-let x: int
-let add: (int, int) => int
-
-let y: float
-
-external eval: string => unit = "js_core_eval"
diff --git a/jscomp/syntax/tests/printer/signature/extension.resi b/jscomp/syntax/tests/printer/signature/extension.resi
deleted file mode 100644
index b1e5023..0000000
--- a/jscomp/syntax/tests/printer/signature/extension.resi
+++ /dev/null
@@ -1,4 +0,0 @@
-%%raw("eval(js)")
-
-@attr
-%%extension(payload)
diff --git a/jscomp/syntax/tests/printer/signature/include.resi b/jscomp/syntax/tests/printer/signature/include.resi
deleted file mode 100644
index 1c91062..0000000
--- a/jscomp/syntax/tests/printer/signature/include.resi
+++ /dev/null
@@ -1,8 +0,0 @@
-include Belt
-
-include {
-  let x: int
-  let y: int
-
-  let add: (int, int) => int
-}
diff --git a/jscomp/syntax/tests/printer/signature/modtype.resi b/jscomp/syntax/tests/printer/signature/modtype.resi
deleted file mode 100644
index 0ffe453..0000000
--- a/jscomp/syntax/tests/printer/signature/modtype.resi
+++ /dev/null
@@ -1,25 +0,0 @@
-module type IntSum = {
-  let x: int 
-  let y: int 
-
-  let add: (int, int) => int
-}
-
-module type LinkedList = module type of List
-
-module type Functoria = (X: Int, Y: Float) => Float
-
-module type Ext = %extension
-
-module type MyInt = Int
-
-module type X = A with type t = string
-
-module type LongNaaaaame = MyModule
-  with module X.Bar = Belt.Array
-   and module X.Bar = Belt.Array
-   and module X.Bar = Belt.Array
-
-
-@attr
-module type LinkedList = module type of List
diff --git a/jscomp/syntax/tests/printer/signature/module.resi b/jscomp/syntax/tests/printer/signature/module.resi
deleted file mode 100644
index 453f3f8..0000000
--- a/jscomp/syntax/tests/printer/signature/module.resi
+++ /dev/null
@@ -1,26 +0,0 @@
-module IntSum: {
-  let x: int 
-  let y: int 
-
-  let add: (int, int) => int
-}
-
-module LinkedList: module type of List
-
-module Functoria: (X: Int, Y: Float) => Float
-
-module Ext: %extension
-
-module MyInt = Int
-module MyInt: Int
-
-module X: A with type t = string
-
-module LongNaaaaame: MyModule
-  with module X.Bar = Belt.Array
-   and module X.Bar = Belt.Array
-   and module X.Bar = Belt.Array
-
-
-@attr
-module LinkedList: module type of List
diff --git a/jscomp/syntax/tests/printer/signature/open.resi b/jscomp/syntax/tests/printer/signature/open.resi
deleted file mode 100644
index 617bb7a..0000000
--- a/jscomp/syntax/tests/printer/signature/open.resi
+++ /dev/null
@@ -1,6 +0,0 @@
-open Belt
-
-open! Belt
-
-@attr
-open Belt
diff --git a/jscomp/syntax/tests/printer/signature/recModule.resi b/jscomp/syntax/tests/printer/signature/recModule.resi
deleted file mode 100644
index 0b228c2..0000000
--- a/jscomp/syntax/tests/printer/signature/recModule.resi
+++ /dev/null
@@ -1,21 +0,0 @@
-module type Signature = {
-  module rec A: {
-    type t = Leaf(string) | Node(ASet.t)
-    let compare: (t, t) => int
-  }
-  // notice the need for the parens on the module_type
-  // otherwise `and` signals the start another with-constraint
-  and ASet: (Set.S with type elt = A.t)
-  and BTree: (Btree.S with type elt = A.t)
-
-  @onFirstAttr
-  module rec A: {
-    type t = Leaf(string) | Node(ASet.t)
-    let compare: (t, t) => int
-  }
-  @onSecondAttr
-  and ASet: Set.S with type elt = A.t
-
-  @parsableOnNext
-  module rec A: Btree and ASet: BSet
-}
diff --git a/jscomp/syntax/tests/printer/signature/type.resi b/jscomp/syntax/tests/printer/signature/type.resi
deleted file mode 100644
index 898c72e..0000000
--- a/jscomp/syntax/tests/printer/signature/type.resi
+++ /dev/null
@@ -1,8 +0,0 @@
-type s = string
-
-type user = {name: string, age: int}
-
-type color =
-  | Red
-  | Blue
-  | Black
diff --git a/jscomp/syntax/tests/printer/signature/typext.resi b/jscomp/syntax/tests/printer/signature/typext.resi
deleted file mode 100644
index f747df7..0000000
--- a/jscomp/syntax/tests/printer/signature/typext.resi
+++ /dev/null
@@ -1,4 +0,0 @@
-type Rgb.color +=
-  | Red
-  | Blue
-  | Green
diff --git a/jscomp/syntax/tests/printer/signature/value.resi b/jscomp/syntax/tests/printer/signature/value.resi
deleted file mode 100644
index 33a7f34..0000000
--- a/jscomp/syntax/tests/printer/signature/value.resi
+++ /dev/null
@@ -1,6 +0,0 @@
-let x: int
-let add: (int, int) => int
-
-let y: float
-
-external eval: string => unit = "js_core_eval"
diff --git a/jscomp/syntax/tests/printer/structure/attribute.res b/jscomp/syntax/tests/printer/structure/attribute.res
deleted file mode 100644
index 0a01097..0000000
--- a/jscomp/syntax/tests/printer/structure/attribute.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@@standaloneAttribute
-
-@@import("react")
-
-@@ssuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLoooongName("function() {return 1}")
diff --git a/jscomp/syntax/tests/printer/structure/exception.res b/jscomp/syntax/tests/printer/structure/exception.res
deleted file mode 100644
index 528624e..0000000
--- a/jscomp/syntax/tests/printer/structure/exception.res
+++ /dev/null
@@ -1,36 +0,0 @@
-exception ExitEarly
-exception ExitEarly(int)
-exception ExitEarly({x: int})
-exception ExitEarly({"jsExit": int})
-exception ExitEarly({@attr "jsExit": int})
-exception ExitEarly({@attr "jsExit": int,})
-exception ExitEarly({@attr "jsExit": int, @attr "code": int,})
-exception ExitEarly({"jsExit": int},)
-exception ExitEarly({"jsExit": int}, {"code": int})
-exception ExitEarly({"jsExit": int}, int, {"code": int},)
-exception ExitEarly(
-  {@attr "jsExit": int, @attr "code": int,},
-  {@attr "jsExit": int, @attr "code": int,},
-)
-exception ExitJsStyle({..})
-exception ExitJsStyle({.. "code": int})
-exception ExitJsStyle({.. "code": int,})
-exception ExitJsStyle({.. @attr "code": int})
-exception ExitJsStyle({.. @attr "code": int,})
-exception ExitJsStyle({.. "code": int, "time": int,})
-exception ExitJsStyle({.. @attr "code": int, @attr "time": int,})
-
-@onConstructor
-exception ExitEarly
-@onConstructor
-exception ExitEarly(int)
-
-exception Exit = Terminate 
-exception Exit = Lib.Terminate 
-exception Exit = Ns.Lib.Terminate 
-
-@onConstructor
-exception Exit = Terminate 
-@onConstructor
-exception Exit = Lib.Terminate 
-exception GadtExit(int): exit<int>
diff --git a/jscomp/syntax/tests/printer/structure/expected/attribute.res.txt b/jscomp/syntax/tests/printer/structure/expected/attribute.res.txt
deleted file mode 100644
index 0a01097..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/attribute.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-@@standaloneAttribute
-
-@@import("react")
-
-@@ssuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuperLoooongName("function() {return 1}")
diff --git a/jscomp/syntax/tests/printer/structure/expected/exception.res.txt b/jscomp/syntax/tests/printer/structure/expected/exception.res.txt
deleted file mode 100644
index 294d17e..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/exception.res.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-exception ExitEarly
-exception ExitEarly(int)
-exception ExitEarly({x: int})
-exception ExitEarly({"jsExit": int})
-exception ExitEarly({@attr "jsExit": int})
-exception ExitEarly({@attr "jsExit": int})
-exception ExitEarly({@attr "jsExit": int, @attr "code": int})
-exception ExitEarly({"jsExit": int})
-exception ExitEarly({"jsExit": int}, {"code": int})
-exception ExitEarly({"jsExit": int}, int, {"code": int})
-exception ExitEarly(
-  {@attr "jsExit": int, @attr "code": int},
-  {@attr "jsExit": int, @attr "code": int},
-)
-exception ExitJsStyle({..})
-exception ExitJsStyle({.."code": int})
-exception ExitJsStyle({.."code": int})
-exception ExitJsStyle({..@attr "code": int})
-exception ExitJsStyle({..@attr "code": int})
-exception ExitJsStyle({.."code": int, "time": int})
-exception ExitJsStyle({..@attr "code": int, @attr "time": int})
-
-@onConstructor exception ExitEarly
-@onConstructor exception ExitEarly(int)
-
-exception Exit = Terminate
-exception Exit = Lib.Terminate
-exception Exit = Ns.Lib.Terminate
-
-@onConstructor exception Exit = Terminate
-@onConstructor exception Exit = Lib.Terminate
-exception GadtExit(int): exit<int>
diff --git a/jscomp/syntax/tests/printer/structure/expected/expr.res.txt b/jscomp/syntax/tests/printer/structure/expected/expr.res.txt
deleted file mode 100644
index 86adfd4..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/expr.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-@attrOnStructure
-expr
-
-@attrOnStructure
-(@attrOnExpr expr)
-
-@attrOnStructure @attrOnStructure2 @attrOnStructurer3 @attrOnStructure4
-(@attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr expr)
-
-@attrOnStructure @attrOnStructure2 @attrOnStructurer3 @attrOnStructure4 @attrOnStructure5
-(@attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr expr)
diff --git a/jscomp/syntax/tests/printer/structure/expected/extension.res.txt b/jscomp/syntax/tests/printer/structure/expected/extension.res.txt
deleted file mode 100644
index 0c6728f..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/extension.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-%%raw("__eval__gc()")
-
-@attr
-%%raw("__eval__gc()")
-
-@attrStructureLvl @attrStructureLvl2 @attrStructureLvl3
-%%raw("__eval__gc()")
-
-@attrStructureLvl @attrStructureLvl2 @attrStructureLvl3 @attrStructureLvl4 @attrStructureLvl5
-%%raw("__eval__gc()")
-
-%%private(@module("./logo.svg") external logo: string = "default")
diff --git a/jscomp/syntax/tests/printer/structure/expected/external.res.txt b/jscomp/syntax/tests/printer/structure/expected/external.res.txt
deleted file mode 100644
index 93d42d1..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/external.res.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-@val external null: reactElement = "null"
-
-external string: string => reactElement = "%identity"
-
-external array: array<reactElement> => reactElement = "%identity"
-
-external refToJsObj: reactRef => {..} = "%identity"
-
-external \"type": \"let" => \"Uident" = "unsafe_call"
diff --git a/jscomp/syntax/tests/printer/structure/expected/include.res.txt b/jscomp/syntax/tests/printer/structure/expected/include.res.txt
deleted file mode 100644
index 92a19b5..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/include.res.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-include Belt
-
-@attr
-include WebGl
-
-include (
-  /* Use varargs to avoid the ReactJS warning for duplicate keys in children */
-  {
-    @val @module("react")
-    external createElementInternalHack: 'a = "createElement"
-    @send
-    external apply: ('theFunction, 'theContext, 'arguments) => 'returnTypeOfTheFunction = "apply"
-
-    let createElementVariadic = (domClassName, ~props=?, children) => {
-      let variadicArguments =
-        [Obj.magic(domClassName), Obj.magic(props)] |> Js.Array.concat(children)
-      createElementInternalHack->apply(Js.Nullable.null, variadicArguments)
-    }
-  }: {
-    let createElementVariadic: (string, ~props: props=?, array<React.element>) => React.element
-  }
-)
diff --git a/jscomp/syntax/tests/printer/structure/expected/moduleBinding.res.txt b/jscomp/syntax/tests/printer/structure/expected/moduleBinding.res.txt
deleted file mode 100644
index d1df60b..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/moduleBinding.res.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-module React = {
-  type t
-
-  let render = () => Js.log("foo")
-}
diff --git a/jscomp/syntax/tests/printer/structure/expected/moduleTypeDeclaration.res.txt b/jscomp/syntax/tests/printer/structure/expected/moduleTypeDeclaration.res.txt
deleted file mode 100644
index bddb429..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/moduleTypeDeclaration.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-module type S = X
diff --git a/jscomp/syntax/tests/printer/structure/expected/open.res.txt b/jscomp/syntax/tests/printer/structure/expected/open.res.txt
deleted file mode 100644
index d55efc9..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/open.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-open Belt
-
-@attr
-open Belt
-
-open! Belt
diff --git a/jscomp/syntax/tests/printer/structure/expected/recModules.res.txt b/jscomp/syntax/tests/printer/structure/expected/recModules.res.txt
deleted file mode 100644
index 2632817..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/recModules.res.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-module rec A: Map = {
-  let m = 2
-}
-and B: Set = {
-  let s = 1
-}
-
-@onFirstBinding
-module rec A: Map = {
-  let m = 2
-}
-@onSecondBinding
-and B: Set = {
-  let s = 1
-}
-
-@onFirstBindingOfNext
-module rec A: Map = {
-  let m = 2
-}
-@onSecondBindingOfNext
-and B: Set = {
-  let s = 1
-}
diff --git a/jscomp/syntax/tests/printer/structure/expected/type.res.txt b/jscomp/syntax/tests/printer/structure/expected/type.res.txt
deleted file mode 100644
index 4db84a7..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/type.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-type t = string and s = int and z = float
-
-type t = string
-and s = int
-and z = float
-
-type t = string
-
-and s = int
-
-and z = float
diff --git a/jscomp/syntax/tests/printer/structure/expected/typeExtension.res.txt b/jscomp/syntax/tests/printer/structure/expected/typeExtension.res.txt
deleted file mode 100644
index 4fef776..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/typeExtension.res.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-type t += Foo
-type Foo.Bar.t += Foo
-type t<'a, 'b> += Foo('a)
-type Foo.Bar.t<'a, 'b> += Foo('a)
-
-type t += private Foo
-type t += private Foo | Bar
-type t += private Foo
-type t += private Foo | Bar
-
-type t += Circle(string, int) | Point({x: int, y: int})
-type t += Circle(string, int) | Point({x: int, y: int})
-
-type t += Foo = Bar
-type t += Foo = Bar | Circle = Circle2
-type t += Foo = Bar | Circle = Geo.Circle2
-type t += private Foo = Bar
-type t += private Foo = Bar | Circle = Circle2
-type t += private Foo = Bar | Circle = Geo.Circle2
-type t += Foo = Bar
-type t += Foo = Bar | Circle = Circle2
-type t += Foo = Bar | Circle = Geo.Circle2
-type t += private Foo = Bar
-type t += private Foo = Bar | Circle = Circle2
-type t += private Foo = Bar | Circle = Geo.Circle2
-type t += Foo = Geo.Metry.Bar
-
-@attr type t += @attr1 Foo
-@attr
-type t += @attr1 Foo
-@attr
-type t += @attr1 Foo | @attr2 Bar
-@attr
-type t += @attr1 Foo | @attr2 Bar
-
-@attr
-type t += private @attr1 Foo
-@attr
-type t += private @attr1 Foo
-@attr
-type t += private @attr1 Foo | @attr2 Bar
-@attr
-type t += private @attr1 Foo | @attr2 Bar
-
-@attr
-type t += @attr1 Foo = Bar
-@attr
-type t += @attr1 Foo = Bar
-@attr
-type t += @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-@attr
-type t += @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-
-@attr
-type t += private @attr1 Foo = Foo2
-@attr
-type t += private @attr1 Foo = Foo2
-@attr
-type t += private @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-@attr
-type t += private @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-
-type t +=
-  private
-  | @attr1 Foo = Foo2
-
-type t +=
-  private
-  | @attr1 Foo = Foo2
-  | @attr2 Bar = Bar2
-
-type t +=
-  | Foo = Bar
-
-module Tid = {
-  type t<_> = ..
-  type s<_> = ..
-  type u<_> = ..
-}
-
-module type Tid = {
-  type t
-  type Tid.t<_> += Tid: Tid.t<t>
-
-  type Tid.s<_> +=
-    | Tid: Tid.s<t>
-
-  type Tid.u<_> +=
-    | Uid: Tid.u<t>
-    | Uid2: Tid.u<t>
-}
diff --git a/jscomp/syntax/tests/printer/structure/expected/valueBinding.res.txt b/jscomp/syntax/tests/printer/structure/expected/valueBinding.res.txt
deleted file mode 100644
index 642afd5..0000000
--- a/jscomp/syntax/tests/printer/structure/expected/valueBinding.res.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-let x = 1 and y = 2 and z = 3
-
-let x = 1
-and y = 2
-and z = 3
-
-let x = 1
-
-and y = 2
-
-and z = 3
-
-@react.component
-let make = () => <div />
-
-@react.component let make = () => <div />
-
-@react.component let make = () => <div />
-@react.recursiveComponent and otherMake = () => <div />
-
-@react.component let make = () => <div />
-@react.recursiveComponent
-and otherMake = () => <div />
-
-@ocaml.doc(" {b See} {!length} ")
-external size: array<'a> => int = "%array_length"
-
-@ocaml.doc(" {b See} {!length} ") external size: array<'a> => int = "%array_length"
diff --git a/jscomp/syntax/tests/printer/structure/expr.res b/jscomp/syntax/tests/printer/structure/expr.res
deleted file mode 100644
index 18a365d..0000000
--- a/jscomp/syntax/tests/printer/structure/expr.res
+++ /dev/null
@@ -1,14 +0,0 @@
-@attrOnStructure
-expr
-
-
-@attrOnStructure
-(@attrOnExpr expr)
-
-
-@attrOnStructure @attrOnStructure2 @attrOnStructurer3 @attrOnStructure4
-(@attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr expr)
-
-
-@attrOnStructure @attrOnStructure2 @attrOnStructurer3 @attrOnStructure4 @attrOnStructure5
-(@attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr @attrOnExpr expr)
diff --git a/jscomp/syntax/tests/printer/structure/extension.res b/jscomp/syntax/tests/printer/structure/extension.res
deleted file mode 100644
index 54aa1ee..0000000
--- a/jscomp/syntax/tests/printer/structure/extension.res
+++ /dev/null
@@ -1,14 +0,0 @@
-%%raw("__eval__gc()")
-
-@attr
-%%raw("__eval__gc()")
-
-@attrStructureLvl @attrStructureLvl2 @attrStructureLvl3
-%%raw("__eval__gc()")
-
-@attrStructureLvl @attrStructureLvl2 @attrStructureLvl3 @attrStructureLvl4 @attrStructureLvl5
-%%raw("__eval__gc()")
-
-%%private(
-  @module("./logo.svg") external logo: string = "default"
-)
diff --git a/jscomp/syntax/tests/printer/structure/external.res b/jscomp/syntax/tests/printer/structure/external.res
deleted file mode 100644
index c28f3a7..0000000
--- a/jscomp/syntax/tests/printer/structure/external.res
+++ /dev/null
@@ -1,9 +0,0 @@
-@val external null: reactElement = "null";
-
-external string: string => reactElement = "%identity";
-
-external array: array<reactElement> => reactElement = "%identity";
-
-external refToJsObj: reactRef => {..} = "%identity";
-
-external \"type": \"let" => \"Uident" = "unsafe_call"
diff --git a/jscomp/syntax/tests/printer/structure/include.res b/jscomp/syntax/tests/printer/structure/include.res
deleted file mode 100644
index 309d7d7..0000000
--- a/jscomp/syntax/tests/printer/structure/include.res
+++ /dev/null
@@ -1,30 +0,0 @@
-include Belt
-
-@attr
-include WebGl
-
-include (
-  /* Use varargs to avoid the ReactJS warning for duplicate keys in children */
-  {
-    @val @module("react")
-    external createElementInternalHack: 'a = "createElement"
-    @send
-    external apply: (
-      'theFunction,
-      'theContext,
-      'arguments,
-    ) => 'returnTypeOfTheFunction = "apply"
-
-    let createElementVariadic = (domClassName, ~props=?, children) => {
-      let variadicArguments =
-        [Obj.magic(domClassName), Obj.magic(props)] |> Js.Array.concat(children)
-      createElementInternalHack->apply(Js.Nullable.null, variadicArguments)
-    }
-  }: {
-    let createElementVariadic: (
-      string,
-      ~props: props=?,
-      array<React.element>,
-    ) => React.element
-  }
-)
diff --git a/jscomp/syntax/tests/printer/structure/moduleBinding.res b/jscomp/syntax/tests/printer/structure/moduleBinding.res
deleted file mode 100644
index d1df60b..0000000
--- a/jscomp/syntax/tests/printer/structure/moduleBinding.res
+++ /dev/null
@@ -1,5 +0,0 @@
-module React = {
-  type t
-
-  let render = () => Js.log("foo")
-}
diff --git a/jscomp/syntax/tests/printer/structure/moduleTypeDeclaration.res b/jscomp/syntax/tests/printer/structure/moduleTypeDeclaration.res
deleted file mode 100644
index bddb429..0000000
--- a/jscomp/syntax/tests/printer/structure/moduleTypeDeclaration.res
+++ /dev/null
@@ -1 +0,0 @@
-module type S = X
diff --git a/jscomp/syntax/tests/printer/structure/open.res b/jscomp/syntax/tests/printer/structure/open.res
deleted file mode 100644
index d55efc9..0000000
--- a/jscomp/syntax/tests/printer/structure/open.res
+++ /dev/null
@@ -1,6 +0,0 @@
-open Belt
-
-@attr
-open Belt
-
-open! Belt
diff --git a/jscomp/syntax/tests/printer/structure/recModules.res b/jscomp/syntax/tests/printer/structure/recModules.res
deleted file mode 100644
index 1a40ed0..0000000
--- a/jscomp/syntax/tests/printer/structure/recModules.res
+++ /dev/null
@@ -1,12 +0,0 @@
-module rec A: Map = { let m = 2}
-and B: Set =  {let s = 1}
-
-@onFirstBinding
-module rec A: Map = { let m = 2}
-@onSecondBinding
-and B: Set =  {let s = 1}
-
-@onFirstBindingOfNext
-module rec A: Map = { let m = 2}
-@onSecondBindingOfNext
-and B: Set =  {let s = 1}
diff --git a/jscomp/syntax/tests/printer/structure/type.res b/jscomp/syntax/tests/printer/structure/type.res
deleted file mode 100644
index 711dffc..0000000
--- a/jscomp/syntax/tests/printer/structure/type.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type t = string and s = int and z = float
-
-type t = string
-and s = int
-and z = float
-
-
-type t = string
-
-and s = int
-
-and z = float
diff --git a/jscomp/syntax/tests/printer/structure/typeExtension.res b/jscomp/syntax/tests/printer/structure/typeExtension.res
deleted file mode 100644
index 09bd8b4..0000000
--- a/jscomp/syntax/tests/printer/structure/typeExtension.res
+++ /dev/null
@@ -1,92 +0,0 @@
-type t += Foo
-type Foo.Bar.t += Foo
-type t<'a, 'b> += Foo('a)
-type Foo.Bar.t<'a, 'b> += Foo('a)
-
-type t += private Foo
-type t += private Foo | Bar
-type t += private | Foo
-type t += private | Foo | Bar
-
-type t += Circle(string, int) | Point({x: int, y: int})
-type t += | Circle(string, int) | Point({x: int, y: int})
-
-type t += Foo = Bar
-type t += Foo = Bar | Circle = Circle2
-type t += Foo = Bar | Circle = Geo.Circle2
-type t += private Foo = Bar
-type t += private Foo = Bar | Circle = Circle2
-type t += private Foo = Bar | Circle = Geo.Circle2
-type t += | Foo = Bar
-type t += | Foo = Bar | Circle = Circle2
-type t += | Foo = Bar | Circle = Geo.Circle2
-type t += private | Foo = Bar
-type t += private | Foo = Bar | Circle = Circle2
-type t += private | Foo = Bar | Circle = Geo.Circle2
-type t += Foo = Geo.Metry.Bar
-
-@attr type t += @attr1 Foo
-@attr
-type t += | @attr1 Foo
-@attr
-type t += @attr1 Foo | @attr2 Bar
-@attr
-type t += | @attr1 Foo | @attr2 Bar
-
-@attr
-type t += private @attr1 Foo
-@attr
-type t += private | @attr1 Foo
-@attr
-type t += private @attr1 Foo | @attr2 Bar
-@attr
-type t += private | @attr1 Foo | @attr2 Bar
-
-@attr
-type t += @attr1 Foo = Bar
-@attr
-type t += | @attr1 Foo = Bar
-@attr
-type t += @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-@attr
-type t += | @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-
-@attr
-type t += private @attr1 Foo = Foo2
-@attr
-type t += private | @attr1 Foo = Foo2
-@attr
-type t += private @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-@attr
-type t += private | @attr1 Foo = Foo2 | @attr2 Bar = Bar2
-
-
-type t += private
-  | @attr1 Foo = Foo2
-
-type t +=
-  private
-  | @attr1 Foo = Foo2
-  | @attr2 Bar = Bar2
-
-
-type t +=
-  | Foo = Bar
-
-module Tid = {
-  type t<_> = ..
-  type s<_> = ..
-  type u<_> = ..
-}
-
-module type Tid = {
-  type t
-  type Tid.t<_> += Tid: Tid.t<t>
-
-  type Tid.s<_> +=
-    | Tid: Tid.s<t>
-
-  type Tid.u<_> +=
-    | Uid: Tid.u<t>
-    | Uid2: Tid.u<t>
-}
diff --git a/jscomp/syntax/tests/printer/structure/valueBinding.res b/jscomp/syntax/tests/printer/structure/valueBinding.res
deleted file mode 100644
index eab76ac..0000000
--- a/jscomp/syntax/tests/printer/structure/valueBinding.res
+++ /dev/null
@@ -1,29 +0,0 @@
-let x = 1 and y = 2 and z = 3
-
-let x = 1
-and y = 2
-and z = 3
-
-
-let x = 1
-
-and y = 2
-
-and z = 3
-
-@react.component
-let make = () => <div />
-
-@react.component let make = () => <div />
-
-@react.component let make = () => <div />
-@react.recursiveComponent and otherMake = () => <div />
-
-@react.component let make = () => <div />
-@react.recursiveComponent
-and otherMake = () => <div />
-
-@ocaml.doc(" {b See} {!length} ")
-external size: array<'a> => int = "%array_length"
-
-@ocaml.doc(" {b See} {!length} ") external size: array<'a> => int = "%array_length"
diff --git a/jscomp/syntax/tests/printer/typeDef/abstract.res b/jscomp/syntax/tests/printer/typeDef/abstract.res
deleted file mode 100644
index d197121..0000000
--- a/jscomp/syntax/tests/printer/typeDef/abstract.res
+++ /dev/null
@@ -1,21 +0,0 @@
-type t
-
-type t<'a, 'b>
-
-type t = string
-type t = @attr string
-type t = private string
-type t = private @attr string
-type t = Module.Long.With.Very.VeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeryLongName.t
-type t = private Module.Long.With.Very.VeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeryLongName.t
-
-type t<'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing> = string
-type t<'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing> = Module.Long.With.Very.VeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeryLongName.t
-
-
-type t<'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing> = Module.Long.With.Very.VeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeryLongName.t
-  constraint 't = ('s, 'a) => 'sub
-
-type t = 't
-  constraint 't = ('s, 'a) => 'sub
-
diff --git a/jscomp/syntax/tests/printer/typeDef/attributes.res b/jscomp/syntax/tests/printer/typeDef/attributes.res
deleted file mode 100644
index 8b007a1..0000000
--- a/jscomp/syntax/tests/printer/typeDef/attributes.res
+++ /dev/null
@@ -1,11 +0,0 @@
-@attr type t = float
-@attr
-type t = float
-
-@attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr type t = int
-@attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr
-type t = int
-
-@attrWithSuperLongIdentifeirName @attrWithSuperLongIdentifeirName @attrWithSuperLongIdentifeirName@attrWithSuperLongIdentifeirName type t = string
-@attrWithSuperLongIdentifeirName @attrWithSuperLongIdentifeirName @attrWithSuperLongIdentifeirName@attrWithSuperLongIdentifeirName
-type t = string
diff --git a/jscomp/syntax/tests/printer/typeDef/constraint.res b/jscomp/syntax/tests/printer/typeDef/constraint.res
deleted file mode 100644
index 1a2a454..0000000
--- a/jscomp/syntax/tests/printer/typeDef/constraint.res
+++ /dev/null
@@ -1,2 +0,0 @@
-type t = Reducer
-  constraint 't = @attr ('state, 'action) => 'nextSubtree
diff --git a/jscomp/syntax/tests/printer/typeDef/exoticIdent.res b/jscomp/syntax/tests/printer/typeDef/exoticIdent.res
deleted file mode 100644
index 9a1776c..0000000
--- a/jscomp/syntax/tests/printer/typeDef/exoticIdent.res
+++ /dev/null
@@ -1,13 +0,0 @@
-type \"type" = User.\"type" = {
-  \"module": \"type",
-  \"let": \"module"
-}
-
-type \"Color" =
-  | Red(\"let", \"module", \"type")
-  | Blue(\"let", \"module", \"type"): \"Color"<\"let", \"SuperType">
-
-type \"type"<'\"😱 gadt", '\"😻">
-  constraint '\"type" = \"let"
-
-type \"type"<'\"😆SuperIdent"> += Blue(\"type", \"ExtremeType") 
diff --git a/jscomp/syntax/tests/printer/typeDef/expected/abstract.res.txt b/jscomp/syntax/tests/printer/typeDef/expected/abstract.res.txt
deleted file mode 100644
index 013424b..0000000
--- a/jscomp/syntax/tests/printer/typeDef/expected/abstract.res.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-type t
-
-type t<'a, 'b>
-
-type t = string
-type t = @attr string
-type t = private string
-type t = private @attr string
-type t = Module.Long.With.Very.VeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeryLongName.t
-type t = private Module.Long.With.Very.VeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeryLongName.t
-
-type t<'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing> = string
-type t<
-  'superlongthing,
-  'superlongthing,
-  'superlongthing,
-  'superlongthing,
-  'superlongthing,
-> = Module.Long.With.Very.VeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeryLongName.t
-
-type t<
-  'superlongthing,
-  'superlongthing,
-  'superlongthing,
-  'superlongthing,
-  'superlongthing,
-> = Module.Long.With.Very.VeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeryLongName.t
-  constraint 't = ('s, 'a) => 'sub
-
-type t = 't constraint 't = ('s, 'a) => 'sub
diff --git a/jscomp/syntax/tests/printer/typeDef/expected/attributes.res.txt b/jscomp/syntax/tests/printer/typeDef/expected/attributes.res.txt
deleted file mode 100644
index 9d0bbab..0000000
--- a/jscomp/syntax/tests/printer/typeDef/expected/attributes.res.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-@attr type t = float
-@attr
-type t = float
-
-@attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr type t = int
-@attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr
-type t = int
-
-@attrWithSuperLongIdentifeirName
-@attrWithSuperLongIdentifeirName
-@attrWithSuperLongIdentifeirName
-@attrWithSuperLongIdentifeirName
-type t = string
-@attrWithSuperLongIdentifeirName
-@attrWithSuperLongIdentifeirName
-@attrWithSuperLongIdentifeirName
-@attrWithSuperLongIdentifeirName
-type t = string
diff --git a/jscomp/syntax/tests/printer/typeDef/expected/constraint.res.txt b/jscomp/syntax/tests/printer/typeDef/expected/constraint.res.txt
deleted file mode 100644
index 49e9c39..0000000
--- a/jscomp/syntax/tests/printer/typeDef/expected/constraint.res.txt
+++ /dev/null
@@ -1 +0,0 @@
-type t = Reducer constraint 't = @attr ('state, 'action) => 'nextSubtree
diff --git a/jscomp/syntax/tests/printer/typeDef/expected/exoticIdent.res.txt b/jscomp/syntax/tests/printer/typeDef/expected/exoticIdent.res.txt
deleted file mode 100644
index 19364f7..0000000
--- a/jscomp/syntax/tests/printer/typeDef/expected/exoticIdent.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-type \"type" = User.\"type" = {
-  \"module": \"type",
-  \"let": \"module",
-}
-
-type \"Color" =
-  | Red(\"let", \"module", \"type")
-  | Blue(\"let", \"module", \"type"): \"Color"<\"let", \"SuperType">
-
-type \"type"<'\"😱 gadt", '\"😻"> constraint '\"type" = \"let"
-
-type \"type"<'\"😆SuperIdent"> += Blue(\"type", \"ExtremeType")
diff --git a/jscomp/syntax/tests/printer/typeDef/expected/open.res.txt b/jscomp/syntax/tests/printer/typeDef/expected/open.res.txt
deleted file mode 100644
index 46783e3..0000000
--- a/jscomp/syntax/tests/printer/typeDef/expected/open.res.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-type t = ..
-type t = private ..
-type t<'a, 'b> = ..
-type t<'a, 'b> = private ..
-
-type t = .. constraint 't = ('s, 'a) => 'sub
diff --git a/jscomp/syntax/tests/printer/typeDef/expected/record.res.txt b/jscomp/syntax/tests/printer/typeDef/expected/record.res.txt
deleted file mode 100644
index a2fea60..0000000
--- a/jscomp/syntax/tests/printer/typeDef/expected/record.res.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-type user = {name: string, age: int}
-type result<'success, 'failure> = {ok: 'success, fail: 'failure}
-type result<'success1, 'failure1, 'success2, 'failure2, 'success3, 'failure3> = {
-  ok: 'success1,
-  fail: 'failure2,
-}
-
-type user = {name: string, age: int, a: string, lot: string, more: string, fields: string}
-type user<'lotsOfTypeVars, 'lotsOfTypeVars2, 'lotsOfTypeVars3, 'lotsOfTypeVars4> = {
-  name: string,
-  age: int,
-  a: string,
-  lot: string,
-  more: string,
-  fields: string,
-}
-
-// auto-breaks over multiple lines, because user gave "hints" to printer
-type user = {
-  name: string,
-  age: int,
-}
-
-type result<'good, 'bad> = {good: 'good, bad: 'bad}
-  constraint 'good = boolean constraint 'bad = float
-
-type user = {
-  name: 't,
-  age: int,
-} constraint 't = string
-
-type t = private {name: string, age: int}
-type t = private {
-  name: string,
-  age: int,
-}
-
-type t = User.t = private {name: string, age: int}
-type t = @attr User.t = private {name: string, age: int}
-type t = User.t = private {
-  name: string,
-  age: int,
-}
-
-// attributes
-type user = {
-  @attr name: string,
-  @attr age: int,
-  @attrAbove
-  isAdmin: bool,
-  @attrAbove
-  hairStyle: Hair.t,
-}
-
-type user = {
-  @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr name: string,
-  @attr age: int,
-  @attrAbove @attrAbove @attrAbove @attrAbove @attrAbove @attrAbove @attrAbove
-  isAdmin: bool,
-  @attrAbove
-  @attrSuperLongNaaaaaaaaaaaaaaameSooooooooLong
-  @attrSuperLongNaaaaaaaaaaaaaaameSooooooooLong
-  hairStyle: Hair.t,
-  @attrAbove
-  @attrSuperLongNaaaaaaaaaaaaaaameSooooooooLong
-  @attrSuperLongNaaaaaaaaaaaaaaameSooooooooLong
-  hairStyle: Hair.t,
-}
-
-type multipleWithAttrs = {x: int, @attr y?: string}
-
-type singleWithAttrs = {@attr y?: string}
diff --git a/jscomp/syntax/tests/printer/typeDef/expected/typeParams.res.txt b/jscomp/syntax/tests/printer/typeDef/expected/typeParams.res.txt
deleted file mode 100644
index df8d742..0000000
--- a/jscomp/syntax/tests/printer/typeDef/expected/typeParams.res.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-type t<'a, 'b>
-type t<+'a, -'b>
-
-type t<'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing>
-
-type t<+'superlongthing, -'superlongthing, +'superlongthing, -'superlongthing, +'superlongthing>
-
-type t<+'superlongthing, -'superlongthing, +'superlongthing, -'superlongthing, +'superlongthing>
-  constraint 't = ('state, 'action) => 'nextSubtree
-
-module Test = {
-  type x<'A> = 'A
-  type y = x<string>
-}
diff --git a/jscomp/syntax/tests/printer/typeDef/expected/variant.res.txt b/jscomp/syntax/tests/printer/typeDef/expected/variant.res.txt
deleted file mode 100644
index 1fb3c84..0000000
--- a/jscomp/syntax/tests/printer/typeDef/expected/variant.res.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-type color = Red | Blue
-type color = Red | Blue | SuperLongColooooooooooooooourName | AnotherSuuuuuuuuuuuuuuperLongName
-
-type color = private Red | Blue
-type color =
-  private
-  | Red
-  | Blue
-  | Green
-type color =
-  private
-  Red | Blue | SuperLongColooooooooooooooourName | AnotherSuuuuuuuuuuuuuperLongName
-
-type color = Colour.t = private Red | Blue
-type color = Colour.t =
-  private
-  | Red
-  | Blue
-  | Green
-type color = Colour.t =
-  private
-  Red | Blue | SuperLongColoooooooooooooourName | AnotherSuuuuuuuuuuuuuperLongName
-
-// gadt
-type color = Red: color | Blue: color
-type color =
-  | Red: color
-  | Blue: color
-  | SuperLongColoooooooooourName: color
-  | AnotherSuuuuuuuuuperLongName: color
-
-type color = Rgb(float, float, float) | Hex(int)
-type color =
-  | Rgb(superLongTypeName, superLongTypeName, superLongTypeName, superLongTypeName)
-  | Hex(superLongTypeName, superLongTypeName, superLongTypeName, superLongTypeName)
-
-type node<_, 'value> =
-  | Root({mutable value: 'value, mutable updatedTime: float}): node<root, 'value>
-  | Derived({
-      mutable cachedValue: 'value,
-      parent: node<_, 'value>,
-      root: node<root, 'value>,
-      updateF: 'value => 'value,
-      mutable updatedTime: float,
-    }): node<derived, 'value>
-
-type t<'a> =
-  | AutoDisposing('a => unit, option<exn> => unit, ref<bool>)
-  | Delegating(
-      'ctx,
-      t<'b>,
-      ('ctx, t<'b>, 'a) => unit,
-      ('ctx, t<'b>, option<exn>) => unit,
-      ref<bool>,
-    ): t<'a>
-
-type t<'a> =
-  | AutoDisposing('a => unit, option<exn> => unit, ref<bool>)
-  | Delegating(
-      'ctx,
-      t<'b>,
-      ('ctx, t<'b>, 'a) => unit,
-      ('ctx, t<'b>, option<exn>) => unit,
-      ref<bool>,
-    ): t<'superLongTypeName, 'superLongTypeName, 'superLongTypeName, 'superLongTypeName>
-
-type jsx<'nature> =
-  | Empty: jsx<empty>
-  | Cons(elem<('s1, 'a1), 'sub1>, jsx<'tl>): jsx<(('a1, 's1) => 'sub1, 'tl)>
-
-type jsx<'nature> =
-  | Empty: jsx<empty>
-  | Cons(elem<('s1, 'a1), 'sub1>, jsx<'tl>): jsxxxxxxxxxxxxxxxxx<(('a1, 's1) => 'sub1, 'tl)>
-
-type color = Red | Blue constraint 't = string
-
-type result<'good, 'bad> =
-  | Good('good)
-  | Bad('bad) constraint 'good = boolean constraint 'bad = float
-
-type color =
-  | @attr Red
-  | @attr Blue
-
-type gadtType<'x> =
-  | Foo(int): @onFirstRow gadtType<int>
-  | Bar(@onInt int): @onSecondRow gadtType<unit>
-
-type color<'value> =
-  | Rgb(
-      @attr superLongTypeName,
-      @attr superLongTypeName,
-      @attr superLongTypeName,
-      @attr superLongTypeName,
-    ): @toRgb color<float>
-  | Hex(
-      @attr superLongTypeName,
-      @attr superLongTypeName,
-      @attr superLongTypeName,
-      @attr superLongTypeName,
-    ): @toHex color<float>
-
-type color = | @rgb Purple
-type color = | @rgb Purple | @rgb Pink
-
-type color =
-  | @rgb Red
-  | @rgb Blue
-  | @rgb Green
-
-// Spreads
-module S = {
-  type s = Five | Six
-}
-type aa = One | Two
-type bb = | ...aa | Three | Four | ...S.s
diff --git a/jscomp/syntax/tests/printer/typeDef/open.res b/jscomp/syntax/tests/printer/typeDef/open.res
deleted file mode 100644
index 43de8de..0000000
--- a/jscomp/syntax/tests/printer/typeDef/open.res
+++ /dev/null
@@ -1,7 +0,0 @@
-type t = ..
-type t =  private ..
-type t<'a, 'b> = ..
-type t<'a, 'b> = private ..
-
-type t = ..
-  constraint 't = ('s, 'a) => 'sub
diff --git a/jscomp/syntax/tests/printer/typeDef/record.res b/jscomp/syntax/tests/printer/typeDef/record.res
deleted file mode 100644
index 9276d89..0000000
--- a/jscomp/syntax/tests/printer/typeDef/record.res
+++ /dev/null
@@ -1,57 +0,0 @@
-type user = {name: string, age: int}
-type result<'success, 'failure> = {ok: 'success, fail: 'failure}
-type result<'success1, 'failure1, 'success2, 'failure2, 'success3, 'failure3,> = {ok: 'success1, fail: 'failure2}
-
-type user = {name: string, age: int, a: string, lot: string, more: string, fields: string}
-type user<'lotsOfTypeVars, 'lotsOfTypeVars2,'lotsOfTypeVars3, 'lotsOfTypeVars4> = {name: string, age: int, a: string, lot: string, more: string, fields: string}
-
-// auto-breaks over multiple lines, because user gave "hints" to printer
-type user = {
-  name: string,
-  age: int
-}
-
-type result<'good, 'bad> = {good: 'good, bad: 'bad}
-  constraint 'good = boolean constraint 'bad = float 
-
-type user = {
-  name: 't,
-  age: int
-} constraint 't = string
-
-type t = private {name: string, age: int,}
-type t = private {
-  name: string,
-  age: int,
-}
-
-type t = User.t = private {name: string, age: int,}
-type t = @attr User.t = private {name: string, age: int,}
-type t = User.t = private {
-  name: string,
-  age: int
-}
-  
-// attributes
-type user = {
-  @attr name: string,
-  @attr age: int,
-  @attrAbove
-  isAdmin: bool,
-  @attrAbove
-  hairStyle: Hair.t,
-}
-
-type user = {
-  @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr @attr name: string,
-  @attr age: int,
-  @attrAbove @attrAbove @attrAbove @attrAbove @attrAbove @attrAbove @attrAbove
-  isAdmin: bool,
-  @attrAbove @attrSuperLongNaaaaaaaaaaaaaaameSooooooooLong @attrSuperLongNaaaaaaaaaaaaaaameSooooooooLong
-  hairStyle: Hair.t,
-  @attrAbove @attrSuperLongNaaaaaaaaaaaaaaameSooooooooLong @attrSuperLongNaaaaaaaaaaaaaaameSooooooooLong hairStyle: Hair.t
-}
-
-type multipleWithAttrs = {x:int, @attr y?: string}
-
-type singleWithAttrs = {@attr y?: string}
diff --git a/jscomp/syntax/tests/printer/typeDef/typeParams.res b/jscomp/syntax/tests/printer/typeDef/typeParams.res
deleted file mode 100644
index df8d742..0000000
--- a/jscomp/syntax/tests/printer/typeDef/typeParams.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type t<'a, 'b>
-type t<+'a, -'b>
-
-type t<'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing, 'superlongthing>
-
-type t<+'superlongthing, -'superlongthing, +'superlongthing, -'superlongthing, +'superlongthing>
-
-type t<+'superlongthing, -'superlongthing, +'superlongthing, -'superlongthing, +'superlongthing>
-  constraint 't = ('state, 'action) => 'nextSubtree
-
-module Test = {
-  type x<'A> = 'A
-  type y = x<string>
-}
diff --git a/jscomp/syntax/tests/printer/typeDef/variant.res b/jscomp/syntax/tests/printer/typeDef/variant.res
deleted file mode 100644
index 94e1675..0000000
--- a/jscomp/syntax/tests/printer/typeDef/variant.res
+++ /dev/null
@@ -1,103 +0,0 @@
-type color = Red | Blue
-type color = Red | Blue | SuperLongColooooooooooooooourName | AnotherSuuuuuuuuuuuuuuperLongName
-
-type color = private Red | Blue
-type color =
-  private
-  | Red
-  | Blue
-  | Green
-type color = private Red | Blue | SuperLongColooooooooooooooourName | AnotherSuuuuuuuuuuuuuperLongName
-
-type color = Colour.t = private Red | Blue
-type color = Colour.t =
-  private
-  | Red
-  | Blue
-  | Green
-type color = Colour.t = private Red | Blue | SuperLongColoooooooooooooourName | AnotherSuuuuuuuuuuuuuperLongName
-
-
-// gadt
-type color = | Red: color | Blue: color
-type color = Red: color | Blue: color | SuperLongColoooooooooourName: color | AnotherSuuuuuuuuuperLongName: color
-
-type color = Rgb(float, float, float) | Hex(int)
-type color = Rgb(superLongTypeName, superLongTypeName, superLongTypeName, superLongTypeName) | Hex(superLongTypeName, superLongTypeName, superLongTypeName, superLongTypeName)
-
-type node <_, 'value> =
-  | Root({
-      mutable value: 'value,
-      mutable updatedTime: float,
-    }): node<root, 'value>
-  | Derived({
-      mutable cachedValue: 'value,
-      parent: node<_, 'value>,
-      root: node<root, 'value>,
-      updateF: 'value => 'value,
-      mutable updatedTime: float,
-    }): node<derived, 'value>
-
-type t<'a> =
-  | AutoDisposing('a => unit, option<exn> => unit, ref<bool>)
-  | Delegating(
-      'ctx,
-      t<'b>,
-      ('ctx, t<'b>, 'a) => unit,
-      ('ctx, t<'b>, option<exn>) => unit,
-      ref<bool>,
-    ): t<'a>;
-
-type t<'a> =
-  | AutoDisposing('a => unit, option<exn> => unit, ref<bool>)
-  | Delegating(
-      'ctx,
-      t<'b>,
-      ('ctx, t<'b>, 'a) => unit,
-      ('ctx, t<'b>, option<exn>) => unit,
-      ref<bool>,
-    ): t<'superLongTypeName, 'superLongTypeName, 'superLongTypeName, 'superLongTypeName>;
-
-type jsx<'nature> =
-  | Empty: jsx<empty>
-  | Cons(elem<('s1, 'a1), 'sub1>, jsx<'tl>): jsx<(('a1, 's1) => 'sub1, 'tl)>
-
-type jsx<'nature> =
-  | Empty: jsx<empty>
-  | Cons(elem<('s1, 'a1), 'sub1>, jsx<'tl>): jsxxxxxxxxxxxxxxxxx<(('a1, 's1) => 'sub1, 'tl)>
-
-type color = Red | Blue
-  constraint 't = string
-
-type result<'good, 'bad> =
-  | Good('good)
-  | Bad('bad)
-  constraint 'good = boolean
-  constraint 'bad = float 
-
-type color =
-  | @attr Red
-  | @attr Blue
-
-type gadtType<'x> =
-| Foo(int): @onFirstRow gadtType<int>
-| Bar(@onInt int): @onSecondRow gadtType<unit>
-
-type color<'value> =
-  | Rgb(@attr superLongTypeName, @attr superLongTypeName, @attr superLongTypeName, @attr superLongTypeName) : @toRgb color<float>
-  | Hex(@attr superLongTypeName, @attr superLongTypeName, @attr superLongTypeName, @attr superLongTypeName) : @toHex color<float>
-
-type color = | @rgb Purple
-type color = | @rgb Purple | @rgb Pink
-
-type color =
-  | @rgb Red
-  | @rgb Blue
-  | @rgb Green
-
-// Spreads
-module S = {
-  type s = Five | Six
-}
-type aa = One | Two
-type bb = | ...aa | Three | Four | ...S.s
\ No newline at end of file
diff --git a/jscomp/syntax/tests/printer/typexpr/alias.res b/jscomp/syntax/tests/printer/typexpr/alias.res
deleted file mode 100644
index bb82d9a..0000000
--- a/jscomp/syntax/tests/printer/typexpr/alias.res
+++ /dev/null
@@ -1,4 +0,0 @@
-type t = string as 'x
-type t = ((string, float) => unit) as 'x
-type t = (string, float) => unit as 'x
-type t = (string, float) => (unit as 'x)
diff --git a/jscomp/syntax/tests/printer/typexpr/any.res b/jscomp/syntax/tests/printer/typexpr/any.res
deleted file mode 100644
index c10dd90..0000000
--- a/jscomp/syntax/tests/printer/typexpr/any.res
+++ /dev/null
@@ -1,17 +0,0 @@
-type t = _
-type t = node<_>
-
-type t = {name: _}
-type t = {name: @attr _}
-
-type t = Plant(_)
-type t = Plant(@attr _)
-
-type t = (_, _) => unit
-type t = (@attr _, @attr _) => unit
-
-let x: _ = ()
-let x: @attr _ = ()
-
-external foo: _ = "foo_c_binding"
-external foo: @attr _ = "foo_c_binding"
diff --git a/jscomp/syntax/tests/printer/typexpr/arrow.res b/jscomp/syntax/tests/printer/typexpr/arrow.res
deleted file mode 100644
index 78aaa06..0000000
--- a/jscomp/syntax/tests/printer/typexpr/arrow.res
+++ /dev/null
@@ -1,112 +0,0 @@
-type t = (string, string) => string
-type t = (~firstName: string, ~lastName: string) => string
-type t = (~firstName: string=?, ~lastName: string=?) => string
-
-type t = (string, string, superLongIdentifierHere, superLongIdentifierHere, superLongIdentifierHere) => okok
-
-type t = (~firstName: string, ~lastName: string, ~long:  superLongIdentifierHere=?, ~long2: superLongIdentifierHere=?, ~long3: superLongIdentifierHere=?) => string
-
-
-type t = (_, typeConstr<'a, state, 'foo>, 'x as 'y, module(S), %extension) => string
-
-external c_binding: (string, string, superLongIdentifierHere, superLongIdentifierHere, superLongIdentifierHere) => okok = "c_binding_external_primitive"
-
-external c_binding: (~any: _, string, ~firstClassModule: module(Hashmap with type key = string and type value = int and type superLongThingHere = definitelyLineBreak)=?, ~typeConstr: typeConstr<superLongIdentifierHere, superLongIdentifierHere, superLongIdentifierHere>, ~subArrow: (~subArrow: 'a1, ~subArrowParameter: 'a2, ~subArrowParameter3: loooooooongTypExpr) => (foo, bar, baz) ,~subArrow2: (~subArrow: 'a1, ~subArrowParameter: 'a2, ~subArrowParameter3: loooooooongTypExpr) => (foo, bar, baz, veryLooooooooooooooooongTupleTypeHere, veryLooooooooooooooooongTupleTypeHere, shoulBreakThatLine ), ~jsObject: {"name": string, "otherLongName": evenLongerType, "woooooooooooooo": excitingTypeHereBecauseItWillBreakthatLine}=?) => okok = "c_binding_external_primitive"
-
-type t = (~firstName: string, ~lastName: string) => {
-  "name": string,
-  "age": int,
-  "moreProps": superLongIdentifierHere,
-  "moreProps2": superLongIdentifierHere2,
-  "moreProps3": superLongIdentifierHere3,
-  "moreProps4": superLongIdentifierHere4,
-}
-
-type t = (~firstName: string, ~lastName: string) => (
-  name, string,
-  age, int,
-  moreProps, superLongIdentifierHere,
-  moreProps2, superLongIdentifierHere2,
-  moreProps3, superLongIdentifierHere3,
-  moreProps4, superLongIdentifierHere4
-)
-
-type t = (~firstName: string, ~lastName: string) => typeConstr<
-  name, string,
-  age, int,
-  moreProps, superLongIdentifierHere,
-  moreProps2, superLongIdentifierHere2,
-  moreProps3, superLongIdentifierHere3,
-  moreProps4, superLongIdentifierHere4,
->
-
-type t = (~firstName: string, ~lastName: string) =>
-  module(Hashmap with type key = string and type value = int and type superLongThingHere = definitelyLineBreak)
-
-type t = (@attr string, @attr float) => unit
-type t = (@attr @attr2 string, @attr @attr2 float, @attr3 int) => unit
-
-type t = @attr (string => unit)
-type t = @attr (foo, bar, baz) => unit
-type t = @attr (foo, @attr2 ~f:bar, @attr3 ~f:baz) => unit
-
-type t = @attr (string => @attr (int => unit))
-type t = @attr (string, int) => @attr (int, float) => unit
-type t = @attr (int => @attr (int, float) => @attr (unit => unit => unit))
-type t = @attr ((@attr2 ~f: int, @attr3  ~g: float) => unit)
-
-
-type f = (@attr @attr @attr @attr @attr @attr @attr @attr @attr ~f: superLong, @attr2  @superLongAttributeNameSuperLongsuperLongAttributeName @attr2 @superLongAttributeNameSuperLongsuperLongAttributeName ~g: wowwwThisisLonggggg, @attr3 ~h: ccccrazysldkfjslkdjflksdjkf=?) => unit
-
-type t = @attr (stringWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong => @attr2 (floatWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong => @attr3 (intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong => unitWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong)))
-
-
-type t = @attr (fooWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, barWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, bazWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong) => @attr2 (stringWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, floatWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong) => unit
-
-
-type t = @attr @attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong @attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong (fooWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, barWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, bazWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong) => @attr2 @attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong @attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong (stringWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, floatWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong) => unit
-
-
-external debounce: (int, @meth unit) => unit = "debounce";
-
-external debounce: int => @meth (unit => unit) = "debounce";
-
-external debounce: (int, @meth (unit => unit)) => @meth (unit => unit) = "debounce";
-
-external debounce: (int, @meth (unit => unit), @meth (unit => unit)) => @meth (unit => unit) = "debounce";
-
-external debounce: (int, @meth (unit => unit), @meth ( unit => @meth (unit => unit))) => @meth (unit => unit) = "debounce";
-
-type returnTyp = (int, int) => @magic float
-type returnTyp = (intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong) => @magic float
-type returnTyp = (intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong, intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong) => @magic @magicWithSuperLongIdentiefierNameLoooooooooooooooooooooooong @magicWithSuperLongIdentiefierNameLoooooooooooooooooooooooong float
-
-// uncurried
-type t = (. int) => int
-type t = (. int, int) => int
-type t = (. int, . int) => int
-type t = (. int, int, . int, int) => int
-
-
-type t = (. @attr int) => unit 
-type t = (. @attr int, . @attr2 int) => unit 
-type t = (. @attrOnInt int, @attrOnInt int, . @attrOnInt int, @attrOnInt int) => int
-type t = (. @attr ~x: int, ~y: int, . @attr ~z: int, @attr ~omega: int) => unit 
-
-@val external requestAnimationFrame: (float => unit) => unit = "requestAnimationFrame"
-@val external requestAnimationFrame: @attr (float => unit) => unit = "requestAnimationFrame"
-
-type arrows = (int, (float => unit) => unit, float) => unit
-
-// tuple as single parameter
-let prepare_expansion: ((type_expr, type_expr)) => (type_expr, type_expr) = f
-
-type getInitialPropsFn<'a> = {
-  "query": Js.Dict.t<string>,
-  "req": Js.Nullable.t<Js.t<'a>>,
-} => Js.Promise.t<Js.t<'a>>
-
-// keep parens
-external fromPoly: ([> ] as 'a) => t = "%identity"
-
-external fromPoly: ([> ] as 'a, [> ] as 'b) => t = "%identity"
diff --git a/jscomp/syntax/tests/printer/typexpr/bsObject.res b/jscomp/syntax/tests/printer/typexpr/bsObject.res
deleted file mode 100644
index 8e2f473..0000000
--- a/jscomp/syntax/tests/printer/typexpr/bsObject.res
+++ /dev/null
@@ -1,27 +0,0 @@
-type user = {"age": int}
-type user = {"age": int, "name": string}
-type user = {"age": int, "name": string, "moreFields": veryVeryVeryLongtype, "superLongNameThat": whyDoesATypeWithThisAmountOfCharactersMakeItIntoThisFile, "because": testingLineBreaks}
-
-
-type magic = {..}
-type t = {.. "age": int}
-type magicallyLong = {.."age": int, "name": string, "moreFields": veryVeryVeryLongtype, "superLongNameThat": whyDoesATypeWithThisAmountOfCharactersMakeItIntoThisFile, "because": testingLineBreaks}
-
-external test: (foo, bar, baz) => {.."age": int, "name": string, "moreFields": veryVeryVeryLongtype, "superLongNameThat": whyDoesATypeWithThisAmountOfCharactersMakeItIntoThisFile, "because": testingLineBreaks} = "primitive"
-
-
-// attributes
-type user = @attr {"age": @attr int}
-type magic = @attr {..}
-type magic = @attr {.}
-type t = @attr {.. "age": int}
-
-external test: (foo, bar, baz) => @attr {.."age": int, "name": string, "moreFields": veryVeryVeryLongtype, "superLongNameThat": whyDoesATypeWithThisAmountOfCharactersMakeItIntoThisFile, "because": testingLineBreaks} = "primitive"
-
-type t = {.}
-type t = private {.}
-
-type t = constr<{.}, {.}, {.}>
-type t = {
-  hr: React.component<{.}>
-}
diff --git a/jscomp/syntax/tests/printer/typexpr/exoticIdent.res b/jscomp/syntax/tests/printer/typexpr/exoticIdent.res
deleted file mode 100644
index 54e51c6..0000000
--- a/jscomp/syntax/tests/printer/typexpr/exoticIdent.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type s = \"type"
-type s = '\"type"
-type s = \"module" as '\"type"
-
-type s = (~\"let": \"type") => \"module"
-
-type t = (\"let", \"module", \"type")
-
-type t = Foo.list<a>
-type t = Foo.\"let"<\"let", \"module">
-
-let f: 'a. \"let" => \"type" = () 
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/alias.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/alias.res.txt
deleted file mode 100644
index e247796..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/alias.res.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-type t = string as 'x
-type t = ((string, float) => unit) as 'x
-type t = ((string, float) => unit) as 'x
-type t = (string, float) => (unit as 'x)
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/any.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/any.res.txt
deleted file mode 100644
index c10dd90..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/any.res.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-type t = _
-type t = node<_>
-
-type t = {name: _}
-type t = {name: @attr _}
-
-type t = Plant(_)
-type t = Plant(@attr _)
-
-type t = (_, _) => unit
-type t = (@attr _, @attr _) => unit
-
-let x: _ = ()
-let x: @attr _ = ()
-
-external foo: _ = "foo_c_binding"
-external foo: @attr _ = "foo_c_binding"
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/arrow.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/arrow.res.txt
deleted file mode 100644
index 2c29260..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/arrow.res.txt
+++ /dev/null
@@ -1,232 +0,0 @@
-type t = (string, string) => string
-type t = (~firstName: string, ~lastName: string) => string
-type t = (~firstName: string=?, ~lastName: string=?) => string
-
-type t = (
-  string,
-  string,
-  superLongIdentifierHere,
-  superLongIdentifierHere,
-  superLongIdentifierHere,
-) => okok
-
-type t = (
-  ~firstName: string,
-  ~lastName: string,
-  ~long: superLongIdentifierHere=?,
-  ~long2: superLongIdentifierHere=?,
-  ~long3: superLongIdentifierHere=?,
-) => string
-
-type t = (_, typeConstr<'a, state, 'foo>, 'x as 'y, module(S), %extension) => string
-
-external c_binding: (
-  string,
-  string,
-  superLongIdentifierHere,
-  superLongIdentifierHere,
-  superLongIdentifierHere,
-) => okok = "c_binding_external_primitive"
-
-external c_binding: (
-  ~any: _,
-  string,
-  ~firstClassModule: module(Hashmap with
-    type key = string
-    and type value = int
-    and type superLongThingHere = definitelyLineBreak
-  )=?,
-  ~typeConstr: typeConstr<
-    superLongIdentifierHere,
-    superLongIdentifierHere,
-    superLongIdentifierHere,
-  >,
-  ~subArrow: (
-    ~subArrow: 'a1,
-    ~subArrowParameter: 'a2,
-    ~subArrowParameter3: loooooooongTypExpr,
-  ) => (foo, bar, baz),
-  ~subArrow2: (
-    ~subArrow: 'a1,
-    ~subArrowParameter: 'a2,
-    ~subArrowParameter3: loooooooongTypExpr,
-  ) => (
-    foo,
-    bar,
-    baz,
-    veryLooooooooooooooooongTupleTypeHere,
-    veryLooooooooooooooooongTupleTypeHere,
-    shoulBreakThatLine,
-  ),
-  ~jsObject: {
-    "name": string,
-    "otherLongName": evenLongerType,
-    "woooooooooooooo": excitingTypeHereBecauseItWillBreakthatLine,
-  }=?,
-) => okok = "c_binding_external_primitive"
-
-type t = (
-  ~firstName: string,
-  ~lastName: string,
-) => {
-  "name": string,
-  "age": int,
-  "moreProps": superLongIdentifierHere,
-  "moreProps2": superLongIdentifierHere2,
-  "moreProps3": superLongIdentifierHere3,
-  "moreProps4": superLongIdentifierHere4,
-}
-
-type t = (
-  ~firstName: string,
-  ~lastName: string,
-) => (
-  name,
-  string,
-  age,
-  int,
-  moreProps,
-  superLongIdentifierHere,
-  moreProps2,
-  superLongIdentifierHere2,
-  moreProps3,
-  superLongIdentifierHere3,
-  moreProps4,
-  superLongIdentifierHere4,
-)
-
-type t = (
-  ~firstName: string,
-  ~lastName: string,
-) => typeConstr<
-  name,
-  string,
-  age,
-  int,
-  moreProps,
-  superLongIdentifierHere,
-  moreProps2,
-  superLongIdentifierHere2,
-  moreProps3,
-  superLongIdentifierHere3,
-  moreProps4,
-  superLongIdentifierHere4,
->
-
-type t = (
-  ~firstName: string,
-  ~lastName: string,
-) => module(Hashmap with
-  type key = string
-  and type value = int
-  and type superLongThingHere = definitelyLineBreak
-)
-
-type t = (@attr string, @attr float) => unit
-type t = (@attr @attr2 string, @attr @attr2 float, @attr3 int) => unit
-
-type t = @attr (string => unit)
-type t = @attr (foo, bar, baz) => unit
-type t = @attr (foo, @attr2 ~f: bar, @attr3 ~f: baz) => unit
-
-type t = @attr (string => @attr (int => unit))
-type t = @attr (string, int) => @attr (int, float) => unit
-type t = @attr (int => @attr (int, float) => @attr (unit, unit) => unit)
-type t = (@attr @attr2 ~f: int, @attr3 ~g: float) => unit
-
-type f = (
-  @attr @attr @attr @attr @attr @attr @attr @attr @attr ~f: superLong,
-  @attr2
-  @superLongAttributeNameSuperLongsuperLongAttributeName
-  @attr2
-  @superLongAttributeNameSuperLongsuperLongAttributeName
-  ~g: wowwwThisisLonggggg,
-  @attr3 ~h: ccccrazysldkfjslkdjflksdjkf=?,
-) => unit
-
-type t = @attr (
-  stringWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong => @attr2 (
-    floatWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong => @attr3 (
-      intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong => unitWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong
-    )
-  )
-)
-
-type t = @attr (
-  fooWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-  barWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-  bazWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-) => @attr2 (
-  stringWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-  floatWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-) => unit
-
-type t = @attr
-@attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong
-@attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong (
-  fooWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-  barWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-  bazWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-) => @attr2
-@attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong
-@attrWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong (
-  stringWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-  floatWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-) => unit
-
-external debounce: (int, @meth unit) => unit = "debounce"
-
-external debounce: int => @meth (unit => unit) = "debounce"
-
-external debounce: (int, @meth (unit => unit)) => @meth (unit => unit) = "debounce"
-
-external debounce: (int, @meth (unit => unit), @meth (unit => unit)) => @meth (unit => unit) =
-  "debounce"
-
-external debounce: (
-  int,
-  @meth (unit => unit),
-  @meth (unit => @meth (unit => unit)),
-) => @meth (unit => unit) = "debounce"
-
-type returnTyp = (int, int) => @magic float
-type returnTyp = (
-  intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-  intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-) => @magic float
-type returnTyp = (
-  intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-  intWithSuperLongIdentifierNameLoooooooooooooooooooooooooooooooooooooooooooooong,
-) => @magic
-@magicWithSuperLongIdentiefierNameLoooooooooooooooooooooooong
-@magicWithSuperLongIdentiefierNameLoooooooooooooooooooooooong
-float
-
-// uncurried
-type t = (. int) => int
-type t = (. int, int) => int
-type t = (. int) => (. int) => int
-type t = (. int, int) => (. int, int) => int
-
-type t = (. @attr int) => unit
-type t = (. @attr int) => (. @attr2 int) => unit
-type t = (. @attrOnInt int, @attrOnInt int) => (. @attrOnInt int, @attrOnInt int) => int
-type t = (. @attr ~x: int, ~y: int) => (. @attr ~z: int, @attr ~omega: int) => unit
-
-@val external requestAnimationFrame: (float => unit) => unit = "requestAnimationFrame"
-@val external requestAnimationFrame: @attr ((float => unit) => unit) = "requestAnimationFrame"
-
-type arrows = (int, (float => unit) => unit, float) => unit
-
-// tuple as single parameter
-let prepare_expansion: ((type_expr, type_expr)) => (type_expr, type_expr) = f
-
-type getInitialPropsFn<'a> = {
-  "query": Js.Dict.t<string>,
-  "req": Js.Nullable.t<Js.t<'a>>,
-} => Js.Promise.t<Js.t<'a>>
-
-// keep parens
-external fromPoly: ([> ] as 'a) => t = "%identity"
-
-external fromPoly: ([> ] as 'a, [> ] as 'b) => t = "%identity"
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/bsObject.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/bsObject.res.txt
deleted file mode 100644
index e7c3c00..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/bsObject.res.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-type user = {"age": int}
-type user = {"age": int, "name": string}
-type user = {
-  "age": int,
-  "name": string,
-  "moreFields": veryVeryVeryLongtype,
-  "superLongNameThat": whyDoesATypeWithThisAmountOfCharactersMakeItIntoThisFile,
-  "because": testingLineBreaks,
-}
-
-type magic = {..}
-type t = {.."age": int}
-type magicallyLong = {..
-  "age": int,
-  "name": string,
-  "moreFields": veryVeryVeryLongtype,
-  "superLongNameThat": whyDoesATypeWithThisAmountOfCharactersMakeItIntoThisFile,
-  "because": testingLineBreaks,
-}
-
-external test: (
-  foo,
-  bar,
-  baz,
-) => {..
-  "age": int,
-  "name": string,
-  "moreFields": veryVeryVeryLongtype,
-  "superLongNameThat": whyDoesATypeWithThisAmountOfCharactersMakeItIntoThisFile,
-  "because": testingLineBreaks,
-} = "primitive"
-
-// attributes
-type user = @attr {"age": @attr int}
-type magic = @attr {..}
-type magic = @attr {.}
-type t = @attr {.."age": int}
-
-external test: (
-  foo,
-  bar,
-  baz,
-) => @attr
-{..
-  "age": int,
-  "name": string,
-  "moreFields": veryVeryVeryLongtype,
-  "superLongNameThat": whyDoesATypeWithThisAmountOfCharactersMakeItIntoThisFile,
-  "because": testingLineBreaks,
-} = "primitive"
-
-type t = {.}
-type t = private {.}
-
-type t = constr<{.}, {.}, {.}>
-type t = {hr: React.component<{.}>}
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/exoticIdent.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/exoticIdent.res.txt
deleted file mode 100644
index 83b5ae9..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/exoticIdent.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-type s = \"type"
-type s = '\"type"
-type s = \"module" as '\"type"
-
-type s = (~\"let": \"type") => \"module"
-
-type t = (\"let", \"module", \"type")
-
-type t = Foo.list<a>
-type t = Foo.\"let"<\"let", \"module">
-
-let f: 'a. \"let" => \"type" = ()
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/extension.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/extension.res.txt
deleted file mode 100644
index 295f745..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/extension.res.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-type t = %extension
-type t = @attr %extension
-
-external foo: %extension = "primitive"
-external foo: @attr %extension = "primitive"
-
-let x: %extension = z
-let x: @attr %extension = z
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/firstClassModule.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/firstClassModule.res.txt
deleted file mode 100644
index bf3ca0f..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/firstClassModule.res.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-type t = module(S)
-type t = module(Hashmap with type key = string)
-type t = module(Hashmap with type key = string and type value = int)
-type t = module(Hashmap with
-  type key = string
-  and type value = int
-  and type superLongThingHere = definitelyLineBreak
-)
-
-type t = constr<module(S)>
-
-external foo: module(S) = "primitive"
-
-let x: module(S) = y
-
-let x: module(Hashmap with
-  type key = string
-  and type value = int
-  and type superLongThingHere = definitelyLineBreak
-) = y
-
-type toValueLikeInstance = t<'a> => module(RxValueLikeInstance.S with type a = 'a)
-type t<'a> = module(Test with type a = 'a)
-type t = ref<module(Console)>
-
-let devices: Hastbl.t<string, module(DEVICE)> = xyz
-
-// attributes
-type t = @attr module(S)
-external foo: @attr module(S) = "primitive"
-let devices: @attr Hastbl.t<string, module(DEVICE)> = xyz
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/objectTypeSpreading.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/objectTypeSpreading.res.txt
deleted file mode 100644
index 8144693..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/objectTypeSpreading.res.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-type a = {"x": int}
-type u = {...a, "u": int}
-type v = {"v": int, ...a}
-type w = {"j": int, ...a, "k": int, ...v}
-
-type t = {...a, "u": int} as 'a
-type t = {...a, "u": int} => unit
-type t = ({...a, "u": int} as 'a) => unit
-type t = ({...a, "u": int}, {...a, "v": int}) => unit
-
-type user = {"name": string}
-
-let steve: {...user, "age": int} = {"name": "Steve", "age": 30}
-let steve = ({"name": "Steve", "age": 30}: {...user, "age": int})
-let steve = {({"name": "Steve", "age": 30}: {...user, "age": int})}
-
-let printFullUser = (steve: {...user, "age": int}) => Js.log(steve)
-let printFullUser = (~user: {...user, "age": int}) => Js.log(steve)
-let printFullUser = (~user: {...user, "age": int}) => Js.log(steve)
-let printFullUser = (~user=steve: {...user, "age": int}) => Js.log(steve)
-
-@val
-external steve: {...user, "age": int} = "steve"
-
-let makeCeoOf30yearsOld = (name): {...user, "age": int} => {"name": name, "age": 30}
-
-type optionalUser = option<{...user, "age": int}>
-type optionalTupleUser = option<({...user, "age": int}, {...user, "age": int})>
-type constrUser = myTypeConstructor<{...user, "age": int}, {...user, "age": int}>
-
-type taggedUser =
-  | User({...user, "age": int})
-  | Ceo({...user, "age": int, "direction": bool}, {...salary, "taxFraud": bool})
-
-type polyTaggedUser = [#User({...user, "age": int})]
-type polyTaggedUser2 = [
-  | #User({...user, "age": int})
-  | #Ceo({...user, "age": int, "direction": bool}, {...salary, "taxFraud": bool})
-]
-
-// notice .. and ..., they should have a space
-type u<'a> = {.. ...hi} as 'a
-type u<'a> = {.. ...hi, "superLongFieldName": string, "superLongFieldName22222222222": int} as 'a
-type u<'a> = {..
-  ...hi,
-  "superLongFieldName": string,
-  ...hi,
-  "superLongFieldName22222222222": int,
-  ...hi,
-} as 'a
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/polyTyp.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/polyTyp.res.txt
deleted file mode 100644
index 1551f61..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/polyTyp.res.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-external getLogger: unit => {
-  "log": 'a => unit,
-  "log2": 'a. int => int,
-  "log3": 'a 'b. ('a, 'b) => int,
-} = "./src/logger.mock.js"
-
-// polytype in label_declaration doesn't have attributes
-type reducer<'state> = {
-  state: @attr 'state,
-  send: 'action. @attr ('state, 'action) => 'action,
-}
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/tuple.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/tuple.res.txt
deleted file mode 100644
index 4f327d7..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/tuple.res.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-type t = (string, int, float)
-
-type t = (
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-)
-
-type t = constr<(string, int, float)>
-
-type t = constr<(
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-)>
-
-external foo: (string, int, float) = "external_binding"
-
-external foo: (
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-) = "external_binding"
-
-let x: (int, int) = (1, 2)
-
-let x: (
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-) = (1, 2)
-
-type t = @attr (@attr string, @attr int, @attr float)
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/typeConstr.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/typeConstr.res.txt
deleted file mode 100644
index e10deda..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/typeConstr.res.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-type t = Option.t<string>
-type t = Mod.Sub.t<a, b, c>
-type t = Mod.Sub.t<
-  soooooLoooooong,
-  soooooLoooooong,
-  soooooLoooooong,
-  soooooLoooooong,
-  soooooLoooooong,
-  soooooLoooooong,
-  b,
-  c,
->
-
-type t = Mod.Sub.t<
-  Mod.Sub.t<soooooLoooooong, soooooLoooooong, soooooLoooooong>,
-  soooooLoooooong,
-  soooooLoooooong,
-  soooooLoooooong,
-  b,
-  c,
->
-type t = Mod.Sub.t<
-  Mod.Sub.t<soooooLoooooong, soooooLoooooong, soooooLoooooong, soooooLoooooong, soooooLoooooong>,
-  Nested.Module.t<string, float>,
-  soooooLoooooong,
-  soooooLoooooong,
-  b,
-  c,
->
-
-let t: list<{"age": int}> = x
-
-let t: list<{
-  "age": int,
-  "name": string,
-  "moreFields": veryVeryVeryLongtype,
-  "superLongNameThat": whyDoesATypeWithThisAmountOfCharactersMakeItIntoThisFile,
-  "because": testingLineBreaks,
-}> = x
-
-let t: list<
-  {"age": int, @attr "name": string},
-  {"name": string, @attr "age": int},
-  {"name": string, @attr "age": int},
-> = x
-
-type t = Option.t<(tupleTyp1, tupleTyp2, tupleTyp3)>
-type t = Option.t<(
-  tupleTyp1,
-  tupleTyp2,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-)>
-let t: Option.t<(
-  tupleTyp1,
-  tupleTyp2,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-  tupleTyp3,
-)> = x
-
-type t = @attrs Option.t<string>
-
-let t: @attrs list<{"age": int}> = x
-
-external color: @attr colour<'t> = "c_color"
-
-@send @return(nullable)
-external getAttribute: (Js.t<'a>, string) => option<string> = "getAttribute"
-
-let dangerousHtml: string => Js.t<'a> = html => {"__html": html}
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/var.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/var.res.txt
deleted file mode 100644
index 09a8c6c..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/var.res.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-type t = 'a
-type t = @attr 'a
-
-type t = constr<'a>
-
-external foo: 'foo = "primitive"
-external foo: @attr 'foo = "primitive"
-
-let x: 'a = y
-let x: @attr 'a = y
-
-type x<'A> = 'A
diff --git a/jscomp/syntax/tests/printer/typexpr/expected/variant.res.txt b/jscomp/syntax/tests/printer/typexpr/expected/variant.res.txt
deleted file mode 100644
index c5662d7..0000000
--- a/jscomp/syntax/tests/printer/typexpr/expected/variant.res.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-type rgb = [#Red | #Green | #Blue]
-type color = [rgb | #Orange | #Yellow | #Purple]
-
-type t = [#variant]
-type t = [#Variant]
-type t = [#"type"]
-type t = [#"va r ia nt"]
-type t = [#"Variant ⛰"]
-
-let id = (x: [> #Red | #Green | #Blue]) => x
-let upper = (x: [< #Red | #Green]) => true
-type point = [#Point(float, float)]
-type \"type" = [#"Point🗿"(\"let", float)]
-type shape = [
-  | #Rectangle(point, point)
-  | #Circle(point, float)
-]
-
-type madness = [< #"type" & (\"let") & (\"Super exotic") | #"Bad Idea"]
-
-let error_of_exn: exn => option<[#Ok(error) | #Already_displayed]> = x
-
-external make: (
-  ~_type: @string
-  [
-    | #basis
-    | #basisClosed
-    | #basisOpen
-    | #linear
-    | #linearClosed
-    | #natural
-    | #monotoneX
-    | #monotoneY
-    | #monotone
-    | #step
-    | #stepBefore
-    | #stepAfter
-  ]=?,
-  ~dataKey: Config.dataItem => Js.null<yValue>,
-  ~stroke: string=?,
-  ~strokeWidth: float=?,
-  ~strokeDasharray: string=?,
-  ~children: React.element=?,
-  ~dot: Dot.t=?,
-  ~activeDot: Dot.t=?,
-  ~label: string=?,
-  ~name: string=?,
-  ~connectNulls: bool=?,
-) => React.element = "Line"
-
-type empty_conj = X([< #X & ('a) & (int, float)]): empty_conj
-
-type conj = X([< #X(int) & ([< #B(int) & (float)])]): conj
-
-module type Conjunctive = {
-  type u1 = [#A | #B]
-  type u2 = [#A | #B | #C]
-
-  let f: [< #T([< u2]) & ([< u2]) & ([< u1])] => unit
-  let g: [< #S & ([< u2]) & ([< u2]) & ([< u1])] => unit
-}
-
-type x = [
-  | #Fooooooooooooooooooooooooooooooooooooooo
-  | #Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar
-  | #Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz
-]
-
-type animation = [
-  | #"ease-in"
-  | #"ease-out"
-  | #"never ease ✍️"
-]
-
-module type Conjunctive = {
-  type u1 = [#A | #B]
-  type u2 = [#A | #B | #C]
-
-  let f: [< #T([< u2]) & ([< u2]) & ([< u1])] => unit
-  let g: [< #S & ([< u2]) & ([< u2]) & ([< u1])] => unit
-  let g: [<
-    | #"Exotic-S+" & ([< #"Exotic-u2+"]) & ([< #"Exotic-u2-"]) & ([< #"Exotic-u1+++"])
-  ] => unit
-}
-
-// should break because user wrote it over serveral lines
-type currencyPoly = [
-  | #USD
-  | #CAD
-  | #EUR
-]
-
-// should not break, user wrote it on one line
-type currencyPoly = [#USD | #CAD | #EUR]
-//
-// should break, line length exceeded
-type currencyPoly = [
-  | #UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUSD
-  | #CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD
-  | #EUUUUUUUUUUUUUUUUUUUR
-]
-
-type t = [s]
-type t = [ListStyleType.t]
-
-type permissions = [
-  | #777
-  | #644
-]
-
-type t = [
-  | #1(string)
-  | #2(int, string)
-]
-
-// don't pick int with suffix as numeric polyvar
-type t = [#"10s" | #"20t"]
-
-// comments
-type foo = [
-  | // before bar
-  #Bar // after bar
-  | // before baz
-  #Baz
-] // after baz
diff --git a/jscomp/syntax/tests/printer/typexpr/extension.res b/jscomp/syntax/tests/printer/typexpr/extension.res
deleted file mode 100644
index 295f745..0000000
--- a/jscomp/syntax/tests/printer/typexpr/extension.res
+++ /dev/null
@@ -1,8 +0,0 @@
-type t = %extension
-type t = @attr %extension
-
-external foo: %extension = "primitive"
-external foo: @attr %extension = "primitive"
-
-let x: %extension = z
-let x: @attr %extension = z
diff --git a/jscomp/syntax/tests/printer/typexpr/firstClassModule.res b/jscomp/syntax/tests/printer/typexpr/firstClassModule.res
deleted file mode 100644
index 62ecae3..0000000
--- a/jscomp/syntax/tests/printer/typexpr/firstClassModule.res
+++ /dev/null
@@ -1,25 +0,0 @@
-type t = module(S)
-type t = module(Hashmap with type key = string)
-type t = module(Hashmap with type key = string and type value = int)
-type t = module(Hashmap with type key = string and type value = int and type superLongThingHere = definitelyLineBreak)
-
-type t = constr<module(S)>
-
-external foo: module(S) = "primitive"
-
-let x: module(S) = y
-
-
-let x: module(Hashmap with type key = string and type value = int and type superLongThingHere = definitelyLineBreak) = y
-
-type toValueLikeInstance = t<'a> => module(RxValueLikeInstance.S with type a = 'a)
-type t<'a> = module(Test with type a = 'a)
-type t = ref<module(Console)>
-
-let devices: Hastbl.t<string, module(DEVICE)> = xyz
-
-
-// attributes
-type t = @attr module(S)
-external foo: @attr module(S) = "primitive"
-let devices: @attr Hastbl.t<string, module(DEVICE)> = xyz
diff --git a/jscomp/syntax/tests/printer/typexpr/objectTypeSpreading.res b/jscomp/syntax/tests/printer/typexpr/objectTypeSpreading.res
deleted file mode 100644
index 8e2d2e0..0000000
--- a/jscomp/syntax/tests/printer/typexpr/objectTypeSpreading.res
+++ /dev/null
@@ -1,45 +0,0 @@
-type a = {"x": int}
-type u = {...a, "u": int}
-type v = {"v": int, ...a}
-type w = {"j": int, ...a, "k": int, ...v}
-
-
-type t = {...a, "u": int} as 'a 
-type t = {...a, "u": int} => unit
-type t = {...a, "u": int} as 'a => unit
-type t = ({...a, "u": int}, {...a, "v": int}) => unit
-
-type user = {"name": string} 
-
-let steve: {...user, "age": int} = {"name": "Steve", "age": 30}
-let steve = ({"name": "Steve", "age": 30}: {...user, "age": int})
-let steve = {({"name": "Steve", "age": 30}: {...user, "age": int})}
-
-let printFullUser = (steve: {...user, "age": int}) => Js.log(steve)
-let printFullUser = (~user: {...user, "age": int}) => Js.log(steve)
-let printFullUser = (~user: {...user, "age": int}) => Js.log(steve)
-let printFullUser = (~user = steve : {...user, "age": int}) => Js.log(steve)
-
-@val
-external steve: {...user, "age": int} = "steve"
-
-let makeCeoOf30yearsOld = (name) : {...user, "age": int} => {"name": name, "age": 30}
-
-type optionalUser = option<{...user, "age": int}>
-type optionalTupleUser = option<({...user, "age": int}, {...user, "age": int})>
-type constrUser = myTypeConstructor<{...user, "age": int}, {...user, "age": int}>
-
-type taggedUser =
-  | User({...user, "age": int})
-  | Ceo({...user, "age": int, "direction": bool}, {...salary, "taxFraud": bool}) 
-
-type polyTaggedUser = [ #User({...user, "age": int}) ]
-type polyTaggedUser2 = [ 
-  | #User({...user, "age": int}) 
-  | #Ceo({...user, "age": int, "direction": bool}, {...salary, "taxFraud": bool}) 
-]
-
-// notice .. and ..., they should have a space
-type u<'a> = {.. ...hi} as 'a
-type u<'a> = {.. ...hi, "superLongFieldName": string, "superLongFieldName22222222222": int} as 'a
-type u<'a> = {.. ...hi, "superLongFieldName": string, ...hi, "superLongFieldName22222222222": int, ...hi} as 'a
diff --git a/jscomp/syntax/tests/printer/typexpr/polyTyp.res b/jscomp/syntax/tests/printer/typexpr/polyTyp.res
deleted file mode 100644
index 6c4bea8..0000000
--- a/jscomp/syntax/tests/printer/typexpr/polyTyp.res
+++ /dev/null
@@ -1,13 +0,0 @@
-external getLogger:
-  unit => {
-		"log": 'a => unit,
-		"log2": 'a. int => int,
-		"log3": 'a 'b. ('a, 'b) => int
-	} =
-"./src/logger.mock.js"
-
-// polytype in label_declaration doesn't have attributes
-type reducer<'state> = {
-  state: @attr 'state,
-  send: 'action. @attr ('state, 'action) => 'action
-}
diff --git a/jscomp/syntax/tests/printer/typexpr/tuple.res b/jscomp/syntax/tests/printer/typexpr/tuple.res
deleted file mode 100644
index 0980722..0000000
--- a/jscomp/syntax/tests/printer/typexpr/tuple.res
+++ /dev/null
@@ -1,45 +0,0 @@
-type t = (string, int, float)
-
-type t = (
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak
-)
-
-type t = constr<(string, int, float)>
-
-type t = constr<(
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak
-)>
-
-external foo: (string, int, float) = "external_binding"
-
-external foo: (
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak
-) = "external_binding"
-
-let x: (int, int) = (1, 2)
-
-let x: (
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak,
-  superLongTypeNameThatWillBreak
-) = (1, 2)
-
-type t = @attr (@attr string, @attr int, @attr float)
diff --git a/jscomp/syntax/tests/printer/typexpr/typeConstr.res b/jscomp/syntax/tests/printer/typexpr/typeConstr.res
deleted file mode 100644
index 224df6e..0000000
--- a/jscomp/syntax/tests/printer/typexpr/typeConstr.res
+++ /dev/null
@@ -1,32 +0,0 @@
-type t = Option.t<string,>
-type t = Mod.Sub.t<a, b, c>
-type t = Mod.Sub.t<soooooLoooooong, soooooLoooooong, soooooLoooooong, soooooLoooooong, soooooLoooooong, soooooLoooooong, b, c>
-
-type t = Mod.Sub.t<Mod.Sub.t<soooooLoooooong, soooooLoooooong, soooooLoooooong>, soooooLoooooong, soooooLoooooong, soooooLoooooong, b, c>
-type t = Mod.Sub.t<Mod.Sub.t<soooooLoooooong, soooooLoooooong, soooooLoooooong, soooooLoooooong, soooooLoooooong>, Nested.Module.t<string, float>, soooooLoooooong, soooooLoooooong, b, c>
-
-
-let t: list<{"age": int}> = x
-
-let t: list<{"age": int, "name": string, "moreFields": veryVeryVeryLongtype, "superLongNameThat": whyDoesATypeWithThisAmountOfCharactersMakeItIntoThisFile, "because": testingLineBreaks}> = x
-
-let t: list<
-  {"age": int, @attr "name": string},
-  {"name": string, @attr "age": int},
-  {"name": string, @attr "age": int},
-> = x
-
-type t = Option.t<(tupleTyp1, tupleTyp2, tupleTyp3)>
-type t = Option.t<(tupleTyp1, tupleTyp2, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3)>
-let t: Option.t<(tupleTyp1, tupleTyp2, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3, tupleTyp3)> = x
-
-type t = @attrs Option.t<string,>
-
-let t: @attrs list<{"age": int}> = x
-
-external color : @attr colour<'t> = "c_color"
-
-@send @return(nullable)
-external getAttribute: (Js.t<'a>, string) => option<string> = "getAttribute"
-
-let dangerousHtml: string => Js.t<'a> = html => {"__html": html}
diff --git a/jscomp/syntax/tests/printer/typexpr/var.res b/jscomp/syntax/tests/printer/typexpr/var.res
deleted file mode 100644
index 09a8c6c..0000000
--- a/jscomp/syntax/tests/printer/typexpr/var.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type t = 'a
-type t = @attr 'a
-
-type t = constr<'a>
-
-external foo: 'foo = "primitive"
-external foo: @attr 'foo = "primitive"
-
-let x: 'a = y
-let x: @attr 'a = y
-
-type x<'A> = 'A
diff --git a/jscomp/syntax/tests/printer/typexpr/variant.res b/jscomp/syntax/tests/printer/typexpr/variant.res
deleted file mode 100644
index e281c73..0000000
--- a/jscomp/syntax/tests/printer/typexpr/variant.res
+++ /dev/null
@@ -1,119 +0,0 @@
-type rgb = [#Red | #Green | #Blue]
-type color = [rgb | #Orange | #Yellow | #Purple];
-
-type t = [| #variant]
-type t = [| #Variant]
-type t = [| #\"type"]
-type t = [| #\"va r ia nt"]
-type t = [| #\"Variant ⛰"]
-
-let id = (x: [> #Red | #Green | #Blue]) => x;
-let upper = (x: [< #Red | #Green]) => true
-type point = [ #Point(float, float) ];
-type \"type" = [ #\"Point🗿"(\"let", float) ];
-type shape = [
-  | #Rectangle(point, point)
-  | #Circle(point, float)
-];
-
-type madness = [< | #\"type" & (\"let") & (\"Super exotic") | #\"Bad Idea" ]
-
-let error_of_exn: exn => option<[ | #Ok(error) | #Already_displayed ]> = x
-
-external make: (
-  ~_type: @string
-  [
-  | #basis
-  | #basisClosed
-  | #basisOpen
-  | #linear
-  | #linearClosed
-  | #natural
-  | #monotoneX
-  | #monotoneY
-  | #monotone
-  | #step
-  | #stepBefore
-  | #stepAfter
-  ]=?,
-  ~dataKey: Config.dataItem => Js.null<yValue>,
-  ~stroke: string=?,
-  ~strokeWidth: float=?,
-  ~strokeDasharray: string=?,
-  ~children: React.element=?,
-  ~dot: Dot.t=?,
-  ~activeDot: Dot.t=?,
-  ~label: string=?,
-  ~name: string=?,
-  ~connectNulls: bool=?,
-) => React.element = "Line"
-
-type empty_conj =
-  | X([< | #X&('a) &(int, float)]): empty_conj
-
-type conj =
-  | X([< | #X(int) &([< | #B(int) &(float)])]): conj
-
-module type Conjunctive = {
-  type u1 = [ | #A | #B]
-  type u2 = [ | #A | #B | #C]
-
-  let f: [< | #T([< u2]) & ([< u2]) & ([< u1])] => unit
-  let g: [< | #S&([< u2]) & ([< u2]) & ([< u1])] => unit;
-}
-
-type x = [
-  #Fooooooooooooooooooooooooooooooooooooooo
-  | #Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar
-  | #Baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz
-]
-
-type animation = [
-  | #"ease-in"
-  | #"ease-out"
-  | #"never ease ✍️"
-]
-
-module type Conjunctive = {
-  type u1 = [ | #A | #B]
-  type u2 = [ | #A | #B | #C]
-
-  let f: [< | #T([< u2]) & ([< u2]) & ([< u1])] => unit
-  let g: [< | #S&([< u2]) & ([< u2]) & ([< u1])] => unit
-  let g: [< | #"Exotic-S+"&([< #"Exotic-u2+"]) & ([< #"Exotic-u2-"]) & ([< #"Exotic-u1+++"])] => unit
-};
-
-
-// should break because user wrote it over serveral lines
-type currencyPoly = [#USD 
-  | #CAD | #EUR]
-
-// should not break, user wrote it on one line
-type currencyPoly = [#USD | #CAD | #EUR]
-//
-// should break, line length exceeded
-type currencyPoly = [#UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUSD | #CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD | #EUUUUUUUUUUUUUUUUUUUR]
-
-type t = [s]
-type t = [ListStyleType.t];
-
-type permissions = [
-  | #777
-  | #644
-]
-
-type t = [
-  | #1(string)
-  | #2(int, string)
-]
-
-// don't pick int with suffix as numeric polyvar
-type t = [#"10s" | #"20t" ]
-
-// comments
-type foo = [
-  // before bar
-  | #Bar // after bar
-  // before baz
-  | #Baz // after baz
-]
diff --git a/jscomp/test/.depend b/jscomp/test/.depend
deleted file mode 100644
index 715644c..0000000
--- a/jscomp/test/.depend
+++ /dev/null
@@ -1,642 +0,0 @@
-a_recursive_type.cmi :
-abstract_type.cmi : mt.cmi
-alias_test.cmi :
-ari_regress_test.cmi :
-array_test.cmi :
-ast_js_mapper_test.cmi :
-basic_module_test.cmi :
-bs_abstract_test.cmi : ../runtime/js.cmj
-class_setter_getter.cmi : ../runtime/js.cmj
-config2_test.cmi : ../runtime/js.cmj
-const_block_test.cmi :
-demo_int_map.cmi :
-derive_projector_test.cmi :
-ext_pervasives_test.cmi :
-ext_sys_test.cmi :
-float_record.cmi :
-flow_parser_reg_test.cmi :
-gpr_405_test.cmi :
-infer_type_test.cmi : ../runtime/js.cmj
-inline_edge_cases.cmi :
-inline_map_test.cmi :
-inner_define.cmi :
-map_test.cmi :
-mt.cmi : ../runtime/js.cmj
-mt_global.cmi : mt.cmi
-ocaml_parsetree_test.cmi :
-ocaml_proto_test.cmi :
-ocaml_typedtree_test.cmi :
-poly_variant_test.cmi :
-polymorphism_test.cmi :
-scanf_reference_error_regression_test.cmi :
-sexp.cmi :
-sexpm.cmi :
-simple_derive_test.cmi :
-simple_derive_use.cmi :
-test_for_map2.cmi :
-test_http_server.cmi :
-test_is_js.cmi :
-test_literals.cmi :
-test_unsafe_obj_ffi.cmi : ../runtime/js.cmj
-test_unsafe_obj_ffi_ppx.cmi : ../runtime/js.cmj
-testing.cmi :
-ui_defs.cmi :
-unsafe_this.cmi : ../runtime/js.cmj
-406_primitive_test.cmj : mt.cmj
-a.cmj : test_order.cmj
-a_filename_test.cmj : mt.cmj ext_filename_test.cmj
-a_list_test.cmj : mt.cmj ext_list_test.cmj
-a_recursive_type.cmj : a_recursive_type.cmi
-a_scope_bug.cmj :
-a_string_test.cmj : mt.cmj ext_string_test.cmj
-abstract_type.cmj : abstract_type.cmi
-adt_optimize_test.cmj :
-alias_test.cmj : alias_test.cmi
-and_or_tailcall_test.cmj : mt.cmj
-app_root_finder.cmj : ../others/node.cmj ../runtime/js.cmj
-argv_test.cmj :
-ari_regress_test.cmj : mt.cmj ari_regress_test.cmi
-arith_lexer.cmj : arith_syntax.cmj arith_parser.cmj
-arith_parser.cmj : arith_syntax.cmj
-arith_syntax.cmj :
-arity_deopt.cmj : mt.cmj
-arity_infer.cmj :
-array_data_util.cmj : ../others/belt.cmj
-array_safe_get.cmj :
-array_subtle_test.cmj : mt.cmj ../runtime/js.cmj
-array_test.cmj : mt.cmj array_test.cmi
-ast_abstract_test.cmj : mt.cmj
-ast_js_mapper_poly_test.cmj : mt.cmj
-ast_js_mapper_test.cmj : ast_js_mapper_test.cmi
-ast_mapper_defensive_test.cmj : mt.cmj
-ast_mapper_unused_warning_test.cmj :
-async_ideas.cmj :
-attr_test.cmj : ../runtime/js.cmj
-b.cmj :
-bal_set_mini.cmj :
-bang_primitive.cmj :
-basic_module_test.cmj : pr6726.cmj offset.cmj mt_global.cmj mt.cmj \
-    basic_module_test.cmi
-bb.cmj :
-bdd.cmj :
-bench.cmj :
-big_enum.cmj :
-big_polyvar_test.cmj :
-bigarray_test.cmj :
-block_alias_test.cmj : mt.cmj
-boolean_test.cmj : test_bool_equal.cmj mt.cmj
-bs_MapInt_test.cmj : ../runtime/js.cmj ../others/belt.cmj
-bs_abstract_test.cmj : ../runtime/js.cmj bs_abstract_test.cmi
-bs_array_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj
-bs_auto_uncurry.cmj : ../runtime/js.cmj
-bs_auto_uncurry_test.cmj : mt.cmj ../others/js_array.cmj ../runtime/js.cmj
-bs_hashmap_test.cmj : mt.cmj ../others/belt.cmj array_data_util.cmj
-bs_hashset_int_test.cmj : mt.cmj ../others/belt.cmj array_data_util.cmj
-bs_hashtbl_string_test.cmj : ../others/belt.cmj
-bs_ignore_effect.cmj : mt.cmj
-bs_ignore_test.cmj : ../runtime/js.cmj
-bs_list_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj
-bs_map_set_dict_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
-    array_data_util.cmj
-bs_map_test.cmj : mt.cmj ../others/belt.cmj
-bs_min_max_test.cmj : mt.cmj
-bs_mutable_set_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
-    array_data_util.cmj
-bs_node_string_buffer_test.cmj : ../others/node.cmj ../runtime/js.cmj
-bs_poly_map_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
-    array_data_util.cmj
-bs_poly_mutable_map_test.cmj : mt.cmj ../others/belt.cmj array_data_util.cmj
-bs_poly_mutable_set_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
-    array_data_util.cmj
-bs_poly_set_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
-    array_data_util.cmj
-bs_qualified.cmj : ../runtime/js.cmj
-bs_queue_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj
-bs_rbset_int_bench.cmj : rbset.cmj
-bs_rest_test.cmj :
-bs_set_bench.cmj : ../others/belt.cmj
-bs_set_int_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj \
-    array_data_util.cmj
-bs_sort_test.cmj : mt.cmj ../others/belt.cmj array_data_util.cmj
-bs_splice_partial.cmj : ../runtime/js.cmj
-bs_stack_test.cmj : ../runtime/js.cmj ../others/belt.cmj
-bs_string_test.cmj : mt.cmj ../runtime/js.cmj
-bs_unwrap_test.cmj :
-buffer_test.cmj : mt.cmj
-bytes_split_gpr_743_test.cmj : mt.cmj ../runtime/js.cmj
-caml_compare_test.cmj : mt.cmj ../runtime/js.cmj
-caml_format_test.cmj : mt.cmj
-caml_sys_poly_fill_test.cmj : ../others/node_process.cmj mt.cmj \
-    ../runtime/js.cmj
-chain_code_test.cmj : mt.cmj ../runtime/js.cmj
-chn_test.cmj : mt.cmj ../others/js_string.cmj ../others/js_array.cmj \
-    ../runtime/js.cmj
-class3_test.cmj : mt.cmj ../runtime/js.cmj
-class4_test.cmj : mt.cmj
-class5_test.cmj : mt.cmj
-class6_test.cmj : mt.cmj
-class7_test.cmj : mt.cmj
-class8_test.cmj : mt.cmj
-class_fib_open_recursion_test.cmj : mt.cmj
-class_repr.cmj :
-class_setter_getter.cmj : ../runtime/js.cmj class_setter_getter.cmi
-class_test.cmj : mt.cmj
-class_type_ffi_test.cmj : ../runtime/js.cmj
-compare_test.cmj :
-complex_if_test.cmj : mt.cmj
-complex_test.cmj : mt.cmj
-complex_while_loop.cmj :
-condition_compilation_test.cmj : mt.cmj
-config1_test.cmj :
-config2_test.cmj : ../runtime/js.cmj config2_test.cmi
-console_log_test.cmj :
-const_block_test.cmj : mt.cmj const_block_test.cmi
-const_defs.cmj :
-const_defs_test.cmj : const_defs.cmj
-const_test.cmj :
-cont_int_fold_test.cmj :
-cps_test.cmj : mt.cmj
-cross_module_inline_test.cmj :
-custom_error_test.cmj : ../runtime/js.cmj
-debug_keep_test.cmj :
-debugger_test.cmj : ../runtime/js.cmj
-default_export_test.cmj :
-defunctor_make_test.cmj : ../runtime/js.cmj
-demo.cmj : ../runtime/js.cmj demo_binding.cmj
-demo_binding.cmj : ../runtime/js.cmj
-demo_int_map.cmj : demo_int_map.cmi
-demo_page.cmj :
-demo_pipe.cmj : ../runtime/js.cmj
-derive_dyntype.cmj :
-derive_projector_test.cmj : ../runtime/js.cmj derive_projector_test.cmi
-derive_type_test.cmj :
-digest_test.cmj : mt.cmj ext_array_test.cmj
-div_by_zero_test.cmj : mt.cmj
-dollar_escape_test.cmj : mt.cmj
-earger_curry_test.cmj : mt.cmj ../runtime/js.cmj
-empty_obj.cmj :
-epsilon_test.cmj : mt.cmj
-equal_box_test.cmj : mt.cmj ../runtime/js.cmj
-equal_exception_test.cmj : mt.cmj
-equal_test.cmj :
-es6_module_test.cmj : mt.cmj
-escape_esmodule.cmj :
-esmodule_ref.cmj : ../runtime/js.cmj escape_esmodule.cmj
-event_ffi.cmj : ../runtime/js.cmj
-exception_alias.cmj :
-exception_def.cmj : test_other_exn.cmj
-exception_raise_test.cmj : mt.cmj ../runtime/js.cmj
-exception_rebind_test.cmj : exception_def.cmj
-exception_rebound_err_test.cmj : mt.cmj ../runtime/js.cmj
-exception_repr_test.cmj : mt.cmj exception_def.cmj
-exception_value_test.cmj : ../runtime/js.cmj
-exn_error_pattern.cmj : mt.cmj ../runtime/js.cmj
-export_keyword.cmj :
-ext_array_test.cmj :
-ext_bytes_test.cmj : mt.cmj
-ext_filename_test.cmj : test_literals.cmj ext_string_test.cmj \
-    ext_pervasives_test.cmj
-ext_list_test.cmj : ext_string_test.cmj
-ext_log_test.cmj :
-ext_pervasives_test.cmj : ext_pervasives_test.cmi
-ext_string_test.cmj : ext_bytes_test.cmj
-ext_sys_test.cmj : ext_sys_test.cmi
-extensible_variant_test.cmj : mt.cmj
-external_ppx.cmj :
-fail_comp.cmj :
-ffi_arity_test.cmj : mt.cmj ../runtime/js.cmj
-ffi_array_test.cmj : mt.cmj ../others/js_array.cmj
-ffi_js_test.cmj : mt.cmj ../others/js_obj.cmj ../runtime/js.cmj
-ffi_splice_test.cmj : mt.cmj
-ffi_test.cmj : ../runtime/js.cmj
-fib.cmj :
-flattern_order_test.cmj :
-flexible_array_test.cmj :
-float_array.cmj :
-float_of_bits_test.cmj : mt.cmj
-float_record.cmj : float_record.cmi
-float_test.cmj : mt_global.cmj mt.cmj ../others/js_float.cmj \
-    ../runtime/js.cmj
-floatarray_test.cmj :
-flow_parser_reg_test.cmj : ../others/node.cmj mt.cmj ../runtime/js.cmj \
-    flow_parser_reg_test.cmi
-for_loop_test.cmj : mt.cmj
-for_side_effect_test.cmj : mt.cmj
-format_regression.cmj :
-format_test.cmj : mt.cmj
-fs_test.cmj : ../others/node.cmj mt.cmj ../runtime/js.cmj
-fun_pattern_match.cmj : ../runtime/js.cmj
-functor_app_test.cmj : mt.cmj functor_inst.cmj functor_def.cmj
-functor_def.cmj : ../runtime/js.cmj
-functor_ffi.cmj : ../runtime/js.cmj
-functor_inst.cmj :
-gbk.cmj : ../runtime/js.cmj
-genlex_test.cmj : mt.cmj
-global_exception_regression_test.cmj : mt.cmj
-global_mangles.cmj :
-global_module_alias_test.cmj : mt.cmj
-google_closure_test.cmj : test_google_closure.cmj mt.cmj
-gpr496_test.cmj : mt.cmj
-gpr_1063_test.cmj :
-gpr_1072.cmj : ../runtime/js.cmj
-gpr_1072_reg.cmj :
-gpr_1150.cmj :
-gpr_1154_test.cmj : mt.cmj
-gpr_1170.cmj :
-gpr_1240_missing_unbox.cmj :
-gpr_1245_test.cmj : ../runtime/js.cmj
-gpr_1268.cmj : ../runtime/js.cmj
-gpr_1285_test.cmj : mt.cmj
-gpr_1409_test.cmj : string_set.cmj mt.cmj ../runtime/js.cmj
-gpr_1423_app_test.cmj : mt.cmj ../runtime/js.cmj gpr_1423_nav.cmj
-gpr_1423_nav.cmj :
-gpr_1438.cmj :
-gpr_1481.cmj : ../runtime/js.cmj
-gpr_1484.cmj :
-gpr_1501_test.cmj : mt.cmj
-gpr_1503_test.cmj : mt.cmj
-gpr_1539_test.cmj :
-gpr_1600_test.cmj : ../runtime/js.cmj
-gpr_1658_test.cmj : mt.cmj ../runtime/js.cmj
-gpr_1667_test.cmj : mt.cmj
-gpr_1692_test.cmj :
-gpr_1698_test.cmj : ../runtime/js.cmj
-gpr_1701_test.cmj :
-gpr_1716_test.cmj : mt.cmj
-gpr_1717_test.cmj :
-gpr_1728_test.cmj : mt.cmj
-gpr_1749_test.cmj : mt.cmj
-gpr_1759_test.cmj :
-gpr_1760_test.cmj : mt.cmj
-gpr_1762_test.cmj : mt.cmj
-gpr_1817_test.cmj : mt.cmj ../runtime/js.cmj
-gpr_1822_test.cmj : mt.cmj
-gpr_1891_test.cmj : ../runtime/js.cmj
-gpr_1943_test.cmj : mt.cmj
-gpr_1946_test.cmj : ../runtime/js.cmj
-gpr_2250_test.cmj : mt.cmj
-gpr_2316_test.cmj : mt.cmj ../runtime/js.cmj
-gpr_2352_test.cmj :
-gpr_2413_test.cmj :
-gpr_2474.cmj :
-gpr_2487.cmj : ../others/belt.cmj
-gpr_2503_test.cmj : mt.cmj ../runtime/js.cmj
-gpr_2608_test.cmj : mt.cmj
-gpr_2614_test.cmj :
-gpr_2633_test.cmj :
-gpr_2642_test.cmj :
-gpr_2652_test.cmj : ../others/node.cmj
-gpr_2682_test.cmj : ../runtime/js.cmj
-gpr_2700_test.cmj :
-gpr_2731_test.cmj :
-gpr_2789_test.cmj : mt.cmj
-gpr_2863_test.cmj : ../others/belt.cmj
-gpr_2931_test.cmj : mt.cmj
-gpr_3142_test.cmj : mt.cmj
-gpr_3154_test.cmj : mt.cmj ../runtime/js.cmj
-gpr_373_test.cmj :
-gpr_405_test.cmj : gpr_405_test.cmi
-gpr_441.cmj :
-gpr_459_test.cmj : mt.cmj
-gpr_627_test.cmj : mt.cmj
-gpr_658.cmj : ../runtime/js.cmj
-gpr_858_test.cmj :
-gpr_858_unit2_test.cmj :
-gpr_904_test.cmj : mt.cmj
-gpr_974_test.cmj : ../runtime/js.cmj
-gpr_977_test.cmj : mt.cmj ../runtime/js.cmj
-gpr_return_type_unused_attribute.cmj :
-gray_code_test.cmj :
-guide_for_ext.cmj :
-hamming_test.cmj : mt.cmj
-hash_test.cmj : mt_global.cmj mt.cmj
-hashtbl_test.cmj : mt.cmj
-hello.foo.cmj : ../runtime/js.cmj
-http_types.cmj : ../runtime/js.cmj
-if_used_test.cmj :
-ignore_test.cmj : mt.cmj ../runtime/js.cmj
-imm_map_bench.cmj : ../runtime/js.cmj ../others/belt.cmj
-include_side_effect.cmj : side_effect.cmj
-include_side_effect_free.cmj : side_effect_free.cmj
-infer_type_test.cmj : ../runtime/js.cmj infer_type_test.cmi
-inline_edge_cases.cmj : inline_edge_cases.cmi
-inline_map2_test.cmj : mt.cmj
-inline_map_test.cmj : mt.cmj inline_map_test.cmi
-inline_record_test.cmj :
-inline_regression_test.cmj : mt.cmj
-inline_string_test.cmj : ../runtime/js.cmj
-inner_call.cmj : ../runtime/js.cmj inner_define.cmj
-inner_define.cmj : inner_define.cmi
-inner_unused.cmj : ../runtime/js.cmj
-installation_test.cmj : ../others/node.cmj mt.cmj ../runtime/js.cmj \
-    app_root_finder.cmj
-int32_test.cmj : mt.cmj ext_array_test.cmj
-int64_mul_div_test.cmj : mt.cmj
-int64_test.cmj : mt.cmj ext_array_test.cmj ../runtime/caml_int64.cmj
-int_hashtbl_test.cmj : mt.cmj
-int_map.cmj :
-int_overflow_test.cmj : mt.cmj ../runtime/js.cmj
-int_switch_test.cmj : mt.cmj
-io_test.cmj : ../runtime/js.cmj
-js_array_test.cmj : mt.cmj ../runtime/js.cmj
-js_bool_test.cmj : mt.cmj
-js_cast_test.cmj : mt.cmj ../others/js_cast.cmj
-js_date_test.cmj : mt.cmj ../others/js_float.cmj ../runtime/js.cmj
-js_dict_test.cmj : mt.cmj ../others/js_dict.cmj
-js_exception_catch_test.cmj : mt.cmj ../runtime/js.cmj
-js_float_test.cmj : mt.cmj ../others/js_float.cmj
-js_global_test.cmj : mt.cmj ../others/js_global.cmj
-js_int_test.cmj : mt.cmj ../others/js_int.cmj
-js_json_test.cmj : mt.cmj ../others/js_json.cmj ../others/js_dict.cmj \
-    ../runtime/js.cmj
-js_list_test.cmj : mt.cmj ../runtime/js.cmj
-js_math_test.cmj : mt.cmj ../runtime/js.cmj
-js_null_test.cmj : mt.cmj ../others/js_null.cmj ../runtime/js.cmj
-js_null_undefined_test.cmj : mt.cmj ../others/js_null_undefined.cmj \
-    ../runtime/js.cmj
-js_nullable_test.cmj : mt.cmj ../runtime/js.cmj
-js_obj_test.cmj : mt.cmj ../others/js_obj.cmj
-js_option_test.cmj : mt.cmj ../runtime/js.cmj
-js_promise_basic_test.cmj : mt.cmj ../others/js_promise.cmj \
-    ../runtime/js.cmj
-js_re_test.cmj : mt.cmj ../runtime/js.cmj
-js_string_test.cmj : mt.cmj ../runtime/js.cmj
-js_typed_array_test.cmj : mt.cmj ../others/js_typed_array.cmj \
-    ../runtime/js.cmj
-js_undefined_test.cmj : mt.cmj ../others/js_undefined.cmj ../runtime/js.cmj
-js_val.cmj :
-jsoo_400_test.cmj : mt.cmj
-jsoo_485_test.cmj :
-key_word_property.cmj :
-key_word_property2.cmj : export_keyword.cmj
-key_word_property_plus_test.cmj : mt.cmj ../runtime/js.cmj \
-    global_mangles.cmj
-large_record_duplication_test.cmj : mt.cmj
-largest_int_flow.cmj :
-lazy_test.cmj : mt.cmj
-lexer_test.cmj : number_lexer.cmj mt.cmj arith_syntax.cmj arith_parser.cmj \
-    arith_lexer.cmj
-lib_js_test.cmj : mt.cmj ../runtime/js.cmj
-libarg_test.cmj : mt.cmj
-libqueue_test.cmj :
-limits_test.cmj : mt.cmj
-list_test.cmj : mt.cmj
-local_class_type.cmj : ../runtime/js.cmj
-local_exception_test.cmj :
-loop_regression_test.cmj : mt.cmj
-loop_suites_test.cmj : mt.cmj for_loop_test.cmj
-map_find_test.cmj : mt.cmj
-map_test.cmj : mt.cmj map_test.cmi
-mario_game.cmj : ../runtime/js.cmj ../others/dom.cmi
-method_chain.cmj :
-method_name_test.cmj : mt.cmj
-minimal_test.cmj :
-miss_colon_test.cmj :
-mock_mt.cmj : mt.cmj ../runtime/js.cmj
-module_alias_test.cmj : mt.cmj ../runtime/js.cmj
-module_as_class_ffi.cmj :
-module_as_function.cmj :
-module_missing_conversion.cmj :
-module_parameter_test.cmj : mt.cmj
-module_splice_test.cmj : mt.cmj ../runtime/js.cmj
-more_uncurry.cmj :
-mpr_6033_test.cmj : mt.cmj
-mt.cmj : ../others/node.cmj ../runtime/js.cmj mt.cmi
-mt_global.cmj : mt.cmj mt_global.cmi
-mutable_obj_test.cmj : ../runtime/js.cmj
-mutual_non_recursive_type.cmj :
-name_mangle_test.cmj : mt.cmj ../runtime/js.cmj
-nested_include.cmj :
-nested_module_alias.cmj :
-nested_obj_literal.cmj :
-nested_obj_test.cmj :
-nested_pattern_match_test.cmj :
-noassert.cmj :
-node_fs_test.cmj : ../others/node.cmj ../runtime/js.cmj
-node_path_test.cmj : ../runtime/js.cmj
-number_lexer.cmj :
-obj_curry_test.cmj :
-obj_literal_ppx.cmj :
-obj_literal_ppx_test.cmj : ../runtime/js.cmj
-obj_magic_test.cmj : mt.cmj
-obj_test.cmj : mt.cmj
-obj_type_test.cmj : ../runtime/js.cmj
-ocaml_parsetree_main_bspack.cmj : mt.cmj
-ocaml_parsetree_test.cmj : ../others/node.cmj ../runtime/js.cmj \
-    ocaml_parsetree_test.cmi
-ocaml_proto_test.cmj : mt.cmj ocaml_proto_test.cmi
-ocaml_re_test.cmj : mt.cmj
-ocaml_typed_tree_main_bspack.cmj : mt.cmj
-ocaml_typedtree_test.cmj : ../others/node.cmj ../runtime/js.cmj \
-    ocaml_typedtree_test.cmi
-of_string_test.cmj : mt.cmj
-offset.cmj :
-oo_js_test_date.cmj : mt.cmj ../runtime/js.cmj
-option_repr_test.cmj : mt.cmj ../runtime/js.cmj ../others/belt.cmj
-optional_ffi_test.cmj : mt.cmj
-optional_regression_test.cmj : mt.cmj ../runtime/js.cmj
-parser_api.cmj :
-parser_api_main_bspack.cmj :
-parser_api_test.cmj : parser_api.cmj mt.cmj
-pipe_send_readline.cmj : ../runtime/js.cmj
-pipe_syntax.cmj :
-poly_type.cmj : ../runtime/js.cmj
-poly_variant_test.cmj : mt.cmj ../runtime/js.cmj poly_variant_test.cmi
-polymorphism_test.cmj : polymorphism_test.cmi
-polyvar_test.cmj : ../runtime/js.cmj
-ppx_apply_test.cmj : mt.cmj
-ppx_this_obj_field.cmj : mt.cmj ../runtime/js.cmj
-ppx_this_obj_test.cmj : mt.cmj
-pq_test.cmj :
-pr6726.cmj :
-pr_regression_test.cmj : mt.cmj
-prepend_data_ffi.cmj : ../runtime/js.cmj
-primitive_reg_test.cmj :
-print_alpha_test.cmj : mt.cmj ../runtime/js.cmj
-printf_sim.cmj :
-printf_test.cmj : mt.cmj
-promise.cmj : ../runtime/js.cmj
-promise_catch_test.cmj : mt.cmj ../runtime/js.cmj
-qcc.cmj :
-queue_test.cmj : mt.cmj
-random_test.cmj : mt_global.cmj mt.cmj
-raw_hash_tbl_bench.cmj :
-rbset.cmj :
-rebind_module.cmj :
-rebind_module_test.cmj : rebind_module.cmj
-rec_fun_test.cmj : mt.cmj
-rec_module_test.cmj : mt.cmj
-rec_value_test.cmj : mt.cmj ../runtime/js.cmj
-record_debug_test.cmj : ../runtime/js.cmj ../others/belt.cmj
-record_with_test.cmj : mt.cmj
-recursive_module.cmj : mt.cmj
-recursive_module_test.cmj : mt.cmj
-regression_print.cmj :
-return_check.cmj : ../runtime/js.cmj
-runtime_encoding_test.cmj :
-scanf_io.cmj : testing.cmj
-scanf_reference_error_regression_test.cmj : mt_global.cmj mt.cmj \
-    scanf_reference_error_regression_test.cmi
-scanf_test.cmj : mt_global.cmj mt.cmj
-set_gen.cmj :
-sexp.cmj : sexp.cmi
-sexpm.cmj : sexpm.cmi
-sexpm_test.cmj : sexpm.cmj mt.cmj ../runtime/js.cmj
-shift_test.cmj :
-side_effect.cmj : ../runtime/js.cmj
-side_effect_free.cmj :
-simple_derive_test.cmj : simple_derive_test.cmi
-simple_derive_use.cmj : simple_derive_use.cmi
-simple_lexer_test.cmj : mt.cmj
-simplify_lambda_632o.cmj :
-single_module_alias.cmj :
-small_inline_test.cmj :
-sprintf_reg_test.cmj : mt_global.cmj mt.cmj
-stack_comp_test.cmj : mt_global.cmj mt.cmj
-stack_test.cmj : mt.cmj
-stream_parser_test.cmj : mt.cmj
-string_bound_get_test.cmj :
-string_get_set_test.cmj : mt.cmj
-string_interp_test.cmj : ../runtime/js.cmj
-string_literal_print_test.cmj : mt.cmj
-string_runtime_test.cmj : mt.cmj ../runtime/caml_string.cmj \
-    ../runtime/caml_char.cmj ../runtime/caml_bytes.cmj
-string_set.cmj : set_gen.cmj
-string_set_test.cmj : string_set.cmj mt.cmj
-string_test.cmj : mt.cmj ext_string_test.cmj
-string_unicode_test.cmj : ../runtime/js.cmj
-stringmatch_test.cmj :
-submodule.cmj : ../runtime/js.cmj
-submodule_call.cmj : submodule.cmj
-swap_test.cmj : mt.cmj
-switch_case_test.cmj : mt.cmj
-tailcall_inline_test.cmj : mt.cmj
-test.cmj :
-test_alias.cmj : test_global_print.cmj
-test_ari.cmj :
-test_array.cmj :
-test_array_append.cmj :
-test_array_primitive.cmj :
-test_bool_equal.cmj : ../others/belt.cmj
-test_bs_this.cmj : ../runtime/js.cmj
-test_bug.cmj :
-test_bytes.cmj :
-test_case_set.cmj :
-test_char.cmj :
-test_closure.cmj :
-test_common.cmj :
-test_const_elim.cmj :
-test_const_propogate.cmj :
-test_cpp.cmj :
-test_cps.cmj :
-test_demo.cmj :
-test_dup_param.cmj :
-test_eq.cmj :
-test_exception.cmj : test_common.cmj
-test_exception_escape.cmj :
-test_export2.cmj :
-test_external.cmj :
-test_external_unit.cmj :
-test_ffi.cmj :
-test_fib.cmj :
-test_filename.cmj :
-test_for_loop.cmj :
-test_for_map.cmj :
-test_for_map2.cmj : int_map.cmj test_for_map2.cmi
-test_format.cmj :
-test_formatter.cmj :
-test_functor_dead_code.cmj :
-test_generative_module.cmj :
-test_global_print.cmj :
-test_google_closure.cmj : ../runtime/js.cmj
-test_http_server.cmj : ../runtime/js.cmj http_types.cmj test_http_server.cmi
-test_include.cmj : test_order.cmj
-test_incomplete.cmj :
-test_incr_ref.cmj :
-test_index.cmj : ../runtime/js.cmj
-test_int_map_find.cmj :
-test_internalOO.cmj :
-test_is_js.cmj : mt.cmj test_is_js.cmi
-test_js_ffi.cmj :
-test_let.cmj :
-test_list.cmj :
-test_literal.cmj :
-test_literals.cmj : test_literals.cmi
-test_match_exception.cmj :
-test_mutliple.cmj :
-test_nat64.cmj :
-test_nested_let.cmj :
-test_nested_print.cmj :
-test_non_export.cmj :
-test_nullary.cmj :
-test_obj.cmj :
-test_obj_simple_ffi.cmj : ../runtime/js.cmj
-test_order.cmj :
-test_order_tailcall.cmj :
-test_other_exn.cmj :
-test_pack.cmj :
-test_per.cmj :
-test_pervasive.cmj :
-test_pervasives2.cmj :
-test_pervasives3.cmj :
-test_primitive.cmj :
-test_promise_bind.cmj : promise.cmj
-test_ramification.cmj :
-test_react.cmj : ../runtime/js.cmj
-test_react_case.cmj :
-test_regex.cmj :
-test_require.cmj : ../runtime/js.cmj
-test_runtime_encoding.cmj :
-test_scope.cmj :
-test_seq.cmj :
-test_set.cmj :
-test_side_effect_functor.cmj :
-test_simple_include.cmj :
-test_simple_obj.cmj :
-test_simple_pattern_match.cmj :
-test_simple_ref.cmj :
-test_simple_tailcall.cmj :
-test_small.cmj :
-test_sprintf.cmj :
-test_stack.cmj :
-test_static_catch_ident.cmj :
-test_string.cmj :
-test_string_case.cmj :
-test_string_const.cmj : ../runtime/js.cmj
-test_string_map.cmj :
-test_string_switch.cmj :
-test_switch.cmj :
-test_trywith.cmj :
-test_tuple.cmj :
-test_tuple_destructring.cmj :
-test_type_based_arity.cmj : abstract_type.cmj
-test_u.cmj :
-test_unsafe_cmp.cmj : ../runtime/js.cmj
-test_unsafe_obj_ffi.cmj : ../runtime/js.cmj test_unsafe_obj_ffi.cmi
-test_unsafe_obj_ffi_ppx.cmj : ../runtime/js.cmj test_unsafe_obj_ffi_ppx.cmi
-test_unsupported_primitive.cmj :
-test_while_closure.cmj :
-test_while_side_effect.cmj :
-test_zero_nullable.cmj : mt.cmj ../runtime/js.cmj
-testing.cmj : testing.cmi
-tfloat_record_test.cmj : mt_global.cmj mt.cmj float_record.cmj \
-    float_array.cmj
-ticker.cmj :
-to_string_test.cmj : mt.cmj
-topsort_test.cmj :
-tscanf_test.cmj : testing.cmj mt_global.cmj mt.cmj
-tuple_alloc.cmj :
-typeof_test.cmj : mt.cmj ../runtime/js.cmj
-unboxed_attribute_test.cmj :
-uncurry_glob_test.cmj : 
-undef_regression2_test.cmj : mt.cmj ../runtime/js.cmj
-undef_regression_test.cmj : ../runtime/js.cmj ../runtime/caml_obj_extern.cmj
-unicode_type_error.cmj :
-unitest_string.cmj :
-unsafe_obj_external.cmj : ../runtime/js.cmj
-unsafe_ppx_test.cmj : mt.cmj ffi_js_test.cmj
-unsafe_this.cmj : ../runtime/js.cmj unsafe_this.cmi
-update_record_test.cmj : mt.cmj ../runtime/js.cmj
-utf8_decode_test.cmj : mt.cmj ../runtime/js.cmj
-watch_test.cmj : ../others/node.cmj ../runtime/js.cmj
-webpack_config.cmj : ../runtime/js.cmj
diff --git a/jscomp/test/.eslintignore b/jscomp/test/.eslintignore
deleted file mode 100644
index 53ddd05..0000000
--- a/jscomp/test/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-camlPrimitive.js
\ No newline at end of file
diff --git a/jscomp/test/.eslintrc b/jscomp/test/.eslintrc
deleted file mode 100644
index f7fade2..0000000
--- a/jscomp/test/.eslintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*-mode:yaml-*-
-
-rules:
-  no-unused-vars: 0
-env:
-  node: true
-extends: 'eslint:recommended'
diff --git a/jscomp/test/.libdepend b/jscomp/test/.libdepend
deleted file mode 100644
index 85745ba..0000000
--- a/jscomp/test/.libdepend
+++ /dev/null
@@ -1,631 +0,0 @@
-a_recursive_type.cmi :
-abstract_type.cmi :
-ari_regress_test.cmi :
-array_test.cmi :
-basic_module_test.cmi :
-const_block_test.cmi :
-demo_int_map.cmi :
-ext_pervasives.cmi : ../stdlib/int32.cmi ../stdlib/format.cmi
-float_record.cmi :
-inline_edge_cases.cmi :
-inline_map_test.cmi :
-map_test.cmi :
-mt.cmi :
-mt_global.cmi : mt.cmi
-scanf_reference_error_regression_test.cmi :
-test_for_map2.cmi :
-test_is_js.cmi :
-testing.cmi :
-ui_defs.cmi :
-a.cmj : test_order.cmj ../stdlib/string.cmi ../stdlib/set.cmi \
-    ../stdlib/list.cmi
-a.cmx : test_order.cmx ../stdlib/string.cmx ../stdlib/set.cmx \
-    ../stdlib/list.cmx
-a_filename_test.cmj : mt.cmi ext_filename.cmj
-a_filename_test.cmx : mt.cmx ext_filename.cmx
-a_list_test.cmj : mt.cmi ext_list.cmj
-a_list_test.cmx : mt.cmx ext_list.cmx
-a_recursive_type.cmj : a_recursive_type.cmi
-a_recursive_type.cmx : a_recursive_type.cmi
-a_scope_bug.cmj :
-a_scope_bug.cmx :
-a_string_test.cmj : mt.cmi ../stdlib/list.cmi ext_string.cmj
-a_string_test.cmx : mt.cmx ../stdlib/list.cmx ext_string.cmx
-abstract_type.cmj : abstract_type.cmi
-abstract_type.cmx : abstract_type.cmi
-and_or_tailcall_test.cmj : mt.cmi
-and_or_tailcall_test.cmx : mt.cmx
-ari_regress_test.cmj : mt.cmi ari_regress_test.cmi
-ari_regress_test.cmx : mt.cmx ari_regress_test.cmi
-arith_lexer.cmj : ../stdlib/lexing.cmi arith_syntax.cmj arith_parser.cmj
-arith_lexer.cmx : ../stdlib/lexing.cmx arith_syntax.cmx arith_parser.cmx
-arith_parser.cmj : ../stdlib/parsing.cmi ../stdlib/obj.cmi \
-    ../stdlib/lexing.cmi arith_syntax.cmj
-arith_parser.cmx : ../stdlib/parsing.cmx ../stdlib/obj.cmx \
-    ../stdlib/lexing.cmx arith_syntax.cmx
-arith_syntax.cmj :
-arith_syntax.cmx :
-array_test.cmj : ../stdlib/pervasives.cmi mt.cmi ../stdlib/list.cmi \
-    ../stdlib/array.cmi array_test.cmi
-array_test.cmx : ../stdlib/pervasives.cmx mt.cmx ../stdlib/list.cmx \
-    ../stdlib/array.cmx array_test.cmi
-b.cmj :
-b.cmx :
-basic_module_test.cmj : ../stdlib/set.cmi pr6726.cmj offset.cmj \
-    mt_global.cmi mt.cmi basic_module_test.cmi
-basic_module_test.cmx : ../stdlib/set.cmx pr6726.cmx offset.cmx \
-    mt_global.cmx mt.cmx basic_module_test.cmi
-bdd.cmj : ../stdlib/array.cmi
-bdd.cmx : ../stdlib/array.cmx
-bigarray_test.cmj : ../stdlib/int32.cmi ../stdlib/complex.cmi \
-    ../stdlib/bigarray.cmi
-bigarray_test.cmx : ../stdlib/int32.cmx ../stdlib/complex.cmx \
-    ../stdlib/bigarray.cmx
-boolean_test.cmj : test_bool_equal.cmj mt.cmi
-boolean_test.cmx : test_bool_equal.cmx mt.cmx
-buffer_test.cmj : ../stdlib/string.cmi mt.cmi ../stdlib/bytes.cmi \
-    ../stdlib/buffer.cmi
-buffer_test.cmx : ../stdlib/string.cmx mt.cmx ../stdlib/bytes.cmx \
-    ../stdlib/buffer.cmx
-caml_compare_test.cmj : mt.cmi
-caml_compare_test.cmx : mt.cmx
-caml_format_test.cmj : ../stdlib/printf.cmi mt.cmi ../stdlib/int64.cmi \
-    ../stdlib/format.cmi ../stdlib/buffer.cmi ../stdlib/array.cmi
-caml_format_test.cmx : ../stdlib/printf.cmx mt.cmx ../stdlib/int64.cmx \
-    ../stdlib/format.cmx ../stdlib/buffer.cmx ../stdlib/array.cmx
-class3_test.cmj : mt.cmi ../stdlib/list.cmi ../lib/js.cmj \
-    ../stdlib/array.cmi
-class3_test.cmx : mt.cmx ../stdlib/list.cmx ../lib/js.cmx \
-    ../stdlib/array.cmx
-class4_test.cmj : mt.cmi
-class4_test.cmx : mt.cmx
-class5_test.cmj : mt.cmi ../stdlib/list.cmi
-class5_test.cmx : mt.cmx ../stdlib/list.cmx
-class6_test.cmj : mt.cmi
-class6_test.cmx : mt.cmx
-class7_test.cmj : ../stdlib/oo.cmi mt.cmi
-class7_test.cmx : ../stdlib/oo.cmx mt.cmx
-class8_test.cmj : mt.cmi
-class8_test.cmx : mt.cmx
-class_repr.cmj : ../stdlib/oo.cmi
-class_repr.cmx : ../stdlib/oo.cmx
-class_test.cmj : mt.cmi
-class_test.cmx : mt.cmx
-class_type_ffi_test.cmj : ../lib/js.cmj
-class_type_ffi_test.cmx : ../lib/js.cmx
-complex_if_test.cmj : mt.cmi ../stdlib/bytes.cmi
-complex_if_test.cmx : mt.cmx ../stdlib/bytes.cmx
-complex_test.cmj : mt.cmi ../stdlib/complex.cmi
-complex_test.cmx : mt.cmx ../stdlib/complex.cmx
-complex_while_loop.cmj :
-complex_while_loop.cmx :
-const_block_test.cmj : mt.cmi ../stdlib/array.cmi const_block_test.cmi
-const_block_test.cmx : mt.cmx ../stdlib/array.cmx const_block_test.cmi
-const_defs.cmj :
-const_defs.cmx :
-const_defs_test.cmj : const_defs.cmj
-const_defs_test.cmx : const_defs.cmx
-const_test.cmj :
-const_test.cmx :
-cont_int_fold_test.cmj :
-cont_int_fold_test.cmx :
-cps_test.cmj : mt.cmi ../stdlib/array.cmi
-cps_test.cmx : mt.cmx ../stdlib/array.cmx
-cross_module_inline_test.cmj :
-cross_module_inline_test.cmx :
-debug_keep_test.cmj :
-debug_keep_test.cmx :
-debugger_test.cmj : ../lib/js.cmj
-debugger_test.cmx : ../lib/js.cmx
-demo.cmj :
-demo.cmx :
-demo_int_map.cmj : ../stdlib/map.cmi demo_int_map.cmi
-demo_int_map.cmx : ../stdlib/map.cmx demo_int_map.cmi
-demo_page.cmj :
-demo_page.cmx :
-digest_test.cmj : ../stdlib/string.cmi ../stdlib/printf.cmi mt.cmi \
-    ext_array.cmj ../stdlib/digest.cmi ../stdlib/array.cmi
-digest_test.cmx : ../stdlib/string.cmx ../stdlib/printf.cmx mt.cmx \
-    ext_array.cmx ../stdlib/digest.cmx ../stdlib/array.cmx
-empty_obj.cmj :
-empty_obj.cmx :
-epsilon_test.cmj : mt.cmi
-epsilon_test.cmx : mt.cmx
-equal_exception_test.cmj : ../stdlib/string.cmi mt.cmi ../stdlib/bytes.cmi
-equal_exception_test.cmx : ../stdlib/string.cmx mt.cmx ../stdlib/bytes.cmx
-equal_test.cmj :
-equal_test.cmx :
-es6_module_test.cmj : mt.cmi ../stdlib/list.cmi
-es6_module_test.cmx : mt.cmx ../stdlib/list.cmx
-event_ffi.cmj : ../lib/js.cmj ../lib/fn.cmj
-event_ffi.cmx : ../lib/js.cmx ../lib/fn.cmx
-exception_raise_test.cmj : mt.cmi
-exception_raise_test.cmx : mt.cmx
-exception_value_test.cmj :
-exception_value_test.cmx :
-ext_array.cmj : ../stdlib/list.cmi ../stdlib/array.cmi
-ext_array.cmx : ../stdlib/list.cmx ../stdlib/array.cmx
-ext_bytes.cmj : ../stdlib/bytes.cmi
-ext_bytes.cmx : ../stdlib/bytes.cmx
-ext_filename.cmj : ../stdlib/sys.cmi ../stdlib/string.cmi ../stdlib/list.cmi \
-    ../stdlib/filename.cmi ext_string.cmj ext_pervasives.cmi
-ext_filename.cmx : ../stdlib/sys.cmx ../stdlib/string.cmx ../stdlib/list.cmx \
-    ../stdlib/filename.cmx ext_string.cmx ext_pervasives.cmx
-ext_list.cmj : ../stdlib/list.cmi ../stdlib/array.cmi
-ext_list.cmx : ../stdlib/list.cmx ../stdlib/array.cmx
-ext_log.cmj : lam_current_unit.cmj ../stdlib/format.cmi
-ext_log.cmx : lam_current_unit.cmx ../stdlib/format.cmx
-ext_pervasives.cmj : ../stdlib/int32.cmi ../stdlib/format.cmi \
-    ext_pervasives.cmi
-ext_pervasives.cmx : ../stdlib/int32.cmx ../stdlib/format.cmx \
-    ext_pervasives.cmi
-ext_string.cmj : ../stdlib/string.cmi ext_bytes.cmj ../stdlib/char.cmi \
-    ../stdlib/bytes.cmi
-ext_string.cmx : ../stdlib/string.cmx ext_bytes.cmx ../stdlib/char.cmx \
-    ../stdlib/bytes.cmx
-extensible_variant_test.cmj : mt.cmi
-extensible_variant_test.cmx : mt.cmx
-fail_comp.cmj :
-fail_comp.cmx :
-ffi_arity_test.cmj : mt.cmi ../lib/fn.cmj
-ffi_arity_test.cmx : mt.cmx ../lib/fn.cmx
-ffi_js.cmj :
-ffi_js.cmx :
-ffi_test.cmj : ../lib/js.cmj
-ffi_test.cmx : ../lib/js.cmx
-fib.cmj :
-fib.cmx :
-float_array.cmj :
-float_array.cmx :
-float_of_bits_test.cmj : ../stdlib/printf.cmi mt.cmi ../stdlib/list.cmi \
-    ../stdlib/int64.cmi ../stdlib/int32.cmi ../stdlib/array.cmi
-float_of_bits_test.cmx : ../stdlib/printf.cmx mt.cmx ../stdlib/list.cmx \
-    ../stdlib/int64.cmx ../stdlib/int32.cmx ../stdlib/array.cmx
-float_record.cmj : float_record.cmi
-float_record.cmx : float_record.cmi
-float_test.cmj : ../stdlib/printf.cmi ../stdlib/pervasives.cmi mt_global.cmi \
-    mt.cmi ../lib/js.cmj ../stdlib/int64.cmi ../stdlib/array.cmi
-float_test.cmx : ../stdlib/printf.cmx ../stdlib/pervasives.cmx mt_global.cmx \
-    mt.cmx ../lib/js.cmx ../stdlib/int64.cmx ../stdlib/array.cmx
-for_loop_test.cmj : mt.cmi ../stdlib/list.cmi ../stdlib/array.cmi
-for_loop_test.cmx : mt.cmx ../stdlib/list.cmx ../stdlib/array.cmx
-for_side_effect_test.cmj : mt.cmi
-for_side_effect_test.cmx : mt.cmx
-format_regression.cmj :
-format_regression.cmx :
-genlex_test.cmj : ../stdlib/stream.cmi mt.cmi ../stdlib/list.cmi \
-    ../stdlib/genlex.cmi
-genlex_test.cmx : ../stdlib/stream.cmx mt.cmx ../stdlib/list.cmx \
-    ../stdlib/genlex.cmx
-global_exception_regression_test.cmj : mt.cmi
-global_exception_regression_test.cmx : mt.cmx
-google_closure_test.cmj : test_google_closure.cmj mt.cmi
-google_closure_test.cmx : test_google_closure.cmx mt.cmx
-guide_for_ext.cmj :
-guide_for_ext.cmx :
-hamming_test.cmj : ../stdlib/printf.cmi mt.cmi ../stdlib/lazy.cmi \
-    ../stdlib/int64.cmi ../stdlib/buffer.cmi
-hamming_test.cmx : ../stdlib/printf.cmx mt.cmx ../stdlib/lazy.cmx \
-    ../stdlib/int64.cmx ../stdlib/buffer.cmx
-hash_test.cmj : ../stdlib/string.cmi mt_global.cmi mt.cmi \
-    ../stdlib/hashtbl.cmi ../stdlib/char.cmi ../stdlib/array.cmi
-hash_test.cmx : ../stdlib/string.cmx mt_global.cmx mt.cmx \
-    ../stdlib/hashtbl.cmx ../stdlib/char.cmx ../stdlib/array.cmx
-hashtbl_test.cmj : mt.cmi ../stdlib/list.cmi ../stdlib/hashtbl.cmi \
-    ../stdlib/array.cmi
-hashtbl_test.cmx : mt.cmx ../stdlib/list.cmx ../stdlib/hashtbl.cmx \
-    ../stdlib/array.cmx
-inline_edge_cases.cmj : inline_edge_cases.cmi
-inline_edge_cases.cmx : inline_edge_cases.cmi
-inline_map2_test.cmj : mt.cmi ../stdlib/list.cmi
-inline_map2_test.cmx : mt.cmx ../stdlib/list.cmx
-inline_map_test.cmj : mt.cmi ../stdlib/list.cmi inline_map_test.cmi
-inline_map_test.cmx : mt.cmx ../stdlib/list.cmx inline_map_test.cmi
-inline_regression_test.cmj : ../stdlib/string.cmi mt.cmi \
-    ../stdlib/filename.cmi
-inline_regression_test.cmx : ../stdlib/string.cmx mt.cmx \
-    ../stdlib/filename.cmx
-int32_test.cmj : mt.cmi ../stdlib/int32.cmi ../stdlib/format.cmi \
-    ext_array.cmj ../stdlib/array.cmi
-int32_test.cmx : mt.cmx ../stdlib/int32.cmx ../stdlib/format.cmx \
-    ext_array.cmx ../stdlib/array.cmx
-int64_mul_div_test.cmj : ../stdlib/printf.cmi mt.cmi ../stdlib/list.cmi \
-    ../stdlib/int64.cmi ../stdlib/array.cmi
-int64_mul_div_test.cmx : ../stdlib/printf.cmx mt.cmx ../stdlib/list.cmx \
-    ../stdlib/int64.cmx ../stdlib/array.cmx
-int64_test.cmj : ../stdlib/pervasives.cmi ../stdlib/nativeint.cmi mt.cmi \
-    ../lib/js.cmj ../stdlib/int64.cmi ../stdlib/int32.cmi \
-    ../stdlib/format.cmi ext_array.cmj ../stdlib/array.cmi
-int64_test.cmx : ../stdlib/pervasives.cmx ../stdlib/nativeint.cmx mt.cmx \
-    ../lib/js.cmx ../stdlib/int64.cmx ../stdlib/int32.cmx \
-    ../stdlib/format.cmx ext_array.cmx ../stdlib/array.cmx
-int_hashtbl_test.cmj : mt.cmi ../stdlib/list.cmi ../stdlib/hashtbl.cmi \
-    ../stdlib/array.cmi
-int_hashtbl_test.cmx : mt.cmx ../stdlib/list.cmx ../stdlib/hashtbl.cmx \
-    ../stdlib/array.cmx
-int_map.cmj : ../stdlib/map.cmi
-int_map.cmx : ../stdlib/map.cmx
-int_overflow_test.cmj : ../stdlib/string.cmi mt.cmi ../stdlib/int32.cmi \
-    ../stdlib/char.cmi
-int_overflow_test.cmx : ../stdlib/string.cmx mt.cmx ../stdlib/int32.cmx \
-    ../stdlib/char.cmx
-io_test.cmj : ../lib/js.cmj
-io_test.cmx : ../lib/js.cmx
-js_bool_test.cmj : mt.cmi ../lib/js.cmj
-js_bool_test.cmx : mt.cmx ../lib/js.cmx
-js_date.cmj :
-js_date.cmx :
-js_date_test.cmj : mt.cmi js_date.cmj
-js_date_test.cmx : mt.cmx js_date.cmx
-js_obj_test.cmj : mt.cmi
-js_obj_test.cmx : mt.cmx
-js_val.cmj :
-js_val.cmx :
-lam_current_unit.cmj : ../stdlib/string.cmi ../stdlib/filename.cmi
-lam_current_unit.cmx : ../stdlib/string.cmx ../stdlib/filename.cmx
-lam_methname.cmj : ../stdlib/string.cmi ../stdlib/list.cmi \
-    lam_current_unit.cmj ext_string.cmj ext_log.cmj
-lam_methname.cmx : ../stdlib/string.cmx ../stdlib/list.cmx \
-    lam_current_unit.cmx ext_string.cmx ext_log.cmx
-lam_methname_test.cmj : mt.cmi lam_methname.cmj
-lam_methname_test.cmx : mt.cmx lam_methname.cmx
-lazy_test.cmj : mt.cmi ../stdlib/lazy.cmi
-lazy_test.cmx : mt.cmx ../stdlib/lazy.cmx
-lexer_test.cmj : number_lexer.cmj mt.cmi ../stdlib/list.cmi \
-    ../stdlib/lexing.cmi arith_syntax.cmj arith_parser.cmj arith_lexer.cmj
-lexer_test.cmx : number_lexer.cmx mt.cmx ../stdlib/list.cmx \
-    ../stdlib/lexing.cmx arith_syntax.cmx arith_parser.cmx arith_lexer.cmx
-lib_js_test.cmj : mt.cmi ../lib/js.cmj
-lib_js_test.cmx : mt.cmx ../lib/js.cmx
-libarg_test.cmj : ../stdlib/printf.cmi mt.cmi ../stdlib/list.cmi \
-    ../stdlib/arg.cmi
-libarg_test.cmx : ../stdlib/printf.cmx mt.cmx ../stdlib/list.cmx \
-    ../stdlib/arg.cmx
-libqueue_test.cmj : ../stdlib/queue.cmi ../stdlib/list.cmi
-libqueue_test.cmx : ../stdlib/queue.cmx ../stdlib/list.cmx
-limits_test.cmj : mt.cmi ../stdlib/int32.cmi
-limits_test.cmx : mt.cmx ../stdlib/int32.cmx
-list_test.cmj : ../stdlib/pervasives.cmi mt.cmi ../stdlib/list.cmi \
-    ../stdlib/array.cmi
-list_test.cmx : ../stdlib/pervasives.cmx mt.cmx ../stdlib/list.cmx \
-    ../stdlib/array.cmx
-local_exception_test.cmj :
-local_exception_test.cmx :
-loop_regression_test.cmj : mt.cmi
-loop_regression_test.cmx : mt.cmx
-loop_suites_test.cmj : mt.cmi for_loop_test.cmj
-loop_suites_test.cmx : mt.cmx for_loop_test.cmx
-map_find_test.cmj : mt.cmi ../stdlib/map.cmi ../stdlib/list.cmi
-map_find_test.cmx : mt.cmx ../stdlib/map.cmx ../stdlib/list.cmx
-map_test.cmj : ../stdlib/string.cmi ../stdlib/pervasives.cmi mt.cmi \
-    ../stdlib/map.cmi ../stdlib/list.cmi map_test.cmi
-map_test.cmx : ../stdlib/string.cmx ../stdlib/pervasives.cmx mt.cmx \
-    ../stdlib/map.cmx ../stdlib/list.cmx map_test.cmi
-mock_mt.cmj : mt.cmi ../stdlib/list.cmi ../lib/js.cmj
-mock_mt.cmx : mt.cmx ../stdlib/list.cmx ../lib/js.cmx
-module_alias.cmj : ../stdlib/pervasives.cmi ../stdlib/list.cmi
-module_alias.cmx : ../stdlib/pervasives.cmx ../stdlib/list.cmx
-module_parameter_test.cmj : ../stdlib/string.cmi mt.cmi
-module_parameter_test.cmx : ../stdlib/string.cmx mt.cmx
-mt.cmj : ../stdlib/list.cmi mt.cmi
-mt.cmx : ../stdlib/list.cmx mt.cmi
-mt_global.cmj : mt.cmi mt_global.cmi
-mt_global.cmx : mt.cmx mt_global.cmi
-number_lexer.cmj : ../stdlib/sys.cmi ../stdlib/lexing.cmi
-number_lexer.cmx : ../stdlib/sys.cmx ../stdlib/lexing.cmx
-obj_magic_test.cmj : ../stdlib/obj.cmi mt.cmi
-obj_magic_test.cmx : ../stdlib/obj.cmx mt.cmx
-obj_test.cmj : mt.cmi
-obj_test.cmx : mt.cmx
-of_string_test.cmj : mt.cmi
-of_string_test.cmx : mt.cmx
-offset.cmj : ../stdlib/string.cmi ../stdlib/set.cmi
-offset.cmx : ../stdlib/string.cmx ../stdlib/set.cmx
-pq_test.cmj :
-pq_test.cmx :
-pr6726.cmj :
-pr6726.cmx :
-pr_regression_test.cmj : mt.cmi
-pr_regression_test.cmx : mt.cmx
-primitive_reg_test.cmj :
-primitive_reg_test.cmx :
-print_alpha_test.cmj : mt.cmi ../lib/js.cmj
-print_alpha_test.cmx : mt.cmx ../lib/js.cmx
-printf_sim.cmj : ../stdlib/printf.cmi
-printf_sim.cmx : ../stdlib/printf.cmx
-printf_test.cmj : ../stdlib/printf.cmi mt.cmi ../stdlib/format.cmi
-printf_test.cmx : ../stdlib/printf.cmx mt.cmx ../stdlib/format.cmx
-qcc.cmj : ../stdlib/sys.cmi ../stdlib/string.cmi ../stdlib/printf.cmi \
-    ../stdlib/list.cmi ../stdlib/char.cmi ../stdlib/bytes.cmi \
-    ../stdlib/array.cmi
-qcc.cmx : ../stdlib/sys.cmx ../stdlib/string.cmx ../stdlib/printf.cmx \
-    ../stdlib/list.cmx ../stdlib/char.cmx ../stdlib/bytes.cmx \
-    ../stdlib/array.cmx
-queue_test.cmj : ../stdlib/queue.cmi mt.cmi ../stdlib/array.cmi
-queue_test.cmx : ../stdlib/queue.cmx mt.cmx ../stdlib/array.cmx
-random_test.cmj : ../stdlib/random.cmi ../stdlib/printf.cmi mt_global.cmi \
-    mt.cmi ../stdlib/int64.cmi ../stdlib/array.cmi
-random_test.cmx : ../stdlib/random.cmx ../stdlib/printf.cmx mt_global.cmx \
-    mt.cmx ../stdlib/int64.cmx ../stdlib/array.cmx
-rec_module_test.cmj : ../stdlib/set.cmi ../stdlib/pervasives.cmi mt.cmi
-rec_module_test.cmx : ../stdlib/set.cmx ../stdlib/pervasives.cmx mt.cmx
-rec_value_test.cmj : mt.cmi ../stdlib/list.cmi ../stdlib/lazy.cmi
-rec_value_test.cmx : mt.cmx ../stdlib/list.cmx ../stdlib/lazy.cmx
-record_with_test.cmj : mt.cmi
-record_with_test.cmx : mt.cmx
-regression_print.cmj :
-regression_print.cmx :
-runtime_encoding_test.cmj :
-runtime_encoding_test.cmx :
-scanf_io.cmj : testing.cmi ../stdlib/string.cmi ../stdlib/scanf.cmi \
-    ../stdlib/printf.cmi ../stdlib/list.cmi ../stdlib/digest.cmi \
-    ../stdlib/buffer.cmi
-scanf_io.cmx : testing.cmx ../stdlib/string.cmx ../stdlib/scanf.cmx \
-    ../stdlib/printf.cmx ../stdlib/list.cmx ../stdlib/digest.cmx \
-    ../stdlib/buffer.cmx
-scanf_reference_error_regression_test.cmj : ../stdlib/scanf.cmi \
-    ../stdlib/printf.cmi mt_global.cmi mt.cmi ../stdlib/list.cmi \
-    scanf_reference_error_regression_test.cmi
-scanf_reference_error_regression_test.cmx : ../stdlib/scanf.cmx \
-    ../stdlib/printf.cmx mt_global.cmx mt.cmx ../stdlib/list.cmx \
-    scanf_reference_error_regression_test.cmi
-scanf_test.cmj : ../stdlib/scanf.cmi mt_global.cmi mt.cmi
-scanf_test.cmx : ../stdlib/scanf.cmx mt_global.cmx mt.cmx
-shift_test.cmj : ../stdlib/nativeint.cmi
-shift_test.cmx : ../stdlib/nativeint.cmx
-simple_lexer_test.cmj : ../stdlib/string.cmi mt.cmi ../stdlib/lexing.cmi
-simple_lexer_test.cmx : ../stdlib/string.cmx mt.cmx ../stdlib/lexing.cmx
-small_inline_test.cmj :
-small_inline_test.cmx :
-sprintf_reg_test.cmj : ../stdlib/printf.cmi mt_global.cmi mt.cmi
-sprintf_reg_test.cmx : ../stdlib/printf.cmx mt_global.cmx mt.cmx
-stack_comp_test.cmj : ../stdlib/stack.cmi mt_global.cmi mt.cmi
-stack_comp_test.cmx : ../stdlib/stack.cmx mt_global.cmx mt.cmx
-stack_test.cmj : ../stdlib/stack.cmi mt.cmi ../stdlib/list.cmi
-stack_test.cmx : ../stdlib/stack.cmx mt.cmx ../stdlib/list.cmx
-string_get_set_test.cmj : mt.cmi
-string_get_set_test.cmx : mt.cmx
-string_literal_print_test.cmj : mt.cmi
-string_literal_print_test.cmx : mt.cmx
-string_runtime_test.cmj : ../stdlib/string.cmi mt.cmi ../stdlib/list.cmi \
-    ../runtime/caml_string.cmi ../stdlib/bytes.cmi
-string_runtime_test.cmx : ../stdlib/string.cmx mt.cmx ../stdlib/list.cmx \
-    ../runtime/caml_string.cmx ../stdlib/bytes.cmx
-string_test.cmj : ../stdlib/string.cmi mt.cmi ../stdlib/list.cmi \
-    ext_string.cmj ../stdlib/bytes.cmi
-string_test.cmx : ../stdlib/string.cmx mt.cmx ../stdlib/list.cmx \
-    ext_string.cmx ../stdlib/bytes.cmx
-stringmatch_test.cmj : ../stdlib/string.cmi
-stringmatch_test.cmx : ../stdlib/string.cmx
-swap_test.cmj : ../stdlib/printf.cmi mt.cmi ../stdlib/list.cmi \
-    ../stdlib/int64.cmi ../stdlib/int32.cmi ../stdlib/format.cmi \
-    ../stdlib/array.cmi
-swap_test.cmx : ../stdlib/printf.cmx mt.cmx ../stdlib/list.cmx \
-    ../stdlib/int64.cmx ../stdlib/int32.cmx ../stdlib/format.cmx \
-    ../stdlib/array.cmx
-tailcall_inline_test.cmj : mt.cmi ../stdlib/array.cmi
-tailcall_inline_test.cmx : mt.cmx ../stdlib/array.cmx
-test_alias.cmj : test_global_print.cmj
-test_alias.cmx : test_global_print.cmx
-test_ari.cmj : ../stdlib/list.cmi
-test_ari.cmx : ../stdlib/list.cmx
-test_array.cmj : ../stdlib/array.cmi
-test_array.cmx : ../stdlib/array.cmx
-test_array_append.cmj : ../stdlib/array.cmi
-test_array_append.cmx : ../stdlib/array.cmx
-test_array_primitive.cmj : ../stdlib/array.cmi
-test_array_primitive.cmx : ../stdlib/array.cmx
-test_bool_equal.cmj :
-test_bool_equal.cmx :
-test_bug.cmj : ../stdlib/bytes.cmi
-test_bug.cmx : ../stdlib/bytes.cmx
-test_bytes.cmj : ../stdlib/bytes.cmi
-test_bytes.cmx : ../stdlib/bytes.cmx
-test_char.cmj :
-test_char.cmx :
-test_closure.cmj : ../stdlib/array.cmi
-test_closure.cmx : ../stdlib/array.cmx
-test_common.cmj :
-test_common.cmx :
-test_const_elim.cmj :
-test_const_elim.cmx :
-test_const_propogate.cmj :
-test_const_propogate.cmx :
-test_cps.cmj : ../stdlib/array.cmi
-test_cps.cmx : ../stdlib/array.cmx
-test_demo.cmj : ../stdlib/list.cmi
-test_demo.cmx : ../stdlib/list.cmx
-test_dup_param.cmj :
-test_dup_param.cmx :
-test_eq.cmj :
-test_eq.cmx :
-test_exception.cmj : test_common.cmj
-test_exception.cmx : test_common.cmx
-test_exception_escape.cmj :
-test_exception_escape.cmx :
-test_export2.cmj :
-test_export2.cmx :
-test_external.cmj :
-test_external.cmx :
-test_external_unit.cmj :
-test_external_unit.cmx :
-test_ffi.cmj :
-test_ffi.cmx :
-test_fib.cmj :
-test_fib.cmx :
-test_filename.cmj : ../stdlib/list.cmi ../stdlib/filename.cmi
-test_filename.cmx : ../stdlib/list.cmx ../stdlib/filename.cmx
-test_for_loop.cmj : ../stdlib/array.cmi
-test_for_loop.cmx : ../stdlib/array.cmx
-test_for_map.cmj : ../stdlib/map.cmi
-test_for_map.cmx : ../stdlib/map.cmx
-test_for_map2.cmj : int_map.cmj test_for_map2.cmi
-test_for_map2.cmx : int_map.cmx test_for_map2.cmi
-test_format.cmj : ../stdlib/format.cmi
-test_format.cmx : ../stdlib/format.cmx
-test_formatter.cmj :
-test_formatter.cmx :
-test_functor_dead_code.cmj : ../stdlib/string.cmi ../stdlib/map.cmi
-test_functor_dead_code.cmx : ../stdlib/string.cmx ../stdlib/map.cmx
-test_generative_module.cmj :
-test_generative_module.cmx :
-test_global_print.cmj : ../stdlib/list.cmi ../stdlib/hashtbl.cmi
-test_global_print.cmx : ../stdlib/list.cmx ../stdlib/hashtbl.cmx
-test_google_closure.cmj : ../lib/js.cmj ../stdlib/array.cmi
-test_google_closure.cmx : ../lib/js.cmx ../stdlib/array.cmx
-test_include.cmj : test_order.cmj ../stdlib/string.cmi ../stdlib/set.cmi \
-    ../stdlib/list.cmi
-test_include.cmx : test_order.cmx ../stdlib/string.cmx ../stdlib/set.cmx \
-    ../stdlib/list.cmx
-test_incomplete.cmj :
-test_incomplete.cmx :
-test_incr_ref.cmj :
-test_incr_ref.cmx :
-test_int_map_find.cmj : ../stdlib/map.cmi ../stdlib/list.cmi
-test_int_map_find.cmx : ../stdlib/map.cmx ../stdlib/list.cmx
-test_internalOO.cmj : ../stdlib/sys.cmi ../stdlib/string.cmi \
-    ../stdlib/obj.cmi ../stdlib/map.cmi ../stdlib/list.cmi ../stdlib/char.cmi \
-    ../stdlib/array.cmi
-test_internalOO.cmx : ../stdlib/sys.cmx ../stdlib/string.cmx \
-    ../stdlib/obj.cmx ../stdlib/map.cmx ../stdlib/list.cmx ../stdlib/char.cmx \
-    ../stdlib/array.cmx
-test_is_js.cmj : test_is_js.cmi
-test_is_js.cmx : test_is_js.cmi
-test_js_ffi.cmj : ../stdlib/string.cmi ../stdlib/set.cmi
-test_js_ffi.cmx : ../stdlib/string.cmx ../stdlib/set.cmx
-test_let.cmj :
-test_let.cmx :
-test_list.cmj : ../stdlib/list.cmi
-test_list.cmx : ../stdlib/list.cmx
-test_literal.cmj :
-test_literal.cmx :
-test_match_exception.cmj :
-test_match_exception.cmx :
-test_nat64.cmj :
-test_nat64.cmx :
-test_nested_let.cmj :
-test_nested_let.cmx :
-test_nested_print.cmj :
-test_nested_print.cmx :
-test_non_export.cmj : ../stdlib/string.cmi ../stdlib/set.cmi
-test_non_export.cmx : ../stdlib/string.cmx ../stdlib/set.cmx
-test_nullary.cmj :
-test_nullary.cmx :
-test_obj.cmj :
-test_obj.cmx :
-test_obj_simple_ffi.cmj :
-test_obj_simple_ffi.cmx :
-test_order.cmj : ../stdlib/pervasives.cmi
-test_order.cmx : ../stdlib/pervasives.cmx
-test_order_tailcall.cmj :
-test_order_tailcall.cmx :
-test_pack.cmj :
-test_pack.cmx :
-test_per.cmj : ../stdlib/camlinternalFormatBasics.cmi
-test_per.cmx : ../stdlib/camlinternalFormatBasics.cmx
-test_pervasive.cmj : ../stdlib/pervasives.cmi ../stdlib/list.cmi
-test_pervasive.cmx : ../stdlib/pervasives.cmx ../stdlib/list.cmx
-test_pervasives2.cmj : ../stdlib/stack.cmi ../stdlib/pervasives.cmi \
-    ../stdlib/list.cmi
-test_pervasives2.cmx : ../stdlib/stack.cmx ../stdlib/pervasives.cmx \
-    ../stdlib/list.cmx
-test_pervasives3.cmj : ../stdlib/pervasives.cmi ../stdlib/list.cmi
-test_pervasives3.cmx : ../stdlib/pervasives.cmx ../stdlib/list.cmx
-test_primitive.cmj : ../stdlib/string.cmi ../stdlib/lazy.cmi \
-    ../stdlib/array.cmi
-test_primitive.cmx : ../stdlib/string.cmx ../stdlib/lazy.cmx \
-    ../stdlib/array.cmx
-test_ramification.cmj :
-test_ramification.cmx :
-test_react.cmj :
-test_react.cmx :
-test_react_case.cmj :
-test_react_case.cmx :
-test_runtime_encoding.cmj : ../stdlib/array.cmi
-test_runtime_encoding.cmx : ../stdlib/array.cmx
-test_scope.cmj :
-test_scope.cmx :
-test_seq.cmj : ../stdlib/printf.cmi
-test_seq.cmx : ../stdlib/printf.cmx
-test_set.cmj : ../stdlib/list.cmi
-test_set.cmx : ../stdlib/list.cmx
-test_side_effect_functor.cmj :
-test_side_effect_functor.cmx :
-test_simple_include.cmj : ../stdlib/array.cmi
-test_simple_include.cmx : ../stdlib/array.cmx
-test_simple_obj.cmj :
-test_simple_obj.cmx :
-test_simple_pattern_match.cmj : ../stdlib/sys.cmi
-test_simple_pattern_match.cmx : ../stdlib/sys.cmx
-test_simple_ref.cmj :
-test_simple_ref.cmx :
-test_simple_tailcall.cmj :
-test_simple_tailcall.cmx :
-test_small.cmj :
-test_small.cmx :
-test_sprintf.cmj : ../stdlib/printf.cmi
-test_sprintf.cmx : ../stdlib/printf.cmx
-test_stack.cmj : ../stdlib/stack.cmi
-test_stack.cmx : ../stdlib/stack.cmx
-test_static_catch_ident.cmj :
-test_static_catch_ident.cmx :
-test_string.cmj : ../stdlib/string.cmi ../stdlib/bytes.cmi
-test_string.cmx : ../stdlib/string.cmx ../stdlib/bytes.cmx
-test_string_case.cmj :
-test_string_case.cmx :
-test_string_const.cmj : ../stdlib/string.cmi
-test_string_const.cmx : ../stdlib/string.cmx
-test_string_map.cmj : ../stdlib/map.cmi
-test_string_map.cmx : ../stdlib/map.cmx
-test_string_switch.cmj : ../stdlib/sys.cmi
-test_string_switch.cmx : ../stdlib/sys.cmx
-test_switch.cmj :
-test_switch.cmx :
-test_trywith.cmj :
-test_trywith.cmx :
-test_tuple.cmj :
-test_tuple.cmx :
-test_tuple_destructring.cmj :
-test_tuple_destructring.cmx :
-test_type_based_arity.cmj : abstract_type.cmi
-test_type_based_arity.cmx : abstract_type.cmx
-test_u.cmj :
-test_u.cmx :
-test_unsupported_primitive.cmj : ../stdlib/bytes.cmi
-test_unsupported_primitive.cmx : ../stdlib/bytes.cmx
-test_while_closure.cmj : ../stdlib/array.cmi
-test_while_closure.cmx : ../stdlib/array.cmx
-test_while_side_effect.cmj :
-test_while_side_effect.cmx :
-test_zero_nullable.cmj : mt.cmi ../lib/js.cmj
-test_zero_nullable.cmx : mt.cmx ../lib/js.cmx
-testing.cmj : ../stdlib/scanf.cmi ../stdlib/printf.cmi testing.cmi
-testing.cmx : ../stdlib/scanf.cmx ../stdlib/printf.cmx testing.cmi
-tfloat_record_test.cmj : mt_global.cmi mt.cmi ../stdlib/format.cmi \
-    float_record.cmi float_array.cmj ../stdlib/buffer.cmi ../stdlib/array.cmi
-tfloat_record_test.cmx : mt_global.cmx mt.cmx ../stdlib/format.cmx \
-    float_record.cmx float_array.cmx ../stdlib/buffer.cmx ../stdlib/array.cmx
-ticker.cmj : ../stdlib/string.cmi ../stdlib/printf.cmi \
-    ../stdlib/pervasives.cmi ../stdlib/map.cmi ../stdlib/list.cmi
-ticker.cmx : ../stdlib/string.cmx ../stdlib/printf.cmx \
-    ../stdlib/pervasives.cmx ../stdlib/map.cmx ../stdlib/list.cmx
-to_string_test.cmj : mt.cmi
-to_string_test.cmx : mt.cmx
-tscanf_test.cmj : testing.cmi ../stdlib/string.cmi ../stdlib/scanf.cmi \
-    ../stdlib/printf.cmi ../stdlib/nativeint.cmi mt_global.cmi mt.cmi \
-    ../stdlib/list.cmi ../stdlib/int64.cmi ../stdlib/int32.cmi \
-    ../stdlib/buffer.cmi
-tscanf_test.cmx : testing.cmx ../stdlib/string.cmx ../stdlib/scanf.cmx \
-    ../stdlib/printf.cmx ../stdlib/nativeint.cmx mt_global.cmx mt.cmx \
-    ../stdlib/list.cmx ../stdlib/int64.cmx ../stdlib/int32.cmx \
-    ../stdlib/buffer.cmx
-tuple_alloc.cmj :
-tuple_alloc.cmx :
-typeof_test.cmj : mt.cmi ../lib/js.cmj
-typeof_test.cmx : mt.cmx ../lib/js.cmx
-undef_regression_test.cmj : ../lib/js.cmj
-undef_regression_test.cmx : ../lib/js.cmx
-unitest_string.cmj :
-unitest_string.cmx :
-unsafe_ppx_test.cmj : mt.cmi ffi_js.cmj
-unsafe_ppx_test.cmx : mt.cmx ffi_js.cmx
diff --git a/jscomp/test/406_primitive_test.js b/jscomp/test/406_primitive_test.js
deleted file mode 100644
index 63c11c6..0000000
--- a/jscomp/test/406_primitive_test.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-eq("File \"406_primitive_test.res\", line 13, characters 3-10", 32, 32);
-
-var backend_type = {
-  TAG: "Other",
-  _0: "BS"
-};
-
-eq("File \"406_primitive_test.res\", line 23, characters 3-10", backend_type, {
-      TAG: "Other",
-      _0: "BS"
-    });
-
-function f(param) {
-  var A = /* @__PURE__ */Caml_exceptions.create("A");
-  try {
-    for(var i = 0; i <= 200; ++i){
-      if (i === 10) {
-        throw {
-              RE_EXN_ID: A,
-              _1: 0,
-              Error: new Error()
-            };
-      }
-      
-    }
-    return ;
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === A) {
-      return ;
-    }
-    throw exn;
-  }
-}
-
-Mt.from_pair_suites("406_primitive_test", suites.contents);
-
-var v = 32;
-
-var max_array_length = /* Max_wosize */2147483647;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.v = v;
-exports.backend_type = backend_type;
-exports.max_array_length = max_array_length;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/406_primitive_test.res b/jscomp/test/406_primitive_test.res
deleted file mode 100644
index e2664f8..0000000
--- a/jscomp/test/406_primitive_test.res
+++ /dev/null
@@ -1,36 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-
-let test_id = ref(0)
-
-let eq = (loc, x, y): unit => Mt.eq_suites(~test_id, loc, ~suites, x, y)
-
-external int_size: unit => int = "%int_size"
-
-external max_wosize: unit => int = "%max_wosize"
-
-let v = int_size() /* 32 on JS */
-
-eq(__LOC__, v, 32)
-type backend_type =
-  | Native
-  | Bytecode
-  | Other(string)
-
-external get_backend_type: unit => backend_type = "%backend_type"
-let backend_type = get_backend_type()
-
-let max_array_length = max_wosize()
-eq(__LOC__, backend_type, Other("BS"))
-
-let f = () => {
-  exception A(int)
-  try for i in 0 to 200 {
-    if i == 10 {
-      raise(A(0))
-    }
-  } catch {
-  | A(_) => ()
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/AsInUncurriedExternals.js b/jscomp/test/AsInUncurriedExternals.js
deleted file mode 100644
index e41fb64..0000000
--- a/jscomp/test/AsInUncurriedExternals.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function mo(prim0, prim1) {
-  return {
-          objectMode: false,
-          name: prim0,
-          someOther: true
-        };
-}
-
-var options = {
-  objectMode: false,
-  name: "foo",
-  someOther: true
-};
-
-function shouldNotFail(objectMode, name) {
-  return 3;
-}
-
-exports.mo = mo;
-exports.options = options;
-exports.shouldNotFail = shouldNotFail;
-/* No side effect */
diff --git a/jscomp/test/AsInUncurriedExternals.res b/jscomp/test/AsInUncurriedExternals.res
deleted file mode 100644
index e04cdc6..0000000
--- a/jscomp/test/AsInUncurriedExternals.res
+++ /dev/null
@@ -1,16 +0,0 @@
-@@uncurried
-
-@obj
-external makeOptions: (
-  ~objectMode: @as(json`false`) _,
-  ~name: string,
-  ~someOther: @as(json`true`) _,
-  unit,
-) => int = ""
-
-let mo = makeOptions
-
-let options = mo(~name="foo", ())
-
-let shouldNotFail: (~objectMode: @as(json`false`) _, ~name: string) => int = (~objectMode, ~name) =>
-  3
diff --git a/jscomp/test/Coercion.js b/jscomp/test/Coercion.js
deleted file mode 100644
index 7e2ca2c..0000000
--- a/jscomp/test/Coercion.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function foo(x) {
-  return x;
-}
-
-var x = 1;
-
-var xx = 1;
-
-exports.x = x;
-exports.xx = xx;
-exports.foo = foo;
-/* No side effect */
diff --git a/jscomp/test/Coercion.res b/jscomp/test/Coercion.res
deleted file mode 100644
index d7c89f7..0000000
--- a/jscomp/test/Coercion.res
+++ /dev/null
@@ -1,11 +0,0 @@
-let x = 1
-
-let xx = (x :> float)
-
-type r1 = {x:int}
-type r2 = {x:int}
-
-type t1 = array<r1>
-type t2 = array<r2>
-
-let foo = (x: t1) => { x :> t2 }
diff --git a/jscomp/test/DerivingAccessorsCurried.js b/jscomp/test/DerivingAccessorsCurried.js
deleted file mode 100644
index eccd00c..0000000
--- a/jscomp/test/DerivingAccessorsCurried.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function myField(param) {
-  return param.myField;
-}
-
-function num(param_0) {
-  return {
-          TAG: "Num",
-          _0: param_0
-        };
-}
-
-function doubleNum(param_0, param_1) {
-  return {
-          TAG: "DoubleNum",
-          _0: param_0,
-          _1: param_1
-        };
-}
-
-function compose(a, accessor) {
-  return Curry._1(accessor, a);
-}
-
-var _composedMyField = 1;
-
-var _composedNum = {
-  TAG: "Num",
-  _0: 1
-};
-
-var noParam = "NoParam";
-
-var _myFieldAlias = myField;
-
-var _noParamAlias = "NoParam";
-
-var _numAlias = num;
-
-var _doubleNumAlias = doubleNum;
-
-exports.myField = myField;
-exports.noParam = noParam;
-exports.num = num;
-exports.doubleNum = doubleNum;
-exports._myFieldAlias = _myFieldAlias;
-exports._noParamAlias = _noParamAlias;
-exports._numAlias = _numAlias;
-exports._doubleNumAlias = _doubleNumAlias;
-exports.compose = compose;
-exports._composedMyField = _composedMyField;
-exports._composedNum = _composedNum;
-/* No side effect */
diff --git a/jscomp/test/DerivingAccessorsCurried.res b/jscomp/test/DerivingAccessorsCurried.res
deleted file mode 100644
index 80ff7ef..0000000
--- a/jscomp/test/DerivingAccessorsCurried.res
+++ /dev/null
@@ -1,21 +0,0 @@
-//Assert that deriving accessors does not break
-//In curried mode
-
-@deriving(accessors)
-type myRecord = { myField: int }
-
-@deriving(accessors)
-type variant = | NoParam | Num(int) | DoubleNum(int, int)
-
-//Asserts the correct signature for derived accessor
-let _myFieldAlias: myRecord => int = myField
-let _noParamAlias: variant = noParam
-let _numAlias: int => variant = num
-let _doubleNumAlias: (int, int) => variant = doubleNum
-
-//Asserts that inference works when composing
-//with derived functions
-let compose = (a, accessor) => accessor(a)
-let _composedMyField = compose({ myField: 1 }, myField)
-let _composedNum = compose(1, num)
-
diff --git a/jscomp/test/DerivingAccessorsUncurried.js b/jscomp/test/DerivingAccessorsUncurried.js
deleted file mode 100644
index e4c47c8..0000000
--- a/jscomp/test/DerivingAccessorsUncurried.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function myField(param) {
-  return param.myField;
-}
-
-function num(param_0) {
-  return {
-          TAG: "Num",
-          _0: param_0
-        };
-}
-
-function doubleNum(param_0, param_1) {
-  return {
-          TAG: "DoubleNum",
-          _0: param_0,
-          _1: param_1
-        };
-}
-
-function compose(a, accessor) {
-  return accessor(a);
-}
-
-var _composedMyField = 1;
-
-var _composedNum = {
-  TAG: "Num",
-  _0: 1
-};
-
-var noParam = "NoParam";
-
-var _myFieldAlias = myField;
-
-var _noParamAlias = "NoParam";
-
-var _numAlias = num;
-
-var _doubleNumAlias = doubleNum;
-
-exports.myField = myField;
-exports.noParam = noParam;
-exports.num = num;
-exports.doubleNum = doubleNum;
-exports._myFieldAlias = _myFieldAlias;
-exports._noParamAlias = _noParamAlias;
-exports._numAlias = _numAlias;
-exports._doubleNumAlias = _doubleNumAlias;
-exports.compose = compose;
-exports._composedMyField = _composedMyField;
-exports._composedNum = _composedNum;
-/* No side effect */
diff --git a/jscomp/test/DerivingAccessorsUncurried.res b/jscomp/test/DerivingAccessorsUncurried.res
deleted file mode 100644
index 130f82c..0000000
--- a/jscomp/test/DerivingAccessorsUncurried.res
+++ /dev/null
@@ -1,22 +0,0 @@
-//Assert that deriving accessors does not break
-//In uncurried mode
-@@uncurried
-
-@deriving(accessors)
-type myRecord = { myField: int }
-
-@deriving(accessors)
-type variant = | NoParam | Num(int) | DoubleNum(int, int)
-
-//Asserts the correct signature for derived accessor
-let _myFieldAlias: myRecord => int = myField
-let _noParamAlias: variant = noParam
-let _numAlias: int => variant = num
-let _doubleNumAlias: (int, int) => variant = doubleNum
-
-//Asserts that inference works when composing
-//with derived functions
-let compose = (a, accessor) => accessor(a)
-let _composedMyField = compose({ myField: 1 }, myField)
-let _composedNum = compose(1, num)
-
diff --git a/jscomp/test/DerivingAccessorsUnurried.js b/jscomp/test/DerivingAccessorsUnurried.js
deleted file mode 100644
index eccd00c..0000000
--- a/jscomp/test/DerivingAccessorsUnurried.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function myField(param) {
-  return param.myField;
-}
-
-function num(param_0) {
-  return {
-          TAG: "Num",
-          _0: param_0
-        };
-}
-
-function doubleNum(param_0, param_1) {
-  return {
-          TAG: "DoubleNum",
-          _0: param_0,
-          _1: param_1
-        };
-}
-
-function compose(a, accessor) {
-  return Curry._1(accessor, a);
-}
-
-var _composedMyField = 1;
-
-var _composedNum = {
-  TAG: "Num",
-  _0: 1
-};
-
-var noParam = "NoParam";
-
-var _myFieldAlias = myField;
-
-var _noParamAlias = "NoParam";
-
-var _numAlias = num;
-
-var _doubleNumAlias = doubleNum;
-
-exports.myField = myField;
-exports.noParam = noParam;
-exports.num = num;
-exports.doubleNum = doubleNum;
-exports._myFieldAlias = _myFieldAlias;
-exports._noParamAlias = _noParamAlias;
-exports._numAlias = _numAlias;
-exports._doubleNumAlias = _doubleNumAlias;
-exports.compose = compose;
-exports._composedMyField = _composedMyField;
-exports._composedNum = _composedNum;
-/* No side effect */
diff --git a/jscomp/test/DictInference.js b/jscomp/test/DictInference.js
deleted file mode 100644
index 2181998..0000000
--- a/jscomp/test/DictInference.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Js_dict = require("../../lib/js/js_dict.js");
-
-var dict = {};
-
-dict["someKey1"] = 1;
-
-dict["someKey2"] = 2;
-
-var asArray = Js_dict.values(dict);
-
-exports.dict = dict;
-exports.asArray = asArray;
-/*  Not a pure module */
diff --git a/jscomp/test/DictInference.res b/jscomp/test/DictInference.res
deleted file mode 100644
index cabae91..0000000
--- a/jscomp/test/DictInference.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let dict = Js.Dict.empty()
-dict->Js.Dict.set("someKey1", 1)
-dict->Js.Dict.set("someKey2", 2)
-let asArray = dict->Js.Dict.values
diff --git a/jscomp/test/DisambiguateOptionalFields.js b/jscomp/test/DisambiguateOptionalFields.js
deleted file mode 100644
index 8d6a849..0000000
--- a/jscomp/test/DisambiguateOptionalFields.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f1(v) {
-  return v.x;
-}
-
-function f2(v) {
-  return v.x;
-}
-
-var v = {
-  x: 3,
-  y: 4
-};
-
-var res = 3;
-
-exports.f1 = f1;
-exports.f2 = f2;
-exports.v = v;
-exports.res = res;
-/* No side effect */
diff --git a/jscomp/test/DisambiguateOptionalFields.res b/jscomp/test/DisambiguateOptionalFields.res
deleted file mode 100644
index 8a4b6e7..0000000
--- a/jscomp/test/DisambiguateOptionalFields.res
+++ /dev/null
@@ -1,8 +0,0 @@
-type t1 = {x:int, y:int}
-type t2 = {x:int, y:int, z?:int}
-
-let f1 = (v:t1) => v.x
-let f2 = (v:t2) => v.x
-
-let v = {x:3, y:4}
-let res = f2(v) // Check that t2 shadows t1
diff --git a/jscomp/test/DotDotDot.js b/jscomp/test/DotDotDot.js
deleted file mode 100644
index f95e0bd..0000000
--- a/jscomp/test/DotDotDot.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var MultipleDotDotDots = {
-  x: {
-    x: 10,
-    y: "abc"
-  }
-};
-
-var v = {
-  x: 10,
-  y: "",
-  z: ""
-};
-
-var v2 = {
-  x: 10,
-  y: "",
-  z: "",
-  v: 1.0,
-  w: 2.0
-};
-
-var x = {
-  name: "test",
-  x: "test"
-};
-
-exports.v = v;
-exports.v2 = v2;
-exports.x = x;
-exports.MultipleDotDotDots = MultipleDotDotDots;
-/* No side effect */
diff --git a/jscomp/test/DotDotDot.res b/jscomp/test/DotDotDot.res
deleted file mode 100644
index 0a0cf79..0000000
--- a/jscomp/test/DotDotDot.res
+++ /dev/null
@@ -1,48 +0,0 @@
-type a = {x: int}
-
-type b = {...a, y: string}
-
-type c = {...b, z: string}
-
-let v: c = {x: 10, y: "", z: ""}
-
-type vw = {v: float, w: float}
-
-type cvw = {...c, ...vw}
-
-let v2: cvw = {x: 10, y: "", z: "", v: 1.0, w: 2.0}
-
-type globalProps = {
-  id?: string,
-  name?: string,
-  title?: string,
-  className?: string,
-}
-
-type anchorProps = {
-  ...globalProps,
-  download?: string,
-  href?: string,
-  target?: [#_self | #_blank | #_parent | #_top],
-}
-
-// globalProps only case?
-type divProps = {...globalProps}
-
-type svgProps = {
-  ...globalProps,
-  x?: string,
-  y?: string,
-}
-
-let x: svgProps = {x: "test", name: "test"}
-
-// uncomment this to reveal a parser error
-// type copiedSvgProps = {...svgProps}
-
-module MultipleDotDotDots = {
-  type t1 = {x: int}
-  type t2 = {y: string}
-  type t = {...t1, ...t2}
-  let x: t = {x: 10, y: "abc"}
-}
diff --git a/jscomp/test/EmptyRecord.js b/jscomp/test/EmptyRecord.js
deleted file mode 100644
index 5d56a17..0000000
--- a/jscomp/test/EmptyRecord.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function construct(b) {
-  if (b) {
-    return {
-            n: 0
-          };
-  } else {
-    return {};
-  }
-}
-
-var er = {};
-
-exports.construct = construct;
-exports.er = er;
-/* No side effect */
diff --git a/jscomp/test/EmptyRecord.res b/jscomp/test/EmptyRecord.res
deleted file mode 100644
index 3d93961..0000000
--- a/jscomp/test/EmptyRecord.res
+++ /dev/null
@@ -1,10 +0,0 @@
-type allOptRec = {n?: int, s?:string}
-
-let construct = (b) => b ? {n:0} : {}
-
-// let z = {}
-// Error: Empty record literal {} should be type annotated or used in a record context.
-
-type emptyrec = {}
-
-let er : emptyrec = {}
\ No newline at end of file
diff --git a/jscomp/test/FFI.js b/jscomp/test/FFI.js
deleted file mode 100644
index 1aafaec..0000000
--- a/jscomp/test/FFI.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var canUseCanvas = (function canUseCanvas() {
-    return !!document.createElement('canvas').getContext;
-  });
-
-var add = ((x,y)=>x+y);
-
-exports.canUseCanvas = canUseCanvas;
-exports.add = add;
-/* No side effect */
diff --git a/jscomp/test/FFI.res b/jscomp/test/FFI.res
deleted file mode 100644
index 5639b4a..0000000
--- a/jscomp/test/FFI.res
+++ /dev/null
@@ -1,9 +0,0 @@
-@@uncurried
-
-let canUseCanvas: unit => bool = %ffi(`
-  function canUseCanvas() {
-    return !!document.createElement('canvas').getContext;
-  }
-`)
-
-let add: (int, int) => int = %ffi(`(x,y)=>x+y`)
diff --git a/jscomp/test/Import.js b/jscomp/test/Import.js
deleted file mode 100644
index 4336162..0000000
--- a/jscomp/test/Import.js
+++ /dev/null
@@ -1,156 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-async function eachIntAsync(list, f) {
-  return Curry._2(await import("../../lib/js/belt_List.js").then(function (m) {
-                  return m.forEach;
-                }), list, f);
-}
-
-function eachIntLazy(list, f) {
-  var obj = import("../../lib/js/belt_List.js").then(function (m) {
-        return m.forEach;
-      });
-  var arg1 = function (each) {
-    return Promise.resolve(Curry._2(each, list, f));
-  };
-  return obj.then(arg1);
-}
-
-eachIntLazy({
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: /* [] */0
-        }
-      }
-    }, (function (n) {
-        console.log("lazy", n);
-      }));
-
-eachIntAsync({
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: /* [] */0
-        }
-      }
-    }, (function (n) {
-        console.log("async", n);
-      }));
-
-var beltAsModule = await import("../../lib/js/belt_List.js");
-
-var M = await import("../../lib/js/belt_List.js");
-
-var N0 = await import("../../lib/js/belt_List.js");
-
-var O = await import("../../lib/js/belt_List.js");
-
-var N1_each = O.forEach;
-
-var N1 = {
-  O: O,
-  each: N1_each
-};
-
-var N2 = await import("../../lib/js/belt_List.js");
-
-var N_each = N2.forEach;
-
-var N = {
-  N0: N0,
-  N1: N1,
-  N2: N2,
-  each: N_each
-};
-
-var M0 = await import("../../lib/js/belt_List.js");
-
-var M1 = await import("../../lib/js/belt_List.js");
-
-async function f(param) {
-  return (await import("../../lib/js/belt_List.js")).forEach;
-}
-
-async function f1(param) {
-  return (await import("../../lib/js/belt_List.js")).forEach;
-}
-
-async function f2(param) {
-  var M3 = await import("../../lib/js/belt_List.js");
-  var M4 = await import("../../lib/js/belt_List.js");
-  return [
-          M3.forEach,
-          M4.forEach
-        ];
-}
-
-async function f3(param) {
-  var M3 = await import("../../lib/js/belt_List.js");
-  var M4 = await import("../../lib/js/belt_List.js");
-  return [
-          M3.forEach,
-          M4.forEach
-        ];
-}
-
-async function f4(param) {
-  return (await import("../../lib/js/belt_Array.js")).forEach;
-}
-
-async function f5(param) {
-  var A = await import("../../lib/js/belt_Array.js");
-  var O = await import("../../lib/js/belt_Option.js");
-  return [
-          A.forEach,
-          O.forEach
-        ];
-}
-
-async function f6(param) {
-  var MS = await import("../../lib/js/belt_MapString.js");
-  var A = await import("../../lib/js/belt_Array.js");
-  return [
-          0,
-          MS.forEach,
-          A.forEach
-        ];
-}
-
-async function f7(param) {
-  await import("../../lib/js/belt_MapInt.js");
-  return 1;
-}
-
-var each = M1.forEach;
-
-var M2;
-
-var each2 = O.forEach;
-
-exports.eachIntAsync = eachIntAsync;
-exports.eachIntLazy = eachIntLazy;
-exports.beltAsModule = beltAsModule;
-exports.M = M;
-exports.N = N;
-exports.M0 = M0;
-exports.M1 = M1;
-exports.each = each;
-exports.M2 = M2;
-exports.each2 = each2;
-exports.f = f;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.f5 = f5;
-exports.f6 = f6;
-exports.f7 = f7;
-/*  Not a pure module */
diff --git a/jscomp/test/Import.res b/jscomp/test/Import.res
deleted file mode 100644
index 5b8097b..0000000
--- a/jscomp/test/Import.res
+++ /dev/null
@@ -1,92 +0,0 @@
-let eachIntAsync = async (list: list<int>, f: int => unit) => {
-  list->(await Js.import(Belt.List.forEach))(f)
-}
-
-let eachIntLazy = (list: list<int>, f: int => unit) =>
-  Js.import(Belt.List.forEach) |> Js.Promise.then_(each => list->each(f)->Js.Promise.resolve)
-
-let _ = list{1, 2, 3}->eachIntLazy(n => Js.log2("lazy", n))
-let _ = list{1, 2, 3}->eachIntAsync(n => Js.log2("async", n))
-
-module type BeltList = module type of Belt.List
-let beltAsModule = await Js.import(module(Belt.List: BeltList))
-
-// module type BeltList0 = module type of Belt.List
-// module M = unpack(@res.await Js.import(module(Belt.List: BeltList0)))
-module M = await Belt.List
-let each = M.forEach
-
-module N = {
-  module N0 = await Belt.List
-  let each = N0.forEach
-
-  module N1 = {
-    module O = await Belt.List
-    let each = O.forEach
-  }
-
-  module N2 = await Belt.List
-  let each = N2.forEach
-}
-
-module M0 = await Belt.List
-let each = M0.forEach
-
-module M1 = await Belt.List
-let each = M1.forEach
-
-module M2 = N.N1.O
-let each2 = M2.forEach
-
-let f = async () => {
-  module M3 = await Belt.List
-  M3.forEach
-}
-
-let f1 = async () => {
-  module M3 = await (Belt.List: BeltList)
-  M3.forEach
-}
-
-let f2 = async () => {
-  module M3 = await (Belt.List: BeltList)
-  module M4 = await (Belt.List: BeltList)
-  (M3.forEach, M4.forEach)
-}
-
-let f3 = async () => {
-  module M3 = await Belt.List
-  module M4 = await Belt.List
-  (M3.forEach, M4.forEach)
-}
-
-let f4 = async () => {
-  module A = await Belt.Array
-  A.forEach
-}
-
-let f5 = async () => {
-  module A = await Belt.Array
-  module O = await Belt.Option
-  (A.forEach, O.forEach)
-}
-
-let f6 = async () => {
-  let a = 0
-  and b = {
-    module MS = await Belt.Map.String
-    MS.forEach
-  }
-  module A = await Belt.Array
-  (a, b, A.forEach)
-}
-
-let f7 = async () => {
-  if true {
-    module MI = await Belt.Map.Int
-    1
-  } else {
-    module MI = await Belt.Map.Dict
-    0
-  }
-}
diff --git a/jscomp/test/ImportAttributes.js b/jscomp/test/ImportAttributes.js
deleted file mode 100644
index 5efa401..0000000
--- a/jscomp/test/ImportAttributes.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var MyCssCss = require("./myCss.css");
-var MyJsonJson = require("./myJson.json").default;
-
-var myJson = MyJsonJson;
-
-console.log(myJson);
-
-var buttonCss = MyCssCss.button;
-
-console.log(buttonCss);
-
-exports.myJson = myJson;
-exports.buttonCss = buttonCss;
-/* myJson Not a pure module */
diff --git a/jscomp/test/ImportAttributes.mjs b/jscomp/test/ImportAttributes.mjs
deleted file mode 100644
index bc0f964..0000000
--- a/jscomp/test/ImportAttributes.mjs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as MyCssCss from "./myCss.css" with {"type": "css", "some-identifier": "yep"};
-import MyJsonJson from "./myJson.json" with {"type": "json", "some-identifier": "yep"};
-
-var myJson = MyJsonJson;
-
-console.log(myJson);
-
-var buttonCss = MyCssCss.button;
-
-console.log(buttonCss);
-
-export {
-  myJson ,
-  buttonCss ,
-}
-/* myJson Not a pure module */
diff --git a/jscomp/test/ImportAttributes.res b/jscomp/test/ImportAttributes.res
deleted file mode 100644
index 2a70431..0000000
--- a/jscomp/test/ImportAttributes.res
+++ /dev/null
@@ -1,11 +0,0 @@
-@@config({flags: ["-bs-package-output", "es6:jscomp/test:.mjs"]})
-
-@module({from: "./myJson.json", with: {type_: "json", \"some-identifier": "yep"}})
-external myJson: Js.Json.t = "default"
-
-Js.log(myJson)
-
-@module({from: "./myCss.css", with: {type_: "css", \"some-identifier": "yep"}})
-external buttonCss: string = "button"
-
-Js.log(buttonCss)
diff --git a/jscomp/test/RecordCoercion.js b/jscomp/test/RecordCoercion.js
deleted file mode 100644
index ea6d174..0000000
--- a/jscomp/test/RecordCoercion.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var TestInlining_a = {
-  number: 42,
-  name: "a"
-};
-
-var TestInlining = {
-  a: TestInlining_a,
-  name: "a"
-};
-
-exports.TestInlining = TestInlining;
-/* No side effect */
diff --git a/jscomp/test/RecordCoercion.res b/jscomp/test/RecordCoercion.res
deleted file mode 100644
index edb5c08..0000000
--- a/jscomp/test/RecordCoercion.res
+++ /dev/null
@@ -1,33 +0,0 @@
-type r1 = {a: option<int>, b: int}
-
-type r2 = {a?: int, b: int}
-
-type r3 = {a?: int}
-
-type r4 = {}
-
-// let _ = (x: r1) => (x :> r2) // Convert a from mandatory to optional NOT ALLOWED
-// let _ = (x: r2) => (x :> r1) can't turn an optional field to a mandatory one
-let _ = (x: r2) => (x :> r3) // can omit field
-// let _ = (x: r1) => (x :> r3) // omit field and convert from mandatory to optional NOT ALLOWED
-let _ = (x: r3) => (x :> r4) // omit everything
-
-type nested1 = {n: r2, extra: int}
-type nested2 = {n: r3}
-let _ = (x: nested1) => (x :> nested2)
-
-module TestInlining = {
-  type a = {
-    number: int,
-    name: string,
-  }
-
-  type b = {name: string}
-
-  let a: a = {
-    number: 42,
-    name: "a",
-  }
-
-  let name = (a :> b).name
-}
diff --git a/jscomp/test/RecordOrObject.js b/jscomp/test/RecordOrObject.js
deleted file mode 100644
index c972f75..0000000
--- a/jscomp/test/RecordOrObject.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var vxy = {
-  x: 10,
-  y: "abc"
-};
-
-var xxi = {
-  x: 10
-};
-
-exports.vxy = vxy;
-exports.xxi = xxi;
-/* No side effect */
diff --git a/jscomp/test/RecordOrObject.res b/jscomp/test/RecordOrObject.res
deleted file mode 100644
index 24de115..0000000
--- a/jscomp/test/RecordOrObject.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type rx = {x: int}
-type ry = {y: string}
-type rxi = {...rx, i?:int}
-type rxy = {...rx, ...ry} // this is a record
-
-let vxy: rxy = {x: 10, y: "abc"}
-let xxi : rxi = {x:10}
-
-type ox = {"x": int}
-type oy = {"y": int}
-type oxz = {...ox, "z": int}
-type oxy = {...ox, ...oy} // this starts as a record but type checking infers that it is an object
diff --git a/jscomp/test/SafePromises.js b/jscomp/test/SafePromises.js
deleted file mode 100644
index 8e6e7fa..0000000
--- a/jscomp/test/SafePromises.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Js_promise2 = require("../../lib/js/js_promise2.js");
-
-async function nestedPromise(xxx) {
-  var xx = await xxx;
-  Js_promise2.then(xx, (function (x) {
-          return Promise.resolve((console.log("Promise2.then", x), undefined));
-        }));
-  Js_promise2.$$catch(xx, (function (x) {
-          console.log("Promise2.catch_", x);
-          return Promise.resolve(0);
-        }));
-  var arg1 = function (x) {
-    return Promise.resolve((console.log("Promise.then_", x), undefined));
-  };
-  xx.then(arg1);
-}
-
-async function create(x) {
-  console.log("create", x);
-  return x;
-}
-
-var xx = create(10);
-
-var xxx = create(xx);
-
-nestedPromise(xxx);
-
-exports.nestedPromise = nestedPromise;
-exports.create = create;
-exports.xx = xx;
-exports.xxx = xxx;
-/* xx Not a pure module */
diff --git a/jscomp/test/SafePromises.res b/jscomp/test/SafePromises.res
deleted file mode 100644
index 8b18ca8..0000000
--- a/jscomp/test/SafePromises.res
+++ /dev/null
@@ -1,23 +0,0 @@
-/*** Problematic example of nested promises is safe with Js.Promise2 */
-
-let nestedPromise = async (xxx: promise<promise<int>>) => {
-  let xx = await xxx
-
-  let _ = xx->Js.Promise2.then(x => Js.log2("Promise2.then", x) |> Js.Promise.resolve)
-  let _ = xx->Js.Promise2.catch(x => {
-    Js.log2("Promise2.catch_", x)
-    0 |> Js.Promise.resolve
-  })
-
-  // This crashes
-  let _ = Js.Promise.then_(x => Js.log2("Promise.then_", x) |> Js.Promise.resolve, xx)
-}
-
-let create = async (x) => {
-  Js.log2("create", x)
-  x
-}
-
-let xx = create(10)
-let xxx = create(xx)
-let _ = nestedPromise(xxx)
diff --git a/jscomp/test/UncurriedAlways.js b/jscomp/test/UncurriedAlways.js
deleted file mode 100644
index e197d22..0000000
--- a/jscomp/test/UncurriedAlways.js
+++ /dev/null
@@ -1,229 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function foo(x, y) {
-  return x + y | 0;
-}
-
-var z = 7;
-
-function bar(x, y) {
-  return x + y | 0;
-}
-
-var b = 7;
-
-var w = 7;
-
-var a = 7;
-
-console.log(a);
-
-[1].map(function (x) {
-      return x + 1 | 0;
-    });
-
-function ptl(extra) {
-  return 10 + extra | 0;
-}
-
-function foo2(x, y) {
-  return x + y | 0;
-}
-
-function bar2(__x) {
-  return __x + 3 | 0;
-}
-
-function foo3(x, y, z) {
-  return (x + y | 0) + z | 0;
-}
-
-function bar3(__x) {
-  return foo3(__x, 3, 4);
-}
-
-function q(param) {
-  return null;
-}
-
-function inl() {
-  
-}
-
-function inl2(x, y) {
-  return x + y | 0;
-}
-
-function foo$1(x, y, z) {
-  return [
-          x,
-          y,
-          z
-        ];
-}
-
-function ptl$1(none, extra) {
-  return [
-          none,
-          "y",
-          extra
-        ];
-}
-
-var a1 = [
-  "x",
-  "y",
-  "z"
-];
-
-console.log("a1:", a1);
-
-var AllLabels = {
-  foo: foo$1,
-  ptl: ptl$1,
-  a1: a1
-};
-
-function foo$2(x, y, z, dOpt) {
-  var d = dOpt !== undefined ? dOpt : "d=0";
-  return [
-          x,
-          y,
-          z,
-          d
-        ];
-}
-
-function ptl$2(none, extra, extra$1) {
-  return foo$2(none, "y", extra, extra$1);
-}
-
-var b1 = ptl$2("x", "z", undefined);
-
-console.log("b1:", b1);
-
-var b2 = ptl$2("x", "z", "d<-100");
-
-console.log("b2:", b2);
-
-var OptAtEnd = {
-  foo: foo$2,
-  ptl: ptl$2,
-  b1: b1,
-  b2: b2
-};
-
-function foo$3(d1Opt, x, d2Opt, y, d3Opt, z, d4Opt, w, d5Opt) {
-  var d1 = d1Opt !== undefined ? d1Opt : "d1=0";
-  var d2 = d2Opt !== undefined ? d2Opt : "d2=0";
-  var d3 = d3Opt !== undefined ? d3Opt : "d3=0";
-  var d4 = d4Opt !== undefined ? d4Opt : "d4=0";
-  var d5 = d5Opt !== undefined ? d5Opt : "d5=0";
-  return [
-          d1,
-          x,
-          d2,
-          y,
-          d3,
-          z,
-          d4,
-          w,
-          d5
-        ];
-}
-
-function ptl$3(none, none$1, none$2, none$3, none$4, none$5, extra) {
-  return foo$3(none, none$1, none$2, "y", none$3, none$4, none$5, "w", extra);
-}
-
-var c1 = ptl$3(undefined, "x", undefined, undefined, "z", undefined, undefined);
-
-console.log("c1:", c1);
-
-var c2 = ptl$3("d1<-100", "x", undefined, undefined, "z", undefined, undefined);
-
-console.log("c2:", c2);
-
-var c3 = ptl$3(undefined, "x", "d2<-200", undefined, "z", "d4<-400", undefined);
-
-console.log("c3:", c3);
-
-var OptMixed = {
-  foo: foo$3,
-  ptl: ptl$3,
-  c1: c1,
-  c2: c2,
-  c3: c3
-};
-
-function fn(cb) {
-  return cb();
-}
-
-((function (s) {
-        console.log({
-              NAME: "foo",
-              VAL: s
-            });
-      })());
-
-function fn1(a, b, param) {
-  return a() + b | 0;
-}
-
-function a$1(__x) {
-  return fn1((function () {
-                return 1;
-              }), 2, __x);
-}
-
-function f3(x, y, z) {
-  console.log(x);
-  return (x + y | 0) + z | 0;
-}
-
-function fx(extra, extra$1) {
-  return f3(1, extra, extra$1);
-}
-
-function fy(none, extra) {
-  return f3(none, 1, extra);
-}
-
-function fz(none, none$1) {
-  return f3(none, none$1, 1);
-}
-
-var fxyz = f3(1, 1, 1);
-
-var PartialApplication = {
-  f3: f3,
-  fx: fx,
-  fy: fy,
-  fz: fz,
-  fxyz: fxyz
-};
-
-exports.foo = foo;
-exports.z = z;
-exports.bar = bar;
-exports.b = b;
-exports.w = w;
-exports.ptl = ptl;
-exports.foo2 = foo2;
-exports.bar2 = bar2;
-exports.foo3 = foo3;
-exports.bar3 = bar3;
-exports.q = q;
-exports.inl = inl;
-exports.inl2 = inl2;
-exports.AllLabels = AllLabels;
-exports.OptAtEnd = OptAtEnd;
-exports.OptMixed = OptMixed;
-exports.fn = fn;
-exports.fn1 = fn1;
-exports.a = a$1;
-exports.PartialApplication = PartialApplication;
-/*  Not a pure module */
diff --git a/jscomp/test/UncurriedAlways.res b/jscomp/test/UncurriedAlways.res
deleted file mode 100644
index a8872f6..0000000
--- a/jscomp/test/UncurriedAlways.res
+++ /dev/null
@@ -1,92 +0,0 @@
-@@uncurried
-
-let foo = (x, y) => x + y
-
-let z = foo(. 3, 4)
-
-let bar = (. x, y) => x + y
-
-let b = bar(3, 4)
-
-let w = 3->foo(4)
-
-let a = 3->foo(. 4)
-
-Js.log(a) // Test automatic uncurried application
-
-let _ = Js.Array2.map([1], (. x) => x + 1)
-
-let ptl = @res.partial foo(10) // force partial application
-
-let foo2 = (x, y) => x + y
-let bar2: _ => _ = foo2(_, 3)
-
-let foo3 = (x, y, z) => x + y + z
-let bar3: _ => _ = foo3(_, 3, 4)
-
-type cmp = Jsx.component<int>
-let q: cmp = _ => Jsx.null // Check that subtyping works past type definitions
-
-@inline
-let inl = () => ()
-
-@inline
-let inl2 = (x,y) => x+y
-
-module AllLabels = {
-  let foo = (~x, ~y, ~z) => (x, y, z)
-
-  let ptl = foo(~y="y", ...)
-
-  let a1 = ptl(~x="x", ~z="z")
-  Js.log2("a1:", a1)
-}
-
-module OptAtEnd = {
-  let foo = (~x, ~y, ~z, ~d="d=0") => (x, y, z, d)
-
-  let ptl = foo(~y="y", ...)
-
-  let b1 = ptl(~x="x", ~z="z")
-  Js.log2("b1:", b1)
-  let b2 = ptl(~x="x", ~z="z", ~d="d<-100")
-  Js.log2("b2:", b2)
-}
-
-module OptMixed = {
-  let foo = (~d1="d1=0", ~x, ~d2="d2=0",  ~y, ~d3="d3=0", ~z, ~d4="d4=0", ~w, ~d5="d5=0") => (d1, x, d2, y, d3, z, d4, w, d5)
-
-  let ptl = foo(~y="y", ~w="w", ...)
-
-  let c1 = ptl(~x="x", ~z="z")
-  Js.log2("c1:", c1)
-  let c2 = ptl(~x="x", ~z="z", ~d1="d1<-100")
-  Js.log2("c2:", c2)
-  let c3 = ptl(~x="x", ~z="z", ~d2="d2<-200", ~d4="d4<-400")
-  Js.log2("c3:", c3)
-}
-
-let fn = cb => {
-  cb()
-}
-
-fn(s => Js.log(#foo(s)))
-
-let fn1 = (a, b, ()) => a() + b 
-
-let a = fn1(() => 1, 2, _)
-
-module PartialApplication = {
-  let f3 = (~x, ~y, ~z) => {
-    Js.log(x)
-    x + y + z
-  }
-
-  let fx = f3(~x=1, ...)
-
-  let fy = f3(~y=1, ...)
-
-  let fz = f3(~z=1, ...)
-
-  let fxyz = f3(~x=1, ~y=1, ~z=1, ...)
-}
diff --git a/jscomp/test/UncurriedExternals.js b/jscomp/test/UncurriedExternals.js
deleted file mode 100644
index 651a1f3..0000000
--- a/jscomp/test/UncurriedExternals.js
+++ /dev/null
@@ -1,158 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var React = require("react");
-
-function dd(param) {
-  throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
-}
-
-var h = sum(1.0, 2.0);
-
-var M = {
-  sum: (function (prim0, prim1) {
-      return sum(prim0, prim1);
-    })
-};
-
-var hh = M.sum(1.0, 2.0);
-
-var mf = 3 % 4;
-
-function tg(arr) {
-  return arr[0];
-}
-
-var tc = Object.assign({}, "abc");
-
-var te = {
-  RE_EXN_ID: "Not_found"
-};
-
-var tcr = {};
-
-function tsiC(c) {
-  c.increment = (function (amount) {
-      var me = this ;
-      console.log(me);
-    });
-}
-
-function tsiU(c) {
-  c.increment = (function (amount) {
-      var me = this ;
-      console.log(me);
-    });
-}
-
-var match = React.useState(function (param) {
-      return 3;
-    });
-
-var StandardNotation_get = match[0];
-
-var StandardNotation_set = match[1];
-
-var StandardNotation = {
-  dd: dd,
-  h: h,
-  M: M,
-  hh: hh,
-  mf: mf,
-  tg: tg,
-  tc: tc,
-  te: te,
-  tcr: tcr,
-  tsiC: tsiC,
-  tsiU: tsiU,
-  get: StandardNotation_get,
-  set: StandardNotation_set
-};
-
-function methodWithAsync(param) {
-  var $$this = this ;
-  return (async function (arg) {
-              return $$this + arg | 0;
-            })(param);
-}
-
-function dd$1(param) {
-  throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
-}
-
-var h$1 = sum(1.0, 2.0);
-
-var M$1 = {
-  sum: (function (prim0, prim1) {
-      return sum(prim0, prim1);
-    })
-};
-
-var hh$1 = M$1.sum(1.0, 2.0);
-
-var mf$1 = 3 % 4;
-
-function tg$1(arr) {
-  return arr[0];
-}
-
-var tc$1 = Object.assign({}, "abc");
-
-var te$1 = {
-  RE_EXN_ID: "Not_found"
-};
-
-var tcr$1 = {};
-
-function tsiC$1(c) {
-  c.increment = (function (amount) {
-      var me = this ;
-      console.log(me);
-    });
-}
-
-function tsiU$1(c) {
-  c.increment = (function (amount) {
-      var me = this ;
-      console.log(me);
-    });
-}
-
-var match$1 = React.useState(function () {
-      return 3;
-    });
-
-function methodWithAsyncU() {
-  var $$this = this ;
-  return async function (arg) {
-    return $$this + arg | 0;
-  };
-}
-
-var get = match$1[0];
-
-var set = match$1[1];
-
-exports.StandardNotation = StandardNotation;
-exports.methodWithAsync = methodWithAsync;
-exports.dd = dd$1;
-exports.h = h$1;
-exports.M = M$1;
-exports.hh = hh$1;
-exports.mf = mf$1;
-exports.tg = tg$1;
-exports.tc = tc$1;
-exports.te = te$1;
-exports.tcr = tcr$1;
-exports.tsiC = tsiC$1;
-exports.tsiU = tsiU$1;
-exports.get = get;
-exports.set = set;
-exports.methodWithAsyncU = methodWithAsyncU;
-/* h Not a pure module */
diff --git a/jscomp/test/UncurriedExternals.res b/jscomp/test/UncurriedExternals.res
deleted file mode 100644
index baf95a0..0000000
--- a/jscomp/test/UncurriedExternals.res
+++ /dev/null
@@ -1,84 +0,0 @@
-module StandardNotation = {
-  external raise: (. exn) => 'a = "%raise"
-  let dd = () => raise(. Not_found)
-
-  @val external sum: (. float, float) => float = "sum"
-  let h = sum(. 1.0, 2.0)
-
-  module M: {
-    let sum: (. float, float) => float
-  } = {
-    external sum: (. float, float) => float = "sum"
-  }
-  let hh = M.sum(. 1.0, 2.0)
-
-  external mod_float: (. float, float) => float = "?fmod_float"
-  let mf = mod_float(. 3., 4.)
-
-  @get_index external get: (. array<string>, int) => option<'a> = ""
-  let tg = arr => arr->get(. 0)
-
-  @val external copy: (. @as(json`{}`) _, string) => string = "Object.assign"
-  let tc = copy(. "abc")
-
-  external toException: (. exn) => exn = "%identity"
-  let te = toException(. Not_found)
-
-  @obj external ccreate: (. unit) => string = ""
-  let tcr = ccreate(.)
-
-  type counter
-  @set external setIncrementC: (counter, @this (counter, int) => unit) => unit = "increment"
-  let tsiC = c => setIncrementC(c, @this (me, amount) => Js.log(me))
-  @set external setIncrementU: (. counter, @this (. counter, int) => unit) => unit = "increment"
-  let tsiU = c => setIncrementU(.c, @this (. me, amount) => Js.log(me))
-
-  @module("react")
-  external useState: (@uncurry (unit => 'state)) => ('state, ('state => 'state) => unit) =
-    "useState"
-  let (get, set) = useState(() => 3)
-}
-
-let methodWithAsync = @this this => async arg => this + arg
-
-@@uncurried.swap
-
-external raise: exn => 'a = "%raise"
-let dd = (. ()) => raise(Not_found)
-
-@val external sum: (float, float) => float = "sum"
-let h = sum(1.0, 2.0)
-
-module M: {
-  let sum: (float, float) => float
-} = {
-  external sum: (float, float) => float = "sum"
-}
-let hh = M.sum(1.0, 2.0)
-
-external mod_float: (float, float) => float = "?fmod_float"
-let mf = mod_float(3., 4.)
-
-@get_index external get: (array<string>, int) => option<'a> = ""
-let tg = arr => arr->get(0)
-
-@val external copy: (@as(json`{}`) _, string) => string = "Object.assign"
-let tc = copy("abc")
-
-external toException: exn => exn = "%identity"
-let te = toException(Not_found)
-
-@obj external ucreate: unit => string = ""
-let tcr = ucreate()
-
-type counter
-@set external setIncrementC: (. counter, @this (. counter, int) => unit) => unit = "increment"
-let tsiC = c => setIncrementC(.c, @this (. me, amount) => Js.log(. me))
-@set external setIncrementU: (counter, @this (counter, int) => unit) => unit = "increment"
-let tsiU = c => setIncrementU(c, @this (me, amount) => Js.log(. me))
-
-@module("react")
-external useState: (@uncurry (unit => 'state)) => ('state, ('state => 'state) => unit) = "useState"
-let (get, set) = useState(() => 3)
-
-let methodWithAsyncU = @this this => async arg => this + arg
diff --git a/jscomp/test/UncurriedPervasives.js b/jscomp/test/UncurriedPervasives.js
deleted file mode 100644
index 9bb777e..0000000
--- a/jscomp/test/UncurriedPervasives.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function n(prim) {
-  
-}
-
-exports.n = n;
-/* No side effect */
diff --git a/jscomp/test/UncurriedPervasives.res b/jscomp/test/UncurriedPervasives.res
deleted file mode 100644
index 5edc7ad..0000000
--- a/jscomp/test/UncurriedPervasives.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@@uncurried
-let n : _ => unit = ignore // Check that we're pulling in uncurried pervasives
diff --git a/jscomp/test/UntaggedVariants.js b/jscomp/test/UntaggedVariants.js
deleted file mode 100644
index b7ee19f..0000000
--- a/jscomp/test/UntaggedVariants.js
+++ /dev/null
@@ -1,674 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Js_dict = require("../../lib/js/js_dict.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function classify(x) {
-  if (x === "A" && typeof x !== "number") {
-    return "A";
-  } else if (typeof x === "number") {
-    return "An integer";
-  } else {
-    return "A string" + x;
-  }
-}
-
-function classify2(x) {
-  if (typeof x === "string") {
-    return "A string" + x;
-  } else {
-    return "A float";
-  }
-}
-
-function cls(x) {
-  if (typeof x !== "object") {
-    if (x === "One") {
-      return "one";
-    } else {
-      return "two";
-    }
-  } else {
-    return "object" + x.y;
-  }
-}
-
-var ListWithTuples = {};
-
-var ListWithObjects = {};
-
-function tuplesToObjects(l) {
-  if (Array.isArray(l)) {
-    return {
-            hd: l[0],
-            tl: tuplesToObjects(l[1])
-          };
-  } else {
-    return null;
-  }
-}
-
-var l1 = [
-  1,
-  [
-    2,
-    [
-      3,
-      undefined
-    ]
-  ]
-];
-
-var l2 = tuplesToObjects(l1);
-
-console.log("l1", l1);
-
-console.log("l2", l2);
-
-function isTrue(x) {
-  if (typeof x !== "object") {
-    return true;
-  } else {
-    return x.flag;
-  }
-}
-
-var Truthy = {
-  isTrue: isTrue
-};
-
-function classify$1(x) {
-  if (x === null || typeof x !== "object") {
-    if (x === null) {
-      return "null";
-    } else {
-      return "undefined";
-    }
-  } else {
-    return "object" + x.name;
-  }
-}
-
-var TwoObjects = {
-  classify: classify$1
-};
-
-function classify$2(x) {
-  if (x === "A" || x === "B") {
-    if (x === "A") {
-      return "a";
-    } else {
-      return "b";
-    }
-  }
-  console.log(x);
-  return "Unknown";
-}
-
-var Unknown = {
-  classify: classify$2
-};
-
-function classify$3(x) {
-  if (typeof x !== "object" && typeof x !== "number" && (x === "C" || x === "B" || x === "A" || x === "D")) {
-    switch (x) {
-      case "A" :
-          return "a";
-      case "B" :
-          return "b";
-      case "C" :
-          return "c";
-      case "D" :
-          return "d";
-      
-    }
-  } else {
-    switch (typeof x) {
-      case "string" :
-          return "string";
-      case "number" :
-          return "int";
-      case "object" :
-          return "Object" + x.name;
-      
-    }
-  }
-}
-
-var MultipleBlocks = {
-  classify: classify$3
-};
-
-function classify$4(x) {
-  switch (typeof x) {
-    case "string" :
-        return "string";
-    case "number" :
-        return "int";
-    case "object" :
-        return "Object" + x.name;
-    
-  }
-}
-
-var OnlyBlocks = {
-  classify: classify$4
-};
-
-function classify$5(x) {
-  if (Array.isArray(x)) {
-    return "array";
-  }
-  switch (typeof x) {
-    case "string" :
-        return "string";
-    case "number" :
-        return "int";
-    case "object" :
-        return "Object" + x.name;
-    
-  }
-}
-
-var WithArray = {
-  classify: classify$5
-};
-
-function classify$6(x) {
-  if (!Array.isArray(x) && (x === null || typeof x !== "object") && typeof x !== "number" && typeof x !== "string") {
-    switch (x) {
-      case false :
-          return "JSONFalse";
-      case true :
-          return "JSONTrue";
-      case null :
-          return "JSONNull";
-      
-    }
-  } else {
-    if (Array.isArray(x)) {
-      return {
-              TAG: "JSONArray",
-              _0: x
-            };
-    }
-    switch (typeof x) {
-      case "string" :
-          return {
-                  TAG: "JSONString",
-                  _0: x
-                };
-      case "number" :
-          return {
-                  TAG: "JSONNumber",
-                  _0: x
-                };
-      case "object" :
-          return {
-                  TAG: "JSONObject",
-                  _0: x
-                };
-      
-    }
-  }
-}
-
-var Json = {
-  classify: classify$6
-};
-
-function check(s, y) {
-  if (!Array.isArray(s)) {
-    return 42;
-  }
-  var x = s[0];
-  if (!Array.isArray(x)) {
-    return 42;
-  }
-  var tmp = s[1];
-  if (Array.isArray(tmp) || x === y) {
-    return 42;
-  } else {
-    return 41;
-  }
-}
-
-var TrickyNested = {
-  check: check
-};
-
-function checkEnum(e) {
-  if (!(e === "Two" || e === "One" || e === "Three")) {
-    return "Something else..." + e;
-  }
-  switch (e) {
-    case "One" :
-        return "One!";
-    case "Two" :
-        return "Two";
-    case "Three" :
-        return "Threeeee";
-    
-  }
-}
-
-var OverlapString = {
-  checkEnum: checkEnum
-};
-
-function checkEnum$1(e) {
-  if (!(e === "Two" || e === 1.0 || e === "Three")) {
-    return "Something else...";
-  }
-  switch (e) {
-    case 1.0 :
-        return "One!";
-    case "Two" :
-        return "Two";
-    case "Three" :
-        return "Threeeee";
-    
-  }
-}
-
-var OverlapNumber = {
-  checkEnum: checkEnum$1
-};
-
-function checkEnum$2(e) {
-  if (!(e === null || typeof e !== "object")) {
-    return "Object...";
-  }
-  switch (e) {
-    case null :
-        return "One!";
-    case "Two" :
-        return "Two";
-    case "Three" :
-        return "Threeeee";
-    
-  }
-}
-
-var OverlapObject = {
-  checkEnum: checkEnum$2
-};
-
-function classify$7(v) {
-  if (Array.isArray(v)) {
-    return Caml_array.get(v, 0);
-  } else {
-    return v.x;
-  }
-}
-
-var RecordIsObject = {
-  classify: classify$7
-};
-
-function classify$8(v) {
-  if (typeof v === "object" && !Array.isArray(v)) {
-    return v.x;
-  } else {
-    return Caml_array.get(v, 0);
-  }
-}
-
-var ArrayAndObject = {
-  classify: classify$8
-};
-
-function testHasNull(x) {
-  return x;
-}
-
-function testHasUndefined(x) {
-  return Caml_option.some(x);
-}
-
-function untaggedWithOptionPayload(x) {
-  return Caml_option.some(x);
-}
-
-function untaggedWithIntPayload(x) {
-  return x;
-}
-
-function untaggedInlineNoOptions(x) {
-  return x;
-}
-
-function untaggedInlineUnaryWihtExplicitOption(x) {
-  return Caml_option.some(x);
-}
-
-function untaggedInlineUnaryWihtImplicitOption(x) {
-  return Caml_option.some(x);
-}
-
-function untaggedInlineMultinaryOption(x) {
-  return x;
-}
-
-var OptionUnboxingHeuristic = {
-  testHasNull: testHasNull,
-  testHasUndefined: testHasUndefined,
-  untaggedWithOptionPayload: untaggedWithOptionPayload,
-  untaggedWithIntPayload: untaggedWithIntPayload,
-  untaggedInlineNoOptions: untaggedInlineNoOptions,
-  untaggedInlineUnaryWihtExplicitOption: untaggedInlineUnaryWihtExplicitOption,
-  untaggedInlineUnaryWihtImplicitOption: untaggedInlineUnaryWihtImplicitOption,
-  untaggedInlineMultinaryOption: untaggedInlineMultinaryOption
-};
-
-function classify$9(v) {
-  if (Array.isArray(v)) {
-    return Caml_array.get(v, 0);
-  }
-  switch (typeof v) {
-    case "object" :
-        return v.x;
-    case "function" :
-        return v(3);
-    
-  }
-}
-
-var ff = (function (x) {
-    return x + 1 | 0;
-  });
-
-var TestFunctionCase = {
-  classify: classify$9,
-  ff: ff
-};
-
-var someJson = '[{"name": "Haan"}, {"name": "Mr"}, false]';
-
-function check$1(s) {
-  if (!Array.isArray(s) && (s === null || typeof s !== "object") && typeof s !== "number" && typeof s !== "string") {
-    console.log("Nope...");
-    return ;
-  }
-  if (Array.isArray(s)) {
-    if (s.length !== 3) {
-      console.log("Nope...");
-      return ;
-    }
-    var match = s[0];
-    if (match === true) {
-      var match$1 = s[1];
-      if (match$1 === false) {
-        var match$2 = s[2];
-        if (!Array.isArray(match$2) && (match$2 === null || typeof match$2 !== "object") && typeof match$2 !== "number" && typeof match$2 !== "string") {
-          console.log("Nope...");
-          return ;
-        }
-        if (Array.isArray(match$2)) {
-          if (match$2.length !== 2) {
-            console.log("Nope...");
-            return ;
-          }
-          var match$3 = match$2[0];
-          if (!Array.isArray(match$3) && (match$3 === null || typeof match$3 !== "object") && typeof match$3 !== "number" && typeof match$3 !== "string") {
-            console.log("Nope...");
-            return ;
-          }
-          if (typeof match$3 === "string" && match$3 === "My name is") {
-            var match$4 = match$2[1];
-            if (!Array.isArray(match$4) && (match$4 === null || typeof match$4 !== "object") && typeof match$4 !== "number" && typeof match$4 !== "string") {
-              console.log("Nope...");
-              return ;
-            }
-            if (typeof match$4 === "number") {
-              if (match$4 !== 10) {
-                console.log("Nope...");
-              } else {
-                console.log("yup");
-              }
-              return ;
-            }
-            console.log("Nope...");
-            return ;
-          } else {
-            console.log("Nope...");
-            return ;
-          }
-        } else {
-          console.log("Nope...");
-          return ;
-        }
-      } else {
-        console.log("Nope...");
-        return ;
-      }
-    } else {
-      console.log("Nope...");
-      return ;
-    }
-  } else {
-    console.log("Nope...");
-    return ;
-  }
-}
-
-var ComplexPattern = {
-  someJson: someJson,
-  check: check$1
-};
-
-async function getUserName(u) {
-  if (u instanceof Promise) {
-    return (await u).name;
-  }
-  switch (typeof u) {
-    case "object" :
-        return u.name;
-    case "string" :
-        return u;
-    
-  }
-}
-
-async function awaitUser(u) {
-  if (u instanceof Promise) {
-    return (await u).name;
-  }
-  switch (typeof u) {
-    case "object" :
-    case "string" :
-        return "dummy";
-    
-  }
-}
-
-var PromiseSync = {
-  getUserName: getUserName,
-  awaitUser: awaitUser
-};
-
-async function classify$10(a) {
-  if (typeof a !== "object" && !(a instanceof Promise) && (a === "test" || a === 12) && !Array.isArray(a)) {
-    if (a === "test") {
-      console.log("testing");
-      return ;
-    }
-    console.log(12);
-    return ;
-  } else {
-    if (Array.isArray(a)) {
-      console.log(function (param) {
-            return Belt_Array.joinWith(a, "-", param);
-          });
-      return ;
-    }
-    if (a instanceof Promise) {
-      console.log(await a);
-      return ;
-    }
-    switch (typeof a) {
-      case "string" :
-          console.log(a);
-          return ;
-      case "object" :
-          console.log(a.userName);
-          return ;
-      
-    }
-  }
-}
-
-var Arr = {
-  classify: classify$10
-};
-
-async function classifyAll(t) {
-  if (Array.isArray(t)) {
-    console.log(function (param) {
-          return Belt_Array.joinWith(t, "-", param);
-        });
-    return ;
-  }
-  if (t instanceof Promise) {
-    console.log(await t);
-    return ;
-  }
-  if (t instanceof Date) {
-    console.log(t.toString());
-    return ;
-  }
-  if (t instanceof RegExp) {
-    console.log(t.test("test"));
-    return ;
-  }
-  if (t instanceof File) {
-    console.log(t.name);
-    return ;
-  }
-  if (t instanceof Blob) {
-    console.log(t.size);
-    return ;
-  }
-  switch (typeof t) {
-    case "string" :
-        console.log(t);
-        return ;
-    case "object" :
-        console.log(t.userName);
-        return ;
-    
-  }
-}
-
-var AllInstanceofTypes = {
-  classifyAll: classifyAll
-};
-
-function test(t) {
-  switch (typeof t) {
-    case "object" :
-        return Js_dict.get(t, "Hello");
-    case "string" :
-        return t;
-    case "function" :
-        return t();
-    
-  }
-}
-
-var Aliased = {
-  test: test
-};
-
-var OnlyOne = {
-  onlyOne: "OnlyOne"
-};
-
-function should_not_merge(x) {
-  if (Array.isArray(x)) {
-    return "do not merge";
-  }
-  if (x instanceof Date) {
-    return "do not merge";
-  }
-  switch (typeof x) {
-    case "boolean" :
-        return "boolean";
-    case "object" :
-        return "do not merge";
-    
-  }
-}
-
-function can_merge(x) {
-  if (Array.isArray(x)) {
-    return "do not merge";
-  }
-  if (x instanceof Date) {
-    return "do not merge";
-  }
-  switch (typeof x) {
-    case "boolean" :
-    case "object" :
-        return "merge";
-    
-  }
-}
-
-var MergeCases = {
-  should_not_merge: should_not_merge,
-  can_merge: can_merge
-};
-
-var i = 42;
-
-var i2 = 42.5;
-
-var s = "abc";
-
-var s2 = "abc";
-
-var w = {
-  x: 10,
-  y: ""
-};
-
-exports.i = i;
-exports.i2 = i2;
-exports.s = s;
-exports.s2 = s2;
-exports.classify = classify;
-exports.classify2 = classify2;
-exports.w = w;
-exports.cls = cls;
-exports.ListWithTuples = ListWithTuples;
-exports.ListWithObjects = ListWithObjects;
-exports.tuplesToObjects = tuplesToObjects;
-exports.l1 = l1;
-exports.l2 = l2;
-exports.Truthy = Truthy;
-exports.TwoObjects = TwoObjects;
-exports.Unknown = Unknown;
-exports.MultipleBlocks = MultipleBlocks;
-exports.OnlyBlocks = OnlyBlocks;
-exports.WithArray = WithArray;
-exports.Json = Json;
-exports.TrickyNested = TrickyNested;
-exports.OverlapString = OverlapString;
-exports.OverlapNumber = OverlapNumber;
-exports.OverlapObject = OverlapObject;
-exports.RecordIsObject = RecordIsObject;
-exports.ArrayAndObject = ArrayAndObject;
-exports.OptionUnboxingHeuristic = OptionUnboxingHeuristic;
-exports.TestFunctionCase = TestFunctionCase;
-exports.ComplexPattern = ComplexPattern;
-exports.PromiseSync = PromiseSync;
-exports.Arr = Arr;
-exports.AllInstanceofTypes = AllInstanceofTypes;
-exports.Aliased = Aliased;
-exports.OnlyOne = OnlyOne;
-exports.MergeCases = MergeCases;
-/* l2 Not a pure module */
diff --git a/jscomp/test/UntaggedVariants.res b/jscomp/test/UntaggedVariants.res
deleted file mode 100644
index d497221..0000000
--- a/jscomp/test/UntaggedVariants.res
+++ /dev/null
@@ -1,461 +0,0 @@
-@unboxed
-type t = A | I(int) | S(string)
-@unboxed
-type t2 = S2(string) | I2(float)
-
-let i = I(42)
-let i2 = I2(42.5)
-let s = S("abc")
-let s2 = S2("abc")
-
-let classify = x =>
-  switch x {
-  | I(_) => "An integer"
-  | S(s) => "A string" ++ s
-  | A => "A"
-  }
-
-let classify2 = x =>
-  switch x {
-  | I2(_) => "A float"
-  | S2(s) => "A string" ++ s
-  }
-
-@unboxed
-type tt = One | Two | Object({x: int, y: string})
-
-let w = Object({x: 10, y: ""})
-
-let cls = x =>
-  switch x {
-  | One => "one"
-  | Two => "two"
-  | Object({y}) => "object" ++ y
-  }
-
-module ListWithTuples = {
-  @unboxed
-  type rec t<'a> = | @as(undefined) Empty | Cons(('a, t<'a>))
-}
-
-module ListWithObjects = {
-  @unboxed
-  type rec t<'a> = | @as(null) Empty | Cons({hd: 'a, tl: t<'a>})
-}
-
-let rec tuplesToObjects = (l: ListWithTuples.t<_>): ListWithObjects.t<_> =>
-  switch l {
-  | Empty => Empty
-  | Cons((hd, tl)) => Cons({hd, tl: tuplesToObjects(tl)})
-  }
-
-let l1 = ListWithTuples.Cons((1, Cons((2, Cons((3, Empty))))))
-let l2 = tuplesToObjects(l1)
-Js.log2("l1", l1)
-Js.log2("l2", l2)
-
-module Truthy = {
-  @unboxed
-  type t = | @as(true) True | Obj({flag: bool})
-
-  let isTrue = x =>
-    switch x {
-    | True => true
-    | Obj({flag}) => flag
-    }
-}
-
-module TwoObjects = {
-  @unboxed
-  type t = | @as(null) Null | Object({name: string}) | @as(undefined) Undefined
-
-  let classify = x =>
-    switch x {
-    | Null => "null"
-    | Object({name}) => "object" ++ name
-    | Undefined => "undefined"
-    }
-}
-
-module Unknown = {
-  @unboxed
-  type t<'a> = A | B | Unknown('a)
-
-  let classify = x =>
-    switch x {
-    | A => "a"
-    | B => "b"
-    | Unknown(v) => {
-        Js.log(x)
-        "Unknown"
-      }
-    }
-}
-
-module MultipleBlocks = {
-  @unboxed
-  type t<'a> = A | B | C | D | String(string) | Int(int) | Object({name: string})
-
-  let classify = x =>
-    switch x {
-    | A => "a"
-    | B => "b"
-    | C => "c"
-    | D => "d"
-    | String(_) => "string"
-    | Int(_) => "int"
-    | Object({name}) => "Object" ++ name
-    }
-}
-
-module OnlyBlocks = {
-  @unboxed
-  type t<'a> = String(string) | Int(int) | Object({name: string})
-
-  let classify = x =>
-    switch x {
-    | String(_) => "string"
-    | Int(_) => "int"
-    | Object({name}) => "Object" ++ name
-    }
-}
-
-module WithArray = {
-  @unboxed
-  type t<'a> = String(string) | Float(float) | Array(array<string>) | Object({name: string})
-
-  let classify = x =>
-    switch x {
-    | String(_) => "string"
-    | Float(_) => "int"
-    | Array(_) if true => "array"
-    | Array(_) => "array"
-    | Object({name}) => "Object" ++ name
-    }
-}
-
-module Json = {
-  @unboxed
-  type rec t =
-    | @as(false) False
-    | @as(true) True
-    | @as(null) Null
-    | String(string)
-    | Number(float)
-    | Object(Js.Dict.t<t>)
-    | Array(array<t>)
-
-  type tagged_t =
-    | JSONFalse
-    | JSONTrue
-    | JSONNull
-    | JSONString(string)
-    | JSONNumber(float)
-    | JSONObject(Js.Dict.t<t>)
-    | JSONArray(array<t>)
-
-  let classify = (x: t) =>
-    switch x {
-    | False => JSONFalse
-    | True => JSONTrue
-    | Null => JSONNull
-    | String(s) => JSONString(s)
-    | Number(n) => JSONNumber(n)
-    | Object(o) => JSONObject(o)
-    | Array(a) => JSONArray(a)
-    }
-
-  /* from js_json.ml
-let classify  (x : t) : tagged_t =
-  let ty = Js.typeof x in
-  if ty = "string" then
-    JSONString (Obj.magic x)
-  else if ty = "number" then
-    JSONNumber (Obj.magic x )
-  else if ty = "boolean" then
-    if (Obj.magic x) = true then JSONTrue
-    else JSONFalse
-  else if (Obj.magic x) == Js.null then
-    JSONNull
-  else if Js_array2.isArray x  then
-    JSONArray (Obj.magic x)
-  else
-    JSONObject (Obj.magic x)  
- */
-}
-
-module TrickyNested = {
-  @unboxed
-  type rec t =
-    | A((t, t))
-    | B
-
-  let check = (s, y) =>
-    switch s {
-    | A((A(x), B)) if x !== y => 41
-    | _ => 42
-    }
-}
-
-module OverlapString = {
-  @unboxed
-  type enum = One | Two | Three | FutureAddedValue(string)
-
-  let checkEnum = e =>
-    switch e {
-    | One => "One!"
-    | Two => "Two"
-    | Three => "Threeeee"
-    | FutureAddedValue(s) => "Something else..." ++ s
-    }
-}
-
-module OverlapNumber = {
-  @unboxed
-  type enum = | @as(1.0) One | Two | Three | FutureAddedValue(float)
-
-  let checkEnum = e =>
-    switch e {
-    | One => "One!"
-    | Two => "Two"
-    | Three => "Threeeee"
-    | FutureAddedValue(_) => "Something else..."
-    }
-}
-
-module OverlapObject = {
-  @unboxed
-  type enum = | @as(null) One | Two | Three | Object({x: int})
-
-  let checkEnum = e =>
-    switch e {
-    | One => "One!"
-    | Two => "Two"
-    | Three => "Threeeee"
-    | Object(_) => "Object..."
-    }
-}
-
-module RecordIsObject = {
-  // @unboxed
-  // this is not allowed
-  type r = {x: int}
-
-  @unboxed
-  type t = Array(array<int>) | Record(r)
-
-  let classify = v =>
-    switch v {
-    | Record({x}) => x
-    | Array(a) => a[0]
-    }
-}
-
-module ArrayAndObject = {
-  @unboxed
-  type t = Record({x: int}) | Array(array<int>)
-
-  let classify = v =>
-    switch v {
-    | Record({x}) => x
-    | Array(a) => a[0]
-    }
-}
-
-module OptionUnboxingHeuristic = {
-  type hasNull = | @as(null) Null | B(int)
-  let testHasNull = (x: hasNull) => Some(x)
-
-  type hasUndefined = | @as(undefined) Undefined | B(int)
-  let testHasUndefined = (x: hasUndefined) => Some(x)
-
-  @unboxed
-  type untaggedWithOptionPayload = A | B(option<string>)
-  let untaggedWithOptionPayload = (x: untaggedWithOptionPayload) => Some(x)
-
-  @unboxed
-  type untaggedWithIntPayload = A | B(int)
-  let untaggedWithIntPayload = (x: untaggedWithIntPayload) => Some(x)
-
-  @unboxed
-  type untaggedInlineNoOption = A | B({x: int})
-  let untaggedInlineNoOptions = (x: untaggedInlineNoOption) => Some(x)
-
-  @unboxed
-  type untaggedInlineUnaryWihtExplicitOption = A | B({x: option<int>})
-  let untaggedInlineUnaryWihtExplicitOption = (x: untaggedInlineUnaryWihtExplicitOption) => Some(x)
-
-  @unboxed
-  type untaggedInlineUnaryWihtImplicitOption = A | B({x?: int})
-  let untaggedInlineUnaryWihtImplicitOption = (x: untaggedInlineUnaryWihtImplicitOption) => Some(x)
-
-  @unboxed
-  type untaggedInlineMultinaryOption = A | B({x: option<int>, y?: string})
-  let untaggedInlineMultinaryOption = (x: untaggedInlineMultinaryOption) => Some(x)
-}
-
-module TestFunctionCase = {
-  @unboxed
-  type t = Array(array<int>) | Record({x: int}) | Function((. int) => int)
-
-  let classify = v =>
-    switch v {
-    | Record({x}) => x
-    | Array(a) => a[0]
-    | Function(f) => f(. 3)
-    }
-
-  let ff = Function((. x) => x + 1)
-}
-
-module ComplexPattern = {
-  @unboxed
-  type rec t =
-    | @as(undefined) Missing
-    | @as(false) False
-    | @as(true) True
-    | @as(null) Null
-    | String(string)
-    | Number(float)
-    | Object(Js.Dict.t<t>)
-    | Array(array<t>)
-
-  type tagged_t =
-    | JSONFalse
-    | JSONTrue
-    | JSONNull
-    | JSONString(string)
-    | JSONNumber(float)
-    | JSONObject(Js.Dict.t<t>)
-    | JSONArray(array<t>)
-
-  let someJson: t = %raw(`'[{"name": "Haan"}, {"name": "Mr"}, false]'`)->Obj.magic
-
-  let check = s =>
-    switch s {
-    | Array([True, False, Array([String("My name is"), Number(10.)])]) => Js.log("yup")
-    | _ => Js.log("Nope...")
-    }
-}
-
-module PromiseSync = {
-  type user = {name: string}
-
-  @unboxed type value = Sync(user) | Async(promise<user>) | Name(string)
-
-  let getUserName = async (u: value) =>
-    switch u {
-    | Sync(user) => user.name
-    | Async(userPromise) =>
-      let user = await userPromise
-      user.name
-    | Name(name) => name
-    }
-
-  let awaitUser = async (u: value) =>
-    switch u {
-    | Async(userPromise) =>
-      let user = await userPromise
-      user.name
-    | _ => "dummy"
-    }
-}
-
-module Arr = {
-  type record = {userName: string}
-
-  @unboxed
-  type arr =
-    | Array(array<string>)
-    | String(string)
-    | Promise(promise<string>)
-    | Object(record)
-    | @as("test") Test
-    | @as(12) TestInt
-
-  let classify = async (a: arr) =>
-    switch a {
-    | Array(arr) => Js.log(arr->Belt.Array.joinWith("-"))
-    | String(s) => Js.log(s)
-    | Promise(p) => Js.log(await p)
-    | Object({userName}) => Js.log(userName)
-    | Test => Js.log("testing")
-    | TestInt => Js.log(12)
-    }
-}
-
-module AllInstanceofTypes = {
-  type record = {userName: string}
-
-  @get external fileName: Js.File.t => string = "name"
-  @get external blobSize: Js.Blob.t => float = "size"
-
-  @unboxed
-  type t =
-    | String(string)
-    | Array(array<string>)
-    | Promise(promise<string>)
-    | Object(record)
-    | Date(Js.Date.t)
-    | RegExp(Js.Re.t)
-    | File(Js.File.t)
-    | Blob(Js.Blob.t)
-
-  let classifyAll = async (t: t) =>
-    switch t {
-    | String(s) => Js.log(s)
-    | Promise(p) => Js.log(await p)
-    | Object({userName}) => Js.log(userName)
-    | Date(date) => Js.log(date->Js.Date.toString)
-    | RegExp(re) => Js.log(re->Js.Re.test_("test"))
-    | Array(arr) => Js.log(arr->Belt.Array.joinWith("-"))
-    | File(file) => Js.log(file->fileName)
-    | Blob(blob) => Js.log(blob->blobSize)
-    }
-}
-
-module Aliased = {
-  type dict = Js.Dict.t<string>
-  type fn = (. unit) => option<string>
-  @unboxed type t = Object(dict) | String(string) | Function(fn)
-
-  let test = (t: t) => {
-    switch t {
-    | Object(d) => d->Js.Dict.get("Hello")
-    | String(s) => Some(s)
-    | Function(fn) => fn(.)
-    }
-  }
-}
-
-module OnlyOne = {
-  @unboxed type onlyOne = OnlyOne
-  let onlyOne = OnlyOne
-}
-
-module MergeCases = {
-  type obj = {name: string}
-
-  @unboxed
-  type t =
-    | Boolean(bool)
-    | Object(obj)
-    | Array(array<int>)
-    | Date(Js.Date.t)
-
-  let should_not_merge = x =>
-    switch x {
-    | Object(_) => "do not merge"
-    | Array(_) => "do not merge"
-    | Date(_) => "do not merge"
-    | Boolean(_) => "boolean"
-    }
-
-  let can_merge = x =>
-    switch x {
-    | Object(_) => "merge"
-    | Array(_) => "do not merge"
-    | Date(_) => "do not merge"
-    | Boolean(_) => "merge"
-    }
-}
diff --git a/jscomp/test/VariantCoercion.js b/jscomp/test/VariantCoercion.js
deleted file mode 100644
index 325b780..0000000
--- a/jscomp/test/VariantCoercion.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var x = {
-  kind: "One",
-  age: 1
-};
-
-var CoerceVariants = {
-  a: 1.1,
-  b: 1.1,
-  x: x,
-  y: x
-};
-
-var a = "hello";
-
-var c = 100;
-
-var CoerceWithPayload = {
-  a: a,
-  aa: "First",
-  b: a,
-  bb: "First",
-  c: c,
-  cc: 2,
-  d: c,
-  dd: 2
-};
-
-var a$1 = "hello";
-
-var aa = "First";
-
-var c$1 = "Hi";
-
-var CoerceFromStringToVariant = {
-  a: a$1,
-  aa: aa,
-  b: a$1,
-  bb: aa,
-  c: c$1,
-  cc: c$1
-};
-
-var CoerceFromIntToVariant = {
-  a: 100,
-  aa: 1,
-  b: 100,
-  bb: 1,
-  c: 120,
-  cc: 120
-};
-
-var CoerceFromFloatToVariant = {
-  a: 100,
-  aa: 1,
-  b: 100,
-  bb: 1,
-  c: 120,
-  cc: 120
-};
-
-var CoerceFromBigintToVariant = {
-  a: 100n,
-  aa: 1n,
-  b: 100n,
-  bb: 1n,
-  c: 120n,
-  cc: 120n
-};
-
-var a$2 = "Three";
-
-var b = "Three";
-
-var i = 1;
-
-var d = 1;
-
-var ii = 1.1;
-
-var dd = 1.1;
-
-exports.a = a$2;
-exports.b = b;
-exports.i = i;
-exports.d = d;
-exports.ii = ii;
-exports.dd = dd;
-exports.CoerceVariants = CoerceVariants;
-exports.CoerceWithPayload = CoerceWithPayload;
-exports.CoerceFromStringToVariant = CoerceFromStringToVariant;
-exports.CoerceFromIntToVariant = CoerceFromIntToVariant;
-exports.CoerceFromFloatToVariant = CoerceFromFloatToVariant;
-exports.CoerceFromBigintToVariant = CoerceFromBigintToVariant;
-/* No side effect */
diff --git a/jscomp/test/VariantCoercion.res b/jscomp/test/VariantCoercion.res
deleted file mode 100644
index 5c31324..0000000
--- a/jscomp/test/VariantCoercion.res
+++ /dev/null
@@ -1,94 +0,0 @@
-type a = One | @as("two") Two | Three
-
-let a: a = Three
-
-let b = (a :> string)
-
-type onlyInts = | @as(1) One1 | @as(2) Two2 | @as(3) Three3
-
-let i = One1
-
-let d = (i :> int)
-
-type onlyFloats = | @as(1.1) Onef | @as(2.2) Twof | @as(3.3) Threef
-
-let ii = Onef
-
-let dd = (ii :> float)
-
-module CoerceVariants = {
-  @unboxed type a = One(int) | @as(1.1) Two | @as(null) T2
-  @unboxed type b = One(int) | @as(1.1) Two | @as(null) T2 | Three
-
-  let a: a = Two
-
-  let b: b = (a :> b)
-
-  @tag("kind") type x = One({age: int, name?: string})
-  @tag("kind") type y = One({age: int, name?: string}) | Two({two: string})
-
-  let x: x = One({age: 1})
-  let y: y = (x :> y)
-}
-
-module CoerceWithPayload = {
-  @unboxed type strings = String(string) | First | Second | Third
-  let a: strings = String("hello")
-  let aa: strings = First
-  let b: string = (a :> string)
-  let bb: string = (aa :> string)
-
-  @unboxed type floats = Number(float) | @as(1.) First | @as(2.) Second | @as(3.) Third
-  let c: floats = Number(100.)
-  let cc: floats = Second
-  let d: float = (c :> float)
-  let dd: float = (cc :> float)
-}
-
-module CoerceFromStringToVariant = {
-  @unboxed type strings = String(string) | First | Second | Third
-  let a = "hello"
-  let aa = "First"
-  let b: strings = (a :> strings)
-  let bb: strings = (aa :> strings)
-
-  @unboxed type mixed = String(string) | @as(1) One | @as(null) Null | Two
-  let c = "Hi"
-  let cc: mixed = (c :> mixed)
-}
-
-module CoerceFromIntToVariant = {
-  @unboxed type ints = Int(int) | @as(1) First | @as(2) Second | @as(3) Third
-  let a = 100
-  let aa = 1
-  let b: ints = (a :> ints)
-  let bb: ints = (aa :> ints)
-
-  @unboxed type mixed = Int(int) | @as(1) One | @as(null) Null | Two
-  let c = 120
-  let cc: mixed = (c :> mixed)
-}
-
-module CoerceFromFloatToVariant = {
-  @unboxed type floats = Float(float) | @as(1.) First | @as(2.) Second | @as(3.) Third
-  let a = 100.
-  let aa = 1.
-  let b: floats = (a :> floats)
-  let bb: floats = (aa :> floats)
-
-  @unboxed type mixed = Float(float) | @as(1.) One | @as(null) Null | Two
-  let c = 120.
-  let cc: mixed = (c :> mixed)
-}
-
-module CoerceFromBigintToVariant = {
-  @unboxed type bigints = BigInt(bigint) | @as(1n) First | @as(2n) Second | @as(3n) Third
-  let a = 100n
-  let aa = 1n
-  let b: bigints = (a :> bigints)
-  let bb: bigints = (aa :> bigints)
-
-  @unboxed type mixed = BigInt(bigint) | @as(1n) One | @as(null) Null | Two
-  let c = 120n
-  let cc: mixed = (c :> mixed)
-}
diff --git a/jscomp/test/VariantSpreads.js b/jscomp/test/VariantSpreads.js
deleted file mode 100644
index 2a14dec..0000000
--- a/jscomp/test/VariantSpreads.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var S = {};
-
-var b1 = "Two";
-
-var b2 = {
-  TAG: "One",
-  _0: true,
-  _1: "Bar"
-};
-
-var c = {
-  TAG: "Five",
-  _0: 2
-};
-
-var ddd = "Six";
-
-var q = {
-  TAG: "One",
-  name: "hello"
-};
-
-exports.S = S;
-exports.b1 = b1;
-exports.b2 = b2;
-exports.c = c;
-exports.ddd = ddd;
-exports.q = q;
-/* No side effect */
diff --git a/jscomp/test/VariantSpreads.res b/jscomp/test/VariantSpreads.res
deleted file mode 100644
index 13e47fc..0000000
--- a/jscomp/test/VariantSpreads.res
+++ /dev/null
@@ -1,20 +0,0 @@
-module S = {
-    type x = Foo | Bar
-    type s = Five(int) | Six
-}
-
-type a = One(bool, S.x) | Two
-
-type b = | ...a | Three | Four | ...S.s
-
-let b1: b = Two
-let b2: b = One(true, Bar)
-
-let c: b = Five(2)
-
-let ddd: b = Six
-
-type f = One({name: string, age?: int}) | Two
-type q = | ...f | Three
-
-let q: q = One({name: "hello"})
\ No newline at end of file
diff --git a/jscomp/test/a.js b/jscomp/test/a.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/a.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/a.res b/jscomp/test/a.res
deleted file mode 100644
index 61c82e3..0000000
--- a/jscomp/test/a.res
+++ /dev/null
@@ -1,33 +0,0 @@
-include (
-  {
-    module M = (
-      S: {
-        let add: (int, int) => int
-      },
-    ) => {
-      let u = S.add(1, 2)
-    }
-    module H = M({
-      let add = (x, y) => x + y
-    })
-
-    include List
-    module N = List
-    let v = N.length
-
-    module Make = (U: Set.OrderedType) => {
-      include U
-      let v = compare
-    }
-
-    module X = Make(String)
-    module U = Make(Test_order)
-
-    include N
-    /* let v = "xhg" */
-    /* let () = v.[0] <- 'a' */
-  }: {}
-)
-
-/* [%%bs.cast.x: 'a -> 'b  ] */
-/* external f : int -> (int -> int) = "%identity" */
diff --git a/jscomp/test/a_filename_test.js b/jscomp/test/a_filename_test.js
deleted file mode 100644
index ef2665e..0000000
--- a/jscomp/test/a_filename_test.js
+++ /dev/null
@@ -1,130 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Ext_filename_test = require("./ext_filename_test.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function test(param, param$1) {
-  return Ext_filename_test.node_relative_path(true, param, param$1);
-}
-
-if (process.platform !== "win32") {
-  eq("File \"a_filename_test.res\", line 16, characters 4-11", [
-        Ext_filename_test.combine("/tmp", "subdir/file.txt"),
-        Ext_filename_test.combine("/tmp", "/a/tmp.txt"),
-        Ext_filename_test.combine("/a/tmp.txt", "subdir/file.txt")
-      ], [
-        "/tmp/subdir/file.txt",
-        "/a/tmp.txt",
-        "/a/tmp.txt/subdir/file.txt"
-      ]);
-  eq("File \"a_filename_test.res\", line 28, characters 5-12", Ext_filename_test.node_relative_path(true, {
-            NAME: "File",
-            VAL: "./a/b.c"
-          }, {
-            NAME: "File",
-            VAL: "./a/u/g.c"
-          }), "./u/g.c");
-  eq("File \"a_filename_test.res\", line 31, characters 4-11", Ext_filename_test.node_relative_path(true, {
-            NAME: "File",
-            VAL: "./a/b.c"
-          }, {
-            NAME: "File",
-            VAL: "xxxghsoghos/ghsoghso/node_modules/buckle-stdlib/list.js"
-          }), "buckle-stdlib/list.js");
-  eq("File \"a_filename_test.res\", line 37, characters 4-11", Ext_filename_test.node_relative_path(true, {
-            NAME: "File",
-            VAL: "./a/b.c"
-          }, {
-            NAME: "File",
-            VAL: "xxxghsoghos/ghsoghso/node_modules//buckle-stdlib/list.js"
-          }), "buckle-stdlib/list.js");
-  eq("File \"a_filename_test.res\", line 43, characters 4-11", Ext_filename_test.node_relative_path(true, {
-            NAME: "File",
-            VAL: "./a/b.c"
-          }, {
-            NAME: "File",
-            VAL: "xxxghsoghos/ghsoghso/node_modules/./buckle-stdlib/list.js"
-          }), "buckle-stdlib/list.js");
-  eq("File \"a_filename_test.res\", line 48, characters 5-12", Ext_filename_test.node_relative_path(true, {
-            NAME: "File",
-            VAL: "./a/c.js"
-          }, {
-            NAME: "File",
-            VAL: "./a/b"
-          }), "./b");
-  eq("File \"a_filename_test.res\", line 49, characters 5-12", Ext_filename_test.node_relative_path(true, {
-            NAME: "File",
-            VAL: "./a/c"
-          }, {
-            NAME: "File",
-            VAL: "./a/b.js"
-          }), "./b.js");
-  eq("File \"a_filename_test.res\", line 50, characters 5-12", Ext_filename_test.node_relative_path(true, {
-            NAME: "Dir",
-            VAL: "./a/"
-          }, {
-            NAME: "File",
-            VAL: "./a/b.js"
-          }), "./b.js");
-  eq("File \"a_filename_test.res\", line 51, characters 5-12", Ext_filename_test.get_extension("a.txt"), ".txt");
-  eq("File \"a_filename_test.res\", line 52, characters 5-12", Ext_filename_test.get_extension("a"), "");
-  eq("File \"a_filename_test.res\", line 53, characters 5-12", Ext_filename_test.get_extension(".txt"), ".txt");
-  eq("File \"a_filename_test.res\", line 56, characters 4-11", $$Array.map(Ext_filename_test.normalize_absolute_path, [
-            "/gsho/./..",
-            "/a/b/../c../d/e/f",
-            "/a/b/../c/../d/e/f",
-            "/gsho/./../..",
-            "/a/b/c/d",
-            "/a/b/c/d/",
-            "/a/",
-            "/a",
-            "/a.txt/",
-            "/a.txt"
-          ]), [
-        "/",
-        "/a/c../d/e/f",
-        "/a/d/e/f",
-        "/",
-        "/a/b/c/d",
-        "/a/b/c/d",
-        "/a",
-        "/a",
-        "/a.txt",
-        "/a.txt"
-      ]);
-}
-
-Mt.from_pair_suites("A_filename_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.test = test;
-/*  Not a pure module */
diff --git a/jscomp/test/a_filename_test.res b/jscomp/test/a_filename_test.res
deleted file mode 100644
index 33df783..0000000
--- a/jscomp/test/a_filename_test.res
+++ /dev/null
@@ -1,76 +0,0 @@
-@var @scope("process")
-external platform: [#aix | #darwin | #freebsd | #linux | #openbsd | #sunos | #win32] = "platform"
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let test = Ext_filename_test.node_relative_path(true)
-let () = /* TODO: adapt these tests to run on Windows. */
-if platform !== #win32 {
-  eq(
-    __LOC__,
-    {
-      let \"//" = Ext_filename_test.combine
-      (
-        \"//"("/tmp", "subdir/file.txt"),
-        \"//"("/tmp", "/a/tmp.txt"),
-        \"//"("/a/tmp.txt", "subdir/file.txt"),
-      )
-    },
-    ("/tmp/subdir/file.txt", "/a/tmp.txt", "/a/tmp.txt/subdir/file.txt"),
-  )
-
-  eq(__LOC__, test(#File("./a/b.c"), #File("./a/u/g.c")), "./u/g.c")
-
-  eq(
-    __LOC__,
-    test(#File("./a/b.c"), #File("xxxghsoghos/ghsoghso/node_modules/buckle-stdlib/list.js")),
-    "buckle-stdlib/list.js",
-  )
-
-  eq(
-    __LOC__,
-    test(#File("./a/b.c"), #File("xxxghsoghos/ghsoghso/node_modules//buckle-stdlib/list.js")),
-    "buckle-stdlib/list.js",
-  )
-
-  eq(
-    __LOC__,
-    test(#File("./a/b.c"), #File("xxxghsoghos/ghsoghso/node_modules/./buckle-stdlib/list.js")),
-    "buckle-stdlib/list.js",
-  )
-
-  eq(__LOC__, test(#File("./a/c.js"), #File("./a/b")), "./b")
-  eq(__LOC__, test(#File("./a/c"), #File("./a/b.js")), "./b.js")
-  eq(__LOC__, test(#Dir("./a/"), #File("./a/b.js")), "./b.js")
-  eq(__LOC__, Ext_filename_test.get_extension("a.txt"), ".txt")
-  eq(__LOC__, Ext_filename_test.get_extension("a"), "")
-  eq(__LOC__, Ext_filename_test.get_extension(".txt"), ".txt")
-
-  eq(
-    __LOC__,
-    Array.map(
-      Ext_filename_test.normalize_absolute_path,
-      [
-        "/gsho/./..",
-        "/a/b/../c../d/e/f",
-        "/a/b/../c/../d/e/f",
-        "/gsho/./../..",
-        "/a/b/c/d",
-        "/a/b/c/d/",
-        "/a/",
-        "/a",
-        "/a.txt/",
-        "/a.txt",
-      ],
-    ),
-    ["/", "/a/c../d/e/f", "/a/d/e/f", "/", "/a/b/c/d", "/a/b/c/d", "/a", "/a", "/a.txt", "/a.txt"],
-  )
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/a_list_test.js b/jscomp/test/a_list_test.js
deleted file mode 100644
index 462476f..0000000
--- a/jscomp/test/a_list_test.js
+++ /dev/null
@@ -1,115 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Ext_list_test = require("./ext_list_test.js");
-
-var suites_0 = [
-  "drop",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: Ext_list_test.drop(3, {
-                    hd: 0,
-                    tl: {
-                      hd: 1,
-                      tl: {
-                        hd: 2,
-                        tl: /* [] */0
-                      }
-                    }
-                  }),
-              _1: /* [] */0
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "drop1",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: Ext_list_test.drop(2, {
-                      hd: 0,
-                      tl: {
-                        hd: 1,
-                        tl: {
-                          hd: 2,
-                          tl: /* [] */0
-                        }
-                      }
-                    }),
-                _1: {
-                  hd: 2,
-                  tl: /* [] */0
-                }
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "flat_map",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: {
-                    hd: 0,
-                    tl: {
-                      hd: 0,
-                      tl: {
-                        hd: 1,
-                        tl: {
-                          hd: 1,
-                          tl: {
-                            hd: 0,
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    }
-                  },
-                  _1: Ext_list_test.flat_map((function (x) {
-                          if (x % 2 === 0) {
-                            return {
-                                    hd: 0,
-                                    tl: /* [] */0
-                                  };
-                          } else {
-                            return {
-                                    hd: 1,
-                                    tl: {
-                                      hd: 1,
-                                      tl: /* [] */0
-                                    }
-                                  };
-                          }
-                        }), {
-                        hd: 0,
-                        tl: {
-                          hd: 0,
-                          tl: {
-                            hd: 3,
-                            tl: {
-                              hd: 0,
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      })
-                };
-        })
-    ],
-    tl: /* [] */0
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("A_list_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/a_list_test.res b/jscomp/test/a_list_test.res
deleted file mode 100644
index 91975a4..0000000
--- a/jscomp/test/a_list_test.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let suites = {
-  open Mt
-  list{
-    ("drop", _ => Eq(Ext_list_test.drop(3, list{0, 1, 2}), list{})),
-    ("drop1", _ => Eq(Ext_list_test.drop(2, list{0, 1, 2}), list{2})),
-    ("flat_map", _ => Eq(list{0, 0, 1, 1, 0}, Ext_list_test.flat_map(x =>
-          if mod(x, 2) === 0 {
-            list{0}
-          } else {
-            list{1, 1}
-          }
-        , list{0, 0, 3, 0}))),
-  }
-}
-
-open Mt
-from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/a_recursive_type.js b/jscomp/test/a_recursive_type.js
deleted file mode 100644
index 5f102e5..0000000
--- a/jscomp/test/a_recursive_type.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function g(x) {
-  return Curry._1(x._0, x);
-}
-
-var loop = g({
-      TAG: "A",
-      _0: g
-    });
-
-var x = {
-  TAG: "A",
-  _0: g
-};
-
-var non_terminate = g(x);
-
-var xx = {};
-
-xx.xx = xx;
-
-exports.loop = loop;
-exports.non_terminate = non_terminate;
-/* loop Not a pure module */
diff --git a/jscomp/test/a_recursive_type.res b/jscomp/test/a_recursive_type.res
deleted file mode 100644
index 5df8db5..0000000
--- a/jscomp/test/a_recursive_type.res
+++ /dev/null
@@ -1,34 +0,0 @@
-type rec t = A(t => int)
-
-let g = x =>
-  switch x {
-  | A(v) => v(x)
-  }
-
-let loop = g(A(g))
-
-let non_terminate = (
-  x =>
-    switch x {
-    | A(v) => v(x)
-    }
-)(A(g))
-
-type rec t0 = {xx: t0}
-/* [@@unboxed] */
-
-let rec xx = {xx: xx}
-
-type rec t1 = A(array<t1>)
-
-@unboxed type rec t2 = A2(array<t2>)
-
-/* let rec h = A [|h|]     
-let rec h1 = A [|h1|] // could be relaxed
-let rec h2 = A2 [|h2|]  
-
-;; Js.log (h,h2) */
-/* If we inline g's definition -- it will be the same, inline uncarefully 
-    (inline the inlined result)
-    will make it non-terminating
-*/
diff --git a/jscomp/test/a_recursive_type.resi b/jscomp/test/a_recursive_type.resi
deleted file mode 100644
index f095e90..0000000
--- a/jscomp/test/a_recursive_type.resi
+++ /dev/null
@@ -1,2 +0,0 @@
-let loop: int
-let non_terminate: int
diff --git a/jscomp/test/a_scope_bug.js b/jscomp/test/a_scope_bug.js
deleted file mode 100644
index b2220eb..0000000
--- a/jscomp/test/a_scope_bug.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function odd(_z) {
-  while(true) {
-    var z = _z;
-    var even = Math.imul(z, z);
-    var a = (even + 4 | 0) + even | 0;
-    console.log(String(a));
-    _z = 32;
-    continue ;
-  };
-}
-
-var even = odd;
-
-exports.odd = odd;
-exports.even = even;
-/* No side effect */
diff --git a/jscomp/test/a_scope_bug.res b/jscomp/test/a_scope_bug.res
deleted file mode 100644
index cc91c32..0000000
--- a/jscomp/test/a_scope_bug.res
+++ /dev/null
@@ -1,13 +0,0 @@
-/** FIXME: the inner 
-    [even ] is printed as [even] while global [even] is printed as [even$1]
-*/
-let rec odd = z => {
-  let a = {
-    let even = z
-    let even = even * even
-    even + 4 + even
-  }
-  print_endline(string_of_int(a))
-  even(32)
-}
-and even = y => odd(y)
diff --git a/jscomp/test/a_string_test.js b/jscomp/test/a_string_test.js
deleted file mode 100644
index 97a888d..0000000
--- a/jscomp/test/a_string_test.js
+++ /dev/null
@@ -1,127 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Ext_string_test = require("./ext_string_test.js");
-
-var suites_0 = [
-  "split",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: Ext_string_test.split(true, "hihi", /* 'i' */105),
-              _1: {
-                hd: "h",
-                tl: {
-                  hd: "h",
-                  tl: {
-                    hd: "",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "split_non_empty",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: Ext_string_test.split(undefined, "hihi", /* 'i' */105),
-                _1: {
-                  hd: "h",
-                  tl: {
-                    hd: "h",
-                    tl: /* [] */0
-                  }
-                }
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "split_empty",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: Ext_string_test.split(true, "", /* 'i' */105),
-                  _1: /* [] */0
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "split_normal",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: Ext_string_test.split(true, "h i i", /* ' ' */32),
-                    _1: {
-                      hd: "h",
-                      tl: {
-                        hd: "i",
-                        tl: {
-                          hd: "i",
-                          tl: /* [] */0
-                        }
-                      }
-                    }
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "split_by",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: List.filter(function (s) {
-                              return s !== "";
-                            })(Ext_string_test.split_by(undefined, (function (x) {
-                                  if (x === /* ' ' */32) {
-                                    return true;
-                                  } else {
-                                    return x === /* '\t' */9;
-                                  }
-                                }), "h hgso hgso \t hi")),
-                      _1: {
-                        hd: "h",
-                        tl: {
-                          hd: "hgso",
-                          tl: {
-                            hd: "hgso",
-                            tl: {
-                              hd: "hi",
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      }
-                    };
-            })
-        ],
-        tl: /* [] */0
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("A_string_test", suites);
-
-var split = Ext_string_test.split;
-
-var split_by = Ext_string_test.split_by;
-
-exports.split = split;
-exports.split_by = split_by;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/a_string_test.res b/jscomp/test/a_string_test.res
deleted file mode 100644
index 789f13b..0000000
--- a/jscomp/test/a_string_test.res
+++ /dev/null
@@ -1,22 +0,0 @@
-let split = Ext_string_test.split
-
-let split_by = Ext_string_test.split_by
-
-let suites = {
-  open Mt
-  list{
-    ("split", _ => Eq(split(~keep_empty=true, "hihi", 'i'), list{"h", "h", ""})),
-    ("split_non_empty", _ => Eq(split("hihi", 'i'), list{"h", "h"})),
-    ("split_empty", _ => Eq(split(~keep_empty=true, "", 'i'), list{})),
-    ("split_normal", _ => Eq(split(~keep_empty=true, "h i i", ' '), list{"h", "i", "i"})),
-    (
-      "split_by",
-      _ => Eq(
-        List.filter(s => s != "", split_by(x => x == ' ' || x == '\t', "h hgso hgso \t hi")),
-        list{"h", "hgso", "hgso", "hi"},
-      ),
-    ),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/abstract_type.js b/jscomp/test/abstract_type.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/abstract_type.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/abstract_type.res b/jscomp/test/abstract_type.res
deleted file mode 100644
index 660b48a..0000000
--- a/jscomp/test/abstract_type.res
+++ /dev/null
@@ -1,6 +0,0 @@
-type t = int => int
-
-type arrow_type = int => int
-
-type poly_type<'a> = 'a
-type poly_abstract_type<'a> = 'a => int
diff --git a/jscomp/test/abstract_type.resi b/jscomp/test/abstract_type.resi
deleted file mode 100644
index 1300f12..0000000
--- a/jscomp/test/abstract_type.resi
+++ /dev/null
@@ -1,7 +0,0 @@
-type t
-
-type arrow_type = int => int
-
-type poly_type<'a> = 'a
-type poly_abstract_type<'a>
-open Mt
diff --git a/jscomp/test/acyc/a0_a1.js b/jscomp/test/acyc/a0_a1.js
deleted file mode 100644
index 4346cd0..0000000
--- a/jscomp/test/acyc/a0_a1.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-
-var v = 3;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/acyc/a0_a1.res b/jscomp/test/acyc/a0_a1.res
deleted file mode 100644
index 55f1eb2..0000000
--- a/jscomp/test/acyc/a0_a1.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 3
diff --git a/jscomp/test/acyc/a1_a2.js b/jscomp/test/acyc/a1_a2.js
deleted file mode 100644
index b625a93..0000000
--- a/jscomp/test/acyc/a1_a2.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict';
-
-var A0_a1 = require("./a0_a1");
-
-var v = A0_a1.v;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/acyc/a1_a2.res b/jscomp/test/acyc/a1_a2.res
deleted file mode 100644
index 408af48..0000000
--- a/jscomp/test/acyc/a1_a2.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = A0_a1.v
diff --git a/jscomp/test/acyc/a1_a2.resi b/jscomp/test/acyc/a1_a2.resi
deleted file mode 100644
index 19b83dc..0000000
--- a/jscomp/test/acyc/a1_a2.resi
+++ /dev/null
@@ -1 +0,0 @@
-let v: int
diff --git a/jscomp/test/acyc/a2_a3.js b/jscomp/test/acyc/a2_a3.js
deleted file mode 100644
index 7ec1353..0000000
--- a/jscomp/test/acyc/a2_a3.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict';
-
-var A1_a2 = require("./a1_a2");
-
-var v = A1_a2.v;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/acyc/a2_a3.res b/jscomp/test/acyc/a2_a3.res
deleted file mode 100644
index 5fbc9b9..0000000
--- a/jscomp/test/acyc/a2_a3.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = A1_a2.v
diff --git a/jscomp/test/acyc/a3_a4.js b/jscomp/test/acyc/a3_a4.js
deleted file mode 100644
index 8102cb3..0000000
--- a/jscomp/test/acyc/a3_a4.js
+++ /dev/null
@@ -1,8 +0,0 @@
-'use strict';
-
-var A2_a3 = require("./a2_a3");
-
-var v = A2_a3.v;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/acyc/a3_a4.res b/jscomp/test/acyc/a3_a4.res
deleted file mode 100644
index acabb43..0000000
--- a/jscomp/test/acyc/a3_a4.res
+++ /dev/null
@@ -1 +0,0 @@
-include A2_a3
diff --git a/jscomp/test/acyc/a4_a5.js b/jscomp/test/acyc/a4_a5.js
deleted file mode 100644
index 771870f..0000000
--- a/jscomp/test/acyc/a4_a5.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-var A3_a4 = require("./a3_a4");
-
-console.log(A3_a4.v);
-
-var v = A3_a4.v;
-
-exports.v = v;
-/*  Not a pure module */
diff --git a/jscomp/test/acyc/a4_a5.res b/jscomp/test/acyc/a4_a5.res
deleted file mode 100644
index fe605a8..0000000
--- a/jscomp/test/acyc/a4_a5.res
+++ /dev/null
@@ -1,3 +0,0 @@
-include A3_a4
-
-Js.log(v)
diff --git a/jscomp/test/acyc/x.js b/jscomp/test/acyc/x.js
deleted file mode 100644
index 022e54a..0000000
--- a/jscomp/test/acyc/x.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict';
-
-
-var A0_a1 = /* module */[/* v */3];
-
-var A1_a2 = /* module */[/* v */3];
-
-var A2_a3 = /* module */[/* v */3];
-
-var A3_a4 = /* module */[/* v */3];
-
-console.log(3);
-
-var A4_a5 = /* module */[/* v */3];
-
-exports.A0_a1 = A0_a1;
-exports.A1_a2 = A1_a2;
-exports.A2_a3 = A2_a3;
-exports.A3_a4 = A3_a4;
-exports.A4_a5 = A4_a5;
-/*  Not a pure module */
diff --git a/jscomp/test/acyc/x.res b/jscomp/test/acyc/x.res
deleted file mode 100644
index c1e75af..0000000
--- a/jscomp/test/acyc/x.res
+++ /dev/null
@@ -1,19 +0,0 @@
-module A0_a1 = {
-  let v = 3
-}
-module A1_a2: {
-  let v: int
-} = {
-  let v = A0_a1.v
-}
-module A2_a3 = {
-  let v = A1_a2.v
-}
-module A3_a4 = {
-  include A2_a3
-}
-module A4_a5 = {
-  include A3_a4
-
-  Js.log(v)
-}
diff --git a/jscomp/test/adt_optimize_test.js b/jscomp/test/adt_optimize_test.js
deleted file mode 100644
index 7a1bc36..0000000
--- a/jscomp/test/adt_optimize_test.js
+++ /dev/null
@@ -1,220 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  switch (x) {
-    case "A" :
-        return 1;
-    case "B" :
-        return 2;
-    case "C" :
-        return 3;
-    
-  }
-}
-
-function f_0(x) {
-  switch (x) {
-    case "A" :
-        return -1;
-    case "B" :
-        return 0;
-    case "C" :
-        return 1;
-    
-  }
-}
-
-function f2(x) {
-  if (x >= 3) {
-    return "T003";
-  }
-  switch (x) {
-    case 0 :
-        return "T000";
-    case 1 :
-        return "T001";
-    case 2 :
-        return "T002";
-    
-  }
-}
-
-function f3(x) {
-  switch (x) {
-    case "X0" :
-        return "Y0";
-    case "X1" :
-        return "Y1";
-    case "X2" :
-        return "Y2";
-    case "X3" :
-        return "Y3";
-    case "X4" :
-        return "Y4";
-    
-  }
-}
-
-function f4(x) {
-  return 3;
-}
-
-function f5(x) {
-  if (typeof x !== "object") {
-    switch (x) {
-      case "A" :
-          return 1;
-      case "B" :
-          return 3;
-      case "F" :
-          return 4;
-      
-    }
-  } else {
-    switch (x.TAG) {
-      case "C" :
-      case "D" :
-          return 1;
-      case "E" :
-          return 2;
-      
-    }
-  }
-}
-
-function f6(x) {
-  if (typeof x === "object") {
-    return 1;
-  }
-  switch (x) {
-    case "A" :
-    case "B" :
-        return 0;
-    case "F" :
-        return 2;
-    
-  }
-}
-
-function f7(x) {
-  if (typeof x !== "object") {
-    switch (x) {
-      case "A" :
-          return 1;
-      case "B" :
-          return 2;
-      case "F" :
-          return -1;
-      
-    }
-  } else {
-    switch (x.TAG) {
-      case "C" :
-          return 3;
-      case "D" :
-          return 4;
-      case "E" :
-          return -1;
-      
-    }
-  }
-}
-
-function f8(x) {
-  if (typeof x !== "object") {
-    switch (x) {
-      case "T60" :
-      case "T61" :
-          return 1;
-      default:
-        return 3;
-    }
-  } else {
-    switch (x.TAG) {
-      case "T64" :
-      case "T65" :
-          return 2;
-      default:
-        return 3;
-    }
-  }
-}
-
-function f9(x) {
-  if (typeof x !== "object") {
-    if (x === "T63") {
-      return 3;
-    } else {
-      return 1;
-    }
-  }
-  switch (x.TAG) {
-    case "T64" :
-    case "T65" :
-        return 2;
-    case "T66" :
-    case "T68" :
-        return 3;
-    
-  }
-}
-
-function f10(x) {
-  if (typeof x !== "object") {
-    switch (x) {
-      case "T60" :
-          return 0;
-      case "T61" :
-          return 2;
-      case "T62" :
-          return 4;
-      case "T63" :
-          return 1;
-      
-    }
-  } else {
-    switch (x.TAG) {
-      case "T64" :
-      case "T65" :
-          return 2;
-      case "T66" :
-      case "T68" :
-          return 3;
-      
-    }
-  }
-}
-
-function f11(x) {
-  if (typeof x !== "object") {
-    return 2;
-  }
-  if (x.TAG === "D") {
-    return 1;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "adt_optimize_test.res",
-          202,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-exports.f = f;
-exports.f_0 = f_0;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.f5 = f5;
-exports.f6 = f6;
-exports.f7 = f7;
-exports.f8 = f8;
-exports.f9 = f9;
-exports.f10 = f10;
-exports.f11 = f11;
-/* No side effect */
diff --git a/jscomp/test/adt_optimize_test.res b/jscomp/test/adt_optimize_test.res
deleted file mode 100644
index 1d693e8..0000000
Binary files a/jscomp/test/adt_optimize_test.res and /dev/null differ
diff --git a/jscomp/test/alias_default_value_test.js b/jscomp/test/alias_default_value_test.js
deleted file mode 100644
index 4234d99..0000000
--- a/jscomp/test/alias_default_value_test.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function Alias_default_value_test$C0(props) {
-  var __b = props.b;
-  var __a = props.a;
-  var a = __a !== undefined ? __a : 2;
-  var b = __b !== undefined ? __b : (a << 1);
-  return a + b | 0;
-}
-
-var C0 = {
-  make: Alias_default_value_test$C0
-};
-
-function Alias_default_value_test$C1(props) {
-  var __bar = props.foo;
-  if (__bar !== undefined) {
-    return __bar;
-  } else {
-    return "";
-  }
-}
-
-var C1 = {
-  make: Alias_default_value_test$C1
-};
-
-function Alias_default_value_test$C2(props) {
-  var __a = props.a;
-  var __bar = props.foo;
-  var bar = __bar !== undefined ? __bar : "";
-  var a = __a !== undefined ? __a : bar;
-  return bar + a + props.b;
-}
-
-var C2 = {
-  make: Alias_default_value_test$C2
-};
-
-function Alias_default_value_test$C3(props) {
-  var __text = props.text;
-  if (__text !== undefined) {
-    return __text;
-  } else {
-    return "Test";
-  }
-}
-
-var C3 = {
-  make: Alias_default_value_test$C3
-};
-
-function Alias_default_value_test$C4(props) {
-  return props.a;
-}
-
-var C4 = {
-  make: Alias_default_value_test$C4
-};
-
-function Alias_default_value_test$C6(props) {
-  return props.comp.xx;
-}
-
-var C6 = {
-  make: Alias_default_value_test$C6
-};
-
-exports.C0 = C0;
-exports.C1 = C1;
-exports.C2 = C2;
-exports.C3 = C3;
-exports.C4 = C4;
-exports.C6 = C6;
-/* No side effect */
diff --git a/jscomp/test/alias_default_value_test.res b/jscomp/test/alias_default_value_test.res
deleted file mode 100644
index 68d6a8b..0000000
--- a/jscomp/test/alias_default_value_test.res
+++ /dev/null
@@ -1,45 +0,0 @@
-@@bs.config({
-  flags: ["-bs-jsx", "4"],
-})
-
-module C0 = {
-  @react.component
-  let make = (~a=2, ~b=a * 2) => {
-    React.int(a + b)
-  }
-}
-
-module C1 = {
-  @react.component
-  let make = (~foo as bar="") => {
-    React.string(bar)
-  }
-}
-
-module C2 = {
-  @react.component
-  let make = (~foo as bar="", ~a=bar, ~b) => {
-    React.string(bar ++ a ++ b)
-  }
-}
-
-module C3 = {
-  @react.component
-  let make = (~priority as _, ~text="Test") => React.string(text)
-}
-
-module C4 = {
-  @react.component
-  let make = (~a as b, ~x=true) => b
-}
-
-module C6 = {
-  module type Comp = {
-    let xx : int
-    @react.component
-    let make: unit => React.element
-  }
-
-  @react.component
-  let make = (~comp as module(Comp: Comp), ~x as (a, b)) => Comp.xx
-}
diff --git a/jscomp/test/alias_test.js b/jscomp/test/alias_test.js
deleted file mode 100644
index 0ea3140..0000000
--- a/jscomp/test/alias_test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_string = require("../../lib/js/caml_string.js");
-
-var a10 = "hello world";
-
-var a20 = a10 + "not";
-
-var v = Caml_string.get(a20, 0) === /* 'h' */104 ? 1 : 2;
-
-var a21 = a20 + a20;
-
-var a22 = "test " + (a21 + "hello");
-
-function ff(param) {
-  return "cool " + a22;
-}
-
-var a23 = ff();
-
-var a15 = a10;
-
-var b15 = 111;
-
-exports.a15 = a15;
-exports.b15 = b15;
-exports.a21 = a21;
-exports.v = v;
-exports.a23 = a23;
-exports.ff = ff;
-/* a23 Not a pure module */
diff --git a/jscomp/test/alias_test.res b/jscomp/test/alias_test.res
deleted file mode 100644
index d72b52c..0000000
--- a/jscomp/test/alias_test.res
+++ /dev/null
@@ -1,97 +0,0 @@
-let a0 = "hello "
-
-let a1 = a0
-
-let a2 = a1
-
-let a3 = a2
-
-let a4 = a3
-
-let a5 = a4
-
-let a6 = a5
-
-let a7 = a6
-
-let a8 = a7
-
-let a9 = a8
-
-let a10 = a9 ++ "world"
-
-let a11 = a10
-
-let a12 = a11
-
-let a13 = a12
-
-let a14 = a13
-
-let a15 = a14
-
-let a16 = a15
-
-let a17 = a16
-
-let a18 = a17
-
-let a19 = a18
-
-let a20 = a19 ++ "not"
-let v = if String.get(a20, 0) == 'h' {
-  1
-} else {
-  2
-}
-let a21 = a20 ++ a20
-
-let a22 = "test " ++ (a21 ++ "hello")
-
-let ff = () => "cool " ++ a22
-
-let a23 = ff()
-
-let b0 = 111
-
-let b1 = b0
-
-let b2 = b1
-
-let b3 = b2
-
-let b4 = b3
-
-let b5 = b4
-
-let b6 = b5
-
-let b7 = b6
-
-let b8 = b7
-
-let b9 = b8
-
-let f = x => b9 + x + b8
-
-let b10 = b9
-
-let b11 = b10
-
-let b12 = b11
-
-let b13 = b12
-
-let b14 = b13
-
-let b15 = b14
-
-let b16 = b15
-
-let b17 = b16
-
-let b18 = b17
-
-let b19 = b18
-
-let b20 = b19 + 1
diff --git a/jscomp/test/alias_test.resi b/jscomp/test/alias_test.resi
deleted file mode 100644
index 58b08d9..0000000
--- a/jscomp/test/alias_test.resi
+++ /dev/null
@@ -1,11 +0,0 @@
-let a15: string
-
-let b15: int
-
-let a21: string
-
-let v: int
-
-let a23: string
-
-let ff: unit => string
diff --git a/jscomp/test/and_or_tailcall_test.js b/jscomp/test/and_or_tailcall_test.js
deleted file mode 100644
index 8e5a02c..0000000
--- a/jscomp/test/and_or_tailcall_test.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-function f(b, x, _n) {
-  while(true) {
-    var n = _n;
-    if (n > 100000) {
-      return false;
-    }
-    if (!b) {
-      return false;
-    }
-    _n = n + 1 | 0;
-    continue ;
-  };
-}
-
-function or_f(b, x, _n) {
-  while(true) {
-    var n = _n;
-    if (n > 100000) {
-      return false;
-    }
-    if (b) {
-      return true;
-    }
-    _n = n + 1 | 0;
-    continue ;
-  };
-}
-
-var suites_0 = [
-  "and_tail",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: false,
-              _1: f(true, 1, 0)
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "or_tail",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: false,
-                _1: or_f(false, 1, 0)
-              };
-      })
-  ],
-  tl: /* [] */0
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("And_or_tailcall_test", suites);
-
-exports.f = f;
-exports.or_f = or_f;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/and_or_tailcall_test.res b/jscomp/test/and_or_tailcall_test.res
deleted file mode 100644
index f461662..0000000
--- a/jscomp/test/and_or_tailcall_test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-let rec f = (b, x, n) =>
-  if n > 100000 {
-    false
-  } else {
-    b && f(b, x, n + 1)
-  }
-
-let rec or_f = (b, x, n) =>
-  if n > 100000 {
-    false
-  } else {
-    b || or_f(b, x, n + 1)
-  }
-
-let suites = {
-  open Mt
-  list{
-    /* becareful inlining will defeat the test purpose here */
-    ("and_tail", _ => Eq(false, f(true, 1, 0))),
-    ("or_tail", _ => Eq(false, or_f(false, 1, 0))),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/argv_test.js b/jscomp/test/argv_test.js
deleted file mode 100644
index f15e97a..0000000
--- a/jscomp/test/argv_test.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Arg = require("../../lib/js/arg.js");
-
-function anno_fun(arg) {
-  
-}
-
-var usage_msg = "Usage:\n";
-
-var compile = {
-  contents: false
-};
-
-var test = {
-  contents: true
-};
-
-var arg_spec_0 = [
-  "-c",
-  {
-    TAG: "Set",
-    _0: compile
-  },
-  " Compile"
-];
-
-var arg_spec_1 = {
-  hd: [
-    "-d",
-    {
-      TAG: "Clear",
-      _0: test
-    },
-    " Test"
-  ],
-  tl: /* [] */0
-};
-
-var arg_spec = {
-  hd: arg_spec_0,
-  tl: arg_spec_1
-};
-
-Arg.parse_argv(undefined, [
-      "prog.exe",
-      "-c",
-      "-d"
-    ], arg_spec, anno_fun, usage_msg);
-
-if (compile.contents !== true) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "argv_test.res",
-          14,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (test.contents !== false) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "argv_test.res",
-          15,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-exports.anno_fun = anno_fun;
-exports.usage_msg = usage_msg;
-exports.compile = compile;
-exports.test = test;
-exports.arg_spec = arg_spec;
-/*  Not a pure module */
diff --git a/jscomp/test/argv_test.res b/jscomp/test/argv_test.res
deleted file mode 100644
index 2122b07..0000000
--- a/jscomp/test/argv_test.res
+++ /dev/null
@@ -1,16 +0,0 @@
-let anno_fun = arg => ()
-/* Js.log arg */
-let usage_msg = "Usage:\n"
-let compile = ref(false)
-let test = ref(true)
-let arg_spec = {
-  open Arg
-  list{("-c", Set(compile), " Compile"), ("-d", Clear(test), " Test")}
-}
-
-Arg.parse_argv(["prog.exe", "-c", "-d"], arg_spec, anno_fun, usage_msg)
-
-{
-  assert (compile.contents == true)
-  assert (test.contents == false)
-}
diff --git a/jscomp/test/ari_regress_test.js b/jscomp/test/ari_regress_test.js
deleted file mode 100644
index f61c720..0000000
--- a/jscomp/test/ari_regress_test.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-
-var g = 7;
-
-var h = {
-  contents: 0
-};
-
-function g1(x, y) {
-  var u = x + y | 0;
-  h.contents = h.contents + 1 | 0;
-  return function (xx, yy) {
-    return (xx + yy | 0) + u | 0;
-  };
-}
-
-var u = 8;
-
-var x = u + 6 | 0;
-
-var partial_arg = g1(3, 4);
-
-function v(param) {
-  return partial_arg(6, param);
-}
-
-var suites_0 = [
-  "curry",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: g,
-              _1: 7
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "curry2",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: 14,
-                _1: (Curry._1(v, 1), Curry._1(v, 1))
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "curry3",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: 14
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "File \"ari_regress_test.res\", line 35, characters 5-12",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: h.contents,
-                    _1: 1
-                  };
-          })
-      ],
-      tl: /* [] */0
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Ari_regress_test", suites);
-
-/* partial_arg Not a pure module */
diff --git a/jscomp/test/ari_regress_test.res b/jscomp/test/ari_regress_test.res
deleted file mode 100644
index 6aa7ec1..0000000
--- a/jscomp/test/ari_regress_test.res
+++ /dev/null
@@ -1,39 +0,0 @@
-let f = x => \"+"(x)
-let g = f(3, 4)
-
-let h = ref(0)
-
-let gg = (x, y) => {
-  let u = x + y
-  z => u + z
-}
-
-let g1 = (x, y) => {
-  let u = x + y
-  let () = incr(h)
-  (xx, yy) => xx + yy + u
-}
-let x = gg(3, 5, 6)
-
-let v = g1(3, 4, 6)
-
-let suites = {
-  open Mt
-  list{
-    ("curry", _ => Eq(g, 7)),
-    (
-      "curry2",
-      _ => Eq(
-        14,
-        {
-          v(1) |> ignore
-          v(1)
-        },
-      ),
-    ),
-    ("curry3", _ => Eq(x, 14)),
-    (__LOC__, _ => Eq(h.contents, 1)),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/ari_regress_test.resi b/jscomp/test/ari_regress_test.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/ari_regress_test.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/arith_lexer.js b/jscomp/test/arith_lexer.js
deleted file mode 100644
index ce03ea3..0000000
--- a/jscomp/test/arith_lexer.js
+++ /dev/null
@@ -1,190 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Lexing = require("../../lib/js/lexing.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_format = require("../../lib/js/caml_format.js");
-
-var __ocaml_lex_tables = {
-  lex_base: "\x00\x00\xf6\xff\xf7\xff\xf8\xff\xf9\xff\xfa\xff\xfb\xff\xfc\xff\
-    \x3a\x00\x85\x00\xff\xff",
-  lex_backtrk: "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \x02\x00\x01\x00\xff\xff",
-  lex_default: "\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \xff\xff\xff\xff\x00\x00",
-  lex_trans: "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x0a\x00\x0a\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x03\x00\x02\x00\x05\x00\x07\x00\x00\x00\x06\x00\x00\x00\x04\x00\
-    \x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\
-    \x09\x00\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x09\x00\x09\x00\x09\x00\
-    \x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-  lex_check: "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\xff\xff\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x09\x00\x09\x00\x09\x00\
-    \x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
-  lex_base_code: "",
-  lex_backtrk_code: "",
-  lex_default_code: "",
-  lex_trans_code: "",
-  lex_check_code: "",
-  lex_code: ""
-};
-
-function __ocaml_lex_lexeme_rec(lexbuf, ___ocaml_lex_state) {
-  while(true) {
-    var __ocaml_lex_state = ___ocaml_lex_state;
-    var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf);
-    switch (__ocaml_lex_state$1) {
-      case 0 :
-          ___ocaml_lex_state = 0;
-          continue ;
-      case 1 :
-          return {
-                  TAG: "NUMERAL",
-                  _0: Caml_format.int_of_string(Lexing.lexeme(lexbuf))
-                };
-      case 2 :
-          return {
-                  TAG: "IDENT",
-                  _0: Lexing.lexeme(lexbuf)
-                };
-      case 3 :
-          return "PLUS";
-      case 4 :
-          return "MINUS";
-      case 5 :
-          return "TIMES";
-      case 6 :
-          return "DIVIDE";
-      case 7 :
-          return "LPAREN";
-      case 8 :
-          return "RPAREN";
-      case 9 :
-          return "EOF";
-      default:
-        Curry._1(lexbuf.refill_buff, lexbuf);
-        ___ocaml_lex_state = __ocaml_lex_state$1;
-        continue ;
-    }
-  };
-}
-
-function lexeme(lexbuf) {
-  return __ocaml_lex_lexeme_rec(lexbuf, 0);
-}
-
-function str(e) {
-  switch (e.TAG) {
-    case "Numeral" :
-        return Pervasives.string_of_float(e._0);
-    case "Plus" :
-        return str(e._0) + ("+" + str(e._1));
-    case "Minus" :
-        return str(e._0) + ("-" + str(e._1));
-    case "Times" :
-        return str(e._0) + ("*" + str(e._1));
-    case "Divide" :
-        return str(e._0) + ("/" + str(e._1));
-    case "Negate" :
-        return "-" + str(e._0);
-    case "Variable" :
-        return e._0;
-    
-  }
-}
-
-exports.__ocaml_lex_tables = __ocaml_lex_tables;
-exports.lexeme = lexeme;
-exports.__ocaml_lex_lexeme_rec = __ocaml_lex_lexeme_rec;
-exports.str = str;
-/* No side effect */
diff --git a/jscomp/test/arith_lexer.mll b/jscomp/test/arith_lexer.mll
deleted file mode 100644
index 283298d..0000000
--- a/jscomp/test/arith_lexer.mll
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  open Arith_parser
-}
-
-rule lexeme = parse
-    [' ' '\t' '\r' '\n']  { lexeme lexbuf }
-  | ['0'-'9']+  { NUMERAL (float (int_of_string (Lexing.lexeme lexbuf))) }
-  | ['a'-'z''A'-'Z']+ {IDENT (Lexing.lexeme lexbuf)}
-  | '+'         { PLUS }
-  | '-'         { MINUS }
-  | '*'         { TIMES }
-  | '/'         { DIVIDE }
-  | '('         { LPAREN }
-  | ')'         { RPAREN }
-  | eof         { EOF }
-
-{
-open Arith_syntax
-let rec str e = 
-  match e with 
-  | Numeral  f -> string_of_float f 
-  | Plus (a,b) -> str a ^ "+" ^ str b 
-  | Minus (a,b) -> str a ^ "-" ^ str b 
-  | Times (a,b) -> str a ^ "*" ^ str b 
-  | Divide (a,b) -> str a ^ "/" ^ str b 
-  | Negate a -> "-" ^ str a 
-  | Variable s -> s 
-
-(* let _ = Parsing.set_trace true;; *)
-}
diff --git a/jscomp/test/arith_lexer.res b/jscomp/test/arith_lexer.res
deleted file mode 100644
index 6fdcdbf..0000000
--- a/jscomp/test/arith_lexer.res
+++ /dev/null
@@ -1,155 +0,0 @@
-open Arith_parser
-
-let __ocaml_lex_tables = {
-  Lexing.lex_base: "\000\000\246\255\247\255\248\255\249\255\250\255\251\255\252\255\
-    \058\000\133\000\255\255",
-  Lexing.lex_backtrk: "\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \002\000\001\000\255\255",
-  Lexing.lex_default: "\255\255\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \255\255\255\255\000\000",
-  Lexing.lex_trans: "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\010\000\010\000\000\000\000\000\010\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \003\000\002\000\005\000\007\000\000\000\006\000\000\000\004\000\
-    \009\000\009\000\009\000\009\000\009\000\009\000\009\000\009\000\
-    \009\000\009\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\009\000\009\000\009\000\
-    \009\000\009\000\009\000\009\000\009\000\009\000\009\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000",
-  Lexing.lex_check: "\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\000\000\000\000\255\255\255\255\000\000\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \000\000\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \000\000\000\000\000\000\000\000\255\255\000\000\255\255\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\255\255\255\255\255\255\255\255\255\255\
-    \255\255\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\255\255\255\255\255\255\
-    \255\255\255\255\255\255\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\009\000\009\000\009\000\
-    \009\000\009\000\009\000\009\000\009\000\009\000\009\000\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \000\000\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255",
-  Lexing.lex_base_code: "",
-  Lexing.lex_backtrk_code: "",
-  Lexing.lex_default_code: "",
-  Lexing.lex_trans_code: "",
-  Lexing.lex_check_code: "",
-  Lexing.lex_code: "",
-}
-
-let rec lexeme = lexbuf => __ocaml_lex_lexeme_rec(lexbuf, 0)
-and __ocaml_lex_lexeme_rec = (lexbuf, __ocaml_lex_state) =>
-  switch Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf) {
-  | 0 => lexeme(lexbuf)
-
-  | 1 => NUMERAL(float(int_of_string(Lexing.lexeme(lexbuf))))
-
-  | 2 => IDENT(Lexing.lexeme(lexbuf))
-
-  | 3 => PLUS
-
-  | 4 => MINUS
-
-  | 5 => TIMES
-
-  | 6 => DIVIDE
-
-  | 7 => LPAREN
-
-  | 8 => RPAREN
-
-  | 9 => EOF
-
-  | __ocaml_lex_state =>
-    lexbuf.Lexing.refill_buff(lexbuf)
-    __ocaml_lex_lexeme_rec(lexbuf, __ocaml_lex_state)
-  }
-open Arith_syntax
-let rec str = e =>
-  switch e {
-  | Numeral(f) => string_of_float(f)
-  | Plus(a, b) => str(a) ++ ("+" ++ str(b))
-  | Minus(a, b) => str(a) ++ ("-" ++ str(b))
-  | Times(a, b) => str(a) ++ ("*" ++ str(b))
-  | Divide(a, b) => str(a) ++ ("/" ++ str(b))
-  | Negate(a) => "-" ++ str(a)
-  | Variable(s) => s
-  }
-
-/* let _ = Parsing.set_trace true;; */
diff --git a/jscomp/test/arith_parser.js b/jscomp/test/arith_parser.js
deleted file mode 100644
index dcbd92c..0000000
--- a/jscomp/test/arith_parser.js
+++ /dev/null
@@ -1,263 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Parsing = require("../../lib/js/parsing.js");
-
-var yytransl_const = [
-  259,
-  260,
-  261,
-  262,
-  263,
-  264,
-  265,
-  0,
-  0
-];
-
-var yytransl_block = [
-  257,
-  258,
-  0
-];
-
-var yylhs = "\xff\xff\
-\x01\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\x02\x00\
-\x02\x00\x00\x00";
-
-var yylen = "\x02\x00\
-\x02\x00\x01\x00\x01\x00\x03\x00\x03\x00\x03\x00\x03\x00\x02\x00\
-\x03\x00\x02\x00";
-
-var yydefred = "\x00\x00\
-\x00\x00\x00\x00\x02\x00\x03\x00\x00\x00\x00\x00\x0a\x00\x00\x00\
-\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x09\x00\
-\x00\x00\x00\x00\x06\x00\x07\x00";
-
-var yydgoto = "\x02\x00\
-\x07\x00\x08\x00";
-
-var yysindex = "\xff\xff\
-\x10\xff\x00\x00\x00\x00\x00\x00\x10\xff\x10\xff\x00\x00\x0a\x00\
-\x00\x00\x16\xff\x10\xff\x10\xff\x10\xff\x10\xff\x00\x00\x00\x00\
-\xff\xfe\xff\xfe\x00\x00\x00\x00";
-
-var yyrindex = "\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x01\x00\x03\x00\x00\x00\x00\x00";
-
-var yygindex = "\x00\x00\
-\x00\x00\x02\x00";
-
-var yytable = "\x01\x00\
-\x04\x00\x00\x00\x05\x00\x0d\x00\x0e\x00\x00\x00\x09\x00\x0a\x00\
-\x00\x00\x0f\x00\x00\x00\x00\x00\x11\x00\x12\x00\x13\x00\x14\x00\
-\x03\x00\x04\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x06\x00\
-\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x00\x00\x00\x00\x10\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x04\x00\x04\x00\x05\x00\x05\x00\x00\x00\
-\x00\x00\x04\x00\x00\x00\x05\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00";
-
-var yycheck = "\x01\x00\
-\x00\x00\xff\xff\x00\x00\x05\x01\x06\x01\xff\xff\x05\x00\x06\x00\
-\xff\xff\x00\x00\xff\xff\xff\xff\x0b\x00\x0c\x00\x0d\x00\x0e\x00\
-\x01\x01\x02\x01\xff\xff\x04\x01\xff\xff\xff\xff\xff\xff\x08\x01\
-\x03\x01\x04\x01\x05\x01\x06\x01\xff\xff\xff\xff\x09\x01\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-\xff\xff\xff\xff\xff\xff\x03\x01\x04\x01\x03\x01\x04\x01\xff\xff\
-\xff\xff\x09\x01\xff\xff\x09\x01\x03\x01\x04\x01\x05\x01\x06\x01";
-
-var yynames_const = "\
-  PLUS\x00\
-  MINUS\x00\
-  TIMES\x00\
-  DIVIDE\x00\
-  UMINUS\x00\
-  LPAREN\x00\
-  RPAREN\x00\
-  EOF\x00\
-  ";
-
-var yynames_block = "\
-  NUMERAL\x00\
-  IDENT\x00\
-  ";
-
-var yyact = [
-  (function (param) {
-      throw {
-            RE_EXN_ID: "Failure",
-            _1: "parser",
-            Error: new Error()
-          };
-    }),
-  (function (__caml_parser_env) {
-      return Parsing.peek_val(__caml_parser_env, 1);
-    }),
-  (function (__caml_parser_env) {
-      var _1 = Parsing.peek_val(__caml_parser_env, 0);
-      return {
-              TAG: "Numeral",
-              _0: _1
-            };
-    }),
-  (function (__caml_parser_env) {
-      var _1 = Parsing.peek_val(__caml_parser_env, 0);
-      return {
-              TAG: "Variable",
-              _0: _1
-            };
-    }),
-  (function (__caml_parser_env) {
-      var _1 = Parsing.peek_val(__caml_parser_env, 2);
-      var _3 = Parsing.peek_val(__caml_parser_env, 0);
-      return {
-              TAG: "Plus",
-              _0: _1,
-              _1: _3
-            };
-    }),
-  (function (__caml_parser_env) {
-      var _1 = Parsing.peek_val(__caml_parser_env, 2);
-      var _3 = Parsing.peek_val(__caml_parser_env, 0);
-      return {
-              TAG: "Minus",
-              _0: _1,
-              _1: _3
-            };
-    }),
-  (function (__caml_parser_env) {
-      var _1 = Parsing.peek_val(__caml_parser_env, 2);
-      var _3 = Parsing.peek_val(__caml_parser_env, 0);
-      return {
-              TAG: "Times",
-              _0: _1,
-              _1: _3
-            };
-    }),
-  (function (__caml_parser_env) {
-      var _1 = Parsing.peek_val(__caml_parser_env, 2);
-      var _3 = Parsing.peek_val(__caml_parser_env, 0);
-      return {
-              TAG: "Divide",
-              _0: _1,
-              _1: _3
-            };
-    }),
-  (function (__caml_parser_env) {
-      var _2 = Parsing.peek_val(__caml_parser_env, 0);
-      return {
-              TAG: "Negate",
-              _0: _2
-            };
-    }),
-  (function (__caml_parser_env) {
-      return Parsing.peek_val(__caml_parser_env, 1);
-    }),
-  (function (__caml_parser_env) {
-      throw {
-            RE_EXN_ID: Parsing.YYexit,
-            _1: Parsing.peek_val(__caml_parser_env, 0),
-            Error: new Error()
-          };
-    })
-];
-
-var yytables = {
-  actions: yyact,
-  transl_const: yytransl_const,
-  transl_block: yytransl_block,
-  lhs: yylhs,
-  len: yylen,
-  defred: yydefred,
-  dgoto: yydgoto,
-  sindex: yysindex,
-  rindex: yyrindex,
-  gindex: yygindex,
-  tablesize: 272,
-  table: yytable,
-  check: yycheck,
-  error_function: Parsing.parse_error,
-  names_const: yynames_const,
-  names_block: yynames_block
-};
-
-function toplevel(lexfun, lexbuf) {
-  return Parsing.yyparse(yytables, 1, lexfun, lexbuf);
-}
-
-var yytablesize = 272;
-
-exports.yytransl_const = yytransl_const;
-exports.yytransl_block = yytransl_block;
-exports.yylhs = yylhs;
-exports.yylen = yylen;
-exports.yydefred = yydefred;
-exports.yydgoto = yydgoto;
-exports.yysindex = yysindex;
-exports.yyrindex = yyrindex;
-exports.yygindex = yygindex;
-exports.yytablesize = yytablesize;
-exports.yytable = yytable;
-exports.yycheck = yycheck;
-exports.yynames_const = yynames_const;
-exports.yynames_block = yynames_block;
-exports.yyact = yyact;
-exports.yytables = yytables;
-exports.toplevel = toplevel;
-/* No side effect */
diff --git a/jscomp/test/arith_parser.mly b/jscomp/test/arith_parser.mly
deleted file mode 100644
index 95b429b..0000000
--- a/jscomp/test/arith_parser.mly
+++ /dev/null
@@ -1,48 +0,0 @@
-%{
-open Arith_syntax
-%}
-
-
-/* Lexemes */
-%token <float> NUMERAL
-%token <string> IDENT
-%token PLUS
-%token MINUS
-%token TIMES
-%token DIVIDE
-%token UMINUS
-%token LPAREN
-%token RPAREN
-%token EOF
-
-/* Precedence and associativity */
-%left PLUS MINUS
-%left TIMES DIVIDE
-%nonassoc UMINUS
-
-/* Top level rule */
-%start toplevel
-%type <Arith_syntax.expression> toplevel
-
-%%
-
-/* Grammar */
-
-toplevel: expression EOF { $1 }
-;
-
-expression:
-  | NUMERAL                           { Numeral $1 }
-  | IDENT                           { Variable $1 } 
-  | expression PLUS   expression      { Plus ($1, $3) }
-  | expression MINUS  expression      { Minus ($1, $3) }
-  | expression TIMES  expression      { Times ($1, $3) }
-  | expression DIVIDE expression      { Divide ($1, $3) }
-  | MINUS expression %prec UMINUS     { Negate $2 } 
-  | LPAREN expression RPAREN          { $2 }
-;
-
-%% 
-
-
-
diff --git a/jscomp/test/arith_parser.res b/jscomp/test/arith_parser.res
deleted file mode 100644
index aaa9d82..0000000
--- a/jscomp/test/arith_parser.res
+++ /dev/null
@@ -1,213 +0,0 @@
-type token =
-  | NUMERAL(float)
-  | IDENT(string)
-  | PLUS
-  | MINUS
-  | TIMES
-  | DIVIDE
-  | UMINUS
-  | LPAREN
-  | RPAREN
-  | EOF
-
-open Parsing
-let _ = parse_error
-open Arith_syntax
-
-let yytransl_const = [
-  259 /* PLUS */,
-  260 /* MINUS */,
-  261 /* TIMES */,
-  262 /* DIVIDE */,
-  263 /* UMINUS */,
-  264 /* LPAREN */,
-  265 /* RPAREN */,
-  0 /* EOF */,
-  0,
-]
-
-let yytransl_block = [257 /* NUMERAL */, 258 /* IDENT */, 0]
-
-let yylhs = "\255\255\
-\001\000\002\000\002\000\002\000\002\000\002\000\002\000\002\000\
-\002\000\000\000"
-
-let yylen = "\002\000\
-\002\000\001\000\001\000\003\000\003\000\003\000\003\000\002\000\
-\003\000\002\000"
-
-let yydefred = "\000\000\
-\000\000\000\000\002\000\003\000\000\000\000\000\010\000\000\000\
-\008\000\000\000\000\000\000\000\000\000\000\000\001\000\009\000\
-\000\000\000\000\006\000\007\000"
-
-let yydgoto = "\002\000\
-\007\000\008\000"
-
-let yysindex = "\255\255\
-\016\255\000\000\000\000\000\000\016\255\016\255\000\000\010\000\
-\000\000\022\255\016\255\016\255\016\255\016\255\000\000\000\000\
-\255\254\255\254\000\000\000\000"
-
-let yyrindex = "\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\001\000\003\000\000\000\000\000"
-
-let yygindex = "\000\000\
-\000\000\002\000"
-
-let yytablesize = 272
-let yytable = "\001\000\
-\004\000\000\000\005\000\013\000\014\000\000\000\009\000\010\000\
-\000\000\015\000\000\000\000\000\017\000\018\000\019\000\020\000\
-\003\000\004\000\000\000\005\000\000\000\000\000\000\000\006\000\
-\011\000\012\000\013\000\014\000\000\000\000\000\016\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-\000\000\000\000\000\000\004\000\004\000\005\000\005\000\000\000\
-\000\000\004\000\000\000\005\000\011\000\012\000\013\000\014\000"
-
-let yycheck = "\001\000\
-\000\000\255\255\000\000\005\001\006\001\255\255\005\000\006\000\
-\255\255\000\000\255\255\255\255\011\000\012\000\013\000\014\000\
-\001\001\002\001\255\255\004\001\255\255\255\255\255\255\008\001\
-\003\001\004\001\005\001\006\001\255\255\255\255\009\001\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-\255\255\255\255\255\255\003\001\004\001\003\001\004\001\255\255\
-\255\255\009\001\255\255\009\001\003\001\004\001\005\001\006\001"
-
-let yynames_const = "\
-  PLUS\000\
-  MINUS\000\
-  TIMES\000\
-  DIVIDE\000\
-  UMINUS\000\
-  LPAREN\000\
-  RPAREN\000\
-  EOF\000\
-  "
-
-let yynames_block = "\
-  NUMERAL\000\
-  IDENT\000\
-  "
-
-let yyact = [
-  _ => failwith("parser"),
-  __caml_parser_env => {
-    let _1: 'expression = Parsing.peek_val(__caml_parser_env, 1)
-    Obj.repr((_1: Arith_syntax.expression))
-  },
-  __caml_parser_env => {
-    let _1: float = Parsing.peek_val(__caml_parser_env, 0)
-    Obj.repr((Numeral(_1): 'expression))
-  },
-  __caml_parser_env => {
-    let _1: string = Parsing.peek_val(__caml_parser_env, 0)
-    Obj.repr((Variable(_1): 'expression))
-  },
-  __caml_parser_env => {
-    let _1: 'expression = Parsing.peek_val(__caml_parser_env, 2)
-    let _3: 'expression = Parsing.peek_val(__caml_parser_env, 0)
-    Obj.repr((Plus(_1, _3): 'expression))
-  },
-  __caml_parser_env => {
-    let _1: 'expression = Parsing.peek_val(__caml_parser_env, 2)
-    let _3: 'expression = Parsing.peek_val(__caml_parser_env, 0)
-    Obj.repr((Minus(_1, _3): 'expression))
-  },
-  __caml_parser_env => {
-    let _1: 'expression = Parsing.peek_val(__caml_parser_env, 2)
-    let _3: 'expression = Parsing.peek_val(__caml_parser_env, 0)
-    Obj.repr((Times(_1, _3): 'expression))
-  },
-  __caml_parser_env => {
-    let _1: 'expression = Parsing.peek_val(__caml_parser_env, 2)
-    let _3: 'expression = Parsing.peek_val(__caml_parser_env, 0)
-    Obj.repr((Divide(_1, _3): 'expression))
-  },
-  __caml_parser_env => {
-    let _2: 'expression = Parsing.peek_val(__caml_parser_env, 0)
-    Obj.repr((Negate(_2): 'expression))
-  },
-  __caml_parser_env => {
-    let _2: 'expression = Parsing.peek_val(__caml_parser_env, 1)
-    Obj.repr((_2: 'expression))
-  },
-  /* Entry toplevel */
-  __caml_parser_env => raise(Parsing.YYexit(Parsing.peek_val(__caml_parser_env, 0))),
-]
-let yytables = {
-  Parsing.actions: yyact,
-  Parsing.transl_const: yytransl_const,
-  Parsing.transl_block: yytransl_block,
-  Parsing.lhs: yylhs,
-  Parsing.len: yylen,
-  Parsing.defred: yydefred,
-  Parsing.dgoto: yydgoto,
-  Parsing.sindex: yysindex,
-  Parsing.rindex: yyrindex,
-  Parsing.gindex: yygindex,
-  Parsing.tablesize: yytablesize,
-  Parsing.table: yytable,
-  Parsing.check: yycheck,
-  Parsing.error_function: parse_error,
-  Parsing.names_const: yynames_const,
-  Parsing.names_block: yynames_block,
-}
-let toplevel = (lexfun: Lexing.lexbuf => token, lexbuf: Lexing.lexbuf): Arith_syntax.expression =>
-  Parsing.yyparse(yytables, 1, lexfun, lexbuf)
diff --git a/jscomp/test/arith_syntax.js b/jscomp/test/arith_syntax.js
deleted file mode 100644
index d56fe97..0000000
--- a/jscomp/test/arith_syntax.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Pervasives = require("../../lib/js/pervasives.js");
-
-function str(e) {
-  switch (e.TAG) {
-    case "Numeral" :
-        return Pervasives.string_of_float(e._0);
-    case "Plus" :
-        return str(e._0) + ("+" + str(e._1));
-    case "Minus" :
-        return str(e._0) + ("-" + str(e._1));
-    case "Times" :
-        return str(e._0) + ("*" + str(e._1));
-    case "Divide" :
-        return str(e._0) + ("/" + str(e._1));
-    case "Negate" :
-        return "-" + str(e._0);
-    case "Variable" :
-        return e._0;
-    
-  }
-}
-
-exports.str = str;
-/* No side effect */
diff --git a/jscomp/test/arith_syntax.res b/jscomp/test/arith_syntax.res
deleted file mode 100644
index 0a5820d..0000000
--- a/jscomp/test/arith_syntax.res
+++ /dev/null
@@ -1,19 +0,0 @@
-type rec expression =
-  | /** non-negative integer constant */ Numeral(float)
-  | /** Addition [e1 + e2] */  Plus(expression, expression)
-  | /** Difference [e1 - e2] */  Minus(expression, expression)
-  | /** Product [e1 * e2] */  Times(expression, expression)
-  | /** Quotient [e1 / e2] */  Divide(expression, expression)
-  | /** Opposite value [-e] */  Negate(expression)
-  | Variable(string)
-
-let rec str = e =>
-  switch e {
-  | Numeral(f) => string_of_float(f)
-  | Plus(a, b) => str(a) ++ ("+" ++ str(b))
-  | Minus(a, b) => str(a) ++ ("-" ++ str(b))
-  | Times(a, b) => str(a) ++ ("*" ++ str(b))
-  | Divide(a, b) => str(a) ++ ("/" ++ str(b))
-  | Negate(a) => "-" ++ str(a)
-  | Variable(s) => s
-  }
diff --git a/jscomp/test/arity.js b/jscomp/test/arity.js
deleted file mode 100644
index e265276..0000000
--- a/jscomp/test/arity.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function u(f, a, b) {
-  console.log(f(a, b));
-  console.log(f(a, b));
-}
-
-function u2(f, a, b) {
-  console.log(Curry._2(f, a, b));
-  console.log(Curry._2(f, a, b));
-}
-
-function f(x, y) {
-  return x + y | 0;
-}
-
-function add(prim0, prim1) {
-  return prim0 + prim1 | 0;
-}
-
-function h(u) {
-  var m = u.hi;
-  return m(1, 2);
-}
-
-var nested = {
-  x: {
-    y: 3
-  }
-};
-
-exports.u = u;
-exports.u2 = u2;
-exports.f = f;
-exports.add = add;
-exports.h = h;
-exports.nested = nested;
-/* No side effect */
diff --git a/jscomp/test/arity.res b/jscomp/test/arity.res
deleted file mode 100644
index 18f818e..0000000
--- a/jscomp/test/arity.res
+++ /dev/null
@@ -1,39 +0,0 @@
-type t = (. ~x: int, ~y: int) => int
-
-let u = (. ~f: t, a, b) => {
-  f(. ~x=a, ~y=b)->Js.log
-  f(. ~y=b, ~x=a)->Js.log
-}
-
-type t0 = (~x: int, ~y: int) => int
-
-let u2 = (~f: t0, a, b) => {
-  f(~x=a, ~y=b)->Js.log
-  f(~y=b, ~x=a)->Js.log
-}
-
-let f = (. ~x, y) => x + y
-let add = \"+"
-// let u = f(.3,~x=2,1);
-// This function has arity2 but was expected arity3
-
-// let h = f (1, 2) ;
-// This function has uncurried type, it needs to be applied in ucurried style
-// This function has uncurried type, it needs to be applied in ucurried style
-
-// let h = add(.1,2);
-// This function is a curried function where an uncurried function is expected
-
-let // This function has arity2 but was expected arity3
-
-// This expression has type string but an expression was expected of type
-
-// This function is applied to arguments
-// This function is applied to arguments -- weird message
-h = u => {
-  let m = u["hi"]
-  m(. 1, 2)
-}
-
-//
-let nested = ({"x": {"y": 3}}: {"x": {"y": int}})
diff --git a/jscomp/test/arity_deopt.js b/jscomp/test/arity_deopt.js
deleted file mode 100644
index 2a17561..0000000
--- a/jscomp/test/arity_deopt.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f0(x, y, z) {
-  return (x + y | 0) + z | 0;
-}
-
-function f1(x) {
-  return function (y, z) {
-    return (x + y | 0) + z | 0;
-  };
-}
-
-function f2(x, y) {
-  return function (z) {
-    return (x + y | 0) + z | 0;
-  };
-}
-
-function f3(x) {
-  return function (y, z) {
-    return (x + y | 0) + z | 0;
-  };
-}
-
-eq("File \"arity_deopt.res\", line 47, characters 11-18", 6, 6);
-
-eq("File \"arity_deopt.res\", line 48, characters 11-18", 6, (function (y, z) {
-          return (1 + y | 0) + z | 0;
-        })(2, 3));
-
-eq("File \"arity_deopt.res\", line 49, characters 11-18", 6, 6);
-
-eq("File \"arity_deopt.res\", line 50, characters 11-18", 6, (function (y, z) {
-          return (1 + y | 0) + z | 0;
-        })(2, 3));
-
-Mt.from_pair_suites("Arity_deopt", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f0 = f0;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-/*  Not a pure module */
diff --git a/jscomp/test/arity_deopt.res b/jscomp/test/arity_deopt.res
deleted file mode 100644
index 6eb9cb6..0000000
--- a/jscomp/test/arity_deopt.res
+++ /dev/null
@@ -1,52 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-/* let f = fun x y */
-
-/* let [@bs] f x y = .. */
-
-/* let! f x y = */
-/* let! x = f x y in */
-/* let! y = f x y in */
-/* let! z = f x y in */
-/* return (x + y + z ) */
-
-/* let f x y = */
-/* let@bs z = f x y in */
-/* let@b y = f x y in */
-/* let@z z = f x y in */
-/* return (x + y + z ) */
-
-let f0 = (. x, y, z) => x + y + z
-/* catch up. In OCaml we can not tell the difference from below
-   {[
-     let f = fun [@bs] x y z -> x + y + z 
-   ]}
-*/
-let f1 = x => (. y, z) => x + y + z
-
-let f2 = (. x, y) => {
-  let a = x
-  z => a + y + z
-}
-
-let f3 = x => {
-  let a = x
-  (. y, z) => a + y + z
-}
-/* be careful! When you start optimize functions of [@bs], its call site invariant 
-   (Ml_app) will not hold any more.
-   So the best is never shrink functons which could change arity
-*/
-let () = {
-  \"@@"(eq(__LOC__, 6), f0(. 1, 2, 3))
-  \"@@"(eq(__LOC__, 6), f1(1)(. 2, 3))
-  \"@@"(eq(__LOC__, 6), f2(. 1, 2)(3))
-  \"@@"(eq(__LOC__, 6), f3(1)(. 2, 3))
-}
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/arity_infer.js b/jscomp/test/arity_infer.js
deleted file mode 100644
index 2abbfa1..0000000
--- a/jscomp/test/arity_infer.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function f0(x) {
-  var tmp;
-  if (x > 3) {
-    tmp = (function (x) {
-        return x + 1 | 0;
-      });
-  } else {
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  }
-  return tmp(3);
-}
-
-function f1(x) {
-  throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
-  return Curry._1(undefined, x);
-}
-
-function f3(x) {
-  var tmp;
-  switch (x) {
-    case 0 :
-        tmp = (function (x) {
-            return x + 1 | 0;
-          });
-        break;
-    case 1 :
-        tmp = (function (x) {
-            return x + 2 | 0;
-          });
-        break;
-    case 2 :
-        tmp = (function (x) {
-            return x + 3 | 0;
-          });
-        break;
-    case 3 :
-        tmp = (function (x) {
-            return x + 4 | 0;
-          });
-        break;
-    default:
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-  }
-  return tmp(3);
-}
-
-exports.f0 = f0;
-exports.f1 = f1;
-exports.f3 = f3;
-/* No side effect */
diff --git a/jscomp/test/arity_infer.res b/jscomp/test/arity_infer.res
deleted file mode 100644
index dd88860..0000000
--- a/jscomp/test/arity_infer.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let f0 = x =>
-  (
-    if x > 3 {
-      x => x + 1
-    } else {
-      raise(Not_found)
-    }
-  )(3)
-
-let f1 = x => (raise(Not_found): _ => _)(x)
-
-let f3 = x =>
-  (
-    switch x {
-    | 0 => x => x + 1
-    | 1 => x => x + 2
-    | 2 => x => x + 3
-    | 3 => x => x + 4
-    | _ => raise(Not_found)
-    }
-  )(3)
diff --git a/jscomp/test/array_data_util.js b/jscomp/test/array_data_util.js
deleted file mode 100644
index 7a84658..0000000
--- a/jscomp/test/array_data_util.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Belt_Array = require("../../lib/js/belt_Array.js");
-
-function range(i, j) {
-  return Belt_Array.makeBy((j - i | 0) + 1 | 0, (function (k) {
-                return k + i | 0;
-              }));
-}
-
-function randomRange(i, j) {
-  var v = Belt_Array.makeBy((j - i | 0) + 1 | 0, (function (k) {
-          return k + i | 0;
-        }));
-  Belt_Array.shuffleInPlace(v);
-  return v;
-}
-
-var A;
-
-exports.A = A;
-exports.range = range;
-exports.randomRange = randomRange;
-/* No side effect */
diff --git a/jscomp/test/array_data_util.res b/jscomp/test/array_data_util.res
deleted file mode 100644
index 22cb608..0000000
--- a/jscomp/test/array_data_util.res
+++ /dev/null
@@ -1,10 +0,0 @@
-module A = Belt.Array
-
-/* [] */
-let range = (i, j) => A.makeBy(j - i + 1, k => k + i)
-
-let randomRange = (i, j) => {
-  let v = A.makeBy(j - i + 1, k => k + i)
-  A.shuffleInPlace(v)
-  v
-}
diff --git a/jscomp/test/array_safe_get.js b/jscomp/test/array_safe_get.js
deleted file mode 100644
index 7a539a1..0000000
--- a/jscomp/test/array_safe_get.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var x = [
-  1,
-  2
-];
-
-var y;
-
-try {
-  y = Caml_array.get(x, 3);
-}
-catch (raw_msg){
-  var msg = Caml_js_exceptions.internalToOCamlException(raw_msg);
-  if (msg.RE_EXN_ID === "Invalid_argument") {
-    console.log(msg._1);
-    y = 0;
-  } else {
-    throw msg;
-  }
-}
-
-exports.x = x;
-exports.y = y;
-/* y Not a pure module */
diff --git a/jscomp/test/array_safe_get.res b/jscomp/test/array_safe_get.res
deleted file mode 100644
index 7c85012..0000000
--- a/jscomp/test/array_safe_get.res
+++ /dev/null
@@ -1,6 +0,0 @@
-let x = [1, 2]
-let y = try x[3] catch {
-| Invalid_argument(msg) =>
-  print_endline(msg)
-  0
-}
diff --git a/jscomp/test/array_subtle_test.js b/jscomp/test/array_subtle_test.js
deleted file mode 100644
index be8be15..0000000
--- a/jscomp/test/array_subtle_test.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, param) {
-  var y = param[1];
-  var x = param[0];
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var v = [
-  1,
-  2,
-  3,
-  3
-];
-
-eq("File \"array_subtle_test.res\", line 11, characters 12-19", [
-      4,
-      v.length
-    ]);
-
-eq("File \"array_subtle_test.res\", line 14, characters 5-12", [
-      5,
-      v.push(3)
-    ]);
-
-eq("File \"array_subtle_test.res\", line 15, characters 5-12", [
-      5,
-      v.length
-    ]);
-
-eq("File \"array_subtle_test.res\", line 16, characters 5-12", [
-      5,
-      v.length
-    ]);
-
-eq("File \"array_subtle_test.res\", line 20, characters 5-12", [
-      3,
-      Caml_array.get(v, 2)
-    ]);
-
-Caml_array.set(v, 2, 4);
-
-eq("File \"array_subtle_test.res\", line 22, characters 5-12", [
-      4,
-      Caml_array.get(v, 2)
-    ]);
-
-while(v.length > 0) {
-  v.pop();
-};
-
-eq("File \"array_subtle_test.res\", line 29, characters 5-12", [
-      0,
-      v.length
-    ]);
-
-function f(v) {
-  var x = v.pop();
-  if (x !== undefined) {
-    console.log("hi");
-  } else {
-    console.log("hi2");
-  }
-  console.log((v.pop(), undefined));
-}
-
-function fff(x) {
-  return true;
-}
-
-function fff2(x) {
-  if (x.length >= 10) {
-    console.log("hi");
-    return ;
-  }
-  
-}
-
-function fff3(x) {
-  return 1;
-}
-
-function fff4(x) {
-  if (x.length !== 0) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-eq("File \"array_subtle_test.res\", line 61, characters 3-10", [
-      fff3([]),
-      1
-    ]);
-
-eq("File \"array_subtle_test.res\", line 62, characters 3-10", [
-      fff4([]),
-      2
-    ]);
-
-eq("File \"array_subtle_test.res\", line 63, characters 3-10", [
-      fff4([1]),
-      1
-    ]);
-
-Mt.from_pair_suites("Array_subtle_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.v = v;
-exports.f = f;
-exports.fff = fff;
-exports.fff2 = fff2;
-exports.fff3 = fff3;
-exports.fff4 = fff4;
-/*  Not a pure module */
diff --git a/jscomp/test/array_subtle_test.res b/jscomp/test/array_subtle_test.res
deleted file mode 100644
index 59db33e..0000000
--- a/jscomp/test/array_subtle_test.res
+++ /dev/null
@@ -1,64 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, (x, y)) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let v = [1, 2, 3, 3]
-
-let () = eq(__LOC__, (4, Array.length(v)))
-
-let () = {
-  eq(__LOC__, (5, Js.Array2.push(v, 3))) /* in Js array length can be changing .. */
-  eq(__LOC__, (5, Array.length(v)))
-  eq(__LOC__, (5, Js.Array2.length(v)))
-}
-
-let () = {
-  eq(__LOC__, (3, v[2]))
-  v[2] = 4
-  eq(__LOC__, (4, v[2]))
-} /* should not inline */
-
-let () = {
-  while Js.Array2.length(v) > 0 {
-    \"@@"(ignore, Js.Array2.pop(v))
-  }
-  eq(__LOC__, (0, Js.Array2.length(v)))
-}
-
-let f = v => {
-  switch Js.Array2.pop(v) {
-  | Some(x) => Js.log("hi")
-  | None => Js.log("hi2")
-  }
-  Js.log(\"@@"(ignore, Js.Array2.pop(v)))
-}
-
-let fff = x => Array.length(x) >= 0
-
-let fff2 = x =>
-  if Array.length(x) >= 10 {
-    Js.log("hi")
-  }
-
-let fff3 = x =>
-  if Array.length(x) >= 0 {
-    1
-  } else {
-    2
-  }
-
-let fff4 = x =>
-  if Array.length(x) > 0 {
-    1
-  } else {
-    2
-  }
-
-eq(__LOC__, (fff3([]), 1))
-eq(__LOC__, (fff4([]), 2))
-eq(__LOC__, (fff4([1]), 1))
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/array_test.js b/jscomp/test/array_test.js
deleted file mode 100644
index a12d2f9..0000000
--- a/jscomp/test/array_test.js
+++ /dev/null
@@ -1,373 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function starts_with(xs, prefix, p) {
-  var H = /* @__PURE__ */Caml_exceptions.create("H");
-  var len1 = xs.length;
-  var len2 = prefix.length;
-  if (len2 > len1) {
-    return false;
-  }
-  try {
-    for(var i = 0; i < len2; ++i){
-      if (!Curry._2(p, Caml_array.get(xs, i), Caml_array.get(prefix, i))) {
-        throw {
-              RE_EXN_ID: H,
-              Error: new Error()
-            };
-      }
-      
-    }
-    return true;
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === H) {
-      return false;
-    }
-    throw exn;
-  }
-}
-
-function is_sorted(x) {
-  var len = x.length;
-  var _i = 0;
-  while(true) {
-    var i = _i;
-    if (i >= (len - 1 | 0)) {
-      return true;
-    }
-    if (!Caml_obj.lessthan(Caml_array.get(x, i), Caml_array.get(x, i + 1 | 0))) {
-      return false;
-    }
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-var array_suites_0 = [
-  "init",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: $$Array.init(5, (function (x) {
-                      return x;
-                    })),
-              _1: [
-                0,
-                1,
-                2,
-                3,
-                4
-              ]
-            };
-    })
-];
-
-var array_suites_1 = {
-  hd: [
-    "toList",
-    (function (param) {
-        var aux = function (xs) {
-          return List.fold_left((function (acc, param) {
-                        return {
-                                hd: [
-                                  $$Array.to_list(param[0]),
-                                  param[1]
-                                ],
-                                tl: acc
-                              };
-                      }), /* [] */0, xs);
-        };
-        var match = List.split(aux({
-                  hd: [
-                    [],
-                    /* [] */0
-                  ],
-                  tl: /* [] */0
-                }));
-        return {
-                TAG: "Eq",
-                _0: match[0],
-                _1: match[1]
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "concat",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: [
-                    0,
-                    1,
-                    2,
-                    3,
-                    4,
-                    5
-                  ],
-                  _1: Caml_array.concat({
-                        hd: [
-                          0,
-                          1,
-                          2
-                        ],
-                        tl: {
-                          hd: [
-                            3,
-                            4
-                          ],
-                          tl: {
-                            hd: [],
-                            tl: {
-                              hd: [5],
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      })
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "make",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: [
-                      Caml_array.make(100, /* 'a' */97),
-                      Caml_array.make_float(100)
-                    ],
-                    _1: [
-                      $$Array.init(100, (function (param) {
-                              return /* 'a' */97;
-                            })),
-                      $$Array.init(100, (function (param) {
-                              return 0;
-                            }))
-                    ]
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "sub",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: $$Array.sub([
-                            0,
-                            1,
-                            2,
-                            3,
-                            4
-                          ], 2, 2),
-                      _1: [
-                        2,
-                        3
-                      ]
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "blit",
-            (function (param) {
-                var u = [
-                  100,
-                  0,
-                  0
-                ];
-                var v = $$Array.init(3, (function (x) {
-                        return (x << 1);
-                      }));
-                $$Array.blit(v, 1, u, 1, 2);
-                return {
-                        TAG: "Eq",
-                        _0: [
-                          [
-                            0,
-                            2,
-                            4
-                          ],
-                          [
-                            100,
-                            2,
-                            4
-                          ]
-                        ],
-                        _1: [
-                          v,
-                          u
-                        ]
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "File \"array_test.res\", line 75, characters 8-15",
-              (function (param) {
-                  var a0 = $$Array.init(100, (function (i) {
-                          return (i << 0);
-                        }));
-                  $$Array.blit(a0, 10, a0, 5, 20);
-                  return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: starts_with(a0, [
-                                0,
-                                1,
-                                2,
-                                3,
-                                4,
-                                10,
-                                11,
-                                12,
-                                13,
-                                14,
-                                15,
-                                16,
-                                17,
-                                18,
-                                19,
-                                20,
-                                21,
-                                22,
-                                23,
-                                24,
-                                25,
-                                26,
-                                27,
-                                28
-                              ], (function (prim0, prim1) {
-                                  return prim0 === prim1;
-                                }))
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "File \"array_test.res\", line 118, characters 8-15",
-                (function (param) {
-                    var a0 = $$Array.init(100, (function (i) {
-                            return (i << 0);
-                          }));
-                    $$Array.blit(a0, 5, a0, 10, 20);
-                    return {
-                            TAG: "Eq",
-                            _0: true,
-                            _1: starts_with(a0, [
-                                  0,
-                                  1,
-                                  2,
-                                  3,
-                                  4,
-                                  5,
-                                  6,
-                                  7,
-                                  8,
-                                  9,
-                                  5,
-                                  6,
-                                  7,
-                                  8,
-                                  9,
-                                  10,
-                                  11,
-                                  12,
-                                  13,
-                                  14,
-                                  15,
-                                  16,
-                                  17,
-                                  18,
-                                  19,
-                                  20
-                                ], (function (prim0, prim1) {
-                                    return prim0 === prim1;
-                                  }))
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "make",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: Caml_array.make(2, 1),
-                              _1: [
-                                1,
-                                1
-                              ]
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "sort",
-                    (function (param) {
-                        var u = [
-                          3,
-                          0,
-                          1
-                        ];
-                        $$Array.sort(Caml.int_compare, u);
-                        return {
-                                TAG: "Eq",
-                                _0: Caml_obj.equal([
-                                      0,
-                                      1,
-                                      3
-                                    ], u),
-                                _1: true
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "sort_large",
-                      (function (param) {
-                          var v = $$Array.init(4, (function (i) {
-                                  return i % 17;
-                                }));
-                          $$Array.sort(Caml.int_compare, v);
-                          return {
-                                  TAG: "Eq",
-                                  _0: true,
-                                  _1: is_sorted(v)
-                                };
-                        })
-                    ],
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var array_suites = {
-  hd: array_suites_0,
-  tl: array_suites_1
-};
-
-Mt.from_pair_suites("Array_test", array_suites);
-
-/*  Not a pure module */
diff --git a/jscomp/test/array_test.res b/jscomp/test/array_test.res
deleted file mode 100644
index a09f495..0000000
--- a/jscomp/test/array_test.res
+++ /dev/null
@@ -1,189 +0,0 @@
-open Mt
-
-module type ARRAY = module type of Array
-module Make = (Array: ARRAY) => {
-  let starts_with = (xs, prefix, p) => {
-    module X = {
-      exception H
-    }
-    let (len1, len2) = {
-      open Array
-      (length(xs), length(prefix))
-    }
-    if len2 > len1 {
-      false
-    } else {
-      try {
-        for i in 0 to len2 - 1 {
-          if \"@@"(not, p(xs[i], prefix[i])) {
-            raise(X.H)
-          }
-        }
-        true
-      } catch {
-      | X.H => false
-      }
-    }
-  }
-
-  let is_sorted = x => {
-    let len = Array.length(x)
-    let rec aux = i =>
-      if i >= len - 1 {
-        true
-      } else if x[i] < x[i + 1] {
-        aux(i + 1)
-      } else {
-        false
-      }
-    aux(0)
-  }
-
-  let array_suites = {
-    open Mt
-    list{
-      ("init", _ => Eq(Array.init(5, x => x), [0, 1, 2, 3, 4])),
-      (
-        "toList",
-        _ => {
-          let aux = (xs: list<(array<int>, list<int>)>) =>
-            List.fold_left((acc, (x, y)) => list{(Array.to_list(x), y), ...acc}, list{}, xs)
-
-          let (a, b) = \"@@"(List.split, aux(list{([], list{})}))
-          Eq(a, b)
-        },
-      ),
-      ("concat", _ => Eq([0, 1, 2, 3, 4, 5], Array.concat(list{[0, 1, 2], [3, 4], [], [5]}))),
-      (
-        "make",
-        _ => Eq(
-          (Array.make(100, 'a'), Array.make_float(100)),
-          (Array.init(100, _ => 'a'), Array.init(100, _ => 0.)),
-        ),
-      ),
-      ("sub", _ => Eq(Array.sub([0, 1, 2, 3, 4], 2, 2), [2, 3])),
-      (
-        "blit",
-        _ => {
-          let u = [100, 0, 0]
-          let v = Array.init(3, x => x * 2)
-          let () = Array.blit(v, 1, u, 1, 2)
-          Eq(([0, 2, 4], [100, 2, 4]), (v, u))
-        },
-      ),
-      (
-        __LOC__,
-        {
-          open Array
-          _ => {
-            let a0 = init(100, i => i * 1)
-            blit(a0, 10, a0, 5, 20)
-            Eq(
-              true,
-              starts_with(
-                a0,
-                [
-                  0,
-                  1,
-                  2,
-                  3,
-                  4,
-                  10,
-                  11,
-                  12,
-                  13,
-                  14,
-                  15,
-                  16,
-                  17,
-                  18,
-                  19,
-                  20,
-                  21,
-                  22,
-                  23,
-                  24,
-                  25,
-                  26,
-                  27,
-                  28,
-                ],
-                \"=",
-              ),
-            )
-          }
-        },
-      ),
-      (
-        __LOC__,
-        {
-          open Array
-          _ => {
-            let a0 = init(100, i => i * 1)
-            blit(a0, 5, a0, 10, 20)
-            Eq(
-              true,
-              starts_with(
-                a0,
-                [
-                  0,
-                  1,
-                  2,
-                  3,
-                  4,
-                  5,
-                  6,
-                  7,
-                  8,
-                  9,
-                  5,
-                  6,
-                  7,
-                  8,
-                  9,
-                  10,
-                  11,
-                  12,
-                  13,
-                  14,
-                  15,
-                  16,
-                  17,
-                  18,
-                  19,
-                  20,
-                ],
-                \"=",
-              ),
-            )
-          }
-        },
-      ),
-      ("make", _ => Eq(Array.make(2, 1), [1, 1])),
-      (
-        "sort",
-        _ => {
-          let u = [3, 0, 1]
-          Array.sort((x: int, y) => Pervasives.compare(x, y), u)
-          Eq([0, 1, 3] == u, true) /* seems [assert.deepEqual] does not do the right job.. */
-        },
-      ),
-      (
-        "sort_large",
-        _ => {
-          let v = Array.init(4, i => mod(i, 17))
-          Array.sort((x: int, y) => compare(x, y), v)
-          Eq(true, is_sorted(v))
-        },
-      ),
-    }
-  }
-}
-
-from_pair_suites(
-  __MODULE__,
-  {
-    module Array_test = Make(Array)
-    Array_test.array_suites
-  },
-)
diff --git a/jscomp/test/array_test.resi b/jscomp/test/array_test.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/array_test.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/as_inline_record_test.js b/jscomp/test/as_inline_record_test.js
deleted file mode 100644
index 9518636..0000000
--- a/jscomp/test/as_inline_record_test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function getName(t) {
-  return t.renamed;
-}
-
-function getName$p(t) {
-  return t.renamed;
-}
-
-function getAge(t) {
-  return t.age;
-}
-
-function getAge$p(t) {
-  return t.age;
-}
-
-var user = {
-  TAG: "User",
-  renamed: "Corentin",
-  age: 35
-};
-
-exports.user = user;
-exports.getName = getName;
-exports.getName$p = getName$p;
-exports.getAge = getAge;
-exports.getAge$p = getAge$p;
-/* No side effect */
diff --git a/jscomp/test/as_inline_record_test.res b/jscomp/test/as_inline_record_test.res
deleted file mode 100644
index c5cb516..0000000
--- a/jscomp/test/as_inline_record_test.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type user =
-  | User({
-      @as("renamed")
-      name: string,
-      age: int,
-    })
-
-let user = User({name: "Corentin", age: 35})
-
-let getName = t =>
-  switch t {
-  | User({name}) => name
-  }
-
-let getName' = t =>
-  switch t {
-  | User(u) => u.name
-  }
-
-let getAge = t => 
-  switch t {
-  | User({age}) => age
-  }
-
-let getAge' = t => 
-  switch t {
-  | User(u) => u.age
-  }
\ No newline at end of file
diff --git a/jscomp/test/ast_abstract_test.js b/jscomp/test/ast_abstract_test.js
deleted file mode 100644
index 01ba525..0000000
--- a/jscomp/test/ast_abstract_test.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Js_mapperRt = require("../../lib/js/js_mapperRt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function tToJs(param) {
-  return {
-          x: param.x,
-          y: param.y,
-          z: param.z
-        };
-}
-
-function tFromJs(param) {
-  return {
-          x: param.x,
-          y: param.y,
-          z: param.z
-        };
-}
-
-var v0 = {
-  x: 3,
-  y: false,
-  z: false
-};
-
-var v1 = {
-  x: 3,
-  y: false,
-  z: ""
-};
-
-var _map = {"a":"a","b":"b","c":"c"};
-
-function xToJs(param) {
-  return param;
-}
-
-function xFromJs(param) {
-  return Js_mapperRt.raiseWhenNotFound(_map[param]);
-}
-
-function idx(v) {
-  eq("File \"ast_abstract_test.res\", line 26, characters 18-25", xFromJs(v), v);
-}
-
-idx("a");
-
-idx("b");
-
-idx("c");
-
-Mt.from_pair_suites("Ast_abstract_test", suites.contents);
-
-var x0 = "a";
-
-var x1 = "b";
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.tToJs = tToJs;
-exports.tFromJs = tFromJs;
-exports.v0 = v0;
-exports.v1 = v1;
-exports.xToJs = xToJs;
-exports.xFromJs = xFromJs;
-exports.idx = idx;
-exports.x0 = x0;
-exports.x1 = x1;
-/*  Not a pure module */
diff --git a/jscomp/test/ast_abstract_test.res b/jscomp/test/ast_abstract_test.res
deleted file mode 100644
index 7e07391..0000000
--- a/jscomp/test/ast_abstract_test.res
+++ /dev/null
@@ -1,96 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-@deriving({jsConverter: newType})
-type t<'a> = {
-  x: int,
-  y: bool,
-  z: 'a,
-}
-
-let v0 = tToJs({x: 3, y: false, z: false})
-let v1 = tToJs({x: 3, y: false, z: ""})
-
-@deriving({jsConverter: newType})
-type x = [
-  | #a
-  | #b
-  | #c
-]
-
-let idx = v => eq(__LOC__, xFromJs(xToJs(v)), v)
-let x0 = xToJs(#a)
-let x1 = xToJs(#b)
-
-let () = {
-  idx(#a)
-  idx(#b)
-  idx(#c)
-}
-
-/* type a =
-  | A
-  | B [@as 3]
-  | C
-[@@bs.deriving {jsConverter = newType}]      
-
-let id  x = 
-    eq  __LOC__ (aFromJs (aToJs x ))  x 
-let a0 = aToJs A 
-let a1 = aToJs B */
-
-/* let () = 
-  id  A ;
-  id  B ;
-  id  C */
-
-/* type b = 
-  | D0
-  | D1
-  | D2 
-  | D3 
-[@@bs.deriving {jsConverter = newType }]       
-
-
-let b0 = bToJs D0 
-let b1 = bToJs D1 
-
-let idb v = 
-  eq __LOC__ (bFromJs (bToJs v )) v 
-
-let () = idb D0; idb D1; idb D2 ; idb D3 */
-
-/* type c = 
-  | D0 [@bs.as 3]
-  | D1
-  | D2 
-  | D3 
-[@@bs.deriving {jsConverter = {newType }}]       
-
-let c0 = cToJs D0 
-
-let idc v = eq __LOC__ (cFromJs (cToJs v)) v
-
-let () = idc D0; idc D1 ; idc D2; idc D3 */
-
-/* type h = 
-  | JsMapperEraseType
-  | B [@@bs.deriving {accessors; jsConverter = newType} ] */
-
-/*
-type z =    
-  | ZFromJs 
-  | ZToJs
-  | ZXx (* not overridden *)
-[@@bs.deriving {
-  accessors;
-  jsConverter
-}
-] */
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/ast_mapper_unused_warning_test.js b/jscomp/test/ast_mapper_unused_warning_test.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/ast_mapper_unused_warning_test.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/ast_mapper_unused_warning_test.res b/jscomp/test/ast_mapper_unused_warning_test.res
deleted file mode 100644
index 304be0f..0000000
--- a/jscomp/test/ast_mapper_unused_warning_test.res
+++ /dev/null
@@ -1,7 +0,0 @@
-@@warning("-104")
-
-@deriving(jsConverter)
-type t = [
-  | #A(int)
-  | #B(string)
-]
diff --git a/jscomp/test/async_await.js b/jscomp/test/async_await.js
deleted file mode 100644
index d376f50..0000000
--- a/jscomp/test/async_await.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function next(n) {
-  return n + 1 | 0;
-}
-
-async function useNext() {
-  return 4;
-}
-
-function Make(I) {
-  var get = async function (key) {
-    return await I.get(key);
-  };
-  return {
-          get: get
-        };
-}
-
-async function topFoo() {
-  return 1;
-}
-
-var arr = [
-  1,
-  2,
-  3
-];
-
-var toplevelAwait = await topFoo();
-
-var toplevelAwait2 = Caml_array.get(arr, await topFoo());
-
-async function f(value) {
-  return await Promise.resolve(1);
-}
-
-exports.next = next;
-exports.useNext = useNext;
-exports.Make = Make;
-exports.topFoo = topFoo;
-exports.arr = arr;
-exports.toplevelAwait = toplevelAwait;
-exports.toplevelAwait2 = toplevelAwait2;
-exports.f = f;
-/* toplevelAwait Not a pure module */
diff --git a/jscomp/test/async_await.res b/jscomp/test/async_await.res
deleted file mode 100644
index 85aafb0..0000000
--- a/jscomp/test/async_await.res
+++ /dev/null
@@ -1,22 +0,0 @@
-@@uncurried.swap
-
-let next = n => n + 1
-let useNext = async () => next(3)
-
-module type Impl = {
-  let get: string => Js.Promise.t<string>
-}
-
-module Make = (I: Impl) => {
-  let get = async (key) => await I.get(key)
-}
-
-let topFoo = async () => 1
-let arr = [1, 2, 3]
-
-let toplevelAwait = await topFoo()
-let toplevelAwait2 = arr[await topFoo()]
-
-let f = async (type input, value: input) => {
-  await Js.Promise.resolve(. 1)
-}
\ No newline at end of file
diff --git a/jscomp/test/async_ideas.js b/jscomp/test/async_ideas.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/async_ideas.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/async_ideas.res b/jscomp/test/async_ideas.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/async_ideas.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/async_inline.js b/jscomp/test/async_inline.js
deleted file mode 100644
index 1c891d0..0000000
--- a/jscomp/test/async_inline.js
+++ /dev/null
@@ -1,102 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var React = require("react");
-
-async function willBeInlined(param) {
-  return 3;
-}
-
-var inlined = willBeInlined();
-
-function wrapSomethingAsync(param) {
-  ((async function (param) {
-          var test = await Promise.resolve("Test");
-          console.log(test);
-        })(777));
-}
-
-function wrapSomethingAsync2(param) {
-  ((async function (param) {
-          var test = await Promise.resolve("Test");
-          console.log(test);
-        })());
-}
-
-async function doSomethingAsync(someAsyncFunction) {
-  return await Curry._1(someAsyncFunction, undefined);
-}
-
-var broken = doSomethingAsync;
-
-var M = {
-  broken: broken
-};
-
-async function broken$1(someAsyncFunction) {
-  return await Curry._1(someAsyncFunction, undefined);
-}
-
-var broken$2 = broken$1;
-
-function curriedId(x) {
-  return x;
-}
-
-async function curriedIdAsync(x) {
-  return x;
-}
-
-function uncurriedId(x) {
-  return x;
-}
-
-async function uncurriedIdAsync(x) {
-  return x;
-}
-
-var tcia = curriedIdAsync(3);
-
-var tui = 3;
-
-var tuia = uncurriedIdAsync(3);
-
-function nested1(param) {
-  return async function (y) {
-    return await y;
-  };
-}
-
-async function nested2(param) {
-  return async function (y) {
-    return await y;
-  };
-}
-
-function onSubmit(param) {
-  return React.useCallback(async function (_a, b) {
-              return await b;
-            });
-}
-
-var tci = 3;
-
-exports.willBeInlined = willBeInlined;
-exports.inlined = inlined;
-exports.wrapSomethingAsync = wrapSomethingAsync;
-exports.wrapSomethingAsync2 = wrapSomethingAsync2;
-exports.M = M;
-exports.broken = broken$2;
-exports.curriedId = curriedId;
-exports.curriedIdAsync = curriedIdAsync;
-exports.uncurriedId = uncurriedId;
-exports.uncurriedIdAsync = uncurriedIdAsync;
-exports.tci = tci;
-exports.tcia = tcia;
-exports.tui = tui;
-exports.tuia = tuia;
-exports.nested1 = nested1;
-exports.nested2 = nested2;
-exports.onSubmit = onSubmit;
-/* inlined Not a pure module */
diff --git a/jscomp/test/async_inline.res b/jscomp/test/async_inline.res
deleted file mode 100644
index 5e3d48d..0000000
--- a/jscomp/test/async_inline.res
+++ /dev/null
@@ -1,62 +0,0 @@
-let willBeInlined = async () => 3
-
-let inlined = willBeInlined ()
-
-let wrapSomethingAsync: unit => unit = () => {
-  let _ = (
-    async (_) => {
-      let test = await Js.Promise.resolve("Test")
-      Js.log(test)
-    }
-  )(777)
-}
-
-external ignorePromise: promise<'a> => unit = "%identity"
-
-let wrapSomethingAsync2 = () =>
-  (
-    async () => {
-      let test = await Js.Promise.resolve("Test")
-      Js.log(test)
-    }
-  )()->ignorePromise
-
-module M: {
-  let broken: (unit => promise<'a>) => promise<'a>
-} = {
-  let doSomethingAsync = async (someAsyncFunction) => {
-    await someAsyncFunction()
-  }
-
-  let broken = someAsyncFunction => doSomethingAsync(someAsyncFunction)
-}
-
-let broken = async (someAsyncFunction) => {
-  await someAsyncFunction()
-}
-
-let broken = someAsyncFunction => broken(someAsyncFunction)
-
-let curriedId = x => x
-let curriedIdAsync = async x => x
-let uncurriedId = (.x ) => x
-let uncurriedIdAsync = async (.x ) => x
-
-let tci = curriedId(3)
-let tcia = curriedIdAsync(3)
-let tui = uncurriedId(. 3)
-let tuia = uncurriedIdAsync(. 3)
-
-let nested1 = () => async (y) => await y
-
-let nested2 = async () => async (y) => await y
-
-type callback<'input, 'output> = 'input => 'output
-
-@module("react")
-external useCallback: (@uncurry ('input => 'output)) => callback<'input, 'output> = "useCallback"
-
-let onSubmit = () =>
-  useCallback(async (_a, b) => {
-    await b
-  })
diff --git a/jscomp/test/async_inside_loop.js b/jscomp/test/async_inside_loop.js
deleted file mode 100644
index 22abaeb..0000000
--- a/jscomp/test/async_inside_loop.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-async function topLevelAsyncFunction(param) {
-  for(var innerScopeVal = 0; innerScopeVal <= 3; ++innerScopeVal){
-    var asyncClosureAccessingScopedVal = await(async function(innerScopeVal){
-    return async function asyncClosureAccessingScopedVal(param) {
-      console.log("Accessing scoped var inside loop", innerScopeVal);
-      return await Promise.resolve();
-    }
-    }(innerScopeVal));
-    await asyncClosureAccessingScopedVal();
-  }
-}
-
-topLevelAsyncFunction();
-
-exports.topLevelAsyncFunction = topLevelAsyncFunction;
-/*  Not a pure module */
diff --git a/jscomp/test/async_inside_loop.res b/jscomp/test/async_inside_loop.res
deleted file mode 100644
index 93adcc7..0000000
--- a/jscomp/test/async_inside_loop.res
+++ /dev/null
@@ -1,12 +0,0 @@
-let topLevelAsyncFunction = async () => {
-  for innerScopeVal in 0 to 3 {
-    let asyncClosureAccessingScopedVal = async () => {
-      Js.log2("Accessing scoped var inside loop", innerScopeVal)
-      await Js.Promise.resolve()
-    }
-
-    await asyncClosureAccessingScopedVal()
-  }
-}
-
-let _ = topLevelAsyncFunction()
diff --git a/jscomp/test/attr_test.js b/jscomp/test/attr_test.js
deleted file mode 100644
index 72d0bdd..0000000
--- a/jscomp/test/attr_test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function u(x, y) {
-  return x + y | 0;
-}
-
-var h = 3;
-
-function max2(x, y) {
-  return x + y;
-}
-
-var hh = 1 + 2;
-
-function f(x) {
-  des(x, (function (param) {
-          console.log("hei");
-        }));
-}
-
-exports.u = u;
-exports.h = h;
-exports.max2 = max2;
-exports.hh = hh;
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/attr_test.res b/jscomp/test/attr_test.res
deleted file mode 100644
index a71b80f..0000000
--- a/jscomp/test/attr_test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let u = (. x, y) => x + y
-
-let h = u(. 1, 2)
-
-type u = {"v": int, "y": int}
-type xx<'a, 'b> = {.."case": (. int) => (. int) => 'a} as 'b
-type xx_uncurry<'a, 'b> = {.."case": (int, int) => 'a} as 'b
-
-type yy_uncurry = {"x": int}
-type yy = {"x": int}
-type number = float
-
-
-
-let max2: (. float, float) => float = (. x, y) => x +. y
-
-let hh = max2(. 1., 2.)
-
-@val external des: (string, @uncurry (unit => unit)) => unit = "des"
-
-let f = x => des(x, () => Js.log("hei"))
diff --git a/jscomp/test/b.js b/jscomp/test/b.js
deleted file mode 100644
index f9e7f93..0000000
--- a/jscomp/test/b.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(point) {
-  var y = point.y;
-  var x = point.x;
-  return Math.pow(x * x + y * y, 2);
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/b.res b/jscomp/test/b.res
deleted file mode 100644
index a99f494..0000000
--- a/jscomp/test/b.res
+++ /dev/null
@@ -1,6 +0,0 @@
-type point = {x: float, y: float}
-
-let f = point => {
-  let {x, y} = point
-  (x *. x +. y *. y) ** 2.
-}
diff --git a/jscomp/test/bal_set_mini.js b/jscomp/test/bal_set_mini.js
deleted file mode 100644
index e97a438..0000000
--- a/jscomp/test/bal_set_mini.js
+++ /dev/null
@@ -1,201 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function height(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return x._3;
-  }
-}
-
-function create(l, v, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          _0: l,
-          _1: v,
-          _2: r,
-          _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, v, r) {
-  var hl = height(l);
-  var hr = height(r);
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      return "Empty";
-    }
-    var lr = l._2;
-    var lv = l._1;
-    var ll = l._0;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, create(lr, v, r));
-    } else if (typeof lr !== "object") {
-      return "Empty";
-    } else {
-      return create(create(ll, lv, lr._0), lr._1, create(lr._2, v, r));
-    }
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: v,
-            _2: r,
-            _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    return "Empty";
-  }
-  var rr = r._2;
-  var rv = r._1;
-  var rl = r._0;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, v, rl), rv, rr);
-  } else if (typeof rl !== "object") {
-    return "Empty";
-  } else {
-    return create(create(l, v, rl._0), rl._1, create(rl._2, rv, rr));
-  }
-}
-
-function compare_int(x, y) {
-  if (x > y) {
-    return 1;
-  } else if (x === y) {
-    return 0;
-  } else {
-    return -1;
-  }
-}
-
-function add(x, x_) {
-  if (typeof x_ !== "object") {
-    return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: "Empty",
-            _3: 1
-          };
-  }
-  var r = x_._2;
-  var v = x_._1;
-  var l = x_._0;
-  var c = compare_int(x, v);
-  if (c === 0) {
-    return x_;
-  } else if (c < 0) {
-    return bal(add(x, l), v, r);
-  } else {
-    return bal(l, v, add(x, r));
-  }
-}
-
-function min_elt(_def, _x) {
-  while(true) {
-    var x = _x;
-    var def = _def;
-    if (typeof x !== "object") {
-      return def;
-    }
-    var l = x._0;
-    if (typeof l !== "object") {
-      return x._1;
-    }
-    _x = l;
-    _def = x._1;
-    continue ;
-  };
-}
-
-function remove_min_elt(l, v, r) {
-  if (typeof l !== "object") {
-    return r;
-  } else {
-    return bal(remove_min_elt(l._0, l._1, l._2), v, r);
-  }
-}
-
-function internal_merge(l, r) {
-  if (typeof l !== "object") {
-    return r;
-  }
-  if (typeof r !== "object") {
-    return l;
-  }
-  var rv = r._1;
-  return bal(l, min_elt(rv, r), remove_min_elt(r._0, rv, r._2));
-}
-
-function remove(x, tree) {
-  if (typeof tree !== "object") {
-    return "Empty";
-  }
-  var r = tree._2;
-  var v = tree._1;
-  var l = tree._0;
-  var c = compare_int(x, v);
-  if (c === 0) {
-    return internal_merge(l, r);
-  } else if (c < 0) {
-    return bal(remove(x, l), v, r);
-  } else {
-    return bal(l, v, remove(x, r));
-  }
-}
-
-function mem(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (typeof x_ !== "object") {
-      return false;
-    }
-    var c = compare_int(x, x_._1);
-    if (c === 0) {
-      return true;
-    }
-    _x_ = c < 0 ? x_._0 : x_._2;
-    continue ;
-  };
-}
-
-var v = "Empty";
-
-for(var i = 0; i <= 100000; ++i){
-  v = add(i, v);
-}
-
-for(var i$1 = 0; i$1 <= 100000; ++i$1){
-  if (!mem(i$1, v)) {
-    console.log("impossible");
-  }
-  
-}
-
-for(var i$2 = 0; i$2 <= 100000; ++i$2){
-  v = remove(i$2, v);
-}
-
-var match = v;
-
-if (typeof match === "object") {
-  console.log("impossible");
-}
-
-exports.height = height;
-exports.create = create;
-exports.bal = bal;
-exports.compare_int = compare_int;
-exports.add = add;
-exports.min_elt = min_elt;
-exports.remove_min_elt = remove_min_elt;
-exports.internal_merge = internal_merge;
-exports.remove = remove;
-exports.mem = mem;
-/*  Not a pure module */
diff --git a/jscomp/test/bal_set_mini.res b/jscomp/test/bal_set_mini.res
deleted file mode 100644
index 100e0e6..0000000
--- a/jscomp/test/bal_set_mini.res
+++ /dev/null
@@ -1,166 +0,0 @@
-type rec t<'a> =
-  | Empty
-  | Node(t<'a>, 'a, t<'a>, int)
-let rec height = x =>
-  switch x {
-  | Empty => 0
-  | Node(_, _, _, h) => h
-  }
-
-let create = (l, v, r) => {
-  let hl = height(l)
-  let hr = height(r)
-  Node(
-    l,
-    v,
-    r,
-    if hl >= hr {
-      hl + 1
-    } else {
-      hr + 1
-    },
-  )
-}
-
-let bal = (l, v, r) => {
-  let hl = height(l)
-  let hr = height(r)
-  if hl > hr + 2 {
-    switch l {
-    | Empty => Empty /* impossible */
-    | Node(ll, lv, lr, _) =>
-      if height(ll) >= height(lr) {
-        create(ll, lv, create(lr, v, r))
-      } else {
-        switch lr {
-        | Empty => Empty /* impossible */
-        | Node(lrl, lrv, lrr, _) => create(create(ll, lv, lrl), lrv, create(lrr, v, r))
-        }
-      }
-    }
-  } else if hr > hl + 2 {
-    switch r {
-    | Empty => Empty /* impossible */
-    | Node(rl, rv, rr, _) =>
-      if height(rr) >= height(rl) {
-        create(create(l, v, rl), rv, rr)
-      } else {
-        switch rl {
-        | Empty => Empty /* impossible */
-        | Node(rll, rlv, rlr, _) => create(create(l, v, rll), rlv, create(rlr, rv, rr))
-        }
-      }
-    }
-  } else {
-    Node(
-      l,
-      v,
-      r,
-      if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    )
-  }
-}
-
-let compare_int = (x: int, y) =>
-  if x > y {
-    1
-  } else if x == y {
-    0
-  } else {
-    -1
-  }
-
-let rec add = (x, x_) =>
-  switch x_ {
-  | Empty => Node(Empty, x, Empty, 1)
-  | Node(l, v, r, _) as t =>
-    let c = compare_int(x, v)
-    if c == 0 {
-      t
-    } else if c < 0 {
-      bal(add(x, l), v, r)
-    } else {
-      bal(l, v, add(x, r))
-    }
-  }
-
-let rec min_elt = (def, x) =>
-  switch x {
-  | Empty => def
-  | Node(Empty, v, r, _) => v
-  | Node(l, v, r, _) => min_elt(v, l)
-  }
-
-/*
-let rec remove_min_elt tree = match tree with  
-    | Empty -> Empty (* impossible *)
-    | Node(Empty, v, r, _) -> r
-    | Node(l, v, r, _) -> bal (remove_min_elt l) v r
-*/
-let rec remove_min_elt = (l, v, r) =>
-  switch l {
-  | Empty => r
-  | Node(ll, lv, lr, _) => bal(remove_min_elt(ll, lv, lr), v, r)
-  }
-
-let internal_merge = (l, r) =>
-  switch (l, r) {
-  | (Empty, t) => t
-  | (t, Empty) => t
-  | (_, Node(rl, rv, rr, _)) => bal(l, min_elt(rv, r), remove_min_elt(rl, rv, rr))
-  }
-
-let rec remove = (x, tree) =>
-  switch tree {
-  | Empty => Empty
-  | Node(l, v, r, _) =>
-    let c = compare_int(x, v)
-    if c == 0 {
-      internal_merge(l, r)
-    } else if c < 0 {
-      bal(remove(x, l), v, r)
-    } else {
-      bal(l, v, remove(x, r))
-    }
-  }
-
-let rec mem = (x, x_) =>
-  switch x_ {
-  | Empty => false
-  | Node(l, v, r, _) =>
-    let c = compare_int(x, v)
-    c == 0 ||
-      mem(
-        x,
-        if c < 0 {
-          l
-        } else {
-          r
-        },
-      )
-  }
-
-let () = {
-  let v = ref(Empty)
-  let iter = 1_00_000
-  for i in 0 to iter {
-    v := add(i, v.contents)
-  }
-
-  for i in 0 to iter {
-    if !mem(i, v.contents) {
-      print_endline("impossible")
-    }
-  }
-  for i in 0 to iter {
-    v := remove(i, v.contents)
-  }
-  switch v.contents {
-  | Empty => ()
-  | Node(_) => print_endline("impossible")
-  }
-}
diff --git a/jscomp/test/bang_primitive.js b/jscomp/test/bang_primitive.js
deleted file mode 100644
index 042f967..0000000
--- a/jscomp/test/bang_primitive.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function test(x, y) {
-  return [
-          x < y,
-          x <= y,
-          x > y,
-          x >= y,
-          x === y,
-          x !== y
-        ];
-}
-
-function f(x, y) {
-  return [
-          String.fromCharCode.apply(null, x),
-          0
-        ];
-}
-
-exports.test = test;
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/bang_primitive.res b/jscomp/test/bang_primitive.res
deleted file mode 100644
index 982f441..0000000
--- a/jscomp/test/bang_primitive.res
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-external log : 'a -> unit = "#console.log"
-
-external log2 : 'a -> unit = "#console.log"
-
-
-let f x = 
-    log x;
-    log2 x  
- */
-
-external xx: 'a => string = "#anything_to_string"
-
-external lt: ('a, 'a) => bool = "#unsafe_lt"
-external le: ('a, 'a) => bool = "#unsafe_le"
-external gt: ('a, 'a) => bool = "#unsafe_gt"
-external ge: ('a, 'a) => bool = "#unsafe_ge"
-external eq: ('a, 'a) => bool = "#unsafe_eq"
-external neq: ('a, 'a) => bool = "#unsafe_neq"
-let test = (x, y) => (lt(x, y), le(x, y), gt(x, y), ge(x, y), eq(x, y), neq(x, y))
-
-/*
-external append : 'a array -> 'a array -> 'a array = "#array_append"
-
-
-let f x y = append x y
-*/
-
-@val
-external of_small_int_array: (@as(json`null`) _, array<int>) => string = "String.fromCharCode.apply"
-
-let f = (x, y) => (of_small_int_array(x), 0)
diff --git a/jscomp/test/basic_module_test.js b/jscomp/test/basic_module_test.js
deleted file mode 100644
index 1fa8240..0000000
--- a/jscomp/test/basic_module_test.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Offset = require("./offset.js");
-var Mt_global = require("./mt_global.js");
-
-var count = {
-  contents: 0
-};
-
-function test(set) {
-  count.contents = Offset.$$Set.cardinal(set) + count.contents | 0;
-}
-
-test(Curry._1(Offset.M.$$Set.singleton, "42"));
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(f, a, b) {
-  Mt_global.collect_eq(test_id, suites, f, a, b);
-}
-
-eq("File \"basic_module_test.res\", line 40, characters 12-19", count.contents, 1);
-
-Mt.from_pair_suites("Basic_module_test", suites.contents);
-
-/*  Not a pure module */
diff --git a/jscomp/test/basic_module_test.res b/jscomp/test/basic_module_test.res
deleted file mode 100644
index 2fecf98..0000000
--- a/jscomp/test/basic_module_test.res
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Jacques Garrigue, Nagoya University */
-/*  */
-/* Copyright 2014 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
-/*  */
-/* ********************************************************************* */
-
-/* PR#6435 */
-let count = ref(0)
-
-module F = (
-  M: {
-    type t
-    module Set: Set.S with type elt = t
-  },
-) => {
-  let test = set => count := M.Set.cardinal(set) + count.contents
-}
-
-module M = F(Offset)
-
-let () = M.test(Offset.M.Set.singleton("42"))
-/*
-  here we assume value access does not have side effect 
-  however, the module should be included 
-  since it may contain side effect unless we 
-  analyze it does not have side effect
-*/
-let v = Pr6726.Test.v
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (f, a, b) => Mt_global.collect_eq(test_id, suites, f, a, b)
-
-let () = eq(__LOC__, count.contents, 1)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/basic_module_test.resi b/jscomp/test/basic_module_test.resi
deleted file mode 100644
index e7bcc98..0000000
--- a/jscomp/test/basic_module_test.resi
+++ /dev/null
@@ -1 +0,0 @@
-/* val v : int */
diff --git a/jscomp/test/bb.js b/jscomp/test/bb.js
deleted file mode 100644
index 8aa3297..0000000
--- a/jscomp/test/bb.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  if (x === "b") {
-    return "b";
-  } else if (x === "c") {
-    return "c";
-  } else {
-    return "a";
-  }
-}
-
-function ff(x) {
-  switch (x) {
-    case "a" :
-        return "a";
-    case "b" :
-        return "b";
-    case "c" :
-        return "c";
-    default:
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bb.res",
-              13,
-              9
-            ],
-            Error: new Error()
-          };
-  }
-}
-
-function test(x) {
-  var match;
-  switch (x) {
-    case "a" :
-        match = "a";
-        break;
-    case "b" :
-        match = "b";
-        break;
-    case "c" :
-        match = "c";
-        break;
-    default:
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bb.res",
-              21,
-              9
-            ],
-            Error: new Error()
-          };
-  }
-  if (match === "b") {
-    return "b";
-  } else if (match === "c") {
-    return "c";
-  } else {
-    return "a";
-  }
-}
-
-var test_poly = "a";
-
-var c = f("a");
-
-var d = f("b");
-
-var e = f("c");
-
-exports.f = f;
-exports.ff = ff;
-exports.test = test;
-exports.test_poly = test_poly;
-exports.c = c;
-exports.d = d;
-exports.e = e;
-/* c Not a pure module */
diff --git a/jscomp/test/bb.res b/jscomp/test/bb.res
deleted file mode 100644
index 5933818..0000000
--- a/jscomp/test/bb.res
+++ /dev/null
@@ -1,34 +0,0 @@
-let f = x =>
-  switch x {
-  | #a => "a"
-  | #b => "b"
-  | #c => "c"
-  }
-
-let ff = x =>
-  switch x {
-  | "a" => #a
-  | "b" => #b
-  | "c" => #c
-  | _ => assert(false)
-  }
-
-let test = x =>
-  switch switch x {
-  | "a" => #a
-  | "b" => #b
-  | "c" => #c
-  | _ => assert(false)
-  } {
-  | #a => "a"
-  | #b => "b"
-  | #c => "c"
-  }
-
-let test_poly = switch #a {
-| #a => "a"
-| #b => "b"
-| #c => "c"
-}
-
-let (c, d, e) = (f(#a), f(#b), f(#c))
diff --git a/jscomp/test/bdd.js b/jscomp/test/bdd.js
deleted file mode 100644
index a231410..0000000
--- a/jscomp/test/bdd.js
+++ /dev/null
@@ -1,460 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function $$eval(_bdd, vars) {
-  while(true) {
-    var bdd = _bdd;
-    if (typeof bdd !== "object") {
-      if (bdd === "One") {
-        return true;
-      } else {
-        return false;
-      }
-    }
-    if (Caml_array.get(vars, bdd._1)) {
-      _bdd = bdd._3;
-      continue ;
-    }
-    _bdd = bdd._0;
-    continue ;
-  };
-}
-
-function getId(bdd) {
-  if (typeof bdd !== "object") {
-    if (bdd === "One") {
-      return 1;
-    } else {
-      return 0;
-    }
-  } else {
-    return bdd._2;
-  }
-}
-
-var nodeC = {
-  contents: 1
-};
-
-var sz_1 = {
-  contents: 8191
-};
-
-var htab = {
-  contents: Caml_array.make(sz_1.contents + 1 | 0, /* [] */0)
-};
-
-var n_items = {
-  contents: 0
-};
-
-function hashVal(x, y, v) {
-  return ((x << 1) + y | 0) + (v << 2) | 0;
-}
-
-function resize(newSize) {
-  var arr = htab.contents;
-  var newSz_1 = newSize - 1 | 0;
-  var newArr = Caml_array.make(newSize, /* [] */0);
-  var copyBucket = function (_bucket) {
-    while(true) {
-      var bucket = _bucket;
-      if (!bucket) {
-        return ;
-      }
-      var n = bucket.hd;
-      if (typeof n !== "object") {
-        if (n === "One") {
-          throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "bdd.res",
-                  60,
-                  13
-                ],
-                Error: new Error()
-              };
-        }
-        throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "bdd.res",
-                60,
-                13
-              ],
-              Error: new Error()
-            };
-      } else {
-        var ind = hashVal(getId(n._0), getId(n._3), n._1) & newSz_1;
-        Caml_array.set(newArr, ind, {
-              hd: n,
-              tl: Caml_array.get(newArr, ind)
-            });
-        _bucket = bucket.tl;
-        continue ;
-      }
-    };
-  };
-  for(var n = 0 ,n_finish = sz_1.contents; n <= n_finish; ++n){
-    copyBucket(Caml_array.get(arr, n));
-  }
-  htab.contents = newArr;
-  sz_1.contents = newSz_1;
-}
-
-function insert(idl, idh, v, ind, bucket, newNode) {
-  if (n_items.contents <= sz_1.contents) {
-    Caml_array.set(htab.contents, ind, {
-          hd: newNode,
-          tl: bucket
-        });
-    n_items.contents = n_items.contents + 1 | 0;
-    return ;
-  }
-  resize((sz_1.contents + sz_1.contents | 0) + 2 | 0);
-  var ind$1 = hashVal(idl, idh, v) & sz_1.contents;
-  Caml_array.set(htab.contents, ind$1, {
-        hd: newNode,
-        tl: Caml_array.get(htab.contents, ind$1)
-      });
-}
-
-function resetUnique(param) {
-  sz_1.contents = 8191;
-  htab.contents = Caml_array.make(sz_1.contents + 1 | 0, /* [] */0);
-  n_items.contents = 0;
-  nodeC.contents = 1;
-}
-
-function mkNode(low, v, high) {
-  var idl = getId(low);
-  var idh = getId(high);
-  if (idl === idh) {
-    return low;
-  }
-  var ind = hashVal(idl, idh, v) & sz_1.contents;
-  var bucket = Caml_array.get(htab.contents, ind);
-  var _b = bucket;
-  while(true) {
-    var b = _b;
-    if (b) {
-      var n = b.hd;
-      if (typeof n !== "object") {
-        if (n === "One") {
-          throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "bdd.res",
-                  121,
-                  15
-                ],
-                Error: new Error()
-              };
-        }
-        throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "bdd.res",
-                121,
-                15
-              ],
-              Error: new Error()
-            };
-      } else {
-        if (v === n._1 && idl === getId(n._0) && idh === getId(n._3)) {
-          return n;
-        }
-        _b = b.tl;
-        continue ;
-      }
-    } else {
-      var n_2 = (nodeC.contents = nodeC.contents + 1 | 0, nodeC.contents);
-      var n$1 = {
-        TAG: "Node",
-        _0: low,
-        _1: v,
-        _2: n_2,
-        _3: high
-      };
-      insert(getId(low), getId(high), v, ind, bucket, n$1);
-      return n$1;
-    }
-  };
-}
-
-function cmpVar(x, y) {
-  if (x < y) {
-    return "LESS";
-  } else if (x > y) {
-    return "GREATER";
-  } else {
-    return "EQUAL";
-  }
-}
-
-function mkVar(x) {
-  return mkNode("Zero", x, "One");
-}
-
-var andslot1 = Caml_array.make(1999, 0);
-
-var andslot2 = Caml_array.make(1999, 0);
-
-var andslot3 = Caml_array.make(1999, "Zero");
-
-var xorslot1 = Caml_array.make(1999, 0);
-
-var xorslot2 = Caml_array.make(1999, 0);
-
-var xorslot3 = Caml_array.make(1999, "Zero");
-
-var notslot1 = Caml_array.make(1999, 0);
-
-var notslot2 = Caml_array.make(1999, "One");
-
-function hash(x, y) {
-  return ((x << 1) + y | 0) % 1999;
-}
-
-function not(n) {
-  if (typeof n !== "object") {
-    if (n === "One") {
-      return "Zero";
-    } else {
-      return "One";
-    }
-  }
-  var id = n._2;
-  var h = id % 1999;
-  if (id === Caml_array.get(notslot1, h)) {
-    return Caml_array.get(notslot2, h);
-  }
-  var f = mkNode(not(n._0), n._1, not(n._3));
-  Caml_array.set(notslot1, h, id);
-  Caml_array.set(notslot2, h, f);
-  return f;
-}
-
-function and2(n1, n2) {
-  if (typeof n1 !== "object") {
-    if (n1 === "One") {
-      return n2;
-    } else {
-      return "Zero";
-    }
-  }
-  var r1 = n1._3;
-  var i1 = n1._2;
-  var v1 = n1._1;
-  var l1 = n1._0;
-  if (typeof n2 !== "object") {
-    if (n2 === "One") {
-      return n1;
-    } else {
-      return "Zero";
-    }
-  }
-  var r2 = n2._3;
-  var i2 = n2._2;
-  var v2 = n2._1;
-  var l2 = n2._0;
-  var h = hash(i1, i2);
-  if (i1 === Caml_array.get(andslot1, h) && i2 === Caml_array.get(andslot2, h)) {
-    return Caml_array.get(andslot3, h);
-  }
-  var match = cmpVar(v1, v2);
-  var f;
-  switch (match) {
-    case "LESS" :
-        f = mkNode(and2(l1, n2), v1, and2(r1, n2));
-        break;
-    case "EQUAL" :
-        f = mkNode(and2(l1, l2), v1, and2(r1, r2));
-        break;
-    case "GREATER" :
-        f = mkNode(and2(n1, l2), v2, and2(n1, r2));
-        break;
-    
-  }
-  Caml_array.set(andslot1, h, i1);
-  Caml_array.set(andslot2, h, i2);
-  Caml_array.set(andslot3, h, f);
-  return f;
-}
-
-function xor(n1, n2) {
-  if (typeof n1 !== "object") {
-    if (n1 === "One") {
-      return not(n2);
-    } else {
-      return n2;
-    }
-  }
-  var r1 = n1._3;
-  var i1 = n1._2;
-  var v1 = n1._1;
-  var l1 = n1._0;
-  if (typeof n2 !== "object") {
-    if (n2 === "One") {
-      return not(n1);
-    } else {
-      return n1;
-    }
-  }
-  var r2 = n2._3;
-  var i2 = n2._2;
-  var v2 = n2._1;
-  var l2 = n2._0;
-  var h = hash(i1, i2);
-  if (i1 === Caml_array.get(andslot1, h) && i2 === Caml_array.get(andslot2, h)) {
-    return Caml_array.get(andslot3, h);
-  }
-  var match = cmpVar(v1, v2);
-  var f;
-  switch (match) {
-    case "LESS" :
-        f = mkNode(xor(l1, n2), v1, xor(r1, n2));
-        break;
-    case "EQUAL" :
-        f = mkNode(xor(l1, l2), v1, xor(r1, r2));
-        break;
-    case "GREATER" :
-        f = mkNode(xor(n1, l2), v2, xor(n1, r2));
-        break;
-    
-  }
-  Caml_array.set(andslot1, h, i1);
-  Caml_array.set(andslot2, h, i2);
-  Caml_array.set(andslot3, h, f);
-  return f;
-}
-
-function hwb(n) {
-  var h = function (i, j) {
-    if (i === j) {
-      return mkNode("Zero", i, "One");
-    } else {
-      return xor(and2(not(mkNode("Zero", j, "One")), h(i, j - 1 | 0)), and2(mkNode("Zero", j, "One"), g(i, j - 1 | 0)));
-    }
-  };
-  var g = function (i, j) {
-    if (i === j) {
-      return mkNode("Zero", i, "One");
-    } else {
-      return xor(and2(not(mkNode("Zero", i, "One")), h(i + 1 | 0, j)), and2(mkNode("Zero", i, "One"), g(i + 1 | 0, j)));
-    }
-  };
-  return h(0, n - 1 | 0);
-}
-
-var seed = {
-  contents: 0
-};
-
-function random(param) {
-  seed.contents = Math.imul(seed.contents, 25173) + 17431 | 0;
-  return (seed.contents & 1) > 0;
-}
-
-function random_vars(n) {
-  var vars = Caml_array.make(n, false);
-  for(var i = 0; i < n; ++i){
-    Caml_array.set(vars, i, random());
-  }
-  return vars;
-}
-
-function bool_equal(a, b) {
-  if (a) {
-    if (b) {
-      return true;
-    } else {
-      return false;
-    }
-  } else if (b) {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-function test_hwb(bdd, vars) {
-  var ntrue = 0;
-  for(var i = 0 ,i_finish = vars.length; i < i_finish; ++i){
-    if (Caml_array.get(vars, i)) {
-      ntrue = ntrue + 1 | 0;
-    }
-    
-  }
-  return bool_equal($$eval(bdd, vars), ntrue > 0 ? Caml_array.get(vars, ntrue - 1 | 0) : false);
-}
-
-function main(param) {
-  var bdd = hwb(22);
-  var succeeded = true;
-  for(var i = 1; i <= 100; ++i){
-    succeeded = succeeded && test_hwb(bdd, random_vars(22));
-  }
-  if (succeeded) {
-    return ;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bdd.res",
-          301,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-main();
-
-var initSize_1 = 8191;
-
-var zero = "Zero";
-
-var one = "One";
-
-var cacheSize = 1999;
-
-exports.$$eval = $$eval;
-exports.getId = getId;
-exports.initSize_1 = initSize_1;
-exports.nodeC = nodeC;
-exports.sz_1 = sz_1;
-exports.htab = htab;
-exports.n_items = n_items;
-exports.hashVal = hashVal;
-exports.resize = resize;
-exports.insert = insert;
-exports.resetUnique = resetUnique;
-exports.mkNode = mkNode;
-exports.cmpVar = cmpVar;
-exports.zero = zero;
-exports.one = one;
-exports.mkVar = mkVar;
-exports.cacheSize = cacheSize;
-exports.andslot1 = andslot1;
-exports.andslot2 = andslot2;
-exports.andslot3 = andslot3;
-exports.xorslot1 = xorslot1;
-exports.xorslot2 = xorslot2;
-exports.xorslot3 = xorslot3;
-exports.notslot1 = notslot1;
-exports.notslot2 = notslot2;
-exports.hash = hash;
-exports.not = not;
-exports.and2 = and2;
-exports.xor = xor;
-exports.hwb = hwb;
-exports.seed = seed;
-exports.random = random;
-exports.random_vars = random_vars;
-exports.bool_equal = bool_equal;
-exports.test_hwb = test_hwb;
-exports.main = main;
-/*  Not a pure module */
diff --git a/jscomp/test/bdd.res b/jscomp/test/bdd.res
deleted file mode 100644
index 109d61d..0000000
--- a/jscomp/test/bdd.res
+++ /dev/null
@@ -1,308 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* Objective Caml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
-/*  */
-/* ********************************************************************* */
-
-/* $Id: bdd.ml 7017 2005-08-12 09:22:04Z xleroy $ */
-
-/* Translated to Caml by Xavier Leroy */
-/* Original code written in SML by ... */
-
-type rec bdd = One | Zero | Node(bdd, int, int, bdd)
-
-let rec eval = (bdd, vars) =>
-  switch bdd {
-  | Zero => false
-  | One => true
-  | Node(l, v, _, h) =>
-    if vars[v] {
-      eval(h, vars)
-    } else {
-      eval(l, vars)
-    }
-  }
-
-let getId = bdd =>
-  switch bdd {
-  | Node(_, _, id, _) => id
-  | Zero => 0
-  | One => 1
-  }
-
-let initSize_1 = 8 * 1024 - 1
-let nodeC = ref(1)
-let sz_1 = ref(initSize_1)
-let htab = ref(Array.make(sz_1.contents + 1, list{}))
-let n_items = ref(0)
-let hashVal = (x, y, v) => lsl(x, 1) + y + lsl(v, 2)
-
-let resize = newSize => {
-  let arr = htab.contents
-  let newSz_1 = newSize - 1
-  let newArr = Array.make(newSize, list{})
-  let rec copyBucket = bucket =>
-    switch bucket {
-    | list{} => ()
-    | list{n, ...ns} =>
-      switch n {
-      | Node(l, v, _, h) =>
-        let ind = land(hashVal(getId(l), getId(h), v), newSz_1)
-
-        newArr[ind] = list{n, ...newArr[ind]}
-        copyBucket(ns)
-      | _ => assert(false)
-      }
-    }
-
-  for n in 0 to sz_1.contents {
-    copyBucket(arr[n])
-  }
-  htab := newArr
-  sz_1 := newSz_1
-}
-
-let rec insert = (idl, idh, v, ind, bucket, newNode) =>
-  if n_items.contents <= sz_1.contents {
-    htab.contents[ind] = list{newNode, ...bucket}
-    incr(n_items)
-  } else {
-    resize(sz_1.contents + sz_1.contents + 2)
-    let ind = land(hashVal(idl, idh, v), sz_1.contents)
-
-    htab.contents[ind] = list{newNode, ...htab.contents[ind]}
-  }
-
-let resetUnique = () => {
-  sz_1 := initSize_1
-  htab := Array.make(sz_1.contents + 1, list{})
-  n_items := 0
-  nodeC := 1
-}
-
-let mkNode = (low, v, high) => {
-  let idl = getId(low)
-  let idh = getId(high)
-
-  if idl == idh {
-    low
-  } else {
-    let ind = land(hashVal(idl, idh, v), sz_1.contents)
-    let bucket = htab.contents[ind]
-    let rec lookup = b =>
-      switch b {
-      | list{} =>
-        let n = Node(
-          low,
-          v,
-          {
-            incr(nodeC)
-            nodeC.contents
-          },
-          high,
-        )
-
-        insert(getId(low), getId(high), v, ind, bucket, n)
-        n
-      | list{n, ...ns} =>
-        switch n {
-        | Node(l, v', id, h) =>
-          if v == v' && (idl == getId(l) && idh == getId(h)) {
-            n
-          } else {
-            lookup(ns)
-          }
-        | _ => assert(false)
-        }
-      }
-
-    lookup(bucket)
-  }
-}
-
-type ordering = LESS | EQUAL | GREATER
-
-let cmpVar = (x: int, y: int) =>
-  if x < y {
-    LESS
-  } else if x > y {
-    GREATER
-  } else {
-    EQUAL
-  }
-
-let zero = Zero
-let one = One
-
-let mkVar = x => mkNode(zero, x, one)
-
-let cacheSize = 1999
-let andslot1 = Array.make(cacheSize, 0)
-let andslot2 = Array.make(cacheSize, 0)
-let andslot3 = Array.make(cacheSize, zero)
-let xorslot1 = Array.make(cacheSize, 0)
-let xorslot2 = Array.make(cacheSize, 0)
-let xorslot3 = Array.make(cacheSize, zero)
-let notslot1 = Array.make(cacheSize, 0)
-let notslot2 = Array.make(cacheSize, one)
-let hash = (x, y) => mod(lsl(x, 1) + y, cacheSize)
-
-let rec not = n =>
-  switch n {
-  | Zero => One
-  | One => Zero
-  | Node(l, v, id, r) =>
-    let h = mod(id, cacheSize)
-
-    if id == notslot1[h] {
-      notslot2[h]
-    } else {
-      let f = mkNode(!l, v, !r)
-
-      notslot1[h] = id
-      notslot2[h] = f
-      f
-    }
-  }
-
-let rec and2 = (n1, n2) =>
-  switch n1 {
-  | Node(l1, v1, i1, r1) =>
-    switch n2 {
-    | Node(l2, v2, i2, r2) =>
-      let h = hash(i1, i2)
-
-      if i1 == andslot1[h] && i2 == andslot2[h] {
-        andslot3[h]
-      } else {
-        let f = switch cmpVar(v1, v2) {
-        | EQUAL => mkNode(and2(l1, l2), v1, and2(r1, r2))
-        | LESS => mkNode(and2(l1, n2), v1, and2(r1, n2))
-        | GREATER => mkNode(and2(n1, l2), v2, and2(n1, r2))
-        }
-
-        andslot1[h] = i1
-        andslot2[h] = i2
-        andslot3[h] = f
-        f
-      }
-    | Zero => Zero
-    | One => n1
-    }
-  | Zero => Zero
-  | One => n2
-  }
-
-let rec xor = (n1, n2) =>
-  switch n1 {
-  | Node(l1, v1, i1, r1) =>
-    switch n2 {
-    | Node(l2, v2, i2, r2) =>
-      let h = hash(i1, i2)
-
-      if i1 == andslot1[h] && i2 == andslot2[h] {
-        andslot3[h]
-      } else {
-        let f = switch cmpVar(v1, v2) {
-        | EQUAL => mkNode(xor(l1, l2), v1, xor(r1, r2))
-        | LESS => mkNode(xor(l1, n2), v1, xor(r1, n2))
-        | GREATER => mkNode(xor(n1, l2), v2, xor(n1, r2))
-        }
-
-        andslot1[h] = i1
-        andslot2[h] = i2
-        andslot3[h] = f
-        f
-      }
-    | Zero => n1
-    | One => !n1
-    }
-  | Zero => n2
-  | One => !n2
-  }
-
-let hwb = n => {
-  let rec h = (i, j) =>
-    if i == j {
-      mkVar(i)
-    } else {
-      xor(and2(!mkVar(j), h(i, j - 1)), and2(mkVar(j), g(i, j - 1)))
-    }
-  and g = (i, j) =>
-    if i == j {
-      mkVar(i)
-    } else {
-      xor(and2(!mkVar(i), h(i + 1, j)), and2(mkVar(i), g(i + 1, j)))
-    }
-
-  h(0, n - 1)
-}
-
-/* Testing */
-let seed = ref(0)
-
-let random = () => {
-  seed := seed.contents * 25173 + 17431
-  land(seed.contents, 1) > 0
-}
-
-let random_vars = n => {
-  let vars = Array.make(n, false)
-  for i in 0 to n - 1 {
-    vars[i] = random()
-  }
-  vars
-}
-
-let bool_equal = (a, b) =>
-  switch (a, b) {
-  | (true, true)
-  | (false, false) => true
-  | _ => false
-  }
-
-let test_hwb = (bdd, vars) => {
-  /* We should have
-        eval bdd vars = vars.(n-1) if n > 0
-        eval bdd vars = false if n = 0
-     where n is the number of "true" elements in vars. */
-  let ntrue = ref(0)
-  for i in 0 to Array.length(vars) - 1 {
-    if vars[i] {
-      incr(ntrue)
-    }
-  }
-  bool_equal(
-    eval(bdd, vars),
-    if ntrue.contents > 0 {
-      vars[ntrue.contents - 1]
-    } else {
-      false
-    },
-  )
-}
-
-let main = () => {
-  let n = 22
-  /* if Array.length Sys.argv >= 2 then int_of_string Sys.argv.(1) else 22 in */
-  let ntests = 100
-  /* if Array.length Sys.argv >= 3 then int_of_string Sys.argv.(2) else 100 in */
-  let bdd = hwb(n)
-  let succeeded = ref(true)
-  for i in 1 to ntests {
-    succeeded := succeeded.contents && test_hwb(bdd, random_vars(n))
-  }
-  assert(succeeded.contents)
-}
-
-let _ = main()
-
-/* local variables: */
-/* compile-command: "../../ocaml/bin/ocamlc.opt -o bdd.byte bdd.ml" */
-/* end: */
diff --git a/jscomp/test/belt_internal_test.js b/jscomp/test/belt_internal_test.js
deleted file mode 100644
index 7580f76..0000000
--- a/jscomp/test/belt_internal_test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function treeHeight(n) {
-  if (n !== undefined) {
-    return n.height;
-  } else {
-    return 0;
-  }
-}
-
-function copy(n) {
-  if (n === undefined) {
-    return n;
-  }
-  var v = n.value;
-  var h = n.height;
-  var l = n.left;
-  var r = n.right;
-  return {
-          value: v,
-          height: h,
-          left: copy(l),
-          right: copy(r)
-        };
-}
-
-exports.treeHeight = treeHeight;
-exports.copy = copy;
-/* No side effect */
diff --git a/jscomp/test/belt_internal_test.res b/jscomp/test/belt_internal_test.res
deleted file mode 100644
index 05049c7..0000000
--- a/jscomp/test/belt_internal_test.res
+++ /dev/null
@@ -1,25 +0,0 @@
-type rec node<'value> = {
-  mutable value: 'value,
-  mutable height: int,
-  mutable left: t<'value>,
-  mutable right: t<'value>,
-}
-and t<'value> = option<node<'value>>
-
-let treeHeight = (n: t<_>) =>
-  switch n {
-  | None => 0
-  | Some(n) => n.height
-  }
-
-let rec copy = n =>
-  switch n {
-  | None => n
-  | Some({left: l, right: r, value: v, height: h}) =>
-    Some({
-      left: copy(l),
-      right: copy(r),
-      value: v,
-      height: h,
-    })
-  }
diff --git a/jscomp/test/belt_result_alias_test.js b/jscomp/test/belt_result_alias_test.js
deleted file mode 100644
index b66a692..0000000
--- a/jscomp/test/belt_result_alias_test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Belt_Result = require("../../lib/js/belt_Result.js");
-
-Belt_Result.map({
-      TAG: "Ok",
-      _0: "Test"
-    }, (function (r) {
-        return "Value: " + r;
-      }));
-
-Belt_Result.getWithDefault(Belt_Result.map({
-          TAG: "Error",
-          _0: "error"
-        }, (function (r) {
-            return "Value: " + r;
-          })), "success");
-
-/*  Not a pure module */
diff --git a/jscomp/test/belt_result_alias_test.res b/jscomp/test/belt_result_alias_test.res
deleted file mode 100644
index daba7ea..0000000
--- a/jscomp/test/belt_result_alias_test.res
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Make sure Belt.Result.t / Pervasives.result can be used interchangiably */
-
-let _ = Ok("Test")->Belt.Result.map(r => "Value: " ++ r)
-
-let _ = {
-  open Belt.Result
-  Error("error")->map(r => "Value: " ++ r)->getWithDefault("success")
-}
diff --git a/jscomp/test/bench.js b/jscomp/test/bench.js
deleted file mode 100644
index 38ca9b8..0000000
--- a/jscomp/test/bench.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-function map(f, a) {
-  var f$1 = Curry.__1(f);
-  var l = a.length;
-  if (l === 0) {
-    return [];
-  }
-  var r = Caml_array.make(l, f$1(a[0]));
-  for(var i = 1; i < l; ++i){
-    r[i] = f$1(a[i]);
-  }
-  return r;
-}
-
-function init(l, f) {
-  var f$1 = Curry.__1(f);
-  if (l === 0) {
-    return [];
-  }
-  if (l < 0) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.init",
-          Error: new Error()
-        };
-  }
-  var res = Caml_array.make(l, f$1(0));
-  for(var i = 1; i < l; ++i){
-    res[i] = f$1(i);
-  }
-  return res;
-}
-
-function fold_left(f, x, a) {
-  var f$1 = Curry.__2(f);
-  var r = x;
-  for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){
-    r = f$1(r, a[i]);
-  }
-  return r;
-}
-
-function f2(param) {
-  var arr = init(3000000, (function (i) {
-          return i;
-        }));
-  var b = map((function (i) {
-          return i + i - 1;
-        }), arr);
-  var v = fold_left((function (prim0, prim1) {
-          return prim0 + prim1;
-        }), 0, b);
-  console.log(Pervasives.string_of_float(v));
-}
-
-f2();
-
-exports.map = map;
-exports.init = init;
-exports.fold_left = fold_left;
-exports.f2 = f2;
-/*  Not a pure module */
diff --git a/jscomp/test/bench.res b/jscomp/test/bench.res
deleted file mode 100644
index 6285496..0000000
--- a/jscomp/test/bench.res
+++ /dev/null
@@ -1,55 +0,0 @@
-let map = (f, a) => {
-  let l = Array.length(a)
-  if l == 0 {
-    []
-  } else {
-    let r = Array.make(l, f(. Array.unsafe_get(a, 0)))
-    for i in 1 to l - 1 {
-      Array.unsafe_set(r, i, f(. Array.unsafe_get(a, i)))
-    }
-    r
-  }
-}
-
-let map = (type u v, f: u => v, a: array<u>): array<v> => map((. x) => f(x), a)
-
-let init = (l, f) =>
-  if l == 0 {
-    []
-  } else if l < 0 {
-    invalid_arg("Array.init")
-  } else {
-    /* See #6575. We could also check for maximum array size, but this depends
-     on whether we create a float array or a regular one... */
-
-    let res = Array.make(l, f(. 0))
-    for i in 1 to pred(l) {
-      Array.unsafe_set(res, i, f(. i))
-    }
-    res
-  }
-
-let init = (l, f) => init(l, (. x) => f(x))
-
-let fold_left = (f, x, a) => {
-  let r = ref(x)
-  for i in 0 to Array.length(a) - 1 {
-    r := f(. r.contents, Array.unsafe_get(a, i))
-  }
-  r.contents
-}
-
-let fold_left = (f, x, a) => fold_left((. x, y) => f(x, y), x, a)
-
-let f2 = () => {
-  let arr = init(3_000_000, i => float_of_int(i))
-  let b = map(i => i +. i -. 1., arr)
-  let v = fold_left(\"+.", 0., b)
-  print_endline(string_of_float(v))
-}
-
-f2()
-
-/* local variables: */
-/* compile-command: "ocamlc bench.ml -o bench.byte  && js_of_ocaml --opt 3 bench.byte -o bench.1.js " */
-/* end: */
diff --git a/jscomp/test/big_enum.js b/jscomp/test/big_enum.js
deleted file mode 100644
index c1d5ed7..0000000
--- a/jscomp/test/big_enum.js
+++ /dev/null
@@ -1,1219 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function to_enum(x) {
-  switch (x) {
-    case "A0" :
-        return 0;
-    case "A1" :
-        return 1;
-    case "A2" :
-        return 2;
-    case "A3" :
-        return 3;
-    case "A4" :
-        return 4;
-    case "A5" :
-        return 5;
-    case "A6" :
-        return 6;
-    case "A7" :
-        return 7;
-    case "A8" :
-        return 8;
-    case "A9" :
-        return 9;
-    case "A10" :
-        return 10;
-    case "A11" :
-        return 11;
-    case "A12" :
-        return 12;
-    case "A13" :
-        return 13;
-    case "A14" :
-        return 14;
-    case "A15" :
-        return 15;
-    case "A16" :
-        return 16;
-    case "A17" :
-        return 17;
-    case "A18" :
-        return 18;
-    case "A19" :
-        return 19;
-    case "A20" :
-        return 20;
-    case "A21" :
-        return 21;
-    case "A22" :
-        return 22;
-    case "A23" :
-        return 23;
-    case "A24" :
-        return 24;
-    case "A25" :
-        return 25;
-    case "A26" :
-        return 26;
-    case "A27" :
-        return 27;
-    case "A28" :
-        return 28;
-    case "A29" :
-        return 29;
-    case "A30" :
-        return 30;
-    case "A31" :
-        return 31;
-    case "A32" :
-        return 32;
-    case "A33" :
-        return 33;
-    case "A34" :
-        return 34;
-    case "A35" :
-        return 35;
-    case "A36" :
-        return 36;
-    case "A37" :
-        return 37;
-    case "A38" :
-        return 38;
-    case "A39" :
-        return 39;
-    case "A40" :
-        return 40;
-    case "A41" :
-        return 41;
-    case "A42" :
-        return 42;
-    case "A43" :
-        return 43;
-    case "A44" :
-        return 44;
-    case "A45" :
-        return 45;
-    case "A46" :
-        return 46;
-    case "A47" :
-        return 47;
-    case "A48" :
-        return 48;
-    case "A49" :
-        return 49;
-    case "A50" :
-        return 50;
-    case "A51" :
-        return 51;
-    case "A52" :
-        return 52;
-    case "A53" :
-        return 53;
-    case "A54" :
-        return 54;
-    case "A55" :
-        return 55;
-    case "A56" :
-        return 56;
-    case "A57" :
-        return 57;
-    case "A58" :
-        return 58;
-    case "A59" :
-        return 59;
-    case "A60" :
-        return 60;
-    case "A61" :
-        return 61;
-    case "A62" :
-        return 62;
-    case "A63" :
-        return 63;
-    case "A64" :
-        return 64;
-    case "A65" :
-        return 65;
-    case "A66" :
-        return 66;
-    case "A67" :
-        return 67;
-    case "A68" :
-        return 68;
-    case "A69" :
-        return 69;
-    case "A70" :
-        return 70;
-    case "A71" :
-        return 71;
-    case "A72" :
-        return 72;
-    case "A73" :
-        return 73;
-    case "A74" :
-        return 74;
-    case "A75" :
-        return 75;
-    case "A76" :
-        return 76;
-    case "A77" :
-        return 77;
-    case "A78" :
-        return 78;
-    case "A79" :
-        return 79;
-    case "A80" :
-        return 80;
-    case "A81" :
-        return 81;
-    case "A82" :
-        return 82;
-    case "A83" :
-        return 83;
-    case "A84" :
-        return 84;
-    case "A85" :
-        return 85;
-    case "A86" :
-        return 86;
-    case "A87" :
-        return 87;
-    case "A88" :
-        return 88;
-    case "A89" :
-        return 89;
-    case "A90" :
-        return 90;
-    case "A91" :
-        return 91;
-    case "A92" :
-        return 92;
-    case "A93" :
-        return 93;
-    case "A94" :
-        return 94;
-    case "A95" :
-        return 95;
-    case "A96" :
-        return 96;
-    case "A97" :
-        return 97;
-    case "A98" :
-        return 98;
-    case "A99" :
-        return 99;
-    case "A100" :
-        return 100;
-    case "A101" :
-        return 101;
-    case "A102" :
-        return 102;
-    case "A103" :
-        return 103;
-    case "A104" :
-        return 104;
-    case "A105" :
-        return 105;
-    case "A106" :
-        return 106;
-    case "A107" :
-        return 107;
-    case "A108" :
-        return 108;
-    case "A109" :
-        return 109;
-    case "A110" :
-        return 110;
-    case "A111" :
-        return 111;
-    case "A112" :
-        return 112;
-    case "A113" :
-        return 113;
-    case "A114" :
-        return 114;
-    case "A115" :
-        return 115;
-    case "A116" :
-        return 116;
-    case "A117" :
-        return 117;
-    case "A118" :
-        return 118;
-    case "A119" :
-        return 119;
-    case "A120" :
-        return 120;
-    case "A121" :
-        return 121;
-    case "A122" :
-        return 122;
-    case "A123" :
-        return 123;
-    case "A124" :
-        return 124;
-    case "A125" :
-        return 125;
-    case "A126" :
-        return 126;
-    case "A127" :
-        return 127;
-    case "A128" :
-        return 128;
-    case "A129" :
-        return 129;
-    case "A130" :
-        return 130;
-    case "A131" :
-        return 131;
-    case "A132" :
-        return 132;
-    case "A133" :
-        return 133;
-    case "A134" :
-        return 134;
-    case "A135" :
-        return 135;
-    case "A136" :
-        return 136;
-    case "A137" :
-        return 137;
-    case "A138" :
-        return 138;
-    case "A139" :
-        return 139;
-    case "A140" :
-        return 140;
-    case "A141" :
-        return 141;
-    case "A142" :
-        return 142;
-    case "A143" :
-        return 143;
-    case "A144" :
-        return 144;
-    case "A145" :
-        return 145;
-    case "A146" :
-        return 146;
-    case "A147" :
-        return 147;
-    case "A148" :
-        return 148;
-    case "A149" :
-        return 149;
-    case "A150" :
-        return 150;
-    case "A151" :
-        return 151;
-    case "A152" :
-        return 152;
-    case "A153" :
-        return 153;
-    case "A154" :
-        return 154;
-    case "A155" :
-        return 155;
-    case "A156" :
-        return 156;
-    case "A157" :
-        return 157;
-    case "A158" :
-        return 158;
-    case "A159" :
-        return 159;
-    case "A160" :
-        return 160;
-    case "A161" :
-        return 161;
-    case "A162" :
-        return 162;
-    case "A163" :
-        return 163;
-    case "A164" :
-        return 164;
-    case "A165" :
-        return 165;
-    case "A166" :
-        return 166;
-    case "A167" :
-        return 167;
-    case "A168" :
-        return 168;
-    case "A169" :
-        return 169;
-    case "A170" :
-        return 170;
-    case "A171" :
-        return 171;
-    case "A172" :
-        return 172;
-    case "A173" :
-        return 173;
-    case "A174" :
-        return 174;
-    case "A175" :
-        return 175;
-    case "A176" :
-        return 176;
-    case "A177" :
-        return 177;
-    case "A178" :
-        return 178;
-    case "A179" :
-        return 179;
-    case "A180" :
-        return 180;
-    case "A181" :
-        return 181;
-    case "A182" :
-        return 182;
-    case "A183" :
-        return 183;
-    case "A184" :
-        return 184;
-    case "A185" :
-        return 185;
-    case "A186" :
-        return 186;
-    case "A187" :
-        return 187;
-    case "A188" :
-        return 188;
-    case "A189" :
-        return 189;
-    case "A190" :
-        return 190;
-    case "A191" :
-        return 191;
-    case "A192" :
-        return 192;
-    case "A193" :
-        return 193;
-    case "A194" :
-        return 194;
-    case "A195" :
-        return 195;
-    case "A196" :
-        return 196;
-    case "A197" :
-        return 197;
-    case "A198" :
-        return 198;
-    case "A199" :
-        return 199;
-    case "A200" :
-        return 200;
-    case "A201" :
-        return 201;
-    case "A202" :
-        return 202;
-    case "A203" :
-        return 203;
-    case "A204" :
-        return 204;
-    case "A205" :
-        return 205;
-    case "A206" :
-        return 206;
-    case "A207" :
-        return 207;
-    case "A208" :
-        return 208;
-    case "A209" :
-        return 209;
-    case "A210" :
-        return 210;
-    case "A211" :
-        return 211;
-    case "A212" :
-        return 212;
-    case "A213" :
-        return 213;
-    case "A214" :
-        return 214;
-    case "A215" :
-        return 215;
-    case "A216" :
-        return 216;
-    case "A217" :
-        return 217;
-    case "A218" :
-        return 218;
-    case "A219" :
-        return 219;
-    case "A220" :
-        return 220;
-    case "A221" :
-        return 221;
-    case "A222" :
-        return 222;
-    case "A223" :
-        return 223;
-    case "A224" :
-        return 224;
-    case "A225" :
-        return 225;
-    case "A226" :
-        return 226;
-    case "A227" :
-        return 227;
-    case "A228" :
-        return 228;
-    case "A229" :
-        return 229;
-    case "A230" :
-        return 230;
-    case "A231" :
-        return 231;
-    case "A232" :
-        return 232;
-    case "A233" :
-        return 233;
-    case "A234" :
-        return 234;
-    case "A235" :
-        return 235;
-    case "A236" :
-        return 236;
-    case "A237" :
-        return 237;
-    case "A238" :
-        return 238;
-    case "A239" :
-        return 239;
-    case "A240" :
-        return 240;
-    case "A241" :
-        return 241;
-    case "A242" :
-        return 242;
-    case "A243" :
-        return 243;
-    case "A244" :
-        return 244;
-    case "A245" :
-        return 245;
-    case "A246" :
-        return 246;
-    case "A247" :
-        return 247;
-    case "A248" :
-        return 248;
-    case "A249" :
-        return 249;
-    case "A250" :
-        return 250;
-    case "A251" :
-        return 251;
-    case "A252" :
-        return 252;
-    case "A253" :
-        return 253;
-    case "A254" :
-        return 254;
-    case "A255" :
-        return 255;
-    case "A256" :
-        return 256;
-    case "A257" :
-        return 257;
-    case "A258" :
-        return 258;
-    case "A259" :
-        return 259;
-    case "A260" :
-        return 260;
-    case "A261" :
-        return 261;
-    case "A262" :
-        return 262;
-    case "A263" :
-        return 263;
-    case "A264" :
-        return 264;
-    case "A265" :
-        return 265;
-    case "A266" :
-        return 266;
-    case "A267" :
-        return 267;
-    case "A268" :
-        return 268;
-    case "A269" :
-        return 269;
-    case "A270" :
-        return 270;
-    case "A271" :
-        return 271;
-    case "A272" :
-        return 272;
-    case "A273" :
-        return 273;
-    case "A274" :
-        return 274;
-    case "A275" :
-        return 275;
-    case "A276" :
-        return 276;
-    case "A277" :
-        return 277;
-    case "A278" :
-        return 278;
-    case "A279" :
-        return 279;
-    case "A280" :
-        return 280;
-    case "A281" :
-        return 281;
-    case "A282" :
-        return 282;
-    case "A283" :
-        return 283;
-    case "A284" :
-        return 284;
-    case "A285" :
-        return 285;
-    case "A286" :
-        return 286;
-    case "A287" :
-        return 287;
-    case "A288" :
-        return 288;
-    case "A289" :
-        return 289;
-    case "A290" :
-        return 290;
-    case "A291" :
-        return 291;
-    case "A292" :
-        return 292;
-    case "A293" :
-        return 293;
-    case "A294" :
-        return 294;
-    case "A295" :
-        return 295;
-    case "A296" :
-        return 296;
-    case "A297" :
-        return 297;
-    case "A298" :
-        return 298;
-    case "A299" :
-        return 299;
-    
-  }
-}
-
-function to_string(x) {
-  switch (x) {
-    case "A0" :
-        return "A0";
-    case "A1" :
-        return "A1";
-    case "A2" :
-        return "A2";
-    case "A3" :
-        return "A3";
-    case "A4" :
-        return "A4";
-    case "A5" :
-        return "A5";
-    case "A6" :
-        return "A6";
-    case "A7" :
-        return "A7";
-    case "A8" :
-        return "A8";
-    case "A9" :
-        return "A9";
-    case "A10" :
-        return "A10";
-    case "A11" :
-        return "A11";
-    case "A12" :
-        return "A12";
-    case "A13" :
-        return "A13";
-    case "A14" :
-        return "A14";
-    case "A15" :
-        return "A15";
-    case "A16" :
-        return "A16";
-    case "A17" :
-        return "A17";
-    case "A18" :
-        return "A18";
-    case "A19" :
-        return "A19";
-    case "A20" :
-        return "A20";
-    case "A21" :
-        return "A21";
-    case "A22" :
-        return "A22";
-    case "A23" :
-        return "A23";
-    case "A24" :
-        return "A24";
-    case "A25" :
-        return "A25";
-    case "A26" :
-        return "A26";
-    case "A27" :
-        return "A27";
-    case "A28" :
-        return "A28";
-    case "A29" :
-        return "A29";
-    case "A30" :
-        return "A30";
-    case "A31" :
-        return "A31";
-    case "A32" :
-        return "A32";
-    case "A33" :
-        return "A33";
-    case "A34" :
-        return "A34";
-    case "A35" :
-        return "A35";
-    case "A36" :
-        return "A36";
-    case "A37" :
-        return "A37";
-    case "A38" :
-        return "A38";
-    case "A39" :
-        return "A39";
-    case "A40" :
-        return "A40";
-    case "A41" :
-        return "A41";
-    case "A42" :
-        return "A42";
-    case "A43" :
-        return "A43";
-    case "A44" :
-        return "A44";
-    case "A45" :
-        return "A45";
-    case "A46" :
-        return "A46";
-    case "A47" :
-        return "A47";
-    case "A48" :
-        return "A48";
-    case "A49" :
-        return "A49";
-    case "A50" :
-        return "A50";
-    case "A51" :
-        return "A51";
-    case "A52" :
-        return "A52";
-    case "A53" :
-        return "A53";
-    case "A54" :
-        return "A54";
-    case "A55" :
-        return "A55";
-    case "A56" :
-        return "A56";
-    case "A57" :
-        return "A57";
-    case "A58" :
-        return "A58";
-    case "A59" :
-        return "A59";
-    case "A60" :
-        return "A60";
-    case "A61" :
-        return "A61";
-    case "A62" :
-        return "A62";
-    case "A63" :
-        return "A63";
-    case "A64" :
-        return "A64";
-    case "A65" :
-        return "A65";
-    case "A66" :
-        return "A66";
-    case "A67" :
-        return "A67";
-    case "A68" :
-        return "A68";
-    case "A69" :
-        return "A69";
-    case "A70" :
-        return "A70";
-    case "A71" :
-        return "A71";
-    case "A72" :
-        return "A72";
-    case "A73" :
-        return "A73";
-    case "A74" :
-        return "A74";
-    case "A75" :
-        return "A75";
-    case "A76" :
-        return "A76";
-    case "A77" :
-        return "A77";
-    case "A78" :
-        return "A78";
-    case "A79" :
-        return "A79";
-    case "A80" :
-        return "A80";
-    case "A81" :
-        return "A81";
-    case "A82" :
-        return "A82";
-    case "A83" :
-        return "A83";
-    case "A84" :
-        return "A84";
-    case "A85" :
-        return "A85";
-    case "A86" :
-        return "A86";
-    case "A87" :
-        return "A87";
-    case "A88" :
-        return "A88";
-    case "A89" :
-        return "A89";
-    case "A90" :
-        return "A90";
-    case "A91" :
-        return "A91";
-    case "A92" :
-        return "A92";
-    case "A93" :
-        return "A93";
-    case "A94" :
-        return "A94";
-    case "A95" :
-        return "A95";
-    case "A96" :
-        return "A96";
-    case "A97" :
-        return "A97";
-    case "A98" :
-        return "A98";
-    case "A99" :
-        return "A99";
-    case "A100" :
-        return "A100";
-    case "A101" :
-        return "A101";
-    case "A102" :
-        return "A102";
-    case "A103" :
-        return "A103";
-    case "A104" :
-        return "A104";
-    case "A105" :
-        return "A105";
-    case "A106" :
-        return "A106";
-    case "A107" :
-        return "A107";
-    case "A108" :
-        return "A108";
-    case "A109" :
-        return "A109";
-    case "A110" :
-        return "A110";
-    case "A111" :
-        return "A111";
-    case "A112" :
-        return "A112";
-    case "A113" :
-        return "A113";
-    case "A114" :
-        return "A114";
-    case "A115" :
-        return "A115";
-    case "A116" :
-        return "A116";
-    case "A117" :
-        return "A117";
-    case "A118" :
-        return "A118";
-    case "A119" :
-        return "A119";
-    case "A120" :
-        return "A120";
-    case "A121" :
-        return "A121";
-    case "A122" :
-        return "A122";
-    case "A123" :
-        return "A123";
-    case "A124" :
-        return "A124";
-    case "A125" :
-        return "A125";
-    case "A126" :
-        return "A126";
-    case "A127" :
-        return "A127";
-    case "A128" :
-        return "A128";
-    case "A129" :
-        return "A129";
-    case "A130" :
-        return "A130";
-    case "A131" :
-        return "A131";
-    case "A132" :
-        return "A132";
-    case "A133" :
-        return "A133";
-    case "A134" :
-        return "A134";
-    case "A135" :
-        return "A135";
-    case "A136" :
-        return "A136";
-    case "A137" :
-        return "A137";
-    case "A138" :
-        return "A138";
-    case "A139" :
-        return "A139";
-    case "A140" :
-        return "A140";
-    case "A141" :
-        return "A141";
-    case "A142" :
-        return "A142";
-    case "A143" :
-        return "A143";
-    case "A144" :
-        return "A144";
-    case "A145" :
-        return "A145";
-    case "A146" :
-        return "A146";
-    case "A147" :
-        return "A147";
-    case "A148" :
-        return "A148";
-    case "A149" :
-        return "A149";
-    case "A150" :
-        return "A150";
-    case "A151" :
-        return "A151";
-    case "A152" :
-        return "A152";
-    case "A153" :
-        return "A153";
-    case "A154" :
-        return "A154";
-    case "A155" :
-        return "A155";
-    case "A156" :
-        return "A156";
-    case "A157" :
-        return "A157";
-    case "A158" :
-        return "A158";
-    case "A159" :
-        return "A159";
-    case "A160" :
-        return "A160";
-    case "A161" :
-        return "A161";
-    case "A162" :
-        return "A162";
-    case "A163" :
-        return "A163";
-    case "A164" :
-        return "A164";
-    case "A165" :
-        return "A165";
-    case "A166" :
-        return "A166";
-    case "A167" :
-        return "A167";
-    case "A168" :
-        return "A168";
-    case "A169" :
-        return "A169";
-    case "A170" :
-        return "A170";
-    case "A171" :
-        return "A171";
-    case "A172" :
-        return "A172";
-    case "A173" :
-        return "A173";
-    case "A174" :
-        return "A174";
-    case "A175" :
-        return "A175";
-    case "A176" :
-        return "A176";
-    case "A177" :
-        return "A177";
-    case "A178" :
-        return "A178";
-    case "A179" :
-        return "A179";
-    case "A180" :
-        return "A180";
-    case "A181" :
-        return "A181";
-    case "A182" :
-        return "A182";
-    case "A183" :
-        return "A183";
-    case "A184" :
-        return "A184";
-    case "A185" :
-        return "A185";
-    case "A186" :
-        return "A186";
-    case "A187" :
-        return "A187";
-    case "A188" :
-        return "A188";
-    case "A189" :
-        return "A189";
-    case "A190" :
-        return "A190";
-    case "A191" :
-        return "A191";
-    case "A192" :
-        return "A192";
-    case "A193" :
-        return "A193";
-    case "A194" :
-        return "A194";
-    case "A195" :
-        return "A195";
-    case "A196" :
-        return "A196";
-    case "A197" :
-        return "A197";
-    case "A198" :
-        return "A198";
-    case "A199" :
-        return "A199";
-    case "A200" :
-        return "A200";
-    case "A201" :
-        return "A201";
-    case "A202" :
-        return "A202";
-    case "A203" :
-        return "A203";
-    case "A204" :
-        return "A204";
-    case "A205" :
-        return "A205";
-    case "A206" :
-        return "A206";
-    case "A207" :
-        return "A207";
-    case "A208" :
-        return "A208";
-    case "A209" :
-        return "A209";
-    case "A210" :
-        return "A210";
-    case "A211" :
-        return "A211";
-    case "A212" :
-        return "A212";
-    case "A213" :
-        return "A213";
-    case "A214" :
-        return "A214";
-    case "A215" :
-        return "A215";
-    case "A216" :
-        return "A216";
-    case "A217" :
-        return "A217";
-    case "A218" :
-        return "A218";
-    case "A219" :
-        return "A219";
-    case "A220" :
-        return "A220";
-    case "A221" :
-        return "A221";
-    case "A222" :
-        return "A222";
-    case "A223" :
-        return "A223";
-    case "A224" :
-        return "A224";
-    case "A225" :
-        return "A225";
-    case "A226" :
-        return "A226";
-    case "A227" :
-        return "A227";
-    case "A228" :
-        return "A228";
-    case "A229" :
-        return "A229";
-    case "A230" :
-        return "A230";
-    case "A231" :
-        return "A231";
-    case "A232" :
-        return "A232";
-    case "A233" :
-        return "A233";
-    case "A234" :
-        return "A234";
-    case "A235" :
-        return "A235";
-    case "A236" :
-        return "A236";
-    case "A237" :
-        return "A237";
-    case "A238" :
-        return "A238";
-    case "A239" :
-        return "A239";
-    case "A240" :
-        return "A240";
-    case "A241" :
-        return "A241";
-    case "A242" :
-        return "A242";
-    case "A243" :
-        return "A243";
-    case "A244" :
-        return "A244";
-    case "A245" :
-        return "A245";
-    case "A246" :
-        return "A246";
-    case "A247" :
-        return "A247";
-    case "A248" :
-        return "A248";
-    case "A249" :
-        return "A249";
-    case "A250" :
-        return "A250";
-    case "A251" :
-        return "A251";
-    case "A252" :
-        return "A252";
-    case "A253" :
-        return "A253";
-    case "A254" :
-        return "A254";
-    case "A255" :
-        return "A255";
-    case "A256" :
-        return "A256";
-    case "A257" :
-        return "A257";
-    case "A258" :
-        return "A258";
-    case "A259" :
-        return "A259";
-    case "A260" :
-        return "A260";
-    case "A261" :
-        return "A261";
-    case "A262" :
-        return "A262";
-    case "A263" :
-        return "A263";
-    case "A264" :
-        return "A264";
-    case "A265" :
-        return "A265";
-    case "A266" :
-        return "A266";
-    case "A267" :
-        return "A267";
-    case "A268" :
-        return "A268";
-    case "A269" :
-        return "A269";
-    case "A270" :
-        return "A270";
-    case "A271" :
-        return "A271";
-    case "A272" :
-        return "A272";
-    case "A273" :
-        return "A273";
-    case "A274" :
-        return "A274";
-    case "A275" :
-        return "A275";
-    case "A276" :
-        return "A276";
-    case "A277" :
-        return "A277";
-    case "A278" :
-        return "A278";
-    case "A279" :
-        return "A279";
-    case "A280" :
-        return "A280";
-    case "A281" :
-        return "A281";
-    case "A282" :
-        return "A282";
-    case "A283" :
-        return "A283";
-    case "A284" :
-        return "A284";
-    case "A285" :
-        return "A285";
-    case "A286" :
-        return "A286";
-    case "A287" :
-        return "A287";
-    case "A288" :
-        return "A288";
-    case "A289" :
-        return "A289";
-    case "A290" :
-        return "A290";
-    case "A291" :
-        return "A291";
-    case "A292" :
-        return "A292";
-    case "A293" :
-        return "A293";
-    case "A294" :
-        return "A294";
-    case "A295" :
-        return "A295";
-    case "A296" :
-        return "A296";
-    case "A297" :
-        return "A297";
-    case "A298" :
-        return "A298";
-    case "A299" :
-        return "A299";
-    
-  }
-}
-
-exports.to_enum = to_enum;
-exports.to_string = to_string;
-/* No side effect */
diff --git a/jscomp/test/big_enum.res b/jscomp/test/big_enum.res
deleted file mode 100644
index 52d0686..0000000
--- a/jscomp/test/big_enum.res
+++ /dev/null
@@ -1,907 +0,0 @@
-type t =
-  | A0
-  | A1
-  | A2
-  | A3
-  | A4
-  | A5
-  | A6
-  | A7
-  | A8
-  | A9
-  | A10
-  | A11
-  | A12
-  | A13
-  | A14
-  | A15
-  | A16
-  | A17
-  | A18
-  | A19
-  | A20
-  | A21
-  | A22
-  | A23
-  | A24
-  | A25
-  | A26
-  | A27
-  | A28
-  | A29
-  | A30
-  | A31
-  | A32
-  | A33
-  | A34
-  | A35
-  | A36
-  | A37
-  | A38
-  | A39
-  | A40
-  | A41
-  | A42
-  | A43
-  | A44
-  | A45
-  | A46
-  | A47
-  | A48
-  | A49
-  | A50
-  | A51
-  | A52
-  | A53
-  | A54
-  | A55
-  | A56
-  | A57
-  | A58
-  | A59
-  | A60
-  | A61
-  | A62
-  | A63
-  | A64
-  | A65
-  | A66
-  | A67
-  | A68
-  | A69
-  | A70
-  | A71
-  | A72
-  | A73
-  | A74
-  | A75
-  | A76
-  | A77
-  | A78
-  | A79
-  | A80
-  | A81
-  | A82
-  | A83
-  | A84
-  | A85
-  | A86
-  | A87
-  | A88
-  | A89
-  | A90
-  | A91
-  | A92
-  | A93
-  | A94
-  | A95
-  | A96
-  | A97
-  | A98
-  | A99
-  | A100
-  | A101
-  | A102
-  | A103
-  | A104
-  | A105
-  | A106
-  | A107
-  | A108
-  | A109
-  | A110
-  | A111
-  | A112
-  | A113
-  | A114
-  | A115
-  | A116
-  | A117
-  | A118
-  | A119
-  | A120
-  | A121
-  | A122
-  | A123
-  | A124
-  | A125
-  | A126
-  | A127
-  | A128
-  | A129
-  | A130
-  | A131
-  | A132
-  | A133
-  | A134
-  | A135
-  | A136
-  | A137
-  | A138
-  | A139
-  | A140
-  | A141
-  | A142
-  | A143
-  | A144
-  | A145
-  | A146
-  | A147
-  | A148
-  | A149
-  | A150
-  | A151
-  | A152
-  | A153
-  | A154
-  | A155
-  | A156
-  | A157
-  | A158
-  | A159
-  | A160
-  | A161
-  | A162
-  | A163
-  | A164
-  | A165
-  | A166
-  | A167
-  | A168
-  | A169
-  | A170
-  | A171
-  | A172
-  | A173
-  | A174
-  | A175
-  | A176
-  | A177
-  | A178
-  | A179
-  | A180
-  | A181
-  | A182
-  | A183
-  | A184
-  | A185
-  | A186
-  | A187
-  | A188
-  | A189
-  | A190
-  | A191
-  | A192
-  | A193
-  | A194
-  | A195
-  | A196
-  | A197
-  | A198
-  | A199
-  | A200
-  | A201
-  | A202
-  | A203
-  | A204
-  | A205
-  | A206
-  | A207
-  | A208
-  | A209
-  | A210
-  | A211
-  | A212
-  | A213
-  | A214
-  | A215
-  | A216
-  | A217
-  | A218
-  | A219
-  | A220
-  | A221
-  | A222
-  | A223
-  | A224
-  | A225
-  | A226
-  | A227
-  | A228
-  | A229
-  | A230
-  | A231
-  | A232
-  | A233
-  | A234
-  | A235
-  | A236
-  | A237
-  | A238
-  | A239
-  | A240
-  | A241
-  | A242
-  | A243
-  | A244
-  | A245
-  | A246
-  | A247
-  | A248
-  | A249
-  | A250
-  | A251
-  | A252
-  | A253
-  | A254
-  | A255
-  | A256
-  | A257
-  | A258
-  | A259
-  | A260
-  | A261
-  | A262
-  | A263
-  | A264
-  | A265
-  | A266
-  | A267
-  | A268
-  | A269
-  | A270
-  | A271
-  | A272
-  | A273
-  | A274
-  | A275
-  | A276
-  | A277
-  | A278
-  | A279
-  | A280
-  | A281
-  | A282
-  | A283
-  | A284
-  | A285
-  | A286
-  | A287
-  | A288
-  | A289
-  | A290
-  | A291
-  | A292
-  | A293
-  | A294
-  | A295
-  | A296
-  | A297
-  | A298
-  | A299
-let to_enum = x =>
-  switch x {
-  | A0 => 0
-  | A1 => 1
-  | A2 => 2
-  | A3 => 3
-  | A4 => 4
-  | A5 => 5
-  | A6 => 6
-  | A7 => 7
-  | A8 => 8
-  | A9 => 9
-  | A10 => 10
-  | A11 => 11
-  | A12 => 12
-  | A13 => 13
-  | A14 => 14
-  | A15 => 15
-  | A16 => 16
-  | A17 => 17
-  | A18 => 18
-  | A19 => 19
-  | A20 => 20
-  | A21 => 21
-  | A22 => 22
-  | A23 => 23
-  | A24 => 24
-  | A25 => 25
-  | A26 => 26
-  | A27 => 27
-  | A28 => 28
-  | A29 => 29
-  | A30 => 30
-  | A31 => 31
-  | A32 => 32
-  | A33 => 33
-  | A34 => 34
-  | A35 => 35
-  | A36 => 36
-  | A37 => 37
-  | A38 => 38
-  | A39 => 39
-  | A40 => 40
-  | A41 => 41
-  | A42 => 42
-  | A43 => 43
-  | A44 => 44
-  | A45 => 45
-  | A46 => 46
-  | A47 => 47
-  | A48 => 48
-  | A49 => 49
-  | A50 => 50
-  | A51 => 51
-  | A52 => 52
-  | A53 => 53
-  | A54 => 54
-  | A55 => 55
-  | A56 => 56
-  | A57 => 57
-  | A58 => 58
-  | A59 => 59
-  | A60 => 60
-  | A61 => 61
-  | A62 => 62
-  | A63 => 63
-  | A64 => 64
-  | A65 => 65
-  | A66 => 66
-  | A67 => 67
-  | A68 => 68
-  | A69 => 69
-  | A70 => 70
-  | A71 => 71
-  | A72 => 72
-  | A73 => 73
-  | A74 => 74
-  | A75 => 75
-  | A76 => 76
-  | A77 => 77
-  | A78 => 78
-  | A79 => 79
-  | A80 => 80
-  | A81 => 81
-  | A82 => 82
-  | A83 => 83
-  | A84 => 84
-  | A85 => 85
-  | A86 => 86
-  | A87 => 87
-  | A88 => 88
-  | A89 => 89
-  | A90 => 90
-  | A91 => 91
-  | A92 => 92
-  | A93 => 93
-  | A94 => 94
-  | A95 => 95
-  | A96 => 96
-  | A97 => 97
-  | A98 => 98
-  | A99 => 99
-  | A100 => 100
-  | A101 => 101
-  | A102 => 102
-  | A103 => 103
-  | A104 => 104
-  | A105 => 105
-  | A106 => 106
-  | A107 => 107
-  | A108 => 108
-  | A109 => 109
-  | A110 => 110
-  | A111 => 111
-  | A112 => 112
-  | A113 => 113
-  | A114 => 114
-  | A115 => 115
-  | A116 => 116
-  | A117 => 117
-  | A118 => 118
-  | A119 => 119
-  | A120 => 120
-  | A121 => 121
-  | A122 => 122
-  | A123 => 123
-  | A124 => 124
-  | A125 => 125
-  | A126 => 126
-  | A127 => 127
-  | A128 => 128
-  | A129 => 129
-  | A130 => 130
-  | A131 => 131
-  | A132 => 132
-  | A133 => 133
-  | A134 => 134
-  | A135 => 135
-  | A136 => 136
-  | A137 => 137
-  | A138 => 138
-  | A139 => 139
-  | A140 => 140
-  | A141 => 141
-  | A142 => 142
-  | A143 => 143
-  | A144 => 144
-  | A145 => 145
-  | A146 => 146
-  | A147 => 147
-  | A148 => 148
-  | A149 => 149
-  | A150 => 150
-  | A151 => 151
-  | A152 => 152
-  | A153 => 153
-  | A154 => 154
-  | A155 => 155
-  | A156 => 156
-  | A157 => 157
-  | A158 => 158
-  | A159 => 159
-  | A160 => 160
-  | A161 => 161
-  | A162 => 162
-  | A163 => 163
-  | A164 => 164
-  | A165 => 165
-  | A166 => 166
-  | A167 => 167
-  | A168 => 168
-  | A169 => 169
-  | A170 => 170
-  | A171 => 171
-  | A172 => 172
-  | A173 => 173
-  | A174 => 174
-  | A175 => 175
-  | A176 => 176
-  | A177 => 177
-  | A178 => 178
-  | A179 => 179
-  | A180 => 180
-  | A181 => 181
-  | A182 => 182
-  | A183 => 183
-  | A184 => 184
-  | A185 => 185
-  | A186 => 186
-  | A187 => 187
-  | A188 => 188
-  | A189 => 189
-  | A190 => 190
-  | A191 => 191
-  | A192 => 192
-  | A193 => 193
-  | A194 => 194
-  | A195 => 195
-  | A196 => 196
-  | A197 => 197
-  | A198 => 198
-  | A199 => 199
-  | A200 => 200
-  | A201 => 201
-  | A202 => 202
-  | A203 => 203
-  | A204 => 204
-  | A205 => 205
-  | A206 => 206
-  | A207 => 207
-  | A208 => 208
-  | A209 => 209
-  | A210 => 210
-  | A211 => 211
-  | A212 => 212
-  | A213 => 213
-  | A214 => 214
-  | A215 => 215
-  | A216 => 216
-  | A217 => 217
-  | A218 => 218
-  | A219 => 219
-  | A220 => 220
-  | A221 => 221
-  | A222 => 222
-  | A223 => 223
-  | A224 => 224
-  | A225 => 225
-  | A226 => 226
-  | A227 => 227
-  | A228 => 228
-  | A229 => 229
-  | A230 => 230
-  | A231 => 231
-  | A232 => 232
-  | A233 => 233
-  | A234 => 234
-  | A235 => 235
-  | A236 => 236
-  | A237 => 237
-  | A238 => 238
-  | A239 => 239
-  | A240 => 240
-  | A241 => 241
-  | A242 => 242
-  | A243 => 243
-  | A244 => 244
-  | A245 => 245
-  | A246 => 246
-  | A247 => 247
-  | A248 => 248
-  | A249 => 249
-  | A250 => 250
-  | A251 => 251
-  | A252 => 252
-  | A253 => 253
-  | A254 => 254
-  | A255 => 255
-  | A256 => 256
-  | A257 => 257
-  | A258 => 258
-  | A259 => 259
-  | A260 => 260
-  | A261 => 261
-  | A262 => 262
-  | A263 => 263
-  | A264 => 264
-  | A265 => 265
-  | A266 => 266
-  | A267 => 267
-  | A268 => 268
-  | A269 => 269
-  | A270 => 270
-  | A271 => 271
-  | A272 => 272
-  | A273 => 273
-  | A274 => 274
-  | A275 => 275
-  | A276 => 276
-  | A277 => 277
-  | A278 => 278
-  | A279 => 279
-  | A280 => 280
-  | A281 => 281
-  | A282 => 282
-  | A283 => 283
-  | A284 => 284
-  | A285 => 285
-  | A286 => 286
-  | A287 => 287
-  | A288 => 288
-  | A289 => 289
-  | A290 => 290
-  | A291 => 291
-  | A292 => 292
-  | A293 => 293
-  | A294 => 294
-  | A295 => 295
-  | A296 => 296
-  | A297 => 297
-  | A298 => 298
-  | A299 => 299
-  }
-let to_string = x =>
-  switch x {
-  | A0 => "A0"
-  | A1 => "A1"
-  | A2 => "A2"
-  | A3 => "A3"
-  | A4 => "A4"
-  | A5 => "A5"
-  | A6 => "A6"
-  | A7 => "A7"
-  | A8 => "A8"
-  | A9 => "A9"
-  | A10 => "A10"
-  | A11 => "A11"
-  | A12 => "A12"
-  | A13 => "A13"
-  | A14 => "A14"
-  | A15 => "A15"
-  | A16 => "A16"
-  | A17 => "A17"
-  | A18 => "A18"
-  | A19 => "A19"
-  | A20 => "A20"
-  | A21 => "A21"
-  | A22 => "A22"
-  | A23 => "A23"
-  | A24 => "A24"
-  | A25 => "A25"
-  | A26 => "A26"
-  | A27 => "A27"
-  | A28 => "A28"
-  | A29 => "A29"
-  | A30 => "A30"
-  | A31 => "A31"
-  | A32 => "A32"
-  | A33 => "A33"
-  | A34 => "A34"
-  | A35 => "A35"
-  | A36 => "A36"
-  | A37 => "A37"
-  | A38 => "A38"
-  | A39 => "A39"
-  | A40 => "A40"
-  | A41 => "A41"
-  | A42 => "A42"
-  | A43 => "A43"
-  | A44 => "A44"
-  | A45 => "A45"
-  | A46 => "A46"
-  | A47 => "A47"
-  | A48 => "A48"
-  | A49 => "A49"
-  | A50 => "A50"
-  | A51 => "A51"
-  | A52 => "A52"
-  | A53 => "A53"
-  | A54 => "A54"
-  | A55 => "A55"
-  | A56 => "A56"
-  | A57 => "A57"
-  | A58 => "A58"
-  | A59 => "A59"
-  | A60 => "A60"
-  | A61 => "A61"
-  | A62 => "A62"
-  | A63 => "A63"
-  | A64 => "A64"
-  | A65 => "A65"
-  | A66 => "A66"
-  | A67 => "A67"
-  | A68 => "A68"
-  | A69 => "A69"
-  | A70 => "A70"
-  | A71 => "A71"
-  | A72 => "A72"
-  | A73 => "A73"
-  | A74 => "A74"
-  | A75 => "A75"
-  | A76 => "A76"
-  | A77 => "A77"
-  | A78 => "A78"
-  | A79 => "A79"
-  | A80 => "A80"
-  | A81 => "A81"
-  | A82 => "A82"
-  | A83 => "A83"
-  | A84 => "A84"
-  | A85 => "A85"
-  | A86 => "A86"
-  | A87 => "A87"
-  | A88 => "A88"
-  | A89 => "A89"
-  | A90 => "A90"
-  | A91 => "A91"
-  | A92 => "A92"
-  | A93 => "A93"
-  | A94 => "A94"
-  | A95 => "A95"
-  | A96 => "A96"
-  | A97 => "A97"
-  | A98 => "A98"
-  | A99 => "A99"
-  | A100 => "A100"
-  | A101 => "A101"
-  | A102 => "A102"
-  | A103 => "A103"
-  | A104 => "A104"
-  | A105 => "A105"
-  | A106 => "A106"
-  | A107 => "A107"
-  | A108 => "A108"
-  | A109 => "A109"
-  | A110 => "A110"
-  | A111 => "A111"
-  | A112 => "A112"
-  | A113 => "A113"
-  | A114 => "A114"
-  | A115 => "A115"
-  | A116 => "A116"
-  | A117 => "A117"
-  | A118 => "A118"
-  | A119 => "A119"
-  | A120 => "A120"
-  | A121 => "A121"
-  | A122 => "A122"
-  | A123 => "A123"
-  | A124 => "A124"
-  | A125 => "A125"
-  | A126 => "A126"
-  | A127 => "A127"
-  | A128 => "A128"
-  | A129 => "A129"
-  | A130 => "A130"
-  | A131 => "A131"
-  | A132 => "A132"
-  | A133 => "A133"
-  | A134 => "A134"
-  | A135 => "A135"
-  | A136 => "A136"
-  | A137 => "A137"
-  | A138 => "A138"
-  | A139 => "A139"
-  | A140 => "A140"
-  | A141 => "A141"
-  | A142 => "A142"
-  | A143 => "A143"
-  | A144 => "A144"
-  | A145 => "A145"
-  | A146 => "A146"
-  | A147 => "A147"
-  | A148 => "A148"
-  | A149 => "A149"
-  | A150 => "A150"
-  | A151 => "A151"
-  | A152 => "A152"
-  | A153 => "A153"
-  | A154 => "A154"
-  | A155 => "A155"
-  | A156 => "A156"
-  | A157 => "A157"
-  | A158 => "A158"
-  | A159 => "A159"
-  | A160 => "A160"
-  | A161 => "A161"
-  | A162 => "A162"
-  | A163 => "A163"
-  | A164 => "A164"
-  | A165 => "A165"
-  | A166 => "A166"
-  | A167 => "A167"
-  | A168 => "A168"
-  | A169 => "A169"
-  | A170 => "A170"
-  | A171 => "A171"
-  | A172 => "A172"
-  | A173 => "A173"
-  | A174 => "A174"
-  | A175 => "A175"
-  | A176 => "A176"
-  | A177 => "A177"
-  | A178 => "A178"
-  | A179 => "A179"
-  | A180 => "A180"
-  | A181 => "A181"
-  | A182 => "A182"
-  | A183 => "A183"
-  | A184 => "A184"
-  | A185 => "A185"
-  | A186 => "A186"
-  | A187 => "A187"
-  | A188 => "A188"
-  | A189 => "A189"
-  | A190 => "A190"
-  | A191 => "A191"
-  | A192 => "A192"
-  | A193 => "A193"
-  | A194 => "A194"
-  | A195 => "A195"
-  | A196 => "A196"
-  | A197 => "A197"
-  | A198 => "A198"
-  | A199 => "A199"
-  | A200 => "A200"
-  | A201 => "A201"
-  | A202 => "A202"
-  | A203 => "A203"
-  | A204 => "A204"
-  | A205 => "A205"
-  | A206 => "A206"
-  | A207 => "A207"
-  | A208 => "A208"
-  | A209 => "A209"
-  | A210 => "A210"
-  | A211 => "A211"
-  | A212 => "A212"
-  | A213 => "A213"
-  | A214 => "A214"
-  | A215 => "A215"
-  | A216 => "A216"
-  | A217 => "A217"
-  | A218 => "A218"
-  | A219 => "A219"
-  | A220 => "A220"
-  | A221 => "A221"
-  | A222 => "A222"
-  | A223 => "A223"
-  | A224 => "A224"
-  | A225 => "A225"
-  | A226 => "A226"
-  | A227 => "A227"
-  | A228 => "A228"
-  | A229 => "A229"
-  | A230 => "A230"
-  | A231 => "A231"
-  | A232 => "A232"
-  | A233 => "A233"
-  | A234 => "A234"
-  | A235 => "A235"
-  | A236 => "A236"
-  | A237 => "A237"
-  | A238 => "A238"
-  | A239 => "A239"
-  | A240 => "A240"
-  | A241 => "A241"
-  | A242 => "A242"
-  | A243 => "A243"
-  | A244 => "A244"
-  | A245 => "A245"
-  | A246 => "A246"
-  | A247 => "A247"
-  | A248 => "A248"
-  | A249 => "A249"
-  | A250 => "A250"
-  | A251 => "A251"
-  | A252 => "A252"
-  | A253 => "A253"
-  | A254 => "A254"
-  | A255 => "A255"
-  | A256 => "A256"
-  | A257 => "A257"
-  | A258 => "A258"
-  | A259 => "A259"
-  | A260 => "A260"
-  | A261 => "A261"
-  | A262 => "A262"
-  | A263 => "A263"
-  | A264 => "A264"
-  | A265 => "A265"
-  | A266 => "A266"
-  | A267 => "A267"
-  | A268 => "A268"
-  | A269 => "A269"
-  | A270 => "A270"
-  | A271 => "A271"
-  | A272 => "A272"
-  | A273 => "A273"
-  | A274 => "A274"
-  | A275 => "A275"
-  | A276 => "A276"
-  | A277 => "A277"
-  | A278 => "A278"
-  | A279 => "A279"
-  | A280 => "A280"
-  | A281 => "A281"
-  | A282 => "A282"
-  | A283 => "A283"
-  | A284 => "A284"
-  | A285 => "A285"
-  | A286 => "A286"
-  | A287 => "A287"
-  | A288 => "A288"
-  | A289 => "A289"
-  | A290 => "A290"
-  | A291 => "A291"
-  | A292 => "A292"
-  | A293 => "A293"
-  | A294 => "A294"
-  | A295 => "A295"
-  | A296 => "A296"
-  | A297 => "A297"
-  | A298 => "A298"
-  | A299 => "A299"
-  }
diff --git a/jscomp/test/big_polyvar_test.js b/jscomp/test/big_polyvar_test.js
deleted file mode 100644
index 0a95c89..0000000
--- a/jscomp/test/big_polyvar_test.js
+++ /dev/null
@@ -1,7242 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var _map = {"variant0":"variant0","variant1":"variant1","variant2":"variant2","variant3":"variant3","variant4":"variant4","variant5":"variant5","variant6":"variant6","variant7":"variant7","variant8":"variant8","variant9":"variant9","variant10":"variant10","variant11":"variant11","variant12":"variant12","variant13":"variant13","variant14":"variant14","variant15":"variant15","variant16":"variant16","variant17":"variant17","variant18":"variant18","variant19":"variant19","variant20":"variant20","variant21":"variant21","variant22":"variant22","variant23":"variant23","variant24":"variant24","variant25":"variant25","variant26":"variant26","variant27":"variant27","variant28":"variant28","variant29":"variant29","variant30":"variant30","variant31":"variant31","variant32":"variant32","variant33":"variant33","variant34":"variant34","variant35":"variant35","variant36":"variant36","variant37":"variant37","variant38":"variant38","variant39":"variant39","variant40":"variant40","variant41":"variant41","variant42":"variant42","variant43":"variant43","variant44":"variant44","variant45":"variant45","variant46":"variant46","variant47":"variant47","variant48":"variant48","variant49":"variant49","variant50":"variant50","variant51":"variant51","variant52":"variant52","variant53":"variant53","variant54":"variant54","variant55":"variant55","variant56":"variant56","variant57":"variant57","variant58":"variant58","variant59":"variant59","variant60":"variant60","variant61":"variant61","variant62":"variant62","variant63":"variant63","variant64":"variant64","variant65":"variant65","variant66":"variant66","variant67":"variant67","variant68":"variant68","variant69":"variant69","variant70":"variant70","variant71":"variant71","variant72":"variant72","variant73":"variant73","variant74":"variant74","variant75":"variant75","variant76":"variant76","variant77":"variant77","variant78":"variant78","variant79":"variant79","variant80":"variant80","variant81":"variant81","variant82":"variant82","variant83":"variant83","variant84":"variant84","variant85":"variant85","variant86":"variant86","variant87":"variant87","variant88":"variant88","variant89":"variant89","variant90":"variant90","variant91":"variant91","variant92":"variant92","variant93":"variant93","variant94":"variant94","variant95":"variant95","variant96":"variant96","variant97":"variant97","variant98":"variant98","variant99":"variant99","variant100":"variant100","variant101":"variant101","variant102":"variant102","variant103":"variant103","variant104":"variant104","variant105":"variant105","variant106":"variant106","variant107":"variant107","variant108":"variant108","variant109":"variant109","variant110":"variant110","variant111":"variant111","variant112":"variant112","variant113":"variant113","variant114":"variant114","variant115":"variant115","variant116":"variant116","variant117":"variant117","variant118":"variant118","variant119":"variant119","variant120":"variant120","variant121":"variant121","variant122":"variant122","variant123":"variant123","variant124":"variant124","variant125":"variant125","variant126":"variant126","variant127":"variant127","variant128":"variant128","variant129":"variant129","variant130":"variant130","variant131":"variant131","variant132":"variant132","variant133":"variant133","variant134":"variant134","variant135":"variant135","variant136":"variant136","variant137":"variant137","variant138":"variant138","variant139":"variant139","variant140":"variant140","variant141":"variant141","variant142":"variant142","variant143":"variant143","variant144":"variant144","variant145":"variant145","variant146":"variant146","variant147":"variant147","variant148":"variant148","variant149":"variant149","variant150":"variant150","variant151":"variant151","variant152":"variant152","variant153":"variant153","variant154":"variant154","variant155":"variant155","variant156":"variant156","variant157":"variant157","variant158":"variant158","variant159":"variant159","variant160":"variant160","variant161":"variant161","variant162":"variant162","variant163":"variant163","variant164":"variant164","variant165":"variant165","variant166":"variant166","variant167":"variant167","variant168":"variant168","variant169":"variant169","variant170":"variant170","variant171":"variant171","variant172":"variant172","variant173":"variant173","variant174":"variant174","variant175":"variant175","variant176":"variant176","variant177":"variant177","variant178":"variant178","variant179":"variant179","variant180":"variant180","variant181":"variant181","variant182":"variant182","variant183":"variant183","variant184":"variant184","variant185":"variant185","variant186":"variant186","variant187":"variant187","variant188":"variant188","variant189":"variant189","variant190":"variant190","variant191":"variant191","variant192":"variant192","variant193":"variant193","variant194":"variant194","variant195":"variant195","variant196":"variant196","variant197":"variant197","variant198":"variant198","variant199":"variant199","variant200":"variant200","variant201":"variant201","variant202":"variant202","variant203":"variant203","variant204":"variant204","variant205":"variant205","variant206":"variant206","variant207":"variant207","variant208":"variant208","variant209":"variant209","variant210":"variant210","variant211":"variant211","variant212":"variant212","variant213":"variant213","variant214":"variant214","variant215":"variant215","variant216":"variant216","variant217":"variant217","variant218":"variant218","variant219":"variant219","variant220":"variant220","variant221":"variant221","variant222":"variant222","variant223":"variant223","variant224":"variant224","variant225":"variant225","variant226":"variant226","variant227":"variant227","variant228":"variant228","variant229":"variant229","variant230":"variant230","variant231":"variant231","variant232":"variant232","variant233":"variant233","variant234":"variant234","variant235":"variant235","variant236":"variant236","variant237":"variant237","variant238":"variant238","variant239":"variant239","variant240":"variant240","variant241":"variant241","variant242":"variant242","variant243":"variant243","variant244":"variant244","variant245":"variant245","variant246":"variant246","variant247":"variant247","variant248":"variant248","variant249":"variant249","variant250":"variant250","variant251":"variant251","variant252":"variant252","variant253":"variant253","variant254":"variant254","variant255":"variant255","variant256":"variant256","variant257":"variant257","variant258":"variant258","variant259":"variant259","variant260":"variant260","variant261":"variant261","variant262":"variant262","variant263":"variant263","variant264":"variant264","variant265":"variant265","variant266":"variant266","variant267":"variant267","variant268":"variant268","variant269":"variant269","variant270":"variant270","variant271":"variant271","variant272":"variant272","variant273":"variant273","variant274":"variant274","variant275":"variant275","variant276":"variant276","variant277":"variant277","variant278":"variant278","variant279":"variant279","variant280":"variant280","variant281":"variant281","variant282":"variant282","variant283":"variant283","variant284":"variant284","variant285":"variant285","variant286":"variant286","variant287":"variant287","variant288":"variant288","variant289":"variant289","variant290":"variant290","variant291":"variant291","variant292":"variant292","variant293":"variant293","variant294":"variant294","variant295":"variant295","variant296":"variant296","variant297":"variant297","variant298":"variant298","variant299":"variant299"};
-
-function tToJs(param) {
-  return param;
-}
-
-function tFromJs(param) {
-  return _map[param];
-}
-
-function eq(x, y) {
-  if (x !== undefined) {
-    if (y !== undefined) {
-      return x === y;
-    } else {
-      return false;
-    }
-  } else {
-    return y === undefined;
-  }
-}
-
-if ("variant0" !== "variant0") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          314,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant1" !== "variant1") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          315,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant2" !== "variant2") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          316,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant3" !== "variant3") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          317,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant4" !== "variant4") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          318,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant5" !== "variant5") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          319,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant6" !== "variant6") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          320,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant7" !== "variant7") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          321,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant8" !== "variant8") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          322,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant9" !== "variant9") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          323,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant10" !== "variant10") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          324,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant11" !== "variant11") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          325,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant12" !== "variant12") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          326,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant13" !== "variant13") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          327,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant14" !== "variant14") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          328,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant15" !== "variant15") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          329,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant16" !== "variant16") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          330,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant17" !== "variant17") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          331,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant18" !== "variant18") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          332,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant19" !== "variant19") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          333,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant20" !== "variant20") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          334,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant21" !== "variant21") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          335,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant22" !== "variant22") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          336,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant23" !== "variant23") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          337,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant24" !== "variant24") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          338,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant25" !== "variant25") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          339,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant26" !== "variant26") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          340,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant27" !== "variant27") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          341,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant28" !== "variant28") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          342,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant29" !== "variant29") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          343,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant30" !== "variant30") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          344,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant31" !== "variant31") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          345,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant32" !== "variant32") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          346,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant33" !== "variant33") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          347,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant34" !== "variant34") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          348,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant35" !== "variant35") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          349,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant36" !== "variant36") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          350,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant37" !== "variant37") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          351,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant38" !== "variant38") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          352,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant39" !== "variant39") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          353,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant40" !== "variant40") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          354,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant41" !== "variant41") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          355,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant42" !== "variant42") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          356,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant43" !== "variant43") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          357,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant44" !== "variant44") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          358,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant45" !== "variant45") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          359,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant46" !== "variant46") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          360,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant47" !== "variant47") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          361,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant48" !== "variant48") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          362,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant49" !== "variant49") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          363,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant50" !== "variant50") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          364,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant51" !== "variant51") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          365,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant52" !== "variant52") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          366,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant53" !== "variant53") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          367,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant54" !== "variant54") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          368,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant55" !== "variant55") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          369,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant56" !== "variant56") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          370,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant57" !== "variant57") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          371,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant58" !== "variant58") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          372,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant59" !== "variant59") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          373,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant60" !== "variant60") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          374,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant61" !== "variant61") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          375,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant62" !== "variant62") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          376,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant63" !== "variant63") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          377,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant64" !== "variant64") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          378,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant65" !== "variant65") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          379,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant66" !== "variant66") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          380,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant67" !== "variant67") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          381,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant68" !== "variant68") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          382,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant69" !== "variant69") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          383,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant70" !== "variant70") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          384,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant71" !== "variant71") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          385,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant72" !== "variant72") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          386,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant73" !== "variant73") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          387,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant74" !== "variant74") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          388,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant75" !== "variant75") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          389,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant76" !== "variant76") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          390,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant77" !== "variant77") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          391,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant78" !== "variant78") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          392,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant79" !== "variant79") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          393,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant80" !== "variant80") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          394,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant81" !== "variant81") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          395,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant82" !== "variant82") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          396,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant83" !== "variant83") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          397,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant84" !== "variant84") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          398,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant85" !== "variant85") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          399,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant86" !== "variant86") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          400,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant87" !== "variant87") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          401,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant88" !== "variant88") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          402,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant89" !== "variant89") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          403,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant90" !== "variant90") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          404,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant91" !== "variant91") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          405,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant92" !== "variant92") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          406,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant93" !== "variant93") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          407,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant94" !== "variant94") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          408,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant95" !== "variant95") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          409,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant96" !== "variant96") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          410,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant97" !== "variant97") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          411,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant98" !== "variant98") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          412,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant99" !== "variant99") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          413,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant100" !== "variant100") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          414,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant101" !== "variant101") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          415,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant102" !== "variant102") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          416,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant103" !== "variant103") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          417,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant104" !== "variant104") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          418,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant105" !== "variant105") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          419,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant106" !== "variant106") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          420,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant107" !== "variant107") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          421,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant108" !== "variant108") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          422,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant109" !== "variant109") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          423,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant110" !== "variant110") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          424,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant111" !== "variant111") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          425,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant112" !== "variant112") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          426,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant113" !== "variant113") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          427,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant114" !== "variant114") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          428,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant115" !== "variant115") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          429,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant116" !== "variant116") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          430,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant117" !== "variant117") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          431,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant118" !== "variant118") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          432,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant119" !== "variant119") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          433,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant120" !== "variant120") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          434,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant121" !== "variant121") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          435,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant122" !== "variant122") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          436,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant123" !== "variant123") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          437,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant124" !== "variant124") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          438,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant125" !== "variant125") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          439,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant126" !== "variant126") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          440,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant127" !== "variant127") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          441,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant128" !== "variant128") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          442,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant129" !== "variant129") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          443,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant130" !== "variant130") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          444,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant131" !== "variant131") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          445,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant132" !== "variant132") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          446,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant133" !== "variant133") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          447,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant134" !== "variant134") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          448,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant135" !== "variant135") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          449,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant136" !== "variant136") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          450,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant137" !== "variant137") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          451,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant138" !== "variant138") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          452,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant139" !== "variant139") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          453,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant140" !== "variant140") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          454,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant141" !== "variant141") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          455,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant142" !== "variant142") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          456,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant143" !== "variant143") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          457,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant144" !== "variant144") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          458,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant145" !== "variant145") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          459,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant146" !== "variant146") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          460,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant147" !== "variant147") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          461,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant148" !== "variant148") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          462,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant149" !== "variant149") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          463,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant150" !== "variant150") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          464,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant151" !== "variant151") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          465,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant152" !== "variant152") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          466,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant153" !== "variant153") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          467,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant154" !== "variant154") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          468,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant155" !== "variant155") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          469,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant156" !== "variant156") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          470,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant157" !== "variant157") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          471,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant158" !== "variant158") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          472,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant159" !== "variant159") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          473,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant160" !== "variant160") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          474,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant161" !== "variant161") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          475,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant162" !== "variant162") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          476,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant163" !== "variant163") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          477,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant164" !== "variant164") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          478,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant165" !== "variant165") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          479,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant166" !== "variant166") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          480,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant167" !== "variant167") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          481,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant168" !== "variant168") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          482,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant169" !== "variant169") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          483,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant170" !== "variant170") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          484,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant171" !== "variant171") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          485,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant172" !== "variant172") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          486,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant173" !== "variant173") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          487,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant174" !== "variant174") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          488,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant175" !== "variant175") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          489,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant176" !== "variant176") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          490,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant177" !== "variant177") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          491,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant178" !== "variant178") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          492,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant179" !== "variant179") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          493,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant180" !== "variant180") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          494,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant181" !== "variant181") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          495,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant182" !== "variant182") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          496,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant183" !== "variant183") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          497,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant184" !== "variant184") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          498,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant185" !== "variant185") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          499,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant186" !== "variant186") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          500,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant187" !== "variant187") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          501,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant188" !== "variant188") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          502,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant189" !== "variant189") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          503,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant190" !== "variant190") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          504,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant191" !== "variant191") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          505,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant192" !== "variant192") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          506,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant193" !== "variant193") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          507,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant194" !== "variant194") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          508,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant195" !== "variant195") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          509,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant196" !== "variant196") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          510,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant197" !== "variant197") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          511,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant198" !== "variant198") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          512,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant199" !== "variant199") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          513,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant200" !== "variant200") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          514,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant201" !== "variant201") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          515,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant202" !== "variant202") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          516,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant203" !== "variant203") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          517,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant204" !== "variant204") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          518,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant205" !== "variant205") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          519,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant206" !== "variant206") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          520,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant207" !== "variant207") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          521,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant208" !== "variant208") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          522,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant209" !== "variant209") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          523,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant210" !== "variant210") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          524,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant211" !== "variant211") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          525,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant212" !== "variant212") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          526,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant213" !== "variant213") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          527,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant214" !== "variant214") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          528,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant215" !== "variant215") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          529,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant216" !== "variant216") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          530,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant217" !== "variant217") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          531,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant218" !== "variant218") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          532,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant219" !== "variant219") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          533,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant220" !== "variant220") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          534,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant221" !== "variant221") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          535,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant222" !== "variant222") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          536,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant223" !== "variant223") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          537,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant224" !== "variant224") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          538,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant225" !== "variant225") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          539,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant226" !== "variant226") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          540,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant227" !== "variant227") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          541,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant228" !== "variant228") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          542,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant229" !== "variant229") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          543,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant230" !== "variant230") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          544,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant231" !== "variant231") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          545,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant232" !== "variant232") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          546,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant233" !== "variant233") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          547,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant234" !== "variant234") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          548,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant235" !== "variant235") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          549,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant236" !== "variant236") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          550,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant237" !== "variant237") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          551,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant238" !== "variant238") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          552,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant239" !== "variant239") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          553,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant240" !== "variant240") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          554,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant241" !== "variant241") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          555,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant242" !== "variant242") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          556,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant243" !== "variant243") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          557,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant244" !== "variant244") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          558,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant245" !== "variant245") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          559,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant246" !== "variant246") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          560,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant247" !== "variant247") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          561,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant248" !== "variant248") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          562,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant249" !== "variant249") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          563,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant250" !== "variant250") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          564,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant251" !== "variant251") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          565,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant252" !== "variant252") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          566,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant253" !== "variant253") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          567,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant254" !== "variant254") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          568,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant255" !== "variant255") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          569,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant256" !== "variant256") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          570,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant257" !== "variant257") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          571,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant258" !== "variant258") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          572,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant259" !== "variant259") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          573,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant260" !== "variant260") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          574,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant261" !== "variant261") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          575,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant262" !== "variant262") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          576,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant263" !== "variant263") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          577,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant264" !== "variant264") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          578,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant265" !== "variant265") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          579,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant266" !== "variant266") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          580,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant267" !== "variant267") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          581,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant268" !== "variant268") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          582,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant269" !== "variant269") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          583,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant270" !== "variant270") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          584,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant271" !== "variant271") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          585,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant272" !== "variant272") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          586,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant273" !== "variant273") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          587,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant274" !== "variant274") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          588,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant275" !== "variant275") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          589,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant276" !== "variant276") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          590,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant277" !== "variant277") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          591,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant278" !== "variant278") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          592,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant279" !== "variant279") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          593,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant280" !== "variant280") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          594,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant281" !== "variant281") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          595,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant282" !== "variant282") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          596,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant283" !== "variant283") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          597,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant284" !== "variant284") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          598,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant285" !== "variant285") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          599,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant286" !== "variant286") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          600,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant287" !== "variant287") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          601,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant288" !== "variant288") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          602,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant289" !== "variant289") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          603,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant290" !== "variant290") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          604,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant291" !== "variant291") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          605,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant292" !== "variant292") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          606,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant293" !== "variant293") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          607,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant294" !== "variant294") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          608,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant295" !== "variant295") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          609,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant296" !== "variant296") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          610,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant297" !== "variant297") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          611,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant298" !== "variant298") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          612,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if ("variant299" !== "variant299") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          613,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant0"), "variant0")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          614,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant1"), "variant1")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          615,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant2"), "variant2")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          616,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant3"), "variant3")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          617,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant4"), "variant4")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          618,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant5"), "variant5")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          619,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant6"), "variant6")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          620,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant7"), "variant7")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          621,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant8"), "variant8")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          622,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant9"), "variant9")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          623,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant10"), "variant10")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          624,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant11"), "variant11")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          625,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant12"), "variant12")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          626,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant13"), "variant13")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          627,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant14"), "variant14")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          628,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant15"), "variant15")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          629,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant16"), "variant16")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          630,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant17"), "variant17")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          631,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant18"), "variant18")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          632,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant19"), "variant19")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          633,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant20"), "variant20")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          634,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant21"), "variant21")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          635,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant22"), "variant22")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          636,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant23"), "variant23")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          637,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant24"), "variant24")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          638,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant25"), "variant25")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          639,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant26"), "variant26")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          640,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant27"), "variant27")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          641,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant28"), "variant28")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          642,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant29"), "variant29")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          643,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant30"), "variant30")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          644,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant31"), "variant31")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          645,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant32"), "variant32")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          646,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant33"), "variant33")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          647,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant34"), "variant34")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          648,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant35"), "variant35")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          649,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant36"), "variant36")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          650,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant37"), "variant37")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          651,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant38"), "variant38")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          652,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant39"), "variant39")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          653,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant40"), "variant40")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          654,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant41"), "variant41")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          655,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant42"), "variant42")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          656,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant43"), "variant43")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          657,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant44"), "variant44")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          658,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant45"), "variant45")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          659,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant46"), "variant46")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          660,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant47"), "variant47")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          661,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant48"), "variant48")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          662,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant49"), "variant49")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          663,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant50"), "variant50")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          664,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant51"), "variant51")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          665,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant52"), "variant52")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          666,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant53"), "variant53")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          667,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant54"), "variant54")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          668,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant55"), "variant55")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          669,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant56"), "variant56")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          670,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant57"), "variant57")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          671,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant58"), "variant58")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          672,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant59"), "variant59")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          673,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant60"), "variant60")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          674,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant61"), "variant61")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          675,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant62"), "variant62")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          676,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant63"), "variant63")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          677,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant64"), "variant64")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          678,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant65"), "variant65")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          679,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant66"), "variant66")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          680,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant67"), "variant67")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          681,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant68"), "variant68")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          682,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant69"), "variant69")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          683,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant70"), "variant70")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          684,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant71"), "variant71")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          685,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant72"), "variant72")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          686,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant73"), "variant73")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          687,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant74"), "variant74")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          688,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant75"), "variant75")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          689,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant76"), "variant76")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          690,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant77"), "variant77")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          691,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant78"), "variant78")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          692,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant79"), "variant79")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          693,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant80"), "variant80")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          694,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant81"), "variant81")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          695,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant82"), "variant82")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          696,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant83"), "variant83")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          697,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant84"), "variant84")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          698,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant85"), "variant85")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          699,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant86"), "variant86")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          700,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant87"), "variant87")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          701,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant88"), "variant88")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          702,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant89"), "variant89")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          703,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant90"), "variant90")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          704,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant91"), "variant91")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          705,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant92"), "variant92")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          706,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant93"), "variant93")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          707,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant94"), "variant94")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          708,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant95"), "variant95")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          709,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant96"), "variant96")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          710,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant97"), "variant97")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          711,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant98"), "variant98")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          712,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant99"), "variant99")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          713,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant100"), "variant100")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          714,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant101"), "variant101")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          715,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant102"), "variant102")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          716,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant103"), "variant103")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          717,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant104"), "variant104")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          718,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant105"), "variant105")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          719,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant106"), "variant106")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          720,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant107"), "variant107")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          721,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant108"), "variant108")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          722,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant109"), "variant109")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          723,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant110"), "variant110")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          724,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant111"), "variant111")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          725,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant112"), "variant112")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          726,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant113"), "variant113")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          727,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant114"), "variant114")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          728,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant115"), "variant115")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          729,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant116"), "variant116")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          730,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant117"), "variant117")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          731,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant118"), "variant118")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          732,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant119"), "variant119")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          733,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant120"), "variant120")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          734,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant121"), "variant121")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          735,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant122"), "variant122")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          736,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant123"), "variant123")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          737,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant124"), "variant124")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          738,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant125"), "variant125")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          739,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant126"), "variant126")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          740,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant127"), "variant127")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          741,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant128"), "variant128")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          742,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant129"), "variant129")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          743,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant130"), "variant130")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          744,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant131"), "variant131")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          745,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant132"), "variant132")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          746,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant133"), "variant133")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          747,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant134"), "variant134")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          748,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant135"), "variant135")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          749,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant136"), "variant136")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          750,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant137"), "variant137")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          751,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant138"), "variant138")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          752,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant139"), "variant139")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          753,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant140"), "variant140")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          754,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant141"), "variant141")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          755,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant142"), "variant142")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          756,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant143"), "variant143")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          757,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant144"), "variant144")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          758,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant145"), "variant145")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          759,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant146"), "variant146")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          760,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant147"), "variant147")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          761,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant148"), "variant148")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          762,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant149"), "variant149")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          763,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant150"), "variant150")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          764,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant151"), "variant151")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          765,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant152"), "variant152")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          766,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant153"), "variant153")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          767,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant154"), "variant154")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          768,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant155"), "variant155")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          769,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant156"), "variant156")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          770,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant157"), "variant157")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          771,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant158"), "variant158")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          772,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant159"), "variant159")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          773,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant160"), "variant160")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          774,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant161"), "variant161")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          775,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant162"), "variant162")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          776,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant163"), "variant163")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          777,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant164"), "variant164")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          778,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant165"), "variant165")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          779,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant166"), "variant166")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          780,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant167"), "variant167")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          781,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant168"), "variant168")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          782,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant169"), "variant169")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          783,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant170"), "variant170")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          784,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant171"), "variant171")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          785,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant172"), "variant172")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          786,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant173"), "variant173")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          787,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant174"), "variant174")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          788,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant175"), "variant175")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          789,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant176"), "variant176")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          790,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant177"), "variant177")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          791,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant178"), "variant178")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          792,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant179"), "variant179")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          793,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant180"), "variant180")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          794,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant181"), "variant181")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          795,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant182"), "variant182")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          796,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant183"), "variant183")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          797,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant184"), "variant184")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          798,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant185"), "variant185")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          799,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant186"), "variant186")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          800,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant187"), "variant187")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          801,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant188"), "variant188")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          802,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant189"), "variant189")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          803,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant190"), "variant190")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          804,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant191"), "variant191")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          805,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant192"), "variant192")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          806,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant193"), "variant193")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          807,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant194"), "variant194")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          808,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant195"), "variant195")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          809,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant196"), "variant196")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          810,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant197"), "variant197")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          811,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant198"), "variant198")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          812,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant199"), "variant199")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          813,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant200"), "variant200")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          814,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant201"), "variant201")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          815,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant202"), "variant202")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          816,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant203"), "variant203")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          817,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant204"), "variant204")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          818,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant205"), "variant205")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          819,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant206"), "variant206")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          820,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant207"), "variant207")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          821,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant208"), "variant208")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          822,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant209"), "variant209")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          823,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant210"), "variant210")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          824,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant211"), "variant211")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          825,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant212"), "variant212")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          826,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant213"), "variant213")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          827,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant214"), "variant214")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          828,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant215"), "variant215")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          829,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant216"), "variant216")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          830,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant217"), "variant217")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          831,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant218"), "variant218")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          832,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant219"), "variant219")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          833,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant220"), "variant220")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          834,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant221"), "variant221")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          835,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant222"), "variant222")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          836,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant223"), "variant223")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          837,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant224"), "variant224")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          838,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant225"), "variant225")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          839,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant226"), "variant226")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          840,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant227"), "variant227")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          841,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant228"), "variant228")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          842,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant229"), "variant229")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          843,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant230"), "variant230")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          844,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant231"), "variant231")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          845,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant232"), "variant232")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          846,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant233"), "variant233")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          847,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant234"), "variant234")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          848,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant235"), "variant235")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          849,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant236"), "variant236")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          850,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant237"), "variant237")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          851,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant238"), "variant238")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          852,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant239"), "variant239")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          853,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant240"), "variant240")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          854,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant241"), "variant241")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          855,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant242"), "variant242")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          856,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant243"), "variant243")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          857,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant244"), "variant244")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          858,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant245"), "variant245")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          859,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant246"), "variant246")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          860,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant247"), "variant247")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          861,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant248"), "variant248")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          862,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant249"), "variant249")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          863,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant250"), "variant250")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          864,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant251"), "variant251")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          865,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant252"), "variant252")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          866,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant253"), "variant253")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          867,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant254"), "variant254")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          868,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant255"), "variant255")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          869,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant256"), "variant256")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          870,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant257"), "variant257")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          871,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant258"), "variant258")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          872,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant259"), "variant259")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          873,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant260"), "variant260")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          874,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant261"), "variant261")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          875,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant262"), "variant262")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          876,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant263"), "variant263")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          877,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant264"), "variant264")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          878,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant265"), "variant265")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          879,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant266"), "variant266")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          880,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant267"), "variant267")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          881,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant268"), "variant268")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          882,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant269"), "variant269")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          883,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant270"), "variant270")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          884,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant271"), "variant271")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          885,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant272"), "variant272")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          886,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant273"), "variant273")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          887,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant274"), "variant274")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          888,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant275"), "variant275")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          889,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant276"), "variant276")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          890,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant277"), "variant277")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          891,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant278"), "variant278")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          892,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant279"), "variant279")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          893,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant280"), "variant280")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          894,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant281"), "variant281")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          895,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant282"), "variant282")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          896,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant283"), "variant283")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          897,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant284"), "variant284")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          898,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant285"), "variant285")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          899,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant286"), "variant286")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          900,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant287"), "variant287")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          901,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant288"), "variant288")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          902,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant289"), "variant289")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          903,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant290"), "variant290")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          904,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant291"), "variant291")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          905,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant292"), "variant292")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          906,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant293"), "variant293")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          907,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant294"), "variant294")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          908,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant295"), "variant295")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          909,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant296"), "variant296")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          910,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant297"), "variant297")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          911,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant298"), "variant298")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          912,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("variant299"), "variant299")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          913,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (!eq(tFromJs("xx"), undefined)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "big_polyvar_test.res",
-          914,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-exports.tToJs = tToJs;
-exports.tFromJs = tFromJs;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/big_polyvar_test.res b/jscomp/test/big_polyvar_test.res
deleted file mode 100644
index 8706dc3..0000000
--- a/jscomp/test/big_polyvar_test.res
+++ /dev/null
@@ -1,914 +0,0 @@
-@deriving(jsConverter)
-type t = [
-  | #variant0
-  | #variant1
-  | #variant2
-  | #variant3
-  | #variant4
-  | #variant5
-  | #variant6
-  | #variant7
-  | #variant8
-  | #variant9
-  | #variant10
-  | #variant11
-  | #variant12
-  | #variant13
-  | #variant14
-  | #variant15
-  | #variant16
-  | #variant17
-  | #variant18
-  | #variant19
-  | #variant20
-  | #variant21
-  | #variant22
-  | #variant23
-  | #variant24
-  | #variant25
-  | #variant26
-  | #variant27
-  | #variant28
-  | #variant29
-  | #variant30
-  | #variant31
-  | #variant32
-  | #variant33
-  | #variant34
-  | #variant35
-  | #variant36
-  | #variant37
-  | #variant38
-  | #variant39
-  | #variant40
-  | #variant41
-  | #variant42
-  | #variant43
-  | #variant44
-  | #variant45
-  | #variant46
-  | #variant47
-  | #variant48
-  | #variant49
-  | #variant50
-  | #variant51
-  | #variant52
-  | #variant53
-  | #variant54
-  | #variant55
-  | #variant56
-  | #variant57
-  | #variant58
-  | #variant59
-  | #variant60
-  | #variant61
-  | #variant62
-  | #variant63
-  | #variant64
-  | #variant65
-  | #variant66
-  | #variant67
-  | #variant68
-  | #variant69
-  | #variant70
-  | #variant71
-  | #variant72
-  | #variant73
-  | #variant74
-  | #variant75
-  | #variant76
-  | #variant77
-  | #variant78
-  | #variant79
-  | #variant80
-  | #variant81
-  | #variant82
-  | #variant83
-  | #variant84
-  | #variant85
-  | #variant86
-  | #variant87
-  | #variant88
-  | #variant89
-  | #variant90
-  | #variant91
-  | #variant92
-  | #variant93
-  | #variant94
-  | #variant95
-  | #variant96
-  | #variant97
-  | #variant98
-  | #variant99
-  | #variant100
-  | #variant101
-  | #variant102
-  | #variant103
-  | #variant104
-  | #variant105
-  | #variant106
-  | #variant107
-  | #variant108
-  | #variant109
-  | #variant110
-  | #variant111
-  | #variant112
-  | #variant113
-  | #variant114
-  | #variant115
-  | #variant116
-  | #variant117
-  | #variant118
-  | #variant119
-  | #variant120
-  | #variant121
-  | #variant122
-  | #variant123
-  | #variant124
-  | #variant125
-  | #variant126
-  | #variant127
-  | #variant128
-  | #variant129
-  | #variant130
-  | #variant131
-  | #variant132
-  | #variant133
-  | #variant134
-  | #variant135
-  | #variant136
-  | #variant137
-  | #variant138
-  | #variant139
-  | #variant140
-  | #variant141
-  | #variant142
-  | #variant143
-  | #variant144
-  | #variant145
-  | #variant146
-  | #variant147
-  | #variant148
-  | #variant149
-  | #variant150
-  | #variant151
-  | #variant152
-  | #variant153
-  | #variant154
-  | #variant155
-  | #variant156
-  | #variant157
-  | #variant158
-  | #variant159
-  | #variant160
-  | #variant161
-  | #variant162
-  | #variant163
-  | #variant164
-  | #variant165
-  | #variant166
-  | #variant167
-  | #variant168
-  | #variant169
-  | #variant170
-  | #variant171
-  | #variant172
-  | #variant173
-  | #variant174
-  | #variant175
-  | #variant176
-  | #variant177
-  | #variant178
-  | #variant179
-  | #variant180
-  | #variant181
-  | #variant182
-  | #variant183
-  | #variant184
-  | #variant185
-  | #variant186
-  | #variant187
-  | #variant188
-  | #variant189
-  | #variant190
-  | #variant191
-  | #variant192
-  | #variant193
-  | #variant194
-  | #variant195
-  | #variant196
-  | #variant197
-  | #variant198
-  | #variant199
-  | #variant200
-  | #variant201
-  | #variant202
-  | #variant203
-  | #variant204
-  | #variant205
-  | #variant206
-  | #variant207
-  | #variant208
-  | #variant209
-  | #variant210
-  | #variant211
-  | #variant212
-  | #variant213
-  | #variant214
-  | #variant215
-  | #variant216
-  | #variant217
-  | #variant218
-  | #variant219
-  | #variant220
-  | #variant221
-  | #variant222
-  | #variant223
-  | #variant224
-  | #variant225
-  | #variant226
-  | #variant227
-  | #variant228
-  | #variant229
-  | #variant230
-  | #variant231
-  | #variant232
-  | #variant233
-  | #variant234
-  | #variant235
-  | #variant236
-  | #variant237
-  | #variant238
-  | #variant239
-  | #variant240
-  | #variant241
-  | #variant242
-  | #variant243
-  | #variant244
-  | #variant245
-  | #variant246
-  | #variant247
-  | #variant248
-  | #variant249
-  | #variant250
-  | #variant251
-  | #variant252
-  | #variant253
-  | #variant254
-  | #variant255
-  | #variant256
-  | #variant257
-  | #variant258
-  | #variant259
-  | #variant260
-  | #variant261
-  | #variant262
-  | #variant263
-  | #variant264
-  | #variant265
-  | #variant266
-  | #variant267
-  | #variant268
-  | #variant269
-  | #variant270
-  | #variant271
-  | #variant272
-  | #variant273
-  | #variant274
-  | #variant275
-  | #variant276
-  | #variant277
-  | #variant278
-  | #variant279
-  | #variant280
-  | #variant281
-  | #variant282
-  | #variant283
-  | #variant284
-  | #variant285
-  | #variant286
-  | #variant287
-  | #variant288
-  | #variant289
-  | #variant290
-  | #variant291
-  | #variant292
-  | #variant293
-  | #variant294
-  | #variant295
-  | #variant296
-  | #variant297
-  | #variant298
-  | #variant299
-]
-let eq = (x: option<t>, y: option<t>) =>
-  switch x {
-  | Some(x) =>
-    switch y {
-    | None => false
-    | Some(y) => x == y
-    }
-  | None => y == None
-  }
-
-assert(tToJs(#variant0) == "variant0")
-assert(tToJs(#variant1) == "variant1")
-assert(tToJs(#variant2) == "variant2")
-assert(tToJs(#variant3) == "variant3")
-assert(tToJs(#variant4) == "variant4")
-assert(tToJs(#variant5) == "variant5")
-assert(tToJs(#variant6) == "variant6")
-assert(tToJs(#variant7) == "variant7")
-assert(tToJs(#variant8) == "variant8")
-assert(tToJs(#variant9) == "variant9")
-assert(tToJs(#variant10) == "variant10")
-assert(tToJs(#variant11) == "variant11")
-assert(tToJs(#variant12) == "variant12")
-assert(tToJs(#variant13) == "variant13")
-assert(tToJs(#variant14) == "variant14")
-assert(tToJs(#variant15) == "variant15")
-assert(tToJs(#variant16) == "variant16")
-assert(tToJs(#variant17) == "variant17")
-assert(tToJs(#variant18) == "variant18")
-assert(tToJs(#variant19) == "variant19")
-assert(tToJs(#variant20) == "variant20")
-assert(tToJs(#variant21) == "variant21")
-assert(tToJs(#variant22) == "variant22")
-assert(tToJs(#variant23) == "variant23")
-assert(tToJs(#variant24) == "variant24")
-assert(tToJs(#variant25) == "variant25")
-assert(tToJs(#variant26) == "variant26")
-assert(tToJs(#variant27) == "variant27")
-assert(tToJs(#variant28) == "variant28")
-assert(tToJs(#variant29) == "variant29")
-assert(tToJs(#variant30) == "variant30")
-assert(tToJs(#variant31) == "variant31")
-assert(tToJs(#variant32) == "variant32")
-assert(tToJs(#variant33) == "variant33")
-assert(tToJs(#variant34) == "variant34")
-assert(tToJs(#variant35) == "variant35")
-assert(tToJs(#variant36) == "variant36")
-assert(tToJs(#variant37) == "variant37")
-assert(tToJs(#variant38) == "variant38")
-assert(tToJs(#variant39) == "variant39")
-assert(tToJs(#variant40) == "variant40")
-assert(tToJs(#variant41) == "variant41")
-assert(tToJs(#variant42) == "variant42")
-assert(tToJs(#variant43) == "variant43")
-assert(tToJs(#variant44) == "variant44")
-assert(tToJs(#variant45) == "variant45")
-assert(tToJs(#variant46) == "variant46")
-assert(tToJs(#variant47) == "variant47")
-assert(tToJs(#variant48) == "variant48")
-assert(tToJs(#variant49) == "variant49")
-assert(tToJs(#variant50) == "variant50")
-assert(tToJs(#variant51) == "variant51")
-assert(tToJs(#variant52) == "variant52")
-assert(tToJs(#variant53) == "variant53")
-assert(tToJs(#variant54) == "variant54")
-assert(tToJs(#variant55) == "variant55")
-assert(tToJs(#variant56) == "variant56")
-assert(tToJs(#variant57) == "variant57")
-assert(tToJs(#variant58) == "variant58")
-assert(tToJs(#variant59) == "variant59")
-assert(tToJs(#variant60) == "variant60")
-assert(tToJs(#variant61) == "variant61")
-assert(tToJs(#variant62) == "variant62")
-assert(tToJs(#variant63) == "variant63")
-assert(tToJs(#variant64) == "variant64")
-assert(tToJs(#variant65) == "variant65")
-assert(tToJs(#variant66) == "variant66")
-assert(tToJs(#variant67) == "variant67")
-assert(tToJs(#variant68) == "variant68")
-assert(tToJs(#variant69) == "variant69")
-assert(tToJs(#variant70) == "variant70")
-assert(tToJs(#variant71) == "variant71")
-assert(tToJs(#variant72) == "variant72")
-assert(tToJs(#variant73) == "variant73")
-assert(tToJs(#variant74) == "variant74")
-assert(tToJs(#variant75) == "variant75")
-assert(tToJs(#variant76) == "variant76")
-assert(tToJs(#variant77) == "variant77")
-assert(tToJs(#variant78) == "variant78")
-assert(tToJs(#variant79) == "variant79")
-assert(tToJs(#variant80) == "variant80")
-assert(tToJs(#variant81) == "variant81")
-assert(tToJs(#variant82) == "variant82")
-assert(tToJs(#variant83) == "variant83")
-assert(tToJs(#variant84) == "variant84")
-assert(tToJs(#variant85) == "variant85")
-assert(tToJs(#variant86) == "variant86")
-assert(tToJs(#variant87) == "variant87")
-assert(tToJs(#variant88) == "variant88")
-assert(tToJs(#variant89) == "variant89")
-assert(tToJs(#variant90) == "variant90")
-assert(tToJs(#variant91) == "variant91")
-assert(tToJs(#variant92) == "variant92")
-assert(tToJs(#variant93) == "variant93")
-assert(tToJs(#variant94) == "variant94")
-assert(tToJs(#variant95) == "variant95")
-assert(tToJs(#variant96) == "variant96")
-assert(tToJs(#variant97) == "variant97")
-assert(tToJs(#variant98) == "variant98")
-assert(tToJs(#variant99) == "variant99")
-assert(tToJs(#variant100) == "variant100")
-assert(tToJs(#variant101) == "variant101")
-assert(tToJs(#variant102) == "variant102")
-assert(tToJs(#variant103) == "variant103")
-assert(tToJs(#variant104) == "variant104")
-assert(tToJs(#variant105) == "variant105")
-assert(tToJs(#variant106) == "variant106")
-assert(tToJs(#variant107) == "variant107")
-assert(tToJs(#variant108) == "variant108")
-assert(tToJs(#variant109) == "variant109")
-assert(tToJs(#variant110) == "variant110")
-assert(tToJs(#variant111) == "variant111")
-assert(tToJs(#variant112) == "variant112")
-assert(tToJs(#variant113) == "variant113")
-assert(tToJs(#variant114) == "variant114")
-assert(tToJs(#variant115) == "variant115")
-assert(tToJs(#variant116) == "variant116")
-assert(tToJs(#variant117) == "variant117")
-assert(tToJs(#variant118) == "variant118")
-assert(tToJs(#variant119) == "variant119")
-assert(tToJs(#variant120) == "variant120")
-assert(tToJs(#variant121) == "variant121")
-assert(tToJs(#variant122) == "variant122")
-assert(tToJs(#variant123) == "variant123")
-assert(tToJs(#variant124) == "variant124")
-assert(tToJs(#variant125) == "variant125")
-assert(tToJs(#variant126) == "variant126")
-assert(tToJs(#variant127) == "variant127")
-assert(tToJs(#variant128) == "variant128")
-assert(tToJs(#variant129) == "variant129")
-assert(tToJs(#variant130) == "variant130")
-assert(tToJs(#variant131) == "variant131")
-assert(tToJs(#variant132) == "variant132")
-assert(tToJs(#variant133) == "variant133")
-assert(tToJs(#variant134) == "variant134")
-assert(tToJs(#variant135) == "variant135")
-assert(tToJs(#variant136) == "variant136")
-assert(tToJs(#variant137) == "variant137")
-assert(tToJs(#variant138) == "variant138")
-assert(tToJs(#variant139) == "variant139")
-assert(tToJs(#variant140) == "variant140")
-assert(tToJs(#variant141) == "variant141")
-assert(tToJs(#variant142) == "variant142")
-assert(tToJs(#variant143) == "variant143")
-assert(tToJs(#variant144) == "variant144")
-assert(tToJs(#variant145) == "variant145")
-assert(tToJs(#variant146) == "variant146")
-assert(tToJs(#variant147) == "variant147")
-assert(tToJs(#variant148) == "variant148")
-assert(tToJs(#variant149) == "variant149")
-assert(tToJs(#variant150) == "variant150")
-assert(tToJs(#variant151) == "variant151")
-assert(tToJs(#variant152) == "variant152")
-assert(tToJs(#variant153) == "variant153")
-assert(tToJs(#variant154) == "variant154")
-assert(tToJs(#variant155) == "variant155")
-assert(tToJs(#variant156) == "variant156")
-assert(tToJs(#variant157) == "variant157")
-assert(tToJs(#variant158) == "variant158")
-assert(tToJs(#variant159) == "variant159")
-assert(tToJs(#variant160) == "variant160")
-assert(tToJs(#variant161) == "variant161")
-assert(tToJs(#variant162) == "variant162")
-assert(tToJs(#variant163) == "variant163")
-assert(tToJs(#variant164) == "variant164")
-assert(tToJs(#variant165) == "variant165")
-assert(tToJs(#variant166) == "variant166")
-assert(tToJs(#variant167) == "variant167")
-assert(tToJs(#variant168) == "variant168")
-assert(tToJs(#variant169) == "variant169")
-assert(tToJs(#variant170) == "variant170")
-assert(tToJs(#variant171) == "variant171")
-assert(tToJs(#variant172) == "variant172")
-assert(tToJs(#variant173) == "variant173")
-assert(tToJs(#variant174) == "variant174")
-assert(tToJs(#variant175) == "variant175")
-assert(tToJs(#variant176) == "variant176")
-assert(tToJs(#variant177) == "variant177")
-assert(tToJs(#variant178) == "variant178")
-assert(tToJs(#variant179) == "variant179")
-assert(tToJs(#variant180) == "variant180")
-assert(tToJs(#variant181) == "variant181")
-assert(tToJs(#variant182) == "variant182")
-assert(tToJs(#variant183) == "variant183")
-assert(tToJs(#variant184) == "variant184")
-assert(tToJs(#variant185) == "variant185")
-assert(tToJs(#variant186) == "variant186")
-assert(tToJs(#variant187) == "variant187")
-assert(tToJs(#variant188) == "variant188")
-assert(tToJs(#variant189) == "variant189")
-assert(tToJs(#variant190) == "variant190")
-assert(tToJs(#variant191) == "variant191")
-assert(tToJs(#variant192) == "variant192")
-assert(tToJs(#variant193) == "variant193")
-assert(tToJs(#variant194) == "variant194")
-assert(tToJs(#variant195) == "variant195")
-assert(tToJs(#variant196) == "variant196")
-assert(tToJs(#variant197) == "variant197")
-assert(tToJs(#variant198) == "variant198")
-assert(tToJs(#variant199) == "variant199")
-assert(tToJs(#variant200) == "variant200")
-assert(tToJs(#variant201) == "variant201")
-assert(tToJs(#variant202) == "variant202")
-assert(tToJs(#variant203) == "variant203")
-assert(tToJs(#variant204) == "variant204")
-assert(tToJs(#variant205) == "variant205")
-assert(tToJs(#variant206) == "variant206")
-assert(tToJs(#variant207) == "variant207")
-assert(tToJs(#variant208) == "variant208")
-assert(tToJs(#variant209) == "variant209")
-assert(tToJs(#variant210) == "variant210")
-assert(tToJs(#variant211) == "variant211")
-assert(tToJs(#variant212) == "variant212")
-assert(tToJs(#variant213) == "variant213")
-assert(tToJs(#variant214) == "variant214")
-assert(tToJs(#variant215) == "variant215")
-assert(tToJs(#variant216) == "variant216")
-assert(tToJs(#variant217) == "variant217")
-assert(tToJs(#variant218) == "variant218")
-assert(tToJs(#variant219) == "variant219")
-assert(tToJs(#variant220) == "variant220")
-assert(tToJs(#variant221) == "variant221")
-assert(tToJs(#variant222) == "variant222")
-assert(tToJs(#variant223) == "variant223")
-assert(tToJs(#variant224) == "variant224")
-assert(tToJs(#variant225) == "variant225")
-assert(tToJs(#variant226) == "variant226")
-assert(tToJs(#variant227) == "variant227")
-assert(tToJs(#variant228) == "variant228")
-assert(tToJs(#variant229) == "variant229")
-assert(tToJs(#variant230) == "variant230")
-assert(tToJs(#variant231) == "variant231")
-assert(tToJs(#variant232) == "variant232")
-assert(tToJs(#variant233) == "variant233")
-assert(tToJs(#variant234) == "variant234")
-assert(tToJs(#variant235) == "variant235")
-assert(tToJs(#variant236) == "variant236")
-assert(tToJs(#variant237) == "variant237")
-assert(tToJs(#variant238) == "variant238")
-assert(tToJs(#variant239) == "variant239")
-assert(tToJs(#variant240) == "variant240")
-assert(tToJs(#variant241) == "variant241")
-assert(tToJs(#variant242) == "variant242")
-assert(tToJs(#variant243) == "variant243")
-assert(tToJs(#variant244) == "variant244")
-assert(tToJs(#variant245) == "variant245")
-assert(tToJs(#variant246) == "variant246")
-assert(tToJs(#variant247) == "variant247")
-assert(tToJs(#variant248) == "variant248")
-assert(tToJs(#variant249) == "variant249")
-assert(tToJs(#variant250) == "variant250")
-assert(tToJs(#variant251) == "variant251")
-assert(tToJs(#variant252) == "variant252")
-assert(tToJs(#variant253) == "variant253")
-assert(tToJs(#variant254) == "variant254")
-assert(tToJs(#variant255) == "variant255")
-assert(tToJs(#variant256) == "variant256")
-assert(tToJs(#variant257) == "variant257")
-assert(tToJs(#variant258) == "variant258")
-assert(tToJs(#variant259) == "variant259")
-assert(tToJs(#variant260) == "variant260")
-assert(tToJs(#variant261) == "variant261")
-assert(tToJs(#variant262) == "variant262")
-assert(tToJs(#variant263) == "variant263")
-assert(tToJs(#variant264) == "variant264")
-assert(tToJs(#variant265) == "variant265")
-assert(tToJs(#variant266) == "variant266")
-assert(tToJs(#variant267) == "variant267")
-assert(tToJs(#variant268) == "variant268")
-assert(tToJs(#variant269) == "variant269")
-assert(tToJs(#variant270) == "variant270")
-assert(tToJs(#variant271) == "variant271")
-assert(tToJs(#variant272) == "variant272")
-assert(tToJs(#variant273) == "variant273")
-assert(tToJs(#variant274) == "variant274")
-assert(tToJs(#variant275) == "variant275")
-assert(tToJs(#variant276) == "variant276")
-assert(tToJs(#variant277) == "variant277")
-assert(tToJs(#variant278) == "variant278")
-assert(tToJs(#variant279) == "variant279")
-assert(tToJs(#variant280) == "variant280")
-assert(tToJs(#variant281) == "variant281")
-assert(tToJs(#variant282) == "variant282")
-assert(tToJs(#variant283) == "variant283")
-assert(tToJs(#variant284) == "variant284")
-assert(tToJs(#variant285) == "variant285")
-assert(tToJs(#variant286) == "variant286")
-assert(tToJs(#variant287) == "variant287")
-assert(tToJs(#variant288) == "variant288")
-assert(tToJs(#variant289) == "variant289")
-assert(tToJs(#variant290) == "variant290")
-assert(tToJs(#variant291) == "variant291")
-assert(tToJs(#variant292) == "variant292")
-assert(tToJs(#variant293) == "variant293")
-assert(tToJs(#variant294) == "variant294")
-assert(tToJs(#variant295) == "variant295")
-assert(tToJs(#variant296) == "variant296")
-assert(tToJs(#variant297) == "variant297")
-assert(tToJs(#variant298) == "variant298")
-assert(tToJs(#variant299) == "variant299")
-assert(eq(tFromJs("variant0"), Some(#variant0)))
-assert(eq(tFromJs("variant1"), Some(#variant1)))
-assert(eq(tFromJs("variant2"), Some(#variant2)))
-assert(eq(tFromJs("variant3"), Some(#variant3)))
-assert(eq(tFromJs("variant4"), Some(#variant4)))
-assert(eq(tFromJs("variant5"), Some(#variant5)))
-assert(eq(tFromJs("variant6"), Some(#variant6)))
-assert(eq(tFromJs("variant7"), Some(#variant7)))
-assert(eq(tFromJs("variant8"), Some(#variant8)))
-assert(eq(tFromJs("variant9"), Some(#variant9)))
-assert(eq(tFromJs("variant10"), Some(#variant10)))
-assert(eq(tFromJs("variant11"), Some(#variant11)))
-assert(eq(tFromJs("variant12"), Some(#variant12)))
-assert(eq(tFromJs("variant13"), Some(#variant13)))
-assert(eq(tFromJs("variant14"), Some(#variant14)))
-assert(eq(tFromJs("variant15"), Some(#variant15)))
-assert(eq(tFromJs("variant16"), Some(#variant16)))
-assert(eq(tFromJs("variant17"), Some(#variant17)))
-assert(eq(tFromJs("variant18"), Some(#variant18)))
-assert(eq(tFromJs("variant19"), Some(#variant19)))
-assert(eq(tFromJs("variant20"), Some(#variant20)))
-assert(eq(tFromJs("variant21"), Some(#variant21)))
-assert(eq(tFromJs("variant22"), Some(#variant22)))
-assert(eq(tFromJs("variant23"), Some(#variant23)))
-assert(eq(tFromJs("variant24"), Some(#variant24)))
-assert(eq(tFromJs("variant25"), Some(#variant25)))
-assert(eq(tFromJs("variant26"), Some(#variant26)))
-assert(eq(tFromJs("variant27"), Some(#variant27)))
-assert(eq(tFromJs("variant28"), Some(#variant28)))
-assert(eq(tFromJs("variant29"), Some(#variant29)))
-assert(eq(tFromJs("variant30"), Some(#variant30)))
-assert(eq(tFromJs("variant31"), Some(#variant31)))
-assert(eq(tFromJs("variant32"), Some(#variant32)))
-assert(eq(tFromJs("variant33"), Some(#variant33)))
-assert(eq(tFromJs("variant34"), Some(#variant34)))
-assert(eq(tFromJs("variant35"), Some(#variant35)))
-assert(eq(tFromJs("variant36"), Some(#variant36)))
-assert(eq(tFromJs("variant37"), Some(#variant37)))
-assert(eq(tFromJs("variant38"), Some(#variant38)))
-assert(eq(tFromJs("variant39"), Some(#variant39)))
-assert(eq(tFromJs("variant40"), Some(#variant40)))
-assert(eq(tFromJs("variant41"), Some(#variant41)))
-assert(eq(tFromJs("variant42"), Some(#variant42)))
-assert(eq(tFromJs("variant43"), Some(#variant43)))
-assert(eq(tFromJs("variant44"), Some(#variant44)))
-assert(eq(tFromJs("variant45"), Some(#variant45)))
-assert(eq(tFromJs("variant46"), Some(#variant46)))
-assert(eq(tFromJs("variant47"), Some(#variant47)))
-assert(eq(tFromJs("variant48"), Some(#variant48)))
-assert(eq(tFromJs("variant49"), Some(#variant49)))
-assert(eq(tFromJs("variant50"), Some(#variant50)))
-assert(eq(tFromJs("variant51"), Some(#variant51)))
-assert(eq(tFromJs("variant52"), Some(#variant52)))
-assert(eq(tFromJs("variant53"), Some(#variant53)))
-assert(eq(tFromJs("variant54"), Some(#variant54)))
-assert(eq(tFromJs("variant55"), Some(#variant55)))
-assert(eq(tFromJs("variant56"), Some(#variant56)))
-assert(eq(tFromJs("variant57"), Some(#variant57)))
-assert(eq(tFromJs("variant58"), Some(#variant58)))
-assert(eq(tFromJs("variant59"), Some(#variant59)))
-assert(eq(tFromJs("variant60"), Some(#variant60)))
-assert(eq(tFromJs("variant61"), Some(#variant61)))
-assert(eq(tFromJs("variant62"), Some(#variant62)))
-assert(eq(tFromJs("variant63"), Some(#variant63)))
-assert(eq(tFromJs("variant64"), Some(#variant64)))
-assert(eq(tFromJs("variant65"), Some(#variant65)))
-assert(eq(tFromJs("variant66"), Some(#variant66)))
-assert(eq(tFromJs("variant67"), Some(#variant67)))
-assert(eq(tFromJs("variant68"), Some(#variant68)))
-assert(eq(tFromJs("variant69"), Some(#variant69)))
-assert(eq(tFromJs("variant70"), Some(#variant70)))
-assert(eq(tFromJs("variant71"), Some(#variant71)))
-assert(eq(tFromJs("variant72"), Some(#variant72)))
-assert(eq(tFromJs("variant73"), Some(#variant73)))
-assert(eq(tFromJs("variant74"), Some(#variant74)))
-assert(eq(tFromJs("variant75"), Some(#variant75)))
-assert(eq(tFromJs("variant76"), Some(#variant76)))
-assert(eq(tFromJs("variant77"), Some(#variant77)))
-assert(eq(tFromJs("variant78"), Some(#variant78)))
-assert(eq(tFromJs("variant79"), Some(#variant79)))
-assert(eq(tFromJs("variant80"), Some(#variant80)))
-assert(eq(tFromJs("variant81"), Some(#variant81)))
-assert(eq(tFromJs("variant82"), Some(#variant82)))
-assert(eq(tFromJs("variant83"), Some(#variant83)))
-assert(eq(tFromJs("variant84"), Some(#variant84)))
-assert(eq(tFromJs("variant85"), Some(#variant85)))
-assert(eq(tFromJs("variant86"), Some(#variant86)))
-assert(eq(tFromJs("variant87"), Some(#variant87)))
-assert(eq(tFromJs("variant88"), Some(#variant88)))
-assert(eq(tFromJs("variant89"), Some(#variant89)))
-assert(eq(tFromJs("variant90"), Some(#variant90)))
-assert(eq(tFromJs("variant91"), Some(#variant91)))
-assert(eq(tFromJs("variant92"), Some(#variant92)))
-assert(eq(tFromJs("variant93"), Some(#variant93)))
-assert(eq(tFromJs("variant94"), Some(#variant94)))
-assert(eq(tFromJs("variant95"), Some(#variant95)))
-assert(eq(tFromJs("variant96"), Some(#variant96)))
-assert(eq(tFromJs("variant97"), Some(#variant97)))
-assert(eq(tFromJs("variant98"), Some(#variant98)))
-assert(eq(tFromJs("variant99"), Some(#variant99)))
-assert(eq(tFromJs("variant100"), Some(#variant100)))
-assert(eq(tFromJs("variant101"), Some(#variant101)))
-assert(eq(tFromJs("variant102"), Some(#variant102)))
-assert(eq(tFromJs("variant103"), Some(#variant103)))
-assert(eq(tFromJs("variant104"), Some(#variant104)))
-assert(eq(tFromJs("variant105"), Some(#variant105)))
-assert(eq(tFromJs("variant106"), Some(#variant106)))
-assert(eq(tFromJs("variant107"), Some(#variant107)))
-assert(eq(tFromJs("variant108"), Some(#variant108)))
-assert(eq(tFromJs("variant109"), Some(#variant109)))
-assert(eq(tFromJs("variant110"), Some(#variant110)))
-assert(eq(tFromJs("variant111"), Some(#variant111)))
-assert(eq(tFromJs("variant112"), Some(#variant112)))
-assert(eq(tFromJs("variant113"), Some(#variant113)))
-assert(eq(tFromJs("variant114"), Some(#variant114)))
-assert(eq(tFromJs("variant115"), Some(#variant115)))
-assert(eq(tFromJs("variant116"), Some(#variant116)))
-assert(eq(tFromJs("variant117"), Some(#variant117)))
-assert(eq(tFromJs("variant118"), Some(#variant118)))
-assert(eq(tFromJs("variant119"), Some(#variant119)))
-assert(eq(tFromJs("variant120"), Some(#variant120)))
-assert(eq(tFromJs("variant121"), Some(#variant121)))
-assert(eq(tFromJs("variant122"), Some(#variant122)))
-assert(eq(tFromJs("variant123"), Some(#variant123)))
-assert(eq(tFromJs("variant124"), Some(#variant124)))
-assert(eq(tFromJs("variant125"), Some(#variant125)))
-assert(eq(tFromJs("variant126"), Some(#variant126)))
-assert(eq(tFromJs("variant127"), Some(#variant127)))
-assert(eq(tFromJs("variant128"), Some(#variant128)))
-assert(eq(tFromJs("variant129"), Some(#variant129)))
-assert(eq(tFromJs("variant130"), Some(#variant130)))
-assert(eq(tFromJs("variant131"), Some(#variant131)))
-assert(eq(tFromJs("variant132"), Some(#variant132)))
-assert(eq(tFromJs("variant133"), Some(#variant133)))
-assert(eq(tFromJs("variant134"), Some(#variant134)))
-assert(eq(tFromJs("variant135"), Some(#variant135)))
-assert(eq(tFromJs("variant136"), Some(#variant136)))
-assert(eq(tFromJs("variant137"), Some(#variant137)))
-assert(eq(tFromJs("variant138"), Some(#variant138)))
-assert(eq(tFromJs("variant139"), Some(#variant139)))
-assert(eq(tFromJs("variant140"), Some(#variant140)))
-assert(eq(tFromJs("variant141"), Some(#variant141)))
-assert(eq(tFromJs("variant142"), Some(#variant142)))
-assert(eq(tFromJs("variant143"), Some(#variant143)))
-assert(eq(tFromJs("variant144"), Some(#variant144)))
-assert(eq(tFromJs("variant145"), Some(#variant145)))
-assert(eq(tFromJs("variant146"), Some(#variant146)))
-assert(eq(tFromJs("variant147"), Some(#variant147)))
-assert(eq(tFromJs("variant148"), Some(#variant148)))
-assert(eq(tFromJs("variant149"), Some(#variant149)))
-assert(eq(tFromJs("variant150"), Some(#variant150)))
-assert(eq(tFromJs("variant151"), Some(#variant151)))
-assert(eq(tFromJs("variant152"), Some(#variant152)))
-assert(eq(tFromJs("variant153"), Some(#variant153)))
-assert(eq(tFromJs("variant154"), Some(#variant154)))
-assert(eq(tFromJs("variant155"), Some(#variant155)))
-assert(eq(tFromJs("variant156"), Some(#variant156)))
-assert(eq(tFromJs("variant157"), Some(#variant157)))
-assert(eq(tFromJs("variant158"), Some(#variant158)))
-assert(eq(tFromJs("variant159"), Some(#variant159)))
-assert(eq(tFromJs("variant160"), Some(#variant160)))
-assert(eq(tFromJs("variant161"), Some(#variant161)))
-assert(eq(tFromJs("variant162"), Some(#variant162)))
-assert(eq(tFromJs("variant163"), Some(#variant163)))
-assert(eq(tFromJs("variant164"), Some(#variant164)))
-assert(eq(tFromJs("variant165"), Some(#variant165)))
-assert(eq(tFromJs("variant166"), Some(#variant166)))
-assert(eq(tFromJs("variant167"), Some(#variant167)))
-assert(eq(tFromJs("variant168"), Some(#variant168)))
-assert(eq(tFromJs("variant169"), Some(#variant169)))
-assert(eq(tFromJs("variant170"), Some(#variant170)))
-assert(eq(tFromJs("variant171"), Some(#variant171)))
-assert(eq(tFromJs("variant172"), Some(#variant172)))
-assert(eq(tFromJs("variant173"), Some(#variant173)))
-assert(eq(tFromJs("variant174"), Some(#variant174)))
-assert(eq(tFromJs("variant175"), Some(#variant175)))
-assert(eq(tFromJs("variant176"), Some(#variant176)))
-assert(eq(tFromJs("variant177"), Some(#variant177)))
-assert(eq(tFromJs("variant178"), Some(#variant178)))
-assert(eq(tFromJs("variant179"), Some(#variant179)))
-assert(eq(tFromJs("variant180"), Some(#variant180)))
-assert(eq(tFromJs("variant181"), Some(#variant181)))
-assert(eq(tFromJs("variant182"), Some(#variant182)))
-assert(eq(tFromJs("variant183"), Some(#variant183)))
-assert(eq(tFromJs("variant184"), Some(#variant184)))
-assert(eq(tFromJs("variant185"), Some(#variant185)))
-assert(eq(tFromJs("variant186"), Some(#variant186)))
-assert(eq(tFromJs("variant187"), Some(#variant187)))
-assert(eq(tFromJs("variant188"), Some(#variant188)))
-assert(eq(tFromJs("variant189"), Some(#variant189)))
-assert(eq(tFromJs("variant190"), Some(#variant190)))
-assert(eq(tFromJs("variant191"), Some(#variant191)))
-assert(eq(tFromJs("variant192"), Some(#variant192)))
-assert(eq(tFromJs("variant193"), Some(#variant193)))
-assert(eq(tFromJs("variant194"), Some(#variant194)))
-assert(eq(tFromJs("variant195"), Some(#variant195)))
-assert(eq(tFromJs("variant196"), Some(#variant196)))
-assert(eq(tFromJs("variant197"), Some(#variant197)))
-assert(eq(tFromJs("variant198"), Some(#variant198)))
-assert(eq(tFromJs("variant199"), Some(#variant199)))
-assert(eq(tFromJs("variant200"), Some(#variant200)))
-assert(eq(tFromJs("variant201"), Some(#variant201)))
-assert(eq(tFromJs("variant202"), Some(#variant202)))
-assert(eq(tFromJs("variant203"), Some(#variant203)))
-assert(eq(tFromJs("variant204"), Some(#variant204)))
-assert(eq(tFromJs("variant205"), Some(#variant205)))
-assert(eq(tFromJs("variant206"), Some(#variant206)))
-assert(eq(tFromJs("variant207"), Some(#variant207)))
-assert(eq(tFromJs("variant208"), Some(#variant208)))
-assert(eq(tFromJs("variant209"), Some(#variant209)))
-assert(eq(tFromJs("variant210"), Some(#variant210)))
-assert(eq(tFromJs("variant211"), Some(#variant211)))
-assert(eq(tFromJs("variant212"), Some(#variant212)))
-assert(eq(tFromJs("variant213"), Some(#variant213)))
-assert(eq(tFromJs("variant214"), Some(#variant214)))
-assert(eq(tFromJs("variant215"), Some(#variant215)))
-assert(eq(tFromJs("variant216"), Some(#variant216)))
-assert(eq(tFromJs("variant217"), Some(#variant217)))
-assert(eq(tFromJs("variant218"), Some(#variant218)))
-assert(eq(tFromJs("variant219"), Some(#variant219)))
-assert(eq(tFromJs("variant220"), Some(#variant220)))
-assert(eq(tFromJs("variant221"), Some(#variant221)))
-assert(eq(tFromJs("variant222"), Some(#variant222)))
-assert(eq(tFromJs("variant223"), Some(#variant223)))
-assert(eq(tFromJs("variant224"), Some(#variant224)))
-assert(eq(tFromJs("variant225"), Some(#variant225)))
-assert(eq(tFromJs("variant226"), Some(#variant226)))
-assert(eq(tFromJs("variant227"), Some(#variant227)))
-assert(eq(tFromJs("variant228"), Some(#variant228)))
-assert(eq(tFromJs("variant229"), Some(#variant229)))
-assert(eq(tFromJs("variant230"), Some(#variant230)))
-assert(eq(tFromJs("variant231"), Some(#variant231)))
-assert(eq(tFromJs("variant232"), Some(#variant232)))
-assert(eq(tFromJs("variant233"), Some(#variant233)))
-assert(eq(tFromJs("variant234"), Some(#variant234)))
-assert(eq(tFromJs("variant235"), Some(#variant235)))
-assert(eq(tFromJs("variant236"), Some(#variant236)))
-assert(eq(tFromJs("variant237"), Some(#variant237)))
-assert(eq(tFromJs("variant238"), Some(#variant238)))
-assert(eq(tFromJs("variant239"), Some(#variant239)))
-assert(eq(tFromJs("variant240"), Some(#variant240)))
-assert(eq(tFromJs("variant241"), Some(#variant241)))
-assert(eq(tFromJs("variant242"), Some(#variant242)))
-assert(eq(tFromJs("variant243"), Some(#variant243)))
-assert(eq(tFromJs("variant244"), Some(#variant244)))
-assert(eq(tFromJs("variant245"), Some(#variant245)))
-assert(eq(tFromJs("variant246"), Some(#variant246)))
-assert(eq(tFromJs("variant247"), Some(#variant247)))
-assert(eq(tFromJs("variant248"), Some(#variant248)))
-assert(eq(tFromJs("variant249"), Some(#variant249)))
-assert(eq(tFromJs("variant250"), Some(#variant250)))
-assert(eq(tFromJs("variant251"), Some(#variant251)))
-assert(eq(tFromJs("variant252"), Some(#variant252)))
-assert(eq(tFromJs("variant253"), Some(#variant253)))
-assert(eq(tFromJs("variant254"), Some(#variant254)))
-assert(eq(tFromJs("variant255"), Some(#variant255)))
-assert(eq(tFromJs("variant256"), Some(#variant256)))
-assert(eq(tFromJs("variant257"), Some(#variant257)))
-assert(eq(tFromJs("variant258"), Some(#variant258)))
-assert(eq(tFromJs("variant259"), Some(#variant259)))
-assert(eq(tFromJs("variant260"), Some(#variant260)))
-assert(eq(tFromJs("variant261"), Some(#variant261)))
-assert(eq(tFromJs("variant262"), Some(#variant262)))
-assert(eq(tFromJs("variant263"), Some(#variant263)))
-assert(eq(tFromJs("variant264"), Some(#variant264)))
-assert(eq(tFromJs("variant265"), Some(#variant265)))
-assert(eq(tFromJs("variant266"), Some(#variant266)))
-assert(eq(tFromJs("variant267"), Some(#variant267)))
-assert(eq(tFromJs("variant268"), Some(#variant268)))
-assert(eq(tFromJs("variant269"), Some(#variant269)))
-assert(eq(tFromJs("variant270"), Some(#variant270)))
-assert(eq(tFromJs("variant271"), Some(#variant271)))
-assert(eq(tFromJs("variant272"), Some(#variant272)))
-assert(eq(tFromJs("variant273"), Some(#variant273)))
-assert(eq(tFromJs("variant274"), Some(#variant274)))
-assert(eq(tFromJs("variant275"), Some(#variant275)))
-assert(eq(tFromJs("variant276"), Some(#variant276)))
-assert(eq(tFromJs("variant277"), Some(#variant277)))
-assert(eq(tFromJs("variant278"), Some(#variant278)))
-assert(eq(tFromJs("variant279"), Some(#variant279)))
-assert(eq(tFromJs("variant280"), Some(#variant280)))
-assert(eq(tFromJs("variant281"), Some(#variant281)))
-assert(eq(tFromJs("variant282"), Some(#variant282)))
-assert(eq(tFromJs("variant283"), Some(#variant283)))
-assert(eq(tFromJs("variant284"), Some(#variant284)))
-assert(eq(tFromJs("variant285"), Some(#variant285)))
-assert(eq(tFromJs("variant286"), Some(#variant286)))
-assert(eq(tFromJs("variant287"), Some(#variant287)))
-assert(eq(tFromJs("variant288"), Some(#variant288)))
-assert(eq(tFromJs("variant289"), Some(#variant289)))
-assert(eq(tFromJs("variant290"), Some(#variant290)))
-assert(eq(tFromJs("variant291"), Some(#variant291)))
-assert(eq(tFromJs("variant292"), Some(#variant292)))
-assert(eq(tFromJs("variant293"), Some(#variant293)))
-assert(eq(tFromJs("variant294"), Some(#variant294)))
-assert(eq(tFromJs("variant295"), Some(#variant295)))
-assert(eq(tFromJs("variant296"), Some(#variant296)))
-assert(eq(tFromJs("variant297"), Some(#variant297)))
-assert(eq(tFromJs("variant298"), Some(#variant298)))
-assert(eq(tFromJs("variant299"), Some(#variant299)))
-assert(eq(tFromJs("xx"), None))
diff --git a/jscomp/test/bigint_test.js b/jscomp/test/bigint_test.js
deleted file mode 100644
index 7cc0897..0000000
--- a/jscomp/test/bigint_test.js
+++ /dev/null
@@ -1,198 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Mt_global = require("./mt_global.js");
-
-var test_id = {
-  contents: 0
-};
-
-var suites = {
-  contents: /* [] */0
-};
-
-function eq(loc) {
-  return function (param, param$1) {
-    return Mt_global.collect_eq(test_id, suites, loc, param, param$1);
-  };
-}
-
-function approx(loc) {
-  return function (param, param$1) {
-    return Mt_global.collect_approx(test_id, suites, loc, param, param$1);
-  };
-}
-
-var bigint_compare = Caml.bigint_compare;
-
-var generic_compare = Caml_obj.compare;
-
-function bigint_equal(x, y) {
-  return x === y;
-}
-
-var generic_equal = Caml_obj.equal;
-
-function bigint_notequal(x, y) {
-  return x !== y;
-}
-
-var generic_notequal = Caml_obj.notequal;
-
-function bigint_lessthan(x, y) {
-  return x < y;
-}
-
-var generic_lessthan = Caml_obj.lessthan;
-
-function bigint_greaterthan(x, y) {
-  return x > y;
-}
-
-var generic_greaterthan = Caml_obj.greaterthan;
-
-function bigint_lessequal(x, y) {
-  return x <= y;
-}
-
-var generic_lessequal = Caml_obj.lessequal;
-
-function bigint_greaterequal(x, y) {
-  return x >= y;
-}
-
-var generic_greaterequal = Caml_obj.greaterequal;
-
-function bigint_land(prim0, prim1) {
-  return prim0 & prim1;
-}
-
-function bigint_lor(prim0, prim1) {
-  return prim0 | prim1;
-}
-
-function bigint_lxor(prim0, prim1) {
-  return prim0 ^ prim1;
-}
-
-function bigint_lsl(prim0, prim1) {
-  return (prim0 << prim1);
-}
-
-function bigint_asr(prim0, prim1) {
-  return (prim0 >> prim1);
-}
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 26, characters 5-12", Caml.bigint_compare(1n, 1n), 0);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 27, characters 5-12", Caml_obj.compare(1n, 1n), 0);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 28, characters 5-12", Caml.bigint_compare(-0n, -1n), 1);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 29, characters 5-12", Caml_obj.compare(-0n, -1n), 1);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 30, characters 5-12", Caml.bigint_compare(0n, -1n), 1);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 31, characters 5-12", Caml_obj.compare(0n, -1n), 1);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 32, characters 5-12", Caml.bigint_compare(1n, 2n), -1);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 33, characters 5-12", Caml_obj.compare(1n, 2n), -1);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 34, characters 5-12", Caml.bigint_compare(1n, 2n), -1);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 35, characters 5-12", Caml_obj.compare(1n, 2n), -1);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 36, characters 5-12", Caml.bigint_compare(1n, 1n), 0);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 37, characters 5-12", Caml_obj.compare(1n, 1n), 0);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 38, characters 5-12", 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n === 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, true);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 39, characters 5-12", Caml_obj.equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n), true);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 40, characters 5-12", 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n === 1000000000000000000000000000000000000000000000000000000000000000000000000000000000001n, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 41, characters 5-12", Caml_obj.equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, 1000000000000000000000000000000000000000000000000000000000000000000000000000000000001n), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 42, characters 5-12", 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n === -1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 43, characters 5-12", Caml_obj.equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, -1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 44, characters 5-12", (
-      1n !== 1n ? (
-          1n !== 2n ? 0n : 4n
-        ) : 3n
-    ) === 3n, true);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 49, characters 5-12", Caml_obj.equal(1n !== 1n ? (
-            1n !== 2n ? 0n : 4n
-          ) : 3n, 3n), true);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 54, characters 5-12", (
-      -1n !== -2n ? (
-          -1n !== -1n ? 0n : 3n
-        ) : 4n
-    ) === 3n, true);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 59, characters 5-12", Caml_obj.equal(-1n !== -1n ? (
-            -1n !== 2n ? 0n : 4n
-          ) : 3n, 3n), true);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 64, characters 5-12", (
-      -1000n !== -1000n ? (
-          -1000n !== -2n ? 0n : 4n
-        ) : 3n
-    ) === 3n, true);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 69, characters 5-12", Caml_obj.equal(-1000n !== -1000n ? (
-            -1000n !== -2n ? 0n : 4n
-          ) : 3n, 3n), true);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 74, characters 5-12", 9n & 1n, 1n);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 75, characters 5-12", 9n | 1n, 9n);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 76, characters 5-12", 9n ^ 1n, 8n);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 77, characters 5-12", (9n << 1n), 18n);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 78, characters 5-12", (9n << -1n), 4n);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 79, characters 5-12", (9n >> 1n), 4n);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 80, characters 5-12", (9n >> -1n), 18n);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 81, characters 5-12", (-9n >> 1n), -5n);
-
-Mt_global.collect_eq(test_id, suites, "File \"bigint_test.res\", line 82, characters 5-12", (-9n >> -1n), -18n);
-
-Mt.from_pair_suites("Bigint_test", suites.contents);
-
-exports.test_id = test_id;
-exports.suites = suites;
-exports.eq = eq;
-exports.approx = approx;
-exports.bigint_compare = bigint_compare;
-exports.generic_compare = generic_compare;
-exports.bigint_equal = bigint_equal;
-exports.generic_equal = generic_equal;
-exports.bigint_notequal = bigint_notequal;
-exports.generic_notequal = generic_notequal;
-exports.bigint_lessthan = bigint_lessthan;
-exports.generic_lessthan = generic_lessthan;
-exports.bigint_greaterthan = bigint_greaterthan;
-exports.generic_greaterthan = generic_greaterthan;
-exports.bigint_lessequal = bigint_lessequal;
-exports.generic_lessequal = generic_lessequal;
-exports.bigint_greaterequal = bigint_greaterequal;
-exports.generic_greaterequal = generic_greaterequal;
-exports.bigint_land = bigint_land;
-exports.bigint_lor = bigint_lor;
-exports.bigint_lxor = bigint_lxor;
-exports.bigint_lsl = bigint_lsl;
-exports.bigint_asr = bigint_asr;
-/*  Not a pure module */
diff --git a/jscomp/test/bigint_test.res b/jscomp/test/bigint_test.res
deleted file mode 100644
index 4348c8f..0000000
--- a/jscomp/test/bigint_test.res
+++ /dev/null
@@ -1,85 +0,0 @@
-let (test_id, suites) = (ref(0), ref(list{}))
-let eq = loc => Mt_global.collect_eq(test_id, suites, loc)
-let approx = loc => Mt_global.collect_approx(test_id, suites, loc)
-
-let bigint_compare = (x: bigint, y) => Pervasives.compare(x, y)
-let generic_compare = Pervasives.compare
-let bigint_equal = (x: bigint, y) => x == y
-let generic_equal = \"="
-let bigint_notequal = (x: bigint, y) => x != y
-let generic_notequal = \"<>"
-let bigint_lessthan = (x: bigint, y) => x < y
-let generic_lessthan = \"<"
-let bigint_greaterthan = (x: bigint, y) => x > y
-let generic_greaterthan = \">"
-let bigint_lessequal = (x: bigint, y) => x <= y
-let generic_lessequal = \"<="
-let bigint_greaterequal = (x: bigint, y) => x >= y
-let generic_greaterequal = \">="
-let bigint_land = Js.BigInt.land
-let bigint_lor = Js.BigInt.lor
-let bigint_lxor = Js.BigInt.lxor
-let bigint_lsl = Js.BigInt.lsl
-let bigint_asr = Js.BigInt.asr
-
-let () = {
-  eq(__LOC__, bigint_compare(1n, 1n), 0)
-  eq(__LOC__, generic_compare(1n, 1n), 0)
-  eq(__LOC__, bigint_compare(-0n, -1n), 1)
-  eq(__LOC__, generic_compare(-0n, -1n), 1)
-  eq(__LOC__, bigint_compare(+0n, -1n), 1)
-  eq(__LOC__, generic_compare(+0n, -1n), 1)
-  eq(__LOC__, bigint_compare(1n, 2n), -1)
-  eq(__LOC__, generic_compare(1n, 2n), -1)
-  eq(__LOC__, bigint_compare(1n, 02n), -1)
-  eq(__LOC__, generic_compare(1n, 02n), -1)
-  eq(__LOC__, bigint_compare(1n, 001n), 0)
-  eq(__LOC__, generic_compare(1n, 001n), 0)
-  eq(__LOC__, bigint_equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n), true)
-  eq(__LOC__, generic_equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n), true)
-  eq(__LOC__, bigint_equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, 1000000000000000000000000000000000000000000000000000000000000000000000000000000000001n), false)
-  eq(__LOC__, generic_equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, 1000000000000000000000000000000000000000000000000000000000000000000000000000000000001n), false)
-  eq(__LOC__, bigint_equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, -1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n), false)
-  eq(__LOC__, generic_equal(1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n, -1000000000000000000000000000000000000000000000000000000000000000000000000000000000000n), false)
-  eq(__LOC__, bigint_equal(switch 1n {
-    |1n => 3n
-    |2n => 4n
-    |_ => 0n
-  }, 3n), true)
-  eq(__LOC__, generic_equal(switch 1n {
-    |1n => 3n
-    |2n => 4n
-    |_ => 0n
-  }, 3n), true)
-  eq(__LOC__, bigint_equal(switch -1n {
-    |-00001n => 3n
-    |-2n => 4n
-    |_ => 0n
-  }, 3n), true)
-  eq(__LOC__, generic_equal(switch -1n {
-    |-00001n => 3n
-    |2n => 4n
-    |_ => 0n
-  }, 3n), true)
-  eq(__LOC__, bigint_equal(switch -0001_000n {
-    |-00001000n => 3n
-    |-0002n => 4n
-    |_ => 0n
-  }, 3n), true)
-  eq(__LOC__, generic_equal(switch -0001_000n {
-    |-00001000n => 3n
-    |-0002n => 4n
-    |_ => 0n
-  }, 3n), true)
-  eq(__LOC__, bigint_land(9n, 1n), 1n)
-  eq(__LOC__, bigint_lor(9n, 1n), 9n)
-  eq(__LOC__, bigint_lxor(9n, 1n), 8n)
-  eq(__LOC__, bigint_lsl(9n, 1n), 18n)
-  eq(__LOC__, bigint_lsl(9n, -1n), 4n)
-  eq(__LOC__, bigint_asr(9n, 1n), 4n)
-  eq(__LOC__, bigint_asr(9n, -1n), 18n)
-  eq(__LOC__, bigint_asr(-9n, 1n), -5n)
-  eq(__LOC__, bigint_asr(-9n, -1n), -18n)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/block_alias_test.js b/jscomp/test/block_alias_test.js
deleted file mode 100644
index f74dce0..0000000
--- a/jscomp/test/block_alias_test.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-var Block = {};
-
-var v0 = {
-  TAG: "A",
-  _0: 0,
-  _1: 1
-};
-
-var Block$1 = {};
-
-var v1 = {
-  TAG: "A",
-  _0: 0,
-  _1: 1
-};
-
-var N = {
-  Block: Block$1,
-  v1: v1
-};
-
-var Caml_obj$1 = {};
-
-var List$1 = {};
-
-var V = {
-  List: List$1
-};
-
-var f = Caml_obj.equal;
-
-eq("File \"block_alias_test.res\", line 27, characters 3-10", List.length({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }), 2);
-
-b("File \"block_alias_test.res\", line 28, characters 2-9", Caml_obj.equal(v0, {
-          TAG: "A",
-          _0: 0,
-          _1: 1
-        }));
-
-eq("File \"block_alias_test.res\", line 29, characters 3-10", v0, v1);
-
-Mt.from_pair_suites("Block_alias_test", suites.contents);
-
-var h = List.length;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.Block = Block;
-exports.v0 = v0;
-exports.N = N;
-exports.Caml_obj = Caml_obj$1;
-exports.V = V;
-exports.f = f;
-exports.h = h;
-/*  Not a pure module */
diff --git a/jscomp/test/block_alias_test.res b/jscomp/test/block_alias_test.res
deleted file mode 100644
index fc6b264..0000000
--- a/jscomp/test/block_alias_test.res
+++ /dev/null
@@ -1,31 +0,0 @@
-let suites = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-
-module Block = {}
-type t =
-  | A0(int)
-  | A(int, int)
-
-let v0 = A(0, 1)
-
-module N = {
-  module Block = {}
-  let v1 = A(0, 1)
-}
-
-module Caml_obj = {}
-
-module V = {
-  module List = {}
-}
-let f = (a, b) => a == b
-
-let h = List.length
-
-eq(__LOC__, h(list{1, 2}), 2)
-b(__LOC__, f(v0, A(0, 1)))
-eq(__LOC__, v0, N.v1)
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/boolean_test.js b/jscomp/test/boolean_test.js
deleted file mode 100644
index 2f60072..0000000
--- a/jscomp/test/boolean_test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Test_bool_equal = require("./test_bool_equal.js");
-
-Mt.from_suites("boolean", {
-      hd: [
-        "bool_equal",
-        Test_bool_equal.assertions
-      ],
-      tl: /* [] */0
-    });
-
-/*  Not a pure module */
diff --git a/jscomp/test/boolean_test.res b/jscomp/test/boolean_test.res
deleted file mode 100644
index f0885c0..0000000
--- a/jscomp/test/boolean_test.res
+++ /dev/null
@@ -1,3 +0,0 @@
-open Mt
-
-from_suites("boolean", list{("bool_equal", Test_bool_equal.assertions)})
diff --git a/jscomp/test/bs_MapInt_test.js b/jscomp/test/bs_MapInt_test.js
deleted file mode 100644
index 7dea07a..0000000
--- a/jscomp/test/bs_MapInt_test.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Js_exn = require("../../lib/js/js_exn.js");
-var Belt_MapInt = require("../../lib/js/belt_MapInt.js");
-
-function should(b) {
-  if (!b) {
-    return Js_exn.raiseError("IMPOSSIBLE");
-  }
-  
-}
-
-function test(param) {
-  var m;
-  for(var i = 0; i <= 999999; ++i){
-    m = Belt_MapInt.set(m, i, i);
-  }
-  for(var i$1 = 0; i$1 <= 999999; ++i$1){
-    should(Belt_MapInt.get(m, i$1) !== undefined);
-  }
-  for(var i$2 = 0; i$2 <= 999999; ++i$2){
-    m = Belt_MapInt.remove(m, i$2);
-  }
-  should(Belt_MapInt.isEmpty(m));
-}
-
-test();
-
-var M;
-
-exports.should = should;
-exports.M = M;
-exports.test = test;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_MapInt_test.res b/jscomp/test/bs_MapInt_test.res
deleted file mode 100644
index a09919c..0000000
--- a/jscomp/test/bs_MapInt_test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-@@bs.config({flags: ["-bs-no-cross-module-opt"]})
-let should = b =>
-  if !b {
-    Js.Exn.raiseError("IMPOSSIBLE")
-  }
-
-module M = Belt.Map.Int
-let test = () => {
-  let m = ref(M.empty)
-  let count = 100_0000 - 1
-  for i in 0 to count {
-    m := M.set(m.contents, i, i)
-  }
-  for i in 0 to count {
-    should(M.get(m.contents, i) != None)
-  }
-  for i in 0 to count {
-    m := M.remove(m.contents, i)
-  }
-  should(M.isEmpty(m.contents))
-}
-
-let () = test()
diff --git a/jscomp/test/bs_abstract_test.js b/jscomp/test/bs_abstract_test.js
deleted file mode 100644
index 2590040..0000000
--- a/jscomp/test/bs_abstract_test.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-var v = {
-  hd: 3,
-  tl: null
-};
-
-v.tl = v;
-
-var f = {
-  k: (function (x, y) {
-      return x === y;
-    }),
-  y: "x"
-};
-
-function uf(u) {
-  return Curry._1(u.y0, 1);
-}
-
-function uf1(u) {
-  return Curry._1(u.y1, 1);
-}
-
-function uf2(u) {
-  return Curry._2(u.y1, 1, 2);
-}
-
-function uff(f) {
-  return f.yyyy(1);
-}
-
-function uff2(f) {
-  return f.yyyy1(1, 2);
-}
-
-function uff3(f) {
-  var x = f.yyyy2;
-  if (x !== undefined) {
-    return Curry._1(x, 0);
-  } else {
-    return 0;
-  }
-}
-
-function fx(v) {
-  return v.x;
-}
-
-exports.f = f;
-exports.uf = uf;
-exports.uf1 = uf1;
-exports.uf2 = uf2;
-exports.uff = uff;
-exports.uff2 = uff2;
-exports.uff3 = uff3;
-exports.fx = fx;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_abstract_test.res b/jscomp/test/bs_abstract_test.res
deleted file mode 100644
index 3e14480..0000000
--- a/jscomp/test/bs_abstract_test.res
+++ /dev/null
@@ -1,60 +0,0 @@
-@deriving(abstract)
-type rec linked_list<'a> = {
-  hd: 'a,
-  mutable tl: Js.null<linked_list<'a>>,
-}
-
-let v = linked_list(~hd=3, ~tl=Js.null)
-
-tlSet(v, Js.Null.return(v))
-
-type rec t = (. int, int) => bool
-@deriving(abstract)
-and x = {
-  k: t,
-  y: string,
-}
-
-let x0 = k => x(~k, ~y="xx")
-let x1 = k => x(~k, ~y="xx")
-
-let f = x(~k=(. x, y) => x == y, ~y="x")
-
-@deriving(abstract)
-type u = {
-  x: int,
-  y0: int => int,
-  y1: (int, int) => int,
-}
-
-let uf = u => u->y0Get(1)
-let uf1 = u => u->y1Get(1)
-let uf2 = u => u->y1Get(1, 2)
-
-@deriving(abstract)
-type u1 = {
-  x: int,
-  yyyy: (. int) => int,
-  yyyy1: (. int, int) => int,
-  @optional yyyy2: int => int,
-}
-
-let uff = f => (f->yyyyGet)(. 1)
-
-let uff2 = f => (f->yyyy1Get)(. 1, 2)
-
-let uff3 = f =>
-  switch f->yyyy2Get {
-  | None => 0
-  | Some(x) => x(0)
-  }
-
-@deriving({abstract: light})
-type u3 = {
-  x: int,
-  yyyy: (. int) => int,
-  yyyy1: (. int, int) => int,
-  @optional yyyy2: int => int,
-}
-
-let fx = v => v->x
diff --git a/jscomp/test/bs_abstract_test.resi b/jscomp/test/bs_abstract_test.resi
deleted file mode 100644
index e663e7d..0000000
--- a/jscomp/test/bs_abstract_test.resi
+++ /dev/null
@@ -1,27 +0,0 @@
-@deriving(abstract)
-type rec linked_list<'a> = private {
-  /* hd : 'a ; */
-  tl: Js.null<linked_list<'a>>,
-}
-
-type rec t = (. int, int) => bool
-@deriving(abstract)
-and x = private {
-  k: t,
-  /* y : string */
-}
-
-let f: x
-type u
-let uf: u => int
-let uf1: (u, int) => int
-let uf2: u => int
-
-type u1
-let uff: u1 => int
-let uff2: u1 => int
-
-let uff3: u1 => int
-
-type u3
-let fx: u3 => int
diff --git a/jscomp/test/bs_array_test.js b/jscomp/test/bs_array_test.js
deleted file mode 100644
index 08205ad..0000000
--- a/jscomp/test/bs_array_test.js
+++ /dev/null
@@ -1,1632 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Curry = require("../../lib/js/curry.js");
-var Js_list = require("../../lib/js/js_list.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Belt_List = require("../../lib/js/belt_List.js");
-var Js_vector = require("../../lib/js/js_vector.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function $$throw(loc, x) {
-  Mt.throw_suites(test_id, suites, loc, x);
-}
-
-function neq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Neq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function push(prim0, prim1) {
-  prim0.push(prim1);
-}
-
-console.log([
-            1,
-            2,
-            3,
-            4
-          ].filter(function (x) {
-              return x > 2;
-            }).map(function (x, i) {
-            return x + i | 0;
-          }).reduce((function (x, y) {
-            return x + y | 0;
-          }), 0));
-
-var v = [
-  1,
-  2
-];
-
-eq("File \"bs_array_test.res\", line 31, characters 4-11", [
-      Belt_Array.get(v, 0),
-      Belt_Array.get(v, 1),
-      Belt_Array.get(v, 2),
-      Belt_Array.get(v, 3),
-      Belt_Array.get(v, -1)
-    ], [
-      1,
-      2,
-      undefined,
-      undefined,
-      undefined
-    ]);
-
-$$throw("File \"bs_array_test.res\", line 35, characters 8-15", (function (param) {
-        Belt_Array.getExn([
-              0,
-              1
-            ], -1);
-      }));
-
-$$throw("File \"bs_array_test.res\", line 36, characters 8-15", (function (param) {
-        Belt_Array.getExn([
-              0,
-              1
-            ], 2);
-      }));
-
-var partial_arg = [
-  0,
-  1
-];
-
-function f(param) {
-  return Belt_Array.getExn(partial_arg, param);
-}
-
-b("File \"bs_array_test.res\", line 38, characters 4-11", Caml_obj.equal([
-          Curry._1(f, 0),
-          Curry._1(f, 1)
-        ], [
-          0,
-          1
-        ]));
-
-$$throw("File \"bs_array_test.res\", line 44, characters 8-15", (function (param) {
-        Belt_Array.setExn([
-              0,
-              1
-            ], -1, 0);
-      }));
-
-$$throw("File \"bs_array_test.res\", line 45, characters 8-15", (function (param) {
-        Belt_Array.setExn([
-              0,
-              1
-            ], 2, 0);
-      }));
-
-b("File \"bs_array_test.res\", line 46, characters 4-11", !Belt_Array.set([
-          1,
-          2
-        ], 2, 0));
-
-var v$1 = [
-  1,
-  2
-];
-
-if (!Belt_Array.set(v$1, 0, 0)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_array_test.res",
-          51,
-          6
-        ],
-        Error: new Error()
-      };
-}
-
-b("File \"bs_array_test.res\", line 48, characters 4-11", Belt_Array.getExn(v$1, 0) === 0);
-
-var v$2 = [
-  1,
-  2
-];
-
-if (!Belt_Array.set(v$2, 1, 0)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_array_test.res",
-          59,
-          6
-        ],
-        Error: new Error()
-      };
-}
-
-b("File \"bs_array_test.res\", line 56, characters 4-11", Belt_Array.getExn(v$2, 1) === 0);
-
-var v$3 = [
-  1,
-  2
-];
-
-b("File \"bs_array_test.res\", line 64, characters 4-11", (Belt_Array.setExn(v$3, 0, 0), Belt_Array.getExn(v$3, 0) === 0));
-
-var v$4 = [
-  1,
-  2
-];
-
-b("File \"bs_array_test.res\", line 72, characters 4-11", (Belt_Array.setExn(v$4, 1, 0), Belt_Array.getExn(v$4, 1) === 0));
-
-function id(x) {
-  eq("File \"bs_array_test.res\", line 81, characters 17-24", Js_vector.toList(Js_list.toVector(x)), x);
-}
-
-eq("File \"bs_array_test.res\", line 84, characters 5-12", Js_list.toVector({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }), [
-      1,
-      2,
-      3
-    ]);
-
-eq("File \"bs_array_test.res\", line 85, characters 5-12", Js_vector.map((function (x) {
-            return x + 1 | 0;
-          }), [
-          1,
-          2,
-          3
-        ]), [
-      2,
-      3,
-      4
-    ]);
-
-eq("File \"bs_array_test.res\", line 86, characters 5-12", Caml_array.make(5, 3), [
-      3,
-      3,
-      3,
-      3,
-      3
-    ]);
-
-var a = Js_vector.init(5, (function (i) {
-        return i + 1 | 0;
-      }));
-
-eq("File \"bs_array_test.res\", line 88, characters 4-11", (Js_vector.filterInPlace((function (j) {
-              return j % 2 === 0;
-            }), a), a), [
-      2,
-      4
-    ]);
-
-var a$1 = Js_vector.init(5, (function (i) {
-        return i + 1 | 0;
-      }));
-
-eq("File \"bs_array_test.res\", line 98, characters 4-11", (Js_vector.filterInPlace((function (j) {
-              return j % 2 !== 0;
-            }), a$1), a$1), [
-      1,
-      3,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 107, characters 5-12", Js_list.toVector({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }), [
-      1,
-      2,
-      3
-    ]);
-
-eq("File \"bs_array_test.res\", line 108, characters 5-12", Js_list.toVector({
-          hd: 1,
-          tl: /* [] */0
-        }), [1]);
-
-id(/* [] */0);
-
-id({
-      hd: 1,
-      tl: /* [] */0
-    });
-
-id({
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: {
-            hd: 4,
-            tl: {
-              hd: 5,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    });
-
-id(Js_vector.toList(Js_vector.init(100, (function (i) {
-                return i;
-              }))));
-
-function add(x, y) {
-  return x + y | 0;
-}
-
-var v$5 = Belt_Array.makeBy(3000, (function (i) {
-        return i;
-      }));
-
-var u = Belt_Array.shuffle(v$5);
-
-neq("File \"bs_array_test.res\", line 122, characters 6-13", u, v$5);
-
-eq("File \"bs_array_test.res\", line 124, characters 5-12", Belt_Array.reduce(u, 0, add), Belt_Array.reduce(v$5, 0, add));
-
-b("File \"bs_array_test.res\", line 129, characters 4-11", Caml_obj.equal(Belt_Array.range(0, 3), [
-          0,
-          1,
-          2,
-          3
-        ]));
-
-b("File \"bs_array_test.res\", line 130, characters 4-11", Caml_obj.equal(Belt_Array.range(3, 0), []));
-
-b("File \"bs_array_test.res\", line 131, characters 4-11", Caml_obj.equal(Belt_Array.range(3, 3), [3]));
-
-b("File \"bs_array_test.res\", line 133, characters 4-11", Caml_obj.equal(Belt_Array.rangeBy(0, 10, 3), [
-          0,
-          3,
-          6,
-          9
-        ]));
-
-b("File \"bs_array_test.res\", line 134, characters 4-11", Caml_obj.equal(Belt_Array.rangeBy(0, 12, 3), [
-          0,
-          3,
-          6,
-          9,
-          12
-        ]));
-
-b("File \"bs_array_test.res\", line 135, characters 4-11", Caml_obj.equal(Belt_Array.rangeBy(33, 0, 1), []));
-
-b("File \"bs_array_test.res\", line 136, characters 4-11", Caml_obj.equal(Belt_Array.rangeBy(33, 0, -1), []));
-
-b("File \"bs_array_test.res\", line 137, characters 4-11", Caml_obj.equal(Belt_Array.rangeBy(3, 12, -1), []));
-
-b("File \"bs_array_test.res\", line 138, characters 4-11", Caml_obj.equal(Belt_Array.rangeBy(3, 3, 0), []));
-
-b("File \"bs_array_test.res\", line 139, characters 4-11", Caml_obj.equal(Belt_Array.rangeBy(3, 3, 1), [3]));
-
-eq("File \"bs_array_test.res\", line 143, characters 5-12", Belt_Array.reduceReverse([], 100, (function (prim0, prim1) {
-            return prim0 - prim1 | 0;
-          })), 100);
-
-eq("File \"bs_array_test.res\", line 144, characters 5-12", Belt_Array.reduceReverse([
-          1,
-          2
-        ], 100, (function (prim0, prim1) {
-            return prim0 - prim1 | 0;
-          })), 97);
-
-eq("File \"bs_array_test.res\", line 145, characters 5-12", Belt_Array.reduceReverse([
-          1,
-          2,
-          3,
-          4
-        ], 100, (function (prim0, prim1) {
-            return prim0 - prim1 | 0;
-          })), 90);
-
-eq("File \"bs_array_test.res\", line 146, characters 5-12", Belt_Array.reduceWithIndex([
-          1,
-          2,
-          3,
-          4
-        ], 0, (function (acc, x, i) {
-            return (acc + x | 0) + i | 0;
-          })), 16);
-
-b("File \"bs_array_test.res\", line 147, characters 4-11", Belt_Array.reduceReverse2([
-          1,
-          2,
-          3
-        ], [
-          1,
-          2
-        ], 0, (function (acc, x, y) {
-            return (acc + x | 0) + y | 0;
-          })) === 6);
-
-function addone(x) {
-  return x + 1 | 0;
-}
-
-function makeMatrixExn(sx, sy, init) {
-  if (!(sx >= 0 && sy >= 0)) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_array_test.res",
-            153,
-            2
-          ],
-          Error: new Error()
-        };
-  }
-  var res = new Array(sx);
-  for(var x = 0; x < sx; ++x){
-    var initY = new Array(sy);
-    for(var y = 0; y < sy; ++y){
-      initY[y] = init;
-    }
-    res[x] = initY;
-  }
-  return res;
-}
-
-eq("File \"bs_array_test.res\", line 166, characters 5-12", Belt_Array.makeBy(0, (function (param) {
-            return 1;
-          })), []);
-
-eq("File \"bs_array_test.res\", line 167, characters 5-12", Belt_Array.makeBy(3, (function (i) {
-            return i;
-          })), [
-      0,
-      1,
-      2
-    ]);
-
-eq("File \"bs_array_test.res\", line 168, characters 5-12", makeMatrixExn(3, 4, 1), [
-      [
-        1,
-        1,
-        1,
-        1
-      ],
-      [
-        1,
-        1,
-        1,
-        1
-      ],
-      [
-        1,
-        1,
-        1,
-        1
-      ]
-    ]);
-
-eq("File \"bs_array_test.res\", line 169, characters 5-12", makeMatrixExn(3, 0, 0), [
-      [],
-      [],
-      []
-    ]);
-
-eq("File \"bs_array_test.res\", line 170, characters 5-12", makeMatrixExn(0, 3, 1), []);
-
-eq("File \"bs_array_test.res\", line 171, characters 5-12", makeMatrixExn(1, 1, 1), [[1]]);
-
-eq("File \"bs_array_test.res\", line 172, characters 5-12", [].slice(0), []);
-
-eq("File \"bs_array_test.res\", line 173, characters 5-12", Belt_Array.map([], (function (prim) {
-            return prim + 1 | 0;
-          })), []);
-
-eq("File \"bs_array_test.res\", line 174, characters 5-12", Belt_Array.mapWithIndex([], add), []);
-
-eq("File \"bs_array_test.res\", line 175, characters 5-12", Belt_Array.mapWithIndex([
-          1,
-          2,
-          3
-        ], add), [
-      1,
-      3,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 176, characters 5-12", Belt_List.fromArray([]), /* [] */0);
-
-eq("File \"bs_array_test.res\", line 177, characters 5-12", Belt_List.fromArray([1]), {
-      hd: 1,
-      tl: /* [] */0
-    });
-
-eq("File \"bs_array_test.res\", line 178, characters 5-12", Belt_List.fromArray([
-          1,
-          2,
-          3
-        ]), {
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("File \"bs_array_test.res\", line 179, characters 5-12", Belt_Array.map([
-          1,
-          2,
-          3
-        ], (function (prim) {
-            return prim + 1 | 0;
-          })), [
-      2,
-      3,
-      4
-    ]);
-
-eq("File \"bs_array_test.res\", line 180, characters 5-12", Belt_List.toArray(/* [] */0), []);
-
-eq("File \"bs_array_test.res\", line 181, characters 5-12", Belt_List.toArray({
-          hd: 1,
-          tl: /* [] */0
-        }), [1]);
-
-eq("File \"bs_array_test.res\", line 182, characters 5-12", Belt_List.toArray({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }), [
-      1,
-      2
-    ]);
-
-eq("File \"bs_array_test.res\", line 183, characters 5-12", Belt_List.toArray({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }), [
-      1,
-      2,
-      3
-    ]);
-
-var v$6 = Belt_Array.makeBy(10, (function (i) {
-        return i;
-      }));
-
-var v0 = Belt_Array.keep(v$6, (function (x) {
-        return x % 2 === 0;
-      }));
-
-var v1 = Belt_Array.keep(v$6, (function (x) {
-        return x % 3 === 0;
-      }));
-
-var v2 = Belt_Array.keepMap(v$6, (function (x) {
-        if (x % 2 === 0) {
-          return x + 1 | 0;
-        }
-        
-      }));
-
-eq("File \"bs_array_test.res\", line 197, characters 5-12", v0, [
-      0,
-      2,
-      4,
-      6,
-      8
-    ]);
-
-eq("File \"bs_array_test.res\", line 198, characters 5-12", v1, [
-      0,
-      3,
-      6,
-      9
-    ]);
-
-eq("File \"bs_array_test.res\", line 199, characters 5-12", v2, [
-      1,
-      3,
-      5,
-      7,
-      9
-    ]);
-
-var a$2 = [
-  1,
-  2,
-  3,
-  4,
-  5
-];
-
-var match = Belt_Array.partition(a$2, (function (x) {
-        return x % 2 === 0;
-      }));
-
-eq("File \"bs_array_test.res\", line 205, characters 5-12", match[0], [
-      2,
-      4
-    ]);
-
-eq("File \"bs_array_test.res\", line 206, characters 5-12", match[1], [
-      1,
-      3,
-      5
-    ]);
-
-var match$1 = Belt_Array.partition(a$2, (function (x) {
-        return x === 2;
-      }));
-
-eq("File \"bs_array_test.res\", line 208, characters 5-12", match$1[0], [2]);
-
-eq("File \"bs_array_test.res\", line 209, characters 5-12", match$1[1], [
-      1,
-      3,
-      4,
-      5
-    ]);
-
-var match$2 = Belt_Array.partition([], (function (x) {
-        return false;
-      }));
-
-eq("File \"bs_array_test.res\", line 211, characters 5-12", match$2[0], []);
-
-eq("File \"bs_array_test.res\", line 212, characters 5-12", match$2[1], []);
-
-var a$3 = [
-  1,
-  2,
-  3,
-  4,
-  5
-];
-
-eq("File \"bs_array_test.res\", line 217, characters 5-12", Belt_Array.slice(a$3, 0, 2), [
-      1,
-      2
-    ]);
-
-eq("File \"bs_array_test.res\", line 218, characters 5-12", Belt_Array.slice(a$3, 0, 5), [
-      1,
-      2,
-      3,
-      4,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 219, characters 5-12", Belt_Array.slice(a$3, 0, 15), [
-      1,
-      2,
-      3,
-      4,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 220, characters 5-12", Belt_Array.slice(a$3, 5, 1), []);
-
-eq("File \"bs_array_test.res\", line 221, characters 5-12", Belt_Array.slice(a$3, 4, 1), [5]);
-
-eq("File \"bs_array_test.res\", line 222, characters 5-12", Belt_Array.slice(a$3, -1, 1), [5]);
-
-eq("File \"bs_array_test.res\", line 223, characters 5-12", Belt_Array.slice(a$3, -1, 2), [5]);
-
-eq("File \"bs_array_test.res\", line 224, characters 5-12", Belt_Array.slice(a$3, -2, 1), [4]);
-
-eq("File \"bs_array_test.res\", line 225, characters 5-12", Belt_Array.slice(a$3, -2, 2), [
-      4,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 226, characters 5-12", Belt_Array.slice(a$3, -2, 3), [
-      4,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 227, characters 5-12", Belt_Array.slice(a$3, -10, 3), [
-      1,
-      2,
-      3
-    ]);
-
-eq("File \"bs_array_test.res\", line 228, characters 5-12", Belt_Array.slice(a$3, -10, 4), [
-      1,
-      2,
-      3,
-      4
-    ]);
-
-eq("File \"bs_array_test.res\", line 229, characters 5-12", Belt_Array.slice(a$3, -10, 5), [
-      1,
-      2,
-      3,
-      4,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 230, characters 5-12", Belt_Array.slice(a$3, -10, 6), [
-      1,
-      2,
-      3,
-      4,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 231, characters 5-12", Belt_Array.slice(a$3, 0, 0), []);
-
-eq("File \"bs_array_test.res\", line 232, characters 5-12", Belt_Array.slice(a$3, 0, -1), []);
-
-var a$4 = [
-  1,
-  2,
-  3,
-  4,
-  5
-];
-
-eq("File \"bs_array_test.res\", line 237, characters 5-12", Belt_Array.sliceToEnd(a$4, 0), [
-      1,
-      2,
-      3,
-      4,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 238, characters 5-12", Belt_Array.sliceToEnd(a$4, 5), []);
-
-eq("File \"bs_array_test.res\", line 239, characters 5-12", Belt_Array.sliceToEnd(a$4, 4), [5]);
-
-eq("File \"bs_array_test.res\", line 240, characters 5-12", Belt_Array.sliceToEnd(a$4, -1), [5]);
-
-eq("File \"bs_array_test.res\", line 241, characters 5-12", Belt_Array.sliceToEnd(a$4, -2), [
-      4,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 242, characters 5-12", Belt_Array.sliceToEnd(a$4, -10), [
-      1,
-      2,
-      3,
-      4,
-      5
-    ]);
-
-eq("File \"bs_array_test.res\", line 243, characters 5-12", Belt_Array.sliceToEnd(a$4, 6), []);
-
-var a$5 = Belt_Array.makeBy(10, (function (x) {
-        return x;
-      }));
-
-Belt_Array.fill(a$5, 0, 3, 0);
-
-eq("File \"bs_array_test.res\", line 248, characters 5-12", a$5.slice(0), [
-      0,
-      0,
-      0,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ]);
-
-Belt_Array.fill(a$5, 2, 8, 1);
-
-eq("File \"bs_array_test.res\", line 250, characters 5-12", a$5.slice(0), [
-      0,
-      0,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1
-    ]);
-
-Belt_Array.fill(a$5, 8, 1, 9);
-
-eq("File \"bs_array_test.res\", line 252, characters 5-12", a$5.slice(0), [
-      0,
-      0,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      9,
-      1
-    ]);
-
-Belt_Array.fill(a$5, 8, 2, 9);
-
-eq("File \"bs_array_test.res\", line 254, characters 5-12", a$5.slice(0), [
-      0,
-      0,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      9,
-      9
-    ]);
-
-Belt_Array.fill(a$5, 8, 3, 12);
-
-eq("File \"bs_array_test.res\", line 256, characters 5-12", a$5.slice(0), [
-      0,
-      0,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      12,
-      12
-    ]);
-
-Belt_Array.fill(a$5, -2, 3, 11);
-
-eq("File \"bs_array_test.res\", line 258, characters 5-12", a$5.slice(0), [
-      0,
-      0,
-      1,
-      1,
-      1,
-      1,
-      1,
-      1,
-      11,
-      11
-    ]);
-
-Belt_Array.fill(a$5, -3, 3, 10);
-
-eq("File \"bs_array_test.res\", line 260, characters 5-12", a$5.slice(0), [
-      0,
-      0,
-      1,
-      1,
-      1,
-      1,
-      1,
-      10,
-      10,
-      10
-    ]);
-
-Belt_Array.fill(a$5, -3, 1, 7);
-
-eq("File \"bs_array_test.res\", line 262, characters 5-12", a$5.slice(0), [
-      0,
-      0,
-      1,
-      1,
-      1,
-      1,
-      1,
-      7,
-      10,
-      10
-    ]);
-
-Belt_Array.fill(a$5, -13, 1, 7);
-
-eq("File \"bs_array_test.res\", line 264, characters 5-12", a$5.slice(0), [
-      7,
-      0,
-      1,
-      1,
-      1,
-      1,
-      1,
-      7,
-      10,
-      10
-    ]);
-
-Belt_Array.fill(a$5, -13, 12, 7);
-
-eq("File \"bs_array_test.res\", line 266, characters 5-12", a$5.slice(0), Belt_Array.make(10, 7));
-
-Belt_Array.fill(a$5, 0, -1, 2);
-
-eq("File \"bs_array_test.res\", line 268, characters 5-12", a$5.slice(0), Belt_Array.make(10, 7));
-
-var b$1 = [
-  1,
-  2,
-  3
-];
-
-Belt_Array.fill(b$1, 0, 0, 0);
-
-eq("File \"bs_array_test.res\", line 271, characters 5-12", b$1, [
-      1,
-      2,
-      3
-    ]);
-
-Belt_Array.fill(b$1, 4, 1, 0);
-
-eq("File \"bs_array_test.res\", line 273, characters 5-12", b$1, [
-      1,
-      2,
-      3
-    ]);
-
-var a0 = Belt_Array.makeBy(10, (function (x) {
-        return x;
-      }));
-
-var b0 = Belt_Array.make(10, 3);
-
-Belt_Array.blit(a0, 1, b0, 2, 5);
-
-eq("File \"bs_array_test.res\", line 280, characters 5-12", b0.slice(0), [
-      3,
-      3,
-      1,
-      2,
-      3,
-      4,
-      5,
-      3,
-      3,
-      3
-    ]);
-
-Belt_Array.blit(a0, -1, b0, 2, 5);
-
-eq("File \"bs_array_test.res\", line 282, characters 5-12", b0.slice(0), [
-      3,
-      3,
-      9,
-      2,
-      3,
-      4,
-      5,
-      3,
-      3,
-      3
-    ]);
-
-Belt_Array.blit(a0, -1, b0, -2, 5);
-
-eq("File \"bs_array_test.res\", line 284, characters 5-12", b0.slice(0), [
-      3,
-      3,
-      9,
-      2,
-      3,
-      4,
-      5,
-      3,
-      9,
-      3
-    ]);
-
-Belt_Array.blit(a0, -2, b0, -2, 2);
-
-eq("File \"bs_array_test.res\", line 286, characters 5-12", b0.slice(0), [
-      3,
-      3,
-      9,
-      2,
-      3,
-      4,
-      5,
-      3,
-      8,
-      9
-    ]);
-
-Belt_Array.blit(a0, -11, b0, -11, 100);
-
-eq("File \"bs_array_test.res\", line 288, characters 5-12", b0.slice(0), a0);
-
-Belt_Array.blit(a0, -11, b0, -11, 2);
-
-eq("File \"bs_array_test.res\", line 290, characters 5-12", b0.slice(0), a0);
-
-var aa = Belt_Array.makeBy(10, (function (x) {
-        return x;
-      }));
-
-Belt_Array.blit(aa, -1, aa, 1, 2);
-
-eq("File \"bs_array_test.res\", line 293, characters 5-12", aa.slice(0), [
-      0,
-      9,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ]);
-
-Belt_Array.blit(aa, -2, aa, 1, 2);
-
-eq("File \"bs_array_test.res\", line 295, characters 5-12", aa.slice(0), [
-      0,
-      8,
-      9,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9
-    ]);
-
-Belt_Array.blit(aa, -5, aa, 4, 3);
-
-eq("File \"bs_array_test.res\", line 297, characters 5-12", aa.slice(0), [
-      0,
-      8,
-      9,
-      3,
-      5,
-      6,
-      7,
-      7,
-      8,
-      9
-    ]);
-
-Belt_Array.blit(aa, 4, aa, 5, 3);
-
-eq("File \"bs_array_test.res\", line 299, characters 5-12", aa.slice(0), [
-      0,
-      8,
-      9,
-      3,
-      5,
-      5,
-      6,
-      7,
-      8,
-      9
-    ]);
-
-eq("File \"bs_array_test.res\", line 300, characters 5-12", Belt_Array.make(0, 3), []);
-
-eq("File \"bs_array_test.res\", line 301, characters 5-12", Belt_Array.make(-1, 3), []);
-
-var c = [
-  0,
-  1,
-  2
-];
-
-Belt_Array.blit(c, 4, c, 1, 1);
-
-eq("File \"bs_array_test.res\", line 304, characters 5-12", c, [
-      0,
-      1,
-      2
-    ]);
-
-eq("File \"bs_array_test.res\", line 308, characters 5-12", Belt_Array.zip([
-          1,
-          2,
-          3
-        ], [
-          2,
-          3,
-          4,
-          1
-        ]), [
-      [
-        1,
-        2
-      ],
-      [
-        2,
-        3
-      ],
-      [
-        3,
-        4
-      ]
-    ]);
-
-eq("File \"bs_array_test.res\", line 309, characters 5-12", Belt_Array.zip([
-          2,
-          3,
-          4,
-          1
-        ], [
-          1,
-          2,
-          3
-        ]), [
-      [
-        2,
-        1
-      ],
-      [
-        3,
-        2
-      ],
-      [
-        4,
-        3
-      ]
-    ]);
-
-eq("File \"bs_array_test.res\", line 310, characters 5-12", Belt_Array.zipBy([
-          2,
-          3,
-          4,
-          1
-        ], [
-          1,
-          2,
-          3
-        ], (function (prim0, prim1) {
-            return prim0 - prim1 | 0;
-          })), [
-      1,
-      1,
-      1
-    ]);
-
-eq("File \"bs_array_test.res\", line 311, characters 5-12", Belt_Array.zipBy([
-          1,
-          2,
-          3
-        ], [
-          2,
-          3,
-          4,
-          1
-        ], (function (prim0, prim1) {
-            return prim0 - prim1 | 0;
-          })), Belt_Array.map([
-          1,
-          1,
-          1
-        ], (function (x) {
-            return -x | 0;
-          })));
-
-eq("File \"bs_array_test.res\", line 312, characters 5-12", Belt_Array.unzip([
-          [
-            1,
-            2
-          ],
-          [
-            2,
-            3
-          ],
-          [
-            3,
-            4
-          ]
-        ]), [
-      [
-        1,
-        2,
-        3
-      ],
-      [
-        2,
-        3,
-        4
-      ]
-    ]);
-
-function sumUsingForEach(xs) {
-  var v = {
-    contents: 0
-  };
-  Belt_Array.forEach(xs, (function (x) {
-          v.contents = v.contents + x | 0;
-        }));
-  return v.contents;
-}
-
-eq("File \"bs_array_test.res\", line 324, characters 5-12", sumUsingForEach([
-          0,
-          1,
-          2,
-          3,
-          4
-        ]), 10);
-
-b("File \"bs_array_test.res\", line 325, characters 4-11", !Belt_Array.every([
-          0,
-          1,
-          2,
-          3,
-          4
-        ], (function (x) {
-            return x > 2;
-          })));
-
-b("File \"bs_array_test.res\", line 326, characters 4-11", Belt_Array.some([
-          1,
-          3,
-          7,
-          8
-        ], (function (x) {
-            return x % 2 === 0;
-          })));
-
-b("File \"bs_array_test.res\", line 327, characters 4-11", !Belt_Array.some([
-          1,
-          3,
-          7
-        ], (function (x) {
-            return x % 2 === 0;
-          })));
-
-b("File \"bs_array_test.res\", line 328, characters 4-11", !Belt_Array.eq([
-          0,
-          1
-        ], [1], (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-var c$1 = {
-  contents: 0
-};
-
-b("File \"bs_array_test.res\", line 330, characters 4-11", (Belt_Array.forEachWithIndex([
-            1,
-            1,
-            1
-          ], (function (i, v) {
-              c$1.contents = (c$1.contents + i | 0) + v | 0;
-            })), c$1.contents === 6));
-
-function id$1(loc, x) {
-  var u = x.slice(0);
-  eq("File \"bs_array_test.res\", line 341, characters 4-11", Belt_Array.reverse(x), (Belt_Array.reverseInPlace(u), u));
-}
-
-id$1("File \"bs_array_test.res\", line 351, characters 5-12", []);
-
-id$1("File \"bs_array_test.res\", line 352, characters 5-12", [1]);
-
-id$1("File \"bs_array_test.res\", line 353, characters 5-12", [
-      1,
-      2
-    ]);
-
-id$1("File \"bs_array_test.res\", line 354, characters 5-12", [
-      1,
-      2,
-      3
-    ]);
-
-id$1("File \"bs_array_test.res\", line 355, characters 5-12", [
-      1,
-      2,
-      3,
-      4
-    ]);
-
-function every2(xs, ys) {
-  var partial_arg = Belt_List.toArray(ys);
-  var partial_arg$1 = Belt_List.toArray(xs);
-  return function (param) {
-    return Belt_Array.every2(partial_arg$1, partial_arg, param);
-  };
-}
-
-function some2(xs, ys) {
-  var partial_arg = Belt_List.toArray(ys);
-  var partial_arg$1 = Belt_List.toArray(xs);
-  return function (param) {
-    return Belt_Array.some2(partial_arg$1, partial_arg, param);
-  };
-}
-
-eq("File \"bs_array_test.res\", line 363, characters 5-12", every2(/* [] */0, {
-            hd: 1,
-            tl: /* [] */0
-          })(function (x, y) {
-          return x > y;
-        }), true);
-
-eq("File \"bs_array_test.res\", line 364, characters 5-12", every2({
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }, {
-            hd: 1,
-            tl: /* [] */0
-          })(function (x, y) {
-          return x > y;
-        }), true);
-
-eq("File \"bs_array_test.res\", line 365, characters 5-12", every2({
-            hd: 2,
-            tl: /* [] */0
-          }, {
-            hd: 1,
-            tl: /* [] */0
-          })(function (x, y) {
-          return x > y;
-        }), true);
-
-eq("File \"bs_array_test.res\", line 366, characters 5-12", every2({
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }, {
-            hd: 1,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          })(function (x, y) {
-          return x > y;
-        }), false);
-
-eq("File \"bs_array_test.res\", line 367, characters 5-12", every2({
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }, {
-            hd: 1,
-            tl: {
-              hd: 0,
-              tl: /* [] */0
-            }
-          })(function (x, y) {
-          return x > y;
-        }), true);
-
-eq("File \"bs_array_test.res\", line 368, characters 5-12", some2(/* [] */0, {
-            hd: 1,
-            tl: /* [] */0
-          })(function (x, y) {
-          return x > y;
-        }), false);
-
-eq("File \"bs_array_test.res\", line 369, characters 5-12", some2({
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }, {
-            hd: 1,
-            tl: /* [] */0
-          })(function (x, y) {
-          return x > y;
-        }), true);
-
-eq("File \"bs_array_test.res\", line 370, characters 5-12", some2({
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }, {
-            hd: 1,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          })(function (x, y) {
-          return x > y;
-        }), true);
-
-eq("File \"bs_array_test.res\", line 371, characters 5-12", some2({
-            hd: 0,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }, {
-            hd: 1,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          })(function (x, y) {
-          return x > y;
-        }), false);
-
-eq("File \"bs_array_test.res\", line 372, characters 5-12", some2({
-            hd: 0,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }, {
-            hd: 3,
-            tl: {
-              hd: 2,
-              tl: /* [] */0
-            }
-          })(function (x, y) {
-          return x > y;
-        }), true);
-
-eq("File \"bs_array_test.res\", line 376, characters 5-12", Belt_Array.concat([], [
-          1,
-          2,
-          3
-        ]), [
-      1,
-      2,
-      3
-    ]);
-
-eq("File \"bs_array_test.res\", line 377, characters 5-12", Belt_Array.concat([], []), []);
-
-eq("File \"bs_array_test.res\", line 378, characters 5-12", Belt_Array.concat([
-          3,
-          2
-        ], [
-          1,
-          2,
-          3
-        ]), [
-      3,
-      2,
-      1,
-      2,
-      3
-    ]);
-
-eq("File \"bs_array_test.res\", line 379, characters 5-12", Belt_Array.concatMany([
-          [
-            3,
-            2
-          ],
-          [
-            1,
-            2,
-            3
-          ]
-        ]), [
-      3,
-      2,
-      1,
-      2,
-      3
-    ]);
-
-eq("File \"bs_array_test.res\", line 380, characters 5-12", Belt_Array.concatMany([
-          [
-            3,
-            2
-          ],
-          [
-            1,
-            2,
-            3
-          ],
-          [],
-          [0]
-        ]), [
-      3,
-      2,
-      1,
-      2,
-      3,
-      0
-    ]);
-
-eq("File \"bs_array_test.res\", line 381, characters 5-12", Belt_Array.concatMany([
-          [],
-          [
-            3,
-            2
-          ],
-          [
-            1,
-            2,
-            3
-          ],
-          [],
-          [0]
-        ]), [
-      3,
-      2,
-      1,
-      2,
-      3,
-      0
-    ]);
-
-eq("File \"bs_array_test.res\", line 382, characters 5-12", Belt_Array.concatMany([
-          [],
-          []
-        ]), []);
-
-b("File \"bs_array_test.res\", line 386, characters 4-11", Belt_Array.cmp([
-          1,
-          2,
-          3
-        ], [
-          0,
-          1,
-          2,
-          3
-        ], Caml.int_compare) < 0);
-
-b("File \"bs_array_test.res\", line 387, characters 4-11", Belt_Array.cmp([
-          0,
-          1,
-          2,
-          3
-        ], [
-          1,
-          2,
-          3
-        ], Caml.int_compare) > 0);
-
-b("File \"bs_array_test.res\", line 388, characters 4-11", Belt_Array.cmp([
-          1,
-          2,
-          3
-        ], [
-          0,
-          1,
-          2
-        ], Caml.int_compare) > 0);
-
-b("File \"bs_array_test.res\", line 389, characters 4-11", Belt_Array.cmp([
-          1,
-          2,
-          3
-        ], [
-          1,
-          2,
-          3
-        ], Caml.int_compare) === 0);
-
-b("File \"bs_array_test.res\", line 390, characters 4-11", Belt_Array.cmp([
-          1,
-          2,
-          4
-        ], [
-          1,
-          2,
-          3
-        ], Caml.int_compare) > 0);
-
-eq("File \"bs_array_test.res\", line 394, characters 5-12", Belt_Array.getBy([
-          1,
-          2,
-          3
-        ], (function (x) {
-            return x > 1;
-          })), 2);
-
-eq("File \"bs_array_test.res\", line 395, characters 5-12", Belt_Array.getBy([
-          1,
-          2,
-          3
-        ], (function (x) {
-            return x > 3;
-          })), undefined);
-
-eq("File \"bs_array_test.res\", line 399, characters 5-12", Belt_Array.getIndexBy([
-          1,
-          2,
-          3
-        ], (function (x) {
-            return x > 1;
-          })), 1);
-
-eq("File \"bs_array_test.res\", line 400, characters 5-12", Belt_Array.getIndexBy([
-          1,
-          2,
-          3
-        ], (function (x) {
-            return x > 3;
-          })), undefined);
-
-var arr = [];
-
-arr.push(3);
-
-arr.push(2);
-
-arr.push(1);
-
-eq("File \"bs_array_test.res\", line 408, characters 5-12", arr, [
-      3,
-      2,
-      1
-    ]);
-
-Mt.from_pair_suites("File \"bs_array_test.res\", line 411, characters 20-27", suites.contents);
-
-var A;
-
-var L;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.$$throw = $$throw;
-exports.neq = neq;
-exports.A = A;
-exports.L = L;
-exports.push = push;
-exports.add = add;
-exports.addone = addone;
-exports.makeMatrixExn = makeMatrixExn;
-exports.sumUsingForEach = sumUsingForEach;
-exports.id = id$1;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_array_test.res b/jscomp/test/bs_array_test.res
deleted file mode 100644
index dbb88eb..0000000
--- a/jscomp/test/bs_array_test.res
+++ /dev/null
@@ -1,411 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(loc, x, y, ~test_id, ~suites)
-let b = (loc, x) => Mt.bool_suites(loc, x, ~test_id, ~suites)
-let throw = (loc, x) => Mt.throw_suites(~test_id, ~suites, loc, x)
-let neq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{
-      (loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Neq(x, y)),
-      ...suites.contents,
-    }
-}
-
-module A = Belt.Array
-module L = Belt.List
-
-let {push} = module(A)
-
-type t<'a> = Js.Array2.t<'a>
-let () =
-  [1, 2, 3, 4]
-  ->Js.Array2.filter(x => x > 2)
-  ->Js.Array2.mapi((x, i) => x + i)
-  ->Js.Array2.reduce((x, y) => x + y, 0)
-  ->Js.log
-
-let () = {
-  let v = [1, 2]
-  eq(
-    __LOC__,
-    (A.get(v, 0), A.get(v, 1), A.get(v, 2), A.get(v, 3), A.get(v, -1)),
-    (Some(1), Some(2), None, None, None),
-  )
-  throw(__LOC__, _ => A.getExn([0, 1], -1) |> ignore)
-  throw(__LOC__, _ => A.getExn([0, 1], 2) |> ignore)
-  b(
-    __LOC__,
-    {
-      let f = A.getExn([0, 1])
-      (f(0), f(1)) == (0, 1)
-    },
-  )
-  throw(__LOC__, _ => A.setExn([0, 1], -1, 0))
-  throw(__LOC__, _ => A.setExn([0, 1], 2, 0))
-  b(__LOC__, !A.set([1, 2], 2, 0))
-  b(
-    __LOC__,
-    {
-      let v = [1, 2]
-      assert(A.set(v, 0, 0))
-      A.getExn(v, 0) == 0
-    },
-  )
-  b(
-    __LOC__,
-    {
-      let v = [1, 2]
-      assert(A.set(v, 1, 0))
-      A.getExn(v, 1) == 0
-    },
-  )
-  b(
-    __LOC__,
-    {
-      let v = [1, 2]
-      A.setExn(v, 0, 0)
-      A.getExn(v, 0) == 0
-    },
-  )
-  b(
-    __LOC__,
-    {
-      let v = [1, 2]
-      A.setExn(v, 1, 0)
-      A.getExn(v, 1) == 0
-    },
-  )
-}
-
-let id = x => eq(__LOC__, \"@@"(Js.Vector.toList, Js.List.toVector(x)), x)
-
-let () = {
-  eq(__LOC__, Js.List.toVector(list{1, 2, 3}), [1, 2, 3])
-  eq(__LOC__, Js.Vector.map((. x) => x + 1, [1, 2, 3]), [2, 3, 4])
-  eq(__LOC__, Js.Vector.make(5, 3), [3, 3, 3, 3, 3])
-  eq(
-    __LOC__,
-    {
-      let a = Js.Vector.init(5, (. i) => i + 1)
-      Js.Vector.filterInPlace((. j) => mod(j, 2) == 0, a)
-      a
-    },
-    [2, 4],
-  )
-
-  eq(
-    __LOC__,
-    {
-      let a = Js.Vector.init(5, (. i) => i + 1)
-      Js.Vector.filterInPlace((. j) => mod(j, 2) != 0, a)
-      a
-    },
-    [1, 3, 5],
-  )
-
-  eq(__LOC__, Js.List.toVector(list{1, 2, 3}), [1, 2, 3])
-  eq(__LOC__, Js.List.toVector(list{1}), [1])
-  id(list{})
-  id(list{1})
-  id(list{1, 2, 3, 4, 5})
-  id({
-    open Js.Vector
-    \"@@"(toList, init(100, (. i) => i))
-  })
-}
-
-let add = (x, y) => x + y
-let () = {
-  let v = A.makeBy(3000, i => i)
-  let u = A.shuffle(v)
-  neq(__LOC__, u, v) /* unlikely */
-  let sum = x => A.reduce(x, 0, add)
-  eq(__LOC__, sum(u), sum(v))
-}
-
-let () = {
-  open A
-  b(__LOC__, range(0, 3) == [0, 1, 2, 3])
-  b(__LOC__, range(3, 0) == [])
-  b(__LOC__, range(3, 3) == [3])
-
-  b(__LOC__, rangeBy(0, 10, ~step=3) == [0, 3, 6, 9])
-  b(__LOC__, rangeBy(0, 12, ~step=3) == [0, 3, 6, 9, 12])
-  b(__LOC__, rangeBy(33, 0, ~step=1) == [])
-  b(__LOC__, rangeBy(33, 0, ~step=-1) == [])
-  b(__LOC__, rangeBy(3, 12, ~step=-1) == [])
-  b(__LOC__, rangeBy(3, 3, ~step=0) == [])
-  b(__LOC__, rangeBy(3, 3, ~step=1) == [3])
-}
-
-let () = {
-  eq(__LOC__, A.reduceReverse([], 100, \"-"), 100)
-  eq(__LOC__, A.reduceReverse([1, 2], 100, \"-"), 97)
-  eq(__LOC__, A.reduceReverse([1, 2, 3, 4], 100, \"-"), 90)
-  eq(__LOC__, A.reduceWithIndex([1, 2, 3, 4], 0, (acc, x, i) => acc + x + i), 16)
-  b(__LOC__, A.reduceReverse2([1, 2, 3], [1, 2], 0, (acc, x, y) => acc + x + y) == 6)
-}
-let addone = (. x) => x + 1
-
-let makeMatrixExn = (sx, sy, init) => {
-  /* let open A in */
-  assert(sx >= 0 && sy >= 0)
-  let res = A.makeUninitializedUnsafe(sx)
-  for x in 0 to sx - 1 {
-    let initY = A.makeUninitializedUnsafe(sy)
-    for y in 0 to sy - 1 {
-      A.setUnsafe(initY, y, init)
-    }
-    A.setUnsafe(res, x, initY)
-  }
-  res
-}
-
-let () = {
-  eq(__LOC__, A.makeBy(0, _ => 1), [])
-  eq(__LOC__, A.makeBy(3, i => i), [0, 1, 2])
-  eq(__LOC__, makeMatrixExn(3, 4, 1), [[1, 1, 1, 1], [1, 1, 1, 1], [1, 1, 1, 1]])
-  eq(__LOC__, makeMatrixExn(3, 0, 0), [[], [], []])
-  eq(__LOC__, makeMatrixExn(0, 3, 1), [])
-  eq(__LOC__, makeMatrixExn(1, 1, 1), [[1]])
-  eq(__LOC__, A.copy([]), [])
-  eq(__LOC__, A.map([], succ), [])
-  eq(__LOC__, A.mapWithIndex([], add), [])
-  eq(__LOC__, A.mapWithIndex([1, 2, 3], add), [1, 3, 5])
-  eq(__LOC__, L.fromArray([]), list{})
-  eq(__LOC__, L.fromArray([1]), list{1})
-  eq(__LOC__, L.fromArray([1, 2, 3]), list{1, 2, 3})
-  eq(__LOC__, A.map([1, 2, 3], succ), [2, 3, 4])
-  eq(__LOC__, L.toArray(list{}), [])
-  eq(__LOC__, L.toArray(list{1}), [1])
-  eq(__LOC__, L.toArray(list{1, 2}), [1, 2])
-  eq(__LOC__, L.toArray(list{1, 2, 3}), [1, 2, 3])
-}
-
-let () = {
-  let v = A.makeBy(10, i => i)
-  let v0 = A.keep(v, x => mod(x, 2) == 0)
-  let v1 = A.keep(v, x => mod(x, 3) == 0)
-  let v2 = A.keepMap(v, x =>
-    if mod(x, 2) == 0 {
-      Some(x + 1)
-    } else {
-      None
-    }
-  )
-  eq(__LOC__, v0, [0, 2, 4, 6, 8])
-  eq(__LOC__, v1, [0, 3, 6, 9])
-  eq(__LOC__, v2, [1, 3, 5, 7, 9])
-}
-
-let () = {
-  let a = [1, 2, 3, 4, 5]
-  let (v0, v1) = A.partition(a, x => mod(x, 2) == 0)
-  eq(__LOC__, v0, [2, 4])
-  eq(__LOC__, v1, [1, 3, 5])
-  let (v0, v1) = A.partition(a, x => x == 2)
-  eq(__LOC__, v0, [2])
-  eq(__LOC__, v1, [1, 3, 4, 5])
-  let (v0, v1) = A.partition([], x => false)
-  eq(__LOC__, v0, [])
-  eq(__LOC__, v1, [])
-}
-
-let () = {
-  let a = [1, 2, 3, 4, 5]
-  eq(__LOC__, A.slice(a, ~offset=0, ~len=2), [1, 2])
-  eq(__LOC__, A.slice(a, ~offset=0, ~len=5), [1, 2, 3, 4, 5])
-  eq(__LOC__, A.slice(a, ~offset=0, ~len=15), [1, 2, 3, 4, 5])
-  eq(__LOC__, A.slice(a, ~offset=5, ~len=1), [])
-  eq(__LOC__, A.slice(a, ~offset=4, ~len=1), [5])
-  eq(__LOC__, A.slice(a, ~offset=-1, ~len=1), [5])
-  eq(__LOC__, A.slice(a, ~offset=-1, ~len=2), [5])
-  eq(__LOC__, A.slice(a, ~offset=-2, ~len=1), [4])
-  eq(__LOC__, A.slice(a, ~offset=-2, ~len=2), [4, 5])
-  eq(__LOC__, A.slice(a, ~offset=-2, ~len=3), [4, 5])
-  eq(__LOC__, A.slice(a, ~offset=-10, ~len=3), [1, 2, 3])
-  eq(__LOC__, A.slice(a, ~offset=-10, ~len=4), [1, 2, 3, 4])
-  eq(__LOC__, A.slice(a, ~offset=-10, ~len=5), [1, 2, 3, 4, 5])
-  eq(__LOC__, A.slice(a, ~offset=-10, ~len=6), [1, 2, 3, 4, 5])
-  eq(__LOC__, A.slice(a, ~offset=0, ~len=0), [])
-  eq(__LOC__, A.slice(a, ~offset=0, ~len=-1), [])
-}
-
-let () = {
-  let a = [1, 2, 3, 4, 5]
-  eq(__LOC__, A.sliceToEnd(a, 0), [1, 2, 3, 4, 5])
-  eq(__LOC__, A.sliceToEnd(a, 5), [])
-  eq(__LOC__, A.sliceToEnd(a, 4), [5])
-  eq(__LOC__, A.sliceToEnd(a, -1), [5])
-  eq(__LOC__, A.sliceToEnd(a, -2), [4, 5])
-  eq(__LOC__, A.sliceToEnd(a, -10), [1, 2, 3, 4, 5])
-  eq(__LOC__, A.sliceToEnd(a, 6), [])
-}
-let () = {
-  let a = A.makeBy(10, x => x)
-  A.fill(a, ~offset=0, ~len=3, 0)
-  eq(__LOC__, A.copy(a), [0, 0, 0, 3, 4, 5, 6, 7, 8, 9])
-  A.fill(a, ~offset=2, ~len=8, 1)
-  eq(__LOC__, A.copy(a), [0, 0, 1, 1, 1, 1, 1, 1, 1, 1])
-  A.fill(a, ~offset=8, ~len=1, 9)
-  eq(__LOC__, A.copy(a), [0, 0, 1, 1, 1, 1, 1, 1, 9, 1])
-  A.fill(a, ~offset=8, ~len=2, 9)
-  eq(__LOC__, A.copy(a), [0, 0, 1, 1, 1, 1, 1, 1, 9, 9])
-  A.fill(a, ~offset=8, ~len=3, 12)
-  eq(__LOC__, A.copy(a), [0, 0, 1, 1, 1, 1, 1, 1, 12, 12])
-  A.fill(a, ~offset=-2, ~len=3, 11)
-  eq(__LOC__, A.copy(a), [0, 0, 1, 1, 1, 1, 1, 1, 11, 11])
-  A.fill(a, ~offset=-3, ~len=3, 10)
-  eq(__LOC__, A.copy(a), [0, 0, 1, 1, 1, 1, 1, 10, 10, 10])
-  A.fill(a, ~offset=-3, ~len=1, 7)
-  eq(__LOC__, A.copy(a), [0, 0, 1, 1, 1, 1, 1, 7, 10, 10])
-  A.fill(a, ~offset=-13, ~len=1, 7)
-  eq(__LOC__, A.copy(a), [7, 0, 1, 1, 1, 1, 1, 7, 10, 10])
-  A.fill(a, ~offset=-13, ~len=12, 7)
-  eq(__LOC__, A.copy(a), A.make(10, 7))
-  A.fill(a, ~offset=0, ~len=-1, 2)
-  eq(__LOC__, A.copy(a), A.make(10, 7))
-  let b = [1, 2, 3]
-  A.fill(b, ~offset=0, ~len=0, 0)
-  eq(__LOC__, b, [1, 2, 3])
-  A.fill(b, ~offset=4, ~len=1, 0)
-  eq(__LOC__, b, [1, 2, 3])
-}
-
-let () = {
-  let a0 = A.makeBy(10, x => x)
-  let b0 = A.make(10, 3)
-  A.blit(~src=a0, ~srcOffset=1, ~dst=b0, ~dstOffset=2, ~len=5)
-  eq(__LOC__, A.copy(b0), [3, 3, 1, 2, 3, 4, 5, 3, 3, 3])
-  A.blit(~src=a0, ~srcOffset=-1, ~dst=b0, ~dstOffset=2, ~len=5)
-  eq(__LOC__, A.copy(b0), [3, 3, 9, 2, 3, 4, 5, 3, 3, 3])
-  A.blit(~src=a0, ~srcOffset=-1, ~dst=b0, ~dstOffset=-2, ~len=5)
-  eq(__LOC__, A.copy(b0), [3, 3, 9, 2, 3, 4, 5, 3, 9, 3])
-  A.blit(~src=a0, ~srcOffset=-2, ~dst=b0, ~dstOffset=-2, ~len=2)
-  eq(__LOC__, A.copy(b0), [3, 3, 9, 2, 3, 4, 5, 3, 8, 9])
-  A.blit(~src=a0, ~srcOffset=-11, ~dst=b0, ~dstOffset=-11, ~len=100)
-  eq(__LOC__, A.copy(b0), a0)
-  A.blit(~src=a0, ~srcOffset=-11, ~dst=b0, ~dstOffset=-11, ~len=2)
-  eq(__LOC__, A.copy(b0), a0)
-  let aa = A.makeBy(10, x => x)
-  A.blit(~src=aa, ~srcOffset=-1, ~dst=aa, ~dstOffset=1, ~len=2)
-  eq(__LOC__, A.copy(aa), [0, 9, 2, 3, 4, 5, 6, 7, 8, 9])
-  A.blit(~src=aa, ~srcOffset=-2, ~dst=aa, ~dstOffset=1, ~len=2)
-  eq(__LOC__, A.copy(aa), [0, 8, 9, 3, 4, 5, 6, 7, 8, 9])
-  A.blit(~src=aa, ~srcOffset=-5, ~dst=aa, ~dstOffset=4, ~len=3)
-  eq(__LOC__, A.copy(aa), [0, 8, 9, 3, 5, 6, 7, 7, 8, 9])
-  A.blit(~src=aa, ~srcOffset=4, ~dst=aa, ~dstOffset=5, ~len=3)
-  eq(__LOC__, A.copy(aa), [0, 8, 9, 3, 5, 5, 6, 7, 8, 9])
-  eq(__LOC__, A.make(0, 3), [])
-  eq(__LOC__, A.make(-1, 3), [])
-  let c = [0, 1, 2]
-  A.blit(~src=c, ~srcOffset=4, ~dst=c, ~dstOffset=1, ~len=1)
-  eq(__LOC__, c, [0, 1, 2])
-}
-
-let () = {
-  eq(__LOC__, A.zip([1, 2, 3], [2, 3, 4, 1]), [(1, 2), (2, 3), (3, 4)])
-  eq(__LOC__, A.zip([2, 3, 4, 1], [1, 2, 3]), [(2, 1), (3, 2), (4, 3)])
-  eq(__LOC__, A.zipBy([2, 3, 4, 1], [1, 2, 3], \"-"), [1, 1, 1])
-  eq(__LOC__, A.zipBy([1, 2, 3], [2, 3, 4, 1], \"-"), A.map([1, 1, 1], x => -x))
-  eq(__LOC__, A.unzip([(1, 2), (2, 3), (3, 4)]), ([1, 2, 3], [2, 3, 4]))
-}
-
-/* Here */
-
-let sumUsingForEach = xs => {
-  let v = ref(0)
-  A.forEach(xs, x => v := v.contents + x)
-  v.contents
-}
-
-let () = {
-  eq(__LOC__, sumUsingForEach([0, 1, 2, 3, 4]), 10)
-  b(__LOC__, !A.every([0, 1, 2, 3, 4], x => x > 2))
-  b(__LOC__, A.some([1, 3, 7, 8], x => mod(x, 2) == 0))
-  b(__LOC__, \"@@"(not, A.some([1, 3, 7], x => mod(x, 2) == 0)))
-  b(__LOC__, \"@@"(not, A.eq([0, 1], [1], \"=")))
-  b(
-    __LOC__,
-    {
-      let c = ref(0)
-      A.forEachWithIndex([1, 1, 1], (i, v) => c := c.contents + i + v)
-      c.contents == 6
-    },
-  )
-}
-
-let id = (loc, x) =>
-  eq(
-    __LOC__,
-    A.reverse(x),
-    {
-      let u = A.copy(x)
-      A.reverseInPlace(u)
-      u
-    },
-  )
-
-let () = {
-  id(__LOC__, [])
-  id(__LOC__, [1])
-  id(__LOC__, [1, 2])
-  id(__LOC__, [1, 2, 3])
-  id(__LOC__, [1, 2, 3, 4])
-}
-
-let () = {
-  module N = {
-    let every2 = (xs, ys) => A.every2(L.toArray(xs), L.toArray(ys))
-    let some2 = (xs, ys) => A.some2(L.toArray(xs), L.toArray(ys))
-  }
-  eq(__LOC__, N.every2(list{}, list{1}, (x, y) => x > y), true)
-  eq(__LOC__, N.every2(list{2, 3}, list{1}, (x, y) => x > y), true)
-  eq(__LOC__, N.every2(list{2}, list{1}, (x, y) => x > y), true)
-  eq(__LOC__, N.every2(list{2, 3}, list{1, 4}, (x, y) => x > y), false)
-  eq(__LOC__, N.every2(list{2, 3}, list{1, 0}, (x, y) => x > y), true)
-  eq(__LOC__, N.some2(list{}, list{1}, (x, y) => x > y), false)
-  eq(__LOC__, N.some2(list{2, 3}, list{1}, (x, y) => x > y), true)
-  eq(__LOC__, N.some2(list{2, 3}, list{1, 4}, (x, y) => x > y), true)
-  eq(__LOC__, N.some2(list{0, 3}, list{1, 4}, (x, y) => x > y), false)
-  eq(__LOC__, N.some2(list{0, 3}, list{3, 2}, (x, y) => x > y), true)
-}
-
-let () = {
-  eq(__LOC__, A.concat([], [1, 2, 3]), [1, 2, 3])
-  eq(__LOC__, A.concat([], []), [])
-  eq(__LOC__, A.concat([3, 2], [1, 2, 3]), [3, 2, 1, 2, 3])
-  eq(__LOC__, A.concatMany([[3, 2], [1, 2, 3]]), [3, 2, 1, 2, 3])
-  eq(__LOC__, A.concatMany([[3, 2], [1, 2, 3], [], [0]]), [3, 2, 1, 2, 3, 0])
-  eq(__LOC__, A.concatMany([[], [3, 2], [1, 2, 3], [], [0]]), [3, 2, 1, 2, 3, 0])
-  eq(__LOC__, A.concatMany([[], []]), [])
-}
-
-let () = {
-  b(__LOC__, A.cmp([1, 2, 3], [0, 1, 2, 3], compare) < 0)
-  b(__LOC__, A.cmp([0, 1, 2, 3], [1, 2, 3], compare) > 0)
-  b(__LOC__, A.cmp([1, 2, 3], [0, 1, 2], (x, y) => compare(x, y)) > 0)
-  b(__LOC__, A.cmp([1, 2, 3], [1, 2, 3], (x, y) => compare(x, y)) == 0)
-  b(__LOC__, A.cmp([1, 2, 4], [1, 2, 3], (x, y) => compare(x, y)) > 0)
-}
-
-let () = {
-  eq(__LOC__, A.getBy([1, 2, 3], x => x > 1), Some(2))
-  eq(__LOC__, A.getBy([1, 2, 3], x => x > 3), None)
-}
-
-let () = {
-  eq(__LOC__, A.getIndexBy([1, 2, 3], x => x > 1), Some(1))
-  eq(__LOC__, A.getIndexBy([1, 2, 3], x => x > 3), None)
-}
-
-let () = {
-  let arr = []
-  arr->push(3)
-  arr->push(2)
-  arr->push(1)
-  eq(__LOC__, arr, [3, 2, 1])
-}
-
-Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/bs_auto_uncurry.js b/jscomp/test/bs_auto_uncurry.js
deleted file mode 100644
index 31f7a65..0000000
--- a/jscomp/test/bs_auto_uncurry.js
+++ /dev/null
@@ -1,158 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_splice_call = require("../../lib/js/caml_splice_call.js");
-
-var Curry$1 = {};
-
-var Block = {};
-
-var xbs = Array.prototype.map.call([
-      1,
-      2,
-      3,
-      5
-    ], (function (x) {
-        return x + 1 | 0;
-      }));
-
-function f(cb) {
-  return Array.prototype.map.call([
-              1,
-              2,
-              3,
-              4
-            ], Curry.__1(cb));
-}
-
-var xs = Array.prototype.map.call([
-      1,
-      1,
-      2
-    ], (function (x) {
-        return function (y) {
-          return (y + x | 0) + 1 | 0;
-        };
-      }));
-
-function f_0(param) {
-  return hi(function (param) {
-              
-            });
-}
-
-function f_01(param) {
-  return hi(function (x) {
-              if (x === undefined) {
-                console.log("x");
-                return ;
-              }
-              
-            });
-}
-
-function f_02(xs) {
-  return hi(function (x) {
-              xs.contents = x;
-              console.log("x");
-            });
-}
-
-function f_03(xs, u) {
-  return hi(Curry.__1(u));
-}
-
-function fishy(x, y, z) {
-  return map2(x, y, Curry.__2(z));
-}
-
-function h(x, y, z) {
-  return map2(x, y, Curry.__2(z));
-}
-
-function h1(x, y, u, z) {
-  var partial_arg = Curry._1(z, u);
-  return map2(x, y, Curry.__2(partial_arg));
-}
-
-function add3(x, y, z) {
-  return (x + y | 0) + z | 0;
-}
-
-function h2(x) {
-  return ff(x, (function (prim0, prim1) {
-                return prim0 + prim1 | 0;
-              }));
-}
-
-function h3(x) {
-  return ff(x, (function (param, param$1) {
-                return add3(1, param, param$1);
-              }));
-}
-
-function h4(x) {
-  return ff1(x, 3, (function (param, param$1) {
-                return add3(1, param, param$1);
-              }));
-}
-
-function h5(x) {
-  return ff2(x, "3", (function (param, param$1) {
-                return add3(2, param, param$1);
-              }));
-}
-
-function add(x, y) {
-  console.log([
-        x,
-        y
-      ]);
-  return x + y | 0;
-}
-
-function h6(x) {
-  return ff2(x, "3", add);
-}
-
-function unit_magic(param) {
-  console.log("noinline");
-  console.log("noinline");
-  return 3;
-}
-
-var f_unit_magic = unit_magic();
-
-function hh(xs) {
-  return function (param) {
-    Caml_splice_call.spliceApply(f_0002, [
-          xs,
-          param
-        ]);
-  };
-}
-
-exports.Curry = Curry$1;
-exports.Block = Block;
-exports.xbs = xbs;
-exports.f = f;
-exports.xs = xs;
-exports.f_0 = f_0;
-exports.f_01 = f_01;
-exports.f_02 = f_02;
-exports.f_03 = f_03;
-exports.fishy = fishy;
-exports.h = h;
-exports.h1 = h1;
-exports.add3 = add3;
-exports.h2 = h2;
-exports.h3 = h3;
-exports.h4 = h4;
-exports.h5 = h5;
-exports.add = add;
-exports.h6 = h6;
-exports.unit_magic = unit_magic;
-exports.f_unit_magic = f_unit_magic;
-exports.hh = hh;
-/* xbs Not a pure module */
diff --git a/jscomp/test/bs_auto_uncurry.res b/jscomp/test/bs_auto_uncurry.res
deleted file mode 100644
index 2b7a23c..0000000
--- a/jscomp/test/bs_auto_uncurry.res
+++ /dev/null
@@ -1,172 +0,0 @@
-module Curry = {}
-module Block = {}
-
-@val external map: (array<'a>, @uncurry ('a => 'b)) => array<'b> = "Array.prototype.map.call"
-
-type id = int => int
-@val external map2: (array<int>, @uncurry (int => int)) => array<int> = "Array.prototype.map.cal"
-
-/* [@bs.uncurry n] should not be documented,
-    since such inconsistency could not be checked
-*/
-
-/* if we know the return value of type we could do more optimizations here */
-let xbs = map([1, 2, 3, 5], x => x + 1)
-
-let f = (cb: int => int) => map([1, 2, 3, 4], cb)
-
-let xs = map([1, 1, 2], (x, y) => y + x + 1)
-
-@val external map2: (array<'a>, array<'b>, @uncurry ('a, 'b) => 'c) => array<'c> = "map2"
-
-@val external ff: (int, @ignore int, @uncurry (int, int) => int) => int = "ff"
-
-@val external ff1: (int, @as(3) _, @uncurry (int, int) => int) => int = "ff1"
-
-@val external ff2: (int, @as("3") _, @uncurry (int, int) => int) => int = "ff2"
-
-@val external hi: (@uncurry(1) (unit => unit)) => int = "hi"
-
-/*
-fun (_){
-    f 0
-}
-*/
-
-let f_0 = () => hi(() => ())
-let f_01 = () =>
-  hi((() as x) =>
-    if x == () {
-      Js.log("x")
-    }
-  ) /* FIXME: not inlined */
-let f_02 = xs =>
-  hi((() as x) => {
-    xs := x
-    Js.log("x")
-  })
-let f_03 = (xs, u) => hi(u)
-/* arity adjust to [0] [ function (){return u (0)}] */
-
-let fishy = (x, y, z) => map2(x, y, x => z(x))
-
-let h = (x, y, z) => map2(x, y, z)
-
-let h1 = (x, y, u, z) => map2(x, y, z(u))
-
-let add3 = (x, y, z) => x + y + z
-
-let h2 = x => ff(x, 2, \"+")
-
-let h3 = x => ff(x, 2, add3(1))
-
-let h4 = x => ff1(x, add3(1))
-
-let h5 = x => ff2(x, add3(2))
-let add = (x, y) => {
-  Js.log((x, y))
-  x + y
-}
-
-let h6 = x => ff2(x, add)
-
-type elem
-@val
-external optional_cb: (
-  @uncurry (string, ~props: elem=?, array<int>) => elem /* This should emit a warning ? */,
-  string,
-) => int = "optional_cb"
-
-/*
-let fishy_unit = fun () -> Js.log 1 
-
-let fishy_unit_2 = fun [@bs] (() as x) -> Js.log x
-
-let v = fishy_unit_2 () [@bs]
-
-*/
-/* Up is not a valid syntax, since you can not apply correctly */
-
-/* ^ should be an error instead of warning */
-
-/*
-external ff : 
-    int -> 
-    (unit -> unit [@bs.uncurry]) -> 
-    int = 
-    ""
-[@@bs.val]
-*/
-
-/*
-So if we pass 
-{[ (fun (() as x) ->  Js.log x  ) ]}
-
-Then we call it on JS side 
-[g ()], we are passing undefined 
-to [x] which is incorrect.
-
-We can also blame users 
-[()=>] is really not representable  in OCaml 
-You are writing the wrong FFI.... 
-
-They need (fun ()[@bs] -> ..)
-Maybe we can create a sugar 
-{[ begin [@bs]  .... end  ]} 
-*/
-
-/*
-external config : 
-    hi: (int -> int [@bs.uncurry]) ->    
-    lo: int -> 
-    unit -> 
-    _ = "" [@@bs.obj]
-
-type expected = 
-    < hi : int -> int [@bs]; 
-      lo : int >  
-
-let f : expected = 
-    config 
-    ~hi:(fun x -> x + 1 )
-    ~lo:3 
-    ()
-*/
-/*
-" we auto-uncurry 
-so the inferred type would be 
-*/
-/*
-let v = ref 0  
-
-
-
-(**
-There is a semantics mismatch when converting curried function into uncurried function 
-for example 
-`let u = f a b c in u d ` may have a side effect here when creating [u].
-We should document it clearly
-*)
-let a4 = Js.Internal.js_fn_mk4 (fun x y z -> incr v ;  fun d -> 1 + d)
-
-
-let () = 
-    ignore @@ a4 0 1 2 3 [@bs]
-    ignore @@ a4 0 1 2 3 [@bs]
-
-;;
-
-Mt.from_pair_suites __MODULE__ !suites
-*/
-
-let unit_magic = () => {
-  Js.log("noinline")
-  Js.log("noinline")
-  3
-}
-
-let f_unit_magic = unit_magic()
-
-@variadic @val external f_0002: (string, array<int>) => unit = "f_0002"
-
-let hh = xs => f_0002(xs)
diff --git a/jscomp/test/bs_auto_uncurry_test.js b/jscomp/test/bs_auto_uncurry_test.js
deleted file mode 100644
index f3a6530..0000000
--- a/jscomp/test/bs_auto_uncurry_test.js
+++ /dev/null
@@ -1,124 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function hi (cb){
-    cb ();
-    return 0;
-}
-;
-
-var xs = {
-  contents: /* [] */0
-};
-
-hi(function (x) {
-      xs.contents = {
-        hd: x,
-        tl: xs.contents
-      };
-    });
-
-hi(function (x) {
-      xs.contents = {
-        hd: x,
-        tl: xs.contents
-      };
-    });
-
-eq("File \"bs_auto_uncurry_test.res\", line 24, characters 5-12", xs.contents, {
-      hd: undefined,
-      tl: {
-        hd: undefined,
-        tl: /* [] */0
-      }
-    });
-
-eq("File \"bs_auto_uncurry_test.res\", line 28, characters 5-12", [
-        1,
-        2,
-        3
-      ].map(function (x) {
-          return x + 1 | 0;
-        }), [
-      2,
-      3,
-      4
-    ]);
-
-eq("File \"bs_auto_uncurry_test.res\", line 29, characters 5-12", [
-        1,
-        2,
-        3
-      ].map(function (x) {
-          return x + 1 | 0;
-        }), [
-      2,
-      3,
-      4
-    ]);
-
-eq("File \"bs_auto_uncurry_test.res\", line 31, characters 5-12", [
-        1,
-        2,
-        3
-      ].reduce((function (prim0, prim1) {
-            return prim0 + prim1 | 0;
-          }), 0), 6);
-
-eq("File \"bs_auto_uncurry_test.res\", line 33, characters 5-12", [
-        1,
-        2,
-        3
-      ].reduce((function (x, y, i) {
-            return (x + y | 0) + i | 0;
-          }), 0), 9);
-
-eq("File \"bs_auto_uncurry_test.res\", line 35, characters 5-12", [
-        1,
-        2,
-        3
-      ].some(function (x) {
-          return x < 1;
-        }), false);
-
-eq("File \"bs_auto_uncurry_test.res\", line 37, characters 5-12", [
-        1,
-        2,
-        3
-      ].every(function (x) {
-          return x > 0;
-        }), true);
-
-Mt.from_pair_suites("Bs_auto_uncurry_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_auto_uncurry_test.res b/jscomp/test/bs_auto_uncurry_test.res
deleted file mode 100644
index b368680..0000000
--- a/jscomp/test/bs_auto_uncurry_test.res
+++ /dev/null
@@ -1,40 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-@send external map: (array<'a>, @uncurry ('a => 'b)) => array<'b> = "map"
-
-%%raw(`
-function hi (cb){
-    cb ();
-    return 0;
-}
-`)
-
-@val external hi: (@uncurry (unit => unit)) => unit = "hi"
-
-let () = {
-  let xs = ref(list{})
-  hi((() as x) => xs := list{x, ...xs.contents})
-  hi((() as x) => xs := list{x, ...xs.contents})
-  eq(__LOC__, xs.contents, list{(), ()})
-}
-
-let () = {
-  eq(__LOC__, [1, 2, 3]->map(x => x + 1), [2, 3, 4])
-  eq(__LOC__, [1, 2, 3]->Js.Array2.map(x => x + 1), [2, 3, 4])
-
-  eq(__LOC__, [1, 2, 3]->Js.Array2.reduce(\"+", 0), 6)
-
-  eq(__LOC__, [1, 2, 3]->Js.Array2.reducei((x, y, i) => x + y + i, 0), 9)
-
-  eq(__LOC__, [1, 2, 3]->Js.Array2.some(x => x < 1), false)
-
-  eq(__LOC__, [1, 2, 3]->Js.Array2.every(x => x > 0), true)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_float_test.js b/jscomp/test/bs_float_test.js
deleted file mode 100644
index e124c86..0000000
--- a/jscomp/test/bs_float_test.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Belt_Float = require("../../lib/js/belt_Float.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function $$throw(loc, x) {
-  Mt.throw_suites(test_id, suites, loc, x);
-}
-
-function neq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Neq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"bs_float_test.res\", line 18, characters 5-12", 1, 1.0);
-
-eq("File \"bs_float_test.res\", line 19, characters 5-12", -1, -1.0);
-
-eq("File \"bs_float_test.res\", line 23, characters 5-12", 1, 1);
-
-eq("File \"bs_float_test.res\", line 24, characters 5-12", 1, 1);
-
-eq("File \"bs_float_test.res\", line 25, characters 5-12", 1, 1);
-
-eq("File \"bs_float_test.res\", line 26, characters 5-12", -1, -1);
-
-eq("File \"bs_float_test.res\", line 27, characters 5-12", -1, -1);
-
-eq("File \"bs_float_test.res\", line 28, characters 5-12", -1, -1);
-
-eq("File \"bs_float_test.res\", line 32, characters 5-12", Belt_Float.fromString("1"), 1.0);
-
-eq("File \"bs_float_test.res\", line 33, characters 5-12", Belt_Float.fromString("-1"), -1.0);
-
-eq("File \"bs_float_test.res\", line 34, characters 5-12", Belt_Float.fromString("1.7"), 1.7);
-
-eq("File \"bs_float_test.res\", line 35, characters 5-12", Belt_Float.fromString("-1.0"), -1.0);
-
-eq("File \"bs_float_test.res\", line 36, characters 5-12", Belt_Float.fromString("-1.5"), -1.5);
-
-eq("File \"bs_float_test.res\", line 37, characters 5-12", Belt_Float.fromString("-1.7"), -1.7);
-
-eq("File \"bs_float_test.res\", line 38, characters 5-12", Belt_Float.fromString("not a float"), undefined);
-
-eq("File \"bs_float_test.res\", line 42, characters 5-12", String(1.0), "1");
-
-eq("File \"bs_float_test.res\", line 43, characters 5-12", String(-1.0), "-1");
-
-eq("File \"bs_float_test.res\", line 44, characters 5-12", String(-1.5), "-1.5");
-
-eq("File \"bs_float_test.res\", line 49, characters 5-12", 2.0 + 3.0, 5.0);
-
-eq("File \"bs_float_test.res\", line 50, characters 5-12", 2.0 - 3.0, -1.0);
-
-eq("File \"bs_float_test.res\", line 51, characters 5-12", 2.0 * 3.0, 6.0);
-
-eq("File \"bs_float_test.res\", line 52, characters 5-12", 3.0 / 2.0, 1.5);
-
-Mt.from_pair_suites("File \"bs_float_test.res\", line 55, characters 20-27", suites.contents);
-
-var F;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.$$throw = $$throw;
-exports.neq = neq;
-exports.F = F;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_float_test.res b/jscomp/test/bs_float_test.res
deleted file mode 100644
index f1c08d8..0000000
--- a/jscomp/test/bs_float_test.res
+++ /dev/null
@@ -1,55 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(loc, x, y, ~test_id, ~suites)
-let b = (loc, x) => Mt.bool_suites(loc, x, ~test_id, ~suites)
-let throw = (loc, x) => Mt.throw_suites(~test_id, ~suites, loc, x)
-let neq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{
-      (loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Neq(x, y)),
-      ...suites.contents,
-    }
-}
-
-module F = Belt.Float
-
-let () = {
-  eq(__LOC__, F.fromInt(1), 1.0)
-  eq(__LOC__, F.fromInt(-1), -1.0)
-}
-
-let () = {
-  eq(__LOC__, F.toInt(1.0), 1)
-  eq(__LOC__, F.toInt(1.3), 1)
-  eq(__LOC__, F.toInt(1.7), 1)
-  eq(__LOC__, F.toInt(-1.0), -1)
-  eq(__LOC__, F.toInt(-1.5), -1)
-  eq(__LOC__, F.toInt(-1.7), -1)
-}
-
-let () = {
-  eq(__LOC__, F.fromString("1"), Some(1.0))
-  eq(__LOC__, F.fromString("-1"), Some(-1.0))
-  eq(__LOC__, F.fromString("1.7"), Some(1.7))
-  eq(__LOC__, F.fromString("-1.0"), Some(-1.0))
-  eq(__LOC__, F.fromString("-1.5"), Some(-1.5))
-  eq(__LOC__, F.fromString("-1.7"), Some(-1.7))
-  eq(__LOC__, F.fromString("not a float"), None)
-}
-
-let () = {
-  eq(__LOC__, F.toString(1.0), "1")
-  eq(__LOC__, F.toString(-1.0), "-1")
-  eq(__LOC__, F.toString(-1.5), "-1.5")
-}
-
-let () = {
-  open! F
-  eq(__LOC__, 2.0 + 3.0, 5.0)
-  eq(__LOC__, 2.0 - 3.0, -1.0)
-  eq(__LOC__, 2.0 * 3.0, 6.0)
-  eq(__LOC__, 3.0 / 2.0, 1.5)
-}
-
-Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/bs_hashmap_test.js b/jscomp/test/bs_hashmap_test.js
deleted file mode 100644
index 10c30c9..0000000
--- a/jscomp/test/bs_hashmap_test.js
+++ /dev/null
@@ -1,133 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Belt_Id = require("../../lib/js/belt_Id.js");
-var Hashtbl = require("../../lib/js/hashtbl.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_HashMap = require("../../lib/js/belt_HashMap.js");
-var Belt_SortArray = require("../../lib/js/belt_SortArray.js");
-var Array_data_util = require("./array_data_util.js");
-var Belt_internalBucketsType = require("../../lib/js/belt_internalBucketsType.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eqx(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function eq(x, y) {
-  return x === y;
-}
-
-var hash = Hashtbl.hash;
-
-var cmp = Caml.int_compare;
-
-var Y = Belt_Id.hashable(hash, eq);
-
-var empty = Belt_internalBucketsType.make(Y.hash, Y.eq, 30);
-
-function add(prim0, prim1) {
-  return prim0 + prim1 | 0;
-}
-
-Belt_HashMap.mergeMany(empty, [
-      [
-        1,
-        1
-      ],
-      [
-        2,
-        3
-      ],
-      [
-        3,
-        3
-      ],
-      [
-        2,
-        2
-      ]
-    ]);
-
-eqx("File \"bs_hashmap_test.res\", line 30, characters 6-13", Belt_HashMap.get(empty, 2), 2);
-
-eqx("File \"bs_hashmap_test.res\", line 31, characters 6-13", empty.size, 3);
-
-var u = Belt_Array.concat(Array_data_util.randomRange(30, 100), Array_data_util.randomRange(40, 120));
-
-var v = Belt_Array.zip(u, u);
-
-var xx = Belt_HashMap.fromArray(v, Y);
-
-eqx("File \"bs_hashmap_test.res\", line 41, characters 6-13", xx.size, 91);
-
-eqx("File \"bs_hashmap_test.res\", line 42, characters 6-13", Belt_SortArray.stableSortBy(Belt_HashMap.keysToArray(xx), cmp), Array_data_util.range(30, 120));
-
-var u$1 = Belt_Array.concat(Array_data_util.randomRange(0, 100000), Array_data_util.randomRange(0, 100));
-
-var v$1 = Belt_internalBucketsType.make(Y.hash, Y.eq, 40);
-
-Belt_HashMap.mergeMany(v$1, Belt_Array.zip(u$1, u$1));
-
-eqx("File \"bs_hashmap_test.res\", line 49, characters 6-13", v$1.size, 100001);
-
-for(var i = 0; i <= 1000; ++i){
-  Belt_HashMap.remove(v$1, i);
-}
-
-eqx("File \"bs_hashmap_test.res\", line 53, characters 6-13", v$1.size, 99000);
-
-for(var i$1 = 0; i$1 <= 2000; ++i$1){
-  Belt_HashMap.remove(v$1, i$1);
-}
-
-eqx("File \"bs_hashmap_test.res\", line 57, characters 6-13", v$1.size, 98000);
-
-b("File \"bs_hashmap_test.res\", line 58, characters 4-11", Belt_Array.every(Array_data_util.range(2001, 100000), (function (x) {
-            return Belt_HashMap.has(v$1, x);
-          })));
-
-Mt.from_pair_suites("Bs_hashmap_test", suites.contents);
-
-var N;
-
-var S;
-
-var I;
-
-var $plus$plus = Belt_Array.concat;
-
-var A;
-
-var So;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eqx = eqx;
-exports.b = b;
-exports.N = N;
-exports.S = S;
-exports.eq = eq;
-exports.hash = hash;
-exports.cmp = cmp;
-exports.Y = Y;
-exports.empty = empty;
-exports.I = I;
-exports.$plus$plus = $plus$plus;
-exports.add = add;
-exports.A = A;
-exports.So = So;
-/* Y Not a pure module */
diff --git a/jscomp/test/bs_hashmap_test.res b/jscomp/test/bs_hashmap_test.res
deleted file mode 100644
index d525565..0000000
--- a/jscomp/test/bs_hashmap_test.res
+++ /dev/null
@@ -1,61 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eqx = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-module N = Belt.HashMap
-module S = Belt.Map.Int
-/* module Y = struct  
-   type t = int 
-
-   end */
-let eq = (x: int, y) => x == y
-let hash = (x: int) => Hashtbl.hash(x)
-let cmp = (x: int, y) => compare(x, y)
-module Y = unpack(Belt.Id.hashable(~eq, ~hash))
-let empty: N.t<int, int, _> = N.make(~id=module(Y), ~hintSize=30)
-
-/*
-[%bs.hash {
-  eq : 
-  hash : 
-}]
-*/
-
-module I = Array_data_util
-let \"++" = Belt.Array.concat
-let add = \"+"
-
-let () = {
-  N.mergeMany(empty, [(1, 1), (2, 3), (3, 3), (2, 2)])
-  eqx(__LOC__, N.get(empty, 2), Some(2))
-  eqx(__LOC__, N.size(empty), 3)
-}
-
-module A = Belt.Array
-module So = Belt.SortArray
-
-let () = {
-  let u = \"++"(I.randomRange(30, 100), I.randomRange(40, 120))
-  let v = A.zip(u, u)
-  let xx = N.fromArray(~id=module(Y), v)
-  eqx(__LOC__, N.size(xx), 91)
-  eqx(__LOC__, So.stableSortBy(N.keysToArray(xx), cmp), I.range(30, 120))
-}
-
-let () = {
-  let u = \"++"(I.randomRange(0, 100_000), I.randomRange(0, 100))
-  let v = N.make(~id=module(Y), ~hintSize=40)
-  N.mergeMany(v, A.zip(u, u))
-  eqx(__LOC__, N.size(v), 100_001)
-  for i in 0 to 1_000 {
-    N.remove(v, i)
-  }
-  eqx(__LOC__, N.size(v), 99_000)
-  for i in 0 to 2_000 {
-    N.remove(v, i)
-  }
-  eqx(__LOC__, N.size(v), 98_000)
-  b(__LOC__, A.every(I.range(2_001, 100_000), x => N.has(v, x)))
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_hashset_int_test.js b/jscomp/test/bs_hashset_int_test.js
deleted file mode 100644
index f75660f..0000000
--- a/jscomp/test/bs_hashset_int_test.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_SetInt = require("../../lib/js/belt_SetInt.js");
-var Array_data_util = require("./array_data_util.js");
-var Belt_HashSetInt = require("../../lib/js/belt_HashSetInt.js");
-var Belt_SortArrayInt = require("../../lib/js/belt_SortArrayInt.js");
-var Belt_internalBucketsType = require("../../lib/js/belt_internalBucketsType.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function add(x, y) {
-  return x + y | 0;
-}
-
-function sum2(h) {
-  var v = {
-    contents: 0
-  };
-  Belt_HashSetInt.forEach(h, (function (x) {
-          v.contents = v.contents + x | 0;
-        }));
-  return v.contents;
-}
-
-var u = Belt_Array.concat(Array_data_util.randomRange(30, 100), Array_data_util.randomRange(40, 120));
-
-var v = Belt_HashSetInt.fromArray(u);
-
-eq("File \"bs_hashset_int_test.res\", line 20, characters 5-12", v.size, 91);
-
-var xs = Belt_SetInt.toArray(Belt_SetInt.fromArray(Belt_HashSetInt.toArray(v)));
-
-eq("File \"bs_hashset_int_test.res\", line 22, characters 5-12", xs, Array_data_util.range(30, 120));
-
-eq("File \"bs_hashset_int_test.res\", line 24, characters 5-12", Belt_HashSetInt.reduce(v, 0, add), 6825);
-
-eq("File \"bs_hashset_int_test.res\", line 25, characters 5-12", sum2(v), 6825);
-
-var u$1 = Belt_Array.concat(Array_data_util.randomRange(0, 100000), Array_data_util.randomRange(0, 100));
-
-var v$1 = Belt_internalBucketsType.make(undefined, undefined, 40);
-
-Belt_HashSetInt.mergeMany(v$1, u$1);
-
-eq("File \"bs_hashset_int_test.res\", line 32, characters 5-12", v$1.size, 100001);
-
-for(var i = 0; i <= 1000; ++i){
-  Belt_HashSetInt.remove(v$1, i);
-}
-
-eq("File \"bs_hashset_int_test.res\", line 36, characters 5-12", v$1.size, 99000);
-
-for(var i$1 = 0; i$1 <= 2000; ++i$1){
-  Belt_HashSetInt.remove(v$1, i$1);
-}
-
-eq("File \"bs_hashset_int_test.res\", line 40, characters 5-12", v$1.size, 98000);
-
-var u0 = Belt_HashSetInt.fromArray(Array_data_util.randomRange(0, 100000));
-
-var u1 = Belt_HashSetInt.copy(u0);
-
-eq("File \"bs_hashset_int_test.res\", line 49, characters 5-12", Belt_HashSetInt.toArray(u0), Belt_HashSetInt.toArray(u1));
-
-for(var i$2 = 0; i$2 <= 2000; ++i$2){
-  Belt_HashSetInt.remove(u1, i$2);
-}
-
-for(var i$3 = 0; i$3 <= 1000; ++i$3){
-  Belt_HashSetInt.remove(u0, i$3);
-}
-
-var v0 = Belt_Array.concat(Array_data_util.range(0, 1000), Belt_HashSetInt.toArray(u0));
-
-var v1 = Belt_Array.concat(Array_data_util.range(0, 2000), Belt_HashSetInt.toArray(u1));
-
-Belt_SortArrayInt.stableSortInPlace(v0);
-
-Belt_SortArrayInt.stableSortInPlace(v1);
-
-eq("File \"bs_hashset_int_test.res\", line 60, characters 5-12", v0, v1);
-
-var h = Belt_HashSetInt.fromArray(Array_data_util.randomRange(0, 1000000));
-
-var histo = Belt_HashSetInt.getBucketHistogram(h);
-
-b("File \"bs_hashset_int_test.res\", line 66, characters 4-11", histo.length <= 10);
-
-Mt.from_pair_suites("Bs_hashset_int_test", suites.contents);
-
-var N;
-
-var S;
-
-var I;
-
-var $plus$plus = Belt_Array.concat;
-
-var A;
-
-var SI;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.N = N;
-exports.S = S;
-exports.I = I;
-exports.$plus$plus = $plus$plus;
-exports.add = add;
-exports.sum2 = sum2;
-exports.A = A;
-exports.SI = SI;
-/* u Not a pure module */
diff --git a/jscomp/test/bs_hashset_int_test.res b/jscomp/test/bs_hashset_int_test.res
deleted file mode 100644
index ff89644..0000000
--- a/jscomp/test/bs_hashset_int_test.res
+++ /dev/null
@@ -1,68 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-module N = Belt.HashSet.Int
-module S = Belt.Set.Int
-
-module I = Array_data_util
-let \"++" = Belt.Array.concat
-let add = (x, y) => x + y
-
-let sum2 = h => {
-  let v = ref(0)
-  N.forEach(h, x => v := v.contents + x)
-  v.contents
-}
-let () = {
-  let u = \"++"(I.randomRange(30, 100), I.randomRange(40, 120))
-  let v = N.fromArray(u)
-  eq(__LOC__, N.size(v), 91)
-  let xs = S.toArray(S.fromArray(N.toArray(v)))
-  eq(__LOC__, xs, I.range(30, 120))
-  let x = (30 + 120) / 2 * 91
-  eq(__LOC__, N.reduce(v, 0, add), x)
-  eq(__LOC__, sum2(v), x)
-}
-
-let () = {
-  let u = \"++"(I.randomRange(0, 100_000), I.randomRange(0, 100))
-  let v = N.make(~hintSize=40)
-  N.mergeMany(v, u)
-  eq(__LOC__, N.size(v), 100_001)
-  for i in 0 to 1_000 {
-    N.remove(v, i)
-  }
-  eq(__LOC__, N.size(v), 99_000)
-  for i in 0 to 2_000 {
-    N.remove(v, i)
-  }
-  eq(__LOC__, N.size(v), 98_000)
-}
-module A = Belt.Array
-
-module SI = Belt.SortArray.Int
-
-let () = {
-  let u0 = N.fromArray(I.randomRange(0, 100_000))
-  let u1 = N.copy(u0)
-  eq(__LOC__, N.toArray(u0), N.toArray(u1))
-  for i in 0 to 2000 {
-    N.remove(u1, i)
-  }
-  for i in 0 to 1000 {
-    N.remove(u0, i)
-  }
-  let v0 = A.concat(I.range(0, 1000), N.toArray(u0))
-  let v1 = A.concat(I.range(0, 2000), N.toArray(u1))
-  SI.stableSortInPlace(v0)
-  SI.stableSortInPlace(v1)
-  eq(__LOC__, v0, v1)
-}
-
-let () = {
-  let h = N.fromArray(I.randomRange(0, 1_000_000))
-  let histo = N.getBucketHistogram(h)
-  b(__LOC__, A.length(histo) <= 10)
-}
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_hashtbl_string_test.js b/jscomp/test/bs_hashtbl_string_test.js
deleted file mode 100644
index f747ef5..0000000
--- a/jscomp/test/bs_hashtbl_string_test.js
+++ /dev/null
@@ -1,346 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var Belt_Id = require("../../lib/js/belt_Id.js");
-var Hashtbl = require("../../lib/js/hashtbl.js");
-var Belt_HashMap = require("../../lib/js/belt_HashMap.js");
-var Belt_MapDict = require("../../lib/js/belt_MapDict.js");
-var Belt_HashMapInt = require("../../lib/js/belt_HashMapInt.js");
-var Belt_HashSetInt = require("../../lib/js/belt_HashSetInt.js");
-var Belt_HashMapString = require("../../lib/js/belt_HashMapString.js");
-var Caml_hash_primitive = require("../../lib/js/caml_hash_primitive.js");
-var Belt_internalBucketsType = require("../../lib/js/belt_internalBucketsType.js");
-
-function hash_string(s) {
-  return Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, s));
-}
-
-var hashString = (function(str){ 
-                                              var hash = 5381,
-                                              i    = str.length | 0;
-
-                                              while(i !== 0) {
-                                              hash = (hash * 33) ^ str.charCodeAt(--i);
-                                              }
-                                              return hash});
-
-var $$String = Belt_Id.hashable(Hashtbl.hash, (function (x, y) {
-        return x === y;
-      }));
-
-var String1 = Belt_Id.hashable(hashString, (function (x, y) {
-        return x === y;
-      }));
-
-var String2 = Belt_Id.hashable((function (x) {
-        return Caml_hash_primitive.hash_final_mix(Caml_hash_primitive.hash_mix_string(0, x));
-      }), (function (x, y) {
-        return x === y;
-      }));
-
-var Int = Belt_Id.hashable(Hashtbl.hash, (function (x, y) {
-        return x === y;
-      }));
-
-var empty = Belt_internalBucketsType.make(Int.hash, Int.eq, 500000);
-
-function bench(param) {
-  for(var i = 0; i <= 1000000; ++i){
-    Belt_HashMap.set(empty, i, i);
-  }
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    if (!Belt_HashMap.has(empty, i$1)) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              37,
-              4
-            ],
-            Error: new Error()
-          };
-    }
-    
-  }
-  Belt_HashMap.logStats(empty);
-}
-
-function bench2(m) {
-  var empty = Belt_internalBucketsType.make(m.hash, m.eq, 1000000);
-  for(var i = 0; i <= 1000000; ++i){
-    Belt_HashMap.set(empty, String(i), i);
-  }
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    if (!Belt_HashMap.has(empty, String(i$1))) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              61,
-              4
-            ],
-            Error: new Error()
-          };
-    }
-    
-  }
-  for(var i$2 = 0; i$2 <= 1000000; ++i$2){
-    Belt_HashMap.remove(empty, String(i$2));
-  }
-  if (empty.size === 0) {
-    return ;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          66,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function bench3(m) {
-  var empty_cmp = m.cmp;
-  var cmp = m.cmp;
-  var table = undefined;
-  for(var i = 0; i <= 1000000; ++i){
-    table = Belt_MapDict.set(table, String(i), i, cmp);
-  }
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    if (!Belt_MapDict.has(table, String(i$1), cmp)) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              81,
-              4
-            ],
-            Error: new Error()
-          };
-    }
-    
-  }
-  for(var i$2 = 0; i$2 <= 1000000; ++i$2){
-    table = Belt_MapDict.remove(table, String(i$2), cmp);
-  }
-  if (Belt_MapDict.size(table) === 0) {
-    return ;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          86,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var Sx = Belt_Id.comparable(Caml.string_compare);
-
-function bench4(param) {
-  var table = Belt_internalBucketsType.make(undefined, undefined, 1000000);
-  for(var i = 0; i <= 1000000; ++i){
-    Belt_HashMapString.set(table, String(i), i);
-  }
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    if (!Belt_HashMapString.has(table, String(i$1))) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              98,
-              4
-            ],
-            Error: new Error()
-          };
-    }
-    
-  }
-  for(var i$2 = 0; i$2 <= 1000000; ++i$2){
-    Belt_HashMapString.remove(table, String(i$2));
-  }
-  if (Belt_HashMapString.isEmpty(table)) {
-    return ;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          103,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function bench5(param) {
-  var table = Belt_internalBucketsType.make(Int.hash, Int.eq, 1000000);
-  console.time("bs_hashtbl_string_test.res 112");
-  for(var i = 0; i <= 1000000; ++i){
-    Belt_HashMap.set(table, i, i);
-  }
-  console.timeEnd("bs_hashtbl_string_test.res 112");
-  console.time("bs_hashtbl_string_test.res 117");
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    if (!Belt_HashMap.has(table, i$1)) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              119,
-              6
-            ],
-            Error: new Error()
-          };
-    }
-    
-  }
-  console.timeEnd("bs_hashtbl_string_test.res 117");
-  console.time("bs_hashtbl_string_test.res 122");
-  for(var i$2 = 0; i$2 <= 1000000; ++i$2){
-    Belt_HashMap.remove(table, i$2);
-  }
-  console.timeEnd("bs_hashtbl_string_test.res 122");
-  if (Belt_HashMap.isEmpty(table)) {
-    return ;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          127,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function bench6(param) {
-  var table = Belt_internalBucketsType.make(undefined, undefined, 1000000);
-  for(var i = 0; i <= 1000000; ++i){
-    Belt_HashMapInt.set(table, i, i);
-  }
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    if (!Belt_HashMapInt.has(table, i$1)) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              138,
-              4
-            ],
-            Error: new Error()
-          };
-    }
-    
-  }
-  for(var i$2 = 0; i$2 <= 1000000; ++i$2){
-    Belt_HashMapInt.remove(table, i$2);
-  }
-  if (table.size === 0) {
-    return ;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          143,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function bench7(param) {
-  var table = Belt_internalBucketsType.make(undefined, undefined, 2000000);
-  for(var i = 0; i <= 1000000; ++i){
-    Belt_HashSetInt.add(table, i);
-  }
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    if (!Belt_HashSetInt.has(table, i$1)) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_hashtbl_string_test.res",
-              160,
-              4
-            ],
-            Error: new Error()
-          };
-    }
-    
-  }
-  for(var i$2 = 0; i$2 <= 1000000; ++i$2){
-    Belt_HashSetInt.remove(table, i$2);
-  }
-  if (table.size === 0) {
-    return ;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_hashtbl_string_test.res",
-          170,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-console.time("bs_hashtbl_string_test.res 181");
-
-bench7();
-
-console.timeEnd("bs_hashtbl_string_test.res 181");
-
-var N;
-
-var count = 1000000;
-
-var initial_size = 1000000;
-
-var M;
-
-var Md;
-
-var Md0;
-
-var H;
-
-var H0;
-
-var HI;
-
-var S;
-
-exports.hash_string = hash_string;
-exports.hashString = hashString;
-exports.$$String = $$String;
-exports.String1 = String1;
-exports.String2 = String2;
-exports.Int = Int;
-exports.N = N;
-exports.empty = empty;
-exports.bench = bench;
-exports.count = count;
-exports.initial_size = initial_size;
-exports.M = M;
-exports.bench2 = bench2;
-exports.Md = Md;
-exports.Md0 = Md0;
-exports.bench3 = bench3;
-exports.Sx = Sx;
-exports.H = H;
-exports.bench4 = bench4;
-exports.H0 = H0;
-exports.bench5 = bench5;
-exports.HI = HI;
-exports.bench6 = bench6;
-exports.S = S;
-exports.bench7 = bench7;
-/* String Not a pure module */
diff --git a/jscomp/test/bs_hashtbl_string_test.res b/jscomp/test/bs_hashtbl_string_test.res
deleted file mode 100644
index 052c81e..0000000
--- a/jscomp/test/bs_hashtbl_string_test.res
+++ /dev/null
@@ -1,186 +0,0 @@
-@@warning("-22")
-type seed = int
-external caml_hash_mix_string: (seed, string) => seed = "?hash_mix_string"
-external final_mix: seed => seed = "?hash_final_mix"
-
-let hash_string = s => final_mix(caml_hash_mix_string(0, s))
-
-let hashString: string => int = %raw(`function(str){ 
-                                              var hash = 5381,
-                                              i    = str.length | 0;
-
-                                              while(i !== 0) {
-                                              hash = (hash * 33) ^ str.charCodeAt(--i);
-                                              }
-                                              return hash}                                              
-                                            `)
-
-module String = unpack(Belt.Id.hashable(~eq=(x: string, y) => x == y, ~hash=Hashtbl.hash))
-
-module String1 = unpack(Belt.Id.hashable(~eq=(x: string, y) => x == y, ~hash=hashString))
-module String2 = unpack(
-  Belt.Id.hashable(~eq=(x: string, y) => x == y, ~hash=(x: string) => hash_string(x))
-)
-
-module Int = unpack(Belt.Id.hashable(~eq=(x: int, y) => x == y, ~hash=Hashtbl.hash))
-module N = Belt.HashMap
-let empty = N.make(~id=module(Int), ~hintSize=500_000)
-
-let bench = () => {
-  let count = 1_000_000
-  /* let add = N.setDone in */
-  let mem = N.has
-  for i in 0 to count {
-    N.set(empty, i, i)
-  }
-  for i in 0 to count {
-    assert(mem(empty, i))
-  }
-  N.logStats(empty)
-}
-
-let count = 1_000_000
-let initial_size = 1_000_000
-/* module B = Belt.Bag */
-/*
-    (empty : _ Belt.HashMap.t)
-    #.add (string_of_int i) i
-    #.add (string_of_int i) i
-*/
-module M = Belt.HashMap
-let bench2 = (type t, m: Belt.Id.hashable<string, t>) => {
-  let empty = M.make(~id=m, ~hintSize=initial_size)
-  module String = unpack(m)
-  /* let hash = String.hash in
-   let eq = String.eq in */
-  /* let table = M.getData empty in */
-  for i in 0 to count {
-    M.set(empty, string_of_int(i), i)
-  }
-  for i in 0 to count {
-    assert(M.has(empty, string_of_int(i)))
-  }
-  for i in 0 to count {
-    M.remove(empty, string_of_int(i))
-  }
-  assert (M.size(empty) == 0)
-}
-
-/* Belt.HashMap.logStats empty */
-module Md = Belt.Map
-module Md0 = Belt.Map.Dict
-let bench3 = (type t, m: Belt.Id.comparable<string, t>) => {
-  let empty = Md.make(~id=m)
-  module String = unpack(m)
-  let cmp = String.cmp
-  let table = ref(Md.getData(empty))
-  for i in 0 to count {
-    table := Md0.set(~cmp, table.contents, string_of_int(i), i)
-  }
-  for i in 0 to count {
-    assert(Md0.has(~cmp, table.contents, string_of_int(i)))
-  }
-  for i in 0 to count {
-    table := Md0.remove(~cmp, table.contents, string_of_int(i))
-  }
-  assert (Md0.size(table.contents) == 0)
-}
-
-module Sx = unpack(Belt.Id.comparable(~cmp=(x: string, y) => compare(x, y)))
-module H = Belt.HashMap.String
-let bench4 = () => {
-  let table = H.make(~hintSize=initial_size)
-
-  for i in 0 to count {
-    H.set(table, string_of_int(i), i)
-  }
-  for i in 0 to count {
-    assert(H.has(table, string_of_int(i)))
-  }
-  for i in 0 to count {
-    H.remove(table, string_of_int(i))
-  }
-  assert(H.isEmpty(table))
-}
-
-module H0 = Belt.HashMap
-let bench5 = () => {
-  let table = H0.make(~id=module(Int), ~hintSize=initial_size)
-  /* let table_data = M.getData table in */
-  /* let hash = Int.hash in
-   let eq = Int.eq in */
-  %time(
-    for i in 0 to count {
-      H0.set(table, i, i)
-    }
-  )
-  %time(
-    for i in 0 to count {
-      assert(H0.has(table, i))
-    }
-  )
-  %time(
-    for i in 0 to count {
-      H0.remove(table, i)
-    }
-  )
-  assert(H0.isEmpty(table))
-}
-
-module HI = Belt.HashMap.Int
-let bench6 = () => {
-  let table = HI.make(~hintSize=initial_size)
-
-  for i in 0 to count {
-    HI.set(table, i, i)
-  }
-  for i in 0 to count {
-    assert(HI.has(table, i))
-  }
-  for i in 0 to count {
-    HI.remove(table, i)
-  }
-  assert (HI.size(table) == 0)
-}
-
-module S = Belt.HashSet.Int
-let bench7 = () => {
-  let table = /* [%time */
-  S.make(~hintSize=initial_size * 2)
-  /* ] */
-
-  /* [%time */
-  for i in 0 to count {
-    S.add(table, i)
-  }
-  /* ] */
-
-  /* [%time */
-  for i in 0 to count {
-    assert(S.has(table, i))
-  }
-  /* ] */
-
-  /* [%time */
-  for i in 0 to count {
-    S.remove(table, i)
-  }
-  /* ] */
-
-  assert (S.size(table) == 0)
-}
-
-/* ;; [%time bench4 ()]
-   ;; [%time bench4 ()]
-   ;; [%time bench2 (module String1)]
-   ;; [%time bench2 (module String2)]
-
-   ;; [%time bench3 (module S)]
-   ;; [%time bench5()] */
-/* ;; [%time bench6 ()] */
-%time(bench7())
-/* ;; [%time bench7 ()]
-;; [%time bench7 ()]
-;; [%time bench7 ()]
-;; [%time bench7 ()]
-;; [%time bench7 ()] */
diff --git a/jscomp/test/bs_ignore_effect.js b/jscomp/test/bs_ignore_effect.js
deleted file mode 100644
index 7b2e939..0000000
--- a/jscomp/test/bs_ignore_effect.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function add(x,y){
-  return x + y
-}
-;
-
-var v = {
-  contents: 0
-};
-
-var h = (v.contents = v.contents + 1 | 0, {
-    hi: 2,
-    lo: 0
-  });
-
-var z = (v.contents = v.contents + 1 | 0, "Float", add(3.0, 2.0));
-
-eq("File \"bs_ignore_effect.res\", line 34, characters 5-12", v.contents, 2);
-
-eq("File \"bs_ignore_effect.res\", line 35, characters 5-12", z, 5.0);
-
-Mt.from_pair_suites("Bs_ignore_effect", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.v = v;
-exports.h = h;
-exports.z = z;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_ignore_effect.res b/jscomp/test/bs_ignore_effect.res
deleted file mode 100644
index f1ee985..0000000
--- a/jscomp/test/bs_ignore_effect.res
+++ /dev/null
@@ -1,38 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-%%raw(`
-function add(x,y){
-  return x + y
-}
-`)
-type rec kind<_> =
-  | Float: kind<float>
-  | String: kind<string>
-@val external add: (@ignore kind<'a>, 'a, 'a) => 'a = "add"
-
-let v = ref(0)
-
-@obj external config: (~hi: int, ~lo: int, unit) => _ = ""
-
-let h = config(~hi=2, ~lo=0, ignore(incr(v)))
-let z = add(
-  {
-    incr(v)
-    Float
-  },
-  3.0,
-  2.0,
-)
-
-let () = {
-  eq(__LOC__, v.contents, 2)
-  eq(__LOC__, z, 5.0)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_ignore_test.js b/jscomp/test/bs_ignore_test.js
deleted file mode 100644
index 91f0a7b..0000000
--- a/jscomp/test/bs_ignore_test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function add(x,y){
-  return x + y
-}
-;
-
-console.log(add(3.0, 2.0));
-
-console.log(add("x", "y"));
-
-function add_dyn(kind,x,y){
-  switch(kind){
-  case "string" : return x + y;
-  case "float" : return x + y;
-  }
-}
-;
-
-function string_of_kind(kind) {
-  if (kind === "Float") {
-    return "float";
-  } else {
-    return "string";
-  }
-}
-
-function add2(k, x, y) {
-  return add_dyn(string_of_kind(k), x, y);
-}
-
-console.log(add2("Float", 3.0, 2.0));
-
-console.log(add2("String", "x", "y"));
-
-exports.string_of_kind = string_of_kind;
-exports.add2 = add2;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_ignore_test.res b/jscomp/test/bs_ignore_test.res
deleted file mode 100644
index 7cf4c7c..0000000
--- a/jscomp/test/bs_ignore_test.res
+++ /dev/null
@@ -1,38 +0,0 @@
-%%raw(`
-function add(x,y){
-  return x + y
-}
-`)
-type rec kind<_> =
-  | Float: kind<float>
-  | String: kind<string>
-@val external add: (@ignore kind<'a>, 'a, 'a) => 'a = "add"
-
-let () = {
-  Js.log(add(Float, 3.0, 2.0))
-  Js.log(add(String, "x", "y"))
-}
-
-%%raw(`
-function add_dyn(kind,x,y){
-  switch(kind){
-  case "string" : return x + y;
-  case "float" : return x + y;
-  }
-}
-`)
-
-let string_of_kind = (type t, kind: kind<t>) =>
-  switch kind {
-  | Float => "float"
-  | String => "string"
-  }
-
-@val external add_dyn: (@ignore kind<'a>, string, 'a, 'a) => 'a = "add_dyn"
-
-let add2 = (k, x, y) => add_dyn(k, string_of_kind(k), x, y)
-
-let () = {
-  Js.log(add2(Float, 3.0, 2.0))
-  Js.log(add2(String, "x", "y"))
-}
diff --git a/jscomp/test/bs_int_test.js b/jscomp/test/bs_int_test.js
deleted file mode 100644
index 3f7a90d..0000000
--- a/jscomp/test/bs_int_test.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Belt_Int = require("../../lib/js/belt_Int.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function $$throw(loc, x) {
-  Mt.throw_suites(test_id, suites, loc, x);
-}
-
-function neq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Neq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"bs_int_test.res\", line 18, characters 5-12", 1, 1.0);
-
-eq("File \"bs_int_test.res\", line 19, characters 5-12", -1, -1.0);
-
-eq("File \"bs_int_test.res\", line 23, characters 5-12", 1, 1);
-
-eq("File \"bs_int_test.res\", line 24, characters 5-12", 1, 1);
-
-eq("File \"bs_int_test.res\", line 25, characters 5-12", 1, 1);
-
-eq("File \"bs_int_test.res\", line 26, characters 5-12", -1, -1);
-
-eq("File \"bs_int_test.res\", line 27, characters 5-12", -1, -1);
-
-eq("File \"bs_int_test.res\", line 28, characters 5-12", -1, -1);
-
-eq("File \"bs_int_test.res\", line 32, characters 5-12", Belt_Int.fromString("1"), 1);
-
-eq("File \"bs_int_test.res\", line 33, characters 5-12", Belt_Int.fromString("-1"), -1);
-
-eq("File \"bs_int_test.res\", line 34, characters 5-12", Belt_Int.fromString("1.7"), 1);
-
-eq("File \"bs_int_test.res\", line 35, characters 5-12", Belt_Int.fromString("-1.0"), -1);
-
-eq("File \"bs_int_test.res\", line 36, characters 5-12", Belt_Int.fromString("-1.5"), -1);
-
-eq("File \"bs_int_test.res\", line 37, characters 5-12", Belt_Int.fromString("-1.7"), -1);
-
-eq("File \"bs_int_test.res\", line 38, characters 5-12", Belt_Int.fromString("not an int"), undefined);
-
-eq("File \"bs_int_test.res\", line 42, characters 5-12", String(1), "1");
-
-eq("File \"bs_int_test.res\", line 43, characters 5-12", String(-1), "-1");
-
-eq("File \"bs_int_test.res\", line 48, characters 5-12", 5, 5);
-
-eq("File \"bs_int_test.res\", line 49, characters 5-12", -1, -1);
-
-eq("File \"bs_int_test.res\", line 50, characters 5-12", 6, 6);
-
-eq("File \"bs_int_test.res\", line 51, characters 5-12", 0, 0);
-
-Mt.from_pair_suites("File \"bs_int_test.res\", line 54, characters 20-27", suites.contents);
-
-var I;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.$$throw = $$throw;
-exports.neq = neq;
-exports.I = I;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_int_test.res b/jscomp/test/bs_int_test.res
deleted file mode 100644
index 58a9c45..0000000
--- a/jscomp/test/bs_int_test.res
+++ /dev/null
@@ -1,54 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(loc, x, y, ~test_id, ~suites)
-let b = (loc, x) => Mt.bool_suites(loc, x, ~test_id, ~suites)
-let throw = (loc, x) => Mt.throw_suites(~test_id, ~suites, loc, x)
-let neq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{
-      (loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Neq(x, y)),
-      ...suites.contents,
-    }
-}
-
-module I = Belt.Int
-
-let () = {
-  eq(__LOC__, I.toFloat(1), 1.0)
-  eq(__LOC__, I.toFloat(-1), -1.0)
-}
-
-let () = {
-  eq(__LOC__, I.fromFloat(1.0), 1)
-  eq(__LOC__, I.fromFloat(1.3), 1)
-  eq(__LOC__, I.fromFloat(1.7), 1)
-  eq(__LOC__, I.fromFloat(-1.0), -1)
-  eq(__LOC__, I.fromFloat(-1.5), -1)
-  eq(__LOC__, I.fromFloat(-1.7), -1)
-}
-
-let () = {
-  eq(__LOC__, I.fromString("1"), Some(1))
-  eq(__LOC__, I.fromString("-1"), Some(-1))
-  eq(__LOC__, I.fromString("1.7"), Some(1))
-  eq(__LOC__, I.fromString("-1.0"), Some(-1))
-  eq(__LOC__, I.fromString("-1.5"), Some(-1))
-  eq(__LOC__, I.fromString("-1.7"), Some(-1))
-  eq(__LOC__, I.fromString("not an int"), None)
-}
-
-let () = {
-  eq(__LOC__, I.toString(1), "1")
-  eq(__LOC__, I.toString(-1), "-1")
-}
-
-let () = {
-  open! I
-  eq(__LOC__, 2 + 3, 5)
-  eq(__LOC__, 2 - 3, -1)
-  eq(__LOC__, 2 * 3, 6)
-  eq(__LOC__, 2 / 3, 0)
-}
-
-Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/bs_list_test.js b/jscomp/test/bs_list_test.js
deleted file mode 100644
index 788934f..0000000
--- a/jscomp/test/bs_list_test.js
+++ /dev/null
@@ -1,2539 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Belt_List = require("../../lib/js/belt_List.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function $$throw(loc, x) {
-  Mt.throw_suites(test_id, suites, loc, x);
-}
-
-function sum(xs) {
-  var v = {
-    contents: 0
-  };
-  Belt_List.forEach(xs, (function (x) {
-          v.contents = v.contents + x | 0;
-        }));
-  return v.contents;
-}
-
-function sum2(xs, ys) {
-  var v = {
-    contents: 0
-  };
-  Belt_List.forEach2(xs, ys, (function (x, y) {
-          v.contents = (v.contents + x | 0) + y | 0;
-        }));
-  return v.contents;
-}
-
-var u = Belt_List.makeBy(5, (function (i) {
-        return Math.imul(i, i);
-      }));
-
-function f(i) {
-  eq("File \"bs_list_test.res\", line 27, characters 18-25", Belt_List.getExn(u, i), Math.imul(i, i));
-}
-
-for(var i = 0; i <= 4; ++i){
-  f(i);
-}
-
-eq("File \"bs_list_test.res\", line 31, characters 5-12", Belt_List.map(u, (function (i) {
-            return i + 1 | 0;
-          })), {
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 5,
-          tl: {
-            hd: 10,
-            tl: {
-              hd: 17,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    });
-
-eq("File \"bs_list_test.res\", line 32, characters 5-12", Belt_List.getBy({
-          hd: 1,
-          tl: {
-            hd: 4,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 2,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, (function (x) {
-            return x % 2 === 0;
-          })), 4);
-
-eq("File \"bs_list_test.res\", line 33, characters 5-12", Belt_List.getBy({
-          hd: 1,
-          tl: {
-            hd: 4,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 2,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, (function (x) {
-            return x % 5 === 0;
-          })), undefined);
-
-eq("FLATTEN", Belt_List.flatten({
-          hd: {
-            hd: 1,
-            tl: /* [] */0
-          },
-          tl: {
-            hd: {
-              hd: 2,
-              tl: /* [] */0
-            },
-            tl: {
-              hd: {
-                hd: 3,
-                tl: /* [] */0
-              },
-              tl: {
-                hd: /* [] */0,
-                tl: {
-                  hd: Belt_List.makeBy(4, (function (i) {
-                          return i;
-                        })),
-                  tl: /* [] */0
-                }
-              }
-            }
-          }
-        }), {
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: {
-            hd: 0,
-            tl: {
-              hd: 1,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: /* [] */0
-                }
-              }
-            }
-          }
-        }
-      }
-    });
-
-eq("FLATTEN", Belt_List.flatten(/* [] */0), /* [] */0);
-
-eq("FLATTEN", Belt_List.flatten({
-          hd: /* [] */0,
-          tl: {
-            hd: /* [] */0,
-            tl: {
-              hd: {
-                hd: 2,
-                tl: /* [] */0
-              },
-              tl: {
-                hd: {
-                  hd: 1,
-                  tl: /* [] */0
-                },
-                tl: {
-                  hd: {
-                    hd: 2,
-                    tl: /* [] */0
-                  },
-                  tl: {
-                    hd: /* [] */0,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }), {
-      hd: 2,
-      tl: {
-        hd: 1,
-        tl: {
-          hd: 2,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("CONCATMANY", Belt_List.concatMany([
-          {
-            hd: 1,
-            tl: /* [] */0
-          },
-          {
-            hd: 2,
-            tl: /* [] */0
-          },
-          {
-            hd: 3,
-            tl: /* [] */0
-          },
-          /* [] */0,
-          Belt_List.makeBy(4, (function (i) {
-                  return i;
-                }))
-        ]), {
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: {
-            hd: 0,
-            tl: {
-              hd: 1,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: /* [] */0
-                }
-              }
-            }
-          }
-        }
-      }
-    });
-
-eq("CONCATMANY", Belt_List.concatMany([]), /* [] */0);
-
-eq("CONCATMANY", Belt_List.concatMany([
-          /* [] */0,
-          /* [] */0,
-          {
-            hd: 2,
-            tl: /* [] */0
-          },
-          {
-            hd: 1,
-            tl: /* [] */0
-          },
-          {
-            hd: 2,
-            tl: /* [] */0
-          },
-          /* [] */0
-        ]), {
-      hd: 2,
-      tl: {
-        hd: 1,
-        tl: {
-          hd: 2,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("CONCATMANY", Belt_List.concatMany([
-          /* [] */0,
-          /* [] */0,
-          {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          },
-          {
-            hd: 1,
-            tl: /* [] */0
-          },
-          {
-            hd: 2,
-            tl: /* [] */0
-          },
-          /* [] */0
-        ]), {
-      hd: 2,
-      tl: {
-        hd: 3,
-        tl: {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-eq("CONCATMANY", Belt_List.concatMany([{
-            hd: 1,
-            tl: {
-              hd: 2,
-              tl: {
-                hd: 3,
-                tl: /* [] */0
-              }
-            }
-          }]), {
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("File \"bs_list_test.res\", line 66, characters 2-9", Belt_List.toArray(Belt_List.concat(Belt_List.makeBy(100, (function (i) {
-                    return i;
-                  })), Belt_List.makeBy(100, (function (i) {
-                    return i;
-                  })))), Belt_Array.concat(Belt_Array.makeBy(100, (function (i) {
-                return i;
-              })), Belt_Array.makeBy(100, (function (i) {
-                return i;
-              }))));
-
-eq("APPEND", Belt_List.concat({
-          hd: 1,
-          tl: /* [] */0
-        }, /* [] */0), {
-      hd: 1,
-      tl: /* [] */0
-    });
-
-eq("APPEND", Belt_List.concat(/* [] */0, {
-          hd: 1,
-          tl: /* [] */0
-        }), {
-      hd: 1,
-      tl: /* [] */0
-    });
-
-eq("ZIP", Belt_List.zip({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 3,
-          tl: {
-            hd: 4,
-            tl: /* [] */0
-          }
-        }), {
-      hd: [
-        1,
-        3
-      ],
-      tl: {
-        hd: [
-          2,
-          4
-        ],
-        tl: /* [] */0
-      }
-    });
-
-eq("ZIP", Belt_List.zip(/* [] */0, {
-          hd: 1,
-          tl: /* [] */0
-        }), /* [] */0);
-
-eq("ZIP", Belt_List.zip(/* [] */0, /* [] */0), /* [] */0);
-
-eq("ZIP", Belt_List.zip({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, /* [] */0), /* [] */0);
-
-eq("ZIP", Belt_List.zip({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          }
-        }), {
-      hd: [
-        1,
-        2
-      ],
-      tl: {
-        hd: [
-          2,
-          3
-        ],
-        tl: {
-          hd: [
-            3,
-            4
-          ],
-          tl: /* [] */0
-        }
-      }
-    });
-
-function mod2(x) {
-  return x % 2 === 0;
-}
-
-function evenIndex(_x, i) {
-  return i % 2 === 0;
-}
-
-eq("PARTITION", Belt_List.partition({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: {
-                    hd: 4,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }, mod2), [
-      {
-        hd: 2,
-        tl: {
-          hd: 2,
-          tl: {
-            hd: 4,
-            tl: /* [] */0
-          }
-        }
-      },
-      {
-        hd: 1,
-        tl: {
-          hd: 3,
-          tl: {
-            hd: 3,
-            tl: /* [] */0
-          }
-        }
-      }
-    ]);
-
-eq("PARTITION", Belt_List.partition({
-          hd: 2,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 2,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, mod2), [
-      {
-        hd: 2,
-        tl: {
-          hd: 2,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          }
-        }
-      },
-      /* [] */0
-    ]);
-
-eq("PARTITION", Belt_List.partition({
-          hd: 2,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 2,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, (function (x) {
-            return !mod2(x);
-          })), [
-      /* [] */0,
-      {
-        hd: 2,
-        tl: {
-          hd: 2,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    ]);
-
-eq("PARTITION", Belt_List.partition(/* [] */0, mod2), [
-      /* [] */0,
-      /* [] */0
-    ]);
-
-eq("UNZIP", Belt_List.unzip(/* [] */0), [
-      /* [] */0,
-      /* [] */0
-    ]);
-
-eq("UNZIP", Belt_List.unzip({
-          hd: [
-            1,
-            2
-          ],
-          tl: /* [] */0
-        }), [
-      {
-        hd: 1,
-        tl: /* [] */0
-      },
-      {
-        hd: 2,
-        tl: /* [] */0
-      }
-    ]);
-
-eq("UNZIP", Belt_List.unzip({
-          hd: [
-            1,
-            2
-          ],
-          tl: {
-            hd: [
-              3,
-              4
-            ],
-            tl: /* [] */0
-          }
-        }), [
-      {
-        hd: 1,
-        tl: {
-          hd: 3,
-          tl: /* [] */0
-        }
-      },
-      {
-        hd: 2,
-        tl: {
-          hd: 4,
-          tl: /* [] */0
-        }
-      }
-    ]);
-
-eq("FILTER", Belt_List.keep({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, mod2), {
-      hd: 2,
-      tl: {
-        hd: 4,
-        tl: /* [] */0
-      }
-    });
-
-eq("FILTER", Belt_List.keep({
-          hd: 1,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 41,
-              tl: /* [] */0
-            }
-          }
-        }, mod2), /* [] */0);
-
-eq("FILTER", Belt_List.keep(/* [] */0, mod2), /* [] */0);
-
-eq("FILTER", Belt_List.keep({
-          hd: 2,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 2,
-              tl: {
-                hd: 4,
-                tl: {
-                  hd: 6,
-                  tl: /* [] */0
-                }
-              }
-            }
-          }
-        }, mod2), {
-      hd: 2,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 2,
-          tl: {
-            hd: 4,
-            tl: {
-              hd: 6,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    });
-
-eq("FILTER2", Belt_List.keepWithIndex(/* [] */0, evenIndex), /* [] */0);
-
-eq("FILTER2", Belt_List.keepWithIndex({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, evenIndex), {
-      hd: 1,
-      tl: {
-        hd: 3,
-        tl: /* [] */0
-      }
-    });
-
-eq("FILTER2", Belt_List.keepWithIndex({
-          hd: 0,
-          tl: {
-            hd: 1,
-            tl: {
-              hd: 2,
-              tl: {
-                hd: 3,
-                tl: {
-                  hd: 4,
-                  tl: {
-                    hd: 5,
-                    tl: {
-                      hd: 6,
-                      tl: {
-                        hd: 7,
-                        tl: /* [] */0
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }, evenIndex), {
-      hd: 0,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 4,
-          tl: {
-            hd: 6,
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-function id(x) {
-  return x;
-}
-
-eq("MAP", Belt_List.map(Belt_List.makeBy(5, id), (function (x) {
-            return (x << 1);
-          })), {
-      hd: 0,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 4,
-          tl: {
-            hd: 6,
-            tl: {
-              hd: 8,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    });
-
-eq("MAP", Belt_List.map(/* [] */0, id), /* [] */0);
-
-eq("MAP", Belt_List.map({
-          hd: 1,
-          tl: /* [] */0
-        }, (function (x) {
-            return -x | 0;
-          })), {
-      hd: -1,
-      tl: /* [] */0
-    });
-
-function add(a, b) {
-  return a + b | 0;
-}
-
-var length_10_id = Belt_List.makeBy(10, id);
-
-var length_8_id = Belt_List.makeBy(8, id);
-
-var d = Belt_List.makeBy(10, (function (x) {
-        return (x << 1);
-      }));
-
-eq("MAP2", Belt_List.zipBy(length_10_id, length_10_id, add), d);
-
-eq("MAP2", Belt_List.zipBy(/* [] */0, {
-          hd: 1,
-          tl: /* [] */0
-        }, add), /* [] */0);
-
-eq("MAP2", Belt_List.zipBy({
-          hd: 1,
-          tl: /* [] */0
-        }, /* [] */0, add), /* [] */0);
-
-eq("MAP2", Belt_List.zipBy(/* [] */0, /* [] */0, add), /* [] */0);
-
-eq("MAP2", Belt_List.zipBy(length_10_id, length_10_id, add), Belt_List.concat(Belt_List.map(length_8_id, (function (x) {
-                return (x << 1);
-              })), {
-          hd: 16,
-          tl: {
-            hd: 18,
-            tl: /* [] */0
-          }
-        }));
-
-eq("MAP2", Belt_List.zipBy(length_10_id, length_8_id, add), Belt_List.mapWithIndex(length_8_id, (function (i, x) {
-            return i + x | 0;
-          })));
-
-eq("MAP2", Belt_List.reverse(Belt_List.mapReverse2(length_10_id, length_10_id, add)), Belt_List.map(length_10_id, (function (x) {
-            return (x << 1);
-          })));
-
-var xs = Belt_List.reverse(Belt_List.mapReverse2(length_8_id, length_10_id, add));
-
-eq("File \"bs_list_test.res\", line 163, characters 5-12", Belt_List.length(xs), 8);
-
-eq("MAP2", xs, Belt_List.zipBy(length_10_id, length_8_id, add));
-
-eq("MAP2", Belt_List.mapReverse2({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }, (function (x, y) {
-            return x + y | 0;
-          })), {
-      hd: 4,
-      tl: {
-        hd: 2,
-        tl: /* [] */0
-      }
-    });
-
-eq("TAKE", Belt_List.take({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, 2), {
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: /* [] */0
-      }
-    });
-
-eq("TAKE", Belt_List.take(/* [] */0, 1), undefined);
-
-eq("TAKE", Belt_List.take({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }, 3), undefined);
-
-eq("TAKE", Belt_List.take({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }, 2), {
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: /* [] */0
-      }
-    });
-
-eq("TAKE", Belt_List.take(length_10_id, 8), length_8_id);
-
-eq("TAKE", Belt_List.take(length_10_id, 0), /* [] */0);
-
-eq("TAKE", Belt_List.take(length_8_id, -2), undefined);
-
-eq("DROP", Belt_List.drop(length_10_id, 10), /* [] */0);
-
-eq("DROP", Belt_List.drop(length_10_id, 8), {
-      hd: 8,
-      tl: {
-        hd: 9,
-        tl: /* [] */0
-      }
-    });
-
-eq("DROP", Belt_List.drop(length_10_id, 0), length_10_id);
-
-eq("DROP", Belt_List.drop(length_8_id, -1), undefined);
-
-var a = Belt_List.makeBy(5, id);
-
-eq("SPLIT", Belt_List.splitAt(/* [] */0, 1), undefined);
-
-eq("SPLIT", Belt_List.splitAt(a, 6), undefined);
-
-eq("SPLIT", Belt_List.splitAt(a, 5), [
-      a,
-      /* [] */0
-    ]);
-
-eq("SPLIT", Belt_List.splitAt(a, 4), [
-      {
-        hd: 0,
-        tl: {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }
-      },
-      {
-        hd: 4,
-        tl: /* [] */0
-      }
-    ]);
-
-eq("SPLIT", Belt_List.splitAt(a, 3), [
-      {
-        hd: 0,
-        tl: {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }
-      },
-      {
-        hd: 3,
-        tl: {
-          hd: 4,
-          tl: /* [] */0
-        }
-      }
-    ]);
-
-eq("SPLIT", Belt_List.splitAt(a, 2), [
-      {
-        hd: 0,
-        tl: {
-          hd: 1,
-          tl: /* [] */0
-        }
-      },
-      {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: {
-            hd: 4,
-            tl: /* [] */0
-          }
-        }
-      }
-    ]);
-
-eq("SPLIT", Belt_List.splitAt(a, 1), [
-      {
-        hd: 0,
-        tl: /* [] */0
-      },
-      {
-        hd: 1,
-        tl: {
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    ]);
-
-eq("SPLIT", Belt_List.splitAt(a, 0), [
-      /* [] */0,
-      a
-    ]);
-
-eq("SPLIT", Belt_List.splitAt(a, -1), undefined);
-
-function succx(x) {
-  return x + 1 | 0;
-}
-
-function eqx(x, y) {
-  return x === y;
-}
-
-b("File \"bs_list_test.res\", line 205, characters 4-11", Belt_List.hasAssoc({
-          hd: [
-            1,
-            "1"
-          ],
-          tl: {
-            hd: [
-              2,
-              "2"
-            ],
-            tl: {
-              hd: [
-                3,
-                "3"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 2, (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_list_test.res\", line 206, characters 4-11", !Belt_List.hasAssoc({
-          hd: [
-            1,
-            "1"
-          ],
-          tl: {
-            hd: [
-              2,
-              "2"
-            ],
-            tl: {
-              hd: [
-                3,
-                "3"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 4, (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_list_test.res\", line 207, characters 4-11", Belt_List.hasAssoc({
-          hd: [
-            1,
-            "1"
-          ],
-          tl: {
-            hd: [
-              2,
-              "2"
-            ],
-            tl: {
-              hd: [
-                3,
-                "3"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 4, (function (x, y) {
-            return (x + 1 | 0) === y;
-          })));
-
-eq("REMOVEASSOQ", Belt_List.removeAssoc({
-          hd: [
-            1,
-            "1"
-          ],
-          tl: {
-            hd: [
-              2,
-              "2"
-            ],
-            tl: {
-              hd: [
-                3,
-                "3"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 3, (function (prim0, prim1) {
-            return prim0 === prim1;
-          })), {
-      hd: [
-        1,
-        "1"
-      ],
-      tl: {
-        hd: [
-          2,
-          "2"
-        ],
-        tl: /* [] */0
-      }
-    });
-
-eq("REMOVEASSOQ", Belt_List.removeAssoc({
-          hd: [
-            1,
-            "1"
-          ],
-          tl: {
-            hd: [
-              2,
-              "2"
-            ],
-            tl: {
-              hd: [
-                3,
-                "3"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 1, (function (prim0, prim1) {
-            return prim0 === prim1;
-          })), {
-      hd: [
-        2,
-        "2"
-      ],
-      tl: {
-        hd: [
-          3,
-          "3"
-        ],
-        tl: /* [] */0
-      }
-    });
-
-eq("REMOVEASSOQ", Belt_List.removeAssoc({
-          hd: [
-            1,
-            "1"
-          ],
-          tl: {
-            hd: [
-              2,
-              "2"
-            ],
-            tl: {
-              hd: [
-                3,
-                "3"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 2, (function (prim0, prim1) {
-            return prim0 === prim1;
-          })), {
-      hd: [
-        1,
-        "1"
-      ],
-      tl: {
-        hd: [
-          3,
-          "3"
-        ],
-        tl: /* [] */0
-      }
-    });
-
-eq("REMOVEASSOQ", Belt_List.removeAssoc({
-          hd: [
-            1,
-            "1"
-          ],
-          tl: {
-            hd: [
-              2,
-              "2"
-            ],
-            tl: {
-              hd: [
-                3,
-                "3"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 0, (function (prim0, prim1) {
-            return prim0 === prim1;
-          })), {
-      hd: [
-        1,
-        "1"
-      ],
-      tl: {
-        hd: [
-          2,
-          "2"
-        ],
-        tl: {
-          hd: [
-            3,
-            "3"
-          ],
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("REMOVEASSOQ", Belt_List.removeAssoc({
-          hd: [
-            1,
-            "1"
-          ],
-          tl: {
-            hd: [
-              2,
-              "2"
-            ],
-            tl: {
-              hd: [
-                3,
-                "3"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 3, eqx), {
-      hd: [
-        1,
-        "1"
-      ],
-      tl: {
-        hd: [
-          2,
-          "2"
-        ],
-        tl: /* [] */0
-      }
-    });
-
-eq("REMOVEASSOQ", Belt_List.removeAssoc({
-          hd: [
-            1,
-            "1"
-          ],
-          tl: {
-            hd: [
-              2,
-              "2"
-            ],
-            tl: {
-              hd: [
-                3,
-                "3"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 1, eqx), {
-      hd: [
-        2,
-        "2"
-      ],
-      tl: {
-        hd: [
-          3,
-          "3"
-        ],
-        tl: /* [] */0
-      }
-    });
-
-eq("REMOVEASSOQ", Belt_List.removeAssoc({
-          hd: [
-            1,
-            "1"
-          ],
-          tl: {
-            hd: [
-              2,
-              "2"
-            ],
-            tl: {
-              hd: [
-                3,
-                "3"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 2, eqx), {
-      hd: [
-        1,
-        "1"
-      ],
-      tl: {
-        hd: [
-          3,
-          "3"
-        ],
-        tl: /* [] */0
-      }
-    });
-
-eq("REMOVEASSOQ", Belt_List.removeAssoc(/* [] */0, 2, eqx), /* [] */0);
-
-var ll = {
-  hd: [
-    1,
-    "1"
-  ],
-  tl: {
-    hd: [
-      2,
-      "2"
-    ],
-    tl: {
-      hd: [
-        3,
-        "3"
-      ],
-      tl: /* [] */0
-    }
-  }
-};
-
-var ll0 = Belt_List.removeAssoc(ll, 0, eqx);
-
-b("File \"bs_list_test.res\", line 222, characters 4-11", ll === ll0);
-
-var ll1 = Belt_List.setAssoc(ll, 2, "22", (function (prim0, prim1) {
-        return prim0 === prim1;
-      }));
-
-eq("File \"bs_list_test.res\", line 224, characters 5-12", ll1, {
-      hd: [
-        1,
-        "1"
-      ],
-      tl: {
-        hd: [
-          2,
-          "22"
-        ],
-        tl: {
-          hd: [
-            3,
-            "3"
-          ],
-          tl: /* [] */0
-        }
-      }
-    });
-
-var ll2 = Belt_List.setAssoc(ll1, 22, "2", (function (prim0, prim1) {
-        return prim0 === prim1;
-      }));
-
-b("File \"bs_list_test.res\", line 226, characters 4-11", Caml_obj.equal(ll2, {
-          hd: [
-            22,
-            "2"
-          ],
-          tl: ll1
-        }));
-
-b("File \"bs_list_test.res\", line 227, characters 4-11", Belt_List.tailExn(ll2) === ll1);
-
-b("File \"bs_list_test.res\", line 229, characters 4-11", Caml_obj.equal(Belt_List.setAssoc({
-              hd: [
-                1,
-                "a"
-              ],
-              tl: {
-                hd: [
-                  2,
-                  "b"
-                ],
-                tl: {
-                  hd: [
-                    3,
-                    "c"
-                  ],
-                  tl: /* [] */0
-                }
-              }
-            }, 2, "x", (function (prim0, prim1) {
-                return prim0 === prim1;
-              })), {
-          hd: [
-            1,
-            "a"
-          ],
-          tl: {
-            hd: [
-              2,
-              "x"
-            ],
-            tl: {
-              hd: [
-                3,
-                "c"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }));
-
-b("File \"bs_list_test.res\", line 234, characters 4-11", Caml_obj.equal(Belt_List.setAssoc({
-              hd: [
-                1,
-                "a"
-              ],
-              tl: {
-                hd: [
-                  3,
-                  "c"
-                ],
-                tl: /* [] */0
-              }
-            }, 2, "2", (function (prim0, prim1) {
-                return prim0 === prim1;
-              })), {
-          hd: [
-            2,
-            "2"
-          ],
-          tl: {
-            hd: [
-              1,
-              "a"
-            ],
-            tl: {
-              hd: [
-                3,
-                "c"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }));
-
-eq("File \"bs_list_test.res\", line 237, characters 5-12", Belt_List.setAssoc(/* [] */0, 1, "1", (function (prim0, prim1) {
-            return prim0 === prim1;
-          })), {
-      hd: [
-        1,
-        "1"
-      ],
-      tl: /* [] */0
-    });
-
-debugger;
-
-eq("File \"bs_list_test.res\", line 239, characters 5-12", Belt_List.setAssoc({
-          hd: [
-            1,
-            "2"
-          ],
-          tl: /* [] */0
-        }, 1, "1", (function (prim0, prim1) {
-            return prim0 === prim1;
-          })), {
-      hd: [
-        1,
-        "1"
-      ],
-      tl: /* [] */0
-    });
-
-eq("File \"bs_list_test.res\", line 241, characters 5-12", Belt_List.setAssoc({
-          hd: [
-            0,
-            "0"
-          ],
-          tl: {
-            hd: [
-              1,
-              "2"
-            ],
-            tl: /* [] */0
-          }
-        }, 1, "1", (function (prim0, prim1) {
-            return prim0 === prim1;
-          })), {
-      hd: [
-        0,
-        "0"
-      ],
-      tl: {
-        hd: [
-          1,
-          "1"
-        ],
-        tl: /* [] */0
-      }
-    });
-
-b("File \"bs_list_test.res\", line 242, characters 4-11", Caml_obj.equal(Belt_List.getAssoc({
-              hd: [
-                1,
-                "a"
-              ],
-              tl: {
-                hd: [
-                  2,
-                  "b"
-                ],
-                tl: {
-                  hd: [
-                    3,
-                    "c"
-                  ],
-                  tl: /* [] */0
-                }
-              }
-            }, 2, (function (prim0, prim1) {
-                return prim0 === prim1;
-              })), "b"));
-
-b("File \"bs_list_test.res\", line 243, characters 4-11", Belt_List.getAssoc({
-          hd: [
-            1,
-            "a"
-          ],
-          tl: {
-            hd: [
-              2,
-              "b"
-            ],
-            tl: {
-              hd: [
-                3,
-                "c"
-              ],
-              tl: /* [] */0
-            }
-          }
-        }, 4, (function (prim0, prim1) {
-            return prim0 === prim1;
-          })) === undefined);
-
-eq("File \"bs_list_test.res\", line 248, characters 4-11", [
-      Belt_List.head(length_10_id),
-      Belt_List.tail(length_10_id)
-    ], [
-      0,
-      Belt_List.drop(length_10_id, 1)
-    ]);
-
-eq("File \"bs_list_test.res\", line 255, characters 5-12", Belt_List.head(/* [] */0), undefined);
-
-$$throw("File \"bs_list_test.res\", line 256, characters 8-15", (function (param) {
-        Belt_List.headExn(/* [] */0);
-      }));
-
-$$throw("File \"bs_list_test.res\", line 257, characters 8-15", (function (param) {
-        Belt_List.tailExn(/* [] */0);
-      }));
-
-$$throw("File \"bs_list_test.res\", line 258, characters 8-15", (function (param) {
-        Belt_List.getExn({
-              hd: 0,
-              tl: {
-                hd: 1,
-                tl: /* [] */0
-              }
-            }, -1);
-      }));
-
-$$throw("File \"bs_list_test.res\", line 259, characters 8-15", (function (param) {
-        Belt_List.getExn({
-              hd: 0,
-              tl: {
-                hd: 1,
-                tl: /* [] */0
-              }
-            }, 2);
-      }));
-
-eq("File \"bs_list_test.res\", line 260, characters 5-12", Belt_List.map({
-          hd: 0,
-          tl: {
-            hd: 1,
-            tl: /* [] */0
-          }
-        }, (function (i) {
-            return Belt_List.getExn({
-                        hd: 0,
-                        tl: {
-                          hd: 1,
-                          tl: /* [] */0
-                        }
-                      }, i);
-          })), {
-      hd: 0,
-      tl: {
-        hd: 1,
-        tl: /* [] */0
-      }
-    });
-
-eq("File \"bs_list_test.res\", line 261, characters 5-12", Belt_List.headExn({
-          hd: 1,
-          tl: /* [] */0
-        }), 1);
-
-eq("File \"bs_list_test.res\", line 262, characters 5-12", Belt_List.tailExn({
-          hd: 1,
-          tl: /* [] */0
-        }), /* [] */0);
-
-Belt_List.forEachWithIndex(length_10_id, (function (i, x) {
-        eq("File \"bs_list_test.res\", line 263, characters 48-55", Belt_List.get(length_10_id, i), x);
-      }));
-
-eq("File \"bs_list_test.res\", line 264, characters 5-12", Belt_List.tail(/* [] */0), undefined);
-
-eq("File \"bs_list_test.res\", line 265, characters 5-12", Belt_List.drop(/* [] */0, 3), undefined);
-
-eq("File \"bs_list_test.res\", line 266, characters 5-12", Belt_List.mapWithIndex(/* [] */0, (function (i, x) {
-            return i + x | 0;
-          })), /* [] */0);
-
-eq("File \"bs_list_test.res\", line 267, characters 5-12", Belt_List.get(length_10_id, -1), undefined);
-
-eq("File \"bs_list_test.res\", line 268, characters 5-12", Belt_List.get(length_10_id, 12), undefined);
-
-eq("File \"bs_list_test.res\", line 269, characters 5-12", sum(/* [] */0), 0);
-
-eq("File \"bs_list_test.res\", line 270, characters 5-12", sum(length_10_id), 45);
-
-eq("File \"bs_list_test.res\", line 271, characters 5-12", Belt_List.makeBy(0, id), /* [] */0);
-
-eq("File \"bs_list_test.res\", line 273, characters 4-11", Belt_List.reverse(Belt_List.reverse(length_10_id)), length_10_id);
-
-eq("File \"bs_list_test.res\", line 281, characters 4-11", Belt_List.reverse(Belt_List.reverse(length_8_id)), length_8_id);
-
-eq("File \"bs_list_test.res\", line 288, characters 5-12", Belt_List.reverse(/* [] */0), /* [] */0);
-
-eq("File \"bs_list_test.res\", line 289, characters 5-12", Belt_List.reverse(Belt_List.mapReverse(length_10_id, succx)), Belt_List.map(length_10_id, succx));
-
-eq("File \"bs_list_test.res\", line 290, characters 5-12", Belt_List.reduce(length_10_id, 0, add), 45);
-
-eq("File \"bs_list_test.res\", line 291, characters 5-12", Belt_List.reduceReverse(length_10_id, 0, add), 45);
-
-eq("File \"bs_list_test.res\", line 292, characters 5-12", Belt_List.reduceReverse(Belt_List.makeBy(10000, (function (i) {
-                return i;
-              })), 0, (function (prim0, prim1) {
-            return prim0 + prim1 | 0;
-          })), 49995000);
-
-eq("File \"bs_list_test.res\", line 295, characters 5-12", sum2(length_10_id, length_10_id), 90);
-
-eq("File \"bs_list_test.res\", line 296, characters 5-12", sum2(length_8_id, length_10_id), 56);
-
-eq("File \"bs_list_test.res\", line 297, characters 5-12", sum2(length_10_id, length_8_id), 56);
-
-eq("File \"bs_list_test.res\", line 298, characters 5-12", Belt_List.reduce2(length_10_id, length_8_id, 0, (function (acc, x, y) {
-            return (acc + x | 0) + y | 0;
-          })), 56);
-
-eq("File \"bs_list_test.res\", line 299, characters 5-12", Belt_List.reduce2({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 2,
-          tl: {
-            hd: 4,
-            tl: {
-              hd: 6,
-              tl: /* [] */0
-            }
-          }
-        }, 0, (function (a, b, c) {
-            return (a + b | 0) + c | 0;
-          })), 18);
-
-eq("File \"bs_list_test.res\", line 300, characters 5-12", Belt_List.reduceReverse2(length_10_id, length_8_id, 0, (function (acc, x, y) {
-            return (acc + x | 0) + y | 0;
-          })), 56);
-
-eq("File \"bs_list_test.res\", line 301, characters 5-12", Belt_List.reduceReverse2(length_10_id, length_10_id, 0, (function (acc, x, y) {
-            return (acc + x | 0) + y | 0;
-          })), 90);
-
-eq("File \"bs_list_test.res\", line 302, characters 5-12", Belt_List.reduceReverse2({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }, 0, (function (acc, x, y) {
-            return (acc + x | 0) + y | 0;
-          })), 6);
-
-eq("File \"bs_list_test.res\", line 303, characters 5-12", Belt_List.every({
-          hd: 2,
-          tl: {
-            hd: 4,
-            tl: {
-              hd: 6,
-              tl: /* [] */0
-            }
-          }
-        }, mod2), true);
-
-eq("File \"bs_list_test.res\", line 304, characters 5-12", Belt_List.every({
-          hd: 1,
-          tl: /* [] */0
-        }, mod2), false);
-
-eq("File \"bs_list_test.res\", line 305, characters 5-12", Belt_List.every(/* [] */0, mod2), true);
-
-eq("File \"bs_list_test.res\", line 306, characters 5-12", Belt_List.some({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 5,
-              tl: /* [] */0
-            }
-          }
-        }, mod2), true);
-
-eq("File \"bs_list_test.res\", line 307, characters 5-12", Belt_List.some({
-          hd: 1,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 5,
-              tl: /* [] */0
-            }
-          }
-        }, mod2), false);
-
-eq("File \"bs_list_test.res\", line 308, characters 5-12", Belt_List.some(/* [] */0, mod2), false);
-
-eq("File \"bs_list_test.res\", line 309, characters 5-12", Belt_List.has({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, "2", (function (x, s) {
-            return String(x) === s;
-          })), true);
-
-eq("File \"bs_list_test.res\", line 310, characters 5-12", Belt_List.has({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, "0", (function (x, s) {
-            return String(x) === s;
-          })), false);
-
-b("File \"bs_list_test.res\", line 312, characters 4-11", Belt_List.reduceReverse({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, 0, (function (prim0, prim1) {
-            return prim0 + prim1 | 0;
-          })) === 10);
-
-b("File \"bs_list_test.res\", line 313, characters 4-11", Belt_List.reduceReverse({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, 10, (function (prim0, prim1) {
-            return prim0 - prim1 | 0;
-          })) === 0);
-
-b("File \"bs_list_test.res\", line 314, characters 4-11", Caml_obj.equal(Belt_List.reduceReverse({
-              hd: 1,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: {
-                    hd: 4,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }, /* [] */0, Belt_List.add), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }));
-
-b("File \"bs_list_test.res\", line 315, characters 4-11", Belt_List.reduce({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, 0, (function (prim0, prim1) {
-            return prim0 + prim1 | 0;
-          })) === 10);
-
-b("File \"bs_list_test.res\", line 316, characters 4-11", Belt_List.reduce({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, 10, (function (prim0, prim1) {
-            return prim0 - prim1 | 0;
-          })) === 0);
-
-b("File \"bs_list_test.res\", line 317, characters 4-11", Caml_obj.equal(Belt_List.reduce({
-              hd: 1,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: {
-                    hd: 4,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }, /* [] */0, Belt_List.add), {
-          hd: 4,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 2,
-              tl: {
-                hd: 1,
-                tl: /* [] */0
-              }
-            }
-          }
-        }));
-
-b("File \"bs_list_test.res\", line 318, characters 4-11", Belt_List.reduceWithIndex({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, 0, (function (acc, x, i) {
-            return (acc + x | 0) + i | 0;
-          })) === 16);
-
-b("File \"bs_list_test.res\", line 319, characters 4-11", Belt_List.reduceReverse2({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }, 0, (function (acc, x, y) {
-            return (acc + x | 0) + y | 0;
-          })) === 6);
-
-var a$1 = Belt_List.makeBy(10000, (function (i) {
-        return i;
-      }));
-
-b("File \"bs_list_test.res\", line 322, characters 4-11", Belt_List.reduceReverse2(a$1, {
-          hd: 0,
-          tl: a$1
-        }, 0, (function (acc, x, y) {
-            return (acc + x | 0) + y | 0;
-          })) === 99980001);
-
-eq("File \"bs_list_test.res\", line 328, characters 5-12", Belt_List.every2(/* [] */0, {
-          hd: 1,
-          tl: /* [] */0
-        }, (function (x, y) {
-            return x > y;
-          })), true);
-
-eq("File \"bs_list_test.res\", line 329, characters 5-12", Belt_List.every2({
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: /* [] */0
-          }
-        }, {
-          hd: 1,
-          tl: /* [] */0
-        }, (function (x, y) {
-            return x > y;
-          })), true);
-
-eq("File \"bs_list_test.res\", line 330, characters 5-12", Belt_List.every2({
-          hd: 2,
-          tl: /* [] */0
-        }, {
-          hd: 1,
-          tl: /* [] */0
-        }, (function (x, y) {
-            return x > y;
-          })), true);
-
-eq("File \"bs_list_test.res\", line 331, characters 5-12", Belt_List.every2({
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: /* [] */0
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 4,
-            tl: /* [] */0
-          }
-        }, (function (x, y) {
-            return x > y;
-          })), false);
-
-eq("File \"bs_list_test.res\", line 332, characters 5-12", Belt_List.every2({
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: /* [] */0
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 0,
-            tl: /* [] */0
-          }
-        }, (function (x, y) {
-            return x > y;
-          })), true);
-
-eq("File \"bs_list_test.res\", line 333, characters 5-12", Belt_List.some2(/* [] */0, {
-          hd: 1,
-          tl: /* [] */0
-        }, (function (x, y) {
-            return x > y;
-          })), false);
-
-eq("File \"bs_list_test.res\", line 334, characters 5-12", Belt_List.some2({
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: /* [] */0
-          }
-        }, {
-          hd: 1,
-          tl: /* [] */0
-        }, (function (x, y) {
-            return x > y;
-          })), true);
-
-eq("File \"bs_list_test.res\", line 335, characters 5-12", Belt_List.some2({
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: /* [] */0
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 4,
-            tl: /* [] */0
-          }
-        }, (function (x, y) {
-            return x > y;
-          })), true);
-
-eq("File \"bs_list_test.res\", line 336, characters 5-12", Belt_List.some2({
-          hd: 0,
-          tl: {
-            hd: 3,
-            tl: /* [] */0
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 4,
-            tl: /* [] */0
-          }
-        }, (function (x, y) {
-            return x > y;
-          })), false);
-
-eq("File \"bs_list_test.res\", line 337, characters 5-12", Belt_List.some2({
-          hd: 0,
-          tl: {
-            hd: 3,
-            tl: /* [] */0
-          }
-        }, {
-          hd: 3,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }, (function (x, y) {
-            return x > y;
-          })), true);
-
-eq("File \"bs_list_test.res\", line 338, characters 5-12", Belt_List.some2({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: -1,
-          tl: {
-            hd: -2,
-            tl: /* [] */0
-          }
-        }, (function (x, y) {
-            return x === y;
-          })), false);
-
-function makeTest(n) {
-  eq("File \"bs_list_test.res\", line 341, characters 23-30", Belt_List.make(n, 3), Belt_List.makeBy(n, (function (param) {
-              return 3;
-            })));
-}
-
-eq("File \"bs_list_test.res\", line 343, characters 12-19", {
-      hd: 2,
-      tl: {
-        hd: 3,
-        tl: /* [] */0
-      }
-    }, {
-      hd: 2,
-      tl: {
-        hd: 3,
-        tl: /* [] */0
-      }
-    });
-
-b("File \"bs_list_test.res\", line 345, characters 4-11", Belt_List.cmp({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 0,
-          tl: {
-            hd: 1,
-            tl: {
-              hd: 2,
-              tl: {
-                hd: 3,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, Caml.int_compare) > 0);
-
-b("File \"bs_list_test.res\", line 346, characters 4-11", Belt_List.cmp({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, Caml.int_compare) > 0);
-
-b("File \"bs_list_test.res\", line 347, characters 4-11", Belt_List.cmp({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, Caml.int_compare) < 0);
-
-b("File \"bs_list_test.res\", line 348, characters 4-11", Belt_List.cmp({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 0,
-          tl: {
-            hd: 1,
-            tl: {
-              hd: 2,
-              tl: /* [] */0
-            }
-          }
-        }, Caml.int_compare) > 0);
-
-b("File \"bs_list_test.res\", line 349, characters 4-11", Belt_List.cmp({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, Caml.int_compare) === 0);
-
-b("File \"bs_list_test.res\", line 350, characters 4-11", Belt_List.cmp({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, Caml.int_compare) > 0);
-
-b("File \"bs_list_test.res\", line 351, characters 4-11", Belt_List.cmpByLength(/* [] */0, /* [] */0) === 0);
-
-b("File \"bs_list_test.res\", line 352, characters 4-11", Belt_List.cmpByLength({
-          hd: 1,
-          tl: /* [] */0
-        }, /* [] */0) > 0);
-
-b("File \"bs_list_test.res\", line 353, characters 4-11", Belt_List.cmpByLength(/* [] */0, {
-          hd: 1,
-          tl: /* [] */0
-        }) < 0);
-
-b("File \"bs_list_test.res\", line 354, characters 4-11", Belt_List.cmpByLength({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }, {
-          hd: 1,
-          tl: /* [] */0
-        }) > 0);
-
-b("File \"bs_list_test.res\", line 355, characters 4-11", Belt_List.cmpByLength({
-          hd: 1,
-          tl: /* [] */0
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }) < 0);
-
-b("File \"bs_list_test.res\", line 356, characters 4-11", Belt_List.cmpByLength({
-          hd: 1,
-          tl: {
-            hd: 3,
-            tl: /* [] */0
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }) === 0);
-
-makeTest(0);
-
-makeTest(1);
-
-makeTest(2);
-
-makeTest(3);
-
-function cmp(a, b) {
-  return a - b | 0;
-}
-
-eq("SORT", Belt_List.sort({
-          hd: 5,
-          tl: {
-            hd: 4,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 2,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, cmp), {
-      hd: 2,
-      tl: {
-        hd: 3,
-        tl: {
-          hd: 4,
-          tl: {
-            hd: 5,
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-eq("SORT", Belt_List.sort({
-          hd: 3,
-          tl: {
-            hd: 9,
-            tl: {
-              hd: 37,
-              tl: {
-                hd: 3,
-                tl: {
-                  hd: 1,
-                  tl: /* [] */0
-                }
-              }
-            }
-          }
-        }, cmp), {
-      hd: 1,
-      tl: {
-        hd: 3,
-        tl: {
-          hd: 3,
-          tl: {
-            hd: 9,
-            tl: {
-              hd: 37,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    });
-
-b("File \"bs_list_test.res\", line 374, characters 4-11", !Belt_List.eq({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }, (function (x, y) {
-            return x === y;
-          })));
-
-b("File \"bs_list_test.res\", line 375, characters 4-11", Belt_List.eq({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, (function (x, y) {
-            return x === y;
-          })));
-
-b("File \"bs_list_test.res\", line 376, characters 4-11", !Belt_List.eq({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          }
-        }, (function (x, y) {
-            return x === y;
-          })));
-
-b("File \"bs_list_test.res\", line 377, characters 4-11", !Belt_List.eq({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-var u0 = Belt_List.makeBy(20, (function (x) {
-        return x;
-      }));
-
-var u1 = Belt_List.keepMap(u0, (function (x) {
-        if (x % 7 === 0) {
-          return x + 1 | 0;
-        }
-        
-      }));
-
-eq("File \"bs_list_test.res\", line 388, characters 5-12", u1, {
-      hd: 1,
-      tl: {
-        hd: 8,
-        tl: {
-          hd: 15,
-          tl: /* [] */0
-        }
-      }
-    });
-
-b("File \"bs_list_test.res\", line 390, characters 4-11", Caml_obj.equal(Belt_List.keepMap({
-              hd: 1,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: {
-                    hd: 4,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }, (function (x) {
-                if (x % 2 === 0) {
-                  return -x | 0;
-                }
-                
-              })), {
-          hd: -2,
-          tl: {
-            hd: -4,
-            tl: /* [] */0
-          }
-        }));
-
-b("File \"bs_list_test.res\", line 404, characters 4-11", Belt_List.keepMap({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }, (function (x) {
-            if (x % 5 === 0) {
-              return x;
-            }
-            
-          })) === /* [] */0);
-
-Mt.from_pair_suites("Bs_list_test", suites.contents);
-
-var N;
-
-var A;
-
-var J;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.$$throw = $$throw;
-exports.N = N;
-exports.A = A;
-exports.J = J;
-exports.sum = sum;
-exports.sum2 = sum2;
-exports.mod2 = mod2;
-exports.evenIndex = evenIndex;
-exports.id = id;
-exports.add = add;
-exports.length_10_id = length_10_id;
-exports.length_8_id = length_8_id;
-exports.succx = succx;
-exports.makeTest = makeTest;
-/* u Not a pure module */
diff --git a/jscomp/test/bs_list_test.res b/jscomp/test/bs_list_test.res
deleted file mode 100644
index 0972509..0000000
--- a/jscomp/test/bs_list_test.res
+++ /dev/null
@@ -1,414 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-
-let eq = (loc, x, y) => Mt.eq_suites(loc, x, y, ~test_id, ~suites)
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-let throw = (loc, x) => Mt.throw_suites(~test_id, ~suites, loc, x)
-
-/* module N = Belt.LinkList */
-module N = Belt.List
-module A = Belt.Array
-module J = Js.Json
-let sum = xs => {
-  let v = ref(0)
-  N.forEach(xs, x => v := v.contents + x)
-  v.contents
-}
-
-let sum2 = (xs, ys) => {
-  let v = ref(0)
-  N.forEach2(xs, ys, (x, y) => v := v.contents + x + y)
-  v.contents
-}
-let () = {
-  let u = N.makeBy(5, i => i * i)
-
-  /* N.checkInvariantInternal u ; */
-  let f = i => eq(__LOC__, N.getExn(u, i), i * i)
-  for i in 0 to 4 {
-    f(i)
-  }
-  eq(__LOC__, N.map(u, i => i + 1), list{1, 2, 5, 10, 17})
-  eq(__LOC__, N.getBy(list{1, 4, 3, 2}, x => mod(x, 2) == 0), Some(4))
-  eq(__LOC__, N.getBy(list{1, 4, 3, 2}, x => mod(x, 5) == 0), None)
-}
-
-let () = {
-  let \"=~" = eq("FLATTEN")
-
-  \"=~"(
-    {
-      open N
-      flatten(list{list{1}, list{2}, list{3}, list{}, makeBy(4, i => i)})
-    },
-    list{1, 2, 3, 0, 1, 2, 3},
-  )
-  \"=~"(N.flatten(list{}), list{})
-  \"=~"(N.flatten(list{list{}, list{}, list{2}, list{1}, list{2}, list{}}), list{2, 1, 2})
-}
-
-let () = {
-  let \"=~" = eq("CONCATMANY")
-  \"=~"(
-    {
-      open N
-      concatMany([list{1}, list{2}, list{3}, list{}, makeBy(4, i => i)])
-    },
-    list{1, 2, 3, 0, 1, 2, 3},
-  )
-  \"=~"(N.concatMany([]), list{})
-  \"=~"(N.concatMany([list{}, list{}, list{2}, list{1}, list{2}, list{}]), list{2, 1, 2})
-  \"=~"(N.concatMany([list{}, list{}, list{2, 3}, list{1}, list{2}, list{}]), list{2, 3, 1, 2})
-  \"=~"(N.concatMany([list{1, 2, 3}]), list{1, 2, 3})
-}
-
-let () = eq(
-  __LOC__,
-  {
-    open N
-    concat(makeBy(100, i => i), makeBy(100, i => i))
-  } |> N.toArray,
-  {
-    open A
-    concat(makeBy(100, i => i), makeBy(100, i => i))
-  },
-)
-let () = {
-  let \"=~" = eq("APPEND")
-  \"=~"(N.concat(list{1}, list{}), list{1})
-  \"=~"(N.concat(list{}, list{1}), list{1})
-}
-
-let () = {
-  let \"=~" = eq("ZIP")
-
-  \"=~"(N.zip(list{1, 2, 3}, list{3, 4}), list{(1, 3), (2, 4)})
-  \"=~"(N.zip(list{}, list{1}), list{})
-  \"=~"(N.zip(list{}, list{}), list{})
-  \"=~"(N.zip(list{1, 2, 3}, list{}), list{})
-  \"=~"(N.zip(list{1, 2, 3}, list{2, 3, 4}), list{(1, 2), (2, 3), (3, 4)})
-}
-
-let mod2 = x => mod(x, 2) == 0
-let evenIndex = (_x, i) => mod(i, 2) == 0
-
-let () = {
-  let \"=~" = eq("PARTITION")
-
-  \"=~"(N.partition(list{1, 2, 3, 2, 3, 4}, mod2), (list{2, 2, 4}, list{1, 3, 3}))
-  \"=~"(N.partition(list{2, 2, 2, 4}, mod2), (list{2, 2, 2, 4}, list{}))
-  \"=~"(N.partition(list{2, 2, 2, 4}, x => !mod2(x)), (list{}, list{2, 2, 2, 4}))
-  \"=~"(N.partition(list{}, mod2), (list{}, list{}))
-}
-
-let () = {
-  let \"=~" = eq("UNZIP")
-  \"=~"(N.unzip(list{}), (list{}, list{}))
-  \"=~"(N.unzip(list{(1, 2)}), (list{1}, list{2}))
-  \"=~"(N.unzip(list{(1, 2), (3, 4)}), (list{1, 3}, list{2, 4}))
-}
-
-let () = {
-  let \"=~" = eq("FILTER")
-  \"=~"(N.keep(list{1, 2, 3, 4}, mod2), list{2, 4})
-  \"=~"(N.keep(list{1, 3, 41}, mod2), list{})
-  \"=~"(N.keep(list{}, mod2), list{})
-  \"=~"(N.keep(list{2, 2, 2, 4, 6}, mod2), list{2, 2, 2, 4, 6})
-}
-
-let () = {
-  let \"=~" = eq("FILTER2")
-  \"=~"(N.keepWithIndex(list{}, evenIndex), list{})
-  \"=~"(N.keepWithIndex(list{1, 2, 3, 4}, evenIndex), list{1, 3})
-  \"=~"(N.keepWithIndex(list{0, 1, 2, 3, 4, 5, 6, 7}, evenIndex), list{0, 2, 4, 6})
-}
-
-let id: int => int = x => x
-
-let () = {
-  let \"=~" = eq("MAP")
-  \"=~"(N.map(N.makeBy(5, id), x => x * 2), list{0, 2, 4, 6, 8})
-  \"=~"(N.map(list{}, id), list{})
-  \"=~"(N.map(list{1}, x => -x), list{-1})
-}
-let add = (a, b) => a + b
-let length_10_id = N.makeBy(10, id)
-let length_8_id = N.makeBy(8, id)
-let () = {
-  let \"=~" = eq("MAP2")
-  let b = length_10_id
-  let c = length_8_id
-  let d = N.makeBy(10, x => 2 * x)
-  let map2_add = (x, y) => N.zipBy(x, y, add)
-  \"=~"(map2_add(length_10_id, b), d)
-  \"=~"(map2_add(list{}, list{1}), list{})
-  \"=~"(map2_add(list{1}, list{}), list{})
-  \"=~"(map2_add(list{}, list{}), list{})
-  \"=~"(
-    map2_add(length_10_id, b),
-    {
-      open N
-      concat(map(c, x => x * 2), list{16, 18})
-    },
-  )
-  \"=~"(
-    map2_add(length_10_id, length_8_id),
-    {
-      open N
-      mapWithIndex(length_8_id, (i, x) => i + x)
-    },
-  )
-  \"=~"(N.reverse(N.mapReverse2(length_10_id, length_10_id, add)), N.map(length_10_id, x => x * 2))
-  let xs = N.reverse(N.mapReverse2(length_8_id, length_10_id, add))
-  eq(__LOC__, N.length(xs), 8)
-  \"=~"(xs, N.zipBy(length_10_id, length_8_id, add))
-  \"=~"(N.mapReverse2(list{1, 2, 3}, list{1, 2}, (x, y) => x + y), list{4, 2})
-}
-
-let () = {
-  let \"=~" = eq("TAKE")
-  \"=~"(N.take(list{1, 2, 3}, 2), Some(list{1, 2}))
-  \"=~"(N.take(list{}, 1), None)
-  \"=~"(N.take(list{1, 2}, 3), None)
-  \"=~"(N.take(list{1, 2}, 2), Some(list{1, 2}))
-  \"=~"(N.take(length_10_id, 8), Some(length_8_id))
-  \"=~"(N.take(length_10_id, 0), Some(list{}))
-  \"=~"(N.take(length_8_id, -2), None)
-}
-
-let () = {
-  let \"=~" = eq("DROP")
-  \"=~"(N.drop(length_10_id, 10), Some(list{}))
-  \"=~"(N.drop(length_10_id, 8), Some(list{8, 9}))
-  \"=~"(N.drop(length_10_id, 0), Some(length_10_id))
-  \"=~"(N.drop(length_8_id, -1), None)
-}
-
-let () = {
-  let \"=~" = eq("SPLIT")
-  let a = N.makeBy(5, id)
-  \"=~"(N.splitAt(list{}, 1), None)
-  \"=~"(N.splitAt(a, 6), None)
-  \"=~"(N.splitAt(a, 5), Some(a, list{}))
-  \"=~"(N.splitAt(a, 4), Some(list{0, 1, 2, 3}, list{4}))
-  \"=~"(N.splitAt(a, 3), Some(list{0, 1, 2}, list{3, 4}))
-  \"=~"(N.splitAt(a, 2), Some(list{0, 1}, list{2, 3, 4}))
-  \"=~"(N.splitAt(a, 1), Some(list{0}, list{1, 2, 3, 4}))
-  \"=~"(N.splitAt(a, 0), Some(list{}, a))
-  \"=~"(N.splitAt(a, -1), None)
-}
-let succx = x => x + 1
-
-let () = {
-  let \"=~" = eq("REMOVEASSOQ")
-  let eqx = (x, y) => (x: int) == y
-  b(__LOC__, N.hasAssoc(list{(1, "1"), (2, "2"), (3, "3")}, 2, \"="))
-  b(__LOC__, !N.hasAssoc(list{(1, "1"), (2, "2"), (3, "3")}, 4, \"="))
-  b(__LOC__, N.hasAssoc(list{(1, "1"), (2, "2"), (3, "3")}, 4, (x, y) => x + 1 == y))
-  \"=~"(N.removeAssoc(list{(1, "1"), (2, "2"), (3, "3")}, 3, \"="), list{(1, "1"), (2, "2")})
-  \"=~"(N.removeAssoc(list{(1, "1"), (2, "2"), (3, "3")}, 1, \"="), list{(2, "2"), (3, "3")})
-  \"=~"(N.removeAssoc(list{(1, "1"), (2, "2"), (3, "3")}, 2, \"="), list{(1, "1"), (3, "3")})
-  \"=~"(
-    N.removeAssoc(list{(1, "1"), (2, "2"), (3, "3")}, 0, \"="),
-    list{(1, "1"), (2, "2"), (3, "3")},
-  )
-
-  \"=~"(N.removeAssoc(list{(1, "1"), (2, "2"), (3, "3")}, 3, eqx), list{(1, "1"), (2, "2")})
-  \"=~"(N.removeAssoc(list{(1, "1"), (2, "2"), (3, "3")}, 1, eqx), list{(2, "2"), (3, "3")})
-  \"=~"(N.removeAssoc(list{(1, "1"), (2, "2"), (3, "3")}, 2, eqx), list{(1, "1"), (3, "3")})
-  \"=~"(N.removeAssoc(list{}, 2, eqx), list{})
-  let ll = list{(1, "1"), (2, "2"), (3, "3")}
-  let ll0 = N.removeAssoc(ll, 0, eqx)
-  b(__LOC__, ll === ll0)
-  let ll1 = N.setAssoc(ll, 2, "22", \"=")
-  eq(__LOC__, ll1, list{(1, "1"), (2, "22"), (3, "3")})
-  let ll2 = N.setAssoc(ll1, 22, "2", \"=")
-  b(__LOC__, ll2 == list{(22, "2"), ...ll1})
-  b(__LOC__, N.tailExn(ll2) === ll1)
-  b(
-    __LOC__,
-    N.setAssoc(list{(1, "a"), (2, "b"), (3, "c")}, 2, "x", \"=") ==
-      list{(1, "a"), (2, "x"), (3, "c")},
-  )
-  b(
-    __LOC__,
-    N.setAssoc(list{(1, "a"), (3, "c")}, 2, "2", \"=") == list{(2, "2"), (1, "a"), (3, "c")},
-  )
-  eq(__LOC__, N.setAssoc(list{}, 1, "1", \"="), list{(1, "1")})
-  %debugger
-  eq(__LOC__, N.setAssoc(list{(1, "2")}, 1, "1", \"="), list{(1, "1")})
-
-  eq(__LOC__, N.setAssoc(list{(0, "0"), (1, "2")}, 1, "1", \"="), list{(0, "0"), (1, "1")})
-  b(__LOC__, N.getAssoc(list{(1, "a"), (2, "b"), (3, "c")}, 2, \"=") == Some("b"))
-  b(__LOC__, N.getAssoc(list{(1, "a"), (2, "b"), (3, "c")}, 4, \"=") == None)
-}
-
-let () = {
-  eq(
-    __LOC__,
-    {
-      open N
-      (head(length_10_id), tail(length_10_id))
-    },
-    (Some(0), N.drop(length_10_id, 1)),
-  )
-  eq(__LOC__, N.head(list{}), None)
-  throw(__LOC__, _ => N.headExn(list{}))
-  throw(__LOC__, _ => N.tailExn(list{}) |> ignore)
-  throw(__LOC__, _ => N.getExn(list{0, 1}, -1) |> ignore)
-  throw(__LOC__, _ => N.getExn(list{0, 1}, 2) |> ignore)
-  eq(__LOC__, N.map(list{0, 1}, i => N.getExn(list{0, 1}, i)), list{0, 1})
-  eq(__LOC__, N.headExn(list{1}), 1)
-  eq(__LOC__, N.tailExn(list{1}), list{})
-  N.forEachWithIndex(length_10_id, (i, x) => eq(__LOC__, N.get(length_10_id, i), Some(x)))
-  eq(__LOC__, N.tail(list{}), None)
-  eq(__LOC__, N.drop(list{}, 3), None)
-  eq(__LOC__, N.mapWithIndex(list{}, (i, x) => i + x), list{})
-  eq(__LOC__, N.get(length_10_id, -1), None)
-  eq(__LOC__, N.get(length_10_id, 12), None)
-  eq(__LOC__, sum(list{}), 0)
-  eq(__LOC__, sum(length_10_id), 45)
-  eq(__LOC__, N.makeBy(0, id), list{})
-  eq(
-    __LOC__,
-    {
-      open N
-      reverse(reverse(length_10_id))
-    },
-    length_10_id,
-  )
-  eq(
-    __LOC__,
-    {
-      open N
-      reverse(reverse(length_8_id))
-    },
-    length_8_id,
-  )
-  eq(__LOC__, N.reverse(list{}), list{})
-  eq(__LOC__, N.reverse(N.mapReverse(length_10_id, succx)), N.map(length_10_id, succx))
-  eq(__LOC__, N.reduce(length_10_id, 0, add), 45)
-  eq(__LOC__, N.reduceReverse(length_10_id, 0, add), 45)
-  eq(__LOC__, N.reduceReverse(N.makeBy(10_000, i => i), 0, \"+"), 0 + 9_999 * 5_000)
-  /* eq __LOC__
-   (N.mapRev2 length_10_id length_8_id add ) */
-  eq(__LOC__, sum2(length_10_id, length_10_id), 90)
-  eq(__LOC__, sum2(length_8_id, length_10_id), 56)
-  eq(__LOC__, sum2(length_10_id, length_8_id), 56)
-  eq(__LOC__, N.reduce2(length_10_id, length_8_id, 0, (acc, x, y) => acc + x + y), 56)
-  eq(__LOC__, N.reduce2(list{1, 2, 3}, list{2, 4, 6}, 0, (a, b, c) => a + b + c), 18)
-  eq(__LOC__, N.reduceReverse2(length_10_id, length_8_id, 0, (acc, x, y) => acc + x + y), 56)
-  eq(__LOC__, N.reduceReverse2(length_10_id, length_10_id, 0, (acc, x, y) => acc + x + y), 90)
-  eq(__LOC__, N.reduceReverse2(list{1, 2, 3}, list{1, 2}, 0, (acc, x, y) => acc + x + y), 6)
-  eq(__LOC__, N.every(list{2, 4, 6}, mod2), true)
-  eq(__LOC__, N.every(list{1}, mod2), false)
-  eq(__LOC__, N.every(list{}, mod2), true)
-  eq(__LOC__, N.some(list{1, 2, 5}, mod2), true)
-  eq(__LOC__, N.some(list{1, 3, 5}, mod2), false)
-  eq(__LOC__, N.some(list{}, mod2), false)
-  eq(__LOC__, N.has(list{1, 2, 3}, "2", (x, s) => string_of_int(x) == s), true)
-  eq(__LOC__, N.has(list{1, 2, 3}, "0", (x, s) => string_of_int(x) == s), false)
-
-  b(__LOC__, N.reduceReverse(list{1, 2, 3, 4}, 0, \"+") == 10)
-  b(__LOC__, N.reduceReverse(list{1, 2, 3, 4}, 10, \"-") == 0)
-  b(__LOC__, N.reduceReverse(list{1, 2, 3, 4}, list{}, N.add) == list{1, 2, 3, 4})
-  b(__LOC__, N.reduce(list{1, 2, 3, 4}, 0, \"+") == 10)
-  b(__LOC__, N.reduce(list{1, 2, 3, 4}, 10, \"-") == 0)
-  b(__LOC__, N.reduce(list{1, 2, 3, 4}, list{}, N.add) == list{4, 3, 2, 1})
-  b(__LOC__, N.reduceWithIndex(list{1, 2, 3, 4}, 0, (acc, x, i) => acc + x + i) == 16)
-  b(__LOC__, N.reduceReverse2(list{1, 2, 3}, list{1, 2}, 0, (acc, x, y) => acc + x + y) == 6)
-  let a = N.makeBy(10_000, i => i)
-  b(
-    __LOC__,
-    N.reduceReverse2(a, list{0, ...a}, 0, (acc, x, y) => acc + x + y) == 9_999 * 10_000 - 9999,
-  )
-}
-
-let () = {
-  eq(__LOC__, N.every2(list{}, list{1}, (x, y) => x > y), true)
-  eq(__LOC__, N.every2(list{2, 3}, list{1}, (x, y) => x > y), true)
-  eq(__LOC__, N.every2(list{2}, list{1}, (x, y) => x > y), true)
-  eq(__LOC__, N.every2(list{2, 3}, list{1, 4}, (x, y) => x > y), false)
-  eq(__LOC__, N.every2(list{2, 3}, list{1, 0}, (x, y) => x > y), true)
-  eq(__LOC__, N.some2(list{}, list{1}, (x, y) => x > y), false)
-  eq(__LOC__, N.some2(list{2, 3}, list{1}, (x, y) => x > y), true)
-  eq(__LOC__, N.some2(list{2, 3}, list{1, 4}, (x, y) => x > y), true)
-  eq(__LOC__, N.some2(list{0, 3}, list{1, 4}, (x, y) => x > y), false)
-  eq(__LOC__, N.some2(list{0, 3}, list{3, 2}, (x, y) => x > y), true)
-  eq(__LOC__, N.some2(list{1, 2, 3}, list{-1, -2}, (x, y) => x == y), false)
-}
-
-let makeTest = n => eq(__LOC__, N.make(n, 3), N.makeBy(n, _ => 3))
-
-let () = eq(__LOC__, list{}->N.add(3)->N.add(2), list{2, 3})
-let () = {
-  b(__LOC__, N.cmp(list{1, 2, 3}, list{0, 1, 2, 3}, compare) > 0)
-  b(__LOC__, N.cmp(list{1, 2, 3, 4}, list{1, 2, 3}, compare) > 0)
-  b(__LOC__, N.cmp(list{1, 2, 3}, list{1, 2, 3, 4}, compare) < 0)
-  b(__LOC__, N.cmp(list{1, 2, 3}, list{0, 1, 2}, (x, y) => compare(x, y)) > 0)
-  b(__LOC__, N.cmp(list{1, 2, 3}, list{1, 2, 3}, (x, y) => compare(x, y)) == 0)
-  b(__LOC__, N.cmp(list{1, 2, 4}, list{1, 2, 3}, (x, y) => compare(x, y)) > 0)
-  b(__LOC__, N.cmpByLength(list{}, list{}) == 0)
-  b(__LOC__, N.cmpByLength(list{1}, list{}) > 0)
-  b(__LOC__, N.cmpByLength(list{}, list{1}) < 0)
-  b(__LOC__, N.cmpByLength(list{1, 2}, list{1}) > 0)
-  b(__LOC__, N.cmpByLength(list{1}, list{1, 2}) < 0)
-  b(__LOC__, N.cmpByLength(list{1, 3}, list{1, 2}) == 0)
-}
-
-let () = {
-  makeTest(0)
-  makeTest(1)
-  makeTest(2)
-  makeTest(3)
-}
-
-let () = {
-  let \"=~" = eq("SORT")
-  let cmp = (a, b) => a - b
-  \"=~"(N.sort(list{5, 4, 3, 2}, cmp), list{2, 3, 4, 5})
-  \"=~"(N.sort(list{3, 9, 37, 3, 1}, cmp), list{1, 3, 3, 9, 37})
-}
-
-let () = {
-  b(__LOC__, \"@@"(not, N.eq(list{1, 2, 3}, list{1, 2}, (x, y) => x == y)))
-  b(__LOC__, N.eq(list{1, 2, 3}, list{1, 2, 3}, (x, y) => x == y))
-  b(__LOC__, \"@@"(not, N.eq(list{1, 2, 3}, list{1, 2, 4}, (x, y) => x == y)))
-  b(__LOC__, \"@@"(not, N.eq(list{1, 2, 3}, list{1, 2, 3, 4}, \"=")))
-}
-let () = {
-  let u0 = N.makeBy(20, x => x)
-  let u1 = u0->N.keepMap(x =>
-    if mod(x, 7) == 0 {
-      Some(x + 1)
-    } else {
-      None
-    }
-  )
-  eq(__LOC__, u1, list{1, 8, 15})
-  b(
-    __LOC__,
-    {
-      open N
-
-      list{1, 2, 3, 4}->keepMap(x =>
-        if mod(x, 2) == 0 {
-          Some(-x)
-        } else {
-          None
-        }
-      ) == list{-2, -4}
-    },
-  )
-  b(
-    __LOC__,
-    N.keepMap(list{1, 2, 3, 4}, x =>
-      if mod(x, 5) == 0 {
-        Some(x)
-      } else {
-        None
-      }
-    ) == list{},
-  )
-}
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_map_set_dict_test.js b/jscomp/test/bs_map_set_dict_test.js
deleted file mode 100644
index 25c8beb..0000000
--- a/jscomp/test/bs_map_set_dict_test.js
+++ /dev/null
@@ -1,214 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Belt_Id = require("../../lib/js/belt_Id.js");
-var Belt_Map = require("../../lib/js/belt_Map.js");
-var Belt_List = require("../../lib/js/belt_List.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_MapDict = require("../../lib/js/belt_MapDict.js");
-var Belt_SetDict = require("../../lib/js/belt_SetDict.js");
-var Array_data_util = require("./array_data_util.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, v) {
-  Mt.bool_suites(test_id, suites, loc, v);
-}
-
-var Icmp = Belt_Id.comparable(Caml.int_compare);
-
-var Icmp2 = Belt_Id.comparable(Caml.int_compare);
-
-var Ic3 = Belt_Id.comparable(Caml.int_compare);
-
-var m0_cmp = Icmp.cmp;
-
-var m0 = {
-  cmp: m0_cmp,
-  data: undefined
-};
-
-var m00_cmp = Ic3.cmp;
-
-var m00 = {
-  cmp: m00_cmp,
-  data: undefined
-};
-
-var I2 = Belt_Id.comparable(function (x, y) {
-      return Caml.int_compare(y, x);
-    });
-
-var m_cmp = Icmp2.cmp;
-
-var m = {
-  cmp: m_cmp,
-  data: undefined
-};
-
-var m2_cmp = I2.cmp;
-
-var m2 = {
-  cmp: m2_cmp,
-  data: undefined
-};
-
-var data;
-
-Belt_Map.getId(m2);
-
-var m_dict = Belt_Map.getId(m);
-
-for(var i = 0; i <= 100000; ++i){
-  data = Belt_MapDict.set(data, i, i, m_dict.cmp);
-}
-
-var data$1 = data;
-
-var newm_cmp = m_dict.cmp;
-
-var newm = {
-  cmp: newm_cmp,
-  data: data$1
-};
-
-console.log(newm);
-
-var m11 = Belt_MapDict.set(undefined, 1, 1, Icmp.cmp);
-
-console.log(m11);
-
-var m_dict$1 = Belt_Map.getId(m);
-
-var cmp = m_dict$1.cmp;
-
-var data$2;
-
-for(var i$1 = 0; i$1 <= 100000; ++i$1){
-  data$2 = Belt_SetDict.add(data$2, i$1, cmp);
-}
-
-console.log(data$2);
-
-function f(param) {
-  return Belt_Map.fromArray(param, Icmp);
-}
-
-function $eq$tilde(a, b) {
-  return function (param) {
-    return Belt_Map.eq(a, b, param);
-  };
-}
-
-var u0 = f(Belt_Array.map(Array_data_util.randomRange(0, 39), (function (x) {
-            return [
-                    x,
-                    x
-                  ];
-          })));
-
-var u1 = Belt_Map.set(u0, 39, 120);
-
-b("File \"bs_map_set_dict_test.res\", line 72, characters 4-11", Belt_Array.every2(Belt_MapDict.toArray(u0.data), Belt_Array.map(Array_data_util.range(0, 39), (function (x) {
-                return [
-                        x,
-                        x
-                      ];
-              })), (function (param, param$1) {
-            if (param[0] === param$1[0]) {
-              return param[1] === param$1[1];
-            } else {
-              return false;
-            }
-          })));
-
-b("File \"bs_map_set_dict_test.res\", line 79, characters 4-11", Belt_List.every2(Belt_MapDict.toList(u0.data), Belt_List.fromArray(Belt_Array.map(Array_data_util.range(0, 39), (function (x) {
-                    return [
-                            x,
-                            x
-                          ];
-                  }))), (function (param, param$1) {
-            if (param[0] === param$1[0]) {
-              return param[1] === param$1[1];
-            } else {
-              return false;
-            }
-          })));
-
-eq("File \"bs_map_set_dict_test.res\", line 84, characters 5-12", Belt_Map.get(u0, 39), 39);
-
-eq("File \"bs_map_set_dict_test.res\", line 85, characters 5-12", Belt_Map.get(u1, 39), 120);
-
-var u = f(Belt_Array.makeByAndShuffle(10000, (function (x) {
-            return [
-                    x,
-                    x
-                  ];
-          })));
-
-eq("File \"bs_map_set_dict_test.res\", line 90, characters 5-12", Belt_Array.makeBy(10000, (function (x) {
-            return [
-                    x,
-                    x
-                  ];
-          })), Belt_MapDict.toArray(u.data));
-
-Mt.from_pair_suites("Bs_map_set_dict_test", suites.contents);
-
-var M;
-
-var MI;
-
-var I;
-
-var A;
-
-var L;
-
-var vv;
-
-var vv2;
-
-var Md0;
-
-var ISet;
-
-var S0;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.Icmp = Icmp;
-exports.Icmp2 = Icmp2;
-exports.Ic3 = Ic3;
-exports.M = M;
-exports.MI = MI;
-exports.I = I;
-exports.A = A;
-exports.L = L;
-exports.m0 = m0;
-exports.m00 = m00;
-exports.I2 = I2;
-exports.m = m;
-exports.m2 = m2;
-exports.vv = vv;
-exports.vv2 = vv2;
-exports.Md0 = Md0;
-exports.ISet = ISet;
-exports.S0 = S0;
-exports.f = f;
-exports.$eq$tilde = $eq$tilde;
-/* Icmp Not a pure module */
diff --git a/jscomp/test/bs_map_set_dict_test.res b/jscomp/test/bs_map_set_dict_test.res
deleted file mode 100644
index 24075c1..0000000
--- a/jscomp/test/bs_map_set_dict_test.res
+++ /dev/null
@@ -1,93 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~suites, ~test_id, loc, x, y)
-let b = (loc, v) => Mt.bool_suites(~suites, ~test_id, loc, v)
-
-module Icmp = unpack(Belt.Id.comparable(~cmp=(x: int, y) => compare(x, y)))
-module Icmp2 = unpack(Belt.Id.comparable(~cmp=(x: int, y) => compare(x, y)))
-
-module Ic3 = unpack(Belt.Id.comparable(~cmp=(compare: (int, int) => int)))
-
-module M = Belt.Map
-module MI = Belt.Map.Int
-/* module B = Belt.Bag */
-module I = Array_data_util
-module A = Belt.Array
-module L = Belt.List
-let m0: M.t<_, string, _> = M.make(~id=module(Icmp))
-
-let m00 = Belt.Set.make(~id=module(Ic3))
-module I2 = unpack(Belt.Id.comparable(~cmp=(x: int, y) => compare(y, x)))
-
-let m = M.make(~id=module(Icmp2))
-let m2: M.t<int, string, _> = M.make(~id=module(I2))
-let vv = MI.empty
-let vv2 = MI.empty
-module Md0 = Belt.Map.Dict
-let () = {
-  let count = 1_000_00
-  let data = ref(M.getData(m))
-  let (m2_dict, m_dict) = {
-    open M
-    (getId(m2), getId(m))
-  }
-  module N = unpack(m2_dict)
-  module Mm = unpack(m_dict)
-  for i in 0 to count {
-    data := Md0.set(data.contents, ~cmp=Mm.cmp, i, i)
-  }
-  let newm = M.packIdData(~data=data.contents, ~id=m_dict)
-  Js.log(newm)
-}
-module ISet = Belt.Set
-let () = {
-  let m = Md0.empty
-  let m11 = Md0.set(~cmp=Icmp.cmp, m, 1, 1)
-
-  let _m20 = M.make(~id=module(Icmp))
-  Js.log(m11)
-}
-
-module S0 = Belt.Set.Dict
-let () = {
-  let count = 100_000
-  let v = ISet.make(~id=module(Icmp2))
-  let m_dict = M.getId(m)
-  module M = unpack(m_dict)
-  let cmp = M.cmp
-  let data = ref(ISet.getData(v))
-  for i in 0 to count {
-    data := S0.add(~cmp, data.contents, i)
-  }
-  Js.log(data.contents)
-}
-
-let f = M.fromArray(~id=module(Icmp))
-let \"=~" = (a, b) => M.eq(a, b)
-
-let () = {
-  let u0 = f(A.map(I.randomRange(0, 39), x => (x, x)))
-  let u1 = M.set(u0, 39, 120)
-  b(
-    __LOC__,
-    A.every2(M.toArray(u0), A.map(I.range(0, 39), x => (x, x)), ((x0, x1), (y0, y1)) =>
-      x0 == y0 && x1 == y1
-    ),
-  )
-
-  b(
-    __LOC__,
-    L.every2(M.toList(u0), L.fromArray(A.map(I.range(0, 39), x => (x, x))), ((x0, x1), (y0, y1)) =>
-      x0 == y0 && x1 == y1
-    ),
-  )
-  eq(__LOC__, M.get(u0, 39), Some(39))
-  eq(__LOC__, M.get(u1, 39), Some(120))
-}
-
-let () = {
-  let u = f(A.makeByAndShuffle(10_000, x => (x, x)))
-  eq(__LOC__, A.makeBy(10_000, x => (x, x)), M.toArray(u))
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_map_test.js b/jscomp/test/bs_map_test.js
deleted file mode 100644
index ac204f9..0000000
--- a/jscomp/test/bs_map_test.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_MapInt = require("../../lib/js/belt_MapInt.js");
-var Belt_SetInt = require("../../lib/js/belt_SetInt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function b(loc, v) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: v
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var mapOfArray = Belt_MapInt.fromArray;
-
-var setOfArray = Belt_SetInt.fromArray;
-
-function emptyMap(param) {
-  
-}
-
-var v = Belt_Array.makeByAndShuffle(1000000, (function (i) {
-        return [
-                i,
-                i
-              ];
-      }));
-
-var u = Belt_MapInt.fromArray(v);
-
-Belt_MapInt.checkInvariantInternal(u);
-
-var firstHalf = Belt_Array.slice(v, 0, 2000);
-
-var xx = Belt_Array.reduce(firstHalf, u, (function (acc, param) {
-        return Belt_MapInt.remove(acc, param[0]);
-      }));
-
-Belt_MapInt.checkInvariantInternal(u);
-
-Belt_MapInt.checkInvariantInternal(xx);
-
-Mt.from_pair_suites("Bs_map_test", suites.contents);
-
-var M;
-
-var N;
-
-var A;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.M = M;
-exports.N = N;
-exports.A = A;
-exports.mapOfArray = mapOfArray;
-exports.setOfArray = setOfArray;
-exports.emptyMap = emptyMap;
-/* v Not a pure module */
diff --git a/jscomp/test/bs_map_test.res b/jscomp/test/bs_map_test.res
deleted file mode 100644
index 6c546fc..0000000
--- a/jscomp/test/bs_map_test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let b = (loc, v) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Ok(v)), ...suites.contents}
-}
-
-module M = Belt.Map.Int
-module N = Belt.Set.Int
-module A = Belt.Array
-
-let mapOfArray = x => M.fromArray(x)
-let setOfArray = x => N.fromArray(x)
-let emptyMap = () => M.empty
-
-let () = {
-  let v = A.makeByAndShuffle(1_000_000, i => (i, i))
-  let u = M.fromArray(v)
-  M.checkInvariantInternal(u)
-  let firstHalf = A.slice(v, ~offset=0, ~len=2_000)
-  let xx = A.reduce(firstHalf, u, (acc, (x, _)) => M.remove(acc, x))
-  M.checkInvariantInternal(u)
-  M.checkInvariantInternal(xx)
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_min_max_test.js b/jscomp/test/bs_min_max_test.js
deleted file mode 100644
index 850139a..0000000
--- a/jscomp/test/bs_min_max_test.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(param, param$1) {
-  return Mt.bool_suites(test_id, suites, param, param$1);
-}
-
-function f(x, y) {
-  return Caml.int_compare(x + y | 0, y + x | 0);
-}
-
-function f2(x, y) {
-  return Caml.int_compare(x + y | 0, y);
-}
-
-var f3 = Caml.int_compare;
-
-function f4(x, y) {
-  if (x < y) {
-    return x;
-  } else {
-    return y;
-  }
-}
-
-var f5_min = Caml_obj.min;
-
-var f5_max = Caml_obj.max;
-
-b("File \"bs_min_max_test.res\", line 19, characters 4-11", Caml.i64_eq(Caml.i64_min(Caml_int64.zero, Caml_int64.one), Caml_int64.zero));
-
-b("File \"bs_min_max_test.res\", line 20, characters 4-11", Caml.i64_eq(Caml.i64_max([
-              0,
-              22
-            ], Caml_int64.one), [
-          0,
-          22
-        ]));
-
-b("File \"bs_min_max_test.res\", line 21, characters 4-11", Caml.i64_eq(Caml.i64_max([
-              -1,
-              4294967293
-            ], [
-              0,
-              3
-            ]), [
-          0,
-          3
-        ]));
-
-eq("File \"bs_min_max_test.res\", line 22, characters 5-12", Caml_obj.min(undefined, 3), undefined);
-
-eq("File \"bs_min_max_test.res\", line 23, characters 5-12", Caml_obj.min(3, undefined), undefined);
-
-eq("File \"bs_min_max_test.res\", line 24, characters 5-12", Caml_obj.max(3, undefined), 3);
-
-eq("File \"bs_min_max_test.res\", line 25, characters 5-12", Caml_obj.max(undefined, 3), 3);
-
-b("File \"bs_min_max_test.res\", line 26, characters 4-11", Caml_obj.greaterequal(5, undefined));
-
-b("File \"bs_min_max_test.res\", line 27, characters 4-11", Caml_obj.lessequal(undefined, 5));
-
-b("File \"bs_min_max_test.res\", line 28, characters 4-11", true);
-
-b("File \"bs_min_max_test.res\", line 29, characters 4-11", true);
-
-Mt.from_pair_suites("Bs_min_max_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.f = f;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.f5_min = f5_min;
-exports.f5_max = f5_max;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_min_max_test.res b/jscomp/test/bs_min_max_test.res
deleted file mode 100644
index b81ea69..0000000
--- a/jscomp/test/bs_min_max_test.res
+++ /dev/null
@@ -1,32 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-let b = Mt.bool_suites(~test_id, ~suites)
-
-let f = (x, y) => Pervasives.compare(x + y, y + x)
-
-let f2 = (x, y) => Pervasives.compare(x + y, y)
-
-let f3 = (x, y) => Pervasives.compare((x: int), y)
-
-let f4 = (x, y) => min((x: int), y)
-
-let f5_min = (x, y) => min(x, y)
-let f5_max = (x, y) => max(x, y)
-
-let () = {
-  b(__LOC__, min(0L, 1L) == 0L)
-  b(__LOC__, max(22L, 1L) == 22L)
-  b(__LOC__, max(-3L, 3L) == 3L)
-  eq(__LOC__, f5_min(None, Some(3)), None)
-  eq(__LOC__, f5_min(Some(3), None), None)
-  eq(__LOC__, f5_max(Some(3), None), Some(3))
-  eq(__LOC__, f5_max(None, Some(3)), Some(3))
-  b(__LOC__, Some(5) >= None)
-  b(__LOC__, None <= Some(5))
-  b(__LOC__, !(None == Some(5)))
-  b(__LOC__, None != Some(5))
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_mutable_set_test.js b/jscomp/test/bs_mutable_set_test.js
deleted file mode 100644
index bc6b575..0000000
--- a/jscomp/test/bs_mutable_set_test.js
+++ /dev/null
@@ -1,860 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Belt_List = require("../../lib/js/belt_List.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_Range = require("../../lib/js/belt_Range.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Array_data_util = require("./array_data_util.js");
-var Belt_MutableSetInt = require("../../lib/js/belt_MutableSetInt.js");
-var Belt_internalAVLset = require("../../lib/js/belt_internalAVLset.js");
-var Belt_internalSetInt = require("../../lib/js/belt_internalSetInt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-var xs = Array_data_util.range(0, 30);
-
-var u = {
-  data: Belt_internalSetInt.fromArray(xs)
-};
-
-b("File \"bs_mutable_set_test.res\", line 21, characters 8-15", Belt_MutableSetInt.removeCheck(u, 0));
-
-b("File \"bs_mutable_set_test.res\", line 22, characters 8-15", !Belt_MutableSetInt.removeCheck(u, 0));
-
-b("File \"bs_mutable_set_test.res\", line 23, characters 8-15", Belt_MutableSetInt.removeCheck(u, 30));
-
-b("File \"bs_mutable_set_test.res\", line 24, characters 8-15", Belt_MutableSetInt.removeCheck(u, 20));
-
-eq("File \"bs_mutable_set_test.res\", line 25, characters 9-16", Belt_internalAVLset.size(u.data), 28);
-
-var r = Array_data_util.randomRange(0, 30);
-
-b("File \"bs_mutable_set_test.res\", line 27, characters 8-15", 29 === Belt_internalAVLset.maxUndefined(u.data));
-
-b("File \"bs_mutable_set_test.res\", line 28, characters 8-15", 1 === Belt_internalAVLset.minUndefined(u.data));
-
-Belt_MutableSetInt.add(u, 3);
-
-for(var i = 0 ,i_finish = r.length; i < i_finish; ++i){
-  Belt_MutableSetInt.remove(u, r[i]);
-}
-
-b("File \"bs_mutable_set_test.res\", line 33, characters 8-15", Belt_MutableSetInt.isEmpty(u));
-
-Belt_MutableSetInt.add(u, 0);
-
-Belt_MutableSetInt.add(u, 1);
-
-Belt_MutableSetInt.add(u, 2);
-
-Belt_MutableSetInt.add(u, 0);
-
-eq("File \"bs_mutable_set_test.res\", line 38, characters 9-16", Belt_internalAVLset.size(u.data), 3);
-
-b("File \"bs_mutable_set_test.res\", line 39, characters 8-15", !Belt_MutableSetInt.isEmpty(u));
-
-for(var i$1 = 0; i$1 <= 3; ++i$1){
-  Belt_MutableSetInt.remove(u, i$1);
-}
-
-b("File \"bs_mutable_set_test.res\", line 43, characters 8-15", Belt_MutableSetInt.isEmpty(u));
-
-Belt_MutableSetInt.mergeMany(u, Array_data_util.randomRange(0, 20000));
-
-Belt_MutableSetInt.mergeMany(u, Array_data_util.randomRange(0, 200));
-
-eq("File \"bs_mutable_set_test.res\", line 46, characters 9-16", Belt_internalAVLset.size(u.data), 20001);
-
-Belt_MutableSetInt.removeMany(u, Array_data_util.randomRange(0, 200));
-
-eq("File \"bs_mutable_set_test.res\", line 48, characters 9-16", Belt_internalAVLset.size(u.data), 19800);
-
-Belt_MutableSetInt.removeMany(u, Array_data_util.randomRange(0, 1000));
-
-eq("File \"bs_mutable_set_test.res\", line 50, characters 9-16", Belt_internalAVLset.size(u.data), 19000);
-
-Belt_MutableSetInt.removeMany(u, Array_data_util.randomRange(0, 1000));
-
-eq("File \"bs_mutable_set_test.res\", line 52, characters 9-16", Belt_internalAVLset.size(u.data), 19000);
-
-Belt_MutableSetInt.removeMany(u, Array_data_util.randomRange(1000, 10000));
-
-eq("File \"bs_mutable_set_test.res\", line 54, characters 9-16", Belt_internalAVLset.size(u.data), 10000);
-
-Belt_MutableSetInt.removeMany(u, Array_data_util.randomRange(10000, 19999));
-
-eq("File \"bs_mutable_set_test.res\", line 56, characters 9-16", Belt_internalAVLset.size(u.data), 1);
-
-b("File \"bs_mutable_set_test.res\", line 57, characters 8-15", Belt_internalSetInt.has(u.data, 20000));
-
-Belt_MutableSetInt.removeMany(u, Array_data_util.randomRange(10000, 30000));
-
-b("File \"bs_mutable_set_test.res\", line 59, characters 8-15", Belt_MutableSetInt.isEmpty(u));
-
-var xs$1 = Array_data_util.randomRange(1000, 2000);
-
-var v = {
-  data: Belt_internalSetInt.fromArray(xs$1)
-};
-
-var bs = Belt_Array.map(Array_data_util.randomRange(500, 1499), (function (x) {
-        return Belt_MutableSetInt.removeCheck(v, x);
-      }));
-
-var indeedRemoved = Belt_Array.reduce(bs, 0, (function (acc, x) {
-        if (x) {
-          return acc + 1 | 0;
-        } else {
-          return acc;
-        }
-      }));
-
-eq("File \"bs_mutable_set_test.res\", line 72, characters 9-16", indeedRemoved, 500);
-
-eq("File \"bs_mutable_set_test.res\", line 73, characters 9-16", Belt_internalAVLset.size(v.data), 501);
-
-var cs = Belt_Array.map(Array_data_util.randomRange(500, 2000), (function (x) {
-        return Belt_MutableSetInt.addCheck(v, x);
-      }));
-
-var indeedAded = Belt_Array.reduce(cs, 0, (function (acc, x) {
-        if (x) {
-          return acc + 1 | 0;
-        } else {
-          return acc;
-        }
-      }));
-
-eq("File \"bs_mutable_set_test.res\", line 82, characters 9-16", indeedAded, 1000);
-
-eq("File \"bs_mutable_set_test.res\", line 83, characters 9-16", Belt_internalAVLset.size(v.data), 1501);
-
-b("File \"bs_mutable_set_test.res\", line 84, characters 8-15", Belt_MutableSetInt.isEmpty({
-          data: undefined
-        }));
-
-eq("File \"bs_mutable_set_test.res\", line 85, characters 9-16", Belt_internalAVLset.minimum(v.data), 500);
-
-eq("File \"bs_mutable_set_test.res\", line 86, characters 9-16", Belt_internalAVLset.maximum(v.data), 2000);
-
-eq("File \"bs_mutable_set_test.res\", line 87, characters 9-16", Belt_internalAVLset.minUndefined(v.data), 500);
-
-eq("File \"bs_mutable_set_test.res\", line 88, characters 9-16", Belt_internalAVLset.maxUndefined(v.data), 2000);
-
-eq("File \"bs_mutable_set_test.res\", line 89, characters 9-16", Belt_MutableSetInt.reduce(v, 0, (function (x, y) {
-            return x + y | 0;
-          })), 1876250);
-
-b("File \"bs_mutable_set_test.res\", line 90, characters 8-15", Belt_List.eq(Belt_internalAVLset.toList(v.data), Belt_List.makeBy(1501, (function (i) {
-                return i + 500 | 0;
-              })), (function (x, y) {
-            return x === y;
-          })));
-
-eq("File \"bs_mutable_set_test.res\", line 91, characters 9-16", Belt_internalAVLset.toArray(v.data), Array_data_util.range(500, 2000));
-
-Belt_internalAVLset.checkInvariantInternal(v.data);
-
-eq("File \"bs_mutable_set_test.res\", line 93, characters 9-16", Belt_internalSetInt.get(v.data, 3), undefined);
-
-eq("File \"bs_mutable_set_test.res\", line 94, characters 9-16", Belt_internalSetInt.get(v.data, 1200), 1200);
-
-var match = Belt_MutableSetInt.split(v, 1000);
-
-var match$1 = match[0];
-
-var bb = match$1[1];
-
-var aa = match$1[0];
-
-b("File \"bs_mutable_set_test.res\", line 96, characters 8-15", match[1]);
-
-b("File \"bs_mutable_set_test.res\", line 97, characters 8-15", Belt_Array.eq(Belt_internalAVLset.toArray(aa.data), Array_data_util.range(500, 999), (function (x, y) {
-            return x === y;
-          })));
-
-b("File \"bs_mutable_set_test.res\", line 98, characters 8-15", Belt_Array.eq(Belt_internalAVLset.toArray(bb.data), Array_data_util.range(1001, 2000), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_mutable_set_test.res\", line 99, characters 8-15", Belt_MutableSetInt.subset(aa, v));
-
-b("File \"bs_mutable_set_test.res\", line 100, characters 8-15", Belt_MutableSetInt.subset(bb, v));
-
-b("File \"bs_mutable_set_test.res\", line 101, characters 8-15", Belt_MutableSetInt.isEmpty(Belt_MutableSetInt.intersect(aa, bb)));
-
-var c = Belt_MutableSetInt.removeCheck(v, 1000);
-
-b("File \"bs_mutable_set_test.res\", line 103, characters 8-15", c);
-
-var match$2 = Belt_MutableSetInt.split(v, 1000);
-
-var match$3 = match$2[0];
-
-var bb$1 = match$3[1];
-
-var aa$1 = match$3[0];
-
-b("File \"bs_mutable_set_test.res\", line 105, characters 8-15", !match$2[1]);
-
-b("File \"bs_mutable_set_test.res\", line 106, characters 8-15", Belt_Array.eq(Belt_internalAVLset.toArray(aa$1.data), Array_data_util.range(500, 999), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_mutable_set_test.res\", line 107, characters 8-15", Belt_Array.eq(Belt_internalAVLset.toArray(bb$1.data), Array_data_util.range(1001, 2000), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_mutable_set_test.res\", line 108, characters 8-15", Belt_MutableSetInt.subset(aa$1, v));
-
-b("File \"bs_mutable_set_test.res\", line 109, characters 8-15", Belt_MutableSetInt.subset(bb$1, v));
-
-b("File \"bs_mutable_set_test.res\", line 110, characters 8-15", Belt_MutableSetInt.isEmpty(Belt_MutableSetInt.intersect(aa$1, bb$1)));
-
-var xs$2 = Array_data_util.randomRange(0, 100);
-
-var aa$2 = {
-  data: Belt_internalSetInt.fromArray(xs$2)
-};
-
-var xs$3 = Array_data_util.randomRange(40, 120);
-
-var bb$2 = {
-  data: Belt_internalSetInt.fromArray(xs$3)
-};
-
-var cc = Belt_MutableSetInt.union(aa$2, bb$2);
-
-var xs$4 = Array_data_util.randomRange(0, 120);
-
-b("File \"bs_mutable_set_test.res\", line 120, characters 8-15", Belt_MutableSetInt.eq(cc, {
-          data: Belt_internalSetInt.fromArray(xs$4)
-        }));
-
-var xs$5 = Array_data_util.randomRange(0, 20);
-
-var xs$6 = Array_data_util.randomRange(21, 40);
-
-var xs$7 = Array_data_util.randomRange(0, 40);
-
-b("File \"bs_mutable_set_test.res\", line 123, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.union({
-              data: Belt_internalSetInt.fromArray(xs$5)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$6)
-            }), {
-          data: Belt_internalSetInt.fromArray(xs$7)
-        }));
-
-var dd = Belt_MutableSetInt.intersect(aa$2, bb$2);
-
-var xs$8 = Array_data_util.randomRange(40, 100);
-
-b("File \"bs_mutable_set_test.res\", line 127, characters 8-15", Belt_MutableSetInt.eq(dd, {
-          data: Belt_internalSetInt.fromArray(xs$8)
-        }));
-
-var xs$9 = Array_data_util.randomRange(0, 20);
-
-var xs$10 = Array_data_util.randomRange(21, 40);
-
-b("File \"bs_mutable_set_test.res\", line 129, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.intersect({
-              data: Belt_internalSetInt.fromArray(xs$9)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$10)
-            }), {
-          data: undefined
-        }));
-
-var xs$11 = Array_data_util.randomRange(21, 40);
-
-var xs$12 = Array_data_util.randomRange(0, 20);
-
-b("File \"bs_mutable_set_test.res\", line 136, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.intersect({
-              data: Belt_internalSetInt.fromArray(xs$11)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$12)
-            }), {
-          data: undefined
-        }));
-
-b("File \"bs_mutable_set_test.res\", line 142, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.intersect({
-              data: Belt_internalSetInt.fromArray([
-                    1,
-                    3,
-                    4,
-                    5,
-                    7,
-                    9
-                  ])
-            }, {
-              data: Belt_internalSetInt.fromArray([
-                    2,
-                    4,
-                    5,
-                    6,
-                    8,
-                    10
-                  ])
-            }), {
-          data: Belt_internalSetInt.fromArray([
-                4,
-                5
-              ])
-        }));
-
-var xs$13 = Array_data_util.randomRange(0, 39);
-
-b("File \"bs_mutable_set_test.res\", line 143, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff(aa$2, bb$2), {
-          data: Belt_internalSetInt.fromArray(xs$13)
-        }));
-
-var xs$14 = Array_data_util.randomRange(101, 120);
-
-b("File \"bs_mutable_set_test.res\", line 144, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff(bb$2, aa$2), {
-          data: Belt_internalSetInt.fromArray(xs$14)
-        }));
-
-var xs$15 = Array_data_util.randomRange(21, 40);
-
-var xs$16 = Array_data_util.randomRange(0, 20);
-
-var xs$17 = Array_data_util.randomRange(21, 40);
-
-b("File \"bs_mutable_set_test.res\", line 146, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({
-              data: Belt_internalSetInt.fromArray(xs$15)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$16)
-            }), {
-          data: Belt_internalSetInt.fromArray(xs$17)
-        }));
-
-var xs$18 = Array_data_util.randomRange(0, 20);
-
-var xs$19 = Array_data_util.randomRange(21, 40);
-
-var xs$20 = Array_data_util.randomRange(0, 20);
-
-b("File \"bs_mutable_set_test.res\", line 153, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({
-              data: Belt_internalSetInt.fromArray(xs$18)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$19)
-            }), {
-          data: Belt_internalSetInt.fromArray(xs$20)
-        }));
-
-var xs$21 = Array_data_util.randomRange(0, 20);
-
-var xs$22 = Array_data_util.randomRange(0, 40);
-
-var xs$23 = Array_data_util.randomRange(0, -1);
-
-b("File \"bs_mutable_set_test.res\", line 161, characters 8-15", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({
-              data: Belt_internalSetInt.fromArray(xs$21)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$22)
-            }), {
-          data: Belt_internalSetInt.fromArray(xs$23)
-        }));
-
-var xs$24 = Array_data_util.randomRange(0, 1000);
-
-var a0 = {
-  data: Belt_internalSetInt.fromArray(xs$24)
-};
-
-var a1 = Belt_MutableSetInt.keep(a0, (function (x) {
-        return x % 2 === 0;
-      }));
-
-var a2 = Belt_MutableSetInt.keep(a0, (function (x) {
-        return x % 2 !== 0;
-      }));
-
-var match$4 = Belt_MutableSetInt.partition(a0, (function (x) {
-        return x % 2 === 0;
-      }));
-
-var a4 = match$4[1];
-
-var a3 = match$4[0];
-
-b("File \"bs_mutable_set_test.res\", line 173, characters 8-15", Belt_MutableSetInt.eq(a1, a3));
-
-b("File \"bs_mutable_set_test.res\", line 174, characters 8-15", Belt_MutableSetInt.eq(a2, a4));
-
-Belt_List.forEach({
-      hd: a0,
-      tl: {
-        hd: a1,
-        tl: {
-          hd: a2,
-          tl: {
-            hd: a3,
-            tl: {
-              hd: a4,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    }, (function (x) {
-        Belt_internalAVLset.checkInvariantInternal(x.data);
-      }));
-
-var v$1 = {
-  data: undefined
-};
-
-for(var i$2 = 0; i$2 <= 100000; ++i$2){
-  Belt_MutableSetInt.add(v$1, i$2);
-}
-
-Belt_internalAVLset.checkInvariantInternal(v$1.data);
-
-b("File \"bs_mutable_set_test.res\", line 188, characters 10-17", Belt_Range.every(0, 100000, (function (i) {
-            return Belt_internalSetInt.has(v$1.data, i);
-          })));
-
-eq("File \"bs_mutable_set_test.res\", line 189, characters 5-12", Belt_internalAVLset.size(v$1.data), 100001);
-
-var u$1 = Belt_Array.concat(Array_data_util.randomRange(30, 100), Array_data_util.randomRange(40, 120));
-
-var v$2 = {
-  data: undefined
-};
-
-Belt_MutableSetInt.mergeMany(v$2, u$1);
-
-eq("File \"bs_mutable_set_test.res\", line 196, characters 5-12", Belt_internalAVLset.size(v$2.data), 91);
-
-eq("File \"bs_mutable_set_test.res\", line 197, characters 5-12", Belt_internalAVLset.toArray(v$2.data), Array_data_util.range(30, 120));
-
-var u$2 = Belt_Array.concat(Array_data_util.randomRange(0, 100000), Array_data_util.randomRange(0, 100));
-
-var v$3 = {
-  data: Belt_internalSetInt.fromArray(u$2)
-};
-
-eq("File \"bs_mutable_set_test.res\", line 203, characters 5-12", Belt_internalAVLset.size(v$3.data), 100001);
-
-var u$3 = Array_data_util.randomRange(50000, 80000);
-
-for(var i$3 = 0 ,i_finish$1 = u$3.length; i$3 < i_finish$1; ++i$3){
-  Belt_MutableSetInt.remove(v$3, i$3);
-}
-
-eq("File \"bs_mutable_set_test.res\", line 210, characters 5-12", Belt_internalAVLset.size(v$3.data), 70000);
-
-var vv = Array_data_util.randomRange(0, 100000);
-
-for(var i$4 = 0 ,i_finish$2 = vv.length; i$4 < i_finish$2; ++i$4){
-  Belt_MutableSetInt.remove(v$3, Caml_array.get(vv, i$4));
-}
-
-eq("File \"bs_mutable_set_test.res\", line 216, characters 5-12", Belt_internalAVLset.size(v$3.data), 0);
-
-b("File \"bs_mutable_set_test.res\", line 217, characters 4-11", Belt_MutableSetInt.isEmpty(v$3));
-
-var xs$25 = Belt_Array.makeBy(30, (function (i) {
-        return i;
-      }));
-
-var v$4 = {
-  data: Belt_internalSetInt.fromArray(xs$25)
-};
-
-Belt_MutableSetInt.remove(v$4, 30);
-
-Belt_MutableSetInt.remove(v$4, 29);
-
-b("File \"bs_mutable_set_test.res\", line 224, characters 4-11", 28 === Belt_internalAVLset.maxUndefined(v$4.data));
-
-Belt_MutableSetInt.remove(v$4, 0);
-
-b("File \"bs_mutable_set_test.res\", line 226, characters 4-11", 1 === Belt_internalAVLset.minUndefined(v$4.data));
-
-eq("File \"bs_mutable_set_test.res\", line 227, characters 5-12", Belt_internalAVLset.size(v$4.data), 28);
-
-var vv$1 = Array_data_util.randomRange(1, 28);
-
-for(var i$5 = 0 ,i_finish$3 = vv$1.length; i$5 < i_finish$3; ++i$5){
-  Belt_MutableSetInt.remove(v$4, Caml_array.get(vv$1, i$5));
-}
-
-eq("File \"bs_mutable_set_test.res\", line 232, characters 5-12", Belt_internalAVLset.size(v$4.data), 0);
-
-function id(loc, x) {
-  var u = {
-    data: Belt_internalAVLset.fromSortedArrayUnsafe(x)
-  };
-  Belt_internalAVLset.checkInvariantInternal(u.data);
-  b(loc, Belt_Array.every2(Belt_internalAVLset.toArray(u.data), x, (function (prim0, prim1) {
-              return prim0 === prim1;
-            })));
-}
-
-id("File \"bs_mutable_set_test.res\", line 242, characters 5-12", []);
-
-id("File \"bs_mutable_set_test.res\", line 243, characters 5-12", [0]);
-
-id("File \"bs_mutable_set_test.res\", line 244, characters 5-12", [
-      0,
-      1
-    ]);
-
-id("File \"bs_mutable_set_test.res\", line 245, characters 5-12", [
-      0,
-      1,
-      2
-    ]);
-
-id("File \"bs_mutable_set_test.res\", line 246, characters 5-12", [
-      0,
-      1,
-      2,
-      3
-    ]);
-
-id("File \"bs_mutable_set_test.res\", line 247, characters 5-12", [
-      0,
-      1,
-      2,
-      3,
-      4
-    ]);
-
-id("File \"bs_mutable_set_test.res\", line 248, characters 5-12", [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5
-    ]);
-
-id("File \"bs_mutable_set_test.res\", line 249, characters 5-12", [
-      0,
-      1,
-      2,
-      3,
-      4,
-      6
-    ]);
-
-id("File \"bs_mutable_set_test.res\", line 250, characters 5-12", [
-      0,
-      1,
-      2,
-      3,
-      4,
-      6,
-      7
-    ]);
-
-id("File \"bs_mutable_set_test.res\", line 251, characters 5-12", [
-      0,
-      1,
-      2,
-      3,
-      4,
-      6,
-      7,
-      8
-    ]);
-
-id("File \"bs_mutable_set_test.res\", line 252, characters 5-12", [
-      0,
-      1,
-      2,
-      3,
-      4,
-      6,
-      7,
-      8,
-      9
-    ]);
-
-id("File \"bs_mutable_set_test.res\", line 253, characters 5-12", Array_data_util.range(0, 1000));
-
-var xs$26 = Array_data_util.randomRange(0, 1000);
-
-var v$5 = {
-  data: Belt_internalSetInt.fromArray(xs$26)
-};
-
-var copyV = Belt_MutableSetInt.keep(v$5, (function (x) {
-        return x % 8 === 0;
-      }));
-
-var match$5 = Belt_MutableSetInt.partition(v$5, (function (x) {
-        return x % 8 === 0;
-      }));
-
-var cc$1 = Belt_MutableSetInt.keep(v$5, (function (x) {
-        return x % 8 !== 0;
-      }));
-
-for(var i$6 = 0; i$6 <= 200; ++i$6){
-  Belt_MutableSetInt.remove(v$5, i$6);
-}
-
-eq("File \"bs_mutable_set_test.res\", line 264, characters 5-12", Belt_internalAVLset.size(copyV.data), 126);
-
-eq("File \"bs_mutable_set_test.res\", line 265, characters 5-12", Belt_internalAVLset.toArray(copyV.data), Belt_Array.makeBy(126, (function (i) {
-            return (i << 3);
-          })));
-
-eq("File \"bs_mutable_set_test.res\", line 266, characters 5-12", Belt_internalAVLset.size(v$5.data), 800);
-
-b("File \"bs_mutable_set_test.res\", line 267, characters 4-11", Belt_MutableSetInt.eq(copyV, match$5[0]));
-
-b("File \"bs_mutable_set_test.res\", line 268, characters 4-11", Belt_MutableSetInt.eq(cc$1, match$5[1]));
-
-var xs$27 = Array_data_util.randomRange(0, 1000);
-
-var v$6 = {
-  data: Belt_internalSetInt.fromArray(xs$27)
-};
-
-var match$6 = Belt_MutableSetInt.split(v$6, 400);
-
-var match$7 = match$6[0];
-
-var xs$28 = Array_data_util.randomRange(0, 399);
-
-b("File \"bs_mutable_set_test.res\", line 274, characters 4-11", Belt_MutableSetInt.eq(match$7[0], {
-          data: Belt_internalSetInt.fromArray(xs$28)
-        }));
-
-var xs$29 = Array_data_util.randomRange(401, 1000);
-
-b("File \"bs_mutable_set_test.res\", line 275, characters 4-11", Belt_MutableSetInt.eq(match$7[1], {
-          data: Belt_internalSetInt.fromArray(xs$29)
-        }));
-
-var xs$30 = Belt_Array.map(Array_data_util.randomRange(0, 1000), (function (x) {
-        return (x << 1);
-      }));
-
-var d = {
-  data: Belt_internalSetInt.fromArray(xs$30)
-};
-
-var match$8 = Belt_MutableSetInt.split(d, 1001);
-
-var match$9 = match$8[0];
-
-var xs$31 = Belt_Array.makeBy(501, (function (x) {
-        return (x << 1);
-      }));
-
-b("File \"bs_mutable_set_test.res\", line 278, characters 4-11", Belt_MutableSetInt.eq(match$9[0], {
-          data: Belt_internalSetInt.fromArray(xs$31)
-        }));
-
-var xs$32 = Belt_Array.makeBy(500, (function (x) {
-        return 1002 + (x << 1) | 0;
-      }));
-
-b("File \"bs_mutable_set_test.res\", line 279, characters 4-11", Belt_MutableSetInt.eq(match$9[1], {
-          data: Belt_internalSetInt.fromArray(xs$32)
-        }));
-
-var xs$33 = Array_data_util.randomRange(0, 100);
-
-var aa$3 = {
-  data: Belt_internalSetInt.fromArray(xs$33)
-};
-
-var xs$34 = Array_data_util.randomRange(40, 120);
-
-var bb$3 = {
-  data: Belt_internalSetInt.fromArray(xs$34)
-};
-
-var cc$2 = Belt_MutableSetInt.union(aa$3, bb$3);
-
-var xs$35 = Array_data_util.randomRange(0, 120);
-
-b("File \"bs_mutable_set_test.res\", line 289, characters 4-11", Belt_MutableSetInt.eq(cc$2, {
-          data: Belt_internalSetInt.fromArray(xs$35)
-        }));
-
-var xs$36 = Array_data_util.randomRange(0, 20);
-
-var xs$37 = Array_data_util.randomRange(21, 40);
-
-var xs$38 = Array_data_util.randomRange(0, 40);
-
-b("File \"bs_mutable_set_test.res\", line 292, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.union({
-              data: Belt_internalSetInt.fromArray(xs$36)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$37)
-            }), {
-          data: Belt_internalSetInt.fromArray(xs$38)
-        }));
-
-var dd$1 = Belt_MutableSetInt.intersect(aa$3, bb$3);
-
-var xs$39 = Array_data_util.randomRange(40, 100);
-
-b("File \"bs_mutable_set_test.res\", line 296, characters 4-11", Belt_MutableSetInt.eq(dd$1, {
-          data: Belt_internalSetInt.fromArray(xs$39)
-        }));
-
-var xs$40 = Array_data_util.randomRange(0, 20);
-
-var xs$41 = Array_data_util.randomRange(21, 40);
-
-b("File \"bs_mutable_set_test.res\", line 298, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.intersect({
-              data: Belt_internalSetInt.fromArray(xs$40)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$41)
-            }), {
-          data: undefined
-        }));
-
-var xs$42 = Array_data_util.randomRange(21, 40);
-
-var xs$43 = Array_data_util.randomRange(0, 20);
-
-b("File \"bs_mutable_set_test.res\", line 302, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.intersect({
-              data: Belt_internalSetInt.fromArray(xs$42)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$43)
-            }), {
-          data: undefined
-        }));
-
-b("File \"bs_mutable_set_test.res\", line 305, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.intersect({
-              data: Belt_internalSetInt.fromArray([
-                    1,
-                    3,
-                    4,
-                    5,
-                    7,
-                    9
-                  ])
-            }, {
-              data: Belt_internalSetInt.fromArray([
-                    2,
-                    4,
-                    5,
-                    6,
-                    8,
-                    10
-                  ])
-            }), {
-          data: Belt_internalSetInt.fromArray([
-                4,
-                5
-              ])
-        }));
-
-var xs$44 = Array_data_util.randomRange(0, 39);
-
-b("File \"bs_mutable_set_test.res\", line 306, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff(aa$3, bb$3), {
-          data: Belt_internalSetInt.fromArray(xs$44)
-        }));
-
-var xs$45 = Array_data_util.randomRange(101, 120);
-
-b("File \"bs_mutable_set_test.res\", line 307, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff(bb$3, aa$3), {
-          data: Belt_internalSetInt.fromArray(xs$45)
-        }));
-
-var xs$46 = Array_data_util.randomRange(21, 40);
-
-var xs$47 = Array_data_util.randomRange(0, 20);
-
-var xs$48 = Array_data_util.randomRange(21, 40);
-
-b("File \"bs_mutable_set_test.res\", line 309, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({
-              data: Belt_internalSetInt.fromArray(xs$46)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$47)
-            }), {
-          data: Belt_internalSetInt.fromArray(xs$48)
-        }));
-
-var xs$49 = Array_data_util.randomRange(0, 20);
-
-var xs$50 = Array_data_util.randomRange(21, 40);
-
-var xs$51 = Array_data_util.randomRange(0, 20);
-
-b("File \"bs_mutable_set_test.res\", line 316, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({
-              data: Belt_internalSetInt.fromArray(xs$49)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$50)
-            }), {
-          data: Belt_internalSetInt.fromArray(xs$51)
-        }));
-
-var xs$52 = Array_data_util.randomRange(0, 20);
-
-var xs$53 = Array_data_util.randomRange(0, 40);
-
-var xs$54 = Array_data_util.randomRange(0, -1);
-
-b("File \"bs_mutable_set_test.res\", line 324, characters 4-11", Belt_MutableSetInt.eq(Belt_MutableSetInt.diff({
-              data: Belt_internalSetInt.fromArray(xs$52)
-            }, {
-              data: Belt_internalSetInt.fromArray(xs$53)
-            }), {
-          data: Belt_internalSetInt.fromArray(xs$54)
-        }));
-
-Mt.from_pair_suites("Bs_mutable_set_test", suites.contents);
-
-var N;
-
-var I;
-
-var R;
-
-var A;
-
-var L;
-
-var empty = Belt_MutableSetInt.make;
-
-var fromArray = Belt_MutableSetInt.fromArray;
-
-var $plus$plus = Belt_MutableSetInt.union;
-
-var f = Belt_MutableSetInt.fromArray;
-
-var $eq$tilde = Belt_MutableSetInt.eq;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.N = N;
-exports.I = I;
-exports.R = R;
-exports.A = A;
-exports.L = L;
-exports.empty = empty;
-exports.fromArray = fromArray;
-exports.$plus$plus = $plus$plus;
-exports.f = f;
-exports.$eq$tilde = $eq$tilde;
-/* u Not a pure module */
diff --git a/jscomp/test/bs_mutable_set_test.res b/jscomp/test/bs_mutable_set_test.res
deleted file mode 100644
index 478bdd3..0000000
--- a/jscomp/test/bs_mutable_set_test.res
+++ /dev/null
@@ -1,332 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-
-module N = Belt.MutableSet.Int
-
-module I = Array_data_util
-module R = Belt.Range
-module A = Belt.Array
-module L = Belt.List
-let \"++" = A.concat
-let empty = N.make
-let fromArray = N.fromArray
-
-/* ********************************************** */
-include (
-  {
-    let () = {
-      let u = fromArray(I.range(0, 30))
-      b(__LOC__, N.removeCheck(u, 0))
-      b(__LOC__, !N.removeCheck(u, 0))
-      b(__LOC__, N.removeCheck(u, 30))
-      b(__LOC__, N.removeCheck(u, 20))
-      eq(__LOC__, N.size(u), 28)
-      let r = I.randomRange(0, 30)
-      b(__LOC__, Js.eqUndefined(29, N.maxUndefined(u)))
-      b(__LOC__, Js.eqUndefined(1, N.minUndefined(u)))
-      N.add(u, 3)
-      for i in 0 to A.length(r) - 1 {
-        N.remove(u, A.getUnsafe(r, i))
-      }
-      b(__LOC__, N.isEmpty(u))
-      N.add(u, 0)
-      N.add(u, 1)
-      N.add(u, 2)
-      N.add(u, 0)
-      eq(__LOC__, N.size(u), 3)
-      b(__LOC__, !N.isEmpty(u))
-      for i in 0 to 3 {
-        N.remove(u, i)
-      }
-      b(__LOC__, N.isEmpty(u))
-      N.mergeMany(u, I.randomRange(0, 20000))
-      N.mergeMany(u, I.randomRange(0, 200))
-      eq(__LOC__, N.size(u), 20001)
-      N.removeMany(u, I.randomRange(0, 200))
-      eq(__LOC__, N.size(u), 19800)
-      N.removeMany(u, I.randomRange(0, 1000))
-      eq(__LOC__, N.size(u), 19000)
-      N.removeMany(u, I.randomRange(0, 1000))
-      eq(__LOC__, N.size(u), 19000)
-      N.removeMany(u, I.randomRange(1000, 10000))
-      eq(__LOC__, N.size(u), 10000)
-      N.removeMany(u, I.randomRange(10000, 20000 - 1))
-      eq(__LOC__, N.size(u), 1)
-      b(__LOC__, N.has(u, 20000))
-      N.removeMany(u, I.randomRange(10_000, 30_000))
-      b(__LOC__, N.isEmpty(u))
-    }
-
-    let () = {
-      let v = fromArray(I.randomRange(1_000, 2_000))
-      let bs = A.map(I.randomRange(500, 1499), x => N.removeCheck(v, x))
-      let indeedRemoved = A.reduce(bs, 0, (acc, x) =>
-        if x {
-          acc + 1
-        } else {
-          acc
-        }
-      )
-      eq(__LOC__, indeedRemoved, 500)
-      eq(__LOC__, N.size(v), 501)
-      let cs = A.map(I.randomRange(500, 2_000), x => N.addCheck(v, x))
-      let indeedAded = A.reduce(cs, 0, (acc, x) =>
-        if x {
-          acc + 1
-        } else {
-          acc
-        }
-      )
-      eq(__LOC__, indeedAded, 1000)
-      eq(__LOC__, N.size(v), 1_501)
-      b(__LOC__, N.isEmpty(empty()))
-      eq(__LOC__, N.minimum(v), Some(500))
-      eq(__LOC__, N.maximum(v), Some(2000))
-      eq(__LOC__, N.minUndefined(v), Js.Undefined.return(500))
-      eq(__LOC__, N.maxUndefined(v), Js.Undefined.return(2000))
-      eq(__LOC__, N.reduce(v, 0, (x, y) => x + y), (500 + 2000) / 2 * 1501)
-      b(__LOC__, L.eq(N.toList(v), L.makeBy(1_501, i => i + 500), (x, y) => x == y))
-      eq(__LOC__, N.toArray(v), I.range(500, 2000))
-      N.checkInvariantInternal(v)
-      eq(__LOC__, N.get(v, 3), None)
-      eq(__LOC__, N.get(v, 1_200), Some(1_200))
-      let ((aa, bb), pres) = N.split(v, 1000)
-      b(__LOC__, pres)
-      b(__LOC__, A.eq(N.toArray(aa), I.range(500, 999), (x, y) => x == y))
-      b(__LOC__, A.eq(N.toArray(bb), I.range(1_001, 2_000), \"="))
-      b(__LOC__, N.subset(aa, v))
-      b(__LOC__, N.subset(bb, v))
-      b(__LOC__, N.isEmpty(N.intersect(aa, bb)))
-      let c = N.removeCheck(v, 1_000)
-      b(__LOC__, c)
-      let ((aa, bb), pres) = N.split(v, 1_000)
-      b(__LOC__, !pres)
-      b(__LOC__, A.eq(N.toArray(aa), I.range(500, 999), \"="))
-      b(__LOC__, A.eq(N.toArray(bb), I.range(1_001, 2_000), \"="))
-      b(__LOC__, N.subset(aa, v))
-      b(__LOC__, N.subset(bb, v))
-      b(__LOC__, N.isEmpty(N.intersect(aa, bb)))
-    }
-
-    let \"++" = N.union
-    let f = fromArray
-    let \"=~" = N.eq
-    let () = {
-      let aa = f(I.randomRange(0, 100))
-      let bb = f(I.randomRange(40, 120))
-      let cc = \"++"(aa, bb)
-      b(__LOC__, \"=~"(cc, f(I.randomRange(0, 120))))
-
-      b(
-        __LOC__,
-        N.eq(N.union(f(I.randomRange(0, 20)), f(I.randomRange(21, 40))), f(I.randomRange(0, 40))),
-      )
-      let dd = N.intersect(aa, bb)
-      b(__LOC__, \"=~"(dd, f(I.randomRange(40, 100))))
-      b(
-        __LOC__,
-        \"=~"(
-          N.intersect(\"@@"(f, I.randomRange(0, 20)), \"@@"(f, I.randomRange(21, 40))),
-          empty(),
-        ),
-      )
-      b(
-        __LOC__,
-        \"=~"(
-          N.intersect(\"@@"(f, I.randomRange(21, 40)), \"@@"(f, I.randomRange(0, 20))),
-          empty(),
-        ),
-      )
-      b(__LOC__, \"=~"(N.intersect(f([1, 3, 4, 5, 7, 9]), f([2, 4, 5, 6, 8, 10])), f([4, 5])))
-      b(__LOC__, \"=~"(N.diff(aa, bb), f(I.randomRange(0, 39))))
-      b(__LOC__, \"=~"(N.diff(bb, aa), f(I.randomRange(101, 120))))
-      b(
-        __LOC__,
-        \"=~"(
-          N.diff(\"@@"(f, I.randomRange(21, 40)), \"@@"(f, I.randomRange(0, 20))),
-          f(I.randomRange(21, 40)),
-        ),
-      )
-      b(
-        __LOC__,
-        \"=~"(
-          N.diff(\"@@"(f, I.randomRange(0, 20)), \"@@"(f, I.randomRange(21, 40))),
-          f(I.randomRange(0, 20)),
-        ),
-      )
-
-      b(
-        __LOC__,
-        \"=~"(
-          N.diff(\"@@"(f, I.randomRange(0, 20)), \"@@"(f, I.randomRange(0, 40))),
-          f(I.randomRange(0, -1)),
-        ),
-      )
-    }
-
-    let () = {
-      let a0 = fromArray(I.randomRange(0, 1000))
-      let (a1, a2) = (N.keep(a0, x => mod(x, 2) == 0), N.keep(a0, x => mod(x, 2) != 0))
-      let (a3, a4) = N.partition(a0, x => mod(x, 2) == 0)
-      b(__LOC__, N.eq(a1, a3))
-      b(__LOC__, N.eq(a2, a4))
-      L.forEach(list{a0, a1, a2, a3, a4}, x => N.checkInvariantInternal(x))
-    }
-  }: {}
-)
-
-/* ********************************************** */
-let () = {
-  let v = N.make()
-  for i in 0 to 1_00_000 {
-    /* [%assert (N.checkInvariantInternal !v)]; */
-    N.add(v, i)
-  }
-  N.checkInvariantInternal(v)
-  \"@@"(b(__LOC__), R.every(0, 1_00_000, i => N.has(v, i)))
-  eq(__LOC__, N.size(v), 1_00_001)
-}
-
-let () = {
-  let u = \"++"(I.randomRange(30, 100), I.randomRange(40, 120))
-  let v = N.make()
-  N.mergeMany(v, u)
-  eq(__LOC__, N.size(v), 91)
-  eq(__LOC__, N.toArray(v), I.range(30, 120))
-}
-
-let () = {
-  let u = \"++"(I.randomRange(0, 100_000), I.randomRange(0, 100))
-  let v = N.fromArray(u)
-  eq(__LOC__, N.size(v), 100_001)
-  let u = I.randomRange(50_000, 80_000)
-
-  for i in 0 to A.length(u) - 1 {
-    N.remove(v, i)
-  }
-
-  eq(__LOC__, N.size(v), 70_000)
-  let count = 100_000
-  let vv = I.randomRange(0, count)
-  for i in 0 to A.length(vv) - 1 {
-    N.remove(v, vv[i])
-  }
-  eq(__LOC__, N.size(v), 0)
-  b(__LOC__, N.isEmpty(v))
-}
-
-let () = {
-  let v = N.fromArray(A.makeBy(30, i => i))
-  N.remove(v, 30)
-  N.remove(v, 29)
-  b(__LOC__, Js.eqUndefined(28, N.maxUndefined(v)))
-  N.remove(v, 0)
-  b(__LOC__, Js.eqUndefined(1, N.minUndefined(v)))
-  eq(__LOC__, N.size(v), 28)
-  let vv = I.randomRange(1, 28)
-  for i in 0 to A.length(vv) - 1 {
-    N.remove(v, vv[i])
-  }
-  eq(__LOC__, N.size(v), 0)
-}
-
-let () = {
-  let id = (loc, x) => {
-    let u = N.fromSortedArrayUnsafe(x)
-    N.checkInvariantInternal(u)
-    b(loc, A.every2(N.toArray(u), x, \"="))
-  }
-
-  id(__LOC__, [])
-  id(__LOC__, [0])
-  id(__LOC__, [0, 1])
-  id(__LOC__, [0, 1, 2])
-  id(__LOC__, [0, 1, 2, 3])
-  id(__LOC__, [0, 1, 2, 3, 4])
-  id(__LOC__, [0, 1, 2, 3, 4, 5])
-  id(__LOC__, [0, 1, 2, 3, 4, 6])
-  id(__LOC__, [0, 1, 2, 3, 4, 6, 7])
-  id(__LOC__, [0, 1, 2, 3, 4, 6, 7, 8])
-  id(__LOC__, [0, 1, 2, 3, 4, 6, 7, 8, 9])
-  id(__LOC__, I.range(0, 1000))
-}
-
-let () = {
-  let v = N.fromArray(I.randomRange(0, 1000))
-  let copyV = N.keep(v, x => mod(x, 8) == 0)
-  let (aa, bb) = N.partition(v, x => mod(x, 8) == 0)
-  let cc = N.keep(v, x => mod(x, 8) != 0)
-  for i in 0 to 200 {
-    N.remove(v, i)
-  }
-  eq(__LOC__, N.size(copyV), 126)
-  eq(__LOC__, N.toArray(copyV), A.makeBy(126, i => i * 8))
-  eq(__LOC__, N.size(v), 800)
-  b(__LOC__, N.eq(copyV, aa))
-  b(__LOC__, N.eq(cc, bb))
-}
-
-let () = {
-  let v = N.fromArray(I.randomRange(0, 1000))
-  let ((aa, bb), _) = N.split(v, 400)
-  b(__LOC__, N.eq(aa, N.fromArray(I.randomRange(0, 399))))
-  b(__LOC__, N.eq(bb, N.fromArray(I.randomRange(401, 1000))))
-  let d = N.fromArray(A.map(I.randomRange(0, 1000), x => x * 2))
-  let ((cc, dd), _) = N.split(d, 1001)
-  b(__LOC__, N.eq(cc, N.fromArray(A.makeBy(501, x => x * 2))))
-  b(__LOC__, N.eq(dd, N.fromArray(A.makeBy(500, x => 1002 + x * 2))))
-}
-
-let \"++" = N.union
-let f = N.fromArray
-let \"=~" = N.eq
-let () = {
-  let aa = f(I.randomRange(0, 100))
-  let bb = f(I.randomRange(40, 120))
-  let cc = \"++"(aa, bb)
-  b(__LOC__, \"=~"(cc, f(I.randomRange(0, 120))))
-
-  b(
-    __LOC__,
-    N.eq(N.union(f(I.randomRange(0, 20)), f(I.randomRange(21, 40))), f(I.randomRange(0, 40))),
-  )
-  let dd = N.intersect(aa, bb)
-  b(__LOC__, \"=~"(dd, f(I.randomRange(40, 100))))
-  b(
-    __LOC__,
-    \"=~"(N.intersect(\"@@"(f, I.randomRange(0, 20)), \"@@"(f, I.randomRange(21, 40))), N.make()),
-  )
-  b(
-    __LOC__,
-    \"=~"(N.intersect(\"@@"(f, I.randomRange(21, 40)), \"@@"(f, I.randomRange(0, 20))), N.make()),
-  )
-  b(__LOC__, \"=~"(N.intersect(f([1, 3, 4, 5, 7, 9]), f([2, 4, 5, 6, 8, 10])), f([4, 5])))
-  b(__LOC__, \"=~"(N.diff(aa, bb), f(I.randomRange(0, 39))))
-  b(__LOC__, \"=~"(N.diff(bb, aa), f(I.randomRange(101, 120))))
-  b(
-    __LOC__,
-    \"=~"(
-      N.diff(\"@@"(f, I.randomRange(21, 40)), \"@@"(f, I.randomRange(0, 20))),
-      f(I.randomRange(21, 40)),
-    ),
-  )
-  b(
-    __LOC__,
-    \"=~"(
-      N.diff(\"@@"(f, I.randomRange(0, 20)), \"@@"(f, I.randomRange(21, 40))),
-      f(I.randomRange(0, 20)),
-    ),
-  )
-
-  b(
-    __LOC__,
-    \"=~"(
-      N.diff(\"@@"(f, I.randomRange(0, 20)), \"@@"(f, I.randomRange(0, 40))),
-      f(I.randomRange(0, -1)),
-    ),
-  )
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_poly_map_test.js b/jscomp/test/bs_poly_map_test.js
deleted file mode 100644
index 07accf3..0000000
--- a/jscomp/test/bs_poly_map_test.js
+++ /dev/null
@@ -1,330 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Belt_Id = require("../../lib/js/belt_Id.js");
-var Belt_Map = require("../../lib/js/belt_Map.js");
-var Belt_Set = require("../../lib/js/belt_Set.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-var Belt_MapDict = require("../../lib/js/belt_MapDict.js");
-var Array_data_util = require("./array_data_util.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, v) {
-  Mt.bool_suites(test_id, suites, loc, v);
-}
-
-var Icmp = Belt_Id.comparable(Caml.int_compare);
-
-function mapOfArray(x) {
-  return Belt_Map.fromArray(x, Icmp);
-}
-
-function setOfArray(x) {
-  return Belt_Set.fromArray(x, Icmp);
-}
-
-function emptyMap(param) {
-  return {
-          cmp: Icmp.cmp,
-          data: undefined
-        };
-}
-
-function mergeInter(s1, s2) {
-  var m = Belt_Map.merge(s1, s2, (function (k, v1, v2) {
-          if (v1 !== undefined && v2 !== undefined) {
-            return Caml_option.some(undefined);
-          }
-          
-        }));
-  return Belt_Set.fromArray(Belt_MapDict.keysToArray(m.data), Icmp);
-}
-
-function mergeUnion(s1, s2) {
-  var m = Belt_Map.merge(s1, s2, (function (k, v1, v2) {
-          if (v1 !== undefined || v2 !== undefined) {
-            return Caml_option.some(undefined);
-          }
-          
-        }));
-  return Belt_Set.fromArray(Belt_MapDict.keysToArray(m.data), Icmp);
-}
-
-function mergeDiff(s1, s2) {
-  var m = Belt_Map.merge(s1, s2, (function (k, v1, v2) {
-          if (v1 !== undefined && v2 === undefined) {
-            return Caml_option.some(undefined);
-          }
-          
-        }));
-  return Belt_Set.fromArray(Belt_MapDict.keysToArray(m.data), Icmp);
-}
-
-function randomRange(i, j) {
-  return Belt_Array.map(Array_data_util.randomRange(i, j), (function (x) {
-                return [
-                        x,
-                        x
-                      ];
-              }));
-}
-
-var u0 = Belt_Map.fromArray(randomRange(0, 100), Icmp);
-
-var u1 = Belt_Map.fromArray(randomRange(30, 120), Icmp);
-
-b("File \"bs_poly_map_test.res\", line 64, characters 4-11", Belt_Set.eq(mergeInter(u0, u1), Belt_Set.fromArray(Array_data_util.range(30, 100), Icmp)));
-
-b("File \"bs_poly_map_test.res\", line 65, characters 4-11", Belt_Set.eq(mergeUnion(u0, u1), Belt_Set.fromArray(Array_data_util.range(0, 120), Icmp)));
-
-b("File \"bs_poly_map_test.res\", line 66, characters 4-11", Belt_Set.eq(mergeDiff(u0, u1), Belt_Set.fromArray(Array_data_util.range(0, 29), Icmp)));
-
-b("File \"bs_poly_map_test.res\", line 67, characters 4-11", Belt_Set.eq(mergeDiff(u1, u0), Belt_Set.fromArray(Array_data_util.range(101, 120), Icmp)));
-
-var a0 = Belt_Map.fromArray(randomRange(0, 10), Icmp);
-
-var a1 = Belt_Map.set(a0, 3, 33);
-
-var a2 = Belt_Map.remove(a1, 3);
-
-var a3 = Belt_Map.update(a2, 3, (function (k) {
-        if (k !== undefined) {
-          return k + 1 | 0;
-        } else {
-          return 11;
-        }
-      }));
-
-var a4 = Belt_Map.update(a2, 3, (function (k) {
-        if (k !== undefined) {
-          return k + 1 | 0;
-        }
-        
-      }));
-
-var a5 = Belt_Map.remove(a0, 3);
-
-var a6 = Belt_Map.remove(a5, 3);
-
-b("File \"bs_poly_map_test.res\", line 88, characters 4-11", a5 === a6);
-
-b("File \"bs_poly_map_test.res\", line 89, characters 4-11", Belt_Map.has(a0, 3));
-
-b("File \"bs_poly_map_test.res\", line 90, characters 4-11", !Belt_Map.has(a5, 3));
-
-b("File \"bs_poly_map_test.res\", line 91, characters 4-11", 3 === Belt_Map.getUndefined(a0, 3));
-
-b("File \"bs_poly_map_test.res\", line 92, characters 4-11", 33 === Belt_Map.getUndefined(a1, 3));
-
-b("File \"bs_poly_map_test.res\", line 93, characters 4-11", Belt_Map.getUndefined(a2, 3) === undefined);
-
-b("File \"bs_poly_map_test.res\", line 95, characters 4-11", 11 === Belt_Map.getUndefined(a3, 3));
-
-b("File \"bs_poly_map_test.res\", line 96, characters 4-11", Belt_Map.getUndefined(a4, 3) === undefined);
-
-var a7 = Belt_Map.removeMany(a0, [
-      7,
-      8,
-      0,
-      1,
-      3,
-      2,
-      4,
-      922,
-      4,
-      5,
-      6
-    ]);
-
-eq("File \"bs_poly_map_test.res\", line 99, characters 5-12", Belt_MapDict.keysToArray(a7.data), [
-      9,
-      10
-    ]);
-
-var a8 = Belt_Map.removeMany(a7, Array_data_util.randomRange(0, 100));
-
-b("File \"bs_poly_map_test.res\", line 101, characters 4-11", Belt_MapDict.isEmpty(a8.data));
-
-var u0$1 = Belt_Map.fromArray(randomRange(0, 100), Icmp);
-
-var u1$1 = Belt_Map.set(u0$1, 3, 32);
-
-eq("File \"bs_poly_map_test.res\", line 108, characters 5-12", Belt_Map.get(u1$1, 3), 32);
-
-eq("File \"bs_poly_map_test.res\", line 109, characters 5-12", Belt_Map.get(u0$1, 3), 3);
-
-function acc(m, is) {
-  return Belt_Array.reduce(is, m, (function (a, i) {
-                return Belt_Map.update(a, i, (function (n) {
-                              if (n !== undefined) {
-                                return n + 1 | 0;
-                              } else {
-                                return 1;
-                              }
-                            }));
-              }));
-}
-
-var m_cmp = Icmp.cmp;
-
-var m = {
-  cmp: m_cmp,
-  data: undefined
-};
-
-var m1 = acc(m, Belt_Array.concat(Array_data_util.randomRange(0, 20), Array_data_util.randomRange(10, 30)));
-
-b("File \"bs_poly_map_test.res\", line 126, characters 4-11", Belt_Map.eq(m1, Belt_Map.fromArray(Belt_Array.makeBy(31, (function (i) {
-                    return [
-                            i,
-                            i >= 10 && i <= 20 ? 2 : 1
-                          ];
-                  })), Icmp), (function (x, y) {
-            return x === y;
-          })));
-
-var v0_cmp = Icmp.cmp;
-
-var v0 = {
-  cmp: v0_cmp,
-  data: undefined
-};
-
-var v1 = Belt_Map.mergeMany(v0, Belt_Array.map(Array_data_util.randomRange(0, 10000), (function (x) {
-            return [
-                    x,
-                    x
-                  ];
-          })));
-
-var v2 = Belt_Map.fromArray(Belt_Array.map(Array_data_util.randomRange(0, 10000), (function (x) {
-            return [
-                    x,
-                    x
-                  ];
-          })), Icmp);
-
-b("File \"bs_poly_map_test.res\", line 150, characters 4-11", Belt_Map.eq(v1, v2, (function (x, y) {
-            return x === y;
-          })));
-
-function inc(x) {
-  if (x !== undefined) {
-    return x + 1 | 0;
-  } else {
-    return 0;
-  }
-}
-
-var v3 = Belt_Map.update(v1, 10, inc);
-
-var v4 = Belt_Map.update(v3, -10, inc);
-
-var match = Belt_Map.split(v3, 5000);
-
-var pres = match[1];
-
-var match$1 = match[0];
-
-var match$2 = Belt_Map.get(v3, 10);
-
-b("File \"bs_poly_map_test.res\", line 161, characters 4-11", match$2 !== undefined ? match$2 === 11 : false);
-
-var match$3 = Belt_Map.get(v3, -10);
-
-b("File \"bs_poly_map_test.res\", line 168, characters 4-11", match$3 === undefined);
-
-var match$4 = Belt_Map.get(v4, -10);
-
-b("File \"bs_poly_map_test.res\", line 175, characters 4-11", match$4 !== undefined ? match$4 === 0 : false);
-
-var map = Belt_Map.remove({
-      cmp: Icmp.cmp,
-      data: undefined
-    }, 0);
-
-b("File \"bs_poly_map_test.res\", line 181, characters 4-11", Belt_MapDict.isEmpty(map.data));
-
-var map$1 = Belt_Map.removeMany({
-      cmp: Icmp.cmp,
-      data: undefined
-    }, [0]);
-
-b("File \"bs_poly_map_test.res\", line 182, characters 4-11", Belt_MapDict.isEmpty(map$1.data));
-
-b("File \"bs_poly_map_test.res\", line 184, characters 4-11", pres !== undefined ? pres === 5000 : false);
-
-b("File \"bs_poly_map_test.res\", line 190, characters 4-11", Belt_Array.eq(Belt_MapDict.keysToArray(match$1[0].data), Belt_Array.makeBy(5000, (function (i) {
-                return i;
-              })), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_poly_map_test.res\", line 191, characters 4-11", Belt_Array.eq(Belt_MapDict.keysToArray(match$1[1].data), Belt_Array.makeBy(5000, (function (i) {
-                return 5001 + i | 0;
-              })), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-var v7 = Belt_Map.remove(v3, 5000);
-
-var match$5 = Belt_Map.split(v7, 5000);
-
-var match$6 = match$5[0];
-
-b("File \"bs_poly_map_test.res\", line 196, characters 4-11", match$5[1] === undefined);
-
-b("File \"bs_poly_map_test.res\", line 202, characters 4-11", Belt_Array.eq(Belt_MapDict.keysToArray(match$6[0].data), Belt_Array.makeBy(5000, (function (i) {
-                return i;
-              })), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_poly_map_test.res\", line 203, characters 4-11", Belt_Array.eq(Belt_MapDict.keysToArray(match$6[1].data), Belt_Array.makeBy(5000, (function (i) {
-                return 5001 + i | 0;
-              })), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-Mt.from_pair_suites("Bs_poly_map_test", suites.contents);
-
-var M;
-
-var N;
-
-var A;
-
-var I;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.Icmp = Icmp;
-exports.M = M;
-exports.N = N;
-exports.A = A;
-exports.I = I;
-exports.mapOfArray = mapOfArray;
-exports.setOfArray = setOfArray;
-exports.emptyMap = emptyMap;
-exports.mergeInter = mergeInter;
-exports.mergeUnion = mergeUnion;
-exports.mergeDiff = mergeDiff;
-exports.randomRange = randomRange;
-exports.acc = acc;
-/* Icmp Not a pure module */
diff --git a/jscomp/test/bs_poly_map_test.res b/jscomp/test/bs_poly_map_test.res
deleted file mode 100644
index d3084fa..0000000
--- a/jscomp/test/bs_poly_map_test.res
+++ /dev/null
@@ -1,206 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~suites, ~test_id, loc, x, y)
-let b = (loc, v) => Mt.bool_suites(~suites, ~test_id, loc, v)
-
-module Icmp = unpack(Belt.Id.comparable(~cmp=(x: int, y) => compare(x, y)))
-module M = Belt.Map
-module N = Belt.Set
-
-module A = Belt.Array
-module I = Array_data_util
-
-let mapOfArray = x => M.fromArray(~id=module(Icmp), x)
-let setOfArray = x => N.fromArray(~id=module(Icmp), x)
-let emptyMap = () => M.make(~id=module(Icmp))
-
-let mergeInter = (s1, s2) =>
-  \"@@"(
-    setOfArray,
-    M.keysToArray(
-      M.merge(s1, s2, (k, v1, v2) =>
-        switch (v1, v2) {
-        | (Some(_), Some(_)) => Some()
-        | (_, _) => None
-        }
-      ),
-    ),
-  )
-
-let mergeUnion = (s1, s2) =>
-  \"@@"(
-    setOfArray,
-    \"@@"(
-      M.keysToArray,
-      M.merge(s1, s2, (k, v1, v2) =>
-        switch (v1, v2) {
-        | (None, None) => None
-        | (_, _) => Some()
-        }
-      ),
-    ),
-  )
-let mergeDiff = (s1, s2) =>
-  \"@@"(
-    setOfArray,
-    \"@@"(
-      M.keysToArray,
-      M.merge(s1, s2, (k, v1, v2) =>
-        switch (v1, v2) {
-        | (Some(_), None) => Some()
-        | (Some(_), Some(_))
-        | (None, _) =>
-          None
-        }
-      ),
-    ),
-  )
-
-let randomRange = (i, j) => A.map(I.randomRange(i, j), x => (x, x))
-
-let () = {
-  let u0 = mapOfArray(randomRange(0, 100))
-  let u1 = mapOfArray(randomRange(30, 120))
-  b(__LOC__, N.eq(mergeInter(u0, u1), setOfArray(I.range(30, 100))))
-  b(__LOC__, N.eq(mergeUnion(u0, u1), setOfArray(I.range(0, 120))))
-  b(__LOC__, N.eq(mergeDiff(u0, u1), setOfArray(I.range(0, 29))))
-  b(__LOC__, N.eq(mergeDiff(u1, u0), setOfArray(I.range(101, 120))))
-}
-
-let () = {
-  let a0 = mapOfArray(randomRange(0, 10))
-  let a1 = M.set(a0, 3, 33) /* (3,3) */
-  let a2 = M.remove(a1, 3) /* no 3 */
-  let a3 = M.update(a2, 3, (k: option<int>) =>
-    switch k {
-    | Some(k: int) => Some(k + 1)
-    | None => Some(11)
-    }
-  ) /* 3, 11 */
-  let a4 = M.update(a2, 3, k =>
-    switch k {
-    | Some(k) => Some(k + 1)
-    | None => None
-    }
-  ) /* no 3 */
-  let a5 = M.remove(a0, 3)
-  let a6 = M.remove(a5, 3)
-  b(__LOC__, a5 === a6)
-  b(__LOC__, M.has(a0, 3))
-  b(__LOC__, !M.has(a5, 3))
-  b(__LOC__, Js.eqUndefined(3, M.getUndefined(a0, 3)))
-  b(__LOC__, Js.eqUndefined(33, M.getUndefined(a1, 3)))
-  b(__LOC__, M.getUndefined(a2, 3) == Js.undefined)
-
-  b(__LOC__, Js.eqUndefined(11, M.getUndefined(a3, 3)))
-  b(__LOC__, M.getUndefined(a4, 3) == Js.undefined)
-
-  let a7 = M.removeMany(a0, [7, 8, 0, 1, 3, 2, 4, 922, 4, 5, 6])
-  eq(__LOC__, M.keysToArray(a7), [9, 10])
-  let a8 = M.removeMany(a7, I.randomRange(0, 100))
-  b(__LOC__, M.isEmpty(a8))
-}
-
-let () = {
-  module Array = M
-  let u0 = mapOfArray(randomRange(0, 100))
-  let u1 = u0[3] = 32
-  eq(__LOC__, u1[3], Some(32))
-  eq(__LOC__, u0[3], Some(3))
-}
-
-let acc = (m, i) =>
-  M.update(m, i, n =>
-    switch n {
-    | None => Some(1)
-    | Some(acc) => Some(acc + 1)
-    }
-  )
-
-let acc = (m, is): M.t<_> => A.reduce(is, m, (a, i) => acc(a, i))
-
-let () = {
-  let m = emptyMap()
-  let m1 = acc(m, A.concat(I.randomRange(0, 20), I.randomRange(10, 30)))
-  b(
-    __LOC__,
-    M.eq(
-      m1,
-      mapOfArray(
-        A.makeBy(31, i => (
-          i,
-          if i >= 10 && i <= 20 {
-            2
-          } else {
-            1
-          },
-        )),
-      ),
-      (x, y) => x == y,
-    ),
-  )
-}
-
-let () = {
-  let v0 = emptyMap()
-  let v1 = M.mergeMany(v0, A.map(I.randomRange(0, 10_000), x => (x, x)))
-
-  let v2 = mapOfArray(A.map(I.randomRange(0, 10_000), x => (x, x)))
-
-  b(__LOC__, M.eq(v1, v2, (x, y) => x == y))
-
-  let inc = x =>
-    switch x {
-    | None => Some(0)
-    | Some(v) => Some(v + 1)
-    }
-  let v3 = M.update(v1, 10, inc)
-  let v4 = M.update(v3, -10, inc)
-  let ((v5, v6), pres) = M.split(v3, 5_000)
-  b(
-    __LOC__,
-    switch M.get(v3, 10) {
-    | Some(11) => true
-    | _ => false
-    },
-  )
-  b(
-    __LOC__,
-    switch M.get(v3, -10) {
-    | None => true
-    | _ => false
-    },
-  )
-  b(
-    __LOC__,
-    switch M.get(v4, -10) {
-    | Some(0) => true
-    | _ => false
-    },
-  )
-  b(__LOC__, M.isEmpty(M.remove(emptyMap(), 0)))
-  b(__LOC__, M.isEmpty(M.removeMany(emptyMap(), [0])))
-  b(
-    __LOC__,
-    switch pres {
-    | Some(5_000) => true
-    | _ => false
-    },
-  )
-  b(__LOC__, A.eq(M.keysToArray(v5), A.makeBy(5_000, i => i), \"="))
-  b(__LOC__, A.eq(M.keysToArray(v6), A.makeBy(5_000, i => 5_001 + i), \"="))
-
-  let v7 = M.remove(v3, 5_000)
-  let ((v8, v9), pres2) = M.split(v7, 5_000)
-  b(
-    __LOC__,
-    switch pres2 {
-    | None => true
-    | _ => false
-    },
-  )
-  b(__LOC__, A.eq(M.keysToArray(v8), A.makeBy(5_000, i => i), \"="))
-  b(__LOC__, A.eq(M.keysToArray(v9), A.makeBy(5_000, i => 5_001 + i), \"="))
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_poly_mutable_map_test.js b/jscomp/test/bs_poly_mutable_map_test.js
deleted file mode 100644
index 1237d06..0000000
--- a/jscomp/test/bs_poly_mutable_map_test.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Belt_Id = require("../../lib/js/belt_Id.js");
-var Belt_Set = require("../../lib/js/belt_Set.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Array_data_util = require("./array_data_util.js");
-var Belt_MutableMap = require("../../lib/js/belt_MutableMap.js");
-var Belt_internalAVLtree = require("../../lib/js/belt_internalAVLtree.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, v) {
-  Mt.bool_suites(test_id, suites, loc, v);
-}
-
-var Icmp = Belt_Id.comparable(Caml.int_compare);
-
-function f(x) {
-  return Belt_MutableMap.fromArray(x, Icmp);
-}
-
-function ff(x) {
-  return Belt_Set.fromArray(x, Icmp);
-}
-
-function randomRange(i, j) {
-  return Belt_Array.map(Array_data_util.randomRange(i, j), (function (x) {
-                return [
-                        x,
-                        x
-                      ];
-              }));
-}
-
-var a0 = Belt_MutableMap.fromArray(randomRange(0, 10), Icmp);
-
-Belt_MutableMap.set(a0, 3, 33);
-
-eq("File \"bs_poly_mutable_map_test.res\", line 27, characters 5-12", Belt_MutableMap.getExn(a0, 3), 33);
-
-Belt_MutableMap.removeMany(a0, [
-      7,
-      8,
-      0,
-      1,
-      3,
-      2,
-      4,
-      922,
-      4,
-      5,
-      6
-    ]);
-
-eq("File \"bs_poly_mutable_map_test.res\", line 29, characters 5-12", Belt_internalAVLtree.keysToArray(a0.data), [
-      9,
-      10
-    ]);
-
-Belt_MutableMap.removeMany(a0, Array_data_util.randomRange(0, 100));
-
-b("File \"bs_poly_mutable_map_test.res\", line 31, characters 4-11", Belt_MutableMap.isEmpty(a0));
-
-var a0$1 = Belt_MutableMap.fromArray(randomRange(0, 10000), Icmp);
-
-Belt_MutableMap.set(a0$1, 2000, 33);
-
-Belt_MutableMap.removeMany(a0$1, Belt_Array.map(randomRange(0, 1998), (function (prim) {
-            return prim[0];
-          })));
-
-Belt_MutableMap.removeMany(a0$1, Belt_Array.map(randomRange(2002, 11000), (function (prim) {
-            return prim[0];
-          })));
-
-eq("File \"bs_poly_mutable_map_test.res\", line 39, characters 5-12", Belt_internalAVLtree.toArray(a0$1.data), [
-      [
-        1999,
-        1999
-      ],
-      [
-        2000,
-        33
-      ],
-      [
-        2001,
-        2001
-      ]
-    ]);
-
-Mt.from_pair_suites("Bs_poly_mutable_map_test", suites.contents);
-
-var M;
-
-var N;
-
-var A;
-
-var I;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.Icmp = Icmp;
-exports.M = M;
-exports.N = N;
-exports.A = A;
-exports.I = I;
-exports.f = f;
-exports.ff = ff;
-exports.randomRange = randomRange;
-/* Icmp Not a pure module */
diff --git a/jscomp/test/bs_poly_mutable_map_test.res b/jscomp/test/bs_poly_mutable_map_test.res
deleted file mode 100644
index f79d8c7..0000000
--- a/jscomp/test/bs_poly_mutable_map_test.res
+++ /dev/null
@@ -1,42 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~suites, ~test_id, loc, x, y)
-let b = (loc, v) => Mt.bool_suites(~suites, ~test_id, loc, v)
-
-module Icmp = unpack(Belt.Id.comparable(~cmp=(x: int, y) => compare(x, y)))
-module M = Belt.MutableMap
-module N = Belt.Set
-
-module A = Belt.Array
-module I = Array_data_util
-let f = x => M.fromArray(~id=module(Icmp), x)
-let ff = x => N.fromArray(~id=module(Icmp), x)
-
-let randomRange = (i, j): array<(int, int)> => A.map(I.randomRange(i, j), x => (x, x))
-
-%%private(
-  let (\".!()<-", \".!()") = {
-    open M
-    (set, getExn)
-  }
-)
-
-let () = {
-  let a0 = f(randomRange(0, 10))
-  \".!()<-"(a0, 3, 33)
-  eq(__LOC__, M.getExn(a0, 3), 33)
-  M.removeMany(a0, [7, 8, 0, 1, 3, 2, 4, 922, 4, 5, 6])
-  eq(__LOC__, M.keysToArray(a0), [9, 10])
-  M.removeMany(a0, I.randomRange(0, 100))
-  b(__LOC__, M.isEmpty(a0))
-}
-
-let () = {
-  let a0 = f(randomRange(0, 10000))
-  \".!()<-"(a0, 2000, 33)
-  a0->M.removeMany(randomRange(0, 1998)->A.map(fst))
-  a0->M.removeMany(randomRange(2002, 11000)->A.map(fst))
-  eq(__LOC__, a0->M.toArray, [(1999, 1999), (2000, 33), (2001, 2001)])
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_poly_mutable_set_test.js b/jscomp/test/bs_poly_mutable_set_test.js
deleted file mode 100644
index a2a1a92..0000000
--- a/jscomp/test/bs_poly_mutable_set_test.js
+++ /dev/null
@@ -1,359 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Belt_Id = require("../../lib/js/belt_Id.js");
-var Belt_List = require("../../lib/js/belt_List.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Array_data_util = require("./array_data_util.js");
-var Belt_MutableSet = require("../../lib/js/belt_MutableSet.js");
-var Belt_internalAVLset = require("../../lib/js/belt_internalAVLset.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-var IntCmp = Belt_Id.comparable(Caml.int_compare);
-
-function fromArray(param) {
-  return Belt_MutableSet.fromArray(param, IntCmp);
-}
-
-function empty(param) {
-  return {
-          cmp: IntCmp.cmp,
-          data: undefined
-        };
-}
-
-var u = fromArray(Array_data_util.range(0, 30));
-
-b("File \"bs_poly_mutable_set_test.res\", line 16, characters 4-11", Belt_MutableSet.removeCheck(u, 0));
-
-b("File \"bs_poly_mutable_set_test.res\", line 17, characters 4-11", !Belt_MutableSet.removeCheck(u, 0));
-
-b("File \"bs_poly_mutable_set_test.res\", line 18, characters 4-11", Belt_MutableSet.removeCheck(u, 30));
-
-b("File \"bs_poly_mutable_set_test.res\", line 19, characters 4-11", Belt_MutableSet.removeCheck(u, 20));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 20, characters 5-12", Belt_internalAVLset.size(u.data), 28);
-
-var r = Array_data_util.randomRange(0, 30);
-
-b("File \"bs_poly_mutable_set_test.res\", line 22, characters 4-11", 29 === Belt_internalAVLset.maxUndefined(u.data));
-
-b("File \"bs_poly_mutable_set_test.res\", line 23, characters 4-11", 1 === Belt_internalAVLset.minUndefined(u.data));
-
-Belt_MutableSet.add(u, 3);
-
-for(var i = 0 ,i_finish = r.length; i < i_finish; ++i){
-  Belt_MutableSet.remove(u, r[i]);
-}
-
-b("File \"bs_poly_mutable_set_test.res\", line 28, characters 4-11", Belt_MutableSet.isEmpty(u));
-
-Belt_MutableSet.add(u, 0);
-
-Belt_MutableSet.add(u, 1);
-
-Belt_MutableSet.add(u, 2);
-
-Belt_MutableSet.add(u, 0);
-
-eq("File \"bs_poly_mutable_set_test.res\", line 33, characters 5-12", Belt_internalAVLset.size(u.data), 3);
-
-b("File \"bs_poly_mutable_set_test.res\", line 34, characters 4-11", !Belt_MutableSet.isEmpty(u));
-
-for(var i$1 = 0; i$1 <= 3; ++i$1){
-  Belt_MutableSet.remove(u, i$1);
-}
-
-b("File \"bs_poly_mutable_set_test.res\", line 38, characters 4-11", Belt_MutableSet.isEmpty(u));
-
-Belt_MutableSet.mergeMany(u, Array_data_util.randomRange(0, 20000));
-
-Belt_MutableSet.mergeMany(u, Array_data_util.randomRange(0, 200));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 41, characters 5-12", Belt_internalAVLset.size(u.data), 20001);
-
-Belt_MutableSet.removeMany(u, Array_data_util.randomRange(0, 200));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 43, characters 5-12", Belt_internalAVLset.size(u.data), 19800);
-
-Belt_MutableSet.removeMany(u, Array_data_util.randomRange(0, 1000));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 45, characters 5-12", Belt_internalAVLset.size(u.data), 19000);
-
-Belt_MutableSet.removeMany(u, Array_data_util.randomRange(0, 1000));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 47, characters 5-12", Belt_internalAVLset.size(u.data), 19000);
-
-Belt_MutableSet.removeMany(u, Array_data_util.randomRange(1000, 10000));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 49, characters 5-12", Belt_internalAVLset.size(u.data), 10000);
-
-Belt_MutableSet.removeMany(u, Array_data_util.randomRange(10000, 19999));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 51, characters 5-12", Belt_internalAVLset.size(u.data), 1);
-
-b("File \"bs_poly_mutable_set_test.res\", line 52, characters 4-11", Belt_MutableSet.has(u, 20000));
-
-Belt_MutableSet.removeMany(u, Array_data_util.randomRange(10000, 30000));
-
-b("File \"bs_poly_mutable_set_test.res\", line 54, characters 4-11", Belt_MutableSet.isEmpty(u));
-
-var v = fromArray(Array_data_util.randomRange(1000, 2000));
-
-var bs = Belt_Array.map(Array_data_util.randomRange(500, 1499), (function (x) {
-        return Belt_MutableSet.removeCheck(v, x);
-      }));
-
-var indeedRemoved = Belt_Array.reduce(bs, 0, (function (acc, x) {
-        if (x) {
-          return acc + 1 | 0;
-        } else {
-          return acc;
-        }
-      }));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 67, characters 5-12", indeedRemoved, 500);
-
-eq("File \"bs_poly_mutable_set_test.res\", line 68, characters 5-12", Belt_internalAVLset.size(v.data), 501);
-
-var cs = Belt_Array.map(Array_data_util.randomRange(500, 2000), (function (x) {
-        return Belt_MutableSet.addCheck(v, x);
-      }));
-
-var indeedAded = Belt_Array.reduce(cs, 0, (function (acc, x) {
-        if (x) {
-          return acc + 1 | 0;
-        } else {
-          return acc;
-        }
-      }));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 77, characters 5-12", indeedAded, 1000);
-
-eq("File \"bs_poly_mutable_set_test.res\", line 78, characters 5-12", Belt_internalAVLset.size(v.data), 1501);
-
-b("File \"bs_poly_mutable_set_test.res\", line 79, characters 4-11", Belt_MutableSet.isEmpty({
-          cmp: IntCmp.cmp,
-          data: undefined
-        }));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 80, characters 5-12", Belt_internalAVLset.minimum(v.data), 500);
-
-eq("File \"bs_poly_mutable_set_test.res\", line 81, characters 5-12", Belt_internalAVLset.maximum(v.data), 2000);
-
-eq("File \"bs_poly_mutable_set_test.res\", line 82, characters 5-12", Belt_internalAVLset.minUndefined(v.data), 500);
-
-eq("File \"bs_poly_mutable_set_test.res\", line 83, characters 5-12", Belt_internalAVLset.maxUndefined(v.data), 2000);
-
-eq("File \"bs_poly_mutable_set_test.res\", line 84, characters 5-12", Belt_MutableSet.reduce(v, 0, (function (x, y) {
-            return x + y | 0;
-          })), 1876250);
-
-b("File \"bs_poly_mutable_set_test.res\", line 85, characters 4-11", Belt_List.eq(Belt_internalAVLset.toList(v.data), Belt_List.makeBy(1501, (function (i) {
-                return i + 500 | 0;
-              })), (function (x, y) {
-            return x === y;
-          })));
-
-eq("File \"bs_poly_mutable_set_test.res\", line 86, characters 5-12", Belt_internalAVLset.toArray(v.data), Array_data_util.range(500, 2000));
-
-Belt_internalAVLset.checkInvariantInternal(v.data);
-
-eq("File \"bs_poly_mutable_set_test.res\", line 88, characters 5-12", Belt_MutableSet.get(v, 3), undefined);
-
-eq("File \"bs_poly_mutable_set_test.res\", line 89, characters 5-12", Belt_MutableSet.get(v, 1200), 1200);
-
-var match = Belt_MutableSet.split(v, 1000);
-
-var match$1 = match[0];
-
-var bb = match$1[1];
-
-var aa = match$1[0];
-
-b("File \"bs_poly_mutable_set_test.res\", line 91, characters 4-11", match[1]);
-
-b("File \"bs_poly_mutable_set_test.res\", line 92, characters 4-11", Belt_Array.eq(Belt_internalAVLset.toArray(aa.data), Array_data_util.range(500, 999), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_poly_mutable_set_test.res\", line 93, characters 4-11", Belt_Array.eq(Belt_internalAVLset.toArray(bb.data), Array_data_util.range(1001, 2000), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_poly_mutable_set_test.res\", line 94, characters 4-11", Belt_MutableSet.subset(aa, v));
-
-b("File \"bs_poly_mutable_set_test.res\", line 95, characters 4-11", Belt_MutableSet.subset(bb, v));
-
-b("File \"bs_poly_mutable_set_test.res\", line 96, characters 4-11", Belt_MutableSet.isEmpty(Belt_MutableSet.intersect(aa, bb)));
-
-var c = Belt_MutableSet.removeCheck(v, 1000);
-
-b("File \"bs_poly_mutable_set_test.res\", line 98, characters 4-11", c);
-
-var match$2 = Belt_MutableSet.split(v, 1000);
-
-var match$3 = match$2[0];
-
-var bb$1 = match$3[1];
-
-var aa$1 = match$3[0];
-
-b("File \"bs_poly_mutable_set_test.res\", line 100, characters 4-11", !match$2[1]);
-
-b("File \"bs_poly_mutable_set_test.res\", line 101, characters 4-11", Belt_Array.eq(Belt_internalAVLset.toArray(aa$1.data), Array_data_util.range(500, 999), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_poly_mutable_set_test.res\", line 102, characters 4-11", Belt_Array.eq(Belt_internalAVLset.toArray(bb$1.data), Array_data_util.range(1001, 2000), (function (prim0, prim1) {
-            return prim0 === prim1;
-          })));
-
-b("File \"bs_poly_mutable_set_test.res\", line 103, characters 4-11", Belt_MutableSet.subset(aa$1, v));
-
-b("File \"bs_poly_mutable_set_test.res\", line 104, characters 4-11", Belt_MutableSet.subset(bb$1, v));
-
-b("File \"bs_poly_mutable_set_test.res\", line 105, characters 4-11", Belt_MutableSet.isEmpty(Belt_MutableSet.intersect(aa$1, bb$1)));
-
-var aa$2 = fromArray(Array_data_util.randomRange(0, 100));
-
-var bb$2 = fromArray(Array_data_util.randomRange(40, 120));
-
-var cc = Belt_MutableSet.union(aa$2, bb$2);
-
-b("File \"bs_poly_mutable_set_test.res\", line 115, characters 4-11", Belt_MutableSet.eq(cc, fromArray(Array_data_util.randomRange(0, 120))));
-
-b("File \"bs_poly_mutable_set_test.res\", line 118, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.union(fromArray(Array_data_util.randomRange(0, 20)), fromArray(Array_data_util.randomRange(21, 40))), fromArray(Array_data_util.randomRange(0, 40))));
-
-var dd = Belt_MutableSet.intersect(aa$2, bb$2);
-
-b("File \"bs_poly_mutable_set_test.res\", line 122, characters 4-11", Belt_MutableSet.eq(dd, fromArray(Array_data_util.randomRange(40, 100))));
-
-b("File \"bs_poly_mutable_set_test.res\", line 124, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.intersect(fromArray(Array_data_util.randomRange(0, 20)), fromArray(Array_data_util.randomRange(21, 40))), {
-          cmp: IntCmp.cmp,
-          data: undefined
-        }));
-
-b("File \"bs_poly_mutable_set_test.res\", line 128, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.intersect(fromArray(Array_data_util.randomRange(21, 40)), fromArray(Array_data_util.randomRange(0, 20))), {
-          cmp: IntCmp.cmp,
-          data: undefined
-        }));
-
-b("File \"bs_poly_mutable_set_test.res\", line 131, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.intersect(fromArray([
-                  1,
-                  3,
-                  4,
-                  5,
-                  7,
-                  9
-                ]), fromArray([
-                  2,
-                  4,
-                  5,
-                  6,
-                  8,
-                  10
-                ])), fromArray([
-              4,
-              5
-            ])));
-
-b("File \"bs_poly_mutable_set_test.res\", line 132, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.diff(aa$2, bb$2), fromArray(Array_data_util.randomRange(0, 39))));
-
-b("File \"bs_poly_mutable_set_test.res\", line 133, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.diff(bb$2, aa$2), fromArray(Array_data_util.randomRange(101, 120))));
-
-b("File \"bs_poly_mutable_set_test.res\", line 135, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.diff(fromArray(Array_data_util.randomRange(21, 40)), fromArray(Array_data_util.randomRange(0, 20))), fromArray(Array_data_util.randomRange(21, 40))));
-
-b("File \"bs_poly_mutable_set_test.res\", line 142, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.diff(fromArray(Array_data_util.randomRange(0, 20)), fromArray(Array_data_util.randomRange(21, 40))), fromArray(Array_data_util.randomRange(0, 20))));
-
-b("File \"bs_poly_mutable_set_test.res\", line 150, characters 4-11", Belt_MutableSet.eq(Belt_MutableSet.diff(fromArray(Array_data_util.randomRange(0, 20)), fromArray(Array_data_util.randomRange(0, 40))), fromArray(Array_data_util.randomRange(0, -1))));
-
-var a0 = fromArray(Array_data_util.randomRange(0, 1000));
-
-var a1 = Belt_MutableSet.keep(a0, (function (x) {
-        return x % 2 === 0;
-      }));
-
-var a2 = Belt_MutableSet.keep(a0, (function (x) {
-        return x % 2 !== 0;
-      }));
-
-var match$4 = Belt_MutableSet.partition(a0, (function (x) {
-        return x % 2 === 0;
-      }));
-
-var a4 = match$4[1];
-
-var a3 = match$4[0];
-
-b("File \"bs_poly_mutable_set_test.res\", line 162, characters 4-11", Belt_MutableSet.eq(a1, a3));
-
-b("File \"bs_poly_mutable_set_test.res\", line 163, characters 4-11", Belt_MutableSet.eq(a2, a4));
-
-Belt_List.forEach({
-      hd: a0,
-      tl: {
-        hd: a1,
-        tl: {
-          hd: a2,
-          tl: {
-            hd: a3,
-            tl: {
-              hd: a4,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    }, (function (x) {
-        Belt_internalAVLset.checkInvariantInternal(x.data);
-      }));
-
-Mt.from_pair_suites("Bs_poly_mutable_set_test", suites.contents);
-
-var N;
-
-var I;
-
-var A;
-
-var L;
-
-var $plus$plus = Belt_MutableSet.union;
-
-var f = fromArray;
-
-var $eq$tilde = Belt_MutableSet.eq;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.N = N;
-exports.I = I;
-exports.A = A;
-exports.IntCmp = IntCmp;
-exports.L = L;
-exports.fromArray = fromArray;
-exports.empty = empty;
-exports.$plus$plus = $plus$plus;
-exports.f = f;
-exports.$eq$tilde = $eq$tilde;
-/* IntCmp Not a pure module */
diff --git a/jscomp/test/bs_poly_mutable_set_test.res b/jscomp/test/bs_poly_mutable_set_test.res
deleted file mode 100644
index d808233..0000000
--- a/jscomp/test/bs_poly_mutable_set_test.res
+++ /dev/null
@@ -1,167 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-
-module N = Belt.MutableSet
-module I = Array_data_util
-module A = Belt.Array
-module IntCmp = unpack(Belt.Id.comparable(~cmp=(x: int, y) => compare(x, y)))
-module L = Belt.List
-let fromArray = N.fromArray(~id=module(IntCmp))
-let empty = () => N.make(~id=module(IntCmp))
-
-let () = {
-  let u = fromArray(I.range(0, 30))
-  b(__LOC__, N.removeCheck(u, 0))
-  b(__LOC__, !N.removeCheck(u, 0))
-  b(__LOC__, N.removeCheck(u, 30))
-  b(__LOC__, N.removeCheck(u, 20))
-  eq(__LOC__, N.size(u), 28)
-  let r = I.randomRange(0, 30)
-  b(__LOC__, Js.eqUndefined(29, N.maxUndefined(u)))
-  b(__LOC__, Js.eqUndefined(1, N.minUndefined(u)))
-  N.add(u, 3)
-  for i in 0 to A.length(r) - 1 {
-    N.remove(u, A.getUnsafe(r, i))
-  }
-  b(__LOC__, N.isEmpty(u))
-  N.add(u, 0)
-  N.add(u, 1)
-  N.add(u, 2)
-  N.add(u, 0)
-  eq(__LOC__, N.size(u), 3)
-  b(__LOC__, !N.isEmpty(u))
-  for i in 0 to 3 {
-    N.remove(u, i)
-  }
-  b(__LOC__, N.isEmpty(u))
-  N.mergeMany(u, I.randomRange(0, 20000))
-  N.mergeMany(u, I.randomRange(0, 200))
-  eq(__LOC__, N.size(u), 20001)
-  N.removeMany(u, I.randomRange(0, 200))
-  eq(__LOC__, N.size(u), 19800)
-  N.removeMany(u, I.randomRange(0, 1000))
-  eq(__LOC__, N.size(u), 19000)
-  N.removeMany(u, I.randomRange(0, 1000))
-  eq(__LOC__, N.size(u), 19000)
-  N.removeMany(u, I.randomRange(1000, 10000))
-  eq(__LOC__, N.size(u), 10000)
-  N.removeMany(u, I.randomRange(10000, 20000 - 1))
-  eq(__LOC__, N.size(u), 1)
-  b(__LOC__, N.has(u, 20000))
-  N.removeMany(u, I.randomRange(10_000, 30_000))
-  b(__LOC__, N.isEmpty(u))
-}
-
-let () = {
-  let v = fromArray(I.randomRange(1_000, 2_000))
-  let bs = A.map(I.randomRange(500, 1499), x => N.removeCheck(v, x))
-  let indeedRemoved = A.reduce(bs, 0, (acc, x) =>
-    if x {
-      acc + 1
-    } else {
-      acc
-    }
-  )
-  eq(__LOC__, indeedRemoved, 500)
-  eq(__LOC__, N.size(v), 501)
-  let cs = A.map(I.randomRange(500, 2_000), x => N.addCheck(v, x))
-  let indeedAded = A.reduce(cs, 0, (acc, x) =>
-    if x {
-      acc + 1
-    } else {
-      acc
-    }
-  )
-  eq(__LOC__, indeedAded, 1000)
-  eq(__LOC__, N.size(v), 1_501)
-  b(__LOC__, N.isEmpty(empty()))
-  eq(__LOC__, N.minimum(v), Some(500))
-  eq(__LOC__, N.maximum(v), Some(2000))
-  eq(__LOC__, N.minUndefined(v), Js.Undefined.return(500))
-  eq(__LOC__, N.maxUndefined(v), Js.Undefined.return(2000))
-  eq(__LOC__, N.reduce(v, 0, (x, y) => x + y), (500 + 2000) / 2 * 1501)
-  b(__LOC__, L.eq(N.toList(v), L.makeBy(1_501, i => i + 500), (x, y) => x == y))
-  eq(__LOC__, N.toArray(v), I.range(500, 2000))
-  N.checkInvariantInternal(v)
-  eq(__LOC__, N.get(v, 3), None)
-  eq(__LOC__, N.get(v, 1_200), Some(1_200))
-  let ((aa, bb), pres) = N.split(v, 1000)
-  b(__LOC__, pres)
-  b(__LOC__, A.eq(N.toArray(aa), I.range(500, 999), \"="))
-  b(__LOC__, A.eq(N.toArray(bb), I.range(1_001, 2_000), \"="))
-  b(__LOC__, N.subset(aa, v))
-  b(__LOC__, N.subset(bb, v))
-  b(__LOC__, N.isEmpty(N.intersect(aa, bb)))
-  let c = N.removeCheck(v, 1_000)
-  b(__LOC__, c)
-  let ((aa, bb), pres) = N.split(v, 1_000)
-  b(__LOC__, !pres)
-  b(__LOC__, A.eq(N.toArray(aa), I.range(500, 999), \"="))
-  b(__LOC__, A.eq(N.toArray(bb), I.range(1_001, 2_000), \"="))
-  b(__LOC__, N.subset(aa, v))
-  b(__LOC__, N.subset(bb, v))
-  b(__LOC__, N.isEmpty(N.intersect(aa, bb)))
-}
-
-let \"++" = N.union
-let f = fromArray
-let \"=~" = N.eq
-let () = {
-  let aa = f(I.randomRange(0, 100))
-  let bb = f(I.randomRange(40, 120))
-  let cc = \"++"(aa, bb)
-  b(__LOC__, \"=~"(cc, f(I.randomRange(0, 120))))
-
-  b(
-    __LOC__,
-    N.eq(N.union(f(I.randomRange(0, 20)), f(I.randomRange(21, 40))), f(I.randomRange(0, 40))),
-  )
-  let dd = N.intersect(aa, bb)
-  b(__LOC__, \"=~"(dd, f(I.randomRange(40, 100))))
-  b(
-    __LOC__,
-    \"=~"(N.intersect(\"@@"(f, I.randomRange(0, 20)), \"@@"(f, I.randomRange(21, 40))), empty()),
-  )
-  b(
-    __LOC__,
-    \"=~"(N.intersect(\"@@"(f, I.randomRange(21, 40)), \"@@"(f, I.randomRange(0, 20))), empty()),
-  )
-  b(__LOC__, \"=~"(N.intersect(f([1, 3, 4, 5, 7, 9]), f([2, 4, 5, 6, 8, 10])), f([4, 5])))
-  b(__LOC__, \"=~"(N.diff(aa, bb), f(I.randomRange(0, 39))))
-  b(__LOC__, \"=~"(N.diff(bb, aa), f(I.randomRange(101, 120))))
-  b(
-    __LOC__,
-    \"=~"(
-      N.diff(\"@@"(f, I.randomRange(21, 40)), \"@@"(f, I.randomRange(0, 20))),
-      f(I.randomRange(21, 40)),
-    ),
-  )
-  b(
-    __LOC__,
-    \"=~"(
-      N.diff(\"@@"(f, I.randomRange(0, 20)), \"@@"(f, I.randomRange(21, 40))),
-      f(I.randomRange(0, 20)),
-    ),
-  )
-
-  b(
-    __LOC__,
-    \"=~"(
-      N.diff(\"@@"(f, I.randomRange(0, 20)), \"@@"(f, I.randomRange(0, 40))),
-      f(I.randomRange(0, -1)),
-    ),
-  )
-}
-
-let () = {
-  let a0 = fromArray(I.randomRange(0, 1000))
-  let (a1, a2) = (N.keep(a0, x => mod(x, 2) == 0), N.keep(a0, x => mod(x, 2) != 0))
-  let (a3, a4) = N.partition(a0, x => mod(x, 2) == 0)
-  b(__LOC__, N.eq(a1, a3))
-  b(__LOC__, N.eq(a2, a4))
-  L.forEach(list{a0, a1, a2, a3, a4}, x => N.checkInvariantInternal(x))
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_poly_set_test.js b/jscomp/test/bs_poly_set_test.js
deleted file mode 100644
index d2a95f7..0000000
--- a/jscomp/test/bs_poly_set_test.js
+++ /dev/null
@@ -1,422 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Belt_Id = require("../../lib/js/belt_Id.js");
-var Belt_Set = require("../../lib/js/belt_Set.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Belt_List = require("../../lib/js/belt_List.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_SetDict = require("../../lib/js/belt_SetDict.js");
-var Belt_SortArray = require("../../lib/js/belt_SortArray.js");
-var Array_data_util = require("./array_data_util.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function t(loc, x) {
-  Mt.throw_suites(test_id, suites, loc, x);
-}
-
-var IntCmp = Belt_Id.comparable(Caml.int_compare);
-
-var u0 = Belt_Set.fromArray(Array_data_util.range(0, 30), IntCmp);
-
-var u1 = Belt_Set.remove(u0, 0);
-
-var u2 = Belt_Set.remove(u1, 0);
-
-var u3 = Belt_Set.remove(u2, 30);
-
-var u4 = Belt_Set.remove(u3, 20);
-
-var r = Array_data_util.randomRange(0, 30);
-
-var u5 = Belt_Set.add(u4, 3);
-
-var u6 = Belt_Set.removeMany(u5, r);
-
-var u7 = Belt_Set.mergeMany(u6, [
-      0,
-      1,
-      2,
-      0
-    ]);
-
-var u8 = Belt_Set.removeMany(u7, [
-      0,
-      1,
-      2,
-      3
-    ]);
-
-var u9 = Belt_Set.mergeMany(u8, Array_data_util.randomRange(0, 20000));
-
-var u10 = Belt_Set.mergeMany(u9, Array_data_util.randomRange(0, 200));
-
-var u11 = Belt_Set.removeMany(u10, Array_data_util.randomRange(0, 200));
-
-var u12 = Belt_Set.removeMany(u11, Array_data_util.randomRange(0, 1000));
-
-var u13 = Belt_Set.removeMany(u12, Array_data_util.randomRange(0, 1000));
-
-var u14 = Belt_Set.removeMany(u13, Array_data_util.randomRange(1000, 10000));
-
-var u15 = Belt_Set.removeMany(u14, Array_data_util.randomRange(10000, 19999));
-
-var u16 = Belt_Set.removeMany(u15, Array_data_util.randomRange(20000, 21000));
-
-b("File \"bs_poly_set_test.res\", line 34, characters 4-11", u0 !== u1);
-
-b("File \"bs_poly_set_test.res\", line 35, characters 4-11", u2 === u1);
-
-eq("File \"bs_poly_set_test.res\", line 36, characters 5-12", Belt_SetDict.size(u4.data), 28);
-
-b("File \"bs_poly_set_test.res\", line 37, characters 4-11", 29 === Belt_SetDict.maxUndefined(u4.data));
-
-b("File \"bs_poly_set_test.res\", line 38, characters 4-11", 1 === Belt_SetDict.minUndefined(u4.data));
-
-b("File \"bs_poly_set_test.res\", line 39, characters 4-11", u4 === u5);
-
-b("File \"bs_poly_set_test.res\", line 40, characters 4-11", Belt_SetDict.isEmpty(u6.data));
-
-eq("File \"bs_poly_set_test.res\", line 41, characters 5-12", Belt_SetDict.size(u7.data), 3);
-
-b("File \"bs_poly_set_test.res\", line 42, characters 4-11", !Belt_SetDict.isEmpty(u7.data));
-
-b("File \"bs_poly_set_test.res\", line 43, characters 4-11", Belt_SetDict.isEmpty(u8.data));
-
-b("File \"bs_poly_set_test.res\", line 46, characters 4-11", Belt_Set.has(u10, 20));
-
-b("File \"bs_poly_set_test.res\", line 47, characters 4-11", Belt_Set.has(u10, 21));
-
-eq("File \"bs_poly_set_test.res\", line 48, characters 5-12", Belt_SetDict.size(u10.data), 20001);
-
-eq("File \"bs_poly_set_test.res\", line 49, characters 5-12", Belt_SetDict.size(u11.data), 19800);
-
-eq("File \"bs_poly_set_test.res\", line 50, characters 5-12", Belt_SetDict.size(u12.data), 19000);
-
-eq("File \"bs_poly_set_test.res\", line 52, characters 5-12", Belt_SetDict.size(u13.data), Belt_SetDict.size(u12.data));
-
-eq("File \"bs_poly_set_test.res\", line 53, characters 5-12", Belt_SetDict.size(u14.data), 10000);
-
-eq("File \"bs_poly_set_test.res\", line 54, characters 5-12", Belt_SetDict.size(u15.data), 1);
-
-b("File \"bs_poly_set_test.res\", line 55, characters 4-11", Belt_Set.has(u15, 20000));
-
-b("File \"bs_poly_set_test.res\", line 56, characters 4-11", !Belt_Set.has(u15, 2000));
-
-b("File \"bs_poly_set_test.res\", line 57, characters 4-11", Belt_SetDict.isEmpty(u16.data));
-
-var u17 = Belt_Set.fromArray(Array_data_util.randomRange(0, 100), IntCmp);
-
-var u18 = Belt_Set.fromArray(Array_data_util.randomRange(59, 200), IntCmp);
-
-var u19 = Belt_Set.union(u17, u18);
-
-var u20 = Belt_Set.fromArray(Array_data_util.randomRange(0, 200), IntCmp);
-
-var u21 = Belt_Set.intersect(u17, u18);
-
-var u22 = Belt_Set.diff(u17, u18);
-
-var u23 = Belt_Set.diff(u18, u17);
-
-var u24 = Belt_Set.union(u18, u17);
-
-var u25 = Belt_Set.add(u22, 59);
-
-var u26 = Belt_Set.add({
-      cmp: IntCmp.cmp,
-      data: undefined
-    }, 3);
-
-var ss = Belt_Array.makeByAndShuffle(100, (function (i) {
-        return (i << 1);
-      }));
-
-var u27 = Belt_Set.fromArray(ss, IntCmp);
-
-var u28 = Belt_Set.union(u27, u26);
-
-var u29 = Belt_Set.union(u26, u27);
-
-b("File \"bs_poly_set_test.res\", line 71, characters 4-11", Belt_Set.eq(u28, u29));
-
-b("File \"bs_poly_set_test.res\", line 72, characters 4-11", Caml_obj.equal(Belt_SetDict.toArray(u29.data), Belt_SortArray.stableSortBy(Belt_Array.concat(ss, [3]), Caml.int_compare)));
-
-b("File \"bs_poly_set_test.res\", line 73, characters 4-11", Belt_Set.eq(u19, u20));
-
-eq("File \"bs_poly_set_test.res\", line 74, characters 5-12", Belt_SetDict.toArray(u21.data), Array_data_util.range(59, 100));
-
-eq("File \"bs_poly_set_test.res\", line 75, characters 5-12", Belt_SetDict.toArray(u22.data), Array_data_util.range(0, 58));
-
-b("File \"bs_poly_set_test.res\", line 76, characters 4-11", Belt_Set.eq(u24, u19));
-
-eq("File \"bs_poly_set_test.res\", line 77, characters 5-12", Belt_SetDict.toArray(u23.data), Array_data_util.range(101, 200));
-
-b("File \"bs_poly_set_test.res\", line 78, characters 4-11", Belt_Set.subset(u23, u18));
-
-b("File \"bs_poly_set_test.res\", line 79, characters 4-11", !Belt_Set.subset(u18, u23));
-
-b("File \"bs_poly_set_test.res\", line 80, characters 4-11", Belt_Set.subset(u22, u17));
-
-b("File \"bs_poly_set_test.res\", line 81, characters 4-11", Belt_Set.subset(u21, u17) && Belt_Set.subset(u21, u18));
-
-b("File \"bs_poly_set_test.res\", line 82, characters 4-11", 47 === Belt_Set.getUndefined(u22, 47));
-
-b("File \"bs_poly_set_test.res\", line 83, characters 4-11", Caml_obj.equal(47, Belt_Set.get(u22, 47)));
-
-b("File \"bs_poly_set_test.res\", line 84, characters 4-11", Belt_Set.getUndefined(u22, 59) === undefined);
-
-b("File \"bs_poly_set_test.res\", line 85, characters 4-11", undefined === Belt_Set.get(u22, 59));
-
-eq("File \"bs_poly_set_test.res\", line 87, characters 5-12", Belt_SetDict.size(u25.data), 60);
-
-b("File \"bs_poly_set_test.res\", line 88, characters 4-11", Belt_SetDict.minimum(undefined) === undefined);
-
-b("File \"bs_poly_set_test.res\", line 89, characters 4-11", Belt_SetDict.maximum(undefined) === undefined);
-
-b("File \"bs_poly_set_test.res\", line 90, characters 4-11", Belt_SetDict.minUndefined(undefined) === undefined);
-
-b("File \"bs_poly_set_test.res\", line 91, characters 4-11", Belt_SetDict.maxUndefined(undefined) === undefined);
-
-function testIterToList(xs) {
-  var v = {
-    contents: /* [] */0
-  };
-  Belt_Set.forEach(xs, (function (x) {
-          v.contents = {
-            hd: x,
-            tl: v.contents
-          };
-        }));
-  return Belt_List.reverse(v.contents);
-}
-
-function testIterToList2(xs) {
-  var v = {
-    contents: /* [] */0
-  };
-  Belt_SetDict.forEach(xs.data, (function (x) {
-          v.contents = {
-            hd: x,
-            tl: v.contents
-          };
-        }));
-  return Belt_List.reverse(v.contents);
-}
-
-var u0$1 = Belt_Set.fromArray(Array_data_util.randomRange(0, 20), IntCmp);
-
-var u1$1 = Belt_Set.remove(u0$1, 17);
-
-var u2$1 = Belt_Set.add(u1$1, 33);
-
-b("File \"bs_poly_set_test.res\", line 110, characters 4-11", Belt_List.every2(testIterToList(u0$1), Belt_List.makeBy(21, (function (i) {
-                return i;
-              })), (function (x, y) {
-            return x === y;
-          })));
-
-b("File \"bs_poly_set_test.res\", line 111, characters 4-11", Belt_List.every2(testIterToList2(u0$1), Belt_List.makeBy(21, (function (i) {
-                return i;
-              })), (function (x, y) {
-            return x === y;
-          })));
-
-b("File \"bs_poly_set_test.res\", line 112, characters 4-11", Belt_List.every2(testIterToList(u0$1), Belt_SetDict.toList(u0$1.data), (function (x, y) {
-            return x === y;
-          })));
-
-b("File \"bs_poly_set_test.res\", line 113, characters 4-11", Belt_Set.some(u0$1, (function (x) {
-            return x === 17;
-          })));
-
-b("File \"bs_poly_set_test.res\", line 114, characters 4-11", !Belt_Set.some(u1$1, (function (x) {
-            return x === 17;
-          })));
-
-b("File \"bs_poly_set_test.res\", line 115, characters 4-11", Belt_Set.every(u0$1, (function (x) {
-            return x < 24;
-          })));
-
-b("File \"bs_poly_set_test.res\", line 116, characters 4-11", Belt_SetDict.every(u0$1.data, (function (x) {
-            return x < 24;
-          })));
-
-b("File \"bs_poly_set_test.res\", line 117, characters 4-11", !Belt_Set.every(u2$1, (function (x) {
-            return x < 24;
-          })));
-
-b("File \"bs_poly_set_test.res\", line 118, characters 4-11", !Belt_Set.every(Belt_Set.fromArray([
-              1,
-              2,
-              3
-            ], IntCmp), (function (x) {
-            return x === 2;
-          })));
-
-b("File \"bs_poly_set_test.res\", line 119, characters 4-11", Belt_Set.cmp(u1$1, u0$1) < 0);
-
-b("File \"bs_poly_set_test.res\", line 120, characters 4-11", Belt_Set.cmp(u0$1, u1$1) > 0);
-
-var a0 = Belt_Set.fromArray(Array_data_util.randomRange(0, 1000), IntCmp);
-
-var a1 = Belt_Set.keep(a0, (function (x) {
-        return x % 2 === 0;
-      }));
-
-var a2 = Belt_Set.keep(a0, (function (x) {
-        return x % 2 !== 0;
-      }));
-
-var match = Belt_Set.partition(a0, (function (x) {
-        return x % 2 === 0;
-      }));
-
-var a4 = match[1];
-
-var a3 = match[0];
-
-b("File \"bs_poly_set_test.res\", line 127, characters 4-11", Belt_Set.eq(a1, a3));
-
-b("File \"bs_poly_set_test.res\", line 128, characters 4-11", Belt_Set.eq(a2, a4));
-
-eq("File \"bs_poly_set_test.res\", line 129, characters 5-12", Belt_Set.getExn(a0, 3), 3);
-
-eq("File \"bs_poly_set_test.res\", line 130, characters 5-12", Belt_Set.getExn(a0, 4), 4);
-
-t("File \"bs_poly_set_test.res\", line 131, characters 4-11", (function (param) {
-        Belt_Set.getExn(a0, 1002);
-      }));
-
-t("File \"bs_poly_set_test.res\", line 132, characters 4-11", (function (param) {
-        Belt_Set.getExn(a0, -1);
-      }));
-
-eq("File \"bs_poly_set_test.res\", line 133, characters 5-12", Belt_SetDict.size(a0.data), 1001);
-
-b("File \"bs_poly_set_test.res\", line 134, characters 4-11", !Belt_SetDict.isEmpty(a0.data));
-
-var match$1 = Belt_Set.split(a0, 200);
-
-var match$2 = match$1[0];
-
-b("File \"bs_poly_set_test.res\", line 136, characters 4-11", match$1[1]);
-
-eq("File \"bs_poly_set_test.res\", line 137, characters 5-12", Belt_SetDict.toArray(match$2[0].data), Belt_Array.makeBy(200, (function (i) {
-            return i;
-          })));
-
-eq("File \"bs_poly_set_test.res\", line 138, characters 5-12", Belt_SetDict.toList(match$2[1].data), Belt_List.makeBy(800, (function (i) {
-            return i + 201 | 0;
-          })));
-
-var a7 = Belt_Set.remove(a0, 200);
-
-var match$3 = Belt_Set.split(a7, 200);
-
-var match$4 = match$3[0];
-
-var a9 = match$4[1];
-
-var a8 = match$4[0];
-
-b("File \"bs_poly_set_test.res\", line 141, characters 4-11", !match$3[1]);
-
-eq("File \"bs_poly_set_test.res\", line 142, characters 5-12", Belt_SetDict.toArray(a8.data), Belt_Array.makeBy(200, (function (i) {
-            return i;
-          })));
-
-eq("File \"bs_poly_set_test.res\", line 143, characters 5-12", Belt_SetDict.toList(a9.data), Belt_List.makeBy(800, (function (i) {
-            return i + 201 | 0;
-          })));
-
-eq("File \"bs_poly_set_test.res\", line 144, characters 5-12", Belt_SetDict.minimum(a8.data), 0);
-
-eq("File \"bs_poly_set_test.res\", line 145, characters 5-12", Belt_SetDict.minimum(a9.data), 201);
-
-Belt_List.forEach({
-      hd: a0,
-      tl: {
-        hd: a1,
-        tl: {
-          hd: a2,
-          tl: {
-            hd: a3,
-            tl: {
-              hd: a4,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    }, (function (x) {
-        Belt_SetDict.checkInvariantInternal(x.data);
-      }));
-
-var a = Belt_Set.fromArray([], IntCmp);
-
-var m = Belt_Set.keep(a, (function (x) {
-        return x % 2 === 0;
-      }));
-
-b("File \"bs_poly_set_test.res\", line 151, characters 4-11", Belt_SetDict.isEmpty(m.data));
-
-var match$5 = Belt_Set.split({
-      cmp: IntCmp.cmp,
-      data: undefined
-    }, 0);
-
-var match$6 = match$5[0];
-
-b("File \"bs_poly_set_test.res\", line 156, characters 4-11", Belt_SetDict.isEmpty(match$6[0].data));
-
-b("File \"bs_poly_set_test.res\", line 157, characters 4-11", Belt_SetDict.isEmpty(match$6[1].data));
-
-b("File \"bs_poly_set_test.res\", line 158, characters 4-11", !match$5[1]);
-
-Mt.from_pair_suites("Bs_poly_set_test", suites.contents);
-
-var N;
-
-var D;
-
-var I;
-
-var A;
-
-var S;
-
-var L;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.t = t;
-exports.N = N;
-exports.D = D;
-exports.I = I;
-exports.A = A;
-exports.S = S;
-exports.IntCmp = IntCmp;
-exports.L = L;
-exports.testIterToList = testIterToList;
-exports.testIterToList2 = testIterToList2;
-/* IntCmp Not a pure module */
diff --git a/jscomp/test/bs_poly_set_test.res b/jscomp/test/bs_poly_set_test.res
deleted file mode 100644
index f5d2ade..0000000
--- a/jscomp/test/bs_poly_set_test.res
+++ /dev/null
@@ -1,160 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-let t = (loc, x) => Mt.throw_suites(~test_id, ~suites, loc, x)
-module N = Belt.Set
-module D = Belt.Set.Dict
-module I = Array_data_util
-module A = Belt.Array
-module S = Belt.SortArray
-module IntCmp = unpack(Belt.Id.comparable(~cmp=(x: int, y) => compare(x, y)))
-module L = Belt.List
-
-let () = {
-  let u0 = N.fromArray(~id=module(IntCmp), I.range(0, 30))
-  let u1 = N.remove(u0, 0)
-  let u2 = N.remove(u1, 0)
-  let u3 = N.remove(u2, 30)
-  let u4 = N.remove(u3, 20)
-  let r = I.randomRange(0, 30)
-
-  let u5 = N.add(u4, 3)
-  let u6 = N.removeMany(u5, r)
-  let u7 = N.mergeMany(u6, [0, 1, 2, 0])
-  let u8 = N.removeMany(u7, [0, 1, 2, 3])
-  let u9 = N.mergeMany(u8, I.randomRange(0, 20000))
-  let u10 = N.mergeMany(u9, I.randomRange(0, 200))
-  let u11 = N.removeMany(u10, I.randomRange(0, 200))
-  let u12 = N.removeMany(u11, I.randomRange(0, 1000))
-  let u13 = N.removeMany(u12, I.randomRange(0, 1000))
-  let u14 = N.removeMany(u13, I.randomRange(1000, 10000))
-  let u15 = N.removeMany(u14, I.randomRange(10000, 20000 - 1))
-  let u16 = N.removeMany(u15, I.randomRange(20000, 21000))
-  b(__LOC__, u0 !== u1)
-  b(__LOC__, u2 === u1)
-  eq(__LOC__, N.size(u4), 28)
-  b(__LOC__, Js.eqUndefined(29, N.maxUndefined(u4)))
-  b(__LOC__, Js.eqUndefined(1, N.minUndefined(u4)))
-  b(__LOC__, u4 === u5)
-  b(__LOC__, N.isEmpty(u6))
-  eq(__LOC__, N.size(u7), 3)
-  b(__LOC__, !N.isEmpty(u7))
-  b(__LOC__, N.isEmpty(u8))
-  /* b __LOC__ (u9 == u10); */
-  /* addArray does not get reference equality guarantee */
-  b(__LOC__, N.has(u10, 20))
-  b(__LOC__, N.has(u10, 21))
-  eq(__LOC__, N.size(u10), 20001)
-  eq(__LOC__, N.size(u11), 19800)
-  eq(__LOC__, N.size(u12), 19000)
-  /* b __LOC__ (u12 == u13); */
-  eq(__LOC__, N.size(u13), N.size(u12))
-  eq(__LOC__, N.size(u14), 10000)
-  eq(__LOC__, N.size(u15), 1)
-  b(__LOC__, N.has(u15, 20000))
-  b(__LOC__, \"@@"(not, N.has(u15, 2000)))
-  b(__LOC__, N.isEmpty(u16))
-  let u17 = N.fromArray(~id=module(IntCmp), I.randomRange(0, 100))
-  let u18 = N.fromArray(~id=module(IntCmp), I.randomRange(59, 200))
-  let u19 = N.union(u17, u18)
-  let u20 = N.fromArray(~id=module(IntCmp), I.randomRange(0, 200))
-  let u21 = N.intersect(u17, u18)
-  let u22 = N.diff(u17, u18)
-  let u23 = N.diff(u18, u17)
-  let u24 = N.union(u18, u17)
-  let u25 = N.add(u22, 59)
-  let u26 = N.add(N.make(~id=module(IntCmp)), 3)
-  let ss = A.makeByAndShuffle(100, i => i * 2)
-  let u27 = N.fromArray(~id=module(IntCmp), ss)
-  let (u28, u29) = (N.union(u27, u26), N.union(u26, u27))
-  b(__LOC__, N.eq(u28, u29))
-  b(__LOC__, N.toArray(u29) == S.stableSortBy(A.concat(ss, [3]), compare))
-  b(__LOC__, N.eq(u19, u20))
-  eq(__LOC__, N.toArray(u21), I.range(59, 100))
-  eq(__LOC__, N.toArray(u22), I.range(0, 58))
-  b(__LOC__, N.eq(u24, u19))
-  eq(__LOC__, N.toArray(u23), I.range(101, 200))
-  b(__LOC__, N.subset(u23, u18))
-  b(__LOC__, !N.subset(u18, u23))
-  b(__LOC__, N.subset(u22, u17))
-  b(__LOC__, N.subset(u21, u17) && N.subset(u21, u18))
-  b(__LOC__, Js.eqUndefined(47, N.getUndefined(u22, 47)))
-  b(__LOC__, Some(47) == N.get(u22, 47))
-  b(__LOC__, N.getUndefined(u22, 59) == Js.undefined)
-  b(__LOC__, None == N.get(u22, 59))
-
-  eq(__LOC__, N.size(u25), 60)
-  b(__LOC__, N.minimum(N.make(~id=module(IntCmp))) == None)
-  b(__LOC__, N.maximum(N.make(~id=module(IntCmp))) == None)
-  b(__LOC__, N.minUndefined(N.make(~id=module(IntCmp))) == Js.undefined)
-  b(__LOC__, N.maxUndefined(N.make(~id=module(IntCmp))) == Js.undefined)
-}
-
-let testIterToList = xs => {
-  let v = ref(list{})
-  N.forEach(xs, x => v := list{x, ...v.contents})
-  L.reverse(v.contents)
-}
-
-let testIterToList2 = xs => {
-  let v = ref(list{})
-  D.forEach(N.getData(xs), x => v := list{x, ...v.contents})
-  L.reverse(v.contents)
-}
-
-let () = {
-  let u0 = N.fromArray(~id=module(IntCmp), I.randomRange(0, 20))
-  let u1 = N.remove(u0, 17)
-  let u2 = N.add(u1, 33)
-  b(__LOC__, L.every2(testIterToList(u0), L.makeBy(21, i => i), (x, y) => x == y))
-  b(__LOC__, L.every2(testIterToList2(u0), L.makeBy(21, i => i), (x, y) => x == y))
-  b(__LOC__, L.every2(testIterToList(u0), N.toList(u0), (x, y) => x == y))
-  b(__LOC__, N.some(u0, x => x == 17))
-  b(__LOC__, !N.some(u1, x => x == 17))
-  b(__LOC__, N.every(u0, x => x < 24))
-  b(__LOC__, D.every(N.getData(u0), x => x < 24))
-  b(__LOC__, !N.every(u2, x => x < 24))
-  b(__LOC__, \"@@"(not, N.every(N.fromArray(~id=module(IntCmp), [1, 2, 3]), x => x == 2)))
-  b(__LOC__, N.cmp(u1, u0) < 0)
-  b(__LOC__, N.cmp(u0, u1) > 0)
-}
-
-let () = {
-  let a0 = N.fromArray(~id=module(IntCmp), I.randomRange(0, 1000))
-  let (a1, a2) = (N.keep(a0, x => mod(x, 2) == 0), N.keep(a0, x => mod(x, 2) != 0))
-  let (a3, a4) = N.partition(a0, x => mod(x, 2) == 0)
-  b(__LOC__, N.eq(a1, a3))
-  b(__LOC__, N.eq(a2, a4))
-  eq(__LOC__, N.getExn(a0, 3), 3)
-  eq(__LOC__, N.getExn(a0, 4), 4)
-  t(__LOC__, _ => \"@@"(ignore, N.getExn(a0, 1002)))
-  t(__LOC__, _ => \"@@"(ignore, N.getExn(a0, -1)))
-  eq(__LOC__, N.size(a0), 1001)
-  b(__LOC__, \"@@"(not, N.isEmpty(a0)))
-  let ((a5, a6), pres) = N.split(a0, 200)
-  b(__LOC__, pres)
-  eq(__LOC__, N.toArray(a5), A.makeBy(200, i => i))
-  eq(__LOC__, N.toList(a6), L.makeBy(800, i => i + 201))
-  let a7 = N.remove(a0, 200)
-  let ((a8, a9), pres) = N.split(a7, 200)
-  b(__LOC__, !pres)
-  eq(__LOC__, N.toArray(a8), A.makeBy(200, i => i))
-  eq(__LOC__, N.toList(a9), L.makeBy(800, i => i + 201))
-  eq(__LOC__, N.minimum(a8), Some(0))
-  eq(__LOC__, N.minimum(a9), Some(201))
-  L.forEach(list{a0, a1, a2, a3, a4}, x => N.checkInvariantInternal(x))
-}
-
-let () = {
-  let a = N.fromArray(~id=module(IntCmp), [])
-  b(__LOC__, N.isEmpty(N.keep(a, x => mod(x, 2) == 0)))
-}
-
-let () = {
-  let ((aa, bb), pres) = N.split(N.make(~id=module(IntCmp)), 0)
-  b(__LOC__, N.isEmpty(aa))
-  b(__LOC__, N.isEmpty(bb))
-  b(__LOC__, !pres)
-}
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_qualified.js b/jscomp/test/bs_qualified.js
deleted file mode 100644
index b040211..0000000
--- a/jscomp/test/bs_qualified.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var ZZ = require("X");
-var Z = require("z");
-var Vscode = require("vscode");
-var GlMatrix = require("gl-matrix");
-
-function f(a, b, c) {
-  Vscode.commands.executeCommands("hi", a, b, c);
-  return process.env;
-}
-
-function f2(param) {
-  return [
-          Z.a0.a1.a2.hi,
-          a0.a1.a2.ho,
-          Math.imul(1, 2)
-        ];
-}
-
-function f3(x) {
-  new (global.Buffer)(20);
-  new (global.a0.a1.a2.Buffer)(20);
-  new (ZZ.global.a0.a1.a2.Buffer)(100);
-  new (ZZ.global.a0.a1.a2.makeBuffer3)(20);
-  console.log(Math.max(1.0, 2.0));
-  console.log(x.a0[0]);
-  console.log(x.a0.a1[0]);
-  console.log(x.a0.a1.a2[0]);
-  x.a0[0] = "x";
-  x.a0.a1[0] = "x";
-  x.a0.a1.a2[0] = "x";
-  console.log(x.a0.getX1);
-  console.log(x.a0.a1.getX2);
-  console.log(x.a0.a1.a2.getX3);
-  x.a0.setX1 = 0;
-  x.a0.a1.setX2 = 0;
-  x.a0.a1.a2.setX3 = 0;
-  x["a0-hi"].a1.a2.setXWeird3 = 0;
-  x.a0.send1(0);
-  x.a0.a1.send2(0);
-  x.a0.a1.send3(0);
-  x.a0.psend1(0);
-  x.a0.a1.psend2(0);
-  x.a0.a1.psend3(0);
-  return GlMatrix.mat4.create();
-}
-
-exports.f = f;
-exports.f2 = f2;
-exports.f3 = f3;
-/* X Not a pure module */
diff --git a/jscomp/test/bs_qualified.res b/jscomp/test/bs_qualified.res
deleted file mode 100644
index 72bd672..0000000
--- a/jscomp/test/bs_qualified.res
+++ /dev/null
@@ -1,103 +0,0 @@
-@module(("x", "X")) external xx: string => unit = "xx"
-
-type param
-
-@scope("commands") @module("vscode") @variadic
-external executeCommands: (string, array<param>) => unit = "executeCommands"
-
-@scope("process") @val external env: Js.Dict.t<string> = "env"
-
-let f = (a, b, c) => {
-  executeCommands("hi", [a, b, c])
-  env
-}
-
-@module("z") @scope(("a0", "a1", "a2")) external hi: string = "hi"
-@val @scope(("a0", "a1", "a2")) external ho: string = "ho"
-@val @scope("Math") external imul: (int, int) => int = "imul"
-let f2 = () => (hi, ho, imul(1, 2))
-
-type buffer
-@new @scope("global") external makeBuffer: int => buffer = "Buffer"
-
-@new @scope(("global", "a0", "a1", "a2")) external makeBuffer1: int => buffer = "Buffer"
-
-@new @scope(("global", "a0", "a1", "a2")) @module(("X", "ZZ"))
-external makeBuffer2: int => buffer = "Buffer"
-
-@new @scope(("global", "a0", "a1", "a2")) @module(("X", "Z"))
-external makeBuffer3: int => buffer = "makeBuffer3"
-
-@scope("Math") @val external max: (float, float) => float = "max"
-/* TODO: `bs.val` is not necessary, by default is good?
- */
-
-type t
-@scope("mat4") @module("gl-matrix") external create: unit => t = "create"
-
-/* external scope_f : t -> int = "" [@@bs.get] [@@bs.scope "hi"] */
-
-@get_index @scope("a0") external getMockFn1: (t, int) => string = ""
-
-@get_index @scope(("a0", "a1")) external getMockFn2: (t, int) => string = ""
-
-@get_index @scope(("a0", "a1", "a2")) external getMockFn3: (t, int) => string = ""
-
-@set_index @scope("a0") external setMocFn1: (t, int, string) => unit = ""
-
-@set_index @scope(("a0", "a1")) external setMocFn2: (t, int, string) => unit = ""
-
-@set_index @scope(("a0", "a1", "a2")) external setMocFn3: (t, int, string) => unit = ""
-
-@get @scope("a0") external getX1: t => int = "getX1"
-
-@get @scope(("a0", "a1")) external getX2: t => int = "getX2"
-
-@get @scope(("a0", "a1", "a2")) external getX3: t => int = "getX3"
-
-@set @scope("a0") external setX1: (t, int) => unit = "setX1"
-
-@set @scope(("a0", "a1")) external setX2: (t, int) => unit = "setX2"
-
-@set @scope(("a0", "a1", "a2")) external setX3: (t, int) => unit = "setX3"
-
-@set @scope(("a0-hi", "a1", "a2")) external setXWeird3: (t, int) => unit = "setXWeird3"
-
-@send @scope("a0") external send1: (t, int) => unit = "send1"
-@send @scope(("a0", "a1")) external send2: (t, int) => unit = "send2"
-@send @scope(("a0", "a1")) external send3: (t, int) => unit = "send3"
-
-@send @scope("a0") external psend1: (t, int) => unit = "psend1"
-@send @scope(("a0", "a1")) external psend2: (t, int) => unit = "psend2"
-@send @scope(("a0", "a1")) external psend3: (t, int) => unit = "psend3"
-
-let f3 = x => {
-  \"@@"(ignore, makeBuffer(20))
-  \"@@"(ignore, makeBuffer1(20))
-  \"@@"(ignore, makeBuffer2(100))
-  \"@@"(ignore, makeBuffer3(20))
-  \"@@"(Js.log, max(1.0, 2.0))
-  /* Js.log @@ scope_f x ; */
-  \"@@"(Js.log, getMockFn1(x, 0))
-  \"@@"(Js.log, getMockFn2(x, 0))
-  \"@@"(Js.log, getMockFn3(x, 0))
-  setMocFn1(x, 0, "x")
-  setMocFn2(x, 0, "x")
-  setMocFn3(x, 0, "x")
-  \"@@"(Js.log, getX1(x))
-  \"@@"(Js.log, getX2(x))
-  \"@@"(Js.log, getX3(x))
-
-  setX1(x, 0)
-  setX2(x, 0)
-  setX3(x, 0)
-  setXWeird3(x, 0)
-
-  send1(x, 0)
-  send2(x, 0)
-  send3(x, 0)
-  x->psend1(0)
-  x->psend2(0)
-  x->psend3(0)
-  create()
-}
diff --git a/jscomp/test/bs_queue_test.js b/jscomp/test/bs_queue_test.js
deleted file mode 100644
index 7c55cc7..0000000
--- a/jscomp/test/bs_queue_test.js
+++ /dev/null
@@ -1,1294 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_MutableQueue = require("../../lib/js/belt_MutableQueue.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function does_raise(f, q) {
-  try {
-    Curry._1(f, q);
-    return false;
-  }
-  catch (exn){
-    return true;
-  }
-}
-
-function $plus$plus(q, x) {
-  Belt_MutableQueue.add(q, x);
-  return q;
-}
-
-var q = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), []) && q.length === 0)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          25,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 1), q)), [1]) && q.length === 1)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          26,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 2), q)), [
-          1,
-          2
-        ]) && q.length === 2)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          27,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 3), q)), [
-          1,
-          2,
-          3
-        ]) && q.length === 3)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          28,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(Belt_MutableQueue.toArray((Belt_MutableQueue.add(q, 4), q)), [
-          1,
-          2,
-          3,
-          4
-        ]) && q.length === 4)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          29,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.popExn(q) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          30,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), [
-          2,
-          3,
-          4
-        ]) && q.length === 3)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          31,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.popExn(q) !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          32,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), [
-          3,
-          4
-        ]) && q.length === 2)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          33,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.popExn(q) !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          34,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), [4]) && q.length === 1)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          35,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.popExn(q) !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          36,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(Belt_MutableQueue.toArray(q), []) && q.length === 0)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          37,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Belt_MutableQueue.popExn, q)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          38,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q$1 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-if (Belt_MutableQueue.popExn((Belt_MutableQueue.add(q$1, 1), q$1)) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          43,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Belt_MutableQueue.popExn, q$1)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          44,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.popExn((Belt_MutableQueue.add(q$1, 2), q$1)) !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          45,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Belt_MutableQueue.popExn, q$1)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          46,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q$1.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          47,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q$2 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-if (Belt_MutableQueue.peekExn((Belt_MutableQueue.add(q$2, 1), q$2)) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          52,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.peekExn((Belt_MutableQueue.add(q$2, 2), q$2)) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          53,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.peekExn((Belt_MutableQueue.add(q$2, 3), q$2)) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          54,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.peekExn(q$2) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          55,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.popExn(q$2) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          56,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.peekExn(q$2) !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          57,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.popExn(q$2) !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          58,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.peekExn(q$2) !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          59,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.popExn(q$2) !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          60,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Belt_MutableQueue.peekExn, q$2)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          61,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Belt_MutableQueue.peekExn, q$2)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          62,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q$3 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-for(var i = 1; i <= 10; ++i){
-  Belt_MutableQueue.add(q$3, i);
-}
-
-Belt_MutableQueue.clear(q$3);
-
-if (q$3.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          71,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Belt_MutableQueue.popExn, q$3)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          72,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(q$3, {
-        length: 0,
-        first: undefined,
-        last: undefined
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          73,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Belt_MutableQueue.add(q$3, 42);
-
-if (Belt_MutableQueue.popExn(q$3) !== 42) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          75,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q1 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-for(var i$1 = 1; i$1 <= 10; ++i$1){
-  Belt_MutableQueue.add(q1, i$1);
-}
-
-var q2 = Belt_MutableQueue.copy(q1);
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1), [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        10
-      ])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          84,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2), [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        10
-      ])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          85,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q1.length !== 10) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          86,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2.length !== 10) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          87,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-for(var i$2 = 1; i$2 <= 10; ++i$2){
-  if (Belt_MutableQueue.popExn(q1) !== i$2) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            89,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  
-}
-
-for(var i$3 = 1; i$3 <= 10; ++i$3){
-  if (Belt_MutableQueue.popExn(q2) !== i$3) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            92,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  
-}
-
-var q$4 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-if (q$4.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          98,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-for(var i$4 = 1; i$4 <= 10; ++i$4){
-  Belt_MutableQueue.add(q$4, i$4);
-  if (q$4.length !== i$4) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            101,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  if (q$4.length === 0) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            102,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  
-}
-
-for(var i$5 = 10; i$5 >= 1; --i$5){
-  if (q$4.length !== i$5) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            105,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  if (q$4.length === 0) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "bs_queue_test.res",
-            106,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  Belt_MutableQueue.popExn(q$4);
-}
-
-if (q$4.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          109,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q$4.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          110,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q$5 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-for(var i$6 = 1; i$6 <= 10; ++i$6){
-  Belt_MutableQueue.add(q$5, i$6);
-}
-
-var i$7 = {
-  contents: 1
-};
-
-Belt_MutableQueue.forEach(q$5, (function (j) {
-        if (i$7.contents !== j) {
-          throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "bs_queue_test.res",
-                  120,
-                  4
-                ],
-                Error: new Error()
-              };
-        }
-        i$7.contents = i$7.contents + 1 | 0;
-      }));
-
-var q1$1 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-var q2$1 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-if (q1$1.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          127,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$1), [])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          128,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$1.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          129,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$1), [])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          130,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Belt_MutableQueue.transfer(q1$1, q2$1);
-
-if (q1$1.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          132,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$1), [])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          133,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$1.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          134,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$1), [])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          135,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q1$2 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-var q2$2 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-for(var i$8 = 1; i$8 <= 4; ++i$8){
-  Belt_MutableQueue.add(q1$2, i$8);
-}
-
-if (q1$2.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          143,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$2), [
-        1,
-        2,
-        3,
-        4
-      ])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          144,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$2.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          145,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$2), [])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          146,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Belt_MutableQueue.transfer(q1$2, q2$2);
-
-if (q1$2.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          148,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$2), [])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          149,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$2.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          150,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$2), [
-        1,
-        2,
-        3,
-        4
-      ])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          151,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q1$3 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-var q2$3 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-for(var i$9 = 5; i$9 <= 8; ++i$9){
-  Belt_MutableQueue.add(q2$3, i$9);
-}
-
-if (q1$3.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          159,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$3), [])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          160,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$3.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          161,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$3), [
-        5,
-        6,
-        7,
-        8
-      ])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          162,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Belt_MutableQueue.transfer(q1$3, q2$3);
-
-if (q1$3.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          164,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$3), [])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          165,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$3.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          166,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$3), [
-        5,
-        6,
-        7,
-        8
-      ])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          167,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q1$4 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-var q2$4 = {
-  length: 0,
-  first: undefined,
-  last: undefined
-};
-
-for(var i$10 = 1; i$10 <= 4; ++i$10){
-  Belt_MutableQueue.add(q1$4, i$10);
-}
-
-for(var i$11 = 5; i$11 <= 8; ++i$11){
-  Belt_MutableQueue.add(q2$4, i$11);
-}
-
-if (q1$4.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          178,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$4), [
-        1,
-        2,
-        3,
-        4
-      ])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          179,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$4.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          180,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$4), [
-        5,
-        6,
-        7,
-        8
-      ])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          181,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Belt_MutableQueue.transfer(q1$4, q2$4);
-
-if (q1$4.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          183,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q1$4), [])) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          184,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var v = [
-  5,
-  6,
-  7,
-  8,
-  1,
-  2,
-  3,
-  4
-];
-
-if (q2$4.length !== 8) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          186,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Belt_MutableQueue.toArray(q2$4), v)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          187,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Belt_MutableQueue.reduce(q2$4, 0, (function (x, y) {
-          return x - y | 0;
-        })) !== Belt_Array.reduce(v, 0, (function (x, y) {
-          return x - y | 0;
-        }))) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_queue_test.res",
-          189,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-console.log("OK");
-
-var q$6 = Belt_MutableQueue.fromArray([
-      1,
-      2,
-      3,
-      4
-    ]);
-
-var q1$5 = Belt_MutableQueue.map(q$6, (function (x) {
-        return x - 1 | 0;
-      }));
-
-eq("File \"bs_queue_test.res\", line 197, characters 5-12", Belt_MutableQueue.toArray(q1$5), [
-      0,
-      1,
-      2,
-      3
-    ]);
-
-var q$7 = Belt_MutableQueue.fromArray([]);
-
-b("File \"bs_queue_test.res\", line 198, characters 4-11", q$7.length === 0);
-
-var q$8 = Belt_MutableQueue.map(Belt_MutableQueue.fromArray([]), (function (x) {
-        return x + 1 | 0;
-      }));
-
-b("File \"bs_queue_test.res\", line 199, characters 4-11", q$8.length === 0);
-
-Mt.from_pair_suites("Bs_queue_test", suites.contents);
-
-var Q;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.Q = Q;
-exports.does_raise = does_raise;
-exports.$plus$plus = $plus$plus;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_queue_test.res b/jscomp/test/bs_queue_test.res
deleted file mode 100644
index df132d4..0000000
--- a/jscomp/test/bs_queue_test.res
+++ /dev/null
@@ -1,202 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-/* TEST
- */
-
-module Q = Belt.MutableQueue
-
-let does_raise = (f, q) =>
-  try {
-    ignore((f(q): int))
-    false
-  } catch {
-  | _ => true
-  }
-let \"++" = (q, x) => {
-  Q.add(q, x)
-  q
-}
-
-let () = {
-  let q = Q.make()
-  assert(Q.toArray(q) == [] && Q.size(q) == 0)
-  assert(Q.toArray(\"++"(q, 1)) == [1] && Q.size(q) == 1)
-  assert(Q.toArray(\"++"(q, 2)) == [1, 2] && Q.size(q) == 2)
-  assert(Q.toArray(\"++"(q, 3)) == [1, 2, 3] && Q.size(q) == 3)
-  assert(Q.toArray(\"++"(q, 4)) == [1, 2, 3, 4] && Q.size(q) == 4)
-  assert(Q.popExn(q) == 1)
-  assert(Q.toArray(q) == [2, 3, 4] && Q.size(q) == 3)
-  assert(Q.popExn(q) == 2)
-  assert(Q.toArray(q) == [3, 4] && Q.size(q) == 2)
-  assert(Q.popExn(q) == 3)
-  assert(Q.toArray(q) == [4] && Q.size(q) == 1)
-  assert(Q.popExn(q) == 4)
-  assert(Q.toArray(q) == [] && Q.size(q) == 0)
-  assert(does_raise(Q.popExn, q))
-}
-
-let () = {
-  let q = Q.make()
-  assert(Q.popExn(\"++"(q, 1)) == 1)
-  assert(does_raise(Q.popExn, q))
-  assert(Q.popExn(\"++"(q, 2)) == 2)
-  assert(does_raise(Q.popExn, q))
-  assert(Q.size(q) == 0)
-}
-
-let () = {
-  let q = Q.make()
-  assert(Q.peekExn(\"++"(q, 1)) == 1)
-  assert(Q.peekExn(\"++"(q, 2)) == 1)
-  assert(Q.peekExn(\"++"(q, 3)) == 1)
-  assert(Q.peekExn(q) == 1)
-  assert(Q.popExn(q) == 1)
-  assert(Q.peekExn(q) == 2)
-  assert(Q.popExn(q) == 2)
-  assert(Q.peekExn(q) == 3)
-  assert(Q.popExn(q) == 3)
-  assert(does_raise(Q.peekExn, q))
-  assert(does_raise(Q.peekExn, q))
-}
-
-let () = {
-  let q = Q.make()
-  for i in 1 to 10 {
-    Q.add(q, i)
-  }
-  Q.clear(q)
-  assert(Q.size(q) == 0)
-  assert(does_raise(Q.popExn, q))
-  assert(q == Q.make())
-  Q.add(q, 42)
-  assert(Q.popExn(q) == 42)
-}
-
-let () = {
-  let q1 = Q.make()
-  for i in 1 to 10 {
-    Q.add(q1, i)
-  }
-  let q2 = Q.copy(q1)
-  assert(Q.toArray(q1) == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
-  assert(Q.toArray(q2) == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
-  assert(Q.size(q1) == 10)
-  assert(Q.size(q2) == 10)
-  for i in 1 to 10 {
-    assert(Q.popExn(q1) == i)
-  }
-  for i in 1 to 10 {
-    assert(Q.popExn(q2) == i)
-  }
-}
-
-let () = {
-  let q = Q.make()
-  assert(Q.isEmpty(q))
-  for i in 1 to 10 {
-    Q.add(q, i)
-    assert(Q.size(q) == i)
-    assert(!Q.isEmpty(q))
-  }
-  for i in 10 downto 1 {
-    assert(Q.size(q) == i)
-    assert(!Q.isEmpty(q))
-    ignore((Q.popExn(q): int))
-  }
-  assert(Q.size(q) == 0)
-  assert(Q.isEmpty(q))
-}
-
-let () = {
-  let q = Q.make()
-  for i in 1 to 10 {
-    Q.add(q, i)
-  }
-  let i = ref(1)
-  Q.forEach(q, j => {
-    assert(i.contents == j)
-    incr(i)
-  })
-}
-
-let () = {
-  let q1 = Q.make() and q2 = Q.make()
-  assert(Q.size(q1) == 0)
-  assert(Q.toArray(q1) == [])
-  assert(Q.size(q2) == 0)
-  assert(Q.toArray(q2) == [])
-  Q.transfer(q1, q2)
-  assert(Q.size(q1) == 0)
-  assert(Q.toArray(q1) == [])
-  assert(Q.size(q2) == 0)
-  assert(Q.toArray(q2) == [])
-}
-
-let () = {
-  let q1 = Q.make() and q2 = Q.make()
-  for i in 1 to 4 {
-    Q.add(q1, i)
-  }
-  assert(Q.size(q1) == 4)
-  assert(Q.toArray(q1) == [1, 2, 3, 4])
-  assert(Q.size(q2) == 0)
-  assert(Q.toArray(q2) == [])
-  Q.transfer(q1, q2)
-  assert(Q.size(q1) == 0)
-  assert(Q.toArray(q1) == [])
-  assert(Q.size(q2) == 4)
-  assert(Q.toArray(q2) == [1, 2, 3, 4])
-}
-
-let () = {
-  let q1 = Q.make() and q2 = Q.make()
-  for i in 5 to 8 {
-    Q.add(q2, i)
-  }
-  assert(Q.size(q1) == 0)
-  assert(Q.toArray(q1) == [])
-  assert(Q.size(q2) == 4)
-  assert(Q.toArray(q2) == [5, 6, 7, 8])
-  Q.transfer(q1, q2)
-  assert(Q.size(q1) == 0)
-  assert(Q.toArray(q1) == [])
-  assert(Q.size(q2) == 4)
-  assert(Q.toArray(q2) == [5, 6, 7, 8])
-}
-
-let () = {
-  let q1 = Q.make() and q2 = Q.make()
-  for i in 1 to 4 {
-    Q.add(q1, i)
-  }
-  for i in 5 to 8 {
-    Q.add(q2, i)
-  }
-  assert(Q.size(q1) == 4)
-  assert(Q.toArray(q1) == [1, 2, 3, 4])
-  assert(Q.size(q2) == 4)
-  assert(Q.toArray(q2) == [5, 6, 7, 8])
-  Q.transfer(q1, q2)
-  assert(Q.size(q1) == 0)
-  assert(Q.toArray(q1) == [])
-  let v = [5, 6, 7, 8, 1, 2, 3, 4]
-  assert(Q.size(q2) == 8)
-  assert(Q.toArray(q2) == v)
-
-  assert(Q.reduce(q2, 0, (x, y) => x - y) == Belt.Array.reduce(v, 0, (x, y) => x - y))
-}
-
-let () = Js.log("OK")
-
-let () = {
-  let q = Q.fromArray([1, 2, 3, 4])
-  let q1 = Q.map(q, x => x - 1)
-  eq(__LOC__, Q.toArray(q1), [0, 1, 2, 3])
-  b(__LOC__, Q.isEmpty(Q.fromArray([])))
-  b(__LOC__, Q.isEmpty(Q.map(Q.fromArray([]), x => x + 1)))
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_rbset_int_bench.js b/jscomp/test/bs_rbset_int_bench.js
deleted file mode 100644
index c26328a..0000000
--- a/jscomp/test/bs_rbset_int_bench.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Rbset = require("./rbset.js");
-
-function bench(param) {
-  var data = "Empty";
-  console.time("bs_rbset_int_bench.res 6");
-  for(var i = 0; i <= 1000000; ++i){
-    data = Rbset.add(i, data);
-  }
-  console.timeEnd("bs_rbset_int_bench.res 6");
-  console.time("bs_rbset_int_bench.res 11");
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    if (!Rbset.mem(i$1, data)) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_rbset_int_bench.res",
-              13,
-              6
-            ],
-            Error: new Error()
-          };
-    }
-    
-  }
-  console.timeEnd("bs_rbset_int_bench.res 11");
-  console.time("bs_rbset_int_bench.res 16");
-  for(var i$2 = 0; i$2 <= 1000000; ++i$2){
-    data = Rbset.remove(i$2, data);
-  }
-  console.timeEnd("bs_rbset_int_bench.res 16");
-  if (Rbset.cardinal(data) === 0) {
-    return ;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_rbset_int_bench.res",
-          21,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-console.time("bs_rbset_int_bench.res 24");
-
-bench();
-
-console.timeEnd("bs_rbset_int_bench.res 24");
-
-var count = 1000000;
-
-var V;
-
-exports.count = count;
-exports.V = V;
-exports.bench = bench;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_rbset_int_bench.res b/jscomp/test/bs_rbset_int_bench.res
deleted file mode 100644
index eb1d2a8..0000000
--- a/jscomp/test/bs_rbset_int_bench.res
+++ /dev/null
@@ -1,24 +0,0 @@
-let count = 1_000_000
-
-module V = Rbset
-let bench = () => {
-  let data = ref(V.empty)
-  %time(
-    for i in 0 to count {
-      data := V.add(i, data.contents)
-    }
-  )
-  %time(
-    for i in 0 to count {
-      assert(V.mem(i, data.contents))
-    }
-  )
-  %time(
-    for i in 0 to count {
-      data := V.remove(i, data.contents)
-    }
-  )
-  assert (V.cardinal(data.contents) == 0)
-}
-
-%time(bench())
diff --git a/jscomp/test/bs_rest_test.js b/jscomp/test/bs_rest_test.js
deleted file mode 100644
index 23f1395..0000000
--- a/jscomp/test/bs_rest_test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function x(v){return [v]}
-;
-
-x("3");
-
-var v = x(3);
-
-function xxx(prim) {
-  return x(prim);
-}
-
-var u = x(3);
-
-var xx = x("3");
-
-exports.v = v;
-exports.xxx = xxx;
-exports.u = u;
-exports.xx = xx;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_rest_test.res b/jscomp/test/bs_rest_test.res
deleted file mode 100644
index b3be3b2..0000000
--- a/jscomp/test/bs_rest_test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-%%raw(`
-function x(v){return [v]}
-`)
-
-@val external f: (. 'a) => array<'a> = "x"
-
-let u = f(. "3")
-let v = f(. 3)
-
-include (
-  {
-    @val external xxx: (. 'a) => array<'a> = "x"
-  }: {
-    let xxx: (. 'a) => array<'a>
-  }
-)
-
-let u = xxx(. 3)
-/** Do we need both [bs.val] and [bs.call]* instead of just one [bs.val] */
-let xx = xxx(. "3")
diff --git a/jscomp/test/bs_set_bench.js b/jscomp/test/bs_set_bench.js
deleted file mode 100644
index c522372..0000000
--- a/jscomp/test/bs_set_bench.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Belt_SetInt = require("../../lib/js/belt_SetInt.js");
-
-function bench(param) {
-  var data;
-  console.time("bs_set_bench.res 6");
-  for(var i = 0; i <= 1000000; ++i){
-    data = Belt_SetInt.add(data, i);
-  }
-  console.timeEnd("bs_set_bench.res 6");
-  console.time("bs_set_bench.res 11");
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    if (!Belt_SetInt.has(data, i$1)) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "bs_set_bench.res",
-              13,
-              6
-            ],
-            Error: new Error()
-          };
-    }
-    
-  }
-  console.timeEnd("bs_set_bench.res 11");
-  console.time("bs_set_bench.res 16");
-  for(var i$2 = 0; i$2 <= 1000000; ++i$2){
-    data = Belt_SetInt.remove(data, i$2);
-  }
-  console.timeEnd("bs_set_bench.res 16");
-  if (Belt_SetInt.size(data) === 0) {
-    return ;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "bs_set_bench.res",
-          21,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-console.time("bs_set_bench.res 24");
-
-bench();
-
-console.timeEnd("bs_set_bench.res 24");
-
-var count = 1000000;
-
-var N;
-
-exports.count = count;
-exports.N = N;
-exports.bench = bench;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_set_bench.res b/jscomp/test/bs_set_bench.res
deleted file mode 100644
index 118dd79..0000000
--- a/jscomp/test/bs_set_bench.res
+++ /dev/null
@@ -1,24 +0,0 @@
-let count = 1_000_000
-
-module N = Belt.Set.Int
-let bench = () => {
-  let data = ref(N.empty)
-  %time(
-    for i in 0 to count {
-      data := N.add(data.contents, i)
-    }
-  )
-  %time(
-    for i in 0 to count {
-      assert(N.has(data.contents, i))
-    }
-  )
-  %time(
-    for i in 0 to count {
-      data := N.remove(data.contents, i)
-    }
-  )
-  assert (N.size(data.contents) == 0)
-}
-
-%time(bench())
diff --git a/jscomp/test/bs_set_int_test.js b/jscomp/test/bs_set_int_test.js
deleted file mode 100644
index 77c7589..0000000
--- a/jscomp/test/bs_set_int_test.js
+++ /dev/null
@@ -1,397 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_SetInt = require("../../lib/js/belt_SetInt.js");
-var Array_data_util = require("./array_data_util.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, v) {
-  Mt.bool_suites(test_id, suites, loc, v);
-}
-
-function $eq$tilde(s, i) {
-  return Belt_SetInt.eq(Belt_SetInt.fromArray(i), s);
-}
-
-function $eq$star(a, b) {
-  return Belt_SetInt.eq(Belt_SetInt.fromArray(a), Belt_SetInt.fromArray(b));
-}
-
-b("File \"bs_set_int_test.res\", line 21, characters 11-18", $eq$star([
-          1,
-          2,
-          3
-        ], [
-          3,
-          2,
-          1
-        ]));
-
-var u = Belt_SetInt.intersect(Belt_SetInt.fromArray([
-          1,
-          2,
-          3
-        ]), Belt_SetInt.fromArray([
-          3,
-          4,
-          5
-        ]));
-
-b("File \"bs_set_int_test.res\", line 27, characters 11-18", Belt_SetInt.eq(Belt_SetInt.fromArray([3]), u));
-
-function range(i, j) {
-  return $$Array.init((j - i | 0) + 1 | 0, (function (k) {
-                return k + i | 0;
-              }));
-}
-
-function revRange(i, j) {
-  return $$Array.of_list(List.rev($$Array.to_list($$Array.init((j - i | 0) + 1 | 0, (function (k) {
-                            return k + i | 0;
-                          })))));
-}
-
-var v = Belt_SetInt.fromArray($$Array.append(range(100, 1000), revRange(400, 1500)));
-
-var i = range(100, 1500);
-
-b("File \"bs_set_int_test.res\", line 37, characters 4-11", Belt_SetInt.eq(Belt_SetInt.fromArray(i), v));
-
-var match = Belt_SetInt.partition(v, (function (x) {
-        return x % 3 === 0;
-      }));
-
-var l;
-
-var r;
-
-for(var i$1 = 100; i$1 <= 1500; ++i$1){
-  if (i$1 % 3 === 0) {
-    l = Belt_SetInt.add(l, i$1);
-  } else {
-    r = Belt_SetInt.add(r, i$1);
-  }
-}
-
-var nl = l;
-
-var nr = r;
-
-b("File \"bs_set_int_test.res\", line 50, characters 4-11", Belt_SetInt.eq(match[0], nl));
-
-b("File \"bs_set_int_test.res\", line 51, characters 4-11", Belt_SetInt.eq(match[1], nr));
-
-var i$2 = range(50, 100);
-
-var s = Belt_SetInt.intersect(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200)));
-
-b("File \"bs_set_int_test.res\", line 55, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$2), s));
-
-var i$3 = range(1, 200);
-
-var s$1 = Belt_SetInt.union(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200)));
-
-b("File \"bs_set_int_test.res\", line 66, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$3), s$1));
-
-var i$4 = range(1, 49);
-
-var s$2 = Belt_SetInt.diff(Belt_SetInt.fromArray(range(1, 100)), Belt_SetInt.fromArray(range(50, 200)));
-
-b("File \"bs_set_int_test.res\", line 77, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$4), s$2));
-
-var i$5 = revRange(50, 100);
-
-var s$3 = Belt_SetInt.intersect(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200)));
-
-b("File \"bs_set_int_test.res\", line 88, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$5), s$3));
-
-var i$6 = revRange(1, 200);
-
-var s$4 = Belt_SetInt.union(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200)));
-
-b("File \"bs_set_int_test.res\", line 99, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$6), s$4));
-
-var i$7 = revRange(1, 49);
-
-var s$5 = Belt_SetInt.diff(Belt_SetInt.fromArray(revRange(1, 100)), Belt_SetInt.fromArray(revRange(50, 200)));
-
-b("File \"bs_set_int_test.res\", line 110, characters 2-9", Belt_SetInt.eq(Belt_SetInt.fromArray(i$7), s$5));
-
-var ss = [
-  1,
-  222,
-  3,
-  4,
-  2,
-  0,
-  33,
-  -1
-];
-
-var v$1 = Belt_SetInt.fromArray([
-      1,
-      222,
-      3,
-      4,
-      2,
-      0,
-      33,
-      -1
-    ]);
-
-var minv = Belt_SetInt.minUndefined(v$1);
-
-var maxv = Belt_SetInt.maxUndefined(v$1);
-
-function approx(loc, x, y) {
-  b(loc, x === y);
-}
-
-eq("File \"bs_set_int_test.res\", line 125, characters 5-12", Belt_SetInt.reduce(v$1, 0, (function (x, y) {
-            return x + y | 0;
-          })), Belt_Array.reduce(ss, 0, (function (prim0, prim1) {
-            return prim0 + prim1 | 0;
-          })));
-
-approx("File \"bs_set_int_test.res\", line 126, characters 9-16", -1, minv);
-
-approx("File \"bs_set_int_test.res\", line 127, characters 9-16", 222, maxv);
-
-var v$2 = Belt_SetInt.remove(v$1, 3);
-
-var minv$1 = Belt_SetInt.minimum(v$2);
-
-var maxv$1 = Belt_SetInt.maximum(v$2);
-
-eq("File \"bs_set_int_test.res\", line 130, characters 5-12", minv$1, -1);
-
-eq("File \"bs_set_int_test.res\", line 131, characters 5-12", maxv$1, 222);
-
-var v$3 = Belt_SetInt.remove(v$2, 222);
-
-var minv$2 = Belt_SetInt.minimum(v$3);
-
-var maxv$2 = Belt_SetInt.maximum(v$3);
-
-eq("File \"bs_set_int_test.res\", line 134, characters 5-12", minv$2, -1);
-
-eq("File \"bs_set_int_test.res\", line 135, characters 5-12", maxv$2, 33);
-
-var v$4 = Belt_SetInt.remove(v$3, -1);
-
-var minv$3 = Belt_SetInt.minimum(v$4);
-
-var maxv$3 = Belt_SetInt.maximum(v$4);
-
-eq("File \"bs_set_int_test.res\", line 138, characters 5-12", minv$3, 0);
-
-eq("File \"bs_set_int_test.res\", line 139, characters 5-12", maxv$3, 33);
-
-var v$5 = Belt_SetInt.remove(v$4, 0);
-
-var v$6 = Belt_SetInt.remove(v$5, 33);
-
-var v$7 = Belt_SetInt.remove(v$6, 2);
-
-var v$8 = Belt_SetInt.remove(v$7, 3);
-
-var v$9 = Belt_SetInt.remove(v$8, 4);
-
-var v$10 = Belt_SetInt.remove(v$9, 1);
-
-b("File \"bs_set_int_test.res\", line 146, characters 4-11", Belt_SetInt.isEmpty(v$10));
-
-var v$11 = Belt_Array.makeByAndShuffle(1000000, (function (i) {
-        return i;
-      }));
-
-var u$1 = Belt_SetInt.fromArray(v$11);
-
-Belt_SetInt.checkInvariantInternal(u$1);
-
-var firstHalf = Belt_Array.slice(v$11, 0, 2000);
-
-var xx = Belt_Array.reduce(firstHalf, u$1, Belt_SetInt.remove);
-
-Belt_SetInt.checkInvariantInternal(u$1);
-
-b("File \"bs_set_int_test.res\", line 158, characters 4-11", Belt_SetInt.eq(Belt_SetInt.union(Belt_SetInt.fromArray(firstHalf), xx), u$1));
-
-var aa = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100));
-
-var bb = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 200));
-
-var cc = Belt_SetInt.fromArray(Array_data_util.randomRange(120, 200));
-
-var dd = Belt_SetInt.union(aa, cc);
-
-b("File \"bs_set_int_test.res\", line 171, characters 4-11", Belt_SetInt.subset(aa, bb));
-
-b("File \"bs_set_int_test.res\", line 172, characters 4-11", Belt_SetInt.subset(dd, bb));
-
-b("File \"bs_set_int_test.res\", line 173, characters 4-11", Belt_SetInt.subset(Belt_SetInt.add(dd, 200), bb));
-
-b("File \"bs_set_int_test.res\", line 174, characters 4-11", Belt_SetInt.add(dd, 200) === dd);
-
-b("File \"bs_set_int_test.res\", line 175, characters 4-11", Belt_SetInt.add(dd, 0) === dd);
-
-b("File \"bs_set_int_test.res\", line 176, characters 4-11", !Belt_SetInt.subset(Belt_SetInt.add(dd, 201), bb));
-
-var aa$1 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100));
-
-var bb$1 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100));
-
-var cc$1 = Belt_SetInt.add(bb$1, 101);
-
-var dd$1 = Belt_SetInt.remove(bb$1, 99);
-
-var ee = Belt_SetInt.add(dd$1, 101);
-
-b("File \"bs_set_int_test.res\", line 185, characters 4-11", Belt_SetInt.eq(aa$1, bb$1));
-
-b("File \"bs_set_int_test.res\", line 186, characters 4-11", !Belt_SetInt.eq(aa$1, cc$1));
-
-b("File \"bs_set_int_test.res\", line 187, characters 4-11", !Belt_SetInt.eq(dd$1, cc$1));
-
-b("File \"bs_set_int_test.res\", line 188, characters 4-11", !Belt_SetInt.eq(bb$1, ee));
-
-var a1 = Belt_SetInt.mergeMany(undefined, Array_data_util.randomRange(0, 100));
-
-var a2 = Belt_SetInt.removeMany(a1, Array_data_util.randomRange(40, 100));
-
-var a3 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 39));
-
-var match$1 = Belt_SetInt.split(a1, 40);
-
-var match$2 = match$1[0];
-
-var a5 = match$2[1];
-
-var a4 = match$2[0];
-
-b("File \"bs_set_int_test.res\", line 197, characters 4-11", Belt_SetInt.eq(a1, Belt_SetInt.fromArray(Array_data_util.randomRange(0, 100))));
-
-b("File \"bs_set_int_test.res\", line 198, characters 4-11", Belt_SetInt.eq(a2, a3));
-
-b("File \"bs_set_int_test.res\", line 199, characters 4-11", match$1[1]);
-
-b("File \"bs_set_int_test.res\", line 200, characters 4-11", Belt_SetInt.eq(a3, a4));
-
-var a6 = Belt_SetInt.remove(Belt_SetInt.removeMany(a1, Array_data_util.randomRange(0, 39)), 40);
-
-b("File \"bs_set_int_test.res\", line 202, characters 4-11", Belt_SetInt.eq(a5, a6));
-
-var a7 = Belt_SetInt.remove(a1, 40);
-
-var match$3 = Belt_SetInt.split(a7, 40);
-
-var match$4 = match$3[0];
-
-var a9 = match$4[1];
-
-b("File \"bs_set_int_test.res\", line 205, characters 4-11", !match$3[1]);
-
-b("File \"bs_set_int_test.res\", line 206, characters 4-11", Belt_SetInt.eq(a4, match$4[0]));
-
-b("File \"bs_set_int_test.res\", line 207, characters 4-11", Belt_SetInt.eq(a5, a9));
-
-var a10 = Belt_SetInt.removeMany(a9, Array_data_util.randomRange(42, 2000));
-
-eq("File \"bs_set_int_test.res\", line 209, characters 5-12", Belt_SetInt.size(a10), 1);
-
-var a11 = Belt_SetInt.removeMany(a9, Array_data_util.randomRange(0, 2000));
-
-b("File \"bs_set_int_test.res\", line 211, characters 4-11", Belt_SetInt.isEmpty(a11));
-
-var match$5 = Belt_SetInt.split(undefined, 0);
-
-var match$6 = match$5[0];
-
-b("File \"bs_set_int_test.res\", line 216, characters 4-11", Belt_SetInt.isEmpty(match$6[0]));
-
-b("File \"bs_set_int_test.res\", line 217, characters 4-11", Belt_SetInt.isEmpty(match$6[1]));
-
-b("File \"bs_set_int_test.res\", line 218, characters 4-11", !match$5[1]);
-
-var v$12 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 2000));
-
-var v0 = Belt_SetInt.fromArray(Array_data_util.randomRange(0, 2000));
-
-var v1 = Belt_SetInt.fromArray(Array_data_util.randomRange(1, 2001));
-
-var v2 = Belt_SetInt.fromArray(Array_data_util.randomRange(3, 2002));
-
-var v3 = Belt_SetInt.removeMany(v2, [
-      2002,
-      2001
-    ]);
-
-var us = Belt_Array.map(Array_data_util.randomRange(1000, 3000), (function (x) {
-        return Belt_SetInt.has(v$12, x);
-      }));
-
-var counted = Belt_Array.reduce(us, 0, (function (acc, x) {
-        if (x) {
-          return acc + 1 | 0;
-        } else {
-          return acc;
-        }
-      }));
-
-eq("File \"bs_set_int_test.res\", line 235, characters 5-12", counted, 1001);
-
-b("File \"bs_set_int_test.res\", line 236, characters 4-11", Belt_SetInt.eq(v$12, v0));
-
-b("File \"bs_set_int_test.res\", line 237, characters 4-11", Belt_SetInt.cmp(v$12, v0) === 0);
-
-b("File \"bs_set_int_test.res\", line 238, characters 4-11", Belt_SetInt.cmp(v$12, v1) < 0);
-
-b("File \"bs_set_int_test.res\", line 239, characters 4-11", Belt_SetInt.cmp(v$12, v2) > 0);
-
-b("File \"bs_set_int_test.res\", line 240, characters 4-11", Belt_SetInt.subset(v3, v0));
-
-b("File \"bs_set_int_test.res\", line 241, characters 4-11", !Belt_SetInt.subset(v1, v0));
-
-eq("File \"bs_set_int_test.res\", line 242, characters 5-12", Belt_SetInt.get(v$12, 30), 30);
-
-eq("File \"bs_set_int_test.res\", line 243, characters 5-12", Belt_SetInt.get(v$12, 3000), undefined);
-
-Mt.from_pair_suites("Bs_set_int_test", suites.contents);
-
-var N;
-
-var I;
-
-var A;
-
-var ofA = Belt_SetInt.fromArray;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.N = N;
-exports.I = I;
-exports.A = A;
-exports.$eq$tilde = $eq$tilde;
-exports.$eq$star = $eq$star;
-exports.ofA = ofA;
-exports.u = u;
-exports.range = range;
-exports.revRange = revRange;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_set_int_test.res b/jscomp/test/bs_set_int_test.res
deleted file mode 100644
index 31f0096..0000000
--- a/jscomp/test/bs_set_int_test.res
+++ /dev/null
@@ -1,245 +0,0 @@
-@@warning("-44")
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~suites, ~test_id, loc, x, y)
-
-let b = (loc, v) => Mt.bool_suites(~suites, ~test_id, loc, v)
-
-module N = Belt.Set.Int
-module I = Array_data_util
-module A = Belt.Array
-let \"=~" = (s, i) => {
-  open N
-  eq(fromArray(i), s)
-}
-let \"=*" = (a, b) => {
-  open N
-  eq(fromArray(a), fromArray(b))
-}
-let ofA = N.fromArray
-
-let () = b(__LOC__, \"=*"([1, 2, 3], [3, 2, 1]))
-let u = {
-  open N
-  intersect(ofA([1, 2, 3]), ofA([3, 4, 5]))
-}
-
-let () = b(__LOC__, \"=~"(u, [3]))
-
-/* inclusive */
-let range = (i, j) => Array.init(j - i + 1, k => k + i)
-
-let revRange = (i, j) =>
-  Array.init(j - i + 1, k => k + i) |> Array.to_list |> List.rev |> Array.of_list
-
-let () = {
-  let v = ofA(Array.append(range(100, 1000), revRange(400, 1500)))
-  b(__LOC__, \"=~"(v, range(100, 1500)))
-  let (l, r) = N.partition(v, x => mod(x, 3) == 0)
-  let (nl, nr) = {
-    let (l, r) = (ref(N.empty), ref(N.empty))
-    for i in 100 to 1500 {
-      if mod(i, 3) == 0 {
-        l := N.add(l.contents, i)
-      } else {
-        r := N.add(r.contents, i)
-      }
-    }
-    (l.contents, r.contents)
-  }
-  b(__LOC__, N.eq(l, nl))
-  b(__LOC__, N.eq(r, nr))
-}
-
-let () = b(
-  __LOC__,
-  \"=~"(
-    {
-      open N
-      intersect(ofA(range(1, 100)), ofA(range(50, 200)))
-    },
-    range(50, 100),
-  ),
-)
-
-let () = b(
-  __LOC__,
-  \"=~"(
-    {
-      open N
-      union(ofA(range(1, 100)), ofA(range(50, 200)))
-    },
-    range(1, 200),
-  ),
-)
-
-let () = b(
-  __LOC__,
-  \"=~"(
-    {
-      open N
-      diff(ofA(range(1, 100)), ofA(range(50, 200)))
-    },
-    range(1, 49),
-  ),
-)
-
-let () = b(
-  __LOC__,
-  \"=~"(
-    {
-      open N
-      intersect(ofA(revRange(1, 100)), ofA(revRange(50, 200)))
-    },
-    revRange(50, 100),
-  ),
-)
-
-let () = b(
-  __LOC__,
-  \"=~"(
-    {
-      open N
-      union(ofA(revRange(1, 100)), ofA(revRange(50, 200)))
-    },
-    revRange(1, 200),
-  ),
-)
-
-let () = b(
-  __LOC__,
-  \"=~"(
-    {
-      open N
-      diff(ofA(revRange(1, 100)), ofA(revRange(50, 200)))
-    },
-    revRange(1, 49),
-  ),
-)
-
-let () = {
-  let ss = [1, 222, 3, 4, 2, 0, 33, -1]
-  let v = ofA([1, 222, 3, 4, 2, 0, 33, -1])
-  let (minv, maxv) = (N.minUndefined(v), N.maxUndefined(v))
-  let approx = (loc, x: int, y) => b(loc, Js.eqUndefined(x, y))
-  eq(__LOC__, N.reduce(v, 0, (x, y) => x + y), A.reduce(ss, 0, \"+"))
-  approx(__LOC__, -1, minv)
-  approx(__LOC__, 222, maxv)
-  let v = N.remove(v, 3)
-  let (minv, maxv) = (N.minimum(v), N.maximum(v))
-  eq(__LOC__, minv, Some(-1))
-  eq(__LOC__, maxv, Some(222))
-  let v = N.remove(v, 222)
-  let (minv, maxv) = (N.minimum(v), N.maximum(v))
-  eq(__LOC__, minv, Some(-1))
-  eq(__LOC__, maxv, Some(33))
-  let v = N.remove(v, -1)
-  let (minv, maxv) = (N.minimum(v), N.maximum(v))
-  eq(__LOC__, minv, Some(0))
-  eq(__LOC__, maxv, Some(33))
-  let v = N.remove(v, 0)
-  let v = N.remove(v, 33)
-  let v = N.remove(v, 2)
-  let v = N.remove(v, 3)
-  let v = N.remove(v, 4)
-  let v = N.remove(v, 1)
-  b(__LOC__, N.isEmpty(v))
-}
-
-let () = {
-  let count = 1_000_000
-  let v = A.makeByAndShuffle(count, i => i)
-  let u = N.fromArray(v)
-  N.checkInvariantInternal(u)
-  let firstHalf = A.slice(v, ~offset=0, ~len=2_000)
-  let xx = Belt.Array.reduce(firstHalf, u, N.remove)
-  N.checkInvariantInternal(u)
-  b(
-    __LOC__,
-    {
-      open N
-      eq(union(fromArray(firstHalf), xx), u)
-    },
-  )
-}
-
-let () = {
-  let aa = N.fromArray(I.randomRange(0, 100))
-  let bb = N.fromArray(I.randomRange(0, 200))
-  let cc = N.fromArray(I.randomRange(120, 200))
-  let dd = N.union(aa, cc)
-  b(__LOC__, N.subset(aa, bb))
-  b(__LOC__, N.subset(dd, bb))
-  b(__LOC__, N.subset(N.add(dd, 200), bb))
-  b(__LOC__, N.add(dd, 200) === dd)
-  b(__LOC__, N.add(dd, 0) === dd)
-  b(__LOC__, !N.subset(N.add(dd, 201), bb))
-}
-
-let () = {
-  let aa = N.fromArray(I.randomRange(0, 100))
-  let bb = N.fromArray(I.randomRange(0, 100))
-  let cc = N.add(bb, 101)
-  let dd = N.remove(bb, 99)
-  let ee = N.add(dd, 101)
-  b(__LOC__, N.eq(aa, bb))
-  b(__LOC__, !N.eq(aa, cc))
-  b(__LOC__, !N.eq(dd, cc))
-  b(__LOC__, !N.eq(bb, ee))
-}
-
-let () = {
-  let a0 = N.empty
-  let a1 = N.mergeMany(a0, I.randomRange(0, 100))
-  let a2 = N.removeMany(a1, I.randomRange(40, 100))
-  let a3 = N.fromArray(I.randomRange(0, 39))
-  let ((a4, a5), pres) = N.split(a1, 40)
-  b(__LOC__, N.eq(a1, N.fromArray(I.randomRange(0, 100))))
-  b(__LOC__, N.eq(a2, a3))
-  b(__LOC__, pres)
-  b(__LOC__, N.eq(a3, a4))
-  let a6 = N.remove(N.removeMany(a1, I.randomRange(0, 39)), 40)
-  b(__LOC__, N.eq(a5, a6))
-  let a7 = N.remove(a1, 40)
-  let ((a8, a9), pres2) = N.split(a7, 40)
-  b(__LOC__, !pres2)
-  b(__LOC__, N.eq(a4, a8))
-  b(__LOC__, N.eq(a5, a9))
-  let a10 = N.removeMany(a9, I.randomRange(42, 2000))
-  eq(__LOC__, N.size(a10), 1)
-  let a11 = N.removeMany(a9, I.randomRange(0, 2000))
-  b(__LOC__, N.isEmpty(a11))
-}
-
-let () = {
-  let ((aa, bb), pres) = N.split(N.empty, 0)
-  b(__LOC__, N.isEmpty(aa))
-  b(__LOC__, N.isEmpty(bb))
-  b(__LOC__, !pres)
-}
-
-let () = {
-  let v = N.fromArray(I.randomRange(0, 2_000))
-  let v0 = N.fromArray(I.randomRange(0, 2_000))
-  let v1 = N.fromArray(I.randomRange(1, 2_001))
-  let v2 = N.fromArray(I.randomRange(3, 2_002))
-  let v3 = N.removeMany(v2, [2_002, 2_001])
-  let us = A.map(I.randomRange(1_000, 3_000), x => N.has(v, x))
-  let counted = A.reduce(us, 0, (acc, x) =>
-    if x {
-      acc + 1
-    } else {
-      acc
-    }
-  )
-  eq(__LOC__, counted, 1_001)
-  b(__LOC__, N.eq(v, v0))
-  b(__LOC__, N.cmp(v, v0) == 0)
-  b(__LOC__, N.cmp(v, v1) < 0)
-  b(__LOC__, N.cmp(v, v2) > 0)
-  b(__LOC__, N.subset(v3, v0))
-  b(__LOC__, !N.subset(v1, v0))
-  eq(__LOC__, N.get(v, 30), Some(30))
-  eq(__LOC__, N.get(v, 3_000), None)
-}
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_sort_test.js b/jscomp/test/bs_sort_test.js
deleted file mode 100644
index 1ee8bbc..0000000
--- a/jscomp/test/bs_sort_test.js
+++ /dev/null
@@ -1,439 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_Range = require("../../lib/js/belt_Range.js");
-var Belt_SortArray = require("../../lib/js/belt_SortArray.js");
-var Array_data_util = require("./array_data_util.js");
-var Belt_SortArrayInt = require("../../lib/js/belt_SortArrayInt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function cmp(x, y) {
-  return x - y | 0;
-}
-
-function unions(xs, ys) {
-  var lenX = xs.length;
-  var lenY = ys.length;
-  var o = new Array(lenX + lenY | 0);
-  var v = Belt_SortArray.union(xs, 0, lenX, ys, 0, lenY, o, 0, cmp);
-  o.length = v;
-  return o;
-}
-
-function inters(xs, ys) {
-  var lenX = xs.length;
-  var lenY = ys.length;
-  var o = new Array(lenX);
-  var v = Belt_SortArray.intersect(xs, 0, lenX, ys, 0, lenY, o, 0, cmp);
-  o.length = v;
-  return o;
-}
-
-function diffs(xs, ys) {
-  var lenX = xs.length;
-  var lenY = ys.length;
-  var o = new Array(lenX);
-  var v = Belt_SortArray.diff(xs, 0, lenX, ys, 0, lenY, o, 0, cmp);
-  o.length = v;
-  return o;
-}
-
-eq("File \"bs_sort_test.res\", line 35, characters 5-12", unions(Array_data_util.range(1, 10), Array_data_util.range(3, 13)), Array_data_util.range(1, 13));
-
-eq("File \"bs_sort_test.res\", line 36, characters 5-12", unions(Array_data_util.range(1, 10), Array_data_util.range(9, 13)), Array_data_util.range(1, 13));
-
-eq("File \"bs_sort_test.res\", line 37, characters 5-12", unions(Array_data_util.range(8, 10), Array_data_util.range(9, 13)), Array_data_util.range(8, 13));
-
-eq("File \"bs_sort_test.res\", line 38, characters 5-12", unions(Array_data_util.range(0, 2), Array_data_util.range(4, 7)), [
-      0,
-      1,
-      2,
-      4,
-      5,
-      6,
-      7
-    ]);
-
-eq("File \"bs_sort_test.res\", line 42, characters 5-12", inters(Array_data_util.range(1, 10), Array_data_util.range(3, 13)), Array_data_util.range(3, 10));
-
-eq("File \"bs_sort_test.res\", line 43, characters 5-12", inters(Array_data_util.range(1, 10), Array_data_util.range(9, 13)), Array_data_util.range(9, 10));
-
-eq("File \"bs_sort_test.res\", line 44, characters 5-12", inters(Array_data_util.range(8, 10), Array_data_util.range(9, 13)), Array_data_util.range(9, 10));
-
-eq("File \"bs_sort_test.res\", line 45, characters 5-12", inters(Array_data_util.range(0, 2), Array_data_util.range(4, 7)), []);
-
-eq("File \"bs_sort_test.res\", line 49, characters 5-12", diffs(Array_data_util.range(1, 10), Array_data_util.range(3, 13)), Array_data_util.range(1, 2));
-
-eq("File \"bs_sort_test.res\", line 50, characters 5-12", diffs(Array_data_util.range(1, 10), Array_data_util.range(9, 13)), Array_data_util.range(1, 8));
-
-eq("File \"bs_sort_test.res\", line 51, characters 5-12", diffs(Array_data_util.range(8, 10), Array_data_util.range(9, 13)), Array_data_util.range(8, 8));
-
-eq("File \"bs_sort_test.res\", line 52, characters 5-12", diffs(Array_data_util.range(0, 2), Array_data_util.range(4, 7)), [
-      0,
-      1,
-      2
-    ]);
-
-b("File \"bs_sort_test.res\", line 56, characters 4-11", Belt_Range.every(0, 200, (function (i) {
-            var v = Array_data_util.randomRange(0, i);
-            Belt_SortArray.stableSortInPlaceBy(v, cmp);
-            return Belt_SortArray.isSorted(v, cmp);
-          })));
-
-b("File \"bs_sort_test.res\", line 64, characters 4-11", Belt_Range.every(0, 200, (function (i) {
-            var v = Array_data_util.randomRange(0, i);
-            Belt_SortArray.stableSortInPlaceBy(v, cmp);
-            return Belt_SortArray.isSorted(v, cmp);
-          })));
-
-b("File \"bs_sort_test.res\", line 71, characters 4-11", Belt_SortArray.isSorted([], cmp));
-
-b("File \"bs_sort_test.res\", line 73, characters 4-11", Belt_SortArray.isSorted([0], cmp));
-
-b("File \"bs_sort_test.res\", line 75, characters 4-11", Belt_SortArray.isSorted([
-          0,
-          1
-        ], cmp));
-
-b("File \"bs_sort_test.res\", line 76, characters 4-11", !Belt_SortArray.isSorted([
-          1,
-          0
-        ], cmp));
-
-var u = Array_data_util.randomRange(0, 1000000);
-
-var u1 = u.slice(0);
-
-var u2 = u.slice(0);
-
-console.time("bs_sort_test.res 85");
-
-Belt_SortArray.stableSortInPlaceBy(u, cmp);
-
-console.timeEnd("bs_sort_test.res 85");
-
-b("File \"bs_sort_test.res\", line 86, characters 4-11", Belt_SortArray.isSorted(u, cmp));
-
-console.time("bs_sort_test.res 87");
-
-Belt_SortArrayInt.stableSortInPlace(u2);
-
-console.timeEnd("bs_sort_test.res 87");
-
-b("File \"bs_sort_test.res\", line 88, characters 4-11", Belt_SortArray.isSorted(u2, cmp));
-
-console.time("bs_sort_test.res 89");
-
-Belt_SortArray.stableSortInPlaceBy(u1, cmp);
-
-console.timeEnd("bs_sort_test.res 89");
-
-b("File \"bs_sort_test.res\", line 90, characters 4-11", Belt_SortArray.isSorted(u1, cmp));
-
-var u$1 = [
-  [
-    1,
-    "a"
-  ],
-  [
-    1,
-    "b"
-  ],
-  [
-    2,
-    "a"
-  ]
-];
-
-eq("File \"bs_sort_test.res\", line 95, characters 5-12", Belt_SortArray.stableSortBy(u$1, (function (param, param$1) {
-            return param[0] - param$1[0] | 0;
-          })), [
-      [
-        1,
-        "a"
-      ],
-      [
-        1,
-        "b"
-      ],
-      [
-        2,
-        "a"
-      ]
-    ]);
-
-var u$2 = [
-  [
-    1,
-    "b"
-  ],
-  [
-    1,
-    "a"
-  ],
-  [
-    1,
-    "b"
-  ],
-  [
-    2,
-    "a"
-  ]
-];
-
-eq("File \"bs_sort_test.res\", line 98, characters 4-11", Belt_SortArray.stableSortBy(u$2, (function (param, param$1) {
-            return param[0] - param$1[0] | 0;
-          })), [
-      [
-        1,
-        "b"
-      ],
-      [
-        1,
-        "a"
-      ],
-      [
-        1,
-        "b"
-      ],
-      [
-        2,
-        "a"
-      ]
-    ]);
-
-var u$3 = [
-  [
-    1,
-    "c"
-  ],
-  [
-    1,
-    "b"
-  ],
-  [
-    1,
-    "a"
-  ],
-  [
-    1,
-    "b"
-  ],
-  [
-    1,
-    "c"
-  ],
-  [
-    2,
-    "a"
-  ]
-];
-
-eq("File \"bs_sort_test.res\", line 104, characters 4-11", Belt_SortArray.stableSortBy(u$3, (function (param, param$1) {
-            return param[0] - param$1[0] | 0;
-          })), [
-      [
-        1,
-        "c"
-      ],
-      [
-        1,
-        "b"
-      ],
-      [
-        1,
-        "a"
-      ],
-      [
-        1,
-        "b"
-      ],
-      [
-        1,
-        "c"
-      ],
-      [
-        2,
-        "a"
-      ]
-    ]);
-
-eq("File \"bs_sort_test.res\", line 111, characters 5-12", Belt_SortArray.binarySearchBy([
-          1,
-          3,
-          5,
-          7
-        ], 4, Caml.int_compare) ^ -1, 2);
-
-eq("File \"bs_sort_test.res\", line 112, characters 5-12", Belt_SortArray.binarySearchBy([
-          1,
-          2,
-          3,
-          4,
-          33,
-          35,
-          36
-        ], 33, cmp), 4);
-
-eq("File \"bs_sort_test.res\", line 113, characters 5-12", Belt_SortArray.binarySearchBy([
-          1,
-          2,
-          3,
-          4,
-          33,
-          35,
-          36
-        ], 1, cmp), 0);
-
-eq("File \"bs_sort_test.res\", line 114, characters 5-12", Belt_SortArray.binarySearchBy([
-          1,
-          2,
-          3,
-          4,
-          33,
-          35,
-          36
-        ], 2, cmp), 1);
-
-eq("File \"bs_sort_test.res\", line 115, characters 5-12", Belt_SortArray.binarySearchBy([
-          1,
-          2,
-          3,
-          4,
-          33,
-          35,
-          36
-        ], 3, cmp), 2);
-
-eq("File \"bs_sort_test.res\", line 116, characters 5-12", Belt_SortArray.binarySearchBy([
-          1,
-          2,
-          3,
-          4,
-          33,
-          35,
-          36
-        ], 4, cmp), 3);
-
-var aa = Array_data_util.range(0, 1000);
-
-b("File \"bs_sort_test.res\", line 118, characters 10-17", Belt_Range.every(0, 1000, (function (i) {
-            return Belt_SortArray.binarySearchBy(aa, i, cmp) === i;
-          })));
-
-var cc = Belt_Array.map(Array_data_util.range(0, 2000), (function (x) {
-        return (x << 1);
-      }));
-
-eq("File \"bs_sort_test.res\", line 121, characters 5-12", Belt_SortArray.binarySearchBy(cc, 5000, cmp) ^ -1, 2001);
-
-eq("File \"bs_sort_test.res\", line 122, characters 5-12", Belt_SortArray.binarySearchBy(cc, -1, cmp) ^ -1, 0);
-
-eq("File \"bs_sort_test.res\", line 123, characters 5-12", Belt_SortArray.binarySearchBy(cc, 0, cmp), 0);
-
-eq("File \"bs_sort_test.res\", line 125, characters 5-12", Belt_SortArray.binarySearchBy(cc, 1, cmp) ^ -1, 1);
-
-b("File \"bs_sort_test.res\", line 127, characters 6-13", Belt_Range.every(0, 1999, (function (i) {
-            return (Belt_SortArray.binarySearchBy(cc, (i << 1) + 1 | 0, cmp) ^ -1) === (i + 1 | 0);
-          })));
-
-function lt(x, y) {
-  return x < y;
-}
-
-eq("File \"bs_sort_test.res\", line 137, characters 5-12", Belt_SortArray.strictlySortedLength([], lt), 0);
-
-eq("File \"bs_sort_test.res\", line 138, characters 5-12", Belt_SortArray.strictlySortedLength([1], lt), 1);
-
-eq("File \"bs_sort_test.res\", line 139, characters 5-12", Belt_SortArray.strictlySortedLength([
-          1,
-          1
-        ], lt), 1);
-
-eq("File \"bs_sort_test.res\", line 140, characters 5-12", Belt_SortArray.strictlySortedLength([
-          1,
-          1,
-          2
-        ], lt), 1);
-
-eq("File \"bs_sort_test.res\", line 141, characters 5-12", Belt_SortArray.strictlySortedLength([
-          1,
-          2
-        ], lt), 2);
-
-eq("File \"bs_sort_test.res\", line 142, characters 5-12", Belt_SortArray.strictlySortedLength([
-          1,
-          2,
-          3,
-          4,
-          3
-        ], lt), 4);
-
-eq("File \"bs_sort_test.res\", line 143, characters 5-12", Belt_SortArray.strictlySortedLength([
-          4,
-          4,
-          3,
-          2,
-          1
-        ], lt), 1);
-
-eq("File \"bs_sort_test.res\", line 144, characters 5-12", Belt_SortArray.strictlySortedLength([
-          4,
-          3,
-          2,
-          1
-        ], lt), -4);
-
-eq("File \"bs_sort_test.res\", line 145, characters 5-12", Belt_SortArray.strictlySortedLength([
-          4,
-          3,
-          2,
-          1,
-          0
-        ], lt), -5);
-
-Mt.from_pair_suites("Bs_sort_test", suites.contents);
-
-var I;
-
-var S;
-
-var R;
-
-var A;
-
-var SI;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.I = I;
-exports.S = S;
-exports.R = R;
-exports.cmp = cmp;
-exports.A = A;
-exports.unions = unions;
-exports.inters = inters;
-exports.diffs = diffs;
-exports.SI = SI;
-exports.lt = lt;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_sort_test.res b/jscomp/test/bs_sort_test.res
deleted file mode 100644
index 42b9059..0000000
--- a/jscomp/test/bs_sort_test.res
+++ /dev/null
@@ -1,148 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-
-module I = Array_data_util
-module S = Belt.SortArray
-module R = Belt.Range
-let cmp = (x, y) => x - y
-module A = Belt.Array
-
-let unions = (xs, ys) => {
-  let (lenX, lenY) = (A.length(xs), A.length(ys))
-  let o = A.makeUninitializedUnsafe(lenX + lenY)
-  let v = S.union(xs, 0, lenX, ys, 0, lenY, o, 0, cmp)
-  A.truncateToLengthUnsafe(o, v)
-  o
-}
-let inters = (xs, ys) => {
-  let (lenX, lenY) = (A.length(xs), A.length(ys))
-  let o = A.makeUninitializedUnsafe(lenX)
-  let v = S.intersect(xs, 0, lenX, ys, 0, lenY, o, 0, cmp)
-  A.truncateToLengthUnsafe(o, v)
-  o
-}
-let diffs = (xs, ys) => {
-  let (lenX, lenY) = (A.length(xs), A.length(ys))
-  let o = A.makeUninitializedUnsafe(lenX)
-  let v = S.diff(xs, 0, lenX, ys, 0, lenY, o, 0, cmp)
-  A.truncateToLengthUnsafe(o, v)
-  o
-}
-
-let () = {
-  eq(__LOC__, unions(I.range(1, 10), I.range(3, 13)), I.range(1, 13))
-  eq(__LOC__, unions(I.range(1, 10), I.range(9, 13)), I.range(1, 13))
-  eq(__LOC__, unions(I.range(8, 10), I.range(9, 13)), I.range(8, 13))
-  eq(__LOC__, unions(I.range(0, 2), I.range(4, 7)), [0, 1, 2, 4, 5, 6, 7])
-}
-
-let () = {
-  eq(__LOC__, inters(I.range(1, 10), I.range(3, 13)), I.range(3, 10))
-  eq(__LOC__, inters(I.range(1, 10), I.range(9, 13)), I.range(9, 10))
-  eq(__LOC__, inters(I.range(8, 10), I.range(9, 13)), I.range(9, 10))
-  eq(__LOC__, inters(I.range(0, 2), I.range(4, 7)), [])
-}
-
-let () = {
-  eq(__LOC__, diffs(I.range(1, 10), I.range(3, 13)), I.range(1, 2))
-  eq(__LOC__, diffs(I.range(1, 10), I.range(9, 13)), I.range(1, 8))
-  eq(__LOC__, diffs(I.range(8, 10), I.range(9, 13)), I.range(8, 8))
-  eq(__LOC__, diffs(I.range(0, 2), I.range(4, 7)), [0, 1, 2])
-}
-let () = {
-  b(
-    __LOC__,
-    R.every(0, 200, i => {
-      let v = I.randomRange(0, i)
-      S.stableSortInPlaceBy(v, cmp)
-      S.isSorted(v, cmp)
-    }),
-  )
-  b(
-    __LOC__,
-    R.every(0, 200, i => {
-      let v = I.randomRange(0, i)
-      S.stableSortInPlaceBy(v, cmp)
-      S.isSorted(v, cmp)
-    }),
-  )
-  b(__LOC__, S.isSorted([], cmp))
-
-  b(__LOC__, S.isSorted([0], cmp))
-
-  b(__LOC__, S.isSorted([0, 1], cmp))
-  b(__LOC__, \"@@"(not, S.isSorted([1, 0], cmp)))
-}
-
-module SI = Belt.SortArray.Int
-let () = {
-  let u = I.randomRange(0, 1_000_000)
-  let u1 = A.copy(u)
-  let u2 = A.copy(u)
-  /* let u3 = A.map u (fun[@bs] x -> float x) in */
-  %time(S.stableSortInPlaceBy(u, cmp))
-  b(__LOC__, S.isSorted(u, cmp))
-  %time(SI.stableSortInPlace(u2))
-  b(__LOC__, S.isSorted(u2, cmp))
-  %time(S.stableSortInPlaceBy(u1, cmp))
-  b(__LOC__, S.isSorted(u1, cmp))
-}
-
-let () = {
-  let u = [(1, "a"), (1, "b"), (2, "a")]
-  eq(__LOC__, S.stableSortBy(u, ((a, _), (b, _)) => a - b), [(1, "a"), (1, "b"), (2, "a")])
-  let u = [(1, "b"), (1, "a"), (1, "b"), (2, "a")]
-  eq(
-    __LOC__,
-    S.stableSortBy(u, ((a, _), (b, _)) => a - b),
-    [(1, "b"), (1, "a"), (1, "b"), (2, "a")],
-  )
-  let u = [(1, "c"), (1, "b"), (1, "a"), (1, "b"), (1, "c"), (2, "a")]
-  eq(
-    __LOC__,
-    S.stableSortBy(u, ((a, _), (b, _)) => a - b),
-    [(1, "c"), (1, "b"), (1, "a"), (1, "b"), (1, "c"), (2, "a")],
-  )
-}
-
-let () = {
-  eq(__LOC__, lnot(S.binarySearchBy([1, 3, 5, 7], 4, compare)), 2)
-  eq(__LOC__, S.binarySearchBy([1, 2, 3, 4, 33, 35, 36], 33, cmp), 4)
-  eq(__LOC__, S.binarySearchBy([1, 2, 3, 4, 33, 35, 36], 1, cmp), 0)
-  eq(__LOC__, S.binarySearchBy([1, 2, 3, 4, 33, 35, 36], 2, cmp), 1)
-  eq(__LOC__, S.binarySearchBy([1, 2, 3, 4, 33, 35, 36], 3, cmp), 2)
-  eq(__LOC__, S.binarySearchBy([1, 2, 3, 4, 33, 35, 36], 4, cmp), 3)
-  let aa = I.range(0, 1000)
-  \"@@"(b(__LOC__), R.every(0, 1000, i => S.binarySearchBy(aa, i, cmp) == i))
-  /* 0, 2, 4, ... 4000 */
-  let cc = A.map(I.range(0, 2000), x => x * 2)
-  eq(__LOC__, lnot(S.binarySearchBy(cc, 5000, cmp)), 2001)
-  eq(__LOC__, lnot(S.binarySearchBy(cc, -1, cmp)), 0)
-  eq(__LOC__, S.binarySearchBy(cc, 0, cmp), 0)
-
-  eq(__LOC__, lnot(S.binarySearchBy(cc, 1, cmp)), 1)
-  \"@@"(
-    b(__LOC__),
-    R.every(0, 1999, i =>
-      lnot(S.binarySearchBy(cc, 2 * i + 1, cmp)) == i + 1
-      /* 1, 3, 5, ... , 3999 */
-    ),
-  )
-}
-
-let lt = (x: int, y) => x < y
-let () = {
-  eq(__LOC__, S.strictlySortedLength([], lt), 0)
-  eq(__LOC__, S.strictlySortedLength([1], lt), 1)
-  eq(__LOC__, S.strictlySortedLength([1, 1], lt), 1)
-  eq(__LOC__, S.strictlySortedLength([1, 1, 2], lt), 1)
-  eq(__LOC__, S.strictlySortedLength([1, 2], lt), 2)
-  eq(__LOC__, S.strictlySortedLength([1, 2, 3, 4, 3], lt), 4)
-  eq(__LOC__, S.strictlySortedLength([4, 4, 3, 2, 1], lt), 1)
-  eq(__LOC__, S.strictlySortedLength([4, 3, 2, 1], lt), -4)
-  eq(__LOC__, S.strictlySortedLength([4, 3, 2, 1, 0], lt), -5)
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_splice_partial.js b/jscomp/test/bs_splice_partial.js
deleted file mode 100644
index 697fc4a..0000000
--- a/jscomp/test/bs_splice_partial.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function test(g) {
-  g.xx(10, 3, "xxx", 1, 2, 3);
-}
-
-function test_hi(x) {
-  var y = x.hi(1, 2, 3);
-  if (y !== null) {
-    console.log(y);
-    return 2;
-  } else {
-    return 1;
-  }
-}
-
-function test_hi__2(x) {
-  var match = x.hi__2();
-  if (match == null) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function test_cb(x) {
-  Curry._1(x.cb("hI", 1, 2, 3), 3);
-  Curry._1(x.cb("hI", 1, 2, 3), 3);
-  return x.cb2("hI", 1, 2, 3)(3);
-}
-
-function f(x) {
-  Curry._1(v, x);
-}
-
-function testUndefined(param) {
-  return say(1, 2, [undefined,undefined]);
-}
-
-exports.test = test;
-exports.test_hi = test_hi;
-exports.test_hi__2 = test_hi__2;
-exports.test_cb = test_cb;
-exports.f = f;
-exports.testUndefined = testUndefined;
-/* No side effect */
diff --git a/jscomp/test/bs_splice_partial.res b/jscomp/test/bs_splice_partial.res
deleted file mode 100644
index e6e5489..0000000
--- a/jscomp/test/bs_splice_partial.res
+++ /dev/null
@@ -1,51 +0,0 @@
-/* let test _g = 
-    on_exit_slice3 __LINE__ [|1;2;3|] 
-
-*/
-
-type t
-@send @variadic
-external on_exit_slice3: (t, int, ~h: @as(3) _, @as("xxx") _, array<int>) => unit = "xx"
-
-let test = g => on_exit_slice3(g, __LINE__, [1, 2, 3])
-
-@variadic @return({null_to_opt: null_to_opt}) @send
-external hi: (int, array<int>) => option<int> = "hi"
-
-let test_hi = x =>
-  switch x->hi([1, 2, 3]) {
-  | None => 1
-  | Some(y) =>
-    Js.log(y)
-    2
-  }
-
-@variadic @return(nullable) @send external hi__2: (int, array<int>) => option<int> = "hi__2"
-
-let test_hi__2 = x =>
-  switch x->hi__2([]) {
-  | None => 1
-  | Some(_) => 2
-  }
-
-type id = int => int
-
-@variadic @send external cb: (int, string, array<int>) => id = "cb"
-
-type id2 = (. int) => int
-@variadic @send external cb2: (int, string, array<int>) => id2 = "cb2"
-
-let test_cb = x => {
-  ignore((x->cb("hI", [1, 2, 3]))(3))
-  \"@@"(ignore, cb(x, "hI", [1, 2, 3])(3))
-  cb2(x, "hI", [1, 2, 3])(. 3)
-}
-
-type u = (. int) => int
-@val external v: u = "v"
-
-let f = x => \"@@"(ignore, v(. x))
-
-@val external fff0: (int, int, @as(json`[undefined,undefined]`) _) => int = "say"
-
-let testUndefined = () => fff0(1, 2)
diff --git a/jscomp/test/bs_stack_test.js b/jscomp/test/bs_stack_test.js
deleted file mode 100644
index 1cde971..0000000
--- a/jscomp/test/bs_stack_test.js
+++ /dev/null
@@ -1,163 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-var Js_undefined = require("../../lib/js/js_undefined.js");
-var Belt_MutableQueue = require("../../lib/js/belt_MutableQueue.js");
-var Belt_MutableStack = require("../../lib/js/belt_MutableStack.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function inOrder(v) {
-  var current = v;
-  var s = {
-    root: undefined
-  };
-  var q = {
-    length: 0,
-    first: undefined,
-    last: undefined
-  };
-  while(current !== undefined) {
-    var v$1 = current;
-    Belt_MutableStack.push(s, v$1);
-    current = v$1.left;
-  };
-  while(s.root !== undefined) {
-    current = Belt_MutableStack.popUndefined(s);
-    var v$2 = current;
-    Belt_MutableQueue.add(q, v$2.value);
-    current = v$2.right;
-    while(current !== undefined) {
-      var v$3 = current;
-      Belt_MutableStack.push(s, v$3);
-      current = v$3.left;
-    };
-  };
-  return Belt_MutableQueue.toArray(q);
-}
-
-function inOrder3(v) {
-  var current = v;
-  var s = {
-    root: undefined
-  };
-  var q = {
-    length: 0,
-    first: undefined,
-    last: undefined
-  };
-  while(current !== undefined) {
-    var v$1 = current;
-    Belt_MutableStack.push(s, v$1);
-    current = v$1.left;
-  };
-  Belt_MutableStack.dynamicPopIter(s, (function (popped) {
-          Belt_MutableQueue.add(q, popped.value);
-          var current = popped.right;
-          while(current !== undefined) {
-            var v = current;
-            Belt_MutableStack.push(s, v);
-            current = v.left;
-          };
-        }));
-  return Belt_MutableQueue.toArray(q);
-}
-
-function inOrder2(v) {
-  var todo = true;
-  var cursor = v;
-  var s = {
-    root: undefined
-  };
-  var q = {
-    length: 0,
-    first: undefined,
-    last: undefined
-  };
-  while(todo) {
-    if (cursor !== undefined) {
-      var v$1 = cursor;
-      Belt_MutableStack.push(s, v$1);
-      cursor = v$1.left;
-    } else if (s.root !== undefined) {
-      cursor = Belt_MutableStack.popUndefined(s);
-      var current = cursor;
-      Belt_MutableQueue.add(q, current.value);
-      cursor = current.right;
-    } else {
-      todo = false;
-    }
-  };
-}
-
-function n(l, r, a) {
-  return {
-          value: a,
-          left: Js_undefined.fromOption(l),
-          right: Js_undefined.fromOption(r)
-        };
-}
-
-var test1 = n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), Caml_option.some(n(undefined, undefined, 5)), 2)), Caml_option.some(n(undefined, undefined, 3)), 1);
-
-function pushAllLeft(st1, s1) {
-  var current = st1;
-  while(current !== undefined) {
-    var v = current;
-    Belt_MutableStack.push(s1, v);
-    current = v.left;
-  };
-}
-
-var test2 = n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), undefined, 2)), undefined, 5)), undefined, 1)), undefined, 3);
-
-var test3 = n(Caml_option.some(n(Caml_option.some(n(Caml_option.some(n(undefined, undefined, 4)), undefined, 2)), undefined, 5)), Caml_option.some(n(undefined, undefined, 3)), 1);
-
-eq("File \"bs_stack_test.res\", line 98, characters 3-10", inOrder(test1), [
-      4,
-      2,
-      5,
-      1,
-      3
-    ]);
-
-eq("File \"bs_stack_test.res\", line 99, characters 3-10", inOrder3(test1), [
-      4,
-      2,
-      5,
-      1,
-      3
-    ]);
-
-Mt.from_pair_suites("bs_stack_test.res", suites.contents);
-
-var S;
-
-var Q;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.S = S;
-exports.Q = Q;
-exports.inOrder = inOrder;
-exports.inOrder3 = inOrder3;
-exports.inOrder2 = inOrder2;
-exports.n = n;
-exports.test1 = test1;
-exports.pushAllLeft = pushAllLeft;
-exports.test2 = test2;
-exports.test3 = test3;
-/* test1 Not a pure module */
diff --git a/jscomp/test/bs_stack_test.res b/jscomp/test/bs_stack_test.res
deleted file mode 100644
index 6f0b02c..0000000
--- a/jscomp/test/bs_stack_test.res
+++ /dev/null
@@ -1,101 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-type rec node = {
-  value: int,
-  left: t,
-  right: t,
-}
-@deriving(abstract) and t = Js.undefined<node>
-
-module S = Belt.MutableStack
-module Q = Belt.MutableQueue
-
-let inOrder = (v: t): array<int> => {
-  let current = ref(v)
-  let s: S.t<node> = S.make()
-  let q: Q.t<int> = Q.make()
-  while current.contents !== Js.undefined {
-    let v = Js.Undefined.getUnsafe(current.contents)
-    S.push(s, v)
-    current := leftGet(v)
-  }
-  while !S.isEmpty(s) {
-    current := S.popUndefined(s)
-    let v = Js.Undefined.getUnsafe(current.contents)
-    Q.add(q, valueGet(v))
-    current := rightGet(v)
-    while current.contents !== Js.undefined {
-      let v = Js.Undefined.getUnsafe(current.contents)
-      S.push(s, v)
-      current := leftGet(v)
-    }
-  }
-  Q.toArray(q)
-}
-
-let inOrder3 = (v: t): array<int> => {
-  let current = ref(v)
-  let s: S.t<node> = S.make()
-  let q: Q.t<int> = Q.make()
-  while current.contents !== Js.undefined {
-    let v = Js.Undefined.getUnsafe(current.contents)
-    S.push(s, v)
-    current := leftGet(v)
-  }
-  S.dynamicPopIter(s, popped => {
-    Q.add(q, valueGet(popped))
-    let current = ref(rightGet(popped))
-    while current.contents !== Js.undefined {
-      let v = Js.Undefined.getUnsafe(current.contents)
-      S.push(s, v)
-      current := leftGet(v)
-    }
-  })
-  Q.toArray(q)
-}
-
-let inOrder2 = (v: t) => {
-  let todo = ref(true)
-  let cursor = ref(v)
-  let s: S.t<node> = S.make()
-  let q: Q.t<int> = Q.make()
-  while todo.contents {
-    if cursor.contents !== Js.undefined {
-      let v = Js.Undefined.getUnsafe(cursor.contents)
-      S.push(s, v)
-      cursor := leftGet(v)
-    } else if !S.isEmpty(s) {
-      cursor := S.popUndefined(s)
-      let current = Js.Undefined.getUnsafe(cursor.contents)
-      Q.add(q, valueGet(current))
-      cursor := rightGet(current)
-    } else {
-      todo := false
-    }
-  }
-}
-
-let n = (~l=?, ~r=?, a) =>
-  node(~value=a, ~left=Js.Undefined.fromOption(l), ~right=Js.Undefined.fromOption(r))
-
-let test1 = n(1, ~l=n(2, ~l=n(4), ~r=n(5)), ~r=n(3))
-
-let pushAllLeft = (st1, s1) => {
-  let current = ref(st1)
-  while current.contents !== Js.undefined {
-    let v = Js.Undefined.getUnsafe(current.contents)
-    S.push(s1, v)
-    current := leftGet(v)
-  }
-}
-
-let test2 = n(3, ~l=n(1, ~l=n(5, ~l=n(2, ~l=n(4)))))
-
-let test3 = n(1, ~l=n(5, ~l=n(2, ~l=n(4))), ~r=n(3))
-
-eq(__LOC__, inOrder(Js.Undefined.return(test1)), [4, 2, 5, 1, 3])
-eq(__LOC__, inOrder3(Js.Undefined.return(test1)), [4, 2, 5, 1, 3])
-
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/bs_string_test.js b/jscomp/test/bs_string_test.js
deleted file mode 100644
index 2c5686d..0000000
--- a/jscomp/test/bs_string_test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"bs_string_test.res\", line 10, characters 2-9", "ghso ghso g".split(" ").reduce((function (x, y) {
-            return x + ("-" + y);
-          }), ""), "-ghso-ghso-g");
-
-Mt.from_pair_suites("Bs_string_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_string_test.res b/jscomp/test/bs_string_test.res
deleted file mode 100644
index 5f787bc..0000000
--- a/jscomp/test/bs_string_test.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let () = eq(
-  __LOC__,
-  "ghso ghso g"->Js.String2.split(" ")->Js.Array2.reduce((x, y) => x ++ ("-" ++ y), ""),
-  "-ghso-ghso-g",
-)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/bs_unwrap_test.js b/jscomp/test/bs_unwrap_test.js
deleted file mode 100644
index b020cf4..0000000
--- a/jscomp/test/bs_unwrap_test.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-console.log([
-      "hello world",
-      1
-    ]);
-
-console.log(1337);
-
-console.log("hello world");
-
-var arg_string = {
-  NAME: "String",
-  VAL: "hi runtime"
-};
-
-console.log(arg_string.VAL);
-
-var arg_pair = {
-  NAME: "Pair",
-  VAL: [
-    "hi",
-    1
-  ]
-};
-
-console.log(arg_pair.VAL);
-
-console.log();
-
-console.log(1, undefined);
-
-console.log(2, "hi");
-
-console.log(3, "hi");
-
-console.log(4, undefined);
-
-var some_arg = {
-  NAME: "Bool",
-  VAL: true
-};
-
-console.log(5, Caml_option.option_unwrap(some_arg));
-
-console.log(6, undefined);
-
-console.log(7, Caml_option.option_unwrap((console.log("trace"), undefined)));
-
-function dyn_log3(prim0, prim1, prim2) {
-  console.log(prim0.VAL, Caml_option.option_unwrap(prim1));
-}
-
-dyn_log3({
-      NAME: "Int",
-      VAL: 8
-    }, {
-      NAME: "Bool",
-      VAL: true
-    }, undefined);
-
-console.log("foo");
-
-console.log({
-      foo: 1
-    });
-
-function dyn_log4(prim) {
-  console.log(prim.VAL);
-}
-
-console.log({
-      foo: 2
-    });
-
-function f(x) {
-  console.log(x.VAL);
-}
-
-function ff0(x, p) {
-  console.log(Caml_option.option_unwrap(x), p);
-}
-
-function ff1(x, p) {
-  console.log(Caml_option.option_unwrap(Curry._1(x, undefined)), p);
-}
-
-function test00(param) {
-  return {
-          a: 1,
-          b: 2,
-          x: undefined
-        };
-}
-
-var none_arg;
-
-exports.arg_string = arg_string;
-exports.arg_pair = arg_pair;
-exports.some_arg = some_arg;
-exports.none_arg = none_arg;
-exports.dyn_log3 = dyn_log3;
-exports.dyn_log4 = dyn_log4;
-exports.f = f;
-exports.ff0 = ff0;
-exports.ff1 = ff1;
-exports.test00 = test00;
-/*  Not a pure module */
diff --git a/jscomp/test/bs_unwrap_test.res b/jscomp/test/bs_unwrap_test.res
deleted file mode 100644
index d00b3da..0000000
--- a/jscomp/test/bs_unwrap_test.res
+++ /dev/null
@@ -1,96 +0,0 @@
-@val
-external log1: @unwrap
-[
-  | #Pair(string, int)
-  | #Int(int)
-  | #String(string)
-] => unit = "console.log"
-
-let _ = log1(#Pair("hello world", 1))
-let _ = log1(#Int(1337))
-let _ = log1(#String("hello world"))
-
-let arg_string = #String("hi runtime")
-let _ = log1(arg_string)
-
-let arg_pair = #Pair("hi", 1)
-let _ = log1(arg_pair)
-
-@val
-external log2: @unwrap
-[
-  | #Unit(unit)
-] => unit = "console.log"
-
-let _ = log2(#Unit())
-
-@val
-external log3: (
-  ~req: @unwrap
-  [
-    | #String(string)
-    | #Int(int)
-  ],
-  ~opt: @unwrap
-  [
-    | #String(string)
-    | #Bool(bool)
-  ]=?,
-  unit,
-) => unit = "console.log"
-
-let _ = log3(~req=#Int(1), ())
-let _ = log3(~req=#Int(2), ~opt=#String("hi"), ())
-let _ = log3(~req=#Int(3), ~opt=?Some(#String("hi")), ())
-let _ = log3(~req=#Int(4), ~opt=?None, ())
-
-/* static optional arg as variable */
-let some_arg = Some(#Bool(true))
-let _ = log3(~req=#Int(5), ~opt=?some_arg, ())
-
-let none_arg = None
-let _ = log3(~req=#Int(6), ~opt=?none_arg, ())
-
-/* static optional arg as complex side-effectful expression */
-let _ = log3(
-  ~req=#Int(7),
-  ~opt=?(
-    _ => {
-      print_endline("trace")
-      None
-    }
-  )(),
-  (),
-)
-
-/* expose the external as a function in generated module */
-let dyn_log3 = log3
-
-/* call the dynamically reassigned external */
-let _ = dyn_log3(~req=#Int(8), ~opt=#Bool(true), ())
-
-@val
-external log4: @unwrap
-[
-  | #String(string)
-  | #Options({"foo": int})
-] => unit = "console.log"
-
-/* Make sure [@bs.unwrap] plays nicely with [%bs.obj] */
-let _ = log4(#String("foo"))
-let _ = log4(#Options({"foo": 1}))
-
-let dyn_log4 = log4
-let _ = dyn_log4(#Options({"foo": 2}))
-
-let f = x => dyn_log4(x)
-
-@val external log5: (~h: @unwrap [#A(int) | #B(string)]=?, int) => unit = "console.log"
-
-let ff0 = (x, p) => log5(~h=?x, p)
-
-let ff1 = (x, p) => log5(~h=?x(), p)
-
-@obj external ff: (~a: int, ~b: int, ~x: unit) => _ = ""
-
-let test00 = () => ff(~a=1, ~b=2, ~x=())
diff --git a/jscomp/test/buffer_test.js b/jscomp/test/buffer_test.js
deleted file mode 100644
index 03d605d..0000000
--- a/jscomp/test/buffer_test.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Bytes = require("../../lib/js/bytes.js");
-var $$Buffer = require("../../lib/js/buffer.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-
-var v = "gso";
-
-var suites_0 = [
-  "equal",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: [
-                Caml_bytes.get(Bytes.make(3, /* 'a' */97), 0),
-                Bytes.make(3, /* 'a' */97)[0]
-              ],
-              _1: [
-                /* 'a' */97,
-                /* 'a' */97
-              ]
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "equal2",
-    (function (param) {
-        var u = Bytes.make(3, /* 'a' */97);
-        u[0] = /* 'b' */98;
-        return {
-                TAG: "Eq",
-                _0: [
-                  u[0],
-                  Caml_string.get(v, 0)
-                ],
-                _1: [
-                  /* 'b' */98,
-                  /* 'g' */103
-                ]
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "buffer",
-      (function (param) {
-          var v = $$Buffer.create(30);
-          for(var i = 0; i <= 10; ++i){
-            $$Buffer.add_string(v, String(i));
-          }
-          return {
-                  TAG: "Eq",
-                  _0: $$Buffer.contents(v),
-                  _1: "012345678910"
-                };
-        })
-    ],
-    tl: /* [] */0
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Buffer_test", suites);
-
-exports.v = v;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/buffer_test.res b/jscomp/test/buffer_test.res
deleted file mode 100644
index 7745b20..0000000
--- a/jscomp/test/buffer_test.res
+++ /dev/null
@@ -1,34 +0,0 @@
-let v = "gso"
-
-let suites = {
-  open Mt
-  list{
-    (
-      "equal",
-      _ => Eq(
-        (Bytes.get(Bytes.make(3, 'a'), 0), Bytes.unsafe_get(Bytes.make(3, 'a'), 0)),
-        ('a', 'a'),
-      ),
-    ),
-    (
-      "equal2",
-      _ => {
-        let u = Bytes.make(3, 'a')
-        Bytes.unsafe_set(u, 0, 'b')
-        Eq((Bytes.unsafe_get(u, 0), String.get(v, 0)), ('b', 'g'))
-      },
-    ),
-    (
-      "buffer",
-      _ => {
-        let v = Buffer.create(30)
-        for i in 0 to 10 {
-          Buffer.add_string(v, string_of_int(i))
-        }
-        Eq(Buffer.contents(v), "012345678910")
-      },
-    ),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/build.ninja b/jscomp/test/build.ninja
deleted file mode 100644
index b4cd127..0000000
--- a/jscomp/test/build.ninja
+++ /dev/null
@@ -1,732 +0,0 @@
-
-bsc_flags = -bs-cross-module-opt -make-runtime-test -bs-package-output commonjs:jscomp/test  -w -3-6-26-27-29-30-32..40-44-45-52-60-9-106+104 -warn-error A  -I runtime -I $stdlib -I others
-
-rule cc
-    command = $bsc -bs-cmi -bs-cmj $bsc_flags   -I test  $in
-    description = $in -> $out
-rule cc_cmi
-    command = $bsc -bs-read-cmi -bs-cmi -bs-cmj $bsc_flags  -I test  $in
-    description = $in -> $out    
-
-
-
-
-rule mll
-    command = $ocamllex $in
-    generator = true
-
-o test/arith_lexer.ml : mll test/arith_lexer.mll
-o test/number_lexer.ml : mll test/number_lexer.mll
-o test/simple_lexer_test.ml : mll test/simple_lexer_test.mll
-o test/406_primitive_test.cmi test/406_primitive_test.cmj : cc test/406_primitive_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/AsInUncurriedExternals.cmi test/AsInUncurriedExternals.cmj : cc test/AsInUncurriedExternals.res | $bsc $stdlib runtime
-o test/Coercion.cmi test/Coercion.cmj : cc test/Coercion.res | $bsc $stdlib runtime
-o test/DerivingAccessorsCurried.cmi test/DerivingAccessorsCurried.cmj : cc test/DerivingAccessorsCurried.res | $bsc $stdlib runtime
-o test/DerivingAccessorsUncurried.cmi test/DerivingAccessorsUncurried.cmj : cc test/DerivingAccessorsUncurried.res | $bsc $stdlib runtime
-o test/DictInference.cmi test/DictInference.cmj : cc test/DictInference.res | $bsc $stdlib runtime
-o test/DisambiguateOptionalFields.cmi test/DisambiguateOptionalFields.cmj : cc test/DisambiguateOptionalFields.res | $bsc $stdlib runtime
-o test/DotDotDot.cmi test/DotDotDot.cmj : cc test/DotDotDot.res | $bsc $stdlib runtime
-o test/EmptyRecord.cmi test/EmptyRecord.cmj : cc test/EmptyRecord.res | $bsc $stdlib runtime
-o test/FFI.cmi test/FFI.cmj : cc test/FFI.res | $bsc $stdlib runtime
-o test/Import.cmi test/Import.cmj : cc test/Import.res | $bsc $stdlib runtime
-o test/ImportAttributes.cmi test/ImportAttributes.cmj : cc test/ImportAttributes.res | $bsc $stdlib runtime
-o test/RecordCoercion.cmi test/RecordCoercion.cmj : cc test/RecordCoercion.res | $bsc $stdlib runtime
-o test/RecordOrObject.cmi test/RecordOrObject.cmj : cc test/RecordOrObject.res | $bsc $stdlib runtime
-o test/SafePromises.cmi test/SafePromises.cmj : cc test/SafePromises.res | $bsc $stdlib runtime
-o test/UncurriedAlways.cmi test/UncurriedAlways.cmj : cc test/UncurriedAlways.res | $bsc $stdlib runtime
-o test/UncurriedExternals.cmi test/UncurriedExternals.cmj : cc test/UncurriedExternals.res | $bsc $stdlib runtime
-o test/UncurriedPervasives.cmi test/UncurriedPervasives.cmj : cc test/UncurriedPervasives.res | $bsc $stdlib runtime
-o test/UntaggedVariants.cmi test/UntaggedVariants.cmj : cc test/UntaggedVariants.res | $bsc $stdlib runtime
-o test/VariantCoercion.cmi test/VariantCoercion.cmj : cc test/VariantCoercion.res | $bsc $stdlib runtime
-o test/VariantSpreads.cmi test/VariantSpreads.cmj : cc test/VariantSpreads.res | $bsc $stdlib runtime
-o test/a.cmi test/a.cmj : cc test/a.res | test/test_order.cmj $bsc $stdlib runtime
-o test/a_filename_test.cmi test/a_filename_test.cmj : cc test/a_filename_test.res | test/ext_filename_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/a_list_test.cmi test/a_list_test.cmj : cc test/a_list_test.res | test/ext_list_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/a_recursive_type.cmj : cc_cmi test/a_recursive_type.res | test/a_recursive_type.cmi $bsc $stdlib runtime
-o test/a_recursive_type.cmi : cc test/a_recursive_type.resi | $bsc $stdlib runtime
-o test/a_scope_bug.cmi test/a_scope_bug.cmj : cc test/a_scope_bug.res | $bsc $stdlib runtime
-o test/a_string_test.cmi test/a_string_test.cmj : cc test/a_string_test.res | test/ext_string_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/abstract_type.cmj : cc_cmi test/abstract_type.res | test/abstract_type.cmi $bsc $stdlib runtime
-o test/abstract_type.cmi : cc test/abstract_type.resi | test/mt.cmi $bsc $stdlib runtime
-o test/adt_optimize_test.cmi test/adt_optimize_test.cmj : cc test/adt_optimize_test.res | $bsc $stdlib runtime
-o test/alias_default_value_test.cmi test/alias_default_value_test.cmj : cc test/alias_default_value_test.res | test/react.cmj $bsc $stdlib runtime
-o test/alias_test.cmj : cc_cmi test/alias_test.res | test/alias_test.cmi $bsc $stdlib runtime
-o test/alias_test.cmi : cc test/alias_test.resi | $bsc $stdlib runtime
-o test/and_or_tailcall_test.cmi test/and_or_tailcall_test.cmj : cc test/and_or_tailcall_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/argv_test.cmi test/argv_test.cmj : cc test/argv_test.res | $bsc $stdlib runtime
-o test/ari_regress_test.cmj : cc_cmi test/ari_regress_test.res | test/ari_regress_test.cmi test/mt.cmj $bsc $stdlib runtime
-o test/ari_regress_test.cmi : cc test/ari_regress_test.resi | $bsc $stdlib runtime
-o test/arith_lexer.cmi test/arith_lexer.cmj : cc test/arith_lexer.res | test/arith_parser.cmj test/arith_syntax.cmj $bsc $stdlib runtime
-o test/arith_parser.cmi test/arith_parser.cmj : cc test/arith_parser.res | test/arith_syntax.cmj $bsc $stdlib runtime
-o test/arith_syntax.cmi test/arith_syntax.cmj : cc test/arith_syntax.res | $bsc $stdlib runtime
-o test/arity.cmi test/arity.cmj : cc test/arity.res | $bsc $stdlib runtime
-o test/arity_deopt.cmi test/arity_deopt.cmj : cc test/arity_deopt.res | test/mt.cmj $bsc $stdlib runtime
-o test/arity_infer.cmi test/arity_infer.cmj : cc test/arity_infer.res | $bsc $stdlib runtime
-o test/array_data_util.cmi test/array_data_util.cmj : cc test/array_data_util.res | $bsc $stdlib runtime
-o test/array_safe_get.cmi test/array_safe_get.cmj : cc test/array_safe_get.res | $bsc $stdlib runtime
-o test/array_subtle_test.cmi test/array_subtle_test.cmj : cc test/array_subtle_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/array_test.cmj : cc_cmi test/array_test.res | test/array_test.cmi test/mt.cmj $bsc $stdlib runtime
-o test/array_test.cmi : cc test/array_test.resi | $bsc $stdlib runtime
-o test/as_inline_record_test.cmi test/as_inline_record_test.cmj : cc test/as_inline_record_test.res | $bsc $stdlib runtime
-o test/ast_abstract_test.cmi test/ast_abstract_test.cmj : cc test/ast_abstract_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/ast_mapper_unused_warning_test.cmi test/ast_mapper_unused_warning_test.cmj : cc test/ast_mapper_unused_warning_test.res | $bsc $stdlib runtime
-o test/async_await.cmi test/async_await.cmj : cc test/async_await.res | $bsc $stdlib runtime
-o test/async_ideas.cmi test/async_ideas.cmj : cc test/async_ideas.res | $bsc $stdlib runtime
-o test/async_inline.cmi test/async_inline.cmj : cc test/async_inline.res | $bsc $stdlib runtime
-o test/async_inside_loop.cmi test/async_inside_loop.cmj : cc test/async_inside_loop.res | $bsc $stdlib runtime
-o test/attr_test.cmi test/attr_test.cmj : cc test/attr_test.res | $bsc $stdlib runtime
-o test/b.cmi test/b.cmj : cc test/b.res | $bsc $stdlib runtime
-o test/bal_set_mini.cmi test/bal_set_mini.cmj : cc test/bal_set_mini.res | $bsc $stdlib runtime
-o test/bang_primitive.cmi test/bang_primitive.cmj : cc test/bang_primitive.res | $bsc $stdlib runtime
-o test/basic_module_test.cmj : cc_cmi test/basic_module_test.res | test/basic_module_test.cmi test/mt.cmj test/mt_global.cmj test/offset.cmj test/pr6726.cmj $bsc $stdlib runtime
-o test/basic_module_test.cmi : cc test/basic_module_test.resi | $bsc $stdlib runtime
-o test/bb.cmi test/bb.cmj : cc test/bb.res | $bsc $stdlib runtime
-o test/bdd.cmi test/bdd.cmj : cc test/bdd.res | $bsc $stdlib runtime
-o test/belt_internal_test.cmi test/belt_internal_test.cmj : cc test/belt_internal_test.res | $bsc $stdlib runtime
-o test/belt_result_alias_test.cmi test/belt_result_alias_test.cmj : cc test/belt_result_alias_test.res | $bsc $stdlib runtime
-o test/bench.cmi test/bench.cmj : cc test/bench.res | $bsc $stdlib runtime
-o test/big_enum.cmi test/big_enum.cmj : cc test/big_enum.res | $bsc $stdlib runtime
-o test/big_polyvar_test.cmi test/big_polyvar_test.cmj : cc test/big_polyvar_test.res | $bsc $stdlib runtime
-o test/bigint_test.cmi test/bigint_test.cmj : cc test/bigint_test.res | test/mt.cmj test/mt_global.cmj $bsc $stdlib runtime
-o test/block_alias_test.cmi test/block_alias_test.cmj : cc test/block_alias_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/boolean_test.cmi test/boolean_test.cmj : cc test/boolean_test.res | test/mt.cmj test/test_bool_equal.cmj $bsc $stdlib runtime
-o test/bs_MapInt_test.cmi test/bs_MapInt_test.cmj : cc test/bs_MapInt_test.res | $bsc $stdlib runtime
-o test/bs_abstract_test.cmj : cc_cmi test/bs_abstract_test.res | test/bs_abstract_test.cmi $bsc $stdlib runtime
-o test/bs_abstract_test.cmi : cc test/bs_abstract_test.resi | $bsc $stdlib runtime
-o test/bs_array_test.cmi test/bs_array_test.cmj : cc test/bs_array_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_auto_uncurry.cmi test/bs_auto_uncurry.cmj : cc test/bs_auto_uncurry.res | $bsc $stdlib runtime
-o test/bs_auto_uncurry_test.cmi test/bs_auto_uncurry_test.cmj : cc test/bs_auto_uncurry_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_float_test.cmi test/bs_float_test.cmj : cc test/bs_float_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_hashmap_test.cmi test/bs_hashmap_test.cmj : cc test/bs_hashmap_test.res | test/array_data_util.cmj test/mt.cmj $bsc $stdlib runtime
-o test/bs_hashset_int_test.cmi test/bs_hashset_int_test.cmj : cc test/bs_hashset_int_test.res | test/array_data_util.cmj test/mt.cmj $bsc $stdlib runtime
-o test/bs_hashtbl_string_test.cmi test/bs_hashtbl_string_test.cmj : cc test/bs_hashtbl_string_test.res | $bsc $stdlib runtime
-o test/bs_ignore_effect.cmi test/bs_ignore_effect.cmj : cc test/bs_ignore_effect.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_ignore_test.cmi test/bs_ignore_test.cmj : cc test/bs_ignore_test.res | $bsc $stdlib runtime
-o test/bs_int_test.cmi test/bs_int_test.cmj : cc test/bs_int_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_list_test.cmi test/bs_list_test.cmj : cc test/bs_list_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_map_set_dict_test.cmi test/bs_map_set_dict_test.cmj : cc test/bs_map_set_dict_test.res | test/array_data_util.cmj test/mt.cmj $bsc $stdlib runtime
-o test/bs_map_test.cmi test/bs_map_test.cmj : cc test/bs_map_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_min_max_test.cmi test/bs_min_max_test.cmj : cc test/bs_min_max_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_mutable_set_test.cmi test/bs_mutable_set_test.cmj : cc test/bs_mutable_set_test.res | test/array_data_util.cmj test/mt.cmj $bsc $stdlib runtime
-o test/bs_poly_map_test.cmi test/bs_poly_map_test.cmj : cc test/bs_poly_map_test.res | test/array_data_util.cmj test/mt.cmj $bsc $stdlib runtime
-o test/bs_poly_mutable_map_test.cmi test/bs_poly_mutable_map_test.cmj : cc test/bs_poly_mutable_map_test.res | test/array_data_util.cmj test/mt.cmj $bsc $stdlib runtime
-o test/bs_poly_mutable_set_test.cmi test/bs_poly_mutable_set_test.cmj : cc test/bs_poly_mutable_set_test.res | test/array_data_util.cmj test/mt.cmj $bsc $stdlib runtime
-o test/bs_poly_set_test.cmi test/bs_poly_set_test.cmj : cc test/bs_poly_set_test.res | test/array_data_util.cmj test/mt.cmj $bsc $stdlib runtime
-o test/bs_qualified.cmi test/bs_qualified.cmj : cc test/bs_qualified.res | $bsc $stdlib runtime
-o test/bs_queue_test.cmi test/bs_queue_test.cmj : cc test/bs_queue_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_rbset_int_bench.cmi test/bs_rbset_int_bench.cmj : cc test/bs_rbset_int_bench.res | test/rbset.cmj $bsc $stdlib runtime
-o test/bs_rest_test.cmi test/bs_rest_test.cmj : cc test/bs_rest_test.res | $bsc $stdlib runtime
-o test/bs_set_bench.cmi test/bs_set_bench.cmj : cc test/bs_set_bench.res | $bsc $stdlib runtime
-o test/bs_set_int_test.cmi test/bs_set_int_test.cmj : cc test/bs_set_int_test.res | test/array_data_util.cmj test/mt.cmj $bsc $stdlib runtime
-o test/bs_sort_test.cmi test/bs_sort_test.cmj : cc test/bs_sort_test.res | test/array_data_util.cmj test/mt.cmj $bsc $stdlib runtime
-o test/bs_splice_partial.cmi test/bs_splice_partial.cmj : cc test/bs_splice_partial.res | $bsc $stdlib runtime
-o test/bs_stack_test.cmi test/bs_stack_test.cmj : cc test/bs_stack_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_string_test.cmi test/bs_string_test.cmj : cc test/bs_string_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bs_unwrap_test.cmi test/bs_unwrap_test.cmj : cc test/bs_unwrap_test.res | $bsc $stdlib runtime
-o test/buffer_test.cmi test/buffer_test.cmj : cc test/buffer_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/bytes_split_gpr_743_test.cmi test/bytes_split_gpr_743_test.cmj : cc test/bytes_split_gpr_743_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/caml_compare_bigint_test.cmi test/caml_compare_bigint_test.cmj : cc test/caml_compare_bigint_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/caml_compare_test.cmi test/caml_compare_test.cmj : cc test/caml_compare_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/caml_format_test.cmi test/caml_format_test.cmj : cc test/caml_format_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/chain_code_test.cmi test/chain_code_test.cmj : cc test/chain_code_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/chn_test.cmi test/chn_test.cmj : cc test/chn_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/class_type_ffi_test.cmi test/class_type_ffi_test.cmj : cc test/class_type_ffi_test.res | $bsc $stdlib runtime
-o test/coercion_module_alias_test.cmi test/coercion_module_alias_test.cmj : cc test/coercion_module_alias_test.res | $bsc $stdlib runtime
-o test/compare_test.cmi test/compare_test.cmj : cc test/compare_test.res | $bsc $stdlib runtime
-o test/complete_parmatch_test.cmi test/complete_parmatch_test.cmj : cc test/complete_parmatch_test.res | $bsc $stdlib runtime
-o test/complex_if_test.cmi test/complex_if_test.cmj : cc test/complex_if_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/complex_test.cmi test/complex_test.cmj : cc test/complex_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/complex_while_loop.cmi test/complex_while_loop.cmj : cc test/complex_while_loop.res | $bsc $stdlib runtime
-o test/condition_compilation_test.cmi test/condition_compilation_test.cmj : cc test/condition_compilation_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/config1_test.cmi test/config1_test.cmj : cc test/config1_test.res | $bsc $stdlib runtime
-o test/console_log_test.cmi test/console_log_test.cmj : cc test/console_log_test.res | $bsc $stdlib runtime
-o test/const_block_test.cmj : cc_cmi test/const_block_test.res | test/const_block_test.cmi test/mt.cmj $bsc $stdlib runtime
-o test/const_block_test.cmi : cc test/const_block_test.resi | $bsc $stdlib runtime
-o test/const_defs.cmi test/const_defs.cmj : cc test/const_defs.res | $bsc $stdlib runtime
-o test/const_defs_test.cmi test/const_defs_test.cmj : cc test/const_defs_test.res | test/const_defs.cmj $bsc $stdlib runtime
-o test/const_test.cmi test/const_test.cmj : cc test/const_test.res | $bsc $stdlib runtime
-o test/cont_int_fold_test.cmi test/cont_int_fold_test.cmj : cc test/cont_int_fold_test.res | $bsc $stdlib runtime
-o test/cps_test.cmi test/cps_test.cmj : cc test/cps_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/cross_module_inline_test.cmi test/cross_module_inline_test.cmj : cc test/cross_module_inline_test.res | test/test_char.cmj $bsc $stdlib runtime
-o test/custom_error_test.cmi test/custom_error_test.cmj : cc test/custom_error_test.res | $bsc $stdlib runtime
-o test/debug_keep_test.cmi test/debug_keep_test.cmj : cc test/debug_keep_test.res | $bsc $stdlib runtime
-o test/debug_mode_value.cmi test/debug_mode_value.cmj : cc test/debug_mode_value.res | $bsc $stdlib runtime
-o test/debug_tmp.cmi test/debug_tmp.cmj : cc test/debug_tmp.res | $bsc $stdlib runtime
-o test/debugger_test.cmi test/debugger_test.cmj : cc test/debugger_test.res | $bsc $stdlib runtime
-o test/default_export_test.cmi test/default_export_test.cmj : cc test/default_export_test.res | $bsc $stdlib runtime
-o test/defunctor_make_test.cmi test/defunctor_make_test.cmj : cc test/defunctor_make_test.res | $bsc $stdlib runtime
-o test/demo_int_map.cmj : cc_cmi test/demo_int_map.res | test/demo_int_map.cmi $bsc $stdlib runtime
-o test/demo_int_map.cmi : cc test/demo_int_map.resi | $bsc $stdlib runtime
-o test/demo_page.cmi test/demo_page.cmj : cc test/demo_page.res | $bsc $stdlib runtime
-o test/demo_pipe.cmi test/demo_pipe.cmj : cc test/demo_pipe.res | $bsc $stdlib runtime
-o test/derive_dyntype.cmi test/derive_dyntype.cmj : cc test/derive_dyntype.res | $bsc $stdlib runtime
-o test/derive_projector_test.cmj : cc_cmi test/derive_projector_test.res | test/derive_projector_test.cmi $bsc $stdlib runtime
-o test/derive_projector_test.cmi : cc test/derive_projector_test.resi | $bsc $stdlib runtime
-o test/derive_type_test.cmi test/derive_type_test.cmj : cc test/derive_type_test.res | $bsc $stdlib runtime
-o test/digest_test.cmi test/digest_test.cmj : cc test/digest_test.res | test/ext_array_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/directives.cmi test/directives.cmj : cc test/directives.res | $bsc $stdlib runtime
-o test/div_by_zero_test.cmi test/div_by_zero_test.cmj : cc test/div_by_zero_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/dollar_escape_test.cmi test/dollar_escape_test.cmj : cc test/dollar_escape_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/earger_curry_test.cmi test/earger_curry_test.cmj : cc test/earger_curry_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/effect.cmi test/effect.cmj : cc test/effect.res | $bsc $stdlib runtime
-o test/epsilon_test.cmi test/epsilon_test.cmj : cc test/epsilon_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/equal_box_test.cmi test/equal_box_test.cmj : cc test/equal_box_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/equal_exception_test.cmi test/equal_exception_test.cmj : cc test/equal_exception_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/equal_test.cmi test/equal_test.cmj : cc test/equal_test.res | $bsc $stdlib runtime
-o test/es6_export.cmi test/es6_export.cmj : cc test/es6_export.res | $bsc $stdlib runtime
-o test/es6_import.cmi test/es6_import.cmj : cc test/es6_import.res | test/es6_export.cmj $bsc $stdlib runtime
-o test/es6_module_test.cmi test/es6_module_test.cmj : cc test/es6_module_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/escape_esmodule.cmi test/escape_esmodule.cmj : cc test/escape_esmodule.res | $bsc $stdlib runtime
-o test/esmodule_ref.cmi test/esmodule_ref.cmj : cc test/esmodule_ref.res | test/escape_esmodule.cmj $bsc $stdlib runtime
-o test/event_ffi.cmi test/event_ffi.cmj : cc test/event_ffi.res | $bsc $stdlib runtime
-o test/exception_alias.cmi test/exception_alias.cmj : cc test/exception_alias.res | $bsc $stdlib runtime
-o test/exception_raise_test.cmi test/exception_raise_test.cmj : cc test/exception_raise_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/exception_rebound_err_test.cmi test/exception_rebound_err_test.cmj : cc test/exception_rebound_err_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/exception_value_test.cmi test/exception_value_test.cmj : cc test/exception_value_test.res | $bsc $stdlib runtime
-o test/exponentiation_precedence_test.cmi test/exponentiation_precedence_test.cmj : cc test/exponentiation_precedence_test.res | $bsc $stdlib runtime
-o test/export_keyword.cmi test/export_keyword.cmj : cc test/export_keyword.res | $bsc $stdlib runtime
-o test/ext_array_test.cmi test/ext_array_test.cmj : cc test/ext_array_test.res | $bsc $stdlib runtime
-o test/ext_bytes_test.cmi test/ext_bytes_test.cmj : cc test/ext_bytes_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/ext_filename_test.cmi test/ext_filename_test.cmj : cc test/ext_filename_test.res | test/ext_string_test.cmj test/test_literals.cmj $bsc $stdlib runtime
-o test/ext_list_test.cmi test/ext_list_test.cmj : cc test/ext_list_test.res | test/ext_string_test.cmj $bsc $stdlib runtime
-o test/ext_pervasives_test.cmj : cc_cmi test/ext_pervasives_test.res | test/ext_pervasives_test.cmi $bsc $stdlib runtime
-o test/ext_pervasives_test.cmi : cc test/ext_pervasives_test.resi | $bsc $stdlib runtime
-o test/ext_string_test.cmi test/ext_string_test.cmj : cc test/ext_string_test.res | test/ext_bytes_test.cmj $bsc $stdlib runtime
-o test/ext_sys_test.cmj : cc_cmi test/ext_sys_test.res | test/ext_sys_test.cmi $bsc $stdlib runtime
-o test/ext_sys_test.cmi : cc test/ext_sys_test.resi | $bsc $stdlib runtime
-o test/extensible_variant_test.cmi test/extensible_variant_test.cmj : cc test/extensible_variant_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/external_polyfill_test.cmi test/external_polyfill_test.cmj : cc test/external_polyfill_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/external_ppx.cmi test/external_ppx.cmj : cc test/external_ppx.res | $bsc $stdlib runtime
-o test/external_ppx2.cmi test/external_ppx2.cmj : cc test/external_ppx2.res | $bsc $stdlib runtime
-o test/fail_comp.cmi test/fail_comp.cmj : cc test/fail_comp.res | $bsc $stdlib runtime
-o test/ffi_arity_test.cmi test/ffi_arity_test.cmj : cc test/ffi_arity_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/ffi_array_test.cmi test/ffi_array_test.cmj : cc test/ffi_array_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/ffi_js_test.cmi test/ffi_js_test.cmj : cc test/ffi_js_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/ffi_splice_test.cmi test/ffi_splice_test.cmj : cc test/ffi_splice_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/ffi_test.cmi test/ffi_test.cmj : cc test/ffi_test.res | $bsc $stdlib runtime
-o test/fib.cmi test/fib.cmj : cc test/fib.res | $bsc $stdlib runtime
-o test/flattern_order_test.cmi test/flattern_order_test.cmj : cc test/flattern_order_test.res | $bsc $stdlib runtime
-o test/flexible_array_test.cmi test/flexible_array_test.cmj : cc test/flexible_array_test.res | $bsc $stdlib runtime
-o test/float_array.cmi test/float_array.cmj : cc test/float_array.res | $bsc $stdlib runtime
-o test/float_of_bits_test.cmi test/float_of_bits_test.cmj : cc test/float_of_bits_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/float_record.cmj : cc_cmi test/float_record.res | test/float_record.cmi $bsc $stdlib runtime
-o test/float_record.cmi : cc test/float_record.resi | $bsc $stdlib runtime
-o test/float_test.cmi test/float_test.cmj : cc test/float_test.res | test/mt.cmj test/mt_global.cmj $bsc $stdlib runtime
-o test/floatarray_test.cmi test/floatarray_test.cmj : cc test/floatarray_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/for_loop_test.cmi test/for_loop_test.cmj : cc test/for_loop_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/for_side_effect_test.cmi test/for_side_effect_test.cmj : cc test/for_side_effect_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/format_regression.cmi test/format_regression.cmj : cc test/format_regression.res | $bsc $stdlib runtime
-o test/format_test.cmi test/format_test.cmj : cc test/format_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/fun_pattern_match.cmi test/fun_pattern_match.cmj : cc test/fun_pattern_match.res | $bsc $stdlib runtime
-o test/functor_app_test.cmi test/functor_app_test.cmj : cc test/functor_app_test.res | test/functor_def.cmj test/functor_inst.cmj test/mt.cmj $bsc $stdlib runtime
-o test/functor_def.cmi test/functor_def.cmj : cc test/functor_def.res | $bsc $stdlib runtime
-o test/functor_ffi.cmi test/functor_ffi.cmj : cc test/functor_ffi.res | $bsc $stdlib runtime
-o test/functor_inst.cmi test/functor_inst.cmj : cc test/functor_inst.res | $bsc $stdlib runtime
-o test/functors.cmi test/functors.cmj : cc test/functors.res | $bsc $stdlib runtime
-o test/gbk.cmi test/gbk.cmj : cc test/gbk.res | $bsc $stdlib runtime
-o test/genlex_test.cmi test/genlex_test.cmj : cc test/genlex_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gentTypeReTest.cmi test/gentTypeReTest.cmj : cc test/gentTypeReTest.res | $bsc $stdlib runtime
-o test/global_exception_regression_test.cmi test/global_exception_regression_test.cmj : cc test/global_exception_regression_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/global_mangles.cmi test/global_mangles.cmj : cc test/global_mangles.res | $bsc $stdlib runtime
-o test/global_module_alias_test.cmi test/global_module_alias_test.cmj : cc test/global_module_alias_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/google_closure_test.cmi test/google_closure_test.cmj : cc test/google_closure_test.res | test/mt.cmj test/test_google_closure.cmj $bsc $stdlib runtime
-o test/gpr496_test.cmi test/gpr496_test.cmj : cc test/gpr496_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1072.cmi test/gpr_1072.cmj : cc test/gpr_1072.res | $bsc $stdlib runtime
-o test/gpr_1072_reg.cmi test/gpr_1072_reg.cmj : cc test/gpr_1072_reg.res | $bsc $stdlib runtime
-o test/gpr_1150.cmi test/gpr_1150.cmj : cc test/gpr_1150.res | $bsc $stdlib runtime
-o test/gpr_1154_test.cmi test/gpr_1154_test.cmj : cc test/gpr_1154_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1170.cmi test/gpr_1170.cmj : cc test/gpr_1170.res | $bsc $stdlib runtime
-o test/gpr_1240_missing_unbox.cmi test/gpr_1240_missing_unbox.cmj : cc test/gpr_1240_missing_unbox.res | $bsc $stdlib runtime
-o test/gpr_1245_test.cmi test/gpr_1245_test.cmj : cc test/gpr_1245_test.res | $bsc $stdlib runtime
-o test/gpr_1268.cmi test/gpr_1268.cmj : cc test/gpr_1268.res | $bsc $stdlib runtime
-o test/gpr_1409_test.cmi test/gpr_1409_test.cmj : cc test/gpr_1409_test.res | test/mt.cmj test/string_set.cmj $bsc $stdlib runtime
-o test/gpr_1423_app_test.cmi test/gpr_1423_app_test.cmj : cc test/gpr_1423_app_test.res | test/gpr_1423_nav.cmj test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1423_nav.cmi test/gpr_1423_nav.cmj : cc test/gpr_1423_nav.res | $bsc $stdlib runtime
-o test/gpr_1438.cmi test/gpr_1438.cmj : cc test/gpr_1438.res | $bsc $stdlib runtime
-o test/gpr_1481.cmi test/gpr_1481.cmj : cc test/gpr_1481.res | $bsc $stdlib runtime
-o test/gpr_1484.cmi test/gpr_1484.cmj : cc test/gpr_1484.res | $bsc $stdlib runtime
-o test/gpr_1503_test.cmi test/gpr_1503_test.cmj : cc test/gpr_1503_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1539_test.cmi test/gpr_1539_test.cmj : cc test/gpr_1539_test.res | $bsc $stdlib runtime
-o test/gpr_1658_test.cmi test/gpr_1658_test.cmj : cc test/gpr_1658_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1667_test.cmi test/gpr_1667_test.cmj : cc test/gpr_1667_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1692_test.cmi test/gpr_1692_test.cmj : cc test/gpr_1692_test.res | $bsc $stdlib runtime
-o test/gpr_1698_test.cmi test/gpr_1698_test.cmj : cc test/gpr_1698_test.res | $bsc $stdlib runtime
-o test/gpr_1701_test.cmi test/gpr_1701_test.cmj : cc test/gpr_1701_test.res | $bsc $stdlib runtime
-o test/gpr_1716_test.cmi test/gpr_1716_test.cmj : cc test/gpr_1716_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1717_test.cmi test/gpr_1717_test.cmj : cc test/gpr_1717_test.res | $bsc $stdlib runtime
-o test/gpr_1728_test.cmi test/gpr_1728_test.cmj : cc test/gpr_1728_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1749_test.cmi test/gpr_1749_test.cmj : cc test/gpr_1749_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1759_test.cmi test/gpr_1759_test.cmj : cc test/gpr_1759_test.res | $bsc $stdlib runtime
-o test/gpr_1760_test.cmi test/gpr_1760_test.cmj : cc test/gpr_1760_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1762_test.cmi test/gpr_1762_test.cmj : cc test/gpr_1762_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1817_test.cmi test/gpr_1817_test.cmj : cc test/gpr_1817_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1822_test.cmi test/gpr_1822_test.cmj : cc test/gpr_1822_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1891_test.cmi test/gpr_1891_test.cmj : cc test/gpr_1891_test.res | $bsc $stdlib runtime
-o test/gpr_1943_test.cmi test/gpr_1943_test.cmj : cc test/gpr_1943_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_1946_test.cmi test/gpr_1946_test.cmj : cc test/gpr_1946_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_2316_test.cmi test/gpr_2316_test.cmj : cc test/gpr_2316_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_2352_test.cmi test/gpr_2352_test.cmj : cc test/gpr_2352_test.res | $bsc $stdlib runtime
-o test/gpr_2413_test.cmi test/gpr_2413_test.cmj : cc test/gpr_2413_test.res | $bsc $stdlib runtime
-o test/gpr_2474.cmi test/gpr_2474.cmj : cc test/gpr_2474.res | $bsc $stdlib runtime
-o test/gpr_2487.cmi test/gpr_2487.cmj : cc test/gpr_2487.res | $bsc $stdlib runtime
-o test/gpr_2503_test.cmi test/gpr_2503_test.cmj : cc test/gpr_2503_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_2608_test.cmi test/gpr_2608_test.cmj : cc test/gpr_2608_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_2614_test.cmi test/gpr_2614_test.cmj : cc test/gpr_2614_test.res | $bsc $stdlib runtime
-o test/gpr_2633_test.cmi test/gpr_2633_test.cmj : cc test/gpr_2633_test.res | $bsc $stdlib runtime
-o test/gpr_2642_test.cmi test/gpr_2642_test.cmj : cc test/gpr_2642_test.res | $bsc $stdlib runtime
-o test/gpr_2682_test.cmi test/gpr_2682_test.cmj : cc test/gpr_2682_test.res | $bsc $stdlib runtime
-o test/gpr_2700_test.cmi test/gpr_2700_test.cmj : cc test/gpr_2700_test.res | $bsc $stdlib runtime
-o test/gpr_2731_test.cmi test/gpr_2731_test.cmj : cc test/gpr_2731_test.res | $bsc $stdlib runtime
-o test/gpr_2789_test.cmi test/gpr_2789_test.cmj : cc test/gpr_2789_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_2931_test.cmi test/gpr_2931_test.cmj : cc test/gpr_2931_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_3142_test.cmi test/gpr_3142_test.cmj : cc test/gpr_3142_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_3154_test.cmi test/gpr_3154_test.cmj : cc test/gpr_3154_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_3209_test.cmi test/gpr_3209_test.cmj : cc test/gpr_3209_test.res | $bsc $stdlib runtime
-o test/gpr_3492_test.cmi test/gpr_3492_test.cmj : cc test/gpr_3492_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_3519_jsx_test.cmi test/gpr_3519_jsx_test.cmj : cc test/gpr_3519_jsx_test.res | $bsc $stdlib runtime
-o test/gpr_3519_test.cmi test/gpr_3519_test.cmj : cc test/gpr_3519_test.res | $bsc $stdlib runtime
-o test/gpr_3536_test.cmi test/gpr_3536_test.cmj : cc test/gpr_3536_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_3546_test.cmi test/gpr_3546_test.cmj : cc test/gpr_3546_test.res | $bsc $stdlib runtime
-o test/gpr_3548_test.cmi test/gpr_3548_test.cmj : cc test/gpr_3548_test.res | $bsc $stdlib runtime
-o test/gpr_3549_test.cmi test/gpr_3549_test.cmj : cc test/gpr_3549_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_3566_drive_test.cmi test/gpr_3566_drive_test.cmj : cc test/gpr_3566_drive_test.res | test/gpr_3566_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/gpr_3566_test.cmi test/gpr_3566_test.cmj : cc test/gpr_3566_test.res | $bsc $stdlib runtime
-o test/gpr_3595_test.cmi test/gpr_3595_test.cmj : cc test/gpr_3595_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_3609_test.cmi test/gpr_3609_test.cmj : cc test/gpr_3609_test.res | $bsc $stdlib runtime
-o test/gpr_3697_test.cmi test/gpr_3697_test.cmj : cc test/gpr_3697_test.res | $bsc $stdlib runtime
-o test/gpr_373_test.cmi test/gpr_373_test.cmj : cc test/gpr_373_test.res | $bsc $stdlib runtime
-o test/gpr_3770_test.cmi test/gpr_3770_test.cmj : cc test/gpr_3770_test.res | $bsc $stdlib runtime
-o test/gpr_3852_alias.cmi test/gpr_3852_alias.cmj : cc test/gpr_3852_alias.res | test/gpr_3852_effect.cmj $bsc $stdlib runtime
-o test/gpr_3852_alias_reify.cmj : cc_cmi test/gpr_3852_alias_reify.res | test/gpr_3852_alias_reify.cmi test/gpr_3852_effect.cmj $bsc $stdlib runtime
-o test/gpr_3852_alias_reify.cmi : cc test/gpr_3852_alias_reify.resi | $bsc $stdlib runtime
-o test/gpr_3852_effect.cmi test/gpr_3852_effect.cmj : cc test/gpr_3852_effect.res | $bsc $stdlib runtime
-o test/gpr_3865.cmi test/gpr_3865.cmj : cc test/gpr_3865.res | test/gpr_3865_bar.cmj test/gpr_3865_foo.cmj $bsc $stdlib runtime
-o test/gpr_3865_bar.cmi test/gpr_3865_bar.cmj : cc test/gpr_3865_bar.res | $bsc $stdlib runtime
-o test/gpr_3865_foo.cmi test/gpr_3865_foo.cmj : cc test/gpr_3865_foo.res | $bsc $stdlib runtime
-o test/gpr_3875_test.cmi test/gpr_3875_test.cmj : cc test/gpr_3875_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_3877_test.cmi test/gpr_3877_test.cmj : cc test/gpr_3877_test.res | $bsc $stdlib runtime
-o test/gpr_3895_test.cmi test/gpr_3895_test.cmj : cc test/gpr_3895_test.res | $bsc $stdlib runtime
-o test/gpr_3897_test.cmi test/gpr_3897_test.cmj : cc test/gpr_3897_test.res | $bsc $stdlib runtime
-o test/gpr_3931_test.cmi test/gpr_3931_test.cmj : cc test/gpr_3931_test.res | $bsc $stdlib runtime
-o test/gpr_3980_test.cmi test/gpr_3980_test.cmj : cc test/gpr_3980_test.res | $bsc $stdlib runtime
-o test/gpr_4025_test.cmi test/gpr_4025_test.cmj : cc test/gpr_4025_test.res | $bsc $stdlib runtime
-o test/gpr_405_test.cmj : cc_cmi test/gpr_405_test.res | test/gpr_405_test.cmi $bsc $stdlib runtime
-o test/gpr_405_test.cmi : cc test/gpr_405_test.resi | $bsc $stdlib runtime
-o test/gpr_4069_test.cmi test/gpr_4069_test.cmj : cc test/gpr_4069_test.res | $bsc $stdlib runtime
-o test/gpr_4265_test.cmi test/gpr_4265_test.cmj : cc test/gpr_4265_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_4274_test.cmi test/gpr_4274_test.cmj : cc test/gpr_4274_test.res | $bsc $stdlib runtime
-o test/gpr_4280_test.cmi test/gpr_4280_test.cmj : cc test/gpr_4280_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_4407_test.cmi test/gpr_4407_test.cmj : cc test/gpr_4407_test.res | test/debug_mode_value.cmj test/mt.cmj $bsc $stdlib runtime
-o test/gpr_441.cmi test/gpr_441.cmj : cc test/gpr_441.res | $bsc $stdlib runtime
-o test/gpr_4442_test.cmi test/gpr_4442_test.cmj : cc test/gpr_4442_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_4491_test.cmi test/gpr_4491_test.cmj : cc test/gpr_4491_test.res | $bsc $stdlib runtime
-o test/gpr_4494_test.cmi test/gpr_4494_test.cmj : cc test/gpr_4494_test.res | $bsc $stdlib runtime
-o test/gpr_4519_test.cmi test/gpr_4519_test.cmj : cc test/gpr_4519_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_459_test.cmi test/gpr_459_test.cmj : cc test/gpr_459_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_4632.cmi test/gpr_4632.cmj : cc test/gpr_4632.res | $bsc $stdlib runtime
-o test/gpr_4639_test.cmi test/gpr_4639_test.cmj : cc test/gpr_4639_test.res | $bsc $stdlib runtime
-o test/gpr_4900_test.cmi test/gpr_4900_test.cmj : cc test/gpr_4900_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_4924_test.cmi test/gpr_4924_test.cmj : cc test/gpr_4924_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_4931.cmi test/gpr_4931.cmj : cc test/gpr_4931.res | $bsc $stdlib runtime
-o test/gpr_4931_allow.cmi test/gpr_4931_allow.cmj : cc test/gpr_4931_allow.res | $bsc $stdlib runtime
-o test/gpr_5071_test.cmi test/gpr_5071_test.cmj : cc test/gpr_5071_test.res | test/react.cmj $bsc $stdlib runtime
-o test/gpr_5169_test.cmi test/gpr_5169_test.cmj : cc test/gpr_5169_test.res | $bsc $stdlib runtime
-o test/gpr_5218_test.cmi test/gpr_5218_test.cmj : cc test/gpr_5218_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_5280_optimize_test.cmi test/gpr_5280_optimize_test.cmj : cc test/gpr_5280_optimize_test.res | $bsc $stdlib runtime
-o test/gpr_5312.cmi test/gpr_5312.cmj : cc test/gpr_5312.res | $bsc $stdlib runtime
-o test/gpr_5557.cmi test/gpr_5557.cmj : cc test/gpr_5557.res | $bsc $stdlib runtime
-o test/gpr_5753.cmi test/gpr_5753.cmj : cc test/gpr_5753.res | $bsc $stdlib runtime
-o test/gpr_658.cmi test/gpr_658.cmj : cc test/gpr_658.res | $bsc $stdlib runtime
-o test/gpr_858_test.cmi test/gpr_858_test.cmj : cc test/gpr_858_test.res | $bsc $stdlib runtime
-o test/gpr_858_unit2_test.cmi test/gpr_858_unit2_test.cmj : cc test/gpr_858_unit2_test.res | $bsc $stdlib runtime
-o test/gpr_904_test.cmi test/gpr_904_test.cmj : cc test/gpr_904_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_974_test.cmi test/gpr_974_test.cmj : cc test/gpr_974_test.res | $bsc $stdlib runtime
-o test/gpr_977_test.cmi test/gpr_977_test.cmj : cc test/gpr_977_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/gpr_return_type_unused_attribute.cmi test/gpr_return_type_unused_attribute.cmj : cc test/gpr_return_type_unused_attribute.res | $bsc $stdlib runtime
-o test/gray_code_test.cmi test/gray_code_test.cmj : cc test/gray_code_test.res | $bsc $stdlib runtime
-o test/guide_for_ext.cmi test/guide_for_ext.cmj : cc test/guide_for_ext.res | $bsc $stdlib runtime
-o test/hamming_test.cmi test/hamming_test.cmj : cc test/hamming_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/hash_collision_test.cmi test/hash_collision_test.cmj : cc test/hash_collision_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/hash_sugar_desugar.cmj : cc_cmi test/hash_sugar_desugar.res | test/hash_sugar_desugar.cmi $bsc $stdlib runtime
-o test/hash_sugar_desugar.cmi : cc test/hash_sugar_desugar.resi | $bsc $stdlib runtime
-o test/hash_test.cmi test/hash_test.cmj : cc test/hash_test.res | test/mt.cmj test/mt_global.cmj $bsc $stdlib runtime
-o test/hashtbl_test.cmi test/hashtbl_test.cmj : cc test/hashtbl_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/hello.foo.cmi test/hello.foo.cmj : cc test/hello.foo.res | $bsc $stdlib runtime
-o test/hello_res.cmj : cc_cmi test/hello_res.res | test/hello_res.cmi $bsc $stdlib runtime
-o test/hello_res.cmi : cc test/hello_res.resi | $bsc $stdlib runtime
-o test/ignore_test.cmi test/ignore_test.cmj : cc test/ignore_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/ignore_uncurry_attribute.cmi test/ignore_uncurry_attribute.cmj : cc test/ignore_uncurry_attribute.res | $bsc $stdlib runtime
-o test/imm_map_bench.cmi test/imm_map_bench.cmj : cc test/imm_map_bench.res | $bsc $stdlib runtime
-o test/import2.cmi test/import2.cmj : cc test/import2.res | test/import_external.cmj $bsc $stdlib runtime
-o test/import_external.cmi test/import_external.cmj : cc test/import_external.res | $bsc $stdlib runtime
-o test/import_side_effect.cmi test/import_side_effect.cmj : cc test/import_side_effect.res | test/side_effect.cmj test/side_effect2.cmj $bsc $stdlib runtime
-o test/import_side_effect_free.cmi test/import_side_effect_free.cmj : cc test/import_side_effect_free.res | test/side_effect_free.cmj $bsc $stdlib runtime
-o test/include_side_effect.cmi test/include_side_effect.cmj : cc test/include_side_effect.res | test/side_effect.cmj $bsc $stdlib runtime
-o test/include_side_effect_free.cmi test/include_side_effect_free.cmj : cc test/include_side_effect_free.res | test/side_effect_free.cmj $bsc $stdlib runtime
-o test/incomplete_toplevel_test.cmi test/incomplete_toplevel_test.cmj : cc test/incomplete_toplevel_test.res | $bsc $stdlib runtime
-o test/infer_type_test.cmj : cc_cmi test/infer_type_test.res | test/infer_type_test.cmi $bsc $stdlib runtime
-o test/infer_type_test.cmi : cc test/infer_type_test.resi | $bsc $stdlib runtime
-o test/inline_condition_with_pattern_matching.cmi test/inline_condition_with_pattern_matching.cmj : cc test/inline_condition_with_pattern_matching.res | $bsc $stdlib runtime
-o test/inline_const.cmj : cc_cmi test/inline_const.res | test/inline_const.cmi $bsc $stdlib runtime
-o test/inline_const.cmi : cc test/inline_const.resi | $bsc $stdlib runtime
-o test/inline_const_test.cmi test/inline_const_test.cmj : cc test/inline_const_test.res | test/inline_const.cmj test/mt.cmj $bsc $stdlib runtime
-o test/inline_edge_cases.cmj : cc_cmi test/inline_edge_cases.res | test/inline_edge_cases.cmi $bsc $stdlib runtime
-o test/inline_edge_cases.cmi : cc test/inline_edge_cases.resi | $bsc $stdlib runtime
-o test/inline_map2_test.cmi test/inline_map2_test.cmj : cc test/inline_map2_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/inline_map_demo.cmi test/inline_map_demo.cmj : cc test/inline_map_demo.res | test/mt.cmj $bsc $stdlib runtime
-o test/inline_map_test.cmj : cc_cmi test/inline_map_test.res | test/inline_map_test.cmi test/mt.cmj $bsc $stdlib runtime
-o test/inline_map_test.cmi : cc test/inline_map_test.resi | $bsc $stdlib runtime
-o test/inline_record_test.cmi test/inline_record_test.cmj : cc test/inline_record_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/inline_regression_test.cmi test/inline_regression_test.cmj : cc test/inline_regression_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/inline_string_test.cmi test/inline_string_test.cmj : cc test/inline_string_test.res | $bsc $stdlib runtime
-o test/inner_call.cmi test/inner_call.cmj : cc test/inner_call.res | test/inner_define.cmj $bsc $stdlib runtime
-o test/inner_define.cmj : cc_cmi test/inner_define.res | test/inner_define.cmi $bsc $stdlib runtime
-o test/inner_define.cmi : cc test/inner_define.resi | $bsc $stdlib runtime
-o test/inner_unused.cmi test/inner_unused.cmj : cc test/inner_unused.res | $bsc $stdlib runtime
-o test/installation_test.cmi test/installation_test.cmj : cc test/installation_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/int32_test.cmi test/int32_test.cmj : cc test/int32_test.res | test/ext_array_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/int64_mul_div_test.cmi test/int64_mul_div_test.cmj : cc test/int64_mul_div_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/int64_string_bench.cmi test/int64_string_bench.cmj : cc test/int64_string_bench.res | $bsc $stdlib runtime
-o test/int64_string_test.cmi test/int64_string_test.cmj : cc test/int64_string_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/int64_test.cmi test/int64_test.cmj : cc test/int64_test.res | test/ext_array_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/int_hashtbl_test.cmi test/int_hashtbl_test.cmj : cc test/int_hashtbl_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/int_map.cmi test/int_map.cmj : cc test/int_map.res | $bsc $stdlib runtime
-o test/int_overflow_test.cmi test/int_overflow_test.cmj : cc test/int_overflow_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/int_poly_var.cmi test/int_poly_var.cmj : cc test/int_poly_var.res | test/mt.cmj test/test2.cmj $bsc $stdlib runtime
-o test/int_switch_test.cmi test/int_switch_test.cmj : cc test/int_switch_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/internal_unused_test.cmi test/internal_unused_test.cmj : cc test/internal_unused_test.res | $bsc $stdlib runtime
-o test/io_test.cmi test/io_test.cmj : cc test/io_test.res | $bsc $stdlib runtime
-o test/js_array_test.cmi test/js_array_test.cmj : cc test/js_array_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_bool_test.cmi test/js_bool_test.cmj : cc test/js_bool_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_cast_test.cmi test/js_cast_test.cmj : cc test/js_cast_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_date_test.cmi test/js_date_test.cmj : cc test/js_date_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_dict_test.cmi test/js_dict_test.cmj : cc test/js_dict_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_exception_catch_test.cmi test/js_exception_catch_test.cmj : cc test/js_exception_catch_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_float_test.cmi test/js_float_test.cmj : cc test/js_float_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_global_test.cmi test/js_global_test.cmj : cc test/js_global_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_int_test.cmi test/js_int_test.cmj : cc test/js_int_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_json_test.cmi test/js_json_test.cmj : cc test/js_json_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_list_test.cmi test/js_list_test.cmj : cc test/js_list_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_math_test.cmi test/js_math_test.cmj : cc test/js_math_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_null_test.cmi test/js_null_test.cmj : cc test/js_null_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_null_undefined_test.cmi test/js_null_undefined_test.cmj : cc test/js_null_undefined_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_nullable_test.cmi test/js_nullable_test.cmj : cc test/js_nullable_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_obj_test.cmi test/js_obj_test.cmj : cc test/js_obj_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_option_test.cmi test/js_option_test.cmj : cc test/js_option_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_re_test.cmi test/js_re_test.cmj : cc test/js_re_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_string_test.cmi test/js_string_test.cmj : cc test/js_string_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_typed_array_test.cmi test/js_typed_array_test.cmj : cc test/js_typed_array_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_undefined_test.cmi test/js_undefined_test.cmj : cc test/js_undefined_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/js_val.cmi test/js_val.cmj : cc test/js_val.res | $bsc $stdlib runtime
-o test/jsoo_400_test.cmi test/jsoo_400_test.cmj : cc test/jsoo_400_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/jsoo_485_test.cmi test/jsoo_485_test.cmj : cc test/jsoo_485_test.res | $bsc $stdlib runtime
-o test/jsxv4_newtype.cmi test/jsxv4_newtype.cmj : cc test/jsxv4_newtype.res | test/react.cmj $bsc $stdlib runtime
-o test/keep_uncurry_attribute.cmi test/keep_uncurry_attribute.cmj : cc test/keep_uncurry_attribute.res | $bsc $stdlib runtime
-o test/key_word_property.cmi test/key_word_property.cmj : cc test/key_word_property.res | $bsc $stdlib runtime
-o test/key_word_property2.cmi test/key_word_property2.cmj : cc test/key_word_property2.res | test/export_keyword.cmj $bsc $stdlib runtime
-o test/key_word_property_plus_test.cmi test/key_word_property_plus_test.cmj : cc test/key_word_property_plus_test.res | test/global_mangles.cmj test/mt.cmj $bsc $stdlib runtime
-o test/label_uncurry.cmi test/label_uncurry.cmj : cc test/label_uncurry.res | $bsc $stdlib runtime
-o test/large_integer_pat.cmi test/large_integer_pat.cmj : cc test/large_integer_pat.res | $bsc $stdlib runtime
-o test/large_record_duplication_test.cmi test/large_record_duplication_test.cmj : cc test/large_record_duplication_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/largest_int_flow.cmi test/largest_int_flow.cmj : cc test/largest_int_flow.res | $bsc $stdlib runtime
-o test/lazy_demo.cmi test/lazy_demo.cmj : cc test/lazy_demo.res | $bsc $stdlib runtime
-o test/lazy_test.cmi test/lazy_test.cmj : cc test/lazy_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/lib_js_test.cmi test/lib_js_test.cmj : cc test/lib_js_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/libarg_test.cmi test/libarg_test.cmj : cc test/libarg_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/libqueue_test.cmi test/libqueue_test.cmj : cc test/libqueue_test.res | $bsc $stdlib runtime
-o test/limits_test.cmi test/limits_test.cmj : cc test/limits_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/list_stack.cmi test/list_stack.cmj : cc test/list_stack.res | $bsc $stdlib runtime
-o test/list_test.cmi test/list_test.cmj : cc test/list_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/local_exception_test.cmi test/local_exception_test.cmj : cc test/local_exception_test.res | $bsc $stdlib runtime
-o test/loop_regression_test.cmi test/loop_regression_test.cmj : cc test/loop_regression_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/loop_suites_test.cmi test/loop_suites_test.cmj : cc test/loop_suites_test.res | test/for_loop_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/map_find_test.cmi test/map_find_test.cmj : cc test/map_find_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/map_test.cmj : cc_cmi test/map_test.res | test/map_test.cmi test/mt.cmj $bsc $stdlib runtime
-o test/map_test.cmi : cc test/map_test.resi | $bsc $stdlib runtime
-o test/mario_game.cmi test/mario_game.cmj : cc test/mario_game.res | $bsc $stdlib runtime
-o test/marshal.cmi test/marshal.cmj : cc test/marshal.res | $bsc $stdlib runtime
-o test/meth_annotation.cmi test/meth_annotation.cmj : cc test/meth_annotation.res | $bsc $stdlib runtime
-o test/method_name_test.cmi test/method_name_test.cmj : cc test/method_name_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/method_string_name.cmi test/method_string_name.cmj : cc test/method_string_name.res | $bsc $stdlib runtime
-o test/minimal_test.cmi test/minimal_test.cmj : cc test/minimal_test.res | $bsc $stdlib runtime
-o test/miss_colon_test.cmi test/miss_colon_test.cmj : cc test/miss_colon_test.res | $bsc $stdlib runtime
-o test/mock_mt.cmi test/mock_mt.cmj : cc test/mock_mt.res | test/mt.cmj $bsc $stdlib runtime
-o test/module_alias_test.cmi test/module_alias_test.cmj : cc test/module_alias_test.res | test/ext_pervasives_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/module_as_class_ffi.cmi test/module_as_class_ffi.cmj : cc test/module_as_class_ffi.res | $bsc $stdlib runtime
-o test/module_as_function.cmi test/module_as_function.cmj : cc test/module_as_function.res | $bsc $stdlib runtime
-o test/module_missing_conversion.cmi test/module_missing_conversion.cmj : cc test/module_missing_conversion.res | $bsc $stdlib runtime
-o test/module_parameter_test.cmi test/module_parameter_test.cmj : cc test/module_parameter_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/module_splice_test.cmi test/module_splice_test.cmj : cc test/module_splice_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/more_poly_variant_test.cmi test/more_poly_variant_test.cmj : cc test/more_poly_variant_test.res | $bsc $stdlib runtime
-o test/more_uncurry.cmi test/more_uncurry.cmj : cc test/more_uncurry.res | $bsc $stdlib runtime
-o test/mpr_6033_test.cmi test/mpr_6033_test.cmj : cc test/mpr_6033_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/mt.cmj : cc_cmi test/mt.res | test/mt.cmi $bsc $stdlib runtime
-o test/mt.cmi : cc test/mt.resi | $bsc $stdlib runtime
-o test/mt_global.cmj : cc_cmi test/mt_global.res | test/mt.cmj test/mt_global.cmi $bsc $stdlib runtime
-o test/mt_global.cmi : cc test/mt_global.resi | test/mt.cmi $bsc $stdlib runtime
-o test/mutable_obj_test.cmi test/mutable_obj_test.cmj : cc test/mutable_obj_test.res | $bsc $stdlib runtime
-o test/mutable_uncurry_test.cmi test/mutable_uncurry_test.cmj : cc test/mutable_uncurry_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/mutual_non_recursive_type.cmi test/mutual_non_recursive_type.cmj : cc test/mutual_non_recursive_type.res | $bsc $stdlib runtime
-o test/name_mangle_test.cmi test/name_mangle_test.cmj : cc test/name_mangle_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/nested_include.cmi test/nested_include.cmj : cc test/nested_include.res | $bsc $stdlib runtime
-o test/nested_module_alias.cmi test/nested_module_alias.cmj : cc test/nested_module_alias.res | $bsc $stdlib runtime
-o test/nested_obj_literal.cmi test/nested_obj_literal.cmj : cc test/nested_obj_literal.res | $bsc $stdlib runtime
-o test/nested_obj_test.cmi test/nested_obj_test.cmj : cc test/nested_obj_test.res | $bsc $stdlib runtime
-o test/nested_pattern_match_test.cmi test/nested_pattern_match_test.cmj : cc test/nested_pattern_match_test.res | $bsc $stdlib runtime
-o test/noassert.cmi test/noassert.cmj : cc test/noassert.res | $bsc $stdlib runtime
-o test/node_path_test.cmi test/node_path_test.cmj : cc test/node_path_test.res | $bsc $stdlib runtime
-o test/null_list_test.cmi test/null_list_test.cmj : cc test/null_list_test.res | $bsc $stdlib runtime
-o test/number_lexer.cmi test/number_lexer.cmj : cc test/number_lexer.res | $bsc $stdlib runtime
-o test/obj_literal_ppx.cmi test/obj_literal_ppx.cmj : cc test/obj_literal_ppx.res | $bsc $stdlib runtime
-o test/obj_literal_ppx_test.cmi test/obj_literal_ppx_test.cmj : cc test/obj_literal_ppx_test.res | $bsc $stdlib runtime
-o test/obj_magic_test.cmi test/obj_magic_test.cmj : cc test/obj_magic_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/obj_type_test.cmi test/obj_type_test.cmj : cc test/obj_type_test.res | $bsc $stdlib runtime
-o test/ocaml_re_test.cmi test/ocaml_re_test.cmj : cc test/ocaml_re_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/of_string_test.cmi test/of_string_test.cmj : cc test/of_string_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/offset.cmi test/offset.cmj : cc test/offset.res | $bsc $stdlib runtime
-o test/omit_trailing_undefined_in_external_calls.cmi test/omit_trailing_undefined_in_external_calls.cmj : cc test/omit_trailing_undefined_in_external_calls.res | $bsc $stdlib runtime
-o test/option_encoding_test.cmi test/option_encoding_test.cmj : cc test/option_encoding_test.res | $bsc $stdlib runtime
-o test/option_record_none_test.cmi test/option_record_none_test.cmj : cc test/option_record_none_test.res | $bsc $stdlib runtime
-o test/option_repr_test.cmi test/option_repr_test.cmj : cc test/option_repr_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/optional_ffi_test.cmi test/optional_ffi_test.cmj : cc test/optional_ffi_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/optional_regression_test.cmi test/optional_regression_test.cmj : cc test/optional_regression_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/pipe_send_readline.cmi test/pipe_send_readline.cmj : cc test/pipe_send_readline.res | $bsc $stdlib runtime
-o test/pipe_syntax.cmi test/pipe_syntax.cmj : cc test/pipe_syntax.res | $bsc $stdlib runtime
-o test/poly_empty_array.cmi test/poly_empty_array.cmj : cc test/poly_empty_array.res | $bsc $stdlib runtime
-o test/poly_variant_test.cmj : cc_cmi test/poly_variant_test.res | test/mt.cmj test/poly_variant_test.cmi $bsc $stdlib runtime
-o test/poly_variant_test.cmi : cc test/poly_variant_test.resi | $bsc $stdlib runtime
-o test/polymorphic_raw_test.cmi test/polymorphic_raw_test.cmj : cc test/polymorphic_raw_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/polymorphism_test.cmj : cc_cmi test/polymorphism_test.res | test/polymorphism_test.cmi $bsc $stdlib runtime
-o test/polymorphism_test.cmi : cc test/polymorphism_test.resi | $bsc $stdlib runtime
-o test/polyvar_convert.cmi test/polyvar_convert.cmj : cc test/polyvar_convert.res | $bsc $stdlib runtime
-o test/polyvar_test.cmi test/polyvar_test.cmj : cc test/polyvar_test.res | $bsc $stdlib runtime
-o test/ppx_apply_test.cmi test/ppx_apply_test.cmj : cc test/ppx_apply_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/pq_test.cmi test/pq_test.cmj : cc test/pq_test.res | $bsc $stdlib runtime
-o test/pr6726.cmi test/pr6726.cmj : cc test/pr6726.res | $bsc $stdlib runtime
-o test/pr_regression_test.cmi test/pr_regression_test.cmj : cc test/pr_regression_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/prepend_data_ffi.cmi test/prepend_data_ffi.cmj : cc test/prepend_data_ffi.res | $bsc $stdlib runtime
-o test/primitive_reg_test.cmi test/primitive_reg_test.cmj : cc test/primitive_reg_test.res | $bsc $stdlib runtime
-o test/print_alpha_test.cmi test/print_alpha_test.cmj : cc test/print_alpha_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/queue_402.cmi test/queue_402.cmj : cc test/queue_402.res | $bsc $stdlib runtime
-o test/queue_test.cmi test/queue_test.cmj : cc test/queue_test.res | test/mt.cmj test/queue_402.cmj $bsc $stdlib runtime
-o test/random_test.cmi test/random_test.cmj : cc test/random_test.res | test/mt.cmj test/mt_global.cmj $bsc $stdlib runtime
-o test/raw_hash_tbl_bench.cmi test/raw_hash_tbl_bench.cmj : cc test/raw_hash_tbl_bench.res | $bsc $stdlib runtime
-o test/raw_output_test.cmi test/raw_output_test.cmj : cc test/raw_output_test.res | $bsc $stdlib runtime
-o test/raw_pure_test.cmi test/raw_pure_test.cmj : cc test/raw_pure_test.res | $bsc $stdlib runtime
-o test/rbset.cmi test/rbset.cmj : cc test/rbset.res | $bsc $stdlib runtime
-o test/react.cmi test/react.cmj : cc test/react.res | $bsc $stdlib runtime
-o test/reactDOMRe.cmi test/reactDOMRe.cmj : cc test/reactDOMRe.res | test/react.cmj test/reactEvent.cmj test/reasonReact.cmj $bsc $stdlib runtime
-o test/reactDOMServerRe.cmi test/reactDOMServerRe.cmj : cc test/reactDOMServerRe.res | test/react.cmj $bsc $stdlib runtime
-o test/reactEvent.cmj : cc_cmi test/reactEvent.res | test/reactEvent.cmi $bsc $stdlib runtime
-o test/reactEvent.cmi : cc test/reactEvent.resi | $bsc $stdlib runtime
-o test/reactTestUtils.cmj : cc_cmi test/reactTestUtils.res | test/react.cmj test/reactTestUtils.cmi $bsc $stdlib runtime
-o test/reactTestUtils.cmi : cc test/reactTestUtils.resi | test/react.cmi $bsc $stdlib runtime
-o test/reasonReact.cmj : cc_cmi test/reasonReact.res | test/react.cmj test/reasonReact.cmi test/reasonReactRouter.cmj $bsc $stdlib runtime
-o test/reasonReact.cmi : cc test/reasonReact.resi | test/react.cmi test/reasonReactRouter.cmi $bsc $stdlib runtime
-o test/reasonReactCompat.cmj : cc_cmi test/reasonReactCompat.res | test/react.cmj test/reasonReact.cmj test/reasonReactCompat.cmi $bsc $stdlib runtime
-o test/reasonReactCompat.cmi : cc test/reasonReactCompat.resi | test/react.cmi test/reasonReact.cmi $bsc $stdlib runtime
-o test/reasonReactOptimizedCreateClass.cmi test/reasonReactOptimizedCreateClass.cmj : cc test/reasonReactOptimizedCreateClass.res | $bsc $stdlib runtime
-o test/reasonReactRouter.cmj : cc_cmi test/reasonReactRouter.res | test/react.cmj test/reasonReactRouter.cmi $bsc $stdlib runtime
-o test/reasonReactRouter.cmi : cc test/reasonReactRouter.resi | $bsc $stdlib runtime
-o test/rebind_module.cmi test/rebind_module.cmj : cc test/rebind_module.res | $bsc $stdlib runtime
-o test/rebind_module_test.cmi test/rebind_module_test.cmj : cc test/rebind_module_test.res | test/rebind_module.cmj $bsc $stdlib runtime
-o test/rec_array_test.cmi test/rec_array_test.cmj : cc test/rec_array_test.res | $bsc $stdlib runtime
-o test/rec_fun_test.cmi test/rec_fun_test.cmj : cc test/rec_fun_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/rec_module_opt.cmi test/rec_module_opt.cmj : cc test/rec_module_opt.res | $bsc $stdlib runtime
-o test/rec_module_test.cmi test/rec_module_test.cmj : cc test/rec_module_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/recmodule.cmi test/recmodule.cmj : cc test/recmodule.res | $bsc $stdlib runtime
-o test/record_debug_test.cmi test/record_debug_test.cmj : cc test/record_debug_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/record_extension_test.cmi test/record_extension_test.cmj : cc test/record_extension_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/record_name_test.cmi test/record_name_test.cmj : cc test/record_name_test.res | $bsc $stdlib runtime
-o test/record_regression.cmi test/record_regression.cmj : cc test/record_regression.res | $bsc $stdlib runtime
-o test/record_type_spread.cmi test/record_type_spread.cmj : cc test/record_type_spread.res | $bsc $stdlib runtime
-o test/record_with_test.cmi test/record_with_test.cmj : cc test/record_with_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/recursive_module.cmi test/recursive_module.cmj : cc test/recursive_module.res | test/mt.cmj $bsc $stdlib runtime
-o test/recursive_module_test.cmi test/recursive_module_test.cmj : cc test/recursive_module_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/recursive_react_component.cmi test/recursive_react_component.cmj : cc test/recursive_react_component.res | test/react.cmj $bsc $stdlib runtime
-o test/recursive_records_test.cmi test/recursive_records_test.cmj : cc test/recursive_records_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/recursive_unbound_module_test.cmi test/recursive_unbound_module_test.cmj : cc test/recursive_unbound_module_test.res | $bsc $stdlib runtime
-o test/regression_print.cmi test/regression_print.cmj : cc test/regression_print.res | $bsc $stdlib runtime
-o test/relative_path.cmi test/relative_path.cmj : cc test/relative_path.res | $bsc $stdlib runtime
-o test/res_debug.cmi test/res_debug.cmj : cc test/res_debug.res | $bsc $stdlib runtime
-o test/return_check.cmi test/return_check.cmj : cc test/return_check.res | $bsc $stdlib runtime
-o test/runtime_encoding_test.cmi test/runtime_encoding_test.cmj : cc test/runtime_encoding_test.res | $bsc $stdlib runtime
-o test/set_annotation.cmi test/set_annotation.cmj : cc test/set_annotation.res | $bsc $stdlib runtime
-o test/set_gen.cmi test/set_gen.cmj : cc test/set_gen.res | $bsc $stdlib runtime
-o test/sexp.cmj : cc_cmi test/sexp.res | test/sexp.cmi $bsc $stdlib runtime
-o test/sexp.cmi : cc test/sexp.resi | $bsc $stdlib runtime
-o test/sexpm.cmj : cc_cmi test/sexpm.res | test/sexpm.cmi $bsc $stdlib runtime
-o test/sexpm.cmi : cc test/sexpm.resi | $bsc $stdlib runtime
-o test/sexpm_test.cmi test/sexpm_test.cmj : cc test/sexpm_test.res | test/mt.cmj test/sexpm.cmj $bsc $stdlib runtime
-o test/side_effect.cmi test/side_effect.cmj : cc test/side_effect.res | $bsc $stdlib runtime
-o test/side_effect2.cmi test/side_effect2.cmj : cc test/side_effect2.res | $bsc $stdlib runtime
-o test/side_effect_free.cmi test/side_effect_free.cmj : cc test/side_effect_free.res | $bsc $stdlib runtime
-o test/simple_derive_test.cmj : cc_cmi test/simple_derive_test.res | test/simple_derive_test.cmi $bsc $stdlib runtime
-o test/simple_derive_test.cmi : cc test/simple_derive_test.resi | $bsc $stdlib runtime
-o test/simple_derive_use.cmj : cc_cmi test/simple_derive_use.res | test/simple_derive_use.cmi $bsc $stdlib runtime
-o test/simple_derive_use.cmi : cc test/simple_derive_use.resi | $bsc $stdlib runtime
-o test/simplify_lambda_632o.cmi test/simplify_lambda_632o.cmj : cc test/simplify_lambda_632o.res | $bsc $stdlib runtime
-o test/single_module_alias.cmi test/single_module_alias.cmj : cc test/single_module_alias.res | $bsc $stdlib runtime
-o test/singular_unit_test.cmi test/singular_unit_test.cmj : cc test/singular_unit_test.res | $bsc $stdlib runtime
-o test/small_inline_test.cmi test/small_inline_test.cmj : cc test/small_inline_test.res | $bsc $stdlib runtime
-o test/splice_test.cmi test/splice_test.cmj : cc test/splice_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/stack_comp_test.cmi test/stack_comp_test.cmj : cc test/stack_comp_test.res | test/mt.cmj test/mt_global.cmj $bsc $stdlib runtime
-o test/stack_test.cmi test/stack_test.cmj : cc test/stack_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/stream_parser_test.cmi test/stream_parser_test.cmj : cc test/stream_parser_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/string_bound_get_test.cmi test/string_bound_get_test.cmj : cc test/string_bound_get_test.res | $bsc $stdlib runtime
-o test/string_constant_compare.cmi test/string_constant_compare.cmj : cc test/string_constant_compare.res | $bsc $stdlib runtime
-o test/string_get_set_test.cmi test/string_get_set_test.cmj : cc test/string_get_set_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/string_runtime_test.cmi test/string_runtime_test.cmj : cc test/string_runtime_test.res | test/mt.cmj test/test_char.cmj $bsc $stdlib runtime
-o test/string_set.cmi test/string_set.cmj : cc test/string_set.res | test/set_gen.cmj $bsc $stdlib runtime
-o test/string_set_test.cmi test/string_set_test.cmj : cc test/string_set_test.res | test/mt.cmj test/string_set.cmj $bsc $stdlib runtime
-o test/string_test.cmi test/string_test.cmj : cc test/string_test.res | test/ext_string_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/string_unicode_test.cmi test/string_unicode_test.cmj : cc test/string_unicode_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/stringmatch_test.cmi test/stringmatch_test.cmj : cc test/stringmatch_test.res | $bsc $stdlib runtime
-o test/submodule.cmi test/submodule.cmj : cc test/submodule.res | $bsc $stdlib runtime
-o test/submodule_call.cmi test/submodule_call.cmj : cc test/submodule_call.res | test/submodule.cmj $bsc $stdlib runtime
-o test/switch_case_test.cmi test/switch_case_test.cmj : cc test/switch_case_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/switch_string.cmi test/switch_string.cmj : cc test/switch_string.res | $bsc $stdlib runtime
-o test/tagged_template_test.cmi test/tagged_template_test.cmj : cc test/tagged_template_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/tailcall_inline_test.cmi test/tailcall_inline_test.cmj : cc test/tailcall_inline_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/template.cmi test/template.cmj : cc test/template.res | $bsc $stdlib runtime
-o test/test.cmi test/test.cmj : cc test/test.res | $bsc $stdlib runtime
-o test/test2.cmi test/test2.cmj : cc test/test2.res | $bsc $stdlib runtime
-o test/test_alias.cmi test/test_alias.cmj : cc test/test_alias.res | test/test_global_print.cmj $bsc $stdlib runtime
-o test/test_ari.cmi test/test_ari.cmj : cc test/test_ari.res | $bsc $stdlib runtime
-o test/test_array.cmi test/test_array.cmj : cc test/test_array.res | $bsc $stdlib runtime
-o test/test_array_append.cmi test/test_array_append.cmj : cc test/test_array_append.res | $bsc $stdlib runtime
-o test/test_array_primitive.cmi test/test_array_primitive.cmj : cc test/test_array_primitive.res | $bsc $stdlib runtime
-o test/test_bool_equal.cmi test/test_bool_equal.cmj : cc test/test_bool_equal.res | $bsc $stdlib runtime
-o test/test_bs_this.cmi test/test_bs_this.cmj : cc test/test_bs_this.res | $bsc $stdlib runtime
-o test/test_bug.cmi test/test_bug.cmj : cc test/test_bug.res | test/test_char.cmj $bsc $stdlib runtime
-o test/test_bytes.cmi test/test_bytes.cmj : cc test/test_bytes.res | $bsc $stdlib runtime
-o test/test_case_opt_collision.cmi test/test_case_opt_collision.cmj : cc test/test_case_opt_collision.res | test/mt.cmj $bsc $stdlib runtime
-o test/test_case_set.cmi test/test_case_set.cmj : cc test/test_case_set.res | $bsc $stdlib runtime
-o test/test_char.cmi test/test_char.cmj : cc test/test_char.res | $bsc $stdlib runtime
-o test/test_closure.cmi test/test_closure.cmj : cc test/test_closure.res | $bsc $stdlib runtime
-o test/test_common.cmi test/test_common.cmj : cc test/test_common.res | $bsc $stdlib runtime
-o test/test_const_elim.cmi test/test_const_elim.cmj : cc test/test_const_elim.res | $bsc $stdlib runtime
-o test/test_const_propogate.cmi test/test_const_propogate.cmj : cc test/test_const_propogate.res | $bsc $stdlib runtime
-o test/test_cpp.cmi test/test_cpp.cmj : cc test/test_cpp.res | $bsc $stdlib runtime
-o test/test_cps.cmi test/test_cps.cmj : cc test/test_cps.res | $bsc $stdlib runtime
-o test/test_demo.cmi test/test_demo.cmj : cc test/test_demo.res | $bsc $stdlib runtime
-o test/test_dup_param.cmi test/test_dup_param.cmj : cc test/test_dup_param.res | $bsc $stdlib runtime
-o test/test_eq.cmi test/test_eq.cmj : cc test/test_eq.res | $bsc $stdlib runtime
-o test/test_exception.cmi test/test_exception.cmj : cc test/test_exception.res | test/test_common.cmj $bsc $stdlib runtime
-o test/test_exception_escape.cmi test/test_exception_escape.cmj : cc test/test_exception_escape.res | $bsc $stdlib runtime
-o test/test_export2.cmi test/test_export2.cmj : cc test/test_export2.res | $bsc $stdlib runtime
-o test/test_external.cmi test/test_external.cmj : cc test/test_external.res | $bsc $stdlib runtime
-o test/test_external_unit.cmi test/test_external_unit.cmj : cc test/test_external_unit.res | $bsc $stdlib runtime
-o test/test_ffi.cmi test/test_ffi.cmj : cc test/test_ffi.res | $bsc $stdlib runtime
-o test/test_fib.cmi test/test_fib.cmj : cc test/test_fib.res | $bsc $stdlib runtime
-o test/test_filename.cmi test/test_filename.cmj : cc test/test_filename.res | $bsc $stdlib runtime
-o test/test_for_loop.cmi test/test_for_loop.cmj : cc test/test_for_loop.res | $bsc $stdlib runtime
-o test/test_for_map.cmi test/test_for_map.cmj : cc test/test_for_map.res | $bsc $stdlib runtime
-o test/test_for_map2.cmj : cc_cmi test/test_for_map2.res | test/int_map.cmj test/test_for_map2.cmi $bsc $stdlib runtime
-o test/test_for_map2.cmi : cc test/test_for_map2.resi | $bsc $stdlib runtime
-o test/test_format.cmi test/test_format.cmj : cc test/test_format.res | $bsc $stdlib runtime
-o test/test_formatter.cmi test/test_formatter.cmj : cc test/test_formatter.res | $bsc $stdlib runtime
-o test/test_functor_dead_code.cmi test/test_functor_dead_code.cmj : cc test/test_functor_dead_code.res | $bsc $stdlib runtime
-o test/test_generative_module.cmi test/test_generative_module.cmj : cc test/test_generative_module.res | $bsc $stdlib runtime
-o test/test_global_print.cmi test/test_global_print.cmj : cc test/test_global_print.res | $bsc $stdlib runtime
-o test/test_google_closure.cmi test/test_google_closure.cmj : cc test/test_google_closure.res | $bsc $stdlib runtime
-o test/test_include.cmi test/test_include.cmj : cc test/test_include.res | test/test_order.cmj $bsc $stdlib runtime
-o test/test_incomplete.cmi test/test_incomplete.cmj : cc test/test_incomplete.res | $bsc $stdlib runtime
-o test/test_incr_ref.cmi test/test_incr_ref.cmj : cc test/test_incr_ref.res | $bsc $stdlib runtime
-o test/test_int_map_find.cmi test/test_int_map_find.cmj : cc test/test_int_map_find.res | $bsc $stdlib runtime
-o test/test_internalOO.cmi test/test_internalOO.cmj : cc test/test_internalOO.res | $bsc $stdlib runtime
-o test/test_is_js.cmj : cc_cmi test/test_is_js.res | test/mt.cmj test/test_is_js.cmi $bsc $stdlib runtime
-o test/test_is_js.cmi : cc test/test_is_js.resi | $bsc $stdlib runtime
-o test/test_js_ffi.cmi test/test_js_ffi.cmj : cc test/test_js_ffi.res | $bsc $stdlib runtime
-o test/test_let.cmi test/test_let.cmj : cc test/test_let.res | $bsc $stdlib runtime
-o test/test_list.cmi test/test_list.cmj : cc test/test_list.res | $bsc $stdlib runtime
-o test/test_literal.cmi test/test_literal.cmj : cc test/test_literal.res | $bsc $stdlib runtime
-o test/test_literals.cmi test/test_literals.cmj : cc test/test_literals.res | $bsc $stdlib runtime
-o test/test_match_exception.cmi test/test_match_exception.cmj : cc test/test_match_exception.res | $bsc $stdlib runtime
-o test/test_mutliple.cmi test/test_mutliple.cmj : cc test/test_mutliple.res | $bsc $stdlib runtime
-o test/test_nat64.cmi test/test_nat64.cmj : cc test/test_nat64.res | $bsc $stdlib runtime
-o test/test_nested_let.cmi test/test_nested_let.cmj : cc test/test_nested_let.res | $bsc $stdlib runtime
-o test/test_nested_print.cmi test/test_nested_print.cmj : cc test/test_nested_print.res | $bsc $stdlib runtime
-o test/test_non_export.cmi test/test_non_export.cmj : cc test/test_non_export.res | $bsc $stdlib runtime
-o test/test_nullary.cmi test/test_nullary.cmj : cc test/test_nullary.res | $bsc $stdlib runtime
-o test/test_obj.cmi test/test_obj.cmj : cc test/test_obj.res | $bsc $stdlib runtime
-o test/test_order.cmi test/test_order.cmj : cc test/test_order.res | $bsc $stdlib runtime
-o test/test_order_tailcall.cmi test/test_order_tailcall.cmj : cc test/test_order_tailcall.res | $bsc $stdlib runtime
-o test/test_other_exn.cmi test/test_other_exn.cmj : cc test/test_other_exn.res | $bsc $stdlib runtime
-o test/test_pack.cmi test/test_pack.cmj : cc test/test_pack.res | $bsc $stdlib runtime
-o test/test_per.cmi test/test_per.cmj : cc test/test_per.res | $bsc $stdlib runtime
-o test/test_pervasive.cmi test/test_pervasive.cmj : cc test/test_pervasive.res | $bsc $stdlib runtime
-o test/test_pervasives2.cmi test/test_pervasives2.cmj : cc test/test_pervasives2.res | $bsc $stdlib runtime
-o test/test_pervasives3.cmi test/test_pervasives3.cmj : cc test/test_pervasives3.res | $bsc $stdlib runtime
-o test/test_primitive.cmi test/test_primitive.cmj : cc test/test_primitive.res | $bsc $stdlib runtime
-o test/test_ramification.cmi test/test_ramification.cmj : cc test/test_ramification.res | $bsc $stdlib runtime
-o test/test_react.cmi test/test_react.cmj : cc test/test_react.res | $bsc $stdlib runtime
-o test/test_react_case.cmi test/test_react_case.cmj : cc test/test_react_case.res | $bsc $stdlib runtime
-o test/test_regex.cmi test/test_regex.cmj : cc test/test_regex.res | $bsc $stdlib runtime
-o test/test_runtime_encoding.cmi test/test_runtime_encoding.cmj : cc test/test_runtime_encoding.res | $bsc $stdlib runtime
-o test/test_scope.cmi test/test_scope.cmj : cc test/test_scope.res | $bsc $stdlib runtime
-o test/test_seq.cmi test/test_seq.cmj : cc test/test_seq.res | $bsc $stdlib runtime
-o test/test_set.cmi test/test_set.cmj : cc test/test_set.res | $bsc $stdlib runtime
-o test/test_side_effect_functor.cmi test/test_side_effect_functor.cmj : cc test/test_side_effect_functor.res | $bsc $stdlib runtime
-o test/test_simple_include.cmi test/test_simple_include.cmj : cc test/test_simple_include.res | $bsc $stdlib runtime
-o test/test_simple_pattern_match.cmi test/test_simple_pattern_match.cmj : cc test/test_simple_pattern_match.res | $bsc $stdlib runtime
-o test/test_simple_ref.cmi test/test_simple_ref.cmj : cc test/test_simple_ref.res | $bsc $stdlib runtime
-o test/test_simple_tailcall.cmi test/test_simple_tailcall.cmj : cc test/test_simple_tailcall.res | $bsc $stdlib runtime
-o test/test_small.cmi test/test_small.cmj : cc test/test_small.res | $bsc $stdlib runtime
-o test/test_sprintf.cmi test/test_sprintf.cmj : cc test/test_sprintf.res | $bsc $stdlib runtime
-o test/test_stack.cmi test/test_stack.cmj : cc test/test_stack.res | $bsc $stdlib runtime
-o test/test_static_catch_ident.cmi test/test_static_catch_ident.cmj : cc test/test_static_catch_ident.res | $bsc $stdlib runtime
-o test/test_string.cmi test/test_string.cmj : cc test/test_string.res | $bsc $stdlib runtime
-o test/test_string_case.cmi test/test_string_case.cmj : cc test/test_string_case.res | $bsc $stdlib runtime
-o test/test_string_const.cmi test/test_string_const.cmj : cc test/test_string_const.res | $bsc $stdlib runtime
-o test/test_string_map.cmi test/test_string_map.cmj : cc test/test_string_map.res | $bsc $stdlib runtime
-o test/test_string_switch.cmi test/test_string_switch.cmj : cc test/test_string_switch.res | $bsc $stdlib runtime
-o test/test_switch.cmi test/test_switch.cmj : cc test/test_switch.res | $bsc $stdlib runtime
-o test/test_trywith.cmi test/test_trywith.cmj : cc test/test_trywith.res | $bsc $stdlib runtime
-o test/test_tuple.cmi test/test_tuple.cmj : cc test/test_tuple.res | $bsc $stdlib runtime
-o test/test_tuple_destructring.cmi test/test_tuple_destructring.cmj : cc test/test_tuple_destructring.res | $bsc $stdlib runtime
-o test/test_type_based_arity.cmi test/test_type_based_arity.cmj : cc test/test_type_based_arity.res | test/abstract_type.cmj $bsc $stdlib runtime
-o test/test_u.cmi test/test_u.cmj : cc test/test_u.res | $bsc $stdlib runtime
-o test/test_unknown.cmi test/test_unknown.cmj : cc test/test_unknown.res | $bsc $stdlib runtime
-o test/test_unsafe_cmp.cmi test/test_unsafe_cmp.cmj : cc test/test_unsafe_cmp.res | $bsc $stdlib runtime
-o test/test_unsafe_obj_ffi.cmj : cc_cmi test/test_unsafe_obj_ffi.res | test/test_unsafe_obj_ffi.cmi $bsc $stdlib runtime
-o test/test_unsafe_obj_ffi.cmi : cc test/test_unsafe_obj_ffi.resi | $bsc $stdlib runtime
-o test/test_unsafe_obj_ffi_ppx.cmj : cc_cmi test/test_unsafe_obj_ffi_ppx.res | test/test_unsafe_obj_ffi_ppx.cmi $bsc $stdlib runtime
-o test/test_unsafe_obj_ffi_ppx.cmi : cc test/test_unsafe_obj_ffi_ppx.resi | $bsc $stdlib runtime
-o test/test_unsupported_primitive.cmi test/test_unsupported_primitive.cmj : cc test/test_unsupported_primitive.res | $bsc $stdlib runtime
-o test/test_while_closure.cmi test/test_while_closure.cmj : cc test/test_while_closure.res | $bsc $stdlib runtime
-o test/test_while_side_effect.cmi test/test_while_side_effect.cmj : cc test/test_while_side_effect.res | $bsc $stdlib runtime
-o test/test_zero_nullable.cmi test/test_zero_nullable.cmj : cc test/test_zero_nullable.res | test/mt.cmj $bsc $stdlib runtime
-o test/then_mangle_test.cmi test/then_mangle_test.cmj : cc test/then_mangle_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/ticker.cmi test/ticker.cmj : cc test/ticker.res | $bsc $stdlib runtime
-o test/to_string_test.cmi test/to_string_test.cmj : cc test/to_string_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/topsort_test.cmi test/topsort_test.cmj : cc test/topsort_test.res | $bsc $stdlib runtime
-o test/tramp_fib.cmi test/tramp_fib.cmj : cc test/tramp_fib.res | test/mt.cmj $bsc $stdlib runtime
-o test/tuple_alloc.cmi test/tuple_alloc.cmj : cc test/tuple_alloc.res | $bsc $stdlib runtime
-o test/type_disambiguate.cmi test/type_disambiguate.cmj : cc test/type_disambiguate.res | $bsc $stdlib runtime
-o test/typeof_test.cmi test/typeof_test.cmj : cc test/typeof_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/unboxed_attribute.cmi test/unboxed_attribute.cmj : cc test/unboxed_attribute.res | $bsc $stdlib runtime
-o test/unboxed_attribute_test.cmi test/unboxed_attribute_test.cmj : cc test/unboxed_attribute_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/unboxed_crash.cmi test/unboxed_crash.cmj : cc test/unboxed_crash.res | $bsc $stdlib runtime
-o test/unboxed_use_case.cmj : cc_cmi test/unboxed_use_case.res | test/unboxed_use_case.cmi $bsc $stdlib runtime
-o test/unboxed_use_case.cmi : cc test/unboxed_use_case.resi | $bsc $stdlib runtime
-o test/uncurried_cast.cmi test/uncurried_cast.cmj : cc test/uncurried_cast.res | $bsc $stdlib runtime
-o test/uncurried_default.args.cmi test/uncurried_default.args.cmj : cc test/uncurried_default.args.res | $bsc $stdlib runtime
-o test/uncurried_pipe.cmi test/uncurried_pipe.cmj : cc test/uncurried_pipe.res | $bsc $stdlib runtime
-o test/uncurry_external_test.cmi test/uncurry_external_test.cmj : cc test/uncurry_external_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/uncurry_glob_test.cmi test/uncurry_glob_test.cmj : cc test/uncurry_glob_test.res | $bsc $stdlib runtime
-o test/uncurry_test.cmj : cc_cmi test/uncurry_test.res | test/uncurry_test.cmi $bsc $stdlib runtime
-o test/uncurry_test.cmi : cc test/uncurry_test.resi | $bsc $stdlib runtime
-o test/undef_regression2_test.cmi test/undef_regression2_test.cmj : cc test/undef_regression2_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/undef_regression_test.cmi test/undef_regression_test.cmj : cc test/undef_regression_test.res | $bsc $stdlib runtime
-o test/undefine_conditional.cmi test/undefine_conditional.cmj : cc test/undefine_conditional.res | $bsc $stdlib runtime
-o test/unicode_type_error.cmi test/unicode_type_error.cmj : cc test/unicode_type_error.res | $bsc $stdlib runtime
-o test/unit_undefined_test.cmi test/unit_undefined_test.cmj : cc test/unit_undefined_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/unitest_string.cmi test/unitest_string.cmj : cc test/unitest_string.res | $bsc $stdlib runtime
-o test/unsafe_full_apply_primitive.cmi test/unsafe_full_apply_primitive.cmj : cc test/unsafe_full_apply_primitive.res | $bsc $stdlib runtime
-o test/unsafe_ppx_test.cmi test/unsafe_ppx_test.cmj : cc test/unsafe_ppx_test.res | test/ffi_js_test.cmj test/mt.cmj $bsc $stdlib runtime
-o test/update_record_test.cmi test/update_record_test.cmj : cc test/update_record_test.res | test/mt.cmj $bsc $stdlib runtime
-o test/variant.cmi test/variant.cmj : cc test/variant.res | $bsc $stdlib runtime
-o test/variantsMatching.cmi test/variantsMatching.cmj : cc test/variantsMatching.res | $bsc $stdlib runtime
-o test/webpack_config.cmi test/webpack_config.cmj : cc test/webpack_config.res | $bsc $stdlib runtime
-o test : phony test/406_primitive_test.cmi test/406_primitive_test.cmj test/AsInUncurriedExternals.cmi test/AsInUncurriedExternals.cmj test/Coercion.cmi test/Coercion.cmj test/DerivingAccessorsCurried.cmi test/DerivingAccessorsCurried.cmj test/DerivingAccessorsUncurried.cmi test/DerivingAccessorsUncurried.cmj test/DictInference.cmi test/DictInference.cmj test/DisambiguateOptionalFields.cmi test/DisambiguateOptionalFields.cmj test/DotDotDot.cmi test/DotDotDot.cmj test/EmptyRecord.cmi test/EmptyRecord.cmj test/FFI.cmi test/FFI.cmj test/Import.cmi test/Import.cmj test/ImportAttributes.cmi test/ImportAttributes.cmj test/RecordCoercion.cmi test/RecordCoercion.cmj test/RecordOrObject.cmi test/RecordOrObject.cmj test/SafePromises.cmi test/SafePromises.cmj test/UncurriedAlways.cmi test/UncurriedAlways.cmj test/UncurriedExternals.cmi test/UncurriedExternals.cmj test/UncurriedPervasives.cmi test/UncurriedPervasives.cmj test/UntaggedVariants.cmi test/UntaggedVariants.cmj test/VariantCoercion.cmi test/VariantCoercion.cmj test/VariantSpreads.cmi test/VariantSpreads.cmj test/a.cmi test/a.cmj test/a_filename_test.cmi test/a_filename_test.cmj test/a_list_test.cmi test/a_list_test.cmj test/a_recursive_type.cmi test/a_recursive_type.cmj test/a_scope_bug.cmi test/a_scope_bug.cmj test/a_string_test.cmi test/a_string_test.cmj test/abstract_type.cmi test/abstract_type.cmj test/adt_optimize_test.cmi test/adt_optimize_test.cmj test/alias_default_value_test.cmi test/alias_default_value_test.cmj test/alias_test.cmi test/alias_test.cmj test/and_or_tailcall_test.cmi test/and_or_tailcall_test.cmj test/argv_test.cmi test/argv_test.cmj test/ari_regress_test.cmi test/ari_regress_test.cmj test/arith_lexer.cmi test/arith_lexer.cmj test/arith_parser.cmi test/arith_parser.cmj test/arith_syntax.cmi test/arith_syntax.cmj test/arity.cmi test/arity.cmj test/arity_deopt.cmi test/arity_deopt.cmj test/arity_infer.cmi test/arity_infer.cmj test/array_data_util.cmi test/array_data_util.cmj test/array_safe_get.cmi test/array_safe_get.cmj test/array_subtle_test.cmi test/array_subtle_test.cmj test/array_test.cmi test/array_test.cmj test/as_inline_record_test.cmi test/as_inline_record_test.cmj test/ast_abstract_test.cmi test/ast_abstract_test.cmj test/ast_mapper_unused_warning_test.cmi test/ast_mapper_unused_warning_test.cmj test/async_await.cmi test/async_await.cmj test/async_ideas.cmi test/async_ideas.cmj test/async_inline.cmi test/async_inline.cmj test/async_inside_loop.cmi test/async_inside_loop.cmj test/attr_test.cmi test/attr_test.cmj test/b.cmi test/b.cmj test/bal_set_mini.cmi test/bal_set_mini.cmj test/bang_primitive.cmi test/bang_primitive.cmj test/basic_module_test.cmi test/basic_module_test.cmj test/bb.cmi test/bb.cmj test/bdd.cmi test/bdd.cmj test/belt_internal_test.cmi test/belt_internal_test.cmj test/belt_result_alias_test.cmi test/belt_result_alias_test.cmj test/bench.cmi test/bench.cmj test/big_enum.cmi test/big_enum.cmj test/big_polyvar_test.cmi test/big_polyvar_test.cmj test/bigint_test.cmi test/bigint_test.cmj test/block_alias_test.cmi test/block_alias_test.cmj test/boolean_test.cmi test/boolean_test.cmj test/bs_MapInt_test.cmi test/bs_MapInt_test.cmj test/bs_abstract_test.cmi test/bs_abstract_test.cmj test/bs_array_test.cmi test/bs_array_test.cmj test/bs_auto_uncurry.cmi test/bs_auto_uncurry.cmj test/bs_auto_uncurry_test.cmi test/bs_auto_uncurry_test.cmj test/bs_float_test.cmi test/bs_float_test.cmj test/bs_hashmap_test.cmi test/bs_hashmap_test.cmj test/bs_hashset_int_test.cmi test/bs_hashset_int_test.cmj test/bs_hashtbl_string_test.cmi test/bs_hashtbl_string_test.cmj test/bs_ignore_effect.cmi test/bs_ignore_effect.cmj test/bs_ignore_test.cmi test/bs_ignore_test.cmj test/bs_int_test.cmi test/bs_int_test.cmj test/bs_list_test.cmi test/bs_list_test.cmj test/bs_map_set_dict_test.cmi test/bs_map_set_dict_test.cmj test/bs_map_test.cmi test/bs_map_test.cmj test/bs_min_max_test.cmi test/bs_min_max_test.cmj test/bs_mutable_set_test.cmi test/bs_mutable_set_test.cmj test/bs_poly_map_test.cmi test/bs_poly_map_test.cmj test/bs_poly_mutable_map_test.cmi test/bs_poly_mutable_map_test.cmj test/bs_poly_mutable_set_test.cmi test/bs_poly_mutable_set_test.cmj test/bs_poly_set_test.cmi test/bs_poly_set_test.cmj test/bs_qualified.cmi test/bs_qualified.cmj test/bs_queue_test.cmi test/bs_queue_test.cmj test/bs_rbset_int_bench.cmi test/bs_rbset_int_bench.cmj test/bs_rest_test.cmi test/bs_rest_test.cmj test/bs_set_bench.cmi test/bs_set_bench.cmj test/bs_set_int_test.cmi test/bs_set_int_test.cmj test/bs_sort_test.cmi test/bs_sort_test.cmj test/bs_splice_partial.cmi test/bs_splice_partial.cmj test/bs_stack_test.cmi test/bs_stack_test.cmj test/bs_string_test.cmi test/bs_string_test.cmj test/bs_unwrap_test.cmi test/bs_unwrap_test.cmj test/buffer_test.cmi test/buffer_test.cmj test/bytes_split_gpr_743_test.cmi test/bytes_split_gpr_743_test.cmj test/caml_compare_bigint_test.cmi test/caml_compare_bigint_test.cmj test/caml_compare_test.cmi test/caml_compare_test.cmj test/caml_format_test.cmi test/caml_format_test.cmj test/chain_code_test.cmi test/chain_code_test.cmj test/chn_test.cmi test/chn_test.cmj test/class_type_ffi_test.cmi test/class_type_ffi_test.cmj test/coercion_module_alias_test.cmi test/coercion_module_alias_test.cmj test/compare_test.cmi test/compare_test.cmj test/complete_parmatch_test.cmi test/complete_parmatch_test.cmj test/complex_if_test.cmi test/complex_if_test.cmj test/complex_test.cmi test/complex_test.cmj test/complex_while_loop.cmi test/complex_while_loop.cmj test/condition_compilation_test.cmi test/condition_compilation_test.cmj test/config1_test.cmi test/config1_test.cmj test/console_log_test.cmi test/console_log_test.cmj test/const_block_test.cmi test/const_block_test.cmj test/const_defs.cmi test/const_defs.cmj test/const_defs_test.cmi test/const_defs_test.cmj test/const_test.cmi test/const_test.cmj test/cont_int_fold_test.cmi test/cont_int_fold_test.cmj test/cps_test.cmi test/cps_test.cmj test/cross_module_inline_test.cmi test/cross_module_inline_test.cmj test/custom_error_test.cmi test/custom_error_test.cmj test/debug_keep_test.cmi test/debug_keep_test.cmj test/debug_mode_value.cmi test/debug_mode_value.cmj test/debug_tmp.cmi test/debug_tmp.cmj test/debugger_test.cmi test/debugger_test.cmj test/default_export_test.cmi test/default_export_test.cmj test/defunctor_make_test.cmi test/defunctor_make_test.cmj test/demo_int_map.cmi test/demo_int_map.cmj test/demo_page.cmi test/demo_page.cmj test/demo_pipe.cmi test/demo_pipe.cmj test/derive_dyntype.cmi test/derive_dyntype.cmj test/derive_projector_test.cmi test/derive_projector_test.cmj test/derive_type_test.cmi test/derive_type_test.cmj test/digest_test.cmi test/digest_test.cmj test/directives.cmi test/directives.cmj test/div_by_zero_test.cmi test/div_by_zero_test.cmj test/dollar_escape_test.cmi test/dollar_escape_test.cmj test/earger_curry_test.cmi test/earger_curry_test.cmj test/effect.cmi test/effect.cmj test/epsilon_test.cmi test/epsilon_test.cmj test/equal_box_test.cmi test/equal_box_test.cmj test/equal_exception_test.cmi test/equal_exception_test.cmj test/equal_test.cmi test/equal_test.cmj test/es6_export.cmi test/es6_export.cmj test/es6_import.cmi test/es6_import.cmj test/es6_module_test.cmi test/es6_module_test.cmj test/escape_esmodule.cmi test/escape_esmodule.cmj test/esmodule_ref.cmi test/esmodule_ref.cmj test/event_ffi.cmi test/event_ffi.cmj test/exception_alias.cmi test/exception_alias.cmj test/exception_raise_test.cmi test/exception_raise_test.cmj test/exception_rebound_err_test.cmi test/exception_rebound_err_test.cmj test/exception_value_test.cmi test/exception_value_test.cmj test/exponentiation_precedence_test.cmi test/exponentiation_precedence_test.cmj test/export_keyword.cmi test/export_keyword.cmj test/ext_array_test.cmi test/ext_array_test.cmj test/ext_bytes_test.cmi test/ext_bytes_test.cmj test/ext_filename_test.cmi test/ext_filename_test.cmj test/ext_list_test.cmi test/ext_list_test.cmj test/ext_pervasives_test.cmi test/ext_pervasives_test.cmj test/ext_string_test.cmi test/ext_string_test.cmj test/ext_sys_test.cmi test/ext_sys_test.cmj test/extensible_variant_test.cmi test/extensible_variant_test.cmj test/external_polyfill_test.cmi test/external_polyfill_test.cmj test/external_ppx.cmi test/external_ppx.cmj test/external_ppx2.cmi test/external_ppx2.cmj test/fail_comp.cmi test/fail_comp.cmj test/ffi_arity_test.cmi test/ffi_arity_test.cmj test/ffi_array_test.cmi test/ffi_array_test.cmj test/ffi_js_test.cmi test/ffi_js_test.cmj test/ffi_splice_test.cmi test/ffi_splice_test.cmj test/ffi_test.cmi test/ffi_test.cmj test/fib.cmi test/fib.cmj test/flattern_order_test.cmi test/flattern_order_test.cmj test/flexible_array_test.cmi test/flexible_array_test.cmj test/float_array.cmi test/float_array.cmj test/float_of_bits_test.cmi test/float_of_bits_test.cmj test/float_record.cmi test/float_record.cmj test/float_test.cmi test/float_test.cmj test/floatarray_test.cmi test/floatarray_test.cmj test/for_loop_test.cmi test/for_loop_test.cmj test/for_side_effect_test.cmi test/for_side_effect_test.cmj test/format_regression.cmi test/format_regression.cmj test/format_test.cmi test/format_test.cmj test/fun_pattern_match.cmi test/fun_pattern_match.cmj test/functor_app_test.cmi test/functor_app_test.cmj test/functor_def.cmi test/functor_def.cmj test/functor_ffi.cmi test/functor_ffi.cmj test/functor_inst.cmi test/functor_inst.cmj test/functors.cmi test/functors.cmj test/gbk.cmi test/gbk.cmj test/genlex_test.cmi test/genlex_test.cmj test/gentTypeReTest.cmi test/gentTypeReTest.cmj test/global_exception_regression_test.cmi test/global_exception_regression_test.cmj test/global_mangles.cmi test/global_mangles.cmj test/global_module_alias_test.cmi test/global_module_alias_test.cmj test/google_closure_test.cmi test/google_closure_test.cmj test/gpr496_test.cmi test/gpr496_test.cmj test/gpr_1072.cmi test/gpr_1072.cmj test/gpr_1072_reg.cmi test/gpr_1072_reg.cmj test/gpr_1150.cmi test/gpr_1150.cmj test/gpr_1154_test.cmi test/gpr_1154_test.cmj test/gpr_1170.cmi test/gpr_1170.cmj test/gpr_1240_missing_unbox.cmi test/gpr_1240_missing_unbox.cmj test/gpr_1245_test.cmi test/gpr_1245_test.cmj test/gpr_1268.cmi test/gpr_1268.cmj test/gpr_1409_test.cmi test/gpr_1409_test.cmj test/gpr_1423_app_test.cmi test/gpr_1423_app_test.cmj test/gpr_1423_nav.cmi test/gpr_1423_nav.cmj test/gpr_1438.cmi test/gpr_1438.cmj test/gpr_1481.cmi test/gpr_1481.cmj test/gpr_1484.cmi test/gpr_1484.cmj test/gpr_1503_test.cmi test/gpr_1503_test.cmj test/gpr_1539_test.cmi test/gpr_1539_test.cmj test/gpr_1658_test.cmi test/gpr_1658_test.cmj test/gpr_1667_test.cmi test/gpr_1667_test.cmj test/gpr_1692_test.cmi test/gpr_1692_test.cmj test/gpr_1698_test.cmi test/gpr_1698_test.cmj test/gpr_1701_test.cmi test/gpr_1701_test.cmj test/gpr_1716_test.cmi test/gpr_1716_test.cmj test/gpr_1717_test.cmi test/gpr_1717_test.cmj test/gpr_1728_test.cmi test/gpr_1728_test.cmj test/gpr_1749_test.cmi test/gpr_1749_test.cmj test/gpr_1759_test.cmi test/gpr_1759_test.cmj test/gpr_1760_test.cmi test/gpr_1760_test.cmj test/gpr_1762_test.cmi test/gpr_1762_test.cmj test/gpr_1817_test.cmi test/gpr_1817_test.cmj test/gpr_1822_test.cmi test/gpr_1822_test.cmj test/gpr_1891_test.cmi test/gpr_1891_test.cmj test/gpr_1943_test.cmi test/gpr_1943_test.cmj test/gpr_1946_test.cmi test/gpr_1946_test.cmj test/gpr_2316_test.cmi test/gpr_2316_test.cmj test/gpr_2352_test.cmi test/gpr_2352_test.cmj test/gpr_2413_test.cmi test/gpr_2413_test.cmj test/gpr_2474.cmi test/gpr_2474.cmj test/gpr_2487.cmi test/gpr_2487.cmj test/gpr_2503_test.cmi test/gpr_2503_test.cmj test/gpr_2608_test.cmi test/gpr_2608_test.cmj test/gpr_2614_test.cmi test/gpr_2614_test.cmj test/gpr_2633_test.cmi test/gpr_2633_test.cmj test/gpr_2642_test.cmi test/gpr_2642_test.cmj test/gpr_2682_test.cmi test/gpr_2682_test.cmj test/gpr_2700_test.cmi test/gpr_2700_test.cmj test/gpr_2731_test.cmi test/gpr_2731_test.cmj test/gpr_2789_test.cmi test/gpr_2789_test.cmj test/gpr_2931_test.cmi test/gpr_2931_test.cmj test/gpr_3142_test.cmi test/gpr_3142_test.cmj test/gpr_3154_test.cmi test/gpr_3154_test.cmj test/gpr_3209_test.cmi test/gpr_3209_test.cmj test/gpr_3492_test.cmi test/gpr_3492_test.cmj test/gpr_3519_jsx_test.cmi test/gpr_3519_jsx_test.cmj test/gpr_3519_test.cmi test/gpr_3519_test.cmj test/gpr_3536_test.cmi test/gpr_3536_test.cmj test/gpr_3546_test.cmi test/gpr_3546_test.cmj test/gpr_3548_test.cmi test/gpr_3548_test.cmj test/gpr_3549_test.cmi test/gpr_3549_test.cmj test/gpr_3566_drive_test.cmi test/gpr_3566_drive_test.cmj test/gpr_3566_test.cmi test/gpr_3566_test.cmj test/gpr_3595_test.cmi test/gpr_3595_test.cmj test/gpr_3609_test.cmi test/gpr_3609_test.cmj test/gpr_3697_test.cmi test/gpr_3697_test.cmj test/gpr_373_test.cmi test/gpr_373_test.cmj test/gpr_3770_test.cmi test/gpr_3770_test.cmj test/gpr_3852_alias.cmi test/gpr_3852_alias.cmj test/gpr_3852_alias_reify.cmi test/gpr_3852_alias_reify.cmj test/gpr_3852_effect.cmi test/gpr_3852_effect.cmj test/gpr_3865.cmi test/gpr_3865.cmj test/gpr_3865_bar.cmi test/gpr_3865_bar.cmj test/gpr_3865_foo.cmi test/gpr_3865_foo.cmj test/gpr_3875_test.cmi test/gpr_3875_test.cmj test/gpr_3877_test.cmi test/gpr_3877_test.cmj test/gpr_3895_test.cmi test/gpr_3895_test.cmj test/gpr_3897_test.cmi test/gpr_3897_test.cmj test/gpr_3931_test.cmi test/gpr_3931_test.cmj test/gpr_3980_test.cmi test/gpr_3980_test.cmj test/gpr_4025_test.cmi test/gpr_4025_test.cmj test/gpr_405_test.cmi test/gpr_405_test.cmj test/gpr_4069_test.cmi test/gpr_4069_test.cmj test/gpr_4265_test.cmi test/gpr_4265_test.cmj test/gpr_4274_test.cmi test/gpr_4274_test.cmj test/gpr_4280_test.cmi test/gpr_4280_test.cmj test/gpr_4407_test.cmi test/gpr_4407_test.cmj test/gpr_441.cmi test/gpr_441.cmj test/gpr_4442_test.cmi test/gpr_4442_test.cmj test/gpr_4491_test.cmi test/gpr_4491_test.cmj test/gpr_4494_test.cmi test/gpr_4494_test.cmj test/gpr_4519_test.cmi test/gpr_4519_test.cmj test/gpr_459_test.cmi test/gpr_459_test.cmj test/gpr_4632.cmi test/gpr_4632.cmj test/gpr_4639_test.cmi test/gpr_4639_test.cmj test/gpr_4900_test.cmi test/gpr_4900_test.cmj test/gpr_4924_test.cmi test/gpr_4924_test.cmj test/gpr_4931.cmi test/gpr_4931.cmj test/gpr_4931_allow.cmi test/gpr_4931_allow.cmj test/gpr_5071_test.cmi test/gpr_5071_test.cmj test/gpr_5169_test.cmi test/gpr_5169_test.cmj test/gpr_5218_test.cmi test/gpr_5218_test.cmj test/gpr_5280_optimize_test.cmi test/gpr_5280_optimize_test.cmj test/gpr_5312.cmi test/gpr_5312.cmj test/gpr_5557.cmi test/gpr_5557.cmj test/gpr_5753.cmi test/gpr_5753.cmj test/gpr_658.cmi test/gpr_658.cmj test/gpr_858_test.cmi test/gpr_858_test.cmj test/gpr_858_unit2_test.cmi test/gpr_858_unit2_test.cmj test/gpr_904_test.cmi test/gpr_904_test.cmj test/gpr_974_test.cmi test/gpr_974_test.cmj test/gpr_977_test.cmi test/gpr_977_test.cmj test/gpr_return_type_unused_attribute.cmi test/gpr_return_type_unused_attribute.cmj test/gray_code_test.cmi test/gray_code_test.cmj test/guide_for_ext.cmi test/guide_for_ext.cmj test/hamming_test.cmi test/hamming_test.cmj test/hash_collision_test.cmi test/hash_collision_test.cmj test/hash_sugar_desugar.cmi test/hash_sugar_desugar.cmj test/hash_test.cmi test/hash_test.cmj test/hashtbl_test.cmi test/hashtbl_test.cmj test/hello.foo.cmi test/hello.foo.cmj test/hello_res.cmi test/hello_res.cmj test/ignore_test.cmi test/ignore_test.cmj test/ignore_uncurry_attribute.cmi test/ignore_uncurry_attribute.cmj test/imm_map_bench.cmi test/imm_map_bench.cmj test/import2.cmi test/import2.cmj test/import_external.cmi test/import_external.cmj test/import_side_effect.cmi test/import_side_effect.cmj test/import_side_effect_free.cmi test/import_side_effect_free.cmj test/include_side_effect.cmi test/include_side_effect.cmj test/include_side_effect_free.cmi test/include_side_effect_free.cmj test/incomplete_toplevel_test.cmi test/incomplete_toplevel_test.cmj test/infer_type_test.cmi test/infer_type_test.cmj test/inline_condition_with_pattern_matching.cmi test/inline_condition_with_pattern_matching.cmj test/inline_const.cmi test/inline_const.cmj test/inline_const_test.cmi test/inline_const_test.cmj test/inline_edge_cases.cmi test/inline_edge_cases.cmj test/inline_map2_test.cmi test/inline_map2_test.cmj test/inline_map_demo.cmi test/inline_map_demo.cmj test/inline_map_test.cmi test/inline_map_test.cmj test/inline_record_test.cmi test/inline_record_test.cmj test/inline_regression_test.cmi test/inline_regression_test.cmj test/inline_string_test.cmi test/inline_string_test.cmj test/inner_call.cmi test/inner_call.cmj test/inner_define.cmi test/inner_define.cmj test/inner_unused.cmi test/inner_unused.cmj test/installation_test.cmi test/installation_test.cmj test/int32_test.cmi test/int32_test.cmj test/int64_mul_div_test.cmi test/int64_mul_div_test.cmj test/int64_string_bench.cmi test/int64_string_bench.cmj test/int64_string_test.cmi test/int64_string_test.cmj test/int64_test.cmi test/int64_test.cmj test/int_hashtbl_test.cmi test/int_hashtbl_test.cmj test/int_map.cmi test/int_map.cmj test/int_overflow_test.cmi test/int_overflow_test.cmj test/int_poly_var.cmi test/int_poly_var.cmj test/int_switch_test.cmi test/int_switch_test.cmj test/internal_unused_test.cmi test/internal_unused_test.cmj test/io_test.cmi test/io_test.cmj test/js_array_test.cmi test/js_array_test.cmj test/js_bool_test.cmi test/js_bool_test.cmj test/js_cast_test.cmi test/js_cast_test.cmj test/js_date_test.cmi test/js_date_test.cmj test/js_dict_test.cmi test/js_dict_test.cmj test/js_exception_catch_test.cmi test/js_exception_catch_test.cmj test/js_float_test.cmi test/js_float_test.cmj test/js_global_test.cmi test/js_global_test.cmj test/js_int_test.cmi test/js_int_test.cmj test/js_json_test.cmi test/js_json_test.cmj test/js_list_test.cmi test/js_list_test.cmj test/js_math_test.cmi test/js_math_test.cmj test/js_null_test.cmi test/js_null_test.cmj test/js_null_undefined_test.cmi test/js_null_undefined_test.cmj test/js_nullable_test.cmi test/js_nullable_test.cmj test/js_obj_test.cmi test/js_obj_test.cmj test/js_option_test.cmi test/js_option_test.cmj test/js_re_test.cmi test/js_re_test.cmj test/js_string_test.cmi test/js_string_test.cmj test/js_typed_array_test.cmi test/js_typed_array_test.cmj test/js_undefined_test.cmi test/js_undefined_test.cmj test/js_val.cmi test/js_val.cmj test/jsoo_400_test.cmi test/jsoo_400_test.cmj test/jsoo_485_test.cmi test/jsoo_485_test.cmj test/jsxv4_newtype.cmi test/jsxv4_newtype.cmj test/keep_uncurry_attribute.cmi test/keep_uncurry_attribute.cmj test/key_word_property.cmi test/key_word_property.cmj test/key_word_property2.cmi test/key_word_property2.cmj test/key_word_property_plus_test.cmi test/key_word_property_plus_test.cmj test/label_uncurry.cmi test/label_uncurry.cmj test/large_integer_pat.cmi test/large_integer_pat.cmj test/large_record_duplication_test.cmi test/large_record_duplication_test.cmj test/largest_int_flow.cmi test/largest_int_flow.cmj test/lazy_demo.cmi test/lazy_demo.cmj test/lazy_test.cmi test/lazy_test.cmj test/lib_js_test.cmi test/lib_js_test.cmj test/libarg_test.cmi test/libarg_test.cmj test/libqueue_test.cmi test/libqueue_test.cmj test/limits_test.cmi test/limits_test.cmj test/list_stack.cmi test/list_stack.cmj test/list_test.cmi test/list_test.cmj test/local_exception_test.cmi test/local_exception_test.cmj test/loop_regression_test.cmi test/loop_regression_test.cmj test/loop_suites_test.cmi test/loop_suites_test.cmj test/map_find_test.cmi test/map_find_test.cmj test/map_test.cmi test/map_test.cmj test/mario_game.cmi test/mario_game.cmj test/marshal.cmi test/marshal.cmj test/meth_annotation.cmi test/meth_annotation.cmj test/method_name_test.cmi test/method_name_test.cmj test/method_string_name.cmi test/method_string_name.cmj test/minimal_test.cmi test/minimal_test.cmj test/miss_colon_test.cmi test/miss_colon_test.cmj test/mock_mt.cmi test/mock_mt.cmj test/module_alias_test.cmi test/module_alias_test.cmj test/module_as_class_ffi.cmi test/module_as_class_ffi.cmj test/module_as_function.cmi test/module_as_function.cmj test/module_missing_conversion.cmi test/module_missing_conversion.cmj test/module_parameter_test.cmi test/module_parameter_test.cmj test/module_splice_test.cmi test/module_splice_test.cmj test/more_poly_variant_test.cmi test/more_poly_variant_test.cmj test/more_uncurry.cmi test/more_uncurry.cmj test/mpr_6033_test.cmi test/mpr_6033_test.cmj test/mt.cmi test/mt.cmj test/mt_global.cmi test/mt_global.cmj test/mutable_obj_test.cmi test/mutable_obj_test.cmj test/mutable_uncurry_test.cmi test/mutable_uncurry_test.cmj test/mutual_non_recursive_type.cmi test/mutual_non_recursive_type.cmj test/name_mangle_test.cmi test/name_mangle_test.cmj test/nested_include.cmi test/nested_include.cmj test/nested_module_alias.cmi test/nested_module_alias.cmj test/nested_obj_literal.cmi test/nested_obj_literal.cmj test/nested_obj_test.cmi test/nested_obj_test.cmj test/nested_pattern_match_test.cmi test/nested_pattern_match_test.cmj test/noassert.cmi test/noassert.cmj test/node_path_test.cmi test/node_path_test.cmj test/null_list_test.cmi test/null_list_test.cmj test/number_lexer.cmi test/number_lexer.cmj test/obj_literal_ppx.cmi test/obj_literal_ppx.cmj test/obj_literal_ppx_test.cmi test/obj_literal_ppx_test.cmj test/obj_magic_test.cmi test/obj_magic_test.cmj test/obj_type_test.cmi test/obj_type_test.cmj test/ocaml_re_test.cmi test/ocaml_re_test.cmj test/of_string_test.cmi test/of_string_test.cmj test/offset.cmi test/offset.cmj test/omit_trailing_undefined_in_external_calls.cmi test/omit_trailing_undefined_in_external_calls.cmj test/option_encoding_test.cmi test/option_encoding_test.cmj test/option_record_none_test.cmi test/option_record_none_test.cmj test/option_repr_test.cmi test/option_repr_test.cmj test/optional_ffi_test.cmi test/optional_ffi_test.cmj test/optional_regression_test.cmi test/optional_regression_test.cmj test/pipe_send_readline.cmi test/pipe_send_readline.cmj test/pipe_syntax.cmi test/pipe_syntax.cmj test/poly_empty_array.cmi test/poly_empty_array.cmj test/poly_variant_test.cmi test/poly_variant_test.cmj test/polymorphic_raw_test.cmi test/polymorphic_raw_test.cmj test/polymorphism_test.cmi test/polymorphism_test.cmj test/polyvar_convert.cmi test/polyvar_convert.cmj test/polyvar_test.cmi test/polyvar_test.cmj test/ppx_apply_test.cmi test/ppx_apply_test.cmj test/pq_test.cmi test/pq_test.cmj test/pr6726.cmi test/pr6726.cmj test/pr_regression_test.cmi test/pr_regression_test.cmj test/prepend_data_ffi.cmi test/prepend_data_ffi.cmj test/primitive_reg_test.cmi test/primitive_reg_test.cmj test/print_alpha_test.cmi test/print_alpha_test.cmj test/queue_402.cmi test/queue_402.cmj test/queue_test.cmi test/queue_test.cmj test/random_test.cmi test/random_test.cmj test/raw_hash_tbl_bench.cmi test/raw_hash_tbl_bench.cmj test/raw_output_test.cmi test/raw_output_test.cmj test/raw_pure_test.cmi test/raw_pure_test.cmj test/rbset.cmi test/rbset.cmj test/react.cmi test/react.cmj test/reactDOMRe.cmi test/reactDOMRe.cmj test/reactDOMServerRe.cmi test/reactDOMServerRe.cmj test/reactEvent.cmi test/reactEvent.cmj test/reactTestUtils.cmi test/reactTestUtils.cmj test/reasonReact.cmi test/reasonReact.cmj test/reasonReactCompat.cmi test/reasonReactCompat.cmj test/reasonReactOptimizedCreateClass.cmi test/reasonReactOptimizedCreateClass.cmj test/reasonReactRouter.cmi test/reasonReactRouter.cmj test/rebind_module.cmi test/rebind_module.cmj test/rebind_module_test.cmi test/rebind_module_test.cmj test/rec_array_test.cmi test/rec_array_test.cmj test/rec_fun_test.cmi test/rec_fun_test.cmj test/rec_module_opt.cmi test/rec_module_opt.cmj test/rec_module_test.cmi test/rec_module_test.cmj test/recmodule.cmi test/recmodule.cmj test/record_debug_test.cmi test/record_debug_test.cmj test/record_extension_test.cmi test/record_extension_test.cmj test/record_name_test.cmi test/record_name_test.cmj test/record_regression.cmi test/record_regression.cmj test/record_type_spread.cmi test/record_type_spread.cmj test/record_with_test.cmi test/record_with_test.cmj test/recursive_module.cmi test/recursive_module.cmj test/recursive_module_test.cmi test/recursive_module_test.cmj test/recursive_react_component.cmi test/recursive_react_component.cmj test/recursive_records_test.cmi test/recursive_records_test.cmj test/recursive_unbound_module_test.cmi test/recursive_unbound_module_test.cmj test/regression_print.cmi test/regression_print.cmj test/relative_path.cmi test/relative_path.cmj test/res_debug.cmi test/res_debug.cmj test/return_check.cmi test/return_check.cmj test/runtime_encoding_test.cmi test/runtime_encoding_test.cmj test/set_annotation.cmi test/set_annotation.cmj test/set_gen.cmi test/set_gen.cmj test/sexp.cmi test/sexp.cmj test/sexpm.cmi test/sexpm.cmj test/sexpm_test.cmi test/sexpm_test.cmj test/side_effect.cmi test/side_effect.cmj test/side_effect2.cmi test/side_effect2.cmj test/side_effect_free.cmi test/side_effect_free.cmj test/simple_derive_test.cmi test/simple_derive_test.cmj test/simple_derive_use.cmi test/simple_derive_use.cmj test/simplify_lambda_632o.cmi test/simplify_lambda_632o.cmj test/single_module_alias.cmi test/single_module_alias.cmj test/singular_unit_test.cmi test/singular_unit_test.cmj test/small_inline_test.cmi test/small_inline_test.cmj test/splice_test.cmi test/splice_test.cmj test/stack_comp_test.cmi test/stack_comp_test.cmj test/stack_test.cmi test/stack_test.cmj test/stream_parser_test.cmi test/stream_parser_test.cmj test/string_bound_get_test.cmi test/string_bound_get_test.cmj test/string_constant_compare.cmi test/string_constant_compare.cmj test/string_get_set_test.cmi test/string_get_set_test.cmj test/string_runtime_test.cmi test/string_runtime_test.cmj test/string_set.cmi test/string_set.cmj test/string_set_test.cmi test/string_set_test.cmj test/string_test.cmi test/string_test.cmj test/string_unicode_test.cmi test/string_unicode_test.cmj test/stringmatch_test.cmi test/stringmatch_test.cmj test/submodule.cmi test/submodule.cmj test/submodule_call.cmi test/submodule_call.cmj test/switch_case_test.cmi test/switch_case_test.cmj test/switch_string.cmi test/switch_string.cmj test/tagged_template_test.cmi test/tagged_template_test.cmj test/tailcall_inline_test.cmi test/tailcall_inline_test.cmj test/template.cmi test/template.cmj test/test.cmi test/test.cmj test/test2.cmi test/test2.cmj test/test_alias.cmi test/test_alias.cmj test/test_ari.cmi test/test_ari.cmj test/test_array.cmi test/test_array.cmj test/test_array_append.cmi test/test_array_append.cmj test/test_array_primitive.cmi test/test_array_primitive.cmj test/test_bool_equal.cmi test/test_bool_equal.cmj test/test_bs_this.cmi test/test_bs_this.cmj test/test_bug.cmi test/test_bug.cmj test/test_bytes.cmi test/test_bytes.cmj test/test_case_opt_collision.cmi test/test_case_opt_collision.cmj test/test_case_set.cmi test/test_case_set.cmj test/test_char.cmi test/test_char.cmj test/test_closure.cmi test/test_closure.cmj test/test_common.cmi test/test_common.cmj test/test_const_elim.cmi test/test_const_elim.cmj test/test_const_propogate.cmi test/test_const_propogate.cmj test/test_cpp.cmi test/test_cpp.cmj test/test_cps.cmi test/test_cps.cmj test/test_demo.cmi test/test_demo.cmj test/test_dup_param.cmi test/test_dup_param.cmj test/test_eq.cmi test/test_eq.cmj test/test_exception.cmi test/test_exception.cmj test/test_exception_escape.cmi test/test_exception_escape.cmj test/test_export2.cmi test/test_export2.cmj test/test_external.cmi test/test_external.cmj test/test_external_unit.cmi test/test_external_unit.cmj test/test_ffi.cmi test/test_ffi.cmj test/test_fib.cmi test/test_fib.cmj test/test_filename.cmi test/test_filename.cmj test/test_for_loop.cmi test/test_for_loop.cmj test/test_for_map.cmi test/test_for_map.cmj test/test_for_map2.cmi test/test_for_map2.cmj test/test_format.cmi test/test_format.cmj test/test_formatter.cmi test/test_formatter.cmj test/test_functor_dead_code.cmi test/test_functor_dead_code.cmj test/test_generative_module.cmi test/test_generative_module.cmj test/test_global_print.cmi test/test_global_print.cmj test/test_google_closure.cmi test/test_google_closure.cmj test/test_include.cmi test/test_include.cmj test/test_incomplete.cmi test/test_incomplete.cmj test/test_incr_ref.cmi test/test_incr_ref.cmj test/test_int_map_find.cmi test/test_int_map_find.cmj test/test_internalOO.cmi test/test_internalOO.cmj test/test_is_js.cmi test/test_is_js.cmj test/test_js_ffi.cmi test/test_js_ffi.cmj test/test_let.cmi test/test_let.cmj test/test_list.cmi test/test_list.cmj test/test_literal.cmi test/test_literal.cmj test/test_literals.cmi test/test_literals.cmj test/test_match_exception.cmi test/test_match_exception.cmj test/test_mutliple.cmi test/test_mutliple.cmj test/test_nat64.cmi test/test_nat64.cmj test/test_nested_let.cmi test/test_nested_let.cmj test/test_nested_print.cmi test/test_nested_print.cmj test/test_non_export.cmi test/test_non_export.cmj test/test_nullary.cmi test/test_nullary.cmj test/test_obj.cmi test/test_obj.cmj test/test_order.cmi test/test_order.cmj test/test_order_tailcall.cmi test/test_order_tailcall.cmj test/test_other_exn.cmi test/test_other_exn.cmj test/test_pack.cmi test/test_pack.cmj test/test_per.cmi test/test_per.cmj test/test_pervasive.cmi test/test_pervasive.cmj test/test_pervasives2.cmi test/test_pervasives2.cmj test/test_pervasives3.cmi test/test_pervasives3.cmj test/test_primitive.cmi test/test_primitive.cmj test/test_ramification.cmi test/test_ramification.cmj test/test_react.cmi test/test_react.cmj test/test_react_case.cmi test/test_react_case.cmj test/test_regex.cmi test/test_regex.cmj test/test_runtime_encoding.cmi test/test_runtime_encoding.cmj test/test_scope.cmi test/test_scope.cmj test/test_seq.cmi test/test_seq.cmj test/test_set.cmi test/test_set.cmj test/test_side_effect_functor.cmi test/test_side_effect_functor.cmj test/test_simple_include.cmi test/test_simple_include.cmj test/test_simple_pattern_match.cmi test/test_simple_pattern_match.cmj test/test_simple_ref.cmi test/test_simple_ref.cmj test/test_simple_tailcall.cmi test/test_simple_tailcall.cmj test/test_small.cmi test/test_small.cmj test/test_sprintf.cmi test/test_sprintf.cmj test/test_stack.cmi test/test_stack.cmj test/test_static_catch_ident.cmi test/test_static_catch_ident.cmj test/test_string.cmi test/test_string.cmj test/test_string_case.cmi test/test_string_case.cmj test/test_string_const.cmi test/test_string_const.cmj test/test_string_map.cmi test/test_string_map.cmj test/test_string_switch.cmi test/test_string_switch.cmj test/test_switch.cmi test/test_switch.cmj test/test_trywith.cmi test/test_trywith.cmj test/test_tuple.cmi test/test_tuple.cmj test/test_tuple_destructring.cmi test/test_tuple_destructring.cmj test/test_type_based_arity.cmi test/test_type_based_arity.cmj test/test_u.cmi test/test_u.cmj test/test_unknown.cmi test/test_unknown.cmj test/test_unsafe_cmp.cmi test/test_unsafe_cmp.cmj test/test_unsafe_obj_ffi.cmi test/test_unsafe_obj_ffi.cmj test/test_unsafe_obj_ffi_ppx.cmi test/test_unsafe_obj_ffi_ppx.cmj test/test_unsupported_primitive.cmi test/test_unsupported_primitive.cmj test/test_while_closure.cmi test/test_while_closure.cmj test/test_while_side_effect.cmi test/test_while_side_effect.cmj test/test_zero_nullable.cmi test/test_zero_nullable.cmj test/then_mangle_test.cmi test/then_mangle_test.cmj test/ticker.cmi test/ticker.cmj test/to_string_test.cmi test/to_string_test.cmj test/topsort_test.cmi test/topsort_test.cmj test/tramp_fib.cmi test/tramp_fib.cmj test/tuple_alloc.cmi test/tuple_alloc.cmj test/type_disambiguate.cmi test/type_disambiguate.cmj test/typeof_test.cmi test/typeof_test.cmj test/unboxed_attribute.cmi test/unboxed_attribute.cmj test/unboxed_attribute_test.cmi test/unboxed_attribute_test.cmj test/unboxed_crash.cmi test/unboxed_crash.cmj test/unboxed_use_case.cmi test/unboxed_use_case.cmj test/uncurried_cast.cmi test/uncurried_cast.cmj test/uncurried_default.args.cmi test/uncurried_default.args.cmj test/uncurried_pipe.cmi test/uncurried_pipe.cmj test/uncurry_external_test.cmi test/uncurry_external_test.cmj test/uncurry_glob_test.cmi test/uncurry_glob_test.cmj test/uncurry_test.cmi test/uncurry_test.cmj test/undef_regression2_test.cmi test/undef_regression2_test.cmj test/undef_regression_test.cmi test/undef_regression_test.cmj test/undefine_conditional.cmi test/undefine_conditional.cmj test/unicode_type_error.cmi test/unicode_type_error.cmj test/unit_undefined_test.cmi test/unit_undefined_test.cmj test/unitest_string.cmi test/unitest_string.cmj test/unsafe_full_apply_primitive.cmi test/unsafe_full_apply_primitive.cmj test/unsafe_ppx_test.cmi test/unsafe_ppx_test.cmj test/update_record_test.cmi test/update_record_test.cmj test/variant.cmi test/variant.cmj test/variantsMatching.cmi test/variantsMatching.cmj test/webpack_config.cmi test/webpack_config.cmj
diff --git a/jscomp/test/bytes_split_gpr_743_test.js b/jscomp/test/bytes_split_gpr_743_test.js
deleted file mode 100644
index f0ffd05..0000000
--- a/jscomp/test/bytes_split_gpr_743_test.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Bytes = require("../../lib/js/bytes.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, param) {
-  var y = param[1];
-  var x = param[0];
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var b = [
-  0,
-  0,
-  0
-];
-
-Caml_bytes.set(b, 0, /* 'a' */97);
-
-Caml_bytes.set(b, 1, /* 'b' */98);
-
-Caml_bytes.set(b, 2, /* 'c' */99);
-
-Bytes.blit(b, 0, b, 1, 2);
-
-var res = Bytes.unsafe_to_string(b);
-
-console.log(res);
-
-eq("File \"bytes_split_gpr_743_test.res\", line 17, characters 5-12", [
-      "aab",
-      res
-    ]);
-
-var b$1 = [
-  0,
-  0,
-  0
-];
-
-Caml_bytes.set(b$1, 0, /* 'a' */97);
-
-Caml_bytes.set(b$1, 1, /* 'b' */98);
-
-Caml_bytes.set(b$1, 2, /* 'c' */99);
-
-Bytes.blit(b$1, 1, b$1, 0, 2);
-
-var res2 = Bytes.unsafe_to_string(b$1);
-
-console.log(res2);
-
-eq("File \"bytes_split_gpr_743_test.res\", line 32, characters 5-12", [
-      "bcc",
-      res2
-    ]);
-
-Mt.from_pair_suites("Bytes_split_gpr_743_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/bytes_split_gpr_743_test.res b/jscomp/test/bytes_split_gpr_743_test.res
deleted file mode 100644
index 3c11f35..0000000
--- a/jscomp/test/bytes_split_gpr_743_test.res
+++ /dev/null
@@ -1,35 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, (x, y)) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let () = {
-  let b = Bytes.create(3)
-  Bytes.set(b, 0, 'a')
-  Bytes.set(b, 1, 'b')
-  Bytes.set(b, 2, 'c')
-  Bytes.blit(b, 0, b, 1, 2)
-  let res = Bytes.unsafe_to_string(b)
-  Js.log(res) /* "aab" */
-  eq(__LOC__, ("aab", res))
-}
-/* assert('a' = Bytes.get b 0); */
-/* assert('a' = Bytes.get b 1); */
-/* assert('b' = Bytes.get b 2); */
-/* () */
-
-let () = {
-  let b = Bytes.create(3)
-  Bytes.set(b, 0, 'a')
-  Bytes.set(b, 1, 'b')
-  Bytes.set(b, 2, 'c')
-  Bytes.blit(b, 1, b, 0, 2)
-  let res2 = Bytes.unsafe_to_string(b)
-  Js.log(res2) /* "bcc" */
-  eq(__LOC__, ("bcc", res2))
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/caml_compare_bigint_test.js b/jscomp/test/caml_compare_bigint_test.js
deleted file mode 100644
index ab3ad10..0000000
--- a/jscomp/test/caml_compare_bigint_test.js
+++ /dev/null
@@ -1,434 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-function isLessThan(title, small, big) {
-  return {
-          hd: [
-            "compare: " + title,
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: true,
-                        _1: Caml_obj.compare(big, small) > 0
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "compare: " + title,
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: Caml_obj.compare(small, big) < 0
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "< operator: " + title,
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: true,
-                            _1: Caml_obj.lessthan(small, big)
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "<= operator: " + title,
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: true,
-                              _1: Caml_obj.lessequal(small, big)
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "> operator: " + title,
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: true,
-                                _1: Caml_obj.greaterthan(big, small)
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      ">= operator: " + title,
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: true,
-                                  _1: Caml_obj.greaterequal(big, small)
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "min: " + title,
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: small,
-                                    _1: Caml_obj.min(big, small)
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "min: " + title,
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: small,
-                                      _1: Caml_obj.min(small, big)
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "max: " + title,
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: big,
-                                        _1: Caml_obj.max(big, small)
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "max: " + title,
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: big,
-                                          _1: Caml_obj.max(small, big)
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "!== operator: " + title,
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: true,
-                                            _1: big !== small
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "!== operator: " + title,
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: true,
-                                              _1: small !== big
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "!= operator: " + title,
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: true,
-                                                _1: Caml_obj.notequal(big, small)
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "!= operator: " + title,
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: true,
-                                                  _1: Caml_obj.notequal(small, big)
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "== operator: " + title,
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: false,
-                                                    _1: Caml_obj.equal(big, small)
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "== operator: " + title,
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: false,
-                                                      _1: Caml_obj.equal(small, big)
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "=== operator: " + title,
-                                            (function (param) {
-                                                return {
-                                                        TAG: "Eq",
-                                                        _0: false,
-                                                        _1: big === small
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "=== operator: " + title,
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "Eq",
-                                                          _0: false,
-                                                          _1: small === big
-                                                        };
-                                                })
-                                            ],
-                                            tl: /* [] */0
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        };
-}
-
-function isEqual(title, num1, num2) {
-  return {
-          hd: [
-            "< operator: " + title,
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: false,
-                        _1: Caml_obj.lessthan(num2, num1)
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "<= operator: " + title,
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: Caml_obj.lessequal(num2, num1)
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "> operator: " + title,
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: false,
-                            _1: Caml_obj.greaterthan(num1, num2)
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  ">= operator: " + title,
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: true,
-                              _1: Caml_obj.greaterequal(num1, num2)
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "min: " + title,
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: num1,
-                                _1: Caml_obj.min(num1, num2)
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "max: " + title,
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: num1,
-                                  _1: Caml_obj.max(num1, num2)
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "compare: " + title,
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: 0,
-                                    _1: Caml_obj.compare(num1, num2)
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "compare: " + title,
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: 0,
-                                      _1: Caml_obj.compare(num2, num1)
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "!= operator: " + title,
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: false,
-                                        _1: num1 !== num2
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "!= operator: " + title,
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: false,
-                                          _1: num2 !== num1
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "!= operator: " + title,
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: false,
-                                            _1: Caml_obj.notequal(num1, num2)
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "!= operator: " + title,
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: false,
-                                              _1: Caml_obj.notequal(num2, num1)
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "== operator: " + title,
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: true,
-                                                _1: Caml_obj.equal(num1, num2)
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "== operator: " + title,
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: true,
-                                                  _1: Caml_obj.equal(num2, num1)
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "=== operator: " + title,
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: true,
-                                                    _1: num1 === num2
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "=== operator: " + title,
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: true,
-                                                      _1: num2 === num1
-                                                    };
-                                            })
-                                        ],
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        };
-}
-
-var five = BigInt("5");
-
-var suites = Pervasives.$at(isLessThan("123 and 555555", BigInt("123"), BigInt("555555")), Pervasives.$at(isEqual("98765 and 98765", BigInt("98765"), BigInt("98765")), isEqual("same instance", five, five)));
-
-Mt.from_pair_suites("caml_compare_bigint_test.res", suites);
-
-exports.isLessThan = isLessThan;
-exports.isEqual = isEqual;
-exports.five = five;
-exports.suites = suites;
-/* five Not a pure module */
diff --git a/jscomp/test/caml_compare_bigint_test.res b/jscomp/test/caml_compare_bigint_test.res
deleted file mode 100644
index 1e026da..0000000
--- a/jscomp/test/caml_compare_bigint_test.res
+++ /dev/null
@@ -1,54 +0,0 @@
-@val external bigint: string => float = "BigInt"
-
-let isLessThan = (title, small, big) => list{
-  ("compare: " ++ title, _ => Mt.Eq(true, compare(big, small) > 0)),
-  ("compare: " ++ title, _ => Mt.Eq(true, compare(small, big) < 0)),
-  ("< operator: " ++ title, _ => Mt.Eq(true, small < big)),
-  ("<= operator: " ++ title, _ => Mt.Eq(true, small <= big)),
-  ("> operator: " ++ title, _ => Mt.Eq(true, big > small)),
-  (">= operator: " ++ title, _ => Mt.Eq(true, big >= small)),
-  ("min: " ++ title, _ => Mt.Eq(small, min(big, small))),
-  ("min: " ++ title, _ => Mt.Eq(small, min(small, big))),
-  ("max: " ++ title, _ => Mt.Eq(big, max(big, small))),
-  ("max: " ++ title, _ => Mt.Eq(big, max(small, big))),
-  ("!== operator: " ++ title, _ => Mt.Eq(true, big !== small)),
-  ("!== operator: " ++ title, _ => Mt.Eq(true, small !== big)),
-  ("!= operator: " ++ title, _ => Mt.Eq(true, big != small)),
-  ("!= operator: " ++ title, _ => Mt.Eq(true, small != big)),
-  ("== operator: " ++ title, _ => Mt.Eq(false, big == small)),
-  ("== operator: " ++ title, _ => Mt.Eq(false, small == big)),
-  ("=== operator: " ++ title, _ => Mt.Eq(false, big === small)),
-  ("=== operator: " ++ title, _ => Mt.Eq(false, small === big)),
-}
-
-let isEqual = (title, num1, num2) => list{
-  ("< operator: " ++ title, _ => Mt.Eq(false, num2 < num1)),
-  ("<= operator: " ++ title, _ => Mt.Eq(true, num2 <= num1)),
-  ("> operator: " ++ title, _ => Mt.Eq(false, num1 > num2)),
-  (">= operator: " ++ title, _ => Mt.Eq(true, num1 >= num2)),
-  ("min: " ++ title, _ => Mt.Eq(num1, min(num1, num2))),
-  ("max: " ++ title, _ => Mt.Eq(num1, max(num1, num2))),
-  ("compare: " ++ title, _ => Mt.Eq(0, compare(num1, num2))),
-  ("compare: " ++ title, _ => Mt.Eq(0, compare(num2, num1))),
-  ("!= operator: " ++ title, _ => Mt.Eq(false, num1 !== num2)),
-  ("!= operator: " ++ title, _ => Mt.Eq(false, num2 !== num1)),
-  ("!= operator: " ++ title, _ => Mt.Eq(false, num1 != num2)),
-  ("!= operator: " ++ title, _ => Mt.Eq(false, num2 != num1)),
-  ("== operator: " ++ title, _ => Mt.Eq(true, num1 == num2)),
-  ("== operator: " ++ title, _ => Mt.Eq(true, num2 == num1)),
-  ("=== operator: " ++ title, _ => Mt.Eq(true, num1 === num2)),
-  ("=== operator: " ++ title, _ => Mt.Eq(true, num2 === num1)),
-}
-
-let five = bigint("5")
-
-/** Not comparing floats and BigInt; not sure this is correct since works in JavaScript */
-let suites: Mt.pair_suites = \"@"(
-  isLessThan("123 and 555555", bigint("123"), bigint("555555")),
-  \"@"(
-    isEqual("98765 and 98765", bigint("98765"), bigint("98765")),
-    isEqual("same instance", five, five),
-  ),
-)
-
-let () = Mt.from_pair_suites(__FILE__, suites)
diff --git a/jscomp/test/caml_compare_test.js b/jscomp/test/caml_compare_test.js
deleted file mode 100644
index f393045..0000000
--- a/jscomp/test/caml_compare_test.js
+++ /dev/null
@@ -1,1160 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var function_equal_test;
-
-try {
-  function_equal_test = Caml_obj.equal((function (x) {
-          return x + 1 | 0;
-        }), (function (x) {
-          return x + 2 | 0;
-        }));
-}
-catch (raw_exn){
-  var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-  function_equal_test = exn.RE_EXN_ID === "Invalid_argument" && exn._1 === "equal: functional value" ? true : false;
-}
-
-var suites = {
-  contents: {
-    hd: [
-      "File \"caml_compare_test.res\", line 12, characters 5-12",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: true,
-                  _1: Caml_obj.lessthan(undefined, 1)
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "option2",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: Caml_obj.lessthan(1, 2)
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "File \"caml_compare_test.res\", line 14, characters 5-12",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: Caml_obj.greaterthan({
-                            hd: 1,
-                            tl: /* [] */0
-                          }, /* [] */0)
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "listeq",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: true,
-                        _1: Caml_obj.equal({
-                              hd: 1,
-                              tl: {
-                                hd: 2,
-                                tl: {
-                                  hd: 3,
-                                  tl: /* [] */0
-                                }
-                              }
-                            }, {
-                              hd: 1,
-                              tl: {
-                                hd: 2,
-                                tl: {
-                                  hd: 3,
-                                  tl: /* [] */0
-                                }
-                              }
-                            })
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "listneq",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: Caml_obj.greaterthan({
-                                hd: 1,
-                                tl: {
-                                  hd: 2,
-                                  tl: {
-                                    hd: 3,
-                                    tl: /* [] */0
-                                  }
-                                }
-                              }, {
-                                hd: 1,
-                                tl: {
-                                  hd: 2,
-                                  tl: {
-                                    hd: 2,
-                                    tl: /* [] */0
-                                  }
-                                }
-                              })
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "custom_u",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: true,
-                            _1: Caml_obj.greaterthan([
-                                  {
-                                    TAG: "A",
-                                    _0: 3
-                                  },
-                                  {
-                                    TAG: "B",
-                                    _0: 2,
-                                    _1: false
-                                  },
-                                  {
-                                    TAG: "C",
-                                    _0: 1
-                                  }
-                                ], [
-                                  {
-                                    TAG: "A",
-                                    _0: 3
-                                  },
-                                  {
-                                    TAG: "B",
-                                    _0: 2,
-                                    _1: false
-                                  },
-                                  {
-                                    TAG: "C",
-                                    _0: 0
-                                  }
-                                ])
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "custom_u2",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: true,
-                              _1: Caml_obj.equal([
-                                    {
-                                      TAG: "A",
-                                      _0: 3
-                                    },
-                                    {
-                                      TAG: "B",
-                                      _0: 2,
-                                      _1: false
-                                    },
-                                    {
-                                      TAG: "C",
-                                      _0: 1
-                                    }
-                                  ], [
-                                    {
-                                      TAG: "A",
-                                      _0: 3
-                                    },
-                                    {
-                                      TAG: "B",
-                                      _0: 2,
-                                      _1: false
-                                    },
-                                    {
-                                      TAG: "C",
-                                      _0: 1
-                                    }
-                                  ])
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "function",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: true,
-                                _1: function_equal_test
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "File \"caml_compare_test.res\", line 20, characters 5-12",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: true,
-                                  _1: Caml_obj.lessthan(undefined, 1)
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "File \"caml_compare_test.res\", line 21, characters 5-12",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: true,
-                                    _1: Caml_obj.lessthan(undefined, [
-                                          1,
-                                          30
-                                        ])
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "File \"caml_compare_test.res\", line 22, characters 5-12",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: true,
-                                      _1: Caml_obj.greaterthan([
-                                            1,
-                                            30
-                                          ], undefined)
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "File \"caml_compare_test.res\", line 24, characters 6-13",
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: true,
-                                        _1: Caml_obj.lessthan({
-                                              hd: 2,
-                                              tl: {
-                                                hd: 6,
-                                                tl: {
-                                                  hd: 1,
-                                                  tl: {
-                                                    hd: 1,
-                                                    tl: {
-                                                      hd: 2,
-                                                      tl: {
-                                                        hd: 1,
-                                                        tl: {
-                                                          hd: 4,
-                                                          tl: {
-                                                            hd: 2,
-                                                            tl: {
-                                                              hd: 1,
-                                                              tl: /* [] */0
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }, {
-                                              hd: 2,
-                                              tl: {
-                                                hd: 6,
-                                                tl: {
-                                                  hd: 1,
-                                                  tl: {
-                                                    hd: 1,
-                                                    tl: {
-                                                      hd: 2,
-                                                      tl: {
-                                                        hd: 1,
-                                                        tl: {
-                                                          hd: 4,
-                                                          tl: {
-                                                            hd: 2,
-                                                            tl: {
-                                                              hd: 1,
-                                                              tl: {
-                                                                hd: 409,
-                                                                tl: /* [] */0
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            })
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "File \"caml_compare_test.res\", line 27, characters 5-12",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: true,
-                                          _1: Caml_obj.lessthan({
-                                                hd: 1,
-                                                tl: /* [] */0
-                                              }, {
-                                                hd: 1,
-                                                tl: {
-                                                  hd: 409,
-                                                  tl: /* [] */0
-                                                }
-                                              })
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "File \"caml_compare_test.res\", line 28, characters 5-12",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: true,
-                                            _1: Caml_obj.lessthan(/* [] */0, {
-                                                  hd: 409,
-                                                  tl: /* [] */0
-                                                })
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "File \"caml_compare_test.res\", line 30, characters 6-13",
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: true,
-                                              _1: Caml_obj.greaterthan({
-                                                    hd: 2,
-                                                    tl: {
-                                                      hd: 6,
-                                                      tl: {
-                                                        hd: 1,
-                                                        tl: {
-                                                          hd: 1,
-                                                          tl: {
-                                                            hd: 2,
-                                                            tl: {
-                                                              hd: 1,
-                                                              tl: {
-                                                                hd: 4,
-                                                                tl: {
-                                                                  hd: 2,
-                                                                  tl: {
-                                                                    hd: 1,
-                                                                    tl: {
-                                                                      hd: 409,
-                                                                      tl: /* [] */0
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }, {
-                                                    hd: 2,
-                                                    tl: {
-                                                      hd: 6,
-                                                      tl: {
-                                                        hd: 1,
-                                                        tl: {
-                                                          hd: 1,
-                                                          tl: {
-                                                            hd: 2,
-                                                            tl: {
-                                                              hd: 1,
-                                                              tl: {
-                                                                hd: 4,
-                                                                tl: {
-                                                                  hd: 2,
-                                                                  tl: {
-                                                                    hd: 1,
-                                                                    tl: /* [] */0
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  })
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "File \"caml_compare_test.res\", line 33, characters 5-12",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: false,
-                                                _1: false
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "File \"caml_compare_test.res\", line 34, characters 5-12",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: false,
-                                                  _1: false
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "File \"caml_compare_test.res\", line 36, characters 6-13",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: false,
-                                                    _1: Caml_obj.equal({
-                                                          hd: 2,
-                                                          tl: {
-                                                            hd: 6,
-                                                            tl: {
-                                                              hd: 1,
-                                                              tl: {
-                                                                hd: 1,
-                                                                tl: {
-                                                                  hd: 2,
-                                                                  tl: {
-                                                                    hd: 1,
-                                                                    tl: {
-                                                                      hd: 4,
-                                                                      tl: {
-                                                                        hd: 2,
-                                                                        tl: {
-                                                                          hd: 1,
-                                                                          tl: /* [] */0
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }, {
-                                                          hd: 2,
-                                                          tl: {
-                                                            hd: 6,
-                                                            tl: {
-                                                              hd: 1,
-                                                              tl: {
-                                                                hd: 1,
-                                                                tl: {
-                                                                  hd: 2,
-                                                                  tl: {
-                                                                    hd: 1,
-                                                                    tl: {
-                                                                      hd: 4,
-                                                                      tl: {
-                                                                        hd: 2,
-                                                                        tl: {
-                                                                          hd: 1,
-                                                                          tl: {
-                                                                            hd: 409,
-                                                                            tl: /* [] */0
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        })
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "File \"caml_compare_test.res\", line 40, characters 6-13",
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: false,
-                                                      _1: Caml_obj.equal({
-                                                            hd: 2,
-                                                            tl: {
-                                                              hd: 6,
-                                                              tl: {
-                                                                hd: 1,
-                                                                tl: {
-                                                                  hd: 1,
-                                                                  tl: {
-                                                                    hd: 2,
-                                                                    tl: {
-                                                                      hd: 1,
-                                                                      tl: {
-                                                                        hd: 4,
-                                                                        tl: {
-                                                                          hd: 2,
-                                                                          tl: {
-                                                                            hd: 1,
-                                                                            tl: {
-                                                                              hd: 409,
-                                                                              tl: /* [] */0
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }, {
-                                                            hd: 2,
-                                                            tl: {
-                                                              hd: 6,
-                                                              tl: {
-                                                                hd: 1,
-                                                                tl: {
-                                                                  hd: 1,
-                                                                  tl: {
-                                                                    hd: 2,
-                                                                    tl: {
-                                                                      hd: 1,
-                                                                      tl: {
-                                                                        hd: 4,
-                                                                        tl: {
-                                                                          hd: 2,
-                                                                          tl: {
-                                                                            hd: 1,
-                                                                            tl: /* [] */0
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          })
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "cmp_id",
-                                            (function (param) {
-                                                return {
-                                                        TAG: "Eq",
-                                                        _0: Caml_obj.compare({
-                                                              x: 1,
-                                                              y: 2
-                                                            }, {
-                                                              x: 1,
-                                                              y: 2
-                                                            }),
-                                                        _1: 0
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "cmp_val",
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "Eq",
-                                                          _0: Caml_obj.compare({
-                                                                x: 1
-                                                              }, {
-                                                                x: 2
-                                                              }),
-                                                          _1: -1
-                                                        };
-                                                })
-                                            ],
-                                            tl: {
-                                              hd: [
-                                                "cmp_val2",
-                                                (function (param) {
-                                                    return {
-                                                            TAG: "Eq",
-                                                            _0: Caml_obj.compare({
-                                                                  x: 2
-                                                                }, {
-                                                                  x: 1
-                                                                }),
-                                                            _1: 1
-                                                          };
-                                                  })
-                                              ],
-                                              tl: {
-                                                hd: [
-                                                  "cmp_empty",
-                                                  (function (param) {
-                                                      return {
-                                                              TAG: "Eq",
-                                                              _0: Caml_obj.compare({}, {}),
-                                                              _1: 0
-                                                            };
-                                                    })
-                                                ],
-                                                tl: {
-                                                  hd: [
-                                                    "cmp_empty2",
-                                                    (function (param) {
-                                                        return {
-                                                                TAG: "Eq",
-                                                                _0: Caml_obj.compare({}, {x:1}),
-                                                                _1: -1
-                                                              };
-                                                      })
-                                                  ],
-                                                  tl: {
-                                                    hd: [
-                                                      "cmp_swap",
-                                                      (function (param) {
-                                                          return {
-                                                                  TAG: "Eq",
-                                                                  _0: Caml_obj.compare({
-                                                                        x: 1,
-                                                                        y: 2
-                                                                      }, {
-                                                                        y: 2,
-                                                                        x: 1
-                                                                      }),
-                                                                  _1: 0
-                                                                };
-                                                        })
-                                                    ],
-                                                    tl: {
-                                                      hd: [
-                                                        "cmp_size",
-                                                        (function (param) {
-                                                            return {
-                                                                    TAG: "Eq",
-                                                                    _0: Caml_obj.compare({x:1}, {x:1, y:2}),
-                                                                    _1: -1
-                                                                  };
-                                                          })
-                                                      ],
-                                                      tl: {
-                                                        hd: [
-                                                          "cmp_size2",
-                                                          (function (param) {
-                                                              return {
-                                                                      TAG: "Eq",
-                                                                      _0: Caml_obj.compare({x:1, y:2}, {x:1}),
-                                                                      _1: 1
-                                                                    };
-                                                            })
-                                                        ],
-                                                        tl: {
-                                                          hd: [
-                                                            "cmp_order",
-                                                            (function (param) {
-                                                                return {
-                                                                        TAG: "Eq",
-                                                                        _0: Caml_obj.compare({
-                                                                              x: 0,
-                                                                              y: 1
-                                                                            }, {
-                                                                              x: 1,
-                                                                              y: 0
-                                                                            }),
-                                                                        _1: -1
-                                                                      };
-                                                              })
-                                                          ],
-                                                          tl: {
-                                                            hd: [
-                                                              "cmp_order2",
-                                                              (function (param) {
-                                                                  return {
-                                                                          TAG: "Eq",
-                                                                          _0: Caml_obj.compare({
-                                                                                x: 1,
-                                                                                y: 0
-                                                                              }, {
-                                                                                x: 0,
-                                                                                y: 1
-                                                                              }),
-                                                                          _1: 1
-                                                                        };
-                                                                })
-                                                            ],
-                                                            tl: {
-                                                              hd: [
-                                                                "cmp_in_list",
-                                                                (function (param) {
-                                                                    return {
-                                                                            TAG: "Eq",
-                                                                            _0: Caml_obj.compare({
-                                                                                  hd: {
-                                                                                    x: 1
-                                                                                  },
-                                                                                  tl: /* [] */0
-                                                                                }, {
-                                                                                  hd: {
-                                                                                    x: 2
-                                                                                  },
-                                                                                  tl: /* [] */0
-                                                                                }),
-                                                                            _1: -1
-                                                                          };
-                                                                  })
-                                                              ],
-                                                              tl: {
-                                                                hd: [
-                                                                  "cmp_in_list2",
-                                                                  (function (param) {
-                                                                      return {
-                                                                              TAG: "Eq",
-                                                                              _0: Caml_obj.compare({
-                                                                                    hd: {
-                                                                                      x: 2
-                                                                                    },
-                                                                                    tl: /* [] */0
-                                                                                  }, {
-                                                                                    hd: {
-                                                                                      x: 1
-                                                                                    },
-                                                                                    tl: /* [] */0
-                                                                                  }),
-                                                                              _1: 1
-                                                                            };
-                                                                    })
-                                                                ],
-                                                                tl: {
-                                                                  hd: [
-                                                                    "cmp_with_list",
-                                                                    (function (param) {
-                                                                        return {
-                                                                                TAG: "Eq",
-                                                                                _0: Caml_obj.compare({
-                                                                                      x: {
-                                                                                        hd: 0,
-                                                                                        tl: /* [] */0
-                                                                                      }
-                                                                                    }, {
-                                                                                      x: {
-                                                                                        hd: 1,
-                                                                                        tl: /* [] */0
-                                                                                      }
-                                                                                    }),
-                                                                                _1: -1
-                                                                              };
-                                                                      })
-                                                                  ],
-                                                                  tl: {
-                                                                    hd: [
-                                                                      "cmp_with_list2",
-                                                                      (function (param) {
-                                                                          return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: Caml_obj.compare({
-                                                                                        x: {
-                                                                                          hd: 1,
-                                                                                          tl: /* [] */0
-                                                                                        }
-                                                                                      }, {
-                                                                                        x: {
-                                                                                          hd: 0,
-                                                                                          tl: /* [] */0
-                                                                                        }
-                                                                                      }),
-                                                                                  _1: 1
-                                                                                };
-                                                                        })
-                                                                    ],
-                                                                    tl: {
-                                                                      hd: [
-                                                                        "eq_id",
-                                                                        (function (param) {
-                                                                            return {
-                                                                                    TAG: "Ok",
-                                                                                    _0: Caml_obj.equal({
-                                                                                          x: 1,
-                                                                                          y: 2
-                                                                                        }, {
-                                                                                          x: 1,
-                                                                                          y: 2
-                                                                                        })
-                                                                                  };
-                                                                          })
-                                                                      ],
-                                                                      tl: {
-                                                                        hd: [
-                                                                          "eq_val",
-                                                                          (function (param) {
-                                                                              return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: Caml_obj.equal({
-                                                                                            x: 1
-                                                                                          }, {
-                                                                                            x: 2
-                                                                                          }),
-                                                                                      _1: false
-                                                                                    };
-                                                                            })
-                                                                        ],
-                                                                        tl: {
-                                                                          hd: [
-                                                                            "eq_val2",
-                                                                            (function (param) {
-                                                                                return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: Caml_obj.equal({
-                                                                                              x: 2
-                                                                                            }, {
-                                                                                              x: 1
-                                                                                            }),
-                                                                                        _1: false
-                                                                                      };
-                                                                              })
-                                                                          ],
-                                                                          tl: {
-                                                                            hd: [
-                                                                              "eq_empty",
-                                                                              (function (param) {
-                                                                                  return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: Caml_obj.equal({}, {}),
-                                                                                          _1: true
-                                                                                        };
-                                                                                })
-                                                                            ],
-                                                                            tl: {
-                                                                              hd: [
-                                                                                "eq_empty2",
-                                                                                (function (param) {
-                                                                                    return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: Caml_obj.equal({}, {x:1}),
-                                                                                            _1: false
-                                                                                          };
-                                                                                  })
-                                                                              ],
-                                                                              tl: {
-                                                                                hd: [
-                                                                                  "eq_swap",
-                                                                                  (function (param) {
-                                                                                      return {
-                                                                                              TAG: "Ok",
-                                                                                              _0: Caml_obj.equal({
-                                                                                                    x: 1,
-                                                                                                    y: 2
-                                                                                                  }, {
-                                                                                                    y: 2,
-                                                                                                    x: 1
-                                                                                                  })
-                                                                                            };
-                                                                                    })
-                                                                                ],
-                                                                                tl: {
-                                                                                  hd: [
-                                                                                    "eq_size",
-                                                                                    (function (param) {
-                                                                                        return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: Caml_obj.equal({x:1}, {x:1, y:2}),
-                                                                                                _1: false
-                                                                                              };
-                                                                                      })
-                                                                                  ],
-                                                                                  tl: {
-                                                                                    hd: [
-                                                                                      "eq_size2",
-                                                                                      (function (param) {
-                                                                                          return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: Caml_obj.equal({x:1, y:2}, {x:1}),
-                                                                                                  _1: false
-                                                                                                };
-                                                                                        })
-                                                                                    ],
-                                                                                    tl: {
-                                                                                      hd: [
-                                                                                        "eq_in_list",
-                                                                                        (function (param) {
-                                                                                            return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: Caml_obj.equal({
-                                                                                                          hd: {
-                                                                                                            x: 1
-                                                                                                          },
-                                                                                                          tl: /* [] */0
-                                                                                                        }, {
-                                                                                                          hd: {
-                                                                                                            x: 2
-                                                                                                          },
-                                                                                                          tl: /* [] */0
-                                                                                                        }),
-                                                                                                    _1: false
-                                                                                                  };
-                                                                                          })
-                                                                                      ],
-                                                                                      tl: {
-                                                                                        hd: [
-                                                                                          "eq_in_list2",
-                                                                                          (function (param) {
-                                                                                              return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: Caml_obj.equal({
-                                                                                                            hd: {
-                                                                                                              x: 2
-                                                                                                            },
-                                                                                                            tl: /* [] */0
-                                                                                                          }, {
-                                                                                                            hd: {
-                                                                                                              x: 2
-                                                                                                            },
-                                                                                                            tl: /* [] */0
-                                                                                                          }),
-                                                                                                      _1: true
-                                                                                                    };
-                                                                                            })
-                                                                                        ],
-                                                                                        tl: {
-                                                                                          hd: [
-                                                                                            "eq_with_list",
-                                                                                            (function (param) {
-                                                                                                return {
-                                                                                                        TAG: "Eq",
-                                                                                                        _0: Caml_obj.equal({
-                                                                                                              x: {
-                                                                                                                hd: 0,
-                                                                                                                tl: /* [] */0
-                                                                                                              }
-                                                                                                            }, {
-                                                                                                              x: {
-                                                                                                                hd: 0,
-                                                                                                                tl: /* [] */0
-                                                                                                              }
-                                                                                                            }),
-                                                                                                        _1: true
-                                                                                                      };
-                                                                                              })
-                                                                                          ],
-                                                                                          tl: {
-                                                                                            hd: [
-                                                                                              "eq_with_list2",
-                                                                                              (function (param) {
-                                                                                                  return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: Caml_obj.equal({
-                                                                                                                x: {
-                                                                                                                  hd: 0,
-                                                                                                                  tl: /* [] */0
-                                                                                                                }
-                                                                                                              }, {
-                                                                                                                x: {
-                                                                                                                  hd: 1,
-                                                                                                                  tl: /* [] */0
-                                                                                                                }
-                                                                                                              }),
-                                                                                                          _1: false
-                                                                                                        };
-                                                                                                })
-                                                                                            ],
-                                                                                            tl: {
-                                                                                              hd: [
-                                                                                                "eq_no_prototype",
-                                                                                                (function (param) {
-                                                                                                    return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: Caml_obj.equal({x:1}, ((function(){let o = Object.create(null);o.x = 1;return o;})())),
-                                                                                                            _1: true
-                                                                                                          };
-                                                                                                  })
-                                                                                              ],
-                                                                                              tl: {
-                                                                                                hd: [
-                                                                                                  "File \"caml_compare_test.res\", line 76, characters 5-12",
-                                                                                                  (function (param) {
-                                                                                                      return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: Caml_obj.compare(null, {
-                                                                                                                    hd: 3,
-                                                                                                                    tl: /* [] */0
-                                                                                                                  }),
-                                                                                                              _1: -1
-                                                                                                            };
-                                                                                                    })
-                                                                                                ],
-                                                                                                tl: {
-                                                                                                  hd: [
-                                                                                                    "File \"caml_compare_test.res\", line 77, characters 5-12",
-                                                                                                    (function (param) {
-                                                                                                        return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: Caml_obj.compare({
-                                                                                                                      hd: 3,
-                                                                                                                      tl: /* [] */0
-                                                                                                                    }, null),
-                                                                                                                _1: 1
-                                                                                                              };
-                                                                                                      })
-                                                                                                  ],
-                                                                                                  tl: {
-                                                                                                    hd: [
-                                                                                                      "File \"caml_compare_test.res\", line 78, characters 5-12",
-                                                                                                      (function (param) {
-                                                                                                          return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: Caml_obj.compare(null, 0),
-                                                                                                                  _1: -1
-                                                                                                                };
-                                                                                                        })
-                                                                                                    ],
-                                                                                                    tl: {
-                                                                                                      hd: [
-                                                                                                        "File \"caml_compare_test.res\", line 79, characters 5-12",
-                                                                                                        (function (param) {
-                                                                                                            return {
-                                                                                                                    TAG: "Eq",
-                                                                                                                    _0: Caml_obj.compare(0, null),
-                                                                                                                    _1: 1
-                                                                                                                  };
-                                                                                                          })
-                                                                                                      ],
-                                                                                                      tl: {
-                                                                                                        hd: [
-                                                                                                          "File \"caml_compare_test.res\", line 80, characters 5-12",
-                                                                                                          (function (param) {
-                                                                                                              return {
-                                                                                                                      TAG: "Eq",
-                                                                                                                      _0: Caml_obj.compare(undefined, 0),
-                                                                                                                      _1: -1
-                                                                                                                    };
-                                                                                                            })
-                                                                                                        ],
-                                                                                                        tl: {
-                                                                                                          hd: [
-                                                                                                            "File \"caml_compare_test.res\", line 81, characters 5-12",
-                                                                                                            (function (param) {
-                                                                                                                return {
-                                                                                                                        TAG: "Eq",
-                                                                                                                        _0: Caml_obj.compare(0, undefined),
-                                                                                                                        _1: 1
-                                                                                                                      };
-                                                                                                              })
-                                                                                                          ],
-                                                                                                          tl: /* [] */0
-                                                                                                        }
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-eq("File \"caml_compare_test.res\", line 88, characters 3-10", true, Caml_obj.greaterthan(1, undefined));
-
-eq("File \"caml_compare_test.res\", line 89, characters 3-10", true, Caml_obj.lessthan(/* [] */0, {
-          hd: 1,
-          tl: /* [] */0
-        }));
-
-eq("File \"caml_compare_test.res\", line 90, characters 3-10", false, Caml_obj.greaterthan(undefined, 1));
-
-eq("File \"caml_compare_test.res\", line 91, characters 3-10", false, Caml_obj.greaterthan(undefined, [
-          1,
-          30
-        ]));
-
-eq("File \"caml_compare_test.res\", line 92, characters 3-10", false, Caml_obj.lessthan([
-          1,
-          30
-        ], undefined));
-
-Mt.from_pair_suites("Caml_compare_test", suites.contents);
-
-exports.function_equal_test = function_equal_test;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/* function_equal_test Not a pure module */
diff --git a/jscomp/test/caml_compare_test.res b/jscomp/test/caml_compare_test.res
deleted file mode 100644
index 4dc811e..0000000
--- a/jscomp/test/caml_compare_test.res
+++ /dev/null
@@ -1,93 +0,0 @@
-@@warning("-45")
-type u = A(int) | B(int, bool) | C(int)
-
-let function_equal_test = try (x => x + 1) == (x => x + 2) catch {
-| Invalid_argument("equal: functional value") => true
-| _ => false
-}
-
-let suites = ref({
-  open Mt
-  list{
-    (__LOC__, _ => Eq(true, None < Some(1))),
-    ("option2", _ => Eq(true, Some(1) < Some(2))),
-    (__LOC__, _ => Eq(true, list{1} > list{})),
-    ("listeq", _ => Eq(true, list{1, 2, 3} == list{1, 2, 3})),
-    ("listneq", _ => Eq(true, list{1, 2, 3} > list{1, 2, 2})),
-    ("custom_u", _ => Eq(true, (A(3), B(2, false), C(1)) > (A(3), B(2, false), C(0)))),
-    ("custom_u2", _ => Eq(true, (A(3), B(2, false), C(1)) == (A(3), B(2, false), C(1)))),
-    ("function", _ => Eq(true, function_equal_test)),
-    (__LOC__, _ => Eq(true, None < Some(1))),
-    (__LOC__, _ => Eq(true, None < Some([1, 30]))),
-    (__LOC__, _ => Eq(true, Some([1, 30]) > None)),
-    (
-      __LOC__,
-      _ => Eq(true, list{2, 6, 1, 1, 2, 1, 4, 2, 1} < list{2, 6, 1, 1, 2, 1, 4, 2, 1, 409}),
-    ),
-    (__LOC__, _ => Eq(true, list{1} < list{1, 409})),
-    (__LOC__, _ => Eq(true, list{} < list{409})),
-    (
-      __LOC__,
-      _ => Eq(true, list{2, 6, 1, 1, 2, 1, 4, 2, 1, 409} > list{2, 6, 1, 1, 2, 1, 4, 2, 1}),
-    ),
-    (__LOC__, _ => Eq(false, None == Some([1, 30]))),
-    (__LOC__, _ => Eq(false, Some([1, 30]) == None)),
-    (
-      __LOC__,
-      _ => Eq(false, list{2, 6, 1, 1, 2, 1, 4, 2, 1} == list{2, 6, 1, 1, 2, 1, 4, 2, 1, 409}),
-    ),
-    (
-      __LOC__,
-      _ => Eq(false, list{2, 6, 1, 1, 2, 1, 4, 2, 1, 409} == list{2, 6, 1, 1, 2, 1, 4, 2, 1}),
-    ),
-    ("cmp_id", _ => Eq(compare({"x": 1, "y": 2}, {"x": 1, "y": 2}), 0)),
-    ("cmp_val", _ => Eq(compare({"x": 1}, {"x": 2}), -1)),
-    ("cmp_val2", _ => Eq(compare({"x": 2}, {"x": 1}), 1)),
-    ("cmp_empty", _ => Eq(compare(%raw("{}"), %raw("{}")), 0)),
-    ("cmp_empty2", _ => Eq(compare(%raw("{}"), %raw("{x:1}")), -1)),
-    ("cmp_swap", _ => Eq(compare({"x": 1, "y": 2}, {"y": 2, "x": 1}), 0)),
-    ("cmp_size", _ => Eq(compare(%raw("{x:1}"), %raw("{x:1, y:2}")), -1)),
-    ("cmp_size2", _ => Eq(compare(%raw("{x:1, y:2}"), %raw("{x:1}")), 1)),
-    ("cmp_order", _ => Eq(compare({"x": 0, "y": 1}, {"x": 1, "y": 0}), -1)),
-    ("cmp_order2", _ => Eq(compare({"x": 1, "y": 0}, {"x": 0, "y": 1}), 1)),
-    ("cmp_in_list", _ => Eq(compare(list{{"x": 1}}, list{{"x": 2}}), -1)),
-    ("cmp_in_list2", _ => Eq(compare(list{{"x": 2}}, list{{"x": 1}}), 1)),
-    ("cmp_with_list", _ => Eq(compare({"x": list{0}}, {"x": list{1}}), -1)),
-    ("cmp_with_list2", _ => Eq(compare({"x": list{1}}, {"x": list{0}}), 1)),
-    ("eq_id", _ => Ok({"x": 1, "y": 2} == {"x": 1, "y": 2})),
-    ("eq_val", _ => Eq({"x": 1} == {"x": 2}, false)),
-    ("eq_val2", _ => Eq({"x": 2} == {"x": 1}, false)),
-    ("eq_empty", _ => Eq(%raw("{}") == %raw("{}"), true)),
-    ("eq_empty2", _ => Eq(%raw("{}") == %raw("{x:1}"), false)),
-    ("eq_swap", _ => Ok({"x": 1, "y": 2} == {"y": 2, "x": 1})),
-    ("eq_size", _ => Eq(%raw("{x:1}") == %raw("{x:1, y:2}"), false)),
-    ("eq_size2", _ => Eq(%raw("{x:1, y:2}") == %raw("{x:1}"), false)),
-    ("eq_in_list", _ => Eq(list{{"x": 1}} == list{{"x": 2}}, false)),
-    ("eq_in_list2", _ => Eq(list{{"x": 2}} == list{{"x": 2}}, true)),
-    ("eq_with_list", _ => Eq({"x": list{0}} == {"x": list{0}}, true)),
-    ("eq_with_list2", _ => Eq({"x": list{0}} == {"x": list{1}}, false)),
-    (
-      "eq_no_prototype",
-      _ => Eq(
-        %raw("{x:1}") == %raw("(function(){let o = Object.create(null);o.x = 1;return o;})()"),
-        true,
-      ),
-    ),
-    (__LOC__, _ => Eq(compare(Js.null, Js.Null.return(list{3})), -1)),
-    (__LOC__, _ => Eq(compare(Js.Null.return(list{3}), Js.null), 1)),
-    (__LOC__, _ => Eq(compare(Js.null, Js.Null.return(0)), -1)),
-    (__LOC__, _ => Eq(compare(Js.Null.return(0), Js.null), 1)),
-    (__LOC__, _ => Eq(compare(Js.Nullable.undefined, Js.Nullable.return(0)), -1)),
-    (__LOC__, _ => Eq(compare(Js.Nullable.return(0), Js.Nullable.undefined), 1)),
-  }
-})
-
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-eq(__LOC__, true, Some(1) > None)
-eq(__LOC__, true, list{} < list{1})
-eq(__LOC__, false, None > Some(1))
-eq(__LOC__, false, None > Some([1, 30]))
-eq(__LOC__, false, Some([1, 30]) < None)
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/caml_format_test.js b/jscomp/test/caml_format_test.js
deleted file mode 100644
index a8672ae..0000000
--- a/jscomp/test/caml_format_test.js
+++ /dev/null
@@ -1,482 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_format = require("../../lib/js/caml_format.js");
-
-var of_string = [
-  [
-    0,
-    "0"
-  ],
-  [
-    3,
-    "03"
-  ],
-  [
-    -3,
-    "-03"
-  ],
-  [
-    -63,
-    "-0x3f"
-  ],
-  [
-    -31,
-    "-0x1f"
-  ],
-  [
-    47,
-    "0X2f"
-  ],
-  [
-    11,
-    "0O13"
-  ],
-  [
-    8,
-    "0o10"
-  ],
-  [
-    3,
-    "0b11"
-  ],
-  [
-    1,
-    "0b01"
-  ],
-  [
-    0,
-    "0b00"
-  ],
-  [
-    -3,
-    "-0b11"
-  ],
-  [
-    -5,
-    "-0B101"
-  ],
-  [
-    332,
-    "0332"
-  ],
-  [
-    -32,
-    "-32"
-  ],
-  [
-    1,
-    "-0xffff_ffff"
-  ],
-  [
-    -1,
-    "0xffff_ffff"
-  ]
-];
-
-function from_float_of_string(xs) {
-  return $$Array.mapi((function (i, param) {
-                return Pervasives.string_of_float;
-              }), xs);
-}
-
-function from_of_string(xs) {
-  return $$Array.to_list($$Array.mapi((function (i, param) {
-                    var b = param[1];
-                    var a = param[0];
-                    return [
-                            "of_string " + String(i),
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: Caml_format.int_of_string(b),
-                                        _1: a
-                                      };
-                              })
-                          ];
-                  }), of_string));
-}
-
-var to_str = Caml_format.int_of_string;
-
-var pairs = [
-  [
-    "FP_infinite",
-    "infinity"
-  ],
-  [
-    "FP_infinite",
-    "+infinity"
-  ],
-  [
-    "FP_infinite",
-    "-infinity"
-  ],
-  [
-    "FP_zero",
-    "0"
-  ],
-  [
-    "FP_zero",
-    "0."
-  ]
-];
-
-var pairs$1 = [
-  [
-    3232,
-    "32_32.0"
-  ],
-  [
-    1.000,
-    "1.000"
-  ],
-  [
-    12.000,
-    "12.000"
-  ]
-];
-
-var suites = Pervasives.$at(from_of_string(of_string), Pervasives.$at({
-          hd: [
-            "isnan_of_string",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: true,
-                        _1: Pervasives.classify_float(Caml_format.float_of_string("nan")) === "FP_nan"
-                      };
-              })
-          ],
-          tl: /* [] */0
-        }, Pervasives.$at($$Array.to_list($$Array.mapi((function (i, param) {
-                        var b = param[1];
-                        var a = param[0];
-                        return [
-                                "infinity_of_string " + String(i),
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: a,
-                                            _1: Pervasives.classify_float(Caml_format.float_of_string(b))
-                                          };
-                                  })
-                              ];
-                      }), pairs)), Pervasives.$at({
-                  hd: [
-                    "throw",
-                    (function (param) {
-                        return {
-                                TAG: "ThrowAny",
-                                _0: (function (param) {
-                                    Caml_format.float_of_string("");
-                                  })
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "format_int",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: "                              33",
-                                  _1: Caml_format.format_int("%32d", 33)
-                                };
-                        })
-                    ],
-                    tl: /* [] */0
-                  }
-                }, $$Array.to_list($$Array.mapi((function (i, param) {
-                            var b = param[1];
-                            var a = param[0];
-                            return [
-                                    "normal_float_of_string " + String(i),
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: a,
-                                                _1: Caml_format.float_of_string(b)
-                                              };
-                                      })
-                                  ];
-                          }), pairs$1))))));
-
-function ff(param) {
-  return Caml_format.format_int("%32d", param);
-}
-
-var float_data = [
-  [
-    "%f",
-    32,
-    "32.000000"
-  ],
-  [
-    "%f",
-    Number.NaN,
-    "nan"
-  ],
-  [
-    "%f",
-    Pervasives.infinity,
-    "inf"
-  ],
-  [
-    "%f",
-    Pervasives.neg_infinity,
-    "-inf"
-  ],
-  [
-    "%1.e",
-    13000,
-    "1e+04"
-  ],
-  [
-    "%1.3e",
-    2.3e-05,
-    "2.300e-05"
-  ],
-  [
-    "%3.10e",
-    3e+56,
-    "3.0000000000e+56"
-  ],
-  [
-    "%3.10f",
-    20000000000,
-    "20000000000.0000000000"
-  ],
-  [
-    "%3.3f",
-    -3300,
-    "-3300.000"
-  ],
-  [
-    "%1.g",
-    13000,
-    "1e+04"
-  ],
-  [
-    "%1.3g",
-    2.3e-05,
-    "2.3e-05"
-  ],
-  [
-    "%3.10g",
-    3e+56,
-    "3e+56"
-  ],
-  [
-    "%3.10g",
-    20000000000,
-    "2e+10"
-  ],
-  [
-    "%3.3g",
-    -3300,
-    "-3.3e+03"
-  ],
-  [
-    "%3.3g",
-    -0.0033,
-    "-0.0033"
-  ],
-  [
-    "%3.10g",
-    30000000000,
-    "3e+10"
-  ],
-  [
-    "%3.0g",
-    30000000000,
-    "3e+10"
-  ],
-  [
-    "%3.g",
-    30000000000,
-    "3e+10"
-  ],
-  [
-    "%3.g",
-    3,
-    "  3"
-  ],
-  [
-    "%1.1g",
-    2.1,
-    "2"
-  ],
-  [
-    "%1.2g",
-    2.1,
-    "2.1"
-  ]
-];
-
-var int64_suites_0 = [
-  "i64_simple7",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: Caml_int64.to_string([
-                    0,
-                    3333
-                  ]),
-              _1: "3333"
-            };
-    })
-];
-
-var int64_suites_1 = {
-  hd: [
-    "i64_simple15",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: Caml_int64.to_string(Caml_int64.neg_one),
-                _1: "-1"
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "i64_simple16",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: Caml_int64.to_string([
-                        -1,
-                        4294956185
-                      ]),
-                  _1: "-11111"
-                };
-        })
-    ],
-    tl: /* [] */0
-  }
-};
-
-var int64_suites = {
-  hd: int64_suites_0,
-  tl: int64_suites_1
-};
-
-var of_string_data = [
-  [
-    Caml_int64.zero,
-    "0"
-  ],
-  [
-    [
-      0,
-      3
-    ],
-    "3"
-  ],
-  [
-    [
-      0,
-      33
-    ],
-    "33"
-  ],
-  [
-    [
-      0,
-      333
-    ],
-    "33_3"
-  ],
-  [
-    [
-      0,
-      33333
-    ],
-    "33_33_3"
-  ],
-  [
-    [
-      77,
-      2620851541
-    ],
-    "333333333333"
-  ],
-  [
-    Caml_int64.neg_one,
-    "0xffff_ffff_ffff_ffff"
-  ],
-  [
-    [
-      0,
-      113
-    ],
-    "0b01110001"
-  ],
-  [
-    Caml_int64.one,
-    "-0xffff_ffff_ffff_ffff"
-  ]
-];
-
-Mt.from_pair_suites("Caml_format_test", Pervasives.$at(suites, Pervasives.$at($$Array.to_list($$Array.mapi((function (i, param) {
-                        var str_result = param[2];
-                        var f = param[1];
-                        var fmt = param[0];
-                        return [
-                                "loat_format " + String(i),
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: Caml_format.format_float(fmt, f),
-                                            _1: str_result
-                                          };
-                                  })
-                              ];
-                      }), float_data)), Pervasives.$at(int64_suites, $$Array.to_list($$Array.mapi((function (i, param) {
-                            var b = param[1];
-                            var a = param[0];
-                            return [
-                                    "int64_of_string " + String(i) + " ",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: Caml_format.int64_of_string(b),
-                                                _1: a
-                                              };
-                                      })
-                                  ];
-                          }), of_string_data))))));
-
-var float_suites = {
-  hd: "float_nan",
-  tl: /* [] */0
-};
-
-var hh = [
-  214748364,
-  3435973836
-];
-
-var hhh = [
-  268435456,
-  0
-];
-
-exports.of_string = of_string;
-exports.from_float_of_string = from_float_of_string;
-exports.from_of_string = from_of_string;
-exports.to_str = to_str;
-exports.suites = suites;
-exports.ff = ff;
-exports.float_data = float_data;
-exports.float_suites = float_suites;
-exports.int64_suites = int64_suites;
-exports.hh = hh;
-exports.hhh = hhh;
-exports.of_string_data = of_string_data;
-/* suites Not a pure module */
diff --git a/jscomp/test/caml_format_test.res b/jscomp/test/caml_format_test.res
deleted file mode 100644
index b69981d..0000000
--- a/jscomp/test/caml_format_test.res
+++ /dev/null
@@ -1,167 +0,0 @@
-@@warning("-107")
-
-let of_string = [
-  (0, "0"),
-  (3, "03"),
-  (-3, "-03"),
-  (-63, "-0x3f"),
-  (-31, "-0x1f"),
-  (47, "0X2f"),
-  (11, "0O13"),
-  (8, "0o10"),
-  (3, "0b11"),
-  (1, "0b01"),
-  (0, "0b00"),
-  (-3, "-0b11"),
-  (-5, "-0B101"),
-  (332, "0332"),
-  (-32, "-32"),
-  (-4294967295, "-0xffff_ffff"),
-  (-1, "0xffff_ffff"),
-]
-
-/* let float_of_string = */
-/* [| "nan", nan ; */
-/* "infinity", infinity; */
-/* "0.", 0. */
-/* |] */
-
-let from_float_of_string = xs => xs |> Array.mapi((i, (a, b)) => string_of_float)
-
-let from_of_string = xs =>
-  of_string
-  |> Array.mapi((i, (a, b)) => (`of_string ${string_of_int(i)}`, _ => Mt.Eq(int_of_string(b), a)))
-  |> Array.to_list
-
-let to_str = s => int_of_string(s)
-
-external format_int: (string, int) => string = "?format_int"
-
-let suites: Mt.pair_suites = \"@"(
-  from_of_string(of_string),
-  \"@"(
-    list{("isnan_of_string", _ => Mt.Eq(true, classify_float(float_of_string("nan")) == FP_nan))},
-    \"@"(
-      {
-        let pairs = [
-          (FP_infinite, "infinity"),
-          (FP_infinite, "+infinity"),
-          (FP_infinite, "-infinity"),
-          (FP_zero, "0"),
-          (FP_zero, "0."),
-        ]
-
-        pairs
-        |> Array.mapi((i, (a, b)) => (
-          `infinity_of_string ${string_of_int(i)}`,
-          _ => Mt.Eq(a, \"@@"(classify_float, float_of_string(b))),
-        ))
-        |> Array.to_list
-      },
-      \"@"(
-        list{
-          ("throw", _ => Mt.ThrowAny(_ => \"@@"(ignore, float_of_string("")))),
-          ("format_int", _ => Mt.Eq("                              33", format_int("%32d", 33))),
-        },
-        {
-          let pairs = [(3232., "32_32.0"), (1.000, "1.000"), (12.000, "12.000")]
-
-          pairs
-          |> Array.mapi((i, (a, b)) => (
-            `normal_float_of_string ${string_of_int(i)}`,
-            _ => Mt.Eq(a, float_of_string(b)),
-          ))
-          |> Array.to_list
-        },
-      ),
-    ),
-  ),
-)
-
-let ff = format_int("%32d")
-
-external format_float: (string, float) => string = "?format_float"
-
-/* ("%3.10f", 3e+56, */
-/* "300000000000000005792779041490073052596128503513888063488.0000000000"); */
-
-let float_data = [
-  ("%f", 32., "32.000000"),
-  ("%f", nan, "nan"),
-  ("%f", infinity, "inf"),
-  ("%f", neg_infinity, "-inf"),
-  ("%1.e", 13000., "1e+04"),
-  ("%1.3e", 2.3e-05, "2.300e-05"),
-  ("%3.10e", 3e+56, "3.0000000000e+56"),
-  ("%3.10f", 20000000000., "20000000000.0000000000"),
-  ("%3.3f", -3300., "-3300.000"),
-  ("%1.g", 13000., "1e+04"),
-  ("%1.3g", 2.3e-05, "2.3e-05"),
-  ("%3.10g", 3e+56, "3e+56"),
-  ("%3.10g", 20000000000., "2e+10"),
-  ("%3.3g", -3300., "-3.3e+03"),
-  ("%3.3g", -0.0033, "-0.0033"),
-  ("%3.10g", 30000000000., "3e+10"),
-  ("%3.0g", 30000000000., "3e+10"),
-  ("%3.g", 30000000000., "3e+10"),
-  ("%3.g", 3., "  3"),
-  ("%1.1g", 2.1, "2"),
-  ("%1.2g", 2.1, "2.1"),
-]
-
-let float_suites = {
-  open Mt
-  list{"float_nan"}
-}
-
-/* module Mt = Mock_mt */
-
-let int64_suites = {
-  open Mt
-  list{
-    ("i64_simple7", _ => Eq(Int64.to_string(3333L), "3333")),
-    ("i64_simple15", _ => Eq(Int64.to_string(-1L), "-1")),
-    ("i64_simple16", _ => Eq(Int64.to_string(-11111L), "-11111")),
-  }
-}
-
-let hh = 922337203685477580L /* 2 ^ 63 / 10 */
-let hhh = 1152921504606846976L
-let of_string_data = [
-  (0L, "0"),
-  (3L, "3"),
-  (33L, "33"),
-  (333L, "33_3"),
-  (33333L, "33_33_3"),
-  (333333333333L, "333333333333"),
-  (-1L, "0xffff_ffff_ffff_ffff"),
-  (113L, "0b01110001"),
-  (1L, "-0xffff_ffff_ffff_ffff"),
-]
-
-/* module Mt = Mock_mt */
-
-let () = \"@@"(
-  Mt.from_pair_suites(__MODULE__),
-  \"@"(
-    suites,
-    \"@"(
-      Array.mapi(
-        (i, (fmt, f, str_result)) => (
-          `loat_format ${string_of_int(i)}`,
-          _ => Mt.Eq(format_float(fmt, f), str_result),
-        ),
-        float_data,
-      ) |> Array.to_list,
-      \"@"(
-        int64_suites,
-        of_string_data
-        |> Array.mapi((i, (a, b)) => (
-          `int64_of_string ${string_of_int(i)} `,
-          _ => Mt.Eq(Int64.of_string(b), a),
-        ))
-        |> Array.to_list,
-      ),
-    ),
-  ),
-)
diff --git a/jscomp/test/chain_code_test.js b/jscomp/test/chain_code_test.js
deleted file mode 100644
index 50de370..0000000
--- a/jscomp/test/chain_code_test.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(h) {
-  return h.x.y.z;
-}
-
-function f2(h) {
-  return h.x.y.z;
-}
-
-function f3(h, x, y) {
-  return Curry._2(Curry._2(h.paint, x, y).draw, x, y);
-}
-
-function f4(h, x, y) {
-  h.paint = [
-    x,
-    y
-  ];
-  h.paint.draw = [
-    x,
-    y
-  ];
-}
-
-eq("File \"chain_code_test.res\", line 24, characters 12-19", 32, ({
-        x: {
-          y: {
-            z: 32
-          }
-        }
-      }).x.y.z);
-
-Mt.from_pair_suites("Chain_code_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-/*  Not a pure module */
diff --git a/jscomp/test/chain_code_test.res b/jscomp/test/chain_code_test.res
deleted file mode 100644
index cc02b68..0000000
--- a/jscomp/test/chain_code_test.res
+++ /dev/null
@@ -1,26 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let f = h => h["x"]["y"]["z"]
-
-let f2 = h => h["x"]["y"]["z"]
-
-let f3 = (h, x, y) => h["paint"](x, y)["draw"](x, y)
-
-let f4 = (h, x, y) => {
-  h["paint"] = (x, y)
-  h["paint"]["draw"] = (x, y)
-}
-
-/* let g h = */
-/* h##(draw (x,y)) */
-/* ##(draw (x,y)) */
-/* ##(draw(x,y)) */
-let () = eq(__LOC__, 32, f2({"x": {"y": {"z": 32}}}))
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/chn_test.js b/jscomp/test/chn_test.js
deleted file mode 100644
index d8d882f..0000000
--- a/jscomp/test/chn_test.js
+++ /dev/null
@@ -1,276 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-console.log("你好，\n世界");
-
-console.log("\x3f\u003f\b\t\n\v\f\r\0\"'");
-
-function convert(s) {
-  return $$Array.to_list(Array.from(s, (function (x) {
-                    var x$1 = x.codePointAt(0);
-                    if (x$1 !== undefined) {
-                      return x$1;
-                    }
-                    throw {
-                          RE_EXN_ID: "Assert_failure",
-                          _1: [
-                            "chn_test.res",
-                            17,
-                            14
-                          ],
-                          Error: new Error()
-                        };
-                  })));
-}
-
-eq("File \"chn_test.res\", line 24, characters 4-11", "你好，\n世界", "你好，\n世界");
-
-eq("File \"chn_test.res\", line 30, characters 4-11", convert("汉字是世界上最美丽的character"), {
-      hd: 27721,
-      tl: {
-        hd: 23383,
-        tl: {
-          hd: 26159,
-          tl: {
-            hd: 19990,
-            tl: {
-              hd: 30028,
-              tl: {
-                hd: 19978,
-                tl: {
-                  hd: 26368,
-                  tl: {
-                    hd: 32654,
-                    tl: {
-                      hd: 20029,
-                      tl: {
-                        hd: 30340,
-                        tl: {
-                          hd: 99,
-                          tl: {
-                            hd: 104,
-                            tl: {
-                              hd: 97,
-                              tl: {
-                                hd: 114,
-                                tl: {
-                                  hd: 97,
-                                  tl: {
-                                    hd: 99,
-                                    tl: {
-                                      hd: 116,
-                                      tl: {
-                                        hd: 101,
-                                        tl: {
-                                          hd: 114,
-                                          tl: /* [] */0
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    });
-
-eq("File \"chn_test.res\", line 54, characters 5-12", convert("\x3f\x3fa"), {
-      hd: 63,
-      tl: {
-        hd: 63,
-        tl: {
-          hd: 97,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("File \"chn_test.res\", line 55, characters 5-12", convert("??a"), {
-      hd: 63,
-      tl: {
-        hd: 63,
-        tl: {
-          hd: 97,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("File \"chn_test.res\", line 56, characters 5-12", convert("\u003f\x3fa"), {
-      hd: 63,
-      tl: {
-        hd: 63,
-        tl: {
-          hd: 97,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("File \"chn_test.res\", line 57, characters 5-12", convert("🚀🚀a"), {
-      hd: 128640,
-      tl: {
-        hd: 128640,
-        tl: {
-          hd: 97,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("File \"chn_test.res\", line 58, characters 5-12", convert("\uD83D\uDE80a"), {
-      hd: 128640,
-      tl: {
-        hd: 97,
-        tl: /* [] */0
-      }
-    });
-
-eq("File \"chn_test.res\", line 59, characters 5-12", convert("\uD83D\uDE80\x3f"), {
-      hd: 128640,
-      tl: {
-        hd: 63,
-        tl: /* [] */0
-      }
-    });
-
-eq("File \"chn_test.res\", line 63, characters 5-12", convert("\uD83D\uDE80\uD83D\uDE80a"), {
-      hd: 128640,
-      tl: {
-        hd: 128640,
-        tl: {
-          hd: 97,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("No inline string length", "\uD83D\uDE80\0".length, 3);
-
-eq("File \"chn_test.res\", line 70, characters 4-11", Caml_string.get("\uD83D\uDE80\0", 0), 128640);
-
-eq("File \"chn_test.res\", line 75, characters 5-12", Caml_string.get("🚀", 0), 128640);
-
-eq("File \"chn_test.res\", line 80, characters 5-12", convert("\uD83D\uDE80"), {
-      hd: 128640,
-      tl: /* [] */0
-    });
-
-eq("File \"chn_test.res\", line 81, characters 5-12", convert("\uD83D\uDE80\uD83D\uDE80"), {
-      hd: 128640,
-      tl: {
-        hd: 128640,
-        tl: /* [] */0
-      }
-    });
-
-eq("File \"chn_test.res\", line 82, characters 5-12", convert(" \b\t\n\v\f\ra"), {
-      hd: 32,
-      tl: {
-        hd: 8,
-        tl: {
-          hd: 9,
-          tl: {
-            hd: 10,
-            tl: {
-              hd: 11,
-              tl: {
-                hd: 12,
-                tl: {
-                  hd: 13,
-                  tl: {
-                    hd: 97,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    });
-
-eq("File \"chn_test.res\", line 89, characters 4-11", convert(" \b\t\n\v\f\r\"'\\\0a"), {
-      hd: 32,
-      tl: {
-        hd: 8,
-        tl: {
-          hd: 9,
-          tl: {
-            hd: 10,
-            tl: {
-              hd: 11,
-              tl: {
-                hd: 12,
-                tl: {
-                  hd: 13,
-                  tl: {
-                    hd: 34,
-                    tl: {
-                      hd: 39,
-                      tl: {
-                        hd: 92,
-                        tl: {
-                          hd: 0,
-                          tl: {
-                            hd: 97,
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    });
-
-Mt.from_pair_suites("Chn_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.convert = convert;
-/*  Not a pure module */
diff --git a/jscomp/test/chn_test.res b/jscomp/test/chn_test.res
deleted file mode 100644
index 65dc566..0000000
--- a/jscomp/test/chn_test.res
+++ /dev/null
@@ -1,94 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-Js.log(`你好，
-世界`)
-
-Js.log(`\x3f\u003f\b\t\n\v\f\r\0"'`)
-
-let convert = (s: string): list<int> =>
-  Js_array2.fromMap(Js_string.castToArrayLike(s), x =>
-    switch Js_string2.codePointAt(x, 0) {
-    | None => assert(false)
-    | Some(x) => x
-    }
-  ) |> Array.to_list
-
-let () = {
-  eq(
-    __LOC__,
-    `你好，
-世界`,
-    `你好，\n世界`,
-  )
-  eq(
-    __LOC__,
-    convert(`汉字是世界上最美丽的character`),
-    list{
-      27721,
-      23383,
-      26159,
-      19990,
-      30028,
-      19978,
-      26368,
-      32654,
-      20029,
-      30340,
-      99,
-      104,
-      97,
-      114,
-      97,
-      99,
-      116,
-      101,
-      114,
-    },
-  )
-  eq(__LOC__, convert(`\x3f\x3fa`), list{63, 63, 97})
-  eq(__LOC__, convert(`??a`), list{63, 63, 97})
-  eq(__LOC__, convert(`\u003f\x3fa`), list{63, 63, 97})
-  eq(__LOC__, convert(`🚀🚀a`), list{128640, 128640, 97})
-  eq(__LOC__, convert(`\uD83D\uDE80a`), list{128640, 97})
-  eq(__LOC__, convert(`\uD83D\uDE80\x3f`), list{128640, 63})
-
-  /* It is amazing Array.from(string)
-   is unicode safe */
-  eq(__LOC__, convert(`\uD83D\uDE80\uD83D\uDE80a`), list{128640, 128640, 97})
-
-  eq("No inline string length", String.length(`\uD83D\uDE80\0`), 3)
-
-  /* eq __LOC__
-   (Js.String.codePointAt 0 {js|\uD83D\uDE80\0|js} ) 128640; */
-  eq(
-    __LOC__,
-    (String.get(`\uD83D\uDE80\0`, 0) :> int),
-    /* TODO: Char.code need normalization? */
-    128640,
-  )
-  eq(__LOC__, (String.get(`🚀`, 0) :> int), 128640)
-
-  /* "\uD83D\uDE80".charCodeAt(0) & 255
-   61 */
-
-  eq(__LOC__, convert(`\uD83D\uDE80`), list{128640})
-  eq(__LOC__, convert(`\uD83D\uDE80\uD83D\uDE80`), list{128640, 128640})
-  eq(__LOC__, convert(` \b\t\n\v\f\ra`), list{32, 8, 9, 10, 11, 12, 13, 97})
-  /* we don't need escape string double quote {|"|}and single quote{|'|}
-    however when we print it, we need escape them
-    there is no need for line continuation,
-
- */
-  eq(
-    __LOC__,
-    convert(` \b\t\n\v\f\r"'\\\0a`),
-    list{32, 8, 9, 10, 11, 12, 13, 34, 39, 92, 0, 97},
-  )
-}
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/class_type_ffi_test.js b/jscomp/test/class_type_ffi_test.js
deleted file mode 100644
index 98bacc3..0000000
--- a/jscomp/test/class_type_ffi_test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function test_set(x) {
-  x.length__aux = 3;
-}
-
-function ff(fn, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) {
-  return fn(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
-}
-
-function ff2(fn, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) {
-  return fn(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);
-}
-
-function off2(o, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) {
-  return Curry.app(o.huge_method, [
-              a0,
-              a1,
-              a2,
-              a3,
-              a4,
-              a5,
-              a6,
-              a7,
-              a8,
-              a9,
-              a10,
-              a11,
-              a12
-            ]);
-}
-
-function mk_f(param) {
-  return function (a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) {
-    return Curry.app(a0, [
-                a1,
-                a2,
-                a3,
-                a4,
-                a5,
-                a6,
-                a7,
-                a8,
-                a9,
-                a10,
-                a11,
-                a12
-              ]);
-  };
-}
-
-exports.test_set = test_set;
-exports.ff = ff;
-exports.ff2 = ff2;
-exports.off2 = off2;
-exports.mk_f = mk_f;
-/* No side effect */
diff --git a/jscomp/test/class_type_ffi_test.res b/jscomp/test/class_type_ffi_test.res
deleted file mode 100644
index 0147da4..0000000
--- a/jscomp/test/class_type_ffi_test.res
+++ /dev/null
@@ -1,35 +0,0 @@
-/* TODO: create a special type 
-   ['a Js.prop_set] for better error message
-*/
-let test_set = x => x["length__aux"] = 3
-
-/* This type is generated on the fly -- in which case
-  it can not be nominal
-*/
-let ff = (
-  fn: (. 'a0, 'a1, 'a2, 'a3, 'a4, 'a5, 'a6, 'a7, 'a8, 'a9, 'a10, 'a11) => 'a12,
-  a0,
-  a1,
-  a2,
-  a3,
-  a4,
-  a5,
-  a6,
-  a7,
-  a8,
-  a9,
-  a10,
-  a11,
-) => fn(. a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11)
-
-let ff2 = (fn, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) =>
-  fn(. a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12)
-
-/* Test [fn_run_method] */
-let off2 = (o, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) =>
-  o["huge_method"](a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12)
-
-/* Test [fn_mk] */
-let mk_f = () =>
-  (. a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) =>
-    a0(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12)
diff --git a/jscomp/test/coercion_module_alias_test.js b/jscomp/test/coercion_module_alias_test.js
deleted file mode 100644
index 1800a18..0000000
--- a/jscomp/test/coercion_module_alias_test.js
+++ /dev/null
@@ -1,215 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Char = require("../../lib/js/char.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-
-function l(prim) {
-  console.log(prim);
-}
-
-var C$p = Char;
-
-var prim = Char.chr(66);
-
-console.log(prim);
-
-var prim$1 = Char.chr(66);
-
-console.log(prim$1);
-
-var C3 = Char;
-
-var prim$2 = Char.chr(66);
-
-console.log(prim$2);
-
-var f = List.length;
-
-function g(x) {
-  return List.length(List.map((function (prim) {
-                    return prim + 1 | 0;
-                  }), x));
-}
-
-function F(X) {
-  return Char;
-}
-
-var C4 = Char;
-
-var prim$3 = Char.chr(66);
-
-console.log(prim$3);
-
-function G(X) {
-  return X;
-}
-
-var M = {};
-
-var N = {
-  x: 1
-};
-
-var N$p;
-
-var M$p = {
-  N: N,
-  N$p: N$p
-};
-
-console.log(1);
-
-var M$p$p = {
-  N$p: N
-};
-
-console.log(M$p$p.N$p.x);
-
-var M2 = {
-  N: N,
-  N$p: N$p
-};
-
-var M3 = {
-  N$p: N
-};
-
-console.log(1);
-
-var M3$p = {
-  N$p: N
-};
-
-console.log(M3$p.N$p.x);
-
-var N$1 = {
-  x: 1
-};
-
-var M4 = {
-  N$p: N$1
-};
-
-console.log(1);
-
-function F0(X) {
-  var N = {
-    x: 1
-  };
-  return {
-          N: N,
-          N$p: undefined
-        };
-}
-
-var N$2 = {
-  x: 1
-};
-
-var M5 = {
-  N$p: N$2
-};
-
-console.log(M5.N$p.x);
-
-var D = {
-  y: 3
-};
-
-var N$3 = {
-  x: 1
-};
-
-var N$p$1;
-
-var M6 = {
-  D: D,
-  N: N$3,
-  N$p: N$p$1
-};
-
-console.log(1);
-
-var M7 = {
-  N$p: N$3
-};
-
-console.log(M7.N$p.x);
-
-console.log(1);
-
-var C$p$1;
-
-var M8 = {
-  C: undefined,
-  C$p: C$p$1
-};
-
-var M9 = {
-  C: Char,
-  C$p: C$p$1
-};
-
-var prim$4 = Curry._1(Char.chr, 66);
-
-console.log(prim$4);
-
-var M10 = {
-  C$p: Char
-};
-
-var prim$5 = Curry._1(M10.C$p.chr, 66);
-
-console.log(prim$5);
-
-var C;
-
-var C$p$p$p = C$p;
-
-var C$p$p = Char;
-
-function G0(funarg) {
-  var N = {
-    x: 1
-  };
-  return {
-          N$p: N
-        };
-}
-
-var M1 = {
-  N: N$3,
-  N$p: N$p$1
-};
-
-exports.l = l;
-exports.C = C;
-exports.C$p = C$p;
-exports.C$p$p$p = C$p$p$p;
-exports.C$p$p = C$p$p;
-exports.C3 = C3;
-exports.f = f;
-exports.g = g;
-exports.F = F;
-exports.C4 = C4;
-exports.G = G;
-exports.M = M;
-exports.M$p = M$p;
-exports.M$p$p = M$p$p;
-exports.M2 = M2;
-exports.M3 = M3;
-exports.M3$p = M3$p;
-exports.M4 = M4;
-exports.F0 = F0;
-exports.G0 = G0;
-exports.M5 = M5;
-exports.M6 = M6;
-exports.M1 = M1;
-exports.M7 = M7;
-exports.M8 = M8;
-exports.M9 = M9;
-exports.M10 = M10;
-/* prim Not a pure module */
diff --git a/jscomp/test/coercion_module_alias_test.res b/jscomp/test/coercion_module_alias_test.res
deleted file mode 100644
index e835608..0000000
--- a/jscomp/test/coercion_module_alias_test.res
+++ /dev/null
@@ -1,147 +0,0 @@
-let l = Js.log
-module C = Char
-
-module C': module type of Char = C
-\"@@"(l, C'.chr(66))
-
-module C''': module type of C = C' /* fails */
-
-module C'': module type of Char = C
-\"@@"(l, C''.chr(66))
-
-module C3 = {
-  include Char
-}
-\"@@"(l, C3.chr(66))
-
-let f = x => {
-  module M = {
-    module L = List
-  }
-  M.L.length(x)
-}
-let g = x => {
-  module L = List
-  L.length(L.map(succ, x))
-}
-
-module F = (X: {}) => Char
-module C4 = F()
-\"@@"(l, C4.chr(66))
-
-module G = (X: {}) => X /* does not alias X */
-module M = G()
-
-module M' = {
-  module N = {
-    let x = 1
-  }
-  module N' = N
-}
-\"@@"(l, M'.N'.x)
-
-module M'': {
-  module N': {
-    let x: int
-  }
-} = M'
-\"@@"(l, M''.N'.x)
-module M2 = {
-  include M'
-}
-module M3: {
-  module N': {
-    let x: int
-  }
-} = {
-  include M'
-}
-\"@@"(l, M3.N'.x)
-module M3': {
-  module N': {
-    let x: int
-  }
-} = M2
-\"@@"(l, M3'.N'.x)
-
-module M4: {
-  module N': {
-    let x: int
-  }
-} = {
-  module N = {
-    let x = 1
-  }
-  module N' = N
-}
-\"@@"(l, M4.N'.x)
-
-module F0 = (X: {}) => {
-  module N = {
-    let x = 1
-  }
-  module N' = N
-}
-module G0: (X: {}) =>
-{
-  module N': {
-    let x: int
-  }
-} = F0
-module M5 = G0()
-\"@@"(l, M5.N'.x)
-
-module M6 = {
-  module D = {
-    let y = 3
-  }
-  module N = {
-    let x = 1
-  }
-  module N' = N
-}
-
-module M1: {
-  module N: {
-    let x: int
-  }
-  module N' = N
-} = M6
-\"@@"(l, M1.N'.x)
-module M7: {
-  module N': {
-    let x: int
-  }
-} = (M6: {
-  module N: {
-    let x: int
-  }
-  module N' = N
-})
-\"@@"(l, M7.N'.x)
-
-open M6
-\"@@"(l, N'.x)
-
-module M8 = {
-  module C = Char
-  module C' = C
-}
-module M9: {
-  module C: {
-    let chr: int => char
-  }
-  module C' = C
-} = M8
-\"@@"(l, M9.C'.chr(66))
-module M10: {
-  module C': {
-    let chr: int => char
-  }
-} = (M8: {
-  module C: {
-    let chr: int => char
-  }
-  module C' = C
-})
-\"@@"(l, M10.C'.chr(66))
diff --git a/jscomp/test/compare_test.js b/jscomp/test/compare_test.js
deleted file mode 100644
index 723dc38..0000000
--- a/jscomp/test/compare_test.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function compare(x, y) {
-  switch (x) {
-    case "A" :
-        return y === "A";
-    case "B" :
-        return y === "B";
-    case "C" :
-        return y === "C";
-    
-  }
-}
-
-function compare2(x, y) {
-  switch (x) {
-    case "A" :
-        switch (y) {
-          case "A" :
-              return true;
-          case "B" :
-          case "C" :
-              return false;
-          
-        }
-    case "B" :
-        switch (y) {
-          case "B" :
-              return true;
-          case "A" :
-          case "C" :
-              return false;
-          
-        }
-    case "C" :
-        switch (y) {
-          case "A" :
-          case "B" :
-              return false;
-          case "C" :
-              return true;
-          
-        }
-    
-  }
-}
-
-function compare3(x, y) {
-  return x === y;
-}
-
-exports.compare = compare;
-exports.compare2 = compare2;
-exports.compare3 = compare3;
-/* No side effect */
diff --git a/jscomp/test/compare_test.res b/jscomp/test/compare_test.res
deleted file mode 100644
index 0a77aa8..0000000
--- a/jscomp/test/compare_test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-type t =
-  | A
-  | B
-  | C
-
-let compare = (x: t, y: t) =>
-  switch x {
-  | A => y == A
-  | B => y == B
-  | C => y == C
-  }
-
-/* There is a downside in this way of writing
-    if I comment [C,C] there will be no warning
-*/
-let compare2 = (x: t, y: t) =>
-  switch (x, y) {
-  | (A, A)
-  | (B, B)
-  | (C, C) => true
-  | (A | B | C, _) => false
-  }
-
-let compare3 = (x: t, y: t) => x == y
diff --git a/jscomp/test/complete_parmatch_test.js b/jscomp/test/complete_parmatch_test.js
deleted file mode 100644
index 1801659..0000000
--- a/jscomp/test/complete_parmatch_test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  switch (x) {
-    case 1 :
-        return /* 'a' */97;
-    case 2 :
-        return /* 'b' */98;
-    case 3 :
-        return /* 'c' */99;
-    default:
-      return /* 'x' */120;
-  }
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/complete_parmatch_test.res b/jscomp/test/complete_parmatch_test.res
deleted file mode 100644
index 5da1f73..0000000
--- a/jscomp/test/complete_parmatch_test.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let f = x =>
-  switch x {
-  | 1 => 'a'
-  | 2 => 'b'
-  | 3 => 'c'
-  | _ => 'x'
-  }
diff --git a/jscomp/test/complex_if_test.js b/jscomp/test/complex_if_test.js
deleted file mode 100644
index fe311b7..0000000
--- a/jscomp/test/complex_if_test.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Bytes = require("../../lib/js/bytes.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-
-function fib(x) {
-  if (x !== 1 && x !== 23) {
-    return fib(x - 1 | 0) + fib(x - 2 | 0) | 0;
-  } else {
-    return 11111123;
-  }
-}
-
-function escaped(s) {
-  var n = 0;
-  for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){
-    var match = s[i];
-    n = n + (
-      match >= 32 ? (
-          match > 92 || match < 34 ? (
-              match >= 127 ? 4 : 1
-            ) : (
-              match > 91 || match < 35 ? 2 : 1
-            )
-        ) : (
-          match >= 11 ? (
-              match !== 13 ? 4 : 2
-            ) : (
-              match >= 8 ? 2 : 4
-            )
-        )
-    ) | 0;
-  }
-  if (n === s.length) {
-    return Bytes.copy(s);
-  }
-  var s$p = Caml_bytes.create(n);
-  n = 0;
-  for(var i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){
-    var c = s[i$1];
-    var exit = 0;
-    if (c >= 35) {
-      if (c !== 92) {
-        if (c >= 127) {
-          exit = 1;
-        } else {
-          s$p[n] = c;
-        }
-      } else {
-        exit = 2;
-      }
-    } else if (c >= 32) {
-      if (c >= 34) {
-        exit = 2;
-      } else {
-        s$p[n] = c;
-      }
-    } else if (c >= 14) {
-      exit = 1;
-    } else {
-      switch (c) {
-        case 8 :
-            s$p[n] = /* '\\' */92;
-            n = n + 1 | 0;
-            s$p[n] = /* 'b' */98;
-            break;
-        case 9 :
-            s$p[n] = /* '\\' */92;
-            n = n + 1 | 0;
-            s$p[n] = /* 't' */116;
-            break;
-        case 10 :
-            s$p[n] = /* '\\' */92;
-            n = n + 1 | 0;
-            s$p[n] = /* 'n' */110;
-            break;
-        case 0 :
-        case 1 :
-        case 2 :
-        case 3 :
-        case 4 :
-        case 5 :
-        case 6 :
-        case 7 :
-        case 11 :
-        case 12 :
-            exit = 1;
-            break;
-        case 13 :
-            s$p[n] = /* '\\' */92;
-            n = n + 1 | 0;
-            s$p[n] = /* 'r' */114;
-            break;
-        
-      }
-    }
-    switch (exit) {
-      case 1 :
-          s$p[n] = /* '\\' */92;
-          n = n + 1 | 0;
-          s$p[n] = 48 + (c / 100 | 0) | 0;
-          n = n + 1 | 0;
-          s$p[n] = 48 + (c / 10 | 0) % 10 | 0;
-          n = n + 1 | 0;
-          s$p[n] = 48 + c % 10 | 0;
-          break;
-      case 2 :
-          s$p[n] = /* '\\' */92;
-          n = n + 1 | 0;
-          s$p[n] = c;
-          break;
-      
-    }
-    n = n + 1 | 0;
-  }
-  return s$p;
-}
-
-function string_escaped(s) {
-  return Bytes.to_string(escaped(Bytes.of_string(s)));
-}
-
-var suites_0 = [
-  "complete_escape",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: Bytes.to_string(escaped(Bytes.of_string("\x00\x01\x02\x03\x04\x05\x06\x07\b\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"))),
-              _1: "\\000\\001\\002\\003\\004\\005\\006\\007\\b\\t\\n\\011\\012\\r\\014\\015\\016\\017\\018\\019\\020\\021\\022\\023\\024\\025\\026\\027\\028\\029\\030\\031 !\\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\\127\\128\\129\\130\\131\\132\\133\\134\\135\\136\\137\\138\\139\\140\\141\\142\\143\\144\\145\\146\\147\\148\\149\\150\\151\\152\\153\\154\\155\\156\\157\\158\\159\\160\\161\\162\\163\\164\\165\\166\\167\\168\\169\\170\\171\\172\\173\\174\\175\\176\\177\\178\\179\\180\\181\\182\\183\\184\\185\\186\\187\\188\\189\\190\\191\\192\\193\\194\\195\\196\\197\\198\\199\\200\\201\\202\\203\\204\\205\\206\\207\\208\\209\\210\\211\\212\\213\\214\\215\\216\\217\\218\\219\\220\\221\\222\\223\\224\\225\\226\\227\\228\\229\\230\\231\\232\\233\\234\\235\\236\\237\\238\\239\\240\\241\\242\\243\\244\\245\\246\\247\\248\\249\\250\\251\\252\\253\\254\\255"
-            };
-    })
-];
-
-var suites = {
-  hd: suites_0,
-  tl: /* [] */0
-};
-
-Mt.from_pair_suites("Complex_if_test", suites);
-
-exports.fib = fib;
-exports.escaped = escaped;
-exports.string_escaped = string_escaped;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/complex_if_test.res b/jscomp/test/complex_if_test.res
deleted file mode 100644
index 2578ee1..0000000
--- a/jscomp/test/complex_if_test.res
+++ /dev/null
@@ -1,82 +0,0 @@
-let rec fib = x =>
-  switch x {
-  | 1 | 23 => 11111123
-  | n => fib(n - 1) + fib(n - 2)
-  }
-
-open Bytes
-external char_code: char => int = "%identity"
-external char_chr: int => char = "%identity"
-
-let escaped = s => {
-  let n = ref(0)
-  for i in 0 to length(s) - 1 {
-    n :=
-      n.contents +
-      switch unsafe_get(s, i) {
-      | '"' | '\\' | '\n' | '\t' | '\r' | '\b' => 2
-      | ' ' .. '~' => 1
-      | _ => 4
-      }
-  }
-  if n.contents == length(s) {
-    copy(s)
-  } else {
-    let s' = create(n.contents)
-    n := 0
-    for i in 0 to length(s) - 1 {
-      switch unsafe_get(s, i) {
-      | ('"' | '\\') as c =>
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, c)
-      | '\n' =>
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, 'n')
-      | '\t' =>
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, 't')
-      | '\r' =>
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, 'r')
-      | '\b' =>
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, 'b')
-      | ' ' .. '~' as c => unsafe_set(s', n.contents, c)
-      | c =>
-        let a = char_code(c)
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, char_chr(48 + a / 100))
-        incr(n)
-        unsafe_set(s', n.contents, char_chr(48 + mod(a / 10, 10)))
-        incr(n)
-        unsafe_set(s', n.contents, char_chr(48 + mod(a, 10)))
-      }
-      incr(n)
-    }
-    s'
-  }
-}
-let string_escaped = s => Bytes.to_string(escaped(Bytes.of_string(s)))
-
-/* let s = (let v = ref "" in for i = 0 to 255 do v := !v ^ (String.make 1 (Char.chr i)) done ; !v);; */
-let suites = {
-  open Mt
-  list{
-    (
-      "complete_escape",
-      _ => Eq(
-        string_escaped(
-          "\000\001\002\003\004\005\006\007\b\t\n\011\012\r\014\015\016\017\018\019\020\021\022\023\024\025\026\027\028\029\030\031 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\127\128\129\130\131\132\133\134\135\136\137\138\139\140\141\142\143\144\145\146\147\148\149\150\151\152\153\154\155\156\157\158\159\160\161\162\163\164\165\166\167\168\169\170\171\172\173\174\175\176\177\178\179\180\181\182\183\184\185\186\187\188\189\190\191\192\193\194\195\196\197\198\199\200\201\202\203\204\205\206\207\208\209\210\211\212\213\214\215\216\217\218\219\220\221\222\223\224\225\226\227\228\229\230\231\232\233\234\235\236\237\238\239\240\241\242\243\244\245\246\247\248\249\250\251\252\253\254\255",
-        ),
-        "\\000\\001\\002\\003\\004\\005\\006\\007\\b\\t\\n\\011\\012\\r\\014\\015\\016\\017\\018\\019\\020\\021\\022\\023\\024\\025\\026\\027\\028\\029\\030\\031 !\\\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\\127\\128\\129\\130\\131\\132\\133\\134\\135\\136\\137\\138\\139\\140\\141\\142\\143\\144\\145\\146\\147\\148\\149\\150\\151\\152\\153\\154\\155\\156\\157\\158\\159\\160\\161\\162\\163\\164\\165\\166\\167\\168\\169\\170\\171\\172\\173\\174\\175\\176\\177\\178\\179\\180\\181\\182\\183\\184\\185\\186\\187\\188\\189\\190\\191\\192\\193\\194\\195\\196\\197\\198\\199\\200\\201\\202\\203\\204\\205\\206\\207\\208\\209\\210\\211\\212\\213\\214\\215\\216\\217\\218\\219\\220\\221\\222\\223\\224\\225\\226\\227\\228\\229\\230\\231\\232\\233\\234\\235\\236\\237\\238\\239\\240\\241\\242\\243\\244\\245\\246\\247\\248\\249\\250\\251\\252\\253\\254\\255",
-      ),
-    ),
-  }
-}
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/complex_test.js b/jscomp/test/complex_test.js
deleted file mode 100644
index afe33e8..0000000
--- a/jscomp/test/complex_test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Complex = require("../../lib/js/complex.js");
-
-var suites_0 = [
-  "basic_add",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: {
-                re: 2,
-                im: 2
-              },
-              _1: Complex.add(Complex.add(Complex.add(Complex.one, Complex.one), Complex.i), Complex.i)
-            };
-    })
-];
-
-var suites = {
-  hd: suites_0,
-  tl: /* [] */0
-};
-
-Mt.from_pair_suites("Complex_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/complex_test.res b/jscomp/test/complex_test.res
deleted file mode 100644
index ab34efa..0000000
--- a/jscomp/test/complex_test.res
+++ /dev/null
@@ -1,8 +0,0 @@
-open Complex
-
-let suites = {
-  open Mt
-  list{("basic_add", _ => Eq({re: 2., im: 2.}, add(add(add(one, one), i), i)))}
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/complex_while_loop.js b/jscomp/test/complex_while_loop.js
deleted file mode 100644
index 6c78cb2..0000000
--- a/jscomp/test/complex_while_loop.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(param) {
-  var n = 0;
-  while((function () {
-          var fib = function (x) {
-            if (x === 0 || x === 1) {
-              return 1;
-            } else {
-              return fib(x - 1 | 0) + fib(x - 2 | 0) | 0;
-            }
-          };
-          return fib(n) > 10;
-        })()) {
-    console.log(String(n));
-    n = n + 1 | 0;
-  };
-}
-
-function ff(param) {
-  while((function () {
-          var b = 9;
-          return (3 + b | 0) > 10;
-        })()) {
-    
-  };
-}
-
-exports.f = f;
-exports.ff = ff;
-/* No side effect */
diff --git a/jscomp/test/complex_while_loop.res b/jscomp/test/complex_while_loop.res
deleted file mode 100644
index eb6cf4d..0000000
--- a/jscomp/test/complex_while_loop.res
+++ /dev/null
@@ -1,23 +0,0 @@
-let f = () => {
-  let n = ref(0)
-  while {
-    let rec fib = x =>
-      switch x {
-      | 0 | 1 => 1
-      | n => fib(n - 1) + fib(n - 2)
-      }
-    fib(n.contents) > 10
-  } {
-    print_endline(string_of_int(n.contents))
-    incr(n)
-  }
-}
-
-let ff = () =>
-  while {
-    let a = 3
-    let b = a * a
-    a + b > 10
-  } {
-    ()
-  }
diff --git a/jscomp/test/condition_compilation_test.js b/jscomp/test/condition_compilation_test.js
deleted file mode 100644
index 3bc735b..0000000
--- a/jscomp/test/condition_compilation_test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var v = {
-  contents: 1
-};
-
-v.contents = v.contents + 1 | 0;
-
-var a = v.contents;
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"condition_compilation_test.res\", line 60, characters 5-12", 3, 3);
-
-eq("File \"condition_compilation_test.res\", line 61, characters 5-12", v.contents, 2);
-
-Mt.from_pair_suites("Condition_compilation_test", suites.contents);
-
-var b = "u";
-
-var buffer_size = 1;
-
-var vv = 3;
-
-var version_gt_3 = true;
-
-var version = -1;
-
-var ocaml_veriosn = "unknown";
-
-exports.b = b;
-exports.buffer_size = buffer_size;
-exports.vv = vv;
-exports.v = v;
-exports.a = a;
-exports.version_gt_3 = version_gt_3;
-exports.version = version;
-exports.ocaml_veriosn = ocaml_veriosn;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/condition_compilation_test.res b/jscomp/test/condition_compilation_test.res
deleted file mode 100644
index c988eba..0000000
--- a/jscomp/test/condition_compilation_test.res
+++ /dev/null
@@ -1,64 +0,0 @@
-let b = "u"
-
-let buffer_size = 1
-
-type open_flag =
-  | O_RDONLY
-  | O_WRONLY
-  | O_RDWR
-  | O_NONBLOCK
-  | O_APPEND
-  | O_CREAT
-  | O_TRUNC
-  | O_EXCL
-  | O_NOCTTY
-  | O_DSYNC
-  | O_SYNC
-  | O_RSYNC
-
-  | O_SHARE_DELETE
-
-  | O_CLOEXEC
-
-  | O_KEEPEXEC
-
-let vv = 3
-
-let v = ref(1)
-
-let a = {
-  let () = incr(v)
-  v.contents
-}
-
-let version_gt_3 = /* comment */
-true
-
-let version = -1
-
-let ocaml_veriosn = "unknown"
-
-/* #if OCAML_VERSION =~ ">4.02" #then */
-/* #else */
-/* #end */
-/**
-   #if OCAML_VERSION =~ \"4.02.3\" #then
-
-   #elif OCAML_VERSION =~ \"4.03\" #then
-   gsho
-   #end
-*/
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let () = {
-  eq(__LOC__, vv, 3)
-  eq(__LOC__, v.contents, 2)
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/conditional/a.res b/jscomp/test/conditional/a.res
deleted file mode 100644
index c2f270f..0000000
--- a/jscomp/test/conditional/a.res
+++ /dev/null
@@ -1 +0,0 @@
-let u = assert(false)
diff --git a/jscomp/test/conditional/a_B.res b/jscomp/test/conditional/a_B.res
deleted file mode 100644
index e4d235f..0000000
--- a/jscomp/test/conditional/a_B.res
+++ /dev/null
@@ -1,6 +0,0 @@
-module B = {
-  let value = 3
-}
-module A = {
-  let u = B.value
-}
diff --git a/jscomp/test/conditional/a_C.res b/jscomp/test/conditional/a_C.res
deleted file mode 100644
index fe61d48..0000000
--- a/jscomp/test/conditional/a_C.res
+++ /dev/null
@@ -1,6 +0,0 @@
-module C = {
-  let value = 3
-}
-module A = {
-  let u = C.value
-}
diff --git a/jscomp/test/conditional/a_none.res b/jscomp/test/conditional/a_none.res
deleted file mode 100644
index 08434a9..0000000
--- a/jscomp/test/conditional/a_none.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module A = {
-  let u = assert(false)
-}
diff --git a/jscomp/test/conditional/b.res b/jscomp/test/conditional/b.res
deleted file mode 100644
index e1b898c..0000000
--- a/jscomp/test/conditional/b.res
+++ /dev/null
@@ -1 +0,0 @@
-let value = 3
diff --git a/jscomp/test/conditional/c.res b/jscomp/test/conditional/c.res
deleted file mode 100644
index e1b898c..0000000
--- a/jscomp/test/conditional/c.res
+++ /dev/null
@@ -1 +0,0 @@
-let value = 3
diff --git a/jscomp/test/config1_test.js b/jscomp/test/config1_test.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/config1_test.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/config1_test.res b/jscomp/test/config1_test.res
deleted file mode 100644
index 15c7ddc..0000000
--- a/jscomp/test/config1_test.res
+++ /dev/null
@@ -1,3 +0,0 @@
-@@bs.config(no_export)
-
-let a = 3
diff --git a/jscomp/test/console_log_test.js b/jscomp/test/console_log_test.js
deleted file mode 100644
index 9a63c34..0000000
--- a/jscomp/test/console_log_test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-function min_int(prim0, prim1) {
-  return Math.min(prim0, prim1);
-}
-
-function say(prim0, prim1) {
-  return prim0.say(prim1);
-}
-
-var v = Caml_obj.compare;
-
-exports.min_int = min_int;
-exports.say = say;
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/console_log_test.res b/jscomp/test/console_log_test.res
deleted file mode 100644
index f6e45c0..0000000
--- a/jscomp/test/console_log_test.res
+++ /dev/null
@@ -1,25 +0,0 @@
-@val @scope("Math") external min_int: (int, int) => int = "min"
-
-/* ATTENTION: only built-in runtime would simplify it
-   as
-   {[
-     var min_int = Math.min
-   ]}
-   otherwise it has to be expanded as
-   {[
-     var min_int = function(x,y){
-       return Math.min(x,y)
-     }
-   ]}
-   There are other things like [@bs.send] which does not like eta reduction
-   
-*/
-let min_int = min_int
-
-type t
-@send external say: (t, int) => int = "say"
-
-let say = say
-
-@@warning("-102")
-let v = Pervasives.compare
diff --git a/jscomp/test/const_block_test.js b/jscomp/test/const_block_test.js
deleted file mode 100644
index 0d6830a..0000000
--- a/jscomp/test/const_block_test.js
+++ /dev/null
@@ -1,102 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-var a = [
-  0,
-  1,
-  2
-];
-
-var b = [
-  0,
-  1,
-  2
-];
-
-var c = [
-  0,
-  1,
-  2,
-  3,
-  4,
-  5
-];
-
-function f(param) {
-  Caml_array.set(a, 0, 3.0);
-  Caml_array.set(b, 0, 3);
-}
-
-function h(param) {
-  return c;
-}
-
-function g(param) {
-  f();
-  return {
-          TAG: "Eq",
-          _0: [
-            Caml_array.get(a, 0),
-            Caml_array.get(b, 0)
-          ],
-          _1: [
-            3.0,
-            3
-          ]
-        };
-}
-
-var suites_0 = [
-  "const_block_test",
-  g
-];
-
-var suites_1 = {
-  hd: [
-    "avoid_mutable_inline_test",
-    (function (param) {
-        Caml_array.set(c, 0, 3);
-        Caml_array.set(c, 1, 4);
-        return {
-                TAG: "Eq",
-                _0: [
-                  3,
-                  4,
-                  2,
-                  3,
-                  4,
-                  5
-                ],
-                _1: c
-              };
-      })
-  ],
-  tl: /* [] */0
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Const_block_test", suites);
-
-var v = [
-  0,
-  1,
-  2,
-  3,
-  4,
-  5
-];
-
-exports.a = a;
-exports.b = b;
-exports.c = c;
-exports.v = v;
-exports.f = f;
-exports.h = h;
-/*  Not a pure module */
diff --git a/jscomp/test/const_block_test.res b/jscomp/test/const_block_test.res
deleted file mode 100644
index 7d6b9fc..0000000
--- a/jscomp/test/const_block_test.res
+++ /dev/null
@@ -1,41 +0,0 @@
-let a = [0., 1., 2.]
-let b = [0, 1, 2]
-let c = [0, 1, 2, 3, 4, 5]
-let v = (0, 1, 2, 3, 4, 5)
-let f = () => {
-  a[0] = 3.0
-  b[0] = 3
-}
-
-/** should not be inlined here 
-        everytime we call [h ()], 
-        it should share the same copy
-     */
-let h = () => c
-
-/** should not be inlined here 
-        everytime we call [h ()], 
-        it should share the same copy
-     */
-let g = () => {
-  f()
-  Mt.Eq((a[0], b[0]), (3.0, 3))
-}
-
-let suites = list{
-  ("const_block_test", g),
-  (
-    "avoid_mutable_inline_test",
-    _ => {
-      let v = h()
-      let v2 = h()
-      let () = {
-        v[0] = 3
-        v2[1] = 4
-      }
-      Eq([3, 4, 2, 3, 4, 5], v)
-    },
-  ),
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/const_block_test.resi b/jscomp/test/const_block_test.resi
deleted file mode 100644
index 84dad4b..0000000
--- a/jscomp/test/const_block_test.resi
+++ /dev/null
@@ -1,6 +0,0 @@
-let a: array<float>
-let b: array<int>
-let c: array<int>
-let v: (int, int, int, int, int, int)
-let f: unit => unit
-let h: unit => array<int>
diff --git a/jscomp/test/const_defs.js b/jscomp/test/const_defs.js
deleted file mode 100644
index ed29947..0000000
--- a/jscomp/test/const_defs.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v = true;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/const_defs.res b/jscomp/test/const_defs.res
deleted file mode 100644
index 6811359..0000000
--- a/jscomp/test/const_defs.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = true
diff --git a/jscomp/test/const_defs_test.js b/jscomp/test/const_defs_test.js
deleted file mode 100644
index aab74fb..0000000
--- a/jscomp/test/const_defs_test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var u = 3;
-
-function f(param) {
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "hi",
-        Error: new Error()
-      };
-}
-
-exports.u = u;
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/const_defs_test.res b/jscomp/test/const_defs_test.res
deleted file mode 100644
index 3328dac..0000000
--- a/jscomp/test/const_defs_test.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let u = if Const_defs.v {
-  3
-} else {
-  4
-}
-
-let f = () => invalid_arg("hi")
diff --git a/jscomp/test/const_test.js b/jscomp/test/const_test.js
deleted file mode 100644
index 53b6172..0000000
--- a/jscomp/test/const_test.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  return x;
-}
-
-function ff(x) {
-  return x;
-}
-
-function fff(x) {
-  var x$1 = {
-    TAG: "A",
-    _0: x
-  };
-  switch (x$1.TAG) {
-    case "A" :
-        return x;
-    case "B" :
-        return 1;
-    case "C" :
-        return 2;
-    
-  }
-}
-
-function h(x) {
-  if (x === "B") {
-    return 1;
-  } else if (x === "C") {
-    return 2;
-  } else {
-    return 0;
-  }
-}
-
-function hh(param) {
-  return 3;
-}
-
-var g = h("A");
-
-exports.f = f;
-exports.ff = ff;
-exports.fff = fff;
-exports.h = h;
-exports.hh = hh;
-exports.g = g;
-/* g Not a pure module */
diff --git a/jscomp/test/const_test.res b/jscomp/test/const_test.res
deleted file mode 100644
index b323336..0000000
--- a/jscomp/test/const_test.res
+++ /dev/null
@@ -1,40 +0,0 @@
-let f = x =>
-  if true {
-    x
-  } else {
-    x - 1
-  }
-
-let ff = x =>
-  switch Some(x) {
-  | Some(_) => x
-  | None => 0
-  }
-
-type t =
-  | A(int)
-  | B(int)
-  | C(int)
-
-let fff = x =>
-  switch A(x) {
-  | A(x) => x
-  | B(_) => 1
-  | C(_) => 2
-  }
-
-let h = x =>
-  switch x {
-  | #A => 0
-  | #B => 1
-  | #C => 2
-  }
-let hh = () =>
-  switch "x" {
-  | "y" => 1
-  | "z" => 2
-  | "x" => 3
-  | _ => 4
-  }
-
-let g = h(#A)
diff --git a/jscomp/test/cont_int_fold_test.js b/jscomp/test/cont_int_fold_test.js
deleted file mode 100644
index 3fa0671..0000000
--- a/jscomp/test/cont_int_fold_test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function a(a0, a1, a2, a3, a4) {
-  return (((((1 + a0 | 0) + a1 | 0) + a2 | 0) + a3 | 0) + a4 | 0) + 2 | 0;
-}
-
-function b(a0, a1, a2, a3, a4) {
-  return (((((1 + a0 | 0) + a1 | 0) + a2 | 0) + a3 | 0) + a4 | 0) + (((((1 + a0 | 0) + a1 | 0) + a2 | 0) + a3 | 0) + a4 | 0) | 0;
-}
-
-exports.a = a;
-exports.b = b;
-/* No side effect */
diff --git a/jscomp/test/cont_int_fold_test.res b/jscomp/test/cont_int_fold_test.res
deleted file mode 100644
index e75307a..0000000
--- a/jscomp/test/cont_int_fold_test.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let a = (a0, a1, a2, a3, a4) => 1 + a0 + a1 + a2 + a3 + a4 + 2
-
-let b = (a0, a1, a2, a3, a4) => 1 + a0 + a1 + a2 + a3 + a4 + (1 + a0 + a1 + a2 + a3 + a4)
diff --git a/jscomp/test/cps_test.js b/jscomp/test/cps_test.js
deleted file mode 100644
index 96d22f2..0000000
--- a/jscomp/test/cps_test.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function test(param) {
-  var v = {
-    contents: 0
-  };
-  var f = function (_n, _acc) {
-    while(true) {
-      var acc = _acc;
-      var n = _n;
-      if (n === 0) {
-        return Curry._1(acc, undefined);
-      }
-      _acc = (function(n,acc){
-      return function (param) {
-        v.contents = v.contents + n | 0;
-        return Curry._1(acc, undefined);
-      }
-      }(n,acc));
-      _n = n - 1 | 0;
-      continue ;
-    };
-  };
-  f(10, (function (param) {
-          
-        }));
-  return v.contents;
-}
-
-function test_closure(param) {
-  var v = {
-    contents: 0
-  };
-  var arr = Caml_array.make(6, (function (x) {
-          return x;
-        }));
-  for(var i = 0; i <= 5; ++i){
-    Caml_array.set(arr, i, (function(i){
-        return function (param) {
-          return i;
-        }
-        }(i)));
-  }
-  $$Array.iter((function (i) {
-          v.contents = v.contents + Curry._1(i, 0) | 0;
-        }), arr);
-  return v.contents;
-}
-
-function test_closure2(param) {
-  var v = {
-    contents: 0
-  };
-  var arr = Caml_array.make(6, (function (x) {
-          return x;
-        }));
-  for(var i = 0; i <= 5; ++i){
-    var j = i + i | 0;
-    Caml_array.set(arr, i, (function(j){
-        return function (param) {
-          return j;
-        }
-        }(j)));
-  }
-  $$Array.iter((function (i) {
-          v.contents = v.contents + Curry._1(i, 0) | 0;
-        }), arr);
-  return v.contents;
-}
-
-Mt.from_pair_suites("Cps_test", {
-      hd: [
-        "cps_test_sum",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: 55,
-                    _1: test()
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "cps_test_closure",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: 15,
-                      _1: test_closure()
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "cps_test_closure2",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: 30,
-                        _1: test_closure2()
-                      };
-              })
-          ],
-          tl: /* [] */0
-        }
-      }
-    });
-
-exports.test = test;
-exports.test_closure = test_closure;
-exports.test_closure2 = test_closure2;
-/*  Not a pure module */
diff --git a/jscomp/test/cps_test.res b/jscomp/test/cps_test.res
deleted file mode 100644
index 4c4ee70..0000000
--- a/jscomp/test/cps_test.res
+++ /dev/null
@@ -1,49 +0,0 @@
-let test = () => {
-  let v = ref(0)
-  let rec f = (n, acc) =>
-    if n == 0 {
-      acc()
-    } else {
-      f(n - 1, _ => {
-        v := v.contents + n
-        acc()
-      })
-    }
-  f(10, _ => ())
-  v.contents
-}
-
-let test_closure = () => {
-  let n = 6
-  let v = ref(0)
-  let arr = Array.make(n, x => x)
-  for i in 0 to n - 1 {
-    arr[i] = _ => i
-  }
-  Array.iter(i => v := v.contents + i(0), arr)
-  v.contents
-}
-
-let test_closure2 = () => {
-  let n = 6
-  let v = ref(0)
-  let arr = Array.make(n, x => x)
-  for i in 0 to n - 1 {
-    let j = i + i
-    arr[i] = _ => j
-  }
-  Array.iter(i => v := v.contents + i(0), arr)
-  v.contents
-}
-
-Mt.from_pair_suites(
-  __MODULE__,
-  {
-    open Mt
-    list{
-      ("cps_test_sum", _ => Eq(55, test())),
-      ("cps_test_closure", _ => Eq(15, test_closure())),
-      ("cps_test_closure2", _ => Eq(30, test_closure2())),
-    }
-  },
-)
diff --git a/jscomp/test/cross_module_inline_test.js b/jscomp/test/cross_module_inline_test.js
deleted file mode 100644
index 6c0cb2d..0000000
--- a/jscomp/test/cross_module_inline_test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Test_char = require("./test_char.js");
-
-var v = Test_char.caml_is_printable(/* 'a' */97);
-
-exports.v = v;
-/* v Not a pure module */
diff --git a/jscomp/test/cross_module_inline_test.res b/jscomp/test/cross_module_inline_test.res
deleted file mode 100644
index f3b2dcc..0000000
--- a/jscomp/test/cross_module_inline_test.res
+++ /dev/null
@@ -1,2 +0,0 @@
-open Test_char
-let v = caml_is_printable('a')
diff --git a/jscomp/test/custom_error_test.js b/jscomp/test/custom_error_test.js
deleted file mode 100644
index 5d2c407..0000000
--- a/jscomp/test/custom_error_test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Js_exn = require("../../lib/js/js_exn.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function test_js_error(param) {
-  var e;
-  try {
-    e = JSON.parse(" {\"x\" : }");
-  }
-  catch (raw_err){
-    var err = Caml_js_exceptions.internalToOCamlException(raw_err);
-    if (err.RE_EXN_ID === Js_exn.$$Error) {
-      console.log(err._1.stack);
-      return ;
-    }
-    throw err;
-  }
-  return e;
-}
-
-function test_js_error2(param) {
-  try {
-    return JSON.parse(" {\"x\" : }");
-  }
-  catch (raw_e){
-    var e = Caml_js_exceptions.internalToOCamlException(raw_e);
-    if (e.RE_EXN_ID === Js_exn.$$Error) {
-      console.log(e._1.stack);
-      throw e;
-    }
-    throw e;
-  }
-}
-
-function example1(param) {
-  var v;
-  try {
-    v = JSON.parse(" {\"x\"  }");
-  }
-  catch (raw_err){
-    var err = Caml_js_exceptions.internalToOCamlException(raw_err);
-    if (err.RE_EXN_ID === Js_exn.$$Error) {
-      console.log(err._1.stack);
-      return ;
-    }
-    throw err;
-  }
-  return v;
-}
-
-function example2(param) {
-  try {
-    return JSON.parse(" {\"x\"}");
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === Js_exn.$$Error) {
-      return ;
-    }
-    throw exn;
-  }
-}
-
-exports.test_js_error = test_js_error;
-exports.test_js_error2 = test_js_error2;
-exports.example1 = example1;
-exports.example2 = example2;
-/* No side effect */
diff --git a/jscomp/test/custom_error_test.res b/jscomp/test/custom_error_test.res
deleted file mode 100644
index b99ee46..0000000
--- a/jscomp/test/custom_error_test.res
+++ /dev/null
@@ -1,31 +0,0 @@
-let test_js_error = () =>
-  switch Js.Json.parseExn(` {"x" : }`) {
-  | exception Js.Exn.Error(err) =>
-    \"@@"(Js.log, Js.Exn.stack(err))
-    None
-  | e => Some(e)
-  }
-
-let test_js_error2 = () =>
-  try Js.Json.parseExn(` {"x" : }`) catch {
-  | Js.Exn.Error(err) as e =>
-    \"@@"(Js.log, Js.Exn.stack(err))
-    raise(e)
-  }
-
-let example1 = () =>
-  switch Js.Json.parseExn(` {"x"  }`) {
-  | exception Js.Exn.Error(err) =>
-    \"@@"(Js.log, Js.Exn.stack(err))
-    None
-  | v => Some(v)
-  }
-
-let example2 = () =>
-  try Some(Js.Json.parseExn(` {"x"}`)) catch {
-  | Js.Exn.Error(_) => None
-  }
-
-/* let () = 
-  Js.log @@ test_js_error () 
-*/
diff --git a/jscomp/test/cyc/a_b.res b/jscomp/test/cyc/a_b.res
deleted file mode 100644
index 6b12735..0000000
--- a/jscomp/test/cyc/a_b.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = B_a.v
diff --git a/jscomp/test/cyc/b_a.res b/jscomp/test/cyc/b_a.res
deleted file mode 100644
index e88b912..0000000
--- a/jscomp/test/cyc/b_a.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = A_b.v
diff --git a/jscomp/test/cyc/c.res b/jscomp/test/cyc/c.res
deleted file mode 100644
index e88b912..0000000
--- a/jscomp/test/cyc/c.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = A_b.v
diff --git a/jscomp/test/debug_keep_test.js b/jscomp/test/debug_keep_test.js
deleted file mode 100644
index 6b2d610..0000000
--- a/jscomp/test/debug_keep_test.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-debugger;
-
-/*  Not a pure module */
diff --git a/jscomp/test/debug_keep_test.res b/jscomp/test/debug_keep_test.res
deleted file mode 100644
index 2f79b57..0000000
--- a/jscomp/test/debug_keep_test.res
+++ /dev/null
@@ -1 +0,0 @@
-let () = %debugger
diff --git a/jscomp/test/debug_mode_value.js b/jscomp/test/debug_mode_value.js
deleted file mode 100644
index bab7b2e..0000000
--- a/jscomp/test/debug_mode_value.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var u = {
-  TAG: "A",
-  _0: 1,
-  _1: 2,
-  [Symbol.for("name")]: "A"
-};
-
-var h = {
-  hd: 1,
-  tl: /* [] */0
-};
-
-exports.u = u;
-exports.h = h;
-/* No side effect */
diff --git a/jscomp/test/debug_mode_value.res b/jscomp/test/debug_mode_value.res
deleted file mode 100644
index b2b010d..0000000
--- a/jscomp/test/debug_mode_value.res
+++ /dev/null
@@ -1,14 +0,0 @@
-@@bs.config({
-  flags: [
-    /* "-drawlambda"; */
-    /* "-dlambda"; */
-    /* "-dtypedtree"; */
-    /* "-bs-diagnose" */
-    "-bs-g",
-  ],
-})
-
-type t = A(int, int)
-
-let u = A(1, 2)
-let h = list{1}
diff --git a/jscomp/test/debug_tmp.js b/jscomp/test/debug_tmp.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/debug_tmp.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/debug_tmp.res b/jscomp/test/debug_tmp.res
deleted file mode 100644
index 8a62d81..0000000
--- a/jscomp/test/debug_tmp.res
+++ /dev/null
@@ -1,22 +0,0 @@
-@@config({
-  flags: [
-    "-w",
-    "@A",
-    /* "-drawlambda"; */
-    /* "-dtypedtree"; */
-    /* "-bs-diagnose"; */
-    /* "-dparsetree"; */
-    /* "-dsource"; */
-    /* "-bs-no-builtin-ppx"; */
-  ],
-})
-/*
-let h1 = fun [@bs]() -> 1 
-let h0 f a b c = f a b c [@bs]
-let h =
-let f x ~y = x + y in
-            f ~y:3 */
-
-/* let f x ~y = x + y
-
-;; Js.log (f 2 3) */
diff --git a/jscomp/test/debugger_test.js b/jscomp/test/debugger_test.js
deleted file mode 100644
index 9aa9f45..0000000
--- a/jscomp/test/debugger_test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x, y) {
-  console.log([
-        x,
-        y
-      ]);
-  return x + y | 0;
-}
-
-function g(param) {
-  f(1, 2);
-  debugger;
-  f(1, 2);
-  debugger;
-  return 3;
-}
-
-function exterme_g(param) {
-  f(1, 2);
-  debugger;
-  var v;
-  console.log(v);
-  f(1, 2);
-  debugger;
-  return 3;
-}
-
-exports.f = f;
-exports.g = g;
-exports.exterme_g = exterme_g;
-/* No side effect */
diff --git a/jscomp/test/debugger_test.res b/jscomp/test/debugger_test.res
deleted file mode 100644
index af0252e..0000000
--- a/jscomp/test/debugger_test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let f = (x, y) => {
-  Js.log((x, y))
-  x + y
-}
-
-let g = () => {
-  \"@@"(ignore, f(1, 2))
-  %debugger
-  \"@@"(ignore, f(1, 2))
-  %debugger
-  3
-}
-
-let exterme_g = () => {
-  \"@@"(ignore, f(1, 2))
-  let v = %debugger
-  Js.log(v)
-  \"@@"(ignore, f(1, 2))
-  %debugger
-  3
-}
diff --git a/jscomp/test/default_export_test.js b/jscomp/test/default_export_test.js
deleted file mode 100644
index a2728d6..0000000
--- a/jscomp/test/default_export_test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var $$default = "xx";
-
-exports.default = $$default;
-exports.__esModule = true;
-/* No side effect */
diff --git a/jscomp/test/default_export_test.res b/jscomp/test/default_export_test.res
deleted file mode 100644
index 5577206..0000000
--- a/jscomp/test/default_export_test.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let default = 3
-
-let default = "xx"
diff --git a/jscomp/test/defunctor_make_test.js b/jscomp/test/defunctor_make_test.js
deleted file mode 100644
index 2226ddc..0000000
--- a/jscomp/test/defunctor_make_test.js
+++ /dev/null
@@ -1,187 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-
-function getcompare(x) {
-  return x;
-}
-
-function Make(M) {
-  return M;
-}
-
-var Comparable = {
-  getcompare: getcompare,
-  Make: Make
-};
-
-function height(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return x._4;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l._4;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r._4;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l._3;
-    var ld = l._2;
-    var lv = l._1;
-    var ll = l._0;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r._3;
-  var rd = r._2;
-  var rv = r._1;
-  var rl = r._0;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, data, compare, x_) {
-  if (typeof x_ !== "object") {
-    return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: data,
-            _3: "Empty",
-            _4: 1
-          };
-  }
-  var r = x_._3;
-  var d = x_._2;
-  var v = x_._1;
-  var l = x_._0;
-  var c = compare(x, v);
-  if (c === 0) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: x_._4
-          };
-  } else if (c < 0) {
-    return bal(add(x, data, compare, l), v, d, r);
-  } else {
-    return bal(l, v, d, add(x, data, compare, r));
-  }
-}
-
-function add$1(x, data, v) {
-  var X = v.compare;
-  return {
-          compare: v.compare,
-          data: add(x, data, X.compare, v.data)
-        };
-}
-
-function empty(v) {
-  return {
-          compare: v,
-          data: "Empty"
-        };
-}
-
-var compare = Caml.int_compare;
-
-var V0 = {
-  compare: compare
-};
-
-var compare$1 = Caml.int_compare;
-
-var V1 = {
-  compare: compare$1
-};
-
-var v0 = {
-  compare: V0,
-  data: "Empty"
-};
-
-var v1 = {
-  compare: V1,
-  data: "Empty"
-};
-
-var v3 = add$1(3, "a", v0);
-
-console.log(v3);
-
-exports.Comparable = Comparable;
-exports.height = height;
-exports.create = create;
-exports.bal = bal;
-exports.add = add$1;
-exports.empty = empty;
-exports.V0 = V0;
-exports.V1 = V1;
-exports.v0 = v0;
-exports.v1 = v1;
-exports.v3 = v3;
-/* v3 Not a pure module */
diff --git a/jscomp/test/defunctor_make_test.res b/jscomp/test/defunctor_make_test.res
deleted file mode 100644
index 2d19893..0000000
--- a/jscomp/test/defunctor_make_test.res
+++ /dev/null
@@ -1,178 +0,0 @@
-module Comparable: {
-  type comparator<'a>
-  let getcompare: comparator<'a> => (. 'a, 'a) => int
-  module type C = {
-    type id
-    type key
-    let compare: comparator<key>
-  }
-  type compare<'key, 'id> = module(C with type key = 'key and type id = 'id)
-  module Make: (
-    M: {
-      type key
-      let compare: (. key, key) => int
-    },
-  ) => (C with type key = M.key)
-} = {
-  type comparator<'a> = (. 'a, 'a) => int
-  let getcompare: comparator<'a> => (. 'a, 'a) => int = x => x
-  module type C = {
-    type id
-    type key
-    let compare: comparator<key>
-  }
-  type compare<'key, 'id> = module(C with type key = 'key and type id = 'id)
-
-  module Make = (
-    M: {
-      type key
-      let compare: (. key, key) => int
-    },
-  ) => {
-    type id
-    type key = M.key
-    let compare = M.compare
-  }
-}
-
-type rec t<'a, 'key> =
-  | Empty
-  | Node(t<'a, 'key>, 'key, 'a, t<'a, 'key>, int)
-
-let height = x =>
-  switch x {
-  | Empty => 0
-  | Node(_, _, _, _, h) => h
-  }
-
-let create = (l, x, d, r) => {
-  let hl = height(l) and hr = height(r)
-  Node(
-    l,
-    x,
-    d,
-    r,
-    if hl >= hr {
-      hl + 1
-    } else {
-      hr + 1
-    },
-  )
-}
-
-let bal = (l, x, d, r) => {
-  let hl = switch l {
-  | Empty => 0
-  | Node(_, _, _, _, h) => h
-  }
-  let hr = switch r {
-  | Empty => 0
-  | Node(_, _, _, _, h) => h
-  }
-  if hl > hr + 2 {
-    switch l {
-    | Empty => invalid_arg("Map.bal")
-    | Node(ll, lv, ld, lr, _) =>
-      if height(ll) >= height(lr) {
-        create(ll, lv, ld, create(lr, x, d, r))
-      } else {
-        switch lr {
-        | Empty => invalid_arg("Map.bal")
-        | Node(lrl, lrv, lrd, lrr, _) =>
-          create(create(ll, lv, ld, lrl), lrv, lrd, create(lrr, x, d, r))
-        }
-      }
-    }
-  } else if hr > hl + 2 {
-    switch r {
-    | Empty => invalid_arg("Map.bal")
-    | Node(rl, rv, rd, rr, _) =>
-      if height(rr) >= height(rl) {
-        create(create(l, x, d, rl), rv, rd, rr)
-      } else {
-        switch rl {
-        | Empty => invalid_arg("Map.bal")
-        | Node(rll, rlv, rld, rlr, _) =>
-          create(create(l, x, d, rll), rlv, rld, create(rlr, rv, rd, rr))
-        }
-      }
-    }
-  } else {
-    Node(
-      l,
-      x,
-      d,
-      r,
-      if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    )
-  }
-}
-
-let rec add = (x, data, compare, x_) =>
-  switch x_ {
-  | Empty => Node(Empty, x, data, Empty, 1)
-  | Node(l, v, d, r, h) =>
-    let c = compare(. x, v)
-    if c == 0 {
-      Node(l, x, data, r, h)
-    } else if c < 0 {
-      bal(add(x, data, compare, l), v, d, r)
-    } else {
-      bal(l, v, d, add(x, data, compare, r))
-    }
-  }
-
-/* type ('k, 'id) compare = */
-/* (module  C with type id  = 'id and type key = 'k) */
-
-type t1<'k, 'v, 'id> = {
-  compare: Comparable.compare<'k, 'id>,
-  data: t<'v, 'k>,
-}
-
-let add = (type k v id, x, data, v: t1<k, v, id>) => {
-  module X = unpack(v.compare)
-  {
-    compare: v.compare,
-    data: add(x, data, Comparable.getcompare(X.compare), v.data),
-  }
-}
-
-let empty = (v: Comparable.compare<_>) => {compare: v, data: Empty}
-
-/* module Make (X : sig type key end) = struct
-  type nonrec key = X.key
-  type id 
-end
-module U = struct
-  include Make ( struct type key = int end)
-  let compare = Pervasives.compare end */
-
-module V0 = Comparable.Make({
-  type key = int
-  let compare = (. x: key, y) => Pervasives.compare((x: key), y)
-})
-module V1 = Comparable.Make({
-  type key = int
-  let compare = (. x: key, y) => Pervasives.compare(x, y)
-})
-let v0 = empty(module(V0))
-let v1 = empty(module(V1))
-
-let v3 = add(3, "a", v0)
-Js.log(v3)
-/* let () = v0 = v1 */
-
-/* let v1 = empty */
-/* (module (struct type id  type key = int let compare = Pervasives.compare end)) */
-
-/* let v2 = empty [%bs.map compare] */
-/* let _ = u = v */
-
-/* local variables: */
-/* compile-command: "ocamlc.opt -c xx.ml" */
-/* end: */
diff --git a/jscomp/test/demo_int_map.js b/jscomp/test/demo_int_map.js
deleted file mode 100644
index 8e4a314..0000000
--- a/jscomp/test/demo_int_map.js
+++ /dev/null
@@ -1,165 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = x - v | 0;
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = add(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function find(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = x - param.v | 0;
-    if (c === 0) {
-      return param.d;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function test(param) {
-  var m = "Empty";
-  for(var i = 0; i <= 1000000; ++i){
-    m = add(i, i, m);
-  }
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    find(i$1, m);
-  }
-}
-
-test();
-
-/*  Not a pure module */
diff --git a/jscomp/test/demo_int_map.res b/jscomp/test/demo_int_map.res
deleted file mode 100644
index d2ec1f1..0000000
--- a/jscomp/test/demo_int_map.res
+++ /dev/null
@@ -1,19 +0,0 @@
-module IntMap = Map.Make({
-  type t = int
-  let compare = (x: int, y) => x - y
-})
-
-let test = () => {
-  let m = ref(IntMap.empty)
-  let count = 1000_000
-  for i in 0 to count {
-    m := IntMap.add(i, i, m.contents)
-  }
-  for i in 0 to count {
-    ignore(IntMap.find(i, m.contents))
-  }
-}
-
-let () = /* Js.log "start" ; */
-test()
-/* Js.log "finish" */
diff --git a/jscomp/test/demo_int_map.resi b/jscomp/test/demo_int_map.resi
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/test/demo_page.js b/jscomp/test/demo_page.js
deleted file mode 100644
index 01135e2..0000000
--- a/jscomp/test/demo_page.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var React = require("react");
-var ReactDom = require("react-dom");
-
-function fib(x) {
-  if (x === 2 || x === 1) {
-    return 1;
-  } else {
-    return fib(x - 1 | 0) + fib(x - 2 | 0) | 0;
-  }
-}
-
-function sum(n) {
-  var v = 0;
-  for(var i = 0; i <= n; ++i){
-    v = v + i | 0;
-  }
-  return v;
-}
-
-function map(f, x) {
-  if (typeof x !== "object") {
-    return "Nil";
-  } else {
-    return {
-            TAG: "Cons",
-            _0: Curry._1(f, x._0),
-            _1: map(f, x._1)
-          };
-  }
-}
-
-function test_curry(x, y) {
-  return x + y | 0;
-}
-
-function f(param) {
-  return 32 + param | 0;
-}
-
-ReactDom.render(React.createClass({
-          render: (function (param) {
-              return React.DOM.div({
-                          alt: "pic"
-                        }, React.DOM.h1(undefined, "hello react"), React.DOM.h2(undefined, "type safe!"));
-            })
-        }), document.getElementById("hi"));
-
-exports.fib = fib;
-exports.sum = sum;
-exports.map = map;
-exports.test_curry = test_curry;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/demo_page.res b/jscomp/test/demo_page.res
deleted file mode 100644
index bba7300..0000000
--- a/jscomp/test/demo_page.res
+++ /dev/null
@@ -1,89 +0,0 @@
-/** Imperative style */
-let rec fib = x =>
-  switch x {
-  | 1 | 2 => 1
-  | n => fib(n - 1) + fib(n - 2)
-  }
-
-/** Imperative style */ /** List map */
-let sum = n => {
-  let v = ref(0)
-  for i in 0 to n {
-    v := v.contents + i
-  }
-  v.contents
-}
-
-/** List map */
-type rec list<'a> =
-  | Nil
-  | Cons('a, list<'a>)
-
-let rec map = (f, x) =>
-  switch x {
-  | Nil => Nil
-  | Cons(x, xs) => Cons(f(x), map(f, xs))
-  }
-
-/** Test curry and uncurry calling convention */
-let test_curry = (x, y) => x + y
-let f = test_curry(32)
-
-/** Create a typed binding for react */
-type t
-type element
-@val external document: t = "document"
-@send external getElementById: (t, string) => element = "getElementById"
-
-/** Phantom types */
-type config
-type component
-type attrs
-type component_class
-
-@obj /** make a json object */
-external config: (~display_name: string=?, ~render: unit => component, unit) => config = ""
-/** make a json object */ @obj
-external attrs: (~alt: string=?, ~autoPlay: bool=?, unit) => attrs = ""
-external str: string => component = "%identity"
-
-type vdom
-@module("react") @val external vdom: vdom = "DOM"
-
-/* FIXME: investigate 
-   cases:
-   {[
-     [@@bs.module "package1" "same_name"]
-     [@@bs.module "package2" "same_name"]
-   ]}
-   {[
-     [@@bs.module "package" "name1"]
-     [@@bs.module "package" "name2"]
-   ]}
-*/
-@send @variadic external h1: (vdom, ~attrs: attrs=?, array<component>) => component = "h1"
-@send @variadic external h2: (vdom, ~attrs: attrs=?, array<component>) => component = "h2"
-
-@send @variadic external h3: (vdom, ~attrs: attrs=?, array<component>) => component = "h3"
-
-@send @variadic external h4: (vdom, ~attrs: attrs=?, array<component>) => component = "h4"
-
-@send @variadic external div: (vdom, ~attrs: attrs=?, array<component>) => component = "div"
-
-@val("createClass") @module("react") external createClass: config => component_class = "createClass"
-@val("render") @module("react-dom") external render: (component_class, element) => unit = ""
-
-render(
-  createClass(
-    config(
-      ~render=_ =>
-        div(
-          vdom,
-          ~attrs=attrs(~alt="pic", ()),
-          [h1(vdom, [str("hello react")]), h2(vdom, [str("type safe!")])],
-        ),
-      (),
-    ),
-  ),
-  getElementById(document, "hi"),
-)
diff --git a/jscomp/test/demo_pipe.js b/jscomp/test/demo_pipe.js
deleted file mode 100644
index d954464..0000000
--- a/jscomp/test/demo_pipe.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function register(rl) {
-  return rl.on("line", (function (x) {
-                  console.log(x);
-                })).on("close", (function (param) {
-                console.log("finished");
-              }));
-}
-
-exports.register = register;
-/* No side effect */
diff --git a/jscomp/test/demo_pipe.res b/jscomp/test/demo_pipe.res
deleted file mode 100644
index 484e65d..0000000
--- a/jscomp/test/demo_pipe.res
+++ /dev/null
@@ -1,11 +0,0 @@
-type readline
-@send
-external on: (
-  readline,
-  @string
-  [
-    | #line(string => unit)
-    | #close(unit => unit)
-  ],
-) => readline = "on"
-let register = rl => rl->on(#line(x => Js.log(x)))->on(#close(() => Js.log("finished")))
diff --git a/jscomp/test/derive_dyntype.js b/jscomp/test/derive_dyntype.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/derive_dyntype.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/derive_dyntype.res b/jscomp/test/derive_dyntype.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/derive_dyntype.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/derive_projector_test.js b/jscomp/test/derive_projector_test.js
deleted file mode 100644
index f68a46d..0000000
--- a/jscomp/test/derive_projector_test.js
+++ /dev/null
@@ -1,127 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function u_x(param) {
-  return param.u_x;
-}
-
-function b_x(param) {
-  return param.b_x;
-}
-
-function c_x(param) {
-  return param.c_x;
-}
-
-function d_int(param_0) {
-  return {
-          TAG: "D_int",
-          _0: param_0
-        };
-}
-
-function d_tuple(param_0, param_1) {
-  return {
-          TAG: "D_tuple",
-          _0: param_0,
-          _1: param_1
-        };
-}
-
-function newContent(param_0) {
-  return {
-          TAG: "NewContent",
-          _0: param_0
-        };
-}
-
-function d_tweak(param_0) {
-  return {
-          TAG: "D_tweak",
-          _0: param_0
-        };
-}
-
-function u_X(param) {
-  return param.u_X;
-}
-
-function d(param) {
-  return param.d;
-}
-
-var v = {
-  TAG: "D_int",
-  _0: 3
-};
-
-var h_1 = {
-  hd: {
-    TAG: "D_int",
-    _0: 3
-  },
-  tl: {
-    hd: {
-      TAG: "D_tuple",
-      _0: 3,
-      _1: "hgo"
-    },
-    tl: {
-      hd: {
-        TAG: "D_tweak",
-        _0: [
-          3,
-          "hgo"
-        ]
-      },
-      tl: {
-        hd: {
-          TAG: "NewContent",
-          _0: "3"
-        },
-        tl: /* [] */0
-      }
-    }
-  }
-};
-
-var h = {
-  hd: "D_empty",
-  tl: h_1
-};
-
-function xx(param_0) {
-  return {
-          TAG: "Xx",
-          _0: param_0
-        };
-}
-
-function a(param_0) {
-  return {
-          TAG: "A",
-          _0: param_0
-        };
-}
-
-var d_empty = "D_empty";
-
-var hei = "Hei";
-
-exports.u_x = u_x;
-exports.b_x = b_x;
-exports.c_x = c_x;
-exports.d_empty = d_empty;
-exports.d_int = d_int;
-exports.d_tuple = d_tuple;
-exports.newContent = newContent;
-exports.d_tweak = d_tweak;
-exports.hei = hei;
-exports.u_X = u_X;
-exports.d = d;
-exports.v = v;
-exports.h = h;
-exports.xx = xx;
-exports.a = a;
-/* No side effect */
diff --git a/jscomp/test/derive_projector_test.res b/jscomp/test/derive_projector_test.res
deleted file mode 100644
index ef1e9bc..0000000
--- a/jscomp/test/derive_projector_test.res
+++ /dev/null
@@ -1,30 +0,0 @@
-@@warning("-104")
-@deriving({accessors: accessors}) type a = {u_x: int}
-
-type rec b<'a> = {b_x: int}
-@deriving(accessors) and c<'a> = {c_x: int}
-
-type rec d =
-  | D_empty
-  | D_int(int)
-  | D_tuple(int, string)
-  | NewContent(string)
-  | D_tweak((int, string))
-  | Hei /* two hei derived, however, this hei is not accessible any more */
-and u = Hei
-and h = {d: d, h: list<h>, u_X: int}
-@deriving({accessors: accessors}) and e = {d: d}
-
-let v = \"@@"(d, {d: d_int(3)})
-
-let g = u_X
-
-let h = list{d_empty, d_int(3), d_tuple(3, "hgo"), d_tweak((3, "hgo")), newContent("3")}
-
-@deriving(accessors) type hh = Xx(int)
-
-@deriving(accessors) type xx = {"x": int}
-
-@deriving(accessors) type t = A((. int) => int)
-
-let f = a((. x) => x)
diff --git a/jscomp/test/derive_projector_test.resi b/jscomp/test/derive_projector_test.resi
deleted file mode 100644
index c0be745..0000000
--- a/jscomp/test/derive_projector_test.resi
+++ /dev/null
@@ -1,24 +0,0 @@
-@@warning("-30")
-@deriving({accessors: accessors}) type a = {u_x: int}
-
-type rec b<'a> = {b_x: int}
-@deriving({accessors: accessors}) and c<'a> = {c_x: int}
-
-type rec d =
-  | D_empty
-  | D_int(int)
-  | D_tuple(int, string)
-  | NewContent(string)
-  | D_tweak((int, string))
-  | Hei
-and u = Hei
-and h = {d: d, h: list<h>, u_X: int}
-
-@deriving({accessors: accessors}) and e = {d: d}
-
-let v: d
-let h: list<d>
-
-@deriving(accessors) type hh = Xx(int)
-
-@deriving(accessors) type t = A((. int) => int)
diff --git a/jscomp/test/derive_type_test.js b/jscomp/test/derive_type_test.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/derive_type_test.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/derive_type_test.res b/jscomp/test/derive_type_test.res
deleted file mode 100644
index d359e08..0000000
--- a/jscomp/test/derive_type_test.res
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-let all_fields_of_h : Bs_dyn.record_shape = 
-  { labels = [| "x" ; "y"; "z"|]}
-
-let value_of_h : h Bs_dyn.to_value = 
-  fun [@bs] (value : h)
-    -> match value with 
-    | {x ; y ; z} -> 
-        Bs_dyn.value_of_record all_fields_of_h
-          [| Bs_dyn.value_of_int x [@bs]; 
-             Bs_dyn.value_of_float y [@bs];
-             Bs_dyn.value_of_string z [@bs]
-          |]
-*/
-
-/* [@@bs.deriving {dynval ; dyntype } ] */
-
-/* [@@bs.deriving {dynval ; dyntype } ] */
diff --git a/jscomp/test/digest_test.js b/jscomp/test/digest_test.js
deleted file mode 100644
index fe38db2..0000000
--- a/jscomp/test/digest_test.js
+++ /dev/null
@@ -1,234 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Digest = require("../../lib/js/digest.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Ext_array_test = require("./ext_array_test.js");
-
-function f(x) {
-  return Digest.to_hex(Digest.string(x));
-}
-
-var ref = [
-  "d41d8cd98f00b204e9800998ecf8427e",
-  "0cc175b9c0f1b6a831c399e269772661",
-  "4124bc0a9335c27f086f24ba207a4912",
-  "47bce5c74f589f4867dbd57e9ca9f808",
-  "74b87337454200d4d33f80c4663dc5e5",
-  "594f803b380a41396ed63dca39503542",
-  "0b4e7a0e5fe84ad35fb5f95b9ceeac79",
-  "5d793fc5b00a2348c3fb9ab59e5ca98a",
-  "3dbe00a167653a1aaee01d93e77e730e",
-  "552e6a97297c53e592208cf97fbb3b60",
-  "e09c80c42fda55f9d992e59ca6b3307d",
-  "d57f21e6a273781dbf8b7657940f3b03",
-  "45e4812014d83dde5666ebdf5a8ed1ed",
-  "c162de19c4c3731ca3428769d0cd593d",
-  "451599a5f9afa91a0f2097040a796f3d",
-  "12f9cf6998d52dbe773b06f848bb3608",
-  "23ca472302f49b3ea5592b146a312da0",
-  "88e42e96cc71151b6e1938a1699b0a27",
-  "2c60c24e7087e18e45055a33f9a5be91",
-  "639d76897485360b3147e66e0a8a3d6c",
-  "22d42eb002cefa81e9ad604ea57bc01d",
-  "bd049f221af82804c5a2826809337c9b",
-  "ff49cfac3968dbce26ebe7d4823e58bd",
-  "d95dbfee231e34cccb8c04444412ed7d",
-  "40edae4bad0e5bf6d6c2dc5615a86afb",
-  "a5a8bfa3962f49330227955e24a2e67c",
-  "ae791f19bdf77357ff10bb6b0e97e121",
-  "aaab9c59a88bf0bdfcb170546c5459d6",
-  "b0f0545856af1a340acdedce23c54b97",
-  "f7ce3d7d44f3342107d884bfa90c966a",
-  "59e794d45697b360e18ba972bada0123",
-  "3b0845db57c200be6052466f87b2198a",
-  "5eca9bd3eb07c006cd43ae48dfde7fd3",
-  "b4f13cb081e412f44e99742cb128a1a5",
-  "4c660346451b8cf91ef50f4634458d41",
-  "11db24dc3f6c2145701db08625dd6d76",
-  "80dad3aad8584778352c68ab06250327",
-  "1227fe415e79db47285cb2689c93963f",
-  "8e084f489f1bdf08c39f98ff6447ce6d",
-  "08b2f2b0864bac1ba1585043362cbec9",
-  "4697843037d962f62a5a429e611e0f5f",
-  "10c4da18575c092b486f8ab96c01c02f",
-  "af205d729450b663f48b11d839a1c8df",
-  "0d3f91798fac6ee279ec2485b25f1124",
-  "4c3c7c067634daec9716a80ea886d123",
-  "d1e358e6e3b707282cdd06e919f7e08c",
-  "8c6ded4f0af86e0a7e301f8a716c4363",
-  "4c2d8bcb02d982d7cb77f649c0a2dea8",
-  "bdb662f765cd310f2a547cab1cfecef6",
-  "08ff5f7301d30200ab89169f6afdb7af",
-  "6eb6a030bcce166534b95bc2ab45d9cf",
-  "1bb77918e5695c944be02c16ae29b25e",
-  "b6fe77c19f0f0f4946c761d62585bfea",
-  "e9e7e260dce84ffa6e0e7eb5fd9d37fc",
-  "eced9e0b81ef2bba605cbc5e2e76a1d0",
-  "ef1772b6dff9a122358552954ad0df65",
-  "3b0c8ac703f828b04c6c197006d17218",
-  "652b906d60af96844ebd21b674f35e93",
-  "dc2f2f2462a0d72358b2f99389458606",
-  "762fc2665994b217c52c3c2eb7d9f406",
-  "cc7ed669cf88f201c3297c6a91e1d18d",
-  "cced11f7bbbffea2f718903216643648",
-  "24612f0ce2c9d2cf2b022ef1e027a54f",
-  "b06521f39153d618550606be297466d5",
-  "014842d480b571495a4a0363793f7367",
-  "c743a45e0d2e6a95cb859adae0248435",
-  "def5d97e01e1219fb2fc8da6c4d6ba2f",
-  "92cb737f8687ccb93022fdb411a77cca",
-  "a0d1395c7fb36247bfe2d49376d9d133",
-  "ab75504250558b788f99d1ebd219abf2",
-  "0f5c6c4e740bfcc08c3c26ccb2673d46",
-  "cddd19bec7f310d8c87149ef47a1828f",
-  "96b39b8b95e016c79d104d83395b8133",
-  "f1fc0b14ff8fa674b02344577e23eeb1",
-  "0e8d28a1cafa3ffcff22afd480cce7d8",
-  "448539ffc17e1e81005b65581855cef4",
-  "61e39aae7c53e6e77db2e4405d9fb157",
-  "618a426895ee6133a372bebd1129b63e",
-  "046c90690c9e36578b9d4a7e1d249c75",
-  "aadab38075c43296ee7e12466ebb03e3",
-  "b15af9cdabbaea0516866a33d8fd0f98",
-  "986e6938ed767a8ae9530eef54bfe5f1",
-  "7ae25a72b71a42ccbc5477fd989cd512",
-  "98d34e50d4aa7a893cc7919a91acb0e3",
-  "3fc53fc22ea40f1a0afd78fc2cd9aa0f",
-  "923e37c738b9d7b1526f70b65229cc3d",
-  "b3966b7a08e5d46fd0774b797ba78dc2",
-  "f50c7286b540bb181db1d6e05a51a296",
-  "4efd6c8826e65a61f82af954d431b59b",
-  "ef1031e79e7a15a4470a5e98b23781b5",
-  "067876bfd0df0f4c5002780ec85e6f8c",
-  "789851dfa4c03563e9cef5f7bc050a7e",
-  "baf934720818ee49477e74fc644faa5e",
-  "9a0ea77ca26d2c121ddcc179edb76308",
-  "20c825561572e33d026f99ddfd999538",
-  "464c461455c5a927079a13609c20b637",
-  "cf37d42f89b6adb0e1a9e99104501b82",
-  "d266af45e3d06b70d9f52e2df4344186",
-  "f8b59fa22eb0ba944e2b7aa24d67b681",
-  "0918d7c2f9062743450a86eae9dde1a3",
-  "36a92cc94a9e0fa21f625f8bfb007adf",
-  "681d73898dad5685d48b5e8438bc3a66",
-  "337ccef058459c3c16411381778da0c4",
-  "6ccdfcc742862036ce07583633c5f77e",
-  "ddfa1adc974649dc5b414be86def7457",
-  "650ebc28ad85f11aa4b63b6ee565b89d",
-  "e4571793bcaba284017eeabd8df85697",
-  "4fc040d354ad9ba5e4f62862109d3e17",
-  "25814274e02aa7cc03d6314eb703e655",
-  "11378ecaee0089c840d26352704027e3",
-  "86f950bfcd824d5546da01c40576db31",
-  "089f243d1e831c5879aa375ee364a06e",
-  "9146ef3527c7cfcc66dc615c3986e391",
-  "d727cfdfc9ed0347e6917a68b982f7bc",
-  "da8f45e1fdc12deecfe56aeb5288796e",
-  "29cfcf52d8250a253a535cf7989c7bd2",
-  "0f6eb555b8e3c35411eebe9348594193",
-  "a922439f963e7e59040e4756992c6f1b",
-  "81f8453cf3f7e5ee5479c777e5a8d80c",
-  "8a7bd0732ed6a28ce75f6dabc90e1613",
-  "5f61c0ccad4cac44c75ff505e1f1e537",
-  "f6acfca2d47c87f2b14ca038234d3614",
-  "269fc62c517f3d55c368152addca57e7",
-  "50587cb16413da779b35508018721647",
-  "5e4a3ecfdaa4636b84a39b6a7be7c047",
-  "c5339dc2af6bf595580281ffb07353f6",
-  "e51176a47347e167ed0ed766b6de1a0c",
-  "020406e1d05cdc2aa287641f7ae2cc39",
-  "e510683b3f5ffe4093d021808bc6ff70",
-  "b325dc1c6f5e7a2b7cf465b9feab7948"
-];
-
-Mt.from_pair_suites("Digest_test", Pervasives.$at({
-          hd: [
-            "File \"digest_test.res\", line 9, characters 9-16",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: Digest.to_hex(Digest.string("value")),
-                        _1: "2063c1608d6e0baf80249c42e2be5804"
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "File \"digest_test.res\", line 11, characters 10-17",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog")),
-                          _1: "9e107d9d372bb6826bd81d3542a419d6"
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "File \"digest_test.res\", line 18, characters 10-17",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog.")),
-                            _1: "e4d909c290d0fb1ca068ffaddf22cbd0"
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "File \"digest_test.res\", line 24, characters 9-16",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: Digest.to_hex(Digest.string("")),
-                              _1: "d41d8cd98f00b204e9800998ecf8427e"
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "File \"digest_test.res\", line 26, characters 10-17",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.")),
-                                _1: "7065cc36bba1d155fb09f9d02f22e8bf"
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "File \"digest_test.res\", line 45, characters 10-17",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: Digest.to_hex(Digest.string("The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.The quick brown fox jumps over the lazy dog.")),
-                                  _1: "b9193d1df4b7a8f0a25ffdd1005c5b2b"
-                                };
-                        })
-                    ],
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }, $$Array.to_list($$Array.map((function (i) {
-                    return [
-                            String(i),
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: Digest.to_hex(Digest.string("a".repeat(i))),
-                                        _1: Caml_array.get(ref, i)
-                                      };
-                              })
-                          ];
-                  }), Ext_array_test.range(0, 129)))));
-
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/digest_test.res b/jscomp/test/digest_test.res
deleted file mode 100644
index 8c9f0ed..0000000
--- a/jscomp/test/digest_test.res
+++ /dev/null
@@ -1,199 +0,0 @@
-let f = x => \"@@"(Digest.to_hex, Digest.string(x))
-
-\"@@"(
-  Mt.from_pair_suites(__MODULE__),
-  \"@"(
-    {
-      open Mt
-      list{
-        (__LOC__, _ => Eq(f("value"), "2063c1608d6e0baf80249c42e2be5804")),
-        (
-          __LOC__,
-          _ => Eq(
-            f("The quick brown fox jumps over the lazy dog"),
-            "9e107d9d372bb6826bd81d3542a419d6",
-          ),
-        ),
-        (
-          __LOC__,
-          _ => Eq(
-            f("The quick brown fox jumps over the lazy dog."),
-            "e4d909c290d0fb1ca068ffaddf22cbd0",
-          ),
-        ),
-        (__LOC__, _ => Eq(f(""), "d41d8cd98f00b204e9800998ecf8427e")),
-        (
-          __LOC__,
-          _ => Eq(
-            f(
-              "The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++ "The quick brown fox jumps over the lazy dog.")))))))))),
-            ),
-            "7065cc36bba1d155fb09f9d02f22e8bf",
-          ),
-        ),
-        (
-          __LOC__,
-          _ => Eq(
-            f(
-              "The quick brown fox jumps over the lazy dog." ++
-              ("The quick brown fox jumps over the lazy dog." ++
-              "The quick brown fox jumps over the lazy dog."),
-            ),
-            "b9193d1df4b7a8f0a25ffdd1005c5b2b",
-          ),
-        ),
-      }
-    },
-    {
-      let ref = [
-        "d41d8cd98f00b204e9800998ecf8427e",
-        "0cc175b9c0f1b6a831c399e269772661",
-        "4124bc0a9335c27f086f24ba207a4912",
-        "47bce5c74f589f4867dbd57e9ca9f808",
-        "74b87337454200d4d33f80c4663dc5e5",
-        "594f803b380a41396ed63dca39503542",
-        "0b4e7a0e5fe84ad35fb5f95b9ceeac79",
-        "5d793fc5b00a2348c3fb9ab59e5ca98a",
-        "3dbe00a167653a1aaee01d93e77e730e",
-        "552e6a97297c53e592208cf97fbb3b60",
-        "e09c80c42fda55f9d992e59ca6b3307d",
-        "d57f21e6a273781dbf8b7657940f3b03",
-        "45e4812014d83dde5666ebdf5a8ed1ed",
-        "c162de19c4c3731ca3428769d0cd593d",
-        "451599a5f9afa91a0f2097040a796f3d",
-        "12f9cf6998d52dbe773b06f848bb3608",
-        "23ca472302f49b3ea5592b146a312da0",
-        "88e42e96cc71151b6e1938a1699b0a27",
-        "2c60c24e7087e18e45055a33f9a5be91",
-        "639d76897485360b3147e66e0a8a3d6c",
-        "22d42eb002cefa81e9ad604ea57bc01d",
-        "bd049f221af82804c5a2826809337c9b",
-        "ff49cfac3968dbce26ebe7d4823e58bd",
-        "d95dbfee231e34cccb8c04444412ed7d",
-        "40edae4bad0e5bf6d6c2dc5615a86afb",
-        "a5a8bfa3962f49330227955e24a2e67c",
-        "ae791f19bdf77357ff10bb6b0e97e121",
-        "aaab9c59a88bf0bdfcb170546c5459d6",
-        "b0f0545856af1a340acdedce23c54b97",
-        "f7ce3d7d44f3342107d884bfa90c966a",
-        "59e794d45697b360e18ba972bada0123",
-        "3b0845db57c200be6052466f87b2198a",
-        "5eca9bd3eb07c006cd43ae48dfde7fd3",
-        "b4f13cb081e412f44e99742cb128a1a5",
-        "4c660346451b8cf91ef50f4634458d41",
-        "11db24dc3f6c2145701db08625dd6d76",
-        "80dad3aad8584778352c68ab06250327",
-        "1227fe415e79db47285cb2689c93963f",
-        "8e084f489f1bdf08c39f98ff6447ce6d",
-        "08b2f2b0864bac1ba1585043362cbec9",
-        "4697843037d962f62a5a429e611e0f5f",
-        "10c4da18575c092b486f8ab96c01c02f",
-        "af205d729450b663f48b11d839a1c8df",
-        "0d3f91798fac6ee279ec2485b25f1124",
-        "4c3c7c067634daec9716a80ea886d123",
-        "d1e358e6e3b707282cdd06e919f7e08c",
-        "8c6ded4f0af86e0a7e301f8a716c4363",
-        "4c2d8bcb02d982d7cb77f649c0a2dea8",
-        "bdb662f765cd310f2a547cab1cfecef6",
-        "08ff5f7301d30200ab89169f6afdb7af",
-        "6eb6a030bcce166534b95bc2ab45d9cf",
-        "1bb77918e5695c944be02c16ae29b25e",
-        "b6fe77c19f0f0f4946c761d62585bfea",
-        "e9e7e260dce84ffa6e0e7eb5fd9d37fc",
-        "eced9e0b81ef2bba605cbc5e2e76a1d0",
-        "ef1772b6dff9a122358552954ad0df65",
-        "3b0c8ac703f828b04c6c197006d17218",
-        "652b906d60af96844ebd21b674f35e93",
-        "dc2f2f2462a0d72358b2f99389458606",
-        "762fc2665994b217c52c3c2eb7d9f406",
-        "cc7ed669cf88f201c3297c6a91e1d18d",
-        "cced11f7bbbffea2f718903216643648",
-        "24612f0ce2c9d2cf2b022ef1e027a54f",
-        "b06521f39153d618550606be297466d5",
-        "014842d480b571495a4a0363793f7367",
-        "c743a45e0d2e6a95cb859adae0248435",
-        "def5d97e01e1219fb2fc8da6c4d6ba2f",
-        "92cb737f8687ccb93022fdb411a77cca",
-        "a0d1395c7fb36247bfe2d49376d9d133",
-        "ab75504250558b788f99d1ebd219abf2",
-        "0f5c6c4e740bfcc08c3c26ccb2673d46",
-        "cddd19bec7f310d8c87149ef47a1828f",
-        "96b39b8b95e016c79d104d83395b8133",
-        "f1fc0b14ff8fa674b02344577e23eeb1",
-        "0e8d28a1cafa3ffcff22afd480cce7d8",
-        "448539ffc17e1e81005b65581855cef4",
-        "61e39aae7c53e6e77db2e4405d9fb157",
-        "618a426895ee6133a372bebd1129b63e",
-        "046c90690c9e36578b9d4a7e1d249c75",
-        "aadab38075c43296ee7e12466ebb03e3",
-        "b15af9cdabbaea0516866a33d8fd0f98",
-        "986e6938ed767a8ae9530eef54bfe5f1",
-        "7ae25a72b71a42ccbc5477fd989cd512",
-        "98d34e50d4aa7a893cc7919a91acb0e3",
-        "3fc53fc22ea40f1a0afd78fc2cd9aa0f",
-        "923e37c738b9d7b1526f70b65229cc3d",
-        "b3966b7a08e5d46fd0774b797ba78dc2",
-        "f50c7286b540bb181db1d6e05a51a296",
-        "4efd6c8826e65a61f82af954d431b59b",
-        "ef1031e79e7a15a4470a5e98b23781b5",
-        "067876bfd0df0f4c5002780ec85e6f8c",
-        "789851dfa4c03563e9cef5f7bc050a7e",
-        "baf934720818ee49477e74fc644faa5e",
-        "9a0ea77ca26d2c121ddcc179edb76308",
-        "20c825561572e33d026f99ddfd999538",
-        "464c461455c5a927079a13609c20b637",
-        "cf37d42f89b6adb0e1a9e99104501b82",
-        "d266af45e3d06b70d9f52e2df4344186",
-        "f8b59fa22eb0ba944e2b7aa24d67b681",
-        "0918d7c2f9062743450a86eae9dde1a3",
-        "36a92cc94a9e0fa21f625f8bfb007adf",
-        "681d73898dad5685d48b5e8438bc3a66",
-        "337ccef058459c3c16411381778da0c4",
-        "6ccdfcc742862036ce07583633c5f77e",
-        "ddfa1adc974649dc5b414be86def7457",
-        "650ebc28ad85f11aa4b63b6ee565b89d",
-        "e4571793bcaba284017eeabd8df85697",
-        "4fc040d354ad9ba5e4f62862109d3e17",
-        "25814274e02aa7cc03d6314eb703e655",
-        "11378ecaee0089c840d26352704027e3",
-        "86f950bfcd824d5546da01c40576db31",
-        "089f243d1e831c5879aa375ee364a06e",
-        "9146ef3527c7cfcc66dc615c3986e391",
-        "d727cfdfc9ed0347e6917a68b982f7bc",
-        "da8f45e1fdc12deecfe56aeb5288796e",
-        "29cfcf52d8250a253a535cf7989c7bd2",
-        "0f6eb555b8e3c35411eebe9348594193",
-        "a922439f963e7e59040e4756992c6f1b",
-        "81f8453cf3f7e5ee5479c777e5a8d80c",
-        "8a7bd0732ed6a28ce75f6dabc90e1613",
-        "5f61c0ccad4cac44c75ff505e1f1e537",
-        "f6acfca2d47c87f2b14ca038234d3614",
-        "269fc62c517f3d55c368152addca57e7",
-        "50587cb16413da779b35508018721647",
-        "5e4a3ecfdaa4636b84a39b6a7be7c047",
-        "c5339dc2af6bf595580281ffb07353f6",
-        "e51176a47347e167ed0ed766b6de1a0c",
-        "020406e1d05cdc2aa287641f7ae2cc39",
-        "e510683b3f5ffe4093d021808bc6ff70",
-        "b325dc1c6f5e7a2b7cf465b9feab7948",
-      ]
-
-      Ext_array_test.range(0, 129)
-      |> Array.map(i => (
-        Belt.Int.toString(i),
-        _ => Mt.Eq(\"@@"(Digest.to_hex, \"@@"(Digest.string, String.make(i, 'a'))), ref[i]),
-      ))
-      |> Array.to_list
-    },
-  ),
-)
diff --git a/jscomp/test/directives.js b/jscomp/test/directives.js
deleted file mode 100644
index bb2c1a8..0000000
--- a/jscomp/test/directives.js
+++ /dev/null
@@ -1,11 +0,0 @@
-first directive;
-second directive;
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Belt_Array = require("../../lib/js/belt_Array.js");
-
-var a = Belt_Array.forEach;
-
-exports.a = a;
-/* No side effect */
diff --git a/jscomp/test/directives.res b/jscomp/test/directives.res
deleted file mode 100644
index 7e7c2e7..0000000
--- a/jscomp/test/directives.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@@directive("first directive;")
-@@directive("second directive;")
-
-let a = Belt.Array.forEach
-
diff --git a/jscomp/test/div_by_zero_test.js b/jscomp/test/div_by_zero_test.js
deleted file mode 100644
index 1143ba4..0000000
--- a/jscomp/test/div_by_zero_test.js
+++ /dev/null
@@ -1,129 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_int32 = require("../../lib/js/caml_int32.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function add(suite) {
-  suites.contents = {
-    hd: suite,
-    tl: suites.contents
-  };
-}
-
-add([
-      "File \"div_by_zero_test.res\", line 11, characters 7-14",
-      (function (param) {
-          return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int32.div(3, 0);
-                    })
-                };
-        })
-    ]);
-
-add([
-      "File \"div_by_zero_test.res\", line 12, characters 7-14",
-      (function (param) {
-          return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int32.mod_(3, 0);
-                    })
-                };
-        })
-    ]);
-
-add([
-      "File \"div_by_zero_test.res\", line 13, characters 7-14",
-      (function (param) {
-          return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int32.div(3, 0);
-                    })
-                };
-        })
-    ]);
-
-add([
-      "File \"div_by_zero_test.res\", line 14, characters 7-14",
-      (function (param) {
-          return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int32.mod_(3, 0);
-                    })
-                };
-        })
-    ]);
-
-add([
-      "File \"div_by_zero_test.res\", line 15, characters 7-14",
-      (function (param) {
-          return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int64.div([
-                            0,
-                            3
-                          ], Caml_int64.zero);
-                    })
-                };
-        })
-    ]);
-
-add([
-      "File \"div_by_zero_test.res\", line 16, characters 7-14",
-      (function (param) {
-          return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Caml_int64.mod_([
-                            0,
-                            3
-                          ], Caml_int64.zero);
-                    })
-                };
-        })
-    ]);
-
-function div(x, y) {
-  return Caml_int32.div(x, y) + 3 | 0;
-}
-
-Mt.from_pair_suites("Div_by_zero_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.add = add;
-exports.div = div;
-/*  Not a pure module */
diff --git a/jscomp/test/div_by_zero_test.res b/jscomp/test/div_by_zero_test.res
deleted file mode 100644
index 3450b6c..0000000
--- a/jscomp/test/div_by_zero_test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-let add = suite => suites := list{suite, ...suites.contents}
-
-let () = {
-  add((__LOC__, _ => ThrowAny(_ => ignore(3 / 0))))
-  add((__LOC__, _ => ThrowAny(_ => ignore(mod(3, 0)))))
-  add((__LOC__, _ => ThrowAny(_ => ignore(Int32.div(3l, 0l)))))
-  add((__LOC__, _ => ThrowAny(_ => ignore(Int32.rem(3l, 0l)))))
-  add((__LOC__, _ => ThrowAny(_ => ignore(Int64.div(3L, 0L)))))
-  add((__LOC__, _ => ThrowAny(_ => ignore(Int64.rem(3L, 0L)))))
-}
-
-let div = (x, y) => x / y + 3
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/dollar_escape_test.js b/jscomp/test/dollar_escape_test.js
deleted file mode 100644
index 963db67..0000000
--- a/jscomp/test/dollar_escape_test.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function $$(x, y) {
-  return x + y | 0;
-}
-
-function $$$plus(x, y) {
-  return Math.imul(x, y);
-}
-
-eq("File \"dollar_escape_test.res\", line 17, characters 3-10", 3, 3);
-
-eq("File \"dollar_escape_test.res\", line 18, characters 3-10", 3, 3);
-
-Mt.from_pair_suites("Dollar_escape_test", suites.contents);
-
-var v = 3;
-
-var u = 3;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.$$ = $$;
-exports.v = v;
-exports.$$$plus = $$$plus;
-exports.u = u;
-/*  Not a pure module */
diff --git a/jscomp/test/dollar_escape_test.res b/jscomp/test/dollar_escape_test.res
deleted file mode 100644
index aec582f..0000000
--- a/jscomp/test/dollar_escape_test.res
+++ /dev/null
@@ -1,19 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let \"$$" = (x, y) => x + y
-
-let v = \"$$"(1, 2)
-
-let \"$$+" = (x, y) => x * y
-
-let u = \"$$+"(1, 3)
-
-eq(__LOC__, v, 3)
-eq(__LOC__, u, 3)
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/earger_curry_test.js b/jscomp/test/earger_curry_test.js
deleted file mode 100644
index 123a360..0000000
--- a/jscomp/test/earger_curry_test.js
+++ /dev/null
@@ -1,192 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-function map(f, a) {
-  var f$1 = Curry.__1(f);
-  var l = a.length;
-  if (l === 0) {
-    return [];
-  }
-  var r = Caml_array.make(l, f$1(a[0]));
-  for(var i = 1; i < l; ++i){
-    r[i] = f$1(a[i]);
-  }
-  return r;
-}
-
-function init(l, f) {
-  var f$1 = Curry.__1(f);
-  if (l === 0) {
-    return [];
-  }
-  if (l < 0) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Array.init",
-          Error: new Error()
-        };
-  }
-  var res = Caml_array.make(l, f$1(0));
-  for(var i = 1; i < l; ++i){
-    res[i] = f$1(i);
-  }
-  return res;
-}
-
-function fold_left(f, x, a) {
-  var f$1 = Curry.__2(f);
-  var r = x;
-  for(var i = 0 ,i_finish = a.length; i < i_finish; ++i){
-    r = f$1(r, a[i]);
-  }
-  return r;
-}
-
-function f2(param) {
-  var arr = init(30000000, (function (i) {
-          return i;
-        }));
-  var b = map((function (i) {
-          return i + i - 1;
-        }), arr);
-  var v = fold_left((function (prim0, prim1) {
-          return prim0 + prim1;
-        }), 0, b);
-  console.log(Pervasives.string_of_float(v));
-}
-
-f2();
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var v = {
-  contents: 0
-};
-
-var all_v = {
-  contents: /* [] */0
-};
-
-function add5(a0, a1, a2, a3, a4) {
-  console.log([
-        a0,
-        a1,
-        a2,
-        a3,
-        a4
-      ]);
-  all_v.contents = {
-    hd: v.contents,
-    tl: all_v.contents
-  };
-  return (((a0 + a1 | 0) + a2 | 0) + a3 | 0) + a4 | 0;
-}
-
-function f(x) {
-  v.contents = v.contents + 1 | 0;
-  var partial_arg = 2;
-  v.contents = v.contents + 1 | 0;
-  var partial_arg$1 = 1;
-  return function (param, param$1) {
-    return add5(x, partial_arg$1, partial_arg, param, param$1);
-  };
-}
-
-function g(x) {
-  v.contents = v.contents + 1 | 0;
-  var partial_arg = 2;
-  v.contents = v.contents + 1 | 0;
-  var partial_arg$1 = 1;
-  var u = function (param, param$1) {
-    return add5(x, partial_arg$1, partial_arg, param, param$1);
-  };
-  all_v.contents = {
-    hd: v.contents,
-    tl: all_v.contents
-  };
-  return u;
-}
-
-var a = f(0)(3, 4);
-
-var b = f(0)(3, 5);
-
-var c = Curry._2(g(0), 3, 4);
-
-var d = Curry._2(g(0), 3, 5);
-
-eq("File \"earger_curry_test.res\", line 138, characters 5-12", a, 10);
-
-eq("File \"earger_curry_test.res\", line 139, characters 5-12", b, 11);
-
-eq("File \"earger_curry_test.res\", line 140, characters 5-12", c, 10);
-
-eq("File \"earger_curry_test.res\", line 141, characters 5-12", d, 11);
-
-eq("File \"earger_curry_test.res\", line 142, characters 5-12", all_v.contents, {
-      hd: 8,
-      tl: {
-        hd: 8,
-        tl: {
-          hd: 6,
-          tl: {
-            hd: 6,
-            tl: {
-              hd: 4,
-              tl: {
-                hd: 2,
-                tl: /* [] */0
-              }
-            }
-          }
-        }
-      }
-    });
-
-Mt.from_pair_suites("Earger_curry_test", suites.contents);
-
-exports.map = map;
-exports.init = init;
-exports.fold_left = fold_left;
-exports.f2 = f2;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.v = v;
-exports.all_v = all_v;
-exports.add5 = add5;
-exports.f = f;
-exports.g = g;
-exports.a = a;
-exports.b = b;
-exports.c = c;
-exports.d = d;
-/*  Not a pure module */
diff --git a/jscomp/test/earger_curry_test.res b/jscomp/test/earger_curry_test.res
deleted file mode 100644
index a830134..0000000
--- a/jscomp/test/earger_curry_test.res
+++ /dev/null
@@ -1,144 +0,0 @@
-let f = g => (. x) => g(x)
-
-let map = (f, a) => {
-  let l = Array.length(a)
-  if l == 0 {
-    []
-  } else {
-    let r = Array.make(l, f(. Array.unsafe_get(a, 0)))
-    for i in 1 to l - 1 {
-      Array.unsafe_set(r, i, f(. Array.unsafe_get(a, i)))
-    }
-    r
-  }
-}
-
-let map = (type u v, f: u => v, a: array<u>): array<v> => map((. x) => f(x), a)
-
-let init = (l, f) =>
-  if l == 0 {
-    []
-  } else if l < 0 {
-    invalid_arg("Array.init")
-  } else {
-    /* See #6575. We could also check for maximum array size, but this depends
-     on whether we create a float array or a regular one... */
-
-    let res = Array.make(l, f(. 0))
-    for i in 1 to pred(l) {
-      Array.unsafe_set(res, i, f(. i))
-    }
-    res
-  }
-
-let init = (l, f) => init(l, (. x) => f(x))
-
-let fold_left = (f, x, a) => {
-  let r = ref(x)
-  for i in 0 to Array.length(a) - 1 {
-    r := f(. r.contents, Array.unsafe_get(a, i))
-  }
-  r.contents
-}
-
-let fold_left = (f, x, a) => fold_left((. x, y) => f(x, y), x, a)
-
-@val external timeStart: string => unit = "console.time"
-
-@val external timeEnd: string => unit = "console.timeEnd"
-
-let f = {
-  open Array
-  () => {
-    let arr = init(10000000, i => float_of_int(i))
-    let b = map(i => i +. i -. 1., arr)
-    let v = fold_left(\"+.", 0., b)
-    print_endline(string_of_float(v))
-  }
-}
-
-let f2 = () => {
-  let arr = init(30_000_000, i => float_of_int(i))
-  let b = map(i => i +. i -. 1., arr)
-  let v = fold_left(\"+.", 0., b)
-  print_endline(string_of_float(v))
-}
-
-/* let time label f = */
-/* timeStart label ; */
-/* f (); */
-/* timeEnd label */
-
-/* ;; */
-/* begin */
-/* time "curried" f ; */
-/* time "uncurried" f2; */
-/* end */
-
-let () = f2()
-
-/* ocamlbuild */
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let v = ref(0)
-
-let all_v = ref(list{})
-
-let add5 = (a0, a1, a2, a3, a4) => {
-  /* [@bs.noinline] ; */ /* Makes sense for debugging */
-  Js.log((a0, a1, a2, a3, a4))
-  all_v := list{v.contents, ...all_v.contents}
-  a0 + a1 + a2 + a3 + a4
-}
-
-let f = x =>
-  /* let u = */ add5(
-    x,
-    {
-      incr(v)
-      1
-    },
-    {
-      incr(v)
-      2
-    },
-  ) /* in */
-/* all_v := !v :: !all_v ;
- u */
-
-let g = x => {
-  let u = add5(
-    x,
-    {
-      incr(v)
-      1
-    },
-    {
-      incr(v)
-      2
-    },
-  )
-  all_v := list{v.contents, ...all_v.contents}
-  u
-}
-let a = f(0, 3, 4)
-
-let b = f(0, 3, 5)
-
-let c = g(0, 3, 4)
-let d = g(0, 3, 5)
-
-let () = {
-  eq(__LOC__, a, 10)
-  eq(__LOC__, b, 11)
-  eq(__LOC__, c, 10)
-  eq(__LOC__, d, 11)
-  eq(__LOC__, all_v.contents, list{8, 8, 6, 6, 4, 2})
-}
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/effect.js b/jscomp/test/effect.js
deleted file mode 100644
index 9dbab81..0000000
--- a/jscomp/test/effect.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log("hello");
-
-console.log("hey");
-
-var a = 3;
-
-var b = 4;
-
-var c = 3;
-
-exports.a = a;
-exports.b = b;
-exports.c = c;
-/*  Not a pure module */
diff --git a/jscomp/test/effect.res b/jscomp/test/effect.res
deleted file mode 100644
index 69adcf6..0000000
--- a/jscomp/test/effect.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let a = 3
-let b = 4
-let () = Js.log("hello")
-Js.log("hey")
-let c = 3
diff --git a/jscomp/test/epsilon_test.js b/jscomp/test/epsilon_test.js
deleted file mode 100644
index e64f49f..0000000
--- a/jscomp/test/epsilon_test.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-var v = (Number.EPSILON?Number.EPSILON:2.220446049250313e-16);
-
-var suites_0 = [
-  "epsilon",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: Pervasives.epsilon_float,
-              _1: v
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "raw_epsilon",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: 2.220446049250313e-16,
-                _1: v
-              };
-      })
-  ],
-  tl: /* [] */0
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Epsilon_test", suites);
-
-exports.v = v;
-exports.suites = suites;
-/* v Not a pure module */
diff --git a/jscomp/test/epsilon_test.res b/jscomp/test/epsilon_test.res
deleted file mode 100644
index 1e12b89..0000000
--- a/jscomp/test/epsilon_test.res
+++ /dev/null
@@ -1,8 +0,0 @@
-let v = %raw(`Number.EPSILON?Number.EPSILON:2.220446049250313e-16`)
-
-let suites = {
-  open Mt
-  list{("epsilon", _ => Eq(epsilon_float, v)), ("raw_epsilon", _ => Eq(2.220446049250313e-16, v))}
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/equal_box_test.js b/jscomp/test/equal_box_test.js
deleted file mode 100644
index 12d1d4e..0000000
--- a/jscomp/test/equal_box_test.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-
-var aa = Caml_obj.equal_null;
-
-var bb = Caml_obj.equal_undefined;
-
-var cc = Caml_obj.equal_nullable;
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function f(param) {
-  
-}
-
-function shouldBeNull(param) {
-  return null;
-}
-
-b("File \"equal_box_test.res\", line 18, characters 4-11", 3 !== null);
-
-b("File \"equal_box_test.res\", line 19, characters 4-11", undefined !== null);
-
-b("File \"equal_box_test.res\", line 20, characters 4-11", "3" !== null);
-
-b("File \"equal_box_test.res\", line 21, characters 4-11", /* '3' */51 !== null);
-
-b("File \"equal_box_test.res\", line 22, characters 4-11", !Caml_int64.equal_null(Caml_int64.zero, null));
-
-b("File \"equal_box_test.res\", line 23, characters 4-11", 0 !== null);
-
-b("File \"equal_box_test.res\", line 24, characters 4-11", true);
-
-b("File \"equal_box_test.res\", line 25, characters 4-11", !Caml_obj.equal_null(undefined, null));
-
-b("File \"equal_box_test.res\", line 26, characters 4-11", Caml_obj.equal_null(null, null));
-
-b("File \"equal_box_test.res\", line 27, characters 4-11", true);
-
-b("File \"equal_box_test.res\", line 28, characters 4-11", true);
-
-b("File \"equal_box_test.res\", line 29, characters 4-11", !Caml_obj.equal_null(3, undefined));
-
-var v = null;
-
-b("File \"equal_box_test.res\", line 34, characters 4-11", 3 !== v);
-
-b("File \"equal_box_test.res\", line 35, characters 4-11", undefined !== v);
-
-b("File \"equal_box_test.res\", line 36, characters 4-11", "3" !== v);
-
-b("File \"equal_box_test.res\", line 37, characters 4-11", /* '3' */51 !== v);
-
-b("File \"equal_box_test.res\", line 38, characters 4-11", !Caml_int64.equal_nullable(Caml_int64.zero, v));
-
-b("File \"equal_box_test.res\", line 39, characters 4-11", 0 !== v);
-
-b("File \"equal_box_test.res\", line 40, characters 4-11", 0 !== v);
-
-b("File \"equal_box_test.res\", line 41, characters 4-11", !Caml_obj.equal_nullable(undefined, v));
-
-b("File \"equal_box_test.res\", line 42, characters 4-11", Caml_obj.equal_nullable(null, v));
-
-b("File \"equal_box_test.res\", line 43, characters 4-11", true);
-
-b("File \"equal_box_test.res\", line 44, characters 4-11", true);
-
-b("File \"equal_box_test.res\", line 45, characters 4-11", !Caml_obj.equal_nullable(3, undefined));
-
-b("File \"equal_box_test.res\", line 51, characters 4-11", 3 !== undefined);
-
-b("File \"equal_box_test.res\", line 52, characters 4-11", true);
-
-b("File \"equal_box_test.res\", line 53, characters 4-11", "3" !== undefined);
-
-b("File \"equal_box_test.res\", line 54, characters 4-11", /* '3' */51 !== undefined);
-
-b("File \"equal_box_test.res\", line 55, characters 4-11", !Caml_int64.equal_undefined(Caml_int64.zero, undefined));
-
-b("File \"equal_box_test.res\", line 56, characters 4-11", 0 !== undefined);
-
-b("File \"equal_box_test.res\", line 57, characters 4-11", true);
-
-b("File \"equal_box_test.res\", line 58, characters 4-11", Caml_obj.equal_undefined(undefined, undefined));
-
-b("File \"equal_box_test.res\", line 62, characters 4-11", !Caml_obj.equal_undefined(null, undefined));
-
-b("File \"equal_box_test.res\", line 63, characters 4-11", true);
-
-b("File \"equal_box_test.res\", line 64, characters 4-11", true);
-
-b("File \"equal_box_test.res\", line 65, characters 4-11", !Caml_obj.equal_undefined(3, undefined));
-
-Mt.from_pair_suites("File \"equal_box_test.res\", line 68, characters 20-27", suites.contents);
-
-exports.aa = aa;
-exports.bb = bb;
-exports.cc = cc;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.f = f;
-exports.shouldBeNull = shouldBeNull;
-/*  Not a pure module */
diff --git a/jscomp/test/equal_box_test.res b/jscomp/test/equal_box_test.res
deleted file mode 100644
index 1af73e2..0000000
--- a/jscomp/test/equal_box_test.res
+++ /dev/null
@@ -1,68 +0,0 @@
-external eqNull: ('a, ~box: Js.null<'a>) => bool = "%bs_equal_null"
-external eqUndefined: ('a, ~box: Js.undefined<'a>) => bool = "%bs_equal_undefined"
-
-external eqNullable: ('a, ~box: Js.nullable<'a>) => bool = "%bs_equal_nullable"
-
-let (aa, bb, cc) = (eqNull, eqUndefined, eqNullable)
-
-let suites = ref(list{})
-let test_id = ref(0)
-
-let eq = (loc, x, y) => Mt.eq_suites(~suites, ~test_id, loc, x, y)
-let b = (loc, x) => Mt.bool_suites(~suites, ~test_id, loc, x)
-
-let f = () => None
-let shouldBeNull = () => Js.null
-
-let () = {
-  b(__LOC__, !eqNull(3, ~box=Js.null))
-  b(__LOC__, !eqNull(None, ~box=Js.null))
-  b(__LOC__, !eqNull("3", ~box=Js.null))
-  b(__LOC__, !eqNull('3', ~box=Js.null))
-  b(__LOC__, !eqNull(0L, ~box=Js.null))
-  b(__LOC__, !eqNull(0, ~box=Js.null))
-  b(__LOC__, !eqNull(0., ~box=Js.null))
-  b(__LOC__, !eqNull(f(), ~box=Js.null))
-  b(__LOC__, eqNull(shouldBeNull(), ~box=Js.null))
-  b(__LOC__, !eqNull(1, ~box=Js.Null.return(3)))
-  b(__LOC__, eqNull(None, ~box=Js.Null.return(None)))
-  b(__LOC__, !eqNull(Some(3), ~box=Js.Null.return(None)))
-}
-
-let () = {
-  let v = Js.Nullable.null
-  b(__LOC__, !eqNullable(3, ~box=v))
-  b(__LOC__, !eqNullable(None, ~box=v))
-  b(__LOC__, !eqNullable("3", ~box=v))
-  b(__LOC__, !eqNullable('3', ~box=v))
-  b(__LOC__, !eqNullable(0L, ~box=v))
-  b(__LOC__, !eqNullable(0, ~box=v))
-  b(__LOC__, !eqNullable(0., ~box=v))
-  b(__LOC__, !eqNullable(f(), ~box=v))
-  b(__LOC__, eqNullable(shouldBeNull(), ~box=v))
-  b(__LOC__, !eqNullable(1, ~box=Js.Nullable.return(3)))
-  b(__LOC__, eqNullable(None, ~box=Js.Nullable.return(None)))
-  b(__LOC__, !eqNullable(Some(3), ~box=Js.Nullable.return(None)))
-}
-
-let () = {
-  let v = Js.Undefined.empty
-
-  b(__LOC__, !eqUndefined(3, ~box=v))
-  b(__LOC__, eqUndefined(None, ~box=v))
-  b(__LOC__, !eqUndefined("3", ~box=v))
-  b(__LOC__, !eqUndefined('3', ~box=v))
-  b(__LOC__, !eqUndefined(0L, ~box=v))
-  b(__LOC__, !eqUndefined(0, ~box=v))
-  b(__LOC__, !eqUndefined(0., ~box=v))
-  b(__LOC__, eqUndefined(f(), ~box=v))
-  /* [ None === undefined]
-     [ None === Js.Undefined.return None]
- */
-  b(__LOC__, !eqUndefined(shouldBeNull(), ~box=v))
-  b(__LOC__, !eqUndefined(1, ~box=Js.Undefined.return(3)))
-  b(__LOC__, eqUndefined(None, ~box=Js.Undefined.return(None)))
-  b(__LOC__, !eqUndefined(Some(3), ~box=Js.Undefined.return(None)))
-}
-
-Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/equal_exception_test.js b/jscomp/test/equal_exception_test.js
deleted file mode 100644
index 454bba7..0000000
--- a/jscomp/test/equal_exception_test.js
+++ /dev/null
@@ -1,191 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Bytes = require("../../lib/js/bytes.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var v = "gso";
-
-function is_equal(param) {
-  if (Caml_bytes.get(Bytes.make(3, /* 'a' */97), 0) !== /* 'a' */97) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "equal_exception_test.res",
-            4,
-            2
-          ],
-          Error: new Error()
-        };
-  }
-  if (Bytes.make(3, /* 'a' */97)[0] !== /* 'a' */97) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "equal_exception_test.res",
-            5,
-            2
-          ],
-          Error: new Error()
-        };
-  }
-  var u = Bytes.make(3, /* 'a' */97);
-  u[0] = /* 'b' */98;
-  if (u[0] !== /* 'b' */98) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "equal_exception_test.res",
-            8,
-            2
-          ],
-          Error: new Error()
-        };
-  }
-  if (Caml_string.get(v, 0) === /* 'g' */103) {
-    return ;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "equal_exception_test.res",
-          9,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function is_exception(param) {
-  try {
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Not_found") {
-      return ;
-    }
-    throw exn;
-  }
-}
-
-function is_normal_exception(_x) {
-  var A = /* @__PURE__ */Caml_exceptions.create("A");
-  var v = {
-    RE_EXN_ID: A,
-    _1: 3
-  };
-  try {
-    throw v;
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === A) {
-      if (exn._1 === 3) {
-        return ;
-      }
-      throw exn;
-    }
-    throw exn;
-  }
-}
-
-function is_arbitrary_exception(param) {
-  var A = /* @__PURE__ */Caml_exceptions.create("A");
-  try {
-    throw {
-          RE_EXN_ID: A,
-          Error: new Error()
-        };
-  }
-  catch (exn){
-    return ;
-  }
-}
-
-var suites_0 = [
-  "is_equal",
-  is_equal
-];
-
-var suites_1 = {
-  hd: [
-    "is_exception",
-    is_exception
-  ],
-  tl: {
-    hd: [
-      "is_normal_exception",
-      is_normal_exception
-    ],
-    tl: {
-      hd: [
-        "is_arbitrary_exception",
-        is_arbitrary_exception
-      ],
-      tl: /* [] */0
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-var e = {
-  RE_EXN_ID: "Not_found"
-};
-
-function eq(x) {
-  return x.RE_EXN_ID === "Not_found";
-}
-
-var Not_found = /* @__PURE__ */Caml_exceptions.create("Equal_exception_test.Not_found");
-
-if (Caml_obj.equal(e, {
-        RE_EXN_ID: Not_found
-      }) !== false) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "equal_exception_test.res",
-          50,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (Not_found === "Not_found" !== false) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "equal_exception_test.res",
-          51,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-Mt.from_suites("exception", suites);
-
-exports.v = v;
-exports.is_equal = is_equal;
-exports.is_exception = is_exception;
-exports.is_normal_exception = is_normal_exception;
-exports.is_arbitrary_exception = is_arbitrary_exception;
-exports.suites = suites;
-exports.e = e;
-exports.eq = eq;
-exports.Not_found = Not_found;
-/*  Not a pure module */
diff --git a/jscomp/test/equal_exception_test.res b/jscomp/test/equal_exception_test.res
deleted file mode 100644
index 4e7382c..0000000
--- a/jscomp/test/equal_exception_test.res
+++ /dev/null
@@ -1,53 +0,0 @@
-let v = "gso"
-
-let is_equal = () => {
-  assert (Bytes.get(Bytes.make(3, 'a'), 0) == 'a')
-  assert (Bytes.unsafe_get(Bytes.make(3, 'a'), 0) == 'a')
-  let u = Bytes.make(3, 'a')
-  Bytes.unsafe_set(u, 0, 'b')
-  assert (Bytes.unsafe_get(u, 0) == 'b')
-  assert (String.get(v, 0) == 'g')
-}
-
-let is_exception = () =>
-  try raise(Not_found) catch {
-  | Not_found => ()
-  }
-
-let is_normal_exception = _x => {
-  module E = {
-    exception A(int)
-  }
-  let v = E.A(3)
-  try raise(v) catch {
-  | E.A(3) => ()
-  }
-}
-
-let is_arbitrary_exception = () => {
-  module E = {
-    exception A
-  }
-  try raise(E.A) catch {
-  | _ => ()
-  }
-}
-
-let suites = list{
-  ("is_equal", is_equal),
-  ("is_exception", is_exception),
-  ("is_normal_exception", is_normal_exception),
-  ("is_arbitrary_exception", is_arbitrary_exception),
-}
-
-let e = Not_found
-let eq = x =>
-  switch x {
-  | Not_found => true
-  | _ => false
-  }
-exception Not_found
-assert ((e == Not_found) == false)
-assert (eq(Not_found) == false)
-
-Mt.from_suites("exception", suites)
diff --git a/jscomp/test/equal_test.js b/jscomp/test/equal_test.js
deleted file mode 100644
index c7f3bd2..0000000
--- a/jscomp/test/equal_test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function str_equal(x, y) {
-  return x === y;
-}
-
-var str_b = true;
-
-function int_equal(x, y) {
-  return x === y;
-}
-
-function float_equal(x, y) {
-  return x === y;
-}
-
-var v = false;
-
-exports.str_equal = str_equal;
-exports.str_b = str_b;
-exports.int_equal = int_equal;
-exports.v = v;
-exports.float_equal = float_equal;
-/* str_b Not a pure module */
diff --git a/jscomp/test/equal_test.res b/jscomp/test/equal_test.res
deleted file mode 100644
index bc91d86..0000000
--- a/jscomp/test/equal_test.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let str_equal = (x: string, y) => x == y
-
-let str_b = "xx" == "xx"
-
-let int_equal = (x: int, y) => x == y
-
-let v = 1 == 2
-
-let float_equal = (x: float, y) => x == y
diff --git a/jscomp/test/es6_export.js b/jscomp/test/es6_export.js
deleted file mode 100644
index 6ea1b96..0000000
--- a/jscomp/test/es6_export.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var $$default = 3;
-
-exports.default = $$default;
-exports.__esModule = true;
-/* No side effect */
diff --git a/jscomp/test/es6_export.mjs b/jscomp/test/es6_export.mjs
deleted file mode 100644
index e20f50b..0000000
--- a/jscomp/test/es6_export.mjs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-var $$default = 3;
-
-export {
-  $$default as default,
-}
-/* No side effect */
diff --git a/jscomp/test/es6_export.res b/jscomp/test/es6_export.res
deleted file mode 100644
index f1d5fa4..0000000
--- a/jscomp/test/es6_export.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@@config({flags: ["-bs-package-output", "es6:jscomp/test:.mjs"]})
-let default = 3
diff --git a/jscomp/test/es6_import.js b/jscomp/test/es6_import.js
deleted file mode 100644
index 8af25c4..0000000
--- a/jscomp/test/es6_import.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Es6_export = require("./es6_export.js");
-
-console.log(Es6_export.default);
-
-/*  Not a pure module */
diff --git a/jscomp/test/es6_import.mjs b/jscomp/test/es6_import.mjs
deleted file mode 100644
index e6f5725..0000000
--- a/jscomp/test/es6_import.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-import * as Es6_export from "./es6_export.mjs";
-
-console.log(Es6_export.default);
-
-export {
-  
-}
-/*  Not a pure module */
diff --git a/jscomp/test/es6_import.res b/jscomp/test/es6_import.res
deleted file mode 100644
index 581f96d..0000000
--- a/jscomp/test/es6_import.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@@config({flags: ["-bs-package-output", "es6:jscomp/test:.mjs"]})
-Js.log(Es6_export.default)
diff --git a/jscomp/test/es6_module_test.js b/jscomp/test/es6_module_test.js
deleted file mode 100644
index 6bee56a..0000000
--- a/jscomp/test/es6_module_test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-
-function length(param) {
-  return 3;
-}
-
-Mt.from_pair_suites("Es6_module_test", {
-      hd: [
-        "list_length",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: List.length({
-                          hd: 1,
-                          tl: {
-                            hd: 2,
-                            tl: /* [] */0
-                          }
-                        }),
-                    _1: 2
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "length",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: 3,
-                      _1: 3
-                    };
-            })
-        ],
-        tl: /* [] */0
-      }
-    });
-
-exports.length = length;
-/*  Not a pure module */
diff --git a/jscomp/test/es6_module_test.res b/jscomp/test/es6_module_test.res
deleted file mode 100644
index dbc4bd8..0000000
--- a/jscomp/test/es6_module_test.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let length = _ => 3
-
-/* Test name collision */
-Mt.from_pair_suites(
-  __MODULE__,
-  list{
-    ("list_length", _ => Eq(List.length(list{1, 2}), 2)),
-    ("length", _ => Eq(length(list{1, 2}), 3)),
-  },
-)
diff --git a/jscomp/test/escape_esmodule.js b/jscomp/test/escape_esmodule.js
deleted file mode 100644
index 40ca26b..0000000
--- a/jscomp/test/escape_esmodule.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var $$__esModule = false;
-
-var $$default = 4;
-
-exports.$$__esModule = $$__esModule;
-exports.default = $$default;
-exports.__esModule = true;
-/* No side effect */
diff --git a/jscomp/test/escape_esmodule.res b/jscomp/test/escape_esmodule.res
deleted file mode 100644
index 8a2f63a..0000000
--- a/jscomp/test/escape_esmodule.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let __esModule = false
-
-let default = 4
diff --git a/jscomp/test/esmodule_ref.js b/jscomp/test/esmodule_ref.js
deleted file mode 100644
index 2afa672..0000000
--- a/jscomp/test/esmodule_ref.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log(false);
-
-/*  Not a pure module */
diff --git a/jscomp/test/esmodule_ref.res b/jscomp/test/esmodule_ref.res
deleted file mode 100644
index 4794e81..0000000
--- a/jscomp/test/esmodule_ref.res
+++ /dev/null
@@ -1,2 +0,0 @@
-assert(!Escape_esmodule.__esModule)
-Js.log(Escape_esmodule.__esModule)
diff --git a/jscomp/test/event_ffi.js b/jscomp/test/event_ffi.js
deleted file mode 100644
index e422d71..0000000
--- a/jscomp/test/event_ffi.js
+++ /dev/null
@@ -1,82 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-
-function h0(x) {
-  return x();
-}
-
-function h00(x) {
-  return x();
-}
-
-function h1(x, y) {
-  return x(y);
-}
-
-function h10(x) {
-  return x(3);
-}
-
-function h30(x) {
-  return function (a) {
-    return x(3, 3, a);
-  };
-}
-
-function h33(x) {
-  return x(1, 2, 3);
-}
-
-function h34(x) {
-  return Curry._1(x(1, 2, 3), 4);
-}
-
-function ocaml_run(b, c) {
-  var x = 1;
-  return (x + b | 0) + c | 0;
-}
-
-function a0() {
-  console.log("hi");
-}
-
-function a1(param) {
-  return function (x) {
-    return x;
-  };
-}
-
-function a2(x, y) {
-  return x + y | 0;
-}
-
-function a3(x, y, z) {
-  return (x + y | 0) + z | 0;
-}
-
-function xx(param) {
-  return function (param) {
-    console.log(3);
-  };
-}
-
-var test_as = List.map;
-
-exports.h0 = h0;
-exports.h00 = h00;
-exports.h1 = h1;
-exports.h10 = h10;
-exports.h30 = h30;
-exports.h33 = h33;
-exports.h34 = h34;
-exports.ocaml_run = ocaml_run;
-exports.a0 = a0;
-exports.a1 = a1;
-exports.a2 = a2;
-exports.a3 = a3;
-exports.test_as = test_as;
-exports.xx = xx;
-/* No side effect */
diff --git a/jscomp/test/event_ffi.res b/jscomp/test/event_ffi.res
deleted file mode 100644
index 548cbee..0000000
--- a/jscomp/test/event_ffi.res
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-type process 
-
-external on : process -> 
-  [
-  `beforeExit 
-  | `exit 
-  ] ->  unit Js.fn -> unit = "on" [@@bs.send]
-
-
-external p : process = "process" [@@bs.val]
-
-
-external on_hi : process -> 
-  [
-  `hello
-  | `xx
-  ] ->  (unit*unit) Js.fn -> unit = "on" [@@bs.send]
-
-type 'a t 
-
-external (!) : 'a t -> 'a = "identity"
-
-let f x = 
-  !x # hey 3  + !x # v
-
-let () = 
-  on p `exit (Js.Internal.fn_mk0 (fun _ -> prerr_endline "hello world"));
-  on_hi p `xx (Js.Internal.fn_mk1 (fun _ -> prerr_endline "hello world"))
-
-*/
-
-let h0 = x => x(.)
-/* {[
-     function h0 (x){
-         return x ()
-       }
-   ]}
-*/
-let h00 = x => x(.)
-
-let h1 = (x, y) => x(. y) /* weird case */
-/*
-bucklescript$bsc -bs-syntax-only -dsource -bs-eval 'let h1 x = fun y -> x y'
-let h1 x y = x y
-*/
-let h10 = x => x(. 3)
-
-let h30 = x => (. a) => x(. 3, 3, a)
-let h33 = x => x(. 1, 2, 3)
-let h34 = x => x(. 1, 2, 3)(4)
-
-let ocaml_run = (. b, c) => ((. x, y, z) => x + y + z)(. 1, b, c)
-
-let a0 = (. ()) => Js.log("hi")
-let a1 = () => (. x) => x
-let a2 = (. x, y) => x + y
-let a3 = (. x, y, z) => x + y + z
-/* let a4 = Js.Internal.fn_mk4 (fun x y z -> let u = x * x + y * y + z * z in fun d -> u + d) */
-
-/* let a44 = Js.Internal.fn_mk4 (fun x y z d -> let u = x * x + y * y + z * z in  u + d) */
-
-/* let b44 () = Js.Internal.fn_mk4 (fun x y z d -> (x,y,z,d)) */
-/* polymoprhic restriction */
-
-let test_as: ('a => 'a, _ as 'b) => 'b = List.map
-
-let xx: unit => (. _) => unit = () => (. _) => Js.log(3)
-
-/* let test_hihi = hihi _ [@bs] */
diff --git a/jscomp/test/exception_alias.js b/jscomp/test/exception_alias.js
deleted file mode 100644
index c83f4f0..0000000
--- a/jscomp/test/exception_alias.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-
-var a0 = {
-  RE_EXN_ID: "Not_found"
-};
-
-var b = List.length({
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: /* [] */0
-      }
-    });
-
-var List$1 = {
-  compare_lengths: List.compare_lengths,
-  compare_length_with: List.compare_length_with,
-  cons: List.cons,
-  hd: List.hd,
-  tl: List.tl,
-  nth: List.nth,
-  nth_opt: List.nth_opt,
-  rev: List.rev,
-  init: List.init,
-  append: List.append,
-  rev_append: List.rev_append,
-  concat: List.concat,
-  flatten: List.flatten,
-  iter: List.iter,
-  iteri: List.iteri,
-  map: List.map,
-  mapi: List.mapi,
-  rev_map: List.rev_map,
-  fold_left: List.fold_left,
-  fold_right: List.fold_right,
-  iter2: List.iter2,
-  map2: List.map2,
-  rev_map2: List.rev_map2,
-  fold_left2: List.fold_left2,
-  fold_right2: List.fold_right2,
-  for_all: List.for_all,
-  exists: List.exists,
-  for_all2: List.for_all2,
-  exists2: List.exists2,
-  mem: List.mem,
-  memq: List.memq,
-  find: List.find,
-  find_opt: List.find_opt,
-  filter: List.filter,
-  find_all: List.find_all,
-  partition: List.partition,
-  assoc: List.assoc,
-  assoc_opt: List.assoc_opt,
-  assq: List.assq,
-  assq_opt: List.assq_opt,
-  mem_assoc: List.mem_assoc,
-  mem_assq: List.mem_assq,
-  remove_assoc: List.remove_assoc,
-  remove_assq: List.remove_assq,
-  split: List.split,
-  combine: List.combine,
-  sort: List.sort,
-  stable_sort: List.stable_sort,
-  fast_sort: List.fast_sort,
-  sort_uniq: List.sort_uniq,
-  merge: List.merge,
-  b: b,
-  length: 3
-};
-
-var a1 = a0;
-
-var a2 = a0;
-
-var a3 = a0;
-
-var a4 = a0;
-
-var a5 = a0;
-
-exports.a0 = a0;
-exports.a1 = a1;
-exports.a2 = a2;
-exports.a3 = a3;
-exports.a4 = a4;
-exports.a5 = a5;
-exports.List = List$1;
-/* b Not a pure module */
diff --git a/jscomp/test/exception_alias.res b/jscomp/test/exception_alias.res
deleted file mode 100644
index cdd03d5..0000000
--- a/jscomp/test/exception_alias.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let a0 = Not_found
-
-let a1 = a0
-
-let a2 = a1
-
-let a3 = a2
-
-let a4 = a3
-
-let a5 = a4
-
-module List = {
-  include List
-  let b = length(list{1, 2})
-  let length = 3
-}
diff --git a/jscomp/test/exception_raise_test.js b/jscomp/test/exception_raise_test.js
deleted file mode 100644
index 6ea4947..0000000
--- a/jscomp/test/exception_raise_test.js
+++ /dev/null
@@ -1,259 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var Js_exn = require("../../lib/js/js_exn.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var Local = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.Local");
-
-var B = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.B");
-
-var C = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.C");
-
-var D = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.D");
-
-function appf(g, x) {
-  var A = /* @__PURE__ */Caml_exceptions.create("A");
-  try {
-    return Curry._1(g, x);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === Local) {
-      return 3;
-    }
-    if (exn.RE_EXN_ID === "Not_found") {
-      return 2;
-    }
-    if (exn.RE_EXN_ID === A) {
-      return 3;
-    }
-    if (exn.RE_EXN_ID !== B) {
-      if (exn.RE_EXN_ID === C) {
-        return exn._1;
-      } else if (exn.RE_EXN_ID === D) {
-        return exn._1[0];
-      } else {
-        return 4;
-      }
-    }
-    var match = exn._1;
-    if (!match) {
-      return 4;
-    }
-    var match$1 = match.tl;
-    if (!match$1) {
-      return 4;
-    }
-    var match$2 = match$1.tl;
-    if (match$2) {
-      return match$2.hd;
-    } else {
-      return 4;
-    }
-  }
-}
-
-var A = /* @__PURE__ */Caml_exceptions.create("Exception_raise_test.A");
-
-var f;
-
-try {
-  f = (function () {throw (new Error ("x"))} ());
-}
-catch (raw_x){
-  var x = Caml_js_exceptions.internalToOCamlException(raw_x);
-  f = x.RE_EXN_ID === A ? x._1 : 2;
-}
-
-var ff;
-
-try {
-  ff = (function () {throw 3} ());
-}
-catch (raw_x$1){
-  var x$1 = Caml_js_exceptions.internalToOCamlException(raw_x$1);
-  ff = x$1.RE_EXN_ID === A ? x$1._1 : 2;
-}
-
-var fff;
-
-try {
-  fff = (function () {throw 2} ());
-}
-catch (raw_x$2){
-  var x$2 = Caml_js_exceptions.internalToOCamlException(raw_x$2);
-  fff = x$2.RE_EXN_ID === A ? x$2._1 : 2;
-}
-
-var a0;
-
-try {
-  a0 = (function (){throw 2} ());
-}
-catch (raw_x$3){
-  var x$3 = Caml_js_exceptions.internalToOCamlException(raw_x$3);
-  if (x$3.RE_EXN_ID === A || x$3.RE_EXN_ID === Js_exn.$$Error) {
-    a0 = x$3._1;
-  } else {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "exception_raise_test.res",
-            104,
-            7
-          ],
-          Error: new Error()
-        };
-  }
-}
-
-var a1;
-
-try {
-  a1 = (function (){throw 2} ());
-}
-catch (raw_e){
-  a1 = Caml_js_exceptions.internalToOCamlException(raw_e);
-}
-
-var a2;
-
-try {
-  a2 = (function (){throw (new Error("x"))} ());
-}
-catch (raw_e$1){
-  a2 = Caml_js_exceptions.internalToOCamlException(raw_e$1);
-}
-
-var suites = {
-  contents: {
-    hd: [
-      "File \"exception_raise_test.res\", line 120, characters 5-12",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: [
-                    f,
-                    ff,
-                    fff,
-                    a0
-                  ],
-                  _1: [
-                    2,
-                    2,
-                    2,
-                    2
-                  ]
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "File \"exception_raise_test.res\", line 123, characters 6-13",
-        (function (param) {
-            if (a1.RE_EXN_ID === Js_exn.$$Error) {
-              return {
-                      TAG: "Eq",
-                      _0: a1._1,
-                      _1: 2
-                    };
-            }
-            throw {
-                  RE_EXN_ID: "Assert_failure",
-                  _1: [
-                    "exception_raise_test.res",
-                    127,
-                    15
-                  ],
-                  Error: new Error()
-                };
-          })
-      ],
-      tl: /* [] */0
-    }
-  }
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-try {
-  ((()=>{throw 2})());
-}
-catch (raw_e$2){
-  var e = Caml_js_exceptions.internalToOCamlException(raw_e$2);
-  eq("File \"exception_raise_test.res\", line 137, characters 10-17", Caml_js_exceptions.as_js_exn(e) !== undefined, true);
-}
-
-try {
-  throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
-}
-catch (raw_e$3){
-  var e$1 = Caml_js_exceptions.internalToOCamlException(raw_e$3);
-  eq("File \"exception_raise_test.res\", line 141, characters 10-17", Caml_js_exceptions.as_js_exn(e$1) !== undefined, false);
-}
-
-function fff0(x, g) {
-  var val;
-  try {
-    val = Curry._1(x, undefined);
-  }
-  catch (exn){
-    return 1;
-  }
-  return Curry._1(g, undefined);
-}
-
-function input_lines(ic, _acc) {
-  while(true) {
-    var acc = _acc;
-    var line;
-    try {
-      line = input_line(ic);
-    }
-    catch (exn){
-      return List.rev(acc);
-    }
-    _acc = {
-      hd: line,
-      tl: acc
-    };
-    continue ;
-  };
-}
-
-eq("File \"exception_raise_test.res\", line 157, characters 12-19", ((a,b,c,_) => a + b + c)(1, 2, 3, 4), 6);
-
-Mt.from_pair_suites("Exception_raise_test", suites.contents);
-
-exports.Local = Local;
-exports.B = B;
-exports.C = C;
-exports.D = D;
-exports.appf = appf;
-exports.A = A;
-exports.f = f;
-exports.ff = ff;
-exports.fff = fff;
-exports.a0 = a0;
-exports.a1 = a1;
-exports.a2 = a2;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.fff0 = fff0;
-exports.input_lines = input_lines;
-/* f Not a pure module */
diff --git a/jscomp/test/exception_raise_test.res b/jscomp/test/exception_raise_test.res
deleted file mode 100644
index 33ed2da..0000000
--- a/jscomp/test/exception_raise_test.res
+++ /dev/null
@@ -1,158 +0,0 @@
-@@warning("-22")
-
-exception Local
-exception B(list<int>)
-exception C(int, int)
-exception D((int, int))
-let appf = (g, x) => {
-  module U = {
-    exception A(int)
-  }
-  try g(x) catch {
-  | Local => 3
-  | Not_found => 2
-  | U.A(32) => 3
-  | U.A(_) => 3
-  | B(list{_, _, x, ..._}) => x
-  | C(x, _)
-  | D(x, _) => x
-  | _ => 4
-  }
-}
-
-/*
-TODO:
-{[
-    else if (exn[0] === B) {
-      var match = exn[1];
-      if (match) {
-        var match$1 = match[1];
-        if (match$1) {
-          var match$2 = match$1[1];
-          if (match$2) {
-            return match$2[0];
-          }
-          else {
-            exit = 1;
-          }
-        }
-        else {
-          exit = 1;
-        }
-      }
-      else {
-        exit = 1;
-      }
-    }
-
-]}
-
-can be simplified as 
-
-{[
-var match, match$1, match$2 ; 
-
-else if (exn[0] === B) {
-  if (match = exn[1] && match$1 = match[1] && match$2 =  match$1[1]) {
-      return match$2[0];
-    }
-  else {
-    exit = 1;
-  }
-}
-
-]}
-
-peepwhole rules like 
-{[
-var x = e ;
-if (x) {
- ..
-}
-]}
-
-can be translated into 
-
-{[
-var x ; 
-if (x = e){
-}
-]}
-*/
-
-exception A(int)
-
-let f = try %raw(` function () {throw (new Error ("x"))} ()`) catch {
-| A(x) => x
-| _ => 2
-}
-
-let ff = try %raw(` function () {throw 3} ()`) catch {
-| A(x) => x
-| _ => 2
-}
-
-let fff = try %raw(` function () {throw 2} ()`) catch {
-| A(x) => x
-| _ => 2
-}
-
-let a0 = try %raw(` function (){throw 2} () `) catch {
-/* throw is a statement */
-| A(x) => x
-| Js.Exn.Error(v) => Obj.magic(v)
-| _ => assert(false)
-}
-
-let a1: exn = try %raw(` function (){throw 2} () `) catch {
-/* throw is a statement */
-| e => e
-}
-
-let a2: exn = try %raw(` function (){throw (new Error("x"))} () `) catch {
-/* throw is a statement */
-| e => e
-}
-
-let suites = ref({
-  open Mt
-  list{
-    (__LOC__, _ => Eq((f, ff, fff, a0), (2, 2, 2, 2))),
-    /* __LOC__, (fun _ -> Eq (Js.Exn.Error (Obj.magic 2) , a1)) */
-    (
-      __LOC__,
-      _ =>
-        switch a1 {
-        | Js.Exn.Error(v) => Eq(Obj.magic(v), 2)
-        | _ => assert(false)
-        },
-    ),
-  }
-})
-
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let () = try %raw(`()=>{throw 2}`)(.) catch {
-| e => eq(__LOC__, Js.Exn.asJsExn(e) != None, true)
-}
-
-let () = try raise(Not_found) catch {
-| e => eq(__LOC__, Js.Exn.asJsExn(e) != None, false)
-}
-
-let fff0 = (x, g) =>
-  switch x() {
-  | exception _ => 1
-  | _ => g()
-  }
-type in_channel
-@val external input_line: in_channel => string = "input_line"
-let rec input_lines = (ic, acc) =>
-  switch input_line(ic) {
-  | exception _ => List.rev(acc)
-  | line => input_lines(ic, list{line, ...acc})
-  }
-
-let () = eq(__LOC__, (%raw(`(a,b,c,_) => a + b + c `): (_, _, _, _) => _)(1, 2, 3, 4), 6)
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/exception_rebound_err_test.js b/jscomp/test/exception_rebound_err_test.js
deleted file mode 100644
index 40ffd42..0000000
--- a/jscomp/test/exception_rebound_err_test.js
+++ /dev/null
@@ -1,94 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var A = /* @__PURE__ */Caml_exceptions.create("Exception_rebound_err_test.A");
-
-var B = /* @__PURE__ */Caml_exceptions.create("Exception_rebound_err_test.B");
-
-var C = /* @__PURE__ */Caml_exceptions.create("Exception_rebound_err_test.C");
-
-function test_js_error4(param) {
-  try {
-    JSON.parse(" {\"x\"}");
-    return 1;
-  }
-  catch (raw_e){
-    var e = Caml_js_exceptions.internalToOCamlException(raw_e);
-    if (e.RE_EXN_ID === "Not_found") {
-      return 2;
-    }
-    if (e.RE_EXN_ID === "Invalid_argument" && e._1 === "x") {
-      return 3;
-    }
-    if (e.RE_EXN_ID === A) {
-      if (e._1 !== 2) {
-        return 7;
-      } else {
-        return 4;
-      }
-    } else if (e.RE_EXN_ID === B) {
-      return 5;
-    } else if (e.RE_EXN_ID === C && !(e._1 !== 1 || e._2 !== 2)) {
-      return 6;
-    } else {
-      return 7;
-    }
-  }
-}
-
-function f(g) {
-  try {
-    return Curry._1(g, undefined);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Not_found") {
-      return 1;
-    }
-    throw exn;
-  }
-}
-
-eq("File \"exception_rebound_err_test.res\", line 31, characters 3-10", test_js_error4(), 7);
-
-Mt.from_pair_suites("Exception_rebound_err_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.A = A;
-exports.B = B;
-exports.C = C;
-exports.test_js_error4 = test_js_error4;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/exception_rebound_err_test.res b/jscomp/test/exception_rebound_err_test.res
deleted file mode 100644
index aa03004..0000000
--- a/jscomp/test/exception_rebound_err_test.res
+++ /dev/null
@@ -1,32 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-exception A(int)
-exception B
-exception C(int, int)
-
-let test_js_error4 = () =>
-  try {
-    \"@@"(ignore, Js.Json.parseExn(` {"x"}`))
-    1
-  } catch {
-  | Not_found => 2
-  | Invalid_argument("x") => 3
-  | A(2) => 4
-  | B => 5
-  | C(1, 2) => 6
-  | e => 7
-  }
-
-let f = g =>
-  try g() catch {
-  | Not_found => 1
-  }
-
-eq(__LOC__, test_js_error4(), 7)
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/exception_value_test.js b/jscomp/test/exception_value_test.js
deleted file mode 100644
index c9f802b..0000000
--- a/jscomp/test/exception_value_test.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Js_exn = require("../../lib/js/js_exn.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function f(param) {
-  throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
-}
-
-function assert_f(x) {
-  if (x <= 3) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "exception_value_test.res",
-            4,
-            11
-          ],
-          Error: new Error()
-        };
-  }
-  return 3;
-}
-
-function hh(param) {
-  throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
-}
-
-var A = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.A");
-
-var B = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.B");
-
-var C = /* @__PURE__ */Caml_exceptions.create("Exception_value_test.C");
-
-var u = {
-  RE_EXN_ID: A,
-  _1: 3
-};
-
-function test_not_found(f, param) {
-  try {
-    return Curry._1(f, undefined);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Not_found") {
-      return 2;
-    }
-    throw exn;
-  }
-}
-
-function test_js_error2(param) {
-  try {
-    return JSON.parse(" {\"x\" : }");
-  }
-  catch (raw_e){
-    var e = Caml_js_exceptions.internalToOCamlException(raw_e);
-    if (e.RE_EXN_ID === Js_exn.$$Error) {
-      console.log(e._1.stack);
-      throw e;
-    }
-    throw e;
-  }
-}
-
-function test_js_error3(param) {
-  try {
-    JSON.parse(" {\"x\"}");
-    return 1;
-  }
-  catch (e){
-    return 0;
-  }
-}
-
-exports.f = f;
-exports.assert_f = assert_f;
-exports.hh = hh;
-exports.A = A;
-exports.B = B;
-exports.C = C;
-exports.u = u;
-exports.test_not_found = test_not_found;
-exports.test_js_error2 = test_js_error2;
-exports.test_js_error3 = test_js_error3;
-/* No side effect */
diff --git a/jscomp/test/exception_value_test.res b/jscomp/test/exception_value_test.res
deleted file mode 100644
index 38460a4..0000000
--- a/jscomp/test/exception_value_test.res
+++ /dev/null
@@ -1,38 +0,0 @@
-let f = () => raise(Not_found)
-
-let assert_f = x => {
-  let () = assert (x > 3)
-  3
-}
-
-let hh = () => {
-  let v = raise(Not_found)
-  v + 3
-}
-/* TODO: comment for line column number */
-
-exception A(int)
-exception B
-exception C(int, int)
-let u = A(3)
-/** note in ocaml, if such exception is not caught,
-  it will be re-raised */
-let test_not_found = (f, ()) =>
-  try f() catch {
-  | Not_found => 2
-  }
-
-let test_js_error2 = () =>
-  try Js.Json.parseExn(` {"x" : }`) catch {
-  | Js.Exn.Error(err) as e =>
-    \"@@"(Js.log, Js.Exn.stack(err))
-    raise(e)
-  }
-
-let test_js_error3 = () =>
-  try {
-    \"@@"(ignore, Js.Json.parseExn(` {"x"}`))
-    1
-  } catch {
-  | e => 0
-  }
diff --git a/jscomp/test/exponentiation_precedence_test.js b/jscomp/test/exponentiation_precedence_test.js
deleted file mode 100644
index 49fb7f5..0000000
--- a/jscomp/test/exponentiation_precedence_test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a = Math.pow(2, Math.pow(3, 2));
-
-var b = Math.pow(2, Math.pow(-3, 2));
-
-var c = Math.pow(Math.pow(2, 3), 2);
-
-var d = Math.pow(-2, 2);
-
-exports.a = a;
-exports.b = b;
-exports.c = c;
-exports.d = d;
-/* a Not a pure module */
diff --git a/jscomp/test/exponentiation_precedence_test.res b/jscomp/test/exponentiation_precedence_test.res
deleted file mode 100644
index 55ec5fb..0000000
--- a/jscomp/test/exponentiation_precedence_test.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let a = 2. ** 3. ** 2.
-let b = 2. ** -3. ** 2.
-let c = (2. ** 3.) ** 2.
-let d = (-2.) ** 2.
diff --git a/jscomp/test/export_keyword.js b/jscomp/test/export_keyword.js
deleted file mode 100644
index 5ac6904..0000000
--- a/jscomp/test/export_keyword.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var $$case = 3;
-
-var $$window = 2;
-
-var $$switch = 3;
-
-exports.$$case = $$case;
-exports.$$window = $$window;
-exports.$$switch = $$switch;
-/* No side effect */
diff --git a/jscomp/test/export_keyword.res b/jscomp/test/export_keyword.res
deleted file mode 100644
index fb635df..0000000
--- a/jscomp/test/export_keyword.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let case = 3
-let window = 2
-
-let \"switch" = 3
diff --git a/jscomp/test/ext_array_test.js b/jscomp/test/ext_array_test.js
deleted file mode 100644
index 63c7b97..0000000
--- a/jscomp/test/ext_array_test.js
+++ /dev/null
@@ -1,309 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function reverse_range(a, i, len) {
-  if (len === 0) {
-    return ;
-  }
-  for(var k = 0 ,k_finish = (len - 1 | 0) / 2 | 0; k <= k_finish; ++k){
-    var t = a[i + k | 0];
-    a[i + k | 0] = a[((i + len | 0) - 1 | 0) - k | 0];
-    a[((i + len | 0) - 1 | 0) - k | 0] = t;
-  }
-}
-
-function reverse_in_place(a) {
-  reverse_range(a, 0, a.length);
-}
-
-function reverse(a) {
-  var b_len = a.length;
-  if (b_len === 0) {
-    return [];
-  }
-  var b = $$Array.copy(a);
-  for(var i = 0; i < b_len; ++i){
-    b[i] = a[(b_len - 1 | 0) - i | 0];
-  }
-  return b;
-}
-
-function reverse_of_list(x) {
-  if (!x) {
-    return [];
-  }
-  var len = List.length(x);
-  var a = Caml_array.make(len, x.hd);
-  var _i = 0;
-  var _x = x.tl;
-  while(true) {
-    var x$1 = _x;
-    var i = _i;
-    if (!x$1) {
-      return a;
-    }
-    a[(len - i | 0) - 2 | 0] = x$1.hd;
-    _x = x$1.tl;
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function filter(f, a) {
-  var arr_len = a.length;
-  var _acc = /* [] */0;
-  var _i = 0;
-  while(true) {
-    var i = _i;
-    var acc = _acc;
-    if (i === arr_len) {
-      return reverse_of_list(acc);
-    }
-    var v = a[i];
-    if (Curry._1(f, v)) {
-      _i = i + 1 | 0;
-      _acc = {
-        hd: v,
-        tl: acc
-      };
-      continue ;
-    }
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function filter_map(f, a) {
-  var arr_len = a.length;
-  var _acc = /* [] */0;
-  var _i = 0;
-  while(true) {
-    var i = _i;
-    var acc = _acc;
-    if (i === arr_len) {
-      return reverse_of_list(acc);
-    }
-    var v = a[i];
-    var v$1 = Curry._1(f, v);
-    if (v$1 !== undefined) {
-      _i = i + 1 | 0;
-      _acc = {
-        hd: Caml_option.valFromOption(v$1),
-        tl: acc
-      };
-      continue ;
-    }
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function range(from, to_) {
-  if (from > to_) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_array_test.range",
-          Error: new Error()
-        };
-  }
-  return $$Array.init((to_ - from | 0) + 1 | 0, (function (i) {
-                return i + from | 0;
-              }));
-}
-
-function map2i(f, a, b) {
-  var len = a.length;
-  if (len !== b.length) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_array_test.map2i",
-          Error: new Error()
-        };
-  }
-  return $$Array.mapi((function (i, a) {
-                return Curry._3(f, i, a, b[i]);
-              }), a);
-}
-
-function tolist_aux(a, f, _i, _res) {
-  while(true) {
-    var res = _res;
-    var i = _i;
-    if (i < 0) {
-      return res;
-    }
-    var v = a[i];
-    var v$1 = Curry._1(f, v);
-    _res = v$1 !== undefined ? ({
-          hd: Caml_option.valFromOption(v$1),
-          tl: res
-        }) : res;
-    _i = i - 1 | 0;
-    continue ;
-  };
-}
-
-function to_list_map(f, a) {
-  return tolist_aux(a, f, a.length - 1 | 0, /* [] */0);
-}
-
-function to_list_map_acc(f, a, acc) {
-  return tolist_aux(a, f, a.length - 1 | 0, acc);
-}
-
-function of_list_map(f, a) {
-  if (!a) {
-    return [];
-  }
-  var tl = a.tl;
-  var hd = Curry._1(f, a.hd);
-  var len = List.length(tl) + 1 | 0;
-  var arr = Caml_array.make(len, hd);
-  var _i = 1;
-  var _x = tl;
-  while(true) {
-    var x = _x;
-    var i = _i;
-    if (!x) {
-      return arr;
-    }
-    arr[i] = Curry._1(f, x.hd);
-    _x = x.tl;
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function rfind_with_index(arr, cmp, v) {
-  var len = arr.length;
-  var _i = len - 1 | 0;
-  while(true) {
-    var i = _i;
-    if (i < 0) {
-      return i;
-    }
-    if (Curry._2(cmp, arr[i], v)) {
-      return i;
-    }
-    _i = i - 1 | 0;
-    continue ;
-  };
-}
-
-function rfind_and_split(arr, cmp, v) {
-  var i = rfind_with_index(arr, cmp, v);
-  if (i < 0) {
-    return "No_split";
-  } else {
-    return {
-            NAME: "Split",
-            VAL: [
-              $$Array.sub(arr, 0, i),
-              $$Array.sub(arr, i + 1 | 0, (arr.length - i | 0) - 1 | 0)
-            ]
-          };
-  }
-}
-
-function find_with_index(arr, cmp, v) {
-  var len = arr.length;
-  var _i = 0;
-  while(true) {
-    var i = _i;
-    if (i >= len) {
-      return -1;
-    }
-    if (Curry._2(cmp, arr[i], v)) {
-      return i;
-    }
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function find_and_split(arr, cmp, v) {
-  var i = find_with_index(arr, cmp, v);
-  if (i < 0) {
-    return "No_split";
-  } else {
-    return {
-            NAME: "Split",
-            VAL: [
-              $$Array.sub(arr, 0, i),
-              $$Array.sub(arr, i + 1 | 0, (arr.length - i | 0) - 1 | 0)
-            ]
-          };
-  }
-}
-
-function exists(p, a) {
-  var n = a.length;
-  var _i = 0;
-  while(true) {
-    var i = _i;
-    if (i === n) {
-      return false;
-    }
-    if (Curry._1(p, a[i])) {
-      return true;
-    }
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function is_empty(arr) {
-  return arr.length === 0;
-}
-
-function unsafe_loop(_index, len, p, xs, ys) {
-  while(true) {
-    var index = _index;
-    if (index >= len) {
-      return true;
-    }
-    if (!Curry._2(p, xs[index], ys[index])) {
-      return false;
-    }
-    _index = index + 1 | 0;
-    continue ;
-  };
-}
-
-function for_all2_no_exn(p, xs, ys) {
-  var len_xs = xs.length;
-  var len_ys = ys.length;
-  if (len_xs === len_ys) {
-    return unsafe_loop(0, len_xs, p, xs, ys);
-  } else {
-    return false;
-  }
-}
-
-exports.reverse_range = reverse_range;
-exports.reverse_in_place = reverse_in_place;
-exports.reverse = reverse;
-exports.reverse_of_list = reverse_of_list;
-exports.filter = filter;
-exports.filter_map = filter_map;
-exports.range = range;
-exports.map2i = map2i;
-exports.tolist_aux = tolist_aux;
-exports.to_list_map = to_list_map;
-exports.to_list_map_acc = to_list_map_acc;
-exports.of_list_map = of_list_map;
-exports.rfind_with_index = rfind_with_index;
-exports.rfind_and_split = rfind_and_split;
-exports.find_with_index = find_with_index;
-exports.find_and_split = find_and_split;
-exports.exists = exists;
-exports.is_empty = is_empty;
-exports.unsafe_loop = unsafe_loop;
-exports.for_all2_no_exn = for_all2_no_exn;
-/* No side effect */
diff --git a/jscomp/test/ext_array_test.res b/jscomp/test/ext_array_test.res
deleted file mode 100644
index 53a71e3..0000000
--- a/jscomp/test/ext_array_test.res
+++ /dev/null
@@ -1,238 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let reverse_range = (a, i, len) =>
-  if len == 0 {
-    ()
-  } else {
-    for k in 0 to (len - 1) / 2 {
-      let t = Array.unsafe_get(a, i + k)
-      Array.unsafe_set(a, i + k, Array.unsafe_get(a, i + len - 1 - k))
-      Array.unsafe_set(a, i + len - 1 - k, t)
-    }
-  }
-
-let reverse_in_place = a => reverse_range(a, 0, Array.length(a))
-
-let reverse = a => {
-  let b_len = Array.length(a)
-  if b_len == 0 {
-    []
-  } else {
-    let b = Array.copy(a)
-    for i in 0 to b_len - 1 {
-      Array.unsafe_set(b, i, Array.unsafe_get(a, b_len - 1 - i))
-    }
-    b
-  }
-}
-
-let reverse_of_list = x =>
-  switch x {
-  | list{} => []
-  | list{hd, ...tl} as l =>
-    let len = List.length(l)
-    let a = Array.make(len, hd)
-    let rec fill = (i, x) =>
-      switch x {
-      | list{} => a
-      | list{hd, ...tl} =>
-        Array.unsafe_set(a, len - i - 2, hd)
-        fill(i + 1, tl)
-      }
-    fill(0, tl)
-  }
-
-let filter = (f, a) => {
-  let arr_len = Array.length(a)
-  let rec aux = (acc, i) =>
-    if i == arr_len {
-      reverse_of_list(acc)
-    } else {
-      let v = Array.unsafe_get(a, i)
-      if f(v) {
-        aux(list{v, ...acc}, i + 1)
-      } else {
-        aux(acc, i + 1)
-      }
-    }
-  aux(list{}, 0)
-}
-
-let filter_map = (f: _ => option<_>, a) => {
-  let arr_len = Array.length(a)
-  let rec aux = (acc, i) =>
-    if i == arr_len {
-      reverse_of_list(acc)
-    } else {
-      let v = Array.unsafe_get(a, i)
-      switch f(v) {
-      | Some(v) => aux(list{v, ...acc}, i + 1)
-      | None => aux(acc, i + 1)
-      }
-    }
-  aux(list{}, 0)
-}
-
-let range = (from, to_) =>
-  if from > to_ {
-    invalid_arg("Ext_array_test.range")
-  } else {
-    Array.init(to_ - from + 1, i => i + from)
-  }
-
-let map2i = (f, a, b) => {
-  let len = Array.length(a)
-  if len != Array.length(b) {
-    invalid_arg("Ext_array_test.map2i")
-  } else {
-    Array.mapi((i, a) => f(i, a, Array.unsafe_get(b, i)), a)
-  }
-}
-
-let rec tolist_aux = (a, f, i, res) =>
-  if i < 0 {
-    res
-  } else {
-    let v = Array.unsafe_get(a, i)
-    tolist_aux(
-      a,
-      f,
-      i - 1,
-      switch f(v) {
-      | Some(v) => list{v, ...res}
-      | None => res
-      },
-    )
-  }
-
-let to_list_map = (f, a) => tolist_aux(a, f, Array.length(a) - 1, list{})
-
-let to_list_map_acc = (f, a, acc) => tolist_aux(a, f, Array.length(a) - 1, acc)
-
-/* TODO: What would happen if [f] raise, memory leak? */
-let of_list_map = (f, a) =>
-  switch a {
-  | list{} => []
-  | list{h, ...tl} =>
-    let hd = f(h)
-    let len = List.length(tl) + 1
-    let arr = Array.make(len, hd)
-    let rec fill = (i, x) =>
-      switch x {
-      | list{} => arr
-      | list{hd, ...tl} =>
-        Array.unsafe_set(arr, i, f(hd))
-        fill(i + 1, tl)
-      }
-    fill(1, tl)
-  }
-
-/**
-{[
-# rfind_with_index [|1;2;3|] (=) 2;;
-- : int = 1
-# rfind_with_index [|1;2;3|] (=) 1;;
-- : int = 0
-# rfind_with_index [|1;2;3|] (=) 3;;
-- : int = 2
-# rfind_with_index [|1;2;3|] (=) 4;;
-- : int = -1
-]}
-*/
-let rfind_with_index = (arr, cmp, v) => {
-  let len = Array.length(arr)
-  let rec aux = i =>
-    if i < 0 {
-      i
-    } else if cmp(Array.unsafe_get(arr, i), v) {
-      i
-    } else {
-      aux(i - 1)
-    }
-  aux(len - 1)
-}
-
-type split<'a> = [#No_split | #Split(array<'a>, array<'a>)]
-let rfind_and_split = (arr, cmp, v): split<_> => {
-  let i = rfind_with_index(arr, cmp, v)
-  if i < 0 {
-    #No_split
-  } else {
-    #Split(Array.sub(arr, 0, i), Array.sub(arr, i + 1, Array.length(arr) - i - 1))
-  }
-}
-
-let find_with_index = (arr, cmp, v) => {
-  let len = Array.length(arr)
-  let rec aux = (i, len) =>
-    if i >= len {
-      -1
-    } else if cmp(Array.unsafe_get(arr, i), v) {
-      i
-    } else {
-      aux(i + 1, len)
-    }
-  aux(0, len)
-}
-
-let find_and_split = (arr, cmp, v): split<_> => {
-  let i = find_with_index(arr, cmp, v)
-  if i < 0 {
-    #No_split
-  } else {
-    #Split(Array.sub(arr, 0, i), Array.sub(arr, i + 1, Array.length(arr) - i - 1))
-  }
-}
-
-/* TODO: available since 4.03, use {!Array.exists} */
-
-let exists = (p, a) => {
-  let n = Array.length(a)
-  let rec loop = i =>
-    if i == n {
-      false
-    } else if p(Array.unsafe_get(a, i)) {
-      true
-    } else {
-      loop(succ(i))
-    }
-  loop(0)
-}
-
-let is_empty = arr => Array.length(arr) == 0
-
-let rec unsafe_loop = (index, len, p, xs, ys) =>
-  if index >= len {
-    true
-  } else {
-    p(Array.unsafe_get(xs, index), Array.unsafe_get(ys, index)) &&
-    unsafe_loop(succ(index), len, p, xs, ys)
-  }
-
-let for_all2_no_exn = (p, xs, ys) => {
-  let len_xs = Array.length(xs)
-  let len_ys = Array.length(ys)
-  len_xs == len_ys && unsafe_loop(0, len_xs, p, xs, ys)
-}
diff --git a/jscomp/test/ext_bytes_test.js b/jscomp/test/ext_bytes_test.js
deleted file mode 100644
index 7dbe566..0000000
--- a/jscomp/test/ext_bytes_test.js
+++ /dev/null
@@ -1,221 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Char = require("../../lib/js/char.js");
-var Bytes = require("../../lib/js/bytes.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function escaped(s) {
-  var n = 0;
-  for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){
-    var match = s[i];
-    n = n + (
-      match >= 32 ? (
-          match > 92 || match < 34 ? (
-              match >= 127 ? 4 : 1
-            ) : (
-              match > 91 || match < 35 ? 2 : 1
-            )
-        ) : (
-          match >= 11 ? (
-              match !== 13 ? 4 : 2
-            ) : (
-              match >= 8 ? 2 : 4
-            )
-        )
-    ) | 0;
-  }
-  if (n === s.length) {
-    return Bytes.copy(s);
-  }
-  var s$p = Caml_bytes.create(n);
-  n = 0;
-  for(var i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){
-    var c = s[i$1];
-    var exit = 0;
-    if (c >= 35) {
-      if (c !== 92) {
-        if (c >= 127) {
-          exit = 1;
-        } else {
-          s$p[n] = c;
-        }
-      } else {
-        exit = 2;
-      }
-    } else if (c >= 32) {
-      if (c >= 34) {
-        exit = 2;
-      } else {
-        s$p[n] = c;
-      }
-    } else if (c >= 14) {
-      exit = 1;
-    } else {
-      switch (c) {
-        case 8 :
-            s$p[n] = /* '\\' */92;
-            n = n + 1 | 0;
-            s$p[n] = /* 'b' */98;
-            break;
-        case 9 :
-            s$p[n] = /* '\\' */92;
-            n = n + 1 | 0;
-            s$p[n] = /* 't' */116;
-            break;
-        case 10 :
-            s$p[n] = /* '\\' */92;
-            n = n + 1 | 0;
-            s$p[n] = /* 'n' */110;
-            break;
-        case 0 :
-        case 1 :
-        case 2 :
-        case 3 :
-        case 4 :
-        case 5 :
-        case 6 :
-        case 7 :
-        case 11 :
-        case 12 :
-            exit = 1;
-            break;
-        case 13 :
-            s$p[n] = /* '\\' */92;
-            n = n + 1 | 0;
-            s$p[n] = /* 'r' */114;
-            break;
-        
-      }
-    }
-    switch (exit) {
-      case 1 :
-          s$p[n] = /* '\\' */92;
-          n = n + 1 | 0;
-          s$p[n] = 48 + (c / 100 | 0) | 0;
-          n = n + 1 | 0;
-          s$p[n] = 48 + (c / 10 | 0) % 10 | 0;
-          n = n + 1 | 0;
-          s$p[n] = 48 + c % 10 | 0;
-          break;
-      case 2 :
-          s$p[n] = /* '\\' */92;
-          n = n + 1 | 0;
-          s$p[n] = c;
-          break;
-      
-    }
-    n = n + 1 | 0;
-  }
-  return s$p;
-}
-
-function starts_with(xs, prefix, p) {
-  var H = /* @__PURE__ */Caml_exceptions.create("H");
-  var len1 = xs.length;
-  var len2 = prefix.length;
-  if (len2 > len1) {
-    return false;
-  }
-  try {
-    for(var i = 0; i < len2; ++i){
-      if (!Curry._2(p, Caml_bytes.get(xs, i), Caml_bytes.get(prefix, i))) {
-        throw {
-              RE_EXN_ID: H,
-              Error: new Error()
-            };
-      }
-      
-    }
-    return true;
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === H) {
-      return false;
-    }
-    throw exn;
-  }
-}
-
-var a = Bytes.init(100, Char.chr);
-
-Bytes.blit(a, 5, a, 10, 10);
-
-eq("File \"ext_bytes_test.res\", line 116, characters 4-11", a, Bytes.of_string("\x00\x01\x02\x03\x04\x05\x06\x07\b\t\x05\x06\x07\b\t\n\x0b\x0c\r\x0e\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abc"));
-
-var a$1 = Bytes.init(100, Char.chr);
-
-Bytes.blit(a$1, 10, a$1, 5, 10);
-
-eq("File \"ext_bytes_test.res\", line 128, characters 4-11", a$1, Bytes.of_string("\x00\x01\x02\x03\x04\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abc"));
-
-var f = Char.chr;
-
-var a$2 = Bytes.unsafe_to_string(Bytes.init(100, f));
-
-var b = Bytes.init(100, (function (i) {
-        return /* '\000' */0;
-      }));
-
-Bytes.blit_string(a$2, 10, b, 5, 10);
-
-eq("File \"ext_bytes_test.res\", line 141, characters 4-11", b, Bytes.of_string("\x00\x00\x00\x00\x00\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"));
-
-var s = Bytes.init(50000, (function (i) {
-        return Char.chr(i % 137);
-      }));
-
-var s1 = Bytes.to_string(s);
-
-var s2 = Bytes.of_string(s1);
-
-eq("File \"ext_bytes_test.res\", line 153, characters 5-12", s, s2);
-
-function f$1(a, b) {
-  return [
-          Caml_bytes.bytes_greaterthan(a, b),
-          Caml_bytes.bytes_greaterequal(a, b),
-          Caml_bytes.bytes_lessthan(a, b),
-          Caml_bytes.bytes_lessequal(a, b),
-          Caml_bytes.bytes_equal(a, b)
-        ];
-}
-
-function f_0(a, b) {
-  return [
-          Caml.i64_gt(a, b),
-          Caml.i64_ge(a, b),
-          Caml.i64_lt(a, b),
-          Caml.i64_le(a, b),
-          Caml.i64_eq(a, b)
-        ];
-}
-
-Mt.from_pair_suites("Ext_bytes_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.escaped = escaped;
-exports.starts_with = starts_with;
-exports.f = f$1;
-exports.f_0 = f_0;
-/* a Not a pure module */
diff --git a/jscomp/test/ext_bytes_test.res b/jscomp/test/ext_bytes_test.res
deleted file mode 100644
index 5775e3e..0000000
Binary files a/jscomp/test/ext_bytes_test.res and /dev/null differ
diff --git a/jscomp/test/ext_filename_test.js b/jscomp/test/ext_filename_test.js
deleted file mode 100644
index 229a506..0000000
--- a/jscomp/test/ext_filename_test.js
+++ /dev/null
@@ -1,398 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Sys = require("../../lib/js/sys.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Bytes = require("../../lib/js/bytes.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_sys = require("../../lib/js/caml_sys.js");
-var Filename = require("../../lib/js/filename.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Test_literals = require("./test_literals.js");
-var Ext_string_test = require("./ext_string_test.js");
-var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var node_sep = "/";
-
-var node_parent = "..";
-
-var node_current = ".";
-
-var cwd = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      return Caml_sys.sys_getcwd();
-    })
-};
-
-function path_as_directory(x) {
-  if (x === "" || Ext_string_test.ends_with(x, Filename.dir_sep)) {
-    return x;
-  } else {
-    return x + Filename.dir_sep;
-  }
-}
-
-function absolute_path(s) {
-  var s$1 = Curry._1(Filename.is_relative, s) ? Filename.concat(CamlinternalLazy.force(cwd), s) : s;
-  var aux = function (_s) {
-    while(true) {
-      var s = _s;
-      var base = Curry._1(Filename.basename, s);
-      var dir = Curry._1(Filename.dirname, s);
-      if (dir === s) {
-        return dir;
-      }
-      if (base !== Filename.current_dir_name) {
-        if (base === Filename.parent_dir_name) {
-          return Curry._1(Filename.dirname, aux(dir));
-        } else {
-          return Filename.concat(aux(dir), base);
-        }
-      }
-      _s = dir;
-      continue ;
-    };
-  };
-  return aux(s$1);
-}
-
-function chop_extension(locOpt, name) {
-  var loc = locOpt !== undefined ? locOpt : "";
-  try {
-    return Filename.chop_extension(name);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Invalid_argument") {
-      var s = "Filename.chop_extension ( " + loc + " : " + name + " )";
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: s,
-            Error: new Error()
-          };
-    }
-    throw exn;
-  }
-}
-
-function chop_extension_if_any(fname) {
-  try {
-    return Filename.chop_extension(fname);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Invalid_argument") {
-      return fname;
-    }
-    throw exn;
-  }
-}
-
-var os_path_separator_char = Filename.dir_sep.codePointAt(0);
-
-function relative_path(file_or_dir_1, file_or_dir_2) {
-  var relevant_dir1 = file_or_dir_1.NAME === "File" ? Curry._1(Filename.dirname, file_or_dir_1.VAL) : file_or_dir_1.VAL;
-  var relevant_dir2 = file_or_dir_2.NAME === "File" ? Curry._1(Filename.dirname, file_or_dir_2.VAL) : file_or_dir_2.VAL;
-  var dir1 = Ext_string_test.split(undefined, relevant_dir1, os_path_separator_char);
-  var dir2 = Ext_string_test.split(undefined, relevant_dir2, os_path_separator_char);
-  var go = function (_dir1, _dir2) {
-    while(true) {
-      var dir2 = _dir2;
-      var dir1 = _dir1;
-      if (dir1 && dir2 && dir1.hd === dir2.hd) {
-        _dir2 = dir2.tl;
-        _dir1 = dir1.tl;
-        continue ;
-      }
-      return Pervasives.$at(List.map((function (param) {
-                        return node_parent;
-                      }), dir2), dir1);
-    };
-  };
-  var ys = go(dir1, dir2);
-  if (ys) {
-    if (ys.hd === node_parent) {
-      return $$Array.of_list(ys).join(node_sep);
-    }
-    var xs = {
-      hd: node_current,
-      tl: ys
-    };
-    return $$Array.of_list(xs).join(node_sep);
-  }
-  var xs$1 = {
-    hd: node_current,
-    tl: ys
-  };
-  return $$Array.of_list(xs$1).join(node_sep);
-}
-
-function node_relative_path(node_modules_shorten, file1, dep_file) {
-  var file2 = dep_file.VAL;
-  var v = Ext_string_test.find(undefined, Test_literals.node_modules, file2);
-  var len = file2.length;
-  if (!(node_modules_shorten && v >= 0)) {
-    return relative_path(dep_file.NAME === "File" ? ({
-                    NAME: "File",
-                    VAL: absolute_path(dep_file.VAL)
-                  }) : ({
-                    NAME: "Dir",
-                    VAL: absolute_path(dep_file.VAL)
-                  }), file1.NAME === "File" ? ({
-                    NAME: "File",
-                    VAL: absolute_path(file1.VAL)
-                  }) : ({
-                    NAME: "Dir",
-                    VAL: absolute_path(file1.VAL)
-                  })) + (node_sep + Curry._1(Filename.basename, file2));
-  }
-  var skip = function (_i) {
-    while(true) {
-      var i = _i;
-      if (i >= len) {
-        var s = "invalid path: " + file2;
-        throw {
-              RE_EXN_ID: "Failure",
-              _1: s,
-              Error: new Error()
-            };
-      }
-      var curr_char = file2.codePointAt(i);
-      if (!(curr_char === os_path_separator_char || curr_char === /* '.' */46)) {
-        return i;
-      }
-      _i = i + 1 | 0;
-      continue ;
-    };
-  };
-  return Ext_string_test.tail_from(file2, skip(v + Test_literals.node_modules_length | 0));
-}
-
-function find_root_filename(_cwd, filename) {
-  while(true) {
-    var cwd = _cwd;
-    if (Caml_sys.sys_file_exists(Filename.concat(cwd, filename))) {
-      return cwd;
-    }
-    var cwd$p = Curry._1(Filename.dirname, cwd);
-    if (cwd$p.length < cwd.length) {
-      _cwd = cwd$p;
-      continue ;
-    }
-    var s = filename + " not found from " + cwd;
-    throw {
-          RE_EXN_ID: "Failure",
-          _1: s,
-          Error: new Error()
-        };
-  };
-}
-
-function find_package_json_dir(cwd) {
-  return find_root_filename(cwd, Test_literals.bsconfig_json);
-}
-
-var package_dir = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      var cwd$1 = CamlinternalLazy.force(cwd);
-      return find_root_filename(cwd$1, Test_literals.bsconfig_json);
-    })
-};
-
-function module_name_of_file(file) {
-  var s = Filename.chop_extension(Curry._1(Filename.basename, file));
-  return Bytes.unsafe_to_string(Bytes.capitalize_ascii(Bytes.unsafe_of_string(s)));
-}
-
-function module_name_of_file_if_any(file) {
-  var s = chop_extension_if_any(Curry._1(Filename.basename, file));
-  return Bytes.unsafe_to_string(Bytes.capitalize_ascii(Bytes.unsafe_of_string(s)));
-}
-
-function combine(p1, p2) {
-  if (p1 === "" || p1 === Filename.current_dir_name) {
-    return p2;
-  } else if (p2 === "" || p2 === Filename.current_dir_name) {
-    return p1;
-  } else if (Curry._1(Filename.is_relative, p2)) {
-    return Filename.concat(p1, p2);
-  } else {
-    return p2;
-  }
-}
-
-function split_aux(p) {
-  var _p = p;
-  var _acc = /* [] */0;
-  while(true) {
-    var acc = _acc;
-    var p$1 = _p;
-    var dir = Curry._1(Filename.dirname, p$1);
-    if (dir === p$1) {
-      return [
-              dir,
-              acc
-            ];
-    }
-    var new_path = Curry._1(Filename.basename, p$1);
-    if (new_path === Filename.dir_sep) {
-      _p = dir;
-      continue ;
-    }
-    _acc = {
-      hd: new_path,
-      tl: acc
-    };
-    _p = dir;
-    continue ;
-  };
-}
-
-function rel_normalized_absolute_path(from, to_) {
-  var match = split_aux(from);
-  var match$1 = split_aux(to_);
-  var root2 = match$1[0];
-  if (match[0] !== root2) {
-    return root2;
-  }
-  var _xss = match[1];
-  var _yss = match$1[1];
-  while(true) {
-    var yss = _yss;
-    var xss = _xss;
-    if (!xss) {
-      if (yss) {
-        return List.fold_left(Filename.concat, yss.hd, yss.tl);
-      } else {
-        return Ext_string_test.empty;
-      }
-    }
-    var xs = xss.tl;
-    if (!yss) {
-      return List.fold_left((function (acc, param) {
-                    return Filename.concat(acc, Ext_string_test.parent_dir_lit);
-                  }), Ext_string_test.parent_dir_lit, xs);
-    }
-    if (xss.hd === yss.hd) {
-      _yss = yss.tl;
-      _xss = xs;
-      continue ;
-    }
-    var start = List.fold_left((function (acc, param) {
-            return Filename.concat(acc, Ext_string_test.parent_dir_lit);
-          }), Ext_string_test.parent_dir_lit, xs);
-    return List.fold_left(Filename.concat, start, yss);
-  };
-}
-
-function normalize_absolute_path(x) {
-  var drop_if_exist = function (xs) {
-    if (xs) {
-      return xs.tl;
-    } else {
-      return /* [] */0;
-    }
-  };
-  var normalize_list = function (_acc, _paths) {
-    while(true) {
-      var paths = _paths;
-      var acc = _acc;
-      if (!paths) {
-        return acc;
-      }
-      var xs = paths.tl;
-      var x = paths.hd;
-      if (x === Ext_string_test.current_dir_lit) {
-        _paths = xs;
-        continue ;
-      }
-      if (x === Ext_string_test.parent_dir_lit) {
-        _paths = xs;
-        _acc = drop_if_exist(acc);
-        continue ;
-      }
-      _paths = xs;
-      _acc = {
-        hd: x,
-        tl: acc
-      };
-      continue ;
-    };
-  };
-  var match = split_aux(x);
-  var root = match[0];
-  var rev_paths = normalize_list(/* [] */0, match[1]);
-  if (rev_paths) {
-    var _acc = rev_paths.hd;
-    var _rev_paths = rev_paths.tl;
-    while(true) {
-      var rev_paths$1 = _rev_paths;
-      var acc = _acc;
-      if (!rev_paths$1) {
-        return Filename.concat(root, acc);
-      }
-      _rev_paths = rev_paths$1.tl;
-      _acc = Filename.concat(rev_paths$1.hd, acc);
-      continue ;
-    };
-  } else {
-    return root;
-  }
-}
-
-function get_extension(x) {
-  var pos = Ext_string_test.rindex_neg(x, /* '.' */46);
-  if (pos < 0) {
-    return "";
-  } else {
-    return Ext_string_test.tail_from(x, pos);
-  }
-}
-
-var simple_convert_node_path_to_os_path;
-
-if (Sys.unix) {
-  simple_convert_node_path_to_os_path = (function (x) {
-      return x;
-    });
-} else if (Sys.win32 || false) {
-  simple_convert_node_path_to_os_path = Ext_string_test.replace_slash_backward;
-} else {
-  var s = "Unknown OS : " + Sys.os_type;
-  throw {
-        RE_EXN_ID: "Failure",
-        _1: s,
-        Error: new Error()
-      };
-}
-
-var $slash$slash = Filename.concat;
-
-exports.node_sep = node_sep;
-exports.node_parent = node_parent;
-exports.node_current = node_current;
-exports.cwd = cwd;
-exports.$slash$slash = $slash$slash;
-exports.path_as_directory = path_as_directory;
-exports.absolute_path = absolute_path;
-exports.chop_extension = chop_extension;
-exports.chop_extension_if_any = chop_extension_if_any;
-exports.os_path_separator_char = os_path_separator_char;
-exports.relative_path = relative_path;
-exports.node_relative_path = node_relative_path;
-exports.find_root_filename = find_root_filename;
-exports.find_package_json_dir = find_package_json_dir;
-exports.package_dir = package_dir;
-exports.module_name_of_file = module_name_of_file;
-exports.module_name_of_file_if_any = module_name_of_file_if_any;
-exports.combine = combine;
-exports.split_aux = split_aux;
-exports.rel_normalized_absolute_path = rel_normalized_absolute_path;
-exports.normalize_absolute_path = normalize_absolute_path;
-exports.get_extension = get_extension;
-exports.simple_convert_node_path_to_os_path = simple_convert_node_path_to_os_path;
-/* simple_convert_node_path_to_os_path Not a pure module */
diff --git a/jscomp/test/ext_filename_test.res b/jscomp/test/ext_filename_test.res
deleted file mode 100644
index fcb80a6..0000000
--- a/jscomp/test/ext_filename_test.res
+++ /dev/null
@@ -1,386 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/** Used when produce node compatible paths */
-let node_sep = "/"
-let node_parent = ".."
-let node_current = "."
-
-type t = [
-  | #File(string)
-  | #Dir(string)
-]
-
-let cwd = lazy Sys.getcwd()
-
-let \"//" = Filename.concat
-
-let combine = (path1, path2) =>
-  if path1 == "" {
-    path2
-  } else if path2 == "" {
-    path1
-  } else if Filename.is_relative(path2) {
-    \"//"(path1, path2)
-  } else {
-    path2
-  }
-
-/* Note that [.//] is the same as [./] */
-let path_as_directory = x =>
-  if x == "" {
-    x
-  } else if Ext_string_test.ends_with(x, Filename.dir_sep) {
-    x
-  } else {
-    x ++ Filename.dir_sep
-  }
-
-let absolute_path = s => {
-  let process = s => {
-    let s = if Filename.is_relative(s) {
-      \"//"(Lazy.force(cwd), s)
-    } else {
-      s
-    }
-    /* Now simplify . and .. components */
-    let rec aux = s => {
-      let (base, dir) = (Filename.basename(s), Filename.dirname(s))
-      if dir == s {
-        dir
-      } else if base == Filename.current_dir_name {
-        aux(dir)
-      } else if base == Filename.parent_dir_name {
-        Filename.dirname(aux(dir))
-      } else {
-        \"//"(aux(dir), base)
-      }
-    }
-    aux(s)
-  }
-  process(s)
-}
-
-let chop_extension = (~loc="", name) =>
-  try Filename.chop_extension(name) catch {
-  | Invalid_argument(_) => invalid_arg("Filename.chop_extension ( " ++ loc ++ " : " ++ name ++ " )")
-  }
-
-let chop_extension_if_any = fname =>
-  try Filename.chop_extension(fname) catch {
-  | Invalid_argument(_) => fname
-  }
-
-let os_path_separator_char = String.unsafe_get(Filename.dir_sep, 0)
-
-/** example
-    {[
-      \"/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib/external/pervasives.cmj\"
-        \"/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib/ocaml_array.ml\"
-    ]}
-
-    The other way
-    {[
-
-      \"/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib/ocaml_array.ml\"
-        \"/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib/external/pervasives.cmj\"
-    ]}
-    {[
-      \"/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib//ocaml_array.ml\"
-    ]}
-    {[
-      /a/b
-      /c/d
-    ]}
-*/
-let relative_path = (file_or_dir_1, file_or_dir_2) => {
-  let sep_char = os_path_separator_char
-  let relevant_dir1 = switch file_or_dir_1 {
-  | #Dir(x) => x
-  | #File(file1) => Filename.dirname(file1)
-  }
-  let relevant_dir2 = switch file_or_dir_2 {
-  | #Dir(x) => x
-  | #File(file2) => Filename.dirname(file2)
-  }
-  let dir1 = Ext_string_test.split(relevant_dir1, sep_char)
-  let dir2 = Ext_string_test.split(relevant_dir2, sep_char)
-  let rec go = (dir1: list<string>, dir2: list<string>) =>
-    switch (dir1, dir2) {
-    | (list{x, ...xs}, list{y, ...ys}) if x == y => go(xs, ys)
-    | (_, _) => \"@"(List.map(_ => node_parent, dir2), dir1)
-    }
-
-  switch go(dir1, dir2) {
-  | list{x, ..._} as ys if x == node_parent => String.concat(node_sep, ys)
-  | ys => \"@@"(String.concat(node_sep), list{node_current, ...ys})
-  }
-}
-
-/** path2: a/b 
-    path1: a 
-    result:  ./b 
-    TODO: [Filename.concat] with care
-
-    [file1] is currently compilation file 
-    [file2] is the dependency
-    
-    TODO: this is a hackish function: FIXME
-*/
-let node_relative_path = (
-  node_modules_shorten,
-  file1: t,
-  #File(file2) as dep_file: [#File(string)],
-) => {
-  let v = Ext_string_test.find(file2, ~sub=Test_literals.node_modules)
-  let len = String.length(file2)
-  if node_modules_shorten && v >= 0 {
-    let rec skip = i =>
-      if i >= len {
-        failwith("invalid path: " ++ file2)
-      } else {
-        /* https://en.wikipedia.org/wiki/Path_(computing))
-           most path separator are a single char 
- */
-        let curr_char = String.unsafe_get(file2, i)
-        if curr_char == os_path_separator_char || curr_char == '.' {
-          skip(i + 1)
-        } else {
-          i
-        }
-      }
-    /*
-          TODO: we need do more than this suppose user 
-          input can be
-           {[
-             "xxxghsoghos/ghsoghso/node_modules/../buckle-stdlib/list.js"
-           ]}
-           This seems weird though
- */
-
-    Ext_string_test.tail_from(file2, skip(v + Test_literals.node_modules_length))
-  } else {
-    relative_path(
-      switch dep_file {
-      | #File(x) => #File(absolute_path(x))
-      | #Dir(x) => #Dir(absolute_path(x))
-      },
-      switch file1 {
-      | #File(x) => #File(absolute_path(x))
-      | #Dir(x) => #Dir(absolute_path(x))
-      },
-    ) ++
-    (node_sep ++
-    /* chop_extension_if_any */ Filename.basename(file2))
-  }
-}
-
-/* Input must be absolute directory */
-let rec find_root_filename = (~cwd, filename) =>
-  if Sys.file_exists(\"//"(cwd, filename)) {
-    cwd
-  } else {
-    let cwd' = Filename.dirname(cwd)
-    if String.length(cwd') < String.length(cwd) {
-      find_root_filename(~cwd=cwd', filename)
-    } else {
-      failwith("" ++ filename ++ " not found from " ++ cwd)
-    }
-  }
-
-let find_package_json_dir = cwd => find_root_filename(~cwd, Test_literals.bsconfig_json)
-
-let package_dir = lazy find_package_json_dir(Lazy.force(cwd))
-
-let module_name_of_file = file =>
-  String.capitalize_ascii(\"@@"(Filename.chop_extension, Filename.basename(file)))
-
-let module_name_of_file_if_any = file =>
-  String.capitalize_ascii(\"@@"(chop_extension_if_any, Filename.basename(file)))
-
-/* For win32 or case insensitve OS 
-    [\".cmj\"] is the same as [\".CMJ\"]
-*/
-/* let has_exact_suffix_then_chop fname suf = */
-
-let combine = (p1, p2) =>
-  if p1 == "" || p1 == Filename.current_dir_name {
-    p2
-  } else if p2 == "" || p2 == Filename.current_dir_name {
-    p1
-  } else if Filename.is_relative(p2) {
-    Filename.concat(p1, p2)
-  } else {
-    p2
-  }
-
-/**
-   {[
-     split_aux \"//ghosg//ghsogh/\";;
-     - : string * string list = (\"/\", [\"ghosg\"; \"ghsogh\"])
-   ]}
-   Note that 
-   {[
-     Filename.dirname \"/a/\" = \"/\"
-       Filename.dirname \"/a/b/\" = Filename.dirname \"/a/b\" = \"/a\"
-   ]}
-   Special case:
-   {[
-     basename \"//\" = \"/\"
-       basename \"///\"  = \"/\"
-   ]}
-   {[
-     basename \"\" =  \".\"
-       basename \"\" = \".\"
-       dirname \"\" = \".\"
-       dirname \"\" =  \".\"
-   ]}  
-*/
-let split_aux = p => {
-  let rec go = (p, acc) => {
-    let dir = Filename.dirname(p)
-    if dir == p {
-      (dir, acc)
-    } else {
-      let new_path = Filename.basename(p)
-      if Ext_string_test.equal(new_path, Filename.dir_sep) {
-        go(dir, acc)
-      } else {
-        /* We could do more path simplification here
-           leave to [rel_normalized_absolute_path]
- */
-
-        go(dir, list{new_path, ...acc})
-      }
-    }
-  }
-
-  go(p, list{})
-}
-
-/** 
-   TODO: optimization
-   if [from] and [to] resolve to the same path, a zero-length string is returned 
-*/
-let rel_normalized_absolute_path = (from, to_) => {
-  let (root1, paths1) = split_aux(from)
-  let (root2, paths2) = split_aux(to_)
-  if root1 != root2 {
-    root2
-  } else {
-    let rec go = (xss, yss) =>
-      switch (xss, yss) {
-      | (list{x, ...xs}, list{y, ...ys}) =>
-        if Ext_string_test.equal(x, y) {
-          go(xs, ys)
-        } else {
-          let start = List.fold_left(
-            (acc, _) => \"//"(acc, Ext_string_test.parent_dir_lit),
-            Ext_string_test.parent_dir_lit,
-            xs,
-          )
-          List.fold_left((acc, v) => \"//"(acc, v), start, yss)
-        }
-      | (list{}, list{}) => Ext_string_test.empty
-      | (list{}, list{y, ...ys}) => List.fold_left((acc, x) => \"//"(acc, x), y, ys)
-      | (list{x, ...xs}, list{}) =>
-        List.fold_left(
-          (acc, _) => \"//"(acc, Ext_string_test.parent_dir_lit),
-          Ext_string_test.parent_dir_lit,
-          xs,
-        )
-      }
-    go(paths1, paths2)
-  }
-}
-
-/* TODO: could be hgighly optimized later 
-  {[
-    normalize_absolute_path "/gsho/./..";;
-
-    normalize_absolute_path "/a/b/../c../d/e/f";;
-
-    normalize_absolute_path "/gsho/./..";;
-
-    normalize_absolute_path "/gsho/./../..";;
-
-    normalize_absolute_path "/a/b/c/d";;
-
-    normalize_absolute_path "/a/b/c/d/";;
-
-    normalize_absolute_path "/a/";;
-
-    normalize_absolute_path "/a";;
-  ]}
-*/
-
-/** See tests in {!Ounit_path_tests} */
-let normalize_absolute_path = x => {
-  let drop_if_exist = xs =>
-    switch xs {
-    | list{} => list{}
-    | list{_, ...xs} => xs
-    }
-  let rec normalize_list = (acc, paths) =>
-    switch paths {
-    | list{} => acc
-    | list{x, ...xs} =>
-      if Ext_string_test.equal(x, Ext_string_test.current_dir_lit) {
-        normalize_list(acc, xs)
-      } else if Ext_string_test.equal(x, Ext_string_test.parent_dir_lit) {
-        normalize_list(drop_if_exist(acc), xs)
-      } else {
-        normalize_list(list{x, ...acc}, xs)
-      }
-    }
-
-  let (root, paths) = split_aux(x)
-  let rev_paths = normalize_list(list{}, paths)
-  let rec go = (acc, rev_paths) =>
-    switch rev_paths {
-    | list{} => Filename.concat(root, acc)
-    | list{last, ...rest} => go(Filename.concat(last, acc), rest)
-    }
-  switch rev_paths {
-  | list{} => root
-  | list{last, ...rest} => go(last, rest)
-  }
-}
-
-let get_extension = x => {
-  let pos = Ext_string_test.rindex_neg(x, '.')
-  if pos < 0 {
-    ""
-  } else {
-    Ext_string_test.tail_from(x, pos)
-  }
-}
-
-let simple_convert_node_path_to_os_path = if Sys.unix {
-  x => x
-} else if Sys.win32 || Sys.cygwin {
-  Ext_string_test.replace_slash_backward
-} else {
-  failwith("Unknown OS : " ++ Sys.os_type)
-}
diff --git a/jscomp/test/ext_list_test.js b/jscomp/test/ext_list_test.js
deleted file mode 100644
index bb16453..0000000
--- a/jscomp/test/ext_list_test.js
+++ /dev/null
@@ -1,986 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-var Ext_string_test = require("./ext_string_test.js");
-
-function filter_map(f, _xs) {
-  while(true) {
-    var xs = _xs;
-    if (!xs) {
-      return /* [] */0;
-    }
-    var ys = xs.tl;
-    var z = Curry._1(f, xs.hd);
-    if (z !== undefined) {
-      return {
-              hd: Caml_option.valFromOption(z),
-              tl: filter_map(f, ys)
-            };
-    }
-    _xs = ys;
-    continue ;
-  };
-}
-
-function excludes(p, l) {
-  var excluded = {
-    contents: false
-  };
-  var aux = function (_accu, _x) {
-    while(true) {
-      var x = _x;
-      var accu = _accu;
-      if (!x) {
-        return List.rev(accu);
-      }
-      var l = x.tl;
-      var x$1 = x.hd;
-      if (Curry._1(p, x$1)) {
-        excluded.contents = true;
-        _x = l;
-        continue ;
-      }
-      _x = l;
-      _accu = {
-        hd: x$1,
-        tl: accu
-      };
-      continue ;
-    };
-  };
-  var v = aux(/* [] */0, l);
-  if (excluded.contents) {
-    return [
-            true,
-            v
-          ];
-  } else {
-    return [
-            false,
-            l
-          ];
-  }
-}
-
-function exclude_with_fact(p, l) {
-  var excluded = {
-    contents: undefined
-  };
-  var aux = function (_accu, _x) {
-    while(true) {
-      var x = _x;
-      var accu = _accu;
-      if (!x) {
-        return List.rev(accu);
-      }
-      var l = x.tl;
-      var x$1 = x.hd;
-      if (Curry._1(p, x$1)) {
-        excluded.contents = Caml_option.some(x$1);
-        _x = l;
-        continue ;
-      }
-      _x = l;
-      _accu = {
-        hd: x$1,
-        tl: accu
-      };
-      continue ;
-    };
-  };
-  var v = aux(/* [] */0, l);
-  return [
-          excluded.contents,
-          excluded.contents !== undefined ? v : l
-        ];
-}
-
-function exclude_with_fact2(p1, p2, l) {
-  var excluded1 = {
-    contents: undefined
-  };
-  var excluded2 = {
-    contents: undefined
-  };
-  var aux = function (_accu, _x) {
-    while(true) {
-      var x = _x;
-      var accu = _accu;
-      if (!x) {
-        return List.rev(accu);
-      }
-      var l = x.tl;
-      var x$1 = x.hd;
-      if (Curry._1(p1, x$1)) {
-        excluded1.contents = Caml_option.some(x$1);
-        _x = l;
-        continue ;
-      }
-      if (Curry._1(p2, x$1)) {
-        excluded2.contents = Caml_option.some(x$1);
-        _x = l;
-        continue ;
-      }
-      _x = l;
-      _accu = {
-        hd: x$1,
-        tl: accu
-      };
-      continue ;
-    };
-  };
-  var v = aux(/* [] */0, l);
-  return [
-          excluded1.contents,
-          excluded2.contents,
-          excluded1.contents !== undefined && excluded2.contents !== undefined ? v : l
-        ];
-}
-
-function same_length(_xs, _ys) {
-  while(true) {
-    var ys = _ys;
-    var xs = _xs;
-    if (!xs) {
-      if (ys) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-    if (!ys) {
-      return false;
-    }
-    _ys = ys.tl;
-    _xs = xs.tl;
-    continue ;
-  };
-}
-
-function filter_mapi(f, xs) {
-  var aux = function (_i, _xs) {
-    while(true) {
-      var xs = _xs;
-      var i = _i;
-      if (!xs) {
-        return /* [] */0;
-      }
-      var ys = xs.tl;
-      var z = Curry._2(f, i, xs.hd);
-      if (z !== undefined) {
-        return {
-                hd: Caml_option.valFromOption(z),
-                tl: aux(i + 1 | 0, ys)
-              };
-      }
-      _xs = ys;
-      _i = i + 1 | 0;
-      continue ;
-    };
-  };
-  return aux(0, xs);
-}
-
-function filter_map2(f, _xs, _ys) {
-  while(true) {
-    var ys = _ys;
-    var xs = _xs;
-    if (xs) {
-      if (ys) {
-        var vs = ys.tl;
-        var us = xs.tl;
-        var z = Curry._2(f, xs.hd, ys.hd);
-        if (z !== undefined) {
-          return {
-                  hd: Caml_option.valFromOption(z),
-                  tl: filter_map2(f, us, vs)
-                };
-        }
-        _ys = vs;
-        _xs = us;
-        continue ;
-      }
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.filter_map2",
-            Error: new Error()
-          };
-    }
-    if (!ys) {
-      return /* [] */0;
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_list_test.filter_map2",
-          Error: new Error()
-        };
-  };
-}
-
-function filter_map2i(f, xs, ys) {
-  var aux = function (_i, _xs, _ys) {
-    while(true) {
-      var ys = _ys;
-      var xs = _xs;
-      var i = _i;
-      if (xs) {
-        if (ys) {
-          var vs = ys.tl;
-          var us = xs.tl;
-          var z = Curry._3(f, i, xs.hd, ys.hd);
-          if (z !== undefined) {
-            return {
-                    hd: Caml_option.valFromOption(z),
-                    tl: aux(i + 1 | 0, us, vs)
-                  };
-          }
-          _ys = vs;
-          _xs = us;
-          _i = i + 1 | 0;
-          continue ;
-        }
-        throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Ext_list_test.filter_map2i",
-              Error: new Error()
-            };
-      }
-      if (!ys) {
-        return /* [] */0;
-      }
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.filter_map2i",
-            Error: new Error()
-          };
-    };
-  };
-  return aux(0, xs, ys);
-}
-
-function rev_map_append(f, _l1, _l2) {
-  while(true) {
-    var l2 = _l2;
-    var l1 = _l1;
-    if (!l1) {
-      return l2;
-    }
-    _l2 = {
-      hd: Curry._1(f, l1.hd),
-      tl: l2
-    };
-    _l1 = l1.tl;
-    continue ;
-  };
-}
-
-function flat_map2(f, lx, ly) {
-  var _acc = /* [] */0;
-  var _lx = lx;
-  var _ly = ly;
-  while(true) {
-    var ly$1 = _ly;
-    var lx$1 = _lx;
-    var acc = _acc;
-    if (lx$1) {
-      if (ly$1) {
-        _ly = ly$1.tl;
-        _lx = lx$1.tl;
-        _acc = List.rev_append(Curry._2(f, lx$1.hd, ly$1.hd), acc);
-        continue ;
-      }
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.flat_map2",
-            Error: new Error()
-          };
-    }
-    if (ly$1) {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.flat_map2",
-            Error: new Error()
-          };
-    }
-    return List.rev(acc);
-  };
-}
-
-function flat_map_aux(f, _acc, append, _lx) {
-  while(true) {
-    var lx = _lx;
-    var acc = _acc;
-    if (!lx) {
-      return List.rev_append(acc, append);
-    }
-    _lx = lx.tl;
-    _acc = List.rev_append(Curry._1(f, lx.hd), acc);
-    continue ;
-  };
-}
-
-function flat_map(f, lx) {
-  return flat_map_aux(f, /* [] */0, /* [] */0, lx);
-}
-
-function flat_map_acc(f, append, lx) {
-  return flat_map_aux(f, /* [] */0, append, lx);
-}
-
-function map2_last(f, l1, l2) {
-  if (l1) {
-    var l1$1 = l1.tl;
-    var u = l1.hd;
-    if (!l1$1) {
-      if (l2) {
-        if (!l2.tl) {
-          return {
-                  hd: Curry._3(f, true, u, l2.hd),
-                  tl: /* [] */0
-                };
-        }
-        
-      } else {
-        throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "List.map2_last",
-              Error: new Error()
-            };
-      }
-    }
-    if (l2) {
-      var r = Curry._3(f, false, u, l2.hd);
-      return {
-              hd: r,
-              tl: map2_last(f, l1$1, l2.tl)
-            };
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.map2_last",
-          Error: new Error()
-        };
-  }
-  if (!l2) {
-    return /* [] */0;
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.map2_last",
-        Error: new Error()
-      };
-}
-
-function map_last(f, l1) {
-  if (!l1) {
-    return /* [] */0;
-  }
-  var l1$1 = l1.tl;
-  var u = l1.hd;
-  if (!l1$1) {
-    return {
-            hd: Curry._2(f, true, u),
-            tl: /* [] */0
-          };
-  }
-  var r = Curry._2(f, false, u);
-  return {
-          hd: r,
-          tl: map_last(f, l1$1)
-        };
-}
-
-function fold_right2_last(f, l1, l2, accu) {
-  if (l1) {
-    var l1$1 = l1.tl;
-    var last1 = l1.hd;
-    if (!l1$1) {
-      if (l2) {
-        if (!l2.tl) {
-          return Curry._4(f, true, last1, l2.hd, accu);
-        }
-        
-      } else {
-        throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "List.fold_right2",
-              Error: new Error()
-            };
-      }
-    }
-    if (l2) {
-      return Curry._4(f, false, last1, l2.hd, fold_right2_last(f, l1$1, l2.tl, accu));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
-  }
-  if (l2) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
-  }
-  return accu;
-}
-
-function init(n, f) {
-  return $$Array.to_list($$Array.init(n, f));
-}
-
-function take(n, l) {
-  var arr = $$Array.of_list(l);
-  var arr_length = arr.length;
-  if (arr_length < n) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_list_test.take",
-          Error: new Error()
-        };
-  }
-  return [
-          $$Array.to_list($$Array.sub(arr, 0, n)),
-          $$Array.to_list($$Array.sub(arr, n, arr_length - n | 0))
-        ];
-}
-
-function try_take(n, l) {
-  var arr = $$Array.of_list(l);
-  var arr_length = arr.length;
-  if (arr_length <= n) {
-    return [
-            l,
-            arr_length,
-            /* [] */0
-          ];
-  } else {
-    return [
-            $$Array.to_list($$Array.sub(arr, 0, n)),
-            n,
-            $$Array.to_list($$Array.sub(arr, n, arr_length - n | 0))
-          ];
-  }
-}
-
-function length_compare(_l, _n) {
-  while(true) {
-    var n = _n;
-    var l = _l;
-    if (n < 0) {
-      return "Gt";
-    }
-    if (!l) {
-      if (n === 0) {
-        return "Eq";
-      } else {
-        return "Lt";
-      }
-    }
-    _n = n - 1 | 0;
-    _l = l.tl;
-    continue ;
-  };
-}
-
-function length_larger_than_n(n, _xs, _ys) {
-  while(true) {
-    var ys = _ys;
-    var xs = _xs;
-    if (!ys) {
-      return length_compare(xs, n) === "Eq";
-    }
-    if (!xs) {
-      return false;
-    }
-    _ys = ys.tl;
-    _xs = xs.tl;
-    continue ;
-  };
-}
-
-function exclude_tail(x) {
-  var _acc = /* [] */0;
-  var _x = x;
-  while(true) {
-    var x$1 = _x;
-    var acc = _acc;
-    if (x$1) {
-      var ys = x$1.tl;
-      var x$2 = x$1.hd;
-      if (!ys) {
-        return [
-                x$2,
-                List.rev(acc)
-              ];
-      }
-      _x = ys;
-      _acc = {
-        hd: x$2,
-        tl: acc
-      };
-      continue ;
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_list_test.exclude_tail",
-          Error: new Error()
-        };
-  };
-}
-
-function group(cmp, lst) {
-  if (lst) {
-    return aux(cmp, lst.hd, group(cmp, lst.tl));
-  } else {
-    return /* [] */0;
-  }
-}
-
-function aux(cmp, x, xss) {
-  if (!xss) {
-    return {
-            hd: {
-              hd: x,
-              tl: /* [] */0
-            },
-            tl: /* [] */0
-          };
-  }
-  var ys = xss.tl;
-  var y = xss.hd;
-  if (Curry._2(cmp, x, List.hd(y))) {
-    return {
-            hd: {
-              hd: x,
-              tl: y
-            },
-            tl: ys
-          };
-  } else {
-    return {
-            hd: y,
-            tl: aux(cmp, x, ys)
-          };
-  }
-}
-
-function stable_group(cmp, lst) {
-  return List.rev(group(cmp, lst));
-}
-
-function drop(_n, _h) {
-  while(true) {
-    var h = _h;
-    var n = _n;
-    if (n < 0) {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.drop",
-            Error: new Error()
-          };
-    }
-    if (n === 0) {
-      return h;
-    }
-    if (h === /* [] */0) {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Ext_list_test.drop",
-            Error: new Error()
-          };
-    }
-    _h = List.tl(h);
-    _n = n - 1 | 0;
-    continue ;
-  };
-}
-
-function find_first_not(p, _x) {
-  while(true) {
-    var x = _x;
-    if (!x) {
-      return ;
-    }
-    var a = x.hd;
-    if (!Curry._1(p, a)) {
-      return Caml_option.some(a);
-    }
-    _x = x.tl;
-    continue ;
-  };
-}
-
-function for_all_opt(p, _x) {
-  while(true) {
-    var x = _x;
-    if (!x) {
-      return ;
-    }
-    var v = Curry._1(p, x.hd);
-    if (v !== undefined) {
-      return v;
-    }
-    _x = x.tl;
-    continue ;
-  };
-}
-
-function fold(f, l, init) {
-  return List.fold_left((function (acc, i) {
-                return Curry._2(f, i, init);
-              }), init, l);
-}
-
-function rev_map_acc(acc, f, l) {
-  var _accu = acc;
-  var _x = l;
-  while(true) {
-    var x = _x;
-    var accu = _accu;
-    if (!x) {
-      return accu;
-    }
-    _x = x.tl;
-    _accu = {
-      hd: Curry._1(f, x.hd),
-      tl: accu
-    };
-    continue ;
-  };
-}
-
-function map_acc(acc, f, l) {
-  if (l) {
-    return {
-            hd: Curry._1(f, l.hd),
-            tl: map_acc(acc, f, l.tl)
-          };
-  } else {
-    return acc;
-  }
-}
-
-function rev_iter(f, xs) {
-  if (xs) {
-    rev_iter(f, xs.tl);
-    return Curry._1(f, xs.hd);
-  }
-  
-}
-
-function for_all2_no_exn(p, _l1, _l2) {
-  while(true) {
-    var l2 = _l2;
-    var l1 = _l1;
-    if (!l1) {
-      if (l2) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-    if (!l2) {
-      return false;
-    }
-    if (!Curry._2(p, l1.hd, l2.hd)) {
-      return false;
-    }
-    _l2 = l2.tl;
-    _l1 = l1.tl;
-    continue ;
-  };
-}
-
-function find_no_exn(p, _x) {
-  while(true) {
-    var x = _x;
-    if (!x) {
-      return ;
-    }
-    var x$1 = x.hd;
-    if (Curry._1(p, x$1)) {
-      return Caml_option.some(x$1);
-    }
-    _x = x.tl;
-    continue ;
-  };
-}
-
-function find_opt(p, _x) {
-  while(true) {
-    var x = _x;
-    if (!x) {
-      return ;
-    }
-    var v = Curry._1(p, x.hd);
-    if (v !== undefined) {
-      return v;
-    }
-    _x = x.tl;
-    continue ;
-  };
-}
-
-function split_map(f, xs) {
-  var _bs = /* [] */0;
-  var _cs = /* [] */0;
-  var _xs = xs;
-  while(true) {
-    var xs$1 = _xs;
-    var cs = _cs;
-    var bs = _bs;
-    if (!xs$1) {
-      return [
-              List.rev(bs),
-              List.rev(cs)
-            ];
-    }
-    var match = Curry._1(f, xs$1.hd);
-    _xs = xs$1.tl;
-    _cs = {
-      hd: match[1],
-      tl: cs
-    };
-    _bs = {
-      hd: match[0],
-      tl: bs
-    };
-    continue ;
-  };
-}
-
-function reduce_from_right(fn, lst) {
-  var match = List.rev(lst);
-  if (match) {
-    return List.fold_left((function (x, y) {
-                  return Curry._2(fn, y, x);
-                }), match.hd, match.tl);
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Ext_list_test.reduce",
-        Error: new Error()
-      };
-}
-
-function reduce_from_left(fn, lst) {
-  if (lst) {
-    return List.fold_left(fn, lst.hd, lst.tl);
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Ext_list_test.reduce_from_left",
-        Error: new Error()
-      };
-}
-
-function create_ref_empty(param) {
-  return {
-          contents: /* [] */0
-        };
-}
-
-function ref_top(x) {
-  var match = x.contents;
-  if (match) {
-    return match.hd;
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Ext_list_test.ref_top",
-        Error: new Error()
-      };
-}
-
-function ref_empty(x) {
-  var match = x.contents;
-  if (match) {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-function ref_push(x, refs) {
-  refs.contents = {
-    hd: x,
-    tl: refs.contents
-  };
-}
-
-function ref_pop(refs) {
-  var match = refs.contents;
-  if (match) {
-    refs.contents = match.tl;
-    return match.hd;
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Ext_list_test.ref_pop",
-        Error: new Error()
-      };
-}
-
-function rev_except_last(xs) {
-  var _acc = /* [] */0;
-  var _xs = xs;
-  while(true) {
-    var xs$1 = _xs;
-    var acc = _acc;
-    if (xs$1) {
-      var xs$2 = xs$1.tl;
-      var x = xs$1.hd;
-      if (!xs$2) {
-        return [
-                acc,
-                x
-              ];
-      }
-      _xs = xs$2;
-      _acc = {
-        hd: x,
-        tl: acc
-      };
-      continue ;
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_list_test.rev_except_last",
-          Error: new Error()
-        };
-  };
-}
-
-function sort_via_array(cmp, lst) {
-  var arr = $$Array.of_list(lst);
-  $$Array.sort(cmp, arr);
-  return $$Array.to_list(arr);
-}
-
-function last(_xs) {
-  while(true) {
-    var xs = _xs;
-    if (xs) {
-      var tl = xs.tl;
-      if (!tl) {
-        return xs.hd;
-      }
-      _xs = tl;
-      continue ;
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_list_test.last",
-          Error: new Error()
-        };
-  };
-}
-
-function assoc_by_string(def, k, _lst) {
-  while(true) {
-    var lst = _lst;
-    if (lst) {
-      var match = lst.hd;
-      if (match[0] === k) {
-        return match[1];
-      }
-      _lst = lst.tl;
-      continue ;
-    }
-    if (def !== undefined) {
-      return Caml_option.valFromOption(def);
-    }
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "ext_list_test.res",
-            472,
-            14
-          ],
-          Error: new Error()
-        };
-  };
-}
-
-function assoc_by_int(def, k, _lst) {
-  while(true) {
-    var lst = _lst;
-    if (lst) {
-      var match = lst.hd;
-      if (match[0] === k) {
-        return match[1];
-      }
-      _lst = lst.tl;
-      continue ;
-    }
-    if (def !== undefined) {
-      return Caml_option.valFromOption(def);
-    }
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "ext_list_test.res",
-            487,
-            14
-          ],
-          Error: new Error()
-        };
-  };
-}
-
-exports.filter_map = filter_map;
-exports.excludes = excludes;
-exports.exclude_with_fact = exclude_with_fact;
-exports.exclude_with_fact2 = exclude_with_fact2;
-exports.same_length = same_length;
-exports.filter_mapi = filter_mapi;
-exports.filter_map2 = filter_map2;
-exports.filter_map2i = filter_map2i;
-exports.rev_map_append = rev_map_append;
-exports.flat_map2 = flat_map2;
-exports.flat_map_aux = flat_map_aux;
-exports.flat_map = flat_map;
-exports.flat_map_acc = flat_map_acc;
-exports.map2_last = map2_last;
-exports.map_last = map_last;
-exports.fold_right2_last = fold_right2_last;
-exports.init = init;
-exports.take = take;
-exports.try_take = try_take;
-exports.length_compare = length_compare;
-exports.length_larger_than_n = length_larger_than_n;
-exports.exclude_tail = exclude_tail;
-exports.group = group;
-exports.aux = aux;
-exports.stable_group = stable_group;
-exports.drop = drop;
-exports.find_first_not = find_first_not;
-exports.for_all_opt = for_all_opt;
-exports.fold = fold;
-exports.rev_map_acc = rev_map_acc;
-exports.map_acc = map_acc;
-exports.rev_iter = rev_iter;
-exports.for_all2_no_exn = for_all2_no_exn;
-exports.find_no_exn = find_no_exn;
-exports.find_opt = find_opt;
-exports.split_map = split_map;
-exports.reduce_from_right = reduce_from_right;
-exports.reduce_from_left = reduce_from_left;
-exports.create_ref_empty = create_ref_empty;
-exports.ref_top = ref_top;
-exports.ref_empty = ref_empty;
-exports.ref_push = ref_push;
-exports.ref_pop = ref_pop;
-exports.rev_except_last = rev_except_last;
-exports.sort_via_array = sort_via_array;
-exports.last = last;
-exports.assoc_by_string = assoc_by_string;
-exports.assoc_by_int = assoc_by_int;
-/* Ext_string_test Not a pure module */
diff --git a/jscomp/test/ext_list_test.res b/jscomp/test/ext_list_test.res
deleted file mode 100644
index e9e1dfb..0000000
--- a/jscomp/test/ext_list_test.res
+++ /dev/null
@@ -1,502 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-let rec filter_map = (f: 'a => option<'b>, xs) =>
-  switch xs {
-  | list{} => list{}
-  | list{y, ...ys} =>
-    switch f(y) {
-    | None => filter_map(f, ys)
-    | Some(z) => list{z, ...filter_map(f, ys)}
-    }
-  }
-
-let excludes = (p: 'a => bool, l): (bool, list<'a>) => {
-  let excluded = ref(false)
-  let rec aux = (accu, x) =>
-    switch x {
-    | list{} => List.rev(accu)
-    | list{x, ...l} =>
-      if p(x) {
-        excluded := true
-        aux(accu, l)
-      } else {
-        aux(list{x, ...accu}, l)
-      }
-    }
-  let v = aux(list{}, l)
-  if excluded.contents {
-    (true, v)
-  } else {
-    (false, l)
-  }
-}
-
-let exclude_with_fact = (p, l) => {
-  let excluded = ref(None)
-  let rec aux = (accu, x) =>
-    switch x {
-    | list{} => List.rev(accu)
-    | list{x, ...l} =>
-      if p(x) {
-        excluded := Some(x)
-        aux(accu, l)
-      } else {
-        aux(list{x, ...accu}, l)
-      }
-    }
-  let v = aux(list{}, l)
-  (
-    excluded.contents,
-    if excluded.contents != None {
-      v
-    } else {
-      l
-    },
-  )
-}
-
-/** Make sure [p2 x] and [p1 x] will not hold at the same time */
-let exclude_with_fact2 = (p1, p2, l) => {
-  let excluded1 = ref(None)
-  let excluded2 = ref(None)
-  let rec aux = (accu, x) =>
-    switch x {
-    | list{} => List.rev(accu)
-    | list{x, ...l} =>
-      if p1(x) {
-        excluded1 := Some(x)
-        aux(accu, l)
-      } else if p2(x) {
-        excluded2 := Some(x)
-        aux(accu, l)
-      } else {
-        aux(list{x, ...accu}, l)
-      }
-    }
-  let v = aux(list{}, l)
-  (
-    excluded1.contents,
-    excluded2.contents,
-    if excluded1.contents != None && excluded2.contents != None {
-      v
-    } else {
-      l
-    },
-  )
-}
-
-let rec same_length = (xs, ys) =>
-  switch (xs, ys) {
-  | (list{}, list{}) => true
-  | (list{_, ...xs}, list{_, ...ys}) => same_length(xs, ys)
-  | (_, _) => false
-  }
-
-let filter_mapi = (f: (int, 'a) => option<'b>, xs) => {
-  let rec aux = (i, xs) =>
-    switch xs {
-    | list{} => list{}
-    | list{y, ...ys} =>
-      switch f(i, y) {
-      | None => aux(i + 1, ys)
-      | Some(z) => list{z, ...aux(i + 1, ys)}
-      }
-    }
-  aux(0, xs)
-}
-
-let rec filter_map2 = (f: ('a, 'b) => option<'c>, xs, ys) =>
-  switch (xs, ys) {
-  | (list{}, list{}) => list{}
-  | (list{u, ...us}, list{v, ...vs}) =>
-    switch f(u, v) {
-    | None => filter_map2(f, us, vs) /* idea: rec f us vs instead? */
-    | Some(z) => list{z, ...filter_map2(f, us, vs)}
-    }
-  | _ => invalid_arg("Ext_list_test.filter_map2")
-  }
-
-let filter_map2i = (f: (int, 'a, 'b) => option<'c>, xs, ys) => {
-  let rec aux = (i, xs, ys) =>
-    switch (xs, ys) {
-    | (list{}, list{}) => list{}
-    | (list{u, ...us}, list{v, ...vs}) =>
-      switch f(i, u, v) {
-      | None => aux(i + 1, us, vs) /* idea: rec f us vs instead? */
-      | Some(z) => list{z, ...aux(i + 1, us, vs)}
-      }
-    | _ => invalid_arg("Ext_list_test.filter_map2i")
-    }
-  aux(0, xs, ys)
-}
-
-let rec rev_map_append = (f, l1, l2) =>
-  switch l1 {
-  | list{} => l2
-  | list{a, ...l} => rev_map_append(f, l, list{f(a), ...l2})
-  }
-
-let flat_map2 = (f, lx, ly) => {
-  let rec aux = (acc, lx, ly) =>
-    switch (lx, ly) {
-    | (list{}, list{}) => List.rev(acc)
-    | (list{x, ...xs}, list{y, ...ys}) => aux(List.rev_append(f(x, y), acc), xs, ys)
-    | (_, _) => invalid_arg("Ext_list_test.flat_map2")
-    }
-  aux(list{}, lx, ly)
-}
-
-let rec flat_map_aux = (f, acc, append, lx) =>
-  switch lx {
-  | list{} => List.rev_append(acc, append)
-  | list{y, ...ys} => flat_map_aux(f, List.rev_append(f(y), acc), append, ys)
-  }
-
-let flat_map = (f, lx) => flat_map_aux(f, list{}, list{}, lx)
-
-let flat_map_acc = (f, append, lx) => flat_map_aux(f, list{}, append, lx)
-
-let rec map2_last = (f, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => list{}
-  | (list{u}, list{v}) => list{f(true, u, v)}
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    let r = f(false, a1, a2)
-    list{r, ...map2_last(f, l1, l2)}
-  | (_, _) => invalid_arg("List.map2_last")
-  }
-
-let rec map_last = (f, l1) =>
-  switch l1 {
-  | list{} => list{}
-  | list{u} => list{f(true, u)}
-  | list{a1, ...l1} =>
-    let r = f(false, a1)
-    list{r, ...map_last(f, l1)}
-  }
-
-let rec fold_right2_last = (f, l1, l2, accu) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => accu
-  | (list{last1}, list{last2}) => f(true, last1, last2, accu)
-  | (list{a1, ...l1}, list{a2, ...l2}) => f(false, a1, a2, fold_right2_last(f, l1, l2, accu))
-  | (_, _) => invalid_arg("List.fold_right2")
-  }
-
-let init = (n, f) => Array.to_list(Array.init(n, f))
-
-let take = (n, l) => {
-  let arr = Array.of_list(l)
-  let arr_length = Array.length(arr)
-  if arr_length < n {
-    invalid_arg("Ext_list_test.take")
-  } else {
-    (Array.to_list(Array.sub(arr, 0, n)), Array.to_list(Array.sub(arr, n, arr_length - n)))
-  }
-}
-
-let try_take = (n, l) => {
-  let arr = Array.of_list(l)
-  let arr_length = Array.length(arr)
-  if arr_length <= n {
-    (l, arr_length, list{})
-  } else {
-    (Array.to_list(Array.sub(arr, 0, n)), n, Array.to_list(Array.sub(arr, n, arr_length - n)))
-  }
-}
-
-/**
-
-  {[length xs = length ys + n ]}
-*/
-let rec length_compare = (l, n) =>
-  if n < 0 {
-    #Gt
-  } else {
-    switch l {
-    | list{_, ...xs} => length_compare(xs, n - 1)
-    | list{} =>
-      if n == 0 {
-        #Eq
-      } else {
-        #Lt
-      }
-    }
-  }
-
-/**
-
-  {[length xs = length ys + n ]}
-*/
-let rec length_larger_than_n = (n, xs, ys) =>
-  switch (xs, ys) {
-  | (_, list{}) => length_compare(xs, n) == #Eq
-  | (list{_, ...xs}, list{_, ...ys}) => length_larger_than_n(n, xs, ys)
-  | (list{}, _) => false
-  }
-
-let exclude_tail = (x: list<'a>) => {
-  let rec aux = (acc, x) =>
-    switch x {
-    | list{} => invalid_arg("Ext_list_test.exclude_tail")
-    | list{x} => (x, List.rev(acc))
-    | list{y0, ...ys} => aux(list{y0, ...acc}, ys)
-    }
-  aux(list{}, x)
-}
-
-/* For small list, only need partial equality 
-   {[
-     group (=) [1;2;3;4;3]
-     ;;
-     - : int list list = [[3; 3]; [4]; [2]; [1]]
-                         # group (=) [];;
-     - : 'a list list = []
-   ]}
-*/
-let rec group = (cmp: ('a, 'a) => bool, lst: list<'a>): list<list<'a>> =>
-  switch lst {
-  | list{} => list{}
-  | list{x, ...xs} => aux(cmp, x, group(cmp, xs))
-  }
-
-and aux = (cmp, x: 'a, xss: list<list<'a>>): list<list<'a>> =>
-  switch xss {
-  | list{} => list{list{x}}
-  | list{y, ...ys} =>
-    if cmp(x, List.hd(y)) /* cannot be null */ {
-      list{list{x, ...y}, ...ys}
-    } else {
-      list{y, ...aux(cmp, x, ys)}
-    }
-  }
-
-let stable_group = (cmp, lst) => group(cmp, lst) |> List.rev
-
-let rec drop = (n, h) =>
-  if n < 0 {
-    invalid_arg("Ext_list_test.drop")
-  } else if n == 0 {
-    h
-  } else if h == list{} {
-    invalid_arg("Ext_list_test.drop")
-  } else {
-    drop(n - 1, List.tl(h))
-  }
-
-let rec find_first_not = (p, x) =>
-  switch x {
-  | list{} => None
-  | list{a, ...l} =>
-    if p(a) {
-      find_first_not(p, l)
-    } else {
-      Some(a)
-    }
-  }
-
-let rec for_all_opt = (p, x) =>
-  switch x {
-  | list{} => None
-  | list{a, ...l} =>
-    switch p(a) {
-    | None => for_all_opt(p, l)
-    | v => v
-    }
-  }
-
-let fold = (f, l, init) => List.fold_left((acc, i) => f(i, init), init, l)
-
-let rev_map_acc = (acc, f, l) => {
-  let rec rmap_f = (accu, x) =>
-    switch x {
-    | list{} => accu
-    | list{a, ...l} => rmap_f(list{f(a), ...accu}, l)
-    }
-
-  rmap_f(acc, l)
-}
-
-let rec map_acc = (acc, f, l) =>
-  switch l {
-  | list{} => acc
-  | list{h, ...hs} => list{f(h), ...map_acc(acc, f, hs)}
-  }
-
-let rec rev_iter = (f, xs) =>
-  switch xs {
-  | list{} => ()
-  | list{y, ...ys} =>
-    rev_iter(f, ys)
-    f(y)
-  }
-
-let rec for_all2_no_exn = (p, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => true
-  | (list{a1, ...l1}, list{a2, ...l2}) => p(a1, a2) && for_all2_no_exn(p, l1, l2)
-  | (_, _) => false
-  }
-
-let rec find_no_exn = (p, x) =>
-  switch x {
-  | list{} => None
-  | list{x, ...l} =>
-    if p(x) {
-      Some(x)
-    } else {
-      find_no_exn(p, l)
-    }
-  }
-
-let rec find_opt = (p, x) =>
-  switch x {
-  | list{} => None
-  | list{x, ...l} =>
-    switch p(x) {
-    | Some(_) as v => v
-    | None => find_opt(p, l)
-    }
-  }
-
-let split_map = (f: 'a => ('b, 'c), xs: list<'a>): (list<'b>, list<'c>) => {
-  let rec aux = (bs, cs, xs) =>
-    switch xs {
-    | list{} => (List.rev(bs), List.rev(cs))
-    | list{u, ...us} =>
-      let (b, c) = f(u)
-      aux(list{b, ...bs}, list{c, ...cs}, us)
-    }
-
-  aux(list{}, list{}, xs)
-}
-
-/*
-   {[
-     reduce_from_right (-) [1;2;3];;
-     - : int = 2
-               # reduce_from_right (-) [1;2;3; 4];;
-     - : int = -2
-                # reduce_from_right (-) [1];;
-     - : int = 1
-               # reduce_from_right (-) [1;2;3; 4; 5];;
-     - : int = 3
-   ]} 
-*/
-let reduce_from_right = (fn, lst) =>
-  switch List.rev(lst) {
-  | list{last, ...rest} => List.fold_left((x, y) => fn(y, x), last, rest)
-  | _ => invalid_arg("Ext_list_test.reduce")
-  }
-let reduce_from_left = (fn, lst) =>
-  switch lst {
-  | list{first, ...rest} => List.fold_left(fn, first, rest)
-  | _ => invalid_arg("Ext_list_test.reduce_from_left")
-  }
-
-type t<'a> = ref<list<'a>>
-
-let create_ref_empty = () => ref(list{})
-
-let ref_top = x =>
-  switch x.contents {
-  | list{y, ..._} => y
-  | _ => invalid_arg("Ext_list_test.ref_top")
-  }
-
-let ref_empty = x =>
-  switch x.contents {
-  | list{} => true
-  | _ => false
-  }
-
-let ref_push = (x, refs) => refs := list{x, ...refs.contents}
-
-let ref_pop = refs =>
-  switch refs.contents {
-  | list{} => invalid_arg("Ext_list_test.ref_pop")
-  | list{x, ...rest} =>
-    refs := rest
-    x
-  }
-
-let rev_except_last = xs => {
-  let rec aux = (acc, xs) =>
-    switch xs {
-    | list{} => invalid_arg("Ext_list_test.rev_except_last")
-    | list{x} => (acc, x)
-    | list{x, ...xs} => aux(list{x, ...acc}, xs)
-    }
-  aux(list{}, xs)
-}
-
-let sort_via_array = (cmp, lst) => {
-  let arr = Array.of_list(lst)
-  Array.sort(cmp, arr)
-  Array.to_list(arr)
-}
-
-let rec last = xs =>
-  switch xs {
-  | list{x} => x
-  | list{_, ...tl} => last(tl)
-  | list{} => invalid_arg("Ext_list_test.last")
-  }
-
-let rec assoc_by_string = (def, k: string, lst) =>
-  switch lst {
-  | list{} =>
-    switch def {
-    | None => assert(false)
-    | Some(x) => x
-    }
-  | list{(k1, v1), ...rest} =>
-    if Ext_string_test.equal(k1, k) {
-      v1
-    } else {
-      assoc_by_string(def, k, rest)
-    }
-  }
-
-let rec assoc_by_int = (def, k: int, lst) =>
-  switch lst {
-  | list{} =>
-    switch def {
-    | None => assert(false)
-    | Some(x) => x
-    }
-  | list{(k1, v1), ...rest} =>
-    if k1 == k {
-      v1
-    } else {
-      assoc_by_int(def, k, rest)
-    }
-  }
-
-/* `modulo [1;2;3;4] [1;2;3]` => [1;2;3], Some [4] `
-  modulo [1;2;3] [1;2;3;4] => [1;2;3] None 
-  modulo [1;2;3] [1;2;3] => [1;2;3] Some []
- */
- 
\ No newline at end of file
diff --git a/jscomp/test/ext_pervasives_test.js b/jscomp/test/ext_pervasives_test.js
deleted file mode 100644
index 31a1bcc..0000000
--- a/jscomp/test/ext_pervasives_test.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function $$finally(v, action, f) {
-  var e;
-  try {
-    e = Curry._1(f, v);
-  }
-  catch (e$1){
-    Curry._1(action, v);
-    throw e$1;
-  }
-  Curry._1(action, v);
-  return e;
-}
-
-function is_pos_pow(n) {
-  var E = /* @__PURE__ */Caml_exceptions.create("E");
-  try {
-    var _c = 0;
-    var _n = n;
-    while(true) {
-      var n$1 = _n;
-      var c = _c;
-      if (n$1 <= 0) {
-        return -2;
-      }
-      if (n$1 === 1) {
-        return c;
-      }
-      if ((n$1 & 1) === 0) {
-        _n = (n$1 >> 1);
-        _c = c + 1 | 0;
-        continue ;
-      }
-      throw {
-            RE_EXN_ID: E,
-            Error: new Error()
-          };
-    };
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === E) {
-      return -1;
-    }
-    throw exn;
-  }
-}
-
-function is_pos_pow_2(n) {
-  var E = /* @__PURE__ */Caml_exceptions.create("E");
-  try {
-    var _c = 0;
-    var _n = n;
-    while(true) {
-      var n$1 = _n;
-      var c = _c;
-      if (n$1 <= 0) {
-        return -2;
-      }
-      if (n$1 === 1) {
-        return c;
-      }
-      if ((n$1 & 1) === 0) {
-        _n = (n$1 >> 1);
-        _c = c + 1 | 0;
-        continue ;
-      }
-      throw {
-            RE_EXN_ID: E,
-            Error: new Error()
-          };
-    };
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === E) {
-      return -1;
-    }
-    throw exn;
-  }
-}
-
-function hash_variant(s) {
-  var accu = 0;
-  for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){
-    accu = Math.imul(223, accu) + Caml_string.get(s, i) | 0;
-  }
-  accu = accu & 2147483647;
-  if (accu > 1073741823) {
-    return accu - -2147483648 | 0;
-  } else {
-    return accu;
-  }
-}
-
-var LargeFile = {
-  u: 3
-};
-
-exports.$$finally = $$finally;
-exports.is_pos_pow = is_pos_pow;
-exports.is_pos_pow_2 = is_pos_pow_2;
-exports.hash_variant = hash_variant;
-exports.LargeFile = LargeFile;
-/* No side effect */
diff --git a/jscomp/test/ext_pervasives_test.res b/jscomp/test/ext_pervasives_test.res
deleted file mode 100644
index d10ac5d..0000000
--- a/jscomp/test/ext_pervasives_test.res
+++ /dev/null
@@ -1,91 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-external reraise: exn => 'a = "%reraise"
-
-let finally = (v, action, f) =>
-  switch f(v) {
-  | exception e =>
-    action(v)->ignore
-    reraise(e)
-  | e =>
-    action(v)->ignore
-    e
-  }
-
-let is_pos_pow = n => {
-  module M = {
-    exception E
-  }
-  let rec aux = (c, n: Int32.t) =>
-    if n <= 0l {
-      -2
-    } else if n == 1l {
-      c
-    } else if Int32.logand(n, 1l) == 0l {
-      aux(c + 1, Int32.shift_right(n, 1))
-    } else {
-      raise(M.E)
-    }
-  try aux(0, n) catch {
-  | M.E => -1
-  }
-}
-
-let is_pos_pow_2 = n => {
-  exception E
-  let rec aux = (c, n: Int32.t) =>
-    if n <= 0l {
-      -2
-    } else if n == 1l {
-      c
-    } else if Int32.logand(n, 1l) == 0l {
-      aux(c + 1, Int32.shift_right(n, 1))
-    } else {
-      raise(E)
-    }
-  try aux(0, n) catch {
-  | E => -1
-  }
-}
-
-let hash_variant = s => {
-  let accu = ref(0)
-  for i in 0 to String.length(s) - 1 {
-    accu := 223 * accu.contents + Char.code(String.get(s, i))
-  }
-  /* reduce to 31 bits */
-  accu := land(accu.contents, lsl(1, 31) - 1)
-
-  /* make it signed for 64 bits architectures */
-  if accu.contents > 0x3FFFFFFF {
-    accu.contents - lsl(1, 31)
-  } else {
-    accu.contents
-  }
-}
-
-module LargeFile = {
-  let u = 3
-}
diff --git a/jscomp/test/ext_pervasives_test.resi b/jscomp/test/ext_pervasives_test.resi
deleted file mode 100644
index 60ad175..0000000
--- a/jscomp/test/ext_pervasives_test.resi
+++ /dev/null
@@ -1,43 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*** Extension to standard library [Pervavives] module, safe to open 
-*/
-
-external reraise: exn => 'a = "%reraise"
-
-let finally: ('a, 'a => 'c, 'a => 'b) => 'b
-
-let is_pos_pow: Int32.t => int
-
-let is_pos_pow_2: Int32.t => int
-
-/** Copied from {!Btype.hash_variant}:
-    need sync up and add test case
-*/
-let hash_variant: string => int
-
-module LargeFile: {
-  let u: int
-}
diff --git a/jscomp/test/ext_string_test.js b/jscomp/test/ext_string_test.js
deleted file mode 100644
index 16a5f6d..0000000
--- a/jscomp/test/ext_string_test.js
+++ /dev/null
@@ -1,657 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Bytes = require("../../lib/js/bytes.js");
-var Curry = require("../../lib/js/curry.js");
-var $$String = require("../../lib/js/string.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-var Ext_bytes_test = require("./ext_bytes_test.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function split_by(keep_emptyOpt, is_delim, str) {
-  var keep_empty = keep_emptyOpt !== undefined ? keep_emptyOpt : false;
-  var len = str.length;
-  var _acc = /* [] */0;
-  var _last_pos = len;
-  var _pos = len - 1 | 0;
-  while(true) {
-    var pos = _pos;
-    var last_pos = _last_pos;
-    var acc = _acc;
-    if (pos === -1) {
-      if (last_pos === 0 && !keep_empty) {
-        return acc;
-      } else {
-        return {
-                hd: $$String.sub(str, 0, last_pos),
-                tl: acc
-              };
-      }
-    }
-    if (Curry._1(is_delim, Caml_string.get(str, pos))) {
-      var new_len = (last_pos - pos | 0) - 1 | 0;
-      if (new_len !== 0 || keep_empty) {
-        var v = $$String.sub(str, pos + 1 | 0, new_len);
-        _pos = pos - 1 | 0;
-        _last_pos = pos;
-        _acc = {
-          hd: v,
-          tl: acc
-        };
-        continue ;
-      }
-      _pos = pos - 1 | 0;
-      _last_pos = pos;
-      continue ;
-    }
-    _pos = pos - 1 | 0;
-    continue ;
-  };
-}
-
-function trim(s) {
-  var i = 0;
-  var j = s.length;
-  while((function () {
-          var tmp = false;
-          if (i < j) {
-            var u = s.codePointAt(i);
-            tmp = u === /* '\t' */9 || u === /* '\n' */10 || u === /* ' ' */32;
-          }
-          return tmp;
-        })()) {
-    i = i + 1 | 0;
-  };
-  var k = j - 1 | 0;
-  while((function () {
-          var tmp = false;
-          if (k >= i) {
-            var u = s.codePointAt(k);
-            tmp = u === /* '\t' */9 || u === /* '\n' */10 || u === /* ' ' */32;
-          }
-          return tmp;
-        })()) {
-    k = k - 1 | 0;
-  };
-  return $$String.sub(s, i, (k - i | 0) + 1 | 0);
-}
-
-function split(keep_empty, str, on) {
-  if (str === "") {
-    return /* [] */0;
-  } else {
-    return split_by(keep_empty, (function (x) {
-                  return x === on;
-                }), str);
-  }
-}
-
-function quick_split_by_ws(str) {
-  return split_by(false, (function (x) {
-                if (x === /* '\t' */9 || x === /* '\n' */10) {
-                  return true;
-                } else {
-                  return x === /* ' ' */32;
-                }
-              }), str);
-}
-
-function starts_with(s, beg) {
-  var beg_len = beg.length;
-  var s_len = s.length;
-  if (beg_len > s_len) {
-    return false;
-  }
-  var i = 0;
-  while(i < beg_len && s.codePointAt(i) === beg.codePointAt(i)) {
-    i = i + 1 | 0;
-  };
-  return i === beg_len;
-}
-
-function ends_with_index(s, end_) {
-  var s_finish = s.length - 1 | 0;
-  var s_beg = end_.length - 1 | 0;
-  if (s_beg > s_finish) {
-    return -1;
-  }
-  var _j = s_finish;
-  var _k = s_beg;
-  while(true) {
-    var k = _k;
-    var j = _j;
-    if (k < 0) {
-      return j + 1 | 0;
-    }
-    if (s.codePointAt(j) !== end_.codePointAt(k)) {
-      return -1;
-    }
-    _k = k - 1 | 0;
-    _j = j - 1 | 0;
-    continue ;
-  };
-}
-
-function ends_with(s, end_) {
-  return ends_with_index(s, end_) >= 0;
-}
-
-function ends_with_then_chop(s, beg) {
-  var i = ends_with_index(s, beg);
-  if (i >= 0) {
-    return $$String.sub(s, 0, i);
-  }
-  
-}
-
-function check_any_suffix_case(s, suffixes) {
-  return List.exists((function (x) {
-                return ends_with(s, x);
-              }), suffixes);
-}
-
-function check_any_suffix_case_then_chop(s, suffixes) {
-  var _suffixes = suffixes;
-  while(true) {
-    var suffixes$1 = _suffixes;
-    if (!suffixes$1) {
-      return ;
-    }
-    var id = ends_with_index(s, suffixes$1.hd);
-    if (id >= 0) {
-      return $$String.sub(s, 0, id);
-    }
-    _suffixes = suffixes$1.tl;
-    continue ;
-  };
-}
-
-function escaped(s) {
-  var needs_escape = function (_i) {
-    while(true) {
-      var i = _i;
-      if (i >= s.length) {
-        return false;
-      }
-      var match = s.codePointAt(i);
-      if (match < 32) {
-        return true;
-      }
-      if (match > 92 || match < 34) {
-        if (match >= 127) {
-          return true;
-        }
-        _i = i + 1 | 0;
-        continue ;
-      }
-      if (match > 91 || match < 35) {
-        return true;
-      }
-      _i = i + 1 | 0;
-      continue ;
-    };
-  };
-  if (needs_escape(0)) {
-    return Bytes.unsafe_to_string(Ext_bytes_test.escaped(Bytes.unsafe_of_string(s)));
-  } else {
-    return s;
-  }
-}
-
-function unsafe_for_all_range(s, _start, finish, p) {
-  while(true) {
-    var start = _start;
-    if (start > finish) {
-      return true;
-    }
-    if (!Curry._1(p, s.codePointAt(start))) {
-      return false;
-    }
-    _start = start + 1 | 0;
-    continue ;
-  };
-}
-
-function for_all_range(s, start, finish, p) {
-  var len = s.length;
-  if (start < 0 || finish >= len) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_string_test.for_all_range",
-          Error: new Error()
-        };
-  }
-  return unsafe_for_all_range(s, start, finish, p);
-}
-
-function for_all(p, s) {
-  return unsafe_for_all_range(s, 0, s.length - 1 | 0, p);
-}
-
-function is_empty(s) {
-  return s.length === 0;
-}
-
-function repeat(n, s) {
-  var len = s.length;
-  var res = Caml_bytes.create(Math.imul(n, len));
-  for(var i = 0; i < n; ++i){
-    $$String.blit(s, 0, res, Math.imul(i, len), len);
-  }
-  return Bytes.to_string(res);
-}
-
-function unsafe_is_sub(sub, i, s, j, len) {
-  if ((j + len | 0) <= s.length) {
-    var _k = 0;
-    while(true) {
-      var k = _k;
-      if (k === len) {
-        return true;
-      }
-      if (sub.codePointAt(i + k | 0) !== s.codePointAt(j + k | 0)) {
-        return false;
-      }
-      _k = k + 1 | 0;
-      continue ;
-    };
-  } else {
-    return false;
-  }
-}
-
-var Local_exit = /* @__PURE__ */Caml_exceptions.create("Ext_string_test.Local_exit");
-
-function find(startOpt, sub, s) {
-  var start = startOpt !== undefined ? startOpt : 0;
-  var n = sub.length;
-  var s_len = s.length;
-  var i = start;
-  try {
-    while((i + n | 0) <= s_len) {
-      if (unsafe_is_sub(sub, 0, s, i, n)) {
-        throw {
-              RE_EXN_ID: Local_exit,
-              Error: new Error()
-            };
-      }
-      i = i + 1 | 0;
-    };
-    return -1;
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === Local_exit) {
-      return i;
-    }
-    throw exn;
-  }
-}
-
-function contain_substring(s, sub) {
-  return find(undefined, sub, s) >= 0;
-}
-
-function non_overlap_count(sub, s) {
-  var sub_len = sub.length;
-  if (sub.length === 0) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_string_test.non_overlap_count",
-          Error: new Error()
-        };
-  }
-  var _acc = 0;
-  var _off = 0;
-  while(true) {
-    var off = _off;
-    var acc = _acc;
-    var i = find(off, sub, s);
-    if (i < 0) {
-      return acc;
-    }
-    _off = i + sub_len | 0;
-    _acc = acc + 1 | 0;
-    continue ;
-  };
-}
-
-function rfind(sub, s) {
-  var n = sub.length;
-  var i = s.length - n | 0;
-  try {
-    while(i >= 0) {
-      if (unsafe_is_sub(sub, 0, s, i, n)) {
-        throw {
-              RE_EXN_ID: Local_exit,
-              Error: new Error()
-            };
-      }
-      i = i - 1 | 0;
-    };
-    return -1;
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === Local_exit) {
-      return i;
-    }
-    throw exn;
-  }
-}
-
-function tail_from(s, x) {
-  var len = s.length;
-  if (x <= len) {
-    return $$String.sub(s, x, len - x | 0);
-  }
-  var s$1 = "Ext_string_test.tail_from " + (s + (" : " + String(x)));
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s$1,
-        Error: new Error()
-      };
-}
-
-function digits_of_str(s, offset, x) {
-  var _i = 0;
-  var _acc = 0;
-  while(true) {
-    var acc = _acc;
-    var i = _i;
-    if (i >= x) {
-      return acc;
-    }
-    _acc = (Math.imul(10, acc) + Caml_string.get(s, offset + i | 0) | 0) - 48 | 0;
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function starts_with_and_number(s, offset, beg) {
-  var beg_len = beg.length;
-  var s_len = s.length;
-  var finish_delim = offset + beg_len | 0;
-  if (finish_delim > s_len) {
-    return -1;
-  }
-  var i = offset;
-  while(i < finish_delim && s.codePointAt(i) === beg.codePointAt(i - offset | 0)) {
-    i = i + 1 | 0;
-  };
-  if (i === finish_delim) {
-    return digits_of_str(s, finish_delim, 2);
-  } else {
-    return -1;
-  }
-}
-
-function equal(x, y) {
-  return x === y;
-}
-
-function rindex_rec(s, _i, c) {
-  while(true) {
-    var i = _i;
-    if (i < 0) {
-      return i;
-    }
-    if (s.codePointAt(i) === c) {
-      return i;
-    }
-    _i = i - 1 | 0;
-    continue ;
-  };
-}
-
-function rindex_rec_opt(s, _i, c) {
-  while(true) {
-    var i = _i;
-    if (i < 0) {
-      return ;
-    }
-    if (s.codePointAt(i) === c) {
-      return i;
-    }
-    _i = i - 1 | 0;
-    continue ;
-  };
-}
-
-function rindex_neg(s, c) {
-  return rindex_rec(s, s.length - 1 | 0, c);
-}
-
-function rindex_opt(s, c) {
-  return rindex_rec_opt(s, s.length - 1 | 0, c);
-}
-
-function is_valid_module_file(s) {
-  var len = s.length;
-  if (len <= 0) {
-    return false;
-  }
-  var match = s.codePointAt(0);
-  if (match >= 91) {
-    if (match > 122 || match < 97) {
-      return false;
-    }
-    
-  } else if (match < 65) {
-    return false;
-  }
-  return unsafe_for_all_range(s, 1, len - 1 | 0, (function (x) {
-                if (x >= 65) {
-                  if (x > 96 || x < 91) {
-                    return x < 123;
-                  } else {
-                    return x === 95;
-                  }
-                } else if (x >= 48) {
-                  return x < 58;
-                } else {
-                  return x === 39;
-                }
-              }));
-}
-
-function is_valid_npm_package_name(s) {
-  var len = s.length;
-  if (len > 214) {
-    return false;
-  }
-  if (len <= 0) {
-    return false;
-  }
-  var match = s.codePointAt(0);
-  if (match >= 97) {
-    if (match >= 123) {
-      return false;
-    }
-    
-  } else if (match !== 64) {
-    return false;
-  }
-  return unsafe_for_all_range(s, 1, len - 1 | 0, (function (x) {
-                if (x >= 58) {
-                  if (x >= 97) {
-                    return x < 123;
-                  } else {
-                    return x === 95;
-                  }
-                } else if (x !== 45) {
-                  return x >= 48;
-                } else {
-                  return true;
-                }
-              }));
-}
-
-function is_valid_source_name(name) {
-  var x = check_any_suffix_case_then_chop(name, {
-        hd: ".ml",
-        tl: {
-          hd: ".res",
-          tl: {
-            hd: ".mli",
-            tl: {
-              hd: ".resi",
-              tl: /* [] */0
-            }
-          }
-        }
-      });
-  if (x !== undefined) {
-    if (is_valid_module_file(x)) {
-      return "Good";
-    } else {
-      return "Invalid_module_name";
-    }
-  } else {
-    return "Suffix_mismatch";
-  }
-}
-
-function unsafe_no_char(x, ch, _i, last_idx) {
-  while(true) {
-    var i = _i;
-    if (i > last_idx) {
-      return true;
-    }
-    if (x.codePointAt(i) === ch) {
-      return false;
-    }
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function unsafe_no_char_idx(x, ch, _i, last_idx) {
-  while(true) {
-    var i = _i;
-    if (i > last_idx) {
-      return -1;
-    }
-    if (x.codePointAt(i) === ch) {
-      return i;
-    }
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function no_char(x, ch, i, len) {
-  var str_len = x.length;
-  if (i < 0 || i >= str_len || len >= str_len) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Ext_string_test.no_char",
-          Error: new Error()
-        };
-  }
-  return unsafe_no_char(x, ch, i, len);
-}
-
-function no_slash(x) {
-  return unsafe_no_char(x, /* '/' */47, 0, x.length - 1 | 0);
-}
-
-function no_slash_idx(x) {
-  return unsafe_no_char_idx(x, /* '/' */47, 0, x.length - 1 | 0);
-}
-
-function replace_slash_backward(x) {
-  var len = x.length;
-  if (unsafe_no_char(x, /* '/' */47, 0, len - 1 | 0)) {
-    return x;
-  } else {
-    return $$String.map((function (x) {
-                  if (x !== 47) {
-                    return x;
-                  } else {
-                    return /* '\\' */92;
-                  }
-                }), x);
-  }
-}
-
-function replace_backward_slash(x) {
-  var len = x.length;
-  if (unsafe_no_char(x, /* '\\' */92, 0, len - 1 | 0)) {
-    return x;
-  } else {
-    return $$String.map((function (x) {
-                  if (x !== 92) {
-                    return x;
-                  } else {
-                    return /* '/' */47;
-                  }
-                }), x);
-  }
-}
-
-var check_suffix_case = ends_with;
-
-var check_suffix_case_then_chop = ends_with_then_chop;
-
-var empty = "";
-
-var single_space = " ";
-
-var single_colon = ":";
-
-var parent_dir_lit = "..";
-
-var current_dir_lit = ".";
-
-exports.split_by = split_by;
-exports.trim = trim;
-exports.split = split;
-exports.quick_split_by_ws = quick_split_by_ws;
-exports.starts_with = starts_with;
-exports.ends_with_index = ends_with_index;
-exports.ends_with = ends_with;
-exports.ends_with_then_chop = ends_with_then_chop;
-exports.check_suffix_case = check_suffix_case;
-exports.check_suffix_case_then_chop = check_suffix_case_then_chop;
-exports.check_any_suffix_case = check_any_suffix_case;
-exports.check_any_suffix_case_then_chop = check_any_suffix_case_then_chop;
-exports.escaped = escaped;
-exports.unsafe_for_all_range = unsafe_for_all_range;
-exports.for_all_range = for_all_range;
-exports.for_all = for_all;
-exports.is_empty = is_empty;
-exports.repeat = repeat;
-exports.unsafe_is_sub = unsafe_is_sub;
-exports.Local_exit = Local_exit;
-exports.find = find;
-exports.contain_substring = contain_substring;
-exports.non_overlap_count = non_overlap_count;
-exports.rfind = rfind;
-exports.tail_from = tail_from;
-exports.digits_of_str = digits_of_str;
-exports.starts_with_and_number = starts_with_and_number;
-exports.equal = equal;
-exports.rindex_rec = rindex_rec;
-exports.rindex_rec_opt = rindex_rec_opt;
-exports.rindex_neg = rindex_neg;
-exports.rindex_opt = rindex_opt;
-exports.is_valid_module_file = is_valid_module_file;
-exports.is_valid_npm_package_name = is_valid_npm_package_name;
-exports.is_valid_source_name = is_valid_source_name;
-exports.unsafe_no_char = unsafe_no_char;
-exports.unsafe_no_char_idx = unsafe_no_char_idx;
-exports.no_char = no_char;
-exports.no_slash = no_slash;
-exports.no_slash_idx = no_slash_idx;
-exports.replace_slash_backward = replace_slash_backward;
-exports.replace_backward_slash = replace_backward_slash;
-exports.empty = empty;
-exports.single_space = single_space;
-exports.single_colon = single_colon;
-exports.parent_dir_lit = parent_dir_lit;
-exports.current_dir_lit = current_dir_lit;
-/* Ext_bytes_test Not a pure module */
diff --git a/jscomp/test/ext_string_test.res b/jscomp/test/ext_string_test.res
deleted file mode 100644
index 89dc2b1..0000000
--- a/jscomp/test/ext_string_test.res
+++ /dev/null
@@ -1,581 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/*
-   {[ split " test_unsafe_obj_ffi_ppx.cmi" ~keep_empty:false ' ']}
-*/
-let split_by = (~keep_empty=false, is_delim, str) => {
-  let len = String.length(str)
-  let rec loop = (acc, last_pos, pos) =>
-    if pos == -1 {
-      if last_pos == 0 && !keep_empty {
-        acc
-      } else {
-        list{String.sub(str, 0, last_pos), ...acc}
-      }
-    } else if is_delim(String.get(str, pos)) {
-      let new_len = last_pos - pos - 1
-      if new_len != 0 || keep_empty {
-        let v = String.sub(str, pos + 1, new_len)
-        loop(list{v, ...acc}, pos, pos - 1)
-      } else {
-        loop(acc, pos, pos - 1)
-      }
-    } else {
-      loop(acc, last_pos, pos - 1)
-    }
-
-  loop(list{}, len, len - 1)
-}
-
-let trim = s => {
-  let i = ref(0)
-  let j = String.length(s)
-  while (
-    i.contents < j && {
-        let u = String.unsafe_get(s, i.contents)
-        u == '\t' || (u == '\n' || u == ' ')
-      }
-  ) {
-    incr(i)
-  }
-  let k = ref(j - 1)
-  while (
-    k.contents >= i.contents && {
-        let u = String.unsafe_get(s, k.contents)
-        u == '\t' || (u == '\n' || u == ' ')
-      }
-  ) {
-    decr(k)
-  }
-  String.sub(s, i.contents, k.contents - i.contents + 1)
-}
-
-let split = (~keep_empty=?, str, on) =>
-  if str == "" {
-    list{}
-  } else {
-    split_by(~keep_empty?, x => (x: char) == on, str)
-  }
-
-let quick_split_by_ws = (str): list<string> =>
-  split_by(~keep_empty=false, x => x == '\t' || (x == '\n' || x == ' '), str)
-
-let starts_with = (s, beg) => {
-  let beg_len = String.length(beg)
-  let s_len = String.length(s)
-  beg_len <= s_len && {
-      let i = ref(0)
-      while (
-        i.contents < beg_len &&
-          String.unsafe_get(s, i.contents) == String.unsafe_get(beg, i.contents)
-      ) {
-        incr(i)
-      }
-      i.contents == beg_len
-    }
-}
-
-/** return an index which is minus when [s] does not 
-    end with [beg]
-*/
-let ends_with_index = (s, end_) => {
-  let s_finish = String.length(s) - 1
-  let s_beg = String.length(end_) - 1
-  if s_beg > s_finish {
-    -1
-  } else {
-    let rec aux = (j, k) =>
-      if k < 0 {
-        j + 1
-      } else if String.unsafe_get(s, j) == String.unsafe_get(end_, k) {
-        aux(j - 1, k - 1)
-      } else {
-        -1
-      }
-    aux(s_finish, s_beg)
-  }
-}
-
-let ends_with = (s, end_) => ends_with_index(s, end_) >= 0
-
-let ends_with_then_chop = (s, beg) => {
-  let i = ends_with_index(s, beg)
-  if i >= 0 {
-    Some(String.sub(s, 0, i))
-  } else {
-    None
-  }
-}
-
-let check_suffix_case = ends_with
-let check_suffix_case_then_chop = ends_with_then_chop
-
-let check_any_suffix_case = (s, suffixes) => List.exists(x => check_suffix_case(s, x), suffixes)
-
-let check_any_suffix_case_then_chop = (s, suffixes) => {
-  let rec aux = suffixes =>
-    switch suffixes {
-    | list{} => None
-    | list{x, ...xs} =>
-      let id = ends_with_index(s, x)
-      if id >= 0 {
-        Some(String.sub(s, 0, id))
-      } else {
-        aux(xs)
-      }
-    }
-  aux(suffixes)
-}
-
-/**  In OCaml 4.02.3, {!String.escaped} is locale senstive, 
-     this version try to make it not locale senstive, this bug is fixed
-     in the compiler trunk     
-*/
-let escaped = s => {
-  let rec needs_escape = i =>
-    if i >= String.length(s) {
-      false
-    } else {
-      switch String.unsafe_get(s, i) {
-      | '"' | '\\' | '\n' | '\t' | '\r' | '\b' => true
-      | ' ' .. '~' => needs_escape(i + 1)
-      | _ => true
-      }
-    }
-
-  if needs_escape(0) {
-    Bytes.unsafe_to_string(Ext_bytes_test.escaped(Bytes.unsafe_of_string(s)))
-  } else {
-    s
-  }
-}
-
-/* it is unsafe to expose such API as unsafe since 
-   user can provide bad input range 
-
-*/
-let rec unsafe_for_all_range = (s, ~start, ~finish, p) =>
-  start > finish ||
-    (p(String.unsafe_get(s, start)) && unsafe_for_all_range(s, ~start=start + 1, ~finish, p))
-
-let for_all_range = (s, ~start, ~finish, p) => {
-  let len = String.length(s)
-  if start < 0 || finish >= len {
-    invalid_arg("Ext_string_test.for_all_range")
-  } else {
-    unsafe_for_all_range(s, ~start, ~finish, p)
-  }
-}
-
-let for_all = (p: char => bool, s) =>
-  unsafe_for_all_range(s, ~start=0, ~finish=String.length(s) - 1, p)
-
-let is_empty = s => String.length(s) == 0
-
-let repeat = (n, s) => {
-  let len = String.length(s)
-  let res = Bytes.create(n * len)
-  for i in 0 to pred(n) {
-    String.blit(s, 0, res, i * len, len)
-  }
-  Bytes.to_string(res)
-}
-
-let equal = (x: string, y) => x == y
-
-let unsafe_is_sub = (~sub, i, s, j, ~len) => {
-  let rec check = k =>
-    if k == len {
-      true
-    } else {
-      String.unsafe_get(sub, i + k) == String.unsafe_get(s, j + k) && check(k + 1)
-    }
-
-  j + len <= String.length(s) && check(0)
-}
-
-exception Local_exit
-let find = (~start=0, ~sub, s) => {
-  let n = String.length(sub)
-  let s_len = String.length(s)
-  let i = ref(start)
-  try {
-    while i.contents + n <= s_len {
-      if unsafe_is_sub(~sub, 0, s, i.contents, ~len=n) {
-        raise_notrace(Local_exit)
-      }
-      incr(i)
-    }
-    -1
-  } catch {
-  | Local_exit => i.contents
-  }
-}
-
-let contain_substring = (s, sub) => find(s, ~sub) >= 0
-
-/** TODO: optimize 
-    avoid nonterminating when string is empty 
-*/
-let non_overlap_count = (~sub, s) => {
-  let sub_len = String.length(sub)
-  let rec aux = (acc, off) => {
-    let i = find(~start=off, ~sub, s)
-    if i < 0 {
-      acc
-    } else {
-      aux(acc + 1, i + sub_len)
-    }
-  }
-  if String.length(sub) == 0 {
-    invalid_arg("Ext_string_test.non_overlap_count")
-  } else {
-    aux(0, 0)
-  }
-}
-
-let rfind = (~sub, s) => {
-  let n = String.length(sub)
-  let i = ref(String.length(s) - n)
-  module M = {
-    exception Exit
-  }
-  try {
-    while i.contents >= 0 {
-      if unsafe_is_sub(~sub, 0, s, i.contents, ~len=n) {
-        raise_notrace(Local_exit)
-      }
-      decr(i)
-    }
-    -1
-  } catch {
-  | Local_exit => i.contents
-  }
-}
-
-let tail_from = (s, x) => {
-  let len = String.length(s)
-  if x > len {
-    invalid_arg("Ext_string_test.tail_from " ++ (s ++ (" : " ++ string_of_int(x))))
-  } else {
-    String.sub(s, x, len - x)
-  }
-}
-
-/**
-   {[ 
-     digits_of_str \"11_js\" 2 == 11     
-   ]}
-*/
-let digits_of_str = (s, ~offset, x) => {
-  let rec aux = (i, acc, s, x) =>
-    if i >= x {
-      acc
-    } else {
-      aux(i + 1, 10 * acc + Char.code(String.get(s, offset + i)) - 48 /* Char.code '0' */, s, x)
-    }
-  aux(0, 0, s, x)
-}
-
-/*
-   {[
-     starts_with_and_number "js_fn_mk_01" 0 "js_fn_mk_" = 1 ;;
-     starts_with_and_number "js_fn_run_02" 0 "js_fn_mk_" = -1 ;;
-     starts_with_and_number "js_fn_mk_03" 6 "mk_" = 3 ;;
-     starts_with_and_number "js_fn_mk_04" 6 "run_" = -1;;
-     starts_with_and_number "js_fn_run_04" 6 "run_" = 4;;
-     (starts_with_and_number "js_fn_run_04" 6 "run_" = 3) = false ;;
-   ]}
-*/
-let starts_with_and_number = (s, ~offset, beg) => {
-  let beg_len = String.length(beg)
-  let s_len = String.length(s)
-  let finish_delim = offset + beg_len
-
-  if finish_delim > s_len {
-    -1
-  } else {
-    let i = ref(offset)
-    while (
-      i.contents < finish_delim &&
-        String.unsafe_get(s, i.contents) == String.unsafe_get(beg, i.contents - offset)
-    ) {
-      incr(i)
-    }
-    if i.contents == finish_delim {
-      digits_of_str(~offset=finish_delim, s, 2)
-    } else {
-      -1
-    }
-  }
-}
-
-let equal = (x: string, y) => x == y
-
-/* let unsafe_concat_with_length len sep l =
-  match l with 
-  | [] -> ""
-  | hd :: tl -> (* num is positive *)
-    let r = Bytes.create len in
-    let hd_len = String.length hd in 
-    let sep_len = String.length sep in 
-    String.unsafe_blit hd 0 r 0 hd_len;
-    let pos = ref hd_len in
-    List.iter
-      (fun s ->
-         let s_len = String.length s in
-         String.unsafe_blit sep 0 r !pos sep_len;
-         pos := !pos +  sep_len;
-         String.unsafe_blit s 0 r !pos s_len;
-         pos := !pos + s_len)
-      tl;
-    Bytes.unsafe_to_string r */
-
-let rec rindex_rec = (s, i, c) =>
-  if i < 0 {
-    i
-  } else if String.unsafe_get(s, i) == c {
-    i
-  } else {
-    rindex_rec(s, i - 1, c)
-  }
-
-let rec rindex_rec_opt = (s, i, c) =>
-  if i < 0 {
-    None
-  } else if String.unsafe_get(s, i) == c {
-    Some(i)
-  } else {
-    rindex_rec_opt(s, i - 1, c)
-  }
-
-let rindex_neg = (s, c) => rindex_rec(s, String.length(s) - 1, c)
-
-let rindex_opt = (s, c) => rindex_rec_opt(s, String.length(s) - 1, c)
-
-let is_valid_module_file = (s: string) => {
-  let len = String.length(s)
-  len > 0 &&
-    switch String.unsafe_get(s, 0) {
-    | 'A' .. 'Z'
-    | 'a' .. 'z' =>
-      unsafe_for_all_range(s, ~start=1, ~finish=len - 1, x =>
-        switch x {
-        | 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '_' | '\'' => true
-        | _ => false
-        }
-      )
-    | _ => false
-    }
-}
-
-/* https://docs.npmjs.com/files/package.json 
-  Some rules:
-  The name must be less than or equal to 214 characters. This includes the scope for scoped packages.
-  The name can't start with a dot or an underscore.
-  New packages must not have uppercase letters in the name.
-  The name ends up being part of a URL, an argument on the command line, and a folder name. Therefore, the name can't contain any non-URL-safe characters.
-*/
-let is_valid_npm_package_name = (s: string) => {
-  let len = String.length(s)
-  len <= 214 &&
-    /* magic number forced by npm */
-    (len > 0 &&
-    switch String.unsafe_get(s, 0) {
-    | 'a' .. 'z' | '@' =>
-      unsafe_for_all_range(s, ~start=1, ~finish=len - 1, x =>
-        switch x {
-        | 'a' .. 'z' | '0' .. '9' | '_' | '-' => true
-        | _ => false
-        }
-      )
-    | _ => false
-    })
-}
-
-type check_result =
-  | Good
-  | Invalid_module_name
-  | /**
-   TODO: move to another module 
-   Make {!Ext_filename_test} not stateful
-*/
-  Suffix_mismatch
-
-let is_valid_source_name = (name): check_result =>
-  switch check_any_suffix_case_then_chop(name, list{".ml", ".res", ".mli", ".resi"}) {
-  | None => Suffix_mismatch
-  | Some(x) =>
-    if is_valid_module_file(x) {
-      Good
-    } else {
-      Invalid_module_name
-    }
-  }
-
-/** TODO: can be improved to return a positive integer instead */
-let rec unsafe_no_char = (x, ch, i, last_idx) =>
-  i > last_idx || (String.unsafe_get(x, i) != ch && unsafe_no_char(x, ch, i + 1, last_idx))
-
-let rec unsafe_no_char_idx = (x, ch, i, last_idx) =>
-  if i > last_idx {
-    -1
-  } else if String.unsafe_get(x, i) != ch {
-    unsafe_no_char_idx(x, ch, i + 1, last_idx)
-  } else {
-    i
-  }
-
-let no_char = (x, ch, i, len): bool => {
-  let str_len = String.length(x)
-  if i < 0 || (i >= str_len || len >= str_len) {
-    invalid_arg("Ext_string_test.no_char")
-  } else {
-    unsafe_no_char(x, ch, i, len)
-  }
-}
-
-let no_slash = x => unsafe_no_char(x, '/', 0, String.length(x) - 1)
-
-let no_slash_idx = x => unsafe_no_char_idx(x, '/', 0, String.length(x) - 1)
-
-let replace_slash_backward = (x: string) => {
-  let len = String.length(x)
-  if unsafe_no_char(x, '/', 0, len - 1) {
-    x
-  } else {
-    String.map(x =>
-      switch x {
-      | '/' => '\\'
-      | x => x
-      }
-    , x)
-  }
-}
-
-let replace_backward_slash = (x: string) => {
-  let len = String.length(x)
-  if unsafe_no_char(x, '\\', 0, len - 1) {
-    x
-  } else {
-    String.map(x =>
-      switch x {
-      | '\\' => '/'
-      | x => x
-      }
-    , x)
-  }
-}
-
-let empty = ""
-
-external compare: (string, string) => int = "?string_length_based_compare"
-
-let single_space = " "
-let single_colon = ":"
-
-/* let concat_array sep (s : string array) =   
-  let s_len = Array.length s in 
-  match s_len with 
-  | 0 -> empty 
-  | 1 -> Array.unsafe_get s 0
-  | _ ->     
-    let sep_len = String.length sep in 
-    let len = ref 0 in 
-    for i = 0 to  s_len - 1 do 
-      len := !len + String.length (Array.unsafe_get s i)
-    done;
-    let target = 
-      Bytes.create 
-        (!len + (s_len - 1) * sep_len ) in    
-    let hd = (Array.unsafe_get s 0) in     
-    let hd_len = String.length hd in 
-    String.unsafe_blit hd  0  target 0 hd_len;   
-    let current_offset = ref hd_len in     
-    for i = 1 to s_len - 1 do 
-      String.unsafe_blit sep 0 target  !current_offset sep_len;
-      let cur = Array.unsafe_get s i in 
-      let cur_len = String.length cur in     
-      let new_off_set = (!current_offset + sep_len ) in
-      String.unsafe_blit cur 0 target new_off_set cur_len; 
-      current_offset := 
-        new_off_set + cur_len ; 
-    done;
-    Bytes.unsafe_to_string target */
-
-/* let concat3 a b c = 
-  let a_len = String.length a in 
-  let b_len = String.length b in 
-  let c_len = String.length c in 
-  let len = a_len + b_len + c_len in 
-  let target = Bytes.create len in 
-  String.unsafe_blit a 0 target 0 a_len ; 
-  String.unsafe_blit b 0 target a_len b_len;
-  String.unsafe_blit c 0 target (a_len + b_len) c_len;
-  Bytes.unsafe_to_string target */
-
-/* let concat4 a b c d =
-  let a_len = String.length a in 
-  let b_len = String.length b in 
-  let c_len = String.length c in 
-  let d_len = String.length d in 
-  let len = a_len + b_len + c_len + d_len in 
-  
-  let target = Bytes.create len in 
-  String.unsafe_blit a 0 target 0 a_len ; 
-  String.unsafe_blit b 0 target a_len b_len;
-  String.unsafe_blit c 0 target (a_len + b_len) c_len;
-  String.unsafe_blit d 0 target (a_len + b_len + c_len) d_len;
-  Bytes.unsafe_to_string target
- */
-/*
-let concat5 a b c d e =
-  let a_len = String.length a in 
-  let b_len = String.length b in 
-  let c_len = String.length c in 
-  let d_len = String.length d in 
-  let e_len = String.length e in 
-  let len = a_len + b_len + c_len + d_len + e_len in 
-  
-  let target = Bytes.create len in 
-  String.unsafe_blit a 0 target 0 a_len ; 
-  String.unsafe_blit b 0 target a_len b_len;
-  String.unsafe_blit c 0 target (a_len + b_len) c_len;
-  String.unsafe_blit d 0 target (a_len + b_len + c_len) d_len;
-  String.unsafe_blit e 0 target (a_len + b_len + c_len + d_len) e_len;
-  Bytes.unsafe_to_string target
- */
-
-/* let inter2 a b =
- concat3 a single_space b */
-
-/* let inter3 a b c =
- concat5 a  single_space  b  single_space  c */
-
-/* let inter4 a b c d =
- concat_array single_space [| a; b ; c; d|] */
-
-let parent_dir_lit = ".."
-let current_dir_lit = "."
diff --git a/jscomp/test/ext_sys_test.js b/jscomp/test/ext_sys_test.js
deleted file mode 100644
index 5ee49cf..0000000
--- a/jscomp/test/ext_sys_test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Sys = require("../../lib/js/sys.js");
-
-var is_windows_or_cygwin = Sys.win32 || false;
-
-exports.is_windows_or_cygwin = is_windows_or_cygwin;
-/* No side effect */
diff --git a/jscomp/test/ext_sys_test.res b/jscomp/test/ext_sys_test.res
deleted file mode 100644
index d224881..0000000
--- a/jscomp/test/ext_sys_test.res
+++ /dev/null
@@ -1,31 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/** TODO: not exported yet, wait for Windows Fix */
-let is_directory_no_exn = f =>
-  try Sys.is_directory(f) catch {
-  | _ => false
-  }
-
-let is_windows_or_cygwin = Sys.win32 || Sys.cygwin
diff --git a/jscomp/test/ext_sys_test.resi b/jscomp/test/ext_sys_test.resi
deleted file mode 100644
index 4cd88d5..0000000
--- a/jscomp/test/ext_sys_test.resi
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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. */
-
-/* Not used yet */
-/* val is_directory_no_exn : string -> bool */
-
-let is_windows_or_cygwin: bool
diff --git a/jscomp/test/extensible_variant_test.js b/jscomp/test/extensible_variant_test.js
deleted file mode 100644
index 86cc359..0000000
--- a/jscomp/test/extensible_variant_test.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var Str = /* @__PURE__ */Caml_exceptions.create("Extensible_variant_test.Str");
-
-var Int = /* @__PURE__ */Caml_exceptions.create("Extensible_variant_test.N.Int");
-
-var N = {
-  Int: Int
-};
-
-var Int$1 = /* @__PURE__ */Caml_exceptions.create("Extensible_variant_test.Int");
-
-function to_int(x) {
-  if (x.RE_EXN_ID === Str) {
-    return -1;
-  }
-  if (x.RE_EXN_ID === Int) {
-    return x._1;
-  }
-  if (x.RE_EXN_ID === Int$1) {
-    return x._2;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "extensible_variant_test.res",
-          16,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-var suites_0 = [
-  "test_int",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: 3,
-              _1: to_int({
-                    RE_EXN_ID: Int,
-                    _1: 3,
-                    _2: 0
-                  })
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "test_int2",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: 0,
-                _1: to_int({
-                      RE_EXN_ID: Int$1,
-                      _1: 3,
-                      _2: 0
-                    })
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "test_string",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: -1,
-                  _1: to_int({
-                        RE_EXN_ID: Str,
-                        _1: "x"
-                      })
-                };
-        })
-    ],
-    tl: /* [] */0
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Extensible_variant_test", suites);
-
-exports.Str = Str;
-exports.N = N;
-exports.Int = Int$1;
-exports.to_int = to_int;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/extensible_variant_test.res b/jscomp/test/extensible_variant_test.res
deleted file mode 100644
index 2dc7521..0000000
--- a/jscomp/test/extensible_variant_test.res
+++ /dev/null
@@ -1,28 +0,0 @@
-type attr = ..
-
-type attr += Str(string)
-
-module N = {
-  type attr += Int(int, int)
-}
-
-type attr += Int(int, int)
-
-let to_int = (x: attr) =>
-  switch x {
-  | Str(_) => -1
-  | N.Int(a, _) => a
-  | Int(_, b) => b
-  | _ => assert(false)
-  }
-
-let suites = {
-  open Mt
-  list{
-    ("test_int", _ => Eq(3, to_int(N.Int(3, 0)))),
-    ("test_int2", _ => Eq(0, to_int(Int(3, 0)))),
-    ("test_string", _ => Eq(-1, to_int(Str("x")))),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/external_polyfill_test.js b/jscomp/test/external_polyfill_test.js
deleted file mode 100644
index beebe43..0000000
--- a/jscomp/test/external_polyfill_test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-require('../../lib/js/caml_external_polyfill.js').register("fancy_add", function(x,y){
-  return + ((""+x ) + (""+y))
-})
-;
-
-var h = Caml_external_polyfill.resolve("fancy_add")(1, 2);
-
-eq("File \"external_polyfill_test.res\", line 15, characters 12-19", h, 12);
-
-Mt.from_pair_suites("External_polyfill_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.h = h;
-/*  Not a pure module */
diff --git a/jscomp/test/external_polyfill_test.res b/jscomp/test/external_polyfill_test.res
deleted file mode 100644
index ba436ff..0000000
--- a/jscomp/test/external_polyfill_test.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-external ff: (int, int) => int = "?fancy_add"
-
-%%raw(`
-require('../../lib/js/caml_external_polyfill.js').register("fancy_add", function(x,y){
-  return + ((""+x ) + (""+y))
-})
-`)
-
-let h = ff(1, 2)
-
-let () = eq(__LOC__, h, 12)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/external_ppx.js b/jscomp/test/external_ppx.js
deleted file mode 100644
index d7bcc73..0000000
--- a/jscomp/test/external_ppx.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var External_ppxGen = require("./external_ppx.gen");
-
-function renamed(param) {
-  var tmp = {
-    type: "123",
-    normal: 12
-  };
-  if (param !== undefined) {
-    tmp.WIDTH = param;
-  }
-  return tmp;
-}
-
-var u = {
-  hi: 2,
-  lo: 3,
-  lo2: {hi:-3 },
-  lo3: -1,
-  lo4: -3
-};
-
-function f(prim) {
-  return External_ppxGen.f(prim);
-}
-
-exports.renamed = renamed;
-exports.u = u;
-exports.f = f;
-/* ./external_ppx.gen Not a pure module */
diff --git a/jscomp/test/external_ppx.res b/jscomp/test/external_ppx.res
deleted file mode 100644
index 1847399..0000000
--- a/jscomp/test/external_ppx.res
+++ /dev/null
@@ -1,32 +0,0 @@
-@obj external make_config: (~length: int, ~width: int) => unit = ""
-
-@obj
-/** Note that 
-    {[ 'a . length: 'a -> width:int -> unit
-    ]} is a syntax error -- check where it is allowed
-*/
-external make_config: (~length: 'a, ~width: int) => unit = ""
-
-@obj external opt_make: (~length: int, ~width: int=?) => (_ as 'event) = ""
-
-@obj
-external renamed_make: (
-  @as("type") ~_type: string,
-  @as("WIDTH") ~width: int=?,
-  ~normal: float,
-) => (_ as 'event) = ""
-
-let renamed = renamed_make(~_type="123", ~normal=12.)
-
-@obj
-external ff: (
-  ~hi: int,
-  ~lo: @as(3) _,
-  ~lo2: @as(json`{hi:-3 }`) _,
-  ~lo3: @as(-1) _,
-  ~lo4: @as(json`-3`) _,
-) => _ = ""
-
-let u = ff(~hi=2)
-
-@genType.import("hh") external f: int => int = "f"
diff --git a/jscomp/test/external_ppx2.js b/jscomp/test/external_ppx2.js
deleted file mode 100644
index 048bce8..0000000
--- a/jscomp/test/external_ppx2.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-f("\h\e\l\lo", 42);
-
-var x = "\h\e\l\lo";
-
-var y;
-
-exports.x = x;
-exports.y = y;
-/*  Not a pure module */
diff --git a/jscomp/test/external_ppx2.res b/jscomp/test/external_ppx2.res
deleted file mode 100644
index c22dfda..0000000
--- a/jscomp/test/external_ppx2.res
+++ /dev/null
@@ -1,4 +0,0 @@
-external f: (@as("\h\e\l\lo") _, int) => unit = "f"
-
-let x = "\h\e\l\lo"
-let y = f(42)
\ No newline at end of file
diff --git a/jscomp/test/fail/gpr_978_module.res b/jscomp/test/fail/gpr_978_module.res
deleted file mode 100644
index 68133a4..0000000
--- a/jscomp/test/fail/gpr_978_module.res
+++ /dev/null
@@ -1,4 +0,0 @@
-exception M(int)
-module M = {
-  let x = 3
-}
diff --git a/jscomp/test/fail_comp.js b/jscomp/test/fail_comp.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/fail_comp.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/fail_comp.res b/jscomp/test/fail_comp.res
deleted file mode 100644
index 6b36e83..0000000
--- a/jscomp/test/fail_comp.res
+++ /dev/null
@@ -1 +0,0 @@
-/* let v : string = Bytes.create 40 */
diff --git a/jscomp/test/ffi_arity_test.js b/jscomp/test/ffi_arity_test.js
deleted file mode 100644
index 500d287..0000000
--- a/jscomp/test/ffi_arity_test.js
+++ /dev/null
@@ -1,138 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-
-function f(v) {
-  if (v % 2 === 0) {
-    return function (v) {
-      return Math.imul(v, v);
-    };
-  } else {
-    return function (v) {
-      return v + v | 0;
-    };
-  }
-}
-
-var v = [
-    1,
-    2,
-    3
-  ].map(function (a, b) {
-      return f(a)(b);
-    });
-
-var vv = [
-    1,
-    2,
-    3
-  ].map(function (a, b) {
-      return a + b | 0;
-    });
-
-var hh = [
-    "1",
-    "2",
-    "3"
-  ].map(function (x) {
-      return parseInt(x);
-    });
-
-function u() {
-  return 3;
-}
-
-var vvv = {
-  contents: 0
-};
-
-function fff(param) {
-  console.log("x");
-  console.log("x");
-  vvv.contents = vvv.contents + 1 | 0;
-}
-
-function g() {
-  fff();
-}
-
-function abc(x, y, z) {
-  console.log("xx");
-  console.log("yy");
-  return (x + y | 0) + z | 0;
-}
-
-var abc_u = abc;
-
-fff();
-
-Mt.from_pair_suites("Ffi_arity_test", {
-      hd: [
-        "File \"ffi_arity_test.res\", line 51, characters 7-14",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: v,
-                    _1: [
-                      0,
-                      1,
-                      4
-                    ]
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "File \"ffi_arity_test.res\", line 52, characters 7-14",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: vv,
-                      _1: [
-                        1,
-                        3,
-                        5
-                      ]
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "File \"ffi_arity_test.res\", line 53, characters 7-14",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: hh,
-                        _1: [
-                          1,
-                          2,
-                          3
-                        ]
-                      };
-              })
-          ],
-          tl: /* [] */0
-        }
-      }
-    });
-
-function bar(fn) {
-  return Curry._1(fn, undefined);
-}
-
-(Curry._1((function(){console.log("forgiving arity")}), undefined));
-
-exports.f = f;
-exports.v = v;
-exports.vv = vv;
-exports.hh = hh;
-exports.u = u;
-exports.vvv = vvv;
-exports.fff = fff;
-exports.g = g;
-exports.abc = abc;
-exports.abc_u = abc_u;
-exports.bar = bar;
-/* v Not a pure module */
diff --git a/jscomp/test/ffi_arity_test.res b/jscomp/test/ffi_arity_test.res
deleted file mode 100644
index f2d1c7c..0000000
--- a/jscomp/test/ffi_arity_test.res
+++ /dev/null
@@ -1,71 +0,0 @@
-@send external map: (array<'a>, (. 'a) => 'b) => array<'b> = "map"
-@send external mapi: (array<'a>, (. 'a, int) => 'b) => array<'b> = "map"
-
-@val external parseInt: string => int = "parseInt"
-@val external parseInt_radix: (string, int) => int = "parseInt"
-
-let f = v =>
-  if mod(v, 2) == 0 {
-    v => v * v
-  } else {
-    v => v + v
-  }
-
-let v = mapi([1, 2, 3], (. a, b) => f(a, b))
-
-let vv = mapi([1, 2, 3], (. a, b) => a + b)
-
-let hh = map(["1", "2", "3"], (. x) => parseInt(x))
-
-let u = (. ()) => 3
-
-let vvv = ref(0)
-let fff = () => {
-  /* No inline */
-  Js.log("x")
-  Js.log("x")
-  incr(vvv)
-}
-
-let g = (. ()) => fff()
-/* will be compiled into 
-  var g = function () { fff (0)}
-  not {[ var g = fff ]}
-*/
-let abc = (x, y, z) => {
-  Js.log("xx")
-  Js.log("yy")
-  x + y + z
-}
-
-let abc_u = (. x, y, z) => abc(x, y, z)
-/* cool, it will be compiled into 
-{[ var absc_u = abc ]}
-*/
-let () = g(.)
-Mt.from_pair_suites(
-  __MODULE__,
-  {
-    open Mt
-    list{
-      (__LOC__, _ => Eq(v, [0, 1, 4])),
-      (__LOC__, _ => Eq(vv, [1, 3, 5])),
-      (__LOC__, _ => Eq(hh, [1, 2, 3])),
-      /* __LOC__, (fun _ -> Eq(  
-         
-         map (map [| 1;2;3|]  ( (fun [@bs] x -> fun y -> x + y))) 
-          ( fun [@bs] y -> (y 0)  * (y 1) ), [|2; 6 ; 12|]
-      )); */
-      /* __LOC__, (fun _ -> Eq(
-        mapi [|1;2;3|] (Js.Internal.fn_mk2 (fun x  -> let y =  x * x in fun i -> y + i )), 
-        [|1; 5 ; 11|]        
-      )) */
-    }
-  },
-)
-
-/* FIXME: */
-let bar = fn => fn()
-/* let hh0001 = fun%raw a b -> {| a + b|}
- let hh0002 = fun%raw () -> {| console.log ("forgiving arity")|} */
-bar(%raw(`function(){console.log("forgiving arity")}`))
diff --git a/jscomp/test/ffi_array_test.js b/jscomp/test/ffi_array_test.js
deleted file mode 100644
index 13e53df..0000000
--- a/jscomp/test/ffi_array_test.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"ffi_array_test.res\", line 11, characters 12-19", [
-        1,
-        2,
-        3,
-        4
-      ].map(function (x) {
-          return x + 1 | 0;
-        }), [
-      2,
-      3,
-      4,
-      5
-    ]);
-
-Mt.from_pair_suites("Ffi_array_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/ffi_array_test.res b/jscomp/test/ffi_array_test.res
deleted file mode 100644
index a86aedd..0000000
--- a/jscomp/test/ffi_array_test.res
+++ /dev/null
@@ -1,13 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-@send external map: (Js_array2.t<'a>, (. 'a) => 'b) => Js_array2.t<'b> = "map"
-
-let () = eq(__LOC__, map([1, 2, 3, 4], (. x) => x + 1), [2, 3, 4, 5])
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/ffi_js_test.js b/jscomp/test/ffi_js_test.js
deleted file mode 100644
index 9bb47fe..0000000
--- a/jscomp/test/ffi_js_test.js
+++ /dev/null
@@ -1,179 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var keys = (function (x){return Object.keys(x)});
-
-function $$higher_order(x){
-   return function(y,z){
-      return x + y + z
-   }
-  }
-;
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, param) {
-  var y = param[1];
-  var x = param[0];
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var int_config = {
-  hi: 3,
-  low: 32
-};
-
-var string_config = {
-  hi: 3,
-  low: "32"
-};
-
-eq("File \"ffi_js_test.res\", line 30, characters 12-19", [
-      6,
-      $$higher_order(1)(2, 3)
-    ]);
-
-var same_type_0 = {
-  hd: int_config,
-  tl: {
-    hd: {
-      hi: 3,
-      low: 32
-    },
-    tl: /* [] */0
-  }
-};
-
-var same_type_1 = {
-  hd: string_config,
-  tl: {
-    hd: {
-      hi: 3,
-      low: "32"
-    },
-    tl: /* [] */0
-  }
-};
-
-var same_type = [
-  same_type_0,
-  same_type_1
-];
-
-eq("File \"ffi_js_test.res\", line 38, characters 5-12", [
-      Object.keys(int_config).length,
-      2
-    ]);
-
-eq("File \"ffi_js_test.res\", line 39, characters 5-12", [
-      Object.keys(string_config).length,
-      2
-    ]);
-
-var u = {
-  contents: 3
-};
-
-var side_effect_config = (u.contents = u.contents + 1 | 0, "Int", {
-    hi: 3,
-    low: 32
-  });
-
-eq("File \"ffi_js_test.res\", line 53, characters 12-19", [
-      u.contents,
-      4
-    ]);
-
-function vv(z) {
-  return z.hh();
-}
-
-function v(z) {
-  return z.ff();
-}
-
-function vvv(z) {
-  return z.ff_pipe();
-}
-
-function vvvv(z) {
-  return z.ff_pipe2();
-}
-
-function create_prim(param) {
-  return {
-          "x'": 3,
-          "x''": 3,
-          "x''''": 2
-        };
-}
-
-function ffff(x) {
-  x.setGADT = 3;
-  x.setGADT2 = [
-    3,
-    "3"
-  ];
-  x.setGADT2 = [
-    "3",
-    3
-  ];
-  var match = x[3];
-  console.log([
-        match[0],
-        match[1]
-      ]);
-  console.log(x.getGADT);
-  var match$1 = x.getGADT2;
-  console.log(match$1[0], match$1[1]);
-  var match$2 = x[0];
-  console.log(match$2[0], match$2[1]);
-  x[0] = [
-    1,
-    "x"
-  ];
-  x[3] = [
-    3,
-    "x"
-  ];
-}
-
-Mt.from_pair_suites("Ffi_js_test", suites.contents);
-
-exports.keys = keys;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.int_config = int_config;
-exports.string_config = string_config;
-exports.same_type = same_type;
-exports.u = u;
-exports.side_effect_config = side_effect_config;
-exports.vv = vv;
-exports.v = v;
-exports.vvv = vvv;
-exports.vvvv = vvvv;
-exports.create_prim = create_prim;
-exports.ffff = ffff;
-/*  Not a pure module */
diff --git a/jscomp/test/ffi_js_test.res b/jscomp/test/ffi_js_test.res
deleted file mode 100644
index 68a4136..0000000
--- a/jscomp/test/ffi_js_test.res
+++ /dev/null
@@ -1,104 +0,0 @@
-let keys: (. Obj.t) => array<string> = %raw(" function (x){return Object.keys(x)}")
-
-%%raw(`
-  function $$higher_order(x){
-   return function(y,z){
-      return x + y + z
-   }
-  }
-`)
-@val external higher_order: int => (. int, int) => int = "$$higher_order"
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, (x, y)) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-type rec kind<_> =
-  | Int: kind<int>
-  | Str: kind<string>
-
-@obj external config: (~kind: @ignore kind<'a>, ~hi: int, ~low: 'a) => _ = ""
-
-let int_config = config(~kind=Int, ~hi=3, ~low=32)
-
-let string_config = config(~kind=Str, ~hi=3, ~low="32")
-
-let () = eq(__LOC__, (6, higher_order(1)(. 2, 3)))
-
-let same_type = (
-  list{int_config, {"hi": 3, "low": 32}},
-  list{string_config, {"hi": 3, "low": "32"}},
-)
-
-let () = {
-  eq(__LOC__, (Array.length(Js_obj.keys(int_config)), 2))
-  eq(__LOC__, (Array.length(Js_obj.keys(string_config)), 2))
-}
-
-let u = ref(3)
-
-let side_effect_config = config(
-  ~kind={
-    incr(u)
-    Int
-  },
-  ~hi=3,
-  ~low=32,
-)
-
-let () = eq(__LOC__, (u.contents, 4))
-
-type null_obj
-
-@send external hh: null_obj => int = "hh" /* it also work */
-@send external ff: (null_obj, unit) => int = "ff"
-@send external ff_pipe: (null_obj, unit) => int = "ff_pipe"
-@send external ff_pipe2: null_obj => int = "ff_pipe2" /* FIXME */
-let vv = z => hh(z)
-
-let v = z => ff(z, ())
-
-let vvv = z => z->ff_pipe()
-
-let vvvv = z => z->ff_pipe2
-let create_prim = () => {"x'": 3, "x''": 3, "x''''": 2}
-
-type t
-@set external setGADT: (t, @ignore kind<'a>, 'a) => unit = "setGADT"
-@set external setGADT2: (t, @ignore kind<'a>, @ignore kind<'b>, ('a, 'b)) => unit = "setGADT2"
-
-@get external getGADT: (t, @ignore kind<'a>) => 'a = "getGADT"
-
-@get external getGADT2: (t, @ignore kind<'a>, @ignore kind<'b>) => ('a, 'b) = "getGADT2"
-
-@get_index external getGADTI2: (t, @ignore kind<'a>, @ignore kind<'b>, int) => ('a, 'b) = ""
-
-@get_index external getGADTI3: (t, @ignore kind<'a>, @ignore kind<'b>, @as(3) _) => ('a, 'b) = ""
-
-@set_index external setGADTI2: (t, @ignore kind<'a>, @ignore kind<'b>, int, ('a, 'b)) => unit = ""
-
-@set_index
-external setGADTI3: (t, @ignore kind<'a>, @ignore kind<'b>, @as(3) _, ('a, 'b)) => unit = ""
-
-let ffff = x => {
-  setGADT(x, Int, 3)
-  setGADT2(x, Int, Str, (3, "3"))
-  setGADT2(x, Str, Int, ("3", 3))
-  switch getGADTI3(x, Int, Str) {
-  | (cc, dd) => Js.log((cc, dd))
-  }
-  \"@@"(Js.log, getGADT(x, Int))
-  switch getGADT2(x, Int, Str) {
-  | (a: int, b: string) => Js.log2(a, b)
-  }
-  switch getGADTI2(x, Int, Str, 0) {
-  | (a: int, b: string) => Js.log2(a, b)
-  }
-  setGADTI2(x, Int, Str, 0, (1, "x"))
-  setGADTI3(x, Int, Str, (3, "x"))
-}
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/ffi_splice_test.js b/jscomp/test/ffi_splice_test.js
deleted file mode 100644
index a0ee3ab..0000000
--- a/jscomp/test/ffi_splice_test.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function Make (){
-  this.data = []
-  for(var i = 0; i < arguments.length; ++i){
-   this.data[i] = arguments[i]
-}
-}
-
-Make.prototype.sum = function(){
-  var result  = 0;
-  for(var k = 0; k < this.data.length; ++k){
-    result = result + this.data[k]
-  };
-  return result
-}  
-
-Make.prototype.add = function(){
-  
-}
-;
-
-function f(x) {
-  return x.test("a", "b").test("a", "b");
-}
-
-var v = new Make(1, 2, 3, 4);
-
-var u = v.sum();
-
-eq("File \"ffi_splice_test.res\", line 56, characters 12-19", u, 10);
-
-Mt.from_pair_suites("Ffi_splice_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.v = v;
-exports.u = u;
-/*  Not a pure module */
diff --git a/jscomp/test/ffi_splice_test.res b/jscomp/test/ffi_splice_test.res
deleted file mode 100644
index 4023382..0000000
--- a/jscomp/test/ffi_splice_test.res
+++ /dev/null
@@ -1,58 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-/*
-[%%raw [@import \"jscomp/test/xx.js\"]] (* PATH relative to package.json *)
-*/
-
-%%raw(`
-function Make (){
-  this.data = []
-  for(var i = 0; i < arguments.length; ++i){
-   this.data[i] = arguments[i]
-}
-}
-
-Make.prototype.sum = function(){
-  var result  = 0;
-  for(var k = 0; k < this.data.length; ++k){
-    result = result + this.data[k]
-  };
-  return result
-}  
-
-Make.prototype.add = function(){
-  
-} 
-`)
-
-type t
-
-@new external make: (int, int, int, int) => t = "Make"
-
-@send external sum: (t, unit) => int = "sum"
-
-/* compile error */
-/* external join : string  -> string = "" [@@bs.module "path"] [@@bs.splice] */
-@module("path") @variadic external join: array<string> => string = "join"
-
-@send @variadic external test: (t, array<string>) => t = "test" /* FIXME */
-
-/* compile error */
-/* external test2 : int -> string -> t= "" [@@bs.send.pipe: t ] [@@bs.splice] */
-let u = ["x", "d"]
-let f = x => x->test(["a", "b"])->test(["a", "b"])
-/* |> test u */
-
-let v = make(1, 2, 3, 4)
-
-let u = sum(v, ())
-
-let () = eq(__LOC__, u, 10)
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/ffi_test.js b/jscomp/test/ffi_test.js
deleted file mode 100644
index 3898e73..0000000
--- a/jscomp/test/ffi_test.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function u(param) {
-  return xx(3);
-}
-
-var Textarea = {};
-
-var $$Int32Array = {};
-
-function v(param) {
-  var u = new TextArea();
-  u.minHeight = 3;
-  return u.minHeight;
-}
-
-function f(param) {
-  var v = new Int32Array(32);
-  v[0] = 3;
-  return v[0];
-}
-
-var a = true;
-
-var b = false;
-
-var c = null;
-
-var d;
-
-exports.u = u;
-exports.a = a;
-exports.b = b;
-exports.c = c;
-exports.d = d;
-exports.Textarea = Textarea;
-exports.$$Int32Array = $$Int32Array;
-exports.v = v;
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/ffi_test.res b/jscomp/test/ffi_test.res
deleted file mode 100644
index 9fea566..0000000
--- a/jscomp/test/ffi_test.res
+++ /dev/null
@@ -1,42 +0,0 @@
-@val external f: int => int = "xx"
-
-let u = () => f(3)
-let v = Js.Null.empty
-
-let (a, b, c, d) = (true, false, Js.Null.empty, Js.Undefined.empty)
-
-module Textarea = {
-  type t
-  @new external create: unit => t = "TextArea"
-  /* TODO: */
-  @set external set_minHeight: (t, int) => unit = "minHeight"
-  @get external get_minHeight: t => int = "minHeight"
-  @send external draw: (t, string) => unit = "string"
-}
-
-/*
-external never_used : Textarea.t ->  int -> int  = "minHeight" [@@bs.get]
-
-let v = never_used (Textarea.create ()) 3 
-*/
-module Int32Array = {
-  type t
-  @new external create: int => t = "Int32Array"
-  @get_index external get: (t, int) => int = ""
-  @set_index external set: (t, int, int) => unit = ""
-}
-
-let v = () => {
-  let u = Textarea.create()
-  Textarea.set_minHeight(u, 3)
-  Textarea.get_minHeight(u)
-}
-/* Textarea.set_minHeight_x */
-
-let f = () => {
-  module Array = Int32Array
-  let v = Array.create(32)
-
-  v[0] = 3
-  v[0]
-}
diff --git a/jscomp/test/fib.js b/jscomp/test/fib.js
deleted file mode 100644
index bcebe6c..0000000
--- a/jscomp/test/fib.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function fib(x) {
-  if (x === 0 || x === 1) {
-    return 1;
-  } else {
-    return fib(x - 1 | 0) + fib(x - 2 | 0) | 0;
-  }
-}
-
-function fib2(n) {
-  var _a = 1;
-  var _b = 1;
-  var _i = 0;
-  while(true) {
-    var i = _i;
-    var b = _b;
-    var a = _a;
-    if (n === i) {
-      return a;
-    }
-    _i = i + 1 | 0;
-    _b = a + b | 0;
-    _a = b;
-    continue ;
-  };
-}
-
-function fib3(n) {
-  var a = 1;
-  var b = 1;
-  for(var i = 1; i <= n; ++i){
-    var tmp = a;
-    a = b;
-    b = b + tmp | 0;
-  }
-  return a;
-}
-
-exports.fib = fib;
-exports.fib2 = fib2;
-exports.fib3 = fib3;
-/* No side effect */
diff --git a/jscomp/test/fib.res b/jscomp/test/fib.res
deleted file mode 100644
index 247048b..0000000
--- a/jscomp/test/fib.res
+++ /dev/null
@@ -1,26 +0,0 @@
-let rec fib = x =>
-  switch x {
-  | 0 | 1 => 1
-  | n => fib(n - 1) + fib(n - 2)
-  }
-
-let fib2 = n => {
-  let rec aux = (a, b, i) =>
-    if n == i {
-      a
-    } else {
-      aux(b, a + b, i + 1)
-    }
-  aux(1, 1, 0)
-}
-
-let fib3 = n => {
-  let a = ref(1)
-  let b = ref(1)
-  for i in 1 to n {
-    let tmp = a.contents
-    a := b.contents
-    b := b.contents + tmp
-  }
-  a.contents
-}
diff --git a/jscomp/test/flattern_order_test.js b/jscomp/test/flattern_order_test.js
deleted file mode 100644
index 2401762..0000000
--- a/jscomp/test/flattern_order_test.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function even(_n) {
-  while(true) {
-    var n = _n;
-    if (n === 0) {
-      return true;
-    }
-    _n = n - 1 | 0;
-    continue ;
-  };
-}
-
-function even2(n) {
-  if (n === 0) {
-    return true;
-  } else {
-    var n$1 = n - 1 | 0;
-    if (n$1 === 1) {
-      return true;
-    } else {
-      return even2(n$1 - 1 | 0);
-    }
-  }
-}
-
-var v = {
-  contents: 0
-};
-
-function obj_get(param) {
-  return v.contents;
-}
-
-function obj_set(i) {
-  v.contents = i;
-}
-
-var obj = {
-  get: obj_get,
-  set: obj_set
-};
-
-exports.even = even;
-exports.even2 = even2;
-exports.v = v;
-exports.obj = obj;
-/* No side effect */
diff --git a/jscomp/test/flattern_order_test.res b/jscomp/test/flattern_order_test.res
deleted file mode 100644
index 3bac0b9..0000000
--- a/jscomp/test/flattern_order_test.res
+++ /dev/null
@@ -1,55 +0,0 @@
-/* such recursive value not allowed in 4.06 */
-
-/* and us = 3 in */
-/* Js.log us; */
-
-/*
-let second xs =
-    let rec ys = 1 :: ys 
-    and _zs () = List.hd xs 
-    (* and us = 3 in  *) in
-
-    xs 
-
-let f x = 
-    let f0 a = a+1 in 
-    let f1 a  = f0 a + 1  in 
-    let f2 a = f1 a + 1 in 
-    f2 x    
-*/
-
-let rec even = {
-  let odd = even
-  n =>
-    if n === 0 {
-      true
-    } else {
-      odd(n - 1)
-    }
-}
-
-let rec even2 = {
-  let odd = n =>
-    if n === 1 {
-      true
-    } else {
-      even2(n - 1)
-    }
-  n =>
-    if n === 0 {
-      true
-    } else {
-      odd(n - 1)
-    }
-}
-
-type t = {
-  get: unit => int,
-  set: int => unit,
-}
-
-let v = ref(0)
-let rec obj = {
-  get: _ => v.contents,
-  set: i => v := i,
-}
diff --git a/jscomp/test/flexible_array_test.js b/jscomp/test/flexible_array_test.js
deleted file mode 100644
index 3201263..0000000
--- a/jscomp/test/flexible_array_test.js
+++ /dev/null
@@ -1,350 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function sub(_tr, _k) {
-  while(true) {
-    var k = _k;
-    var tr = _tr;
-    if (typeof tr !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    if (k === 1) {
-      return tr._0;
-    }
-    if (k % 2 === 0) {
-      _k = k / 2 | 0;
-      _tr = tr._1;
-      continue ;
-    }
-    _k = k / 2 | 0;
-    _tr = tr._2;
-    continue ;
-  };
-}
-
-function update(tr, k, w) {
-  if (typeof tr !== "object") {
-    if (k === 1) {
-      return {
-              TAG: "Br",
-              _0: w,
-              _1: "Lf",
-              _2: "Lf"
-            };
-    }
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  }
-  var r = tr._2;
-  var l = tr._1;
-  if (k === 1) {
-    return {
-            TAG: "Br",
-            _0: w,
-            _1: l,
-            _2: r
-          };
-  }
-  var v = tr._0;
-  if (k % 2 === 0) {
-    return {
-            TAG: "Br",
-            _0: v,
-            _1: update(l, k / 2 | 0, w),
-            _2: r
-          };
-  } else {
-    return {
-            TAG: "Br",
-            _0: v,
-            _1: l,
-            _2: update(r, k / 2 | 0, w)
-          };
-  }
-}
-
-function $$delete(tr, n) {
-  if (typeof tr !== "object") {
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  }
-  if (n === 1) {
-    return "Lf";
-  }
-  var r = tr._2;
-  var l = tr._1;
-  var v = tr._0;
-  if (n % 2 === 0) {
-    return {
-            TAG: "Br",
-            _0: v,
-            _1: $$delete(l, n / 2 | 0),
-            _2: r
-          };
-  } else {
-    return {
-            TAG: "Br",
-            _0: v,
-            _1: l,
-            _2: $$delete(r, n / 2 | 0)
-          };
-  }
-}
-
-function loext(tr, w) {
-  if (typeof tr !== "object") {
-    return {
-            TAG: "Br",
-            _0: w,
-            _1: "Lf",
-            _2: "Lf"
-          };
-  } else {
-    return {
-            TAG: "Br",
-            _0: w,
-            _1: loext(tr._2, tr._0),
-            _2: tr._1
-          };
-  }
-}
-
-function lorem(tr) {
-  if (typeof tr !== "object") {
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  }
-  var l = tr._1;
-  if (typeof l === "object") {
-    return {
-            TAG: "Br",
-            _0: l._0,
-            _1: tr._2,
-            _2: lorem(l)
-          };
-  }
-  var tmp = tr._2;
-  if (typeof tmp !== "object") {
-    return "Lf";
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "flexible_array_test.res",
-          80,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-var empty = [
-  "Lf",
-  0
-];
-
-function length(param) {
-  return param[1];
-}
-
-function get(param, i) {
-  if (i >= 0 && i < param[1]) {
-    return sub(param[0], i + 1 | 0);
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Array.get",
-        Error: new Error()
-      };
-}
-
-function set(param, i, v) {
-  var k = param[1];
-  if (i >= 0 && i < k) {
-    return [
-            update(param[0], i + 1 | 0, v),
-            k
-          ];
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Array.set",
-        Error: new Error()
-      };
-}
-
-function push_front(param, v) {
-  return [
-          loext(param[0], v),
-          param[1] + 1 | 0
-        ];
-}
-
-function pop_front(param) {
-  var k = param[1];
-  if (k > 0) {
-    return [
-            lorem(param[0]),
-            k - 1 | 0
-          ];
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Array.pop_front",
-        Error: new Error()
-      };
-}
-
-function push_back(param, v) {
-  var k = param[1];
-  return [
-          update(param[0], k + 1 | 0, v),
-          k + 1 | 0
-        ];
-}
-
-function pop_back(param) {
-  var k = param[1];
-  if (k > 0) {
-    return [
-            $$delete(param[0], k),
-            k - 1 | 0
-          ];
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Array.pop_back",
-        Error: new Error()
-      };
-}
-
-function filter_from(i, p, s) {
-  var u = empty;
-  for(var i$1 = i ,i_finish = length(s); i$1 < i_finish; ++i$1){
-    var ele = get(s, i$1);
-    if (Curry._1(p, ele)) {
-      u = push_back(u, ele);
-    }
-    
-  }
-  return u;
-}
-
-function append(a, b) {
-  var empty$1 = empty;
-  for(var i = 0 ,i_finish = length(a); i < i_finish; ++i){
-    empty$1 = push_back(empty$1, get(a, i));
-  }
-  for(var i$1 = 0 ,i_finish$1 = length(b); i$1 < i_finish$1; ++i$1){
-    empty$1 = push_back(empty$1, get(b, i$1));
-  }
-  return empty$1;
-}
-
-function sort(s) {
-  var size = length(s);
-  if (size <= 1) {
-    return s;
-  }
-  var head = get(s, 0);
-  var larger = sort(filter_from(1, (function (x) {
-              return Caml_obj.greaterthan(x, head);
-            }), s));
-  var smaller = sort(filter_from(1, (function (x) {
-              return Caml_obj.lessequal(x, head);
-            }), s));
-  return append(smaller, push_front(larger, head));
-}
-
-function of_array(arr) {
-  var v = empty;
-  for(var i = 0 ,i_finish = arr.length; i < i_finish; ++i){
-    v = push_back(v, Caml_array.get(arr, i));
-  }
-  return v;
-}
-
-var equal = Caml_obj.equal;
-
-var Int_array = {
-  empty: empty,
-  get: get,
-  set: set,
-  push_front: push_front,
-  pop_front: pop_front,
-  push_back: push_back,
-  pop_back: pop_back,
-  append: append,
-  sort: sort,
-  of_array: of_array,
-  equal: equal
-};
-
-function $eq$tilde(x, y) {
-  return Caml_obj.equal(x, of_array(y));
-}
-
-var u = of_array([
-      1,
-      2,
-      2,
-      5,
-      3,
-      6
-    ]);
-
-var x = sort(u);
-
-if (!Caml_obj.equal(x, of_array([
-            1,
-            2,
-            2,
-            3,
-            5,
-            6
-          ]))) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "flexible_array_test.res",
-          184,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var v = $$Array.init(500, (function (i) {
-        return 500 - i | 0;
-      }));
-
-var y = $$Array.init(500, (function (i) {
-        return i + 1 | 0;
-      }));
-
-var x$1 = sort(of_array(v));
-
-Caml_obj.equal(x$1, of_array(y));
-
-exports.sub = sub;
-exports.update = update;
-exports.$$delete = $$delete;
-exports.loext = loext;
-exports.lorem = lorem;
-exports.Int_array = Int_array;
-exports.$eq$tilde = $eq$tilde;
-/* u Not a pure module */
diff --git a/jscomp/test/flexible_array_test.res b/jscomp/test/flexible_array_test.res
deleted file mode 100644
index 4ffee66..0000000
--- a/jscomp/test/flexible_array_test.res
+++ /dev/null
@@ -1,188 +0,0 @@
-type rec tree<'a> =
-  | Lf
-  | Br('a, tree<'a>, tree<'a>)
-
-let rec sub = (tr: tree<_>, k) =>
-  switch tr {
-  | Lf => raise(Not_found)
-  | Br(v, l, r) =>
-    if k == 1 {
-      v
-    } else if mod(k, 2) == 0 {
-      sub(l, k / 2)
-    } else {
-      sub(r, k / 2)
-    }
-  }
-
-let rec update = (tr: tree<_>, k, w) =>
-  switch tr {
-  | Lf =>
-    if k == 1 {
-      Br(w, Lf, Lf)
-    } else {
-      raise(Not_found)
-    }
-  | Br(v, l, r) =>
-    if k == 1 {
-      Br(w, l, r)
-    } else if mod(k, 2) == 0 {
-      Br(v, update(l, k / 2, w), r)
-    } else {
-      Br(v, l, update(r, k / 2, w))
-    }
-  }
-
-let rec delete = (tr: tree<_>, n) =>
-  switch tr {
-  | Lf => raise(Not_found)
-  | Br(v, l, r) =>
-    if n == 1 {
-      Lf
-    } else if mod(n, 2) == 0 {
-      Br(v, delete(l, n / 2), r)
-    } else {
-      Br(v, l, delete(r, n / 2))
-    }
-  }
-
-/* it is the same as [push_front] */
-/** proof:
-    left => right 
-    right has to be left 
-*/
-let rec loext = (tr: tree<_>, w) =>
-  switch tr {
-  | Lf => Br(w, Lf, Lf)
-  | Br(v, l, r) =>
-    Br(
-      w,
-      loext(
-        r,
-        v,
-      ) /* v at position 2 
-                                   contribute to 4, 6, 8,12, 10, 14
-                                   from 3 5 ,...
- */,
-      l,
-    )
-  }
-
-/* pop_back */
-let rec lorem = (tr: tree<_>) =>
-  switch tr {
-  | Lf => raise(Not_found)
-  | Br(w, Lf, Lf) => Lf
-  /* length = 1 */
-  | Br(w, Br(v, ll, lr) as l, r) =>
-    /* length >= 2 */
-    Br(v, r, lorem(l))
-  | _ => assert(false)
-  }
-
-module Int_array: {
-  type t
-  let empty: t
-  let get: (t, int) => int
-  let set: (t, int, int) => t
-  let push_front: (t, int) => t
-  let pop_front: t => t
-  let push_back: (t, int) => t
-  let pop_back: t => t
-  let append: (t, t) => t
-  let sort: t => t
-  let of_array: array<int> => t
-  let equal: (t, t) => bool
-} = {
-  type t = (tree<int>, int)
-
-  let empty = (Lf, 0)
-
-  let length = ((_, n)) => n
-
-  let get = ((tree, k), i) =>
-    if i >= 0 && i < k {
-      sub(tree, i + 1)
-    } else {
-      invalid_arg("Array.get")
-    }
-
-  let set = ((tree, k), i, v) =>
-    if i >= 0 && i < k {
-      (update(tree, i + 1, v), k)
-    } else {
-      invalid_arg("Array.set")
-    }
-
-  let push_front = ((tree, k), v) => (loext(tree, v), k + 1)
-
-  let pop_front = ((tree, k)) =>
-    if k > 0 {
-      (lorem(tree), k - 1)
-    } else {
-      invalid_arg("Array.pop_front")
-    }
-
-  let push_back = ((tree, k), v) => (update(tree, k + 1, v), k + 1)
-
-  let pop_back = ((tree, k)) =>
-    if k > 0 {
-      (delete(tree, k), k - 1)
-    } else {
-      invalid_arg("Array.pop_back")
-    }
-
-  let filter_from = (i, p, s) => {
-    let u = ref(empty)
-    for i in i to length(s) - 1 {
-      let ele = get(s, i)
-      if p(ele) {
-        u := push_back(u.contents, ele)
-      }
-    }
-    u.contents
-  }
-
-  let append = (a, b) => {
-    /* let size = size a + size b in */
-    let empty = ref(empty)
-    for i in 0 to length(a) - 1 {
-      empty := push_back(empty.contents, get(a, i))
-    }
-    for i in 0 to length(b) - 1 {
-      empty := push_back(empty.contents, get(b, i))
-    }
-    empty.contents
-  }
-
-  let rec sort = s => {
-    let size = length(s)
-    if size <= 1 {
-      s
-    } else {
-      let head = get(s, 0)
-      let larger = \"@@"(sort, filter_from(1, x => x > head, s))
-      let smaller = \"@@"(sort, filter_from(1, x => x <= head, s))
-      append(smaller, push_front(larger, head))
-    }
-  }
-  let of_array = arr => {
-    let v = ref(empty)
-    for i in 0 to Array.length(arr) - 1 {
-      v := push_back(v.contents, arr[i])
-    }
-    v.contents
-  }
-
-  let equal = (x: t, y: t) => x == y
-}
-
-let \"=~" = (x, y) => Int_array.equal(x, Int_array.of_array(y))
-
-let _ = {
-  let u = Int_array.of_array([1, 2, 2, 5, 3, 6])
-  assert(\"=~"(Int_array.sort(u), [1, 2, 2, 3, 5, 6]))
-  let len = 500
-  let v = Array.init(len, i => len - i)
-  \"=~"(Int_array.sort(Int_array.of_array(v)), Array.init(len, i => i + 1))
-}
diff --git a/jscomp/test/float_array.js b/jscomp/test/float_array.js
deleted file mode 100644
index d859178..0000000
--- a/jscomp/test/float_array.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function small_float_array(x) {
-  return [
-          [
-            1,
-            2,
-            3
-          ],
-          x
-        ];
-}
-
-function longer_float_array(x) {
-  return [
-          [
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            0,
-            1,
-            2,
-            3,
-            4,
-            5,
-            6,
-            7,
-            8,
-            9,
-            0
-          ],
-          x
-        ];
-}
-
-exports.small_float_array = small_float_array;
-exports.longer_float_array = longer_float_array;
-/* No side effect */
diff --git a/jscomp/test/float_array.res b/jscomp/test/float_array.res
deleted file mode 100644
index b02d976..0000000
--- a/jscomp/test/float_array.res
+++ /dev/null
@@ -1,47 +0,0 @@
-let small_float_array = x => ([1., 2., 3.], x)
-
-let longer_float_array = x => (
-  [
-    1.,
-    2.,
-    3.,
-    4.,
-    5.,
-    6.,
-    7.,
-    8.,
-    9.,
-    0.,
-    1.,
-    2.,
-    3.,
-    4.,
-    5.,
-    6.,
-    7.,
-    8.,
-    9.,
-    0.,
-    1.,
-    2.,
-    3.,
-    4.,
-    5.,
-    6.,
-    7.,
-    8.,
-    9.,
-    0.,
-    1.,
-    2.,
-    3.,
-    4.,
-    5.,
-    6.,
-    7.,
-    8.,
-    9.,
-    0.,
-  ],
-  x,
-)
diff --git a/jscomp/test/float_of_bits_test.js b/jscomp/test/float_of_bits_test.js
deleted file mode 100644
index 7bc2901..0000000
--- a/jscomp/test/float_of_bits_test.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Caml_float = require("../../lib/js/caml_float.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-var one_float = [
-  1072693248,
-  0
-];
-
-var int32_pairs = [
-  [
-    32,
-    4.48415508583941463e-44
-  ],
-  [
-    3,
-    4.20389539297445121e-45
-  ]
-];
-
-function from_pairs(pair) {
-  return List.concat($$Array.to_list($$Array.mapi((function (i, param) {
-                        var f = param[1];
-                        var i32 = param[0];
-                        return {
-                                hd: [
-                                  "int32_float_of_bits " + i,
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: Caml_float.int_float_of_bits(i32),
-                                              _1: f
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "int32_bits_of_float " + i,
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: Caml_float.int_bits_of_float(f),
-                                                _1: i32
-                                              };
-                                      })
-                                  ],
-                                  tl: /* [] */0
-                                }
-                              };
-                      }), int32_pairs)));
-}
-
-var suites = Pervasives.$at({
-      hd: [
-        "one",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: Caml_int64.bits_of_float(1.0),
-                    _1: one_float
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "two",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: Caml_int64.float_of_bits(one_float),
-                      _1: 1.0
-                    };
-            })
-        ],
-        tl: /* [] */0
-      }
-    }, from_pairs(int32_pairs));
-
-Mt.from_pair_suites("Float_of_bits_test", suites);
-
-exports.one_float = one_float;
-exports.int32_pairs = int32_pairs;
-exports.from_pairs = from_pairs;
-exports.suites = suites;
-/* suites Not a pure module */
diff --git a/jscomp/test/float_of_bits_test.res b/jscomp/test/float_of_bits_test.res
deleted file mode 100644
index 384d32d..0000000
--- a/jscomp/test/float_of_bits_test.res
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Int64.bits_of_float 1.0 */
-let one_float = 4607182418800017408L
-
-let int32_pairs = [(32l, 4.48415508583941463e-44), (3l, 4.20389539297445121e-45)]
-
-let from_pairs = pair =>
-  int32_pairs
-  |> Array.mapi((i, (i32, f)) => list{
-    ("int32_float_of_bits " ++ __unsafe_cast(i), _ => Mt.Eq(Int32.float_of_bits(i32), f)),
-    ("int32_bits_of_float " ++ __unsafe_cast(i), _ => Mt.Eq(Int32.bits_of_float(f), i32)),
-  })
-  |> Array.to_list
-  |> List.concat
-let suites = \"@"(
-  {
-    open Mt
-    list{
-      ("one", _ => Eq(Int64.bits_of_float(1.0), one_float)),
-      ("two", _ => Eq(Int64.float_of_bits(one_float), 1.0)),
-    }
-  },
-  from_pairs(int32_pairs),
-)
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/float_record.js b/jscomp/test/float_record.js
deleted file mode 100644
index 32f9d95..0000000
--- a/jscomp/test/float_record.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function make(f) {
-  return f;
-}
-
-function from(t) {
-  return t;
-}
-
-exports.make = make;
-exports.from = from;
-/* No side effect */
diff --git a/jscomp/test/float_record.res b/jscomp/test/float_record.res
deleted file mode 100644
index b4dd5c6..0000000
--- a/jscomp/test/float_record.res
+++ /dev/null
@@ -1,19 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Pierre Weis, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 2007 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
-/*  */
-/* ********************************************************************* */
-
-type t = float
-
-let make = f => f
-
-let from = t => t
-
-type s = {f: t}
diff --git a/jscomp/test/float_record.resi b/jscomp/test/float_record.resi
deleted file mode 100644
index a156a8b..0000000
--- a/jscomp/test/float_record.resi
+++ /dev/null
@@ -1,18 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Pierre Weis, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 2007 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
-/*  */
-/* ********************************************************************* */
-
-type t = private float
-
-let make: float => t
-let from: t => float
-
-type s = {f: t}
diff --git a/jscomp/test/float_test.js b/jscomp/test/float_test.js
deleted file mode 100644
index ab342bd..0000000
--- a/jscomp/test/float_test.js
+++ /dev/null
@@ -1,400 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var $$Array = require("../../lib/js/array.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Mt_global = require("./mt_global.js");
-var Caml_float = require("../../lib/js/caml_float.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-var test_id = {
-  contents: 0
-};
-
-var suites = {
-  contents: /* [] */0
-};
-
-function eq(loc) {
-  return function (param, param$1) {
-    return Mt_global.collect_eq(test_id, suites, loc, param, param$1);
-  };
-}
-
-function approx(loc) {
-  return function (param, param$1) {
-    return Mt_global.collect_approx(test_id, suites, loc, param, param$1);
-  };
-}
-
-var epsilon_float = Caml_int64.float_of_bits([
-      1018167296,
-      0
-    ]);
-
-var match = Caml_float.frexp_float(12.0);
-
-var match$1 = Caml_float.frexp_float(0);
-
-var match$2 = Caml_float.frexp_float(-12.0);
-
-var results = $$Array.append([
-      [
-        Math.log10(2),
-        0.301029995663981198
-      ],
-      [
-        Caml_float.ldexp_float(1, 6),
-        64
-      ],
-      [
-        Caml_float.ldexp_float(1, 5),
-        32
-      ],
-      [
-        Caml_float.ldexp_float(1.e-5, 1024),
-        1.79769313486231605e+303
-      ],
-      [
-        Caml_float.ldexp_float(1, -1024),
-        5.56268464626800346e-309
-      ],
-      [
-        Caml_float.hypot_float(3, 4),
-        5
-      ],
-      [
-        Caml_float.hypot_float(4, 3),
-        5
-      ],
-      [
-        Caml_float.hypot_float(5, 12),
-        13
-      ],
-      [
-        Caml_float.hypot_float(12, 5),
-        13
-      ],
-      [
-        Caml_float.copysign_float(22.3, -1),
-        -22.3
-      ],
-      [
-        Caml_float.copysign_float(22.3, 1),
-        22.3
-      ],
-      [
-        Caml_float.expm1_float(1e-15),
-        1.00000000000000067e-15
-      ],
-      [
-        Math.log1p(1e-10),
-        9.9999999995000007e-11
-      ]
-    ], [
-      [
-        match$1[0],
-        0
-      ],
-      [
-        match$1[1],
-        0
-      ],
-      [
-        match[0],
-        0.75
-      ],
-      [
-        match[1],
-        4
-      ],
-      [
-        match$2[0],
-        -0.75
-      ],
-      [
-        match$2[1],
-        4
-      ]
-    ]);
-
-function from_pairs(ps) {
-  return $$Array.to_list($$Array.mapi((function (i, param) {
-                    var b = param[1];
-                    var a = param[0];
-                    return [
-                            "pair " + i,
-                            (function (param) {
-                                return {
-                                        TAG: "Approx",
-                                        _0: a,
-                                        _1: b
-                                      };
-                              })
-                          ];
-                  }), ps));
-}
-
-var float_compare = Caml.float_compare;
-
-var generic_compare = Caml_obj.compare;
-
-function float_equal(x, y) {
-  return x === y;
-}
-
-var generic_equal = Caml_obj.equal;
-
-function float_notequal(x, y) {
-  return x !== y;
-}
-
-var generic_notequal = Caml_obj.notequal;
-
-function float_lessthan(x, y) {
-  return x < y;
-}
-
-var generic_lessthan = Caml_obj.lessthan;
-
-function float_greaterthan(x, y) {
-  return x > y;
-}
-
-var generic_greaterthan = Caml_obj.greaterthan;
-
-function float_lessequal(x, y) {
-  return x <= y;
-}
-
-var generic_lessequal = Caml_obj.lessequal;
-
-function float_greaterequal(x, y) {
-  return x >= y;
-}
-
-var generic_greaterequal = Caml_obj.greaterequal;
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 59, characters 5-12", Pervasives.classify_float(3), "FP_normal");
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 60, characters 5-12", Caml_float.modf_float(-3.125), [
-      -0.125,
-      -3
-    ]);
-
-var match$3 = Caml_float.modf_float(Number.NaN);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 62, characters 4-11", [
-      Number.isNaN(match$3[0]),
-      Number.isNaN(match$3[1])
-    ], [
-      true,
-      true
-    ]);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 71, characters 4-11", $$Array.map((function (x) {
-            if (x > 0) {
-              return 1;
-            } else if (x < 0) {
-              return -1;
-            } else {
-              return 0;
-            }
-          }), $$Array.map((function (param) {
-                return Caml.float_compare(param[0], param[1]);
-              }), [
-              [
-                1,
-                3
-              ],
-              [
-                2,
-                1
-              ],
-              [
-                3,
-                2
-              ]
-            ])), [
-      -1,
-      1,
-      1
-    ]);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 83, characters 5-12", Caml_float.copysign_float(-3, 0), 3);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 84, characters 5-12", Caml_float.copysign_float(3, 0), 3);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 85, characters 5-12", Math.log10(10), 1);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 86, characters 5-12", Caml_float.expm1_float(0), 0);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 87, characters 5-12", Number("3.0"), 3.0);
-
-Mt_global.collect_approx(test_id, suites, "File \"float_test.res\", line 88, characters 9-16", Caml_float.expm1_float(2), 6.38905609893065);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 89, characters 5-12", Caml.float_compare(NaN, NaN), 0);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 90, characters 5-12", Caml_obj.compare(NaN, NaN), 0);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 91, characters 5-12", Caml.float_compare(NaN, Pervasives.neg_infinity), -1);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 92, characters 5-12", Caml_obj.compare(NaN, Pervasives.neg_infinity), -1);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 93, characters 5-12", Caml.float_compare(Pervasives.neg_infinity, NaN), 1);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 94, characters 5-12", Caml_obj.compare(Pervasives.neg_infinity, NaN), 1);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 95, characters 5-12", NaN === NaN, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 96, characters 5-12", Caml_obj.equal(NaN, NaN), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 97, characters 5-12", 4.2 === NaN, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 98, characters 5-12", Caml_obj.equal(4.2, NaN), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 99, characters 5-12", NaN === 4.2, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 100, characters 5-12", Caml_obj.equal(NaN, 4.2), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 101, characters 5-12", NaN !== NaN, true);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 102, characters 5-12", Caml_obj.notequal(NaN, NaN), true);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 103, characters 5-12", 4.2 !== NaN, true);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 104, characters 5-12", Caml_obj.notequal(4.2, NaN), true);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 105, characters 5-12", NaN !== 4.2, true);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 106, characters 5-12", Caml_obj.notequal(NaN, 4.2), true);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 107, characters 5-12", NaN < NaN, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 108, characters 5-12", Caml_obj.lessthan(NaN, NaN), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 109, characters 5-12", 4.2 < NaN, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 110, characters 5-12", Caml_obj.lessthan(4.2, NaN), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 111, characters 5-12", NaN < 4.2, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 112, characters 5-12", Caml_obj.lessthan(NaN, 4.2), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 113, characters 5-12", NaN > NaN, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 114, characters 5-12", Caml_obj.greaterthan(NaN, NaN), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 115, characters 5-12", 4.2 > NaN, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 116, characters 5-12", Caml_obj.greaterthan(4.2, NaN), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 117, characters 5-12", NaN > 4.2, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 118, characters 5-12", Caml_obj.greaterthan(NaN, 4.2), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 119, characters 5-12", NaN <= NaN, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 120, characters 5-12", Caml_obj.lessequal(NaN, NaN), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 121, characters 5-12", 4.2 <= NaN, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 122, characters 5-12", Caml_obj.lessequal(4.2, NaN), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 123, characters 5-12", NaN <= 4.2, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 124, characters 5-12", Caml_obj.lessequal(NaN, 4.2), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 125, characters 5-12", NaN >= NaN, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 126, characters 5-12", Caml_obj.greaterequal(NaN, NaN), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 127, characters 5-12", 4.2 >= NaN, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 128, characters 5-12", Caml_obj.greaterequal(4.2, NaN), false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 129, characters 5-12", NaN >= 4.2, false);
-
-Mt_global.collect_eq(test_id, suites, "File \"float_test.res\", line 130, characters 5-12", Caml_obj.greaterequal(NaN, 4.2), false);
-
-var match$4 = Caml_float.modf_float(32.3);
-
-var b = match$4[1];
-
-var a = match$4[0];
-
-Mt.from_pair_suites("Float_test", Pervasives.$at({
-          hd: [
-            "mod_float",
-            (function (param) {
-                return {
-                        TAG: "Approx",
-                        _0: 3.2 % 0.5,
-                        _1: 0.200000000000000178
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "modf_float1",
-              (function (param) {
-                  return {
-                          TAG: "Approx",
-                          _0: a,
-                          _1: 0.299999999999997158
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "modf_float2",
-                (function (param) {
-                    return {
-                            TAG: "Approx",
-                            _0: b,
-                            _1: 32
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "int_of_float",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: 3,
-                              _1: 3
-                            };
-                    })
-                ],
-                tl: /* [] */0
-              }
-            }
-          }
-        }, Pervasives.$at(from_pairs(results), suites.contents)));
-
-exports.test_id = test_id;
-exports.suites = suites;
-exports.eq = eq;
-exports.approx = approx;
-exports.epsilon_float = epsilon_float;
-exports.results = results;
-exports.from_pairs = from_pairs;
-exports.float_compare = float_compare;
-exports.generic_compare = generic_compare;
-exports.float_equal = float_equal;
-exports.generic_equal = generic_equal;
-exports.float_notequal = float_notequal;
-exports.generic_notequal = generic_notequal;
-exports.float_lessthan = float_lessthan;
-exports.generic_lessthan = generic_lessthan;
-exports.float_greaterthan = float_greaterthan;
-exports.generic_greaterthan = generic_greaterthan;
-exports.float_lessequal = float_lessequal;
-exports.generic_lessequal = generic_lessequal;
-exports.float_greaterequal = float_greaterequal;
-exports.generic_greaterequal = generic_greaterequal;
-/* results Not a pure module */
diff --git a/jscomp/test/float_test.res b/jscomp/test/float_test.res
deleted file mode 100644
index eb86620..0000000
--- a/jscomp/test/float_test.res
+++ /dev/null
@@ -1,150 +0,0 @@
-let (test_id, suites) = (ref(0), ref(list{}))
-let eq = loc => Mt_global.collect_eq(test_id, suites, loc)
-let approx = loc => Mt_global.collect_approx(test_id, suites, loc)
-
-let epsilon_float = Int64.float_of_bits(0x3C_B0_00_00_00_00_00_00L)
-
-let results = Array.append(
-  [
-    (log10(2.), 0.301029995663981198),
-    (ldexp(1., 6), 64.) /* 1. * 2. ^ 6 */,
-    (ldexp(1., 5), 32.),
-    (ldexp(1.e-5, 1024), 1.79769313486231605e+303),
-    (ldexp(1., -1024), 5.56268464626800346e-309),
-    (hypot(3., 4.), 5.),
-    (hypot(4., 3.), 5.),
-    (hypot(5., 12.), 13.),
-    (hypot(12., 5.), 13.),
-    (copysign(22.3, -1.), -22.3),
-    (copysign(22.3, 1.), 22.3),
-    (expm1(1e-15), 1.00000000000000067e-15),
-    (log1p(1e-10), 9.9999999995000007e-11),
-  ],
-  {
-    let (a, b) = frexp(12.0)
-    let (c, d) = frexp(0.)
-    let (e, f) = frexp(-12.0)
-    [
-      (c, 0.),
-      (float_of_int(d), 0.),
-      (a, 0.75),
-      (float_of_int(b), 4.),
-      (e, -0.75),
-      (float_of_int(f), 4.),
-    ]
-  },
-)
-
-let from_pairs = ps =>
-  ps
-  |> Array.mapi((i, (a, b)) => ("pair " ++ __unsafe_cast(i), _ => Mt.Approx(a, b)))
-  |> Array.to_list
-
-let float_compare = (x: float, y) => Pervasives.compare(x, y)
-let generic_compare = Pervasives.compare
-let float_equal = (x: float, y) => x == y
-let generic_equal = \"="
-let float_notequal = (x: float, y) => x != y
-let generic_notequal = \"<>"
-let float_lessthan = (x: float, y) => x < y
-let generic_lessthan = \"<"
-let float_greaterthan = (x: float, y) => x > y
-let generic_greaterthan = \">"
-let float_lessequal = (x: float, y) => x <= y
-let generic_lessequal = \"<="
-let float_greaterequal = (x: float, y) => x >= y
-let generic_greaterequal = \">="
-
-let () = {
-  eq(__LOC__, classify_float(3.), FP_normal)
-  eq(__LOC__, modf(-3.125), (-0.125, -3.))
-  eq(
-    __LOC__,
-    {
-      let (a, b) = modf(nan)
-      (Js_float.isNaN(a), Js_float.isNaN(b))
-    },
-    (true, true),
-  )
-  /* modf nan => (nan,nan) */
-  eq(
-    __LOC__,
-    Array.map(((x, y)) => float_compare(x, y), [(1., 3.), (2., 1.), (3., 2.)]) |> Array.map(x =>
-      if x > 0 {
-        1
-      } else if x < 0 {
-        -1
-      } else {
-        0
-      }
-    ),
-    [-1, 1, 1],
-  )
-  eq(__LOC__, copysign(-3., 0.), 3.)
-  eq(__LOC__, copysign(3., 0.), 3.)
-  eq(__LOC__, log10(10.), 1.)
-  eq(__LOC__, expm1(0.), 0.)
-  eq(__LOC__, Js.Float.fromString("3.0"), 3.0)
-  approx(__LOC__, expm1(2.), 6.38905609893065)
-  eq(__LOC__, float_compare(Js.Float._NaN, Js.Float._NaN), 0)
-  eq(__LOC__, generic_compare(Js.Float._NaN, Js.Float._NaN), 0)
-  eq(__LOC__, float_compare(Js.Float._NaN, neg_infinity), -1)
-  eq(__LOC__, generic_compare(Js.Float._NaN, neg_infinity), -1)
-  eq(__LOC__, float_compare(neg_infinity, Js.Float._NaN), 1)
-  eq(__LOC__, generic_compare(neg_infinity, Js.Float._NaN), 1)
-  eq(__LOC__, float_equal(Js.Float._NaN, Js.Float._NaN), false)
-  eq(__LOC__, generic_equal(Js.Float._NaN, Js.Float._NaN), false)
-  eq(__LOC__, float_equal(4.2, Js.Float._NaN), false)
-  eq(__LOC__, generic_equal(4.2, Js.Float._NaN), false)
-  eq(__LOC__, float_equal(Js.Float._NaN, 4.2), false)
-  eq(__LOC__, generic_equal(Js.Float._NaN, 4.2), false)
-  eq(__LOC__, float_notequal(Js.Float._NaN, Js.Float._NaN), true)
-  eq(__LOC__, generic_notequal(Js.Float._NaN, Js.Float._NaN), true)
-  eq(__LOC__, float_notequal(4.2, Js.Float._NaN), true)
-  eq(__LOC__, generic_notequal(4.2, Js.Float._NaN), true)
-  eq(__LOC__, float_notequal(Js.Float._NaN, 4.2), true)
-  eq(__LOC__, generic_notequal(Js.Float._NaN, 4.2), true)
-  eq(__LOC__, float_lessthan(Js.Float._NaN, Js.Float._NaN), false)
-  eq(__LOC__, generic_lessthan(Js.Float._NaN, Js.Float._NaN), false)
-  eq(__LOC__, float_lessthan(4.2, Js.Float._NaN), false)
-  eq(__LOC__, generic_lessthan(4.2, Js.Float._NaN), false)
-  eq(__LOC__, float_lessthan(Js.Float._NaN, 4.2), false)
-  eq(__LOC__, generic_lessthan(Js.Float._NaN, 4.2), false)
-  eq(__LOC__, float_greaterthan(Js.Float._NaN, Js.Float._NaN), false)
-  eq(__LOC__, generic_greaterthan(Js.Float._NaN, Js.Float._NaN), false)
-  eq(__LOC__, float_greaterthan(4.2, Js.Float._NaN), false)
-  eq(__LOC__, generic_greaterthan(4.2, Js.Float._NaN), false)
-  eq(__LOC__, float_greaterthan(Js.Float._NaN, 4.2), false)
-  eq(__LOC__, generic_greaterthan(Js.Float._NaN, 4.2), false)
-  eq(__LOC__, float_lessequal(Js.Float._NaN, Js.Float._NaN), false)
-  eq(__LOC__, generic_lessequal(Js.Float._NaN, Js.Float._NaN), false)
-  eq(__LOC__, float_lessequal(4.2, Js.Float._NaN), false)
-  eq(__LOC__, generic_lessequal(4.2, Js.Float._NaN), false)
-  eq(__LOC__, float_lessequal(Js.Float._NaN, 4.2), false)
-  eq(__LOC__, generic_lessequal(Js.Float._NaN, 4.2), false)
-  eq(__LOC__, float_greaterequal(Js.Float._NaN, Js.Float._NaN), false)
-  eq(__LOC__, generic_greaterequal(Js.Float._NaN, Js.Float._NaN), false)
-  eq(__LOC__, float_greaterequal(4.2, Js.Float._NaN), false)
-  eq(__LOC__, generic_greaterequal(4.2, Js.Float._NaN), false)
-  eq(__LOC__, float_greaterequal(Js.Float._NaN, 4.2), false)
-  eq(__LOC__, generic_greaterequal(Js.Float._NaN, 4.2), false)
-}
-
-let () = {
-  let (a, b) = modf(32.3)
-  \"@@"(
-    Mt.from_pair_suites(__MODULE__),
-    \"@"(
-      {
-        open Mt
-        list{
-          ("mod_float", _ => Approx(mod_float(3.2, 0.5), 0.200000000000000178)),
-          ("modf_float1", _ => Approx(a, 0.299999999999997158)),
-          ("modf_float2", _ => Approx(b, 32.)),
-          ("int_of_float", _ => Eq(int_of_float(3.2), 3)),
-        }
-      },
-      \"@"(from_pairs(results), suites.contents),
-    ),
-  )
-}
diff --git a/jscomp/test/floatarray_test.js b/jscomp/test/floatarray_test.js
deleted file mode 100644
index c8d86e1..0000000
--- a/jscomp/test/floatarray_test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var v = Caml_array.make_float(5);
-
-for(var i = 0; i <= 4; ++i){
-  v[i] = 0;
-}
-
-Caml_array.set(v, 2, 15.5);
-
-eq("File \"floatarray_test.res\", line 15, characters 5-12", [
-      v.length,
-      v[2],
-      Caml_array.get(v, 1)
-    ], [
-      5,
-      15.5,
-      0
-    ]);
-
-Mt.from_pair_suites("Floatarray_test", suites.contents);
-
-var K;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.K = K;
-/* v Not a pure module */
diff --git a/jscomp/test/floatarray_test.res b/jscomp/test/floatarray_test.res
deleted file mode 100644
index 620069d..0000000
--- a/jscomp/test/floatarray_test.res
+++ /dev/null
@@ -1,18 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-module K = Array.Floatarray
-
-let () = {
-  let len = 5
-  let v = K.create(len)
-
-  for i in 0 to len - 1 {
-    K.unsafe_set(v, i, 0.)
-  }
-  K.set(v, 2, 0x1.fp3)
-  eq(__LOC__, (K.length(v), K.unsafe_get(v, 2), K.get(v, 1)), (len, 0x1.fp3, 0.))
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/for_loop_test.js b/jscomp/test/for_loop_test.js
deleted file mode 100644
index 9b6a0b1..0000000
--- a/jscomp/test/for_loop_test.js
+++ /dev/null
@@ -1,335 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function for_3(x) {
-  var v = {
-    contents: 0
-  };
-  var arr = $$Array.map((function (param, param$1) {
-          
-        }), x);
-  for(var i = 0 ,i_finish = x.length; i < i_finish; ++i){
-    var j = (i << 1);
-    Caml_array.set(arr, i, (function(j){
-        return function (param) {
-          v.contents = v.contents + j | 0;
-        }
-        }(j)));
-  }
-  $$Array.iter((function (x) {
-          Curry._1(x, undefined);
-        }), arr);
-  return v.contents;
-}
-
-function for_4(x) {
-  var v = {
-    contents: 0
-  };
-  var arr = $$Array.map((function (param, param$1) {
-          
-        }), x);
-  for(var i = 0 ,i_finish = x.length; i < i_finish; ++i){
-    var j = (i << 1);
-    var k = (j << 1);
-    Caml_array.set(arr, i, (function(k){
-        return function (param) {
-          v.contents = v.contents + k | 0;
-        }
-        }(k)));
-  }
-  $$Array.iter((function (x) {
-          Curry._1(x, undefined);
-        }), arr);
-  return v.contents;
-}
-
-function for_5(x, u) {
-  var v = {
-    contents: 0
-  };
-  var arr = $$Array.map((function (param, param$1) {
-          
-        }), x);
-  for(var i = 0 ,i_finish = x.length; i < i_finish; ++i){
-    var k = Math.imul((u << 1), u);
-    Caml_array.set(arr, i, (function(k){
-        return function (param) {
-          v.contents = v.contents + k | 0;
-        }
-        }(k)));
-  }
-  $$Array.iter((function (x) {
-          Curry._1(x, undefined);
-        }), arr);
-  return v.contents;
-}
-
-function for_6(x, u) {
-  var v = {
-    contents: 0
-  };
-  var arr = $$Array.map((function (param, param$1) {
-          
-        }), x);
-  var v4 = {
-    contents: 0
-  };
-  var v5 = {
-    contents: 0
-  };
-  var inspect_3 = -1;
-  v4.contents = v4.contents + 1 | 0;
-  for(var j = 0; j <= 1; ++j){
-    v5.contents = v5.contents + 1 | 0;
-    var v2 = {
-      contents: 0
-    };
-    (function(v2){
-    for(var i = 0 ,i_finish = x.length; i < i_finish; ++i){
-      var k = Math.imul((u << 1), u);
-      var h = (v5.contents << 1);
-      v2.contents = v2.contents + 1 | 0;
-      Caml_array.set(arr, i, (function(k,h){
-          return function (param) {
-            v.contents = (((((v.contents + k | 0) + v2.contents | 0) + v4.contents | 0) + v5.contents | 0) + h | 0) + u | 0;
-          }
-          }(k,h)));
-    }
-    }(v2));
-    inspect_3 = v2.contents;
-  }
-  $$Array.iter((function (x) {
-          Curry._1(x, undefined);
-        }), arr);
-  return [
-          v.contents,
-          v4.contents,
-          v5.contents,
-          inspect_3
-        ];
-}
-
-function for_7(param) {
-  var v = {
-    contents: 0
-  };
-  var arr = Caml_array.make(21, (function (param) {
-          
-        }));
-  for(var i = 0; i <= 6; ++i){
-    (function(i){
-    for(var j = 0; j <= 2; ++j){
-      Caml_array.set(arr, Math.imul(i, 3) + j | 0, (function(j){
-          return function (param) {
-            v.contents = (v.contents + i | 0) + j | 0;
-          }
-          }(j)));
-    }
-    }(i));
-  }
-  $$Array.iter((function (f) {
-          Curry._1(f, undefined);
-        }), arr);
-  return v.contents;
-}
-
-function for_8(param) {
-  var v = {
-    contents: 0
-  };
-  var arr = Caml_array.make(21, (function (param) {
-          
-        }));
-  for(var i = 0; i <= 6; ++i){
-    var k = (i << 1);
-    (function(i,k){
-    for(var j = 0; j <= 2; ++j){
-      var h = i + j | 0;
-      Caml_array.set(arr, Math.imul(i, 3) + j | 0, (function(j,h){
-          return function (param) {
-            v.contents = (((v.contents + i | 0) + j | 0) + h | 0) + k | 0;
-          }
-          }(j,h)));
-    }
-    }(i,k));
-  }
-  $$Array.iter((function (f) {
-          Curry._1(f, undefined);
-        }), arr);
-  return v.contents;
-}
-
-function for_9(param) {
-  var v = {
-    contents: /* [] */0
-  };
-  var collect = function (x) {
-    v.contents = {
-      hd: x,
-      tl: v.contents
-    };
-  };
-  var vv = {
-    contents: 0
-  };
-  var vv2 = {
-    contents: 0
-  };
-  var arr = Caml_array.make(4, (function (param) {
-          
-        }));
-  var arr2 = Caml_array.make(2, (function (param) {
-          
-        }));
-  for(var i = 0; i <= 1; ++i){
-    var v$1 = {
-      contents: 0
-    };
-    v$1.contents = v$1.contents + i | 0;
-    (function(v$1){
-    for(var j = 0; j <= 1; ++j){
-      v$1.contents = v$1.contents + 1 | 0;
-      collect(v$1.contents);
-      Caml_array.set(arr, (i << 1) + j | 0, (function (param) {
-              vv.contents = vv.contents + v$1.contents | 0;
-            }));
-    }
-    }(v$1));
-    Caml_array.set(arr2, i, (function(v$1){
-        return function (param) {
-          vv2.contents = vv2.contents + v$1.contents | 0;
-        }
-        }(v$1)));
-  }
-  $$Array.iter((function (f) {
-          Curry._1(f, undefined);
-        }), arr);
-  $$Array.iter((function (f) {
-          Curry._1(f, undefined);
-        }), arr2);
-  return [[
-            vv.contents,
-            $$Array.of_list(List.rev(v.contents)),
-            vv2.contents
-          ]];
-}
-
-var suites_0 = [
-  "for_loop_test_3",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: 90,
-              _1: for_3(Caml_array.make(10, 2))
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "for_loop_test_4",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: 180,
-                _1: for_4(Caml_array.make(10, 2))
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "for_loop_test_5",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: 2420,
-                  _1: for_5(Caml_array.make(10, 2), 11)
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "for_loop_test_6",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: [
-                      30,
-                      1,
-                      2,
-                      3
-                    ],
-                    _1: for_6(Caml_array.make(3, 0), 0)
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "for_loop_test_7",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: 84,
-                      _1: for_7()
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "for_loop_test_8",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: 294,
-                        _1: for_8()
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "for_loop_test_9",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: [[
-                              10,
-                              [
-                                1,
-                                2,
-                                2,
-                                3
-                              ],
-                              5
-                            ]],
-                          _1: for_9()
-                        };
-                })
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-exports.for_3 = for_3;
-exports.for_4 = for_4;
-exports.for_5 = for_5;
-exports.for_6 = for_6;
-exports.for_7 = for_7;
-exports.for_8 = for_8;
-exports.for_9 = for_9;
-exports.suites = suites;
-/* No side effect */
diff --git a/jscomp/test/for_loop_test.res b/jscomp/test/for_loop_test.res
deleted file mode 100644
index 8c45dd2..0000000
--- a/jscomp/test/for_loop_test.res
+++ /dev/null
@@ -1,168 +0,0 @@
-let for_3 = x => {
-  let v = ref(0)
-  let arr = Array.map((_, _) => (), x)
-  for i in 0 to Array.length(x) - 1 {
-    let j = i * 2
-    arr[i] = _ => v := v.contents + j
-  }
-  Array.iter(x => x(), arr)
-  v.contents
-}
-
-let for_4 = x => {
-  let v = ref(0)
-  let arr = Array.map((_, _) => (), x)
-  for i in 0 to Array.length(x) - 1 {
-    let j = i * 2
-    let k = 2 * j
-    arr[i] = _ => v := v.contents + k
-  }
-  Array.iter(x => x(), arr)
-  v.contents
-}
-
-let for_5 = (x, u) => {
-  let v = ref(0)
-  let arr = Array.map((_, _) => (), x)
-  for i in 0 to Array.length(x) - 1 {
-    let _j = i * 2
-    let k = 2 * u * u
-    arr[i] = _ => v := v.contents + k
-  }
-  Array.iter(x => x(), arr)
-  v.contents
-}
-
-let for_6 = (x, u) => {
-  let v = ref(0)
-  let arr = Array.map((_, _) => (), x)
-  let v4 = ref(0)
-  let v5 = ref(0)
-  let inspect_3 = ref(-1)
-  incr(v4)
-  for j in 0 to 1 {
-    incr(v5)
-    let v2 = ref(0)
-    let v3 = u
-    for i in 0 to Array.length(x) - 1 {
-      let _j = i * 2
-      let k = 2 * u * u
-      let h = 2 * v5.contents
-      incr(v2)
-      arr[i] = _ => v := v.contents + k + v2.contents + v4.contents + v5.contents + h + v3
-      /* v2 should not be captured */
-    }
-    inspect_3 := v2.contents
-  }
-  Array.iter(x => x(), arr)
-  [v.contents, v4.contents, v5.contents, inspect_3.contents]
-}
-
-let for_7 = () => {
-  let i_len = 7
-  let j_len = 3
-  let v = ref(0)
-  let arr = Array.make(i_len * j_len, _ => ())
-  for i in 0 to i_len - 1 {
-    for j in 0 to j_len - 1 {
-      arr[i * j_len + j] = _ => v := v.contents + i + j
-    }
-  }
-  Array.iter(f => f(), arr)
-  v.contents
-}
-
-let for_8 = () => {
-  let i_len = 7
-  let j_len = 3
-  let v = ref(0)
-  let arr = Array.make(i_len * j_len, _ => ())
-  for i in 0 to i_len - 1 {
-    let k = 2 * i
-    for j in 0 to j_len - 1 {
-      let h = i + j
-      arr[i * j_len + j] = _ => v := v.contents + i + j + h + k
-    }
-  }
-  Array.iter(f => f(), arr)
-  v.contents
-}
-
-let for_9 = () => {
-  let (collect, get) = {
-    let v: ref<list<int>> = ref(list{})
-    (x => v := list{x, ...v.contents}, () => \"@@"(Array.of_list, List.rev(v.contents)))
-  }
-
-  let i_len = 2
-  let j_len = 2
-  let vv = ref(0)
-  let vv2 = ref(0)
-  let arr = Array.make(i_len * j_len, _ => ())
-  let arr2 = Array.make(i_len, _ => ())
-  for i in 0 to i_len - 1 {
-    let v = ref(0)
-    /* incr v ; */
-    v := v.contents + i
-    for j in 0 to j_len - 1 {
-      incr(v)
-      collect(v.contents)
-      arr[i * j_len + j] = _ => vv := vv.contents + v.contents
-      /* v should not be captured inside , 
-           since for next iteration, 
-           we are bound the same v
-
-           there are four iterations of this function
-           
-           the first two bound one v 
-
-           the second two bound the other one
-
-           -- sometimes it's hard to tell the difference,  
-           when v is not relevant to the outer [index]
-           actually we have to lexical scope the whole for statement
- */
-    }
-    arr2[i] = _ => vv2 := vv2.contents + v.contents
-    /* v should be captured, since next iteration 
-        v is changed
- */
-  }
-  Array.iter(f => f(), arr)
-  Array.iter(f => f(), arr2)
-  [(vv.contents, get(), vv2.contents)]
-}
-
-/*
-
-See how google closure works, in both simple model and advanced model
-
-{[
-var x = []
-
-var u = []
-var result = 0
-for(let i = 0; i < 2; ++i){
-  let counter = 0;
-  counter += i;
-  for(let j = 0; j < 2 ; ++j){
-     x[i * 2 +j ] = ()=>{ result += counter}
-   }
-  u.push(counter)
-}
-x.forEach(x=>x())
-console.log(result,u)
-]}
-
-
-*/
-
-let suites = list{
-  ("for_loop_test_3", _ => Mt.Eq(90, \"@@"(for_3, Array.make(10, 2)))),
-  ("for_loop_test_4", _ => Mt.Eq(180, \"@@"(for_4, Array.make(10, 2)))),
-  ("for_loop_test_5", _ => Mt.Eq(2420, for_5(Array.make(10, 2), 11))),
-  ("for_loop_test_6", _ => Mt.Eq([30, 1, 2, 3], for_6(Array.make(3, 0), 0))),
-  ("for_loop_test_7", _ => Mt.Eq(84, for_7())),
-  ("for_loop_test_8", _ => Mt.Eq(294, for_8())),
-  ("for_loop_test_9", _ => Mt.Eq([(10, [1, 2, 2, 3], 5)], for_9())),
-}
diff --git a/jscomp/test/for_side_effect_test.js b/jscomp/test/for_side_effect_test.js
deleted file mode 100644
index e770b02..0000000
--- a/jscomp/test/for_side_effect_test.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-function tst(param) {
-  for(var i = (console.log("hi"), 0) ,i_finish = (console.log("hello"), 3); i <= i_finish; ++i){
-    
-  }
-}
-
-function test2(param) {
-  var v = 0;
-  v = 3;
-  v = 10;
-  for(var i = 0; i <= 1; ++i){
-    
-  }
-  return v;
-}
-
-var suites_0 = [
-  "for_order",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: 10,
-              _1: test2()
-            };
-    })
-];
-
-var suites = {
-  hd: suites_0,
-  tl: /* [] */0
-};
-
-Mt.from_pair_suites("For_side_effect_test", suites);
-
-exports.tst = tst;
-exports.test2 = test2;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/for_side_effect_test.res b/jscomp/test/for_side_effect_test.res
deleted file mode 100644
index e1b66ba..0000000
--- a/jscomp/test/for_side_effect_test.res
+++ /dev/null
@@ -1,32 +0,0 @@
-let tst = () =>
-  for i in {
-    print_endline("hi")
-    0
-  } to {
-    print_endline("hello")
-    3
-  } {
-    ()
-  }
-
-let test2 = () => {
-  let v = ref(0)
-  for i in {
-    v := 3
-    0
-  } to {
-    v := 10
-    1
-  } {
-    ()
-  }
-  v.contents
-}
-open Mt
-
-let suites = {
-  open Mt
-  list{("for_order", _ => Eq(10, test2()))}
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/format_regression.js b/jscomp/test/format_regression.js
deleted file mode 100644
index d591f1c..0000000
--- a/jscomp/test/format_regression.js
+++ /dev/null
@@ -1,77 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function peek_queue(param) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "format_regression.res",
-          10,
-          22
-        ],
-        Error: new Error()
-      };
-}
-
-function int_of_size(param) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "format_regression.res",
-          11,
-          23
-        ],
-        Error: new Error()
-      };
-}
-
-function take_queue(param) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "format_regression.res",
-          12,
-          22
-        ],
-        Error: new Error()
-      };
-}
-
-function format_pp_token(param, param$1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "format_regression.res",
-          13,
-          32
-        ],
-        Error: new Error()
-      };
-}
-
-function advance_loop(state) {
-  while(true) {
-    var match = peek_queue(state.pp_queue);
-    var size = match.elem_size;
-    var size$1 = int_of_size(size);
-    if (size$1 < 0 && (state.pp_right_total - state.pp_left_total | 0) < state.pp_space_left) {
-      return ;
-    }
-    take_queue(state.pp_queue);
-    Curry._1(format_pp_token(state, size$1 < 0 ? 1000000010 : size$1), match.token);
-    state.pp_left_total = match.length + state.pp_left_total | 0;
-    continue ;
-  };
-}
-
-var pp_infinity = 1000000010;
-
-exports.peek_queue = peek_queue;
-exports.int_of_size = int_of_size;
-exports.take_queue = take_queue;
-exports.format_pp_token = format_pp_token;
-exports.pp_infinity = pp_infinity;
-exports.advance_loop = advance_loop;
-/* No side effect */
diff --git a/jscomp/test/format_regression.res b/jscomp/test/format_regression.res
deleted file mode 100644
index 52d1cfc..0000000
--- a/jscomp/test/format_regression.res
+++ /dev/null
@@ -1,45 +0,0 @@
-@@warning("-20-21")
-type tag
-type queue_elem<'a>
-type queue<'a> = {
-  mutable insert: queue_elem<'a>,
-  mutable body: queue_elem<'a>,
-}
-type size
-type pp_token
-let peek_queue = _ => assert(false)
-let int_of_size = _ => assert(false)
-let take_queue = _ => assert(false)
-let format_pp_token = (_, _) => assert(false)
-let pp_infinity = 1000000010
-type pp_queue_elem = {
-  mutable elem_size: size,
-  token: pp_token,
-  length: int,
-}
-
-type formatter = {
-  mutable pp_space_left: int,
-  mutable pp_left_total: int,
-  mutable pp_right_total: int,
-  mutable pp_queue: queue<pp_queue_elem>,
-}
-let rec advance_loop = state =>
-  switch peek_queue(state.pp_queue) {
-  | {elem_size: size, token: tok, length: len} =>
-    let size = int_of_size(size)
-    if !(size < 0 && state.pp_right_total - state.pp_left_total < state.pp_space_left) {
-      ignore(take_queue(state.pp_queue))
-      format_pp_token(
-        state,
-        if size < 0 {
-          pp_infinity
-        } else {
-          size
-        },
-        tok,
-      )
-      state.pp_left_total = len + state.pp_left_total
-      advance_loop(state)
-    }
-  }
diff --git a/jscomp/test/format_test.js b/jscomp/test/format_test.js
deleted file mode 100644
index 622709d..0000000
--- a/jscomp/test/format_test.js
+++ /dev/null
@@ -1,209 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Bytes = require("../../lib/js/bytes.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_format = require("../../lib/js/caml_format.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function eq3(loc, a, b, c) {
-  eq(loc, a, b);
-  eq(loc, b, c);
-  eq(loc, a, c);
-}
-
-var M = {};
-
-eq("File \"format_test.res\", line 23, characters 5-12", 7.875, 7.875);
-
-eq("File \"format_test.res\", line 25, characters 5-12", -7.875, -7.875);
-
-eq3("File \"format_test.res\", line 29, characters 6-13", Infinity, Number.POSITIVE_INFINITY, Pervasives.infinity);
-
-eq3("File \"format_test.res\", line 30, characters 6-13", -Infinity, Number.NEGATIVE_INFINITY, Pervasives.neg_infinity);
-
-eq3("File \"format_test.res\", line 31, characters 6-13", Pervasives.max_float, 1.79769313486231571e+308, Number.MAX_VALUE);
-
-eq("File \"format_test.res\", line 32, characters 5-12", Pervasives.classify_float(Infinity), "FP_infinite");
-
-eq("File \"format_test.res\", line 33, characters 5-12", Pervasives.classify_float(Infinity), "FP_infinite");
-
-eq("File \"format_test.res\", line 35, characters 5-12", Pervasives.min_float, 2.22507385850720138e-308);
-
-eq("File \"format_test.res\", line 36, characters 5-12", Pervasives.epsilon_float, 2.22044604925031308e-16);
-
-eq("File \"format_test.res\", line 37, characters 5-12", 4.94065645841e-324, 5e-324);
-
-eq("File \"format_test.res\", line 38, characters 5-12", 1.00000000000000022 - 1, Pervasives.epsilon_float);
-
-eq("File \"format_test.res\", line 39, characters 5-12", 1.11253692925360069e-308 / 2.22507385850720138e-308, 0.5);
-
-eq("File \"format_test.res\", line 40, characters 5-12", Pervasives.classify_float(1.11253692925360069e-308), "FP_subnormal");
-
-eq("File \"format_test.res\", line 41, characters 5-12", 1.11253692925360069e-308, 1.11253692925360069e-308);
-
-eq("File \"format_test.res\", line 42, characters 5-12", 2.22507385850720138e-308, 2.22507385850720138e-308);
-
-eq("File \"format_test.res\", line 44, characters 5-12", (1 + 255 / 256) * 8, 15.96875);
-
-eq("File \"format_test.res\", line 45, characters 5-12", (1 + 4095 / 4096) * 8, 15.998046875);
-
-eq("File \"format_test.res\", line 46, characters 5-12", (1 + 65535 / 65536) * 8, 15.9998779296875);
-
-function f(loc, ls) {
-  List.iter((function (param) {
-          eq(loc, Caml_format.float_of_string(param[0]), param[1]);
-        }), ls);
-}
-
-f("File \"format_test.res\", line 53, characters 11-18", {
-      hd: [
-        "0x3.fp+1",
-        7.875
-      ],
-      tl: {
-        hd: [
-          " 0x3.fp2",
-          15.75
-        ],
-        tl: {
-          hd: [
-            " 0x4.fp2",
-            19.75
-          ],
-          tl: /* [] */0
-        }
-      }
-    });
-
-function sl(f) {
-  return Caml_format.hexstring_of_float(f, -1, /* '-' */45);
-}
-
-function aux_list(loc, ls) {
-  List.iter((function (param) {
-          eq(loc, Caml_format.hexstring_of_float(param[0], -1, /* '-' */45), param[1]);
-        }), ls);
-}
-
-var literals_0 = [
-  7.875,
-  "0x1.f8p+2"
-];
-
-var literals_1 = {
-  hd: [
-    0.3,
-    "0x1.3333333333333p-2"
-  ],
-  tl: {
-    hd: [
-      Pervasives.infinity,
-      "infinity"
-    ],
-    tl: {
-      hd: [
-        0.4,
-        "0x1.999999999999ap-2"
-      ],
-      tl: {
-        hd: [
-          0.5,
-          "0x1p-1"
-        ],
-        tl: {
-          hd: [
-            0.6,
-            "0x1.3333333333333p-1"
-          ],
-          tl: {
-            hd: [
-              0.7,
-              "0x1.6666666666666p-1"
-            ],
-            tl: {
-              hd: [
-                0.8,
-                "0x1.999999999999ap-1"
-              ],
-              tl: {
-                hd: [
-                  0.9,
-                  "0x1.ccccccccccccdp-1"
-                ],
-                tl: /* [] */0
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var literals = {
-  hd: literals_0,
-  tl: literals_1
-};
-
-aux_list("File \"format_test.res\", line 72, characters 18-25", literals);
-
-var s = Caml_format.hexstring_of_float(7.875, -1, /* '-' */45);
-
-eq("File \"format_test.res\", line 74, characters 12-19", Bytes.unsafe_to_string(Bytes.uppercase_ascii(Bytes.unsafe_of_string(s))), "0X1.F8P+2");
-
-function scan_float(loc, s, expect) {
-  eq(loc, Caml_format.float_of_string(s), expect);
-}
-
-scan_float("File \"format_test.res\", line 80, characters 13-20", "0x3f.p1", 126);
-
-scan_float("File \"format_test.res\", line 81, characters 13-20", "0x1.3333333333333p-2", 0.3);
-
-List.iter((function (param) {
-        scan_float("File \"format_test.res\", line 82, characters 35-42", param[1], param[0]);
-      }), literals);
-
-var f1 = - -9.9;
-
-eq("File \"format_test.res\", line 88, characters 5-12", f1, 9.9);
-
-Mt.from_pair_suites("Format_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.eq3 = eq3;
-exports.M = M;
-exports.f = f;
-exports.sl = sl;
-exports.aux_list = aux_list;
-exports.literals = literals;
-exports.scan_float = scan_float;
-/*  Not a pure module */
diff --git a/jscomp/test/format_test.res b/jscomp/test/format_test.res
deleted file mode 100644
index 663cb9d..0000000
--- a/jscomp/test/format_test.res
+++ /dev/null
@@ -1,91 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let eq3 = (loc, a, b, c) => {
-  eq(loc, a, b)
-  eq(loc, b, c)
-  eq(loc, a, c)
-}
-
-module M = {
-  @val @scope("Number") external infinity: float = "POSITIVE_INFINITY"
-  @val @scope("Number") external neg_infinity: float = "NEGATIVE_INFINITY"
-  @val @scope("Number") external nan: float = "NaN"
-  @val @scope("Number") external max_float: float = "MAX_VALUE"
-}
-
-let () = {
-  eq(__LOC__, 0x3.fp+1, 7.875)
-
-  eq(__LOC__, -0x3.fp+1, -7.875)
-  /* in standard, it is still infinity, but 
-    ideally should give an warning
- */
-  eq3(__LOC__, 0x1p2047, M.infinity, infinity)
-  eq3(__LOC__, -0x1p2047, M.neg_infinity, neg_infinity)
-  eq3(__LOC__, max_float, 0x1.ffff_ffff_ffff_fp+1023, M.max_float)
-  eq(__LOC__, classify_float(0x1.2p2047), FP_infinite)
-  eq(__LOC__, classify_float(0x1.1p2047), FP_infinite)
-
-  eq(__LOC__, min_float, 0x1p-1022)
-  eq(__LOC__, epsilon_float, 0x1p-52)
-  eq(__LOC__, 0x0.0000_0000_0000_1p-1022, 5e-324)
-  eq(__LOC__, 0x1.0000_0000_0000_1 -. 1., epsilon_float)
-  eq(__LOC__, 0x1p-1023 /. 0x1p-1022, 0x1p-1)
-  eq(__LOC__, classify_float(0x1p-1023), FP_subnormal)
-  eq(__LOC__, 0x1p-1023, 0x0.8p-1022)
-  eq(__LOC__, 0x0.ffff_ffff_ffff_ffff_ffp-1022, 0x1p-1022)
-
-  eq(__LOC__, (1. +. 0xffp0 /. 0x100p0) *. 8., 0x1.ffp3)
-  eq(__LOC__, (1. +. 0xfffp0 /. 0x1000p0) *. 8., 0x1.fffp3)
-  eq(__LOC__, (1. +. 0xffffp0 /. 0x10000p0) *. 8., 0x1.ffffp3)
-}
-
-/* TODO: add scanf example */
-
-let f = (loc, ls) => List.iter(((a, b)) => eq(loc, float_of_string(a), b), ls)
-
-let () = f(__LOC__, list{("0x3.fp+1", 0x3.fp+1), (" 0x3.fp2", 0x3.fp2), (" 0x4.fp2", 0x4.fp2)})
-
-external hexstring_of_float: (float, int, char) => string = "?hexstring_of_float"
-
-let sl = (f: float): string => hexstring_of_float(f, -1, '-')
-
-let aux_list = (loc, ls) => List.iter(((a, b)) => eq(loc, sl(a), b), ls)
-let literals = list{
-  (0x3.fp+1, "0x1.f8p+2") /* (1. +. 0xf8p0 /. 0x1_00p0) *. 4. */,
-  (0.3, "0x1.3333333333333p-2"),
-  (infinity, "infinity"),
-  (0.4, "0x1.999999999999ap-2"),
-  (0.5, "0x1p-1"),
-  (0.6, "0x1.3333333333333p-1"),
-  (0.7, "0x1.6666666666666p-1"),
-  (0.8, "0x1.999999999999ap-1"),
-  (0.9, "0x1.ccccccccccccdp-1"),
-}
-
-let () = aux_list(__LOC__, literals)
-
-let () = eq(__LOC__, String.uppercase_ascii(hexstring_of_float(0x3.fp+1, -1, '-')), "0X1.F8P+2")
-/* The internal does some thing similar with "%H" */
-let scan_float = (loc, s, expect) => eq(loc, float_of_string(s), expect)
-/* Scanf.sscanf s "%h" (fun result -> eq loc result expect) */
-
-let () = {
-  scan_float(__LOC__, "0x3f.p1", 0x3f.p1)
-  scan_float(__LOC__, "0x1.3333333333333p-2", 0.3)
-  List.iter(((a, b)) => scan_float(__LOC__, b, a), literals)
-}
-
-let () = {
-  let f = -9.9
-  let f1 = -.f
-  eq(__LOC__, f1, 9.9)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/fun_pattern_match.js b/jscomp/test/fun_pattern_match.js
deleted file mode 100644
index 25975a5..0000000
--- a/jscomp/test/fun_pattern_match.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var Curry = require("../../lib/js/curry.js");
-
-function f(param, v) {
-  return ((((param.x0 + param.x1 | 0) + param.x2 | 0) + param.x3 | 0) + param.x4 | 0) + v | 0;
-}
-
-function f2(param, param$1) {
-  return (((((param.x0 + param.x1 | 0) + param.x2 | 0) + param.x3 | 0) + param.x4 | 0) + param$1.a | 0) + param$1.b | 0;
-}
-
-function f3(param) {
-  var lhs = param.rank;
-  return function (param) {
-    var rhs = param.rank;
-    if (typeof lhs !== "object") {
-      lhs === "Uninitialized";
-    } else {
-      if (typeof rhs === "object") {
-        return Caml.int_compare(lhs._0, rhs._0);
-      }
-      rhs === "Uninitialized";
-    }
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "fun_pattern_match.res",
-            33,
-            9
-          ],
-          Error: new Error()
-        };
-  };
-}
-
-function f4(param) {
-  var lhs = param.rank;
-  return function (param) {
-    var rhs = param.rank;
-    if (typeof lhs !== "object") {
-      lhs === "Uninitialized";
-    } else {
-      if (typeof rhs === "object") {
-        return Caml.int_compare(lhs._0, rhs._0);
-      }
-      rhs === "Uninitialized";
-    }
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "fun_pattern_match.res",
-            39,
-            9
-          ],
-          Error: new Error()
-        };
-  };
-}
-
-var x = {
-  NAME: "A",
-  VAL: r
-};
-
-function r(param) {
-  return x;
-}
-
-var match = r();
-
-var v = Curry._1(match.VAL, undefined);
-
-console.log(v);
-
-function handle_tuple(x, y) {
-  if (x !== 0) {
-    if (x === 1 && y === 2) {
-      return 3;
-    }
-    
-  } else if (y === 1) {
-    return 2;
-  }
-  console.log([
-        x,
-        y
-      ]);
-  return x + y | 0;
-}
-
-exports.f = f;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.r = r;
-exports.v = v;
-exports.handle_tuple = handle_tuple;
-/* match Not a pure module */
diff --git a/jscomp/test/fun_pattern_match.res b/jscomp/test/fun_pattern_match.res
deleted file mode 100644
index 8b484e0..0000000
--- a/jscomp/test/fun_pattern_match.res
+++ /dev/null
@@ -1,62 +0,0 @@
-type u = {x0: int, x1: int, x2: int, x3: int, x4: int}
-
-let f = ({x0, x1, x2, x3, x4}, v) => x0 + x1 + x2 + x3 + x4 + v
-
-type b = {a: int, b: int}
-let f2 = ({x0, x1, x2, x3, x4}, {a, b}) => x0 + x1 + x2 + x3 + x4 + a + b
-
-type binary_op =
-  | PLUS
-  | MINUS
-
-type rank =
-  | Uninitialized
-  | Visited
-  | Ranked(int)
-
-type rec binary_op_ticker = {
-  op: binary_op,
-  rhs: ticker,
-  lhs: ticker,
-}
-
-and ticker_type =
-  | Market
-  | Binary_op(binary_op_ticker)
-
-and ticker = {mutable rank: rank}
-
-let f3 = ({rank: lhs, _}, {rank: rhs}) =>
-  /* generate curried version when pattern match against arguments */
-  switch (lhs, rhs) {
-  | (Ranked(x), Ranked(y)) => Pervasives.compare(x, y)
-  | _ => assert(false)
-  }
-
-let f4 = ({rank: lhs, _}, {rank: rhs}) =>
-  switch (lhs, rhs) {
-  | (Ranked(x), Ranked(y)) => Pervasives.compare(x, y)
-  | _ => assert(false)
-  }
-
-/* #995 test case */
-let rec r = {
-  let rec x = #A(r) and y = () => x
-  y
-}
-
-let v = {
-  let #A(x) = r()
-  x()
-}
-
-Js.log(v)
-
-let handle_tuple = (x, y) =>
-  switch (x, y) {
-  | (0, 1) => 2
-  | (1, 2) => 3
-  | (a, b) as x =>
-    Js.log(x)
-    a + b
-  }
diff --git a/jscomp/test/functor_app_test.js b/jscomp/test/functor_app_test.js
deleted file mode 100644
index 635ae81..0000000
--- a/jscomp/test/functor_app_test.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Functor_def = require("./functor_def.js");
-var Functor_inst = require("./functor_inst.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var Y0 = Functor_def.Make(Functor_inst);
-
-var Y1 = Functor_def.Make(Functor_inst);
-
-eq("File \"functor_app_test.res\", line 15, characters 3-10", Curry._2(Y0.h, 1, 2), 4);
-
-eq("File \"functor_app_test.res\", line 16, characters 3-10", Curry._2(Y1.h, 2, 3), 6);
-
-var v = Functor_def.$$return();
-
-eq("File \"functor_app_test.res\", line 20, characters 3-10", v, 2);
-
-Mt.from_pair_suites("Functor_app_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.Y0 = Y0;
-exports.Y1 = Y1;
-exports.v = v;
-/* Y0 Not a pure module */
diff --git a/jscomp/test/functor_app_test.res b/jscomp/test/functor_app_test.res
deleted file mode 100644
index 7a1fdfc..0000000
--- a/jscomp/test/functor_app_test.res
+++ /dev/null
@@ -1,22 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-/* module X =  Map.Make(String) */
-
-module Y0 = Functor_def.Make(Functor_inst)
-
-module Y1 = Functor_def.Make(Functor_inst)
-
-eq(__LOC__, Y0.h(1, 2), 4)
-eq(__LOC__, Y1.h(2, 3), 6)
-
-let v = Functor_def.return()
-
-eq(__LOC__, v, 2)
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/functor_def.js b/jscomp/test/functor_def.js
deleted file mode 100644
index fb80c5d..0000000
--- a/jscomp/test/functor_def.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-var v = {
-  contents: 0
-};
-
-function f(x, x$1) {
-  v.contents = v.contents + 1 | 0;
-  return x$1 + x$1 | 0;
-}
-
-function $$return(param) {
-  return v.contents;
-}
-
-function Make(U) {
-  var h = function (x, x$1) {
-    console.log(f(x$1, x$1));
-    return Curry._2(U.say, x$1, x$1);
-  };
-  return {
-          h: h
-        };
-}
-
-exports.v = v;
-exports.f = f;
-exports.$$return = $$return;
-exports.Make = Make;
-/* No side effect */
diff --git a/jscomp/test/functor_def.res b/jscomp/test/functor_def.res
deleted file mode 100644
index b59e840..0000000
--- a/jscomp/test/functor_def.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let v = ref(0)
-
-let f = (x, x) => {
-  incr(v)
-  x + x
-}
-
-let return = () => v.contents
-
-module Make = (
-  U: {
-    type t
-    let say: (int, int) => int
-  },
-) => {
-  /* let () = Js.log "no inline" */
-  let h = (x, x) => {
-    Js.log(f(x, x))
-    U.say(x, x)
-  }
-}
diff --git a/jscomp/test/functor_ffi.js b/jscomp/test/functor_ffi.js
deleted file mode 100644
index 8c33a76..0000000
--- a/jscomp/test/functor_ffi.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function Make(S) {
-  var opt_get = function (f, i) {
-    return Caml_option.undefined_to_opt(f[i]);
-  };
-  return {
-          opt_get: opt_get
-        };
-}
-
-function opt_get(f, i) {
-  return Caml_option.undefined_to_opt(f[i]);
-}
-
-var Int_arr = {
-  opt_get: opt_get
-};
-
-function f(v) {
-  return [
-          v[0],
-          Caml_option.undefined_to_opt(v[1])
-        ];
-}
-
-exports.Make = Make;
-exports.Int_arr = Int_arr;
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/functor_ffi.res b/jscomp/test/functor_ffi.res
deleted file mode 100644
index c5de0aa..0000000
--- a/jscomp/test/functor_ffi.res
+++ /dev/null
@@ -1,19 +0,0 @@
-module Make = (
-  S: {
-    type elt
-  },
-) => {
-  open S
-  type t<'a>
-  @get_index external unsafe_get: (t<elt>, int) => elt = ""
-
-  @get_index external get: (t<elt>, int) => Js.undefined<elt> = ""
-
-  let opt_get = (f, i) => \"@@"(Js.Undefined.toOption, get(f, i))
-}
-
-module Int_arr = Make({
-  type elt = int
-})
-
-let f = (v): (int, option<_>) => (Int_arr.unsafe_get(v, 0), Int_arr.opt_get(v, 1))
diff --git a/jscomp/test/functor_inst.js b/jscomp/test/functor_inst.js
deleted file mode 100644
index 9dcca23..0000000
--- a/jscomp/test/functor_inst.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function say(x, y) {
-  return x + y | 0;
-}
-
-exports.say = say;
-/* No side effect */
diff --git a/jscomp/test/functor_inst.res b/jscomp/test/functor_inst.res
deleted file mode 100644
index 9511547..0000000
--- a/jscomp/test/functor_inst.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type t
-
-let say = (x, y) => x + y
diff --git a/jscomp/test/functors.js b/jscomp/test/functors.js
deleted file mode 100644
index c4d2a5f..0000000
--- a/jscomp/test/functors.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function O(X) {
-  var cow = function (x) {
-    return Curry._1(X.foo, x);
-  };
-  var sheep = function (x) {
-    return 1 + Curry._1(X.foo, x) | 0;
-  };
-  return {
-          cow: cow,
-          sheep: sheep
-        };
-}
-
-function F(X, Y) {
-  var cow = function (x) {
-    return Curry._1(Y.foo, Curry._1(X.foo, x));
-  };
-  var sheep = function (x) {
-    return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0;
-  };
-  return {
-          cow: cow,
-          sheep: sheep
-        };
-}
-
-function F1(X, Y) {
-  var sheep = function (x) {
-    return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0;
-  };
-  return {
-          sheep: sheep
-        };
-}
-
-function F2(X, Y) {
-  var sheep = function (x) {
-    return 1 + Curry._1(Y.foo, Curry._1(X.foo, x)) | 0;
-  };
-  return {
-          sheep: sheep
-        };
-}
-
-var M = {
-  F: (function (funarg, funarg$1) {
-      var sheep = function (x) {
-        return 1 + Curry._1(funarg$1.foo, Curry._1(funarg.foo, x)) | 0;
-      };
-      return {
-              sheep: sheep
-            };
-    })
-};
-
-exports.O = O;
-exports.F = F;
-exports.F1 = F1;
-exports.F2 = F2;
-exports.M = M;
-/* No side effect */
diff --git a/jscomp/test/functors.res b/jscomp/test/functors.res
deleted file mode 100644
index 9a1058a..0000000
--- a/jscomp/test/functors.res
+++ /dev/null
@@ -1,46 +0,0 @@
-module type S = {
-  let foo: int => int
-}
-
-@inline(always)
-module O = (X: S) => {
-  let cow = x => X.foo(x)
-  let sheep = x => 1 + cow(x)
-}
-
-@inline(always)
-module F = (X: S, Y: S) => {
-  let cow = x => Y.foo(X.foo(x))
-  let sheep = x => 1 + cow(x)
-}
-
-module type S1 = {
-  let bar: int => int
-  let foo: int => int
-}
-
-module type T = {
-  let sheep: int => int
-}
-
-@inline(always)
-module F1 = (X: S, Y: S): T => {
-  let cow = x => Y.foo(X.foo(x))
-  let sheep = x => 1 + cow(x)
-}
-
-@inline(always)
-module F2: (S1, S1) => T = (X: S, Y: S) => {
-  let cow = x => Y.foo(X.foo(x))
-  let sheep = x => 1 + cow(x)
-}
-
-module M: {
-  module F: (X: S1, Y: S1) => T
-} = {
-  @inline(always)
-  module F = (X: S, Y: S) => {
-    let cow = x => Y.foo(X.foo(x))
-    let sheep = x => 1 + cow(x)
-  }
-}
diff --git a/jscomp/test/gbk.js b/jscomp/test/gbk.js
deleted file mode 100644
index 431b057..0000000
--- a/jscomp/test/gbk.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log("你好");
-
-console.log("你好");
-
-console.log("你好");
-
-console.log("你好你好");
-
-console.log("\\u4f60\\u597d");
-
-/*  Not a pure module */
diff --git a/jscomp/test/gbk.res b/jscomp/test/gbk.res
deleted file mode 100644
index 4274cba..0000000
--- a/jscomp/test/gbk.res
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  Js.log("你好")
-
-  Js.log(`你好`)
-
-  Js.log(%raw(`"你好"`))
-
-  Js.log((%raw(`"你好你好"`): string))
-
-  Js.log(%raw(`"\\u4f60\\u597d"`))
-}
diff --git a/jscomp/test/genlex_test.js b/jscomp/test/genlex_test.js
deleted file mode 100644
index 8809d35..0000000
--- a/jscomp/test/genlex_test.js
+++ /dev/null
@@ -1,122 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Genlex = require("../../lib/js/genlex.js");
-var Stream = require("../../lib/js/stream.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var lexer = Genlex.make_lexer({
-      hd: "+",
-      tl: {
-        hd: "-",
-        tl: {
-          hd: "*",
-          tl: {
-            hd: "/",
-            tl: {
-              hd: "let",
-              tl: {
-                hd: "=",
-                tl: {
-                  hd: "(",
-                  tl: {
-                    hd: ")",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    });
-
-function to_list(s) {
-  var _acc = /* [] */0;
-  while(true) {
-    var acc = _acc;
-    var v;
-    try {
-      v = Stream.next(s);
-    }
-    catch (raw_exn){
-      var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-      if (exn.RE_EXN_ID === Stream.Failure) {
-        return List.rev(acc);
-      }
-      throw exn;
-    }
-    _acc = {
-      hd: v,
-      tl: acc
-    };
-    continue ;
-  };
-}
-
-var suites_0 = [
-  "lexer_stream_genlex",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: {
-                hd: {
-                  TAG: "Int",
-                  _0: 3
-                },
-                tl: {
-                  hd: {
-                    TAG: "Kwd",
-                    _0: "("
-                  },
-                  tl: {
-                    hd: {
-                      TAG: "Int",
-                      _0: 3
-                    },
-                    tl: {
-                      hd: {
-                        TAG: "Kwd",
-                        _0: "+"
-                      },
-                      tl: {
-                        hd: {
-                          TAG: "Int",
-                          _0: 2
-                        },
-                        tl: {
-                          hd: {
-                            TAG: "Int",
-                            _0: -1
-                          },
-                          tl: {
-                            hd: {
-                              TAG: "Kwd",
-                              _0: ")"
-                            },
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              _1: to_list(lexer(Stream.of_string("3(3 + 2 -1)")))
-            };
-    })
-];
-
-var suites = {
-  hd: suites_0,
-  tl: /* [] */0
-};
-
-Mt.from_pair_suites("Genlex_test", suites);
-
-exports.lexer = lexer;
-exports.to_list = to_list;
-exports.suites = suites;
-/* lexer Not a pure module */
diff --git a/jscomp/test/genlex_test.res b/jscomp/test/genlex_test.res
deleted file mode 100644
index 74f3d7b..0000000
--- a/jscomp/test/genlex_test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-open Genlex
-
-let lexer = make_lexer(list{"+", "-", "*", "/", "let", "=", "(", ")"})
-
-let to_list = s => {
-  let rec aux = acc =>
-    switch Stream.next(s) {
-    | exception Stream.Failure => List.rev(acc)
-    | v => aux(list{v, ...acc})
-    }
-  aux(list{})
-}
-
-let suites = {
-  open Mt
-  list{
-    (
-      "lexer_stream_genlex",
-      _ => Eq(
-        list{Int(3), Kwd("("), Int(3), Kwd("+"), Int(2), Int(-1), Kwd(")")},
-        "3(3 + 2 -1)" |> Stream.of_string |> lexer |> to_list,
-      ),
-    ),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/gentTypeReTest.js b/jscomp/test/gentTypeReTest.js
deleted file mode 100644
index af4cc95..0000000
--- a/jscomp/test/gentTypeReTest.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var GentTypeReTestGen = require("./gentTypeReTest.gen");
-
-function f(prim) {
-  return GentTypeReTestGen.f(prim);
-}
-
-exports.f = f;
-/* ./gentTypeReTest.gen Not a pure module */
diff --git a/jscomp/test/gentTypeReTest.res b/jscomp/test/gentTypeReTest.res
deleted file mode 100644
index 94cd6cd..0000000
--- a/jscomp/test/gentTypeReTest.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@genType.import("hh")
-external f: int => int = "f"
diff --git a/jscomp/test/glob/glob_test_add.res b/jscomp/test/glob/glob_test_add.res
deleted file mode 100644
index 1997dd2..0000000
--- a/jscomp/test/glob/glob_test_add.res
+++ /dev/null
@@ -1 +0,0 @@
-let add = (x, y) => x + y
diff --git a/jscomp/test/glob/glob_test_u.res b/jscomp/test/glob/glob_test_u.res
deleted file mode 100644
index f7fc82a..0000000
--- a/jscomp/test/glob/glob_test_u.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = Glob_u.v
diff --git a/jscomp/test/glob/glob_u.res b/jscomp/test/glob/glob_u.res
deleted file mode 100644
index 55f1eb2..0000000
--- a/jscomp/test/glob/glob_u.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 3
diff --git a/jscomp/test/glob/glob_x.res b/jscomp/test/glob/glob_x.res
deleted file mode 100644
index 9d41822..0000000
--- a/jscomp/test/glob/glob_x.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 32
diff --git a/jscomp/test/glob/xlob_x.res b/jscomp/test/glob/xlob_x.res
deleted file mode 100644
index 55f1eb2..0000000
--- a/jscomp/test/glob/xlob_x.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 3
diff --git a/jscomp/test/global_exception_regression_test.js b/jscomp/test/global_exception_regression_test.js
deleted file mode 100644
index b97e697..0000000
--- a/jscomp/test/global_exception_regression_test.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var v = {
-  RE_EXN_ID: "Not_found"
-};
-
-var u = {
-  RE_EXN_ID: "Not_found"
-};
-
-var s = {
-  RE_EXN_ID: "End_of_file"
-};
-
-var suites_0 = [
-  "not_found_equal",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: u,
-              _1: v
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "not_found_not_equal_end_of_file",
-    (function (param) {
-        return {
-                TAG: "Neq",
-                _0: u,
-                _1: s
-              };
-      })
-  ],
-  tl: /* [] */0
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Global_exception_regression_test", suites);
-
-exports.v = v;
-exports.u = u;
-exports.s = s;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/global_exception_regression_test.res b/jscomp/test/global_exception_regression_test.res
deleted file mode 100644
index eeba1dd..0000000
--- a/jscomp/test/global_exception_regression_test.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let v = Not_found
-
-let u = Not_found
-let s = End_of_file
-let suites = {
-  open Mt
-  list{("not_found_equal", _ => Eq(u, v)), ("not_found_not_equal_end_of_file", _ => Neq(u, s))}
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/global_mangles.js b/jscomp/test/global_mangles.js
deleted file mode 100644
index 1430b84..0000000
--- a/jscomp/test/global_mangles.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var $$__dirname = 1;
-
-var $$__filename = 2;
-
-var $$clearImmediate = 3;
-
-var $$clearInterval = 4;
-
-var $$clearTimeout = 5;
-
-var $$console = 6;
-
-var $$exports = 7;
-
-var $$global = 8;
-
-var _module = 9;
-
-var $$process = 10;
-
-var $$require = 11;
-
-var $$setImmediate = 12;
-
-var $$setInterval = 13;
-
-var $$setTimeout = 14;
-
-exports.$$__dirname = $$__dirname;
-exports.$$__filename = $$__filename;
-exports.$$clearImmediate = $$clearImmediate;
-exports.$$clearInterval = $$clearInterval;
-exports.$$clearTimeout = $$clearTimeout;
-exports.$$console = $$console;
-exports.$$exports = $$exports;
-exports.$$global = $$global;
-exports._module = _module;
-exports.$$process = $$process;
-exports.$$require = $$require;
-exports.$$setImmediate = $$setImmediate;
-exports.$$setInterval = $$setInterval;
-exports.$$setTimeout = $$setTimeout;
-/* No side effect */
diff --git a/jscomp/test/global_mangles.res b/jscomp/test/global_mangles.res
deleted file mode 100644
index 102f8ed..0000000
--- a/jscomp/test/global_mangles.res
+++ /dev/null
@@ -1,18 +0,0 @@
-/* https://nodejs.org/api/globals.html */
-
-let (
-  __dirname,
-  __filename,
-  clearImmediate,
-  clearInterval,
-  clearTimeout,
-  console,
-  exports,
-  global,
-  _module,
-  process,
-  require,
-  setImmediate,
-  setInterval,
-  setTimeout,
-) = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)
diff --git a/jscomp/test/global_module_alias_test.js b/jscomp/test/global_module_alias_test.js
deleted file mode 100644
index 991a40f..0000000
--- a/jscomp/test/global_module_alias_test.js
+++ /dev/null
@@ -1,171 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var v = {
-  contents: 0
-};
-
-function Make(U) {
-  v.contents = v.contents + 1 | 0;
-  v.contents = v.contents + 1 | 0;
-  v.contents = v.contents + 1 | 0;
-  return U;
-}
-
-function f(param) {
-  v.contents = v.contents + 1 | 0;
-  v.contents = v.contents + 1 | 0;
-  v.contents = v.contents + 1 | 0;
-  v.contents = v.contents + 1 | 0;
-  v.contents = v.contents + 1 | 0;
-  v.contents = v.contents + 1 | 0;
-  return List;
-}
-
-eq("File \"global_module_alias_test.res\", line 48, characters 12-19", List.length({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }), 2);
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-v.contents = v.contents + 1 | 0;
-
-var H = List;
-
-eq("File \"global_module_alias_test.res\", line 52, characters 12-19", v.contents, 12);
-
-function g(param) {
-  return List.length({
-              hd: 1,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: {
-                    hd: 4,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            });
-}
-
-function xx(param) {
-  v.contents = v.contents + 1 | 0;
-  v.contents = v.contents + 1 | 0;
-  v.contents = v.contents + 1 | 0;
-  return List;
-}
-
-eq("File \"global_module_alias_test.res\", line 80, characters 12-19", g(), 4);
-
-var V = xx();
-
-eq("File \"global_module_alias_test.res\", line 84, characters 5-12", Curry._1(V.length, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }), 3);
-
-eq("File \"global_module_alias_test.res\", line 85, characters 5-12", v.contents, 15);
-
-var H$1 = f();
-
-eq("File \"global_module_alias_test.res\", line 87, characters 5-12", Curry._1(H$1.length, {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }), 2);
-
-eq("File \"global_module_alias_test.res\", line 88, characters 5-12", v.contents, 21);
-
-Mt.from_pair_suites("Global_module_alias_test", suites.contents);
-
-var A;
-
-var B;
-
-var C;
-
-var D;
-
-var E;
-
-var F;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.A = A;
-exports.B = B;
-exports.C = C;
-exports.D = D;
-exports.E = E;
-exports.F = F;
-exports.v = v;
-exports.Make = Make;
-exports.f = f;
-exports.H = H;
-exports.g = g;
-exports.xx = xx;
-/*  Not a pure module */
diff --git a/jscomp/test/global_module_alias_test.res b/jscomp/test/global_module_alias_test.res
deleted file mode 100644
index b2339fa..0000000
--- a/jscomp/test/global_module_alias_test.res
+++ /dev/null
@@ -1,91 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-module A = List
-
-module B = A
-
-module C = B
-
-module D = C
-
-module E = D
-
-module F = E
-
-/* module alias is reolved 
-   B -> 0, any point to B will be ponited to A after type checking
-*/
-module type S = module type of List
-
-let v = ref(0)
-
-module Make = (U: S) => {
-  let () = {
-    incr(v)
-    incr(v)
-    incr(v)
-  }
-  include U
-}
-
-let f = () => {
-  let () = {
-    incr(v)
-    incr(v)
-    incr(v)
-  }
-  module G = F /* local module is not module alias */
-  module H = G
-  module(Make(H): S)
-}
-
-let () = eq(__LOC__, C.length(list{1, 2}), 2)
-
-module H = Make(Make(Make(Make(F))))
-
-let () = eq(__LOC__, v.contents, 12)
-
-let g = () => {
-  module A0 = List
-  /* since module alias compiled to no code,  
-     so whenever 
-     {[ let module A0 = Global_module ]}
-     happens we should just unpack it 
- */
-  module A1 = A0
-  module A2 = A1
-  module A3 = A2
-  A3.length(list{1, 2, 3, 4})
-}
-
-let xx = () => {
-  module A0 = List
-  /* since module alias compiled to no code,  
-     so whenever 
-     {[ let module A0 = Global_module ]}
-     happens we should just unpack it 
- */
-  module A1 = A0
-  module A2 = A1
-  module A3 = A2
-  module(Make(A3): S)
-}
-
-let () = eq(__LOC__, g(), 4)
-
-let () = {
-  module V = unpack(xx(): S) /* xx () not inlined in 4.06 */
-  eq(__LOC__, V.length(list{1, 2, 3}), 3)
-  eq(__LOC__, v.contents, 15)
-  module H = unpack(f(): S)
-  eq(__LOC__, H.length(list{1, 2}), 2)
-  eq(__LOC__, v.contents, 21)
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/google_closure_test.js b/jscomp/test/google_closure_test.js
deleted file mode 100644
index 42dd98b..0000000
--- a/jscomp/test/google_closure_test.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Test_google_closure = require("./test_google_closure.js");
-
-Mt.from_pair_suites("Closure", {
-      hd: [
-        "partial",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: [
-                      Test_google_closure.a,
-                      Test_google_closure.b,
-                      Test_google_closure.c
-                    ],
-                    _1: [
-                      "3",
-                      101,
-                      [
-                        1,
-                        2
-                      ]
-                    ]
-                  };
-          })
-      ],
-      tl: /* [] */0
-    });
-
-/*  Not a pure module */
diff --git a/jscomp/test/google_closure_test.res b/jscomp/test/google_closure_test.res
deleted file mode 100644
index 38e2e63..0000000
--- a/jscomp/test/google_closure_test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-/* module Mt = Mock_mt */
-
-Mt.from_pair_suites(
-  "Closure",
-  {
-    open Mt
-    list{
-      (
-        "partial",
-        _ => Eq(
-          {
-            open Test_google_closure
-            (a, b, c)
-          },
-          ("3", 101, [1, 2]),
-        ),
-      ),
-    }
-  },
-)
diff --git a/jscomp/test/gpr496_test.js b/jscomp/test/gpr496_test.js
deleted file mode 100644
index 5931bf9..0000000
--- a/jscomp/test/gpr496_test.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Curry = require("../../lib/js/curry.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var expected = [
-  false,
-  false,
-  true,
-  true,
-  -1,
-  1,
-  0,
-  0
-];
-
-var expected2 = [
-  false,
-  false,
-  true,
-  true,
-  -1,
-  1,
-  0,
-  0
-];
-
-var u = [
-  false,
-  false,
-  true,
-  true,
-  -1,
-  1,
-  0,
-  0
-];
-
-eq("File \"gpr496_test.res\", line 32, characters 12-19", expected, u);
-
-eq("File \"gpr496_test.res\", line 34, characters 12-19", expected, expected2);
-
-function ff(x, y) {
-  return Caml.bool_min(x, Curry._1(y, undefined));
-}
-
-eq("File \"gpr496_test.res\", line 37, characters 12-19", true < false ? true : false, false);
-
-Mt.from_pair_suites("Gpr496_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.expected = expected;
-exports.expected2 = expected2;
-exports.u = u;
-exports.ff = ff;
-/* expected Not a pure module */
diff --git a/jscomp/test/gpr496_test.res b/jscomp/test/gpr496_test.res
deleted file mode 100644
index 7a3273e..0000000
--- a/jscomp/test/gpr496_test.res
+++ /dev/null
@@ -1,39 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let expected = (
-  true == false,
-  false == true,
-  false == false,
-  true == true,
-  Pervasives.compare(false, true),
-  Pervasives.compare(true, false),
-  Pervasives.compare(false, false),
-  Pervasives.compare(true, true),
-)
-
-let expected2 = (false, false, true, true, -1, 1, 0, 0)
-let u = (
-  true == false,
-  false == true,
-  false == false,
-  true == true,
-  Pervasives.compare(false, true),
-  Pervasives.compare(true, false),
-  Pervasives.compare(false, false),
-  Pervasives.compare(true, true),
-)
-
-let () = eq(__LOC__, expected, u)
-
-let () = eq(__LOC__, expected, expected2)
-
-let ff = (x: bool, y) => min(x, y())
-let () = eq(__LOC__, min(true, false), false)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1072.js b/jscomp/test/gpr_1072.js
deleted file mode 100644
index 157ac2f..0000000
--- a/jscomp/test/gpr_1072.js
+++ /dev/null
@@ -1,192 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var u = {
-  y: 3
-};
-
-var v_ice_cream3_0 = {
-  flavor: "vanilla",
-  num: 3
-};
-
-var v_ice_cream3_1 = {
-  hd: {
-    flavor: "x",
-    num: 3
-  },
-  tl: {
-    hd: {
-      flavor: "vanilla",
-      num: 3
-    },
-    tl: /* [] */0
-  }
-};
-
-var v_ice_cream3 = {
-  hd: v_ice_cream3_0,
-  tl: v_ice_cream3_1
-};
-
-var v_ice_cream4_0 = {
-  flavor: "vanilla",
-  num: 3
-};
-
-var v_ice_cream4_1 = {
-  hd: {
-    flavor: "x",
-    num: 3
-  },
-  tl: /* [] */0
-};
-
-var v_ice_cream4 = {
-  hd: v_ice_cream4_0,
-  tl: v_ice_cream4_1
-};
-
-var vv = {
-  x__ignore: 3
-};
-
-var int_expect = {
-  x__ignore: 0
-};
-
-var int_expect2 = {
-  x__ignore: 0
-};
-
-var int_expects_0 = {};
-
-var int_expects_1 = {
-  hd: {
-    x__ignore: 2
-  },
-  tl: {
-    hd: {
-      x__ignore: 3
-    },
-    tl: /* [] */0
-  }
-};
-
-var int_expects = {
-  hd: int_expects_0,
-  tl: int_expects_1
-};
-
-var mk_ice = {
-  flavour: "vanilla",
-  num: 3
-};
-
-var my_ice2 = {
-  flavour: "vanilla",
-  num: 1
-};
-
-var my_ice3 = {
-  num: 2
-};
-
-var v_mk4 = {
-  y: 3
-};
-
-var v_mk5 = {
-  x: undefined,
-  y: 3
-};
-
-var v_mk6 = {
-  y: 3
-};
-
-var v_mk6_1 = {
-  x: undefined,
-  y: 3
-};
-
-var mk_u = {
-  x__ignore: 0
-};
-
-var v_mk7_0 = {
-  y: 3
-};
-
-var v_mk7_1 = {
-  hd: {
-    y: 2
-  },
-  tl: {
-    hd: {
-      y: 2
-    },
-    tl: /* [] */0
-  }
-};
-
-var v_mk7 = {
-  hd: v_mk7_0,
-  tl: v_mk7_1
-};
-
-again("a", 3);
-
-again(undefined, 3);
-
-again(undefined, 3);
-
-again(undefined, 3);
-
-again2("a", 3);
-
-again3(3);
-
-again3(2);
-
-var side_effect = {
-  contents: 0
-};
-
-again4(undefined, undefined, 141);
-
-again4(undefined, undefined, 142);
-
-again4(undefined, undefined, 143);
-
-again4(undefined, undefined, 144);
-
-again4(undefined, undefined, 145);
-
-again4((side_effect.contents = side_effect.contents + 1 | 0, undefined), undefined, 152);
-
-again4((side_effect.contents = side_effect.contents + 1 | 0, undefined), (side_effect.contents = side_effect.contents - 1 | 0, undefined), 164);
-
-again4(undefined, (side_effect.contents = side_effect.contents - 1 | 0, undefined), 172);
-
-again4((side_effect.contents = side_effect.contents + 1 | 0, undefined), undefined, 175);
-
-exports.u = u;
-exports.v_ice_cream3 = v_ice_cream3;
-exports.v_ice_cream4 = v_ice_cream4;
-exports.vv = vv;
-exports.int_expect = int_expect;
-exports.int_expect2 = int_expect2;
-exports.int_expects = int_expects;
-exports.mk_ice = mk_ice;
-exports.my_ice2 = my_ice2;
-exports.my_ice3 = my_ice3;
-exports.v_mk4 = v_mk4;
-exports.v_mk5 = v_mk5;
-exports.v_mk6 = v_mk6;
-exports.v_mk6_1 = v_mk6_1;
-exports.mk_u = mk_u;
-exports.v_mk7 = v_mk7;
-exports.side_effect = side_effect;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_1072.res b/jscomp/test/gpr_1072.res
deleted file mode 100644
index 068d006..0000000
--- a/jscomp/test/gpr_1072.res
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-external ice_cream:
-    ?flavor:([`vanilla | `chocolate ] [@bs.string]) -> 
-    num:int ->
-    unit -> 
-    _ =  ""
-[@@bs.obj]
-
-
-let my_scoop = ice_cream ~flavor:`vanilla ~num:3 ()
-*/
-/*
-external ice_cream_2:
-    flavor:([`vanilla | `chocolate ] [@bs.string]) -> 
-    num:int ->
-    unit -> 
-    _ =  ""
-[@@bs.obj]
-
-let my_scoop2 = ice_cream_2 ~flavor:`vanilla ~num:3 ()
-*/
-
-type opt_test = {"x": Js.Undefined.t<int>, "y": Js.Undefined.t<int>}
-@obj external opt_test: (~x: int=?, ~y: int=?, unit) => _ = ""
-
-let u: opt_test = opt_test(~y=3, ())
-
-@obj
-external ice_cream3: (~flavor: @string [#vanilla | @as("x") #chocolate]=?, ~num: int, unit) => _ =
-  "" /* TODO: warn when [_] happens in any place except `bs.obj` */
-type ice_cream3_expect = {"flavor": Js.undefined<string>, "num": int}
-
-let v_ice_cream3: list<ice_cream3_expect> = list{
-  ice_cream3(~flavor=#vanilla, ~num=3, ()),
-  ice_cream3(~flavor=#chocolate, ~num=3, ()),
-  ice_cream3(~flavor=#vanilla, ~num=3, ()),
-}
-
-type u
-@obj
-external ice_cream4: (~flavor: @string [#vanilla | @as("x") #chocolate]=?, ~num: int, unit) => u =
-  ""
-
-let v_ice_cream4: list<u> = list{
-  ice_cream4(~flavor=#vanilla, ~num=3, ()),
-  ice_cream4(~flavor=#chocolate, ~num=3, ()),
-}
-
-@obj external label_test: (~x__ignore: int, unit) => _ = ""
-
-/** here the type label should be the same, 
-    when get the object, it will be mangled */    
-type label_expect = {"x__ignore": int}
-
-let vv: label_expect = label_test(~x__ignore=3, ())
-
-@obj external int_test: (~x__ignore: @int [#a | #b], unit) => _ = ""
-/* translate [`a] to 0, [`b] to 1 */
-type int_expect = {"x__ignore": int}
-
-let int_expect: int_expect = int_test(~x__ignore=#a, ())
-
-@obj external int_test2: (~x__ignore: @int [#a | #b]=?, unit) => _ = ""
-
-type int_expect2 = {"x__ignore": Js.Undefined.t<int>}
-
-let int_expect2: int_expect2 = int_test2(~x__ignore=#a, ())
-
-@obj external int_test3: (~x__ignore: @int [@as(2) #a | #b]=?, unit) => _ = ""
-
-let int_expects: list<int_expect2> = list{
-  int_test3(),
-  int_test3(~x__ignore=#a, ()),
-  int_test3(~x__ignore=#b, ()),
-}
-
-type flavor = [#vanilla | #chocolate]
-@obj external ice: (~flavour: flavor, ~num: int, unit) => _ = ""
-
-let mk_ice: {"flavour": flavor, "num": int} = ice(~flavour=#vanilla, ~num=3, ())
-
-@obj external ice2: (~flavour: flavor=?, ~num: int, unit) => _ = ""
-
-let my_ice2: {"flavour": Js.Undefined.t<flavor>, "num": int} = ice2(~flavour=#vanilla, ~num=1, ())
-
-let my_ice3: {"flavour": Js.Undefined.t<flavor>, "num": int} = ice2(~num=2, ())
-
-@obj external mk4: (~x__ignore: @ignore [#a | #b], ~y: int, unit) => _ = ""
-
-let v_mk4: {"y": int} = mk4(~x__ignore=#a, ~y=3, ())
-
-@obj external mk5: (~x: unit, ~y: int, unit) => _ = ""
-
-let v_mk5: {"x": unit, "y": int} = mk5(~x=(), ~y=3, ())
-
-@obj external mk6: (~x: unit=?, ~y: int, unit) => _ = ""
-
-let v_mk6: {"x": Js.Undefined.t<unit>, "y": int} = mk6(~y=3, ())
-
-let v_mk6_1 = mk6(~x=(), ~y=3, ())
-type mk
-@obj external mk: (~x__ignore: @int [#a | #b]=?, unit) => _ = ""
-
-/* TODO: fix me */
-let mk_u: {"x__ignore": Js.Undefined.t<int>} = mk(~x__ignore=#a, ())
-
-@obj external mk7: (~x: @ignore [#a | #b]=?, ~y: int, unit) => _ = ""
-
-let v_mk7: list<{"y": int}> = list{mk7(~x=#a, ~y=3, ()), mk7(~x=#b, ~y=2, ()), mk7(~y=2, ())}
-
-@val external again: (~x__ignore: [#a | #b]=?, int) => unit = "again"
-
-let () = {
-  again(~x__ignore=#a, 3)
-  again(3)
-  again(~x__ignore=?None, 3)
-  again(
-    ~x__ignore=?{
-      ignore(3)
-      None
-    },
-    3,
-  )
-}
-
-@val external again2: (~x__ignore: [#a | #b], int) => unit = "again2"
-
-let () = again2(~x__ignore=#a, 3)
-
-@val external again3: (~x__ignore: @ignore [#a | #b], int) => unit = "again3"
-
-let () = {
-  again3(~x__ignore=#a, 3)
-  again3(~x__ignore=#b, 2)
-}
-
-@val external again4: (~x: unit=?, ~y: unit, int, unit) => unit = "again4"
-
-let side_effect = ref(0)
-let () = {
-  again4(~y=(), __LINE__, ())
-  again4(~x=?None, ~y=(), __LINE__, ())
-  again4(~x=?Some(), ~y=(), __LINE__, ())
-  again4(~x=(), ~y=(), __LINE__, ())
-  again4(~y=(), __LINE__, ())
-  again4(
-    ~x={
-      incr(side_effect)
-      ()
-    },
-    ~y=(),
-    __LINE__,
-    (),
-  )
-  again4(
-    ~x={
-      incr(side_effect)
-      ()
-    },
-    ~y={
-      decr(side_effect)
-      ()
-    },
-    __LINE__,
-    (),
-  )
-  again4(
-    ~y={
-      decr(side_effect)
-      ()
-    },
-    __LINE__,
-    (),
-  )
-  again4(~x=incr(side_effect), ~y=(), __LINE__, ())
-}
-
-/* external again5 : ?x__ignore:([`a of unit -> int | `b of string -> int ] [@bs.string]) */
-/* -> int -> unit = "" [@@bs.val] */
-
-/* let v = again5 3 */
diff --git a/jscomp/test/gpr_1072_reg.js b/jscomp/test/gpr_1072_reg.js
deleted file mode 100644
index 34098fd..0000000
--- a/jscomp/test/gpr_1072_reg.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v1 = {
-  localeMatcher: "best fit",
-  formatMatcher: "basic",
-  day: "2-digit",
-  timeZoneName: "short"
-};
-
-exports.v1 = v1;
-/* No side effect */
diff --git a/jscomp/test/gpr_1072_reg.res b/jscomp/test/gpr_1072_reg.res
deleted file mode 100644
index 1bd34fe..0000000
--- a/jscomp/test/gpr_1072_reg.res
+++ /dev/null
@@ -1,76 +0,0 @@
-type t
-
-@obj
-external make: (
-  ~localeMatcher: @string [#lookup | @as("best fit") #best_fit]=?,
-  ~timeZone: string=?,
-  ~hour12: bool=?,
-  ~formatMatcher: @string [#basic | @as("best fit") #best_fit]=?,
-  ~weekday: [#narrow | #short | #long]=?,
-  ~era: [#narrow | #short | #long]=?,
-  ~year: @string [#numeric | @as("2-digit") #two_digit]=?,
-  ~month: @string
-  [
-    | #narrow
-    | #short
-    | #long
-    | #numeric
-    | @as("2-digit") #two_digit
-  ]=?,
-  ~day: @string [#numeric | @as("2-digit") #two_digit]=?,
-  ~hour: @string [#numeric | @as("2-digit") #two_digit]=?,
-  ~minute: @string [#numeric | @as("2-digit") #two_digit]=?,
-  ~second: @string [#numeric | @as("2-digit") #two_digit]=?,
-  ~timeZoneName: [#short | #long]=?,
-  unit,
-) => t = ""
-
-let v1 = make(
-  ~localeMatcher=#best_fit,
-  ~formatMatcher=#basic,
-  ~day=#two_digit,
-  ~timeZoneName=#short,
-  (),
-)
-
-/* In the future we might allow below cases , issues are [`num] maybe escaped
-    we need prevent its escaping
-
-  external make2 :
-    ?localeMatcher:
-      ([`lookup | `best_fit [@bs.as \"best fit\"]] [@bs.string]) ->
-
-    ?timeZone:string ->
-    ?hour12:bool ->
-    ?formatMatcher:
-      ([`basic | `best_fit [@bs.as \"best fit\"]] [@bs.string]) ->
-
-    ?weekday:([`narrow | `short | `long] [@bs.string]) ->
-    ?era:([`narrow | `short | `long] [@bs.string]) ->
-    ?year:([`numeric | `two_digit [@bs.as \"2-digit\"]] [@bs.string]) ->
-    ?month:
-      ([`narrow |
-        `short |
-        `long |
-        `numeric |
-        `two_digit [@bs.as \"2-digit\"]] [@bs.string]) ->
-
-    ?day:(([`numeric | `two_digit [@bs.as \"2-digit\"]] [@bs.string]) as 'num) ->
-    ?hour:('num) ->
-    ?minute:('num) ->
-    ?second:('num) ->
-    ?timeZoneName:([`short | `long] [@bs.string]) ->
-    unit ->
-    t =
-    \"\" [@@bs.obj]
-
-
-let v2 =
-     make2 
-    ~localeMatcher:`best_fit     
-    ~formatMatcher:`basic
-    ~day:`two_digit
-    ~timeZoneName:`short 
-    ~hour:`two_digit
-    ()
-*/
diff --git a/jscomp/test/gpr_1150.js b/jscomp/test/gpr_1150.js
deleted file mode 100644
index 034cd50..0000000
--- a/jscomp/test/gpr_1150.js
+++ /dev/null
@@ -1,249 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(children) {
-  if (!children) {
-    return [];
-  }
-  var children$1 = children.tl;
-  var a0 = children.hd;
-  if (!children$1) {
-    return [a0];
-  }
-  var children$2 = children$1.tl;
-  var a1 = children$1.hd;
-  if (!children$2) {
-    return [
-            a0,
-            a1
-          ];
-  }
-  var children$3 = children$2.tl;
-  var a2 = children$2.hd;
-  if (!children$3) {
-    return [
-            a0,
-            a1,
-            a2
-          ];
-  }
-  var children$4 = children$3.tl;
-  var a3 = children$3.hd;
-  if (!children$4) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3
-          ];
-  }
-  var children$5 = children$4.tl;
-  var a4 = children$4.hd;
-  if (!children$5) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4
-          ];
-  }
-  var children$6 = children$5.tl;
-  var a5 = children$5.hd;
-  if (!children$6) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5
-          ];
-  }
-  var children$7 = children$6.tl;
-  var a6 = children$6.hd;
-  if (!children$7) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6
-          ];
-  }
-  var children$8 = children$7.tl;
-  var a7 = children$7.hd;
-  if (!children$8) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7
-          ];
-  }
-  var children$9 = children$8.tl;
-  var a8 = children$8.hd;
-  if (!children$9) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8
-          ];
-  }
-  var children$10 = children$9.tl;
-  var a9 = children$9.hd;
-  if (!children$10) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9
-          ];
-  }
-  var children$11 = children$10.tl;
-  var a10 = children$10.hd;
-  if (!children$11) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9,
-            a10
-          ];
-  }
-  var children$12 = children$11.tl;
-  var a11 = children$11.hd;
-  if (!children$12) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9,
-            a10,
-            a11
-          ];
-  }
-  var children$13 = children$12.tl;
-  var a12 = children$12.hd;
-  if (!children$13) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9,
-            a10,
-            a11,
-            a12
-          ];
-  }
-  var children$14 = children$13.tl;
-  var a13 = children$13.hd;
-  if (!children$14) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9,
-            a10,
-            a11,
-            a12,
-            a13
-          ];
-  }
-  var children$15 = children$14.tl;
-  var a14 = children$14.hd;
-  if (!children$15) {
-    return [
-            a0,
-            a1,
-            a2,
-            a3,
-            a4,
-            a5,
-            a6,
-            a7,
-            a8,
-            a9,
-            a10,
-            a11,
-            a12,
-            a13,
-            a14
-          ];
-  }
-  if (children$15.tl) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "gpr_1150.res",
-            100,
-            62
-          ],
-          Error: new Error()
-        };
-  }
-  return [
-          a0,
-          a1,
-          a2,
-          a3,
-          a4,
-          a5,
-          a6,
-          a7,
-          a8,
-          a9,
-          a10,
-          a11,
-          a12,
-          a13,
-          a14,
-          children$15.hd
-        ];
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/gpr_1150.res b/jscomp/test/gpr_1150.res
deleted file mode 100644
index 5b6b007..0000000
--- a/jscomp/test/gpr_1150.res
+++ /dev/null
@@ -1,201 +0,0 @@
-let f = children =>
-  switch children {
-  | list{} => []
-  | list{a0, ...children} =>
-    switch children {
-    | list{} => [a0]
-    | list{a1, ...children} =>
-      switch children {
-      | list{} => [a0, a1]
-      | list{a2, ...children} =>
-        switch children {
-        | list{} => [a0, a1, a2]
-        | list{a3, ...children} =>
-          switch children {
-          | list{} => [a0, a1, a2, a3]
-          | list{a4, ...children} =>
-            switch children {
-            | list{} => [a0, a1, a2, a3, a4]
-            | list{a5, ...children} =>
-              switch children {
-              | list{} => [a0, a1, a2, a3, a4, a5]
-              | list{a6, ...children} =>
-                switch children {
-                | list{} => [a0, a1, a2, a3, a4, a5, a6]
-                | list{a7, ...children} =>
-                  switch children {
-                  | list{} => [a0, a1, a2, a3, a4, a5, a6, a7]
-                  | list{a8, ...children} =>
-                    switch children {
-                    | list{} => [a0, a1, a2, a3, a4, a5, a6, a7, a8]
-                    | list{a9, ...children} =>
-                      switch children {
-                      | list{} => [a0, a1, a2, a3, a4, a5, a6, a7, a8, a9]
-                      | list{a10, ...children} =>
-                        switch children {
-                        | list{} => [a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10]
-                        | list{a11, ...children} =>
-                          switch children {
-                          | list{} => [a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11]
-                          | list{a12, ...children} =>
-                            switch children {
-                            | list{} => [a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12]
-                            | list{a13, ...children} =>
-                              switch children {
-                              | list{} => [
-                                  a0,
-                                  a1,
-                                  a2,
-                                  a3,
-                                  a4,
-                                  a5,
-                                  a6,
-                                  a7,
-                                  a8,
-                                  a9,
-                                  a10,
-                                  a11,
-                                  a12,
-                                  a13,
-                                ]
-                              | list{a14, ...children} =>
-                                switch children {
-                                | list{} => [
-                                    a0,
-                                    a1,
-                                    a2,
-                                    a3,
-                                    a4,
-                                    a5,
-                                    a6,
-                                    a7,
-                                    a8,
-                                    a9,
-                                    a10,
-                                    a11,
-                                    a12,
-                                    a13,
-                                    a14,
-                                  ]
-                                | list{a15, ...children} =>
-                                  switch children {
-                                  | list{} => [
-                                      a0,
-                                      a1,
-                                      a2,
-                                      a3,
-                                      a4,
-                                      a5,
-                                      a6,
-                                      a7,
-                                      a8,
-                                      a9,
-                                      a10,
-                                      a11,
-                                      a12,
-                                      a13,
-                                      a14,
-                                      a15,
-                                    ]
-                                  | list{a16, ...children} => assert(false)
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-/*
-                                    match children with 
-                                    | [] ->   [|a0;a1;a2;a3;a4;a5;a6;a7;a8;a9;a10;a11;a12;a13;a14;a15;a16|]
-                                    | a17::children -> 
-                                    match children with 
-                                    | [] ->   [|a0;a1;a2;a3;a4;a5;a6;a7;a8;a9;a10;a11;a12;a13;a14;a15;a16;a17|]
-                                    | a18::children -> 
-                                        match children with 
-                                        | [] ->   [|a0;a1;a2;a3;a4;a5;a6;a7;a8;a9;a10;a11;a12;a13;a14;a15;a16;a17;a18|]
-                                        | a19::children -> 
-                                        match children with 
-                                        | [] ->   [|a0;a1;a2;a3;a4;a5;a6;a7;a8;a9;a10;a11;a12;a13;a14;a15;a16;a17;a18;a19|]
-                                        | _ -> assert false 
-
-*/
-
-/* This function seems to trigger quadratice behavior with the length of [children] 
-                                          memory consumption is okay
-                                          17 -> 4s
-                                          18 -> 9s
-                                          19 -> 19s
-                                          20 -> 40s
-                                      */
-/*
-let f children = 
-  match children with
-  | [] ->   [||]
-  | a::[] ->   [|a|]
-  | a::b::[] ->   [|a;b|]
-  | a::b::c::[] ->   [|a;b;c|]
-  | a::b::c::d::[] ->
-        [|a;b;c;d|]
-  | a::b::c::d::e::[] ->
-        [|a;b;c;d;e|]
-  | a::b::c::d::e::f::[] ->
-        [|a;b;c;d;e;f|]
-  | a::b::c::d::e::f::g::[] ->
-        [|a;b;c;d;e;f;g|]
-  | a::b::c::d::e::f::g::h::[] ->
-        [|a;b;c;d;e;f;g;h|]
-  | a::b::c::d::e::f::g::h::i::[] ->
-        [|a;b;c;d;e;f;g;h;i|]
-  | a::b::c::d::e::f::g::h::i::j::[] ->
-        [|a;b;c;d;e;f;g;h;i;j|]
-  | a::b::c::d::e::f::g::h::i::j::k::[] ->
-        [|a;b;c;d;e;f;g;h;i;j;k|]
-  | a::b::c::d::e::f::g::h::i::j::k::l::[] ->
-       
-        [|a;b;c;d;e;f;g;h;i;j;k;l|]
-  | a::b::c::d::e::f::g::h::i::j::k::l::m::[] ->
-       
-        [|a;b;c;d;e;f;g;h;i;j;k;l;m|]
-  | a::b::c::d::e::f::g::h::i::j::k::l::m::n::[] ->
-       
-        [|a;b;c;d;e;f;g;h;i;j;k;l;m;n|]
-  | a::b::c::d::e::f::g::h::i::j::k::l::m::n::o::[] ->
-       
-        [|a;b;c;d;e;f;g;h;i;j;k;l;m;n;o|]
-  | a::b::c::d::e::f::g::h::i::j::k::l::m::n::o::p::[] ->
-       
-        [|a;b;c;d;e;f;g;h;i;j;k;l;m;n;o;p|]
-  | a::b::c::d::e::f::g::h::i::j::k::l::m::n::o::p::q::[] ->
-       
-        [|a;b;c;d;e;f;g;h;i;j;k;l;m;n;o;p;q|] 
-  | a0::a1::a2::a3::a4::a5::a6::a7::a8::a9::a10::a11::a12::a13::a14::a15::a16::a17::[] ->
-       
-        [|a0;a1;a2;a3;a4;a5;a6;a7;a8;a9;a10;a11;a12;a13;a14;a15;a16;a17|] 
-  | a0::a1::a2::a3::a4::a5::a6::a7::a8::a9::a10::a11::a12::a13::a14::a15::a16::a17::a18::[] ->
-       
-        [|a0;a1;a2;a3;a4;a5;a6;a7;a8;a9;a10;a11;a12;a13;a14;a15;a16;a17;a18|] 
-  | a0::a1::a2::a3::a4::a5::a6::a7::a8::a9::a10::a11::a12::a13::a14::a15::a16::a17::a18::a19::[] ->
-       
-        [|a0;a1;a2;a3;a4;a5;a6;a7;a8;a9;a10;a11;a12;a13;a14;a15;a16;a17;a18;a19|] 
-
-  | _ ->
-      let msg =
-        "Reason allows up to 17 static children (but dynamic children in an array can be unlimited in size); You have "
-          ^
-          ((string_of_int (List.length children)) ^
-             ", please put them in an array and assign key to the elements. Sorry for the inconvenience!") in
-      raise ((Invalid_argument (msg))[@explicit_arity ])
-
-*/
diff --git a/jscomp/test/gpr_1154_test.js b/jscomp/test/gpr_1154_test.js
deleted file mode 100644
index fb4ee3e..0000000
--- a/jscomp/test/gpr_1154_test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Int64 = require("../../lib/js/int64.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(x) {
-  console.log("f");
-  return x;
-}
-
-function g(x) {
-  return Caml_int64.or_(x, (console.log("f"), x));
-}
-
-var v = {
-  contents: 0
-};
-
-function f2(x) {
-  v.contents = v.contents + 1 | 0;
-  return x;
-}
-
-function g2(x) {
-  return Caml_int64.or_(x, (v.contents = v.contents + 1 | 0, x));
-}
-
-var a = Caml_int64.or_(Int64.one, (v.contents = v.contents + 1 | 0, Int64.one));
-
-eq("File \"gpr_1154_test.res\", line 28, characters 12-19", v.contents, 1);
-
-Mt.from_pair_suites("Gpr_1154_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.g = g;
-exports.v = v;
-exports.f2 = f2;
-exports.g2 = g2;
-exports.a = a;
-/* a Not a pure module */
diff --git a/jscomp/test/gpr_1154_test.res b/jscomp/test/gpr_1154_test.res
deleted file mode 100644
index e1821b8..0000000
--- a/jscomp/test/gpr_1154_test.res
+++ /dev/null
@@ -1,29 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let f = x => {
-  print_string("f")
-  x
-}
-let g = x => Int64.logor(x, f(x))
-
-let v = ref(0)
-let f2 = x => {
-  incr(v)
-  x
-}
-
-let g2 = x => Int64.logor(x, f2(x))
-
-/* TODO: should be shared for small integers,
-    also we should not inline it (more allocations here)
- */
-let a = g2 /* 1L */(Int64.one)
-
-let () = eq(__LOC__, v.contents, 1)
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1170.js b/jscomp/test/gpr_1170.js
deleted file mode 100644
index 17d7753..0000000
--- a/jscomp/test/gpr_1170.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(resp) {
-  resp.statusCode = 200;
-  resp.hi = "hi";
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/gpr_1170.res b/jscomp/test/gpr_1170.res
deleted file mode 100644
index 42ac38e..0000000
--- a/jscomp/test/gpr_1170.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type resp
-@set external set_okay: (resp, @as(200) _) => unit = "statusCode"
-
-@set external set_hi: (resp, @as("hi") _) => unit = "hi"
-
-let f = resp => {
-  set_okay(resp)
-  set_hi(resp)
-}
diff --git a/jscomp/test/gpr_1240_missing_unbox.js b/jscomp/test/gpr_1240_missing_unbox.js
deleted file mode 100644
index 241dcb3..0000000
--- a/jscomp/test/gpr_1240_missing_unbox.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x, y) {
-  var x$1 = x;
-  var y$1 = y;
-  return [
-          x$1,
-          y$1
-        ];
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/gpr_1240_missing_unbox.res b/jscomp/test/gpr_1240_missing_unbox.res
deleted file mode 100644
index c95ec40..0000000
--- a/jscomp/test/gpr_1240_missing_unbox.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let f = (x, y) => {
-  let (x, y) = (ref(x), ref(y))
-  (x.contents, y.contents)
-}
diff --git a/jscomp/test/gpr_1245_test.js b/jscomp/test/gpr_1245_test.js
deleted file mode 100644
index 79ff9d7..0000000
--- a/jscomp/test/gpr_1245_test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var x = {
-  contents: 1
-};
-
-var y = {
-  contents: 2
-};
-
-function f(param) {
-  var a = {
-    contents: param[0]
-  };
-  var b = {
-    contents: param[1]
-  };
-  console.log(a, b);
-}
-
-function g(param) {
-  return 3;
-}
-
-function a0(f) {
-  var u = Curry._1(f, undefined);
-  if (u !== null) {
-    console.log(u);
-    console.log(u);
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-function a1(f) {
-  var E = /* @__PURE__ */Caml_exceptions.create("E");
-  try {
-    return Curry._1(f, undefined);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === E) {
-      return 1;
-    }
-    throw exn;
-  }
-}
-
-var a = 1;
-
-var b = 2;
-
-exports.a = a;
-exports.b = b;
-exports.x = x;
-exports.y = y;
-exports.f = f;
-exports.g = g;
-exports.a0 = a0;
-exports.a1 = a1;
-/* No side effect */
diff --git a/jscomp/test/gpr_1245_test.res b/jscomp/test/gpr_1245_test.res
deleted file mode 100644
index db1c15e..0000000
--- a/jscomp/test/gpr_1245_test.res
+++ /dev/null
@@ -1,52 +0,0 @@
-let (a, b) = (1, 2)
-
-let (x, y) = (ref(a), ref(b))
-
-let f = ((c, d)) => {
-  let (a, b) = (ref(c), ref(d))
-  Js.log2(a, b)
-}
-
-/* escape analysis to avoid allocation
-    {[
-      let match/xx = [a,b,c]
-      ]}
-    later if [match/xx] is only used in destructring
-    [Pfield match/xx i] then there is no need to construct 
-    such block.
-
-    It is more general than   
-    [Js.Null.toOption]
-    since its box number is one and immutable,
-    so we can give it a meaningful name for such slot
-
-    This also applies to [reference]
-    exception allocation
-*/
-
-type t = {x: int, y: int}
-
-let g = () => {
-  let z = {x: 1, y: 2}
-  z.x + z.y
-}
-
-let a0 = f => {
-  let u = Js.Null.toOption(f())
-  switch u {
-  | None => 0
-  | Some(x) =>
-    Js.log(x)
-    Js.log(x)
-    1
-  }
-}
-
-let a1 = f => {
-  module M = {
-    exception E
-  }
-  try f() catch {
-  | M.E => 1
-  }
-}
diff --git a/jscomp/test/gpr_1268.js b/jscomp/test/gpr_1268.js
deleted file mode 100644
index 4ba2f85..0000000
--- a/jscomp/test/gpr_1268.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function f_add2(a, b, x, y) {
-  return add(Curry._1(b, y), Curry._1(a, x));
-}
-
-function f(a, b, x, y) {
-  return Curry._1(a, x) + Curry._1(b, y) | 0;
-}
-
-function f1(a, b, x, y) {
-  return add(Curry._1(a, x), Curry._1(b, y));
-}
-
-function f2(x) {
-  console.log(x);
-}
-
-function f3(x) {
-  console.log(x);
-}
-
-function f4(x, y) {
-  return add(y, x);
-}
-
-exports.f_add2 = f_add2;
-exports.f = f;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-/* No side effect */
diff --git a/jscomp/test/gpr_1268.res b/jscomp/test/gpr_1268.res
deleted file mode 100644
index add5f5d..0000000
--- a/jscomp/test/gpr_1268.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let f = (a, b, x, y) => a(x) |> \"+"(b(y))
-
-@val external add: (int, int) => int = "add"
-
-let f_add2 = (a, b, x, y) => a(x) |> add(b(y))
-
-let f = (a, b, x, y) => a(x) + b(y)
-
-let f1 = (a, b, x, y) => add(a(x), b(y))
-
-let f2 = x => Js.log(x)
-
-let f3 = x => x |> Js.log
-
-let f4 = (x, y) => x |> add(y)
diff --git a/jscomp/test/gpr_1409_test.js b/jscomp/test/gpr_1409_test.js
deleted file mode 100644
index 80826b9..0000000
--- a/jscomp/test/gpr_1409_test.js
+++ /dev/null
@@ -1,182 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var String_set = require("./string_set.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var a = {};
-
-var b = {
-  foo: "42"
-};
-
-function map(f, x) {
-  if (x !== undefined) {
-    return Caml_option.some(Curry._1(f, Caml_option.valFromOption(x)));
-  }
-  
-}
-
-function make(foo) {
-  var partial_arg = map((function (prim) {
-          return String(prim);
-        }), foo);
-  return function (param) {
-    var tmp = {};
-    if (partial_arg !== undefined) {
-      tmp.foo = partial_arg;
-    }
-    return tmp;
-  };
-}
-
-var a_ = make(undefined)();
-
-var b_ = make(42)();
-
-eq("File \"gpr_1409_test.res\", line 26, characters 3-10", b_.foo, "42");
-
-console.log(Object.keys(a_));
-
-console.log(a, b, a_, b_);
-
-eq("File \"gpr_1409_test.res\", line 31, characters 3-10", Object.keys(a_).length, 0);
-
-var test2 = {
-  hi: 2
-};
-
-function test3(_open, xx__hi) {
-  var tmp = {
-    hi: 2
-  };
-  if (_open !== undefined) {
-    tmp._open = _open;
-  }
-  if (xx__hi !== undefined) {
-    tmp.xx__hi = xx__hi;
-  }
-  return tmp;
-}
-
-function test4(_open, xx__hi) {
-  console.log("no inlin");
-  var tmp = {
-    _open: _open,
-    hi: 2
-  };
-  if (xx__hi !== undefined) {
-    tmp.xx__hi = xx__hi;
-  }
-  return tmp;
-}
-
-function test5(f, x) {
-  console.log("no inline");
-  var tmp = {
-    hi: 2
-  };
-  var tmp$1 = Curry._1(f, x);
-  if (tmp$1 !== undefined) {
-    tmp._open = tmp$1;
-  }
-  var tmp$2 = Curry._1(f, x);
-  if (tmp$2 !== undefined) {
-    tmp.xx__hi = tmp$2;
-  }
-  return tmp;
-}
-
-function test6(f, x) {
-  console.log("no inline");
-  var x$1 = {
-    contents: 3
-  };
-  var tmp = {
-    hi: 2
-  };
-  var tmp$1 = (x$1.contents = x$1.contents + 1 | 0, x$1.contents);
-  if (tmp$1 !== undefined) {
-    tmp._open = tmp$1;
-  }
-  var tmp$2 = f(x$1);
-  if (tmp$2 !== undefined) {
-    tmp.xx__hi = tmp$2;
-  }
-  return tmp;
-}
-
-function keys(xs, ys) {
-  return String_set.equal(String_set.of_list(xs), String_set.of_list($$Array.to_list(ys)));
-}
-
-eq("File \"gpr_1409_test.res\", line 69, characters 3-10", keys({
-          hd: "hi",
-          tl: /* [] */0
-        }, Object.keys(test3(undefined, undefined))), true);
-
-eq("File \"gpr_1409_test.res\", line 71, characters 3-10", keys({
-          hd: "hi",
-          tl: {
-            hd: "_open",
-            tl: /* [] */0
-          }
-        }, Object.keys(test3(2, undefined))), true);
-
-eq("File \"gpr_1409_test.res\", line 73, characters 3-10", keys({
-          hd: "hi",
-          tl: {
-            hd: "_open",
-            tl: {
-              hd: "xx__hi",
-              tl: /* [] */0
-            }
-          }
-        }, Object.keys(test3(2, 2))), true);
-
-Mt.from_pair_suites("Gpr_1409_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.a = a;
-exports.b = b;
-exports.map = map;
-exports.make = make;
-exports.a_ = a_;
-exports.b_ = b_;
-exports.test2 = test2;
-exports.test3 = test3;
-exports.test4 = test4;
-exports.test5 = test5;
-exports.test6 = test6;
-exports.keys = keys;
-/* a_ Not a pure module */
diff --git a/jscomp/test/gpr_1409_test.res b/jscomp/test/gpr_1409_test.res
deleted file mode 100644
index 934b850..0000000
--- a/jscomp/test/gpr_1409_test.res
+++ /dev/null
@@ -1,75 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-/* type t */
-@obj external make: (~foo: string=?, unit) => _ = ""
-
-let a = make()
-let b = make(~foo="42", ())
-
-let map = (f, x) =>
-  switch x {
-  | None => None
-  | Some(x) => Some(f(x))
-  }
-
-let make = (~foo: option<int>=?) => make(~foo=?map(string_of_int, foo))
-
-let a_ = make()
-let b_ = make(~foo=42, ())
-
-eq(__LOC__, b_["foo"], Js.Undefined.return("42"))
-
-Js.log(Js.Obj.keys(a_))
-Js.log4(a, b, a_, b_)
-
-eq(__LOC__, Array.length(Js.Obj.keys(a_)), 0)
-
-@obj external mangle: (~_open: int=?, ~xx__hi: int=?, ~hi: int, unit) => _ = ""
-
-let test2 = mangle(~hi=2, ())
-
-@inline(never)
-let test3 = (_open, xx__hi) =>
-  /* Js.log "no inlin"; */
-  mangle(~_open?, ~xx__hi?, ~hi=2, ())
-
-let test4 = (_open, xx__hi) => {
-  Js.log("no inlin")
-  mangle(~_open=?Some(_open), ~xx__hi?, ~hi=2, ())
-}
-
-let test5 = (f, x) => {
-  Js.log("no inline")
-  mangle(~_open=?f(x), ~xx__hi=?f(x), ~hi=2, ())
-}
-
-let test6 = (f, x) => {
-  Js.log("no inline")
-  let x = ref(3)
-  mangle(
-    ~_open=?{
-      incr(x)
-      Some(x.contents)
-    },
-    ~xx__hi=?f(. x),
-    ~hi=2,
-    (),
-  )
-}
-
-let keys = (xs, ys) =>
-  String_set.equal(String_set.of_list(xs), String_set.of_list(Array.to_list(ys)))
-
-eq(__LOC__, keys(list{"hi"}, Js.Obj.keys(test3(None, None))), true)
-
-eq(__LOC__, keys(list{"hi", "_open"}, Js.Obj.keys(test3(Some(2), None))), true)
-
-eq(__LOC__, keys(list{"hi", "_open", "xx__hi"}, Js.Obj.keys(test3(Some(2), Some(2)))), true)
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1423_app_test.js b/jscomp/test/gpr_1423_app_test.js
deleted file mode 100644
index a152b15..0000000
--- a/jscomp/test/gpr_1423_app_test.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Gpr_1423_nav = require("./gpr_1423_nav.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function foo(f) {
-  console.log(Curry._2(f, "a1", undefined));
-}
-
-foo(function (param) {
-      return function (param$1) {
-        return Gpr_1423_nav.busted(param, "a2", param$1);
-      };
-    });
-
-function foo2(f) {
-  return Curry._2(f, "a1", undefined);
-}
-
-eq("File \"gpr_1423_app_test.res\", line 15, characters 12-19", "a1a2", "a1a2");
-
-Mt.from_pair_suites("Gpr_1423_app_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.foo = foo;
-exports.foo2 = foo2;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_1423_app_test.res b/jscomp/test/gpr_1423_app_test.res
deleted file mode 100644
index 86a1762..0000000
--- a/jscomp/test/gpr_1423_app_test.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let foo = f => Js.log(f(~a1="a1", ()))
-
-let _ = foo(Gpr_1423_nav.busted(~a2="a2"))
-
-let foo2 = f => f(~a1="a1", ())
-
-let () = eq(__LOC__, foo2(Gpr_1423_nav.busted(~a2="a2")), "a1a2")
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1423_nav.js b/jscomp/test/gpr_1423_nav.js
deleted file mode 100644
index 0116b45..0000000
--- a/jscomp/test/gpr_1423_nav.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function busted(a1, a2, param) {
-  return a1 + a2;
-}
-
-exports.busted = busted;
-/* No side effect */
diff --git a/jscomp/test/gpr_1423_nav.res b/jscomp/test/gpr_1423_nav.res
deleted file mode 100644
index d64577c..0000000
--- a/jscomp/test/gpr_1423_nav.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let busted = (~a1, ~a2, ()) =>
-  /* "hello" */
-  a1 ++ a2
diff --git a/jscomp/test/gpr_1438.js b/jscomp/test/gpr_1438.js
deleted file mode 100644
index 1007c0d..0000000
--- a/jscomp/test/gpr_1438.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function actionKey(key, a, b, c, d, e) {
-  switch (key) {
-    case 98 :
-        return c;
-    case 106 :
-        return d;
-    case 107 :
-        return e;
-    case 116 :
-        return b;
-    case 99 :
-    case 118 :
-        return a;
-    default:
-      
-  }
-  return function (param) {
-    
-  };
-}
-
-exports.actionKey = actionKey;
-/* No side effect */
diff --git a/jscomp/test/gpr_1438.res b/jscomp/test/gpr_1438.res
deleted file mode 100644
index 77306e2..0000000
--- a/jscomp/test/gpr_1438.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let actionKey = (key, a, b, c, d, e) =>
-  switch key {
-  | 'v'
-  | 'c' => a
-  | 't' => b
-  | 'b' => c
-  | 'j' => d
-  | 'k' => e
-  | _ => _ => ()
-  }
diff --git a/jscomp/test/gpr_1481.js b/jscomp/test/gpr_1481.js
deleted file mode 100644
index 2e8a9ff..0000000
--- a/jscomp/test/gpr_1481.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Moduleid = require("#moduleid");
-
-function f(param) {
-  return Moduleid.name;
-}
-
-exports.f = f;
-/* #moduleid Not a pure module */
diff --git a/jscomp/test/gpr_1481.res b/jscomp/test/gpr_1481.res
deleted file mode 100644
index f34e919..0000000
--- a/jscomp/test/gpr_1481.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type moduleId = {"name": string}
-
-@module external moduleId: moduleId = "#moduleid"
-
-let f = () => moduleId["name"]
diff --git a/jscomp/test/gpr_1484.js b/jscomp/test/gpr_1484.js
deleted file mode 100644
index 5e8a874..0000000
--- a/jscomp/test/gpr_1484.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function test(x) {
-  x.nodeValue = null;
-}
-
-exports.test = test;
-/* No side effect */
diff --git a/jscomp/test/gpr_1484.res b/jscomp/test/gpr_1484.res
deleted file mode 100644
index d5b7e65..0000000
--- a/jscomp/test/gpr_1484.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type t
-@set external clearNodeValue: (t, @as(json`null`) _) => unit = "nodeValue"
-
-/* TODO: more test cases */
-/* external clearNodeValue2 : */
-/* t -> (_ [@bs.as {json|null|json}]) -> int -> unit = */
-/* "nodeValue" [@@bs.set] */
-
-let test = x => clearNodeValue(x)
diff --git a/jscomp/test/gpr_1503_test.js b/jscomp/test/gpr_1503_test.js
deleted file mode 100644
index 160ee23..0000000
--- a/jscomp/test/gpr_1503_test.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Int64 = require("../../lib/js/int64.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-var Caml_format = require("../../lib/js/caml_format.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function id(x) {
-  return Caml_format.int64_of_string(Caml_int64.to_string(x));
-}
-
-var i = [
-  2074848171,
-  2880154539
-];
-
-var s = Caml_int64.to_string(i);
-
-var i$p = Caml_format.int64_of_string(s);
-
-eq("File \"gpr_1503_test.res\", line 15, characters 5-12", i, i$p);
-
-eq("File \"gpr_1503_test.res\", line 19, characters 5-12", Int64.max_int, Caml_format.int64_of_string(Caml_int64.to_string(Int64.max_int)));
-
-eq("File \"gpr_1503_test.res\", line 20, characters 5-12", Int64.min_int, Caml_format.int64_of_string(Caml_int64.to_string(Int64.min_int)));
-
-Mt.from_pair_suites("Gpr_1503_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.id = id;
-/* s Not a pure module */
diff --git a/jscomp/test/gpr_1503_test.res b/jscomp/test/gpr_1503_test.res
deleted file mode 100644
index 7885207..0000000
--- a/jscomp/test/gpr_1503_test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let id = x => x |> Int64.to_string |> Int64.of_string
-
-let () = {
-  let i = 0x7BABABABABABABABL
-  let s = Int64.to_string(i)
-  let i' = Int64.of_string(s)
-  eq(__LOC__, i, i')
-}
-
-let () = {
-  eq(__LOC__, Int64.max_int, id(Int64.max_int))
-  eq(__LOC__, Int64.min_int, id(Int64.min_int))
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1539_test.js b/jscomp/test/gpr_1539_test.js
deleted file mode 100644
index a0d64fd..0000000
--- a/jscomp/test/gpr_1539_test.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_module = require("../../lib/js/caml_module.js");
-
-var Point = Caml_module.init_mod([
-      "gpr_1539_test.res",
-      11,
-      4
-    ], {
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "add"
-        ]]
-    });
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "add"
-        ]]
-    }, Point, {
-      add: (function (prim0, prim1) {
-          return prim0.add(prim1);
-        })
-    });
-
-var CRS;
-
-var Layer;
-
-exports.CRS = CRS;
-exports.Layer = Layer;
-exports.Point = Point;
-/* Point Not a pure module */
diff --git a/jscomp/test/gpr_1539_test.res b/jscomp/test/gpr_1539_test.res
deleted file mode 100644
index b6161ac..0000000
--- a/jscomp/test/gpr_1539_test.res
+++ /dev/null
@@ -1,14 +0,0 @@
-module rec CRS: {
-  type t
-} = CRS
-and Layer: {
-  type t
-} = Layer
-
-and Point: {
-  type t
-  let add: (t, t) => t
-} = {
-  type t
-  @send external add: (t, t) => t = "add"
-}
diff --git a/jscomp/test/gpr_1658_test.js b/jscomp/test/gpr_1658_test.js
deleted file mode 100644
index b4d2747..0000000
--- a/jscomp/test/gpr_1658_test.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Js_types = require("../../lib/js/js_types.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"gpr_1658_test.res\", line 10, characters 5-12", null, null);
-
-var match = Js_types.classify(null);
-
-if (typeof match !== "object" && match === "JSNull") {
-  eq("File \"gpr_1658_test.res\", line 12, characters 17-24", true, true);
-} else {
-  eq("File \"gpr_1658_test.res\", line 13, characters 12-19", true, false);
-}
-
-eq("File \"gpr_1658_test.res\", line 15, characters 5-12", true, Js_types.test(null, "Null"));
-
-Mt.from_pair_suites("File \"gpr_1658_test.res\", line 18, characters 20-27", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_1658_test.res b/jscomp/test/gpr_1658_test.res
deleted file mode 100644
index b25a155..0000000
--- a/jscomp/test/gpr_1658_test.res
+++ /dev/null
@@ -1,18 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let () = {
-  eq(__LOC__, Js.Null.empty, Js.Null.empty)
-  switch Js.Types.classify(Js.Null.empty) {
-  | JSNull => eq(__LOC__, true, true)
-  | _ => eq(__LOC__, true, false)
-  }
-  eq(__LOC__, true, Js.Types.test(Js.Null.empty, Null))
-}
-
-Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/gpr_1667_test.js b/jscomp/test/gpr_1667_test.js
deleted file mode 100644
index b908253..0000000
--- a/jscomp/test/gpr_1667_test.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"gpr_1667_test.res\", line 24, characters 5-12", 0, 0);
-
-Mt.from_pair_suites("Gpr_1667_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_1667_test.res b/jscomp/test/gpr_1667_test.res
deleted file mode 100644
index 19b3be5..0000000
--- a/jscomp/test/gpr_1667_test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-{
-  let i = {
-    let e =
-      {
-        let o = false
-        (
-          z =>
-            {
-              let m = ()
-              n => 0
-            }((q, y) => o)
-        )(o)
-      } == 0
-    0
-  }
-  eq(__LOC__, i, 0)
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1692_test.js b/jscomp/test/gpr_1692_test.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/gpr_1692_test.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/gpr_1692_test.res b/jscomp/test/gpr_1692_test.res
deleted file mode 100644
index fd789e0..0000000
--- a/jscomp/test/gpr_1692_test.res
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  let _s = {
-    let h = true
-    x => {
-      let j = f => true
-      f => 0
-    }
-  }("", "")
-}
diff --git a/jscomp/test/gpr_1698_test.js b/jscomp/test/gpr_1698_test.js
deleted file mode 100644
index 2a0fb86..0000000
--- a/jscomp/test/gpr_1698_test.js
+++ /dev/null
@@ -1,222 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function is_number(_expr) {
-  while(true) {
-    var expr = _expr;
-    switch (expr.TAG) {
-      case "Val" :
-          if (expr._0.TAG === "Natural") {
-            return true;
-          } else {
-            return false;
-          }
-      case "Neg" :
-          _expr = expr._0;
-          continue ;
-      case "Sum" :
-      case "Pow" :
-      case "Frac" :
-      case "Gcd" :
-          return false;
-      
-    }
-  };
-}
-
-function compare(context, state, _a, _b) {
-  while(true) {
-    var b = _b;
-    var a = _a;
-    var exit = 0;
-    var na;
-    var da;
-    var nb;
-    var db;
-    var exit$1 = 0;
-    var exit$2 = 0;
-    var exit$3 = 0;
-    switch (a.TAG) {
-      case "Val" :
-          switch (b.TAG) {
-            case "Val" :
-                return 111;
-            case "Neg" :
-                exit$3 = 5;
-                break;
-            case "Sum" :
-                exit$2 = 4;
-                break;
-            case "Frac" :
-                throw {
-                      RE_EXN_ID: "Assert_failure",
-                      _1: [
-                        "gpr_1698_test.res",
-                        41,
-                        9
-                      ],
-                      Error: new Error()
-                    };
-            case "Pow" :
-            case "Gcd" :
-                exit = 1;
-                break;
-            
-          }
-          break;
-      case "Neg" :
-          _a = a._0;
-          continue ;
-      case "Sum" :
-      case "Pow" :
-          exit$3 = 5;
-          break;
-      case "Frac" :
-          switch (b.TAG) {
-            case "Val" :
-                throw {
-                      RE_EXN_ID: "Assert_failure",
-                      _1: [
-                        "gpr_1698_test.res",
-                        41,
-                        9
-                      ],
-                      Error: new Error()
-                    };
-            case "Neg" :
-                exit$3 = 5;
-                break;
-            case "Sum" :
-                exit$2 = 4;
-                break;
-            case "Frac" :
-                na = a._0;
-                da = a._1;
-                nb = b._0;
-                db = b._1;
-                exit = 2;
-                break;
-            case "Pow" :
-            case "Gcd" :
-                exit = 1;
-                break;
-            
-          }
-          break;
-      case "Gcd" :
-          switch (b.TAG) {
-            case "Neg" :
-                exit$3 = 5;
-                break;
-            case "Sum" :
-                exit$2 = 4;
-                break;
-            case "Gcd" :
-                na = a._0;
-                da = a._1;
-                nb = b._0;
-                db = b._1;
-                exit = 2;
-                break;
-            default:
-              exit$1 = 3;
-          }
-          break;
-      
-    }
-    if (exit$3 === 5) {
-      if (b.TAG === "Neg") {
-        _b = b._0;
-        continue ;
-      }
-      if (a.TAG === "Sum") {
-        if (is_number(b)) {
-          return 1;
-        }
-        exit$2 = 4;
-      } else {
-        exit$2 = 4;
-      }
-    }
-    if (exit$2 === 4) {
-      if (b.TAG === "Sum") {
-        if (is_number(a)) {
-          return -1;
-        }
-        exit$1 = 3;
-      } else {
-        exit$1 = 3;
-      }
-    }
-    if (exit$1 === 3) {
-      switch (a.TAG) {
-        case "Sum" :
-            exit = 1;
-            break;
-        case "Pow" :
-            return -1;
-        case "Val" :
-        case "Frac" :
-        case "Gcd" :
-            return 1;
-        
-      }
-    }
-    switch (exit) {
-      case 1 :
-          switch (b.TAG) {
-            case "Pow" :
-                return 1;
-            default:
-              return -1;
-          }
-      case 2 :
-          var denom = compare(context, state, da, db);
-          if (denom !== 0) {
-            return denom;
-          }
-          _b = nb;
-          _a = na;
-          continue ;
-      
-    }
-  };
-}
-
-var a = {
-  TAG: "Sum",
-  _0: {
-    hd: {
-      TAG: "Val",
-      _0: {
-        TAG: "Symbol",
-        _0: "a"
-      }
-    },
-    tl: {
-      hd: {
-        TAG: "Val",
-        _0: {
-          TAG: "Natural",
-          _0: 2
-        }
-      },
-      tl: /* [] */0
-    }
-  }
-};
-
-var b = {
-  TAG: "Val",
-  _0: {
-    TAG: "Symbol",
-    _0: "x"
-  }
-};
-
-console.log(compare("InSum", {
-          complex: true
-        }, a, b));
-
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_1698_test.res b/jscomp/test/gpr_1698_test.res
deleted file mode 100644
index 0cfd35a..0000000
--- a/jscomp/test/gpr_1698_test.res
+++ /dev/null
@@ -1,47 +0,0 @@
-@@bs.config({no_export: true})
-type value =
-  | Natural(int)
-  | Symbol(string)
-type context = InSum
-type rec t =
-  | Val(value)
-  | Neg(t)
-  | Sum(list<t>)
-  | Pow(t, t)
-  | Frac(t, t)
-  | Gcd(t, t)
-let rec is_number = (expr: t) =>
-  switch expr {
-  | Val(Natural(_)) => true
-  | Neg(a) => is_number(a)
-  | Val(Symbol(_)) | Sum(_) | Gcd(_) | _ => false
-  }
-
-let sym = x => Val(Symbol(x))
-
-let rec compare = (context, state, a, b) =>
-  /* Js.log {j|$a vs $b |j}; */
-  switch (a, b, context) {
-  | (Neg(x), y, _) | (x, Neg(y), _) =>
-    /* Js.log ""; */
-    compare(context, state, x, y)
-  | (Val(_), Val(_), _) => 111
-  | (Gcd(na, da), Gcd(nb, db), _)
-  | (Frac(na, da), Frac(nb, db), _) =>
-    let denom = compare(context, state, da, db)
-    denom == 0 ? compare(context, state, na, nb) : denom
-  | (Sum(_), y, _) if is_number(y) => 1
-  | (x, Sum(_), _) if is_number(x) => -1
-  | (Pow(_), _, _) => -1
-  | (_, Pow(_), _) => 1
-  | (Sum(_), _, _) => -1
-  | (_, Sum(_), _) => 1
-  | (Gcd(_), _, _) => 1
-  | (_, Gcd(_), _) => -1
-  | _ => assert(false)
-  }
-let a = Sum(list{sym("a"), Val(Natural(2))})
-let b = sym("x")
-type st = {complex: bool}
-let empty = () => {complex: true}
-let _ = \"@@"(Js.log, compare(InSum, empty(), a, b))
diff --git a/jscomp/test/gpr_1701_test.js b/jscomp/test/gpr_1701_test.js
deleted file mode 100644
index 6e3e204..0000000
--- a/jscomp/test/gpr_1701_test.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var Foo = /* @__PURE__ */Caml_exceptions.create("Gpr_1701_test.Foo");
-
-function test(n) {
-  if (n === 0) {
-    throw {
-          RE_EXN_ID: Foo,
-          Error: new Error()
-        };
-  }
-  try {
-    return test(n - 1 | 0);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === Foo) {
-      return ;
-    }
-    throw exn;
-  }
-}
-
-test(100);
-
-function read_lines(inc) {
-  var _acc = /* [] */0;
-  while(true) {
-    var acc = _acc;
-    var l;
-    try {
-      l = input_line(inc);
-    }
-    catch (raw_exn){
-      var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-      if (exn.RE_EXN_ID === "End_of_file") {
-        l = undefined;
-      } else {
-        throw exn;
-      }
-    }
-    if (l === undefined) {
-      return List.rev(acc);
-    }
-    _acc = {
-      hd: l,
-      tl: acc
-    };
-    continue ;
-  };
-}
-
-function read_lines2(inc) {
-  var _acc = /* [] */0;
-  while(true) {
-    var acc = _acc;
-    var l;
-    try {
-      l = input_line(inc);
-    }
-    catch (raw_exn){
-      var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-      if (exn.RE_EXN_ID === "End_of_file") {
-        return List.rev(acc);
-      }
-      throw exn;
-    }
-    _acc = {
-      hd: l,
-      tl: acc
-    };
-    continue ;
-  };
-}
-
-function read_lines3(inc) {
-  var loop = function (acc) {
-    try {
-      var l = input_line(inc);
-      return loop({
-                  hd: l,
-                  tl: acc
-                });
-    }
-    catch (raw_exn){
-      var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-      if (exn.RE_EXN_ID === "End_of_file") {
-        return List.rev(acc);
-      }
-      throw exn;
-    }
-  };
-  return loop(/* [] */0);
-}
-
-function fff(f, x) {
-  try {
-    return fff(f, x);
-  }
-  catch (exn){
-    return x + 1 | 0;
-  }
-}
-
-exports.Foo = Foo;
-exports.test = test;
-exports.read_lines = read_lines;
-exports.read_lines2 = read_lines2;
-exports.read_lines3 = read_lines3;
-exports.fff = fff;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_1701_test.res b/jscomp/test/gpr_1701_test.res
deleted file mode 100644
index ec95e04..0000000
--- a/jscomp/test/gpr_1701_test.res
+++ /dev/null
@@ -1,54 +0,0 @@
-exception Foo
-
-let rec test = n =>
-  if n == 0 {
-    raise(Foo)
-  } else {
-    try test(n - 1) catch {
-    | Foo => ()
-    }
-  }
-
-let () = test(100)
-
-type in_channel
-@val external input_line: in_channel => string = "input_line"
-
-let read_lines = inc => {
-  let rec loop = acc =>
-    switch try Some(input_line(inc)) catch {
-    | End_of_file => None
-    } {
-    | Some(l) => loop(list{l, ...acc})
-    | None => List.rev(acc)
-    }
-
-  loop(list{})
-}
-
-let read_lines2 = inc => {
-  let rec loop = acc =>
-    switch input_line(inc) {
-    | l => loop(list{l, ...acc})
-    | exception End_of_file => List.rev(acc)
-    }
-
-  loop(list{})
-}
-
-let read_lines3 = inc => {
-  let rec loop = acc =>
-    try {
-      let l = input_line(inc)
-      loop(list{l, ...acc})
-    } catch {
-    | End_of_file => List.rev(acc)
-    }
-
-  loop(list{})
-}
-
-let rec fff = (f, x) =>
-  try fff(f, x) catch {
-  | _ => x + 1
-  }
diff --git a/jscomp/test/gpr_1716_test.js b/jscomp/test/gpr_1716_test.js
deleted file mode 100644
index 4683a97..0000000
--- a/jscomp/test/gpr_1716_test.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var a = {};
-
-var b = {};
-
-Caml_obj.update_dummy(a, {
-      b: b
-    });
-
-Caml_obj.update_dummy(b, {
-      a: a
-    });
-
-function is_inifite(x) {
-  return x.b.a === x;
-}
-
-eq("File \"gpr_1716_test.res\", line 16, characters 3-10", true, is_inifite(a));
-
-Mt.from_pair_suites("Gpr_1716_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.a = a;
-exports.b = b;
-exports.is_inifite = is_inifite;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_1716_test.res b/jscomp/test/gpr_1716_test.res
deleted file mode 100644
index b2e3f99..0000000
--- a/jscomp/test/gpr_1716_test.res
+++ /dev/null
@@ -1,18 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-type rec a = {b: b}
-and b = {a: a}
-
-let rec a = {b: b} and b = {a: a}
-
-let is_inifite = (x: a) => x.b.a === x
-
-eq(__LOC__, true, is_inifite(a))
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1717_test.js b/jscomp/test/gpr_1717_test.js
deleted file mode 100644
index 830c967..0000000
--- a/jscomp/test/gpr_1717_test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var A = {};
-
-var A0 = {};
-
-var A1 = {};
-
-exports.A = A;
-exports.A0 = A0;
-exports.A1 = A1;
-/* No side effect */
diff --git a/jscomp/test/gpr_1717_test.res b/jscomp/test/gpr_1717_test.res
deleted file mode 100644
index 600fbaf..0000000
--- a/jscomp/test/gpr_1717_test.res
+++ /dev/null
@@ -1,4 +0,0 @@
-module rec A: {} = {}
-
-module rec A0: {} = {}
-and A1: {} = {}
diff --git a/jscomp/test/gpr_1728_test.js b/jscomp/test/gpr_1728_test.js
deleted file mode 100644
index 6c9472e..0000000
--- a/jscomp/test/gpr_1728_test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_format = require("../../lib/js/caml_format.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function foo(x) {
-  return Caml_format.int_of_string(x) !== 3;
-}
-
-function badInlining(obj) {
-  var x = obj.field;
-  Caml_format.int_of_string(x) !== 3;
-}
-
-eq("File \"gpr_1728_test.res\", line 16, characters 3-10", badInlining({
-          field: "3"
-        }), undefined);
-
-eq("File \"gpr_1728_test.res\", line 18, characters 3-10", Caml_format.int_of_string("-13"), -13);
-
-eq("File \"gpr_1728_test.res\", line 19, characters 3-10", Caml_format.int_of_string("+13"), 13);
-
-eq("File \"gpr_1728_test.res\", line 20, characters 3-10", Caml_format.int_of_string("13"), 13);
-
-eq("File \"gpr_1728_test.res\", line 21, characters 3-10", Caml_format.int_of_string("0u32"), 32);
-
-eq("File \"gpr_1728_test.res\", line 22, characters 3-10", Caml_format.int_of_string("-0u32"), -32);
-
-eq("File \"gpr_1728_test.res\", line 23, characters 3-10", Caml_format.int_of_string("+0u32"), 32);
-
-eq("File \"gpr_1728_test.res\", line 24, characters 3-10", Caml_format.int_of_string("+0x32"), 50);
-
-eq("File \"gpr_1728_test.res\", line 25, characters 3-10", Caml_format.int_of_string("-0x32"), -50);
-
-eq("File \"gpr_1728_test.res\", line 26, characters 3-10", Caml_format.int_of_string("0x32"), 50);
-
-Mt.from_pair_suites("Gpr_1728_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.foo = foo;
-exports.badInlining = badInlining;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_1728_test.res b/jscomp/test/gpr_1728_test.res
deleted file mode 100644
index 655b40b..0000000
--- a/jscomp/test/gpr_1728_test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let foo = x => int_of_string(x) !== 3
-
-let badInlining = obj =>
-  if foo(obj["field"]) {
-    ()
-  }
-
-eq(__LOC__, badInlining({"field": "3"}), ())
-
-eq(__LOC__, int_of_string("-13"), -13)
-eq(__LOC__, int_of_string("+13"), 13)
-eq(__LOC__, int_of_string("13"), 13)
-eq(__LOC__, int_of_string("0u32"), 32)
-eq(__LOC__, int_of_string("-0u32"), -32)
-eq(__LOC__, int_of_string("+0u32"), 32)
-eq(__LOC__, int_of_string("+0x32"), 50)
-eq(__LOC__, int_of_string("-0x32"), -50)
-eq(__LOC__, int_of_string("0x32"), 50)
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1749_test.js b/jscomp/test/gpr_1749_test.js
deleted file mode 100644
index b75c25e..0000000
--- a/jscomp/test/gpr_1749_test.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"gpr_1749_test.res\", line 15, characters 3-10", 0, 0);
-
-Mt.from_pair_suites("Gpr_1749_test", suites.contents);
-
-var a = 0;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.a = a;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_1749_test.res b/jscomp/test/gpr_1749_test.res
deleted file mode 100644
index 8b6bc6a..0000000
--- a/jscomp/test/gpr_1749_test.res
+++ /dev/null
@@ -1,16 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let a = if 1. < (1. < 1. ? 1. : 10.) {
-  0
-} else {
-  1
-}
-
-eq(__LOC__, 0, a)
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1759_test.js b/jscomp/test/gpr_1759_test.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/gpr_1759_test.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/gpr_1759_test.res b/jscomp/test/gpr_1759_test.res
deleted file mode 100644
index 8e6e2fd..0000000
--- a/jscomp/test/gpr_1759_test.res
+++ /dev/null
@@ -1,6 +0,0 @@
-/* ;; let i:int =
-    (compare (print_string "") ())
-  in print_int i
-
-;; print_string 
-(if (<>) () (print_string "") then "true" else "false") */
diff --git a/jscomp/test/gpr_1760_test.js b/jscomp/test/gpr_1760_test.js
deleted file mode 100644
index 8a701ac..0000000
--- a/jscomp/test/gpr_1760_test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_int32 = require("../../lib/js/caml_int32.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var a0;
-
-try {
-  Caml_int32.div(0, 0);
-  a0 = 0;
-}
-catch (exn){
-  a0 = 1;
-}
-
-var a1;
-
-try {
-  Caml_int32.mod_(0, 0);
-  a1 = 0;
-}
-catch (exn$1){
-  a1 = 1;
-}
-
-var a4;
-
-try {
-  Caml_int32.div(0, 0);
-  a4 = 0;
-}
-catch (exn$2){
-  a4 = 1;
-}
-
-var a5;
-
-try {
-  Caml_int32.mod_(0, 0);
-  a5 = 0;
-}
-catch (exn$3){
-  a5 = 1;
-}
-
-var a6;
-
-try {
-  Caml_int64.div(Caml_int64.zero, Caml_int64.zero);
-  a6 = 0;
-}
-catch (exn$4){
-  a6 = 1;
-}
-
-var a7;
-
-try {
-  Caml_int64.mod_(Caml_int64.zero, Caml_int64.zero);
-  a7 = 0;
-}
-catch (exn$5){
-  a7 = 1;
-}
-
-eq("File \"gpr_1760_test.res\", line 57, characters 3-10", [
-      a0,
-      a1,
-      a4,
-      a5,
-      a6,
-      a7
-    ], [
-      1,
-      1,
-      1,
-      1,
-      1,
-      1
-    ]);
-
-Mt.from_pair_suites("Gpr_1760_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.a0 = a0;
-exports.a1 = a1;
-exports.a4 = a4;
-exports.a5 = a5;
-exports.a6 = a6;
-exports.a7 = a7;
-/* a0 Not a pure module */
diff --git a/jscomp/test/gpr_1760_test.res b/jscomp/test/gpr_1760_test.res
deleted file mode 100644
index c4e86f6..0000000
--- a/jscomp/test/gpr_1760_test.res
+++ /dev/null
@@ -1,59 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let a0 = try {
-  let _c = 0 / 0
-  0
-} catch {
-| _ => 1
-}
-
-let a1 = try {
-  let _h = mod(0, 0)
-  0
-} catch {
-| _ => 1
-}
-
-/*
-let a2 = try (let _h = Nativeint.div 0n 0n in 0) with _ -> 1
-
-let a3 = try (let _h = Nativeint.rem 0n 0n in 0 ) with _ -> 1 
-*/
-/* TODO: more work on int32 effect anaylsys */
-
-let a4 = try {
-  let _ = Int32.div(0l, 0l)
-  0
-} catch {
-| _ => 1
-}
-
-let a5 = try {
-  let _ = Int32.rem(0l, 0l)
-  0
-} catch {
-| _ => 1
-}
-
-let a6 = try {
-  let _ = Int64.div(0L, 0L)
-  0
-} catch {
-| _ => 1
-}
-let a7 = try {
-  let _ = Int64.rem(0L, 0L)
-  0
-} catch {
-| _ => 1
-}
-
-eq(__LOC__, (a0, a1, a4, a5, a6, a7), (1, 1, 1, 1, 1, 1))
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1762_test.js b/jscomp/test/gpr_1762_test.js
deleted file mode 100644
index 0fa11d2..0000000
--- a/jscomp/test/gpr_1762_test.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var v = {
-  contents: 3
-};
-
-function update(param) {
-  v.contents = v.contents + 1 | 0;
-  return true;
-}
-
-v.contents = v.contents + 1 | 0;
-
-eq("File \"gpr_1762_test.res\", line 24, characters 3-10", v.contents, 4);
-
-Mt.from_pair_suites("Gpr_1762_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.v = v;
-exports.update = update;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_1762_test.res b/jscomp/test/gpr_1762_test.res
deleted file mode 100644
index 7612670..0000000
--- a/jscomp/test/gpr_1762_test.res
+++ /dev/null
@@ -1,26 +0,0 @@
-/* ;; if bool_of_string "x" then "" else "" */
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let v = ref(3)
-
-let update = () => {
-  incr(v)
-  true
-}
-
-if update() {
-  ""
-} else {
-  ""
-}->ignore
-
-eq(__LOC__, v.contents, 4)
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1817_test.js b/jscomp/test/gpr_1817_test.js
deleted file mode 100644
index 16a6232..0000000
--- a/jscomp/test/gpr_1817_test.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(param) {
-  var x = new Date();
-  var y = new Date();
-  return [
-          Caml_obj.greaterthan(y, x),
-          Caml_obj.lessthan(y, x),
-          true
-        ];
-}
-
-var match = f();
-
-var a2 = match[2];
-
-var a1 = match[1];
-
-var a0 = match[0];
-
-console.log(a0, a1);
-
-eq("File \"gpr_1817_test.res\", line 20, characters 3-10", a2, true);
-
-Mt.from_pair_suites("Gpr_1817_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.a0 = a0;
-exports.a1 = a1;
-exports.a2 = a2;
-/* match Not a pure module */
diff --git a/jscomp/test/gpr_1817_test.res b/jscomp/test/gpr_1817_test.res
deleted file mode 100644
index 1189106..0000000
--- a/jscomp/test/gpr_1817_test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-type t
-@new external makeDate: unit => t = "Date"
-
-let f = () => {
-  let x = makeDate()
-  let y = makeDate()
-  (y > x, y < x, true)
-}
-/* y > x */
-let (a0, a1, a2) = f()
-Js.log2(a0, a1)
-eq(__LOC__, a2, true)
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1822_test.js b/jscomp/test/gpr_1822_test.js
deleted file mode 100644
index 6776e28..0000000
--- a/jscomp/test/gpr_1822_test.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var myShape = {
-  TAG: "Circle",
-  _0: 10
-};
-
-var area;
-
-area = myShape.TAG === "Circle" ? 100 * 3.14 : Math.imul(10, myShape._1);
-
-eq("File \"gpr_1822_test.res\", line 20, characters 3-10", area, 314);
-
-Mt.from_pair_suites("Gpr_1822_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.myShape = myShape;
-exports.area = area;
-/* area Not a pure module */
diff --git a/jscomp/test/gpr_1822_test.res b/jscomp/test/gpr_1822_test.res
deleted file mode 100644
index af4434d..0000000
--- a/jscomp/test/gpr_1822_test.res
+++ /dev/null
@@ -1,22 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-type shape =
-  | Circle(int)
-
-  | Rectangle(int, int)
-
-let myShape = Circle(10)
-let area = switch myShape {
-| Circle(r) => float_of_int(r * r) *. 3.14
-| Rectangle(w, h) => float_of_int(w * h)
-}
-
-eq(__LOC__, area, 314.)
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1891_test.js b/jscomp/test/gpr_1891_test.js
deleted file mode 100644
index bbaf49b..0000000
--- a/jscomp/test/gpr_1891_test.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function foo(x) {
-  if (typeof x === "object" && x.NAME === "Foo" && x.VAL === 3) {
-    console.log("1");
-  } else {
-    console.log("2");
-  }
-}
-
-function foo2(x) {
-  if (typeof x === "object" && x.NAME === "Foo" && x.VAL === 3) {
-    return "xxxx";
-  } else {
-    return "xxx";
-  }
-}
-
-function foo3(x) {
-  if (typeof x === "object" && x.NAME === "Foo" && x.VAL === 3) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function foo4(x, h) {
-  if (typeof x === "object" && x.NAME === "Foo" && x.VAL === 3) {
-    return Curry._1(h, undefined);
-  }
-  
-}
-
-function foo5(x) {
-  if (typeof x === "object" && x.NAME === "Foo" && x.VAL === 3) {
-    console.log("hi");
-  } else {
-    console.log("x");
-  }
-}
-
-exports.foo = foo;
-exports.foo2 = foo2;
-exports.foo3 = foo3;
-exports.foo4 = foo4;
-exports.foo5 = foo5;
-/* No side effect */
diff --git a/jscomp/test/gpr_1891_test.res b/jscomp/test/gpr_1891_test.res
deleted file mode 100644
index d4eea9d..0000000
--- a/jscomp/test/gpr_1891_test.res
+++ /dev/null
@@ -1,29 +0,0 @@
-let foo = x =>
-  switch x {
-  | #Foo(3) => print_endline("1")
-  | _ => print_endline("2")
-  }
-
-let foo2 = x =>
-  switch x {
-  | #Foo(3) => "xxxx"
-  | _ => "xxx"
-  }
-
-let foo3 = x =>
-  switch x {
-  | #Foo(3) => 1
-  | _ => 2
-  }
-
-let foo4 = (x, h) =>
-  switch x {
-  | #Foo(3) => h()
-  | _ => ()
-  }
-
-let foo5 = x =>
-  switch x {
-  | #Foo(3) => Js.log("hi")
-  | _ => Js.log("x")
-  }
diff --git a/jscomp/test/gpr_1943_test.js b/jscomp/test/gpr_1943_test.js
deleted file mode 100644
index ed12bff..0000000
--- a/jscomp/test/gpr_1943_test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(x) {
-  return [
-          x._003,
-          x._50,
-          x._50x,
-          x.__50,
-          x.__50x,
-          x["_50x'"],
-          x["x'"]
-        ];
-}
-
-var v = f({
-      _003: 0,
-      _50: 1,
-      _50x: 2,
-      __50: 3,
-      __50x: 4,
-      "_50x'": 5,
-      "x'": 6
-    });
-
-eq("File \"gpr_1943_test.res\", line 23, characters 3-10", [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6
-    ], v);
-
-Mt.from_pair_suites("Gpr_1943_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.v = v;
-/* v Not a pure module */
diff --git a/jscomp/test/gpr_1943_test.res b/jscomp/test/gpr_1943_test.res
deleted file mode 100644
index df8fc2e..0000000
--- a/jscomp/test/gpr_1943_test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let f = x => (x["_003"], x["_50"], x["_50x"], x["__50"], x["__50x"], x["_50x'"], x["x'"])
-/* x##_ */ /* TODO: should have a syntax error */
-
-let v = f({
-  "_003": 0,
-  "_50": 1,
-  "_50x": 2,
-  "__50": 3,
-  "__50x": 4,
-  "_50x'": 5,
-  "x'": 6,
-  /* _  = 6 */
-})
-
-eq(__LOC__, (0, 1, 2, 3, 4, 5, 6), v)
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_1946_test.js b/jscomp/test/gpr_1946_test.js
deleted file mode 100644
index 7b1c6c2..0000000
--- a/jscomp/test/gpr_1946_test.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var x = ({
-    x: 3,
-    y: 4
-  }).x;
-
-var zz = ({
-    _5: 3
-  })._5;
-
-var h = {
-  "0123": 2,
-  "123_456": 3
-};
-
-function f(id) {
-  while(false) {
-    
-  };
-  return id;
-}
-
-eq("File \"gpr_1946_test.res\", line 24, characters 3-10", ({
-        _5: 3
-      })._5, 3);
-
-eq("File \"gpr_1946_test.res\", line 25, characters 3-10", [
-      2,
-      3
-    ], [
-      f(h)["0123"],
-      f(h)["123_456"]
-    ]);
-
-console.log(({
-          _5: 3
-        }).TAG);
-
-Mt.from_pair_suites("File \"gpr_1946_test.res\", line 28, characters 20-27", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.x = x;
-exports.zz = zz;
-exports.h = h;
-exports.f = f;
-/* x Not a pure module */
diff --git a/jscomp/test/gpr_1946_test.res b/jscomp/test/gpr_1946_test.res
deleted file mode 100644
index dce60f1..0000000
--- a/jscomp/test/gpr_1946_test.res
+++ /dev/null
@@ -1,28 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let x = ({"x": 3, "y": 4})["x"]
-
-({"x": 3, "y": 4})["x"]->ignore
-
-let zz = ({"_5": 3})["_5"]
-
-type t = {
-  @as("0123") a: int,
-  @as("123_456") b: int,
-}
-
-let h = {a: 2, b: 3}
-let f = id => {
-  while false {
-    ()
-  }
-  id
-}
-
-eq(__LOC__, ({"_5": 3})["_5"], 3)
-eq(__LOC__, (2, 3), (f(h).a, f(h).b))
-\"@@"(Js.log, Obj.tag(Obj.repr({"_5": 3})))
-
-Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/gpr_2316_test.js b/jscomp/test/gpr_2316_test.js
deleted file mode 100644
index ef8b728..0000000
--- a/jscomp/test/gpr_2316_test.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var y;
-
-try {
-  throw {
-        RE_EXN_ID: "Failure",
-        _1: "boo",
-        Error: new Error()
-      };
-}
-catch (raw_msg){
-  var msg = Caml_js_exceptions.internalToOCamlException(raw_msg);
-  if (msg.RE_EXN_ID === "Failure") {
-    y = msg._1;
-  } else {
-    throw msg;
-  }
-}
-
-var x;
-
-var exit = 0;
-
-try {
-  throw {
-        RE_EXN_ID: "Failure",
-        _1: "boo",
-        Error: new Error()
-      };
-}
-catch (raw_msg$1){
-  var msg$1 = Caml_js_exceptions.internalToOCamlException(raw_msg$1);
-  if (msg$1.RE_EXN_ID === "Failure") {
-    x = msg$1._1;
-  } else {
-    throw msg$1;
-  }
-}
-
-if (exit === 1) {
-  console.log("ok");
-  x = undefined;
-}
-
-eq("File \"gpr_2316_test.res\", line 22, characters 5-12", y, "boo");
-
-eq("File \"gpr_2316_test.res\", line 23, characters 5-12", x, "boo");
-
-Mt.from_pair_suites("Gpr_2316_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.y = y;
-exports.x = x;
-/* y Not a pure module */
diff --git a/jscomp/test/gpr_2316_test.res b/jscomp/test/gpr_2316_test.res
deleted file mode 100644
index f741533..0000000
--- a/jscomp/test/gpr_2316_test.res
+++ /dev/null
@@ -1,26 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let y = switch failwith("boo") {
-| exception Failure(msg) => Some(msg)
-| e => None
-}
-
-let x = switch failwith("boo") {
-| exception Failure(msg) => Some(msg)
-| e =>
-  Js.log("ok")
-  None
-}
-
-let () = {
-  eq(__LOC__, y, Some("boo"))
-  eq(__LOC__, x, Some("boo"))
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_2352_test.js b/jscomp/test/gpr_2352_test.js
deleted file mode 100644
index 887a690..0000000
--- a/jscomp/test/gpr_2352_test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  x.hey = 22;
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/gpr_2352_test.res b/jscomp/test/gpr_2352_test.res
deleted file mode 100644
index 0a488b7..0000000
--- a/jscomp/test/gpr_2352_test.res
+++ /dev/null
@@ -1 +0,0 @@
-let f = x => x["hey"] = 22
diff --git a/jscomp/test/gpr_2413_test.js b/jscomp/test/gpr_2413_test.js
deleted file mode 100644
index 44fb314..0000000
--- a/jscomp/test/gpr_2413_test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  switch (x.TAG) {
-    case "A" :
-        var a = x._0;
-        if (a.TAG === "P") {
-          var a$1 = a._0;
-          return a$1 + a$1 | 0;
-        }
-        var a$2 = a._0;
-        return a$2 - a$2 | 0;
-    case "B" :
-    case "C" :
-        break;
-    
-  }
-  var a$3 = x._0._0;
-  return Math.imul(a$3, a$3);
-}
-
-function ff(c) {
-  c.contents = c.contents + 1 | 0;
-  var match = (1 + c.contents | 0) + 1 | 0;
-  if (match > 3 || match < 0) {
-    return 0;
-  } else {
-    return match + 1 | 0;
-  }
-}
-
-exports.f = f;
-exports.ff = ff;
-/* No side effect */
diff --git a/jscomp/test/gpr_2413_test.res b/jscomp/test/gpr_2413_test.res
deleted file mode 100644
index fdce7e7..0000000
--- a/jscomp/test/gpr_2413_test.res
+++ /dev/null
@@ -1,31 +0,0 @@
-type inner =
-  | P(int)
-  | S(int)
-
-type outer =
-  | A(inner)
-  | B(inner)
-  | C(inner)
-
-let f = x =>
-  /* These cause unreachable code */
-  switch x {
-  | A(P(a)) => a + a
-  | A(S(a)) => a - a
-  /* These don't, because there's commonality between them */
-  | B(P(a)) | B(S(a)) | C(P(a)) | C(S(a)) => a * a
-  }
-
-let ff = c =>
-  switch {
-    let a = 1
-    let b = 1
-    incr(c)
-    a + c.contents + b
-  } {
-  | 0 => 1
-  | 1 => 2
-  | 2 => 3
-  | 3 => 4
-  | _ => 0
-  }
diff --git a/jscomp/test/gpr_2474.js b/jscomp/test/gpr_2474.js
deleted file mode 100644
index a375d93..0000000
--- a/jscomp/test/gpr_2474.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var coordinates = 1;
-
-exports.coordinates = coordinates;
-/* No side effect */
diff --git a/jscomp/test/gpr_2474.res b/jscomp/test/gpr_2474.res
deleted file mode 100644
index 905835c..0000000
--- a/jscomp/test/gpr_2474.res
+++ /dev/null
@@ -1,4 +0,0 @@
-@@warning("-a")
-let coordinates = 1
-
-/* let 2 = coordinates */
diff --git a/jscomp/test/gpr_2487.js b/jscomp/test/gpr_2487.js
deleted file mode 100644
index 6bf5991..0000000
--- a/jscomp/test/gpr_2487.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Belt_Array = require("../../lib/js/belt_Array.js");
-
-var b = Belt_Array.eq([
-      1,
-      2,
-      3
-    ], [
-      1,
-      2,
-      3
-    ], (function (prim0, prim1) {
-        return prim0 === prim1;
-      }));
-
-var A;
-
-exports.A = A;
-exports.b = b;
-/* b Not a pure module */
diff --git a/jscomp/test/gpr_2487.res b/jscomp/test/gpr_2487.res
deleted file mode 100644
index 8a2763c..0000000
--- a/jscomp/test/gpr_2487.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module A = Belt.Array
-
-let b = A.eq([1, 2, 3], [1, 2, 3], \"=")
diff --git a/jscomp/test/gpr_2503_test.js b/jscomp/test/gpr_2503_test.js
deleted file mode 100644
index 8b2be59..0000000
--- a/jscomp/test/gpr_2503_test.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, b$1) {
-  Mt.bool_suites(test_id, suites, loc, b$1);
-}
-
-function makeWrapper(foo, param) {
-  var tmp = {};
-  if (foo !== undefined) {
-    tmp.foo = Caml_option.valFromOption(foo);
-  }
-  console.log(tmp);
-}
-
-function makeWrapper2(foo, param) {
-  console.log({
-        foo: foo
-      });
-}
-
-makeWrapper2("a", undefined);
-
-function makeWrapper3(foo, param) {
-  console.log(2);
-  var tmp = {};
-  if (foo !== undefined) {
-    tmp.foo = Caml_option.valFromOption(foo);
-  }
-  return tmp;
-}
-
-function makeWrapper4(foo, param) {
-  console.log(2);
-  var tmp = {};
-  var tmp$1 = foo > 100 ? undefined : (
-      foo > 10 ? "b" : "a"
-    );
-  if (tmp$1 !== undefined) {
-    tmp.foo = Caml_option.valFromOption(tmp$1);
-  }
-  return tmp;
-}
-
-b("File \"gpr_2503_test.res\", line 39, characters 2-9", "a" === makeWrapper3("a", undefined).foo);
-
-b("File \"gpr_2503_test.res\", line 41, characters 2-9", undefined === makeWrapper3(undefined, undefined).foo);
-
-b("File \"gpr_2503_test.res\", line 43, characters 2-9", "a" === makeWrapper4(1, undefined).foo);
-
-b("File \"gpr_2503_test.res\", line 45, characters 2-9", "b" === makeWrapper4(11, undefined).foo);
-
-b("File \"gpr_2503_test.res\", line 47, characters 2-9", undefined === makeWrapper4(111, undefined).foo);
-
-Mt.from_pair_suites("Gpr_2503_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.makeWrapper = makeWrapper;
-exports.makeWrapper2 = makeWrapper2;
-exports.makeWrapper3 = makeWrapper3;
-exports.makeWrapper4 = makeWrapper4;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_2503_test.res b/jscomp/test/gpr_2503_test.res
deleted file mode 100644
index 84d03c1..0000000
--- a/jscomp/test/gpr_2503_test.res
+++ /dev/null
@@ -1,49 +0,0 @@
-let suites = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~suites, ~test_id, loc, x, y)
-
-let b = (loc, b) => Mt.bool_suites(~suites, ~test_id, loc, b)
-/* TODO: */
-
-@obj external make: (~foo: [#a | #b]=?, unit) => _ = ""
-
-let makeWrapper = (~foo=?, ()) => Js.log(make(~foo?, ()))
-
-@obj external make2: (~foo: [#a | #b], unit) => _ = ""
-
-let makeWrapper2 = (foo, ()) => Js.log(make2(~foo, ()))
-
-let _ = makeWrapper2(#a, ())
-
-@obj external make3: (~foo: [#a | #b]=?, unit) => _ = ""
-
-let makeWrapper3 = (~foo=?, ()) => {
-  Js.log(2)
-  make(~foo?, ())
-}
-
-let makeWrapper4 = (foo, ()) => {
-  Js.log(2)
-  make(
-    ~foo=?if foo > 100 {
-      None
-    } else if foo > 10 {
-      Some(#b)
-    } else {
-      Some(#a)
-    },
-    (),
-  )
-}
-
-b(__LOC__, Js.eqUndefined(#a, makeWrapper3(~foo=#a, ())["foo"]))
-
-b(__LOC__, Js.undefined == makeWrapper3()["foo"])
-
-b(__LOC__, Js.eqUndefined(#a, makeWrapper4(1, ())["foo"]))
-
-b(__LOC__, Js.eqUndefined(#b, makeWrapper4(11, ())["foo"]))
-
-b(__LOC__, Js.undefined == makeWrapper4(111, ())["foo"])
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_2608_test.js b/jscomp/test/gpr_2608_test.js
deleted file mode 100644
index 4a67676..0000000
--- a/jscomp/test/gpr_2608_test.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var oppHeroes = {
-  hd: 0,
-  tl: /* [] */0
-};
-
-var huntGrootCondition = false;
-
-if (List.length(/* [] */0) > 0) {
-  var x = List.filter(function (h) {
-          return List.hd(/* [] */0) <= 1000;
-        })(oppHeroes);
-  huntGrootCondition = List.length(x) === 0;
-}
-
-var huntGrootCondition2 = true;
-
-if (List.length(/* [] */0) < 0) {
-  var x$1 = List.filter(function (h) {
-          return List.hd(/* [] */0) <= 1000;
-        })(oppHeroes);
-  huntGrootCondition2 = List.length(x$1) === 0;
-}
-
-eq("File \"gpr_2608_test.res\", line 21, characters 5-12", huntGrootCondition, false);
-
-eq("File \"gpr_2608_test.res\", line 22, characters 5-12", huntGrootCondition2, true);
-
-Mt.from_pair_suites("Gpr_2608_test", suites.contents);
-
-var nearestGroots = /* [] */0;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.nearestGroots = nearestGroots;
-exports.oppHeroes = oppHeroes;
-exports.huntGrootCondition = huntGrootCondition;
-exports.huntGrootCondition2 = huntGrootCondition2;
-/* huntGrootCondition Not a pure module */
diff --git a/jscomp/test/gpr_2608_test.res b/jscomp/test/gpr_2608_test.res
deleted file mode 100644
index 65c23d0..0000000
--- a/jscomp/test/gpr_2608_test.res
+++ /dev/null
@@ -1,25 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let nearestGroots = list{}
-
-let oppHeroes = list{0}
-let huntGrootCondition =
-  List.length(nearestGroots) > 0 && {
-      let x = List.filter(h => List.hd(nearestGroots) <= 1000, oppHeroes)
-      List.length(x) == 0
-    }
-
-let huntGrootCondition2 =
-  List.length(nearestGroots) >= 0 || {
-      let x = List.filter(h => List.hd(nearestGroots) <= 1000, oppHeroes)
-      List.length(x) == 0
-    }
-
-let () = {
-  eq(__LOC__, huntGrootCondition, false)
-  eq(__LOC__, huntGrootCondition2, true)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_2614_test.js b/jscomp/test/gpr_2614_test.js
deleted file mode 100644
index 96bc52a..0000000
--- a/jscomp/test/gpr_2614_test.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var v = {
-  "Content-Type": 3,
-  l: 2,
-  open: 2
-};
-
-var b = v.l;
-
-var c = v.open;
-
-function ff(param) {
-  v["Content-Type"] = 3;
-  v.l = 2;
-}
-
-var partial_arg = "x";
-
-function h0(param) {
-  var tmp = {
-    hi: 2
-  };
-  if (partial_arg !== undefined) {
-    tmp["lo-x"] = Caml_option.valFromOption(partial_arg);
-  }
-  return tmp;
-}
-
-var h1 = {
-  "lo-x": "x",
-  hi: 2
-};
-
-var h2 = {
-  hi: 2
-};
-
-function hh(x) {
-  x["lo-x"] = "3";
-  return Caml_option.undefined_to_opt(x["lo-x"]);
-}
-
-function hh2(x) {
-  var match = x["lo-x"];
-  if (match !== undefined) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-var u = {
-  "xx-yy": 3
-};
-
-var x = u["xx-yy"];
-
-var v$1 = x !== undefined ? x : 0;
-
-exports.b = b;
-exports.c = c;
-exports.ff = ff;
-exports.h0 = h0;
-exports.h1 = h1;
-exports.h2 = h2;
-exports.hh = hh;
-exports.hh2 = hh2;
-exports.u = u;
-exports.v = v$1;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_2614_test.res b/jscomp/test/gpr_2614_test.res
deleted file mode 100644
index 8a942e2..0000000
--- a/jscomp/test/gpr_2614_test.res
+++ /dev/null
@@ -1,86 +0,0 @@
-@@warning("-a")
-
-@deriving(abstract)
-type t = {
-  @as("Content-Type") mutable hi: int,
-  @as("l") mutable low: int,
-  @as("open") mutable x: int,
-}
-/* [@@bs.x] */
-/*
-external hiSet :
-      t -> int -> unit = "Content-Type"
-        "\132\149\166\190\000\000\000\019\000\000\000\004\000\000\000\014\000\000\000\012\176\145BE\167,Content-Type@"
-*/
-
-let v = t(~hi=3, ~low=2, ~x=2)
-
-let (a, b, c) = (v->hiGet, v->lowGet, v->xGet)
-
-/**
-  v |. (hi, lo)
-*/
-let ff = () => {
-  v->hiSet(3)
-  v->lowSet(2)
-}
-
-@deriving(abstract)
-type a = {
-  @optional @as("lo-x") mutable low: string,
-  hi: int,
-}
-
-/**
-external a : ?low:int -> hi:int -> a
-low: a -> int option [@@bs.return undefined_to_opt]
-lowSet : a -> int -> unit
-*/
-let h0 = a(~hi=2, ~low="x")
-
-let h1 = a(~hi=2, ~low="x", ())
-
-let h2 = a(~hi=2, ())
-
-let hh = x => {
-  x->lowSet("3")
-  x->lowGet
-}
-
-/* should we make the type of
-
-    lowSet : a -> string option -> unit
-    lowSet : a -> string -> unit
-*/
-
-let hh2 = x =>
-  switch x->lowGet {
-  | None => 0
-  | Some(_) => 1
-  }
-
-@deriving(abstract)
-type css = {
-  @optional a0: int,
-  @optional a1: int,
-  @optional a2: int,
-  @optional a3: int,
-  @optional a4: int,
-  @optional a5: int,
-  @optional a6: int,
-  @optional a7: int,
-  @optional a8: int,
-  @optional @as("xx-yy") a9: int,
-  @optional a10: int,
-  @optional a11: int,
-  @optional a12: int,
-  @optional a13: int,
-  @optional a14: int,
-  @optional a15: int,
-}
-
-let u = css(~a9=3, ())
-let v = switch u->a9Get {
-| None => 0
-| Some(x) => x
-}
diff --git a/jscomp/test/gpr_2633_test.js b/jscomp/test/gpr_2633_test.js
deleted file mode 100644
index 56b8b9e..0000000
--- a/jscomp/test/gpr_2633_test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function on1(foo, $$event) {
-  foo.on($$event.NAME, $$event.VAL);
-}
-
-function on2(foo, h, $$event) {
-  foo.on(Curry._1(h, $$event).NAME, Curry._1(h, $$event).VAL);
-}
-
-exports.on1 = on1;
-exports.on2 = on2;
-/* No side effect */
diff --git a/jscomp/test/gpr_2633_test.res b/jscomp/test/gpr_2633_test.res
deleted file mode 100644
index 74959dc..0000000
--- a/jscomp/test/gpr_2633_test.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type foo
-
-@send
-external on: (
-  foo,
-  @string
-  [
-    | #bar(unit => unit)
-    | #foo(string => unit)
-  ],
-) => unit = "on"
-
-let on1 = (foo, event) => on(foo, event)
-
-/* FIXME */
-let on2 = (foo, h, event) => on(foo, h(event))
diff --git a/jscomp/test/gpr_2642_test.js b/jscomp/test/gpr_2642_test.js
deleted file mode 100644
index f6dd411..0000000
--- a/jscomp/test/gpr_2642_test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function isfree(id, _x) {
-  while(true) {
-    var x = _x;
-    switch (x.TAG) {
-      case "Pident" :
-          return id === x._0;
-      case "Pdot" :
-          _x = x._0;
-          continue ;
-      case "Papply" :
-          if (isfree(id, x._0)) {
-            return true;
-          }
-          _x = x._1;
-          continue ;
-      
-    }
-  };
-}
-
-exports.isfree = isfree;
-/* No side effect */
diff --git a/jscomp/test/gpr_2642_test.res b/jscomp/test/gpr_2642_test.res
deleted file mode 100644
index a26c9af..0000000
--- a/jscomp/test/gpr_2642_test.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type rec t =
-  | Pident(string)
-  | Pdot(t, string, int)
-  | Papply(t, t)
-
-let rec isfree = (id, x) =>
-  switch x {
-  | Pident(id') => id == id'
-  | Pdot(p, s, pos) => isfree(id, p)
-  /* if isfree id p then
-    true
-  else false */
-  | Papply(p1, p2) => isfree(id, p1) || isfree(id, p2)
-  }
diff --git a/jscomp/test/gpr_2682_test.js b/jscomp/test/gpr_2682_test.js
deleted file mode 100644
index a169156..0000000
--- a/jscomp/test/gpr_2682_test.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var sum = ((a,b) => a + b);
-
-var v = sum(1, 2);
-
-function f(a) {
-  return a + 3 | 0;
-}
-
-var b = f(1);
-
-var c = f(2);
-
-var forIn = ((o,foo)=> {
-  for (var i in o){
-    foo(o)
-  }
-  });
-
-function log(x) {
-  console.log(x);
-}
-
-var N = {
-  log2: log
-};
-
-forIn({
-      x: 3
-    }, (function (x) {
-        console.log(x);
-      }));
-
-forIn({
-      x: 3,
-      y: 3
-    }, (function (x) {
-        console.log(x);
-      }));
-
-var f3 = (()=>true);
-
-var bbbb = f3();
-
-if (!bbbb) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_2682_test.res",
-          52,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-exports.sum = sum;
-exports.v = v;
-exports.f = f;
-exports.b = b;
-exports.c = c;
-exports.forIn = forIn;
-exports.N = N;
-exports.f3 = f3;
-exports.bbbb = bbbb;
-/* v Not a pure module */
diff --git a/jscomp/test/gpr_2682_test.res b/jscomp/test/gpr_2682_test.res
deleted file mode 100644
index 638604b..0000000
--- a/jscomp/test/gpr_2682_test.res
+++ /dev/null
@@ -1,52 +0,0 @@
-@@warning("-22")
-/* [@@@bs.config no_export] */
-/* let for_each n =
-  ([%raw{|
-	for (var key in n){
-      console.log(key)
-    }
-  |}] : unit ); () */
-
-let sum: (int, int) => int = %raw(`(a,b) => a + b
-`)
-
-let v = sum(1, 2)
-
-let f = a => a + %raw(`3`)
-
-let b = f(1)
-let c = f(2)
-
-let forIn = %raw(`(o,foo)=> {
-  for (var i in o){
-    foo(o)
-  }
-  }`)
-
-let forIn: ('a, (. string) => unit) => unit = forIn
-
-/*
-let%raw forIn : 'a -> (string -> unit [@bs]) -> unit = fun o foo -> {|
-  for (var i in o){
-    foo(o)
-  }
-|}
-*/
-module N: {
-  let log2: (. string) => unit
-} = {
-  let log = (. x) => Js.log(x)
-
-  let log2: (. 'a) => unit = log
-}
-
-/* let log : 'a -> unit = fun%raw x -> {|console.log (x)|} */
-
-forIn({"x": 3}, (. x) => Js.log(x))
-forIn({"x": 3, "y": 3}, (. x) => Js.log(x))
-
-let f3: (. unit) => bool = %raw("()=>true")
-
-let bbbb = f3(.)
-
-assert(bbbb)
diff --git a/jscomp/test/gpr_2700_test.js b/jscomp/test/gpr_2700_test.js
deleted file mode 100644
index d30a948..0000000
--- a/jscomp/test/gpr_2700_test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  if (x === 3) {
-    return true;
-  } else {
-    return x === 4;
-  }
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/gpr_2700_test.res b/jscomp/test/gpr_2700_test.res
deleted file mode 100644
index 1801ed7..0000000
--- a/jscomp/test/gpr_2700_test.res
+++ /dev/null
@@ -1 +0,0 @@
-let f = x => x == 3 || x == 4
diff --git a/jscomp/test/gpr_2731_test.js b/jscomp/test/gpr_2731_test.js
deleted file mode 100644
index a12d56a..0000000
--- a/jscomp/test/gpr_2731_test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  return x + 1 | 0;
-}
-
-var a = f(1);
-
-var b = f(2);
-
-function g(param) {
-  return 1;
-}
-
-var c = g();
-
-var d = g();
-
-exports.f = f;
-exports.a = a;
-exports.b = b;
-exports.g = g;
-exports.c = c;
-exports.d = d;
-/* a Not a pure module */
diff --git a/jscomp/test/gpr_2731_test.res b/jscomp/test/gpr_2731_test.res
deleted file mode 100644
index bdcb405..0000000
--- a/jscomp/test/gpr_2731_test.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let f = x => x + %raw(`1`)
-
-let a = f(1)
-let b = f(2)
-
-let g = () => %raw(`1`)
-
-let c = g()
-let d = g()
diff --git a/jscomp/test/gpr_2789_test.js b/jscomp/test/gpr_2789_test.js
deleted file mode 100644
index 6404653..0000000
--- a/jscomp/test/gpr_2789_test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-Mt.from_pair_suites("Gpr_2789_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_2789_test.res b/jscomp/test/gpr_2789_test.res
deleted file mode 100644
index ad8d6e7..0000000
--- a/jscomp/test/gpr_2789_test.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-/* let () = 
-  eq __LOC__ 0 (Weak.length (Weak.create 0));
-  eq __LOC__ 1 (Weak.length (Weak.create 1)) */
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_2931_test.js b/jscomp/test/gpr_2931_test.js
deleted file mode 100644
index 9c4bf21..0000000
--- a/jscomp/test/gpr_2931_test.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function fake_c2(a_type, b_type) {
-  switch (a_type) {
-    case "number" :
-        if (b_type === "number") {
-          return 33;
-        }
-        break;
-    case "string" :
-        return 1;
-    case "undefined" :
-        return -1;
-    default:
-      
-  }
-  if (b_type === "undefined") {
-    return 1;
-  } else if (a_type === "number") {
-    return 3;
-  } else {
-    return 0;
-  }
-}
-
-eq("File \"gpr_2931_test.res\", line 15, characters 3-10", 3, fake_c2("number", "xx"));
-
-Mt.from_pair_suites("Gpr_2931_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.fake_c2 = fake_c2;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_2931_test.res b/jscomp/test/gpr_2931_test.res
deleted file mode 100644
index 8fae9dd..0000000
--- a/jscomp/test/gpr_2931_test.res
+++ /dev/null
@@ -1,16 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let fake_c2 = (a_type, b_type) =>
-  switch (a_type, b_type) {
-  | ("undefined", _) => -1
-  | (_, "undefined") => 1
-  | ("string", _) => 1
-  | ("number", "number") => 33
-  | ("number", _) => 3
-  | _ => 0
-  }
-
-eq(__LOC__, 3, fake_c2("number", "xx"))
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_3142_test.js b/jscomp/test/gpr_3142_test.js
deleted file mode 100644
index f897451..0000000
--- a/jscomp/test/gpr_3142_test.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var _map = {"a":"x","u":"hi","b":"你","c":"我"};
-
-var _revMap = {"x":"a","hi":"u","你":"b","我":"c"};
-
-function tToJs(param) {
-  return _map[param];
-}
-
-function tFromJs(param) {
-  return _revMap[param];
-}
-
-eq("File \"gpr_3142_test.res\", line 17, characters 3-10", tToJs("a"), "x");
-
-eq("File \"gpr_3142_test.res\", line 18, characters 3-10", tToJs("u"), "hi");
-
-eq("File \"gpr_3142_test.res\", line 19, characters 3-10", tToJs("b"), "你");
-
-eq("File \"gpr_3142_test.res\", line 20, characters 3-10", tToJs("c"), "我");
-
-eq("File \"gpr_3142_test.res\", line 22, characters 3-10", tFromJs("x"), "a");
-
-eq("File \"gpr_3142_test.res\", line 23, characters 3-10", tFromJs("hi"), "u");
-
-eq("File \"gpr_3142_test.res\", line 24, characters 3-10", tFromJs("你"), "b");
-
-eq("File \"gpr_3142_test.res\", line 25, characters 3-10", tFromJs("我"), "c");
-
-eq("File \"gpr_3142_test.res\", line 26, characters 3-10", tFromJs("xx"), undefined);
-
-Mt.from_pair_suites("Gpr_3142_test", suites.contents);
-
-var v = tToJs;
-
-var u = tFromJs;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.tToJs = tToJs;
-exports.tFromJs = tFromJs;
-exports.v = v;
-exports.u = u;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3142_test.res b/jscomp/test/gpr_3142_test.res
deleted file mode 100644
index 357943c..0000000
--- a/jscomp/test/gpr_3142_test.res
+++ /dev/null
@@ -1,28 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-@deriving(jsConverter)
-type t = [
-  | @as("x") #a
-  | @as("hi") #u
-  | @as(`你`) #b
-  | @as(`我`) #c
-]
-
-let (v, u) = (tToJs, tFromJs)
-
-/* not applicable to thiis type, and unused warning */
-
-eq(__LOC__, v(#a), "x")
-eq(__LOC__, v(#u), "hi")
-eq(__LOC__, v(#b), `你`)
-eq(__LOC__, v(#c), `我`)
-
-eq(__LOC__, u("x"), Some(#a))
-eq(__LOC__, u("hi"), Some(#u))
-eq(__LOC__, u(`你`), Some(#b))
-eq(__LOC__, u(`我`), Some(#c))
-eq(__LOC__, u("xx"), None)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_3154_test.js b/jscomp/test/gpr_3154_test.js
deleted file mode 100644
index 640d60d..0000000
--- a/jscomp/test/gpr_3154_test.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Js_dict = require("../../lib/js/js_dict.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-var d = {};
-
-d["foo"] = undefined;
-
-var match = Js_dict.get(d, "foo");
-
-if (match !== undefined && Caml_option.valFromOption(match) === undefined) {
-  b("File \"gpr_3154_test.res\", line 12, characters 20-27", true);
-} else {
-  b("File \"gpr_3154_test.res\", line 13, characters 11-18", false);
-}
-
-var d0 = {};
-
-d0["foo"] = undefined;
-
-eq("File \"gpr_3154_test.res\", line 20, characters 5-12", Js_dict.get(d0, "foo"), Caml_option.some(undefined));
-
-Mt.from_pair_suites("Gpr_3154_test", suites.contents);
-
-var J;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.J = J;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3154_test.res b/jscomp/test/gpr_3154_test.res
deleted file mode 100644
index a4e9502..0000000
--- a/jscomp/test/gpr_3154_test.res
+++ /dev/null
@@ -1,23 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-
-module J = Js.Dict
-
-let () = {
-  let d = Js.Dict.empty()
-  J.set(d, "foo", None)
-  switch J.get(d, "foo") {
-  | Some(None) => b(__LOC__, true)
-  | _ => b(__LOC__, false)
-  }
-}
-
-let () = {
-  let d0 = Js.Dict.empty()
-  J.set(d0, "foo", None)
-  eq(__LOC__, J.get(d0, "foo"), Some(None))
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_3209_test.js b/jscomp/test/gpr_3209_test.js
deleted file mode 100644
index 170f470..0000000
--- a/jscomp/test/gpr_3209_test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f9(x) {
-  if (typeof x !== "object") {
-    switch (x) {
-      case "T60" :
-      case "T61" :
-      case "T62" :
-          return 1;
-      default:
-        return 3;
-    }
-  } else {
-    switch (x.TAG) {
-      case "T64" :
-      case "T65" :
-          return 2;
-      default:
-        return 3;
-    }
-  }
-}
-
-exports.f9 = f9;
-/* No side effect */
diff --git a/jscomp/test/gpr_3209_test.res b/jscomp/test/gpr_3209_test.res
deleted file mode 100644
index a0f469c..0000000
--- a/jscomp/test/gpr_3209_test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-/* [@@@warning "a-11-8-4-a"] */
-@@warning("a+11+8-8")
-type t6 =
-  | T60
-  | T61
-  | T62
-  | T63
-  | T64(int)
-  | T65(int)
-  | T66(int)
-  | T68(int)
-
-let f9 = x =>
-  switch x {
-  | T60
-  | T61
-  | T62 => 1
-  | T64(_)
-  | T65(_) => 2
-  | _ => 3
-  }
diff --git a/jscomp/test/gpr_3492_test.js b/jscomp/test/gpr_3492_test.js
deleted file mode 100644
index c1d9d84..0000000
--- a/jscomp/test/gpr_3492_test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function foo(a){return a()}
-;
-
-function fn(param) {
-  console.log("hi");
-  return 1;
-}
-
-eq("File \"gpr_3492_test.res\", line 13, characters 12-19", foo(fn), 1);
-
-Mt.from_pair_suites("gpr_3492_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.fn = fn;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3492_test.res b/jscomp/test/gpr_3492_test.res
deleted file mode 100644
index a75d6c1..0000000
--- a/jscomp/test/gpr_3492_test.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-%%raw("function foo(a){return a()}")
-
-@val("foo") external foo: (@uncurry (unit => int)) => int = ""
-let fn = () => {
-  Js.log("hi")
-  1
-}
-
-let () = eq(__LOC__, foo(fn), 1)
-
-let () = Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/gpr_3519_jsx_test.js b/jscomp/test/gpr_3519_jsx_test.js
deleted file mode 100644
index dbda272..0000000
--- a/jscomp/test/gpr_3519_jsx_test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var React = {
-  $$null: undefined
-};
-
-function make(param, param$1) {
-  
-}
-
-var Foo = {
-  make: make
-};
-
-exports.React = React;
-exports.Foo = Foo;
-/* No side effect */
diff --git a/jscomp/test/gpr_3519_jsx_test.res b/jscomp/test/gpr_3519_jsx_test.res
deleted file mode 100644
index fdd5f01..0000000
--- a/jscomp/test/gpr_3519_jsx_test.res
+++ /dev/null
@@ -1,10 +0,0 @@
-module React = {
-  type element = unit
-  let null = ()
-}
-
-module Foo: {
-  @react.component let make: (~htmlAttributes: array<float>=?, unit) => React.element
-} = {
-  @react.component let make = (~htmlAttributes as _=?, ()) => React.null
-}
diff --git a/jscomp/test/gpr_3519_test.js b/jscomp/test/gpr_3519_test.js
deleted file mode 100644
index fb55a38..0000000
--- a/jscomp/test/gpr_3519_test.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var Foo = {};
-
-exports.Foo = Foo;
-/* No side effect */
diff --git a/jscomp/test/gpr_3519_test.res b/jscomp/test/gpr_3519_test.res
deleted file mode 100644
index 5b52ac5..0000000
--- a/jscomp/test/gpr_3519_test.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module Foo: {
-  @obj external makeProps: (~bar: array<string>=?) => string = ""
-} = {
-  @obj external makeProps: (~bar: 'bar=?) => string = ""
-}
-
-type arra<'a> = array<'a>
-
-@send @variadic external f0: (int, int, int, array<int>) => unit = "f0"
-
-@send @variadic external f1: (int, int, int, ~y: array<int>) => unit = "f1"
diff --git a/jscomp/test/gpr_3536_test.js b/jscomp/test/gpr_3536_test.js
deleted file mode 100644
index 15958ca..0000000
--- a/jscomp/test/gpr_3536_test.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var X = {};
-
-function xx(obj, a0, a1, a2, a3, a4, a5) {
-  return (Curry._2(a4, Curry._2(a2, Curry._2(a0, obj, a1), a3), a5) - 1 | 0) - 3 | 0;
-}
-
-eq("File \"gpr_3536_test.res\", line 18, characters 12-19", 5, 5);
-
-eq("File \"gpr_3536_test.res\", line 20, characters 12-19", xx(3, (function (prim0, prim1) {
-            return prim0 - prim1 | 0;
-          }), 2, (function (prim0, prim1) {
-            return prim0 + prim1 | 0;
-          }), 4, (function (prim0, prim1) {
-            return Math.imul(prim0, prim1);
-          }), 3), 11);
-
-Mt.from_pair_suites("Gpr_3536_test", suites.contents);
-
-var v = 5;
-
-var u = {
-  TAG: "Some",
-  _0: 3
-};
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.v = v;
-exports.X = X;
-exports.u = u;
-exports.xx = xx;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3536_test.res b/jscomp/test/gpr_3536_test.res
deleted file mode 100644
index 7991b0d..0000000
--- a/jscomp/test/gpr_3536_test.res
+++ /dev/null
@@ -1,25 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let v = 2->(3->\"+")
-
-module X = {
-  type t = Some(int)
-}
-
-let u = 3->X.Some
-
-let xx = (obj, a0, a1, a2, a3, a4, a5) => obj->a0(a1)->a2(a3)->a4(a5)->\"-"(1)->(3->\"-")
-/*
-  (a4 (a2 (a0 obj a1) a3) a5)
-*/
-
-let () = eq(__LOC__, v, 5)
-
-let () = eq(__LOC__, xx(3, \"-", 2, \"+", 4, \"*", 3), 11)
-
-/*
-
-*/
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_3546_test.js b/jscomp/test/gpr_3546_test.js
deleted file mode 100644
index 5c8420e..0000000
--- a/jscomp/test/gpr_3546_test.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function t_error3(param_0) {
-  return {
-          TAG: "T_error3",
-          _0: param_0
-        };
-}
-
-var t_error = "T_error";
-
-var t_error2 = "T_error2";
-
-exports.t_error = t_error;
-exports.t_error2 = t_error2;
-exports.t_error3 = t_error3;
-/* No side effect */
diff --git a/jscomp/test/gpr_3546_test.res b/jscomp/test/gpr_3546_test.res
deleted file mode 100644
index 020aae3..0000000
--- a/jscomp/test/gpr_3546_test.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@deriving(accessors) type rec terminal<'a> = T_error: terminal<unit>
-
-@deriving(accessors) type rec terminal2<'a> = T_error2: terminal2<unit>
-
-@deriving(accessors) type rec terminal3<'a> = T_error3(int): terminal3<int>
diff --git a/jscomp/test/gpr_3548_test.js b/jscomp/test/gpr_3548_test.js
deleted file mode 100644
index b8bc6e4..0000000
--- a/jscomp/test/gpr_3548_test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var _map = {"Horizontal":"horizontal","Vertical":"vertical"};
-
-var _revMap = {"horizontal":"Horizontal","vertical":"Vertical"};
-
-function orientationToJs(param) {
-  return _map[param];
-}
-
-function orientationFromJs(param) {
-  return _revMap[param];
-}
-
-console.log(orientationToJs("Horizontal"));
-
-exports.orientationToJs = orientationToJs;
-exports.orientationFromJs = orientationFromJs;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3548_test.res b/jscomp/test/gpr_3548_test.res
deleted file mode 100644
index 337d5d7..0000000
--- a/jscomp/test/gpr_3548_test.res
+++ /dev/null
@@ -1,7 +0,0 @@
-@deriving(jsConverter)
-type orientation = [
-  | @as("horizontal") #Horizontal
-  | @as("vertical") #Vertical
-]
-
-let () = Js.log(orientationToJs(#Horizontal))
diff --git a/jscomp/test/gpr_3549_test.js b/jscomp/test/gpr_3549_test.js
deleted file mode 100644
index 264e512..0000000
--- a/jscomp/test/gpr_3549_test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var others = [
-  0,
-  0,
-  1,
-  1,
-  2e3
-];
-
-eq("File \"gpr_3549_test.res\", line 13, characters 5-12", 7.0, 7);
-
-eq("File \"gpr_3549_test.res\", line 14, characters 5-12", 2e3, 2000);
-
-eq("File \"gpr_3549_test.res\", line 15, characters 5-12", 0.2, 0.2);
-
-eq("File \"gpr_3549_test.res\", line 16, characters 5-12", 32, 32);
-
-eq("File \"gpr_3549_test.res\", line 17, characters 5-12", others, [
-      0.0,
-      0.0,
-      1.0,
-      1.0,
-      2e3
-    ]);
-
-Mt.from_pair_suites("Gpr_3549_test", suites.contents);
-
-var u = 32;
-
-var x = 7.0;
-
-var y = 2e3;
-
-var z = 0.2;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.u = u;
-exports.x = x;
-exports.y = y;
-exports.z = z;
-exports.others = others;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3549_test.res b/jscomp/test/gpr_3549_test.res
deleted file mode 100644
index deeba15..0000000
--- a/jscomp/test/gpr_3549_test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let u = 0032 /* integer formatting */
-
-let x = 00007.0
-let y = 02e3
-let z = 0000.2
-let others = (00., 000., 01., 001., 002e3)
-
-let () = {
-  eq(__LOC__, x, 7.)
-  eq(__LOC__, y, 2000.)
-  eq(__LOC__, z, 0.2)
-  eq(__LOC__, u, 32)
-  eq(__LOC__, others, (0.0, 0.0, 1.0, 1.0, 2e3))
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_3566_drive_test.js b/jscomp/test/gpr_3566_drive_test.js
deleted file mode 100644
index c04df35..0000000
--- a/jscomp/test/gpr_3566_drive_test.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-var Gpr_3566_test = require("./gpr_3566_test.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var H = Gpr_3566_test.Test({});
-
-eq("File \"gpr_3566_drive_test.res\", line 7, characters 12-19", H.b, true);
-
-var Caml_option$1 = {};
-
-function f(x) {
-  return Caml_option.some(x);
-}
-
-Mt.from_pair_suites("gpr_3566_drive_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.H = H;
-exports.Caml_option = Caml_option$1;
-exports.f = f;
-/* H Not a pure module */
diff --git a/jscomp/test/gpr_3566_drive_test.res b/jscomp/test/gpr_3566_drive_test.res
deleted file mode 100644
index c8e234d..0000000
--- a/jscomp/test/gpr_3566_drive_test.res
+++ /dev/null
@@ -1,11 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-module H = Gpr_3566_test.Test()
-let () = eq(__LOC__, H.b, true)
-
-module Caml_option = {}
-let f = x => Some(x)
-let () = Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/gpr_3566_test.js b/jscomp/test/gpr_3566_test.js
deleted file mode 100644
index c771437..0000000
--- a/jscomp/test/gpr_3566_test.js
+++ /dev/null
@@ -1,151 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function eq_A(x, y) {
-  if (x.TAG === "A" && y.TAG === "A") {
-    return x._0 === y._0;
-  } else {
-    return false;
-  }
-}
-
-function Test($star) {
-  console.log("no inline");
-  var u = {
-    TAG: "A",
-    _0: 3
-  };
-  var Block = {};
-  var b = eq_A({
-        TAG: "A",
-        _0: 3
-      }, u);
-  return {
-          u: u,
-          Block: Block,
-          y: 32,
-          b: b
-        };
-}
-
-function Test2($star) {
-  console.log("no inline");
-  var Block = {};
-  var b = eq_A({
-        TAG: "A",
-        _0: 3
-      }, {
-        TAG: "A",
-        _0: 3
-      });
-  return {
-          Block: Block,
-          y: 32,
-          b: b
-        };
-}
-
-function f(i, y) {
-  var x = {
-    TAG: "A",
-    _0: i
-  };
-  return eq_A(x, y);
-}
-
-function Test3($star) {
-  var f = Caml_obj.equal;
-  var Caml_obj$1 = {};
-  return {
-          f: f,
-          Caml_obj: Caml_obj$1
-        };
-}
-
-function Test4($star) {
-  var Caml_obj$1 = {};
-  var f = Caml_obj.equal;
-  return {
-          Caml_obj: Caml_obj$1,
-          f: f
-        };
-}
-
-function Test5($star) {
-  var f = function (x) {
-    return Caml_option.some(x);
-  };
-  var Caml_option$1 = {};
-  return {
-          f: f,
-          Caml_option: Caml_option$1
-        };
-}
-
-function Test6($star) {
-  var Caml_option$1 = {};
-  var f = function (x) {
-    return Caml_option.some(x);
-  };
-  return {
-          Caml_option: Caml_option$1,
-          f: f
-        };
-}
-
-function Test7($star) {
-  var Caml_option = {};
-  return {
-          Caml_option: Caml_option
-        };
-}
-
-function Test8($star) {
-  var Curry$1 = {};
-  var f = function (x) {
-    return Curry._1(x, 1);
-  };
-  return {
-          Curry: Curry$1,
-          f: f
-        };
-}
-
-function Test9($star) {
-  var f = function (x) {
-    return Curry._1(x, 1);
-  };
-  var Curry$1 = {};
-  return {
-          f: f,
-          Curry: Curry$1
-        };
-}
-
-function Test10($star) {
-  var Curry = {};
-  return {
-          Curry: Curry
-        };
-}
-
-var x = 3;
-
-exports.eq_A = eq_A;
-exports.Test = Test;
-exports.Test2 = Test2;
-exports.x = x;
-exports.f = f;
-exports.Test3 = Test3;
-exports.Test4 = Test4;
-exports.Test5 = Test5;
-exports.Test6 = Test6;
-exports.Test7 = Test7;
-exports.Test8 = Test8;
-exports.Test9 = Test9;
-exports.Test10 = Test10;
-/* No side effect */
diff --git a/jscomp/test/gpr_3566_test.res b/jscomp/test/gpr_3566_test.res
deleted file mode 100644
index be890db..0000000
--- a/jscomp/test/gpr_3566_test.res
+++ /dev/null
@@ -1,70 +0,0 @@
-type t = A(int) | B(string)
-let eq_A = (x: t, y) =>
-  switch x {
-  | A(x) =>
-    switch y {
-    | A(x1) => x == x1
-    | _ => false
-    }
-  | _ => false
-  }
-
-module Test = () => {
-  let () = Js.log("no inline")
-  let u = A(3)
-  module Block = {}
-  let y = 32
-  let b = eq_A(A(3), u)
-}
-
-module Test2 = () => {
-  let () = Js.log("no inline")
-
-  module Block = {}
-  let y = 32
-  let b = eq_A(A(3), A(3))
-}
-
-let x = 3
-
-let f = (i, y) => {
-  let x = A(i)
-  eq_A(x, y)
-}
-
-module Test3 = () => {
-  let f = (x, y) => x == y
-  module Caml_obj = {}
-}
-module Test4 = () => {
-  module Caml_obj = {}
-  let f = (x, y) => x == y
-}
-
-module Test5 = () => {
-  let f = x => Some(x)
-  module Caml_option = {}
-}
-
-module Test6 = () => {
-  module Caml_option = {}
-  let f = x => Some(x)
-}
-
-module Test7 = () => {
-  module Caml_option = {}
-}
-
-module Test8 = () => {
-  module Curry = {}
-  let f = x => x(1)
-}
-
-module Test9 = () => {
-  let f = x => x(1)
-  module Curry = {}
-}
-
-module Test10 = () => {
-  module Curry = {}
-}
diff --git a/jscomp/test/gpr_3595_test.js b/jscomp/test/gpr_3595_test.js
deleted file mode 100644
index c794191..0000000
--- a/jscomp/test/gpr_3595_test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var x = 1;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.x = x;
-/* Mt Not a pure module */
diff --git a/jscomp/test/gpr_3595_test.res b/jscomp/test/gpr_3595_test.res
deleted file mode 100644
index f3d2c97..0000000
--- a/jscomp/test/gpr_3595_test.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-@@warning("-a")
-
-/* let [|a|] = [|1|] */
-
-let x = 1
-
-/* let () = 
-  eq __LOC__ a 1 
-
-
-let () = Mt.from_pair_suites __FILE__ !suites */
diff --git a/jscomp/test/gpr_3609_test.js b/jscomp/test/gpr_3609_test.js
deleted file mode 100644
index b500d41..0000000
--- a/jscomp/test/gpr_3609_test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function func(state) {
-  if (typeof state !== "object") {
-    return 0;
-  } else {
-    return 0 + state._0 | 0;
-  }
-}
-
-exports.func = func;
-/* No side effect */
diff --git a/jscomp/test/gpr_3609_test.res b/jscomp/test/gpr_3609_test.res
deleted file mode 100644
index 58621c4..0000000
--- a/jscomp/test/gpr_3609_test.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type state =
-  | Empty
-  | Int1(int)
-  | Int2(int)
-let func = (state: state): int =>
-  switch state {
-  | Empty => 0
-  | Int2(intValue)
-  | Int1(intValue) =>
-    let intFunc = intParam => intParam + intValue
-    intFunc(0)
-  }
diff --git a/jscomp/test/gpr_3697_test.js b/jscomp/test/gpr_3697_test.js
deleted file mode 100644
index 8f63781..0000000
--- a/jscomp/test/gpr_3697_test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
-
-function fix(param) {
-  return {
-          TAG: "Fix",
-          _0: {
-            LAZY_DONE: false,
-            VAL: (function () {
-                return fix();
-              })
-          }
-        };
-}
-
-function unfixLeak(_f) {
-  while(true) {
-    var f = _f;
-    _f = CamlinternalLazy.force(f._0);
-    continue ;
-  };
-}
-
-function unfix(p) {
-  while(true) {
-    var match = p.contents;
-    p.contents = CamlinternalLazy.force(match._0);
-  };
-}
-
-exports.fix = fix;
-exports.unfixLeak = unfixLeak;
-exports.unfix = unfix;
-/* No side effect */
diff --git a/jscomp/test/gpr_3697_test.res b/jscomp/test/gpr_3697_test.res
deleted file mode 100644
index 96d88c5..0000000
--- a/jscomp/test/gpr_3697_test.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type rec t<'a> = Fix(lazy_t<t<'a>>)
-
-let rec fix = () => Fix(lazy fix())
-
-let rec unfixLeak = (Fix(f)) => \"@@"(unfixLeak, Lazy.force(f))
-
-let unfix = p =>
-  while true {
-    p :=
-      switch p.contents {
-      | Fix(lazy h) => h
-      }
-  }
-/* ;; unfixLeak (fix ()) */
-
-/* ;; unfix (ref (fix ())) */
diff --git a/jscomp/test/gpr_373_test.js b/jscomp/test/gpr_373_test.js
deleted file mode 100644
index f04dccc..0000000
--- a/jscomp/test/gpr_373_test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var overflow_dec_i32_number = 272872590;
-
-var overflow_dec_i32_number_2 = 0;
-
-var not_overflow_dec_i32_number_3 = -1;
-
-var overflow_hex_i32_number = -1;
-
-exports.overflow_dec_i32_number = overflow_dec_i32_number;
-exports.overflow_dec_i32_number_2 = overflow_dec_i32_number_2;
-exports.not_overflow_dec_i32_number_3 = not_overflow_dec_i32_number_3;
-exports.overflow_hex_i32_number = overflow_hex_i32_number;
-/* No side effect */
diff --git a/jscomp/test/gpr_373_test.res b/jscomp/test/gpr_373_test.res
deleted file mode 100644
index 3b5014c..0000000
--- a/jscomp/test/gpr_373_test.res
+++ /dev/null
@@ -1,10 +0,0 @@
-@@warning("-107")
-
-let overflow_dec_i32_number = 949_460_645_006
-
-let overflow_dec_i32_number_2 = 4611686018427387904 /* max_int + 1 */
-
-let overflow_dec_i32_number_2 = 4611686018427387904
-
-let not_overflow_dec_i32_number_3 = 0xffff_ffff
-let overflow_hex_i32_number = 0xffff_ffffl
diff --git a/jscomp/test/gpr_3770_test.js b/jscomp/test/gpr_3770_test.js
deleted file mode 100644
index 683fc48..0000000
--- a/jscomp/test/gpr_3770_test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function show(x) {
-  var a = x._0;
-  if (a === 0 && x._1 === 0 && x._2 === 0) {
-    return "zeroes";
-  }
-  return String(a) + String(x._1);
-}
-
-exports.show = show;
-/* No side effect */
diff --git a/jscomp/test/gpr_3770_test.res b/jscomp/test/gpr_3770_test.res
deleted file mode 100644
index 095a00d..0000000
--- a/jscomp/test/gpr_3770_test.res
+++ /dev/null
@@ -1,7 +0,0 @@
-type t = Foo(int, int, int)
-
-let show = x =>
-  switch x {
-  | Foo(0, 0, 0) => "zeroes"
-  | Foo(a, b, _) => string_of_int(a) ++ string_of_int(b)
-  }
diff --git a/jscomp/test/gpr_3852_alias.js b/jscomp/test/gpr_3852_alias.js
deleted file mode 100644
index 50f6cf1..0000000
--- a/jscomp/test/gpr_3852_alias.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var A;
-
-exports.A = A;
-/* No side effect */
diff --git a/jscomp/test/gpr_3852_alias.res b/jscomp/test/gpr_3852_alias.res
deleted file mode 100644
index 6df3370..0000000
--- a/jscomp/test/gpr_3852_alias.res
+++ /dev/null
@@ -1,3 +0,0 @@
-module A = Gpr_3852_effect
-
-/* It should generate a dummy JS file */
diff --git a/jscomp/test/gpr_3852_alias_reify.js b/jscomp/test/gpr_3852_alias_reify.js
deleted file mode 100644
index 281b804..0000000
--- a/jscomp/test/gpr_3852_alias_reify.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Gpr_3852_effect = require("./gpr_3852_effect.js");
-
-var A = Gpr_3852_effect;
-
-exports.A = A;
-/* Gpr_3852_effect Not a pure module */
diff --git a/jscomp/test/gpr_3852_alias_reify.res b/jscomp/test/gpr_3852_alias_reify.res
deleted file mode 100644
index 6ab0b07..0000000
--- a/jscomp/test/gpr_3852_alias_reify.res
+++ /dev/null
@@ -1 +0,0 @@
-module A = Gpr_3852_effect
diff --git a/jscomp/test/gpr_3852_alias_reify.resi b/jscomp/test/gpr_3852_alias_reify.resi
deleted file mode 100644
index 4521fed..0000000
--- a/jscomp/test/gpr_3852_alias_reify.resi
+++ /dev/null
@@ -1,3 +0,0 @@
-module A: {
-  let v: int
-}
diff --git a/jscomp/test/gpr_3852_effect.js b/jscomp/test/gpr_3852_effect.js
deleted file mode 100644
index d16bef9..0000000
--- a/jscomp/test/gpr_3852_effect.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log("hello");
-
-var v = 0;
-
-exports.v = v;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3852_effect.res b/jscomp/test/gpr_3852_effect.res
deleted file mode 100644
index d9572c9..0000000
--- a/jscomp/test/gpr_3852_effect.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let v = 0
-let () = Js.log("hello")
diff --git a/jscomp/test/gpr_3865.js b/jscomp/test/gpr_3865.js
deleted file mode 100644
index ae1f07a..0000000
--- a/jscomp/test/gpr_3865.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Gpr_3865_foo = require("./gpr_3865_foo.js");
-
-var B = Gpr_3865_foo;
-
-console.log(Gpr_3865_foo.$$return);
-
-console.log(Gpr_3865_foo.$$return);
-
-var F;
-
-exports.F = F;
-exports.B = B;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3865.res b/jscomp/test/gpr_3865.res
deleted file mode 100644
index 4430d02..0000000
--- a/jscomp/test/gpr_3865.res
+++ /dev/null
@@ -1,5 +0,0 @@
-module F = Gpr_3865_foo
-module B = Gpr_3865_bar.Make(Gpr_3865_foo)
-
-Js.log(F.return)
-Js.log(B.return)
diff --git a/jscomp/test/gpr_3865_bar.js b/jscomp/test/gpr_3865_bar.js
deleted file mode 100644
index c36cc82..0000000
--- a/jscomp/test/gpr_3865_bar.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function Make(M) {
-  return M;
-}
-
-exports.Make = Make;
-/* No side effect */
diff --git a/jscomp/test/gpr_3865_bar.res b/jscomp/test/gpr_3865_bar.res
deleted file mode 100644
index dc25db3..0000000
--- a/jscomp/test/gpr_3865_bar.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module type S = {
-  let return: int
-}
-
-module Make = (M: S) => {
-  include M
-}
diff --git a/jscomp/test/gpr_3865_foo.js b/jscomp/test/gpr_3865_foo.js
deleted file mode 100644
index c99bc65..0000000
--- a/jscomp/test/gpr_3865_foo.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var $$return = 5;
-
-exports.$$return = $$return;
-/* No side effect */
diff --git a/jscomp/test/gpr_3865_foo.res b/jscomp/test/gpr_3865_foo.res
deleted file mode 100644
index 147f5fd..0000000
--- a/jscomp/test/gpr_3865_foo.res
+++ /dev/null
@@ -1 +0,0 @@
-let return = 5
diff --git a/jscomp/test/gpr_3875_test.js b/jscomp/test/gpr_3875_test.js
deleted file mode 100644
index 291db72..0000000
--- a/jscomp/test/gpr_3875_test.js
+++ /dev/null
@@ -1,76 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-
-var result = {
-  contents: ""
-};
-
-function log(x) {
-  result.contents = x;
-}
-
-var Xx = {
-  log: log
-};
-
-function compilerBug(a, b, c, f) {
-  var exit = 0;
-  if (a !== "x") {
-    exit = 2;
-  }
-  if (exit === 2) {
-    if (b === undefined) {
-      if (c) {
-        result.contents = "No x, c is true";
-      } else {
-        result.contents = "No x, c is false";
-      }
-      return ;
-    }
-    if (b !== "x") {
-      if (c) {
-        result.contents = "No x, c is true";
-      } else {
-        result.contents = "No x, c is false";
-      }
-      return ;
-    }
-    
-  }
-  if (Curry._1(f, undefined)) {
-    result.contents = "Some x, f returns true";
-  } else {
-    result.contents = "Some x, f returns false";
-  }
-}
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-compilerBug("x", undefined, true, (function (param) {
-        return true;
-      }));
-
-eq("File \"gpr_3875_test.res\", line 35, characters 5-12", result.contents, "Some x, f returns true");
-
-Mt.from_pair_suites("gpr_3875_test.res", suites.contents);
-
-exports.result = result;
-exports.Xx = Xx;
-exports.compilerBug = compilerBug;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3875_test.res b/jscomp/test/gpr_3875_test.res
deleted file mode 100644
index c5edaeb..0000000
--- a/jscomp/test/gpr_3875_test.res
+++ /dev/null
@@ -1,38 +0,0 @@
-let result = ref("")
-/** TODO: 
-  pattern match over (Some \"xx\") could be simplified
-*/
-module Xx = {
-  let log = x => result := x
-}
-
-/** TODO: 
-  pattern match over (Some \"xx\") could be simplified
-*/
-let compilerBug = (a, b, c, f) =>
-  switch (a, b) {
-  | (Some("x"), _)
-  | (_, Some("x")) =>
-    if f() {
-      Xx.log("Some x, f returns true")
-    } else {
-      Xx.log("Some x, f returns false")
-    }
-  | _ =>
-    if c {
-      Xx.log("No x, c is true")
-    } else {
-      Xx.log("No x, c is false")
-    }
-  }
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let _ = {
-  compilerBug(Some("x"), None, true, () => true)
-  eq(__LOC__, result.contents, "Some x, f returns true")
-}
-
-let () = Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/gpr_3877_test.js b/jscomp/test/gpr_3877_test.js
deleted file mode 100644
index 4311dc1..0000000
--- a/jscomp/test/gpr_3877_test.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function test(code) {
-  if (code > 599 || code < 500) {
-    if (code === 201 || code === 200) {
-      return "good response";
-    } else {
-      return "the catch all";
-    }
-  } else if (code > 597 || code < 512) {
-    return "bad response";
-  } else {
-    return "the catch all";
-  }
-}
-
-var a = "good response";
-
-var b = "bad response";
-
-if (a !== "good response") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_3877_test.res",
-          26,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-if (b !== "bad response") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_3877_test.res",
-          27,
-          0
-        ],
-        Error: new Error()
-      };
-}
-
-exports.test = test;
-exports.a = a;
-exports.b = b;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3877_test.res b/jscomp/test/gpr_3877_test.res
deleted file mode 100644
index c3c72db..0000000
--- a/jscomp/test/gpr_3877_test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-@inline
-let test = code =>
-  switch code {
-  | 201 | 200 => "good response"
-  | 500
-  | 503
-  | 506
-  | 509
-  | 598
-  | 501
-  | 504
-  | 507
-  | 510
-  | 599
-  | 502
-  | 505
-  | 508
-  | 511 => "bad response"
-  | _ => "the catch all"
-  }
-
-let a = test(201)
-
-let b = test(504)
-
-assert (a == "good response")
-assert (b == "bad response")
diff --git a/jscomp/test/gpr_3895_test.js b/jscomp/test/gpr_3895_test.js
deleted file mode 100644
index 6e01e40..0000000
--- a/jscomp/test/gpr_3895_test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(re) {
-  re.exec("banana");
-  return 3;
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/gpr_3895_test.res b/jscomp/test/gpr_3895_test.res
deleted file mode 100644
index 7c6c7c3..0000000
--- a/jscomp/test/gpr_3895_test.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let f = re => {
-  let _ = re->Js.Re.exec_("banana")
-  3
-}
diff --git a/jscomp/test/gpr_3897_test.js b/jscomp/test/gpr_3897_test.js
deleted file mode 100644
index d5f7e2f..0000000
--- a/jscomp/test/gpr_3897_test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function Make(U) {
-  return U;
-}
-
-exports.Make = Make;
-/* No side effect */
diff --git a/jscomp/test/gpr_3897_test.res b/jscomp/test/gpr_3897_test.res
deleted file mode 100644
index 7f26860..0000000
--- a/jscomp/test/gpr_3897_test.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module type S = {
-  let x: int
-}
-
-module Make = (U: S) => {
-  include U
-}
diff --git a/jscomp/test/gpr_3931_test.js b/jscomp/test/gpr_3931_test.js
deleted file mode 100644
index 627a566..0000000
--- a/jscomp/test/gpr_3931_test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_module = require("../../lib/js/caml_module.js");
-
-var PA = Caml_module.init_mod([
-      "gpr_3931_test.res",
-      3,
-      4
-    ], {
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "print"
-        ]]
-    });
-
-var P = Caml_module.init_mod([
-      "gpr_3931_test.res",
-      12,
-      4
-    ], {
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "print"
-        ]]
-    });
-
-function print(a) {
-  $$Array.iter(P.print, a);
-}
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "print"
-        ]]
-    }, PA, {
-      print: print
-    });
-
-function print$1(i) {
-  console.log(String(i));
-}
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "print"
-        ]]
-    }, P, {
-      print: print$1
-    });
-
-Curry._1(PA.print, [
-      1,
-      2
-    ]);
-
-exports.PA = PA;
-exports.P = P;
-/* PA Not a pure module */
diff --git a/jscomp/test/gpr_3931_test.res b/jscomp/test/gpr_3931_test.res
deleted file mode 100644
index 2659308..0000000
--- a/jscomp/test/gpr_3931_test.res
+++ /dev/null
@@ -1,16 +0,0 @@
-module rec PA: {
-  let print: array<int> => unit
-} = {
-  /* let () = P.print 3 */
-  let print = {
-    let iter = Array.iter(P.print)
-    a => iter(a)
-  }
-}
-and P: {
-  let print: int => unit
-} = {
-  let print = i => print_endline(string_of_int(i))
-}
-
-let () = PA.print([1, 2])
diff --git a/jscomp/test/gpr_3980_test.js b/jscomp/test/gpr_3980_test.js
deleted file mode 100644
index 478fd21..0000000
--- a/jscomp/test/gpr_3980_test.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Js_math = require("../../lib/js/js_math.js");
-
-var match = 1;
-
-if (match !== undefined) {
-  if (match !== 1) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "gpr_3980_test.res",
-            15,
-            7
-          ],
-          Error: new Error()
-        };
-  }
-  var match$1 = 1;
-  if (match$1 !== 1) {
-    if (match$1 !== 2) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "gpr_3980_test.res",
-              13,
-              9
-            ],
-            Error: new Error()
-          };
-    }
-    Js_math.floor(1);
-  }
-  
-} else {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_3980_test.res",
-          15,
-          7
-        ],
-        Error: new Error()
-      };
-}
-
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_3980_test.res b/jscomp/test/gpr_3980_test.res
deleted file mode 100644
index 0e2e4b7..0000000
--- a/jscomp/test/gpr_3980_test.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type student = {
-  name: string,
-  age: int,
-}
-let _ = switch Some(1) {
-| Some(1) =>
-  switch %raw("1") {
-  | 1 => {name: "hi", age: 1}
-  | 2 => {
-      name: "bye",
-      age: Js.Math.floor(1.),
-    }
-  | _ => assert(false)
-  }
-| _ => assert(false)
-}
diff --git a/jscomp/test/gpr_4025_test.js b/jscomp/test/gpr_4025_test.js
deleted file mode 100644
index c919274..0000000
--- a/jscomp/test/gpr_4025_test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-({})["hi"] = "hello";
-
-console.log("hi");
-
-function f(x) {
-  ({
-      x: (console.log("hi"), x)
-    }).x = x + 1 | 0;
-}
-
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4025_test.res b/jscomp/test/gpr_4025_test.res
deleted file mode 100644
index c87d546..0000000
--- a/jscomp/test/gpr_4025_test.res
+++ /dev/null
@@ -1,18 +0,0 @@
-()->Js.Dict.empty->Js.Dict.set("hi", "hello")
-
-type u = {mutable x: int}
-
-{x: 3}.x = {
-  print_endline("hi")
-  2
-}
-
-let f = x => {x: x}.x = x + 1
-
-let f = x =>
-  {
-    x: {
-      print_endline("hi")
-      x
-    },
-  }.x = x + 1
diff --git a/jscomp/test/gpr_405_test.js b/jscomp/test/gpr_405_test.js
deleted file mode 100644
index 3deb71c..0000000
--- a/jscomp/test/gpr_405_test.js
+++ /dev/null
@@ -1,124 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var Curry = require("../../lib/js/curry.js");
-var Hashtbl = require("../../lib/js/hashtbl.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function Make(funarg) {
-  var $$let = funarg.V;
-  var H = Hashtbl.Make({
-        equal: $$let.equal,
-        hash: $$let.hash
-      });
-  var find_default = function (htbl, x) {
-    try {
-      return Curry._2(H.find, htbl, x);
-    }
-    catch (raw_exn){
-      var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-      if (exn.RE_EXN_ID === "Not_found") {
-        return false;
-      }
-      throw exn;
-    }
-  };
-  var min_cutset = function (gr, first_node) {
-    var n_labels = Curry._1(H.create, 97);
-    var l_labels = Curry._1(H.create, 97);
-    var already_processed = Curry._1(H.create, 97);
-    var on_the_stack = Curry._1(H.create, 97);
-    var cut_set = {
-      contents: /* [] */0
-    };
-    var counter = {
-      contents: 1
-    };
-    var step2 = function (top, rest_of_stack) {
-      if (find_default(already_processed, top)) {
-        throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "gpr_405_test.res",
-                40,
-                6
-              ],
-              Error: new Error()
-            };
-      }
-      if (find_default(on_the_stack, top)) {
-        throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "gpr_405_test.res",
-                41,
-                6
-              ],
-              Error: new Error()
-            };
-      }
-      Curry._3(H.add, on_the_stack, top, true);
-      Curry._3(H.add, n_labels, top, counter.contents);
-      counter.contents = counter.contents + 1 | 0;
-      Curry._3(H.add, l_labels, top, 0);
-      Curry._3(H.add, already_processed, top, true);
-      var _successors = Curry._2(funarg.succ, gr, top);
-      var _top = top;
-      var _rest_of_stack = rest_of_stack;
-      while(true) {
-        var rest_of_stack$1 = _rest_of_stack;
-        var top$1 = _top;
-        var successors = _successors;
-        if (successors) {
-          var successor = successors.hd;
-          if (!find_default(already_processed, successor)) {
-            return step2(successor, {
-                        hd: [
-                          top$1,
-                          successors
-                        ],
-                        tl: rest_of_stack$1
-                      });
-          }
-          var x = find_default(on_the_stack, successor) ? Curry._2(H.find, n_labels, successor) : Curry._2(H.find, l_labels, successor);
-          Curry._3(H.add, l_labels, top$1, Caml.int_max(Curry._2(H.find, l_labels, top$1), x));
-          _successors = successors.tl;
-          continue ;
-        }
-        if (Curry._2(H.find, l_labels, top$1) === Curry._2(H.find, n_labels, top$1)) {
-          cut_set.contents = {
-            hd: top$1,
-            tl: cut_set.contents
-          };
-          Curry._3(H.add, l_labels, top$1, 0);
-        }
-        if (Curry._2(H.find, l_labels, top$1) > Curry._2(H.find, n_labels, top$1)) {
-          throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "Graph.Mincut: graph not reducible",
-                Error: new Error()
-              };
-        }
-        if (!rest_of_stack$1) {
-          return cut_set.contents;
-        }
-        var match = rest_of_stack$1.hd;
-        var new_top = match[0];
-        Curry._3(H.add, on_the_stack, top$1, false);
-        Curry._3(H.add, l_labels, new_top, Caml.int_max(Curry._2(H.find, l_labels, top$1), Curry._2(H.find, l_labels, new_top)));
-        _rest_of_stack = rest_of_stack$1.tl;
-        _top = new_top;
-        _successors = match[1];
-        continue ;
-      };
-    };
-    return step2(first_node, /* [] */0);
-  };
-  return {
-          min_cutset: min_cutset
-        };
-}
-
-exports.Make = Make;
-/* No side effect */
diff --git a/jscomp/test/gpr_405_test.res b/jscomp/test/gpr_405_test.res
deleted file mode 100644
index f779235..0000000
--- a/jscomp/test/gpr_405_test.res
+++ /dev/null
@@ -1,94 +0,0 @@
-module type G = {
-  type t
-  module V: {
-    /*** Vertices are {!COMPARABLE}. */
-
-    type t
-
-    let compare: (t, t) => int
-    let hash: t => int
-    let equal: (t, t) => bool
-
-    type label
-    let create: label => t
-    let label: t => label
-  }
-  let succ: (t, V.t) => list<V.t>
-}
-
-module Make = (G: G) => {
-  module H = Hashtbl.Make(G.V)
-
-  let find_default = (htbl, x) =>
-    try H.find(htbl, x) catch {
-    | Not_found => false
-    }
-
-  let min_cutset = (gr, first_node) => {
-    let n_labels = H.create(97)
-    let l_labels = H.create(97)
-
-    let already_processed = H.create(97)
-    let is_already_processed = x => find_default(already_processed, x)
-
-    let on_the_stack = H.create(97)
-    let is_on_the_stack = x => find_default(on_the_stack, x)
-    let cut_set = ref(list{})
-    let counter = ref(1)
-
-    let rec step2 = (top, rest_of_stack) => {
-      assert(!is_already_processed(top))
-      assert(!is_on_the_stack(top))
-      H.add(on_the_stack, top, true)
-      H.add(n_labels, top, counter.contents)
-      counter := counter.contents + 1
-      H.add(l_labels, top, 0)
-      H.add(already_processed, top, true)
-      step3(G.succ(gr, top), top, rest_of_stack)
-    }
-
-    and step3 = (successors, top, rest_of_stack) =>
-      switch successors {
-      | list{successor, ...other_successors} =>
-        if !is_already_processed(successor) {
-          /* step 4 */
-          step2(successor, list{(top, successors), ...rest_of_stack})
-        } else {
-          /* step 5 */
-
-          let x = if is_on_the_stack(successor) {
-            H.find(n_labels, successor)
-          } else {
-            H.find(l_labels, successor)
-          }
-
-          H.add(l_labels, top, max(H.find(l_labels, top), x))
-          step3(other_successors, top, rest_of_stack)
-        }
-
-      | list{} =>
-        /* step 7 */
-        if H.find(l_labels, top) == H.find(n_labels, top) {
-          cut_set := list{top, ...cut_set.contents}
-          H.add(l_labels, top, 0)
-        }
-
-        /* check added between algorithms C and D */
-        if H.find(l_labels, top) > H.find(n_labels, top) {
-          raise(Invalid_argument("Graph.Mincut: graph not reducible"))
-        } else {
-          /* step 8 */
-          switch rest_of_stack {
-          | list{} => cut_set.contents /* SUCCESS */
-          | list{(new_top, new_successors), ...new_tail} =>
-            H.add(on_the_stack, top, false)
-            H.add(l_labels, new_top, max(H.find(l_labels, top), H.find(l_labels, new_top)))
-            step3(new_successors, new_top, new_tail)
-          }
-        }
-      }
-
-    /* step 2 */
-    step2(first_node, list{})
-  }
-}
diff --git a/jscomp/test/gpr_405_test.resi b/jscomp/test/gpr_405_test.resi
deleted file mode 100644
index 9167fc8..0000000
--- a/jscomp/test/gpr_405_test.resi
+++ /dev/null
@@ -1,22 +0,0 @@
-module type G = {
-  type t
-  module V: {
-    /*** Vertices are {!COMPARABLE}. */
-
-    type t
-
-    let compare: (t, t) => int
-    let hash: t => int
-    let equal: (t, t) => bool
-
-    type label
-    let create: label => t
-    let label: t => label
-  }
-  let succ: (t, V.t) => list<V.t>
-}
-
-module Make: (G: G) =>
-{
-  let min_cutset: (G.t, G.V.t) => list<G.V.t>
-}
diff --git a/jscomp/test/gpr_4069_test.js b/jscomp/test/gpr_4069_test.js
deleted file mode 100644
index d9fdf4e..0000000
--- a/jscomp/test/gpr_4069_test.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function f(value) {
-  if (value == null) {
-    return ;
-  } else {
-    return value;
-  }
-}
-
-function fxx(v) {
-  var match = Curry._1(v, undefined);
-  switch (match) {
-    case 1 :
-        return /* 'a' */97;
-    case 2 :
-        return /* 'b' */98;
-    case 3 :
-        return /* 'c' */99;
-    default:
-      return /* 'd' */100;
-  }
-}
-
-function fxxx2(v) {
-  if (Curry._1(v, undefined)) {
-    return 2;
-  } else {
-    return 1;
-  }
-}
-
-function fxxx3(v) {
-  if (Curry._1(v, undefined)) {
-    return 2;
-  } else {
-    return 1;
-  }
-}
-
-exports.f = f;
-exports.fxx = fxx;
-exports.fxxx2 = fxxx2;
-exports.fxxx3 = fxxx3;
-/* No side effect */
diff --git a/jscomp/test/gpr_4069_test.res b/jscomp/test/gpr_4069_test.res
deleted file mode 100644
index 305c35e..0000000
--- a/jscomp/test/gpr_4069_test.res
+++ /dev/null
@@ -1,26 +0,0 @@
-let f = value =>
-  switch Js.Nullable.isNullable(value) {
-  | false => Some((Obj.magic(value): string))
-  | true => None
-  }
-
-let fxx = v =>
-  switch v() {
-  | 1 => 'a'
-  | 2 => 'b'
-  | 3 => 'c'
-  | _ => 'd'
-  }
-
-let fxxx2 = v =>
-  switch v() {
-  | false => 1
-  | true => 2
-  }
-
-let fxxx3 = v =>
-  if v() {
-    2
-  } else {
-    1
-  }
diff --git a/jscomp/test/gpr_4265_test.js b/jscomp/test/gpr_4265_test.js
deleted file mode 100644
index b5e9236..0000000
--- a/jscomp/test/gpr_4265_test.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Belt_MutableMapInt = require("../../lib/js/belt_MutableMapInt.js");
-var Belt_internalMapInt = require("../../lib/js/belt_internalMapInt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var mockMap = {
-  data: undefined
-};
-
-function add(id) {
-  Belt_MutableMapInt.set(mockMap, id, id);
-  return id;
-}
-
-function remove(id) {
-  Belt_MutableMapInt.remove(mockMap, id);
-}
-
-add(1726);
-
-var n = add(6667);
-
-add(486);
-
-Belt_MutableMapInt.remove(mockMap, 1726);
-
-var n1 = Belt_internalMapInt.getExn(mockMap.data, 6667);
-
-eq("File \"gpr_4265_test.res\", line 18, characters 3-10", n, n1);
-
-Mt.from_pair_suites("gpr_4265_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.mockMap = mockMap;
-exports.add = add;
-exports.remove = remove;
-exports.n = n;
-exports.n1 = n1;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4265_test.res b/jscomp/test/gpr_4265_test.res
deleted file mode 100644
index 0db028d..0000000
--- a/jscomp/test/gpr_4265_test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-open Belt
-let mockMap = MutableMap.Int.make()
-let add = id => {
-  (mockMap->MutableMap.Int.set)(id, id)
-  id
-}
-let remove = id => (mockMap->MutableMap.Int.remove)(id)
-let _ = add(1726)
-let n = add(6667)
-let _ = add(486)
-let _ = remove(1726)
-let n1 = (mockMap->MutableMap.Int.getExn)(6667)
-
-eq(__LOC__, n, n1)
-
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/gpr_4274_test.js b/jscomp/test/gpr_4274_test.js
deleted file mode 100644
index 55ce7a2..0000000
--- a/jscomp/test/gpr_4274_test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Belt_List = require("../../lib/js/belt_List.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-
-var N = {};
-
-function f(X, xs) {
-  X.forEach(xs, {
-        i: (function (x) {
-            console.log(x.x);
-          })
-      });
-}
-
-Belt_List.forEachU({
-      hd: {
-        x: 3
-      },
-      tl: /* [] */0
-    }, (function (x) {
-        console.log(x.x);
-      }));
-
-var Foo = {};
-
-var bar = [{
-    foo: "bar"
-  }];
-
-Belt_Array.mapU(bar, (function (b) {
-        return b.foo;
-      }));
-
-exports.N = N;
-exports.f = f;
-exports.Foo = Foo;
-exports.bar = bar;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4274_test.res b/jscomp/test/gpr_4274_test.res
deleted file mode 100644
index e692133..0000000
--- a/jscomp/test/gpr_4274_test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-module N = {
-  type t = {x: int}
-}
-
-module type X = {
-  type f<'a> = {i: 'a}
-  let forEach: (. array<'a>, f<'a => unit>) => unit
-}
-
-/* type annotation here interferes.. */
-let f = (module(X: X), xs: array<N.t>) => X.forEach(. xs, {X.i: x => Js.log(x.x)})
-
-Belt.List.forEachU(list{{N.x: 3}}, (. x) => Js.log(x.x))
-
-module Foo = {
-  type record = {foo: string}
-}
-let bar = [{Foo.foo: @reason.raw_literal("bar") "bar"}]
-
-let _ = Belt.Array.mapU(bar, (. b) => b.foo)
diff --git a/jscomp/test/gpr_4280_test.js b/jscomp/test/gpr_4280_test.js
deleted file mode 100644
index 2feceec..0000000
--- a/jscomp/test/gpr_4280_test.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var u = {
-  contents: 0
-};
-
-function div(children, param) {
-  for(var i = 0; i <= 1; ++i){
-    u.contents = 300;
-    console.log("nonline");
-  }
-}
-
-function string(s) {
-  for(var i = 0; i <= 1; ++i){
-    u.contents = 200;
-    console.log("no");
-  }
-}
-
-function fn(authState, route) {
-  var onboardingRoute;
-  if (typeof authState === "object") {
-    var exit = 0;
-    if (typeof route === "object" && route.NAME === "Onboarding") {
-      onboardingRoute = route.VAL;
-    } else {
-      exit = 2;
-    }
-    if (exit === 2) {
-      console.log(authState.VAL);
-      div({
-            hd: string("VerifyEmail"),
-            tl: /* [] */0
-          }, undefined);
-      return 2;
-    }
-    
-  } else {
-    var exit$1 = 0;
-    if (typeof route === "object") {
-      if (route.NAME === "Onboarding") {
-        onboardingRoute = route.VAL;
-      } else {
-        exit$1 = 2;
-      }
-    } else {
-      if (route === "SignUp" || route === "SignIn" || route === "Invite" || route === "PasswordReset") {
-        div({
-              hd: string("LoggedOut"),
-              tl: /* [] */0
-            }, undefined);
-        return 1;
-      }
-      exit$1 = 2;
-    }
-    if (exit$1 === 2) {
-      div({
-            hd: string("Redirect"),
-            tl: /* [] */0
-          }, undefined);
-      return 3;
-    }
-    
-  }
-  console.log(onboardingRoute);
-  div({
-        hd: string("Onboarding"),
-        tl: /* [] */0
-      }, undefined);
-  return 0;
-}
-
-eq("File \"gpr_4280_test.res\", line 42, characters 3-10", fn("Unauthenticated", "Invite"), 1);
-
-eq("File \"gpr_4280_test.res\", line 43, characters 3-10", fn("Unauthenticated", {
-          NAME: "Onboarding",
-          VAL: 0
-        }), 0);
-
-eq("File \"gpr_4280_test.res\", line 44, characters 3-10", fn({
-          NAME: "Unverified",
-          VAL: 0
-        }, "Invite"), 2);
-
-eq("File \"gpr_4280_test.res\", line 45, characters 3-10", fn("Unauthenticated", "xx"), 3);
-
-Mt.from_pair_suites("gpr_4280_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.u = u;
-exports.div = div;
-exports.string = string;
-exports.fn = fn;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4280_test.res b/jscomp/test/gpr_4280_test.res
deleted file mode 100644
index a8c039a..0000000
--- a/jscomp/test/gpr_4280_test.res
+++ /dev/null
@@ -1,46 +0,0 @@
-@@bs.config({flags: [/* "-bs-diagnose" */]})
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let u = ref(0)
-let div = (~children, ()) =>
-  for i in 0 to 1 {
-    u := 300
-    Js.log("nonline")
-  }
-
-let string = (s: string) =>
-  for i in 0 to 1 {
-    u := 200
-    Js.log("no")
-  }
-
-let fn = (authState, route) =>
-  switch (authState, route) {
-  | (#Unauthenticated, #Onboarding(onboardingRoute))
-  | (#Unverified(_), #Onboarding(onboardingRoute)) =>
-    Js.Console.log(onboardingRoute)
-    div(~children=list{string("Onboarding")}, ())
-    0
-  | (#Unauthenticated, #SignIn)
-  | (#Unauthenticated, #SignUp)
-  | (#Unauthenticated, #Invite)
-  | (#Unauthenticated, #PasswordReset) =>
-    div(~children=list{string("LoggedOut")}, ())
-    1
-
-  | (#Unverified(user), _) =>
-    Js.Console.log(user)
-    div(~children=list{string("VerifyEmail")}, ())
-    2
-  | (#Unauthenticated, _) =>
-    div(~children=list{string("Redirect")}, ())
-    3
-  }
-
-eq(__LOC__, fn(#Unauthenticated, #Invite), 1)
-eq(__LOC__, fn(#Unauthenticated, #Onboarding(0)), 0)
-eq(__LOC__, fn(#Unverified(0), #Invite), 2)
-eq(__LOC__, fn(#Unauthenticated, #xx), 3)
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/gpr_4407_test.js b/jscomp/test/gpr_4407_test.js
deleted file mode 100644
index 746f29a..0000000
--- a/jscomp/test/gpr_4407_test.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Debug_mode_value = require("./debug_mode_value.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var non_debug_u = {
-  TAG: "A",
-  _0: 1,
-  _1: 2
-};
-
-eq("File \"gpr_4407_test.res\", line 7, characters 3-10", Debug_mode_value.u, non_debug_u);
-
-Mt.from_pair_suites("File \"gpr_4407_test.res\", line 8, characters 20-27", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.non_debug_u = non_debug_u;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4407_test.res b/jscomp/test/gpr_4407_test.res
deleted file mode 100644
index d25c784..0000000
--- a/jscomp/test/gpr_4407_test.res
+++ /dev/null
@@ -1,8 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let non_debug_u = Debug_mode_value.A(1, 2)
-
-eq(__LOC__, Debug_mode_value.u, non_debug_u)
-Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/gpr_441.js b/jscomp/test/gpr_441.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/gpr_441.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/gpr_441.res b/jscomp/test/gpr_441.res
deleted file mode 100644
index fc71a45..0000000
--- a/jscomp/test/gpr_441.res
+++ /dev/null
@@ -1,4 +0,0 @@
-/* external new_rectangle : */
-/* unit -> int  = "" [@@bs.new] [@@bs.module "@Rectangle"] */
-
-/* let rect = new_rectangle */
diff --git a/jscomp/test/gpr_4442_test.js b/jscomp/test/gpr_4442_test.js
deleted file mode 100644
index 746ca0e..0000000
--- a/jscomp/test/gpr_4442_test.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var u = (function fib(n){
-  if(n===0||n==1){
-    return 1
-  }
-  return fib(n-1) + fib(n-2)
-});
-
-eq("File \"gpr_4442_test.res\", line 12, characters 3-10", u(2), 2);
-
-eq("File \"gpr_4442_test.res\", line 13, characters 3-10", u(3), 3);
-
-Mt.from_pair_suites("gpr_4442_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.u = u;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4442_test.res b/jscomp/test/gpr_4442_test.res
deleted file mode 100644
index b35c3fb..0000000
--- a/jscomp/test/gpr_4442_test.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let u = %raw(`function fib(n){
-  if(n===0||n==1){
-    return 1
-  }
-  return fib(n-1) + fib(n-2)
-}`)
-
-eq(__LOC__, u(2), 2)
-eq(__LOC__, u(3), 3)
-
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/gpr_4491_test.js b/jscomp/test/gpr_4491_test.js
deleted file mode 100644
index c36e8b6..0000000
--- a/jscomp/test/gpr_4491_test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(xs) {
-  if (xs !== undefined) {
-    console.log("side effect");
-    
-  } else {
-    
-  }
-  console.log("nothing to see here", xs);
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/gpr_4491_test.res b/jscomp/test/gpr_4491_test.res
deleted file mode 100644
index b6364b9..0000000
--- a/jscomp/test/gpr_4491_test.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let f = xs => {
-  let unused = switch xs {
-  | Some(l) =>
-    Js.log("side effect")
-    list{l, l}
-  | None => list{1, 2}
-  }
-
-  Js.log2("nothing to see here", xs)
-}
diff --git a/jscomp/test/gpr_4494_test.js b/jscomp/test/gpr_4494_test.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/gpr_4494_test.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/gpr_4494_test.res b/jscomp/test/gpr_4494_test.res
deleted file mode 100644
index 97fb80d..0000000
--- a/jscomp/test/gpr_4494_test.res
+++ /dev/null
@@ -1 +0,0 @@
-/* disable it temporarily since it's TNTE */
diff --git a/jscomp/test/gpr_4519_test.js b/jscomp/test/gpr_4519_test.js
deleted file mode 100644
index bebe7f0..0000000
--- a/jscomp/test/gpr_4519_test.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function nextFor(x) {
-  if (x !== undefined) {
-    if (x === "Required") {
-      return "Optional";
-    } else {
-      return ;
-    }
-  } else {
-    return "Required";
-  }
-}
-
-eq("File \"gpr_4519_test.res\", line 16, characters 3-10", nextFor("Required"), "Optional");
-
-Mt.from_pair_suites("Gpr_4519_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.nextFor = nextFor;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4519_test.res b/jscomp/test/gpr_4519_test.res
deleted file mode 100644
index ea25d9a..0000000
--- a/jscomp/test/gpr_4519_test.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-type t =
-  | Required
-  | Optional
-
-let nextFor = (x: option<t>) =>
-  switch x {
-  | Some(Required) => Some(Optional)
-  | Some(Optional) => None
-  | None => Some(Required)
-  }
-
-eq(__LOC__, nextFor(Some(Required)), Some(Optional))
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_459_test.js b/jscomp/test/gpr_459_test.js
deleted file mode 100644
index 660dd23..0000000
--- a/jscomp/test/gpr_459_test.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var uu = {
-  "_'x": 3
-};
-
-var uu2 = {
-  _then: 1,
-  catch: 2,
-  "_'x": 3
-};
-
-var hh = uu["_'x"];
-
-eq("File \"gpr_459_test.res\", line 23, characters 12-19", hh, 3);
-
-eq("File \"gpr_459_test.res\", line 25, characters 12-19", [
-      1,
-      2,
-      3
-    ], [
-      uu2._then,
-      uu2.catch,
-      uu2["_'x"]
-    ]);
-
-Mt.from_pair_suites("Gpr_459_test", suites.contents);
-
-/* hh Not a pure module */
diff --git a/jscomp/test/gpr_459_test.res b/jscomp/test/gpr_459_test.res
deleted file mode 100644
index dcbce38..0000000
--- a/jscomp/test/gpr_459_test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-@@bs.config({no_export: no_export})
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let uu = {
-  "_'x": 3,
-}
-
-let uu2 = {
-  "_then": 1,
-  "catch": 2,
-  "_'x": 3,
-}
-
-let hh = uu["_'x"]
-
-let () = eq(__LOC__, hh, 3)
-
-let () = eq(__LOC__, (1, 2, 3), (uu2["_then"], uu2["catch"], uu2["_'x"]))
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_4632.js b/jscomp/test/gpr_4632.js
deleted file mode 100644
index 47fbae7..0000000
--- a/jscomp/test/gpr_4632.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var T0_myList = {
-  hd: 1,
-  tl: {
-    hd: 2,
-    tl: /* [] */0
-  }
-};
-
-var T0_tail = {
-  hd: 2,
-  tl: /* [] */0
-};
-
-var T0 = {
-  myList: T0_myList,
-  head: 1,
-  tail: T0_tail
-};
-
-throw {
-      RE_EXN_ID: "Match_failure",
-      _1: [
-        "gpr_4632.res",
-        12,
-        6
-      ],
-      Error: new Error()
-    };
-
-exports.T0 = T0;
-exports.T1 = T1;
-/* T1 Not a pure module */
diff --git a/jscomp/test/gpr_4632.res b/jscomp/test/gpr_4632.res
deleted file mode 100644
index ff94d8b..0000000
--- a/jscomp/test/gpr_4632.res
+++ /dev/null
@@ -1,13 +0,0 @@
-@@config({flags: ["-w", "a"]})
-
-module T0 = {
-  let myList = list{1, 2}
-
-  let list{head, ...tail} = myList
-}
-
-module T1 = {
-  let myList = list{(1, 2, 3)}
-
-  let list{h0, h1, ...h2} = myList
-}
diff --git a/jscomp/test/gpr_4639_test.js b/jscomp/test/gpr_4639_test.js
deleted file mode 100644
index 410c13d..0000000
--- a/jscomp/test/gpr_4639_test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function x(url) {
-  if (!url) {
-    return "start";
-  }
-  switch (url.hd) {
-    case "login" :
-        if (url.tl) {
-          return "start";
-        } else {
-          return "login";
-        }
-    case "start" :
-        return "start";
-    default:
-      return "start";
-  }
-}
-
-exports.x = x;
-/* No side effect */
diff --git a/jscomp/test/gpr_4639_test.res b/jscomp/test/gpr_4639_test.res
deleted file mode 100644
index 1683e27..0000000
--- a/jscomp/test/gpr_4639_test.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let x = url =>
-  switch url {
-  | list{} => #start
-  | list{"login"} => #login
-  | list{"start"} => #start
-  | _ => #start
-  }
diff --git a/jscomp/test/gpr_4900_test.js b/jscomp/test/gpr_4900_test.js
deleted file mode 100644
index 4109122..0000000
--- a/jscomp/test/gpr_4900_test.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function showToJs(x) {
-  if (typeof x !== "object" && x === "No") {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-Mt.eq_suites(test_id, suites, "File \"gpr_4900_test.res\", line 13, characters 29-36", true, true);
-
-Mt.eq_suites(test_id, suites, "File \"gpr_4900_test.res\", line 14, characters 29-36", false, false);
-
-Mt.eq_suites(test_id, suites, "File \"gpr_4900_test.res\", line 15, characters 29-36", true, true);
-
-Mt.from_pair_suites("File \"gpr_4900_test.res\", line 17, characters 17-24", suites.contents);
-
-var from_pair_suites = Mt.from_pair_suites;
-
-var eq_suites = Mt.eq_suites;
-
-exports.from_pair_suites = from_pair_suites;
-exports.eq_suites = eq_suites;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.showToJs = showToJs;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4900_test.res b/jscomp/test/gpr_4900_test.res
deleted file mode 100644
index 59a90e3..0000000
--- a/jscomp/test/gpr_4900_test.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let {from_pair_suites, eq_suites} = module(Mt)
-
-let suites = ref(list{})
-let test_id = ref(0)
-type show = No | After(int) | Yes
-
-let showToJs = x =>
-  switch x {
-  | Yes | After(_) => true
-  | No => false
-  }
-
-eq_suites(~test_id, ~suites, __LOC__, showToJs(Yes), true)
-eq_suites(~test_id, ~suites, __LOC__, showToJs(No), false)
-eq_suites(~test_id, ~suites, __LOC__, showToJs(After(3)), true)
-
-from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/gpr_4924_test.js b/jscomp/test/gpr_4924_test.js
deleted file mode 100644
index dbae579..0000000
--- a/jscomp/test/gpr_4924_test.js
+++ /dev/null
@@ -1,93 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function u(b) {
-  if (typeof b !== "object" && b === "A") {
-    return 0;
-  } else {
-    return 1;
-  }
-}
-
-function u1(b) {
-  if (typeof b !== "object" && b === "A") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function u2(b) {
-  if (typeof b !== "object" && b === "A") {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-Mt.eq_suites(test_id, suites, "File \"gpr_4924_test.res\", line 27, characters 29-36", false, false);
-
-Mt.eq_suites(test_id, suites, "File \"gpr_4924_test.res\", line 28, characters 29-36", true, true);
-
-Mt.eq_suites(test_id, suites, "File \"gpr_4924_test.res\", line 29, characters 29-36", true, true);
-
-function u3(b) {
-  if (typeof b !== "object" && b === "A") {
-    return 3;
-  } else {
-    return 4;
-  }
-}
-
-function u4(b) {
-  if (typeof b !== "object" && b === "A") {
-    return 3;
-  } else {
-    return 4;
-  }
-}
-
-function u5(b) {
-  if (typeof b !== "object" && b === "A") {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-function u6(b) {
-  if (typeof b !== "object" && b === "A") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-Mt.from_pair_suites("File \"gpr_4924_test.res\", line 54, characters 17-24", suites.contents);
-
-var from_pair_suites = Mt.from_pair_suites;
-
-var eq_suites = Mt.eq_suites;
-
-exports.from_pair_suites = from_pair_suites;
-exports.eq_suites = eq_suites;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.u = u;
-exports.u1 = u1;
-exports.u2 = u2;
-exports.u3 = u3;
-exports.u4 = u4;
-exports.u5 = u5;
-exports.u6 = u6;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4924_test.res b/jscomp/test/gpr_4924_test.res
deleted file mode 100644
index e212250..0000000
--- a/jscomp/test/gpr_4924_test.res
+++ /dev/null
@@ -1,54 +0,0 @@
-let {from_pair_suites, eq_suites} = module(Mt)
-let suites = ref(list{})
-let test_id = ref(0)
-
-type t =
-  | A
-  | B
-  | C(int)
-let u = b =>
-  switch b {
-  | A => 0
-  | B | C(_) => 1
-  }
-
-let u1 = b =>
-  switch b {
-  | A => true
-  | B | C(_) => false
-  }
-
-let u2 = b =>
-  switch b {
-  | A => false
-  | B | C(_) => true
-  }
-
-eq_suites(~test_id, ~suites, __LOC__, u2(A), false)
-eq_suites(~test_id, ~suites, __LOC__, u2(B), true)
-eq_suites(~test_id, ~suites, __LOC__, u2(C(2)), true)
-let u3 = b =>
-  switch b {
-  | A => 3
-  | B | C(_) => 4
-  }
-
-let u4 = b =>
-  switch b {
-  | A => 3
-  | _ => 4
-  }
-
-let u5 = b =>
-  switch b {
-  | A => false
-  | _ => true
-  }
-
-let u6 = b =>
-  switch b {
-  | A => true
-  | _ => false
-  }
-
-from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/gpr_4931.js b/jscomp/test/gpr_4931.js
deleted file mode 100644
index 3a4a16e..0000000
--- a/jscomp/test/gpr_4931.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-if (import.meta.hot){
-  console.log('es6')
-}
-;
-
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4931.res b/jscomp/test/gpr_4931.res
deleted file mode 100644
index 9138490..0000000
--- a/jscomp/test/gpr_4931.res
+++ /dev/null
@@ -1,9 +0,0 @@
-@@config({
-  flags: ["-w", "-103"],
-})
-
-%%raw(`
-if (import.meta.hot){
-  console.log('es6')
-}
-`)
diff --git a/jscomp/test/gpr_4931_allow.js b/jscomp/test/gpr_4931_allow.js
deleted file mode 100644
index b94afa8..0000000
--- a/jscomp/test/gpr_4931_allow.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-if(import.meta.hot) {
-  import.meta.hot.accept();
-}else{
-  console.log("ok")
-}
-;
-
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4931_allow.mjs b/jscomp/test/gpr_4931_allow.mjs
deleted file mode 100644
index 52d3994..0000000
--- a/jscomp/test/gpr_4931_allow.mjs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-
-
-if(import.meta.hot) {
-  import.meta.hot.accept();
-}else{
-  console.log("ok")
-}
-;
-
-export {
-  
-}
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_4931_allow.res b/jscomp/test/gpr_4931_allow.res
deleted file mode 100644
index 2a7065c..0000000
--- a/jscomp/test/gpr_4931_allow.res
+++ /dev/null
@@ -1,11 +0,0 @@
-@@config({
-  flags : ["-bs-package-output", "es6:jscomp/test:.mjs"]
-})
-
-%%raw(`
-if(import.meta.hot) {
-  import.meta.hot.accept();
-}else{
-  console.log("ok")
-}`)
-
diff --git a/jscomp/test/gpr_5071_test.js b/jscomp/test/gpr_5071_test.js
deleted file mode 100644
index 1940728..0000000
--- a/jscomp/test/gpr_5071_test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var Test = {};
-
-var u = {
-  s: "hello"
-};
-
-function f(s, y) {
-  var tmp = {};
-  if (s !== undefined) {
-    tmp.s = s;
-  }
-  console.log(tmp);
-  console.log(y);
-}
-
-function make(s) {
-  if (s !== undefined) {
-    return s;
-  } else {
-    return null;
-  }
-}
-
-var H = {
-  make: make
-};
-
-exports.Test = Test;
-exports.u = u;
-exports.f = f;
-exports.H = H;
-/* No side effect */
diff --git a/jscomp/test/gpr_5071_test.res b/jscomp/test/gpr_5071_test.res
deleted file mode 100644
index e2f5de6..0000000
--- a/jscomp/test/gpr_5071_test.res
+++ /dev/null
@@ -1,31 +0,0 @@
-@@config({
-  flags: [
-  "-w","-16"  
-    ],
-})
-module Test: {
-  @obj
-  external makeProps: (~s: string=?, unit) => {"s": string} = ""
-} = {
-  @obj
-  external makeProps: (~s: 's=?, unit) => {"s": 's} = ""
-}
-
-let u = Test.makeProps(~s="hello", ())
-
-let f = (~s=?, y) => {
-  Test.makeProps(~s?, ())->Js.log
-  Js.log(y)
-}
-
-module H: {
-  @react.component
-  let make: (~s: string=?) => React.element
-} = {
-  @react.component
-  let make = (~s=?) =>
-    switch s {
-    | Some(s) => React.string(s)
-    | None => React.null
-    }
-}
diff --git a/jscomp/test/gpr_5169_test.js b/jscomp/test/gpr_5169_test.js
deleted file mode 100644
index 8afd1a3..0000000
--- a/jscomp/test/gpr_5169_test.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var NotOption = {};
-
-var TotallyNotOption = {};
-
-var NotOption2 = {};
-
-var a;
-
-var b = 1;
-
-var c;
-
-var d = 1;
-
-var e;
-
-var f = 1;
-
-var g;
-
-var h = 1;
-
-var i = "None";
-
-var j = {
-  TAG: "Some",
-  _0: 1
-};
-
-var k = "None";
-
-var l = {
-  TAG: "Some",
-  _0: 1
-};
-
-exports.NotOption = NotOption;
-exports.a = a;
-exports.b = b;
-exports.c = c;
-exports.d = d;
-exports.TotallyNotOption = TotallyNotOption;
-exports.e = e;
-exports.f = f;
-exports.g = g;
-exports.h = h;
-exports.NotOption2 = NotOption2;
-exports.i = i;
-exports.j = j;
-exports.k = k;
-exports.l = l;
-/* No side effect */
diff --git a/jscomp/test/gpr_5169_test.res b/jscomp/test/gpr_5169_test.res
deleted file mode 100644
index 04b7341..0000000
--- a/jscomp/test/gpr_5169_test.res
+++ /dev/null
@@ -1,44 +0,0 @@
-module NotOption = {
-  type t<'a> = None | Some('a)
-}
-
-let a = NotOption.None /* undefined */
-let b = NotOption.Some(1) /* 1 */
-let c = {
-  open NotOption
-  None
-}
-let d = {
-  open NotOption
-  Some(1)
-}
-
-module TotallyNotOption = {
-  type t<'a> = Some('a) | None
-}
-
-let e = TotallyNotOption.None /* undefined */
-let f = TotallyNotOption.Some(1) /* 1 */
-let g = {
-  open TotallyNotOption
-  None
-}
-let h = {
-  open TotallyNotOption
-  Some(1)
-}
-
-module NotOption2 = {
-  type t<'a> = None | Some('a) | Bogus
-}
-
-let i = NotOption2.None
-let j = NotOption2.Some(1)
-let k = {
-  open NotOption2
-  None
-}
-let l = {
-  open NotOption2
-  Some(1)
-}
diff --git a/jscomp/test/gpr_5218_test.js b/jscomp/test/gpr_5218_test.js
deleted file mode 100644
index 7b7a094..0000000
--- a/jscomp/test/gpr_5218_test.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var test_id = {
-  contents: 0
-};
-
-var suites = {
-  contents: /* [] */0
-};
-
-function test(x) {
-  if (x.NAME === 2) {
-    return {
-            NAME: 2,
-            VAL: x.VAL
-          };
-  } else {
-    return {
-            NAME: 1,
-            VAL: x.VAL
-          };
-  }
-}
-
-Mt.eq_suites(test_id, suites, "File \"gpr_5218_test.res\", line 11, characters 27-34", test({
-          NAME: 1,
-          VAL: 3
-        }), {
-      NAME: 1,
-      VAL: 3
-    });
-
-Mt.eq_suites(test_id, suites, "File \"gpr_5218_test.res\", line 13, characters 27-34", test({
-          NAME: 2,
-          VAL: 3
-        }), {
-      NAME: 2,
-      VAL: 3
-    });
-
-Mt.from_pair_suites("gpr_5218_test.res", suites.contents);
-
-var eq_suites = Mt.eq_suites;
-
-exports.eq_suites = eq_suites;
-exports.test_id = test_id;
-exports.suites = suites;
-exports.test = test;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_5218_test.res b/jscomp/test/gpr_5218_test.res
deleted file mode 100644
index 9ba4448..0000000
--- a/jscomp/test/gpr_5218_test.res
+++ /dev/null
@@ -1,15 +0,0 @@
-
-let {eq_suites} = module(Mt)
-let test_id = ref(0)
-let suites = ref(list{})
-
-let test = x => switch (x) {
-  | #1(x) => #1(x)
-  | #2(x) => #2(x)
-}
-
-eq_suites(~test_id,~suites,__LOC__,test(#1(3)),#1(3))
-
-eq_suites(~test_id,~suites,__LOC__,test(#2(3)),#2(3))
-
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/gpr_5280_optimize_test.js b/jscomp/test/gpr_5280_optimize_test.js
deleted file mode 100644
index b4e9c8b..0000000
--- a/jscomp/test/gpr_5280_optimize_test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a = {
-  TAG: "Color",
-  _0: "#ffff"
-};
-
-var c;
-
-c = typeof a !== "object" ? "orange" : "white";
-
-exports.a = a;
-exports.c = c;
-/* c Not a pure module */
diff --git a/jscomp/test/gpr_5280_optimize_test.res b/jscomp/test/gpr_5280_optimize_test.res
deleted file mode 100644
index 64fcc7a..0000000
--- a/jscomp/test/gpr_5280_optimize_test.res
+++ /dev/null
@@ -1,22 +0,0 @@
-@@config({
-  flags: [
-    "-w",
-    "@A",
-    /* "-drawlambda"; */
-    /* "-dtypedtree"; */
-    /* "-bs-diagnose" */
-    /* "-dparsetree"; */
-    /* "-dsource"; */
-    /* "-bs-no-builtin-ppx"; */
-  ],
-})
-
-type color = Orange | Color(string)
-
-let a = Color("#ffff")
-
-let c = switch a {
-| Orange => "orange"
-| Color("#ffff") => "white"
-| Color(s) => s
-}
diff --git a/jscomp/test/gpr_5312.js b/jscomp/test/gpr_5312.js
deleted file mode 100644
index cf3f2bd..0000000
--- a/jscomp/test/gpr_5312.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function someFunction(arg1, arg2, obj) {
-  obj.someFunction(arg1, arg2);
-}
-
-var MyModule = {
-  someFunction: someFunction
-};
-
-exports.MyModule = MyModule;
-/* No side effect */
diff --git a/jscomp/test/gpr_5312.res b/jscomp/test/gpr_5312.res
deleted file mode 100644
index 572e0a8..0000000
--- a/jscomp/test/gpr_5312.res
+++ /dev/null
@@ -1,10 +0,0 @@
-@@config({flags : [ "-w", "-103"]})
-module type MyModule = {
-  type t
-  @bs.send.pipe(: t) external someFunction: (string, string) => unit = "someFunction"
-}
-
-module MyModule: MyModule = {
-  type t
-  @bs.send.pipe(: t) external someFunction: (string, string) => unit = "someFunction"
-}
\ No newline at end of file
diff --git a/jscomp/test/gpr_5557.js b/jscomp/test/gpr_5557.js
deleted file mode 100644
index e6abeb6..0000000
--- a/jscomp/test/gpr_5557.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function isA(c) {
-  if (c === 97) {
-    return true;
-  }
-  throw {
-        RE_EXN_ID: "Match_failure",
-        _1: [
-          "gpr_5557.res",
-          5,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var h = /* 'a' */97;
-
-exports.isA = isA;
-exports.h = h;
-/* No side effect */
diff --git a/jscomp/test/gpr_5557.res b/jscomp/test/gpr_5557.res
deleted file mode 100644
index a9342cf..0000000
--- a/jscomp/test/gpr_5557.res
+++ /dev/null
@@ -1,9 +0,0 @@
-@@config({
-  flags : ["-w", "-8"]
-})
-let isA = c =>
-  switch c {
-  | 'a' => true
-  }
-
-let h : int = ('a' :> int)  
diff --git a/jscomp/test/gpr_5753.js b/jscomp/test/gpr_5753.js
deleted file mode 100644
index 1c02f17..0000000
--- a/jscomp/test/gpr_5753.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log(/* '文' */25991);
-
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_5753.res b/jscomp/test/gpr_5753.res
deleted file mode 100644
index 27eb975..0000000
--- a/jscomp/test/gpr_5753.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@@config({
-  flags : ["-w", "-8"]
-})
-
-'文'-> Js.log
\ No newline at end of file
diff --git a/jscomp/test/gpr_658.js b/jscomp/test/gpr_658.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/gpr_658.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/gpr_658.res b/jscomp/test/gpr_658.res
deleted file mode 100644
index ce7a172..0000000
--- a/jscomp/test/gpr_658.res
+++ /dev/null
@@ -1,5 +0,0 @@
-/* external obj : < hi : int  >   = "{hi:1}" [@@bs.val] */
-
-@obj external mk: (~hi: int, unit) => {"hi": int} = ""
-
-/* external set_name : < > ->  string -> unit = "1name" [@@bs.set] */
diff --git a/jscomp/test/gpr_858_test.js b/jscomp/test/gpr_858_test.js
deleted file mode 100644
index 84dbb9e..0000000
--- a/jscomp/test/gpr_858_test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var direct = {
-  contents: /* [] */0
-};
-
-var indirect = {
-  contents: /* [] */0
-};
-
-exports.direct = direct;
-exports.indirect = indirect;
-/* No side effect */
diff --git a/jscomp/test/gpr_858_test.res b/jscomp/test/gpr_858_test.res
deleted file mode 100644
index 2825899..0000000
--- a/jscomp/test/gpr_858_test.res
+++ /dev/null
@@ -1,8 +0,0 @@
-let direct: ref<list<int>> = ref(list{})
-let indirect: ref<list<int>> = ref(list{})
-
-/* FIXME */
-
-/* to prevent g from been inlined */
-
-/* to prevent f from been inlined */
diff --git a/jscomp/test/gpr_858_unit2_test.js b/jscomp/test/gpr_858_unit2_test.js
deleted file mode 100644
index 3f5bf78..0000000
--- a/jscomp/test/gpr_858_unit2_test.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-var delayed = {
-  contents: (function (param) {
-      
-    })
-};
-
-for(var i = 1; i <= 2; ++i){
-  var f = (function(i){
-  return function f(n, x) {
-    if (x !== 0) {
-      var prev = delayed.contents;
-      delayed.contents = (function (param) {
-          Curry._1(prev, undefined);
-          f(((n + 1 | 0) + i | 0) - i | 0, x - 1 | 0);
-        });
-      return ;
-    }
-    if (i === n) {
-      return ;
-    }
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "gpr_858_unit2_test.res",
-            6,
-            13
-          ],
-          Error: new Error()
-        };
-  }
-  }(i));
-  f(0, i);
-}
-
-Curry._1(delayed.contents, undefined);
-
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_858_unit2_test.res b/jscomp/test/gpr_858_unit2_test.res
deleted file mode 100644
index bfcb7c1..0000000
--- a/jscomp/test/gpr_858_unit2_test.res
+++ /dev/null
@@ -1,19 +0,0 @@
-let () = {
-  let delayed = ref(() => ())
-  for i in 1 to 2 {
-    let rec f = (n, x) =>
-      switch x {
-      | 0 => assert (i == n)
-      | j =>
-        delayed := {
-            let prev = delayed.contents
-            () => {
-              prev()
-              f(succ(n) + i - i, pred(j))
-            }
-          }
-      }
-    f(0, i)
-  }
-  delayed.contents()
-}
diff --git a/jscomp/test/gpr_904_test.js b/jscomp/test/gpr_904_test.js
deleted file mode 100644
index 9d9f558..0000000
--- a/jscomp/test/gpr_904_test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function check_healty(check) {
-  if (!check.a && !check.b) {
-    return !check.c;
-  } else {
-    return false;
-  }
-}
-
-function basic_not(x) {
-  return !x;
-}
-
-function f(check) {
-  if (check.x) {
-    return check.y;
-  } else {
-    return false;
-  }
-}
-
-eq("File \"gpr_904_test.res\", line 16, characters 12-19", f({
-          x: true,
-          y: false
-        }), false);
-
-eq("File \"gpr_904_test.res\", line 18, characters 12-19", check_healty({
-          a: false,
-          b: false,
-          c: true
-        }), false);
-
-Mt.from_pair_suites("Gpr_904_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.check_healty = check_healty;
-exports.basic_not = basic_not;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_904_test.res b/jscomp/test/gpr_904_test.res
deleted file mode 100644
index fcf72b1..0000000
--- a/jscomp/test/gpr_904_test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let check_healty = check => !check["a"] && (!check["b"] && !check["c"])
-
-let basic_not = x => !x
-
-let f = check => check["x"] && check["y"]
-/* [x && y] in OCaml can be translated to [x && y] in JS */
-
-let () = eq(__LOC__, f({"x": true, "y": false}), false)
-
-let () = eq(__LOC__, check_healty({"a": false, "b": false, "c": true}), false)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_974_test.js b/jscomp/test/gpr_974_test.js
deleted file mode 100644
index 43ed958..0000000
--- a/jscomp/test/gpr_974_test.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-if (!Caml_obj.equal(Caml_option.nullable_to_opt(""), "")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_974_test.res",
-          2,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Caml_option.undefined_to_opt(""), "")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_974_test.res",
-          3,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(Caml_option.null_to_opt(""), "")) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "gpr_974_test.res",
-          4,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-/*  Not a pure module */
diff --git a/jscomp/test/gpr_974_test.res b/jscomp/test/gpr_974_test.res
deleted file mode 100644
index 176ec6d..0000000
--- a/jscomp/test/gpr_974_test.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let _ = {
-  assert (Js.Null_undefined.toOption(Js.Null_undefined.return("")) == Some(""))
-  assert (Js.Undefined.toOption(Js.Undefined.return("")) == Some(""))
-  assert (Js.Null.toOption(Js.Null.return("")) == Some(""))
-}
diff --git a/jscomp/test/gpr_977_test.js b/jscomp/test/gpr_977_test.js
deleted file mode 100644
index 6103854..0000000
--- a/jscomp/test/gpr_977_test.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Int32 = require("../../lib/js/int32.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(x) {
-  for(var i = 0; i <= 100; ++i){
-    console.log(".");
-  }
-  return -x | 0;
-}
-
-function int32_f(x) {
-  for(var i = 0; i <= 100; ++i){
-    console.log(".");
-  }
-  return -x | 0;
-}
-
-var u = f(-2147483648);
-
-eq("File \"gpr_977_test.res\", line 33, characters 5-12", -2147483648, u);
-
-eq("File \"gpr_977_test.res\", line 34, characters 5-12", Int32.min_int, int32_f(Int32.min_int));
-
-Mt.from_pair_suites("Gpr_977_test", suites.contents);
-
-var min_32_int = -2147483648;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.int32_f = int32_f;
-exports.min_32_int = min_32_int;
-exports.u = u;
-/* u Not a pure module */
diff --git a/jscomp/test/gpr_977_test.res b/jscomp/test/gpr_977_test.res
deleted file mode 100644
index 882fe36..0000000
--- a/jscomp/test/gpr_977_test.res
+++ /dev/null
@@ -1,37 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let f = x => {
-  for i in 0 to 100 {
-    Js.log(".") /* prevent optimization */
-  }
-  -x
-}
-
-let int32_f = x => {
-  for i in 0 to 100 {
-    Js.log(".") /* prevent optimization */
-  }
-  Int32.neg(x)
-}
-
-/* let nint32_f x =
-  for i = 0 to 100 do 
-    Js.log "." ; (* prevent optimization*)
-  done;    
-  Nativeint.neg x */
-
-let min_32_int = -2147483648
-let u = f(min_32_int)
-
-let () = {
-  eq(__LOC__, min_32_int, u)
-  eq(__LOC__, Int32.min_int, int32_f(Int32.min_int))
-}
-/* eq __LOC__ (nint32_f (-2147483648n)) (2147483648n) */
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/gpr_return_type_unused_attribute.js b/jscomp/test/gpr_return_type_unused_attribute.js
deleted file mode 100644
index cf81aea..0000000
--- a/jscomp/test/gpr_return_type_unused_attribute.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v = mk(2);
-
-exports.v = v;
-/* v Not a pure module */
diff --git a/jscomp/test/gpr_return_type_unused_attribute.res b/jscomp/test/gpr_return_type_unused_attribute.res
deleted file mode 100644
index 35beb73..0000000
--- a/jscomp/test/gpr_return_type_unused_attribute.res
+++ /dev/null
@@ -1,9 +0,0 @@
-/* [@@@warning "-101"] */
-
-@val
-external mk: int => [#a | #b] = "mk"
-/* [@bs.string] */
-
-let v = mk(2)
-
-/* let h () = v = "x" */
diff --git a/jscomp/test/gray_code_test.js b/jscomp/test/gray_code_test.js
deleted file mode 100644
index dbfe89a..0000000
--- a/jscomp/test/gray_code_test.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Bytes = require("../../lib/js/bytes.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-
-function gray_encode(b) {
-  return b ^ (b >>> 1);
-}
-
-function gray_decode(n) {
-  var _p = n;
-  var _n = (n >>> 1);
-  while(true) {
-    var n$1 = _n;
-    var p = _p;
-    if (n$1 === 0) {
-      return p;
-    }
-    _n = (n$1 >>> 1);
-    _p = p ^ n$1;
-    continue ;
-  };
-}
-
-function bool_string(len, n) {
-  var s = Bytes.make(len, /* '0' */48);
-  var _i = len - 1 | 0;
-  var _n = n;
-  while(true) {
-    var n$1 = _n;
-    var i = _i;
-    if ((n$1 & 1) === 1) {
-      Caml_bytes.set(s, i, /* '1' */49);
-    }
-    if (i <= 0) {
-      return s;
-    }
-    _n = (n$1 >>> 1);
-    _i = i - 1 | 0;
-    continue ;
-  };
-}
-
-function next_power(v) {
-  var v$1 = v - 1 | 0;
-  var v$2 = (v$1 >>> 1) | v$1;
-  var v$3 = (v$2 >>> 2) | v$2;
-  var v$4 = (v$3 >>> 4) | v$3;
-  var v$5 = (v$4 >>> 8) | v$4;
-  var v$6 = (v$5 >>> 16) | v$5;
-  return v$6 + 1 | 0;
-}
-
-exports.gray_encode = gray_encode;
-exports.gray_decode = gray_decode;
-exports.bool_string = bool_string;
-exports.next_power = next_power;
-/* No side effect */
diff --git a/jscomp/test/gray_code_test.res b/jscomp/test/gray_code_test.res
deleted file mode 100644
index 8131da4..0000000
--- a/jscomp/test/gray_code_test.res
+++ /dev/null
@@ -1,38 +0,0 @@
-let gray_encode = b => lxor(b, lsr(b, 1))
-
-let gray_decode = n => {
-  let rec aux = (p, n) =>
-    if n == 0 {
-      p
-    } else {
-      aux(lxor(p, n), lsr(n, 1))
-    }
-
-  aux(n, lsr(n, 1))
-}
-
-let bool_string = (len, n) => {
-  let s = Bytes.make(len, '0')
-  let rec aux = (i, n) => {
-    if land(n, 1) == 1 {
-      Bytes.set(s, i, '1')
-    }
-    if i <= 0 {
-      s
-    } else {
-      aux(pred(i), lsr(n, 1))
-    }
-  }
-
-  aux(pred(len), n)
-}
-
-let next_power = v => {
-  let v = v - 1
-  let v = lor(lsr(v, 1), v)
-  let v = lor(lsr(v, 2), v)
-  let v = lor(lsr(v, 4), v)
-  let v = lor(lsr(v, 8), v)
-  let v = lor(lsr(v, 16), v)
-  v + 1
-}
diff --git a/jscomp/test/guide_for_ext.js b/jscomp/test/guide_for_ext.js
deleted file mode 100644
index 66a6db9..0000000
--- a/jscomp/test/guide_for_ext.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function mk(param) {
-  return {
-          text: 32,
-          label: "hel"
-        };
-}
-
-exports.mk = mk;
-/* No side effect */
diff --git a/jscomp/test/guide_for_ext.res b/jscomp/test/guide_for_ext.res
deleted file mode 100644
index e419672..0000000
--- a/jscomp/test/guide_for_ext.res
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-[%js{ text : 32 ; label : \"hel\" }]
-Attention: also ok for nested case
-*/
-
-let mk = () => {
-  module N = {
-    @obj external mk: (~text: 'b, ~label: 'a) => {"text": 'b, "label": 'a} = ""
-  }
-
-  N.mk(~text=32, ~label="hel")
-}
diff --git a/jscomp/test/hamming_test.js b/jscomp/test/hamming_test.js
deleted file mode 100644
index 6a42718..0000000
--- a/jscomp/test/hamming_test.js
+++ /dev/null
@@ -1,256 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var $$Buffer = require("../../lib/js/buffer.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-var Caml_format = require("../../lib/js/caml_format.js");
-var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
-
-var n0 = Caml_int64.zero;
-
-var n1 = Caml_int64.one;
-
-var n2 = [
-  0,
-  2
-];
-
-var n3 = [
-  0,
-  3
-];
-
-var n5 = [
-  0,
-  5
-];
-
-var $percent = Caml_int64.mod_;
-
-var $star = Caml_int64.mul;
-
-var $slash = Caml_int64.div;
-
-var $plus = Caml_int64.add;
-
-var digit = Caml_format.int64_of_string("1000000000000000000");
-
-function mul(n, param) {
-  var pl = param[0];
-  return [
-          Caml_int64.mod_(Caml_int64.mul(n, pl), digit),
-          Caml_int64.add(Caml_int64.mul(n, param[1]), Caml_int64.div(Caml_int64.mul(n, pl), digit))
-        ];
-}
-
-function cmp(param, param$1) {
-  var ph = param$1[1];
-  var nh = param[1];
-  if (Caml_obj.lessthan(nh, ph)) {
-    return -1;
-  }
-  if (Caml_obj.greaterthan(nh, ph)) {
-    return 1;
-  }
-  var pl = param$1[0];
-  var nl = param[0];
-  if (Caml_obj.lessthan(nl, pl)) {
-    return -1;
-  } else if (Caml_obj.greaterthan(nl, pl)) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-function x2(p) {
-  return mul(n2, p);
-}
-
-function x3(p) {
-  return mul(n3, p);
-}
-
-function x5(p) {
-  return mul(n5, p);
-}
-
-var nn1 = [
-  n1,
-  n0
-];
-
-var buf = $$Buffer.create(5000);
-
-function paddding(s) {
-  if (s.length <= 18) {
-    return "0".repeat(18 - s.length | 0) + s;
-  } else {
-    return s;
-  }
-}
-
-function pr(param) {
-  var nh = param[1];
-  var nl = param[0];
-  if (Caml_int64.equal(nh, n0)) {
-    $$Buffer.add_string(buf, Caml_int64.to_string(nl));
-    return $$Buffer.add_string(buf, "\n");
-  } else {
-    $$Buffer.add_string(buf, Caml_int64.to_string(nh));
-    $$Buffer.add_string(buf, paddding(Caml_int64.to_string(nl)));
-    return $$Buffer.add_string(buf, "\n");
-  }
-}
-
-function map(f, l) {
-  return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              var match = CamlinternalLazy.force(l);
-              return {
-                      TAG: "Cons",
-                      _0: Curry._1(f, match._0),
-                      _1: map(f, match._1)
-                    };
-            })
-        };
-}
-
-function merge(cmp, l1, l2) {
-  return {
-          LAZY_DONE: false,
-          VAL: (function () {
-              var match = CamlinternalLazy.force(l1);
-              var match$1 = CamlinternalLazy.force(l2);
-              var ll2 = match$1._1;
-              var x2 = match$1._0;
-              var ll1 = match._1;
-              var x1 = match._0;
-              var c = Curry._2(cmp, x1, x2);
-              if (c === 0) {
-                return {
-                        TAG: "Cons",
-                        _0: x1,
-                        _1: merge(cmp, ll1, ll2)
-                      };
-              } else if (c < 0) {
-                return {
-                        TAG: "Cons",
-                        _0: x1,
-                        _1: merge(cmp, ll1, l2)
-                      };
-              } else {
-                return {
-                        TAG: "Cons",
-                        _0: x2,
-                        _1: merge(cmp, l1, ll2)
-                      };
-              }
-            })
-        };
-}
-
-function iter_interval(f, _l, _param) {
-  while(true) {
-    var param = _param;
-    var l = _l;
-    var stop = param[1];
-    if (stop === 0) {
-      return ;
-    }
-    var start = param[0];
-    var match = CamlinternalLazy.force(l);
-    if (start <= 0) {
-      Curry._1(f, match._0);
-    }
-    _param = [
-      start - 1 | 0,
-      stop - 1 | 0
-    ];
-    _l = match._1;
-    continue ;
-  };
-}
-
-var hamming = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      return {
-              TAG: "Cons",
-              _0: nn1,
-              _1: merge(cmp, ham2, merge(cmp, ham3, ham5))
-            };
-    })
-};
-
-var ham2 = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      return CamlinternalLazy.force(map(x2, hamming));
-    })
-};
-
-var ham3 = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      return CamlinternalLazy.force(map(x3, hamming));
-    })
-};
-
-var ham5 = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      return CamlinternalLazy.force(map(x5, hamming));
-    })
-};
-
-iter_interval(pr, hamming, [
-      88000,
-      88100
-    ]);
-
-Mt.from_pair_suites("Hamming_test", {
-      hd: [
-        "output",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: $$Buffer.contents(buf),
-                    _1: "6726050156250000000000000000000000000\n6729216728661136606575523242669244416\n6730293634611118019721084375000000000\n6731430439413948088320000000000000000\n6733644878411293029785156250000000000\n6736815026358904613608094481682268160\n6739031236724077363200000000000000000\n6743282904874568941599068856042651648\n6744421903677486140423997176256921600\n6746640616477458432000000000000000000\n6750000000000000000000000000000000000\n6750897085400702945836103937453588480\n6752037370304563380023474956271616000\n6754258588364960445000000000000000000\n6755399441055744000000000000000000000\n6757621765136718750000000000000000000\n6758519863481752323552044362431792300\n6759661435938757375539248533340160000\n6761885162088395001166534423828125000\n6763027302973440000000000000000000000\n6765252136392518877983093261718750000\n6767294110289640371843415775641600000\n6768437164792816653010961694720000000\n6770663777894400000000000000000000000\n6774935403077748181101173538816000000\n6776079748261363229431903027200000000\n6778308875544000000000000000000000000\n6782585324034592562287109312160000000\n6783730961356018699387011072000000000\n6785962605658597412109375000000000000\n6789341568946838378906250000000000000\n6791390813820928754681118720000000000\n6794772480000000000000000000000000000\n6799059315411241693033267200000000000\n6800207735332289107722240000000000000\n6802444800000000000000000000000000000\n6806736475893120841673472000000000000\n6807886192552970708582400000000000000\n6810125783203125000000000000000000000\n6814422305043756994967597929687500000\n6815573319906622439424000000000000000\n6817815439391434192657470703125000000\n6821025214188390921278195662703296512\n6821210263296961784362792968750000000\n6823269127183128330240000000000000000\n6828727177473454717179297140960133120\n6830973624183426662400000000000000000\n6834375000000000000000000000000000000\n6835283298968211732659055236671758336\n6836437837433370422273768393225011200\n6838686820719522450562500000000000000\n6839841934068940800000000000000000000\n6842092037200927734375000000000000000\n6844157203887991842733489140006912000\n6845313241232438768082197309030400000\n6847565144260608000000000000000000000\n6849817788097425363957881927490234375\n6851885286668260876491458472837120000\n6853042629352726861173598715904000000\n6855297075118080000000000000000000000\n6859622095616220033364938208051200000\n6860780745114630269799801815040000000\n6863037736488300000000000000000000000\n6866455078125000000000000000000000000\n6867367640585024969315698178562000000\n6868527598372968933129348710400000000\n6870787138229329879760742187500000000\n6871947673600000000000000000000000000\n6874208338558673858642578125000000000\n6876283198993690364114632704000000000\n6879707136000000000000000000000000000\n6884047556853882214196183040000000000\n6885210332023942721568768000000000000\n6887475360000000000000000000000000000\n6891820681841784852194390400000000000\n6892984769959882842439680000000000000\n6895252355493164062500000000000000000\n6899602583856803957404692903808593750\n6900767986405455219916800000000000000\n6903038132383827120065689086914062500\n6906475391588173806667327880859375000\n6908559991272917434368000000000000000\n6912000000000000000000000000000000000\n6914086267191872901144038355222134784\n6916360794485719495680000000000000000\n6917529027641081856000000000000000000\n6919804687500000000000000000000000000\n6921893310401287552552190498140323840\n6924170405978516481194531250000000000\n6925339958244802560000000000000000000\n6927618187665939331054687500000000000\n6929709168936591740767657754256998400\n6930879656747844252683224775393280000\n6933159708563865600000000000000000000\n6937533852751614137447601703747584000\n6938705662219635946938268699852800000\n6940988288557056000000000000000000000\n6945367371811422783781999935651840000\n6946540504428563148172299337728000000\n6948825708194403750000000000000000000\n"
-                  };
-          })
-      ],
-      tl: /* [] */0
-    });
-
-exports.n0 = n0;
-exports.n1 = n1;
-exports.n2 = n2;
-exports.n3 = n3;
-exports.n5 = n5;
-exports.$percent = $percent;
-exports.$star = $star;
-exports.$slash = $slash;
-exports.$plus = $plus;
-exports.digit = digit;
-exports.mul = mul;
-exports.cmp = cmp;
-exports.x2 = x2;
-exports.x3 = x3;
-exports.x5 = x5;
-exports.nn1 = nn1;
-exports.buf = buf;
-exports.paddding = paddding;
-exports.pr = pr;
-exports.map = map;
-exports.merge = merge;
-exports.iter_interval = iter_interval;
-exports.hamming = hamming;
-exports.ham2 = ham2;
-exports.ham3 = ham3;
-exports.ham5 = ham5;
-/* digit Not a pure module */
diff --git a/jscomp/test/hamming_test.res b/jscomp/test/hamming_test.res
deleted file mode 100644
index 9f5ae62..0000000
--- a/jscomp/test/hamming_test.res
+++ /dev/null
@@ -1,225 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Damien Doligez, projet Moscova, INRIA Rocquencourt */
-/*  */
-/* Copyright 2002 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
-/*  */
-/* ********************************************************************* */
-
-/* We cannot use bignums because we don't do custom runtimes, but
-   int64 is a bit short, so we roll our own 37-digit numbers...
-*/
-
-let n0 = Int64.of_int(0)
-let n1 = Int64.of_int(1)
-let n2 = Int64.of_int(2)
-let n3 = Int64.of_int(3)
-let n5 = Int64.of_int(5)
-
-let \"%" = Int64.rem
-let \"*" = Int64.mul
-let \"/" = Int64.div
-let \"+" = Int64.add
-let digit = Int64.of_string("1000000000000000000")
-
-let mul = (n, (pl, ph)) => (\"%"(n * pl, digit), n * ph + n * pl / digit)
-let cmp = ((nl, nh), (pl, ph)) =>
-  if nh < ph {
-    -1
-  } else if nh > ph {
-    1
-  } else if nl < pl {
-    -1
-  } else if nl > pl {
-    1
-  } else {
-    0
-  }
-
-let x2 = p => mul(n2, p)
-let x3 = p => mul(n3, p)
-let x5 = p => mul(n5, p)
-
-let nn1 = (n1, n0)
-let buf = Buffer.create(5000)
-let paddding = s =>
-  if String.length(s) <= 18 {
-    Js.String2.repeat("0", 18 - String.length(s)) ++ s
-  } else {
-    s
-  }
-let pr = ((nl, nh)) =>
-  if compare(nh, n0) == 0 {
-    Buffer.add_string(buf, Int64.to_string(nl))
-    Buffer.add_string(buf, "\n")
-  } else {
-    Buffer.add_string(buf, Int64.to_string(nh))
-    Buffer.add_string(buf, paddding(Int64.to_string(nl)))
-    Buffer.add_string(buf, "\n")
-  }
-
-/* This is where the interesting stuff begins. */
-
-open Lazy
-
-type rec lcons<'a> = Cons('a, Lazy.t<lcons<'a>>)
-type llist<'a> = Lazy.t<lcons<'a>>
-
-let rec map = (f, l) =>
-  lazy (
-    switch force(l) {
-    | Cons(x, ll) => Cons(f(x), map(f, ll))
-    }
-  )
-
-let rec merge = (cmp, l1, l2) =>
-  lazy (
-    switch (force(l1), force(l2)) {
-    | (Cons(x1, ll1), Cons(x2, ll2)) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        Cons(x1, merge(cmp, ll1, ll2))
-      } else if c < 0 {
-        Cons(x1, merge(cmp, ll1, l2))
-      } else {
-        Cons(x2, merge(cmp, l1, ll2))
-      }
-    }
-  )
-
-let rec iter_interval = (f, l, (start, stop)) =>
-  if stop == 0 {
-    ()
-  } else {
-    switch force(l) {
-    | Cons(x, ll) =>
-      if start <= 0 {
-        f(x)
-      }
-      iter_interval(f, ll, (start - 1, stop - 1))
-    }
-  }
-
-let rec hamming = lazy Cons(nn1, merge(cmp, ham2, merge(cmp, ham3, ham5)))
-and ham2 = lazy force(map(x2, hamming))
-and ham3 = lazy force(map(x3, hamming))
-and ham5 = lazy force(map(x5, hamming))
-
-iter_interval(pr, hamming, (88000, 88100))
-
-Mt.from_pair_suites(
-  __MODULE__,
-  list{
-    (
-      "output",
-      _ => Eq(
-        Buffer.contents(buf),
-        `6726050156250000000000000000000000000
-6729216728661136606575523242669244416
-6730293634611118019721084375000000000
-6731430439413948088320000000000000000
-6733644878411293029785156250000000000
-6736815026358904613608094481682268160
-6739031236724077363200000000000000000
-6743282904874568941599068856042651648
-6744421903677486140423997176256921600
-6746640616477458432000000000000000000
-6750000000000000000000000000000000000
-6750897085400702945836103937453588480
-6752037370304563380023474956271616000
-6754258588364960445000000000000000000
-6755399441055744000000000000000000000
-6757621765136718750000000000000000000
-6758519863481752323552044362431792300
-6759661435938757375539248533340160000
-6761885162088395001166534423828125000
-6763027302973440000000000000000000000
-6765252136392518877983093261718750000
-6767294110289640371843415775641600000
-6768437164792816653010961694720000000
-6770663777894400000000000000000000000
-6774935403077748181101173538816000000
-6776079748261363229431903027200000000
-6778308875544000000000000000000000000
-6782585324034592562287109312160000000
-6783730961356018699387011072000000000
-6785962605658597412109375000000000000
-6789341568946838378906250000000000000
-6791390813820928754681118720000000000
-6794772480000000000000000000000000000
-6799059315411241693033267200000000000
-6800207735332289107722240000000000000
-6802444800000000000000000000000000000
-6806736475893120841673472000000000000
-6807886192552970708582400000000000000
-6810125783203125000000000000000000000
-6814422305043756994967597929687500000
-6815573319906622439424000000000000000
-6817815439391434192657470703125000000
-6821025214188390921278195662703296512
-6821210263296961784362792968750000000
-6823269127183128330240000000000000000
-6828727177473454717179297140960133120
-6830973624183426662400000000000000000
-6834375000000000000000000000000000000
-6835283298968211732659055236671758336
-6836437837433370422273768393225011200
-6838686820719522450562500000000000000
-6839841934068940800000000000000000000
-6842092037200927734375000000000000000
-6844157203887991842733489140006912000
-6845313241232438768082197309030400000
-6847565144260608000000000000000000000
-6849817788097425363957881927490234375
-6851885286668260876491458472837120000
-6853042629352726861173598715904000000
-6855297075118080000000000000000000000
-6859622095616220033364938208051200000
-6860780745114630269799801815040000000
-6863037736488300000000000000000000000
-6866455078125000000000000000000000000
-6867367640585024969315698178562000000
-6868527598372968933129348710400000000
-6870787138229329879760742187500000000
-6871947673600000000000000000000000000
-6874208338558673858642578125000000000
-6876283198993690364114632704000000000
-6879707136000000000000000000000000000
-6884047556853882214196183040000000000
-6885210332023942721568768000000000000
-6887475360000000000000000000000000000
-6891820681841784852194390400000000000
-6892984769959882842439680000000000000
-6895252355493164062500000000000000000
-6899602583856803957404692903808593750
-6900767986405455219916800000000000000
-6903038132383827120065689086914062500
-6906475391588173806667327880859375000
-6908559991272917434368000000000000000
-6912000000000000000000000000000000000
-6914086267191872901144038355222134784
-6916360794485719495680000000000000000
-6917529027641081856000000000000000000
-6919804687500000000000000000000000000
-6921893310401287552552190498140323840
-6924170405978516481194531250000000000
-6925339958244802560000000000000000000
-6927618187665939331054687500000000000
-6929709168936591740767657754256998400
-6930879656747844252683224775393280000
-6933159708563865600000000000000000000
-6937533852751614137447601703747584000
-6938705662219635946938268699852800000
-6940988288557056000000000000000000000
-6945367371811422783781999935651840000
-6946540504428563148172299337728000000
-6948825708194403750000000000000000000
-`,
-      ),
-    ),
-  },
-)
diff --git a/jscomp/test/hash_collision_test.js b/jscomp/test/hash_collision_test.js
deleted file mode 100644
index 5a6d610..0000000
--- a/jscomp/test/hash_collision_test.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function f0(x) {
-  if (x === "azdwbie") {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-function f1(x) {
-  if (x.NAME === "azdwbie") {
-    return x.VAL + 2 | 0;
-  } else {
-    return x.VAL + 1 | 0;
-  }
-}
-
-var hi = [
-  "Eric_Cooper",
-  "azdwbie"
-];
-
-eq("File \"hash_collision_test.res\", line 20, characters 3-10", 0, 0);
-
-eq("File \"hash_collision_test.res\", line 21, characters 3-10", 1, 1);
-
-eq("File \"hash_collision_test.res\", line 23, characters 3-10", f1({
-          NAME: "Eric_Cooper",
-          VAL: -1
-        }), 0);
-
-eq("File \"hash_collision_test.res\", line 25, characters 3-10", f1({
-          NAME: "azdwbie",
-          VAL: -2
-        }), 0);
-
-Mt.from_pair_suites("hash_collision_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f0 = f0;
-exports.f1 = f1;
-exports.hi = hi;
-/*  Not a pure module */
diff --git a/jscomp/test/hash_collision_test.res b/jscomp/test/hash_collision_test.res
deleted file mode 100644
index b05173a..0000000
--- a/jscomp/test/hash_collision_test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-type collision = [#Eric_Cooper | #azdwbie]
-
-let f0 = x =>
-  switch x {
-  | #Eric_Cooper => 0
-  | #azdwbie => 1
-  }
-
-let f1 = x =>
-  switch x {
-  | #Eric_Cooper(x) => x + 1
-  | #azdwbie(x) => x + 2
-  }
-
-let hi: array<collision> = [#Eric_Cooper, #azdwbie]
-eq(__LOC__, f0(#Eric_Cooper), 0)
-eq(__LOC__, f0(#azdwbie), 1)
-
-eq(__LOC__, f1(#Eric_Cooper(-1)), 0)
-
-eq(__LOC__, f1(#azdwbie(-2)), 0)
-
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/hash_sugar_desugar.js b/jscomp/test/hash_sugar_desugar.js
deleted file mode 100644
index 4cf64de..0000000
--- a/jscomp/test/hash_sugar_desugar.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function h1(u) {
-  return u.p;
-}
-
-function h3(u) {
-  var f = u.hi;
-  return Curry._2(f, 1, 2);
-}
-
-function g5(u) {
-  u.hi = 3;
-}
-
-function h5(u) {
-  u.hi = 3;
-}
-
-function h6(u) {
-  return u.p;
-}
-
-function h7(u) {
-  return u.m(1, 2);
-}
-
-function h8(u) {
-  var f = u.hi;
-  return Curry._2(f, 1, 2);
-}
-
-function chain_g(h) {
-  return h.x.y.z;
-}
-
-exports.h1 = h1;
-exports.h3 = h3;
-exports.g5 = g5;
-exports.h5 = h5;
-exports.h6 = h6;
-exports.h7 = h7;
-exports.h8 = h8;
-exports.chain_g = chain_g;
-/* No side effect */
diff --git a/jscomp/test/hash_sugar_desugar.res b/jscomp/test/hash_sugar_desugar.res
deleted file mode 100644
index 326f499..0000000
--- a/jscomp/test/hash_sugar_desugar.res
+++ /dev/null
@@ -1,34 +0,0 @@
-@@config({
-  flags: [
-    /* "-drawlambda"; */
-    /* "-dsource"; */
-    /* "-bs-diagnose" */
-  ],
-})
-
-let h1 = u => u["p"]
-
-let h3 = u => {
-  let f = u["hi"]
-  f(1, 2)
-}
-
-let g5 = u => u["hi"] = 3
-let h5 = u => u["hi"] = 3
-/* assignment 
- This seems to be wrong in rescript syntax
-  u["hi"] = 3 
-*/
-
-let h6 = u => u["p"]
-
-let h7 = u => u["m"](. 1, 2)
-
-let h8 = u => {
-  let f = u["hi"]
-  f(1, 2)
-}
-
-let chain_f = h => h["x"]["y"]["z"]
-
-let chain_g = h => h["x"]["y"]["z"]
diff --git a/jscomp/test/hash_sugar_desugar.resi b/jscomp/test/hash_sugar_desugar.resi
deleted file mode 100644
index ab1f0a3..0000000
--- a/jscomp/test/hash_sugar_desugar.resi
+++ /dev/null
@@ -1,14 +0,0 @@
-let h1: {.."p": 'a} => 'a
-let h3: {.."hi": (int, int) => 'a} => 'a
-let g5: {..@set "hi": int} => unit
-let h5: {..@set "hi": int} => unit
-/* The inferred type is 
-   val h5 : < hi#= : (int -> unit [@bs.meth]); .. > -> unit
-   We should propose the rescript syntax:
-   { mutable "hi" : int  }
-*/
-let h6: {.."p": 'a} => 'a
-let h7: {.."m": (. int, int) => 'a} => 'a
-let h8: {.."hi": (int, int) => 'a} => 'a
-
-let chain_g: {"x": {"y": {"z": int}}} => int
diff --git a/jscomp/test/hash_test.js b/jscomp/test/hash_test.js
deleted file mode 100644
index 3695788..0000000
--- a/jscomp/test/hash_test.js
+++ /dev/null
@@ -1,89 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Char = require("../../lib/js/char.js");
-var $$Array = require("../../lib/js/array.js");
-var Hashtbl = require("../../lib/js/hashtbl.js");
-var Mt_global = require("./mt_global.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(f) {
-  return function (param, param$1) {
-    return Mt_global.collect_eq(test_id, suites, f, param, param$1);
-  };
-}
-
-var test_strings = $$Array.init(32, (function (i) {
-        return Caml_string.make(i, Char.chr(i));
-      }));
-
-var test_strings_hash_results = [
-  0,
-  904391063,
-  889600889,
-  929588010,
-  596566298,
-  365199070,
-  448044845,
-  311625091,
-  681445541,
-  634941451,
-  82108334,
-  17482990,
-  491949228,
-  696194769,
-  711728152,
-  594966620,
-  820561748,
-  958901713,
-  102794744,
-  378848504,
-  349314368,
-  114167579,
-  71240932,
-  110067399,
-  280623927,
-  323523937,
-  310683234,
-  178511779,
-  585018975,
-  544388424,
-  1043872806,
-  831138595
-];
-
-function normalize(x) {
-  return x & 1073741823;
-}
-
-function caml_hash(x) {
-  return Hashtbl.hash(x) & 1073741823;
-}
-
-Mt_global.collect_eq(test_id, suites, "File \"hash_test.res\", line 44, characters 12-19", $$Array.map(caml_hash, test_strings), test_strings_hash_results);
-
-Mt_global.collect_eq(test_id, suites, "File \"hash_test.res\", line 46, characters 12-19", Hashtbl.hash(0) & 1073741823, 129913994);
-
-Mt_global.collect_eq(test_id, suites, "File \"hash_test.res\", line 48, characters 12-19", Hashtbl.hash("x") & 1073741823, 780510073);
-
-Mt_global.collect_eq(test_id, suites, "File \"hash_test.res\", line 50, characters 12-19", Hashtbl.hash("xy") & 1073741823, 194127723);
-
-Mt.from_pair_suites("Hash_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.test_strings = test_strings;
-exports.test_strings_hash_results = test_strings_hash_results;
-exports.normalize = normalize;
-exports.caml_hash = caml_hash;
-/* test_strings Not a pure module */
diff --git a/jscomp/test/hash_test.res b/jscomp/test/hash_test.res
deleted file mode 100644
index 7a532f1..0000000
--- a/jscomp/test/hash_test.res
+++ /dev/null
@@ -1,52 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = f => Mt_global.collect_eq(test_id, suites, f)
-
-let test_strings = Array.init(32, i => String.make(i, Char.chr(i)))
-
-let test_strings_hash_results = [
-  0,
-  904391063,
-  889600889,
-  929588010,
-  596566298,
-  365199070,
-  448044845,
-  311625091,
-  681445541,
-  634941451,
-  82108334,
-  17482990,
-  491949228,
-  696194769,
-  711728152,
-  594966620,
-  820561748,
-  958901713,
-  102794744,
-  378848504,
-  349314368,
-  114167579,
-  71240932,
-  110067399,
-  280623927,
-  323523937,
-  310683234,
-  178511779,
-  585018975,
-  544388424,
-  1043872806,
-  831138595,
-]
-
-let normalize = x => land(x, 0x3FFFFFFF)
-let caml_hash = x => Hashtbl.hash(x) |> normalize
-let () = eq(__LOC__, test_strings |> Array.map(caml_hash), test_strings_hash_results)
-
-let () = eq(__LOC__, Hashtbl.hash(0) |> normalize, 129913994)
-
-let () = eq(__LOC__, Hashtbl.hash("x") |> normalize, 780510073)
-
-let () = eq(__LOC__, Hashtbl.hash("xy") |> normalize, 194127723)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/hashtbl_test.js b/jscomp/test/hashtbl_test.js
deleted file mode 100644
index afb8268..0000000
--- a/jscomp/test/hashtbl_test.js
+++ /dev/null
@@ -1,113 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Hashtbl = require("../../lib/js/hashtbl.js");
-var MoreLabels = require("../../lib/js/moreLabels.js");
-
-function to_list(tbl) {
-  return Hashtbl.fold((function (k, v, acc) {
-                return {
-                        hd: [
-                          k,
-                          v
-                        ],
-                        tl: acc
-                      };
-              }), tbl, /* [] */0);
-}
-
-function f(param) {
-  var tbl = Hashtbl.create(undefined, 17);
-  Hashtbl.add(tbl, 1, /* '1' */49);
-  Hashtbl.add(tbl, 2, /* '2' */50);
-  return List.sort((function (param, param$1) {
-                return Caml.int_compare(param[0], param$1[0]);
-              }), to_list(tbl));
-}
-
-function g(count) {
-  var tbl = Hashtbl.create(undefined, 17);
-  for(var i = 0; i <= count; ++i){
-    Hashtbl.replace(tbl, (i << 1), String(i));
-  }
-  for(var i$1 = 0; i$1 <= count; ++i$1){
-    Hashtbl.replace(tbl, (i$1 << 1), String(i$1));
-  }
-  var v = to_list(tbl);
-  return $$Array.of_list(List.sort((function (param, param$1) {
-                    return Caml.int_compare(param[0], param$1[0]);
-                  }), v));
-}
-
-var suites_0 = [
-  "simple",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: {
-                hd: [
-                  1,
-                  /* '1' */49
-                ],
-                tl: {
-                  hd: [
-                    2,
-                    /* '2' */50
-                  ],
-                  tl: /* [] */0
-                }
-              },
-              _1: f()
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "more_iterations",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: $$Array.init(1001, (function (i) {
-                        return [
-                                (i << 1),
-                                String(i)
-                              ];
-                      })),
-                _1: g(1000)
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "More_labels_regressionfix_374",
-      (function (param) {
-          var tbl = MoreLabels.Hashtbl.create(undefined, 30);
-          Hashtbl.add(tbl, 3, 3);
-          return {
-                  TAG: "Eq",
-                  _0: tbl.size,
-                  _1: 1
-                };
-        })
-    ],
-    tl: /* [] */0
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Hashtbl_test", suites);
-
-exports.to_list = to_list;
-exports.f = f;
-exports.g = g;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/hashtbl_test.res b/jscomp/test/hashtbl_test.res
deleted file mode 100644
index 6132a5e..0000000
--- a/jscomp/test/hashtbl_test.res
+++ /dev/null
@@ -1,47 +0,0 @@
-open Hashtbl
-
-let to_list = tbl => fold((k, v, acc) => list{(k, v), ...acc}, tbl, list{})
-
-let f = () => {
-  let tbl = Hashtbl.create(17)
-  add(tbl, 1, '1')
-  add(tbl, 2, '2')
-  \"@@"(List.sort(((a: int, _), (b, _)) => compare(a, b)), to_list(tbl))
-}
-
-let g = count => {
-  let tbl = Hashtbl.create(17)
-  for i in 0 to count {
-    replace(tbl, i * 2, string_of_int(i))
-  }
-  for i in 0 to count {
-    replace(tbl, i * 2, string_of_int(i))
-  }
-  let v = to_list(tbl)
-  let v = \"@@"(List.sort(((x, _), (y: int, _)) => compare(x, y)), v)
-  Array.of_list(v)
-}
-
-let suites = {
-  open Mt
-  list{
-    ("simple", _ => Eq(list{(1, '1'), (2, '2')}, f())),
-    (
-      "more_iterations",
-      _ => {
-        let count = 1000
-        Eq(Array.init(count + 1, i => (2 * i, string_of_int(i))), g(count))
-      },
-    ),
-    (
-      "More_labels_regressionfix_374",
-      _ => {
-        let tbl: Hashtbl.t<int, int> = MoreLabels.Hashtbl.create(30)
-        Hashtbl.add(tbl, 3, 3)
-        Eq(Hashtbl.length(tbl), 1)
-      },
-    ),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/hello.foo.js b/jscomp/test/hello.foo.js
deleted file mode 100644
index a9caeea..0000000
--- a/jscomp/test/hello.foo.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log("Hello");
-
-/*  Not a pure module */
diff --git a/jscomp/test/hello.foo.res b/jscomp/test/hello.foo.res
deleted file mode 100644
index 3d4c10d..0000000
--- a/jscomp/test/hello.foo.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.log(__MODULE__)
diff --git a/jscomp/test/hello_res.js b/jscomp/test/hello_res.js
deleted file mode 100644
index 7c6cdc1..0000000
--- a/jscomp/test/hello_res.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-
-var b = List.length({
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: /* [] */0
-        }
-      }
-    });
-
-var a = b - 1 | 0;
-
-console.log("hello, res");
-
-List.length({
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: /* [] */0
-        }
-      }
-    });
-
-console.log(3);
-
-console.log([
-      3,
-      1
-    ]);
-
-var to = 3;
-
-var downto = 1;
-
-exports.a = a;
-exports.to = to;
-exports.downto = downto;
-/* b Not a pure module */
diff --git a/jscomp/test/hello_res.res b/jscomp/test/hello_res.res
deleted file mode 100644
index 5ad0b97..0000000
--- a/jscomp/test/hello_res.res
+++ /dev/null
@@ -1,46 +0,0 @@
-@@config({
-  flags: [
-    // "-dparsetree"
-    ],
-})
-
-let b = List.length(list{1, 2, 3})
-let a = b - 1
-Js.log("hello, res")
-
-type t = {"x": int}
-
-type h = {...t, "y": string}
-
-let u01: h = {"x": 3, "y": "x"}
-let u: t = {"x": 3}
-
-let h = u["x"]
-
-%%private(let {length, cons} = module(List))
-
-%%private(let {length, cons} = module(List))
-
-%%private(let (a, b) = (1, 2))
-
-let {length: len, cons: c} = module(List)
-
-module H = {
-  module H1 = {
-    let v = 3
-  }
-}
-let u = {
-  let {length: l, cons} = module(List)
-  cons(l(list{1, 2, 3}), list{})
-}
-
-let h = {
-  let {v} = module(H.H1)
-  Js.log(v)
-}
-
-let to = 3
-let downto = 1
-
-Js.log([to, downto])
diff --git a/jscomp/test/hello_res.resi b/jscomp/test/hello_res.resi
deleted file mode 100644
index b3d091d..0000000
--- a/jscomp/test/hello_res.resi
+++ /dev/null
@@ -1,4 +0,0 @@
-let a : int
-
-let to : int 
-let downto : int
\ No newline at end of file
diff --git a/jscomp/test/ignore_test.js b/jscomp/test/ignore_test.js
deleted file mode 100644
index 6b400bd..0000000
--- a/jscomp/test/ignore_test.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(x) {
-  
-}
-
-function ff(x) {
-  console.log(x);
-}
-
-eq("File \"ignore_test.res\", line 13, characters 12-19", undefined, undefined);
-
-Mt.from_pair_suites("Ignore_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.ff = ff;
-/*  Not a pure module */
diff --git a/jscomp/test/ignore_test.res b/jscomp/test/ignore_test.res
deleted file mode 100644
index f93bb61..0000000
--- a/jscomp/test/ignore_test.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let f = x => ignore(x)
-
-let ff = x => ignore(Js.log(x))
-
-let () = eq(__LOC__, f(3), ())
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/ignore_uncurry_attribute.js b/jscomp/test/ignore_uncurry_attribute.js
deleted file mode 100644
index 6ca125d..0000000
--- a/jscomp/test/ignore_uncurry_attribute.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function map1(prim0, prim1) {
-  return map(prim0, prim1);
-}
-
-function map2(prim0, prim1) {
-  return map(prim0, prim1);
-}
-
-exports.map1 = map1;
-exports.map2 = map2;
-/* No side effect */
diff --git a/jscomp/test/ignore_uncurry_attribute.res b/jscomp/test/ignore_uncurry_attribute.res
deleted file mode 100644
index bff10d3..0000000
--- a/jscomp/test/ignore_uncurry_attribute.res
+++ /dev/null
@@ -1,7 +0,0 @@
-@@uncurried
-
-external map1: (array<'a>, @uncurry ('a => 'b)) => array<'b> = "map"
-let map1 = map1
-
-external map2: (array<'a>, ('a => 'b)) => array<'b> = "map"
-let map2 = map2
diff --git a/jscomp/test/imm_map_bench.js b/jscomp/test/imm_map_bench.js
deleted file mode 100644
index 63b569c..0000000
--- a/jscomp/test/imm_map_bench.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Immutable = require("immutable");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_MapInt = require("../../lib/js/belt_MapInt.js");
-
-var empty = new Immutable.OrderedMap();
-
-function fromArray(kvs) {
-  var v = empty;
-  for(var i = 0 ,i_finish = kvs.length; i < i_finish; ++i){
-    var match = kvs[i];
-    v = v.set(match[0], match[1]);
-  }
-  return v;
-}
-
-function should(b) {
-  if (b) {
-    return ;
-  }
-  throw new Error("impossible");
-}
-
-var shuffledDataAdd = Belt_Array.makeByAndShuffle(1000001, (function (i) {
-        return [
-                i,
-                i
-              ];
-      }));
-
-function test(param) {
-  var v = fromArray(shuffledDataAdd);
-  for(var j = 0; j <= 1000000; ++j){
-    should(v.has(j));
-  }
-}
-
-function test2(param) {
-  var v = Belt_MapInt.fromArray(shuffledDataAdd);
-  for(var j = 0; j <= 1000000; ++j){
-    should(Belt_MapInt.has(v, j));
-  }
-}
-
-console.time("imm_map_bench.res 43");
-
-test();
-
-console.timeEnd("imm_map_bench.res 43");
-
-console.time("imm_map_bench.res 44");
-
-test2();
-
-console.timeEnd("imm_map_bench.res 44");
-
-var A;
-
-var count = 1000000;
-
-var M;
-
-exports.A = A;
-exports.empty = empty;
-exports.fromArray = fromArray;
-exports.should = should;
-exports.count = count;
-exports.shuffledDataAdd = shuffledDataAdd;
-exports.test = test;
-exports.M = M;
-exports.test2 = test2;
-/* empty Not a pure module */
diff --git a/jscomp/test/imm_map_bench.res b/jscomp/test/imm_map_bench.res
deleted file mode 100644
index b0d4eff..0000000
--- a/jscomp/test/imm_map_bench.res
+++ /dev/null
@@ -1,44 +0,0 @@
-type map
-@new @module("immutable") external empty: unit => map = "OrderedMap"
-@send external set: (map, int, int) => map = "set"
-@send @return(undefined_to_opt) external get: (map, int) => option<int> = "get"
-@send external mem: (map, int) => bool = "has"
-
-module A = Belt.Array
-let empty = empty()
-let fromArray = kvs => {
-  let v = ref(empty)
-  for i in 0 to A.length(kvs) - 1 {
-    let (key, value) = A.getUnsafe(kvs, i)
-    v := set(v.contents, key, value)
-  }
-  v.contents
-}
-
-let should = b =>
-  if !b {
-    Js.Exn.raiseError("impossible")
-  }
-
-let count = 1_000_000
-
-let shuffledDataAdd = A.makeByAndShuffle(count + 1, i => (i, i))
-
-let test = () => {
-  let v = fromArray(shuffledDataAdd)
-  for j in 0 to count {
-    should(mem(v, j))
-  }
-}
-
-module M = Belt.Map.Int
-
-let test2 = () => {
-  let v = M.fromArray(shuffledDataAdd)
-  for j in 0 to count {
-    should(M.has(v, j))
-  }
-}
-
-%time(test())
-%time(test2())
diff --git a/jscomp/test/import2.js b/jscomp/test/import2.js
deleted file mode 100644
index 00deaef..0000000
--- a/jscomp/test/import2.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var A = require("a").default;
-
-var a = import("a").then(function (m) {
-      return m.default;
-    });
-
-var b = A;
-
-exports.a = a;
-exports.b = b;
-/* a Not a pure module */
diff --git a/jscomp/test/import2.res b/jscomp/test/import2.res
deleted file mode 100644
index 9130ed5..0000000
--- a/jscomp/test/import2.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let a = Js.import(Import_external.makeA)
-let b = Import_external.makeA
diff --git a/jscomp/test/import_external.js b/jscomp/test/import_external.js
deleted file mode 100644
index 595a8b2..0000000
--- a/jscomp/test/import_external.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var f8 = import("a").then(function (m) {
-      return m.default;
-    });
-
-exports.f8 = f8;
-/* f8 Not a pure module */
diff --git a/jscomp/test/import_external.res b/jscomp/test/import_external.res
deleted file mode 100644
index e3e93b1..0000000
--- a/jscomp/test/import_external.res
+++ /dev/null
@@ -1,4 +0,0 @@
-@module("a")
-external makeA: string = "default"
-
-let f8 = Js.import(makeA)
diff --git a/jscomp/test/import_side_effect.js b/jscomp/test/import_side_effect.js
deleted file mode 100644
index afe5c54..0000000
--- a/jscomp/test/import_side_effect.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a = import("./side_effect2.js").then(function (m) {
-      return m.a;
-    });
-
-var M = await import("./side_effect.js");
-
-exports.a = a;
-exports.M = M;
-/* M Not a pure module */
diff --git a/jscomp/test/import_side_effect.res b/jscomp/test/import_side_effect.res
deleted file mode 100644
index 013d7cd..0000000
--- a/jscomp/test/import_side_effect.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let a = Js.import(Side_effect2.a)
-
-module M = await Side_effect
diff --git a/jscomp/test/import_side_effect_free.js b/jscomp/test/import_side_effect_free.js
deleted file mode 100644
index ba50c9d..0000000
--- a/jscomp/test/import_side_effect_free.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a = await import("./side_effect_free.js").then(function (m) {
-      return m.a;
-    });
-
-exports.a = a;
-/* a Not a pure module */
diff --git a/jscomp/test/import_side_effect_free.res b/jscomp/test/import_side_effect_free.res
deleted file mode 100644
index 0f23a78..0000000
--- a/jscomp/test/import_side_effect_free.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = await Js.import(Side_effect_free.a)
diff --git a/jscomp/test/include_side_effect.js b/jscomp/test/include_side_effect.js
deleted file mode 100644
index c2d25e0..0000000
--- a/jscomp/test/include_side_effect.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Side_effect = require("./side_effect.js");
-
-
-/* Side_effect Not a pure module */
diff --git a/jscomp/test/include_side_effect.res b/jscomp/test/include_side_effect.res
deleted file mode 100644
index 14f7d6d..0000000
--- a/jscomp/test/include_side_effect.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@@bs.config({no_export: no_export})
-include Side_effect
diff --git a/jscomp/test/include_side_effect_free.js b/jscomp/test/include_side_effect_free.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/include_side_effect_free.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/include_side_effect_free.res b/jscomp/test/include_side_effect_free.res
deleted file mode 100644
index 92bf8ee..0000000
--- a/jscomp/test/include_side_effect_free.res
+++ /dev/null
@@ -1,4 +0,0 @@
-@@bs.config(no_export)
-/* since it is side effect free , this should generate a dummy file
- */
-include Side_effect_free
diff --git a/jscomp/test/incomplete_toplevel_test.js b/jscomp/test/incomplete_toplevel_test.js
deleted file mode 100644
index 701ec21..0000000
--- a/jscomp/test/incomplete_toplevel_test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(param) {
-  console.log("no inline");
-  return [
-          1,
-          2,
-          3
-        ];
-}
-
-var match = f();
-
-var a = match[0];
-
-var b = match[1];
-
-var c = match[2];
-
-exports.f = f;
-exports.a = a;
-exports.b = b;
-exports.c = c;
-/* match Not a pure module */
diff --git a/jscomp/test/incomplete_toplevel_test.res b/jscomp/test/incomplete_toplevel_test.res
deleted file mode 100644
index 9945f0e..0000000
--- a/jscomp/test/incomplete_toplevel_test.res
+++ /dev/null
@@ -1,6 +0,0 @@
-let f = () => {
-  Js.log("no inline")
-  (1, 2, 3)
-}
-
-let (a, b, c) = f()
diff --git a/jscomp/test/infer_type_test.js b/jscomp/test/infer_type_test.js
deleted file mode 100644
index 7a26024..0000000
--- a/jscomp/test/infer_type_test.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var hh = {
-  hi: 30,
-  lo: 20
-};
-
-var v = {
-  hi: 32,
-  lo: 3
-};
-
-var vv = {
-  hi: 3,
-  lo: 3,
-  width: 3
-};
-
-var u = v.hi;
-
-var uu = v.width;
-
-exports.hh = hh;
-exports.v = v;
-exports.vv = vv;
-exports.u = u;
-exports.uu = uu;
-/*  Not a pure module */
diff --git a/jscomp/test/infer_type_test.res b/jscomp/test/infer_type_test.res
deleted file mode 100644
index 5f44f19..0000000
--- a/jscomp/test/infer_type_test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-@obj external mk_config: (~hi: int, ~lo: int, ~width: int=?, unit) => _ = ""
-
-type hh = {"hi": int, "lo": int, "width": Js.undefined<int>}
-let hh = mk_config(~hi=30, ~lo=20, ())
-
-/* let v = hh##widt */
-let v = hh["width"]
-
-@obj external config: (~hi: int, ~lo: int, ~width: int=?, unit) => _ = ""
-
-let v = config(~hi=32, ~lo=3, ())
-
-let vv = config(~lo=3, ~width=3, ~hi=3, ())
-
-let u = v["hi"]
-/* val u:  int type */
-let uu = v["width"]
-/* val uu :  int Js.undefined */
-/* compile error
-let uu = v##xx
-*/
diff --git a/jscomp/test/infer_type_test.resi b/jscomp/test/infer_type_test.resi
deleted file mode 100644
index 0c57fe7..0000000
--- a/jscomp/test/infer_type_test.resi
+++ /dev/null
@@ -1,11 +0,0 @@
-@obj external mk_config: (~hi: int, ~lo: int, ~width: int=?, unit) => _ = ""
-
-type hh = {"hi": int, "lo": int, "width": Js.undefined<int>}
-let hh: hh
-
-let v: {"hi": int, "lo": int, "width": Js.undefined<int>}
-
-let vv: {"hi": int, "lo": int, "width": Js.undefined<int>}
-
-let u: int
-let uu: Js.undefined<int>
diff --git a/jscomp/test/inline_condition_with_pattern_matching.js b/jscomp/test/inline_condition_with_pattern_matching.js
deleted file mode 100644
index d7663ed..0000000
--- a/jscomp/test/inline_condition_with_pattern_matching.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var person1 = {
-  TAG: "Teacher",
-  age: 12345
-};
-
-var message;
-
-if (person1.TAG === "Teacher") {
-  message = "b";
-} else {
-  var tmp = 12345;
-  message = typeof tmp !== "object" || tmp.TAG === "Vacations" ? "a" : "b";
-}
-
-var Test1 = {
-  person1: person1,
-  message: message
-};
-
-var person2 = {
-  TAG: "Teacher",
-  name: "Jane",
-  age: 12345
-};
-
-var message$1;
-
-if (person2.TAG === "Teacher") {
-  message$1 = "Hello Jane.";
-} else {
-  var name = "Jane";
-  var match = person2.reportCard;
-  if (match.passing) {
-    message$1 = "Congrats " + name + ", nice GPA of " + match.gpa.toString() + " you got there!";
-  } else {
-    var exit = 0;
-    var tmp$1 = 12345;
-    if (typeof tmp$1 !== "object") {
-      message$1 = tmp$1 === "Sick" ? "How are you feeling?" : "Good luck next semester " + name + "!";
-    } else {
-      exit = 1;
-    }
-    if (exit === 1) {
-      message$1 = person2.reportCard.gpa !== 0.0 ? "Good luck next semester " + name + "!" : "Come back in " + (12345)._0.toString() + " days!";
-    }
-    
-  }
-}
-
-var Test2 = {
-  person2: person2,
-  message: message$1
-};
-
-exports.Test1 = Test1;
-exports.Test2 = Test2;
-/* message Not a pure module */
diff --git a/jscomp/test/inline_condition_with_pattern_matching.res b/jscomp/test/inline_condition_with_pattern_matching.res
deleted file mode 100644
index a3a61ff..0000000
--- a/jscomp/test/inline_condition_with_pattern_matching.res
+++ /dev/null
@@ -1,36 +0,0 @@
-module Test1 = {
-  type status = Vacations(int) | Sabbatical(int) | Sick
-  type person =
-    | Teacher({age: int})
-    | Student({status: status})
-
-  let person1 = Teacher({age: 12345})
-
-  let message = switch person1 {
-  | Student({status: Vacations(_) | Sick}) => "a"
-  | _ => "b"
-  }
-}
-
-module Test2 = {
-  type status = Vacations(int) | Sabbatical(int) | Sick | Present
-  type reportCard = {passing: bool, gpa: float}
-  type person =
-    | Teacher({name: string, age: int})
-    | Student({name: string, status: status, reportCard: reportCard})
-
-  let person2 = Teacher({name: "Jane", age: 12345})
-
-  let message = switch person2 {
-  | Teacher({name: "Mary" | "Joe"}) => `Hey, still going to the party on Saturday?`
-  | Teacher({name}) =>
-    // this is matched only if `name` isn't "Mary" or "Joe"
-    `Hello ${name}.`
-  | Student({name, reportCard: {passing: true, gpa}}) =>
-    `Congrats ${name}, nice GPA of ${Js.Float.toString(gpa)} you got there!`
-  | Student({reportCard: {gpa: 0.0}, status: Vacations(daysLeft) | Sabbatical(daysLeft)}) =>
-    `Come back in ${Js.Int.toString(daysLeft)} days!`
-  | Student({status: Sick}) => `How are you feeling?`
-  | Student({name}) => `Good luck next semester ${name}!`
-  }
-}
diff --git a/jscomp/test/inline_const.js b/jscomp/test/inline_const.js
deleted file mode 100644
index 46d7e7c..0000000
--- a/jscomp/test/inline_const.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var N = {};
-
-var hh = "hellohello";
-
-console.log([
-      3e-6,
-      3e-6
-    ]);
-
-var x = true;
-
-function N1(funarg) {
-  return {};
-}
-
-var h = "hello";
-
-exports.x = x;
-exports.N = N;
-exports.N1 = N1;
-exports.h = h;
-exports.hh = hh;
-/*  Not a pure module */
diff --git a/jscomp/test/inline_const.res b/jscomp/test/inline_const.res
deleted file mode 100644
index d7c9e42..0000000
--- a/jscomp/test/inline_const.res
+++ /dev/null
@@ -1,44 +0,0 @@
-@inline let x = true
-
-@inline let f = "hello"
-
-@inline let f1 = `a`
-
-@inline let f2 = `中文`
-/* Do we need fix 
-  let f2 : string = blabla
-*/
-
-module N: {
-  @inline(`中文`) let f3: string
-} = {
-  @inline let f3 = `中文`
-}
-
-module N1 = () => {
-  @inline let f4 = `中文`
-  @inline let xx = 3e-6
-  let xx0 = 3e-6
-}
-let h = f
-
-let hh = f ++ f
-
-open N
-
-module H = N1()
-open H
-let (a, b, c, d, e) = (f, f1, f2, f3, f4)
-
-@inline let f5 = true
-
-@inline let f6 = 1
-
-@inline let f7 = 1L
-
-@inline let f9 = 100L
-
-@inline let v = 100L
-@inline let u = 1L
-
-let () = Js.log((xx, xx0))
diff --git a/jscomp/test/inline_const.resi b/jscomp/test/inline_const.resi
deleted file mode 100644
index 3e392f6..0000000
--- a/jscomp/test/inline_const.resi
+++ /dev/null
@@ -1,29 +0,0 @@
-let x: bool
-
-@inline("hello") let f: string
-
-@inline(`a`) let f1: string
-
-@inline(`中文`) let f2: string
-
-module N: {
-  @inline(`中文`) let f3: string
-}
-
-module N1: () =>
-{
-  @inline(`中文`) let f4: string
-  @inline(3e-6) let xx: float
-}
-
-let h: string
-let hh: string
-
-@inline(true) let f5: bool
-
-@inline(1) let f6: int
-
-/* val f7 : bool [@@bs.inline 1L] */
-
-@inline(100L) let v: int64
-@inline(1L) let u: int64
diff --git a/jscomp/test/inline_const_test.js b/jscomp/test/inline_const_test.js
deleted file mode 100644
index 46d0bed..0000000
--- a/jscomp/test/inline_const_test.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Int64 = require("../../lib/js/int64.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-var Inline_const = require("./inline_const.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var H = {};
-
-var f = "hello";
-
-var f1 = "a";
-
-var f2 = "中文";
-
-var f3 = "中文";
-
-var f4 = "中文";
-
-eq("File \"inline_const_test.res\", line 13, characters 5-12", f, "hello");
-
-eq("File \"inline_const_test.res\", line 14, characters 5-12", f1, "a");
-
-eq("File \"inline_const_test.res\", line 15, characters 5-12", f2, "中文");
-
-eq("File \"inline_const_test.res\", line 16, characters 5-12", f3, "中文");
-
-eq("File \"inline_const_test.res\", line 17, characters 5-12", f4, "中文");
-
-eq("File \"inline_const_test.res\", line 18, characters 5-12", true, true);
-
-eq("File \"inline_const_test.res\", line 19, characters 5-12", 1, 1);
-
-eq("File \"inline_const_test.res\", line 20, characters 5-12", 3e-6, 0.000003);
-
-var h = Caml_int64.add(Caml_int64.add([
-          0,
-          100
-        ], Int64.one), Caml_int64.one);
-
-Mt.from_pair_suites("File \"inline_const_test.res\", line 28, characters 29-36", suites.contents);
-
-var f5 = true;
-
-var f6 = 1;
-
-var f7 = 3e-6;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.H = H;
-exports.f = f;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.f5 = f5;
-exports.f6 = f6;
-exports.f7 = f7;
-exports.h = h;
-/*  Not a pure module */
diff --git a/jscomp/test/inline_const_test.res b/jscomp/test/inline_const_test.res
deleted file mode 100644
index 64ca4c3..0000000
--- a/jscomp/test/inline_const_test.res
+++ /dev/null
@@ -1,28 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-module H = Inline_const.N1()
-
-let (f, f1, f2, f3, f4, f5, f6, f7) = {
-  open Inline_const
-  (f, f1, f2, N.f3, H.f4, f5, f6, H.xx)
-}
-
-let () = {
-  eq(__LOC__, f, "hello")
-  eq(__LOC__, f1, "a")
-  eq(__LOC__, f2, `中文`)
-  eq(__LOC__, f3, `中文`)
-  eq(__LOC__, f4, `中文`)
-  eq(__LOC__, f5, true)
-  eq(__LOC__, f6, 1)
-  eq(__LOC__, f7, 0.000003)
-}
-
-let h = {
-  open Inline_const
-  Int64.add(Int64.add(v, Int64.one), u)
-}
-
-let () = Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/inline_edge_cases.js b/jscomp/test/inline_edge_cases.js
deleted file mode 100644
index 7b16cfd..0000000
--- a/jscomp/test/inline_edge_cases.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function test3(_n) {
-  while(true) {
-    var n = _n;
-    if (n === 0) {
-      return (n + 5 | 0) + 4 | 0;
-    }
-    _n = n - 1 | 0;
-    continue ;
-  };
-}
-
-function test2(_n) {
-  while(true) {
-    var n = _n;
-    if (n === 0) {
-      return test3(n) + 3 | 0;
-    }
-    _n = n - 1 | 0;
-    continue ;
-  };
-}
-
-function test0(_n) {
-  while(true) {
-    var n = _n;
-    if (n === 0) {
-      var _n$1 = n;
-      while(true) {
-        var n$1 = _n$1;
-        if (n$1 === 0) {
-          return test2(n$1) + 2 | 0;
-        }
-        _n$1 = n$1 - 1 | 0;
-        continue ;
-      };
-    }
-    _n = n - 1 | 0;
-    continue ;
-  };
-}
-
-var v = test0(10);
-
-test0(10) + 2 | 0;
-
-exports.v = v;
-/* v Not a pure module */
diff --git a/jscomp/test/inline_edge_cases.res b/jscomp/test/inline_edge_cases.res
deleted file mode 100644
index 78e7e41..0000000
--- a/jscomp/test/inline_edge_cases.res
+++ /dev/null
@@ -1,33 +0,0 @@
-let test4 = n => n + 5
-
-let rec test3 = n =>
-  if n == 0 {
-    test4(n) + 4
-  } else {
-    test3(n - 1)
-  }
-
-let rec test2 = n =>
-  if n == 0 {
-    test3(n) + 3
-  } else {
-    test2(n - 1)
-  }
-
-let rec test1 = n =>
-  if n == 0 {
-    test2(n) + 2
-  } else {
-    test1(n - 1)
-  }
-
-let rec test0 = n =>
-  if n == 0 {
-    test1(n)
-  } else {
-    test0(n - 1)
-  }
-
-let v = test0(10)
-
-let u = test0(10) + 2
diff --git a/jscomp/test/inline_edge_cases.resi b/jscomp/test/inline_edge_cases.resi
deleted file mode 100644
index 19b83dc..0000000
--- a/jscomp/test/inline_edge_cases.resi
+++ /dev/null
@@ -1 +0,0 @@
-let v: int
diff --git a/jscomp/test/inline_map2_test.js b/jscomp/test/inline_map2_test.js
deleted file mode 100644
index 9613eb9..0000000
--- a/jscomp/test/inline_map2_test.js
+++ /dev/null
@@ -1,2037 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function Make(Ord) {
-  var height = function (x) {
-    if (typeof x !== "object") {
-      return 0;
-    } else {
-      return x._4;
-    }
-  };
-  var create = function (l, x, d, r) {
-    var hl = height(l);
-    var hr = height(r);
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  };
-  var singleton = function (x, d) {
-    return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: d,
-            _3: "Empty",
-            _4: 1
-          };
-  };
-  var bal = function (l, x, d, r) {
-    var hl;
-    hl = typeof l !== "object" ? 0 : l._4;
-    var hr;
-    hr = typeof r !== "object" ? 0 : r._4;
-    if (hl > (hr + 2 | 0)) {
-      if (typeof l !== "object") {
-        throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Map.bal",
-              Error: new Error()
-            };
-      }
-      var lr = l._3;
-      var ld = l._2;
-      var lv = l._1;
-      var ll = l._0;
-      if (height(ll) >= height(lr)) {
-        return create(ll, lv, ld, create(lr, x, d, r));
-      }
-      if (typeof lr === "object") {
-        return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
-      }
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    if (hr <= (hl + 2 | 0)) {
-      return {
-              TAG: "Node",
-              _0: l,
-              _1: x,
-              _2: d,
-              _3: r,
-              _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
-    }
-    if (typeof r !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var rr = r._3;
-    var rd = r._2;
-    var rv = r._1;
-    var rl = r._0;
-    if (height(rr) >= height(rl)) {
-      return create(create(l, x, d, rl), rv, rd, rr);
-    }
-    if (typeof rl === "object") {
-      return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  };
-  var is_empty = function (x) {
-    if (typeof x !== "object") {
-      return true;
-    } else {
-      return false;
-    }
-  };
-  var add = function (x, data, x_) {
-    if (typeof x_ !== "object") {
-      return {
-              TAG: "Node",
-              _0: "Empty",
-              _1: x,
-              _2: data,
-              _3: "Empty",
-              _4: 1
-            };
-    }
-    var r = x_._3;
-    var d = x_._2;
-    var v = x_._1;
-    var l = x_._0;
-    var c = Curry._2(Ord.compare, x, v);
-    if (c === 0) {
-      return {
-              TAG: "Node",
-              _0: l,
-              _1: x,
-              _2: data,
-              _3: r,
-              _4: x_._4
-            };
-    } else if (c < 0) {
-      return bal(add(x, data, l), v, d, r);
-    } else {
-      return bal(l, v, d, add(x, data, r));
-    }
-  };
-  var find = function (x, _x_) {
-    while(true) {
-      var x_ = _x_;
-      if (typeof x_ !== "object") {
-        throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
-      }
-      var c = Curry._2(Ord.compare, x, x_._1);
-      if (c === 0) {
-        return x_._2;
-      }
-      _x_ = c < 0 ? x_._0 : x_._3;
-      continue ;
-    };
-  };
-  var mem = function (x, _x_) {
-    while(true) {
-      var x_ = _x_;
-      if (typeof x_ !== "object") {
-        return false;
-      }
-      var c = Curry._2(Ord.compare, x, x_._1);
-      if (c === 0) {
-        return true;
-      }
-      _x_ = c < 0 ? x_._0 : x_._3;
-      continue ;
-    };
-  };
-  var min_binding = function (_x) {
-    while(true) {
-      var x = _x;
-      if (typeof x !== "object") {
-        throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
-      }
-      var l = x._0;
-      if (typeof l !== "object") {
-        return [
-                x._1,
-                x._2
-              ];
-      }
-      _x = l;
-      continue ;
-    };
-  };
-  var max_binding = function (_x) {
-    while(true) {
-      var x = _x;
-      if (typeof x !== "object") {
-        throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
-      }
-      var r = x._3;
-      if (typeof r !== "object") {
-        return [
-                x._1,
-                x._2
-              ];
-      }
-      _x = r;
-      continue ;
-    };
-  };
-  var remove_min_binding = function (x) {
-    if (typeof x !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.remove_min_elt",
-            Error: new Error()
-          };
-    }
-    var l = x._0;
-    if (typeof l !== "object") {
-      return x._3;
-    } else {
-      return bal(remove_min_binding(l), x._1, x._2, x._3);
-    }
-  };
-  var remove = function (x, x_) {
-    if (typeof x_ !== "object") {
-      return "Empty";
-    }
-    var r = x_._3;
-    var d = x_._2;
-    var v = x_._1;
-    var l = x_._0;
-    var c = Curry._2(Ord.compare, x, v);
-    if (c === 0) {
-      if (typeof l !== "object") {
-        return r;
-      }
-      if (typeof r !== "object") {
-        return l;
-      }
-      var match = min_binding(r);
-      return bal(l, match[0], match[1], remove_min_binding(r));
-    } else if (c < 0) {
-      return bal(remove(x, l), v, d, r);
-    } else {
-      return bal(l, v, d, remove(x, r));
-    }
-  };
-  var iter = function (f, _x) {
-    while(true) {
-      var x = _x;
-      if (typeof x !== "object") {
-        return ;
-      }
-      iter(f, x._0);
-      Curry._2(f, x._1, x._2);
-      _x = x._3;
-      continue ;
-    };
-  };
-  var map = function (f, x) {
-    if (typeof x !== "object") {
-      return "Empty";
-    }
-    var l$p = map(f, x._0);
-    var d$p = Curry._1(f, x._2);
-    var r$p = map(f, x._3);
-    return {
-            TAG: "Node",
-            _0: l$p,
-            _1: x._1,
-            _2: d$p,
-            _3: r$p,
-            _4: x._4
-          };
-  };
-  var mapi = function (f, x) {
-    if (typeof x !== "object") {
-      return "Empty";
-    }
-    var v = x._1;
-    var l$p = mapi(f, x._0);
-    var d$p = Curry._2(f, v, x._2);
-    var r$p = mapi(f, x._3);
-    return {
-            TAG: "Node",
-            _0: l$p,
-            _1: v,
-            _2: d$p,
-            _3: r$p,
-            _4: x._4
-          };
-  };
-  var fold = function (f, _m, _accu) {
-    while(true) {
-      var accu = _accu;
-      var m = _m;
-      if (typeof m !== "object") {
-        return accu;
-      }
-      _accu = Curry._3(f, m._1, m._2, fold(f, m._0, accu));
-      _m = m._3;
-      continue ;
-    };
-  };
-  var for_all = function (p, _x) {
-    while(true) {
-      var x = _x;
-      if (typeof x !== "object") {
-        return true;
-      }
-      if (!Curry._2(p, x._1, x._2)) {
-        return false;
-      }
-      if (!for_all(p, x._0)) {
-        return false;
-      }
-      _x = x._3;
-      continue ;
-    };
-  };
-  var exists = function (p, _x) {
-    while(true) {
-      var x = _x;
-      if (typeof x !== "object") {
-        return false;
-      }
-      if (Curry._2(p, x._1, x._2)) {
-        return true;
-      }
-      if (exists(p, x._0)) {
-        return true;
-      }
-      _x = x._3;
-      continue ;
-    };
-  };
-  var add_min_binding = function (k, v, x) {
-    if (typeof x !== "object") {
-      return singleton(k, v);
-    } else {
-      return bal(add_min_binding(k, v, x._0), x._1, x._2, x._3);
-    }
-  };
-  var add_max_binding = function (k, v, x) {
-    if (typeof x !== "object") {
-      return singleton(k, v);
-    } else {
-      return bal(x._0, x._1, x._2, add_max_binding(k, v, x._3));
-    }
-  };
-  var join = function (l, v, d, r) {
-    if (typeof l !== "object") {
-      return add_min_binding(v, d, r);
-    }
-    var lh = l._4;
-    if (typeof r !== "object") {
-      return add_max_binding(v, d, l);
-    }
-    var rh = r._4;
-    if (lh > (rh + 2 | 0)) {
-      return bal(l._0, l._1, l._2, join(l._3, v, d, r));
-    } else if (rh > (lh + 2 | 0)) {
-      return bal(join(l, v, d, r._0), r._1, r._2, r._3);
-    } else {
-      return create(l, v, d, r);
-    }
-  };
-  var concat = function (t1, t2) {
-    if (typeof t1 !== "object") {
-      return t2;
-    }
-    if (typeof t2 !== "object") {
-      return t1;
-    }
-    var match = min_binding(t2);
-    return join(t1, match[0], match[1], remove_min_binding(t2));
-  };
-  var concat_or_join = function (t1, v, d, t2) {
-    if (d !== undefined) {
-      return join(t1, v, Caml_option.valFromOption(d), t2);
-    } else {
-      return concat(t1, t2);
-    }
-  };
-  var split = function (x, x_) {
-    if (typeof x_ !== "object") {
-      return [
-              "Empty",
-              undefined,
-              "Empty"
-            ];
-    }
-    var r = x_._3;
-    var d = x_._2;
-    var v = x_._1;
-    var l = x_._0;
-    var c = Curry._2(Ord.compare, x, v);
-    if (c === 0) {
-      return [
-              l,
-              Caml_option.some(d),
-              r
-            ];
-    }
-    if (c < 0) {
-      var match = split(x, l);
-      return [
-              match[0],
-              match[1],
-              join(match[2], v, d, r)
-            ];
-    }
-    var match$1 = split(x, r);
-    return [
-            join(l, v, d, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
-  };
-  var merge = function (f, s1, s2) {
-    if (typeof s1 !== "object") {
-      if (typeof s2 !== "object") {
-        return "Empty";
-      }
-      
-    } else {
-      var v1 = s1._1;
-      if (s1._4 >= height(s2)) {
-        var match = split(v1, s2);
-        return concat_or_join(merge(f, s1._0, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1._2), match[1]), merge(f, s1._3, match[2]));
-      }
-      
-    }
-    if (typeof s2 !== "object") {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "inline_map2_test.res",
-              359,
-              11
-            ],
-            Error: new Error()
-          };
-    }
-    var v2 = s2._1;
-    var match$1 = split(v2, s1);
-    return concat_or_join(merge(f, match$1[0], s2._0), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2._2)), merge(f, match$1[2], s2._3));
-  };
-  var filter = function (p, x) {
-    if (typeof x !== "object") {
-      return "Empty";
-    }
-    var d = x._2;
-    var v = x._1;
-    var l$p = filter(p, x._0);
-    var pvd = Curry._2(p, v, d);
-    var r$p = filter(p, x._3);
-    if (pvd) {
-      return join(l$p, v, d, r$p);
-    } else {
-      return concat(l$p, r$p);
-    }
-  };
-  var partition = function (p, x) {
-    if (typeof x !== "object") {
-      return [
-              "Empty",
-              "Empty"
-            ];
-    }
-    var d = x._2;
-    var v = x._1;
-    var match = partition(p, x._0);
-    var lf = match[1];
-    var lt = match[0];
-    var pvd = Curry._2(p, v, d);
-    var match$1 = partition(p, x._3);
-    var rf = match$1[1];
-    var rt = match$1[0];
-    if (pvd) {
-      return [
-              join(lt, v, d, rt),
-              concat(lf, rf)
-            ];
-    } else {
-      return [
-              concat(lt, rt),
-              join(lf, v, d, rf)
-            ];
-    }
-  };
-  var cons_enum = function (_m, _e) {
-    while(true) {
-      var e = _e;
-      var m = _m;
-      if (typeof m !== "object") {
-        return e;
-      }
-      _e = {
-        TAG: "More",
-        _0: m._1,
-        _1: m._2,
-        _2: m._3,
-        _3: e
-      };
-      _m = m._0;
-      continue ;
-    };
-  };
-  var compare = function (cmp, m1, m2) {
-    var _e1 = cons_enum(m1, "End");
-    var _e2 = cons_enum(m2, "End");
-    while(true) {
-      var e2 = _e2;
-      var e1 = _e1;
-      if (typeof e1 !== "object") {
-        if (typeof e2 !== "object") {
-          return 0;
-        } else {
-          return -1;
-        }
-      }
-      if (typeof e2 !== "object") {
-        return 1;
-      }
-      var c = Curry._2(Ord.compare, e1._0, e2._0);
-      if (c !== 0) {
-        return c;
-      }
-      var c$1 = Curry._2(cmp, e1._1, e2._1);
-      if (c$1 !== 0) {
-        return c$1;
-      }
-      _e2 = cons_enum(e2._2, e2._3);
-      _e1 = cons_enum(e1._2, e1._3);
-      continue ;
-    };
-  };
-  var equal = function (cmp, m1, m2) {
-    var _e1 = cons_enum(m1, "End");
-    var _e2 = cons_enum(m2, "End");
-    while(true) {
-      var e2 = _e2;
-      var e1 = _e1;
-      if (typeof e1 !== "object") {
-        if (typeof e2 !== "object") {
-          return true;
-        } else {
-          return false;
-        }
-      }
-      if (typeof e2 !== "object") {
-        return false;
-      }
-      if (Curry._2(Ord.compare, e1._0, e2._0) !== 0) {
-        return false;
-      }
-      if (!Curry._2(cmp, e1._1, e2._1)) {
-        return false;
-      }
-      _e2 = cons_enum(e2._2, e2._3);
-      _e1 = cons_enum(e1._2, e1._3);
-      continue ;
-    };
-  };
-  var cardinal = function (x) {
-    if (typeof x !== "object") {
-      return 0;
-    } else {
-      return (cardinal(x._0) + 1 | 0) + cardinal(x._3) | 0;
-    }
-  };
-  var bindings_aux = function (_accu, _x) {
-    while(true) {
-      var x = _x;
-      var accu = _accu;
-      if (typeof x !== "object") {
-        return accu;
-      }
-      _x = x._0;
-      _accu = {
-        hd: [
-          x._1,
-          x._2
-        ],
-        tl: bindings_aux(accu, x._3)
-      };
-      continue ;
-    };
-  };
-  var bindings = function (s) {
-    return bindings_aux(/* [] */0, s);
-  };
-  return {
-          height: height,
-          create: create,
-          singleton: singleton,
-          bal: bal,
-          empty: "Empty",
-          is_empty: is_empty,
-          add: add,
-          find: find,
-          mem: mem,
-          min_binding: min_binding,
-          max_binding: max_binding,
-          remove_min_binding: remove_min_binding,
-          remove: remove,
-          iter: iter,
-          map: map,
-          mapi: mapi,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          add_min_binding: add_min_binding,
-          add_max_binding: add_max_binding,
-          join: join,
-          concat: concat,
-          concat_or_join: concat_or_join,
-          split: split,
-          merge: merge,
-          filter: filter,
-          partition: partition,
-          cons_enum: cons_enum,
-          compare: compare,
-          equal: equal,
-          cardinal: cardinal,
-          bindings_aux: bindings_aux,
-          bindings: bindings,
-          choose: min_binding
-        };
-}
-
-function height(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return x._4;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function singleton(x, d) {
-  return {
-          TAG: "Node",
-          _0: "Empty",
-          _1: x,
-          _2: d,
-          _3: "Empty",
-          _4: 1
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l._4;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r._4;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l._3;
-    var ld = l._2;
-    var lv = l._1;
-    var ll = l._0;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r._3;
-  var rd = r._2;
-  var rv = r._1;
-  var rl = r._0;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function is_empty(x) {
-  if (typeof x !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function add(x, data, x_) {
-  if (typeof x_ !== "object") {
-    return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: data,
-            _3: "Empty",
-            _4: 1
-          };
-  }
-  var r = x_._3;
-  var d = x_._2;
-  var v = x_._1;
-  var l = x_._0;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: x_._4
-          };
-  } else if (c < 0) {
-    return bal(add(x, data, l), v, d, r);
-  } else {
-    return bal(l, v, d, add(x, data, r));
-  }
-}
-
-function find(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (typeof x_ !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml.int_compare(x, x_._1);
-    if (c === 0) {
-      return x_._2;
-    }
-    _x_ = c < 0 ? x_._0 : x_._3;
-    continue ;
-  };
-}
-
-function mem(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (typeof x_ !== "object") {
-      return false;
-    }
-    var c = Caml.int_compare(x, x_._1);
-    if (c === 0) {
-      return true;
-    }
-    _x_ = c < 0 ? x_._0 : x_._3;
-    continue ;
-  };
-}
-
-function min_binding(_x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var l = x._0;
-    if (typeof l !== "object") {
-      return [
-              x._1,
-              x._2
-            ];
-    }
-    _x = l;
-    continue ;
-  };
-}
-
-function max_binding(_x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var r = x._3;
-    if (typeof r !== "object") {
-      return [
-              x._1,
-              x._2
-            ];
-    }
-    _x = r;
-    continue ;
-  };
-}
-
-function remove_min_binding(x) {
-  if (typeof x !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.remove_min_elt",
-          Error: new Error()
-        };
-  }
-  var l = x._0;
-  if (typeof l !== "object") {
-    return x._3;
-  } else {
-    return bal(remove_min_binding(l), x._1, x._2, x._3);
-  }
-}
-
-function remove(x, x_) {
-  if (typeof x_ !== "object") {
-    return "Empty";
-  }
-  var r = x_._3;
-  var d = x_._2;
-  var v = x_._1;
-  var l = x_._0;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    if (typeof l !== "object") {
-      return r;
-    }
-    if (typeof r !== "object") {
-      return l;
-    }
-    var match = min_binding(r);
-    return bal(l, match[0], match[1], remove_min_binding(r));
-  } else if (c < 0) {
-    return bal(remove(x, l), v, d, r);
-  } else {
-    return bal(l, v, d, remove(x, r));
-  }
-}
-
-function iter(f, _x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      return ;
-    }
-    iter(f, x._0);
-    Curry._2(f, x._1, x._2);
-    _x = x._3;
-    continue ;
-  };
-}
-
-function map(f, x) {
-  if (typeof x !== "object") {
-    return "Empty";
-  }
-  var l$p = map(f, x._0);
-  var d$p = Curry._1(f, x._2);
-  var r$p = map(f, x._3);
-  return {
-          TAG: "Node",
-          _0: l$p,
-          _1: x._1,
-          _2: d$p,
-          _3: r$p,
-          _4: x._4
-        };
-}
-
-function mapi(f, x) {
-  if (typeof x !== "object") {
-    return "Empty";
-  }
-  var v = x._1;
-  var l$p = mapi(f, x._0);
-  var d$p = Curry._2(f, v, x._2);
-  var r$p = mapi(f, x._3);
-  return {
-          TAG: "Node",
-          _0: l$p,
-          _1: v,
-          _2: d$p,
-          _3: r$p,
-          _4: x._4
-        };
-}
-
-function fold(f, _m, _accu) {
-  while(true) {
-    var accu = _accu;
-    var m = _m;
-    if (typeof m !== "object") {
-      return accu;
-    }
-    _accu = Curry._3(f, m._1, m._2, fold(f, m._0, accu));
-    _m = m._3;
-    continue ;
-  };
-}
-
-function for_all(p, _x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      return true;
-    }
-    if (!Curry._2(p, x._1, x._2)) {
-      return false;
-    }
-    if (!for_all(p, x._0)) {
-      return false;
-    }
-    _x = x._3;
-    continue ;
-  };
-}
-
-function exists(p, _x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      return false;
-    }
-    if (Curry._2(p, x._1, x._2)) {
-      return true;
-    }
-    if (exists(p, x._0)) {
-      return true;
-    }
-    _x = x._3;
-    continue ;
-  };
-}
-
-function add_min_binding(k, v, x) {
-  if (typeof x !== "object") {
-    return singleton(k, v);
-  } else {
-    return bal(add_min_binding(k, v, x._0), x._1, x._2, x._3);
-  }
-}
-
-function add_max_binding(k, v, x) {
-  if (typeof x !== "object") {
-    return singleton(k, v);
-  } else {
-    return bal(x._0, x._1, x._2, add_max_binding(k, v, x._3));
-  }
-}
-
-function join(l, v, d, r) {
-  if (typeof l !== "object") {
-    return add_min_binding(v, d, r);
-  }
-  var lh = l._4;
-  if (typeof r !== "object") {
-    return add_max_binding(v, d, l);
-  }
-  var rh = r._4;
-  if (lh > (rh + 2 | 0)) {
-    return bal(l._0, l._1, l._2, join(l._3, v, d, r));
-  } else if (rh > (lh + 2 | 0)) {
-    return bal(join(l, v, d, r._0), r._1, r._2, r._3);
-  } else {
-    return create(l, v, d, r);
-  }
-}
-
-function concat(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  }
-  if (typeof t2 !== "object") {
-    return t1;
-  }
-  var match = min_binding(t2);
-  return join(t1, match[0], match[1], remove_min_binding(t2));
-}
-
-function concat_or_join(t1, v, d, t2) {
-  if (d !== undefined) {
-    return join(t1, v, Caml_option.valFromOption(d), t2);
-  } else {
-    return concat(t1, t2);
-  }
-}
-
-function split(x, x_) {
-  if (typeof x_ !== "object") {
-    return [
-            "Empty",
-            undefined,
-            "Empty"
-          ];
-  }
-  var r = x_._3;
-  var d = x_._2;
-  var v = x_._1;
-  var l = x_._0;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
-  }
-  if (c < 0) {
-    var match = split(x, l);
-    return [
-            match[0],
-            match[1],
-            join(match[2], v, d, r)
-          ];
-  }
-  var match$1 = split(x, r);
-  return [
-          join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
-}
-
-function merge(f, s1, s2) {
-  if (typeof s1 !== "object") {
-    if (typeof s2 !== "object") {
-      return "Empty";
-    }
-    
-  } else {
-    var v1 = s1._1;
-    if (s1._4 >= height(s2)) {
-      var match = split(v1, s2);
-      return concat_or_join(merge(f, s1._0, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1._2), match[1]), merge(f, s1._3, match[2]));
-    }
-    
-  }
-  if (typeof s2 !== "object") {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "inline_map2_test.res",
-            359,
-            11
-          ],
-          Error: new Error()
-        };
-  }
-  var v2 = s2._1;
-  var match$1 = split(v2, s1);
-  return concat_or_join(merge(f, match$1[0], s2._0), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2._2)), merge(f, match$1[2], s2._3));
-}
-
-function filter(p, x) {
-  if (typeof x !== "object") {
-    return "Empty";
-  }
-  var d = x._2;
-  var v = x._1;
-  var l$p = filter(p, x._0);
-  var pvd = Curry._2(p, v, d);
-  var r$p = filter(p, x._3);
-  if (pvd) {
-    return join(l$p, v, d, r$p);
-  } else {
-    return concat(l$p, r$p);
-  }
-}
-
-function partition(p, x) {
-  if (typeof x !== "object") {
-    return [
-            "Empty",
-            "Empty"
-          ];
-  }
-  var d = x._2;
-  var v = x._1;
-  var match = partition(p, x._0);
-  var lf = match[1];
-  var lt = match[0];
-  var pvd = Curry._2(p, v, d);
-  var match$1 = partition(p, x._3);
-  var rf = match$1[1];
-  var rt = match$1[0];
-  if (pvd) {
-    return [
-            join(lt, v, d, rt),
-            concat(lf, rf)
-          ];
-  } else {
-    return [
-            concat(lt, rt),
-            join(lf, v, d, rf)
-          ];
-  }
-}
-
-function cons_enum(_m, _e) {
-  while(true) {
-    var e = _e;
-    var m = _m;
-    if (typeof m !== "object") {
-      return e;
-    }
-    _e = {
-      TAG: "More",
-      _0: m._1,
-      _1: m._2,
-      _2: m._3,
-      _3: e
-    };
-    _m = m._0;
-    continue ;
-  };
-}
-
-function compare(cmp, m1, m2) {
-  var _e1 = cons_enum(m1, "End");
-  var _e2 = cons_enum(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return 0;
-      } else {
-        return -1;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return 1;
-    }
-    var c = Caml.int_compare(e1._0, e2._0);
-    if (c !== 0) {
-      return c;
-    }
-    var c$1 = Curry._2(cmp, e1._1, e2._1);
-    if (c$1 !== 0) {
-      return c$1;
-    }
-    _e2 = cons_enum(e2._2, e2._3);
-    _e1 = cons_enum(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function equal(cmp, m1, m2) {
-  var _e1 = cons_enum(m1, "End");
-  var _e2 = cons_enum(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return true;
-      } else {
-        return false;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return false;
-    }
-    if (e1._0 !== e2._0) {
-      return false;
-    }
-    if (!Curry._2(cmp, e1._1, e2._1)) {
-      return false;
-    }
-    _e2 = cons_enum(e2._2, e2._3);
-    _e1 = cons_enum(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function cardinal(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return (cardinal(x._0) + 1 | 0) + cardinal(x._3) | 0;
-  }
-}
-
-function bindings_aux(_accu, _x) {
-  while(true) {
-    var x = _x;
-    var accu = _accu;
-    if (typeof x !== "object") {
-      return accu;
-    }
-    _x = x._0;
-    _accu = {
-      hd: [
-        x._1,
-        x._2
-      ],
-      tl: bindings_aux(accu, x._3)
-    };
-    continue ;
-  };
-}
-
-function bindings(s) {
-  return bindings_aux(/* [] */0, s);
-}
-
-var IntMap = {
-  height: height,
-  create: create,
-  singleton: singleton,
-  bal: bal,
-  empty: "Empty",
-  is_empty: is_empty,
-  add: add,
-  find: find,
-  mem: mem,
-  min_binding: min_binding,
-  max_binding: max_binding,
-  remove_min_binding: remove_min_binding,
-  remove: remove,
-  iter: iter,
-  map: map,
-  mapi: mapi,
-  fold: fold,
-  for_all: for_all,
-  exists: exists,
-  add_min_binding: add_min_binding,
-  add_max_binding: add_max_binding,
-  join: join,
-  concat: concat,
-  concat_or_join: concat_or_join,
-  split: split,
-  merge: merge,
-  filter: filter,
-  partition: partition,
-  cons_enum: cons_enum,
-  compare: compare,
-  equal: equal,
-  cardinal: cardinal,
-  bindings_aux: bindings_aux,
-  bindings: bindings,
-  choose: min_binding
-};
-
-var m = List.fold_left((function (acc, param) {
-        return add(param[0], param[1], acc);
-      }), "Empty", {
-      hd: [
-        10,
-        /* 'a' */97
-      ],
-      tl: {
-        hd: [
-          3,
-          /* 'b' */98
-        ],
-        tl: {
-          hd: [
-            7,
-            /* 'c' */99
-          ],
-          tl: {
-            hd: [
-              20,
-              /* 'd' */100
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-function height$1(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return x._4;
-  }
-}
-
-function create$1(l, x, d, r) {
-  var hl = height$1(l);
-  var hr = height$1(r);
-  return {
-          TAG: "Node",
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function singleton$1(x, d) {
-  return {
-          TAG: "Node",
-          _0: "Empty",
-          _1: x,
-          _2: d,
-          _3: "Empty",
-          _4: 1
-        };
-}
-
-function bal$1(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l._4;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r._4;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l._3;
-    var ld = l._2;
-    var lv = l._1;
-    var ll = l._0;
-    if (height$1(ll) >= height$1(lr)) {
-      return create$1(ll, lv, ld, create$1(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create$1(create$1(ll, lv, ld, lr._0), lr._1, lr._2, create$1(lr._3, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r._3;
-  var rd = r._2;
-  var rv = r._1;
-  var rl = r._0;
-  if (height$1(rr) >= height$1(rl)) {
-    return create$1(create$1(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create$1(create$1(l, x, d, rl._0), rl._1, rl._2, create$1(rl._3, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function is_empty$1(x) {
-  if (typeof x !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function add$1(x, data, x_) {
-  if (typeof x_ !== "object") {
-    return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: data,
-            _3: "Empty",
-            _4: 1
-          };
-  }
-  var r = x_._3;
-  var d = x_._2;
-  var v = x_._1;
-  var l = x_._0;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: x_._4
-          };
-  } else if (c < 0) {
-    return bal$1(add$1(x, data, l), v, d, r);
-  } else {
-    return bal$1(l, v, d, add$1(x, data, r));
-  }
-}
-
-function find$1(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (typeof x_ !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml.string_compare(x, x_._1);
-    if (c === 0) {
-      return x_._2;
-    }
-    _x_ = c < 0 ? x_._0 : x_._3;
-    continue ;
-  };
-}
-
-function mem$1(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (typeof x_ !== "object") {
-      return false;
-    }
-    var c = Caml.string_compare(x, x_._1);
-    if (c === 0) {
-      return true;
-    }
-    _x_ = c < 0 ? x_._0 : x_._3;
-    continue ;
-  };
-}
-
-function min_binding$1(_x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var l = x._0;
-    if (typeof l !== "object") {
-      return [
-              x._1,
-              x._2
-            ];
-    }
-    _x = l;
-    continue ;
-  };
-}
-
-function max_binding$1(_x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var r = x._3;
-    if (typeof r !== "object") {
-      return [
-              x._1,
-              x._2
-            ];
-    }
-    _x = r;
-    continue ;
-  };
-}
-
-function remove_min_binding$1(x) {
-  if (typeof x !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.remove_min_elt",
-          Error: new Error()
-        };
-  }
-  var l = x._0;
-  if (typeof l !== "object") {
-    return x._3;
-  } else {
-    return bal$1(remove_min_binding$1(l), x._1, x._2, x._3);
-  }
-}
-
-function remove$1(x, x_) {
-  if (typeof x_ !== "object") {
-    return "Empty";
-  }
-  var r = x_._3;
-  var d = x_._2;
-  var v = x_._1;
-  var l = x_._0;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    if (typeof l !== "object") {
-      return r;
-    }
-    if (typeof r !== "object") {
-      return l;
-    }
-    var match = min_binding$1(r);
-    return bal$1(l, match[0], match[1], remove_min_binding$1(r));
-  } else if (c < 0) {
-    return bal$1(remove$1(x, l), v, d, r);
-  } else {
-    return bal$1(l, v, d, remove$1(x, r));
-  }
-}
-
-function iter$1(f, _x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      return ;
-    }
-    iter$1(f, x._0);
-    Curry._2(f, x._1, x._2);
-    _x = x._3;
-    continue ;
-  };
-}
-
-function map$1(f, x) {
-  if (typeof x !== "object") {
-    return "Empty";
-  }
-  var l$p = map$1(f, x._0);
-  var d$p = Curry._1(f, x._2);
-  var r$p = map$1(f, x._3);
-  return {
-          TAG: "Node",
-          _0: l$p,
-          _1: x._1,
-          _2: d$p,
-          _3: r$p,
-          _4: x._4
-        };
-}
-
-function mapi$1(f, x) {
-  if (typeof x !== "object") {
-    return "Empty";
-  }
-  var v = x._1;
-  var l$p = mapi$1(f, x._0);
-  var d$p = Curry._2(f, v, x._2);
-  var r$p = mapi$1(f, x._3);
-  return {
-          TAG: "Node",
-          _0: l$p,
-          _1: v,
-          _2: d$p,
-          _3: r$p,
-          _4: x._4
-        };
-}
-
-function fold$1(f, _m, _accu) {
-  while(true) {
-    var accu = _accu;
-    var m = _m;
-    if (typeof m !== "object") {
-      return accu;
-    }
-    _accu = Curry._3(f, m._1, m._2, fold$1(f, m._0, accu));
-    _m = m._3;
-    continue ;
-  };
-}
-
-function for_all$1(p, _x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      return true;
-    }
-    if (!Curry._2(p, x._1, x._2)) {
-      return false;
-    }
-    if (!for_all$1(p, x._0)) {
-      return false;
-    }
-    _x = x._3;
-    continue ;
-  };
-}
-
-function exists$1(p, _x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      return false;
-    }
-    if (Curry._2(p, x._1, x._2)) {
-      return true;
-    }
-    if (exists$1(p, x._0)) {
-      return true;
-    }
-    _x = x._3;
-    continue ;
-  };
-}
-
-function add_min_binding$1(k, v, x) {
-  if (typeof x !== "object") {
-    return singleton$1(k, v);
-  } else {
-    return bal$1(add_min_binding$1(k, v, x._0), x._1, x._2, x._3);
-  }
-}
-
-function add_max_binding$1(k, v, x) {
-  if (typeof x !== "object") {
-    return singleton$1(k, v);
-  } else {
-    return bal$1(x._0, x._1, x._2, add_max_binding$1(k, v, x._3));
-  }
-}
-
-function join$1(l, v, d, r) {
-  if (typeof l !== "object") {
-    return add_min_binding$1(v, d, r);
-  }
-  var lh = l._4;
-  if (typeof r !== "object") {
-    return add_max_binding$1(v, d, l);
-  }
-  var rh = r._4;
-  if (lh > (rh + 2 | 0)) {
-    return bal$1(l._0, l._1, l._2, join$1(l._3, v, d, r));
-  } else if (rh > (lh + 2 | 0)) {
-    return bal$1(join$1(l, v, d, r._0), r._1, r._2, r._3);
-  } else {
-    return create$1(l, v, d, r);
-  }
-}
-
-function concat$1(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  }
-  if (typeof t2 !== "object") {
-    return t1;
-  }
-  var match = min_binding$1(t2);
-  return join$1(t1, match[0], match[1], remove_min_binding$1(t2));
-}
-
-function concat_or_join$1(t1, v, d, t2) {
-  if (d !== undefined) {
-    return join$1(t1, v, Caml_option.valFromOption(d), t2);
-  } else {
-    return concat$1(t1, t2);
-  }
-}
-
-function split$1(x, x_) {
-  if (typeof x_ !== "object") {
-    return [
-            "Empty",
-            undefined,
-            "Empty"
-          ];
-  }
-  var r = x_._3;
-  var d = x_._2;
-  var v = x_._1;
-  var l = x_._0;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
-  }
-  if (c < 0) {
-    var match = split$1(x, l);
-    return [
-            match[0],
-            match[1],
-            join$1(match[2], v, d, r)
-          ];
-  }
-  var match$1 = split$1(x, r);
-  return [
-          join$1(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
-}
-
-function merge$1(f, s1, s2) {
-  if (typeof s1 !== "object") {
-    if (typeof s2 !== "object") {
-      return "Empty";
-    }
-    
-  } else {
-    var v1 = s1._1;
-    if (s1._4 >= height$1(s2)) {
-      var match = split$1(v1, s2);
-      return concat_or_join$1(merge$1(f, s1._0, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1._2), match[1]), merge$1(f, s1._3, match[2]));
-    }
-    
-  }
-  if (typeof s2 !== "object") {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "inline_map2_test.res",
-            359,
-            11
-          ],
-          Error: new Error()
-        };
-  }
-  var v2 = s2._1;
-  var match$1 = split$1(v2, s1);
-  return concat_or_join$1(merge$1(f, match$1[0], s2._0), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2._2)), merge$1(f, match$1[2], s2._3));
-}
-
-function filter$1(p, x) {
-  if (typeof x !== "object") {
-    return "Empty";
-  }
-  var d = x._2;
-  var v = x._1;
-  var l$p = filter$1(p, x._0);
-  var pvd = Curry._2(p, v, d);
-  var r$p = filter$1(p, x._3);
-  if (pvd) {
-    return join$1(l$p, v, d, r$p);
-  } else {
-    return concat$1(l$p, r$p);
-  }
-}
-
-function partition$1(p, x) {
-  if (typeof x !== "object") {
-    return [
-            "Empty",
-            "Empty"
-          ];
-  }
-  var d = x._2;
-  var v = x._1;
-  var match = partition$1(p, x._0);
-  var lf = match[1];
-  var lt = match[0];
-  var pvd = Curry._2(p, v, d);
-  var match$1 = partition$1(p, x._3);
-  var rf = match$1[1];
-  var rt = match$1[0];
-  if (pvd) {
-    return [
-            join$1(lt, v, d, rt),
-            concat$1(lf, rf)
-          ];
-  } else {
-    return [
-            concat$1(lt, rt),
-            join$1(lf, v, d, rf)
-          ];
-  }
-}
-
-function cons_enum$1(_m, _e) {
-  while(true) {
-    var e = _e;
-    var m = _m;
-    if (typeof m !== "object") {
-      return e;
-    }
-    _e = {
-      TAG: "More",
-      _0: m._1,
-      _1: m._2,
-      _2: m._3,
-      _3: e
-    };
-    _m = m._0;
-    continue ;
-  };
-}
-
-function compare$1(cmp, m1, m2) {
-  var _e1 = cons_enum$1(m1, "End");
-  var _e2 = cons_enum$1(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return 0;
-      } else {
-        return -1;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return 1;
-    }
-    var c = Caml.string_compare(e1._0, e2._0);
-    if (c !== 0) {
-      return c;
-    }
-    var c$1 = Curry._2(cmp, e1._1, e2._1);
-    if (c$1 !== 0) {
-      return c$1;
-    }
-    _e2 = cons_enum$1(e2._2, e2._3);
-    _e1 = cons_enum$1(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function equal$1(cmp, m1, m2) {
-  var _e1 = cons_enum$1(m1, "End");
-  var _e2 = cons_enum$1(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return true;
-      } else {
-        return false;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return false;
-    }
-    if (Caml.string_compare(e1._0, e2._0) !== 0) {
-      return false;
-    }
-    if (!Curry._2(cmp, e1._1, e2._1)) {
-      return false;
-    }
-    _e2 = cons_enum$1(e2._2, e2._3);
-    _e1 = cons_enum$1(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function cardinal$1(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return (cardinal$1(x._0) + 1 | 0) + cardinal$1(x._3) | 0;
-  }
-}
-
-function bindings_aux$1(_accu, _x) {
-  while(true) {
-    var x = _x;
-    var accu = _accu;
-    if (typeof x !== "object") {
-      return accu;
-    }
-    _x = x._0;
-    _accu = {
-      hd: [
-        x._1,
-        x._2
-      ],
-      tl: bindings_aux$1(accu, x._3)
-    };
-    continue ;
-  };
-}
-
-function bindings$1(s) {
-  return bindings_aux$1(/* [] */0, s);
-}
-
-var SMap = {
-  height: height$1,
-  create: create$1,
-  singleton: singleton$1,
-  bal: bal$1,
-  empty: "Empty",
-  is_empty: is_empty$1,
-  add: add$1,
-  find: find$1,
-  mem: mem$1,
-  min_binding: min_binding$1,
-  max_binding: max_binding$1,
-  remove_min_binding: remove_min_binding$1,
-  remove: remove$1,
-  iter: iter$1,
-  map: map$1,
-  mapi: mapi$1,
-  fold: fold$1,
-  for_all: for_all$1,
-  exists: exists$1,
-  add_min_binding: add_min_binding$1,
-  add_max_binding: add_max_binding$1,
-  join: join$1,
-  concat: concat$1,
-  concat_or_join: concat_or_join$1,
-  split: split$1,
-  merge: merge$1,
-  filter: filter$1,
-  partition: partition$1,
-  cons_enum: cons_enum$1,
-  compare: compare$1,
-  equal: equal$1,
-  cardinal: cardinal$1,
-  bindings_aux: bindings_aux$1,
-  bindings: bindings$1,
-  choose: min_binding$1
-};
-
-var s = List.fold_left((function (acc, param) {
-        return add$1(param[0], param[1], acc);
-      }), "Empty", {
-      hd: [
-        "10",
-        /* 'a' */97
-      ],
-      tl: {
-        hd: [
-          "3",
-          /* 'b' */98
-        ],
-        tl: {
-          hd: [
-            "7",
-            /* 'c' */99
-          ],
-          tl: {
-            hd: [
-              "20",
-              /* 'd' */100
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-Mt.from_pair_suites("Inline_map2_test", {
-      hd: [
-        "assertion1",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: find(10, m),
-                    _1: /* 'a' */97
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "assertion2",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: find$1("10", s),
-                      _1: /* 'a' */97
-                    };
-            })
-        ],
-        tl: /* [] */0
-      }
-    });
-
-var empty = "Empty";
-
-exports.Make = Make;
-exports.IntMap = IntMap;
-exports.empty = empty;
-exports.m = m;
-exports.SMap = SMap;
-exports.s = s;
-/* m Not a pure module */
diff --git a/jscomp/test/inline_map2_test.res b/jscomp/test/inline_map2_test.res
deleted file mode 100644
index b9e0dcd..0000000
--- a/jscomp/test/inline_map2_test.res
+++ /dev/null
@@ -1,485 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-module type OrderedType = {
-  type t
-  let compare: (t, t) => int
-}
-
-module type S = {
-  type key
-  type t<+'a>
-  let empty: t<'a>
-  let is_empty: t<'a> => bool
-  let mem: (key, t<'a>) => bool
-  let add: (key, 'a, t<'a>) => t<'a>
-  let singleton: (key, 'a) => t<'a>
-  let remove: (key, t<'a>) => t<'a>
-  let merge: ((key, option<'a>, option<'b>) => option<'c>, t<'a>, t<'b>) => t<'c>
-  let compare: (('a, 'a) => int, t<'a>, t<'a>) => int
-  let equal: (('a, 'a) => bool, t<'a>, t<'a>) => bool
-  let iter: ((key, 'a) => unit, t<'a>) => unit
-  let fold: ((key, 'a, 'b) => 'b, t<'a>, 'b) => 'b
-  let for_all: ((key, 'a) => bool, t<'a>) => bool
-  let exists: ((key, 'a) => bool, t<'a>) => bool
-  let filter: ((key, 'a) => bool, t<'a>) => t<'a>
-  let partition: ((key, 'a) => bool, t<'a>) => (t<'a>, t<'a>)
-  let cardinal: t<'a> => int
-  let bindings: t<'a> => list<(key, 'a)>
-  let min_binding: t<'a> => (key, 'a)
-  let max_binding: t<'a> => (key, 'a)
-  let choose: t<'a> => (key, 'a)
-  let split: (key, t<'a>) => (t<'a>, option<'a>, t<'a>)
-  let find: (key, t<'a>) => 'a
-  let map: ('a => 'b, t<'a>) => t<'b>
-  let mapi: ((key, 'a) => 'b, t<'a>) => t<'b>
-}
-
-module Make = (Ord: OrderedType) => {
-  type key = Ord.t
-
-  type rec t<'a> =
-    | Empty
-    | Node(t<'a>, key, 'a, t<'a>, int)
-
-  let height = x =>
-    switch x {
-    | Empty => 0
-    | Node(_, _, _, _, h) => h
-    }
-
-  let create = (l, x, d, r) => {
-    let hl = height(l) and hr = height(r)
-    Node(
-      l,
-      x,
-      d,
-      r,
-      if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    )
-  }
-
-  let singleton = (x, d) => Node(Empty, x, d, Empty, 1)
-
-  let bal = (l, x, d, r) => {
-    let hl = switch l {
-    | Empty => 0
-    | Node(_, _, _, _, h) => h
-    }
-    let hr = switch r {
-    | Empty => 0
-    | Node(_, _, _, _, h) => h
-    }
-    if hl > hr + 2 {
-      switch l {
-      | Empty => invalid_arg("Map.bal")
-      | Node(ll, lv, ld, lr, _) =>
-        if height(ll) >= height(lr) {
-          create(ll, lv, ld, create(lr, x, d, r))
-        } else {
-          switch lr {
-          | Empty => invalid_arg("Map.bal")
-          | Node(lrl, lrv, lrd, lrr, _) =>
-            create(create(ll, lv, ld, lrl), lrv, lrd, create(lrr, x, d, r))
-          }
-        }
-      }
-    } else if hr > hl + 2 {
-      switch r {
-      | Empty => invalid_arg("Map.bal")
-      | Node(rl, rv, rd, rr, _) =>
-        if height(rr) >= height(rl) {
-          create(create(l, x, d, rl), rv, rd, rr)
-        } else {
-          switch rl {
-          | Empty => invalid_arg("Map.bal")
-          | Node(rll, rlv, rld, rlr, _) =>
-            create(create(l, x, d, rll), rlv, rld, create(rlr, rv, rd, rr))
-          }
-        }
-      }
-    } else {
-      Node(
-        l,
-        x,
-        d,
-        r,
-        if hl >= hr {
-          hl + 1
-        } else {
-          hr + 1
-        },
-      )
-    }
-  }
-
-  let empty = Empty
-
-  let is_empty = x =>
-    switch x {
-    | Empty => true
-    | _ => false
-    }
-
-  let rec add = (x, data, x_) =>
-    switch x_ {
-    | Empty => Node(Empty, x, data, Empty, 1)
-    | Node(l, v, d, r, h) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        Node(l, x, data, r, h)
-      } else if c < 0 {
-        bal(add(x, data, l), v, d, r)
-      } else {
-        bal(l, v, d, add(x, data, r))
-      }
-    }
-
-  let rec find = (x, x_) =>
-    switch x_ {
-    | Empty => raise(Not_found)
-    | Node(l, v, d, r, _) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        d
-      } else {
-        find(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-      }
-    }
-
-  let rec mem = (x, x_) =>
-    switch x_ {
-    | Empty => false
-    | Node(l, v, d, r, _) =>
-      let c = Ord.compare(x, v)
-      c == 0 ||
-        mem(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-    }
-
-  let rec min_binding = x =>
-    switch x {
-    | Empty => raise(Not_found)
-    | Node(Empty, x, d, r, _) => (x, d)
-    | Node(l, x, d, r, _) => min_binding(l)
-    }
-
-  let rec max_binding = x =>
-    switch x {
-    | Empty => raise(Not_found)
-    | Node(l, x, d, Empty, _) => (x, d)
-    | Node(l, x, d, r, _) => max_binding(r)
-    }
-
-  let rec remove_min_binding = x =>
-    switch x {
-    | Empty => invalid_arg("Map.remove_min_elt")
-    | Node(Empty, x, d, r, _) => r
-    | Node(l, x, d, r, _) => bal(remove_min_binding(l), x, d, r)
-    }
-
-  let merge = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) =>
-      let (x, d) = min_binding(t2)
-      bal(t1, x, d, remove_min_binding(t2))
-    }
-
-  let rec remove = (x, x_) =>
-    switch x_ {
-    | Empty => Empty
-    | Node(l, v, d, r, h) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        merge(l, r)
-      } else if c < 0 {
-        bal(remove(x, l), v, d, r)
-      } else {
-        bal(l, v, d, remove(x, r))
-      }
-    }
-
-  let rec iter = (f, x) =>
-    switch x {
-    | Empty => ()
-    | Node(l, v, d, r, _) =>
-      iter(f, l)
-      f(v, d)
-      iter(f, r)
-    }
-
-  let rec map = (f, x) =>
-    switch x {
-    | Empty => Empty
-    | Node(l, v, d, r, h) =>
-      let l' = map(f, l)
-      let d' = f(d)
-      let r' = map(f, r)
-      Node(l', v, d', r', h)
-    }
-
-  let rec mapi = (f, x) =>
-    switch x {
-    | Empty => Empty
-    | Node(l, v, d, r, h) =>
-      let l' = mapi(f, l)
-      let d' = f(v, d)
-      let r' = mapi(f, r)
-      Node(l', v, d', r', h)
-    }
-
-  let rec fold = (f, m, accu) =>
-    switch m {
-    | Empty => accu
-    | Node(l, v, d, r, _) => fold(f, r, f(v, d, fold(f, l, accu)))
-    }
-
-  let rec for_all = (p, x) =>
-    switch x {
-    | Empty => true
-    | Node(l, v, d, r, _) => p(v, d) && (for_all(p, l) && for_all(p, r))
-    }
-
-  let rec exists = (p, x) =>
-    switch x {
-    | Empty => false
-    | Node(l, v, d, r, _) => p(v, d) || (exists(p, l) || exists(p, r))
-    }
-
-  /* Beware: those two functions assume that the added k is *strictly*
-       smaller (or bigger) than all the present keys in the tree; it
-       does not test for equality with the current min (or max) key.
-
-       Indeed, they are only used during the "join" operation which
-       respects this precondition.
- */
-
-  let rec add_min_binding = (k, v, x) =>
-    switch x {
-    | Empty => singleton(k, v)
-    | Node(l, x, d, r, h) => bal(add_min_binding(k, v, l), x, d, r)
-    }
-
-  let rec add_max_binding = (k, v, x) =>
-    switch x {
-    | Empty => singleton(k, v)
-    | Node(l, x, d, r, h) => bal(l, x, d, add_max_binding(k, v, r))
-    }
-
-  /* Same as create and bal, but no assumptions are made on the
-   relative heights of l and r. */
-
-  let rec join = (l, v, d, r) =>
-    switch (l, r) {
-    | (Empty, _) => add_min_binding(v, d, r)
-    | (_, Empty) => add_max_binding(v, d, l)
-    | (Node(ll, lv, ld, lr, lh), Node(rl, rv, rd, rr, rh)) =>
-      if lh > rh + 2 {
-        bal(ll, lv, ld, join(lr, v, d, r))
-      } else if rh > lh + 2 {
-        bal(join(l, v, d, rl), rv, rd, rr)
-      } else {
-        create(l, v, d, r)
-      }
-    }
-
-  /* Merge two trees l and r into one.
-       All elements of l must precede the elements of r.
-       No assumption on the heights of l and r. */
-
-  let concat = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) =>
-      let (x, d) = min_binding(t2)
-      join(t1, x, d, remove_min_binding(t2))
-    }
-
-  let concat_or_join = (t1, v, d, t2) =>
-    switch d {
-    | Some(d) => join(t1, v, d, t2)
-    | None => concat(t1, t2)
-    }
-
-  let rec split = (x, x_) =>
-    switch x_ {
-    | Empty => (Empty, None, Empty)
-    | Node(l, v, d, r, _) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        (l, Some(d), r)
-      } else if c < 0 {
-        let (ll, pres, rl) = split(x, l)
-        (ll, pres, join(rl, v, d, r))
-      } else {
-        let (lr, pres, rr) = split(x, r)
-        (join(l, v, d, lr), pres, rr)
-      }
-    }
-
-  let rec merge = (f, s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, Empty) => Empty
-    | (Node(l1, v1, d1, r1, h1), _) if h1 >= height(s2) =>
-      let (l2, d2, r2) = split(v1, s2)
-      concat_or_join(merge(f, l1, l2), v1, f(v1, Some(d1), d2), merge(f, r1, r2))
-    | (_, Node(l2, v2, d2, r2, h2)) =>
-      let (l1, d1, r1) = split(v2, s1)
-      concat_or_join(merge(f, l1, l2), v2, f(v2, d1, Some(d2)), merge(f, r1, r2))
-    | _ => assert(false)
-    }
-
-  let rec filter = (p, x) =>
-    switch x {
-    | Empty => Empty
-    | Node(l, v, d, r, _) =>
-      /* call [p] in the expected left-to-right order */
-      let l' = filter(p, l)
-      let pvd = p(v, d)
-      let r' = filter(p, r)
-      if pvd {
-        join(l', v, d, r')
-      } else {
-        concat(l', r')
-      }
-    }
-
-  let rec partition = (p, x) =>
-    switch x {
-    | Empty => (Empty, Empty)
-    | Node(l, v, d, r, _) =>
-      /* call [p] in the expected left-to-right order */
-      let (lt, lf) = partition(p, l)
-      let pvd = p(v, d)
-      let (rt, rf) = partition(p, r)
-      if pvd {
-        (join(lt, v, d, rt), concat(lf, rf))
-      } else {
-        (concat(lt, rt), join(lf, v, d, rf))
-      }
-    }
-
-  type rec enumeration<'a> = End | More(key, 'a, t<'a>, enumeration<'a>)
-
-  let rec cons_enum = (m, e) =>
-    switch m {
-    | Empty => e
-    | Node(l, v, d, r, _) => cons_enum(l, More(v, d, r, e))
-    }
-
-  let compare = (cmp, m1, m2) => {
-    let rec compare_aux = (e1, e2) =>
-      switch (e1, e2) {
-      | (End, End) => 0
-      | (End, _) => -1
-      | (_, End) => 1
-      | (More(v1, d1, r1, e1), More(v2, d2, r2, e2)) =>
-        let c = Ord.compare(v1, v2)
-        if c != 0 {
-          c
-        } else {
-          let c = cmp(d1, d2)
-          if c != 0 {
-            c
-          } else {
-            compare_aux(cons_enum(r1, e1), cons_enum(r2, e2))
-          }
-        }
-      }
-    compare_aux(cons_enum(m1, End), cons_enum(m2, End))
-  }
-
-  let equal = (cmp, m1, m2) => {
-    let rec equal_aux = (e1, e2) =>
-      switch (e1, e2) {
-      | (End, End) => true
-      | (End, _) => false
-      | (_, End) => false
-      | (More(v1, d1, r1, e1), More(v2, d2, r2, e2)) =>
-        Ord.compare(v1, v2) == 0 && (cmp(d1, d2) && equal_aux(cons_enum(r1, e1), cons_enum(r2, e2)))
-      }
-    equal_aux(cons_enum(m1, End), cons_enum(m2, End))
-  }
-
-  let rec cardinal = x =>
-    switch x {
-    | Empty => 0
-    | Node(l, _, _, r, _) => cardinal(l) + 1 + cardinal(r)
-    }
-
-  let rec bindings_aux = (accu, x) =>
-    switch x {
-    | Empty => accu
-    | Node(l, v, d, r, _) => bindings_aux(list{(v, d), ...bindings_aux(accu, r)}, l)
-    }
-
-  let bindings = s => bindings_aux(list{}, s)
-
-  let choose = min_binding
-}
-
-module IntMap = Make({
-  type t = int
-  let compare = (x: t, y) => compare(x, y)
-})
-
-let empty = IntMap.empty
-
-let m = List.fold_left(
-  (acc, (k, v)) => IntMap.add(k, v, acc),
-  empty,
-  list{(10, 'a'), (3, 'b'), (7, 'c'), (20, 'd')},
-)
-
-module SMap = Make({
-  type t = string
-  let compare = (x: t, y) => compare(x, y)
-})
-
-let s = List.fold_left(
-  (acc, (k, v)) => SMap.add(k, v, acc),
-  SMap.empty,
-  list{("10", 'a'), ("3", 'b'), ("7", 'c'), ("20", 'd')},
-)
-@val("console.log") external log: 'a => unit = ""
-
-Mt.from_pair_suites(
-  __MODULE__,
-  {
-    open Mt
-    list{
-      ("assertion1", _ => Eq(IntMap.find(10, m), 'a')),
-      ("assertion2", _ => Eq(SMap.find("10", s), 'a')),
-    }
-  },
-)
diff --git a/jscomp/test/inline_map_demo.js b/jscomp/test/inline_map_demo.js
deleted file mode 100644
index c973437..0000000
--- a/jscomp/test/inline_map_demo.js
+++ /dev/null
@@ -1,200 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-
-function height(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return x._4;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l._4;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r._4;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "inline_map_demo.res",
-              41,
-              15
-            ],
-            Error: new Error()
-          };
-    }
-    var lr = l._3;
-    var ld = l._2;
-    var lv = l._1;
-    var ll = l._0;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "inline_map_demo.res",
-            47,
-            19
-          ],
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "inline_map_demo.res",
-            55,
-            15
-          ],
-          Error: new Error()
-        };
-  }
-  var rr = r._3;
-  var rd = r._2;
-  var rv = r._1;
-  var rl = r._0;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "inline_map_demo.res",
-          61,
-          19
-        ],
-        Error: new Error()
-      };
-}
-
-function add(x, data, tree) {
-  if (typeof tree !== "object") {
-    return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: data,
-            _3: "Empty",
-            _4: 1
-          };
-  }
-  var r = tree._3;
-  var d = tree._2;
-  var v = tree._1;
-  var l = tree._0;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: tree._4
-          };
-  } else if (c < 0) {
-    return bal(add(x, data, l), v, d, r);
-  } else {
-    return bal(l, v, d, add(x, data, r));
-  }
-}
-
-var m = List.fold_left((function (acc, param) {
-        return add(param[0], param[1], acc);
-      }), "Empty", {
-      hd: [
-        10,
-        /* 'a' */97
-      ],
-      tl: {
-        hd: [
-          3,
-          /* 'b' */98
-        ],
-        tl: {
-          hd: [
-            7,
-            /* 'c' */99
-          ],
-          tl: {
-            hd: [
-              20,
-              /* 'd' */100
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-function find(px, _x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml.int_compare(px, x._1);
-    if (c === 0) {
-      return x._2;
-    }
-    _x = c < 0 ? x._0 : x._3;
-    continue ;
-  };
-}
-
-Mt.from_pair_suites("Inline_map_demo", {
-      hd: [
-        "find",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: find(10, m),
-                    _1: /* 'a' */97
-                  };
-          })
-      ],
-      tl: /* [] */0
-    });
-
-/* m Not a pure module */
diff --git a/jscomp/test/inline_map_demo.res b/jscomp/test/inline_map_demo.res
deleted file mode 100644
index 34ee7b3..0000000
--- a/jscomp/test/inline_map_demo.res
+++ /dev/null
@@ -1,139 +0,0 @@
-@@config({no_export: no_export, flags: ["-w", "@A"]})
-
-let compare = (x: int, y: int) => compare(x, y)
-
-type rec t<'a> =
-  | Empty
-  | Node(t<'a>, int, 'a, t<'a>, int)
-
-let height = x =>
-  switch x {
-  | Empty => 0
-  | Node(_, _, _, _, h) => h
-  }
-
-let create = (l, x, d, r) => {
-  let hl = height(l) and hr = height(r)
-  Node(
-    l,
-    x,
-    d,
-    r,
-    if hl >= hr {
-      hl + 1
-    } else {
-      hr + 1
-    },
-  )
-}
-
-let bal = (l, x, d, r) => {
-  let hl = switch l {
-  | Empty => 0
-  | Node(_, _, _, _, h) => h
-  }
-  let hr = switch r {
-  | Empty => 0
-  | Node(_, _, _, _, h) => h
-  }
-  if hl > hr + 2 {
-    switch l {
-    | Empty => assert(false)
-    | Node(ll, lv, ld, lr, _) =>
-      if height(ll) >= height(lr) {
-        create(ll, lv, ld, create(lr, x, d, r))
-      } else {
-        switch lr {
-        | Empty => assert(false)
-        | Node(lrl, lrv, lrd, lrr, _) =>
-          create(create(ll, lv, ld, lrl), lrv, lrd, create(lrr, x, d, r))
-        }
-      }
-    }
-  } else if hr > hl + 2 {
-    switch r {
-    | Empty => assert(false)
-    | Node(rl, rv, rd, rr, _) =>
-      if height(rr) >= height(rl) {
-        create(create(l, x, d, rl), rv, rd, rr)
-      } else {
-        switch rl {
-        | Empty => assert(false)
-        | Node(rll, rlv, rld, rlr, _) =>
-          create(create(l, x, d, rll), rlv, rld, create(rlr, rv, rd, rr))
-        }
-      }
-    }
-  } else {
-    Node(
-      l,
-      x,
-      d,
-      r,
-      if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    )
-  }
-}
-
-let rec add = (x, data, tree) =>
-  switch tree {
-  | Empty => Node(Empty, x, data, Empty, 1)
-  | Node(l, v, d, r, h) =>
-    let c = compare(x, v)
-    if c == 0 {
-      Node(l, x, data, r, h)
-    } else if c < 0 {
-      bal(add(x, data, l), v, d, r)
-    } else {
-      bal(l, v, d, add(x, data, r))
-    }
-  }
-
-let empty = Empty
-
-/* Beware: those two functions assume that the added k is *strictly*
-   smaller (or bigger) than all the present keys in the tree; it
-   does not test for equality with the current min (or max) key.
-
-   Indeed, they are only used during the "join" operation which
-   respects this precondition.
-*/
-
-/* Same as create and bal, but no assumptions are made on the
- relative heights of l and r. */
-
-/* Merge two trees l and r into one.
-   All elements of l must precede the elements of r.
-   No assumption on the heights of l and r. */
-
-/* end */
-let m = List.fold_left(
-  (acc, (k, v)) => add(k, v, acc),
-  empty,
-  list{(10, 'a'), (3, 'b'), (7, 'c'), (20, 'd')},
-)
-
-let rec find = (px, x) =>
-  switch x {
-  | Empty => raise(Not_found)
-  | Node(l, v, d, r, _) =>
-    let c = compare(px, v)
-    if c == 0 {
-      d
-    } else {
-      find(
-        px,
-        if c < 0 {
-          l
-        } else {
-          r
-        },
-      )
-    }
-  }
-
-Mt.from_pair_suites(__MODULE__, list{("find", _ => Mt.Eq(find(10, m), 'a'))})
diff --git a/jscomp/test/inline_map_test.js b/jscomp/test/inline_map_test.js
deleted file mode 100644
index 2c55bcd..0000000
--- a/jscomp/test/inline_map_test.js
+++ /dev/null
@@ -1,184 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-
-function height(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return x._4;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          _0: l,
-          _1: x,
-          _2: d,
-          _3: r,
-          _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l._4;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r._4;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l._3;
-    var ld = l._2;
-    var lv = l._1;
-    var ll = l._0;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr._0), lr._1, lr._2, create(lr._3, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: d,
-            _3: r,
-            _4: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r._3;
-  var rd = r._2;
-  var rv = r._1;
-  var rl = r._0;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, data, x_) {
-  if (typeof x_ !== "object") {
-    return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: data,
-            _3: "Empty",
-            _4: 1
-          };
-  }
-  var r = x_._3;
-  var d = x_._2;
-  var v = x_._1;
-  var l = x_._0;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: x,
-            _2: data,
-            _3: r,
-            _4: x_._4
-          };
-  } else if (c < 0) {
-    return bal(add(x, data, l), v, d, r);
-  } else {
-    return bal(l, v, d, add(x, data, r));
-  }
-}
-
-function find(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (typeof x_ !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml.int_compare(x, x_._1);
-    if (c === 0) {
-      return x_._2;
-    }
-    _x_ = c < 0 ? x_._0 : x_._3;
-    continue ;
-  };
-}
-
-var m = List.fold_left((function (acc, param) {
-        return add(param[0], param[1], acc);
-      }), "Empty", {
-      hd: [
-        10,
-        /* 'a' */97
-      ],
-      tl: {
-        hd: [
-          3,
-          /* 'b' */98
-        ],
-        tl: {
-          hd: [
-            7,
-            /* 'c' */99
-          ],
-          tl: {
-            hd: [
-              20,
-              /* 'd' */100
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-Mt.from_pair_suites("Inline_map_test", {
-      hd: [
-        "find",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: find(10, m),
-                    _1: /* 'a' */97
-                  };
-          })
-      ],
-      tl: /* [] */0
-    });
-
-/* m Not a pure module */
diff --git a/jscomp/test/inline_map_test.res b/jscomp/test/inline_map_test.res
deleted file mode 100644
index 01368d7..0000000
--- a/jscomp/test/inline_map_test.res
+++ /dev/null
@@ -1,416 +0,0 @@
-module Ord = {
-  type t = int
-}
-let compare = (x: int, y: int) => compare(x, y)
-/* module Make(Ord: OrderedType) = struct */
-
-type key = Ord.t
-
-type rec t<'a> =
-  | Empty
-  | Node(t<'a>, key, 'a, t<'a>, int)
-
-let height = x =>
-  switch x {
-  | Empty => 0
-  | Node(_, _, _, _, h) => h
-  }
-
-let create = (l, x, d, r) => {
-  let hl = height(l) and hr = height(r)
-  Node(
-    l,
-    x,
-    d,
-    r,
-    if hl >= hr {
-      hl + 1
-    } else {
-      hr + 1
-    },
-  )
-}
-
-let singleton = (x, d) => Node(Empty, x, d, Empty, 1)
-
-let bal = (l, x, d, r) => {
-  let hl = switch l {
-  | Empty => 0
-  | Node(_, _, _, _, h) => h
-  }
-  let hr = switch r {
-  | Empty => 0
-  | Node(_, _, _, _, h) => h
-  }
-  if hl > hr + 2 {
-    switch l {
-    | Empty => invalid_arg("Map.bal")
-    | Node(ll, lv, ld, lr, _) =>
-      if height(ll) >= height(lr) {
-        create(ll, lv, ld, create(lr, x, d, r))
-      } else {
-        switch lr {
-        | Empty => invalid_arg("Map.bal")
-        | Node(lrl, lrv, lrd, lrr, _) =>
-          create(create(ll, lv, ld, lrl), lrv, lrd, create(lrr, x, d, r))
-        }
-      }
-    }
-  } else if hr > hl + 2 {
-    switch r {
-    | Empty => invalid_arg("Map.bal")
-    | Node(rl, rv, rd, rr, _) =>
-      if height(rr) >= height(rl) {
-        create(create(l, x, d, rl), rv, rd, rr)
-      } else {
-        switch rl {
-        | Empty => invalid_arg("Map.bal")
-        | Node(rll, rlv, rld, rlr, _) =>
-          create(create(l, x, d, rll), rlv, rld, create(rlr, rv, rd, rr))
-        }
-      }
-    }
-  } else {
-    Node(
-      l,
-      x,
-      d,
-      r,
-      if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    )
-  }
-}
-
-let empty = Empty
-
-let is_empty = x =>
-  switch x {
-  | Empty => true
-  | _ => false
-  }
-
-let rec add = (x, data, x_) =>
-  switch x_ {
-  | Empty => Node(Empty, x, data, Empty, 1)
-  | Node(l, v, d, r, h) =>
-    let c = compare(x, v)
-    if c == 0 {
-      Node(l, x, data, r, h)
-    } else if c < 0 {
-      bal(add(x, data, l), v, d, r)
-    } else {
-      bal(l, v, d, add(x, data, r))
-    }
-  }
-
-let rec find = (x, x_) =>
-  switch x_ {
-  | Empty => raise(Not_found)
-  | Node(l, v, d, r, _) =>
-    let c = compare(x, v)
-    if c == 0 {
-      d
-    } else {
-      find(
-        x,
-        if c < 0 {
-          l
-        } else {
-          r
-        },
-      )
-    }
-  }
-
-let rec mem = (x, x_) =>
-  switch x_ {
-  | Empty => false
-  | Node(l, v, d, r, _) =>
-    let c = compare(x, v)
-    c == 0 ||
-      mem(
-        x,
-        if c < 0 {
-          l
-        } else {
-          r
-        },
-      )
-  }
-
-let rec min_binding = x =>
-  switch x {
-  | Empty => raise(Not_found)
-  | Node(Empty, x, d, r, _) => (x, d)
-  | Node(l, x, d, r, _) => min_binding(l)
-  }
-
-let rec max_binding = x =>
-  switch x {
-  | Empty => raise(Not_found)
-  | Node(l, x, d, Empty, _) => (x, d)
-  | Node(l, x, d, r, _) => max_binding(r)
-  }
-
-let rec remove_min_binding = x =>
-  switch x {
-  | Empty => invalid_arg("Map.remove_min_elt")
-  | Node(Empty, x, d, r, _) => r
-  | Node(l, x, d, r, _) => bal(remove_min_binding(l), x, d, r)
-  }
-
-let merge = (t1, t2) =>
-  switch (t1, t2) {
-  | (Empty, t) => t
-  | (t, Empty) => t
-  | (_, _) =>
-    let (x, d) = min_binding(t2)
-    bal(t1, x, d, remove_min_binding(t2))
-  }
-
-let rec remove = (x, x_) =>
-  switch x_ {
-  | Empty => Empty
-  | Node(l, v, d, r, h) =>
-    let c = compare(x, v)
-    if c == 0 {
-      merge(l, r)
-    } else if c < 0 {
-      bal(remove(x, l), v, d, r)
-    } else {
-      bal(l, v, d, remove(x, r))
-    }
-  }
-
-let rec iter = (f, x) =>
-  switch x {
-  | Empty => ()
-  | Node(l, v, d, r, _) =>
-    iter(f, l)
-    f(v, d)
-    iter(f, r)
-  }
-
-let rec map = (f, x) =>
-  switch x {
-  | Empty => Empty
-  | Node(l, v, d, r, h) =>
-    let l' = map(f, l)
-    let d' = f(d)
-    let r' = map(f, r)
-    Node(l', v, d', r', h)
-  }
-
-let rec mapi = (f, x) =>
-  switch x {
-  | Empty => Empty
-  | Node(l, v, d, r, h) =>
-    let l' = mapi(f, l)
-    let d' = f(v, d)
-    let r' = mapi(f, r)
-    Node(l', v, d', r', h)
-  }
-
-let rec fold = (f, m, accu) =>
-  switch m {
-  | Empty => accu
-  | Node(l, v, d, r, _) => fold(f, r, f(v, d, fold(f, l, accu)))
-  }
-
-let rec for_all = (p, x) =>
-  switch x {
-  | Empty => true
-  | Node(l, v, d, r, _) => p(v, d) && (for_all(p, l) && for_all(p, r))
-  }
-
-let rec exists = (p, x) =>
-  switch x {
-  | Empty => false
-  | Node(l, v, d, r, _) => p(v, d) || (exists(p, l) || exists(p, r))
-  }
-
-/* Beware: those two functions assume that the added k is *strictly*
-   smaller (or bigger) than all the present keys in the tree; it
-   does not test for equality with the current min (or max) key.
-
-   Indeed, they are only used during the "join" operation which
-   respects this precondition.
-*/
-
-let rec add_min_binding = (k, v, x) =>
-  switch x {
-  | Empty => singleton(k, v)
-  | Node(l, x, d, r, h) => bal(add_min_binding(k, v, l), x, d, r)
-  }
-
-let rec add_max_binding = (k, v, x) =>
-  switch x {
-  | Empty => singleton(k, v)
-  | Node(l, x, d, r, h) => bal(l, x, d, add_max_binding(k, v, r))
-  }
-
-/* Same as create and bal, but no assumptions are made on the
- relative heights of l and r. */
-
-let rec join = (l, v, d, r) =>
-  switch (l, r) {
-  | (Empty, _) => add_min_binding(v, d, r)
-  | (_, Empty) => add_max_binding(v, d, l)
-  | (Node(ll, lv, ld, lr, lh), Node(rl, rv, rd, rr, rh)) =>
-    if lh > rh + 2 {
-      bal(ll, lv, ld, join(lr, v, d, r))
-    } else if rh > lh + 2 {
-      bal(join(l, v, d, rl), rv, rd, rr)
-    } else {
-      create(l, v, d, r)
-    }
-  }
-
-/* Merge two trees l and r into one.
-   All elements of l must precede the elements of r.
-   No assumption on the heights of l and r. */
-
-let concat = (t1, t2) =>
-  switch (t1, t2) {
-  | (Empty, t) => t
-  | (t, Empty) => t
-  | (_, _) =>
-    let (x, d) = min_binding(t2)
-    join(t1, x, d, remove_min_binding(t2))
-  }
-
-let concat_or_join = (t1, v, d, t2) =>
-  switch d {
-  | Some(d) => join(t1, v, d, t2)
-  | None => concat(t1, t2)
-  }
-
-let rec split = (x, x_) =>
-  switch x_ {
-  | Empty => (Empty, None, Empty)
-  | Node(l, v, d, r, _) =>
-    let c = compare(x, v)
-    if c == 0 {
-      (l, Some(d), r)
-    } else if c < 0 {
-      let (ll, pres, rl) = split(x, l)
-      (ll, pres, join(rl, v, d, r))
-    } else {
-      let (lr, pres, rr) = split(x, r)
-      (join(l, v, d, lr), pres, rr)
-    }
-  }
-
-let rec merge = (f, s1, s2) =>
-  switch (s1, s2) {
-  | (Empty, Empty) => Empty
-  | (Node(l1, v1, d1, r1, h1), _) if h1 >= height(s2) =>
-    let (l2, d2, r2) = split(v1, s2)
-    concat_or_join(merge(f, l1, l2), v1, f(v1, Some(d1), d2), merge(f, r1, r2))
-  | (_, Node(l2, v2, d2, r2, h2)) =>
-    let (l1, d1, r1) = split(v2, s1)
-    concat_or_join(merge(f, l1, l2), v2, f(v2, d1, Some(d2)), merge(f, r1, r2))
-  | _ => assert(false)
-  }
-
-let rec filter = (p, x) =>
-  switch x {
-  | Empty => Empty
-  | Node(l, v, d, r, _) =>
-    /* call [p] in the expected left-to-right order */
-    let l' = filter(p, l)
-    let pvd = p(v, d)
-    let r' = filter(p, r)
-    if pvd {
-      join(l', v, d, r')
-    } else {
-      concat(l', r')
-    }
-  }
-
-let rec partition = (p, x) =>
-  switch x {
-  | Empty => (Empty, Empty)
-  | Node(l, v, d, r, _) =>
-    /* call [p] in the expected left-to-right order */
-    let (lt, lf) = partition(p, l)
-    let pvd = p(v, d)
-    let (rt, rf) = partition(p, r)
-    if pvd {
-      (join(lt, v, d, rt), concat(lf, rf))
-    } else {
-      (concat(lt, rt), join(lf, v, d, rf))
-    }
-  }
-
-type rec enumeration<'a> = End | More(key, 'a, t<'a>, enumeration<'a>)
-
-let rec cons_enum = (m, e) =>
-  switch m {
-  | Empty => e
-  | Node(l, v, d, r, _) => cons_enum(l, More(v, d, r, e))
-  }
-
-let compare = (cmp, m1, m2) => {
-  let rec compare_aux = (e1, e2) =>
-    switch (e1, e2) {
-    | (End, End) => 0
-    | (End, _) => -1
-    | (_, End) => 1
-    | (More(v1, d1, r1, e1), More(v2, d2, r2, e2)) =>
-      let c = compare(v1, v2)
-      if c != 0 {
-        c
-      } else {
-        let c = cmp(d1, d2)
-        if c != 0 {
-          c
-        } else {
-          compare_aux(cons_enum(r1, e1), cons_enum(r2, e2))
-        }
-      }
-    }
-  compare_aux(cons_enum(m1, End), cons_enum(m2, End))
-}
-
-/* let equal cmp m1 m2 = */
-/* let rec equal_aux e1 e2 = */
-/* match (e1, e2) with */
-/* (End, End) -> true */
-/* | (End, _)  -> false */
-/* | (_, End) -> false */
-/* | (More(v1, d1, r1, e1), More(v2, d2, r2, e2)) -> */
-/* compare v1 v2 = 0 && cmp d1 d2 && */
-/* equal_aux (cons_enum r1 e1) (cons_enum r2 e2) */
-/* in equal_aux (cons_enum m1 End) (cons_enum m2 End) */
-
-let rec cardinal = x =>
-  switch x {
-  | Empty => 0
-  | Node(l, _, _, r, _) => cardinal(l) + 1 + cardinal(r)
-  }
-
-let rec bindings_aux = (accu, x) =>
-  switch x {
-  | Empty => accu
-  | Node(l, v, d, r, _) => bindings_aux(list{(v, d), ...bindings_aux(accu, r)}, l)
-  }
-
-let bindings = s => bindings_aux(list{}, s)
-
-let choose = min_binding
-
-/* end */
-let m = List.fold_left(
-  (acc, (k, v)) => add(k, v, acc),
-  empty,
-  list{(10, 'a'), (3, 'b'), (7, 'c'), (20, 'd')},
-)
-
-@val("console.log") external log: 'a => unit = ""
-
-Mt.from_pair_suites(__MODULE__, list{("find", _ => Mt.Eq(find(10, m), 'a'))})
diff --git a/jscomp/test/inline_map_test.resi b/jscomp/test/inline_map_test.resi
deleted file mode 100644
index 9ed9122..0000000
--- a/jscomp/test/inline_map_test.resi
+++ /dev/null
@@ -1 +0,0 @@
-/* val assertions : unit -> unit */
diff --git a/jscomp/test/inline_record_test.js b/jscomp/test/inline_record_test.js
deleted file mode 100644
index 25d6b5c..0000000
--- a/jscomp/test/inline_record_test.js
+++ /dev/null
@@ -1,245 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var v = {
-  TAG: "A0",
-  lbl: 3,
-  more: /* [] */0
-};
-
-var v1 = {
-  TAG: "A1",
-  more: {
-    hd: 1,
-    tl: {
-      hd: 2,
-      tl: /* [] */0
-    }
-  }
-};
-
-function f(x) {
-  if (x.TAG === "A0") {
-    return List.fold_left((function (prim0, prim1) {
-                  return prim0 + prim1 | 0;
-                }), x.lbl, x.more);
-  } else {
-    return List.fold_left((function (prim0, prim1) {
-                  return prim0 + prim1 | 0;
-                }), 0, x.more);
-  }
-}
-
-eq("File \"inline_record_test.res\", line 19, characters 3-10", f(v), 3);
-
-eq("File \"inline_record_test.res\", line 20, characters 3-10", f(v1), 3);
-
-console.log(f(v));
-
-console.log(f(v1));
-
-var A0 = /* @__PURE__ */Caml_exceptions.create("Inline_record_test.A0");
-
-var v3 = {
-  RE_EXN_ID: A0,
-  lbl: 3,
-  more: /* [] */0
-};
-
-var tmp;
-
-if (A0 === A0) {
-  tmp = 3;
-} else {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "inline_record_test.res",
-          47,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-eq("File \"inline_record_test.res\", line 44, characters 2-9", tmp, 3);
-
-function ff(x) {
-  if (x.TAG === "A0") {
-    x.x = x.x + 1 | 0;
-  } else {
-    x.z = x.z + 2 | 0;
-  }
-}
-
-var v4 = {
-  TAG: "A0",
-  x: 0,
-  y: 0,
-  z: 0
-};
-
-var v5 = {
-  TAG: "A1",
-  z: 0
-};
-
-for(var i = 0; i <= 10; ++i){
-  ff(v4);
-  ff(v5);
-}
-
-var tmp$1;
-
-if (v4.TAG === "A0") {
-  tmp$1 = v4.x;
-} else {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "inline_record_test.res",
-          74,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-eq("File \"inline_record_test.res\", line 71, characters 2-9", tmp$1, 11);
-
-var tmp$2;
-
-if (v5.TAG === "A0") {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "inline_record_test.res",
-          83,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-tmp$2 = v5.z;
-
-eq("File \"inline_record_test.res\", line 80, characters 2-9", tmp$2, 22);
-
-var A4 = /* @__PURE__ */Caml_exceptions.create("Inline_record_test.A4");
-
-var v6 = {
-  RE_EXN_ID: A4,
-  x: 0,
-  y: 0,
-  z: 0
-};
-
-function ff0(x) {
-  if (x.RE_EXN_ID === A4) {
-    x.x = x.x + 1 | 0;
-    x.z = x.z + 1 | 0;
-    return ;
-  }
-  
-}
-
-for(var i$1 = 0; i$1 <= 10; ++i$1){
-  ff0(v6);
-}
-
-var tmp$3;
-
-if (v6.RE_EXN_ID === A4) {
-  tmp$3 = v6.x;
-} else {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "inline_record_test.res",
-          108,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-eq("File \"inline_record_test.res\", line 105, characters 2-9", tmp$3, 11);
-
-function ff1(x) {
-  if (typeof x !== "object") {
-    return "A1";
-  } else {
-    return {
-            TAG: "A0",
-            lbl: x.lbl + 1 | 0,
-            more: x.more
-          };
-  }
-}
-
-Mt.from_pair_suites("Inline_record_test", suites.contents);
-
-var b = {
-  TAG: "B"
-};
-
-if (typeof b !== "object") {
-  console.log("A!");
-} else {
-  console.log("B");
-}
-
-console.log("10!");
-
-var v2 = {
-  TAG: "A0",
-  lbl: 3,
-  more: /* [] */0
-};
-
-var vvv = {
-  TAG: "A0",
-  lbl: 3,
-  more: /* [] */0
-};
-
-var r = {
-  y: 10
-};
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.v = v;
-exports.v1 = v1;
-exports.f = f;
-exports.v2 = v2;
-exports.A0 = A0;
-exports.v3 = v3;
-exports.vvv = vvv;
-exports.ff = ff;
-exports.v4 = v4;
-exports.v5 = v5;
-exports.A4 = A4;
-exports.v6 = v6;
-exports.ff0 = ff0;
-exports.ff1 = ff1;
-exports.b = b;
-exports.r = r;
-/*  Not a pure module */
diff --git a/jscomp/test/inline_record_test.res b/jscomp/test/inline_record_test.res
deleted file mode 100644
index cfc5b24..0000000
--- a/jscomp/test/inline_record_test.res
+++ /dev/null
@@ -1,136 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-
-let test_id = ref(0)
-
-let eq = (loc, x, y): unit => Mt.eq_suites(~test_id, loc, ~suites, x, y)
-
-type t0 =
-  | A0({lbl: int, more: list<int>})
-  | A1({more: list<int>})
-
-let v: t0 = A0({lbl: 3, more: list{}})
-let v1 = A1({more: list{1, 2}})
-
-let f = (x: t0) =>
-  switch x {
-  | A0({lbl, more}) => List.fold_left(\"+", lbl, more)
-  | A1({more}) => List.fold_left(\"+", 0, more)
-  }
-eq(__LOC__, f(v), 3)
-eq(__LOC__, f(v1), 3)
-Js.log(f(v))
-Js.log(f(v1))
-
-/* let foo ?(bar= 1) baz = bar + baz */
-type t1 =
-  | A0({lbl: int, more: list<int>})
-  | A1
-
-let v2: t1 = A0({lbl: 3, more: list{}})
-
-type t2 = ..
-
-type t2 += A0({lbl: int, more: list<int>})
-
-let v3: t2 = A0({lbl: 3, more: list{}})
-
-type t3 =
-  | A0({lbl: int, more: list<int>})
-  | A1
-
-let vvv: t3 = A0({lbl: 3, more: list{}})
-
-eq(
-  __LOC__,
-  switch v3 {
-  | A0({lbl}) => lbl
-  | _ => assert(false)
-  },
-  3,
-)
-
-type t4 =
-  | A0({mutable x: int, y: int, mutable z: int})
-  | A1({mutable z: int})
-
-let ff = (x: t4) =>
-  switch x {
-  | A0(u) => u.x = u.x + 1
-  | A1(u) => u.z = u.z + 2
-  }
-
-let v4: t4 = A0({x: 0, y: 0, z: 0})
-let v5: t4 = A1({z: 0})
-
-for i in 0 to 10 {
-  ff(v4)
-  ff(v5)
-}
-
-eq(
-  __LOC__,
-  switch v4 {
-  | A0(u) => u.x
-  | _ => assert(false)
-  },
-  11,
-)
-
-eq(
-  __LOC__,
-  switch v5 {
-  | A1(u) => u.z
-  | _ => assert(false)
-  },
-  22,
-)
-
-exception A4({mutable x: int, y: int, mutable z: int})
-
-let v6: exn = A4({x: 0, y: 0, z: 0})
-
-let ff0 = (x: exn) =>
-  switch x {
-  | A4(u) =>
-    u.x = u.x + 1
-    u.z = u.z + 1
-  | _ => ()
-  }
-
-for i in 0 to 10 {
-  ff0(v6)
-}
-
-eq(
-  __LOC__,
-  switch v6 {
-  | A4(u) => u.x
-  | _ => assert(false)
-  },
-  11,
-)
-
-let ff1 = (x: t1): t1 =>
-  switch x {
-  | A0(u) => A0({...u, lbl: u.lbl + 1})
-  | A1 => A1
-  }
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
-
-type emptyRecord = A | B({})
-
-let b = B({})
-
-let () = switch b {
-| A => Js.log("A!")
-| B({}) => Js.log("B")
-}
-
-type r = {y: int}
-let r = {y: 10}
-
-switch r {
-| {y: 10} => Js.log("10!")
-| {} => Js.log("Catch all?")
-}
diff --git a/jscomp/test/inline_regression_test.js b/jscomp/test/inline_regression_test.js
deleted file mode 100644
index 79e5b6d..0000000
--- a/jscomp/test/inline_regression_test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var $$String = require("../../lib/js/string.js");
-var Filename = require("../../lib/js/filename.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-
-function generic_basename(is_dir_sep, current_dir_name, name) {
-  if (name === "") {
-    return current_dir_name;
-  } else {
-    var _n = name.length - 1 | 0;
-    while(true) {
-      var n = _n;
-      if (n < 0) {
-        return $$String.sub(name, 0, 1);
-      }
-      if (!Curry._2(is_dir_sep, name, n)) {
-        var _n$1 = n;
-        var p = n + 1 | 0;
-        while(true) {
-          var n$1 = _n$1;
-          if (n$1 < 0) {
-            return $$String.sub(name, 0, p);
-          }
-          if (Curry._2(is_dir_sep, name, n$1)) {
-            return $$String.sub(name, n$1 + 1 | 0, (p - n$1 | 0) - 1 | 0);
-          }
-          _n$1 = n$1 - 1 | 0;
-          continue ;
-        };
-      }
-      _n = n - 1 | 0;
-      continue ;
-    };
-  }
-}
-
-function basename(param) {
-  return generic_basename((function (s, i) {
-                return Caml_string.get(s, i) === /* '/' */47;
-              }), Filename.current_dir_name, param);
-}
-
-var suites_0 = [
-  "basename",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: basename("b/c/a.b"),
-              _1: "a.b"
-            };
-    })
-];
-
-var suites = {
-  hd: suites_0,
-  tl: /* [] */0
-};
-
-Mt.from_pair_suites("Inline_regression_test", suites);
-
-exports.generic_basename = generic_basename;
-exports.basename = basename;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/inline_regression_test.res b/jscomp/test/inline_regression_test.res
deleted file mode 100644
index 8139912..0000000
--- a/jscomp/test/inline_regression_test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-let generic_basename = (is_dir_sep, current_dir_name, name) => {
-  let rec find_end = n =>
-    if n < 0 {
-      String.sub(name, 0, 1)
-    } else if is_dir_sep(name, n) {
-      find_end(n - 1)
-    } else {
-      find_beg(n, n + 1)
-    }
-  and find_beg = (n, p) =>
-    if n < 0 {
-      String.sub(name, 0, p)
-    } else if is_dir_sep(name, n) {
-      String.sub(name, n + 1, p - n - 1)
-    } else {
-      find_beg(n - 1, p)
-    }
-
-  if name == "" {
-    current_dir_name
-  } else {
-    find_end(String.length(name) - 1)
-  }
-}
-
-let basename = generic_basename((s, i) => String.get(s, i) == '/', Filename.current_dir_name)
-
-let suites = {
-  open Mt
-  list{("basename", _ => Eq(basename("b/c/a.b"), "a.b"))}
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/inline_string_test.js b/jscomp/test/inline_string_test.js
deleted file mode 100644
index fa4faec..0000000
--- a/jscomp/test/inline_string_test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log("list");
-
-console.log("list");
-
-function f(x) {
-  if (x !== undefined) {
-    return "Some";
-  } else {
-    return "None";
-  }
-}
-
-console.log([
-      f(3),
-      "None",
-      "Some"
-    ]);
-
-console.log([
-      "A",
-      "A"
-    ]);
-
-/*  Not a pure module */
diff --git a/jscomp/test/inline_string_test.res b/jscomp/test/inline_string_test.res
deleted file mode 100644
index 6bcc79f..0000000
--- a/jscomp/test/inline_string_test.res
+++ /dev/null
@@ -1,69 +0,0 @@
-@@bs.config({no_export: no_export})
-type t =
-  | A_list
-  | A_hashtable
-
-let string_of_associative_type = x =>
-  switch x {
-  | A_list => "list"
-  | A_hashtable => "Hashtbl.t"
-  }
-
-Js.log(string_of_associative_type(A_list))
-
-type t2 =
-  | A_list
-  | A_hashtable
-  | A_bad
-let string_of_associative_type = x =>
-  switch x {
-  | A_list => "list"
-  | A_hashtable => "Hashtbl.t"
-  | A_bad => "bad"
-  }
-
-Js.log(string_of_associative_type(A_list))
-
-let v = Some(3)
-
-let f = x =>
-  switch x {
-  | Some(_) => "Some"
-  | None => "None"
-  }
-let u = v => f(Some(v))
-Js.log((f(v), f(None), f(Some(3))))
-
-type v =
-  | A(int)
-  | B(int)
-  | C(int)
-  | D(int)
-  | E(int)
-  | F(int)
-  | G(int)
-  | H(int)
-
-let ff = x =>
-  switch x {
-  | A(_) => "A"
-  | B(_) => "B"
-  | C(_) => "C"
-  | D(_) => "D"
-  | E(_) => "E"
-  | F(_) => "F"
-  | G(_) => "G"
-  | H(_) => "H"
-  }
-
-Js.log((
-  ff(A(3)),
-  (
-    x =>
-      switch x {
-      | A(_) => "A"
-      | B(_) => "B"
-      | _ => "?"
-      }
-  )(A(3)),
-))
diff --git a/jscomp/test/inner_call.js b/jscomp/test/inner_call.js
deleted file mode 100644
index 27eb2e2..0000000
--- a/jscomp/test/inner_call.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Inner_define = require("./inner_define.js");
-
-console.log(Inner_define.N.add(1, 2));
-
-function f(x) {
-  return [
-          Inner_define.N0.f1(x),
-          Inner_define.N0.f2(x, x),
-          Inner_define.N0.f3(x, x, x),
-          Inner_define.N1.f2(x, x)
-        ];
-}
-
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/inner_call.res b/jscomp/test/inner_call.res
deleted file mode 100644
index 6adc75c..0000000
--- a/jscomp/test/inner_call.res
+++ /dev/null
@@ -1,5 +0,0 @@
-Js.log(Inner_define.N.add(1, 2))
-
-open Inner_define
-
-let f = x => (N0.f1(x), N0.f2(x, x), N0.f3(x, x, x), N1.f2(x, x))
diff --git a/jscomp/test/inner_define.js b/jscomp/test/inner_define.js
deleted file mode 100644
index 503683b..0000000
--- a/jscomp/test/inner_define.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function add(x, y) {
-  return x + y | 0;
-}
-
-var N = {
-  add: add
-};
-
-function f1(param) {
-  
-}
-
-function f2(param, param$1) {
-  
-}
-
-function f3(param, param$1, param$2) {
-  
-}
-
-var N0 = {
-  f1: f1,
-  f2: f2,
-  f3: f3
-};
-
-function f2$1(param, param$1) {
-  
-}
-
-function f3$1(param, param$1, param$2) {
-  
-}
-
-var N1 = {
-  f2: f2$1,
-  f3: f3$1
-};
-
-exports.N = N;
-exports.N0 = N0;
-exports.N1 = N1;
-/* No side effect */
diff --git a/jscomp/test/inner_define.res b/jscomp/test/inner_define.res
deleted file mode 100644
index d73752d..0000000
--- a/jscomp/test/inner_define.res
+++ /dev/null
@@ -1,23 +0,0 @@
-module N = {
-  let add = (x, y) => x + y
-}
-
-module type S0 = {
-  let f1: unit => unit
-  let f2: (unit, unit) => unit
-  let f3: (unit, unit, unit) => unit
-}
-
-module N0: S0 = {
-  let f4 = (_, _, _) => ()
-  let f1 = _ => ()
-  let f2 = (_, _) => ()
-  let f3 = (_, _, _) => ()
-}
-
-module N1 = {
-  let f4 = (_, _, _) => ()
-  let f1 = _ => ()
-  let f2 = (_, _) => ()
-  let f3 = (_, _, _) => ()
-}
diff --git a/jscomp/test/inner_define.resi b/jscomp/test/inner_define.resi
deleted file mode 100644
index 65d9440..0000000
--- a/jscomp/test/inner_define.resi
+++ /dev/null
@@ -1,16 +0,0 @@
-module N: {
-  let add: (int, int) => int
-}
-
-module type S0 = {
-  let f1: unit => unit
-  let f2: (unit, unit) => unit
-  let f3: (unit, unit, unit) => unit
-}
-
-module N0: S0
-
-module N1: {
-  let f2: (unit, unit) => unit
-  let f3: (unit, unit, unit) => unit
-}
diff --git a/jscomp/test/inner_unused.js b/jscomp/test/inner_unused.js
deleted file mode 100644
index a76c319..0000000
--- a/jscomp/test/inner_unused.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  return x + 3 | 0;
-}
-
-function M(S) {
-  var f = function (x) {
-    return x;
-  };
-  return {
-          f: f
-        };
-}
-
-function fff(param, param$1) {
-  return 3;
-}
-
-exports.f = f;
-exports.M = M;
-exports.fff = fff;
-/* No side effect */
diff --git a/jscomp/test/inner_unused.res b/jscomp/test/inner_unused.res
deleted file mode 100644
index 5c70a3a..0000000
--- a/jscomp/test/inner_unused.res
+++ /dev/null
@@ -1,18 +0,0 @@
-let f = x => {
-  let unused_f = x => {
-    Js.log("x")
-    x + x
-  }
-  let unused_h = x => unused_f(3)
-  x + 3
-}
-
-module M = (S: Set.S): {
-  let f: int => int
-} => {
-  let f = x => x
-  let unused_g = x => x + 2
-  let unused_h = x => unused_g(x)
-}
-
-let fff = (_, _) => 3
diff --git a/jscomp/test/installation_test.js b/jscomp/test/installation_test.js
deleted file mode 100644
index de7f502..0000000
--- a/jscomp/test/installation_test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-Mt.from_pair_suites("Installation_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/installation_test.res b/jscomp/test/installation_test.res
deleted file mode 100644
index f404ebd..0000000
--- a/jscomp/test/installation_test.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/int32_test.js b/jscomp/test/int32_test.js
deleted file mode 100644
index 7d53b6e..0000000
--- a/jscomp/test/int32_test.js
+++ /dev/null
@@ -1,241 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Int32 = require("../../lib/js/int32.js");
-var Caml_float = require("../../lib/js/caml_float.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Ext_array_test = require("./ext_array_test.js");
-
-function f(x) {
-  return [
-          x,
-          (x >>> 1),
-          (x >>> 2)
-        ];
-}
-
-var shift_right_logical_tests_0 = $$Array.map((function (x) {
-        return (-1 >>> x) | 0;
-      }), Ext_array_test.range(0, 31));
-
-var shift_right_logical_tests_1 = [
-  -1,
-  2147483647,
-  1073741823,
-  536870911,
-  268435455,
-  134217727,
-  67108863,
-  33554431,
-  16777215,
-  8388607,
-  4194303,
-  2097151,
-  1048575,
-  524287,
-  262143,
-  131071,
-  65535,
-  32767,
-  16383,
-  8191,
-  4095,
-  2047,
-  1023,
-  511,
-  255,
-  127,
-  63,
-  31,
-  15,
-  7,
-  3,
-  1
-];
-
-var shift_right_logical_tests = [
-  shift_right_logical_tests_0,
-  shift_right_logical_tests_1
-];
-
-var shift_right_tests_0 = $$Array.map((function (x) {
-        return (Int32.min_int >> x);
-      }), Ext_array_test.range(0, 31));
-
-var shift_right_tests_1 = [
-  -2147483648,
-  -1073741824,
-  -536870912,
-  -268435456,
-  -134217728,
-  -67108864,
-  -33554432,
-  -16777216,
-  -8388608,
-  -4194304,
-  -2097152,
-  -1048576,
-  -524288,
-  -262144,
-  -131072,
-  -65536,
-  -32768,
-  -16384,
-  -8192,
-  -4096,
-  -2048,
-  -1024,
-  -512,
-  -256,
-  -128,
-  -64,
-  -32,
-  -16,
-  -8,
-  -4,
-  -2,
-  -1
-];
-
-var shift_right_tests = [
-  shift_right_tests_0,
-  shift_right_tests_1
-];
-
-var shift_left_tests_0 = $$Array.map((function (x) {
-        return (1 << x);
-      }), Ext_array_test.range(0, 31));
-
-var shift_left_tests_1 = [
-  1,
-  2,
-  4,
-  8,
-  16,
-  32,
-  64,
-  128,
-  256,
-  512,
-  1024,
-  2048,
-  4096,
-  8192,
-  16384,
-  32768,
-  65536,
-  131072,
-  262144,
-  524288,
-  1048576,
-  2097152,
-  4194304,
-  8388608,
-  16777216,
-  33554432,
-  67108864,
-  134217728,
-  268435456,
-  536870912,
-  1073741824,
-  -2147483648
-];
-
-var shift_left_tests = [
-  shift_left_tests_0,
-  shift_left_tests_1
-];
-
-function $star$tilde(prim0, prim1) {
-  return Math.imul(prim0, prim1);
-}
-
-var suites = {
-  contents: Pervasives.$at({
-        hd: [
-          "File \"int32_test.res\", line 131, characters 9-16",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: 1,
-                      _1: 1
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "File \"int32_test.res\", line 132, characters 9-16",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: -2147483647,
-                        _1: -2147483647
-                      };
-              })
-          ],
-          tl: /* [] */0
-        }
-      }, Pervasives.$at($$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
-                      return [
-                              "shift_right_logical_cases " + i,
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: a,
-                                          _1: b
-                                        };
-                                })
-                            ];
-                    }), shift_right_logical_tests_0, shift_right_logical_tests_1)), Pervasives.$at($$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
-                          return [
-                                  "shift_right_cases " + i,
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: a,
-                                              _1: b
-                                            };
-                                    })
-                                ];
-                        }), shift_right_tests_0, shift_right_tests_1)), $$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
-                          return [
-                                  "shift_left_cases " + i,
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: a,
-                                              _1: b
-                                            };
-                                    })
-                                ];
-                        }), shift_left_tests_0, shift_left_tests_1)))))
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-eq("File \"int32_test.res\", line 170, characters 5-12", Caml_float.int_bits_of_float(0.3), 1050253722);
-
-eq("File \"int32_test.res\", line 171, characters 5-12", Caml_float.int_float_of_bits(1050253722), 0.300000011920928955);
-
-Mt.from_pair_suites("Int32_test", suites.contents);
-
-var test_div = 30;
-
-exports.f = f;
-exports.shift_right_logical_tests = shift_right_logical_tests;
-exports.shift_right_tests = shift_right_tests;
-exports.shift_left_tests = shift_left_tests;
-exports.test_div = test_div;
-exports.$star$tilde = $star$tilde;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/* shift_right_logical_tests Not a pure module */
diff --git a/jscomp/test/int32_test.res b/jscomp/test/int32_test.res
deleted file mode 100644
index 78d3c43..0000000
--- a/jscomp/test/int32_test.res
+++ /dev/null
@@ -1,173 +0,0 @@
-let f = x => Int32.logor(Int32.logor(x, 0l), 0l)
-
-let f = x => (
-  Int32.shift_right_logical(x, 0),
-  Int32.shift_right_logical(x, 1),
-  Int32.shift_right_logical(x, 2),
-)
-
-let shift_right_logical_tests = (
-  Ext_array_test.range(0, 31) |> Array.map(x => Int32.shift_right_logical(-1l, x)),
-  [
-    -1l,
-    2147483647l,
-    1073741823l,
-    536870911l,
-    268435455l,
-    134217727l,
-    67108863l,
-    33554431l,
-    16777215l,
-    8388607l,
-    4194303l,
-    2097151l,
-    1048575l,
-    524287l,
-    262143l,
-    131071l,
-    65535l,
-    32767l,
-    16383l,
-    8191l,
-    4095l,
-    2047l,
-    1023l,
-    511l,
-    255l,
-    127l,
-    63l,
-    31l,
-    15l,
-    7l,
-    3l,
-    1l,
-  ],
-)
-
-let shift_right_tests = (
-  Ext_array_test.range(0, 31) |> Array.map(x => Int32.shift_right(Int32.min_int, x)),
-  [
-    -2147483648l,
-    -1073741824l,
-    -536870912l,
-    -268435456l,
-    -134217728l,
-    -67108864l,
-    -33554432l,
-    -16777216l,
-    -8388608l,
-    -4194304l,
-    -2097152l,
-    -1048576l,
-    -524288l,
-    -262144l,
-    -131072l,
-    -65536l,
-    -32768l,
-    -16384l,
-    -8192l,
-    -4096l,
-    -2048l,
-    -1024l,
-    -512l,
-    -256l,
-    -128l,
-    -64l,
-    -32l,
-    -16l,
-    -8l,
-    -4l,
-    -2l,
-    -1l,
-  ],
-)
-
-let shift_left_tests = (
-  Ext_array_test.range(0, 31) |> Array.map(x => Int32.shift_left(1l, x)),
-  [
-    1l,
-    2l,
-    4l,
-    8l,
-    16l,
-    32l,
-    64l,
-    128l,
-    256l,
-    512l,
-    1024l,
-    2048l,
-    4096l,
-    8192l,
-    16384l,
-    32768l,
-    65536l,
-    131072l,
-    262144l,
-    524288l,
-    1048576l,
-    2097152l,
-    4194304l,
-    8388608l,
-    16777216l,
-    33554432l,
-    67108864l,
-    134217728l,
-    268435456l,
-    536870912l,
-    1073741824l,
-    -2147483648l,
-  ],
-)
-
-let test_div = 61 / 2
-
-let \"*~" = Int32.mul
-let suites = ref(
-  \"@"(
-    {
-      open Mt
-      list{
-        (__LOC__, _ => Eq(\"*~"(0xffff_ffffl, 0xffff_ffffl), 1l)),
-        (__LOC__, _ => Eq(\"*~"(0xffff_ffffl, 0x7fff_ffffl), -2147483647l)),
-      }
-    },
-    \"@"(
-      {
-        let (a, b) = shift_right_logical_tests
-        Ext_array_test.map2i(
-          (i, a, b) => ("shift_right_logical_cases " ++ __unsafe_cast(i), _ => Mt.Eq(a, b)),
-          a,
-          b,
-        ) |> Array.to_list
-      },
-      \"@"(
-        {
-          let (a, b) = shift_right_tests
-          Ext_array_test.map2i(
-            (i, a, b) => ("shift_right_cases " ++ __unsafe_cast(i), _ => Mt.Eq(a, b)),
-            a,
-            b,
-          ) |> Array.to_list
-        },
-        {
-          let (a, b) = shift_left_tests
-          Ext_array_test.map2i(
-            (i, a, b) => ("shift_left_cases " ++ __unsafe_cast(i), _ => Mt.Eq(a, b)),
-            a,
-            b,
-          ) |> Array.to_list
-        },
-      ),
-    ),
-  ),
-)
-
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let () = {
-  eq(__LOC__, Int32.bits_of_float(0.3), 1050253722l)
-  eq(__LOC__, Int32.float_of_bits(1050253722l), 0.300000011920928955)
-}
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/int64_mul_div_test.js b/jscomp/test/int64_mul_div_test.js
deleted file mode 100644
index cae2874..0000000
--- a/jscomp/test/int64_mul_div_test.js
+++ /dev/null
@@ -1,1694 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Int64 = require("../../lib/js/int64.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-function commutative_mul(result, a, b) {
-  return {
-          TAG: "Eq",
-          _0: [
-            result,
-            result
-          ],
-          _1: [
-            Caml_int64.mul(a, b),
-            Caml_int64.mul(b, a)
-          ]
-        };
-}
-
-var pairs = [
-  [
-    [
-      -1482940033,
-      2541785568
-    ],
-    [
-      1831202545,
-      525340320
-    ],
-    [
-      165328154,
-      634982515
-    ]
-  ],
-  [
-    [
-      2086642202,
-      4249709544
-    ],
-    [
-      1756378018,
-      3051843660
-    ],
-    [
-      1129387921,
-      4132619358
-    ]
-  ],
-  [
-    [
-      -2133087767,
-      1358520104
-    ],
-    [
-      209351581,
-      3480263932
-    ],
-    [
-      2047885301,
-      2699186102
-    ]
-  ],
-  [
-    [
-      781938191,
-      3733162556
-    ],
-    [
-      1243995318,
-      3630533041
-    ],
-    [
-      965315102,
-      2542797052
-    ]
-  ],
-  [
-    [
-      -1526298485,
-      3121533040
-    ],
-    [
-      806837349,
-      4053728232
-    ],
-    [
-      973509509,
-      2421939110
-    ]
-  ],
-  [
-    [
-      -1053250751,
-      2477426938
-    ],
-    [
-      297218479,
-      3467715454
-    ],
-    [
-      1353404045,
-      1639039171
-    ]
-  ],
-  [
-    [
-      -1614556777,
-      1100802137
-    ],
-    [
-      1812737275,
-      732603925
-    ],
-    [
-      1686007471,
-      1587408437
-    ]
-  ],
-  [
-    [
-      166521361,
-      3339161296
-    ],
-    [
-      585926665,
-      2485045435
-    ],
-    [
-      1193284387,
-      2883446640
-    ]
-  ],
-  [
-    [
-      -1556851713,
-      2199030589
-    ],
-    [
-      563693579,
-      3317959669
-    ],
-    [
-      1423006973,
-      700349737
-    ]
-  ],
-  [
-    [
-      2096650716,
-      2212704850
-    ],
-    [
-      1413202597,
-      4019257153
-    ],
-    [
-      495794945,
-      3451719634
-    ]
-  ],
-  [
-    [
-      1149398987,
-      1313884544
-    ],
-    [
-      556147957,
-      255480485
-    ],
-    [
-      1711350082,
-      929852288
-    ]
-  ],
-  [
-    [
-      908394614,
-      2507458775
-    ],
-    [
-      1053216964,
-      725956947
-    ],
-    [
-      2145390454,
-      3984887277
-    ]
-  ],
-  [
-    [
-      962684198,
-      1441406688
-    ],
-    [
-      1528894622,
-      468792198
-    ],
-    [
-      1893431833,
-      3919858640
-    ]
-  ],
-  [
-    [
-      -603570361,
-      3328354720
-    ],
-    [
-      1842921977,
-      1999781536
-    ],
-    [
-      1854314037,
-      3255494393
-    ]
-  ],
-  [
-    [
-      1827458543,
-      1187405920
-    ],
-    [
-      1066436782,
-      2505967328
-    ],
-    [
-      1004254249,
-      2020291989
-    ]
-  ],
-  [
-    [
-      -1818789533,
-      1878451246
-    ],
-    [
-      247021097,
-      1999625579
-    ],
-    [
-      1434621550,
-      2370451978
-    ]
-  ],
-  [
-    [
-      1714915951,
-      2103538455
-    ],
-    [
-      1071186049,
-      45872671
-    ],
-    [
-      911777108,
-      2638787593
-    ]
-  ],
-  [
-    [
-      365880810,
-      3950734524
-    ],
-    [
-      1215123423,
-      1477626470
-    ],
-    [
-      1155052099,
-      1816687658
-    ]
-  ],
-  [
-    [
-      -1590309406,
-      1713682280
-    ],
-    [
-      1236324221,
-      2330256524
-    ],
-    [
-      871497139,
-      1538765150
-    ]
-  ],
-  [
-    [
-      -1335640207,
-      1074580892
-    ],
-    [
-      153491040,
-      2295578284
-    ],
-    [
-      469100620,
-      1001897781
-    ]
-  ]
-];
-
-function from_pairs(prefix, pairs) {
-  return $$Array.to_list($$Array.mapi((function (i, param) {
-                    var b = param[2];
-                    var a = param[1];
-                    var result = param[0];
-                    return [
-                            prefix + "_" + i,
-                            (function (param) {
-                                return commutative_mul(result, a, b);
-                              })
-                          ];
-                  }), pairs));
-}
-
-var small_pairs = [
-  [
-    [
-      0,
-      121
-    ],
-    [
-      0,
-      11
-    ],
-    [
-      0,
-      11
-    ]
-  ],
-  [
-    [
-      0,
-      126736
-    ],
-    [
-      0,
-      356
-    ],
-    [
-      0,
-      356
-    ]
-  ],
-  [
-    [
-      0,
-      137176406
-    ],
-    [
-      0,
-      12346
-    ],
-    [
-      0,
-      11111
-    ]
-  ],
-  [
-    [
-      268435455,
-      4293918720
-    ],
-    [
-      255,
-      4294967295
-    ],
-    [
-      0,
-      1048576
-    ]
-  ],
-  [
-    [
-      -268435456,
-      1048576
-    ],
-    [
-      -256,
-      1
-    ],
-    [
-      0,
-      1048576
-    ]
-  ],
-  [
-    [
-      -639559543,
-      1275262484
-    ],
-    [
-      1209011959,
-      3147693253
-    ],
-    [
-      1831626934,
-      242558724
-    ]
-  ]
-];
-
-var to_floats = [
-  [
-    Caml_int64.one,
-    1
-  ],
-  [
-    [
-      0,
-      2
-    ],
-    2
-  ],
-  [
-    [
-      0,
-      4
-    ],
-    4
-  ],
-  [
-    [
-      0,
-      8
-    ],
-    8
-  ],
-  [
-    [
-      0,
-      16
-    ],
-    16
-  ],
-  [
-    [
-      0,
-      32
-    ],
-    32
-  ],
-  [
-    [
-      0,
-      64
-    ],
-    64
-  ],
-  [
-    [
-      0,
-      128
-    ],
-    128
-  ],
-  [
-    [
-      0,
-      256
-    ],
-    256
-  ],
-  [
-    [
-      0,
-      512
-    ],
-    512
-  ],
-  [
-    [
-      0,
-      1024
-    ],
-    1024
-  ],
-  [
-    [
-      0,
-      2048
-    ],
-    2048
-  ],
-  [
-    [
-      0,
-      4096
-    ],
-    4096
-  ],
-  [
-    [
-      0,
-      8192
-    ],
-    8192
-  ],
-  [
-    [
-      0,
-      16384
-    ],
-    16384
-  ],
-  [
-    [
-      0,
-      32768
-    ],
-    32768
-  ],
-  [
-    [
-      0,
-      65536
-    ],
-    65536
-  ],
-  [
-    [
-      0,
-      131072
-    ],
-    131072
-  ],
-  [
-    [
-      0,
-      262144
-    ],
-    262144
-  ],
-  [
-    [
-      0,
-      524288
-    ],
-    524288
-  ],
-  [
-    [
-      0,
-      1048576
-    ],
-    1048576
-  ],
-  [
-    [
-      0,
-      2097152
-    ],
-    2097152
-  ],
-  [
-    [
-      0,
-      4194304
-    ],
-    4194304
-  ],
-  [
-    [
-      0,
-      8388608
-    ],
-    8388608
-  ],
-  [
-    [
-      0,
-      16777216
-    ],
-    16777216
-  ],
-  [
-    [
-      0,
-      33554432
-    ],
-    33554432
-  ],
-  [
-    [
-      0,
-      67108864
-    ],
-    67108864
-  ],
-  [
-    [
-      0,
-      134217728
-    ],
-    134217728
-  ],
-  [
-    [
-      0,
-      268435456
-    ],
-    268435456
-  ],
-  [
-    [
-      0,
-      536870912
-    ],
-    536870912
-  ],
-  [
-    [
-      0,
-      1073741824
-    ],
-    1073741824
-  ],
-  [
-    [
-      0,
-      2147483648
-    ],
-    2147483648
-  ],
-  [
-    [
-      1,
-      0
-    ],
-    4294967296
-  ],
-  [
-    [
-      2,
-      0
-    ],
-    8589934592
-  ],
-  [
-    [
-      4,
-      0
-    ],
-    17179869184
-  ],
-  [
-    [
-      8,
-      0
-    ],
-    34359738368
-  ],
-  [
-    [
-      16,
-      0
-    ],
-    68719476736
-  ],
-  [
-    [
-      32,
-      0
-    ],
-    137438953472
-  ],
-  [
-    [
-      64,
-      0
-    ],
-    274877906944
-  ],
-  [
-    [
-      128,
-      0
-    ],
-    549755813888
-  ],
-  [
-    [
-      256,
-      0
-    ],
-    1099511627776
-  ],
-  [
-    [
-      512,
-      0
-    ],
-    2199023255552
-  ],
-  [
-    [
-      1024,
-      0
-    ],
-    4398046511104
-  ],
-  [
-    [
-      2048,
-      0
-    ],
-    8796093022208
-  ],
-  [
-    [
-      4096,
-      0
-    ],
-    17592186044416
-  ],
-  [
-    [
-      8192,
-      0
-    ],
-    35184372088832
-  ],
-  [
-    [
-      16384,
-      0
-    ],
-    70368744177664
-  ],
-  [
-    [
-      32768,
-      0
-    ],
-    140737488355328
-  ],
-  [
-    [
-      65536,
-      0
-    ],
-    281474976710656
-  ],
-  [
-    [
-      131072,
-      0
-    ],
-    562949953421312
-  ],
-  [
-    [
-      262144,
-      0
-    ],
-    1125899906842624
-  ],
-  [
-    [
-      524288,
-      0
-    ],
-    2251799813685248
-  ],
-  [
-    [
-      1048576,
-      0
-    ],
-    4503599627370496
-  ],
-  [
-    [
-      2097152,
-      0
-    ],
-    9007199254740992
-  ],
-  [
-    [
-      4194304,
-      0
-    ],
-    18014398509481984
-  ],
-  [
-    [
-      8388608,
-      0
-    ],
-    36028797018963968
-  ],
-  [
-    [
-      16777216,
-      0
-    ],
-    72057594037927936
-  ],
-  [
-    [
-      33554432,
-      0
-    ],
-    144115188075855872
-  ],
-  [
-    [
-      67108864,
-      0
-    ],
-    288230376151711744
-  ],
-  [
-    [
-      134217728,
-      0
-    ],
-    576460752303423488
-  ],
-  [
-    [
-      268435456,
-      0
-    ],
-    1.15292150460684698e+18
-  ],
-  [
-    [
-      536870912,
-      0
-    ],
-    2.30584300921369395e+18
-  ],
-  [
-    [
-      1073741824,
-      0
-    ],
-    4.6116860184273879e+18
-  ],
-  [
-    Caml_int64.min_int,
-    -9.22337203685477581e+18
-  ]
-];
-
-var check_complete_compare = [
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true,
-  true
-];
-
-var of_float_pairs = [
-  [
-    6853066956871844,
-    [
-      1595603,
-      4254472356
-    ]
-  ],
-  [
-    -8507688874782117,
-    [
-      -1980851,
-      1388466779
-    ]
-  ],
-  [
-    4083117349607451,
-    [
-      950674,
-      3610449947
-    ]
-  ],
-  [
-    -4860723193745655,
-    [
-      -1131726,
-      2964287241
-    ]
-  ],
-  [
-    7820020192255542,
-    [
-      1820740,
-      1437736502
-    ]
-  ],
-  [
-    -4908619721514532,
-    [
-      -1142878,
-      3911803356
-    ]
-  ],
-  [
-    5.67685864687671e+15,
-    [
-      1321746,
-      2803257894
-    ]
-  ],
-  [
-    -703696191048023,
-    [
-      -163843,
-      4135630505
-    ]
-  ],
-  [
-    1123586534990153.88,
-    [
-      261605,
-      1615520073
-    ]
-  ],
-  [
-    -4.29886533981922e+15,
-    [
-      -1000908,
-      1786485548
-    ]
-  ],
-  [
-    2.43885138012066e+15,
-    [
-      567839,
-      1445727316
-    ]
-  ],
-  [
-    -8011538689499494,
-    [
-      -1865332,
-      1246682778
-    ]
-  ],
-  [
-    2710072285421155,
-    [
-      630987,
-      3756220003
-    ]
-  ],
-  [
-    -2541457347159789.5,
-    [
-      -591730,
-      3650902291
-    ]
-  ],
-  [
-    5012932793576708,
-    [
-      1167164,
-      1584508164
-    ]
-  ],
-  [
-    -943066847413899.125,
-    [
-      -219575,
-      596605301
-    ]
-  ],
-  [
-    5440257518642004,
-    [
-      1266658,
-      2833425236
-    ]
-  ],
-  [
-    -7750676773453898,
-    [
-      -1804596,
-      4029038518
-    ]
-  ],
-  [
-    8911999221747713,
-    [
-      2074986,
-      2212089857
-    ]
-  ],
-  [
-    -1443906702582204.25,
-    [
-      -336186,
-      1172790852
-    ]
-  ],
-  [
-    659345820712164.875,
-    [
-      153515,
-      3916266724
-    ]
-  ],
-  [
-    -3284023713149006.5,
-    [
-      -764622,
-      2770653106
-    ]
-  ],
-  [
-    5062818438579988,
-    [
-      1178779,
-      1184368404
-    ]
-  ],
-  [
-    -8904450004162331,
-    [
-      -2073229,
-      747956453
-    ]
-  ],
-  [
-    848261089308786,
-    [
-      197501,
-      753381490
-    ]
-  ],
-  [
-    -6376579516657391,
-    [
-      -1484664,
-      3808891153
-    ]
-  ],
-  [
-    1337907592605664.25,
-    [
-      311505,
-      3805065184
-    ]
-  ],
-  [
-    -8.54733738833896e+15,
-    [
-      -1990083,
-      4012986608
-    ]
-  ],
-  [
-    2345417644172927,
-    [
-      546085,
-      428336767
-    ]
-  ],
-  [
-    -2587460670129294.5,
-    [
-      -602441,
-      3722640242
-    ]
-  ],
-  [
-    4580431718597436,
-    [
-      1066464,
-      3716236092
-    ]
-  ],
-  [
-    -1460576044874256.25,
-    [
-      -340067,
-      598574576
-    ]
-  ],
-  [
-    3403657978343579.5,
-    [
-      792475,
-      3770445979
-    ]
-  ],
-  [
-    -7.89068917321888e+15,
-    [
-      -1837195,
-      3268155840
-    ]
-  ],
-  [
-    1683098350604788.5,
-    [
-      391876,
-      3746517492
-    ]
-  ],
-  [
-    -3966538891560174.5,
-    [
-      -923532,
-      845249298
-    ]
-  ],
-  [
-    6726025288963652,
-    [
-      1566024,
-      3424212548
-    ]
-  ],
-  [
-    -4790410747298403,
-    [
-      -1115355,
-      2501131677
-    ]
-  ],
-  [
-    1985858071337706.25,
-    [
-      462368,
-      2632620778
-    ]
-  ],
-  [
-    -5281733497873409,
-    [
-      -1229750,
-      2534382591
-    ]
-  ]
-];
-
-var simple_divs = [
-  [
-    [
-      0,
-      6
-    ],
-    [
-      0,
-      3
-    ],
-    [
-      0,
-      2
-    ],
-    Caml_int64.zero
-  ],
-  [
-    [
-      0,
-      120
-    ],
-    [
-      0,
-      11
-    ],
-    [
-      0,
-      10
-    ],
-    [
-      0,
-      10
-    ]
-  ],
-  [
-    Caml_int64.min_int,
-    [
-      0,
-      2
-    ],
-    [
-      -1073741824,
-      0
-    ],
-    Caml_int64.zero
-  ],
-  [
-    [
-      1112580415,
-      4131866785
-    ],
-    [
-      2013350321,
-      2605406679
-    ],
-    Caml_int64.zero,
-    [
-      1112580415,
-      4131866785
-    ]
-  ],
-  [
-    [
-      983582600,
-      1414064366
-    ],
-    [
-      1027627185,
-      720592487
-    ],
-    Caml_int64.zero,
-    [
-      983582600,
-      1414064366
-    ]
-  ],
-  [
-    [
-      707587463,
-      4050792578
-    ],
-    [
-      457824592,
-      2852982217
-    ],
-    Caml_int64.one,
-    [
-      249762871,
-      1197810361
-    ]
-  ],
-  [
-    [
-      3696312,
-      3842956494
-    ],
-    [
-      303263066,
-      1932508180
-    ],
-    Caml_int64.zero,
-    [
-      3696312,
-      3842956494
-    ]
-  ],
-  [
-    [
-      1998955230,
-      530108890
-    ],
-    [
-      1876081138,
-      2994715702
-    ],
-    Caml_int64.one,
-    [
-      122874091,
-      1830360484
-    ]
-  ],
-  [
-    [
-      1123314058,
-      2451991450
-    ],
-    [
-      1077511003,
-      2658013162
-    ],
-    Caml_int64.one,
-    [
-      45803054,
-      4088945584
-    ]
-  ],
-  [
-    [
-      772515434,
-      3820835012
-    ],
-    [
-      1485983210,
-      435807891
-    ],
-    Caml_int64.zero,
-    [
-      772515434,
-      3820835012
-    ]
-  ],
-  [
-    [
-      1437309318,
-      1357533220
-    ],
-    [
-      1141241105,
-      541080542
-    ],
-    Caml_int64.one,
-    [
-      296068213,
-      816452678
-    ]
-  ],
-  [
-    [
-      1559319564,
-      407118687
-    ],
-    [
-      211092740,
-      4014353660
-    ],
-    [
-      0,
-      7
-    ],
-    [
-      81670377,
-      2371414139
-    ]
-  ],
-  [
-    [
-      897058469,
-      1054256000
-    ],
-    [
-      57853316,
-      661312616
-    ],
-    [
-      0,
-      15
-    ],
-    [
-      29258726,
-      4019468648
-    ]
-  ],
-  [
-    [
-      1771820319,
-      3029842884
-    ],
-    [
-      1113086871,
-      222584391
-    ],
-    Caml_int64.one,
-    [
-      658733448,
-      2807258493
-    ]
-  ],
-  [
-    [
-      1699471447,
-      2730544778
-    ],
-    [
-      1090632987,
-      3896573910
-    ],
-    Caml_int64.one,
-    [
-      608838459,
-      3128938164
-    ]
-  ],
-  [
-    [
-      1300122432,
-      837406327
-    ],
-    [
-      349961722,
-      3861260410
-    ],
-    [
-      0,
-      3
-    ],
-    [
-      250237263,
-      2138526985
-    ]
-  ],
-  [
-    [
-      1844919629,
-      681013979
-    ],
-    [
-      141654602,
-      3894038038
-    ],
-    [
-      0,
-      13
-    ],
-    [
-      3409791,
-      1598127037
-    ]
-  ],
-  [
-    [
-      876561860,
-      3227349399
-    ],
-    [
-      1635137811,
-      1118648885
-    ],
-    Caml_int64.zero,
-    [
-      876561860,
-      3227349399
-    ]
-  ],
-  [
-    [
-      1444234022,
-      1188873919
-    ],
-    [
-      1506775353,
-      2449062589
-    ],
-    Caml_int64.zero,
-    [
-      1444234022,
-      1188873919
-    ]
-  ],
-  [
-    [
-      216713133,
-      2955981804
-    ],
-    [
-      840978153,
-      478170254
-    ],
-    Caml_int64.zero,
-    [
-      216713133,
-      2955981804
-    ]
-  ],
-  [
-    [
-      311131250,
-      2343706662
-    ],
-    [
-      1432032601,
-      1397060596
-    ],
-    Caml_int64.zero,
-    [
-      311131250,
-      2343706662
-    ]
-  ],
-  [
-    [
-      702252958,
-      2254774319
-    ],
-    [
-      333531300,
-      1983179783
-    ],
-    [
-      0,
-      2
-    ],
-    [
-      35190357,
-      2583382049
-    ]
-  ],
-  [
-    [
-      222120797,
-      1357843095
-    ],
-    [
-      1409050141,
-      2550433032
-    ],
-    Caml_int64.zero,
-    [
-      222120797,
-      1357843095
-    ]
-  ]
-];
-
-function from(xs) {
-  return List.mapi((function (i, param) {
-                var d = param[3];
-                var c = param[2];
-                var b = param[1];
-                var a = param[0];
-                return [
-                        "small_divs " + i,
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: [
-                                      c,
-                                      d
-                                    ],
-                                    _1: [
-                                      Caml_int64.div(a, b),
-                                      Caml_int64.mod_(a, b)
-                                    ]
-                                  };
-                          })
-                      ];
-              }), $$Array.to_list(xs));
-}
-
-var to_string = [[
-    Caml_int64.zero,
-    "0"
-  ]];
-
-var int64_compare_tests = [
-  [
-    Caml_int64.one,
-    [
-      0,
-      2
-    ],
-    -1
-  ],
-  [
-    [
-      0,
-      2
-    ],
-    Caml_int64.one,
-    1
-  ],
-  [
-    [
-      0,
-      2
-    ],
-    Caml_int64.one,
-    1
-  ]
-];
-
-function from_compare(xs) {
-  return List.mapi((function (i, param) {
-                var c = param[2];
-                var b = param[1];
-                var a = param[0];
-                return [
-                        "int64_compare " + i,
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: c,
-                                    _1: Caml_int64.compare(a, b)
-                                  };
-                          })
-                      ];
-              }), $$Array.to_list(xs));
-}
-
-function from_to_string(xs) {
-  return List.mapi((function (i, param) {
-                var str_a = param[1];
-                var a = param[0];
-                return [
-                        "to_string " + i,
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: str_a,
-                                    _1: Caml_int64.to_string(a)
-                                  };
-                          })
-                      ];
-              }), $$Array.to_list(xs));
-}
-
-Mt.from_pair_suites("Int64_mul_div_test", Pervasives.$at(from_pairs("random", pairs), Pervasives.$at(from_pairs("small", small_pairs), Pervasives.$at(List.mapi((function (i, param) {
-                        var f = param[1];
-                        var i64 = param[0];
-                        return [
-                                "to_float_" + i,
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: Caml_int64.to_float(i64),
-                                            _1: f
-                                          };
-                                  })
-                              ];
-                      }), $$Array.to_list(to_floats)), Pervasives.$at(List.mapi((function (i, param) {
-                            var i64 = param[1];
-                            var f = param[0];
-                            return [
-                                    "of_float_" + i,
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: Caml_int64.of_float(f),
-                                                _1: i64
-                                              };
-                                      })
-                                  ];
-                          }), $$Array.to_list(of_float_pairs)), Pervasives.$at({
-                          hd: [
-                            "compare_check_complete",
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: $$Array.map((function (param) {
-                                                return true;
-                                              }), check_complete_compare),
-                                        _1: check_complete_compare
-                                      };
-                              })
-                          ],
-                          tl: /* [] */0
-                        }, Pervasives.$at(from(simple_divs), Pervasives.$at(from_compare(int64_compare_tests), {
-                                  hd: [
-                                    "div_rem_0",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: Caml_int64.zero,
-                                                _1: Caml_int64.zero
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "div_rem_1",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: Caml_int64.neg_one,
-                                                  _1: Caml_int64.neg_one
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "File \"int64_mul_div_test.res\", line 263, characters 19-26",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: Caml_int64.to_float(Int64.max_int),
-                                                    _1: 9.22337203685477581e+18
-                                                  };
-                                          })
-                                      ],
-                                      tl: /* [] */0
-                                    }
-                                  }
-                                }))))))));
-
-exports.commutative_mul = commutative_mul;
-exports.pairs = pairs;
-exports.from_pairs = from_pairs;
-exports.small_pairs = small_pairs;
-exports.to_floats = to_floats;
-exports.check_complete_compare = check_complete_compare;
-exports.of_float_pairs = of_float_pairs;
-exports.simple_divs = simple_divs;
-exports.from = from;
-exports.to_string = to_string;
-exports.int64_compare_tests = int64_compare_tests;
-exports.from_compare = from_compare;
-exports.from_to_string = from_to_string;
-/*  Not a pure module */
diff --git a/jscomp/test/int64_mul_div_test.res b/jscomp/test/int64_mul_div_test.res
deleted file mode 100644
index 856cdd8..0000000
--- a/jscomp/test/int64_mul_div_test.res
+++ /dev/null
@@ -1,289 +0,0 @@
-open Int64
-
-let commutative_mul = (result, a, b) => Mt.Eq((result, result), (mul(a, b), mul(b, a)))
-
-let pairs = [
-  (-6369178941122375200L, 7864955043652308640L, 710079015173034099L),
-  (8962060020293135336L, 7543586149775142988L, 4850684189325050974L),
-  (-9161542197404147928L, 899158197241158908L, 8795600396453302198L),
-  (3358398961571564092L, 5342919210817653169L, 4145996795967701244L),
-  (-6555402073887813520L, 3465340031200066536L, 4181191505921956774L),
-  (-4523677527555012358L, 1276543650539578238L, 5812826113188151491L),
-  (-6934468553649362855L, 7785647313097762325L, 7241346950344076853L),
-  (715203802919571152L, 2516535866514393275L, 5125117419875854192L),
-  (-6686627189857547459L, 2421045490088152053L, 6111768411715304745L),
-  (9005046258567688786L, 6069658940756524865L, 2129423077748838354L),
-  (4936631060534413696L, 2388637287307694757L, 7350192635126770560L),
-  (3901525161500002519L, 4523532416698366291L, 9214381841065479661L),
-  (4134697148227395296L, 6566552400989074310L, 8132227803860192208L),
-  (-2592314958001559136L, 7915289622294445728L, 7964218148684228345L),
-  (7848874678168215648L, 4580311104447448800L, 4313239158344332693L),
-  (-7811641560663661522L, 1060947535036669291L, 6161652641757280778L),
-  (7365507927037276951L, 4600709048432326175L, 3916052862740247561L),
-  (1571446117134724284L, 5218915363866200678L, 4960910992197841962L),
-  (-6830326887577503896L, 5309972098777932940L, 3743051712101331294L),
-  (-5736531007213089380L, 659238999324606124L, 2014771822435221301L),
-]
-
-let from_pairs = (prefix, pairs) =>
-  \"@@"(
-    Array.to_list,
-    Array.mapi(
-      (i, (result, a, b)) => (
-        "" ++ prefix ++ "_" ++ __unsafe_cast(i),
-        _ => commutative_mul(result, a, b),
-      ),
-      pairs,
-    ),
-  )
-
-let small_pairs = [
-  (121L, 11L, 11L),
-  (126736L, 356L, 356L),
-  (137176406L, 12346L, 11111L),
-  (0xffff_ffff_ff_00000L, 0xffff_ffff_ffL, 0x1_00000L),
-  (-0xffff_ffff_ff_00000L, -0xffff_ffff_ffL, 0x1_00000L),
-  (0xd9e118894c02f614L, 0x4_8100_ef7b_b9df_cc5L, 0x6d2c_68b6_0e75_2704L),
-]
-
-let to_floats = [
-  (1L, 1.),
-  (2L, 2.),
-  (4L, 4.),
-  (8L, 8.),
-  (16L, 16.),
-  (32L, 32.),
-  (64L, 64.),
-  (128L, 128.),
-  (256L, 256.),
-  (512L, 512.),
-  (1024L, 1024.),
-  (2048L, 2048.),
-  (4096L, 4096.),
-  (8192L, 8192.),
-  (16384L, 16384.),
-  (32768L, 32768.),
-  (65536L, 65536.),
-  (131072L, 131072.),
-  (262144L, 262144.),
-  (524288L, 524288.),
-  (1048576L, 1048576.),
-  (2097152L, 2097152.),
-  (4194304L, 4194304.),
-  (8388608L, 8388608.),
-  (16777216L, 16777216.),
-  (33554432L, 33554432.),
-  (67108864L, 67108864.),
-  (134217728L, 134217728.),
-  (268435456L, 268435456.),
-  (536870912L, 536870912.),
-  (1073741824L, 1073741824.),
-  (2147483648L, 2147483648.),
-  (4294967296L, 4294967296.),
-  (8589934592L, 8589934592.),
-  (17179869184L, 17179869184.),
-  (34359738368L, 34359738368.),
-  (68719476736L, 68719476736.),
-  (137438953472L, 137438953472.),
-  (274877906944L, 274877906944.),
-  (549755813888L, 549755813888.),
-  (1099511627776L, 1099511627776.),
-  (2199023255552L, 2199023255552.),
-  (4398046511104L, 4398046511104.),
-  (8796093022208L, 8796093022208.),
-  (17592186044416L, 17592186044416.),
-  (35184372088832L, 35184372088832.),
-  (70368744177664L, 70368744177664.),
-  (140737488355328L, 140737488355328.),
-  (281474976710656L, 281474976710656.),
-  (562949953421312L, 562949953421312.),
-  (1125899906842624L, 1125899906842624.),
-  (2251799813685248L, 2251799813685248.),
-  (4503599627370496L, 4503599627370496.),
-  (9007199254740992L, 9007199254740992.),
-  (18014398509481984L, 18014398509481984.),
-  (36028797018963968L, 36028797018963968.),
-  (72057594037927936L, 72057594037927936.),
-  (144115188075855872L, 144115188075855872.),
-  (288230376151711744L, 288230376151711744.),
-  (576460752303423488L, 576460752303423488.),
-  (1152921504606846976L, 1.15292150460684698e+18),
-  (2305843009213693952L, 2.30584300921369395e+18),
-  (4611686018427387904L, 4.6116860184273879e+18),
-  (-9223372036854775808L, -9.22337203685477581e+18),
-]
-
-let check_complete_compare = [
-  3L >= 2L,
-  3L >= 3L,
-  3L == 3L,
-  2L == 2L,
-  2L < 3L,
-  3L > 2L,
-  2L <= 3L,
-  3L <= 3L,
-]
-/* let f () =  Random.float (2. ** 53. -. 1.);; */
-/* Array.init 40 (fun i -> let v = if i mod 2 = 0 then f () else -. f() in  v, of_float v);; */
-let of_float_pairs = [
-  (6853066956871844., 6853066956871844L),
-  (-8507688874782117., -8507688874782117L),
-  (4083117349607451., 4083117349607451L),
-  (-4860723193745655., -4860723193745655L),
-  (7820020192255542., 7820020192255542L),
-  (-4908619721514532., -4908619721514532L),
-  (5.67685864687671e+15, 5676858646876710L),
-  (-703696191048023., -703696191048023L),
-  (1123586534990153.88, 1123586534990153L),
-  (-4.29886533981922e+15, -4298865339819220L),
-  (2.43885138012066e+15, 2438851380120660L),
-  (-8011538689499494., -8011538689499494L),
-  (2710072285421155., 2710072285421155L),
-  (-2541457347159789.5, -2541457347159789L),
-  (5012932793576708., 5012932793576708L),
-  (-943066847413899.125, -943066847413899L),
-  (5440257518642004., 5440257518642004L),
-  (-7750676773453898., -7750676773453898L),
-  (8911999221747713., 8911999221747713L),
-  (-1443906702582204.25, -1443906702582204L),
-  (659345820712164.875, 659345820712164L),
-  (-3284023713149006.5, -3284023713149006L),
-  (5062818438579988., 5062818438579988L),
-  (-8904450004162331., -8904450004162331L),
-  (848261089308786., 848261089308786L),
-  (-6376579516657391., -6376579516657391L),
-  (1337907592605664.25, 1337907592605664L),
-  (-8.54733738833896e+15, -8547337388338960L),
-  (2345417644172927., 2345417644172927L),
-  (-2587460670129294.5, -2587460670129294L),
-  (4580431718597436., 4580431718597436L),
-  (-1460576044874256.25, -1460576044874256L),
-  (3403657978343579.5, 3403657978343579L),
-  (-7.89068917321888e+15, -7890689173218880L),
-  (1683098350604788.5, 1683098350604788L),
-  (-3966538891560174.5, -3966538891560174L),
-  (6726025288963652., 6726025288963652L),
-  (-4790410747298403., -4790410747298403L),
-  (1985858071337706.25, 1985858071337706L),
-  (-5281733497873409., -5281733497873409L),
-]
-
-let simple_divs = [
-  (6L, 3L, 2L, 0L),
-  (120L, 11L, 10L, 10L),
-  (-9223372036854775808L, 2L, -4611686018427387904L, 0L),
-  /* (-9223372036854775808L, 1L, -9223372036854775808L, 0L); */
-  /* (-9223372036854775808L, -1L, -9223372036854775808L, 0L); */
-
-  (4778496500726974625L, 8647273786691508695L, 0L, 4778496500726974625L),
-  (4224455101328713966L, 4413625152776134247L, 0L, 4224455101328713966L),
-  (3039065016695402626L, 1966341652797525449L, 1L, 1072723363897877177L),
-  (15875542998768846L, 1302504952487197716L, 0L, 15875542998768846L),
-  (8585447339548266970L, 8057707135347178550L, 1L, 527740204201088420L),
-  (4824597144699038618L, 4627874521623171050L, 1L, 196722623075867568L),
-  (3317928528506081476L, 6382249289790908051L, 0L, 3317928528506081476L),
-  (6173196516403597348L, 4901593223366982622L, 1L, 1271603293036614726L),
-  (6697226531800097631L, 906636418737384700L, 7L, 350771600638404731L),
-  (3852836788009085824L, 248478100846466152L, 15L, 125665275312093544L),
-  (7609910327523130308L, 4780671708774555207L, 1L, 2829238618748575101L),
-  (7299174288081342090L, 4684233015000367062L, 1L, 2614941273080975028L),
-  (5583983327073390199L, 1503074154703104122L, 3L, 1074760862964077833L),
-  (7923869470984467163L, 608401886811934230L, 13L, 14644942429322173L),
-  (3764804524848279959L, 7022863423816677941L, 0L, 3764804524848279959L),
-  (6202937893449418431L, 6471550866002918077L, 0L, 6202937893449418431L),
-  (930775821804680172L, 3611973664263654542L, 0L, 930775821804680172L),
-  (1336298545857306662L, 6150533189497877492L, 0L, 1336298545857306662L),
-  (3016153490384035887L, 1432506027675544583L, 2L, 151141435032946721L),
-  (954001560234298007L, 6051824276569621768L, 0L, 954001560234298007L),
-]
-/* let f a b = a,b, div a b, rem a b;; */
-
-let from = xs =>
-  xs
-  |> Array.to_list
-  |> List.mapi((i, (a, b, c, d)) => (
-    "small_divs " ++ __unsafe_cast(i),
-    _ => Mt.Eq((c, d), (Int64.div(a, b), Int64.rem(a, b))),
-  ))
-let to_string = [(0L, "0")]
-
-let int64_compare_tests = [(1L, 2L, -1), (2L, 1L, 1), (2L, 1L, 1)]
-
-let from_compare = xs =>
-  xs
-  |> Array.to_list
-  |> List.mapi((i, (a, b, c)) => (
-    "int64_compare " ++ __unsafe_cast(i),
-    _ => Mt.Eq(c, Int64.compare(a, b)),
-  ))
-
-let from_to_string = xs =>
-  xs
-  |> Array.to_list
-  |> List.mapi((i, (a, str_a)) => (
-    "to_string " ++ __unsafe_cast(i),
-    _ => Mt.Eq(str_a, Int64.to_string(a)),
-  ))
-
-\"@@"(
-  Mt.from_pair_suites(__MODULE__),
-  \"@"(
-    from_pairs("random", pairs),
-    \"@"(
-      from_pairs("small", small_pairs),
-      \"@"(
-        to_floats
-        |> Array.to_list
-        |> List.mapi((i, (i64, f)) => (
-          "to_float_" ++ __unsafe_cast(i),
-          _ => Mt.Eq(Int64.to_float(i64), f),
-        )),
-        \"@"(
-          of_float_pairs
-          |> Array.to_list
-          |> List.mapi((i, (f, i64)) => (
-            "of_float_" ++ __unsafe_cast(i),
-            _ => Mt.Eq(Int64.of_float(f), i64),
-          )),
-          \"@"(
-            list{
-              (
-                "compare_check_complete",
-                _ => Mt.Eq(Array.map(_ => true, check_complete_compare), check_complete_compare),
-              ),
-            },
-            \"@"(
-              from(simple_divs),
-              \"@"(
-                from_compare(int64_compare_tests),
-                list{
-                  ("div_rem_0", _ => Eq(Int64.div(-1L, 16L), 0L)),
-                  ("div_rem_1", _ => Eq(Int64.rem(-1L, 16L), -1L)),
-                  /* __LOC__, (fun _ -> Eq(Int64.of_float 2e65, -9223372036854775808L)) */
-                  (__LOC__, _ => Eq(Int64.to_float(Int64.max_int), 9.22337203685477581e+18)),
-                },
-              ),
-            ),
-          ),
-        ),
-      ),
-    ),
-  ),
-)
-/*
-  Undefined behaviorJ
-
-  (* Note in ocaml [Int64.of_float] is weird
-   {[
-     Int64.of_float 2.e65;;
-     - : int64 = -9223372036854775808L
-   ]}
-
-
-   {[
-     Int64.of_float (Int64.to_float (Int64.sub Int64.max_int 1L));;
-     - : int64 = -9223372036854775808L
-   ]}
-   both overflow
-*)
-*/
diff --git a/jscomp/test/int64_string_bench.js b/jscomp/test/int64_string_bench.js
deleted file mode 100644
index 614bdc7..0000000
--- a/jscomp/test/int64_string_bench.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Int64 = require("../../lib/js/int64.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-
-console.time("Int64.to_string");
-
-var u = Caml_int64.sub(Int64.max_int, [
-      0,
-      200000
-    ]);
-
-for(var i = 0; i <= 100000; ++i){
-  Caml_int64.to_string(u);
-}
-
-console.timeEnd("Int64.to_string");
-
-console.log(Caml_int64.to_string(u));
-
-console.time("Int64.to_string");
-
-var u$1 = [
-  0,
-  30000000
-];
-
-for(var i$1 = 0; i$1 <= 100000; ++i$1){
-  Caml_int64.to_string(u$1);
-}
-
-console.timeEnd("Int64.to_string");
-
-console.log(Caml_int64.to_string(u$1));
-
-console.time("Int64.to_string");
-
-var u$2 = Caml_int64.add(Int64.min_int, [
-      0,
-      100
-    ]);
-
-for(var i$2 = 0; i$2 <= 100000; ++i$2){
-  Caml_int64.to_string(u$2);
-}
-
-console.timeEnd("Int64.to_string");
-
-console.log(Caml_int64.to_string(u$2));
-
-/*  Not a pure module */
diff --git a/jscomp/test/int64_string_bench.res b/jscomp/test/int64_string_bench.res
deleted file mode 100644
index 7d16521..0000000
--- a/jscomp/test/int64_string_bench.res
+++ /dev/null
@@ -1,35 +0,0 @@
-let () = {
-  Js.Console.timeStart("Int64.to_string")
-  let u = {
-    open Int64
-    max_int->sub(200_000L)
-  }
-  /* let u = 3L in */
-  for i in 0 to 1_00_000 {
-    Int64.to_string(u) |> ignore
-  }
-  Js.Console.timeEnd("Int64.to_string")
-  Js.log(Int64.to_string(u))
-}
-let () = {
-  Js.Console.timeStart("Int64.to_string")
-  let u = 30_000_000L
-  for i in 0 to 1_00_000 {
-    Int64.to_string(u) |> ignore
-  }
-  Js.Console.timeEnd("Int64.to_string")
-  Js.log(Int64.to_string(u))
-}
-
-let () = {
-  Js.Console.timeStart("Int64.to_string")
-  let u = {
-    open Int64
-    min_int->add(100L)
-  }
-  for i in 0 to 1_00_000 {
-    Int64.to_string(u) |> ignore
-  }
-  Js.Console.timeEnd("Int64.to_string")
-  Js.log(Int64.to_string(u))
-}
diff --git a/jscomp/test/int64_string_test.js b/jscomp/test/int64_string_test.js
deleted file mode 100644
index af2ed53..0000000
--- a/jscomp/test/int64_string_test.js
+++ /dev/null
@@ -1,1354 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Int64 = require("../../lib/js/int64.js");
-var Belt_List = require("../../lib/js/belt_List.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var v = Caml_int64.to_string(Int64.max_int);
-
-eq("File \"int64_string_test.res\", line 6, characters 3-10", v, "9223372036854775807");
-
-function f(a, b) {
-  eq("File \"int64_string_test.res\", line 7, characters 21-28", Caml_int64.to_string(a), b);
-}
-
-var hh = Caml_int64.add(Int64.min_int, [
-      0,
-      100
-    ]);
-
-eq("File \"int64_string_test.res\", line 14, characters 3-10", hh, [
-      -2147483648,
-      100
-    ]);
-
-f([
-      -1,
-      4294967263
-    ], "-33");
-
-f([
-      0,
-      33
-    ], "33");
-
-f(Int64.min_int, "-9223372036854775808");
-
-f(hh, "-9223372036854775708");
-
-f([
-      232830,
-      2764472320
-    ], "1000000000000000");
-
-for(var i = 0; i <= 8; ++i){
-  eq("File \"int64_string_test.res\", line 22, characters 4-11", Caml_int64.to_string(Caml_int64.add(Int64.min_int, Caml_int64.of_int32(i))), "-922337203685477580" + String(8 - i | 0));
-}
-
-for(var i$1 = 0; i$1 <= 8; ++i$1){
-  eq("File \"int64_string_test.res\", line 32, characters 4-11", Caml_int64.to_string(Caml_int64.add(Int64.min_int, Caml_int64.of_int32(100 + i$1 | 0))), "-922337203685477570" + String(8 - i$1 | 0));
-}
-
-for(var i$2 = 0; i$2 <= 8; ++i$2){
-  eq("File \"int64_string_test.res\", line 42, characters 4-11", Caml_int64.to_string(Caml_int64.add(Int64.min_int, Caml_int64.of_int32(1000000 + i$2 | 0))), "-922337203685377580" + String(8 - i$2 | 0));
-}
-
-var u = [
-  2097151,
-  4294957295
-];
-
-for(var i$3 = 0; i$3 <= 6; ++i$3){
-  eq("File \"int64_string_test.res\", line 56, characters 4-11", Caml_int64.to_string(Caml_int64.add(u, Caml_int64.of_int32(Math.imul(i$3, 10000)))), "90071992547" + (String(3 + i$3 | 0) + "0991"));
-}
-
-var v$1 = [
-  -2097153,
-  4294917297
-];
-
-for(var i$4 = 0; i$4 <= 9; ++i$4){
-  eq("File \"int64_string_test.res\", line 67, characters 4-11", Caml_int64.to_string(Caml_int64.add(v$1, Caml_int64.of_int32(Math.imul(i$4, 10000)))), "-90071992547" + (String(9 - i$4 | 0) + "0991"));
-}
-
-eq("File \"int64_string_test.res\", line 73, characters 3-10", Caml_int64.to_string([
-          2097151,
-          4294967295
-        ]), "9007199254740991");
-
-eq("File \"int64_string_test.res\", line 74, characters 3-10", Caml_int64.to_string([
-          -2097152,
-          1
-        ]), "-9007199254740991");
-
-eq("File \"int64_string_test.res\", line 75, characters 3-10", Caml_int64.to_string([
-          -1,
-          4294967063
-        ]), "-233");
-
-eq("File \"int64_string_test.res\", line 77, characters 2-9", Caml_int64.to_string(Caml_int64.max_int), "9223372036854775807");
-
-var random_data = {
-  hd: {
-    hd: [
-      [
-        2147226018,
-        2371765545
-      ],
-      "9222265526802072873"
-    ],
-    tl: /* [] */0
-  },
-  tl: {
-    hd: {
-      hd: [
-        [
-          -2147226019,
-          1923201751
-        ],
-        "-9222265526802072873"
-      ],
-      tl: /* [] */0
-    },
-    tl: {
-      hd: {
-        hd: [
-          [
-            1923105645,
-            2649378864
-          ],
-          "8259675854677364784"
-        ],
-        tl: /* [] */0
-      },
-      tl: {
-        hd: {
-          hd: [
-            [
-              -1923105646,
-              1645588432
-            ],
-            "-8259675854677364784"
-          ],
-          tl: /* [] */0
-        },
-        tl: {
-          hd: {
-            hd: [
-              [
-                2057149268,
-                2297424218
-              ],
-              "8835388831347763546"
-            ],
-            tl: /* [] */0
-          },
-          tl: {
-            hd: {
-              hd: [
-                [
-                  -2057149269,
-                  1997543078
-                ],
-                "-8835388831347763546"
-              ],
-              tl: /* [] */0
-            },
-            tl: {
-              hd: {
-                hd: [
-                  [
-                    1963412104,
-                    2782957513
-                  ],
-                  "8432790778033508297"
-                ],
-                tl: /* [] */0
-              },
-              tl: {
-                hd: {
-                  hd: [
-                    [
-                      -1963412105,
-                      1512009783
-                    ],
-                    "-8432790778033508297"
-                  ],
-                  tl: /* [] */0
-                },
-                tl: {
-                  hd: {
-                    hd: [
-                      [
-                        2049795191,
-                        4094053847
-                      ],
-                      "8803803312937127383"
-                    ],
-                    tl: /* [] */0
-                  },
-                  tl: {
-                    hd: {
-                      hd: [
-                        [
-                          -2049795192,
-                          200913449
-                        ],
-                        "-8803803312937127383"
-                      ],
-                      tl: /* [] */0
-                    },
-                    tl: {
-                      hd: {
-                        hd: [
-                          [
-                            1991682107,
-                            3848914476
-                          ],
-                          "8554209517442287148"
-                        ],
-                        tl: /* [] */0
-                      },
-                      tl: {
-                        hd: {
-                          hd: [
-                            [
-                              -1991682108,
-                              446052820
-                            ],
-                            "-8554209517442287148"
-                          ],
-                          tl: /* [] */0
-                        },
-                        tl: {
-                          hd: {
-                            hd: [
-                              [
-                                2055313051,
-                                3635531172
-                              ],
-                              "8827502340722511268"
-                            ],
-                            tl: /* [] */0
-                          },
-                          tl: {
-                            hd: {
-                              hd: [
-                                [
-                                  -2055313052,
-                                  659436124
-                                ],
-                                "-8827502340722511268"
-                              ],
-                              tl: /* [] */0
-                            },
-                            tl: {
-                              hd: {
-                                hd: [
-                                  [
-                                    2086148291,
-                                    3665585993
-                                  ],
-                                  "8959938688116877129"
-                                ],
-                                tl: /* [] */0
-                              },
-                              tl: {
-                                hd: {
-                                  hd: [
-                                    [
-                                      -2086148292,
-                                      629381303
-                                    ],
-                                    "-8959938688116877129"
-                                  ],
-                                  tl: /* [] */0
-                                },
-                                tl: {
-                                  hd: {
-                                    hd: [
-                                      [
-                                        1950036541,
-                                        3885629083
-                                      ],
-                                      "8375343173485592219"
-                                    ],
-                                    tl: /* [] */0
-                                  },
-                                  tl: {
-                                    hd: {
-                                      hd: [
-                                        [
-                                          -1950036542,
-                                          409338213
-                                        ],
-                                        "-8375343173485592219"
-                                      ],
-                                      tl: /* [] */0
-                                    },
-                                    tl: {
-                                      hd: {
-                                        hd: [
-                                          [
-                                            1920197492,
-                                            3902751793
-                                          ],
-                                          "8247185433903973425"
-                                        ],
-                                        tl: /* [] */0
-                                      },
-                                      tl: {
-                                        hd: {
-                                          hd: [
-                                            [
-                                              -1920197493,
-                                              392215503
-                                            ],
-                                            "-8247185433903973425"
-                                          ],
-                                          tl: /* [] */0
-                                        },
-                                        tl: {
-                                          hd: {
-                                            hd: [
-                                              [
-                                                2066884723,
-                                                2562066076
-                                              ],
-                                              "8877202292449085084"
-                                            ],
-                                            tl: /* [] */0
-                                          },
-                                          tl: {
-                                            hd: {
-                                              hd: [
-                                                [
-                                                  -2066884724,
-                                                  1732901220
-                                                ],
-                                                "-8877202292449085084"
-                                              ],
-                                              tl: /* [] */0
-                                            },
-                                            tl: {
-                                              hd: {
-                                                hd: [
-                                                  [
-                                                    2028895352,
-                                                    86646639
-                                                  ],
-                                                  "8714039183933054831"
-                                                ],
-                                                tl: /* [] */0
-                                              },
-                                              tl: {
-                                                hd: {
-                                                  hd: [
-                                                    [
-                                                      -2028895353,
-                                                      4208320657
-                                                    ],
-                                                    "-8714039183933054831"
-                                                  ],
-                                                  tl: /* [] */0
-                                                },
-                                                tl: {
-                                                  hd: {
-                                                    hd: [
-                                                      [
-                                                        2068232680,
-                                                        1417923479
-                                                      ],
-                                                      "8882991722536356759"
-                                                    ],
-                                                    tl: /* [] */0
-                                                  },
-                                                  tl: {
-                                                    hd: {
-                                                      hd: [
-                                                        [
-                                                          -2068232681,
-                                                          2877043817
-                                                        ],
-                                                        "-8882991722536356759"
-                                                      ],
-                                                      tl: /* [] */0
-                                                    },
-                                                    tl: {
-                                                      hd: {
-                                                        hd: [
-                                                          [
-                                                            1940466044,
-                                                            2146167188
-                                                          ],
-                                                          "8334238200124664212"
-                                                        ],
-                                                        tl: /* [] */0
-                                                      },
-                                                      tl: {
-                                                        hd: {
-                                                          hd: [
-                                                            [
-                                                              -1940466045,
-                                                              2148800108
-                                                            ],
-                                                            "-8334238200124664212"
-                                                          ],
-                                                          tl: /* [] */0
-                                                        },
-                                                        tl: {
-                                                          hd: {
-                                                            hd: [
-                                                              [
-                                                                2139021480,
-                                                                2844915322
-                                                              ],
-                                                              "9187027304886433402"
-                                                            ],
-                                                            tl: /* [] */0
-                                                          },
-                                                          tl: {
-                                                            hd: {
-                                                              hd: [
-                                                                [
-                                                                  -2139021481,
-                                                                  1450051974
-                                                                ],
-                                                                "-9187027304886433402"
-                                                              ],
-                                                              tl: /* [] */0
-                                                            },
-                                                            tl: {
-                                                              hd: {
-                                                                hd: [
-                                                                  [
-                                                                    2126455706,
-                                                                    3857675610
-                                                                  ],
-                                                                  "9133057717520266586"
-                                                                ],
-                                                                tl: /* [] */0
-                                                              },
-                                                              tl: {
-                                                                hd: {
-                                                                  hd: [
-                                                                    [
-                                                                      -2126455707,
-                                                                      437291686
-                                                                    ],
-                                                                    "-9133057717520266586"
-                                                                  ],
-                                                                  tl: /* [] */0
-                                                                },
-                                                                tl: {
-                                                                  hd: {
-                                                                    hd: [
-                                                                      [
-                                                                        2134212194,
-                                                                        608162909
-                                                                      ],
-                                                                      "9166371576562570333"
-                                                                    ],
-                                                                    tl: /* [] */0
-                                                                  },
-                                                                  tl: {
-                                                                    hd: {
-                                                                      hd: [
-                                                                        [
-                                                                          -2134212195,
-                                                                          3686804387
-                                                                        ],
-                                                                        "-9166371576562570333"
-                                                                      ],
-                                                                      tl: /* [] */0
-                                                                    },
-                                                                    tl: {
-                                                                      hd: {
-                                                                        hd: [
-                                                                          [
-                                                                            2014956425,
-                                                                            1403654222
-                                                                          ],
-                                                                          "8654171949643731022"
-                                                                        ],
-                                                                        tl: /* [] */0
-                                                                      },
-                                                                      tl: {
-                                                                        hd: {
-                                                                          hd: [
-                                                                            [
-                                                                              -2014956426,
-                                                                              2891313074
-                                                                            ],
-                                                                            "-8654171949643731022"
-                                                                          ],
-                                                                          tl: /* [] */0
-                                                                        },
-                                                                        tl: {
-                                                                          hd: {
-                                                                            hd: [
-                                                                              [
-                                                                                2103588109,
-                                                                                1237787861
-                                                                              ],
-                                                                              "9034842133647271125"
-                                                                            ],
-                                                                            tl: /* [] */0
-                                                                          },
-                                                                          tl: {
-                                                                            hd: {
-                                                                              hd: [
-                                                                                [
-                                                                                  -2103588110,
-                                                                                  3057179435
-                                                                                ],
-                                                                                "-9034842133647271125"
-                                                                              ],
-                                                                              tl: /* [] */0
-                                                                            },
-                                                                            tl: {
-                                                                              hd: {
-                                                                                hd: [
-                                                                                  [
-                                                                                    2004341376,
-                                                                                    3161072855
-                                                                                  ],
-                                                                                  "8608580663100712151"
-                                                                                ],
-                                                                                tl: /* [] */0
-                                                                              },
-                                                                              tl: {
-                                                                                hd: {
-                                                                                  hd: [
-                                                                                    [
-                                                                                      -2004341377,
-                                                                                      1133894441
-                                                                                    ],
-                                                                                    "-8608580663100712151"
-                                                                                  ],
-                                                                                  tl: /* [] */0
-                                                                                },
-                                                                                tl: {
-                                                                                  hd: {
-                                                                                    hd: [
-                                                                                      [
-                                                                                        2053733102,
-                                                                                        4142388780
-                                                                                      ],
-                                                                                      "8820716511945020972"
-                                                                                    ],
-                                                                                    tl: /* [] */0
-                                                                                  },
-                                                                                  tl: {
-                                                                                    hd: {
-                                                                                      hd: [
-                                                                                        [
-                                                                                          -2053733103,
-                                                                                          152578516
-                                                                                        ],
-                                                                                        "-8820716511945020972"
-                                                                                      ],
-                                                                                      tl: /* [] */0
-                                                                                    },
-                                                                                    tl: {
-                                                                                      hd: {
-                                                                                        hd: [
-                                                                                          [
-                                                                                            2131986077,
-                                                                                            1979926511
-                                                                                          ],
-                                                                                          "9156810478222264303"
-                                                                                        ],
-                                                                                        tl: /* [] */0
-                                                                                      },
-                                                                                      tl: {
-                                                                                        hd: {
-                                                                                          hd: [
-                                                                                            [
-                                                                                              -2131986078,
-                                                                                              2315040785
-                                                                                            ],
-                                                                                            "-9156810478222264303"
-                                                                                          ],
-                                                                                          tl: /* [] */0
-                                                                                        },
-                                                                                        tl: {
-                                                                                          hd: {
-                                                                                            hd: [
-                                                                                              [
-                                                                                                2038531675,
-                                                                                                609814957
-                                                                                              ],
-                                                                                              "8755426876594915757"
-                                                                                            ],
-                                                                                            tl: /* [] */0
-                                                                                          },
-                                                                                          tl: {
-                                                                                            hd: {
-                                                                                              hd: [
-                                                                                                [
-                                                                                                  -2038531676,
-                                                                                                  3685152339
-                                                                                                ],
-                                                                                                "-8755426876594915757"
-                                                                                              ],
-                                                                                              tl: /* [] */0
-                                                                                            },
-                                                                                            tl: {
-                                                                                              hd: {
-                                                                                                hd: [
-                                                                                                  [
-                                                                                                    2043028138,
-                                                                                                    1830468673
-                                                                                                  ],
-                                                                                                  "8774739039348243521"
-                                                                                                ],
-                                                                                                tl: /* [] */0
-                                                                                              },
-                                                                                              tl: {
-                                                                                                hd: {
-                                                                                                  hd: [
-                                                                                                    [
-                                                                                                      -2043028139,
-                                                                                                      2464498623
-                                                                                                    ],
-                                                                                                    "-8774739039348243521"
-                                                                                                  ],
-                                                                                                  tl: /* [] */0
-                                                                                                },
-                                                                                                tl: {
-                                                                                                  hd: {
-                                                                                                    hd: [
-                                                                                                      [
-                                                                                                        2113110666,
-                                                                                                        2304115509
-                                                                                                      ],
-                                                                                                      "9075741205602894645"
-                                                                                                    ],
-                                                                                                    tl: /* [] */0
-                                                                                                  },
-                                                                                                  tl: {
-                                                                                                    hd: {
-                                                                                                      hd: [
-                                                                                                        [
-                                                                                                          -2113110667,
-                                                                                                          1990851787
-                                                                                                        ],
-                                                                                                        "-9075741205602894645"
-                                                                                                      ],
-                                                                                                      tl: /* [] */0
-                                                                                                    },
-                                                                                                    tl: {
-                                                                                                      hd: {
-                                                                                                        hd: [
-                                                                                                          [
-                                                                                                            2045703976,
-                                                                                                            62815435
-                                                                                                          ],
-                                                                                                          "8786231674279984331"
-                                                                                                        ],
-                                                                                                        tl: /* [] */0
-                                                                                                      },
-                                                                                                      tl: {
-                                                                                                        hd: {
-                                                                                                          hd: [
-                                                                                                            [
-                                                                                                              -2045703977,
-                                                                                                              4232151861
-                                                                                                            ],
-                                                                                                            "-8786231674279984331"
-                                                                                                          ],
-                                                                                                          tl: /* [] */0
-                                                                                                        },
-                                                                                                        tl: {
-                                                                                                          hd: {
-                                                                                                            hd: [
-                                                                                                              [
-                                                                                                                2083606415,
-                                                                                                                1641712918
-                                                                                                              ],
-                                                                                                              "8949021411802516758"
-                                                                                                            ],
-                                                                                                            tl: /* [] */0
-                                                                                                          },
-                                                                                                          tl: {
-                                                                                                            hd: {
-                                                                                                              hd: [
-                                                                                                                [
-                                                                                                                  -2083606416,
-                                                                                                                  2653254378
-                                                                                                                ],
-                                                                                                                "-8949021411802516758"
-                                                                                                              ],
-                                                                                                              tl: /* [] */0
-                                                                                                            },
-                                                                                                            tl: {
-                                                                                                              hd: {
-                                                                                                                hd: [
-                                                                                                                  [
-                                                                                                                    1984816802,
-                                                                                                                    385116562
-                                                                                                                  ],
-                                                                                                                  "8524723253526423954"
-                                                                                                                ],
-                                                                                                                tl: /* [] */0
-                                                                                                              },
-                                                                                                              tl: {
-                                                                                                                hd: {
-                                                                                                                  hd: [
-                                                                                                                    [
-                                                                                                                      -1984816803,
-                                                                                                                      3909850734
-                                                                                                                    ],
-                                                                                                                    "-8524723253526423954"
-                                                                                                                  ],
-                                                                                                                  tl: /* [] */0
-                                                                                                                },
-                                                                                                                tl: {
-                                                                                                                  hd: {
-                                                                                                                    hd: [
-                                                                                                                      [
-                                                                                                                        1982155493,
-                                                                                                                        3659984780
-                                                                                                                      ],
-                                                                                                                      "8513293021681741708"
-                                                                                                                    ],
-                                                                                                                    tl: /* [] */0
-                                                                                                                  },
-                                                                                                                  tl: {
-                                                                                                                    hd: {
-                                                                                                                      hd: [
-                                                                                                                        [
-                                                                                                                          -1982155494,
-                                                                                                                          634982516
-                                                                                                                        ],
-                                                                                                                        "-8513293021681741708"
-                                                                                                                      ],
-                                                                                                                      tl: /* [] */0
-                                                                                                                    },
-                                                                                                                    tl: {
-                                                                                                                      hd: {
-                                                                                                                        hd: [
-                                                                                                                          [
-                                                                                                                            1960775672,
-                                                                                                                            1953231192
-                                                                                                                          ],
-                                                                                                                          "8421467387985654104"
-                                                                                                                        ],
-                                                                                                                        tl: /* [] */0
-                                                                                                                      },
-                                                                                                                      tl: {
-                                                                                                                        hd: {
-                                                                                                                          hd: [
-                                                                                                                            [
-                                                                                                                              -1960775673,
-                                                                                                                              2341736104
-                                                                                                                            ],
-                                                                                                                            "-8421467387985654104"
-                                                                                                                          ],
-                                                                                                                          tl: /* [] */0
-                                                                                                                        },
-                                                                                                                        tl: {
-                                                                                                                          hd: {
-                                                                                                                            hd: [
-                                                                                                                              [
-                                                                                                                                1957806908,
-                                                                                                                                2805808029
-                                                                                                                              ],
-                                                                                                                              "8408716644548688797"
-                                                                                                                            ],
-                                                                                                                            tl: /* [] */0
-                                                                                                                          },
-                                                                                                                          tl: {
-                                                                                                                            hd: {
-                                                                                                                              hd: [
-                                                                                                                                [
-                                                                                                                                  -1957806909,
-                                                                                                                                  1489159267
-                                                                                                                                ],
-                                                                                                                                "-8408716644548688797"
-                                                                                                                              ],
-                                                                                                                              tl: /* [] */0
-                                                                                                                            },
-                                                                                                                            tl: {
-                                                                                                                              hd: {
-                                                                                                                                hd: [
-                                                                                                                                  [
-                                                                                                                                    2035600198,
-                                                                                                                                    3721695148
-                                                                                                                                  ],
-                                                                                                                                  "8742836281862819756"
-                                                                                                                                ],
-                                                                                                                                tl: /* [] */0
-                                                                                                                              },
-                                                                                                                              tl: {
-                                                                                                                                hd: {
-                                                                                                                                  hd: [
-                                                                                                                                    [
-                                                                                                                                      -2035600199,
-                                                                                                                                      573272148
-                                                                                                                                    ],
-                                                                                                                                    "-8742836281862819756"
-                                                                                                                                  ],
-                                                                                                                                  tl: /* [] */0
-                                                                                                                                },
-                                                                                                                                tl: {
-                                                                                                                                  hd: {
-                                                                                                                                    hd: [
-                                                                                                                                      [
-                                                                                                                                        1979020711,
-                                                                                                                                        2587734081
-                                                                                                                                      ],
-                                                                                                                                      "8499829234439401537"
-                                                                                                                                    ],
-                                                                                                                                    tl: /* [] */0
-                                                                                                                                  },
-                                                                                                                                  tl: {
-                                                                                                                                    hd: {
-                                                                                                                                      hd: [
-                                                                                                                                        [
-                                                                                                                                          -1979020712,
-                                                                                                                                          1707233215
-                                                                                                                                        ],
-                                                                                                                                        "-8499829234439401537"
-                                                                                                                                      ],
-                                                                                                                                      tl: /* [] */0
-                                                                                                                                    },
-                                                                                                                                    tl: {
-                                                                                                                                      hd: {
-                                                                                                                                        hd: [
-                                                                                                                                          [
-                                                                                                                                            1938132066,
-                                                                                                                                            814703363
-                                                                                                                                          ],
-                                                                                                                                          "8324213839613616899"
-                                                                                                                                        ],
-                                                                                                                                        tl: /* [] */0
-                                                                                                                                      },
-                                                                                                                                      tl: {
-                                                                                                                                        hd: {
-                                                                                                                                          hd: [
-                                                                                                                                            [
-                                                                                                                                              -1938132067,
-                                                                                                                                              3480263933
-                                                                                                                                            ],
-                                                                                                                                            "-8324213839613616899"
-                                                                                                                                          ],
-                                                                                                                                          tl: /* [] */0
-                                                                                                                                        },
-                                                                                                                                        tl: {
-                                                                                                                                          hd: {
-                                                                                                                                            hd: [
-                                                                                                                                              [
-                                                                                                                                                2121879728,
-                                                                                                                                                100663039
-                                                                                                                                              ],
-                                                                                                                                              "9113404037906038527"
-                                                                                                                                            ],
-                                                                                                                                            tl: /* [] */0
-                                                                                                                                          },
-                                                                                                                                          tl: {
-                                                                                                                                            hd: {
-                                                                                                                                              hd: [
-                                                                                                                                                [
-                                                                                                                                                  -2121879729,
-                                                                                                                                                  4194304257
-                                                                                                                                                ],
-                                                                                                                                                "-9113404037906038527"
-                                                                                                                                              ],
-                                                                                                                                              tl: /* [] */0
-                                                                                                                                            },
-                                                                                                                                            tl: {
-                                                                                                                                              hd: {
-                                                                                                                                                hd: [
-                                                                                                                                                  [
-                                                                                                                                                    2078127307,
-                                                                                                                                                    1821275721
-                                                                                                                                                  ],
-                                                                                                                                                  "8925488822310827593"
-                                                                                                                                                ],
-                                                                                                                                                tl: /* [] */0
-                                                                                                                                              },
-                                                                                                                                              tl: {
-                                                                                                                                                hd: {
-                                                                                                                                                  hd: [
-                                                                                                                                                    [
-                                                                                                                                                      -2078127308,
-                                                                                                                                                      2473691575
-                                                                                                                                                    ],
-                                                                                                                                                    "-8925488822310827593"
-                                                                                                                                                  ],
-                                                                                                                                                  tl: /* [] */0
-                                                                                                                                                },
-                                                                                                                                                tl: {
-                                                                                                                                                  hd: {
-                                                                                                                                                    hd: [
-                                                                                                                                                      [
-                                                                                                                                                        2113685321,
-                                                                                                                                                        221520981
-                                                                                                                                                      ],
-                                                                                                                                                      "9078209327951782997"
-                                                                                                                                                    ],
-                                                                                                                                                    tl: /* [] */0
-                                                                                                                                                  },
-                                                                                                                                                  tl: {
-                                                                                                                                                    hd: {
-                                                                                                                                                      hd: [
-                                                                                                                                                        [
-                                                                                                                                                          -2113685322,
-                                                                                                                                                          4073446315
-                                                                                                                                                        ],
-                                                                                                                                                        "-9078209327951782997"
-                                                                                                                                                      ],
-                                                                                                                                                      tl: /* [] */0
-                                                                                                                                                    },
-                                                                                                                                                    tl: {
-                                                                                                                                                      hd: {
-                                                                                                                                                        hd: [
-                                                                                                                                                          [
-                                                                                                                                                            2045429685,
-                                                                                                                                                            76350484
-                                                                                                                                                          ],
-                                                                                                                                                          "8785053603418932244"
-                                                                                                                                                        ],
-                                                                                                                                                        tl: /* [] */0
-                                                                                                                                                      },
-                                                                                                                                                      tl: {
-                                                                                                                                                        hd: {
-                                                                                                                                                          hd: [
-                                                                                                                                                            [
-                                                                                                                                                              -2045429686,
-                                                                                                                                                              4218616812
-                                                                                                                                                            ],
-                                                                                                                                                            "-8785053603418932244"
-                                                                                                                                                          ],
-                                                                                                                                                          tl: /* [] */0
-                                                                                                                                                        },
-                                                                                                                                                        tl: {
-                                                                                                                                                          hd: {
-                                                                                                                                                            hd: [
-                                                                                                                                                              [
-                                                                                                                                                                1968718580,
-                                                                                                                                                                3812769591
-                                                                                                                                                              ],
-                                                                                                                                                              "8455581919940329271"
-                                                                                                                                                            ],
-                                                                                                                                                            tl: /* [] */0
-                                                                                                                                                          },
-                                                                                                                                                          tl: {
-                                                                                                                                                            hd: {
-                                                                                                                                                              hd: [
-                                                                                                                                                                [
-                                                                                                                                                                  -1968718581,
-                                                                                                                                                                  482197705
-                                                                                                                                                                ],
-                                                                                                                                                                "-8455581919940329271"
-                                                                                                                                                              ],
-                                                                                                                                                              tl: /* [] */0
-                                                                                                                                                            },
-                                                                                                                                                            tl: {
-                                                                                                                                                              hd: {
-                                                                                                                                                                hd: [
-                                                                                                                                                                  [
-                                                                                                                                                                    2085192963,
-                                                                                                                                                                    3635600512
-                                                                                                                                                                  ],
-                                                                                                                                                                  "8955835585569938560"
-                                                                                                                                                                ],
-                                                                                                                                                                tl: /* [] */0
-                                                                                                                                                              },
-                                                                                                                                                              tl: {
-                                                                                                                                                                hd: {
-                                                                                                                                                                  hd: [
-                                                                                                                                                                    [
-                                                                                                                                                                      -2085192964,
-                                                                                                                                                                      659366784
-                                                                                                                                                                    ],
-                                                                                                                                                                    "-8955835585569938560"
-                                                                                                                                                                  ],
-                                                                                                                                                                  tl: /* [] */0
-                                                                                                                                                                },
-                                                                                                                                                                tl: {
-                                                                                                                                                                  hd: {
-                                                                                                                                                                    hd: [
-                                                                                                                                                                      [
-                                                                                                                                                                        2105970746,
-                                                                                                                                                                        891163075
-                                                                                                                                                                      ],
-                                                                                                                                                                      "9045075481293885891"
-                                                                                                                                                                    ],
-                                                                                                                                                                    tl: /* [] */0
-                                                                                                                                                                  },
-                                                                                                                                                                  tl: {
-                                                                                                                                                                    hd: {
-                                                                                                                                                                      hd: [
-                                                                                                                                                                        [
-                                                                                                                                                                          -2105970747,
-                                                                                                                                                                          3403804221
-                                                                                                                                                                        ],
-                                                                                                                                                                        "-9045075481293885891"
-                                                                                                                                                                      ],
-                                                                                                                                                                      tl: /* [] */0
-                                                                                                                                                                    },
-                                                                                                                                                                    tl: {
-                                                                                                                                                                      hd: {
-                                                                                                                                                                        hd: [
-                                                                                                                                                                          [
-                                                                                                                                                                            1979240942,
-                                                                                                                                                                            1745967587
-                                                                                                                                                                          ],
-                                                                                                                                                                          "8500775118540200419"
-                                                                                                                                                                        ],
-                                                                                                                                                                        tl: /* [] */0
-                                                                                                                                                                      },
-                                                                                                                                                                      tl: {
-                                                                                                                                                                        hd: {
-                                                                                                                                                                          hd: [
-                                                                                                                                                                            [
-                                                                                                                                                                              -1979240943,
-                                                                                                                                                                              2548999709
-                                                                                                                                                                            ],
-                                                                                                                                                                            "-8500775118540200419"
-                                                                                                                                                                          ],
-                                                                                                                                                                          tl: /* [] */0
-                                                                                                                                                                        },
-                                                                                                                                                                        tl: {
-                                                                                                                                                                          hd: {
-                                                                                                                                                                            hd: [
-                                                                                                                                                                              [
-                                                                                                                                                                                2128838238,
-                                                                                                                                                                                2568362122
-                                                                                                                                                                              ],
-                                                                                                                                                                              "9143290613252626570"
-                                                                                                                                                                            ],
-                                                                                                                                                                            tl: /* [] */0
-                                                                                                                                                                          },
-                                                                                                                                                                          tl: {
-                                                                                                                                                                            hd: {
-                                                                                                                                                                              hd: [
-                                                                                                                                                                                [
-                                                                                                                                                                                  -2128838239,
-                                                                                                                                                                                  1726605174
-                                                                                                                                                                                ],
-                                                                                                                                                                                "-9143290613252626570"
-                                                                                                                                                                              ],
-                                                                                                                                                                              tl: /* [] */0
-                                                                                                                                                                            },
-                                                                                                                                                                            tl: {
-                                                                                                                                                                              hd: {
-                                                                                                                                                                                hd: [
-                                                                                                                                                                                  [
-                                                                                                                                                                                    2031412573,
-                                                                                                                                                                                    3131651906
-                                                                                                                                                                                  ],
-                                                                                                                                                                                  "8724850568849864514"
-                                                                                                                                                                                ],
-                                                                                                                                                                                tl: /* [] */0
-                                                                                                                                                                              },
-                                                                                                                                                                              tl: {
-                                                                                                                                                                                hd: {
-                                                                                                                                                                                  hd: [
-                                                                                                                                                                                    [
-                                                                                                                                                                                      -2031412574,
-                                                                                                                                                                                      1163315390
-                                                                                                                                                                                    ],
-                                                                                                                                                                                    "-8724850568849864514"
-                                                                                                                                                                                  ],
-                                                                                                                                                                                  tl: /* [] */0
-                                                                                                                                                                                },
-                                                                                                                                                                                tl: {
-                                                                                                                                                                                  hd: {
-                                                                                                                                                                                    hd: [
-                                                                                                                                                                                      [
-                                                                                                                                                                                        2134043448,
-                                                                                                                                                                                        3264840400
-                                                                                                                                                                                      ],
-                                                                                                                                                                                      "9165646820667917008"
-                                                                                                                                                                                    ],
-                                                                                                                                                                                    tl: /* [] */0
-                                                                                                                                                                                  },
-                                                                                                                                                                                  tl: {
-                                                                                                                                                                                    hd: {
-                                                                                                                                                                                      hd: [
-                                                                                                                                                                                        [
-                                                                                                                                                                                          -2134043449,
-                                                                                                                                                                                          1030126896
-                                                                                                                                                                                        ],
-                                                                                                                                                                                        "-9165646820667917008"
-                                                                                                                                                                                      ],
-                                                                                                                                                                                      tl: /* [] */0
-                                                                                                                                                                                    },
-                                                                                                                                                                                    tl: {
-                                                                                                                                                                                      hd: {
-                                                                                                                                                                                        hd: [
-                                                                                                                                                                                          [
-                                                                                                                                                                                            2053645659,
-                                                                                                                                                                                            2298737672
-                                                                                                                                                                                          ],
-                                                                                                                                                                                          "8820340945276105736"
-                                                                                                                                                                                        ],
-                                                                                                                                                                                        tl: /* [] */0
-                                                                                                                                                                                      },
-                                                                                                                                                                                      tl: {
-                                                                                                                                                                                        hd: {
-                                                                                                                                                                                          hd: [
-                                                                                                                                                                                            [
-                                                                                                                                                                                              -2053645660,
-                                                                                                                                                                                              1996229624
-                                                                                                                                                                                            ],
-                                                                                                                                                                                            "-8820340945276105736"
-                                                                                                                                                                                          ],
-                                                                                                                                                                                          tl: /* [] */0
-                                                                                                                                                                                        },
-                                                                                                                                                                                        tl: {
-                                                                                                                                                                                          hd: {
-                                                                                                                                                                                            hd: [
-                                                                                                                                                                                              [
-                                                                                                                                                                                                2121544293,
-                                                                                                                                                                                                2164977707
-                                                                                                                                                                                              ],
-                                                                                                                                                                                              "9111963357615419435"
-                                                                                                                                                                                            ],
-                                                                                                                                                                                            tl: /* [] */0
-                                                                                                                                                                                          },
-                                                                                                                                                                                          tl: {
-                                                                                                                                                                                            hd: {
-                                                                                                                                                                                              hd: [
-                                                                                                                                                                                                [
-                                                                                                                                                                                                  -2121544294,
-                                                                                                                                                                                                  2129989589
-                                                                                                                                                                                                ],
-                                                                                                                                                                                                "-9111963357615419435"
-                                                                                                                                                                                              ],
-                                                                                                                                                                                              tl: /* [] */0
-                                                                                                                                                                                            },
-                                                                                                                                                                                            tl: {
-                                                                                                                                                                                              hd: {
-                                                                                                                                                                                                hd: [
-                                                                                                                                                                                                  [
-                                                                                                                                                                                                    2143847823,
-                                                                                                                                                                                                    4240900280
-                                                                                                                                                                                                  ],
-                                                                                                                                                                                                  "9207756291626696888"
-                                                                                                                                                                                                ],
-                                                                                                                                                                                                tl: /* [] */0
-                                                                                                                                                                                              },
-                                                                                                                                                                                              tl: {
-                                                                                                                                                                                                hd: {
-                                                                                                                                                                                                  hd: [
-                                                                                                                                                                                                    [
-                                                                                                                                                                                                      -2143847824,
-                                                                                                                                                                                                      54067016
-                                                                                                                                                                                                    ],
-                                                                                                                                                                                                    "-9207756291626696888"
-                                                                                                                                                                                                  ],
-                                                                                                                                                                                                  tl: /* [] */0
-                                                                                                                                                                                                },
-                                                                                                                                                                                                tl: {
-                                                                                                                                                                                                  hd: {
-                                                                                                                                                                                                    hd: [
-                                                                                                                                                                                                      [
-                                                                                                                                                                                                        2080628135,
-                                                                                                                                                                                                        1548719224
-                                                                                                                                                                                                      ],
-                                                                                                                                                                                                      "8936229796511192184"
-                                                                                                                                                                                                    ],
-                                                                                                                                                                                                    tl: /* [] */0
-                                                                                                                                                                                                  },
-                                                                                                                                                                                                  tl: {
-                                                                                                                                                                                                    hd: {
-                                                                                                                                                                                                      hd: [
-                                                                                                                                                                                                        [
-                                                                                                                                                                                                          -2080628136,
-                                                                                                                                                                                                          2746248072
-                                                                                                                                                                                                        ],
-                                                                                                                                                                                                        "-8936229796511192184"
-                                                                                                                                                                                                      ],
-                                                                                                                                                                                                      tl: /* [] */0
-                                                                                                                                                                                                    },
-                                                                                                                                                                                                    tl: {
-                                                                                                                                                                                                      hd: {
-                                                                                                                                                                                                        hd: [
-                                                                                                                                                                                                          [
-                                                                                                                                                                                                            2061191282,
-                                                                                                                                                                                                            1066249560
-                                                                                                                                                                                                          ],
-                                                                                                                                                                                                          "8852749148056563032"
-                                                                                                                                                                                                        ],
-                                                                                                                                                                                                        tl: /* [] */0
-                                                                                                                                                                                                      },
-                                                                                                                                                                                                      tl: {
-                                                                                                                                                                                                        hd: {
-                                                                                                                                                                                                          hd: [
-                                                                                                                                                                                                            [
-                                                                                                                                                                                                              -2061191283,
-                                                                                                                                                                                                              3228717736
-                                                                                                                                                                                                            ],
-                                                                                                                                                                                                            "-8852749148056563032"
-                                                                                                                                                                                                          ],
-                                                                                                                                                                                                          tl: /* [] */0
-                                                                                                                                                                                                        },
-                                                                                                                                                                                                        tl: /* [] */0
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  }
-                                                                                                                                                                                                }
-                                                                                                                                                                                              }
-                                                                                                                                                                                            }
-                                                                                                                                                                                          }
-                                                                                                                                                                                        }
-                                                                                                                                                                                      }
-                                                                                                                                                                                    }
-                                                                                                                                                                                  }
-                                                                                                                                                                                }
-                                                                                                                                                                              }
-                                                                                                                                                                            }
-                                                                                                                                                                          }
-                                                                                                                                                                        }
-                                                                                                                                                                      }
-                                                                                                                                                                    }
-                                                                                                                                                                  }
-                                                                                                                                                                }
-                                                                                                                                                              }
-                                                                                                                                                            }
-                                                                                                                                                          }
-                                                                                                                                                        }
-                                                                                                                                                      }
-                                                                                                                                                    }
-                                                                                                                                                  }
-                                                                                                                                                }
-                                                                                                                                              }
-                                                                                                                                            }
-                                                                                                                                          }
-                                                                                                                                        }
-                                                                                                                                      }
-                                                                                                                                    }
-                                                                                                                                  }
-                                                                                                                                }
-                                                                                                                              }
-                                                                                                                            }
-                                                                                                                          }
-                                                                                                                        }
-                                                                                                                      }
-                                                                                                                    }
-                                                                                                                  }
-                                                                                                                }
-                                                                                                              }
-                                                                                                            }
-                                                                                                          }
-                                                                                                        }
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-Belt_List.forEach(random_data, (function (u) {
-        if (u) {
-          if (u.tl) {
-            throw {
-                  RE_EXN_ID: "Assert_failure",
-                  _1: [
-                    "int64_string_test.res",
-                    191,
-                    9
-                  ],
-                  Error: new Error()
-                };
-          }
-          var match = u.hd;
-          return eq("File \"int64_string_test.res\", line 190, characters 25-32", Caml_int64.to_string(match[0]), match[1]);
-        }
-        throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "int64_string_test.res",
-                191,
-                9
-              ],
-              Error: new Error()
-            };
-      }));
-
-eq("File \"int64_string_test.res\", line 195, characters 3-10", Caml_int64.to_string([
-          -2097152,
-          1
-        ]), "-9007199254740991");
-
-eq("File \"int64_string_test.res\", line 196, characters 3-10", Caml_int64.to_string([
-          -2097152,
-          0
-        ]), "-9007199254740992");
-
-Mt.from_pair_suites("File \"int64_string_test.res\", line 197, characters 20-27", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.hh = hh;
-exports.u = u;
-exports.v = v$1;
-exports.random_data = random_data;
-/* v Not a pure module */
diff --git a/jscomp/test/int64_string_test.res b/jscomp/test/int64_string_test.res
deleted file mode 100644
index 804eb3b..0000000
--- a/jscomp/test/int64_string_test.res
+++ /dev/null
@@ -1,197 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let v = Int64.to_string(Int64.max_int)
-eq(__LOC__, v, "9223372036854775807")
-let f = (a, b) => eq(__LOC__, Int64.to_string(a), b)
-
-let hh = {
-  open Int64
-  add(min_int, 100L)
-}
-
-eq(__LOC__, hh, -9223372036854775708L)
-f(-33L, "-33")
-f(33L, "33")
-f(Int64.min_int, "-9223372036854775808")
-f(hh, "-9223372036854775708")
-f(1_000_000_000_000_000L, "1000000000000000")
-for i in 0 to 8 {
-  eq(
-    __LOC__,
-    {
-      open Int64
-      to_string(add(min_int, of_int(i)))
-    },
-    "-922337203685477580" ++ string_of_int(8 - i),
-  )
-}
-for i in 0 to 8 {
-  eq(
-    __LOC__,
-    {
-      open Int64
-      to_string(add(min_int, \"@@"(of_int, 100 + i)))
-    },
-    "-922337203685477570" ++ string_of_int(8 - i),
-  )
-}
-for i in 0 to 8 {
-  eq(
-    __LOC__,
-    {
-      open Int64
-      to_string(add(min_int, \"@@"(of_int, 1_000_000 + i)))
-    },
-    "-922337203685377580" ++ string_of_int(8 - i),
-  )
-}
-
-let u = 9007199254730991L
-/* + 100 */
-for i in 0 to 6 {
-  open Int64
-  eq(
-    __LOC__,
-    u->add((i * 100_00)->of_int)->to_string,
-    "90071992547" ++ (string_of_int(3 + i) ++ "0991"),
-  )
-}
-
-let v = -9007199254790991L
-
-for i in 0 to 9 {
-  open Int64
-  eq(
-    __LOC__,
-    v->add((i * 100_00)->of_int)->to_string,
-    "-90071992547" ++ (string_of_int(9 - i) ++ "0991"),
-  )
-}
-
-eq(__LOC__, 9007199254740991L->Int64.to_string, "9007199254740991")
-eq(__LOC__, -9007199254740991L->Int64.to_string, "-9007199254740991")
-eq(__LOC__, Int64.to_string(-233L), "-233")
-eq(
-  __LOC__,
-  {
-    open Int64
-    to_string(9223372036854775807L)
-  },
-  "9223372036854775807",
-)
-
-let random_data = list{
-  list{(9222265526802072873L, "9222265526802072873")},
-  list{(-9222265526802072873L, "-9222265526802072873")},
-  list{(8259675854677364784L, "8259675854677364784")},
-  list{(-8259675854677364784L, "-8259675854677364784")},
-  list{(8835388831347763546L, "8835388831347763546")},
-  list{(-8835388831347763546L, "-8835388831347763546")},
-  list{(8432790778033508297L, "8432790778033508297")},
-  list{(-8432790778033508297L, "-8432790778033508297")},
-  list{(8803803312937127383L, "8803803312937127383")},
-  list{(-8803803312937127383L, "-8803803312937127383")},
-  list{(8554209517442287148L, "8554209517442287148")},
-  list{(-8554209517442287148L, "-8554209517442287148")},
-  list{(8827502340722511268L, "8827502340722511268")},
-  list{(-8827502340722511268L, "-8827502340722511268")},
-  list{(8959938688116877129L, "8959938688116877129")},
-  list{(-8959938688116877129L, "-8959938688116877129")},
-  list{(8375343173485592219L, "8375343173485592219")},
-  list{(-8375343173485592219L, "-8375343173485592219")},
-  list{(8247185433903973425L, "8247185433903973425")},
-  list{(-8247185433903973425L, "-8247185433903973425")},
-  list{(8877202292449085084L, "8877202292449085084")},
-  list{(-8877202292449085084L, "-8877202292449085084")},
-  list{(8714039183933054831L, "8714039183933054831")},
-  list{(-8714039183933054831L, "-8714039183933054831")},
-  list{(8882991722536356759L, "8882991722536356759")},
-  list{(-8882991722536356759L, "-8882991722536356759")},
-  list{(8334238200124664212L, "8334238200124664212")},
-  list{(-8334238200124664212L, "-8334238200124664212")},
-  list{(9187027304886433402L, "9187027304886433402")},
-  list{(-9187027304886433402L, "-9187027304886433402")},
-  list{(9133057717520266586L, "9133057717520266586")},
-  list{(-9133057717520266586L, "-9133057717520266586")},
-  list{(9166371576562570333L, "9166371576562570333")},
-  list{(-9166371576562570333L, "-9166371576562570333")},
-  list{(8654171949643731022L, "8654171949643731022")},
-  list{(-8654171949643731022L, "-8654171949643731022")},
-  list{(9034842133647271125L, "9034842133647271125")},
-  list{(-9034842133647271125L, "-9034842133647271125")},
-  list{(8608580663100712151L, "8608580663100712151")},
-  list{(-8608580663100712151L, "-8608580663100712151")},
-  list{(8820716511945020972L, "8820716511945020972")},
-  list{(-8820716511945020972L, "-8820716511945020972")},
-  list{(9156810478222264303L, "9156810478222264303")},
-  list{(-9156810478222264303L, "-9156810478222264303")},
-  list{(8755426876594915757L, "8755426876594915757")},
-  list{(-8755426876594915757L, "-8755426876594915757")},
-  list{(8774739039348243521L, "8774739039348243521")},
-  list{(-8774739039348243521L, "-8774739039348243521")},
-  list{(9075741205602894645L, "9075741205602894645")},
-  list{(-9075741205602894645L, "-9075741205602894645")},
-  list{(8786231674279984331L, "8786231674279984331")},
-  list{(-8786231674279984331L, "-8786231674279984331")},
-  list{(8949021411802516758L, "8949021411802516758")},
-  list{(-8949021411802516758L, "-8949021411802516758")},
-  list{(8524723253526423954L, "8524723253526423954")},
-  list{(-8524723253526423954L, "-8524723253526423954")},
-  list{(8513293021681741708L, "8513293021681741708")},
-  list{(-8513293021681741708L, "-8513293021681741708")},
-  list{(8421467387985654104L, "8421467387985654104")},
-  list{(-8421467387985654104L, "-8421467387985654104")},
-  list{(8408716644548688797L, "8408716644548688797")},
-  list{(-8408716644548688797L, "-8408716644548688797")},
-  list{(8742836281862819756L, "8742836281862819756")},
-  list{(-8742836281862819756L, "-8742836281862819756")},
-  list{(8499829234439401537L, "8499829234439401537")},
-  list{(-8499829234439401537L, "-8499829234439401537")},
-  list{(8324213839613616899L, "8324213839613616899")},
-  list{(-8324213839613616899L, "-8324213839613616899")},
-  list{(9113404037906038527L, "9113404037906038527")},
-  list{(-9113404037906038527L, "-9113404037906038527")},
-  list{(8925488822310827593L, "8925488822310827593")},
-  list{(-8925488822310827593L, "-8925488822310827593")},
-  list{(9078209327951782997L, "9078209327951782997")},
-  list{(-9078209327951782997L, "-9078209327951782997")},
-  list{(8785053603418932244L, "8785053603418932244")},
-  list{(-8785053603418932244L, "-8785053603418932244")},
-  list{(8455581919940329271L, "8455581919940329271")},
-  list{(-8455581919940329271L, "-8455581919940329271")},
-  list{(8955835585569938560L, "8955835585569938560")},
-  list{(-8955835585569938560L, "-8955835585569938560")},
-  list{(9045075481293885891L, "9045075481293885891")},
-  list{(-9045075481293885891L, "-9045075481293885891")},
-  list{(8500775118540200419L, "8500775118540200419")},
-  list{(-8500775118540200419L, "-8500775118540200419")},
-  list{(9143290613252626570L, "9143290613252626570")},
-  list{(-9143290613252626570L, "-9143290613252626570")},
-  list{(8724850568849864514L, "8724850568849864514")},
-  list{(-8724850568849864514L, "-8724850568849864514")},
-  list{(9165646820667917008L, "9165646820667917008")},
-  list{(-9165646820667917008L, "-9165646820667917008")},
-  list{(8820340945276105736L, "8820340945276105736")},
-  list{(-8820340945276105736L, "-8820340945276105736")},
-  list{(9111963357615419435L, "9111963357615419435")},
-  list{(-9111963357615419435L, "-9111963357615419435")},
-  list{(9207756291626696888L, "9207756291626696888")},
-  list{(-9207756291626696888L, "-9207756291626696888")},
-  list{(8936229796511192184L, "8936229796511192184")},
-  list{(-8936229796511192184L, "-8936229796511192184")},
-  list{(8852749148056563032L, "8852749148056563032")},
-  list{(-8852749148056563032L, "-8852749148056563032")},
-}
-
-Belt_List.forEach(random_data, u =>
-  switch u {
-  | list{(v, str)} => eq(__LOC__, Int64.to_string(v), str)
-  | _ => assert(false)
-  }
-)
-
-eq(__LOC__, Int64.to_string(-9007199254740991L), "-9007199254740991")
-eq(__LOC__, Int64.to_string(-9007199254740992L), "-9007199254740992")
-Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/int64_test.js b/jscomp/test/int64_test.js
deleted file mode 100644
index 38dae45..0000000
--- a/jscomp/test/int64_test.js
+++ /dev/null
@@ -1,2254 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Int32 = require("../../lib/js/int32.js");
-var Int64 = require("../../lib/js/int64.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Ext_array_test = require("./ext_array_test.js");
-
-var v = Caml_int64.add(Caml_int64.of_int32(Int32.max_int), Int64.one);
-
-var h = Caml_int64.neg(v);
-
-var a = [
-  0,
-  2147483647
-];
-
-function commutative_add(result, a, b) {
-  return {
-          TAG: "Eq",
-          _0: [
-            result,
-            result
-          ],
-          _1: [
-            Caml_int64.add(a, b),
-            Caml_int64.add(b, a)
-          ]
-        };
-}
-
-var generic_compare = Caml_obj.compare;
-
-var shift_left_tests_0 = $$Array.map((function (i) {
-        return Caml_int64.lsl_(Caml_int64.one, i);
-      }), Ext_array_test.range(0, 63));
-
-var shift_left_tests_1 = [
-  Caml_int64.one,
-  [
-    0,
-    2
-  ],
-  [
-    0,
-    4
-  ],
-  [
-    0,
-    8
-  ],
-  [
-    0,
-    16
-  ],
-  [
-    0,
-    32
-  ],
-  [
-    0,
-    64
-  ],
-  [
-    0,
-    128
-  ],
-  [
-    0,
-    256
-  ],
-  [
-    0,
-    512
-  ],
-  [
-    0,
-    1024
-  ],
-  [
-    0,
-    2048
-  ],
-  [
-    0,
-    4096
-  ],
-  [
-    0,
-    8192
-  ],
-  [
-    0,
-    16384
-  ],
-  [
-    0,
-    32768
-  ],
-  [
-    0,
-    65536
-  ],
-  [
-    0,
-    131072
-  ],
-  [
-    0,
-    262144
-  ],
-  [
-    0,
-    524288
-  ],
-  [
-    0,
-    1048576
-  ],
-  [
-    0,
-    2097152
-  ],
-  [
-    0,
-    4194304
-  ],
-  [
-    0,
-    8388608
-  ],
-  [
-    0,
-    16777216
-  ],
-  [
-    0,
-    33554432
-  ],
-  [
-    0,
-    67108864
-  ],
-  [
-    0,
-    134217728
-  ],
-  [
-    0,
-    268435456
-  ],
-  [
-    0,
-    536870912
-  ],
-  [
-    0,
-    1073741824
-  ],
-  [
-    0,
-    2147483648
-  ],
-  [
-    1,
-    0
-  ],
-  [
-    2,
-    0
-  ],
-  [
-    4,
-    0
-  ],
-  [
-    8,
-    0
-  ],
-  [
-    16,
-    0
-  ],
-  [
-    32,
-    0
-  ],
-  [
-    64,
-    0
-  ],
-  [
-    128,
-    0
-  ],
-  [
-    256,
-    0
-  ],
-  [
-    512,
-    0
-  ],
-  [
-    1024,
-    0
-  ],
-  [
-    2048,
-    0
-  ],
-  [
-    4096,
-    0
-  ],
-  [
-    8192,
-    0
-  ],
-  [
-    16384,
-    0
-  ],
-  [
-    32768,
-    0
-  ],
-  [
-    65536,
-    0
-  ],
-  [
-    131072,
-    0
-  ],
-  [
-    262144,
-    0
-  ],
-  [
-    524288,
-    0
-  ],
-  [
-    1048576,
-    0
-  ],
-  [
-    2097152,
-    0
-  ],
-  [
-    4194304,
-    0
-  ],
-  [
-    8388608,
-    0
-  ],
-  [
-    16777216,
-    0
-  ],
-  [
-    33554432,
-    0
-  ],
-  [
-    67108864,
-    0
-  ],
-  [
-    134217728,
-    0
-  ],
-  [
-    268435456,
-    0
-  ],
-  [
-    536870912,
-    0
-  ],
-  [
-    1073741824,
-    0
-  ],
-  Caml_int64.min_int
-];
-
-var shift_left_tests = [
-  shift_left_tests_0,
-  shift_left_tests_1
-];
-
-var shift_right_tests_0 = $$Array.map((function (i) {
-        return Caml_int64.asr_(Caml_int64.min_int, i);
-      }), Ext_array_test.range(0, 63));
-
-var shift_right_tests_1 = [
-  Caml_int64.min_int,
-  [
-    -1073741824,
-    0
-  ],
-  [
-    -536870912,
-    0
-  ],
-  [
-    -268435456,
-    0
-  ],
-  [
-    -134217728,
-    0
-  ],
-  [
-    -67108864,
-    0
-  ],
-  [
-    -33554432,
-    0
-  ],
-  [
-    -16777216,
-    0
-  ],
-  [
-    -8388608,
-    0
-  ],
-  [
-    -4194304,
-    0
-  ],
-  [
-    -2097152,
-    0
-  ],
-  [
-    -1048576,
-    0
-  ],
-  [
-    -524288,
-    0
-  ],
-  [
-    -262144,
-    0
-  ],
-  [
-    -131072,
-    0
-  ],
-  [
-    -65536,
-    0
-  ],
-  [
-    -32768,
-    0
-  ],
-  [
-    -16384,
-    0
-  ],
-  [
-    -8192,
-    0
-  ],
-  [
-    -4096,
-    0
-  ],
-  [
-    -2048,
-    0
-  ],
-  [
-    -1024,
-    0
-  ],
-  [
-    -512,
-    0
-  ],
-  [
-    -256,
-    0
-  ],
-  [
-    -128,
-    0
-  ],
-  [
-    -64,
-    0
-  ],
-  [
-    -32,
-    0
-  ],
-  [
-    -16,
-    0
-  ],
-  [
-    -8,
-    0
-  ],
-  [
-    -4,
-    0
-  ],
-  [
-    -2,
-    0
-  ],
-  [
-    -1,
-    0
-  ],
-  [
-    -1,
-    2147483648
-  ],
-  [
-    -1,
-    3221225472
-  ],
-  [
-    -1,
-    3758096384
-  ],
-  [
-    -1,
-    4026531840
-  ],
-  [
-    -1,
-    4160749568
-  ],
-  [
-    -1,
-    4227858432
-  ],
-  [
-    -1,
-    4261412864
-  ],
-  [
-    -1,
-    4278190080
-  ],
-  [
-    -1,
-    4286578688
-  ],
-  [
-    -1,
-    4290772992
-  ],
-  [
-    -1,
-    4292870144
-  ],
-  [
-    -1,
-    4293918720
-  ],
-  [
-    -1,
-    4294443008
-  ],
-  [
-    -1,
-    4294705152
-  ],
-  [
-    -1,
-    4294836224
-  ],
-  [
-    -1,
-    4294901760
-  ],
-  [
-    -1,
-    4294934528
-  ],
-  [
-    -1,
-    4294950912
-  ],
-  [
-    -1,
-    4294959104
-  ],
-  [
-    -1,
-    4294963200
-  ],
-  [
-    -1,
-    4294965248
-  ],
-  [
-    -1,
-    4294966272
-  ],
-  [
-    -1,
-    4294966784
-  ],
-  [
-    -1,
-    4294967040
-  ],
-  [
-    -1,
-    4294967168
-  ],
-  [
-    -1,
-    4294967232
-  ],
-  [
-    -1,
-    4294967264
-  ],
-  [
-    -1,
-    4294967280
-  ],
-  [
-    -1,
-    4294967288
-  ],
-  [
-    -1,
-    4294967292
-  ],
-  [
-    -1,
-    4294967294
-  ],
-  Caml_int64.neg_one
-];
-
-var shift_right_tests = [
-  shift_right_tests_0,
-  shift_right_tests_1
-];
-
-var shift_right_logical_suites_0 = $$Array.map((function (i) {
-        return Caml_int64.lsr_(Caml_int64.min_int, i);
-      }), Ext_array_test.range(0, 63));
-
-var shift_right_logical_suites_1 = [
-  Caml_int64.min_int,
-  [
-    1073741824,
-    0
-  ],
-  [
-    536870912,
-    0
-  ],
-  [
-    268435456,
-    0
-  ],
-  [
-    134217728,
-    0
-  ],
-  [
-    67108864,
-    0
-  ],
-  [
-    33554432,
-    0
-  ],
-  [
-    16777216,
-    0
-  ],
-  [
-    8388608,
-    0
-  ],
-  [
-    4194304,
-    0
-  ],
-  [
-    2097152,
-    0
-  ],
-  [
-    1048576,
-    0
-  ],
-  [
-    524288,
-    0
-  ],
-  [
-    262144,
-    0
-  ],
-  [
-    131072,
-    0
-  ],
-  [
-    65536,
-    0
-  ],
-  [
-    32768,
-    0
-  ],
-  [
-    16384,
-    0
-  ],
-  [
-    8192,
-    0
-  ],
-  [
-    4096,
-    0
-  ],
-  [
-    2048,
-    0
-  ],
-  [
-    1024,
-    0
-  ],
-  [
-    512,
-    0
-  ],
-  [
-    256,
-    0
-  ],
-  [
-    128,
-    0
-  ],
-  [
-    64,
-    0
-  ],
-  [
-    32,
-    0
-  ],
-  [
-    16,
-    0
-  ],
-  [
-    8,
-    0
-  ],
-  [
-    4,
-    0
-  ],
-  [
-    2,
-    0
-  ],
-  [
-    1,
-    0
-  ],
-  [
-    0,
-    2147483648
-  ],
-  [
-    0,
-    1073741824
-  ],
-  [
-    0,
-    536870912
-  ],
-  [
-    0,
-    268435456
-  ],
-  [
-    0,
-    134217728
-  ],
-  [
-    0,
-    67108864
-  ],
-  [
-    0,
-    33554432
-  ],
-  [
-    0,
-    16777216
-  ],
-  [
-    0,
-    8388608
-  ],
-  [
-    0,
-    4194304
-  ],
-  [
-    0,
-    2097152
-  ],
-  [
-    0,
-    1048576
-  ],
-  [
-    0,
-    524288
-  ],
-  [
-    0,
-    262144
-  ],
-  [
-    0,
-    131072
-  ],
-  [
-    0,
-    65536
-  ],
-  [
-    0,
-    32768
-  ],
-  [
-    0,
-    16384
-  ],
-  [
-    0,
-    8192
-  ],
-  [
-    0,
-    4096
-  ],
-  [
-    0,
-    2048
-  ],
-  [
-    0,
-    1024
-  ],
-  [
-    0,
-    512
-  ],
-  [
-    0,
-    256
-  ],
-  [
-    0,
-    128
-  ],
-  [
-    0,
-    64
-  ],
-  [
-    0,
-    32
-  ],
-  [
-    0,
-    16
-  ],
-  [
-    0,
-    8
-  ],
-  [
-    0,
-    4
-  ],
-  [
-    0,
-    2
-  ],
-  Caml_int64.one
-];
-
-var shift_right_logical_suites = [
-  shift_right_logical_suites_0,
-  shift_right_logical_suites_1
-];
-
-function fib(_n, _a, _b) {
-  while(true) {
-    var b = _b;
-    var a = _a;
-    var n = _n;
-    if (n === 0) {
-      return a;
-    }
-    _b = Caml_int64.add(a, b);
-    _a = b;
-    _n = n - 1 | 0;
-    continue ;
-  };
-}
-
-function fac(_n, _acc) {
-  while(true) {
-    var acc = _acc;
-    var n = _n;
-    if (n === 0) {
-      return acc;
-    }
-    _acc = Caml_int64.mul(acc, Caml_int64.of_int32(n));
-    _n = n - 1 | 0;
-    continue ;
-  };
-}
-
-var suites = Pervasives.$at({
-      hd: [
-        "add_one",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: v,
-                    _1: [
-                      0,
-                      2147483648
-                    ]
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "add_2",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: [
-                        0,
-                        4294967294
-                      ],
-                      _1: Caml_int64.add(a, a)
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "add_3",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: Caml_int64.zero,
-                        _1: Caml_int64.zero
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "add_4",
-              (function (param) {
-                  return commutative_add([
-                              -1,
-                              4294967294
-                            ], [
-                              -1,
-                              4294967293
-                            ], Caml_int64.one);
-                })
-            ],
-            tl: {
-              hd: [
-                "add_5",
-                (function (param) {
-                    return commutative_add([
-                                -1,
-                                4294967293
-                              ], [
-                                -1,
-                                4294967293
-                              ], Caml_int64.zero);
-                  })
-              ],
-              tl: {
-                hd: [
-                  "add_6",
-                  (function (param) {
-                      return commutative_add([
-                                  0,
-                                  4
-                                ], [
-                                  -1,
-                                  4294967293
-                                ], [
-                                  0,
-                                  7
-                                ]);
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "add_7",
-                    (function (param) {
-                        return commutative_add([
-                                    1,
-                                    0
-                                  ], [
-                                    0,
-                                    2147483648
-                                  ], [
-                                    0,
-                                    2147483648
-                                  ]);
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "add_8",
-                      (function (param) {
-                          return commutative_add([
-                                      1,
-                                      0
-                                    ], [
-                                      0,
-                                      4294967295
-                                    ], Caml_int64.one);
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "add_9",
-                        (function (param) {
-                            return commutative_add([
-                                        0,
-                                        4294967295
-                                      ], [
-                                        0,
-                                        2147483648
-                                      ], [
-                                        0,
-                                        2147483647
-                                      ]);
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "add_10",
-                          (function (param) {
-                              return commutative_add([
-                                          0,
-                                          2147483648
-                                        ], [
-                                          0,
-                                          2147483648
-                                        ], Caml_int64.zero);
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "add_11",
-                            (function (param) {
-                                return commutative_add([
-                                            0,
-                                            4294967295
-                                          ], [
-                                            0,
-                                            4294967295
-                                          ], Caml_int64.zero);
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "to_int32",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: 3,
-                                          _1: Caml_int64.to_int32([
-                                                0,
-                                                3
-                                              ])
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "to_int",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: 3,
-                                            _1: Caml_int64.to_int32([
-                                                  0,
-                                                  3
-                                                ])
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "of_int",
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: [
-                                                0,
-                                                3
-                                              ],
-                                              _1: [
-                                                0,
-                                                3
-                                              ]
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "lognot",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: [
-                                                  -1,
-                                                  4294967293
-                                                ],
-                                                _1: [
-                                                  -1,
-                                                  4294967293
-                                                ]
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "neg",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: [
-                                                    -1,
-                                                    4294967294
-                                                  ],
-                                                  _1: [
-                                                    -1,
-                                                    4294967294
-                                                  ]
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "File \"int64_test.res\", line 277, characters 7-14",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: Int64.min_int,
-                                                    _1: Caml_int64.neg(Int64.min_int)
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "File \"int64_test.res\", line 279, characters 8-15",
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: Int64.max_int,
-                                                      _1: Caml_int64.neg(Caml_int64.add(Int64.min_int, Caml_int64.one))
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "sub1",
-                                            (function (param) {
-                                                return {
-                                                        TAG: "Eq",
-                                                        _0: [
-                                                          0,
-                                                          2
-                                                        ],
-                                                        _1: [
-                                                          0,
-                                                          2
-                                                        ]
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "xor1",
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "Eq",
-                                                          _0: [
-                                                            [
-                                                              0,
-                                                              286331153
-                                                            ],
-                                                            Caml_int64.xor(a, [
-                                                                  0,
-                                                                  4009750271
-                                                                ])
-                                                          ],
-                                                          _1: [
-                                                            [
-                                                              0,
-                                                              286331153
-                                                            ],
-                                                            [
-                                                              0,
-                                                              2432700672
-                                                            ]
-                                                          ]
-                                                        };
-                                                })
-                                            ],
-                                            tl: {
-                                              hd: [
-                                                "or",
-                                                (function (param) {
-                                                    return {
-                                                            TAG: "Eq",
-                                                            _0: [
-                                                              0,
-                                                              4294967295
-                                                            ],
-                                                            _1: [
-                                                              0,
-                                                              4294967295
-                                                            ]
-                                                          };
-                                                  })
-                                              ],
-                                              tl: {
-                                                hd: [
-                                                  "and",
-                                                  (function (param) {
-                                                      return {
-                                                              TAG: "Eq",
-                                                              _0: [
-                                                                0,
-                                                                4008636142
-                                                              ],
-                                                              _1: [
-                                                                0,
-                                                                4008636142
-                                                              ]
-                                                            };
-                                                    })
-                                                ],
-                                                tl: {
-                                                  hd: [
-                                                    "lsl",
-                                                    (function (param) {
-                                                        return {
-                                                                TAG: "Eq",
-                                                                _0: $$Array.map((function (x) {
-                                                                        return Caml_int64.lsl_(Caml_int64.one, x);
-                                                                      }), $$Array.init(64, (function (i) {
-                                                                            return i;
-                                                                          }))),
-                                                                _1: [
-                                                                  Caml_int64.one,
-                                                                  [
-                                                                    0,
-                                                                    2
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    4
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    8
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    16
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    32
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    64
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    128
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    256
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    512
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    1024
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    2048
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    4096
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    8192
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    16384
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    32768
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    65536
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    131072
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    262144
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    524288
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    1048576
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    2097152
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    4194304
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    8388608
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    16777216
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    33554432
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    67108864
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    134217728
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    268435456
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    536870912
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    1073741824
-                                                                  ],
-                                                                  [
-                                                                    0,
-                                                                    2147483648
-                                                                  ],
-                                                                  [
-                                                                    1,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    2,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    4,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    8,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    16,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    32,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    64,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    128,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    256,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    512,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    1024,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    2048,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    4096,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    8192,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    16384,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    32768,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    65536,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    131072,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    262144,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    524288,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    1048576,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    2097152,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    4194304,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    8388608,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    16777216,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    33554432,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    67108864,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    134217728,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    268435456,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    536870912,
-                                                                    0
-                                                                  ],
-                                                                  [
-                                                                    1073741824,
-                                                                    0
-                                                                  ],
-                                                                  Caml_int64.min_int
-                                                                ]
-                                                              };
-                                                      })
-                                                  ],
-                                                  tl: {
-                                                    hd: [
-                                                      "lsr",
-                                                      (function (param) {
-                                                          return {
-                                                                  TAG: "Eq",
-                                                                  _0: $$Array.map((function (x) {
-                                                                          return Caml_int64.lsr_(Caml_int64.neg_one, x);
-                                                                        }), $$Array.init(64, (function (i) {
-                                                                              return i;
-                                                                            }))),
-                                                                  _1: [
-                                                                    Caml_int64.neg_one,
-                                                                    Caml_int64.max_int,
-                                                                    [
-                                                                      1073741823,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      536870911,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      268435455,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      134217727,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      67108863,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      33554431,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      16777215,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      8388607,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      4194303,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      2097151,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      1048575,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      524287,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      262143,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      131071,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      65535,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      32767,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      16383,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      8191,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      4095,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      2047,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      1023,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      511,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      255,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      127,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      63,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      31,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      15,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      7,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      3,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      1,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      4294967295
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      2147483647
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      1073741823
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      536870911
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      268435455
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      134217727
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      67108863
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      33554431
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      16777215
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      8388607
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      4194303
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      2097151
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      1048575
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      524287
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      262143
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      131071
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      65535
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      32767
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      16383
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      8191
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      4095
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      2047
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      1023
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      511
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      255
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      127
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      63
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      31
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      15
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      7
-                                                                    ],
-                                                                    [
-                                                                      0,
-                                                                      3
-                                                                    ],
-                                                                    Caml_int64.one
-                                                                  ]
-                                                                };
-                                                        })
-                                                    ],
-                                                    tl: {
-                                                      hd: [
-                                                        "asr",
-                                                        (function (param) {
-                                                            return {
-                                                                    TAG: "Eq",
-                                                                    _0: $$Array.map((function (x) {
-                                                                            return Caml_int64.asr_(Caml_int64.neg_one, x);
-                                                                          }), $$Array.init(64, (function (i) {
-                                                                                return i;
-                                                                              }))),
-                                                                    _1: [
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one,
-                                                                      Caml_int64.neg_one
-                                                                    ]
-                                                                  };
-                                                          })
-                                                      ],
-                                                      tl: {
-                                                        hd: [
-                                                          "mul simple",
-                                                          (function (param) {
-                                                              return {
-                                                                      TAG: "Eq",
-                                                                      _0: [
-                                                                        0,
-                                                                        6
-                                                                      ],
-                                                                      _1: [
-                                                                        0,
-                                                                        6
-                                                                      ]
-                                                                    };
-                                                            })
-                                                        ],
-                                                        tl: {
-                                                          hd: [
-                                                            "of_int32",
-                                                            (function (param) {
-                                                                return {
-                                                                        TAG: "Eq",
-                                                                        _0: $$Array.map(Caml_int64.of_int32, [
-                                                                              0,
-                                                                              -2147483648
-                                                                            ]),
-                                                                        _1: [
-                                                                          Caml_int64.zero,
-                                                                          [
-                                                                            -1,
-                                                                            2147483648
-                                                                          ]
-                                                                        ]
-                                                                      };
-                                                              })
-                                                          ],
-                                                          tl: {
-                                                            hd: [
-                                                              "of_int32_singleton",
-                                                              (function (param) {
-                                                                  return {
-                                                                          TAG: "Eq",
-                                                                          _0: [
-                                                                            -1,
-                                                                            4294967293
-                                                                          ],
-                                                                          _1: [
-                                                                            -1,
-                                                                            4294967293
-                                                                          ]
-                                                                        };
-                                                                })
-                                                            ],
-                                                            tl: {
-                                                              hd: [
-                                                                "File \"int64_test.res\", line 526, characters 7-14",
-                                                                (function (param) {
-                                                                    return {
-                                                                            TAG: "Eq",
-                                                                            _0: [
-                                                                              0,
-                                                                              3
-                                                                            ],
-                                                                            _1: [
-                                                                              0,
-                                                                              3
-                                                                            ]
-                                                                          };
-                                                                  })
-                                                              ],
-                                                              tl: {
-                                                                hd: [
-                                                                  "to_int32",
-                                                                  (function (param) {
-                                                                      return {
-                                                                              TAG: "Eq",
-                                                                              _0: $$Array.map(Caml_int64.to_int32, [
-                                                                                    Caml_int64.zero,
-                                                                                    [
-                                                                                      0,
-                                                                                      2147483648
-                                                                                    ]
-                                                                                  ]),
-                                                                              _1: [
-                                                                                0,
-                                                                                -2147483648
-                                                                              ]
-                                                                            };
-                                                                    })
-                                                                ],
-                                                                tl: {
-                                                                  hd: [
-                                                                    "discard_sign",
-                                                                    (function (param) {
-                                                                        return {
-                                                                                TAG: "Eq",
-                                                                                _0: Caml_int64.discard_sign(Caml_int64.neg_one),
-                                                                                _1: Caml_int64.max_int
-                                                                              };
-                                                                      })
-                                                                  ],
-                                                                  tl: {
-                                                                    hd: [
-                                                                      "div_mod",
-                                                                      (function (param) {
-                                                                          return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: Caml_int64.div_mod([
-                                                                                        0,
-                                                                                        7
-                                                                                      ], [
-                                                                                        0,
-                                                                                        3
-                                                                                      ]),
-                                                                                  _1: [
-                                                                                    [
-                                                                                      0,
-                                                                                      2
-                                                                                    ],
-                                                                                    Caml_int64.one
-                                                                                  ]
-                                                                                };
-                                                                        })
-                                                                    ],
-                                                                    tl: {
-                                                                      hd: [
-                                                                        "to_hex",
-                                                                        (function (param) {
-                                                                            return {
-                                                                                    TAG: "Eq",
-                                                                                    _0: Caml_int64.to_hex(Caml_int64.neg_one),
-                                                                                    _1: "ffffffffffffffff"
-                                                                                  };
-                                                                          })
-                                                                      ],
-                                                                      tl: {
-                                                                        hd: [
-                                                                          "generic_compare",
-                                                                          (function (param) {
-                                                                              return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: Caml_obj.compare([
-                                                                                            1,
-                                                                                            0
-                                                                                          ], Caml_int64.one) > 0,
-                                                                                      _1: true
-                                                                                    };
-                                                                            })
-                                                                        ],
-                                                                        tl: {
-                                                                          hd: [
-                                                                            "test_compier_literal",
-                                                                            (function (param) {
-                                                                                return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: [
-                                                                                          0,
-                                                                                          4294967295
-                                                                                        ],
-                                                                                        _1: [
-                                                                                          0,
-                                                                                          4294967295
-                                                                                        ]
-                                                                                      };
-                                                                              })
-                                                                          ],
-                                                                          tl: {
-                                                                            hd: [
-                                                                              "generic_compare2",
-                                                                              (function (param) {
-                                                                                  return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: Caml_obj.compare([
-                                                                                                0,
-                                                                                                2147483648
-                                                                                              ], Caml_int64.one) > 0,
-                                                                                          _1: true
-                                                                                        };
-                                                                                })
-                                                                            ],
-                                                                            tl: {
-                                                                              hd: [
-                                                                                "shift_left",
-                                                                                (function (param) {
-                                                                                    return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: [
-                                                                                              0,
-                                                                                              4294967040
-                                                                                            ],
-                                                                                            _1: [
-                                                                                              0,
-                                                                                              4294967040
-                                                                                            ]
-                                                                                          };
-                                                                                  })
-                                                                              ],
-                                                                              tl: {
-                                                                                hd: [
-                                                                                  "fib_int64",
-                                                                                  (function (param) {
-                                                                                      return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: fib(1000, Caml_int64.one, [
-                                                                                                    0,
-                                                                                                    2
-                                                                                                  ]),
-                                                                                              _1: [
-                                                                                                -1990564327,
-                                                                                                2874523960
-                                                                                              ]
-                                                                                            };
-                                                                                    })
-                                                                                ],
-                                                                                tl: {
-                                                                                  hd: [
-                                                                                    "fac_int64",
-                                                                                    (function (param) {
-                                                                                        return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: fac(30, Caml_int64.one),
-                                                                                                _1: [
-                                                                                                  -2040662563,
-                                                                                                  1409286144
-                                                                                                ]
-                                                                                              };
-                                                                                      })
-                                                                                  ],
-                                                                                  tl: {
-                                                                                    hd: [
-                                                                                      "File \"int64_test.res\", line 553, characters 8-15",
-                                                                                      (function (param) {
-                                                                                          return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: Caml_int64.add(Int64.max_int, Int64.max_int),
-                                                                                                  _1: [
-                                                                                                    -1,
-                                                                                                    4294967294
-                                                                                                  ]
-                                                                                                };
-                                                                                        })
-                                                                                    ],
-                                                                                    tl: {
-                                                                                      hd: [
-                                                                                        "File \"int64_test.res\", line 563, characters 8-15",
-                                                                                        (function (param) {
-                                                                                            return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: Caml_int64.add(Int64.min_int, Int64.min_int),
-                                                                                                    _1: Caml_int64.zero
-                                                                                                  };
-                                                                                          })
-                                                                                      ],
-                                                                                      tl: {
-                                                                                        hd: [
-                                                                                          "File \"int64_test.res\", line 573, characters 8-15",
-                                                                                          (function (param) {
-                                                                                              return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: Caml_int64.neg_one,
-                                                                                                      _1: Caml_int64.neg_one
-                                                                                                    };
-                                                                                            })
-                                                                                        ],
-                                                                                        tl: /* [] */0
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }, Pervasives.$at($$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
-                    return [
-                            "shift_left_cases " + i,
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: a,
-                                        _1: b
-                                      };
-                              })
-                          ];
-                  }), shift_left_tests_0, shift_left_tests_1)), Pervasives.$at($$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
-                        return [
-                                "shift_right_cases " + i,
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: a,
-                                            _1: b
-                                          };
-                                  })
-                              ];
-                      }), shift_right_tests_0, shift_right_tests_1)), $$Array.to_list(Ext_array_test.map2i((function (i, a, b) {
-                        return [
-                                "shift_right_logical_cases " + i,
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: a,
-                                            _1: b
-                                          };
-                                  })
-                              ];
-                      }), shift_right_logical_suites_0, shift_right_logical_suites_1)))));
-
-var suites$1 = {
-  contents: suites
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites$1, loc, x, y);
-}
-
-function id(loc, x) {
-  var float_value = Caml_int64.float_of_bits(x);
-  var match = Pervasives.classify_float(float_value);
-  if (match === "FP_nan") {
-    return ;
-  } else {
-    return eq(loc, Caml_int64.bits_of_float(float_value), x);
-  }
-}
-
-eq("File \"int64_test.res\", line 629, characters 5-12", Caml_int64.bits_of_float(0.3), [
-      1070805811,
-      858993459
-    ]);
-
-eq("File \"int64_test.res\", line 630, characters 5-12", Caml_int64.float_of_bits([
-          1070805811,
-          858993459
-        ]), 0.3);
-
-id("File \"int64_test.res\", line 631, characters 5-12", Caml_int64.neg_one);
-
-id("File \"int64_test.res\", line 632, characters 5-12", [
-      -1,
-      4294967196
-    ]);
-
-id("File \"int64_test.res\", line 633, characters 5-12", [
-      0,
-      4294967295
-    ]);
-
-id("File \"int64_test.res\", line 634, characters 5-12", [
-      0,
-      536870911
-    ]);
-
-id("File \"int64_test.res\", line 635, characters 5-12", [
-      0,
-      536870655
-    ]);
-
-eq("File \"int64_test.res\", line 637, characters 4-11", Caml_int64.div(Int64.min_int, [
-          0,
-          10
-        ]), [
-      -214748365,
-      858993460
-    ]);
-
-eq("File \"int64_test.res\", line 645, characters 4-11", Caml_int64.to_string(Caml_int64.div(Int64.min_int, [
-              0,
-              10
-            ])), "-922337203685477580");
-
-eq("File \"int64_test.res\", line 653, characters 4-11", Caml_int64.mul(Int64.min_int, [
-          0,
-          10
-        ]), Caml_int64.zero);
-
-eq("File \"int64_test.res\", line 661, characters 4-11", Caml_int64.mul([
-          0,
-          10
-        ], Int64.min_int), Caml_int64.zero);
-
-eq("File \"int64_test.res\", line 669, characters 4-11", Caml_int64.mul(Caml_int64.one, Int64.min_int), Int64.min_int);
-
-eq("File \"int64_test.res\", line 677, characters 4-11", Caml_int64.mul(Int64.max_int, [
-          0,
-          10
-        ]), [
-      -1,
-      4294967286
-    ]);
-
-eq("File \"int64_test.res\", line 685, characters 4-11", Caml_int64.succ(Int64.max_int), Int64.min_int);
-
-eq("File \"int64_test.res\", line 693, characters 4-11", Caml_int64.succ(Int64.min_int), [
-      -2147483648,
-      1
-    ]);
-
-eq("File \"int64_test.res\", line 700, characters 5-12", Caml_int64.succ([
-          0,
-          4294967295
-        ]), [
-      1,
-      0
-    ]);
-
-Mt.from_pair_suites("Int64_test", suites$1.contents);
-
-exports.v = v;
-exports.h = h;
-exports.a = a;
-exports.commutative_add = commutative_add;
-exports.generic_compare = generic_compare;
-exports.shift_left_tests = shift_left_tests;
-exports.shift_right_tests = shift_right_tests;
-exports.shift_right_logical_suites = shift_right_logical_suites;
-exports.fib = fib;
-exports.fac = fac;
-exports.suites = suites$1;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.id = id;
-/* shift_left_tests Not a pure module */
diff --git a/jscomp/test/int64_test.res b/jscomp/test/int64_test.res
deleted file mode 100644
index 3e7ef21..0000000
--- a/jscomp/test/int64_test.res
+++ /dev/null
@@ -1,702 +0,0 @@
-/* module Mt = Mock_mt */
-
-let v = Int64.add(Int64.of_int32(Int32.max_int), Int64.one)
-let h = Int64.neg(v)
-let a = Int64.of_int32(2147483647l)
-
-open Int64
-
-let commutative_add = (result, a, b) => Mt.Eq((result, result), (add(a, b), add(b, a)))
-let generic_compare = Pervasives.compare
-
-let shift_left_tests = (
-  Ext_array_test.range(0, 63) |> Array.map(i => Int64.shift_left(1L, i)),
-  [
-    1L,
-    2L,
-    4L,
-    8L,
-    16L,
-    32L,
-    64L,
-    128L,
-    256L,
-    512L,
-    1024L,
-    2048L,
-    4096L,
-    8192L,
-    16384L,
-    32768L,
-    65536L,
-    131072L,
-    262144L,
-    524288L,
-    1048576L,
-    2097152L,
-    4194304L,
-    8388608L,
-    16777216L,
-    33554432L,
-    67108864L,
-    134217728L,
-    268435456L,
-    536870912L,
-    1073741824L,
-    2147483648L,
-    4294967296L,
-    8589934592L,
-    17179869184L,
-    34359738368L,
-    68719476736L,
-    137438953472L,
-    274877906944L,
-    549755813888L,
-    1099511627776L,
-    2199023255552L,
-    4398046511104L,
-    8796093022208L,
-    17592186044416L,
-    35184372088832L,
-    70368744177664L,
-    140737488355328L,
-    281474976710656L,
-    562949953421312L,
-    1125899906842624L,
-    2251799813685248L,
-    4503599627370496L,
-    9007199254740992L,
-    18014398509481984L,
-    36028797018963968L,
-    72057594037927936L,
-    144115188075855872L,
-    288230376151711744L,
-    576460752303423488L,
-    1152921504606846976L,
-    2305843009213693952L,
-    4611686018427387904L,
-    -9223372036854775808L,
-  ],
-)
-
-let shift_right_tests = (
-  Ext_array_test.range(0, 63) |> Array.map(i => Int64.shift_right(0x8000_0000_0000_0000L, i)),
-  [
-    -9223372036854775808L,
-    -4611686018427387904L,
-    -2305843009213693952L,
-    -1152921504606846976L,
-    -576460752303423488L,
-    -288230376151711744L,
-    -144115188075855872L,
-    -72057594037927936L,
-    -36028797018963968L,
-    -18014398509481984L,
-    -9007199254740992L,
-    -4503599627370496L,
-    -2251799813685248L,
-    -1125899906842624L,
-    -562949953421312L,
-    -281474976710656L,
-    -140737488355328L,
-    -70368744177664L,
-    -35184372088832L,
-    -17592186044416L,
-    -8796093022208L,
-    -4398046511104L,
-    -2199023255552L,
-    -1099511627776L,
-    -549755813888L,
-    -274877906944L,
-    -137438953472L,
-    -68719476736L,
-    -34359738368L,
-    -17179869184L,
-    -8589934592L,
-    -4294967296L,
-    -2147483648L,
-    -1073741824L,
-    -536870912L,
-    -268435456L,
-    -134217728L,
-    -67108864L,
-    -33554432L,
-    -16777216L,
-    -8388608L,
-    -4194304L,
-    -2097152L,
-    -1048576L,
-    -524288L,
-    -262144L,
-    -131072L,
-    -65536L,
-    -32768L,
-    -16384L,
-    -8192L,
-    -4096L,
-    -2048L,
-    -1024L,
-    -512L,
-    -256L,
-    -128L,
-    -64L,
-    -32L,
-    -16L,
-    -8L,
-    -4L,
-    -2L,
-    -1L,
-  ],
-)
-
-let shift_right_logical_suites = (
-  Ext_array_test.range(0, 63) |> Array.map(i =>
-    Int64.shift_right_logical(0x8000_0000_0000_0000L, i)
-  ),
-  [
-    -9223372036854775808L,
-    4611686018427387904L,
-    2305843009213693952L,
-    1152921504606846976L,
-    576460752303423488L,
-    288230376151711744L,
-    144115188075855872L,
-    72057594037927936L,
-    36028797018963968L,
-    18014398509481984L,
-    9007199254740992L,
-    4503599627370496L,
-    2251799813685248L,
-    1125899906842624L,
-    562949953421312L,
-    281474976710656L,
-    140737488355328L,
-    70368744177664L,
-    35184372088832L,
-    17592186044416L,
-    8796093022208L,
-    4398046511104L,
-    2199023255552L,
-    1099511627776L,
-    549755813888L,
-    274877906944L,
-    137438953472L,
-    68719476736L,
-    34359738368L,
-    17179869184L,
-    8589934592L,
-    4294967296L,
-    2147483648L,
-    1073741824L,
-    536870912L,
-    268435456L,
-    134217728L,
-    67108864L,
-    33554432L,
-    16777216L,
-    8388608L,
-    4194304L,
-    2097152L,
-    1048576L,
-    524288L,
-    262144L,
-    131072L,
-    65536L,
-    32768L,
-    16384L,
-    8192L,
-    4096L,
-    2048L,
-    1024L,
-    512L,
-    256L,
-    128L,
-    64L,
-    32L,
-    16L,
-    8L,
-    4L,
-    2L,
-    1L,
-  ],
-)
-let rec fib = (n, a, b) =>
-  if n == 0 {
-    a
-  } else {
-    fib(n - 1, b, Int64.add(a, b))
-  }
-let rec fac = (n, acc) =>
-  if n == 0 {
-    acc
-  } else {
-    fac(n - 1, Int64.mul(acc, Int64.of_int(n)))
-  }
-let suites: Mt.pair_suites = /* "shift_right",(fun _ ->
-        Eq(Nativeint.shift_right_logical 0xffff_ffffn 0, 0xffff_ffffn)
-      ); */
-
-\"@"(
-  {
-    open Mt
-    list{
-      ("add_one", _ => Eq(v, 2147483648L)),
-      (
-        "add_2",
-        _ => Eq(
-          4294967294L,
-          {
-            open Int64
-            add(a, a)
-          },
-        ),
-      ),
-      (
-        "add_3",
-        _ => Eq(
-          0L,
-          {
-            open Int64
-            add(0L, 0L)
-          },
-        ),
-      ),
-      ("add_4", _ => commutative_add(-2L, -3L, 1L)),
-      ("add_5", _ => commutative_add(-3L, -3L, 0L)),
-      ("add_6", _ => commutative_add(4L, -3L, 7L)),
-      ("add_7", _ => commutative_add(0x100000000L, 0x80000000L, 0x80000000L)),
-      ("add_8", _ => commutative_add(0x100000000L, 0xffffffffL, 1L)),
-      ("add_9", _ => commutative_add(0xffffffffL, 0x80000000L, 0x7fffffffL)),
-      ("add_10", _ => commutative_add(0x80000000L, 0x80000000L, 0L)),
-      ("add_11", _ => commutative_add(0xffffffffL, 0xffffffffL, 0L)),
-      ("to_int32", _ => Eq(3l, Int64.to_int32(3L))),
-      ("to_int", _ => Eq(3, Int64.to_int(3L))),
-      ("of_int", _ => Eq(3L, Int64.of_int(3))),
-      ("lognot", _ => Eq(-3L, Int64.lognot(2L))),
-      ("neg", _ => Eq(-2L, Int64.neg(2L))),
-      (__LOC__, _ => Eq(Int64.min_int, Int64.neg(Int64.min_int))),
-      (
-        __LOC__,
-        _ => Eq(
-          Int64.max_int,
-          Int64.neg({
-            open Int64
-            add(min_int, 1L)
-          }),
-        ),
-      ),
-      (
-        "sub1",
-        _ => Eq(
-          2L,
-          {
-            open Int64
-            sub(3L, 1L)
-          },
-        ),
-      ),
-      (
-        "xor1",
-        _ => Eq(
-          (logxor(0xEEFFEEFFL, 0xFFEEFFEEL), logxor(a, 0xEEFFEEFFL)),
-          (286331153L, 2432700672L),
-        ),
-      ),
-      ("or", _ => Eq(logor(0xEEFFEEFFL, 0xFFEEFFEEL), 4294967295L)),
-      ("and", _ => Eq(logand(0xEEFFEEFFL, 0xFFEEFFEEL), 4008636142L)),
-      (
-        "lsl",
-        _ => Eq(
-          Array.init(64, i => i) |> Array.map(x => shift_left(1L, x)),
-          [
-            1L,
-            2L,
-            4L,
-            8L,
-            16L,
-            32L,
-            64L,
-            128L,
-            256L,
-            512L,
-            1024L,
-            2048L,
-            4096L,
-            8192L,
-            16384L,
-            32768L,
-            65536L,
-            131072L,
-            262144L,
-            524288L,
-            1048576L,
-            2097152L,
-            4194304L,
-            8388608L,
-            16777216L,
-            33554432L,
-            67108864L,
-            134217728L,
-            268435456L,
-            536870912L,
-            1073741824L,
-            2147483648L,
-            4294967296L,
-            8589934592L,
-            17179869184L,
-            34359738368L,
-            68719476736L,
-            137438953472L,
-            274877906944L,
-            549755813888L,
-            1099511627776L,
-            2199023255552L,
-            4398046511104L,
-            8796093022208L,
-            17592186044416L,
-            35184372088832L,
-            70368744177664L,
-            140737488355328L,
-            281474976710656L,
-            562949953421312L,
-            1125899906842624L,
-            2251799813685248L,
-            4503599627370496L,
-            9007199254740992L,
-            18014398509481984L,
-            36028797018963968L,
-            72057594037927936L,
-            144115188075855872L,
-            288230376151711744L,
-            576460752303423488L,
-            1152921504606846976L,
-            2305843009213693952L,
-            4611686018427387904L,
-            -9223372036854775808L,
-          ],
-        ),
-      ),
-      (
-        "lsr",
-        _ => Eq(
-          Array.init(64, i => i) |> Array.map(x => shift_right_logical(-1L, x)),
-          [
-            -1L,
-            9223372036854775807L,
-            4611686018427387903L,
-            2305843009213693951L,
-            1152921504606846975L,
-            576460752303423487L,
-            288230376151711743L,
-            144115188075855871L,
-            72057594037927935L,
-            36028797018963967L,
-            18014398509481983L,
-            9007199254740991L,
-            4503599627370495L,
-            2251799813685247L,
-            1125899906842623L,
-            562949953421311L,
-            281474976710655L,
-            140737488355327L,
-            70368744177663L,
-            35184372088831L,
-            17592186044415L,
-            8796093022207L,
-            4398046511103L,
-            2199023255551L,
-            1099511627775L,
-            549755813887L,
-            274877906943L,
-            137438953471L,
-            68719476735L,
-            34359738367L,
-            17179869183L,
-            8589934591L,
-            4294967295L,
-            2147483647L,
-            1073741823L,
-            536870911L,
-            268435455L,
-            134217727L,
-            67108863L,
-            33554431L,
-            16777215L,
-            8388607L,
-            4194303L,
-            2097151L,
-            1048575L,
-            524287L,
-            262143L,
-            131071L,
-            65535L,
-            32767L,
-            16383L,
-            8191L,
-            4095L,
-            2047L,
-            1023L,
-            511L,
-            255L,
-            127L,
-            63L,
-            31L,
-            15L,
-            7L,
-            3L,
-            1L,
-          ],
-        ),
-      ),
-      (
-        "asr",
-        _ => Eq(
-          Array.init(64, i => i) |> Array.map(x => shift_right(-1L, x)),
-          [
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-            -1L,
-          ],
-        ),
-      ),
-      ("mul simple", _ => Eq(6L, mul(3L, 2L))),
-      ("of_int32", _ => Eq(Array.map(Int64.of_int32, [0l, -2147483648l]), [0L, -2147483648L])),
-      ("of_int32_singleton", _ => Eq(Int64.of_int32(-3l), -3L)),
-      (__LOC__, _ => Eq(Int64.of_int32(3l), 3L)),
-      (
-        "to_int32",
-        _ => Eq(Array.map(Int64.to_int32, [0L, 0x0000_0000_8000_0000L]), [0l, -2147483648l]),
-      ),
-      ("discard_sign", _ => Eq(Caml_int64.discard_sign(-1L), 0x7fff_ffff_ffff_ffffL)),
-      ("div_mod", _ => Eq(Caml_int64.div_mod(7L, 3L), (2L, 1L))),
-      ("to_hex", _ => Eq(Caml_int64.to_hex(-1L), "ffffffffffffffff")),
-      (
-        "generic_compare",
-        _ => Eq(generic_compare(0x0000_0001_0000_0000L, 0x0000_0000_0000_0001L) > 0, true),
-      ),
-      (
-        "test_compier_literal",
-        _ => Eq(
-          0x0000_0000_ffff_ffffL,
-          Int64.add(Int64.add(0x0000_0000_7fff_ffffL, 0x0000_0000_7fff_ffffL), 1L),
-        ),
-      ),
-      (
-        "generic_compare2",
-        _ => Eq(generic_compare(0x0000_0000_8000_0000L, 0x0000_0000_0000_0001L) > 0, true),
-      ),
-      ("shift_left", _ => Eq(Int64.shift_left(0x00ff_ffffL, 8), 0xffff_ff00L)),
-      ("fib_int64", _ => Eq(fib(1000, 1L, 2L), -8549408682174725832L)),
-      ("fac_int64", _ => Eq(fac(30, 1L), -8764578968847253504L)),
-      (
-        __LOC__,
-        _ => Eq(
-          {
-            open Int64
-            add(max_int, max_int)
-          },
-          -2L,
-        ),
-      ),
-      (
-        __LOC__,
-        _ => Eq(
-          {
-            open Int64
-            add(min_int, min_int)
-          },
-          0L,
-        ),
-      ),
-      (
-        __LOC__,
-        _ => Eq(
-          {
-            open Int64
-            add(0x1111_1111_1111_1111L, 0xeeee_eeee_eeee_eeeeL)
-          },
-          -1L,
-        ),
-      ),
-    }
-  },
-  \"@"(
-    {
-      let (a, b) = shift_left_tests
-      Ext_array_test.map2i(
-        (i, a, b) => ("shift_left_cases " ++ __unsafe_cast(i), _ => Mt.Eq(a, b)),
-        a,
-        b,
-      ) |> Array.to_list
-    },
-    \"@"(
-      {
-        let (a, b) = shift_right_tests
-        Ext_array_test.map2i(
-          (i, a, b) => ("shift_right_cases " ++ __unsafe_cast(i), _ => Mt.Eq(a, b)),
-          a,
-          b,
-        ) |> Array.to_list
-      },
-      {
-        let (a, b) = shift_right_logical_suites
-        Ext_array_test.map2i(
-          (i, a, b) => ("shift_right_logical_cases " ++ __unsafe_cast(i), _ => Mt.Eq(a, b)),
-          a,
-          b,
-        ) |> Array.to_list
-      },
-    ),
-  ),
-)
-
-let suites = ref(suites)
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let id = (loc, x: int64) => {
-  /* This is not a round trip, since NaN is not distinguishable in JS */
-  let float_value = Int64.float_of_bits(x)
-  switch classify_float(float_value) {
-  | FP_nan => ()
-  | _ => eq(loc, Int64.bits_of_float(float_value), x)
-  }
-}
-
-let () = {
-  open Int64
-  eq(__LOC__, Int64.bits_of_float(0.3), 4599075939470750515L)
-  eq(__LOC__, Int64.float_of_bits(4599075939470750515L), 0.3)
-  id(__LOC__, -1L)
-  id(__LOC__, -100L)
-  id(__LOC__, 0xff_ff_ff_ffL)
-  id(__LOC__, 0x1f_ff_ff_ffL)
-  id(__LOC__, 0x1f_ff_fe_ffL)
-  eq(
-    __LOC__,
-    {
-      open Int64
-      div(min_int, 10L)
-    },
-    -922337203685477580L,
-  )
-  eq(
-    __LOC__,
-    {
-      open Int64
-      to_string(div(min_int, 10L))
-    },
-    "-922337203685477580",
-  )
-  eq(
-    __LOC__,
-    {
-      open Int64
-      mul(min_int, 10L)
-    },
-    0L,
-  )
-  eq(
-    __LOC__,
-    {
-      open Int64
-      mul(10L, min_int)
-    },
-    0L,
-  )
-  eq(
-    __LOC__,
-    {
-      open Int64
-      mul(1L, min_int)
-    },
-    min_int,
-  )
-  eq(
-    __LOC__,
-    {
-      open Int64
-      mul(max_int, 10L)
-    },
-    -10L,
-  )
-  eq(
-    __LOC__,
-    {
-      open Int64
-      succ(max_int)
-    },
-    min_int,
-  )
-  eq(
-    __LOC__,
-    {
-      open Int64
-      succ(min_int)
-    },
-    -9223372036854775807L,
-  )
-  eq(__LOC__, succ(0xffff_ffffL), 0x1_0000_0000L)
-}
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/int_hashtbl_test.js b/jscomp/test/int_hashtbl_test.js
deleted file mode 100644
index 387d8c4..0000000
--- a/jscomp/test/int_hashtbl_test.js
+++ /dev/null
@@ -1,114 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Hashtbl = require("../../lib/js/hashtbl.js");
-
-function f(H) {
-  var tbl = Curry._1(H.create, 17);
-  Curry._3(H.add, tbl, 1, /* '1' */49);
-  Curry._3(H.add, tbl, 2, /* '2' */50);
-  return List.sort((function (param, param$1) {
-                return Caml.int_compare(param[0], param$1[0]);
-              }), Curry._3(H.fold, (function (k, v, acc) {
-                    return {
-                            hd: [
-                              k,
-                              v
-                            ],
-                            tl: acc
-                          };
-                  }), tbl, /* [] */0));
-}
-
-function g(H, count) {
-  var tbl = Curry._1(H.create, 17);
-  for(var i = 0; i <= count; ++i){
-    Curry._3(H.replace, tbl, (i << 1), String(i));
-  }
-  for(var i$1 = 0; i$1 <= count; ++i$1){
-    Curry._3(H.replace, tbl, (i$1 << 1), String(i$1));
-  }
-  var v = Curry._3(H.fold, (function (k, v, acc) {
-          return {
-                  hd: [
-                    k,
-                    v
-                  ],
-                  tl: acc
-                };
-        }), tbl, /* [] */0);
-  return $$Array.of_list(List.sort((function (param, param$1) {
-                    return Caml.int_compare(param[0], param$1[0]);
-                  }), v));
-}
-
-var hash = Hashtbl.hash;
-
-function equal(x, y) {
-  return x === y;
-}
-
-var Int_hash = Hashtbl.Make({
-      equal: equal,
-      hash: hash
-    });
-
-var suites_0 = [
-  "simple",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: {
-                hd: [
-                  1,
-                  /* '1' */49
-                ],
-                tl: {
-                  hd: [
-                    2,
-                    /* '2' */50
-                  ],
-                  tl: /* [] */0
-                }
-              },
-              _1: f(Int_hash)
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "more_iterations",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: $$Array.init(1001, (function (i) {
-                        return [
-                                (i << 1),
-                                String(i)
-                              ];
-                      })),
-                _1: g(Int_hash, 1000)
-              };
-      })
-  ],
-  tl: /* [] */0
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Int_hashtbl_test", suites);
-
-exports.f = f;
-exports.g = g;
-exports.Int_hash = Int_hash;
-exports.suites = suites;
-/* Int_hash Not a pure module */
diff --git a/jscomp/test/int_hashtbl_test.res b/jscomp/test/int_hashtbl_test.res
deleted file mode 100644
index cfaf7e4..0000000
--- a/jscomp/test/int_hashtbl_test.res
+++ /dev/null
@@ -1,54 +0,0 @@
-open Hashtbl
-
-module type S = Hashtbl.S with type key = int
-
-/*
-let to_list (module H : S) (tbl : 'a H.t) = 
-  H.fold (fun k v acc -> (k,v)::acc) tbl []
-*/
-
-let f = (module(H: Hashtbl.S with type key = int)) => {
-  /* let module Hashtbl = (val Hashtbl) in */
-  let tbl = H.create(17)
-  H.add(tbl, 1, '1')
-  H.add(tbl, 2, '2')
-  \"@@"(
-    List.sort(((a: int, _), (b, _)) => compare(a, b)),
-    H.fold((k, v, acc) => list{(k, v), ...acc}, tbl, list{}),
-  )
-}
-
-let g = (module(H: S), count) => {
-  let tbl = H.create(17)
-  for i in 0 to count {
-    H.replace(tbl, i * 2, string_of_int(i))
-  }
-  for i in 0 to count {
-    H.replace(tbl, i * 2, string_of_int(i))
-  }
-  let v = H.fold((k, v, acc) => list{(k, v), ...acc}, tbl, list{})
-  let v = \"@@"(List.sort(((x, _), (y: int, _)) => compare(x, y)), v)
-  Array.of_list(v)
-}
-
-module Int_hash = Hashtbl.Make({
-  type t = int
-  let hash = x => Hashtbl.hash(x)
-  let equal = (x: int, y) => x == y
-})
-
-let suites = {
-  open Mt
-  list{
-    ("simple", _ => Eq(list{(1, '1'), (2, '2')}, f(module(Int_hash)))),
-    (
-      "more_iterations",
-      _ => {
-        let count = 1000
-        Eq(Array.init(count + 1, i => (2 * i, string_of_int(i))), g(module(Int_hash), count))
-      },
-    ),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/int_map.js b/jscomp/test/int_map.js
deleted file mode 100644
index 1b72bbb..0000000
--- a/jscomp/test/int_map.js
+++ /dev/null
@@ -1,994 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function singleton(x, d) {
-  return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          d: d,
-          r: "Empty",
-          h: 1
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function is_empty(param) {
-  if (typeof param !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function add(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = add(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function find(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml.int_compare(x, param.v);
-    if (c === 0) {
-      return param.d;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function find_first(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_first_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_last(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_last_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_opt(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var c = Caml.int_compare(x, param.v);
-    if (c === 0) {
-      return Caml_option.some(param.d);
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function mem(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    var c = Caml.int_compare(x, param.v);
-    if (c === 0) {
-      return true;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function min_binding(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function min_binding_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function max_binding(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function max_binding_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function remove_min_binding(param) {
-  if (typeof param !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.remove_min_elt",
-          Error: new Error()
-        };
-  }
-  var l = param.l;
-  if (typeof l !== "object") {
-    return param.r;
-  } else {
-    return bal(remove_min_binding(l), param.v, param.d, param.r);
-  }
-}
-
-function merge(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  }
-  if (typeof t2 !== "object") {
-    return t1;
-  }
-  var match = min_binding(t2);
-  return bal(t1, match[0], match[1], remove_min_binding(t2));
-}
-
-function remove(x, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    return merge(l, r);
-  }
-  if (c < 0) {
-    var ll = remove(x, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = remove(x, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function update(x, f, param) {
-  if (typeof param !== "object") {
-    var data = Curry._1(f, undefined);
-    if (data !== undefined) {
-      return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: "Empty",
-              h: 1
-            };
-    } else {
-      return "Empty";
-    }
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    var data$1 = Curry._1(f, Caml_option.some(d));
-    if (data$1 === undefined) {
-      return merge(l, r);
-    }
-    var data$2 = Caml_option.valFromOption(data$1);
-    if (d === data$2) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = update(x, f, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = update(x, f, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function iter(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    iter(f, param.l);
-    Curry._2(f, param.v, param.d);
-    _param = param.r;
-    continue ;
-  };
-}
-
-function map(f, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var l$p = map(f, param.l);
-  var d$p = Curry._1(f, param.d);
-  var r$p = map(f, param.r);
-  return {
-          TAG: "Node",
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
-}
-
-function mapi(f, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var v = param.v;
-  var l$p = mapi(f, param.l);
-  var d$p = Curry._2(f, v, param.d);
-  var r$p = mapi(f, param.r);
-  return {
-          TAG: "Node",
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
-}
-
-function fold(f, _m, _accu) {
-  while(true) {
-    var accu = _accu;
-    var m = _m;
-    if (typeof m !== "object") {
-      return accu;
-    }
-    _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu));
-    _m = m.r;
-    continue ;
-  };
-}
-
-function for_all(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return true;
-    }
-    if (!Curry._2(p, param.v, param.d)) {
-      return false;
-    }
-    if (!for_all(p, param.l)) {
-      return false;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function exists(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    if (Curry._2(p, param.v, param.d)) {
-      return true;
-    }
-    if (exists(p, param.l)) {
-      return true;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function add_min_binding(k, x, param) {
-  if (typeof param !== "object") {
-    return singleton(k, x);
-  } else {
-    return bal(add_min_binding(k, x, param.l), param.v, param.d, param.r);
-  }
-}
-
-function add_max_binding(k, x, param) {
-  if (typeof param !== "object") {
-    return singleton(k, x);
-  } else {
-    return bal(param.l, param.v, param.d, add_max_binding(k, x, param.r));
-  }
-}
-
-function join(l, v, d, r) {
-  if (typeof l !== "object") {
-    return add_min_binding(v, d, r);
-  }
-  var lh = l.h;
-  if (typeof r !== "object") {
-    return add_max_binding(v, d, l);
-  }
-  var rh = r.h;
-  if (lh > (rh + 2 | 0)) {
-    return bal(l.l, l.v, l.d, join(l.r, v, d, r));
-  } else if (rh > (lh + 2 | 0)) {
-    return bal(join(l, v, d, r.l), r.v, r.d, r.r);
-  } else {
-    return create(l, v, d, r);
-  }
-}
-
-function concat(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  }
-  if (typeof t2 !== "object") {
-    return t1;
-  }
-  var match = min_binding(t2);
-  return join(t1, match[0], match[1], remove_min_binding(t2));
-}
-
-function concat_or_join(t1, v, d, t2) {
-  if (d !== undefined) {
-    return join(t1, v, Caml_option.valFromOption(d), t2);
-  } else {
-    return concat(t1, t2);
-  }
-}
-
-function split(x, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            undefined,
-            "Empty"
-          ];
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
-  }
-  if (c < 0) {
-    var match = split(x, l);
-    return [
-            match[0],
-            match[1],
-            join(match[2], v, d, r)
-          ];
-  }
-  var match$1 = split(x, r);
-  return [
-          join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
-}
-
-function merge$1(f, s1, s2) {
-  if (typeof s1 !== "object") {
-    if (typeof s2 !== "object") {
-      return "Empty";
-    }
-    
-  } else {
-    var v1 = s1.v;
-    if (s1.h >= height(s2)) {
-      var match = split(v1, s2);
-      return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2]));
-    }
-    
-  }
-  if (typeof s2 !== "object") {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "map.res",
-            552,
-            11
-          ],
-          Error: new Error()
-        };
-  }
-  var v2 = s2.v;
-  var match$1 = split(v2, s1);
-  return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r));
-}
-
-function union(f, s1, s2) {
-  if (typeof s1 !== "object") {
-    return s2;
-  }
-  var d1 = s1.d;
-  var v1 = s1.v;
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var d2 = s2.d;
-  var v2 = s2.v;
-  if (s1.h >= s2.h) {
-    var match = split(v1, s2);
-    var d2$1 = match[1];
-    var l = union(f, s1.l, match[0]);
-    var r = union(f, s1.r, match[2]);
-    if (d2$1 !== undefined) {
-      return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r);
-    } else {
-      return join(l, v1, d1, r);
-    }
-  }
-  var match$1 = split(v2, s1);
-  var d1$1 = match$1[1];
-  var l$1 = union(f, match$1[0], s2.l);
-  var r$1 = union(f, match$1[2], s2.r);
-  if (d1$1 !== undefined) {
-    return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1);
-  } else {
-    return join(l$1, v2, d2, r$1);
-  }
-}
-
-function filter(p, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var l$p = filter(p, l);
-  var pvd = Curry._2(p, v, d);
-  var r$p = filter(p, r);
-  if (pvd) {
-    if (l === l$p && r === r$p) {
-      return param;
-    } else {
-      return join(l$p, v, d, r$p);
-    }
-  } else {
-    return concat(l$p, r$p);
-  }
-}
-
-function partition(p, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            "Empty"
-          ];
-  }
-  var d = param.d;
-  var v = param.v;
-  var match = partition(p, param.l);
-  var lf = match[1];
-  var lt = match[0];
-  var pvd = Curry._2(p, v, d);
-  var match$1 = partition(p, param.r);
-  var rf = match$1[1];
-  var rt = match$1[0];
-  if (pvd) {
-    return [
-            join(lt, v, d, rt),
-            concat(lf, rf)
-          ];
-  } else {
-    return [
-            concat(lt, rt),
-            join(lf, v, d, rf)
-          ];
-  }
-}
-
-function cons_enum(_m, _e) {
-  while(true) {
-    var e = _e;
-    var m = _m;
-    if (typeof m !== "object") {
-      return e;
-    }
-    _e = {
-      TAG: "More",
-      _0: m.v,
-      _1: m.d,
-      _2: m.r,
-      _3: e
-    };
-    _m = m.l;
-    continue ;
-  };
-}
-
-function compare(cmp, m1, m2) {
-  var _e1 = cons_enum(m1, "End");
-  var _e2 = cons_enum(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return 0;
-      } else {
-        return -1;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return 1;
-    }
-    var c = Caml.int_compare(e1._0, e2._0);
-    if (c !== 0) {
-      return c;
-    }
-    var c$1 = Curry._2(cmp, e1._1, e2._1);
-    if (c$1 !== 0) {
-      return c$1;
-    }
-    _e2 = cons_enum(e2._2, e2._3);
-    _e1 = cons_enum(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function equal(cmp, m1, m2) {
-  var _e1 = cons_enum(m1, "End");
-  var _e2 = cons_enum(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return true;
-      } else {
-        return false;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return false;
-    }
-    if (e1._0 !== e2._0) {
-      return false;
-    }
-    if (!Curry._2(cmp, e1._1, e2._1)) {
-      return false;
-    }
-    _e2 = cons_enum(e2._2, e2._3);
-    _e1 = cons_enum(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function cardinal(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0;
-  }
-}
-
-function bindings_aux(_accu, _param) {
-  while(true) {
-    var param = _param;
-    var accu = _accu;
-    if (typeof param !== "object") {
-      return accu;
-    }
-    _param = param.l;
-    _accu = {
-      hd: [
-        param.v,
-        param.d
-      ],
-      tl: bindings_aux(accu, param.r)
-    };
-    continue ;
-  };
-}
-
-function bindings(s) {
-  return bindings_aux(/* [] */0, s);
-}
-
-var empty = "Empty";
-
-var choose = min_binding;
-
-var choose_opt = min_binding_opt;
-
-exports.empty = empty;
-exports.is_empty = is_empty;
-exports.mem = mem;
-exports.add = add;
-exports.update = update;
-exports.singleton = singleton;
-exports.remove = remove;
-exports.merge = merge$1;
-exports.union = union;
-exports.compare = compare;
-exports.equal = equal;
-exports.iter = iter;
-exports.fold = fold;
-exports.for_all = for_all;
-exports.exists = exists;
-exports.filter = filter;
-exports.partition = partition;
-exports.cardinal = cardinal;
-exports.bindings = bindings;
-exports.min_binding = min_binding;
-exports.min_binding_opt = min_binding_opt;
-exports.max_binding = max_binding;
-exports.max_binding_opt = max_binding_opt;
-exports.choose = choose;
-exports.choose_opt = choose_opt;
-exports.split = split;
-exports.find = find;
-exports.find_opt = find_opt;
-exports.find_first = find_first;
-exports.find_first_opt = find_first_opt;
-exports.find_last = find_last;
-exports.find_last_opt = find_last_opt;
-exports.map = map;
-exports.mapi = mapi;
-/* No side effect */
diff --git a/jscomp/test/int_map.res b/jscomp/test/int_map.res
deleted file mode 100644
index 223b479..0000000
--- a/jscomp/test/int_map.res
+++ /dev/null
@@ -1,4 +0,0 @@
-include Map.Make({
-  type t = int
-  let compare = (x: int, y) => compare(x, y)
-})
diff --git a/jscomp/test/int_overflow_test.js b/jscomp/test/int_overflow_test.js
deleted file mode 100644
index cdf9770..0000000
--- a/jscomp/test/int_overflow_test.js
+++ /dev/null
@@ -1,214 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Int32 = require("../../lib/js/int32.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-
-function hash_variant(s) {
-  var accu = 0;
-  for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){
-    accu = Math.imul(223, accu) + Caml_string.get(s, i) & 2147483647;
-  }
-  if (accu > 1073741823) {
-    return accu - -2147483648 | 0;
-  } else {
-    return accu;
-  }
-}
-
-function hash_variant2(s) {
-  var accu = 0;
-  for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){
-    accu = Math.imul(223, accu) + Caml_string.get(s, i) | 0;
-  }
-  accu = accu & 2147483647;
-  if (accu > 1073741823) {
-    return accu - -2147483648 | 0;
-  } else {
-    return accu;
-  }
-}
-
-function fib(x) {
-  if (x === 0 || x === 1) {
-    return 1;
-  } else {
-    return fib(x - 1 | 0) + fib(x - 2 | 0) | 0;
-  }
-}
-
-Mt.from_pair_suites("Int_overflow_test", {
-      hd: [
-        "plus_overflow",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: (Int32.max_int + 1 | 0) === Int32.min_int
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "minus_overflow",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: (Int32.min_int - Int32.one | 0) === Int32.max_int
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "flow_again",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: 2147483646,
-                        _1: (Int32.max_int + Int32.max_int | 0) + Int32.min_int | 0
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "flow_again",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: -2,
-                          _1: Int32.max_int + Int32.max_int | 0
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "hash_test",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: hash_variant("xxyyzzuuxxzzyy00112233"),
-                            _1: 544087776
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "hash_test2",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: hash_variant("xxyyzxzzyy"),
-                              _1: -449896130
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "File \"int_overflow_test.res\", line 88, characters 5-12",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: hash_variant2("xxyyzzuuxxzzyy00112233"),
-                                _1: 544087776
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "File \"int_overflow_test.res\", line 89, characters 5-12",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: hash_variant2("xxyyzxzzyy"),
-                                  _1: -449896130
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "int_literal_flow",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: -1,
-                                    _1: -1
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "int_literal_flow2",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: -1,
-                                      _1: -1
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "int_literal_flow3",
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: -1,
-                                        _1: -1
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "int32_mul",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: -33554431,
-                                          _1: -33554431
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "File \"int_overflow_test.res\", line 94, characters 5-12",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: Number("3") | 0,
-                                            _1: 3
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "File \"int_overflow_test.res\", line 96, characters 5-12",
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: Number("3.2") | 0,
-                                              _1: 3
-                                            };
-                                    })
-                                ],
-                                tl: /* [] */0
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    });
-
-exports.hash_variant = hash_variant;
-exports.hash_variant2 = hash_variant2;
-exports.fib = fib;
-/*  Not a pure module */
diff --git a/jscomp/test/int_overflow_test.res b/jscomp/test/int_overflow_test.res
deleted file mode 100644
index 598e060..0000000
--- a/jscomp/test/int_overflow_test.res
+++ /dev/null
@@ -1,98 +0,0 @@
-@@warning("-107")
-let hash_variant = s => {
-  let accu = ref(0)
-  for i in 0 to String.length(s) - 1 {
-    accu := land(223 * accu.contents + Char.code(String.get(s, i)), lsl(1, 31) - 1)
-    /* Here accu is 31 bits, times 223 will not be than 53 bits..
-       TODO: we can use `Sys.backend_type` for patching
- */
-  }
-
-  /* reduce to 31 bits */
-  /* accu := !accu land (1 lsl 31 - 1); */
-  /* make it signed for 64 bits architectures */
-  if accu.contents > 0x3FFFFFFF {
-    lor(accu.contents - lsl(1, 31), 0)
-  } else {
-    accu.contents
-  }
-}
-
-let hash_variant2 = s => {
-  let accu = ref(0)
-  for i in 0 to String.length(s) - 1 {
-    accu := 223 * accu.contents + Char.code(String.get(s, i))
-  }
-  /* reduce to 31 bits */
-  accu := land(accu.contents, lsl(1, 31) - 1)
-
-  /* make it signed for 64 bits architectures */
-  if accu.contents > 0x3FFFFFFF {
-    accu.contents - lsl(1, 31)
-  } else {
-    accu.contents
-  }
-}
-
-let rec fib = x =>
-  switch x {
-  | 0l | 1l => 1l
-  | n => Int32.add(fib(Int32.sub(n, 1l)), fib(Int32.sub(n, 2l)))
-  }
-
-Mt.from_pair_suites(
-  __MODULE__,
-  list{
-    (
-      "plus_overflow",
-      _ => Eq(
-        true,
-        {
-          open Int32
-          add(max_int, 1l)
-        } == Int32.min_int,
-      ),
-    ),
-    (
-      "minus_overflow",
-      _ => Eq(
-        true,
-        {
-          open Int32
-          sub(min_int, one)
-        } == Int32.max_int,
-      ),
-    ),
-    (
-      "flow_again",
-      _ => Eq(
-        2147483646l,
-        {
-          open Int32
-          add(add(max_int, max_int), min_int)
-        },
-      ),
-    ),
-    (
-      "flow_again",
-      _ => Eq(
-        -2l,
-        {
-          open Int32
-          add(max_int, max_int)
-        },
-      ),
-    ),
-    ("hash_test", _ => Eq(hash_variant("xxyyzzuuxxzzyy00112233"), 544087776)),
-    ("hash_test2", _ => Eq(hash_variant("xxyyzxzzyy"), -449896130)),
-    (__LOC__, _ => Eq(hash_variant2("xxyyzzuuxxzzyy00112233"), 544087776)),
-    (__LOC__, _ => Eq(hash_variant2("xxyyzxzzyy"), -449896130)),
-    ("int_literal_flow", _ => Eq(-1, 0xffffffff)),
-    ("int_literal_flow2", _ => Eq(-1l, Int32.of_int(0xffffffff))),
-    ("int_literal_flow3", _ => Eq(-1l, Int32.of_int(0xfffffffff))),
-    ("int32_mul", _ => Eq(-33554431l, Int32.mul(0xffffffl, 0xffffffl))),
-    (__LOC__, _ => Eq(\"@@"(int_of_float, Js.Float.fromString("3")), 3)),
-    /* FIXME */
-    (__LOC__, _ => Eq(\"@@"(int_of_float, Js.Float.fromString("3.2")), 3)),
-  },
-)
diff --git a/jscomp/test/int_poly_var.js b/jscomp/test/int_poly_var.js
deleted file mode 100644
index 80818b0..0000000
--- a/jscomp/test/int_poly_var.js
+++ /dev/null
@@ -1,199 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var test_id = {
-  contents: 0
-};
-
-var suites = {
-  contents: /* [] */0
-};
-
-function nest(x) {
-  if (x.TAG === "A") {
-    var match = x._0;
-    if (match === 0) {
-      return 0;
-    } else if (match === 1) {
-      return 1;
-    } else {
-      return 2;
-    }
-  }
-  var match$1 = x._0;
-  if (x._1 !== 0) {
-    if (match$1 === 1) {
-      return 4;
-    } else if (match$1 === 2) {
-      return 5;
-    } else {
-      return 6;
-    }
-  } else {
-    return 3;
-  }
-}
-
-function f2(x, b) {
-  if (x === 1) {
-    return b;
-  } else if (x === 2) {
-    return 0;
-  } else if (x === "c") {
-    return 33;
-  } else {
-    return 3;
-  }
-}
-
-function f3(x, b) {
-  if (typeof x !== "object") {
-    return 3;
-  }
-  var variant = x.NAME;
-  if (variant === 32) {
-    return x.VAL[0];
-  } else if (variant === 333) {
-    return x.VAL[1];
-  } else {
-    return x.VAL;
-  }
-}
-
-function h(x) {
-  return x === 0;
-}
-
-var hihi = f3(3, 0);
-
-var hh10 = "3" === 3;
-
-var tuple_0 = nest({
-      TAG: "A",
-      _0: 0
-    });
-
-var tuple_1 = nest({
-      TAG: "A",
-      _0: 1
-    });
-
-var tuple_2 = nest({
-      TAG: "A",
-      _0: 2
-    });
-
-var tuple_3 = nest({
-      TAG: "B",
-      _0: 1,
-      _1: 0
-    });
-
-var tuple_4 = nest({
-      TAG: "B",
-      _0: 1,
-      _1: 1
-    });
-
-var tuple_5 = nest({
-      TAG: "B",
-      _0: 2,
-      _1: 1
-    });
-
-var tuple_6 = nest({
-      TAG: "B",
-      _0: 2,
-      _1: 2
-    });
-
-var tuple_7 = nest({
-      TAG: "B",
-      _0: 0,
-      _1: 0
-    });
-
-var tuple_8 = nest({
-      TAG: "B",
-      _0: 0,
-      _1: 1
-    });
-
-var tuple = [
-  tuple_0,
-  tuple_1,
-  tuple_2,
-  tuple_3,
-  tuple_4,
-  tuple_5,
-  tuple_6,
-  tuple_7,
-  tuple_8,
-  true,
-  hh10
-];
-
-Mt.eq_suites(test_id, suites, "File \"int_poly_var.res\", line 79, characters 29-36", hihi, 3);
-
-Mt.eq_suites(test_id, suites, "File \"int_poly_var.res\", line 80, characters 29-36", tuple, [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      5,
-      3,
-      6,
-      true,
-      false
-    ]);
-
-function hh0(x) {
-  return x;
-}
-
-function hh1(x) {
-  return x;
-}
-
-function f(x) {
-  if (x.NAME === 1) {
-    return x.VAL;
-  } else {
-    return String(x.VAL);
-  }
-}
-
-Mt.from_pair_suites("int_poly_var.res", suites.contents);
-
-var eq_suites = Mt.eq_suites;
-
-var u = 1;
-
-var g = /* 'b' */98;
-
-var hh9 = true;
-
-var begin = 3;
-
-exports.eq_suites = eq_suites;
-exports.test_id = test_id;
-exports.suites = suites;
-exports.u = u;
-exports.nest = nest;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.h = h;
-exports.g = g;
-exports.hihi = hihi;
-exports.hh9 = hh9;
-exports.hh10 = hh10;
-exports.tuple = tuple;
-exports.begin = begin;
-exports.hh0 = hh0;
-exports.hh1 = hh1;
-exports.f = f;
-/* hihi Not a pure module */
diff --git a/jscomp/test/int_poly_var.res b/jscomp/test/int_poly_var.res
deleted file mode 100644
index 351fc0e..0000000
--- a/jscomp/test/int_poly_var.res
+++ /dev/null
@@ -1,101 +0,0 @@
-let {eq_suites} = module(Mt)
-let test_id = ref(0)
-let suites = ref(list{})
-let u = #1
-
-type t = [
-  | #0
-  | #1
-  | #2
-]
-type h =
-  | A(t)
-  | B(t, int)
-
-let nest = (x: h) => {
-  switch x {
-  | A(#0) => 0
-  | A(#1) => 1
-  | A(_) => 2
-  | B(_, 0) => 3
-  | B(#1, _) => 4
-  | B(#2, _) => 5
-  | B(#0, _) => 6
-  }
-}
-@inline
-let f = (x: t) => {
-  switch x {
-  | #0 => 'a'
-  | #1 => 'b'
-  | #2 => 'c'
-  }
-}
-
-let f2 = (x, b) => {
-  switch x {
-  | #0 => 3
-  | #1 => b
-  | #c => 33
-  | #2 => 0
-  }
-}
-
-// typeof x === "string"
-// is no longer correct
-// we should use !== "object"
-let f3 = (x, b) => {
-  switch x {
-  | #12(y) => y
-  | #23(z) => z
-  | #32(h, _) => h
-  | #3 => 3
-  | #333(_, h) => h
-  }
-}
-let h = x => x == #0
-
-let g = f(#1)
-
-let hihi = f3(#3, 0)
-
-let hh9 = 3 == Obj.magic(#3)
-let hh10 = "3" == Obj.magic(#3)
-let tuple = (
-  nest(A(#0)),
-  nest(A(#1)),
-  nest(A(#2)),
-  nest(B(#1, 0)),
-  nest(B(#1, 1)),
-  nest(B(#2, 1)),
-  nest(B(#2, 2)),
-  nest(B(#0, 0)),
-  nest(B(#0, 1)),
-  hh9,
-  hh10,
-)
-
-let begin = 3
-eq_suites(~test_id, ~suites, __LOC__, hihi, 3)
-eq_suites(~test_id, ~suites, __LOC__, tuple, (0, 1, 2, 3, 4, 5, 5, 3, 6, true, false))
-
-let hh0 = (x: list<t>) => (x :> list<int>)
-let hh1 = (x: list<[#a | #b]>) => (x :> list<string>)
-
-// let hh2 = ( x : [#a (int)]) => ( x :> string)
-// let hh2 = ( x : [#a (int)]) => ( x :> int)
-// let hh1 = ( x :  list< [< #a | #b ]>) => ( x :> list <string>)
-
-type t0 = [#a | #b]
-
-let f = (x: list<t0>) => (x :> list<Test2.U.H.t>)
-
-type u = [#0(int) | #1(string)]
-
-let f = (x: u) => {
-  switch x {
-  | #0(x) => string_of_int(x)
-  | #1(x) => x
-  }
-}
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/int_switch_test.js b/jscomp/test/int_switch_test.js
deleted file mode 100644
index a2b1c73..0000000
--- a/jscomp/test/int_switch_test.js
+++ /dev/null
@@ -1,95 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-function f(x) {
-  var match = Curry._1(x, undefined);
-  switch (match) {
-    case 1 :
-        return /* 'a' */97;
-    case 2 :
-        return /* 'b' */98;
-    case 3 :
-        return /* 'c' */99;
-    default:
-      return /* 'x' */120;
-  }
-}
-
-function f22(x) {
-  var match = Curry._1(x, undefined);
-  switch (match) {
-    case 1 :
-        return /* 'a' */97;
-    case 2 :
-        return /* 'b' */98;
-    case 3 :
-        return /* 'c' */99;
-    default:
-      return /* 'x' */120;
-  }
-}
-
-function f33(x) {
-  var match = Curry._1(x, undefined);
-  switch (match) {
-    case "A" :
-        return /* 'a' */97;
-    case "B" :
-        return /* 'b' */98;
-    case "C" :
-        return /* 'c' */99;
-    case "D" :
-        return /* 'x' */120;
-    
-  }
-}
-
-eq("File \"int_switch_test.res\", line 32, characters 3-10", f(function (param) {
-          return 1;
-        }), /* 'a' */97);
-
-eq("File \"int_switch_test.res\", line 33, characters 3-10", f(function (param) {
-          return 2;
-        }), /* 'b' */98);
-
-eq("File \"int_switch_test.res\", line 34, characters 3-10", f(function (param) {
-          return 3;
-        }), /* 'c' */99);
-
-eq("File \"int_switch_test.res\", line 35, characters 3-10", f(function (param) {
-          return 0;
-        }), /* 'x' */120);
-
-eq("File \"int_switch_test.res\", line 36, characters 3-10", f(function (param) {
-          return -1;
-        }), /* 'x' */120);
-
-Mt.from_pair_suites("Int_switch_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.f = f;
-exports.f22 = f22;
-exports.f33 = f33;
-/*  Not a pure module */
diff --git a/jscomp/test/int_switch_test.res b/jscomp/test/int_switch_test.res
deleted file mode 100644
index 0633dfc..0000000
--- a/jscomp/test/int_switch_test.res
+++ /dev/null
@@ -1,38 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(loc, x, y, ~test_id, ~suites)
-let b = (loc, x) => Mt.bool_suites(loc, x, ~test_id, ~suites)
-
-let f = x =>
-  switch x() {
-  | 1 => 'a'
-  | 2 => 'b'
-  | 3 => 'c'
-  | _ => 'x'
-  }
-
-type t = A | B | C | D
-
-let f22 = x =>
-  switch x() {
-  | 3 => 'c'
-  | 2 => 'b'
-  | 1 => 'a'
-  | _ => 'x'
-  }
-
-let f33 = x =>
-  switch x() {
-  | C => 'c'
-  | B => 'b'
-  | A => 'a'
-  | _ => 'x'
-  }
-
-eq(__LOC__, f(_ => 1), 'a')
-eq(__LOC__, f(_ => 2), 'b')
-eq(__LOC__, f(_ => 3), 'c')
-eq(__LOC__, f(_ => 0), 'x')
-eq(__LOC__, f(_ => -1), 'x')
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/internal_unused_test.js b/jscomp/test/internal_unused_test.js
deleted file mode 100644
index 9eb9f5a..0000000
--- a/jscomp/test/internal_unused_test.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-console.log(3);
-
-var A = /* @__PURE__ */Caml_exceptions.create("Internal_unused_test.P1.A");
-
-function f(param) {
-  throw {
-        RE_EXN_ID: A,
-        Error: new Error()
-      };
-}
-
-var c = 5;
-
-var h1 = 2;
-
-var h2 = h1 + 1 | 0;
-
-var h4 = 2;
-
-var h5 = h4 + 1 | 0;
-
-var b = 5;
-
-var N = {
-  b: b
-};
-
-console.log(h5);
-
-console.log(h2);
-
-console.log(c);
-
-console.log(3);
-
-function H($star) {
-  return {};
-}
-
-exports.f = f;
-exports.N = N;
-exports.H = H;
-/*  Not a pure module */
diff --git a/jscomp/test/internal_unused_test.res b/jscomp/test/internal_unused_test.res
deleted file mode 100644
index 172028f..0000000
--- a/jscomp/test/internal_unused_test.res
+++ /dev/null
@@ -1,64 +0,0 @@
-@@warning("A")
-@@warnerror("a")
-@internal.local
-module P0 = {
-  {
-    let a = 3
-    Js.log(a)
-    (a + 2)->ignore
-  }
-}
-open! P0
-
-@internal.local
-module P1 = {
-  exception A
-  let _a = 2
-}
-open! P1
-
-let f = () => raise(A)
-
-%%private(let b = 3)
-
-%%private(let c = b + 2)
-
-%%private(
-  let d = c
-  let f = d
-  let h = (. a, b) => a + b
-)
-
-%%private(let h0 = 1)
-
-%%private(let h1 = h0 + 1)
-
-%%private(let h2 = h1 + 1)
-
-%%private(
-  let h3 = 1
-  let h4 = h3 + 1
-  let h5 = h4 + 1
-)
-
-module N = {
-  %%private(let a = 3)
-  let b = a + 2
-}
-
-Js.log(h5)
-Js.log(h2)
-
-Js.log(f)
-
-Js.log(h(. 1, 2))
-
-/* module%private X  = Arg
- type x = X.spec */
-/* [%%debugger.chrome] */
-
-module H = () => {
-  %%private(
-    @module("./x") external x: int => int = "x"
-  )
-}
diff --git a/jscomp/test/io_test.js b/jscomp/test/io_test.js
deleted file mode 100644
index 61e043c..0000000
--- a/jscomp/test/io_test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(param) {
-  console.error("x");
-  console.log();
-  console.log("hi");
-  console.log();
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/io_test.res b/jscomp/test/io_test.res
deleted file mode 100644
index 7fa5094..0000000
--- a/jscomp/test/io_test.res
+++ /dev/null
@@ -1,6 +0,0 @@
-let f = () => {
-  let v = prerr_endline("x")
-  Js.log(v)
-  let u = print_endline("hi")
-  Js.log(u)
-}
diff --git a/jscomp/test/joinClasses.js b/jscomp/test/joinClasses.js
deleted file mode 100644
index d8309c6..0000000
--- a/jscomp/test/joinClasses.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = function(){
-    var sum =   0 ; 
-    var i = 0;
-    for(; i < arguments.length ; ++ i){
-        sum += arguments[i]
-    }
-    return sum
-}
\ No newline at end of file
diff --git a/jscomp/test/js_array_test.js b/jscomp/test/js_array_test.js
deleted file mode 100644
index 2cf826a..0000000
--- a/jscomp/test/js_array_test.js
+++ /dev/null
@@ -1,1196 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Js_vector = require("../../lib/js/js_vector.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites_0 = [
-  "File \"js_array_test.res\", line 5, characters 6-13",
-  (function (param) {
-      var x = [
-        1,
-        2,
-        3,
-        4,
-        5
-      ];
-      return {
-              TAG: "Eq",
-              _0: [
-                2,
-                4
-              ],
-              _1: (Js_vector.filterInPlace((function (x) {
-                        return x % 2 === 0;
-                      }), x), x)
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "File \"js_array_test.res\", line 16, characters 6-13",
-    (function (param) {
-        var x = [
-          1,
-          2,
-          3,
-          4,
-          5
-        ];
-        return {
-                TAG: "Eq",
-                _0: true,
-                _1: (Js_vector.filterInPlace((function (x) {
-                          return x > 10;
-                        }), x), x.length === 0)
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "isArray_array",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: true,
-                  _1: Array.isArray([])
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "isArray_int",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: false,
-                    _1: Array.isArray(34)
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "length",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: 3,
-                      _1: [
-                        1,
-                        2,
-                        3
-                      ].length
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "copyWithin",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: [
-                          1,
-                          2,
-                          3,
-                          1,
-                          2
-                        ],
-                        _1: [
-                            1,
-                            2,
-                            3,
-                            4,
-                            5
-                          ].copyWithin(-2)
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "copyWithinFrom",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: [
-                            4,
-                            5,
-                            3,
-                            4,
-                            5
-                          ],
-                          _1: [
-                              1,
-                              2,
-                              3,
-                              4,
-                              5
-                            ].copyWithin(0, 3)
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "copyWithinFromRange",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: [
-                              4,
-                              2,
-                              3,
-                              4,
-                              5
-                            ],
-                            _1: [
-                                1,
-                                2,
-                                3,
-                                4,
-                                5
-                              ].copyWithin(0, 3, 4)
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "fillInPlace",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: [
-                                4,
-                                4,
-                                4
-                              ],
-                              _1: [
-                                  1,
-                                  2,
-                                  3
-                                ].fill(4)
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "fillFromInPlace",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: [
-                                  1,
-                                  4,
-                                  4
-                                ],
-                                _1: [
-                                    1,
-                                    2,
-                                    3
-                                  ].fill(4, 1)
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "fillRangeInPlace",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: [
-                                    1,
-                                    4,
-                                    3
-                                  ],
-                                  _1: [
-                                      1,
-                                      2,
-                                      3
-                                    ].fill(4, 1, 2)
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "pop",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: 3,
-                                    _1: Caml_option.undefined_to_opt([
-                                            1,
-                                            2,
-                                            3
-                                          ].pop())
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "pop - empty array",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: undefined,
-                                      _1: Caml_option.undefined_to_opt([].pop())
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "push",
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: 4,
-                                        _1: [
-                                            1,
-                                            2,
-                                            3
-                                          ].push(4)
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "pushMany",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: 5,
-                                          _1: [
-                                              1,
-                                              2,
-                                              3
-                                            ].push(4, 5)
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "reverseInPlace",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: [
-                                              3,
-                                              2,
-                                              1
-                                            ],
-                                            _1: [
-                                                1,
-                                                2,
-                                                3
-                                              ].reverse()
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "shift",
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: 1,
-                                              _1: Caml_option.undefined_to_opt([
-                                                      1,
-                                                      2,
-                                                      3
-                                                    ].shift())
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "shift - empty array",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: undefined,
-                                                _1: Caml_option.undefined_to_opt([].shift())
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "sortInPlace",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: [
-                                                    1,
-                                                    2,
-                                                    3
-                                                  ],
-                                                  _1: [
-                                                      3,
-                                                      1,
-                                                      2
-                                                    ].sort()
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "sortInPlaceWith",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: [
-                                                      3,
-                                                      2,
-                                                      1
-                                                    ],
-                                                    _1: [
-                                                        3,
-                                                        1,
-                                                        2
-                                                      ].sort(function (a, b) {
-                                                          return b - a | 0;
-                                                        })
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "spliceInPlace",
-                                          (function (param) {
-                                              var arr = [
-                                                1,
-                                                2,
-                                                3,
-                                                4
-                                              ];
-                                              var removed = arr.splice(2, 0, 5);
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: [
-                                                        [
-                                                          1,
-                                                          2,
-                                                          5,
-                                                          3,
-                                                          4
-                                                        ],
-                                                        []
-                                                      ],
-                                                      _1: [
-                                                        arr,
-                                                        removed
-                                                      ]
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "removeFromInPlace",
-                                            (function (param) {
-                                                var arr = [
-                                                  1,
-                                                  2,
-                                                  3,
-                                                  4
-                                                ];
-                                                var removed = arr.splice(2);
-                                                return {
-                                                        TAG: "Eq",
-                                                        _0: [
-                                                          [
-                                                            1,
-                                                            2
-                                                          ],
-                                                          [
-                                                            3,
-                                                            4
-                                                          ]
-                                                        ],
-                                                        _1: [
-                                                          arr,
-                                                          removed
-                                                        ]
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "removeCountInPlace",
-                                              (function (param) {
-                                                  var arr = [
-                                                    1,
-                                                    2,
-                                                    3,
-                                                    4
-                                                  ];
-                                                  var removed = arr.splice(2, 1);
-                                                  return {
-                                                          TAG: "Eq",
-                                                          _0: [
-                                                            [
-                                                              1,
-                                                              2,
-                                                              4
-                                                            ],
-                                                            [3]
-                                                          ],
-                                                          _1: [
-                                                            arr,
-                                                            removed
-                                                          ]
-                                                        };
-                                                })
-                                            ],
-                                            tl: {
-                                              hd: [
-                                                "unshift",
-                                                (function (param) {
-                                                    return {
-                                                            TAG: "Eq",
-                                                            _0: 4,
-                                                            _1: [
-                                                                1,
-                                                                2,
-                                                                3
-                                                              ].unshift(4)
-                                                          };
-                                                  })
-                                              ],
-                                              tl: {
-                                                hd: [
-                                                  "unshiftMany",
-                                                  (function (param) {
-                                                      return {
-                                                              TAG: "Eq",
-                                                              _0: 5,
-                                                              _1: [
-                                                                  1,
-                                                                  2,
-                                                                  3
-                                                                ].unshift(4, 5)
-                                                            };
-                                                    })
-                                                ],
-                                                tl: {
-                                                  hd: [
-                                                    "append",
-                                                    (function (param) {
-                                                        return {
-                                                                TAG: "Eq",
-                                                                _0: [
-                                                                  1,
-                                                                  2,
-                                                                  3,
-                                                                  4
-                                                                ],
-                                                                _1: [
-                                                                    1,
-                                                                    2,
-                                                                    3
-                                                                  ].concat([4])
-                                                              };
-                                                      })
-                                                  ],
-                                                  tl: {
-                                                    hd: [
-                                                      "concat",
-                                                      (function (param) {
-                                                          return {
-                                                                  TAG: "Eq",
-                                                                  _0: [
-                                                                    1,
-                                                                    2,
-                                                                    3,
-                                                                    4,
-                                                                    5
-                                                                  ],
-                                                                  _1: [
-                                                                      1,
-                                                                      2,
-                                                                      3
-                                                                    ].concat([
-                                                                        4,
-                                                                        5
-                                                                      ])
-                                                                };
-                                                        })
-                                                    ],
-                                                    tl: {
-                                                      hd: [
-                                                        "concatMany",
-                                                        (function (param) {
-                                                            return {
-                                                                    TAG: "Eq",
-                                                                    _0: [
-                                                                      1,
-                                                                      2,
-                                                                      3,
-                                                                      4,
-                                                                      5,
-                                                                      6,
-                                                                      7
-                                                                    ],
-                                                                    _1: [
-                                                                        1,
-                                                                        2,
-                                                                        3
-                                                                      ].concat([
-                                                                          4,
-                                                                          5
-                                                                        ], [
-                                                                          6,
-                                                                          7
-                                                                        ])
-                                                                  };
-                                                          })
-                                                      ],
-                                                      tl: {
-                                                        hd: [
-                                                          "includes",
-                                                          (function (param) {
-                                                              return {
-                                                                      TAG: "Eq",
-                                                                      _0: true,
-                                                                      _1: [
-                                                                          1,
-                                                                          2,
-                                                                          3
-                                                                        ].includes(3)
-                                                                    };
-                                                            })
-                                                        ],
-                                                        tl: {
-                                                          hd: [
-                                                            "indexOf",
-                                                            (function (param) {
-                                                                return {
-                                                                        TAG: "Eq",
-                                                                        _0: 1,
-                                                                        _1: [
-                                                                            1,
-                                                                            2,
-                                                                            3
-                                                                          ].indexOf(2)
-                                                                      };
-                                                              })
-                                                          ],
-                                                          tl: {
-                                                            hd: [
-                                                              "indexOfFrom",
-                                                              (function (param) {
-                                                                  return {
-                                                                          TAG: "Eq",
-                                                                          _0: 3,
-                                                                          _1: [
-                                                                              1,
-                                                                              2,
-                                                                              3,
-                                                                              2
-                                                                            ].indexOf(2, 2)
-                                                                        };
-                                                                })
-                                                            ],
-                                                            tl: {
-                                                              hd: [
-                                                                "join",
-                                                                (function (param) {
-                                                                    return {
-                                                                            TAG: "Eq",
-                                                                            _0: "1,2,3",
-                                                                            _1: [
-                                                                                1,
-                                                                                2,
-                                                                                3
-                                                                              ].join()
-                                                                          };
-                                                                  })
-                                                              ],
-                                                              tl: {
-                                                                hd: [
-                                                                  "joinWith",
-                                                                  (function (param) {
-                                                                      return {
-                                                                              TAG: "Eq",
-                                                                              _0: "1;2;3",
-                                                                              _1: [
-                                                                                  1,
-                                                                                  2,
-                                                                                  3
-                                                                                ].join(";")
-                                                                            };
-                                                                    })
-                                                                ],
-                                                                tl: {
-                                                                  hd: [
-                                                                    "lastIndexOf",
-                                                                    (function (param) {
-                                                                        return {
-                                                                                TAG: "Eq",
-                                                                                _0: 1,
-                                                                                _1: [
-                                                                                    1,
-                                                                                    2,
-                                                                                    3
-                                                                                  ].lastIndexOf(2)
-                                                                              };
-                                                                      })
-                                                                  ],
-                                                                  tl: {
-                                                                    hd: [
-                                                                      "lastIndexOfFrom",
-                                                                      (function (param) {
-                                                                          return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: 1,
-                                                                                  _1: [
-                                                                                      1,
-                                                                                      2,
-                                                                                      3,
-                                                                                      2
-                                                                                    ].lastIndexOf(2, 2)
-                                                                                };
-                                                                        })
-                                                                    ],
-                                                                    tl: {
-                                                                      hd: [
-                                                                        "slice",
-                                                                        (function (param) {
-                                                                            return {
-                                                                                    TAG: "Eq",
-                                                                                    _0: [
-                                                                                      2,
-                                                                                      3
-                                                                                    ],
-                                                                                    _1: [
-                                                                                        1,
-                                                                                        2,
-                                                                                        3,
-                                                                                        4,
-                                                                                        5
-                                                                                      ].slice(1, 3)
-                                                                                  };
-                                                                          })
-                                                                      ],
-                                                                      tl: {
-                                                                        hd: [
-                                                                          "copy",
-                                                                          (function (param) {
-                                                                              return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: [
-                                                                                        1,
-                                                                                        2,
-                                                                                        3,
-                                                                                        4,
-                                                                                        5
-                                                                                      ],
-                                                                                      _1: [
-                                                                                          1,
-                                                                                          2,
-                                                                                          3,
-                                                                                          4,
-                                                                                          5
-                                                                                        ].slice()
-                                                                                    };
-                                                                            })
-                                                                        ],
-                                                                        tl: {
-                                                                          hd: [
-                                                                            "sliceFrom",
-                                                                            (function (param) {
-                                                                                return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: [
-                                                                                          3,
-                                                                                          4,
-                                                                                          5
-                                                                                        ],
-                                                                                        _1: [
-                                                                                            1,
-                                                                                            2,
-                                                                                            3,
-                                                                                            4,
-                                                                                            5
-                                                                                          ].slice(2)
-                                                                                      };
-                                                                              })
-                                                                          ],
-                                                                          tl: {
-                                                                            hd: [
-                                                                              "toString",
-                                                                              (function (param) {
-                                                                                  return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: "1,2,3",
-                                                                                          _1: [
-                                                                                              1,
-                                                                                              2,
-                                                                                              3
-                                                                                            ].toString()
-                                                                                        };
-                                                                                })
-                                                                            ],
-                                                                            tl: {
-                                                                              hd: [
-                                                                                "toLocaleString",
-                                                                                (function (param) {
-                                                                                    return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: "1,2,3",
-                                                                                            _1: [
-                                                                                                1,
-                                                                                                2,
-                                                                                                3
-                                                                                              ].toLocaleString()
-                                                                                          };
-                                                                                  })
-                                                                              ],
-                                                                              tl: {
-                                                                                hd: [
-                                                                                  "every",
-                                                                                  (function (param) {
-                                                                                      return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: true,
-                                                                                              _1: [
-                                                                                                  1,
-                                                                                                  2,
-                                                                                                  3
-                                                                                                ].every(function (n) {
-                                                                                                    return n > 0;
-                                                                                                  })
-                                                                                            };
-                                                                                    })
-                                                                                ],
-                                                                                tl: {
-                                                                                  hd: [
-                                                                                    "everyi",
-                                                                                    (function (param) {
-                                                                                        return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: false,
-                                                                                                _1: [
-                                                                                                    1,
-                                                                                                    2,
-                                                                                                    3
-                                                                                                  ].every(function (param, i) {
-                                                                                                      return i > 0;
-                                                                                                    })
-                                                                                              };
-                                                                                      })
-                                                                                  ],
-                                                                                  tl: {
-                                                                                    hd: [
-                                                                                      "filter",
-                                                                                      (function (param) {
-                                                                                          return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: [
-                                                                                                    2,
-                                                                                                    4
-                                                                                                  ],
-                                                                                                  _1: [
-                                                                                                      1,
-                                                                                                      2,
-                                                                                                      3,
-                                                                                                      4
-                                                                                                    ].filter(function (n) {
-                                                                                                        return n % 2 === 0;
-                                                                                                      })
-                                                                                                };
-                                                                                        })
-                                                                                    ],
-                                                                                    tl: {
-                                                                                      hd: [
-                                                                                        "filteri",
-                                                                                        (function (param) {
-                                                                                            return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: [
-                                                                                                      1,
-                                                                                                      3
-                                                                                                    ],
-                                                                                                    _1: [
-                                                                                                        1,
-                                                                                                        2,
-                                                                                                        3,
-                                                                                                        4
-                                                                                                      ].filter(function (param, i) {
-                                                                                                          return i % 2 === 0;
-                                                                                                        })
-                                                                                                  };
-                                                                                          })
-                                                                                      ],
-                                                                                      tl: {
-                                                                                        hd: [
-                                                                                          "find",
-                                                                                          (function (param) {
-                                                                                              return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: 2,
-                                                                                                      _1: Caml_option.undefined_to_opt([
-                                                                                                              1,
-                                                                                                              2,
-                                                                                                              3,
-                                                                                                              4
-                                                                                                            ].find(function (n) {
-                                                                                                                return n % 2 === 0;
-                                                                                                              }))
-                                                                                                    };
-                                                                                            })
-                                                                                        ],
-                                                                                        tl: {
-                                                                                          hd: [
-                                                                                            "find - no match",
-                                                                                            (function (param) {
-                                                                                                return {
-                                                                                                        TAG: "Eq",
-                                                                                                        _0: undefined,
-                                                                                                        _1: Caml_option.undefined_to_opt([
-                                                                                                                1,
-                                                                                                                2,
-                                                                                                                3,
-                                                                                                                4
-                                                                                                              ].find(function (n) {
-                                                                                                                  return n % 2 === 5;
-                                                                                                                }))
-                                                                                                      };
-                                                                                              })
-                                                                                          ],
-                                                                                          tl: {
-                                                                                            hd: [
-                                                                                              "findi",
-                                                                                              (function (param) {
-                                                                                                  return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: 1,
-                                                                                                          _1: Caml_option.undefined_to_opt([
-                                                                                                                  1,
-                                                                                                                  2,
-                                                                                                                  3,
-                                                                                                                  4
-                                                                                                                ].find(function (param, i) {
-                                                                                                                    return i % 2 === 0;
-                                                                                                                  }))
-                                                                                                        };
-                                                                                                })
-                                                                                            ],
-                                                                                            tl: {
-                                                                                              hd: [
-                                                                                                "findi - no match",
-                                                                                                (function (param) {
-                                                                                                    return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: undefined,
-                                                                                                            _1: Caml_option.undefined_to_opt([
-                                                                                                                    1,
-                                                                                                                    2,
-                                                                                                                    3,
-                                                                                                                    4
-                                                                                                                  ].find(function (param, i) {
-                                                                                                                      return i % 2 === 5;
-                                                                                                                    }))
-                                                                                                          };
-                                                                                                  })
-                                                                                              ],
-                                                                                              tl: {
-                                                                                                hd: [
-                                                                                                  "findIndex",
-                                                                                                  (function (param) {
-                                                                                                      return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: 1,
-                                                                                                              _1: [
-                                                                                                                  1,
-                                                                                                                  2,
-                                                                                                                  3,
-                                                                                                                  4
-                                                                                                                ].findIndex(function (n) {
-                                                                                                                    return n % 2 === 0;
-                                                                                                                  })
-                                                                                                            };
-                                                                                                    })
-                                                                                                ],
-                                                                                                tl: {
-                                                                                                  hd: [
-                                                                                                    "findIndexi",
-                                                                                                    (function (param) {
-                                                                                                        return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: 0,
-                                                                                                                _1: [
-                                                                                                                    1,
-                                                                                                                    2,
-                                                                                                                    3,
-                                                                                                                    4
-                                                                                                                  ].findIndex(function (param, i) {
-                                                                                                                      return i % 2 === 0;
-                                                                                                                    })
-                                                                                                              };
-                                                                                                      })
-                                                                                                  ],
-                                                                                                  tl: {
-                                                                                                    hd: [
-                                                                                                      "forEach",
-                                                                                                      (function (param) {
-                                                                                                          var sum = {
-                                                                                                            contents: 0
-                                                                                                          };
-                                                                                                          [
-                                                                                                              1,
-                                                                                                              2,
-                                                                                                              3
-                                                                                                            ].forEach(function (n) {
-                                                                                                                sum.contents = sum.contents + n | 0;
-                                                                                                              });
-                                                                                                          return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: 6,
-                                                                                                                  _1: sum.contents
-                                                                                                                };
-                                                                                                        })
-                                                                                                    ],
-                                                                                                    tl: {
-                                                                                                      hd: [
-                                                                                                        "forEachi",
-                                                                                                        (function (param) {
-                                                                                                            var sum = {
-                                                                                                              contents: 0
-                                                                                                            };
-                                                                                                            [
-                                                                                                                1,
-                                                                                                                2,
-                                                                                                                3
-                                                                                                              ].forEach(function (param, i) {
-                                                                                                                  sum.contents = sum.contents + i | 0;
-                                                                                                                });
-                                                                                                            return {
-                                                                                                                    TAG: "Eq",
-                                                                                                                    _0: 3,
-                                                                                                                    _1: sum.contents
-                                                                                                                  };
-                                                                                                          })
-                                                                                                      ],
-                                                                                                      tl: {
-                                                                                                        hd: [
-                                                                                                          "map",
-                                                                                                          (function (param) {
-                                                                                                              return {
-                                                                                                                      TAG: "Eq",
-                                                                                                                      _0: [
-                                                                                                                        2,
-                                                                                                                        4,
-                                                                                                                        6,
-                                                                                                                        8
-                                                                                                                      ],
-                                                                                                                      _1: [
-                                                                                                                          1,
-                                                                                                                          2,
-                                                                                                                          3,
-                                                                                                                          4
-                                                                                                                        ].map(function (n) {
-                                                                                                                            return (n << 1);
-                                                                                                                          })
-                                                                                                                    };
-                                                                                                            })
-                                                                                                        ],
-                                                                                                        tl: {
-                                                                                                          hd: [
-                                                                                                            "map",
-                                                                                                            (function (param) {
-                                                                                                                return {
-                                                                                                                        TAG: "Eq",
-                                                                                                                        _0: [
-                                                                                                                          0,
-                                                                                                                          2,
-                                                                                                                          4,
-                                                                                                                          6
-                                                                                                                        ],
-                                                                                                                        _1: [
-                                                                                                                            1,
-                                                                                                                            2,
-                                                                                                                            3,
-                                                                                                                            4
-                                                                                                                          ].map(function (param, i) {
-                                                                                                                              return (i << 1);
-                                                                                                                            })
-                                                                                                                      };
-                                                                                                              })
-                                                                                                          ],
-                                                                                                          tl: {
-                                                                                                            hd: [
-                                                                                                              "reduce",
-                                                                                                              (function (param) {
-                                                                                                                  return {
-                                                                                                                          TAG: "Eq",
-                                                                                                                          _0: -10,
-                                                                                                                          _1: [
-                                                                                                                              1,
-                                                                                                                              2,
-                                                                                                                              3,
-                                                                                                                              4
-                                                                                                                            ].reduce((function (acc, n) {
-                                                                                                                                  return acc - n | 0;
-                                                                                                                                }), 0)
-                                                                                                                        };
-                                                                                                                })
-                                                                                                            ],
-                                                                                                            tl: {
-                                                                                                              hd: [
-                                                                                                                "reducei",
-                                                                                                                (function (param) {
-                                                                                                                    return {
-                                                                                                                            TAG: "Eq",
-                                                                                                                            _0: -6,
-                                                                                                                            _1: [
-                                                                                                                                1,
-                                                                                                                                2,
-                                                                                                                                3,
-                                                                                                                                4
-                                                                                                                              ].reduce((function (acc, param, i) {
-                                                                                                                                    return acc - i | 0;
-                                                                                                                                  }), 0)
-                                                                                                                          };
-                                                                                                                  })
-                                                                                                              ],
-                                                                                                              tl: {
-                                                                                                                hd: [
-                                                                                                                  "reduceRight",
-                                                                                                                  (function (param) {
-                                                                                                                      return {
-                                                                                                                              TAG: "Eq",
-                                                                                                                              _0: -10,
-                                                                                                                              _1: [
-                                                                                                                                  1,
-                                                                                                                                  2,
-                                                                                                                                  3,
-                                                                                                                                  4
-                                                                                                                                ].reduceRight((function (acc, n) {
-                                                                                                                                      return acc - n | 0;
-                                                                                                                                    }), 0)
-                                                                                                                            };
-                                                                                                                    })
-                                                                                                                ],
-                                                                                                                tl: {
-                                                                                                                  hd: [
-                                                                                                                    "reduceRighti",
-                                                                                                                    (function (param) {
-                                                                                                                        return {
-                                                                                                                                TAG: "Eq",
-                                                                                                                                _0: -6,
-                                                                                                                                _1: [
-                                                                                                                                    1,
-                                                                                                                                    2,
-                                                                                                                                    3,
-                                                                                                                                    4
-                                                                                                                                  ].reduceRight((function (acc, param, i) {
-                                                                                                                                        return acc - i | 0;
-                                                                                                                                      }), 0)
-                                                                                                                              };
-                                                                                                                      })
-                                                                                                                  ],
-                                                                                                                  tl: {
-                                                                                                                    hd: [
-                                                                                                                      "some",
-                                                                                                                      (function (param) {
-                                                                                                                          return {
-                                                                                                                                  TAG: "Eq",
-                                                                                                                                  _0: false,
-                                                                                                                                  _1: [
-                                                                                                                                      1,
-                                                                                                                                      2,
-                                                                                                                                      3,
-                                                                                                                                      4
-                                                                                                                                    ].some(function (n) {
-                                                                                                                                        return n <= 0;
-                                                                                                                                      })
-                                                                                                                                };
-                                                                                                                        })
-                                                                                                                    ],
-                                                                                                                    tl: {
-                                                                                                                      hd: [
-                                                                                                                        "somei",
-                                                                                                                        (function (param) {
-                                                                                                                            return {
-                                                                                                                                    TAG: "Eq",
-                                                                                                                                    _0: true,
-                                                                                                                                    _1: [
-                                                                                                                                        1,
-                                                                                                                                        2,
-                                                                                                                                        3,
-                                                                                                                                        4
-                                                                                                                                      ].some(function (param, i) {
-                                                                                                                                          return i <= 0;
-                                                                                                                                        })
-                                                                                                                                  };
-                                                                                                                          })
-                                                                                                                      ],
-                                                                                                                      tl: /* [] */0
-                                                                                                                    }
-                                                                                                                  }
-                                                                                                                }
-                                                                                                              }
-                                                                                                            }
-                                                                                                          }
-                                                                                                        }
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_array_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_array_test.res b/jscomp/test/js_array_test.res
deleted file mode 100644
index 5cf60b1..0000000
--- a/jscomp/test/js_array_test.res
+++ /dev/null
@@ -1,187 +0,0 @@
-let suites = {
-  open Mt
-  list{
-    (
-      __LOC__,
-      _ => Eq(
-        [2, 4],
-        {
-          let x = [1, 2, 3, 4, 5]
-          Js.Vector.filterInPlace((. x) => mod(x, 2) == 0, x)
-          x
-        },
-      ),
-    ),
-    (
-      __LOC__,
-      _ => Eq(
-        true,
-        {
-          let x = [1, 2, 3, 4, 5]
-          Js.Vector.filterInPlace((. x) => x > 10, x)
-          Array.length(x) == 0
-        },
-      ),
-    ),
-    /* es2015, unable to test because nothing currently implements array_like
-    "from", (fun _ ->
-      Eq(
-        [| 0; 1 |],
-        [| "a"; "b" |] |. Js.Array2.keys |. Js.Array2.from)
-    );
- */
-
-    /* es2015, unable to test because nothing currently implements array_like
-    "fromMap", (fun _ ->
-      Eq(
-        [| (-1); 0 |],
-        Js.Array2.fromMap
-          ([| "a"; "b" |] |. Js.Array2.keys)
-          ((fun x -> x - 1) [@bs]))
-    );
- */
-
-    /* es2015 */
-    ("isArray_array", _ => Eq(true, []->Js.Array2.isArray)),
-    ("isArray_int", _ => Eq(false, 34->Js.Array2.isArray)),
-    ("length", _ => Eq(3, [1, 2, 3]->Js.Array2.length)),
-    /* es2015 */
-    ("copyWithin", _ => Eq([1, 2, 3, 1, 2], [1, 2, 3, 4, 5]->Js.Array2.copyWithin(~to_=-2))),
-    (
-      "copyWithinFrom",
-      _ => Eq([4, 5, 3, 4, 5], [1, 2, 3, 4, 5]->Js.Array2.copyWithinFrom(~to_=0, ~from=3)),
-    ),
-    (
-      "copyWithinFromRange",
-      _ => Eq(
-        [4, 2, 3, 4, 5],
-        [1, 2, 3, 4, 5]->Js.Array2.copyWithinFromRange(~to_=0, ~start=3, ~end_=4),
-      ),
-    ),
-    /* es2015 */
-    ("fillInPlace", _ => Eq([4, 4, 4], [1, 2, 3]->Js.Array2.fillInPlace(4))),
-    ("fillFromInPlace", _ => Eq([1, 4, 4], [1, 2, 3]->Js.Array2.fillFromInPlace(4, ~from=1))),
-    (
-      "fillRangeInPlace",
-      _ => Eq([1, 4, 3], [1, 2, 3]->Js.Array2.fillRangeInPlace(4, ~start=1, ~end_=2)),
-    ),
-    ("pop", _ => Eq(Some(3), [1, 2, 3]->Js.Array2.pop)),
-    ("pop - empty array", _ => Eq(None, []->Js.Array2.pop)),
-    ("push", _ => Eq(4, [1, 2, 3]->Js.Array2.push(4))),
-    ("pushMany", _ => Eq(5, [1, 2, 3]->Js.Array2.pushMany([4, 5]))),
-    ("reverseInPlace", _ => Eq([3, 2, 1], [1, 2, 3]->Js.Array2.reverseInPlace)),
-    ("shift", _ => Eq(Some(1), [1, 2, 3]->Js.Array2.shift)),
-    ("shift - empty array", _ => Eq(None, []->Js.Array2.shift)),
-    ("sortInPlace", _ => Eq([1, 2, 3], [3, 1, 2]->Js.Array2.sortInPlace)),
-    ("sortInPlaceWith", _ => Eq([3, 2, 1], [3, 1, 2]->Js.Array2.sortInPlaceWith((a, b) => b - a))),
-    (
-      "spliceInPlace",
-      _ => {
-        let arr = [1, 2, 3, 4]
-        let removed = arr->Js.Array2.spliceInPlace(~pos=2, ~remove=0, ~add=[5])
-
-        Eq(([1, 2, 5, 3, 4], []), (arr, removed))
-      },
-    ),
-    (
-      "removeFromInPlace",
-      _ => {
-        let arr = [1, 2, 3, 4]
-        let removed = arr->Js.Array2.removeFromInPlace(~pos=2)
-
-        Eq(([1, 2], [3, 4]), (arr, removed))
-      },
-    ),
-    (
-      "removeCountInPlace",
-      _ => {
-        let arr = [1, 2, 3, 4]
-        let removed = arr->Js.Array2.removeCountInPlace(~pos=2, ~count=1)
-
-        Eq(([1, 2, 4], [3]), (arr, removed))
-      },
-    ),
-    ("unshift", _ => Eq(4, [1, 2, 3]->Js.Array2.unshift(4))),
-    ("unshiftMany", _ => Eq(5, [1, 2, 3]->Js.Array2.unshiftMany([4, 5]))),
-    ("append", _ => Eq([1, 2, 3, 4], [1, 2, 3]->Js.Array2.concat([4]))),
-    ("concat", _ => Eq([1, 2, 3, 4, 5], [1, 2, 3]->Js.Array2.concat([4, 5]))),
-    (
-      "concatMany",
-      _ => Eq([1, 2, 3, 4, 5, 6, 7], [1, 2, 3]->Js.Array2.concatMany([[4, 5], [6, 7]])),
-    ),
-    /* es2016 */
-    ("includes", _ => Eq(true, [1, 2, 3]->Js.Array2.includes(3))),
-    ("indexOf", _ => Eq(1, [1, 2, 3]->Js.Array2.indexOf(2))),
-    ("indexOfFrom", _ => Eq(3, [1, 2, 3, 2]->Js.Array2.indexOfFrom(2, ~from=2))),
-    ("join", _ => Eq("1,2,3", [1, 2, 3]->Js.Array.join)),
-    ("joinWith", _ => Eq("1;2;3", [1, 2, 3]->Js.Array2.joinWith(";"))),
-    ("lastIndexOf", _ => Eq(1, [1, 2, 3]->Js.Array2.lastIndexOf(2))),
-    ("lastIndexOfFrom", _ => Eq(1, [1, 2, 3, 2]->Js.Array2.lastIndexOfFrom(2, ~from=2))),
-    ("slice", _ => Eq([2, 3], [1, 2, 3, 4, 5]->Js.Array2.slice(~start=1, ~end_=3))),
-    ("copy", _ => Eq([1, 2, 3, 4, 5], [1, 2, 3, 4, 5]->Js.Array2.copy)),
-    ("sliceFrom", _ => Eq([3, 4, 5], [1, 2, 3, 4, 5]->Js.Array2.sliceFrom(2))),
-    ("toString", _ => Eq("1,2,3", [1, 2, 3]->Js.Array2.toString)),
-    ("toLocaleString", _ => Eq("1,2,3", [1, 2, 3]->Js.Array2.toLocaleString)),
-    /* es2015, iterator
-    "entries", (fun _ ->
-      Eq([| (0, "a"); (1, "b"); (2, "c") |],
-         [| "a"; "b"; "c" |] |. Js.Array2.entries |. Js.Array2.from)
-    );
- */
-
-    ("every", _ => Eq(true, [1, 2, 3]->Js.Array2.every(n => n > 0))),
-    ("everyi", _ => Eq(false, [1, 2, 3]->Js.Array2.everyi((_, i) => i > 0))),
-    ("filter", _ => Eq([2, 4], [1, 2, 3, 4]->Js.Array2.filter(n => mod(n, 2) == 0))),
-    ("filteri", _ => Eq([1, 3], [1, 2, 3, 4]->Js.Array2.filteri((_, i) => mod(i, 2) == 0))),
-    /* es2015 */
-    ("find", _ => Eq(Some(2), [1, 2, 3, 4]->Js.Array2.find(n => mod(n, 2) == 0))),
-    ("find - no match", _ => Eq(None, [1, 2, 3, 4]->Js.Array2.find(n => mod(n, 2) == 5))),
-    ("findi", _ => Eq(Some(1), [1, 2, 3, 4]->Js.Array2.findi((_, i) => mod(i, 2) == 0))),
-    ("findi - no match", _ => Eq(None, [1, 2, 3, 4]->Js.Array2.findi((_, i) => mod(i, 2) == 5))),
-    /* es2015 */
-    ("findIndex", _ => Eq(1, [1, 2, 3, 4]->Js.Array2.findIndex(n => mod(n, 2) == 0))),
-    ("findIndexi", _ => Eq(0, [1, 2, 3, 4]->Js.Array2.findIndexi((_, i) => mod(i, 2) == 0))),
-    (
-      "forEach",
-      _ => {
-        let sum = ref(0)
-        let _ = [1, 2, 3]->Js.Array2.forEach(n => sum := sum.contents + n)
-
-        Eq(6, sum.contents)
-      },
-    ),
-    (
-      "forEachi",
-      _ => {
-        let sum = ref(0)
-        let _ = [1, 2, 3]->Js.Array2.forEachi((_, i) => sum := sum.contents + i)
-
-        Eq(3, sum.contents)
-      },
-    ),
-    /* es2015, iterator
-    "keys", (fun _ ->
-      Eq([| 0; 1; 2 |],
-         [| "a"; "b"; "c" |] |. Js.Array2.keys |. Js.Array2.from)
-    );
- */
-
-    ("map", _ => Eq([2, 4, 6, 8], [1, 2, 3, 4]->Js.Array2.map(n => n * 2))),
-    ("map", _ => Eq([0, 2, 4, 6], [1, 2, 3, 4]->Js.Array2.mapi((_, i) => i * 2))),
-    ("reduce", _ => Eq(-10, [1, 2, 3, 4]->Js.Array2.reduce((acc, n) => acc - n, 0))),
-    ("reducei", _ => Eq(-6, [1, 2, 3, 4]->Js.Array2.reducei((acc, _, i) => acc - i, 0))),
-    ("reduceRight", _ => Eq(-10, [1, 2, 3, 4]->Js.Array2.reduceRight((acc, n) => acc - n, 0))),
-    ("reduceRighti", _ => Eq(-6, [1, 2, 3, 4]->Js.Array2.reduceRighti((acc, _, i) => acc - i, 0))),
-    ("some", _ => Eq(false, [1, 2, 3, 4]->Js.Array2.some(n => n <= 0))),
-    ("somei", _ => Eq(true, [1, 2, 3, 4]->Js.Array2.somei((_, i) => i <= 0))),
-
-    /* es2015, iterator
-    "values", (fun _ ->
-      Eq([| "a"; "b"; "c" |],
-         [| "a"; "b"; "c" |] |. Js.Array2.values |. Js.Array2.from)
-    );
- */
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_bool_test.js b/jscomp/test/js_bool_test.js
deleted file mode 100644
index 38ac995..0000000
--- a/jscomp/test/js_bool_test.js
+++ /dev/null
@@ -1,153 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-function f(x) {
-  if (x) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function f2(x) {
-  if (x) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function f4(x) {
-  if (x) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-var u = 1;
-
-var v = true;
-
-var suites_0 = [
-  "?bool_eq_caml_bool",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: u,
-              _1: true
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "js_bool_eq_js_bool",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: v,
-                _1: true
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "js_bool_neq_acml_bool",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: true,
-                  _1: true === true
-                };
-        })
-    ],
-    tl: /* [] */0
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-function ff(u) {
-  if (u === true) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function fi(x, y) {
-  return x === y;
-}
-
-function fb(x, y) {
-  return x === y;
-}
-
-function fadd(x, y) {
-  return x + y | 0;
-}
-
-function ffadd(x, y) {
-  return x + y;
-}
-
-function ss(x) {
-  return "xx" > x;
-}
-
-function bb(x) {
-  return [
-          true > x,
-          false,
-          true,
-          true <= x,
-          false,
-          false < x,
-          false >= x,
-          true
-        ];
-}
-
-var consts = [
-  false,
-  false,
-  true,
-  false,
-  true,
-  false,
-  true,
-  true
-];
-
-var bool_array = [
-  true,
-  false
-];
-
-Mt.from_pair_suites("Js_bool_test", suites);
-
-var f3 = true;
-
-exports.f = f;
-exports.f2 = f2;
-exports.f4 = f4;
-exports.f3 = f3;
-exports.u = u;
-exports.v = v;
-exports.suites = suites;
-exports.ff = ff;
-exports.fi = fi;
-exports.fb = fb;
-exports.fadd = fadd;
-exports.ffadd = ffadd;
-exports.ss = ss;
-exports.bb = bb;
-exports.consts = consts;
-exports.bool_array = bool_array;
-/*  Not a pure module */
diff --git a/jscomp/test/js_bool_test.res b/jscomp/test/js_bool_test.res
deleted file mode 100644
index 8638789..0000000
--- a/jscomp/test/js_bool_test.res
+++ /dev/null
@@ -1,78 +0,0 @@
-let f = x =>
-  if x {
-    true
-  } else {
-    false
-  }
-
-let f2 = x =>
-  if x {
-    true
-  } else {
-    false
-  }
-
-let f4 = x =>
-  if x {
-    true
-  } else {
-    false
-  }
-
-let f3 = if true {
-  true
-} else {
-  false
-}
-
-let u: bool = %raw(` 1`)
-
-let v: bool = %raw(` true`)
-
-let suites = {
-  open Mt
-  list{
-    ("?bool_eq_caml_bool", _ => Eq(u, f(true))),
-    ("js_bool_eq_js_bool", _ => Eq(v, f4(true))),
-    ("js_bool_neq_acml_bool", _ => Eq(true, f(true) == %raw(`true`) /* not type check */)),
-  }
-}
-
-let ff = u =>
-  if u == true {
-    1
-  } else {
-    2
-  }
-
-let fi = (x: int, y) => x == y
-let fb = (x: bool, y) => x == y
-let fadd = (x: int, y) => x + y
-let ffadd = (x: float, y) => x +. y
-
-let ss = x => "xx" > x
-
-let bb = x => (
-  true > x,
-  true < x,
-  true >= x,
-  true <= x,
-  false > x,
-  false < x,
-  false >= x,
-  false <= x,
-)
-
-let consts = (
-  true && false,
-  false && false,
-  true && true,
-  false && true,
-  true || false,
-  false || false,
-  true || true,
-  false || true,
-)
-
-let bool_array = [true, false]
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_cast_test.js b/jscomp/test/js_cast_test.js
deleted file mode 100644
index 16044bc..0000000
--- a/jscomp/test/js_cast_test.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var counter = {
-  contents: 0
-};
-
-function add_test(loc, test) {
-  counter.contents = counter.contents + 1 | 0;
-  var id = loc + (" id " + String(counter.contents));
-  suites.contents = {
-    hd: [
-      id,
-      test
-    ],
-    tl: suites.contents
-  };
-}
-
-function eq(loc, x, y) {
-  add_test(loc, (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        }));
-}
-
-eq("File \"js_cast_test.res\", line 14, characters 12-19", true, 1);
-
-eq("File \"js_cast_test.res\", line 16, characters 12-19", false, 0);
-
-eq("File \"js_cast_test.res\", line 18, characters 12-19", 0, 0.0);
-
-eq("File \"js_cast_test.res\", line 20, characters 12-19", 1, 1.0);
-
-eq("File \"js_cast_test.res\", line 22, characters 12-19", 123456789, 123456789.0);
-
-Mt.from_pair_suites("Js_cast_test", suites.contents);
-
-exports.suites = suites;
-exports.add_test = add_test;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/js_cast_test.res b/jscomp/test/js_cast_test.res
deleted file mode 100644
index 8ac03da..0000000
--- a/jscomp/test/js_cast_test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-
-let add_test = {
-  let counter = ref(0)
-  (loc, test) => {
-    incr(counter)
-    let id = loc ++ (" id " ++ string_of_int(counter.contents))
-    suites := list{(id, test), ...suites.contents}
-  }
-}
-
-let eq = (loc, x, y) => add_test(loc, _ => Mt.Eq(x, y))
-
-let () = eq(__LOC__, Js_cast.intOfBool(true), 1)
-
-let () = eq(__LOC__, Js_cast.intOfBool(false), 0)
-
-let () = eq(__LOC__, Js_cast.floatOfInt(0), 0.0)
-
-let () = eq(__LOC__, Js_cast.floatOfInt(1), 1.0)
-
-let () = eq(__LOC__, Js_cast.floatOfInt(123456789), 123456789.0)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/js_date_test.js b/jscomp/test/js_date_test.js
deleted file mode 100644
index 60245bb..0000000
--- a/jscomp/test/js_date_test.js
+++ /dev/null
@@ -1,1110 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-function date(param) {
-  return new Date("1976-03-08T12:34:56.789+01:23");
-}
-
-var suites_0 = [
-  "valueOf",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: 195131516789,
-              _1: new Date("1976-03-08T12:34:56.789+01:23").valueOf()
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "make",
-    (function (param) {
-        return {
-                TAG: "Ok",
-                _0: new Date().getTime() > 1487223505382
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "parseAsFloat",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: Date.parse("1976-03-08T12:34:56.789+01:23"),
-                  _1: 195131516789
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "parseAsFloat_invalid",
-        (function (param) {
-            return {
-                    TAG: "Ok",
-                    _0: Number.isNaN(Date.parse("gibberish"))
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "fromFloat",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: "1976-03-08T11:11:56.789Z",
-                      _1: new Date(195131516789).toISOString()
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "fromString_valid",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: 195131516789,
-                        _1: new Date("1976-03-08T12:34:56.789+01:23").getTime()
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "fromString_invalid",
-              (function (param) {
-                  return {
-                          TAG: "Ok",
-                          _0: Number.isNaN(new Date("gibberish").getTime())
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "makeWithYM",
-                (function (param) {
-                    var d = new Date(1984, 4);
-                    return {
-                            TAG: "Eq",
-                            _0: [
-                              1984,
-                              4
-                            ],
-                            _1: [
-                              d.getFullYear(),
-                              d.getMonth()
-                            ]
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "makeWithYMD",
-                  (function (param) {
-                      var d = new Date(1984, 4, 6);
-                      return {
-                              TAG: "Eq",
-                              _0: [
-                                1984,
-                                4,
-                                6
-                              ],
-                              _1: [
-                                d.getFullYear(),
-                                d.getMonth(),
-                                d.getDate()
-                              ]
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "makeWithYMDH",
-                    (function (param) {
-                        var d = new Date(1984, 4, 6, 3);
-                        return {
-                                TAG: "Eq",
-                                _0: [
-                                  1984,
-                                  4,
-                                  6,
-                                  3
-                                ],
-                                _1: [
-                                  d.getFullYear(),
-                                  d.getMonth(),
-                                  d.getDate(),
-                                  d.getHours()
-                                ]
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "makeWithYMDHM",
-                      (function (param) {
-                          var d = new Date(1984, 4, 6, 3, 59);
-                          return {
-                                  TAG: "Eq",
-                                  _0: [
-                                    1984,
-                                    4,
-                                    6,
-                                    3,
-                                    59
-                                  ],
-                                  _1: [
-                                    d.getFullYear(),
-                                    d.getMonth(),
-                                    d.getDate(),
-                                    d.getHours(),
-                                    d.getMinutes()
-                                  ]
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "makeWithYMDHMS",
-                        (function (param) {
-                            var d = new Date(1984, 4, 6, 3, 59, 27);
-                            return {
-                                    TAG: "Eq",
-                                    _0: [
-                                      1984,
-                                      4,
-                                      6,
-                                      3,
-                                      59,
-                                      27
-                                    ],
-                                    _1: [
-                                      d.getFullYear(),
-                                      d.getMonth(),
-                                      d.getDate(),
-                                      d.getHours(),
-                                      d.getMinutes(),
-                                      d.getSeconds()
-                                    ]
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "utcWithYM",
-                          (function (param) {
-                              var d = Date.UTC(1984, 4);
-                              var d$1 = new Date(d);
-                              return {
-                                      TAG: "Eq",
-                                      _0: [
-                                        1984,
-                                        4
-                                      ],
-                                      _1: [
-                                        d$1.getUTCFullYear(),
-                                        d$1.getUTCMonth()
-                                      ]
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "utcWithYMD",
-                            (function (param) {
-                                var d = Date.UTC(1984, 4, 6);
-                                var d$1 = new Date(d);
-                                return {
-                                        TAG: "Eq",
-                                        _0: [
-                                          1984,
-                                          4,
-                                          6
-                                        ],
-                                        _1: [
-                                          d$1.getUTCFullYear(),
-                                          d$1.getUTCMonth(),
-                                          d$1.getUTCDate()
-                                        ]
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "utcWithYMDH",
-                              (function (param) {
-                                  var d = Date.UTC(1984, 4, 6, 3);
-                                  var d$1 = new Date(d);
-                                  return {
-                                          TAG: "Eq",
-                                          _0: [
-                                            1984,
-                                            4,
-                                            6,
-                                            3
-                                          ],
-                                          _1: [
-                                            d$1.getUTCFullYear(),
-                                            d$1.getUTCMonth(),
-                                            d$1.getUTCDate(),
-                                            d$1.getUTCHours()
-                                          ]
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "utcWithYMDHM",
-                                (function (param) {
-                                    var d = Date.UTC(1984, 4, 6, 3, 59);
-                                    var d$1 = new Date(d);
-                                    return {
-                                            TAG: "Eq",
-                                            _0: [
-                                              1984,
-                                              4,
-                                              6,
-                                              3,
-                                              59
-                                            ],
-                                            _1: [
-                                              d$1.getUTCFullYear(),
-                                              d$1.getUTCMonth(),
-                                              d$1.getUTCDate(),
-                                              d$1.getUTCHours(),
-                                              d$1.getUTCMinutes()
-                                            ]
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "utcWithYMDHMS",
-                                  (function (param) {
-                                      var d = Date.UTC(1984, 4, 6, 3, 59, 27);
-                                      var d$1 = new Date(d);
-                                      return {
-                                              TAG: "Eq",
-                                              _0: [
-                                                1984,
-                                                4,
-                                                6,
-                                                3,
-                                                59,
-                                                27
-                                              ],
-                                              _1: [
-                                                d$1.getUTCFullYear(),
-                                                d$1.getUTCMonth(),
-                                                d$1.getUTCDate(),
-                                                d$1.getUTCHours(),
-                                                d$1.getUTCMinutes(),
-                                                d$1.getUTCSeconds()
-                                              ]
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "getFullYear",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: 1976,
-                                                _1: new Date("1976-03-08T12:34:56.789+01:23").getFullYear()
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "getMilliseconds",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: 789,
-                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").getMilliseconds()
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "getSeconds",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: 56,
-                                                    _1: new Date("1976-03-08T12:34:56.789+01:23").getSeconds()
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "getTime",
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: 195131516789,
-                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").getTime()
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "getUTCDate",
-                                            (function (param) {
-                                                return {
-                                                        TAG: "Eq",
-                                                        _0: 8,
-                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCDate()
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "getUTCDay",
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "Eq",
-                                                          _0: 1,
-                                                          _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCDay()
-                                                        };
-                                                })
-                                            ],
-                                            tl: {
-                                              hd: [
-                                                "getUTCFUllYear",
-                                                (function (param) {
-                                                    return {
-                                                            TAG: "Eq",
-                                                            _0: 1976,
-                                                            _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCFullYear()
-                                                          };
-                                                  })
-                                              ],
-                                              tl: {
-                                                hd: [
-                                                  "getUTCHours",
-                                                  (function (param) {
-                                                      return {
-                                                              TAG: "Eq",
-                                                              _0: 11,
-                                                              _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCHours()
-                                                            };
-                                                    })
-                                                ],
-                                                tl: {
-                                                  hd: [
-                                                    "getUTCMilliseconds",
-                                                    (function (param) {
-                                                        return {
-                                                                TAG: "Eq",
-                                                                _0: 789,
-                                                                _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMilliseconds()
-                                                              };
-                                                      })
-                                                  ],
-                                                  tl: {
-                                                    hd: [
-                                                      "getUTCMinutes",
-                                                      (function (param) {
-                                                          return {
-                                                                  TAG: "Eq",
-                                                                  _0: 11,
-                                                                  _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMinutes()
-                                                                };
-                                                        })
-                                                    ],
-                                                    tl: {
-                                                      hd: [
-                                                        "getUTCMonth",
-                                                        (function (param) {
-                                                            return {
-                                                                    TAG: "Eq",
-                                                                    _0: 2,
-                                                                    _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCMonth()
-                                                                  };
-                                                          })
-                                                      ],
-                                                      tl: {
-                                                        hd: [
-                                                          "getUTCSeconds",
-                                                          (function (param) {
-                                                              return {
-                                                                      TAG: "Eq",
-                                                                      _0: 56,
-                                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").getUTCSeconds()
-                                                                    };
-                                                            })
-                                                        ],
-                                                        tl: {
-                                                          hd: [
-                                                            "getYear",
-                                                            (function (param) {
-                                                                return {
-                                                                        TAG: "Eq",
-                                                                        _0: 1976,
-                                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").getFullYear()
-                                                                      };
-                                                              })
-                                                          ],
-                                                          tl: {
-                                                            hd: [
-                                                              "setDate",
-                                                              (function (param) {
-                                                                  var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                  d.setDate(12);
-                                                                  return {
-                                                                          TAG: "Eq",
-                                                                          _0: 12,
-                                                                          _1: d.getDate()
-                                                                        };
-                                                                })
-                                                            ],
-                                                            tl: {
-                                                              hd: [
-                                                                "setFullYear",
-                                                                (function (param) {
-                                                                    var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                    d.setFullYear(1986);
-                                                                    return {
-                                                                            TAG: "Eq",
-                                                                            _0: 1986,
-                                                                            _1: d.getFullYear()
-                                                                          };
-                                                                  })
-                                                              ],
-                                                              tl: {
-                                                                hd: [
-                                                                  "setFullYearM",
-                                                                  (function (param) {
-                                                                      var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                      d.setFullYear(1986, 7);
-                                                                      return {
-                                                                              TAG: "Eq",
-                                                                              _0: [
-                                                                                1986,
-                                                                                7
-                                                                              ],
-                                                                              _1: [
-                                                                                d.getFullYear(),
-                                                                                d.getMonth()
-                                                                              ]
-                                                                            };
-                                                                    })
-                                                                ],
-                                                                tl: {
-                                                                  hd: [
-                                                                    "setFullYearMD",
-                                                                    (function (param) {
-                                                                        var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                        d.setFullYear(1986, 7, 23);
-                                                                        return {
-                                                                                TAG: "Eq",
-                                                                                _0: [
-                                                                                  1986,
-                                                                                  7,
-                                                                                  23
-                                                                                ],
-                                                                                _1: [
-                                                                                  d.getFullYear(),
-                                                                                  d.getMonth(),
-                                                                                  d.getDate()
-                                                                                ]
-                                                                              };
-                                                                      })
-                                                                  ],
-                                                                  tl: {
-                                                                    hd: [
-                                                                      "setHours",
-                                                                      (function (param) {
-                                                                          var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                          d.setHours(22);
-                                                                          return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: 22,
-                                                                                  _1: d.getHours()
-                                                                                };
-                                                                        })
-                                                                    ],
-                                                                    tl: {
-                                                                      hd: [
-                                                                        "setHoursM",
-                                                                        (function (param) {
-                                                                            var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                            d.setHours(22, 48);
-                                                                            return {
-                                                                                    TAG: "Eq",
-                                                                                    _0: [
-                                                                                      22,
-                                                                                      48
-                                                                                    ],
-                                                                                    _1: [
-                                                                                      d.getHours(),
-                                                                                      d.getMinutes()
-                                                                                    ]
-                                                                                  };
-                                                                          })
-                                                                      ],
-                                                                      tl: {
-                                                                        hd: [
-                                                                          "setHoursMS",
-                                                                          (function (param) {
-                                                                              var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                              d.setHours(22, 48, 54);
-                                                                              return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: [
-                                                                                        22,
-                                                                                        48,
-                                                                                        54
-                                                                                      ],
-                                                                                      _1: [
-                                                                                        d.getHours(),
-                                                                                        d.getMinutes(),
-                                                                                        d.getSeconds()
-                                                                                      ]
-                                                                                    };
-                                                                            })
-                                                                        ],
-                                                                        tl: {
-                                                                          hd: [
-                                                                            "setMilliseconds",
-                                                                            (function (param) {
-                                                                                var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                d.setMilliseconds(543);
-                                                                                return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: 543,
-                                                                                        _1: d.getMilliseconds()
-                                                                                      };
-                                                                              })
-                                                                          ],
-                                                                          tl: {
-                                                                            hd: [
-                                                                              "setMinutes",
-                                                                              (function (param) {
-                                                                                  var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                  d.setMinutes(18);
-                                                                                  return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: 18,
-                                                                                          _1: d.getMinutes()
-                                                                                        };
-                                                                                })
-                                                                            ],
-                                                                            tl: {
-                                                                              hd: [
-                                                                                "setMinutesS",
-                                                                                (function (param) {
-                                                                                    var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                    d.setMinutes(18, 42);
-                                                                                    return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: [
-                                                                                              18,
-                                                                                              42
-                                                                                            ],
-                                                                                            _1: [
-                                                                                              d.getMinutes(),
-                                                                                              d.getSeconds()
-                                                                                            ]
-                                                                                          };
-                                                                                  })
-                                                                              ],
-                                                                              tl: {
-                                                                                hd: [
-                                                                                  "setMinutesSMs",
-                                                                                  (function (param) {
-                                                                                      var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                      d.setMinutes(18, 42, 311);
-                                                                                      return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: [
-                                                                                                18,
-                                                                                                42,
-                                                                                                311
-                                                                                              ],
-                                                                                              _1: [
-                                                                                                d.getMinutes(),
-                                                                                                d.getSeconds(),
-                                                                                                d.getMilliseconds()
-                                                                                              ]
-                                                                                            };
-                                                                                    })
-                                                                                ],
-                                                                                tl: {
-                                                                                  hd: [
-                                                                                    "setMonth",
-                                                                                    (function (param) {
-                                                                                        var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                        d.setMonth(10);
-                                                                                        return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: 10,
-                                                                                                _1: d.getMonth()
-                                                                                              };
-                                                                                      })
-                                                                                  ],
-                                                                                  tl: {
-                                                                                    hd: [
-                                                                                      "setMonthD",
-                                                                                      (function (param) {
-                                                                                          var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                          d.setMonth(10, 14);
-                                                                                          return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: [
-                                                                                                    10,
-                                                                                                    14
-                                                                                                  ],
-                                                                                                  _1: [
-                                                                                                    d.getMonth(),
-                                                                                                    d.getDate()
-                                                                                                  ]
-                                                                                                };
-                                                                                        })
-                                                                                    ],
-                                                                                    tl: {
-                                                                                      hd: [
-                                                                                        "setSeconds",
-                                                                                        (function (param) {
-                                                                                            var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                            d.setSeconds(36);
-                                                                                            return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: 36,
-                                                                                                    _1: d.getSeconds()
-                                                                                                  };
-                                                                                          })
-                                                                                      ],
-                                                                                      tl: {
-                                                                                        hd: [
-                                                                                          "setSecondsMs",
-                                                                                          (function (param) {
-                                                                                              var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                              d.setSeconds(36, 420);
-                                                                                              return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: [
-                                                                                                        36,
-                                                                                                        420
-                                                                                                      ],
-                                                                                                      _1: [
-                                                                                                        d.getSeconds(),
-                                                                                                        d.getMilliseconds()
-                                                                                                      ]
-                                                                                                    };
-                                                                                            })
-                                                                                        ],
-                                                                                        tl: {
-                                                                                          hd: [
-                                                                                            "setUTCDate",
-                                                                                            (function (param) {
-                                                                                                var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                d.setUTCDate(12);
-                                                                                                return {
-                                                                                                        TAG: "Eq",
-                                                                                                        _0: 12,
-                                                                                                        _1: d.getUTCDate()
-                                                                                                      };
-                                                                                              })
-                                                                                          ],
-                                                                                          tl: {
-                                                                                            hd: [
-                                                                                              "setUTCFullYear",
-                                                                                              (function (param) {
-                                                                                                  var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                  d.setUTCFullYear(1986);
-                                                                                                  return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: 1986,
-                                                                                                          _1: d.getUTCFullYear()
-                                                                                                        };
-                                                                                                })
-                                                                                            ],
-                                                                                            tl: {
-                                                                                              hd: [
-                                                                                                "setUTCFullYearM",
-                                                                                                (function (param) {
-                                                                                                    var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                    d.setUTCFullYear(1986, 7);
-                                                                                                    return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: [
-                                                                                                              1986,
-                                                                                                              7
-                                                                                                            ],
-                                                                                                            _1: [
-                                                                                                              d.getUTCFullYear(),
-                                                                                                              d.getUTCMonth()
-                                                                                                            ]
-                                                                                                          };
-                                                                                                  })
-                                                                                              ],
-                                                                                              tl: {
-                                                                                                hd: [
-                                                                                                  "setUTCFullYearMD",
-                                                                                                  (function (param) {
-                                                                                                      var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                      d.setUTCFullYear(1986, 7, 23);
-                                                                                                      return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: [
-                                                                                                                1986,
-                                                                                                                7,
-                                                                                                                23
-                                                                                                              ],
-                                                                                                              _1: [
-                                                                                                                d.getUTCFullYear(),
-                                                                                                                d.getUTCMonth(),
-                                                                                                                d.getUTCDate()
-                                                                                                              ]
-                                                                                                            };
-                                                                                                    })
-                                                                                                ],
-                                                                                                tl: {
-                                                                                                  hd: [
-                                                                                                    "setUTCHours",
-                                                                                                    (function (param) {
-                                                                                                        var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                        d.setUTCHours(22);
-                                                                                                        return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: 22,
-                                                                                                                _1: d.getUTCHours()
-                                                                                                              };
-                                                                                                      })
-                                                                                                  ],
-                                                                                                  tl: {
-                                                                                                    hd: [
-                                                                                                      "setUTCHoursM",
-                                                                                                      (function (param) {
-                                                                                                          var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                          d.setUTCHours(22, 48);
-                                                                                                          return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: [
-                                                                                                                    22,
-                                                                                                                    48
-                                                                                                                  ],
-                                                                                                                  _1: [
-                                                                                                                    d.getUTCHours(),
-                                                                                                                    d.getUTCMinutes()
-                                                                                                                  ]
-                                                                                                                };
-                                                                                                        })
-                                                                                                    ],
-                                                                                                    tl: {
-                                                                                                      hd: [
-                                                                                                        "setUTCHoursMS",
-                                                                                                        (function (param) {
-                                                                                                            var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                            d.setUTCHours(22, 48, 54);
-                                                                                                            return {
-                                                                                                                    TAG: "Eq",
-                                                                                                                    _0: [
-                                                                                                                      22,
-                                                                                                                      48,
-                                                                                                                      54
-                                                                                                                    ],
-                                                                                                                    _1: [
-                                                                                                                      d.getUTCHours(),
-                                                                                                                      d.getUTCMinutes(),
-                                                                                                                      d.getUTCSeconds()
-                                                                                                                    ]
-                                                                                                                  };
-                                                                                                          })
-                                                                                                      ],
-                                                                                                      tl: {
-                                                                                                        hd: [
-                                                                                                          "setUTCMilliseconds",
-                                                                                                          (function (param) {
-                                                                                                              var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                              d.setUTCMilliseconds(543);
-                                                                                                              return {
-                                                                                                                      TAG: "Eq",
-                                                                                                                      _0: 543,
-                                                                                                                      _1: d.getUTCMilliseconds()
-                                                                                                                    };
-                                                                                                            })
-                                                                                                        ],
-                                                                                                        tl: {
-                                                                                                          hd: [
-                                                                                                            "setUTCMinutes",
-                                                                                                            (function (param) {
-                                                                                                                var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                                d.setUTCMinutes(18);
-                                                                                                                return {
-                                                                                                                        TAG: "Eq",
-                                                                                                                        _0: 18,
-                                                                                                                        _1: d.getUTCMinutes()
-                                                                                                                      };
-                                                                                                              })
-                                                                                                          ],
-                                                                                                          tl: {
-                                                                                                            hd: [
-                                                                                                              "setUTCMinutesS",
-                                                                                                              (function (param) {
-                                                                                                                  var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                                  d.setUTCMinutes(18, 42);
-                                                                                                                  return {
-                                                                                                                          TAG: "Eq",
-                                                                                                                          _0: [
-                                                                                                                            18,
-                                                                                                                            42
-                                                                                                                          ],
-                                                                                                                          _1: [
-                                                                                                                            d.getUTCMinutes(),
-                                                                                                                            d.getUTCSeconds()
-                                                                                                                          ]
-                                                                                                                        };
-                                                                                                                })
-                                                                                                            ],
-                                                                                                            tl: {
-                                                                                                              hd: [
-                                                                                                                "setUTCMinutesSMs",
-                                                                                                                (function (param) {
-                                                                                                                    var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                                    d.setUTCMinutes(18, 42, 311);
-                                                                                                                    return {
-                                                                                                                            TAG: "Eq",
-                                                                                                                            _0: [
-                                                                                                                              18,
-                                                                                                                              42,
-                                                                                                                              311
-                                                                                                                            ],
-                                                                                                                            _1: [
-                                                                                                                              d.getUTCMinutes(),
-                                                                                                                              d.getUTCSeconds(),
-                                                                                                                              d.getUTCMilliseconds()
-                                                                                                                            ]
-                                                                                                                          };
-                                                                                                                  })
-                                                                                                              ],
-                                                                                                              tl: {
-                                                                                                                hd: [
-                                                                                                                  "setUTCMonth",
-                                                                                                                  (function (param) {
-                                                                                                                      var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                                      d.setUTCMonth(10);
-                                                                                                                      return {
-                                                                                                                              TAG: "Eq",
-                                                                                                                              _0: 10,
-                                                                                                                              _1: d.getUTCMonth()
-                                                                                                                            };
-                                                                                                                    })
-                                                                                                                ],
-                                                                                                                tl: {
-                                                                                                                  hd: [
-                                                                                                                    "setUTCMonthD",
-                                                                                                                    (function (param) {
-                                                                                                                        var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                                        d.setUTCMonth(10, 14);
-                                                                                                                        return {
-                                                                                                                                TAG: "Eq",
-                                                                                                                                _0: [
-                                                                                                                                  10,
-                                                                                                                                  14
-                                                                                                                                ],
-                                                                                                                                _1: [
-                                                                                                                                  d.getUTCMonth(),
-                                                                                                                                  d.getUTCDate()
-                                                                                                                                ]
-                                                                                                                              };
-                                                                                                                      })
-                                                                                                                  ],
-                                                                                                                  tl: {
-                                                                                                                    hd: [
-                                                                                                                      "setUTCSeconds",
-                                                                                                                      (function (param) {
-                                                                                                                          var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                                          d.setUTCSeconds(36);
-                                                                                                                          return {
-                                                                                                                                  TAG: "Eq",
-                                                                                                                                  _0: 36,
-                                                                                                                                  _1: d.getUTCSeconds()
-                                                                                                                                };
-                                                                                                                        })
-                                                                                                                    ],
-                                                                                                                    tl: {
-                                                                                                                      hd: [
-                                                                                                                        "setUTCSecondsMs",
-                                                                                                                        (function (param) {
-                                                                                                                            var d = new Date("1976-03-08T12:34:56.789+01:23");
-                                                                                                                            d.setUTCSeconds(36, 420);
-                                                                                                                            return {
-                                                                                                                                    TAG: "Eq",
-                                                                                                                                    _0: [
-                                                                                                                                      36,
-                                                                                                                                      420
-                                                                                                                                    ],
-                                                                                                                                    _1: [
-                                                                                                                                      d.getUTCSeconds(),
-                                                                                                                                      d.getUTCMilliseconds()
-                                                                                                                                    ]
-                                                                                                                                  };
-                                                                                                                          })
-                                                                                                                      ],
-                                                                                                                      tl: {
-                                                                                                                        hd: [
-                                                                                                                          "toDateString",
-                                                                                                                          (function (param) {
-                                                                                                                              return {
-                                                                                                                                      TAG: "Eq",
-                                                                                                                                      _0: "Mon Mar 08 1976",
-                                                                                                                                      _1: new Date("1976-03-08T12:34:56.789+01:23").toDateString()
-                                                                                                                                    };
-                                                                                                                            })
-                                                                                                                        ],
-                                                                                                                        tl: {
-                                                                                                                          hd: [
-                                                                                                                            "toGMTString",
-                                                                                                                            (function (param) {
-                                                                                                                                return {
-                                                                                                                                        TAG: "Eq",
-                                                                                                                                        _0: "Mon, 08 Mar 1976 11:11:56 GMT",
-                                                                                                                                        _1: new Date("1976-03-08T12:34:56.789+01:23").toUTCString()
-                                                                                                                                      };
-                                                                                                                              })
-                                                                                                                          ],
-                                                                                                                          tl: {
-                                                                                                                            hd: [
-                                                                                                                              "toISOString",
-                                                                                                                              (function (param) {
-                                                                                                                                  return {
-                                                                                                                                          TAG: "Eq",
-                                                                                                                                          _0: "1976-03-08T11:11:56.789Z",
-                                                                                                                                          _1: new Date("1976-03-08T12:34:56.789+01:23").toISOString()
-                                                                                                                                        };
-                                                                                                                                })
-                                                                                                                            ],
-                                                                                                                            tl: {
-                                                                                                                              hd: [
-                                                                                                                                "toJSON",
-                                                                                                                                (function (param) {
-                                                                                                                                    return {
-                                                                                                                                            TAG: "Eq",
-                                                                                                                                            _0: "1976-03-08T11:11:56.789Z",
-                                                                                                                                            _1: new Date("1976-03-08T12:34:56.789+01:23").toJSON()
-                                                                                                                                          };
-                                                                                                                                  })
-                                                                                                                              ],
-                                                                                                                              tl: {
-                                                                                                                                hd: [
-                                                                                                                                  "toJSONUnsafe",
-                                                                                                                                  (function (param) {
-                                                                                                                                      return {
-                                                                                                                                              TAG: "Eq",
-                                                                                                                                              _0: "1976-03-08T11:11:56.789Z",
-                                                                                                                                              _1: new Date("1976-03-08T12:34:56.789+01:23").toJSON()
-                                                                                                                                            };
-                                                                                                                                    })
-                                                                                                                                ],
-                                                                                                                                tl: {
-                                                                                                                                  hd: [
-                                                                                                                                    "toUTCString",
-                                                                                                                                    (function (param) {
-                                                                                                                                        return {
-                                                                                                                                                TAG: "Eq",
-                                                                                                                                                _0: "Mon, 08 Mar 1976 11:11:56 GMT",
-                                                                                                                                                _1: new Date("1976-03-08T12:34:56.789+01:23").toUTCString()
-                                                                                                                                              };
-                                                                                                                                      })
-                                                                                                                                  ],
-                                                                                                                                  tl: {
-                                                                                                                                    hd: [
-                                                                                                                                      "eq",
-                                                                                                                                      (function (param) {
-                                                                                                                                          var a = new Date("2013-03-01T01:10:00");
-                                                                                                                                          var b = new Date("2013-03-01T01:10:00");
-                                                                                                                                          var c = new Date("2013-03-01T01:10:01");
-                                                                                                                                          return {
-                                                                                                                                                  TAG: "Ok",
-                                                                                                                                                  _0: Caml_obj.equal(a, b) && Caml_obj.notequal(b, c) && Caml_obj.greaterthan(c, b)
-                                                                                                                                                };
-                                                                                                                                        })
-                                                                                                                                    ],
-                                                                                                                                    tl: /* [] */0
-                                                                                                                                  }
-                                                                                                                                }
-                                                                                                                              }
-                                                                                                                            }
-                                                                                                                          }
-                                                                                                                        }
-                                                                                                                      }
-                                                                                                                    }
-                                                                                                                  }
-                                                                                                                }
-                                                                                                              }
-                                                                                                            }
-                                                                                                          }
-                                                                                                        }
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_date_test", suites);
-
-var N;
-
-exports.N = N;
-exports.date = date;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_date_test.res b/jscomp/test/js_date_test.res
deleted file mode 100644
index 2b19872..0000000
--- a/jscomp/test/js_date_test.res
+++ /dev/null
@@ -1,471 +0,0 @@
-module N = Js.Date
-
-let date = () => N.fromString("1976-03-08T12:34:56.789+01:23")
-
-let suites = {
-  open Mt
-  list{
-    ("valueOf", _ => Eq(195131516789., N.valueOf(date()))),
-    ("make", _ => Ok(N.make() |> N.getTime > 1487223505382.)),
-    ("parseAsFloat", _ => Eq(N.parseAsFloat("1976-03-08T12:34:56.789+01:23"), 195131516789.)),
-    ("parseAsFloat_invalid", _ => Ok(N.parseAsFloat("gibberish") |> Js_float.isNaN)),
-    ("fromFloat", _ => Eq("1976-03-08T11:11:56.789Z", N.fromFloat(195131516789.) |> N.toISOString)),
-    (
-      "fromString_valid",
-      _ => Eq(195131516789., N.fromString("1976-03-08T12:34:56.789+01:23") |> N.getTime),
-    ),
-    ("fromString_invalid", _ => Ok(N.fromString("gibberish") |> N.getTime |> Js_float.isNaN)),
-    (
-      "makeWithYM",
-      _ => {
-        let d = N.makeWithYM(~year=1984., ~month=4., ())
-
-        Eq((1984., 4.), (N.getFullYear(d), N.getMonth(d)))
-      },
-    ),
-    (
-      "makeWithYMD",
-      _ => {
-        let d = N.makeWithYMD(~year=1984., ~month=4., ~date=6., ())
-
-        Eq((1984., 4., 6.), (N.getFullYear(d), N.getMonth(d), N.getDate(d)))
-      },
-    ),
-    (
-      "makeWithYMDH",
-      _ => {
-        let d = N.makeWithYMDH(~year=1984., ~month=4., ~date=6., ~hours=3., ())
-
-        Eq((1984., 4., 6., 3.), (N.getFullYear(d), N.getMonth(d), N.getDate(d), N.getHours(d)))
-      },
-    ),
-    (
-      "makeWithYMDHM",
-      _ => {
-        let d = N.makeWithYMDHM(~year=1984., ~month=4., ~date=6., ~hours=3., ~minutes=59., ())
-
-        Eq(
-          (1984., 4., 6., 3., 59.),
-          (N.getFullYear(d), N.getMonth(d), N.getDate(d), N.getHours(d), N.getMinutes(d)),
-        )
-      },
-    ),
-    (
-      "makeWithYMDHMS",
-      _ => {
-        let d = N.makeWithYMDHMS(
-          ~year=1984.,
-          ~month=4.,
-          ~date=6.,
-          ~hours=3.,
-          ~minutes=59.,
-          ~seconds=27.,
-          (),
-        )
-
-        Eq(
-          (1984., 4., 6., 3., 59., 27.),
-          (
-            N.getFullYear(d),
-            N.getMonth(d),
-            N.getDate(d),
-            N.getHours(d),
-            N.getMinutes(d),
-            N.getSeconds(d),
-          ),
-        )
-      },
-    ),
-    (
-      "utcWithYM",
-      _ => {
-        let d = N.utcWithYM(~year=1984., ~month=4., ())
-        let d = N.fromFloat(d)
-
-        Eq((1984., 4.), (N.getUTCFullYear(d), N.getUTCMonth(d)))
-      },
-    ),
-    (
-      "utcWithYMD",
-      _ => {
-        let d = N.utcWithYMD(~year=1984., ~month=4., ~date=6., ())
-        let d = N.fromFloat(d)
-
-        Eq((1984., 4., 6.), (N.getUTCFullYear(d), N.getUTCMonth(d), N.getUTCDate(d)))
-      },
-    ),
-    (
-      "utcWithYMDH",
-      _ => {
-        let d = N.utcWithYMDH(~year=1984., ~month=4., ~date=6., ~hours=3., ())
-        let d = N.fromFloat(d)
-
-        Eq(
-          (1984., 4., 6., 3.),
-          (N.getUTCFullYear(d), N.getUTCMonth(d), N.getUTCDate(d), N.getUTCHours(d)),
-        )
-      },
-    ),
-    (
-      "utcWithYMDHM",
-      _ => {
-        let d = N.utcWithYMDHM(~year=1984., ~month=4., ~date=6., ~hours=3., ~minutes=59., ())
-        let d = N.fromFloat(d)
-
-        Eq(
-          (1984., 4., 6., 3., 59.),
-          (
-            N.getUTCFullYear(d),
-            N.getUTCMonth(d),
-            N.getUTCDate(d),
-            N.getUTCHours(d),
-            N.getUTCMinutes(d),
-          ),
-        )
-      },
-    ),
-    (
-      "utcWithYMDHMS",
-      _ => {
-        let d = N.utcWithYMDHMS(
-          ~year=1984.,
-          ~month=4.,
-          ~date=6.,
-          ~hours=3.,
-          ~minutes=59.,
-          ~seconds=27.,
-          (),
-        )
-        let d = N.fromFloat(d)
-
-        Eq(
-          (1984., 4., 6., 3., 59., 27.),
-          (
-            N.getUTCFullYear(d),
-            N.getUTCMonth(d),
-            N.getUTCDate(d),
-            N.getUTCHours(d),
-            N.getUTCMinutes(d),
-            N.getUTCSeconds(d),
-          ),
-        )
-      },
-    ),
-    /* locale dependent
-    "getDate", (fun _ ->
-      Eq(8., N.getDate (date ())));
-    "getDay", (fun _ ->
-      Eq(1., N.getDay (date ())));
- */
-    ("getFullYear", _ => Eq(1976., N.getFullYear(date()))),
-    /* locale dependent
-    "getHours", (fun _ ->
-      Eq(12., N.getHours (date ())));
- */
-    ("getMilliseconds", _ => Eq(789., N.getMilliseconds(date()))),
-    /* locale dependent
-    "getMinutes", (fun _ ->
-      Eq(11., N.getMinutes (date ())));
-    "getMonth", (fun _ ->
-      Eq(2., N.getMonth (date ())));
- */
-    ("getSeconds", _ => Eq(56., N.getSeconds(date()))),
-    ("getTime", _ => Eq(195131516789., N.getTime(date()))),
-    /* locale depdendent
-    "getTimezoneOffset", (fun _ ->
-      Eq(-60., N.getTimezoneOffset (date ())));
- */
-    ("getUTCDate", _ => Eq(8., N.getUTCDate(date()))),
-    ("getUTCDay", _ => Eq(1., N.getUTCDay(date()))),
-    ("getUTCFUllYear", _ => Eq(1976., N.getUTCFullYear(date()))),
-    ("getUTCHours", _ => Eq(11., N.getUTCHours(date()))),
-    ("getUTCMilliseconds", _ => Eq(789., N.getUTCMilliseconds(date()))),
-    ("getUTCMinutes", _ => Eq(11., N.getUTCMinutes(date()))),
-    ("getUTCMonth", _ => Eq(2., N.getUTCMonth(date()))),
-    ("getUTCSeconds", _ => Eq(56., N.getUTCSeconds(date()))),
-    ("getYear", _ => Eq(1976., N.getFullYear(date()))),
-    (
-      "setDate",
-      _ => {
-        let d = date()
-        let _ = N.setDate(d, 12.)
-
-        Eq(12., N.getDate(d))
-      },
-    ),
-    (
-      "setFullYear",
-      _ => {
-        let d = date()
-        let _ = N.setFullYear(d, 1986.)
-
-        Eq(1986., N.getFullYear(d))
-      },
-    ),
-    (
-      "setFullYearM",
-      _ => {
-        let d = date()
-        let _ = N.setFullYearM(d, ~year=1986., ~month=7., ())
-        Eq((1986., 7.), (N.getFullYear(d), N.getMonth(d)))
-      },
-    ),
-    (
-      "setFullYearMD",
-      _ => {
-        let d = date()
-        let _ = N.setFullYearMD(d, ~year=1986., ~month=7., ~date=23., ())
-        Eq((1986., 7., 23.), (N.getFullYear(d), N.getMonth(d), N.getDate(d)))
-      },
-    ),
-    (
-      "setHours",
-      _ => {
-        let d = date()
-        let _ = N.setHours(d, 22.)
-
-        Eq(22., N.getHours(d))
-      },
-    ),
-    (
-      "setHoursM",
-      _ => {
-        let d = date()
-        let _ = N.setHoursM(d, ~hours=22., ~minutes=48., ())
-        Eq((22., 48.), (N.getHours(d), N.getMinutes(d)))
-      },
-    ),
-    (
-      "setHoursMS",
-      _ => {
-        let d = date()
-        let _ = N.setHoursMS(d, ~hours=22., ~minutes=48., ~seconds=54., ())
-        Eq((22., 48., 54.), (N.getHours(d), N.getMinutes(d), N.getSeconds(d)))
-      },
-    ),
-    (
-      "setMilliseconds",
-      _ => {
-        let d = date()
-        let _ = N.setMilliseconds(d, 543.)
-
-        Eq(543., N.getMilliseconds(d))
-      },
-    ),
-    (
-      "setMinutes",
-      _ => {
-        let d = date()
-        let _ = N.setMinutes(d, 18.)
-
-        Eq(18., N.getMinutes(d))
-      },
-    ),
-    (
-      "setMinutesS",
-      _ => {
-        let d = date()
-        let _ = N.setMinutesS(d, ~minutes=18., ~seconds=42., ())
-        Eq((18., 42.), (N.getMinutes(d), N.getSeconds(d)))
-      },
-    ),
-    (
-      "setMinutesSMs",
-      _ => {
-        let d = date()
-        let _ = N.setMinutesSMs(d, ~minutes=18., ~seconds=42., ~milliseconds=311., ())
-        Eq((18., 42., 311.), (N.getMinutes(d), N.getSeconds(d), N.getMilliseconds(d)))
-      },
-    ),
-    (
-      "setMonth",
-      _ => {
-        let d = date()
-        let _ = N.setMonth(d, 10.)
-
-        Eq(10., N.getMonth(d))
-      },
-    ),
-    (
-      "setMonthD",
-      _ => {
-        let d = date()
-        let _ = N.setMonthD(d, ~month=10., ~date=14., ())
-        Eq((10., 14.), (N.getMonth(d), N.getDate(d)))
-      },
-    ),
-    (
-      "setSeconds",
-      _ => {
-        let d = date()
-        let _ = N.setSeconds(d, 36.)
-
-        Eq(36., N.getSeconds(d))
-      },
-    ),
-    (
-      "setSecondsMs",
-      _ => {
-        let d = date()
-        let _ = N.setSecondsMs(d, ~seconds=36., ~milliseconds=420., ())
-        Eq((36., 420.), (N.getSeconds(d), N.getMilliseconds(d)))
-      },
-    ),
-    (
-      "setUTCDate",
-      _ => {
-        let d = date()
-        let _ = N.setUTCDate(d, 12.)
-
-        Eq(12., N.getUTCDate(d))
-      },
-    ),
-    (
-      "setUTCFullYear",
-      _ => {
-        let d = date()
-        let _ = N.setUTCFullYear(d, 1986.)
-
-        Eq(1986., N.getUTCFullYear(d))
-      },
-    ),
-    (
-      "setUTCFullYearM",
-      _ => {
-        let d = date()
-        let _ = N.setUTCFullYearM(d, ~year=1986., ~month=7., ())
-        Eq((1986., 7.), (N.getUTCFullYear(d), N.getUTCMonth(d)))
-      },
-    ),
-    (
-      "setUTCFullYearMD",
-      _ => {
-        let d = date()
-        let _ = N.setUTCFullYearMD(d, ~year=1986., ~month=7., ~date=23., ())
-        Eq((1986., 7., 23.), (N.getUTCFullYear(d), N.getUTCMonth(d), N.getUTCDate(d)))
-      },
-    ),
-    (
-      "setUTCHours",
-      _ => {
-        let d = date()
-        let _ = N.setUTCHours(d, 22.)
-
-        Eq(22., N.getUTCHours(d))
-      },
-    ),
-    (
-      "setUTCHoursM",
-      _ => {
-        let d = date()
-        let _ = N.setUTCHoursM(d, ~hours=22., ~minutes=48., ())
-        Eq((22., 48.), (N.getUTCHours(d), N.getUTCMinutes(d)))
-      },
-    ),
-    (
-      "setUTCHoursMS",
-      _ => {
-        let d = date()
-        let _ = N.setUTCHoursMS(d, ~hours=22., ~minutes=48., ~seconds=54., ())
-        Eq((22., 48., 54.), (N.getUTCHours(d), N.getUTCMinutes(d), N.getUTCSeconds(d)))
-      },
-    ),
-    (
-      "setUTCMilliseconds",
-      _ => {
-        let d = date()
-        let _ = N.setUTCMilliseconds(d, 543.)
-
-        Eq(543., N.getUTCMilliseconds(d))
-      },
-    ),
-    (
-      "setUTCMinutes",
-      _ => {
-        let d = date()
-        let _ = N.setUTCMinutes(d, 18.)
-
-        Eq(18., N.getUTCMinutes(d))
-      },
-    ),
-    (
-      "setUTCMinutesS",
-      _ => {
-        let d = date()
-        let _ = N.setUTCMinutesS(d, ~minutes=18., ~seconds=42., ())
-        Eq((18., 42.), (N.getUTCMinutes(d), N.getUTCSeconds(d)))
-      },
-    ),
-    (
-      "setUTCMinutesSMs",
-      _ => {
-        let d = date()
-        let _ = N.setUTCMinutesSMs(d, ~minutes=18., ~seconds=42., ~milliseconds=311., ())
-        Eq((18., 42., 311.), (N.getUTCMinutes(d), N.getUTCSeconds(d), N.getUTCMilliseconds(d)))
-      },
-    ),
-    (
-      "setUTCMonth",
-      _ => {
-        let d = date()
-        let _ = N.setUTCMonth(d, 10.)
-
-        Eq(10., N.getUTCMonth(d))
-      },
-    ),
-    (
-      "setUTCMonthD",
-      _ => {
-        let d = date()
-        let _ = N.setUTCMonthD(d, ~month=10., ~date=14., ())
-        Eq((10., 14.), (N.getUTCMonth(d), N.getUTCDate(d)))
-      },
-    ),
-    (
-      "setUTCSeconds",
-      _ => {
-        let d = date()
-        let _ = N.setUTCSeconds(d, 36.)
-
-        Eq(36., N.getUTCSeconds(d))
-      },
-    ),
-    (
-      "setUTCSecondsMs",
-      _ => {
-        let d = date()
-        let _ = N.setUTCSecondsMs(d, ~seconds=36., ~milliseconds=420., ())
-        Eq((36., 420.), (N.getUTCSeconds(d), N.getUTCMilliseconds(d)))
-      },
-    ),
-    ("toDateString", _ => Eq("Mon Mar 08 1976", N.toDateString(date()))),
-    ("toGMTString", _ => Eq("Mon, 08 Mar 1976 11:11:56 GMT", N.toUTCString(date()))),
-    ("toISOString", _ => Eq("1976-03-08T11:11:56.789Z", N.toISOString(date()))),
-    ("toJSON", _ => Eq("1976-03-08T11:11:56.789Z", N.toJSON(date()))),
-    ("toJSONUnsafe", _ => Eq("1976-03-08T11:11:56.789Z", N.toJSONUnsafe(date()))),
-    /* locale dependent
-    "toLocaleDateString", (fun _ ->
-      Eq("3/8/1976", N.toLocaleDateString (date ())));
-    "toLocaleString", (fun _ ->
-      Eq("3/8/1976, 12:11:56 PM", N.toLocaleString (date ())));
-    "toLocaleTimeString", (fun _ ->
-      Eq("12:11:56 PM", N.toLocaleTimeString (date ())));
-    "toString", (fun _ ->
-      Eq("Mon Mar 08 1976 12:11:56 GMT+0100 (CET)", N.toString (date ())));
-    "toTimeString", (fun _ ->
-      Eq("12:11:56 GMT+0100 (CET)", N.toTimeString (date ())));
- */
-    ("toUTCString", _ => Eq("Mon, 08 Mar 1976 11:11:56 GMT", N.toUTCString(date()))),
-    (
-      "eq",
-      _ => {
-        let a = Js.Date.fromString("2013-03-01T01:10:00")
-        let b = Js.Date.fromString("2013-03-01T01:10:00")
-        let c = Js.Date.fromString("2013-03-01T01:10:01")
-        Ok(a == b && (b != c && c > b))
-      },
-    ),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_dict_test.js b/jscomp/test/js_dict_test.js
deleted file mode 100644
index e0a31cd..0000000
--- a/jscomp/test/js_dict_test.js
+++ /dev/null
@@ -1,265 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Js_dict = require("../../lib/js/js_dict.js");
-
-function obj(param) {
-  return {
-          foo: 43,
-          bar: 86
-        };
-}
-
-var suites_0 = [
-  "empty",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: [],
-              _1: Object.keys({})
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "get",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: 43,
-                _1: Js_dict.get({
-                      foo: 43,
-                      bar: 86
-                    }, "foo")
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "get - property not in object",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: undefined,
-                  _1: Js_dict.get({
-                        foo: 43,
-                        bar: 86
-                      }, "baz")
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "unsafe_get",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: 43,
-                    _1: ({
-                          foo: 43,
-                          bar: 86
-                        })["foo"]
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "set",
-          (function (param) {
-              var o = {
-                foo: 43,
-                bar: 86
-              };
-              o["foo"] = 36;
-              return {
-                      TAG: "Eq",
-                      _0: 36,
-                      _1: Js_dict.get(o, "foo")
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "keys",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: [
-                          "foo",
-                          "bar"
-                        ],
-                        _1: Object.keys({
-                              foo: 43,
-                              bar: 86
-                            })
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "entries",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: [
-                            [
-                              "foo",
-                              43
-                            ],
-                            [
-                              "bar",
-                              86
-                            ]
-                          ],
-                          _1: Js_dict.entries({
-                                foo: 43,
-                                bar: 86
-                              })
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "values",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: [
-                              43,
-                              86
-                            ],
-                            _1: Js_dict.values({
-                                  foo: 43,
-                                  bar: 86
-                                })
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "fromList - []",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: {},
-                              _1: Js_dict.fromList(/* [] */0)
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "fromList",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: [
-                                  [
-                                    "x",
-                                    23
-                                  ],
-                                  [
-                                    "y",
-                                    46
-                                  ]
-                                ],
-                                _1: Js_dict.entries(Js_dict.fromList({
-                                          hd: [
-                                            "x",
-                                            23
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "y",
-                                              46
-                                            ],
-                                            tl: /* [] */0
-                                          }
-                                        }))
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "fromArray - []",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: {},
-                                  _1: Js_dict.fromArray([])
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "fromArray",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: [
-                                      [
-                                        "x",
-                                        23
-                                      ],
-                                      [
-                                        "y",
-                                        46
-                                      ]
-                                    ],
-                                    _1: Js_dict.entries(Js_dict.fromArray([
-                                              [
-                                                "x",
-                                                23
-                                              ],
-                                              [
-                                                "y",
-                                                46
-                                              ]
-                                            ]))
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "map",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: {
-                                        foo: "43",
-                                        bar: "86"
-                                      },
-                                      _1: Js_dict.map((function (i) {
-                                              return String(i);
-                                            }), {
-                                            foo: 43,
-                                            bar: 86
-                                          })
-                                    };
-                            })
-                        ],
-                        tl: /* [] */0
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_dict_test", suites);
-
-exports.obj = obj;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_dict_test.res b/jscomp/test/js_dict_test.res
deleted file mode 100644
index 8db7937..0000000
--- a/jscomp/test/js_dict_test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-open Js_dict
-
-let obj = (): t<'a> => Obj.magic({"foo": 43, "bar": 86})
-
-let suites = {
-  open Mt
-  list{
-    ("empty", _ => Eq([], keys(empty()))),
-    ("get", _ => Eq(Some(43), get(obj(), "foo"))),
-    ("get - property not in object", _ => Eq(None, get(obj(), "baz"))),
-    ("unsafe_get", _ => Eq(43, unsafeGet(obj(), "foo"))),
-    (
-      "set",
-      _ => {
-        let o = obj()
-        set(o, "foo", 36)
-        Eq(Some(36), get(o, "foo"))
-      },
-    ),
-    ("keys", _ => Eq(["foo", "bar"], keys(obj()))),
-    ("entries", _ => Eq([("foo", 43), ("bar", 86)], entries(obj()))),
-    ("values", _ => Eq([43, 86], values(obj()))),
-    ("fromList - []", _ => Eq(empty(), fromList(list{}))),
-    ("fromList", _ => Eq([("x", 23), ("y", 46)], fromList(list{("x", 23), ("y", 46)}) |> entries)),
-    ("fromArray - []", _ => Eq(empty(), fromArray([]))),
-    ("fromArray", _ => Eq([("x", 23), ("y", 46)], fromArray([("x", 23), ("y", 46)]) |> entries)),
-    (
-      "map",
-      _ => Eq({"foo": "43", "bar": "86"} |> Obj.magic, map((. i) => string_of_int(i), obj())),
-    ),
-  }
-}
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_exception_catch_test.js b/jscomp/test/js_exception_catch_test.js
deleted file mode 100644
index 59ecc6f..0000000
--- a/jscomp/test/js_exception_catch_test.js
+++ /dev/null
@@ -1,223 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Js_exn = require("../../lib/js/js_exn.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var counter = {
-  contents: 0
-};
-
-function add_test(loc, test) {
-  counter.contents = counter.contents + 1 | 0;
-  var id = loc + (" id " + String(counter.contents));
-  suites.contents = {
-    hd: [
-      id,
-      test
-    ],
-    tl: suites.contents
-  };
-}
-
-function eq(loc, x, y) {
-  add_test(loc, (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        }));
-}
-
-function false_(loc) {
-  add_test(loc, (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-}
-
-function true_(loc) {
-  add_test(loc, (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: true
-                };
-        }));
-}
-
-var exit = 0;
-
-var e;
-
-try {
-  e = JSON.parse(" {\"x\"}");
-  exit = 1;
-}
-catch (raw_x){
-  var x = Caml_js_exceptions.internalToOCamlException(raw_x);
-  if (x.RE_EXN_ID === Js_exn.$$Error) {
-    add_test("File \"js_exception_catch_test.res\", line 18, characters 37-44", (function (param) {
-            return {
-                    TAG: "Ok",
-                    _0: true
-                  };
-          }));
-  } else {
-    throw x;
-  }
-}
-
-if (exit === 1) {
-  add_test("File \"js_exception_catch_test.res\", line 19, characters 14-21", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-}
-
-var A = /* @__PURE__ */Caml_exceptions.create("Js_exception_catch_test.A");
-
-var B = /* @__PURE__ */Caml_exceptions.create("Js_exception_catch_test.B");
-
-var C = /* @__PURE__ */Caml_exceptions.create("Js_exception_catch_test.C");
-
-function test(f) {
-  try {
-    Curry._1(f, undefined);
-    return "No_error";
-  }
-  catch (raw_e){
-    var e = Caml_js_exceptions.internalToOCamlException(raw_e);
-    if (e.RE_EXN_ID === "Not_found") {
-      return "Not_found";
-    } else if (e.RE_EXN_ID === "Invalid_argument") {
-      if (e._1 === "x") {
-        return "Invalid_argument";
-      } else {
-        return "Invalid_any";
-      }
-    } else if (e.RE_EXN_ID === A) {
-      if (e._1 !== 2) {
-        return "A_any";
-      } else {
-        return "A2";
-      }
-    } else if (e.RE_EXN_ID === B) {
-      return "B";
-    } else if (e.RE_EXN_ID === C) {
-      if (e._1 !== 1 || e._2 !== 2) {
-        return "C_any";
-      } else {
-        return "C";
-      }
-    } else if (e.RE_EXN_ID === Js_exn.$$Error) {
-      return "Js_error";
-    } else {
-      return "Any";
-    }
-  }
-}
-
-eq("File \"js_exception_catch_test.res\", line 44, characters 5-12", test(function (param) {
-          
-        }), "No_error");
-
-eq("File \"js_exception_catch_test.res\", line 45, characters 5-12", test(function (param) {
-          throw {
-                RE_EXN_ID: "Not_found",
-                Error: new Error()
-              };
-        }), "Not_found");
-
-eq("File \"js_exception_catch_test.res\", line 46, characters 5-12", test(function (param) {
-          throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "x",
-                Error: new Error()
-              };
-        }), "Invalid_argument");
-
-eq("File \"js_exception_catch_test.res\", line 47, characters 5-12", test(function (param) {
-          throw {
-                RE_EXN_ID: "Invalid_argument",
-                _1: "",
-                Error: new Error()
-              };
-        }), "Invalid_any");
-
-eq("File \"js_exception_catch_test.res\", line 48, characters 5-12", test(function (param) {
-          throw {
-                RE_EXN_ID: A,
-                _1: 2,
-                Error: new Error()
-              };
-        }), "A2");
-
-eq("File \"js_exception_catch_test.res\", line 49, characters 5-12", test(function (param) {
-          throw {
-                RE_EXN_ID: A,
-                _1: 3,
-                Error: new Error()
-              };
-        }), "A_any");
-
-eq("File \"js_exception_catch_test.res\", line 50, characters 5-12", test(function (param) {
-          throw {
-                RE_EXN_ID: B,
-                Error: new Error()
-              };
-        }), "B");
-
-eq("File \"js_exception_catch_test.res\", line 51, characters 5-12", test(function (param) {
-          throw {
-                RE_EXN_ID: C,
-                _1: 1,
-                _2: 2,
-                Error: new Error()
-              };
-        }), "C");
-
-eq("File \"js_exception_catch_test.res\", line 52, characters 5-12", test(function (param) {
-          throw {
-                RE_EXN_ID: C,
-                _1: 0,
-                _2: 2,
-                Error: new Error()
-              };
-        }), "C_any");
-
-eq("File \"js_exception_catch_test.res\", line 53, characters 5-12", test(function (param) {
-          throw new Error("x");
-        }), "Js_error");
-
-eq("File \"js_exception_catch_test.res\", line 54, characters 5-12", test(function (param) {
-          throw {
-                RE_EXN_ID: "Failure",
-                _1: "x",
-                Error: new Error()
-              };
-        }), "Any");
-
-Mt.from_pair_suites("Js_exception_catch_test", suites.contents);
-
-exports.suites = suites;
-exports.add_test = add_test;
-exports.eq = eq;
-exports.false_ = false_;
-exports.true_ = true_;
-exports.A = A;
-exports.B = B;
-exports.C = C;
-exports.test = test;
-/*  Not a pure module */
diff --git a/jscomp/test/js_exception_catch_test.res b/jscomp/test/js_exception_catch_test.res
deleted file mode 100644
index 899a4f8..0000000
--- a/jscomp/test/js_exception_catch_test.res
+++ /dev/null
@@ -1,57 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-
-let add_test = {
-  let counter = ref(0)
-  (loc, test) => {
-    incr(counter)
-    let id = loc ++ (" id " ++ string_of_int(counter.contents))
-    suites := list{(id, test), ...suites.contents}
-  }
-}
-
-let eq = (loc, x, y) => add_test(loc, _ => Mt.Eq(x, y))
-let false_ = loc => add_test(loc, _ => Mt.Ok(false))
-
-let true_ = loc => add_test(loc, _ => Mt.Ok(true))
-
-let () = switch Js.Json.parseExn(` {"x"}`) {
-| exception Js.Exn.Error(x) => true_(__LOC__)
-| e => false_(__LOC__)
-}
-
-exception A(int)
-exception B
-exception C(int, int)
-
-let test = f =>
-  try {
-    f()
-    #No_error
-  } catch {
-  | Not_found => #Not_found
-  | Invalid_argument("x") => #Invalid_argument
-  | Invalid_argument(_) => #Invalid_any
-  | A(2) => #A2
-  | A(_) => #A_any
-  | B => #B
-  | C(1, 2) => #C
-  | C(_) => #C_any
-  | Js.Exn.Error(_) => #Js_error
-  | e => #Any
-  }
-
-let () = {
-  eq(__LOC__, test(_ => ()), #No_error)
-  eq(__LOC__, test(_ => raise(Not_found)), #Not_found)
-  eq(__LOC__, test(_ => invalid_arg("x")), #Invalid_argument)
-  eq(__LOC__, test(_ => invalid_arg("")), #Invalid_any)
-  eq(__LOC__, test(_ => raise(A(2))), #A2)
-  eq(__LOC__, test(_ => raise(A(3))), #A_any)
-  eq(__LOC__, test(_ => raise(B)), #B)
-  eq(__LOC__, test(_ => raise(C(1, 2))), #C)
-  eq(__LOC__, test(_ => raise(C(0, 2))), #C_any)
-  eq(__LOC__, test(_ => Js.Exn.raiseError("x")), #Js_error)
-  eq(__LOC__, test(_ => failwith("x")), #Any)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/js_float_test.js b/jscomp/test/js_float_test.js
deleted file mode 100644
index b2d4567..0000000
--- a/jscomp/test/js_float_test.js
+++ /dev/null
@@ -1,541 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-var suites_0 = [
-  "_NaN <> _NaN",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: false,
-              _1: NaN === NaN
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "isNaN - _NaN",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: true,
-                _1: Number.isNaN(NaN)
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "isNaN - 0.",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: false,
-                  _1: Number.isNaN(0)
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "isFinite - infinity",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: false,
-                    _1: Number.isFinite(Pervasives.infinity)
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "isFinite - neg_infinity",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: false,
-                      _1: Number.isFinite(Pervasives.neg_infinity)
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "isFinite - _NaN",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: false,
-                        _1: Number.isFinite(NaN)
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "isFinite - 0.",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: Number.isFinite(0)
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "toExponential",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: "1.23456e+2",
-                            _1: (123.456).toExponential()
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "toExponential - large number",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: "1.2e+21",
-                              _1: (1.2e21).toExponential()
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "toExponentialWithPrecision - digits:2",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: "1.23e+2",
-                                _1: (123.456).toExponential(2)
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "toExponentialWithPrecision - digits:4",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: "1.2346e+2",
-                                  _1: (123.456).toExponential(4)
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "toExponentialWithPrecision - digits:20",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: "0.00000000000000000000e+0",
-                                    _1: (0).toExponential(20)
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "File \"js_float_test.res\", line 27, characters 5-12",
-                          (function (param) {
-                              return {
-                                      TAG: "ThrowAny",
-                                      _0: (function (param) {
-                                          (0).toExponential(101);
-                                        })
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "toExponentialWithPrecision - digits:-1",
-                            (function (param) {
-                                return {
-                                        TAG: "ThrowAny",
-                                        _0: (function (param) {
-                                            (0).toExponential(-1);
-                                          })
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "toFixed",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: "123",
-                                          _1: (123.456).toFixed()
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "toFixed - large number",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: "1.2e+21",
-                                            _1: (1.2e21).toFixed()
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "toFixedWithPrecision - digits:2",
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: "123.46",
-                                              _1: (123.456).toFixed(2)
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "toFixedWithPrecision - digits:4",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: "123.4560",
-                                                _1: (123.456).toFixed(4)
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "toFixedWithPrecision - digits:20",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: "0.00000000000000000000",
-                                                  _1: (0).toFixed(20)
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "toFixedWithPrecision - digits:101",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "ThrowAny",
-                                                    _0: (function (param) {
-                                                        (0).toFixed(101);
-                                                      })
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "toFixedWithPrecision - digits:-1",
-                                          (function (param) {
-                                              return {
-                                                      TAG: "ThrowAny",
-                                                      _0: (function (param) {
-                                                          (0).toFixed(-1);
-                                                        })
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "toPrecision",
-                                            (function (param) {
-                                                return {
-                                                        TAG: "Eq",
-                                                        _0: "123.456",
-                                                        _1: (123.456).toPrecision()
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "toPrecision - large number",
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "Eq",
-                                                          _0: "1.2e+21",
-                                                          _1: (1.2e21).toPrecision()
-                                                        };
-                                                })
-                                            ],
-                                            tl: {
-                                              hd: [
-                                                "toPrecisionWithPrecision - digits:2",
-                                                (function (param) {
-                                                    return {
-                                                            TAG: "Eq",
-                                                            _0: "1.2e+2",
-                                                            _1: (123.456).toPrecision(2)
-                                                          };
-                                                  })
-                                              ],
-                                              tl: {
-                                                hd: [
-                                                  "toPrecisionWithPrecision - digits:4",
-                                                  (function (param) {
-                                                      return {
-                                                              TAG: "Eq",
-                                                              _0: "123.5",
-                                                              _1: (123.456).toPrecision(4)
-                                                            };
-                                                    })
-                                                ],
-                                                tl: {
-                                                  hd: [
-                                                    "toPrecisionWithPrecision - digits:20",
-                                                    (function (param) {
-                                                        return {
-                                                                TAG: "Eq",
-                                                                _0: "0.0000000000000000000",
-                                                                _1: (0).toPrecision(20)
-                                                              };
-                                                      })
-                                                  ],
-                                                  tl: {
-                                                    hd: [
-                                                      "File \"js_float_test.res\", line 68, characters 5-12",
-                                                      (function (param) {
-                                                          return {
-                                                                  TAG: "ThrowAny",
-                                                                  _0: (function (param) {
-                                                                      (0).toPrecision(101);
-                                                                    })
-                                                                };
-                                                        })
-                                                    ],
-                                                    tl: {
-                                                      hd: [
-                                                        "toPrecisionWithPrecision - digits:-1",
-                                                        (function (param) {
-                                                            return {
-                                                                    TAG: "ThrowAny",
-                                                                    _0: (function (param) {
-                                                                        (0).toPrecision(-1);
-                                                                      })
-                                                                  };
-                                                          })
-                                                      ],
-                                                      tl: {
-                                                        hd: [
-                                                          "toString",
-                                                          (function (param) {
-                                                              return {
-                                                                      TAG: "Eq",
-                                                                      _0: "1.23",
-                                                                      _1: (1.23).toString()
-                                                                    };
-                                                            })
-                                                        ],
-                                                        tl: {
-                                                          hd: [
-                                                            "toString - large number",
-                                                            (function (param) {
-                                                                return {
-                                                                        TAG: "Eq",
-                                                                        _0: "1.2e+21",
-                                                                        _1: (1.2e21).toString()
-                                                                      };
-                                                              })
-                                                          ],
-                                                          tl: {
-                                                            hd: [
-                                                              "toStringWithRadix - radix:2",
-                                                              (function (param) {
-                                                                  return {
-                                                                          TAG: "Eq",
-                                                                          _0: "1111011.0111010010111100011010100111111011111001110111",
-                                                                          _1: (123.456).toString(2)
-                                                                        };
-                                                                })
-                                                            ],
-                                                            tl: {
-                                                              hd: [
-                                                                "toStringWithRadix - radix:16",
-                                                                (function (param) {
-                                                                    return {
-                                                                            TAG: "Eq",
-                                                                            _0: "7b.74bc6a7ef9dc",
-                                                                            _1: (123.456).toString(16)
-                                                                          };
-                                                                  })
-                                                              ],
-                                                              tl: {
-                                                                hd: [
-                                                                  "toStringWithRadix - radix:36",
-                                                                  (function (param) {
-                                                                      return {
-                                                                              TAG: "Eq",
-                                                                              _0: "3f",
-                                                                              _1: (123).toString(36)
-                                                                            };
-                                                                    })
-                                                                ],
-                                                                tl: {
-                                                                  hd: [
-                                                                    "toStringWithRadix - radix:37",
-                                                                    (function (param) {
-                                                                        return {
-                                                                                TAG: "ThrowAny",
-                                                                                _0: (function (param) {
-                                                                                    (0).toString(37);
-                                                                                  })
-                                                                              };
-                                                                      })
-                                                                  ],
-                                                                  tl: {
-                                                                    hd: [
-                                                                      "toStringWithRadix - radix:1",
-                                                                      (function (param) {
-                                                                          return {
-                                                                                  TAG: "ThrowAny",
-                                                                                  _0: (function (param) {
-                                                                                      (0).toString(1);
-                                                                                    })
-                                                                                };
-                                                                        })
-                                                                    ],
-                                                                    tl: {
-                                                                      hd: [
-                                                                        "toStringWithRadix - radix:-1",
-                                                                        (function (param) {
-                                                                            return {
-                                                                                    TAG: "ThrowAny",
-                                                                                    _0: (function (param) {
-                                                                                        (0).toString(-1);
-                                                                                      })
-                                                                                  };
-                                                                          })
-                                                                      ],
-                                                                      tl: {
-                                                                        hd: [
-                                                                          "fromString - 123",
-                                                                          (function (param) {
-                                                                              return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: 123,
-                                                                                      _1: Number("123")
-                                                                                    };
-                                                                            })
-                                                                        ],
-                                                                        tl: {
-                                                                          hd: [
-                                                                            "fromString - 12.3",
-                                                                            (function (param) {
-                                                                                return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: 12.3,
-                                                                                        _1: Number("12.3")
-                                                                                      };
-                                                                              })
-                                                                          ],
-                                                                          tl: {
-                                                                            hd: [
-                                                                              "fromString - empty string",
-                                                                              (function (param) {
-                                                                                  return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: 0,
-                                                                                          _1: Number("")
-                                                                                        };
-                                                                                })
-                                                                            ],
-                                                                            tl: {
-                                                                              hd: [
-                                                                                "fromString - 0x11",
-                                                                                (function (param) {
-                                                                                    return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: 17,
-                                                                                            _1: Number("0x11")
-                                                                                          };
-                                                                                  })
-                                                                              ],
-                                                                              tl: {
-                                                                                hd: [
-                                                                                  "fromString - 0b11",
-                                                                                  (function (param) {
-                                                                                      return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: 3,
-                                                                                              _1: Number("0b11")
-                                                                                            };
-                                                                                    })
-                                                                                ],
-                                                                                tl: {
-                                                                                  hd: [
-                                                                                    "fromString - 0o11",
-                                                                                    (function (param) {
-                                                                                        return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: 9,
-                                                                                                _1: Number("0o11")
-                                                                                              };
-                                                                                      })
-                                                                                  ],
-                                                                                  tl: {
-                                                                                    hd: [
-                                                                                      "fromString - invalid string",
-                                                                                      (function (param) {
-                                                                                          return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: true,
-                                                                                                  _1: Number.isNaN(Number("foo"))
-                                                                                                };
-                                                                                        })
-                                                                                    ],
-                                                                                    tl: /* [] */0
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_float_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_float_test.res b/jscomp/test/js_float_test.res
deleted file mode 100644
index 0d8f0f7..0000000
--- a/jscomp/test/js_float_test.res
+++ /dev/null
@@ -1,109 +0,0 @@
-open Js_float
-
-let suites = {
-  open Mt
-  list{
-    ("_NaN <> _NaN", _ => Eq(false, _NaN == _NaN)),
-    ("isNaN - _NaN", _ => Eq(true, isNaN(_NaN))),
-    ("isNaN - 0.", _ => Eq(false, isNaN(0.))),
-    ("isFinite - infinity", _ => Eq(false, isFinite(infinity))),
-    ("isFinite - neg_infinity", _ => Eq(false, isFinite(neg_infinity))),
-    ("isFinite - _NaN", _ => Eq(false, isFinite(_NaN))),
-    ("isFinite - 0.", _ => Eq(true, isFinite(0.))),
-    ("toExponential", _ => Eq("1.23456e+2", toExponential(123.456))),
-    ("toExponential - large number", _ => Eq("1.2e+21", toExponential(1.2e21))),
-    (
-      "toExponentialWithPrecision - digits:2",
-      _ => Eq("1.23e+2", toExponentialWithPrecision(123.456, ~digits=2)),
-    ),
-    (
-      "toExponentialWithPrecision - digits:4",
-      _ => Eq("1.2346e+2", toExponentialWithPrecision(123.456, ~digits=4)),
-    ),
-    (
-      "toExponentialWithPrecision - digits:20",
-      _ => Eq("0.00000000000000000000e+0", toExponentialWithPrecision(0., ~digits=20)),
-    ),
-    (__LOC__, _ => ThrowAny(() => \"@@"(ignore, toExponentialWithPrecision(0., ~digits=101)))),
-    (
-      "toExponentialWithPrecision - digits:-1",
-      _ => ThrowAny(() => \"@@"(ignore, toExponentialWithPrecision(0., ~digits=-1))),
-    ),
-    ("toFixed", _ => Eq("123", toFixed(123.456))),
-    ("toFixed - large number", _ => Eq("1.2e+21", toFixed(1.2e21))),
-    (
-      "toFixedWithPrecision - digits:2",
-      _ => Eq("123.46", toFixedWithPrecision(123.456, ~digits=2)),
-    ),
-    (
-      "toFixedWithPrecision - digits:4",
-      _ => Eq("123.4560", toFixedWithPrecision(123.456, ~digits=4)),
-    ),
-    (
-      "toFixedWithPrecision - digits:20",
-      _ => Eq("0.00000000000000000000", toFixedWithPrecision(0., ~digits=20)),
-    ),
-    (
-      "toFixedWithPrecision - digits:101",
-      _ => ThrowAny(() => \"@@"(ignore, toFixedWithPrecision(0., ~digits=101))),
-    ),
-    (
-      "toFixedWithPrecision - digits:-1",
-      _ => ThrowAny(() => \"@@"(ignore, toFixedWithPrecision(0., ~digits=-1))),
-    ),
-    ("toPrecision", _ => Eq("123.456", toPrecision(123.456))),
-    ("toPrecision - large number", _ => Eq("1.2e+21", toPrecision(1.2e21))),
-    (
-      "toPrecisionWithPrecision - digits:2",
-      _ => Eq("1.2e+2", toPrecisionWithPrecision(123.456, ~digits=2)),
-    ),
-    (
-      "toPrecisionWithPrecision - digits:4",
-      _ => Eq("123.5", toPrecisionWithPrecision(123.456, ~digits=4)),
-    ),
-    (
-      "toPrecisionWithPrecision - digits:20",
-      _ => Eq("0.0000000000000000000", toPrecisionWithPrecision(0., ~digits=20)),
-    ),
-    (__LOC__, _ => ThrowAny(() => \"@@"(ignore, toPrecisionWithPrecision(0., ~digits=101)))),
-    (
-      "toPrecisionWithPrecision - digits:-1",
-      _ => ThrowAny(() => \"@@"(ignore, toPrecisionWithPrecision(0., ~digits=-1))),
-    ),
-    ("toString", _ => Eq("1.23", toString(1.23))),
-    ("toString - large number", _ => Eq("1.2e+21", toString(1.2e21))),
-    (
-      "toStringWithRadix - radix:2",
-      _ => Eq(
-        "1111011.0111010010111100011010100111111011111001110111",
-        toStringWithRadix(123.456, ~radix=2),
-      ),
-    ),
-    (
-      "toStringWithRadix - radix:16",
-      _ => Eq("7b.74bc6a7ef9dc", toStringWithRadix(123.456, ~radix=16)),
-    ),
-    ("toStringWithRadix - radix:36", _ => Eq("3f", toStringWithRadix(123., ~radix=36))),
-    (
-      "toStringWithRadix - radix:37",
-      _ => ThrowAny(() => \"@@"(ignore, toStringWithRadix(0., ~radix=37))),
-    ),
-    (
-      "toStringWithRadix - radix:1",
-      _ => ThrowAny(() => \"@@"(ignore, toStringWithRadix(0., ~radix=1))),
-    ),
-    (
-      "toStringWithRadix - radix:-1",
-      _ => ThrowAny(() => \"@@"(ignore, toStringWithRadix(0., ~radix=-1))),
-    ),
-    ("fromString - 123", _ => Eq(123., fromString("123"))),
-    ("fromString - 12.3", _ => Eq(12.3, fromString("12.3"))),
-    ("fromString - empty string", _ => Eq(0., fromString(""))),
-    ("fromString - 0x11", _ => Eq(17., fromString("0x11"))),
-    ("fromString - 0b11", _ => Eq(3., fromString("0b11"))),
-    ("fromString - 0o11", _ => Eq(9., fromString("0o11"))),
-    ("fromString - invalid string", _ => Eq(true, fromString("foo") |> isNaN)),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_global_test.js b/jscomp/test/js_global_test.js
deleted file mode 100644
index d1374ee..0000000
--- a/jscomp/test/js_global_test.js
+++ /dev/null
@@ -1,93 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites_0 = [
-  "setTimeout/clearTimeout sanity check",
-  (function (param) {
-      var handle = setTimeout((function (param) {
-              
-            }), 0);
-      clearTimeout(handle);
-      return {
-              TAG: "Ok",
-              _0: true
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "setInerval/clearInterval sanity check",
-    (function (param) {
-        var handle = setInterval((function (param) {
-                
-              }), 0);
-        clearInterval(handle);
-        return {
-                TAG: "Ok",
-                _0: true
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "encodeURI",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: encodeURI("[-=-]"),
-                  _1: "%5B-=-%5D"
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "decodeURI",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: decodeURI("%5B-=-%5D"),
-                    _1: "[-=-]"
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "encodeURIComponent",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: encodeURIComponent("[-=-]"),
-                      _1: "%5B-%3D-%5D"
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "decodeURIComponent",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: decodeURIComponent("%5B-%3D-%5D"),
-                        _1: "[-=-]"
-                      };
-              })
-          ],
-          tl: /* [] */0
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_global_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_global_test.res b/jscomp/test/js_global_test.res
deleted file mode 100644
index fb2fa5c..0000000
--- a/jscomp/test/js_global_test.res
+++ /dev/null
@@ -1,29 +0,0 @@
-open Js_global
-
-let suites = {
-  open Mt
-  list{
-    (
-      "setTimeout/clearTimeout sanity check",
-      _ => {
-        let handle = setTimeout(() => (), 0)
-        clearTimeout(handle)
-        Ok(true)
-      },
-    ),
-    (
-      "setInerval/clearInterval sanity check",
-      _ => {
-        let handle = setInterval(() => (), 0)
-        clearInterval(handle)
-        Ok(true)
-      },
-    ),
-    ("encodeURI", _ => Eq(encodeURI("[-=-]"), "%5B-=-%5D")),
-    ("decodeURI", _ => Eq(decodeURI("%5B-=-%5D"), "[-=-]")),
-    ("encodeURIComponent", _ => Eq(encodeURIComponent("[-=-]"), "%5B-%3D-%5D")),
-    ("decodeURIComponent", _ => Eq(decodeURIComponent("%5B-%3D-%5D"), "[-=-]")),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_int_test.js b/jscomp/test/js_int_test.js
deleted file mode 100644
index 6c4766e..0000000
--- a/jscomp/test/js_int_test.js
+++ /dev/null
@@ -1,250 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites_0 = [
-  "toExponential",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: "1.23456e+5",
-              _1: (123456).toExponential()
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "toExponentialWithPrecision - digits:2",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: "1.23e+5",
-                _1: (123456).toExponential(2)
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "toExponentialWithPrecision - digits:4",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: "1.2346e+5",
-                  _1: (123456).toExponential(4)
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "toExponentialWithPrecision - digits:20",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: "0.00000000000000000000e+0",
-                    _1: (0).toExponential(20)
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "File \"js_int_test.res\", line 19, characters 5-12",
-          (function (param) {
-              return {
-                      TAG: "ThrowAny",
-                      _0: (function (param) {
-                          (0).toExponential(101);
-                        })
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "toExponentialWithPrecision - digits:-1",
-            (function (param) {
-                return {
-                        TAG: "ThrowAny",
-                        _0: (function (param) {
-                            (0).toExponential(-1);
-                          })
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "toPrecision",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: "123456",
-                          _1: (123456).toPrecision()
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "toPrecisionWithPrecision - digits:2",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: "1.2e+5",
-                            _1: (123456).toPrecision(2)
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "toPrecisionWithPrecision - digits:4",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: "1.235e+5",
-                              _1: (123456).toPrecision(4)
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "toPrecisionWithPrecision - digits:20",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: "0.0000000000000000000",
-                                _1: (0).toPrecision(20)
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "File \"js_int_test.res\", line 37, characters 5-12",
-                      (function (param) {
-                          return {
-                                  TAG: "ThrowAny",
-                                  _0: (function (param) {
-                                      (0).toPrecision(101);
-                                    })
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "toPrecisionWithPrecision - digits:-1",
-                        (function (param) {
-                            return {
-                                    TAG: "ThrowAny",
-                                    _0: (function (param) {
-                                        (0).toPrecision(-1);
-                                      })
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "toString",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: "123",
-                                      _1: (123).toString()
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "toStringWithRadix - radix:2",
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: "11110001001000000",
-                                        _1: (123456).toString(2)
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "toStringWithRadix - radix:16",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: "1e240",
-                                          _1: (123456).toString(16)
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "toStringWithRadix - radix:36",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: "2n9c",
-                                            _1: (123456).toString(36)
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "toStringWithRadix - radix:37",
-                                  (function (param) {
-                                      return {
-                                              TAG: "ThrowAny",
-                                              _0: (function (param) {
-                                                  (0).toString(37);
-                                                })
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "toStringWithRadix - radix:1",
-                                    (function (param) {
-                                        return {
-                                                TAG: "ThrowAny",
-                                                _0: (function (param) {
-                                                    (0).toString(1);
-                                                  })
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "toStringWithRadix - radix:-1",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "ThrowAny",
-                                                  _0: (function (param) {
-                                                      (0).toString(-1);
-                                                    })
-                                                };
-                                        })
-                                    ],
-                                    tl: /* [] */0
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_int_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_int_test.res b/jscomp/test/js_int_test.res
deleted file mode 100644
index 9255445..0000000
--- a/jscomp/test/js_int_test.res
+++ /dev/null
@@ -1,64 +0,0 @@
-open Js_int
-
-let suites = {
-  open Mt
-  list{
-    ("toExponential", _ => Eq("1.23456e+5", toExponential(123456))),
-    (
-      "toExponentialWithPrecision - digits:2",
-      _ => Eq("1.23e+5", toExponentialWithPrecision(123456, ~digits=2)),
-    ),
-    (
-      "toExponentialWithPrecision - digits:4",
-      _ => Eq("1.2346e+5", toExponentialWithPrecision(123456, ~digits=4)),
-    ),
-    (
-      "toExponentialWithPrecision - digits:20",
-      _ => Eq("0.00000000000000000000e+0", toExponentialWithPrecision(0, ~digits=20)),
-    ),
-    (__LOC__, _ => ThrowAny(() => \"@@"(ignore, toExponentialWithPrecision(0, ~digits=101)))),
-    (
-      "toExponentialWithPrecision - digits:-1",
-      _ => ThrowAny(() => \"@@"(ignore, toExponentialWithPrecision(0, ~digits=-1))),
-    ),
-    ("toPrecision", _ => Eq("123456", toPrecision(123456))),
-    (
-      "toPrecisionWithPrecision - digits:2",
-      _ => Eq("1.2e+5", toPrecisionWithPrecision(123456, ~digits=2)),
-    ),
-    (
-      "toPrecisionWithPrecision - digits:4",
-      _ => Eq("1.235e+5", toPrecisionWithPrecision(123456, ~digits=4)),
-    ),
-    (
-      "toPrecisionWithPrecision - digits:20",
-      _ => Eq("0.0000000000000000000", toPrecisionWithPrecision(0, ~digits=20)),
-    ),
-    (__LOC__, _ => ThrowAny(() => \"@@"(ignore, toPrecisionWithPrecision(0, ~digits=101)))),
-    (
-      "toPrecisionWithPrecision - digits:-1",
-      _ => ThrowAny(() => \"@@"(ignore, toPrecisionWithPrecision(0, ~digits=-1))),
-    ),
-    ("toString", _ => Eq("123", toString(123))),
-    (
-      "toStringWithRadix - radix:2",
-      _ => Eq("11110001001000000", toStringWithRadix(123456, ~radix=2)),
-    ),
-    ("toStringWithRadix - radix:16", _ => Eq("1e240", toStringWithRadix(123456, ~radix=16))),
-    ("toStringWithRadix - radix:36", _ => Eq("2n9c", toStringWithRadix(123456, ~radix=36))),
-    (
-      "toStringWithRadix - radix:37",
-      _ => ThrowAny(() => \"@@"(ignore, toStringWithRadix(0, ~radix=37))),
-    ),
-    (
-      "toStringWithRadix - radix:1",
-      _ => ThrowAny(() => \"@@"(ignore, toStringWithRadix(0, ~radix=1))),
-    ),
-    (
-      "toStringWithRadix - radix:-1",
-      _ => ThrowAny(() => \"@@"(ignore, toStringWithRadix(0, ~radix=-1))),
-    ),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_json_test.js b/jscomp/test/js_json_test.js
deleted file mode 100644
index 8068a48..0000000
--- a/jscomp/test/js_json_test.js
+++ /dev/null
@@ -1,788 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Js_dict = require("../../lib/js/js_dict.js");
-var Js_json = require("../../lib/js/js_json.js");
-var Belt_List = require("../../lib/js/belt_List.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var counter = {
-  contents: 0
-};
-
-function add_test(loc, test) {
-  counter.contents = counter.contents + 1 | 0;
-  var id = loc + (" id " + String(counter.contents));
-  suites.contents = {
-    hd: [
-      id,
-      test
-    ],
-    tl: suites.contents
-  };
-}
-
-function eq(loc, x, y) {
-  add_test(loc, (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        }));
-}
-
-function false_(loc) {
-  add_test(loc, (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-}
-
-function true_(loc) {
-  add_test(loc, (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: true
-                };
-        }));
-}
-
-var v = JSON.parse(" { \"x\" : [1, 2, 3 ] } ");
-
-add_test("File \"js_json_test.res\", line 22, characters 11-18", (function (param) {
-        var ty = Js_json.classify(v);
-        if (typeof ty !== "object") {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }
-        if (ty.TAG !== "JSONObject") {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }
-        var v$1 = Js_dict.get(ty._0, "x");
-        if (v$1 === undefined) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }
-        var ty2 = Js_json.classify(v$1);
-        if (typeof ty2 !== "object") {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }
-        if (ty2.TAG !== "JSONArray") {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }
-        ty2._0.forEach(function (x) {
-              var ty3 = Js_json.classify(x);
-              if (typeof ty3 !== "object") {
-                throw {
-                      RE_EXN_ID: "Assert_failure",
-                      _1: [
-                        "js_json_test.res",
-                        37,
-                        19
-                      ],
-                      Error: new Error()
-                    };
-              }
-              if (ty3.TAG === "JSONNumber") {
-                return ;
-              }
-              throw {
-                    RE_EXN_ID: "Assert_failure",
-                    _1: [
-                      "js_json_test.res",
-                      37,
-                      19
-                    ],
-                    Error: new Error()
-                  };
-            });
-        return {
-                TAG: "Ok",
-                _0: true
-              };
-      }));
-
-eq("File \"js_json_test.res\", line 48, characters 5-12", Js_json.test(v, "Object"), true);
-
-var json = JSON.parse(JSON.stringify(null));
-
-var ty = Js_json.classify(json);
-
-if (typeof ty !== "object") {
-  if (ty === "JSONNull") {
-    add_test("File \"js_json_test.res\", line 55, characters 24-31", (function (param) {
-            return {
-                    TAG: "Ok",
-                    _0: true
-                  };
-          }));
-  } else {
-    console.log(ty);
-    add_test("File \"js_json_test.res\", line 58, characters 11-18", (function (param) {
-            return {
-                    TAG: "Ok",
-                    _0: false
-                  };
-          }));
-  }
-} else {
-  console.log(ty);
-  add_test("File \"js_json_test.res\", line 58, characters 11-18", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-}
-
-var json$1 = JSON.parse(JSON.stringify("test string"));
-
-var ty$1 = Js_json.classify(json$1);
-
-if (typeof ty$1 !== "object") {
-  add_test("File \"js_json_test.res\", line 68, characters 16-23", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-} else if (ty$1.TAG === "JSONString") {
-  eq("File \"js_json_test.res\", line 67, characters 26-33", ty$1._0, "test string");
-} else {
-  add_test("File \"js_json_test.res\", line 68, characters 16-23", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-}
-
-var json$2 = JSON.parse(JSON.stringify(1.23456789));
-
-var ty$2 = Js_json.classify(json$2);
-
-var exit = 0;
-
-if (typeof ty$2 !== "object" || ty$2.TAG !== "JSONNumber") {
-  exit = 1;
-} else {
-  eq("File \"js_json_test.res\", line 77, characters 26-33", ty$2._0, 1.23456789);
-}
-
-if (exit === 1) {
-  add_test("File \"js_json_test.res\", line 78, characters 18-25", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-}
-
-var json$3 = JSON.parse(JSON.stringify(-1347440721));
-
-var ty$3 = Js_json.classify(json$3);
-
-var exit$1 = 0;
-
-if (typeof ty$3 !== "object" || ty$3.TAG !== "JSONNumber") {
-  exit$1 = 1;
-} else {
-  eq("File \"js_json_test.res\", line 87, characters 26-33", ty$3._0 | 0, -1347440721);
-}
-
-if (exit$1 === 1) {
-  add_test("File \"js_json_test.res\", line 88, characters 18-25", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-}
-
-function test(v) {
-  var json = JSON.parse(JSON.stringify(v));
-  var ty = Js_json.classify(json);
-  if (typeof ty === "object") {
-    return add_test("File \"js_json_test.res\", line 100, characters 18-25", (function (param) {
-                  return {
-                          TAG: "Ok",
-                          _0: false
-                        };
-                }));
-  }
-  switch (ty) {
-    case "JSONFalse" :
-        return eq("File \"js_json_test.res\", line 99, characters 24-31", false, v);
-    case "JSONTrue" :
-        return eq("File \"js_json_test.res\", line 98, characters 23-30", true, v);
-    default:
-      return add_test("File \"js_json_test.res\", line 100, characters 18-25", (function (param) {
-                    return {
-                            TAG: "Ok",
-                            _0: false
-                          };
-                  }));
-  }
-}
-
-test(true);
-
-test(false);
-
-function option_get(x) {
-  if (x !== undefined) {
-    return Caml_option.valFromOption(x);
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "js_json_test.res",
-          111,
-          12
-        ],
-        Error: new Error()
-      };
-}
-
-var dict = {};
-
-dict["a"] = "test string";
-
-dict["b"] = 123.0;
-
-var json$4 = JSON.parse(JSON.stringify(dict));
-
-var ty$4 = Js_json.classify(json$4);
-
-if (typeof ty$4 !== "object") {
-  add_test("File \"js_json_test.res\", line 142, characters 16-23", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-} else if (ty$4.TAG === "JSONObject") {
-  var x = ty$4._0;
-  var ta = Js_json.classify(option_get(Js_dict.get(x, "a")));
-  if (typeof ta !== "object") {
-    add_test("File \"js_json_test.res\", line 140, characters 18-25", (function (param) {
-            return {
-                    TAG: "Ok",
-                    _0: false
-                  };
-          }));
-  } else if (ta.TAG === "JSONString") {
-    if (ta._0 !== "test string") {
-      add_test("File \"js_json_test.res\", line 131, characters 15-22", (function (param) {
-              return {
-                      TAG: "Ok",
-                      _0: false
-                    };
-            }));
-    } else {
-      var ty$5 = Js_json.classify(option_get(Js_dict.get(x, "b")));
-      if (typeof ty$5 !== "object") {
-        add_test("File \"js_json_test.res\", line 137, characters 22-29", (function (param) {
-                return {
-                        TAG: "Ok",
-                        _0: false
-                      };
-              }));
-      } else if (ty$5.TAG === "JSONNumber") {
-        var b = ty$5._0;
-        add_test("File \"js_json_test.res\", line 136, characters 38-45", (function (param) {
-                return {
-                        TAG: "Approx",
-                        _0: 123.0,
-                        _1: b
-                      };
-              }));
-      } else {
-        add_test("File \"js_json_test.res\", line 137, characters 22-29", (function (param) {
-                return {
-                        TAG: "Ok",
-                        _0: false
-                      };
-              }));
-      }
-    }
-  } else {
-    add_test("File \"js_json_test.res\", line 140, characters 18-25", (function (param) {
-            return {
-                    TAG: "Ok",
-                    _0: false
-                  };
-          }));
-  }
-} else {
-  add_test("File \"js_json_test.res\", line 142, characters 16-23", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-}
-
-function eq_at_i(loc, json, i, kind, expected) {
-  var ty = Js_json.classify(json);
-  if (typeof ty !== "object") {
-    return add_test(loc, (function (param) {
-                  return {
-                          TAG: "Ok",
-                          _0: false
-                        };
-                }));
-  }
-  if (ty.TAG !== "JSONArray") {
-    return add_test(loc, (function (param) {
-                  return {
-                          TAG: "Ok",
-                          _0: false
-                        };
-                }));
-  }
-  var ty$1 = Js_json.classify(Caml_array.get(ty._0, i));
-  switch (kind) {
-    case "String" :
-        if (typeof ty$1 !== "object") {
-          return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
-        } else if (ty$1.TAG === "JSONString") {
-          return eq(loc, ty$1._0, expected);
-        } else {
-          return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
-        }
-    case "Number" :
-        if (typeof ty$1 !== "object") {
-          return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
-        } else if (ty$1.TAG === "JSONNumber") {
-          return eq(loc, ty$1._0, expected);
-        } else {
-          return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
-        }
-    case "Object" :
-        if (typeof ty$1 !== "object") {
-          return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
-        } else if (ty$1.TAG === "JSONObject") {
-          return eq(loc, ty$1._0, expected);
-        } else {
-          return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
-        }
-    case "Array" :
-        if (typeof ty$1 !== "object") {
-          return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
-        } else if (ty$1.TAG === "JSONArray") {
-          return eq(loc, ty$1._0, expected);
-        } else {
-          return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
-        }
-    case "Boolean" :
-        if (typeof ty$1 === "object") {
-          return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
-        }
-        switch (ty$1) {
-          case "JSONFalse" :
-              return eq(loc, false, expected);
-          case "JSONTrue" :
-              return eq(loc, true, expected);
-          default:
-            return add_test(loc, (function (param) {
-                          return {
-                                  TAG: "Ok",
-                                  _0: false
-                                };
-                        }));
-        }
-    case "Null" :
-        if (typeof ty$1 !== "object") {
-          if (ty$1 === "JSONNull") {
-            return add_test(loc, (function (param) {
-                          return {
-                                  TAG: "Ok",
-                                  _0: true
-                                };
-                        }));
-          } else {
-            return add_test(loc, (function (param) {
-                          return {
-                                  TAG: "Ok",
-                                  _0: false
-                                };
-                        }));
-          }
-        } else {
-          return add_test(loc, (function (param) {
-                        return {
-                                TAG: "Ok",
-                                _0: false
-                              };
-                      }));
-        }
-    
-  }
-}
-
-var json$5 = JSON.parse(JSON.stringify($$Array.map((function (prim) {
-                return prim;
-              }), [
-              "string 0",
-              "string 1",
-              "string 2"
-            ])));
-
-eq_at_i("File \"js_json_test.res\", line 199, characters 10-17", json$5, 0, "String", "string 0");
-
-eq_at_i("File \"js_json_test.res\", line 200, characters 10-17", json$5, 1, "String", "string 1");
-
-eq_at_i("File \"js_json_test.res\", line 201, characters 10-17", json$5, 2, "String", "string 2");
-
-var json$6 = JSON.parse(JSON.stringify([
-          "string 0",
-          "string 1",
-          "string 2"
-        ]));
-
-eq_at_i("File \"js_json_test.res\", line 208, characters 10-17", json$6, 0, "String", "string 0");
-
-eq_at_i("File \"js_json_test.res\", line 209, characters 10-17", json$6, 1, "String", "string 1");
-
-eq_at_i("File \"js_json_test.res\", line 210, characters 10-17", json$6, 2, "String", "string 2");
-
-var a = [
-  1.0000001,
-  10000000000.1,
-  123.0
-];
-
-var json$7 = JSON.parse(JSON.stringify(a));
-
-eq_at_i("File \"js_json_test.res\", line 219, characters 10-17", json$7, 0, "Number", Caml_array.get(a, 0));
-
-eq_at_i("File \"js_json_test.res\", line 220, characters 10-17", json$7, 1, "Number", Caml_array.get(a, 1));
-
-eq_at_i("File \"js_json_test.res\", line 221, characters 10-17", json$7, 2, "Number", Caml_array.get(a, 2));
-
-var a$1 = [
-  0,
-  -1347440721,
-  -268391749
-];
-
-var json$8 = JSON.parse(JSON.stringify($$Array.map((function (prim) {
-                return prim;
-              }), a$1)));
-
-eq_at_i("File \"js_json_test.res\", line 230, characters 10-17", json$8, 0, "Number", Caml_array.get(a$1, 0));
-
-eq_at_i("File \"js_json_test.res\", line 231, characters 10-17", json$8, 1, "Number", Caml_array.get(a$1, 1));
-
-eq_at_i("File \"js_json_test.res\", line 232, characters 10-17", json$8, 2, "Number", Caml_array.get(a$1, 2));
-
-var a$2 = [
-  true,
-  false,
-  true
-];
-
-var json$9 = JSON.parse(JSON.stringify(a$2));
-
-eq_at_i("File \"js_json_test.res\", line 241, characters 10-17", json$9, 0, "Boolean", Caml_array.get(a$2, 0));
-
-eq_at_i("File \"js_json_test.res\", line 242, characters 10-17", json$9, 1, "Boolean", Caml_array.get(a$2, 1));
-
-eq_at_i("File \"js_json_test.res\", line 243, characters 10-17", json$9, 2, "Boolean", Caml_array.get(a$2, 2));
-
-function make_d(s, i) {
-  var d = {};
-  d["a"] = s;
-  d["b"] = i;
-  return d;
-}
-
-var a$3 = [
-  make_d("aaa", 123),
-  make_d("bbb", 456)
-];
-
-var json$10 = JSON.parse(JSON.stringify(a$3));
-
-var ty$6 = Js_json.classify(json$10);
-
-if (typeof ty$6 !== "object") {
-  add_test("File \"js_json_test.res\", line 271, characters 16-23", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-} else if (ty$6.TAG === "JSONArray") {
-  var ty$7 = Js_json.classify(Caml_array.get(ty$6._0, 1));
-  if (typeof ty$7 !== "object") {
-    add_test("File \"js_json_test.res\", line 269, characters 18-25", (function (param) {
-            return {
-                    TAG: "Ok",
-                    _0: false
-                  };
-          }));
-  } else if (ty$7.TAG === "JSONObject") {
-    var ty$8 = Js_json.classify(option_get(Js_dict.get(ty$7._0, "a")));
-    if (typeof ty$8 !== "object") {
-      add_test("File \"js_json_test.res\", line 267, characters 20-27", (function (param) {
-              return {
-                      TAG: "Ok",
-                      _0: false
-                    };
-            }));
-    } else if (ty$8.TAG === "JSONString") {
-      eq("File \"js_json_test.res\", line 266, characters 35-42", ty$8._0, "bbb");
-    } else {
-      add_test("File \"js_json_test.res\", line 267, characters 20-27", (function (param) {
-              return {
-                      TAG: "Ok",
-                      _0: false
-                    };
-            }));
-    }
-  } else {
-    add_test("File \"js_json_test.res\", line 269, characters 18-25", (function (param) {
-            return {
-                    TAG: "Ok",
-                    _0: false
-                  };
-          }));
-  }
-} else {
-  add_test("File \"js_json_test.res\", line 271, characters 16-23", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-}
-
-try {
-  JSON.parse("{{ A}");
-  add_test("File \"js_json_test.res\", line 279, characters 11-18", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: false
-                };
-        }));
-}
-catch (exn){
-  add_test("File \"js_json_test.res\", line 281, characters 17-24", (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: true
-                };
-        }));
-}
-
-eq("File \"js_json_test.res\", line 287, characters 12-19", JSON.stringify([
-          1,
-          2,
-          3
-        ]), "[1,2,3]");
-
-eq("File \"js_json_test.res\", line 290, characters 2-9", JSON.stringify({
-          foo: 1,
-          bar: "hello",
-          baz: {
-            baaz: 10
-          }
-        }), "{\"foo\":1,\"bar\":\"hello\",\"baz\":{\"baaz\":10}}");
-
-eq("File \"js_json_test.res\", line 295, characters 12-19", JSON.stringify(null), "null");
-
-eq("File \"js_json_test.res\", line 297, characters 12-19", JSON.stringify(undefined), undefined);
-
-eq("File \"js_json_test.res\", line 300, characters 5-12", Js_json.decodeString("test"), "test");
-
-eq("File \"js_json_test.res\", line 301, characters 5-12", Js_json.decodeString(true), undefined);
-
-eq("File \"js_json_test.res\", line 302, characters 5-12", Js_json.decodeString([]), undefined);
-
-eq("File \"js_json_test.res\", line 303, characters 5-12", Js_json.decodeString(null), undefined);
-
-eq("File \"js_json_test.res\", line 304, characters 5-12", Js_json.decodeString({}), undefined);
-
-eq("File \"js_json_test.res\", line 305, characters 5-12", Js_json.decodeString(1.23), undefined);
-
-eq("File \"js_json_test.res\", line 309, characters 5-12", Js_json.decodeNumber("test"), undefined);
-
-eq("File \"js_json_test.res\", line 310, characters 5-12", Js_json.decodeNumber(true), undefined);
-
-eq("File \"js_json_test.res\", line 311, characters 5-12", Js_json.decodeNumber([]), undefined);
-
-eq("File \"js_json_test.res\", line 312, characters 5-12", Js_json.decodeNumber(null), undefined);
-
-eq("File \"js_json_test.res\", line 313, characters 5-12", Js_json.decodeNumber({}), undefined);
-
-eq("File \"js_json_test.res\", line 314, characters 5-12", Js_json.decodeNumber(1.23), 1.23);
-
-eq("File \"js_json_test.res\", line 318, characters 5-12", Js_json.decodeObject("test"), undefined);
-
-eq("File \"js_json_test.res\", line 319, characters 5-12", Js_json.decodeObject(true), undefined);
-
-eq("File \"js_json_test.res\", line 320, characters 5-12", Js_json.decodeObject([]), undefined);
-
-eq("File \"js_json_test.res\", line 321, characters 5-12", Js_json.decodeObject(null), undefined);
-
-eq("File \"js_json_test.res\", line 322, characters 5-12", Js_json.decodeObject({}), {});
-
-eq("File \"js_json_test.res\", line 323, characters 5-12", Js_json.decodeObject(1.23), undefined);
-
-eq("File \"js_json_test.res\", line 327, characters 5-12", Js_json.decodeArray("test"), undefined);
-
-eq("File \"js_json_test.res\", line 328, characters 5-12", Js_json.decodeArray(true), undefined);
-
-eq("File \"js_json_test.res\", line 329, characters 5-12", Js_json.decodeArray([]), []);
-
-eq("File \"js_json_test.res\", line 330, characters 5-12", Js_json.decodeArray(null), undefined);
-
-eq("File \"js_json_test.res\", line 331, characters 5-12", Js_json.decodeArray({}), undefined);
-
-eq("File \"js_json_test.res\", line 332, characters 5-12", Js_json.decodeArray(1.23), undefined);
-
-eq("File \"js_json_test.res\", line 336, characters 5-12", Js_json.decodeBoolean("test"), undefined);
-
-eq("File \"js_json_test.res\", line 337, characters 5-12", Js_json.decodeBoolean(true), true);
-
-eq("File \"js_json_test.res\", line 338, characters 5-12", Js_json.decodeBoolean([]), undefined);
-
-eq("File \"js_json_test.res\", line 339, characters 5-12", Js_json.decodeBoolean(null), undefined);
-
-eq("File \"js_json_test.res\", line 340, characters 5-12", Js_json.decodeBoolean({}), undefined);
-
-eq("File \"js_json_test.res\", line 341, characters 5-12", Js_json.decodeBoolean(1.23), undefined);
-
-eq("File \"js_json_test.res\", line 345, characters 5-12", Js_json.decodeNull("test"), undefined);
-
-eq("File \"js_json_test.res\", line 346, characters 5-12", Js_json.decodeNull(true), undefined);
-
-eq("File \"js_json_test.res\", line 347, characters 5-12", Js_json.decodeNull([]), undefined);
-
-eq("File \"js_json_test.res\", line 348, characters 5-12", Js_json.decodeNull(null), null);
-
-eq("File \"js_json_test.res\", line 349, characters 5-12", Js_json.decodeNull({}), undefined);
-
-eq("File \"js_json_test.res\", line 350, characters 5-12", Js_json.decodeNull(1.23), undefined);
-
-function id(obj) {
-  return Js_json.deserializeUnsafe(Js_json.serializeExn(obj));
-}
-
-function idtest(obj) {
-  eq("File \"js_json_test.res\", line 355, characters 23-30", obj, Js_json.deserializeUnsafe(Js_json.serializeExn(obj)));
-}
-
-idtest(undefined);
-
-idtest({
-      hd: [
-        undefined,
-        undefined,
-        undefined
-      ],
-      tl: /* [] */0
-    });
-
-idtest(Belt_List.makeBy(500, (function (i) {
-            if (i % 2 === 0) {
-              return ;
-            } else {
-              return 1;
-            }
-          })));
-
-idtest(Belt_Array.makeBy(500, (function (i) {
-            if (i % 2 === 0) {
-              return ;
-            } else {
-              return 1;
-            }
-          })));
-
-Mt.from_pair_suites("Js_json_test", suites.contents);
-
-var J;
-
-exports.suites = suites;
-exports.J = J;
-exports.add_test = add_test;
-exports.eq = eq;
-exports.false_ = false_;
-exports.true_ = true_;
-exports.option_get = option_get;
-exports.eq_at_i = eq_at_i;
-exports.id = id;
-exports.idtest = idtest;
-/* v Not a pure module */
diff --git a/jscomp/test/js_json_test.res b/jscomp/test/js_json_test.res
deleted file mode 100644
index 04086a7..0000000
--- a/jscomp/test/js_json_test.res
+++ /dev/null
@@ -1,379 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-module J = Js.Json
-
-let add_test = {
-  let counter = ref(0)
-  (loc, test) => {
-    incr(counter)
-    let id = loc ++ (" id " ++ string_of_int(counter.contents))
-    suites := list{(id, test), ...suites.contents}
-  }
-}
-
-let eq = (loc, x, y) => add_test(loc, _ => Mt.Eq(x, y))
-
-let false_ = loc => add_test(loc, _ => Mt.Ok(false))
-
-let true_ = loc => add_test(loc, _ => Mt.Ok(true))
-
-let () = {
-  let v = J.parseExn(` { "x" : [1, 2, 3 ] } `)
-
-  add_test(__LOC__, _ => {
-    let ty = J.classify(v)
-    switch ty {
-    | J.JSONObject(x) =>
-      /* compiler infer x : J.t Js.Dict.t */
-      switch Js.Dict.get(x, "x") {
-      | Some(v) =>
-        let ty2 = J.classify(v)
-        switch ty2 {
-        | J.JSONArray(x) =>
-          /* compiler infer x : J.t array */
-          x->Js.Array2.forEach(x => {
-            let ty3 = J.classify(x)
-            switch ty3 {
-            | J.JSONNumber(_) => ()
-            | _ => assert(false)
-            }
-          }) |> (() => Mt.Ok(true))
-        | _ => Mt.Ok(false)
-        }
-      | None => Mt.Ok(false)
-      }
-    | _ => Mt.Ok(false)
-    }
-  })
-
-  eq(__LOC__, J.test(v, Object), true)
-}
-
-let () = {
-  let json = J.null |> J.stringify |> J.parseExn
-  let ty = J.classify(json)
-  switch ty {
-  | J.JSONNull => true_(__LOC__)
-  | _ =>
-    Js.log(ty)
-    false_(__LOC__)
-  }
-}
-
-let () = {
-  let json = J.string("test string") |> J.stringify |> J.parseExn
-
-  let ty = J.classify(json)
-  switch ty {
-  | J.JSONString(x) => eq(__LOC__, x, "test string")
-  | _ => false_(__LOC__)
-  }
-}
-
-let () = {
-  let json = J.number(1.23456789) |> J.stringify |> J.parseExn
-
-  let ty = J.classify(json)
-  switch ty {
-  | J.JSONNumber(x) => eq(__LOC__, x, 1.23456789)
-  | _ => add_test(__LOC__, _ => Mt.Ok(false))
-  }
-}
-
-let () = {
-  let json = J.number(float_of_int(0xAFAFAFAF)) |> J.stringify |> J.parseExn
-
-  let ty = J.classify(json)
-  switch ty {
-  | J.JSONNumber(x) => eq(__LOC__, int_of_float(x), 0xAFAFAFAF)
-  | _ => add_test(__LOC__, _ => Mt.Ok(false))
-  }
-}
-
-let () = {
-  let test = v => {
-    let json = J.boolean(v) |> J.stringify |> J.parseExn
-
-    let ty = J.classify(json)
-    switch ty {
-    | J.JSONTrue => eq(__LOC__, true, v)
-    | J.JSONFalse => eq(__LOC__, false, v)
-    | _ => false_(__LOC__)
-    }
-  }
-
-  test(true)
-  test(false)
-  ()
-}
-
-let option_get = x =>
-  switch x {
-  | None => assert(false)
-  | Some(x) => x
-  }
-
-let () = {
-  let dict = Js_dict.empty()
-  Js_dict.set(dict, "a", J.string("test string"))
-  Js_dict.set(dict, "b", J.number(123.0))
-
-  let json = dict |> J.object_ |> J.stringify |> J.parseExn
-
-  /* Make sure parsed as Object */
-  let ty = J.classify(json)
-  switch ty {
-  | J.JSONObject(x) =>
-    /* Test field 'a' */
-    let ta = J.classify(\"@@"(option_get, Js_dict.get(x, "a")))
-    switch ta {
-    | J.JSONString(a) =>
-      if a != "test string" {
-        false_(__LOC__)
-      } else {
-        /* Test field 'b' */
-        let ty = J.classify(\"@@"(option_get, Js_dict.get(x, "b")))
-        switch ty {
-        | J.JSONNumber(b) => add_test(__LOC__, _ => Mt.Approx(123.0, b))
-        | _ => false_(__LOC__)
-        }
-      }
-    | _ => false_(__LOC__)
-    }
-  | _ => false_(__LOC__)
-  }
-}
-
-/* Check that the given json value is an array and that its element
- * a position [i] is equal to both the [kind] and [expected] value */
-let eq_at_i = (type a, loc: string, json: J.t, i: int, kind: J.Kind.t<a>, expected: a): unit => {
-  let ty = J.classify(json)
-  switch ty {
-  | J.JSONArray(x) =>
-    let ty = J.classify(x[i])
-    switch kind {
-    | J.Kind.Boolean =>
-      switch ty {
-      | JSONTrue => eq(loc, true, expected)
-
-      | JSONFalse => eq(loc, false, expected)
-      | _ => false_(loc)
-      }
-    | J.Kind.Number =>
-      switch ty {
-      | JSONNumber(f) => eq(loc, f, expected)
-      | _ => false_(loc)
-      }
-    | J.Kind.Object =>
-      switch ty {
-      | JSONObject(f) => eq(loc, f, expected)
-      | _ => false_(loc)
-      }
-    | J.Kind.Array =>
-      switch ty {
-      | JSONArray(f) => eq(loc, f, expected)
-      | _ => false_(loc)
-      }
-    | J.Kind.Null =>
-      switch ty {
-      | JSONNull => true_(loc)
-      | _ => false_(loc)
-      }
-    | J.Kind.String =>
-      switch ty {
-      | JSONString(f) => eq(loc, f, expected)
-      | _ => false_(loc)
-      }
-    }
-  | _ => false_(loc)
-  }
-}
-
-let () = {
-  let json =
-    ["string 0", "string 1", "string 2"]
-    |> Array.map(J.string)
-    |> J.array
-    |> J.stringify
-    |> J.parseExn
-
-  eq_at_i(__LOC__, json, 0, J.Kind.String, "string 0")
-  eq_at_i(__LOC__, json, 1, J.Kind.String, "string 1")
-  eq_at_i(__LOC__, json, 2, J.Kind.String, "string 2")
-  ()
-}
-
-let () = {
-  let json = ["string 0", "string 1", "string 2"] |> J.stringArray |> J.stringify |> J.parseExn
-
-  eq_at_i(__LOC__, json, 0, J.Kind.String, "string 0")
-  eq_at_i(__LOC__, json, 1, J.Kind.String, "string 1")
-  eq_at_i(__LOC__, json, 2, J.Kind.String, "string 2")
-  ()
-}
-
-let () = {
-  let a = [1.0000001, 10000000000.1, 123.0]
-  let json = a |> J.numberArray |> J.stringify |> J.parseExn
-
-  /* Loop is unrolled to keep relevant location information */
-  eq_at_i(__LOC__, json, 0, J.Kind.Number, a[0])
-  eq_at_i(__LOC__, json, 1, J.Kind.Number, a[1])
-  eq_at_i(__LOC__, json, 2, J.Kind.Number, a[2])
-  ()
-}
-
-let () = {
-  let a = [0, 0xAFAFAFAF, 0xF000AABB]
-  let json = a |> Array.map(float_of_int) |> J.numberArray |> J.stringify |> J.parseExn
-
-  /* Loop is unrolled to keep relevant location information */
-  eq_at_i(__LOC__, json, 0, J.Kind.Number, float_of_int(a[0]))
-  eq_at_i(__LOC__, json, 1, J.Kind.Number, float_of_int(a[1]))
-  eq_at_i(__LOC__, json, 2, J.Kind.Number, float_of_int(a[2]))
-  ()
-}
-
-let () = {
-  let a = [true, false, true]
-  let json = a |> J.booleanArray |> J.stringify |> J.parseExn
-
-  /* Loop is unrolled to keep relevant location information */
-  eq_at_i(__LOC__, json, 0, J.Kind.Boolean, a[0])
-  eq_at_i(__LOC__, json, 1, J.Kind.Boolean, a[1])
-  eq_at_i(__LOC__, json, 2, J.Kind.Boolean, a[2])
-  ()
-}
-
-let () = {
-  let make_d = (s, i) => {
-    let d = Js_dict.empty()
-    Js_dict.set(d, "a", J.string(s))
-    Js_dict.set(d, "b", J.number(float_of_int(i)))
-    d
-  }
-
-  let a = [make_d("aaa", 123), make_d("bbb", 456)]
-  let json = a |> J.objectArray |> J.stringify |> J.parseExn
-
-  let ty = J.classify(json)
-  switch ty {
-  | J.JSONArray(x) =>
-    let ty = J.classify(x[1])
-    switch ty {
-    | J.JSONObject(a1) =>
-      let ty = \"@@"(J.classify, \"@@"(option_get, Js_dict.get(a1, "a")))
-      switch ty {
-      | J.JSONString(aValue) => eq(__LOC__, aValue, "bbb")
-      | _ => false_(__LOC__)
-      }
-    | _ => false_(__LOC__)
-    }
-  | _ => false_(__LOC__)
-  }
-}
-
-let () = {
-  let invalid_json_str = "{{ A}"
-  try {
-    let _ = J.parseExn(invalid_json_str)
-    false_(__LOC__)
-  } catch {
-  | exn => true_(__LOC__)
-  }
-}
-
-/* stringifyAny tests */
-
-let () = eq(__LOC__, J.stringifyAny([1, 2, 3]), Some("[1,2,3]"))
-
-let () = eq(
-  __LOC__,
-  J.stringifyAny({"foo": 1, "bar": "hello", "baz": {"baaz": 10}}),
-  Some(`{"foo":1,"bar":"hello","baz":{"baaz":10}}`),
-)
-
-let () = eq(__LOC__, J.stringifyAny(Js.Null.empty), Some("null"))
-
-let () = eq(__LOC__, J.stringifyAny(Js.Undefined.empty), None)
-
-let () = {
-  eq(__LOC__, J.decodeString(J.string("test")), Some("test"))
-  eq(__LOC__, J.decodeString(J.boolean(true)), None)
-  eq(__LOC__, J.decodeString(J.array([])), None)
-  eq(__LOC__, J.decodeString(J.null), None)
-  eq(__LOC__, J.decodeString(\"@@"(J.object_, Js.Dict.empty())), None)
-  eq(__LOC__, J.decodeString(J.number(1.23)), None)
-}
-
-let () = {
-  eq(__LOC__, J.decodeNumber(J.string("test")), None)
-  eq(__LOC__, J.decodeNumber(J.boolean(true)), None)
-  eq(__LOC__, J.decodeNumber(J.array([])), None)
-  eq(__LOC__, J.decodeNumber(J.null), None)
-  eq(__LOC__, J.decodeNumber(\"@@"(J.object_, Js.Dict.empty())), None)
-  eq(__LOC__, J.decodeNumber(J.number(1.23)), Some(1.23))
-}
-
-let () = {
-  eq(__LOC__, J.decodeObject(J.string("test")), None)
-  eq(__LOC__, J.decodeObject(J.boolean(true)), None)
-  eq(__LOC__, J.decodeObject(J.array([])), None)
-  eq(__LOC__, J.decodeObject(J.null), None)
-  eq(__LOC__, J.decodeObject(\"@@"(J.object_, Js.Dict.empty())), Some(Js.Dict.empty()))
-  eq(__LOC__, J.decodeObject(J.number(1.23)), None)
-}
-
-let () = {
-  eq(__LOC__, J.decodeArray(J.string("test")), None)
-  eq(__LOC__, J.decodeArray(J.boolean(true)), None)
-  eq(__LOC__, J.decodeArray(J.array([])), Some([]))
-  eq(__LOC__, J.decodeArray(J.null), None)
-  eq(__LOC__, J.decodeArray(\"@@"(J.object_, Js.Dict.empty())), None)
-  eq(__LOC__, J.decodeArray(J.number(1.23)), None)
-}
-
-let () = {
-  eq(__LOC__, J.decodeBoolean(J.string("test")), None)
-  eq(__LOC__, J.decodeBoolean(J.boolean(true)), Some(true))
-  eq(__LOC__, J.decodeBoolean(J.array([])), None)
-  eq(__LOC__, J.decodeBoolean(J.null), None)
-  eq(__LOC__, J.decodeBoolean(\"@@"(J.object_, Js.Dict.empty())), None)
-  eq(__LOC__, J.decodeBoolean(J.number(1.23)), None)
-}
-
-let () = {
-  eq(__LOC__, J.decodeNull(J.string("test")), None)
-  eq(__LOC__, J.decodeNull(J.boolean(true)), None)
-  eq(__LOC__, J.decodeNull(J.array([])), None)
-  eq(__LOC__, J.decodeNull(J.null), Some(Js.null))
-  eq(__LOC__, J.decodeNull(\"@@"(J.object_, Js.Dict.empty())), None)
-  eq(__LOC__, J.decodeNull(J.number(1.23)), None)
-}
-
-let id = (type t, obj: t): t => obj->J.serializeExn->J.deserializeUnsafe
-
-let idtest = obj => eq(__LOC__, obj, id(obj))
-let () = {
-  idtest(None)
-  idtest(list{(None, None, None)})
-  idtest(
-    Belt.List.makeBy(500, i =>
-      if mod(i, 2) == 0 {
-        None
-      } else {
-        Some(1)
-      }
-    ),
-  )
-  idtest(
-    Belt.Array.makeBy(500, i =>
-      if mod(i, 2) == 0 {
-        None
-      } else {
-        Some(1)
-      }
-    ),
-  )
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/js_list_test.js b/jscomp/test/js_list_test.js
deleted file mode 100644
index 71ab15c..0000000
--- a/jscomp/test/js_list_test.js
+++ /dev/null
@@ -1,216 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Js_list = require("../../lib/js/js_list.js");
-var Js_vector = require("../../lib/js/js_vector.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"js_list_test.res\", line 11, characters 4-11", Js_list.flatten({
-          hd: {
-            hd: 1,
-            tl: {
-              hd: 2,
-              tl: /* [] */0
-            }
-          },
-          tl: {
-            hd: {
-              hd: 3,
-              tl: /* [] */0
-            },
-            tl: {
-              hd: /* [] */0,
-              tl: {
-                hd: {
-                  hd: 1,
-                  tl: {
-                    hd: 2,
-                    tl: {
-                      hd: 3,
-                      tl: /* [] */0
-                    }
-                  }
-                },
-                tl: /* [] */0
-              }
-            }
-          }
-        }), {
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: {
-            hd: 1,
-            tl: {
-              hd: 2,
-              tl: {
-                hd: 3,
-                tl: /* [] */0
-              }
-            }
-          }
-        }
-      }
-    });
-
-eq("File \"js_list_test.res\", line 15, characters 5-12", Js_list.filterMap((function (x) {
-            if (x % 2 === 0) {
-              return x;
-            }
-            
-          }), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: {
-                  hd: 5,
-                  tl: {
-                    hd: 6,
-                    tl: {
-                      hd: 7,
-                      tl: /* [] */0
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }), {
-      hd: 2,
-      tl: {
-        hd: 4,
-        tl: {
-          hd: 6,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("File \"js_list_test.res\", line 22, characters 5-12", Js_list.filterMap((function (x) {
-            if (x % 2 === 0) {
-              return x;
-            }
-            
-          }), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: {
-                  hd: 5,
-                  tl: {
-                    hd: 6,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }), {
-      hd: 2,
-      tl: {
-        hd: 4,
-        tl: {
-          hd: 6,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("File \"js_list_test.res\", line 29, characters 5-12", Js_list.countBy((function (x) {
-            return x % 2 === 0;
-          }), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: {
-                  hd: 5,
-                  tl: {
-                    hd: 6,
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }), 3);
-
-function f(i) {
-  return i;
-}
-
-var v = Js_vector.toList(Js_vector.init(100000, f));
-
-eq("File \"js_list_test.res\", line 31, characters 5-12", Js_list.countBy((function (x) {
-            return x % 2 === 0;
-          }), v), 50000);
-
-var vv = Js_list.foldRight((function (x, y) {
-        return {
-                hd: x,
-                tl: y
-              };
-      }), v, /* [] */0);
-
-eq("File \"js_list_test.res\", line 33, characters 5-12", true, Js_list.equal((function (x, y) {
-            return x === y;
-          }), v, vv));
-
-var vvv = Js_list.filter((function (x) {
-        return x % 10 === 0;
-      }), vv);
-
-eq("File \"js_list_test.res\", line 36, characters 5-12", Js_list.length(vvv), 10000);
-
-function f$1(x) {
-  return Math.imul(x, 10);
-}
-
-eq("File \"js_list_test.res\", line 37, characters 5-12", true, Js_list.equal((function (x, y) {
-            return x === y;
-          }), vvv, Js_vector.toList(Js_vector.init(10000, f$1))));
-
-Mt.from_pair_suites("Js_list_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/js_list_test.res b/jscomp/test/js_list_test.res
deleted file mode 100644
index 4a40d33..0000000
--- a/jscomp/test/js_list_test.res
+++ /dev/null
@@ -1,40 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let () = {
-  eq(
-    __LOC__,
-    Js.List.flatten(list{list{1, 2}, list{3}, list{}, list{1, 2, 3}}),
-    list{1, 2, 3, 1, 2, 3},
-  )
-  eq(__LOC__, Js.List.filterMap((. x) =>
-      if mod(x, 2) == 0 {
-        Some(x)
-      } else {
-        None
-      }
-    , list{1, 2, 3, 4, 5, 6, 7}), list{2, 4, 6})
-  eq(__LOC__, Js.List.filterMap((. x) =>
-      if mod(x, 2) == 0 {
-        Some(x)
-      } else {
-        None
-      }
-    , list{1, 2, 3, 4, 5, 6}), list{2, 4, 6})
-  eq(__LOC__, Js.List.countBy((. x) => mod(x, 2) == 0, list{1, 2, 3, 4, 5, 6}), 3)
-  let v = Js.List.init(10_0000, (. i) => i)
-  eq(__LOC__, Js.List.countBy((. x) => mod(x, 2) == 0, v), 50_000)
-  let vv = Js.List.foldRight((. x, y) => Js.List.cons(x, y), v, list{})
-  eq(__LOC__, true, Js.List.equal((. x, y) => x == y, v, vv))
-
-  let vvv = Js.List.filter((. x) => mod(x, 10) == 0, vv)
-  eq(__LOC__, Js.List.length(vvv), 10000)
-  eq(__LOC__, true, Js.List.equal((. x, y) => x == y, vvv, Js.List.init(10_000, (. x) => x * 10)))
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/js_math_test.js b/jscomp/test/js_math_test.js
deleted file mode 100644
index 4eb628c..0000000
--- a/jscomp/test/js_math_test.js
+++ /dev/null
@@ -1,742 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Js_math = require("../../lib/js/js_math.js");
-
-var suites_0 = [
-  "_E",
-  (function (param) {
-      return {
-              TAG: "ApproxThreshold",
-              _0: 0.001,
-              _1: 2.718,
-              _2: Math.E
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "_LN2",
-    (function (param) {
-        return {
-                TAG: "ApproxThreshold",
-                _0: 0.001,
-                _1: 0.693,
-                _2: Math.LN2
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "_LN10",
-      (function (param) {
-          return {
-                  TAG: "ApproxThreshold",
-                  _0: 0.001,
-                  _1: 2.303,
-                  _2: Math.LN10
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "_LOG2E",
-        (function (param) {
-            return {
-                    TAG: "ApproxThreshold",
-                    _0: 0.001,
-                    _1: 1.443,
-                    _2: Math.LOG2E
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "_LOG10E",
-          (function (param) {
-              return {
-                      TAG: "ApproxThreshold",
-                      _0: 0.001,
-                      _1: 0.434,
-                      _2: Math.LOG10E
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "_PI",
-            (function (param) {
-                return {
-                        TAG: "ApproxThreshold",
-                        _0: 0.00001,
-                        _1: 3.14159,
-                        _2: Math.PI
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "_SQRT1_2",
-              (function (param) {
-                  return {
-                          TAG: "ApproxThreshold",
-                          _0: 0.001,
-                          _1: 0.707,
-                          _2: Math.SQRT1_2
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "_SQRT2",
-                (function (param) {
-                    return {
-                            TAG: "ApproxThreshold",
-                            _0: 0.001,
-                            _1: 1.414,
-                            _2: Math.SQRT2
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "abs_int",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: 4,
-                              _1: Math.abs(-4)
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "abs_float",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: 1.2,
-                                _1: Math.abs(-1.2)
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "acos",
-                      (function (param) {
-                          return {
-                                  TAG: "ApproxThreshold",
-                                  _0: 0.001,
-                                  _1: 1.159,
-                                  _2: Math.acos(0.4)
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "acosh",
-                        (function (param) {
-                            return {
-                                    TAG: "ApproxThreshold",
-                                    _0: 0.001,
-                                    _1: 0.622,
-                                    _2: Math.acosh(1.2)
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "asin",
-                          (function (param) {
-                              return {
-                                      TAG: "ApproxThreshold",
-                                      _0: 0.001,
-                                      _1: 0.411,
-                                      _2: Math.asin(0.4)
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "asinh",
-                            (function (param) {
-                                return {
-                                        TAG: "ApproxThreshold",
-                                        _0: 0.001,
-                                        _1: 0.390,
-                                        _2: Math.asinh(0.4)
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "atan",
-                              (function (param) {
-                                  return {
-                                          TAG: "ApproxThreshold",
-                                          _0: 0.001,
-                                          _1: 0.380,
-                                          _2: Math.atan(0.4)
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "atanh",
-                                (function (param) {
-                                    return {
-                                            TAG: "ApproxThreshold",
-                                            _0: 0.001,
-                                            _1: 0.423,
-                                            _2: Math.atanh(0.4)
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "atan2",
-                                  (function (param) {
-                                      return {
-                                              TAG: "ApproxThreshold",
-                                              _0: 0.001,
-                                              _1: 0.588,
-                                              _2: Math.atan2(0.4, 0.6)
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "cbrt",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: 2,
-                                                _1: Math.cbrt(8)
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "unsafe_ceil_int",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: 4,
-                                                  _1: Math.ceil(3.2)
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "ceil_int",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: 4,
-                                                    _1: Js_math.ceil_int(3.2)
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "ceil_float",
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: 4,
-                                                      _1: Math.ceil(3.2)
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "cos",
-                                            (function (param) {
-                                                return {
-                                                        TAG: "ApproxThreshold",
-                                                        _0: 0.001,
-                                                        _1: 0.921,
-                                                        _2: Math.cos(0.4)
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "cosh",
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "ApproxThreshold",
-                                                          _0: 0.001,
-                                                          _1: 1.081,
-                                                          _2: Math.cosh(0.4)
-                                                        };
-                                                })
-                                            ],
-                                            tl: {
-                                              hd: [
-                                                "exp",
-                                                (function (param) {
-                                                    return {
-                                                            TAG: "ApproxThreshold",
-                                                            _0: 0.001,
-                                                            _1: 1.491,
-                                                            _2: Math.exp(0.4)
-                                                          };
-                                                  })
-                                              ],
-                                              tl: {
-                                                hd: [
-                                                  "expm1",
-                                                  (function (param) {
-                                                      return {
-                                                              TAG: "ApproxThreshold",
-                                                              _0: 0.001,
-                                                              _1: 0.491,
-                                                              _2: Math.expm1(0.4)
-                                                            };
-                                                    })
-                                                ],
-                                                tl: {
-                                                  hd: [
-                                                    "unsafe_floor_int",
-                                                    (function (param) {
-                                                        return {
-                                                                TAG: "Eq",
-                                                                _0: 3,
-                                                                _1: Math.floor(3.2)
-                                                              };
-                                                      })
-                                                  ],
-                                                  tl: {
-                                                    hd: [
-                                                      "floor_int",
-                                                      (function (param) {
-                                                          return {
-                                                                  TAG: "Eq",
-                                                                  _0: 3,
-                                                                  _1: Js_math.floor_int(3.2)
-                                                                };
-                                                        })
-                                                    ],
-                                                    tl: {
-                                                      hd: [
-                                                        "floor_float",
-                                                        (function (param) {
-                                                            return {
-                                                                    TAG: "Eq",
-                                                                    _0: 3,
-                                                                    _1: Math.floor(3.2)
-                                                                  };
-                                                          })
-                                                      ],
-                                                      tl: {
-                                                        hd: [
-                                                          "fround",
-                                                          (function (param) {
-                                                              return {
-                                                                      TAG: "Approx",
-                                                                      _0: 3.2,
-                                                                      _1: Math.fround(3.2)
-                                                                    };
-                                                            })
-                                                        ],
-                                                        tl: {
-                                                          hd: [
-                                                            "hypot",
-                                                            (function (param) {
-                                                                return {
-                                                                        TAG: "ApproxThreshold",
-                                                                        _0: 0.001,
-                                                                        _1: 0.721,
-                                                                        _2: Math.hypot(0.4, 0.6)
-                                                                      };
-                                                              })
-                                                          ],
-                                                          tl: {
-                                                            hd: [
-                                                              "hypotMany",
-                                                              (function (param) {
-                                                                  return {
-                                                                          TAG: "ApproxThreshold",
-                                                                          _0: 0.001,
-                                                                          _1: 1.077,
-                                                                          _2: Math.hypot(0.4, 0.6, 0.8)
-                                                                        };
-                                                                })
-                                                            ],
-                                                            tl: {
-                                                              hd: [
-                                                                "imul",
-                                                                (function (param) {
-                                                                    return {
-                                                                            TAG: "Eq",
-                                                                            _0: 8,
-                                                                            _1: Math.imul(4, 2)
-                                                                          };
-                                                                  })
-                                                              ],
-                                                              tl: {
-                                                                hd: [
-                                                                  "log",
-                                                                  (function (param) {
-                                                                      return {
-                                                                              TAG: "ApproxThreshold",
-                                                                              _0: 0.001,
-                                                                              _1: -0.916,
-                                                                              _2: Math.log(0.4)
-                                                                            };
-                                                                    })
-                                                                ],
-                                                                tl: {
-                                                                  hd: [
-                                                                    "log1p",
-                                                                    (function (param) {
-                                                                        return {
-                                                                                TAG: "ApproxThreshold",
-                                                                                _0: 0.001,
-                                                                                _1: 0.336,
-                                                                                _2: Math.log1p(0.4)
-                                                                              };
-                                                                      })
-                                                                  ],
-                                                                  tl: {
-                                                                    hd: [
-                                                                      "log10",
-                                                                      (function (param) {
-                                                                          return {
-                                                                                  TAG: "ApproxThreshold",
-                                                                                  _0: 0.001,
-                                                                                  _1: -0.397,
-                                                                                  _2: Math.log10(0.4)
-                                                                                };
-                                                                        })
-                                                                    ],
-                                                                    tl: {
-                                                                      hd: [
-                                                                        "log2",
-                                                                        (function (param) {
-                                                                            return {
-                                                                                    TAG: "ApproxThreshold",
-                                                                                    _0: 0.001,
-                                                                                    _1: -1.321,
-                                                                                    _2: Math.log2(0.4)
-                                                                                  };
-                                                                          })
-                                                                      ],
-                                                                      tl: {
-                                                                        hd: [
-                                                                          "max_int",
-                                                                          (function (param) {
-                                                                              return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: 4,
-                                                                                      _1: Math.max(2, 4)
-                                                                                    };
-                                                                            })
-                                                                        ],
-                                                                        tl: {
-                                                                          hd: [
-                                                                            "maxMany_int",
-                                                                            (function (param) {
-                                                                                return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: 4,
-                                                                                        _1: Math.max(2, 4, 3)
-                                                                                      };
-                                                                              })
-                                                                          ],
-                                                                          tl: {
-                                                                            hd: [
-                                                                              "max_float",
-                                                                              (function (param) {
-                                                                                  return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: 4.2,
-                                                                                          _1: Math.max(2.7, 4.2)
-                                                                                        };
-                                                                                })
-                                                                            ],
-                                                                            tl: {
-                                                                              hd: [
-                                                                                "maxMany_float",
-                                                                                (function (param) {
-                                                                                    return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: 4.2,
-                                                                                            _1: Math.max(2.7, 4.2, 3.9)
-                                                                                          };
-                                                                                  })
-                                                                              ],
-                                                                              tl: {
-                                                                                hd: [
-                                                                                  "min_int",
-                                                                                  (function (param) {
-                                                                                      return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: 2,
-                                                                                              _1: Math.min(2, 4)
-                                                                                            };
-                                                                                    })
-                                                                                ],
-                                                                                tl: {
-                                                                                  hd: [
-                                                                                    "minMany_int",
-                                                                                    (function (param) {
-                                                                                        return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: 2,
-                                                                                                _1: Math.min(2, 4, 3)
-                                                                                              };
-                                                                                      })
-                                                                                  ],
-                                                                                  tl: {
-                                                                                    hd: [
-                                                                                      "min_float",
-                                                                                      (function (param) {
-                                                                                          return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: 2.7,
-                                                                                                  _1: Math.min(2.7, 4.2)
-                                                                                                };
-                                                                                        })
-                                                                                    ],
-                                                                                    tl: {
-                                                                                      hd: [
-                                                                                        "minMany_float",
-                                                                                        (function (param) {
-                                                                                            return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: 2.7,
-                                                                                                    _1: Math.min(2.7, 4.2, 3.9)
-                                                                                                  };
-                                                                                          })
-                                                                                      ],
-                                                                                      tl: {
-                                                                                        hd: [
-                                                                                          "random",
-                                                                                          (function (param) {
-                                                                                              var a = Math.random();
-                                                                                              return {
-                                                                                                      TAG: "Ok",
-                                                                                                      _0: a >= 0 && a < 1
-                                                                                                    };
-                                                                                            })
-                                                                                        ],
-                                                                                        tl: {
-                                                                                          hd: [
-                                                                                            "random_int",
-                                                                                            (function (param) {
-                                                                                                var a = Js_math.random_int(1, 3);
-                                                                                                return {
-                                                                                                        TAG: "Ok",
-                                                                                                        _0: a >= 1 && a < 3
-                                                                                                      };
-                                                                                              })
-                                                                                          ],
-                                                                                          tl: {
-                                                                                            hd: [
-                                                                                              "unsafe_round",
-                                                                                              (function (param) {
-                                                                                                  return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: 3,
-                                                                                                          _1: Math.round(3.2)
-                                                                                                        };
-                                                                                                })
-                                                                                            ],
-                                                                                            tl: {
-                                                                                              hd: [
-                                                                                                "round",
-                                                                                                (function (param) {
-                                                                                                    return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: 3,
-                                                                                                            _1: Math.round(3.2)
-                                                                                                          };
-                                                                                                  })
-                                                                                              ],
-                                                                                              tl: {
-                                                                                                hd: [
-                                                                                                  "sign_int",
-                                                                                                  (function (param) {
-                                                                                                      return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: -1,
-                                                                                                              _1: Math.sign(-4)
-                                                                                                            };
-                                                                                                    })
-                                                                                                ],
-                                                                                                tl: {
-                                                                                                  hd: [
-                                                                                                    "sign_float",
-                                                                                                    (function (param) {
-                                                                                                        return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: -1,
-                                                                                                                _1: Math.sign(-4.2)
-                                                                                                              };
-                                                                                                      })
-                                                                                                  ],
-                                                                                                  tl: {
-                                                                                                    hd: [
-                                                                                                      "sign_float -0",
-                                                                                                      (function (param) {
-                                                                                                          return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: -0,
-                                                                                                                  _1: Math.sign(-0)
-                                                                                                                };
-                                                                                                        })
-                                                                                                    ],
-                                                                                                    tl: {
-                                                                                                      hd: [
-                                                                                                        "sin",
-                                                                                                        (function (param) {
-                                                                                                            return {
-                                                                                                                    TAG: "ApproxThreshold",
-                                                                                                                    _0: 0.001,
-                                                                                                                    _1: 0.389,
-                                                                                                                    _2: Math.sin(0.4)
-                                                                                                                  };
-                                                                                                          })
-                                                                                                      ],
-                                                                                                      tl: {
-                                                                                                        hd: [
-                                                                                                          "sinh",
-                                                                                                          (function (param) {
-                                                                                                              return {
-                                                                                                                      TAG: "ApproxThreshold",
-                                                                                                                      _0: 0.001,
-                                                                                                                      _1: 0.410,
-                                                                                                                      _2: Math.sinh(0.4)
-                                                                                                                    };
-                                                                                                            })
-                                                                                                        ],
-                                                                                                        tl: {
-                                                                                                          hd: [
-                                                                                                            "sqrt",
-                                                                                                            (function (param) {
-                                                                                                                return {
-                                                                                                                        TAG: "ApproxThreshold",
-                                                                                                                        _0: 0.001,
-                                                                                                                        _1: 0.632,
-                                                                                                                        _2: Math.sqrt(0.4)
-                                                                                                                      };
-                                                                                                              })
-                                                                                                          ],
-                                                                                                          tl: {
-                                                                                                            hd: [
-                                                                                                              "tan",
-                                                                                                              (function (param) {
-                                                                                                                  return {
-                                                                                                                          TAG: "ApproxThreshold",
-                                                                                                                          _0: 0.001,
-                                                                                                                          _1: 0.422,
-                                                                                                                          _2: Math.tan(0.4)
-                                                                                                                        };
-                                                                                                                })
-                                                                                                            ],
-                                                                                                            tl: {
-                                                                                                              hd: [
-                                                                                                                "tanh",
-                                                                                                                (function (param) {
-                                                                                                                    return {
-                                                                                                                            TAG: "ApproxThreshold",
-                                                                                                                            _0: 0.001,
-                                                                                                                            _1: 0.379,
-                                                                                                                            _2: Math.tanh(0.4)
-                                                                                                                          };
-                                                                                                                  })
-                                                                                                              ],
-                                                                                                              tl: {
-                                                                                                                hd: [
-                                                                                                                  "unsafe_trunc",
-                                                                                                                  (function (param) {
-                                                                                                                      return {
-                                                                                                                              TAG: "Eq",
-                                                                                                                              _0: 4,
-                                                                                                                              _1: Math.trunc(4.2156)
-                                                                                                                            };
-                                                                                                                    })
-                                                                                                                ],
-                                                                                                                tl: {
-                                                                                                                  hd: [
-                                                                                                                    "trunc",
-                                                                                                                    (function (param) {
-                                                                                                                        return {
-                                                                                                                                TAG: "Eq",
-                                                                                                                                _0: 4,
-                                                                                                                                _1: Math.trunc(4.2156)
-                                                                                                                              };
-                                                                                                                      })
-                                                                                                                  ],
-                                                                                                                  tl: /* [] */0
-                                                                                                                }
-                                                                                                              }
-                                                                                                            }
-                                                                                                          }
-                                                                                                        }
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_math_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_math_test.res b/jscomp/test/js_math_test.res
deleted file mode 100644
index 5704f30..0000000
--- a/jscomp/test/js_math_test.res
+++ /dev/null
@@ -1,79 +0,0 @@
-open Js.Math
-
-let suites = {
-  open Mt
-  list{
-    ("_E", _ => ApproxThreshold(0.001, 2.718, _E)),
-    ("_LN2", _ => ApproxThreshold(0.001, 0.693, _LN2)),
-    ("_LN10", _ => ApproxThreshold(0.001, 2.303, _LN10)),
-    ("_LOG2E", _ => ApproxThreshold(0.001, 1.443, _LOG2E)),
-    ("_LOG10E", _ => ApproxThreshold(0.001, 0.434, _LOG10E)),
-    ("_PI", _ => ApproxThreshold(0.00001, 3.14159, _PI)),
-    ("_SQRT1_2", _ => ApproxThreshold(0.001, 0.707, _SQRT1_2)),
-    ("_SQRT2", _ => ApproxThreshold(0.001, 1.414, _SQRT2)),
-    ("abs_int", _ => Eq(4, abs_int(-4))),
-    ("abs_float", _ => Eq(1.2, abs_float(-1.2))),
-    ("acos", _ => ApproxThreshold(0.001, 1.159, acos(0.4))),
-    ("acosh", _ => ApproxThreshold(0.001, 0.622, acosh(1.2))),
-    ("asin", _ => ApproxThreshold(0.001, 0.411, asin(0.4))),
-    ("asinh", _ => ApproxThreshold(0.001, 0.390, asinh(0.4))),
-    ("atan", _ => ApproxThreshold(0.001, 0.380, atan(0.4))),
-    ("atanh", _ => ApproxThreshold(0.001, 0.423, atanh(0.4))),
-    ("atan2", _ => ApproxThreshold(0.001, 0.588, atan2(~x=0.6, ~y=0.4, ()))),
-    ("cbrt", _ => Eq(2., cbrt(8.))),
-    ("unsafe_ceil_int", _ => Eq(4, unsafe_ceil_int(3.2))),
-    ("ceil_int", _ => Eq(4, ceil_int(3.2))),
-    ("ceil_float", _ => Eq(4., ceil_float(3.2))),
-    ("cos", _ => ApproxThreshold(0.001, 0.921, cos(0.4))),
-    ("cosh", _ => ApproxThreshold(0.001, 1.081, cosh(0.4))),
-    ("exp", _ => ApproxThreshold(0.001, 1.491, exp(0.4))),
-    ("expm1", _ => ApproxThreshold(0.001, 0.491, expm1(0.4))),
-    ("unsafe_floor_int", _ => Eq(3, unsafe_floor_int(3.2))),
-    ("floor_int", _ => Eq(3, floor_int(3.2))),
-    ("floor_float", _ => Eq(3., floor_float(3.2))),
-    ("fround", _ => Approx(3.2, fround(3.2))),
-    ("hypot", _ => ApproxThreshold(0.001, 0.721, hypot(0.4, 0.6))),
-    ("hypotMany", _ => ApproxThreshold(0.001, 1.077, hypotMany([0.4, 0.6, 0.8]))),
-    ("imul", _ => Eq(8, imul(4, 2))),
-    ("log", _ => ApproxThreshold(0.001, -0.916, log(0.4))),
-    ("log1p", _ => ApproxThreshold(0.001, 0.336, log1p(0.4))),
-    ("log10", _ => ApproxThreshold(0.001, -0.397, log10(0.4))),
-    ("log2", _ => ApproxThreshold(0.001, -1.321, log2(0.4))),
-    ("max_int", _ => Eq(4, max_int(2, 4))),
-    ("maxMany_int", _ => Eq(4, maxMany_int([2, 4, 3]))),
-    ("max_float", _ => Eq(4.2, max_float(2.7, 4.2))),
-    ("maxMany_float", _ => Eq(4.2, maxMany_float([2.7, 4.2, 3.9]))),
-    ("min_int", _ => Eq(2, min_int(2, 4))),
-    ("minMany_int", _ => Eq(2, minMany_int([2, 4, 3]))),
-    ("min_float", _ => Eq(2.7, min_float(2.7, 4.2))),
-    ("minMany_float", _ => Eq(2.7, minMany_float([2.7, 4.2, 3.9]))),
-    (
-      "random",
-      _ => Ok({
-        let a = random()
-        a >= 0. && a < 1.
-      }),
-    ),
-    (
-      "random_int",
-      _ => Ok({
-        let a = random_int(1, 3)
-        a >= 1 && a < 3
-      }),
-    ),
-    ("unsafe_round", _ => Eq(3, unsafe_round(3.2))),
-    ("round", _ => Eq(3., round(3.2))),
-    ("sign_int", _ => Eq(-1, sign_int(-4))),
-    ("sign_float", _ => Eq(-1., sign_float(-4.2))),
-    ("sign_float -0", _ => Eq(-0., sign_float(-0.))),
-    ("sin", _ => ApproxThreshold(0.001, 0.389, sin(0.4))),
-    ("sinh", _ => ApproxThreshold(0.001, 0.410, sinh(0.4))),
-    ("sqrt", _ => ApproxThreshold(0.001, 0.632, sqrt(0.4))),
-    ("tan", _ => ApproxThreshold(0.001, 0.422, tan(0.4))),
-    ("tanh", _ => ApproxThreshold(0.001, 0.379, tanh(0.4))),
-    ("unsafe_trunc", _ => Eq(4, unsafe_trunc(4.2156))),
-    ("trunc", _ => Eq(4., trunc(4.2156))),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_null_test.js b/jscomp/test/js_null_test.js
deleted file mode 100644
index 2143ef0..0000000
--- a/jscomp/test/js_null_test.js
+++ /dev/null
@@ -1,165 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Js_null = require("../../lib/js/js_null.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites_0 = [
-  "toOption - empty",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: undefined,
-              _1: undefined
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "toOption - 'a",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: Caml_option.some(undefined),
-                _1: Caml_option.some()
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "return",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: "something",
-                  _1: Caml_option.null_to_opt("something")
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "test - empty",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: true
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "test - 'a",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: false,
-                      _1: false
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "bind - empty",
-            (function (param) {
-                return {
-                        TAG: "StrictEq",
-                        _0: null,
-                        _1: Js_null.bind(null, (function (v) {
-                                return v;
-                              }))
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "bind - 'a",
-              (function (param) {
-                  return {
-                          TAG: "StrictEq",
-                          _0: 4,
-                          _1: Js_null.bind(2, (function (n) {
-                                  return (n << 1);
-                                }))
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "iter - empty",
-                (function (param) {
-                    var hit = {
-                      contents: false
-                    };
-                    Js_null.iter(null, (function (param) {
-                            hit.contents = true;
-                          }));
-                    return {
-                            TAG: "Eq",
-                            _0: false,
-                            _1: hit.contents
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "iter - 'a",
-                  (function (param) {
-                      var hit = {
-                        contents: 0
-                      };
-                      Js_null.iter(2, (function (v) {
-                              hit.contents = v;
-                            }));
-                      return {
-                              TAG: "Eq",
-                              _0: 2,
-                              _1: hit.contents
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "fromOption - None",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: null,
-                                _1: Js_null.fromOption(undefined)
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "fromOption - Some",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: 2,
-                                  _1: Js_null.fromOption(2)
-                                };
-                        })
-                    ],
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_null_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_null_test.res b/jscomp/test/js_null_test.res
deleted file mode 100644
index 9dbeae2..0000000
--- a/jscomp/test/js_null_test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-open Js_null
-
-let suites = {
-  open Mt
-  list{
-    ("toOption - empty", _ => Eq(None, empty |> toOption)),
-    ("toOption - 'a", _ => Eq(Some(), return() |> toOption)),
-    ("return", _ => Eq(Some("something"), return("something") |> toOption)),
-    ("test - empty", _ => Eq(true, empty == Js.null)),
-    ("test - 'a", _ => Eq(false, return() == empty)),
-    ("bind - empty", _ => StrictEq(empty, bind(empty, (. v) => v))),
-    ("bind - 'a", _ => StrictEq(return(4), bind(return(2), (. n) => n * 2))),
-    (
-      "iter - empty",
-      _ => {
-        let hit = ref(false)
-        let _ = iter(empty, (. _) => hit := true)
-        Eq(false, hit.contents)
-      },
-    ),
-    (
-      "iter - 'a",
-      _ => {
-        let hit = ref(0)
-        let _ = iter(return(2), (. v) => hit := v)
-        Eq(2, hit.contents)
-      },
-    ),
-    ("fromOption - None", _ => Eq(empty, None |> fromOption)),
-    ("fromOption - Some", _ => Eq(return(2), Some(2) |> fromOption)),
-  }
-}
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_null_undefined_test.js b/jscomp/test/js_null_undefined_test.js
deleted file mode 100644
index 6be2c75..0000000
--- a/jscomp/test/js_null_undefined_test.js
+++ /dev/null
@@ -1,321 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-var Js_null_undefined = require("../../lib/js/js_null_undefined.js");
-
-var suites_0 = [
-  "toOption - null",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: undefined,
-              _1: undefined
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "toOption - undefined",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: undefined,
-                _1: undefined
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "toOption - empty",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: undefined,
-                  _1: undefined
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "File \"js_null_undefined_test.res\", line 9, characters 5-12",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: "foo",
-                    _1: Caml_option.nullable_to_opt("foo")
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "return",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: "something",
-                      _1: Caml_option.nullable_to_opt("something")
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "test - null",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: true,
-                        _1: true
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "test - undefined",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: true,
-                          _1: true
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "test - empty",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: true,
-                            _1: true
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "File \"js_null_undefined_test.res\", line 14, characters 5-12",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: true,
-                              _1: true
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "bind - null",
-                    (function (param) {
-                        return {
-                                TAG: "StrictEq",
-                                _0: null,
-                                _1: Js_null_undefined.bind(null, (function (v) {
-                                        return v;
-                                      }))
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "bind - undefined",
-                      (function (param) {
-                          return {
-                                  TAG: "StrictEq",
-                                  _0: undefined,
-                                  _1: Js_null_undefined.bind(undefined, (function (v) {
-                                          return v;
-                                        }))
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "bind - empty",
-                        (function (param) {
-                            return {
-                                    TAG: "StrictEq",
-                                    _0: undefined,
-                                    _1: Js_null_undefined.bind(undefined, (function (v) {
-                                            return v;
-                                          }))
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "bind - 'a",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: 4,
-                                      _1: Js_null_undefined.bind(2, (function (n) {
-                                              return (n << 1);
-                                            }))
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "iter - null",
-                            (function (param) {
-                                var hit = {
-                                  contents: false
-                                };
-                                Js_null_undefined.iter(null, (function (param) {
-                                        hit.contents = true;
-                                      }));
-                                return {
-                                        TAG: "Eq",
-                                        _0: false,
-                                        _1: hit.contents
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "iter - undefined",
-                              (function (param) {
-                                  var hit = {
-                                    contents: false
-                                  };
-                                  Js_null_undefined.iter(undefined, (function (param) {
-                                          hit.contents = true;
-                                        }));
-                                  return {
-                                          TAG: "Eq",
-                                          _0: false,
-                                          _1: hit.contents
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "iter - empty",
-                                (function (param) {
-                                    var hit = {
-                                      contents: false
-                                    };
-                                    Js_null_undefined.iter(undefined, (function (param) {
-                                            hit.contents = true;
-                                          }));
-                                    return {
-                                            TAG: "Eq",
-                                            _0: false,
-                                            _1: hit.contents
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "iter - 'a",
-                                  (function (param) {
-                                      var hit = {
-                                        contents: 0
-                                      };
-                                      Js_null_undefined.iter(2, (function (v) {
-                                              hit.contents = v;
-                                            }));
-                                      return {
-                                              TAG: "Eq",
-                                              _0: 2,
-                                              _1: hit.contents
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "fromOption - None",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: undefined,
-                                                _1: Js_null_undefined.fromOption(undefined)
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "fromOption - Some",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: 2,
-                                                  _1: Js_null_undefined.fromOption(2)
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "null <> undefined",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Ok",
-                                                    _0: true
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "null <> empty",
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Ok",
-                                                      _0: true
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "undefined = empty",
-                                            (function (param) {
-                                                return {
-                                                        TAG: "Ok",
-                                                        _0: true
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "File \"js_null_undefined_test.res\", line 57, characters 6-13",
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "Ok",
-                                                          _0: true
-                                                        };
-                                                })
-                                            ],
-                                            tl: /* [] */0
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_null_undefined_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_null_undefined_test.res b/jscomp/test/js_null_undefined_test.res
deleted file mode 100644
index b1e0255..0000000
--- a/jscomp/test/js_null_undefined_test.res
+++ /dev/null
@@ -1,65 +0,0 @@
-open Js_null_undefined
-
-let suites = {
-  open Mt
-  list{
-    ("toOption - null", _ => Eq(None, null |> toOption)),
-    ("toOption - undefined", _ => Eq(None, undefined |> toOption)),
-    ("toOption - empty", _ => Eq(None, undefined |> toOption)),
-    (__LOC__, _ => Eq(Some("foo"), return("foo") |> toOption)),
-    ("return", _ => Eq(Some("something"), return("something") |> toOption)),
-    ("test - null", _ => Eq(true, null |> isNullable)),
-    ("test - undefined", _ => Eq(true, undefined |> isNullable)),
-    ("test - empty", _ => Eq(true, undefined |> isNullable)),
-    (__LOC__, _ => Eq(true, return() |> isNullable)),
-    ("bind - null", _ => StrictEq(null, bind(null, (. v) => v))),
-    ("bind - undefined", _ => StrictEq(undefined, bind(undefined, (. v) => v))),
-    ("bind - empty", _ => StrictEq(undefined, bind(undefined, (. v) => v))),
-    ("bind - 'a", _ => Eq(return(4), bind(return(2), (. n) => n * 2))),
-    (
-      "iter - null",
-      _ => {
-        let hit = ref(false)
-        let _ = iter(null, (. _) => hit := true)
-        Eq(false, hit.contents)
-      },
-    ),
-    (
-      "iter - undefined",
-      _ => {
-        let hit = ref(false)
-        let _ = iter(undefined, (. _) => hit := true)
-        Eq(false, hit.contents)
-      },
-    ),
-    (
-      "iter - empty",
-      _ => {
-        let hit = ref(false)
-        let _ = iter(undefined, (. _) => hit := true)
-        Eq(false, hit.contents)
-      },
-    ),
-    (
-      "iter - 'a",
-      _ => {
-        let hit = ref(0)
-        let _ = iter(return(2), (. v) => hit := v)
-        Eq(2, hit.contents)
-      },
-    ),
-    ("fromOption - None", _ => Eq(undefined, None |> fromOption)),
-    ("fromOption - Some", _ => Eq(return(2), Some(2) |> fromOption)),
-    ("null <> undefined", _ => Ok(null != undefined)),
-    ("null <> empty", _ => Ok(null != undefined)),
-    ("undefined = empty", _ => Ok(undefined == undefined)),
-    (
-      __LOC__,
-      _ => Ok({
-        let null = 3
-        !Js.isNullable(Js.Nullable.return(null))
-      }),
-    ),
-  }
-}
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_nullable_test.js b/jscomp/test/js_nullable_test.js
deleted file mode 100644
index 10dca58..0000000
--- a/jscomp/test/js_nullable_test.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function test(dom) {
-  var elem = dom.getElementById("haha");
-  if (elem == null) {
-    return 1;
-  } else {
-    console.log(elem);
-    return 2;
-  }
-}
-
-function f(x, y) {
-  console.log("no inline");
-  return x + y | 0;
-}
-
-eq("File \"js_nullable_test.res\", line 28, characters 3-10", false, false);
-
-eq("File \"js_nullable_test.res\", line 30, characters 3-10", (f(1, 2) == null), false);
-
-eq("File \"js_nullable_test.res\", line 32, characters 3-10", (null == null), true);
-
-eq("File \"js_nullable_test.res\", line 37, characters 5-12", false, false);
-
-Mt.from_pair_suites("Js_nullable_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.test = test;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/js_nullable_test.res b/jscomp/test/js_nullable_test.res
deleted file mode 100644
index 114ea2e..0000000
--- a/jscomp/test/js_nullable_test.res
+++ /dev/null
@@ -1,39 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-type element
-type dom
-@send @return(nullable) external getElementById: (dom, string) => option<element> = "getElementById"
-
-let test = dom => {
-  let elem = dom->getElementById("haha")
-  switch elem {
-  | None => 1
-  | Some(ui) =>
-    Js.log(ui)
-    2
-  }
-}
-
-let f = (x, y) => {
-  Js.log("no inline")
-  Js.Nullable.return(x + y)
-}
-
-eq(__LOC__, Js.isNullable(Js.Nullable.return(3)), false)
-
-eq(__LOC__, Js.isNullable(f(1, 2)), false)
-
-eq(__LOC__, Js.isNullable(%raw("null")), true)
-
-{
-  let null2 = Js.Nullable.return(3)
-  let null = null2
-  eq(__LOC__, Js.isNullable(null), false)
-}
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/js_obj_test.js b/jscomp/test/js_obj_test.js
deleted file mode 100644
index b256d7f..0000000
--- a/jscomp/test/js_obj_test.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites_0 = [
-  "empty",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: 0,
-              _1: Object.keys({}).length
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "assign",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: {
-                  a: 1
-                },
-                _1: Object.assign({}, {
-                      a: 1
-                    })
-              };
-      })
-  ],
-  tl: /* [] */0
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_obj_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_obj_test.res b/jscomp/test/js_obj_test.res
deleted file mode 100644
index e93bb13..0000000
--- a/jscomp/test/js_obj_test.res
+++ /dev/null
@@ -1,13 +0,0 @@
-open Js_obj
-
-type x = {"say": int => int}
-
-let suites = {
-  open Mt
-  list{
-    ("empty", _ => Eq(0, empty() |> keys |> Array.length)),
-    ("assign", _ => Eq({"a": 1}, assign(empty(), {"a": 1}))),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_option_test.js b/jscomp/test/js_option_test.js
deleted file mode 100644
index a5b1571..0000000
--- a/jscomp/test/js_option_test.js
+++ /dev/null
@@ -1,311 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Js_option = require("../../lib/js/js_option.js");
-
-function simpleEq(a, b) {
-  return a === b;
-}
-
-var option_suites_0 = [
-  "option_isSome_Some",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: true,
-              _1: true
-            };
-    })
-];
-
-var option_suites_1 = {
-  hd: [
-    "option_isSome_None",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: false,
-                _1: false
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "option_isNone_Some",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: false,
-                  _1: false
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "option_isNone_None",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: true
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "option_isSomeValue_Eq",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: Js_option.isSomeValue(simpleEq, 2, 2)
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "option_isSomeValue_Diff",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: false,
-                        _1: Js_option.isSomeValue(simpleEq, 1, 2)
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "option_isSomeValue_DiffNone",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: false,
-                          _1: Js_option.isSomeValue(simpleEq, 1, undefined)
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "option_getExn_Some",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: 2,
-                            _1: Js_option.getExn(2)
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "option_equal_Eq",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: true,
-                              _1: Js_option.equal(simpleEq, 2, 2)
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "option_equal_Diff",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: false,
-                                _1: Js_option.equal(simpleEq, 1, 2)
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "option_equal_DiffNone",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: false,
-                                  _1: Js_option.equal(simpleEq, 1, undefined)
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "option_andThen_SomeSome",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: true,
-                                    _1: Js_option.isSomeValue(simpleEq, 3, Js_option.andThen((function (a) {
-                                                return a + 1 | 0;
-                                              }), 2))
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "option_andThen_SomeNone",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: false,
-                                      _1: Js_option.isSomeValue(simpleEq, 3, Js_option.andThen((function (param) {
-                                                  
-                                                }), 2))
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "option_map_Some",
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: true,
-                                        _1: Js_option.isSomeValue(simpleEq, 3, Js_option.map((function (a) {
-                                                    return a + 1 | 0;
-                                                  }), 2))
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "option_map_None",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: undefined,
-                                          _1: Js_option.map((function (a) {
-                                                  return a + 1 | 0;
-                                                }), undefined)
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "option_default_Some",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: 2,
-                                            _1: Js_option.getWithDefault(3, 2)
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "option_default_None",
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: 3,
-                                              _1: Js_option.getWithDefault(3, undefined)
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "option_filter_Pass",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: true,
-                                                _1: Js_option.isSomeValue(simpleEq, 2, Js_option.filter((function (a) {
-                                                            return a % 2 === 0;
-                                                          }), 2))
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "option_filter_Reject",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: undefined,
-                                                  _1: Js_option.filter((function (a) {
-                                                          return a % 3 === 0;
-                                                        }), 2)
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "option_filter_None",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: undefined,
-                                                    _1: Js_option.filter((function (a) {
-                                                            return a % 3 === 0;
-                                                          }), undefined)
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "option_firstSome_First",
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: true,
-                                                      _1: Js_option.isSomeValue(simpleEq, 3, Js_option.firstSome(3, 2))
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "option_firstSome_First",
-                                            (function (param) {
-                                                return {
-                                                        TAG: "Eq",
-                                                        _0: true,
-                                                        _1: Js_option.isSomeValue(simpleEq, 2, Js_option.firstSome(undefined, 2))
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "option_firstSome_None",
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "Eq",
-                                                          _0: undefined,
-                                                          _1: Js_option.firstSome(undefined, undefined)
-                                                        };
-                                                })
-                                            ],
-                                            tl: /* [] */0
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var option_suites = {
-  hd: option_suites_0,
-  tl: option_suites_1
-};
-
-Mt.from_pair_suites("Js_option_test", option_suites);
-
-exports.simpleEq = simpleEq;
-exports.option_suites = option_suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_option_test.res b/jscomp/test/js_option_test.res
deleted file mode 100644
index 7b9ceda..0000000
--- a/jscomp/test/js_option_test.res
+++ /dev/null
@@ -1,56 +0,0 @@
-let simpleEq = (. a: int, b) => a == b
-
-let option_suites = {
-  open Mt
-  list{
-    ("option_isSome_Some", _ => Eq(true, Js.Option.isSome(Some(1)))),
-    ("option_isSome_None", _ => Eq(false, Js.Option.isSome(None))),
-    ("option_isNone_Some", _ => Eq(false, Js.Option.isNone(Some(1)))),
-    ("option_isNone_None", _ => Eq(true, Js.Option.isNone(None))),
-    ("option_isSomeValue_Eq", _ => Eq(true, Js.Option.isSomeValue(simpleEq, 2, Some(2)))),
-    ("option_isSomeValue_Diff", _ => Eq(false, Js.Option.isSomeValue(simpleEq, 1, Some(2)))),
-    ("option_isSomeValue_DiffNone", _ => Eq(false, Js.Option.isSomeValue(simpleEq, 1, None))),
-    ("option_getExn_Some", _ => Eq(2, Js.Option.getExn(Some(2)))),
-    ("option_equal_Eq", _ => Eq(true, Js.Option.equal(simpleEq, Some(2), Some(2)))),
-    ("option_equal_Diff", _ => Eq(false, Js.Option.equal(simpleEq, Some(1), Some(2)))),
-    ("option_equal_DiffNone", _ => Eq(false, Js.Option.equal(simpleEq, Some(1), None))),
-    (
-      "option_andThen_SomeSome",
-      _ => Eq(
-        true,
-        Js.Option.isSomeValue(simpleEq, 3, Js.Option.andThen((. a) => Some(a + 1), Some(2))),
-      ),
-    ),
-    (
-      "option_andThen_SomeNone",
-      _ => Eq(false, Js.Option.isSomeValue(simpleEq, 3, Js.Option.andThen((. _) => None, Some(2)))),
-    ),
-    (
-      "option_map_Some",
-      _ => Eq(true, Js.Option.isSomeValue(simpleEq, 3, Js.Option.map((. a) => a + 1, Some(2)))),
-    ),
-    ("option_map_None", _ => Eq(None, Js.Option.map((. a) => a + 1, None))),
-    ("option_default_Some", _ => Eq(2, Js.Option.getWithDefault(3, Some(2)))),
-    ("option_default_None", _ => Eq(3, Js.Option.getWithDefault(3, None))),
-    (
-      "option_filter_Pass",
-      _ => Eq(
-        true,
-        Js.Option.isSomeValue(simpleEq, 2, Js.Option.filter((. a) => mod(a, 2) == 0, Some(2))),
-      ),
-    ),
-    ("option_filter_Reject", _ => Eq(None, Js.Option.filter((. a) => mod(a, 3) == 0, Some(2)))),
-    ("option_filter_None", _ => Eq(None, Js.Option.filter((. a) => mod(a, 3) == 0, None))),
-    (
-      "option_firstSome_First",
-      _ => Eq(true, Js.Option.isSomeValue(simpleEq, 3, Js.Option.firstSome(Some(3), Some(2)))),
-    ),
-    (
-      "option_firstSome_First",
-      _ => Eq(true, Js.Option.isSomeValue(simpleEq, 2, Js.Option.firstSome(None, Some(2)))),
-    ),
-    ("option_firstSome_None", _ => Eq(None, Js.Option.firstSome(None, None))),
-  }
-}
-
-let () = Mt.from_pair_suites(__MODULE__, option_suites)
diff --git a/jscomp/test/js_re_test.js b/jscomp/test/js_re_test.js
deleted file mode 100644
index 95ee7ad..0000000
--- a/jscomp/test/js_re_test.js
+++ /dev/null
@@ -1,290 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites_0 = [
-  "captures",
-  (function (param) {
-      var re = /(\d+)-(?:(\d+))?/g;
-      var result = re.exec("3-");
-      if (result === null) {
-        return {
-                TAG: "Fail",
-                _0: undefined
-              };
-      }
-      var defined = Caml_array.get(result, 1);
-      var $$undefined = Caml_array.get(result, 2);
-      return {
-              TAG: "Eq",
-              _0: [
-                "3",
-                null
-              ],
-              _1: [
-                defined,
-                $$undefined
-              ]
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "fromString",
-    (function (param) {
-        var contentOf = function (tag, xmlString) {
-          var x = new RegExp("<" + (tag + (">(.*?)<\\/" + (tag + ">")))).exec(xmlString);
-          if (x !== null) {
-            return Caml_option.nullable_to_opt(Caml_array.get(x, 1));
-          }
-          
-        };
-        return {
-                TAG: "Eq",
-                _0: contentOf("div", "<div>Hi</div>"),
-                _1: "Hi"
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "exec_literal",
-      (function (param) {
-          var res = /[^.]+/.exec("http://xxx.domain.com");
-          if (res !== null) {
-            return {
-                    TAG: "Eq",
-                    _0: "http://xxx",
-                    _1: Caml_array.get(res, 0)
-                  };
-          } else {
-            return {
-                    TAG: "FailWith",
-                    _0: "regex should match"
-                  };
-          }
-        })
-    ],
-    tl: {
-      hd: [
-        "exec_no_match",
-        (function (param) {
-            var match = /https:\/\/(.*)/.exec("http://xxx.domain.com");
-            if (match !== null) {
-              return {
-                      TAG: "FailWith",
-                      _0: "regex should not match"
-                    };
-            } else {
-              return {
-                      TAG: "Ok",
-                      _0: true
-                    };
-            }
-          })
-      ],
-      tl: {
-        hd: [
-          "test_str",
-          (function (param) {
-              var res = new RegExp("foo").test("#foo#");
-              return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: res
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "fromStringWithFlags",
-            (function (param) {
-                var res = new RegExp("foo", "g");
-                return {
-                        TAG: "Eq",
-                        _0: true,
-                        _1: res.global
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "result_index",
-              (function (param) {
-                  var res = new RegExp("zbar").exec("foobarbazbar");
-                  if (res !== null) {
-                    return {
-                            TAG: "Eq",
-                            _0: 8,
-                            _1: res.index
-                          };
-                  } else {
-                    return {
-                            TAG: "Fail",
-                            _0: undefined
-                          };
-                  }
-                })
-            ],
-            tl: {
-              hd: [
-                "result_input",
-                (function (param) {
-                    var input = "foobar";
-                    var res = /foo/g.exec(input);
-                    if (res !== null) {
-                      return {
-                              TAG: "Eq",
-                              _0: input,
-                              _1: res.input
-                            };
-                    } else {
-                      return {
-                              TAG: "Fail",
-                              _0: undefined
-                            };
-                    }
-                  })
-              ],
-              tl: {
-                hd: [
-                  "t_flags",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: "gi",
-                              _1: /./ig.flags
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "t_global",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: true,
-                                _1: /./ig.global
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "t_ignoreCase",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: true,
-                                  _1: /./ig.ignoreCase
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "t_lastIndex",
-                        (function (param) {
-                            var re = /na/g;
-                            re.exec("banana");
-                            return {
-                                    TAG: "Eq",
-                                    _0: 4,
-                                    _1: re.lastIndex
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "t_setLastIndex",
-                          (function (param) {
-                              var re = /na/g;
-                              var before = re.lastIndex;
-                              re.lastIndex = 42;
-                              var after = re.lastIndex;
-                              return {
-                                      TAG: "Eq",
-                                      _0: [
-                                        0,
-                                        42
-                                      ],
-                                      _1: [
-                                        before,
-                                        after
-                                      ]
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "t_multiline",
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: false,
-                                        _1: /./ig.multiline
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "t_source",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: "f.+o",
-                                          _1: /f.+o/ig.source
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "t_sticky",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: true,
-                                            _1: /./yg.sticky
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "t_unicode",
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: false,
-                                              _1: /./yg.unicode
-                                            };
-                                    })
-                                ],
-                                tl: /* [] */0
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_re_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_re_test.res b/jscomp/test/js_re_test.res
deleted file mode 100644
index 851ec74..0000000
--- a/jscomp/test/js_re_test.res
+++ /dev/null
@@ -1,121 +0,0 @@
-let suites = {
-  open Mt
-  list{
-    (
-      "captures",
-      _ => {
-        let re = %re("/(\d+)-(?:(\d+))?/g")
-        let str = "3-"
-        switch re->Js.Re.exec_(str) {
-        | Some(result) =>
-          let defined = Js.Re.captures(result)[1]
-          let undefined = Js.Re.captures(result)[2]
-          Eq((Js.Nullable.return("3"), Js.Nullable.null), (defined, undefined))
-        | None => Fail()
-        }
-      },
-    ),
-    (
-      "fromString",
-      _ => {
-        /* From the example in js_re.mli */
-        let contentOf = (tag, xmlString) =>
-          Js.Re.fromString("<" ++ (tag ++ (">(.*?)<\\/" ++ (tag ++ ">"))))
-          ->Js.Re.exec_(xmlString)
-          ->(
-            x =>
-              switch x {
-              | Some(result) => Js.Nullable.toOption(Js.Re.captures(result)[1])
-              | None => None
-              }
-          )
-        Eq(contentOf("div", "<div>Hi</div>"), Some("Hi"))
-      },
-    ),
-    (
-      "exec_literal",
-      _ =>
-        switch %re("/[^.]+/")->Js.Re.exec_("http://xxx.domain.com") {
-        | Some(res) => Eq(Js.Nullable.return("http://xxx"), Js.Re.captures(res)[0])
-        | None => FailWith("regex should match")
-        },
-    ),
-    (
-      "exec_no_match",
-      _ =>
-        switch %re("/https:\/\/(.*)/")->Js.Re.exec_("http://xxx.domain.com") {
-        | Some(_) => FailWith("regex should not match")
-        | None => Ok(true)
-        },
-    ),
-    (
-      "test_str",
-      _ => {
-        let res = "foo"->Js.Re.fromString->Js.Re.test_("#foo#")
-
-        Eq(true, res)
-      },
-    ),
-    (
-      "fromStringWithFlags",
-      _ => {
-        let res = Js.Re.fromStringWithFlags("foo", ~flags="g")
-
-        Eq(true, res->Js.Re.global)
-      },
-    ),
-    (
-      "result_index",
-      _ =>
-        switch "zbar"->Js.Re.fromString->Js.Re.exec_("foobarbazbar") {
-        | Some(res) => Eq(8, res |> Js.Re.index)
-        | None => Fail()
-        },
-    ),
-    (
-      "result_input",
-      _ => {
-        let input = "foobar"
-
-        switch %re("/foo/g")->Js.Re.exec_(input) {
-        | Some(res) => Eq(input, res |> Js.Re.input)
-        | None => Fail()
-        }
-      },
-    ),
-    /* es2015 */
-    ("t_flags", _ => Eq("gi", %re("/./ig")->Js.Re.flags)),
-    ("t_global", _ => Eq(true, %re("/./ig")->Js.Re.global)),
-    ("t_ignoreCase", _ => Eq(true, %re("/./ig")->Js.Re.ignoreCase)),
-    (
-      "t_lastIndex",
-      _ => {
-        let re = %re("/na/g")
-        let _ =
-          re->Js.Re.exec_(
-            "banana",
-          ) /* Caml_option.null_to_opt post operation is not dropped in 4.06 which seems to be reduandant */
-        Eq(4, re->Js.Re.lastIndex)
-      },
-    ),
-    (
-      "t_setLastIndex",
-      _ => {
-        let re = %re("/na/g")
-
-        let before = Js.Re.lastIndex(re)
-        let () = Js.Re.setLastIndex(re, 42)
-        let after = Js.Re.lastIndex(re)
-
-        Eq((0, 42), (before, after))
-      },
-    ),
-    ("t_multiline", _ => Eq(false, %re("/./ig")->Js.Re.multiline)),
-    ("t_source", _ => Eq("f.+o", %re("/f.+o/ig")->Js.Re.source)),
-    /* es2015 */
-    ("t_sticky", _ => Eq(true, %re("/./yg")->Js.Re.sticky)),
-    ("t_unicode", _ => Eq(false, %re("/./yg")->Js.Re.unicode)),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_string_test.js b/jscomp/test/js_string_test.js
deleted file mode 100644
index fd1d58d..0000000
--- a/jscomp/test/js_string_test.js
+++ /dev/null
@@ -1,731 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Belt_Option = require("../../lib/js/belt_Option.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites_0 = [
-  "make",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: "null",
-              _1: String(null).concat("")
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "fromCharCode",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: "a",
-                _1: String.fromCharCode(97)
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "fromCharCodeMany",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: "az",
-                  _1: String.fromCharCode(97, 122)
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "fromCodePoint",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: "a",
-                    _1: String.fromCodePoint(97)
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "fromCodePointMany",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: "az",
-                      _1: String.fromCodePoint(97, 122)
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "length",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: 3,
-                        _1: "foo".length
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "get",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: "a",
-                          _1: "foobar"[4]
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "charAt",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: "a",
-                            _1: "foobar".charAt(4)
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "charCodeAt",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: 97,
-                              _1: "foobar".charCodeAt(4)
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "codePointAt",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: 97,
-                                _1: "foobar".codePointAt(4)
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "codePointAt - out of bounds",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: undefined,
-                                  _1: "foobar".codePointAt(98)
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "concat",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: "foobar",
-                                    _1: "foo".concat("bar")
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "concatMany",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: "foobarbaz",
-                                      _1: "foo".concat("bar", "baz")
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "endsWith",
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: true,
-                                        _1: "foobar".endsWith("bar")
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "endsWithFrom",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: false,
-                                          _1: "foobar".endsWith("bar", 1)
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "includes",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: true,
-                                            _1: "foobarbaz".includes("bar")
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "includesFrom",
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: false,
-                                              _1: "foobarbaz".includes("bar", 4)
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "indexOf",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: 3,
-                                                _1: "foobarbaz".indexOf("bar")
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "indexOfFrom",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: -1,
-                                                  _1: "foobarbaz".indexOf("bar", 4)
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "lastIndexOf",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: 3,
-                                                    _1: "foobarbaz".lastIndexOf("bar")
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "lastIndexOfFrom",
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: 3,
-                                                      _1: "foobarbaz".lastIndexOf("bar", 4)
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "localeCompare",
-                                            (function (param) {
-                                                return {
-                                                        TAG: "Eq",
-                                                        _0: 0,
-                                                        _1: "foo".localeCompare("foo")
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "match",
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "Eq",
-                                                          _0: [
-                                                            "na",
-                                                            "na"
-                                                          ],
-                                                          _1: Caml_option.null_to_opt("banana".match(/na+/g))
-                                                        };
-                                                })
-                                            ],
-                                            tl: {
-                                              hd: [
-                                                "match - no match",
-                                                (function (param) {
-                                                    return {
-                                                            TAG: "Eq",
-                                                            _0: undefined,
-                                                            _1: Caml_option.null_to_opt("banana".match(/nanana+/g))
-                                                          };
-                                                  })
-                                              ],
-                                              tl: {
-                                                hd: [
-                                                  "match - not found capture groups",
-                                                  (function (param) {
-                                                      return {
-                                                              TAG: "Eq",
-                                                              _0: [
-                                                                "hello ",
-                                                                undefined
-                                                              ],
-                                                              _1: Belt_Option.map(Caml_option.null_to_opt("hello word".match(/hello (world)?/)), (function (prim) {
-                                                                      return prim.slice();
-                                                                    }))
-                                                            };
-                                                    })
-                                                ],
-                                                tl: {
-                                                  hd: [
-                                                    "normalize",
-                                                    (function (param) {
-                                                        return {
-                                                                TAG: "Eq",
-                                                                _0: "foo",
-                                                                _1: "foo".normalize()
-                                                              };
-                                                      })
-                                                  ],
-                                                  tl: {
-                                                    hd: [
-                                                      "normalizeByForm",
-                                                      (function (param) {
-                                                          return {
-                                                                  TAG: "Eq",
-                                                                  _0: "foo",
-                                                                  _1: "foo".normalize("NFKD")
-                                                                };
-                                                        })
-                                                    ],
-                                                    tl: {
-                                                      hd: [
-                                                        "repeat",
-                                                        (function (param) {
-                                                            return {
-                                                                    TAG: "Eq",
-                                                                    _0: "foofoofoo",
-                                                                    _1: "foo".repeat(3)
-                                                                  };
-                                                          })
-                                                      ],
-                                                      tl: {
-                                                        hd: [
-                                                          "replace",
-                                                          (function (param) {
-                                                              return {
-                                                                      TAG: "Eq",
-                                                                      _0: "fooBORKbaz",
-                                                                      _1: "foobarbaz".replace("bar", "BORK")
-                                                                    };
-                                                            })
-                                                        ],
-                                                        tl: {
-                                                          hd: [
-                                                            "replaceByRe",
-                                                            (function (param) {
-                                                                return {
-                                                                        TAG: "Eq",
-                                                                        _0: "fooBORKBORK",
-                                                                        _1: "foobarbaz".replace(/ba./g, "BORK")
-                                                                      };
-                                                              })
-                                                          ],
-                                                          tl: {
-                                                            hd: [
-                                                              "unsafeReplaceBy0",
-                                                              (function (param) {
-                                                                  var replace = function (whole, offset, s) {
-                                                                    if (whole === "bar") {
-                                                                      return "BORK";
-                                                                    } else {
-                                                                      return "DORK";
-                                                                    }
-                                                                  };
-                                                                  return {
-                                                                          TAG: "Eq",
-                                                                          _0: "fooBORKDORK",
-                                                                          _1: "foobarbaz".replace(/ba./g, replace)
-                                                                        };
-                                                                })
-                                                            ],
-                                                            tl: {
-                                                              hd: [
-                                                                "unsafeReplaceBy1",
-                                                                (function (param) {
-                                                                    var replace = function (whole, p1, offset, s) {
-                                                                      if (whole === "bar") {
-                                                                        return "BORK";
-                                                                      } else {
-                                                                        return "DORK";
-                                                                      }
-                                                                    };
-                                                                    return {
-                                                                            TAG: "Eq",
-                                                                            _0: "fooBORKDORK",
-                                                                            _1: "foobarbaz".replace(/ba./g, replace)
-                                                                          };
-                                                                  })
-                                                              ],
-                                                              tl: {
-                                                                hd: [
-                                                                  "unsafeReplaceBy2",
-                                                                  (function (param) {
-                                                                      var replace = function (whole, p1, p2, offset, s) {
-                                                                        if (whole === "bar") {
-                                                                          return "BORK";
-                                                                        } else {
-                                                                          return "DORK";
-                                                                        }
-                                                                      };
-                                                                      return {
-                                                                              TAG: "Eq",
-                                                                              _0: "fooBORKDORK",
-                                                                              _1: "foobarbaz".replace(/ba./g, replace)
-                                                                            };
-                                                                    })
-                                                                ],
-                                                                tl: {
-                                                                  hd: [
-                                                                    "unsafeReplaceBy3",
-                                                                    (function (param) {
-                                                                        var replace = function (whole, p1, p2, p3, offset, s) {
-                                                                          if (whole === "bar") {
-                                                                            return "BORK";
-                                                                          } else {
-                                                                            return "DORK";
-                                                                          }
-                                                                        };
-                                                                        return {
-                                                                                TAG: "Eq",
-                                                                                _0: "fooBORKDORK",
-                                                                                _1: "foobarbaz".replace(/ba./g, replace)
-                                                                              };
-                                                                      })
-                                                                  ],
-                                                                  tl: {
-                                                                    hd: [
-                                                                      "search",
-                                                                      (function (param) {
-                                                                          return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: 3,
-                                                                                  _1: "foobarbaz".search(/ba./g)
-                                                                                };
-                                                                        })
-                                                                    ],
-                                                                    tl: {
-                                                                      hd: [
-                                                                        "slice",
-                                                                        (function (param) {
-                                                                            return {
-                                                                                    TAG: "Eq",
-                                                                                    _0: "bar",
-                                                                                    _1: "foobarbaz".slice(3, 6)
-                                                                                  };
-                                                                          })
-                                                                      ],
-                                                                      tl: {
-                                                                        hd: [
-                                                                          "sliceToEnd",
-                                                                          (function (param) {
-                                                                              return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: "barbaz",
-                                                                                      _1: "foobarbaz".slice(3)
-                                                                                    };
-                                                                            })
-                                                                        ],
-                                                                        tl: {
-                                                                          hd: [
-                                                                            "split",
-                                                                            (function (param) {
-                                                                                return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: [
-                                                                                          "foo",
-                                                                                          "bar",
-                                                                                          "baz"
-                                                                                        ],
-                                                                                        _1: "foo bar baz".split(" ")
-                                                                                      };
-                                                                              })
-                                                                          ],
-                                                                          tl: {
-                                                                            hd: [
-                                                                              "splitAtMost",
-                                                                              (function (param) {
-                                                                                  return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: [
-                                                                                            "foo",
-                                                                                            "bar"
-                                                                                          ],
-                                                                                          _1: "foo bar baz".split(" ", 2)
-                                                                                        };
-                                                                                })
-                                                                            ],
-                                                                            tl: {
-                                                                              hd: [
-                                                                                "splitByRe",
-                                                                                (function (param) {
-                                                                                    return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: [
-                                                                                              "a",
-                                                                                              "#",
-                                                                                              undefined,
-                                                                                              "b",
-                                                                                              "#",
-                                                                                              ":",
-                                                                                              "c"
-                                                                                            ],
-                                                                                            _1: "a#b#:c".split(/(#)(:)?/)
-                                                                                          };
-                                                                                  })
-                                                                              ],
-                                                                              tl: {
-                                                                                hd: [
-                                                                                  "splitByReAtMost",
-                                                                                  (function (param) {
-                                                                                      return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: [
-                                                                                                "a",
-                                                                                                "#",
-                                                                                                undefined
-                                                                                              ],
-                                                                                              _1: "a#b#:c".split(/(#)(:)?/, 3)
-                                                                                            };
-                                                                                    })
-                                                                                ],
-                                                                                tl: {
-                                                                                  hd: [
-                                                                                    "startsWith",
-                                                                                    (function (param) {
-                                                                                        return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: true,
-                                                                                                _1: "foobarbaz".startsWith("foo")
-                                                                                              };
-                                                                                      })
-                                                                                  ],
-                                                                                  tl: {
-                                                                                    hd: [
-                                                                                      "startsWithFrom",
-                                                                                      (function (param) {
-                                                                                          return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: false,
-                                                                                                  _1: "foobarbaz".startsWith("foo", 1)
-                                                                                                };
-                                                                                        })
-                                                                                    ],
-                                                                                    tl: {
-                                                                                      hd: [
-                                                                                        "substr",
-                                                                                        (function (param) {
-                                                                                            return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: "barbaz",
-                                                                                                    _1: "foobarbaz".substr(3)
-                                                                                                  };
-                                                                                          })
-                                                                                      ],
-                                                                                      tl: {
-                                                                                        hd: [
-                                                                                          "substrAtMost",
-                                                                                          (function (param) {
-                                                                                              return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: "bar",
-                                                                                                      _1: "foobarbaz".substr(3, 3)
-                                                                                                    };
-                                                                                            })
-                                                                                        ],
-                                                                                        tl: {
-                                                                                          hd: [
-                                                                                            "substring",
-                                                                                            (function (param) {
-                                                                                                return {
-                                                                                                        TAG: "Eq",
-                                                                                                        _0: "bar",
-                                                                                                        _1: "foobarbaz".substring(3, 6)
-                                                                                                      };
-                                                                                              })
-                                                                                          ],
-                                                                                          tl: {
-                                                                                            hd: [
-                                                                                              "substringToEnd",
-                                                                                              (function (param) {
-                                                                                                  return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: "barbaz",
-                                                                                                          _1: "foobarbaz".substring(3)
-                                                                                                        };
-                                                                                                })
-                                                                                            ],
-                                                                                            tl: {
-                                                                                              hd: [
-                                                                                                "toLowerCase",
-                                                                                                (function (param) {
-                                                                                                    return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: "bork",
-                                                                                                            _1: "BORK".toLowerCase()
-                                                                                                          };
-                                                                                                  })
-                                                                                              ],
-                                                                                              tl: {
-                                                                                                hd: [
-                                                                                                  "toLocaleLowerCase",
-                                                                                                  (function (param) {
-                                                                                                      return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: "bork",
-                                                                                                              _1: "BORK".toLocaleLowerCase()
-                                                                                                            };
-                                                                                                    })
-                                                                                                ],
-                                                                                                tl: {
-                                                                                                  hd: [
-                                                                                                    "toUpperCase",
-                                                                                                    (function (param) {
-                                                                                                        return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: "FUBAR",
-                                                                                                                _1: "fubar".toUpperCase()
-                                                                                                              };
-                                                                                                      })
-                                                                                                  ],
-                                                                                                  tl: {
-                                                                                                    hd: [
-                                                                                                      "toLocaleUpperCase",
-                                                                                                      (function (param) {
-                                                                                                          return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: "FUBAR",
-                                                                                                                  _1: "fubar".toLocaleUpperCase()
-                                                                                                                };
-                                                                                                        })
-                                                                                                    ],
-                                                                                                    tl: {
-                                                                                                      hd: [
-                                                                                                        "trim",
-                                                                                                        (function (param) {
-                                                                                                            return {
-                                                                                                                    TAG: "Eq",
-                                                                                                                    _0: "foo",
-                                                                                                                    _1: "  foo  ".trim()
-                                                                                                                  };
-                                                                                                          })
-                                                                                                      ],
-                                                                                                      tl: {
-                                                                                                        hd: [
-                                                                                                          "anchor",
-                                                                                                          (function (param) {
-                                                                                                              return {
-                                                                                                                      TAG: "Eq",
-                                                                                                                      _0: "<a name=\"bar\">foo</a>",
-                                                                                                                      _1: "foo".anchor("bar")
-                                                                                                                    };
-                                                                                                            })
-                                                                                                        ],
-                                                                                                        tl: {
-                                                                                                          hd: [
-                                                                                                            "link",
-                                                                                                            (function (param) {
-                                                                                                                return {
-                                                                                                                        TAG: "Eq",
-                                                                                                                        _0: "<a href=\"https://reason.ml\">foo</a>",
-                                                                                                                        _1: "foo".link("https://reason.ml")
-                                                                                                                      };
-                                                                                                              })
-                                                                                                          ],
-                                                                                                          tl: {
-                                                                                                            hd: [
-                                                                                                              "File \"js_string_test.res\", line 138, characters 5-12",
-                                                                                                              (function (param) {
-                                                                                                                  return {
-                                                                                                                          TAG: "Ok",
-                                                                                                                          _0: "ab".includes("a")
-                                                                                                                        };
-                                                                                                                })
-                                                                                                            ],
-                                                                                                            tl: /* [] */0
-                                                                                                          }
-                                                                                                        }
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_string_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_string_test.res b/jscomp/test/js_string_test.res
deleted file mode 100644
index f1ae84d..0000000
--- a/jscomp/test/js_string_test.res
+++ /dev/null
@@ -1,141 +0,0 @@
-let suites = {
-  open Mt
-  list{
-    ("make", _ => Eq("null", Js.String2.make(Js.null)->Js.String2.concat(""))),
-    ("fromCharCode", _ => Eq("a", Js.String2.fromCharCode(97))),
-    ("fromCharCodeMany", _ => Eq("az", Js.String2.fromCharCodeMany([97, 122]))),
-    /* es2015 */
-    ("fromCodePoint", _ => Eq("a", Js.String2.fromCodePoint(0x61))),
-    ("fromCodePointMany", _ => Eq("az", Js.String2.fromCodePointMany([0x61, 0x7a]))),
-    ("length", _ => Eq(3, "foo"->Js.String2.length)),
-    ("get", _ => Eq("a", Js.String2.get("foobar", 4))),
-    ("charAt", _ => Eq("a", "foobar"->Js.String2.charAt(4))),
-    ("charCodeAt", _ => Eq(97., "foobar"->Js.String2.charCodeAt(4))),
-    /* es2015 */
-    ("codePointAt", _ => Eq(Some(0x61), "foobar"->Js.String2.codePointAt(4))),
-    ("codePointAt - out of bounds", _ => Eq(None, "foobar"->Js.String2.codePointAt(98))),
-    ("concat", _ => Eq("foobar", "foo"->Js.String2.concat("bar"))),
-    ("concatMany", _ => Eq("foobarbaz", "foo"->Js.String2.concatMany(["bar", "baz"]))),
-    /* es2015 */
-    ("endsWith", _ => Eq(true, "foobar"->Js.String2.endsWith("bar"))),
-    ("endsWithFrom", _ => Eq(false, "foobar"->Js.String2.endsWithFrom("bar", 1))),
-    /* es2015 */
-    ("includes", _ => Eq(true, "foobarbaz"->Js.String2.includes("bar"))),
-    ("includesFrom", _ => Eq(false, "foobarbaz"->Js.String2.includesFrom("bar", 4))),
-    ("indexOf", _ => Eq(3, "foobarbaz"->Js.String2.indexOf("bar"))),
-    ("indexOfFrom", _ => Eq(-1, "foobarbaz"->Js.String2.indexOfFrom("bar", 4))),
-    ("lastIndexOf", _ => Eq(3, "foobarbaz"->Js.String2.lastIndexOf("bar"))),
-    ("lastIndexOfFrom", _ => Eq(3, "foobarbaz"->Js.String2.lastIndexOfFrom("bar", 4))),
-    ("localeCompare", _ => Eq(0., "foo"->Js.String2.localeCompare("foo"))),
-    ("match", _ => Eq(Some([Some("na"), Some("na")]), "banana"->Js.String2.match_(%re("/na+/g")))),
-    ("match - no match", _ => Eq(None, "banana"->Js.String2.match_(%re("/nanana+/g")))),
-    (
-      "match - not found capture groups",
-      _ => Eq(
-        Some([Some("hello "), None]),
-        "hello word"->Js.String2.match_(%re("/hello (world)?/"))->Belt.Option.map(Js.Array.copy),
-      ),
-    ),
-    /* es2015 */
-    ("normalize", _ => Eq("foo", "foo"->Js.String2.normalize)),
-    ("normalizeByForm", _ => Eq("foo", "foo"->Js.String2.normalizeByForm("NFKD"))),
-    /* es2015 */
-    ("repeat", _ => Eq("foofoofoo", "foo"->Js.String2.repeat(3))),
-    ("replace", _ => Eq("fooBORKbaz", "foobarbaz"->Js.String2.replace("bar", "BORK"))),
-    (
-      "replaceByRe",
-      _ => Eq("fooBORKBORK", "foobarbaz"->Js.String2.replaceByRe(%re("/ba./g"), "BORK")),
-    ),
-    (
-      "unsafeReplaceBy0",
-      _ => {
-        let replace = (whole, offset, s) =>
-          if whole == "bar" {
-            "BORK"
-          } else {
-            "DORK"
-          }
-
-        Eq("fooBORKDORK", "foobarbaz"->Js.String2.unsafeReplaceBy0(%re("/ba./g"), replace))
-      },
-    ),
-    (
-      "unsafeReplaceBy1",
-      _ => {
-        let replace = (whole, p1, offset, s) =>
-          if whole == "bar" {
-            "BORK"
-          } else {
-            "DORK"
-          }
-
-        Eq("fooBORKDORK", "foobarbaz"->Js.String2.unsafeReplaceBy1(%re("/ba./g"), replace))
-      },
-    ),
-    (
-      "unsafeReplaceBy2",
-      _ => {
-        let replace = (whole, p1, p2, offset, s) =>
-          if whole == "bar" {
-            "BORK"
-          } else {
-            "DORK"
-          }
-
-        Eq("fooBORKDORK", "foobarbaz"->Js.String2.unsafeReplaceBy2(%re("/ba./g"), replace))
-      },
-    ),
-    (
-      "unsafeReplaceBy3",
-      _ => {
-        let replace = (whole, p1, p2, p3, offset, s) =>
-          if whole == "bar" {
-            "BORK"
-          } else {
-            "DORK"
-          }
-
-        Eq("fooBORKDORK", "foobarbaz"->Js.String2.unsafeReplaceBy3(%re("/ba./g"), replace))
-      },
-    ),
-    ("search", _ => Eq(3, "foobarbaz"->Js.String2.search(%re("/ba./g")))),
-    ("slice", _ => Eq("bar", "foobarbaz"->Js.String2.slice(~from=3, ~to_=6))),
-    ("sliceToEnd", _ => Eq("barbaz", "foobarbaz"->Js.String2.sliceToEnd(~from=3))),
-    ("split", _ => Eq(["foo", "bar", "baz"], "foo bar baz"->Js.String2.split(" "))),
-    ("splitAtMost", _ => Eq(["foo", "bar"], "foo bar baz"->Js.String2.splitAtMost(" ", ~limit=2))),
-    (
-      "splitByRe",
-      _ => Eq(
-        [Some("a"), Some("#"), None, Some("b"), Some("#"), Some(":"), Some("c")],
-        "a#b#:c" |> Js.String.splitByRe(%re("/(#)(:)?/")),
-      ),
-    ),
-    (
-      "splitByReAtMost",
-      _ => Eq(
-        [Some("a"), Some("#"), None],
-        "a#b#:c" |> Js.String.splitByReAtMost(%re("/(#)(:)?/"), ~limit=3),
-      ),
-    ),
-    /* es2015 */
-    ("startsWith", _ => Eq(true, "foobarbaz"->Js.String2.startsWith("foo"))),
-    ("startsWithFrom", _ => Eq(false, "foobarbaz"->Js.String2.startsWithFrom("foo", 1))),
-    ("substr", _ => Eq("barbaz", "foobarbaz"->Js.String2.substr(~from=3))),
-    ("substrAtMost", _ => Eq("bar", "foobarbaz"->Js.String2.substrAtMost(~from=3, ~length=3))),
-    ("substring", _ => Eq("bar", "foobarbaz"->Js.String2.substring(~from=3, ~to_=6))),
-    ("substringToEnd", _ => Eq("barbaz", "foobarbaz"->Js.String2.substringToEnd(~from=3))),
-    ("toLowerCase", _ => Eq("bork", "BORK"->Js.String2.toLowerCase)),
-    ("toLocaleLowerCase", _ => Eq("bork", "BORK"->Js.String2.toLocaleLowerCase)),
-    ("toUpperCase", _ => Eq("FUBAR", "fubar"->Js.String2.toUpperCase)),
-    ("toLocaleUpperCase", _ => Eq("FUBAR", "fubar"->Js.String2.toLocaleUpperCase)),
-    ("trim", _ => Eq("foo", "  foo  "->Js.String2.trim)),
-    /* es2015 */
-    ("anchor", _ => Eq("<a name=\"bar\">foo</a>", "foo"->Js.String2.anchor("bar"))),
-    (
-      "link",
-      _ => Eq("<a href=\"https://reason.ml\">foo</a>", "foo"->Js.String2.link("https://reason.ml")),
-    ),
-    (__LOC__, _ => Ok(Js.String2.includes("ab", "a"))),
-  }
-}
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_typed_array_test.js b/jscomp/test/js_typed_array_test.js
deleted file mode 100644
index 43e6c36..0000000
--- a/jscomp/test/js_typed_array_test.js
+++ /dev/null
@@ -1,2342 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Js_typed_array = require("../../lib/js/js_typed_array.js");
-
-function mkI8(a) {
-  return new Int8Array(a);
-}
-
-function via(make, f, arr) {
-  return Array.from(Curry._1(f, Curry._1(make, arr)));
-}
-
-function viaInt8(f, arr) {
-  return function (param, param$1) {
-    return Array.from(Curry._1(param, new Int8Array(param$1)));
-  };
-}
-
-var x = new Int8Array([
-      1,
-      2,
-      3
-    ]);
-
-var suites_0 = [
-  "array_buffer - make",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: 5,
-              _1: new ArrayBuffer(5).byteLength
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "array_buffer - byteLength",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: 5,
-                _1: new ArrayBuffer(5).byteLength
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "array_buffer - slice",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: 2,
-                  _1: Js_typed_array.$$ArrayBuffer.slice(2, 4, new ArrayBuffer(5)).byteLength
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "array_buffer - sliceFrom",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: 3,
-                    _1: Js_typed_array.$$ArrayBuffer.sliceFrom(2, new ArrayBuffer(5)).byteLength
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "typed_array - unsafe_get",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: 4,
-                      _1: new Int8Array([
-                              1,
-                              2,
-                              3,
-                              4,
-                              5
-                            ])[3]
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "typed_array - unsafe_set",
-            (function (param) {
-                var a = new Int8Array([
-                      1,
-                      2,
-                      3,
-                      4,
-                      5
-                    ]);
-                a[3] = 14;
-                return {
-                        TAG: "Eq",
-                        _0: 14,
-                        _1: a[3]
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "typed_array - buffer",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: new Int8Array([
-                                3,
-                                4,
-                                5
-                              ]),
-                          _1: new Int8Array(new Int8Array([
-                                    1,
-                                    2,
-                                    3,
-                                    4,
-                                    5
-                                  ]).buffer, 2)
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "typed_array - byteLength",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: 10,
-                            _1: new Int16Array([
-                                  1,
-                                  2,
-                                  3,
-                                  4,
-                                  5
-                                ]).byteLength
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "typed_array - byteOffset",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: 0,
-                              _1: new Int8Array([
-                                    1,
-                                    2,
-                                    3,
-                                    4,
-                                    5
-                                  ]).byteOffset
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "typed_array - setArray",
-                    (function (param) {
-                        var f = function (a) {
-                          Js_typed_array.$$Int8Array.setArray([
-                                9,
-                                8,
-                                7
-                              ], a);
-                          return a;
-                        };
-                        return {
-                                TAG: "Eq",
-                                _0: new Int8Array([
-                                      9,
-                                      8,
-                                      7,
-                                      4,
-                                      5
-                                    ]),
-                                _1: f(new Int8Array([
-                                          1,
-                                          2,
-                                          3,
-                                          4,
-                                          5
-                                        ]))
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "typed_array - setArrayOffset",
-                      (function (param) {
-                          var f = function (a) {
-                            Js_typed_array.$$Int8Array.setArrayOffset([
-                                  9,
-                                  8,
-                                  7
-                                ], 2, a);
-                            return a;
-                          };
-                          return {
-                                  TAG: "Eq",
-                                  _0: new Int8Array([
-                                        1,
-                                        2,
-                                        9,
-                                        8,
-                                        7
-                                      ]),
-                                  _1: f(new Int8Array([
-                                            1,
-                                            2,
-                                            3,
-                                            4,
-                                            5
-                                          ]))
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "typed_array - length",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: 5,
-                                    _1: new Int8Array([
-                                          1,
-                                          2,
-                                          3,
-                                          4,
-                                          5
-                                        ]).length
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "typed_array - copyWithin",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: new Int8Array([
-                                            1,
-                                            2,
-                                            3,
-                                            1,
-                                            2
-                                          ]),
-                                      _1: Js_typed_array.$$Int8Array.copyWithin(-2, new Int8Array([
-                                                1,
-                                                2,
-                                                3,
-                                                4,
-                                                5
-                                              ]))
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "typed_array - copyWithinFrom",
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: new Int8Array([
-                                              4,
-                                              5,
-                                              3,
-                                              4,
-                                              5
-                                            ]),
-                                        _1: Js_typed_array.$$Int8Array.copyWithinFrom(0, 3, new Int8Array([
-                                                  1,
-                                                  2,
-                                                  3,
-                                                  4,
-                                                  5
-                                                ]))
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "typed_array - copyWithinFromRange",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: new Int8Array([
-                                                4,
-                                                2,
-                                                3,
-                                                4,
-                                                5
-                                              ]),
-                                          _1: Js_typed_array.$$Int8Array.copyWithinFromRange(0, 3, 4, new Int8Array([
-                                                    1,
-                                                    2,
-                                                    3,
-                                                    4,
-                                                    5
-                                                  ]))
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "typed_array - fillInPlace",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: new Int8Array([
-                                                  4,
-                                                  4,
-                                                  4
-                                                ]),
-                                            _1: Js_typed_array.$$Int8Array.fillInPlace(4, new Int8Array([
-                                                      1,
-                                                      2,
-                                                      3
-                                                    ]))
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "typed_array - fillFromInPlace",
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: new Int8Array([
-                                                    1,
-                                                    4,
-                                                    4
-                                                  ]),
-                                              _1: Js_typed_array.$$Int8Array.fillFromInPlace(4, 1, new Int8Array([
-                                                        1,
-                                                        2,
-                                                        3
-                                                      ]))
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "typed_array - fillRangeInPlace",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: new Int8Array([
-                                                      1,
-                                                      4,
-                                                      3
-                                                    ]),
-                                                _1: Js_typed_array.$$Int8Array.fillRangeInPlace(4, 1, 2, new Int8Array([
-                                                          1,
-                                                          2,
-                                                          3
-                                                        ]))
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "typed_array - reverseInPlace",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: new Int8Array([
-                                                        3,
-                                                        2,
-                                                        1
-                                                      ]),
-                                                  _1: new Int8Array([
-                                                          1,
-                                                          2,
-                                                          3
-                                                        ]).reverse()
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "typed_array - sortInPlace",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: new Int8Array([
-                                                          1,
-                                                          2,
-                                                          3
-                                                        ]),
-                                                    _1: new Int8Array([
-                                                            3,
-                                                            1,
-                                                            2
-                                                          ]).sort()
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "typed_array - sortInPlaceWith",
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: new Int8Array([
-                                                            3,
-                                                            2,
-                                                            1
-                                                          ]),
-                                                      _1: Js_typed_array.$$Int8Array.sortInPlaceWith((function (a, b) {
-                                                              return b - a | 0;
-                                                            }), new Int8Array([
-                                                                3,
-                                                                1,
-                                                                2
-                                                              ]))
-                                                    };
-                                            })
-                                        ],
-                                        tl: {
-                                          hd: [
-                                            "typed_array - includes",
-                                            (function (param) {
-                                                return {
-                                                        TAG: "Eq",
-                                                        _0: true,
-                                                        _1: Js_typed_array.$$Int8Array.includes(3, new Int8Array([
-                                                                  1,
-                                                                  2,
-                                                                  3
-                                                                ]))
-                                                      };
-                                              })
-                                          ],
-                                          tl: {
-                                            hd: [
-                                              "typed_array - indexOf",
-                                              (function (param) {
-                                                  return {
-                                                          TAG: "Eq",
-                                                          _0: 1,
-                                                          _1: Js_typed_array.$$Int8Array.indexOf(2, new Int8Array([
-                                                                    1,
-                                                                    2,
-                                                                    3
-                                                                  ]))
-                                                        };
-                                                })
-                                            ],
-                                            tl: {
-                                              hd: [
-                                                "typed_array - indexOfFrom",
-                                                (function (param) {
-                                                    return {
-                                                            TAG: "Eq",
-                                                            _0: 3,
-                                                            _1: Js_typed_array.$$Int8Array.indexOfFrom(2, 2, new Int8Array([
-                                                                      1,
-                                                                      2,
-                                                                      3,
-                                                                      2
-                                                                    ]))
-                                                          };
-                                                  })
-                                              ],
-                                              tl: {
-                                                hd: [
-                                                  "typed_array - join",
-                                                  (function (param) {
-                                                      return {
-                                                              TAG: "Eq",
-                                                              _0: "1,2,3",
-                                                              _1: new Int8Array([
-                                                                      1,
-                                                                      2,
-                                                                      3
-                                                                    ]).join()
-                                                            };
-                                                    })
-                                                ],
-                                                tl: {
-                                                  hd: [
-                                                    "typed_array - joinWith",
-                                                    (function (param) {
-                                                        return {
-                                                                TAG: "Eq",
-                                                                _0: "1;2;3",
-                                                                _1: Js_typed_array.$$Int8Array.joinWith(";", new Int8Array([
-                                                                          1,
-                                                                          2,
-                                                                          3
-                                                                        ]))
-                                                              };
-                                                      })
-                                                  ],
-                                                  tl: {
-                                                    hd: [
-                                                      "typed_array - lastIndexOf",
-                                                      (function (param) {
-                                                          return {
-                                                                  TAG: "Eq",
-                                                                  _0: 1,
-                                                                  _1: Js_typed_array.$$Int8Array.lastIndexOf(2, new Int8Array([
-                                                                            1,
-                                                                            2,
-                                                                            3
-                                                                          ]))
-                                                                };
-                                                        })
-                                                    ],
-                                                    tl: {
-                                                      hd: [
-                                                        "typed_array - lastIndexOfFrom",
-                                                        (function (param) {
-                                                            return {
-                                                                    TAG: "Eq",
-                                                                    _0: 1,
-                                                                    _1: Js_typed_array.$$Int8Array.lastIndexOfFrom(2, 2, new Int8Array([
-                                                                              1,
-                                                                              2,
-                                                                              3,
-                                                                              2
-                                                                            ]))
-                                                                  };
-                                                          })
-                                                      ],
-                                                      tl: {
-                                                        hd: [
-                                                          "typed_array - slice",
-                                                          (function (param) {
-                                                              return {
-                                                                      TAG: "Eq",
-                                                                      _0: new Int8Array([
-                                                                            2,
-                                                                            3
-                                                                          ]),
-                                                                      _1: Js_typed_array.$$Int8Array.slice(1, 3, new Int8Array([
-                                                                                1,
-                                                                                2,
-                                                                                3,
-                                                                                4,
-                                                                                5
-                                                                              ]))
-                                                                    };
-                                                            })
-                                                        ],
-                                                        tl: {
-                                                          hd: [
-                                                            "typed_array - copy",
-                                                            (function (param) {
-                                                                return {
-                                                                        TAG: "Eq",
-                                                                        _0: new Int8Array([
-                                                                              1,
-                                                                              2,
-                                                                              3,
-                                                                              4,
-                                                                              5
-                                                                            ]),
-                                                                        _1: new Int8Array([
-                                                                                1,
-                                                                                2,
-                                                                                3,
-                                                                                4,
-                                                                                5
-                                                                              ]).slice()
-                                                                      };
-                                                              })
-                                                          ],
-                                                          tl: {
-                                                            hd: [
-                                                              "typed_array - sliceFrom",
-                                                              (function (param) {
-                                                                  return {
-                                                                          TAG: "Eq",
-                                                                          _0: new Int8Array([
-                                                                                3,
-                                                                                4,
-                                                                                5
-                                                                              ]),
-                                                                          _1: Js_typed_array.$$Int8Array.sliceFrom(2, new Int8Array([
-                                                                                    1,
-                                                                                    2,
-                                                                                    3,
-                                                                                    4,
-                                                                                    5
-                                                                                  ]))
-                                                                        };
-                                                                })
-                                                            ],
-                                                            tl: {
-                                                              hd: [
-                                                                "typed_array - subarray",
-                                                                (function (param) {
-                                                                    return {
-                                                                            TAG: "Eq",
-                                                                            _0: new Int8Array([
-                                                                                  2,
-                                                                                  3
-                                                                                ]),
-                                                                            _1: Js_typed_array.$$Int8Array.subarray(1, 3, new Int8Array([
-                                                                                      1,
-                                                                                      2,
-                                                                                      3,
-                                                                                      4,
-                                                                                      5
-                                                                                    ]))
-                                                                          };
-                                                                  })
-                                                              ],
-                                                              tl: {
-                                                                hd: [
-                                                                  "typed_array - subarrayFrom",
-                                                                  (function (param) {
-                                                                      return {
-                                                                              TAG: "Eq",
-                                                                              _0: new Int8Array([
-                                                                                    3,
-                                                                                    4,
-                                                                                    5
-                                                                                  ]),
-                                                                              _1: Js_typed_array.$$Int8Array.subarrayFrom(2, new Int8Array([
-                                                                                        1,
-                                                                                        2,
-                                                                                        3,
-                                                                                        4,
-                                                                                        5
-                                                                                      ]))
-                                                                            };
-                                                                    })
-                                                                ],
-                                                                tl: {
-                                                                  hd: [
-                                                                    "typed_array - toString",
-                                                                    (function (param) {
-                                                                        return {
-                                                                                TAG: "Eq",
-                                                                                _0: "1,2,3",
-                                                                                _1: new Int8Array([
-                                                                                        1,
-                                                                                        2,
-                                                                                        3
-                                                                                      ]).toString()
-                                                                              };
-                                                                      })
-                                                                  ],
-                                                                  tl: {
-                                                                    hd: [
-                                                                      "typed_array - toLocaleString",
-                                                                      (function (param) {
-                                                                          return {
-                                                                                  TAG: "Eq",
-                                                                                  _0: "1,2,3",
-                                                                                  _1: new Int8Array([
-                                                                                          1,
-                                                                                          2,
-                                                                                          3
-                                                                                        ]).toLocaleString()
-                                                                                };
-                                                                        })
-                                                                    ],
-                                                                    tl: {
-                                                                      hd: [
-                                                                        "typed_array - every",
-                                                                        (function (param) {
-                                                                            return {
-                                                                                    TAG: "Eq",
-                                                                                    _0: true,
-                                                                                    _1: Js_typed_array.$$Int8Array.every((function (n) {
-                                                                                            return n > 0;
-                                                                                          }), new Int8Array([
-                                                                                              1,
-                                                                                              2,
-                                                                                              3
-                                                                                            ]))
-                                                                                  };
-                                                                          })
-                                                                      ],
-                                                                      tl: {
-                                                                        hd: [
-                                                                          "typed_array - everyi",
-                                                                          (function (param) {
-                                                                              return {
-                                                                                      TAG: "Eq",
-                                                                                      _0: false,
-                                                                                      _1: Js_typed_array.$$Int8Array.everyi((function (param, i) {
-                                                                                              return i > 0;
-                                                                                            }), new Int8Array([
-                                                                                                1,
-                                                                                                2,
-                                                                                                3
-                                                                                              ]))
-                                                                                    };
-                                                                            })
-                                                                        ],
-                                                                        tl: {
-                                                                          hd: [
-                                                                            "typed_array - filter",
-                                                                            (function (param) {
-                                                                                return {
-                                                                                        TAG: "Eq",
-                                                                                        _0: new Int8Array([
-                                                                                              2,
-                                                                                              4
-                                                                                            ]),
-                                                                                        _1: Js_typed_array.$$Int8Array.filter((function (n) {
-                                                                                                return n % 2 === 0;
-                                                                                              }), new Int8Array([
-                                                                                                  1,
-                                                                                                  2,
-                                                                                                  3,
-                                                                                                  4
-                                                                                                ]))
-                                                                                      };
-                                                                              })
-                                                                          ],
-                                                                          tl: {
-                                                                            hd: [
-                                                                              "typed_array - filteri",
-                                                                              (function (param) {
-                                                                                  return {
-                                                                                          TAG: "Eq",
-                                                                                          _0: new Int8Array([
-                                                                                                1,
-                                                                                                3
-                                                                                              ]),
-                                                                                          _1: Js_typed_array.$$Int8Array.filteri((function (param, i) {
-                                                                                                  return i % 2 === 0;
-                                                                                                }), new Int8Array([
-                                                                                                    1,
-                                                                                                    2,
-                                                                                                    3,
-                                                                                                    4
-                                                                                                  ]))
-                                                                                        };
-                                                                                })
-                                                                            ],
-                                                                            tl: {
-                                                                              hd: [
-                                                                                "typed_array - find",
-                                                                                (function (param) {
-                                                                                    return {
-                                                                                            TAG: "Eq",
-                                                                                            _0: 2,
-                                                                                            _1: Js_typed_array.$$Int8Array.find((function (n) {
-                                                                                                    return n % 2 === 0;
-                                                                                                  }), new Int8Array([
-                                                                                                      1,
-                                                                                                      2,
-                                                                                                      3,
-                                                                                                      4
-                                                                                                    ]))
-                                                                                          };
-                                                                                  })
-                                                                              ],
-                                                                              tl: {
-                                                                                hd: [
-                                                                                  "typed_array - findi",
-                                                                                  (function (param) {
-                                                                                      return {
-                                                                                              TAG: "Eq",
-                                                                                              _0: 1,
-                                                                                              _1: Js_typed_array.$$Int8Array.findi((function (param, i) {
-                                                                                                      return i % 2 === 0;
-                                                                                                    }), new Int8Array([
-                                                                                                        1,
-                                                                                                        2,
-                                                                                                        3,
-                                                                                                        4
-                                                                                                      ]))
-                                                                                            };
-                                                                                    })
-                                                                                ],
-                                                                                tl: {
-                                                                                  hd: [
-                                                                                    "typed_array - findIndex",
-                                                                                    (function (param) {
-                                                                                        return {
-                                                                                                TAG: "Eq",
-                                                                                                _0: 1,
-                                                                                                _1: Js_typed_array.$$Int8Array.findIndex((function (n) {
-                                                                                                        return n % 2 === 0;
-                                                                                                      }), new Int8Array([
-                                                                                                          1,
-                                                                                                          2,
-                                                                                                          3,
-                                                                                                          4
-                                                                                                        ]))
-                                                                                              };
-                                                                                      })
-                                                                                  ],
-                                                                                  tl: {
-                                                                                    hd: [
-                                                                                      "typed_array - findIndexi",
-                                                                                      (function (param) {
-                                                                                          return {
-                                                                                                  TAG: "Eq",
-                                                                                                  _0: 0,
-                                                                                                  _1: Js_typed_array.$$Int8Array.findIndexi((function (param, i) {
-                                                                                                          return i % 2 === 0;
-                                                                                                        }), new Int8Array([
-                                                                                                            1,
-                                                                                                            2,
-                                                                                                            3,
-                                                                                                            4
-                                                                                                          ]))
-                                                                                                };
-                                                                                        })
-                                                                                    ],
-                                                                                    tl: {
-                                                                                      hd: [
-                                                                                        "typed_array - forEach",
-                                                                                        (function (param) {
-                                                                                            var sum = {
-                                                                                              contents: 0
-                                                                                            };
-                                                                                            Js_typed_array.$$Int8Array.forEach((function (n) {
-                                                                                                    sum.contents = sum.contents + n | 0;
-                                                                                                  }), new Int8Array([
-                                                                                                      1,
-                                                                                                      2,
-                                                                                                      3
-                                                                                                    ]));
-                                                                                            return {
-                                                                                                    TAG: "Eq",
-                                                                                                    _0: 6,
-                                                                                                    _1: sum.contents
-                                                                                                  };
-                                                                                          })
-                                                                                      ],
-                                                                                      tl: {
-                                                                                        hd: [
-                                                                                          "typed_array - forEachi",
-                                                                                          (function (param) {
-                                                                                              var sum = {
-                                                                                                contents: 0
-                                                                                              };
-                                                                                              Js_typed_array.$$Int8Array.forEachi((function (param, i) {
-                                                                                                      sum.contents = sum.contents + i | 0;
-                                                                                                    }), new Int8Array([
-                                                                                                        1,
-                                                                                                        2,
-                                                                                                        3
-                                                                                                      ]));
-                                                                                              return {
-                                                                                                      TAG: "Eq",
-                                                                                                      _0: 3,
-                                                                                                      _1: sum.contents
-                                                                                                    };
-                                                                                            })
-                                                                                        ],
-                                                                                        tl: {
-                                                                                          hd: [
-                                                                                            "typed_array - map",
-                                                                                            (function (param) {
-                                                                                                return {
-                                                                                                        TAG: "Eq",
-                                                                                                        _0: new Int8Array([
-                                                                                                              2,
-                                                                                                              4,
-                                                                                                              6,
-                                                                                                              8
-                                                                                                            ]),
-                                                                                                        _1: Js_typed_array.$$Int8Array.map((function (n) {
-                                                                                                                return (n << 1);
-                                                                                                              }), new Int8Array([
-                                                                                                                  1,
-                                                                                                                  2,
-                                                                                                                  3,
-                                                                                                                  4
-                                                                                                                ]))
-                                                                                                      };
-                                                                                              })
-                                                                                          ],
-                                                                                          tl: {
-                                                                                            hd: [
-                                                                                              "typed_array - map",
-                                                                                              (function (param) {
-                                                                                                  return {
-                                                                                                          TAG: "Eq",
-                                                                                                          _0: new Int8Array([
-                                                                                                                0,
-                                                                                                                2,
-                                                                                                                4,
-                                                                                                                6
-                                                                                                              ]),
-                                                                                                          _1: Js_typed_array.$$Int8Array.mapi((function (param, i) {
-                                                                                                                  return (i << 1);
-                                                                                                                }), new Int8Array([
-                                                                                                                    1,
-                                                                                                                    2,
-                                                                                                                    3,
-                                                                                                                    4
-                                                                                                                  ]))
-                                                                                                        };
-                                                                                                })
-                                                                                            ],
-                                                                                            tl: {
-                                                                                              hd: [
-                                                                                                "typed_array - reduce",
-                                                                                                (function (param) {
-                                                                                                    return {
-                                                                                                            TAG: "Eq",
-                                                                                                            _0: -10,
-                                                                                                            _1: Js_typed_array.$$Int8Array.reduce((function (acc, n) {
-                                                                                                                    return acc - n | 0;
-                                                                                                                  }), 0, new Int8Array([
-                                                                                                                      1,
-                                                                                                                      2,
-                                                                                                                      3,
-                                                                                                                      4
-                                                                                                                    ]))
-                                                                                                          };
-                                                                                                  })
-                                                                                              ],
-                                                                                              tl: {
-                                                                                                hd: [
-                                                                                                  "typed_array - reducei",
-                                                                                                  (function (param) {
-                                                                                                      return {
-                                                                                                              TAG: "Eq",
-                                                                                                              _0: -6,
-                                                                                                              _1: Js_typed_array.$$Int8Array.reducei((function (acc, param, i) {
-                                                                                                                      return acc - i | 0;
-                                                                                                                    }), 0, new Int8Array([
-                                                                                                                        1,
-                                                                                                                        2,
-                                                                                                                        3,
-                                                                                                                        4
-                                                                                                                      ]))
-                                                                                                            };
-                                                                                                    })
-                                                                                                ],
-                                                                                                tl: {
-                                                                                                  hd: [
-                                                                                                    "typed_array - reduceRight",
-                                                                                                    (function (param) {
-                                                                                                        return {
-                                                                                                                TAG: "Eq",
-                                                                                                                _0: -10,
-                                                                                                                _1: Js_typed_array.$$Int8Array.reduceRight((function (acc, n) {
-                                                                                                                        return acc - n | 0;
-                                                                                                                      }), 0, new Int8Array([
-                                                                                                                          1,
-                                                                                                                          2,
-                                                                                                                          3,
-                                                                                                                          4
-                                                                                                                        ]))
-                                                                                                              };
-                                                                                                      })
-                                                                                                  ],
-                                                                                                  tl: {
-                                                                                                    hd: [
-                                                                                                      "typed_array - reduceRighti",
-                                                                                                      (function (param) {
-                                                                                                          return {
-                                                                                                                  TAG: "Eq",
-                                                                                                                  _0: -6,
-                                                                                                                  _1: Js_typed_array.$$Int8Array.reduceRighti((function (acc, param, i) {
-                                                                                                                          return acc - i | 0;
-                                                                                                                        }), 0, new Int8Array([
-                                                                                                                            1,
-                                                                                                                            2,
-                                                                                                                            3,
-                                                                                                                            4
-                                                                                                                          ]))
-                                                                                                                };
-                                                                                                        })
-                                                                                                    ],
-                                                                                                    tl: {
-                                                                                                      hd: [
-                                                                                                        "typed_array - some",
-                                                                                                        (function (param) {
-                                                                                                            return {
-                                                                                                                    TAG: "Eq",
-                                                                                                                    _0: false,
-                                                                                                                    _1: Js_typed_array.$$Int8Array.some((function (n) {
-                                                                                                                            return n <= 0;
-                                                                                                                          }), new Int8Array([
-                                                                                                                              1,
-                                                                                                                              2,
-                                                                                                                              3,
-                                                                                                                              4
-                                                                                                                            ]))
-                                                                                                                  };
-                                                                                                          })
-                                                                                                      ],
-                                                                                                      tl: {
-                                                                                                        hd: [
-                                                                                                          "typed_array - somei",
-                                                                                                          (function (param) {
-                                                                                                              return {
-                                                                                                                      TAG: "Eq",
-                                                                                                                      _0: true,
-                                                                                                                      _1: Js_typed_array.$$Int8Array.somei((function (param, i) {
-                                                                                                                              return i <= 0;
-                                                                                                                            }), new Int8Array([
-                                                                                                                                1,
-                                                                                                                                2,
-                                                                                                                                3,
-                                                                                                                                4
-                                                                                                                              ]))
-                                                                                                                    };
-                                                                                                            })
-                                                                                                        ],
-                                                                                                        tl: {
-                                                                                                          hd: [
-                                                                                                            "int8_array - _BYTES_PER_ELEMENT",
-                                                                                                            (function (param) {
-                                                                                                                return {
-                                                                                                                        TAG: "Eq",
-                                                                                                                        _0: 1,
-                                                                                                                        _1: Int8Array.BYTES_PER_ELEMENT
-                                                                                                                      };
-                                                                                                              })
-                                                                                                          ],
-                                                                                                          tl: {
-                                                                                                            hd: [
-                                                                                                              "int8_array - make",
-                                                                                                              (function (param) {
-                                                                                                                  return {
-                                                                                                                          TAG: "Eq",
-                                                                                                                          _0: 3,
-                                                                                                                          _1: new Int8Array([
-                                                                                                                                1,
-                                                                                                                                2,
-                                                                                                                                3
-                                                                                                                              ]).byteLength
-                                                                                                                        };
-                                                                                                                })
-                                                                                                            ],
-                                                                                                            tl: {
-                                                                                                              hd: [
-                                                                                                                "int8_array - fromBuffer",
-                                                                                                                (function (param) {
-                                                                                                                    return {
-                                                                                                                            TAG: "Eq",
-                                                                                                                            _0: 32,
-                                                                                                                            _1: new Int8Array(new ArrayBuffer(32)).byteLength
-                                                                                                                          };
-                                                                                                                  })
-                                                                                                              ],
-                                                                                                              tl: {
-                                                                                                                hd: [
-                                                                                                                  "int8_array - fromBufferOffset",
-                                                                                                                  (function (param) {
-                                                                                                                      var buffer = new ArrayBuffer(32);
-                                                                                                                      return {
-                                                                                                                              TAG: "Eq",
-                                                                                                                              _0: 24,
-                                                                                                                              _1: new Int8Array(buffer, 8).byteLength
-                                                                                                                            };
-                                                                                                                    })
-                                                                                                                ],
-                                                                                                                tl: {
-                                                                                                                  hd: [
-                                                                                                                    "int8_array - fromBufferRange",
-                                                                                                                    (function (param) {
-                                                                                                                        var buffer = new ArrayBuffer(32);
-                                                                                                                        return {
-                                                                                                                                TAG: "Eq",
-                                                                                                                                _0: 2,
-                                                                                                                                _1: new Int8Array(buffer, 8, 2).byteLength
-                                                                                                                              };
-                                                                                                                      })
-                                                                                                                  ],
-                                                                                                                  tl: {
-                                                                                                                    hd: [
-                                                                                                                      "int8_array - fromLength",
-                                                                                                                      (function (param) {
-                                                                                                                          return {
-                                                                                                                                  TAG: "Eq",
-                                                                                                                                  _0: 3,
-                                                                                                                                  _1: new Int8Array(3).byteLength
-                                                                                                                                };
-                                                                                                                        })
-                                                                                                                    ],
-                                                                                                                    tl: {
-                                                                                                                      hd: [
-                                                                                                                        "int8_array - unsafe_set - typed_array sanity check",
-                                                                                                                        (function (param) {
-                                                                                                                            var a = new Int8Array([
-                                                                                                                                  1,
-                                                                                                                                  2,
-                                                                                                                                  3,
-                                                                                                                                  4,
-                                                                                                                                  5
-                                                                                                                                ]);
-                                                                                                                            a[3] = 14;
-                                                                                                                            return {
-                                                                                                                                    TAG: "Eq",
-                                                                                                                                    _0: 14,
-                                                                                                                                    _1: a[3]
-                                                                                                                                  };
-                                                                                                                          })
-                                                                                                                      ],
-                                                                                                                      tl: {
-                                                                                                                        hd: [
-                                                                                                                          "uint8_array - _BYTES_PER_ELEMENT",
-                                                                                                                          (function (param) {
-                                                                                                                              return {
-                                                                                                                                      TAG: "Eq",
-                                                                                                                                      _0: 1,
-                                                                                                                                      _1: Uint8Array.BYTES_PER_ELEMENT
-                                                                                                                                    };
-                                                                                                                            })
-                                                                                                                        ],
-                                                                                                                        tl: {
-                                                                                                                          hd: [
-                                                                                                                            "uint8_array - make",
-                                                                                                                            (function (param) {
-                                                                                                                                return {
-                                                                                                                                        TAG: "Eq",
-                                                                                                                                        _0: 3,
-                                                                                                                                        _1: new Uint8Array([
-                                                                                                                                              1,
-                                                                                                                                              2,
-                                                                                                                                              3
-                                                                                                                                            ]).byteLength
-                                                                                                                                      };
-                                                                                                                              })
-                                                                                                                          ],
-                                                                                                                          tl: {
-                                                                                                                            hd: [
-                                                                                                                              "uint8_array - fromBuffer",
-                                                                                                                              (function (param) {
-                                                                                                                                  return {
-                                                                                                                                          TAG: "Eq",
-                                                                                                                                          _0: 32,
-                                                                                                                                          _1: new Uint8Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                        };
-                                                                                                                                })
-                                                                                                                            ],
-                                                                                                                            tl: {
-                                                                                                                              hd: [
-                                                                                                                                "uint8_array - fromBufferOffset",
-                                                                                                                                (function (param) {
-                                                                                                                                    var buffer = new ArrayBuffer(32);
-                                                                                                                                    return {
-                                                                                                                                            TAG: "Eq",
-                                                                                                                                            _0: 24,
-                                                                                                                                            _1: new Uint8Array(buffer, 8).byteLength
-                                                                                                                                          };
-                                                                                                                                  })
-                                                                                                                              ],
-                                                                                                                              tl: {
-                                                                                                                                hd: [
-                                                                                                                                  "uint8_array - fromBufferRange",
-                                                                                                                                  (function (param) {
-                                                                                                                                      var buffer = new ArrayBuffer(32);
-                                                                                                                                      return {
-                                                                                                                                              TAG: "Eq",
-                                                                                                                                              _0: 2,
-                                                                                                                                              _1: new Uint8Array(buffer, 8, 2).byteLength
-                                                                                                                                            };
-                                                                                                                                    })
-                                                                                                                                ],
-                                                                                                                                tl: {
-                                                                                                                                  hd: [
-                                                                                                                                    "uint8_array - fromLength",
-                                                                                                                                    (function (param) {
-                                                                                                                                        return {
-                                                                                                                                                TAG: "Eq",
-                                                                                                                                                _0: 3,
-                                                                                                                                                _1: new Uint8Array(3).byteLength
-                                                                                                                                              };
-                                                                                                                                      })
-                                                                                                                                  ],
-                                                                                                                                  tl: {
-                                                                                                                                    hd: [
-                                                                                                                                      "uint8_array - unsafe_set - typed_array sanity check",
-                                                                                                                                      (function (param) {
-                                                                                                                                          var a = new Uint8Array([
-                                                                                                                                                1,
-                                                                                                                                                2,
-                                                                                                                                                3,
-                                                                                                                                                4,
-                                                                                                                                                5
-                                                                                                                                              ]);
-                                                                                                                                          a[3] = 14;
-                                                                                                                                          return {
-                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                  _0: 14,
-                                                                                                                                                  _1: a[3]
-                                                                                                                                                };
-                                                                                                                                        })
-                                                                                                                                    ],
-                                                                                                                                    tl: {
-                                                                                                                                      hd: [
-                                                                                                                                        "uint8clamped_array - _BYTES_PER_ELEMENT",
-                                                                                                                                        (function (param) {
-                                                                                                                                            return {
-                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                    _0: 1,
-                                                                                                                                                    _1: Uint8ClampedArray.BYTES_PER_ELEMENT
-                                                                                                                                                  };
-                                                                                                                                          })
-                                                                                                                                      ],
-                                                                                                                                      tl: {
-                                                                                                                                        hd: [
-                                                                                                                                          "uint8clamped_array - make",
-                                                                                                                                          (function (param) {
-                                                                                                                                              return {
-                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                      _0: 3,
-                                                                                                                                                      _1: new Uint8ClampedArray([
-                                                                                                                                                            1,
-                                                                                                                                                            2,
-                                                                                                                                                            3
-                                                                                                                                                          ]).byteLength
-                                                                                                                                                    };
-                                                                                                                                            })
-                                                                                                                                        ],
-                                                                                                                                        tl: {
-                                                                                                                                          hd: [
-                                                                                                                                            "uint8clamped_array - fromBuffer",
-                                                                                                                                            (function (param) {
-                                                                                                                                                return {
-                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                        _0: 32,
-                                                                                                                                                        _1: new Uint8ClampedArray(new ArrayBuffer(32)).byteLength
-                                                                                                                                                      };
-                                                                                                                                              })
-                                                                                                                                          ],
-                                                                                                                                          tl: {
-                                                                                                                                            hd: [
-                                                                                                                                              "uint8clamped_array - fromBufferOffset",
-                                                                                                                                              (function (param) {
-                                                                                                                                                  var buffer = new ArrayBuffer(32);
-                                                                                                                                                  return {
-                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                          _0: 24,
-                                                                                                                                                          _1: new Uint8ClampedArray(buffer, 8).byteLength
-                                                                                                                                                        };
-                                                                                                                                                })
-                                                                                                                                            ],
-                                                                                                                                            tl: {
-                                                                                                                                              hd: [
-                                                                                                                                                "uint8clamped_array - fromBufferRange",
-                                                                                                                                                (function (param) {
-                                                                                                                                                    var buffer = new ArrayBuffer(32);
-                                                                                                                                                    return {
-                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                            _0: 2,
-                                                                                                                                                            _1: new Uint8ClampedArray(buffer, 8, 2).byteLength
-                                                                                                                                                          };
-                                                                                                                                                  })
-                                                                                                                                              ],
-                                                                                                                                              tl: {
-                                                                                                                                                hd: [
-                                                                                                                                                  "uint8clamped_array - fromLength",
-                                                                                                                                                  (function (param) {
-                                                                                                                                                      return {
-                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                              _0: 3,
-                                                                                                                                                              _1: new Uint8ClampedArray(3).byteLength
-                                                                                                                                                            };
-                                                                                                                                                    })
-                                                                                                                                                ],
-                                                                                                                                                tl: {
-                                                                                                                                                  hd: [
-                                                                                                                                                    "uint8clamped_array - unsafe_set - typed_array sanity check",
-                                                                                                                                                    (function (param) {
-                                                                                                                                                        var a = new Uint8ClampedArray([
-                                                                                                                                                              1,
-                                                                                                                                                              2,
-                                                                                                                                                              3,
-                                                                                                                                                              4,
-                                                                                                                                                              5
-                                                                                                                                                            ]);
-                                                                                                                                                        a[3] = 14;
-                                                                                                                                                        return {
-                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                _0: 14,
-                                                                                                                                                                _1: a[3]
-                                                                                                                                                              };
-                                                                                                                                                      })
-                                                                                                                                                  ],
-                                                                                                                                                  tl: {
-                                                                                                                                                    hd: [
-                                                                                                                                                      "int16_array - _BYTES_PER_ELEMENT",
-                                                                                                                                                      (function (param) {
-                                                                                                                                                          return {
-                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                  _0: 2,
-                                                                                                                                                                  _1: Int16Array.BYTES_PER_ELEMENT
-                                                                                                                                                                };
-                                                                                                                                                        })
-                                                                                                                                                    ],
-                                                                                                                                                    tl: {
-                                                                                                                                                      hd: [
-                                                                                                                                                        "int16_array - make",
-                                                                                                                                                        (function (param) {
-                                                                                                                                                            return {
-                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                    _0: 6,
-                                                                                                                                                                    _1: new Int16Array([
-                                                                                                                                                                          1,
-                                                                                                                                                                          2,
-                                                                                                                                                                          3
-                                                                                                                                                                        ]).byteLength
-                                                                                                                                                                  };
-                                                                                                                                                          })
-                                                                                                                                                      ],
-                                                                                                                                                      tl: {
-                                                                                                                                                        hd: [
-                                                                                                                                                          "int16_array - fromBuffer",
-                                                                                                                                                          (function (param) {
-                                                                                                                                                              return {
-                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                      _0: 32,
-                                                                                                                                                                      _1: new Int16Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                    };
-                                                                                                                                                            })
-                                                                                                                                                        ],
-                                                                                                                                                        tl: {
-                                                                                                                                                          hd: [
-                                                                                                                                                            "int16_array - fromBufferOffset",
-                                                                                                                                                            (function (param) {
-                                                                                                                                                                var buffer = new ArrayBuffer(32);
-                                                                                                                                                                return {
-                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                        _0: 24,
-                                                                                                                                                                        _1: new Int16Array(buffer, 8).byteLength
-                                                                                                                                                                      };
-                                                                                                                                                              })
-                                                                                                                                                          ],
-                                                                                                                                                          tl: {
-                                                                                                                                                            hd: [
-                                                                                                                                                              "int16_array - fromBufferRange",
-                                                                                                                                                              (function (param) {
-                                                                                                                                                                  var buffer = new ArrayBuffer(32);
-                                                                                                                                                                  return {
-                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                          _0: 4,
-                                                                                                                                                                          _1: new Int16Array(buffer, 8, 2).byteLength
-                                                                                                                                                                        };
-                                                                                                                                                                })
-                                                                                                                                                            ],
-                                                                                                                                                            tl: {
-                                                                                                                                                              hd: [
-                                                                                                                                                                "int16_array - fromLength",
-                                                                                                                                                                (function (param) {
-                                                                                                                                                                    return {
-                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                            _0: 6,
-                                                                                                                                                                            _1: new Int16Array(3).byteLength
-                                                                                                                                                                          };
-                                                                                                                                                                  })
-                                                                                                                                                              ],
-                                                                                                                                                              tl: {
-                                                                                                                                                                hd: [
-                                                                                                                                                                  "int16_array - unsafe_set - typed_array sanity check",
-                                                                                                                                                                  (function (param) {
-                                                                                                                                                                      var a = new Int16Array([
-                                                                                                                                                                            1,
-                                                                                                                                                                            2,
-                                                                                                                                                                            3,
-                                                                                                                                                                            4,
-                                                                                                                                                                            5
-                                                                                                                                                                          ]);
-                                                                                                                                                                      a[3] = 14;
-                                                                                                                                                                      return {
-                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                              _0: 14,
-                                                                                                                                                                              _1: a[3]
-                                                                                                                                                                            };
-                                                                                                                                                                    })
-                                                                                                                                                                ],
-                                                                                                                                                                tl: {
-                                                                                                                                                                  hd: [
-                                                                                                                                                                    "uint16_array - _BYTES_PER_ELEMENT",
-                                                                                                                                                                    (function (param) {
-                                                                                                                                                                        return {
-                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                _0: 2,
-                                                                                                                                                                                _1: Uint16Array.BYTES_PER_ELEMENT
-                                                                                                                                                                              };
-                                                                                                                                                                      })
-                                                                                                                                                                  ],
-                                                                                                                                                                  tl: {
-                                                                                                                                                                    hd: [
-                                                                                                                                                                      "uint16_array - make",
-                                                                                                                                                                      (function (param) {
-                                                                                                                                                                          return {
-                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                  _0: 6,
-                                                                                                                                                                                  _1: new Uint16Array([
-                                                                                                                                                                                        1,
-                                                                                                                                                                                        2,
-                                                                                                                                                                                        3
-                                                                                                                                                                                      ]).byteLength
-                                                                                                                                                                                };
-                                                                                                                                                                        })
-                                                                                                                                                                    ],
-                                                                                                                                                                    tl: {
-                                                                                                                                                                      hd: [
-                                                                                                                                                                        "uint16_array - fromBuffer",
-                                                                                                                                                                        (function (param) {
-                                                                                                                                                                            return {
-                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                    _0: 32,
-                                                                                                                                                                                    _1: new Uint16Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                  };
-                                                                                                                                                                          })
-                                                                                                                                                                      ],
-                                                                                                                                                                      tl: {
-                                                                                                                                                                        hd: [
-                                                                                                                                                                          "uint16_array - fromBufferOffset",
-                                                                                                                                                                          (function (param) {
-                                                                                                                                                                              var buffer = new ArrayBuffer(32);
-                                                                                                                                                                              return {
-                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                      _0: 24,
-                                                                                                                                                                                      _1: new Uint16Array(buffer, 8).byteLength
-                                                                                                                                                                                    };
-                                                                                                                                                                            })
-                                                                                                                                                                        ],
-                                                                                                                                                                        tl: {
-                                                                                                                                                                          hd: [
-                                                                                                                                                                            "uint16_array - fromBufferRange",
-                                                                                                                                                                            (function (param) {
-                                                                                                                                                                                var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                return {
-                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                        _0: 4,
-                                                                                                                                                                                        _1: new Uint16Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                      };
-                                                                                                                                                                              })
-                                                                                                                                                                          ],
-                                                                                                                                                                          tl: {
-                                                                                                                                                                            hd: [
-                                                                                                                                                                              "uint16_array - fromLength",
-                                                                                                                                                                              (function (param) {
-                                                                                                                                                                                  return {
-                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                          _0: 6,
-                                                                                                                                                                                          _1: new Uint16Array(3).byteLength
-                                                                                                                                                                                        };
-                                                                                                                                                                                })
-                                                                                                                                                                            ],
-                                                                                                                                                                            tl: {
-                                                                                                                                                                              hd: [
-                                                                                                                                                                                "uint16_array - unsafe_set - typed_array sanity check",
-                                                                                                                                                                                (function (param) {
-                                                                                                                                                                                    var a = new Uint16Array([
-                                                                                                                                                                                          1,
-                                                                                                                                                                                          2,
-                                                                                                                                                                                          3,
-                                                                                                                                                                                          4,
-                                                                                                                                                                                          5
-                                                                                                                                                                                        ]);
-                                                                                                                                                                                    a[3] = 14;
-                                                                                                                                                                                    return {
-                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                            _0: 14,
-                                                                                                                                                                                            _1: a[3]
-                                                                                                                                                                                          };
-                                                                                                                                                                                  })
-                                                                                                                                                                              ],
-                                                                                                                                                                              tl: {
-                                                                                                                                                                                hd: [
-                                                                                                                                                                                  "int32_array - _BYTES_PER_ELEMENT",
-                                                                                                                                                                                  (function (param) {
-                                                                                                                                                                                      return {
-                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                              _0: 4,
-                                                                                                                                                                                              _1: Int32Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                            };
-                                                                                                                                                                                    })
-                                                                                                                                                                                ],
-                                                                                                                                                                                tl: {
-                                                                                                                                                                                  hd: [
-                                                                                                                                                                                    "int32_array - make",
-                                                                                                                                                                                    (function (param) {
-                                                                                                                                                                                        return {
-                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                _0: 12,
-                                                                                                                                                                                                _1: new Int32Array($$Array.map((function (prim) {
-                                                                                                                                                                                                            return prim;
-                                                                                                                                                                                                          }), [
-                                                                                                                                                                                                          1,
-                                                                                                                                                                                                          2,
-                                                                                                                                                                                                          3
-                                                                                                                                                                                                        ])).byteLength
-                                                                                                                                                                                              };
-                                                                                                                                                                                      })
-                                                                                                                                                                                  ],
-                                                                                                                                                                                  tl: {
-                                                                                                                                                                                    hd: [
-                                                                                                                                                                                      "int32_array - fromBuffer",
-                                                                                                                                                                                      (function (param) {
-                                                                                                                                                                                          return {
-                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                  _0: 32,
-                                                                                                                                                                                                  _1: new Int32Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                };
-                                                                                                                                                                                        })
-                                                                                                                                                                                    ],
-                                                                                                                                                                                    tl: {
-                                                                                                                                                                                      hd: [
-                                                                                                                                                                                        "int32_array - fromBufferOffset",
-                                                                                                                                                                                        (function (param) {
-                                                                                                                                                                                            var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                            return {
-                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                    _0: 24,
-                                                                                                                                                                                                    _1: new Int32Array(buffer, 8).byteLength
-                                                                                                                                                                                                  };
-                                                                                                                                                                                          })
-                                                                                                                                                                                      ],
-                                                                                                                                                                                      tl: {
-                                                                                                                                                                                        hd: [
-                                                                                                                                                                                          "int32_array - fromBufferRange",
-                                                                                                                                                                                          (function (param) {
-                                                                                                                                                                                              var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                              return {
-                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                      _0: 8,
-                                                                                                                                                                                                      _1: new Int32Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                    };
-                                                                                                                                                                                            })
-                                                                                                                                                                                        ],
-                                                                                                                                                                                        tl: {
-                                                                                                                                                                                          hd: [
-                                                                                                                                                                                            "int32_array - fromLength",
-                                                                                                                                                                                            (function (param) {
-                                                                                                                                                                                                return {
-                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                        _0: 12,
-                                                                                                                                                                                                        _1: new Int32Array(3).byteLength
-                                                                                                                                                                                                      };
-                                                                                                                                                                                              })
-                                                                                                                                                                                          ],
-                                                                                                                                                                                          tl: {
-                                                                                                                                                                                            hd: [
-                                                                                                                                                                                              "int32_array - unsafe_set - typed_array sanity check",
-                                                                                                                                                                                              (function (param) {
-                                                                                                                                                                                                  var a = new Int32Array($$Array.map((function (prim) {
-                                                                                                                                                                                                              return prim;
-                                                                                                                                                                                                            }), [
-                                                                                                                                                                                                            1,
-                                                                                                                                                                                                            2,
-                                                                                                                                                                                                            3,
-                                                                                                                                                                                                            4,
-                                                                                                                                                                                                            5
-                                                                                                                                                                                                          ]));
-                                                                                                                                                                                                  a[3] = 14;
-                                                                                                                                                                                                  return {
-                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                          _0: 14,
-                                                                                                                                                                                                          _1: a[3]
-                                                                                                                                                                                                        };
-                                                                                                                                                                                                })
-                                                                                                                                                                                            ],
-                                                                                                                                                                                            tl: {
-                                                                                                                                                                                              hd: [
-                                                                                                                                                                                                "uint32_array - _BYTES_PER_ELEMENT",
-                                                                                                                                                                                                (function (param) {
-                                                                                                                                                                                                    return {
-                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                            _0: 4,
-                                                                                                                                                                                                            _1: Uint32Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                                          };
-                                                                                                                                                                                                  })
-                                                                                                                                                                                              ],
-                                                                                                                                                                                              tl: {
-                                                                                                                                                                                                hd: [
-                                                                                                                                                                                                  "uint32_array - make",
-                                                                                                                                                                                                  (function (param) {
-                                                                                                                                                                                                      return {
-                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                              _0: 12,
-                                                                                                                                                                                                              _1: new Uint32Array([
-                                                                                                                                                                                                                    1,
-                                                                                                                                                                                                                    2,
-                                                                                                                                                                                                                    3
-                                                                                                                                                                                                                  ]).byteLength
-                                                                                                                                                                                                            };
-                                                                                                                                                                                                    })
-                                                                                                                                                                                                ],
-                                                                                                                                                                                                tl: {
-                                                                                                                                                                                                  hd: [
-                                                                                                                                                                                                    "uint32_array - fromBuffer",
-                                                                                                                                                                                                    (function (param) {
-                                                                                                                                                                                                        return {
-                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                _0: 32,
-                                                                                                                                                                                                                _1: new Uint32Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                              };
-                                                                                                                                                                                                      })
-                                                                                                                                                                                                  ],
-                                                                                                                                                                                                  tl: {
-                                                                                                                                                                                                    hd: [
-                                                                                                                                                                                                      "uint32_array - fromBufferOffset",
-                                                                                                                                                                                                      (function (param) {
-                                                                                                                                                                                                          var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                                          return {
-                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                  _0: 24,
-                                                                                                                                                                                                                  _1: new Uint32Array(buffer, 8).byteLength
-                                                                                                                                                                                                                };
-                                                                                                                                                                                                        })
-                                                                                                                                                                                                    ],
-                                                                                                                                                                                                    tl: {
-                                                                                                                                                                                                      hd: [
-                                                                                                                                                                                                        "uint32_array - fromBufferRange",
-                                                                                                                                                                                                        (function (param) {
-                                                                                                                                                                                                            var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                                            return {
-                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                    _0: 8,
-                                                                                                                                                                                                                    _1: new Uint32Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                                  };
-                                                                                                                                                                                                          })
-                                                                                                                                                                                                      ],
-                                                                                                                                                                                                      tl: {
-                                                                                                                                                                                                        hd: [
-                                                                                                                                                                                                          "uint32_array - fromLength",
-                                                                                                                                                                                                          (function (param) {
-                                                                                                                                                                                                              return {
-                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                      _0: 12,
-                                                                                                                                                                                                                      _1: new Uint32Array(3).byteLength
-                                                                                                                                                                                                                    };
-                                                                                                                                                                                                            })
-                                                                                                                                                                                                        ],
-                                                                                                                                                                                                        tl: {
-                                                                                                                                                                                                          hd: [
-                                                                                                                                                                                                            "uint32_array - unsafe_set - typed_array sanity check",
-                                                                                                                                                                                                            (function (param) {
-                                                                                                                                                                                                                var a = new Uint32Array([
-                                                                                                                                                                                                                      1,
-                                                                                                                                                                                                                      2,
-                                                                                                                                                                                                                      3,
-                                                                                                                                                                                                                      4,
-                                                                                                                                                                                                                      5
-                                                                                                                                                                                                                    ]);
-                                                                                                                                                                                                                a[3] = 14;
-                                                                                                                                                                                                                return {
-                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                        _0: 14,
-                                                                                                                                                                                                                        _1: a[3]
-                                                                                                                                                                                                                      };
-                                                                                                                                                                                                              })
-                                                                                                                                                                                                          ],
-                                                                                                                                                                                                          tl: {
-                                                                                                                                                                                                            hd: [
-                                                                                                                                                                                                              "float32_array - _BYTES_PER_ELEMENT",
-                                                                                                                                                                                                              (function (param) {
-                                                                                                                                                                                                                  return {
-                                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                                          _0: 4,
-                                                                                                                                                                                                                          _1: Float32Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                                                        };
-                                                                                                                                                                                                                })
-                                                                                                                                                                                                            ],
-                                                                                                                                                                                                            tl: {
-                                                                                                                                                                                                              hd: [
-                                                                                                                                                                                                                "float32_array - make",
-                                                                                                                                                                                                                (function (param) {
-                                                                                                                                                                                                                    return {
-                                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                                            _0: 12,
-                                                                                                                                                                                                                            _1: new Float32Array([
-                                                                                                                                                                                                                                  1,
-                                                                                                                                                                                                                                  2,
-                                                                                                                                                                                                                                  3
-                                                                                                                                                                                                                                ]).byteLength
-                                                                                                                                                                                                                          };
-                                                                                                                                                                                                                  })
-                                                                                                                                                                                                              ],
-                                                                                                                                                                                                              tl: {
-                                                                                                                                                                                                                hd: [
-                                                                                                                                                                                                                  "float32_array - fromBuffer",
-                                                                                                                                                                                                                  (function (param) {
-                                                                                                                                                                                                                      return {
-                                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                                              _0: 32,
-                                                                                                                                                                                                                              _1: new Float32Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                                            };
-                                                                                                                                                                                                                    })
-                                                                                                                                                                                                                ],
-                                                                                                                                                                                                                tl: {
-                                                                                                                                                                                                                  hd: [
-                                                                                                                                                                                                                    "float32_array - fromBufferOffset",
-                                                                                                                                                                                                                    (function (param) {
-                                                                                                                                                                                                                        var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                                                        return {
-                                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                                _0: 24,
-                                                                                                                                                                                                                                _1: new Float32Array(buffer, 8).byteLength
-                                                                                                                                                                                                                              };
-                                                                                                                                                                                                                      })
-                                                                                                                                                                                                                  ],
-                                                                                                                                                                                                                  tl: {
-                                                                                                                                                                                                                    hd: [
-                                                                                                                                                                                                                      "float32_array - fromBufferRange",
-                                                                                                                                                                                                                      (function (param) {
-                                                                                                                                                                                                                          var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                                                          return {
-                                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                                  _0: 8,
-                                                                                                                                                                                                                                  _1: new Float32Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                                                };
-                                                                                                                                                                                                                        })
-                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                    tl: {
-                                                                                                                                                                                                                      hd: [
-                                                                                                                                                                                                                        "float32_array - fromLength",
-                                                                                                                                                                                                                        (function (param) {
-                                                                                                                                                                                                                            return {
-                                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                                    _0: 12,
-                                                                                                                                                                                                                                    _1: new Float32Array(3).byteLength
-                                                                                                                                                                                                                                  };
-                                                                                                                                                                                                                          })
-                                                                                                                                                                                                                      ],
-                                                                                                                                                                                                                      tl: {
-                                                                                                                                                                                                                        hd: [
-                                                                                                                                                                                                                          "float32_array - unsafe_set - typed_array sanity check",
-                                                                                                                                                                                                                          (function (param) {
-                                                                                                                                                                                                                              var a = new Float32Array([
-                                                                                                                                                                                                                                    1,
-                                                                                                                                                                                                                                    2,
-                                                                                                                                                                                                                                    3,
-                                                                                                                                                                                                                                    4,
-                                                                                                                                                                                                                                    5
-                                                                                                                                                                                                                                  ]);
-                                                                                                                                                                                                                              a[3] = 14;
-                                                                                                                                                                                                                              return {
-                                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                                      _0: 14,
-                                                                                                                                                                                                                                      _1: a[3]
-                                                                                                                                                                                                                                    };
-                                                                                                                                                                                                                            })
-                                                                                                                                                                                                                        ],
-                                                                                                                                                                                                                        tl: {
-                                                                                                                                                                                                                          hd: [
-                                                                                                                                                                                                                            "float64_array - _BYTES_PER_ELEMENT",
-                                                                                                                                                                                                                            (function (param) {
-                                                                                                                                                                                                                                return {
-                                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                                        _0: 8,
-                                                                                                                                                                                                                                        _1: Float64Array.BYTES_PER_ELEMENT
-                                                                                                                                                                                                                                      };
-                                                                                                                                                                                                                              })
-                                                                                                                                                                                                                          ],
-                                                                                                                                                                                                                          tl: {
-                                                                                                                                                                                                                            hd: [
-                                                                                                                                                                                                                              "float64_array - make",
-                                                                                                                                                                                                                              (function (param) {
-                                                                                                                                                                                                                                  return {
-                                                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                                                          _0: 24,
-                                                                                                                                                                                                                                          _1: new Float64Array([
-                                                                                                                                                                                                                                                1,
-                                                                                                                                                                                                                                                2,
-                                                                                                                                                                                                                                                3
-                                                                                                                                                                                                                                              ]).byteLength
-                                                                                                                                                                                                                                        };
-                                                                                                                                                                                                                                })
-                                                                                                                                                                                                                            ],
-                                                                                                                                                                                                                            tl: {
-                                                                                                                                                                                                                              hd: [
-                                                                                                                                                                                                                                "float64_array - fromBuffer",
-                                                                                                                                                                                                                                (function (param) {
-                                                                                                                                                                                                                                    return {
-                                                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                                                            _0: 32,
-                                                                                                                                                                                                                                            _1: new Float64Array(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                                                          };
-                                                                                                                                                                                                                                  })
-                                                                                                                                                                                                                              ],
-                                                                                                                                                                                                                              tl: {
-                                                                                                                                                                                                                                hd: [
-                                                                                                                                                                                                                                  "float64_array - fromBufferOffset",
-                                                                                                                                                                                                                                  (function (param) {
-                                                                                                                                                                                                                                      var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                                                                      return {
-                                                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                                                              _0: 24,
-                                                                                                                                                                                                                                              _1: new Float64Array(buffer, 8).byteLength
-                                                                                                                                                                                                                                            };
-                                                                                                                                                                                                                                    })
-                                                                                                                                                                                                                                ],
-                                                                                                                                                                                                                                tl: {
-                                                                                                                                                                                                                                  hd: [
-                                                                                                                                                                                                                                    "float64_array - fromBufferRange",
-                                                                                                                                                                                                                                    (function (param) {
-                                                                                                                                                                                                                                        var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                                                                        return {
-                                                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                                                _0: 16,
-                                                                                                                                                                                                                                                _1: new Float64Array(buffer, 8, 2).byteLength
-                                                                                                                                                                                                                                              };
-                                                                                                                                                                                                                                      })
-                                                                                                                                                                                                                                  ],
-                                                                                                                                                                                                                                  tl: {
-                                                                                                                                                                                                                                    hd: [
-                                                                                                                                                                                                                                      "float64_array - fromLength",
-                                                                                                                                                                                                                                      (function (param) {
-                                                                                                                                                                                                                                          return {
-                                                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                                                  _0: 24,
-                                                                                                                                                                                                                                                  _1: new Float64Array(3).byteLength
-                                                                                                                                                                                                                                                };
-                                                                                                                                                                                                                                        })
-                                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                                    tl: {
-                                                                                                                                                                                                                                      hd: [
-                                                                                                                                                                                                                                        "float64_array - unsafe_set - typed_array sanity check",
-                                                                                                                                                                                                                                        (function (param) {
-                                                                                                                                                                                                                                            var a = new Float64Array([
-                                                                                                                                                                                                                                                  1,
-                                                                                                                                                                                                                                                  2,
-                                                                                                                                                                                                                                                  3,
-                                                                                                                                                                                                                                                  4,
-                                                                                                                                                                                                                                                  5
-                                                                                                                                                                                                                                                ]);
-                                                                                                                                                                                                                                            a[3] = 14;
-                                                                                                                                                                                                                                            return {
-                                                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                                                    _0: 14,
-                                                                                                                                                                                                                                                    _1: a[3]
-                                                                                                                                                                                                                                                  };
-                                                                                                                                                                                                                                          })
-                                                                                                                                                                                                                                      ],
-                                                                                                                                                                                                                                      tl: {
-                                                                                                                                                                                                                                        hd: [
-                                                                                                                                                                                                                                          "DataView - make, byteLength",
-                                                                                                                                                                                                                                          (function (param) {
-                                                                                                                                                                                                                                              return {
-                                                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                                                      _0: 32,
-                                                                                                                                                                                                                                                      _1: new DataView(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                                                                    };
-                                                                                                                                                                                                                                            })
-                                                                                                                                                                                                                                        ],
-                                                                                                                                                                                                                                        tl: {
-                                                                                                                                                                                                                                          hd: [
-                                                                                                                                                                                                                                            "DataView - fromBuffer",
-                                                                                                                                                                                                                                            (function (param) {
-                                                                                                                                                                                                                                                return {
-                                                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                                                        _0: 32,
-                                                                                                                                                                                                                                                        _1: new DataView(new ArrayBuffer(32)).byteLength
-                                                                                                                                                                                                                                                      };
-                                                                                                                                                                                                                                              })
-                                                                                                                                                                                                                                          ],
-                                                                                                                                                                                                                                          tl: {
-                                                                                                                                                                                                                                            hd: [
-                                                                                                                                                                                                                                              "DataView - fromBufferOffset",
-                                                                                                                                                                                                                                              (function (param) {
-                                                                                                                                                                                                                                                  var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                                                                                  return {
-                                                                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                                                                          _0: 24,
-                                                                                                                                                                                                                                                          _1: new DataView(buffer, 8).byteLength
-                                                                                                                                                                                                                                                        };
-                                                                                                                                                                                                                                                })
-                                                                                                                                                                                                                                            ],
-                                                                                                                                                                                                                                            tl: {
-                                                                                                                                                                                                                                              hd: [
-                                                                                                                                                                                                                                                "DataView - fromBufferRange",
-                                                                                                                                                                                                                                                (function (param) {
-                                                                                                                                                                                                                                                    var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                                                                                    return {
-                                                                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                                                                            _0: 4,
-                                                                                                                                                                                                                                                            _1: new DataView(buffer, 8, 4).byteLength
-                                                                                                                                                                                                                                                          };
-                                                                                                                                                                                                                                                  })
-                                                                                                                                                                                                                                              ],
-                                                                                                                                                                                                                                              tl: {
-                                                                                                                                                                                                                                                hd: [
-                                                                                                                                                                                                                                                  "DataView - buffer",
-                                                                                                                                                                                                                                                  (function (param) {
-                                                                                                                                                                                                                                                      var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                                                                                      return {
-                                                                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                                                                              _0: buffer,
-                                                                                                                                                                                                                                                              _1: new DataView(buffer).buffer
-                                                                                                                                                                                                                                                            };
-                                                                                                                                                                                                                                                    })
-                                                                                                                                                                                                                                                ],
-                                                                                                                                                                                                                                                tl: {
-                                                                                                                                                                                                                                                  hd: [
-                                                                                                                                                                                                                                                    "DataView - byteOffset",
-                                                                                                                                                                                                                                                    (function (param) {
-                                                                                                                                                                                                                                                        var buffer = new ArrayBuffer(32);
-                                                                                                                                                                                                                                                        return {
-                                                                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                                                                _0: 8,
-                                                                                                                                                                                                                                                                _1: new DataView(buffer, 8).byteOffset
-                                                                                                                                                                                                                                                              };
-                                                                                                                                                                                                                                                      })
-                                                                                                                                                                                                                                                  ],
-                                                                                                                                                                                                                                                  tl: {
-                                                                                                                                                                                                                                                    hd: [
-                                                                                                                                                                                                                                                      "DataView - setInt8, getInt8",
-                                                                                                                                                                                                                                                      (function (param) {
-                                                                                                                                                                                                                                                          var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                          var view = new DataView(buffer);
-                                                                                                                                                                                                                                                          view.setInt8(0, 1);
-                                                                                                                                                                                                                                                          return {
-                                                                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                                                                  _0: 1,
-                                                                                                                                                                                                                                                                  _1: view.getInt8(0)
-                                                                                                                                                                                                                                                                };
-                                                                                                                                                                                                                                                        })
-                                                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                                                    tl: {
-                                                                                                                                                                                                                                                      hd: [
-                                                                                                                                                                                                                                                        "DataView - setUint8, getUint8",
-                                                                                                                                                                                                                                                        (function (param) {
-                                                                                                                                                                                                                                                            var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                            var view = new DataView(buffer);
-                                                                                                                                                                                                                                                            view.setUint8(0, 128);
-                                                                                                                                                                                                                                                            return {
-                                                                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                                                                    _0: 128,
-                                                                                                                                                                                                                                                                    _1: view.getUint8(0)
-                                                                                                                                                                                                                                                                  };
-                                                                                                                                                                                                                                                          })
-                                                                                                                                                                                                                                                      ],
-                                                                                                                                                                                                                                                      tl: {
-                                                                                                                                                                                                                                                        hd: [
-                                                                                                                                                                                                                                                          "DataView - setInt16, getInt16",
-                                                                                                                                                                                                                                                          (function (param) {
-                                                                                                                                                                                                                                                              var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                              var view = new DataView(buffer);
-                                                                                                                                                                                                                                                              view.setInt16(0, 257);
-                                                                                                                                                                                                                                                              return {
-                                                                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                                                                      _0: 257,
-                                                                                                                                                                                                                                                                      _1: view.getInt16(0)
-                                                                                                                                                                                                                                                                    };
-                                                                                                                                                                                                                                                            })
-                                                                                                                                                                                                                                                        ],
-                                                                                                                                                                                                                                                        tl: {
-                                                                                                                                                                                                                                                          hd: [
-                                                                                                                                                                                                                                                            "DataView - getInt16LittleEndian",
-                                                                                                                                                                                                                                                            (function (param) {
-                                                                                                                                                                                                                                                                var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                view.setInt16(0, 25000, 1);
-                                                                                                                                                                                                                                                                return {
-                                                                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                                                                        _0: 25000,
-                                                                                                                                                                                                                                                                        _1: view.getInt16(0, 1)
-                                                                                                                                                                                                                                                                      };
-                                                                                                                                                                                                                                                              })
-                                                                                                                                                                                                                                                          ],
-                                                                                                                                                                                                                                                          tl: {
-                                                                                                                                                                                                                                                            hd: [
-                                                                                                                                                                                                                                                              "DataView - setInt16LittleEndian",
-                                                                                                                                                                                                                                                              (function (param) {
-                                                                                                                                                                                                                                                                  var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                  var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                  view.setInt16(0, 25000, 1);
-                                                                                                                                                                                                                                                                  return {
-                                                                                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                                                                                          _0: -22431,
-                                                                                                                                                                                                                                                                          _1: view.getInt16(0)
-                                                                                                                                                                                                                                                                        };
-                                                                                                                                                                                                                                                                })
-                                                                                                                                                                                                                                                            ],
-                                                                                                                                                                                                                                                            tl: {
-                                                                                                                                                                                                                                                              hd: [
-                                                                                                                                                                                                                                                                "DataView - setUint16, getUint16",
-                                                                                                                                                                                                                                                                (function (param) {
-                                                                                                                                                                                                                                                                    var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                    var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                    view.setUint16(0, 32768);
-                                                                                                                                                                                                                                                                    return {
-                                                                                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                                                                                            _0: 32768,
-                                                                                                                                                                                                                                                                            _1: view.getUint16(0)
-                                                                                                                                                                                                                                                                          };
-                                                                                                                                                                                                                                                                  })
-                                                                                                                                                                                                                                                              ],
-                                                                                                                                                                                                                                                              tl: {
-                                                                                                                                                                                                                                                                hd: [
-                                                                                                                                                                                                                                                                  "DataView - getUint16LittleEndian",
-                                                                                                                                                                                                                                                                  (function (param) {
-                                                                                                                                                                                                                                                                      var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                      var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                      view.setUint16(0, 32768, 1);
-                                                                                                                                                                                                                                                                      return {
-                                                                                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                                                                                              _0: 32768,
-                                                                                                                                                                                                                                                                              _1: view.getUint16(0, 1)
-                                                                                                                                                                                                                                                                            };
-                                                                                                                                                                                                                                                                    })
-                                                                                                                                                                                                                                                                ],
-                                                                                                                                                                                                                                                                tl: {
-                                                                                                                                                                                                                                                                  hd: [
-                                                                                                                                                                                                                                                                    "DataView - setUint16LittleEndian",
-                                                                                                                                                                                                                                                                    (function (param) {
-                                                                                                                                                                                                                                                                        var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                        var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                        view.setUint16(0, 32768, 1);
-                                                                                                                                                                                                                                                                        return {
-                                                                                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                                                                                _0: 128,
-                                                                                                                                                                                                                                                                                _1: view.getUint16(0)
-                                                                                                                                                                                                                                                                              };
-                                                                                                                                                                                                                                                                      })
-                                                                                                                                                                                                                                                                  ],
-                                                                                                                                                                                                                                                                  tl: {
-                                                                                                                                                                                                                                                                    hd: [
-                                                                                                                                                                                                                                                                      "DataView - setInt32, getInt32",
-                                                                                                                                                                                                                                                                      (function (param) {
-                                                                                                                                                                                                                                                                          var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                          var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                          view.setInt32(0, 65537);
-                                                                                                                                                                                                                                                                          return {
-                                                                                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                                                                                  _0: 65537,
-                                                                                                                                                                                                                                                                                  _1: view.getInt32(0)
-                                                                                                                                                                                                                                                                                };
-                                                                                                                                                                                                                                                                        })
-                                                                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                                                                    tl: {
-                                                                                                                                                                                                                                                                      hd: [
-                                                                                                                                                                                                                                                                        "DataView - getInt32LittleEndian",
-                                                                                                                                                                                                                                                                        (function (param) {
-                                                                                                                                                                                                                                                                            var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                            var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                            view.setInt32(0, 65537, 1);
-                                                                                                                                                                                                                                                                            return {
-                                                                                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                                                                                    _0: 65537,
-                                                                                                                                                                                                                                                                                    _1: view.getInt32(0, 1)
-                                                                                                                                                                                                                                                                                  };
-                                                                                                                                                                                                                                                                          })
-                                                                                                                                                                                                                                                                      ],
-                                                                                                                                                                                                                                                                      tl: {
-                                                                                                                                                                                                                                                                        hd: [
-                                                                                                                                                                                                                                                                          "DataView - setInt32LittleEndian",
-                                                                                                                                                                                                                                                                          (function (param) {
-                                                                                                                                                                                                                                                                              var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                              var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                              view.setInt32(0, 65537, 1);
-                                                                                                                                                                                                                                                                              return {
-                                                                                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                                                                                      _0: 16777472,
-                                                                                                                                                                                                                                                                                      _1: view.getInt32(0)
-                                                                                                                                                                                                                                                                                    };
-                                                                                                                                                                                                                                                                            })
-                                                                                                                                                                                                                                                                        ],
-                                                                                                                                                                                                                                                                        tl: {
-                                                                                                                                                                                                                                                                          hd: [
-                                                                                                                                                                                                                                                                            "DataView - setUint32, getUint32",
-                                                                                                                                                                                                                                                                            (function (param) {
-                                                                                                                                                                                                                                                                                var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                                var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                                view.setUint32(0, 65537);
-                                                                                                                                                                                                                                                                                return {
-                                                                                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                                                                                        _0: 65537,
-                                                                                                                                                                                                                                                                                        _1: view.getUint32(0)
-                                                                                                                                                                                                                                                                                      };
-                                                                                                                                                                                                                                                                              })
-                                                                                                                                                                                                                                                                          ],
-                                                                                                                                                                                                                                                                          tl: {
-                                                                                                                                                                                                                                                                            hd: [
-                                                                                                                                                                                                                                                                              "DataView - getUint32LittleEndian",
-                                                                                                                                                                                                                                                                              (function (param) {
-                                                                                                                                                                                                                                                                                  var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                                  var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                                  view.setUint32(0, 65537, 1);
-                                                                                                                                                                                                                                                                                  return {
-                                                                                                                                                                                                                                                                                          TAG: "Eq",
-                                                                                                                                                                                                                                                                                          _0: 65537,
-                                                                                                                                                                                                                                                                                          _1: view.getUint32(0, 1)
-                                                                                                                                                                                                                                                                                        };
-                                                                                                                                                                                                                                                                                })
-                                                                                                                                                                                                                                                                            ],
-                                                                                                                                                                                                                                                                            tl: {
-                                                                                                                                                                                                                                                                              hd: [
-                                                                                                                                                                                                                                                                                "DataView - setUint32LittleEndian",
-                                                                                                                                                                                                                                                                                (function (param) {
-                                                                                                                                                                                                                                                                                    var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                                    var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                                    view.setUint32(0, 65537, 1);
-                                                                                                                                                                                                                                                                                    return {
-                                                                                                                                                                                                                                                                                            TAG: "Eq",
-                                                                                                                                                                                                                                                                                            _0: 16777472,
-                                                                                                                                                                                                                                                                                            _1: view.getUint32(0)
-                                                                                                                                                                                                                                                                                          };
-                                                                                                                                                                                                                                                                                  })
-                                                                                                                                                                                                                                                                              ],
-                                                                                                                                                                                                                                                                              tl: {
-                                                                                                                                                                                                                                                                                hd: [
-                                                                                                                                                                                                                                                                                  "DataView - setFloat32, getFloat32",
-                                                                                                                                                                                                                                                                                  (function (param) {
-                                                                                                                                                                                                                                                                                      var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                                      var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                                      view.setFloat32(0, 65537.0);
-                                                                                                                                                                                                                                                                                      return {
-                                                                                                                                                                                                                                                                                              TAG: "Eq",
-                                                                                                                                                                                                                                                                                              _0: 65537.0,
-                                                                                                                                                                                                                                                                                              _1: view.getFloat32(0)
-                                                                                                                                                                                                                                                                                            };
-                                                                                                                                                                                                                                                                                    })
-                                                                                                                                                                                                                                                                                ],
-                                                                                                                                                                                                                                                                                tl: {
-                                                                                                                                                                                                                                                                                  hd: [
-                                                                                                                                                                                                                                                                                    "DataView - getFloat32LittleEndian",
-                                                                                                                                                                                                                                                                                    (function (param) {
-                                                                                                                                                                                                                                                                                        var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                                        var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                                        view.setFloat32(0, 65537.0, 1);
-                                                                                                                                                                                                                                                                                        return {
-                                                                                                                                                                                                                                                                                                TAG: "Eq",
-                                                                                                                                                                                                                                                                                                _0: 65537.0,
-                                                                                                                                                                                                                                                                                                _1: view.getFloat32(0, 1)
-                                                                                                                                                                                                                                                                                              };
-                                                                                                                                                                                                                                                                                      })
-                                                                                                                                                                                                                                                                                  ],
-                                                                                                                                                                                                                                                                                  tl: {
-                                                                                                                                                                                                                                                                                    hd: [
-                                                                                                                                                                                                                                                                                      "DataView - setFloat32LittleEndian",
-                                                                                                                                                                                                                                                                                      (function (param) {
-                                                                                                                                                                                                                                                                                          var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                                          var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                                          view.setFloat32(0, 1.0, 1);
-                                                                                                                                                                                                                                                                                          return {
-                                                                                                                                                                                                                                                                                                  TAG: "Eq",
-                                                                                                                                                                                                                                                                                                  _0: 4.600602988224807e-41,
-                                                                                                                                                                                                                                                                                                  _1: view.getFloat32(0)
-                                                                                                                                                                                                                                                                                                };
-                                                                                                                                                                                                                                                                                        })
-                                                                                                                                                                                                                                                                                    ],
-                                                                                                                                                                                                                                                                                    tl: {
-                                                                                                                                                                                                                                                                                      hd: [
-                                                                                                                                                                                                                                                                                        "DataView - setFloat64, getFloat64",
-                                                                                                                                                                                                                                                                                        (function (param) {
-                                                                                                                                                                                                                                                                                            var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                                            var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                                            view.setFloat64(0, 1e200);
-                                                                                                                                                                                                                                                                                            return {
-                                                                                                                                                                                                                                                                                                    TAG: "Eq",
-                                                                                                                                                                                                                                                                                                    _0: 1e200,
-                                                                                                                                                                                                                                                                                                    _1: view.getFloat64(0)
-                                                                                                                                                                                                                                                                                                  };
-                                                                                                                                                                                                                                                                                          })
-                                                                                                                                                                                                                                                                                      ],
-                                                                                                                                                                                                                                                                                      tl: {
-                                                                                                                                                                                                                                                                                        hd: [
-                                                                                                                                                                                                                                                                                          "DataView - getFloat64LittleEndian",
-                                                                                                                                                                                                                                                                                          (function (param) {
-                                                                                                                                                                                                                                                                                              var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                                              var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                                              view.setFloat64(0, 1e200, 1);
-                                                                                                                                                                                                                                                                                              return {
-                                                                                                                                                                                                                                                                                                      TAG: "Eq",
-                                                                                                                                                                                                                                                                                                      _0: 1e200,
-                                                                                                                                                                                                                                                                                                      _1: view.getFloat64(0, 1)
-                                                                                                                                                                                                                                                                                                    };
-                                                                                                                                                                                                                                                                                            })
-                                                                                                                                                                                                                                                                                        ],
-                                                                                                                                                                                                                                                                                        tl: {
-                                                                                                                                                                                                                                                                                          hd: [
-                                                                                                                                                                                                                                                                                            "DataView - setFloat64LittleEndian",
-                                                                                                                                                                                                                                                                                            (function (param) {
-                                                                                                                                                                                                                                                                                                var buffer = new ArrayBuffer(8);
-                                                                                                                                                                                                                                                                                                var view = new DataView(buffer);
-                                                                                                                                                                                                                                                                                                view.setFloat64(0, 1.0, 1);
-                                                                                                                                                                                                                                                                                                return {
-                                                                                                                                                                                                                                                                                                        TAG: "Eq",
-                                                                                                                                                                                                                                                                                                        _0: 3.03865e-319,
-                                                                                                                                                                                                                                                                                                        _1: view.getFloat64(0)
-                                                                                                                                                                                                                                                                                                      };
-                                                                                                                                                                                                                                                                                              })
-                                                                                                                                                                                                                                                                                          ],
-                                                                                                                                                                                                                                                                                          tl: /* [] */0
-                                                                                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                                }
-                                                                                                                                                                                                                              }
-                                                                                                                                                                                                                            }
-                                                                                                                                                                                                                          }
-                                                                                                                                                                                                                        }
-                                                                                                                                                                                                                      }
-                                                                                                                                                                                                                    }
-                                                                                                                                                                                                                  }
-                                                                                                                                                                                                                }
-                                                                                                                                                                                                              }
-                                                                                                                                                                                                            }
-                                                                                                                                                                                                          }
-                                                                                                                                                                                                        }
-                                                                                                                                                                                                      }
-                                                                                                                                                                                                    }
-                                                                                                                                                                                                  }
-                                                                                                                                                                                                }
-                                                                                                                                                                                              }
-                                                                                                                                                                                            }
-                                                                                                                                                                                          }
-                                                                                                                                                                                        }
-                                                                                                                                                                                      }
-                                                                                                                                                                                    }
-                                                                                                                                                                                  }
-                                                                                                                                                                                }
-                                                                                                                                                                              }
-                                                                                                                                                                            }
-                                                                                                                                                                          }
-                                                                                                                                                                        }
-                                                                                                                                                                      }
-                                                                                                                                                                    }
-                                                                                                                                                                  }
-                                                                                                                                                                }
-                                                                                                                                                              }
-                                                                                                                                                            }
-                                                                                                                                                          }
-                                                                                                                                                        }
-                                                                                                                                                      }
-                                                                                                                                                    }
-                                                                                                                                                  }
-                                                                                                                                                }
-                                                                                                                                              }
-                                                                                                                                            }
-                                                                                                                                          }
-                                                                                                                                        }
-                                                                                                                                      }
-                                                                                                                                    }
-                                                                                                                                  }
-                                                                                                                                }
-                                                                                                                              }
-                                                                                                                            }
-                                                                                                                          }
-                                                                                                                        }
-                                                                                                                      }
-                                                                                                                    }
-                                                                                                                  }
-                                                                                                                }
-                                                                                                              }
-                                                                                                            }
-                                                                                                          }
-                                                                                                        }
-                                                                                                      }
-                                                                                                    }
-                                                                                                  }
-                                                                                                }
-                                                                                              }
-                                                                                            }
-                                                                                          }
-                                                                                        }
-                                                                                      }
-                                                                                    }
-                                                                                  }
-                                                                                }
-                                                                              }
-                                                                            }
-                                                                          }
-                                                                        }
-                                                                      }
-                                                                    }
-                                                                  }
-                                                                }
-                                                              }
-                                                            }
-                                                          }
-                                                        }
-                                                      }
-                                                    }
-                                                  }
-                                                }
-                                              }
-                                            }
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_typed_array_test", suites);
-
-exports.mkI8 = mkI8;
-exports.via = via;
-exports.viaInt8 = viaInt8;
-exports.x = x;
-exports.suites = suites;
-/* x Not a pure module */
diff --git a/jscomp/test/js_typed_array_test.res b/jscomp/test/js_typed_array_test.res
deleted file mode 100644
index d86763e..0000000
--- a/jscomp/test/js_typed_array_test.res
+++ /dev/null
@@ -1,889 +0,0 @@
-open Js_typed_array
-
-@val external arrayFrom: 'a => array<'b> = "Array.from"
-
-let mkI8 = a => Int8Array.make(a)
-let via = (make, f, arr) => arrayFrom(f(make(arr)))
-let viaInt8 = (f, arr) => via(Int8Array.make)
-
-/* make sure we expose a type that's easy to refer to */
-let x: Int8Array.t = mkI8([1, 2, 3])
-
-let suites = {
-  open Mt
-  list{
-    /* ArrayBuffer
-     */
-
-    ("array_buffer - make", _ => Eq(5, ArrayBuffer.make(5) |> ArrayBuffer.byteLength)),
-    /* experimental
-    "array_buffer - transfer", (fun _ ->
-      Eq(5, ArrayBuffer.make 5 |> ArrayBuffer.transfer |> ArrayBuffer.byteLength));
-    "array_buffer - transferWithLength", (fun _ ->
-      let a = ArrayBuffer.make 5 in
-      Eq(10,  ArrayBuffer.transferWithLength a 10 |> ArrayBuffer.byteLength));
- */
-
-    ("array_buffer - byteLength", _ => Eq(5, ArrayBuffer.make(5) |> ArrayBuffer.byteLength)),
-    (
-      "array_buffer - slice",
-      _ => Eq(
-        2,
-        ArrayBuffer.make(5) |> ArrayBuffer.slice(~start=2, ~end_=4) |> ArrayBuffer.byteLength,
-      ),
-    ),
-    (
-      "array_buffer - sliceFrom",
-      _ => Eq(3, ArrayBuffer.make(5) |> ArrayBuffer.sliceFrom(2) |> ArrayBuffer.byteLength),
-    ),
-    /* Generic typed array
-     */
-
-    ("typed_array - unsafe_get", _ => Eq(4, Int8Array.unsafe_get(mkI8([1, 2, 3, 4, 5]), 3))),
-    (
-      "typed_array - unsafe_set",
-      _ => {
-        let a = mkI8([1, 2, 3, 4, 5])
-        let _ = Int8Array.unsafe_set(a, 3, 14)
-
-        Eq(14, Int8Array.unsafe_get(a, 3))
-      },
-    ),
-    (
-      "typed_array - buffer",
-      _ => Eq(
-        mkI8([3, 4, 5]),
-        mkI8([1, 2, 3, 4, 5])
-        |> Int8Array.buffer
-        |> (
-          x =>
-            switch x {
-            | a => Int8Array.fromBufferOffset(a, 2)
-            }
-        ),
-      ),
-    ),
-    (
-      "typed_array - byteLength",
-      _ => Eq(10, Int16Array.make([1, 2, 3, 4, 5]) |> Int16Array.byteLength),
-    ),
-    ("typed_array - byteOffset", _ => Eq(0, mkI8([1, 2, 3, 4, 5]) |> Int8Array.byteOffset)),
-    (
-      "typed_array - setArray",
-      _ => {
-        let f = a => {
-          Int8Array.setArray([9, 8, 7], a)
-          a
-        }
-
-        Eq(mkI8([9, 8, 7, 4, 5]), mkI8([1, 2, 3, 4, 5]) |> f)
-      },
-    ),
-    (
-      "typed_array - setArrayOffset",
-      _ => {
-        let f = a => {
-          Int8Array.setArrayOffset([9, 8, 7], 2, a)
-          a
-        }
-
-        Eq(mkI8([1, 2, 9, 8, 7]), mkI8([1, 2, 3, 4, 5]) |> f)
-      },
-    ),
-    /* These shouldn't compile
-    "type_safe_sanity_check 1", (fun _ ->
-      let a = Float32Array.make [| 1.; 2.; 3.; 4.; 5. |] in
-      let _ = Int8Array.set a 3 14 in
-
-      Eq(14, Int8Array.get a 3)
-    );
-    "type_safe_sanity_check 2", (fun _ ->
-      let a = Int16Array.make [| 1; 2; 3; 4; 5 |] in
-      let _ = Int8Array.set a 3 14 in
-
-      Eq(14, Int8Array.get a 3)
-    );
- */
-
-    /* Array itnerface(-ish) */
-
-    ("typed_array - length", _ => Eq(5, mkI8([1, 2, 3, 4, 5]) |> Int8Array.length)),
-    (
-      "typed_array - copyWithin",
-      _ => Eq(mkI8([1, 2, 3, 1, 2]), mkI8([1, 2, 3, 4, 5]) |> Int8Array.copyWithin(~to_=-2)),
-    ),
-    (
-      "typed_array - copyWithinFrom",
-      _ => Eq(
-        mkI8([4, 5, 3, 4, 5]),
-        mkI8([1, 2, 3, 4, 5]) |> Int8Array.copyWithinFrom(~to_=0, ~from=3),
-      ),
-    ),
-    (
-      "typed_array - copyWithinFromRange",
-      _ => Eq(
-        mkI8([4, 2, 3, 4, 5]),
-        mkI8([1, 2, 3, 4, 5]) |> Int8Array.copyWithinFromRange(~to_=0, ~start=3, ~end_=4),
-      ),
-    ),
-    (
-      "typed_array - fillInPlace",
-      _ => Eq(mkI8([4, 4, 4]), mkI8([1, 2, 3]) |> Int8Array.fillInPlace(4)),
-    ),
-    (
-      "typed_array - fillFromInPlace",
-      _ => Eq(mkI8([1, 4, 4]), mkI8([1, 2, 3]) |> Int8Array.fillFromInPlace(4, ~from=1)),
-    ),
-    (
-      "typed_array - fillRangeInPlace",
-      _ => Eq(mkI8([1, 4, 3]), mkI8([1, 2, 3]) |> Int8Array.fillRangeInPlace(4, ~start=1, ~end_=2)),
-    ),
-    (
-      "typed_array - reverseInPlace",
-      _ => Eq(mkI8([3, 2, 1]), mkI8([1, 2, 3]) |> Int8Array.reverseInPlace),
-    ),
-    (
-      "typed_array - sortInPlace",
-      _ => Eq(mkI8([1, 2, 3]), mkI8([3, 1, 2]) |> Int8Array.sortInPlace),
-    ),
-    (
-      "typed_array - sortInPlaceWith",
-      _ => Eq(mkI8([3, 2, 1]), mkI8([3, 1, 2]) |> Int8Array.sortInPlaceWith((. a, b) => b - a)),
-    ),
-    /* es2016 */
-    ("typed_array - includes", _ => Eq(true, mkI8([1, 2, 3]) |> Int8Array.includes(3))),
-    ("typed_array - indexOf", _ => Eq(1, mkI8([1, 2, 3]) |> Int8Array.indexOf(2))),
-    (
-      "typed_array - indexOfFrom",
-      _ => Eq(3, mkI8([1, 2, 3, 2]) |> Int8Array.indexOfFrom(2, ~from=2)),
-    ),
-    ("typed_array - join", _ => Eq("1,2,3", mkI8([1, 2, 3]) |> Int8Array.join)),
-    ("typed_array - joinWith", _ => Eq("1;2;3", mkI8([1, 2, 3]) |> Int8Array.joinWith(";"))),
-    ("typed_array - lastIndexOf", _ => Eq(1, mkI8([1, 2, 3]) |> Int8Array.lastIndexOf(2))),
-    (
-      "typed_array - lastIndexOfFrom",
-      _ => Eq(1, mkI8([1, 2, 3, 2]) |> Int8Array.lastIndexOfFrom(2, ~from=2)),
-    ),
-    (
-      "typed_array - slice",
-      _ => Eq(mkI8([2, 3]), mkI8([1, 2, 3, 4, 5]) |> Int8Array.slice(~start=1, ~end_=3)),
-    ),
-    ("typed_array - copy", _ => Eq(mkI8([1, 2, 3, 4, 5]), mkI8([1, 2, 3, 4, 5]) |> Int8Array.copy)),
-    (
-      "typed_array - sliceFrom",
-      _ => Eq(mkI8([3, 4, 5]), mkI8([1, 2, 3, 4, 5]) |> Int8Array.sliceFrom(2)),
-    ),
-    (
-      "typed_array - subarray",
-      _ => Eq(mkI8([2, 3]), mkI8([1, 2, 3, 4, 5]) |> Int8Array.subarray(~start=1, ~end_=3)),
-    ),
-    (
-      "typed_array - subarrayFrom",
-      _ => Eq(mkI8([3, 4, 5]), mkI8([1, 2, 3, 4, 5]) |> Int8Array.subarrayFrom(2)),
-    ),
-    ("typed_array - toString", _ => Eq("1,2,3", mkI8([1, 2, 3]) |> Int8Array.toString)),
-    ("typed_array - toLocaleString", _ => Eq("1,2,3", mkI8([1, 2, 3]) |> Int8Array.toLocaleString)),
-    /* es2015, iterator
-    "typed_array - entries", (fun _ ->
-      Eq(mkI8 [| (0, "a"); (1, "b"); (2, "c") |],
-         mkI8 [| "a"; "b"; "c" |] |> Int8Array.entries |> Int8Array.from)
-    );
- */
-
-    ("typed_array - every", _ => Eq(true, mkI8([1, 2, 3]) |> Int8Array.every((. n) => n > 0))),
-    (
-      "typed_array - everyi",
-      _ => Eq(false, mkI8([1, 2, 3]) |> Int8Array.everyi((. _, i) => i > 0)),
-    ),
-    (
-      "typed_array - filter",
-      _ => Eq(mkI8([2, 4]), mkI8([1, 2, 3, 4]) |> Int8Array.filter((. n) => mod(n, 2) == 0)),
-    ),
-    (
-      "typed_array - filteri",
-      _ => Eq(mkI8([1, 3]), mkI8([1, 2, 3, 4]) |> Int8Array.filteri((. _, i) => mod(i, 2) == 0)),
-    ),
-    (
-      "typed_array - find",
-      _ => Eq(
-        Js.Undefined.return(2),
-        mkI8([1, 2, 3, 4]) |> Int8Array.find((. n) => mod(n, 2) == 0),
-      ),
-    ),
-    (
-      "typed_array - findi",
-      _ => Eq(
-        Js.Undefined.return(1),
-        mkI8([1, 2, 3, 4]) |> Int8Array.findi((. _, i) => mod(i, 2) == 0),
-      ),
-    ),
-    (
-      "typed_array - findIndex",
-      _ => Eq(1, mkI8([1, 2, 3, 4]) |> Int8Array.findIndex((. n) => mod(n, 2) == 0)),
-    ),
-    (
-      "typed_array - findIndexi",
-      _ => Eq(0, mkI8([1, 2, 3, 4]) |> Int8Array.findIndexi((. _, i) => mod(i, 2) == 0)),
-    ),
-    (
-      "typed_array - forEach",
-      _ => {
-        let sum = ref(0)
-        let _ = mkI8([1, 2, 3]) |> Int8Array.forEach((. n) => sum := sum.contents + n)
-
-        Eq(6, sum.contents)
-      },
-    ),
-    (
-      "typed_array - forEachi",
-      _ => {
-        let sum = ref(0)
-        let _ = mkI8([1, 2, 3]) |> Int8Array.forEachi((. _, i) => sum := sum.contents + i)
-
-        Eq(3, sum.contents)
-      },
-    ),
-    /* es2015, iterator
-    "typed_array - keys", (fun _ ->
-      Eq(mkI8 [| 0; 1; 2 |],
-         mkI8 [| "a"; "b"; "c" |] |> Int8Array.keys |> Int8Array.from)
-    );
- */
-
-    (
-      "typed_array - map",
-      _ => Eq(mkI8([2, 4, 6, 8]), mkI8([1, 2, 3, 4]) |> Int8Array.map((. n) => n * 2)),
-    ),
-    (
-      "typed_array - map",
-      _ => Eq(mkI8([0, 2, 4, 6]), mkI8([1, 2, 3, 4]) |> Int8Array.mapi((. _, i) => i * 2)),
-    ),
-    (
-      "typed_array - reduce",
-      _ => Eq(-10, mkI8([1, 2, 3, 4]) |> Int8Array.reduce((. acc, n) => acc - n, 0)),
-    ),
-    (
-      "typed_array - reducei",
-      _ => Eq(-6, mkI8([1, 2, 3, 4]) |> Int8Array.reducei((. acc, _, i) => acc - i, 0)),
-    ),
-    (
-      "typed_array - reduceRight",
-      _ => Eq(-10, mkI8([1, 2, 3, 4]) |> Int8Array.reduceRight((. acc, n) => acc - n, 0)),
-    ),
-    (
-      "typed_array - reduceRighti",
-      _ => Eq(-6, mkI8([1, 2, 3, 4]) |> Int8Array.reduceRighti((. acc, _, i) => acc - i, 0)),
-    ),
-    ("typed_array - some", _ => Eq(false, mkI8([1, 2, 3, 4]) |> Int8Array.some((. n) => n <= 0))),
-    (
-      "typed_array - somei",
-      _ => Eq(true, mkI8([1, 2, 3, 4]) |> Int8Array.somei((. _, i) => i <= 0)),
-    ),
-    /* es2015, iterator
-    "typed_array - values", (fun _ ->
-      Eq(mkI8 [| "a"; "b"; "c" |],
-         mkI8 [| "a"; "b"; "c" |] |> Int8Array.values |> Int8Array.from)
-    );
- */
-
-    /* Int8Array
-     */
-
-    ("int8_array - _BYTES_PER_ELEMENT", _ => Eq(1, Int8Array._BYTES_PER_ELEMENT)),
-    /* byte length is a decent indicator of the kind of typed array */
-    ("int8_array - make", _ => Eq(3, Int8Array.make([1, 2, 3]) |> Int8Array.byteLength)),
-    (
-      "int8_array - fromBuffer",
-      _ => Eq(32, ArrayBuffer.make(32) |> Int8Array.fromBuffer |> Int8Array.byteLength),
-    ),
-    (
-      "int8_array - fromBufferOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(24, Int8Array.fromBufferOffset(buffer, 8) |> Int8Array.byteLength)
-      },
-    ),
-    (
-      "int8_array - fromBufferRange",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(2, Int8Array.fromBufferRange(buffer, ~offset=8, ~length=2) |> Int8Array.byteLength)
-      },
-    ),
-    ("int8_array - fromLength", _ => Eq(3, Int8Array.fromLength(3) |> Int8Array.byteLength)),
-    /* unable to test because nothing currently implements array_like
-    "int8_array - from", (fun _ ->
-      Eq(3, [| "a"; "b"; "c" |] |> Js.Array.keys |> Int8Array.from |> Int8Array.byteLength));
- */
-    (
-      "int8_array - unsafe_set - typed_array sanity check",
-      _ => {
-        let a = Int8Array.make([1, 2, 3, 4, 5])
-        let _ = Int8Array.unsafe_set(a, 3, 14)
-
-        Eq(14, Int8Array.unsafe_get(a, 3))
-      },
-    ),
-    /* Uint8Array
-     */
-
-    ("uint8_array - _BYTES_PER_ELEMENT", _ => Eq(1, Uint8Array._BYTES_PER_ELEMENT)),
-    /* byte length is a decent indicator of the kind of typed array */
-    ("uint8_array - make", _ => Eq(3, Uint8Array.make([1, 2, 3]) |> Uint8Array.byteLength)),
-    (
-      "uint8_array - fromBuffer",
-      _ => Eq(32, ArrayBuffer.make(32) |> Uint8Array.fromBuffer |> Uint8Array.byteLength),
-    ),
-    (
-      "uint8_array - fromBufferOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(24, Uint8Array.fromBufferOffset(buffer, 8) |> Uint8Array.byteLength)
-      },
-    ),
-    (
-      "uint8_array - fromBufferRange",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(2, Uint8Array.fromBufferRange(buffer, ~offset=8, ~length=2) |> Uint8Array.byteLength)
-      },
-    ),
-    ("uint8_array - fromLength", _ => Eq(3, Uint8Array.fromLength(3) |> Uint8Array.byteLength)),
-    /* unable to test because nothing currently implements array_like
-    "uint8_array - from", (fun _ ->
-      Eq(3, [| "a"; "b"; "c" |] |> Js.Array.keys |> Uint8Array.from |> Uint8Array.byteLength));
- */
-    (
-      "uint8_array - unsafe_set - typed_array sanity check",
-      _ => {
-        let a = Uint8Array.make([1, 2, 3, 4, 5])
-        let _ = Uint8Array.unsafe_set(a, 3, 14)
-
-        Eq(14, Uint8Array.unsafe_get(a, 3))
-      },
-    ),
-    /* Uint8ClampedArray
-     */
-
-    ("uint8clamped_array - _BYTES_PER_ELEMENT", _ => Eq(1, Uint8ClampedArray._BYTES_PER_ELEMENT)),
-    /* byte length is a decent indicator of the kind of typed array */
-    (
-      "uint8clamped_array - make",
-      _ => Eq(3, Uint8ClampedArray.make([1, 2, 3]) |> Uint8ClampedArray.byteLength),
-    ),
-    (
-      "uint8clamped_array - fromBuffer",
-      _ => Eq(
-        32,
-        ArrayBuffer.make(32) |> Uint8ClampedArray.fromBuffer |> Uint8ClampedArray.byteLength,
-      ),
-    ),
-    (
-      "uint8clamped_array - fromBufferOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(24, Uint8ClampedArray.fromBufferOffset(buffer, 8) |> Uint8ClampedArray.byteLength)
-      },
-    ),
-    (
-      "uint8clamped_array - fromBufferRange",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(
-          2,
-          Uint8ClampedArray.fromBufferRange(
-            buffer,
-            ~offset=8,
-            ~length=2,
-          ) |> Uint8ClampedArray.byteLength,
-        )
-      },
-    ),
-    (
-      "uint8clamped_array - fromLength",
-      _ => Eq(3, Uint8ClampedArray.fromLength(3) |> Uint8ClampedArray.byteLength),
-    ),
-    /* unable to test because nothing currently implements array_like
-    "uint8clamped_array - from", (fun _ ->
-      Eq(3, [| "a"; "b"; "c" |] |> Js.Array.keys |> Uint8ClampedArray.from |> Uint8ClampedArray.byteLength));
- */
-    (
-      "uint8clamped_array - unsafe_set - typed_array sanity check",
-      _ => {
-        let a = Uint8ClampedArray.make([1, 2, 3, 4, 5])
-        let _ = Uint8ClampedArray.unsafe_set(a, 3, 14)
-
-        Eq(14, Uint8ClampedArray.unsafe_get(a, 3))
-      },
-    ),
-    /* Int16Array
-     */
-
-    ("int16_array - _BYTES_PER_ELEMENT", _ => Eq(2, Int16Array._BYTES_PER_ELEMENT)),
-    /* byte length is a decent indicator of the kind of typed array */
-    ("int16_array - make", _ => Eq(6, Int16Array.make([1, 2, 3]) |> Int16Array.byteLength)),
-    (
-      "int16_array - fromBuffer",
-      _ => Eq(32, ArrayBuffer.make(32) |> Int16Array.fromBuffer |> Int16Array.byteLength),
-    ),
-    (
-      "int16_array - fromBufferOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(24, Int16Array.fromBufferOffset(buffer, 8) |> Int16Array.byteLength)
-      },
-    ),
-    (
-      "int16_array - fromBufferRange",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(4, Int16Array.fromBufferRange(buffer, ~offset=8, ~length=2) |> Int16Array.byteLength)
-      },
-    ),
-    ("int16_array - fromLength", _ => Eq(6, Int16Array.fromLength(3) |> Int16Array.byteLength)),
-    /* unable to test because nothing currently implements array_like
-    "int16_array - from", (fun _ ->
-      Eq(3, [| "a"; "b"; "c" |] |> Js.Array.keys |> Int16Array.from |> Int16Array.byteLength));
- */
-    (
-      "int16_array - unsafe_set - typed_array sanity check",
-      _ => {
-        let a = Int16Array.make([1, 2, 3, 4, 5])
-        let _ = Int16Array.unsafe_set(a, 3, 14)
-
-        Eq(14, Int16Array.unsafe_get(a, 3))
-      },
-    ),
-    /* Uint16Array
-     */
-
-    ("uint16_array - _BYTES_PER_ELEMENT", _ => Eq(2, Uint16Array._BYTES_PER_ELEMENT)),
-    /* byte length is a decent indicator of the kind of typed array */
-    ("uint16_array - make", _ => Eq(6, Uint16Array.make([1, 2, 3]) |> Uint16Array.byteLength)),
-    (
-      "uint16_array - fromBuffer",
-      _ => Eq(32, ArrayBuffer.make(32) |> Uint16Array.fromBuffer |> Uint16Array.byteLength),
-    ),
-    (
-      "uint16_array - fromBufferOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(24, Uint16Array.fromBufferOffset(buffer, 8) |> Uint16Array.byteLength)
-      },
-    ),
-    (
-      "uint16_array - fromBufferRange",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(4, Uint16Array.fromBufferRange(buffer, ~offset=8, ~length=2) |> Uint16Array.byteLength)
-      },
-    ),
-    ("uint16_array - fromLength", _ => Eq(6, Uint16Array.fromLength(3) |> Uint16Array.byteLength)),
-    /* unable to test because nothing currently implements array_like
-    "uint16_array - from", (fun _ ->
-      Eq(3, [| "a"; "b"; "c" |] |> Js.Array.keys |> Uint16Array.from |> Uint16Array.byteLength));
- */
-    (
-      "uint16_array - unsafe_set - typed_array sanity check",
-      _ => {
-        let a = Uint16Array.make([1, 2, 3, 4, 5])
-        let _ = Uint16Array.unsafe_set(a, 3, 14)
-
-        Eq(14, Uint16Array.unsafe_get(a, 3))
-      },
-    ),
-    /* Int32Array
-     */
-
-    ("int32_array - _BYTES_PER_ELEMENT", _ => Eq(4, Int32Array._BYTES_PER_ELEMENT)),
-    /* byte length is a decent indicator of the kind of typed array */
-    (
-      "int32_array - make",
-      _ => Eq(12, Int32Array.make([1, 2, 3] |> Array.map(Int32.of_int)) |> Int32Array.byteLength),
-    ),
-    (
-      "int32_array - fromBuffer",
-      _ => Eq(32, ArrayBuffer.make(32) |> Int32Array.fromBuffer |> Int32Array.byteLength),
-    ),
-    (
-      "int32_array - fromBufferOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(24, Int32Array.fromBufferOffset(buffer, 8) |> Int32Array.byteLength)
-      },
-    ),
-    (
-      "int32_array - fromBufferRange",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(8, Int32Array.fromBufferRange(buffer, ~offset=8, ~length=2) |> Int32Array.byteLength)
-      },
-    ),
-    ("int32_array - fromLength", _ => Eq(12, Int32Array.fromLength(3) |> Int32Array.byteLength)),
-    /* unable to test because nothing currently implements array_like
-    "int32_array - from", (fun _ ->
-      Eq(3, [| "a"; "b"; "c" |] |> Js.Array.keys |> Int32Array.from |> Int32Array.byteLength));
- */
-    (
-      "int32_array - unsafe_set - typed_array sanity check",
-      _ => {
-        let a = Int32Array.make([1, 2, 3, 4, 5] |> Array.map(Int32.of_int))
-        let _ = Int32Array.unsafe_set(a, 3, Int32.of_int(14))
-
-        Eq(Int32.of_int(14), Int32Array.unsafe_get(a, 3))
-      },
-    ),
-    /* Uint32Array
-     */
-
-    ("uint32_array - _BYTES_PER_ELEMENT", _ => Eq(4, Uint32Array._BYTES_PER_ELEMENT)),
-    /* byte length is a decent indicator of the kind of typed array */
-    ("uint32_array - make", _ => Eq(12, Uint32Array.make([1, 2, 3]) |> Uint32Array.byteLength)),
-    (
-      "uint32_array - fromBuffer",
-      _ => Eq(32, ArrayBuffer.make(32) |> Uint32Array.fromBuffer |> Uint32Array.byteLength),
-    ),
-    (
-      "uint32_array - fromBufferOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(24, Uint32Array.fromBufferOffset(buffer, 8) |> Uint32Array.byteLength)
-      },
-    ),
-    (
-      "uint32_array - fromBufferRange",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(8, Uint32Array.fromBufferRange(buffer, ~offset=8, ~length=2) |> Uint32Array.byteLength)
-      },
-    ),
-    ("uint32_array - fromLength", _ => Eq(12, Uint32Array.fromLength(3) |> Uint32Array.byteLength)),
-    /* unable to test because nothing currently implements array_like
-    "uint32_array - from", (fun _ ->
-      Eq(3, [| "a"; "b"; "c" |] |> Js.Array.keys |> Uint32Array.from |> Uint32Array.byteLength));
- */
-    (
-      "uint32_array - unsafe_set - typed_array sanity check",
-      _ => {
-        let a = Uint32Array.make([1, 2, 3, 4, 5])
-        let _ = Uint32Array.unsafe_set(a, 3, 14)
-
-        Eq(14, Uint32Array.unsafe_get(a, 3))
-      },
-    ),
-    /* Float32Array
-     */
-
-    ("float32_array - _BYTES_PER_ELEMENT", _ => Eq(4, Float32Array._BYTES_PER_ELEMENT)),
-    /* byte length is a decent indicator of the kind of typed array */
-    (
-      "float32_array - make",
-      _ => Eq(12, Float32Array.make([1., 2., 3.]) |> Float32Array.byteLength),
-    ),
-    (
-      "float32_array - fromBuffer",
-      _ => Eq(32, ArrayBuffer.make(32) |> Float32Array.fromBuffer |> Float32Array.byteLength),
-    ),
-    (
-      "float32_array - fromBufferOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(24, Float32Array.fromBufferOffset(buffer, 8) |> Float32Array.byteLength)
-      },
-    ),
-    (
-      "float32_array - fromBufferRange",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(8, Float32Array.fromBufferRange(buffer, ~offset=8, ~length=2) |> Float32Array.byteLength)
-      },
-    ),
-    (
-      "float32_array - fromLength",
-      _ => Eq(12, Float32Array.fromLength(3) |> Float32Array.byteLength),
-    ),
-    /* unable to test because nothing currently implements array_like
-    "float32_array - from", (fun _ ->
-      Eq(3, [| "a"; "b"; "c" |] |> Js.Array.keys |> Float32Array.from |> Float32Array.byteLength));
- */
-    (
-      "float32_array - unsafe_set - typed_array sanity check",
-      _ => {
-        let a = Float32Array.make([1., 2., 3., 4., 5.])
-        let _ = Float32Array.unsafe_set(a, 3, 14.)
-
-        Eq(14., Float32Array.unsafe_get(a, 3))
-      },
-    ),
-    /* Float64Array
-     */
-
-    ("float64_array - _BYTES_PER_ELEMENT", _ => Eq(8, Float64Array._BYTES_PER_ELEMENT)),
-    /* byte length is a decent indicator of the kind of typed array */
-    (
-      "float64_array - make",
-      _ => Eq(24, Float64Array.make([1., 2., 3.]) |> Float64Array.byteLength),
-    ),
-    (
-      "float64_array - fromBuffer",
-      _ => Eq(32, ArrayBuffer.make(32) |> Float64Array.fromBuffer |> Float64Array.byteLength),
-    ),
-    (
-      "float64_array - fromBufferOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(24, Float64Array.fromBufferOffset(buffer, 8) |> Float64Array.byteLength)
-      },
-    ),
-    (
-      "float64_array - fromBufferRange",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(
-          16,
-          Float64Array.fromBufferRange(buffer, ~offset=8, ~length=2) |> Float64Array.byteLength,
-        )
-      },
-    ),
-    (
-      "float64_array - fromLength",
-      _ => Eq(24, Float64Array.fromLength(3) |> Float64Array.byteLength),
-    ),
-    /* unable to test because nothing currently implements array_like
-    "float64_array - from", (fun _ ->
-      Eq(3, [| "a"; "b"; "c" |] |> Js.Array.keys |> Float64Array.from |> Float64Array.byteLength));
- */
-    (
-      "float64_array - unsafe_set - typed_array sanity check",
-      _ => {
-        let a = Float64Array.make([1., 2., 3., 4., 5.])
-        let _ = Float64Array.unsafe_set(a, 3, 14.)
-
-        Eq(14., Float64Array.unsafe_get(a, 3))
-      },
-    ),
-    /* DataView
-     */
-
-    (
-      "DataView - make, byteLength",
-      _ => Eq(32, ArrayBuffer.make(32) |> DataView.make |> DataView.byteLength),
-    ),
-    (
-      "DataView - fromBuffer",
-      _ => Eq(32, ArrayBuffer.make(32) |> DataView.fromBuffer |> DataView.byteLength),
-    ),
-    (
-      "DataView - fromBufferOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(24, DataView.fromBufferOffset(buffer, 8) |> DataView.byteLength)
-      },
-    ),
-    (
-      "DataView - fromBufferRange",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(4, DataView.fromBufferRange(buffer, ~offset=8, ~length=4) |> DataView.byteLength)
-      },
-    ),
-    (
-      "DataView - buffer",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(buffer, DataView.fromBuffer(buffer) |> DataView.buffer)
-      },
-    ),
-    (
-      "DataView - byteOffset",
-      _ => {
-        let buffer = ArrayBuffer.make(32)
-        Eq(8, DataView.fromBufferOffset(buffer, 8) |> DataView.byteOffset)
-      },
-    ),
-    (
-      "DataView - setInt8, getInt8",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setInt8(view, 0, 1)
-        Eq(1, DataView.getInt8(view, 0))
-      },
-    ),
-    (
-      "DataView - setUint8, getUint8",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setUint8(view, 0, 128)
-        Eq(128, DataView.getUint8(view, 0))
-      },
-    ),
-    (
-      "DataView - setInt16, getInt16",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setInt16(view, 0, 257)
-        Eq(257, DataView.getInt16(view, 0))
-      },
-    ),
-    (
-      "DataView - getInt16LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setInt16LittleEndian(view, 0, 25000)
-        Eq(25000, DataView.getInt16LittleEndian(view, 0))
-      },
-    ),
-    (
-      "DataView - setInt16LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setInt16LittleEndian(view, 0, 25000)
-        Eq(-22431, DataView.getInt16(view, 0))
-      },
-    ),
-    (
-      "DataView - setUint16, getUint16",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setUint16(view, 0, 32768)
-        Eq(32768, DataView.getUint16(view, 0))
-      },
-    ),
-    (
-      "DataView - getUint16LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setUint16LittleEndian(view, 0, 32768)
-        Eq(32768, DataView.getUint16LittleEndian(view, 0))
-      },
-    ),
-    (
-      "DataView - setUint16LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setUint16LittleEndian(view, 0, 32768)
-        Eq(128, DataView.getUint16(view, 0))
-      },
-    ),
-    (
-      "DataView - setInt32, getInt32",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setInt32(view, 0, 65537)
-        Eq(65537, DataView.getInt32(view, 0))
-      },
-    ),
-    (
-      "DataView - getInt32LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setInt32LittleEndian(view, 0, 65537)
-        Eq(65537, DataView.getInt32LittleEndian(view, 0))
-      },
-    ),
-    (
-      "DataView - setInt32LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setInt32LittleEndian(view, 0, 65537)
-        Eq(16777472, DataView.getInt32(view, 0))
-      },
-    ),
-    /* Testing against 2_147_483_649 would be better,
-     but JS platform restrict us with int32 */
-    (
-      "DataView - setUint32, getUint32",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setUint32(view, 0, 65537)
-        Eq(65537, DataView.getUint32(view, 0))
-      },
-    ),
-    (
-      "DataView - getUint32LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setUint32LittleEndian(view, 0, 65537)
-        Eq(65537, DataView.getUint32LittleEndian(view, 0))
-      },
-    ),
-    (
-      "DataView - setUint32LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setUint32LittleEndian(view, 0, 65537)
-        Eq(16777472, DataView.getUint32(view, 0))
-      },
-    ),
-    (
-      "DataView - setFloat32, getFloat32",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setFloat32(view, 0, 65537.0)
-        Eq(65537.0, DataView.getFloat32(view, 0))
-      },
-    ),
-    (
-      "DataView - getFloat32LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setFloat32LittleEndian(view, 0, 65537.0)
-        Eq(65537.0, DataView.getFloat32LittleEndian(view, 0))
-      },
-    ),
-    (
-      "DataView - setFloat32LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setFloat32LittleEndian(view, 0, 1.0)
-        Eq(4.600602988224807e-41, DataView.getFloat32(view, 0))
-      },
-    ),
-    (
-      "DataView - setFloat64, getFloat64",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setFloat64(view, 0, 1e200)
-        Eq(1e200, DataView.getFloat64(view, 0))
-      },
-    ),
-    (
-      "DataView - getFloat64LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setFloat64LittleEndian(view, 0, 1e200)
-        Eq(1e200, DataView.getFloat64LittleEndian(view, 0))
-      },
-    ),
-    (
-      "DataView - setFloat64LittleEndian",
-      _ => {
-        let buffer = ArrayBuffer.make(8)
-        let view = DataView.make(buffer)
-        DataView.setFloat64LittleEndian(view, 0, 1.0)
-        Eq(3.03865e-319, DataView.getFloat64(view, 0))
-      },
-    ),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_undefined_test.js b/jscomp/test/js_undefined_test.js
deleted file mode 100644
index 5e86518..0000000
--- a/jscomp/test/js_undefined_test.js
+++ /dev/null
@@ -1,165 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-var Js_undefined = require("../../lib/js/js_undefined.js");
-
-var suites_0 = [
-  "toOption - empty",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: undefined,
-              _1: undefined
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "File \"js_undefined_test.res\", line 7, characters 5-12",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: undefined,
-                _1: undefined
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "return",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: "something",
-                  _1: Caml_option.undefined_to_opt("something")
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "test - empty",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: true
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "File \"js_undefined_test.res\", line 10, characters 5-12",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: true
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "bind - empty",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: undefined,
-                        _1: Js_undefined.bind(undefined, (function (v) {
-                                return v;
-                              }))
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "bind - 'a",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: 4,
-                          _1: Js_undefined.bind(2, (function (n) {
-                                  return (n << 1);
-                                }))
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "iter - empty",
-                (function (param) {
-                    var hit = {
-                      contents: false
-                    };
-                    Js_undefined.iter(undefined, (function (param) {
-                            hit.contents = true;
-                          }));
-                    return {
-                            TAG: "Eq",
-                            _0: false,
-                            _1: hit.contents
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "iter - 'a",
-                  (function (param) {
-                      var hit = {
-                        contents: 0
-                      };
-                      Js_undefined.iter(2, (function (v) {
-                              hit.contents = v;
-                            }));
-                      return {
-                              TAG: "Eq",
-                              _0: 2,
-                              _1: hit.contents
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "fromOption - None",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: undefined,
-                                _1: Js_undefined.fromOption(undefined)
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "fromOption - Some",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: 2,
-                                  _1: Js_undefined.fromOption(2)
-                                };
-                        })
-                    ],
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Js_undefined_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/js_undefined_test.res b/jscomp/test/js_undefined_test.res
deleted file mode 100644
index 29753e7..0000000
--- a/jscomp/test/js_undefined_test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-open Js_undefined
-
-let suites = {
-  open Mt
-  list{
-    ("toOption - empty", _ => Eq(None, empty |> toOption)),
-    (__LOC__, _ => Eq(None, return() |> toOption)),
-    ("return", _ => Eq(Some("something"), return("something") |> toOption)),
-    ("test - empty", _ => Eq(true, empty == Js.undefined)),
-    (__LOC__, _ => Eq(true, return() == Js.undefined)),
-    ("bind - empty", _ => Eq(empty, bind(empty, (. v) => v))),
-    ("bind - 'a", _ => Eq(return(4), bind(return(2), (. n) => n * 2))),
-    (
-      "iter - empty",
-      _ => {
-        let hit = ref(false)
-        let _ = iter(empty, (. _) => hit := true)
-        Eq(false, hit.contents)
-      },
-    ),
-    (
-      "iter - 'a",
-      _ => {
-        let hit = ref(0)
-        let _ = iter(return(2), (. v) => hit := v)
-        Eq(2, hit.contents)
-      },
-    ),
-    ("fromOption - None", _ => Eq(empty, None |> fromOption)),
-    ("fromOption - Some", _ => Eq(return(2), Some(2) |> fromOption)),
-  }
-}
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/js_val.js b/jscomp/test/js_val.js
deleted file mode 100644
index c614a20..0000000
--- a/jscomp/test/js_val.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var X = require("x");
-
-var h = u;
-
-var hh = X.vv;
-
-var hhh = X.vv;
-
-var hhhh = X.vvvv;
-
-exports.h = h;
-exports.hh = hh;
-exports.hhh = hhh;
-exports.hhhh = hhhh;
-/* h Not a pure module */
diff --git a/jscomp/test/js_val.res b/jscomp/test/js_val.res
deleted file mode 100644
index c9a910a..0000000
--- a/jscomp/test/js_val.res
+++ /dev/null
@@ -1,13 +0,0 @@
-@val external u: int = "u"
-
-@val @module("x") external vv: int = "vv"
-
-@val @module(("x", "U")) external vvv: int = "vv"
-@module(("x", "U")) external vvvv: int = "vvvv"
-
-/* TODO: unify all [bs.module] name, here ideally,
- we should have only one [require("x")] here */
-let h = u
-let hh = vv
-let hhh = vvv
-let hhhh = vvvv
diff --git a/jscomp/test/jsoo_400_test.js b/jscomp/test/jsoo_400_test.js
deleted file mode 100644
index fa8e5fd..0000000
--- a/jscomp/test/jsoo_400_test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_int32 = require("../../lib/js/caml_int32.js");
-
-function u(param) {
-  var n;
-  try {
-    n = "123".length;
-  }
-  catch (exn){
-    return 42;
-  }
-  return Caml_int32.div(3, 0);
-}
-
-Mt.from_pair_suites("Jsoo_400_test", {
-      hd: [
-        "File \"jsoo_400_test.res\", line 7, characters 38-45",
-        (function (param) {
-            return {
-                    TAG: "ThrowAny",
-                    _0: (function (param) {
-                        u();
-                      })
-                  };
-          })
-      ],
-      tl: /* [] */0
-    });
-
-exports.u = u;
-/*  Not a pure module */
diff --git a/jscomp/test/jsoo_400_test.res b/jscomp/test/jsoo_400_test.res
deleted file mode 100644
index 6bf5061..0000000
--- a/jscomp/test/jsoo_400_test.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let u = () =>
-  switch String.length("123") {
-  | n => 3 / 0
-  | exception _ => 42
-  } /* TODO: could be optimized */
-
-Mt.from_pair_suites(__MODULE__, list{(__LOC__, _ => ThrowAny(_ => ignore(u())))})
diff --git a/jscomp/test/jsoo_485_test.js b/jscomp/test/jsoo_485_test.js
deleted file mode 100644
index 25e071f..0000000
--- a/jscomp/test/jsoo_485_test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(param) {
-  3;
-}
-
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/jsoo_485_test.res b/jscomp/test/jsoo_485_test.res
deleted file mode 100644
index 10a90bc..0000000
--- a/jscomp/test/jsoo_485_test.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let f = () => ref(None) := Some(3)
-
-/* Uncaught ReferenceError: Invalid left-hand side in assignment */
-/*
-function f() {
-  /* None */0 = /* Some */[3];
-  return /* () */0;
-}*/
-
-let () = f()
diff --git a/jscomp/test/jsxv4_newtype.js b/jscomp/test/jsxv4_newtype.js
deleted file mode 100644
index 3889299..0000000
--- a/jscomp/test/jsxv4_newtype.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function Jsxv4_newtype$V4A(props) {
-  return null;
-}
-
-var V4A = {
-  make: Jsxv4_newtype$V4A
-};
-
-function Jsxv4_newtype$V4A1(props) {
-  return null;
-}
-
-var V4A1 = {
-  make: Jsxv4_newtype$V4A1
-};
-
-function Jsxv4_newtype$V4A2(props) {
-  return null;
-}
-
-var V4A2 = {
-  make: Jsxv4_newtype$V4A2
-};
-
-function Jsxv4_newtype$V4A3(props) {
-  return props.foo;
-}
-
-var V4A3 = {
-  make: Jsxv4_newtype$V4A3
-};
-
-exports.V4A = V4A;
-exports.V4A1 = V4A1;
-exports.V4A2 = V4A2;
-exports.V4A3 = V4A3;
-/* No side effect */
diff --git a/jscomp/test/jsxv4_newtype.res b/jscomp/test/jsxv4_newtype.res
deleted file mode 100644
index 8989c18..0000000
--- a/jscomp/test/jsxv4_newtype.res
+++ /dev/null
@@ -1,33 +0,0 @@
-@@bs.config({
-   flags: ["-bs-jsx", "4"],
- })
-
-module V4A = {
-  @react.component
-  let make = (type a, ~a: a, ~b: array<option<[#Foo(a)]>>, ~c: 'a, _) => React.null
-}
-
-module V4A1 = {
-  @react.component
-  let make = (type x y, ~a:x, ~b:array<y>, ~c:'a) => React.null
-}
-
-module type T = {
-  type t
-}
-
-module V4A2 = {
-  @react.component
-  let make = (type a, ~foo: module(T with type t = a)) => {
-    module T = unpack(foo)
-    React.null
-  }
-}
-
-module V4A3 = {
-  @react.component
-  let make = (type a, ~foo) => {
-    module T = unpack(foo: T with type t = a)
-    foo
-  }
-}
diff --git a/jscomp/test/keep_uncurry_attribute.js b/jscomp/test/keep_uncurry_attribute.js
deleted file mode 100644
index 994d97e..0000000
--- a/jscomp/test/keep_uncurry_attribute.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function map1(prim0, prim1) {
-  return map(prim0, Curry.__1(prim1));
-}
-
-function map2(prim0, prim1) {
-  return map(prim0, prim1);
-}
-
-exports.map1 = map1;
-exports.map2 = map2;
-/* No side effect */
diff --git a/jscomp/test/keep_uncurry_attribute.res b/jscomp/test/keep_uncurry_attribute.res
deleted file mode 100644
index 00d48fd..0000000
--- a/jscomp/test/keep_uncurry_attribute.res
+++ /dev/null
@@ -1,5 +0,0 @@
-external map1: (array<'a>, @uncurry ('a => 'b)) => array<'b> = "map"
-let map1 = map1
-
-external map2: (array<'a>, ('a => 'b)) => array<'b> = "map"
-let map2 = map2
diff --git a/jscomp/test/key_word_property.js b/jscomp/test/key_word_property.js
deleted file mode 100644
index be6b1e2..0000000
--- a/jscomp/test/key_word_property.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Vscode = require("vscode");
-var SomeEs6Module = require("some-es6-module");
-var SomeEs6Module$1 = require("some-es6-module").default;
-var OmeEs6Module = require("./ome-es6-module").default;
-var OmeEs6Module$1 = require("./ome-es6-module");
-
-var $$default = SomeEs6Module$1;
-
-var default2 = SomeEs6Module.default2;
-
-var oefault = OmeEs6Module;
-
-var oefault2 = OmeEs6Module$1.default2;
-
-var $$window = Vscode.window;
-
-function mk($$window, $$default) {
-  return {
-          window: $$window,
-          default: $$default
-        };
-}
-
-function mk2($$window, $$default) {
-  return {
-          hd: {
-            window: $$window,
-            default: $$default
-          },
-          tl: /* [] */0
-        };
-}
-
-function des(v) {
-  return {
-          window: v.window,
-          default: v.default
-        };
-}
-
-var test = {
-  case: 3,
-  window: 3
-};
-
-function u(param) {
-  return $$window.switch();
-}
-
-var $$case = 3;
-
-exports.default = $$default;
-exports.__esModule = true;
-exports.default2 = default2;
-exports.oefault = oefault;
-exports.oefault2 = oefault2;
-exports.$$window = $$window;
-exports.mk = mk;
-exports.mk2 = mk2;
-exports.des = des;
-exports.$$case = $$case;
-exports.test = test;
-exports.u = u;
-/* default Not a pure module */
diff --git a/jscomp/test/key_word_property.res b/jscomp/test/key_word_property.res
deleted file mode 100644
index cece2e9..0000000
--- a/jscomp/test/key_word_property.res
+++ /dev/null
@@ -1,36 +0,0 @@
-/* [@@@bs.config {flags = [|
-  "-bs-package-output"; "es6:jscomp/test"
-|]}] 
-*/
-/* FIXME it does not work */
-
-type t
-
-@module("some-es6-module") external default: t = "default"
-@module("some-es6-module") external default2: t = "default2"
-let (default, default2) = (default, default2)
-
-@module("./ome-es6-module") external oefault: t = "default"
-@module("./ome-es6-module") external oefault2: t = "default2"
-let (oefault, oefault2) = (oefault, oefault2)
-
-type window
-@val @module("vscode") external window: window = "window"
-
-let window = window
-let mk = (window, default) => {"window": window, "default": default}
-type t_ = {window: int, default: int}
-
-let mk2 = (window, default) => list{{window, default}}
-
-let des = v => {"window": v["window"], "default": v["default"]}
-
-let case = 3
-
-let test = {"case": case, "window": 3}
-
-@send external \"switch": window => string = "switch"
-
-let u = () => \"switch"(window)
-
-/* 0,0,0,0,0,0,0,0,0,0,0,0,0,0 */
diff --git a/jscomp/test/key_word_property2.js b/jscomp/test/key_word_property2.js
deleted file mode 100644
index 39da11a..0000000
--- a/jscomp/test/key_word_property2.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Export_keyword = require("./export_keyword.js");
-
-function test2(v) {
-  return {
-          _open: v._open,
-          window: v.window
-        };
-}
-
-function test(p) {
-  return [
-          p.catch,
-          p._then
-        ];
-}
-
-var $$case = Export_keyword.$$case;
-
-var $$window = Export_keyword.$$window;
-
-var $$switch = Export_keyword.$$switch;
-
-exports.test2 = test2;
-exports.test = test;
-exports.$$case = $$case;
-exports.$$window = $$window;
-exports.$$switch = $$switch;
-/* No side effect */
diff --git a/jscomp/test/key_word_property2.res b/jscomp/test/key_word_property2.res
deleted file mode 100644
index 642822a..0000000
--- a/jscomp/test/key_word_property2.res
+++ /dev/null
@@ -1,12 +0,0 @@
-let test2 = v =>
-  {
-    "_open": v["_open"],
-    "window": v["window"],
-  }
-
-let test = p => (p["catch"], p["_then"])
-let (case, window, \"switch") = (
-  Export_keyword.case,
-  Export_keyword.window,
-  Export_keyword.\"switch",
-)
diff --git a/jscomp/test/key_word_property_plus_test.js b/jscomp/test/key_word_property_plus_test.js
deleted file mode 100644
index a4de693..0000000
--- a/jscomp/test/key_word_property_plus_test.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Global_mangles = require("./global_mangles.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"key_word_property_plus_test.res\", line 10, characters 2-9", [
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        10,
-        11,
-        12,
-        13,
-        14
-      ].reduce((function (prim0, prim1) {
-            return prim0 + prim1 | 0;
-          }), 0), ((((((((((((Global_mangles.$$__dirname + Global_mangles.$$__filename | 0) + Global_mangles.$$clearImmediate | 0) + Global_mangles.$$clearInterval | 0) + Global_mangles.$$clearTimeout | 0) + Global_mangles.$$console | 0) + Global_mangles.$$exports | 0) + Global_mangles.$$global | 0) + Global_mangles._module | 0) + Global_mangles.$$process | 0) + Global_mangles.$$require | 0) + Global_mangles.$$setImmediate | 0) + Global_mangles.$$setInterval | 0) + Global_mangles.$$setTimeout | 0);
-
-Mt.from_pair_suites("Key_word_property_plus_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/key_word_property_plus_test.res b/jscomp/test/key_word_property_plus_test.res
deleted file mode 100644
index 9dd9828..0000000
--- a/jscomp/test/key_word_property_plus_test.res
+++ /dev/null
@@ -1,31 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let () = eq(
-  __LOC__,
-  Js.Array2.reduce([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], \"+", 0),
-  {
-    open Global_mangles
-    __dirname +
-    __filename +
-    clearImmediate +
-    clearInterval +
-    clearTimeout +
-    console +
-    exports +
-    global +
-    _module +
-    process +
-    require +
-    setImmediate +
-    setInterval +
-    setTimeout
-  },
-)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/label_uncurry.js b/jscomp/test/label_uncurry.js
deleted file mode 100644
index 36ca016..0000000
--- a/jscomp/test/label_uncurry.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_format = require("../../lib/js/caml_format.js");
-
-function f(x) {
-  return x;
-}
-
-function u(x, y) {
-  return x + Caml_format.int_of_string(y) | 0;
-}
-
-function u1(f) {
-  console.log(f(2, "x"));
-  console.log(f(2, "x"));
-}
-
-function h(x) {
-  return 3;
-}
-
-var a = u1(u);
-
-exports.f = f;
-exports.u = u;
-exports.u1 = u1;
-exports.h = h;
-exports.a = a;
-/* a Not a pure module */
diff --git a/jscomp/test/label_uncurry.res b/jscomp/test/label_uncurry.res
deleted file mode 100644
index 3e64de0..0000000
--- a/jscomp/test/label_uncurry.res
+++ /dev/null
@@ -1,17 +0,0 @@
-type t = (. ~x: int, ~y: string) => int
-
-type u = (. ~x: int, ~y: string) => int
-
-let f = (x: t): u => x
-
-let u: u = (. ~x, ~y) => x + int_of_string(y)
-
-let u1 = (f: u) => {
-  f(. ~y="x", ~x=2)->Js.log
-  f(. ~x=2, ~y="x")->Js.log
-}
-let h = (. ~x : unit) => 3
-
-let a = u1(u)
-
-type u0 = (. ~x: int=?, ~y: string) => int
diff --git a/jscomp/test/lam.md b/jscomp/test/lam.md
deleted file mode 100644
index b065bfe..0000000
--- a/jscomp/test/lam.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-== optimizations done in `Lam.convert`
-
-1. Specialize `CamlinternalMod`, `Pervasives.(^)` functions for recursive module
-2. Alias removing
-
-[source,ocaml]
---------------
-let x = y (x/y)
-let u = x (u/x, x/y -> u/y)
---------------
-
-3. extract `Psj_unsafe_downgrade`
-
-4. scc for recursive functions
\ No newline at end of file
diff --git a/jscomp/test/large_integer_pat.js b/jscomp/test/large_integer_pat.js
deleted file mode 100644
index 7e03d30..0000000
--- a/jscomp/test/large_integer_pat.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function ff(x) {
-  if (x >= 123 || x < 0) {
-    return 2;
-  } else {
-    return 1;
-  }
-}
-
-exports.ff = ff;
-/* No side effect */
diff --git a/jscomp/test/large_integer_pat.res b/jscomp/test/large_integer_pat.res
deleted file mode 100644
index c3324d9..0000000
--- a/jscomp/test/large_integer_pat.res
+++ /dev/null
@@ -1,250 +0,0 @@
-let ff = x =>
-  switch x {
-  | 0
-  | 1
-  | 2
-  | 3
-  | 4
-  | 5
-  | 6
-  | 7
-  | 8
-  | 9
-  | 10
-  | 11
-  | 12
-  | 13
-  | 14
-  | 15
-  | 16
-  | 17
-  | 18
-  | 19
-  | 20
-  | 21
-  | 22
-  | 23
-  | 24
-  | 25
-  | 26
-  | 27
-  | 28
-  | 29
-  | 30
-  | 31
-  | 32
-  | 33
-  | 34
-  | 35
-  | 36
-  | 37
-  | 38
-  | 39
-  | 40
-  | 41
-  | 42
-  | 43
-  | 44
-  | 45
-  | 46
-  | 47
-  | 48
-  | 49
-  | 50
-  | 51
-  | 52
-  | 53
-  | 54
-  | 55
-  | 56
-  | 57
-  | 58
-  | 59
-  | 60
-  | 61
-  | 62
-  | 63
-  | 64
-  | 65
-  | 66
-  | 67
-  | 68
-  | 69
-  | 70
-  | 71
-  | 72
-  | 73
-  | 74
-  | 75
-  | 76
-  | 77
-  | 78
-  | 79
-  | 80
-  | 81
-  | 82
-  | 83
-  | 84
-  | 85
-  | 86
-  | 87
-  | 88
-  | 89
-  | 90
-  | 91
-  | 92
-  | 93
-  | 94
-  | 95
-  | 96
-  | 97
-  | 98
-  | 99
-  | 100
-  | 101
-  | 102
-  | 103
-  | 104
-  | 105
-  | 106
-  | 107
-  | 108
-  | 109
-  | 110
-  | 111
-  | 112
-  | 113
-  | 114
-  | 115
-  | 116
-  | 117
-  | 118
-  | 119
-  | 120
-  | 121
-  | 122 => 1
-  | 123
-  | 124
-  | 125
-  | 126
-  | 127
-  | 128
-  | 129
-  | 130
-  | 131
-  | 132
-  | 133
-  | 134
-  | 135
-  | 136
-  | 137
-  | 138
-  | 139
-  | 140
-  | 141
-  | 142
-  | 143
-  | 144
-  | 145
-  | 146
-  | 147
-  | 148
-  | 149
-  | 150
-  | 151
-  | 152
-  | 153
-  | 154
-  | 155
-  | 156
-  | 157
-  | 158
-  | 159
-  | 160
-  | 161
-  | 162
-  | 163
-  | 164
-  | 165
-  | 166
-  | 167
-  | 168
-  | 169
-  | 170
-  | 171
-  | 172
-  | 173
-  | 174
-  | 175
-  | 176
-  | 177
-  | 178
-  | 179
-  | 180
-  | 181
-  | 182
-  | 183
-  | 184
-  | 185
-  | 186
-  | 187
-  | 188
-  | 189
-  | 190
-  | 191
-  | 192
-  | 193
-  | 194
-  | 195
-  | 196
-  | 197
-  | 198
-  | 199
-  | 200
-  | 201
-  | 202
-  | 203
-  | 204
-  | 205
-  | 206
-  | 207
-  | 208
-  | 209
-  | 210
-  | 211
-  | 212
-  | 213
-  | 214
-  | 215
-  | 216
-  | 217
-  | 218
-  | 219
-  | 220
-  | 221
-  | 222
-  | 223
-  | 224
-  | 225
-  | 226
-  | 227
-  | 228
-  | 229
-  | 230
-  | 231
-  | 232
-  | 233
-  | 234
-  | 235
-  | 236
-  | 237
-  | 238
-  | 239
-  | 240
-  | 241
-  | 242
-  | 243
-  | 244
-  | 245 => 2
-  | _ => 2
-  }
diff --git a/jscomp/test/large_record_duplication_test.js b/jscomp/test/large_record_duplication_test.js
deleted file mode 100644
index f194241..0000000
--- a/jscomp/test/large_record_duplication_test.js
+++ /dev/null
@@ -1,248 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function f0(x) {
-  var newrecord = Caml_obj.obj_dup(x);
-  newrecord.x0 = 1;
-  return newrecord;
-}
-
-var Small = /* @__PURE__ */Caml_exceptions.create("Large_record_duplication_test.Small");
-
-function f_small(x) {
-  if (x.RE_EXN_ID === Small) {
-    return {
-            RE_EXN_ID: Small,
-            x: 2,
-            y: x.y
-          };
-  } else {
-    return {
-            RE_EXN_ID: "Not_found"
-          };
-  }
-}
-
-var h = {
-  RE_EXN_ID: Small,
-  x: 1,
-  y: ""
-};
-
-eq("File \"large_record_duplication_test.res\", line 70, characters 3-10", f_small(h), {
-      RE_EXN_ID: Small,
-      x: 2,
-      y: ""
-    });
-
-eq("File \"large_record_duplication_test.res\", line 72, characters 3-10", Caml_obj.equal(h, {
-          RE_EXN_ID: Small,
-          x: 2,
-          y: ""
-        }), false);
-
-var v1 = {
-  TAG: "A0",
-  x0: 9,
-  x1: 9,
-  x2: 9,
-  x3: 9,
-  x4: 9,
-  x5: 9,
-  x6: 9,
-  x7: 9,
-  x8: 9,
-  x9: 9,
-  x10: 9,
-  x11: 9,
-  x12: 9,
-  x13: 9,
-  x14: 9,
-  x15: 9,
-  x16: 9,
-  x17: 9,
-  x18: 9,
-  x19: 9,
-  x20: 9,
-  x21: 9,
-  x22: 9
-};
-
-function get_x0(x) {
-  if (typeof x !== "object") {
-    return ;
-  } else {
-    return x.x0;
-  }
-}
-
-function f1(x) {
-  if (typeof x !== "object") {
-    return "A1";
-  }
-  var newrecord = Caml_obj.obj_dup(x);
-  newrecord.x0 = 1;
-  return newrecord;
-}
-
-eq("File \"large_record_duplication_test.res\", line 140, characters 3-10", get_x0(f1(v1)), 1);
-
-var v2 = {
-  TAG: "A0",
-  x0: 9,
-  x1: 9,
-  x2: 9,
-  x3: 9,
-  x4: 9,
-  x5: 9,
-  x6: 9,
-  x7: 9,
-  x8: 9,
-  x9: 9,
-  x10: 9,
-  x11: 9,
-  x12: 9,
-  x13: 9,
-  x14: 9,
-  x15: 9,
-  x16: 9,
-  x17: 9,
-  x18: 9,
-  x19: 9,
-  x20: 9,
-  x21: 9,
-  x22: 9
-};
-
-function get_x0$1(x) {
-  if (x.TAG === "A0") {
-    return x.x0;
-  }
-  
-}
-
-function f2(x) {
-  if (x.TAG !== "A0") {
-    return x;
-  }
-  var newrecord = Caml_obj.obj_dup(x);
-  newrecord.x0 = 1;
-  return newrecord;
-}
-
-eq("File \"large_record_duplication_test.res\", line 208, characters 3-10", get_x0$1(f2(v2)), 1);
-
-var A0 = /* @__PURE__ */Caml_exceptions.create("Large_record_duplication_test.A0");
-
-function f3(x) {
-  if (x.RE_EXN_ID !== A0) {
-    return x;
-  }
-  var newrecord = Caml_obj.obj_dup(x);
-  newrecord.x0 = 1;
-  return newrecord;
-}
-
-function get_x0$2(x) {
-  if (x.RE_EXN_ID === A0) {
-    return x.x0;
-  }
-  
-}
-
-var v3 = {
-  RE_EXN_ID: A0,
-  x0: 9,
-  x1: 9,
-  x2: 9,
-  x3: 9,
-  x4: 9,
-  x5: 9,
-  x6: 9,
-  x7: 9,
-  x8: 9,
-  x9: 9,
-  x10: 9,
-  x11: 9,
-  x12: 9,
-  x13: 9,
-  x14: 9,
-  x15: 9,
-  x16: 9,
-  x17: 9,
-  x18: 9,
-  x19: 9,
-  x20: 9,
-  x21: 9,
-  x22: 9
-};
-
-eq("File \"large_record_duplication_test.res\", line 275, characters 3-10", get_x0$2(f3(v3)), 1);
-
-eq("File \"large_record_duplication_test.res\", line 276, characters 3-10", get_x0$2(v3), 9);
-
-eq("File \"large_record_duplication_test.res\", line 277, characters 3-10", get_x0$2({
-          RE_EXN_ID: "Not_found"
-        }), undefined);
-
-Mt.from_pair_suites("Large_record_duplication_test", suites.contents);
-
-var v0 = {
-  x0: 9,
-  x1: 9,
-  x2: 9,
-  x3: 9,
-  x4: 9,
-  x5: 9,
-  x6: 9,
-  x7: 9,
-  x8: 9,
-  x9: 9,
-  x10: 9,
-  x11: 9,
-  x12: 9,
-  x13: 9,
-  x14: 9,
-  x15: 9,
-  x16: 9,
-  x17: 9,
-  x18: 9,
-  x19: 9,
-  x20: 9,
-  x21: 9,
-  x22: 9
-};
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.v0 = v0;
-exports.f0 = f0;
-exports.Small = Small;
-exports.f_small = f_small;
-exports.h = h;
-exports.v1 = v1;
-exports.f1 = f1;
-exports.v2 = v2;
-exports.f2 = f2;
-exports.A0 = A0;
-exports.f3 = f3;
-exports.get_x0 = get_x0$2;
-exports.v3 = v3;
-/*  Not a pure module */
diff --git a/jscomp/test/large_record_duplication_test.res b/jscomp/test/large_record_duplication_test.res
deleted file mode 100644
index a16405b..0000000
--- a/jscomp/test/large_record_duplication_test.res
+++ /dev/null
@@ -1,279 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-
-let test_id = ref(0)
-
-let eq = (loc, x, y): unit => Mt.eq_suites(~test_id, loc, ~suites, x, y)
-
-type t = {
-  x0: int,
-  x1: int,
-  x2: int,
-  x3: int,
-  x4: int,
-  x5: int,
-  x6: int,
-  x7: int,
-  x8: int,
-  x9: int,
-  x10: int,
-  x11: int,
-  x12: int,
-  x13: int,
-  x14: int,
-  x15: int,
-  x16: int,
-  x17: int,
-  x18: int,
-  x19: int,
-  x20: int,
-  x21: int,
-  x22: int,
-}
-
-let v0: t = {
-  x0: 9,
-  x1: 9,
-  x2: 9,
-  x3: 9,
-  x4: 9,
-  x5: 9,
-  x6: 9,
-  x7: 9,
-  x8: 9,
-  x9: 9,
-  x10: 9,
-  x11: 9,
-  x12: 9,
-  x13: 9,
-  x14: 9,
-  x15: 9,
-  x16: 9,
-  x17: 9,
-  x18: 9,
-  x19: 9,
-  x20: 9,
-  x21: 9,
-  x22: 9,
-}
-
-let f0 = (x: t) => {...x, x0: 1}
-
-exception Small({x: int, y: string})
-
-let f_small = x =>
-  switch x {
-  | Small(u) => Small({...u, x: 2})
-  | _ => Not_found
-  }
-
-let h = Small({x: 1, y: ""})
-eq(__LOC__, f_small(h), Small({x: 2, y: ""}))
-
-eq(__LOC__, h == Small({x: 2, y: ""}), false)
-
-type t1 =
-  | A0({
-      x0: int,
-      x1: int,
-      x2: int,
-      x3: int,
-      x4: int,
-      x5: int,
-      x6: int,
-      x7: int,
-      x8: int,
-      x9: int,
-      x10: int,
-      x11: int,
-      x12: int,
-      x13: int,
-      x14: int,
-      x15: int,
-      x16: int,
-      x17: int,
-      x18: int,
-      x19: int,
-      x20: int,
-      x21: int,
-      x22: int,
-    })
-  | A1
-
-let v1: t1 = A0({
-  x0: 9,
-  x1: 9,
-  x2: 9,
-  x3: 9,
-  x4: 9,
-  x5: 9,
-  x6: 9,
-  x7: 9,
-  x8: 9,
-  x9: 9,
-  x10: 9,
-  x11: 9,
-  x12: 9,
-  x13: 9,
-  x14: 9,
-  x15: 9,
-  x16: 9,
-  x17: 9,
-  x18: 9,
-  x19: 9,
-  x20: 9,
-  x21: 9,
-  x22: 9,
-})
-
-let get_x0 = (x: t1) =>
-  switch x {
-  | A0(u) => Some(u.x0)
-  | _ => None
-  }
-
-let f1 = (x: t1): t1 =>
-  switch x {
-  | A0(u) => A0({...u, x0: 1})
-  | A1 => A1
-  }
-
-eq(__LOC__, get_x0(f1(v1)), Some(1))
-
-type t2 =
-  | A0({
-      x0: int,
-      x1: int,
-      x2: int,
-      x3: int,
-      x4: int,
-      x5: int,
-      x6: int,
-      x7: int,
-      x8: int,
-      x9: int,
-      x10: int,
-      x11: int,
-      x12: int,
-      x13: int,
-      x14: int,
-      x15: int,
-      x16: int,
-      x17: int,
-      x18: int,
-      x19: int,
-      x20: int,
-      x21: int,
-      x22: int,
-    })
-  | A1(int)
-
-let v2: t2 = A0({
-  x0: 9,
-  x1: 9,
-  x2: 9,
-  x3: 9,
-  x4: 9,
-  x5: 9,
-  x6: 9,
-  x7: 9,
-  x8: 9,
-  x9: 9,
-  x10: 9,
-  x11: 9,
-  x12: 9,
-  x13: 9,
-  x14: 9,
-  x15: 9,
-  x16: 9,
-  x17: 9,
-  x18: 9,
-  x19: 9,
-  x20: 9,
-  x21: 9,
-  x22: 9,
-})
-
-let get_x0 = (x: t2) =>
-  switch x {
-  | A0(u) => Some(u.x0)
-  | _ => None
-  }
-
-let f2 = (x: t2): t2 =>
-  switch x {
-  | A0(u) => A0({...u, x0: 1})
-  | A1(_) => x
-  }
-
-eq(__LOC__, get_x0(f2(v2)), Some(1))
-
-type exn +=
-  | A0({
-    x0: int,
-    x1: int,
-    x2: int,
-    x3: int,
-    x4: int,
-    x5: int,
-    x6: int,
-    x7: int,
-    x8: int,
-    x9: int,
-    x10: int,
-    x11: int,
-    x12: int,
-    x13: int,
-    x14: int,
-    x15: int,
-    x16: int,
-    x17: int,
-    x18: int,
-    x19: int,
-    x20: int,
-    x21: int,
-    x22: int,
-  })
-
-let f3 = (x: exn): exn =>
-  switch x {
-  | A0(u) => A0({...u, x0: 1})
-  | _ => x
-  }
-
-let get_x0 = (x: exn) =>
-  switch x {
-  | A0(u) => Some(u.x0)
-  | _ => None
-  }
-
-let v3: exn = A0({
-  x0: 9,
-  x1: 9,
-  x2: 9,
-  x3: 9,
-  x4: 9,
-  x5: 9,
-  x6: 9,
-  x7: 9,
-  x8: 9,
-  x9: 9,
-  x10: 9,
-  x11: 9,
-  x12: 9,
-  x13: 9,
-  x14: 9,
-  x15: 9,
-  x16: 9,
-  x17: 9,
-  x18: 9,
-  x19: 9,
-  x20: 9,
-  x21: 9,
-  x22: 9,
-})
-
-eq(__LOC__, get_x0(f3(v3)), Some(1))
-eq(__LOC__, get_x0(v3), Some(9))
-eq(__LOC__, get_x0(Not_found), None)
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/largest_int_flow.js b/jscomp/test/largest_int_flow.js
deleted file mode 100644
index 16104d4..0000000
--- a/jscomp/test/largest_int_flow.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var x = 272872590;
-
-exports.x = x;
-/* No side effect */
diff --git a/jscomp/test/largest_int_flow.res b/jscomp/test/largest_int_flow.res
deleted file mode 100644
index 1f7179d..0000000
--- a/jscomp/test/largest_int_flow.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@@warning("-107")
-let x = 949460645006
diff --git a/jscomp/test/lazy_demo.js b/jscomp/test/lazy_demo.js
deleted file mode 100644
index 9d5062f..0000000
--- a/jscomp/test/lazy_demo.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
-
-var lazy1 = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      console.log("Hello, lazy");
-      return 1;
-    })
-};
-
-var lazy2 = {
-  LAZY_DONE: true,
-  VAL: 3
-};
-
-console.log(lazy1, lazy2);
-
-var la = CamlinternalLazy.force(lazy1);
-
-var lb = CamlinternalLazy.force(lazy2);
-
-console.log(la, lb);
-
-exports.lazy1 = lazy1;
-exports.lazy2 = lazy2;
-exports.la = la;
-exports.lb = lb;
-/*  Not a pure module */
diff --git a/jscomp/test/lazy_demo.res b/jscomp/test/lazy_demo.res
deleted file mode 100644
index 65c9eb3..0000000
--- a/jscomp/test/lazy_demo.res
+++ /dev/null
@@ -1,12 +0,0 @@
-let lazy1 = lazy {
-  "Hello, lazy"->Js.log
-  1
-}
-
-let lazy2 = lazy 3
-
-Js.log2(lazy1, lazy2)
-
-let (lazy la, lazy lb) = (lazy1, lazy2)
-
-Js.log2(la, lb)
diff --git a/jscomp/test/lazy_test.js b/jscomp/test/lazy_test.js
deleted file mode 100644
index b973dbd..0000000
--- a/jscomp/test/lazy_test.js
+++ /dev/null
@@ -1,379 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Lazy = require("../../lib/js/lazy.js");
-var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var u = {
-  contents: 3
-};
-
-var v = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      u.contents = 32;
-    })
-};
-
-function lazy_test(param) {
-  var h = u.contents;
-  CamlinternalLazy.force(v);
-  var g = u.contents;
-  return [
-          h,
-          g
-        ];
-}
-
-function f(x) {
-  CamlinternalLazy.force(x[0]);
-  var match = x[2].contents;
-  if (match === undefined) {
-    return 0;
-  }
-  CamlinternalLazy.force(x[1]);
-  var x$1 = x[2].contents;
-  if (x$1 !== undefined) {
-    return 1;
-  }
-  throw {
-        RE_EXN_ID: "Match_failure",
-        _1: [
-          "lazy_test.res",
-          14,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var s = {
-  contents: undefined
-};
-
-var set_true = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      s.contents = 1;
-    })
-};
-
-var set_false = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      s.contents = undefined;
-    })
-};
-
-var h;
-
-try {
-  h = f([
-        set_true,
-        set_false,
-        s
-      ]);
-}
-catch (raw_exn){
-  var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-  if (exn.RE_EXN_ID === "Match_failure") {
-    h = 2;
-  } else {
-    throw exn;
-  }
-}
-
-var u_v = {
-  contents: 0
-};
-
-var u$1 = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      u_v.contents = 2;
-    })
-};
-
-CamlinternalLazy.force(u$1);
-
-var exotic = CamlinternalLazy.force;
-
-var l_from_fun = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      return 3;
-    })
-};
-
-var forward_test = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      var u = 3;
-      u = u + 1 | 0;
-      return u;
-    })
-};
-
-var f005 = {
-  LAZY_DONE: true,
-  VAL: 6
-};
-
-var f006 = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      return function (param) {
-        return 3;
-      };
-    })
-};
-
-var f007 = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    })
-};
-
-var f008 = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      console.log("hi");
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    })
-};
-
-function a2(x) {
-  return {
-          LAZY_DONE: true,
-          VAL: x
-        };
-}
-
-var a3 = {
-  LAZY_DONE: true,
-  VAL: 3
-};
-
-var a4 = {
-  LAZY_DONE: true,
-  VAL: 3
-};
-
-var a5 = {
-  LAZY_DONE: true,
-  VAL: undefined
-};
-
-var a6 = {
-  LAZY_DONE: true,
-  VAL: undefined
-};
-
-var a7 = CamlinternalLazy.force(a5);
-
-var a8 = CamlinternalLazy.force(a6);
-
-Mt.from_pair_suites("Lazy_test", {
-      hd: [
-        "simple",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: lazy_test(),
-                    _1: [
-                      3,
-                      32
-                    ]
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "lazy_match",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: h,
-                      _1: 2
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "lazy_force",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: u_v.contents,
-                        _1: 2
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "lazy_from_fun",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: CamlinternalLazy.force(l_from_fun),
-                          _1: 3
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "lazy_from_val",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: CamlinternalLazy.force({
-                                  LAZY_DONE: true,
-                                  VAL: 3
-                                }),
-                            _1: 3
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "lazy_from_val2",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: CamlinternalLazy.force(CamlinternalLazy.force({
-                                        LAZY_DONE: true,
-                                        VAL: {
-                                          LAZY_DONE: true,
-                                          VAL: 3
-                                        }
-                                      })),
-                              _1: 3
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "lazy_from_val3",
-                    (function (param) {
-                        debugger;
-                        return {
-                                TAG: "Eq",
-                                _0: CamlinternalLazy.force(CamlinternalLazy.force({
-                                          LAZY_DONE: true,
-                                          VAL: forward_test
-                                        })),
-                                _1: 4
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "lazy_test.res",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: a3,
-                                  _1: a4
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "lazy_test.res",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: a7,
-                                    _1: undefined
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "lazy_test.res",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: a8,
-                                      _1: undefined
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "File \"lazy_test.res\", line 98, characters 7-14",
-                            (function (param) {
-                                return {
-                                        TAG: "Ok",
-                                        _0: Lazy.is_val({
-                                              LAZY_DONE: true,
-                                              VAL: 3
-                                            })
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "File \"lazy_test.res\", line 99, characters 7-14",
-                              (function (param) {
-                                  return {
-                                          TAG: "Ok",
-                                          _0: !Lazy.is_val({
-                                                LAZY_DONE: false,
-                                                VAL: (function () {
-                                                    throw {
-                                                          RE_EXN_ID: "Not_found",
-                                                          Error: new Error()
-                                                        };
-                                                  })
-                                              })
-                                        };
-                                })
-                            ],
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    });
-
-exports.v = v;
-exports.lazy_test = lazy_test;
-exports.f = f;
-exports.s = s;
-exports.set_true = set_true;
-exports.set_false = set_false;
-exports.h = h;
-exports.u_v = u_v;
-exports.u = u$1;
-exports.exotic = exotic;
-exports.l_from_fun = l_from_fun;
-exports.forward_test = forward_test;
-exports.f005 = f005;
-exports.f006 = f006;
-exports.f007 = f007;
-exports.f008 = f008;
-exports.a2 = a2;
-exports.a3 = a3;
-exports.a4 = a4;
-exports.a5 = a5;
-exports.a6 = a6;
-exports.a7 = a7;
-exports.a8 = a8;
-/* h Not a pure module */
diff --git a/jscomp/test/lazy_test.res b/jscomp/test/lazy_test.res
deleted file mode 100644
index 709542a..0000000
--- a/jscomp/test/lazy_test.res
+++ /dev/null
@@ -1,102 +0,0 @@
-let u = ref(3)
-let v = lazy (u := 32)
-
-let lazy_test = () => {
-  let h = u.contents
-  let g = {
-    Lazy.force(v)
-    u.contents
-  }
-  (h, g)
-}
-
-let f = x =>
-  switch x {
-  | (lazy (), _, {contents: None}) => 0
-  | (_, lazy (), {contents: Some(x)}) => 1
-  }
-
-/* PR #5992 */
-/* Was segfaulting */
-let s = ref(None)
-let set_true = lazy (s := Some(1))
-let set_false = lazy (s := None)
-
-let h = try f((set_true, set_false, s)) catch {
-| Match_failure(_) => 2
-}
-
-let u_v = ref(0)
-let u = lazy (u_v := 2)
-let () = Lazy.force(u)
-
-/* module Mt = Mock_mt */
-
-let exotic = x =>
-  switch x {
-  /* Lazy in a pattern. (used in advi) */
-  | lazy y => y
-  }
-
-/* let l_from_val = Lazy.from_val 3 */
-
-let l_from_fun = Lazy.from_fun(_ => 3)
-let forward_test = lazy {
-  let u = ref(3)
-  incr(u)
-  u.contents
-}
-/* module Mt = Mock_mt */
-
-let f005 = lazy (1 + 2 + 3)
-
-let f006 = lazy {
-  let x = 3
-  _ => x
-}
-
-let f007 = lazy raise(Not_found)
-let f008 = lazy {
-  print_endline("hi")
-  raise(Not_found)
-}
-
-let a2 = x => lazy x
-
-let a3 = lazy 3
-let a4 = a2(3)
-let a5 = lazy None
-let a6 = lazy ()
-
-let lazy a7 = a5
-let lazy a8 = a6
-
-Mt.from_pair_suites(
-  __MODULE__,
-  {
-    open Mt
-    list{
-      ("simple", _ => Eq(lazy_test(), (3, 32))),
-      ("lazy_match", _ => Eq(h, 2)),
-      ("lazy_force", _ => Eq(u_v.contents, 2)),
-      ("lazy_from_fun", _ => Eq(Lazy.force(l_from_fun), 3)),
-      ("lazy_from_val", _ => Eq(Lazy.force(Lazy.from_val(3)), 3)),
-      ("lazy_from_val2", _ => Eq(\"@@"(Lazy.force, Lazy.force(Lazy.from_val(lazy 3))), 3)),
-      (
-        "lazy_from_val3",
-        _ => Eq(
-          {
-            %debugger
-            \"@@"(Lazy.force, Lazy.force(Lazy.from_val(forward_test)))
-          },
-          4,
-        ),
-      ),
-      (__FILE__, _ => Eq(a3, a4)),
-      (__FILE__, _ => Eq(a7, None)),
-      (__FILE__, _ => Eq(a8, ())),
-      (__LOC__, _ => Ok(Lazy.is_val(lazy 3))),
-      (__LOC__, _ => Ok(\"@@"(not, Lazy.is_val(lazy raise(Not_found))))),
-    }
-  },
-)
diff --git a/jscomp/test/lib_js_test.js b/jscomp/test/lib_js_test.js
deleted file mode 100644
index fc58e1e..0000000
--- a/jscomp/test/lib_js_test.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-console.log(JSON.stringify({
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }));
-
-console.log("hey");
-
-var suites_0 = [
-  "anything_to_string",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: "3",
-              _1: String(3)
-            };
-    })
-];
-
-var suites = {
-  hd: suites_0,
-  tl: /* [] */0
-};
-
-Mt.from_pair_suites("Lib_js_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/lib_js_test.res b/jscomp/test/lib_js_test.res
deleted file mode 100644
index c5f2cec..0000000
--- a/jscomp/test/lib_js_test.res
+++ /dev/null
@@ -1,16 +0,0 @@
-@val external to_json_string: 'a => string = "JSON.stringify"
-
-let () = {
-  \"@@"(Js.log, to_json_string(list{1, 2, 3}))
-  Js.log("hey")
-}
-@val external of_any: 'a => string = "String"
-let suites = {
-  open Mt
-  list{
-    ("anything_to_string", _ => Eq("3", of_any(3))),
-    /* in js, array is printed as {[ 1,2 ]} without brackets */
-    /* "array_to_string", (fun _ -> Eq("[0]", Js.anything_to_string [|0|])) */
-  }
-}
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/libarg_test.js b/jscomp/test/libarg_test.js
deleted file mode 100644
index 0902174..0000000
--- a/jscomp/test/libarg_test.js
+++ /dev/null
@@ -1,411 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Arg = require("../../lib/js/arg.js");
-var List = require("../../lib/js/list.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-var current = {
-  contents: 0
-};
-
-var accum = {
-  contents: /* [] */0
-};
-
-function record(fmt) {
-  accum.contents = {
-    hd: fmt,
-    tl: accum.contents
-  };
-}
-
-function f_unit(param) {
-  record("unit()");
-}
-
-function f_bool(b) {
-  record("bool(" + b + ")");
-}
-
-var r_set = {
-  contents: false
-};
-
-var r_clear = {
-  contents: true
-};
-
-function f_string(s) {
-  record("string(" + s + ")");
-}
-
-var r_string = {
-  contents: ""
-};
-
-function f_int(i) {
-  record("int(" + i + ")");
-}
-
-var r_int = {
-  contents: 0
-};
-
-function f_float(f) {
-  record("float(" + f + ")");
-}
-
-var r_float = {
-  contents: 0.0
-};
-
-function f_symbol(s) {
-  record("symbol(" + s + ")");
-}
-
-function f_rest(s) {
-  record("rest(" + s + ")");
-}
-
-function f_anon(s) {
-  record("anon(" + s + ")");
-}
-
-var spec_0 = [
-  "-u",
-  {
-    TAG: "Unit",
-    _0: f_unit
-  },
-  "Unit (0)"
-];
-
-var spec_1 = {
-  hd: [
-    "-b",
-    {
-      TAG: "Bool",
-      _0: f_bool
-    },
-    "Bool (1)"
-  ],
-  tl: {
-    hd: [
-      "-s",
-      {
-        TAG: "Set",
-        _0: r_set
-      },
-      "Set (0)"
-    ],
-    tl: {
-      hd: [
-        "-c",
-        {
-          TAG: "Clear",
-          _0: r_clear
-        },
-        "Clear (0)"
-      ],
-      tl: {
-        hd: [
-          "-str",
-          {
-            TAG: "String",
-            _0: f_string
-          },
-          "String (1)"
-        ],
-        tl: {
-          hd: [
-            "-sstr",
-            {
-              TAG: "Set_string",
-              _0: r_string
-            },
-            "Set_string (1)"
-          ],
-          tl: {
-            hd: [
-              "-i",
-              {
-                TAG: "Int",
-                _0: f_int
-              },
-              "Int (1)"
-            ],
-            tl: {
-              hd: [
-                "-si",
-                {
-                  TAG: "Set_int",
-                  _0: r_int
-                },
-                "Set_int (1)"
-              ],
-              tl: {
-                hd: [
-                  "-f",
-                  {
-                    TAG: "Float",
-                    _0: f_float
-                  },
-                  "Float (1)"
-                ],
-                tl: {
-                  hd: [
-                    "-sf",
-                    {
-                      TAG: "Set_float",
-                      _0: r_float
-                    },
-                    "Set_float (1)"
-                  ],
-                  tl: {
-                    hd: [
-                      "-t",
-                      {
-                        TAG: "Tuple",
-                        _0: {
-                          hd: {
-                            TAG: "Bool",
-                            _0: f_bool
-                          },
-                          tl: {
-                            hd: {
-                              TAG: "String",
-                              _0: f_string
-                            },
-                            tl: {
-                              hd: {
-                                TAG: "Int",
-                                _0: f_int
-                              },
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      },
-                      "Tuple (3)"
-                    ],
-                    tl: {
-                      hd: [
-                        "-sym",
-                        {
-                          TAG: "Symbol",
-                          _0: {
-                            hd: "a",
-                            tl: {
-                              hd: "b",
-                              tl: {
-                                hd: "c",
-                                tl: /* [] */0
-                              }
-                            }
-                          },
-                          _1: f_symbol
-                        },
-                        "Symbol (1)"
-                      ],
-                      tl: {
-                        hd: [
-                          "-rest",
-                          {
-                            TAG: "Rest",
-                            _0: f_rest
-                          },
-                          "Rest (*)"
-                        ],
-                        tl: /* [] */0
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var spec = {
-  hd: spec_0,
-  tl: spec_1
-};
-
-var args1 = [
-  "prog",
-  "anon1",
-  "-u",
-  "-b",
-  "true",
-  "-s",
-  "anon2",
-  "-c",
-  "-str",
-  "foo",
-  "-sstr",
-  "bar",
-  "-i",
-  "19",
-  "-si",
-  "42",
-  "-f",
-  "3.14",
-  "-sf",
-  "2.72",
-  "anon3",
-  "-t",
-  "false",
-  "gee",
-  "1436",
-  "-sym",
-  "c",
-  "anon4",
-  "-rest",
-  "r1",
-  "r2"
-];
-
-var args2 = [
-  "prog",
-  "anon1",
-  "-u",
-  "-b=true",
-  "-s",
-  "anon2",
-  "-c",
-  "-str=foo",
-  "-sstr=bar",
-  "-i=19",
-  "-si=42",
-  "-f=3.14",
-  "-sf=2.72",
-  "anon3",
-  "-t",
-  "false",
-  "gee",
-  "1436",
-  "-sym=c",
-  "anon4",
-  "-rest",
-  "r1",
-  "r2"
-];
-
-function error(s) {
-  console.log("error (" + (s + ")"));
-}
-
-function check(r, v, msg) {
-  if (Caml_obj.notequal(r.contents, v)) {
-    return error(msg);
-  }
-  
-}
-
-function test(argv) {
-  current.contents = 0;
-  r_set.contents = false;
-  r_clear.contents = true;
-  r_string.contents = "";
-  r_int.contents = 0;
-  r_float.contents = 0.0;
-  accum.contents = /* [] */0;
-  Arg.parse_argv(current, argv, spec, f_anon, "usage");
-  var result = List.rev(accum.contents);
-  var reference = {
-    hd: "anon(anon1)",
-    tl: {
-      hd: "unit()",
-      tl: {
-        hd: "bool(true)",
-        tl: {
-          hd: "anon(anon2)",
-          tl: {
-            hd: "string(foo)",
-            tl: {
-              hd: "int(19)",
-              tl: {
-                hd: "float(3.14)",
-                tl: {
-                  hd: "anon(anon3)",
-                  tl: {
-                    hd: "bool(false)",
-                    tl: {
-                      hd: "string(gee)",
-                      tl: {
-                        hd: "int(1436)",
-                        tl: {
-                          hd: "symbol(c)",
-                          tl: {
-                            hd: "anon(anon4)",
-                            tl: {
-                              hd: "rest(r1)",
-                              tl: {
-                                hd: "rest(r2)",
-                                tl: /* [] */0
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  };
-  if (Caml_obj.notequal(result, reference)) {
-    var f = function (x, y) {
-      console.log(x, y);
-    };
-    List.iter2(f, result, reference);
-  }
-  check(r_set, true, "Set");
-  check(r_clear, false, "Clear");
-  check(r_string, "bar", "Set_string");
-  check(r_int, 42, "Set_int");
-  check(r_float, 2.72, "Set_float");
-}
-
-test(args1);
-
-test(args2);
-
-Mt.from_pair_suites("Libarg_test", /* [] */0);
-
-var suites = /* [] */0;
-
-exports.current = current;
-exports.accum = accum;
-exports.record = record;
-exports.f_unit = f_unit;
-exports.f_bool = f_bool;
-exports.r_set = r_set;
-exports.r_clear = r_clear;
-exports.f_string = f_string;
-exports.r_string = r_string;
-exports.f_int = f_int;
-exports.r_int = r_int;
-exports.f_float = f_float;
-exports.r_float = r_float;
-exports.f_symbol = f_symbol;
-exports.f_rest = f_rest;
-exports.f_anon = f_anon;
-exports.spec = spec;
-exports.args1 = args1;
-exports.args2 = args2;
-exports.error = error;
-exports.check = check;
-exports.test = test;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/libarg_test.res b/jscomp/test/libarg_test.res
deleted file mode 100644
index 5c92ff2..0000000
--- a/jscomp/test/libarg_test.res
+++ /dev/null
@@ -1,151 +0,0 @@
-let current = ref(0)
-
-let accum = ref(list{})
-
-let record = fmt /* args */ => accum := list{fmt, ...accum.contents}
-
-let f_unit = () => record("unit()")
-let f_bool = b => record("bool(" ++ __unsafe_cast(b) ++ ")")
-let r_set = ref(false)
-let r_clear = ref(true)
-let f_string = s => record("string(" ++ s ++ ")")
-let r_string = ref("")
-let f_int = i => record("int(" ++ __unsafe_cast(i) ++ ")")
-let r_int = ref(0)
-let f_float = f => record("float(" ++ __unsafe_cast(f) ++ ")")
-let r_float = ref(0.0)
-let f_symbol = s => record("symbol(" ++ s ++ ")")
-let f_rest = s => record("rest(" ++ s ++ ")")
-let f_anon = s => record("anon(" ++ s ++ ")")
-
-let spec = {
-  open Arg
-  list{
-    ("-u", Unit(f_unit), "Unit (0)"),
-    ("-b", Bool(f_bool), "Bool (1)"),
-    ("-s", Set(r_set), "Set (0)"),
-    ("-c", Clear(r_clear), "Clear (0)"),
-    ("-str", String(f_string), "String (1)"),
-    ("-sstr", Set_string(r_string), "Set_string (1)"),
-    ("-i", Int(f_int), "Int (1)"),
-    ("-si", Set_int(r_int), "Set_int (1)"),
-    ("-f", Float(f_float), "Float (1)"),
-    ("-sf", Set_float(r_float), "Set_float (1)"),
-    ("-t", Tuple(list{Bool(f_bool), String(f_string), Int(f_int)}), "Tuple (3)"),
-    ("-sym", Symbol(list{"a", "b", "c"}, f_symbol), "Symbol (1)"),
-    ("-rest", Rest(f_rest), "Rest (*)"),
-  }
-}
-
-let args1 = [
-  "prog",
-  "anon1",
-  "-u",
-  "-b",
-  "true",
-  "-s",
-  "anon2",
-  "-c",
-  "-str",
-  "foo",
-  "-sstr",
-  "bar",
-  "-i",
-  "19",
-  "-si",
-  "42",
-  "-f",
-  "3.14",
-  "-sf",
-  "2.72",
-  "anon3",
-  "-t",
-  "false",
-  "gee",
-  "1436",
-  "-sym",
-  "c",
-  "anon4",
-  "-rest",
-  "r1",
-  "r2",
-]
-
-let args2 = [
-  "prog",
-  "anon1",
-  "-u",
-  "-b=true",
-  "-s",
-  "anon2",
-  "-c",
-  "-str=foo",
-  "-sstr=bar",
-  "-i=19",
-  "-si=42",
-  "-f=3.14",
-  "-sf=2.72",
-  "anon3",
-  "-t",
-  "false",
-  "gee",
-  "1436",
-  "-sym=c",
-  "anon4",
-  "-rest",
-  "r1",
-  "r2",
-]
-
-let error = s => Js.log("error (" ++ (s ++ ")"))
-let check = (r, v, msg) =>
-  if r.contents != v {
-    error(msg)
-  }
-
-let test = argv => {
-  current := 0
-  r_set := false
-  r_clear := true
-  r_string := ""
-  r_int := 0
-  r_float := 0.0
-  accum := list{}
-  Arg.parse_argv(~current, argv, spec, f_anon, "usage")
-  let result = List.rev(accum.contents)
-  let reference = list{
-    "anon(anon1)",
-    "unit()",
-    "bool(true)",
-    "anon(anon2)",
-    "string(foo)",
-    "int(19)",
-    "float(3.14)",
-    "anon(anon3)",
-    "bool(false)",
-    "string(gee)",
-    "int(1436)",
-    "symbol(c)",
-    "anon(anon4)",
-    "rest(r1)",
-    "rest(r2)",
-  }
-
-  if result != reference {
-    let f = (x, y) => Js.log2(x, y)
-
-    List.iter2(f, result, reference)
-  }
-  check(r_set, true, "Set")
-  check(r_clear, false, "Clear")
-  check(r_string, "bar", "Set_string")
-  check(r_int, 42, "Set_int")
-  check(r_float, 2.72, "Set_float")
-}
-
-test(args1)
-
-test(args2)
-let suites = list{}
-
-let () = Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/libqueue_test.js b/jscomp/test/libqueue_test.js
deleted file mode 100644
index b052119..0000000
--- a/jscomp/test/libqueue_test.js
+++ /dev/null
@@ -1,1392 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var Queue = require("../../lib/js/queue.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function to_list(q) {
-  return List.rev(Queue.fold((function (l, x) {
-                    return {
-                            hd: x,
-                            tl: l
-                          };
-                  }), /* [] */0, q));
-}
-
-var Q = {
-  Empty: Queue.Empty,
-  create: Queue.create,
-  add: Queue.add,
-  push: Queue.push,
-  take: Queue.take,
-  pop: Queue.pop,
-  peek: Queue.peek,
-  top: Queue.top,
-  clear: Queue.clear,
-  copy: Queue.copy,
-  is_empty: Queue.is_empty,
-  length: Queue.length,
-  iter: Queue.iter,
-  fold: Queue.fold,
-  transfer: Queue.transfer,
-  to_list: to_list
-};
-
-function does_raise(f, q) {
-  try {
-    Curry._1(f, q);
-    return false;
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === Queue.Empty) {
-      return true;
-    }
-    throw exn;
-  }
-}
-
-var q = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-if (!(to_list(q) === /* [] */0 && q.length === 0)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          30,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.add(1, q);
-
-if (!(Caml_obj.equal(to_list(q), {
-          hd: 1,
-          tl: /* [] */0
-        }) && q.length === 1)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          32,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.add(2, q);
-
-if (!(Caml_obj.equal(to_list(q), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }) && q.length === 2)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          34,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.add(3, q);
-
-if (!(Caml_obj.equal(to_list(q), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }) && q.length === 3)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          36,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.add(4, q);
-
-if (!(Caml_obj.equal(to_list(q), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }) && q.length === 4)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          38,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Queue.take(q) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          39,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(to_list(q), {
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          }
-        }) && q.length === 3)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          40,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Queue.take(q) !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          41,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(to_list(q), {
-          hd: 3,
-          tl: {
-            hd: 4,
-            tl: /* [] */0
-          }
-        }) && q.length === 2)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          42,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Queue.take(q) !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          43,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(Caml_obj.equal(to_list(q), {
-          hd: 4,
-          tl: /* [] */0
-        }) && q.length === 1)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          44,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Queue.take(q) !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          45,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!(to_list(q) === /* [] */0 && q.length === 0)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          46,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Queue.take, q)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          47,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q$1 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-Queue.add(1, q$1);
-
-if (Queue.take(q$1) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          53,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Queue.take, q$1)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          54,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.add(2, q$1);
-
-if (Queue.take(q$1) !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          56,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Queue.take, q$1)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          57,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q$1.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          58,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q$2 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-Queue.add(1, q$2);
-
-if (Queue.peek(q$2) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          64,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.add(2, q$2);
-
-if (Queue.peek(q$2) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          66,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.add(3, q$2);
-
-if (Queue.peek(q$2) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          68,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Queue.peek(q$2) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          69,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Queue.take(q$2) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          70,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Queue.peek(q$2) !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          71,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Queue.take(q$2) !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          72,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Queue.peek(q$2) !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          73,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (Queue.take(q$2) !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          74,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Queue.peek, q$2)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          75,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Queue.peek, q$2)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          76,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q$3 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-for(var i = 1; i <= 10; ++i){
-  Queue.add(i, q$3);
-}
-
-Queue.clear(q$3);
-
-if (q$3.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          85,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!does_raise(Queue.take, q$3)) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          86,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(q$3, {
-        length: 0,
-        first: "Nil",
-        last: "Nil"
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          87,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.add(42, q$3);
-
-if (Queue.take(q$3) !== 42) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          89,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q1 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-for(var i$1 = 1; i$1 <= 10; ++i$1){
-  Queue.add(i$1, q1);
-}
-
-var q2 = Queue.copy(q1);
-
-if (!Caml_obj.equal(to_list(q1), {
-        hd: 1,
-        tl: {
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 4,
-              tl: {
-                hd: 5,
-                tl: {
-                  hd: 6,
-                  tl: {
-                    hd: 7,
-                    tl: {
-                      hd: 8,
-                      tl: {
-                        hd: 9,
-                        tl: {
-                          hd: 10,
-                          tl: /* [] */0
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          98,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(to_list(q2), {
-        hd: 1,
-        tl: {
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 4,
-              tl: {
-                hd: 5,
-                tl: {
-                  hd: 6,
-                  tl: {
-                    hd: 7,
-                    tl: {
-                      hd: 8,
-                      tl: {
-                        hd: 9,
-                        tl: {
-                          hd: 10,
-                          tl: /* [] */0
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          99,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q1.length !== 10) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          100,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2.length !== 10) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          101,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-for(var i$2 = 1; i$2 <= 10; ++i$2){
-  if (Queue.take(q1) !== i$2) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            103,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  
-}
-
-for(var i$3 = 1; i$3 <= 10; ++i$3){
-  if (Queue.take(q2) !== i$3) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            106,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  
-}
-
-var q$4 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-if (q$4.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          112,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-for(var i$4 = 1; i$4 <= 10; ++i$4){
-  Queue.add(i$4, q$4);
-  if (q$4.length !== i$4) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            115,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  if (q$4.length === 0) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            116,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  
-}
-
-for(var i$5 = 10; i$5 >= 1; --i$5){
-  if (q$4.length !== i$5) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            119,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  if (q$4.length === 0) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "libqueue_test.res",
-            120,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  Queue.take(q$4);
-}
-
-if (q$4.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          123,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q$4.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          124,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q$5 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-for(var i$6 = 1; i$6 <= 10; ++i$6){
-  Queue.add(i$6, q$5);
-}
-
-var i$7 = {
-  contents: 1
-};
-
-Queue.iter((function (j) {
-        if (i$7.contents !== j) {
-          throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "libqueue_test.res",
-                  134,
-                  4
-                ],
-                Error: new Error()
-              };
-        }
-        i$7.contents = i$7.contents + 1 | 0;
-      }), q$5);
-
-var q1$1 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-var q2$1 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-if (q1$1.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          141,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (to_list(q1$1) !== /* [] */0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          142,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$1.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          143,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (to_list(q2$1) !== /* [] */0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          144,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.transfer(q1$1, q2$1);
-
-if (q1$1.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          146,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (to_list(q1$1) !== /* [] */0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          147,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$1.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          148,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (to_list(q2$1) !== /* [] */0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          149,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q1$2 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-var q2$2 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-for(var i$8 = 1; i$8 <= 4; ++i$8){
-  Queue.add(i$8, q1$2);
-}
-
-if (q1$2.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          157,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(to_list(q1$2), {
-        hd: 1,
-        tl: {
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          158,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$2.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          159,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (to_list(q2$2) !== /* [] */0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          160,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.transfer(q1$2, q2$2);
-
-if (q1$2.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          162,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (to_list(q1$2) !== /* [] */0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          163,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$2.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          164,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(to_list(q2$2), {
-        hd: 1,
-        tl: {
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          165,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q1$3 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-var q2$3 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-for(var i$9 = 5; i$9 <= 8; ++i$9){
-  Queue.add(i$9, q2$3);
-}
-
-if (q1$3.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          173,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (to_list(q1$3) !== /* [] */0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          174,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$3.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          175,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(to_list(q2$3), {
-        hd: 5,
-        tl: {
-          hd: 6,
-          tl: {
-            hd: 7,
-            tl: {
-              hd: 8,
-              tl: /* [] */0
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          176,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.transfer(q1$3, q2$3);
-
-if (q1$3.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          178,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (to_list(q1$3) !== /* [] */0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          179,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$3.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          180,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(to_list(q2$3), {
-        hd: 5,
-        tl: {
-          hd: 6,
-          tl: {
-            hd: 7,
-            tl: {
-              hd: 8,
-              tl: /* [] */0
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          181,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var q1$4 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-var q2$4 = {
-  length: 0,
-  first: "Nil",
-  last: "Nil"
-};
-
-for(var i$10 = 1; i$10 <= 4; ++i$10){
-  Queue.add(i$10, q1$4);
-}
-
-for(var i$11 = 5; i$11 <= 8; ++i$11){
-  Queue.add(i$11, q2$4);
-}
-
-if (q1$4.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          192,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(to_list(q1$4), {
-        hd: 1,
-        tl: {
-          hd: 2,
-          tl: {
-            hd: 3,
-            tl: {
-              hd: 4,
-              tl: /* [] */0
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          193,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$4.length !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          194,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(to_list(q2$4), {
-        hd: 5,
-        tl: {
-          hd: 6,
-          tl: {
-            hd: 7,
-            tl: {
-              hd: 8,
-              tl: /* [] */0
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          195,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-Queue.transfer(q1$4, q2$4);
-
-if (q1$4.length !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          197,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (to_list(q1$4) !== /* [] */0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          198,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (q2$4.length !== 8) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          199,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(to_list(q2$4), {
-        hd: 5,
-        tl: {
-          hd: 6,
-          tl: {
-            hd: 7,
-            tl: {
-              hd: 8,
-              tl: {
-                hd: 1,
-                tl: {
-                  hd: 2,
-                  tl: {
-                    hd: 3,
-                    tl: {
-                      hd: 4,
-                      tl: /* [] */0
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "libqueue_test.res",
-          200,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-console.log("OK");
-
-exports.Q = Q;
-exports.does_raise = does_raise;
-/* q Not a pure module */
diff --git a/jscomp/test/libqueue_test.res b/jscomp/test/libqueue_test.res
deleted file mode 100644
index d5a33be..0000000
--- a/jscomp/test/libqueue_test.res
+++ /dev/null
@@ -1,203 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Jeremie Dimino, Jane Street Europe */
-/*  */
-/* Copyright 2015 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
-/*  */
-/* ********************************************************************* */
-
-module Q = {
-  include Queue
-
-  let to_list = q => fold((l, x) => list{x, ...l}, list{}, q) |> List.rev
-}
-
-let does_raise = (f, q) =>
-  try {
-    ignore((f(q): int))
-    false
-  } catch {
-  | Q.Empty => true
-  }
-
-let () = {
-  let q = Q.create()
-  ()
-  assert(Q.to_list(q) == list{} && Q.length(q) == 0)
-  Q.add(1, q)
-  assert(Q.to_list(q) == list{1} && Q.length(q) == 1)
-  Q.add(2, q)
-  assert(Q.to_list(q) == list{1, 2} && Q.length(q) == 2)
-  Q.add(3, q)
-  assert(Q.to_list(q) == list{1, 2, 3} && Q.length(q) == 3)
-  Q.add(4, q)
-  assert(Q.to_list(q) == list{1, 2, 3, 4} && Q.length(q) == 4)
-  assert(Q.take(q) == 1)
-  assert(Q.to_list(q) == list{2, 3, 4} && Q.length(q) == 3)
-  assert(Q.take(q) == 2)
-  assert(Q.to_list(q) == list{3, 4} && Q.length(q) == 2)
-  assert(Q.take(q) == 3)
-  assert(Q.to_list(q) == list{4} && Q.length(q) == 1)
-  assert(Q.take(q) == 4)
-  assert(Q.to_list(q) == list{} && Q.length(q) == 0)
-  assert(does_raise(Q.take, q))
-}
-
-let () = {
-  let q = Q.create()
-  Q.add(1, q)
-  assert(Q.take(q) == 1)
-  assert(does_raise(Q.take, q))
-  Q.add(2, q)
-  assert(Q.take(q) == 2)
-  assert(does_raise(Q.take, q))
-  assert(Q.length(q) == 0)
-}
-
-let () = {
-  let q = Q.create()
-  Q.add(1, q)
-  assert(Q.peek(q) == 1)
-  Q.add(2, q)
-  assert(Q.peek(q) == 1)
-  Q.add(3, q)
-  assert(Q.peek(q) == 1)
-  assert(Q.peek(q) == 1)
-  assert(Q.take(q) == 1)
-  assert(Q.peek(q) == 2)
-  assert(Q.take(q) == 2)
-  assert(Q.peek(q) == 3)
-  assert(Q.take(q) == 3)
-  assert(does_raise(Q.peek, q))
-  assert(does_raise(Q.peek, q))
-}
-
-let () = {
-  let q = Q.create()
-  for i in 1 to 10 {
-    Q.add(i, q)
-  }
-  Q.clear(q)
-  assert(Q.length(q) == 0)
-  assert(does_raise(Q.take, q))
-  assert(q == Q.create())
-  Q.add(42, q)
-  assert(Q.take(q) == 42)
-}
-
-let () = {
-  let q1 = Q.create()
-  for i in 1 to 10 {
-    Q.add(i, q1)
-  }
-  let q2 = Q.copy(q1)
-  assert(Q.to_list(q1) == list{1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-  assert(Q.to_list(q2) == list{1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-  assert(Q.length(q1) == 10)
-  assert(Q.length(q2) == 10)
-  for i in 1 to 10 {
-    assert(Q.take(q1) == i)
-  }
-  for i in 1 to 10 {
-    assert(Q.take(q2) == i)
-  }
-}
-
-let () = {
-  let q = Q.create()
-  assert(Q.is_empty(q))
-  for i in 1 to 10 {
-    Q.add(i, q)
-    assert(Q.length(q) == i)
-    assert(!Q.is_empty(q))
-  }
-  for i in 10 downto 1 {
-    assert(Q.length(q) == i)
-    assert(!Q.is_empty(q))
-    ignore((Q.take(q): int))
-  }
-  assert(Q.length(q) == 0)
-  assert(Q.is_empty(q))
-}
-
-let () = {
-  let q = Q.create()
-  for i in 1 to 10 {
-    Q.add(i, q)
-  }
-  let i = ref(1)
-  Q.iter(j => {
-    assert(i.contents == j)
-    incr(i)
-  }, q)
-}
-
-let () = {
-  let q1 = Q.create() and q2 = Q.create()
-  assert(Q.length(q1) == 0)
-  assert(Q.to_list(q1) == list{})
-  assert(Q.length(q2) == 0)
-  assert(Q.to_list(q2) == list{})
-  Q.transfer(q1, q2)
-  assert(Q.length(q1) == 0)
-  assert(Q.to_list(q1) == list{})
-  assert(Q.length(q2) == 0)
-  assert(Q.to_list(q2) == list{})
-}
-
-let () = {
-  let q1 = Q.create() and q2 = Q.create()
-  for i in 1 to 4 {
-    Q.add(i, q1)
-  }
-  assert(Q.length(q1) == 4)
-  assert(Q.to_list(q1) == list{1, 2, 3, 4})
-  assert(Q.length(q2) == 0)
-  assert(Q.to_list(q2) == list{})
-  Q.transfer(q1, q2)
-  assert(Q.length(q1) == 0)
-  assert(Q.to_list(q1) == list{})
-  assert(Q.length(q2) == 4)
-  assert(Q.to_list(q2) == list{1, 2, 3, 4})
-}
-
-let () = {
-  let q1 = Q.create() and q2 = Q.create()
-  for i in 5 to 8 {
-    Q.add(i, q2)
-  }
-  assert(Q.length(q1) == 0)
-  assert(Q.to_list(q1) == list{})
-  assert(Q.length(q2) == 4)
-  assert(Q.to_list(q2) == list{5, 6, 7, 8})
-  Q.transfer(q1, q2)
-  assert(Q.length(q1) == 0)
-  assert(Q.to_list(q1) == list{})
-  assert(Q.length(q2) == 4)
-  assert(Q.to_list(q2) == list{5, 6, 7, 8})
-}
-
-let () = {
-  let q1 = Q.create() and q2 = Q.create()
-  for i in 1 to 4 {
-    Q.add(i, q1)
-  }
-  for i in 5 to 8 {
-    Q.add(i, q2)
-  }
-  assert(Q.length(q1) == 4)
-  assert(Q.to_list(q1) == list{1, 2, 3, 4})
-  assert(Q.length(q2) == 4)
-  assert(Q.to_list(q2) == list{5, 6, 7, 8})
-  Q.transfer(q1, q2)
-  assert(Q.length(q1) == 0)
-  assert(Q.to_list(q1) == list{})
-  assert(Q.length(q2) == 8)
-  assert(Q.to_list(q2) == list{5, 6, 7, 8, 1, 2, 3, 4})
-}
-
-let () = print_endline("OK")
diff --git a/jscomp/test/limits_test.js b/jscomp/test/limits_test.js
deleted file mode 100644
index 03028f4..0000000
--- a/jscomp/test/limits_test.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Int32 = require("../../lib/js/int32.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-eq("File \"limits_test.res\", line 10, characters 5-12", Pervasives.max_int, 2147483647);
-
-eq("File \"limits_test.res\", line 11, characters 5-12", Pervasives.min_int, -2147483648);
-
-eq("File \"limits_test.res\", line 12, characters 5-12", Int32.max_int, 2147483647);
-
-eq("File \"limits_test.res\", line 13, characters 5-12", Int32.min_int, -2147483648);
-
-Mt.from_pair_suites("Limits_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/limits_test.res b/jscomp/test/limits_test.res
deleted file mode 100644
index 5297c0a..0000000
--- a/jscomp/test/limits_test.res
+++ /dev/null
@@ -1,16 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let () = {
-  eq(__LOC__, max_int, %raw("2147483647"))
-  eq(__LOC__, min_int, %raw("-2147483648"))
-  eq(__LOC__, Int32.max_int, %raw("2147483647"))
-  eq(__LOC__, Int32.min_int, %raw("-2147483648"))
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/lint.sh b/jscomp/test/lint.sh
deleted file mode 100755
index b128665..0000000
--- a/jscomp/test/lint.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e 
-eslint -f unix . > ./err.compile
diff --git a/jscomp/test/list_stack.js b/jscomp/test/list_stack.js
deleted file mode 100644
index 84fc2df..0000000
--- a/jscomp/test/list_stack.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-
-List.find((function (x) {
-        return x > 3;
-      }), /* [] */0);
-
-/*  Not a pure module */
diff --git a/jscomp/test/list_stack.res b/jscomp/test/list_stack.res
deleted file mode 100644
index 483e4b0..0000000
--- a/jscomp/test/list_stack.res
+++ /dev/null
@@ -1 +0,0 @@
-List.find(x => x > 3, list{})->ignore
diff --git a/jscomp/test/list_test.js b/jscomp/test/list_test.js
deleted file mode 100644
index eda351f..0000000
--- a/jscomp/test/list_test.js
+++ /dev/null
@@ -1,182 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-
-var list_suites_0 = [
-  "length",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: 1,
-              _1: List.length({
-                    hd: [
-                      0,
-                      1,
-                      2,
-                      3,
-                      4
-                    ],
-                    tl: /* [] */0
-                  })
-            };
-    })
-];
-
-var list_suites_1 = {
-  hd: [
-    "length2",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: 5,
-                _1: List.length({
-                      hd: 0,
-                      tl: {
-                        hd: 1,
-                        tl: {
-                          hd: 2,
-                          tl: {
-                            hd: 3,
-                            tl: {
-                              hd: 4,
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      }
-                    })
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "long_length",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: 30000,
-                  _1: List.length($$Array.to_list($$Array.init(30000, (function (param) {
-                                  return 0;
-                                }))))
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "sort",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: List.sort(Caml.int_compare, {
-                          hd: 4,
-                          tl: {
-                            hd: 1,
-                            tl: {
-                              hd: 2,
-                              tl: {
-                                hd: 3,
-                                tl: /* [] */0
-                              }
-                            }
-                          }
-                        }),
-                    _1: {
-                      hd: 1,
-                      tl: {
-                        hd: 2,
-                        tl: {
-                          hd: 3,
-                          tl: {
-                            hd: 4,
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    }
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "File \"list_test.res\", line 20, characters 5-12",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: List.mem(3, {
-                            hd: 1,
-                            tl: {
-                              hd: 2,
-                              tl: {
-                                hd: 3,
-                                tl: /* [] */0
-                              }
-                            }
-                          })
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "File \"list_test.res\", line 21, characters 5-12",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: false,
-                        _1: List.mem(4, {
-                              hd: 1,
-                              tl: {
-                                hd: 2,
-                                tl: {
-                                  hd: 3,
-                                  tl: /* [] */0
-                                }
-                              }
-                            })
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "File \"list_test.res\", line 22, characters 5-12",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: 9,
-                          _1: List.assoc(4, {
-                                hd: [
-                                  1,
-                                  2
-                                ],
-                                tl: {
-                                  hd: [
-                                    4,
-                                    9
-                                  ],
-                                  tl: /* [] */0
-                                }
-                              })
-                        };
-                })
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    }
-  }
-};
-
-var list_suites = {
-  hd: list_suites_0,
-  tl: list_suites_1
-};
-
-Mt.from_pair_suites("List_test", list_suites);
-
-exports.list_suites = list_suites;
-/*  Not a pure module */
diff --git a/jscomp/test/list_test.res b/jscomp/test/list_test.res
deleted file mode 100644
index 1febc64..0000000
--- a/jscomp/test/list_test.res
+++ /dev/null
@@ -1,26 +0,0 @@
-let list_suites = {
-  open Mt
-  list{
-    ("length", _ => Eq(1, List.length(list{(0, 1, 2, 3, 4)})) /* This is tuple haha */),
-    ("length2", _ => Eq(5, List.length(list{0, 1, 2, 3, 4})) /* This is tuple haha */),
-    (
-      "long_length",
-      _ => {
-        let v = 30_000
-        Eq(v, List.length(Array.to_list(Array.init(v, _ => 0))))
-      },
-    ),
-    (
-      "sort",
-      _ => Eq(
-        List.sort((x: int, y) => Pervasives.compare(x, y), list{4, 1, 2, 3}),
-        list{1, 2, 3, 4},
-      ),
-    ),
-    (__LOC__, _ => Eq(true, List.mem(3, list{1, 2, 3}))),
-    (__LOC__, _ => Eq(false, List.mem(4, list{1, 2, 3}))),
-    (__LOC__, _ => Eq(9, List.assoc(4, list{(1, 2), (4, 9)}))),
-  }
-}
-
-let () = Mt.from_pair_suites(__MODULE__, list_suites)
diff --git a/jscomp/test/local_exception_test.js b/jscomp/test/local_exception_test.js
deleted file mode 100644
index 925c518..0000000
--- a/jscomp/test/local_exception_test.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var A = /* @__PURE__ */Caml_exceptions.create("Local_exception_test.A");
-
-var v = {
-  RE_EXN_ID: A,
-  _1: 3,
-  _2: true
-};
-
-var B = /* @__PURE__ */Caml_exceptions.create("Local_exception_test.B");
-
-var u = {
-  RE_EXN_ID: B
-};
-
-var D = /* @__PURE__ */Caml_exceptions.create("Local_exception_test.D");
-
-var d = {
-  RE_EXN_ID: D,
-  _1: 3
-};
-
-exports.A = A;
-exports.v = v;
-exports.B = B;
-exports.u = u;
-exports.D = D;
-exports.d = d;
-/* No side effect */
diff --git a/jscomp/test/local_exception_test.res b/jscomp/test/local_exception_test.res
deleted file mode 100644
index 3fc06d8..0000000
--- a/jscomp/test/local_exception_test.res
+++ /dev/null
@@ -1,15 +0,0 @@
-exception A(int, bool)
-
-let v = A(3, true)
-
-exception B
-
-let u = B
-
-exception D(int)
-
-let d = D(3)
-/* Not allowed */
-
-/* intentionally overridden ,
- so that we can not tell the differrence, only by [id] */
diff --git a/jscomp/test/loop_regression_test.js b/jscomp/test/loop_regression_test.js
deleted file mode 100644
index 4cee928..0000000
--- a/jscomp/test/loop_regression_test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-function f(param) {
-  var v = {
-    contents: 0
-  };
-  var acc = {
-    contents: 0
-  };
-  var n = 10;
-  while(true) {
-    if (v.contents > n) {
-      return acc.contents;
-    }
-    acc.contents = acc.contents + v.contents | 0;
-    v.contents = v.contents + 1 | 0;
-    continue ;
-  };
-}
-
-var suites_0 = [
-  "sum",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: 55,
-              _1: f()
-            };
-    })
-];
-
-var suites = {
-  hd: suites_0,
-  tl: /* [] */0
-};
-
-Mt.from_pair_suites("Loop_regression_test", suites);
-
-exports.f = f;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/loop_regression_test.res b/jscomp/test/loop_regression_test.res
deleted file mode 100644
index ec5ec72..0000000
--- a/jscomp/test/loop_regression_test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let f = () => {
-  let v = ref(0)
-  let acc = ref(0)
-
-  let rec loop = (n): int =>
-    if v.contents > n {
-      acc.contents
-    } else {
-      acc := acc.contents + v.contents
-      incr(v)
-      loop(n)
-    }
-  loop(10)
-}
-
-let suites = {
-  open Mt
-  list{("sum", _ => Eq(55, f()))}
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/loop_suites_test.js b/jscomp/test/loop_suites_test.js
deleted file mode 100644
index b3d046c..0000000
--- a/jscomp/test/loop_suites_test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var For_loop_test = require("./for_loop_test.js");
-
-Mt.from_pair_suites("for_loop_test", For_loop_test.suites);
-
-/*  Not a pure module */
diff --git a/jscomp/test/loop_suites_test.res b/jscomp/test/loop_suites_test.res
deleted file mode 100644
index 04e52dc..0000000
--- a/jscomp/test/loop_suites_test.res
+++ /dev/null
@@ -1 +0,0 @@
-Mt.from_pair_suites("for_loop_test", For_loop_test.suites)
diff --git a/jscomp/test/map_find_test.js b/jscomp/test/map_find_test.js
deleted file mode 100644
index 3c7f673..0000000
--- a/jscomp/test/map_find_test.js
+++ /dev/null
@@ -1,386 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = add(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function find(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml.int_compare(x, param.v);
-    if (c === 0) {
-      return param.d;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-var m = List.fold_left((function (acc, param) {
-        return add(param[0], param[1], acc);
-      }), "Empty", {
-      hd: [
-        10,
-        /* 'a' */97
-      ],
-      tl: {
-        hd: [
-          3,
-          /* 'b' */98
-        ],
-        tl: {
-          hd: [
-            7,
-            /* 'c' */99
-          ],
-          tl: {
-            hd: [
-              20,
-              /* 'd' */100
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-function height$1(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create$1(l, x, d, r) {
-  var hl = height$1(l);
-  var hr = height$1(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal$1(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height$1(ll) >= height$1(lr)) {
-      return create$1(ll, lv, ld, create$1(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create$1(create$1(ll, lv, ld, lr.l), lr.v, lr.d, create$1(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height$1(rr) >= height$1(rl)) {
-    return create$1(create$1(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create$1(create$1(l, x, d, rl.l), rl.v, rl.d, create$1(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function add$1(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add$1(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal$1(ll, v, d, r);
-    }
-  }
-  var rr = add$1(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal$1(l, v, d, rr);
-  }
-}
-
-function find$1(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml.string_compare(x, param.v);
-    if (c === 0) {
-      return param.d;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-var s = List.fold_left((function (acc, param) {
-        return add$1(param[0], param[1], acc);
-      }), "Empty", {
-      hd: [
-        "10",
-        /* 'a' */97
-      ],
-      tl: {
-        hd: [
-          "3",
-          /* 'b' */98
-        ],
-        tl: {
-          hd: [
-            "7",
-            /* 'c' */99
-          ],
-          tl: {
-            hd: [
-              "20",
-              /* 'd' */100
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-Mt.from_pair_suites("Map_find_test", {
-      hd: [
-        "int",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: find(10, m),
-                    _1: /* 'a' */97
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "string",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: find$1("10", s),
-                      _1: /* 'a' */97
-                    };
-            })
-        ],
-        tl: /* [] */0
-      }
-    });
-
-/* m Not a pure module */
diff --git a/jscomp/test/map_find_test.res b/jscomp/test/map_find_test.res
deleted file mode 100644
index 64a946d..0000000
--- a/jscomp/test/map_find_test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-include (
-  {
-    module IntMap = Map.Make({
-      type t = int
-      let compare = (x: t, y) => compare(x, y)
-    })
-
-    let empty = IntMap.empty
-
-    let m = List.fold_left(
-      (acc, (k, v)) => IntMap.add(k, v, acc),
-      empty,
-      list{(10, 'a'), (3, 'b'), (7, 'c'), (20, 'd')},
-    )
-
-    module SMap = Map.Make({
-      type t = string
-      let compare = (x: t, y) => compare(x, y)
-    })
-
-    let s = List.fold_left(
-      (acc, (k, v)) => SMap.add(k, v, acc),
-      SMap.empty,
-      list{("10", 'a'), ("3", 'b'), ("7", 'c'), ("20", 'd')},
-    )
-    @val("console.log") external log: 'a => unit = ""
-
-    \"@@"(
-      Mt.from_pair_suites(__MODULE__),
-      list{("int", _ => Eq(IntMap.find(10, m), 'a')), ("string", _ => Eq(SMap.find("10", s), 'a'))},
-    )
-  }: {}
-)
diff --git a/jscomp/test/map_test.js b/jscomp/test/map_test.js
deleted file mode 100644
index 8b6e659..0000000
--- a/jscomp/test/map_test.js
+++ /dev/null
@@ -1,542 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = add(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function cons_enum(_m, _e) {
-  while(true) {
-    var e = _e;
-    var m = _m;
-    if (typeof m !== "object") {
-      return e;
-    }
-    _e = {
-      TAG: "More",
-      _0: m.v,
-      _1: m.d,
-      _2: m.r,
-      _3: e
-    };
-    _m = m.l;
-    continue ;
-  };
-}
-
-function compare(cmp, m1, m2) {
-  var _e1 = cons_enum(m1, "End");
-  var _e2 = cons_enum(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return 0;
-      } else {
-        return -1;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return 1;
-    }
-    var c = Caml.int_compare(e1._0, e2._0);
-    if (c !== 0) {
-      return c;
-    }
-    var c$1 = Curry._2(cmp, e1._1, e2._1);
-    if (c$1 !== 0) {
-      return c$1;
-    }
-    _e2 = cons_enum(e2._2, e2._3);
-    _e1 = cons_enum(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function equal(cmp, m1, m2) {
-  var _e1 = cons_enum(m1, "End");
-  var _e2 = cons_enum(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return true;
-      } else {
-        return false;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return false;
-    }
-    if (e1._0 !== e2._0) {
-      return false;
-    }
-    if (!Curry._2(cmp, e1._1, e2._1)) {
-      return false;
-    }
-    _e2 = cons_enum(e2._2, e2._3);
-    _e1 = cons_enum(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function cardinal(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0;
-  }
-}
-
-function height$1(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create$1(l, x, d, r) {
-  var hl = height$1(l);
-  var hr = height$1(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal$1(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height$1(ll) >= height$1(lr)) {
-      return create$1(ll, lv, ld, create$1(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create$1(create$1(ll, lv, ld, lr.l), lr.v, lr.d, create$1(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height$1(rr) >= height$1(rl)) {
-    return create$1(create$1(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create$1(create$1(l, x, d, rl.l), rl.v, rl.d, create$1(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function add$1(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add$1(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal$1(ll, v, d, r);
-    }
-  }
-  var rr = add$1(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal$1(l, v, d, rr);
-  }
-}
-
-function find(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml.string_compare(x, param.v);
-    if (c === 0) {
-      return param.d;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function of_list(kvs) {
-  return List.fold_left((function (acc, param) {
-                return add(param[0], param[1], acc);
-              }), "Empty", kvs);
-}
-
-var int_map_suites_0 = [
-  "add",
-  (function (param) {
-      var v = of_list({
-            hd: [
-              1,
-              /* '1' */49
-            ],
-            tl: {
-              hd: [
-                2,
-                /* '3' */51
-              ],
-              tl: {
-                hd: [
-                  3,
-                  /* '4' */52
-                ],
-                tl: /* [] */0
-              }
-            }
-          });
-      return {
-              TAG: "Eq",
-              _0: cardinal(v),
-              _1: 3
-            };
-    })
-];
-
-var int_map_suites_1 = {
-  hd: [
-    "equal",
-    (function (param) {
-        var v = of_list({
-              hd: [
-                1,
-                /* '1' */49
-              ],
-              tl: {
-                hd: [
-                  2,
-                  /* '3' */51
-                ],
-                tl: {
-                  hd: [
-                    3,
-                    /* '4' */52
-                  ],
-                  tl: /* [] */0
-                }
-              }
-            });
-        var u = of_list({
-              hd: [
-                2,
-                /* '3' */51
-              ],
-              tl: {
-                hd: [
-                  3,
-                  /* '4' */52
-                ],
-                tl: {
-                  hd: [
-                    1,
-                    /* '1' */49
-                  ],
-                  tl: /* [] */0
-                }
-              }
-            });
-        return {
-                TAG: "Eq",
-                _0: compare(Caml.int_compare, u, v),
-                _1: 0
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "equal2",
-      (function (param) {
-          var v = of_list({
-                hd: [
-                  1,
-                  /* '1' */49
-                ],
-                tl: {
-                  hd: [
-                    2,
-                    /* '3' */51
-                  ],
-                  tl: {
-                    hd: [
-                      3,
-                      /* '4' */52
-                    ],
-                    tl: /* [] */0
-                  }
-                }
-              });
-          var u = of_list({
-                hd: [
-                  2,
-                  /* '3' */51
-                ],
-                tl: {
-                  hd: [
-                    3,
-                    /* '4' */52
-                  ],
-                  tl: {
-                    hd: [
-                      1,
-                      /* '1' */49
-                    ],
-                    tl: /* [] */0
-                  }
-                }
-              });
-          return {
-                  TAG: "Eq",
-                  _0: true,
-                  _1: equal((function (x, y) {
-                          return x === y;
-                        }), u, v)
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "iteration",
-        (function (param) {
-            var m = "Empty";
-            for(var i = 0; i <= 10000; ++i){
-              m = add$1(String(i), String(i), m);
-            }
-            var v = -1;
-            for(var i$1 = 0; i$1 <= 10000; ++i$1){
-              if (find(String(i$1), m) !== String(i$1)) {
-                v = i$1;
-              }
-              
-            }
-            return {
-                    TAG: "Eq",
-                    _0: v,
-                    _1: -1
-                  };
-          })
-      ],
-      tl: /* [] */0
-    }
-  }
-};
-
-var int_map_suites = {
-  hd: int_map_suites_0,
-  tl: int_map_suites_1
-};
-
-Mt.from_pair_suites("Map_test", int_map_suites);
-
-/*  Not a pure module */
diff --git a/jscomp/test/map_test.res b/jscomp/test/map_test.res
deleted file mode 100644
index ee6d432..0000000
--- a/jscomp/test/map_test.res
+++ /dev/null
@@ -1,57 +0,0 @@
-open Mt
-module Int = {
-  type t = int
-  let compare = (x: int, y: int) => Pervasives.compare(x, y)
-}
-module Int_map = Map.Make(Int)
-module String_map = Map.Make(String)
-
-let of_list = kvs => List.fold_left((acc, (k, v)) => Int_map.add(k, v, acc), Int_map.empty, kvs)
-
-let int_map_suites = {
-  open Mt
-  open Int_map
-  list{
-    (
-      "add",
-      _ => {
-        let v = of_list(list{(1, '1'), (2, '3'), (3, '4')})
-        Eq(cardinal(v), 3)
-      },
-    ),
-    (
-      "equal",
-      _ => {
-        let v = of_list(list{(1, '1'), (2, '3'), (3, '4')})
-        let u = of_list(list{(2, '3'), (3, '4'), (1, '1')})
-        Eq(compare(Pervasives.compare, u, v), 0)
-      },
-    ),
-    (
-      "equal2",
-      _ => {
-        let v = of_list(list{(1, '1'), (2, '3'), (3, '4')})
-        let u = of_list(list{(2, '3'), (3, '4'), (1, '1')})
-        Eq(true, equal((x, y) => x == y, u, v))
-      },
-    ),
-    (
-      "iteration",
-      _ => {
-        let m = ref(String_map.empty)
-        let count = 1_0000
-        for i in 0 to count {
-          m := String_map.add(string_of_int(i), string_of_int(i), m.contents)
-        }
-        let v = ref(-1)
-        for i in 0 to count {
-          if String_map.find(string_of_int(i), m.contents) !== string_of_int(i) {
-            v := i
-          }
-        }
-        Eq(v.contents, -1)
-      },
-    ),
-  }
-}
-Mt.from_pair_suites(__MODULE__, int_map_suites)
diff --git a/jscomp/test/map_test.resi b/jscomp/test/map_test.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/map_test.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/mario_game.js b/jscomp/test/mario_game.js
deleted file mode 100644
index 6983adb..0000000
--- a/jscomp/test/mario_game.js
+++ /dev/null
@@ -1,3394 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var Random = require("../../lib/js/random.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_int32 = require("../../lib/js/caml_int32.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var Actors = {};
-
-var Dom_html = {};
-
-function setup_sprite(loopOpt, bbox_offsetOpt, bbox_sizeOpt, img_src, max_frames, max_ticks, frame_size, src_offset) {
-  var loop = loopOpt !== undefined ? loopOpt : true;
-  var bbox_offset = bbox_offsetOpt !== undefined ? bbox_offsetOpt : [
-      0,
-      0
-    ];
-  var bbox_size = bbox_sizeOpt !== undefined ? bbox_sizeOpt : [
-      0,
-      0
-    ];
-  var bbox_size$1 = Caml_obj.equal(bbox_size, [
-        0,
-        0
-      ]) ? frame_size : bbox_size;
-  var img_src$1 = "./sprites/" + img_src;
-  return {
-          max_frames: max_frames,
-          max_ticks: max_ticks,
-          img_src: img_src$1,
-          frame_size: frame_size,
-          src_offset: src_offset,
-          bbox_offset: bbox_offset,
-          bbox_size: bbox_size$1,
-          loop: loop
-        };
-}
-
-function make_enemy(param) {
-  var dir = param[1];
-  switch (param[0]) {
-    case "Goomba" :
-        return setup_sprite(undefined, [
-                    1,
-                    1
-                  ], [
-                    14,
-                    14
-                  ], "enemies.png", 2, 10, [
-                    16,
-                    16
-                  ], [
-                    0,
-                    128
-                  ]);
-    case "GKoopa" :
-        if (dir === "Left") {
-          return setup_sprite(undefined, [
-                      4,
-                      10
-                    ], [
-                      11,
-                      16
-                    ], "enemies.png", 2, 10, [
-                      16,
-                      27
-                    ], [
-                      0,
-                      69
-                    ]);
-        } else {
-          return setup_sprite(undefined, [
-                      1,
-                      10
-                    ], [
-                      11,
-                      16
-                    ], "enemies.png", 2, 10, [
-                      16,
-                      27
-                    ], [
-                      32,
-                      69
-                    ]);
-        }
-    case "RKoopa" :
-        if (dir === "Left") {
-          return setup_sprite(undefined, [
-                      4,
-                      10
-                    ], [
-                      11,
-                      16
-                    ], "enemies.png", 2, 10, [
-                      16,
-                      27
-                    ], [
-                      0,
-                      5
-                    ]);
-        } else {
-          return setup_sprite(undefined, [
-                      1,
-                      10
-                    ], [
-                      11,
-                      16
-                    ], "enemies.png", 2, 10, [
-                      16,
-                      27
-                    ], [
-                      32,
-                      5
-                    ]);
-        }
-    case "GKoopaShell" :
-        return setup_sprite(undefined, [
-                    2,
-                    2
-                  ], [
-                    12,
-                    13
-                  ], "enemies.png", 4, 10, [
-                    16,
-                    16
-                  ], [
-                    0,
-                    96
-                  ]);
-    case "RKoopaShell" :
-        return setup_sprite(undefined, [
-                    2,
-                    2
-                  ], [
-                    12,
-                    13
-                  ], "enemies.png", 4, 10, [
-                    16,
-                    16
-                  ], [
-                    0,
-                    32
-                  ]);
-    
-  }
-}
-
-function make_particle(x) {
-  switch (x) {
-    case "GoombaSquish" :
-        return setup_sprite(undefined, undefined, undefined, "enemies.png", 1, 0, [
-                    16,
-                    16
-                  ], [
-                    0,
-                    144
-                  ]);
-    case "BrickChunkL" :
-        return setup_sprite(undefined, undefined, undefined, "chunks.png", 1, 0, [
-                    8,
-                    8
-                  ], [
-                    0,
-                    0
-                  ]);
-    case "BrickChunkR" :
-        return setup_sprite(undefined, undefined, undefined, "chunks.png", 1, 0, [
-                    8,
-                    8
-                  ], [
-                    8,
-                    0
-                  ]);
-    case "Score100" :
-        return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    8
-                  ], [
-                    0,
-                    0
-                  ]);
-    case "Score200" :
-        return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    9
-                  ], [
-                    0,
-                    9
-                  ]);
-    case "Score400" :
-        return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    9
-                  ], [
-                    0,
-                    18
-                  ]);
-    case "Score800" :
-        return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    12,
-                    9
-                  ], [
-                    0,
-                    27
-                  ]);
-    case "Score1000" :
-        return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    0
-                  ]);
-    case "Score2000" :
-        return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    9
-                  ]);
-    case "Score4000" :
-        return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    18
-                  ]);
-    case "Score8000" :
-        return setup_sprite(undefined, undefined, undefined, "score.png", 1, 0, [
-                    14,
-                    9
-                  ], [
-                    13,
-                    27
-                  ]);
-    
-  }
-}
-
-function make_type(typ, dir) {
-  switch (typ.TAG) {
-    case "SPlayer" :
-        var pt = typ._0;
-        var spr_type = [
-          typ._1,
-          dir
-        ];
-        if (pt === "BigM") {
-          var typ$1 = spr_type[0];
-          if (spr_type[1] === "Left") {
-            switch (typ$1) {
-              case "Standing" :
-                  return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              13,
-                              25
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              27
-                            ], [
-                              16,
-                              5
-                            ]);
-              case "Jumping" :
-                  return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              12,
-                              25
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              26
-                            ], [
-                              48,
-                              6
-                            ]);
-              case "Running" :
-                  return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              13,
-                              25
-                            ], "mario-big.png", 4, 10, [
-                              16,
-                              27
-                            ], [
-                              0,
-                              37
-                            ]);
-              case "Crouching" :
-                  return setup_sprite(undefined, [
-                              2,
-                              10
-                            ], [
-                              13,
-                              17
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              27
-                            ], [
-                              32,
-                              5
-                            ]);
-              
-            }
-          } else {
-            switch (typ$1) {
-              case "Standing" :
-                  return setup_sprite(undefined, [
-                              1,
-                              1
-                            ], [
-                              13,
-                              25
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              26
-                            ], [
-                              16,
-                              69
-                            ]);
-              case "Jumping" :
-                  return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              12,
-                              25
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              26
-                            ], [
-                              48,
-                              70
-                            ]);
-              case "Running" :
-                  return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              13,
-                              25
-                            ], "mario-big.png", 4, 10, [
-                              16,
-                              27
-                            ], [
-                              0,
-                              101
-                            ]);
-              case "Crouching" :
-                  return setup_sprite(undefined, [
-                              2,
-                              10
-                            ], [
-                              13,
-                              17
-                            ], "mario-big.png", 1, 0, [
-                              16,
-                              27
-                            ], [
-                              32,
-                              69
-                            ]);
-              
-            }
-          }
-        } else {
-          var typ$2 = spr_type[0];
-          if (spr_type[1] === "Left") {
-            switch (typ$2) {
-              case "Standing" :
-                  return setup_sprite(undefined, [
-                              3,
-                              1
-                            ], [
-                              11,
-                              15
-                            ], "mario-small.png", 1, 0, [
-                              16,
-                              16
-                            ], [
-                              0,
-                              0
-                            ]);
-              case "Jumping" :
-                  return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              13,
-                              15
-                            ], "mario-small.png", 2, 10, [
-                              16,
-                              16
-                            ], [
-                              16,
-                              16
-                            ]);
-              case "Running" :
-                  return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              12,
-                              15
-                            ], "mario-small.png", 3, 5, [
-                              16,
-                              16
-                            ], [
-                              16,
-                              0
-                            ]);
-              case "Crouching" :
-                  return setup_sprite(undefined, [
-                              1,
-                              5
-                            ], [
-                              14,
-                              10
-                            ], "mario-small.png", 1, 0, [
-                              16,
-                              16
-                            ], [
-                              0,
-                              64
-                            ]);
-              
-            }
-          } else {
-            switch (typ$2) {
-              case "Standing" :
-                  return setup_sprite(undefined, [
-                              1,
-                              1
-                            ], [
-                              11,
-                              15
-                            ], "mario-small.png", 1, 0, [
-                              16,
-                              16
-                            ], [
-                              0,
-                              32
-                            ]);
-              case "Jumping" :
-                  return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              13,
-                              15
-                            ], "mario-small.png", 2, 10, [
-                              16,
-                              16
-                            ], [
-                              16,
-                              48
-                            ]);
-              case "Running" :
-                  return setup_sprite(undefined, [
-                              2,
-                              1
-                            ], [
-                              12,
-                              15
-                            ], "mario-small.png", 3, 5, [
-                              16,
-                              16
-                            ], [
-                              16,
-                              32
-                            ]);
-              case "Crouching" :
-                  return setup_sprite(undefined, [
-                              1,
-                              5
-                            ], [
-                              14,
-                              10
-                            ], "mario-small.png", 1, 0, [
-                              16,
-                              16
-                            ], [
-                              0,
-                              64
-                            ]);
-              
-            }
-          }
-        }
-    case "SEnemy" :
-        return make_enemy([
-                    typ._0,
-                    dir
-                  ]);
-    case "SItem" :
-        var x = typ._0;
-        switch (x) {
-          case "Mushroom" :
-              return setup_sprite(undefined, [
-                          2,
-                          0
-                        ], [
-                          12,
-                          16
-                        ], "items.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          0
-                        ]);
-          case "FireFlower" :
-              return setup_sprite(undefined, undefined, undefined, "items.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          188
-                        ]);
-          case "Star" :
-              return setup_sprite(undefined, undefined, undefined, "items.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          16,
-                          48
-                        ]);
-          case "Coin" :
-              return setup_sprite(undefined, [
-                          3,
-                          0
-                        ], [
-                          12,
-                          16
-                        ], "items.png", 3, 15, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          80
-                        ]);
-          
-        }
-    case "SBlock" :
-        var x$1 = typ._0;
-        if (typeof x$1 === "object") {
-          return setup_sprite(undefined, undefined, undefined, "blocks.png", 4, 15, [
-                      16,
-                      16
-                    ], [
-                      0,
-                      16
-                    ]);
-        }
-        switch (x$1) {
-          case "QBlockUsed" :
-              return setup_sprite(undefined, undefined, undefined, "blocks.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          32
-                        ]);
-          case "Brick" :
-              return setup_sprite(undefined, undefined, undefined, "blocks.png", 5, 10, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          0
-                        ]);
-          case "UnBBlock" :
-              return setup_sprite(undefined, undefined, undefined, "blocks.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          48
-                        ]);
-          case "Cloud" :
-              return setup_sprite(undefined, undefined, undefined, "blocks.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          64
-                        ]);
-          case "Panel" :
-              return setup_sprite(undefined, undefined, undefined, "panel.png", 3, 15, [
-                          26,
-                          26
-                        ], [
-                          0,
-                          0
-                        ]);
-          case "Ground" :
-              return setup_sprite(undefined, undefined, undefined, "ground.png", 1, 0, [
-                          16,
-                          16
-                        ], [
-                          0,
-                          32
-                        ]);
-          
-        }
-    
-  }
-}
-
-function make_from_params(params, context) {
-  var img = document.createElement("img");
-  img.src = params.img_src;
-  return {
-          params: params,
-          context: context,
-          frame: {
-            contents: 0
-          },
-          ticks: {
-            contents: 0
-          },
-          img: img
-        };
-}
-
-function make(spawn, dir, context) {
-  var params = make_type(spawn, dir);
-  return make_from_params(params, context);
-}
-
-function make_bgd(context) {
-  var params = setup_sprite(undefined, undefined, undefined, "bgd-1.png", 1, 0, [
-        512,
-        256
-      ], [
-        0,
-        0
-      ]);
-  return make_from_params(params, context);
-}
-
-function make_particle$1(ptyp, context) {
-  var params = make_particle(ptyp);
-  return make_from_params(params, context);
-}
-
-function transform_enemy(enemy_typ, spr, dir) {
-  var params = make_enemy([
-        enemy_typ,
-        dir
-      ]);
-  var img = document.createElement("img");
-  img.src = params.img_src;
-  spr.params = params;
-  spr.img = img;
-}
-
-function update_animation(spr) {
-  var curr_ticks = spr.ticks.contents;
-  if (curr_ticks >= spr.params.max_ticks) {
-    spr.ticks.contents = 0;
-    if (spr.params.loop) {
-      spr.frame.contents = Caml_int32.mod_(spr.frame.contents + 1 | 0, spr.params.max_frames);
-      return ;
-    } else {
-      return ;
-    }
-  } else {
-    spr.ticks.contents = curr_ticks + 1 | 0;
-    return ;
-  }
-}
-
-var Sprite = {
-  setup_sprite: setup_sprite,
-  make: make,
-  make_bgd: make_bgd,
-  make_particle: make_particle$1,
-  transform_enemy: transform_enemy,
-  update_animation: update_animation
-};
-
-function pair_to_xy(pair) {
-  return {
-          x: pair[0],
-          y: pair[1]
-        };
-}
-
-function make_type$1(typ, ctx) {
-  switch (typ) {
-    case "BrickChunkL" :
-    case "BrickChunkR" :
-        return {
-                sprite: make_particle$1(typ, ctx),
-                rot: 0,
-                lifetime: 300
-              };
-    default:
-      return {
-              sprite: make_particle$1(typ, ctx),
-              rot: 0,
-              lifetime: 30
-            };
-  }
-}
-
-function make$1(velOpt, accOpt, part_type, pos, ctx) {
-  var vel = velOpt !== undefined ? velOpt : [
-      0,
-      0
-    ];
-  var acc = accOpt !== undefined ? accOpt : [
-      0,
-      0
-    ];
-  var params = make_type$1(part_type, ctx);
-  var pos$1 = pair_to_xy(pos);
-  var vel$1 = pair_to_xy(vel);
-  var acc$1 = pair_to_xy(acc);
-  return {
-          params: params,
-          part_type: part_type,
-          pos: pos$1,
-          vel: vel$1,
-          acc: acc$1,
-          kill: false,
-          life: params.lifetime
-        };
-}
-
-function make_score(score, pos, ctx) {
-  var t = score >= 801 ? (
-      score >= 2001 ? (
-          score !== 4000 ? (
-              score !== 8000 ? "Score100" : "Score8000"
-            ) : "Score4000"
-        ) : (
-          score !== 1000 ? (
-              score >= 2000 ? "Score2000" : "Score100"
-            ) : "Score1000"
-        )
-    ) : (
-      score >= 201 ? (
-          score !== 400 ? (
-              score >= 800 ? "Score800" : "Score100"
-            ) : "Score400"
-        ) : (
-          score !== 100 && score >= 200 ? "Score200" : "Score100"
-        )
-    );
-  return make$1([
-              0.5,
-              -0.7
-            ], undefined, t, pos, ctx);
-}
-
-function update_vel(part) {
-  part.vel.x = part.vel.x + part.acc.x;
-  part.vel.y = part.vel.y + part.acc.y;
-}
-
-function $$process(part) {
-  part.life = part.life - 1 | 0;
-  if (part.life === 0) {
-    part.kill = true;
-  }
-  update_vel(part);
-  part.pos.x = part.vel.x + part.pos.x;
-  part.pos.y = part.vel.y + part.pos.y;
-}
-
-var Particle = {
-  make: make$1,
-  make_score: make_score,
-  $$process: $$process
-};
-
-var id_counter = {
-  contents: Pervasives.min_int
-};
-
-function setup_obj(has_gravityOpt, speedOpt, param) {
-  var has_gravity = has_gravityOpt !== undefined ? has_gravityOpt : true;
-  var speed = speedOpt !== undefined ? speedOpt : 1;
-  return {
-          has_gravity: has_gravity,
-          speed: speed
-        };
-}
-
-function set_vel_to_speed(obj) {
-  var speed = obj.params.speed;
-  var match = obj.dir;
-  if (match === "Left") {
-    obj.vel.x = - speed;
-  } else {
-    obj.vel.x = speed;
-  }
-}
-
-function make_type$2(x) {
-  switch (x.TAG) {
-    case "SPlayer" :
-        return setup_obj(undefined, 2.8, undefined);
-    case "SEnemy" :
-        var x$1 = x._0;
-        switch (x$1) {
-          case "GKoopaShell" :
-          case "RKoopaShell" :
-              return setup_obj(undefined, 3, undefined);
-          default:
-            return setup_obj(undefined, undefined, undefined);
-        }
-    case "SItem" :
-        var x$2 = x._0;
-        if (x$2 === "Coin") {
-          return setup_obj(false, undefined, undefined);
-        } else {
-          return setup_obj(undefined, undefined, undefined);
-        }
-    case "SBlock" :
-        return setup_obj(false, undefined, undefined);
-    
-  }
-}
-
-function new_id(param) {
-  id_counter.contents = id_counter.contents + 1 | 0;
-  return id_counter.contents;
-}
-
-function make$2($staropt$star, $staropt$star$1, spawnable, context, param) {
-  var id = $staropt$star !== undefined ? Caml_option.valFromOption($staropt$star) : undefined;
-  var dir = $staropt$star$1 !== undefined ? $staropt$star$1 : "Left";
-  var spr = make(spawnable, dir, context);
-  var params = make_type$2(spawnable);
-  var id$1 = id !== undefined ? id : new_id();
-  var obj = {
-    params: params,
-    pos: {
-      x: param[0],
-      y: param[1]
-    },
-    vel: {
-      x: 0.0,
-      y: 0.0
-    },
-    id: id$1,
-    jumping: false,
-    grounded: false,
-    dir: dir,
-    invuln: 0,
-    kill: false,
-    health: 1,
-    crouch: false,
-    score: 0
-  };
-  return [
-          spr,
-          obj
-        ];
-}
-
-function spawn(spawnable, context, param) {
-  var match = make$2(undefined, undefined, spawnable, context, [
-        param[0],
-        param[1]
-      ]);
-  var obj = match[1];
-  var spr = match[0];
-  switch (spawnable.TAG) {
-    case "SPlayer" :
-        return {
-                TAG: "Player",
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
-    case "SEnemy" :
-        set_vel_to_speed(obj);
-        return {
-                TAG: "Enemy",
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
-    case "SItem" :
-        return {
-                TAG: "Item",
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
-    case "SBlock" :
-        return {
-                TAG: "Block",
-                _0: spawnable._0,
-                _1: spr,
-                _2: obj
-              };
-    
-  }
-}
-
-function get_sprite(x) {
-  return x._1;
-}
-
-function get_obj(x) {
-  return x._2;
-}
-
-function is_player(x) {
-  if (x.TAG === "Player") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function is_enemy(x) {
-  if (x.TAG === "Enemy") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function equals(col1, col2) {
-  return col1._2.id === col2._2.id;
-}
-
-function normalize_pos(pos, p1, p2) {
-  var match = p1.bbox_offset;
-  var match$1 = p2.bbox_offset;
-  var match$2 = p1.bbox_size;
-  var match$3 = p2.bbox_size;
-  pos.x = pos.x - (match$3[0] + match$1[0]) + (match$2[0] + match[0]);
-  pos.y = pos.y - (match$3[1] + match$1[1]) + (match$2[1] + match[1]);
-}
-
-function update_player(player, keys, context) {
-  var prev_jumping = player.jumping;
-  var prev_dir = player.dir;
-  var prev_vx = Math.abs(player.vel.x);
-  List.iter((function (param) {
-          var lr_acc = player.vel.x * 0.2;
-          switch (param) {
-            case "CLeft" :
-                if (!player.crouch) {
-                  if (player.vel.x > - player.params.speed) {
-                    player.vel.x = player.vel.x - (0.4 - lr_acc);
-                  }
-                  player.dir = "Left";
-                  return ;
-                } else {
-                  return ;
-                }
-            case "CRight" :
-                if (!player.crouch) {
-                  if (player.vel.x < player.params.speed) {
-                    player.vel.x = player.vel.x + (0.4 + lr_acc);
-                  }
-                  player.dir = "Right";
-                  return ;
-                } else {
-                  return ;
-                }
-            case "CUp" :
-                if (!player.jumping && player.grounded) {
-                  player.jumping = true;
-                  player.grounded = false;
-                  player.vel.y = Caml.float_max(player.vel.y - (5.7 + Math.abs(player.vel.x) * 0.25), -6);
-                  return ;
-                } else {
-                  return ;
-                }
-            case "CDown" :
-                if (!player.jumping && player.grounded) {
-                  player.crouch = true;
-                  return ;
-                } else {
-                  return ;
-                }
-            
-          }
-        }), keys);
-  var v = player.vel.x * 0.9;
-  var vel_damped = Math.abs(v) < 0.1 ? 0 : v;
-  player.vel.x = vel_damped;
-  var pl_typ = player.health <= 1 ? "SmallM" : "BigM";
-  if (!prev_jumping && player.jumping) {
-    return [
-            pl_typ,
-            make({
-                  TAG: "SPlayer",
-                  _0: pl_typ,
-                  _1: "Jumping"
-                }, player.dir, context)
-          ];
-  } else if (prev_dir !== player.dir || prev_vx === 0 && Math.abs(player.vel.x) > 0 && !player.jumping) {
-    return [
-            pl_typ,
-            make({
-                  TAG: "SPlayer",
-                  _0: pl_typ,
-                  _1: "Running"
-                }, player.dir, context)
-          ];
-  } else if (prev_dir !== player.dir && player.jumping && prev_jumping) {
-    return [
-            pl_typ,
-            make({
-                  TAG: "SPlayer",
-                  _0: pl_typ,
-                  _1: "Jumping"
-                }, player.dir, context)
-          ];
-  } else if (player.vel.y === 0 && player.crouch) {
-    return [
-            pl_typ,
-            make({
-                  TAG: "SPlayer",
-                  _0: pl_typ,
-                  _1: "Crouching"
-                }, player.dir, context)
-          ];
-  } else if (player.vel.y === 0 && player.vel.x === 0) {
-    return [
-            pl_typ,
-            make({
-                  TAG: "SPlayer",
-                  _0: pl_typ,
-                  _1: "Standing"
-                }, player.dir, context)
-          ];
-  } else {
-    return ;
-  }
-}
-
-function update_vel$1(obj) {
-  if (obj.grounded) {
-    obj.vel.y = 0;
-    return ;
-  } else if (obj.params.has_gravity) {
-    obj.vel.y = Caml.float_min(obj.vel.y + 0.2 + Math.abs(obj.vel.y) * 0.01, 4.5);
-    return ;
-  } else {
-    return ;
-  }
-}
-
-function update_pos(obj) {
-  obj.pos.x = obj.vel.x + obj.pos.x;
-  if (obj.params.has_gravity) {
-    obj.pos.y = obj.vel.y + obj.pos.y;
-    return ;
-  }
-  
-}
-
-function process_obj(obj, mapy) {
-  update_vel$1(obj);
-  update_pos(obj);
-  if (obj.pos.y > mapy) {
-    obj.kill = true;
-    return ;
-  }
-  
-}
-
-function normalize_origin(pos, spr) {
-  var p = spr.params;
-  var match = p.bbox_offset;
-  var match$1 = p.bbox_size;
-  pos.x = pos.x - match[0];
-  pos.y = pos.y - (match[1] + match$1[1]);
-}
-
-function collide_block(check_xOpt, dir, obj) {
-  var check_x = check_xOpt !== undefined ? check_xOpt : true;
-  switch (dir) {
-    case "North" :
-        obj.vel.y = -0.001;
-        return ;
-    case "South" :
-        obj.vel.y = 0;
-        obj.grounded = true;
-        obj.jumping = false;
-        return ;
-    case "East" :
-    case "West" :
-        break;
-    
-  }
-  if (check_x) {
-    obj.vel.x = 0;
-    return ;
-  }
-  
-}
-
-function opposite_dir(dir) {
-  if (dir === "Left") {
-    return "Right";
-  } else {
-    return "Left";
-  }
-}
-
-function reverse_left_right(obj) {
-  obj.vel.x = - obj.vel.x;
-  obj.dir = opposite_dir(obj.dir);
-}
-
-function evolve_enemy(player_dir, typ, spr, obj, context) {
-  switch (typ) {
-    case "Goomba" :
-        obj.kill = true;
-        return ;
-    case "GKoopa" :
-        var match = make$2(undefined, obj.dir, {
-              TAG: "SEnemy",
-              _0: "GKoopaShell"
-            }, context, [
-              obj.pos.x,
-              obj.pos.y
-            ]);
-        var new_obj = match[1];
-        var new_spr = match[0];
-        normalize_pos(new_obj.pos, spr.params, new_spr.params);
-        return {
-                TAG: "Enemy",
-                _0: "GKoopaShell",
-                _1: new_spr,
-                _2: new_obj
-              };
-    case "RKoopa" :
-        var match$1 = make$2(undefined, obj.dir, {
-              TAG: "SEnemy",
-              _0: "RKoopaShell"
-            }, context, [
-              obj.pos.x,
-              obj.pos.y
-            ]);
-        var new_obj$1 = match$1[1];
-        var new_spr$1 = match$1[0];
-        normalize_pos(new_obj$1.pos, spr.params, new_spr$1.params);
-        return {
-                TAG: "Enemy",
-                _0: "RKoopaShell",
-                _1: new_spr$1,
-                _2: new_obj$1
-              };
-    case "GKoopaShell" :
-    case "RKoopaShell" :
-        break;
-    
-  }
-  obj.dir = player_dir;
-  if (obj.vel.x !== 0) {
-    obj.vel.x = 0;
-  } else {
-    set_vel_to_speed(obj);
-  }
-}
-
-function rev_dir(o, t, s) {
-  reverse_left_right(o);
-  var old_params = s.params;
-  transform_enemy(t, s, o.dir);
-  normalize_pos(o.pos, old_params, s.params);
-}
-
-function dec_health(obj) {
-  var health = obj.health - 1 | 0;
-  if (health === 0) {
-    obj.kill = true;
-    return ;
-  } else if (obj.invuln === 0) {
-    obj.health = health;
-    return ;
-  } else {
-    return ;
-  }
-}
-
-function evolve_block(obj, context) {
-  dec_health(obj);
-  var match = make$2(undefined, undefined, {
-        TAG: "SBlock",
-        _0: "QBlockUsed"
-      }, context, [
-        obj.pos.x,
-        obj.pos.y
-      ]);
-  return {
-          TAG: "Block",
-          _0: "QBlockUsed",
-          _1: match[0],
-          _2: match[1]
-        };
-}
-
-function spawn_above(player_dir, obj, typ, context) {
-  var item = spawn({
-        TAG: "SItem",
-        _0: typ
-      }, context, [
-        obj.pos.x,
-        obj.pos.y
-      ]);
-  var item_obj = item._2;
-  item_obj.pos.y = item_obj.pos.y - item._1.params.frame_size[1];
-  item_obj.dir = opposite_dir(player_dir);
-  set_vel_to_speed(item_obj);
-  return item;
-}
-
-function get_aabb(obj) {
-  var spr = obj._1.params;
-  var obj$1 = obj._2;
-  var match = spr.bbox_offset;
-  var box = obj$1.pos.x + match[0];
-  var boy = obj$1.pos.y + match[1];
-  var match$1 = spr.bbox_size;
-  var sy = match$1[1];
-  var sx = match$1[0];
-  return {
-          center: {
-            x: box + sx / 2,
-            y: boy + sy / 2
-          },
-          half: {
-            x: sx / 2,
-            y: sy / 2
-          }
-        };
-}
-
-function col_bypass(c1, c2) {
-  var o1 = c1._2;
-  var o2 = c2._2;
-  var ctypes;
-  switch (c1.TAG) {
-    case "Player" :
-        ctypes = c2.TAG === "Enemy" ? c1._2.invuln > 0 : false;
-        break;
-    case "Enemy" :
-        ctypes = c2.TAG === "Item" ? true : false;
-        break;
-    case "Item" :
-        switch (c2.TAG) {
-          case "Enemy" :
-          case "Item" :
-              ctypes = true;
-              break;
-          case "Player" :
-          case "Block" :
-              ctypes = false;
-              break;
-          
-        }
-        break;
-    case "Block" :
-        ctypes = false;
-        break;
-    
-  }
-  if (o1.kill || o2.kill) {
-    return true;
-  } else {
-    return ctypes;
-  }
-}
-
-function check_collision(c1, c2) {
-  var b1 = get_aabb(c1);
-  var b2 = get_aabb(c2);
-  var o1 = c1._2;
-  if (col_bypass(c1, c2)) {
-    return ;
-  }
-  var vx = b1.center.x - b2.center.x;
-  var vy = b1.center.y - b2.center.y;
-  var hwidths = b1.half.x + b2.half.x;
-  var hheights = b1.half.y + b2.half.y;
-  if (!(Math.abs(vx) < hwidths && Math.abs(vy) < hheights)) {
-    return ;
-  }
-  var ox = hwidths - Math.abs(vx);
-  var oy = hheights - Math.abs(vy);
-  if (ox >= oy) {
-    if (vy > 0) {
-      o1.pos.y = o1.pos.y + oy;
-      return "North";
-    } else {
-      o1.pos.y = o1.pos.y - oy;
-      return "South";
-    }
-  } else if (vx > 0) {
-    o1.pos.x = o1.pos.x + ox;
-    return "West";
-  } else {
-    o1.pos.x = o1.pos.x - ox;
-    return "East";
-  }
-}
-
-function kill(collid, ctx) {
-  switch (collid.TAG) {
-    case "Player" :
-        return /* [] */0;
-    case "Enemy" :
-        var o = collid._2;
-        var pos_0 = o.pos.x;
-        var pos_1 = o.pos.y;
-        var pos = [
-          pos_0,
-          pos_1
-        ];
-        var score = o.score > 0 ? ({
-              hd: make_score(o.score, pos, ctx),
-              tl: /* [] */0
-            }) : /* [] */0;
-        var remains;
-        remains = collid._0 === "Goomba" ? ({
-              hd: make$1(undefined, undefined, "GoombaSquish", pos, ctx),
-              tl: /* [] */0
-            }) : /* [] */0;
-        return Pervasives.$at(score, remains);
-    case "Item" :
-        var o$1 = collid._2;
-        if (collid._0 === "Mushroom") {
-          return {
-                  hd: make_score(o$1.score, [
-                        o$1.pos.x,
-                        o$1.pos.y
-                      ], ctx),
-                  tl: /* [] */0
-                };
-        } else {
-          return /* [] */0;
-        }
-    case "Block" :
-        var o$2 = collid._2;
-        var tmp = collid._0;
-        if (typeof tmp === "object") {
-          return /* [] */0;
-        }
-        if (tmp !== "Brick") {
-          return /* [] */0;
-        }
-        var pos_0$1 = o$2.pos.x;
-        var pos_1$1 = o$2.pos.y;
-        var pos$1 = [
-          pos_0$1,
-          pos_1$1
-        ];
-        var p1 = make$1([
-              -5,
-              -5
-            ], [
-              0,
-              0.2
-            ], "BrickChunkL", pos$1, ctx);
-        var p2 = make$1([
-              -3,
-              -4
-            ], [
-              0,
-              0.2
-            ], "BrickChunkL", pos$1, ctx);
-        var p3 = make$1([
-              3,
-              -4
-            ], [
-              0,
-              0.2
-            ], "BrickChunkR", pos$1, ctx);
-        var p4 = make$1([
-              5,
-              -5
-            ], [
-              0,
-              0.2
-            ], "BrickChunkR", pos$1, ctx);
-        return {
-                hd: p1,
-                tl: {
-                  hd: p2,
-                  tl: {
-                    hd: p3,
-                    tl: {
-                      hd: p4,
-                      tl: /* [] */0
-                    }
-                  }
-                }
-              };
-    
-  }
-}
-
-var $$Object = {
-  invuln: 60,
-  dampen_jump: 4,
-  get_sprite: get_sprite,
-  get_obj: get_obj,
-  spawn: spawn,
-  equals: equals,
-  is_player: is_player,
-  is_enemy: is_enemy,
-  normalize_origin: normalize_origin,
-  normalize_pos: normalize_pos,
-  kill: kill,
-  process_obj: process_obj,
-  update_player: update_player,
-  check_collision: check_collision,
-  evolve_enemy: evolve_enemy,
-  evolve_block: evolve_block,
-  dec_health: dec_health,
-  rev_dir: rev_dir,
-  reverse_left_right: reverse_left_right,
-  collide_block: collide_block,
-  spawn_above: spawn_above
-};
-
-function render_bbox(sprite, param) {
-  var context = sprite.context;
-  var match = sprite.params.bbox_offset;
-  var match$1 = sprite.params.bbox_size;
-  context.strokeStyle = "#FF0000";
-  return Curry._4(context.strokeRect, param[0] + match[0], param[1] + match[1], match$1[0], match$1[1]);
-}
-
-function render(sprite, param) {
-  var context = sprite.context;
-  var match = sprite.params.src_offset;
-  var match$1 = sprite.params.frame_size;
-  var sw = match$1[0];
-  var match$2 = sprite.params.frame_size;
-  var sx = match[0] + sprite.frame.contents * sw;
-  return Curry.app(context.drawImage, [
-              sprite.img,
-              sx,
-              match[1],
-              sw,
-              match$1[1],
-              param[0],
-              param[1],
-              match$2[0],
-              match$2[1]
-            ]);
-}
-
-function draw_bgd(bgd, off_x) {
-  render(bgd, [
-        - off_x,
-        0
-      ]);
-  return render(bgd, [
-              bgd.params.frame_size[0] - off_x,
-              0
-            ]);
-}
-
-function clear_canvas(canvas) {
-  var context = Curry._1(canvas.getContext, "2d");
-  var cwidth = canvas.width;
-  var cheight = canvas.height;
-  Curry._4(context.clearRect, 0, 0, cwidth, cheight);
-}
-
-function hud(canvas, score, coins) {
-  var score_string = String(score);
-  var coin_string = String(coins);
-  var context = Curry._1(canvas.getContext, "2d");
-  context.font = "10px 'Press Start 2P'";
-  Curry._3(context.fillText, "Score: " + score_string, canvas.width - 140, 18);
-  Curry._3(context.fillText, "Coins: " + coin_string, 120, 18);
-}
-
-function fps(canvas, fps_val) {
-  var fps_str = String(fps_val | 0);
-  var context = Curry._1(canvas.getContext, "2d");
-  Curry._3(context.fillText, fps_str, 10, 18);
-}
-
-function game_win(ctx) {
-  Curry._4(ctx.rect, 0, 0, 512, 512);
-  ctx.fillStyle = "black";
-  Curry._1(ctx.fill, undefined);
-  ctx.fillStyle = "white";
-  ctx.font = "20px 'Press Start 2P'";
-  Curry._3(ctx.fillText, "You win!", 180, 128);
-  throw {
-        RE_EXN_ID: "Failure",
-        _1: "Game over.",
-        Error: new Error()
-      };
-}
-
-function game_loss(ctx) {
-  Curry._4(ctx.rect, 0, 0, 512, 512);
-  ctx.fillStyle = "black";
-  Curry._1(ctx.fill, undefined);
-  ctx.fillStyle = "white";
-  ctx.font = "20px 'Press Start 2P'";
-  Curry._3(ctx.fillText, "GAME OVER. You lose!", 60, 128);
-  throw {
-        RE_EXN_ID: "Failure",
-        _1: "Game over.",
-        Error: new Error()
-      };
-}
-
-var Draw = {
-  render: render,
-  clear_canvas: clear_canvas,
-  draw_bgd: draw_bgd,
-  render_bbox: render_bbox,
-  fps: fps,
-  hud: hud,
-  game_win: game_win,
-  game_loss: game_loss
-};
-
-function make$3(param, param$1) {
-  return {
-          pos: {
-            x: 0,
-            y: 0
-          },
-          v_dim: {
-            x: param[0],
-            y: param[1]
-          },
-          m_dim: {
-            x: param$1[0],
-            y: param$1[1]
-          }
-        };
-}
-
-function calc_viewport_point(cc, vc, mc) {
-  var vc_half = vc / 2;
-  return Caml.float_min(Caml.float_max(cc - vc_half, 0), Caml.float_min(mc - vc, Math.abs(cc - vc_half)));
-}
-
-function in_viewport(v, pos) {
-  var v_min_x = v.pos.x - 32;
-  var v_max_x = v.pos.x + v.v_dim.x;
-  var v_min_y = v.pos.y - 32;
-  var v_max_y = v.pos.y + v.v_dim.y;
-  var x = pos.x;
-  var y = pos.y;
-  if (x >= v_min_x && x <= v_max_x && y >= v_min_y) {
-    return y <= v_max_y;
-  } else {
-    return false;
-  }
-}
-
-function out_of_viewport_below(v, y) {
-  var v_max_y = v.pos.y + v.v_dim.y;
-  return y >= v_max_y;
-}
-
-function coord_to_viewport(viewport, coord) {
-  return {
-          x: coord.x - viewport.pos.x,
-          y: coord.y - viewport.pos.y
-        };
-}
-
-function update(vpt, ctr) {
-  var new_x = calc_viewport_point(ctr.x, vpt.v_dim.x, vpt.m_dim.x);
-  var new_y = calc_viewport_point(ctr.y, vpt.v_dim.y, vpt.m_dim.y);
-  var pos = {
-    x: new_x,
-    y: new_y
-  };
-  return {
-          pos: pos,
-          v_dim: vpt.v_dim,
-          m_dim: vpt.m_dim
-        };
-}
-
-var Viewport = {
-  make: make$3,
-  calc_viewport_point: calc_viewport_point,
-  in_viewport: in_viewport,
-  out_of_viewport_below: out_of_viewport_below,
-  coord_to_viewport: coord_to_viewport,
-  update: update
-};
-
-var pressed_keys = {
-  left: false,
-  right: false,
-  up: false,
-  down: false,
-  bbox: 0
-};
-
-var collid_objs = {
-  contents: /* [] */0
-};
-
-var particles = {
-  contents: /* [] */0
-};
-
-var last_time = {
-  contents: 0
-};
-
-function calc_fps(t0, t1) {
-  var delta = (t1 - t0) / 1000;
-  return 1 / delta;
-}
-
-function update_score(state, i) {
-  state.score = state.score + i | 0;
-}
-
-function process_collision(dir, c1, c2, state) {
-  var context = state.ctx;
-  var exit = 0;
-  var s1;
-  var o1;
-  var typ;
-  var s2;
-  var o2;
-  var s1$1;
-  var o1$1;
-  var t2;
-  var s2$1;
-  var o2$1;
-  var o1$2;
-  var t2$1;
-  var o2$2;
-  switch (c1.TAG) {
-    case "Player" :
-        var o1$3 = c1._2;
-        var s1$2 = c1._1;
-        switch (c2.TAG) {
-          case "Player" :
-              return [
-                      undefined,
-                      undefined
-                    ];
-          case "Enemy" :
-              var o2$3 = c2._2;
-              var s2$2 = c2._1;
-              var typ$1 = c2._0;
-              if (dir === "South") {
-                s1 = s1$2;
-                o1 = o1$3;
-                typ = typ$1;
-                s2 = s2$2;
-                o2 = o2$3;
-                exit = 1;
-              } else {
-                s1$1 = s1$2;
-                o1$1 = o1$3;
-                t2 = typ$1;
-                s2$1 = s2$2;
-                o2$1 = o2$3;
-                exit = 2;
-              }
-              break;
-          case "Item" :
-              o1$2 = o1$3;
-              t2$1 = c2._0;
-              o2$2 = c2._2;
-              exit = 3;
-              break;
-          case "Block" :
-              var o2$4 = c2._2;
-              var t = c2._0;
-              if (dir === "North") {
-                if (typeof t !== "object") {
-                  switch (t) {
-                    case "Brick" :
-                        if (c1._0 === "BigM") {
-                          collide_block(undefined, dir, o1$3);
-                          dec_health(o2$4);
-                          return [
-                                  undefined,
-                                  undefined
-                                ];
-                        } else {
-                          collide_block(undefined, dir, o1$3);
-                          return [
-                                  undefined,
-                                  undefined
-                                ];
-                        }
-                    case "Panel" :
-                        game_win(state.ctx);
-                        return [
-                                undefined,
-                                undefined
-                              ];
-                    default:
-                      collide_block(undefined, dir, o1$3);
-                      return [
-                              undefined,
-                              undefined
-                            ];
-                  }
-                } else {
-                  var updated_block = evolve_block(o2$4, context);
-                  var spawned_item = spawn_above(o1$3.dir, o2$4, t._0, context);
-                  collide_block(undefined, dir, o1$3);
-                  return [
-                          spawned_item,
-                          updated_block
-                        ];
-                }
-              } else {
-                var exit$1 = 0;
-                if (typeof t !== "object") {
-                  if (t === "Panel") {
-                    game_win(state.ctx);
-                    return [
-                            undefined,
-                            undefined
-                          ];
-                  }
-                  exit$1 = 4;
-                } else {
-                  exit$1 = 4;
-                }
-                if (exit$1 === 4) {
-                  if (dir === "South") {
-                    state.multiplier = 1;
-                    collide_block(undefined, dir, o1$3);
-                    return [
-                            undefined,
-                            undefined
-                          ];
-                  }
-                  collide_block(undefined, dir, o1$3);
-                  return [
-                          undefined,
-                          undefined
-                        ];
-                }
-                
-              }
-              break;
-          
-        }
-        break;
-    case "Enemy" :
-        var o1$4 = c1._2;
-        var s1$3 = c1._1;
-        var t1 = c1._0;
-        switch (c2.TAG) {
-          case "Player" :
-              var o1$5 = c2._2;
-              var s1$4 = c2._1;
-              if (dir === "North") {
-                s1 = s1$4;
-                o1 = o1$5;
-                typ = t1;
-                s2 = s1$3;
-                o2 = o1$4;
-                exit = 1;
-              } else {
-                s1$1 = s1$4;
-                o1$1 = o1$5;
-                t2 = t1;
-                s2$1 = s1$3;
-                o2$1 = o1$4;
-                exit = 2;
-              }
-              break;
-          case "Enemy" :
-              var t2$2 = c2._0;
-              var s2$3 = c2._1;
-              var o2$5 = c2._2;
-              var exit$2 = 0;
-              switch (t1) {
-                case "GKoopaShell" :
-                    switch (t2$2) {
-                      case "GKoopaShell" :
-                      case "RKoopaShell" :
-                          exit$2 = 1;
-                          break;
-                      default:
-                        exit$2 = 2;
-                    }
-                    break;
-                case "RKoopaShell" :
-                    switch (t2$2) {
-                      case "GKoopaShell" :
-                      case "RKoopaShell" :
-                          exit$2 = 1;
-                          break;
-                      default:
-                        exit$2 = 2;
-                    }
-                    break;
-                default:
-                  switch (t2$2) {
-                    case "GKoopaShell" :
-                    case "RKoopaShell" :
-                        exit$2 = 3;
-                        break;
-                    default:
-                      var exit$3 = 0;
-                      switch (dir) {
-                        case "North" :
-                        case "South" :
-                            return [
-                                    undefined,
-                                    undefined
-                                  ];
-                        case "East" :
-                        case "West" :
-                            exit$3 = 4;
-                            break;
-                        
-                      }
-                      if (exit$3 === 4) {
-                        rev_dir(o1$4, t1, s1$3);
-                        rev_dir(o2$5, t2$2, s2$3);
-                        return [
-                                undefined,
-                                undefined
-                              ];
-                      }
-                      
-                  }
-              }
-              switch (exit$2) {
-                case 1 :
-                    dec_health(o1$4);
-                    dec_health(o2$5);
-                    return [
-                            undefined,
-                            undefined
-                          ];
-                case 2 :
-                    if (o1$4.vel.x === 0) {
-                      rev_dir(o2$5, t2$2, s2$3);
-                      return [
-                              undefined,
-                              undefined
-                            ];
-                    } else {
-                      dec_health(o2$5);
-                      return [
-                              undefined,
-                              undefined
-                            ];
-                    }
-                case 3 :
-                    if (o2$5.vel.x === 0) {
-                      rev_dir(o1$4, t1, s1$3);
-                      return [
-                              undefined,
-                              undefined
-                            ];
-                    } else {
-                      dec_health(o1$4);
-                      return [
-                              undefined,
-                              undefined
-                            ];
-                    }
-                
-              }
-          case "Item" :
-              return [
-                      undefined,
-                      undefined
-                    ];
-          case "Block" :
-              var o2$6 = c2._2;
-              var t2$3 = c2._0;
-              var exit$4 = 0;
-              switch (dir) {
-                case "North" :
-                case "South" :
-                    collide_block(undefined, dir, o1$4);
-                    return [
-                            undefined,
-                            undefined
-                          ];
-                case "East" :
-                case "West" :
-                    exit$4 = 4;
-                    break;
-                
-              }
-              if (exit$4 === 4) {
-                var exit$5 = 0;
-                var typ$2;
-                switch (t1) {
-                  case "GKoopaShell" :
-                      if (typeof t2$3 !== "object") {
-                        if (t2$3 === "Brick") {
-                          dec_health(o2$6);
-                          reverse_left_right(o1$4);
-                          return [
-                                  undefined,
-                                  undefined
-                                ];
-                        }
-                        exit$5 = 5;
-                      } else {
-                        typ$2 = t2$3._0;
-                        exit$5 = 6;
-                      }
-                      break;
-                  case "RKoopaShell" :
-                      if (typeof t2$3 !== "object") {
-                        if (t2$3 === "Brick") {
-                          dec_health(o2$6);
-                          reverse_left_right(o1$4);
-                          return [
-                                  undefined,
-                                  undefined
-                                ];
-                        }
-                        exit$5 = 5;
-                      } else {
-                        typ$2 = t2$3._0;
-                        exit$5 = 6;
-                      }
-                      break;
-                  default:
-                    exit$5 = 5;
-                }
-                switch (exit$5) {
-                  case 5 :
-                      rev_dir(o1$4, t1, s1$3);
-                      return [
-                              undefined,
-                              undefined
-                            ];
-                  case 6 :
-                      var updated_block$1 = evolve_block(o2$6, context);
-                      var spawned_item$1 = spawn_above(o1$4.dir, o2$6, typ$2, context);
-                      rev_dir(o1$4, t1, s1$3);
-                      return [
-                              updated_block$1,
-                              spawned_item$1
-                            ];
-                  
-                }
-              }
-              break;
-          
-        }
-        break;
-    case "Item" :
-        var o2$7 = c1._2;
-        switch (c2.TAG) {
-          case "Player" :
-              o1$2 = c2._2;
-              t2$1 = c1._0;
-              o2$2 = o2$7;
-              exit = 3;
-              break;
-          case "Enemy" :
-          case "Item" :
-              return [
-                      undefined,
-                      undefined
-                    ];
-          case "Block" :
-              switch (dir) {
-                case "North" :
-                case "South" :
-                    collide_block(undefined, dir, o2$7);
-                    return [
-                            undefined,
-                            undefined
-                          ];
-                case "East" :
-                case "West" :
-                    reverse_left_right(o2$7);
-                    return [
-                            undefined,
-                            undefined
-                          ];
-                
-              }
-          
-        }
-        break;
-    case "Block" :
-        return [
-                undefined,
-                undefined
-              ];
-    
-  }
-  switch (exit) {
-    case 1 :
-        o1.invuln = 10;
-        o1.jumping = false;
-        o1.grounded = true;
-        switch (typ) {
-          case "GKoopaShell" :
-          case "RKoopaShell" :
-              break;
-          default:
-            dec_health(o2);
-            o1.vel.y = - 4;
-            if (state.multiplier === 8) {
-              update_score(state, 800);
-              o2.score = 800;
-              return [
-                      undefined,
-                      evolve_enemy(o1.dir, typ, s2, o2, context)
-                    ];
-            }
-            var score = Math.imul(100, state.multiplier);
-            update_score(state, score);
-            o2.score = score;
-            state.multiplier = (state.multiplier << 1);
-            return [
-                    undefined,
-                    evolve_enemy(o1.dir, typ, s2, o2, context)
-                  ];
-        }
-        var r2 = evolve_enemy(o1.dir, typ, s2, o2, context);
-        o1.vel.y = - 4;
-        o1.pos.y = o1.pos.y - 5;
-        return [
-                undefined,
-                r2
-              ];
-    case 2 :
-        switch (t2) {
-          case "GKoopaShell" :
-          case "RKoopaShell" :
-              break;
-          default:
-            dec_health(o1$1);
-            o1$1.invuln = 60;
-            return [
-                    undefined,
-                    undefined
-                  ];
-        }
-        var r2$1 = o2$1.vel.x === 0 ? evolve_enemy(o1$1.dir, t2, s2$1, o2$1, context) : (dec_health(o1$1), o1$1.invuln = 60, undefined);
-        return [
-                undefined,
-                r2$1
-              ];
-    case 3 :
-        var exit$6 = 0;
-        switch (t2$1) {
-          case "Mushroom" :
-              dec_health(o2$2);
-              if (o1$2.health === 2) {
-                
-              } else {
-                o1$2.health = o1$2.health + 1 | 0;
-              }
-              o1$2.vel.x = 0;
-              o1$2.vel.y = 0;
-              update_score(state, 1000);
-              o2$2.score = 1000;
-              return [
-                      undefined,
-                      undefined
-                    ];
-          case "FireFlower" :
-          case "Star" :
-              exit$6 = 4;
-              break;
-          case "Coin" :
-              state.coins = state.coins + 1 | 0;
-              dec_health(o2$2);
-              update_score(state, 100);
-              return [
-                      undefined,
-                      undefined
-                    ];
-          
-        }
-        if (exit$6 === 4) {
-          dec_health(o2$2);
-          update_score(state, 1000);
-          return [
-                  undefined,
-                  undefined
-                ];
-        }
-        break;
-    
-  }
-}
-
-function broad_phase(collid, all_collids, state) {
-  var obj = collid._2;
-  return List.filter(function (c) {
-                if (in_viewport(state.vpt, obj.pos) || is_player(collid)) {
-                  return true;
-                } else {
-                  return out_of_viewport_below(state.vpt, obj.pos.y);
-                }
-              })(all_collids);
-}
-
-function check_collisions(collid, all_collids, state) {
-  if (collid.TAG === "Block") {
-    return /* [] */0;
-  }
-  var broad = broad_phase(collid, all_collids, state);
-  var _cs = broad;
-  var _acc = /* [] */0;
-  while(true) {
-    var acc = _acc;
-    var cs = _cs;
-    if (!cs) {
-      return acc;
-    }
-    var h = cs.hd;
-    var c_obj = collid._2;
-    var new_objs;
-    if (equals(collid, h)) {
-      new_objs = [
-        undefined,
-        undefined
-      ];
-    } else {
-      var dir = check_collision(collid, h);
-      new_objs = dir !== undefined && h._2.id !== c_obj.id ? process_collision(dir, collid, h, state) : [
-          undefined,
-          undefined
-        ];
-    }
-    var o = new_objs[0];
-    var acc$1;
-    if (o !== undefined) {
-      var o2 = new_objs[1];
-      acc$1 = o2 !== undefined ? ({
-            hd: o,
-            tl: {
-              hd: o2,
-              tl: acc
-            }
-          }) : ({
-            hd: o,
-            tl: acc
-          });
-    } else {
-      var o$1 = new_objs[1];
-      acc$1 = o$1 !== undefined ? ({
-            hd: o$1,
-            tl: acc
-          }) : acc;
-    }
-    _acc = acc$1;
-    _cs = cs.tl;
-    continue ;
-  };
-}
-
-function update_collidable(state, collid, all_collids) {
-  var obj = collid._2;
-  var spr = collid._1;
-  obj.invuln = obj.invuln > 0 ? obj.invuln - 1 | 0 : 0;
-  var viewport_filter = in_viewport(state.vpt, obj.pos) || is_player(collid) || out_of_viewport_below(state.vpt, obj.pos.y);
-  if (!(!obj.kill && viewport_filter)) {
-    return /* [] */0;
-  }
-  obj.grounded = false;
-  process_obj(obj, state.map);
-  var evolved = check_collisions(collid, all_collids, state);
-  var vpt_adj_xy = coord_to_viewport(state.vpt, obj.pos);
-  render(spr, [
-        vpt_adj_xy.x,
-        vpt_adj_xy.y
-      ]);
-  if (pressed_keys.bbox === 1) {
-    render_bbox(spr, [
-          vpt_adj_xy.x,
-          vpt_adj_xy.y
-        ]);
-  }
-  if (obj.vel.x !== 0 || !is_enemy(collid)) {
-    update_animation(spr);
-  }
-  return evolved;
-}
-
-function translate_keys(param) {
-  var ctrls_0 = [
-    pressed_keys.left,
-    "CLeft"
-  ];
-  var ctrls_1 = {
-    hd: [
-      pressed_keys.right,
-      "CRight"
-    ],
-    tl: {
-      hd: [
-        pressed_keys.up,
-        "CUp"
-      ],
-      tl: {
-        hd: [
-          pressed_keys.down,
-          "CDown"
-        ],
-        tl: /* [] */0
-      }
-    }
-  };
-  var ctrls = {
-    hd: ctrls_0,
-    tl: ctrls_1
-  };
-  return List.fold_left((function (a, x) {
-                if (x[0]) {
-                  return {
-                          hd: x[1],
-                          tl: a
-                        };
-                } else {
-                  return a;
-                }
-              }), /* [] */0, ctrls);
-}
-
-function run_update_collid(state, collid, all_collids) {
-  if (collid.TAG === "Player") {
-    var o = collid._2;
-    var keys = translate_keys();
-    o.crouch = false;
-    var match = update_player(o, keys, state.ctx);
-    var player;
-    if (match !== undefined) {
-      var new_spr = match[1];
-      normalize_pos(o.pos, collid._1.params, new_spr.params);
-      player = {
-        TAG: "Player",
-        _0: match[0],
-        _1: new_spr,
-        _2: o
-      };
-    } else {
-      player = collid;
-    }
-    var evolved = update_collidable(state, player, all_collids);
-    collid_objs.contents = Pervasives.$at(collid_objs.contents, evolved);
-    return player;
-  }
-  var obj = collid._2;
-  var evolved$1 = update_collidable(state, collid, all_collids);
-  if (!obj.kill) {
-    collid_objs.contents = {
-      hd: collid,
-      tl: Pervasives.$at(collid_objs.contents, evolved$1)
-    };
-  }
-  var new_parts = obj.kill ? kill(collid, state.ctx) : /* [] */0;
-  particles.contents = Pervasives.$at(particles.contents, new_parts);
-  return collid;
-}
-
-function update_loop(canvas, param, map_dim) {
-  var player = param[0];
-  var ctx = Curry._1(canvas.getContext, "2d");
-  var cwidth = canvas.width / 1;
-  var cheight = canvas.height / 1;
-  var viewport = make$3([
-        cwidth,
-        cheight
-      ], map_dim);
-  var state = {
-    bgd: make_bgd(ctx),
-    ctx: ctx,
-    vpt: update(viewport, player._2.pos),
-    map: map_dim[1],
-    score: 0,
-    coins: 0,
-    multiplier: 1,
-    game_over: false
-  };
-  Curry._2(state.ctx.scale, 1, 1);
-  var update_helper = function (time, state, player, objs, parts) {
-    if (state.game_over === true) {
-      return game_win(state.ctx);
-    }
-    collid_objs.contents = /* [] */0;
-    particles.contents = /* [] */0;
-    var fps$1 = calc_fps(last_time.contents, time);
-    last_time.contents = time;
-    clear_canvas(canvas);
-    var vpos_x_int = state.vpt.pos.x / 5 | 0;
-    var bgd_width = state.bgd.params.frame_size[0] | 0;
-    draw_bgd(state.bgd, Caml_int32.mod_(vpos_x_int, bgd_width));
-    var player$1 = run_update_collid(state, player, objs);
-    if (player$1._2.kill === true) {
-      return game_loss(state.ctx);
-    }
-    var state$1 = {
-      bgd: state.bgd,
-      ctx: state.ctx,
-      vpt: update(state.vpt, player$1._2.pos),
-      map: state.map,
-      score: state.score,
-      coins: state.coins,
-      multiplier: state.multiplier,
-      game_over: state.game_over
-    };
-    List.iter((function (obj) {
-            run_update_collid(state$1, obj, objs);
-          }), objs);
-    List.iter((function (part) {
-            $$process(part);
-            var x = part.pos.x - state$1.vpt.pos.x;
-            var y = part.pos.y - state$1.vpt.pos.y;
-            render(part.params.sprite, [
-                  x,
-                  y
-                ]);
-            if (!part.kill) {
-              particles.contents = {
-                hd: part,
-                tl: particles.contents
-              };
-              return ;
-            }
-            
-          }), parts);
-    fps(canvas, fps$1);
-    hud(canvas, state$1.score, state$1.coins);
-    requestAnimationFrame(function (t) {
-          update_helper(t, state$1, player$1, collid_objs.contents, particles.contents);
-        });
-  };
-  update_helper(0, state, player, param[1], /* [] */0);
-}
-
-function keydown(evt) {
-  var match = evt.keyCode;
-  if (match >= 41) {
-    switch (match) {
-      case 65 :
-          pressed_keys.left = true;
-          break;
-      case 66 :
-          pressed_keys.bbox = (pressed_keys.bbox + 1 | 0) % 2;
-          break;
-      case 68 :
-          pressed_keys.right = true;
-          break;
-      case 83 :
-          pressed_keys.down = true;
-          break;
-      case 87 :
-          pressed_keys.up = true;
-          break;
-      default:
-        
-    }
-  } else if (match >= 32) {
-    switch (match) {
-      case 33 :
-      case 34 :
-      case 35 :
-      case 36 :
-          break;
-      case 37 :
-          pressed_keys.left = true;
-          break;
-      case 32 :
-      case 38 :
-          pressed_keys.up = true;
-          break;
-      case 39 :
-          pressed_keys.right = true;
-          break;
-      case 40 :
-          pressed_keys.down = true;
-          break;
-      
-    }
-  }
-  return true;
-}
-
-function keyup(evt) {
-  var match = evt.keyCode;
-  if (match >= 68) {
-    if (match !== 83) {
-      if (match !== 87) {
-        if (match >= 69) {
-          
-        } else {
-          pressed_keys.right = false;
-        }
-      } else {
-        pressed_keys.up = false;
-      }
-    } else {
-      pressed_keys.down = false;
-    }
-  } else if (match >= 41) {
-    if (match !== 65) {
-      
-    } else {
-      pressed_keys.left = false;
-    }
-  } else if (match >= 32) {
-    switch (match) {
-      case 33 :
-      case 34 :
-      case 35 :
-      case 36 :
-          break;
-      case 37 :
-          pressed_keys.left = false;
-          break;
-      case 32 :
-      case 38 :
-          pressed_keys.up = false;
-          break;
-      case 39 :
-          pressed_keys.right = false;
-          break;
-      case 40 :
-          pressed_keys.down = false;
-          break;
-      
-    }
-  }
-  return true;
-}
-
-var Director = {
-  update_loop: update_loop,
-  keydown: keydown,
-  keyup: keyup
-};
-
-function mem_loc(checkloc, _loclist) {
-  while(true) {
-    var loclist = _loclist;
-    if (!loclist) {
-      return false;
-    }
-    if (Caml_obj.equal(checkloc, loclist.hd[1])) {
-      return true;
-    }
-    _loclist = loclist.tl;
-    continue ;
-  };
-}
-
-function convert_list(lst) {
-  if (!lst) {
-    return /* [] */0;
-  }
-  var h = lst.hd;
-  return Pervasives.$at({
-              hd: [
-                h[0],
-                [
-                  h[1][0] * 16,
-                  h[1][1] * 16
-                ]
-              ],
-              tl: /* [] */0
-            }, convert_list(lst.tl));
-}
-
-function choose_enemy_typ(typ) {
-  switch (typ) {
-    case 0 :
-        return "RKoopa";
-    case 1 :
-        return "GKoopa";
-    case 2 :
-        return "Goomba";
-    default:
-      throw {
-            RE_EXN_ID: "Failure",
-            _1: "Shouldn't reach here",
-            Error: new Error()
-          };
-  }
-}
-
-function choose_sblock_typ(typ) {
-  switch (typ) {
-    case 0 :
-        return "Brick";
-    case 1 :
-        return "UnBBlock";
-    case 2 :
-        return "Cloud";
-    case 3 :
-        return {
-                TAG: "QBlock",
-                _0: "Mushroom"
-              };
-    case 4 :
-        return "Ground";
-    default:
-      throw {
-            RE_EXN_ID: "Failure",
-            _1: "Shouldn't reach here",
-            Error: new Error()
-          };
-  }
-}
-
-function avoid_overlap(_lst, currentLst) {
-  while(true) {
-    var lst = _lst;
-    if (!lst) {
-      return /* [] */0;
-    }
-    var t = lst.tl;
-    var h = lst.hd;
-    if (!mem_loc(h[1], currentLst)) {
-      return Pervasives.$at({
-                  hd: h,
-                  tl: /* [] */0
-                }, avoid_overlap(t, currentLst));
-    }
-    _lst = t;
-    continue ;
-  };
-}
-
-function trim_edges(_lst, blockw, blockh) {
-  while(true) {
-    var lst = _lst;
-    if (!lst) {
-      return /* [] */0;
-    }
-    var t = lst.tl;
-    var h = lst.hd;
-    var cx = h[1][0];
-    var cy = h[1][1];
-    var pixx = blockw * 16;
-    var pixy = blockh * 16;
-    if (!(cx < 128 || pixx - cx < 528 || cy === 0 || pixy - cy < 48)) {
-      return Pervasives.$at({
-                  hd: h,
-                  tl: /* [] */0
-                }, trim_edges(t, blockw, blockh));
-    }
-    _lst = t;
-    continue ;
-  };
-}
-
-function generate_clouds(cbx, cby, typ, num) {
-  if (num === 0) {
-    return /* [] */0;
-  } else {
-    return Pervasives.$at({
-                hd: [
-                  typ,
-                  [
-                    cbx,
-                    cby
-                  ]
-                ],
-                tl: /* [] */0
-              }, generate_clouds(cbx + 1, cby, typ, num - 1 | 0));
-  }
-}
-
-function generate_coins(_block_coord) {
-  while(true) {
-    var block_coord = _block_coord;
-    var place_coin = Random.$$int(2);
-    if (!block_coord) {
-      return /* [] */0;
-    }
-    var t = block_coord.tl;
-    var h = block_coord.hd;
-    if (place_coin === 0) {
-      var xc = h[1][0];
-      var yc = h[1][1];
-      return Pervasives.$at({
-                  hd: [
-                    0,
-                    [
-                      xc,
-                      yc - 16
-                    ]
-                  ],
-                  tl: /* [] */0
-                }, generate_coins(t));
-    }
-    _block_coord = t;
-    continue ;
-  };
-}
-
-function choose_block_pattern(blockw, blockh, cbx, cby, prob) {
-  if (cbx > blockw || cby > blockh) {
-    return /* [] */0;
-  }
-  var block_typ = Random.$$int(4);
-  var stair_typ = Random.$$int(2);
-  var life_block_chance = Random.$$int(5);
-  var middle_block = life_block_chance === 0 ? 3 : stair_typ;
-  switch (prob) {
-    case 0 :
-        if (blockw - cbx > 2) {
-          return {
-                  hd: [
-                    stair_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: {
-                    hd: [
-                      middle_block,
-                      [
-                        cbx + 1,
-                        cby
-                      ]
-                    ],
-                    tl: {
-                      hd: [
-                        stair_typ,
-                        [
-                          cbx + 2,
-                          cby
-                        ]
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                };
-        } else if (blockw - cbx > 1) {
-          return {
-                  hd: [
-                    block_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: {
-                    hd: [
-                      block_typ,
-                      [
-                        cbx + 1,
-                        cby
-                      ]
-                    ],
-                    tl: /* [] */0
-                  }
-                };
-        } else {
-          return {
-                  hd: [
-                    block_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: /* [] */0
-                };
-        }
-    case 1 :
-        var num_clouds = Random.$$int(5) + 5 | 0;
-        if (cby < 5) {
-          return generate_clouds(cbx, cby, 2, num_clouds);
-        } else {
-          return /* [] */0;
-        }
-    case 2 :
-        if (blockh - cby === 1) {
-          var four_0 = [
-            stair_typ,
-            [
-              cbx,
-              cby
-            ]
-          ];
-          var four_1 = {
-            hd: [
-              stair_typ,
-              [
-                cbx + 1,
-                cby
-              ]
-            ],
-            tl: {
-              hd: [
-                stair_typ,
-                [
-                  cbx + 2,
-                  cby
-                ]
-              ],
-              tl: {
-                hd: [
-                  stair_typ,
-                  [
-                    cbx + 3,
-                    cby
-                  ]
-                ],
-                tl: /* [] */0
-              }
-            }
-          };
-          var four = {
-            hd: four_0,
-            tl: four_1
-          };
-          var three_0 = [
-            stair_typ,
-            [
-              cbx + 1,
-              cby - 1
-            ]
-          ];
-          var three_1 = {
-            hd: [
-              stair_typ,
-              [
-                cbx + 2,
-                cby - 1
-              ]
-            ],
-            tl: {
-              hd: [
-                stair_typ,
-                [
-                  cbx + 3,
-                  cby - 1
-                ]
-              ],
-              tl: /* [] */0
-            }
-          };
-          var three = {
-            hd: three_0,
-            tl: three_1
-          };
-          var two_0 = [
-            stair_typ,
-            [
-              cbx + 2,
-              cby - 2
-            ]
-          ];
-          var two_1 = {
-            hd: [
-              stair_typ,
-              [
-                cbx + 3,
-                cby - 2
-              ]
-            ],
-            tl: /* [] */0
-          };
-          var two = {
-            hd: two_0,
-            tl: two_1
-          };
-          var one_0 = [
-            stair_typ,
-            [
-              cbx + 3,
-              cby - 3
-            ]
-          ];
-          var one = {
-            hd: one_0,
-            tl: /* [] */0
-          };
-          return Pervasives.$at(four, Pervasives.$at(three, Pervasives.$at(two, one)));
-        } else {
-          return /* [] */0;
-        }
-    case 3 :
-        if (stair_typ === 0 && blockh - cby > 3) {
-          var three_0$1 = [
-            stair_typ,
-            [
-              cbx,
-              cby
-            ]
-          ];
-          var three_1$1 = {
-            hd: [
-              stair_typ,
-              [
-                cbx + 1,
-                cby
-              ]
-            ],
-            tl: {
-              hd: [
-                stair_typ,
-                [
-                  cbx + 2,
-                  cby
-                ]
-              ],
-              tl: /* [] */0
-            }
-          };
-          var three$1 = {
-            hd: three_0$1,
-            tl: three_1$1
-          };
-          var two_0$1 = [
-            stair_typ,
-            [
-              cbx + 2,
-              cby + 1
-            ]
-          ];
-          var two_1$1 = {
-            hd: [
-              stair_typ,
-              [
-                cbx + 3,
-                cby + 1
-              ]
-            ],
-            tl: /* [] */0
-          };
-          var two$1 = {
-            hd: two_0$1,
-            tl: two_1$1
-          };
-          var one_0$1 = [
-            stair_typ,
-            [
-              cbx + 5,
-              cby + 2
-            ]
-          ];
-          var one_1 = {
-            hd: [
-              stair_typ,
-              [
-                cbx + 6,
-                cby + 2
-              ]
-            ],
-            tl: /* [] */0
-          };
-          var one$1 = {
-            hd: one_0$1,
-            tl: one_1
-          };
-          return Pervasives.$at(three$1, Pervasives.$at(two$1, one$1));
-        } else if (blockh - cby > 2) {
-          var one_0$2 = [
-            stair_typ,
-            [
-              cbx,
-              cby
-            ]
-          ];
-          var one_1$1 = {
-            hd: [
-              stair_typ,
-              [
-                cbx + 1,
-                cby
-              ]
-            ],
-            tl: /* [] */0
-          };
-          var one$2 = {
-            hd: one_0$2,
-            tl: one_1$1
-          };
-          var two_0$2 = [
-            stair_typ,
-            [
-              cbx + 3,
-              cby - 1
-            ]
-          ];
-          var two_1$2 = {
-            hd: [
-              stair_typ,
-              [
-                cbx + 4,
-                cby - 1
-              ]
-            ],
-            tl: /* [] */0
-          };
-          var two$2 = {
-            hd: two_0$2,
-            tl: two_1$2
-          };
-          var three_0$2 = [
-            stair_typ,
-            [
-              cbx + 4,
-              cby - 2
-            ]
-          ];
-          var three_1$2 = {
-            hd: [
-              stair_typ,
-              [
-                cbx + 5,
-                cby - 2
-              ]
-            ],
-            tl: {
-              hd: [
-                stair_typ,
-                [
-                  cbx + 6,
-                  cby - 2
-                ]
-              ],
-              tl: /* [] */0
-            }
-          };
-          var three$2 = {
-            hd: three_0$2,
-            tl: three_1$2
-          };
-          return Pervasives.$at(one$2, Pervasives.$at(two$2, three$2));
-        } else {
-          return {
-                  hd: [
-                    stair_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: /* [] */0
-                };
-        }
-    case 4 :
-        if (cby + 3 - blockh === 2) {
-          return {
-                  hd: [
-                    stair_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: /* [] */0
-                };
-        } else if (cby + 3 - blockh === 1) {
-          return {
-                  hd: [
-                    stair_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: {
-                    hd: [
-                      stair_typ,
-                      [
-                        cbx,
-                        cby + 1
-                      ]
-                    ],
-                    tl: /* [] */0
-                  }
-                };
-        } else {
-          return {
-                  hd: [
-                    stair_typ,
-                    [
-                      cbx,
-                      cby
-                    ]
-                  ],
-                  tl: {
-                    hd: [
-                      stair_typ,
-                      [
-                        cbx,
-                        cby + 1
-                      ]
-                    ],
-                    tl: {
-                      hd: [
-                        stair_typ,
-                        [
-                          cbx,
-                          cby + 2
-                        ]
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                };
-        }
-    case 5 :
-        return {
-                hd: [
-                  3,
-                  [
-                    cbx,
-                    cby
-                  ]
-                ],
-                tl: /* [] */0
-              };
-    default:
-      throw {
-            RE_EXN_ID: "Failure",
-            _1: "Shouldn't reach here",
-            Error: new Error()
-          };
-  }
-}
-
-function generate_enemies(blockw, blockh, _cbx, _cby, acc) {
-  while(true) {
-    var cby = _cby;
-    var cbx = _cbx;
-    if (cbx > blockw - 32) {
-      return /* [] */0;
-    }
-    if (cby > blockh - 1 || cbx < 15) {
-      _cby = 0;
-      _cbx = cbx + 1;
-      continue ;
-    }
-    if (mem_loc([
-            cbx,
-            cby
-          ], acc) || cby === 0) {
-      _cby = cby + 1;
-      continue ;
-    }
-    var prob = Random.$$int(30);
-    if (prob < 3 && blockh - 1 === cby) {
-      var enemy_0 = [
-        prob,
-        [
-          cbx * 16,
-          cby * 16
-        ]
-      ];
-      var enemy = {
-        hd: enemy_0,
-        tl: /* [] */0
-      };
-      return Pervasives.$at(enemy, generate_enemies(blockw, blockh, cbx, cby + 1, acc));
-    }
-    _cby = cby + 1;
-    continue ;
-  };
-}
-
-function generate_block_enemies(_block_coord) {
-  while(true) {
-    var block_coord = _block_coord;
-    var place_enemy = Random.$$int(20);
-    var enemy_typ = Random.$$int(3);
-    if (!block_coord) {
-      return /* [] */0;
-    }
-    var t = block_coord.tl;
-    var h = block_coord.hd;
-    if (place_enemy === 0) {
-      var xc = h[1][0];
-      var yc = h[1][1];
-      return Pervasives.$at({
-                  hd: [
-                    enemy_typ,
-                    [
-                      xc,
-                      yc - 16
-                    ]
-                  ],
-                  tl: /* [] */0
-                }, generate_block_enemies(t));
-    }
-    _block_coord = t;
-    continue ;
-  };
-}
-
-function generate_block_locs(blockw, blockh, _cbx, _cby, _acc) {
-  while(true) {
-    var acc = _acc;
-    var cby = _cby;
-    var cbx = _cbx;
-    if (blockw - cbx < 33) {
-      return acc;
-    }
-    if (cby > blockh - 1) {
-      _cby = 0;
-      _cbx = cbx + 1;
-      continue ;
-    }
-    if (mem_loc([
-            cbx,
-            cby
-          ], acc) || cby === 0) {
-      _cby = cby + 1;
-      continue ;
-    }
-    var prob = Random.$$int(100);
-    if (prob < 5) {
-      var newacc = choose_block_pattern(blockw, blockh, cbx, cby, prob);
-      var undup_lst = avoid_overlap(newacc, acc);
-      var called_acc = Pervasives.$at(acc, undup_lst);
-      _acc = called_acc;
-      _cby = cby + 1;
-      continue ;
-    }
-    _cby = cby + 1;
-    continue ;
-  };
-}
-
-function generate_panel(context, blockw, blockh) {
-  return spawn({
-              TAG: "SBlock",
-              _0: "Panel"
-            }, context, [
-              blockw * 16 - 256,
-              blockh * 16 * 2 / 3
-            ]);
-}
-
-function generate_ground(blockw, blockh, _inc, _acc) {
-  while(true) {
-    var acc = _acc;
-    var inc = _inc;
-    if (inc > blockw) {
-      return acc;
-    }
-    if (inc > 10) {
-      var skip = Random.$$int(10);
-      var newacc = Pervasives.$at(acc, {
-            hd: [
-              4,
-              [
-                inc * 16,
-                blockh * 16
-              ]
-            ],
-            tl: /* [] */0
-          });
-      if (skip === 7 && blockw - inc > 32) {
-        _inc = inc + 1;
-        continue ;
-      }
-      _acc = newacc;
-      _inc = inc + 1;
-      continue ;
-    }
-    var newacc$1 = Pervasives.$at(acc, {
-          hd: [
-            4,
-            [
-              inc * 16,
-              blockh * 16
-            ]
-          ],
-          tl: /* [] */0
-        });
-    _acc = newacc$1;
-    _inc = inc + 1;
-    continue ;
-  };
-}
-
-function convert_to_block_obj(lst, context) {
-  if (!lst) {
-    return /* [] */0;
-  }
-  var h = lst.hd;
-  var sblock_typ = choose_sblock_typ(h[0]);
-  var ob = spawn({
-        TAG: "SBlock",
-        _0: sblock_typ
-      }, context, h[1]);
-  return Pervasives.$at({
-              hd: ob,
-              tl: /* [] */0
-            }, convert_to_block_obj(lst.tl, context));
-}
-
-function convert_to_enemy_obj(lst, context) {
-  if (!lst) {
-    return /* [] */0;
-  }
-  var h = lst.hd;
-  var senemy_typ = choose_enemy_typ(h[0]);
-  var ob = spawn({
-        TAG: "SEnemy",
-        _0: senemy_typ
-      }, context, h[1]);
-  return Pervasives.$at({
-              hd: ob,
-              tl: /* [] */0
-            }, convert_to_enemy_obj(lst.tl, context));
-}
-
-function convert_to_coin_obj(lst, context) {
-  if (!lst) {
-    return /* [] */0;
-  }
-  var ob = spawn({
-        TAG: "SItem",
-        _0: "Coin"
-      }, context, lst.hd[1]);
-  return Pervasives.$at({
-              hd: ob,
-              tl: /* [] */0
-            }, convert_to_coin_obj(lst.tl, context));
-}
-
-function generate_helper(blockw, blockh, cx, cy, context) {
-  var block_locs = generate_block_locs(blockw, blockh, 0, 0, /* [] */0);
-  var converted_block_locs = trim_edges(convert_list(block_locs), blockw, blockh);
-  var obj_converted_block_locs = convert_to_block_obj(converted_block_locs, context);
-  var ground_blocks = generate_ground(blockw, blockh, 0, /* [] */0);
-  var obj_converted_ground_blocks = convert_to_block_obj(ground_blocks, context);
-  var block_locations = Pervasives.$at(block_locs, ground_blocks);
-  var all_blocks = Pervasives.$at(obj_converted_block_locs, obj_converted_ground_blocks);
-  var enemy_locs = generate_enemies(blockw, blockh, 0, 0, block_locations);
-  var obj_converted_enemies = convert_to_enemy_obj(enemy_locs, context);
-  var coin_locs = generate_coins(converted_block_locs);
-  var undup_coin_locs = trim_edges(avoid_overlap(coin_locs, converted_block_locs), blockw, blockh);
-  var converted_block_coin_locs = Pervasives.$at(converted_block_locs, coin_locs);
-  var enemy_block_locs = generate_block_enemies(converted_block_locs);
-  var undup_enemy_block_locs = avoid_overlap(enemy_block_locs, converted_block_coin_locs);
-  var obj_enemy_blocks = convert_to_enemy_obj(undup_enemy_block_locs, context);
-  var coin_objects = convert_to_coin_obj(undup_coin_locs, context);
-  var obj_panel = generate_panel(context, blockw, blockh);
-  return Pervasives.$at(all_blocks, Pervasives.$at(obj_converted_enemies, Pervasives.$at(coin_objects, Pervasives.$at(obj_enemy_blocks, {
-                          hd: obj_panel,
-                          tl: /* [] */0
-                        }))));
-}
-
-function generate(w, h, context) {
-  var blockw = w / 16;
-  var blockh = h / 16 - 1;
-  var collide_list = generate_helper(blockw, blockh, 0, 0, context);
-  var player = spawn({
-        TAG: "SPlayer",
-        _0: "SmallM",
-        _1: "Standing"
-      }, context, [
-        100,
-        224
-      ]);
-  return [
-          player,
-          collide_list
-        ];
-}
-
-function init(param) {
-  Random.self_init();
-}
-
-var Procedural_generator = {
-  init: init,
-  generate: generate
-};
-
-var loadCount = {
-  contents: 0
-};
-
-function load(param) {
-  Random.self_init();
-  var canvas_id = "canvas";
-  var el = document.getElementById(canvas_id);
-  var canvas;
-  if (el !== null) {
-    canvas = el;
-  } else {
-    console.log("cant find canvas " + canvas_id);
-    throw {
-          RE_EXN_ID: "Failure",
-          _1: "fail",
-          Error: new Error()
-        };
-  }
-  var context = Curry._1(canvas.getContext, "2d");
-  document.addEventListener("keydown", keydown, true);
-  document.addEventListener("keyup", keyup, true);
-  Random.self_init();
-  update_loop(canvas, generate(2400, 256, context), [
-        2400,
-        256
-      ]);
-  console.log("asd");
-}
-
-function inc_counter(param) {
-  loadCount.contents = loadCount.contents + 1 | 0;
-  if (loadCount.contents === 4) {
-    return load();
-  }
-  
-}
-
-function preload(param) {
-  return List.map((function (img_src) {
-                var img_src$1 = "sprites/" + img_src;
-                var img = document.createElement("img");
-                img.src = img_src$1;
-                img.addEventListener("load", (function (ev) {
-                        inc_counter();
-                        return true;
-                      }), true);
-              }), {
-              hd: "blocks.png",
-              tl: {
-                hd: "items.png",
-                tl: {
-                  hd: "enemies.png",
-                  tl: {
-                    hd: "mario-small.png",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            });
-}
-
-window.onload = (function (param) {
-    preload();
-    return true;
-  });
-
-var Main = {
-  Html: undefined,
-  Pg: undefined,
-  loadCount: loadCount,
-  imgsToLoad: 4,
-  level_width: 2400,
-  level_height: 256,
-  load: load,
-  inc_counter: inc_counter,
-  preload: preload
-};
-
-exports.Actors = Actors;
-exports.Dom_html = Dom_html;
-exports.Sprite = Sprite;
-exports.Particle = Particle;
-exports.$$Object = $$Object;
-exports.Draw = Draw;
-exports.Viewport = Viewport;
-exports.Director = Director;
-exports.Procedural_generator = Procedural_generator;
-exports.Main = Main;
-/*  Not a pure module */
diff --git a/jscomp/test/mario_game.res b/jscomp/test/mario_game.res
deleted file mode 100644
index 6a89eec..0000000
--- a/jscomp/test/mario_game.res
+++ /dev/null
@@ -1,2642 +0,0 @@
-@@bs.config({flags: ["-w", "a", "-bs-no-bin-annot"]})
-
-module Actors: {
-  type dir_1d = Left | Right
-  type dir_2d = North | South | East | West
-
-  /* Generic xy record for easy position access */
-  type xy = {
-    mutable x: float,
-    mutable y: float,
-  }
-
-  /* Controls correspond to keyboard input */
-  type controls =
-    | CLeft
-    | CRight
-    | CUp
-    | CDown
-
-  /* Player ability type */
-  type pl_typ =
-    | BigM
-    | SmallM
-
-  type item_typ =
-    | Mushroom
-    | FireFlower
-    | Star
-    | Coin
-
-  type enemy_typ =
-    | Goomba
-    | GKoopa
-    | RKoopa
-    | GKoopaShell
-    | RKoopaShell
-
-  type block_typ =
-    | QBlock(item_typ)
-    | QBlockUsed
-    | Brick
-    | UnBBlock
-    | Cloud
-    | Panel
-    | Ground
-
-  /* Player action type */
-  type player_typ =
-    | Standing
-    | Jumping
-    | Running
-    | Crouching
-
-  /* Particle Type */
-  type part_typ =
-    | GoombaSquish
-    | BrickChunkL
-    | BrickChunkR
-    | Score100
-    | Score200
-    | Score400
-    | Score800
-    | Score1000
-    | Score2000
-    | Score4000
-    | Score8000
-
-  /* type unbblock_typ =
-  | Wood
-  | Earth
-  | Brick
-| */
-
-  type spawn_typ =
-    | SPlayer(pl_typ, player_typ)
-    | SEnemy(enemy_typ)
-    | SItem(item_typ)
-    | SBlock(block_typ)
-  /* | SGround of ground_typ */
-} = {
-  type dir_1d = Left | Right
-  type dir_2d = North | South | East | West
-
-  type xy = {
-    mutable x: float,
-    mutable y: float,
-  }
-
-  type controls =
-    | CLeft
-    | CRight
-    | CUp
-    | CDown
-
-  type pl_typ =
-    | BigM
-    | SmallM
-
-  type item_typ =
-    | Mushroom
-    | FireFlower
-    | Star
-    | Coin
-
-  type enemy_typ =
-    | Goomba
-    | GKoopa
-    | RKoopa
-    | GKoopaShell
-    | RKoopaShell
-
-  type block_typ =
-    | QBlock(item_typ)
-    | QBlockUsed
-    | Brick
-    | UnBBlock
-    | Cloud
-    | Panel
-    | Ground
-
-  type player_typ =
-    | Standing
-    | Jumping
-    | Running
-    | Crouching
-
-  type part_typ =
-    | GoombaSquish
-    | BrickChunkL
-    | BrickChunkR
-    | Score100
-    | Score200
-    | Score400
-    | Score800
-    | Score1000
-    | Score2000
-    | Score4000
-    | Score8000
-
-  type spawn_typ =
-    | SPlayer(pl_typ, player_typ)
-    | SEnemy(enemy_typ)
-    | SItem(item_typ)
-    | SBlock(block_typ)
-}
-module Dom_html = {
-  type imageElement
-  type canvasRenderingContext2D
-  type canvasElement
-
-  @val external document: Dom.document = "document"
-  @val external window: Dom.window = "window"
-
-  /* external createImg: (_ [@bs.as "img"]) -> document -> imageElement = "createElement" [@@bs.send] */
-  @send external createImg: (Dom.document, @as("img") _) => imageElement = "createElement"
-  @val external requestAnimationFrame: (float => unit) => unit = "requestAnimationFrame"
-  @return(null_to_opt) @send
-  external getElementById: (Dom.document, string) => option<Dom.element> = "getElementById"
-  @send
-  external addEventListener: (Dom.document, string, Dom.event_like<'a> => bool, bool) => unit =
-    "addEventListener"
-  @send
-  external addEventListenerImg: (imageElement, string, Dom.event_like<'a> => bool, bool) => unit =
-    "addEventListener"
-
-  /* unsafe casts */
-  external imageElementToJsObj: imageElement => {..} = "%identity"
-  external canvasRenderingContext2DToJsObj: canvasRenderingContext2D => {..} = "%identity"
-  external canvasElementToJsObj: canvasElement => {..} = "%identity"
-  external keyboardEventToJsObj: Dom.keyboardEvent => {..} = "%identity"
-  external elementToCanvasElement: Dom.element => canvasElement = "%identity"
-  external windowToJsObj: Dom.window => {..} = "%identity"
-}
-module Sprite: {
-  open Actors
-
-  /* Represents an xy vector */
-  type xy = (float, float) /* x, y */
-
-  /* Inherent sprite parameters from which to create the sprite */
-  type sprite_params = {
-    max_frames: int,
-    max_ticks: int,
-    img_src: string,
-    frame_size: xy,
-    src_offset: xy,
-    bbox_offset: xy,
-    bbox_size: xy,
-    loop: bool,
-  }
-
-  /* Concrete sprite created to visually represent an object */
-  type sprite = {
-    mutable params: sprite_params,
-    context: Dom_html.canvasRenderingContext2D,
-    frame: ref<int>,
-    ticks: ref<int>,
-    mutable img: Dom_html.imageElement,
-  }
-
-  /* Sets up a sprite to create */
-  let setup_sprite: (
-    ~loop: bool=?,
-    ~bb_off: (float, float)=?,
-    ~bb_sz: (float, float)=?,
-    string,
-    int,
-    int,
-    xy,
-    xy,
-  ) => sprite_params
-
-  /* Creates a sprite given the actor type */
-  let make: (Actors.spawn_typ, Actors.dir_1d, Dom_html.canvasRenderingContext2D) => sprite
-
-  /* Make a background */
-  let make_bgd: Dom_html.canvasRenderingContext2D => sprite
-
-  /* Make a particle corresponding to the given type */
-  let make_particle: (Actors.part_typ, Dom_html.canvasRenderingContext2D) => sprite
-
-  /* Transform an enemy sprite based on direction */
-  let transform_enemy: (Actors.enemy_typ, sprite, Actors.dir_1d) => unit
-
-  /* Updates the sprite's animation */
-  let update_animation: sprite => unit
-} = {
-  open Actors
-
-  type xy = (float, float)
-
-  type sprite_params = {
-    max_frames: int,
-    max_ticks: int,
-    img_src: string,
-    frame_size: xy,
-    src_offset: xy,
-    bbox_offset: xy,
-    bbox_size: xy,
-    loop: bool,
-  }
-
-  type sprite = {
-    mutable params: sprite_params,
-    context: Dom_html.canvasRenderingContext2D,
-    frame: ref<int>,
-    ticks: ref<int>,
-    mutable img: Dom_html.imageElement,
-  }
-
-  /* setup_sprite is used to initialize a sprite. */
-  let setup_sprite = (
-    ~loop=true,
-    ~bb_off as bbox_offset=(0., 0.),
-    ~bb_sz as bbox_size=(0., 0.),
-    img_src,
-    max_frames,
-    max_ticks,
-    frame_size,
-    src_offset,
-  ) => {
-    let bbox_size = if bbox_size == (0., 0.) {
-      frame_size
-    } else {
-      bbox_size
-    }
-    let img_src = "./sprites/" ++ img_src
-    {
-      img_src,
-      max_frames,
-      max_ticks,
-      frame_size,
-      src_offset,
-      bbox_offset,
-      bbox_size,
-      loop,
-    }
-  }
-
-  /* The following functions are used in order to define sprite animations
-   *from their sprite sheets. Also creates bounding boxes if necessary. */
-
-  /* Sets sprite for small mario. */
-  let make_small_player = ((typ, dir)) =>
-    switch dir {
-    /* 16x16 grid with 0x0 offset */
-    | Left =>
-      switch typ {
-      | Standing =>
-        setup_sprite(
-          "mario-small.png",
-          ~bb_off=(3., 1.),
-          ~bb_sz=(11., 15.),
-          1,
-          0,
-          (16., 16.),
-          (0., 0.),
-        )
-      | Jumping =>
-        setup_sprite(
-          "mario-small.png",
-          ~bb_off=(2., 1.),
-          ~bb_sz=(13., 15.),
-          2,
-          10,
-          (16., 16.),
-          (16., 16.),
-        )
-      | Running =>
-        setup_sprite(
-          "mario-small.png",
-          ~bb_off=(2., 1.),
-          ~bb_sz=(12., 15.),
-          3,
-          5,
-          (16., 16.),
-          (16., 0.),
-        )
-      | Crouching =>
-        setup_sprite(
-          "mario-small.png",
-          ~bb_off=(1., 5.),
-          ~bb_sz=(14., 10.),
-          1,
-          0,
-          (16., 16.),
-          (0., 64.),
-        )
-      }
-    | Right =>
-      switch typ {
-      | Standing =>
-        setup_sprite(
-          "mario-small.png",
-          ~bb_off=(1., 1.),
-          ~bb_sz=(11., 15.),
-          1,
-          0,
-          (16., 16.),
-          (0., 32.),
-        )
-      | Jumping =>
-        setup_sprite(
-          "mario-small.png",
-          ~bb_off=(2., 1.),
-          ~bb_sz=(13., 15.),
-          2,
-          10,
-          (16., 16.),
-          (16., 48.),
-        )
-      | Running =>
-        setup_sprite(
-          "mario-small.png",
-          ~bb_off=(2., 1.),
-          ~bb_sz=(12., 15.),
-          3,
-          5,
-          (16., 16.),
-          (16., 32.),
-        )
-      | Crouching =>
-        setup_sprite(
-          "mario-small.png",
-          ~bb_off=(1., 5.),
-          ~bb_sz=(14., 10.),
-          1,
-          0,
-          (16., 16.),
-          (0., 64.),
-        )
-      }
-    }
-
-  /* Sets sprite for big mario. */
-  let make_big_player = ((typ, dir)) =>
-    switch dir {
-    | Left =>
-      switch typ {
-      | Standing =>
-        setup_sprite(
-          "mario-big.png",
-          1,
-          0,
-          ~bb_off=(2., 1.),
-          ~bb_sz=(13., 25.),
-          (16., 27.),
-          (16., 5.),
-        )
-      | Jumping =>
-        setup_sprite(
-          "mario-big.png",
-          1,
-          0,
-          ~bb_off=(2., 1.),
-          ~bb_sz=(12., 25.),
-          (16., 26.),
-          (48., 6.),
-        )
-      | Running =>
-        setup_sprite(
-          "mario-big.png",
-          4,
-          10,
-          ~bb_off=(2., 1.),
-          ~bb_sz=(13., 25.),
-          (16., 27.),
-          (0., 37.),
-        )
-      | Crouching =>
-        setup_sprite(
-          "mario-big.png",
-          1,
-          0,
-          ~bb_off=(2., 10.),
-          ~bb_sz=(13., 17.),
-          (16., 27.),
-          (32., 5.),
-        )
-      }
-    | Right =>
-      switch typ {
-      | Standing =>
-        setup_sprite(
-          "mario-big.png",
-          1,
-          0,
-          ~bb_off=(1., 1.),
-          ~bb_sz=(13., 25.),
-          (16., 26.),
-          (16., 69.),
-        )
-      | Jumping =>
-        setup_sprite(
-          "mario-big.png",
-          1,
-          0,
-          ~bb_off=(2., 1.),
-          ~bb_sz=(12., 25.),
-          (16., 26.),
-          (48., 70.),
-        )
-      | Running =>
-        setup_sprite(
-          "mario-big.png",
-          4,
-          10,
-          ~bb_off=(2., 1.),
-          ~bb_sz=(13., 25.),
-          (16., 27.),
-          (0., 101.),
-        )
-      | Crouching =>
-        setup_sprite(
-          "mario-big.png",
-          1,
-          0,
-          ~bb_off=(2., 10.),
-          ~bb_sz=(13., 17.),
-          (16., 27.),
-          (32., 69.),
-        )
-      }
-    }
-
-  /* Sets sprites for enemies: Goomba, Red Koopa, Green Koopa. */
-  let make_enemy = ((typ, dir)) =>
-    switch (typ, dir) {
-    | (Goomba, _) =>
-      setup_sprite(
-        "enemies.png",
-        ~bb_off=(1., 1.),
-        ~bb_sz=(14., 14.),
-        2,
-        10,
-        (16., 16.),
-        (0., 128.),
-      )
-    | (GKoopa, Left) =>
-      setup_sprite(
-        "enemies.png",
-        ~bb_off=(4., 10.),
-        ~bb_sz=(11., 16.),
-        2,
-        10,
-        (16., 27.),
-        (0., 69.),
-      )
-    | (GKoopa, Right) =>
-      setup_sprite(
-        "enemies.png",
-        ~bb_off=(1., 10.),
-        ~bb_sz=(11., 16.),
-        2,
-        10,
-        (16., 27.),
-        (32., 69.),
-      )
-    | (RKoopa, Left) =>
-      setup_sprite("enemies.png", ~bb_off=(4., 10.), ~bb_sz=(11., 16.), 2, 10, (16., 27.), (0., 5.))
-    | (RKoopa, Right) =>
-      setup_sprite(
-        "enemies.png",
-        ~bb_off=(1., 10.),
-        ~bb_sz=(11., 16.),
-        2,
-        10,
-        (16., 27.),
-        (32., 5.),
-      )
-    | (GKoopaShell, _) =>
-      setup_sprite("enemies.png", ~bb_off=(2., 2.), ~bb_sz=(12., 13.), 4, 10, (16., 16.), (0., 96.))
-    | (RKoopaShell, _) =>
-      setup_sprite("enemies.png", ~bb_off=(2., 2.), ~bb_sz=(12., 13.), 4, 10, (16., 16.), (0., 32.))
-    }
-
-  /* Sets sprites for items: coin, fireflower, mushroom, star. */
-  let make_item = x =>
-    /* 16x16 grid with 0x0 offset */
-    switch x {
-    | Coin =>
-      setup_sprite("items.png", ~bb_off=(3., 0.), ~bb_sz=(12., 16.), 3, 15, (16., 16.), (0., 80.))
-    | FireFlower => setup_sprite("items.png", 1, 0, (16., 16.), (0., 188.))
-    | Mushroom =>
-      setup_sprite("items.png", ~bb_off=(2., 0.), ~bb_sz=(12., 16.), 1, 0, (16., 16.), (0., 0.))
-    | Star => setup_sprite("items.png", 1, 0, (16., 16.), (16., 48.))
-    }
-
-  /* Sets sprites for blocks: brick, question block, unbreakable block, cloud block
-   * panel block, ground block. */
-  let make_block = x =>
-    /* 16x16 grid with 0x0 offset */
-    switch x {
-    | Brick => setup_sprite("blocks.png", 5, 10, (16., 16.), (0., 0.))
-    | QBlock(_) => setup_sprite("blocks.png", 4, 15, (16., 16.), (0., 16.))
-    | QBlockUsed => setup_sprite("blocks.png", 1, 0, (16., 16.), (0., 32.))
-    | UnBBlock => setup_sprite("blocks.png", 1, 0, (16., 16.), (0., 48.))
-    | Cloud => setup_sprite("blocks.png", 1, 0, (16., 16.), (0., 64.))
-    | Panel => setup_sprite("panel.png", 3, 15, (26., 26.), (0., 0.))
-    | Ground => setup_sprite("ground.png", 1, 0, (16., 16.), (0., 32.))
-    }
-
-  /* Sets sprites for particles, squished goomba, brick chunks (upon destruction
-   * of brick), score text. */
-  let make_particle = x =>
-    switch x {
-    | GoombaSquish => setup_sprite("enemies.png", 1, 0, (16., 16.), (0., 144.))
-    | BrickChunkL => setup_sprite("chunks.png", 1, 0, (8., 8.), (0., 0.))
-    | BrickChunkR => setup_sprite("chunks.png", 1, 0, (8., 8.), (8., 0.))
-    | Score100 => setup_sprite("score.png", 1, 0, (12., 8.), (0., 0.))
-    | Score200 => setup_sprite("score.png", 1, 0, (12., 9.), (0., 9.))
-    | Score400 => setup_sprite("score.png", 1, 0, (12., 9.), (0., 18.))
-    | Score800 => setup_sprite("score.png", 1, 0, (12., 9.), (0., 27.))
-    | Score1000 => setup_sprite("score.png", 1, 0, (14., 9.), (13., 0.))
-    | Score2000 => setup_sprite("score.png", 1, 0, (14., 9.), (13., 9.))
-    | Score4000 => setup_sprite("score.png", 1, 0, (14., 9.), (13., 18.))
-    | Score8000 => setup_sprite("score.png", 1, 0, (14., 9.), (13., 27.))
-    }
-
-  /* Calls to set sprite for either big or small mario. */
-  let make_player = (pt, spr_type) =>
-    switch pt {
-    | BigM => make_big_player(spr_type)
-    | SmallM => make_small_player(spr_type)
-    }
-
-  /* Calls to set sprites for each type of object. */
-  let make_type = (typ, dir: Actors.dir_1d) =>
-    switch typ {
-    | SPlayer(pt, st) => make_player(pt, (st, dir))
-    | SEnemy(t) => make_enemy((t, dir))
-    | SItem(t) => make_item(t)
-    | SBlock(t) => make_block(t)
-    }
-
-  /* Makes a sprite from provided [params]. */
-  let make_from_params = (params, context) => {
-    let img = Dom_html.createImg(Dom_html.document)
-    Dom_html.imageElementToJsObj(img)["src"] = params.img_src
-    {
-      params,
-      context,
-      img,
-      frame: ref(0),
-      ticks: ref(0),
-    }
-  }
-
-  /* Make is the wrapper function to cycle through sprite animations */
-  let make = (spawn, dir, context) => {
-    let params = make_type(spawn, dir)
-    make_from_params(params, context)
-  }
-
-  /* Make a background */
-  let make_bgd = context => {
-    let params = setup_sprite("bgd-1.png", 1, 0, (512., 256.), (0., 0.))
-    make_from_params(params, context)
-  }
-
-  /* Make a particle from the given particle type */
-  let make_particle = (ptyp, context) => {
-    let params = make_particle(ptyp)
-    make_from_params(params, context)
-  }
-
-  /* Transform_enemy is used in order to switch the direction an enemy faces. */
-  let transform_enemy = (enemy_typ, spr, dir) => {
-    let params = make_enemy((enemy_typ, dir))
-    let img = Dom_html.createImg(Dom_html.document)
-    Dom_html.imageElementToJsObj(img)["src"] = params.img_src
-    spr.params = params
-    spr.img = img
-  }
-
-  /* update_animation is the main method to cycle through sprite animations */
-  let update_animation = (spr: sprite) => {
-    /* Only advance frame when ticked */
-    let curr_ticks = spr.ticks.contents
-    if curr_ticks >= spr.params.max_ticks {
-      spr.ticks := 0
-      if spr.params.loop {
-        spr.frame := mod(spr.frame.contents + 1, spr.params.max_frames)
-      }
-    } else {
-      spr.ticks := curr_ticks + 1
-    }
-  }
-}
-module Particle: {
-  open Actors
-  open Sprite
-
-  type part_params = {
-    sprite: Sprite.sprite,
-    rot: float,
-    lifetime: int,
-  }
-
-  type particle = {
-    params: part_params,
-    part_type: Actors.part_typ,
-    pos: Actors.xy,
-    vel: Actors.xy,
-    acc: Actors.xy,
-    mutable kill: bool,
-    mutable life: int,
-  }
-
-  let make: (
-    ~vel: (float, float)=?,
-    ~acc: (float, float)=?,
-    Actors.part_typ,
-    (float, float),
-    Dom_html.canvasRenderingContext2D,
-  ) => particle
-
-  let make_score: (int, (float, float), Dom_html.canvasRenderingContext2D) => particle
-
-  let process: particle => unit
-} = /* Template params associated with a particle */
-
-/* Backing sprite */
-/* Rotation */
-/* Life span */
-
-/* Kill the particle in the next frame */
-/* Remaining lifespan of particle */
-
-/* Makes a new particle of the given particle type with at a position. */
-
-/* Make a score particle. The first int indicates the score to spawn */
-
-/* Process a particle, updating its velocity and position. Also marks it as
- * killable if it exceeds its lifespan */
-
-{
-  open Actors
-  open Sprite
-
-  type part_params = {
-    sprite: Sprite.sprite,
-    rot: float,
-    lifetime: int,
-  }
-
-  type particle = {
-    params: part_params,
-    part_type: Actors.part_typ,
-    pos: Actors.xy,
-    vel: Actors.xy,
-    acc: Actors.xy,
-    mutable kill: bool,
-    mutable life: int,
-  }
-
-  /* Converts an x,y [pair] to an Actors.xy record */
-  let pair_to_xy = pair => {
-    x: fst(pair),
-    y: snd(pair),
-  }
-
-  /* Function wrapper to assist in generating the template paramss for a
-   * particle. */
-  let make_params = (sprite, rot, lifetime) => {
-    sprite,
-    rot,
-    lifetime,
-  }
-
-  /* Generate the template for a specific particle type */
-  let make_type = (typ, ctx) =>
-    switch typ {
-    | GoombaSquish as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-    | BrickChunkL as t => make_params(Sprite.make_particle(t, ctx), 0., 300)
-    | BrickChunkR as t => make_params(Sprite.make_particle(t, ctx), 0., 300)
-    | Score100 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-    | Score200 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-    | Score400 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-    | Score800 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-    | Score1000 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-    | Score2000 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-    | Score4000 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-    | Score8000 as t => make_params(Sprite.make_particle(t, ctx), 0., 30)
-    }
-
-  let make = (~vel=(0., 0.), ~acc=(0., 0.), part_type, pos, ctx) => {
-    let params = make_type(part_type, ctx)
-    let pos = pair_to_xy(pos)
-    and vel = pair_to_xy(vel)
-    and acc = pair_to_xy(acc)
-    {
-      params,
-      part_type,
-      pos,
-      vel,
-      acc,
-      kill: false,
-      life: params.lifetime,
-    }
-  }
-
-  let make_score = (score, pos, ctx) => {
-    let t = switch score {
-    | 100 => Score100
-    | 200 => Score200
-    | 400 => Score400
-    | 800 => Score800
-    | 1000 => Score1000
-    | 2000 => Score2000
-    | 4000 => Score4000
-    | 8000 => Score8000
-    | _ => Score100
-    }
-    make(~vel=(0.5, -0.7), t, pos, ctx)
-  }
-
-  /* Mutably update the velocity of a particle */
-  let update_vel = part => {
-    part.vel.x = part.vel.x +. part.acc.x
-    part.vel.y = part.vel.y +. part.acc.y
-  }
-
-  /* Mutably update the position of a particle */
-  let update_pos = part => {
-    part.pos.x = part.vel.x +. part.pos.x
-    part.pos.y = part.vel.y +. part.pos.y
-  }
-
-  let process = part => {
-    part.life = part.life - 1
-    if part.life == 0 {
-      part.kill = true
-    }
-    update_vel(part)
-    update_pos(part)
-  }
-}
-module Object: {
-  open Sprite
-  open Actors
-  open Particle
-
-  let invuln: int
-  let dampen_jump: float
-
-  type aabb = {
-    center: xy,
-    half: xy,
-  }
-
-  type obj_params = {
-    has_gravity: bool,
-    speed: float,
-  }
-  type obj = {
-    params: obj_params,
-    pos: xy,
-    vel: xy,
-    id: int,
-    mutable jumping: bool,
-    mutable grounded: bool,
-    mutable dir: Actors.dir_1d,
-    mutable invuln: int,
-    mutable kill: bool,
-    mutable health: int,
-    mutable crouch: bool,
-    mutable score: int,
-  }
-
-  type collidable =
-    | Player(pl_typ, sprite, obj)
-    | Enemy(enemy_typ, sprite, obj)
-    | Item(item_typ, sprite, obj)
-    | Block(block_typ, sprite, obj)
-
-  let get_sprite: collidable => Sprite.sprite
-
-  let get_obj: collidable => obj
-
-  let spawn: (Actors.spawn_typ, Dom_html.canvasRenderingContext2D, (float, float)) => collidable
-
-  let equals: (collidable, collidable) => bool
-
-  let is_player: collidable => bool
-  let is_enemy: collidable => bool
-
-  let normalize_origin: (xy, Sprite.sprite) => unit
-
-  let normalize_pos: (xy, Sprite.sprite_params, Sprite.sprite_params) => unit
-
-  let kill: (collidable, Dom_html.canvasRenderingContext2D) => list<particle>
-
-  let process_obj: (obj, float) => unit
-
-  let update_player: (
-    obj,
-    list<Actors.controls>,
-    Dom_html.canvasRenderingContext2D,
-  ) => option<(pl_typ, sprite)>
-
-  let check_collision: (collidable, collidable) => option<Actors.dir_2d>
-
-  let evolve_enemy: (
-    Actors.dir_1d,
-    Actors.enemy_typ,
-    Sprite.sprite,
-    obj,
-    Dom_html.canvasRenderingContext2D,
-  ) => option<collidable>
-
-  let evolve_block: (obj, Dom_html.canvasRenderingContext2D) => collidable
-  let dec_health: obj => unit
-
-  let rev_dir: (obj, Actors.enemy_typ, Sprite.sprite) => unit
-
-  let reverse_left_right: obj => unit
-
-  let collide_block: (~check_x: bool=?, Actors.dir_2d, obj) => unit
-
-  let spawn_above: (
-    Actors.dir_1d,
-    obj,
-    Actors.item_typ,
-    Dom_html.canvasRenderingContext2D,
-  ) => collidable
-} = /* # of frames of invulnerability */
-/* Boost to jump when enemy jumped on */
-
-/* Returns the sprite associated with the object */
-
-/* Creates a new object with a given
- * actor type on the the canvas at a given position */
-
-/* Destroys the object, returning a list of destruction effect objects */
-
-/* Checks whether a collision occured between two objects, returning the
- * direction of the collision if one occurred. */
-
-{
-  open Sprite
-  open Actors
-  open Particle
-
-  /* Variables */
-  let friction = 0.9
-  let gravity = 0.2
-  let max_y_vel = 4.5
-  let player_speed = 2.8
-  let player_jump = 5.7
-  let player_max_jump = -6.
-  let dampen_jump = 4.
-  let invuln = 60
-
-  type aabb = {
-    center: xy,
-    half: xy,
-  }
-
-  type obj_params = {
-    has_gravity: bool,
-    speed: float,
-  }
-
-  let id_counter = ref(min_int)
-
-  type obj = {
-    params: obj_params,
-    pos: xy,
-    vel: xy,
-    id: int,
-    mutable jumping: bool,
-    mutable grounded: bool,
-    mutable dir: Actors.dir_1d,
-    mutable invuln: int,
-    mutable kill: bool,
-    mutable health: int,
-    mutable crouch: bool,
-    mutable score: int,
-  }
-
-  type collidable =
-    | Player(pl_typ, sprite, obj)
-    | Enemy(enemy_typ, sprite, obj)
-    | Item(item_typ, sprite, obj)
-    | Block(block_typ, sprite, obj)
-
-  /* setup_obj is used to set gravity and speed, with default values true and 1. */
-  let setup_obj = (~g as has_gravity=true, ~spd as speed=1., ()) => {
-    has_gravity,
-    speed,
-  }
-
-  /* Sets an object's x velocity to the speed specified in its params based on
-   * its direction */
-  let set_vel_to_speed = obj => {
-    let speed = obj.params.speed
-    switch obj.dir {
-    | Left => obj.vel.x = -.speed
-    | Right => obj.vel.x = speed
-    }
-  }
-
-  /* The following make functions all set the objects' has_gravity and speed,
-   * returning an [obj_params] that can be directly plugged into the [obj]
-   * during creation. */
-  let make_player = () => setup_obj(~spd=player_speed, ())
-
-  let make_item = x =>
-    switch x {
-    | Mushroom => setup_obj()
-    | FireFlower => setup_obj()
-    | Star => setup_obj()
-    | Coin => setup_obj(~g=false, ())
-    }
-
-  let make_enemy = x =>
-    switch x {
-    | Goomba => setup_obj()
-    | GKoopa => setup_obj()
-    | RKoopa => setup_obj()
-    | GKoopaShell => setup_obj(~spd=3., ())
-    | RKoopaShell => setup_obj(~spd=3., ())
-    }
-
-  let make_block = x =>
-    switch x {
-    | QBlock(i) => setup_obj(~g=false, ())
-    | QBlockUsed => setup_obj(~g=false, ())
-    | Brick => setup_obj(~g=false, ())
-    | UnBBlock => setup_obj(~g=false, ())
-    | Cloud => setup_obj(~g=false, ())
-    | Panel => setup_obj(~g=false, ())
-    | Ground => setup_obj(~g=false, ())
-    }
-
-  let make_type = x =>
-    switch x {
-    | SPlayer(pt, t) => make_player() /* FIXME: why unused param introduced here */
-    | SEnemy(t) => make_enemy(t)
-    | SItem(t) => make_item(t)
-    | SBlock(t) => make_block(t)
-    }
-
-  /* Used in object creation and to compare two objects. */
-  let new_id = () => {
-    id_counter := id_counter.contents + 1
-    id_counter.contents
-  }
-
-  /* Used to return a new sprite and object of a created spawnable object */
-  let make = (~id=None, ~dir=Left, spawnable, context, (posx, posy)) => {
-    let spr = Sprite.make(spawnable, dir, context)
-    let params = make_type(spawnable)
-    let id = switch id {
-    | None => new_id()
-    | Some(n) => n
-    }
-
-    let obj = {
-      params,
-      pos: {x: posx, y: posy},
-      vel: {x: 0.0, y: 0.0},
-      id,
-      jumping: false,
-      grounded: false,
-      dir,
-      invuln: 0,
-      kill: false,
-      health: 1,
-      crouch: false,
-      score: 0,
-    }
-    (spr, obj)
-  }
-
-  /* spawn returns a new collidable */
-  let spawn = (spawnable, context, (posx, posy)) => {
-    let (spr, obj) = make(spawnable, context, (posx, posy))
-    switch spawnable {
-    | SPlayer(typ, t) => Player(typ, spr, obj)
-    | SEnemy(t) =>
-      set_vel_to_speed(obj)
-      Enemy(t, spr, obj)
-    | SItem(t) => Item(t, spr, obj)
-    | SBlock(t) => Block(t, spr, obj)
-    }
-  }
-
-  /* Helper methods for getting sprites and objects from their collidables */
-  let get_sprite = x =>
-    switch x {
-    | Player(_, s, _) | Enemy(_, s, _) | Item(_, s, _) | Block(_, s, _) => s
-    }
-
-  let get_obj = x =>
-    switch x {
-    | Player(_, _, o) | Enemy(_, _, o) | Item(_, _, o) | Block(_, _, o) => o
-    }
-
-  let is_player = x =>
-    switch x {
-    | Player(_, _, _) => true
-    | _ => false
-    }
-
-  let is_enemy = x =>
-    switch x {
-    | Enemy(_, _, _) => true
-    | _ => false
-    }
-
-  let equals = (col1, col2) => get_obj(col1).id == get_obj(col2).id
-
-  /* Matches the controls being used and updates each of the player's params. */
-  let update_player_keys = (player: obj, controls: controls): unit => {
-    let lr_acc = player.vel.x *. 0.2
-    switch controls {
-    | CLeft =>
-      if !player.crouch {
-        if player.vel.x > -.player.params.speed {
-          player.vel.x = player.vel.x -. (0.4 -. lr_acc)
-        }
-        player.dir = Left
-      }
-    | CRight =>
-      if !player.crouch {
-        if player.vel.x < player.params.speed {
-          player.vel.x = player.vel.x +. (0.4 +. lr_acc)
-        }
-        player.dir = Right
-      }
-    | CUp =>
-      if !player.jumping && player.grounded {
-        player.jumping = true
-        player.grounded = false
-        player.vel.y = max(
-          player.vel.y -. (player_jump +. abs_float(player.vel.x) *. 0.25),
-          player_max_jump,
-        )
-      }
-    | CDown =>
-      if !player.jumping && player.grounded {
-        player.crouch = true
-      }
-    }
-  }
-
-  /* Used for sprite changing. If sprites change to different dimensions as a result
-   *of some action, the new sprite must be normalized so that things aren't
-   *jumpy */
-  let normalize_pos = (pos, p1: Sprite.sprite_params, p2: Sprite.sprite_params) => {
-    let (box1, boy1) = p1.bbox_offset and (box2, boy2) = p2.bbox_offset
-    let (bw1, bh1) = p1.bbox_size and (bw2, bh2) = p2.bbox_size
-    pos.x = pos.x -. (bw2 +. box2) +. (bw1 +. box1)
-    pos.y = pos.y -. (bh2 +. boy2) +. (bh1 +. boy1)
-  }
-
-  /* Update player is constantly being called to check for if big or small
-   *Mario sprites/collidables should be used. */
-  let update_player = (player, keys, context) => {
-    let prev_jumping = player.jumping
-    let prev_dir = player.dir and prev_vx = abs_float(player.vel.x)
-    List.iter(update_player_keys(player), keys)
-    let v = player.vel.x *. friction
-    let vel_damped = if abs_float(v) < 0.1 {
-      0.
-    } else {
-      v
-    }
-    player.vel.x = vel_damped
-    let pl_typ = if player.health <= 1 {
-      SmallM
-    } else {
-      BigM
-    }
-    if !prev_jumping && player.jumping {
-      Some(pl_typ, Sprite.make(SPlayer(pl_typ, Jumping), player.dir, context))
-    } else if (
-      prev_dir != player.dir || (prev_vx == 0. && abs_float(player.vel.x) > 0. && !player.jumping)
-    ) {
-      Some(pl_typ, Sprite.make(SPlayer(pl_typ, Running), player.dir, context))
-    } else if prev_dir != player.dir && (player.jumping && prev_jumping) {
-      Some(pl_typ, Sprite.make(SPlayer(pl_typ, Jumping), player.dir, context))
-    } else if player.vel.y == 0. && player.crouch {
-      Some(pl_typ, Sprite.make(SPlayer(pl_typ, Crouching), player.dir, context))
-    } else if player.vel.y == 0. && player.vel.x == 0. {
-      Some(pl_typ, Sprite.make(SPlayer(pl_typ, Standing), player.dir, context))
-    } else {
-      None
-    }
-  }
-
-  /* The following two helper methods update velocity and position of the player */
-  let update_vel = obj =>
-    if obj.grounded {
-      obj.vel.y = 0.
-    } else if obj.params.has_gravity {
-      obj.vel.y = min(obj.vel.y +. gravity +. abs_float(obj.vel.y) *. 0.01, max_y_vel)
-    }
-
-  let update_pos = obj => {
-    obj.pos.x = obj.vel.x +. obj.pos.x
-    if obj.params.has_gravity {
-      obj.pos.y = obj.vel.y +. obj.pos.y
-    }
-  }
-
-  /* Calls two above helper functions to update velocity and position of player. */
-  let process_obj = (obj, mapy) => {
-    update_vel(obj)
-    update_pos(obj)
-    if obj.pos.y > mapy {
-      obj.kill = true
-    }
-  }
-
-  /* Converts an origin based on the bottom left of the bounding box to the top
-   * right of the sprite, to make it easier to place objects flush with the ground. */
-  let normalize_origin = (pos, spr: Sprite.sprite) => {
-    let p = spr.params
-    let (box, boy) = p.bbox_offset and (_, bh) = p.bbox_size
-    pos.x = pos.x -. box
-    pos.y = pos.y -. (boy +. bh)
-  }
-
-  /* Checks upon collision of block and updates the values of the object. */
-  let collide_block = (~check_x=true, dir, obj) =>
-    switch dir {
-    | North => obj.vel.y = -0.001
-    | South =>
-      obj.vel.y = 0.
-      obj.grounded = true
-      obj.jumping = false
-    | East | West =>
-      if check_x {
-        obj.vel.x = 0.
-      }
-    }
-
-  /* Simple helper method that reverses the direction in question */
-  let opposite_dir = dir =>
-    switch dir {
-    | Left => Right
-    | Right => Left
-    }
-
-  /* Used for enemy-enemy collisions */
-  let reverse_left_right = obj => {
-    obj.vel.x = -.obj.vel.x
-    obj.dir = opposite_dir(obj.dir)
-  }
-
-  /* Actually creates a new enemy and deletes the previous. The positions must be
-   *normalized. This method is typically called when enemies are killed and a
-   *new sprite must be used (i.e., koopa to koopa shell). */
-  let evolve_enemy = (player_dir, typ, spr: Sprite.sprite, obj, context) =>
-    switch typ {
-    | GKoopa =>
-      let (new_spr, new_obj) = make(
-        ~dir=obj.dir,
-        SEnemy(GKoopaShell),
-        context,
-        (obj.pos.x, obj.pos.y),
-      )
-      normalize_pos(new_obj.pos, spr.params, new_spr.params)
-      Some(Enemy(GKoopaShell, new_spr, new_obj))
-    | RKoopa =>
-      let (new_spr, new_obj) = make(
-        ~dir=obj.dir,
-        SEnemy(RKoopaShell),
-        context,
-        (obj.pos.x, obj.pos.y),
-      )
-      normalize_pos(new_obj.pos, spr.params, new_spr.params)
-      Some(Enemy(RKoopaShell, new_spr, new_obj))
-    | GKoopaShell | RKoopaShell =>
-      obj.dir = player_dir
-      if obj.vel.x != 0. {
-        obj.vel.x = 0.
-      } else {
-        set_vel_to_speed(obj)
-      }
-      None
-    | _ =>
-      obj.kill = true
-      None
-    }
-
-  /* Updates the direction of the sprite. */
-  let rev_dir = (o, t, s: sprite) => {
-    reverse_left_right(o)
-    let old_params = s.params
-    Sprite.transform_enemy(t, s, o.dir)
-    normalize_pos(o.pos, old_params, s.params)
-  }
-
-  /* Used for killing enemies, or to make big Mario into small Mario */
-  let dec_health = obj => {
-    let health = obj.health - 1
-    if health == 0 {
-      obj.kill = true
-    } else if obj.invuln == 0 {
-      obj.health = health
-    }
-  }
-
-  /* Used for deleting a block and replacing it with a used block */
-  let evolve_block = (obj, context) => {
-    dec_health(obj)
-    let (new_spr, new_obj) = make(SBlock(QBlockUsed), context, (obj.pos.x, obj.pos.y))
-    Block(QBlockUsed, new_spr, new_obj)
-  }
-
-  /* Used for making a small Mario into a Big Mario */
-  let evolve_player = (spr: Sprite.sprite, obj, context) => {
-    let (new_spr, new_obj) = make(SPlayer(BigM, Standing), context, (obj.pos.x, obj.pos.y))
-    normalize_pos(new_obj.pos, spr.params, new_spr.params)
-    Player(BigM, new_spr, new_obj)
-  }
-
-  /* Used for spawning items above question mark blocks */
-  let spawn_above = (player_dir, obj, typ, context) => {
-    let item = spawn(SItem(typ), context, (obj.pos.x, obj.pos.y))
-    let item_obj = get_obj(item)
-    item_obj.pos.y = item_obj.pos.y -. snd(get_sprite(item).params.frame_size)
-    item_obj.dir = opposite_dir(player_dir)
-    set_vel_to_speed(item_obj)
-    item
-  }
-
-  /* Used to get the bounding box. */
-  let get_aabb = obj => {
-    let spr = get_sprite(obj).params
-    let obj = get_obj(obj)
-    let (offx, offy) = spr.bbox_offset
-    let (box, boy) = (obj.pos.x +. offx, obj.pos.y +. offy)
-    let (sx, sy) = spr.bbox_size
-    {
-      center: {x: box +. sx /. 2., y: boy +. sy /. 2.},
-      half: {x: sx /. 2., y: sy /. 2.},
-    }
-  }
-
-  let col_bypass = (c1, c2) => {
-    let o1 = get_obj(c1) and o2 = get_obj(c2)
-    let ctypes = switch (c1, c2) {
-    | (Item(_, _, _), Enemy(_, _, _))
-    | (Enemy(_, _, _), Item(_, _, _))
-    | (Item(_, _, _), Item(_, _, _)) => true
-    | (Player(_, _, o1), Enemy(_, _, _)) =>
-      if o1.invuln > 0 {
-        true
-      } else {
-        false
-      }
-    | _ => false
-    }
-    o1.kill || (o2.kill || ctypes)
-  }
-
-  /* Used for checking if collisions occur. Compares half-widths and half-heights
-   *and adjusts for when collisions do occur, by changing position so that
-   *a second collision does not occur again immediately. This causes snapping. */
-  let check_collision = (c1, c2) => {
-    let b1 = get_aabb(c1) and b2 = get_aabb(c2)
-    let o1 = get_obj(c1)
-    if col_bypass(c1, c2) {
-      None
-    } else {
-      let vx = b1.center.x -. b2.center.x
-      let vy = b1.center.y -. b2.center.y
-      let hwidths = b1.half.x +. b2.half.x
-      let hheights = b1.half.y +. b2.half.y
-      if abs_float(vx) < hwidths && abs_float(vy) < hheights {
-        let ox = hwidths -. abs_float(vx)
-        let oy = hheights -. abs_float(vy)
-        if ox >= oy {
-          if vy > 0. {
-            o1.pos.y = o1.pos.y +. oy
-            Some(North)
-          } else {
-            o1.pos.y = o1.pos.y -. oy
-            Some(South)
-          }
-        } else if vx > 0. {
-          o1.pos.x = o1.pos.x +. ox
-          Some(West)
-        } else {
-          o1.pos.x = o1.pos.x -. ox
-          Some(East)
-        }
-      } else {
-        None
-      }
-    }
-  }
-
-  /* "Kills" the matched object by setting certain parameters for each. */
-  let kill = (collid, ctx) =>
-    switch collid {
-    | Enemy(t, s, o) =>
-      let pos = (o.pos.x, o.pos.y)
-      let score = if o.score > 0 {
-        list{Particle.make_score(o.score, pos, ctx)}
-      } else {
-        list{}
-      }
-      let remains = switch t {
-      | Goomba => list{Particle.make(GoombaSquish, pos, ctx)}
-      | _ => list{}
-      }
-      \"@"(score, remains)
-    | Block(t, s, o) =>
-      switch t {
-      | Brick =>
-        let pos = (o.pos.x, o.pos.y)
-        let p1 = Particle.make(~vel=(-5., -5.), ~acc=(0., 0.2), BrickChunkL, pos, ctx)
-        let p2 = Particle.make(~vel=(-3., -4.), ~acc=(0., 0.2), BrickChunkL, pos, ctx)
-        let p3 = Particle.make(~vel=(3., -4.), ~acc=(0., 0.2), BrickChunkR, pos, ctx)
-        let p4 = Particle.make(~vel=(5., -5.), ~acc=(0., 0.2), BrickChunkR, pos, ctx)
-        list{p1, p2, p3, p4}
-      | _ => list{}
-      }
-    | Item(t, s, o) =>
-      switch t {
-      | Mushroom => list{Particle.make_score(o.score, (o.pos.x, o.pos.y), ctx)}
-      | _ => list{}
-      }
-    | _ => list{}
-    }
-}
-module Draw: {
-  let render: (Sprite.sprite, (float, float)) => unit
-
-  let clear_canvas: Dom_html.canvasElement => unit
-
-  let draw_bgd: (Sprite.sprite, float) => unit
-
-  let render_bbox: (Sprite.sprite, (float, float)) => unit
-
-  let fps: (Dom_html.canvasElement, float) => unit
-
-  let hud: (Dom_html.canvasElement, int, int) => unit
-
-  let game_win: Dom_html.canvasRenderingContext2D => unit
-
-  let game_loss: Dom_html.canvasRenderingContext2D => unit
-} = /* Renders a given object on the canvas */
-
-/* Clears the canvas */
-
-/* Draw the given sprite as a background */
-
-/* Draws the axis aligned bounding box of the sprite at the position */
-
-/* Draws the fps on the canvas */
-
-/* Draw the heads up display */
-
-/* Draw the game win screen */
-
-/* Draw the game loss screen */
-
-{
-  open Object
-  open Sprite
-  module Html = Dom_html
-  let document = Html.document
-
-  let get_context = canvas => canvas["getContext"]("2d")
-
-  let render_bbox = (sprite, (posx, posy)) => {
-    let context = Dom_html.canvasRenderingContext2DToJsObj(sprite.context)
-    let (bbox, bboy) = sprite.params.bbox_offset
-    let (bbsx, bbsy) = sprite.params.bbox_size
-    context["strokeStyle"] = "#FF0000"
-    context["strokeRect"](posx +. bbox, posy +. bboy, bbsx, bbsy)
-  }
-
-  /* Draws a sprite onto the canvas. */
-  let render = (sprite, (posx, posy)) => {
-    let context = Dom_html.canvasRenderingContext2DToJsObj(sprite.context)
-    let (sx, sy) = sprite.params.src_offset
-    let (sw, sh) = sprite.params.frame_size
-    let (dx, dy) = (posx, posy)
-    let (dw, dh) = sprite.params.frame_size
-    let sx = sx +. float_of_int(sprite.frame.contents) *. sw
-    /* print_endline (string_of_int !(sprite.frame)); */
-    /* context##clearRect(0.,0.,sw, sh); */
-    context["drawImage"](sprite.img, sx, sy, sw, sh, dx, dy, dw, dh)
-  }
-
-  /* Draws two background images, which needs to be done because of the
-   *constantly changing viewport, which is always at most going to be
-   *between two background images. */
-  let draw_bgd = (bgd, off_x) => {
-    render(bgd, (-.off_x, 0.))
-    render(bgd, (fst(bgd.params.frame_size) -. off_x, 0.))
-  }
-
-  /* Used for animation updating. Canvas is cleared each frame and redrawn. */
-  let clear_canvas = canvas => {
-    let canvas = Dom_html.canvasElementToJsObj(canvas)
-    let context = Dom_html.canvasRenderingContext2DToJsObj(canvas["getContext"]("2d"))
-    let cwidth = float_of_int(canvas["width"])
-    let cheight = float_of_int(canvas["height"])
-    \"@@"(ignore, context["clearRect"](0., 0., cwidth, cheight))
-  }
-
-  /* Displays the text for score and coins. */
-  let hud = (canvas, score, coins) => {
-    let score_string = string_of_int(score)
-    let coin_string = string_of_int(coins)
-    let canvas = Dom_html.canvasElementToJsObj(canvas)
-    let context = Dom_html.canvasRenderingContext2DToJsObj(canvas["getContext"]("2d"))
-    \"@@"(ignore, context["font"] = "10px 'Press Start 2P'")
-    \"@@"(
-      ignore,
-      context["fillText"]("Score: " ++ score_string, float_of_int(canvas["width"]) -. 140., 18.),
-    )
-    \"@@"(ignore, context["fillText"]("Coins: " ++ coin_string, 120., 18.))
-  }
-
-  /* Displays the fps. */
-  let fps = (canvas, fps_val) => {
-    let fps_str = int_of_float(fps_val) |> string_of_int
-    let canvas = Dom_html.canvasElementToJsObj(canvas)
-    let context = Dom_html.canvasRenderingContext2DToJsObj(canvas["getContext"]("2d"))
-    \"@@"(ignore, context["fillText"](fps_str, 10., 18.))
-  }
-
-  /* game_win displays a black screen when you finish a game. */
-  let game_win = ctx => {
-    let ctx = Dom_html.canvasRenderingContext2DToJsObj(ctx)
-    ctx["rect"](0., 0., 512., 512.)
-    ctx["fillStyle"] = "black"
-    ctx["fill"]()
-    ctx["fillStyle"] = "white"
-    ctx["font"] = "20px 'Press Start 2P'"
-    ctx["fillText"]("You win!", 180., 128.)
-    failwith("Game over.")
-  }
-
-  /* gave_loss displays a black screen stating a loss to finish that level play. */
-  let game_loss = ctx => {
-    let ctx = Dom_html.canvasRenderingContext2DToJsObj(ctx)
-    ctx["rect"](0., 0., 512., 512.)
-    ctx["fillStyle"] = "black"
-    ctx["fill"]()
-    ctx["fillStyle"] = "white"
-    ctx["font"] = "20px 'Press Start 2P'"
-    ctx["fillText"]("GAME OVER. You lose!", 60., 128.)
-    failwith("Game over.")
-  }
-
-  let draw_background_color = canvas => failwith("todo")
-}
-module Viewport: {
-  open Actors
-
-  type viewport = {
-    pos: Actors.xy /* Absolute position of viewport relative to map */,
-    v_dim: Actors.xy /* Dimensions of viewport */,
-    m_dim: Actors.xy /* Dimensions of map */,
-  }
-
-  /* Makes a new viewport of viewport dimensions and map dimensions */
-  let make: ((float, float), (float, float)) => viewport
-
-  /* Calculates the viewport origin point */
-  let calc_viewport_point: (float, float, float) => float
-
-  /* Whether the supplied position is outside of the viewport */
-  let in_viewport: (viewport, Actors.xy) => bool
-
-  /* Whether the supplied position is below the viewport */
-  let out_of_viewport_below: (viewport, float) => bool
-
-  /* Converts absolute coordinates to viewport coodinates */
-  let coord_to_viewport: (viewport, Actors.xy) => Actors.xy
-
-  /* Update the viewport */
-  let update: (viewport, Actors.xy) => viewport
-} = {
-  open Actors
-
-  type viewport = {
-    pos: Actors.xy,
-    v_dim: Actors.xy,
-    m_dim: Actors.xy,
-  }
-
-  let make = ((vx, vy), (mx, my)) => {
-    pos: {x: 0., y: 0.},
-    v_dim: {x: vx, y: vy},
-    m_dim: {x: mx, y: my},
-  }
-
-  /* Calculates the viewport origin coordinate given the centering coordinate
-   * [cc], the canvas coordinate [vc], and the map coordinate [mc]. This function
-   * works for both x and y. At the extreme points, it will ensure that the
-   * viewport is always within bounds of the map, even if it is no longer
-   * centered about the origin point. */
-  let calc_viewport_point = (cc, vc, mc) => {
-    let vc_half = vc /. 2.
-    min(max(cc -. vc_half, 0.), min(mc -. vc, abs_float(cc -. vc_half)))
-  }
-
-  /* Returns whether a coordinate pair [pos] is inside the viewport [v] */
-  let in_viewport = (v, pos) => {
-    let margin = 32.
-    let (v_min_x, v_max_x) = (v.pos.x -. margin, v.pos.x +. v.v_dim.x)
-    let (v_min_y, v_max_y) = (v.pos.y -. margin, v.pos.y +. v.v_dim.y)
-    let (x, y) = (pos.x, pos.y)
-    x >= v_min_x && (x <= v_max_x && (y >= v_min_y && y <= v_max_y))
-  }
-
-  /* Returns whether an object is outside of the viewport and below it. This is
-   * useful for determining whether to process falling out of screen normally. */
-  let out_of_viewport_below = (v, y) => {
-    let v_max_y = v.pos.y +. v.v_dim.y
-    y >= v_max_y
-  }
-
-  /* Converts a x,y [coord] pair in absolute coordinates to coordinates relative
-   * to the viewport */
-  let coord_to_viewport = (viewport, coord) => {
-    x: coord.x -. viewport.pos.x,
-    y: coord.y -. viewport.pos.y,
-  }
-
-  /* Update the viewport [vpt] given the new center x,y coordinate pair [ctr] */
-  let update = (vpt, ctr) => {
-    let new_x = calc_viewport_point(ctr.x, vpt.v_dim.x, vpt.m_dim.x)
-    let new_y = calc_viewport_point(ctr.y, vpt.v_dim.y, vpt.m_dim.y)
-    let pos = {x: new_x, y: new_y}
-    {...vpt, pos}
-  }
-}
-module Director: {
-  let update_loop: (
-    Dom_html.canvasElement,
-    (Object.collidable, list<Object.collidable>),
-    (float, float),
-  ) => unit
-
-  let keydown: Dom.keyboardEvent => bool
-
-  let keyup: Dom.keyboardEvent => bool
-} = /* Initiates the main game loop */
-
-/* Keydown event handler function */
-
-/* Keyup event handler function */
-
-{
-  open Sprite
-  open Object
-  open Actors
-  open Viewport
-  open Particle
-
-  /* Represents the values of relevant key bindings. */
-  type keys = {
-    mutable left: bool,
-    mutable right: bool,
-    mutable up: bool,
-    mutable down: bool,
-    mutable bbox: int,
-  }
-
-  /* st represents the state of the game. It includes a background sprite (e.g.,
-   * (e.g., hills), a context (used for rendering onto the page), a viewport
-   * (used for moving the player's "camera"), a score (which is kept track
-   * throughout the game), coins (also kept track through the game),
-   * a multiplier (used for when you kill multiple enemies before ever touching
-   * the ground, as in the actual Super Mario), and a game_over bool (which
-   * is only true when the game is over). */
-  type st = {
-    bgd: sprite,
-    ctx: Dom_html.canvasRenderingContext2D,
-    vpt: viewport,
-    map: float,
-    mutable score: int,
-    mutable coins: int,
-    mutable multiplier: int,
-    mutable game_over: bool,
-  }
-
-  /* pressed_keys instantiates the keys. */
-  let pressed_keys = {
-    left: false,
-    right: false,
-    up: false,
-    down: false,
-    bbox: 0,
-  }
-
-  let collid_objs = ref(list{}) /* List of next iteration collidable objects */
-  let particles = ref(list{}) /* List of next iteration particles */
-  let last_time = ref(0.) /* Used for calculating fps */
-
-  /* Calculates fps as the difference between [t0] and [t1] */
-  let calc_fps = (t0, t1) => {
-    let delta = (t1 -. t0) /. 1000.
-    1. /. delta
-  }
-
-  /* Adds [i] to the score in [state] */
-  let update_score = (state, i) => state.score = state.score + i
-
-  /* player_attack_enemy is called for a player hitting an enemy from the north.
-   *This causes the player to either kill the enemy or move the enemy, in the
-   *case that the enemy is a shell. Invulnerability, jumping, and grounded
-   *are used for fine tuning the movements. */
-  let player_attack_enemy = (s1, o1, typ, s2, o2, state, context) => {
-    o1.invuln = 10
-    o1.jumping = false
-    o1.grounded = true
-    switch typ {
-    | GKoopaShell | RKoopaShell =>
-      let r2 = evolve_enemy(o1.dir, typ, s2, o2, context)
-      o1.vel.y = -.dampen_jump
-      o1.pos.y = o1.pos.y -. 5.
-      (None, r2)
-    | _ =>
-      dec_health(o2)
-      o1.vel.y = -.dampen_jump
-      if state.multiplier == 8 {
-        update_score(state, 800)
-        o2.score = 800
-        (None, evolve_enemy(o1.dir, typ, s2, o2, context))
-      } else {
-        let score = 100 * state.multiplier
-        update_score(state, score)
-        o2.score = score
-        state.multiplier = state.multiplier * 2
-        (None, evolve_enemy(o1.dir, typ, s2, o2, context))
-      }
-    }
-  }
-
-  /* enemy_attack_player is used when an enemy kills a player. */
-  let enemy_attack_player = (s1, o1: Object.obj, t2, s2, o2: Object.obj, context) =>
-    switch t2 {
-    | GKoopaShell | RKoopaShell =>
-      let r2 = if o2.vel.x == 0. {
-        evolve_enemy(o1.dir, t2, s2, o2, context)
-      } else {
-        dec_health(o1)
-        o1.invuln = invuln
-        None
-      }
-      (None, r2)
-    | _ =>
-      dec_health(o1)
-      o1.invuln = invuln
-      (None, None)
-    }
-
-  /* In the case that two enemies collide, they are to reverse directions. However,
-   *in the case that one or more of the two enemies is a koopa shell, then
-   *the koopa shell kills the other enemy. */
-  let col_enemy_enemy = (t1, s1, o1, t2, s2, o2, dir) =>
-    switch (t1, t2) {
-    | (GKoopaShell, GKoopaShell)
-    | (GKoopaShell, RKoopaShell)
-    | (RKoopaShell, RKoopaShell)
-    | (RKoopaShell, GKoopaShell) =>
-      dec_health(o1)
-      dec_health(o2)
-      (None, None)
-    | (RKoopaShell, _) | (GKoopaShell, _) =>
-      if o1.vel.x == 0. {
-        rev_dir(o2, t2, s2)
-        (None, None)
-      } else {
-        dec_health(o2)
-        (None, None)
-      }
-    | (_, RKoopaShell) | (_, GKoopaShell) =>
-      if o2.vel.x == 0. {
-        rev_dir(o1, t1, s1)
-        (None, None)
-      } else {
-        dec_health(o1)
-        (None, None)
-      }
-    | (_, _) =>
-      switch dir {
-      | West | East =>
-        rev_dir(o1, t1, s1)
-        rev_dir(o2, t2, s2)
-        (None, None)
-      | _ => (None, None)
-      }
-    }
-
-  /* Gets the object at a given position */
-  let obj_at_pos = (dir, pos: xy, collids: list<Object.collidable>): list<Object.collidable> =>
-    switch dir {
-    | Left =>
-      List.filter(
-        (col: Object.collidable) =>
-          get_obj(col).pos.y == pos.y && get_obj(col).pos.x == pos.x -. 16.,
-        collids,
-      )
-    | _ =>
-      List.filter(
-        (col: Object.collidable) =>
-          get_obj(col).pos.y == pos.y && get_obj(col).pos.x == pos.x +. 16.,
-        collids,
-      )
-    }
-
-  /* Returns whether the object at a given position is a block */
-  let is_block = (dir, pos, collids) =>
-    switch obj_at_pos(dir, pos, collids) {
-    | list{} => false
-    | list{Block(_, _, _)} => true
-    | _ => false
-    }
-
-  /* Returns whether the given object is a red koopa */
-  let is_rkoopa = collid =>
-    switch collid {
-    | Enemy(RKoopa, _, _) => true
-    | _ => false
-    }
-
-  /* Process collision is called to match each of the possible collisions that
-   * may occur. Returns a pair of collidable options, representing objects that
-   * were created from the existing ones. That is, the first element represents
-   * a new item spawned as a result of the first collidable. None indicates that
-   * no new item should be spawned. Transformations to existing objects occur
-   * mutably, as many changes are side-effectual. */
-  let process_collision = (
-    dir: Actors.dir_2d,
-    c1: Object.collidable,
-    c2: Object.collidable,
-    state: st,
-  ): (option<Object.collidable>, option<Object.collidable>) => {
-    let context = state.ctx
-    switch (c1, c2, dir) {
-    | (Player(_, s1, o1), Enemy(typ, s2, o2), South)
-    | (Enemy(typ, s2, o2), Player(_, s1, o1), North) =>
-      player_attack_enemy(s1, o1, typ, s2, o2, state, context)
-    | (Player(_, s1, o1), Enemy(t2, s2, o2), _)
-    | (Enemy(t2, s2, o2), Player(_, s1, o1), _) =>
-      enemy_attack_player(s1, o1, t2, s2, o2, context)
-    | (Player(_, s1, o1), Item(t2, s2, o2), _)
-    | (Item(t2, s2, o2), Player(_, s1, o1), _) =>
-      switch t2 {
-      | Mushroom =>
-        dec_health(o2)
-        if o1.health == 2 {
-          ()
-        } else {
-          o1.health = o1.health + 1
-        }
-        o1.vel.x = 0.
-        o1.vel.y = 0.
-        update_score(state, 1000)
-        o2.score = 1000
-        (None, None)
-      | Coin =>
-        state.coins = state.coins + 1
-        dec_health(o2)
-        update_score(state, 100)
-        (None, None)
-      | _ =>
-        dec_health(o2)
-        update_score(state, 1000)
-        (None, None)
-      }
-    | (Enemy(t1, s1, o1), Enemy(t2, s2, o2), dir) => col_enemy_enemy(t1, s1, o1, t2, s2, o2, dir)
-    | (Enemy(t1, s1, o1), Block(t2, s2, o2), East)
-    | (Enemy(t1, s1, o1), Block(t2, s2, o2), West) =>
-      switch (t1, t2) {
-      /* FIXME */
-      | (RKoopaShell, Brick) | (GKoopaShell, Brick) =>
-        dec_health(o2)
-        reverse_left_right(o1)
-        (None, None)
-      | (RKoopaShell, QBlock(typ)) | (GKoopaShell, QBlock(typ)) =>
-        let updated_block = evolve_block(o2, context)
-        let spawned_item = spawn_above(o1.dir, o2, typ, context)
-        rev_dir(o1, t1, s1)
-        (Some(updated_block), Some(spawned_item))
-      | (_, _) =>
-        rev_dir(o1, t1, s1)
-        (None, None)
-      }
-    | (Item(_, s1, o1), Block(typ2, s2, o2), East)
-    | (Item(_, s1, o1), Block(typ2, s2, o2), West) =>
-      reverse_left_right(o1)
-      (None, None)
-    | (Enemy(_, s1, o1), Block(typ2, s2, o2), _)
-    | (Item(_, s1, o1), Block(typ2, s2, o2), _) =>
-      collide_block(dir, o1)
-      (None, None)
-    | (Player(t1, s1, o1), Block(t, s2, o2), North) =>
-      switch t {
-      | QBlock(typ) =>
-        let updated_block = evolve_block(o2, context)
-        let spawned_item = spawn_above(o1.dir, o2, typ, context)
-        collide_block(dir, o1)
-        (Some(spawned_item), Some(updated_block))
-      | Brick =>
-        if t1 == BigM {
-          collide_block(dir, o1)
-          dec_health(o2)
-          (None, None)
-        } else {
-          collide_block(dir, o1)
-          (None, None)
-        }
-      | Panel =>
-        Draw.game_win(state.ctx)
-        (None, None)
-      | _ =>
-        collide_block(dir, o1)
-        (None, None)
-      }
-    | (Player(_, s1, o1), Block(t, s2, o2), _) =>
-      switch t {
-      | Panel =>
-        Draw.game_win(state.ctx)
-        (None, None)
-      | _ =>
-        switch dir {
-        | South =>
-          state.multiplier = 1
-          collide_block(dir, o1)
-          (None, None)
-        | _ =>
-          collide_block(dir, o1)
-          (None, None)
-        }
-      }
-    | (_, _, _) => (None, None)
-    }
-  }
-
-  /* Run the broad phase object filtering */
-  let broad_phase = (collid, all_collids, state) => {
-    let obj = get_obj(collid)
-    List.filter(
-      c =>
-        in_viewport(state.vpt, obj.pos) ||
-        (is_player(collid) ||
-        out_of_viewport_below(state.vpt, obj.pos.y)),
-      all_collids,
-    )
-  }
-
-  /* narrow_phase of collision is used in order to continuously loop through
-   *each of the collidable objects to constantly check if collisions are
-   *occurring. */
-  let rec narrow_phase = (c, cs, state) => {
-    let rec narrow_helper = (c, cs, state, acc) =>
-      switch cs {
-      | list{} => acc
-      | list{h, ...t} =>
-        let c_obj = get_obj(c)
-        let new_objs = if !equals(c, h) {
-          switch Object.check_collision(c, h) {
-          | None => (None, None)
-          | Some(dir) =>
-            if get_obj(h).id != c_obj.id {
-              /* ( (if (if is_rkoopa c then
-            begin match c_obj.dir with
-            | Left -> is_block c_obj.dir {x= c_obj.pos.x -. 16.; y= c_obj.pos.y -. 27.} cs
-            | _ -> is_block c_obj.dir {x= c_obj.pos.x +. 16.; y= c_obj.pos.y -. 27.} cs
-            end else false) then rev_dir c_obj RKoopa (Object.get_sprite c) else
-            ());*/
-              process_collision(dir, c, h, state)
-            } else {
-              (None, None)
-            }
-          }
-        } else {
-          (None, None)
-        }
-        let acc = switch new_objs {
-        | (None, Some(o)) => list{o, ...acc}
-        | (Some(o), None) => list{o, ...acc}
-        | (Some(o1), Some(o2)) => list{o1, o2, ...acc}
-        | (None, None) => acc
-        }
-
-        narrow_helper(c, t, state, acc)
-      }
-    narrow_helper(c, cs, state, list{})
-  }
-
-  /* This is an optimization setp to determine which objects require narrow phase
-   * checking. This excludes static collidables, allowing collision to only be
-   * checked with moving objects. This method is called once per collidable.
-   * Collision detection proceeds as follows:
-   * 1. Broad phase - filter collidables that cannot possibly collide with
-   *    this object.
-   * 2. Narrow phase - compare against all objects to determine whether there
-   *    is a collision, and process the collision.
-   * This method returns a list of objects that are created, which should be
-   * added to the list of collidables for the next iteration.
-   * */
-  let check_collisions = (collid, all_collids, state) =>
-    switch collid {
-    | Block(_, _, _) => list{}
-    | _ =>
-      let broad = broad_phase(collid, all_collids, state)
-      narrow_phase(collid, broad, state)
-    }
-
-  /* Returns whether the bounding box should be drawn */
-  let check_bbox_enabled = () => pressed_keys.bbox == 1
-
-  /* update_collidable is the primary update method for collidable objects,
-   * checking the collision, updating the object, and drawing to the canvas. */
-  let update_collidable = (state, collid: Object.collidable, all_collids) => {
-    /* TODO: optimize. Draw static elements only once */
-    let obj = Object.get_obj(collid)
-    let spr = Object.get_sprite(collid)
-    obj.invuln = if obj.invuln > 0 {
-      obj.invuln - 1
-    } else {
-      0
-    }
-    /* Prevent position from being updated outside of viewport */
-    let viewport_filter =
-      in_viewport(state.vpt, obj.pos) ||
-      (is_player(collid) ||
-      out_of_viewport_below(state.vpt, obj.pos.y))
-    if !obj.kill && viewport_filter {
-      obj.grounded = false
-      Object.process_obj(obj, state.map)
-      /* Run collision detection if moving object */
-      let evolved = check_collisions(collid, all_collids, state)
-      /* Render and update animation */
-      let vpt_adj_xy = coord_to_viewport(state.vpt, obj.pos)
-      Draw.render(spr, (vpt_adj_xy.x, vpt_adj_xy.y))
-      if check_bbox_enabled() {
-        Draw.render_bbox(spr, (vpt_adj_xy.x, vpt_adj_xy.y))
-      }
-
-      if obj.vel.x != 0. || !is_enemy(collid) {
-        Sprite.update_animation(spr)
-      }
-      evolved
-    } else {
-      list{}
-    }
-  }
-
-  /* Converts a keypress to a list of control keys, allowing more than one key
-   * to be processed each frame. */
-  let translate_keys = () => {
-    let k = pressed_keys
-    let ctrls = list{(k.left, CLeft), (k.right, CRight), (k.up, CUp), (k.down, CDown)}
-    List.fold_left((a, x) =>
-      if fst(x) {
-        list{snd(x), ...a}
-      } else {
-        a
-      }
-    , list{}, ctrls)
-  }
-
-  /* run_update is used to update all of the collidables at once. Primarily used
-   * as a wrapper method. This method is necessary to differentiate between
-   * the player collidable and the remaining collidables, as special operations
-   * such as viewport centering only occur with the player. */
-  let run_update_collid = (state, collid, all_collids) =>
-    switch collid {
-    | Player(t, s, o) as p =>
-      let keys = translate_keys()
-      o.crouch = false
-      let player = switch Object.update_player(o, keys, state.ctx) {
-      | None => p
-      | Some(new_typ, new_spr) =>
-        Object.normalize_pos(o.pos, s.params, new_spr.params)
-        Player(new_typ, new_spr, o)
-      }
-      let evolved = update_collidable(state, player, all_collids)
-      collid_objs := \"@"(collid_objs.contents, evolved)
-      player
-    | _ =>
-      let obj = get_obj(collid)
-      let evolved = update_collidable(state, collid, all_collids)
-      if !obj.kill {
-        collid_objs := list{collid, ...\"@"(collid_objs.contents, evolved)}
-      }
-      let new_parts = if obj.kill {
-        Object.kill(collid, state.ctx)
-      } else {
-        list{}
-      }
-      particles := \"@"(particles.contents, new_parts)
-      collid
-    }
-
-  /* Primary update function to update and persist a particle */
-  let run_update_particle = (state, part) => {
-    Particle.process(part)
-    let x = part.pos.x -. state.vpt.pos.x and y = part.pos.y -. state.vpt.pos.y
-    Draw.render(part.params.sprite, (x, y))
-    if !part.kill {
-      particles := list{part, ...particles.contents}
-    }
-  }
-
-  /* update_loop is constantly being called to check for collisions and to
-   *update each of the objects in the game. */
-  let update_loop = (canvas, (player, objs), map_dim) => {
-    let scale = 1.
-    let ctx = Dom_html.canvasElementToJsObj(canvas)["getContext"]("2d")
-    let cwidth = float_of_int(Dom_html.canvasElementToJsObj(canvas)["width"]) /. scale
-    let cheight = float_of_int(Dom_html.canvasElementToJsObj(canvas)["height"]) /. scale
-    let viewport = Viewport.make((cwidth, cheight), map_dim)
-    let state = {
-      bgd: Sprite.make_bgd(ctx),
-      vpt: Viewport.update(viewport, get_obj(player).pos),
-      ctx,
-      score: 0,
-      coins: 0,
-      multiplier: 1,
-      map: snd(map_dim),
-      game_over: false,
-    }
-    Dom_html.canvasRenderingContext2DToJsObj(state.ctx)["scale"](scale, scale)
-    let rec update_helper = (time, state, player, objs, parts) =>
-      if state.game_over == true {
-        Draw.game_win(state.ctx)
-      } else {
-        collid_objs := list{}
-        particles := list{}
-
-        let fps = calc_fps(last_time.contents, time)
-        last_time := time
-
-        Draw.clear_canvas(canvas)
-
-        /* Parallax background */
-        let vpos_x_int = int_of_float(state.vpt.pos.x /. 5.)
-        let bgd_width = int_of_float(fst(state.bgd.params.frame_size))
-        Draw.draw_bgd(state.bgd, float_of_int(mod(vpos_x_int, bgd_width)))
-
-        let player = run_update_collid(state, player, objs)
-
-        if get_obj(player).kill == true {
-          Draw.game_loss(state.ctx)
-        } else {
-          let state = {
-            ...state,
-            vpt: Viewport.update(state.vpt, get_obj(player).pos),
-          }
-          List.iter(obj => ignore(run_update_collid(state, obj, objs)), objs)
-          List.iter(part => run_update_particle(state, part), parts)
-          Draw.fps(canvas, fps)
-          Draw.hud(canvas, state.score, state.coins)
-          \"@@"(
-            ignore,
-            Dom_html.requestAnimationFrame((t: float) =>
-              update_helper(t, state, player, collid_objs.contents, particles.contents)
-            ),
-          )
-        }
-      }
-    update_helper(0., state, player, objs, list{})
-  }
-
-  /* Keydown event handler translates a key press */
-  let keydown = evt => {
-    let evt = Dom_html.keyboardEventToJsObj(evt)
-    let () = switch evt["keyCode"] {
-    | 38 | 32 | 87 => pressed_keys.up = true
-    | 39 | 68 => pressed_keys.right = true
-    | 37 | 65 => pressed_keys.left = true
-    | 40 | 83 => pressed_keys.down = true
-    | 66 => pressed_keys.bbox = mod(pressed_keys.bbox + 1, 2)
-    | _ => ()
-    }
-    true
-  }
-
-  /* Keyup event handler translates a key release */
-  let keyup = evt => {
-    let evt = Dom_html.keyboardEventToJsObj(evt)
-    let () = switch evt["keyCode"] {
-    | 38 | 32 | 87 => pressed_keys.up = false
-    | 39 | 68 => pressed_keys.right = false
-    | 37 | 65 => pressed_keys.left = false
-    | 40 | 83 => pressed_keys.down = false
-    | _ => ()
-    }
-    true
-  }
-}
-module Procedural_generator: {
-  open Object
-  open Actors
-
-  type obj_coord
-
-  let init: unit => unit
-
-  /* Procedurally generates a new map of default size */
-  let generate: (float, float, Dom_html.canvasRenderingContext2D) => (collidable, list<collidable>)
-} = {
-  open Actors
-  open Object
-
-  /* Note: Canvas is 512 by 256 (w*h) -> 32 by 16 blocks */
-
-  /* Holds obj typ and its coordinates. (int, (x-coord, y-coord)) */
-  type obj_coord = (int, (float, float))
-
-  /* Checks if the given location checkloc is already part of the list of locations
-   * in loclist. */
-  let rec mem_loc = (checkloc: (float, float), loclist: list<obj_coord>): bool =>
-    switch loclist {
-    | list{} => false
-    | list{h, ...t} =>
-      if checkloc == snd(h) {
-        true
-      } else {
-        mem_loc(checkloc, t)
-      }
-    }
-
-  /* Converts list of locations from blocksize to pixelsize by multiplying (x,y) by
-   * 16. */
-  let rec convert_list = (lst: list<obj_coord>): list<obj_coord> =>
-    switch lst {
-    | list{} => list{}
-    | list{h, ...t} =>
-      \"@"(list{(fst(h), (fst(snd(h)) *. 16., snd(snd(h)) *. 16.))}, convert_list(t))
-    }
-
-  /* Chooses what type of enemy should be instantiated given typ number */
-  let choose_enemy_typ = (typ: int): enemy_typ =>
-    switch typ {
-    | 0 => RKoopa
-    | 1 => GKoopa
-    | 2 => Goomba
-    | _ => failwith("Shouldn't reach here")
-    }
-
-  /* Chooses what type of block should be instantiated given typ number */
-  let choose_sblock_typ = (typ: int): block_typ =>
-    switch typ {
-    | 0 => Brick
-    | 1 => UnBBlock
-    | 2 => Cloud
-    | 3 => QBlock(Mushroom)
-    | 4 => Ground
-    | _ => failwith("Shouldn't reach here")
-    }
-
-  /* Optimizes lst such that there are no two items in the list that have the same
-   * coordinates. If there is one, it is removed. */
-  let rec avoid_overlap = (lst: list<obj_coord>, currentLst: list<obj_coord>): list<obj_coord> =>
-    switch lst {
-    | list{} => list{}
-    | list{h, ...t} =>
-      if mem_loc(snd(h), currentLst) {
-        avoid_overlap(t, currentLst)
-      } else {
-        \"@"(list{h}, avoid_overlap(t, currentLst))
-      }
-    }
-
-  /* Gets rid of objects with coordinates in the ending frame, within 128 pixels of
-   * the start, at the very top, and two blocks from the ground. */
-  let rec trim_edges = (lst: list<obj_coord>, blockw: float, blockh: float): list<obj_coord> =>
-    switch lst {
-    | list{} => list{}
-    | list{h, ...t} =>
-      let cx = fst(snd(h))
-      let cy = snd(snd(h))
-      let pixx = blockw *. 16.
-      let pixy = blockh *. 16.
-      if cx < 128. || (pixx -. cx < 528. || (cy == 0. || pixy -. cy < 48.)) {
-        trim_edges(t, blockw, blockh)
-      } else {
-        \"@"(list{h}, trim_edges(t, blockw, blockh))
-      }
-    }
-
-  /* Generates a stair formation with block typ being dependent on typ. This type
-   * of stair formation requires that the first step be on the ground. */
-  let generate_ground_stairs = (cbx, cby, typ) => {
-    let four = list{
-      (typ, (cbx, cby)),
-      (typ, (cbx +. 1., cby)),
-      (typ, (cbx +. 2., cby)),
-      (typ, (cbx +. 3., cby)),
-    }
-    let three = list{
-      (typ, (cbx +. 1., cby -. 1.)),
-      (typ, (cbx +. 2., cby -. 1.)),
-      (typ, (cbx +. 3., cby -. 1.)),
-    }
-    let two = list{(typ, (cbx +. 2., cby -. 2.)), (typ, (cbx +. 3., cby -. 2.))}
-    let one = list{(typ, (cbx +. 3., cby -. 3.))}
-    \"@"(four, \"@"(three, \"@"(two, one)))
-  }
-
-  /* Generates a stair formation going upwards. */
-  let generate_airup_stairs = (cbx, cby, typ) => {
-    let one = list{(typ, (cbx, cby)), (typ, (cbx +. 1., cby))}
-    let two = list{(typ, (cbx +. 3., cby -. 1.)), (typ, (cbx +. 4., cby -. 1.))}
-    let three = list{
-      (typ, (cbx +. 4., cby -. 2.)),
-      (typ, (cbx +. 5., cby -. 2.)),
-      (typ, (cbx +. 6., cby -. 2.)),
-    }
-    \"@"(one, \"@"(two, three))
-  }
-
-  /* Generates a stair formation going downwards */
-  let generate_airdown_stairs = (cbx, cby, typ) => {
-    let three = list{(typ, (cbx, cby)), (typ, (cbx +. 1., cby)), (typ, (cbx +. 2., cby))}
-    let two = list{(typ, (cbx +. 2., cby +. 1.)), (typ, (cbx +. 3., cby +. 1.))}
-    let one = list{(typ, (cbx +. 5., cby +. 2.)), (typ, (cbx +. 6., cby +. 2.))}
-    \"@"(three, \"@"(two, one))
-  }
-
-  /* Generates a cloud block platform with some length num. */
-  let rec generate_clouds = (cbx, cby, typ, num) =>
-    if num == 0 {
-      list{}
-    } else {
-      \"@"(list{(typ, (cbx, cby))}, generate_clouds(cbx +. 1., cby, typ, num - 1))
-    }
-
-  /* Generates an obj_coord list (typ, coordinates) of coins to be placed. */
-  let rec generate_coins = (block_coord: list<obj_coord>): list<obj_coord> => {
-    let place_coin = Random.int(2)
-    switch block_coord {
-    | list{} => list{}
-    | list{h, ...t} =>
-      if place_coin == 0 {
-        let xc = fst(snd(h))
-        let yc = snd(snd(h))
-        \"@"(list{(0, (xc, yc -. 16.))}, generate_coins(t))
-      } else {
-        generate_coins(t)
-      }
-    }
-  }
-
-  /* Chooses the form of the blocks to be placed.
-   * When called, leaves a 1 block gap from canvas size.
-   * 1. If current xblock or yblock is greater than canvas width or height
-   *    respectively, return an empty list.
-   * 2. If current xblock or yblock is within 10 blocks of the left and right sides
-   *    of the level map, prevent any objects from being initialized.
-   * 3. Else call helper methods to created block formations and return obj_coord
-   *    list.
-   * */
-  let choose_block_pattern = (
-    blockw: float,
-    blockh: float,
-    cbx: float,
-    cby: float,
-    prob: int,
-  ): list<obj_coord> =>
-    if cbx > blockw || cby > blockh {
-      list{}
-    } else {
-      let block_typ = Random.int(4)
-      let stair_typ = Random.int(2)
-      let life_block_chance = Random.int(5)
-      let middle_block = if life_block_chance == 0 {
-        3
-      } else {
-        stair_typ
-      }
-      let obj_coord = switch prob {
-      | 0 =>
-        if blockw -. cbx > 2. {
-          list{
-            (stair_typ, (cbx, cby)),
-            (middle_block, (cbx +. 1., cby)),
-            (stair_typ, (cbx +. 2., cby)),
-          }
-        } else if blockw -. cbx > 1. {
-          list{(block_typ, (cbx, cby)), (block_typ, (cbx +. 1., cby))}
-        } else {
-          list{(block_typ, (cbx, cby))}
-        }
-      | 1 =>
-        let num_clouds = Random.int(5) + 5
-        if cby < 5. {
-          generate_clouds(cbx, cby, 2, num_clouds)
-        } else {
-          list{}
-        }
-      | 2 =>
-        if blockh -. cby == 1. {
-          generate_ground_stairs(cbx, cby, stair_typ)
-        } else {
-          list{}
-        }
-      | 3 =>
-        if stair_typ == 0 && blockh -. cby > 3. {
-          generate_airdown_stairs(cbx, cby, stair_typ)
-        } else if blockh -. cby > 2. {
-          generate_airup_stairs(cbx, cby, stair_typ)
-        } else {
-          list{(stair_typ, (cbx, cby))}
-        }
-      | 4 =>
-        if cby +. 3. -. blockh == 2. {
-          list{(stair_typ, (cbx, cby))}
-        } else if cby +. 3. -. blockh == 1. {
-          list{(stair_typ, (cbx, cby)), (stair_typ, (cbx, cby +. 1.))}
-        } else {
-          list{
-            (stair_typ, (cbx, cby)),
-            (stair_typ, (cbx, cby +. 1.)),
-            (stair_typ, (cbx, cby +. 2.)),
-          }
-        }
-      | 5 => list{(3, (cbx, cby))}
-      | _ => failwith("Shouldn't reach here")
-      }
-      obj_coord
-    }
-
-  /* Generates a list of enemies to be placed on the ground. */
-  let rec generate_enemies = (
-    blockw: float,
-    blockh: float,
-    cbx: float,
-    cby: float,
-    acc: list<obj_coord>,
-  ) =>
-    if cbx > blockw -. 32. {
-      list{}
-    } else if cby > blockh -. 1. || cbx < 15. {
-      generate_enemies(blockw, blockh, cbx +. 1., 0., acc)
-    } else if mem_loc((cbx, cby), acc) || cby == 0. {
-      generate_enemies(blockw, blockh, cbx, cby +. 1., acc)
-    } else {
-      let prob = Random.int(30)
-      let enem_prob = 3
-      if prob < enem_prob && blockh -. 1. == cby {
-        let enemy = list{(prob, (cbx *. 16., cby *. 16.))}
-        \"@"(enemy, generate_enemies(blockw, blockh, cbx, cby +. 1., acc))
-      } else {
-        generate_enemies(blockw, blockh, cbx, cby +. 1., acc)
-      }
-    }
-
-  /* Generates a list of enemies to be placed upon the block objects. */
-  let rec generate_block_enemies = (block_coord: list<obj_coord>): list<obj_coord> => {
-    let place_enemy = Random.int(20)
-    let enemy_typ = Random.int(3)
-    switch block_coord {
-    | list{} => list{}
-    | list{h, ...t} =>
-      if place_enemy == 0 {
-        let xc = fst(snd(h))
-        let yc = snd(snd(h))
-        \"@"(list{(enemy_typ, (xc, yc -. 16.))}, generate_block_enemies(t))
-      } else {
-        generate_block_enemies(t)
-      }
-    }
-  }
-
-  /* Generates an obj_coord list (typ, coordinates) of blocks to be placed. */
-  let rec generate_block_locs = (
-    blockw: float,
-    blockh: float,
-    cbx: float,
-    cby: float,
-    acc: list<obj_coord>,
-  ): list<obj_coord> =>
-    if blockw -. cbx < 33. {
-      acc
-    } else if cby > blockh -. 1. {
-      generate_block_locs(blockw, blockh, cbx +. 1., 0., acc)
-    } else if mem_loc((cbx, cby), acc) || cby == 0. {
-      generate_block_locs(blockw, blockh, cbx, cby +. 1., acc)
-    } else {
-      let prob = Random.int(100)
-      let block_prob = 5
-      if prob < block_prob {
-        let newacc = choose_block_pattern(blockw, blockh, cbx, cby, prob)
-        let undup_lst = avoid_overlap(newacc, acc)
-        let called_acc = \"@"(acc, undup_lst)
-        generate_block_locs(blockw, blockh, cbx, cby +. 1., called_acc)
-      } else {
-        generate_block_locs(blockw, blockh, cbx, cby +. 1., acc)
-      }
-    }
-
-  /* Generates the ending item panel at the end of the level. Games ends upon
-   * collision with player. */
-  let generate_panel = (
-    context: Dom_html.canvasRenderingContext2D,
-    blockw: float,
-    blockh: float,
-  ): collidable => {
-    let ob = Object.spawn(
-      SBlock(Panel),
-      context,
-      (blockw *. 16. -. 256., blockh *. 16. *. 2. /. 3.),
-    )
-    ob
-  }
-
-  /* Generates the list of brick locations needed to display the ground.
-   * 1/10 chance that a ground block is skipped each call to create holes. */
-  let rec generate_ground = (blockw: float, blockh: float, inc: float, acc: list<obj_coord>): list<
-    obj_coord,
-  > =>
-    if inc > blockw {
-      acc
-    } else if inc > 10. {
-      let skip = Random.int(10)
-      let newacc = \"@"(acc, list{(4, (inc *. 16., blockh *. 16.))})
-      if skip == 7 && blockw -. inc > 32. {
-        generate_ground(blockw, blockh, inc +. 1., acc)
-      } else {
-        generate_ground(blockw, blockh, inc +. 1., newacc)
-      }
-    } else {
-      let newacc = \"@"(acc, list{(4, (inc *. 16., blockh *. 16.))})
-      generate_ground(blockw, blockh, inc +. 1., newacc)
-    }
-
-  /* Converts the obj_coord list called by generate_block_locs to a list of objects
-   * with the coordinates given from the obj_coord list. */
-  let rec convert_to_block_obj = (
-    lst: list<obj_coord>,
-    context: Dom_html.canvasRenderingContext2D,
-  ): list<collidable> =>
-    switch lst {
-    | list{} => list{}
-    | list{h, ...t} =>
-      let sblock_typ = choose_sblock_typ(fst(h))
-      let ob = Object.spawn(SBlock(sblock_typ), context, snd(h))
-      \"@"(list{ob}, convert_to_block_obj(t, context))
-    }
-
-  /* Converts the obj_coord list called by generate_enemies to a list of objects
-   * with the coordinates given from the obj_coord list. */
-  let rec convert_to_enemy_obj = (
-    lst: list<obj_coord>,
-    context: Dom_html.canvasRenderingContext2D,
-  ): list<collidable> =>
-    switch lst {
-    | list{} => list{}
-    | list{h, ...t} =>
-      let senemy_typ = choose_enemy_typ(fst(h))
-      let ob = Object.spawn(SEnemy(senemy_typ), context, snd(h))
-      \"@"(list{ob}, convert_to_enemy_obj(t, context))
-    }
-
-  /* Converts the list of coordinates into a list of Coin objects */
-  let rec convert_to_coin_obj = (
-    lst: list<obj_coord>,
-    context: Dom_html.canvasRenderingContext2D,
-  ): list<collidable> =>
-    switch lst {
-    | list{} => list{}
-    | list{h, ...t} =>
-      let sitem_typ = Coin
-      let ob = Object.spawn(SItem(sitem_typ), context, snd(h))
-      \"@"(list{ob}, convert_to_coin_obj(t, context))
-    }
-
-  /* Procedurally generates a list of collidables given canvas width, height and
-   * context. Arguments block width (blockw) and block height (blockh) are in
-   * block form, not pixels. */
-  let generate_helper = (
-    blockw: float,
-    blockh: float,
-    cx: float,
-    cy: float,
-    context: Dom_html.canvasRenderingContext2D,
-  ): list<collidable> => {
-    let block_locs = generate_block_locs(blockw, blockh, 0., 0., list{})
-    let converted_block_locs = trim_edges(convert_list(block_locs), blockw, blockh)
-    let obj_converted_block_locs = convert_to_block_obj(converted_block_locs, context)
-    let ground_blocks = generate_ground(blockw, blockh, 0., list{})
-    let obj_converted_ground_blocks = convert_to_block_obj(ground_blocks, context)
-    let block_locations = \"@"(block_locs, ground_blocks)
-    let all_blocks = \"@"(obj_converted_block_locs, obj_converted_ground_blocks)
-    let enemy_locs = generate_enemies(blockw, blockh, 0., 0., block_locations)
-    let obj_converted_enemies = convert_to_enemy_obj(enemy_locs, context)
-    let coin_locs = generate_coins(converted_block_locs)
-    let undup_coin_locs = trim_edges(avoid_overlap(coin_locs, converted_block_locs), blockw, blockh)
-    let converted_block_coin_locs = \"@"(converted_block_locs, coin_locs)
-    let enemy_block_locs = generate_block_enemies(converted_block_locs)
-    let undup_enemy_block_locs = avoid_overlap(enemy_block_locs, converted_block_coin_locs)
-    let obj_enemy_blocks = convert_to_enemy_obj(undup_enemy_block_locs, context)
-    let coin_objects = convert_to_coin_obj(undup_coin_locs, context)
-    let obj_panel = generate_panel(context, blockw, blockh)
-    \"@"(
-      all_blocks,
-      \"@"(obj_converted_enemies, \"@"(coin_objects, \"@"(obj_enemy_blocks, list{obj_panel}))),
-    )
-  }
-
-  /* Main function called to procedurally generate the level map. w and h args
-   * are in pixel form. Converts to block form to call generate_helper. Spawns
-   * the list of collidables received from generate_helper to display on canvas. */
-  let generate = (w: float, h: float, context: Dom_html.canvasRenderingContext2D): (
-    collidable,
-    list<collidable>,
-  ) => {
-    let blockw = w /. 16.
-    let blockh = h /. 16. -. 1.
-    let collide_list = generate_helper(blockw, blockh, 0., 0., context)
-    let player = Object.spawn(SPlayer(SmallM, Standing), context, (100., 224.))
-    (player, collide_list)
-  }
-
-  /* Makes sure level map is uniquely generated at each call. */
-  let init = () => Random.self_init()
-}
-module Main = {
-  open Actors
-  open Sprite
-  open Object
-  module Html = Dom_html
-  module Pg = Procedural_generator
-
-  let loadCount = ref(0)
-  let imgsToLoad = 4
-  let level_width = 2400.
-  let level_height = 256.
-
-  /* Canvas is chosen from the index.html file. The context is obtained from
-   *the canvas. Listeners are added. A level is generated and the general
-   *update_loop method is called to make the level playable. */
-  let load = _ => {
-    Random.self_init()
-    let canvas_id = "canvas"
-    let canvas = switch Dom_html.getElementById(Dom_html.document, canvas_id) {
-    | None =>
-      Js.log("cant find canvas " ++ canvas_id ++ "")
-      failwith("fail")
-    | Some(el) => Dom_html.elementToCanvasElement(el)
-    }
-
-    let context = Dom_html.canvasElementToJsObj(canvas)["getContext"]("2d")
-    let _ = Dom_html.addEventListener(Dom_html.document, "keydown", Director.keydown, true)
-    let _ = Dom_html.addEventListener(Dom_html.document, "keyup", Director.keyup, true)
-    let () = Pg.init()
-    let _ = Director.update_loop(
-      canvas,
-      Pg.generate(level_width, level_height, context),
-      (level_width, level_height),
-    )
-    print_endline("asd")
-    ()
-  }
-
-  let inc_counter = _ => {
-    loadCount := loadCount.contents + 1
-    if loadCount.contents == imgsToLoad {
-      load()
-    } else {
-      ()
-    }
-  }
-
-  /* Used for concurrency issues. */
-  let preload = _ => {
-    let root_dir = "sprites/"
-    let imgs = list{"blocks.png", "items.png", "enemies.png", "mario-small.png"}
-    List.map(img_src => {
-      let img_src = root_dir ++ img_src
-      let img = Html.createImg(Dom_html.document)
-      Dom_html.imageElementToJsObj(img)["src"] = img_src
-      ignore(
-        Dom_html.addEventListenerImg(
-          img,
-          "load",
-          ev => {
-            inc_counter()
-            true
-          },
-          true,
-        ),
-      )
-    }, imgs)
-  }
-
-  let _ = Dom_html.windowToJsObj(Dom_html.window)["onload"] = _ => {
-    ignore(preload())
-    true
-  }
-}
diff --git a/jscomp/test/marshal.js b/jscomp/test/marshal.js
deleted file mode 100644
index 358fadf..0000000
--- a/jscomp/test/marshal.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Bytes = require("../../lib/js/bytes.js");
-var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js");
-
-function to_buffer(buff, ofs, len, v, flags) {
-  if (ofs < 0 || len < 0 || ofs > (buff.length - len | 0)) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Marshal.to_buffer: substring out of bounds",
-          Error: new Error()
-        };
-  }
-  return Caml_external_polyfill.resolve("output_value_to_buffer")(buff, ofs, len, v, flags);
-}
-
-function data_size(buff, ofs) {
-  if (ofs < 0 || ofs > (buff.length - 20 | 0)) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Marshal.data_size",
-          Error: new Error()
-        };
-  }
-  return Caml_external_polyfill.resolve("marshal_data_size")(buff, ofs);
-}
-
-function total_size(buff, ofs) {
-  return 20 + data_size(buff, ofs) | 0;
-}
-
-function from_bytes(buff, ofs) {
-  if (ofs < 0 || ofs > (buff.length - 20 | 0)) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Marshal.from_bytes",
-          Error: new Error()
-        };
-  }
-  var len = Caml_external_polyfill.resolve("marshal_data_size")(buff, ofs);
-  if (ofs > (buff.length - (20 + len | 0) | 0)) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Marshal.from_bytes",
-          Error: new Error()
-        };
-  }
-  return Caml_external_polyfill.resolve("input_value_from_string")(buff, ofs);
-}
-
-function from_string(buff, ofs) {
-  return from_bytes(Bytes.unsafe_of_string(buff), ofs);
-}
-
-var header_size = 20;
-
-exports.to_buffer = to_buffer;
-exports.header_size = header_size;
-exports.data_size = data_size;
-exports.total_size = total_size;
-exports.from_bytes = from_bytes;
-exports.from_string = from_string;
-/* No side effect */
diff --git a/jscomp/test/marshal.res b/jscomp/test/marshal.res
deleted file mode 100644
index 380e6cf..0000000
--- a/jscomp/test/marshal.res
+++ /dev/null
@@ -1,68 +0,0 @@
-@@warning("a")
-/* ************************************************************************ */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1997 Institut National de Recherche en Informatique et */
-/* en Automatique. */
-/*  */
-/* All rights reserved.  This file is distributed under the terms of */
-/* the GNU Lesser General Public License version 2.1, with the */
-/* special exception on linking described in the file LICENSE. */
-/*  */
-/* ************************************************************************ */
-
-type extern_flags =
-  | No_sharing
-  | Closures
-  | Compat_32
-/* note: this type definition is used in 'byterun/debugger.c' */
-
-external to_bytes: ('a, list<extern_flags>) => bytes = "?output_value_to_string"
-external to_string: ('a, list<extern_flags>) => string = "?output_value_to_string"
-external to_buffer_unsafe: (bytes, int, int, 'a, list<extern_flags>) => int =
-  "?output_value_to_buffer"
-
-let to_buffer = (buff, ofs, len, v, flags) =>
-  if ofs < 0 || (len < 0 || ofs > Bytes.length(buff) - len) {
-    invalid_arg("Marshal.to_buffer: substring out of bounds")
-  } else {
-    to_buffer_unsafe(buff, ofs, len, v, flags)
-  }
-
-/* The functions below use byte sequences as input, never using any
-   mutation. It makes sense to use non-mutated [bytes] rather than
-   [string], because we really work with sequences of bytes, not
-   a text representation.
-*/
-
-external from_bytes_unsafe: (bytes, int) => 'a = "?input_value_from_string"
-external data_size_unsafe: (bytes, int) => int = "?marshal_data_size"
-
-let header_size = 20
-let data_size = (buff, ofs) =>
-  if ofs < 0 || ofs > Bytes.length(buff) - header_size {
-    invalid_arg("Marshal.data_size")
-  } else {
-    data_size_unsafe(buff, ofs)
-  }
-let total_size = (buff, ofs) => header_size + data_size(buff, ofs)
-
-let from_bytes = (buff, ofs) =>
-  if ofs < 0 || ofs > Bytes.length(buff) - header_size {
-    invalid_arg("Marshal.from_bytes")
-  } else {
-    let len = data_size_unsafe(buff, ofs)
-    if ofs > Bytes.length(buff) - (header_size + len) {
-      invalid_arg("Marshal.from_bytes")
-    } else {
-      from_bytes_unsafe(buff, ofs)
-    }
-  }
-
-let from_string = (buff, ofs) =>
-  /* Bytes.unsafe_of_string is safe here, as the produced byte
-   sequence is never mutated */
-  from_bytes(Bytes.unsafe_of_string(buff), ofs)
diff --git a/jscomp/test/meth_annotation.js b/jscomp/test/meth_annotation.js
deleted file mode 100644
index 3471959..0000000
--- a/jscomp/test/meth_annotation.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-john.say("hey", "jude");
-
-/*  Not a pure module */
diff --git a/jscomp/test/meth_annotation.res b/jscomp/test/meth_annotation.res
deleted file mode 100644
index 8ce1e17..0000000
--- a/jscomp/test/meth_annotation.res
+++ /dev/null
@@ -1,6 +0,0 @@
-// The @meth annotation is for backwards compatibility. It just makes the type uncurried.
-type person = {@meth "say": (string, string) => unit}
-
-@val external john: person = "john"
-
-john["say"]("hey", "jude")
diff --git a/jscomp/test/method_name_test.js b/jscomp/test/method_name_test.js
deleted file mode 100644
index 75e9173..0000000
--- a/jscomp/test/method_name_test.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(x, i, file, v) {
-  Curry._1(x.case, i);
-  Curry._2(x.case__set, i, v);
-  Curry._1(x._open, file);
-  Curry._1(x.open__, file);
-  return x._MAX_LENGTH;
-}
-
-function ff(x, i, v) {
-  x.make__config = v;
-  x.make_config = v;
-  Curry._1(x.case__unsafe, i);
-  return Curry._1(x._open__, 3);
-}
-
-var u = {
-  "_Content'type": "x"
-};
-
-var h = {
-  _open: 3,
-  _end: 32
-};
-
-function hg(x) {
-  return x._open + x._end | 0;
-}
-
-eq("File \"method_name_test.res\", line 39, characters 12-19", 35, hg(h));
-
-Mt.from_pair_suites("Method_name_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.ff = ff;
-exports.u = u;
-exports.h = h;
-exports.hg = hg;
-/*  Not a pure module */
diff --git a/jscomp/test/method_name_test.res b/jscomp/test/method_name_test.res
deleted file mode 100644
index defaf8f..0000000
--- a/jscomp/test/method_name_test.res
+++ /dev/null
@@ -1,41 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let f = (x, i, file, v) => {
-  x["case"](i)
-  x["case__set"](i, v)
-  x["_open"](file)
-  x["open__"](file)
-  x["_MAX_LENGTH"]
-}
-
-let ff = (x, i, v) => {
-  x["make__config"]
-  x["make_config"]
-  x["make__config"] = v
-  x["make_config"] = v
-  x["case__unsafe"](i)
-  x["_open__"](3)
-}
-/* x##__open 32; */
-/* x##case_setUnsafe (i,v) */
-/* do we need polymorphism over [case#=]
-   I can only think of [case#=] will have one type
-   ['key -> 'value -> void ]
-   unlike [case] which may have different return types
-*/
-
-let u = {"_Content'type": "x"}
-
-let h = {"_open": 3, "_end": 32}
-
-let hg = x => x["_open"] + x["_end"]
-
-let () = eq(__LOC__, 35, hg(h))
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/method_string_name.js b/jscomp/test/method_string_name.js
deleted file mode 100644
index 12d612f..0000000
--- a/jscomp/test/method_string_name.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var f = {
-  "Content-Type": 3
-};
-
-console.log(f["Content-Type"]);
-
-function ff(x) {
-  x["Content-Type"] = "hello";
-  console.log(({
-          "Content-Type": "hello"
-        })["Content-Type"]);
-}
-
-exports.f = f;
-exports.ff = ff;
-/*  Not a pure module */
diff --git a/jscomp/test/method_string_name.res b/jscomp/test/method_string_name.res
deleted file mode 100644
index 842317e..0000000
--- a/jscomp/test/method_string_name.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let f = {"Content-Type": 3}
-
-Js.log(f["Content-Type"])
-
-let ff = x => {
-  x["Hi"]
-  // x## "hi#";
-  x["Content-Type"] = "hello"
-  Js.log(({"Content-Type": "hello"})["Content-Type"])
-}
diff --git a/jscomp/test/minimal_test.js b/jscomp/test/minimal_test.js
deleted file mode 100644
index b3b5967..0000000
--- a/jscomp/test/minimal_test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var fake_y = {
-  hd: 2,
-  tl: {
-    hd: 3,
-    tl: /* [] */0
-  }
-};
-
-var fake_z = {
-  hd: 1,
-  tl: fake_y
-};
-
-exports.fake_y = fake_y;
-exports.fake_z = fake_z;
-/* No side effect */
diff --git a/jscomp/test/minimal_test.res b/jscomp/test/minimal_test.res
deleted file mode 100644
index cf2a2b2..0000000
--- a/jscomp/test/minimal_test.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let rec fake_y = list{2, 3}
-and fake_z = list{1, ...fake_y}
diff --git a/jscomp/test/miss_colon_test.js b/jscomp/test/miss_colon_test.js
deleted file mode 100644
index 6e985e6..0000000
--- a/jscomp/test/miss_colon_test.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function $plus$colon(_f, _g) {
-  while(true) {
-    var g = _g;
-    var f = _f;
-    if (f.TAG === "Int") {
-      var n = f._0;
-      if (g.TAG === "Int") {
-        return {
-                TAG: "Int",
-                _0: n + g._0 | 0
-              };
-      }
-      if (n === 0) {
-        return g;
-      }
-      
-    }
-    switch (g.TAG) {
-      case "Int" :
-          if (g._0 !== 0) {
-            return {
-                    TAG: "Add",
-                    _0: f,
-                    _1: g
-                  };
-          } else {
-            return f;
-          }
-      case "Add" :
-          _g = g._1;
-          _f = $plus$colon(f, g._0);
-          continue ;
-      case "Var" :
-      case "Mul" :
-          return {
-                  TAG: "Add",
-                  _0: f,
-                  _1: g
-                };
-      
-    }
-  };
-}
-
-function $star$colon(_f, _g) {
-  while(true) {
-    var g = _g;
-    var f = _f;
-    var exit = 0;
-    var exit$1 = 0;
-    if (f.TAG === "Int") {
-      var n = f._0;
-      if (g.TAG === "Int") {
-        return {
-                TAG: "Int",
-                _0: Math.imul(n, g._0)
-              };
-      }
-      if (n === 0) {
-        return {
-                TAG: "Int",
-                _0: 0
-              };
-      }
-      exit$1 = 3;
-    } else {
-      exit$1 = 3;
-    }
-    if (exit$1 === 3) {
-      if (g.TAG === "Int") {
-        if (g._0 === 0) {
-          return {
-                  TAG: "Int",
-                  _0: 0
-                };
-        }
-        exit = 2;
-      } else {
-        exit = 2;
-      }
-    }
-    if (exit === 2 && f.TAG === "Int" && f._0 === 1) {
-      return g;
-    }
-    switch (g.TAG) {
-      case "Int" :
-          if (g._0 !== 1) {
-            return {
-                    TAG: "Mul",
-                    _0: f,
-                    _1: g
-                  };
-          } else {
-            return f;
-          }
-      case "Var" :
-      case "Add" :
-          return {
-                  TAG: "Mul",
-                  _0: f,
-                  _1: g
-                };
-      case "Mul" :
-          _g = g._1;
-          _f = $star$colon(f, g._0);
-          continue ;
-      
-    }
-  };
-}
-
-function simplify(x) {
-  switch (x.TAG) {
-    case "Int" :
-    case "Var" :
-        return x;
-    case "Add" :
-        return $plus$colon(simplify(x._0), simplify(x._1));
-    case "Mul" :
-        return $star$colon(simplify(x._0), simplify(x._1));
-    
-  }
-}
-
-exports.$plus$colon = $plus$colon;
-exports.$star$colon = $star$colon;
-exports.simplify = simplify;
-/* No side effect */
diff --git a/jscomp/test/miss_colon_test.res b/jscomp/test/miss_colon_test.res
deleted file mode 100644
index a97f029..0000000
--- a/jscomp/test/miss_colon_test.res
+++ /dev/null
@@ -1,29 +0,0 @@
-type rec expr =
-  | Int(int)
-  | Var(string)
-  | Add(expr, expr)
-  | Mul(expr, expr)
-
-let rec \"+:" = (f, g) =>
-  switch (f, g) {
-  | (Int(n), Int(m)) => Int(n + m)
-  | (Int(0), e) | (e, Int(0)) => e
-  | (f, Add(g, h)) => \"+:"(\"+:"(f, g), h)
-  | (f, g) => Add(f, g)
-  }
-
-let rec \"*:" = (f, g) =>
-  switch (f, g) {
-  | (Int(n), Int(m)) => Int(n * m)
-  | (Int(0), _) | (_, Int(0)) => Int(0)
-  | (Int(1), e) | (e, Int(1)) => e
-  | (f, Mul(g, h)) => \"*:"(\"*:"(f, g), h)
-  | (f, g) => Mul(f, g)
-  }
-
-let rec simplify = x =>
-  switch x {
-  | (Int(_) | Var(_)) as f => f
-  | Add(f, g) => \"+:"(simplify(f), simplify(g))
-  | Mul(f, g) => \"*:"(simplify(f), simplify(g))
-  }
diff --git a/jscomp/test/mock_mt.js b/jscomp/test/mock_mt.js
deleted file mode 100644
index 29acadc..0000000
--- a/jscomp/test/mock_mt.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-
-function from_pair_suites(name, suites) {
-  console.log([
-        name,
-        "testing"
-      ]);
-  List.iter((function (param) {
-          var name = param[0];
-          var fn = Curry._1(param[1], undefined);
-          switch (fn.TAG) {
-            case "Eq" :
-                console.log([
-                      name,
-                      fn._0,
-                      "eq?",
-                      fn._1
-                    ]);
-                return ;
-            case "Neq" :
-                console.log([
-                      name,
-                      fn._0,
-                      "neq?",
-                      fn._1
-                    ]);
-                return ;
-            case "StrictEq" :
-                console.log([
-                      name,
-                      fn._0,
-                      "strict_eq?",
-                      fn._1
-                    ]);
-                return ;
-            case "StrictNeq" :
-                console.log([
-                      name,
-                      fn._0,
-                      "strict_neq?",
-                      fn._1
-                    ]);
-                return ;
-            case "Ok" :
-                console.log([
-                      name,
-                      fn._0,
-                      "ok?"
-                    ]);
-                return ;
-            case "Approx" :
-                console.log([
-                      name,
-                      fn._0,
-                      "~",
-                      fn._1
-                    ]);
-                return ;
-            case "ApproxThreshold" :
-                console.log([
-                      name,
-                      fn._1,
-                      "~",
-                      fn._2,
-                      " (",
-                      fn._0,
-                      ")"
-                    ]);
-                return ;
-            case "ThrowAny" :
-                return ;
-            case "Fail" :
-                console.log("failed");
-                return ;
-            case "FailWith" :
-                console.log("failed: " + fn._0);
-                return ;
-            
-          }
-        }), suites);
-}
-
-exports.from_pair_suites = from_pair_suites;
-/* No side effect */
diff --git a/jscomp/test/mock_mt.res b/jscomp/test/mock_mt.res
deleted file mode 100644
index 1c48199..0000000
--- a/jscomp/test/mock_mt.res
+++ /dev/null
@@ -1,30 +0,0 @@
-type rec eq = Mt.eq =
-  | Eq('a, 'a): eq
-  | Neq('a, 'a): eq
-  | StrictEq('a, 'a): eq
-  | StrictNeq('a, 'a): eq
-  | Ok(bool): eq
-  | Approx(float, float): eq
-  | ApproxThreshold(float, float, float): eq
-  | ThrowAny(unit => unit): eq
-  | Fail(unit): eq
-  | FailWith(string): eq
-type pair_suites = list<(string, unit => eq)>
-
-let from_pair_suites = (name: string, suites: pair_suites) => {
-  Js.log((name, "testing"))
-  List.iter(((name, code)) =>
-    switch code() {
-    | Eq(a, b) => Js.log((name, a, "eq?", b))
-    | Neq(a, b) => Js.log((name, a, "neq?", b))
-    | StrictEq(a, b) => Js.log((name, a, "strict_eq?", b))
-    | StrictNeq(a, b) => Js.log((name, a, "strict_neq?", b))
-    | Approx(a, b) => Js.log((name, a, "~", b))
-    | ApproxThreshold(t, a, b) => Js.log((name, a, "~", b, " (", t, ")"))
-    | ThrowAny(fn) => ()
-    | Fail(_) => Js.log("failed")
-    | FailWith(msg) => Js.log("failed: " ++ msg)
-    | Ok(a) => Js.log((name, a, "ok?"))
-    }
-  , suites)
-}
diff --git a/jscomp/test/module_alias_test.js b/jscomp/test/module_alias_test.js
deleted file mode 100644
index 2764181..0000000
--- a/jscomp/test/module_alias_test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(x) {
-  console.log(x);
-  console.log(List.length(x));
-  return List;
-}
-
-var h = f(/* [] */0);
-
-var a = Curry._1(h.length, {
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: {
-          hd: 3,
-          tl: /* [] */0
-        }
-      }
-    });
-
-eq("File \"module_alias_test.res\", line 30, characters 3-10", a, 3);
-
-Mt.from_pair_suites("Module_alias_test", suites.contents);
-
-var N;
-
-var V;
-
-var J;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.N = N;
-exports.V = V;
-exports.J = J;
-exports.f = f;
-exports.a = a;
-/* h Not a pure module */
diff --git a/jscomp/test/module_alias_test.res b/jscomp/test/module_alias_test.res
deleted file mode 100644
index 136194a..0000000
--- a/jscomp/test/module_alias_test.res
+++ /dev/null
@@ -1,31 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-module N = List
-
-module V = Ext_pervasives_test.LargeFile
-
-module J = Js.Json
-
-module type X = module type of List
-
-let f = x => {
-  module L = List
-  Js.log(x)
-  Js.log(List.length(x))
-  module(L: X)
-}
-
-let a = {
-  let h = f(list{})
-  let module(L: X) = h
-  L.length(list{1, 2, 3})
-}
-
-eq(__LOC__, a, 3)
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/module_as_class_ffi.js b/jscomp/test/module_as_class_ffi.js
deleted file mode 100644
index 9452d53..0000000
--- a/jscomp/test/module_as_class_ffi.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Foo_class = require("xx/foo_class");
-
-function f(param) {
-  return new Foo_class(3);
-}
-
-function v(param) {
-  return Foo_class.ff(3);
-}
-
-exports.f = f;
-exports.v = v;
-/* xx/foo_class Not a pure module */
diff --git a/jscomp/test/module_as_class_ffi.res b/jscomp/test/module_as_class_ffi.res
deleted file mode 100644
index 44e9b7c..0000000
--- a/jscomp/test/module_as_class_ffi.res
+++ /dev/null
@@ -1,25 +0,0 @@
-type t
-
-@new @module external mk: int => t = "xx/foo_class"
-
-let f = () => mk(3)
-
-/* external mk2 : int -> t = "xx/foo_class" [@@bs.new "x"] [@@bs.module] 
-
-File "module_as_class_ffi.ml", line 9, characters 0-69:
-conflict attributes found: (bs.new should not carry payload here)
-*/
-/*
-TODO: more error checking
-1. [@@bs.module] can only be used once
-2. here [bs.new] should not have any payload
-3. consolidate all [bs.module] 
-
-
-let ff () =
-  mk2 3  
-*/
-
-@module("xx/foo_class") external ff: int => t = "ff"
-
-let v = () => ff(3)
diff --git a/jscomp/test/module_as_function.js b/jscomp/test/module_as_function.js
deleted file mode 100644
index 2ec1288..0000000
--- a/jscomp/test/module_as_function.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Nightmare = require("nightmare");
-
-var v = Nightmare({
-      show: true
-    });
-
-exports.v = v;
-/* v Not a pure module */
diff --git a/jscomp/test/module_as_function.res b/jscomp/test/module_as_function.res
deleted file mode 100644
index cf996df..0000000
--- a/jscomp/test/module_as_function.res
+++ /dev/null
@@ -1,3 +0,0 @@
-@module external nightmare: {"show": bool} => int = "nightmare"
-
-let v = nightmare({"show": true})
diff --git a/jscomp/test/module_missing_conversion.js b/jscomp/test/module_missing_conversion.js
deleted file mode 100644
index dfff882..0000000
--- a/jscomp/test/module_missing_conversion.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Array = require("../../lib/js/array.js");
-var $$String = require("../../lib/js/string.js");
-var MoreLabels = require("../../lib/js/moreLabels.js");
-
-function f(x) {
-  return x;
-}
-
-var XX = {
-  make_float: $$Array.make_float,
-  init: $$Array.init,
-  make_matrix: $$Array.make_matrix,
-  create_matrix: $$Array.create_matrix,
-  append: $$Array.append,
-  concat: $$Array.concat,
-  sub: $$Array.sub,
-  copy: $$Array.copy,
-  fill: $$Array.fill,
-  blit: $$Array.blit,
-  to_list: $$Array.to_list,
-  of_list: $$Array.of_list,
-  iter: $$Array.iter,
-  iteri: $$Array.iteri,
-  map: $$Array.map,
-  mapi: $$Array.mapi,
-  fold_left: $$Array.fold_left,
-  fold_right: $$Array.fold_right,
-  iter2: $$Array.iter2,
-  map2: $$Array.map2,
-  for_all: $$Array.for_all,
-  exists: $$Array.exists,
-  mem: $$Array.mem,
-  memq: $$Array.memq,
-  sort: $$Array.sort,
-  stable_sort: $$Array.stable_sort,
-  fast_sort: $$Array.fast_sort,
-  Floatarray: $$Array.Floatarray,
-  f: f
-};
-
-var u = [$$String];
-
-var hh = "x".length;
-
-var ghh = MoreLabels.Hashtbl.create(undefined, 30);
-
-exports.XX = XX;
-exports.u = u;
-exports.hh = hh;
-exports.ghh = ghh;
-/* ghh Not a pure module */
diff --git a/jscomp/test/module_missing_conversion.res b/jscomp/test/module_missing_conversion.res
deleted file mode 100644
index 6ffe760..0000000
--- a/jscomp/test/module_missing_conversion.res
+++ /dev/null
@@ -1,14 +0,0 @@
-module type S = module type of String
-
-module XX = {
-  include Array
-  let f = x => x
-}
-let u = [module(String: S)]
-
-let hh = {
-  let module(String: S) = u[0]
-  String.length("x")
-}
-
-let ghh: Hashtbl.t<int, int> = MoreLabels.Hashtbl.create(30)
diff --git a/jscomp/test/module_parameter_test.js b/jscomp/test/module_parameter_test.js
deleted file mode 100644
index 38ad674..0000000
--- a/jscomp/test/module_parameter_test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$String = require("../../lib/js/string.js");
-
-function u(v) {
-  return v;
-}
-
-var s = $$String;
-
-var N = {
-  s: s
-};
-
-var v0 = "x".length;
-
-function v(x) {
-  return x.length;
-}
-
-var suites_0 = [
-  "const",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: 1,
-              _1: v0
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "other",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: 3,
-                _1: "abc".length
-              };
-      })
-  ],
-  tl: /* [] */0
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Module_parameter_test", suites);
-
-exports.u = u;
-exports.N = N;
-exports.v0 = v0;
-exports.v = v;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/module_parameter_test.res b/jscomp/test/module_parameter_test.res
deleted file mode 100644
index f489890..0000000
--- a/jscomp/test/module_parameter_test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-module type X = module type of String
-
-let u = (v: module(X)) => v
-
-module N = {
-  let s = u(module(String))
-}
-
-let v0 = {
-  module V = unpack(N.s: X)
-  V.length("x")
-}
-
-let v = x => {
-  module V = unpack(N.s: X)
-  V.length(x)
-}
-
-let suites = {
-  open Mt
-  list{("const", _ => Eq(1, v0)), ("other", _ => Eq(3, v("abc")))}
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/module_splice_test.js b/jscomp/test/module_splice_test.js
deleted file mode 100644
index d96e7d7..0000000
--- a/jscomp/test/module_splice_test.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var JoinClasses = require("./joinClasses");
-var Caml_splice_call = require("../../lib/js/caml_splice_call.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, param) {
-  var y = param[1];
-  var x = param[0];
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function joinClasses(prim) {
-  return Caml_splice_call.spliceApply(JoinClasses, [prim]);
-}
-
-var a = JoinClasses(1, 2, 3);
-
-var pair = [
-  a,
-  6
-];
-
-console.log(pair);
-
-eq("File \"module_splice_test.res\", line 16, characters 5-12", pair);
-
-Mt.from_pair_suites("Module_splice_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.joinClasses = joinClasses;
-exports.a = a;
-/* a Not a pure module */
diff --git a/jscomp/test/module_splice_test.res b/jscomp/test/module_splice_test.res
deleted file mode 100644
index b50a80e..0000000
--- a/jscomp/test/module_splice_test.res
+++ /dev/null
@@ -1,19 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, (x, y)) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-@module @variadic external joinClasses: array<int> => int = "./joinClasses"
-
-let a = joinClasses([1, 2, 3])
-
-let () = {
-  let pair = (a, 6)
-  Js.log(pair)
-  eq(__LOC__, pair)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/more_poly_variant_test.js b/jscomp/test/more_poly_variant_test.js
deleted file mode 100644
index 6f66db6..0000000
--- a/jscomp/test/more_poly_variant_test.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function map(f, x) {
-  if (typeof x !== "object") {
-    return "Nil";
-  }
-  var match = x.VAL;
-  return {
-          NAME: "Cons",
-          VAL: [
-            f(match[0]),
-            map(f, match[1])
-          ]
-        };
-}
-
-function split_cases(x) {
-  if (typeof x === "object" && x.NAME === "Snoc") {
-    return {
-            NAME: "B",
-            VAL: x
-          };
-  } else {
-    return {
-            NAME: "A",
-            VAL: x
-          };
-  }
-}
-
-function f(x) {
-  if (typeof x === "object") {
-    return "myvariant";
-  } else {
-    return "Tag3";
-  }
-}
-
-function g1(x) {
-  if (x.NAME === "Tag2") {
-    return "Tag2";
-  } else {
-    return "Tag1";
-  }
-}
-
-function g(x) {
-  if (typeof x === "object") {
-    return g1(x);
-  } else {
-    return "Tag3";
-  }
-}
-
-function f1(x) {
-  if (x === "As") {
-    return "A";
-  } else {
-    return "other";
-  }
-}
-
-function f2(x) {
-  if (typeof x === "object") {
-    console.log(x);
-    return 2;
-  } else if (x === "h") {
-    return 2;
-  } else if (x === "hello") {
-    return 3;
-  } else if (x === "Tag4") {
-    console.log(x);
-    return 2;
-  } else {
-    return 333;
-  }
-}
-
-exports.map = map;
-exports.split_cases = split_cases;
-exports.f = f;
-exports.g1 = g1;
-exports.g = g;
-exports.f1 = f1;
-exports.f2 = f2;
-/* No side effect */
diff --git a/jscomp/test/more_poly_variant_test.res b/jscomp/test/more_poly_variant_test.res
deleted file mode 100644
index 6352030..0000000
--- a/jscomp/test/more_poly_variant_test.res
+++ /dev/null
@@ -1,54 +0,0 @@
-type rec vlist<'a> = [#Nil | #Cons('a, vlist<'a>)]
-
-let rec map = (f): (vlist<'a> => vlist<'b>) =>
-  x =>
-    switch x {
-    | #Nil => #Nil
-    | #Cons(a, l) => #Cons(f(. a), map(f, l))
-    }
-
-let split_cases = x =>
-  switch x {
-  | (#Nil | #Cons(_)) as x => #A(x)
-  | #Snoc(_) as x => #B(x)
-  }
-
-type myvariant = [#Tag1(int) | #Tag2(bool)]
-
-let f = x =>
-  switch x {
-  | #...myvariant => "myvariant"
-  | #Tag3 => "Tag3"
-  }
-
-let g1 = x =>
-  switch x {
-  | #Tag1(_) => "Tag1"
-  | #Tag2(_) => "Tag2"
-  }
-
-let g = x =>
-  switch x {
-  | #...myvariant as x => g1(x)
-  | #Tag3 => "Tag3"
-  }
-
-type abc = [#A | #B | #C]
-
-let f1 = x =>
-  switch x {
-  | #As => "A"
-  | #...abc => "other"
-  }
-
-type myvariant2 = [#Tag3(int) | #Tag4 | myvariant]
-type x = [#a | #b | #c]
-let f2 = x =>
-  switch x {
-  | #...myvariant2 as x =>
-    Js.log(x)
-    2
-  | #hello => 3
-  | #h => 2
-  | #...x => 333
-  }
diff --git a/jscomp/test/more_uncurry.js b/jscomp/test/more_uncurry.js
deleted file mode 100644
index a89f66d..0000000
--- a/jscomp/test/more_uncurry.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x, y, x_) {
-  if (x_ !== undefined) {
-    return (x + y | 0) + x_ | 0;
-  } else {
-    return x + y | 0;
-  }
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/more_uncurry.res b/jscomp/test/more_uncurry.res
deleted file mode 100644
index 5d77f68..0000000
--- a/jscomp/test/more_uncurry.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let f = (x, y, x_) =>
-  switch x_ {
-  | None => x + y
-  | Some(z) => x + y + z
-  }
diff --git a/jscomp/test/mpr_6033_test.js b/jscomp/test/mpr_6033_test.js
deleted file mode 100644
index d6d1999..0000000
--- a/jscomp/test/mpr_6033_test.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(x) {
-  var y = CamlinternalLazy.force(x);
-  return y + "abc";
-}
-
-var x = {
-  LAZY_DONE: true,
-  VAL: "def"
-};
-
-CamlinternalLazy.force(x);
-
-var u = f(x);
-
-eq("File \"mpr_6033_test.res\", line 20, characters 3-10", u, "defabc");
-
-Mt.from_pair_suites("Mpr_6033_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.u = u;
-/*  Not a pure module */
diff --git a/jscomp/test/mpr_6033_test.res b/jscomp/test/mpr_6033_test.res
deleted file mode 100644
index 14a3e60..0000000
--- a/jscomp/test/mpr_6033_test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let f = x =>
-  switch x {
-  | lazy y => y ++ "abc"
-  }
-
-let u = {
-  let x = lazy "def"
-  ignore(Lazy.force(x))
-  f(x)
-}
-
-eq(__LOC__, u, "defabc")
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/mt.js b/jscomp/test/mt.js
deleted file mode 100644
index ba3c501..0000000
--- a/jscomp/test/mt.js
+++ /dev/null
@@ -1,311 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Path = require("path");
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Assert = require("assert");
-var Process = require("process");
-
-function assert_fail(msg) {
-  Assert.fail(undefined, undefined, msg, "");
-}
-
-function is_mocha(param) {
-  var match = $$Array.to_list(Process.argv);
-  if (!match) {
-    return false;
-  }
-  var match$1 = match.tl;
-  if (!match$1) {
-    return false;
-  }
-  var exec = Path.basename(match$1.hd);
-  if (exec === "mocha") {
-    return true;
-  } else {
-    return exec === "_mocha";
-  }
-}
-
-var from_suites = (function from_suites(name, suite) {
-  var match = $$Array.to_list(Process.argv);
-  if (match && is_mocha(undefined)) {
-    describe(name, (function () {
-            return List.iter((function (param) {
-                          var partial_arg = param[1];
-                          it(param[0], (function () {
-                                  return Curry._1(partial_arg, undefined);
-                                }));
-                        }), suite);
-          }));
-    return ;
-  }
-  
-});
-
-function close_enough(thresholdOpt, a, b) {
-  var threshold = thresholdOpt !== undefined ? thresholdOpt : 0.0000001;
-  return Math.abs(a - b) < threshold;
-}
-
-function handleCode(spec) {
-  switch (spec.TAG) {
-    case "Eq" :
-        Assert.deepEqual(spec._0, spec._1);
-        return ;
-    case "Neq" :
-        Assert.notDeepEqual(spec._0, spec._1);
-        return ;
-    case "StrictEq" :
-        Assert.strictEqual(spec._0, spec._1);
-        return ;
-    case "StrictNeq" :
-        Assert.notStrictEqual(spec._0, spec._1);
-        return ;
-    case "Ok" :
-        Assert.ok(spec._0);
-        return ;
-    case "Approx" :
-        var b = spec._1;
-        var a = spec._0;
-        if (!close_enough(undefined, a, b)) {
-          Assert.deepEqual(a, b);
-          return ;
-        } else {
-          return ;
-        }
-    case "ApproxThreshold" :
-        var b$1 = spec._2;
-        var a$1 = spec._1;
-        if (!close_enough(spec._0, a$1, b$1)) {
-          Assert.deepEqual(a$1, b$1);
-          return ;
-        } else {
-          return ;
-        }
-    case "ThrowAny" :
-        Assert.throws(spec._0);
-        return ;
-    case "Fail" :
-        return assert_fail("failed");
-    case "FailWith" :
-        return assert_fail(spec._0);
-    
-  }
-}
-
-function force_curry(x) {
-  List.hd({
-        hd: 3,
-        tl: /* [] */0
-      });
-  $$Array.copy([5]);
-  return Curry._1(x, undefined);
-}
-
-var from_pair_suites = (function from_pair_suites(name, suites) {
-  var match = $$Array.to_list(Process.argv);
-  if (match) {
-    if (is_mocha(undefined)) {
-      describe(name, (function () {
-              return List.iter((function (param) {
-                            var code = param[1];
-                            it(param[0], (function () {
-                                    return handleCode(Curry._1(code, undefined));
-                                  }));
-                          }), suites);
-            }));
-      return ;
-    } else {
-      console.log([
-            name,
-            "testing"
-          ]);
-      return List.iter((function (param) {
-                    var name = param[0];
-                    var fn = Curry._1(param[1], undefined);
-                    switch (fn.TAG) {
-                      case "Eq" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "eq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case "Neq" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "neq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case "StrictEq" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "strict_eq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case "StrictNeq" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "strict_neq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case "Ok" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "ok?"
-                              ]);
-                          return ;
-                      case "Approx" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "~",
-                                fn._1
-                              ]);
-                          return ;
-                      case "ApproxThreshold" :
-                          console.log([
-                                name,
-                                fn._1,
-                                "~",
-                                fn._2,
-                                " (",
-                                fn._0,
-                                ")"
-                              ]);
-                          return ;
-                      case "ThrowAny" :
-                          return ;
-                      case "Fail" :
-                          console.log("failed");
-                          return ;
-                      case "FailWith" :
-                          console.log("failed: " + fn._0);
-                          return ;
-                      
-                    }
-                  }), suites);
-    }
-  }
-  
-});
-
-var val_unit = Promise.resolve();
-
-var from_promise_suites = (function from_promise_suites(name, suites) {
-  var match = $$Array.to_list(Process.argv);
-  if (match) {
-    if (is_mocha(undefined)) {
-      describe(name, (function () {
-              return List.iter((function (param) {
-                            var code = param[1];
-                            it(param[0], (function () {
-                                    var arg1 = function (x) {
-                                      handleCode(x);
-                                      return val_unit;
-                                    };
-                                    return code.then(arg1);
-                                  }));
-                          }), suites);
-            }));
-    } else {
-      console.log("promise suites");
-    }
-    return ;
-  }
-  
-});
-
-function old_from_promise_suites_donotuse(name, suites) {
-  var match = $$Array.to_list(Process.argv);
-  if (match) {
-    if (is_mocha()) {
-      describe(name, (function () {
-              List.iter((function (param) {
-                      var code = param[1];
-                      it(param[0], (function (param) {
-                              var arg1 = function (x) {
-                                handleCode(x);
-                                return val_unit;
-                              };
-                              return code.then(arg1);
-                            }));
-                    }), suites);
-            }));
-    } else {
-      console.log("promise suites");
-    }
-    return ;
-  }
-  
-}
-
-function eq_suites(test_id, suites, loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function bool_suites(test_id, suites, loc, x) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: x
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function throw_suites(test_id, suites, loc, x) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "ThrowAny",
-                  _0: x
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-exports.from_suites = from_suites;
-exports.from_pair_suites = from_pair_suites;
-exports.from_promise_suites = from_promise_suites;
-exports.old_from_promise_suites_donotuse = old_from_promise_suites_donotuse;
-exports.eq_suites = eq_suites;
-exports.bool_suites = bool_suites;
-exports.throw_suites = throw_suites;
-exports.force_curry = force_curry;
-/* val_unit Not a pure module */
diff --git a/jscomp/test/mt.res b/jscomp/test/mt.res
deleted file mode 100644
index 5810bfa..0000000
--- a/jscomp/test/mt.res
+++ /dev/null
@@ -1,313 +0,0 @@
-@val external describe: (string, (. unit) => unit) => unit = "describe"
-
-@val external it: (string, @uncurry (unit => unit)) => unit = "it"
-
-@val external it_promise: (string, @uncurry (unit => Js.Promise.t<_>)) => unit = "it"
-
-@val @module("assert") external eq: ('a, 'a) => unit = "deepEqual"
-
-@val @module("assert") external neq: ('a, 'a) => unit = "notDeepEqual"
-
-@val @module("assert") external strict_eq: ('a, 'a) => unit = "strictEqual"
-
-@val @module("assert") external strict_neq: ('a, 'a) => unit = "notStrictEqual"
-
-@val @module("assert") external ok: bool => unit = "ok"
-
-@val @module("assert") external fail: ('a, 'a, Js.undefined<string>, string) => unit = "fail"
-
-@val @variadic external dump: array<'a> => unit = "console.log"
-
-@val
-@module("assert")
-/** There is a problem --
-    it does not return [unit]
-*/
-external throws: (unit => unit) => unit = "throws"
-
-let assert_equal = eq
-let assert_notequal = neq
-let assert_strict_equal = strict_eq
-let assert_strict_notequal = strict_neq
-let assert_ok = a => ok(a)
-let assert_fail = msg => fail((), (), Js.Undefined.return(msg), "")
-
-@module("process") external argv: array<string> = "argv"
-@module("path") external basename: string => string = "basename"
-
-let is_mocha = () =>
-  switch Array.to_list(argv) {
-  | list{_node, mocha, ..._} =>
-    let exec = basename(mocha)
-    exec == "mocha" || exec == "_mocha"
-  | _ => false
-  }
-/* assert -- raises an AssertionError which mocha handls better
- */
-
-let from_suites = %raw(`
-function from_suites(name, suite) {
-  var match = $$Array.to_list(Process.argv);
-  if (match && is_mocha(undefined)) {
-    describe(name, (function () {
-            return List.iter((function (param) {
-                          var partial_arg = param[1];
-                          it(param[0], (function () {
-                                  return Curry._1(partial_arg, undefined);
-                                }));
-                        }), suite);
-          }));
-    return ;
-  }
-  
-}
-`)
-
-type rec eq =
-  | Eq('a, 'a): eq
-  | Neq('a, 'a): eq
-  | StrictEq('a, 'a): eq
-  | StrictNeq('a, 'a): eq
-  | Ok(bool): eq
-  | Approx(float, float): eq
-  | ApproxThreshold(float, float, float): eq
-  | ThrowAny(unit => unit): eq
-  | Fail(unit): eq
-  | FailWith(string): eq
-/* TODO: | Exception : exn -> (unit -> unit) -> _ eq */
-
-type pair_suites = list<(string, unit => eq)>
-type promise_suites = list<(string, Js.Promise.t<eq>)>
-let close_enough = (~threshold=0.0000001 /* epsilon_float */, a, b) => abs_float(a -. b) < threshold
-
-let node_from_pair_suites = (name: string, suites: pair_suites) => {
-  Js.log((name, "testing"))
-  List.iter(((name, code)) =>
-    switch code() {
-    | Eq(a, b) => Js.log((name, a, "eq?", b))
-    | Neq(a, b) => Js.log((name, a, "neq?", b))
-    | StrictEq(a, b) => Js.log((name, a, "strict_eq?", b))
-    | StrictNeq(a, b) => Js.log((name, a, "strict_neq?", b))
-    | Approx(a, b) => Js.log((name, a, "~", b))
-    | ApproxThreshold(t, a, b) => Js.log((name, a, "~", b, " (", t, ")"))
-    | ThrowAny(fn) => ()
-    | Fail(_) => Js.log("failed")
-    | FailWith(msg) => Js.log("failed: " ++ msg)
-    | Ok(a) => Js.log((name, a, "ok?"))
-    }
-  , suites)
-}
-
-let handleCode = spec =>
-  switch spec {
-  | Eq(a, b) => assert_equal(a, b)
-  | Neq(a, b) => assert_notequal(a, b)
-  | StrictEq(a, b) => assert_strict_equal(a, b)
-  | StrictNeq(a, b) => assert_strict_notequal(a, b)
-  | Ok(a) => assert_ok(a)
-  | Approx(a, b) =>
-    if !close_enough(a, b) {
-      assert_equal(a, b)
-    } /* assert_equal gives better ouput */
-  | ApproxThreshold(t, a, b) =>
-    if !close_enough(~threshold=t, a, b) {
-      assert_equal(a, b)
-    } /* assert_equal gives better ouput */
-  | ThrowAny(fn) => throws(fn)
-  | Fail(_) => assert_fail("failed")
-  | FailWith(msg) => assert_fail(msg)
-  }
-
-let force_curry = x => {
-  let _ = List.hd(list{3})
-  let _ = Array.copy([5])
-  x()
-}
-let from_pair_suites = %raw(`
-function from_pair_suites(name, suites) {
-  var match = $$Array.to_list(Process.argv);
-  if (match) {
-    if (is_mocha(undefined)) {
-      describe(name, (function () {
-              return List.iter((function (param) {
-                            var code = param[1];
-                            it(param[0], (function () {
-                                    return handleCode(Curry._1(code, undefined));
-                                  }));
-                          }), suites);
-            }));
-      return ;
-    } else {
-      console.log([
-            name,
-            "testing"
-          ]);
-      return List.iter((function (param) {
-                    var name = param[0];
-                    var fn = Curry._1(param[1], undefined);
-                    switch (fn.TAG) {
-                      case "Eq" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "eq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case "Neq" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "neq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case "StrictEq" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "strict_eq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case "StrictNeq" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "strict_neq?",
-                                fn._1
-                              ]);
-                          return ;
-                      case "Ok" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "ok?"
-                              ]);
-                          return ;
-                      case "Approx" :
-                          console.log([
-                                name,
-                                fn._0,
-                                "~",
-                                fn._1
-                              ]);
-                          return ;
-                      case "ApproxThreshold" :
-                          console.log([
-                                name,
-                                fn._1,
-                                "~",
-                                fn._2,
-                                " (",
-                                fn._0,
-                                ")"
-                              ]);
-                          return ;
-                      case "ThrowAny" :
-                          return ;
-                      case "Fail" :
-                          console.log("failed");
-                          return ;
-                      case "FailWith" :
-                          console.log("failed: " + fn._0);
-                          return ;
-                      
-                    }
-                  }), suites);
-    }
-  }
-  
-}
-`)
-let val_unit = Js.Promise.resolve()
-
-let from_promise_suites = %raw(`
-
-function from_promise_suites(name, suites) {
-  var match = $$Array.to_list(Process.argv);
-  if (match) {
-    if (is_mocha(undefined)) {
-      describe(name, (function () {
-              return List.iter((function (param) {
-                            var code = param[1];
-                            it(param[0], (function () {
-                                    var arg1 = function (x) {
-                                      handleCode(x);
-                                      return val_unit;
-                                    };
-                                    return code.then(arg1);
-                                  }));
-                          }), suites);
-            }));
-    } else {
-      console.log("promise suites");
-    }
-    return ;
-  }
-  
-}
-`)
-
-let old_from_promise_suites_donotuse = (name, suites: list<(string, Js.Promise.t<_>)>) =>
-  switch Array.to_list(argv) {
-  | list{cmd, ..._} =>
-    if is_mocha() {
-      describe(name, (. ()) =>
-        suites |> List.iter(((name, code)) =>
-          it_promise(
-            name,
-            _ =>
-              code |> Js.Promise.then_(
-                x => {
-                  handleCode(x)
-                  val_unit
-                },
-              ),
-          )
-        )
-      )
-    } else {
-      Js.log("promise suites")
-    } /* TODO */
-  | _ => ()
-  }
-
-/*
-Note that [require] is a file local value,
-we need type [require]
-
-let is_top : unit -> bool = [%bs.raw{|
-function (_){
-console.log('hi');
-if (typeof require === "undefined"){
-  return false
-} else {
-  console.log("hey",require.main.filename);
-  return require.main === module;
-}
-}
-|}]
-
-let from_pair_suites_non_top name suites =
-    if not @@ is_top () then
-      from_pair_suites name suites
-*/
-
-let eq_suites = (~test_id, ~suites, loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Eq(x, y)), ...suites.contents}
-}
-
-let bool_suites = (~test_id, ~suites, loc, x) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Ok(x)), ...suites.contents}
-}
-
-let throw_suites = (~test_id, ~suites, loc, x) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => ThrowAny(x)), ...suites.contents}
-}
diff --git a/jscomp/test/mt.resi b/jscomp/test/mt.resi
deleted file mode 100644
index 1e18ec1..0000000
--- a/jscomp/test/mt.resi
+++ /dev/null
@@ -1,29 +0,0 @@
-type rec eq =
-  | Eq('a, 'a): eq
-  | Neq('a, 'a): eq
-  | StrictEq('a, 'a): eq
-  | StrictNeq('a, 'a): eq
-  | Ok(bool): eq
-  | Approx(float, float): eq
-  | ApproxThreshold(float, float, float): eq
-  | ThrowAny(unit => unit): eq
-  | Fail(unit): eq
-  | FailWith(string): eq
-type pair_suites = list<(string, unit => eq)>
-
-let from_suites: (string, list<(string, unit => unit)>) => unit
-let from_pair_suites: (string, pair_suites) => unit
-
-type promise_suites = list<(string, Js.Promise.t<eq>)>
-
-let from_promise_suites: (string, promise_suites) => unit
-
-let old_from_promise_suites_donotuse: (string, promise_suites) => unit
-
-let eq_suites: (~test_id: ref<int>, ~suites: ref<pair_suites>, string, 'b, 'b) => unit
-
-let bool_suites: (~test_id: ref<int>, ~suites: ref<pair_suites>, string, bool) => unit
-
-let throw_suites: (~test_id: ref<int>, ~suites: ref<pair_suites>, string, unit => unit) => unit
-
-let force_curry: (unit => unit) => unit
diff --git a/jscomp/test/mt_global.js b/jscomp/test/mt_global.js
deleted file mode 100644
index 9b21f8a..0000000
--- a/jscomp/test/mt_global.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function collect_eq(test_id, suites, loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function collect_neq(test_id, suites, loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Neq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function collect_approx(test_id, suites, loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Approx",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-exports.collect_eq = collect_eq;
-exports.collect_neq = collect_neq;
-exports.collect_approx = collect_approx;
-/* No side effect */
diff --git a/jscomp/test/mt_global.res b/jscomp/test/mt_global.res
deleted file mode 100644
index ac492af..0000000
--- a/jscomp/test/mt_global.res
+++ /dev/null
@@ -1,22 +0,0 @@
-let collect_eq = (test_id, suites, loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-let collect_neq = (test_id, suites, loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{
-      (loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Neq(x, y)),
-      ...suites.contents,
-    }
-}
-
-let collect_approx = (test_id, suites, loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{
-      (loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Approx(x, y)),
-      ...suites.contents,
-    }
-}
diff --git a/jscomp/test/mt_global.resi b/jscomp/test/mt_global.resi
deleted file mode 100644
index 3fb7f4c..0000000
--- a/jscomp/test/mt_global.resi
+++ /dev/null
@@ -1,5 +0,0 @@
-let collect_eq: (ref<int>, ref<Mt.pair_suites>, string, 'b, 'b) => unit
-
-let collect_neq: (ref<int>, ref<Mt.pair_suites>, string, 'b, 'b) => unit
-
-let collect_approx: (ref<int>, ref<Mt.pair_suites>, string, float, float) => unit
diff --git a/jscomp/test/mutable_obj_test.js b/jscomp/test/mutable_obj_test.js
deleted file mode 100644
index cfba990..0000000
--- a/jscomp/test/mutable_obj_test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  x.dec = (function (x) {
-      return {
-              x: x,
-              y: x
-            };
-    });
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/mutable_obj_test.res b/jscomp/test/mutable_obj_test.res
deleted file mode 100644
index 6b9a080..0000000
--- a/jscomp/test/mutable_obj_test.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type u = {@set "height": int}
-
-let f = (x: u) => {
-  x["height"] = 3
-  x["height"] * 2
-}
-
-let f = (x: {@set({no_get: no_get}) "height": int}) => x["height"] = 3
-
-type v = {@set "dec": int => {"x": int, "y": float}}
-
-let f = (x: v) => x["dec"] = (x) => {"x": x, "y": float_of_int(x)}
diff --git a/jscomp/test/mutable_uncurry_test.js b/jscomp/test/mutable_uncurry_test.js
deleted file mode 100644
index c98e621..0000000
--- a/jscomp/test/mutable_uncurry_test.js
+++ /dev/null
@@ -1,240 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eqs(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function eq(param, param$1) {
-  var x = param.contents;
-  var y = param$1.contents;
-  return x === y;
-}
-
-function eq2(x, param) {
-  var y = param.contents;
-  return Caml_obj.equal(x.contents, y);
-}
-
-eqs("File \"mutable_uncurry_test.res\", line 15, characters 4-11", false, eq({
-          contents: 1
-        }, {
-          contents: 2
-        }));
-
-eqs("File \"mutable_uncurry_test.res\", line 16, characters 4-11", true, eq({
-          contents: 2
-        }, {
-          contents: 2
-        }));
-
-function ut3(param, param$1, param$2) {
-  var x0 = param.contents;
-  var x1 = param$1.contents;
-  var x2 = param$2.contents;
-  return [
-          x0,
-          x1,
-          x2
-        ];
-}
-
-function t3(param) {
-  var x0 = param.contents;
-  return function (param) {
-    var x1 = param.contents;
-    return function (param) {
-      var x2 = param.contents;
-      return [
-              x0,
-              x1,
-              x2
-            ];
-    };
-  };
-}
-
-function ut4(param, param$1, param$2, param$3) {
-  var x0 = param.contents;
-  var x1 = param$1.contents;
-  return (function (param) {
-                var x2 = param.contents;
-                return function (param) {
-                  var x3 = param.contents;
-                  return [
-                          x0,
-                          x1,
-                          x2,
-                          x3
-                        ];
-                };
-              })(param$2)(param$3);
-}
-
-function t4(param) {
-  var x0 = param.contents;
-  return function (param) {
-    var x1 = param.contents;
-    return function (param) {
-      var x2 = param.contents;
-      return function (param) {
-        var x3 = param.contents;
-        return [
-                x0,
-                x1,
-                x2,
-                x3
-              ];
-      };
-    };
-  };
-}
-
-function ut5(param, param$1, param$2, param$3, param$4) {
-  var x0 = param.contents;
-  var x1 = param$1.contents;
-  return (function (param) {
-                  var x2 = param.contents;
-                  return function (param) {
-                    var x3 = param.contents;
-                    return function (param) {
-                      var x4 = param.contents;
-                      return [
-                              x0,
-                              x1,
-                              x2,
-                              x3,
-                              x4
-                            ];
-                    };
-                  };
-                })(param$2)(param$3)(param$4);
-}
-
-function t5(param) {
-  var x0 = param.contents;
-  return function (param) {
-    var x1 = param.contents;
-    return function (param) {
-      var x2 = param.contents;
-      return function (param) {
-        var x3 = param.contents;
-        return function (param) {
-          var x4 = param.contents;
-          return [
-                  x0,
-                  x1,
-                  x2,
-                  x3,
-                  x4
-                ];
-        };
-      };
-    };
-  };
-}
-
-function nested0(param, param$1, param$2) {
-  var x0 = param.contents;
-  var x1 = param$1.contents;
-  var x2 = param$2.contents;
-  var a = (x0 + x1 | 0) + x2 | 0;
-  return function (param) {
-    var x0 = param.contents;
-    return function (param) {
-      var x1 = param.contents;
-      return function (param) {
-        var x2 = param.contents;
-        return ((a + x0 | 0) + x1 | 0) + x2 | 0;
-      };
-    };
-  };
-}
-
-function nested1(param) {
-  var x0 = param.contents;
-  return function (param) {
-    var x1 = param.contents;
-    return function (param) {
-      var x2 = param.contents;
-      var a = (x0 + x1 | 0) + x2 | 0;
-      return function (param, param$1, param$2) {
-        var x0 = param.contents;
-        var x1 = param$1.contents;
-        var x2 = param$2.contents;
-        return ((a + x0 | 0) + x1 | 0) + x2 | 0;
-      };
-    };
-  };
-}
-
-eqs("File \"mutable_uncurry_test.res\", line 51, characters 4-11", ut3({
-          contents: 1
-        }, {
-          contents: 2
-        }, {
-          contents: 3
-        }), [
-      1,
-      2,
-      3
-    ]);
-
-eqs("File \"mutable_uncurry_test.res\", line 52, characters 4-11", Curry._1(t3({
-                contents: 1
-              })({
-              contents: 2
-            }), {
-          contents: 3
-        }), [
-      1,
-      2,
-      3
-    ]);
-
-eqs("File \"mutable_uncurry_test.res\", line 54, characters 4-11", ut5({
-          contents: 1
-        }, {
-          contents: 2
-        }, {
-          contents: 3
-        }, {
-          contents: 1
-        }, {
-          contents: 1
-        }), [
-      1,
-      2,
-      3,
-      1,
-      1
-    ]);
-
-Mt.from_pair_suites("mutable_uncurry_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eqs = eqs;
-exports.eq = eq;
-exports.eq2 = eq2;
-exports.ut3 = ut3;
-exports.t3 = t3;
-exports.ut4 = ut4;
-exports.t4 = t4;
-exports.ut5 = ut5;
-exports.t5 = t5;
-exports.nested0 = nested0;
-exports.nested1 = nested1;
-/*  Not a pure module */
diff --git a/jscomp/test/mutable_uncurry_test.res b/jscomp/test/mutable_uncurry_test.res
deleted file mode 100644
index 8acbd34..0000000
--- a/jscomp/test/mutable_uncurry_test.res
+++ /dev/null
@@ -1,55 +0,0 @@
-@@bs.config({
-  flags: [
-    /* "-bs-diagnose" */
-  ],
-})
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eqs = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let eq = (. {contents: (x: int)}, {contents: y}) => x == y
-
-let eq2 = (. x, {contents: y}) => x.contents == y
-
-eqs(__LOC__, false, eq(. ref(1), ref(2)))
-eqs(__LOC__, true, eq(. ref(2), ref(2)))
-
-let ut3 = (. {contents: x0}, {contents: x1}, {contents: x2}) => (x0, x1, x2)
-let t3 = ({contents: x0}, {contents: x1}, {contents: x2}) => (x0, x1, x2)
-
-let ut4 = (. {contents: x0}, {contents: x1}, {contents: x2}, {contents: x3}) => (x0, x1, x2, x3)
-
-let t4 = ({contents: x0}, {contents: x1}, {contents: x2}, {contents: x3}) => (x0, x1, x2, x3)
-
-let ut5 = (. {contents: x0}, {contents: x1}, {contents: x2}, {contents: x3}, {contents: x4}) => (
-  x0,
-  x1,
-  x2,
-  x3,
-  x4,
-)
-
-let t5 = ({contents: x0}, {contents: x1}, {contents: x2}, {contents: x3}, {contents: x4}) => (
-  x0,
-  x1,
-  x2,
-  x3,
-  x4,
-)
-
-let nested0 = (. {contents: x0}, {contents: x1}, {contents: x2}) => {
-  let a = x0 + x1 + x2
-  ({contents: x0}, {contents: x1}, {contents: x2}) => a + x0 + x1 + x2
-}
-
-let nested1 = ({contents: x0}, {contents: x1}, {contents: x2}) => {
-  let a = x0 + x1 + x2
-  (. {contents: x0}, {contents: x1}, {contents: x2}) => a + x0 + x1 + x2
-}
-
-eqs(__LOC__, ut3(. ref(1), ref(2), ref(3)), (1, 2, 3))
-eqs(__LOC__, t3(ref(1), ref(2), ref(3)), (1, 2, 3))
-
-eqs(__LOC__, ut5(. ref(1), ref(2), ref(3), ref(1), ref(1)), (1, 2, 3, 1, 1))
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/mutual_non_recursive_type.js b/jscomp/test/mutual_non_recursive_type.js
deleted file mode 100644
index e8d6f3d..0000000
--- a/jscomp/test/mutual_non_recursive_type.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  return x;
-}
-
-var U = {
-  f: f
-};
-
-var v = {
-  TAG: "H",
-  _0: "OT"
-};
-
-exports.U = U;
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/mutual_non_recursive_type.res b/jscomp/test/mutual_non_recursive_type.res
deleted file mode 100644
index 9f5cc15..0000000
--- a/jscomp/test/mutual_non_recursive_type.res
+++ /dev/null
@@ -1,13 +0,0 @@
-module U = {
-  type t = OT
-  let f = x => x
-}
-
-open U
-
-type t =
-  | Ta(t) /* * u compilation error [nonrec applices to all] */
-  | Tb(int)
-and u = | /** one attribute nonrecursive will affect all */ H(t) /* refers to old t */
-
-let v: u = H(OT)
diff --git a/jscomp/test/name_mangle_test.js b/jscomp/test/name_mangle_test.js
deleted file mode 100644
index b5d42a4..0000000
--- a/jscomp/test/name_mangle_test.js
+++ /dev/null
@@ -1,153 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f0(x) {
-  var old = x._open;
-  x._open = old + 1 | 0;
-  return x._open;
-}
-
-function f1(x) {
-  var old = x._in;
-  x._in = old + 1 | 0;
-  return x._in;
-}
-
-function f2(x) {
-  var old = x._MAX_LENGTH;
-  x._MAX_LENGTH = old + 1 | 0;
-  return x._MAX_LENGTH;
-}
-
-function f3(x) {
-  var old = x._Capital;
-  x._Capital = old + 1 | 0;
-  return x._Capital;
-}
-
-function f4(x) {
-  var old = x._open__;
-  x._open__ = old + 1 | 0;
-  return x._open__;
-}
-
-function f5(x) {
-  var old = x.open__;
-  x.open__ = old + 1 | 0;
-  return x.open__;
-}
-
-function f6(x) {
-  var old = x["_'x"];
-  x["_'x"] = old + 1 | 0;
-  return x["_'x"];
-}
-
-function f7(x) {
-  var old = x._Capital__;
-  x._Capital__ = old + 1 | 0;
-  return x._Capital__;
-}
-
-function f8(x) {
-  var old = x._MAX__;
-  x._MAX__ = old + 1 | 0;
-  return x._MAX__;
-}
-
-function f9(x) {
-  var old = x.__;
-  x.__ = old + 1 | 0;
-  return x.__;
-}
-
-function f10(x) {
-  var old = x.__x;
-  x.__x = old + 1 | 0;
-  return x.__x;
-}
-
-function f11(x) {
-  var old = x.___;
-  x.___ = old + 1 | 0;
-  return x.___;
-}
-
-function f12(x) {
-  var old = x.____;
-  x.____ = old + 1 | 0;
-  return x.____;
-}
-
-eq("File \"name_mangle_test.res\", line 94, characters 5-12", f0({_open:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 95, characters 5-12", f1({_in:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 96, characters 5-12", f2({_MAX_LENGTH:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 97, characters 5-12", f3({_Capital:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 98, characters 5-12", f4({_open__:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 99, characters 5-12", f5({open__:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 100, characters 5-12", f6({ "_'x" :0}), 1);
-
-eq("File \"name_mangle_test.res\", line 101, characters 5-12", f7({_Capital__:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 102, characters 5-12", f8({_MAX__:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 103, characters 5-12", f9({__:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 104, characters 5-12", f10({__x:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 105, characters 5-12", f11({___:0}), 1);
-
-eq("File \"name_mangle_test.res\", line 106, characters 5-12", f12({____:0}), 1);
-
-Mt.from_pair_suites("File \"name_mangle_test.res\", line 109, characters 20-27", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f0 = f0;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.f5 = f5;
-exports.f6 = f6;
-exports.f7 = f7;
-exports.f8 = f8;
-exports.f9 = f9;
-exports.f10 = f10;
-exports.f11 = f11;
-exports.f12 = f12;
-/*  Not a pure module */
diff --git a/jscomp/test/name_mangle_test.res b/jscomp/test/name_mangle_test.res
deleted file mode 100644
index 15ae63f..0000000
--- a/jscomp/test/name_mangle_test.res
+++ /dev/null
@@ -1,109 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-/* FIXME: paren needed here 
-    {[ x##xh#= (g z )  ]}
-*/
-let f0 = (x: {@set "_open": int}) => {
-  let old = x["_open"]
-  x["_open"] = old + 1
-  x["_open"]
-}
-
-let f1 = (x: {@set "_in": int}) => {
-  let old = x["_in"]
-  x["_in"] = old + 1
-  x["_in"]
-}
-
-let f2 = (x: {@set "_MAX_LENGTH": int}) => {
-  let old = x["_MAX_LENGTH"]
-  x["_MAX_LENGTH"] = old + 1
-  x["_MAX_LENGTH"]
-}
-
-let f3 = (x: {@set "_Capital": int}) => {
-  let old = x["_Capital"]
-  x["_Capital"] = old + 1
-  x["_Capital"]
-}
-
-let f4 = (x: {@set "_open__": int}) => {
-  let old = x["_open__"]
-  x["_open__"] = old + 1
-  x["_open__"]
-}
-
-let f5 = (x: {@set "open__": int}) => {
-  let old = x["open__"]
-  x["open__"] = old + 1
-  x["open__"]
-}
-
-/* < _ : int > -> is a syntax error */
-
-let f6 = (x: {@set "_'x": int}) => {
-  let old = x["_'x"]
-  x["_'x"] = old + 1
-  x["_'x"]
-}
-
-let f7 = (x: {@set "_Capital__": int}) => {
-  let old = x["_Capital__"]
-  x["_Capital__"] = old + 1
-  x["_Capital__"]
-}
-
-let f8 = (x: {@set "_MAX__": int}) => {
-  let old = x["_MAX__"]
-  x["_MAX__"] = old + 1
-  x["_MAX__"]
-}
-
-let f9 = (x: {@set "__": int}) => {
-  let old = x["__"]
-  x["__"] = old + 1
-  x["__"]
-}
-
-let f10 = (x: {@set "__x": int}) => {
-  let old = x["__x"]
-  x["__x"] = old + 1
-  x["__x"]
-}
-
-/* triple _ */
-let f11 = (x: {@set "___": int}) => {
-  let old = x["___"]
-  x["___"] = old + 1
-  x["___"]
-}
-/* quad _ */
-let f12 = (x: {@set "____": int}) => {
-  let old = x["____"]
-  x["____"] = old + 1
-  x["____"]
-}
-
-let () = {
-  eq(__LOC__, f0(%raw("{_open:0}")), 1)
-  eq(__LOC__, f1(%raw("{_in:0}")), 1)
-  eq(__LOC__, f2(%raw("{_MAX_LENGTH:0}")), 1)
-  eq(__LOC__, f3(%raw("{_Capital:0}")), 1)
-  eq(__LOC__, f4(%raw("{_open__:0}")), 1)
-  eq(__LOC__, f5(%raw("{open__:0}")), 1)
-  eq(__LOC__, f6(%raw(`{ "_'x" :0} `)), 1)
-  eq(__LOC__, f7(%raw("{_Capital__:0}")), 1)
-  eq(__LOC__, f8(%raw("{_MAX__:0}")), 1)
-  eq(__LOC__, f9(%raw("{__:0}")), 1)
-  eq(__LOC__, f10(%raw("{__x:0}")), 1)
-  eq(__LOC__, f11(%raw("{___:0}")), 1)
-  eq(__LOC__, f12(%raw("{____:0}")), 1)
-}
-
-Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/nested_include.js b/jscomp/test/nested_include.js
deleted file mode 100644
index 2107e1e..0000000
--- a/jscomp/test/nested_include.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  return x;
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/nested_include.res b/jscomp/test/nested_include.res
deleted file mode 100644
index 8b1b457..0000000
--- a/jscomp/test/nested_include.res
+++ /dev/null
@@ -1,10 +0,0 @@
-include {
-  type t
-  include (
-    {
-      let f = x => x
-    }: {
-      let f: t => t
-    }
-  )
-}
diff --git a/jscomp/test/nested_module_alias.js b/jscomp/test/nested_module_alias.js
deleted file mode 100644
index eaa04d2..0000000
--- a/jscomp/test/nested_module_alias.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-
-function v(x) {
-  return [
-          List.length(x),
-          List.length(x)
-        ];
-}
-
-var L;
-
-exports.L = L;
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/nested_module_alias.res b/jscomp/test/nested_module_alias.res
deleted file mode 100644
index 5699283..0000000
--- a/jscomp/test/nested_module_alias.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module L = List
-
-let v = x => {
-  module H = List
-  module U = L
-  (H.length(x), U.length(x))
-}
diff --git a/jscomp/test/nested_obj_literal.js b/jscomp/test/nested_obj_literal.js
deleted file mode 100644
index 3549600..0000000
--- a/jscomp/test/nested_obj_literal.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var structural_obj = {
-  x: {
-    y: {
-      z: 3
-    }
-  }
-};
-
-var f_record = {
-  x: {
-    y: {
-      z: 3
-    }
-  }
-};
-
-exports.structural_obj = structural_obj;
-exports.f_record = f_record;
-/* No side effect */
diff --git a/jscomp/test/nested_obj_literal.res b/jscomp/test/nested_obj_literal.res
deleted file mode 100644
index de879b7..0000000
--- a/jscomp/test/nested_obj_literal.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let structural_obj = {"x": {"y": {"z": 3}}}
-/* compiler inferred type :
- val structural_obj : < x : < y : < z : int >  >  > [@bs.obj] */
-
-type x<'a> = {x: 'a}
-type y<'a> = {y: 'a}
-type z<'a> = {z: 'a}
-let f_record = {x: {y: {z: 3}}}
-/* compiler inferred type :
- val f_record : int z y x */
diff --git a/jscomp/test/nested_obj_test.js b/jscomp/test/nested_obj_test.js
deleted file mode 100644
index cbbee0c..0000000
--- a/jscomp/test/nested_obj_test.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var f = {
-  x: {
-    y: {
-      z: 3
-    }
-  }
-};
-
-var f2_0 = {
-  hd: {
-    x: {
-      y: {
-        z: 3
-      }
-    }
-  },
-  tl: {
-    hd: {
-      x: {
-        y: {
-          z: 31
-        }
-      }
-    },
-    tl: /* [] */0
-  }
-};
-
-var f2_1 = [
-  {
-    x: {
-      y: {
-        z: 3
-      }
-    }
-  },
-  {
-    x: {
-      y: {
-        z: 31
-      }
-    }
-  }
-];
-
-var f2 = [
-  f2_0,
-  f2_1
-];
-
-var f3 = {
-  x: {
-    y: {
-      z: 3
-    }
-  }
-};
-
-var f_record = {
-  x: {
-    y: {
-      z: 3
-    }
-  }
-};
-
-exports.f_record = f_record;
-exports.f = f;
-exports.f2 = f2;
-exports.f3 = f3;
-/* No side effect */
diff --git a/jscomp/test/nested_obj_test.res b/jscomp/test/nested_obj_test.res
deleted file mode 100644
index 26fb997..0000000
--- a/jscomp/test/nested_obj_test.res
+++ /dev/null
@@ -1,26 +0,0 @@
-type f_obj = {"x": {"y": {"z": int}}}
-let f: f_obj = {"x": {"y": {"z": 3}}}
-
-type x<'a> = {x: 'a}
-type y<'a> = {y: 'a}
-type z<'a> = {z: 'a}
-let f_record = {x: {y: {z: 3}}}
-
-let f: f_obj = {"x": {"y": {"z": 3}}}
-
-let f2: (list<{"x": {"y": {"z": int}}}>, array<{"x": {"y": {"z": int}}}>) = (
-  list{{"x": {"y": {"z": 3}}}, {"x": {"y": {"z": 31}}}},
-  [{"x": {"y": {"z": 3}}}, {"x": {"y": {"z": 31}}}],
-)
-
-let f3: {"x": {"y": {"z": int}}} = {"x": {"y": {"z": 3}}}
-
-/* how about 
-let f x = [%bs.obj (x : < x : int > ) ] 
-*/
-/*
-advantage of extension point
-: robust, *control the entry point*, entry point can be more flexible easy to write , 
-disdvantage
-: more intrusive, does not work with ocamldep
-*/
diff --git a/jscomp/test/nested_pattern_match_test.js b/jscomp/test/nested_pattern_match_test.js
deleted file mode 100644
index 6f74ac7..0000000
--- a/jscomp/test/nested_pattern_match_test.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f_list(x) {
-  if (!x) {
-    return 0;
-  }
-  var match = x.tl;
-  if (!match) {
-    return 0;
-  }
-  var match$1 = match.tl;
-  if (!match$1) {
-    return 0;
-  }
-  var match$2 = match$1.tl;
-  if (!match$2) {
-    return 0;
-  }
-  var match$3 = match$2.tl;
-  if (!match$3) {
-    return 0;
-  }
-  var match$4 = match$3.tl;
-  if (match$4) {
-    return ((((x.hd + match.hd | 0) + match$1.hd | 0) + match$2.hd | 0) + match$3.hd | 0) + match$4.hd | 0;
-  } else {
-    return 0;
-  }
-}
-
-function f_arr(x) {
-  if (x.length !== 6) {
-    return 0;
-  }
-  var a0 = x[0];
-  var a1 = x[1];
-  var a2 = x[2];
-  var a3 = x[3];
-  var a4 = x[4];
-  var a5 = x[5];
-  return ((((a0 + a1 | 0) + a2 | 0) + a3 | 0) + a4 | 0) + a5 | 0;
-}
-
-function f_opion(x) {
-  var match = x.hi;
-  if (match !== 2) {
-    if (match !== 3) {
-      return 0;
-    }
-    var match$1 = x.lo;
-    if (!match$1) {
-      return 0;
-    }
-    if (match$1.hd !== undefined) {
-      return 0;
-    }
-    var match$2 = match$1.tl;
-    if (!match$2) {
-      return 0;
-    }
-    if (match$2.hd !== undefined) {
-      return 0;
-    }
-    var match$3 = match$2.tl;
-    if (!match$3) {
-      return 0;
-    }
-    var match$4 = match$3.hd;
-    if (match$4 === undefined) {
-      return 0;
-    }
-    if (match$4 !== 2) {
-      return 0;
-    }
-    var match$5 = match$3.tl;
-    if (!match$5) {
-      return 0;
-    }
-    var match$6 = match$5.hd;
-    if (match$6 === undefined) {
-      return 0;
-    }
-    if (match$6 !== 1) {
-      return 0;
-    }
-    var match$7 = match$5.tl;
-    if (match$7 && match$7.hd !== undefined) {
-      return 2;
-    } else {
-      return 0;
-    }
-  }
-  var match$8 = x.lo;
-  if (!match$8) {
-    return 0;
-  }
-  if (match$8.hd !== undefined) {
-    return 0;
-  }
-  var match$9 = match$8.tl;
-  if (!match$9) {
-    return 0;
-  }
-  if (match$9.hd !== undefined) {
-    return 0;
-  }
-  var match$10 = match$9.tl;
-  if (!match$10) {
-    return 0;
-  }
-  var match$11 = match$10.hd;
-  if (match$11 === undefined) {
-    return 0;
-  }
-  if (match$11 !== 2) {
-    return 0;
-  }
-  var match$12 = match$10.tl;
-  if (!match$12) {
-    return 0;
-  }
-  var match$13 = match$12.hd;
-  if (match$13 === undefined) {
-    return 0;
-  }
-  if (match$13 !== 1) {
-    return 0;
-  }
-  var match$14 = match$12.tl;
-  if (match$14 && match$14.hd !== undefined) {
-    return 3;
-  } else {
-    return 0;
-  }
-}
-
-exports.f_list = f_list;
-exports.f_arr = f_arr;
-exports.f_opion = f_opion;
-/* No side effect */
diff --git a/jscomp/test/nested_pattern_match_test.res b/jscomp/test/nested_pattern_match_test.res
deleted file mode 100644
index 73e1dae..0000000
--- a/jscomp/test/nested_pattern_match_test.res
+++ /dev/null
@@ -1,66 +0,0 @@
-let f_list = x =>
-  switch x {
-  | list{a0, a1, a2, a3, a4, a5, ..._} => a0 + a1 + a2 + a3 + a4 + a5
-  | _ => 0
-  }
-
-/*
-if(!match) {return 0}
-else {
-   var match$1 = match[1]
-   if (!match$1) {return 0}
-}
-
-
-Ideal code output:
-{[
-var match, match$1, match$2, match$3, match$4
-
-if(x && (match$1 = match[1]) && (match$2 = match$1[1]) && match$3 = match$2[1] && match$4 = match$3[1]){
-    reutrn x[0] + match[0] + match$1[0] +match$2[0]
-           + match$3[0] + match$4[0]
-}else {
-  return 0
-}
-
-]}
-
-{[
-var b0, b1, b2, b3, b4, b5
-
-if(!x || !(b0 = x[1] ) || !(b1 = b0[1]) || !(b2=b1[1]) || !(b3 = b2[1]) || !(b4 = b3[1]) || !(b5=b4[1])){
-    return 0
-} else {
-  var a0 = b0[0],
-      a1 = b1[0],
-      a2 = b2[0],
-      a3 = b3[0],
-      a4 = b4[0]
-      a5 = b5[0];
-  return a0 + a1 + a2 + a3 + a4 + a5
-}
-]}
-*/
-
-let f_arr = x =>
-  switch x {
-  | [a0, a1, a2, a3, a4, a5] => a0 + a1 + a2 + a3 + a4 + a5
-  | _ => 0
-  }
-
-type t = {
-  hi: int,
-  lo: list<option<int>>,
-}
-let f_opion = x =>
-  switch x {
-  | {hi: 3, lo: list{None, None, Some(2), Some(1), Some(_), ..._}} => 2
-  | _ => 0
-  }
-
-let f_opion = x =>
-  switch x {
-  | {hi: 3, lo: list{None, None, Some(2), Some(1), Some(_), ..._}} => 2
-  | {hi: 2, lo: list{None, None, Some(2), Some(1), Some(_), ..._}} => 3
-  | _ => 0
-  }
diff --git a/jscomp/test/noassert.js b/jscomp/test/noassert.js
deleted file mode 100644
index fb1c0f0..0000000
--- a/jscomp/test/noassert.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(param) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "noassert.res",
-          1,
-          14
-        ],
-        Error: new Error()
-      };
-}
-
-function h(param) {
-  
-}
-
-exports.f = f;
-exports.h = h;
-/* No side effect */
diff --git a/jscomp/test/noassert.res b/jscomp/test/noassert.res
deleted file mode 100644
index fcc6aa7..0000000
--- a/jscomp/test/noassert.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let f = () => assert (false)
-
-let h = () => assert (3 > 2)
diff --git a/jscomp/test/node_path_test.js b/jscomp/test/node_path_test.js
deleted file mode 100644
index a90d6ca..0000000
--- a/jscomp/test/node_path_test.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Path = require("path");
-
-console.log(Path.join(".", "Node_path_test"));
-
-/*  Not a pure module */
diff --git a/jscomp/test/node_path_test.res b/jscomp/test/node_path_test.res
deleted file mode 100644
index fcde2aa..0000000
--- a/jscomp/test/node_path_test.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@module("path") @variadic external join: array<string> => string = "join"
-
-let () = Js.log(join([".", __MODULE__]))
-
-/* let f x = join x */
diff --git a/jscomp/test/null_list_test.js b/jscomp/test/null_list_test.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/null_list_test.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/null_list_test.res b/jscomp/test/null_list_test.res
deleted file mode 100644
index a3babc6..0000000
--- a/jscomp/test/null_list_test.res
+++ /dev/null
@@ -1,5 +0,0 @@
-/* https://github.com/ocaml/ocaml/pull/234 */
-
-/* This raises in our generated code */
-
-/* compile error */
diff --git a/jscomp/test/number_lexer.js b/jscomp/test/number_lexer.js
deleted file mode 100644
index 9482a28..0000000
--- a/jscomp/test/number_lexer.js
+++ /dev/null
@@ -1,185 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Lexing = require("../../lib/js/lexing.js");
-
-function l(prim) {
-  console.log(prim);
-}
-
-var __ocaml_lex_tables = {
-  lex_base: "\x00\x00\xf6\xff\xf7\xff\xf8\xff\xf9\xff\xfa\xff\xfb\xff\xfc\xff\
-    \x3a\x00\x85\x00\xff\xff",
-  lex_backtrk: "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \x02\x00\x01\x00\xff\xff",
-  lex_default: "\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \xff\xff\xff\xff\x00\x00",
-  lex_trans: "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x0a\x00\x0a\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x03\x00\x02\x00\x05\x00\x07\x00\x00\x00\x06\x00\x00\x00\x04\x00\
-    \x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\
-    \x09\x00\x09\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x09\x00\x09\x00\x09\x00\
-    \x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-  lex_check: "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\x00\x00\x00\x00\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\xff\xff\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-    \x00\x00\x00\x00\x00\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\
-    \x08\x00\x08\x00\x08\x00\x08\x00\x08\x00\x09\x00\x09\x00\x09\x00\
-    \x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\x09\x00\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\
-    \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff",
-  lex_base_code: "",
-  lex_backtrk_code: "",
-  lex_default_code: "",
-  lex_trans_code: "",
-  lex_check_code: "",
-  lex_code: ""
-};
-
-function __ocaml_lex_token_rec(l, lexbuf, ___ocaml_lex_state) {
-  while(true) {
-    var __ocaml_lex_state = ___ocaml_lex_state;
-    var __ocaml_lex_state$1 = Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf);
-    switch (__ocaml_lex_state$1) {
-      case 0 :
-          Curry._1(l, "new line");
-          ___ocaml_lex_state = 0;
-          continue ;
-      case 1 :
-          Curry._1(l, "number");
-          Curry._1(l, Lexing.lexeme(lexbuf));
-          ___ocaml_lex_state = 0;
-          continue ;
-      case 2 :
-          Curry._1(l, "ident");
-          Curry._1(l, Lexing.lexeme(lexbuf));
-          ___ocaml_lex_state = 0;
-          continue ;
-      case 3 :
-          Curry._1(l, "+");
-          ___ocaml_lex_state = 0;
-          continue ;
-      case 4 :
-          Curry._1(l, "-");
-          ___ocaml_lex_state = 0;
-          continue ;
-      case 5 :
-          Curry._1(l, "*");
-          ___ocaml_lex_state = 0;
-          continue ;
-      case 6 :
-          Curry._1(l, "/");
-          ___ocaml_lex_state = 0;
-          continue ;
-      case 7 :
-          Curry._1(l, "(");
-          ___ocaml_lex_state = 0;
-          continue ;
-      case 8 :
-          Curry._1(l, ")");
-          ___ocaml_lex_state = 0;
-          continue ;
-      case 9 :
-          return Curry._1(l, "eof");
-      default:
-        Curry._1(lexbuf.refill_buff, lexbuf);
-        ___ocaml_lex_state = __ocaml_lex_state$1;
-        continue ;
-    }
-  };
-}
-
-function token(l, lexbuf) {
-  __ocaml_lex_token_rec(l, lexbuf, 0);
-}
-
-exports.l = l;
-exports.__ocaml_lex_tables = __ocaml_lex_tables;
-exports.token = token;
-exports.__ocaml_lex_token_rec = __ocaml_lex_token_rec;
-/* No side effect */
diff --git a/jscomp/test/number_lexer.mll b/jscomp/test/number_lexer.mll
deleted file mode 100644
index b423508..0000000
--- a/jscomp/test/number_lexer.mll
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-external log : string -> unit = "caml_alloc_dummy" [@@bs.val "console.log"]
-let l = 
-#if BS then 
- log 
-#else output_string stdout
-#end
-
-}
-
-rule  token l = parse
-    [' ' '\t' '\r' '\n']  { l "new line" ; token l lexbuf}
-  | ['0'-'9']+  { l "number"; l (Lexing.lexeme lexbuf); token l lexbuf }
-  | ['a'-'z''A'-'Z']+ {l "ident"; l (Lexing.lexeme lexbuf); token l lexbuf}
-  | '+'         { l "+" ; token l lexbuf }
-  | '-'         { l "-" ; token l lexbuf}
-  | '*'         { l "*" ; token l lexbuf}
-  | '/'         { l "/" ; token l lexbuf}
-  | '('         { l "(" ; token l lexbuf }
-  | ')'         { l ")"; token l lexbuf }
-  | eof         { l "eof" }
-
-{
-(* token l (Lexing.from_string "32 + 32 ( ) * / ") *)
-(* token (Lexing.from_string "32") *)
-}
-
-(* local variables: *)
-(* compile-command: "ocamlbuild number_lexer.byte --" *)
-(* end: *)
diff --git a/jscomp/test/number_lexer.res b/jscomp/test/number_lexer.res
deleted file mode 100644
index 78b10be..0000000
--- a/jscomp/test/number_lexer.res
+++ /dev/null
@@ -1,164 +0,0 @@
-@val("console.log") external log: string => unit = "caml_alloc_dummy"
-let l = log
-
-let __ocaml_lex_tables = {
-  Lexing.lex_base: "\000\000\246\255\247\255\248\255\249\255\250\255\251\255\252\255\
-    \058\000\133\000\255\255",
-  Lexing.lex_backtrk: "\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \002\000\001\000\255\255",
-  Lexing.lex_default: "\255\255\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \255\255\255\255\000\000",
-  Lexing.lex_trans: "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\010\000\010\000\000\000\000\000\010\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \003\000\002\000\005\000\007\000\000\000\006\000\000\000\004\000\
-    \009\000\009\000\009\000\009\000\009\000\009\000\009\000\009\000\
-    \009\000\009\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\009\000\009\000\009\000\
-    \009\000\009\000\009\000\009\000\009\000\009\000\009\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000",
-  Lexing.lex_check: "\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\000\000\000\000\255\255\255\255\000\000\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \000\000\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \000\000\000\000\000\000\000\000\255\255\000\000\255\255\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\255\255\255\255\255\255\255\255\255\255\
-    \255\255\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\255\255\255\255\255\255\
-    \255\255\255\255\255\255\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\008\000\008\000\008\000\
-    \008\000\008\000\008\000\008\000\008\000\009\000\009\000\009\000\
-    \009\000\009\000\009\000\009\000\009\000\009\000\009\000\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \000\000\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255",
-  Lexing.lex_base_code: "",
-  Lexing.lex_backtrk_code: "",
-  Lexing.lex_default_code: "",
-  Lexing.lex_trans_code: "",
-  Lexing.lex_check_code: "",
-  Lexing.lex_code: "",
-}
-
-let rec token = (l, lexbuf) => __ocaml_lex_token_rec(l, lexbuf, 0)
-and __ocaml_lex_token_rec = (l, lexbuf, __ocaml_lex_state) =>
-  switch Lexing.engine(__ocaml_lex_tables, __ocaml_lex_state, lexbuf) {
-  | 0 =>
-    l("new line")
-    token(l, lexbuf)
-
-  | 1 =>
-    l("number")
-    l(Lexing.lexeme(lexbuf))
-    token(l, lexbuf)
-
-  | 2 =>
-    l("ident")
-    l(Lexing.lexeme(lexbuf))
-    token(l, lexbuf)
-
-  | 3 =>
-    l("+")
-    token(l, lexbuf)
-
-  | 4 =>
-    l("-")
-    token(l, lexbuf)
-
-  | 5 =>
-    l("*")
-    token(l, lexbuf)
-
-  | 6 =>
-    l("/")
-    token(l, lexbuf)
-
-  | 7 =>
-    l("(")
-    token(l, lexbuf)
-
-  | 8 =>
-    l(")")
-    token(l, lexbuf)
-
-  | 9 => l("eof")
-
-  | __ocaml_lex_state =>
-    lexbuf.Lexing.refill_buff(lexbuf)
-    __ocaml_lex_token_rec(l, lexbuf, __ocaml_lex_state)
-  } /* token l (Lexing.from_string "32 + 32 ( ) * / ") */
-/* token (Lexing.from_string "32") */
diff --git a/jscomp/test/obj_literal_ppx.js b/jscomp/test/obj_literal_ppx.js
deleted file mode 100644
index 0670cfd..0000000
--- a/jscomp/test/obj_literal_ppx.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a = {
-  x: 3,
-  y: [1]
-};
-
-var b = {
-  x: 3,
-  y: [1],
-  z: 3,
-  u: (function (x, y) {
-      return x + y | 0;
-    })
-};
-
-function f(obj) {
-  return obj.x + obj.y.length | 0;
-}
-
-var u = f(a);
-
-var v = f(b);
-
-exports.a = a;
-exports.b = b;
-exports.f = f;
-exports.u = u;
-exports.v = v;
-/* u Not a pure module */
diff --git a/jscomp/test/obj_literal_ppx.res b/jscomp/test/obj_literal_ppx.res
deleted file mode 100644
index fc67f22..0000000
--- a/jscomp/test/obj_literal_ppx.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let a = {"x": 3, "y": [1]}
-
-let b = {"x": 3, "y": [1], "z": 3, "u": (. x, y) => x + y}
-
-let f = obj => obj["x"] + Array.length(obj["y"])
-
-let u = f(a)
-
-let v = f(b)
diff --git a/jscomp/test/obj_literal_ppx_test.js b/jscomp/test/obj_literal_ppx_test.js
deleted file mode 100644
index 3006a39..0000000
--- a/jscomp/test/obj_literal_ppx_test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a = {
-  x: 3,
-  y: {
-    hd: 1,
-    tl: {
-      hd: 2,
-      tl: {
-        hd: 3,
-        tl: /* [] */0
-      }
-    }
-  }
-};
-
-exports.a = a;
-/* No side effect */
diff --git a/jscomp/test/obj_literal_ppx_test.res b/jscomp/test/obj_literal_ppx_test.res
deleted file mode 100644
index ff7dffb..0000000
--- a/jscomp/test/obj_literal_ppx_test.res
+++ /dev/null
@@ -1,6 +0,0 @@
-let a = {
-  module N = {
-    @obj external create: (~x: 'a0, ~y: 'a1) => {"x": 'a0, "y": 'a1} = ""
-  }
-  N.create(~x=3, ~y=list{1, 2, 3})
-}
diff --git a/jscomp/test/obj_magic_test.js b/jscomp/test/obj_magic_test.js
deleted file mode 100644
index d11f762..0000000
--- a/jscomp/test/obj_magic_test.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-function is_block(x) {
-  return typeof x !== "number";
-}
-
-var suites_0 = [
-  "is_block_test1",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: false,
-              _1: "number" !== "number"
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "is_block_test2",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: true,
-                _1: typeof ({
-                    hd: 3,
-                    tl: /* [] */0
-                  }) !== "number"
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "is_block_test3",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: true,
-                  _1: "string" !== "number"
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "is_block_test4",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: false,
-                    _1: "number" !== "number"
-                  };
-          })
-      ],
-      tl: /* [] */0
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Obj_magic_test", suites);
-
-exports.is_block = is_block;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/obj_magic_test.res b/jscomp/test/obj_magic_test.res
deleted file mode 100644
index eaed75b..0000000
--- a/jscomp/test/obj_magic_test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-@@bs.config({
-  flags: [
-    /* "-drawlambda" */
-  ],
-})
-
-/* let empty_backtrace  = Obj.obj (Obj.new_block Obj.abstract_tag 0) */
-
-let is_block = x => Js.typeof(Obj.repr(x)) != "number"
-
-let suites = {
-  open Mt
-  list{
-    ("is_block_test1", _ => Eq(false, is_block(3))),
-    ("is_block_test2", _ => Eq(true, is_block(list{3}))),
-    ("is_block_test3", _ => Eq(true, is_block("x"))),
-    ("is_block_test4", _ => Eq(false, is_block(3.0))),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/obj_type_test.js b/jscomp/test/obj_type_test.js
deleted file mode 100644
index 7cabf0e..0000000
--- a/jscomp/test/obj_type_test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(u) {
-  return u;
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/obj_type_test.res b/jscomp/test/obj_type_test.res
deleted file mode 100644
index cc6e307..0000000
--- a/jscomp/test/obj_type_test.res
+++ /dev/null
@@ -1,3 +0,0 @@
-type x = {"x": int, "y": 'self => int} as 'self
-
-let f = (u: x): x => u
diff --git a/jscomp/test/ocaml_re_test.js b/jscomp/test/ocaml_re_test.js
deleted file mode 100644
index 041f35e..0000000
--- a/jscomp/test/ocaml_re_test.js
+++ /dev/null
@@ -1,4211 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var Char = require("../../lib/js/char.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Bytes = require("../../lib/js/bytes.js");
-var Curry = require("../../lib/js/curry.js");
-var $$String = require("../../lib/js/string.js");
-var Hashtbl = require("../../lib/js/hashtbl.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function union(_l, _l$p) {
-  while(true) {
-    var l$p = _l$p;
-    var l = _l;
-    if (!l$p) {
-      return l;
-    }
-    if (!l) {
-      return l$p;
-    }
-    var r$p = l$p.tl;
-    var match = l$p.hd;
-    var c2$p = match[1];
-    var c1$p = match[0];
-    var r = l.tl;
-    var match$1 = l.hd;
-    var c2 = match$1[1];
-    var c1 = match$1[0];
-    if ((c2 + 1 | 0) < c1$p) {
-      return {
-              hd: [
-                c1,
-                c2
-              ],
-              tl: union(r, l$p)
-            };
-    }
-    if ((c2$p + 1 | 0) < c1) {
-      return {
-              hd: [
-                c1$p,
-                c2$p
-              ],
-              tl: union(l, r$p)
-            };
-    }
-    if (c2 < c2$p) {
-      _l$p = {
-        hd: [
-          c1 < c1$p ? c1 : c1$p,
-          c2$p
-        ],
-        tl: r$p
-      };
-      _l = r;
-      continue ;
-    }
-    _l$p = r$p;
-    _l = {
-      hd: [
-        c1 < c1$p ? c1 : c1$p,
-        c2
-      ],
-      tl: r
-    };
-    continue ;
-  };
-}
-
-function inter(_l, _l$p) {
-  while(true) {
-    var l$p = _l$p;
-    var l = _l;
-    if (!l$p) {
-      return /* [] */0;
-    }
-    if (!l) {
-      return /* [] */0;
-    }
-    var r$p = l$p.tl;
-    var match = l$p.hd;
-    var c2$p = match[1];
-    var c1$p = match[0];
-    var r = l.tl;
-    var match$1 = l.hd;
-    var c2 = match$1[1];
-    var c1 = match$1[0];
-    if (Caml_obj.lessthan(c2, c1$p)) {
-      _l = r;
-      continue ;
-    }
-    if (!Caml_obj.lessthan(c2$p, c1)) {
-      if (Caml_obj.lessthan(c2, c2$p)) {
-        return {
-                hd: [
-                  Caml_obj.max(c1, c1$p),
-                  c2
-                ],
-                tl: inter(r, l$p)
-              };
-      } else {
-        return {
-                hd: [
-                  Caml_obj.max(c1, c1$p),
-                  c2$p
-                ],
-                tl: inter(l, r$p)
-              };
-      }
-    }
-    _l$p = r$p;
-    continue ;
-  };
-}
-
-function diff(_l, _l$p) {
-  while(true) {
-    var l$p = _l$p;
-    var l = _l;
-    if (!l$p) {
-      return l;
-    }
-    if (!l) {
-      return /* [] */0;
-    }
-    var r$p = l$p.tl;
-    var match = l$p.hd;
-    var c2$p = match[1];
-    var c1$p = match[0];
-    var r = l.tl;
-    var match$1 = l.hd;
-    var c2 = match$1[1];
-    var c1 = match$1[0];
-    if (c2 < c1$p) {
-      return {
-              hd: [
-                c1,
-                c2
-              ],
-              tl: diff(r, l$p)
-            };
-    }
-    if (c2$p < c1) {
-      _l$p = r$p;
-      continue ;
-    }
-    var r$p$p = c2$p < c2 ? ({
-          hd: [
-            c2$p + 1 | 0,
-            c2
-          ],
-          tl: r
-        }) : r;
-    if (c1 < c1$p) {
-      return {
-              hd: [
-                c1,
-                c1$p - 1 | 0
-              ],
-              tl: diff(r$p$p, r$p)
-            };
-    }
-    _l$p = r$p;
-    _l = r$p$p;
-    continue ;
-  };
-}
-
-function single(c) {
-  return {
-          hd: [
-            c,
-            c
-          ],
-          tl: /* [] */0
-        };
-}
-
-function seq(c, c$p) {
-  if (Caml_obj.lessequal(c, c$p)) {
-    return {
-            hd: [
-              c,
-              c$p
-            ],
-            tl: /* [] */0
-          };
-  } else {
-    return {
-            hd: [
-              c$p,
-              c
-            ],
-            tl: /* [] */0
-          };
-  }
-}
-
-function offset(o, l) {
-  if (!l) {
-    return /* [] */0;
-  }
-  var match = l.hd;
-  return {
-          hd: [
-            match[0] + o | 0,
-            match[1] + o | 0
-          ],
-          tl: offset(o, l.tl)
-        };
-}
-
-function mem(c, _s) {
-  while(true) {
-    var s = _s;
-    if (!s) {
-      return false;
-    }
-    var match = s.hd;
-    if (c <= match[1]) {
-      return c >= match[0];
-    }
-    _s = s.tl;
-    continue ;
-  };
-}
-
-function hash_rec(x) {
-  if (!x) {
-    return 0;
-  }
-  var match = x.hd;
-  return (match[0] + Math.imul(13, match[1]) | 0) + Math.imul(257, hash_rec(x.tl)) | 0;
-}
-
-function one_char(x) {
-  if (!x) {
-    return ;
-  }
-  if (x.tl) {
-    return ;
-  }
-  var match = x.hd;
-  var i = match[0];
-  if (Caml_obj.equal(i, match[1])) {
-    return Caml_option.some(i);
-  }
-  
-}
-
-function compare(param, param$1) {
-  var c = Caml_obj.compare(param[0], param$1[0]);
-  if (c !== 0) {
-    return c;
-  } else {
-    return Caml_obj.compare(param[1], param$1[1]);
-  }
-}
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = compare(x, v);
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = add(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-var cany = {
-  hd: [
-    0,
-    255
-  ],
-  tl: /* [] */0
-};
-
-function intersect(x, y) {
-  return (x & y) !== 0;
-}
-
-function $plus$plus(x, y) {
-  return x | y;
-}
-
-function from_char(x) {
-  if (x >= 170) {
-    if (x >= 192) {
-      if (x > 255 || x < 216) {
-        if (x >= 215) {
-          return 4;
-        } else {
-          return 2;
-        }
-      } else if (x !== 247) {
-        return 2;
-      } else {
-        return 4;
-      }
-    } else if (x > 185 || x < 171) {
-      if (x >= 187) {
-        return 4;
-      } else {
-        return 2;
-      }
-    } else if (x !== 181) {
-      return 4;
-    } else {
-      return 2;
-    }
-  } else if (x >= 65) {
-    if (x > 96 || x < 91) {
-      if (x >= 123) {
-        return 4;
-      } else {
-        return 2;
-      }
-    } else if (x !== 95) {
-      return 4;
-    } else {
-      return 2;
-    }
-  } else if (x >= 48) {
-    if (x >= 58) {
-      return 4;
-    } else {
-      return 2;
-    }
-  } else if (x !== 10) {
-    return 4;
-  } else {
-    return 12;
-  }
-}
-
-function height$1(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create$1(l, v, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  return {
-          TAG: "Node",
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal$1(l, v, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var lv = l.v;
-    var ll = l.l;
-    if (height$1(ll) >= height$1(lr)) {
-      return create$1(ll, lv, create$1(lr, v, r));
-    }
-    if (typeof lr === "object") {
-      return create$1(create$1(ll, lv, lr.l), lr.v, create$1(lr.r, v, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rv = r.v;
-  var rl = r.l;
-  if (height$1(rr) >= height$1(rl)) {
-    return create$1(create$1(l, v, rl), rv, rr);
-  }
-  if (typeof rl === "object") {
-    return create$1(create$1(l, v, rl.l), rl.v, create$1(rl.r, rv, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Set.bal",
-        Error: new Error()
-      };
-}
-
-function add$1(x, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    return param;
-  }
-  if (c < 0) {
-    var ll = add$1(x, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal$1(ll, v, r);
-    }
-  }
-  var rr = add$1(x, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal$1(l, v, rr);
-  }
-}
-
-function hash_combine(h, accu) {
-  return Math.imul(accu, 65599) + h | 0;
-}
-
-var empty = {
-  marks: /* [] */0,
-  pmarks: "Empty"
-};
-
-function hash(m, accu) {
-  var _l = m.marks;
-  var _accu = hash_combine(Hashtbl.hash(m.pmarks), accu);
-  while(true) {
-    var accu$1 = _accu;
-    var l = _l;
-    if (!l) {
-      return accu$1;
-    }
-    var match = l.hd;
-    _accu = hash_combine(match[0], hash_combine(match[1], accu$1));
-    _l = l.tl;
-    continue ;
-  };
-}
-
-function marks_set_idx(idx, x) {
-  if (!x) {
-    return x;
-  }
-  var match = x.hd;
-  if (match[1] !== -1) {
-    return x;
-  } else {
-    return {
-            hd: [
-              match[0],
-              idx
-            ],
-            tl: marks_set_idx(idx, x.tl)
-          };
-  }
-}
-
-function marks_set_idx$1(marks, idx) {
-  return {
-          marks: marks_set_idx(idx, marks.marks),
-          pmarks: marks.pmarks
-        };
-}
-
-function first(f, _x) {
-  while(true) {
-    var x = _x;
-    if (!x) {
-      return ;
-    }
-    var res = Curry._1(f, x.hd);
-    if (res !== undefined) {
-      return res;
-    }
-    _x = x.tl;
-    continue ;
-  };
-}
-
-var eps_expr = {
-  id: 0,
-  def: "Eps"
-};
-
-function mk_expr(ids, def) {
-  ids.contents = ids.contents + 1 | 0;
-  return {
-          id: ids.contents,
-          def: def
-        };
-}
-
-function cst(ids, s) {
-  if (s ? false : true) {
-    return mk_expr(ids, {
-                TAG: "Alt",
-                _0: /* [] */0
-              });
-  } else {
-    return mk_expr(ids, {
-                TAG: "Cst",
-                _0: s
-              });
-  }
-}
-
-function alt(ids, x) {
-  if (x) {
-    if (x.tl) {
-      return mk_expr(ids, {
-                  TAG: "Alt",
-                  _0: x
-                });
-    } else {
-      return x.hd;
-    }
-  } else {
-    return mk_expr(ids, {
-                TAG: "Alt",
-                _0: /* [] */0
-              });
-  }
-}
-
-function seq$1(ids, kind, x, y) {
-  var match = x.def;
-  var match$1 = y.def;
-  var exit = 0;
-  if (typeof match !== "object") {
-    return y;
-  }
-  if (match.TAG === "Alt") {
-    if (!match._0) {
-      return x;
-    }
-    exit = 2;
-  } else {
-    exit = 2;
-  }
-  if (exit === 2) {
-    if (typeof match$1 !== "object") {
-      if (kind === "First") {
-        return x;
-      }
-      
-    } else if (match$1.TAG === "Alt" && !match$1._0) {
-      return y;
-    }
-    
-  }
-  return mk_expr(ids, {
-              TAG: "Seq",
-              _0: kind,
-              _1: x,
-              _2: y
-            });
-}
-
-function is_eps(expr) {
-  var match = expr.def;
-  if (typeof match !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function rep(ids, kind, sem, x) {
-  return mk_expr(ids, {
-              TAG: "Rep",
-              _0: kind,
-              _1: sem,
-              _2: x
-            });
-}
-
-function erase(ids, m, m$p) {
-  return mk_expr(ids, {
-              TAG: "Erase",
-              _0: m,
-              _1: m$p
-            });
-}
-
-function rename(ids, x) {
-  var l = x.def;
-  if (typeof l !== "object") {
-    return mk_expr(ids, x.def);
-  }
-  switch (l.TAG) {
-    case "Alt" :
-        return mk_expr(ids, {
-                    TAG: "Alt",
-                    _0: List.map((function (param) {
-                            return rename(ids, param);
-                          }), l._0)
-                  });
-    case "Seq" :
-        return mk_expr(ids, {
-                    TAG: "Seq",
-                    _0: l._0,
-                    _1: rename(ids, l._1),
-                    _2: rename(ids, l._2)
-                  });
-    case "Rep" :
-        return mk_expr(ids, {
-                    TAG: "Rep",
-                    _0: l._0,
-                    _1: l._1,
-                    _2: rename(ids, l._2)
-                  });
-    default:
-      return mk_expr(ids, x.def);
-  }
-}
-
-function equal(_l1, _l2) {
-  while(true) {
-    var l2 = _l2;
-    var l1 = _l1;
-    if (!l1) {
-      if (l2) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-    var marks1 = l1.hd;
-    switch (marks1.TAG) {
-      case "TSeq" :
-          if (!l2) {
-            return false;
-          }
-          var match = l2.hd;
-          switch (match.TAG) {
-            case "TSeq" :
-                if (marks1._1.id !== match._1.id) {
-                  return false;
-                }
-                if (!equal(marks1._0, match._0)) {
-                  return false;
-                }
-                _l2 = l2.tl;
-                _l1 = l1.tl;
-                continue ;
-            case "TExp" :
-            case "TMatch" :
-                return false;
-            
-          }
-      case "TExp" :
-          if (!l2) {
-            return false;
-          }
-          var match$1 = l2.hd;
-          switch (match$1.TAG) {
-            case "TExp" :
-                if (marks1._1.id !== match$1._1.id) {
-                  return false;
-                }
-                if (!Caml_obj.equal(marks1._0, match$1._0)) {
-                  return false;
-                }
-                _l2 = l2.tl;
-                _l1 = l1.tl;
-                continue ;
-            case "TSeq" :
-            case "TMatch" :
-                return false;
-            
-          }
-      case "TMatch" :
-          if (!l2) {
-            return false;
-          }
-          var marks2 = l2.hd;
-          switch (marks2.TAG) {
-            case "TSeq" :
-            case "TExp" :
-                return false;
-            case "TMatch" :
-                if (!Caml_obj.equal(marks1._0, marks2._0)) {
-                  return false;
-                }
-                _l2 = l2.tl;
-                _l1 = l1.tl;
-                continue ;
-            
-          }
-      
-    }
-  };
-}
-
-function hash$1(_l, _accu) {
-  while(true) {
-    var accu = _accu;
-    var l = _l;
-    if (!l) {
-      return accu;
-    }
-    var marks = l.hd;
-    switch (marks.TAG) {
-      case "TSeq" :
-          _accu = hash_combine(388635598, hash_combine(marks._1.id, hash$1(marks._0, accu)));
-          _l = l.tl;
-          continue ;
-      case "TExp" :
-          _accu = hash_combine(726404471, hash_combine(marks._1.id, hash(marks._0, accu)));
-          _l = l.tl;
-          continue ;
-      case "TMatch" :
-          _accu = hash_combine(471882453, hash(marks._0, accu));
-          _l = l.tl;
-          continue ;
-      
-    }
-  };
-}
-
-function tseq(kind, x, y, rem) {
-  if (!x) {
-    return rem;
-  }
-  var match = x.hd;
-  switch (match.TAG) {
-    case "TExp" :
-        var tmp = match._1.def;
-        if (typeof tmp !== "object" && !x.tl) {
-          return {
-                  hd: {
-                    TAG: "TExp",
-                    _0: match._0,
-                    _1: y
-                  },
-                  tl: rem
-                };
-        }
-        break;
-    case "TSeq" :
-    case "TMatch" :
-        break;
-    
-  }
-  return {
-          hd: {
-            TAG: "TSeq",
-            _0: x,
-            _1: y,
-            _2: kind
-          },
-          tl: rem
-        };
-}
-
-var dummy = {
-  idx: -1,
-  category: -1,
-  desc: /* [] */0,
-  status: undefined,
-  hash: -1
-};
-
-function hash$2(idx, cat, desc) {
-  return hash$1(desc, hash_combine(idx, hash_combine(cat, 0))) & 1073741823;
-}
-
-function mk(idx, cat, desc) {
-  return {
-          idx: idx,
-          category: cat,
-          desc: desc,
-          status: undefined,
-          hash: hash$2(idx, cat, desc)
-        };
-}
-
-function create$2(cat, e) {
-  return mk(0, cat, {
-              hd: {
-                TAG: "TExp",
-                _0: empty,
-                _1: e
-              },
-              tl: /* [] */0
-            });
-}
-
-function equal$1(x, y) {
-  if (x.hash === y.hash && x.idx === y.idx && x.category === y.category) {
-    return equal(x.desc, y.desc);
-  } else {
-    return false;
-  }
-}
-
-function hash$3(t) {
-  return t.hash;
-}
-
-var Table = Hashtbl.Make({
-      equal: equal$1,
-      hash: hash$3
-    });
-
-function reset_table(a) {
-  $$Array.fill(a, 0, a.length, false);
-}
-
-function mark_used_indices(tbl) {
-  return function (param) {
-    return List.iter((function (x) {
-                  switch (x.TAG) {
-                    case "TSeq" :
-                        return mark_used_indices(tbl)(x._0);
-                    case "TExp" :
-                    case "TMatch" :
-                        break;
-                    
-                  }
-                  List.iter((function (param) {
-                          var i = param[1];
-                          if (i >= 0) {
-                            return Caml_array.set(tbl, i, true);
-                          }
-                          
-                        }), x._0.marks);
-                }), param);
-  };
-}
-
-function find_free(tbl, _idx, len) {
-  while(true) {
-    var idx = _idx;
-    if (idx === len || !Caml_array.get(tbl, idx)) {
-      return idx;
-    }
-    _idx = idx + 1 | 0;
-    continue ;
-  };
-}
-
-function free_index(tbl_ref, l) {
-  var tbl = tbl_ref.contents;
-  reset_table(tbl);
-  mark_used_indices(tbl)(l);
-  var len = tbl.length;
-  var idx = find_free(tbl, 0, len);
-  if (idx === len) {
-    tbl_ref.contents = Caml_array.make((len << 1), false);
-  }
-  return idx;
-}
-
-var remove_matches = List.filter(function (x) {
-      switch (x.TAG) {
-        case "TSeq" :
-        case "TExp" :
-            return true;
-        case "TMatch" :
-            return false;
-        
-      }
-    });
-
-function split_at_match_rec(_l$p, _x) {
-  while(true) {
-    var x = _x;
-    var l$p = _l$p;
-    if (x) {
-      var x$1 = x.hd;
-      switch (x$1.TAG) {
-        case "TSeq" :
-        case "TExp" :
-            _x = x.tl;
-            _l$p = {
-              hd: x$1,
-              tl: l$p
-            };
-            continue ;
-        case "TMatch" :
-            return [
-                    List.rev(l$p),
-                    Curry._1(remove_matches, x.tl)
-                  ];
-        
-      }
-    } else {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "ocaml_re_test.res",
-              816,
-              16
-            ],
-            Error: new Error()
-          };
-    }
-  };
-}
-
-function remove_duplicates(prev, _l, y) {
-  while(true) {
-    var l = _l;
-    if (!l) {
-      return [
-              /* [] */0,
-              prev
-            ];
-    }
-    var x = l.hd;
-    switch (x.TAG) {
-      case "TSeq" :
-          var x$1 = x._1;
-          var match = remove_duplicates(prev, x._0, x$1);
-          var match$1 = remove_duplicates(match[1], l.tl, y);
-          return [
-                  tseq(x._2, match[0], x$1, match$1[0]),
-                  match$1[1]
-                ];
-      case "TExp" :
-          var x$2 = x._1;
-          var tmp = x$2.def;
-          if (typeof tmp !== "object") {
-            var r = l.tl;
-            if (List.memq(y.id, prev)) {
-              _l = r;
-              continue ;
-            }
-            var match$2 = remove_duplicates({
-                  hd: y.id,
-                  tl: prev
-                }, r, y);
-            return [
-                    {
-                      hd: x,
-                      tl: match$2[0]
-                    },
-                    match$2[1]
-                  ];
-          }
-          var r$1 = l.tl;
-          if (List.memq(x$2.id, prev)) {
-            _l = r$1;
-            continue ;
-          }
-          var match$3 = remove_duplicates({
-                hd: x$2.id,
-                tl: prev
-              }, r$1, y);
-          return [
-                  {
-                    hd: x,
-                    tl: match$3[0]
-                  },
-                  match$3[1]
-                ];
-      case "TMatch" :
-          return [
-                  {
-                    hd: x,
-                    tl: /* [] */0
-                  },
-                  prev
-                ];
-      
-    }
-  };
-}
-
-function set_idx(idx, x) {
-  if (!x) {
-    return /* [] */0;
-  }
-  var marks = x.hd;
-  switch (marks.TAG) {
-    case "TSeq" :
-        return {
-                hd: {
-                  TAG: "TSeq",
-                  _0: set_idx(idx, marks._0),
-                  _1: marks._1,
-                  _2: marks._2
-                },
-                tl: set_idx(idx, x.tl)
-              };
-    case "TExp" :
-        return {
-                hd: {
-                  TAG: "TExp",
-                  _0: marks_set_idx$1(marks._0, idx),
-                  _1: marks._1
-                },
-                tl: set_idx(idx, x.tl)
-              };
-    case "TMatch" :
-        return {
-                hd: {
-                  TAG: "TMatch",
-                  _0: marks_set_idx$1(marks._0, idx)
-                },
-                tl: set_idx(idx, x.tl)
-              };
-    
-  }
-}
-
-function filter_marks(b, e, marks) {
-  return {
-          marks: List.filter(function (param) {
-                  var i = param[0];
-                  if (i < b) {
-                    return true;
-                  } else {
-                    return i > e;
-                  }
-                })(marks.marks),
-          pmarks: marks.pmarks
-        };
-}
-
-function delta_1(marks, c, next_cat, prev_cat, x, rem) {
-  var s = x.def;
-  if (typeof s !== "object") {
-    return {
-            hd: {
-              TAG: "TMatch",
-              _0: marks
-            },
-            tl: rem
-          };
-  }
-  switch (s.TAG) {
-    case "Cst" :
-        if (mem(c, s._0)) {
-          return {
-                  hd: {
-                    TAG: "TExp",
-                    _0: marks,
-                    _1: eps_expr
-                  },
-                  tl: rem
-                };
-        } else {
-          return rem;
-        }
-    case "Alt" :
-        return delta_2(marks, c, next_cat, prev_cat, s._0, rem);
-    case "Seq" :
-        var y$p = delta_1(marks, c, next_cat, prev_cat, s._1, /* [] */0);
-        return delta_seq(c, next_cat, prev_cat, s._0, y$p, s._2, rem);
-    case "Rep" :
-        var kind = s._1;
-        var y$p$1 = delta_1(marks, c, next_cat, prev_cat, s._2, /* [] */0);
-        var marks$p = first((function (x) {
-                switch (x.TAG) {
-                  case "TSeq" :
-                  case "TExp" :
-                      return ;
-                  case "TMatch" :
-                      return x._0;
-                  
-                }
-              }), y$p$1);
-        var match = marks$p !== undefined ? [
-            Curry._1(remove_matches, y$p$1),
-            marks$p
-          ] : [
-            y$p$1,
-            marks
-          ];
-        var y$p$p = match[0];
-        if (s._0 === "Non_greedy") {
-          return {
-                  hd: {
-                    TAG: "TMatch",
-                    _0: marks
-                  },
-                  tl: tseq(kind, y$p$p, x, rem)
-                };
-        } else {
-          return tseq(kind, y$p$p, x, {
-                      hd: {
-                        TAG: "TMatch",
-                        _0: match[1]
-                      },
-                      tl: rem
-                    });
-        }
-    case "Mark" :
-        var i = s._0;
-        var marks_marks = {
-          hd: [
-            i,
-            -1
-          ],
-          tl: List.remove_assq(i, marks.marks)
-        };
-        var marks_pmarks = marks.pmarks;
-        var marks$1 = {
-          marks: marks_marks,
-          pmarks: marks_pmarks
-        };
-        return {
-                hd: {
-                  TAG: "TMatch",
-                  _0: marks$1
-                },
-                tl: rem
-              };
-    case "Erase" :
-        return {
-                hd: {
-                  TAG: "TMatch",
-                  _0: filter_marks(s._0, s._1, marks)
-                },
-                tl: rem
-              };
-    case "Before" :
-        if (intersect(next_cat, s._0)) {
-          return {
-                  hd: {
-                    TAG: "TMatch",
-                    _0: marks
-                  },
-                  tl: rem
-                };
-        } else {
-          return rem;
-        }
-    case "After" :
-        if (intersect(prev_cat, s._0)) {
-          return {
-                  hd: {
-                    TAG: "TMatch",
-                    _0: marks
-                  },
-                  tl: rem
-                };
-        } else {
-          return rem;
-        }
-    case "Pmark" :
-        var marks_marks$1 = marks.marks;
-        var marks_pmarks$1 = add$1(s._0, marks.pmarks);
-        var marks$2 = {
-          marks: marks_marks$1,
-          pmarks: marks_pmarks$1
-        };
-        return {
-                hd: {
-                  TAG: "TMatch",
-                  _0: marks$2
-                },
-                tl: rem
-              };
-    
-  }
-}
-
-function delta_2(marks, c, next_cat, prev_cat, l, rem) {
-  if (l) {
-    return delta_1(marks, c, next_cat, prev_cat, l.hd, delta_2(marks, c, next_cat, prev_cat, l.tl, rem));
-  } else {
-    return rem;
-  }
-}
-
-function delta_seq(c, next_cat, prev_cat, kind, y, z, rem) {
-  var marks = first((function (x) {
-          switch (x.TAG) {
-            case "TSeq" :
-            case "TExp" :
-                return ;
-            case "TMatch" :
-                return x._0;
-            
-          }
-        }), y);
-  if (marks === undefined) {
-    return tseq(kind, y, z, rem);
-  }
-  if (kind === "Longest") {
-    return tseq(kind, Curry._1(remove_matches, y), z, delta_1(marks, c, next_cat, prev_cat, z, rem));
-  }
-  if (kind !== "First") {
-    return delta_1(marks, c, next_cat, prev_cat, z, tseq(kind, Curry._1(remove_matches, y), z, rem));
-  }
-  var match = split_at_match_rec(/* [] */0, y);
-  return tseq(kind, match[0], z, delta_1(marks, c, next_cat, prev_cat, z, tseq(kind, match[1], z, rem)));
-}
-
-function delta_4(c, next_cat, prev_cat, l, rem) {
-  if (l) {
-    var x = l.hd;
-    var rem$1 = delta_4(c, next_cat, prev_cat, l.tl, rem);
-    switch (x.TAG) {
-      case "TSeq" :
-          var y$p = delta_4(c, next_cat, prev_cat, x._0, /* [] */0);
-          return delta_seq(c, next_cat, prev_cat, x._2, y$p, x._1, rem$1);
-      case "TExp" :
-          return delta_1(x._0, c, next_cat, prev_cat, x._1, rem$1);
-      case "TMatch" :
-          return {
-                  hd: x,
-                  tl: rem$1
-                };
-      
-    }
-  } else {
-    return rem;
-  }
-}
-
-function delta(tbl_ref, next_cat, $$char, st) {
-  var prev_cat = st.category;
-  var match = remove_duplicates(/* [] */0, delta_4($$char, next_cat, prev_cat, st.desc, /* [] */0), eps_expr);
-  var expr$p = match[0];
-  var idx = free_index(tbl_ref, expr$p);
-  var expr$p$p = set_idx(idx, expr$p);
-  return mk(idx, next_cat, expr$p$p);
-}
-
-function flatten_match(m) {
-  var ma = List.fold_left((function (ma, param) {
-          return Caml.int_max(ma, param[0]);
-        }), -1, m);
-  var res = Caml_array.make(ma + 1 | 0, -1);
-  List.iter((function (param) {
-          Caml_array.set(res, param[0], param[1]);
-        }), m);
-  return res;
-}
-
-function status(s) {
-  var st = s.status;
-  if (st !== undefined) {
-    return st;
-  }
-  var match = s.desc;
-  var st$1;
-  if (match) {
-    var m = match.hd;
-    switch (m.TAG) {
-      case "TSeq" :
-      case "TExp" :
-          st$1 = "Running";
-          break;
-      case "TMatch" :
-          var m$1 = m._0;
-          st$1 = {
-            TAG: "Match",
-            _0: flatten_match(m$1.marks),
-            _1: m$1.pmarks
-          };
-          break;
-      
-    }
-  } else {
-    st$1 = "Failed";
-  }
-  s.status = st$1;
-  return st$1;
-}
-
-var Re_automata_Category = {
-  $plus$plus: $plus$plus,
-  from_char: from_char,
-  inexistant: 1,
-  letter: 2,
-  not_letter: 4,
-  newline: 8,
-  lastnewline: 16,
-  search_boundary: 32
-};
-
-var Re_automata_State = {
-  dummy: dummy,
-  create: create$2,
-  Table: Table
-};
-
-function iter(_n, f, _v) {
-  while(true) {
-    var v = _v;
-    var n = _n;
-    if (n === 0) {
-      return v;
-    }
-    _v = Curry._1(f, v);
-    _n = n - 1 | 0;
-    continue ;
-  };
-}
-
-function category(re, c) {
-  if (c === -1) {
-    return Re_automata_Category.inexistant;
-  } else if (c === re.lnl) {
-    return Curry._2(Re_automata_Category.$plus$plus, Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.lastnewline, Re_automata_Category.newline), Re_automata_Category.not_letter);
-  } else {
-    return Curry._1(Re_automata_Category.from_char, Caml_bytes.get(re.col_repr, c));
-  }
-}
-
-var dummy_next = [];
-
-var unknown_state = {
-  idx: -2,
-  real_idx: 0,
-  next: dummy_next,
-  final: /* [] */0,
-  desc: Re_automata_State.dummy
-};
-
-function mk_state(ncol, desc) {
-  var match = status(desc);
-  var break_state;
-  break_state = typeof match !== "object" && match !== "Failed" ? false : true;
-  return {
-          idx: break_state ? -3 : desc.idx,
-          real_idx: desc.idx,
-          next: break_state ? dummy_next : Caml_array.make(ncol, unknown_state),
-          final: /* [] */0,
-          desc: desc
-        };
-}
-
-function find_state(re, desc) {
-  try {
-    return Curry._2(Re_automata_State.Table.find, re.states, desc);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Not_found") {
-      var st = mk_state(re.ncol, desc);
-      Curry._3(Re_automata_State.Table.add, re.states, desc, st);
-      return st;
-    }
-    throw exn;
-  }
-}
-
-function delta$1(info, cat, c, st) {
-  var desc = delta(info.re.tbl, cat, c, st.desc);
-  var len = info.positions.length;
-  if (desc.idx === len && len > 0) {
-    var pos = info.positions;
-    info.positions = Caml_array.make((len << 1), 0);
-    $$Array.blit(pos, 0, info.positions, 0, len);
-  }
-  return desc;
-}
-
-function validate(info, s, pos, st) {
-  var c = Caml_bytes.get(info.i_cols, Caml_string.get(s, pos));
-  var cat = category(info.re, c);
-  var desc$p = delta$1(info, cat, c, st);
-  var st$p = find_state(info.re, desc$p);
-  Caml_array.set(st.next, c, st$p);
-}
-
-function loop(info, s, pos, st) {
-  if (pos >= info.last) {
-    return st;
-  }
-  var st$p = Caml_array.get(st.next, Caml_bytes.get(info.i_cols, Caml_string.get(s, pos)));
-  var _pos = pos;
-  var _st = st;
-  var _st$p = st$p;
-  while(true) {
-    var st$p$1 = _st$p;
-    var st$1 = _st;
-    var pos$1 = _pos;
-    if (st$p$1.idx < 0) {
-      if (st$p$1.idx === -3) {
-        Caml_array.set(info.positions, st$p$1.real_idx, pos$1 + 1 | 0);
-        return st$p$1;
-      } else {
-        validate(info, s, pos$1, st$1);
-        return loop(info, s, pos$1, st$1);
-      }
-    }
-    var pos$2 = pos$1 + 1 | 0;
-    if (pos$2 < info.last) {
-      var st$p$p = Caml_array.get(st$p$1.next, Caml_bytes.get(info.i_cols, Caml_string.get(s, pos$2)));
-      Caml_array.set(info.positions, st$p$1.idx, pos$2);
-      _st$p = st$p$p;
-      _st = st$p$1;
-      _pos = pos$2;
-      continue ;
-    }
-    Caml_array.set(info.positions, st$p$1.idx, pos$2);
-    return st$p$1;
-  };
-}
-
-function $$final(info, st, cat) {
-  try {
-    return List.assq(cat, st.final);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Not_found") {
-      var st$p = delta$1(info, cat, -1, st);
-      var res_0 = st$p.idx;
-      var res_1 = status(st$p);
-      var res = [
-        res_0,
-        res_1
-      ];
-      st.final = {
-        hd: [
-          cat,
-          res
-        ],
-        tl: st.final
-      };
-      return res;
-    }
-    throw exn;
-  }
-}
-
-function find_initial_state(re, cat) {
-  try {
-    return List.assq(cat, re.initial_states);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Not_found") {
-      var st = find_state(re, Curry._2(Re_automata_State.create, cat, re.initial));
-      re.initial_states = {
-        hd: [
-          cat,
-          st
-        ],
-        tl: re.initial_states
-      };
-      return st;
-    }
-    throw exn;
-  }
-}
-
-function get_color(re, s, pos) {
-  if (pos < 0) {
-    return -1;
-  }
-  var slen = s.length;
-  if (pos >= slen) {
-    return -1;
-  } else if (pos === (slen - 1 | 0) && re.lnl !== -1 && Caml_string.get(s, pos) === /* '\n' */10) {
-    return re.lnl;
-  } else {
-    return Caml_bytes.get(re.cols, Caml_string.get(s, pos));
-  }
-}
-
-function scan_str(info, s, initial_state, groups) {
-  var pos = info.pos;
-  var last = info.last;
-  if (!(last === s.length && info.re.lnl !== -1 && last > pos && Caml_string.get(s, last - 1 | 0) === /* '\n' */10)) {
-    if (groups) {
-      return loop(info, s, pos, initial_state);
-    } else {
-      var _pos = pos;
-      var _st = initial_state;
-      while(true) {
-        var st = _st;
-        var pos$1 = _pos;
-        if (pos$1 >= last) {
-          return st;
-        }
-        var st$p = Caml_array.get(st.next, Caml_bytes.get(info.i_cols, Caml_string.get(s, pos$1)));
-        if (st$p.idx >= 0) {
-          _st = st$p;
-          _pos = pos$1 + 1 | 0;
-          continue ;
-        }
-        if (st$p.idx === -3) {
-          return st$p;
-        }
-        validate(info, s, pos$1, st);
-        continue ;
-      };
-    }
-  }
-  var info$1 = {
-    re: info.re,
-    i_cols: info.i_cols,
-    positions: info.positions,
-    pos: info.pos,
-    last: last - 1 | 0
-  };
-  var st$1 = scan_str(info$1, s, initial_state, groups);
-  if (st$1.idx === -3) {
-    return st$1;
-  } else {
-    var pos$2 = last - 1 | 0;
-    while(true) {
-      var st$p$1 = Caml_array.get(st$1.next, info$1.re.lnl);
-      if (st$p$1.idx >= 0) {
-        if (groups) {
-          Caml_array.set(info$1.positions, st$p$1.idx, pos$2 + 1 | 0);
-        }
-        return st$p$1;
-      }
-      if (st$p$1.idx === -3) {
-        if (groups) {
-          Caml_array.set(info$1.positions, st$p$1.real_idx, pos$2 + 1 | 0);
-        }
-        return st$p$1;
-      }
-      var c = info$1.re.lnl;
-      var real_c = Caml_bytes.get(info$1.i_cols, /* '\n' */10);
-      var cat = category(info$1.re, c);
-      var desc$p = delta$1(info$1, cat, real_c, st$1);
-      var st$p$2 = find_state(info$1.re, desc$p);
-      Caml_array.set(st$1.next, c, st$p$2);
-      continue ;
-    };
-  }
-}
-
-function cadd(c, s) {
-  return union(single(c), s);
-}
-
-function trans_set(cache, cm, s) {
-  var i = one_char(s);
-  if (i !== undefined) {
-    return single(Caml_bytes.get(cm, i));
-  }
-  var v_0 = hash_rec(s);
-  var v = [
-    v_0,
-    s
-  ];
-  try {
-    var _param = cache.contents;
-    while(true) {
-      var param = _param;
-      if (typeof param !== "object") {
-        throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
-      }
-      var c = compare(v, param.v);
-      if (c === 0) {
-        return param.d;
-      }
-      _param = c < 0 ? param.l : param.r;
-      continue ;
-    };
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Not_found") {
-      var l = List.fold_right((function (param, l) {
-              return union(seq(Caml_bytes.get(cm, param[0]), Caml_bytes.get(cm, param[1])), l);
-            }), s, /* [] */0);
-      cache.contents = add(v, l, cache.contents);
-      return l;
-    }
-    throw exn;
-  }
-}
-
-function is_charset(_x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      return false;
-    }
-    switch (x.TAG) {
-      case "Set" :
-          return true;
-      case "Sem" :
-      case "Sem_greedy" :
-          _x = x._1;
-          continue ;
-      case "No_group" :
-      case "Case" :
-      case "No_case" :
-          _x = x._0;
-          continue ;
-      case "Alternative" :
-      case "Intersection" :
-      case "Complement" :
-          return List.for_all(is_charset, x._0);
-      case "Difference" :
-          if (!is_charset(x._0)) {
-            return false;
-          }
-          _x = x._1;
-          continue ;
-      default:
-        return false;
-    }
-  };
-}
-
-function split(s, cm) {
-  var _t = s;
-  var f = function (i, j) {
-    Caml_bytes.set(cm, i, /* '\001' */1);
-    Caml_bytes.set(cm, j + 1 | 0, /* '\001' */1);
-  };
-  while(true) {
-    var t = _t;
-    if (!t) {
-      return ;
-    }
-    var match = t.hd;
-    Curry._2(f, match[0], match[1]);
-    _t = t.tl;
-    continue ;
-  };
-}
-
-var cupper = union(seq(/* 'A' */65, /* 'Z' */90), union(seq(/* '\192' */192, /* '\214' */214), seq(/* '\216' */216, /* '\222' */222)));
-
-var clower = offset(32, cupper);
-
-var calpha = List.fold_right(cadd, {
-      hd: /* '\170' */170,
-      tl: {
-        hd: /* '\181' */181,
-        tl: {
-          hd: /* '\186' */186,
-          tl: {
-            hd: /* '\223' */223,
-            tl: {
-              hd: /* '\255' */255,
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    }, union(clower, cupper));
-
-var cdigit = seq(/* '0' */48, /* '9' */57);
-
-var calnum = union(calpha, cdigit);
-
-var cword = union({
-      hd: [
-        /* '_' */95,
-        /* '_' */95
-      ],
-      tl: /* [] */0
-    }, calnum);
-
-function colorize(c, regexp) {
-  var lnl = {
-    contents: false
-  };
-  var colorize$1 = function (_regexp) {
-    while(true) {
-      var regexp = _regexp;
-      if (typeof regexp !== "object") {
-        switch (regexp) {
-          case "Beg_of_line" :
-          case "End_of_line" :
-              return split({
-                          hd: [
-                            /* '\n' */10,
-                            /* '\n' */10
-                          ],
-                          tl: /* [] */0
-                        }, c);
-          case "Beg_of_word" :
-          case "End_of_word" :
-          case "Not_bound" :
-              return split(cword, c);
-          case "Last_end_of_line" :
-              lnl.contents = true;
-              return ;
-          case "Beg_of_str" :
-          case "End_of_str" :
-          case "Start" :
-          case "Stop" :
-              return ;
-          
-        }
-      } else {
-        switch (regexp.TAG) {
-          case "Set" :
-              return split(regexp._0, c);
-          case "Sequence" :
-          case "Alternative" :
-              return List.iter(colorize$1, regexp._0);
-          case "Repeat" :
-          case "Group" :
-          case "No_group" :
-          case "Nest" :
-              _regexp = regexp._0;
-              continue ;
-          case "Sem" :
-          case "Sem_greedy" :
-          case "Pmark" :
-              _regexp = regexp._1;
-              continue ;
-          default:
-            throw {
-                  RE_EXN_ID: "Assert_failure",
-                  _1: [
-                    "ocaml_re_test.res",
-                    2169,
-                    8
-                  ],
-                  Error: new Error()
-                };
-        }
-      }
-    };
-  };
-  colorize$1(regexp);
-  return lnl.contents;
-}
-
-function flatten_cmap(cm) {
-  var c = Caml_bytes.create(256);
-  var col_repr = Caml_bytes.create(256);
-  var v = 0;
-  Caml_bytes.set(c, 0, /* '\000' */0);
-  Caml_bytes.set(col_repr, 0, /* '\000' */0);
-  for(var i = 1; i <= 255; ++i){
-    if (Caml_bytes.get(cm, i) !== /* '\000' */0) {
-      v = v + 1 | 0;
-    }
-    Caml_bytes.set(c, i, Char.chr(v));
-    Caml_bytes.set(col_repr, v, Char.chr(i));
-  }
-  return [
-          c,
-          Bytes.sub(col_repr, 0, v + 1 | 0),
-          v + 1 | 0
-        ];
-}
-
-function equal$2(_x1, _x2) {
-  while(true) {
-    var x2 = _x2;
-    var x1 = _x1;
-    if (typeof x1 !== "object") {
-      switch (x1) {
-        case "Beg_of_line" :
-            if (typeof x2 !== "object" && x2 === "Beg_of_line") {
-              return true;
-            } else {
-              return false;
-            }
-        case "End_of_line" :
-            if (typeof x2 !== "object" && x2 === "End_of_line") {
-              return true;
-            } else {
-              return false;
-            }
-        case "Beg_of_word" :
-            if (typeof x2 !== "object" && x2 === "Beg_of_word") {
-              return true;
-            } else {
-              return false;
-            }
-        case "End_of_word" :
-            if (typeof x2 !== "object" && x2 === "End_of_word") {
-              return true;
-            } else {
-              return false;
-            }
-        case "Not_bound" :
-            if (typeof x2 !== "object" && x2 === "Not_bound") {
-              return true;
-            } else {
-              return false;
-            }
-        case "Beg_of_str" :
-            if (typeof x2 !== "object" && x2 === "Beg_of_str") {
-              return true;
-            } else {
-              return false;
-            }
-        case "End_of_str" :
-            if (typeof x2 !== "object" && x2 === "End_of_str") {
-              return true;
-            } else {
-              return false;
-            }
-        case "Last_end_of_line" :
-            if (typeof x2 !== "object" && x2 === "Last_end_of_line") {
-              return true;
-            } else {
-              return false;
-            }
-        case "Start" :
-            if (typeof x2 !== "object" && x2 === "Start") {
-              return true;
-            } else {
-              return false;
-            }
-        case "Stop" :
-            if (typeof x2 !== "object" && x2 === "Stop") {
-              return true;
-            } else {
-              return false;
-            }
-        
-      }
-    } else {
-      switch (x1.TAG) {
-        case "Set" :
-            if (typeof x2 !== "object" || x2.TAG !== "Set") {
-              return false;
-            } else {
-              return Caml_obj.equal(x1._0, x2._0);
-            }
-        case "Sequence" :
-            if (typeof x2 !== "object" || x2.TAG !== "Sequence") {
-              return false;
-            } else {
-              return eq_list(x1._0, x2._0);
-            }
-        case "Alternative" :
-            if (typeof x2 !== "object" || x2.TAG !== "Alternative") {
-              return false;
-            } else {
-              return eq_list(x1._0, x2._0);
-            }
-        case "Repeat" :
-            if (typeof x2 !== "object") {
-              return false;
-            }
-            if (x2.TAG !== "Repeat") {
-              return false;
-            }
-            if (x1._1 !== x2._1) {
-              return false;
-            }
-            if (!Caml_obj.equal(x1._2, x2._2)) {
-              return false;
-            }
-            _x2 = x2._0;
-            _x1 = x1._0;
-            continue ;
-        case "Sem" :
-            if (typeof x2 !== "object") {
-              return false;
-            }
-            if (x2.TAG !== "Sem") {
-              return false;
-            }
-            if (x1._0 !== x2._0) {
-              return false;
-            }
-            _x2 = x2._1;
-            _x1 = x1._1;
-            continue ;
-        case "Sem_greedy" :
-            if (typeof x2 !== "object") {
-              return false;
-            }
-            if (x2.TAG !== "Sem_greedy") {
-              return false;
-            }
-            if (x1._0 !== x2._0) {
-              return false;
-            }
-            _x2 = x2._1;
-            _x1 = x1._1;
-            continue ;
-        case "Group" :
-            return false;
-        case "No_group" :
-            if (typeof x2 !== "object") {
-              return false;
-            }
-            if (x2.TAG !== "No_group") {
-              return false;
-            }
-            _x2 = x2._0;
-            _x1 = x1._0;
-            continue ;
-        case "Nest" :
-            if (typeof x2 !== "object") {
-              return false;
-            }
-            if (x2.TAG !== "Nest") {
-              return false;
-            }
-            _x2 = x2._0;
-            _x1 = x1._0;
-            continue ;
-        case "Case" :
-            if (typeof x2 !== "object") {
-              return false;
-            }
-            if (x2.TAG !== "Case") {
-              return false;
-            }
-            _x2 = x2._0;
-            _x1 = x1._0;
-            continue ;
-        case "No_case" :
-            if (typeof x2 !== "object") {
-              return false;
-            }
-            if (x2.TAG !== "No_case") {
-              return false;
-            }
-            _x2 = x2._0;
-            _x1 = x1._0;
-            continue ;
-        case "Intersection" :
-            if (typeof x2 !== "object" || x2.TAG !== "Intersection") {
-              return false;
-            } else {
-              return eq_list(x1._0, x2._0);
-            }
-        case "Complement" :
-            if (typeof x2 !== "object" || x2.TAG !== "Complement") {
-              return false;
-            } else {
-              return eq_list(x1._0, x2._0);
-            }
-        case "Difference" :
-            if (typeof x2 !== "object") {
-              return false;
-            }
-            if (x2.TAG !== "Difference") {
-              return false;
-            }
-            if (!equal$2(x1._0, x2._0)) {
-              return false;
-            }
-            _x2 = x2._1;
-            _x1 = x1._1;
-            continue ;
-        case "Pmark" :
-            if (typeof x2 !== "object") {
-              return false;
-            }
-            if (x2.TAG !== "Pmark") {
-              return false;
-            }
-            if (x1._0 !== x2._0) {
-              return false;
-            }
-            _x2 = x2._1;
-            _x1 = x1._1;
-            continue ;
-        
-      }
-    }
-  };
-}
-
-function eq_list(_l1, _l2) {
-  while(true) {
-    var l2 = _l2;
-    var l1 = _l1;
-    if (!l1) {
-      if (l2) {
-        return false;
-      } else {
-        return true;
-      }
-    }
-    if (!l2) {
-      return false;
-    }
-    if (!equal$2(l1.hd, l2.hd)) {
-      return false;
-    }
-    _l2 = l2.tl;
-    _l1 = l1.tl;
-    continue ;
-  };
-}
-
-function sequence(x) {
-  if (x && !x.tl) {
-    return x.hd;
-  } else {
-    return {
-            TAG: "Sequence",
-            _0: x
-          };
-  }
-}
-
-function merge_sequences(_x) {
-  while(true) {
-    var x = _x;
-    if (!x) {
-      return /* [] */0;
-    }
-    var l$p = x.hd;
-    if (typeof l$p === "object") {
-      switch (l$p.TAG) {
-        case "Sequence" :
-            var match = l$p._0;
-            if (match) {
-              var y = match.tl;
-              var x$1 = match.hd;
-              var r$p = merge_sequences(x.tl);
-              var exit = 0;
-              if (r$p) {
-                var match$1 = r$p.hd;
-                if (typeof match$1 !== "object" || match$1.TAG !== "Sequence") {
-                  exit = 2;
-                } else {
-                  var match$2 = match$1._0;
-                  if (match$2) {
-                    if (equal$2(x$1, match$2.hd)) {
-                      return {
-                              hd: {
-                                TAG: "Sequence",
-                                _0: {
-                                  hd: x$1,
-                                  tl: {
-                                    hd: {
-                                      TAG: "Alternative",
-                                      _0: {
-                                        hd: sequence(y),
-                                        tl: {
-                                          hd: sequence(match$2.tl),
-                                          tl: /* [] */0
-                                        }
-                                      }
-                                    },
-                                    tl: /* [] */0
-                                  }
-                                }
-                              },
-                              tl: r$p.tl
-                            };
-                    }
-                    exit = 2;
-                  } else {
-                    exit = 2;
-                  }
-                }
-              } else {
-                exit = 2;
-              }
-              if (exit === 2) {
-                return {
-                        hd: {
-                          TAG: "Sequence",
-                          _0: {
-                            hd: x$1,
-                            tl: y
-                          }
-                        },
-                        tl: r$p
-                      };
-              }
-              
-            }
-            break;
-        case "Alternative" :
-            _x = Pervasives.$at(l$p._0, x.tl);
-            continue ;
-        default:
-          
-      }
-    }
-    return {
-            hd: l$p,
-            tl: merge_sequences(x.tl)
-          };
-  };
-}
-
-function enforce_kind(ids, kind, kind$p, cr) {
-  if (kind === "First" && kind$p !== "First") {
-    return seq$1(ids, kind$p, cr, mk_expr(ids, "Eps"));
-  } else {
-    return cr;
-  }
-}
-
-function translate(ids, kind, _ign_group, ign_case, _greedy, pos, cache, c, _x) {
-  while(true) {
-    var x = _x;
-    var greedy = _greedy;
-    var ign_group = _ign_group;
-    if (typeof x !== "object") {
-      switch (x) {
-        case "Beg_of_line" :
-            var c$1 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline);
-            return [
-                    mk_expr(ids, {
-                          TAG: "After",
-                          _0: c$1
-                        }),
-                    kind
-                  ];
-        case "End_of_line" :
-            var c$2 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.newline);
-            return [
-                    mk_expr(ids, {
-                          TAG: "Before",
-                          _0: c$2
-                        }),
-                    kind
-                  ];
-        case "Beg_of_word" :
-            var c$3 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter);
-            var c$4 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter);
-            return [
-                    seq$1(ids, "First", mk_expr(ids, {
-                              TAG: "After",
-                              _0: c$3
-                            }), mk_expr(ids, {
-                              TAG: "Before",
-                              _0: c$4
-                            })),
-                    kind
-                  ];
-        case "End_of_word" :
-            var c$5 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.letter);
-            var c$6 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.not_letter);
-            return [
-                    seq$1(ids, "First", mk_expr(ids, {
-                              TAG: "After",
-                              _0: c$5
-                            }), mk_expr(ids, {
-                              TAG: "Before",
-                              _0: c$6
-                            })),
-                    kind
-                  ];
-        case "Not_bound" :
-            return [
-                    alt(ids, {
-                          hd: seq$1(ids, "First", mk_expr(ids, {
-                                    TAG: "After",
-                                    _0: Re_automata_Category.letter
-                                  }), mk_expr(ids, {
-                                    TAG: "Before",
-                                    _0: Re_automata_Category.letter
-                                  })),
-                          tl: {
-                            hd: seq$1(ids, "First", mk_expr(ids, {
-                                      TAG: "After",
-                                      _0: Re_automata_Category.letter
-                                    }), mk_expr(ids, {
-                                      TAG: "Before",
-                                      _0: Re_automata_Category.letter
-                                    })),
-                            tl: /* [] */0
-                          }
-                        }),
-                    kind
-                  ];
-        case "Beg_of_str" :
-            return [
-                    mk_expr(ids, {
-                          TAG: "After",
-                          _0: Re_automata_Category.inexistant
-                        }),
-                    kind
-                  ];
-        case "End_of_str" :
-            return [
-                    mk_expr(ids, {
-                          TAG: "Before",
-                          _0: Re_automata_Category.inexistant
-                        }),
-                    kind
-                  ];
-        case "Last_end_of_line" :
-            var c$7 = Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.inexistant, Re_automata_Category.lastnewline);
-            return [
-                    mk_expr(ids, {
-                          TAG: "Before",
-                          _0: c$7
-                        }),
-                    kind
-                  ];
-        case "Start" :
-            return [
-                    mk_expr(ids, {
-                          TAG: "After",
-                          _0: Re_automata_Category.search_boundary
-                        }),
-                    kind
-                  ];
-        case "Stop" :
-            return [
-                    mk_expr(ids, {
-                          TAG: "Before",
-                          _0: Re_automata_Category.search_boundary
-                        }),
-                    kind
-                  ];
-        
-      }
-    } else {
-      switch (x.TAG) {
-        case "Set" :
-            return [
-                    cst(ids, trans_set(cache, c, x._0)),
-                    kind
-                  ];
-        case "Sequence" :
-            return [
-                    trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._0),
-                    kind
-                  ];
-        case "Alternative" :
-            var merged_sequences = merge_sequences(x._0);
-            if (merged_sequences && !merged_sequences.tl) {
-              var match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, merged_sequences.hd);
-              return [
-                      enforce_kind(ids, kind, match[1], match[0]),
-                      kind
-                    ];
-            }
-            return [
-                    alt(ids, List.map((function(ign_group,greedy){
-                            return function (r$p) {
-                              var match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p);
-                              return enforce_kind(ids, kind, match[1], match[0]);
-                            }
-                            }(ign_group,greedy)), merged_sequences)),
-                    kind
-                  ];
-        case "Repeat" :
-            var j = x._2;
-            var i = x._1;
-            var match$1 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._0);
-            var kind$p = match$1[1];
-            var cr = match$1[0];
-            var rem;
-            if (j !== undefined) {
-              var f = greedy === "Non_greedy" ? (function(cr,kind$p){
-                return function (rem) {
-                  return alt(ids, {
-                              hd: mk_expr(ids, "Eps"),
-                              tl: {
-                                hd: seq$1(ids, kind$p, rename(ids, cr), rem),
-                                tl: /* [] */0
-                              }
-                            });
-                }
-                }(cr,kind$p)) : (function(cr,kind$p){
-                return function (rem) {
-                  return alt(ids, {
-                              hd: seq$1(ids, kind$p, rename(ids, cr), rem),
-                              tl: {
-                                hd: mk_expr(ids, "Eps"),
-                                tl: /* [] */0
-                              }
-                            });
-                }
-                }(cr,kind$p));
-              rem = iter(j - i | 0, f, mk_expr(ids, "Eps"));
-            } else {
-              rem = rep(ids, greedy, kind$p, cr);
-            }
-            return [
-                    iter(i, (function(cr,kind$p){
-                        return function (rem) {
-                          return seq$1(ids, kind$p, rename(ids, cr), rem);
-                        }
-                        }(cr,kind$p)), rem),
-                    kind
-                  ];
-        case "Sem" :
-            var kind$p$1 = x._0;
-            var match$2 = translate(ids, kind$p$1, ign_group, ign_case, greedy, pos, cache, c, x._1);
-            return [
-                    enforce_kind(ids, kind$p$1, match$2[1], match$2[0]),
-                    kind$p$1
-                  ];
-        case "Sem_greedy" :
-            _x = x._1;
-            _greedy = x._0;
-            continue ;
-        case "Group" :
-            var r$p = x._0;
-            if (ign_group) {
-              _x = r$p;
-              continue ;
-            }
-            var p = pos.contents;
-            pos.contents = pos.contents + 2 | 0;
-            var match$3 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r$p);
-            return [
-                    seq$1(ids, "First", mk_expr(ids, {
-                              TAG: "Mark",
-                              _0: p
-                            }), seq$1(ids, "First", match$3[0], mk_expr(ids, {
-                                  TAG: "Mark",
-                                  _0: p + 1 | 0
-                                }))),
-                    match$3[1]
-                  ];
-        case "No_group" :
-            _x = x._0;
-            _ign_group = true;
-            continue ;
-        case "Nest" :
-            var b = pos.contents;
-            var match$4 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._0);
-            var kind$p$2 = match$4[1];
-            var cr$1 = match$4[0];
-            var e = pos.contents - 1 | 0;
-            if (e < b) {
-              return [
-                      cr$1,
-                      kind$p$2
-                    ];
-            } else {
-              return [
-                      seq$1(ids, "First", erase(ids, b, e), cr$1),
-                      kind$p$2
-                    ];
-            }
-        case "Pmark" :
-            var match$5 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x._1);
-            return [
-                    seq$1(ids, "First", mk_expr(ids, {
-                              TAG: "Pmark",
-                              _0: x._0
-                            }), match$5[0]),
-                    match$5[1]
-                  ];
-        default:
-          throw {
-                RE_EXN_ID: "Assert_failure",
-                _1: [
-                  "ocaml_re_test.res",
-                  2403,
-                  80
-                ],
-                Error: new Error()
-              };
-      }
-    }
-  };
-}
-
-function trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, x) {
-  if (!x) {
-    return mk_expr(ids, "Eps");
-  }
-  var rem = x.tl;
-  var r = x.hd;
-  if (rem) {
-    var match = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r);
-    var cr$p = match[0];
-    var cr$p$p = trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, rem);
-    if (is_eps(cr$p$p)) {
-      return cr$p;
-    } else if (is_eps(cr$p)) {
-      return cr$p$p;
-    } else {
-      return seq$1(ids, match[1], cr$p, cr$p$p);
-    }
-  }
-  var match$1 = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r);
-  return enforce_kind(ids, kind, match$1[1], match$1[0]);
-}
-
-function case_insens(s) {
-  return union(s, union(offset(32, inter(s, cupper)), offset(-32, inter(s, clower))));
-}
-
-function as_set(x) {
-  if (typeof x !== "object") {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "ocaml_re_test.res",
-            2438,
-            11
-          ],
-          Error: new Error()
-        };
-  }
-  if (x.TAG === "Set") {
-    return x._0;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "ocaml_re_test.res",
-          2438,
-          11
-        ],
-        Error: new Error()
-      };
-}
-
-function handle_case(_ign_case, _x) {
-  while(true) {
-    var x = _x;
-    var ign_case = _ign_case;
-    if (typeof x !== "object") {
-      return x;
-    }
-    switch (x.TAG) {
-      case "Set" :
-          var s = x._0;
-          return {
-                  TAG: "Set",
-                  _0: ign_case ? case_insens(s) : s
-                };
-      case "Sequence" :
-          return {
-                  TAG: "Sequence",
-                  _0: List.map((function(ign_case){
-                      return function (param) {
-                        return handle_case(ign_case, param);
-                      }
-                      }(ign_case)), x._0)
-                };
-      case "Alternative" :
-          var l$p = List.map((function(ign_case){
-              return function (param) {
-                return handle_case(ign_case, param);
-              }
-              }(ign_case)), x._0);
-          if (is_charset({
-                  TAG: "Alternative",
-                  _0: l$p
-                })) {
-            return {
-                    TAG: "Set",
-                    _0: List.fold_left((function (s, r) {
-                            return union(s, as_set(r));
-                          }), /* [] */0, l$p)
-                  };
-          } else {
-            return {
-                    TAG: "Alternative",
-                    _0: l$p
-                  };
-          }
-      case "Repeat" :
-          return {
-                  TAG: "Repeat",
-                  _0: handle_case(ign_case, x._0),
-                  _1: x._1,
-                  _2: x._2
-                };
-      case "Sem" :
-          var r$p = handle_case(ign_case, x._1);
-          if (is_charset(r$p)) {
-            return r$p;
-          } else {
-            return {
-                    TAG: "Sem",
-                    _0: x._0,
-                    _1: r$p
-                  };
-          }
-      case "Sem_greedy" :
-          var r$p$1 = handle_case(ign_case, x._1);
-          if (is_charset(r$p$1)) {
-            return r$p$1;
-          } else {
-            return {
-                    TAG: "Sem_greedy",
-                    _0: x._0,
-                    _1: r$p$1
-                  };
-          }
-      case "Group" :
-          return {
-                  TAG: "Group",
-                  _0: handle_case(ign_case, x._0)
-                };
-      case "No_group" :
-          var r$p$2 = handle_case(ign_case, x._0);
-          if (is_charset(r$p$2)) {
-            return r$p$2;
-          } else {
-            return {
-                    TAG: "No_group",
-                    _0: r$p$2
-                  };
-          }
-      case "Nest" :
-          var r$p$3 = handle_case(ign_case, x._0);
-          if (is_charset(r$p$3)) {
-            return r$p$3;
-          } else {
-            return {
-                    TAG: "Nest",
-                    _0: r$p$3
-                  };
-          }
-      case "Case" :
-          _x = x._0;
-          _ign_case = false;
-          continue ;
-      case "No_case" :
-          _x = x._0;
-          _ign_case = true;
-          continue ;
-      case "Intersection" :
-          var l$p$1 = List.map((function(ign_case){
-              return function (r) {
-                return handle_case(ign_case, r);
-              }
-              }(ign_case)), x._0);
-          return {
-                  TAG: "Set",
-                  _0: List.fold_left((function (s, r) {
-                          return inter(s, as_set(r));
-                        }), cany, l$p$1)
-                };
-      case "Complement" :
-          var l$p$2 = List.map((function(ign_case){
-              return function (r) {
-                return handle_case(ign_case, r);
-              }
-              }(ign_case)), x._0);
-          return {
-                  TAG: "Set",
-                  _0: diff(cany, List.fold_left((function (s, r) {
-                              return union(s, as_set(r));
-                            }), /* [] */0, l$p$2))
-                };
-      case "Difference" :
-          return {
-                  TAG: "Set",
-                  _0: inter(as_set(handle_case(ign_case, x._0)), diff(cany, as_set(handle_case(ign_case, x._1))))
-                };
-      case "Pmark" :
-          return {
-                  TAG: "Pmark",
-                  _0: x._0,
-                  _1: handle_case(ign_case, x._1)
-                };
-      
-    }
-  };
-}
-
-function anchored(_x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      switch (x) {
-        case "Beg_of_str" :
-        case "Start" :
-            return true;
-        default:
-          return false;
-      }
-    } else {
-      switch (x.TAG) {
-        case "Sequence" :
-            return List.exists(anchored, x._0);
-        case "Alternative" :
-            return List.for_all(anchored, x._0);
-        case "Repeat" :
-            if (x._1 <= 0) {
-              return false;
-            }
-            _x = x._0;
-            continue ;
-        case "Group" :
-        case "No_group" :
-        case "Nest" :
-        case "Case" :
-        case "No_case" :
-            _x = x._0;
-            continue ;
-        case "Sem" :
-        case "Sem_greedy" :
-        case "Pmark" :
-            _x = x._1;
-            continue ;
-        default:
-          return false;
-      }
-    }
-  };
-}
-
-function alt$1(x) {
-  if (x && !x.tl) {
-    return x.hd;
-  } else {
-    return {
-            TAG: "Alternative",
-            _0: x
-          };
-  }
-}
-
-function seq$2(x) {
-  if (x && !x.tl) {
-    return x.hd;
-  } else {
-    return {
-            TAG: "Sequence",
-            _0: x
-          };
-  }
-}
-
-var epsilon = {
-  TAG: "Sequence",
-  _0: /* [] */0
-};
-
-function repn(r, i, j) {
-  if (i < 0) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Re.repn",
-          Error: new Error()
-        };
-  }
-  if (j !== undefined && j < i) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Re.repn",
-          Error: new Error()
-        };
-  }
-  return {
-          TAG: "Repeat",
-          _0: r,
-          _1: i,
-          _2: j
-        };
-}
-
-function set(str) {
-  var s = /* [] */0;
-  for(var i = 0 ,i_finish = str.length; i < i_finish; ++i){
-    s = union(single(Caml_string.get(str, i)), s);
-  }
-  return {
-          TAG: "Set",
-          _0: s
-        };
-}
-
-function compl(l) {
-  var r = {
-    TAG: "Complement",
-    _0: l
-  };
-  if (is_charset(r)) {
-    return r;
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Re.compl",
-        Error: new Error()
-      };
-}
-
-var any = {
-  TAG: "Set",
-  _0: cany
-};
-
-var notnl = {
-  TAG: "Set",
-  _0: diff(cany, {
-        hd: [
-          /* '\n' */10,
-          /* '\n' */10
-        ],
-        tl: /* [] */0
-      })
-};
-
-var lower = alt$1({
-      hd: {
-        TAG: "Set",
-        _0: seq(/* 'a' */97, /* 'z' */122)
-      },
-      tl: {
-        hd: {
-          TAG: "Set",
-          _0: {
-            hd: [
-              /* '\181' */181,
-              /* '\181' */181
-            ],
-            tl: /* [] */0
-          }
-        },
-        tl: {
-          hd: {
-            TAG: "Set",
-            _0: seq(/* '\223' */223, /* '\246' */246)
-          },
-          tl: {
-            hd: {
-              TAG: "Set",
-              _0: seq(/* '\248' */248, /* '\255' */255)
-            },
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-var upper = alt$1({
-      hd: {
-        TAG: "Set",
-        _0: seq(/* 'A' */65, /* 'Z' */90)
-      },
-      tl: {
-        hd: {
-          TAG: "Set",
-          _0: seq(/* '\192' */192, /* '\214' */214)
-        },
-        tl: {
-          hd: {
-            TAG: "Set",
-            _0: seq(/* '\216' */216, /* '\222' */222)
-          },
-          tl: /* [] */0
-        }
-      }
-    });
-
-var alpha = alt$1({
-      hd: lower,
-      tl: {
-        hd: upper,
-        tl: {
-          hd: {
-            TAG: "Set",
-            _0: {
-              hd: [
-                /* '\170' */170,
-                /* '\170' */170
-              ],
-              tl: /* [] */0
-            }
-          },
-          tl: {
-            hd: {
-              TAG: "Set",
-              _0: {
-                hd: [
-                  /* '\186' */186,
-                  /* '\186' */186
-                ],
-                tl: /* [] */0
-              }
-            },
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-var digit = {
-  TAG: "Set",
-  _0: seq(/* '0' */48, /* '9' */57)
-};
-
-var alnum = alt$1({
-      hd: alpha,
-      tl: {
-        hd: digit,
-        tl: /* [] */0
-      }
-    });
-
-var wordc = alt$1({
-      hd: alnum,
-      tl: {
-        hd: {
-          TAG: "Set",
-          _0: {
-            hd: [
-              /* '_' */95,
-              /* '_' */95
-            ],
-            tl: /* [] */0
-          }
-        },
-        tl: /* [] */0
-      }
-    });
-
-var ascii = {
-  TAG: "Set",
-  _0: seq(/* '\000' */0, /* '\127' */127)
-};
-
-var blank = set("\t ");
-
-var cntrl = alt$1({
-      hd: {
-        TAG: "Set",
-        _0: seq(/* '\000' */0, /* '\031' */31)
-      },
-      tl: {
-        hd: {
-          TAG: "Set",
-          _0: seq(/* '\127' */127, /* '\159' */159)
-        },
-        tl: /* [] */0
-      }
-    });
-
-var graph = alt$1({
-      hd: {
-        TAG: "Set",
-        _0: seq(/* '!' */33, /* '~' */126)
-      },
-      tl: {
-        hd: {
-          TAG: "Set",
-          _0: seq(/* '\160' */160, /* '\255' */255)
-        },
-        tl: /* [] */0
-      }
-    });
-
-var print = alt$1({
-      hd: {
-        TAG: "Set",
-        _0: seq(/* ' ' */32, /* '~' */126)
-      },
-      tl: {
-        hd: {
-          TAG: "Set",
-          _0: seq(/* '\160' */160, /* '\255' */255)
-        },
-        tl: /* [] */0
-      }
-    });
-
-var punct = alt$1({
-      hd: {
-        TAG: "Set",
-        _0: seq(/* '!' */33, /* '/' */47)
-      },
-      tl: {
-        hd: {
-          TAG: "Set",
-          _0: seq(/* ':' */58, /* '@' */64)
-        },
-        tl: {
-          hd: {
-            TAG: "Set",
-            _0: seq(/* '[' */91, /* '`' */96)
-          },
-          tl: {
-            hd: {
-              TAG: "Set",
-              _0: seq(/* '{' */123, /* '~' */126)
-            },
-            tl: {
-              hd: {
-                TAG: "Set",
-                _0: seq(/* '\160' */160, /* '\169' */169)
-              },
-              tl: {
-                hd: {
-                  TAG: "Set",
-                  _0: seq(/* '\171' */171, /* '\180' */180)
-                },
-                tl: {
-                  hd: {
-                    TAG: "Set",
-                    _0: seq(/* '\182' */182, /* '\185' */185)
-                  },
-                  tl: {
-                    hd: {
-                      TAG: "Set",
-                      _0: seq(/* '\187' */187, /* '\191' */191)
-                    },
-                    tl: {
-                      hd: {
-                        TAG: "Set",
-                        _0: {
-                          hd: [
-                            /* '\215' */215,
-                            /* '\215' */215
-                          ],
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: {
-                        hd: {
-                          TAG: "Set",
-                          _0: {
-                            hd: [
-                              /* '\247' */247,
-                              /* '\247' */247
-                            ],
-                            tl: /* [] */0
-                          }
-                        },
-                        tl: /* [] */0
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    });
-
-var space = alt$1({
-      hd: {
-        TAG: "Set",
-        _0: {
-          hd: [
-            /* ' ' */32,
-            /* ' ' */32
-          ],
-          tl: /* [] */0
-        }
-      },
-      tl: {
-        hd: {
-          TAG: "Set",
-          _0: seq(/* '\t' */9, /* '\r' */13)
-        },
-        tl: /* [] */0
-      }
-    });
-
-var xdigit = alt$1({
-      hd: digit,
-      tl: {
-        hd: {
-          TAG: "Set",
-          _0: seq(/* 'a' */97, /* 'f' */102)
-        },
-        tl: {
-          hd: {
-            TAG: "Set",
-            _0: seq(/* 'A' */65, /* 'F' */70)
-          },
-          tl: /* [] */0
-        }
-      }
-    });
-
-function compile(r) {
-  var regexp = anchored(r) ? ({
-        TAG: "Group",
-        _0: r
-      }) : seq$2({
-          hd: {
-            TAG: "Sem",
-            _0: "Shortest",
-            _1: repn(any, 0, undefined)
-          },
-          tl: {
-            hd: {
-              TAG: "Group",
-              _0: r
-            },
-            tl: /* [] */0
-          }
-        });
-  var regexp$1 = handle_case(false, regexp);
-  var c = Bytes.make(257, /* '\000' */0);
-  var need_lnl = colorize(c, regexp$1);
-  var match = flatten_cmap(c);
-  var ncol = match[2];
-  var col = match[0];
-  var lnl = need_lnl ? ncol : -1;
-  var ncol$1 = need_lnl ? ncol + 1 | 0 : ncol;
-  var ids = {
-    contents: 0
-  };
-  var pos = {
-    contents: 0
-  };
-  var match$1 = translate(ids, "First", false, false, "Greedy", pos, {
-        contents: "Empty"
-      }, col, regexp$1);
-  var r$1 = enforce_kind(ids, "First", match$1[1], match$1[0]);
-  var col_repr = match[1];
-  var group_count = pos.contents / 2 | 0;
-  return {
-          initial: r$1,
-          initial_states: /* [] */0,
-          cols: col,
-          col_repr: col_repr,
-          ncol: ncol$1,
-          lnl: lnl,
-          tbl: {
-            contents: [false]
-          },
-          states: Curry._1(Re_automata_State.Table.create, 97),
-          group_count: group_count
-        };
-}
-
-function exec_internal(name, posOpt, lenOpt, groups, re, s) {
-  var pos = posOpt !== undefined ? posOpt : 0;
-  var len = lenOpt !== undefined ? lenOpt : -1;
-  if (pos < 0 || len < -1 || (pos + len | 0) > s.length) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: name,
-          Error: new Error()
-        };
-  }
-  var partial = false;
-  var slen = s.length;
-  var last = len === -1 ? slen : pos + len | 0;
-  var tmp;
-  if (groups) {
-    var n = re.tbl.contents.length + 1 | 0;
-    tmp = n <= 10 ? [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0
-      ] : Caml_array.make(n, 0);
-  } else {
-    tmp = [];
-  }
-  var info = {
-    re: re,
-    i_cols: re.cols,
-    positions: tmp,
-    pos: pos,
-    last: last
-  };
-  var initial_cat = pos === 0 ? Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, category(re, get_color(re, s, pos - 1 | 0)));
-  var initial_state = find_initial_state(re, initial_cat);
-  var st = scan_str(info, s, initial_state, groups);
-  var res;
-  if (st.idx === -3 || partial) {
-    res = status(st.desc);
-  } else {
-    var final_cat = last === slen ? Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, Re_automata_Category.inexistant) : Curry._2(Re_automata_Category.$plus$plus, Re_automata_Category.search_boundary, category(re, get_color(re, s, last)));
-    var match = $$final(info, st, final_cat);
-    if (groups) {
-      Caml_array.set(info.positions, match[0], last + 1 | 0);
-    }
-    res = match[1];
-  }
-  if (typeof res !== "object") {
-    if (res === "Failed") {
-      return "Failed";
-    } else {
-      return "Running";
-    }
-  } else {
-    return {
-            TAG: "Match",
-            _0: {
-              s: s,
-              marks: res._0,
-              pmarks: res._1,
-              gpos: info.positions,
-              gcount: re.group_count
-            }
-          };
-  }
-}
-
-function offset$1(t, i) {
-  if (((i << 1) + 1 | 0) >= t.marks.length) {
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  }
-  var m1 = Caml_array.get(t.marks, (i << 1));
-  if (m1 === -1) {
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  }
-  var p1 = Caml_array.get(t.gpos, m1) - 1 | 0;
-  var p2 = Caml_array.get(t.gpos, Caml_array.get(t.marks, (i << 1) + 1 | 0)) - 1 | 0;
-  return [
-          p1,
-          p2
-        ];
-}
-
-function get(t, i) {
-  var match = offset$1(t, i);
-  var p1 = match[0];
-  return $$String.sub(t.s, p1, match[1] - p1 | 0);
-}
-
-var Parse_error = /* @__PURE__ */Caml_exceptions.create("Parse_error");
-
-var Not_supported = /* @__PURE__ */Caml_exceptions.create("Not_supported");
-
-function posix_class_of_string(x) {
-  switch (x) {
-    case "alnum" :
-        return alnum;
-    case "ascii" :
-        return ascii;
-    case "blank" :
-        return blank;
-    case "cntrl" :
-        return cntrl;
-    case "digit" :
-        return digit;
-    case "graph" :
-        return graph;
-    case "lower" :
-        return lower;
-    case "print" :
-        return print;
-    case "punct" :
-        return punct;
-    case "space" :
-        return space;
-    case "upper" :
-        return upper;
-    case "word" :
-        return wordc;
-    case "xdigit" :
-        return xdigit;
-    default:
-      var s = "Invalid pcre class: " + x;
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: s,
-            Error: new Error()
-          };
-  }
-}
-
-function parse(multiline, dollar_endonly, dotall, ungreedy, s) {
-  var i = {
-    contents: 0
-  };
-  var l = s.length;
-  var test = function (c) {
-    if (i.contents !== l) {
-      return Caml_string.get(s, i.contents) === c;
-    } else {
-      return false;
-    }
-  };
-  var accept = function (c) {
-    var r = test(c);
-    if (r) {
-      i.contents = i.contents + 1 | 0;
-    }
-    return r;
-  };
-  var accept_s = function (s$p) {
-    var len = s$p.length;
-    try {
-      for(var j = 0; j < len; ++j){
-        try {
-          if (Caml_string.get(s$p, j) !== Caml_string.get(s, i.contents + j | 0)) {
-            throw {
-                  RE_EXN_ID: Pervasives.Exit,
-                  Error: new Error()
-                };
-          }
-          
-        }
-        catch (exn){
-          throw {
-                RE_EXN_ID: Pervasives.Exit,
-                Error: new Error()
-              };
-        }
-      }
-      i.contents = i.contents + len | 0;
-      return true;
-    }
-    catch (raw_exn){
-      var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn);
-      if (exn$1.RE_EXN_ID === Pervasives.Exit) {
-        return false;
-      }
-      throw exn$1;
-    }
-  };
-  var get = function (param) {
-    var r = Caml_string.get(s, i.contents);
-    i.contents = i.contents + 1 | 0;
-    return r;
-  };
-  var greedy_mod = function (r) {
-    var gr = accept(/* '?' */63);
-    var gr$1 = ungreedy ? !gr : gr;
-    if (gr$1) {
-      return {
-              TAG: "Sem_greedy",
-              _0: "Non_greedy",
-              _1: r
-            };
-    } else {
-      return {
-              TAG: "Sem_greedy",
-              _0: "Greedy",
-              _1: r
-            };
-    }
-  };
-  var atom = function (param) {
-    if (accept(/* '.' */46)) {
-      if (dotall) {
-        return any;
-      } else {
-        return notnl;
-      }
-    }
-    if (accept(/* '(' */40)) {
-      if (accept(/* '?' */63)) {
-        if (accept(/* ':' */58)) {
-          var r = regexp$p(branch$p(/* [] */0));
-          if (!accept(/* ')' */41)) {
-            throw {
-                  RE_EXN_ID: Parse_error,
-                  Error: new Error()
-                };
-          }
-          return r;
-        }
-        if (accept(/* '#' */35)) {
-          var _param;
-          while(true) {
-            if (accept(/* ')' */41)) {
-              return epsilon;
-            }
-            i.contents = i.contents + 1 | 0;
-            _param = undefined;
-            continue ;
-          };
-        }
-        throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
-      }
-      var r$1 = regexp$p(branch$p(/* [] */0));
-      if (!accept(/* ')' */41)) {
-        throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
-      }
-      return {
-              TAG: "Group",
-              _0: r$1
-            };
-    }
-    if (accept(/* '^' */94)) {
-      if (multiline) {
-        return "Beg_of_line";
-      } else {
-        return "Beg_of_str";
-      }
-    }
-    if (accept(/* '$' */36)) {
-      if (multiline) {
-        return "End_of_line";
-      } else if (dollar_endonly) {
-        return "Last_end_of_line";
-      } else {
-        return "End_of_str";
-      }
-    }
-    if (accept(/* '[' */91)) {
-      if (accept(/* '^' */94)) {
-        return compl(bracket(/* [] */0));
-      } else {
-        return alt$1(bracket(/* [] */0));
-      }
-    }
-    if (accept(/* '\\' */92)) {
-      if (i.contents === l) {
-        throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
-      }
-      var c = get();
-      switch (c) {
-        case 48 :
-        case 49 :
-        case 50 :
-        case 51 :
-        case 52 :
-        case 53 :
-        case 54 :
-        case 55 :
-        case 56 :
-        case 57 :
-            throw {
-                  RE_EXN_ID: Not_supported,
-                  Error: new Error()
-                };
-        case 65 :
-            return "Beg_of_str";
-        case 66 :
-            return "Not_bound";
-        case 68 :
-            return compl({
-                        hd: digit,
-                        tl: /* [] */0
-                      });
-        case 71 :
-            return "Start";
-        case 83 :
-            return compl({
-                        hd: space,
-                        tl: /* [] */0
-                      });
-        case 87 :
-            return compl({
-                        hd: alnum,
-                        tl: {
-                          hd: {
-                            TAG: "Set",
-                            _0: {
-                              hd: [
-                                /* '_' */95,
-                                /* '_' */95
-                              ],
-                              tl: /* [] */0
-                            }
-                          },
-                          tl: /* [] */0
-                        }
-                      });
-        case 90 :
-            return "Last_end_of_line";
-        case 98 :
-            return alt$1({
-                        hd: "Beg_of_word",
-                        tl: {
-                          hd: "End_of_word",
-                          tl: /* [] */0
-                        }
-                      });
-        case 100 :
-            return digit;
-        case 115 :
-            return space;
-        case 119 :
-            return alt$1({
-                        hd: alnum,
-                        tl: {
-                          hd: {
-                            TAG: "Set",
-                            _0: {
-                              hd: [
-                                /* '_' */95,
-                                /* '_' */95
-                              ],
-                              tl: /* [] */0
-                            }
-                          },
-                          tl: /* [] */0
-                        }
-                      });
-        case 67 :
-        case 69 :
-        case 70 :
-        case 72 :
-        case 73 :
-        case 74 :
-        case 75 :
-        case 76 :
-        case 77 :
-        case 78 :
-        case 79 :
-        case 80 :
-        case 81 :
-        case 82 :
-        case 84 :
-        case 85 :
-        case 86 :
-        case 88 :
-        case 89 :
-        case 97 :
-        case 99 :
-        case 101 :
-        case 102 :
-        case 103 :
-        case 104 :
-        case 105 :
-        case 106 :
-        case 107 :
-        case 108 :
-        case 109 :
-        case 110 :
-        case 111 :
-        case 112 :
-        case 113 :
-        case 114 :
-        case 116 :
-        case 117 :
-        case 118 :
-        case 120 :
-        case 121 :
-            throw {
-                  RE_EXN_ID: Parse_error,
-                  Error: new Error()
-                };
-        case 122 :
-            return "End_of_str";
-        default:
-          return {
-                  TAG: "Set",
-                  _0: single(c)
-                };
-      }
-    } else {
-      if (i.contents === l) {
-        throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
-      }
-      var c$1 = get();
-      if (c$1 >= 64) {
-        if (c$1 !== 92) {
-          if (c$1 !== 123) {
-            return {
-                    TAG: "Set",
-                    _0: single(c$1)
-                  };
-          }
-          throw {
-                RE_EXN_ID: Parse_error,
-                Error: new Error()
-              };
-        }
-        throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
-      }
-      if (c$1 >= 44) {
-        if (c$1 >= 63) {
-          throw {
-                RE_EXN_ID: Parse_error,
-                Error: new Error()
-              };
-        }
-        return {
-                TAG: "Set",
-                _0: single(c$1)
-              };
-      }
-      if (c$1 >= 42) {
-        throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
-      }
-      return {
-              TAG: "Set",
-              _0: single(c$1)
-            };
-    }
-  };
-  var integer = function (param) {
-    if (i.contents === l) {
-      return ;
-    }
-    var d = get();
-    if (d > 57 || d < 48) {
-      i.contents = i.contents - 1 | 0;
-      return ;
-    } else {
-      var _i = d - /* '0' */48 | 0;
-      while(true) {
-        var i$1 = _i;
-        if (i.contents === l) {
-          return i$1;
-        }
-        var d$1 = get();
-        if (d$1 > 57 || d$1 < 48) {
-          i.contents = i.contents - 1 | 0;
-          return i$1;
-        }
-        var i$p = Math.imul(10, i$1) + (d$1 - /* '0' */48 | 0) | 0;
-        if (i$p < i$1) {
-          throw {
-                RE_EXN_ID: Parse_error,
-                Error: new Error()
-              };
-        }
-        _i = i$p;
-        continue ;
-      };
-    }
-  };
-  var $$char = function (param) {
-    if (i.contents === l) {
-      throw {
-            RE_EXN_ID: Parse_error,
-            Error: new Error()
-          };
-    }
-    var c = get();
-    if (c === /* '[' */91) {
-      if (accept(/* '=' */61)) {
-        throw {
-              RE_EXN_ID: Not_supported,
-              Error: new Error()
-            };
-      }
-      if (accept(/* ':' */58)) {
-        var compl$1 = accept(/* '^' */94);
-        var cls;
-        try {
-          cls = List.find(accept_s, {
-                hd: "alnum",
-                tl: {
-                  hd: "ascii",
-                  tl: {
-                    hd: "blank",
-                    tl: {
-                      hd: "cntrl",
-                      tl: {
-                        hd: "digit",
-                        tl: {
-                          hd: "lower",
-                          tl: {
-                            hd: "print",
-                            tl: {
-                              hd: "space",
-                              tl: {
-                                hd: "upper",
-                                tl: {
-                                  hd: "word",
-                                  tl: {
-                                    hd: "punct",
-                                    tl: {
-                                      hd: "graph",
-                                      tl: {
-                                        hd: "xdigit",
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              });
-        }
-        catch (raw_exn){
-          var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-          if (exn.RE_EXN_ID === "Not_found") {
-            throw {
-                  RE_EXN_ID: Parse_error,
-                  Error: new Error()
-                };
-          }
-          throw exn;
-        }
-        if (!accept_s(":]")) {
-          throw {
-                RE_EXN_ID: Parse_error,
-                Error: new Error()
-              };
-        }
-        var posix_class = posix_class_of_string(cls);
-        var re = compl$1 ? compl({
-                hd: posix_class,
-                tl: /* [] */0
-              }) : posix_class;
-        return {
-                NAME: "Set",
-                VAL: re
-              };
-      }
-      if (!accept(/* '.' */46)) {
-        return {
-                NAME: "Char",
-                VAL: c
-              };
-      }
-      if (i.contents === l) {
-        throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
-      }
-      var c$1 = get();
-      if (!accept(/* '.' */46)) {
-        throw {
-              RE_EXN_ID: Not_supported,
-              Error: new Error()
-            };
-      }
-      if (!accept(/* ']' */93)) {
-        throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
-      }
-      return {
-              NAME: "Char",
-              VAL: c$1
-            };
-    }
-    if (c !== /* '\\' */92) {
-      return {
-              NAME: "Char",
-              VAL: c
-            };
-    }
-    var c$2 = get();
-    if (c$2 >= 58) {
-      if (c$2 >= 123) {
-        return {
-                NAME: "Char",
-                VAL: c$2
-              };
-      }
-      switch (c$2) {
-        case 68 :
-            return {
-                    NAME: "Set",
-                    VAL: compl({
-                          hd: digit,
-                          tl: /* [] */0
-                        })
-                  };
-        case 83 :
-            return {
-                    NAME: "Set",
-                    VAL: compl({
-                          hd: space,
-                          tl: /* [] */0
-                        })
-                  };
-        case 87 :
-            return {
-                    NAME: "Set",
-                    VAL: compl({
-                          hd: alnum,
-                          tl: {
-                            hd: {
-                              TAG: "Set",
-                              _0: {
-                                hd: [
-                                  /* '_' */95,
-                                  /* '_' */95
-                                ],
-                                tl: /* [] */0
-                              }
-                            },
-                            tl: /* [] */0
-                          }
-                        })
-                  };
-        case 58 :
-        case 59 :
-        case 60 :
-        case 61 :
-        case 62 :
-        case 63 :
-        case 64 :
-        case 91 :
-        case 92 :
-        case 93 :
-        case 94 :
-        case 95 :
-        case 96 :
-            return {
-                    NAME: "Char",
-                    VAL: c$2
-                  };
-        case 98 :
-            return {
-                    NAME: "Char",
-                    VAL: /* '\b' */8
-                  };
-        case 100 :
-            return {
-                    NAME: "Set",
-                    VAL: digit
-                  };
-        case 110 :
-            return {
-                    NAME: "Char",
-                    VAL: /* '\n' */10
-                  };
-        case 114 :
-            return {
-                    NAME: "Char",
-                    VAL: /* '\r' */13
-                  };
-        case 115 :
-            return {
-                    NAME: "Set",
-                    VAL: space
-                  };
-        case 116 :
-            return {
-                    NAME: "Char",
-                    VAL: /* '\t' */9
-                  };
-        case 119 :
-            return {
-                    NAME: "Set",
-                    VAL: alt$1({
-                          hd: alnum,
-                          tl: {
-                            hd: {
-                              TAG: "Set",
-                              _0: {
-                                hd: [
-                                  /* '_' */95,
-                                  /* '_' */95
-                                ],
-                                tl: /* [] */0
-                              }
-                            },
-                            tl: /* [] */0
-                          }
-                        })
-                  };
-        case 65 :
-        case 66 :
-        case 67 :
-        case 69 :
-        case 70 :
-        case 71 :
-        case 72 :
-        case 73 :
-        case 74 :
-        case 75 :
-        case 76 :
-        case 77 :
-        case 78 :
-        case 79 :
-        case 80 :
-        case 81 :
-        case 82 :
-        case 84 :
-        case 85 :
-        case 86 :
-        case 88 :
-        case 89 :
-        case 90 :
-        case 97 :
-        case 99 :
-        case 101 :
-        case 102 :
-        case 103 :
-        case 104 :
-        case 105 :
-        case 106 :
-        case 107 :
-        case 108 :
-        case 109 :
-        case 111 :
-        case 112 :
-        case 113 :
-        case 117 :
-        case 118 :
-        case 120 :
-        case 121 :
-        case 122 :
-            throw {
-                  RE_EXN_ID: Parse_error,
-                  Error: new Error()
-                };
-        
-      }
-    } else {
-      if (c$2 >= 48) {
-        throw {
-              RE_EXN_ID: Not_supported,
-              Error: new Error()
-            };
-      }
-      return {
-              NAME: "Char",
-              VAL: c$2
-            };
-    }
-  };
-  var bracket = function (_s) {
-    while(true) {
-      var s = _s;
-      if (s !== /* [] */0 && accept(/* ']' */93)) {
-        return s;
-      }
-      var match = $$char();
-      if (match.NAME === "Char") {
-        var c = match.VAL;
-        if (accept(/* '-' */45)) {
-          if (accept(/* ']' */93)) {
-            return {
-                    hd: {
-                      TAG: "Set",
-                      _0: single(c)
-                    },
-                    tl: {
-                      hd: {
-                        TAG: "Set",
-                        _0: {
-                          hd: [
-                            /* '-' */45,
-                            /* '-' */45
-                          ],
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: s
-                    }
-                  };
-          }
-          var match$1 = $$char();
-          if (match$1.NAME !== "Char") {
-            return {
-                    hd: {
-                      TAG: "Set",
-                      _0: single(c)
-                    },
-                    tl: {
-                      hd: {
-                        TAG: "Set",
-                        _0: {
-                          hd: [
-                            /* '-' */45,
-                            /* '-' */45
-                          ],
-                          tl: /* [] */0
-                        }
-                      },
-                      tl: {
-                        hd: match$1.VAL,
-                        tl: s
-                      }
-                    }
-                  };
-          }
-          _s = {
-            hd: {
-              TAG: "Set",
-              _0: seq(c, match$1.VAL)
-            },
-            tl: s
-          };
-          continue ;
-        }
-        _s = {
-          hd: {
-            TAG: "Set",
-            _0: single(c)
-          },
-          tl: s
-        };
-        continue ;
-      }
-      _s = {
-        hd: match.VAL,
-        tl: s
-      };
-      continue ;
-    };
-  };
-  var piece = function (param) {
-    var r = atom();
-    if (accept(/* '*' */42)) {
-      return greedy_mod(repn(r, 0, undefined));
-    }
-    if (accept(/* '+' */43)) {
-      return greedy_mod(repn(r, 1, undefined));
-    }
-    if (accept(/* '?' */63)) {
-      return greedy_mod(repn(r, 0, 1));
-    }
-    if (!accept(/* '{' */123)) {
-      return r;
-    }
-    var i$1 = integer();
-    if (i$1 !== undefined) {
-      var j = accept(/* ',' */44) ? integer() : i$1;
-      if (!accept(/* '}' */125)) {
-        throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
-      }
-      if (j !== undefined && j < i$1) {
-        throw {
-              RE_EXN_ID: Parse_error,
-              Error: new Error()
-            };
-      }
-      return greedy_mod(repn(r, i$1, j));
-    }
-    i.contents = i.contents - 1 | 0;
-    return r;
-  };
-  var branch$p = function (_left) {
-    while(true) {
-      var left = _left;
-      if (i.contents === l || test(/* '|' */124) || test(/* ')' */41)) {
-        return seq$2(List.rev(left));
-      }
-      _left = {
-        hd: piece(),
-        tl: left
-      };
-      continue ;
-    };
-  };
-  var regexp$p = function (_left) {
-    while(true) {
-      var left = _left;
-      if (!accept(/* '|' */124)) {
-        return left;
-      }
-      _left = alt$1({
-            hd: left,
-            tl: {
-              hd: branch$p(/* [] */0),
-              tl: /* [] */0
-            }
-          });
-      continue ;
-    };
-  };
-  var res = regexp$p(branch$p(/* [] */0));
-  if (i.contents !== l) {
-    throw {
-          RE_EXN_ID: Parse_error,
-          Error: new Error()
-        };
-  }
-  return res;
-}
-
-function re(flagsOpt, pat) {
-  var flags = flagsOpt !== undefined ? flagsOpt : /* [] */0;
-  var opts = List.map((function (x) {
-          if (x === "CASELESS") {
-            return "Caseless";
-          } else if (x === "ANCHORED") {
-            return "Anchored";
-          } else {
-            return "Multiline";
-          }
-        }), flags);
-  var optsOpt = opts;
-  var opts$1 = optsOpt !== undefined ? optsOpt : /* [] */0;
-  var r = parse(List.memq("Multiline", opts$1), List.memq("Dollar_endonly", opts$1), List.memq("Dotall", opts$1), List.memq("Ungreedy", opts$1), pat);
-  var r$1 = List.memq("Anchored", opts$1) ? seq$2({
-          hd: "Start",
-          tl: {
-            hd: r,
-            tl: /* [] */0
-          }
-        }) : r;
-  if (List.memq("Caseless", opts$1)) {
-    return {
-            TAG: "No_case",
-            _0: r$1
-          };
-  } else {
-    return r$1;
-  }
-}
-
-function exec(rex, pos, s) {
-  var len;
-  var substr = exec_internal("Re.exec", pos, len, true, rex, s);
-  if (typeof substr === "object") {
-    return substr._0;
-  }
-  if (substr === "Failed") {
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  }
-  throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
-}
-
-var s = "a".repeat(1048575) + "b";
-
-eq("File \"ocaml_re_test.res\", line 3843, characters 7-14", get(exec(compile(re(undefined, "aa?b")), undefined, s), 0), "aab");
-
-Mt.from_pair_suites("Ocaml_re_test", suites.contents);
-
-/* Table Not a pure module */
diff --git a/jscomp/test/ocaml_re_test.res b/jscomp/test/ocaml_re_test.res
deleted file mode 100644
index d4b4017..0000000
--- a/jscomp/test/ocaml_re_test.res
+++ /dev/null
@@ -1,3847 +0,0 @@
-@@bs.config({flags: ["-w", "a", "-bs-no-bin-annot"], no_export})
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-module Re_cset: {
-  /*
-   RE - A regular expression library
-
-   Copyright (C) 2001 Jerome Vouillon
-   email: Jerome.Vouillon@pps.jussieu.fr
-
-   This library 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, with
-   linking exception; either version 2.1 of the License, or (at
-   your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   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 library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-  /* Character sets, represented as sorted list of intervals */
-
-  type c = int
-  type t
-
-  let iter: (t, ~f: (c, c) => unit) => unit
-
-  let union: (t, t) => t
-  let inter: (t, t) => t
-  let diff: (t, t) => t
-  let offset: (int, t) => t
-
-  let empty: t
-  let single: c => t
-  let seq: (c, c) => t
-  let add: (c, t) => t
-
-  let mem: (c, t) => bool
-
-  type hash
-  let hash: t => hash
-
-  let one_char: t => option<c>
-
-  let fold_right: (t, ~init: 'acc, ~f: ((c, c), 'acc) => 'acc) => 'acc
-
-  let hash_rec: t => int
-
-  module CSetMap: Map.S with type key = (int, t)
-
-  let cany: t
-
-  let csingle: char => t
-
-  let is_empty: t => bool
-
-  let prepend: (t, list<'a>, list<(t, list<'a>)>) => list<(t, list<'a>)>
-
-  let pick: t => c
-} = {
-  /*
-   RE - A regular expression library
-
-   Copyright (C) 2001 Jerome Vouillon
-   email: Jerome.Vouillon@pps.jussieu.fr
-
-   This library 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, with
-   linking exception; either version 2.1 of the License, or (at
-   your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   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 library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-  type c = int
-  type t = list<(c, c)>
-
-  let rec union = (l, l') =>
-    switch (l, l') {
-    | (_, list{}) => l
-    | (list{}, _) => l'
-    | (list{(c1, c2), ...r}, list{(c1', c2'), ...r'}) =>
-      if c2 + 1 < c1' {
-        list{(c1, c2), ...union(r, l')}
-      } else if c2' + 1 < c1 {
-        list{(c1', c2'), ...union(l, r')}
-      } else if c2 < c2' {
-        union(r, list{(min(c1, c1'), c2'), ...r'})
-      } else {
-        union(list{(min(c1, c1'), c2), ...r}, r')
-      }
-    }
-
-  let rec inter = (l, l') =>
-    switch (l, l') {
-    | (_, list{}) => list{}
-    | (list{}, _) => list{}
-    | (list{(c1, c2), ...r}, list{(c1', c2'), ...r'}) =>
-      if c2 < c1' {
-        inter(r, l')
-      } else if c2' < c1 {
-        inter(l, r')
-      } else if c2 < c2' {
-        list{(max(c1, c1'), c2), ...inter(r, l')}
-      } else {
-        list{(max(c1, c1'), c2'), ...inter(l, r')}
-      }
-    }
-
-  let rec diff = (l, l') =>
-    switch (l, l') {
-    | (_, list{}) => l
-    | (list{}, _) => list{}
-    | (list{(c1, c2), ...r}, list{(c1', c2'), ...r'}) =>
-      if c2 < c1' {
-        list{(c1, c2), ...diff(r, l')}
-      } else if c2' < c1 {
-        diff(l, r')
-      } else {
-        let r'' = if c2' < c2 {
-          list{(c2' + 1, c2), ...r}
-        } else {
-          r
-        }
-        if c1 < c1' {
-          list{(c1, c1' - 1), ...diff(r'', r')}
-        } else {
-          diff(r'', r')
-        }
-      }
-    }
-
-  let single = c => list{(c, c)}
-
-  let add = (c, l) => union(single(c), l)
-
-  let seq = (c, c') =>
-    if c <= c' {
-      list{(c, c')}
-    } else {
-      list{(c', c)}
-    }
-
-  let rec offset = (o, l) =>
-    switch l {
-    | list{} => list{}
-    | list{(c1, c2), ...r} => list{(c1 + o, c2 + o), ...offset(o, r)}
-    }
-
-  let empty = list{}
-
-  let rec mem = (c: int, s) =>
-    switch s {
-    | list{} => false
-    | list{(c1, c2), ...rem} =>
-      if c <= c2 {
-        c >= c1
-      } else {
-        mem(c, rem)
-      }
-    }
-
-  /* ** */
-
-  type hash = int
-
-  let rec hash_rec = x =>
-    switch x {
-    | list{} => 0
-    | list{(i, j), ...r} => i + 13 * j + 257 * hash_rec(r)
-    }
-  let hash = l => land(hash_rec(l), 0x3FFFFFFF)
-
-  /* ** */
-
-  /* let%ignore pp = Re_fmt.list print_one */
-
-  let rec iter = (t, ~f) =>
-    switch t {
-    | list{} => ()
-    | list{(x, y), ...xs} =>
-      f(x, y)
-      iter(xs, ~f)
-    }
-
-  let one_char = x =>
-    switch x {
-    | list{(i, j)} if i == j => Some(i)
-    | _ => None
-    }
-
-  module CSetMap = Map.Make({
-    type t = (int, list<(int, int)>)
-    let compare = ((i, u), (j, v)) => {
-      let c = compare(i, j)
-      if c != 0 {
-        c
-      } else {
-        compare(u, v)
-      }
-    }
-  })
-
-  let fold_right = (t, ~init, ~f) => List.fold_right(f, t, init)
-
-  let csingle = c => single(Char.code(c))
-
-  let cany = list{(0, 255)}
-
-  let is_empty = x =>
-    switch x {
-    | list{} => true
-    | _ => false
-    }
-
-  let rec prepend = (s, x, l) =>
-    switch (s, l) {
-    | (list{}, _) => l
-    | (_r, list{}) => list{}
-    | (list{(_c, c'), ...r}, list{(list{(d, _d')}, _x'), ..._r'}) if c' < d => prepend(r, x, l)
-    | (list{(c, c'), ...r}, list{(list{(d, d')}, x'), ...r'}) =>
-      if c <= d {
-        if c' < d' {
-          list{
-            (list{(d, c')}, \"@"(x, x')),
-            ...prepend(r, x, list{(list{(c' + 1, d')}, x'), ...r'}),
-          }
-        } else {
-          list{(list{(d, d')}, \"@"(x, x')), ...prepend(s, x, r')}
-        }
-      } else if c > d' {
-        list{(list{(d, d')}, x'), ...prepend(s, x, r')}
-      } else {
-        list{(list{(d, c - 1)}, x'), ...prepend(s, x, list{(list{(c, d')}, x'), ...r'})}
-      }
-    | _ => assert(false)
-    }
-
-  let pick = x =>
-    switch x {
-    | list{} => invalid_arg("Re_cset.pick")
-    | list{(x, _), ..._} => x
-    }
-}
-module Re_automata: {
-  /*
-   RE - A regular expression library
-
-   Copyright (C) 2001 Jerome Vouillon
-   email: Jerome.Vouillon@pps.jussieu.fr
-
-   This library 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, with
-   linking exception; either version 2.1 of the License, or (at
-   your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   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 library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-  /* Regular expressions */
-
-  @ocaml.doc(" Categories represent the various kinds of characters that can be tested
-    by look-ahead and look-behind operations.
-
-    This is more restricted than Cset, but faster.
-")
-  module Category: {
-    type t
-    let \"++": (t, t) => t
-    let from_char: char => t
-
-    let inexistant: t
-    let letter: t
-    let not_letter: t
-    let newline: t
-    let lastnewline: t
-    let search_boundary: t
-  }
-
-  type mark = int
-
-  type sem = [#Longest | #Shortest | #First]
-  type rep_kind = [#Greedy | #Non_greedy]
-
-  module Pmark: {
-    type t = private int
-    let equal: (t, t) => bool
-    let compare: (t, t) => int
-    let gen: unit => t
-  }
-
-  type expr
-  let is_eps: expr => bool
-
-  type ids
-  let create_ids: unit => ids
-
-  let cst: (ids, Re_cset.t) => expr
-  let empty: ids => expr
-  let alt: (ids, list<expr>) => expr
-  let seq: (ids, sem, expr, expr) => expr
-  let eps: ids => expr
-  let rep: (ids, rep_kind, sem, expr) => expr
-  let mark: (ids, mark) => expr
-  let pmark: (ids, Pmark.t) => expr
-  let erase: (ids, mark, mark) => expr
-  let before: (ids, Category.t) => expr
-  let after: (ids, Category.t) => expr
-
-  let rename: (ids, expr) => expr
-
-  /* ** */
-
-  module PmarkSet: Set.S with type elt = Pmark.t
-
-  /* States of the automata */
-
-  type idx = int
-  module Marks: {
-    type t = {
-      marks: list<(mark, idx)>,
-      pmarks: PmarkSet.t,
-    }
-  }
-
-  module E: {
-    type t
-  }
-
-  type hash
-  type mark_infos = array<int>
-  type status = Failed | Match(mark_infos, PmarkSet.t) | Running
-
-  module State: {
-    type t = {
-      idx: idx,
-      category: Category.t,
-      desc: list<E.t>,
-      mutable status: option<status>,
-      hash: hash,
-    }
-    let dummy: t
-    let create: (Category.t, expr) => t
-    module Table: Hashtbl.S with type key = t
-  }
-
-  /* ** */
-
-  /* Computation of the states following a given state */
-
-  type working_area
-  let create_working_area: unit => working_area
-  let index_count: working_area => int
-
-  let delta: (working_area, Category.t, Re_cset.c, State.t) => State.t
-  let deriv: (
-    working_area,
-    Re_cset.t,
-    list<(Category.t, Re_cset.t)>,
-    State.t,
-  ) => list<(Re_cset.t, State.t)>
-
-  /* ** */
-
-  let status: State.t => status
-} = {
-  /*
-   RE - A regular expression library
-
-   Copyright (C) 2001 Jerome Vouillon
-   email: Jerome.Vouillon@pps.jussieu.fr
-
-   This library 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, with
-   linking exception; either version 2.1 of the License, or (at
-   your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   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 library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-  module Cset = Re_cset
-
-  type sem = [#Longest | #Shortest | #First]
-
-  type rep_kind = [#Greedy | #Non_greedy]
-
-  module Category: {
-    type t
-    let equal: (t, t) => bool
-    let compare: (t, t) => int
-
-    let to_int: t => int
-
-    let intersect: (t, t) => bool
-    let \"++": (t, t) => t
-    let from_char: char => t
-
-    let dummy: t
-    let inexistant: t
-    let letter: t
-    let not_letter: t
-    let newline: t
-    let lastnewline: t
-    let search_boundary: t
-  } = {
-    type t = int
-    let equal = (x: int, y: int) => x == y
-    let compare = (x: int, y: int) => compare(x, y)
-    let to_int = x => x
-
-    let intersect = (x, y) => land(x, y) != 0
-    let \"++" = (x, y) => lor(x, y)
-
-    let dummy = -1
-    let inexistant = 1
-    let letter = 2
-    let not_letter = 4
-    let newline = 8
-    let lastnewline = 16
-    let search_boundary = 32
-
-    let from_char = x =>
-      /* Should match [cword] definition */
-      switch x {
-      | 'a' .. 'z'
-      | 'A' .. 'Z'
-      | '0' .. '9'
-      | '_'
-      | 'ª'
-      | 'µ'
-      | 'º'
-      | 'À' .. 'Ö'
-      | 'Ø' .. 'ö'
-      | 'ø' .. 'ÿ' => letter
-      | '\n' => \"++"(not_letter, newline)
-      | _ => not_letter
-      }
-  }
-
-  type mark = int
-  type idx = int
-
-  module Pmark: {
-    type t = private int
-    let equal: (t, t) => bool
-    let compare: (t, t) => int
-    let gen: unit => t
-  } = {
-    type t = int
-    let equal = (x: int, y: int) => x == y
-    let compare = (x: int, y: int) => compare(x, y)
-    let r = ref(0)
-    let gen = () => {
-      incr(r)
-      r.contents
-    }
-  }
-
-  type rec expr = {id: int, def: def}
-
-  and def =
-    | Cst(Cset.t)
-    | Alt(list<expr>)
-    | Seq(sem, expr, expr)
-    | Eps
-    | Rep(rep_kind, sem, expr)
-    | Mark(int)
-    | Erase(int, int)
-    | Before(Category.t)
-    | After(Category.t)
-    | Pmark(Pmark.t)
-
-  module PmarkSet = Set.Make(Pmark)
-
-  let hash_combine = (h, accu) => accu * 65599 + h
-
-  module Marks = {
-    type t = {
-      marks: list<(int, int)>,
-      pmarks: PmarkSet.t,
-    }
-
-    let empty = {marks: list{}, pmarks: PmarkSet.empty}
-
-    let rec merge_marks_offset = (old, x) =>
-      switch x {
-      | list{} => old
-      | list{(i, v), ...rem} =>
-        let nw' = merge_marks_offset(List.remove_assq(i, old), rem)
-        if v == -2 {
-          nw'
-        } else {
-          list{(i, v), ...nw'}
-        }
-      }
-
-    let merge = (old, nw) => {
-      marks: merge_marks_offset(old.marks, nw.marks),
-      pmarks: PmarkSet.union(old.pmarks, nw.pmarks),
-    }
-
-    let rec hash_marks_offset = (l, accu) =>
-      switch l {
-      | list{} => accu
-      | list{(a, i), ...r} => hash_marks_offset(r, hash_combine(a, hash_combine(i, accu)))
-      }
-
-    let hash = (m, accu) => hash_marks_offset(m.marks, hash_combine(Hashtbl.hash(m.pmarks), accu))
-
-    let rec marks_set_idx = (idx, x) =>
-      switch x {
-      | list{(a, -1), ...rem} => list{(a, idx), ...marks_set_idx(idx, rem)}
-      | marks => marks
-      }
-
-    let marks_set_idx = (marks, idx) => {...marks, marks: marks_set_idx(idx, marks.marks)}
-  }
-
-  /* ** */
-
-  /* let%ignore rec pp ch e =
-  let open Re_fmt in
-  match e.def with
-    Cst l ->
-    sexp ch "cst" Cset.pp l;
-  | Alt l ->
-    sexp ch "alt" (list pp) l
-  | Seq (k, e, e') ->
-    sexp ch "seq" (triple pp_sem pp pp) (k, e, e')
-  | Eps ->
-    str ch "eps"
-  | Rep (_rk, k, e) ->
-    sexp ch "rep" (pair pp_sem pp) (k, e)
-  | Mark i ->
-    sexp ch "mark" int i
-  | Pmark i ->
-    sexp ch "pmark" int (i :> int)
-  | Erase (b, e) ->
-    sexp ch "erase" (pair int int) (b, e)
-  | Before c ->
-    sexp ch "before" Category.pp c
-  | After c ->
-    sexp ch "after" Category.pp c
-
- */
-  /* ** */
-
-  let rec first = (f, x) =>
-    switch x {
-    | list{} => None
-    | list{x, ...r} =>
-      switch f(x) {
-      | None => first(f, r)
-      | Some(_) as res => res
-      }
-    }
-
-  /* ** */
-
-  type ids = ref<int>
-  let create_ids = () => ref(0)
-
-  let eps_expr = {id: 0, def: Eps}
-
-  let mk_expr = (ids, def) => {
-    incr(ids)
-    {id: ids.contents, def}
-  }
-
-  let empty = ids => mk_expr(ids, Alt(list{}))
-
-  let cst = (ids, s) =>
-    if Re_cset.is_empty(s) {
-      empty(ids)
-    } else {
-      mk_expr(ids, Cst(s))
-    }
-
-  let alt = (ids, x) =>
-    switch x {
-    | list{} => empty(ids)
-    | list{c} => c
-    | l => mk_expr(ids, Alt(l))
-    }
-
-  let seq = (ids, kind, x, y) =>
-    switch (x.def, y.def) {
-    | (Alt(list{}), _) => x
-    | (_, Alt(list{})) => y
-    | (Eps, _) => y
-    | (_, Eps) if kind == #First => x
-    | _ => mk_expr(ids, Seq(kind, x, y))
-    }
-
-  let is_eps = expr =>
-    switch expr.def {
-    | Eps => true
-    | _ => false
-    }
-
-  let eps = ids => mk_expr(ids, Eps)
-
-  let rep = (ids, kind, sem, x) => mk_expr(ids, Rep(kind, sem, x))
-
-  let mark = (ids, m) => mk_expr(ids, Mark(m))
-
-  let pmark = (ids, i) => mk_expr(ids, Pmark(i))
-
-  let erase = (ids, m, m') => mk_expr(ids, Erase(m, m'))
-
-  let before = (ids, c) => mk_expr(ids, Before(c))
-
-  let after = (ids, c) => mk_expr(ids, After(c))
-
-  /* ** */
-
-  let rec rename = (ids, x) =>
-    switch x.def {
-    | Cst(_) | Eps | Mark(_) | Pmark(_) | Erase(_) | Before(_) | After(_) => mk_expr(ids, x.def)
-    | Alt(l) => mk_expr(ids, Alt(List.map(rename(ids), l)))
-    | Seq(k, y, z) => mk_expr(ids, Seq(k, rename(ids, y), rename(ids, z)))
-    | Rep(g, k, y) => mk_expr(ids, Rep(g, k, rename(ids, y)))
-    }
-
-  /* ** */
-
-  type hash = int
-  type mark_infos = array<int>
-  type status = Failed | Match(mark_infos, PmarkSet.t) | Running
-
-  module E = {
-    type rec t =
-      | TSeq(list<t>, expr, sem)
-      | TExp(Marks.t, expr)
-      | TMatch(Marks.t)
-
-    let rec equal = (l1, l2) =>
-      switch (l1, l2) {
-      | (list{}, list{}) => true
-      | (list{TSeq(l1', e1, _), ...r1}, list{TSeq(l2', e2, _), ...r2}) =>
-        e1.id == e2.id && (equal(l1', l2') && equal(r1, r2))
-      | (list{TExp(marks1, e1), ...r1}, list{TExp(marks2, e2), ...r2}) =>
-        e1.id == e2.id && (marks1 == marks2 && equal(r1, r2))
-      | (list{TMatch(marks1), ...r1}, list{TMatch(marks2), ...r2}) =>
-        marks1 == marks2 && equal(r1, r2)
-      | _ => false
-      }
-
-    let rec hash = (l, accu) =>
-      switch l {
-      | list{} => accu
-      | list{TSeq(l', e, _), ...r} =>
-        hash(r, hash_combine(0x172a1bce, hash_combine(e.id, hash(l', accu))))
-      | list{TExp(marks, e), ...r} =>
-        hash(r, hash_combine(0x2b4c0d77, hash_combine(e.id, Marks.hash(marks, accu))))
-      | list{TMatch(marks), ...r} => hash(r, hash_combine(0x1c205ad5, Marks.hash(marks, accu)))
-      }
-
-    let texp = (marks, x) => TExp(marks, x)
-
-    let tseq = (kind, x, y, rem) =>
-      switch x {
-      | list{} => rem
-      | list{TExp(marks, {def: Eps, _})} => list{TExp(marks, y), ...rem}
-      | _ => list{TSeq(x, y, kind), ...rem}
-      }
-  }
-
-  module State = {
-    type t = {
-      idx: idx,
-      category: Category.t,
-      desc: list<E.t>,
-      mutable status: option<status>,
-      hash: hash,
-    }
-
-    let dummy = {
-      idx: -1,
-      category: Category.dummy,
-      desc: list{},
-      status: None,
-      hash: -1,
-    }
-
-    let hash = (idx, cat, desc) =>
-      land(E.hash(desc, hash_combine(idx, hash_combine(Category.to_int(cat), 0))), 0x3FFFFFFF)
-
-    let mk = (idx, cat, desc) => {
-      idx,
-      category: cat,
-      desc,
-      status: None,
-      hash: hash(idx, cat, desc),
-    }
-
-    let create = (cat, e) => mk(0, cat, list{E.TExp(Marks.empty, e)})
-
-    let equal = (x, y) =>
-      (x.hash: int) == y.hash &&
-        ((x.idx: int) == y.idx &&
-        (Category.equal(x.category, y.category) && E.equal(x.desc, y.desc)))
-
-    let compare = (x, y) => {
-      let c = compare((x.hash: int), y.hash)
-      if c != 0 {
-        c
-      } else {
-        let c = Category.compare(x.category, y.category)
-        if c != 0 {
-          c
-        } else {
-          compare(x.desc, y.desc)
-        }
-      }
-    }
-
-    type t' = t
-    module Table = Hashtbl.Make({
-      type t = t'
-      let equal = equal
-      let hash = t => t.hash
-    })
-  }
-
-  /* *** Find a free index *** */
-
-  type working_area = ref<array<bool>>
-
-  let create_working_area = () => ref([false])
-
-  let index_count = w => Array.length(w.contents)
-
-  let reset_table = a => Array.fill(a, 0, Array.length(a), false)
-
-  let rec mark_used_indices = tbl =>
-    List.iter(x =>
-      switch x {
-      | E.TSeq(l, _, _) => mark_used_indices(tbl, l)
-      | E.TExp(marks, _)
-      | E.TMatch(marks) =>
-        List.iter(((_, i)) =>
-          if i >= 0 {
-            tbl[i] = true
-          }
-        , marks.Marks.marks)
-      }
-    )
-
-  let rec find_free = (tbl, idx, len) =>
-    if idx == len || !tbl[idx] {
-      idx
-    } else {
-      find_free(tbl, idx + 1, len)
-    }
-
-  let free_index = (tbl_ref, l) => {
-    let tbl = tbl_ref.contents
-    reset_table(tbl)
-    mark_used_indices(tbl, l)
-    let len = Array.length(tbl)
-    let idx = find_free(tbl, 0, len)
-    if idx == len {
-      tbl_ref := Array.make(2 * len, false)
-    }
-    idx
-  }
-
-  /* *** Computation of the next state *** */
-
-  let remove_matches = List.filter(x =>
-    switch x {
-    | E.TMatch(_) => false
-    | _ => true
-    }
-  )
-
-  let rec split_at_match_rec = (l', x) =>
-    switch x {
-    | list{} => assert(false)
-    | list{E.TMatch(_), ...r} => (List.rev(l'), remove_matches(r))
-    | list{x, ...r} => split_at_match_rec(list{x, ...l'}, r)
-    }
-
-  let split_at_match = l => split_at_match_rec(list{}, l)
-
-  let rec remove_duplicates = (prev, l, y) =>
-    switch l {
-    | list{} => (list{}, prev)
-    | list{E.TMatch(_) as x, ..._} => /* Truncate after first match */
-      (list{x}, prev)
-    | list{E.TSeq(l', x, kind), ...r} =>
-      let (l'', prev') = remove_duplicates(prev, l', x)
-      let (r', prev'') = remove_duplicates(prev', r, y)
-      (E.tseq(kind, l'', x, r'), prev'')
-    | list{E.TExp(_marks, {def: Eps, _}) as e, ...r} =>
-      if List.memq(y.id, prev) {
-        remove_duplicates(prev, r, y)
-      } else {
-        let (r', prev') = remove_duplicates(list{y.id, ...prev}, r, y)
-        (list{e, ...r'}, prev')
-      }
-    | list{E.TExp(_marks, x) as e, ...r} =>
-      if List.memq(x.id, prev) {
-        remove_duplicates(prev, r, y)
-      } else {
-        let (r', prev') = remove_duplicates(list{x.id, ...prev}, r, y)
-        (list{e, ...r'}, prev')
-      }
-    }
-
-  let rec set_idx = (idx, x) =>
-    switch x {
-    | list{} => list{}
-    | list{E.TMatch(marks), ...r} =>
-      list{E.TMatch(Marks.marks_set_idx(marks, idx)), ...set_idx(idx, r)}
-    | list{E.TSeq(l', x, kind), ...r} => list{E.TSeq(set_idx(idx, l'), x, kind), ...set_idx(idx, r)}
-    | list{E.TExp(marks, x), ...r} =>
-      list{E.TExp(Marks.marks_set_idx(marks, idx), x), ...set_idx(idx, r)}
-    }
-
-  let filter_marks = (b, e, marks) => {
-    ...marks,
-    Marks.marks: List.filter(((i, _)) => i < b || i > e, marks.Marks.marks),
-  }
-
-  let rec delta_1 = (marks, c, ~next_cat, ~prev_cat, x, rem) =>
-    switch x.def {
-    | Cst(s) =>
-      if Cset.mem(c, s) {
-        list{E.texp(marks, eps_expr), ...rem}
-      } else {
-        rem
-      }
-    | Alt(l) => delta_2(marks, c, ~next_cat, ~prev_cat, l, rem)
-    | Seq(kind, y, z) =>
-      let y' = delta_1(marks, c, ~next_cat, ~prev_cat, y, list{})
-      delta_seq(c, ~next_cat, ~prev_cat, kind, y', z, rem)
-    | Rep(rep_kind, kind, y) =>
-      let y' = delta_1(marks, c, ~next_cat, ~prev_cat, y, list{})
-      let (y'', marks') = switch first(x =>
-        switch x {
-        | E.TMatch(marks) => Some(marks)
-        | _ => None
-        }
-      , y') {
-      | None => (y', marks)
-      | Some(marks') => (remove_matches(y'), marks')
-      }
-
-      switch rep_kind {
-      | #Greedy => E.tseq(kind, y'', x, list{E.TMatch(marks'), ...rem})
-      | #Non_greedy => list{E.TMatch(marks), ...E.tseq(kind, y'', x, rem)}
-      }
-    | Eps => list{E.TMatch(marks), ...rem}
-    | Mark(i) =>
-      let marks = {...marks, Marks.marks: list{(i, -1), ...List.remove_assq(i, marks.Marks.marks)}}
-      list{E.TMatch(marks), ...rem}
-    | Pmark(i) =>
-      let marks = {...marks, Marks.pmarks: PmarkSet.add(i, marks.Marks.pmarks)}
-      list{E.TMatch(marks), ...rem}
-    | Erase(b, e) => list{E.TMatch(filter_marks(b, e, marks)), ...rem}
-    | Before(cat'') =>
-      if Category.intersect(next_cat, cat'') {
-        list{E.TMatch(marks), ...rem}
-      } else {
-        rem
-      }
-    | After(cat'') =>
-      if Category.intersect(prev_cat, cat'') {
-        list{E.TMatch(marks), ...rem}
-      } else {
-        rem
-      }
-    }
-
-  and delta_2 = (marks, c, ~next_cat, ~prev_cat, l, rem) =>
-    switch l {
-    | list{} => rem
-    | list{y, ...r} =>
-      delta_1(marks, c, ~next_cat, ~prev_cat, y, delta_2(marks, c, ~next_cat, ~prev_cat, r, rem))
-    }
-
-  and delta_seq = (c, ~next_cat, ~prev_cat, kind, y, z, rem) =>
-    switch first(x =>
-      switch x {
-      | E.TMatch(marks) => Some(marks)
-      | _ => None
-      }
-    , y) {
-    | None => E.tseq(kind, y, z, rem)
-    | Some(marks) =>
-      switch kind {
-      | #Longest =>
-        E.tseq(kind, remove_matches(y), z, delta_1(marks, c, ~next_cat, ~prev_cat, z, rem))
-      | #Shortest =>
-        delta_1(marks, c, ~next_cat, ~prev_cat, z, E.tseq(kind, remove_matches(y), z, rem))
-      | #First =>
-        let (y', y'') = split_at_match(y)
-        E.tseq(kind, y', z, delta_1(marks, c, ~next_cat, ~prev_cat, z, E.tseq(kind, y'', z, rem)))
-      }
-    }
-
-  let rec delta_3 = (c, ~next_cat, ~prev_cat, x, rem) =>
-    switch x {
-    | E.TSeq(y, z, kind) =>
-      let y' = delta_4(c, ~next_cat, ~prev_cat, y, list{})
-      delta_seq(c, ~next_cat, ~prev_cat, kind, y', z, rem)
-    | E.TExp(marks, e) => delta_1(marks, c, ~next_cat, ~prev_cat, e, rem)
-    | E.TMatch(_) => list{x, ...rem}
-    }
-
-  and delta_4 = (c, ~next_cat, ~prev_cat, l, rem) =>
-    switch l {
-    | list{} => rem
-    | list{y, ...r} => delta_3(c, ~next_cat, ~prev_cat, y, delta_4(c, ~next_cat, ~prev_cat, r, rem))
-    }
-
-  let delta = (tbl_ref, next_cat, char, st) => {
-    let prev_cat = st.State.category
-    let (expr', _) = remove_duplicates(
-      list{},
-      delta_4(char, ~next_cat, ~prev_cat, st.State.desc, list{}),
-      eps_expr,
-    )
-    let idx = free_index(tbl_ref, expr')
-    let expr'' = set_idx(idx, expr')
-    State.mk(idx, next_cat, expr'')
-  }
-
-  /* ** */
-
-  let rec red_tr = x =>
-    switch x {
-    | (list{} | list{_}) as l => l
-    | list{(s1, st1) as tr1, (s2, st2) as tr2, ...rem} =>
-      if State.equal(st1, st2) {
-        red_tr(list{(Cset.union(s1, s2), st1), ...rem})
-      } else {
-        list{tr1, ...red_tr(list{tr2, ...rem})}
-      }
-    }
-
-  let simpl_tr = l =>
-    List.sort(
-      ((s1, _), (s2, _)) => compare(s1, s2),
-      red_tr(List.sort(((_, st1), (_, st2)) => State.compare(st1, st2), l)),
-    )
-
-  /* ** */
-
-  let prepend_deriv = List.fold_right(((s, x), l) => Cset.prepend(s, x, l))
-
-  let rec restrict = (s, x) =>
-    switch x {
-    | list{} => list{}
-    | list{(s', x'), ...rem} =>
-      let s'' = Cset.inter(s, s')
-      if Cset.is_empty(s'') {
-        restrict(s, rem)
-      } else {
-        list{(s'', x'), ...restrict(s, rem)}
-      }
-    }
-
-  let rec remove_marks = (b, e, rem) =>
-    if b > e {
-      rem
-    } else {
-      remove_marks(b, e - 1, list{(e, -2), ...rem})
-    }
-
-  let rec prepend_marks_expr = (m, x) =>
-    switch x {
-    | E.TSeq(l, e', s) => E.TSeq(prepend_marks_expr_lst(m, l), e', s)
-    | E.TExp(m', e') => E.TExp(Marks.merge(m, m'), e')
-    | E.TMatch(m') => E.TMatch(Marks.merge(m, m'))
-    }
-
-  and prepend_marks_expr_lst = (m, l) => List.map(prepend_marks_expr(m), l)
-
-  let prepend_marks = m => List.map(((s, x)) => (s, prepend_marks_expr_lst(m, x)))
-
-  let rec deriv_1 = (all_chars, categories, marks, cat, x, rem) =>
-    switch x.def {
-    | Cst(s) => Cset.prepend(s, list{E.texp(marks, eps_expr)}, rem)
-    | Alt(l) => deriv_2(all_chars, categories, marks, cat, l, rem)
-    | Seq(kind, y, z) =>
-      let y' = deriv_1(all_chars, categories, marks, cat, y, list{(all_chars, list{})})
-      deriv_seq(all_chars, categories, cat, kind, y', z, rem)
-    | Rep(rep_kind, kind, y) =>
-      let y' = deriv_1(all_chars, categories, marks, cat, y, list{(all_chars, list{})})
-      List.fold_right(((s, z), rem) => {
-        let (z', marks') = switch first(x =>
-          switch x {
-          | E.TMatch(marks) => Some(marks)
-          | _ => None
-          }
-        , z) {
-        | None => (z, marks)
-        | Some(marks') => (remove_matches(z), marks')
-        }
-
-        Cset.prepend(
-          s,
-          switch rep_kind {
-          | #Greedy => E.tseq(kind, z', x, list{E.TMatch(marks')})
-          | #Non_greedy => list{E.TMatch(marks), ...E.tseq(kind, z', x, list{})}
-          },
-          rem,
-        )
-      }, y', rem)
-    | Eps => Cset.prepend(all_chars, list{E.TMatch(marks)}, rem)
-    | Mark(i) =>
-      Cset.prepend(
-        all_chars,
-        list{
-          E.TMatch({
-            ...marks,
-            Marks.marks: list{(i, -1), ...List.remove_assq(i, marks.Marks.marks)},
-          }),
-        },
-        rem,
-      )
-    | Pmark(_) => Cset.prepend(all_chars, list{E.TMatch(marks)}, rem)
-    | Erase(b, e) =>
-      Cset.prepend(
-        all_chars,
-        list{
-          E.TMatch({
-            ...marks,
-            Marks.marks: remove_marks(b, e, filter_marks(b, e, marks).Marks.marks),
-          }),
-        },
-        rem,
-      )
-    | Before(cat') => Cset.prepend(List.assq(cat', categories), list{E.TMatch(marks)}, rem)
-    | After(cat') =>
-      if Category.intersect(cat, cat') {
-        Cset.prepend(all_chars, list{E.TMatch(marks)}, rem)
-      } else {
-        rem
-      }
-    }
-
-  and deriv_2 = (all_chars, categories, marks, cat, l, rem) =>
-    switch l {
-    | list{} => rem
-    | list{y, ...r} =>
-      deriv_1(
-        all_chars,
-        categories,
-        marks,
-        cat,
-        y,
-        deriv_2(all_chars, categories, marks, cat, r, rem),
-      )
-    }
-
-  and deriv_seq = (all_chars, categories, cat, kind, y, z, rem) =>
-    if List.exists(((_s, xl)) => List.exists(x =>
-        switch x {
-        | E.TMatch(_) => true
-        | _ => false
-        }
-      , xl), y) {
-      let z' = deriv_1(all_chars, categories, Marks.empty, cat, z, list{(all_chars, list{})})
-      List.fold_right(((s, y), rem) =>
-        switch first(x =>
-          switch x {
-          | E.TMatch(marks) => Some(marks)
-          | _ => None
-          }
-        , y) {
-        | None => Cset.prepend(s, E.tseq(kind, y, z, list{}), rem)
-        | Some(marks) =>
-          let z'' = prepend_marks(marks, z')
-          switch kind {
-          | #Longest =>
-            Cset.prepend(
-              s,
-              E.tseq(kind, remove_matches(y), z, list{}),
-              prepend_deriv(restrict(s, z''), rem),
-            )
-          | #Shortest =>
-            prepend_deriv(
-              restrict(s, z''),
-              Cset.prepend(s, E.tseq(kind, remove_matches(y), z, list{}), rem),
-            )
-          | #First =>
-            let (y', y'') = split_at_match(y)
-            Cset.prepend(
-              s,
-              E.tseq(kind, y', z, list{}),
-              prepend_deriv(restrict(s, z''), Cset.prepend(s, E.tseq(kind, y'', z, list{}), rem)),
-            )
-          }
-        }
-      , y, rem)
-    } else {
-      List.fold_right(((s, xl), rem) => Cset.prepend(s, E.tseq(kind, xl, z, list{}), rem), y, rem)
-    }
-
-  let rec deriv_3 = (all_chars, categories, cat, x, rem) =>
-    switch x {
-    | E.TSeq(y, z, kind) =>
-      let y' = deriv_4(all_chars, categories, cat, y, list{(all_chars, list{})})
-      deriv_seq(all_chars, categories, cat, kind, y', z, rem)
-    | E.TExp(marks, e) => deriv_1(all_chars, categories, marks, cat, e, rem)
-    | E.TMatch(_) => Cset.prepend(all_chars, list{x}, rem)
-    }
-
-  and deriv_4 = (all_chars, categories, cat, l, rem) =>
-    switch l {
-    | list{} => rem
-    | list{y, ...r} =>
-      deriv_3(all_chars, categories, cat, y, deriv_4(all_chars, categories, cat, r, rem))
-    }
-
-  let deriv = (tbl_ref, all_chars, categories, st) => {
-    let der = deriv_4(
-      all_chars,
-      categories,
-      st.State.category,
-      st.State.desc,
-      list{(all_chars, list{})},
-    )
-    simpl_tr(List.fold_right(((s, expr), rem) => {
-        let (expr', _) = remove_duplicates(list{}, expr, eps_expr)
-        let idx = free_index(tbl_ref, expr')
-        let expr'' = set_idx(idx, expr')
-        List.fold_right(((cat', s'), rem) => {
-          let s'' = Cset.inter(s, s')
-          if Cset.is_empty(s'') {
-            rem
-          } else {
-            list{(s'', State.mk(idx, cat', expr'')), ...rem}
-          }
-        }, categories, rem)
-      }, der, list{}))
-  }
-
-  /* ** */
-
-  let flatten_match = m => {
-    let ma = List.fold_left((ma, (i, _)) => max(ma, i), -1, m)
-    let res = Array.make(ma + 1, -1)
-    List.iter(((i, v)) => res[i] = v, m)
-    res
-  }
-
-  let status = s =>
-    switch s.State.status {
-    | Some(st) => st
-    | None =>
-      let st = switch s.State.desc {
-      | list{} => Failed
-      | list{E.TMatch(m), ..._} => Match(flatten_match(m.Marks.marks), m.Marks.pmarks)
-      | _ => Running
-      }
-
-      s.State.status = Some(st)
-      st
-    }
-}
-module Re: {
-  @@ocaml.text(
-    /*
-   RE - A regular expression library
-
-   Copyright (C) 2001 Jerome Vouillon
-   email: Jerome.Vouillon@pps.jussieu.fr
-
-   This library 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, with
-   linking exception; either version 2.1 of the License, or (at
-   your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   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 library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-    " Module [Re]: regular expressions commons "
-  )
-
-  @ocaml.doc(" Regular expression ")
-  type t
-
-  @ocaml.doc(" Compiled regular expression ")
-  type re
-
-  @ocaml.doc(" Information about groups in a match. ")
-  type groups
-
-  @@ocaml.text(" {2 Compilation and execution of a regular expression} ")
-
-  @ocaml.doc(" Compile a regular expression into an executable version that can be
-    used to match strings, e.g. with {!exec}. ")
-  let compile: t => re
-
-  @ocaml.doc(" [exec re str] matches [str] against the compiled expression [re],
-    and returns the matched groups if any.
-    @param pos optional beginning of the string (default 0)
-    @param len length of the substring of [str] that can be matched (default [-1],
-      meaning to the end of the string
-    @raise Not_found if the regular expression can't be found in [str]
-")
-  let exec: (
-    ~pos: int /* Default: 0 */=?,
-    ~len: int /* Default: -1 (until end of string) */=?,
-    re,
-    string,
-  ) => groups
-
-  @ocaml.doc(" Similar to {!exec}, but returns an option instead of using an exception. ")
-  let exec_opt: (
-    ~pos: int /* Default: 0 */=?,
-    ~len: int /* Default: -1 (until end of string) */=?,
-    re,
-    string,
-  ) => option<groups>
-
-  @ocaml.doc(" Similar to {!exec}, but returns [true] if the expression matches,
-    and [false] if it doesn't ")
-  let execp: (
-    ~pos: int /* Default: 0 */=?,
-    ~len: int /* Default: -1 (until end of string) */=?,
-    re,
-    string,
-  ) => bool
-
-  @ocaml.doc(" More detailed version of {!exec_p} ")
-  let exec_partial: (
-    ~pos: int /* Default: 0 */=?,
-    ~len: int /* Default: -1 (until end of string) */=?,
-    re,
-    string,
-  ) => [#Full | #Partial | #Mismatch]
-
-  @ocaml.doc(" Manipulate matching groups. ")
-  module Group: {
-    @ocaml.doc(" Information about groups in a match. ")
-    type t = groups
-
-    @ocaml.doc(" Raise [Not_found] if the group did not match ")
-    let get: (t, int) => string
-
-    @ocaml.doc(" Raise [Not_found] if the group did not match ")
-    let offset: (t, int) => (int, int)
-
-    @ocaml.doc(" Return the start of the match. Raise [Not_found] if the group did not match. ")
-    let start: (t, int) => int
-
-    @ocaml.doc(" Return the end of the match. Raise [Not_found] if the group did not match. ")
-    let stop: (t, int) => int
-
-    @ocaml.doc(" Return the empty string for each group which did not match ")
-    let all: t => array<string>
-
-    @ocaml.doc(" Return [(-1,-1)] for each group which did not match ")
-    let all_offset: t => array<(int, int)>
-
-    @ocaml.doc(" Test whether a group matched ")
-    let test: (t, int) => bool
-
-    @ocaml.doc(" Returns the total number of groups defined - matched or not.
-      This function is experimental. ")
-    let nb_groups: t => int
-
-    /* val pp : Format.formatter -> t -> unit */
-  }
-
-  @ocaml.doc(" Marks ")
-  module Mark: {
-    @ocaml.doc(" Mark id ")
-    type t
-
-    @ocaml.doc(" Tell if a mark was matched. ")
-    let test: (Group.t, t) => bool
-
-    module Set: Set.S with type elt = t
-
-    @ocaml.doc(" Return all the mark matched. ")
-    let all: Group.t => Set.t
-
-    let equal: (t, t) => bool
-    let compare: (t, t) => int
-  }
-
-  @@ocaml.text(" {2 High Level Operations} ")
-
-  type gen<'a> = unit => option<'a>
-
-  @ocaml.doc(" Repeatedly calls {!exec} on the given string, starting at given
-    position and length.")
-  let all: (~pos: int=?, ~len: int=?, re, string) => list<Group.t>
-
-  @ocaml.doc(" Same as {!all} but returns a generator ")
-  let all_gen: (~pos: int=?, ~len: int=?, re, string) => gen<Group.t>
-
-  @ocaml.doc(" Same as {!all}, but extracts the matched substring rather than
-    returning the whole group. This basically iterates over matched
-    strings ")
-  let matches: (~pos: int=?, ~len: int=?, re, string) => list<string>
-
-  @ocaml.doc(" Same as {!matches}, but returns a generator. ")
-  let matches_gen: (~pos: int=?, ~len: int=?, re, string) => gen<string>
-
-  @ocaml.doc(" [split re s] splits [s] into chunks separated by [re]. It yields
-    the chunks themselves, not the separator. For instance
-    this can be used with a whitespace-matching re such as [\"[\t ]+\"]. ")
-  let split: (~pos: int=?, ~len: int=?, re, string) => list<string>
-
-  let split_gen: (~pos: int=?, ~len: int=?, re, string) => gen<string>
-
-  type split_token = [
-    | @ocaml.doc(" Text between delimiters ") #Text(string)
-    | @ocaml.doc(" Delimiter ") #Delim(Group.t)
-  ]
-
-  let split_full: (~pos: int=?, ~len: int=?, re, string) => list<split_token>
-
-  let split_full_gen: (~pos: int=?, ~len: int=?, re, string) => gen<split_token>
-
-  @ocaml.doc(" [replace ~all re ~f s] iterates on [s], and replaces every occurrence
-    of [re] with [f substring] where [substring] is the current match.
-    If [all = false], then only the first occurrence of [re] is replaced. ")
-  let replace: (
-    ~pos: int=?,
-    ~len: int=?,
-    ~all: bool=?,
-    re,
-    ~f: Group.t => string /* how to replace */,
-    string,
-  ) => string
-
-  @ocaml.doc(" [replace_string ~all re ~by s] iterates on [s], and replaces every
-    occurrence of [re] with [by]. If [all = false], then only the first
-    occurrence of [re] is replaced. ")
-  let replace_string: (~pos: int=?, ~len: int=?, ~all: bool=?, re, ~by: string, string) => string
-
-  @@ocaml.text(" {2 String expressions (literal match)} ")
-
-  let str: string => t
-  let char: char => t
-
-  @@ocaml.text(" {2 Basic operations on regular expressions} ")
-
-  @ocaml.doc(" Alternative ")
-  let alt: list<t> => t
-
-  @ocaml.doc(" Sequence ")
-  let seq: list<t> => t
-
-  @ocaml.doc(" Match nothing ")
-  let empty: t
-
-  @ocaml.doc(" Empty word ")
-  let epsilon: t
-
-  @ocaml.doc(" 0 or more matches ")
-  let rep: t => t
-
-  @ocaml.doc(" 1 or more matches ")
-  let rep1: t => t
-
-  @ocaml.doc(" [repn re i j] matches [re] at least [i] times
-    and at most [j] times, bounds included.
-    [j = None] means no upper bound.
-")
-  let repn: (t, int, option<int>) => t
-
-  @ocaml.doc(" 0 or 1 matches ")
-  let opt: t => t
-
-  @@ocaml.text(" {2 String, line, word} ")
-
-  @ocaml.doc(" Beginning of line ")
-  let bol: t
-
-  @ocaml.doc(" End of line ")
-  let eol: t
-
-  @ocaml.doc(" Beginning of word ")
-  let bow: t
-
-  @ocaml.doc(" End of word ")
-  let eow: t
-
-  @ocaml.doc(" Beginning of string ")
-  let bos: t
-
-  @ocaml.doc(" End of string ")
-  let eos: t
-
-  @ocaml.doc(" Last end of line or end of string ")
-  let leol: t
-
-  @ocaml.doc(" Initial position ")
-  let start: t
-
-  @ocaml.doc(" Final position ")
-  let stop: t
-
-  @ocaml.doc(" Word ")
-  let word: t => t
-
-  @ocaml.doc(" Not at a word boundary ")
-  let not_boundary: t
-
-  @ocaml.doc(" Only matches the whole string ")
-  let whole_string: t => t
-
-  @@ocaml.text(" {2 Match semantics} ")
-
-  @ocaml.doc(" Longest match ")
-  let longest: t => t
-
-  @ocaml.doc(" Shortest match ")
-  let shortest: t => t
-
-  @ocaml.doc(" First match ")
-  let first: t => t
-
-  @@ocaml.text(" {2 Repeated match modifiers} ")
-
-  @ocaml.doc(" Greedy ")
-  let greedy: t => t
-
-  @ocaml.doc(" Non-greedy ")
-  let non_greedy: t => t
-
-  @@ocaml.text(" {2 Groups (or submatches)} ")
-
-  @ocaml.doc(" Delimit a group ")
-  let group: t => t
-
-  @ocaml.doc(" Remove all groups ")
-  let no_group: t => t
-
-  @ocaml.doc(" when matching against [nest e], only the group matching in the
-       last match of e will be considered as matching ")
-  let nest: t => t
-
-  @ocaml.doc(" Mark a regexp. the markid can then be used to know if this regexp was used. ")
-  let mark: t => (Mark.t, t)
-
-  @@ocaml.text(" {2 Character sets} ")
-
-  @ocaml.doc(" Any character of the string ")
-  let set: string => t
-
-  @ocaml.doc(" Character ranges ")
-  let rg: (char, char) => t
-
-  @ocaml.doc(" Intersection of character sets ")
-  let inter: list<t> => t
-
-  @ocaml.doc(" Difference of character sets ")
-  let diff: (t, t) => t
-
-  @ocaml.doc(" Complement of union ")
-  let compl: list<t> => t
-
-  @@ocaml.text(" {2 Predefined character sets} ")
-
-  @ocaml.doc(" Any character ")
-  let any: t
-
-  @ocaml.doc(" Any character but a newline ")
-  let notnl: t
-
-  let alnum: t
-  let wordc: t
-  let alpha: t
-  let ascii: t
-  let blank: t
-  let cntrl: t
-  let digit: t
-  let graph: t
-  let lower: t
-  let print: t
-  let punct: t
-  let space: t
-  let upper: t
-  let xdigit: t
-
-  @@ocaml.text(" {2 Case modifiers} ")
-
-  @ocaml.doc(" Case sensitive matching ")
-  let case: t => t
-
-  @ocaml.doc(" Case insensitive matching ")
-  let no_case: t => t
-
-  @@ocaml.text(
-    /* ** */
-
-    " {2 Internal debugging}  "
-  )
-
-  @@ocaml.text(
-    /* val pp : Format.formatter -> t -> unit */
-
-    /* val pp_re : Format.formatter -> re -> unit */
-
-    " Alias for {!pp_re}. Deprecated "
-  )
-  @@ocaml.text(
-    /* val print_re : Format.formatter -> re -> unit */
-
-    " {2 Experimental functions}. "
-  )
-
-  @ocaml.doc(" [witness r] generates a string [s] such that [execp (compile r) s] is
-    true ")
-  let witness: t => string
-
-  @@ocaml.text(" {2 Deprecated functions} ")
-
-  @ocaml.doc(" Alias for {!Group.t}. Deprecated ")
-  type substrings = Group.t
-
-  @ocaml.doc(" Same as {!Group.get}. Deprecated ")
-  let get: (Group.t, int) => string
-
-  @ocaml.doc(" Same as {!Group.offset}. Deprecated ")
-  let get_ofs: (Group.t, int) => (int, int)
-
-  @ocaml.doc(" Same as {!Group.all}. Deprecated ")
-  let get_all: Group.t => array<string>
-
-  @ocaml.doc(" Same as {!Group.all_offset}. Deprecated ")
-  let get_all_ofs: Group.t => array<(int, int)>
-
-  @ocaml.doc(" Same as {!Group.test}. Deprecated ")
-  let test: (Group.t, int) => bool
-
-  @ocaml.doc(" Alias for {!Mark.t}. Deprecated ")
-  type markid = Mark.t
-
-  @ocaml.doc(" Same as {!Mark.test}. Deprecated ")
-  let marked: (Group.t, Mark.t) => bool
-
-  @ocaml.doc(" Same as {!Mark.all}. Deprecated ")
-  let mark_set: Group.t => Mark.Set.t
-} = {
-  /*
-   RE - A regular expression library
-
-   Copyright (C) 2001 Jerome Vouillon
-   email: Jerome.Vouillon@pps.jussieu.fr
-
-   This library 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, with
-   linking exception; either version 2.1 of the License, or (at
-   your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   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 library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-  module Cset = Re_cset
-  module Automata = Re_automata
-  module MarkSet = Automata.PmarkSet
-  module Category = Automata.Category
-
-  let rec iter = (n, f, v) =>
-    if n == 0 {
-      v
-    } else {
-      iter(n - 1, f, f(v))
-    }
-
-  /* ** */
-
-  let unknown = -2
-  let break = -3
-
-  /* Result of a successful match. */
-  type groups = {
-    s: string,
-    /* Input string. Matched strings are substrings of s */
-    marks: Automata.mark_infos,
-    /* Mapping from group indices to positions in gpos. group i has positions 2*i
-     - 1, 2*i + 1 in gpos. If the group wasn't matched, then its corresponding
-     values in marks will be -1,-1 */
-    pmarks: MarkSet.t,
-    /* Marks positions. i.e. those marks created with Re.marks */
-    gpos: array<int>,
-    /* Group positions. Adjacent elements are (start, stop) of group match.
-     indexed by the values in marks. So group i in an re would be the substring:
-
-     start = t.gpos.(marks.(2*i)) - 1
-     stop = t.gpos.(marks.(2*i + 1)) - 1 */
-    gcount: int,
-    /* Number of groups the regular expression contains. Matched or not */
-  }
-
-  type match_info =
-    | Match(groups)
-    | Failed
-    | Running
-
-  type rec state = {
-    idx: int,
-    /* Index of the current position in the position table.
-       Not yet computed transitions point to a dummy state where
-       [idx] is set to [unknown];
-       If [idx] is set to [break] for states that either always
-       succeed or always fail. */
-    real_idx: int,
-    /* The real index, in case [idx] is set to [break] */
-    next: array<state>,
-    /* Transition table, indexed by color */
-    mutable final: list<(Category.t, (Automata.idx, Automata.status))>,
-    /* Mapping from the category of the next character to
-       - the index where the next position should be saved
-       - possibly, the list of marks (and the corresponding indices)
-         corresponding to the best match */
-    desc: Automata.State.t,
-    /* Description of this state of the automata */
-  }
-
-  /* Automata (compiled regular expression) */
-  type re = {
-    initial: Automata.expr,
-    /* The whole regular expression */
-    mutable initial_states: list<(Category.t, state)>,
-    /* Initial states, indexed by initial category */
-    cols: Bytes.t,
-    /* Color table */
-    col_repr: Bytes.t,
-    /* Table from colors to one character of this color */
-    ncol: int,
-    /* Number of colors. */
-    lnl: int,
-    /* Color of the last newline */
-    tbl: Automata.working_area,
-    /* Temporary table used to compute the first available index
-     when computing a new state */
-    states: Automata.State.Table.t<state>,
-    /* States of the deterministic automata */
-    group_count: int,
-    /* Number of groups in the regular expression */
-  }
-
-  /* let print_re = pp_re */
-
-  /* Information used during matching */
-  type info = {
-    re: re,
-    /* The automata */
-    i_cols: Bytes.t,
-    /* Color table ([x.i_cols = x.re.cols])
-     Shortcut used for performance reasons */
-    mutable positions: array<int>,
-    /* Array of mark positions
-     The mark are off by one for performance reasons */
-    pos: int,
-    /* Position where the match is started */
-    last: int,
-    /* Position where the match should stop */
-  }
-
-  /* ** */
-
-  let category = (re, c) =>
-    if c == -1 {
-      Category.inexistant
-    } /* Special category for the last newline */
-    else if c == re.lnl {
-      open Category
-      \"++"(\"++"(lastnewline, newline), not_letter)
-    } else {
-      Category.from_char(Bytes.get(re.col_repr, c))
-    }
-
-  /* ** */
-
-  let dummy_next = []
-
-  let unknown_state = {
-    idx: unknown,
-    real_idx: 0,
-    next: dummy_next,
-    final: list{},
-    desc: Automata.State.dummy,
-  }
-
-  let mk_state = (ncol, desc) => {
-    let break_state = switch Automata.status(desc) {
-    | Automata.Running => false
-    | Automata.Failed
-    | Automata.Match(_) => true
-    }
-
-    {
-      idx: if break_state {
-        break
-      } else {
-        desc.Automata.State.idx
-      },
-      real_idx: desc.Automata.State.idx,
-      next: if break_state {
-        dummy_next
-      } else {
-        Array.make(ncol, unknown_state)
-      },
-      final: list{},
-      desc,
-    }
-  }
-
-  let find_state = (re, desc) =>
-    try Automata.State.Table.find(re.states, desc) catch {
-    | Not_found =>
-      let st = mk_state(re.ncol, desc)
-      Automata.State.Table.add(re.states, desc, st)
-      st
-    }
-
-  /* *** Match with marks *** */
-
-  let delta = (info, cat, c, st) => {
-    let desc = Automata.delta(info.re.tbl, cat, c, st.desc)
-    let len = Array.length(info.positions)
-    if desc.Automata.State.idx == len && len > 0 {
-      let pos = info.positions
-      info.positions = Array.make(2 * len, 0)
-      Array.blit(pos, 0, info.positions, 0, len)
-    }
-    desc
-  }
-
-  let validate = (info, s: string, pos, st) => {
-    let c = Char.code(Bytes.get(info.i_cols, Char.code(String.get(s, pos))))
-    let cat = category(info.re, c)
-    let desc' = delta(info, cat, c, st)
-    let st' = find_state(info.re, desc')
-    st.next[c] = st'
-  }
-
-  /*
-let rec loop info s pos st =
-  if pos < info.last then
-    let st' = st.next.(Char.code info.i_cols.[Char.code s.[pos]]) in
-    let idx = st'.idx in
-    if idx >= 0 then begin
-      info.positions.(idx) <- pos;
-      loop info s (pos + 1) st'
-    end else if idx = break then begin
-      info.positions.(st'.real_idx) <- pos;
-      st'
-    end else begin (* Unknown *)
-      validate info s pos st;
-      loop info s pos st
-    end
-  else
-    st
-*/
-
-  let rec loop = (info, s: string, pos, st) =>
-    if pos < info.last {
-      let st' = st.next[Char.code(Bytes.get(info.i_cols, Char.code(String.get(s, pos))))]
-      loop2(info, s, pos, st, st')
-    } else {
-      st
-    }
-
-  and loop2 = (info, s, pos, st, st') =>
-    if st'.idx >= 0 {
-      let pos = pos + 1
-      if pos < info.last {
-        /* It is important to place these reads before the write */
-        /* But then, we don't have enough registers left to store the
-         right position.  So, we store the position plus one. */
-        let st'' = st'.next[Char.code(Bytes.get(info.i_cols, Char.code(String.get(s, pos))))]
-        info.positions[st'.idx] = pos
-        loop2(info, s, pos, st', st'')
-      } else {
-        info.positions[st'.idx] = pos
-        st'
-      }
-    } else if st'.idx == break {
-      info.positions[st'.real_idx] = pos + 1
-      st'
-    } else {
-      /* Unknown */
-      validate(info, s, pos, st)
-      loop(info, s, pos, st)
-    }
-
-  let rec loop_no_mark = (info, s, pos, last, st) =>
-    if pos < last {
-      let st' = st.next[Char.code(Bytes.get(info.i_cols, Char.code(String.get(s, pos))))]
-      if st'.idx >= 0 {
-        loop_no_mark(info, s, pos + 1, last, st')
-      } else if st'.idx == break {
-        st'
-      } else {
-        /* Unknown */
-        validate(info, s, pos, st)
-        loop_no_mark(info, s, pos, last, st)
-      }
-    } else {
-      st
-    }
-
-  let final = (info, st, cat) =>
-    try List.assq(cat, st.final) catch {
-    | Not_found =>
-      let st' = delta(info, cat, -1, st)
-      let res = (st'.Automata.State.idx, Automata.status(st'))
-      st.final = list{(cat, res), ...st.final}
-      res
-    }
-
-  let find_initial_state = (re, cat) =>
-    try List.assq(cat, re.initial_states) catch {
-    | Not_found =>
-      let st = find_state(re, Automata.State.create(cat, re.initial))
-      re.initial_states = list{(cat, st), ...re.initial_states}
-      st
-    }
-
-  let get_color = (re, s: string, pos) =>
-    if pos < 0 {
-      -1
-    } else {
-      let slen = String.length(s)
-      if pos >= slen {
-        -1
-      } else if pos == slen - 1 && (re.lnl != -1 && String.get(s, pos) == '\n') {
-        /* Special case for the last newline */
-        re.lnl
-      } else {
-        Char.code(Bytes.get(re.cols, Char.code(String.get(s, pos))))
-      }
-    }
-
-  let rec handle_last_newline = (info, pos, st, groups) => {
-    let st' = st.next[info.re.lnl]
-    if st'.idx >= 0 {
-      if groups {
-        info.positions[st'.idx] = pos + 1
-      }
-      st'
-    } else if st'.idx == break {
-      if groups {
-        info.positions[st'.real_idx] = pos + 1
-      }
-      st'
-    } else {
-      /* Unknown */
-      let c = info.re.lnl
-      let real_c = Char.code(Bytes.get(info.i_cols, Char.code('\n')))
-      let cat = category(info.re, c)
-      let desc' = delta(info, cat, real_c, st)
-      let st' = find_state(info.re, desc')
-      st.next[c] = st'
-      handle_last_newline(info, pos, st, groups)
-    }
-  }
-
-  let rec scan_str = (info, s: string, initial_state, groups) => {
-    let pos = info.pos
-    let last = info.last
-    if (
-      last == String.length(s) &&
-        (info.re.lnl != -1 &&
-        (last > pos && String.get(s, last - 1) == '\n'))
-    ) {
-      let info = {...info, last: last - 1}
-      let st = scan_str(info, s, initial_state, groups)
-      if st.idx == break {
-        st
-      } else {
-        handle_last_newline(info, last - 1, st, groups)
-      }
-    } else if groups {
-      loop(info, s, pos, initial_state)
-    } else {
-      loop_no_mark(info, s, pos, last, initial_state)
-    }
-  }
-
-  let match_str = (~groups, ~partial, re, s, ~pos, ~len) => {
-    let slen = String.length(s)
-    let last = if len == -1 {
-      slen
-    } else {
-      pos + len
-    }
-    let info = {
-      re,
-      i_cols: re.cols,
-      pos,
-      last,
-      positions: if groups {
-        let n = Automata.index_count(re.tbl) + 1
-        if n <= 10 {
-          [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-        } else {
-          Array.make(n, 0)
-        }
-      } else {
-        []
-      },
-    }
-
-    let initial_cat = if pos == 0 {
-      open Category
-      \"++"(search_boundary, inexistant)
-    } else {
-      open Category
-      \"++"(search_boundary, category(re, get_color(re, s, pos - 1)))
-    }
-    let initial_state = find_initial_state(re, initial_cat)
-    let st = scan_str(info, s, initial_state, groups)
-    let res = if st.idx == break || partial {
-      Automata.status(st.desc)
-    } else {
-      let final_cat = if last == slen {
-        open Category
-        \"++"(search_boundary, inexistant)
-      } else {
-        open Category
-        \"++"(search_boundary, category(re, get_color(re, s, last)))
-      }
-      let (idx, res) = final(info, st, final_cat)
-      if groups {
-        info.positions[idx] = last + 1
-      }
-      res
-    }
-
-    switch res {
-    | Automata.Match(marks, pmarks) =>
-      Match({s, marks, pmarks, gpos: info.positions, gcount: re.group_count})
-    | Automata.Failed => Failed
-    | Automata.Running => Running
-    }
-  }
-
-  let mk_re = (init, cols, col_repr, ncol, lnl, group_count) => {
-    initial: init,
-    initial_states: list{},
-    cols,
-    col_repr,
-    ncol,
-    lnl,
-    tbl: Automata.create_working_area(),
-    states: Automata.State.Table.create(97),
-    group_count,
-  }
-
-  /* *** Character sets *** */
-
-  let cseq = (c, c') => Cset.seq(Char.code(c), Char.code(c'))
-  let cadd = (c, s) => Cset.add(Char.code(c), s)
-
-  let trans_set = (cache, cm, s) =>
-    switch Cset.one_char(s) {
-    | Some(i) => Cset.csingle(Bytes.get(cm, i))
-    | None =>
-      let v = (Cset.hash_rec(s), s)
-      try Cset.CSetMap.find(v, cache.contents) catch {
-      | Not_found =>
-        let l = Cset.fold_right(
-          s,
-          ~f=((i, j), l) => Cset.union(cseq(Bytes.get(cm, i), Bytes.get(cm, j)), l),
-          ~init=Cset.empty,
-        )
-
-        cache := Cset.CSetMap.add(v, l, cache.contents)
-        l
-      }
-    }
-
-  /* ** */
-
-  type rec regexp =
-    | Set(Cset.t)
-    | Sequence(list<regexp>)
-    | Alternative(list<regexp>)
-    | Repeat(regexp, int, option<int>)
-    | Beg_of_line
-    | End_of_line
-    | Beg_of_word
-    | End_of_word
-    | Not_bound
-    | Beg_of_str
-    | End_of_str
-    | Last_end_of_line
-    | Start
-    | Stop
-    | Sem(Automata.sem, regexp)
-    | Sem_greedy(Automata.rep_kind, regexp)
-    | Group(regexp)
-    | No_group(regexp)
-    | Nest(regexp)
-    | Case(regexp)
-    | No_case(regexp)
-    | Intersection(list<regexp>)
-    | Complement(list<regexp>)
-    | Difference(regexp, regexp)
-    | Pmark(Automata.Pmark.t, regexp)
-
-  /* let %ignore rec pp fmt t =
-  let open Re_fmt in
-  let var s re = sexp fmt s pp re in
-  let seq s rel = sexp fmt s (list pp) rel in
-  match t with
-  | Set s ->  sexp fmt "Set" Cset.pp s
-  | Sequence sq -> seq "Sequence" sq
-  | Alternative alt -> seq "Alternative" alt
-  | Repeat (re, start, stop) ->
-    let pp' fmt () = fprintf fmt "%a@ %d%a" pp re   start   optint stop in
-    sexp fmt "Repeat" pp' ()
-  | Beg_of_line      -> str fmt "Beg_of_line"
-  | End_of_line      -> str fmt "End_of_line"
-  | Beg_of_word      -> str fmt "Beg_of_word"
-  | End_of_word      -> str fmt "End_of_word"
-  | Not_bound        -> str fmt "Not_bound"
-  | Beg_of_str       -> str fmt "Beg_of_str"
-  | End_of_str       -> str fmt "End_of_str"
-  | Last_end_of_line -> str fmt "Last_end_of_line"
-  | Start            -> str fmt "Start"
-  | Stop             -> str fmt "Stop"
-  | Sem (sem, re)    ->
-    sexp fmt "Sem" (pair Automata.pp_sem pp) (sem, re)
-  | Sem_greedy (k, re) ->
-    sexp fmt "Sem_greedy" (pair Automata.pp_rep_kind pp) (k, re)
-  | Group c        -> var "Group" c
-  | No_group c     -> var "No_group" c
-  | Nest c         -> var "Nest" c
-  | Case c         -> var "Case" c
-  | No_case c      -> var "No_case" c
-  | Intersection c -> seq "Intersection" c
-  | Complement c   -> seq "Complement" c
-  | Difference (a, b) -> sexp fmt "Difference" (pair pp pp) (a, b)
-  | Pmark (m, r)      -> sexp fmt "Pmark" (pair Automata.Pmark.pp pp) (m, r)
- */
-  let rec is_charset = x =>
-    switch x {
-    | Set(_) => true
-    | Alternative(l) | Intersection(l) | Complement(l) => List.for_all(is_charset, l)
-    | Difference(r, r') => is_charset(r) && is_charset(r')
-    | Sem(_, r)
-    | Sem_greedy(_, r)
-    | No_group(r)
-    | Case(r)
-    | No_case(r) =>
-      is_charset(r)
-    | Sequence(_)
-    | Repeat(_)
-    | Beg_of_line
-    | End_of_line
-    | Beg_of_word
-    | End_of_word
-    | Beg_of_str
-    | End_of_str
-    | Not_bound
-    | Last_end_of_line
-    | Start
-    | Stop
-    | Group(_)
-    | Nest(_)
-    | Pmark(_, _) => false
-    }
-
-  /* *** Colormap *** */
-
-  /* XXX Use a better algorithm allowing non-contiguous regions? */
-  let split = (s, cm) =>
-    Re_cset.iter(s, ~f=(i, j) => {
-      Bytes.set(cm, i, '
')
-      Bytes.set(cm, j + 1, '
')
-    })
-
-  let cupper = Cset.union(cseq('A', 'Z'), Cset.union(cseq('À', 'Ö'), cseq('Ø', 'Þ')))
-  let clower = Cset.offset(32, cupper)
-  let calpha = List.fold_right(cadd, list{'ª', 'µ', 'º', 'ß', 'ÿ'}, Cset.union(clower, cupper))
-  let cdigit = cseq('0', '9')
-  let calnum = Cset.union(calpha, cdigit)
-  let cword = cadd('_', calnum)
-
-  let colorize = (c, regexp) => {
-    let lnl = ref(false)
-    let rec colorize = regexp =>
-      switch regexp {
-      | Set(s) => split(s, c)
-      | Sequence(l) => List.iter(colorize, l)
-      | Alternative(l) => List.iter(colorize, l)
-      | Repeat(r, _, _) => colorize(r)
-      | Beg_of_line | End_of_line => split(Cset.csingle('\n'), c)
-      | Beg_of_word
-      | End_of_word
-      | Not_bound =>
-        split(cword, c)
-      | Beg_of_str
-      | End_of_str
-      | Start
-      | Stop => ()
-      | Last_end_of_line => lnl := true
-      | Sem(_, r)
-      | Sem_greedy(_, r)
-      | Group(r)
-      | No_group(r)
-      | Nest(r)
-      | Pmark(_, r) =>
-        colorize(r)
-      | Case(_)
-      | No_case(_)
-      | Intersection(_)
-      | Complement(_)
-      | Difference(_) =>
-        assert(false)
-      }
-
-    colorize(regexp)
-    lnl.contents
-  }
-
-  let make_cmap = () => Bytes.make(257, '')
-
-  let flatten_cmap = cm => {
-    let c = Bytes.create(256)
-    let col_repr = Bytes.create(256)
-    let v = ref(0)
-    Bytes.set(c, 0, '')
-    Bytes.set(col_repr, 0, '')
-    for i in 1 to 255 {
-      if Bytes.get(cm, i) != '' {
-        incr(v)
-      }
-      Bytes.set(c, i, Char.chr(v.contents))
-      Bytes.set(col_repr, v.contents, Char.chr(i))
-    }
-    (c, Bytes.sub(col_repr, 0, v.contents + 1), v.contents + 1)
-  }
-
-  /* *** Compilation *** */
-
-  let rec equal = (x1, x2) =>
-    switch (x1, x2) {
-    | (Set(s1), Set(s2)) => s1 == s2
-    | (Sequence(l1), Sequence(l2)) => eq_list(l1, l2)
-    | (Alternative(l1), Alternative(l2)) => eq_list(l1, l2)
-    | (Repeat(x1', i1, j1), Repeat(x2', i2, j2)) => i1 == i2 && (j1 == j2 && equal(x1', x2'))
-    | (Beg_of_line, Beg_of_line)
-    | (End_of_line, End_of_line)
-    | (Beg_of_word, Beg_of_word)
-    | (End_of_word, End_of_word)
-    | (Not_bound, Not_bound)
-    | (Beg_of_str, Beg_of_str)
-    | (End_of_str, End_of_str)
-    | (Last_end_of_line, Last_end_of_line)
-    | (Start, Start)
-    | (Stop, Stop) => true
-    | (Sem(sem1, x1'), Sem(sem2, x2')) => sem1 == sem2 && equal(x1', x2')
-    | (Sem_greedy(k1, x1'), Sem_greedy(k2, x2')) => k1 == k2 && equal(x1', x2')
-    | (Group(_), Group(_)) => /* Do not merge groups! */
-      false
-    | (No_group(x1'), No_group(x2')) => equal(x1', x2')
-    | (Nest(x1'), Nest(x2')) => equal(x1', x2')
-    | (Case(x1'), Case(x2')) => equal(x1', x2')
-    | (No_case(x1'), No_case(x2')) => equal(x1', x2')
-    | (Intersection(l1), Intersection(l2)) => eq_list(l1, l2)
-    | (Complement(l1), Complement(l2)) => eq_list(l1, l2)
-    | (Difference(x1', x1''), Difference(x2', x2'')) => equal(x1', x2') && equal(x1'', x2'')
-    | (Pmark(m1, r1), Pmark(m2, r2)) => Automata.Pmark.equal(m1, m2) && equal(r1, r2)
-    | _ => false
-    }
-
-  and eq_list = (l1, l2) =>
-    switch (l1, l2) {
-    | (list{}, list{}) => true
-    | (list{x1, ...r1}, list{x2, ...r2}) => equal(x1, x2) && eq_list(r1, r2)
-    | _ => false
-    }
-
-  let sequence = x =>
-    switch x {
-    | list{x} => x
-    | l => Sequence(l)
-    }
-
-  let rec merge_sequences = x =>
-    switch x {
-    | list{} => list{}
-    | list{Alternative(l'), ...r} => merge_sequences(\"@"(l', r))
-    | list{Sequence(list{x, ...y}), ...r} =>
-      switch merge_sequences(r) {
-      | list{Sequence(list{x', ...y'}), ...r'} if equal(x, x') =>
-        list{Sequence(list{x, Alternative(list{sequence(y), sequence(y')})}), ...r'}
-      | r' => list{Sequence(list{x, ...y}), ...r'}
-      }
-    | list{x, ...r} => list{x, ...merge_sequences(r)}
-    }
-
-  module A = Automata
-
-  let enforce_kind = (ids, kind, kind', cr) =>
-    switch (kind, kind') {
-    | (#First, #First) => cr
-    | (#First, k) => A.seq(ids, k, cr, A.eps(ids))
-    | _ => cr
-    }
-
-  /* XXX should probably compute a category mask */
-  let rec translate = (ids, kind, ign_group, ign_case, greedy, pos, cache, c, x) =>
-    switch x {
-    | Set(s) => (A.cst(ids, trans_set(cache, c, s)), kind)
-    | Sequence(l) => (trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, l), kind)
-    | Alternative(l) =>
-      switch merge_sequences(l) {
-      | list{r'} =>
-        let (cr, kind') = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r')
-        (enforce_kind(ids, kind, kind', cr), kind)
-      | merged_sequences => (A.alt(ids, List.map(r' => {
-              let (cr, kind') = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r')
-              enforce_kind(ids, kind, kind', cr)
-            }, merged_sequences)), kind)
-      }
-    | Repeat(r', i, j) =>
-      let (cr, kind') = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r')
-      let rem = switch j {
-      | None => A.rep(ids, greedy, kind', cr)
-      | Some(j) =>
-        let f = switch greedy {
-        | #Greedy => rem => A.alt(ids, list{A.seq(ids, kind', A.rename(ids, cr), rem), A.eps(ids)})
-        | #Non_greedy =>
-          rem => A.alt(ids, list{A.eps(ids), A.seq(ids, kind', A.rename(ids, cr), rem)})
-        }
-
-        iter(j - i, f, A.eps(ids))
-      }
-
-      (iter(i, rem => A.seq(ids, kind', A.rename(ids, cr), rem), rem), kind)
-    | Beg_of_line => (
-        A.after(
-          ids,
-          {
-            open Category
-            \"++"(inexistant, newline)
-          },
-        ),
-        kind,
-      )
-    | End_of_line => (
-        A.before(
-          ids,
-          {
-            open Category
-            \"++"(inexistant, newline)
-          },
-        ),
-        kind,
-      )
-    | Beg_of_word => (
-        A.seq(
-          ids,
-          #First,
-          A.after(
-            ids,
-            {
-              open Category
-              \"++"(inexistant, not_letter)
-            },
-          ),
-          A.before(
-            ids,
-            {
-              open Category
-              \"++"(inexistant, letter)
-            },
-          ),
-        ),
-        kind,
-      )
-    | End_of_word => (
-        A.seq(
-          ids,
-          #First,
-          A.after(
-            ids,
-            {
-              open Category
-              \"++"(inexistant, letter)
-            },
-          ),
-          A.before(
-            ids,
-            {
-              open Category
-              \"++"(inexistant, not_letter)
-            },
-          ),
-        ),
-        kind,
-      )
-    | Not_bound => (
-        A.alt(
-          ids,
-          list{
-            A.seq(ids, #First, A.after(ids, Category.letter), A.before(ids, Category.letter)),
-            A.seq(ids, #First, A.after(ids, Category.letter), A.before(ids, Category.letter)),
-          },
-        ),
-        kind,
-      )
-    | Beg_of_str => (A.after(ids, Category.inexistant), kind)
-    | End_of_str => (A.before(ids, Category.inexistant), kind)
-    | Last_end_of_line => (
-        A.before(
-          ids,
-          {
-            open Category
-            \"++"(inexistant, lastnewline)
-          },
-        ),
-        kind,
-      )
-    | Start => (A.after(ids, Category.search_boundary), kind)
-    | Stop => (A.before(ids, Category.search_boundary), kind)
-    | Sem(kind', r') =>
-      let (cr, kind'') = translate(ids, kind', ign_group, ign_case, greedy, pos, cache, c, r')
-      (enforce_kind(ids, kind', kind'', cr), kind')
-    | Sem_greedy(greedy', r') =>
-      translate(ids, kind, ign_group, ign_case, greedy', pos, cache, c, r')
-    | Group(r') =>
-      if ign_group {
-        translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r')
-      } else {
-        let p = pos.contents
-        pos := pos.contents + 2
-        let (cr, kind') = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r')
-        (A.seq(ids, #First, A.mark(ids, p), A.seq(ids, #First, cr, A.mark(ids, p + 1))), kind')
-      }
-    | No_group(r') => translate(ids, kind, true, ign_case, greedy, pos, cache, c, r')
-    | Nest(r') =>
-      let b = pos.contents
-      let (cr, kind') = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r')
-
-      let e = pos.contents - 1
-      if e < b {
-        (cr, kind')
-      } else {
-        (A.seq(ids, #First, A.erase(ids, b, e), cr), kind')
-      }
-    | Difference(_) | Complement(_) | Intersection(_) | No_case(_) | Case(_) => assert(false)
-    | Pmark(i, r') =>
-      let (cr, kind') = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r')
-      (A.seq(ids, #First, A.pmark(ids, i), cr), kind')
-    }
-
-  and trans_seq = (ids, kind, ign_group, ign_case, greedy, pos, cache, c, x) =>
-    switch x {
-    | list{} => A.eps(ids)
-    | list{r} =>
-      let (cr', kind') = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r)
-      enforce_kind(ids, kind, kind', cr')
-    | list{r, ...rem} =>
-      let (cr', kind') = translate(ids, kind, ign_group, ign_case, greedy, pos, cache, c, r)
-      let cr'' = trans_seq(ids, kind, ign_group, ign_case, greedy, pos, cache, c, rem)
-      if A.is_eps(cr'') {
-        cr'
-      } else if A.is_eps(cr') {
-        cr''
-      } else {
-        A.seq(ids, kind', cr', cr'')
-      }
-    }
-
-  /* *** Case *** */
-
-  let case_insens = s =>
-    Cset.union(
-      s,
-      Cset.union(Cset.offset(32, Cset.inter(s, cupper)), Cset.offset(-32, Cset.inter(s, clower))),
-    )
-
-  let as_set = x =>
-    switch x {
-    | Set(s) => s
-    | _ => assert(false)
-    }
-
-  /* XXX Should split alternatives into (1) charsets and (2) more
-   complex regular expressions; alternative should therefore probably
-   be flatten here */
-  let rec handle_case = (ign_case, x) =>
-    switch x {
-    | Set(s) =>
-      Set(
-        if ign_case {
-          case_insens(s)
-        } else {
-          s
-        },
-      )
-    | Sequence(l) => Sequence(List.map(handle_case(ign_case), l))
-    | Alternative(l) =>
-      let l' = List.map(handle_case(ign_case), l)
-      if is_charset(Alternative(l')) {
-        Set(List.fold_left((s, r) => Cset.union(s, as_set(r)), Cset.empty, l'))
-      } else {
-        Alternative(l')
-      }
-    | Repeat(r, i, j) => Repeat(handle_case(ign_case, r), i, j)
-    | (Beg_of_line
-      | End_of_line
-      | Beg_of_word
-      | End_of_word
-      | Not_bound
-      | Beg_of_str
-      | End_of_str
-      | Last_end_of_line
-      | Start
-      | Stop) as r => r
-    | Sem(k, r) =>
-      let r' = handle_case(ign_case, r)
-      if is_charset(r') {
-        r'
-      } else {
-        Sem(k, r')
-      }
-    | Sem_greedy(k, r) =>
-      let r' = handle_case(ign_case, r)
-      if is_charset(r') {
-        r'
-      } else {
-        Sem_greedy(k, r')
-      }
-    | Group(r) => Group(handle_case(ign_case, r))
-    | No_group(r) =>
-      let r' = handle_case(ign_case, r)
-      if is_charset(r') {
-        r'
-      } else {
-        No_group(r')
-      }
-    | Nest(r) =>
-      let r' = handle_case(ign_case, r)
-      if is_charset(r') {
-        r'
-      } else {
-        Nest(r')
-      }
-    | Case(r) => handle_case(false, r)
-    | No_case(r) => handle_case(true, r)
-    | Intersection(l) =>
-      let l' = List.map(r => handle_case(ign_case, r), l)
-      Set(List.fold_left((s, r) => Cset.inter(s, as_set(r)), Cset.cany, l'))
-    | Complement(l) =>
-      let l' = List.map(r => handle_case(ign_case, r), l)
-      Set(Cset.diff(Cset.cany, List.fold_left((s, r) => Cset.union(s, as_set(r)), Cset.empty, l')))
-    | Difference(r, r') =>
-      Set(
-        Cset.inter(
-          as_set(handle_case(ign_case, r)),
-          Cset.diff(Cset.cany, as_set(handle_case(ign_case, r'))),
-        ),
-      )
-    | Pmark(i, r) => Pmark(i, handle_case(ign_case, r))
-    }
-
-  /* ** */
-
-  let compile_1 = regexp => {
-    let regexp = handle_case(false, regexp)
-    let c = make_cmap()
-    let need_lnl = colorize(c, regexp)
-    let (col, col_repr, ncol) = flatten_cmap(c)
-    let lnl = if need_lnl {
-      ncol
-    } else {
-      -1
-    }
-    let ncol = if need_lnl {
-      ncol + 1
-    } else {
-      ncol
-    }
-    let ids = A.create_ids()
-    let pos = ref(0)
-    let (r, kind) = translate(
-      ids,
-      #First,
-      false,
-      false,
-      #Greedy,
-      pos,
-      ref(Cset.CSetMap.empty),
-      col,
-      regexp,
-    )
-    let r = enforce_kind(ids, #First, kind, r)
-    /* Format.eprintf "<%d %d>@." !ids ncol; */
-    mk_re(r, col, col_repr, ncol, lnl, pos.contents / 2)
-  }
-
-  /* ** */
-
-  let rec anchored = x =>
-    switch x {
-    | Sequence(l) => List.exists(anchored, l)
-    | Alternative(l) => List.for_all(anchored, l)
-    | Repeat(r, i, _) => i > 0 && anchored(r)
-    | Set(_)
-    | Beg_of_line
-    | End_of_line
-    | Beg_of_word
-    | End_of_word
-    | Not_bound
-    | End_of_str
-    | Last_end_of_line
-    | Stop
-    | Intersection(_)
-    | Complement(_)
-    | Difference(_) => false
-    | Beg_of_str | Start => true
-    | Sem(_, r)
-    | Sem_greedy(_, r)
-    | Group(r)
-    | No_group(r)
-    | Nest(r)
-    | Case(r)
-    | No_case(r)
-    | Pmark(_, r) =>
-      anchored(r)
-    }
-
-  /* ** */
-
-  type t = regexp
-
-  let str = s => {
-    let l = ref(list{})
-    for i in String.length(s) - 1 downto 0 {
-      l := list{Set(Cset.csingle(String.get(s, i))), ...l.contents}
-    }
-    Sequence(l.contents)
-  }
-  let char = c => Set(Cset.csingle(c))
-
-  let alt = x =>
-    switch x {
-    | list{r} => r
-    | l => Alternative(l)
-    }
-  let seq = x =>
-    switch x {
-    | list{r} => r
-    | l => Sequence(l)
-    }
-
-  let empty = alt(list{})
-  let epsilon = seq(list{})
-  let repn = (r, i, j) => {
-    if i < 0 {
-      invalid_arg("Re.repn")
-    }
-    switch j {
-    | Some(j) if j < i => invalid_arg("Re.repn")
-    | _ => ()
-    }
-    Repeat(r, i, j)
-  }
-  let rep = r => repn(r, 0, None)
-  let rep1 = r => repn(r, 1, None)
-  let opt = r => repn(r, 0, Some(1))
-  let bol = Beg_of_line
-  let eol = End_of_line
-  let bow = Beg_of_word
-  let eow = End_of_word
-  let word = r => seq(list{bow, r, eow})
-  let not_boundary = Not_bound
-  let bos = Beg_of_str
-  let eos = End_of_str
-  let whole_string = r => seq(list{bos, r, eos})
-  let leol = Last_end_of_line
-  let start = Start
-  let stop = Stop
-  let longest = r => Sem(#Longest, r)
-  let shortest = r => Sem(#Shortest, r)
-  let first = r => Sem(#First, r)
-  let greedy = r => Sem_greedy(#Greedy, r)
-  let non_greedy = r => Sem_greedy(#Non_greedy, r)
-  let group = r => Group(r)
-  let no_group = r => No_group(r)
-  let nest = r => Nest(r)
-  let mark = r => {
-    let i = Automata.Pmark.gen()
-    (i, Pmark(i, r))
-  }
-
-  let set = str => {
-    let s = ref(Cset.empty)
-    for i in 0 to String.length(str) - 1 {
-      s := Cset.union(Cset.csingle(String.get(str, i)), s.contents)
-    }
-    Set(s.contents)
-  }
-
-  let rg = (c, c') => Set(cseq(c, c'))
-
-  let inter = l => {
-    let r = Intersection(l)
-    if is_charset(r) {
-      r
-    } else {
-      invalid_arg("Re.inter")
-    }
-  }
-
-  let compl = l => {
-    let r = Complement(l)
-    if is_charset(r) {
-      r
-    } else {
-      invalid_arg("Re.compl")
-    }
-  }
-
-  let diff = (r, r') => {
-    let r'' = Difference(r, r')
-    if is_charset(r'') {
-      r''
-    } else {
-      invalid_arg("Re.diff")
-    }
-  }
-
-  let any = Set(Cset.cany)
-  let notnl = Set(Cset.diff(Cset.cany, Cset.csingle('\n')))
-
-  let lower = alt(list{rg('a', 'z'), char('µ'), rg('ß', 'ö'), rg('ø', 'ÿ')})
-  let upper = alt(list{rg('A', 'Z'), rg('À', 'Ö'), rg('Ø', 'Þ')})
-  let alpha = alt(list{lower, upper, char('ª'), char('º')})
-  let digit = rg('0', '9')
-  let alnum = alt(list{alpha, digit})
-  let wordc = alt(list{alnum, char('_')})
-  let ascii = rg('', '')
-  let blank = set("\t ")
-  let cntrl = alt(list{rg('', ''), rg('', 'Ÿ')})
-  let graph = alt(list{rg('!', '~'), rg(' ', 'ÿ')})
-  let print = alt(list{rg(' ', '~'), rg(' ', 'ÿ')})
-  let punct = alt(list{
-    rg('!', '/'),
-    rg(':', '@'),
-    rg('[', '`'),
-    rg('{', '~'),
-    rg(' ', '©'),
-    rg('«', '´'),
-    rg('¶', '¹'),
-    rg('»', '¿'),
-    char('×'),
-    char('÷'),
-  })
-  let space = alt(list{char(' '), rg('\t', '\r')})
-  let xdigit = alt(list{digit, rg('a', 'f'), rg('A', 'F')})
-
-  let case = r => Case(r)
-  let no_case = r => No_case(r)
-
-  /* ** */
-
-  let compile = r =>
-    compile_1(
-      if anchored(r) {
-        group(r)
-      } else {
-        seq(list{shortest(rep(any)), group(r)})
-      },
-    )
-
-  let exec_internal = (name, ~pos=0, ~len=-1, ~groups, re, s) => {
-    if pos < 0 || (len < -1 || pos + len > String.length(s)) {
-      invalid_arg(name)
-    }
-    match_str(~groups, ~partial=false, re, s, ~pos, ~len)
-  }
-
-  let exec = (~pos=?, ~len=?, re, s) =>
-    switch exec_internal("Re.exec", ~pos?, ~len?, ~groups=true, re, s) {
-    | Match(substr) => substr
-    | _ => raise(Not_found)
-    }
-
-  let exec_opt = (~pos=?, ~len=?, re, s) =>
-    switch exec_internal("Re.exec_opt", ~pos?, ~len?, ~groups=true, re, s) {
-    | Match(substr) => Some(substr)
-    | _ => None
-    }
-
-  let execp = (~pos=?, ~len=?, re, s) =>
-    switch exec_internal(~groups=false, "Re.execp", ~pos?, ~len?, re, s) {
-    | Match(_substr) => true
-    | _ => false
-    }
-
-  let exec_partial = (~pos=?, ~len=?, re, s) =>
-    switch exec_internal(~groups=false, "Re.exec_partial", ~pos?, ~len?, re, s) {
-    | Match(_) => #Full
-    | Running => #Partial
-    | Failed => #Mismatch
-    }
-
-  module Group = {
-    type t = groups
-
-    let offset = (t, i) => {
-      if 2 * i + 1 >= Array.length(t.marks) {
-        raise(Not_found)
-      }
-      let m1 = t.marks[2 * i]
-      if m1 == -1 {
-        raise(Not_found)
-      }
-      let p1 = t.gpos[m1] - 1
-      let p2 = t.gpos[t.marks[2 * i + 1]] - 1
-      (p1, p2)
-    }
-
-    let get = (t, i) => {
-      let (p1, p2) = offset(t, i)
-      String.sub(t.s, p1, p2 - p1)
-    }
-
-    let start = (subs, i) => fst(offset(subs, i))
-
-    let stop = (subs, i) => snd(offset(subs, i))
-
-    let test = (t, i) =>
-      if 2 * i >= Array.length(t.marks) {
-        false
-      } else {
-        let idx = t.marks[2 * i]
-        idx != -1
-      }
-
-    let dummy_offset = (-1, -1)
-
-    let all_offset = t => {
-      let res = Array.make(t.gcount, dummy_offset)
-      for i in 0 to Array.length(t.marks) / 2 - 1 {
-        let m1 = t.marks[2 * i]
-        if m1 != -1 {
-          let p1 = t.gpos[m1]
-          let p2 = t.gpos[t.marks[2 * i + 1]]
-          res[i] = (p1 - 1, p2 - 1)
-        }
-      }
-      res
-    }
-
-    let dummy_string = ""
-
-    let all = t => {
-      let res = Array.make(t.gcount, dummy_string)
-      for i in 0 to Array.length(t.marks) / 2 - 1 {
-        let m1 = t.marks[2 * i]
-        if m1 != -1 {
-          let p1 = t.gpos[m1]
-          let p2 = t.gpos[t.marks[2 * i + 1]]
-          res[i] = String.sub(t.s, p1 - 1, p2 - p1)
-        }
-      }
-      res
-    }
-
-    /* let%ignore pp fmt t =
-    let matches =
-      let offsets = all_offset t in
-      let strs = all t in
-      Array.to_list (
-        Array.init (Array.length strs) (fun i -> strs.(i), offsets.(i))
-      ) in
-    let open Re_fmt in
-    let pp_match fmt (str, (start, stop)) =
-      fprintf fmt "@[(%s (%d %d))@]" str start stop in
-    sexp fmt "Group" (list pp_match) matches */
-
-    let nb_groups = t => t.gcount
-  }
-
-  module Mark = {
-    type t = Automata.Pmark.t
-
-    let test = ({pmarks, _}, p) => Automata.PmarkSet.mem(p, pmarks)
-
-    let all = s => s.pmarks
-
-    module Set = MarkSet
-
-    let equal = Automata.Pmark.equal
-
-    let compare = Automata.Pmark.compare
-  }
-
-  type gen<'a> = unit => option<'a>
-
-  let all_gen = (~pos=0, ~len=?, re, s) => {
-    if pos < 0 {
-      invalid_arg("Re.all")
-    }
-    /* index of the first position we do not consider.
-     !pos < limit is an invariant */
-    let limit = switch len {
-    | None => String.length(s)
-    | Some(l) =>
-      if l < 0 || pos + l > String.length(s) {
-        invalid_arg("Re.all")
-      }
-      pos + l
-    }
-
-    /* iterate on matches. When a match is found, search for the next
-     one just after its end */
-    let pos = ref(pos)
-    () =>
-      if pos.contents >= limit {
-        None /* no more matches */
-      } else {
-        switch match_str(
-          ~groups=true,
-          ~partial=false,
-          re,
-          s,
-          ~pos=pos.contents,
-          ~len=limit - pos.contents,
-        ) {
-        | Match(substr) =>
-          let (p1, p2) = Group.offset(substr, 0)
-          pos := if p1 == p2 {
-              p2 + 1
-            } else {
-              p2
-            }
-          Some(substr)
-        | Running
-        | Failed =>
-          None
-        }
-      }
-  }
-
-  let all = (~pos=?, ~len=?, re, s) => {
-    let l = ref(list{})
-    let g = all_gen(~pos?, ~len?, re, s)
-    let rec iter = () =>
-      switch g() {
-      | None => List.rev(l.contents)
-      | Some(sub) =>
-        l := list{sub, ...l.contents}
-        iter()
-      }
-    iter()
-  }
-
-  let matches_gen = (~pos=?, ~len=?, re, s) => {
-    let g = all_gen(~pos?, ~len?, re, s)
-    () =>
-      switch g() {
-      | None => None
-      | Some(sub) => Some(Group.get(sub, 0))
-      }
-  }
-
-  let matches = (~pos=?, ~len=?, re, s) => {
-    let l = ref(list{})
-    let g = all_gen(~pos?, ~len?, re, s)
-    let rec iter = () =>
-      switch g() {
-      | None => List.rev(l.contents)
-      | Some(sub) =>
-        l := list{Group.get(sub, 0), ...l.contents}
-        iter()
-      }
-    iter()
-  }
-
-  type split_token = [
-    | #Text(string)
-    | #Delim(groups)
-  ]
-
-  let split_full_gen = (~pos=0, ~len=?, re, s) => {
-    if pos < 0 {
-      invalid_arg("Re.split")
-    }
-    let limit = switch len {
-    | None => String.length(s)
-    | Some(l) =>
-      if l < 0 || pos + l > String.length(s) {
-        invalid_arg("Re.split")
-      }
-      pos + l
-    }
-
-    /* i: start of delimited string
-     pos: first position after last match of [re]
-     limit: first index we ignore (!pos < limit is an invariant) */
-    let pos0 = pos
-    let state = ref(#Idle)
-    let i = ref(pos) and pos = ref(pos)
-    let next = () =>
-      switch state.contents {
-      | #Idle if pos.contents >= limit =>
-        if i.contents < limit {
-          let sub = String.sub(s, i.contents, limit - i.contents)
-          incr(i)
-          Some(#Text(sub))
-        } else {
-          None
-        }
-      | #Idle =>
-        switch match_str(
-          ~groups=true,
-          ~partial=false,
-          re,
-          s,
-          ~pos=pos.contents,
-          ~len=limit - pos.contents,
-        ) {
-        | Match(substr) =>
-          let (p1, p2) = Group.offset(substr, 0)
-          pos := if p1 == p2 {
-              p2 + 1
-            } else {
-              p2
-            }
-          let old_i = i.contents
-          i := p2
-          if p1 > pos0 {
-            /* string does not start by a delimiter */
-            let text = String.sub(s, old_i, p1 - old_i)
-            state := #Yield(#Delim(substr))
-            Some(#Text(text))
-          } else {
-            Some(#Delim(substr))
-          }
-        | Running => None
-        | Failed =>
-          if i.contents < limit {
-            let text = String.sub(s, i.contents, limit - i.contents)
-            i := limit
-            Some(#Text(text)) /* yield last string */
-          } else {
-            None
-          }
-        }
-      | #Yield(x) =>
-        state := #Idle
-        Some(x)
-      }
-    next
-  }
-
-  let split_full = (~pos=?, ~len=?, re, s) => {
-    let l = ref(list{})
-    let g = split_full_gen(~pos?, ~len?, re, s)
-    let rec iter = () =>
-      switch g() {
-      | None => List.rev(l.contents)
-      | Some(s) =>
-        l := list{s, ...l.contents}
-        iter()
-      }
-    iter()
-  }
-
-  let split_gen = (~pos=?, ~len=?, re, s) => {
-    let g = split_full_gen(~pos?, ~len?, re, s)
-    let rec next = () =>
-      switch g() {
-      | None => None
-      | Some(#Delim(_)) => next()
-      | Some(#Text(s)) => Some(s)
-      }
-    next
-  }
-
-  let split = (~pos=?, ~len=?, re, s) => {
-    let l = ref(list{})
-    let g = split_full_gen(~pos?, ~len?, re, s)
-    let rec iter = () =>
-      switch g() {
-      | None => List.rev(l.contents)
-      | Some(#Delim(_)) => iter()
-      | Some(#Text(s)) =>
-        l := list{s, ...l.contents}
-        iter()
-      }
-    iter()
-  }
-
-  let replace = (~pos=0, ~len=?, ~all=true, re, ~f, s) => {
-    if pos < 0 {
-      invalid_arg("Re.replace")
-    }
-    let limit = switch len {
-    | None => String.length(s)
-    | Some(l) =>
-      if l < 0 || pos + l > String.length(s) {
-        invalid_arg("Re.replace")
-      }
-      pos + l
-    }
-
-    /* buffer into which we write the result */
-    let buf = Buffer.create(String.length(s))
-    /* iterate on matched substrings. */
-    let rec iter = pos =>
-      if pos < limit {
-        switch match_str(~groups=true, ~partial=false, re, s, ~pos, ~len=limit - pos) {
-        | Match(substr) =>
-          let (p1, p2) = Group.offset(substr, 0)
-          /* add string between previous match and current match */
-          Buffer.add_substring(buf, s, pos, p1 - pos)
-          /* what should we replace the matched group with? */
-          let replacing = f(substr)
-          Buffer.add_string(buf, replacing)
-          if all {
-            /* if we matched a non-char e.g. ^ we must manually advance by 1 */
-            iter(
-              if p1 == p2 {
-                /* a non char could be past the end of string. e.g. $ */
-                if p2 < limit {
-                  Buffer.add_char(buf, String.get(s, p2))
-                }
-                p2 + 1
-              } else {
-                p2
-              },
-            )
-          } else {
-            Buffer.add_substring(buf, s, p2, limit - p2)
-          }
-        | Running => ()
-        | Failed => Buffer.add_substring(buf, s, pos, limit - pos)
-        }
-      }
-
-    iter(pos)
-    Buffer.contents(buf)
-  }
-
-  let replace_string = (~pos=?, ~len=?, ~all=?, re, ~by, s) =>
-    replace(~pos?, ~len?, ~all?, re, s, ~f=_ => by)
-
-  let witness = t => {
-    let rec witness = x =>
-      switch x {
-      | Set(c) => String.make(1, Char.chr(Cset.pick(c)))
-      | Sequence(xs) => String.concat("", List.map(witness, xs))
-      | Alternative(list{x, ..._}) => witness(x)
-      | Alternative(list{}) => assert(false)
-      | Repeat(r, from, _to) =>
-        let w = witness(r)
-        let b = Buffer.create(String.length(w) * from)
-        for _i in 1 to from {
-          Buffer.add_string(b, w)
-        }
-        Buffer.contents(b)
-      | No_case(r) => witness(r)
-      | Intersection(_)
-      | Complement(_)
-      | Difference(_, _) =>
-        assert(false)
-      | Group(r)
-      | No_group(r)
-      | Nest(r)
-      | Sem(_, r)
-      | Pmark(_, r)
-      | Case(r)
-      | Sem_greedy(_, r) =>
-        witness(r)
-      | Beg_of_line
-      | End_of_line
-      | Beg_of_word
-      | End_of_word
-      | Not_bound
-      | Beg_of_str
-      | Last_end_of_line
-      | Start
-      | Stop
-      | End_of_str => ""
-      }
-    witness(handle_case(false, t))
-  }
-
-  @@ocaml.text(" {2 Deprecated functions} ")
-
-  type substrings = groups
-
-  let get = Group.get
-  let get_ofs = Group.offset
-  let get_all = Group.all
-  let get_all_ofs = Group.all_offset
-  let test = Group.test
-
-  type markid = Mark.t
-
-  let marked = Mark.test
-  let mark_set = Mark.all
-
-  /* ******************************** */
-
-  /*
-Information about the previous character:
-- does not exists
-- is a letter
-- is not a letter
-- is a newline
-- is last newline
-
-Beginning of word:
-- previous is not a letter or does not exist
-- current is a letter or does not exist
-
-End of word:
-- previous is a letter or does not exist
-- current is not a letter or does not exist
-
-Beginning of line:
-- previous is a newline or does not exist
-
-Beginning of buffer:
-- previous does not exist
-
-End of buffer
-- current does not exist
-
-End of line
-- current is a newline or does not exist
-*/
-
-  /*
-Rep: e = T,e | ()
-  - semantics of the comma (shortest/longest/first)
-  - semantics of the union (greedy/non-greedy)
-
-Bounded repetition
-  a{0,3} = (a,(a,a?)?)?
-*/
-}
-module Re_perl: {
-  @@ocaml.text(
-    /*
-   RE - A regular expression library
-
-   Copyright (C) 2001 Jerome Vouillon
-   email: Jerome.Vouillon@pps.jussieu.fr
-
-   This library 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, with
-   linking exception; either version 2.1 of the License, or (at
-   your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   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 library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-    " Perl-style regular expressions "
-  )
-
-  exception Parse_error
-  @ocaml.doc(" Errors that can be raised during the parsing of the regular expression ")
-  exception Not_supported
-
-  type opt = [
-    | #Ungreedy
-    | #Dotall
-    | #Dollar_endonly
-    | #Multiline
-    | #Anchored
-    | #Caseless
-  ]
-
-  @ocaml.doc(" Parsing of a Perl-style regular expression ")
-  let re: (~opts: list<opt>=?, string) => Re.t
-
-  @ocaml.doc(" Regular expression compilation ")
-  let compile: Re.t => Re.re
-
-  @ocaml.doc(" (Same as [Re.compile]) ")
-  let compile_pat: (~opts: list<opt>=?, string) => Re.re
-} = {
-  /*
-   RE - A regular expression library
-
-   Copyright (C) 2001 Jerome Vouillon
-   email: Jerome.Vouillon@pps.jussieu.fr
-
-   This library 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, with
-   linking exception; either version 2.1 of the License, or (at
-   your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   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 library; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-  exception Parse_error
-  exception Not_supported
-
-  let posix_class_of_string = x =>
-    switch x {
-    | "alnum" => Re.alnum
-    | "ascii" => Re.ascii
-    | "blank" => Re.blank
-    | "cntrl" => Re.cntrl
-    | "digit" => Re.digit
-    | "lower" => Re.lower
-    | "print" => Re.print
-    | "space" => Re.space
-    | "upper" => Re.upper
-    | "word" => Re.wordc
-    | "punct" => Re.punct
-    | "graph" => Re.graph
-    | "xdigit" => Re.xdigit
-    | class_ => invalid_arg("Invalid pcre class: " ++ class_)
-    }
-
-  let posix_class_strings = list{
-    "alnum",
-    "ascii",
-    "blank",
-    "cntrl",
-    "digit",
-    "lower",
-    "print",
-    "space",
-    "upper",
-    "word",
-    "punct",
-    "graph",
-    "xdigit",
-  }
-
-  let parse = (multiline, dollar_endonly, dotall, ungreedy, s) => {
-    let i = ref(0)
-    let l = String.length(s)
-    let eos = () => i.contents == l
-    let test = c => !eos() && String.get(s, i.contents) == c
-    let accept = c => {
-      let r = test(c)
-      if r {
-        incr(i)
-      }
-      r
-    }
-    let accept_s = s' => {
-      let len = String.length(s')
-      try {
-        for j in 0 to len - 1 {
-          try if String.get(s', j) != String.get(s, i.contents + j) {
-            raise(Exit)
-          } catch {
-          | _ => raise(Exit)
-          }
-        }
-        i := i.contents + len
-        true
-      } catch {
-      | Exit => false
-      }
-    }
-    let get = () => {
-      let r = String.get(s, i.contents)
-      incr(i)
-      r
-    }
-    let unget = () => decr(i)
-    let greedy_mod = r => {
-      let gr = accept('?')
-      let gr = if ungreedy {
-        !gr
-      } else {
-        gr
-      }
-      if gr {
-        Re.non_greedy(r)
-      } else {
-        Re.greedy(r)
-      }
-    }
-
-    let rec regexp = () => regexp'(branch())
-    and regexp' = left =>
-      if accept('|') {
-        regexp'(Re.alt(list{left, branch()}))
-      } else {
-        left
-      }
-    and branch = () => branch'(list{})
-    and branch' = left =>
-      if eos() || (test('|') || test(')')) {
-        Re.seq(List.rev(left))
-      } else {
-        branch'(list{piece(), ...left})
-      }
-    and piece = () => {
-      let r = atom()
-      if accept('*') {
-        greedy_mod(Re.rep(r))
-      } else if accept('+') {
-        greedy_mod(Re.rep1(r))
-      } else if accept('?') {
-        greedy_mod(Re.opt(r))
-      } else if accept('{') {
-        switch integer() {
-        | Some(i) =>
-          let j = if accept(',') {
-            integer()
-          } else {
-            Some(i)
-          }
-          if !accept('}') {
-            raise(Parse_error)
-          }
-          switch j {
-          | Some(j) if j < i => raise(Parse_error)
-          | _ => ()
-          }
-          greedy_mod(Re.repn(r, i, j))
-        | None =>
-          unget()
-          r
-        }
-      } else {
-        r
-      }
-    }
-    and atom = () =>
-      if accept('.') {
-        if dotall {
-          Re.any
-        } else {
-          Re.notnl
-        }
-      } else if accept('(') {
-        if accept('?') {
-          if accept(':') {
-            let r = regexp()
-            if !accept(')') {
-              raise(Parse_error)
-            }
-            r
-          } else if accept('#') {
-            comment()
-          } else {
-            raise(Parse_error)
-          }
-        } else {
-          let r = regexp()
-          if !accept(')') {
-            raise(Parse_error)
-          }
-          Re.group(r)
-        }
-      } else if accept('^') {
-        if multiline {
-          Re.bol
-        } else {
-          Re.bos
-        }
-      } else if accept('$') {
-        if multiline {
-          Re.eol
-        } else if dollar_endonly {
-          Re.leol
-        } else {
-          Re.eos
-        }
-      } else if accept('[') {
-        if accept('^') {
-          Re.compl(bracket(list{}))
-        } else {
-          Re.alt(bracket(list{}))
-        }
-      } else if accept('\\') {
-        /* XXX
-   - Back-references
-   - \cx (control-x), \e, \f, \n, \r, \t, \xhh, \ddd
-*/
-        if eos() {
-          raise(Parse_error)
-        }
-        switch get() {
-        | 'w' => Re.alt(list{Re.alnum, Re.char('_')})
-        | 'W' => Re.compl(list{Re.alnum, Re.char('_')})
-        | 's' => Re.space
-        | 'S' => Re.compl(list{Re.space})
-        | 'd' => Re.digit
-        | 'D' => Re.compl(list{Re.digit})
-        | 'b' => Re.alt(list{Re.bow, Re.eow})
-        | 'B' => Re.not_boundary
-        | 'A' => Re.bos
-        | 'Z' => Re.leol
-        | 'z' => Re.eos
-        | 'G' => Re.start
-        | 'a' .. 'z' | 'A' .. 'Z' => raise(Parse_error)
-        | '0' .. '9' => raise(Not_supported)
-        | c => Re.char(c)
-        }
-      } else {
-        if eos() {
-          raise(Parse_error)
-        }
-        switch get() {
-        | '*' | '+' | '?' | '{' | '\\' => raise(Parse_error)
-        | c => Re.char(c)
-        }
-      }
-    and integer = () =>
-      if eos() {
-        None
-      } else {
-        switch get() {
-        | '0' .. '9' as d => integer'(Char.code(d) - Char.code('0'))
-        | _ =>
-          unget()
-          None
-        }
-      }
-    and integer' = i =>
-      if eos() {
-        Some(i)
-      } else {
-        switch get() {
-        | '0' .. '9' as d =>
-          let i' = 10 * i + (Char.code(d) - Char.code('0'))
-          if i' < i {
-            raise(Parse_error)
-          }
-          integer'(i')
-        | _ =>
-          unget()
-          Some(i)
-        }
-      }
-    and bracket = s =>
-      if s != list{} && accept(']') {
-        s
-      } else {
-        switch char() {
-        | #Char(c) =>
-          if accept('-') {
-            if accept(']') {
-              list{Re.char(c), Re.char('-'), ...s}
-            } else {
-              switch char() {
-              | #Char(c') => bracket(list{Re.rg(c, c'), ...s})
-              | #Set(st') => list{Re.char(c), Re.char('-'), st', ...s}
-              }
-            }
-          } else {
-            bracket(list{Re.char(c), ...s})
-          }
-        | #Set(st) => bracket(list{st, ...s})
-        }
-      }
-    and char = () => {
-      if eos() {
-        raise(Parse_error)
-      }
-      let c = get()
-      if c == '[' {
-        if accept('=') {
-          raise(Not_supported)
-        }
-        if accept(':') {
-          let compl = accept('^')
-          let cls = try List.find(accept_s, posix_class_strings) catch {
-          | Not_found => raise(Parse_error)
-          }
-          if !accept_s(":]") {
-            raise(Parse_error)
-          }
-          let re = {
-            let posix_class = posix_class_of_string(cls)
-            if compl {
-              Re.compl(list{posix_class})
-            } else {
-              posix_class
-            }
-          }
-          #Set(re)
-        } else if accept('.') {
-          if eos() {
-            raise(Parse_error)
-          }
-          let c = get()
-          if !accept('.') {
-            raise(Not_supported)
-          }
-          if !accept(']') {
-            raise(Parse_error)
-          }
-          #Char(c)
-        } else {
-          #Char(c)
-        }
-      } else if c == '\\' {
-        let c = get()
-        /* XXX
-   \127, ...
-*/
-        switch c {
-        | 'b' => #Char('\b')
-        | 'n' => #Char('\n') /* XXX */
-        | 'r' => #Char('\r') /* XXX */
-        | 't' => #Char('\t') /* XXX */
-        | 'w' => #Set(Re.alt(list{Re.alnum, Re.char('_')}))
-        | 'W' => #Set(Re.compl(list{Re.alnum, Re.char('_')}))
-        | 's' => #Set(Re.space)
-        | 'S' => #Set(Re.compl(list{Re.space}))
-        | 'd' => #Set(Re.digit)
-        | 'D' => #Set(Re.compl(list{Re.digit}))
-        | 'a' .. 'z' | 'A' .. 'Z' => raise(Parse_error)
-        | '0' .. '9' => raise(Not_supported)
-        | _ => #Char(c)
-        }
-      } else {
-        #Char(c)
-      }
-    }
-    and comment = () =>
-      if accept(')') {
-        Re.epsilon
-      } else {
-        incr(i)
-        comment()
-      }
-
-    let res = regexp()
-    if !eos() {
-      raise(Parse_error)
-    }
-    res
-  }
-
-  type opt = [
-    | #Ungreedy
-    | #Dotall
-    | #Dollar_endonly
-    | #Multiline
-    | #Anchored
-    | #Caseless
-  ]
-
-  let re = (~opts=list{}, s) => {
-    let r = parse(
-      List.memq(#Multiline, opts),
-      List.memq(#Dollar_endonly, opts),
-      List.memq(#Dotall, opts),
-      List.memq(#Ungreedy, opts),
-      s,
-    )
-
-    let r = if List.memq(#Anchored, opts) {
-      Re.seq(list{Re.start, r})
-    } else {
-      r
-    }
-    let r = if List.memq(#Caseless, opts) {
-      Re.no_case(r)
-    } else {
-      r
-    }
-    r
-  }
-
-  let compile = Re.compile
-  let compile_pat = (~opts=list{}, s) => compile(re(~opts, s))
-}
-module Re_pcre: {
-  type regexp = Re.re
-
-  type flag = [#CASELESS | #MULTILINE | #ANCHORED]
-
-  type groups = Re.groups
-
-  @ocaml.doc(" Result of a {!Pcre.full_split} ")
-  type split_result =
-    | @ocaml.doc(" Text part of splitted string ") Text(string)
-    | @ocaml.doc(" Delimiter part of splitted string ") Delim(string)
-    | @ocaml.doc(" Subgroup of matched delimiter (subgroup_nr, subgroup_str) ") Group(int, string)
-    | @ocaml.doc(" Unmatched subgroup ") NoGroup
-
-  @ocaml.doc(" [re ~flags s] creates the regexp [s] using the pcre syntax. ")
-  let re: (~flags: list<flag>=?, string) => Re.t
-
-  @ocaml.doc(" [re ~flags s] compiles the regexp [s] using the pcre syntax. ")
-  let regexp: (~flags: list<flag>=?, string) => regexp
-
-  @ocaml.doc(" [extract ~rex s] executes [rex] on [s] and returns the matching groups. ")
-  let extract: (~rex: regexp, string) => array<string>
-
-  @ocaml.doc(" Equivalent to {!Re.exec}. ")
-  let exec: (~rex: regexp, ~pos: int=?, string) => groups
-
-  @ocaml.doc(" Equivalent to {!Re.Group.get}. ")
-  let get_substring: (groups, int) => string
-
-  @ocaml.doc(" Equivalent to {!Re.Group.offset}. ")
-  let get_substring_ofs: (groups, int) => (int, int)
-
-  @ocaml.doc(" Equivalent to {!Re.execp}. ")
-  let pmatch: (~rex: regexp, string) => bool
-
-  let substitute: (~rex: Re.re, ~subst: string => string, string) => string
-
-  let full_split: (~max: int=?, ~rex: regexp, string) => list<split_result>
-
-  let split: (~rex: regexp, string) => list<string>
-
-  let quote: string => string
-
-  @@ocaml.text(" {2 Deprecated} ")
-
-  type substrings = Re.groups
-} = {
-  type regexp = Re.re
-
-  type flag = [#CASELESS | #MULTILINE | #ANCHORED]
-
-  type split_result =
-    | Text(string)
-    | Delim(string)
-    | Group(int, string)
-    | NoGroup
-
-  type groups = Re.groups
-
-  let re = (~flags=list{}, pat) => {
-    let opts = List.map(x =>
-      switch x {
-      | #CASELESS => #Caseless
-      | #MULTILINE => #Multiline
-      | #ANCHORED => #Anchored
-      }
-    , flags)
-    Re_perl.re(~opts, pat)
-  }
-
-  let regexp = (~flags=?, pat) => Re.compile(re(~flags?, pat))
-
-  let extract = (~rex, s) => Re.Group.all(Re.exec(rex, s))
-
-  let exec = (~rex, ~pos=?, s) => Re.exec(rex, ~pos?, s)
-
-  let get_substring = (s, i) => Re.Group.get(s, i)
-
-  let get_substring_ofs = (s, i) => Re.Group.offset(s, i)
-
-  let pmatch = (~rex, s) => Re.execp(rex, s)
-
-  let substitute = (~rex, ~subst, str) => {
-    let b = Buffer.create(1024)
-    let rec loop = pos =>
-      if pos >= String.length(str) {
-        Buffer.contents(b)
-      } else if Re.execp(~pos, rex, str) {
-        let ss = Re.exec(~pos, rex, str)
-        let (start, fin) = Re.Group.offset(ss, 0)
-        let pat = Re.Group.get(ss, 0)
-        Buffer.add_substring(b, str, pos, start - pos)
-        Buffer.add_string(b, subst(pat))
-        loop(fin)
-      } else {
-        Buffer.add_substring(b, str, pos, String.length(str) - pos)
-        loop(String.length(str))
-      }
-
-    loop(0)
-  }
-
-  let split = (~rex, str) => {
-    let rec loop = (accu, pos) =>
-      if pos >= String.length(str) {
-        List.rev(accu)
-      } else if Re.execp(~pos, rex, str) {
-        let ss = Re.exec(~pos, rex, str)
-        let (start, fin) = Re.Group.offset(ss, 0)
-        let s = String.sub(str, pos, start - pos)
-        loop(list{s, ...accu}, fin)
-      } else {
-        let s = String.sub(str, pos, String.length(str) - pos)
-        loop(list{s, ...accu}, String.length(str))
-      }
-    loop(list{}, 0)
-  }
-
-  /* From PCRE */
-  let string_unsafe_sub = (s, ofs, len) => {
-    let r = Bytes.create(len)
-    Bytes.blit(s, ofs, r, 0, len)
-    Bytes.unsafe_to_string(r)
-  }
-
-  let quote = s => {
-    let len = String.length(s)
-    let buf = Bytes.create(lsl(len, 1))
-    let pos = ref(0)
-    for i in 0 to len - 1 {
-      switch String.unsafe_get(s, i) {
-      | ('\\'
-        | '^'
-        | '$'
-        | '.'
-        | '['
-        | '|'
-        | '('
-        | ')'
-        | '?'
-        | '*'
-        | '+'
-        | '{') as c =>
-        Bytes.unsafe_set(buf, pos.contents, '\\')
-        incr(pos)
-        Bytes.unsafe_set(buf, pos.contents, c)
-        incr(pos)
-      | c =>
-        Bytes.unsafe_set(buf, pos.contents, c)
-        incr(pos)
-      }
-    }
-    string_unsafe_sub(buf, 0, pos.contents)
-  }
-
-  let full_split = (~max=0, ~rex, s) =>
-    if String.length(s) == 0 {
-      list{}
-    } else if max == 1 {
-      list{Text(s)}
-    } else {
-      let results = Re.split_full(rex, s)
-      let matches = List.map(x =>
-        switch x {
-        | #Text(s) => list{Text(s)}
-        | #Delim(d) =>
-          let matches = Re.Group.all_offset(d)
-          let delim = Re.Group.get(d, 0)
-          list{
-            Delim(delim),
-            ...{
-              let l = ref(list{})
-              for i in 1 to Array.length(matches) - 1 {
-                l :=
-                  list{
-                    if matches[i] == (-1, -1) {
-                      NoGroup
-                    } else {
-                      Group(i, Re.Group.get(d, i))
-                    },
-                    ...l.contents,
-                  }
-              }
-              List.rev(l.contents)
-            },
-          }
-        }
-      , results)
-      List.concat(matches)
-    }
-
-  type substrings = Re.groups
-}
-module Xx = {
-  let _ = {
-    let s = String.make(1024 * 1024 - 1, 'a') ++ "b"
-
-    eq(__LOC__, Re.get(Re_pcre.exec(~rex=Re_pcre.regexp("aa?b"), s), 0), "aab")
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/of_string_test.js b/jscomp/test/of_string_test.js
deleted file mode 100644
index a8cc421..0000000
--- a/jscomp/test/of_string_test.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-var suites_0 = [
-  "string_of_float_1",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: "10.",
-              _1: Pervasives.string_of_float(10)
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "string_of_int",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: "10",
-                _1: String(10)
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "valid_float_lexem",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: "10.",
-                  _1: Pervasives.valid_float_lexem("10")
-                };
-        })
-    ],
-    tl: /* [] */0
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Of_string_test", suites);
-
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/of_string_test.res b/jscomp/test/of_string_test.res
deleted file mode 100644
index 48d3bce..0000000
--- a/jscomp/test/of_string_test.res
+++ /dev/null
@@ -1,14 +0,0 @@
-let suites = {
-  open Mt
-  list{
-    ("string_of_float_1", _ => Eq("10.", string_of_float(10.))),
-    ("string_of_int", _ => Eq("10", string_of_int(10))),
-    /* Note that 
-     [valid_float_lexem] use Range pattern, so we have to use 
-     char as int now to make it passes the test 
- */
-    ("valid_float_lexem", _ => Eq("10.", valid_float_lexem("10"))),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/offset.js b/jscomp/test/offset.js
deleted file mode 100644
index 361b23e..0000000
--- a/jscomp/test/offset.js
+++ /dev/null
@@ -1,1018 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var $$String = require("../../lib/js/string.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, v, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  return {
-          TAG: "Node",
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, v, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, create(lr, v, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, v, rl), rv, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Set.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    return param;
-  }
-  if (c < 0) {
-    var ll = add(x, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, r);
-    }
-  }
-  var rr = add(x, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, rr);
-  }
-}
-
-function singleton(x) {
-  return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          r: "Empty",
-          h: 1
-        };
-}
-
-function add_min_element(x, param) {
-  if (typeof param !== "object") {
-    return singleton(x);
-  } else {
-    return bal(add_min_element(x, param.l), param.v, param.r);
-  }
-}
-
-function add_max_element(x, param) {
-  if (typeof param !== "object") {
-    return singleton(x);
-  } else {
-    return bal(param.l, param.v, add_max_element(x, param.r));
-  }
-}
-
-function join(l, v, r) {
-  if (typeof l !== "object") {
-    return add_min_element(v, r);
-  }
-  var lh = l.h;
-  if (typeof r !== "object") {
-    return add_max_element(v, l);
-  }
-  var rh = r.h;
-  if (lh > (rh + 2 | 0)) {
-    return bal(l.l, l.v, join(l.r, v, r));
-  } else if (rh > (lh + 2 | 0)) {
-    return bal(join(l, v, r.l), r.v, r.r);
-  } else {
-    return create(l, v, r);
-  }
-}
-
-function min_elt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return param.v;
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function min_elt_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return Caml_option.some(param.v);
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function max_elt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return param.v;
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function max_elt_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return Caml_option.some(param.v);
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function remove_min_elt(param) {
-  if (typeof param !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.remove_min_elt",
-          Error: new Error()
-        };
-  }
-  var l = param.l;
-  if (typeof l !== "object") {
-    return param.r;
-  } else {
-    return bal(remove_min_elt(l), param.v, param.r);
-  }
-}
-
-function concat(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  } else if (typeof t2 !== "object") {
-    return t1;
-  } else {
-    return join(t1, min_elt(t2), remove_min_elt(t2));
-  }
-}
-
-function split(x, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            false,
-            "Empty"
-          ];
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    return [
-            l,
-            true,
-            r
-          ];
-  }
-  if (c < 0) {
-    var match = split(x, l);
-    return [
-            match[0],
-            match[1],
-            join(match[2], v, r)
-          ];
-  }
-  var match$1 = split(x, r);
-  return [
-          join(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
-}
-
-function is_empty(param) {
-  if (typeof param !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function mem(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    var c = Caml.string_compare(x, param.v);
-    if (c === 0) {
-      return true;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function remove(x, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    if (typeof l !== "object") {
-      return r;
-    } else if (typeof r !== "object") {
-      return l;
-    } else {
-      return bal(l, min_elt(r), remove_min_elt(r));
-    }
-  }
-  if (c < 0) {
-    var ll = remove(x, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, r);
-    }
-  }
-  var rr = remove(x, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, rr);
-  }
-}
-
-function union(s1, s2) {
-  if (typeof s1 !== "object") {
-    return s2;
-  }
-  var h1 = s1.h;
-  var v1 = s1.v;
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var h2 = s2.h;
-  var v2 = s2.v;
-  if (h1 >= h2) {
-    if (h2 === 1) {
-      return add(v2, s1);
-    }
-    var match = split(v1, s2);
-    return join(union(s1.l, match[0]), v1, union(s1.r, match[2]));
-  }
-  if (h1 === 1) {
-    return add(v1, s2);
-  }
-  var match$1 = split(v2, s1);
-  return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r));
-}
-
-function inter(s1, s2) {
-  if (typeof s1 !== "object") {
-    return "Empty";
-  }
-  if (typeof s2 !== "object") {
-    return "Empty";
-  }
-  var r1 = s1.r;
-  var v1 = s1.v;
-  var l1 = s1.l;
-  var match = split(v1, s2);
-  var l2 = match[0];
-  if (match[1]) {
-    return join(inter(l1, l2), v1, inter(r1, match[2]));
-  } else {
-    return concat(inter(l1, l2), inter(r1, match[2]));
-  }
-}
-
-function diff(s1, s2) {
-  if (typeof s1 !== "object") {
-    return "Empty";
-  }
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var r1 = s1.r;
-  var v1 = s1.v;
-  var l1 = s1.l;
-  var match = split(v1, s2);
-  var l2 = match[0];
-  if (match[1]) {
-    return concat(diff(l1, l2), diff(r1, match[2]));
-  } else {
-    return join(diff(l1, l2), v1, diff(r1, match[2]));
-  }
-}
-
-function cons_enum(_s, _e) {
-  while(true) {
-    var e = _e;
-    var s = _s;
-    if (typeof s !== "object") {
-      return e;
-    }
-    _e = {
-      TAG: "More",
-      _0: s.v,
-      _1: s.r,
-      _2: e
-    };
-    _s = s.l;
-    continue ;
-  };
-}
-
-function compare(s1, s2) {
-  var _e1 = cons_enum(s1, "End");
-  var _e2 = cons_enum(s2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return 0;
-      } else {
-        return -1;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return 1;
-    }
-    var c = Caml.string_compare(e1._0, e2._0);
-    if (c !== 0) {
-      return c;
-    }
-    _e2 = cons_enum(e2._1, e2._2);
-    _e1 = cons_enum(e1._1, e1._2);
-    continue ;
-  };
-}
-
-function equal(s1, s2) {
-  return compare(s1, s2) === 0;
-}
-
-function subset(_s1, _s2) {
-  while(true) {
-    var s2 = _s2;
-    var s1 = _s1;
-    if (typeof s1 !== "object") {
-      return true;
-    }
-    var r1 = s1.r;
-    var v1 = s1.v;
-    var l1 = s1.l;
-    if (typeof s2 !== "object") {
-      return false;
-    }
-    var r2 = s2.r;
-    var l2 = s2.l;
-    var c = Caml.string_compare(v1, s2.v);
-    if (c === 0) {
-      if (!subset(l1, l2)) {
-        return false;
-      }
-      _s2 = r2;
-      _s1 = r1;
-      continue ;
-    }
-    if (c < 0) {
-      if (!subset({
-              TAG: "Node",
-              l: l1,
-              v: v1,
-              r: "Empty",
-              h: 0
-            }, l2)) {
-        return false;
-      }
-      _s1 = r1;
-      continue ;
-    }
-    if (!subset({
-            TAG: "Node",
-            l: "Empty",
-            v: v1,
-            r: r1,
-            h: 0
-          }, r2)) {
-      return false;
-    }
-    _s1 = l1;
-    continue ;
-  };
-}
-
-function iter(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    iter(f, param.l);
-    Curry._1(f, param.v);
-    _param = param.r;
-    continue ;
-  };
-}
-
-function fold(f, _s, _accu) {
-  while(true) {
-    var accu = _accu;
-    var s = _s;
-    if (typeof s !== "object") {
-      return accu;
-    }
-    _accu = Curry._2(f, s.v, fold(f, s.l, accu));
-    _s = s.r;
-    continue ;
-  };
-}
-
-function for_all(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return true;
-    }
-    if (!Curry._1(p, param.v)) {
-      return false;
-    }
-    if (!for_all(p, param.l)) {
-      return false;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function exists(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    if (Curry._1(p, param.v)) {
-      return true;
-    }
-    if (exists(p, param.l)) {
-      return true;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function filter(p, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var l$p = filter(p, l);
-  var pv = Curry._1(p, v);
-  var r$p = filter(p, r);
-  if (pv) {
-    if (l === l$p && r === r$p) {
-      return param;
-    } else {
-      return join(l$p, v, r$p);
-    }
-  } else {
-    return concat(l$p, r$p);
-  }
-}
-
-function partition(p, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            "Empty"
-          ];
-  }
-  var v = param.v;
-  var match = partition(p, param.l);
-  var lf = match[1];
-  var lt = match[0];
-  var pv = Curry._1(p, v);
-  var match$1 = partition(p, param.r);
-  var rf = match$1[1];
-  var rt = match$1[0];
-  if (pv) {
-    return [
-            join(lt, v, rt),
-            concat(lf, rf)
-          ];
-  } else {
-    return [
-            concat(lt, rt),
-            join(lf, v, rf)
-          ];
-  }
-}
-
-function cardinal(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0;
-  }
-}
-
-function elements_aux(_accu, _param) {
-  while(true) {
-    var param = _param;
-    var accu = _accu;
-    if (typeof param !== "object") {
-      return accu;
-    }
-    _param = param.l;
-    _accu = {
-      hd: param.v,
-      tl: elements_aux(accu, param.r)
-    };
-    continue ;
-  };
-}
-
-function elements(s) {
-  return elements_aux(/* [] */0, s);
-}
-
-function find(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    var c = Caml.string_compare(x, v);
-    if (c === 0) {
-      return v;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function find_first(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return v0;
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_first_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return Caml_option.some(v0);
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_last(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return v0;
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_last_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return Caml_option.some(v0);
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_opt(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    var c = Caml.string_compare(x, v);
-    if (c === 0) {
-      return Caml_option.some(v);
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function map(f, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var l$p = map(f, l);
-  var v$p = Curry._1(f, v);
-  var r$p = map(f, r);
-  if (l === l$p && v === v$p && r === r$p) {
-    return param;
-  } else if ((l$p === "Empty" || Caml.string_compare(max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Caml.string_compare(v$p, min_elt(r$p)) < 0)) {
-    return join(l$p, v$p, r$p);
-  } else {
-    return union(l$p, add(v$p, r$p));
-  }
-}
-
-function of_list(l) {
-  if (!l) {
-    return "Empty";
-  }
-  var match = l.tl;
-  var x0 = l.hd;
-  if (!match) {
-    return singleton(x0);
-  }
-  var match$1 = match.tl;
-  var x1 = match.hd;
-  if (!match$1) {
-    return add(x1, singleton(x0));
-  }
-  var match$2 = match$1.tl;
-  var x2 = match$1.hd;
-  if (!match$2) {
-    return add(x2, add(x1, singleton(x0)));
-  }
-  var match$3 = match$2.tl;
-  var x3 = match$2.hd;
-  if (match$3) {
-    if (match$3.tl) {
-      var l$1 = List.sort_uniq($$String.compare, l);
-      var sub = function (n, l) {
-        switch (n) {
-          case 0 :
-              return [
-                      "Empty",
-                      l
-                    ];
-          case 1 :
-              if (l) {
-                return [
-                        {
-                          TAG: "Node",
-                          l: "Empty",
-                          v: l.hd,
-                          r: "Empty",
-                          h: 1
-                        },
-                        l.tl
-                      ];
-              }
-              break;
-          case 2 :
-              if (l) {
-                var match = l.tl;
-                if (match) {
-                  return [
-                          {
-                            TAG: "Node",
-                            l: {
-                              TAG: "Node",
-                              l: "Empty",
-                              v: l.hd,
-                              r: "Empty",
-                              h: 1
-                            },
-                            v: match.hd,
-                            r: "Empty",
-                            h: 2
-                          },
-                          match.tl
-                        ];
-                }
-                
-              }
-              break;
-          case 3 :
-              if (l) {
-                var match$1 = l.tl;
-                if (match$1) {
-                  var match$2 = match$1.tl;
-                  if (match$2) {
-                    return [
-                            {
-                              TAG: "Node",
-                              l: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: l.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              v: match$1.hd,
-                              r: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: match$2.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              h: 2
-                            },
-                            match$2.tl
-                          ];
-                  }
-                  
-                }
-                
-              }
-              break;
-          default:
-            
-        }
-        var nl = n / 2 | 0;
-        var match$3 = sub(nl, l);
-        var l$1 = match$3[1];
-        if (l$1) {
-          var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
-          return [
-                  create(match$3[0], l$1.hd, match$4[0]),
-                  match$4[1]
-                ];
-        }
-        throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "set.res",
-                691,
-                20
-              ],
-              Error: new Error()
-            };
-      };
-      return sub(List.length(l$1), l$1)[0];
-    } else {
-      return add(match$3.hd, add(x3, add(x2, add(x1, singleton(x0)))));
-    }
-  } else {
-    return add(x3, add(x2, add(x1, singleton(x0))));
-  }
-}
-
-var $$Set = {
-  empty: "Empty",
-  is_empty: is_empty,
-  mem: mem,
-  add: add,
-  singleton: singleton,
-  remove: remove,
-  union: union,
-  inter: inter,
-  diff: diff,
-  compare: compare,
-  equal: equal,
-  subset: subset,
-  iter: iter,
-  map: map,
-  fold: fold,
-  for_all: for_all,
-  exists: exists,
-  filter: filter,
-  partition: partition,
-  cardinal: cardinal,
-  elements: elements,
-  min_elt: min_elt,
-  min_elt_opt: min_elt_opt,
-  max_elt: max_elt,
-  max_elt_opt: max_elt_opt,
-  choose: min_elt,
-  choose_opt: min_elt_opt,
-  split: split,
-  find: find,
-  find_opt: find_opt,
-  find_first: find_first,
-  find_first_opt: find_first_opt,
-  find_last: find_last,
-  find_last_opt: find_last_opt,
-  of_list: of_list
-};
-
-var M = {
-  x: 1,
-  $$Set: $$Set
-};
-
-var x = 1;
-
-exports.M = M;
-exports.x = x;
-exports.$$Set = $$Set;
-/* No side effect */
diff --git a/jscomp/test/offset.res b/jscomp/test/offset.res
deleted file mode 100644
index b775365..0000000
--- a/jscomp/test/offset.res
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Jacques Garrigue, Nagoya University */
-/*  */
-/* Copyright 2014 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
-/*  */
-/* ********************************************************************* */
-
-module M = {
-  type t = string
-
-  let x = 0
-  let x = 1
-
-  module Set = Set.Make(String)
-}
-
-include M
diff --git a/jscomp/test/omit_trailing_undefined_in_external_calls.js b/jscomp/test/omit_trailing_undefined_in_external_calls.js
deleted file mode 100644
index 12603d5..0000000
--- a/jscomp/test/omit_trailing_undefined_in_external_calls.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var SomeModule = require("SomeModule");
-
-SomeModule.formatDate(new Date());
-
-SomeModule.formatDate(new Date(), {
-      someOption: true
-    });
-
-SomeModule.formatDate(new Date(), undefined, true);
-
-(42).toString();
-
-var x = new RegExp("ab+c");
-
-exports.x = x;
-/*  Not a pure module */
diff --git a/jscomp/test/omit_trailing_undefined_in_external_calls.res b/jscomp/test/omit_trailing_undefined_in_external_calls.res
deleted file mode 100644
index 07b4ac6..0000000
--- a/jscomp/test/omit_trailing_undefined_in_external_calls.res
+++ /dev/null
@@ -1,19 +0,0 @@
-@@uncurried
-
-type dateFormatOptions = {someOption?: bool}
-
-@module("SomeModule")
-external formatDate: (Js.Date.t, ~options: dateFormatOptions=?, ~done: bool=?) => string =
-  "formatDate"
-
-let x = formatDate(Js.Date.make())
-let x = formatDate(Js.Date.make(), ~options={someOption: true})
-let x = formatDate(Js.Date.make(), ~done=true)
-
-@send external floatToString: (float, ~radix: int=?) => string = "toString"
-
-let x = floatToString(42.)
-
-@new external regExpFromString: (string, ~flags: string=?) => Js.Re.t = "RegExp"
-
-let x = regExpFromString("ab+c")
\ No newline at end of file
diff --git a/jscomp/test/option_encoding_test.js b/jscomp/test/option_encoding_test.js
deleted file mode 100644
index 20da98c..0000000
--- a/jscomp/test/option_encoding_test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var N = {};
-
-var u = [
-  undefined,
-  3
-];
-
-var h;
-
-exports.N = N;
-exports.u = u;
-exports.h = h;
-/* No side effect */
diff --git a/jscomp/test/option_encoding_test.res b/jscomp/test/option_encoding_test.res
deleted file mode 100644
index 3aec24a..0000000
--- a/jscomp/test/option_encoding_test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-@@config({
-  flags: [
-    "-w",
-    "@A",
-    /* "-drawlambda"; */
-    /* "-dtypedtree"; */
-    /* "-bs-diagnose"; */
-    /* "-dparsetree"; */
-    /* "-dsource"; */
-  ],
-})
-
-module N = {
-  type t<'a> = option<'a> =
-    | None
-    | Some('a)
-}
-
-let u = {
-  open N
-  (None, Some(3))
-}
-
-let h = N.None
diff --git a/jscomp/test/option_record_none_test.js b/jscomp/test/option_record_none_test.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/option_record_none_test.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/option_record_none_test.res b/jscomp/test/option_record_none_test.res
deleted file mode 100644
index 18d6704..0000000
--- a/jscomp/test/option_record_none_test.res
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-// type t0 = {
-//   x : int ,
-//   y : option<string>
-// }
-
-// let h = { x : 3 }
-// module N = {
-//   type c = option<string>
-// }
-
-// module Make = () => {
-//   type t<'a> = {
-//     x: int,
-//     @as("Y") y: option<string>,
-//     z: option<'a>,
-//     h: N.c,
-//   }
-// }
-
-// module N0 = Make()
-// open N0
-
-// let f = {
-//   x: 3,
-// }
diff --git a/jscomp/test/option_repr_test.js b/jscomp/test/option_repr_test.js
deleted file mode 100644
index a9cf2b9..0000000
--- a/jscomp/test/option_repr_test.js
+++ /dev/null
@@ -1,316 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Belt_List = require("../../lib/js/belt_List.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function b(loc, v) {
-  Mt.bool_suites(test_id, suites, loc, v);
-}
-
-function f0(x) {
-  var match = x[1];
-  if (match !== undefined && match) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function f1(u) {
-  if (typeof u !== "object") {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-function f2(x, y, zOpt, param) {
-  var z = zOpt !== undefined ? zOpt : 3;
-  console.log(x);
-  if (y !== undefined) {
-    return y + z | 0;
-  } else {
-    return 0;
-  }
-}
-
-function f3(x) {
-  if (x !== undefined) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-function f4(x) {
-  if (x !== undefined) {
-    return x + 1 | 0;
-  } else {
-    return 0;
-  }
-}
-
-function f5(a) {
-  return false;
-}
-
-function f6(a) {
-  return true;
-}
-
-var f10 = Caml_option.some(Caml_option.some(Caml_option.some(Caml_option.some(undefined))));
-
-var f11 = Caml_option.some(f10);
-
-var randomized = {
-  contents: false
-};
-
-function create(randomOpt, param) {
-  var random = randomOpt !== undefined ? randomOpt : randomized.contents;
-  if (random) {
-    return 2;
-  } else {
-    return 1;
-  }
-}
-
-var ff = create(false, undefined);
-
-function f13(xOpt, yOpt, param) {
-  var x = xOpt !== undefined ? xOpt : 3;
-  var y = yOpt !== undefined ? yOpt : 4;
-  return x + y | 0;
-}
-
-var a = f13(2, undefined, undefined);
-
-function f12(x) {
-  return x;
-}
-
-var length_8_id = Belt_List.makeBy(8, (function (x) {
-        return x;
-      }));
-
-var length_10_id = Belt_List.makeBy(10, (function (x) {
-        return x;
-      }));
-
-function f13$1(param) {
-  return Caml_obj.equal(Belt_List.take(length_10_id, 8), {
-              hd: 1,
-              tl: {
-                hd: 2,
-                tl: {
-                  hd: 3,
-                  tl: /* [] */0
-                }
-              }
-            });
-}
-
-b("File \"option_repr_test.res\", line 93, characters 4-11", Caml_obj.lessthan(undefined, null));
-
-b("File \"option_repr_test.res\", line 94, characters 4-11", !Caml_obj.greaterthan(undefined, null));
-
-b("File \"option_repr_test.res\", line 95, characters 4-11", Caml_obj.greaterthan(null, undefined));
-
-b("File \"option_repr_test.res\", line 96, characters 4-11", Caml_obj.lessthan(undefined, Caml_option.some(undefined)));
-
-b("File \"option_repr_test.res\", line 97, characters 4-11", Caml_obj.greaterthan(Caml_option.some(undefined), undefined));
-
-console.log(6, undefined);
-
-function ltx(a, b) {
-  if (Caml_obj.lessthan(a, b)) {
-    return Caml_obj.greaterthan(b, a);
-  } else {
-    return false;
-  }
-}
-
-function gtx(a, b) {
-  if (Caml_obj.greaterthan(a, b)) {
-    return Caml_obj.lessthan(b, a);
-  } else {
-    return false;
-  }
-}
-
-function eqx(a, b) {
-  if (Caml_obj.equal(a, b)) {
-    return Caml_obj.equal(b, a);
-  } else {
-    return false;
-  }
-}
-
-function neqx(a, b) {
-  if (Caml_obj.notequal(a, b)) {
-    return Caml_obj.notequal(b, a);
-  } else {
-    return false;
-  }
-}
-
-function all_true(xs) {
-  return Belt_List.every(xs, (function (x) {
-                return x;
-              }));
-}
-
-var xs_0 = gtx(Caml_option.some(null), Caml_option.some(undefined));
-
-var xs = {
-  hd: xs_0,
-  tl: /* [] */0
-};
-
-b("File \"option_repr_test.res\", line 125, characters 8-15", Belt_List.every(xs, (function (x) {
-            return x;
-          })));
-
-var xs_0$1 = ltx(Caml_option.some(undefined), 3);
-
-var xs_1 = {
-  hd: ltx(Caml_option.some(undefined), Caml_option.some(Caml_option.some(undefined))),
-  tl: {
-    hd: ltx(Caml_option.some(undefined), "3"),
-    tl: {
-      hd: ltx(Caml_option.some(undefined), true),
-      tl: {
-        hd: ltx(Caml_option.some(undefined), false),
-        tl: {
-          hd: ltx(false, true),
-          tl: {
-            hd: ltx(false, true),
-            tl: {
-              hd: ltx(undefined, Caml_option.some(undefined)),
-              tl: {
-                hd: ltx(undefined, null),
-                tl: {
-                  hd: ltx(undefined, (function (x) {
-                          return x;
-                        })),
-                  tl: {
-                    hd: ltx(null, 3),
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var xs$1 = {
-  hd: xs_0$1,
-  tl: xs_1
-};
-
-b("File \"option_repr_test.res\", line 128, characters 4-11", Belt_List.every(xs$1, (function (x) {
-            return x;
-          })));
-
-var xs_0$2 = eqx(undefined, undefined);
-
-var xs_1$1 = {
-  hd: neqx(undefined, null),
-  tl: {
-    hd: eqx(Caml_option.some(undefined), Caml_option.some(undefined)),
-    tl: {
-      hd: eqx(Caml_option.some(Caml_option.some(undefined)), Caml_option.some(Caml_option.some(undefined))),
-      tl: {
-        hd: neqx(Caml_option.some(Caml_option.some(Caml_option.some(undefined))), Caml_option.some(Caml_option.some(undefined))),
-        tl: /* [] */0
-      }
-    }
-  }
-};
-
-var xs$2 = {
-  hd: xs_0$2,
-  tl: xs_1$1
-};
-
-b("File \"option_repr_test.res\", line 145, characters 4-11", Belt_List.every(xs$2, (function (x) {
-            return x;
-          })));
-
-function v(x) {
-  return x;
-}
-
-function v0(x) {
-  return x;
-}
-
-var N0 = {
-  v: v,
-  v0: v0
-};
-
-Mt.from_pair_suites("Option_repr_test", suites.contents);
-
-var f7;
-
-var f8 = Caml_option.some(undefined);
-
-var f9 = Caml_option.some(Caml_option.some(undefined));
-
-var N;
-
-var none_arg;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.b = b;
-exports.f0 = f0;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.f5 = f5;
-exports.f6 = f6;
-exports.f7 = f7;
-exports.f8 = f8;
-exports.f9 = f9;
-exports.f10 = f10;
-exports.f11 = f11;
-exports.randomized = randomized;
-exports.create = create;
-exports.ff = ff;
-exports.a = a;
-exports.f12 = f12;
-exports.N = N;
-exports.length_8_id = length_8_id;
-exports.length_10_id = length_10_id;
-exports.f13 = f13$1;
-exports.none_arg = none_arg;
-exports.ltx = ltx;
-exports.gtx = gtx;
-exports.eqx = eqx;
-exports.neqx = neqx;
-exports.all_true = all_true;
-exports.N0 = N0;
-/* ff Not a pure module */
diff --git a/jscomp/test/option_repr_test.res b/jscomp/test/option_repr_test.res
deleted file mode 100644
index a57ca37..0000000
--- a/jscomp/test/option_repr_test.res
+++ /dev/null
@@ -1,165 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~suites, ~test_id, loc, x, y)
-let b = (loc, v) => Mt.bool_suites(~suites, ~test_id, loc, v)
-
-type u<'a> = option<'a> =
-  private
-  | None
-  | Some('a)
-
-let f0 = x =>
-  switch x {
-  | (_, Some(true)) => 1
-  | (_, _) => 2
-  }
-
-type x = A(int, int) | None
-
-type x0 = Some(int) | None
-let f1 = u =>
-  switch u {
-  | A(_) => 0
-  | None => 1
-  }
-
-let f2 = (~x=?, ~y: option<int>=?, ~z=3, ()) => {
-  Js.log(x)
-  switch y {
-  | None => 0
-  | Some(y) => y + z
-  }
-}
-
-let f3 = x =>
-  switch x {
-  | None => 0
-  | Some(_) => 1
-  }
-
-let f4 = x =>
-  switch x {
-  | None => 0
-  | Some(x) => x + 1
-  }
-
-type t<'a> =
-  | None
-  | Some('a)
-let f5 = a => Some(a) == None
-
-let f6 = a => Some(a) != None
-
-let f7 = None
-
-let f8 = Some(None)
-
-let f9 = Some(Some(None))
-
-let f10 = Some(Some(Some(Some(None))))
-
-let f11 = Some(f10)
-
-let f12 = Some(Some(Some(Some(list{(1, 2)}))))
-
-let randomized = ref(false)
-
-let create = (~random=randomized.contents, ()) =>
-  if random {
-    2
-  } else {
-    1
-  }
-
-let ff = create(~random=false, ())
-
-let f13 = (~x=3, ~y=4, ()) => x + y
-
-let a = f13(~x=2, ())
-
-let f12 = (x: list<_>) => Some(x)
-
-module N = Belt.List
-
-let length_8_id: list<int> = N.makeBy(8, x => x)
-let length_10_id: list<int> = N.makeBy(10, x => x)
-
-type xx<'a> = option<'a> =
-  | None
-  | Some('a)
-let f13 = () => N.take(length_10_id, 8) == (Some(list{1, 2, 3}): option<_>)
-
-let () = {
-  b(__LOC__, None < Some(Js.null))
-  b(__LOC__, !(None > Some(Js.null)))
-  b(__LOC__, Some(Js.null) > None)
-  b(__LOC__, None < Some(Js.undefined))
-  b(__LOC__, Some(Js.undefined) > None)
-}
-
-@val
-external log3: (
-  ~req: @unwrap
-  [
-    | #String(string)
-    | #Int(int)
-  ],
-  ~opt: @unwrap
-  [
-    | #String(string)
-    | #Bool(bool)
-  ]=?,
-  unit,
-) => unit = "console.log"
-
-let none_arg = None
-let _ = log3(~req=#Int(6), ~opt=?none_arg, ())
-
-let ltx = (a, b) => a < b && b > a
-let gtx = (a, b) => a > b && b < a
-let eqx = (a, b) => a == b && b == a
-let neqx = (a, b) => a != b && b != a
-
-let all_true = xs => Belt.List.every(xs, x => x)
-
-\"@@"(b(__LOC__), all_true(list{gtx(Some(Some(Js.null)), Some(None))}))
-
-\"@@"(
-  b(__LOC__),
-  all_true(list{
-    ltx(Some(None), Some(Some(3))),
-    ltx(Some(None), Some(Some(None))),
-    ltx(Some(None), Some(Some("3"))),
-    ltx(Some(None), Some(Some(true))),
-    ltx(Some(None), Some(Some(false))),
-    ltx(Some(false), Some(true)),
-    ltx(Some(Some(false)), Some(Some(true))),
-    ltx(None, Some(None)),
-    ltx(None, Some(Js.null)),
-    ltx(None, Some(x => x)),
-    ltx(Some(Js.null), Some(Js.Null.return(3))),
-  }),
-)
-
-\"@@"(
-  b(__LOC__),
-  all_true(list{
-    eqx(None, None),
-    neqx(None, Some(Js.null)),
-    eqx(Some(None), Some(None)),
-    eqx(Some(Some(None)), Some(Some(None))),
-    neqx(Some(Some(Some(None))), Some(Some(None))),
-  }),
-)
-
-module N0 = {
-  type record = {x: int, mutable y: string}
-  type t =
-    | None
-    | Some(record)
-
-  let v = (x: record): t => Some(x)
-  let v0 = (x: record): option<record> => Some(x)
-  /* [v] and [v0] should be just an identity function */
-}
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/optional_ffi_test.js b/jscomp/test/optional_ffi_test.js
deleted file mode 100644
index 18ac19b..0000000
--- a/jscomp/test/optional_ffi_test.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, param) {
-  var y = param[1];
-  var x = param[0];
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function hey(x, y) {
-    if (x === void 0) { x = 3; }
-    return x + y;
-  }
-;
-
-var u = hey(undefined, 3);
-
-var z = hey(5, 3);
-
-eq("File \"optional_ffi_test.res\", line 21, characters 12-19", [
-      [
-        u,
-        z
-      ],
-      [
-        6,
-        8
-      ]
-    ]);
-
-var counter = {
-  contents: 0
-};
-
-function side_effect(x) {
-  x.contents = x.contents + 1 | 0;
-  return x.contents;
-}
-
-function bug_to_fix(f, x) {
-  return hey(f(x), 3);
-}
-
-function bug_to_fix2(f, x) {
-  return hey(Caml_option.option_get(f(x)), 3);
-}
-
-var counter2 = {
-  contents: 0
-};
-
-function side_effect2(x) {
-  x.contents = x.contents + 1 | 0;
-  return x.contents;
-}
-
-var v = bug_to_fix(side_effect, counter);
-
-var pair_0 = [
-  v,
-  counter.contents
-];
-
-var pair_1 = [
-  4,
-  1
-];
-
-var pair = [
-  pair_0,
-  pair_1
-];
-
-var v2 = bug_to_fix2(side_effect2, counter2);
-
-var pair2_0 = [
-  v2,
-  counter.contents
-];
-
-var pair2_1 = [
-  4,
-  1
-];
-
-var pair2 = [
-  pair2_0,
-  pair2_1
-];
-
-eq("File \"optional_ffi_test.res\", line 45, characters 5-12", pair);
-
-eq("File \"optional_ffi_test.res\", line 46, characters 5-12", pair2);
-
-function heystr(x, y) {
-    if (x === void 0) { x = "3"; }
-    return x + y;
-  }
-;
-
-var pair_1$1 = heystr("name", "4");
-
-var pair$1 = [
-  "name4",
-  pair_1$1
-];
-
-eq("File \"optional_ffi_test.res\", line 61, characters 5-12", pair$1);
-
-Mt.from_pair_suites("Optional_ffi_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.u = u;
-exports.z = z;
-exports.counter = counter;
-exports.side_effect = side_effect;
-exports.bug_to_fix = bug_to_fix;
-exports.bug_to_fix2 = bug_to_fix2;
-exports.counter2 = counter2;
-exports.side_effect2 = side_effect2;
-/*  Not a pure module */
diff --git a/jscomp/test/optional_ffi_test.res b/jscomp/test/optional_ffi_test.res
deleted file mode 100644
index 6ffdbed..0000000
--- a/jscomp/test/optional_ffi_test.res
+++ /dev/null
@@ -1,64 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, (x, y)) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-%%raw(`
-function hey(x, y) {
-    if (x === void 0) { x = 3; }
-    return x + y;
-  }
-`)
-@val external xx: (~x: int=?, ~y: int, unit) => int = "hey"
-
-let u = xx(~y=3, ())
-
-let z = xx(~x=2 + 3, ~y=3, ())
-
-let () = eq(__LOC__, ((u, z), (6, 8)))
-
-let counter = ref(0)
-let side_effect = (. x) => {
-  incr(x)
-  x.contents
-}
-
-let bug_to_fix = (f, x) => xx(~x=f(. x), ~y=3, ()) /* : [f x] is done once */
-
-let bug_to_fix2 = (f, x) => xx(~x=?f(. x), ~y=3, ()) /* : [f x] is done once */
-
-let counter2 = ref(0)
-let side_effect2 = (. x) => {
-  incr(x)
-  Some(x.contents)
-}
-
-let () = {
-  let v = bug_to_fix(side_effect, counter)
-  let pair = ((v, counter.contents), (4, 1))
-  let v2 = bug_to_fix2(side_effect2, counter2)
-  let pair2 = ((v2, counter.contents), (4, 1))
-  /* Js.log (pair,pair2) */
-  eq(__LOC__, pair)
-  eq(__LOC__, pair2)
-}
-
-%%raw(`
-function heystr(x, y) {
-    if (x === void 0) { x = "3"; }
-    return x + y;
-  }
-  `)
-
-@val external kk: (~name: string=?, string) => string = "heystr"
-
-let () = {
-  let pair = ("name4", kk(~name="name", "4"))
-  /* Js.log pair ; */
-  eq(__LOC__, pair)
-}
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/optional_regression_test.js b/jscomp/test/optional_regression_test.js
deleted file mode 100644
index fb5131a..0000000
--- a/jscomp/test/optional_regression_test.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function make(s, b, i) {
-  return function (param) {
-    var tmp = {};
-    if (s !== undefined) {
-      tmp.s = Caml_option.valFromOption(s);
-    }
-    if (b !== undefined) {
-      tmp.b = Caml_option.valFromOption(b);
-    }
-    if (i !== undefined) {
-      tmp.i = Caml_option.valFromOption(i);
-    }
-    return tmp;
-  };
-}
-
-var hh = {
-  s: "",
-  b: false,
-  i: 0
-};
-
-eq("File \"optional_regression_test.res\", line 16, characters 3-10", Caml_option.undefined_to_opt(hh.s), "");
-
-eq("File \"optional_regression_test.res\", line 17, characters 3-10", Caml_option.undefined_to_opt(hh.b), false);
-
-eq("File \"optional_regression_test.res\", line 18, characters 3-10", Caml_option.undefined_to_opt(hh.i), 0);
-
-console.log(hh);
-
-Mt.from_pair_suites("Optional_regression_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.make = make;
-exports.hh = hh;
-/*  Not a pure module */
diff --git a/jscomp/test/optional_regression_test.res b/jscomp/test/optional_regression_test.res
deleted file mode 100644
index c525cff..0000000
--- a/jscomp/test/optional_regression_test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-@deriving(abstract)
-type test = {
-  @optional s: string,
-  @optional b: bool,
-  @optional i: int,
-}
-
-let make = (~s=?, ~b=?, ~i=?) => test(~s?, ~b?, ~i?)
-
-let hh = make(~s="", ~b=false, ~i=0, ())
-
-eq(__LOC__, hh->sGet, Some(""))
-eq(__LOC__, hh->bGet, Some(false))
-eq(__LOC__, hh->iGet, Some(0))
-Js.log(hh)
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/pipe_send_readline.js b/jscomp/test/pipe_send_readline.js
deleted file mode 100644
index 1186d0a..0000000
--- a/jscomp/test/pipe_send_readline.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function u(rl) {
-  return rl.on("line", (function (x) {
-                  console.log(x);
-                })).on("close", (function () {
-                console.log("finished");
-              }));
-}
-
-function xx(h) {
-  return h.send("x").hi;
-}
-
-function yy(h) {
-  return h.send("x");
-}
-
-exports.u = u;
-exports.xx = xx;
-exports.yy = yy;
-/* No side effect */
diff --git a/jscomp/test/pipe_send_readline.res b/jscomp/test/pipe_send_readline.res
deleted file mode 100644
index 04ef69f..0000000
--- a/jscomp/test/pipe_send_readline.res
+++ /dev/null
@@ -1,19 +0,0 @@
-/* should give a warning on unused attribute..   [@@bs.xx] */
-
-type readline
-@send
-external on: (
-  readline as 'self,
-  @string
-  [
-    | #line((. string) => unit)
-    | #close((. unit) => unit)
-  ],
-) => 'self = "on"
-let u = rl => rl->on(#line((. x) => Js.log(x)))->on(#close((. ()) => Js.log("finished")))
-
-@send external send: ({"hi": int} as 'self, string) => 'self = "send"
-
-let xx = (h): int => h->send("x")->(x => x["hi"])
-
-let yy = h => h->send("x")
diff --git a/jscomp/test/pipe_syntax.js b/jscomp/test/pipe_syntax.js
deleted file mode 100644
index 86f6cc5..0000000
--- a/jscomp/test/pipe_syntax.js
+++ /dev/null
@@ -1,102 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function t0(x, f) {
-  return Curry._1(f, Curry._1(f, Curry._1(f, x)));
-}
-
-function t1(x, f) {
-  return Curry._1(f, x);
-}
-
-function t2(x, f, g) {
-  return Curry._2(f, Curry._3(g, Curry._1(f, x), x, x), x);
-}
-
-function t3(x, f) {
-  return Curry._3(f, x, 1, 2);
-}
-
-function f(a, b, c) {
-  return [
-          Curry._1(b, a),
-          Curry._1(c, a)
-        ];
-}
-
-function f1(a, b, c, d) {
-  var __ocaml_internal_obj = Curry._1(a, b);
-  return [
-          Curry._1(c, __ocaml_internal_obj),
-          Curry._1(d, __ocaml_internal_obj)
-        ];
-}
-
-function f2(a, b, c, d) {
-  var __ocaml_internal_obj = Curry._1(a, b);
-  var u = Curry._1(c, __ocaml_internal_obj);
-  var v = Curry._1(d, __ocaml_internal_obj);
-  return u + v | 0;
-}
-
-function f3(a, b, c, d, e) {
-  var __ocaml_internal_obj = Curry._1(a, b);
-  var u = Curry._2(c, __ocaml_internal_obj, d);
-  var v = Curry._3(d, __ocaml_internal_obj, 1, 2);
-  var h = Curry._1(e, __ocaml_internal_obj);
-  return (u + v | 0) + h | 0;
-}
-
-function f4(a, b, c) {
-  return [
-          Curry._2(b, a, c),
-          Curry._2(b, a, c)
-        ];
-}
-
-function f5(a, b, c, d) {
-  var v0 = Curry._3(b, a, c, c);
-  var v1 = Curry._3(b, a, c, c);
-  var v2 = Curry._3(b, a, d, d);
-  return (v0 + v1 | 0) + v2 | 0;
-}
-
-function f6(a) {
-  return Caml_option.some(a);
-}
-
-function f7(a) {
-  return [
-          Caml_option.some(a),
-          Caml_option.some(a),
-          Caml_option.some(a)
-        ];
-}
-
-function f8(a) {
-  return Caml_option.some(Caml_option.some(a));
-}
-
-var with_poly = {
-  NAME: "Foo",
-  VAL: 1
-};
-
-exports.t0 = t0;
-exports.t1 = t1;
-exports.t2 = t2;
-exports.t3 = t3;
-exports.f = f;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.f5 = f5;
-exports.f6 = f6;
-exports.f7 = f7;
-exports.f8 = f8;
-exports.with_poly = with_poly;
-/* No side effect */
diff --git a/jscomp/test/pipe_syntax.res b/jscomp/test/pipe_syntax.res
deleted file mode 100644
index bfec31d..0000000
--- a/jscomp/test/pipe_syntax.res
+++ /dev/null
@@ -1,42 +0,0 @@
-include (
-  {
-    let t0 = (x, f) => x->f->f->f
-
-    let t1 = (x, f) => x->f
-
-    let t2 = (x, f, g) => x->f->g(x, x)->f(x)
-
-    let t3 = (x, f) => x->f(~h=1, ~x=2)
-  }: {
-    let t0: ('a, 'a => 'a) => 'a
-    let t1: ('a, 'a => 'b) => 'b
-    let t2: ('a, ('a, 'a) => 'b, ('a => 'b, 'a, 'a) => 'a) => 'b
-    let t3: ('a, ('a, ~h: int, ~x: int) => 'b) => 'b
-  }
-)
-
-let f = (a, b, c) => a->(b, c)
-
-let f1 = (a, b, c, d) => a(b)->(c, d)
-
-let f2 = (a, b, c, d) => {
-  let (u, v) = a(b)->(c, d)
-  u + v
-}
-
-let f3 = (a, b, c, d, e) => a(b)->(c(d), d(1, 2), e)->(((u, v, h)) => u + v + h)
-
-let f4 = (a, b, c) => a->(b(c), b(c))
-
-let f5 = (a, b, c, d) => {
-  let (v0, v1, v2) = a->(b(c, c), b(c, c), b(d, d))
-  v0 + v1 + v2
-}
-
-let f6 = a => a->Some
-
-let f7 = a => a->(Some, Some, Some)
-
-let f8 = a => a->Some->Some
-
-let with_poly = 1->#Foo
diff --git a/jscomp/test/poly_empty_array.js b/jscomp/test/poly_empty_array.js
deleted file mode 100644
index 684dd92..0000000
--- a/jscomp/test/poly_empty_array.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a = [];
-
-exports.a = a;
-/* No side effect */
diff --git a/jscomp/test/poly_empty_array.res b/jscomp/test/poly_empty_array.res
deleted file mode 100644
index 63ee85b..0000000
--- a/jscomp/test/poly_empty_array.res
+++ /dev/null
@@ -1,2 +0,0 @@
-@@bs.config({flags: ["-bs-unsafe-empty-array"]})
-let a = []
diff --git a/jscomp/test/poly_variant_test.js b/jscomp/test/poly_variant_test.js
deleted file mode 100644
index 33f79cf..0000000
--- a/jscomp/test/poly_variant_test.js
+++ /dev/null
@@ -1,104 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function hey_string (option){
-  switch(option){
-  case "on_closed" : 
-  case "on_open" : 
-  case "in" : return option
-  default : throw Error ("impossible")
- }
-}
-function hey_int (option){
-  switch (option){
-   case 0 : 
-   case 3 : 
-   case 4 : 
-   case 5:
-   case 6 : return option
-   default : throw Error("impossible")
-  }
- }
-;
-
-var uu = [
-  hey_string("on_open"),
-  hey_string("on_closed"),
-  hey_string("in")
-];
-
-var vv = [
-  hey_int(3),
-  hey_int(0),
-  hey_int(4)
-];
-
-eq("File \"poly_variant_test.res\", line 64, characters 5-12", vv, [
-      3,
-      0,
-      4
-    ]);
-
-eq("File \"poly_variant_test.res\", line 65, characters 5-12", [
-      hey_int(5),
-      hey_int(6)
-    ], [
-      5,
-      6
-    ]);
-
-eq("File \"poly_variant_test.res\", line 66, characters 5-12", uu, [
-      "on_open",
-      "on_closed",
-      "in"
-    ]);
-
-hey_string("on_closed");
-
-hey_string("in");
-
-function p_is_int_test(x) {
-  if (typeof x === "object") {
-    return 3;
-  } else {
-    return 2;
-  }
-}
-
-eq("File \"poly_variant_test.res\", line 156, characters 5-12", 2, 2);
-
-eq("File \"poly_variant_test.res\", line 157, characters 5-12", 3, p_is_int_test({
-          NAME: "b",
-          VAL: 2
-        }));
-
-Mt.from_pair_suites("Poly_variant_test", suites.contents);
-
-/*  Not a pure module */
diff --git a/jscomp/test/poly_variant_test.res b/jscomp/test/poly_variant_test.res
deleted file mode 100644
index 1eaa3f4..0000000
--- a/jscomp/test/poly_variant_test.res
+++ /dev/null
@@ -1,176 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-%%raw(`
-function hey_string (option){
-  switch(option){
-  case "on_closed" : 
-  case "on_open" : 
-  case "in" : return option
-  default : throw Error ("impossible")
- }
-}
-function hey_int (option){
-  switch (option){
-   case 0 : 
-   case 3 : 
-   case 4 : 
-   case 5:
-   case 6 : return option
-   default : throw Error("impossible")
-  }
- }
-`)
-
-/** when marshall, make sure location does not matter */
-type u = [
-  | #on_closed
-  | #on_open
-  | #in_
-  /* [@bs.as "in"] TODO: warning test */
-]
-/* indeed we have a warning here */
-/* TODO: add warning test
- */
-
-/** when marshall, make sure location does not matter */ @val
-external test_string_type: (~flag: @string [#on_closed | #on_open | @as("in") #in_]) => string =
-  "hey_string"
-
-@val
-external test_int_type: @int
-[
-  | #on_closed
-  | @as(3) #on_open
-  | #in_
-  | @as(5) #again
-  | #hey
-] => int = "hey_int"
-
-let uu = [
-  test_string_type(~flag=#on_open),
-  test_string_type(~flag=#on_closed),
-  test_string_type(~flag=#in_),
-]
-
-let vv = [test_int_type(#on_open), test_int_type(#on_closed), test_int_type(#in_)]
-
-let () = {
-  eq(__LOC__, vv, [3, 0, 4])
-  eq(__LOC__, (test_int_type(#again), test_int_type(#hey)), (5, 6))
-  eq(__LOC__, uu, ["on_open", "on_closed", "in"])
-}
-
-let option = #on_closed
-
-let v = test_string_type(~flag=option)
-
-let ff = h => test_string_type(~flag=h)
-
-let xx = test_string_type(~flag=#in_)
-
-type readline
-@send
-external on: (
-  readline,
-  @string
-  [
-    | #line((. string) => unit)
-    | #close((. ()) => unit)
-  ],
-) => unit = "on"
-
-let register = readline => {
-  on(readline, #line((. s) => Js.log(s)))
-  on(readline, #close((. ()) => Js.log("finished")))
-}
-
-/* external on : */
-/* ([ `line of (string -> unit [@bs]) */
-/* | `close of (unit -> unit [@bs])] */
-/* [@bs.string]) -> */
-/* readline -> readline  = */
-/* "on" [@@bs.send] */
-@send
-external on2: (
-  readline,
-  @string
-  [
-    | #line((. string) => unit)
-    | #close((. unit) => unit)
-  ],
-) => unit = "on2"
-
-@module("fs") external readFileSync: (string, [#utf8 | #ascii]) => string = "readFileSync"
-
-let read = name => readFileSync(name, #utf8)
-
-module N = {
-  @module("fs") external readFileSync: (string, [#utf8 | #ascii]) => string = "readFileSync"
-  let read = name => readFileSync(name, #utf8)
-}
-/**
-let register readline = 
-  readline 
-  |> on (`line begin fun [@bs] s -> Js.log s end)
-  |> on (`close begin fun [@bs] () -> Js.log \"finished\" end)
-
-{[
-let register readline = 
-  on (`line begin fun [@bs] s -> Js.log s end) readline; 
-  on (`close begin fun [@bs] () -> Js.log \"finished\" end) readline
-
-]}
-*/
-let readN = N.read
-
-/**
-let register readline = 
-  readline 
-  |> on (`line begin fun [@bs] s -> Js.log s end)
-  |> on (`close begin fun [@bs] () -> Js.log \"finished\" end)
-
-{[
-let register readline = 
-  on (`line begin fun [@bs] s -> Js.log s end) readline; 
-  on (`close begin fun [@bs] () -> Js.log \"finished\" end) readline
-
-]}
-*/
-let test = (readline, x) => on(readline, x)
-
-let p_is_int_test = x =>
-  switch x {
-  | #a => 2
-  | #b(_) => 3
-  }
-
-let u = #b(2)
-
-let () = {
-  eq(__LOC__, 2, p_is_int_test(#a))
-  eq(__LOC__, 3, p_is_int_test(u))
-}
-
-let hey = x =>
-  switch x {
-  | (#a
-    | #b
-    | #d
-    | #c) as u =>
-    Js.log("u")
-    Js.log(u)
-
-  | (#e
-    | #f
-    | #h) as v =>
-    Js.log("v")
-    Js.log(v)
-  }
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/poly_variant_test.resi b/jscomp/test/poly_variant_test.resi
deleted file mode 100644
index e69de29..0000000
diff --git a/jscomp/test/polymorphic_raw_test.js b/jscomp/test/polymorphic_raw_test.js
deleted file mode 100644
index aa029a4..0000000
--- a/jscomp/test/polymorphic_raw_test.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var f = ((a) => typeof a);
-
-var a = f(3);
-
-var b = f("3");
-
-eq("File \"polymorphic_raw_test.res\", line 18, characters 3-10", a, "number");
-
-eq("File \"polymorphic_raw_test.res\", line 19, characters 3-10", b, "string");
-
-Mt.from_pair_suites("polymorphic_raw_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.a = a;
-exports.b = b;
-/* a Not a pure module */
diff --git a/jscomp/test/polymorphic_raw_test.res b/jscomp/test/polymorphic_raw_test.res
deleted file mode 100644
index 7ab56d6..0000000
--- a/jscomp/test/polymorphic_raw_test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-@@config({
-  flags: [],
-})
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let f: _ => string = %raw(` (a) => typeof a  `)
-
-let a = f(3)
-let b = f("3")
-
-eq(__LOC__, a, "number")
-eq(__LOC__, b, "string")
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/polymorphism_test.js b/jscomp/test/polymorphism_test.js
deleted file mode 100644
index 8fde555..0000000
--- a/jscomp/test/polymorphism_test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function map(f, x) {
-  if (!x) {
-    return /* [] */0;
-  }
-  var r = f(x.hd);
-  return {
-          hd: r,
-          tl: map(f, x.tl)
-        };
-}
-
-exports.map = map;
-/* No side effect */
diff --git a/jscomp/test/polymorphism_test.res b/jscomp/test/polymorphism_test.res
deleted file mode 100644
index f66e60e..0000000
--- a/jscomp/test/polymorphism_test.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let rec map = (f, x) =>
-  switch x {
-  | list{} => list{}
-  | list{a, ...l} =>
-    let r = f(. a)
-    list{r, ...map(f, l)}
-  }
diff --git a/jscomp/test/polymorphism_test.resi b/jscomp/test/polymorphism_test.resi
deleted file mode 100644
index f74d1bc..0000000
--- a/jscomp/test/polymorphism_test.resi
+++ /dev/null
@@ -1 +0,0 @@
-let map: ((. 'a) => 'b, list<'a>) => list<'b>
diff --git a/jscomp/test/polyvar_convert.js b/jscomp/test/polyvar_convert.js
deleted file mode 100644
index 2ea6162..0000000
--- a/jscomp/test/polyvar_convert.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var revData = {"x":"a","b":"b"};
-
-var data = {"a":"x","b":"b"};
-
-function tToJs(x) {
-  return data[x];
-}
-
-function vFromJsOpt(s) {
-  return revData[s];
-}
-
-function vFromJs(s) {
-  return revData[s];
-}
-
-exports.revData = revData;
-exports.data = data;
-exports.tToJs = tToJs;
-exports.vFromJsOpt = vFromJsOpt;
-exports.vFromJs = vFromJs;
-/* No side effect */
diff --git a/jscomp/test/polyvar_convert.res b/jscomp/test/polyvar_convert.res
deleted file mode 100644
index 4101046..0000000
--- a/jscomp/test/polyvar_convert.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type t = [
-  | @as("x") #a
-  | #b
-]
-
-let revData = %raw(` {"x":"a","b":"b"} `)
-let data = %raw(` {"a":"x","b":"b"} `)
-@get_index external get: ('a, 'b) => 'c = ""
-
-let tToJs = (x: t): string => get(data, x)
-
-let vFromJsOpt = (s: string): option<t> => get(revData, s)
-
-let vFromJs = (s: string): t => get(revData, s)
diff --git a/jscomp/test/polyvar_test.js b/jscomp/test/polyvar_test.js
deleted file mode 100644
index ed1cae5..0000000
--- a/jscomp/test/polyvar_test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var ff = "B";
-
-console.log([
-      "A",
-      ff,
-      "A"
-    ]);
-
-/*  Not a pure module */
diff --git a/jscomp/test/polyvar_test.res b/jscomp/test/polyvar_test.res
deleted file mode 100644
index 7758f58..0000000
--- a/jscomp/test/polyvar_test.res
+++ /dev/null
@@ -1,22 +0,0 @@
-@@bs.config(no_export)
-
-let f = x =>
-  switch x {
-  | #A => "A"
-  | #B => "B"
-  }
-
-let f1 = x =>
-  switch x {
-  | #A => "A"
-  }
-
-let ff = {
-  let x = 66
-  if x >= 66 {
-    "B"
-  } else {
-    "A"
-  }
-}
-let () = Js.log((f(#A), ff, f1(#A)))
diff --git a/jscomp/test/ppx_apply_test.js b/jscomp/test/ppx_apply_test.js
deleted file mode 100644
index 6111a80..0000000
--- a/jscomp/test/ppx_apply_test.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var u = 3;
-
-function nullary() {
-  return 3;
-}
-
-function unary(a) {
-  return a + 3 | 0;
-}
-
-var xx = 6;
-
-eq("File \"ppx_apply_test.res\", line 16, characters 12-19", u, 3);
-
-function h(a) {
-  return xx(a);
-}
-
-Mt.from_pair_suites("Ppx_apply_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.u = u;
-exports.nullary = nullary;
-exports.unary = unary;
-exports.xx = xx;
-exports.h = h;
-/* u Not a pure module */
diff --git a/jscomp/test/ppx_apply_test.res b/jscomp/test/ppx_apply_test.res
deleted file mode 100644
index b85c2d8..0000000
--- a/jscomp/test/ppx_apply_test.res
+++ /dev/null
@@ -1,22 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let u = ((. a, b) => a + b)(. 1, 2)
-
-let nullary = (. ()) => 3
-
-let unary = (. a) => a + 3
-
-let xx = unary(. 3)
-let () = eq(__LOC__, u, 3)
-
-@val external f: (. int) => int = "xx"
-
-let h = a => f(. a)
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/pq_test.js b/jscomp/test/pq_test.js
deleted file mode 100644
index 3fb5083..0000000
--- a/jscomp/test/pq_test.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-function insert(queue, prio, elt) {
-  if (typeof queue !== "object") {
-    return {
-            TAG: "Node",
-            _0: prio,
-            _1: elt,
-            _2: "Empty",
-            _3: "Empty"
-          };
-  }
-  var right = queue._3;
-  var left = queue._2;
-  var e = queue._1;
-  var p = queue._0;
-  if (prio <= p) {
-    return {
-            TAG: "Node",
-            _0: prio,
-            _1: elt,
-            _2: insert(right, p, e),
-            _3: left
-          };
-  } else {
-    return {
-            TAG: "Node",
-            _0: p,
-            _1: e,
-            _2: insert(right, prio, elt),
-            _3: left
-          };
-  }
-}
-
-var Queue_is_empty = /* @__PURE__ */Caml_exceptions.create("Pq_test.PrioQueue.Queue_is_empty");
-
-function remove_top(x) {
-  if (typeof x !== "object") {
-    throw {
-          RE_EXN_ID: Queue_is_empty,
-          Error: new Error()
-        };
-  }
-  var left = x._2;
-  var tmp = x._3;
-  if (typeof tmp !== "object") {
-    return left;
-  }
-  if (typeof left !== "object") {
-    return x._3;
-  }
-  var right = x._3;
-  var rprio = right._0;
-  var lprio = left._0;
-  if (lprio <= rprio) {
-    return {
-            TAG: "Node",
-            _0: lprio,
-            _1: left._1,
-            _2: remove_top(left),
-            _3: right
-          };
-  } else {
-    return {
-            TAG: "Node",
-            _0: rprio,
-            _1: right._1,
-            _2: left,
-            _3: remove_top(right)
-          };
-  }
-}
-
-function extract(x) {
-  if (typeof x === "object") {
-    return [
-            x._0,
-            x._1,
-            remove_top(x)
-          ];
-  }
-  throw {
-        RE_EXN_ID: Queue_is_empty,
-        Error: new Error()
-      };
-}
-
-var PrioQueue = {
-  empty: "Empty",
-  insert: insert,
-  Queue_is_empty: Queue_is_empty,
-  remove_top: remove_top,
-  extract: extract
-};
-
-exports.PrioQueue = PrioQueue;
-/* No side effect */
diff --git a/jscomp/test/pq_test.res b/jscomp/test/pq_test.res
deleted file mode 100644
index 115213c..0000000
--- a/jscomp/test/pq_test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-module PrioQueue = {
-  type priority = int
-  type rec queue<'a> = Empty | Node(priority, 'a, queue<'a>, queue<'a>)
-  let empty = Empty
-  let rec insert = (queue, prio, elt) =>
-    switch queue {
-    | Empty => Node(prio, elt, Empty, Empty)
-    | Node(p, e, left, right) =>
-      if prio <= p {
-        Node(prio, elt, insert(right, p, e), left)
-      } else {
-        Node(p, e, insert(right, prio, elt), left)
-      }
-    }
-  exception Queue_is_empty
-  let rec remove_top = x =>
-    switch x {
-    | Empty => raise(Queue_is_empty)
-    | Node(prio, elt, left, Empty) => left
-    | Node(prio, elt, Empty, right) => right
-    | Node(prio, elt, Node(lprio, lelt, _, _) as left, Node(rprio, relt, _, _) as right) =>
-      if lprio <= rprio {
-        Node(lprio, lelt, remove_top(left), right)
-      } else {
-        Node(rprio, relt, left, remove_top(right))
-      }
-    }
-  let extract = x =>
-    switch x {
-    | Empty => raise(Queue_is_empty)
-    | Node(prio, elt, _, _) as queue => (prio, elt, remove_top(queue))
-    }
-}
diff --git a/jscomp/test/pr6726.js b/jscomp/test/pr6726.js
deleted file mode 100644
index 852f739..0000000
--- a/jscomp/test/pr6726.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function get_uint8(str, off) {
-  return 33;
-}
-
-var BigEndian = {
-  get_uint8: get_uint8
-};
-
-var ExtUnixAll = {
-  BigEndian: BigEndian
-};
-
-var ExtUnix = {
-  All: undefined
-};
-
-function test_endian_string(x) {
-  return 33;
-}
-
-var v = 33;
-
-var Test = {
-  test_endian_string: test_endian_string,
-  v: v
-};
-
-exports.ExtUnixAll = ExtUnixAll;
-exports.ExtUnix = ExtUnix;
-exports.Test = Test;
-/* No side effect */
diff --git a/jscomp/test/pr6726.res b/jscomp/test/pr6726.res
deleted file mode 100644
index 56d2658..0000000
--- a/jscomp/test/pr6726.res
+++ /dev/null
@@ -1,31 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Jacques Garrigue, Nagoya University */
-/*  */
-/* Copyright 2014 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
-/*  */
-/* ********************************************************************* */
-
-module ExtUnixAll = {
-  external unused: unit => unit = "%identity"
-  module BigEndian = {
-    let get_uint8 = (str, off) => 33
-  }
-}
-
-module ExtUnix = {
-  module All = ExtUnixAll
-}
-
-module Test = {
-  open ExtUnix.All
-  let test_endian_string = x => {
-    module B = BigEndian
-    B.get_uint8(x, 0)
-  }
-  let v = test_endian_string(1)
-}
diff --git a/jscomp/test/pr_regression_test.js b/jscomp/test/pr_regression_test.js
deleted file mode 100644
index 08eb2e7..0000000
--- a/jscomp/test/pr_regression_test.js
+++ /dev/null
@@ -1,119 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-
-var v = {
-  contents: 3
-};
-
-function f(h) {
-  v.contents = v.contents + 1 | 0;
-  var partial_arg = 3;
-  return function (param) {
-    return Curry._2(h, partial_arg, param);
-  };
-}
-
-f(function (prim0, prim1) {
-      return prim0 + prim1 | 0;
-    });
-
-f(function (prim0, prim1) {
-      return prim0 + prim1 | 0;
-    });
-
-var a = v.contents;
-
-var v$1 = {
-  contents: 3
-};
-
-function f$1(h) {
-  v$1.contents = v$1.contents + 1 | 0;
-  var partial_arg = 3;
-  return function (param) {
-    return Curry._2(h, partial_arg, param);
-  };
-}
-
-f$1(function (prim0, prim1) {
-      return prim0 + prim1 | 0;
-    });
-
-f$1(function (prim0, prim1) {
-      return prim0 + prim1 | 0;
-    });
-
-var b = v$1.contents;
-
-var v$2 = {
-  contents: 3
-};
-
-function f$2(h) {
-  return Curry._2(h, 2, (v$2.contents = v$2.contents + 1 | 0, 3));
-}
-
-f$2(function (prim0, prim1) {
-      return prim0 + prim1 | 0;
-    });
-
-f$2(function (prim0, prim1) {
-      return prim0 + prim1 | 0;
-    });
-
-var c = v$2.contents;
-
-var v$3 = {
-  contents: 3
-};
-
-function f$3(h, g) {
-  v$3.contents = v$3.contents + 1 | 0;
-  var partial_arg = 9;
-  return function (param) {
-    return Curry._2(h, partial_arg, param);
-  };
-}
-
-f$3((function (prim0, prim1) {
-        return prim0 + prim1 | 0;
-      }), 3);
-
-f$3((function (prim0, prim1) {
-        return prim0 + prim1 | 0;
-      }), 3);
-
-var d = v$3.contents;
-
-Mt.from_pair_suites("Pr_regression_test", {
-      hd: [
-        "partial",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: [
-                      5,
-                      5,
-                      5,
-                      5
-                    ],
-                    _1: [
-                      a,
-                      b,
-                      c,
-                      d
-                    ]
-                  };
-          })
-      ],
-      tl: /* [] */0
-    });
-
-exports.a = a;
-exports.b = b;
-exports.c = c;
-exports.d = d;
-/*  Not a pure module */
diff --git a/jscomp/test/pr_regression_test.res b/jscomp/test/pr_regression_test.res
deleted file mode 100644
index bd74bf0..0000000
--- a/jscomp/test/pr_regression_test.res
+++ /dev/null
@@ -1,63 +0,0 @@
-let a = {
-  let v = ref(3)
-  let action = () => incr(v)
-  let f = h =>
-    ((x, y) => h(x, y))({
-      action()
-      3
-    })
-  \"@@"(ignore, f(\"+"))
-  \"@@"(ignore, f(\"+"))
-  v.contents
-}
-
-let b = {
-  let v = ref(3)
-  let action = () => incr(v)
-  let f = h =>
-    ((x, y) => h(x, y))({
-      action()
-      3
-    })
-  \"@@"(ignore, f(\"+"))
-  \"@@"(ignore, f(\"+"))
-  v.contents
-}
-
-let c = {
-  let v = ref(3)
-  let action = () => incr(v)
-  let f = h =>
-    ((x, y) => h(x, y))(
-      2,
-      {
-        action()
-        3
-      },
-    )
-  \"@@"(ignore, f(\"+"))
-  \"@@"(ignore, f(\"+"))
-  v.contents
-}
-
-let d = {
-  let v = ref(3)
-  let action = () => incr(v)
-  let f = (h, g) =>
-    ((x, y) => h(x, y))({
-      let v = 3
-      action()
-      v * v
-    })
-  \"@@"(ignore, f(\"+", 3))
-  \"@@"(ignore, f(\"+", 3))
-  v.contents
-}
-
-Mt.from_pair_suites(
-  __MODULE__,
-  {
-    open Mt
-    list{("partial", _ => Eq((5, 5, 5, 5), (a, b, c, d)))}
-  },
-)
diff --git a/jscomp/test/prepend_data_ffi.js b/jscomp/test/prepend_data_ffi.js
deleted file mode 100644
index dafe613..0000000
--- a/jscomp/test/prepend_data_ffi.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v1 = {
-  stdio: "inherit",
-  v: 3
-};
-
-var v2 = {
-  stdio: 1,
-  v: 2
-};
-
-process.on("exit", (function (exit_code) {
-        return String(exit_code);
-      }));
-
-process.on(1, (function (param) {
-        
-      }));
-
-process.on((function (i) {
-        return String(i);
-      }), "exit");
-
-process.on((function (i) {
-        return String(i);
-      }), 1);
-
-xx(3, 3, "xxx", "a", "b");
-
-function f(x) {
-  x.xx(72, [
-        1,
-        2,
-        3
-      ]);
-  x.xx(73, 3, "xxx", [
-        1,
-        2,
-        3
-      ]);
-  x.xx(74, 3, "xxx", 1, 2, 3);
-  x.xx(75, 3, "xxx", 0, "b", 1, 2, 3, 4, 5);
-  x.xx(76, 3, true, false, "你好",  ["你好",1,2,3] ,  [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}] ,  [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}] , "xxx", 0, "yyy", "b", 1, 2, 3, 4, 5);
-}
-
-process.on("exit", (function (exit_code) {
-        console.log("error code: " + String(exit_code));
-      }));
-
-function register(p) {
-  p.on("exit", (function (i) {
-          console.log(i);
-        }));
-}
-
-var config = {
-  stdio: "inherit",
-  cwd: "."
-};
-
-exports.v1 = v1;
-exports.v2 = v2;
-exports.f = f;
-exports.register = register;
-exports.config = config;
-/*  Not a pure module */
diff --git a/jscomp/test/prepend_data_ffi.res b/jscomp/test/prepend_data_ffi.res
deleted file mode 100644
index 4dac705..0000000
--- a/jscomp/test/prepend_data_ffi.res
+++ /dev/null
@@ -1,90 +0,0 @@
-type config1_expect = {"v": int}
-@obj external config1: (~stdio: @as("inherit") _, ~v: int, unit) => _ = ""
-
-let v1: config1_expect = config1(~v=3, ())
-
-type config2_expect = {"v": int}
-
-@obj external config2: (~stdio: @as(1) _, ~v: int, unit) => _ = ""
-let v2: config2_expect = config2(~v=2, ())
-
-@val external on_exit: (@as("exit") _, int => string) => unit = "process.on"
-
-let () = on_exit(exit_code => string_of_int(exit_code))
-
-@val external on_exit_int: (@as(1) _, int => unit) => unit = "process.on"
-
-let () = on_exit_int(_ => ())
-
-@val external on_exit3: (int => string, @as("exit") _) => unit = "process.on"
-
-let () = on_exit3(i => string_of_int(i))
-
-@val external on_exit4: (int => string, @as(1) _) => unit = "process.on"
-
-let () = on_exit4(i => string_of_int(i))
-
-@val @variadic external on_exit_slice: (int, @as(3) _, @as("xxx") _, array<string>) => unit = "xx"
-
-let () = on_exit_slice(3, ["a", "b"])
-
-type t
-
-@send external on_exit_slice1: (t, int, array<int>) => unit = "xx"
-
-@send external on_exit_slice2: (t, int, @as(3) _, @as("xxx") _, array<int>) => unit = "xx"
-
-@send @variadic external on_exit_slice3: (t, int, @as(3) _, @as("xxx") _, array<int>) => unit = "xx"
-
-@send @variadic
-external on_exit_slice4: (
-  t,
-  int,
-  @as(3) _,
-  @as("xxx") _,
-  @int [#a | #b | #c],
-  [#a | #b | #c],
-  array<int>,
-) => unit = "xx"
-
-@send @variadic
-external on_exit_slice5: (
-  t,
-  int,
-  @as(3) _,
-  @as(json`true`) _,
-  @as(json`false`) _,
-  @as(json`"你好"`) _,
-  @as(json` ["你好",1,2,3] `) _,
-  @as(json` [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}] `) _,
-  @as(json` [{ "arr" : ["你好",1,2,3], "encoding" : "utf8"}] `) _,
-  @as("xxx") _,
-  @int [#a | #b | #c],
-  @as("yyy") _,
-  [#a | #b | #c],
-  array<int>,
-) => unit = "xx"
-
-/**
- TODO: bs.send conflicts with bs.val: better error message
-*/
-let f = (x: t) => {
-  x->on_exit_slice1(__LINE__, [1, 2, 3])
-  x->on_exit_slice2(__LINE__, [1, 2, 3])
-  x->on_exit_slice3(__LINE__, [1, 2, 3])
-  x->on_exit_slice4(__LINE__, #a, #b, [1, 2, 3, 4, 5])
-  x->on_exit_slice5(__LINE__, #a, #b, [1, 2, 3, 4, 5])
-}
-
-@val external process_on_exit: (@as("exit") _, int => unit) => unit = "process.on"
-
-let () = process_on_exit(exit_code => Js.log("error code: " ++ string_of_int(exit_code)))
-
-type process
-
-@send external on_exit: (process, @as("exit") _, int => unit) => unit = "on"
-let register = (p: process) => p->on_exit(i => Js.log(i))
-
-@obj external io_config: (~stdio: @as("inherit") _, ~cwd: string, unit) => _ = ""
-
-let config = io_config(~cwd=".", ())
diff --git a/jscomp/test/primitive_reg_test.js b/jscomp/test/primitive_reg_test.js
deleted file mode 100644
index c66f7c6..0000000
--- a/jscomp/test/primitive_reg_test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function x(prim0, prim1) {
-  return prim0 % prim1;
-}
-
-exports.x = x;
-/* No side effect */
diff --git a/jscomp/test/primitive_reg_test.res b/jscomp/test/primitive_reg_test.res
deleted file mode 100644
index 74b7c26..0000000
--- a/jscomp/test/primitive_reg_test.res
+++ /dev/null
@@ -1 +0,0 @@
-let x = mod_float
diff --git a/jscomp/test/print_alpha_test.js b/jscomp/test/print_alpha_test.js
deleted file mode 100644
index 0979e72..0000000
--- a/jscomp/test/print_alpha_test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-
-function f(h, param) {
-  console.log(3);
-  return Curry.__2(h);
-}
-
-Mt.from_pair_suites("Print_alpha_test", {
-      hd: [
-        "File \"print_alpha_test.res\", line 16, characters 10-17",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: f((function (prim0, prim1) {
-                              return prim0 + prim1 | 0;
-                            }), undefined)(1, 2),
-                    _1: 3
-                  };
-          })
-      ],
-      tl: /* [] */0
-    });
-
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/print_alpha_test.res b/jscomp/test/print_alpha_test.res
deleted file mode 100644
index 81e6511..0000000
--- a/jscomp/test/print_alpha_test.res
+++ /dev/null
@@ -1,18 +0,0 @@
-/* TODO: is it good or or bad to change arity of [f], 
-   actually we can not, since we can not tell from the lambda layer
-*/
-let f = (h, (), x, y) => h(x, y)
-
-let f = (h, ()) => {
-  let u = 1 + 2
-  Js.log(u)
-  (x, y) => h(x, y)
-}
-
-Mt.from_pair_suites(
-  __MODULE__,
-  {
-    open Mt
-    list{(__LOC__, _ => Eq(f(\"+", (), 1, 2), 3))}
-  },
-)
diff --git a/jscomp/test/queue_402.js b/jscomp/test/queue_402.js
deleted file mode 100644
index cbcd920..0000000
--- a/jscomp/test/queue_402.js
+++ /dev/null
@@ -1,191 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var Empty = /* @__PURE__ */Caml_exceptions.create("Queue_402.Empty");
-
-function create(param) {
-  return {
-          length: 0,
-          tail: undefined
-        };
-}
-
-function clear(q) {
-  q.length = 0;
-  q.tail = undefined;
-}
-
-function add(x, q) {
-  if (q.length === 0) {
-    var cell = {};
-    cell.content = x;
-    cell.next = cell;
-    q.length = 1;
-    q.tail = cell;
-    return ;
-  }
-  var tail = q.tail;
-  var head = tail.next;
-  var cell$1 = {
-    content: x,
-    next: head
-  };
-  q.length = q.length + 1 | 0;
-  tail.next = cell$1;
-  q.tail = cell$1;
-}
-
-function peek(q) {
-  if (q.length === 0) {
-    throw {
-          RE_EXN_ID: Empty,
-          Error: new Error()
-        };
-  }
-  return q.tail.next.content;
-}
-
-function take(q) {
-  if (q.length === 0) {
-    throw {
-          RE_EXN_ID: Empty,
-          Error: new Error()
-        };
-  }
-  q.length = q.length - 1 | 0;
-  var tail = q.tail;
-  var head = tail.next;
-  if (head === tail) {
-    q.tail = undefined;
-  } else {
-    tail.next = head.next;
-  }
-  return head.content;
-}
-
-function copy(q) {
-  if (q.length === 0) {
-    return {
-            length: 0,
-            tail: undefined
-          };
-  }
-  var tail = q.tail;
-  var tail$p = {};
-  Caml_obj.update_dummy(tail$p, {
-        content: tail.content,
-        next: tail$p
-      });
-  var copy$1 = function (_prev, _cell) {
-    while(true) {
-      var cell = _cell;
-      var prev = _prev;
-      if (cell === tail) {
-        return ;
-      }
-      var res = {
-        content: cell.content,
-        next: tail$p
-      };
-      prev.next = res;
-      _cell = cell.next;
-      _prev = res;
-      continue ;
-    };
-  };
-  copy$1(tail$p, tail.next);
-  return {
-          length: q.length,
-          tail: tail$p
-        };
-}
-
-function is_empty(q) {
-  return q.length === 0;
-}
-
-function length(q) {
-  return q.length;
-}
-
-function iter(f, q) {
-  if (q.length <= 0) {
-    return ;
-  }
-  var tail = q.tail;
-  var _cell = tail.next;
-  while(true) {
-    var cell = _cell;
-    Curry._1(f, cell.content);
-    if (cell === tail) {
-      return ;
-    }
-    _cell = cell.next;
-    continue ;
-  };
-}
-
-function fold(f, accu, q) {
-  if (q.length === 0) {
-    return accu;
-  }
-  var tail = q.tail;
-  var _accu = accu;
-  var _cell = tail.next;
-  while(true) {
-    var cell = _cell;
-    var accu$1 = _accu;
-    var accu$2 = Curry._2(f, accu$1, cell.content);
-    if (cell === tail) {
-      return accu$2;
-    }
-    _cell = cell.next;
-    _accu = accu$2;
-    continue ;
-  };
-}
-
-function transfer(q1, q2) {
-  var length1 = q1.length;
-  if (length1 <= 0) {
-    return ;
-  }
-  var tail1 = q1.tail;
-  clear(q1);
-  if (q2.length > 0) {
-    var tail2 = q2.tail;
-    var head1 = tail1.next;
-    var head2 = tail2.next;
-    tail1.next = head2;
-    tail2.next = head1;
-  }
-  q2.length = q2.length + length1 | 0;
-  q2.tail = tail1;
-}
-
-var push = add;
-
-var top = peek;
-
-var pop = take;
-
-exports.Empty = Empty;
-exports.create = create;
-exports.clear = clear;
-exports.add = add;
-exports.push = push;
-exports.peek = peek;
-exports.top = top;
-exports.take = take;
-exports.pop = pop;
-exports.copy = copy;
-exports.is_empty = is_empty;
-exports.length = length;
-exports.iter = iter;
-exports.fold = fold;
-exports.transfer = transfer;
-/* No side effect */
diff --git a/jscomp/test/queue_402.res b/jscomp/test/queue_402.res
deleted file mode 100644
index a8268af..0000000
--- a/jscomp/test/queue_402.res
+++ /dev/null
@@ -1,178 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Francois Pottier, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 2002 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-exception Empty
-
-/* OCaml currently does not allow the components of a sum type to be
-   mutable. Yet, for optimal space efficiency, we must have cons cells
-   whose [next] field is mutable. This leads us to define a type of
-   cyclic lists, so as to eliminate the [Nil] case and the sum
-   type. */
-
-type rec cell<'a> = {
-  content: 'a,
-  mutable next: cell<'a>,
-}
-
-/* A queue is a reference to either nothing or some cell of a cyclic
-   list. By convention, that cell is to be viewed as the last cell in
-   the queue. The first cell in the queue is then found in constant
-   time: it is the next cell in the cyclic list. The queue's length is
-   also recorded, so as to make [length] a constant-time operation.
-
-   The [tail] field should really be of type ['a cell option], but
-   then it would be [None] when [length] is 0 and [Some] otherwise,
-   leading to redundant memory allocation and accesses. We avoid this
-   overhead by filling [tail] with a dummy value when [length] is 0.
-   Of course, this requires bending the type system's arm slightly,
-   because it does not have dependent sums. */
-
-type t<'a> = {
-  mutable length: int,
-  mutable tail: cell<'a>,
-}
-
-let create = () => {
-  length: 0,
-  tail: Obj.magic(None),
-}
-
-let clear = q => {
-  q.length = 0
-  q.tail = Obj.magic(None)
-}
-
-let add = (x, q) =>
-  if q.length == 0 {
-    let rec cell = {
-      content: x,
-      next: cell,
-    }
-    q.length = 1
-    q.tail = cell
-  } else {
-    let tail = q.tail
-    let head = tail.next
-    let cell = {
-      content: x,
-      next: head,
-    }
-    q.length = q.length + 1
-    tail.next = cell
-    q.tail = cell
-  }
-
-let push = add
-
-let peek = q =>
-  if q.length == 0 {
-    raise(Empty)
-  } else {
-    q.tail.next.content
-  }
-
-let top = peek
-
-let take = q => {
-  if q.length == 0 {
-    raise(Empty)
-  }
-  q.length = q.length - 1
-  let tail = q.tail
-  let head = tail.next
-  if head === tail {
-    q.tail = Obj.magic(None)
-  } else {
-    tail.next = head.next
-  }
-  head.content
-}
-
-let pop = take
-
-let copy = q =>
-  if q.length == 0 {
-    create()
-  } else {
-    let tail = q.tail
-
-    let rec tail' = {
-      content: tail.content,
-      next: tail',
-    }
-
-    let rec copy = (prev, cell) =>
-      if cell !== tail {
-        let res = {
-          content: cell.content,
-          next: tail',
-        }
-        prev.next = res
-        copy(res, cell.next)
-      }
-
-    copy(tail', tail.next)
-    {
-      length: q.length,
-      tail: tail',
-    }
-  }
-
-let is_empty = q => q.length == 0
-
-let length = q => q.length
-
-let iter = (f, q) =>
-  if q.length > 0 {
-    let tail = q.tail
-    let rec iter = cell => {
-      f(cell.content)
-      if cell !== tail {
-        iter(cell.next)
-      }
-    }
-    iter(tail.next)
-  }
-
-let fold = (f, accu, q) =>
-  if q.length == 0 {
-    accu
-  } else {
-    let tail = q.tail
-    let rec fold = (accu, cell) => {
-      let accu = f(accu, cell.content)
-      if cell === tail {
-        accu
-      } else {
-        fold(accu, cell.next)
-      }
-    }
-    fold(accu, tail.next)
-  }
-
-let transfer = (q1, q2) => {
-  let length1 = q1.length
-  if length1 > 0 {
-    let tail1 = q1.tail
-    clear(q1)
-    if q2.length > 0 {
-      let tail2 = q2.tail
-      let head1 = tail1.next
-      let head2 = tail2.next
-      tail1.next = head2
-      tail2.next = head1
-    }
-    q2.length = q2.length + length1
-    q2.tail = tail1
-  }
-}
diff --git a/jscomp/test/queue_test.js b/jscomp/test/queue_test.js
deleted file mode 100644
index 4630a7c..0000000
--- a/jscomp/test/queue_test.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Queue = require("../../lib/js/queue.js");
-var Queue_402 = require("./queue_402.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function Test(Queue) {
-  var to_array = function (q) {
-    var v = Caml_array.make(Curry._1(Queue.length, q), 0);
-    Curry._3(Queue.fold, (function (i, e) {
-            Caml_array.set(v, i, e);
-            return i + 1 | 0;
-          }), 0, q);
-    return v;
-  };
-  var queue_1 = function (x) {
-    var q = Curry._1(Queue.create, undefined);
-    $$Array.iter((function (x) {
-            Curry._2(Queue.add, x, q);
-          }), x);
-    return to_array(q);
-  };
-  return {
-          to_array: to_array,
-          queue_1: queue_1
-        };
-}
-
-function to_array(q) {
-  var v = Caml_array.make(q.length, 0);
-  Queue.fold((function (i, e) {
-          Caml_array.set(v, i, e);
-          return i + 1 | 0;
-        }), 0, q);
-  return v;
-}
-
-function queue_1(x) {
-  var q = {
-    length: 0,
-    first: "Nil",
-    last: "Nil"
-  };
-  $$Array.iter((function (x) {
-          Queue.add(x, q);
-        }), x);
-  return to_array(q);
-}
-
-var T1 = {
-  to_array: to_array,
-  queue_1: queue_1
-};
-
-function to_array$1(q) {
-  var v = Caml_array.make(q.length, 0);
-  Queue_402.fold((function (i, e) {
-          Caml_array.set(v, i, e);
-          return i + 1 | 0;
-        }), 0, q);
-  return v;
-}
-
-function queue_1$1(x) {
-  var q = {
-    length: 0,
-    tail: undefined
-  };
-  $$Array.iter((function (x) {
-          Queue_402.add(x, q);
-        }), x);
-  return to_array$1(q);
-}
-
-var T2 = {
-  to_array: to_array$1,
-  queue_1: queue_1$1
-};
-
-var suites_0 = [
-  "File \"queue_test.res\", line 34, characters 6-13",
-  (function (param) {
-      var x = [
-        3,
-        4,
-        5,
-        2
-      ];
-      return {
-              TAG: "Eq",
-              _0: x,
-              _1: queue_1(x)
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "File \"queue_test.res\", line 41, characters 6-13",
-    (function (param) {
-        var x = [
-          3,
-          4,
-          5,
-          2
-        ];
-        return {
-                TAG: "Eq",
-                _0: x,
-                _1: queue_1$1(x)
-              };
-      })
-  ],
-  tl: /* [] */0
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Queue_test", suites);
-
-exports.Test = Test;
-exports.T1 = T1;
-exports.T2 = T2;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/queue_test.res b/jscomp/test/queue_test.res
deleted file mode 100644
index 1285273..0000000
--- a/jscomp/test/queue_test.res
+++ /dev/null
@@ -1,50 +0,0 @@
-module Test = (Queue: module type of Queue) => {
-  let to_array = q => {
-    let v = Array.make(Queue.length(q), 0)
-    \"@@"(ignore, Queue.fold((i, e) => {
-        v[i] = e
-        i + 1
-      }, 0, q))
-    v
-  }
-  @val("console.log") @variadic external dump: array<'a> => unit = ""
-
-  let queue_1 = x => {
-    let q = Queue.create()
-    /* dump [|q|]; */
-    Array.iter(x => Queue.add(x, q), x)
-    /* dump [|q|]; */
-    to_array(q)
-  }
-
-  /*
-    TODO: Note it needs need recursive values support */
-    /* let _ = queue_1 [|38|] */
-  
-}
-
-module T1 = Test(Queue)
-module T2 = Test(Queue_402)
-open Mt
-
-let suites = {
-  open Mt
-  list{
-    (
-      __LOC__,
-      _ => {
-        let x = [3, 4, 5, 2]
-        Eq(x, T1.queue_1(x))
-      },
-    ),
-    (
-      __LOC__,
-      _ => {
-        let x = [3, 4, 5, 2]
-        Eq(x, T2.queue_1(x))
-      },
-    ),
-  }
-}
-
-from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/random_test.js b/jscomp/test/random_test.js
deleted file mode 100644
index e32d5ea..0000000
--- a/jscomp/test/random_test.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Int64 = require("../../lib/js/int64.js");
-var Random = require("../../lib/js/random.js");
-var Mt_global = require("./mt_global.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-var id = {
-  contents: 0
-};
-
-var suites = {
-  contents: /* [] */0
-};
-
-function eq(f) {
-  return function (param, param$1) {
-    return Mt_global.collect_eq(id, suites, f, param, param$1);
-  };
-}
-
-function neq(f) {
-  return function (param, param$1) {
-    return Mt_global.collect_neq(id, suites, f, param, param$1);
-  };
-}
-
-function approx(f) {
-  return function (param, param$1) {
-    return Mt_global.collect_approx(id, suites, f, param, param$1);
-  };
-}
-
-Mt_global.collect_neq(id, suites, "File \"random_test.res\", line 9, characters 2-9", (Random.self_init(), Random.$$int(10000)), (Random.self_init(), Random.$$int(1000)));
-
-Random.init(0);
-
-var v = Caml_array.make(10, false);
-
-for(var i = 0; i <= 9; ++i){
-  Caml_array.set(v, i, Random.bool());
-}
-
-Mt_global.collect_eq(id, suites, "File \"random_test.res\", line 28, characters 12-19", v, [
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      true,
-      true,
-      true,
-      false
-    ]);
-
-var f = Random.int64(Int64.max_int);
-
-var h = Random.int64([
-      0,
-      3
-    ]);
-
-var vv = Random.bits();
-
-var xx = Random.$$float(3.0);
-
-var xxx = Random.int32(103);
-
-Mt.from_pair_suites("Random_test", suites.contents);
-
-exports.id = id;
-exports.suites = suites;
-exports.eq = eq;
-exports.neq = neq;
-exports.approx = approx;
-exports.v = v;
-exports.f = f;
-exports.h = h;
-exports.vv = vv;
-exports.xx = xx;
-exports.xxx = xxx;
-/*  Not a pure module */
diff --git a/jscomp/test/random_test.res b/jscomp/test/random_test.res
deleted file mode 100644
index 7d313b1..0000000
--- a/jscomp/test/random_test.res
+++ /dev/null
@@ -1,36 +0,0 @@
-let id = ref(0)
-let suites = ref(list{})
-
-let eq = f => Mt_global.collect_eq(id, suites, f)
-let neq = f => Mt_global.collect_neq(id, suites, f)
-let approx = f => Mt_global.collect_approx(id, suites, f)
-
-let () = neq(
-  __LOC__,
-  {
-    Random.self_init()
-    Random.int(10000)
-  },
-  {
-    Random.self_init()
-    Random.int(1000)
-  },
-)
-
-/* determinism acutally */
-let v = Random.init(0)
-
-let v = Array.make(10, false)
-
-let () = for i in 0 to 9 {
-  v[i] = Random.bool()
-}
-let () = eq(__LOC__, v, [true, true, true, true, true, false, true, true, true, false])
-
-let f = Random.int64(Int64.max_int)
-let h = Random.int64(3L)
-let vv = Random.bits()
-let xx = Random.float(3.0)
-let xxx = Random.int32(103l)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/raw_hash_tbl_bench.js b/jscomp/test/raw_hash_tbl_bench.js
deleted file mode 100644
index 6252b10..0000000
--- a/jscomp/test/raw_hash_tbl_bench.js
+++ /dev/null
@@ -1,36 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Hashtbl = require("../../lib/js/hashtbl.js");
-
-function bench(param) {
-  var table = Hashtbl.create(undefined, 1000000);
-  for(var i = 0; i <= 1000000; ++i){
-    Hashtbl.add(table, i, i);
-  }
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    if (!Hashtbl.mem(table, i$1)) {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "raw_hash_tbl_bench.res",
-              8,
-              4
-            ],
-            Error: new Error()
-          };
-    }
-    
-  }
-  for(var i$2 = 0; i$2 <= 1000000; ++i$2){
-    Hashtbl.remove(table, i$2);
-  }
-}
-
-bench();
-
-var count = 1000000;
-
-exports.count = count;
-exports.bench = bench;
-/*  Not a pure module */
diff --git a/jscomp/test/raw_hash_tbl_bench.res b/jscomp/test/raw_hash_tbl_bench.res
deleted file mode 100644
index 0e19e2e..0000000
--- a/jscomp/test/raw_hash_tbl_bench.res
+++ /dev/null
@@ -1,15 +0,0 @@
-let count = 1_000_000
-let bench = () => {
-  let table = Hashtbl.create(1_000_000)
-  for i in 0 to count {
-    Hashtbl.add(table, i, i)
-  }
-  for i in 0 to count {
-    assert(Hashtbl.mem(table, i))
-  }
-  for i in 0 to count {
-    Hashtbl.remove(table, i)
-  }
-}
-
-bench()
diff --git a/jscomp/test/raw_output_test.js b/jscomp/test/raw_output_test.js
deleted file mode 100644
index 515fb69..0000000
--- a/jscomp/test/raw_output_test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function mk(fn) {
-  return Curry._1(fn, undefined);
-}
-
-(((_)=> console.log('should works'))());
-
-console.log((function () {
-          return 1;
-        })());
-
-exports.mk = mk;
-/*  Not a pure module */
diff --git a/jscomp/test/raw_output_test.res b/jscomp/test/raw_output_test.res
deleted file mode 100644
index c539e8b..0000000
--- a/jscomp/test/raw_output_test.res
+++ /dev/null
@@ -1,14 +0,0 @@
-@@warning("-22")
-let mk = fn => fn()
-
-/* Here it became subtle, 
-  the optimizer knew its arity is zero, and it has one arguments
-
-  in normal case, if its arity is 3, and it has four arguments, the 
-  optimizer will try to supply it with some arguments, in that case
-  it will do a wrong job. So we disabled such application 
-  when arity is zero
-*/
-mk(%raw(`(_)=> console.log('should works')`))
-
-Js.log(((. ()) => 1)(.))
diff --git a/jscomp/test/raw_pure_test.js b/jscomp/test/raw_pure_test.js
deleted file mode 100644
index 23f53d8..0000000
--- a/jscomp/test/raw_pure_test.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/**
- * copyright 
-*/
-// hello
-'use strict';
-
-var List = require("../../lib/js/list.js");
-
-var x0 = null;
-
-var x2 = "荷兰";
-
-var x3 = /ghoghos/;
-
-/**
- * copyright
-*/
-
-function f(x) {
-  //eslint-disable
-  /*hgosgh */
-  return x;
-}
-
-var hh = List.length;
-
-exports.x0 = x0;
-exports.x2 = x2;
-exports.x3 = x3;
-exports.hh = hh;
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/raw_pure_test.res b/jscomp/test/raw_pure_test.res
deleted file mode 100644
index 4dca387..0000000
--- a/jscomp/test/raw_pure_test.res
+++ /dev/null
@@ -1,51 +0,0 @@
-%%raw(`
-/**
- * copyright 
-*/
-`)
-
-%%raw(`
-// hello
-
-`)
-
-let x0 = %raw(`null`)
-
-let x2 = %raw(`"荷兰"`)
-
-let x3 = %raw(`/ghoghos/`)
-
-%%raw(`
-/**
- * copyright
-*/
-`)
-
-let f = %raw("/*hello*/ 0 ")
-let hh = List.length
-let f = x => {
-  ignore(
-    %raw("//eslint-disable
-  0"),
-  )
-  ignore(%raw(`/*hgosgh */0 `))
-  x
-}
-/* let s = [%raw                                           {hgosgho| (a,x) => {
-
-  return a +x + a
-}
-
-
-|hgosgho} */
-
-/* ] */
-
-/* let error0 = [%raw {hgosgho| x => x      + ;|hgosgho}] */
-/* let error1 = [%raw " x => x      + ;"] */
-/* let error2 = [%raw {hgosgho| //
-x => x      + 
-;|hgosgho}] */
-/* let v = [%raw{| /* comment */ |}] 
-  this is not good 
-*/
diff --git a/jscomp/test/rbset.js b/jscomp/test/rbset.js
deleted file mode 100644
index dc5cbd7..0000000
--- a/jscomp/test/rbset.js
+++ /dev/null
@@ -1,758 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function blackify(x) {
-  if (typeof x !== "object" || x._0 === "Black") {
-    return [
-            x,
-            true
-          ];
-  } else {
-    return [
-            {
-              TAG: "Node",
-              _0: "Black",
-              _1: x._1,
-              _2: x._2,
-              _3: x._3
-            },
-            false
-          ];
-  }
-}
-
-function is_empty(x) {
-  if (typeof x !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function mem(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (typeof x_ !== "object") {
-      return false;
-    }
-    var y = x_._2;
-    if (x === y) {
-      return true;
-    }
-    if (x < y) {
-      _x_ = x_._1;
-      continue ;
-    }
-    _x_ = x_._3;
-    continue ;
-  };
-}
-
-function balance_left(l, x, r) {
-  var exit = 0;
-  var a;
-  var x$1;
-  var b;
-  var y;
-  var c;
-  var z;
-  var d;
-  if (typeof l !== "object" || l._0 === "Black") {
-    exit = 1;
-  } else {
-    var a$1 = l._1;
-    var exit$1 = 0;
-    if (typeof a$1 !== "object" || a$1._0 === "Black") {
-      exit$1 = 3;
-    } else {
-      a = a$1._1;
-      x$1 = a$1._2;
-      b = a$1._3;
-      y = l._2;
-      c = l._3;
-      z = x;
-      d = r;
-      exit = 2;
-    }
-    if (exit$1 === 3) {
-      var match = l._3;
-      if (typeof match !== "object" || match._0 === "Black") {
-        exit = 1;
-      } else {
-        a = a$1;
-        x$1 = l._2;
-        b = match._1;
-        y = match._2;
-        c = match._3;
-        z = x;
-        d = r;
-        exit = 2;
-      }
-    }
-    
-  }
-  switch (exit) {
-    case 1 :
-        return {
-                TAG: "Node",
-                _0: "Black",
-                _1: l,
-                _2: x,
-                _3: r
-              };
-    case 2 :
-        return {
-                TAG: "Node",
-                _0: "Red",
-                _1: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: a,
-                  _2: x$1,
-                  _3: b
-                },
-                _2: y,
-                _3: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: c,
-                  _2: z,
-                  _3: d
-                }
-              };
-    
-  }
-}
-
-function balance_right(l, x, r) {
-  var exit = 0;
-  var a;
-  var x$1;
-  var b;
-  var y;
-  var c;
-  var z;
-  var d;
-  if (typeof r !== "object" || r._0 === "Black") {
-    exit = 1;
-  } else {
-    var b$1 = r._1;
-    var exit$1 = 0;
-    if (typeof b$1 !== "object" || b$1._0 === "Black") {
-      exit$1 = 3;
-    } else {
-      a = l;
-      x$1 = x;
-      b = b$1._1;
-      y = b$1._2;
-      c = b$1._3;
-      z = r._2;
-      d = r._3;
-      exit = 2;
-    }
-    if (exit$1 === 3) {
-      var match = r._3;
-      if (typeof match !== "object" || match._0 === "Black") {
-        exit = 1;
-      } else {
-        a = l;
-        x$1 = x;
-        b = b$1;
-        y = r._2;
-        c = match._1;
-        z = match._2;
-        d = match._3;
-        exit = 2;
-      }
-    }
-    
-  }
-  switch (exit) {
-    case 1 :
-        return {
-                TAG: "Node",
-                _0: "Black",
-                _1: l,
-                _2: x,
-                _3: r
-              };
-    case 2 :
-        return {
-                TAG: "Node",
-                _0: "Red",
-                _1: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: a,
-                  _2: x$1,
-                  _3: b
-                },
-                _2: y,
-                _3: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: c,
-                  _2: z,
-                  _3: d
-                }
-              };
-    
-  }
-}
-
-function singleton(x) {
-  return {
-          TAG: "Node",
-          _0: "Black",
-          _1: "Empty",
-          _2: x,
-          _3: "Empty"
-        };
-}
-
-function unbalanced_left(x) {
-  if (typeof x === "object") {
-    if (x._0 === "Black") {
-      var match = x._1;
-      if (typeof match === "object") {
-        if (match._0 === "Black") {
-          return [
-                  balance_left({
-                        TAG: "Node",
-                        _0: "Red",
-                        _1: match._1,
-                        _2: match._2,
-                        _3: match._3
-                      }, x._2, x._3),
-                  true
-                ];
-        }
-        var match$1 = match._3;
-        if (typeof match$1 === "object" && match$1._0 === "Black") {
-          return [
-                  {
-                    TAG: "Node",
-                    _0: "Black",
-                    _1: match._1,
-                    _2: match._2,
-                    _3: balance_left({
-                          TAG: "Node",
-                          _0: "Red",
-                          _1: match$1._1,
-                          _2: match$1._2,
-                          _3: match$1._3
-                        }, x._2, x._3)
-                  },
-                  false
-                ];
-        }
-        
-      }
-      
-    } else {
-      var match$2 = x._1;
-      if (typeof match$2 === "object" && match$2._0 === "Black") {
-        return [
-                balance_left({
-                      TAG: "Node",
-                      _0: "Red",
-                      _1: match$2._1,
-                      _2: match$2._2,
-                      _3: match$2._3
-                    }, x._2, x._3),
-                false
-              ];
-      }
-      
-    }
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "rbset.res",
-          64,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-function unbalanced_right(x) {
-  if (typeof x === "object") {
-    if (x._0 === "Black") {
-      var match = x._3;
-      var x$1 = x._2;
-      var a = x._1;
-      if (typeof match === "object") {
-        if (match._0 === "Black") {
-          return [
-                  balance_right(a, x$1, {
-                        TAG: "Node",
-                        _0: "Red",
-                        _1: match._1,
-                        _2: match._2,
-                        _3: match._3
-                      }),
-                  true
-                ];
-        }
-        var match$1 = match._1;
-        if (typeof match$1 === "object" && match$1._0 === "Black") {
-          return [
-                  {
-                    TAG: "Node",
-                    _0: "Black",
-                    _1: balance_right(a, x$1, {
-                          TAG: "Node",
-                          _0: "Red",
-                          _1: match$1._1,
-                          _2: match$1._2,
-                          _3: match$1._3
-                        }),
-                    _2: match._2,
-                    _3: match._3
-                  },
-                  false
-                ];
-        }
-        
-      }
-      
-    } else {
-      var match$2 = x._3;
-      if (typeof match$2 === "object" && match$2._0 === "Black") {
-        return [
-                balance_right(x._1, x._2, {
-                      TAG: "Node",
-                      _0: "Red",
-                      _1: match$2._1,
-                      _2: match$2._2,
-                      _3: match$2._3
-                    }),
-                false
-              ];
-      }
-      
-    }
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "rbset.res",
-          75,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-function lbalance(x1, x2, x3) {
-  if (typeof x1 !== "object") {
-    return {
-            TAG: "Node",
-            _0: "Black",
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
-  }
-  if (x1._0 === "Black") {
-    return {
-            TAG: "Node",
-            _0: "Black",
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
-  }
-  var r = x1._3;
-  var l = x1._1;
-  if (typeof l === "object" && l._0 !== "Black") {
-    return {
-            TAG: "Node",
-            _0: "Red",
-            _1: {
-              TAG: "Node",
-              _0: "Black",
-              _1: l._1,
-              _2: l._2,
-              _3: l._3
-            },
-            _2: x1._2,
-            _3: {
-              TAG: "Node",
-              _0: "Black",
-              _1: r,
-              _2: x2,
-              _3: x3
-            }
-          };
-  }
-  if (typeof r !== "object") {
-    return {
-            TAG: "Node",
-            _0: "Black",
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
-  }
-  if (r._0 === "Black") {
-    return {
-            TAG: "Node",
-            _0: "Black",
-            _1: x1,
-            _2: x2,
-            _3: x3
-          };
-  }
-  var y = r._2;
-  return {
-          TAG: "Node",
-          _0: "Red",
-          _1: {
-            TAG: "Node",
-            _0: "Black",
-            _1: l,
-            _2: y,
-            _3: r._1
-          },
-          _2: y,
-          _3: {
-            TAG: "Node",
-            _0: "Black",
-            _1: r._3,
-            _2: x2,
-            _3: x3
-          }
-        };
-}
-
-function rbalance(x1, x2, x3) {
-  if (typeof x3 === "object" && x3._0 !== "Black") {
-    var b = x3._1;
-    var exit = 0;
-    if (typeof b !== "object") {
-      exit = 2;
-    } else {
-      if (b._0 !== "Black") {
-        return {
-                TAG: "Node",
-                _0: "Red",
-                _1: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: x1,
-                  _2: x2,
-                  _3: b._1
-                },
-                _2: b._2,
-                _3: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: b._3,
-                  _2: x3._2,
-                  _3: x3._3
-                }
-              };
-      }
-      exit = 2;
-    }
-    if (exit === 2) {
-      var match = x3._3;
-      if (typeof match === "object" && match._0 !== "Black") {
-        return {
-                TAG: "Node",
-                _0: "Red",
-                _1: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: x1,
-                  _2: x2,
-                  _3: b
-                },
-                _2: x3._2,
-                _3: {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: match._1,
-                  _2: match._2,
-                  _3: match._3
-                }
-              };
-      }
-      
-    }
-    
-  }
-  return {
-          TAG: "Node",
-          _0: "Black",
-          _1: x1,
-          _2: x2,
-          _3: x3
-        };
-}
-
-function ins(x, x_) {
-  if (typeof x_ !== "object") {
-    return {
-            TAG: "Node",
-            _0: "Red",
-            _1: "Empty",
-            _2: x,
-            _3: "Empty"
-          };
-  }
-  if (x_._0 === "Black") {
-    var y = x_._2;
-    if (x === y) {
-      return x_;
-    }
-    var b = x_._3;
-    var a = x_._1;
-    if (x < y) {
-      return lbalance(ins(x, a), y, b);
-    } else {
-      return rbalance(a, y, ins(x, b));
-    }
-  }
-  var y$1 = x_._2;
-  if (x === y$1) {
-    return x_;
-  }
-  var b$1 = x_._3;
-  var a$1 = x_._1;
-  if (x < y$1) {
-    return {
-            TAG: "Node",
-            _0: "Red",
-            _1: ins(x, a$1),
-            _2: y$1,
-            _3: b$1
-          };
-  } else {
-    return {
-            TAG: "Node",
-            _0: "Red",
-            _1: a$1,
-            _2: y$1,
-            _3: ins(x, b$1)
-          };
-  }
-}
-
-function add(x, s) {
-  var s$1 = ins(x, s);
-  if (typeof s$1 !== "object" || s$1._0 === "Black") {
-    return s$1;
-  } else {
-    return {
-            TAG: "Node",
-            _0: "Black",
-            _1: s$1._1,
-            _2: s$1._2,
-            _3: s$1._3
-          };
-  }
-}
-
-function remove_min(x) {
-  if (typeof x !== "object") {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "rbset.res",
-            138,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  var c = x._0;
-  if (c === "Black") {
-    var tmp = x._1;
-    if (typeof tmp !== "object") {
-      var match = x._3;
-      var x$1 = x._2;
-      if (typeof match !== "object") {
-        return [
-                "Empty",
-                x$1,
-                true
-              ];
-      }
-      if (match._0 !== "Black") {
-        return [
-                {
-                  TAG: "Node",
-                  _0: "Black",
-                  _1: match._1,
-                  _2: match._2,
-                  _3: match._3
-                },
-                x$1,
-                false
-              ];
-      }
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "rbset.res",
-              138,
-              4
-            ],
-            Error: new Error()
-          };
-    }
-    
-  } else {
-    var tmp$1 = x._1;
-    if (typeof tmp$1 !== "object") {
-      return [
-              x._3,
-              x._2,
-              false
-            ];
-    }
-    
-  }
-  var match$1 = remove_min(x._1);
-  var y = match$1[1];
-  var s_1 = match$1[0];
-  var s_2 = x._2;
-  var s_3 = x._3;
-  var s = {
-    TAG: "Node",
-    _0: c,
-    _1: s_1,
-    _2: s_2,
-    _3: s_3
-  };
-  if (!match$1[2]) {
-    return [
-            s,
-            y,
-            false
-          ];
-  }
-  var match$2 = unbalanced_right(s);
-  return [
-          match$2[0],
-          y,
-          match$2[1]
-        ];
-}
-
-function remove_aux(x, n) {
-  if (typeof n !== "object") {
-    return [
-            "Empty",
-            false
-          ];
-  }
-  var r = n._3;
-  var y = n._2;
-  var l = n._1;
-  var c = n._0;
-  if (x === y) {
-    if (typeof r !== "object") {
-      if (c === "Red") {
-        return [
-                l,
-                false
-              ];
-      } else {
-        return blackify(l);
-      }
-    }
-    var match = remove_min(r);
-    var n_2 = match[1];
-    var n_3 = match[0];
-    var n$1 = {
-      TAG: "Node",
-      _0: c,
-      _1: l,
-      _2: n_2,
-      _3: n_3
-    };
-    if (match[2]) {
-      return unbalanced_left(n$1);
-    } else {
-      return [
-              n$1,
-              false
-            ];
-    }
-  }
-  if (x < y) {
-    var match$1 = remove_aux(x, l);
-    var n_1 = match$1[0];
-    var n$2 = {
-      TAG: "Node",
-      _0: c,
-      _1: n_1,
-      _2: y,
-      _3: r
-    };
-    if (match$1[1]) {
-      return unbalanced_right(n$2);
-    } else {
-      return [
-              n$2,
-              false
-            ];
-    }
-  }
-  var match$2 = remove_aux(x, r);
-  var n_3$1 = match$2[0];
-  var n$3 = {
-    TAG: "Node",
-    _0: c,
-    _1: l,
-    _2: y,
-    _3: n_3$1
-  };
-  if (match$2[1]) {
-    return unbalanced_left(n$3);
-  } else {
-    return [
-            n$3,
-            false
-          ];
-  }
-}
-
-function remove(x, s) {
-  return remove_aux(x, s)[0];
-}
-
-function cardinal(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return (1 + cardinal(x._1) | 0) + cardinal(x._3) | 0;
-  }
-}
-
-var empty = "Empty";
-
-exports.blackify = blackify;
-exports.empty = empty;
-exports.is_empty = is_empty;
-exports.mem = mem;
-exports.balance_left = balance_left;
-exports.balance_right = balance_right;
-exports.singleton = singleton;
-exports.unbalanced_left = unbalanced_left;
-exports.unbalanced_right = unbalanced_right;
-exports.lbalance = lbalance;
-exports.rbalance = rbalance;
-exports.ins = ins;
-exports.add = add;
-exports.remove_min = remove_min;
-exports.remove_aux = remove_aux;
-exports.remove = remove;
-exports.cardinal = cardinal;
-/* No side effect */
diff --git a/jscomp/test/rbset.res b/jscomp/test/rbset.res
deleted file mode 100644
index 75b8039..0000000
--- a/jscomp/test/rbset.res
+++ /dev/null
@@ -1,199 +0,0 @@
-type elt = int
-type color = Black | Red
-type rec t =
-  | Node(color, t, elt, t)
-  | Empty
-
-type rec enum =
-  | End
-  | More(elt, t, enum)
-
-let blackify = x =>
-  switch x {
-  | Node(Red, l, x, r) => (Node(Black, l, x, r), false)
-  | s => (s, true)
-  }
-
-let empty = Empty
-
-let is_empty = x =>
-  switch x {
-  | Empty => true
-  | _ => false
-  }
-
-let rec mem = (x, x_) =>
-  switch x_ {
-  | Empty => false
-  | Node(_, l, y, r) =>
-    if x == y {
-      true
-    } else if x < y {
-      mem(x, l)
-    } else {
-      mem(x, r)
-    }
-  }
-
-let balance_left = (l, x, r) =>
-  switch (l, x, r) {
-  | (Node(Red, Node(Red, a, x, b), y, c), z, d)
-  | (Node(Red, a, x, Node(Red, b, y, c)), z, d) =>
-    Node(Red, Node(Black, a, x, b), y, Node(Black, c, z, d))
-  | (l, x, r) => Node(Black, l, x, r)
-  }
-
-let balance_right = (l, x, r) =>
-  switch (l, x, r) {
-  | (a, x, Node(Red, Node(Red, b, y, c), z, d))
-  | (a, x, Node(Red, b, y, Node(Red, c, z, d))) =>
-    Node(Red, Node(Black, a, x, b), y, Node(Black, c, z, d))
-  | (l, x, r) => Node(Black, l, x, r)
-  }
-
-let singleton = x => Node(Black, Empty, x, Empty)
-
-let unbalanced_left = x =>
-  switch x {
-  | Node(Red, Node(Black, a, x, b), y, c) => (balance_left(Node(Red, a, x, b), y, c), false)
-  | Node(Black, Node(Black, a, x, b), y, c) => (balance_left(Node(Red, a, x, b), y, c), true)
-  | Node(Black, Node(Red, a, x, Node(Black, b, y, c)), z, d) => (
-      Node(Black, a, x, balance_left(Node(Red, b, y, c), z, d)),
-      false,
-    )
-  | _ => assert(false)
-  }
-
-let unbalanced_right = x =>
-  switch x {
-  | Node(Red, a, x, Node(Black, b, y, c)) => (balance_right(a, x, Node(Red, b, y, c)), false)
-  | Node(Black, a, x, Node(Black, b, y, c)) => (balance_right(a, x, Node(Red, b, y, c)), true)
-  | Node(Black, a, x, Node(Red, Node(Black, b, y, c), z, d)) => (
-      Node(Black, balance_right(a, x, Node(Red, b, y, c)), z, d),
-      false,
-    )
-  | _ => assert(false)
-  }
-
-let lbalance = (x1, x2, x3) =>
-  switch x1 {
-  | Node(Red, Node(Red, a, x, b), y, c) =>
-    Node(Red, Node(Black, a, x, b), y, Node(Black, c, x2, x3))
-  | Node(Red, a, x, Node(Red, b, y, c)) =>
-    Node(Red, Node(Black, a, x, b), y, Node(Black, c, x2, x3))
-  | _ => Node(Black, x1, x2, x3)
-  }
-
-let lbalance = (x1, x2, x3) =>
-  switch x1 {
-  | Node(Red, l, y, r) =>
-    switch (l, r) {
-    | (Node(Red, a, x, b), _) => Node(Red, Node(Black, a, x, b), y, Node(Black, r, x2, x3))
-    | (_, Node(Red, b, y, c)) => Node(Red, Node(Black, l, y, b), y, Node(Black, c, x2, x3))
-    | _ => Node(Black, x1, x2, x3)
-    }
-  | _ => Node(Black, x1, x2, x3)
-  }
-let rbalance = (x1, x2, x3) =>
-  switch (x1, x2, x3) {
-  | (a, x, Node(Red, Node(Red, b, y, c), z, d)) =>
-    Node(Red, Node(Black, a, x, b), y, Node(Black, c, z, d))
-  | (a, x, Node(Red, b, y, Node(Red, c, z, d))) =>
-    Node(Red, Node(Black, a, x, b), y, Node(Black, c, z, d))
-  | (a, x, b) => Node(Black, a, x, b)
-  }
-
-let rec ins = (x, x_) =>
-  switch x_ {
-  | Empty => Node(Red, Empty, x, Empty)
-  | Node(Red, a, y, b) as s =>
-    if x == y {
-      s
-    } else if x < y {
-      Node(Red, ins(x, a), y, b)
-    } else {
-      Node(Red, a, y, ins(x, b))
-    }
-
-  | Node(Black, a, y, b) as s =>
-    if x == y {
-      s
-    } else if x < y {
-      lbalance(ins(x, a), y, b)
-    } else {
-      rbalance(a, y, ins(x, b))
-    }
-  }
-
-let add = (x, s) =>
-  switch ins(x, s) {
-  | Node(Red, a, y, b) => Node(Black, a, y, b)
-  | s => s
-  }
-
-let rec remove_min = x =>
-  switch x {
-  | Empty
-  | Node(Black, Empty, _, Node(Black, _, _, _)) =>
-    assert(false)
-  | Node(Black, Empty, x, Empty) => (Empty, x, true)
-  | Node(Black, Empty, x, Node(Red, l, y, r)) => (Node(Black, l, y, r), x, false)
-  | Node(Red, Empty, x, r) => (r, x, false)
-  | Node(c, l, x, r) =>
-    let (l, y, d) = remove_min(l)
-    let s = Node(c, l, x, r)
-    if d {
-      let (s, d) = unbalanced_right(s)
-      (s, y, d)
-    } else {
-      (s, y, false)
-    }
-  }
-
-let rec remove_aux = (x, n) =>
-  switch n {
-  | Empty => (Empty, false)
-  | Node(c, l, y, r) =>
-    if x == y {
-      switch r {
-      | Empty =>
-        if c == Red {
-          (l, false)
-        } else {
-          blackify(l)
-        }
-      | _ =>
-        let (r, y, d) = remove_min(r)
-        let n = Node(c, l, y, r)
-        if d {
-          unbalanced_left(n)
-        } else {
-          (n, false)
-        }
-      }
-    } else if x < y {
-      let (l, d) = remove_aux(x, l)
-      let n = Node(c, l, y, r)
-      if d {
-        unbalanced_right(n)
-      } else {
-        (n, false)
-      }
-    } else {
-      let (r, d) = remove_aux(x, r)
-      let n = Node(c, l, y, r)
-      if d {
-        unbalanced_left(n)
-      } else {
-        (n, false)
-      }
-    }
-  }
-
-let remove = (x, s) => fst(remove_aux(x, s))
-
-let rec cardinal = x =>
-  switch x {
-  | Empty => 0
-  | Node(_, l, x, r) => 1 + cardinal(l) + cardinal(r)
-  }
diff --git a/jscomp/test/react.js b/jscomp/test/react.js
deleted file mode 100644
index 88fd49d..0000000
--- a/jscomp/test/react.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var Ref = {};
-
-var Children = {};
-
-var Context = {};
-
-var Fragment = {};
-
-var StrictMode = {};
-
-var Suspense = {};
-
-var SuspenseList = {};
-
-exports.Ref = Ref;
-exports.Children = Children;
-exports.Context = Context;
-exports.Fragment = Fragment;
-exports.StrictMode = StrictMode;
-exports.Suspense = Suspense;
-exports.SuspenseList = SuspenseList;
-/* No side effect */
diff --git a/jscomp/test/react.res b/jscomp/test/react.res
deleted file mode 100644
index 8038984..0000000
--- a/jscomp/test/react.res
+++ /dev/null
@@ -1,344 +0,0 @@
-type element
-
-@val external null: element = "null"
-
-external float: float => element = "%identity"
-external int: int => element = "%identity"
-external string: string => element = "%identity"
-
-external array: array<element> => element = "%identity"
-
-type componentLike<'props, 'return> = 'props => 'return
-
-type component<'props> = componentLike<'props, element>
-
-@module("react")
-external createElement: (component<'props>, 'props) => element = "createElement"
-
-@module("react")
-external cloneElement: (element, 'props) => element = "cloneElement"
-
-@variadic @module("react")
-external createElementVariadic: (component<'props>, 'props, array<element>) => element =
-  "createElement"
-
-type ref<'value> = {mutable current: 'value}
-
-module Ref = {
-  @deprecated("Please use the type React.ref instead")
-  type t<'value> = ref<'value>
-
-  @deprecated("Please directly read from ref.current instead") @get
-  external current: ref<'value> => 'value = "current"
-
-  @deprecated("Please directly assign to ref.current instead") @set
-  external setCurrent: (ref<'value>, 'value) => unit = "current"
-}
-
-@module("react")
-external createRef: unit => ref<Js.nullable<'a>> = "createRef"
-
-module Children = {
-  @module("react") @scope("Children") @val
-  external map: (element, element => element) => element = "map"
-  @module("react") @scope("Children") @val
-  external mapWithIndex: (element, @uncurry (element, int) => element) => element = "map"
-  @module("react") @scope("Children") @val
-  external forEach: (element, element => unit) => unit = "forEach"
-  @module("react") @scope("Children") @val
-  external forEachWithIndex: (element, @uncurry (element, int) => unit) => unit = "forEach"
-  @module("react") @scope("Children") @val
-  external count: element => int = "count"
-  @module("react") @scope("Children") @val
-  external only: element => element = "only"
-  @module("react") @scope("Children") @val
-  external toArray: element => array<element> = "toArray"
-}
-
-module Context = {
-  type t<'props>
-
-  @get
-  external provider: t<'props> => component<{"value": 'props, "children": element}> = "Provider"
-}
-
-@module("react")
-external createContext: 'a => Context.t<'a> = "createContext"
-
-@module("react")
-external forwardRef: (@uncurry ('props, Js.Nullable.t<ref<'a>>) => element) => component<'props> =
-  "forwardRef"
-
-@module("react")
-external memo: component<'props> => component<'props> = "memo"
-
-@module("react")
-external memoCustomCompareProps: (
-  component<'props>,
-  @uncurry ('props, 'props) => bool,
-) => component<'props> = "memo"
-
-module Fragment = {
-  @obj
-  external makeProps: (~children: element, ~key: 'key=?, unit) => {"children": element} = ""
-  @module("react")
-  external make: component<{
-    "children": element,
-  }> = "Fragment"
-}
-
-module StrictMode = {
-  @obj
-  external makeProps: (~children: element, ~key: 'key=?, unit) => {"children": element} = ""
-  @module("react")
-  external make: component<{
-    "children": element,
-  }> = "StrictMode"
-}
-
-module Suspense = {
-  @obj
-  external makeProps: (
-    ~children: element=?,
-    ~fallback: element=?,
-    ~key: 'key=?,
-    unit,
-  ) => {"children": option<element>, "fallback": option<element>} = ""
-  @module("react")
-  external make: component<{
-    "children": option<element>,
-    "fallback": option<element>,
-  }> = "Suspense"
-}
-
-/* Experimental React.SuspenseList */
-module SuspenseList = {
-  type revealOrder
-  type tail
-  @obj
-  external makeProps: (
-    ~children: element=?,
-    ~revealOrder: [#forwards | #backwards | #together]=?,
-    ~tail: [#collapsed | #hidden]=?,
-    unit,
-  ) => {"children": option<element>, "revealOrder": option<revealOrder>, "tail": option<tail>} = ""
-
-  @module("react")
-  external make: component<{
-    "children": option<element>,
-    "revealOrder": option<revealOrder>,
-    "tail": option<tail>,
-  }> = "SuspenseList"
-}
-/* HOOKS */
-
-/*
- * Yeah, we know this api isn't great. tl;dr: useReducer instead.
- * It's because useState can take functions or non-function values and treats
- * them differently. Lazy initializer + callback which returns state is the
- * only way to safely have any type of state and be able to update it correctly.
- */
-@module("react")
-external useState: (@uncurry (unit => 'state)) => ('state, ('state => 'state) => unit) = "useState"
-
-@module("react")
-external useReducer: (@uncurry ('state, 'action) => 'state, 'state) => ('state, 'action => unit) =
-  "useReducer"
-
-@module("react")
-external useReducerWithMapState: (
-  @uncurry ('state, 'action) => 'state,
-  'initialState,
-  @uncurry ('initialState => 'state),
-) => ('state, 'action => unit) = "useReducer"
-
-@module("react")
-external useEffect: (@uncurry (unit => option<unit => unit>)) => unit = "useEffect"
-@module("react")
-external useEffect0: (@uncurry (unit => option<unit => unit>), @as(json`[]`) _) => unit =
-  "useEffect"
-@module("react")
-external useEffect1: (@uncurry (unit => option<unit => unit>), array<'a>) => unit = "useEffect"
-@module("react")
-external useEffect2: (@uncurry (unit => option<unit => unit>), ('a, 'b)) => unit = "useEffect"
-@module("react")
-external useEffect3: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c)) => unit = "useEffect"
-@module("react")
-external useEffect4: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd)) => unit =
-  "useEffect"
-@module("react")
-external useEffect5: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd, 'e)) => unit =
-  "useEffect"
-@module("react")
-external useEffect6: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd, 'e, 'f)) => unit =
-  "useEffect"
-@module("react")
-external useEffect7: (
-  @uncurry (unit => option<unit => unit>),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => unit = "useEffect"
-
-@module("react")
-external useLayoutEffect: (@uncurry (unit => option<unit => unit>)) => unit = "useLayoutEffect"
-@module("react")
-external useLayoutEffect0: (@uncurry (unit => option<unit => unit>), @as(json`[]`) _) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect1: (@uncurry (unit => option<unit => unit>), array<'a>) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect2: (@uncurry (unit => option<unit => unit>), ('a, 'b)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect3: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect4: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect5: (@uncurry (unit => option<unit => unit>), ('a, 'b, 'c, 'd, 'e)) => unit =
-  "useLayoutEffect"
-@module("react")
-external useLayoutEffect6: (
-  @uncurry (unit => option<unit => unit>),
-  ('a, 'b, 'c, 'd, 'e, 'f),
-) => unit = "useLayoutEffect"
-@module("react")
-external useLayoutEffect7: (
-  @uncurry (unit => option<unit => unit>),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => unit = "useLayoutEffect"
-
-@module("react")
-external useMemo: (@uncurry (unit => 'any)) => 'any = "useMemo"
-@module("react")
-external useMemo0: (@uncurry (unit => 'any), @as(json`[]`) _) => 'any = "useMemo"
-@module("react")
-external useMemo1: (@uncurry (unit => 'any), array<'a>) => 'any = "useMemo"
-@module("react")
-external useMemo2: (@uncurry (unit => 'any), ('a, 'b)) => 'any = "useMemo"
-@module("react")
-external useMemo3: (@uncurry (unit => 'any), ('a, 'b, 'c)) => 'any = "useMemo"
-@module("react")
-external useMemo4: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd)) => 'any = "useMemo"
-@module("react")
-external useMemo5: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd, 'e)) => 'any = "useMemo"
-@module("react")
-external useMemo6: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd, 'e, 'f)) => 'any = "useMemo"
-@module("react")
-external useMemo7: (@uncurry (unit => 'any), ('a, 'b, 'c, 'd, 'e, 'f, 'g)) => 'any = "useMemo"
-
-/* This is used as return values */
-type callback<'input, 'output> = 'input => 'output
-
-@module("react")
-external useCallback: (@uncurry ('input => 'output)) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback0: (
-  @uncurry ('input => 'output),
-  @as(json`[]`) _,
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback1: (@uncurry ('input => 'output), array<'a>) => callback<'input, 'output> =
-  "useCallback"
-@module("react")
-external useCallback2: (@uncurry ('input => 'output), ('a, 'b)) => callback<'input, 'output> =
-  "useCallback"
-@module("react")
-external useCallback3: (@uncurry ('input => 'output), ('a, 'b, 'c)) => callback<'input, 'output> =
-  "useCallback"
-@module("react")
-external useCallback4: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd),
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback5: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd, 'e),
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback6: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd, 'e, 'f),
-) => callback<'input, 'output> = "useCallback"
-@module("react")
-external useCallback7: (
-  @uncurry ('input => 'output),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => callback<'input, 'output> = "useCallback"
-
-@module("react")
-external useContext: Context.t<'any> => 'any = "useContext"
-
-@module("react") external useRef: 'value => ref<'value> = "useRef"
-
-@module("react")
-external useImperativeHandle0: (
-  Js.Nullable.t<ref<'value>>,
-  @uncurry (unit => 'value),
-  @as(json`[]`) _,
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle1: (
-  Js.Nullable.t<ref<'value>>,
-  @uncurry (unit => 'value),
-  array<'a>,
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle2: (
-  Js.Nullable.t<ref<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle3: (
-  Js.Nullable.t<ref<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle4: (
-  Js.Nullable.t<ref<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle5: (
-  Js.Nullable.t<ref<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd, 'e),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle6: (
-  Js.Nullable.t<ref<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd, 'e, 'f),
-) => unit = "useImperativeHandle"
-
-@module("react")
-external useImperativeHandle7: (
-  Js.Nullable.t<ref<'value>>,
-  @uncurry (unit => 'value),
-  ('a, 'b, 'c, 'd, 'e, 'f, 'g),
-) => unit = "useImperativeHandle"
-
-type transitionConfig = {timeoutMs: int}
-
-@module("react")
-external useTransition: (
-  ~config: transitionConfig=?,
-  unit,
-) => (callback<callback<unit, unit>, unit>, bool) = "useTransition"
-
-@set
-external setDisplayName: (component<'props>, string) => unit = "displayName"
-
-@get @return(nullable)
-external displayName: component<'props> => option<string> = "displayName"
diff --git a/jscomp/test/reactDOMRe.js b/jscomp/test/reactDOMRe.js
deleted file mode 100644
index a9c0ad6..0000000
--- a/jscomp/test/reactDOMRe.js
+++ /dev/null
@@ -1,109 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var React = require("react");
-var ReactDom = require("react-dom");
-
-function renderToElementWithClassName(reactElement, className) {
-  var elements = document.getElementsByClassName(className);
-  if (elements.length !== 0) {
-    ReactDom.render(reactElement, elements[0]);
-  } else {
-    console.error("ReactDOMRe.renderToElementWithClassName: no element of class " + (className + " found in the HTML."));
-  }
-}
-
-function renderToElementWithId(reactElement, id) {
-  var element = document.getElementById(id);
-  if (element == null) {
-    console.error("ReactDOMRe.renderToElementWithId : no element of id " + (id + " found in the HTML."));
-  } else {
-    ReactDom.render(reactElement, element);
-  }
-}
-
-function createRootWithClassName(className) {
-  var elements = document.getElementsByClassName(className);
-  if (elements.length !== 0) {
-    return {
-            TAG: "Ok",
-            _0: ReactDom.createRoot(elements[0])
-          };
-  } else {
-    return {
-            TAG: "Error",
-            _0: "ReactDOMRe.Unstable.createRootWithClassName: no element of class " + (className + " found in the HTML.")
-          };
-  }
-}
-
-function createRootWithId(id) {
-  var element = document.getElementById(id);
-  if (element == null) {
-    return {
-            TAG: "Error",
-            _0: "ReactDOMRe.Unstable.createRootWithId: no element of id " + (id + " found in the HTML.")
-          };
-  } else {
-    return {
-            TAG: "Ok",
-            _0: ReactDom.createRoot(element)
-          };
-  }
-}
-
-var Experimental = {
-  createRootWithClassName: createRootWithClassName,
-  createRootWithId: createRootWithId
-};
-
-function hydrateToElementWithClassName(reactElement, className) {
-  var elements = document.getElementsByClassName(className);
-  if (elements.length !== 0) {
-    ReactDom.hydrate(reactElement, elements[0]);
-  } else {
-    console.error("ReactDOMRe.hydrateToElementWithClassName: no element of class " + (className + " found in the HTML."));
-  }
-}
-
-function hydrateToElementWithId(reactElement, id) {
-  var element = document.getElementById(id);
-  if (element == null) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "ReactDOMRe.hydrateToElementWithId : no element of id " + (id + " found in the HTML."),
-          Error: new Error()
-        };
-  }
-  ReactDom.hydrate(reactElement, element);
-}
-
-var Ref = {};
-
-function createElementVariadic(domClassName, props, children) {
-  var variadicArguments = [
-      domClassName,
-      props
-    ].concat(children);
-  return React.createElement.apply(null, variadicArguments);
-}
-
-function unsafeAddProp(style, key, value) {
-  var dict = {};
-  dict[key] = value;
-  return Object.assign({}, style, dict);
-}
-
-var Style = {
-  unsafeAddProp: unsafeAddProp
-};
-
-exports.renderToElementWithClassName = renderToElementWithClassName;
-exports.renderToElementWithId = renderToElementWithId;
-exports.Experimental = Experimental;
-exports.hydrateToElementWithClassName = hydrateToElementWithClassName;
-exports.hydrateToElementWithId = hydrateToElementWithId;
-exports.Ref = Ref;
-exports.createElementVariadic = createElementVariadic;
-exports.Style = Style;
-/* react Not a pure module */
diff --git a/jscomp/test/reactDOMRe.res b/jscomp/test/reactDOMRe.res
deleted file mode 100644
index d5a417f..0000000
--- a/jscomp/test/reactDOMRe.res
+++ /dev/null
@@ -1,2587 +0,0 @@
-/* First time reading an ReScript file? */
-/* `external` is the foreign function call. */
-/* here we're saying `I guarantee that on the JS side, we have a `render` function in the module "react-dom"
- that takes in a reactElement, a dom element, and returns unit (nothing) */
-/* It's like `let`, except you're pointing the implementation to the JS side. The compiler will inline these
- calls and add the appropriate `require("react-dom")` in the file calling this `render` */
-@val @module("react-dom")
-external render: (React.element, Dom.element) => unit = "render"
-
-@val
-external _getElementsByClassName: string => array<Dom.element> = "document.getElementsByClassName"
-
-@val @return(nullable)
-external _getElementById: string => option<Dom.element> = "document.getElementById"
-
-let renderToElementWithClassName = (reactElement, className) =>
-  switch _getElementsByClassName(className) {
-  | [] =>
-    Js.Console.error(
-      "ReactDOMRe.renderToElementWithClassName: no element of class " ++
-      (className ++
-      " found in the HTML."),
-    )
-  | elements => render(reactElement, Array.unsafe_get(elements, 0))
-  }
-
-let renderToElementWithId = (reactElement, id) =>
-  switch _getElementById(id) {
-  | None =>
-    Js.Console.error(
-      "ReactDOMRe.renderToElementWithId : no element of id " ++ (id ++ " found in the HTML."),
-    )
-  | Some(element) => render(reactElement, element)
-  }
-
-module Experimental = {
-  type root
-
-  @module("react-dom")
-  external createRoot: Dom.element => root = "createRoot"
-
-  @send external render: (root, React.element) => unit = "render"
-
-  let createRootWithClassName = className =>
-    switch _getElementsByClassName(className) {
-    | [] =>
-      Error(
-        "ReactDOMRe.Unstable.createRootWithClassName: no element of class " ++
-        (className ++
-        " found in the HTML."),
-      )
-    | elements => Ok(createRoot(Array.unsafe_get(elements, 0)))
-    }
-
-  let createRootWithId = id =>
-    switch _getElementById(id) {
-    | None =>
-      Error(
-        "ReactDOMRe.Unstable.createRootWithId: no element of id " ++ (id ++ " found in the HTML."),
-      )
-    | Some(element) => Ok(createRoot(element))
-    }
-}
-
-@val @module("react-dom")
-external hydrate: (React.element, Dom.element) => unit = "hydrate"
-
-let hydrateToElementWithClassName = (reactElement, className) =>
-  switch _getElementsByClassName(className) {
-  | [] =>
-    Js.Console.error(
-      "ReactDOMRe.hydrateToElementWithClassName: no element of class " ++
-      (className ++
-      " found in the HTML."),
-    )
-  | elements => hydrate(reactElement, Array.unsafe_get(elements, 0))
-  }
-
-let hydrateToElementWithId = (reactElement, id) =>
-  switch _getElementById(id) {
-  | None =>
-    raise(
-      Invalid_argument(
-        "ReactDOMRe.hydrateToElementWithId : no element of id " ++ (id ++ " found in the HTML."),
-      ),
-    )
-  | Some(element) => hydrate(reactElement, element)
-  }
-
-@val @module("react-dom")
-external createPortal: (React.element, Dom.element) => React.element = "createPortal"
-
-@val @module("react-dom")
-external unmountComponentAtNode: Dom.element => unit = "unmountComponentAtNode"
-
-@val @module("react-dom")
-external findDOMNode: ReasonReact.reactRef => Dom.element = "findDOMNode"
-
-external domElementToObj: Dom.element => {..} = "%identity"
-
-type style
-
-type domRef
-
-module Ref = {
-  type t = domRef
-  type currentDomRef = React.ref<Js.nullable<Dom.element>>
-  type callbackDomRef = Js.nullable<Dom.element> => unit
-
-  external domRef: currentDomRef => domRef = "%identity"
-  external callbackDomRef: callbackDomRef => domRef = "%identity"
-}
-
-/* This list isn't exhaustive. We'll add more as we go. */
-/*
- * Watch out! There are two props types and the only difference is the type of ref.
- * Please keep in sync.
- */
-@deriving(abstract)
-type domProps = {
-  @optional
-  key: string,
-  @optional
-  ref: domRef,
-  /* accessibility */
-  /* https://www.w3.org/TR/wai-aria-1.1/ */
-  /* https://accessibilityresources.org/<aria-tag> is a great resource for these */
-  /* [@bs.optional] [@bs.as "aria-current"] ariaCurrent: page|step|location|date|time|true|false, */
-  @optional @as("aria-details")
-  ariaDetails: string,
-  @optional @as("aria-disabled")
-  ariaDisabled: bool,
-  @optional @as("aria-hidden")
-  ariaHidden: bool,
-  /* [@bs.optional] [@bs.as "aria-invalid"] ariaInvalid: grammar|false|spelling|true, */
-  @optional @as("aria-keyshortcuts")
-  ariaKeyshortcuts: string,
-  @optional @as("aria-label")
-  ariaLabel: string,
-  @optional @as("aria-roledescription")
-  ariaRoledescription: string,
-  /* Widget Attributes */
-  /* [@bs.optional] [@bs.as "aria-autocomplete"] ariaAutocomplete: inline|list|both|none, */
-  /* [@bs.optional] [@bs.as "aria-checked"] ariaChecked: true|false|mixed, /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */ */
-  @optional @as("aria-expanded")
-  ariaExpanded: bool,
-  /* [@bs.optional] [@bs.as "aria-haspopup"] ariaHaspopup: false|true|menu|listbox|tree|grid|dialog, */
-  @optional @as("aria-level")
-  ariaLevel: int,
-  @optional @as("aria-modal")
-  ariaModal: bool,
-  @optional @as("aria-multiline")
-  ariaMultiline: bool,
-  @optional @as("aria-multiselectable")
-  ariaMultiselectable: bool,
-  /* [@bs.optional] [@bs.as "aria-orientation"] ariaOrientation: horizontal|vertical|undefined, */
-  @optional @as("aria-placeholder")
-  ariaPlaceholder: string,
-  /* [@bs.optional] [@bs.as "aria-pressed"] ariaPressed: true|false|mixed, /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */ */
-  @optional @as("aria-readonly")
-  ariaReadonly: bool,
-  @optional @as("aria-required")
-  ariaRequired: bool,
-  @optional @as("aria-selected")
-  ariaSelected: bool,
-  @optional @as("aria-sort")
-  ariaSort: string,
-  @optional @as("aria-valuemax")
-  ariaValuemax: float,
-  @optional @as("aria-valuemin")
-  ariaValuemin: float,
-  @optional @as("aria-valuenow")
-  ariaValuenow: float,
-  @optional @as("aria-valuetext")
-  ariaValuetext: string,
-  /* Live Region Attributes */
-  @optional @as("aria-atomic")
-  ariaAtomic: bool,
-  @optional @as("aria-busy")
-  ariaBusy: bool,
-  /* [@bs.optional] [@bs.as "aria-live"] ariaLive: off|polite|assertive|rude, */
-  @optional @as("aria-relevant")
-  ariaRelevant: string,
-  /* Drag-and-Drop Attributes */
-  /* [@bs.optional] [@bs.as "aria-dropeffect"] ariaDropeffect: copy|move|link|execute|popup|none, */
-  @optional @as("aria-grabbed")
-  ariaGrabbed: bool,
-  /* Relationship Attributes */
-  @optional @as("aria-activedescendant")
-  ariaActivedescendant: string,
-  @optional @as("aria-colcount")
-  ariaColcount: int,
-  @optional @as("aria-colindex")
-  ariaColindex: int,
-  @optional @as("aria-colspan")
-  ariaColspan: int,
-  @optional @as("aria-controls")
-  ariaControls: string,
-  @optional @as("aria-describedby")
-  ariaDescribedby: string,
-  @optional @as("aria-errormessage")
-  ariaErrormessage: string,
-  @optional @as("aria-flowto")
-  ariaFlowto: string,
-  @optional @as("aria-labelledby")
-  ariaLabelledby: string,
-  @optional @as("aria-owns")
-  ariaOwns: string,
-  @optional @as("aria-posinset")
-  ariaPosinset: int,
-  @optional @as("aria-rowcount")
-  ariaRowcount: int,
-  @optional @as("aria-rowindex")
-  ariaRowindex: int,
-  @optional @as("aria-rowspan")
-  ariaRowspan: int,
-  @optional @as("aria-setsize")
-  ariaSetsize: int,
-  /* react textarea/input */
-  @optional
-  defaultChecked: bool,
-  @optional
-  defaultValue: string,
-  /* global html attributes */
-  @optional
-  accessKey: string,
-  @optional
-  className: string /* substitute for "class" */,
-  @optional
-  contentEditable: bool,
-  @optional
-  contextMenu: string,
-  @optional
-  dir: string /* "ltr", "rtl" or "auto" */,
-  @optional
-  draggable: bool,
-  @optional
-  hidden: bool,
-  @optional
-  id: string,
-  @optional
-  lang: string,
-  @optional
-  role: string /* ARIA role */,
-  @optional
-  style: style,
-  @optional
-  spellCheck: bool,
-  @optional
-  tabIndex: int,
-  @optional
-  title: string,
-  /* html5 microdata */
-  @optional
-  itemID: string,
-  @optional
-  itemProp: string,
-  @optional
-  itemRef: string,
-  @optional
-  itemScope: bool,
-  @optional
-  itemType: string /* uri */,
-  /* tag-specific html attributes */
-  @optional
-  accept: string,
-  @optional
-  acceptCharset: string,
-  @optional
-  action: string /* uri */,
-  @optional
-  allowFullScreen: bool,
-  @optional
-  alt: string,
-  @optional
-  async: bool,
-  @optional
-  autoComplete: string /* has a fixed, but large-ish, set of possible values */,
-  @optional
-  autoCapitalize: string /* Mobile Safari specific */,
-  @optional
-  autoFocus: bool,
-  @optional
-  autoPlay: bool,
-  @optional
-  challenge: string,
-  @optional
-  charSet: string,
-  @optional
-  checked: bool,
-  @optional
-  cite: string /* uri */,
-  @optional
-  crossOrigin: string /* anonymous, use-credentials */,
-  @optional
-  cols: int,
-  @optional
-  colSpan: int,
-  @optional
-  content: string,
-  @optional
-  controls: bool,
-  @optional
-  coords: string /* set of values specifying the coordinates of a region */,
-  @optional
-  data: string /* uri */,
-  @optional
-  dateTime: string /* "valid date string with optional time" */,
-  @optional
-  default: bool,
-  @optional
-  defer: bool,
-  @optional
-  disabled: bool,
-  @optional
-  download: string /* should really be either a boolean, signifying presence, or a string */,
-  @optional
-  encType: string /* "application/x-www-form-urlencoded", "multipart/form-data" or "text/plain" */,
-  @optional
-  form: string,
-  @optional
-  formAction: string /* uri */,
-  @optional
-  formTarget: string /* "_blank", "_self", etc. */,
-  @optional
-  formMethod: string /* "post", "get", "put" */,
-  @optional
-  headers: string,
-  @optional
-  height: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  @optional
-  high: int,
-  @optional
-  href: string /* uri */,
-  @optional
-  hrefLang: string,
-  @optional
-  htmlFor: string /* substitute for "for" */,
-  @optional
-  httpEquiv: string /* has a fixed set of possible values */,
-  @optional
-  icon: string /* uri? */,
-  @optional
-  inputMode: string /* "verbatim", "latin", "numeric", etc. */,
-  @optional
-  integrity: string,
-  @optional
-  keyType: string,
-  @optional
-  kind: string /* has a fixed set of possible values */,
-  @optional
-  label: string,
-  @optional
-  list: string,
-  @optional
-  loop: bool,
-  @optional
-  low: int,
-  @optional
-  manifest: string /* uri */,
-  @optional
-  max: string /* should be int or Js.Date.t */,
-  @optional
-  maxLength: int,
-  @optional
-  media: string /* a valid media query */,
-  @optional
-  mediaGroup: string,
-  @optional
-  method: string /* "post" or "get" */,
-  @optional
-  min: string,
-  @optional
-  minLength: int,
-  @optional
-  multiple: bool,
-  @optional
-  muted: bool,
-  @optional
-  name: string,
-  @optional
-  nonce: string,
-  @optional
-  noValidate: bool,
-  @optional @as("open")
-  open_: bool /* use this one. Previous one is deprecated */,
-  @optional
-  optimum: int,
-  @optional
-  pattern: string /* valid Js RegExp */,
-  @optional
-  placeholder: string,
-  @optional
-  poster: string /* uri */,
-  @optional
-  preload: string /* "none", "metadata" or "auto" (and "" as a synonym for "auto") */,
-  @optional
-  radioGroup: string,
-  @optional
-  readOnly: bool,
-  @optional
-  rel: string /* a space- or comma-separated (depending on the element) list of a fixed set of "link types" */,
-  @optional
-  required: bool,
-  @optional
-  reversed: bool,
-  @optional
-  rows: int,
-  @optional
-  rowSpan: int,
-  @optional
-  sandbox: string /* has a fixed set of possible values */,
-  @optional
-  scope: string /* has a fixed set of possible values */,
-  @optional
-  scoped: bool,
-  @optional
-  scrolling: string /* html4 only, "auto", "yes" or "no" */,
-  /* seamless - supported by React, but removed from the html5 spec */
-  @optional
-  selected: bool,
-  @optional
-  shape: string,
-  @optional
-  size: int,
-  @optional
-  sizes: string,
-  @optional
-  span: int,
-  @optional
-  src: string /* uri */,
-  @optional
-  srcDoc: string,
-  @optional
-  srcLang: string,
-  @optional
-  srcSet: string,
-  @optional
-  start: int,
-  @optional
-  step: float,
-  @optional
-  summary: string /* deprecated */,
-  @optional
-  target: string,
-  @optional @as("type")
-  type_: string /* has a fixed but large-ish set of possible values */ /* use this one. Previous one is deprecated */,
-  @optional
-  useMap: string,
-  @optional
-  value: string,
-  @optional
-  width: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  @optional
-  wrap: string /* "hard" or "soft" */,
-  /* Clipboard events */
-  @optional
-  onCopy: ReactEvent.Clipboard.t => unit,
-  @optional
-  onCut: ReactEvent.Clipboard.t => unit,
-  @optional
-  onPaste: ReactEvent.Clipboard.t => unit,
-  /* Composition events */
-  @optional
-  onCompositionEnd: ReactEvent.Composition.t => unit,
-  @optional
-  onCompositionStart: ReactEvent.Composition.t => unit,
-  @optional
-  onCompositionUpdate: ReactEvent.Composition.t => unit,
-  /* Keyboard events */
-  @optional
-  onKeyDown: ReactEvent.Keyboard.t => unit,
-  @optional
-  onKeyPress: ReactEvent.Keyboard.t => unit,
-  @optional
-  onKeyUp: ReactEvent.Keyboard.t => unit,
-  /* Focus events */
-  @optional
-  onFocus: ReactEvent.Focus.t => unit,
-  @optional
-  onBlur: ReactEvent.Focus.t => unit,
-  /* Form events */
-  @optional
-  onChange: ReactEvent.Form.t => unit,
-  @optional
-  onInput: ReactEvent.Form.t => unit,
-  @optional
-  onSubmit: ReactEvent.Form.t => unit,
-  @optional
-  onInvalid: ReactEvent.Form.t => unit,
-  /* Mouse events */
-  @optional
-  onClick: ReactEvent.Mouse.t => unit,
-  @optional
-  onContextMenu: ReactEvent.Mouse.t => unit,
-  @optional
-  onDoubleClick: ReactEvent.Mouse.t => unit,
-  @optional
-  onDrag: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragEnd: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragEnter: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragExit: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragLeave: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragOver: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragStart: ReactEvent.Mouse.t => unit,
-  @optional
-  onDrop: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseDown: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseEnter: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseLeave: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseMove: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseOut: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseOver: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseUp: ReactEvent.Mouse.t => unit,
-  /* Selection events */
-  @optional
-  onSelect: ReactEvent.Selection.t => unit,
-  /* Touch events */
-  @optional
-  onTouchCancel: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchEnd: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchMove: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchStart: ReactEvent.Touch.t => unit,
-  /* UI events */
-  @optional
-  onScroll: ReactEvent.UI.t => unit,
-  /* Wheel events */
-  @optional
-  onWheel: ReactEvent.Wheel.t => unit,
-  /* Media events */
-  @optional
-  onAbort: ReactEvent.Media.t => unit,
-  @optional
-  onCanPlay: ReactEvent.Media.t => unit,
-  @optional
-  onCanPlayThrough: ReactEvent.Media.t => unit,
-  @optional
-  onDurationChange: ReactEvent.Media.t => unit,
-  @optional
-  onEmptied: ReactEvent.Media.t => unit,
-  @optional
-  onEncrypetd: ReactEvent.Media.t => unit,
-  @optional
-  onEnded: ReactEvent.Media.t => unit,
-  @optional
-  onError: ReactEvent.Media.t => unit,
-  @optional
-  onLoadedData: ReactEvent.Media.t => unit,
-  @optional
-  onLoadedMetadata: ReactEvent.Media.t => unit,
-  @optional
-  onLoadStart: ReactEvent.Media.t => unit,
-  @optional
-  onPause: ReactEvent.Media.t => unit,
-  @optional
-  onPlay: ReactEvent.Media.t => unit,
-  @optional
-  onPlaying: ReactEvent.Media.t => unit,
-  @optional
-  onProgress: ReactEvent.Media.t => unit,
-  @optional
-  onRateChange: ReactEvent.Media.t => unit,
-  @optional
-  onSeeked: ReactEvent.Media.t => unit,
-  @optional
-  onSeeking: ReactEvent.Media.t => unit,
-  @optional
-  onStalled: ReactEvent.Media.t => unit,
-  @optional
-  onSuspend: ReactEvent.Media.t => unit,
-  @optional
-  onTimeUpdate: ReactEvent.Media.t => unit,
-  @optional
-  onVolumeChange: ReactEvent.Media.t => unit,
-  @optional
-  onWaiting: ReactEvent.Media.t => unit,
-  /* Image events */
-  @optional
-  onLoad: ReactEvent.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */,
-  /* Animation events */
-  @optional
-  onAnimationStart: ReactEvent.Animation.t => unit,
-  @optional
-  onAnimationEnd: ReactEvent.Animation.t => unit,
-  @optional
-  onAnimationIteration: ReactEvent.Animation.t => unit,
-  /* Transition events */
-  @optional
-  onTransitionEnd: ReactEvent.Transition.t => unit,
-  /* svg */
-  @optional
-  accentHeight: string,
-  @optional
-  accumulate: string,
-  @optional
-  additive: string,
-  @optional
-  alignmentBaseline: string,
-  @optional
-  allowReorder: string,
-  @optional
-  alphabetic: string,
-  @optional
-  amplitude: string,
-  @optional
-  arabicForm: string,
-  @optional
-  ascent: string,
-  @optional
-  attributeName: string,
-  @optional
-  attributeType: string,
-  @optional
-  autoReverse: string,
-  @optional
-  azimuth: string,
-  @optional
-  baseFrequency: string,
-  @optional
-  baseProfile: string,
-  @optional
-  baselineShift: string,
-  @optional
-  bbox: string,
-  @optional @as("begin")
-  begin_: string /* use this one. Previous one is deprecated */,
-  @optional
-  bias: string,
-  @optional
-  by: string,
-  @optional
-  calcMode: string,
-  @optional
-  capHeight: string,
-  @optional
-  clip: string,
-  @optional
-  clipPath: string,
-  @optional
-  clipPathUnits: string,
-  @optional
-  clipRule: string,
-  @optional
-  colorInterpolation: string,
-  @optional
-  colorInterpolationFilters: string,
-  @optional
-  colorProfile: string,
-  @optional
-  colorRendering: string,
-  @optional
-  contentScriptType: string,
-  @optional
-  contentStyleType: string,
-  @optional
-  cursor: string,
-  @optional
-  cx: string,
-  @optional
-  cy: string,
-  @optional
-  d: string,
-  @optional
-  decelerate: string,
-  @optional
-  descent: string,
-  @optional
-  diffuseConstant: string,
-  @optional
-  direction: string,
-  @optional
-  display: string,
-  @optional
-  divisor: string,
-  @optional
-  dominantBaseline: string,
-  @optional
-  dur: string,
-  @optional
-  dx: string,
-  @optional
-  dy: string,
-  @optional
-  edgeMode: string,
-  @optional
-  elevation: string,
-  @optional
-  enableBackground: string,
-  @optional @as("end")
-  end_: string /* use this one. Previous one is deprecated */,
-  @optional
-  exponent: string,
-  @optional
-  externalResourcesRequired: string,
-  @optional
-  fill: string,
-  @optional
-  fillOpacity: string,
-  @optional
-  fillRule: string,
-  @optional
-  filter: string,
-  @optional
-  filterRes: string,
-  @optional
-  filterUnits: string,
-  @optional
-  floodColor: string,
-  @optional
-  floodOpacity: string,
-  @optional
-  focusable: string,
-  @optional
-  fontFamily: string,
-  @optional
-  fontSize: string,
-  @optional
-  fontSizeAdjust: string,
-  @optional
-  fontStretch: string,
-  @optional
-  fontStyle: string,
-  @optional
-  fontVariant: string,
-  @optional
-  fontWeight: string,
-  @optional
-  fomat: string,
-  @optional
-  from: string,
-  @optional
-  fx: string,
-  @optional
-  fy: string,
-  @optional
-  g1: string,
-  @optional
-  g2: string,
-  @optional
-  glyphName: string,
-  @optional
-  glyphOrientationHorizontal: string,
-  @optional
-  glyphOrientationVertical: string,
-  @optional
-  glyphRef: string,
-  @optional
-  gradientTransform: string,
-  @optional
-  gradientUnits: string,
-  @optional
-  hanging: string,
-  @optional
-  horizAdvX: string,
-  @optional
-  horizOriginX: string,
-  @optional
-  ideographic: string,
-  @optional
-  imageRendering: string,
-  @optional @as("in")
-  in_: string /* use this one. Previous one is deprecated */,
-  @optional
-  in2: string,
-  @optional
-  intercept: string,
-  @optional
-  k: string,
-  @optional
-  k1: string,
-  @optional
-  k2: string,
-  @optional
-  k3: string,
-  @optional
-  k4: string,
-  @optional
-  kernelMatrix: string,
-  @optional
-  kernelUnitLength: string,
-  @optional
-  kerning: string,
-  @optional
-  keyPoints: string,
-  @optional
-  keySplines: string,
-  @optional
-  keyTimes: string,
-  @optional
-  lengthAdjust: string,
-  @optional
-  letterSpacing: string,
-  @optional
-  lightingColor: string,
-  @optional
-  limitingConeAngle: string,
-  @optional
-  local: string,
-  @optional
-  markerEnd: string,
-  @optional
-  markerHeight: string,
-  @optional
-  markerMid: string,
-  @optional
-  markerStart: string,
-  @optional
-  markerUnits: string,
-  @optional
-  markerWidth: string,
-  @optional
-  mask: string,
-  @optional
-  maskContentUnits: string,
-  @optional
-  maskUnits: string,
-  @optional
-  mathematical: string,
-  @optional
-  mode: string,
-  @optional
-  numOctaves: string,
-  @optional
-  offset: string,
-  @optional
-  opacity: string,
-  @optional
-  operator: string,
-  @optional
-  order: string,
-  @optional
-  orient: string,
-  @optional
-  orientation: string,
-  @optional
-  origin: string,
-  @optional
-  overflow: string,
-  @optional
-  overflowX: string,
-  @optional
-  overflowY: string,
-  @optional
-  overlinePosition: string,
-  @optional
-  overlineThickness: string,
-  @optional
-  paintOrder: string,
-  @optional
-  panose1: string,
-  @optional
-  pathLength: string,
-  @optional
-  patternContentUnits: string,
-  @optional
-  patternTransform: string,
-  @optional
-  patternUnits: string,
-  @optional
-  pointerEvents: string,
-  @optional
-  points: string,
-  @optional
-  pointsAtX: string,
-  @optional
-  pointsAtY: string,
-  @optional
-  pointsAtZ: string,
-  @optional
-  preserveAlpha: string,
-  @optional
-  preserveAspectRatio: string,
-  @optional
-  primitiveUnits: string,
-  @optional
-  r: string,
-  @optional
-  radius: string,
-  @optional
-  refX: string,
-  @optional
-  refY: string,
-  @optional
-  renderingIntent: string,
-  @optional
-  repeatCount: string,
-  @optional
-  repeatDur: string,
-  @optional
-  requiredExtensions: string,
-  @optional
-  requiredFeatures: string,
-  @optional
-  restart: string,
-  @optional
-  result: string,
-  @optional
-  rotate: string,
-  @optional
-  rx: string,
-  @optional
-  ry: string,
-  @optional
-  scale: string,
-  @optional
-  seed: string,
-  @optional
-  shapeRendering: string,
-  @optional
-  slope: string,
-  @optional
-  spacing: string,
-  @optional
-  specularConstant: string,
-  @optional
-  specularExponent: string,
-  @optional
-  speed: string,
-  @optional
-  spreadMethod: string,
-  @optional
-  startOffset: string,
-  @optional
-  stdDeviation: string,
-  @optional
-  stemh: string,
-  @optional
-  stemv: string,
-  @optional
-  stitchTiles: string,
-  @optional
-  stopColor: string,
-  @optional
-  stopOpacity: string,
-  @optional
-  strikethroughPosition: string,
-  @optional
-  strikethroughThickness: string,
-  @optional
-  string: string,
-  @optional
-  stroke: string,
-  @optional
-  strokeDasharray: string,
-  @optional
-  strokeDashoffset: string,
-  @optional
-  strokeLinecap: string,
-  @optional
-  strokeLinejoin: string,
-  @optional
-  strokeMiterlimit: string,
-  @optional
-  strokeOpacity: string,
-  @optional
-  strokeWidth: string,
-  @optional
-  surfaceScale: string,
-  @optional
-  systemLanguage: string,
-  @optional
-  tableValues: string,
-  @optional
-  targetX: string,
-  @optional
-  targetY: string,
-  @optional
-  textAnchor: string,
-  @optional
-  textDecoration: string,
-  @optional
-  textLength: string,
-  @optional
-  textRendering: string,
-  @optional @as("to")
-  to_: string /* use this one. Previous one is deprecated */,
-  @optional
-  transform: string,
-  @optional
-  u1: string,
-  @optional
-  u2: string,
-  @optional
-  underlinePosition: string,
-  @optional
-  underlineThickness: string,
-  @optional
-  unicode: string,
-  @optional
-  unicodeBidi: string,
-  @optional
-  unicodeRange: string,
-  @optional
-  unitsPerEm: string,
-  @optional
-  vAlphabetic: string,
-  @optional
-  vHanging: string,
-  @optional
-  vIdeographic: string,
-  @optional
-  vMathematical: string,
-  @optional
-  values: string,
-  @optional
-  vectorEffect: string,
-  @optional
-  version: string,
-  @optional
-  vertAdvX: string,
-  @optional
-  vertAdvY: string,
-  @optional
-  vertOriginX: string,
-  @optional
-  vertOriginY: string,
-  @optional
-  viewBox: string,
-  @optional
-  viewTarget: string,
-  @optional
-  visibility: string,
-  /* width::string? => */
-  @optional
-  widths: string,
-  @optional
-  wordSpacing: string,
-  @optional
-  writingMode: string,
-  @optional
-  x: string,
-  @optional
-  x1: string,
-  @optional
-  x2: string,
-  @optional
-  xChannelSelector: string,
-  @optional
-  xHeight: string,
-  @optional
-  xlinkActuate: string,
-  @optional
-  xlinkArcrole: string,
-  @optional
-  xlinkHref: string,
-  @optional
-  xlinkRole: string,
-  @optional
-  xlinkShow: string,
-  @optional
-  xlinkTitle: string,
-  @optional
-  xlinkType: string,
-  @optional
-  xmlns: string,
-  @optional
-  xmlnsXlink: string,
-  @optional
-  xmlBase: string,
-  @optional
-  xmlLang: string,
-  @optional
-  xmlSpace: string,
-  @optional
-  y: string,
-  @optional
-  y1: string,
-  @optional
-  y2: string,
-  @optional
-  yChannelSelector: string,
-  @optional
-  z: string,
-  @optional
-  zoomAndPan: string,
-  /* RDFa */
-  @optional
-  about: string,
-  @optional
-  datatype: string,
-  @optional
-  inlist: string,
-  @optional
-  prefix: string,
-  @optional
-  property: string,
-  @optional
-  resource: string,
-  @optional
-  typeof: string,
-  @optional
-  vocab: string,
-  /* react-specific */
-  @optional
-  dangerouslySetInnerHTML: {"__html": string},
-  @optional
-  suppressContentEditableWarning: bool,
-}
-
-@variadic @module("react")
-external createDOMElementVariadic: (
-  string,
-  ~props: domProps=?,
-  array<React.element>,
-) => React.element = "createElement"
-
-/* This list isn't exhaustive. We'll add more as we go. */
-/*
- * Watch out! There are two props types and the only difference is the type of ref.
- * Please keep in sync.
- */
-@deriving(abstract)
-type props = {
-  @optional
-  key: string,
-  @optional
-  ref: Js.nullable<Dom.element> => unit,
-  /* accessibility */
-  /* https://www.w3.org/TR/wai-aria-1.1/ */
-  /* https://accessibilityresources.org/<aria-tag> is a great resource for these */
-  /* [@bs.optional] [@bs.as "aria-current"] ariaCurrent: page|step|location|date|time|true|false, */
-  @optional @as("aria-details")
-  ariaDetails: string,
-  @optional @as("aria-disabled")
-  ariaDisabled: bool,
-  @optional @as("aria-hidden")
-  ariaHidden: bool,
-  /* [@bs.optional] [@bs.as "aria-invalid"] ariaInvalid: grammar|false|spelling|true, */
-  @optional @as("aria-keyshortcuts")
-  ariaKeyshortcuts: string,
-  @optional @as("aria-label")
-  ariaLabel: string,
-  @optional @as("aria-roledescription")
-  ariaRoledescription: string,
-  /* Widget Attributes */
-  /* [@bs.optional] [@bs.as "aria-autocomplete"] ariaAutocomplete: inline|list|both|none, */
-  /* [@bs.optional] [@bs.as "aria-checked"] ariaChecked: true|false|mixed, /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */ */
-  @optional @as("aria-expanded")
-  ariaExpanded: bool,
-  /* [@bs.optional] [@bs.as "aria-haspopup"] ariaHaspopup: false|true|menu|listbox|tree|grid|dialog, */
-  @optional @as("aria-level")
-  ariaLevel: int,
-  @optional @as("aria-modal")
-  ariaModal: bool,
-  @optional @as("aria-multiline")
-  ariaMultiline: bool,
-  @optional @as("aria-multiselectable")
-  ariaMultiselectable: bool,
-  /* [@bs.optional] [@bs.as "aria-orientation"] ariaOrientation: horizontal|vertical|undefined, */
-  @optional @as("aria-placeholder")
-  ariaPlaceholder: string,
-  /* [@bs.optional] [@bs.as "aria-pressed"] ariaPressed: true|false|mixed, /* https://www.w3.org/TR/wai-aria-1.1/#valuetype_tristate */ */
-  @optional @as("aria-readonly")
-  ariaReadonly: bool,
-  @optional @as("aria-required")
-  ariaRequired: bool,
-  @optional @as("aria-selected")
-  ariaSelected: bool,
-  @optional @as("aria-sort")
-  ariaSort: string,
-  @optional @as("aria-valuemax")
-  ariaValuemax: float,
-  @optional @as("aria-valuemin")
-  ariaValuemin: float,
-  @optional @as("aria-valuenow")
-  ariaValuenow: float,
-  @optional @as("aria-valuetext")
-  ariaValuetext: string,
-  /* Live Region Attributes */
-  @optional @as("aria-atomic")
-  ariaAtomic: bool,
-  @optional @as("aria-busy")
-  ariaBusy: bool,
-  /* [@bs.optional] [@bs.as "aria-live"] ariaLive: off|polite|assertive|rude, */
-  @optional @as("aria-relevant")
-  ariaRelevant: string,
-  /* Drag-and-Drop Attributes */
-  /* [@bs.optional] [@bs.as "aria-dropeffect"] ariaDropeffect: copy|move|link|execute|popup|none, */
-  @optional @as("aria-grabbed")
-  ariaGrabbed: bool,
-  /* Relationship Attributes */
-  @optional @as("aria-activedescendant")
-  ariaActivedescendant: string,
-  @optional @as("aria-colcount")
-  ariaColcount: int,
-  @optional @as("aria-colindex")
-  ariaColindex: int,
-  @optional @as("aria-colspan")
-  ariaColspan: int,
-  @optional @as("aria-controls")
-  ariaControls: string,
-  @optional @as("aria-describedby")
-  ariaDescribedby: string,
-  @optional @as("aria-errormessage")
-  ariaErrormessage: string,
-  @optional @as("aria-flowto")
-  ariaFlowto: string,
-  @optional @as("aria-labelledby")
-  ariaLabelledby: string,
-  @optional @as("aria-owns")
-  ariaOwns: string,
-  @optional @as("aria-posinset")
-  ariaPosinset: int,
-  @optional @as("aria-rowcount")
-  ariaRowcount: int,
-  @optional @as("aria-rowindex")
-  ariaRowindex: int,
-  @optional @as("aria-rowspan")
-  ariaRowspan: int,
-  @optional @as("aria-setsize")
-  ariaSetsize: int,
-  /* react textarea/input */
-  @optional
-  defaultChecked: bool,
-  @optional
-  defaultValue: string,
-  /* global html attributes */
-  @optional
-  accessKey: string,
-  @optional
-  className: string /* substitute for "class" */,
-  @optional
-  contentEditable: bool,
-  @optional
-  contextMenu: string,
-  @optional
-  dir: string /* "ltr", "rtl" or "auto" */,
-  @optional
-  draggable: bool,
-  @optional
-  hidden: bool,
-  @optional
-  id: string,
-  @optional
-  lang: string,
-  @optional
-  role: string /* ARIA role */,
-  @optional
-  style: style,
-  @optional
-  spellCheck: bool,
-  @optional
-  tabIndex: int,
-  @optional
-  title: string,
-  /* html5 microdata */
-  @optional
-  itemID: string,
-  @optional
-  itemProp: string,
-  @optional
-  itemRef: string,
-  @optional
-  itemScope: bool,
-  @optional
-  itemType: string /* uri */,
-  /* tag-specific html attributes */
-  @optional
-  accept: string,
-  @optional
-  acceptCharset: string,
-  @optional
-  action: string /* uri */,
-  @optional
-  allowFullScreen: bool,
-  @optional
-  alt: string,
-  @optional
-  async: bool,
-  @optional
-  autoComplete: string /* has a fixed, but large-ish, set of possible values */,
-  @optional
-  autoCapitalize: string /* Mobile Safari specific */,
-  @optional
-  autoFocus: bool,
-  @optional
-  autoPlay: bool,
-  @optional
-  challenge: string,
-  @optional
-  charSet: string,
-  @optional
-  checked: bool,
-  @optional
-  cite: string /* uri */,
-  @optional
-  crossorigin: bool,
-  @optional
-  cols: int,
-  @optional
-  colSpan: int,
-  @optional
-  content: string,
-  @optional
-  controls: bool,
-  @optional
-  coords: string /* set of values specifying the coordinates of a region */,
-  @optional
-  data: string /* uri */,
-  @optional
-  dateTime: string /* "valid date string with optional time" */,
-  @optional
-  default: bool,
-  @optional
-  defer: bool,
-  @optional
-  disabled: bool,
-  @optional
-  download: string /* should really be either a boolean, signifying presence, or a string */,
-  @optional
-  encType: string /* "application/x-www-form-urlencoded", "multipart/form-data" or "text/plain" */,
-  @optional
-  form: string,
-  @optional
-  formAction: string /* uri */,
-  @optional
-  formTarget: string /* "_blank", "_self", etc. */,
-  @optional
-  formMethod: string /* "post", "get", "put" */,
-  @optional
-  headers: string,
-  @optional
-  height: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  @optional
-  high: int,
-  @optional
-  href: string /* uri */,
-  @optional
-  hrefLang: string,
-  @optional
-  htmlFor: string /* substitute for "for" */,
-  @optional
-  httpEquiv: string /* has a fixed set of possible values */,
-  @optional
-  icon: string /* uri? */,
-  @optional
-  inputMode: string /* "verbatim", "latin", "numeric", etc. */,
-  @optional
-  integrity: string,
-  @optional
-  keyType: string,
-  @optional
-  kind: string /* has a fixed set of possible values */,
-  @optional
-  label: string,
-  @optional
-  list: string,
-  @optional
-  loop: bool,
-  @optional
-  low: int,
-  @optional
-  manifest: string /* uri */,
-  @optional
-  max: string /* should be int or Js.Date.t */,
-  @optional
-  maxLength: int,
-  @optional
-  media: string /* a valid media query */,
-  @optional
-  mediaGroup: string,
-  @optional
-  method: string /* "post" or "get" */,
-  @optional
-  min: string,
-  @optional
-  minLength: int,
-  @optional
-  multiple: bool,
-  @optional
-  muted: bool,
-  @optional
-  name: string,
-  @optional
-  nonce: string,
-  @optional
-  noValidate: bool,
-  @optional @as("open")
-  open_: bool /* use this one. Previous one is deprecated */,
-  @optional
-  optimum: int,
-  @optional
-  pattern: string /* valid Js RegExp */,
-  @optional
-  placeholder: string,
-  @optional
-  poster: string /* uri */,
-  @optional
-  preload: string /* "none", "metadata" or "auto" (and "" as a synonym for "auto") */,
-  @optional
-  radioGroup: string,
-  @optional
-  readOnly: bool,
-  @optional
-  rel: string /* a space- or comma-separated (depending on the element) list of a fixed set of "link types" */,
-  @optional
-  required: bool,
-  @optional
-  reversed: bool,
-  @optional
-  rows: int,
-  @optional
-  rowSpan: int,
-  @optional
-  sandbox: string /* has a fixed set of possible values */,
-  @optional
-  scope: string /* has a fixed set of possible values */,
-  @optional
-  scoped: bool,
-  @optional
-  scrolling: string /* html4 only, "auto", "yes" or "no" */,
-  /* seamless - supported by React, but removed from the html5 spec */
-  @optional
-  selected: bool,
-  @optional
-  shape: string,
-  @optional
-  size: int,
-  @optional
-  sizes: string,
-  @optional
-  span: int,
-  @optional
-  src: string /* uri */,
-  @optional
-  srcDoc: string,
-  @optional
-  srcLang: string,
-  @optional
-  srcSet: string,
-  @optional
-  start: int,
-  @optional
-  step: float,
-  @optional
-  summary: string /* deprecated */,
-  @optional
-  target: string,
-  @optional @as("type")
-  type_: string /* has a fixed but large-ish set of possible values */ /* use this one. Previous one is deprecated */,
-  @optional
-  useMap: string,
-  @optional
-  value: string,
-  @optional
-  width: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
-  @optional
-  wrap: string /* "hard" or "soft" */,
-  /* Clipboard events */
-  @optional
-  onCopy: ReactEvent.Clipboard.t => unit,
-  @optional
-  onCut: ReactEvent.Clipboard.t => unit,
-  @optional
-  onPaste: ReactEvent.Clipboard.t => unit,
-  /* Composition events */
-  @optional
-  onCompositionEnd: ReactEvent.Composition.t => unit,
-  @optional
-  onCompositionStart: ReactEvent.Composition.t => unit,
-  @optional
-  onCompositionUpdate: ReactEvent.Composition.t => unit,
-  /* Keyboard events */
-  @optional
-  onKeyDown: ReactEvent.Keyboard.t => unit,
-  @optional
-  onKeyPress: ReactEvent.Keyboard.t => unit,
-  @optional
-  onKeyUp: ReactEvent.Keyboard.t => unit,
-  /* Focus events */
-  @optional
-  onFocus: ReactEvent.Focus.t => unit,
-  @optional
-  onBlur: ReactEvent.Focus.t => unit,
-  /* Form events */
-  @optional
-  onChange: ReactEvent.Form.t => unit,
-  @optional
-  onInput: ReactEvent.Form.t => unit,
-  @optional
-  onSubmit: ReactEvent.Form.t => unit,
-  @optional
-  onInvalid: ReactEvent.Form.t => unit,
-  /* Mouse events */
-  @optional
-  onClick: ReactEvent.Mouse.t => unit,
-  @optional
-  onContextMenu: ReactEvent.Mouse.t => unit,
-  @optional
-  onDoubleClick: ReactEvent.Mouse.t => unit,
-  @optional
-  onDrag: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragEnd: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragEnter: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragExit: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragLeave: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragOver: ReactEvent.Mouse.t => unit,
-  @optional
-  onDragStart: ReactEvent.Mouse.t => unit,
-  @optional
-  onDrop: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseDown: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseEnter: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseLeave: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseMove: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseOut: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseOver: ReactEvent.Mouse.t => unit,
-  @optional
-  onMouseUp: ReactEvent.Mouse.t => unit,
-  /* Selection events */
-  @optional
-  onSelect: ReactEvent.Selection.t => unit,
-  /* Touch events */
-  @optional
-  onTouchCancel: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchEnd: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchMove: ReactEvent.Touch.t => unit,
-  @optional
-  onTouchStart: ReactEvent.Touch.t => unit,
-  /* UI events */
-  @optional
-  onScroll: ReactEvent.UI.t => unit,
-  /* Wheel events */
-  @optional
-  onWheel: ReactEvent.Wheel.t => unit,
-  /* Media events */
-  @optional
-  onAbort: ReactEvent.Media.t => unit,
-  @optional
-  onCanPlay: ReactEvent.Media.t => unit,
-  @optional
-  onCanPlayThrough: ReactEvent.Media.t => unit,
-  @optional
-  onDurationChange: ReactEvent.Media.t => unit,
-  @optional
-  onEmptied: ReactEvent.Media.t => unit,
-  @optional
-  onEncrypetd: ReactEvent.Media.t => unit,
-  @optional
-  onEnded: ReactEvent.Media.t => unit,
-  @optional
-  onError: ReactEvent.Media.t => unit,
-  @optional
-  onLoadedData: ReactEvent.Media.t => unit,
-  @optional
-  onLoadedMetadata: ReactEvent.Media.t => unit,
-  @optional
-  onLoadStart: ReactEvent.Media.t => unit,
-  @optional
-  onPause: ReactEvent.Media.t => unit,
-  @optional
-  onPlay: ReactEvent.Media.t => unit,
-  @optional
-  onPlaying: ReactEvent.Media.t => unit,
-  @optional
-  onProgress: ReactEvent.Media.t => unit,
-  @optional
-  onRateChange: ReactEvent.Media.t => unit,
-  @optional
-  onSeeked: ReactEvent.Media.t => unit,
-  @optional
-  onSeeking: ReactEvent.Media.t => unit,
-  @optional
-  onStalled: ReactEvent.Media.t => unit,
-  @optional
-  onSuspend: ReactEvent.Media.t => unit,
-  @optional
-  onTimeUpdate: ReactEvent.Media.t => unit,
-  @optional
-  onVolumeChange: ReactEvent.Media.t => unit,
-  @optional
-  onWaiting: ReactEvent.Media.t => unit,
-  /* Image events */
-  @optional
-  onLoad: ReactEvent.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */,
-  /* Animation events */
-  @optional
-  onAnimationStart: ReactEvent.Animation.t => unit,
-  @optional
-  onAnimationEnd: ReactEvent.Animation.t => unit,
-  @optional
-  onAnimationIteration: ReactEvent.Animation.t => unit,
-  /* Transition events */
-  @optional
-  onTransitionEnd: ReactEvent.Transition.t => unit,
-  /* svg */
-  @optional
-  accentHeight: string,
-  @optional
-  accumulate: string,
-  @optional
-  additive: string,
-  @optional
-  alignmentBaseline: string,
-  @optional
-  allowReorder: string,
-  @optional
-  alphabetic: string,
-  @optional
-  amplitude: string,
-  @optional
-  arabicForm: string,
-  @optional
-  ascent: string,
-  @optional
-  attributeName: string,
-  @optional
-  attributeType: string,
-  @optional
-  autoReverse: string,
-  @optional
-  azimuth: string,
-  @optional
-  baseFrequency: string,
-  @optional
-  baseProfile: string,
-  @optional
-  baselineShift: string,
-  @optional
-  bbox: string,
-  @optional @as("begin")
-  begin_: string /* use this one. Previous one is deprecated */,
-  @optional
-  bias: string,
-  @optional
-  by: string,
-  @optional
-  calcMode: string,
-  @optional
-  capHeight: string,
-  @optional
-  clip: string,
-  @optional
-  clipPath: string,
-  @optional
-  clipPathUnits: string,
-  @optional
-  clipRule: string,
-  @optional
-  colorInterpolation: string,
-  @optional
-  colorInterpolationFilters: string,
-  @optional
-  colorProfile: string,
-  @optional
-  colorRendering: string,
-  @optional
-  contentScriptType: string,
-  @optional
-  contentStyleType: string,
-  @optional
-  cursor: string,
-  @optional
-  cx: string,
-  @optional
-  cy: string,
-  @optional
-  d: string,
-  @optional
-  decelerate: string,
-  @optional
-  descent: string,
-  @optional
-  diffuseConstant: string,
-  @optional
-  direction: string,
-  @optional
-  display: string,
-  @optional
-  divisor: string,
-  @optional
-  dominantBaseline: string,
-  @optional
-  dur: string,
-  @optional
-  dx: string,
-  @optional
-  dy: string,
-  @optional
-  edgeMode: string,
-  @optional
-  elevation: string,
-  @optional
-  enableBackground: string,
-  @optional @as("end")
-  end_: string /* use this one. Previous one is deprecated */,
-  @optional
-  exponent: string,
-  @optional
-  externalResourcesRequired: string,
-  @optional
-  fill: string,
-  @optional
-  fillOpacity: string,
-  @optional
-  fillRule: string,
-  @optional
-  filter: string,
-  @optional
-  filterRes: string,
-  @optional
-  filterUnits: string,
-  @optional
-  floodColor: string,
-  @optional
-  floodOpacity: string,
-  @optional
-  focusable: string,
-  @optional
-  fontFamily: string,
-  @optional
-  fontSize: string,
-  @optional
-  fontSizeAdjust: string,
-  @optional
-  fontStretch: string,
-  @optional
-  fontStyle: string,
-  @optional
-  fontVariant: string,
-  @optional
-  fontWeight: string,
-  @optional
-  fomat: string,
-  @optional
-  from: string,
-  @optional
-  fx: string,
-  @optional
-  fy: string,
-  @optional
-  g1: string,
-  @optional
-  g2: string,
-  @optional
-  glyphName: string,
-  @optional
-  glyphOrientationHorizontal: string,
-  @optional
-  glyphOrientationVertical: string,
-  @optional
-  glyphRef: string,
-  @optional
-  gradientTransform: string,
-  @optional
-  gradientUnits: string,
-  @optional
-  hanging: string,
-  @optional
-  horizAdvX: string,
-  @optional
-  horizOriginX: string,
-  @optional
-  ideographic: string,
-  @optional
-  imageRendering: string,
-  @optional @as("in")
-  in_: string /* use this one. Previous one is deprecated */,
-  @optional
-  in2: string,
-  @optional
-  intercept: string,
-  @optional
-  k: string,
-  @optional
-  k1: string,
-  @optional
-  k2: string,
-  @optional
-  k3: string,
-  @optional
-  k4: string,
-  @optional
-  kernelMatrix: string,
-  @optional
-  kernelUnitLength: string,
-  @optional
-  kerning: string,
-  @optional
-  keyPoints: string,
-  @optional
-  keySplines: string,
-  @optional
-  keyTimes: string,
-  @optional
-  lengthAdjust: string,
-  @optional
-  letterSpacing: string,
-  @optional
-  lightingColor: string,
-  @optional
-  limitingConeAngle: string,
-  @optional
-  local: string,
-  @optional
-  markerEnd: string,
-  @optional
-  markerHeight: string,
-  @optional
-  markerMid: string,
-  @optional
-  markerStart: string,
-  @optional
-  markerUnits: string,
-  @optional
-  markerWidth: string,
-  @optional
-  mask: string,
-  @optional
-  maskContentUnits: string,
-  @optional
-  maskUnits: string,
-  @optional
-  mathematical: string,
-  @optional
-  mode: string,
-  @optional
-  numOctaves: string,
-  @optional
-  offset: string,
-  @optional
-  opacity: string,
-  @optional
-  operator: string,
-  @optional
-  order: string,
-  @optional
-  orient: string,
-  @optional
-  orientation: string,
-  @optional
-  origin: string,
-  @optional
-  overflow: string,
-  @optional
-  overflowX: string,
-  @optional
-  overflowY: string,
-  @optional
-  overlinePosition: string,
-  @optional
-  overlineThickness: string,
-  @optional
-  paintOrder: string,
-  @optional
-  panose1: string,
-  @optional
-  pathLength: string,
-  @optional
-  patternContentUnits: string,
-  @optional
-  patternTransform: string,
-  @optional
-  patternUnits: string,
-  @optional
-  pointerEvents: string,
-  @optional
-  points: string,
-  @optional
-  pointsAtX: string,
-  @optional
-  pointsAtY: string,
-  @optional
-  pointsAtZ: string,
-  @optional
-  preserveAlpha: string,
-  @optional
-  preserveAspectRatio: string,
-  @optional
-  primitiveUnits: string,
-  @optional
-  r: string,
-  @optional
-  radius: string,
-  @optional
-  refX: string,
-  @optional
-  refY: string,
-  @optional
-  renderingIntent: string,
-  @optional
-  repeatCount: string,
-  @optional
-  repeatDur: string,
-  @optional
-  requiredExtensions: string,
-  @optional
-  requiredFeatures: string,
-  @optional
-  restart: string,
-  @optional
-  result: string,
-  @optional
-  rotate: string,
-  @optional
-  rx: string,
-  @optional
-  ry: string,
-  @optional
-  scale: string,
-  @optional
-  seed: string,
-  @optional
-  shapeRendering: string,
-  @optional
-  slope: string,
-  @optional
-  spacing: string,
-  @optional
-  specularConstant: string,
-  @optional
-  specularExponent: string,
-  @optional
-  speed: string,
-  @optional
-  spreadMethod: string,
-  @optional
-  startOffset: string,
-  @optional
-  stdDeviation: string,
-  @optional
-  stemh: string,
-  @optional
-  stemv: string,
-  @optional
-  stitchTiles: string,
-  @optional
-  stopColor: string,
-  @optional
-  stopOpacity: string,
-  @optional
-  strikethroughPosition: string,
-  @optional
-  strikethroughThickness: string,
-  @optional
-  string: string,
-  @optional
-  stroke: string,
-  @optional
-  strokeDasharray: string,
-  @optional
-  strokeDashoffset: string,
-  @optional
-  strokeLinecap: string,
-  @optional
-  strokeLinejoin: string,
-  @optional
-  strokeMiterlimit: string,
-  @optional
-  strokeOpacity: string,
-  @optional
-  strokeWidth: string,
-  @optional
-  surfaceScale: string,
-  @optional
-  systemLanguage: string,
-  @optional
-  tableValues: string,
-  @optional
-  targetX: string,
-  @optional
-  targetY: string,
-  @optional
-  textAnchor: string,
-  @optional
-  textDecoration: string,
-  @optional
-  textLength: string,
-  @optional
-  textRendering: string,
-  @optional @as("to")
-  to_: string /* use this one. Previous one is deprecated */,
-  @optional
-  transform: string,
-  @optional
-  u1: string,
-  @optional
-  u2: string,
-  @optional
-  underlinePosition: string,
-  @optional
-  underlineThickness: string,
-  @optional
-  unicode: string,
-  @optional
-  unicodeBidi: string,
-  @optional
-  unicodeRange: string,
-  @optional
-  unitsPerEm: string,
-  @optional
-  vAlphabetic: string,
-  @optional
-  vHanging: string,
-  @optional
-  vIdeographic: string,
-  @optional
-  vMathematical: string,
-  @optional
-  values: string,
-  @optional
-  vectorEffect: string,
-  @optional
-  version: string,
-  @optional
-  vertAdvX: string,
-  @optional
-  vertAdvY: string,
-  @optional
-  vertOriginX: string,
-  @optional
-  vertOriginY: string,
-  @optional
-  viewBox: string,
-  @optional
-  viewTarget: string,
-  @optional
-  visibility: string,
-  /* width::string? => */
-  @optional
-  widths: string,
-  @optional
-  wordSpacing: string,
-  @optional
-  writingMode: string,
-  @optional
-  x: string,
-  @optional
-  x1: string,
-  @optional
-  x2: string,
-  @optional
-  xChannelSelector: string,
-  @optional
-  xHeight: string,
-  @optional
-  xlinkActuate: string,
-  @optional
-  xlinkArcrole: string,
-  @optional
-  xlinkHref: string,
-  @optional
-  xlinkRole: string,
-  @optional
-  xlinkShow: string,
-  @optional
-  xlinkTitle: string,
-  @optional
-  xlinkType: string,
-  @optional
-  xmlns: string,
-  @optional
-  xmlnsXlink: string,
-  @optional
-  xmlBase: string,
-  @optional
-  xmlLang: string,
-  @optional
-  xmlSpace: string,
-  @optional
-  y: string,
-  @optional
-  y1: string,
-  @optional
-  y2: string,
-  @optional
-  yChannelSelector: string,
-  @optional
-  z: string,
-  @optional
-  zoomAndPan: string,
-  /* RDFa */
-  @optional
-  about: string,
-  @optional
-  datatype: string,
-  @optional
-  inlist: string,
-  @optional
-  prefix: string,
-  @optional
-  property: string,
-  @optional
-  resource: string,
-  @optional
-  typeof: string,
-  @optional
-  vocab: string,
-  /* react-specific */
-  @optional
-  dangerouslySetInnerHTML: {"__html": string},
-  @optional
-  suppressContentEditableWarning: bool,
-}
-
-external objToDOMProps: {..} => props = "%identity"
-
-@deprecated("Please use ReactDOMRe.props instead")
-type reactDOMProps = props
-
-@variadic @val @module("react")
-external createElement: (string, ~props: props=?, array<React.element>) => React.element =
-  "createElement"
-
-/* Only wanna expose createElementVariadic here. Don't wanna write an interface file */
-include (
-  /* Use varargs to avoid the ReactJS warning for duplicate keys in children */
-  {
-    @val @module("react")
-    external createElementInternalHack: 'a = "createElement"
-    @send
-    external apply: ('theFunction, 'theContext, 'arguments) => 'returnTypeOfTheFunction = "apply"
-
-    let createElementVariadic = (domClassName, ~props=?, children) => {
-      let variadicArguments =
-        [Obj.magic(domClassName), Obj.magic(props)] |> Js.Array.concat(children)
-      createElementInternalHack->apply(Js.Nullable.null, variadicArguments)
-    }
-  }: {
-    let createElementVariadic: (string, ~props: props=?, array<React.element>) => React.element
-  }
-)
-
-module Style = {
-  type t = style
-  @obj
-  external make: (
-    ~azimuth: string=?,
-    ~background: string=?,
-    ~backgroundAttachment: string=?,
-    ~backgroundColor: string=?,
-    ~backgroundImage: string=?,
-    ~backgroundPosition: string=?,
-    ~backgroundRepeat: string=?,
-    ~border: string=?,
-    ~borderCollapse: string=?,
-    ~borderColor: string=?,
-    ~borderSpacing: string=?,
-    ~borderStyle: string=?,
-    ~borderTop: string=?,
-    ~borderRight: string=?,
-    ~borderBottom: string=?,
-    ~borderLeft: string=?,
-    ~borderTopColor: string=?,
-    ~borderRightColor: string=?,
-    ~borderBottomColor: string=?,
-    ~borderLeftColor: string=?,
-    ~borderTopStyle: string=?,
-    ~borderRightStyle: string=?,
-    ~borderBottomStyle: string=?,
-    ~borderLeftStyle: string=?,
-    ~borderTopWidth: string=?,
-    ~borderRightWidth: string=?,
-    ~borderBottomWidth: string=?,
-    ~borderLeftWidth: string=?,
-    ~borderWidth: string=?,
-    ~bottom: string=?,
-    ~captionSide: string=?,
-    ~clear: string=?,
-    ~clip: string=?,
-    ~color: string=?,
-    ~content: string=?,
-    ~counterIncrement: string=?,
-    ~counterReset: string=?,
-    ~cue: string=?,
-    ~cueAfter: string=?,
-    ~cueBefore: string=?,
-    ~cursor: string=?,
-    ~direction: string=?,
-    ~display: string=?,
-    ~elevation: string=?,
-    ~emptyCells: string=?,
-    ~float: string=?,
-    ~font: string=?,
-    ~fontFamily: string=?,
-    ~fontSize: string=?,
-    ~fontSizeAdjust: string=?,
-    ~fontStretch: string=?,
-    ~fontStyle: string=?,
-    ~fontVariant: string=?,
-    ~fontWeight: string=?,
-    ~height: string=?,
-    ~left: string=?,
-    ~letterSpacing: string=?,
-    ~lineHeight: string=?,
-    ~listStyle: string=?,
-    ~listStyleImage: string=?,
-    ~listStylePosition: string=?,
-    ~listStyleType: string=?,
-    ~margin: string=?,
-    ~marginTop: string=?,
-    ~marginRight: string=?,
-    ~marginBottom: string=?,
-    ~marginLeft: string=?,
-    ~markerOffset: string=?,
-    ~marks: string=?,
-    ~maxHeight: string=?,
-    ~maxWidth: string=?,
-    ~minHeight: string=?,
-    ~minWidth: string=?,
-    ~orphans: string=?,
-    ~outline: string=?,
-    ~outlineColor: string=?,
-    ~outlineStyle: string=?,
-    ~outlineWidth: string=?,
-    ~overflow: string=?,
-    ~overflowX: string=?,
-    ~overflowY: string=?,
-    ~padding: string=?,
-    ~paddingTop: string=?,
-    ~paddingRight: string=?,
-    ~paddingBottom: string=?,
-    ~paddingLeft: string=?,
-    ~page: string=?,
-    ~pageBreakAfter: string=?,
-    ~pageBreakBefore: string=?,
-    ~pageBreakInside: string=?,
-    ~pause: string=?,
-    ~pauseAfter: string=?,
-    ~pauseBefore: string=?,
-    ~pitch: string=?,
-    ~pitchRange: string=?,
-    ~playDuring: string=?,
-    ~position: string=?,
-    ~quotes: string=?,
-    ~richness: string=?,
-    ~right: string=?,
-    ~size: string=?,
-    ~speak: string=?,
-    ~speakHeader: string=?,
-    ~speakNumeral: string=?,
-    ~speakPunctuation: string=?,
-    ~speechRate: string=?,
-    ~stress: string=?,
-    ~tableLayout: string=?,
-    ~textAlign: string=?,
-    ~textDecoration: string=?,
-    ~textIndent: string=?,
-    ~textShadow: string=?,
-    ~textTransform: string=?,
-    ~top: string=?,
-    ~unicodeBidi: string=?,
-    ~verticalAlign: string=?,
-    ~visibility: string=?,
-    ~voiceFamily: string=?,
-    ~volume: string=?,
-    ~whiteSpace: string=?,
-    ~widows: string=?,
-    ~width: string=?,
-    ~wordSpacing: string=?,
-    ~zIndex: string=?,
-    ~opacity: /* Below properties based on https://www.w3.org/Style/CSS/all-properties */
-    /* Color Level 3 - REC */
-    string=?,
-    ~backgroundOrigin: /* Backgrounds and Borders Level 3 - CR */
-    /* backgroundRepeat - already defined by CSS2Properties */
-    /* backgroundAttachment - already defined by CSS2Properties */
-    string=?,
-    ~backgroundSize: string=?,
-    ~backgroundClip: string=?,
-    ~borderRadius: string=?,
-    ~borderTopLeftRadius: string=?,
-    ~borderTopRightRadius: string=?,
-    ~borderBottomLeftRadius: string=?,
-    ~borderBottomRightRadius: string=?,
-    ~borderImage: string=?,
-    ~borderImageSource: string=?,
-    ~borderImageSlice: string=?,
-    ~borderImageWidth: string=?,
-    ~borderImageOutset: string=?,
-    ~borderImageRepeat: string=?,
-    ~boxShadow: string=?,
-    ~columns: /* Multi-column Layout - CR */
-    string=?,
-    ~columnCount: string=?,
-    ~columnFill: string=?,
-    ~columnGap: string=?,
-    ~columnRule: string=?,
-    ~columnRuleColor: string=?,
-    ~columnRuleStyle: string=?,
-    ~columnRuleWidth: string=?,
-    ~columnSpan: string=?,
-    ~columnWidth: string=?,
-    ~breakAfter: string=?,
-    ~breakBefore: string=?,
-    ~breakInside: string=?,
-    ~rest: /* Speech - CR */
-    string=?,
-    ~restAfter: string=?,
-    ~restBefore: string=?,
-    ~speakAs: string=?,
-    ~voiceBalance: string=?,
-    ~voiceDuration: string=?,
-    ~voicePitch: string=?,
-    ~voiceRange: string=?,
-    ~voiceRate: string=?,
-    ~voiceStress: string=?,
-    ~voiceVolume: string=?,
-    ~objectFit: /* Image Values and Replaced Content Level 3 - CR */
-    string=?,
-    ~objectPosition: string=?,
-    ~imageResolution: string=?,
-    ~imageOrientation: string=?,
-    ~alignContent: /* Flexible Box Layout - CR */
-    string=?,
-    ~alignItems: string=?,
-    ~alignSelf: string=?,
-    ~flex: string=?,
-    ~flexBasis: string=?,
-    ~flexDirection: string=?,
-    ~flexFlow: string=?,
-    ~flexGrow: string=?,
-    ~flexShrink: string=?,
-    ~flexWrap: string=?,
-    ~justifyContent: string=?,
-    ~order: string=?,
-    ~textDecorationColor: /* Text Decoration Level 3 - CR */
-    /* textDecoration - already defined by CSS2Properties */
-    string=?,
-    ~textDecorationLine: string=?,
-    ~textDecorationSkip: string=?,
-    ~textDecorationStyle: string=?,
-    ~textEmphasis: string=?,
-    ~textEmphasisColor: string=?,
-    ~textEmphasisPosition: string=?,
-    ~textEmphasisStyle: string=?,
-    ~textUnderlinePosition: /* textShadow - already defined by CSS2Properties */
-    string=?,
-    ~fontFeatureSettings: /* Fonts Level 3 - CR */
-    string=?,
-    ~fontKerning: string=?,
-    ~fontLanguageOverride: string=?,
-    ~fontSynthesis: /* fontSizeAdjust - already defined by CSS2Properties */
-    /* fontStretch - already defined by CSS2Properties */
-    string=?,
-    ~forntVariantAlternates: string=?,
-    ~fontVariantCaps: string=?,
-    ~fontVariantEastAsian: string=?,
-    ~fontVariantLigatures: string=?,
-    ~fontVariantNumeric: string=?,
-    ~fontVariantPosition: string=?,
-    ~all: /* Cascading and Inheritance Level 3 - CR */
-    string=?,
-    ~glyphOrientationVertical: /* Writing Modes Level 3 - CR */
-    string=?,
-    ~textCombineUpright: string=?,
-    ~textOrientation: string=?,
-    ~writingMode: string=?,
-    ~shapeImageThreshold: /* Shapes Level 1 - CR */
-    string=?,
-    ~shapeMargin: string=?,
-    ~shapeOutside: string=?,
-    ~clipPath: /* Masking Level 1 - CR */
-    string=?,
-    ~clipRule: string=?,
-    ~mask: string=?,
-    ~maskBorder: string=?,
-    ~maskBorderMode: string=?,
-    ~maskBorderOutset: string=?,
-    ~maskBorderRepeat: string=?,
-    ~maskBorderSlice: string=?,
-    ~maskBorderSource: string=?,
-    ~maskBorderWidth: string=?,
-    ~maskClip: string=?,
-    ~maskComposite: string=?,
-    ~maskImage: string=?,
-    ~maskMode: string=?,
-    ~maskOrigin: string=?,
-    ~maskPosition: string=?,
-    ~maskRepeat: string=?,
-    ~maskSize: string=?,
-    ~maskType: string=?,
-    ~backgroundBlendMode: /* Compositing and Blending Level 1 - CR */
-    string=?,
-    ~isolation: string=?,
-    ~mixBlendMode: string=?,
-    ~boxDecorationBreak: /* Fragmentation Level 3 - CR */
-    string=?,
-    ~boxSizing: /* breakAfter - already defined by Multi-column Layout */
-    /* breakBefore - already defined by Multi-column Layout */
-    /* breakInside - already defined by Multi-column Layout */
-    /* Basic User Interface Level 3 - CR */
-    string=?,
-    ~caretColor: string=?,
-    ~navDown: string=?,
-    ~navLeft: string=?,
-    ~navRight: string=?,
-    ~navUp: string=?,
-    ~outlineOffset: string=?,
-    ~resize: string=?,
-    ~textOverflow: string=?,
-    ~grid: /* Grid Layout Level 1 - CR */
-    string=?,
-    ~gridArea: string=?,
-    ~gridAutoColumns: string=?,
-    ~gridAutoFlow: string=?,
-    ~gridAutoRows: string=?,
-    ~gridColumn: string=?,
-    ~gridColumnEnd: string=?,
-    ~gridColumnGap: string=?,
-    ~gridColumnStart: string=?,
-    ~gridGap: string=?,
-    ~gridRow: string=?,
-    ~gridRowEnd: string=?,
-    ~gridRowGap: string=?,
-    ~gridRowStart: string=?,
-    ~gridTemplate: string=?,
-    ~gridTemplateAreas: string=?,
-    ~gridTemplateColumns: string=?,
-    ~gridTemplateRows: string=?,
-    ~willChange: /* Will Change Level 1 - CR */
-    string=?,
-    ~hangingPunctuation: /* Text Level 3 - LC */
-    string=?,
-    ~hyphens: string=?,
-    ~lineBreak: /* letterSpacing - already defined by CSS2Properties */
-    string=?,
-    ~overflowWrap: string=?,
-    ~tabSize: string=?,
-    ~textAlignLast: /* textAlign - already defined by CSS2Properties */
-    string=?,
-    ~textJustify: string=?,
-    ~wordBreak: string=?,
-    ~wordWrap: string=?,
-    ~animation: /* Animations - WD */
-    string=?,
-    ~animationDelay: string=?,
-    ~animationDirection: string=?,
-    ~animationDuration: string=?,
-    ~animationFillMode: string=?,
-    ~animationIterationCount: string=?,
-    ~animationName: string=?,
-    ~animationPlayState: string=?,
-    ~animationTimingFunction: string=?,
-    ~transition: /* Transitions - WD */
-    string=?,
-    ~transitionDelay: string=?,
-    ~transitionDuration: string=?,
-    ~transitionProperty: string=?,
-    ~transitionTimingFunction: string=?,
-    ~backfaceVisibility: /* Transforms Level 1 - WD */
-    string=?,
-    ~perspective: string=?,
-    ~perspectiveOrigin: string=?,
-    ~transform: string=?,
-    ~transformOrigin: string=?,
-    ~transformStyle: string=?,
-    ~justifyItems: /* Box Alignment Level 3 - WD */
-    /* alignContent - already defined by Flexible Box Layout */
-    /* alignItems - already defined by Flexible Box Layout */
-    string=?,
-    ~justifySelf: string=?,
-    ~placeContent: string=?,
-    ~placeItems: string=?,
-    ~placeSelf: string=?,
-    ~appearance: /* Basic User Interface Level 4 - FPWD */
-    string=?,
-    ~caret: string=?,
-    ~caretAnimation: string=?,
-    ~caretShape: string=?,
-    ~userSelect: string=?,
-    ~maxLines: /* Overflow Level 3 - WD */
-    string=?,
-    ~marqueeDirection: /* Basix Box Model - WD */
-    string=?,
-    ~marqueeLoop: string=?,
-    ~marqueeSpeed: string=?,
-    ~marqueeStyle: string=?,
-    ~overflowStyle: string=?,
-    ~rotation: string=?,
-    ~rotationPoint: string=?,
-    ~alignmentBaseline: /* SVG 1.1 - REC */
-    string=?,
-    ~baselineShift: string=?,
-    ~clip: string=?,
-    ~clipPath: string=?,
-    ~clipRule: string=?,
-    ~colorInterpolation: string=?,
-    ~colorInterpolationFilters: string=?,
-    ~colorProfile: string=?,
-    ~colorRendering: string=?,
-    ~cursor: string=?,
-    ~dominantBaseline: string=?,
-    ~fill: string=?,
-    ~fillOpacity: string=?,
-    ~fillRule: string=?,
-    ~filter: string=?,
-    ~floodColor: string=?,
-    ~floodOpacity: string=?,
-    ~glyphOrientationHorizontal: string=?,
-    ~glyphOrientationVertical: string=?,
-    ~imageRendering: string=?,
-    ~kerning: string=?,
-    ~lightingColor: string=?,
-    ~markerEnd: string=?,
-    ~markerMid: string=?,
-    ~markerStart: string=?,
-    ~pointerEvents: string=?,
-    ~shapeRendering: string=?,
-    ~stopColor: string=?,
-    ~stopOpacity: string=?,
-    ~stroke: string=?,
-    ~strokeDasharray: string=?,
-    ~strokeDashoffset: string=?,
-    ~strokeLinecap: string=?,
-    ~strokeLinejoin: string=?,
-    ~strokeMiterlimit: string=?,
-    ~strokeOpacity: string=?,
-    ~strokeWidth: string=?,
-    ~textAnchor: string=?,
-    ~textRendering: string=?,
-    ~rubyAlign: /* Ruby Layout Level 1 - WD */
-    string=?,
-    ~rubyMerge: string=?,
-    ~rubyPosition: string=?,
-    /* Lists and Counters Level 3 - WD */
-    /* listStyle - already defined by CSS2Properties */
-    /* listStyleImage - already defined by CSS2Properties */
-    /* listStylePosition - already defined by CSS2Properties */
-    /* listStyleType - already defined by CSS2Properties */
-    /* counterIncrement - already defined by CSS2Properties */
-    /* counterReset - already defined by CSS2Properties */
-    /* Not added yet
-     * -------------
-     * Generated Content for Paged Media - WD
-     * Generated Content Level 3 - WD
-     * Line Grid Level 1 - WD
-     * Regions - WD
-     * Inline Layout Level 3 - WD
-     * Round Display Level 1 - WD
-     * Image Values and Replaced Content Level 4 - WD
-     * Positioned Layout Level 3 - WD
-     * Filter Effects Level 1 -  -WD
-     * Exclusions Level 1 - WD
-     * Text Level 4 - FPWD
-     * SVG Markers - FPWD
-     * Motion Path Level 1 - FPWD
-     * Color Level 4 - FPWD
-     * SVG Strokes - FPWD
-     * Table Level 3 - FPWD
-     */
-    unit,
-  ) => style = ""
-  /* CSS2Properties: https://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSS2Properties */
-  @val
-  external combine: (@as(json`{}`) _, style, style) => t = "Object.assign"
-
-  external _dictToStyle: Js.Dict.t<string> => style = "%identity"
-
-  let unsafeAddProp = (style, key, value) => {
-    let dict = Js.Dict.empty()
-    Js.Dict.set(dict, key, value)
-    combine(style, _dictToStyle(dict))
-  }
-
-  @val
-  external unsafeAddStyle: (@as(json`{}`) _, style, {..}) => style = "Object.assign"
-}
diff --git a/jscomp/test/reactDOMServerRe.js b/jscomp/test/reactDOMServerRe.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/reactDOMServerRe.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/reactDOMServerRe.res b/jscomp/test/reactDOMServerRe.res
deleted file mode 100644
index 8758a6d..0000000
--- a/jscomp/test/reactDOMServerRe.res
+++ /dev/null
@@ -1,5 +0,0 @@
-@val @module("react-dom/server")
-external renderToString: React.element => string = "renderToString"
-
-@val @module("react-dom/server")
-external renderToStaticMarkup: React.element => string = "renderToStaticMarkup"
diff --git a/jscomp/test/reactEvent.js b/jscomp/test/reactEvent.js
deleted file mode 100644
index 91d374a..0000000
--- a/jscomp/test/reactEvent.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var Synthetic = {};
-
-var Clipboard = {};
-
-var Composition = {};
-
-var Keyboard = {};
-
-var Focus = {};
-
-var Form = {};
-
-var Mouse = {};
-
-var $$Selection = {};
-
-var $$Touch = {};
-
-var UI = {};
-
-var Wheel = {};
-
-var Media = {};
-
-var $$Image = {};
-
-var $$Animation = {};
-
-var Transition = {};
-
-exports.Synthetic = Synthetic;
-exports.Clipboard = Clipboard;
-exports.Composition = Composition;
-exports.Keyboard = Keyboard;
-exports.Focus = Focus;
-exports.Form = Form;
-exports.Mouse = Mouse;
-exports.$$Selection = $$Selection;
-exports.$$Touch = $$Touch;
-exports.UI = UI;
-exports.Wheel = Wheel;
-exports.Media = Media;
-exports.$$Image = $$Image;
-exports.$$Animation = $$Animation;
-exports.Transition = Transition;
-/* No side effect */
diff --git a/jscomp/test/reactEvent.res b/jscomp/test/reactEvent.res
deleted file mode 100644
index d1f3f65..0000000
--- a/jscomp/test/reactEvent.res
+++ /dev/null
@@ -1,224 +0,0 @@
-type synthetic<'a>
-
-module MakeEventWithType = (
-  Type: {
-    type t
-  },
-) => {
-  @get external bubbles: Type.t => bool = "bubbles"
-  @get external cancelable: Type.t => bool = "cancelable"
-  @get external currentTarget: Type.t => {..} = "currentTarget" /* Should return Dom.eventTarget */
-  @get external defaultPrevented: Type.t => bool = "defaultPrevented"
-  @get external eventPhase: Type.t => int = "eventPhase"
-  @get external isTrusted: Type.t => bool = "isTrusted"
-  @get external nativeEvent: Type.t => {..} = "nativeEvent" /* Should return Dom.event */
-  @send external preventDefault: Type.t => unit = "preventDefault"
-  @send
-  external isDefaultPrevented: Type.t => bool = "isDefaultPrevented"
-  @send external stopPropagation: Type.t => unit = "stopPropagation"
-  @send
-  external isPropagationStopped: Type.t => bool = "isPropagationStopped"
-  @get external target: Type.t => {..} = "target" /* Should return Dom.eventTarget */
-  @get external timeStamp: Type.t => float = "timeStamp"
-  @get external type_: Type.t => string = "type"
-  @send external persist: Type.t => unit = "persist"
-}
-
-module Synthetic = {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: synthetic<'a> => bool = "bubbles"
-  @get external cancelable: synthetic<'a> => bool = "cancelable"
-  @get
-  external currentTarget: synthetic<'a> => {..} =
-    "currentTarget" /* Should return Dom.eventTarget */
-  @get
-  external defaultPrevented: synthetic<'a> => bool = "defaultPrevented"
-  @get external eventPhase: synthetic<'a> => int = "eventPhase"
-  @get external isTrusted: synthetic<'a> => bool = "isTrusted"
-  @get
-  external nativeEvent: synthetic<'a> => {..} = "nativeEvent" /* Should return Dom.event */
-  @send
-  external preventDefault: synthetic<'a> => unit = "preventDefault"
-  @send
-  external isDefaultPrevented: synthetic<'a> => bool = "isDefaultPrevented"
-  @send
-  external stopPropagation: synthetic<'a> => unit = "stopPropagation"
-  @send
-  external isPropagationStopped: synthetic<'a> => bool = "isPropagationStopped"
-  @get external target: synthetic<'a> => {..} = "target" /* Should return Dom.eventTarget */
-  @get external timeStamp: synthetic<'a> => float = "timeStamp"
-  @get external type_: synthetic<'a> => string = "type"
-  @send external persist: synthetic<'a> => unit = "persist"
-}
-
-/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */
-external toSyntheticEvent: synthetic<'a> => Synthetic.t = "%identity"
-
-module Clipboard = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external clipboardData: t => {..} = "clipboardData" /* Should return Dom.dataTransfer */
-}
-
-module Composition = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external data: t => string = "data"
-}
-
-module Keyboard = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external altKey: t => bool = "altKey"
-  @get external charCode: t => int = "charCode"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external key: t => string = "key"
-  @get external keyCode: t => int = "keyCode"
-  @get external locale: t => string = "locale"
-  @get external location: t => int = "location"
-  @get external metaKey: t => bool = "metaKey"
-  @get external repeat: t => bool = "repeat"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external which: t => int = "which"
-}
-
-module Focus = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get @return(nullable)
-  external relatedTarget: t => option<{..}> = "relatedTarget" /* Should return Dom.eventTarget */
-}
-
-module Form = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Mouse = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external altKey: t => bool = "altKey"
-  @get external button: t => int = "button"
-  @get external buttons: t => int = "buttons"
-  @get external clientX: t => int = "clientX"
-  @get external clientY: t => int = "clientY"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external metaKey: t => bool = "metaKey"
-  @get external movementX: t => int = "movementX"
-  @get external movementY: t => int = "movementY"
-  @get external pageX: t => int = "pageX"
-  @get external pageY: t => int = "pageY"
-  @get @return(nullable)
-  external relatedTarget: t => option<{..}> = "relatedTarget" /* Should return Dom.eventTarget */
-  @get external screenX: t => int = "screenX"
-  @get external screenY: t => int = "screenY"
-  @get external shiftKey: t => bool = "shiftKey"
-}
-
-module Selection = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Touch = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external altKey: t => bool = "altKey"
-  @get external changedTouches: t => {..} = "changedTouches" /* Should return Dom.touchList */
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external metaKey: t => bool = "metaKey"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external targetTouches: t => {..} = "targetTouches" /* Should return Dom.touchList */
-  @get external touches: t => {..} = "touches" /* Should return Dom.touchList */
-}
-
-module UI = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external detail: t => int = "detail"
-  @get external view: t => Dom.window = "view" /* Should return DOMAbstractView/WindowProxy */
-}
-
-module Wheel = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external deltaMode: t => int = "deltaMode"
-  @get external deltaX: t => float = "deltaX"
-  @get external deltaY: t => float = "deltaY"
-  @get external deltaZ: t => float = "deltaZ"
-}
-
-module Media = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Image = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-}
-
-module Animation = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external animationName: t => string = "animationName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
-
-module Transition = {
-  type tag
-  type t = synthetic<tag>
-  include MakeEventWithType({
-    type t = t
-  })
-  @get external propertyName: t => string = "propertyName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
diff --git a/jscomp/test/reactEvent.resi b/jscomp/test/reactEvent.resi
deleted file mode 100644
index 44a6535..0000000
--- a/jscomp/test/reactEvent.resi
+++ /dev/null
@@ -1,405 +0,0 @@
-/* This is the whole synthetic event system of ReactJS/ReasonReact. The first module `Synthetic` represents
-   the generic synthetic event. The rest are the specific ones.
-
-   In each module, the type `t` commonly means "the type of that module" (OCaml convention). In our case, e.g.
-   `ReactEvent.Mouse.t` represents a ReactJS synthetic mouse event. You'd use it to type your props:
-
-   ```
-   type props = {
-     onClick: ReactEvent.Mouse.t => unit
-   };
-   ```
-
-   All the methods and properties of a type of event are in the module, as seen below.
-
-   Each module also has a `tag` type. You can ignore it; they're only needed by their `t` type. This way, we
-   get to allow a base `Synthetic` event module with generic methods. So e.g. even a mouse event (`Mouse.t`)
-   get to be passed to a generic handler:
-
-   ```
-   let handleClick = ({state, props}, event) => {
-     ReactEvent.Mouse.preventDefault(event);
-     ...
-   };
-   let handleSubmit = ({state, props}, event) => {
-     /* this handler can be triggered by either a Keyboard or a Mouse event; conveniently use the generic
-        preventDefault */
-     ReactEvent.Synthetic.preventDefault(event);
-     ...
-   };
-
-   let render = (_) => <Foo onSubmit=handleSubmit onEnter=handleSubmit .../>;
-   ```
-
-   How to translate idioms from ReactJS:
-
-   1. myMouseEvent.preventDefault() -> ReactEvent.Mouse.preventDefault(myMouseEvent)
-   2. myKeyboardEvent.which -> ReactEvent.Keyboard.which(myKeyboardEvent)
- */
-type synthetic<'a>
-
-module Synthetic: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: synthetic<'a> => bool = "bubbles"
-  @get external cancelable: synthetic<'a> => bool = "cancelable"
-  @get
-  external currentTarget: synthetic<'a> => {..} = "currentTarget"
-  @get
-  external defaultPrevented: synthetic<'a> => bool = "defaultPrevented"
-  @get external eventPhase: synthetic<'a> => int = "eventPhase"
-  @get external isTrusted: synthetic<'a> => bool = "isTrusted"
-  @get
-  external nativeEvent: synthetic<'a> => {..} = "nativeEvent"
-  @send
-  external preventDefault: synthetic<'a> => unit = "preventDefault"
-  @send
-  external isDefaultPrevented: synthetic<'a> => bool = "isDefaultPrevented"
-  @send
-  external stopPropagation: synthetic<'a> => unit = "stopPropagation"
-  @send
-  external isPropagationStopped: synthetic<'a> => bool = "isPropagationStopped"
-  @get external target: synthetic<'a> => {..} = "target"
-  @get external timeStamp: synthetic<'a> => float = "timeStamp"
-  @get external type_: synthetic<'a> => string = "type"
-  @send external persist: synthetic<'a> => unit = "persist"
-}
-
-/* Cast any event type to the general synthetic type. This is safe, since synthetic is more general */
-external toSyntheticEvent: synthetic<'a> => Synthetic.t = "%identity"
-
-module Clipboard: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external clipboardData: t => {..} = "clipboardData" /* Should return Dom.dataTransfer */
-}
-
-module Composition: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external data: t => string = "data"
-}
-
-module Keyboard: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external altKey: t => bool = "altKey"
-  @get external charCode: t => int = "charCode"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external key: t => string = "key"
-  @get external keyCode: t => int = "keyCode"
-  @get external locale: t => string = "locale"
-  @get external location: t => int = "location"
-  @get external metaKey: t => bool = "metaKey"
-  @get external repeat: t => bool = "repeat"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external which: t => int = "which"
-}
-
-module Focus: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get @return(nullable)
-  external relatedTarget: t => option<{..}> = "relatedTarget" /* Should return Dom.eventTarget */
-}
-
-module Form: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-}
-
-module Mouse: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external altKey: t => bool = "altKey"
-  @get external button: t => int = "button"
-  @get external buttons: t => int = "buttons"
-  @get external clientX: t => int = "clientX"
-  @get external clientY: t => int = "clientY"
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external metaKey: t => bool = "metaKey"
-  @get external movementX: t => int = "movementX"
-  @get external movementY: t => int = "movementY"
-  @get external pageX: t => int = "pageX"
-  @get external pageY: t => int = "pageY"
-  @get @return(nullable)
-  external relatedTarget: t => option<{..}> = "relatedTarget" /* Should return Dom.eventTarget */
-  @get external screenX: t => int = "screenX"
-  @get external screenY: t => int = "screenY"
-  @get external shiftKey: t => bool = "shiftKey"
-}
-
-module Selection: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-}
-
-module Touch: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external altKey: t => bool = "altKey"
-  @get external changedTouches: t => {..} = "changedTouches" /* Should return Dom.touchList */
-  @get external ctrlKey: t => bool = "ctrlKey"
-  @send
-  external getModifierState: (t, string) => bool = "getModifierState"
-  @get external metaKey: t => bool = "metaKey"
-  @get external shiftKey: t => bool = "shiftKey"
-  @get external targetTouches: t => {..} = "targetTouches" /* Should return Dom.touchList */
-  @get external touches: t => {..} = "touches" /* Should return Dom.touchList */
-}
-
-module UI: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external detail: t => int = "detail"
-  @get external view: t => Dom.window = "view" /* Should return DOMAbstractView/WindowProxy */
-}
-
-module Wheel: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external deltaMode: t => int = "deltaMode"
-  @get external deltaX: t => float = "deltaX"
-  @get external deltaY: t => float = "deltaY"
-  @get external deltaZ: t => float = "deltaZ"
-}
-
-module Media: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-}
-
-module Image: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-}
-
-module Animation: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external animationName: t => string = "animationName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
-
-module Transition: {
-  type tag
-  type t = synthetic<tag>
-  @get external bubbles: t => bool = "bubbles"
-  @get external cancelable: t => bool = "cancelable"
-  @get external currentTarget: t => {..} = "currentTarget"
-  @get external defaultPrevented: t => bool = "defaultPrevented"
-  @get external eventPhase: t => int = "eventPhase"
-  @get external isTrusted: t => bool = "isTrusted"
-  @get external nativeEvent: t => {..} = "nativeEvent"
-  @send external preventDefault: t => unit = "preventDefault"
-  @send external isDefaultPrevented: t => bool = "isDefaultPrevented"
-  @send external stopPropagation: t => unit = "stopPropagation"
-  @send external isPropagationStopped: t => bool = "isPropagationStopped"
-  @get external target: t => {..} = "target"
-  @get external timeStamp: t => float = "timeStamp"
-  @get external type_: t => string = "type"
-  @send external persist: t => unit = "persist"
-  @get external propertyName: t => string = "propertyName"
-  @get external pseudoElement: t => string = "pseudoElement"
-  @get external elapsedTime: t => float = "elapsedTime"
-}
diff --git a/jscomp/test/reactTestUtils.js b/jscomp/test/reactTestUtils.js
deleted file mode 100644
index e17fd62..0000000
--- a/jscomp/test/reactTestUtils.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Belt_Array = require("../../lib/js/belt_Array.js");
-var Belt_Option = require("../../lib/js/belt_Option.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-var TestUtils = require("react-dom/test-utils");
-
-function act(func) {
-  var reactFunc = function () {
-    Curry._1(func, undefined);
-  };
-  TestUtils.act(reactFunc);
-}
-
-function actAsync(func) {
-  return TestUtils.act(function () {
-              return Curry._1(func, undefined);
-            });
-}
-
-function changeWithValue(element, value) {
-  var $$event = {
-    target: {
-      value: value
-    }
-  };
-  TestUtils.Simulate.change(element, $$event);
-}
-
-function changeWithChecked(element, value) {
-  var $$event = {
-    target: {
-      checked: value
-    }
-  };
-  TestUtils.Simulate.change(element, $$event);
-}
-
-var Simulate = {
-  changeWithValue: changeWithValue,
-  changeWithChecked: changeWithChecked
-};
-
-function findBySelector(element, selector) {
-  return element.querySelector(selector);
-}
-
-function findByAllSelector(element, selector) {
-  return Array.from(element.querySelectorAll(selector));
-}
-
-function findBySelectorAndTextContent(element, selector, content) {
-  return Belt_Array.getBy(Array.from(element.querySelectorAll(selector)), (function (node) {
-                return node.textContent === content;
-              }));
-}
-
-function findBySelectorAndPartialTextContent(element, selector, content) {
-  return Belt_Array.getBy(Array.from(element.querySelectorAll(selector)), (function (node) {
-                return node.textContent.includes(content);
-              }));
-}
-
-var DOM = {
-  findBySelector: findBySelector,
-  findByAllSelector: findByAllSelector,
-  findBySelectorAndTextContent: findBySelectorAndTextContent,
-  findBySelectorAndPartialTextContent: findBySelectorAndPartialTextContent
-};
-
-function prepareContainer(container, param) {
-  var containerElement = document.createElement("div");
-  Belt_Option.map(document.body, (function (body) {
-          return body.appendChild(containerElement);
-        }));
-  container.contents = Caml_option.some(containerElement);
-}
-
-function cleanupContainer(container, param) {
-  Belt_Option.map(container.contents, (function (prim) {
-          prim.remove();
-        }));
-  container.contents = undefined;
-}
-
-function getContainer(container) {
-  return Belt_Option.getExn(container.contents);
-}
-
-exports.act = act;
-exports.actAsync = actAsync;
-exports.Simulate = Simulate;
-exports.DOM = DOM;
-exports.prepareContainer = prepareContainer;
-exports.cleanupContainer = cleanupContainer;
-exports.getContainer = getContainer;
-/* react-dom/test-utils Not a pure module */
diff --git a/jscomp/test/reactTestUtils.res b/jscomp/test/reactTestUtils.res
deleted file mode 100644
index 30b7618..0000000
--- a/jscomp/test/reactTestUtils.res
+++ /dev/null
@@ -1,133 +0,0 @@
-type undefined = Js.undefined<unit>
-
-let undefined: undefined = Js.Undefined.empty
-
-@module("react-dom/test-utils")
-external reactAct: ((. ()) => undefined) => unit = "act"
-
-let act: (unit => unit) => unit = func => {
-  let reactFunc = (. ()) => {
-    func()
-    undefined
-  }
-  reactAct(reactFunc)
-}
-
-@module("react-dom/test-utils")
-external reactActAsync: ((. ()) => Js.Promise.t<'a>) => Js.Promise.t<unit> = "act"
-
-let actAsync = func => {
-  let reactFunc = (. ()) => func()
-  reactActAsync(reactFunc)
-}
-
-@module("react-dom/test-utils")
-external isElement: 'element => bool = "isElement"
-
-@module("react-dom/test-utils")
-external isElementOfType: ('element, React.component<'props>) => bool = "isElement"
-
-@module("react-dom/test-utils")
-external isDOMComponent: 'element => bool = "isDOMComponent"
-
-@module("react-dom/test-utils")
-external isCompositeComponent: 'element => bool = "isCompositeComponent"
-
-@module("react-dom/test-utils")
-external isCompositeComponentWithType: ('element, React.component<'props>) => bool =
-  "isCompositeComponentWithType"
-
-module Simulate = {
-  @module("react-dom/test-utils") @scope("Simulate")
-  external click: Dom.element => unit = "click"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external clickWithEvent: (Dom.element, 'event) => unit = "click"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external change: Dom.element => unit = "change"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external blur: Dom.element => unit = "blur"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external changeWithEvent: (Dom.element, 'event) => unit = "change"
-  let changeWithValue = (element, value) => {
-    let event = {
-      "target": {
-        "value": value,
-      },
-    }
-    changeWithEvent(element, event)
-  }
-  let changeWithChecked = (element, value) => {
-    let event = {
-      "target": {
-        "checked": value,
-      },
-    }
-    changeWithEvent(element, event)
-  }
-  @module("react-dom/test-utils") @scope("Simulate")
-  external canPlay: Dom.element => unit = "canPlay"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external timeUpdate: Dom.element => unit = "timeUpdate"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external ended: Dom.element => unit = "ended"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external focus: Dom.element => unit = "focus"
-}
-
-@val external document: Dom.document = "document"
-
-@send
-external querySelector: (Dom.element, string) => option<Dom.element> = "querySelector"
-
-@send
-external querySelectorAll: (Dom.element, string) => Js.Array.array_like<Dom.element> =
-  "querySelectorAll"
-
-@get external textContent: Dom.element => string = "textContent"
-@get external body: Dom.document => option<Dom.element> = "body"
-@send
-external createElement: (Dom.document, string) => Dom.element = "createElement"
-@send external remove: Dom.element => unit = "remove"
-@send
-external appendChild: (Dom.element, Dom.element) => Dom.element = "appendChild"
-
-let querySelectorAll = (element, string) => Js.Array.from(querySelectorAll(element, string))
-
-module DOM = {
-  open Belt
-
-  @return(nullable) @get
-  external value: Dom.element => option<string> = "value"
-
-  let findBySelector = (element, selector) => querySelector(element, selector)
-
-  let findByAllSelector = (element, selector) => querySelectorAll(element, selector)
-
-  let findBySelectorAndTextContent = (element, selector, content) =>
-    querySelectorAll(element, selector)->Array.getBy(node => node->textContent === content)
-
-  let findBySelectorAndPartialTextContent = (element, selector, content) =>
-    querySelectorAll(element, selector)->Array.getBy(node =>
-      node->textContent->Js.String2.includes(content)
-    )
-}
-
-let prepareContainer = (container: ref<option<Dom.element>>, ()) => {
-  open Belt
-
-  let containerElement = document->createElement("div")
-  let _ = document->body->Option.map(body => body->appendChild(containerElement))
-  container := Some(containerElement)
-}
-
-let cleanupContainer = (container: ref<option<Dom.element>>, ()) => {
-  open Belt
-
-  let _ = container.contents->Option.map(remove)
-  container := None
-}
-
-let getContainer = container => {
-  open Belt
-  container.contents->Option.getExn
-}
diff --git a/jscomp/test/reactTestUtils.resi b/jscomp/test/reactTestUtils.resi
deleted file mode 100644
index 3e9b1d8..0000000
--- a/jscomp/test/reactTestUtils.resi
+++ /dev/null
@@ -1,56 +0,0 @@
-let act: (unit => unit) => unit
-
-let actAsync: (unit => Js.Promise.t<'a>) => Js.Promise.t<unit>
-
-@module("react-dom/test-utils")
-external isElement: 'element => bool = "isElement"
-
-@module("react-dom/test-utils")
-external isElementOfType: ('element, React.component<'props>) => bool = "isElement"
-
-@module("react-dom/test-utils")
-external isDOMComponent: 'element => bool = "isDOMComponent"
-
-@module("react-dom/test-utils")
-external isCompositeComponent: 'element => bool = "isCompositeComponent"
-
-@module("react-dom/test-utils")
-external isCompositeComponentWithType: ('element, React.component<'props>) => bool =
-  "isCompositeComponentWithType"
-
-module Simulate: {
-  @module("react-dom/test-utils") @scope("Simulate")
-  external click: Dom.element => unit = "click"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external clickWithEvent: (Dom.element, 'event) => unit = "click"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external change: Dom.element => unit = "change"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external blur: Dom.element => unit = "blur"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external changeWithEvent: (Dom.element, 'event) => unit = "change"
-  let changeWithValue: (Dom.element, string) => unit
-  let changeWithChecked: (Dom.element, bool) => unit
-  @module("react-dom/test-utils") @scope("Simulate")
-  external canPlay: Dom.element => unit = "canPlay"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external timeUpdate: Dom.element => unit = "timeUpdate"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external ended: Dom.element => unit = "ended"
-  @module("react-dom/test-utils") @scope("Simulate")
-  external focus: Dom.element => unit = "focus"
-}
-
-module DOM: {
-  @return(nullable) @get
-  external value: Dom.element => option<string> = "value"
-
-  let findBySelector: (Dom.element, string) => option<Dom.element>
-  let findByAllSelector: (Dom.element, string) => array<Dom.element>
-  let findBySelectorAndTextContent: (Dom.element, string, string) => option<Dom.element>
-  let findBySelectorAndPartialTextContent: (Dom.element, string, string) => option<Dom.element>
-}
-
-let prepareContainer: (ref<option<Dom.element>>, unit) => unit
-let cleanupContainer: (ref<option<Dom.element>>, unit) => unit
-let getContainer: ref<option<Dom.element>> => Dom.element
diff --git a/jscomp/test/reasonReact.js b/jscomp/test/reasonReact.js
deleted file mode 100644
index 6bb5965..0000000
--- a/jscomp/test/reasonReact.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var React = require("react");
-
-function createDomElement(s, props, children) {
-  var vararg = [
-      s,
-      props
-    ].concat(children);
-  return Curry._2(React.createElement.apply, null, vararg);
-}
-
-function anyToUnit(param) {
-  
-}
-
-function anyToTrue(param) {
-  return true;
-}
-
-function willReceivePropsDefault(param) {
-  return param.state;
-}
-
-function renderDefault(_self) {
-  return "RenderNotImplemented";
-}
-
-function initialStateDefault(param) {
-  
-}
-
-function reducerDefault(_action, _state) {
-  return "NoUpdate";
-}
-
-function basicComponent(debugName) {
-  return {
-          debugName: debugName,
-          reactClassInternal: debugName,
-          handedOffState: {
-            contents: undefined
-          },
-          willReceiveProps: willReceivePropsDefault,
-          didMount: anyToUnit,
-          didUpdate: anyToUnit,
-          willUnmount: anyToUnit,
-          willUpdate: anyToUnit,
-          shouldUpdate: anyToTrue,
-          render: renderDefault,
-          initialState: initialStateDefault,
-          retainedProps: undefined,
-          reducer: reducerDefault,
-          jsElementWrapped: undefined
-        };
-}
-
-var statelessComponent = basicComponent;
-
-var statelessComponentWithRetainedProps = basicComponent;
-
-var reducerComponent = basicComponent;
-
-var reducerComponentWithRetainedProps = basicComponent;
-
-function element(keyOpt, refOpt, component) {
-  var key = keyOpt !== undefined ? keyOpt : undefined;
-  var ref = refOpt !== undefined ? refOpt : undefined;
-  var element$1 = {
-    TAG: "Element",
-    _0: component
-  };
-  var jsElementWrapped = component.jsElementWrapped;
-  if (jsElementWrapped !== undefined) {
-    return Curry._2(jsElementWrapped, key, ref);
-  } else {
-    return React.createElement(component.reactClassInternal, {
-                key: key,
-                ref: ref,
-                reasonProps: element$1
-              });
-  }
-}
-
-function wrapReasonForJs(component, jsPropsToReason) {
-  var uncurriedJsPropsToReason = Curry.__1(jsPropsToReason);
-  component.reactClassInternal.prototype.jsPropsToReason = uncurriedJsPropsToReason;
-  return component.reactClassInternal;
-}
-
-var dummyInteropComponent = basicComponent("interop");
-
-function wrapJsForReason(reactClass, props, children) {
-  var jsElementWrapped = (function (param, param$1) {
-      var props$1 = Object.assign(Object.assign({}, props), {
-            ref: param$1,
-            key: param
-          });
-      var varargs = [
-          reactClass,
-          props$1
-        ].concat(children);
-      return Curry._2(React.createElement.apply, null, varargs);
-    });
-  return {
-          debugName: dummyInteropComponent.debugName,
-          reactClassInternal: dummyInteropComponent.reactClassInternal,
-          handedOffState: dummyInteropComponent.handedOffState,
-          willReceiveProps: dummyInteropComponent.willReceiveProps,
-          didMount: dummyInteropComponent.didMount,
-          didUpdate: dummyInteropComponent.didUpdate,
-          willUnmount: dummyInteropComponent.willUnmount,
-          willUpdate: dummyInteropComponent.willUpdate,
-          shouldUpdate: dummyInteropComponent.shouldUpdate,
-          render: dummyInteropComponent.render,
-          initialState: dummyInteropComponent.initialState,
-          retainedProps: dummyInteropComponent.retainedProps,
-          reducer: dummyInteropComponent.reducer,
-          jsElementWrapped: jsElementWrapped
-        };
-}
-
-var Router;
-
-exports.statelessComponent = statelessComponent;
-exports.statelessComponentWithRetainedProps = statelessComponentWithRetainedProps;
-exports.reducerComponent = reducerComponent;
-exports.reducerComponentWithRetainedProps = reducerComponentWithRetainedProps;
-exports.element = element;
-exports.wrapReasonForJs = wrapReasonForJs;
-exports.createDomElement = createDomElement;
-exports.wrapJsForReason = wrapJsForReason;
-exports.Router = Router;
-/* dummyInteropComponent Not a pure module */
diff --git a/jscomp/test/reasonReact.res b/jscomp/test/reasonReact.res
deleted file mode 100644
index 0bb79e4..0000000
--- a/jscomp/test/reasonReact.res
+++ /dev/null
@@ -1,308 +0,0 @@
-// Prevent warning about the `retainedProps` field being defined in both
-// `self` and `componentSpec` record types.
-@@warning("-30")
-
-type reactClass
-
-type jsProps
-
-type reactElement = React.element
-
-type reactRef
-
-@val external null: reactElement = "null"
-
-external string: string => reactElement = "%identity"
-
-external array: array<reactElement> => reactElement = "%identity"
-
-external refToJsObj: reactRef => {..} = "%identity"
-
-@variadic @val @module("react")
-external createElement: (reactClass, ~props: {..}=?, array<reactElement>) => reactElement =
-  "createElement"
-
-@variadic @module("react")
-external cloneElement: (reactElement, ~props: {..}=?, array<reactElement>) => reactElement =
-  "cloneElement"
-
-@val @module("react")
-external createElementVerbatim: 'a = "createElement"
-
-let createDomElement = (s, ~props, children) => {
-  let vararg = [Obj.magic(s), Obj.magic(props)] |> Js.Array.concat(children)
-  /* Use varargs to avoid warnings on duplicate keys in children */
-  Obj.magic(createElementVerbatim)["apply"](Js.Nullable.null, vararg)
-}
-
-@val external magicNull: 'a = "null"
-
-type reactClassInternal = reactClass
-
-type renderNotImplemented = RenderNotImplemented
-
-type stateless = unit
-
-type noRetainedProps = unit
-
-type actionless = unit
-
-/* **
- * Elements are what JSX blocks become. They represent the *potential* for a
- * component instance and state to be created / updated. They are not yet
- * instances.
- */
-type rec element = Element(component<'state, 'retainedProps, 'action>): element
-and jsPropsToReason<'jsProps, 'state, 'retainedProps, 'action> = 'jsProps => component<
-  'state,
-  'retainedProps,
-  'action,
->
-and uncurriedJsPropsToReason<'jsProps, 'state, 'retainedProps, 'action> = (
-  . 'jsProps,
-) => component<'state, 'retainedProps, 'action>
-/* **
- * Type of hidden field for Reason components that use JS components
- */
-and jsElementWrapped = option<
-  (~key: Js.nullable<string>, ~ref: Js.nullable<Js.nullable<reactRef> => unit>) => reactElement,
->
-and update<'state, 'retainedProps, 'action> =
-  | NoUpdate
-  | Update('state)
-  | SideEffects(self<'state, 'retainedProps, 'action> => unit)
-  | UpdateWithSideEffects('state, self<'state, 'retainedProps, 'action> => unit)
-/* **
- * Granularly types state, and initial state as being independent, so that we
- * may include a template that all instances extend from.
- */
-and componentSpec<'state, 'initialState, 'retainedProps, 'initialRetainedProps, 'action> = {
-  debugName: string,
-  reactClassInternal: reactClassInternal,
-  /* Keep here as a way to prove that the API may be implemented soundly */
-  mutable handedOffState: ref<option<'state>>,
-  willReceiveProps: self<'state, 'retainedProps, 'action> => 'state,
-  didMount: self<'state, 'retainedProps, 'action> => unit,
-  didUpdate: oldNewSelf<'state, 'retainedProps, 'action> => unit,
-  willUnmount: self<'state, 'retainedProps, 'action> => unit,
-  willUpdate: oldNewSelf<'state, 'retainedProps, 'action> => unit,
-  shouldUpdate: oldNewSelf<'state, 'retainedProps, 'action> => bool,
-  render: self<'state, 'retainedProps, 'action> => reactElement,
-  initialState: unit => 'initialState,
-  retainedProps: 'initialRetainedProps,
-  reducer: ('action, 'state) => update<'state, 'retainedProps, 'action>,
-  jsElementWrapped: jsElementWrapped,
-}
-and component<'state, 'retainedProps, 'action> = componentSpec<
-  'state,
-  'state,
-  'retainedProps,
-  'retainedProps,
-  'action,
->
-and self<'state, 'retainedProps, 'action> = {
-  handle: 'payload. (('payload, self<'state, 'retainedProps, 'action>) => unit, 'payload) => unit,
-  state: 'state,
-  retainedProps: 'retainedProps,
-  send: 'action => unit,
-  onUnmount: (unit => unit) => unit,
-}
-and oldNewSelf<'state, 'retainedProps, 'action> = {
-  oldSelf: self<'state, 'retainedProps, 'action>,
-  newSelf: self<'state, 'retainedProps, 'action>,
-}
-
-type rec jsComponentThis<'state, 'props, 'retainedProps, 'action> = {
-  "state": totalState<'state, 'retainedProps, 'action>,
-  "props": {"reasonProps": 'props},
-  "setState": @meth (
-    (
-      totalState<'state, 'retainedProps, 'action>,
-      'props,
-    ) => totalState<'state, 'retainedProps, 'action>,
-    Js.nullable<unit => unit>,
-  ) => unit,
-  "jsPropsToReason": option<uncurriedJsPropsToReason<'props, 'state, 'retainedProps, 'action>>,
-}
-/* **
- * `totalState` tracks all of the internal reason API bookkeeping.
- *
- * Since we will mutate `totalState` in `shouldComponentUpdate`, and since
- * there's no guarantee that returning true from `shouldComponentUpdate`
- * guarantees that a component's update *actually* takes place (it could get
- * rolled back by Fiber etc), then we should put all properties that we
- * mutate directly on the totalState, so that when Fiber makes backup shallow
- * backup copies of `totalState`, our changes can be rolled back correctly
- * even when we mutate them.
- */
-and totalState<'state, 'retainedProps, 'action> = {"reasonState": 'state}
-
-let anyToUnit = _ => ()
-
-let anyToTrue = _ => true
-
-let willReceivePropsDefault = ({state}) => state
-
-let renderDefault = _self => string("RenderNotImplemented")
-
-let initialStateDefault = () => ()
-
-let reducerDefault: ('action, 'state) => update<'state, 'retainedProps, 'action> = (
-  _action,
-  _state,
-) => NoUpdate
-
-let convertPropsIfTheyreFromJs = (props, jsPropsToReason, debugName) => {
-  let props = Obj.magic(props)
-  switch (Js.Nullable.toOption(props["reasonProps"]), jsPropsToReason) {
-  | (Some(props), _) => props
-  | (None, Some(toReasonProps)) => Element(toReasonProps(. props))
-  | (None, None) =>
-    raise(
-      Invalid_argument(
-        "A JS component called the Reason component " ++
-        (debugName ++
-        " which didn't implement the JS->Reason React props conversion."),
-      ),
-    )
-  }
-}
-
-// Old reason-react sources converted from .re syntax.
-// The OCaml object system is not available in ReScript anymore
-// let createClass = (type reasonState retainedProps action, debugName): reactClass =>
-//   ReasonReactOptimizedCreateClass.createClass(. Pexp_object not implemented in printer)
-let createClass = Obj.magic
-
-let basicComponent = debugName => {
-  let componentTemplate = {
-    reactClassInternal: createClass(debugName),
-    debugName: debugName,
-    /* Keep here as a way to prove that the API may be implemented soundly */
-    handedOffState: {
-      contents: None,
-    },
-    didMount: anyToUnit,
-    willReceiveProps: willReceivePropsDefault,
-    didUpdate: anyToUnit,
-    willUnmount: anyToUnit,
-    willUpdate: anyToUnit,
-    /* **
-     * Called when component will certainly mount at some point - and may be
-     * called on the sever for server side React rendering.
-     */
-    shouldUpdate: anyToTrue,
-    render: renderDefault,
-    initialState: initialStateDefault,
-    reducer: reducerDefault,
-    jsElementWrapped: None,
-    retainedProps: (),
-  }
-  componentTemplate
-}
-
-let statelessComponent = (debugName): component<stateless, noRetainedProps, actionless> =>
-  basicComponent(debugName)
-
-let statelessComponentWithRetainedProps = (debugName): componentSpec<
-  stateless,
-  stateless,
-  'retainedProps,
-  noRetainedProps,
-  actionless,
-> => basicComponent(debugName)
-
-let reducerComponent = (debugName): componentSpec<
-  'state,
-  stateless,
-  noRetainedProps,
-  noRetainedProps,
-  'action,
-> => basicComponent(debugName)
-
-let reducerComponentWithRetainedProps = (debugName): componentSpec<
-  'state,
-  stateless,
-  'retainedProps,
-  noRetainedProps,
-  'action,
-> => basicComponent(debugName)
-
-/* **
- * Convenience for creating React elements before we have a better JSX transform.  Hopefully this makes it
- * usable to build some components while waiting to migrate the JSX transform to the next API.
- *
- * Constrain the component here instead of relying on the Element constructor which would lead to confusing
- * error messages.
- */
-let element = (
-  ~key: string=Obj.magic(Js.Nullable.undefined),
-  ~ref: Js.nullable<reactRef> => unit=Obj.magic(Js.Nullable.undefined),
-  component: component<'state, 'retainedProps, 'action>,
-) => {
-  let element = Element(component)
-  switch component.jsElementWrapped {
-  | Some(jsElementWrapped) =>
-    jsElementWrapped(~key=Js.Nullable.return(key), ~ref=Js.Nullable.return(ref))
-  | None =>
-    createElement(
-      component.reactClassInternal,
-      ~props={"key": key, "ref": ref, "reasonProps": element},
-      [],
-    )
-  }
-}
-
-let wrapReasonForJs = (
-  ~component,
-  jsPropsToReason: jsPropsToReason<'jsProps, 'state, 'retainedProps, 'action>,
-) => {
-  let jsPropsToReason: jsPropsToReason<jsProps, 'state, 'retainedProps, 'action> = Obj.magic(
-    jsPropsToReason,
-  ) /* cast 'jsProps to jsProps */
-  let uncurriedJsPropsToReason: uncurriedJsPropsToReason<
-    jsProps,
-    'state,
-    'retainedProps,
-    'action,
-  > = (. jsProps) => jsPropsToReason(jsProps)
-  Obj.magic(component.reactClassInternal)["prototype"]["jsPropsToReason"] = Some(
-    uncurriedJsPropsToReason,
-  )
-  component.reactClassInternal
-}
-
-module WrapProps = {
-  /* We wrap the props for reason->reason components, as a marker that "these props were passed from another
-   reason component" */
-  let wrapProps = (
-    ~reactClass,
-    ~props,
-    children,
-    ~key: Js.nullable<string>,
-    ~ref: Js.nullable<Js.nullable<reactRef> => unit>,
-  ) => {
-    let props = Js.Obj.assign(
-      Js.Obj.assign(Js.Obj.empty(), Obj.magic(props)),
-      {"ref": ref, "key": key},
-    )
-    let varargs = [Obj.magic(reactClass), Obj.magic(props)] |> Js.Array.concat(Obj.magic(children))
-    /* Use varargs under the hood */
-    Obj.magic(createElementVerbatim)["apply"](Js.Nullable.null, varargs)
-  }
-  let dummyInteropComponent = basicComponent("interop")
-  let wrapJsForReason = (~reactClass, ~props, children): component<
-    stateless,
-    noRetainedProps,
-    _,
-  > => {
-    let jsElementWrapped = Some(wrapProps(~reactClass, ~props, children))
-    {...dummyInteropComponent, jsElementWrapped: jsElementWrapped}
-  }
-}
-
-let wrapJsForReason = WrapProps.wrapJsForReason
-
-@module("react") external fragment: 'a = "Fragment"
-
-module Router = ReasonReactRouter
diff --git a/jscomp/test/reasonReact.resi b/jscomp/test/reasonReact.resi
deleted file mode 100644
index 89d3b7f..0000000
--- a/jscomp/test/reasonReact.resi
+++ /dev/null
@@ -1,214 +0,0 @@
-/* **
- * This API assumes that JSX will desugar <Foo key ref attr1=val1 attrn=valn /> into:
- *
- * ReasonReact.element(
- *   Foo.make(~key, ~ref, ~attr1=val1, ~attrn=valn, [| |]
- * )
- */
-
-type reactClass
-
-type reactElement = React.element
-
-type reactRef
-
-@val external null: reactElement = "null"
-
-external string: string => reactElement = "%identity"
-
-external array: array<reactElement> => reactElement = "%identity"
-
-external refToJsObj: reactRef => {..} = "%identity"
-
-/* This should _not_ be used directly, unless you're passing a class like this:
-
-   switch (actionsClass) {
-   | Some(actions) =>
-       ReasonReact.createElement(
-         actions,
-         ~props={
-           "className": "hi"
-         },
-         [|whatever|],
-       )
-   }
-
-   In every other case, you should be using the JSX
- */
-@variadic @val @module("react")
-external createElement: (reactClass, ~props: {..}=?, array<reactElement>) => reactElement =
-  "createElement"
-
-@variadic @module("react")
-external cloneElement: (reactElement, ~props: {..}=?, array<reactElement>) => reactElement =
-  "cloneElement"
-
-type renderNotImplemented = RenderNotImplemented
-
-/* **
- * A stateless component is a component with state of type unit. This cannot be
- * abstract for now, because a stateless component's willReceiveProps needs to
- * return the state, aka unit. We can provide a helper
- * ReasonReact.statelessReturn that's of type `stateless`, but that's verbose
- */
-type stateless = unit
-
-type noRetainedProps
-
-/* ** An actionless component is a component with actions of type unit */
-type actionless = unit
-
-/* Control how a state update is performed.
-   The state can be updated of left unchanged.
-   Side effects can be specified and are scheduled for later execution.
-   Note: when a side effect is scheduled, it's added to a queue of existing pending side effects.
-   All the side effects are performed in batch after all the state updates have been performed,
-   in the same order in which they were scheduled, just before shouldUpdate is called. */
-type rec update<'state, 'retainedProps, 'action> =
-  | /* Don't update the state. */
-  NoUpdate
-  /* Update the state with the given one. */
-  | Update('state)
-  /* Perform side effects without updating state, and don't trigger a re-render.
-     Do not prevent a re-render either, if one was scheduled to happen.
-     The side effects function is invoked when all the updates have completed. */
-  | SideEffects(self<'state, 'retainedProps, 'action> => unit)
-  /* Update the state and perform side effects.
-   The side effects function is invoked when all the updates have completed. */
-  | UpdateWithSideEffects('state, self<'state, 'retainedProps, 'action> => unit)
-and self<'state, 'retainedProps, 'action> = {
-  /* **
-   * Call a handler function.
-   *
-   * The callback is passed the payload and current state immediately.
-   * Note: the callback typically performs side effects, since it returns nothing.
-   */
-  handle: 'payload. (('payload, self<'state, 'retainedProps, 'action>) => unit, 'payload) => unit,
-  state: 'state,
-  retainedProps: 'retainedProps,
-  send: 'action => unit,
-  onUnmount: (unit => unit) => unit,
-}
-
-type reactClassInternal
-
-/* ** For internal use only */
-type jsElementWrapped
-
-type oldNewSelf<'state, 'retainedProps, 'action> = {
-  oldSelf: self<'state, 'retainedProps, 'action>,
-  newSelf: self<'state, 'retainedProps, 'action>,
-}
-
-type rec componentSpec<'state, 'initialState, 'retainedProps, 'initialRetainedProps, 'action> = {
-  debugName: string,
-  reactClassInternal: reactClassInternal,
-  /* Keep here as a way to prove that the API may be implemented soundly */
-  mutable handedOffState: ref<option<'state>>,
-  /* ** Callback invoked when the component receives new props or state.
-   * Note: this callback must not perform side effects.
-   */
-  willReceiveProps: self<'state, 'retainedProps, 'action> => 'state,
-  didMount: self<'state, 'retainedProps, 'action> => unit,
-  didUpdate: oldNewSelf<'state, 'retainedProps, 'action> => unit,
-  willUnmount: self<'state, 'retainedProps, 'action> => unit,
-  willUpdate: oldNewSelf<'state, 'retainedProps, 'action> => unit,
-  shouldUpdate: oldNewSelf<'state, 'retainedProps, 'action> => bool,
-  render: self<'state, 'retainedProps, 'action> => reactElement,
-  initialState: unit => 'initialState,
-  retainedProps: 'initialRetainedProps,
-  /* ** Reducer callback.
-   *
-   * The callback is invoked by the reduce function contained in self.
-   * A state update is scheduled based on the action passed, and added to the queue of pending updates.
-   * The state received will be the resulting one after the pending updates have been executed.
-   *
-   * Note: this callback must not perform side effects.
-   * If side effects are required, they should be contained in a
-   * side-effectful function specified in the returned update.
-   */
-  reducer: ('action, 'state) => update<'state, 'retainedProps, 'action>,
-  jsElementWrapped: jsElementWrapped,
-}
-and component<'state, 'retainedProps, 'action> = componentSpec<
-  'state,
-  'state,
-  'retainedProps,
-  'retainedProps,
-  'action,
->
-
-/* ** Create a stateless component: i.e. a component where state has type stateless. */
-let statelessComponent: string => componentSpec<
-  stateless,
-  stateless,
-  noRetainedProps,
-  noRetainedProps,
-  actionless,
->
-
-let statelessComponentWithRetainedProps: string => componentSpec<
-  stateless,
-  stateless,
-  'retainedProps,
-  noRetainedProps,
-  actionless,
->
-
-let reducerComponent: string => componentSpec<
-  'state,
-  stateless,
-  noRetainedProps,
-  noRetainedProps,
-  'action,
->
-
-let reducerComponentWithRetainedProps: string => componentSpec<
-  'state,
-  stateless,
-  'retainedProps,
-  noRetainedProps,
-  'action,
->
-
-let element: (
-  ~key: string=?,
-  ~ref: Js.nullable<reactRef> => unit=?,
-  component<'state, 'retainedProps, 'action>,
-) => reactElement
-
-type jsPropsToReason<'jsProps, 'state, 'retainedProps, 'action> = 'jsProps => component<
-  'state,
-  'retainedProps,
-  'action,
->
-
-/* **
- * We *under* constrain the kind of component spec this accepts because we actually extend the *originally*
- * defined component. It uses mutation on the original component, so that even if it is extended with
- * {...component}, all extensions will also see the underlying js class. I can sleep at night because js
- * interop is integrating with untyped, code and it is *possible* to create pure-ReasonReact apps without JS
- * interop entirely. */
-let wrapReasonForJs: (
-  ~component: componentSpec<'state, 'initialState, 'retainedProps, 'initialRetainedProps, 'action>,
-  jsPropsToReason<_>,
-) => reactClass
-
-@deprecated("
-Were you using this because you needed to pass a children array reference to a DOM element?  We now support children spread for DOM elements: `<div> ...children </div>`.
-Alternatively, if you're using this because the prop name contains a hyphen, please use `ReactDOMRe.createElementVariadic` instead.")
-let createDomElement: (string, ~props: {..}, array<reactElement>) => reactElement
-
-/**
- * Wrap props into a JS component
- * Use for interop when Reason components use JS components
- */
-let wrapJsForReason: (
-  ~reactClass: reactClass,
-  ~props: 'a,
-  'b,
-) => component<stateless, noRetainedProps, actionless>
-
-@module("react") external fragment: 'a = "Fragment"
-
-module Router = ReasonReactRouter
diff --git a/jscomp/test/reasonReactCompat.js b/jscomp/test/reasonReactCompat.js
deleted file mode 100644
index f95760f..0000000
--- a/jscomp/test/reasonReactCompat.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var ReasonReact = require("./reasonReact.js");
-
-var wrapReactForReasonReact = ReasonReact.wrapJsForReason;
-
-var wrapReasonReactForReact = ReasonReact.wrapReasonForJs;
-
-exports.wrapReactForReasonReact = wrapReactForReasonReact;
-exports.wrapReasonReactForReact = wrapReasonReactForReact;
-/* ReasonReact Not a pure module */
diff --git a/jscomp/test/reasonReactCompat.res b/jscomp/test/reasonReactCompat.res
deleted file mode 100644
index 3118ab1..0000000
--- a/jscomp/test/reasonReactCompat.res
+++ /dev/null
@@ -1,10 +0,0 @@
-external componentToReasonReactClass: React.component<'props> => ReasonReact.reactClass =
-  "%identity"
-
-external reasonReactClassToComponent: ReasonReact.reactClass => React.component<'props> =
-  "%identity"
-let wrapReactForReasonReact = (component, props, children) =>
-  ReasonReact.wrapJsForReason(~reactClass=componentToReasonReactClass(component), ~props, children)
-
-let wrapReasonReactForReact = (~component, propsConverter) =>
-  reasonReactClassToComponent(ReasonReact.wrapReasonForJs(~component, propsConverter))
diff --git a/jscomp/test/reasonReactCompat.resi b/jscomp/test/reasonReactCompat.resi
deleted file mode 100644
index bb6e9c2..0000000
--- a/jscomp/test/reasonReactCompat.resi
+++ /dev/null
@@ -1,14 +0,0 @@
-let wrapReactForReasonReact: (
-  React.component<'props>,
-  'props,
-  'children,
-) => ReasonReact.component<
-  ReasonReact.stateless,
-  ReasonReact.noRetainedProps,
-  ReasonReact.actionless,
->
-
-let wrapReasonReactForReact: (
-  ~component: ReasonReact.componentSpec<'a, 'b, 'c, 'd, 'e>,
-  ReasonReact.jsPropsToReason<'props, 'g, 'h, 'i>,
-) => React.component<'props>
diff --git a/jscomp/test/reasonReactOptimizedCreateClass.js b/jscomp/test/reasonReactOptimizedCreateClass.js
deleted file mode 100644
index 22bc3fa..0000000
--- a/jscomp/test/reasonReactOptimizedCreateClass.js
+++ /dev/null
@@ -1,893 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var React = require("react");
-
-function _assign(prim0, prim1) {
-  return Object.assign(prim0, prim1);
-}
-
-var emptyObject = {};
-
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-
-// 'use strict';
-
-// var _assign = require('object-assign');
-
-// var emptyObject = require('emptyObject');
-// var _invariant = require('invariant');
-
-// if (process.env.NODE_ENV !== 'production') {
-//   var warning = require('fbjs/lib/warning');
-// }
-
-var MIXINS_KEY = 'mixins';
-
-// Helper function to allow the creation of anonymous functions which do not
-// have .name set to the name of the variable being assigned to.
-function identity(fn) {
-  return fn;
-}
-
-var ReactPropTypeLocationNames;
-// if (process.env.NODE_ENV !== 'production') {
-//   ReactPropTypeLocationNames = {
-//     prop: 'prop',
-//     context: 'context',
-//     childContext: 'child context'
-//   };
-// } else {
-  ReactPropTypeLocationNames = {};
-// }
-;
-
-var factory = (function factory(ReactComponent, isValidElement, ReactNoopUpdateQueue) {
-  /**
-   * Policies that describe methods in \`ReactClassInterface\`.
-   */
-
-  var injectedMixins = [];
-
-  /**
-   * Composite components are higher-level components that compose other composite
-   * or host components.
-   *
-   * To create a new type of \`ReactClass\`, pass a specification of
-   * your new class to \`React.createClass\`. The only requirement of your class
-   * specification is that you implement a \`render\` method.
-   *
-   *   var MyComponent = React.createClass({
-   *     render: function() {
-   *       return <div>Hello World</div>;
-   *     }
-   *   });
-   *
-   * The class specification supports a specific protocol of methods that have
-   * special meaning (e.g. \`render\`). See \`ReactClassInterface\` for
-   * more the comprehensive protocol. Any other properties and methods in the
-   * class specification will be available on the prototype.
-   *
-   * @interface ReactClassInterface
-   * @internal
-   */
-  var ReactClassInterface = {
-    /**
-     * An array of Mixin objects to include when defining your component.
-     *
-     * @type {array}
-     * @optional
-     */
-    mixins: 'DEFINE_MANY',
-
-    /**
-     * An object containing properties and methods that should be defined on
-     * the component's constructor instead of its prototype (static methods).
-     *
-     * @type {object}
-     * @optional
-     */
-    statics: 'DEFINE_MANY',
-
-    /**
-     * Definition of prop types for this component.
-     *
-     * @type {object}
-     * @optional
-     */
-    propTypes: 'DEFINE_MANY',
-
-    /**
-     * Definition of context types for this component.
-     *
-     * @type {object}
-     * @optional
-     */
-    contextTypes: 'DEFINE_MANY',
-
-    /**
-     * Definition of context types this component sets for its children.
-     *
-     * @type {object}
-     * @optional
-     */
-    childContextTypes: 'DEFINE_MANY',
-
-    // ==== Definition methods ====
-
-    /**
-     * Invoked when the component is mounted. Values in the mapping will be set on
-     * \`this.props\` if that prop is not specified (i.e. using an \`in\` check).
-     *
-     * This method is invoked before \`getInitialState\` and therefore cannot rely
-     * on \`this.state\` or use \`this.setState\`.
-     *
-     * @return {object}
-     * @optional
-     */
-    getDefaultProps: 'DEFINE_MANY_MERGED',
-
-    /**
-     * Invoked once before the component is mounted. The return value will be used
-     * as the initial value of \`this.state\`.
-     *
-     *   getInitialState: function() {
-     *     return {
-     *       isOn: false,
-     *       fooBaz: new BazFoo()
-     *     }
-     *   }
-     *
-     * @return {object}
-     * @optional
-     */
-    getInitialState: 'DEFINE_MANY_MERGED',
-
-    /**
-     * @return {object}
-     * @optional
-     */
-    getChildContext: 'DEFINE_MANY_MERGED',
-
-    /**
-     * Uses props from \`this.props\` and state from \`this.state\` to render the
-     * structure of the component.
-     *
-     * No guarantees are made about when or how often this method is invoked, so
-     * it must not have side effects.
-     *
-     *   render: function() {
-     *     var name = this.props.name;
-     *     return <div>Hello, {name}!</div>;
-     *   }
-     *
-     * @return {ReactComponent}
-     * @required
-     */
-    render: 'DEFINE_ONCE',
-
-    // ==== Delegate methods ====
-
-    /**
-     * Invoked when the component is initially created and about to be mounted.
-     * This may have side effects, but any external subscriptions or data created
-     * by this method must be cleaned up in \`componentWillUnmount\`.
-     *
-     * @optional
-     */
-    componentWillMount: 'DEFINE_MANY',
-
-    /**
-     * Invoked when the component has been mounted and has a DOM representation.
-     * However, there is no guarantee that the DOM node is in the document.
-     *
-     * Use this as an opportunity to operate on the DOM when the component has
-     * been mounted (initialized and rendered) for the first time.
-     *
-     * @param {DOMElement} rootNode DOM element representing the component.
-     * @optional
-     */
-    componentDidMount: 'DEFINE_MANY',
-
-    /**
-     * Invoked before the component receives new props.
-     *
-     * Use this as an opportunity to react to a prop transition by updating the
-     * state using \`this.setState\`. Current props are accessed via \`this.props\`.
-     *
-     *   componentWillReceiveProps: function(nextProps, nextContext) {
-     *     this.setState({
-     *       likesIncreasing: nextProps.likeCount > this.props.likeCount
-     *     });
-     *   }
-     *
-     * NOTE: There is no equivalent \`componentWillReceiveState\`. An incoming prop
-     * transition may cause a state change, but the opposite is not true. If you
-     * need it, you are probably looking for \`componentWillUpdate\`.
-     *
-     * @param {object} nextProps
-     * @optional
-     */
-    componentWillReceiveProps: 'DEFINE_MANY',
-
-    /**
-     * Invoked while deciding if the component should be updated as a result of
-     * receiving new props, state and/or context.
-     *
-     * Use this as an opportunity to \`return false\` when you're certain that the
-     * transition to the new props/state/context will not require a component
-     * update.
-     *
-     *   shouldComponentUpdate: function(nextProps, nextState, nextContext) {
-     *     return !equal(nextProps, this.props) ||
-     *       !equal(nextState, this.state) ||
-     *       !equal(nextContext, this.context);
-     *   }
-     *
-     * @param {object} nextProps
-     * @param {?object} nextState
-     * @param {?object} nextContext
-     * @return {boolean} True if the component should update.
-     * @optional
-     */
-    shouldComponentUpdate: 'DEFINE_ONCE',
-
-    /**
-     * Invoked when the component is about to update due to a transition from
-     * \`this.props\`, \`this.state\` and \`this.context\` to \`nextProps\`, \`nextState\`
-     * and \`nextContext\`.
-     *
-     * Use this as an opportunity to perform preparation before an update occurs.
-     *
-     * NOTE: You **cannot** use \`this.setState()\` in this method.
-     *
-     * @param {object} nextProps
-     * @param {?object} nextState
-     * @param {?object} nextContext
-     * @param {ReactReconcileTransaction} transaction
-     * @optional
-     */
-    componentWillUpdate: 'DEFINE_MANY',
-
-    /**
-     * Invoked when the component's DOM representation has been updated.
-     *
-     * Use this as an opportunity to operate on the DOM when the component has
-     * been updated.
-     *
-     * @param {object} prevProps
-     * @param {?object} prevState
-     * @param {?object} prevContext
-     * @param {DOMElement} rootNode DOM element representing the component.
-     * @optional
-     */
-    componentDidUpdate: 'DEFINE_MANY',
-
-    /**
-     * Invoked when the component is about to be removed from its parent and have
-     * its DOM representation destroyed.
-     *
-     * Use this as an opportunity to deallocate any external resources.
-     *
-     * NOTE: There is no \`componentDidUnmount\` since your component will have been
-     * destroyed by that point.
-     *
-     * @optional
-     */
-    componentWillUnmount: 'DEFINE_MANY',
-
-    // ==== Advanced methods ====
-
-    /**
-     * Updates the component's currently mounted DOM representation.
-     *
-     * By default, this implements React's rendering and reconciliation algorithm.
-     * Sophisticated clients may wish to override this.
-     *
-     * @param {ReactReconcileTransaction} transaction
-     * @internal
-     * @overridable
-     */
-    updateComponent: 'OVERRIDE_BASE'
-  };
-
-  /**
-   * Mapping from class specification keys to special processing functions.
-   *
-   * Although these are declared like instance properties in the specification
-   * when defining classes using \`React.createClass\`, they are actually static
-   * and are accessible on the constructor instead of the prototype. Despite
-   * being static, they must be defined outside of the "statics" key under
-   * which all other static methods are defined.
-   */
-  var RESERVED_SPEC_KEYS = {
-    displayName: function(Constructor, displayName) {
-      Constructor.displayName = displayName;
-    },
-    mixins: function(Constructor, mixins) {
-      if (mixins) {
-        for (var i = 0; i < mixins.length; i++) {
-          mixSpecIntoComponent(Constructor, mixins[i]);
-        }
-      }
-    },
-    childContextTypes: function(Constructor, childContextTypes) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   validateTypeDef(Constructor, childContextTypes, 'childContext');
-      // }
-      Constructor.childContextTypes = _assign(
-        {},
-        Constructor.childContextTypes,
-        childContextTypes
-      );
-    },
-    contextTypes: function(Constructor, contextTypes) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   validateTypeDef(Constructor, contextTypes, 'context');
-      // }
-      Constructor.contextTypes = _assign(
-        {},
-        Constructor.contextTypes,
-        contextTypes
-      );
-    },
-    /**
-     * Special case getDefaultProps which should move into statics but requires
-     * automatic merging.
-     */
-    getDefaultProps: function(Constructor, getDefaultProps) {
-      if (Constructor.getDefaultProps) {
-        Constructor.getDefaultProps = createMergedResultFunction(
-          Constructor.getDefaultProps,
-          getDefaultProps
-        );
-      } else {
-        Constructor.getDefaultProps = getDefaultProps;
-      }
-    },
-    propTypes: function(Constructor, propTypes) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   validateTypeDef(Constructor, propTypes, 'prop');
-      // }
-      Constructor.propTypes = _assign({}, Constructor.propTypes, propTypes);
-    },
-    statics: function(Constructor, statics) {
-      mixStaticSpecIntoComponent(Constructor, statics);
-    },
-    autobind: function() {}
-  };
-
-  function validateTypeDef(Constructor, typeDef, location) {
-    for (var propName in typeDef) {
-      // if (typeDef.hasOwnProperty(propName)) {
-      //   // use a warning instead of an _invariant so components
-      //   // don't show up in prod but only in __DEV__
-      //   // if (process.env.NODE_ENV !== 'production') {
-      //   //   warning(
-      //   //     typeof typeDef[propName] === 'function',
-      //   //     '%s: %s type \`%s\` is invalid; it must be a function, usually from ' +
-      //   //       'React.PropTypes.',
-      //   //     Constructor.displayName || 'ReactClass',
-      //   //     ReactPropTypeLocationNames[location],
-      //   //     propName
-      //   //   );
-      //   // }
-      // }
-    }
-  }
-
-  function validateMethodOverride(isAlreadyDefined, name) {
-    var specPolicy = ReactClassInterface.hasOwnProperty(name)
-      ? ReactClassInterface[name]
-      : null;
-
-    // Disallow overriding of base class methods unless explicitly allowed.
-    if (ReactClassMixin.hasOwnProperty(name)) {
-      // _invariant(
-      //   specPolicy === 'OVERRIDE_BASE',
-      //   'ReactClassInterface: You are attempting to override ' +
-      //     '\`%s\` from your class specification. Ensure that your method names ' +
-      //     'do not overlap with React methods.',
-      //   name
-      // );
-    }
-
-    // Disallow defining methods more than once unless explicitly allowed.
-    if (isAlreadyDefined) {
-      // _invariant(
-      //   specPolicy === 'DEFINE_MANY' || specPolicy === 'DEFINE_MANY_MERGED',
-      //   'ReactClassInterface: You are attempting to define ' +
-      //     '\`%s\` on your component more than once. This conflict may be due ' +
-      //     'to a mixin.',
-      //   name
-      // );
-    }
-  }
-
-  /**
-   * Mixin helper which handles policy validation and reserved
-   * specification keys when building React classes.
-   */
-  function mixSpecIntoComponent(Constructor, spec) {
-    if (!spec) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   var typeofSpec = typeof spec;
-      //   var isMixinValid = typeofSpec === 'object' && spec !== null;
-      //
-      //   if (process.env.NODE_ENV !== 'production') {
-      //     warning(
-      //       isMixinValid,
-      //       "%s: You're attempting to include a mixin that is either null " +
-      //         'or not an object. Check the mixins included by the component, ' +
-      //         'as well as any mixins they include themselves. ' +
-      //         'Expected object but got %s.',
-      //       Constructor.displayName || 'ReactClass',
-      //       spec === null ? null : typeofSpec
-      //     );
-      //   }
-      // }
-
-      return;
-    }
-
-    // _invariant(
-    //   typeof spec !== 'function',
-    //   "ReactClass: You're attempting to " +
-    //     'use a component class or function as a mixin. Instead, just use a ' +
-    //     'regular object.'
-    // );
-    // _invariant(
-    //   !isValidElement(spec),
-    //   "ReactClass: You're attempting to " +
-    //     'use a component as a mixin. Instead, just use a regular object.'
-    // );
-
-    var proto = Constructor.prototype;
-    var autoBindPairs = proto.__reactAutoBindPairs;
-
-    // By handling mixins before any other properties, we ensure the same
-    // chaining order is applied to methods with DEFINE_MANY policy, whether
-    // mixins are listed before or after these methods in the spec.
-    if (spec.hasOwnProperty(MIXINS_KEY)) {
-      RESERVED_SPEC_KEYS.mixins(Constructor, spec.mixins);
-    }
-
-    for (var name in spec) {
-      if (!spec.hasOwnProperty(name)) {
-        continue;
-      }
-
-      if (name === MIXINS_KEY) {
-        // We have already handled mixins in a special case above.
-        continue;
-      }
-
-      var property = spec[name];
-      var isAlreadyDefined = proto.hasOwnProperty(name);
-      validateMethodOverride(isAlreadyDefined, name);
-
-      if (RESERVED_SPEC_KEYS.hasOwnProperty(name)) {
-        RESERVED_SPEC_KEYS[name](Constructor, property);
-      } else {
-        // Setup methods on prototype:
-        // The following member methods should not be automatically bound:
-        // 1. Expected ReactClass methods (in the "interface").
-        // 2. Overridden methods (that were mixed in).
-        var isReactClassMethod = ReactClassInterface.hasOwnProperty(name);
-        var isFunction = typeof property === 'function';
-        var shouldAutoBind =
-          isFunction &&
-          !isReactClassMethod &&
-          !isAlreadyDefined &&
-          spec.autobind !== false;
-
-        if (shouldAutoBind) {
-          autoBindPairs.push(name, property);
-          proto[name] = property;
-        } else {
-          if (isAlreadyDefined) {
-            var specPolicy = ReactClassInterface[name];
-
-            // These cases should already be caught by validateMethodOverride.
-            // _invariant(
-            //   isReactClassMethod &&
-            //     (specPolicy === 'DEFINE_MANY_MERGED' ||
-            //       specPolicy === 'DEFINE_MANY'),
-            //   'ReactClass: Unexpected spec policy %s for key %s ' +
-            //     'when mixing in component specs.',
-            //   specPolicy,
-            //   name
-            // );
-
-            // For methods which are defined more than once, call the existing
-            // methods before calling the new property, merging if appropriate.
-            if (specPolicy === 'DEFINE_MANY_MERGED') {
-              proto[name] = createMergedResultFunction(proto[name], property);
-            } else if (specPolicy === 'DEFINE_MANY') {
-              proto[name] = createChainedFunction(proto[name], property);
-            }
-          } else {
-            proto[name] = property;
-            // if (process.env.NODE_ENV !== 'production') {
-            //   // Add verbose displayName to the function, which helps when looking
-            //   // at profiling tools.
-            //   if (typeof property === 'function' && spec.displayName) {
-            //     proto[name].displayName = spec.displayName + '_' + name;
-            //   }
-            // }
-          }
-        }
-      }
-    }
-  }
-
-  function mixStaticSpecIntoComponent(Constructor, statics) {
-    if (!statics) {
-      return;
-    }
-    for (var name in statics) {
-      var property = statics[name];
-      if (!statics.hasOwnProperty(name)) {
-        continue;
-      }
-
-      var isReserved = name in RESERVED_SPEC_KEYS;
-      // _invariant(
-      //   !isReserved,
-      //   'ReactClass: You are attempting to define a reserved ' +
-      //     'property, \`%s\`, that shouldn\\'t be on the "statics" key. Define it ' +
-      //     'as an instance property instead; it will still be accessible on the ' +
-      //     'constructor.',
-      //   name
-      // );
-
-      var isInherited = name in Constructor;
-      // _invariant(
-      //   !isInherited,
-      //   'ReactClass: You are attempting to define ' +
-      //     '\`%s\` on your component more than once. This conflict may be ' +
-      //     'due to a mixin.',
-      //   name
-      // );
-      Constructor[name] = property;
-    }
-  }
-
-  /**
-   * Merge two objects, but throw if both contain the same key.
-   *
-   * @param {object} one The first object, which is mutated.
-   * @param {object} two The second object
-   * @return {object} one after it has been mutated to contain everything in two.
-   */
-  function mergeIntoWithNoDuplicateKeys(one, two) {
-    // _invariant(
-    //   one && two && typeof one === 'object' && typeof two === 'object',
-    //   'mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.'
-    // );
-
-    for (var key in two) {
-      if (two.hasOwnProperty(key)) {
-        // _invariant(
-        //   one[key] === undefined,
-        //   'mergeIntoWithNoDuplicateKeys(): ' +
-        //     'Tried to merge two objects with the same key: \`%s\`. This conflict ' +
-        //     'may be due to a mixin; in particular, this may be caused by two ' +
-        //     'getInitialState() or getDefaultProps() methods returning objects ' +
-        //     'with clashing keys.',
-        //   key
-        // );
-        one[key] = two[key];
-      }
-    }
-    return one;
-  }
-
-  /**
-   * Creates a function that invokes two functions and merges their return values.
-   *
-   * @param {function} one Function to invoke first.
-   * @param {function} two Function to invoke second.
-   * @return {function} Function that invokes the two argument functions.
-   * @private
-   */
-  function createMergedResultFunction(one, two) {
-    return function mergedResult() {
-      var a = one.apply(this, arguments);
-      var b = two.apply(this, arguments);
-      if (a == null) {
-        return b;
-      } else if (b == null) {
-        return a;
-      }
-      var c = {};
-      mergeIntoWithNoDuplicateKeys(c, a);
-      mergeIntoWithNoDuplicateKeys(c, b);
-      return c;
-    };
-  }
-
-  /**
-   * Creates a function that invokes two functions and ignores their return vales.
-   *
-   * @param {function} one Function to invoke first.
-   * @param {function} two Function to invoke second.
-   * @return {function} Function that invokes the two argument functions.
-   * @private
-   */
-  function createChainedFunction(one, two) {
-    return function chainedFunction() {
-      one.apply(this, arguments);
-      two.apply(this, arguments);
-    };
-  }
-
-  /**
-   * Binds a method to the component.
-   *
-   * @param {object} component Component whose method is going to be bound.
-   * @param {function} method Method to be bound.
-   * @return {function} The bound method.
-   */
-  function bindAutoBindMethod(component, method) {
-    var boundMethod = method.bind(component);
-    // if (process.env.NODE_ENV !== 'production') {
-    //   boundMethod.__reactBoundContext = component;
-    //   boundMethod.__reactBoundMethod = method;
-    //   boundMethod.__reactBoundArguments = null;
-    //   var componentName = component.constructor.displayName;
-    //   var _bind = boundMethod.bind;
-    //   boundMethod.bind = function(newThis) {
-    //     for (
-    //       var _len = arguments.length,
-    //         args = Array(_len > 1 ? _len - 1 : 0),
-    //         _key = 1;
-    //       _key < _len;
-    //       _key++
-    //     ) {
-    //       args[_key - 1] = arguments[_key];
-    //     }
-    //
-    //     // User is trying to bind() an autobound method; we effectively will
-    //     // ignore the value of "this" that the user is trying to use, so
-    //     // let's warn.
-    //     if (newThis !== component && newThis !== null) {
-    //       if (process.env.NODE_ENV !== 'production') {
-    //         warning(
-    //           false,
-    //           'bind(): React component methods may only be bound to the ' +
-    //             'component instance. See %s',
-    //           componentName
-    //         );
-    //       }
-    //     } else if (!args.length) {
-    //       if (process.env.NODE_ENV !== 'production') {
-    //         warning(
-    //           false,
-    //           'bind(): You are binding a component method to the component. ' +
-    //             'React does this for you automatically in a high-performance ' +
-    //             'way, so you can safely remove this call. See %s',
-    //           componentName
-    //         );
-    //       }
-    //       return boundMethod;
-    //     }
-    //     var reboundMethod = _bind.apply(boundMethod, arguments);
-    //     reboundMethod.__reactBoundContext = component;
-    //     reboundMethod.__reactBoundMethod = method;
-    //     reboundMethod.__reactBoundArguments = args;
-    //     return reboundMethod;
-    //   };
-    // }
-    return boundMethod;
-  }
-
-  /**
-   * Binds all auto-bound methods in a component.
-   *
-   * @param {object} component Component whose method is going to be bound.
-   */
-  function bindAutoBindMethods(component) {
-    var pairs = component.__reactAutoBindPairs;
-    for (var i = 0; i < pairs.length; i += 2) {
-      var autoBindKey = pairs[i];
-      var method = pairs[i + 1];
-      component[autoBindKey] = bindAutoBindMethod(component, method);
-    }
-  }
-
-  var IsMountedPreMixin = {
-    componentDidMount: function() {
-      this.__isMounted = true;
-    }
-  };
-
-  var IsMountedPostMixin = {
-    componentWillUnmount: function() {
-      this.__isMounted = false;
-    }
-  };
-
-  /**
-   * Add more to the ReactClass base class. These are all legacy features and
-   * therefore not already part of the modern ReactComponent.
-   */
-  var ReactClassMixin = {
-    /**
-     * TODO: This will be deprecated because state should always keep a consistent
-     * type signature and the only use case for this, is to avoid that.
-     */
-    replaceState: function(newState, callback) {
-      this.updater.enqueueReplaceState(this, newState, callback);
-    },
-
-    /**
-     * Checks whether or not this composite component is mounted.
-     * @return {boolean} True if mounted, false otherwise.
-     * @protected
-     * @final
-     */
-    isMounted: function() {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   warning(
-      //     this.__didWarnIsMounted,
-      //     '%s: isMounted is deprecated. Instead, make sure to clean up ' +
-      //       'subscriptions and pending requests in componentWillUnmount to ' +
-      //       'prevent memory leaks.',
-      //     (this.constructor && this.constructor.displayName) ||
-      //       this.name ||
-      //       'Component'
-      //   );
-      //   this.__didWarnIsMounted = true;
-      // }
-      return !!this.__isMounted;
-    }
-  };
-
-  var ReactClassComponent = function() {};
-  _assign(
-    ReactClassComponent.prototype,
-    ReactComponent.prototype,
-    ReactClassMixin
-  );
-
-  /**
-   * Creates a composite component class given a class specification.
-   * See https://facebook.github.io/react/docs/top-level-api.html#react.createclass
-   *
-   * @param {object} spec Class specification (which must define \`render\`).
-   * @return {function} Component constructor function.
-   * @public
-   */
-  function createClass(spec) {
-    // To keep our warnings more understandable, we'll use a little hack here to
-    // ensure that Constructor.name !== 'Constructor'. This makes sure we don't
-    // unnecessarily identify a class without displayName as 'Constructor'.
-    var Constructor = identity(function(props, context, updater) {
-      // This constructor gets overridden by mocks. The argument is used
-      // by mocks to assert on what gets mounted.
-
-      // if (process.env.NODE_ENV !== 'production') {
-      //   warning(
-      //     this instanceof Constructor,
-      //     'Something is calling a React component directly. Use a factory or ' +
-      //       'JSX instead. See: https://fb.me/react-legacyfactory'
-      //   );
-      // }
-
-      // Wire up auto-binding
-      if (this.__reactAutoBindPairs.length) {
-        bindAutoBindMethods(this);
-      }
-
-      this.props = props;
-      this.context = context;
-      this.refs = emptyObject;
-      this.updater = updater || ReactNoopUpdateQueue;
-
-      this.state = null;
-
-      // ReactClasses doesn't have constructors. Instead, they use the
-      // getInitialState and componentWillMount methods for initialization.
-
-      var initialState = this.getInitialState ? this.getInitialState() : null;
-      // if (process.env.NODE_ENV !== 'production') {
-      //   // We allow auto-mocks to proceed as if they're returning null.
-      //   if (
-      //     initialState === undefined &&
-      //     this.getInitialState._isMockFunction
-      //   ) {
-      //     // This is probably bad practice. Consider warning here and
-      //     // deprecating this convenience.
-      //     initialState = null;
-      //   }
-      // }
-      // _invariant(
-      //   typeof initialState === 'object' && !Array.isArray(initialState),
-      //   '%s.getInitialState(): must return an object or null',
-      //   Constructor.displayName || 'ReactCompositeComponent'
-      // );
-
-      this.state = initialState;
-    });
-    Constructor.prototype = new ReactClassComponent();
-    Constructor.prototype.constructor = Constructor;
-    Constructor.prototype.__reactAutoBindPairs = [];
-
-    injectedMixins.forEach(mixSpecIntoComponent.bind(null, Constructor));
-
-    mixSpecIntoComponent(Constructor, IsMountedPreMixin);
-    mixSpecIntoComponent(Constructor, spec);
-    mixSpecIntoComponent(Constructor, IsMountedPostMixin);
-
-    // Initialize the defaultProps property after all mixins have been merged.
-    if (Constructor.getDefaultProps) {
-      Constructor.defaultProps = Constructor.getDefaultProps();
-    }
-
-    // if (process.env.NODE_ENV !== 'production') {
-    //   // This is a tag to indicate that the use of these method names is ok,
-    //   // since it's used with createClass. If it's not, then it's likely a
-    //   // mistake so we'll warn you to use the static property, property
-    //   // initializer or constructor respectively.
-    //   if (Constructor.getDefaultProps) {
-    //     Constructor.getDefaultProps.isReactClassApproved = {};
-    //   }
-    //   if (Constructor.prototype.getInitialState) {
-    //     Constructor.prototype.getInitialState.isReactClassApproved = {};
-    //   }
-    // }
-
-    // _invariant(
-    //   Constructor.prototype.render,
-    //   'createClass(...): Class specification must implement a \`render\` method.'
-    // );
-
-    // if (process.env.NODE_ENV !== 'production') {
-    //   warning(
-    //     !Constructor.prototype.componentShouldUpdate,
-    //     '%s has a method called ' +
-    //       'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
-    //       'The name is phrased as a question because the function is ' +
-    //       'expected to return a value.',
-    //     spec.displayName || 'A component'
-    //   );
-    //   warning(
-    //     !Constructor.prototype.componentWillRecieveProps,
-    //     '%s has a method called ' +
-    //       'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
-    //     spec.displayName || 'A component'
-    //   );
-    // }
-
-    // Reduce time spent doing lookups by setting these on the prototype.
-    for (var methodName in ReactClassInterface) {
-      if (!Constructor.prototype[methodName]) {
-        Constructor.prototype[methodName] = null;
-      }
-    }
-
-    return Constructor;
-  }
-
-  return createClass;
-});
-
-var reactNoopUpdateQueue = new React.Component().updater;
-
-var createClass = factory(React.Component, React.isValidElement, reactNoopUpdateQueue);
-
-exports._assign = _assign;
-exports.emptyObject = emptyObject;
-exports.factory = factory;
-exports.reactNoopUpdateQueue = reactNoopUpdateQueue;
-exports.createClass = createClass;
-/*  Not a pure module */
diff --git a/jscomp/test/reasonReactOptimizedCreateClass.res b/jscomp/test/reasonReactOptimizedCreateClass.res
deleted file mode 100644
index 8c4ed94..0000000
--- a/jscomp/test/reasonReactOptimizedCreateClass.res
+++ /dev/null
@@ -1,889 +0,0 @@
-let _assign = Js.Obj.assign
-
-let emptyObject = Js.Obj.empty()
-
-%%raw(`
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- */
-
-// 'use strict';
-
-// var _assign = require('object-assign');
-
-// var emptyObject = require('emptyObject');
-// var _invariant = require('invariant');
-
-// if (process.env.NODE_ENV !== 'production') {
-//   var warning = require('fbjs/lib/warning');
-// }
-
-var MIXINS_KEY = 'mixins';
-
-// Helper function to allow the creation of anonymous functions which do not
-// have .name set to the name of the variable being assigned to.
-function identity(fn) {
-  return fn;
-}
-
-var ReactPropTypeLocationNames;
-// if (process.env.NODE_ENV !== 'production') {
-//   ReactPropTypeLocationNames = {
-//     prop: 'prop',
-//     context: 'context',
-//     childContext: 'child context'
-//   };
-// } else {
-  ReactPropTypeLocationNames = {};
-// }
-`)
-
-let factory = %raw(`
-function factory(ReactComponent, isValidElement, ReactNoopUpdateQueue) {
-  /**
-   * Policies that describe methods in \`ReactClassInterface\`.
-   */
-
-  var injectedMixins = [];
-
-  /**
-   * Composite components are higher-level components that compose other composite
-   * or host components.
-   *
-   * To create a new type of \`ReactClass\`, pass a specification of
-   * your new class to \`React.createClass\`. The only requirement of your class
-   * specification is that you implement a \`render\` method.
-   *
-   *   var MyComponent = React.createClass({
-   *     render: function() {
-   *       return <div>Hello World</div>;
-   *     }
-   *   });
-   *
-   * The class specification supports a specific protocol of methods that have
-   * special meaning (e.g. \`render\`). See \`ReactClassInterface\` for
-   * more the comprehensive protocol. Any other properties and methods in the
-   * class specification will be available on the prototype.
-   *
-   * @interface ReactClassInterface
-   * @internal
-   */
-  var ReactClassInterface = {
-    /**
-     * An array of Mixin objects to include when defining your component.
-     *
-     * @type {array}
-     * @optional
-     */
-    mixins: 'DEFINE_MANY',
-
-    /**
-     * An object containing properties and methods that should be defined on
-     * the component's constructor instead of its prototype (static methods).
-     *
-     * @type {object}
-     * @optional
-     */
-    statics: 'DEFINE_MANY',
-
-    /**
-     * Definition of prop types for this component.
-     *
-     * @type {object}
-     * @optional
-     */
-    propTypes: 'DEFINE_MANY',
-
-    /**
-     * Definition of context types for this component.
-     *
-     * @type {object}
-     * @optional
-     */
-    contextTypes: 'DEFINE_MANY',
-
-    /**
-     * Definition of context types this component sets for its children.
-     *
-     * @type {object}
-     * @optional
-     */
-    childContextTypes: 'DEFINE_MANY',
-
-    // ==== Definition methods ====
-
-    /**
-     * Invoked when the component is mounted. Values in the mapping will be set on
-     * \`this.props\` if that prop is not specified (i.e. using an \`in\` check).
-     *
-     * This method is invoked before \`getInitialState\` and therefore cannot rely
-     * on \`this.state\` or use \`this.setState\`.
-     *
-     * @return {object}
-     * @optional
-     */
-    getDefaultProps: 'DEFINE_MANY_MERGED',
-
-    /**
-     * Invoked once before the component is mounted. The return value will be used
-     * as the initial value of \`this.state\`.
-     *
-     *   getInitialState: function() {
-     *     return {
-     *       isOn: false,
-     *       fooBaz: new BazFoo()
-     *     }
-     *   }
-     *
-     * @return {object}
-     * @optional
-     */
-    getInitialState: 'DEFINE_MANY_MERGED',
-
-    /**
-     * @return {object}
-     * @optional
-     */
-    getChildContext: 'DEFINE_MANY_MERGED',
-
-    /**
-     * Uses props from \`this.props\` and state from \`this.state\` to render the
-     * structure of the component.
-     *
-     * No guarantees are made about when or how often this method is invoked, so
-     * it must not have side effects.
-     *
-     *   render: function() {
-     *     var name = this.props.name;
-     *     return <div>Hello, {name}!</div>;
-     *   }
-     *
-     * @return {ReactComponent}
-     * @required
-     */
-    render: 'DEFINE_ONCE',
-
-    // ==== Delegate methods ====
-
-    /**
-     * Invoked when the component is initially created and about to be mounted.
-     * This may have side effects, but any external subscriptions or data created
-     * by this method must be cleaned up in \`componentWillUnmount\`.
-     *
-     * @optional
-     */
-    componentWillMount: 'DEFINE_MANY',
-
-    /**
-     * Invoked when the component has been mounted and has a DOM representation.
-     * However, there is no guarantee that the DOM node is in the document.
-     *
-     * Use this as an opportunity to operate on the DOM when the component has
-     * been mounted (initialized and rendered) for the first time.
-     *
-     * @param {DOMElement} rootNode DOM element representing the component.
-     * @optional
-     */
-    componentDidMount: 'DEFINE_MANY',
-
-    /**
-     * Invoked before the component receives new props.
-     *
-     * Use this as an opportunity to react to a prop transition by updating the
-     * state using \`this.setState\`. Current props are accessed via \`this.props\`.
-     *
-     *   componentWillReceiveProps: function(nextProps, nextContext) {
-     *     this.setState({
-     *       likesIncreasing: nextProps.likeCount > this.props.likeCount
-     *     });
-     *   }
-     *
-     * NOTE: There is no equivalent \`componentWillReceiveState\`. An incoming prop
-     * transition may cause a state change, but the opposite is not true. If you
-     * need it, you are probably looking for \`componentWillUpdate\`.
-     *
-     * @param {object} nextProps
-     * @optional
-     */
-    componentWillReceiveProps: 'DEFINE_MANY',
-
-    /**
-     * Invoked while deciding if the component should be updated as a result of
-     * receiving new props, state and/or context.
-     *
-     * Use this as an opportunity to \`return false\` when you're certain that the
-     * transition to the new props/state/context will not require a component
-     * update.
-     *
-     *   shouldComponentUpdate: function(nextProps, nextState, nextContext) {
-     *     return !equal(nextProps, this.props) ||
-     *       !equal(nextState, this.state) ||
-     *       !equal(nextContext, this.context);
-     *   }
-     *
-     * @param {object} nextProps
-     * @param {?object} nextState
-     * @param {?object} nextContext
-     * @return {boolean} True if the component should update.
-     * @optional
-     */
-    shouldComponentUpdate: 'DEFINE_ONCE',
-
-    /**
-     * Invoked when the component is about to update due to a transition from
-     * \`this.props\`, \`this.state\` and \`this.context\` to \`nextProps\`, \`nextState\`
-     * and \`nextContext\`.
-     *
-     * Use this as an opportunity to perform preparation before an update occurs.
-     *
-     * NOTE: You **cannot** use \`this.setState()\` in this method.
-     *
-     * @param {object} nextProps
-     * @param {?object} nextState
-     * @param {?object} nextContext
-     * @param {ReactReconcileTransaction} transaction
-     * @optional
-     */
-    componentWillUpdate: 'DEFINE_MANY',
-
-    /**
-     * Invoked when the component's DOM representation has been updated.
-     *
-     * Use this as an opportunity to operate on the DOM when the component has
-     * been updated.
-     *
-     * @param {object} prevProps
-     * @param {?object} prevState
-     * @param {?object} prevContext
-     * @param {DOMElement} rootNode DOM element representing the component.
-     * @optional
-     */
-    componentDidUpdate: 'DEFINE_MANY',
-
-    /**
-     * Invoked when the component is about to be removed from its parent and have
-     * its DOM representation destroyed.
-     *
-     * Use this as an opportunity to deallocate any external resources.
-     *
-     * NOTE: There is no \`componentDidUnmount\` since your component will have been
-     * destroyed by that point.
-     *
-     * @optional
-     */
-    componentWillUnmount: 'DEFINE_MANY',
-
-    // ==== Advanced methods ====
-
-    /**
-     * Updates the component's currently mounted DOM representation.
-     *
-     * By default, this implements React's rendering and reconciliation algorithm.
-     * Sophisticated clients may wish to override this.
-     *
-     * @param {ReactReconcileTransaction} transaction
-     * @internal
-     * @overridable
-     */
-    updateComponent: 'OVERRIDE_BASE'
-  };
-
-  /**
-   * Mapping from class specification keys to special processing functions.
-   *
-   * Although these are declared like instance properties in the specification
-   * when defining classes using \`React.createClass\`, they are actually static
-   * and are accessible on the constructor instead of the prototype. Despite
-   * being static, they must be defined outside of the "statics" key under
-   * which all other static methods are defined.
-   */
-  var RESERVED_SPEC_KEYS = {
-    displayName: function(Constructor, displayName) {
-      Constructor.displayName = displayName;
-    },
-    mixins: function(Constructor, mixins) {
-      if (mixins) {
-        for (var i = 0; i < mixins.length; i++) {
-          mixSpecIntoComponent(Constructor, mixins[i]);
-        }
-      }
-    },
-    childContextTypes: function(Constructor, childContextTypes) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   validateTypeDef(Constructor, childContextTypes, 'childContext');
-      // }
-      Constructor.childContextTypes = _assign(
-        {},
-        Constructor.childContextTypes,
-        childContextTypes
-      );
-    },
-    contextTypes: function(Constructor, contextTypes) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   validateTypeDef(Constructor, contextTypes, 'context');
-      // }
-      Constructor.contextTypes = _assign(
-        {},
-        Constructor.contextTypes,
-        contextTypes
-      );
-    },
-    /**
-     * Special case getDefaultProps which should move into statics but requires
-     * automatic merging.
-     */
-    getDefaultProps: function(Constructor, getDefaultProps) {
-      if (Constructor.getDefaultProps) {
-        Constructor.getDefaultProps = createMergedResultFunction(
-          Constructor.getDefaultProps,
-          getDefaultProps
-        );
-      } else {
-        Constructor.getDefaultProps = getDefaultProps;
-      }
-    },
-    propTypes: function(Constructor, propTypes) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   validateTypeDef(Constructor, propTypes, 'prop');
-      // }
-      Constructor.propTypes = _assign({}, Constructor.propTypes, propTypes);
-    },
-    statics: function(Constructor, statics) {
-      mixStaticSpecIntoComponent(Constructor, statics);
-    },
-    autobind: function() {}
-  };
-
-  function validateTypeDef(Constructor, typeDef, location) {
-    for (var propName in typeDef) {
-      // if (typeDef.hasOwnProperty(propName)) {
-      //   // use a warning instead of an _invariant so components
-      //   // don't show up in prod but only in __DEV__
-      //   // if (process.env.NODE_ENV !== 'production') {
-      //   //   warning(
-      //   //     typeof typeDef[propName] === 'function',
-      //   //     '%s: %s type \`%s\` is invalid; it must be a function, usually from ' +
-      //   //       'React.PropTypes.',
-      //   //     Constructor.displayName || 'ReactClass',
-      //   //     ReactPropTypeLocationNames[location],
-      //   //     propName
-      //   //   );
-      //   // }
-      // }
-    }
-  }
-
-  function validateMethodOverride(isAlreadyDefined, name) {
-    var specPolicy = ReactClassInterface.hasOwnProperty(name)
-      ? ReactClassInterface[name]
-      : null;
-
-    // Disallow overriding of base class methods unless explicitly allowed.
-    if (ReactClassMixin.hasOwnProperty(name)) {
-      // _invariant(
-      //   specPolicy === 'OVERRIDE_BASE',
-      //   'ReactClassInterface: You are attempting to override ' +
-      //     '\`%s\` from your class specification. Ensure that your method names ' +
-      //     'do not overlap with React methods.',
-      //   name
-      // );
-    }
-
-    // Disallow defining methods more than once unless explicitly allowed.
-    if (isAlreadyDefined) {
-      // _invariant(
-      //   specPolicy === 'DEFINE_MANY' || specPolicy === 'DEFINE_MANY_MERGED',
-      //   'ReactClassInterface: You are attempting to define ' +
-      //     '\`%s\` on your component more than once. This conflict may be due ' +
-      //     'to a mixin.',
-      //   name
-      // );
-    }
-  }
-
-  /**
-   * Mixin helper which handles policy validation and reserved
-   * specification keys when building React classes.
-   */
-  function mixSpecIntoComponent(Constructor, spec) {
-    if (!spec) {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   var typeofSpec = typeof spec;
-      //   var isMixinValid = typeofSpec === 'object' && spec !== null;
-      //
-      //   if (process.env.NODE_ENV !== 'production') {
-      //     warning(
-      //       isMixinValid,
-      //       "%s: You're attempting to include a mixin that is either null " +
-      //         'or not an object. Check the mixins included by the component, ' +
-      //         'as well as any mixins they include themselves. ' +
-      //         'Expected object but got %s.',
-      //       Constructor.displayName || 'ReactClass',
-      //       spec === null ? null : typeofSpec
-      //     );
-      //   }
-      // }
-
-      return;
-    }
-
-    // _invariant(
-    //   typeof spec !== 'function',
-    //   "ReactClass: You're attempting to " +
-    //     'use a component class or function as a mixin. Instead, just use a ' +
-    //     'regular object.'
-    // );
-    // _invariant(
-    //   !isValidElement(spec),
-    //   "ReactClass: You're attempting to " +
-    //     'use a component as a mixin. Instead, just use a regular object.'
-    // );
-
-    var proto = Constructor.prototype;
-    var autoBindPairs = proto.__reactAutoBindPairs;
-
-    // By handling mixins before any other properties, we ensure the same
-    // chaining order is applied to methods with DEFINE_MANY policy, whether
-    // mixins are listed before or after these methods in the spec.
-    if (spec.hasOwnProperty(MIXINS_KEY)) {
-      RESERVED_SPEC_KEYS.mixins(Constructor, spec.mixins);
-    }
-
-    for (var name in spec) {
-      if (!spec.hasOwnProperty(name)) {
-        continue;
-      }
-
-      if (name === MIXINS_KEY) {
-        // We have already handled mixins in a special case above.
-        continue;
-      }
-
-      var property = spec[name];
-      var isAlreadyDefined = proto.hasOwnProperty(name);
-      validateMethodOverride(isAlreadyDefined, name);
-
-      if (RESERVED_SPEC_KEYS.hasOwnProperty(name)) {
-        RESERVED_SPEC_KEYS[name](Constructor, property);
-      } else {
-        // Setup methods on prototype:
-        // The following member methods should not be automatically bound:
-        // 1. Expected ReactClass methods (in the "interface").
-        // 2. Overridden methods (that were mixed in).
-        var isReactClassMethod = ReactClassInterface.hasOwnProperty(name);
-        var isFunction = typeof property === 'function';
-        var shouldAutoBind =
-          isFunction &&
-          !isReactClassMethod &&
-          !isAlreadyDefined &&
-          spec.autobind !== false;
-
-        if (shouldAutoBind) {
-          autoBindPairs.push(name, property);
-          proto[name] = property;
-        } else {
-          if (isAlreadyDefined) {
-            var specPolicy = ReactClassInterface[name];
-
-            // These cases should already be caught by validateMethodOverride.
-            // _invariant(
-            //   isReactClassMethod &&
-            //     (specPolicy === 'DEFINE_MANY_MERGED' ||
-            //       specPolicy === 'DEFINE_MANY'),
-            //   'ReactClass: Unexpected spec policy %s for key %s ' +
-            //     'when mixing in component specs.',
-            //   specPolicy,
-            //   name
-            // );
-
-            // For methods which are defined more than once, call the existing
-            // methods before calling the new property, merging if appropriate.
-            if (specPolicy === 'DEFINE_MANY_MERGED') {
-              proto[name] = createMergedResultFunction(proto[name], property);
-            } else if (specPolicy === 'DEFINE_MANY') {
-              proto[name] = createChainedFunction(proto[name], property);
-            }
-          } else {
-            proto[name] = property;
-            // if (process.env.NODE_ENV !== 'production') {
-            //   // Add verbose displayName to the function, which helps when looking
-            //   // at profiling tools.
-            //   if (typeof property === 'function' && spec.displayName) {
-            //     proto[name].displayName = spec.displayName + '_' + name;
-            //   }
-            // }
-          }
-        }
-      }
-    }
-  }
-
-  function mixStaticSpecIntoComponent(Constructor, statics) {
-    if (!statics) {
-      return;
-    }
-    for (var name in statics) {
-      var property = statics[name];
-      if (!statics.hasOwnProperty(name)) {
-        continue;
-      }
-
-      var isReserved = name in RESERVED_SPEC_KEYS;
-      // _invariant(
-      //   !isReserved,
-      //   'ReactClass: You are attempting to define a reserved ' +
-      //     'property, \`%s\`, that shouldn\\'t be on the "statics" key. Define it ' +
-      //     'as an instance property instead; it will still be accessible on the ' +
-      //     'constructor.',
-      //   name
-      // );
-
-      var isInherited = name in Constructor;
-      // _invariant(
-      //   !isInherited,
-      //   'ReactClass: You are attempting to define ' +
-      //     '\`%s\` on your component more than once. This conflict may be ' +
-      //     'due to a mixin.',
-      //   name
-      // );
-      Constructor[name] = property;
-    }
-  }
-
-  /**
-   * Merge two objects, but throw if both contain the same key.
-   *
-   * @param {object} one The first object, which is mutated.
-   * @param {object} two The second object
-   * @return {object} one after it has been mutated to contain everything in two.
-   */
-  function mergeIntoWithNoDuplicateKeys(one, two) {
-    // _invariant(
-    //   one && two && typeof one === 'object' && typeof two === 'object',
-    //   'mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.'
-    // );
-
-    for (var key in two) {
-      if (two.hasOwnProperty(key)) {
-        // _invariant(
-        //   one[key] === undefined,
-        //   'mergeIntoWithNoDuplicateKeys(): ' +
-        //     'Tried to merge two objects with the same key: \`%s\`. This conflict ' +
-        //     'may be due to a mixin; in particular, this may be caused by two ' +
-        //     'getInitialState() or getDefaultProps() methods returning objects ' +
-        //     'with clashing keys.',
-        //   key
-        // );
-        one[key] = two[key];
-      }
-    }
-    return one;
-  }
-
-  /**
-   * Creates a function that invokes two functions and merges their return values.
-   *
-   * @param {function} one Function to invoke first.
-   * @param {function} two Function to invoke second.
-   * @return {function} Function that invokes the two argument functions.
-   * @private
-   */
-  function createMergedResultFunction(one, two) {
-    return function mergedResult() {
-      var a = one.apply(this, arguments);
-      var b = two.apply(this, arguments);
-      if (a == null) {
-        return b;
-      } else if (b == null) {
-        return a;
-      }
-      var c = {};
-      mergeIntoWithNoDuplicateKeys(c, a);
-      mergeIntoWithNoDuplicateKeys(c, b);
-      return c;
-    };
-  }
-
-  /**
-   * Creates a function that invokes two functions and ignores their return vales.
-   *
-   * @param {function} one Function to invoke first.
-   * @param {function} two Function to invoke second.
-   * @return {function} Function that invokes the two argument functions.
-   * @private
-   */
-  function createChainedFunction(one, two) {
-    return function chainedFunction() {
-      one.apply(this, arguments);
-      two.apply(this, arguments);
-    };
-  }
-
-  /**
-   * Binds a method to the component.
-   *
-   * @param {object} component Component whose method is going to be bound.
-   * @param {function} method Method to be bound.
-   * @return {function} The bound method.
-   */
-  function bindAutoBindMethod(component, method) {
-    var boundMethod = method.bind(component);
-    // if (process.env.NODE_ENV !== 'production') {
-    //   boundMethod.__reactBoundContext = component;
-    //   boundMethod.__reactBoundMethod = method;
-    //   boundMethod.__reactBoundArguments = null;
-    //   var componentName = component.constructor.displayName;
-    //   var _bind = boundMethod.bind;
-    //   boundMethod.bind = function(newThis) {
-    //     for (
-    //       var _len = arguments.length,
-    //         args = Array(_len > 1 ? _len - 1 : 0),
-    //         _key = 1;
-    //       _key < _len;
-    //       _key++
-    //     ) {
-    //       args[_key - 1] = arguments[_key];
-    //     }
-    //
-    //     // User is trying to bind() an autobound method; we effectively will
-    //     // ignore the value of "this" that the user is trying to use, so
-    //     // let's warn.
-    //     if (newThis !== component && newThis !== null) {
-    //       if (process.env.NODE_ENV !== 'production') {
-    //         warning(
-    //           false,
-    //           'bind(): React component methods may only be bound to the ' +
-    //             'component instance. See %s',
-    //           componentName
-    //         );
-    //       }
-    //     } else if (!args.length) {
-    //       if (process.env.NODE_ENV !== 'production') {
-    //         warning(
-    //           false,
-    //           'bind(): You are binding a component method to the component. ' +
-    //             'React does this for you automatically in a high-performance ' +
-    //             'way, so you can safely remove this call. See %s',
-    //           componentName
-    //         );
-    //       }
-    //       return boundMethod;
-    //     }
-    //     var reboundMethod = _bind.apply(boundMethod, arguments);
-    //     reboundMethod.__reactBoundContext = component;
-    //     reboundMethod.__reactBoundMethod = method;
-    //     reboundMethod.__reactBoundArguments = args;
-    //     return reboundMethod;
-    //   };
-    // }
-    return boundMethod;
-  }
-
-  /**
-   * Binds all auto-bound methods in a component.
-   *
-   * @param {object} component Component whose method is going to be bound.
-   */
-  function bindAutoBindMethods(component) {
-    var pairs = component.__reactAutoBindPairs;
-    for (var i = 0; i < pairs.length; i += 2) {
-      var autoBindKey = pairs[i];
-      var method = pairs[i + 1];
-      component[autoBindKey] = bindAutoBindMethod(component, method);
-    }
-  }
-
-  var IsMountedPreMixin = {
-    componentDidMount: function() {
-      this.__isMounted = true;
-    }
-  };
-
-  var IsMountedPostMixin = {
-    componentWillUnmount: function() {
-      this.__isMounted = false;
-    }
-  };
-
-  /**
-   * Add more to the ReactClass base class. These are all legacy features and
-   * therefore not already part of the modern ReactComponent.
-   */
-  var ReactClassMixin = {
-    /**
-     * TODO: This will be deprecated because state should always keep a consistent
-     * type signature and the only use case for this, is to avoid that.
-     */
-    replaceState: function(newState, callback) {
-      this.updater.enqueueReplaceState(this, newState, callback);
-    },
-
-    /**
-     * Checks whether or not this composite component is mounted.
-     * @return {boolean} True if mounted, false otherwise.
-     * @protected
-     * @final
-     */
-    isMounted: function() {
-      // if (process.env.NODE_ENV !== 'production') {
-      //   warning(
-      //     this.__didWarnIsMounted,
-      //     '%s: isMounted is deprecated. Instead, make sure to clean up ' +
-      //       'subscriptions and pending requests in componentWillUnmount to ' +
-      //       'prevent memory leaks.',
-      //     (this.constructor && this.constructor.displayName) ||
-      //       this.name ||
-      //       'Component'
-      //   );
-      //   this.__didWarnIsMounted = true;
-      // }
-      return !!this.__isMounted;
-    }
-  };
-
-  var ReactClassComponent = function() {};
-  _assign(
-    ReactClassComponent.prototype,
-    ReactComponent.prototype,
-    ReactClassMixin
-  );
-
-  /**
-   * Creates a composite component class given a class specification.
-   * See https://facebook.github.io/react/docs/top-level-api.html#react.createclass
-   *
-   * @param {object} spec Class specification (which must define \`render\`).
-   * @return {function} Component constructor function.
-   * @public
-   */
-  function createClass(spec) {
-    // To keep our warnings more understandable, we'll use a little hack here to
-    // ensure that Constructor.name !== 'Constructor'. This makes sure we don't
-    // unnecessarily identify a class without displayName as 'Constructor'.
-    var Constructor = identity(function(props, context, updater) {
-      // This constructor gets overridden by mocks. The argument is used
-      // by mocks to assert on what gets mounted.
-
-      // if (process.env.NODE_ENV !== 'production') {
-      //   warning(
-      //     this instanceof Constructor,
-      //     'Something is calling a React component directly. Use a factory or ' +
-      //       'JSX instead. See: https://fb.me/react-legacyfactory'
-      //   );
-      // }
-
-      // Wire up auto-binding
-      if (this.__reactAutoBindPairs.length) {
-        bindAutoBindMethods(this);
-      }
-
-      this.props = props;
-      this.context = context;
-      this.refs = emptyObject;
-      this.updater = updater || ReactNoopUpdateQueue;
-
-      this.state = null;
-
-      // ReactClasses doesn't have constructors. Instead, they use the
-      // getInitialState and componentWillMount methods for initialization.
-
-      var initialState = this.getInitialState ? this.getInitialState() : null;
-      // if (process.env.NODE_ENV !== 'production') {
-      //   // We allow auto-mocks to proceed as if they're returning null.
-      //   if (
-      //     initialState === undefined &&
-      //     this.getInitialState._isMockFunction
-      //   ) {
-      //     // This is probably bad practice. Consider warning here and
-      //     // deprecating this convenience.
-      //     initialState = null;
-      //   }
-      // }
-      // _invariant(
-      //   typeof initialState === 'object' && !Array.isArray(initialState),
-      //   '%s.getInitialState(): must return an object or null',
-      //   Constructor.displayName || 'ReactCompositeComponent'
-      // );
-
-      this.state = initialState;
-    });
-    Constructor.prototype = new ReactClassComponent();
-    Constructor.prototype.constructor = Constructor;
-    Constructor.prototype.__reactAutoBindPairs = [];
-
-    injectedMixins.forEach(mixSpecIntoComponent.bind(null, Constructor));
-
-    mixSpecIntoComponent(Constructor, IsMountedPreMixin);
-    mixSpecIntoComponent(Constructor, spec);
-    mixSpecIntoComponent(Constructor, IsMountedPostMixin);
-
-    // Initialize the defaultProps property after all mixins have been merged.
-    if (Constructor.getDefaultProps) {
-      Constructor.defaultProps = Constructor.getDefaultProps();
-    }
-
-    // if (process.env.NODE_ENV !== 'production') {
-    //   // This is a tag to indicate that the use of these method names is ok,
-    //   // since it's used with createClass. If it's not, then it's likely a
-    //   // mistake so we'll warn you to use the static property, property
-    //   // initializer or constructor respectively.
-    //   if (Constructor.getDefaultProps) {
-    //     Constructor.getDefaultProps.isReactClassApproved = {};
-    //   }
-    //   if (Constructor.prototype.getInitialState) {
-    //     Constructor.prototype.getInitialState.isReactClassApproved = {};
-    //   }
-    // }
-
-    // _invariant(
-    //   Constructor.prototype.render,
-    //   'createClass(...): Class specification must implement a \`render\` method.'
-    // );
-
-    // if (process.env.NODE_ENV !== 'production') {
-    //   warning(
-    //     !Constructor.prototype.componentShouldUpdate,
-    //     '%s has a method called ' +
-    //       'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
-    //       'The name is phrased as a question because the function is ' +
-    //       'expected to return a value.',
-    //     spec.displayName || 'A component'
-    //   );
-    //   warning(
-    //     !Constructor.prototype.componentWillRecieveProps,
-    //     '%s has a method called ' +
-    //       'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
-    //     spec.displayName || 'A component'
-    //   );
-    // }
-
-    // Reduce time spent doing lookups by setting these on the prototype.
-    for (var methodName in ReactClassInterface) {
-      if (!Constructor.prototype[methodName]) {
-        Constructor.prototype[methodName] = null;
-      }
-    }
-
-    return Constructor;
-  }
-
-  return createClass;
-}
-`)
-
-@module("react") external reactComponent: 'a = "Component"
-
-@module("react") external reactIsValidElement: bool = "isValidElement"
-
-@module("react") @new
-external newReactComponent: unit => {"updater": 'a} = "Component"
-
-let reactNoopUpdateQueue = newReactComponent()["updater"]
-
-let createClass = factory(. reactComponent, reactIsValidElement, reactNoopUpdateQueue)
diff --git a/jscomp/test/reasonReactRouter.js b/jscomp/test/reasonReactRouter.js
deleted file mode 100644
index 708d608..0000000
--- a/jscomp/test/reasonReactRouter.js
+++ /dev/null
@@ -1,198 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var React = require("react");
-
-function safeMakeEvent(eventName) {
-  if (typeof Event === "function") {
-    return new Event(eventName);
-  }
-  var $$event = document.createEvent("Event");
-  $$event.initEvent(eventName, true, true);
-  return $$event;
-}
-
-function path(param) {
-  var $$window = typeof window === "undefined" ? undefined : window;
-  if ($$window === undefined) {
-    return /* [] */0;
-  }
-  var raw = $$window.location.pathname;
-  switch (raw) {
-    case "" :
-    case "/" :
-        return /* [] */0;
-    default:
-      var raw$1 = raw.slice(1);
-      var match = raw$1[raw$1.length - 1 | 0];
-      var raw$2 = match === "/" ? raw$1.slice(0, -1) : raw$1;
-      var a = raw$2.split("/");
-      var _i = a.length - 1 | 0;
-      var _res = /* [] */0;
-      while(true) {
-        var res = _res;
-        var i = _i;
-        if (i < 0) {
-          return res;
-        }
-        _res = {
-          hd: a[i],
-          tl: res
-        };
-        _i = i - 1 | 0;
-        continue ;
-      };
-  }
-}
-
-function hash(param) {
-  var $$window = typeof window === "undefined" ? undefined : window;
-  if ($$window === undefined) {
-    return "";
-  }
-  var raw = $$window.location.hash;
-  switch (raw) {
-    case "" :
-    case "#" :
-        return "";
-    default:
-      return raw.slice(1);
-  }
-}
-
-function search(param) {
-  var $$window = typeof window === "undefined" ? undefined : window;
-  if ($$window === undefined) {
-    return "";
-  }
-  var raw = $$window.location.search;
-  switch (raw) {
-    case "" :
-    case "?" :
-        return "";
-    default:
-      return raw.slice(1);
-  }
-}
-
-function push(path) {
-  var match = typeof history === "undefined" ? undefined : history;
-  var match$1 = typeof window === "undefined" ? undefined : window;
-  if (match !== undefined && match$1 !== undefined) {
-    match.pushState(null, "", path);
-    match$1.dispatchEvent(safeMakeEvent("popstate"));
-    return ;
-  }
-  
-}
-
-function replace(path) {
-  var match = typeof history === "undefined" ? undefined : history;
-  var match$1 = typeof window === "undefined" ? undefined : window;
-  if (match !== undefined && match$1 !== undefined) {
-    match.replaceState(null, "", path);
-    match$1.dispatchEvent(safeMakeEvent("popstate"));
-    return ;
-  }
-  
-}
-
-function urlNotEqual(a, b) {
-  if (a.hash !== b.hash || a.search !== b.search) {
-    return true;
-  } else {
-    var _aList = a.path;
-    var _bList = b.path;
-    while(true) {
-      var bList = _bList;
-      var aList = _aList;
-      if (!aList) {
-        if (bList) {
-          return true;
-        } else {
-          return false;
-        }
-      }
-      if (!bList) {
-        return true;
-      }
-      if (aList.hd !== bList.hd) {
-        return true;
-      }
-      _bList = bList.tl;
-      _aList = aList.tl;
-      continue ;
-    };
-  }
-}
-
-function url(param) {
-  return {
-          path: path(),
-          hash: hash(),
-          search: search()
-        };
-}
-
-function watchUrl(callback) {
-  var $$window = typeof window === "undefined" ? undefined : window;
-  if ($$window === undefined) {
-    return function (param) {
-      
-    };
-  }
-  var watcherID = function (param) {
-    Curry._1(callback, url());
-  };
-  $$window.addEventListener("popstate", watcherID);
-  return watcherID;
-}
-
-function unwatchUrl(watcherID) {
-  var $$window = typeof window === "undefined" ? undefined : window;
-  if ($$window !== undefined) {
-    $$window.removeEventListener("popstate", watcherID);
-    return ;
-  }
-  
-}
-
-function useUrl(serverUrl, param) {
-  var match = React.useState(function (param) {
-        if (serverUrl !== undefined) {
-          return serverUrl;
-        } else {
-          return url();
-        }
-      });
-  var setUrl = match[1];
-  var url$1 = match[0];
-  React.useEffect((function (param) {
-          var watcherId = watchUrl(function (url) {
-                Curry._1(setUrl, (function (param) {
-                        return url;
-                      }));
-              });
-          var newUrl = url();
-          if (urlNotEqual(newUrl, url$1)) {
-            Curry._1(setUrl, (function (param) {
-                    return newUrl;
-                  }));
-          }
-          return (function (param) {
-                    unwatchUrl(watcherId);
-                  });
-        }), []);
-  return url$1;
-}
-
-var dangerouslyGetInitialUrl = url;
-
-exports.push = push;
-exports.replace = replace;
-exports.watchUrl = watchUrl;
-exports.unwatchUrl = unwatchUrl;
-exports.dangerouslyGetInitialUrl = dangerouslyGetInitialUrl;
-exports.useUrl = useUrl;
-/* react Not a pure module */
diff --git a/jscomp/test/reasonReactRouter.res b/jscomp/test/reasonReactRouter.res
deleted file mode 100644
index cd70c75..0000000
--- a/jscomp/test/reasonReactRouter.res
+++ /dev/null
@@ -1,183 +0,0 @@
-@get external location: Dom.window => Dom.location = "location"
-
-@send
-external /* actually the cb is Dom.event => unit, but let's restrict the access for now */
-addEventListener: (Dom.window, string, unit => unit) => unit = "addEventListener"
-
-@send
-external removeEventListener: (Dom.window, string, unit => unit) => unit = "removeEventListener"
-
-@send
-external dispatchEvent: (Dom.window, Dom.event) => unit = "dispatchEvent"
-
-@get external pathname: Dom.location => string = "pathname"
-
-@get external hash: Dom.location => string = "hash"
-
-@get external search: Dom.location => string = "search"
-
-@send
-external pushState: (Dom.history, @as(json`null`) _, @as("") _, ~href: string) => unit = "pushState"
-
-@send
-external replaceState: (Dom.history, @as(json`null`) _, @as("") _, ~href: string) => unit =
-  "replaceState"
-
-@val external event: 'a = "Event"
-
-@new external makeEventIE11Compatible: string => Dom.event = "Event"
-
-@val @scope("document")
-external createEventNonIEBrowsers: string => Dom.event = "createEvent"
-
-@send
-external initEventNonIEBrowsers: (Dom.event, string, bool, bool) => unit = "initEvent"
-
-let safeMakeEvent = eventName =>
-  if Js.typeof(event) == "function" {
-    makeEventIE11Compatible(eventName)
-  } else {
-    let event = createEventNonIEBrowsers("Event")
-    initEventNonIEBrowsers(event, eventName, true, true)
-    event
-  }
-
-/* This is copied from array.ml. We want to cut dependencies for ReasonReact so
- that it's friendlier to use in size-constrained codebases */
-let arrayToList = a => {
-  let rec tolist = (i, res) =>
-    if i < 0 {
-      res
-    } else {
-      tolist(i - 1, list{Array.unsafe_get(a, i), ...res})
-    }
-  tolist(Array.length(a) - 1, list{})
-}
-/* if we ever roll our own parser in the future, make sure you test all url combinations
-   e.g. foo.com/?#bar
- */
-/* sigh URLSearchParams doesn't work on IE11, edge16, etc. */
-/* actually you know what, not gonna provide search for now. It's a mess.
- We'll let users roll their own solution/data structure for now */
-let path = () =>
-  switch %external(window) {
-  | None => list{}
-  | Some(window: Dom.window) =>
-    switch window |> location |> pathname {
-    | ""
-    | "/" => list{}
-    | raw =>
-      /* remove the preceeding /, which every pathname seems to have */
-      let raw = Js.String.sliceToEnd(~from=1, raw)
-      /* remove the trailing /, which some pathnames might have. Ugh */
-      let raw = switch Js.String.get(raw, Js.String.length(raw) - 1) {
-      | "/" => Js.String.slice(~from=0, ~to_=-1, raw)
-      | _ => raw
-      }
-      raw |> Js.String.split("/") |> arrayToList
-    }
-  }
-let hash = () =>
-  switch %external(window) {
-  | None => ""
-  | Some(window: Dom.window) =>
-    switch window |> location |> hash {
-    | ""
-    | "#" => ""
-    | raw =>
-      /* remove the preceeding #, which every hash seems to have.
-       Why is this even included in location.hash?? */
-      raw |> Js.String.sliceToEnd(~from=1)
-    }
-  }
-let search = () =>
-  switch %external(window) {
-  | None => ""
-  | Some(window: Dom.window) =>
-    switch window |> location |> search {
-    | ""
-    | "?" => ""
-    | raw =>
-      /* remove the preceeding ?, which every search seems to have. */
-      raw |> Js.String.sliceToEnd(~from=1)
-    }
-  }
-let push = path =>
-  switch (%external(history), %external(window)) {
-  | (None, _)
-  | (_, None) => ()
-  | (Some(history: Dom.history), Some(window: Dom.window)) =>
-    pushState(history, ~href=path)
-    dispatchEvent(window, safeMakeEvent("popstate"))
-  }
-let replace = path =>
-  switch (%external(history), %external(window)) {
-  | (None, _)
-  | (_, None) => ()
-  | (Some(history: Dom.history), Some(window: Dom.window)) =>
-    replaceState(history, ~href=path)
-    dispatchEvent(window, safeMakeEvent("popstate"))
-  }
-type url = {
-  path: list<string>,
-  hash: string,
-  search: string,
-}
-let urlNotEqual = (a, b) => {
-  let rec listNotEqual = (aList, bList) =>
-    switch (aList, bList) {
-    | (list{}, list{}) => false
-    | (list{}, list{_, ..._})
-    | (list{_, ..._}, list{}) => true
-    | (list{aHead, ...aRest}, list{bHead, ...bRest}) =>
-      if aHead !== bHead {
-        true
-      } else {
-        listNotEqual(aRest, bRest)
-      }
-    }
-  a.hash !== b.hash || (a.search !== b.search || listNotEqual(a.path, b.path))
-}
-type watcherID = unit => unit
-let url = () => {path: path(), hash: hash(), search: search()}
-/* alias exposed publicly */
-let dangerouslyGetInitialUrl = url
-let watchUrl = callback =>
-  switch %external(window) {
-  | None => () => ()
-  | Some(window: Dom.window) =>
-    let watcherID = () => callback(url())
-    addEventListener(window, "popstate", watcherID)
-    watcherID
-  }
-let unwatchUrl = watcherID =>
-  switch %external(window) {
-  | None => ()
-  | Some(window: Dom.window) => removeEventListener(window, "popstate", watcherID)
-  }
-
-let useUrl = (~serverUrl=?, ()) => {
-  let (url, setUrl) = React.useState(() =>
-    switch serverUrl {
-    | Some(url) => url
-    | None => dangerouslyGetInitialUrl()
-    }
-  )
-
-  React.useEffect0(() => {
-    let watcherId = watchUrl(url => setUrl(_ => url))
-
-    /*
-      * check for updates that may have occured between
-      * the initial state and the subscribe above
-      */
-    let newUrl = dangerouslyGetInitialUrl()
-    if urlNotEqual(newUrl, url) {
-      setUrl(_ => newUrl)
-    }
-
-    Some(() => unwatchUrl(watcherId))
-  })
-
-  url
-}
diff --git a/jscomp/test/reasonReactRouter.resi b/jscomp/test/reasonReactRouter.resi
deleted file mode 100644
index 65c9bae..0000000
--- a/jscomp/test/reasonReactRouter.resi
+++ /dev/null
@@ -1,33 +0,0 @@
-/** update the url with the string path. Example: `push(\"/book/1\")`, `push(\"/books#title\")` */
-let push: string => unit
-/** update the url with the string path. modifies the current history entry instead of creating a new one. Example: `replace(\"/book/1\")`, `replace(\"/books#title\")` */
-let replace: string => unit
-type watcherID
-type url = {
-  /* path takes window.location.path, like "/book/title/edit" and turns it into `["book", "title", "edit"]` */
-  path: list<string>,
-  /* the url's hash, if any. The # symbol is stripped out for you */
-  hash: string,
-  /* the url's query params, if any. The ? symbol is stripped out for you */
-  search: string,
-}
-/** start watching for URL changes. Returns a subscription token. Upon url change, calls the callback and passes it the url record */
-let watchUrl: (url => unit) => watcherID
-/** stop watching for URL changes */
-let unwatchUrl: watcherID => unit
-/** this is marked as \"dangerous\" because you technically shouldn't be accessing the URL outside of watchUrl's callback;
-      you'd read a potentially stale url, instead of the fresh one inside watchUrl.
-
-      But this helper is sometimes needed, if you'd like to initialize a page whose display/state depends on the URL,
-      instead of reading from it in watchUrl's callback, which you'd probably have put inside didMount (aka too late,
-      the page's already rendered).
-
-      So, the correct (and idiomatic) usage of this helper is to only use it in a component that's also subscribed to
-      watchUrl. Please see https://github.com/reasonml-community/reason-react-example/blob/master/src/todomvc/TodoItem.re
-      for an example.
-      */
-let dangerouslyGetInitialUrl: unit => url
-/** hook for watching url changes.
- * serverUrl is used for ssr. it allows you to specify the url without relying on browser apis existing/working as expected
- */
-let useUrl: (~serverUrl: url=?, unit) => url
diff --git a/jscomp/test/rebind_module.js b/jscomp/test/rebind_module.js
deleted file mode 100644
index 2337c91..0000000
--- a/jscomp/test/rebind_module.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var A = /* @__PURE__ */Caml_exceptions.create("Rebind_module.A");
-
-var AA = /* @__PURE__ */Caml_exceptions.create("Rebind_module.AA");
-
-exports.A = A;
-exports.AA = AA;
-/* No side effect */
diff --git a/jscomp/test/rebind_module.res b/jscomp/test/rebind_module.res
deleted file mode 100644
index 8ace62f..0000000
--- a/jscomp/test/rebind_module.res
+++ /dev/null
@@ -1,12 +0,0 @@
-type a = ..
-type b = ..
-
-type a += A
-/* A is shadowed so it will available any more,
-   it seems record disamibigution does not 
-   work with extensible type
-*/
-
-type b += AA /* name must be unique since 4.06 */
-
-/* TODO: more tests for Local module A */
diff --git a/jscomp/test/rebind_module_test.js b/jscomp/test/rebind_module_test.js
deleted file mode 100644
index 71f1f95..0000000
--- a/jscomp/test/rebind_module_test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Rebind_module = require("./rebind_module.js");
-
-function x(v) {
-  if (v.RE_EXN_ID === Rebind_module.AA) {
-    return 0;
-  } else {
-    return 1;
-  }
-}
-
-exports.x = x;
-/* No side effect */
diff --git a/jscomp/test/rebind_module_test.res b/jscomp/test/rebind_module_test.res
deleted file mode 100644
index b863c8d..0000000
--- a/jscomp/test/rebind_module_test.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let x = (v: Rebind_module.b) =>
-  switch v {
-  | Rebind_module.AA => 0
-  | _ => 1
-  }
diff --git a/jscomp/test/rec_array_test.js b/jscomp/test/rec_array_test.js
deleted file mode 100644
index 6c4c983..0000000
--- a/jscomp/test/rec_array_test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-var vicky = {};
-
-var teacher = {};
-
-Caml_obj.update_dummy(vicky, {
-      taughtBy: teacher
-    });
-
-Caml_obj.update_dummy(teacher, {
-      students: [vicky]
-    });
-
-exports.vicky = vicky;
-exports.teacher = teacher;
-/* No side effect */
diff --git a/jscomp/test/rec_array_test.res b/jscomp/test/rec_array_test.res
deleted file mode 100644
index 8d90b13..0000000
--- a/jscomp/test/rec_array_test.res
+++ /dev/null
@@ -1,5 +0,0 @@
-type rec student = {taughtBy: teacher}
-and teacher = {students: array<student>}
-
-let rec vicky = { taughtBy: teacher } 
-and teacher = {students: [vicky]}
\ No newline at end of file
diff --git a/jscomp/test/rec_fun_test.js b/jscomp/test/rec_fun_test.js
deleted file mode 100644
index 34a5cbd..0000000
--- a/jscomp/test/rec_fun_test.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var called = {
-  contents: 0
-};
-
-function g(param) {
-  var v = {};
-  var next = function (i, b) {
-    called.contents = called.contents + 1 | 0;
-    if (b) {
-      Curry._2(v.contents, i, false);
-    }
-    return i + 1 | 0;
-  };
-  Caml_obj.update_dummy(v, {
-        contents: next
-      });
-  console.log(String(next(0, true)));
-}
-
-g();
-
-var x = {};
-
-var y = {};
-
-Caml_obj.update_dummy(x, {
-      hd: 1,
-      tl: y
-    });
-
-Caml_obj.update_dummy(y, {
-      hd: 2,
-      tl: x
-    });
-
-eq("File \"rec_fun_test.res\", line 29, characters 3-10", called.contents, 2);
-
-Mt.from_pair_suites("Rec_fun_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.called = called;
-exports.g = g;
-exports.x = x;
-exports.y = y;
-/*  Not a pure module */
diff --git a/jscomp/test/rec_fun_test.res b/jscomp/test/rec_fun_test.res
deleted file mode 100644
index ee57d1d..0000000
--- a/jscomp/test/rec_fun_test.res
+++ /dev/null
@@ -1,31 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let called = ref(0)
-/* function hoisting prevent the toplevel bug */
-let g = () => {
-  let rec v = ref(next)
-  and next = (i, b) => {
-    incr(called)
-    if b {
-      ignore(v.contents(i, false))
-    }
-    i + 1
-  }
-
-  print_endline(\"@@"(string_of_int, next(0, true)))
-}
-
-g()
-
-let rec x = list{1, ...y}
-and y = list{2, ...x}
-
-eq(__LOC__, called.contents, 2)
-
-Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/rec_module_opt.js b/jscomp/test/rec_module_opt.js
deleted file mode 100644
index 6b5d737..0000000
--- a/jscomp/test/rec_module_opt.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Set = require("../../lib/js/set.js");
-var Caml = require("../../lib/js/caml.js");
-var Curry = require("../../lib/js/curry.js");
-
-function compare(t1, t2) {
-  if (t1.TAG === "Leaf") {
-    if (t2.TAG === "Leaf") {
-      return Caml.string_compare(t1._0, t2._0);
-    } else {
-      return 1;
-    }
-  } else if (t2.TAG === "Leaf") {
-    return -1;
-  } else {
-    return Curry._2(ASet.compare, t1._0, t2._0);
-  }
-}
-
-var A = {
-  compare: compare
-};
-
-var ASet = $$Set.Make(A);
-
-var X0 = {};
-
-var Y0 = {};
-
-function f(x) {
-  return x + 1 | 0;
-}
-
-var X1 = {
-  f: f
-};
-
-function f$1(x) {
-  return x + 2 | 0;
-}
-
-var Y1 = {
-  f: f$1
-};
-
-var X;
-
-exports.A = A;
-exports.ASet = ASet;
-exports.X = X;
-exports.X0 = X0;
-exports.Y0 = Y0;
-exports.X1 = X1;
-exports.Y1 = Y1;
-/* ASet Not a pure module */
diff --git a/jscomp/test/rec_module_opt.res b/jscomp/test/rec_module_opt.res
deleted file mode 100644
index 816cf1d..0000000
--- a/jscomp/test/rec_module_opt.res
+++ /dev/null
@@ -1,49 +0,0 @@
-@@bs.config({
-  flags: [
-    /* "-drawlambda"; */
-    /* "-dlambda"; */
-    /* "-dtypedtree"; */
-    /* "-bs-diagnose" */
-
-    "-bs-no-cross-module-opt",
-  ],
-})
-
-module rec A: {
-  type t = Leaf(string) | Node(ASet.t)
-  let compare: (t, t) => int
-} = {
-  type t = Leaf(string) | Node(ASet.t)
-  let compare = (t1, t2) =>
-    switch (t1, t2) {
-    | (Leaf(s1), Leaf(s2)) => Pervasives.compare(s1, s2)
-    | (Leaf(_), Node(_)) => 1
-    | (Node(_), Leaf(_)) => -1
-    | (Node(n1), Node(n2)) => ASet.compare(n1, n2)
-    }
-  let hello = x => x
-}
-and ASet: Set.S with type elt = A.t = Set.Make(A)
-
-module rec X: {} = X
-
-module rec X0: {
-  type t
-} = {
-  type t
-}
-and Y0: {
-  type t
-} = {
-  type t
-}
-module type S = {
-  let f: int => int
-}
-
-module rec X1: S = {
-  let f = x => x + 1
-}
-and Y1: S = {
-  let f = x => x + 2
-}
diff --git a/jscomp/test/rec_module_test.js b/jscomp/test/rec_module_test.js
deleted file mode 100644
index 88e1ea9..0000000
--- a/jscomp/test/rec_module_test.js
+++ /dev/null
@@ -1,1225 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function even(n) {
-  if (n === 0) {
-    return true;
-  } else if (n === 1) {
-    return false;
-  } else {
-    return Curry._1(B.odd, n - 1 | 0);
-  }
-}
-
-var A = {
-  even: even
-};
-
-function odd(n) {
-  if (n === 1) {
-    return true;
-  } else if (n === 0) {
-    return false;
-  } else {
-    return Curry._1(A.even, n - 1 | 0);
-  }
-}
-
-var B = {
-  odd: odd
-};
-
-function even$1(n) {
-  if (n === 0) {
-    return true;
-  } else if (n === 1) {
-    return false;
-  } else {
-    return Curry._1(BB.odd, n - 1 | 0);
-  }
-}
-
-function x(param) {
-  return Curry._1(BB.y, undefined) + 3 | 0;
-}
-
-var AA = {
-  even: even$1,
-  x: x
-};
-
-function odd$1(n) {
-  if (n === 1) {
-    return true;
-  } else if (n === 0) {
-    return false;
-  } else {
-    return Curry._1(even$1, n - 1 | 0);
-  }
-}
-
-function y(param) {
-  return 32;
-}
-
-var BB = {
-  odd: odd$1,
-  y: y
-};
-
-var Even = {};
-
-var Odd = {};
-
-function compare(t1, t2) {
-  if (t1.TAG === "Leaf") {
-    if (t2.TAG === "Leaf") {
-      return Caml.string_compare(t1._0, t2._0);
-    } else {
-      return 1;
-    }
-  } else if (t2.TAG === "Leaf") {
-    return -1;
-  } else {
-    return Curry._2(ASet.compare, t1._0, t2._0);
-  }
-}
-
-var AAA = {
-  compare: compare
-};
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, v, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  return {
-          TAG: "Node",
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, v, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, create(lr, v, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, v, rl), rv, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Set.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var c = Curry._2(AAA.compare, x, v);
-  if (c === 0) {
-    return param;
-  }
-  if (c < 0) {
-    var ll = add(x, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, r);
-    }
-  }
-  var rr = add(x, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, rr);
-  }
-}
-
-function singleton(x) {
-  return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          r: "Empty",
-          h: 1
-        };
-}
-
-function add_min_element(x, param) {
-  if (typeof param !== "object") {
-    return singleton(x);
-  } else {
-    return bal(add_min_element(x, param.l), param.v, param.r);
-  }
-}
-
-function add_max_element(x, param) {
-  if (typeof param !== "object") {
-    return singleton(x);
-  } else {
-    return bal(param.l, param.v, add_max_element(x, param.r));
-  }
-}
-
-function join(l, v, r) {
-  if (typeof l !== "object") {
-    return add_min_element(v, r);
-  }
-  var lh = l.h;
-  if (typeof r !== "object") {
-    return add_max_element(v, l);
-  }
-  var rh = r.h;
-  if (lh > (rh + 2 | 0)) {
-    return bal(l.l, l.v, join(l.r, v, r));
-  } else if (rh > (lh + 2 | 0)) {
-    return bal(join(l, v, r.l), r.v, r.r);
-  } else {
-    return create(l, v, r);
-  }
-}
-
-function min_elt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return param.v;
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function min_elt_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return Caml_option.some(param.v);
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function max_elt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return param.v;
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function max_elt_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return Caml_option.some(param.v);
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function remove_min_elt(param) {
-  if (typeof param !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.remove_min_elt",
-          Error: new Error()
-        };
-  }
-  var l = param.l;
-  if (typeof l !== "object") {
-    return param.r;
-  } else {
-    return bal(remove_min_elt(l), param.v, param.r);
-  }
-}
-
-function concat(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  } else if (typeof t2 !== "object") {
-    return t1;
-  } else {
-    return join(t1, min_elt(t2), remove_min_elt(t2));
-  }
-}
-
-function split(x, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            false,
-            "Empty"
-          ];
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var c = Curry._2(AAA.compare, x, v);
-  if (c === 0) {
-    return [
-            l,
-            true,
-            r
-          ];
-  }
-  if (c < 0) {
-    var match = split(x, l);
-    return [
-            match[0],
-            match[1],
-            join(match[2], v, r)
-          ];
-  }
-  var match$1 = split(x, r);
-  return [
-          join(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
-}
-
-function is_empty(param) {
-  if (typeof param !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function mem(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    var c = Curry._2(AAA.compare, x, param.v);
-    if (c === 0) {
-      return true;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function remove(x, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var c = Curry._2(AAA.compare, x, v);
-  if (c === 0) {
-    if (typeof l !== "object") {
-      return r;
-    } else if (typeof r !== "object") {
-      return l;
-    } else {
-      return bal(l, min_elt(r), remove_min_elt(r));
-    }
-  }
-  if (c < 0) {
-    var ll = remove(x, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, r);
-    }
-  }
-  var rr = remove(x, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, rr);
-  }
-}
-
-function union(s1, s2) {
-  if (typeof s1 !== "object") {
-    return s2;
-  }
-  var h1 = s1.h;
-  var v1 = s1.v;
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var h2 = s2.h;
-  var v2 = s2.v;
-  if (h1 >= h2) {
-    if (h2 === 1) {
-      return add(v2, s1);
-    }
-    var match = split(v1, s2);
-    return join(union(s1.l, match[0]), v1, union(s1.r, match[2]));
-  }
-  if (h1 === 1) {
-    return add(v1, s2);
-  }
-  var match$1 = split(v2, s1);
-  return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r));
-}
-
-function inter(s1, s2) {
-  if (typeof s1 !== "object") {
-    return "Empty";
-  }
-  if (typeof s2 !== "object") {
-    return "Empty";
-  }
-  var r1 = s1.r;
-  var v1 = s1.v;
-  var l1 = s1.l;
-  var match = split(v1, s2);
-  var l2 = match[0];
-  if (match[1]) {
-    return join(inter(l1, l2), v1, inter(r1, match[2]));
-  } else {
-    return concat(inter(l1, l2), inter(r1, match[2]));
-  }
-}
-
-function diff(s1, s2) {
-  if (typeof s1 !== "object") {
-    return "Empty";
-  }
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var r1 = s1.r;
-  var v1 = s1.v;
-  var l1 = s1.l;
-  var match = split(v1, s2);
-  var l2 = match[0];
-  if (match[1]) {
-    return concat(diff(l1, l2), diff(r1, match[2]));
-  } else {
-    return join(diff(l1, l2), v1, diff(r1, match[2]));
-  }
-}
-
-function cons_enum(_s, _e) {
-  while(true) {
-    var e = _e;
-    var s = _s;
-    if (typeof s !== "object") {
-      return e;
-    }
-    _e = {
-      TAG: "More",
-      _0: s.v,
-      _1: s.r,
-      _2: e
-    };
-    _s = s.l;
-    continue ;
-  };
-}
-
-function compare$1(s1, s2) {
-  var _e1 = cons_enum(s1, "End");
-  var _e2 = cons_enum(s2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return 0;
-      } else {
-        return -1;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return 1;
-    }
-    var c = Curry._2(AAA.compare, e1._0, e2._0);
-    if (c !== 0) {
-      return c;
-    }
-    _e2 = cons_enum(e2._1, e2._2);
-    _e1 = cons_enum(e1._1, e1._2);
-    continue ;
-  };
-}
-
-function equal(s1, s2) {
-  return compare$1(s1, s2) === 0;
-}
-
-function subset(_s1, _s2) {
-  while(true) {
-    var s2 = _s2;
-    var s1 = _s1;
-    if (typeof s1 !== "object") {
-      return true;
-    }
-    var r1 = s1.r;
-    var v1 = s1.v;
-    var l1 = s1.l;
-    if (typeof s2 !== "object") {
-      return false;
-    }
-    var r2 = s2.r;
-    var l2 = s2.l;
-    var c = Curry._2(AAA.compare, v1, s2.v);
-    if (c === 0) {
-      if (!subset(l1, l2)) {
-        return false;
-      }
-      _s2 = r2;
-      _s1 = r1;
-      continue ;
-    }
-    if (c < 0) {
-      if (!subset({
-              TAG: "Node",
-              l: l1,
-              v: v1,
-              r: "Empty",
-              h: 0
-            }, l2)) {
-        return false;
-      }
-      _s1 = r1;
-      continue ;
-    }
-    if (!subset({
-            TAG: "Node",
-            l: "Empty",
-            v: v1,
-            r: r1,
-            h: 0
-          }, r2)) {
-      return false;
-    }
-    _s1 = l1;
-    continue ;
-  };
-}
-
-function iter(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    iter(f, param.l);
-    Curry._1(f, param.v);
-    _param = param.r;
-    continue ;
-  };
-}
-
-function fold(f, _s, _accu) {
-  while(true) {
-    var accu = _accu;
-    var s = _s;
-    if (typeof s !== "object") {
-      return accu;
-    }
-    _accu = Curry._2(f, s.v, fold(f, s.l, accu));
-    _s = s.r;
-    continue ;
-  };
-}
-
-function for_all(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return true;
-    }
-    if (!Curry._1(p, param.v)) {
-      return false;
-    }
-    if (!for_all(p, param.l)) {
-      return false;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function exists(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    if (Curry._1(p, param.v)) {
-      return true;
-    }
-    if (exists(p, param.l)) {
-      return true;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function filter(p, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var l$p = filter(p, l);
-  var pv = Curry._1(p, v);
-  var r$p = filter(p, r);
-  if (pv) {
-    if (l === l$p && r === r$p) {
-      return param;
-    } else {
-      return join(l$p, v, r$p);
-    }
-  } else {
-    return concat(l$p, r$p);
-  }
-}
-
-function partition(p, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            "Empty"
-          ];
-  }
-  var v = param.v;
-  var match = partition(p, param.l);
-  var lf = match[1];
-  var lt = match[0];
-  var pv = Curry._1(p, v);
-  var match$1 = partition(p, param.r);
-  var rf = match$1[1];
-  var rt = match$1[0];
-  if (pv) {
-    return [
-            join(lt, v, rt),
-            concat(lf, rf)
-          ];
-  } else {
-    return [
-            concat(lt, rt),
-            join(lf, v, rf)
-          ];
-  }
-}
-
-function cardinal(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0;
-  }
-}
-
-function elements_aux(_accu, _param) {
-  while(true) {
-    var param = _param;
-    var accu = _accu;
-    if (typeof param !== "object") {
-      return accu;
-    }
-    _param = param.l;
-    _accu = {
-      hd: param.v,
-      tl: elements_aux(accu, param.r)
-    };
-    continue ;
-  };
-}
-
-function elements(s) {
-  return elements_aux(/* [] */0, s);
-}
-
-function find(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    var c = Curry._2(AAA.compare, x, v);
-    if (c === 0) {
-      return v;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function find_first(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return v0;
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_first_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return Caml_option.some(v0);
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_last(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return v0;
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_last_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return Caml_option.some(v0);
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_opt(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    var c = Curry._2(AAA.compare, x, v);
-    if (c === 0) {
-      return Caml_option.some(v);
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function map(f, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var l$p = map(f, l);
-  var v$p = Curry._1(f, v);
-  var r$p = map(f, r);
-  if (l === l$p && v === v$p && r === r$p) {
-    return param;
-  } else if ((l$p === "Empty" || Curry._2(AAA.compare, max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Curry._2(AAA.compare, v$p, min_elt(r$p)) < 0)) {
-    return join(l$p, v$p, r$p);
-  } else {
-    return union(l$p, add(v$p, r$p));
-  }
-}
-
-function of_list(l) {
-  if (!l) {
-    return "Empty";
-  }
-  var match = l.tl;
-  var x0 = l.hd;
-  if (!match) {
-    return singleton(x0);
-  }
-  var match$1 = match.tl;
-  var x1 = match.hd;
-  if (!match$1) {
-    return add(x1, singleton(x0));
-  }
-  var match$2 = match$1.tl;
-  var x2 = match$1.hd;
-  if (!match$2) {
-    return add(x2, add(x1, singleton(x0)));
-  }
-  var match$3 = match$2.tl;
-  var x3 = match$2.hd;
-  if (match$3) {
-    if (match$3.tl) {
-      var l$1 = List.sort_uniq(AAA.compare, l);
-      var sub = function (n, l) {
-        switch (n) {
-          case 0 :
-              return [
-                      "Empty",
-                      l
-                    ];
-          case 1 :
-              if (l) {
-                return [
-                        {
-                          TAG: "Node",
-                          l: "Empty",
-                          v: l.hd,
-                          r: "Empty",
-                          h: 1
-                        },
-                        l.tl
-                      ];
-              }
-              break;
-          case 2 :
-              if (l) {
-                var match = l.tl;
-                if (match) {
-                  return [
-                          {
-                            TAG: "Node",
-                            l: {
-                              TAG: "Node",
-                              l: "Empty",
-                              v: l.hd,
-                              r: "Empty",
-                              h: 1
-                            },
-                            v: match.hd,
-                            r: "Empty",
-                            h: 2
-                          },
-                          match.tl
-                        ];
-                }
-                
-              }
-              break;
-          case 3 :
-              if (l) {
-                var match$1 = l.tl;
-                if (match$1) {
-                  var match$2 = match$1.tl;
-                  if (match$2) {
-                    return [
-                            {
-                              TAG: "Node",
-                              l: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: l.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              v: match$1.hd,
-                              r: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: match$2.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              h: 2
-                            },
-                            match$2.tl
-                          ];
-                  }
-                  
-                }
-                
-              }
-              break;
-          default:
-            
-        }
-        var nl = n / 2 | 0;
-        var match$3 = sub(nl, l);
-        var l$1 = match$3[1];
-        if (l$1) {
-          var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
-          return [
-                  create(match$3[0], l$1.hd, match$4[0]),
-                  match$4[1]
-                ];
-        }
-        throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "set.res",
-                691,
-                20
-              ],
-              Error: new Error()
-            };
-      };
-      return sub(List.length(l$1), l$1)[0];
-    } else {
-      return add(match$3.hd, add(x3, add(x2, add(x1, singleton(x0)))));
-    }
-  } else {
-    return add(x3, add(x2, add(x1, singleton(x0))));
-  }
-}
-
-var ASet = {
-  empty: "Empty",
-  is_empty: is_empty,
-  mem: mem,
-  add: add,
-  singleton: singleton,
-  remove: remove,
-  union: union,
-  inter: inter,
-  diff: diff,
-  compare: compare$1,
-  equal: equal,
-  subset: subset,
-  iter: iter,
-  map: map,
-  fold: fold,
-  for_all: for_all,
-  exists: exists,
-  filter: filter,
-  partition: partition,
-  cardinal: cardinal,
-  elements: elements,
-  min_elt: min_elt,
-  min_elt_opt: min_elt_opt,
-  max_elt: max_elt,
-  max_elt_opt: max_elt_opt,
-  choose: min_elt,
-  choose_opt: min_elt_opt,
-  split: split,
-  find: find,
-  find_opt: find_opt,
-  find_first: find_first,
-  find_first_opt: find_first_opt,
-  find_last: find_last,
-  find_last_opt: find_last_opt,
-  of_list: of_list
-};
-
-var suites_0 = [
-  "test1",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: [
-                true,
-                true,
-                false,
-                false
-              ],
-              _1: [
-                Curry._1(A.even, 2),
-                Curry._1(even$1, 4),
-                Curry._1(B.odd, 2),
-                Curry._1(odd$1, 4)
-              ]
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "test2",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: Curry._1(y, undefined),
-                _1: 32
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "test3",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: Curry._1(x, undefined),
-                  _1: 35
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "test4",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: true,
-                    _1: Curry._1(A.even, 2)
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "test4",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: true,
-                      _1: Curry._1(even$1, 4)
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "test5",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: false,
-                        _1: Curry._1(B.odd, 2)
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "test6",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: 2,
-                          _1: Curry._1(cardinal, Curry._1(of_list, {
-                                    hd: {
-                                      TAG: "Leaf",
-                                      _0: "a"
-                                    },
-                                    tl: {
-                                      hd: {
-                                        TAG: "Leaf",
-                                        _0: "b"
-                                      },
-                                      tl: {
-                                        hd: {
-                                          TAG: "Leaf",
-                                          _0: "a"
-                                        },
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }))
-                        };
-                })
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Rec_module_test", suites);
-
-exports.A = A;
-exports.B = B;
-exports.AA = AA;
-exports.BB = BB;
-exports.Even = Even;
-exports.Odd = Odd;
-exports.AAA = AAA;
-exports.ASet = ASet;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/rec_module_test.res b/jscomp/test/rec_module_test.res
deleted file mode 100644
index d549ac6..0000000
--- a/jscomp/test/rec_module_test.res
+++ /dev/null
@@ -1,94 +0,0 @@
-module rec A: {
-  let even: int => bool
-} = {
-  let even = n =>
-    if n == 0 {
-      true
-    } else if n == 1 {
-      false
-    } else {
-      B.odd(n - 1)
-    }
-}
-and B: {
-  let odd: int => bool
-} = {
-  let odd = n =>
-    if n == 1 {
-      true
-    } else if n == 0 {
-      false
-    } else {
-      A.even(n - 1)
-    }
-}
-
-module rec AA: {
-  let even: int => bool
-  let x: unit => int
-} = {
-  let even = n =>
-    if n == 0 {
-      true
-    } else if n == 1 {
-      false
-    } else {
-      BB.odd(n - 1)
-    }
-  let x = () => BB.y() + 3
-}
-and BB: {
-  let odd: int => bool
-  let y: unit => int
-} = {
-  let odd = n =>
-    if n == 1 {
-      true
-    } else if n == 0 {
-      false
-    } else {
-      AA.even(n - 1)
-    }
-  let y = () => 32
-}
-
-module rec Even: {
-  type t = Zero | Succ(Odd.t)
-} = {
-  type t = Zero | Succ(Odd.t)
-}
-and Odd: {
-  type t = Succ(Even.t)
-} = {
-  type t = Succ(Even.t)
-}
-
-module rec AAA: {
-  type t = Leaf(string) | Node(ASet.t)
-  let compare: (t, t) => int
-} = {
-  type t = Leaf(string) | Node(ASet.t)
-  let compare = (t1, t2) =>
-    switch (t1, t2) {
-    | (Leaf(s1), Leaf(s2)) => Pervasives.compare(s1, s2)
-    | (Leaf(_), Node(_)) => 1
-    | (Node(_), Leaf(_)) => -1
-    | (Node(n1), Node(n2)) => ASet.compare(n1, n2)
-    }
-}
-and ASet: Set.S with type elt = AAA.t = Set.Make(AAA)
-
-let suites = {
-  open Mt
-  list{
-    ("test1", _ => Eq((true, true, false, false), (A.even(2), AA.even(4), B.odd(2), BB.odd(4)))),
-    ("test2", _ => Eq(BB.y(), 32)),
-    ("test3", _ => Eq(AA.x(), 35)),
-    ("test4", _ => Eq(true, A.even(2))),
-    ("test4", _ => Eq(true, AA.even(4))),
-    ("test5", _ => Eq(false, B.odd(2))),
-    ("test6", _ => Eq(2, ASet.cardinal(ASet.of_list(list{Leaf("a"), Leaf("b"), Leaf("a")})))),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/recmodule.js b/jscomp/test/recmodule.js
deleted file mode 100644
index 41a4c1e..0000000
--- a/jscomp/test/recmodule.js
+++ /dev/null
@@ -1,207 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_module = require("../../lib/js/caml_module.js");
-
-var Entity = {};
-
-function MakeLayer(Deps) {
-  var getLight = function (id) {
-    return Curry._1(Deps.presentLight, {
-                id: id,
-                name: "Light 1"
-              });
-  };
-  return {
-          getLight: getLight
-        };
-}
-
-var UseCase = {
-  MakeLayer: MakeLayer
-};
-
-function MakeLayer$1(Deps, UC) {
-  var presentLight = function (light) {
-    return Curry._2(Deps.presentJson, light, 200);
-  };
-  var handleGetLight = function (req) {
-    return Curry._1(UC.getLight, req.params.id);
-  };
-  return {
-          handleGetLight: handleGetLight,
-          presentLight: presentLight
-        };
-}
-
-var Adapter = {
-  MakeLayer: MakeLayer$1
-};
-
-function MakeLayer$2(Deps) {
-  var presentJson = function (json, status) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "recmodule.res",
-            60,
-            41
-          ],
-          Error: new Error()
-        };
-  };
-  var routes = function (param) {
-    return [[
-              "/lights",
-              Deps.handleGetLight
-            ]];
-  };
-  return {
-          presentJson: presentJson,
-          routes: routes
-        };
-}
-
-var Infra = {
-  MakeLayer: MakeLayer$2
-};
-
-var I = Caml_module.init_mod([
-      "recmodule.res",
-      67,
-      30
-    ], {
-      TAG: "Module",
-      _0: [
-        [
-          "Function",
-          "presentJson"
-        ],
-        [
-          "Function",
-          "routes"
-        ]
-      ]
-    });
-
-var A = Caml_module.init_mod([
-      "recmodule.res",
-      68,
-      25
-    ], {
-      TAG: "Module",
-      _0: [
-        [
-          "Function",
-          "handleGetLight"
-        ],
-        [
-          "Function",
-          "presentLight"
-        ]
-      ]
-    });
-
-var U = Caml_module.init_mod([
-      "recmodule.res",
-      69,
-      25
-    ], {
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "getLight"
-        ]]
-    });
-
-function presentJson(json, status) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "recmodule.res",
-          60,
-          41
-        ],
-        Error: new Error()
-      };
-}
-
-function routes(param) {
-  return [[
-            "/lights",
-            A.handleGetLight
-          ]];
-}
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [
-        [
-          "Function",
-          "presentJson"
-        ],
-        [
-          "Function",
-          "routes"
-        ]
-      ]
-    }, I, {
-      presentJson: presentJson,
-      routes: routes
-    });
-
-function presentLight(light) {
-  return Curry._2(I.presentJson, light, 200);
-}
-
-function handleGetLight(req) {
-  return Curry._1(U.getLight, req.params.id);
-}
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [
-        [
-          "Function",
-          "handleGetLight"
-        ],
-        [
-          "Function",
-          "presentLight"
-        ]
-      ]
-    }, A, {
-      handleGetLight: handleGetLight,
-      presentLight: presentLight
-    });
-
-function getLight(id) {
-  return Curry._1(A.presentLight, {
-              id: id,
-              name: "Light 1"
-            });
-}
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "getLight"
-        ]]
-    }, U, {
-      getLight: getLight
-    });
-
-var App = {
-  I: I,
-  A: A,
-  U: U
-};
-
-exports.Entity = Entity;
-exports.UseCase = UseCase;
-exports.Adapter = Adapter;
-exports.Infra = Infra;
-exports.App = App;
-/* I Not a pure module */
diff --git a/jscomp/test/recmodule.res b/jscomp/test/recmodule.res
deleted file mode 100644
index d96f207..0000000
--- a/jscomp/test/recmodule.res
+++ /dev/null
@@ -1,70 +0,0 @@
-type params = {id: string}
-type req = {params: params}
-
-module Entity = {
-  type light = {
-    id: string,
-    name: string,
-  }
-}
-
-module UseCase = {
-  module type Layer = {
-    let getLight: string => promise<unit>
-  }
-
-  module type Deps = {
-    let presentLight: Entity.light => promise<unit>
-  }
-
-  module MakeLayer = (Deps: Deps): Layer => {
-    let getLight = id => {
-      Deps.presentLight({
-        id,
-        name: "Light 1",
-      })
-    }
-  }
-}
-
-module Adapter = {
-  module type Layer = {
-    let handleGetLight: req => promise<unit>
-    let presentLight: Entity.light => promise<unit>
-  }
-
-  module type Deps = {
-    let presentJson: ('a, ~status: int) => promise<unit>
-  }
-
-  module MakeLayer = (Deps: Deps, UC: UseCase.Layer): Layer => {
-    let presentLight = light => light->Deps.presentJson(~status=200)
-
-    let handleGetLight = req => {
-      UC.getLight(req.params.id)
-    }
-  }
-}
-
-module Infra = {
-  module type Layer = {
-    let presentJson: ('a, ~status: int) => promise<unit>
-    let routes: unit => array<(string, req => promise<unit>)>
-  }
-
-  module type Deps = {
-    let handleGetLight: req => promise<unit>
-  }
-
-  module MakeLayer = (Deps: Deps): Layer => {
-    let presentJson = (json, ~status) => assert false
-
-    let routes = () => [("/lights", Deps.handleGetLight)]
-  }
-}
-
-module App = {
-  module rec I: Infra.Layer = Infra.MakeLayer(A)
-  and A: Adapter.Layer = Adapter.MakeLayer(I, U)
-  and U: UseCase.Layer = UseCase.MakeLayer(A)
-}
diff --git a/jscomp/test/record_debug_test.js b/jscomp/test/record_debug_test.js
deleted file mode 100644
index 3c191e7..0000000
--- a/jscomp/test/record_debug_test.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var v = {
-  a: 3,
-  b: {
-    xx: 2,
-    yy: 3
-  }
-};
-
-var u_a = 2;
-
-var u_b = {
-  xx: 2,
-  yy: 3
-};
-
-var u = {
-  a: u_a,
-  b: u_b
-};
-
-var A = /* @__PURE__ */Caml_exceptions.create("Record_debug_test.A");
-
-var B = /* @__PURE__ */Caml_exceptions.create("Record_debug_test.B");
-
-var v0 = {
-  RE_EXN_ID: A,
-  _1: 3
-};
-
-var v1 = {
-  RE_EXN_ID: B,
-  _1: 3,
-  _2: 2
-};
-
-var N = {
-  a: 0,
-  b: 1
-};
-
-function N0_f(prim) {
-  return prim;
-}
-
-var N0 = {
-  a: 0,
-  b: 1,
-  f: N0_f
-};
-
-console.log("hei", v);
-
-var a = [
-  1,
-  2,
-  2,
-  4,
-  3
-];
-
-var c = [
-  1,
-  2,
-  3,
-  4,
-  5
-];
-
-console.log(a, c);
-
-eq("File \"record_debug_test.res\", line 58, characters 3-10", [
-      "",
-      "a"
-    ], [
-      "",
-      "a"
-    ]);
-
-Mt.from_pair_suites("record_debug_test.res", suites.contents);
-
-var h = {
-  hd: 1,
-  tl: {
-    hd: 2,
-    tl: {
-      hd: 3,
-      tl: {
-        hd: 4,
-        tl: /* [] */0
-      }
-    }
-  }
-};
-
-var v2 = {
-  NAME: "C",
-  VAL: 2
-};
-
-var v3 = {
-  NAME: "C",
-  VAL: [
-    2,
-    3
-  ]
-};
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.v = v;
-exports.u = u;
-exports.h = h;
-exports.A = A;
-exports.B = B;
-exports.v0 = v0;
-exports.v1 = v1;
-exports.v2 = v2;
-exports.v3 = v3;
-exports.N = N;
-exports.N0 = N0;
-exports.a = a;
-exports.c = c;
-/*  Not a pure module */
diff --git a/jscomp/test/record_debug_test.res b/jscomp/test/record_debug_test.res
deleted file mode 100644
index 208c098..0000000
--- a/jscomp/test/record_debug_test.res
+++ /dev/null
@@ -1,60 +0,0 @@
-/* [@@@bs.config {flags = [|"-dsource"|]}] */
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-type rec t = {
-  a: option<int>,
-  b: y,
-}
-and y = {
-  xx: int,
-  yy: int,
-}
-
-let v = {a: Some(3), b: {xx: 2, yy: 3}}
-
-let u = {...v, a: Some(2)}
-
-let h = list{1, 2, 3, 4}
-
-exception A(int)
-
-type u = ..
-
-type u += B(int, int)
-
-let v0 = A(3)
-let v1 = B(3, 2)
-let v2 = #C(2)
-let v3 = #C(2, 3)
-
-module N = {
-  let a = 0
-  let b = 1
-  external f: int => int = "%identity"
-}
-
-module N0: {
-  let a: int
-  let b: int
-  let f: int => int
-} = {
-  let a = 0
-  let b = 1
-  external f: int => int = "%identity"
-}
-
-Js.log2("hei", v)
-
-let (a, c) = ((1, 2, 2, 4, 3), [1, 2, 3, 4, 5])
-Js.log2(a, c)
-
-%%private(let i = 3)
-%%private(
-  let a = (``, `a`)
-)
-
-eq(__LOC__, a, ("", "a"))
-
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/record_extension_test.js b/jscomp/test/record_extension_test.js
deleted file mode 100644
index 0a800c9..0000000
--- a/jscomp/test/record_extension_test.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_format = require("../../lib/js/caml_format.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var Inline_record = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.Inline_record");
-
-function f(x) {
-  if (x.RE_EXN_ID === Inline_record) {
-    return x.x + Caml_format.int_of_string(x.y) | 0;
-  }
-  
-}
-
-var v0 = {
-  RE_EXN_ID: Inline_record,
-  x: 3,
-  y: "4"
-};
-
-eq("File \"record_extension_test.res\", line 18, characters 3-10", f(v0), 7);
-
-function f2(x) {
-  if (typeof x !== "object" || x.TAG !== "C") {
-    return 0;
-  } else {
-    return x.x;
-  }
-}
-
-function f2_with(x) {
-  if (typeof x !== "object" || x.TAG !== "C") {
-    return x;
-  } else {
-    return {
-            TAG: "C",
-            x: 0,
-            y: x.y
-          };
-  }
-}
-
-var A = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.A");
-
-var B = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.B");
-
-var C = /* @__PURE__ */Caml_exceptions.create("Record_extension_test.C");
-
-function u(f) {
-  try {
-    return Curry._1(f, undefined);
-  }
-  catch (raw_x){
-    var x = Caml_js_exceptions.internalToOCamlException(raw_x);
-    if (x.RE_EXN_ID === A) {
-      return x.name + x.x | 0;
-    } else if (x.RE_EXN_ID === B) {
-      return x._1 + x._2 | 0;
-    } else if (x.RE_EXN_ID === C) {
-      return x.name;
-    } else {
-      return -1;
-    }
-  }
-}
-
-Mt.from_pair_suites("File \"record_extension_test.res\", line 55, characters 29-36", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.Inline_record = Inline_record;
-exports.f = f;
-exports.v0 = v0;
-exports.f2 = f2;
-exports.f2_with = f2_with;
-exports.A = A;
-exports.B = B;
-exports.C = C;
-exports.u = u;
-/*  Not a pure module */
diff --git a/jscomp/test/record_extension_test.res b/jscomp/test/record_extension_test.res
deleted file mode 100644
index a8e73d7..0000000
--- a/jscomp/test/record_extension_test.res
+++ /dev/null
@@ -1,55 +0,0 @@
-/* for o in jscomp/test/*test.js ; do npx mocha  $o ; done */*/
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-/* Record_extension */
-type t0 = ..
-type t0 += Inline_record({x: int, y: string})
-
-let f = x =>
-  switch x {
-  | Inline_record({x, y}) => Some(x + int_of_string(y))
-  | _ => None
-  }
-let v0 = Inline_record({x: 3, y: "4"})
-
-eq(__LOC__, f(v0), Some(7))
-
-/* Record_unboxed */
-type t1 = | @unboxed A({x: int})
-
-/* Record_inlined */
-type t2 =
-  | B
-  | C({x: int, y: string})
-  | D({w: int})
-let f2 = x =>
-  switch x {
-  | D(_)
-  | B => 0
-
-  | C({x}) => x
-  }
-
-let f2_with = x =>
-  switch x {
-  | D(_)
-  | B => x
-  | C(u) => C({...u, x: 0})
-  }
-
-exception A({name: int, x: int})
-exception B(int, int)
-exception C({name: int})
-
-let u = f =>
-  try f() catch {
-  | A({name, x}) => name + x
-  | B(a, b) => a + b
-  | C(x) => x.name
-  | _ => -1
-  }
-
-let () = Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/record_name_test.js b/jscomp/test/record_name_test.js
deleted file mode 100644
index 7b193c0..0000000
--- a/jscomp/test/record_name_test.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  return {
-          THIS_IS_NOT_EXPRESSIBLE_IN_BUCKLE: x
-        };
-}
-
-function set(x) {
-  x.THIS_IS_NOT_EXPRESSIBLE_IN_BUCKLE = 3;
-  return (x.THIS_IS_NOT_EXPRESSIBLE_IN_BUCKLE << 1);
-}
-
-function f1(u) {
-  return u.x.x.x.y;
-}
-
-function f2(x) {
-  x["x'"] = x["x'"] + 3 | 0;
-  return {
-          "x'": x["x'"] + 3 | 0
-        };
-}
-
-function f3(x) {
-  x.in = x.in + 3 | 0;
-  return {
-          in: x.in + 3 | 0
-        };
-}
-
-function f4(param) {
-  return (((param.EXACT_MAPPING_TO_JS_LABEL + param.EXACT_2 | 0) + param.z.hello | 0) << 1);
-}
-
-function u(param) {
-  return {
-          x: 22,
-          h: 3
-        };
-}
-
-exports.f = f;
-exports.set = set;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.u = u;
-/* No side effect */
diff --git a/jscomp/test/record_name_test.res b/jscomp/test/record_name_test.res
deleted file mode 100644
index 4d5b6bd..0000000
--- a/jscomp/test/record_name_test.res
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-To work around unused attribute checking
-
-- we mark it used in ppx stage
-we can not mark it in parsing since it won't
-works for reason
-*/
-type t = {
-  @as("THIS_IS_NOT_EXPRESSIBLE_IN_BUCKLE") mutable x: int,
-  /* test key word later */
-}
-
-let f = x => {x: x}
-
-let set = x => {
-  x.x = 3
-  x.x * 2
-}
-
-type x = t = private {@as("THIS_IS_NOT_EXPRESSIBLE_IN_BUCKLE") mutable x: int}
-
-type rec t0 = {x: t0, y: int}
-
-let f1 = u =>
-  switch u {
-  | {x: {x: {x: {y}}}} => y
-  }
-
-type t1 = {mutable x': int}
-
-let f2 = (x: t1) => {
-  x.x' = x.x' + 3
-  {x': x.x' + 3}
-}
-
-type t2 = {@as("open") mutable x': int}
-
-let f3 = (x: t2) => {
-  x.x' = x.x' + 3
-  {x': x.x' + 3}
-}
-
-type t3 = {@as("in") mutable x': int}
-
-let f3 = (x: t3) => {
-  x.x' = x.x' + 3
-  {x': x.x' + 3}
-}
-
-type rec entry = {
-  @as("EXACT_MAPPING_TO_JS_LABEL") x: int,
-  @as("EXACT_2") y: int,
-  z: obj,
-}
-and obj = {@as("hello") hi: int}
-
-let f4 = ({x, y, z: {hi}}: entry) => (x + y + hi) * 2
-
-/* either x or y is a mistake */
-
-type t6 = {
-  @as("x") x: int,
-  @as("y") y: int,
-}
-/* allow this case */
-
-@obj external ff: (~x: int, ~h: @as(3) _) => _ = ""
-@obj external ff2: (~x: int, ~h: @as(3) _) => {"x": int} = ""
-let u = () => {
-  ignore(ff(~x=3))
-  ff2(~x=22)
-}
diff --git a/jscomp/test/record_regression.js b/jscomp/test/record_regression.js
deleted file mode 100644
index a409a3a..0000000
--- a/jscomp/test/record_regression.js
+++ /dev/null
@@ -1,295 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var f1 = {
-  x: 3,
-  z: 2
-};
-
-var newrecord = Caml_obj.obj_dup(f1);
-
-newrecord.y = 3;
-
-var newrecord$1 = Caml_obj.obj_dup(newrecord);
-
-newrecord$1.yy = Caml_option.some(undefined);
-
-var theseTwoShouldBeIdentical = [
-  newrecord$1.yy,
-  Caml_option.some(undefined)
-];
-
-var v = {
-  x: 2,
-  z: 3
-};
-
-var newrecord$2 = Caml_obj.obj_dup(v);
-
-newrecord$2.y1 = 22;
-
-var v1 = {
-  x: 2,
-  z: 3
-};
-
-var newrecord$3 = Caml_obj.obj_dup(v1);
-
-newrecord$3.y1 = 22;
-
-function h11(v1) {
-  var newrecord = Caml_obj.obj_dup(v1);
-  newrecord.y1 = 22;
-  return newrecord;
-}
-
-var po = {
-  aa: 3,
-  bb: 4
-};
-
-var newrecord$4 = Caml_obj.obj_dup(po);
-
-newrecord$4.aa = undefined;
-
-function setAA(ao) {
-  return {
-          aa: ao
-        };
-}
-
-var ir0 = {
-  TAG: "V0",
-  x0: "v0",
-  x3: 3
-};
-
-var ir1 = {
-  TAG: "V0",
-  x0: "v0",
-  x1: "v1",
-  x3: 3
-};
-
-var ir2 = {
-  TAG: "V0",
-  x0: "v0",
-  x1: "v1",
-  x2: 2,
-  x3: 3
-};
-
-var ir3 = {
-  TAG: "V1",
-  y0: "v0",
-  y1: 1
-};
-
-var pm0;
-
-pm0 = ir0.TAG === "V0" ? [
-    "v0",
-    3
-  ] : [
-    "v0",
-    undefined
-  ];
-
-var pm1;
-
-if (ir1.TAG === "V0") {
-  var x1 = "v1";
-  var x0 = "v0";
-  pm1 = x1 !== undefined ? [
-      x0,
-      x1,
-      3
-    ] : [
-      x0,
-      "n/a",
-      3
-    ];
-} else {
-  pm1 = [
-    "v0",
-    "n/a",
-    "v1"
-  ];
-}
-
-var pm2;
-
-if (ir2.TAG === "V0") {
-  var x1$1 = "v1";
-  var x0$1 = "v0";
-  if (x1$1 !== undefined) {
-    var x2 = 2;
-    pm2 = x2 !== undefined ? [
-        x0$1,
-        x1$1,
-        x2,
-        3
-      ] : [
-        x0$1,
-        x1$1,
-        0,
-        3
-      ];
-  } else {
-    var x2$1 = 2;
-    pm2 = x2$1 !== undefined ? [
-        x0$1,
-        "n/a",
-        x2$1,
-        3
-      ] : [
-        x0$1,
-        "n/a",
-        0,
-        3
-      ];
-  }
-} else {
-  pm2 = [
-    "v0",
-    "n/a",
-    0,
-    "v1"
-  ];
-}
-
-function inlinedRecord(ir) {
-  if (ir.TAG !== "V0") {
-    return [
-            ir.y0,
-            "n/a",
-            0,
-            ir.y1
-          ];
-  }
-  var x1 = ir.x1;
-  var x0 = ir.x0;
-  if (x1 !== undefined) {
-    switch (x1) {
-      case "x1" :
-          var x2 = ir.x2;
-          if (x2 !== undefined) {
-            return [
-                    x0,
-                    "x1",
-                    x2,
-                    ir.x3
-                  ];
-          }
-          break;
-      case "xx1" :
-          var x2$1 = ir.x2;
-          if (x2$1 !== undefined) {
-            return [
-                    x0,
-                    "xx1",
-                    x2$1,
-                    ir.x3
-                  ];
-          }
-          break;
-      default:
-        
-    }
-    var x2$2 = ir.x2;
-    if (x2$2 !== undefined) {
-      return [
-              x0,
-              x1,
-              x2$2,
-              ir.x3
-            ];
-    } else {
-      return [
-              x0,
-              x1,
-              0,
-              ir.x3
-            ];
-    }
-  }
-  var x2$3 = ir.x2;
-  if (x2$3 !== undefined) {
-    return [
-            x0,
-            "n/a",
-            x2$3,
-            ir.x3
-          ];
-  } else {
-    return [
-            x0,
-            "n/a",
-            0,
-            ir.x3
-          ];
-  }
-}
-
-var pm3 = inlinedRecord(ir2);
-
-var pm4 = inlinedRecord(ir3);
-
-var f2 = {
-  x: 3,
-  y: 3,
-  z: 3
-};
-
-var f3 = newrecord;
-
-var f4 = newrecord$1;
-
-var v2 = {
-  x: 3,
-  y: undefined,
-  z: 2
-};
-
-var h = newrecord$2;
-
-var h10 = newrecord$3;
-
-var ir4 = {
-  TAG: "V0",
-  x: 3
-};
-
-var ir5 = {
-  TAG: "V0"
-};
-
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.theseTwoShouldBeIdentical = theseTwoShouldBeIdentical;
-exports.v2 = v2;
-exports.v = v;
-exports.h = h;
-exports.v1 = v1;
-exports.h10 = h10;
-exports.h11 = h11;
-exports.po = po;
-exports.setAA = setAA;
-exports.ir0 = ir0;
-exports.ir1 = ir1;
-exports.ir2 = ir2;
-exports.ir3 = ir3;
-exports.pm0 = pm0;
-exports.pm1 = pm1;
-exports.pm2 = pm2;
-exports.inlinedRecord = inlinedRecord;
-exports.pm3 = pm3;
-exports.pm4 = pm4;
-exports.ir4 = ir4;
-exports.ir5 = ir5;
-/*  Not a pure module */
diff --git a/jscomp/test/record_regression.res b/jscomp/test/record_regression.res
deleted file mode 100644
index 44ae1b0..0000000
--- a/jscomp/test/record_regression.res
+++ /dev/null
@@ -1,129 +0,0 @@
-// @@config({flags: ["-bs-diagnose"] })
-
-type t0 = {x: int, y?: int, yy?: option<int>, z: int}
-
-let f1 = {x: 3, z: 2}
-
-let f2 = {x: 3, z: 3, y: 3}
-
-let f3 = {...f1, y: 3}
-
-let f4 = {...f3, yy: None}
-
-let theseTwoShouldBeIdentical = [f4.yy, (Some(None): option<option<int>>)]
-
-type r = {
-  x: int,
-  y: option<int>,
-  z: int,
-}
-
-// let v0 = { x :  3 , z : 2 }
-
-// let v2 = { ... v0 , x : 3 }
-
-let v1: t0 = {
-  x: 3,
-  z: 3,
-}
-
-let v2: r = {x: 3, y: None, z: 2}
-
-type config = {
-  x: int,
-  y0?: int,
-  y1?: int,
-  y2?: int,
-  y3?: int,
-  y4?: int,
-  y5?: int,
-  y6?: int,
-  y7?: int,
-  y8?: int,
-  y9?: int,
-  y10?: int,
-  y11?: int,
-  y12?: int,
-  y13?: int,
-  y14?: int,
-  y15?: int,
-  y16?: int,
-  y17?: int,
-  y18?: int,
-  y19?: int,
-  y20?: int,
-  y21?: int,
-  y22?: int,
-  y23?: int,
-  z: int,
-}
-
-let v: config = {x: 2, z: 3}
-
-let h: config = {...v, y1: 22}
-
-type small_config = {
-  x: int,
-  y0?: int,
-  y1?: int,
-  z: int,
-}
-
-let v1: small_config = {x: 2, z: 3}
-
-let h10: small_config = {...v1, y1: 22}
-
-let h11 = (v1): small_config => {
-  {...v1, y1: 22}
-}
-
-type partiallyOptional = {
-  aa?: int,
-  bb: option<int>,
-}
-
-let po = {aa: 3, bb: Some(4)}
-
-let _ = {...po, aa: ?None}
-
-let setAA = (ao: option<int>) => {aa: ?ao, bb: None}
-
-type inlinedOptional = V0({x0: string, x1?: string, x2?: int, x3: int}) | V1({y0: string, y1: int})
-
-let ir0 = V0({x0: "v0", x3: 3})
-let ir1 = V0({x0: "v0", x1: "v1", x3: 3})
-let ir2 = V0({x0: "v0", x1: "v1", x2: 2, x3: 3})
-let ir3 = V1({y0: "v0", y1: 1})
-
-let pm0 = switch ir0 {
-| V0({x0, x3}) => (x0, x3)
-| V1({y0, y1}) => (y0, y1)
-}
-let pm1 = switch ir1 {
-| V0({x0, x1, x3}) => (x0, x1, x3)
-| V0({x0, x1: ?None, x3}) => (x0, "n/a", x3)
-| V1({y0, y1}) => (y0, "n/a", y1)
-}
-let pm2 = switch ir2 {
-| V0({x0, x1, x2, x3}) => (x0, x1, x2, x3)
-| V0({x0, x1: ?None, x2, x3}) => (x0, "n/a", x2, x3)
-| V0({x0, x1, x2: ?None, x3}) => (x0, x1, 0, x3)
-| V0({x0, x1: ?None, x2: ?None, x3}) => (x0, "n/a", 0, x3)
-| V1({y0, y1}) => (y0, "n/a", 0, y1)
-}
-let inlinedRecord = ir =>
-  switch ir {
-  | V0({x0, x1: ?Some("x1"), x2, x3}) => (x0, "x1", x2, x3)
-  | V0({x0, x1: "xx1", x2, x3}) => (x0, "xx1", x2, x3)
-  | V0({x0, x1, x2, x3}) => (x0, x1, x2, x3)
-  | V0({x0, x1: ?None, x2, x3}) => (x0, "n/a", x2, x3)
-  | V0({x0, x1, x2: ?None, x3}) => (x0, x1, 0, x3)
-  | V0({x0, x1: ?None, x2: ?None, x3}) => (x0, "n/a", 0, x3)
-  | V1({y0, y1}) => (y0, "n/a", 0, y1)
-  }
-let pm3 = inlinedRecord(ir2)
-let pm4 = inlinedRecord(ir3)
-
-type inlinedOptional2 = V0({x?: int})
-let ir4 = V0({x: 3})
-let ir5 = V0({})
\ No newline at end of file
diff --git a/jscomp/test/record_type_spread.js b/jscomp/test/record_type_spread.js
deleted file mode 100644
index 7f0c619..0000000
--- a/jscomp/test/record_type_spread.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function getY(v) {
-  return v.y;
-}
-
-function getX(v) {
-  return v.x;
-}
-
-var DeepSub = {
-  d: {
-    x: {
-      TAG: "Ok",
-      _0: 1
-    },
-    z: {
-      NAME: "Two",
-      VAL: 1
-    }
-  }
-};
-
-var v = {
-  y: 3,
-  x: 3
-};
-
-var d = {
-  a: "",
-  b: 1,
-  c: undefined,
-  d: {
-    TAG: "Ok",
-    _0: 1
-  }
-};
-
-var x = {
-  c: "hello"
-};
-
-exports.getY = getY;
-exports.getX = getX;
-exports.v = v;
-exports.d = d;
-exports.x = x;
-exports.DeepSub = DeepSub;
-/* No side effect */
diff --git a/jscomp/test/record_type_spread.res b/jscomp/test/record_type_spread.res
deleted file mode 100644
index ee373fb..0000000
--- a/jscomp/test/record_type_spread.res
+++ /dev/null
@@ -1,61 +0,0 @@
-type x = {x: int}
-
-type y = {
-  y: int,
-  ...x,
-}
-
-let getY = (v: y) => v.y
-let getX = (v: y) => v.x
-
-let v: y = {y: 3, x: 3}
-
-type f<'a> = {
-  a: string,
-  b: 'a,
-  c: option<'a>,
-  d: option<result<'a, 'a>>,
-}
-
-type d<'a> = {
-  ...f<'a>,
-}
-
-let d: d<int> = {
-  a: "",
-  b: 1,
-  c: None,
-  d: Some(Ok(1)),
-}
-
-type rn<'aaa> = {c: option<'aaa>}
-
-type withRenamedTypeVariable<'bbb> = {
-  ...rn<'bbb>,
-}
-
-let x: withRenamedTypeVariable<bool> = {
-  c: Some(true),
-}
-
-type rnAsString = {
-  ...rn<string>,
-}
-
-let x: rnAsString = {
-  c: Some("hello"),
-}
-
-module DeepSub = {
-  type t<'a, 'b> = {
-    x: result<'a, 'b>,
-    z: [#One | #Two('a) | #Three('b)],
-  }
-  type d = {
-    ...t<int, int>,
-  }
-  let d: d = {
-    x: Ok(1),
-    z: #Two(1),
-  }
-}
diff --git a/jscomp/test/record_with_test.js b/jscomp/test/record_with_test.js
deleted file mode 100644
index e1b315c..0000000
--- a/jscomp/test/record_with_test.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-
-var v = {
-  syntax: undefined,
-  imports: 0,
-  file_options: 0,
-  package: 0,
-  messages: 0,
-  enums: 0,
-  extends: 0
-};
-
-var u_v = {
-  syntax: undefined,
-  imports: 0,
-  file_options: 0,
-  package: 0,
-  messages: 0,
-  enums: 0,
-  extends: 0
-};
-
-function f(g, h) {
-  var init = Curry._1(g, h);
-  return {
-          syntax: init.syntax,
-          imports: 0,
-          file_options: init.file_options,
-          package: init.package,
-          messages: init.messages,
-          enums: init.enums,
-          extends: init.extends
-        };
-}
-
-var suites_0 = [
-  "eq_with",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: v,
-              _1: u_v
-            };
-    })
-];
-
-var suites = {
-  hd: suites_0,
-  tl: /* [] */0
-};
-
-Mt.from_pair_suites("Record_with_test", suites);
-
-var uv = {
-  syntax: undefined,
-  imports: 1,
-  file_options: 0,
-  package: 0,
-  messages: 0,
-  enums: 0,
-  extends: 0
-};
-
-exports.v = v;
-exports.uv = uv;
-exports.u_v = u_v;
-exports.f = f;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/record_with_test.res b/jscomp/test/record_with_test.res
deleted file mode 100644
index 117ddd0..0000000
--- a/jscomp/test/record_with_test.res
+++ /dev/null
@@ -1,39 +0,0 @@
-type proto = {
-  syntax: option<string>,
-  imports: int,
-  file_options: int,
-  package: int,
-  messages: int,
-  enums: int,
-  extends: int,
-}
-
-let v = {
-  syntax: None,
-  imports: 0,
-  file_options: 0,
-  package: 0,
-  messages: 0,
-  enums: 0,
-  extends: 0,
-}
-
-let uv = {
-  syntax: None,
-  imports: 1,
-  file_options: 0,
-  package: 0,
-  messages: 0,
-  enums: 0,
-  extends: 0,
-}
-let u_v = {...v, imports: 0}
-
-let f = (g, h) => {...g(h), imports: 0}
-
-let suites = {
-  open Mt
-  list{("eq_with", _ => Eq(v, u_v))}
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/recursive_module.js b/jscomp/test/recursive_module.js
deleted file mode 100644
index 439491c..0000000
--- a/jscomp/test/recursive_module.js
+++ /dev/null
@@ -1,220 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Lazy = require("../../lib/js/lazy.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_module = require("../../lib/js/caml_module.js");
-var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var Xx = {
-  f: (function (prim0, prim1) {
-      return Caml_external_polyfill.resolve("hfiehi")(prim0, prim1);
-    })
-};
-
-var Int3 = Caml_module.init_mod([
-      "recursive_module.res",
-      25,
-      4
-    ], {
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "u"
-        ]]
-    });
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "u"
-        ]]
-    }, Int3, Int3);
-
-var Inta = Caml_module.init_mod([
-      "recursive_module.res",
-      29,
-      4
-    ], {
-      TAG: "Module",
-      _0: [[
-          "Lazy",
-          "a"
-        ]]
-    });
-
-var Intb = Caml_module.init_mod([
-      "recursive_module.res",
-      34,
-      4
-    ], {
-      TAG: "Module",
-      _0: [[
-          "Lazy",
-          "a"
-        ]]
-    });
-
-var a = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      return CamlinternalLazy.force(Intb.a);
-    })
-};
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          "Lazy",
-          "a"
-        ]]
-    }, Inta, {
-      a: a
-    });
-
-var a$1 = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      return CamlinternalLazy.force(Inta.a) + 1 | 0;
-    })
-};
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          "Lazy",
-          "a"
-        ]]
-    }, Intb, {
-      a: a$1
-    });
-
-var tmp;
-
-try {
-  tmp = CamlinternalLazy.force(Intb.a);
-}
-catch (raw_exn){
-  var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-  if (exn.RE_EXN_ID === Lazy.Undefined) {
-    tmp = -1;
-  } else {
-    throw exn;
-  }
-}
-
-eq("File \"recursive_module.res\", line 39, characters 2-9", -1, tmp);
-
-var Inta$1 = Caml_module.init_mod([
-      "recursive_module.res",
-      49,
-      6
-    ], {
-      TAG: "Module",
-      _0: [[
-          "Lazy",
-          "a"
-        ]]
-    });
-
-var Intb$1 = Caml_module.init_mod([
-      "recursive_module.res",
-      54,
-      6
-    ], {
-      TAG: "Module",
-      _0: [[
-          "Lazy",
-          "a"
-        ]]
-    });
-
-var a$2 = {
-  LAZY_DONE: false,
-  VAL: (function () {
-      return CamlinternalLazy.force(Intb$1.a) + 1 | 0;
-    })
-};
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          "Lazy",
-          "a"
-        ]]
-    }, Inta$1, {
-      a: a$2
-    });
-
-var a$3 = {
-  LAZY_DONE: true,
-  VAL: 2
-};
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          "Lazy",
-          "a"
-        ]]
-    }, Intb$1, {
-      a: a$3
-    });
-
-var A = {
-  Inta: Inta$1,
-  Intb: Intb$1
-};
-
-eq("File \"recursive_module.res\", line 59, characters 3-10", CamlinternalLazy.force(Inta$1.a), 3);
-
-var tmp$1;
-
-try {
-  Curry._1(Int3.u, 3);
-  tmp$1 = 3;
-}
-catch (raw_exn$1){
-  var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
-  if (exn$1.RE_EXN_ID === "Undefined_recursive_module") {
-    tmp$1 = 4;
-  } else {
-    throw exn$1;
-  }
-}
-
-eq("File \"recursive_module.res\", line 62, characters 2-9", 4, tmp$1);
-
-Mt.from_pair_suites("Recursive_module", suites.contents);
-
-var Int32;
-
-var uuu = Xx.f;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.Int32 = Int32;
-exports.Xx = Xx;
-exports.uuu = uuu;
-exports.Int3 = Int3;
-exports.Inta = Inta;
-exports.Intb = Intb;
-exports.A = A;
-/* Int3 Not a pure module */
diff --git a/jscomp/test/recursive_module.res b/jscomp/test/recursive_module.res
deleted file mode 100644
index 55ce60b..0000000
--- a/jscomp/test/recursive_module.res
+++ /dev/null
@@ -1,72 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-module rec Int32: {
-  type t
-  type buffer
-  @get external buffer: t => buffer = "buffer"
-  @get_index external get: (t, int) => int = ""
-  @set_index external set: (t, int, int) => unit = ""
-  @new external create: array<int> => t = "Int32Array"
-  @new external of_buffer: buffer => t = "Int32Array"
-} = Int32 /* Int32 is compiled away in 4.06 */
-
-module Xx: {
-  let f: (int, int) => int
-} = {
-  external f: (int, int) => int = "?hfiehi"
-}
-
-let uuu = Xx.f
-
-module rec Int3: {
-  let u: int => int
-} = Int3
-
-module rec Inta: {
-  let a: lazy_t<int>
-} = {
-  let a = lazy Lazy.force(Intb.a)
-}
-and Intb: {
-  let a: lazy_t<int>
-} = {
-  let a = lazy (Lazy.force(Inta.a) + 1)
-}
-
-eq(
-  __LOC__,
-  -1,
-  try Lazy.force(Intb.a) catch {
-  | Lazy.Undefined => -1
-  },
-)
-
-module A = {
-  module rec Inta: {
-    let a: lazy_t<int>
-  } = {
-    let a = lazy (Lazy.force(Intb.a) + 1)
-  }
-  and Intb: {
-    let a: lazy_t<int>
-  } = {
-    let a = lazy 2
-  }
-}
-
-eq(__LOC__, Lazy.force(A.Inta.a), 3)
-/* expect raise Undefined_recursive_module */
-eq(
-  __LOC__,
-  4,
-  try {
-    ignore(Int3.u(3))
-    3
-  } catch {
-  | Undefined_recursive_module(_) => 4
-  },
-)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/recursive_module_test.js b/jscomp/test/recursive_module_test.js
deleted file mode 100644
index 4d41248..0000000
--- a/jscomp/test/recursive_module_test.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_module = require("../../lib/js/caml_module.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function add(suite) {
-  suites.contents = {
-    hd: suite,
-    tl: suites.contents
-  };
-}
-
-var Int3 = Caml_module.init_mod([
-      "recursive_module_test.res",
-      12,
-      4
-    ], {
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "u"
-        ]]
-    });
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          "Function",
-          "u"
-        ]]
-    }, Int3, Int3);
-
-function fact(n) {
-  if (n <= 1) {
-    return 1;
-  } else {
-    return Math.imul(n, Curry._1(M.fact, n - 1 | 0));
-  }
-}
-
-var M = {
-  fact: fact
-};
-
-var fact$1 = M.fact;
-
-var Fact = {
-  M: M,
-  fact: fact$1
-};
-
-eq("File \"recursive_module_test.res\", line 29, characters 12-19", 120, Curry._1(fact$1, 5));
-
-add([
-      "File \"recursive_module_test.res\", line 31, characters 14-21",
-      (function (param) {
-          return {
-                  TAG: "ThrowAny",
-                  _0: (function (param) {
-                      Curry._1(Int3.u, 3);
-                    })
-                };
-        })
-    ]);
-
-Mt.from_pair_suites("Recursive_module_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.add = add;
-exports.Int3 = Int3;
-exports.Fact = Fact;
-/* Int3 Not a pure module */
diff --git a/jscomp/test/recursive_module_test.res b/jscomp/test/recursive_module_test.res
deleted file mode 100644
index 742ff96..0000000
--- a/jscomp/test/recursive_module_test.res
+++ /dev/null
@@ -1,33 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-let add = suite => suites := list{suite, ...suites.contents}
-
-module rec Int3: {
-  let u: int => int
-} = Int3
-
-module Fact = {
-  module type S = {
-    let fact: int => int
-  }
-  module rec M: S = {
-    let fact = n =>
-      if n <= 1 {
-        1
-      } else {
-        n * M.fact(n - 1)
-      }
-  }
-  include M
-}
-
-let () = eq(__LOC__, 120, Fact.fact(5))
-
-let () = add((__LOC__, _ => Mt.ThrowAny(_ => ignore(Int3.u(3)))))
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/recursive_react_component.js b/jscomp/test/recursive_react_component.js
deleted file mode 100644
index b389e42..0000000
--- a/jscomp/test/recursive_react_component.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var React = require("react");
-
-function make(Props) {
-  var foo = Props.foo;
-  return React.createElement(make, {
-              foo: foo
-            });
-}
-
-exports.make = make;
-/* react Not a pure module */
diff --git a/jscomp/test/recursive_react_component.res b/jscomp/test/recursive_react_component.res
deleted file mode 100644
index c6437ce..0000000
--- a/jscomp/test/recursive_react_component.res
+++ /dev/null
@@ -1,11 +0,0 @@
-@@bs.config({
-  flags: [
-    "-bs-jsx",
-    "3", // "-dsource",
-    // "-w","A",
-    // "-warn-error", "a"
-  ],
-})
-
-@react.component
-let rec make = (~foo, ()) => React.createElement(make, makeProps(~foo, ()))
diff --git a/jscomp/test/recursive_records_test.js b/jscomp/test/recursive_records_test.js
deleted file mode 100644
index ca0328c..0000000
--- a/jscomp/test/recursive_records_test.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var rec_cell = {};
-
-rec_cell.content = 3;
-
-rec_cell.next = rec_cell;
-
-function f0(x) {
-  var rec_cell = {};
-  Caml_obj.update_dummy(rec_cell, {
-        content: Math.imul(x, x) - 6 | 0,
-        next: rec_cell
-      });
-  return rec_cell;
-}
-
-function a0(x) {
-  return (x.content + x.next.content | 0) + x.next.next.content | 0;
-}
-
-eq("File \"recursive_records_test.res\", line 26, characters 5-12", a0(rec_cell), 9);
-
-eq("File \"recursive_records_test.res\", line 27, characters 5-12", a0(f0(3)), 9);
-
-var rec_cell2 = {};
-
-rec_cell2.content = 3;
-
-rec_cell2.next = rec_cell2;
-
-function f2(x) {
-  var rec_cell2 = {};
-  Caml_obj.update_dummy(rec_cell2, {
-        TAG: "Cons",
-        content: Math.imul(x, x) - 6 | 0,
-        next: rec_cell2
-      });
-  return rec_cell2;
-}
-
-function hd(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return x.content;
-  }
-}
-
-function tl_exn(x) {
-  if (typeof x === "object") {
-    return x.next;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "recursive_records_test.res",
-          49,
-          11
-        ],
-        Error: new Error()
-      };
-}
-
-eq("File \"recursive_records_test.res\", line 54, characters 5-12", (hd(rec_cell2) + hd(tl_exn(rec_cell2)) | 0) + hd(tl_exn(tl_exn(rec_cell2))) | 0, 9);
-
-var rec_cell2$1 = f2(3);
-
-eq("File \"recursive_records_test.res\", line 56, characters 5-12", (hd(rec_cell2$1) + hd(tl_exn(rec_cell2$1)) | 0) + hd(tl_exn(tl_exn(rec_cell2$1))) | 0, 9);
-
-var rec_cell3 = {};
-
-rec_cell3.hd = 3;
-
-rec_cell3.tl = rec_cell3;
-
-function f3(x) {
-  var rec_cell3 = {};
-  Caml_obj.update_dummy(rec_cell3, {
-        hd: Math.imul(x, x) - 6 | 0,
-        tl: rec_cell3
-      });
-  return rec_cell3;
-}
-
-eq("File \"recursive_records_test.res\", line 68, characters 4-11", (List.hd(rec_cell3) + List.hd(List.tl(rec_cell3)) | 0) + List.hd(List.tl(List.tl(rec_cell3))) | 0, 9);
-
-var rec_cell3$1 = f3(3);
-
-eq("File \"recursive_records_test.res\", line 77, characters 4-11", (List.hd(rec_cell3$1) + List.hd(List.tl(rec_cell3$1)) | 0) + List.hd(List.tl(List.tl(rec_cell3$1))) | 0, 9);
-
-Mt.from_pair_suites("recursive_records_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.rec_cell = rec_cell;
-exports.f0 = f0;
-exports.a0 = a0;
-exports.rec_cell2 = rec_cell2;
-exports.f2 = f2;
-exports.hd = hd;
-exports.tl_exn = tl_exn;
-exports.rec_cell3 = rec_cell3;
-exports.f3 = f3;
-/*  Not a pure module */
diff --git a/jscomp/test/recursive_records_test.res b/jscomp/test/recursive_records_test.res
deleted file mode 100644
index e98f5cc..0000000
--- a/jscomp/test/recursive_records_test.res
+++ /dev/null
@@ -1,86 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-type rec cell<'a> = {
-  content: 'a,
-  mutable next: cell<'a>,
-}
-
-let rec rec_cell = {
-  content: 3,
-  next: rec_cell,
-} /* over records */
-
-let f0 = x => {
-  let rec rec_cell = {
-    content: x * x - 6,
-    next: rec_cell,
-  }
-  rec_cell
-}
-
-let a0 = x => x.content + x.next.content + x.next.next.content
-
-let () = {
-  eq(__LOC__, a0(rec_cell), 9)
-  eq(__LOC__, a0(f0(3)), 9)
-}
-
-type rec cell2 =
-  | Nil
-  | Cons({content: int, mutable next: cell2})
-
-let rec rec_cell2 = Cons({content: 3, next: rec_cell2})
-/* over inline records */
-let f2 = x => {
-  let rec rec_cell2 = Cons({content: x * x - 6, next: rec_cell2})
-  rec_cell2
-}
-
-let hd = x =>
-  switch x {
-  | Nil => 0
-  | Cons(x) => x.content
-  }
-
-let tl_exn = x =>
-  switch x {
-  | Nil => assert(false)
-  | Cons(x) => x.next
-  }
-
-let () = {
-  eq(__LOC__, hd(rec_cell2) + hd(tl_exn(rec_cell2)) + hd(tl_exn(tl_exn(rec_cell2))), 9)
-  let rec_cell2 = f2(3)
-  eq(__LOC__, hd(rec_cell2) + hd(tl_exn(rec_cell2)) + hd(tl_exn(tl_exn(rec_cell2))), 9)
-}
-
-let rec rec_cell3 = list{3, ...rec_cell3} /* over variant */
-
-let f3 = x => {
-  let rec rec_cell3 = list{x * x - 6, ...rec_cell3} /* over variant */
-  rec_cell3
-}
-
-let () = {
-  eq(
-    __LOC__,
-    {
-      open List
-      hd(rec_cell3) + hd(tl(rec_cell3)) + hd(tl(tl(rec_cell3)))
-    },
-    9,
-  )
-  let rec_cell3 = f3(3)
-  eq(
-    __LOC__,
-    {
-      open List
-      hd(rec_cell3) + hd(tl(rec_cell3)) + hd(tl(tl(rec_cell3)))
-    },
-    9,
-  )
-}
-
-let () = Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/recursive_unbound_module_test.js b/jscomp/test/recursive_unbound_module_test.js
deleted file mode 100644
index f651e96..0000000
--- a/jscomp/test/recursive_unbound_module_test.js
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_module = require("../../lib/js/caml_module.js");
-
-function Make(X) {
-  var f = function (param) {
-    
-  };
-  var M = {
-    f: f
-  };
-  return {
-          M: M
-        };
-}
-
-var B = Caml_module.init_mod([
-      "recursive_unbound_module_test.res",
-      14,
-      11
-    ], {
-      TAG: "Module",
-      _0: [[
-          {
-            TAG: "Module",
-            _0: [[
-                "Function",
-                "f"
-              ]]
-          },
-          "M"
-        ]]
-    });
-
-function f(param) {
-  
-}
-
-var M = {
-  f: f
-};
-
-Caml_module.update_mod({
-      TAG: "Module",
-      _0: [[
-          {
-            TAG: "Module",
-            _0: [[
-                "Function",
-                "f"
-              ]]
-          },
-          "M"
-        ]]
-    }, B, {
-      M: M
-    });
-
-var A;
-
-exports.Make = Make;
-exports.A = A;
-exports.B = B;
-/* B Not a pure module */
diff --git a/jscomp/test/recursive_unbound_module_test.res b/jscomp/test/recursive_unbound_module_test.res
deleted file mode 100644
index 802c992..0000000
--- a/jscomp/test/recursive_unbound_module_test.res
+++ /dev/null
@@ -1,17 +0,0 @@
-module type S = {
-  module M: {
-    let f: unit => unit
-  }
-}
-
-module Make = (X: {}) => {
-  module M = {
-    let f = () => ()
-  }
-}
-
-module rec A: {} = {}
-and B: S = {
-  module C = Make(A)
-  include C
-}
diff --git a/jscomp/test/regression_print.js b/jscomp/test/regression_print.js
deleted file mode 100644
index f174166..0000000
--- a/jscomp/test/regression_print.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log(JSON.stringify(2));
-
-console.log(JSON.stringify(1));
-
-/*  Not a pure module */
diff --git a/jscomp/test/regression_print.res b/jscomp/test/regression_print.res
deleted file mode 100644
index b652645..0000000
--- a/jscomp/test/regression_print.res
+++ /dev/null
@@ -1,11 +0,0 @@
-include (
-  {
-    @val external to_str: 'a => string = "JSON.stringify"
-    let debug = x => print_endline(to_str(x))
-
-    let () = {
-      \"@@"(debug, 2)
-      debug(1)
-    }
-  }: {}
-)
diff --git a/jscomp/test/relative_path.js b/jscomp/test/relative_path.js
deleted file mode 100644
index aee0012..0000000
--- a/jscomp/test/relative_path.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var FileJs = require("./File.js");
-
-var foo = FileJs.foo;
-
-function foo2(prim) {
-  return FileJs.foo2(prim);
-}
-
-var bar = foo;
-
-exports.foo = foo;
-exports.foo2 = foo2;
-exports.bar = bar;
-/* foo Not a pure module */
diff --git a/jscomp/test/relative_path.res b/jscomp/test/relative_path.res
deleted file mode 100644
index 9d3ed00..0000000
--- a/jscomp/test/relative_path.res
+++ /dev/null
@@ -1,7 +0,0 @@
-/* include (struct */
-@module("./File.js") external foo: int = "foo"
-/* end : sig val foo : int end ) */
-
-@module("./File.js") external foo2: int => int = "foo2"
-
-let bar = foo
diff --git a/jscomp/test/res_debug.js b/jscomp/test/res_debug.js
deleted file mode 100644
index f826b71..0000000
--- a/jscomp/test/res_debug.js
+++ /dev/null
@@ -1,95 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function f($$window, a, b) {
-  return $$window.location(a, b);
-}
-
-var v0 = {
-  x: 3,
-  z: 2
-};
-
-var newrecord = Caml_obj.obj_dup(v0);
-
-newrecord.x = 3;
-
-function testMatch(v) {
-  var y = v.y;
-  if (y !== undefined) {
-    return y;
-  } else {
-    return 42;
-  }
-}
-
-function optionMap(x, f) {
-  if (x !== undefined) {
-    return Caml_option.some(Curry._1(f, Caml_option.valFromOption(x)));
-  }
-  
-}
-
-var ok_name = optionMap(undefined, (function (x) {
-        return x;
-      }));
-
-var ok = {
-  name: ok_name
-};
-
-var bad_name = optionMap(undefined, (function (x) {
-        return x;
-      }));
-
-var bad = {
-  name: bad_name
-};
-
-function identity(x) {
-  return x;
-}
-
-var name1 = "ReScript";
-
-var ok1 = {
-  name: name1
-};
-
-var bad1 = {
-  name: name1
-};
-
-var v2 = newrecord;
-
-var v1 = {
-  x: 3,
-  z: 3
-};
-
-var h = /* '😊' */128522;
-
-var hey = "hello, 世界";
-
-var name;
-
-exports.f = f;
-exports.v0 = v0;
-exports.v2 = v2;
-exports.v1 = v1;
-exports.testMatch = testMatch;
-exports.h = h;
-exports.hey = hey;
-exports.optionMap = optionMap;
-exports.name = name;
-exports.ok = ok;
-exports.bad = bad;
-exports.identity = identity;
-exports.name1 = name1;
-exports.ok1 = ok1;
-exports.bad1 = bad1;
-/*  Not a pure module */
diff --git a/jscomp/test/res_debug.res b/jscomp/test/res_debug.res
deleted file mode 100644
index 829c15c..0000000
--- a/jscomp/test/res_debug.res
+++ /dev/null
@@ -1,71 +0,0 @@
-@@config({
-  flags: [/* "-w";
-   "@A" */
-  /* "-drawlambda"; */
-  /* "-dtypedtree"; */
-  /* "-bs-diagnose"; */
-  // "-dparsetree",
-  /* "-dsource"; */],
-})
-type t = {x: int, y: int}
-
-// let f = (x,y) => {
-//     let {} = {x,y}
-//     x + y
-// }
-
-let f = (window, a, b) => {
-  window["location"](. a, b)
-}
-
-// let h = () => {
-//   // external hi : int => int = "hi"
-//   let h = 3
-//   h
-
-// }
-
-type r = {
-  x: int,
-  y?: int,
-  z: int,
-}
-
-let v0 = {x: 3, z: 2}
-
-let v2 = {...v0, x: 3}
-
-let v1: r = {
-  x: 3,
-  z: 3,
-}
-
-let testMatch = v =>
-  switch v {
-  | {y} => y
-  | {y: ?None} => 42
-  }
-
-let h = '😊'
-let hey = "hello, 世界"
-// failed to type check
-
-let optionMap = (x, f) =>
-  switch x {
-  | None => None
-  | Some(v) => Some(f(v))
-  }
-
-type props<'name> = {key?: string, name?: string}
-
-let name = None
-
-let ok = {name: ?optionMap(name, x => x)}
-let bad = {name: ?name->optionMap(x => x)}
-
-let identity = x => x
-
-let name1 = Some("ReScript")
-
-let ok1 = {name: ?identity(name1)}
-let bad1 = {name: ?name1->identity}
diff --git a/jscomp/test/return_check.js b/jscomp/test/return_check.js
deleted file mode 100644
index 961218c..0000000
--- a/jscomp/test/return_check.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function test(dom) {
-  var elem = dom.getElementById("haha");
-  if (elem !== null) {
-    console.log(elem);
-    return 2;
-  } else {
-    return 1;
-  }
-}
-
-function f_undefined(xs, i) {
-  var k = xs[i];
-  if (k !== undefined) {
-    return k;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "return_check.res",
-          23,
-          12
-        ],
-        Error: new Error()
-      };
-}
-
-function f_escaped_not(xs, i) {
-  var x = xs[i];
-  console.log("hei");
-  if (x !== undefined) {
-    return x;
-  } else {
-    return 1;
-  }
-}
-
-function f_escaped_1(xs, i) {
-  var x = xs[i];
-  return function (param) {
-    if (x !== undefined) {
-      return x;
-    } else {
-      return 1;
-    }
-  };
-}
-
-function f_escaped_2(xs, i) {
-  console.log(Caml_option.undefined_to_opt(xs[i]));
-}
-
-function f_null(xs, i) {
-  var k = xs[i];
-  if (k !== null) {
-    return k;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "return_check.res",
-          51,
-          12
-        ],
-        Error: new Error()
-      };
-}
-
-function f_null_undefined(xs, i) {
-  var k = xs[i];
-  if (!(k == null)) {
-    return k;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "return_check.res",
-          59,
-          12
-        ],
-        Error: new Error()
-      };
-}
-
-exports.test = test;
-exports.f_undefined = f_undefined;
-exports.f_escaped_not = f_escaped_not;
-exports.f_escaped_1 = f_escaped_1;
-exports.f_escaped_2 = f_escaped_2;
-exports.f_null = f_null;
-exports.f_null_undefined = f_null_undefined;
-/* No side effect */
diff --git a/jscomp/test/return_check.res b/jscomp/test/return_check.res
deleted file mode 100644
index 8492cba..0000000
--- a/jscomp/test/return_check.res
+++ /dev/null
@@ -1,61 +0,0 @@
-type element
-type dom
-@send @return({null_to_opt: null_to_opt})
-external getElementById: (dom, string) => option<element> = "getElementById"
-
-let test = dom => {
-  let elem = dom->getElementById("haha")
-  switch elem {
-  | None => 1
-  | Some(ui) =>
-    Js.log(ui)
-    2
-  }
-}
-
-/* external getElementById2 : dom -> string -> element option = ""
- [@@bs.return null_to_opt] */
-
-@get_index @return(undefined_to_opt) external get_undefined: (array<int>, int) => option<int> = ""
-
-let f_undefined = (xs, i) =>
-  switch get_undefined(xs, i) {
-  | None => assert(false)
-  | Some(k) => k
-  }
-
-let f_escaped_not = (xs, i) => {
-  let x = get_undefined(xs, i)
-  Js.log("hei")
-  switch x {
-  | Some(k) => k
-  | None => 1
-  }
-}
-
-let f_escaped_1 = (xs, i) => {
-  let x = get_undefined(xs, i)
-  () =>
-    switch x {
-    | Some(k) => k
-    | None => 1
-    }
-} /* still okay */
-
-let f_escaped_2 = (xs, i) => Js.log(get_undefined(xs, i))
-
-@get_index @return(null_to_opt) external get_null: (array<int>, int) => option<int> = ""
-
-let f_null = (xs, i) =>
-  switch get_null(xs, i) {
-  | None => assert(false)
-  | Some(k) => k
-  }
-
-@get_index @return(nullable) external get_null_undefined: (array<int>, int) => option<int> = ""
-
-let f_null_undefined = (xs, i) =>
-  switch get_null_undefined(xs, i) {
-  | None => assert(false)
-  | Some(k) => k
-  }
diff --git a/jscomp/test/run_test.sh b/jscomp/test/run_test.sh
deleted file mode 100755
index dc20d04..0000000
--- a/jscomp/test/run_test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-for i in *.js do
-    echo $i && node $i;
-done
diff --git a/jscomp/test/runtime_encoding_test.js b/jscomp/test/runtime_encoding_test.js
deleted file mode 100644
index e957e5f..0000000
--- a/jscomp/test/runtime_encoding_test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v = [
-  0,
-  1
-];
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/runtime_encoding_test.res b/jscomp/test/runtime_encoding_test.res
deleted file mode 100644
index 9720e97..0000000
--- a/jscomp/test/runtime_encoding_test.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = [0, 1]
diff --git a/jscomp/test/set_annotation.js b/jscomp/test/set_annotation.js
deleted file mode 100644
index 7d93668..0000000
--- a/jscomp/test/set_annotation.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var MyJSFile = require("MyJSFile");
-
-MyJSFile.student1.name = "Mary";
-
-/*  Not a pure module */
diff --git a/jscomp/test/set_annotation.res b/jscomp/test/set_annotation.res
deleted file mode 100644
index e3f1ca0..0000000
--- a/jscomp/test/set_annotation.res
+++ /dev/null
@@ -1,7 +0,0 @@
-type student = {
-  @set "age": int,
-  @set "name": string,
-}
-@module("MyJSFile") external student1: student = "student1"
-
-student1["name"] = "Mary"
diff --git a/jscomp/test/set_gen.js b/jscomp/test/set_gen.js
deleted file mode 100644
index 4707404..0000000
--- a/jscomp/test/set_gen.js
+++ /dev/null
@@ -1,761 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-function cons_enum(_s, _e) {
-  while(true) {
-    var e = _e;
-    var s = _s;
-    if (typeof s !== "object") {
-      return e;
-    }
-    _e = {
-      TAG: "More",
-      _0: s._1,
-      _1: s._2,
-      _2: e
-    };
-    _s = s._0;
-    continue ;
-  };
-}
-
-function height(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return x._3;
-  }
-}
-
-function min_elt(_x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var l = x._0;
-    if (typeof l !== "object") {
-      return x._1;
-    }
-    _x = l;
-    continue ;
-  };
-}
-
-function max_elt(_x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var r = x._2;
-    if (typeof r !== "object") {
-      return x._1;
-    }
-    _x = r;
-    continue ;
-  };
-}
-
-function is_empty(x) {
-  if (typeof x !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function cardinal_aux(_acc, _x) {
-  while(true) {
-    var x = _x;
-    var acc = _acc;
-    if (typeof x !== "object") {
-      return acc;
-    }
-    _x = x._0;
-    _acc = cardinal_aux(acc + 1 | 0, x._2);
-    continue ;
-  };
-}
-
-function cardinal(s) {
-  return cardinal_aux(0, s);
-}
-
-function elements_aux(_accu, _x) {
-  while(true) {
-    var x = _x;
-    var accu = _accu;
-    if (typeof x !== "object") {
-      return accu;
-    }
-    _x = x._0;
-    _accu = {
-      hd: x._1,
-      tl: elements_aux(accu, x._2)
-    };
-    continue ;
-  };
-}
-
-function elements(s) {
-  return elements_aux(/* [] */0, s);
-}
-
-function iter(f, _x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      return ;
-    }
-    iter(f, x._0);
-    Curry._1(f, x._1);
-    _x = x._2;
-    continue ;
-  };
-}
-
-function fold(f, _s, _accu) {
-  while(true) {
-    var accu = _accu;
-    var s = _s;
-    if (typeof s !== "object") {
-      return accu;
-    }
-    _accu = Curry._2(f, s._1, fold(f, s._0, accu));
-    _s = s._2;
-    continue ;
-  };
-}
-
-function for_all(p, _x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      return true;
-    }
-    if (!Curry._1(p, x._1)) {
-      return false;
-    }
-    if (!for_all(p, x._0)) {
-      return false;
-    }
-    _x = x._2;
-    continue ;
-  };
-}
-
-function exists(p, _x) {
-  while(true) {
-    var x = _x;
-    if (typeof x !== "object") {
-      return false;
-    }
-    if (Curry._1(p, x._1)) {
-      return true;
-    }
-    if (exists(p, x._0)) {
-      return true;
-    }
-    _x = x._2;
-    continue ;
-  };
-}
-
-function max_int3(a, b, c) {
-  if (a >= b) {
-    if (a >= c) {
-      return a;
-    } else {
-      return c;
-    }
-  } else if (b >= c) {
-    return b;
-  } else {
-    return c;
-  }
-}
-
-function max_int_2(a, b) {
-  if (a >= b) {
-    return a;
-  } else {
-    return b;
-  }
-}
-
-var Height_invariant_broken = /* @__PURE__ */Caml_exceptions.create("Set_gen.Height_invariant_broken");
-
-var Height_diff_borken = /* @__PURE__ */Caml_exceptions.create("Set_gen.Height_diff_borken");
-
-function check_height_and_diff(x) {
-  if (typeof x !== "object") {
-    return 0;
-  }
-  var h = x._3;
-  var hl = check_height_and_diff(x._0);
-  var hr = check_height_and_diff(x._2);
-  if (h !== (max_int_2(hl, hr) + 1 | 0)) {
-    throw {
-          RE_EXN_ID: Height_invariant_broken,
-          Error: new Error()
-        };
-  }
-  var diff = Pervasives.abs(hl - hr | 0);
-  if (diff > 2) {
-    throw {
-          RE_EXN_ID: Height_diff_borken,
-          Error: new Error()
-        };
-  }
-  return h;
-}
-
-function check(tree) {
-  check_height_and_diff(tree);
-}
-
-function create(l, v, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l._3;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r._3;
-  return {
-          TAG: "Node",
-          _0: l,
-          _1: v,
-          _2: r,
-          _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function internal_bal(l, v, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l._3;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r._3;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "set_gen.res",
-              278,
-              15
-            ],
-            Error: new Error()
-          };
-    }
-    var lr = l._2;
-    var lv = l._1;
-    var ll = l._0;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, create(lr, v, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, lr._0), lr._1, create(lr._2, v, r));
-    }
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "set_gen.res",
-            288,
-            19
-          ],
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: v,
-            _2: r,
-            _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "set_gen.res",
-            300,
-            15
-          ],
-          Error: new Error()
-        };
-  }
-  var rr = r._2;
-  var rv = r._1;
-  var rl = r._0;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, v, rl), rv, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, v, rl._0), rl._1, create(rl._2, rv, rr));
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "set_gen.res",
-          306,
-          19
-        ],
-        Error: new Error()
-      };
-}
-
-function remove_min_elt(x) {
-  if (typeof x !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.remove_min_elt",
-          Error: new Error()
-        };
-  }
-  var l = x._0;
-  if (typeof l !== "object") {
-    return x._2;
-  } else {
-    return internal_bal(remove_min_elt(l), x._1, x._2);
-  }
-}
-
-function singleton(x) {
-  return {
-          TAG: "Node",
-          _0: "Empty",
-          _1: x,
-          _2: "Empty",
-          _3: 1
-        };
-}
-
-function internal_merge(l, r) {
-  if (typeof l !== "object") {
-    return r;
-  } else if (typeof r !== "object") {
-    return l;
-  } else {
-    return internal_bal(l, min_elt(r), remove_min_elt(r));
-  }
-}
-
-function add_min_element(v, x) {
-  if (typeof x !== "object") {
-    return singleton(v);
-  } else {
-    return internal_bal(add_min_element(v, x._0), x._1, x._2);
-  }
-}
-
-function add_max_element(v, x) {
-  if (typeof x !== "object") {
-    return singleton(v);
-  } else {
-    return internal_bal(x._0, x._1, add_max_element(v, x._2));
-  }
-}
-
-function internal_join(l, v, r) {
-  if (typeof l !== "object") {
-    return add_min_element(v, r);
-  }
-  var lh = l._3;
-  if (typeof r !== "object") {
-    return add_max_element(v, l);
-  }
-  var rh = r._3;
-  if (lh > (rh + 2 | 0)) {
-    return internal_bal(l._0, l._1, internal_join(l._2, v, r));
-  } else if (rh > (lh + 2 | 0)) {
-    return internal_bal(internal_join(l, v, r._0), r._1, r._2);
-  } else {
-    return create(l, v, r);
-  }
-}
-
-function internal_concat(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  } else if (typeof t2 !== "object") {
-    return t1;
-  } else {
-    return internal_join(t1, min_elt(t2), remove_min_elt(t2));
-  }
-}
-
-function filter(p, x) {
-  if (typeof x !== "object") {
-    return "Empty";
-  }
-  var v = x._1;
-  var l$p = filter(p, x._0);
-  var pv = Curry._1(p, v);
-  var r$p = filter(p, x._2);
-  if (pv) {
-    return internal_join(l$p, v, r$p);
-  } else {
-    return internal_concat(l$p, r$p);
-  }
-}
-
-function partition(p, x) {
-  if (typeof x !== "object") {
-    return [
-            "Empty",
-            "Empty"
-          ];
-  }
-  var v = x._1;
-  var match = partition(p, x._0);
-  var lf = match[1];
-  var lt = match[0];
-  var pv = Curry._1(p, v);
-  var match$1 = partition(p, x._2);
-  var rf = match$1[1];
-  var rt = match$1[0];
-  if (pv) {
-    return [
-            internal_join(lt, v, rt),
-            internal_concat(lf, rf)
-          ];
-  } else {
-    return [
-            internal_concat(lt, rt),
-            internal_join(lf, v, rf)
-          ];
-  }
-}
-
-function of_sorted_list(l) {
-  var sub = function (n, l) {
-    switch (n) {
-      case 0 :
-          return [
-                  "Empty",
-                  l
-                ];
-      case 1 :
-          if (l) {
-            return [
-                    {
-                      TAG: "Node",
-                      _0: "Empty",
-                      _1: l.hd,
-                      _2: "Empty",
-                      _3: 1
-                    },
-                    l.tl
-                  ];
-          }
-          break;
-      case 2 :
-          if (l) {
-            var match = l.tl;
-            if (match) {
-              return [
-                      {
-                        TAG: "Node",
-                        _0: {
-                          TAG: "Node",
-                          _0: "Empty",
-                          _1: l.hd,
-                          _2: "Empty",
-                          _3: 1
-                        },
-                        _1: match.hd,
-                        _2: "Empty",
-                        _3: 2
-                      },
-                      match.tl
-                    ];
-            }
-            
-          }
-          break;
-      case 3 :
-          if (l) {
-            var match$1 = l.tl;
-            if (match$1) {
-              var match$2 = match$1.tl;
-              if (match$2) {
-                return [
-                        {
-                          TAG: "Node",
-                          _0: {
-                            TAG: "Node",
-                            _0: "Empty",
-                            _1: l.hd,
-                            _2: "Empty",
-                            _3: 1
-                          },
-                          _1: match$1.hd,
-                          _2: {
-                            TAG: "Node",
-                            _0: "Empty",
-                            _1: match$2.hd,
-                            _2: "Empty",
-                            _3: 1
-                          },
-                          _3: 2
-                        },
-                        match$2.tl
-                      ];
-              }
-              
-            }
-            
-          }
-          break;
-      default:
-        
-    }
-    var nl = n / 2 | 0;
-    var match$3 = sub(nl, l);
-    var l$1 = match$3[1];
-    if (l$1) {
-      var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
-      return [
-              create(match$3[0], l$1.hd, match$4[0]),
-              match$4[1]
-            ];
-    }
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "set_gen.res",
-            447,
-            18
-          ],
-          Error: new Error()
-        };
-  };
-  return sub(List.length(l), l)[0];
-}
-
-function of_sorted_array(l) {
-  var sub = function (start, n, l) {
-    if (n === 0) {
-      return "Empty";
-    }
-    if (n === 1) {
-      var x0 = l[start];
-      return {
-              TAG: "Node",
-              _0: "Empty",
-              _1: x0,
-              _2: "Empty",
-              _3: 1
-            };
-    }
-    if (n === 2) {
-      var x0$1 = l[start];
-      var x1 = l[start + 1 | 0];
-      return {
-              TAG: "Node",
-              _0: {
-                TAG: "Node",
-                _0: "Empty",
-                _1: x0$1,
-                _2: "Empty",
-                _3: 1
-              },
-              _1: x1,
-              _2: "Empty",
-              _3: 2
-            };
-    }
-    if (n === 3) {
-      var x0$2 = l[start];
-      var x1$1 = l[start + 1 | 0];
-      var x2 = l[start + 2 | 0];
-      return {
-              TAG: "Node",
-              _0: {
-                TAG: "Node",
-                _0: "Empty",
-                _1: x0$2,
-                _2: "Empty",
-                _3: 1
-              },
-              _1: x1$1,
-              _2: {
-                TAG: "Node",
-                _0: "Empty",
-                _1: x2,
-                _2: "Empty",
-                _3: 1
-              },
-              _3: 2
-            };
-    }
-    var nl = n / 2 | 0;
-    var left = sub(start, nl, l);
-    var mid = start + nl | 0;
-    var v = l[mid];
-    var right = sub(mid + 1 | 0, (n - nl | 0) - 1 | 0, l);
-    return create(left, v, right);
-  };
-  return sub(0, l.length, l);
-}
-
-function is_ordered(cmp, tree) {
-  var is_ordered_min_max = function (tree) {
-    if (typeof tree !== "object") {
-      return "Empty";
-    }
-    var r = tree._2;
-    var v = tree._1;
-    var match = is_ordered_min_max(tree._0);
-    if (typeof match === "object") {
-      var match$1 = match.VAL;
-      var max_v = match$1[1];
-      var min_v = match$1[0];
-      var match$2 = is_ordered_min_max(r);
-      if (typeof match$2 !== "object") {
-        if (match$2 === "Empty" && Curry._2(cmp, max_v, v) < 0) {
-          return {
-                  NAME: "V",
-                  VAL: [
-                    min_v,
-                    v
-                  ]
-                };
-        } else {
-          return "No";
-        }
-      }
-      var match$3 = match$2.VAL;
-      if (Curry._2(cmp, max_v, match$3[0]) < 0) {
-        return {
-                NAME: "V",
-                VAL: [
-                  min_v,
-                  match$3[1]
-                ]
-              };
-      } else {
-        return "No";
-      }
-    }
-    if (match !== "Empty") {
-      return "No";
-    }
-    var match$4 = is_ordered_min_max(r);
-    if (typeof match$4 !== "object") {
-      if (match$4 === "Empty") {
-        return {
-                NAME: "V",
-                VAL: [
-                  v,
-                  v
-                ]
-              };
-      } else {
-        return "No";
-      }
-    }
-    var match$5 = match$4.VAL;
-    if (Curry._2(cmp, v, match$5[0]) < 0) {
-      return {
-              NAME: "V",
-              VAL: [
-                v,
-                match$5[1]
-              ]
-            };
-    } else {
-      return "No";
-    }
-  };
-  return is_ordered_min_max(tree) !== "No";
-}
-
-function invariant(cmp, t) {
-  check_height_and_diff(t);
-  return is_ordered(cmp, t);
-}
-
-function compare_aux(cmp, _e1, _e2) {
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return 0;
-      } else {
-        return -1;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return 1;
-    }
-    var c = Curry._2(cmp, e1._0, e2._0);
-    if (c !== 0) {
-      return c;
-    }
-    _e2 = cons_enum(e2._1, e2._2);
-    _e1 = cons_enum(e1._1, e1._2);
-    continue ;
-  };
-}
-
-function compare(cmp, s1, s2) {
-  return compare_aux(cmp, cons_enum(s1, "End"), cons_enum(s2, "End"));
-}
-
-var empty = "Empty";
-
-var choose = min_elt;
-
-exports.cons_enum = cons_enum;
-exports.height = height;
-exports.min_elt = min_elt;
-exports.max_elt = max_elt;
-exports.empty = empty;
-exports.is_empty = is_empty;
-exports.cardinal_aux = cardinal_aux;
-exports.cardinal = cardinal;
-exports.elements_aux = elements_aux;
-exports.elements = elements;
-exports.choose = choose;
-exports.iter = iter;
-exports.fold = fold;
-exports.for_all = for_all;
-exports.exists = exists;
-exports.max_int3 = max_int3;
-exports.max_int_2 = max_int_2;
-exports.Height_invariant_broken = Height_invariant_broken;
-exports.Height_diff_borken = Height_diff_borken;
-exports.check_height_and_diff = check_height_and_diff;
-exports.check = check;
-exports.create = create;
-exports.internal_bal = internal_bal;
-exports.remove_min_elt = remove_min_elt;
-exports.singleton = singleton;
-exports.internal_merge = internal_merge;
-exports.add_min_element = add_min_element;
-exports.add_max_element = add_max_element;
-exports.internal_join = internal_join;
-exports.internal_concat = internal_concat;
-exports.filter = filter;
-exports.partition = partition;
-exports.of_sorted_list = of_sorted_list;
-exports.of_sorted_array = of_sorted_array;
-exports.is_ordered = is_ordered;
-exports.invariant = invariant;
-exports.compare_aux = compare_aux;
-exports.compare = compare;
-/* No side effect */
diff --git a/jscomp/test/set_gen.res b/jscomp/test/set_gen.res
deleted file mode 100644
index bd743ec..0000000
--- a/jscomp/test/set_gen.res
+++ /dev/null
@@ -1,581 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-/***
-  balanced tree based on stdlib distribution
-*/
-
-type rec t<'a> =
-  | Empty
-  | Node(t<'a>, 'a, t<'a>, int)
-
-type rec enumeration<'a> = End | More('a, t<'a>, enumeration<'a>)
-
-let rec cons_enum = (s, e) =>
-  switch s {
-  | Empty => e
-  | Node(l, v, r, _) => cons_enum(l, More(v, r, e))
-  }
-
-let rec height = x =>
-  switch x {
-  | Empty => 0
-  | Node(_, _, _, h) => h
-  }
-
-/* Smallest and greatest element of a set */
-
-let rec min_elt = x =>
-  switch x {
-  | Empty => raise(Not_found)
-  | Node(Empty, v, r, _) => v
-  | Node(l, v, r, _) => min_elt(l)
-  }
-
-let rec max_elt = x =>
-  switch x {
-  | Empty => raise(Not_found)
-  | Node(l, v, Empty, _) => v
-  | Node(l, v, r, _) => max_elt(r)
-  }
-
-let empty = Empty
-
-let is_empty = x =>
-  switch x {
-  | Empty => true
-  | _ => false
-  }
-
-let rec cardinal_aux = (acc, x) =>
-  switch x {
-  | Empty => acc
-  | Node(l, _, r, _) => cardinal_aux(cardinal_aux(acc + 1, r), l)
-  }
-
-let cardinal = s => cardinal_aux(0, s)
-
-let rec elements_aux = (accu, x) =>
-  switch x {
-  | Empty => accu
-  | Node(l, v, r, _) => elements_aux(list{v, ...elements_aux(accu, r)}, l)
-  }
-
-let elements = s => elements_aux(list{}, s)
-
-let choose = min_elt
-
-let rec iter = (f, x) =>
-  switch x {
-  | Empty => ()
-  | Node(l, v, r, _) =>
-    iter(f, l)
-    f(v)
-    iter(f, r)
-  }
-
-let rec fold = (f, s, accu) =>
-  switch s {
-  | Empty => accu
-  | Node(l, v, r, _) => fold(f, r, f(v, fold(f, l, accu)))
-  }
-
-let rec for_all = (p, x) =>
-  switch x {
-  | Empty => true
-  | Node(l, v, r, _) => p(v) && (for_all(p, l) && for_all(p, r))
-  }
-
-let rec exists = (p, x) =>
-  switch x {
-  | Empty => false
-  | Node(l, v, r, _) => p(v) || (exists(p, l) || exists(p, r))
-  }
-
-let max_int3 = (a: int, b, c) =>
-  if a >= b {
-    if a >= c {
-      a
-    } else {
-      c
-    }
-  } else if b >= c {
-    b
-  } else {
-    c
-  }
-let max_int_2 = (a: int, b) =>
-  if a >= b {
-    a
-  } else {
-    b
-  }
-
-exception Height_invariant_broken
-exception Height_diff_borken
-
-let rec check_height_and_diff = x =>
-  switch x {
-  | Empty => 0
-  | Node(l, _, r, h) =>
-    let hl = check_height_and_diff(l)
-    let hr = check_height_and_diff(r)
-    if h != max_int_2(hl, hr) + 1 {
-      raise(Height_invariant_broken)
-    } else {
-      let diff = abs(hl - hr)
-      if diff > 2 {
-        raise(Height_diff_borken)
-      } else {
-        h
-      }
-    }
-  }
-
-let check = tree => ignore(check_height_and_diff(tree))
-/*
-    Invariants: 
-    1. {[ l < v < r]}
-    2. l and r balanced 
-    3. [height l] - [height r] <= 2
-*/
-let create = (l, v, r) => {
-  let hl = switch l {
-  | Empty => 0
-  | Node(_, _, _, h) => h
-  }
-  let hr = switch r {
-  | Empty => 0
-  | Node(_, _, _, h) => h
-  }
-  Node(
-    l,
-    v,
-    r,
-    if hl >= hr {
-      hl + 1
-    } else {
-      hr + 1
-    },
-  )
-}
-
-/* Same as create, but performs one step of rebalancing if necessary.
-    Invariants:
-    1. {[ l < v < r ]}
-    2. l and r balanced 
-    3. | height l - height r | <= 3.
-
-    Proof by indunction
-
-    Lemma: the height of  [bal l v r] will bounded by [max l r] + 1 
-*/
-/*
-let internal_bal l v r =
-  match l with
-  | Empty ->
-    begin match r with 
-      | Empty -> Node(Empty,v,Empty,1)
-      | Node(rl,rv,rr,hr) -> 
-        if hr > 2 then
-          begin match rl with
-            | Empty -> create (* create l v rl *) (Node (Empty,v,Empty,1)) rv rr 
-            | Node(rll,rlv,rlr,hrl) -> 
-              let hrr = height rr in 
-              if hrr >= hrl then 
-                Node  
-                  ((Node (Empty,v,rl,hrl+1))(* create l v rl *),
-                   rv, rr, if hrr = hrl then hrr + 2 else hrr + 1) 
-              else 
-                let hrll = height rll in 
-                let hrlr = height rlr in 
-                create
-                  (Node(Empty,v,rll,hrll + 1)) 
-                  (* create l v rll *) 
-                  rlv 
-                  (Node (rlr,rv,rr, if hrlr > hrr then hrlr + 1 else hrr + 1))
-                  (* create rlr rv rr *)    
-          end 
-        else Node (l,v,r, hr + 1)  
-    end
-  | Node(ll,lv,lr,hl) ->
-    begin match r with 
-      | Empty ->
-        if hl > 2 then 
-          (*if height ll >= height lr then create ll lv (create lr v r)
-            else*)
-          begin match lr with 
-            | Empty -> 
-              create ll lv (Node (Empty,v,Empty, 1)) 
-            (* create lr v r *)  
-            | Node(lrl,lrv,lrr,hlr) -> 
-              if height ll >= hlr then 
-                create ll lv
-                  (Node(lr,v,Empty,hlr+1)) 
-                  (*create lr v r*)
-              else 
-                let hlrr = height lrr in  
-                create 
-                  (create ll lv lrl)
-                  lrv
-                  (Node(lrr,v,Empty,hlrr + 1)) 
-                  (*create lrr v r*)
-          end 
-        else Node(l,v,r, hl+1)    
-      | Node(rl,rv,rr,hr) ->
-        if hl > hr + 2 then           
-          begin match lr with 
-            | Empty ->   create ll lv (create lr v r)
-            | Node(lrl,lrv,lrr,_) ->
-              if height ll >= height lr then create ll lv (create lr v r)
-              else 
-                create (create ll lv lrl) lrv (create lrr v r)
-          end 
-        else
-        if hr > hl + 2 then             
-          begin match rl with 
-            | Empty ->
-              let hrr = height rr in   
-              Node(
-                (Node (l,v,Empty,hl + 1))
-                (*create l v rl*)
-                ,
-                rv,
-                rr,
-                if hrr > hr then hrr + 1 else hl + 2 
-              )
-            | Node(rll,rlv,rlr,_) ->
-              let hrr = height rr in 
-              let hrl = height rl in 
-              if hrr >= hrl then create (create l v rl) rv rr else 
-                create (create l v rll) rlv (create rlr rv rr)
-          end
-        else  
-          Node(l,v,r, if hl >= hr then hl+1 else hr + 1)
-    end
-*/
-let internal_bal = (l, v, r) => {
-  let hl = switch l {
-  | Empty => 0
-  | Node(_, _, _, h) => h
-  }
-  let hr = switch r {
-  | Empty => 0
-  | Node(_, _, _, h) => h
-  }
-  if hl > hr + 2 {
-    switch l {
-    | Empty => assert(false)
-    | Node(ll, lv, lr, _) =>
-      if height(ll) >= height(lr) {
-        /* [ll] >~ [lr] 
-           [ll] >~ [r] 
-           [ll] ~~ [ lr ^ r]  
- */
-        create(ll, lv, create(lr, v, r))
-      } else {
-        switch lr {
-        | Empty => assert(false)
-        | Node(lrl, lrv, lrr, _) =>
-          /* [lr] >~ [ll]
-             [lr] >~ [r]
-             [ll ^ lrl] ~~ [lrr ^ r]   
- */
-          create(create(ll, lv, lrl), lrv, create(lrr, v, r))
-        }
-      }
-    }
-  } else if hr > hl + 2 {
-    switch r {
-    | Empty => assert(false)
-    | Node(rl, rv, rr, _) =>
-      if height(rr) >= height(rl) {
-        create(create(l, v, rl), rv, rr)
-      } else {
-        switch rl {
-        | Empty => assert(false)
-        | Node(rll, rlv, rlr, _) => create(create(l, v, rll), rlv, create(rlr, rv, rr))
-        }
-      }
-    }
-  } else {
-    Node(
-      l,
-      v,
-      r,
-      if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    )
-  }
-}
-
-let rec remove_min_elt = x =>
-  switch x {
-  | Empty => invalid_arg("Set.remove_min_elt")
-  | Node(Empty, v, r, _) => r
-  | Node(l, v, r, _) => internal_bal(remove_min_elt(l), v, r)
-  }
-
-let singleton = x => Node(Empty, x, Empty, 1)
-
-/*
-   All elements of l must precede the elements of r.
-       Assume | height l - height r | <= 2.
-   weak form of [concat] 
-*/
-
-let internal_merge = (l, r) =>
-  switch (l, r) {
-  | (Empty, t) => t
-  | (t, Empty) => t
-  | (_, _) => internal_bal(l, min_elt(r), remove_min_elt(r))
-  }
-
-/* Beware: those two functions assume that the added v is *strictly*
-    smaller (or bigger) than all the present elements in the tree; it
-    does not test for equality with the current min (or max) element.
-    Indeed, they are only used during the "join" operation which
-    respects this precondition.
-*/
-
-let rec add_min_element = (v, x) =>
-  switch x {
-  | Empty => singleton(v)
-  | Node(l, x, r, h) => internal_bal(add_min_element(v, l), x, r)
-  }
-
-let rec add_max_element = (v, x) =>
-  switch x {
-  | Empty => singleton(v)
-  | Node(l, x, r, h) => internal_bal(l, x, add_max_element(v, r))
-  }
-
-/** 
-    Invariants:
-    1. l < v < r 
-    2. l and r are balanced 
-
-    Proof by induction
-    The height of output will be ~~ (max (height l) (height r) + 2)
-    Also use the lemma from [bal]
-*/
-let rec internal_join = (l, v, r) =>
-  switch (l, r) {
-  | (Empty, _) => add_min_element(v, r)
-  | (_, Empty) => add_max_element(v, l)
-  | (Node(ll, lv, lr, lh), Node(rl, rv, rr, rh)) =>
-    if lh > rh + 2 {
-      /* proof by induction:
-         now [height of ll] is [lh - 1] 
- */
-      internal_bal(ll, lv, internal_join(lr, v, r))
-    } else if rh > lh + 2 {
-      internal_bal(internal_join(l, v, rl), rv, rr)
-    } else {
-      create(l, v, r)
-    }
-  }
-
-/*
-    Required Invariants: 
-    [t1] < [t2]  
-*/
-let internal_concat = (t1, t2) =>
-  switch (t1, t2) {
-  | (Empty, t) => t
-  | (t, Empty) => t
-  | (_, _) => internal_join(t1, min_elt(t2), remove_min_elt(t2))
-  }
-
-let rec filter = (p, x) =>
-  switch x {
-  | Empty => Empty
-  | Node(l, v, r, _) =>
-    /* call [p] in the expected left-to-right order */
-    let l' = filter(p, l)
-    let pv = p(v)
-    let r' = filter(p, r)
-    if pv {
-      internal_join(l', v, r')
-    } else {
-      internal_concat(l', r')
-    }
-  }
-
-let rec partition = (p, x) =>
-  switch x {
-  | Empty => (Empty, Empty)
-  | Node(l, v, r, _) =>
-    /* call [p] in the expected left-to-right order */
-    let (lt, lf) = partition(p, l)
-    let pv = p(v)
-    let (rt, rf) = partition(p, r)
-    if pv {
-      (internal_join(lt, v, rt), internal_concat(lf, rf))
-    } else {
-      (internal_concat(lt, rt), internal_join(lf, v, rf))
-    }
-  }
-
-let of_sorted_list = l => {
-  let rec sub = (n, l) =>
-    switch (n, l) {
-    | (0, l) => (Empty, l)
-    | (1, list{x0, ...l}) => (Node(Empty, x0, Empty, 1), l)
-    | (2, list{x0, x1, ...l}) => (Node(Node(Empty, x0, Empty, 1), x1, Empty, 2), l)
-    | (3, list{x0, x1, x2, ...l}) => (
-        Node(Node(Empty, x0, Empty, 1), x1, Node(Empty, x2, Empty, 1), 2),
-        l,
-      )
-    | (n, l) =>
-      let nl = n / 2
-      let (left, l) = sub(nl, l)
-      switch l {
-      | list{} => assert(false)
-      | list{mid, ...l} =>
-        let (right, l) = sub(n - nl - 1, l)
-        (create(left, mid, right), l)
-      }
-    }
-
-  fst(sub(List.length(l), l))
-}
-
-let of_sorted_array = l => {
-  let rec sub = (start, n, l) =>
-    if n == 0 {
-      Empty
-    } else if n == 1 {
-      let x0 = Array.unsafe_get(l, start)
-      Node(Empty, x0, Empty, 1)
-    } else if n == 2 {
-      let x0 = Array.unsafe_get(l, start)
-      let x1 = Array.unsafe_get(l, start + 1)
-      Node(Node(Empty, x0, Empty, 1), x1, Empty, 2)
-    } else if n == 3 {
-      let x0 = Array.unsafe_get(l, start)
-      let x1 = Array.unsafe_get(l, start + 1)
-      let x2 = Array.unsafe_get(l, start + 2)
-      Node(Node(Empty, x0, Empty, 1), x1, Node(Empty, x2, Empty, 1), 2)
-    } else {
-      let nl = n / 2
-      let left = sub(start, nl, l)
-      let mid = start + nl
-      let v = Array.unsafe_get(l, mid)
-      let right = sub(mid + 1, n - nl - 1, l)
-      create(left, v, right)
-    }
-
-  sub(0, Array.length(l), l)
-}
-
-let is_ordered = (cmp, tree) => {
-  let rec is_ordered_min_max = tree =>
-    switch tree {
-    | Empty => #Empty
-    | Node(l, v, r, _) =>
-      switch is_ordered_min_max(l) {
-      | #No => #No
-      | #Empty =>
-        switch is_ordered_min_max(r) {
-        | #No => #No
-        | #Empty => #V(v, v)
-        | #V(l, r) =>
-          if cmp(v, l) < 0 {
-            #V(v, r)
-          } else {
-            #No
-          }
-        }
-      | #V(min_v, max_v) =>
-        switch is_ordered_min_max(r) {
-        | #No => #No
-        | #Empty =>
-          if cmp(max_v, v) < 0 {
-            #V(min_v, v)
-          } else {
-            #No
-          }
-        | #V(min_v_r, max_v_r) =>
-          if cmp(max_v, min_v_r) < 0 {
-            #V(min_v, max_v_r)
-          } else {
-            #No
-          }
-        }
-      }
-    }
-  is_ordered_min_max(tree) != #No
-}
-
-let invariant = (cmp, t) => {
-  check(t)
-  is_ordered(cmp, t)
-}
-
-let rec compare_aux = (cmp, e1, e2) =>
-  switch (e1, e2) {
-  | (End, End) => 0
-  | (End, _) => -1
-  | (_, End) => 1
-  | (More(v1, r1, e1), More(v2, r2, e2)) =>
-    let c = cmp(v1, v2)
-    if c != 0 {
-      c
-    } else {
-      compare_aux(cmp, cons_enum(r1, e1), cons_enum(r2, e2))
-    }
-  }
-
-let compare = (cmp, s1, s2) => compare_aux(cmp, cons_enum(s1, End), cons_enum(s2, End))
-
-module type S = {
-  type elt
-  type t
-  let empty: t
-  let is_empty: t => bool
-  let iter: (elt => unit, t) => unit
-  let fold: ((elt, 'a) => 'a, t, 'a) => 'a
-  let for_all: (elt => bool, t) => bool
-  let exists: (elt => bool, t) => bool
-  let singleton: elt => t
-  let cardinal: t => int
-  let elements: t => list<elt>
-  let min_elt: t => elt
-  let max_elt: t => elt
-  let choose: t => elt
-  let of_sorted_list: list<elt> => t
-  let of_sorted_array: array<elt> => t
-  let partition: (elt => bool, t) => (t, t)
-
-  let mem: (elt, t) => bool
-  let add: (elt, t) => t
-  let remove: (elt, t) => t
-  let union: (t, t) => t
-  let inter: (t, t) => t
-  let diff: (t, t) => t
-  let compare: (t, t) => int
-  let equal: (t, t) => bool
-  let subset: (t, t) => bool
-  let filter: (elt => bool, t) => t
-
-  let split: (elt, t) => (t, bool, t)
-  let find: (elt, t) => elt
-  let of_list: list<elt> => t
-  let of_sorted_list: list<elt> => t
-  let of_sorted_array: array<elt> => t
-  let invariant: t => bool
-}
diff --git a/jscomp/test/sexp.js b/jscomp/test/sexp.js
deleted file mode 100644
index 29bf3a1..0000000
--- a/jscomp/test/sexp.js
+++ /dev/null
@@ -1,541 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var Hashtbl = require("../../lib/js/hashtbl.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_format = require("../../lib/js/caml_format.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var equal = Caml_obj.equal;
-
-var compare = Caml_obj.compare;
-
-var hash = Hashtbl.hash;
-
-function of_int(x) {
-  return {
-          NAME: "Atom",
-          VAL: String(x)
-        };
-}
-
-function of_float(x) {
-  return {
-          NAME: "Atom",
-          VAL: Pervasives.string_of_float(x)
-        };
-}
-
-function of_bool(x) {
-  return {
-          NAME: "Atom",
-          VAL: x ? "true" : "false"
-        };
-}
-
-function atom(x) {
-  return {
-          NAME: "Atom",
-          VAL: x
-        };
-}
-
-function of_list(l) {
-  return {
-          NAME: "List",
-          VAL: l
-        };
-}
-
-function of_rev_list(l) {
-  return {
-          NAME: "List",
-          VAL: List.rev(l)
-        };
-}
-
-function of_pair(param) {
-  return {
-          NAME: "List",
-          VAL: {
-            hd: param[0],
-            tl: {
-              hd: param[1],
-              tl: /* [] */0
-            }
-          }
-        };
-}
-
-function of_triple(param) {
-  return {
-          NAME: "List",
-          VAL: {
-            hd: param[0],
-            tl: {
-              hd: param[1],
-              tl: {
-                hd: param[2],
-                tl: /* [] */0
-              }
-            }
-          }
-        };
-}
-
-function of_quad(param) {
-  return {
-          NAME: "List",
-          VAL: {
-            hd: param[0],
-            tl: {
-              hd: param[1],
-              tl: {
-                hd: param[2],
-                tl: {
-                  hd: param[3],
-                  tl: /* [] */0
-                }
-              }
-            }
-          }
-        };
-}
-
-function of_variant(name, args) {
-  return {
-          NAME: "List",
-          VAL: {
-            hd: {
-              NAME: "Atom",
-              VAL: name
-            },
-            tl: args
-          }
-        };
-}
-
-function of_field(name, t) {
-  return {
-          NAME: "List",
-          VAL: {
-            hd: {
-              NAME: "Atom",
-              VAL: name
-            },
-            tl: {
-              hd: t,
-              tl: /* [] */0
-            }
-          }
-        };
-}
-
-function of_record(l) {
-  return {
-          NAME: "List",
-          VAL: List.map((function (param) {
-                  return of_field(param[0], param[1]);
-                }), l)
-        };
-}
-
-function $$return(x) {
-  return Caml_option.some(x);
-}
-
-function $great$pipe$eq(e, f) {
-  if (e !== undefined) {
-    return Caml_option.some(Curry._1(f, Caml_option.valFromOption(e)));
-  }
-  
-}
-
-function $great$great$eq(e, f) {
-  if (e !== undefined) {
-    return Curry._1(f, Caml_option.valFromOption(e));
-  }
-  
-}
-
-function map_opt(f, l) {
-  var _acc = /* [] */0;
-  var _l = l;
-  while(true) {
-    var l$1 = _l;
-    var acc = _acc;
-    if (!l$1) {
-      return List.rev(acc);
-    }
-    var y = Curry._1(f, l$1.hd);
-    if (y === undefined) {
-      return ;
-    }
-    _l = l$1.tl;
-    _acc = {
-      hd: Caml_option.valFromOption(y),
-      tl: acc
-    };
-    continue ;
-  };
-}
-
-function list_any(f, e) {
-  if (e.NAME === "List") {
-    var _l = e.VAL;
-    while(true) {
-      var l = _l;
-      if (!l) {
-        return ;
-      }
-      var res = Curry._1(f, l.hd);
-      if (res !== undefined) {
-        return res;
-      }
-      _l = l.tl;
-      continue ;
-    };
-  }
-  
-}
-
-function list_all(f, e) {
-  if (e.NAME === "List") {
-    var _acc = /* [] */0;
-    var _l = e.VAL;
-    while(true) {
-      var l = _l;
-      var acc = _acc;
-      if (!l) {
-        return List.rev(acc);
-      }
-      var tl = l.tl;
-      var y = Curry._1(f, l.hd);
-      if (y !== undefined) {
-        _l = tl;
-        _acc = {
-          hd: Caml_option.valFromOption(y),
-          tl: acc
-        };
-        continue ;
-      }
-      _l = tl;
-      continue ;
-    };
-  } else {
-    return /* [] */0;
-  }
-}
-
-function _try_atom(e, f) {
-  if (e.NAME === "List") {
-    return ;
-  }
-  try {
-    return Caml_option.some(Curry._1(f, e.VAL));
-  }
-  catch (exn){
-    return ;
-  }
-}
-
-function to_int(e) {
-  return _try_atom(e, Caml_format.int_of_string);
-}
-
-function to_bool(e) {
-  return _try_atom(e, Pervasives.bool_of_string);
-}
-
-function to_float(e) {
-  return _try_atom(e, Caml_format.float_of_string);
-}
-
-function to_string(e) {
-  return _try_atom(e, (function (x) {
-                return x;
-              }));
-}
-
-function to_pair(e) {
-  if (typeof e !== "object") {
-    return ;
-  }
-  if (e.NAME !== "List") {
-    return ;
-  }
-  var match = e.VAL;
-  if (!match) {
-    return ;
-  }
-  var match$1 = match.tl;
-  if (match$1 && !match$1.tl) {
-    return [
-            match.hd,
-            match$1.hd
-          ];
-  }
-  
-}
-
-function to_pair_with(f1, f2, e) {
-  return $great$great$eq(to_pair(e), (function (param) {
-                var y = param[1];
-                return $great$great$eq(Curry._1(f1, param[0]), (function (x) {
-                              return $great$great$eq(Curry._1(f2, y), (function (y) {
-                                            return [
-                                                    x,
-                                                    y
-                                                  ];
-                                          }));
-                            }));
-              }));
-}
-
-function to_triple(e) {
-  if (typeof e !== "object") {
-    return ;
-  }
-  if (e.NAME !== "List") {
-    return ;
-  }
-  var match = e.VAL;
-  if (!match) {
-    return ;
-  }
-  var match$1 = match.tl;
-  if (!match$1) {
-    return ;
-  }
-  var match$2 = match$1.tl;
-  if (match$2 && !match$2.tl) {
-    return [
-            match.hd,
-            match$1.hd,
-            match$2.hd
-          ];
-  }
-  
-}
-
-function to_triple_with(f1, f2, f3, e) {
-  return $great$great$eq(to_triple(e), (function (param) {
-                var z = param[2];
-                var y = param[1];
-                return $great$great$eq(Curry._1(f1, param[0]), (function (x) {
-                              return $great$great$eq(Curry._1(f2, y), (function (y) {
-                                            return $great$great$eq(Curry._1(f3, z), (function (z) {
-                                                          return [
-                                                                  x,
-                                                                  y,
-                                                                  z
-                                                                ];
-                                                        }));
-                                          }));
-                            }));
-              }));
-}
-
-function to_list(e) {
-  if (e.NAME === "List") {
-    return Caml_option.some(e.VAL);
-  }
-  
-}
-
-function to_list_with(f, e) {
-  if (e.NAME === "List") {
-    return map_opt(f, e.VAL);
-  }
-  
-}
-
-function get_field(name, e) {
-  if (e.NAME === "List") {
-    var _l = e.VAL;
-    while(true) {
-      var l = _l;
-      if (!l) {
-        return ;
-      }
-      var match = l.hd;
-      if (typeof match === "object") {
-        if (match.NAME === "List") {
-          var match$1 = match.VAL;
-          if (match$1) {
-            var match$2 = match$1.hd;
-            if (typeof match$2 === "object") {
-              if (match$2.NAME === "Atom") {
-                var match$3 = match$1.tl;
-                if (match$3) {
-                  if (match$3.tl) {
-                    _l = l.tl;
-                    continue ;
-                  }
-                  if (Caml_obj.equal(name, match$2.VAL)) {
-                    return match$3.hd;
-                  }
-                  _l = l.tl;
-                  continue ;
-                }
-                _l = l.tl;
-                continue ;
-              }
-              _l = l.tl;
-              continue ;
-            }
-            _l = l.tl;
-            continue ;
-          }
-          _l = l.tl;
-          continue ;
-        }
-        _l = l.tl;
-        continue ;
-      }
-      _l = l.tl;
-      continue ;
-    };
-  }
-  
-}
-
-function field(name, f, e) {
-  return $great$great$eq(get_field(name, e), f);
-}
-
-function _get_field_list(name, _l) {
-  while(true) {
-    var l = _l;
-    if (!l) {
-      return ;
-    }
-    var match = l.hd;
-    if (typeof match === "object") {
-      if (match.NAME === "List") {
-        var match$1 = match.VAL;
-        if (match$1) {
-          var match$2 = match$1.hd;
-          if (typeof match$2 === "object") {
-            if (match$2.NAME === "Atom") {
-              if (Caml_obj.equal(name, match$2.VAL)) {
-                return match$1.tl;
-              }
-              _l = l.tl;
-              continue ;
-            }
-            _l = l.tl;
-            continue ;
-          }
-          _l = l.tl;
-          continue ;
-        }
-        _l = l.tl;
-        continue ;
-      }
-      _l = l.tl;
-      continue ;
-    }
-    _l = l.tl;
-    continue ;
-  };
-}
-
-function field_list(name, f, e) {
-  if (e.NAME === "List") {
-    return $great$great$eq(_get_field_list(name, e.VAL), f);
-  }
-  
-}
-
-function _get_variant(s, args, _l) {
-  while(true) {
-    var l = _l;
-    if (!l) {
-      return ;
-    }
-    var match = l.hd;
-    if (Caml_obj.equal(s, match[0])) {
-      return Curry._1(match[1], args);
-    }
-    _l = l.tl;
-    continue ;
-  };
-}
-
-function get_variant(l, e) {
-  if (e.NAME !== "List") {
-    return _get_variant(e.VAL, /* [] */0, l);
-  }
-  var match = e.VAL;
-  if (!match) {
-    return ;
-  }
-  var match$1 = match.hd;
-  if (typeof match$1 === "object" && match$1.NAME === "Atom") {
-    return _get_variant(match$1.VAL, match.tl, l);
-  }
-  
-}
-
-function get_exn(e) {
-  if (e !== undefined) {
-    return Caml_option.valFromOption(e);
-  }
-  throw {
-        RE_EXN_ID: "Failure",
-        _1: "CCSexp.Traverse.get_exn",
-        Error: new Error()
-      };
-}
-
-var of_unit = {
-  NAME: "List",
-  VAL: /* [] */0
-};
-
-var Traverse = {
-  map_opt: map_opt,
-  list_any: list_any,
-  list_all: list_all,
-  to_int: to_int,
-  to_string: to_string,
-  to_bool: to_bool,
-  to_float: to_float,
-  to_list: to_list,
-  to_list_with: to_list_with,
-  to_pair: to_pair,
-  to_pair_with: to_pair_with,
-  to_triple: to_triple,
-  to_triple_with: to_triple_with,
-  get_field: get_field,
-  field: field,
-  get_variant: get_variant,
-  field_list: field_list,
-  $great$great$eq: $great$great$eq,
-  $great$pipe$eq: $great$pipe$eq,
-  $$return: $$return,
-  get_exn: get_exn
-};
-
-exports.equal = equal;
-exports.compare = compare;
-exports.hash = hash;
-exports.atom = atom;
-exports.of_int = of_int;
-exports.of_bool = of_bool;
-exports.of_list = of_list;
-exports.of_rev_list = of_rev_list;
-exports.of_float = of_float;
-exports.of_unit = of_unit;
-exports.of_pair = of_pair;
-exports.of_triple = of_triple;
-exports.of_quad = of_quad;
-exports.of_variant = of_variant;
-exports.of_field = of_field;
-exports.of_record = of_record;
-exports.Traverse = Traverse;
-/* No side effect */
diff --git a/jscomp/test/sexp.res b/jscomp/test/sexp.res
deleted file mode 100644
index ef95024..0000000
--- a/jscomp/test/sexp.res
+++ /dev/null
@@ -1,186 +0,0 @@
-/*** {1 Simple S-expression parsing/printing} */
-
-type rec t = [
-  | #Atom(string)
-  | #List(list<t>)
-]
-
-let equal = (a, b) => a == b
-
-let compare = (a, b) => Pervasives.compare(a, b)
-
-let hash = a => Hashtbl.hash(a)
-
-let of_int = x => #Atom(string_of_int(x))
-let of_float = x => #Atom(string_of_float(x))
-let of_bool = x => #Atom(string_of_bool(x))
-let atom = x => #Atom(x)
-let of_unit = #List(list{})
-let of_list = l => #List(l)
-let of_rev_list = l => #List(List.rev(l))
-let of_pair = ((x, y)) => #List(list{x, y})
-let of_triple = ((x, y, z)) => #List(list{x, y, z})
-let of_quad = ((x, y, z, u)) => #List(list{x, y, z, u})
-
-let of_variant = (name, args) => #List(list{#Atom(name), ...args})
-let of_field = (name, t) => #List(list{#Atom(name), t})
-let of_record = l => #List(List.map(((n, x)) => of_field(n, x), l))
-
-/*** {6 Traversal of S-exp} */
-
-module Traverse = {
-  type conv<'a> = t => option<'a>
-
-  let return = x => Some(x)
-
-  let \">|=" = (e, f) =>
-    switch e {
-    | None => None
-    | Some(x) => Some(f(x))
-    }
-
-  let \">>=" = (e, f) =>
-    switch e {
-    | None => None
-    | Some(x) => f(x)
-    }
-
-  let map_opt = (f, l) => {
-    let rec recurse = (acc, l) =>
-      switch l {
-      | list{} => Some(List.rev(acc))
-      | list{x, ...l'} =>
-        switch f(x) {
-        | None => None
-        | Some(y) => recurse(list{y, ...acc}, l')
-        }
-      }
-    recurse(list{}, l)
-  }
-
-  let rec _list_any = (f, l) =>
-    switch l {
-    | list{} => None
-    | list{x, ...tl} =>
-      switch f(x) {
-      | Some(_) as res => res
-      | None => _list_any(f, tl)
-      }
-    }
-
-  let list_any = (f, e) =>
-    switch e {
-    | #Atom(_) => None
-    | #List(l) => _list_any(f, l)
-    }
-
-  let rec _list_all = (f, acc, l) =>
-    switch l {
-    | list{} => List.rev(acc)
-    | list{x, ...tl} =>
-      switch f(x) {
-      | Some(y) => _list_all(f, list{y, ...acc}, tl)
-      | None => _list_all(f, acc, tl)
-      }
-    }
-
-  let list_all = (f, e) =>
-    switch e {
-    | #Atom(_) => list{}
-    | #List(l) => _list_all(f, list{}, l)
-    }
-
-  let _try_atom = (e, f) =>
-    switch e {
-    | #List(_) => None
-    | #Atom(x) =>
-      try Some(f(x)) catch {
-      | _ => None
-      }
-    }
-
-  let to_int = e => _try_atom(e, int_of_string)
-  let to_bool = e => _try_atom(e, bool_of_string)
-  let to_float = e => _try_atom(e, float_of_string)
-  let to_string = e => _try_atom(e, x => x)
-
-  let to_pair = e =>
-    switch e {
-    | #List(list{x, y}) => Some(x, y)
-    | _ => None
-    }
-
-  let to_pair_with = (f1, f2, e) =>
-    \">>="(to_pair(e), ((x, y)) => \">>="(f1(x), x => \">>="(f2(y), y => return((x, y)))))
-
-  let to_triple = e =>
-    switch e {
-    | #List(list{x, y, z}) => Some(x, y, z)
-    | _ => None
-    }
-
-  let to_triple_with = (f1, f2, f3, e) =>
-    \">>="(to_triple(e), ((x, y, z)) =>
-      \">>="(f1(x), x => \">>="(f2(y), y => \">>="(f3(z), z => return((x, y, z)))))
-    )
-
-  let to_list = e =>
-    switch e {
-    | #List(l) => Some(l)
-    | #Atom(_) => None
-    }
-
-  let to_list_with = (f, e: t) =>
-    switch e {
-    | #List(l) => map_opt(f, l)
-    | #Atom(_) => None
-    }
-
-  let rec _get_field = (name, l) =>
-    switch l {
-    | list{#List(list{#Atom(n), x}), ..._} if name == n => Some(x)
-    | list{_, ...tl} => _get_field(name, tl)
-    | list{} => None
-    }
-
-  let get_field = (name, e) =>
-    switch e {
-    | #List(l) => _get_field(name, l)
-    | #Atom(_) => None
-    }
-
-  let field = (name, f, e) => \">>="(get_field(name, e), f)
-
-  let rec _get_field_list = (name, l) =>
-    switch l {
-    | list{#List(list{#Atom(n), ...tl}), ..._} if name == n => Some(tl)
-    | list{_, ...tl} => _get_field_list(name, tl)
-    | list{} => None
-    }
-
-  let field_list = (name, f, e) =>
-    switch e {
-    | #List(l) => \">>="(_get_field_list(name, l), f)
-    | #Atom(_) => None
-    }
-
-  let rec _get_variant = (s, args, l) =>
-    switch l {
-    | list{} => None
-    | list{(s', f), ..._} if s == s' => f(args)
-    | list{_, ...tl} => _get_variant(s, args, tl)
-    }
-
-  let get_variant = (l, e) =>
-    switch e {
-    | #List(list{#Atom(s), ...args}) => _get_variant(s, args, l)
-    | #List(_) => None
-    | #Atom(s) => _get_variant(s, list{}, l)
-    }
-
-  let get_exn = e =>
-    switch e {
-    | None => failwith("CCSexp.Traverse.get_exn")
-    | Some(x) => x
-    }
-}
diff --git a/jscomp/test/sexp.resi b/jscomp/test/sexp.resi
deleted file mode 100644
index ffb85e6..0000000
--- a/jscomp/test/sexp.resi
+++ /dev/null
@@ -1,146 +0,0 @@
-/*** {1 Handling S-expressions}
-
-    @since 0.4
-
-    @since 0.7
-    Moved the streaming parser to CCSexpStream
-*/
-
-/*** {2 Basics} */
-
-type rec t = [
-  | #Atom(string)
-  | #List(list<t>)
-]
-
-let equal: (t, t) => bool
-let compare: (t, t) => int
-let hash: t => int
-
-/** Build an atom directly from a string */
-let atom: string => t
-
-let of_int: int => t
-let of_bool: bool => t
-let of_list: list<t> => t
-/** Reverse the list */
-let of_rev_list: list<t> => t
-/** Reverse the list */
-let of_float: float => t
-let of_unit: t
-let of_pair: ((t, t)) => t
-let of_triple: ((t, t, t)) => t
-let of_quad: ((t, t, t, t)) => t
-
-/** [of_variant name args] is used to encode algebraic variants
-    into a S-expr. For instance [of_variant \"some\" [of_int 1]]
-    represents the value [Some 1] */
-let of_variant: (string, list<t>) => t
-
-/** Used to represent one record field */
-let of_field: (string, t) => t
-
-/** Represent a record by its named fields */
-let of_record: list<(string, t)> => t
-
-/* {6 Traversal of S-exp}
-
-    Example: serializing 2D points
-    {[
-      type pt = {x:int; y:int };;
-
-      let pt_of_sexp e =
-        Sexp.Traverse.(
-          field \"x\" to_int e >>= fun x ->
-          field \"y\" to_int e >>= fun y ->
-          return {x;y}
-        );;
-
-      let sexp_of_pt pt = Sexp.(of_record [\"x\", of_int pt.x; \"y\", of_int pt.y]);;
-
-      let l = [{x=1;y=1}; {x=2;y=10}];;
-
-      let sexp = Sexp.(of_list (List.map sexp_of_pt l));;
-
-      Sexp.Traverse.list_all pt_of_sexp sexp;;
-    ]}
-
-*/
-
-module Traverse: {
-  /** A converter from S-expressions to 'a is a function [sexp -> 'a option].
-      @since 0.4.1 */
-  type conv<'a> = t => option<'a>
-
-  /** Map over a list, failing as soon as the function fails on any element
-      @since 0.4.1 */
-  let map_opt: ('a => option<'b>, list<'a>) => option<list<'b>>
-
-  /** [list_any f (List l)] tries [f x] for every element [x] in [List l],
-      and returns the first non-None result (if any). */
-  let list_any: (conv<'a>, t) => option<'a>
-
-  /** [list_all f (List l)] returns the list of all [y] such that [x] in [l]
-      and [f x = Some y] */
-  let list_all: (conv<'a>, t) => list<'a>
-
-  /** Expect an integer */
-  let to_int: conv<int>
-
-  /** Expect a string (an atom) */
-  let to_string: conv<string>
-
-  /** Expect a boolean */
-  let to_bool: conv<bool>
-
-  /** Expect a float */
-  let to_float: conv<float>
-
-  /** Expect a list */
-  let to_list: conv<list<t>>
-
-  /** Expect a list, applies [f] to all the elements of the list, and succeeds
-      only if [f] succeeded on every element
-      @since 0.4.1 */
-  let to_list_with: (t => option<'a>) => conv<list<'a>>
-
-  /** Expect a list of two elements */
-  let to_pair: conv<(t, t)>
-
-  /** Same as {!to_pair} but applies conversion functions
-      @since 0.4.1 */
-  let to_pair_with: (conv<'a>, conv<'b>) => conv<('a, 'b)>
-
-  let to_triple: conv<(t, t, t)>
-
-  let to_triple_with: (conv<'a>, conv<'b>, conv<'c>) => conv<('a, 'b, 'c)>
-  /* @since 0.4.1 */
-
-  /** [get_field name e], when [e = List [(n1,x1); (n2,x2) ... ]], extracts
-      the [xi] such that [name = ni], if it can find it. */
-  let get_field: string => conv<t>
-
-  /** Enriched version of {!get_field}, with a converter as argument */
-  let field: (string, conv<'a>) => conv<'a>
-
-  /** [get_variant l e] checks whether [e = List (Atom s :: args)], and
-      if some pair of [l] is [s, f]. In this case, it calls [f args]
-      and returns its result, otherwise it returns None. */
-  let get_variant: list<(string, list<t> => option<'a>)> => conv<'a>
-
-  /** [field_list name f  \"(... (name a b c d) ...record)\"]
-      will look for a field based on the given [name], and expect it to have a
-      list of arguments dealt with by [f] (here, \"a b c d\").
-      @since 0.4.1 */
-  let field_list: (string, list<t> => option<'a>) => conv<'a>
-
-  let \">>=": (option<'a>, 'a => option<'b>) => option<'b>
-
-  let \">|=": (option<'a>, 'a => 'b) => option<'b>
-
-  let return: 'a => option<'a>
-
-  /** Unwrap an option, possibly failing.
-      @raise Invalid_argument if the argument is [None] */
-  let get_exn: option<'a> => 'a
-}
diff --git a/jscomp/test/sexpm.js b/jscomp/test/sexpm.js
deleted file mode 100644
index de38992..0000000
--- a/jscomp/test/sexpm.js
+++ /dev/null
@@ -1,573 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Sys = require("../../lib/js/sys.js");
-var Caml = require("../../lib/js/caml.js");
-var Char = require("../../lib/js/char.js");
-var List = require("../../lib/js/list.js");
-var Bytes = require("../../lib/js/bytes.js");
-var Curry = require("../../lib/js/curry.js");
-var $$Buffer = require("../../lib/js/buffer.js");
-var $$String = require("../../lib/js/string.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function _must_escape(s) {
-  try {
-    for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){
-      var c = s.codePointAt(i);
-      var exit = 0;
-      if (c >= 42) {
-        if (c !== 59) {
-          if (c !== 92) {
-            exit = 1;
-          } else {
-            throw {
-                  RE_EXN_ID: Pervasives.Exit,
-                  Error: new Error()
-                };
-          }
-        } else {
-          throw {
-                RE_EXN_ID: Pervasives.Exit,
-                Error: new Error()
-              };
-        }
-      } else if (c >= 11) {
-        if (c >= 32) {
-          switch (c) {
-            case 33 :
-            case 35 :
-            case 36 :
-            case 37 :
-            case 38 :
-            case 39 :
-                exit = 1;
-                break;
-            case 32 :
-            case 34 :
-            case 40 :
-            case 41 :
-                throw {
-                      RE_EXN_ID: Pervasives.Exit,
-                      Error: new Error()
-                    };
-            
-          }
-        } else {
-          exit = 1;
-        }
-      } else {
-        if (c >= 9) {
-          throw {
-                RE_EXN_ID: Pervasives.Exit,
-                Error: new Error()
-              };
-        }
-        exit = 1;
-      }
-      if (exit === 1 && c > 127) {
-        throw {
-              RE_EXN_ID: Pervasives.Exit,
-              Error: new Error()
-            };
-      }
-      
-    }
-    return false;
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === Pervasives.Exit) {
-      return true;
-    }
-    throw exn;
-  }
-}
-
-function to_buf(b, t) {
-  if (t.NAME === "List") {
-    var l = t.VAL;
-    if (l) {
-      if (l.tl) {
-        $$Buffer.add_char(b, /* '(' */40);
-        List.iteri((function (i, t$p) {
-                if (i > 0) {
-                  $$Buffer.add_char(b, /* ' ' */32);
-                }
-                to_buf(b, t$p);
-              }), l);
-        return $$Buffer.add_char(b, /* ')' */41);
-      } else {
-        $$Buffer.add_string(b, "(");
-        to_buf(b, l.hd);
-        return $$Buffer.add_string(b, ")");
-      }
-    } else {
-      return $$Buffer.add_string(b, "()");
-    }
-  }
-  var s = t.VAL;
-  if (_must_escape(s)) {
-    return $$Buffer.add_string(b, "\"" + ($$String.escaped(s) + "\""));
-  } else {
-    return $$Buffer.add_string(b, s);
-  }
-}
-
-function to_string(t) {
-  var b = $$Buffer.create(128);
-  to_buf(b, t);
-  return $$Buffer.contents(b);
-}
-
-function make(bufsizeOpt, refill) {
-  var bufsize = bufsizeOpt !== undefined ? bufsizeOpt : 1024;
-  var bufsize$1 = Caml.int_min(bufsize > 16 ? bufsize : 16, Sys.max_string_length);
-  return {
-          buf: Caml_bytes.create(bufsize$1),
-          refill: refill,
-          atom: $$Buffer.create(32),
-          i: 0,
-          len: 0,
-          line: 1,
-          col: 1
-        };
-}
-
-function _is_digit(c) {
-  if (/* '0' */48 <= c) {
-    return c <= /* '9' */57;
-  } else {
-    return false;
-  }
-}
-
-function _refill(t, k_succ, k_fail) {
-  var n = Curry._3(t.refill, t.buf, 0, t.buf.length);
-  t.i = 0;
-  t.len = n;
-  if (n === 0) {
-    return Curry._1(k_fail, t);
-  } else {
-    return Curry._1(k_succ, t);
-  }
-}
-
-function _get(t) {
-  if (t.i >= t.len) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "sexpm.res",
-            111,
-            4
-          ],
-          Error: new Error()
-        };
-  }
-  var c = Caml_bytes.get(t.buf, t.i);
-  t.i = t.i + 1 | 0;
-  if (c === /* '\n' */10) {
-    t.col = 1;
-    t.line = t.line + 1 | 0;
-  } else {
-    t.col = t.col + 1 | 0;
-  }
-  return c;
-}
-
-function _error(param) {
-  var line = param.line;
-  var col = param.col;
-  return function (msg) {
-    var b = $$Buffer.create(32);
-    $$Buffer.add_string(b, "at " + (line + (", " + (col + ": "))));
-    $$Buffer.add_string(b, msg);
-    var msg$p = $$Buffer.contents(b);
-    return {
-            NAME: "Error",
-            VAL: msg$p
-          };
-  };
-}
-
-function _error_eof(t) {
-  return _error(t)("unexpected end of input");
-}
-
-function expr(k, t) {
-  while(true) {
-    if (t.i === t.len) {
-      return _refill(t, (function (param) {
-                    return expr(k, param);
-                  }), _error_eof);
-    }
-    var c = _get(t);
-    if (c >= 11) {
-      if (c !== 32) {
-        return expr_starting_with(c, k, t);
-      }
-      continue ;
-    }
-    if (c < 9) {
-      return expr_starting_with(c, k, t);
-    }
-    continue ;
-  };
-}
-
-function expr_starting_with(c, k, t) {
-  if (c >= 42) {
-    if (c === 59) {
-      return skip_comment((function (param, param$1) {
-                    return expr(k, t);
-                  }), t);
-    }
-    if (c === 92) {
-      return _error(t)("unexpected '\\'");
-    }
-    
-  } else if (c >= 11) {
-    if (c >= 32) {
-      switch (c) {
-        case 32 :
-            throw {
-                  RE_EXN_ID: "Assert_failure",
-                  _1: [
-                    "sexpm.res",
-                    152,
-                    27
-                  ],
-                  Error: new Error()
-                };
-        case 34 :
-            return quoted(k, t);
-        case 33 :
-        case 35 :
-        case 36 :
-        case 37 :
-        case 38 :
-        case 39 :
-            break;
-        case 40 :
-            return expr_list(/* [] */0, k, t);
-        case 41 :
-            return _error(t)("unexpected ')'");
-        
-      }
-    }
-    
-  } else if (c >= 9) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "sexpm.res",
-            152,
-            27
-          ],
-          Error: new Error()
-        };
-  }
-  $$Buffer.add_char(t.atom, c);
-  return atom(k, t);
-}
-
-function expr_list(acc, k, t) {
-  while(true) {
-    if (t.i === t.len) {
-      return _refill(t, (function (param) {
-                    return expr_list(acc, k, param);
-                  }), _error_eof);
-    }
-    var c = _get(t);
-    if (c > 32 || c < 9) {
-      if (c === 41) {
-        return Curry._2(k, undefined, {
-                    NAME: "List",
-                    VAL: List.rev(acc)
-                  });
-      }
-      
-    } else if (c > 31 || c < 11) {
-      continue ;
-    }
-    return expr_starting_with(c, (function (last, e) {
-                  if (last !== undefined) {
-                    if (last !== 40) {
-                      if (last !== 41) {
-                        return expr_list({
-                                    hd: e,
-                                    tl: acc
-                                  }, k, t);
-                      } else {
-                        return Curry._2(k, undefined, {
-                                    NAME: "List",
-                                    VAL: List.rev({
-                                          hd: e,
-                                          tl: acc
-                                        })
-                                  });
-                      }
-                    } else {
-                      return expr_list(/* [] */0, (function (param, l) {
-                                    return expr_list({
-                                                hd: l,
-                                                tl: acc
-                                              }, k, t);
-                                  }), t);
-                    }
-                  } else {
-                    return expr_list({
-                                hd: e,
-                                tl: acc
-                              }, k, t);
-                  }
-                }), t);
-  };
-}
-
-function _return_atom(last, k, t) {
-  var s = $$Buffer.contents(t.atom);
-  t.atom.position = 0;
-  return Curry._2(k, last, {
-              NAME: "Atom",
-              VAL: s
-            });
-}
-
-function atom(k, t) {
-  while(true) {
-    if (t.i === t.len) {
-      return _refill(t, (function (param) {
-                    return atom(k, param);
-                  }), (function (param) {
-                    return _return_atom(undefined, k, param);
-                  }));
-    }
-    var c = _get(t);
-    var exit = 0;
-    if (c >= 35) {
-      if (c >= 42) {
-        if (c === 92) {
-          return _error(t)("unexpected '\\' in non-quoted string");
-        }
-        exit = 1;
-      } else {
-        exit = c >= 40 ? 2 : 1;
-      }
-    } else if (c >= 11) {
-      if (c >= 32) {
-        switch (c) {
-          case 32 :
-              exit = 2;
-              break;
-          case 33 :
-              exit = 1;
-              break;
-          case 34 :
-              return _error(t)("unexpected '\"' in the middle of an atom");
-          
-        }
-      } else {
-        exit = 1;
-      }
-    } else {
-      exit = c >= 9 ? 2 : 1;
-    }
-    switch (exit) {
-      case 1 :
-          $$Buffer.add_char(t.atom, c);
-          continue ;
-      case 2 :
-          return _return_atom(c, k, t);
-      
-    }
-  };
-}
-
-function quoted(k, t) {
-  while(true) {
-    if (t.i === t.len) {
-      return _refill(t, (function (param) {
-                    return quoted(k, param);
-                  }), _error_eof);
-    }
-    var c = _get(t);
-    if (c === 34) {
-      return _return_atom(undefined, k, t);
-    }
-    if (c === 92) {
-      return escaped((function (c) {
-                    $$Buffer.add_char(t.atom, c);
-                    return quoted(k, t);
-                  }), t);
-    }
-    $$Buffer.add_char(t.atom, c);
-    continue ;
-  };
-}
-
-function escaped(k, t) {
-  if (t.i === t.len) {
-    return _refill(t, (function (param) {
-                  return escaped(k, param);
-                }), _error_eof);
-  }
-  var c = _get(t);
-  if (c >= 92) {
-    if (c < 117) {
-      switch (c) {
-        case 92 :
-            return Curry._1(k, /* '\\' */92);
-        case 98 :
-            return Curry._1(k, /* '\b' */8);
-        case 110 :
-            return Curry._1(k, /* '\n' */10);
-        case 114 :
-            return Curry._1(k, /* '\r' */13);
-        case 93 :
-        case 94 :
-        case 95 :
-        case 96 :
-        case 97 :
-        case 99 :
-        case 100 :
-        case 101 :
-        case 102 :
-        case 103 :
-        case 104 :
-        case 105 :
-        case 106 :
-        case 107 :
-        case 108 :
-        case 109 :
-        case 111 :
-        case 112 :
-        case 113 :
-        case 115 :
-            break;
-        case 116 :
-            return Curry._1(k, /* '\t' */9);
-        
-      }
-    }
-    
-  } else if (c === 34) {
-    return Curry._1(k, /* '"' */34);
-  }
-  if (_is_digit(c)) {
-    return read2int(c - /* '0' */48 | 0, (function (n) {
-                  return Curry._1(k, Char.chr(n));
-                }), t);
-  } else {
-    return _error(t)("unexpected escaped char '" + (c + "'"));
-  }
-}
-
-function read2int(i, k, t) {
-  if (t.i === t.len) {
-    return _refill(t, (function (param) {
-                  return read2int(i, k, param);
-                }), _error_eof);
-  }
-  var c = _get(t);
-  if (_is_digit(c)) {
-    return read1int(Math.imul(10, i) + (c - /* '0' */48 | 0) | 0, k, t);
-  } else {
-    return _error(t)("unexpected escaped char '" + (c + "' when reading byte"));
-  }
-}
-
-function read1int(i, k, t) {
-  if (t.i === t.len) {
-    return _refill(t, (function (param) {
-                  return read1int(i, k, param);
-                }), _error_eof);
-  }
-  var c = _get(t);
-  if (_is_digit(c)) {
-    return Curry._1(k, Math.imul(10, i) + (c - /* '0' */48 | 0) | 0);
-  } else {
-    return _error(t)("unexpected escaped char '" + (c + "' when reading byte"));
-  }
-}
-
-function skip_comment(k, t) {
-  while(true) {
-    if (t.i === t.len) {
-      return _refill(t, (function (param) {
-                    return skip_comment(k, param);
-                  }), _error_eof);
-    }
-    var match = _get(t);
-    if (match === 10) {
-      return Curry._2(k, undefined, undefined);
-    }
-    continue ;
-  };
-}
-
-function expr_or_end(k, t) {
-  while(true) {
-    if (t.i === t.len) {
-      return _refill(t, (function (param) {
-                    return expr_or_end(k, param);
-                  }), (function (param) {
-                    return "End";
-                  }));
-    }
-    var c = _get(t);
-    if (c >= 11) {
-      if (c !== 32) {
-        return expr_starting_with(c, k, t);
-      }
-      continue ;
-    }
-    if (c < 9) {
-      return expr_starting_with(c, k, t);
-    }
-    continue ;
-  };
-}
-
-function next(t) {
-  return expr_or_end((function (param, x) {
-                return {
-                        NAME: "Ok",
-                        VAL: x
-                      };
-              }), t);
-}
-
-function parse_string(s) {
-  var n = s.length;
-  var stop = {
-    contents: false
-  };
-  var refill = function (bytes, i, _len) {
-    if (stop.contents) {
-      return 0;
-    } else {
-      stop.contents = true;
-      Bytes.blit_string(s, 0, bytes, i, n);
-      return n;
-    }
-  };
-  var d = make(n, refill);
-  var res = next(d);
-  if (typeof res === "object") {
-    return res;
-  } else {
-    return {
-            NAME: "Error",
-            VAL: "unexpected end of file"
-          };
-  }
-}
-
-exports.to_buf = to_buf;
-exports.to_string = to_string;
-exports.parse_string = parse_string;
-/* No side effect */
diff --git a/jscomp/test/sexpm.res b/jscomp/test/sexpm.res
deleted file mode 100644
index 24c82f8..0000000
--- a/jscomp/test/sexpm.res
+++ /dev/null
@@ -1,323 +0,0 @@
-/* This file is free software, part of containers. See file "license" for more details. */
-
-@@warning("a")
-type or_error<'a> = [#Ok('a) | #Error(string)]
-type sequence<'a> = ('a => unit) => unit
-type gen<'a> = unit => option<'a>
-
-type rec t = [
-  | #Atom(string)
-  | #List(list<t>)
-]
-type sexp = t
-
-/* {2 Serialization (encoding)} */
-
-/* shall we escape the string because of one of its chars? */
-let _must_escape = s =>
-  try {
-    for i in 0 to String.length(s) - 1 {
-      let c = String.unsafe_get(s, i)
-      switch c {
-      | ' ' | ';' | ')' | '(' | '"' | '\\' | '\n' | '\t' => raise(Exit)
-      | _ if Char.code(c) > 127 => raise(Exit) /* non-ascii */
-      | _ => ()
-      }
-    }
-    false
-  } catch {
-  | Exit => true
-  }
-
-let rec to_buf = (b, t) =>
-  switch t {
-  | #Atom(s) if _must_escape(s) => Buffer.add_string(b, "\"" ++ (String.escaped(s) ++ "\""))
-  | #Atom(s) => Buffer.add_string(b, s)
-  | #List(list{}) => Buffer.add_string(b, "()")
-  | #List(list{x}) =>
-    Buffer.add_string(b, "(")
-    to_buf(b, x)
-    Buffer.add_string(b, ")")
-  | #List(l) =>
-    Buffer.add_char(b, '(')
-    List.iteri((i, t') => {
-      if i > 0 {
-        Buffer.add_char(b, ' ')
-      }
-      to_buf(b, t')
-    }, l)
-    Buffer.add_char(b, ')')
-  }
-
-let to_string = t => {
-  let b = Buffer.create(128)
-  to_buf(b, t)
-  Buffer.contents(b)
-}
-
-/* {2 Deserialization (decoding)} */
-
-module type MONAD = {
-  type t<'a>
-  let return: 'a => t<'a>
-  let \">>=": (t<'a>, 'a => t<'b>) => t<'b>
-}
-
-type parse_result<'a> = [or_error<'a> | #End]
-
-module MakeDecode = (M: MONAD) => {
-  let \">>=" = M.\">>="
-
-  type t = {
-    buf: Bytes.t,
-    refill: (Bytes.t, int, int) => M.t<int>,
-    atom: Buffer.t,
-    mutable i: int /* offset in [buf] */,
-    mutable len: int /* how many bytes of [buf] are usable */,
-    mutable line: int,
-    mutable col: int,
-  }
-
-  let make = (~bufsize=1024, refill) => {
-    let bufsize = min(max(bufsize, 16), Sys.max_string_length)
-    {
-      buf: Bytes.create(bufsize),
-      refill,
-      atom: Buffer.create(32),
-      i: 0,
-      len: 0,
-      line: 1,
-      col: 1,
-    }
-  }
-
-  let _is_digit = c => Char.code('0') <= Char.code(c) && Char.code(c) <= Char.code('9')
-  let _digit2i = c => Char.code(c) - Char.code('0')
-
-  /* refill buffer. If it works, call k_succ, otherwise call k_fail */
-  let _refill = (t, k_succ, k_fail) =>
-    \">>="(t.refill(t.buf, 0, Bytes.length(t.buf)), n => {
-      t.i = 0
-      t.len = n
-      if n == 0 {
-        k_fail(t)
-      } else {
-        k_succ(t)
-      }
-    })
-
-  /* get next char, assuming t.i < t.len */
-  let _get = t => {
-    assert (t.i < t.len)
-    let c = Bytes.get(t.buf, t.i)
-    t.i = t.i + 1
-    if c == '\n' {
-      t.col = 1
-      t.line = t.line + 1
-    } else {
-      t.col = t.col + 1
-    }
-    c
-  }
-
-  /* return an error */
-  let _error = ({line, col}, msg: string) => {
-    let b = Buffer.create(32)
-    Buffer.add_string(b, "at " ++ (__unsafe_cast(line) ++ (", " ++ (__unsafe_cast(col) ++ ": "))))
-    Buffer.add_string(b, msg)
-    let msg' = Buffer.contents(b)
-    M.return(#Error(msg'))
-  }
-
-  let _error_eof = t => _error(t, "unexpected end of input")
-
-  /* The parsers all take a success continuation, and the decoder as
-      last arguments. The continuation is used to minimize the
-      number of calls to [>>=] and take two parameters, the next
-      char (if not consumed), and the returned expression itself */
-
-  /* read expression */
-  let rec expr = (k, t) =>
-    if t.i == t.len {
-      _refill(t, expr(k), _error_eof)
-    } else {
-      switch _get(t) {
-      | ' ' | '\t' | '\n' => expr(k, t)
-      | c => expr_starting_with(c, k, t)
-      }
-    }
-
-  and expr_starting_with = (c, k, t) =>
-    switch c {
-    | ' ' | '\t' | '\n' => assert(false)
-    | ';' => skip_comment((_, ()) => expr(k, t), t)
-    | '(' => expr_list(list{}, k, t)
-    | ')' => _error(t, "unexpected ')'")
-    | '\\' => _error(t, "unexpected '\\'")
-    | '"' => quoted(k, t)
-    | c =>
-      Buffer.add_char(t.atom, c)
-      atom(k, t)
-    }
-
-  /* parse list */
-  and expr_list = (acc, k, t) =>
-    if t.i == t.len {
-      _refill(t, expr_list(acc, k), _error_eof)
-    } else {
-      switch _get(t) {
-      | ' ' | '\t' | '\n' => expr_list(acc, k, t)
-      | ')' => k(None, #List(List.rev(acc)))
-      | c =>
-        expr_starting_with(
-          c,
-          (last, e) =>
-            switch last {
-            | Some('(') => expr_list(list{}, (_, l) => expr_list(list{l, ...acc}, k, t), t)
-            | Some(')') => k(None, #List(List.rev(list{e, ...acc})))
-            | _ => expr_list(list{e, ...acc}, k, t)
-            },
-          t,
-        )
-      }
-    }
-
-  /* return the current atom (last char: c) */
-  and _return_atom = (last, k, t) => {
-    let s = Buffer.contents(t.atom)
-    Buffer.clear(t.atom)
-    k(last, #Atom(s))
-  }
-
-  /* parse atom */
-  and atom = (k, t) =>
-    if t.i == t.len {
-      _refill(t, atom(k), _return_atom(None, k))
-    } else {
-      switch _get(t) {
-      | '\\' => _error(t, "unexpected '\\' in non-quoted string")
-      | '"' => _error(t, "unexpected '\"' in the middle of an atom")
-      | (' ' | '\n' | '\t' | '(' | ')') as c => _return_atom(Some(c), k, t)
-      | c =>
-        Buffer.add_char(t.atom, c)
-        atom(k, t)
-      }
-    }
-
-  /* quoted string */
-  and quoted = (k, t) =>
-    if t.i == t.len {
-      _refill(t, quoted(k), _error_eof)
-    } else {
-      switch _get(t) {
-      | '\\' =>
-        /* read escaped char and continue */
-        escaped(c => {
-          Buffer.add_char(t.atom, c)
-          quoted(k, t)
-        }, t)
-      | '"' => _return_atom(None, k, t)
-      | c =>
-        Buffer.add_char(t.atom, c)
-        quoted(k, t)
-      }
-    }
-
-  /* read escaped char */
-  and escaped = (k, t) =>
-    if t.i == t.len {
-      _refill(t, escaped(k), _error_eof)
-    } else {
-      switch _get(t) {
-      | 'n' => k('\n')
-      | 't' => k('\t')
-      | 'r' => k('\r')
-      | 'b' => k('\b')
-      | '\\' => k('\\')
-      | '"' => k('"')
-      | c if _is_digit(c) => read2int(_digit2i(c), n => k(Char.chr(n)), t)
-      | c => _error(t, "unexpected escaped char '" ++ (__unsafe_cast(c) ++ "'"))
-      }
-    }
-
-  and read2int = (i, k, t) =>
-    if t.i == t.len {
-      _refill(t, read2int(i, k), _error_eof)
-    } else {
-      switch _get(t) {
-      | c if _is_digit(c) => read1int(10 * i + _digit2i(c), k, t)
-      | c => _error(t, "unexpected escaped char '" ++ (__unsafe_cast(c) ++ "' when reading byte"))
-      }
-    }
-
-  and read1int = (i, k, t) =>
-    if t.i == t.len {
-      _refill(t, read1int(i, k), _error_eof)
-    } else {
-      switch _get(t) {
-      | c if _is_digit(c) => k(10 * i + _digit2i(c))
-      | c => _error(t, "unexpected escaped char '" ++ (__unsafe_cast(c) ++ "' when reading byte"))
-      }
-    }
-
-  /* skip until end of line, then call next() */
-  and skip_comment = (k, t) =>
-    if t.i == t.len {
-      _refill(t, skip_comment(k), _error_eof)
-    } else {
-      switch _get(t) {
-      | '\n' => k(None, ())
-      | _ => skip_comment(k, t)
-      }
-    }
-
-  /* top-level expression */
-  let rec expr_or_end = (k, t) =>
-    if t.i == t.len {
-      _refill(t, expr_or_end(k), _ => M.return(#End))
-    } else {
-      switch _get(t) {
-      | ' ' | '\t' | '\n' => expr_or_end(k, t)
-      | c => expr_starting_with(c, k, t)
-      }
-    }
-
-  /* entry point */
-  let next = (t): M.t<parse_result<sexp>> => expr_or_end((_, x) => M.return(#Ok(x)), t)
-}
-
-module ID_MONAD = {
-  type t<'a> = 'a
-  let return = x => x
-  let \">>=" = (x, f) => f(x)
-}
-
-module D = MakeDecode(ID_MONAD)
-
-let parse_string = (s): or_error<t> => {
-  let n = String.length(s)
-  let stop = ref(false)
-  let refill = (bytes, i, _len) =>
-    if stop.contents {
-      0
-    } else {
-      stop := true
-      Bytes.blit_string(s, 0, bytes, i, n)
-      n
-    }
-
-  let d = D.make(~bufsize=n, refill)
-  switch D.next(d) {
-  | #End => #Error("unexpected end of file")
-  | (#Ok(_) | #Error(_)) as res => res
-  }
-}
-
-/* $T
-    CCError.to_opt (parse_string "(abc d/e/f \"hello \\\" () world\" )") <> None
-     CCError.to_opt (parse_string "(abc ( d e ffff   ) \"hello/world\")") <> None
-*/
-
-/* $Q & ~count:100
-     sexp_gen (fun s -> sexp_valid s ==> (to_string s |> parse_string = `Ok s))
-*/
diff --git a/jscomp/test/sexpm.resi b/jscomp/test/sexpm.resi
deleted file mode 100644
index 645d0c9..0000000
--- a/jscomp/test/sexpm.resi
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This file is free software, part of containers. See file "license" for more details. */
-
-/* {1 Simple and efficient S-expression parsing/printing}
-
-    @since 0.7 " */
-
-type or_error<'a> = [#Ok('a) | #Error(string)]
-type sequence<'a> = ('a => unit) => unit
-type gen<'a> = unit => option<'a>
-
-/* {2 Basics} */
-
-type rec t = [
-  | #Atom(string)
-  | #List(list<t>)
-]
-type sexp = t
-
-/* {2 Serialization (encoding)} */
-
-let to_buf: (Buffer.t, t) => unit
-
-let to_string: t => string
-
-/** Parse a string */
-let parse_string: string => or_error<t>
diff --git a/jscomp/test/sexpm_test.js b/jscomp/test/sexpm_test.js
deleted file mode 100644
index a5880b8..0000000
--- a/jscomp/test/sexpm_test.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Sexpm = require("./sexpm.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, param) {
-  var y = param[1];
-  var x = param[0];
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function print_or_error(x) {
-  if (x.NAME === "Error") {
-    return "Error:" + x.VAL;
-  } else {
-    return "Ok:" + Sexpm.to_string(x.VAL);
-  }
-}
-
-var a = Sexpm.parse_string("(x x gh 3 3)");
-
-eq("File \"sexpm_test.res\", line 17, characters 5-12", [
-      {
-        NAME: "Ok",
-        VAL: {
-          NAME: "List",
-          VAL: {
-            hd: {
-              NAME: "Atom",
-              VAL: "x"
-            },
-            tl: {
-              hd: {
-                NAME: "Atom",
-                VAL: "x"
-              },
-              tl: {
-                hd: {
-                  NAME: "Atom",
-                  VAL: "gh"
-                },
-                tl: {
-                  hd: {
-                    NAME: "Atom",
-                    VAL: "3"
-                  },
-                  tl: {
-                    hd: {
-                      NAME: "Atom",
-                      VAL: "3"
-                    },
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      a
-    ]);
-
-eq("File \"sexpm_test.res\", line 18, characters 5-12", [
-      print_or_error(a).trim(),
-      "Ok:(x x gh 3 3)\n".trim()
-    ]);
-
-Mt.from_pair_suites("Sexpm_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.print_or_error = print_or_error;
-/* a Not a pure module */
diff --git a/jscomp/test/sexpm_test.res b/jscomp/test/sexpm_test.res
deleted file mode 100644
index 591b402..0000000
--- a/jscomp/test/sexpm_test.res
+++ /dev/null
@@ -1,25 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, (x, y)) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let print_or_error = x =>
-  switch x {
-  | #Ok(a) => "Ok:" ++ Sexpm.to_string(a)
-  | #Error(a) => "Error:" ++ a
-  }
-
-let () = {
-  let a = Sexpm.parse_string("(x x gh 3 3)")
-  eq(__LOC__, (#Ok(#List(list{#Atom("x"), #Atom("x"), #Atom("gh"), #Atom("3"), #Atom("3")})), a))
-  eq(__LOC__, (Js.String2.trim(print_or_error(a)), Js.String2.trim("Ok:(x x gh 3 3)\n")))
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
-
-/*
-[%bs.internal.test ]
-*/
diff --git a/jscomp/test/side_effect.js b/jscomp/test/side_effect.js
deleted file mode 100644
index 8db15a2..0000000
--- a/jscomp/test/side_effect.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log("Side_effect");
-
-/*  Not a pure module */
diff --git a/jscomp/test/side_effect.res b/jscomp/test/side_effect.res
deleted file mode 100644
index 3d4c10d..0000000
--- a/jscomp/test/side_effect.res
+++ /dev/null
@@ -1 +0,0 @@
-Js.log(__MODULE__)
diff --git a/jscomp/test/side_effect2.js b/jscomp/test/side_effect2.js
deleted file mode 100644
index da6ef1f..0000000
--- a/jscomp/test/side_effect2.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Belt_Array = require("../../lib/js/belt_Array.js");
-
-var a = Belt_Array.map([1], (function (x) {
-        return x;
-      }));
-
-exports.a = a;
-/* a Not a pure module */
diff --git a/jscomp/test/side_effect2.res b/jscomp/test/side_effect2.res
deleted file mode 100644
index 6d45776..0000000
--- a/jscomp/test/side_effect2.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = Belt.Array.map([1], x => x)
diff --git a/jscomp/test/side_effect_free.js b/jscomp/test/side_effect_free.js
deleted file mode 100644
index bd93031..0000000
--- a/jscomp/test/side_effect_free.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a = 3;
-
-exports.a = a;
-/* No side effect */
diff --git a/jscomp/test/side_effect_free.res b/jscomp/test/side_effect_free.res
deleted file mode 100644
index 1bf62c4..0000000
--- a/jscomp/test/side_effect_free.res
+++ /dev/null
@@ -1 +0,0 @@
-let a = 3
diff --git a/jscomp/test/simple_derive_test.js b/jscomp/test/simple_derive_test.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/simple_derive_test.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/simple_derive_test.res b/jscomp/test/simple_derive_test.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/simple_derive_test.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/simple_derive_test.resi b/jscomp/test/simple_derive_test.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/simple_derive_test.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/simple_derive_use.js b/jscomp/test/simple_derive_use.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/simple_derive_use.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/simple_derive_use.res b/jscomp/test/simple_derive_use.res
deleted file mode 100644
index 307b9de..0000000
--- a/jscomp/test/simple_derive_use.res
+++ /dev/null
@@ -1,3 +0,0 @@
-/* idea: 
-   [%bs.deriving.dynval: Simple_derive_test.vv] 3 [@bs]
-*/
diff --git a/jscomp/test/simple_derive_use.resi b/jscomp/test/simple_derive_use.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/simple_derive_use.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/simplify_lambda_632o.js b/jscomp/test/simplify_lambda_632o.js
deleted file mode 100644
index 4324b08..0000000
--- a/jscomp/test/simplify_lambda_632o.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  switch (x) {
-    case "X1" :
-        return "X1";
-    case "X2" :
-        return "X2";
-    case "X3" :
-        return "X3";
-    case "X4" :
-        return "X4";
-    
-  }
-}
-
-function f2(x) {
-  switch (x) {
-    case "X1" :
-        return "X1";
-    case "X2" :
-        return "X2";
-    case "X3" :
-        return "X3";
-    case "X4" :
-        return "X4";
-    
-  }
-}
-
-exports.f = f;
-exports.f2 = f2;
-/* No side effect */
diff --git a/jscomp/test/simplify_lambda_632o.res b/jscomp/test/simplify_lambda_632o.res
deleted file mode 100644
index c262434..0000000
--- a/jscomp/test/simplify_lambda_632o.res
+++ /dev/null
@@ -1,19 +0,0 @@
-type t = X1 | X2 | X3 | X4
-type t1 = X1 | X2 | X3 | X4 | X5
-type t2 = X1 | X2 | X3 | X4 | X5(int)
-
-let f = (x: t): t1 =>
-  switch x {
-  | X1 => X1
-  | X2 => X2
-  | X3 => X3
-  | X4 => X4
-  }
-
-let f2 = (x: t): t2 =>
-  switch x {
-  | X1 => X1
-  | X2 => X2
-  | X3 => X3
-  | X4 => X4
-  }
diff --git a/jscomp/test/single_module_alias.js b/jscomp/test/single_module_alias.js
deleted file mode 100644
index efadc24..0000000
--- a/jscomp/test/single_module_alias.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var L;
-
-exports.L = L;
-/* No side effect */
diff --git a/jscomp/test/single_module_alias.res b/jscomp/test/single_module_alias.res
deleted file mode 100644
index 9792cc2..0000000
--- a/jscomp/test/single_module_alias.res
+++ /dev/null
@@ -1 +0,0 @@
-module L = List
diff --git a/jscomp/test/singular_unit_test.js b/jscomp/test/singular_unit_test.js
deleted file mode 100644
index 639c2d4..0000000
--- a/jscomp/test/singular_unit_test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f0(x) {
-  return x;
-}
-
-function f1(x) {
-  return 2;
-}
-
-function f3(x) {
-  if (x !== undefined) {
-    return x;
-  } else {
-    return "A";
-  }
-}
-
-var v0;
-
-exports.f0 = f0;
-exports.f1 = f1;
-exports.f3 = f3;
-exports.v0 = v0;
-/* No side effect */
diff --git a/jscomp/test/singular_unit_test.res b/jscomp/test/singular_unit_test.res
deleted file mode 100644
index 48875f6..0000000
--- a/jscomp/test/singular_unit_test.res
+++ /dev/null
@@ -1,19 +0,0 @@
-type t = A
-
-let f0 = (x: t) =>
-  switch x {
-  | A as y => y
-  }
-
-let f1 = (x: t) =>
-  switch x {
-  | A => 2
-  }
-
-let f3 = x =>
-  switch x {
-  | Some(A as y) => y
-  | None => A
-  }
-
-let v0 = ()
diff --git a/jscomp/test/slot/test_concat.res b/jscomp/test/slot/test_concat.res
deleted file mode 100644
index 63c6c8a..0000000
--- a/jscomp/test/slot/test_concat.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let v = Pervasives.\"^"
-
-/* local variables: */
-/* compile-command: "ocamlc -drawlambda test_concat.ml" */
-/* end: */
diff --git a/jscomp/test/small_inline_test.js b/jscomp/test/small_inline_test.js
deleted file mode 100644
index 830841e..0000000
--- a/jscomp/test/small_inline_test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function $pipe$great(x, f) {
-  return Curry._1(f, x);
-}
-
-function hello1(y, f) {
-  return Curry._1(f, y);
-}
-
-function hello2(y, f) {
-  return Curry._1(f, y);
-}
-
-function hello3(y, f) {
-  return Curry._1(f, y);
-}
-
-function hello4(y, f) {
-  return Curry._1(f, y);
-}
-
-function hello5(y, f) {
-  return Curry._1(f, y);
-}
-
-function f(_x) {
-  while(true) {
-    var x = _x;
-    _x = x + 1 | 0;
-    continue ;
-  };
-}
-
-function ff(_x, _y) {
-  while(true) {
-    var y = _y;
-    var x = _x;
-    _y = x + 1 | 0;
-    _x = y;
-    continue ;
-  };
-}
-
-function fff(_x, _y) {
-  while(true) {
-    var y = _y;
-    var x = _x;
-    _y = x;
-    _x = y;
-    continue ;
-  };
-}
-
-exports.$pipe$great = $pipe$great;
-exports.hello1 = hello1;
-exports.hello2 = hello2;
-exports.hello3 = hello3;
-exports.hello4 = hello4;
-exports.hello5 = hello5;
-exports.f = f;
-exports.ff = ff;
-exports.fff = fff;
-/* No side effect */
diff --git a/jscomp/test/small_inline_test.res b/jscomp/test/small_inline_test.res
deleted file mode 100644
index 66a0cf3..0000000
--- a/jscomp/test/small_inline_test.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let \"|>" = (x, f) => f(x)
-
-let hello1 = (y, f) => y |> f
-
-let hello2 = (y, f) => y |> f
-
-let hello3 = (y, f) => y |> f
-
-let hello4 = (y, f) => y |> f
-
-let hello5 = (y, f) => hello1(y, f)
-
-let rec f = x => f(x + 1)
-
-let rec ff = (x, y) => ff(y, x + 1)
-
-let rec fff = (x, y) => fff(y, x)
diff --git a/jscomp/test/splice_test.js b/jscomp/test/splice_test.js
deleted file mode 100644
index c702357..0000000
--- a/jscomp/test/splice_test.js
+++ /dev/null
@@ -1,206 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_splice_call = require("../../lib/js/caml_splice_call.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-var Caml_splice_call$1 = {};
-
-Math.max(1);
-
-function f00(a, b) {
-  return a.send(b);
-}
-
-var a = [];
-
-a.push(1, 2, 3, 4);
-
-eq("File \"splice_test.res\", line 23, characters 5-12", a, [
-      1,
-      2,
-      3,
-      4
-    ]);
-
-function dynamic(arr) {
-  var a = [];
-  Caml_splice_call.spliceObjApply(a, "push", [
-        1,
-        arr
-      ]);
-  eq("File \"splice_test.res\", line 29, characters 5-12", a, Caml_array.concat({
-            hd: [1],
-            tl: {
-              hd: arr,
-              tl: /* [] */0
-            }
-          }));
-}
-
-dynamic([
-      2,
-      3,
-      4
-    ]);
-
-dynamic([]);
-
-dynamic([
-      1,
-      1,
-      3
-    ]);
-
-var a$1 = new Array(1, 2, 3, 4);
-
-eq("File \"splice_test.res\", line 44, characters 5-12", a$1, [
-      1,
-      2,
-      3,
-      4
-    ]);
-
-function dynamicNew(arr) {
-  var a = Caml_splice_call.spliceNewApply(Array, [
-        1,
-        2,
-        arr
-      ]);
-  eq("File \"splice_test.res\", line 49, characters 5-12", a, Caml_array.concat({
-            hd: [
-              1,
-              2
-            ],
-            tl: {
-              hd: arr,
-              tl: /* [] */0
-            }
-          }));
-}
-
-dynamicNew([
-      3,
-      4
-    ]);
-
-dynamicNew([]);
-
-dynamicNew([
-      1,
-      3
-    ]);
-
-class Foo {
-  constructor(...names) {
-    this.names = names;
-  }
-}
-;
-
-var f = new Foo("a", "b", "c");
-
-eq("File \"splice_test.res\", line 71, characters 5-12", f.names, [
-      "a",
-      "b",
-      "c"
-    ]);
-
-function dynamicFoo(arr) {
-  var f = Caml_splice_call.spliceNewApply(Foo, [arr]);
-  eq("File \"splice_test.res\", line 76, characters 5-12", f.names, arr);
-}
-
-dynamicFoo([]);
-
-dynamicFoo(["a"]);
-
-dynamicFoo([
-      "a",
-      "b",
-      "c"
-    ]);
-
-var a$2 = [];
-
-a$2.push(1, 2, 3, 4);
-
-eq("File \"splice_test.res\", line 93, characters 7-14", a$2, [
-      1,
-      2,
-      3,
-      4
-    ]);
-
-function dynamic$1(arr) {
-  var a = [];
-  Caml_splice_call.spliceObjApply(a, "push", [
-        1,
-        arr
-      ]);
-  eq("File \"splice_test.res\", line 99, characters 7-14", a, Caml_array.concat({
-            hd: [1],
-            tl: {
-              hd: arr,
-              tl: /* [] */0
-            }
-          }));
-}
-
-dynamic$1([
-      2,
-      3,
-      4
-    ]);
-
-dynamic$1([]);
-
-dynamic$1([
-      1,
-      1,
-      3
-    ]);
-
-var Pipe = {
-  dynamic: dynamic$1
-};
-
-function f1(c) {
-  return Caml_splice_call.spliceApply(Math.max, [
-              1,
-              c
-            ]);
-}
-
-eq("File \"splice_test.res\", line 109, characters 3-10", Math.max(1, 2, 3), 3);
-
-eq("File \"splice_test.res\", line 110, characters 3-10", Math.max(1), 1);
-
-eq("File \"splice_test.res\", line 111, characters 3-10", Math.max(1, 1, 2, 3, 4, 5, 2, 3), 5);
-
-Mt.from_pair_suites("splice_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.Caml_splice_call = Caml_splice_call$1;
-exports.f00 = f00;
-exports.dynamic = dynamic;
-exports.dynamicNew = dynamicNew;
-exports.dynamicFoo = dynamicFoo;
-exports.Pipe = Pipe;
-exports.f1 = f1;
-/*  Not a pure module */
diff --git a/jscomp/test/splice_test.res b/jscomp/test/splice_test.res
deleted file mode 100644
index 447574b..0000000
--- a/jscomp/test/splice_test.res
+++ /dev/null
@@ -1,113 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-module Caml_splice_call = {}
-@variadic @val external f: (int, array<int>) => int = "Math.max"
-
-f(1, [])->ignore
-
-@variadic @send external send: (int, array<int>) => int = "send"
-
-let f00 = (a, b) => a->send([b])
-
-@send @variadic external push: (array<int>, int, array<int>) => unit = "push"
-
-/* This is only test, the binding maybe wrong
-  since in OCaml array'length is not mutable
-*/
-let () = {
-  let a = []
-  a->push(1, [2, 3, 4])
-
-  eq(__LOC__, a, [1, 2, 3, 4])
-}
-
-let dynamic = arr => {
-  let a = []
-  a->push(1, arr)
-  eq(__LOC__, a, Array.concat(list{[1], arr}))
-}
-
-dynamic([2, 3, 4])
-dynamic([])
-dynamic([1, 1, 3])
-
-/* Array constructor with a single parameter `x`
-   just makes an array with its length set to `x`,
-   so at least two parameters are needed
-*/
-@variadic @new external newArr: (int, int, array<int>) => array<int> = "Array"
-
-let () = {
-  let a = newArr(1, 2, [3, 4])
-  eq(__LOC__, a, [1, 2, 3, 4])
-}
-
-let dynamicNew = arr => {
-  let a = newArr(1, 2, arr)
-  eq(__LOC__, a, Array.concat(list{[1, 2], arr}))
-}
-
-dynamicNew([3, 4])
-dynamicNew([])
-dynamicNew([1, 3])
-
-%%raw(`
-class Foo {
-  constructor(...names) {
-    this.names = names;
-  }
-}
-`)
-
-type foo
-
-@variadic @new external newFoo: array<string> => foo = "Foo"
-@get external fooNames: foo => array<string> = "names"
-
-let () = {
-  let f = newFoo(["a", "b", "c"])
-  eq(__LOC__, fooNames(f), ["a", "b", "c"])
-}
-
-let dynamicFoo = arr => {
-  let f = newFoo(arr)
-  eq(__LOC__, fooNames(f), arr)
-}
-
-dynamicFoo([])
-dynamicFoo(["a"])
-dynamicFoo(["a", "b", "c"])
-
-module Pipe = {
-  @send @variadic external push: (array<int>, int, array<int>) => unit = "push"
-
-  /* This is only test, the binding maybe wrong
-     since in OCaml array'length is not mutable
- */
-  let () = {
-    let a = []
-    a->push(1, [2, 3, 4])
-
-    eq(__LOC__, a, [1, 2, 3, 4])
-  }
-
-  let dynamic = arr => {
-    let a = []
-    a->push(1, arr)
-    eq(__LOC__, a, Array.concat(list{[1], arr}))
-  }
-
-  dynamic([2, 3, 4])
-  dynamic([])
-  dynamic([1, 1, 3])
-}
-
-let f1 = (c: array<int>) => f(1, c)
-
-eq(__LOC__, f1([2, 3]), 3)
-eq(__LOC__, f1([]), 1)
-eq(__LOC__, f1([1, 2, 3, 4, 5, 2, 3]), 5)
-
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/stack_comp_test.js b/jscomp/test/stack_comp_test.js
deleted file mode 100644
index 65dadf2..0000000
--- a/jscomp/test/stack_comp_test.js
+++ /dev/null
@@ -1,452 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var Stack = require("../../lib/js/stack.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Mt_global = require("./mt_global.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(f, param) {
-  Mt_global.collect_eq(test_id, suites, f, param[0], param[1]);
-}
-
-function assert_(loc, v) {
-  eq(loc, [
-        v,
-        true
-      ]);
-}
-
-function to_list(s) {
-  var l = {
-    contents: /* [] */0
-  };
-  List.iter((function (x) {
-          l.contents = {
-            hd: x,
-            tl: l.contents
-          };
-        }), s.c);
-  return l.contents;
-}
-
-var S = {
-  Empty: Stack.Empty,
-  create: Stack.create,
-  push: Stack.push,
-  pop: Stack.pop,
-  top: Stack.top,
-  clear: Stack.clear,
-  copy: Stack.copy,
-  is_empty: Stack.is_empty,
-  length: Stack.length,
-  iter: Stack.iter,
-  fold: Stack.fold,
-  to_list: to_list
-};
-
-function does_raise(f, s) {
-  try {
-    Curry._1(f, s);
-    return false;
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === Stack.Empty) {
-      return true;
-    }
-    throw exn;
-  }
-}
-
-var s = {
-  c: /* [] */0,
-  len: 0
-};
-
-assert_("File \"stack_comp_test.res\", line 39, characters 10-17", to_list(s) === /* [] */0 && s.len === 0);
-
-Stack.push(1, s);
-
-assert_("File \"stack_comp_test.res\", line 41, characters 10-17", Caml_obj.equal(to_list(s), {
-          hd: 1,
-          tl: /* [] */0
-        }) && s.len === 1);
-
-Stack.push(2, s);
-
-assert_("File \"stack_comp_test.res\", line 43, characters 10-17", Caml_obj.equal(to_list(s), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }) && s.len === 2);
-
-Stack.push(3, s);
-
-assert_("File \"stack_comp_test.res\", line 45, characters 10-17", Caml_obj.equal(to_list(s), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }) && s.len === 3);
-
-Stack.push(4, s);
-
-assert_("File \"stack_comp_test.res\", line 47, characters 10-17", Caml_obj.equal(to_list(s), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }) && s.len === 4);
-
-assert_("File \"stack_comp_test.res\", line 48, characters 10-17", Stack.pop(s) === 4);
-
-assert_("File \"stack_comp_test.res\", line 49, characters 10-17", Caml_obj.equal(to_list(s), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: /* [] */0
-            }
-          }
-        }) && s.len === 3);
-
-assert_("File \"stack_comp_test.res\", line 50, characters 10-17", Stack.pop(s) === 3);
-
-assert_("File \"stack_comp_test.res\", line 51, characters 10-17", Caml_obj.equal(to_list(s), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: /* [] */0
-          }
-        }) && s.len === 2);
-
-assert_("File \"stack_comp_test.res\", line 52, characters 10-17", Stack.pop(s) === 2);
-
-assert_("File \"stack_comp_test.res\", line 53, characters 10-17", Caml_obj.equal(to_list(s), {
-          hd: 1,
-          tl: /* [] */0
-        }) && s.len === 1);
-
-assert_("File \"stack_comp_test.res\", line 54, characters 10-17", Stack.pop(s) === 1);
-
-assert_("File \"stack_comp_test.res\", line 55, characters 10-17", to_list(s) === /* [] */0 && s.len === 0);
-
-assert_("File \"stack_comp_test.res\", line 56, characters 10-17", does_raise(Stack.pop, s));
-
-var s$1 = {
-  c: /* [] */0,
-  len: 0
-};
-
-Stack.push(1, s$1);
-
-assert_("File \"stack_comp_test.res\", line 62, characters 10-17", Stack.pop(s$1) === 1);
-
-assert_("File \"stack_comp_test.res\", line 63, characters 10-17", does_raise(Stack.pop, s$1));
-
-Stack.push(2, s$1);
-
-assert_("File \"stack_comp_test.res\", line 65, characters 10-17", Stack.pop(s$1) === 2);
-
-assert_("File \"stack_comp_test.res\", line 66, characters 10-17", does_raise(Stack.pop, s$1));
-
-assert_("File \"stack_comp_test.res\", line 67, characters 10-17", s$1.len === 0);
-
-var s$2 = {
-  c: /* [] */0,
-  len: 0
-};
-
-Stack.push(1, s$2);
-
-assert_("File \"stack_comp_test.res\", line 73, characters 10-17", Stack.top(s$2) === 1);
-
-Stack.push(2, s$2);
-
-assert_("File \"stack_comp_test.res\", line 75, characters 10-17", Stack.top(s$2) === 2);
-
-Stack.push(3, s$2);
-
-assert_("File \"stack_comp_test.res\", line 77, characters 10-17", Stack.top(s$2) === 3);
-
-assert_("File \"stack_comp_test.res\", line 78, characters 10-17", Stack.top(s$2) === 3);
-
-assert_("File \"stack_comp_test.res\", line 79, characters 10-17", Stack.pop(s$2) === 3);
-
-assert_("File \"stack_comp_test.res\", line 80, characters 10-17", Stack.top(s$2) === 2);
-
-assert_("File \"stack_comp_test.res\", line 81, characters 10-17", Stack.pop(s$2) === 2);
-
-assert_("File \"stack_comp_test.res\", line 82, characters 10-17", Stack.top(s$2) === 1);
-
-assert_("File \"stack_comp_test.res\", line 83, characters 10-17", Stack.pop(s$2) === 1);
-
-assert_("File \"stack_comp_test.res\", line 84, characters 10-17", does_raise(Stack.top, s$2));
-
-assert_("File \"stack_comp_test.res\", line 85, characters 10-17", does_raise(Stack.top, s$2));
-
-var s$3 = {
-  c: /* [] */0,
-  len: 0
-};
-
-for(var i = 1; i <= 10; ++i){
-  Stack.push(i, s$3);
-}
-
-Stack.clear(s$3);
-
-assert_("File \"stack_comp_test.res\", line 94, characters 10-17", s$3.len === 0);
-
-assert_("File \"stack_comp_test.res\", line 95, characters 10-17", does_raise(Stack.pop, s$3));
-
-assert_("File \"stack_comp_test.res\", line 96, characters 10-17", Caml_obj.equal(s$3, {
-          c: /* [] */0,
-          len: 0
-        }));
-
-Stack.push(42, s$3);
-
-assert_("File \"stack_comp_test.res\", line 98, characters 10-17", Stack.pop(s$3) === 42);
-
-var s1 = {
-  c: /* [] */0,
-  len: 0
-};
-
-for(var i$1 = 1; i$1 <= 10; ++i$1){
-  Stack.push(i$1, s1);
-}
-
-var s2 = Stack.copy(s1);
-
-assert_("File \"stack_comp_test.res\", line 107, characters 10-17", Caml_obj.equal(to_list(s1), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: {
-                  hd: 5,
-                  tl: {
-                    hd: 6,
-                    tl: {
-                      hd: 7,
-                      tl: {
-                        hd: 8,
-                        tl: {
-                          hd: 9,
-                          tl: {
-                            hd: 10,
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }));
-
-assert_("File \"stack_comp_test.res\", line 108, characters 10-17", Caml_obj.equal(to_list(s2), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: {
-                  hd: 5,
-                  tl: {
-                    hd: 6,
-                    tl: {
-                      hd: 7,
-                      tl: {
-                        hd: 8,
-                        tl: {
-                          hd: 9,
-                          tl: {
-                            hd: 10,
-                            tl: /* [] */0
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }));
-
-assert_("File \"stack_comp_test.res\", line 109, characters 10-17", s1.len === 10);
-
-assert_("File \"stack_comp_test.res\", line 110, characters 10-17", s2.len === 10);
-
-for(var i$2 = 10; i$2 >= 1; --i$2){
-  assert_("File \"stack_comp_test.res\", line 112, characters 12-19", Stack.pop(s1) === i$2);
-}
-
-for(var i$3 = 10; i$3 >= 1; --i$3){
-  assert_("File \"stack_comp_test.res\", line 115, characters 12-19", Stack.pop(s2) === i$3);
-}
-
-var s$4 = {
-  c: /* [] */0,
-  len: 0
-};
-
-assert_("File \"stack_comp_test.res\", line 121, characters 10-17", s$4.c === /* [] */0);
-
-for(var i$4 = 1; i$4 <= 10; ++i$4){
-  Stack.push(i$4, s$4);
-  assert_("File \"stack_comp_test.res\", line 124, characters 12-19", s$4.len === i$4);
-  assert_("File \"stack_comp_test.res\", line 125, characters 12-19", s$4.c !== /* [] */0);
-}
-
-for(var i$5 = 10; i$5 >= 1; --i$5){
-  assert_("File \"stack_comp_test.res\", line 128, characters 12-19", s$4.len === i$5);
-  assert_("File \"stack_comp_test.res\", line 129, characters 12-19", s$4.c !== /* [] */0);
-  Stack.pop(s$4);
-}
-
-assert_("File \"stack_comp_test.res\", line 132, characters 10-17", s$4.len === 0);
-
-assert_("File \"stack_comp_test.res\", line 133, characters 10-17", s$4.c === /* [] */0);
-
-var s$5 = {
-  c: /* [] */0,
-  len: 0
-};
-
-for(var i$6 = 10; i$6 >= 1; --i$6){
-  Stack.push(i$6, s$5);
-}
-
-var i$7 = {
-  contents: 1
-};
-
-List.iter((function (j) {
-        assert_("File \"stack_comp_test.res\", line 143, characters 12-19", i$7.contents === j);
-        i$7.contents = i$7.contents + 1 | 0;
-      }), s$5.c);
-
-var s1$1 = {
-  c: /* [] */0,
-  len: 0
-};
-
-assert_("File \"stack_comp_test.res\", line 150, characters 10-17", s1$1.len === 0);
-
-assert_("File \"stack_comp_test.res\", line 151, characters 10-17", to_list(s1$1) === /* [] */0);
-
-var s2$1 = Stack.copy(s1$1);
-
-assert_("File \"stack_comp_test.res\", line 153, characters 10-17", s1$1.len === 0);
-
-assert_("File \"stack_comp_test.res\", line 154, characters 10-17", to_list(s1$1) === /* [] */0);
-
-assert_("File \"stack_comp_test.res\", line 155, characters 10-17", s2$1.len === 0);
-
-assert_("File \"stack_comp_test.res\", line 156, characters 10-17", to_list(s2$1) === /* [] */0);
-
-var s1$2 = {
-  c: /* [] */0,
-  len: 0
-};
-
-for(var i$8 = 1; i$8 <= 4; ++i$8){
-  Stack.push(i$8, s1$2);
-}
-
-assert_("File \"stack_comp_test.res\", line 165, characters 10-17", s1$2.len === 4);
-
-assert_("File \"stack_comp_test.res\", line 166, characters 10-17", Caml_obj.equal(to_list(s1$2), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }));
-
-var s2$2 = Stack.copy(s1$2);
-
-assert_("File \"stack_comp_test.res\", line 168, characters 10-17", s1$2.len === 4);
-
-assert_("File \"stack_comp_test.res\", line 169, characters 10-17", Caml_obj.equal(to_list(s1$2), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }));
-
-assert_("File \"stack_comp_test.res\", line 170, characters 10-17", s2$2.len === 4);
-
-assert_("File \"stack_comp_test.res\", line 171, characters 10-17", Caml_obj.equal(to_list(s2$2), {
-          hd: 1,
-          tl: {
-            hd: 2,
-            tl: {
-              hd: 3,
-              tl: {
-                hd: 4,
-                tl: /* [] */0
-              }
-            }
-          }
-        }));
-
-Mt.from_pair_suites("Stack_comp_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.assert_ = assert_;
-exports.S = S;
-exports.does_raise = does_raise;
-/* s Not a pure module */
diff --git a/jscomp/test/stack_comp_test.res b/jscomp/test/stack_comp_test.res
deleted file mode 100644
index 326af18..0000000
--- a/jscomp/test/stack_comp_test.res
+++ /dev/null
@@ -1,174 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Jeremie Dimino, Jane Street Europe */
-/*  */
-/* Copyright 2015 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the S Public License version 1.0. */
-/*  */
-/* ********************************************************************* */
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (f, (a, b)) => Mt_global.collect_eq(test_id, suites, f, a, b)
-let assert_ = (loc, v) => eq(loc, (v, true))
-
-module S = {
-  include Stack
-
-  let to_list = s => {
-    let l = ref(list{})
-    iter(x => l := list{x, ...l.contents}, s)
-    l.contents
-  } /* from bottom to top */
-}
-
-let does_raise = (f, s) =>
-  try {
-    ignore((f(s): int))
-    false
-  } catch {
-  | S.Empty => true
-  }
-
-let () = {
-  let s = S.create()
-  ()
-  assert_(__LOC__, S.to_list(s) == list{} && S.length(s) == 0)
-  S.push(1, s)
-  assert_(__LOC__, S.to_list(s) == list{1} && S.length(s) == 1)
-  S.push(2, s)
-  assert_(__LOC__, S.to_list(s) == list{1, 2} && S.length(s) == 2)
-  S.push(3, s)
-  assert_(__LOC__, S.to_list(s) == list{1, 2, 3} && S.length(s) == 3)
-  S.push(4, s)
-  assert_(__LOC__, S.to_list(s) == list{1, 2, 3, 4} && S.length(s) == 4)
-  assert_(__LOC__, S.pop(s) == 4)
-  assert_(__LOC__, S.to_list(s) == list{1, 2, 3} && S.length(s) == 3)
-  assert_(__LOC__, S.pop(s) == 3)
-  assert_(__LOC__, S.to_list(s) == list{1, 2} && S.length(s) == 2)
-  assert_(__LOC__, S.pop(s) == 2)
-  assert_(__LOC__, S.to_list(s) == list{1} && S.length(s) == 1)
-  assert_(__LOC__, S.pop(s) == 1)
-  assert_(__LOC__, S.to_list(s) == list{} && S.length(s) == 0)
-  assert_(__LOC__, does_raise(S.pop, s))
-}
-
-let () = {
-  let s = S.create()
-  S.push(1, s)
-  assert_(__LOC__, S.pop(s) == 1)
-  assert_(__LOC__, does_raise(S.pop, s))
-  S.push(2, s)
-  assert_(__LOC__, S.pop(s) == 2)
-  assert_(__LOC__, does_raise(S.pop, s))
-  assert_(__LOC__, S.length(s) == 0)
-}
-
-let () = {
-  let s = S.create()
-  S.push(1, s)
-  assert_(__LOC__, S.top(s) == 1)
-  S.push(2, s)
-  assert_(__LOC__, S.top(s) == 2)
-  S.push(3, s)
-  assert_(__LOC__, S.top(s) == 3)
-  assert_(__LOC__, S.top(s) == 3)
-  assert_(__LOC__, S.pop(s) == 3)
-  assert_(__LOC__, S.top(s) == 2)
-  assert_(__LOC__, S.pop(s) == 2)
-  assert_(__LOC__, S.top(s) == 1)
-  assert_(__LOC__, S.pop(s) == 1)
-  assert_(__LOC__, does_raise(S.top, s))
-  assert_(__LOC__, does_raise(S.top, s))
-}
-
-let () = {
-  let s = S.create()
-  for i in 1 to 10 {
-    S.push(i, s)
-  }
-  S.clear(s)
-  assert_(__LOC__, S.length(s) == 0)
-  assert_(__LOC__, does_raise(S.pop, s))
-  assert_(__LOC__, s == S.create())
-  S.push(42, s)
-  assert_(__LOC__, S.pop(s) == 42)
-}
-
-let () = {
-  let s1 = S.create()
-  for i in 1 to 10 {
-    S.push(i, s1)
-  }
-  let s2 = S.copy(s1)
-  assert_(__LOC__, S.to_list(s1) == list{1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-  assert_(__LOC__, S.to_list(s2) == list{1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
-  assert_(__LOC__, S.length(s1) == 10)
-  assert_(__LOC__, S.length(s2) == 10)
-  for i in 10 downto 1 {
-    assert_(__LOC__, S.pop(s1) == i)
-  }
-  for i in 10 downto 1 {
-    assert_(__LOC__, S.pop(s2) == i)
-  }
-}
-
-let () = {
-  let s = S.create()
-  assert_(__LOC__, S.is_empty(s))
-  for i in 1 to 10 {
-    S.push(i, s)
-    assert_(__LOC__, S.length(s) == i)
-    assert_(__LOC__, !S.is_empty(s))
-  }
-  for i in 10 downto 1 {
-    assert_(__LOC__, S.length(s) == i)
-    assert_(__LOC__, !S.is_empty(s))
-    ignore((S.pop(s): int))
-  }
-  assert_(__LOC__, S.length(s) == 0)
-  assert_(__LOC__, S.is_empty(s))
-}
-
-let () = {
-  let s = S.create()
-  for i in 10 downto 1 {
-    S.push(i, s)
-  }
-  let i = ref(1)
-  S.iter(j => {
-    assert_(__LOC__, i.contents == j)
-    incr(i)
-  }, s)
-}
-
-let () = {
-  let s1 = S.create()
-  assert_(__LOC__, S.length(s1) == 0)
-  assert_(__LOC__, S.to_list(s1) == list{})
-  let s2 = S.copy(s1)
-  assert_(__LOC__, S.length(s1) == 0)
-  assert_(__LOC__, S.to_list(s1) == list{})
-  assert_(__LOC__, S.length(s2) == 0)
-  assert_(__LOC__, S.to_list(s2) == list{})
-}
-
-let () = {
-  let s1 = S.create()
-  let _s2 = S.create()
-  for i in 1 to 4 {
-    S.push(i, s1)
-  }
-  assert_(__LOC__, S.length(s1) == 4)
-  assert_(__LOC__, S.to_list(s1) == list{1, 2, 3, 4})
-  let s2 = S.copy(s1)
-  assert_(__LOC__, S.length(s1) == 4)
-  assert_(__LOC__, S.to_list(s1) == list{1, 2, 3, 4})
-  assert_(__LOC__, S.length(s2) == 4)
-  assert_(__LOC__, S.to_list(s2) == list{1, 2, 3, 4})
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/stack_test.js b/jscomp/test/stack_test.js
deleted file mode 100644
index dc7dc1d..0000000
--- a/jscomp/test/stack_test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Stack = require("../../lib/js/stack.js");
-
-function to_list(v) {
-  var acc = /* [] */0;
-  while(v.c !== /* [] */0) {
-    acc = {
-      hd: Stack.pop(v),
-      tl: acc
-    };
-  };
-  return List.rev(acc);
-}
-
-function v(param) {
-  var v$1 = {
-    c: /* [] */0,
-    len: 0
-  };
-  Stack.push(3, v$1);
-  Stack.push(4, v$1);
-  Stack.push(1, v$1);
-  return to_list(v$1);
-}
-
-var suites_0 = [
-  "push_test",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: {
-                hd: 1,
-                tl: {
-                  hd: 4,
-                  tl: {
-                    hd: 3,
-                    tl: /* [] */0
-                  }
-                }
-              },
-              _1: v()
-            };
-    })
-];
-
-var suites = {
-  hd: suites_0,
-  tl: /* [] */0
-};
-
-Mt.from_pair_suites("Stack_test", suites);
-
-exports.to_list = to_list;
-exports.v = v;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/stack_test.res b/jscomp/test/stack_test.res
deleted file mode 100644
index 48cc753..0000000
--- a/jscomp/test/stack_test.res
+++ /dev/null
@@ -1,21 +0,0 @@
-open Stack
-
-let to_list = v => {
-  let acc = ref(list{})
-  while \"@@"(not, is_empty(v)) {
-    acc := list{pop(v), ...acc.contents}
-  }
-  List.rev(acc.contents)
-}
-
-let v = () => {
-  let v = create()
-  push(3, v)
-  push(4, v)
-  push(1, v)
-  to_list(v)
-}
-
-let suites = list{("push_test", _ => Mt.Eq(list{1, 4, 3}, v()))}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/stream_parser_test.js b/jscomp/test/stream_parser_test.js
deleted file mode 100644
index d6b4993..0000000
--- a/jscomp/test/stream_parser_test.js
+++ /dev/null
@@ -1,334 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Queue = require("../../lib/js/queue.js");
-var Genlex = require("../../lib/js/genlex.js");
-var Stream = require("../../lib/js/stream.js");
-var Caml_int32 = require("../../lib/js/caml_int32.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var Parse_error = /* @__PURE__ */Caml_exceptions.create("Stream_parser_test.Parse_error");
-
-function parse(token) {
-  var look_ahead = {
-    length: 0,
-    first: "Nil",
-    last: "Nil"
-  };
-  var token$1 = function (param) {
-    if (look_ahead.length !== 0) {
-      return Queue.pop(look_ahead);
-    }
-    try {
-      return Curry._1(token, undefined);
-    }
-    catch (exn){
-      return {
-              TAG: "Kwd",
-              _0: "=="
-            };
-    }
-  };
-  var parse_atom = function (param) {
-    var n = token$1();
-    switch (n.TAG) {
-      case "Kwd" :
-          if (n._0 === "(") {
-            var v = parse_expr_aux(parse_term_aux(parse_atom()));
-            var match = token$1();
-            if (match.TAG === "Kwd") {
-              if (match._0 === ")") {
-                return v;
-              }
-              throw {
-                    RE_EXN_ID: Parse_error,
-                    _1: "Unbalanced parens",
-                    Error: new Error()
-                  };
-            }
-            throw {
-                  RE_EXN_ID: Parse_error,
-                  _1: "Unbalanced parens",
-                  Error: new Error()
-                };
-          }
-          Queue.push(n, look_ahead);
-          throw {
-                RE_EXN_ID: Parse_error,
-                _1: "unexpected token",
-                Error: new Error()
-              };
-      case "Int" :
-          return n._0;
-      default:
-        Queue.push(n, look_ahead);
-        throw {
-              RE_EXN_ID: Parse_error,
-              _1: "unexpected token",
-              Error: new Error()
-            };
-    }
-  };
-  var parse_term_aux = function (e1) {
-    var e = token$1();
-    if (e.TAG === "Kwd") {
-      switch (e._0) {
-        case "*" :
-            return Math.imul(e1, parse_term_aux(parse_atom()));
-        case "/" :
-            return Caml_int32.div(e1, parse_term_aux(parse_atom()));
-        default:
-          Queue.push(e, look_ahead);
-          return e1;
-      }
-    } else {
-      Queue.push(e, look_ahead);
-      return e1;
-    }
-  };
-  var parse_expr_aux = function (e1) {
-    var e = token$1();
-    if (e.TAG === "Kwd") {
-      switch (e._0) {
-        case "+" :
-            return e1 + parse_expr_aux(parse_term_aux(parse_atom())) | 0;
-        case "-" :
-            return e1 - parse_expr_aux(parse_term_aux(parse_atom())) | 0;
-        default:
-          Queue.push(e, look_ahead);
-          return e1;
-      }
-    } else {
-      Queue.push(e, look_ahead);
-      return e1;
-    }
-  };
-  var r = parse_expr_aux(parse_term_aux(parse_atom()));
-  return [
-          r,
-          Queue.fold((function (acc, x) {
-                  return {
-                          hd: x,
-                          tl: acc
-                        };
-                }), /* [] */0, look_ahead)
-        ];
-}
-
-var lexer = Genlex.make_lexer({
-      hd: "(",
-      tl: {
-        hd: "*",
-        tl: {
-          hd: "/",
-          tl: {
-            hd: "+",
-            tl: {
-              hd: "-",
-              tl: {
-                hd: ")",
-                tl: /* [] */0
-              }
-            }
-          }
-        }
-      }
-    });
-
-function token(chars) {
-  var strm = lexer(chars);
-  return function (param) {
-    return Stream.next(strm);
-  };
-}
-
-function l_parse(token) {
-  var look_ahead = {
-    length: 0,
-    first: "Nil",
-    last: "Nil"
-  };
-  var token$1 = function (param) {
-    if (look_ahead.length !== 0) {
-      return Queue.pop(look_ahead);
-    }
-    try {
-      return Curry._1(token, undefined);
-    }
-    catch (exn){
-      return {
-              TAG: "Kwd",
-              _0: "=="
-            };
-    }
-  };
-  var parse_f_aux = function (_a) {
-    while(true) {
-      var a = _a;
-      var t = token$1();
-      if (t.TAG === "Kwd") {
-        switch (t._0) {
-          case "*" :
-              _a = Math.imul(a, parse_f());
-              continue ;
-          case "/" :
-              _a = Caml_int32.div(a, parse_f());
-              continue ;
-          default:
-            Queue.push(t, look_ahead);
-            return a;
-        }
-      } else {
-        Queue.push(t, look_ahead);
-        return a;
-      }
-    };
-  };
-  var parse_f = function (param) {
-    var i = token$1();
-    switch (i.TAG) {
-      case "Kwd" :
-          if (i._0 === "(") {
-            var v = parse_t_aux(parse_f_aux(parse_f()));
-            var t = token$1();
-            if (t.TAG === "Kwd") {
-              if (t._0 === ")") {
-                return v;
-              }
-              throw {
-                    RE_EXN_ID: Parse_error,
-                    _1: "Unbalanced )",
-                    Error: new Error()
-                  };
-            }
-            throw {
-                  RE_EXN_ID: Parse_error,
-                  _1: "Unbalanced )",
-                  Error: new Error()
-                };
-          }
-          throw {
-                RE_EXN_ID: Parse_error,
-                _1: "Unexpected token",
-                Error: new Error()
-              };
-      case "Int" :
-          return i._0;
-      default:
-        throw {
-              RE_EXN_ID: Parse_error,
-              _1: "Unexpected token",
-              Error: new Error()
-            };
-    }
-  };
-  var parse_t_aux = function (_a) {
-    while(true) {
-      var a = _a;
-      var t = token$1();
-      if (t.TAG === "Kwd") {
-        switch (t._0) {
-          case "+" :
-              _a = a + parse_f_aux(parse_f()) | 0;
-              continue ;
-          case "-" :
-              _a = a - parse_f_aux(parse_f()) | 0;
-              continue ;
-          default:
-            Queue.push(t, look_ahead);
-            return a;
-        }
-      } else {
-        Queue.push(t, look_ahead);
-        return a;
-      }
-    };
-  };
-  var r = parse_t_aux(parse_f_aux(parse_f()));
-  return [
-          r,
-          Queue.fold((function (acc, x) {
-                  return {
-                          hd: x,
-                          tl: acc
-                        };
-                }), /* [] */0, look_ahead)
-        ];
-}
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var match = parse(token(Stream.of_string("1 + 2 + (3  - 2) * 3 * 3  - 2 a")));
-
-eq("File \"stream_parser_test.res\", line 141, characters 5-12", [
-      match[0],
-      match[1]
-    ], [
-      10,
-      {
-        hd: {
-          TAG: "Ident",
-          _0: "a"
-        },
-        tl: /* [] */0
-      }
-    ]);
-
-eq("File \"stream_parser_test.res\", line 142, characters 5-12", [
-      2,
-      {
-        hd: {
-          TAG: "Kwd",
-          _0: "=="
-        },
-        tl: /* [] */0
-      }
-    ], parse(token(Stream.of_string("3 - 2  - 1"))));
-
-eq("File \"stream_parser_test.res\", line 143, characters 5-12", [
-      0,
-      {
-        hd: {
-          TAG: "Kwd",
-          _0: "=="
-        },
-        tl: /* [] */0
-      }
-    ], l_parse(token(Stream.of_string("3 - 2  - 1"))));
-
-Mt.from_pair_suites("Stream_parser_test", suites.contents);
-
-exports.Parse_error = Parse_error;
-exports.parse = parse;
-exports.lexer = lexer;
-exports.token = token;
-exports.l_parse = l_parse;
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/* lexer Not a pure module */
diff --git a/jscomp/test/stream_parser_test.res b/jscomp/test/stream_parser_test.res
deleted file mode 100644
index bf6f821..0000000
--- a/jscomp/test/stream_parser_test.res
+++ /dev/null
@@ -1,146 +0,0 @@
-exception Parse_error(string)
-
-/**
-
-expr 
-| expr1  expr_aux 
-expr_aux 
-| + expr 
-expr1
-| expr2 expr1_aux 
-expr1_aux
-| * expr1
-
-expr2
-| Int
-| ( expr )
-
-*/
-let parse = (token: unit => Genlex.token) => {
-  let look_ahead = Queue.create()
-  let token = () =>
-    if Queue.is_empty(look_ahead) {
-      try token() catch {
-      | _ => Kwd("==")
-      }
-    } else {
-      Queue.pop(look_ahead)
-    }
-  let push = e => Queue.push(e, look_ahead)
-  let rec parse_atom = () =>
-    switch token() {
-    | Int(n) => n
-    | Kwd("(") =>
-      let v = parse_expr()
-      switch token() {
-      | Kwd(")") => v
-      | _ => raise(Parse_error("Unbalanced parens"))
-      }
-    | e =>
-      push(e)
-      raise(Parse_error("unexpected token"))
-    }
-  and parse_term = () => parse_term_aux(parse_atom())
-  and parse_term_aux = e1 =>
-    switch token() {
-    | Kwd("*") => e1 * parse_term()
-    | Kwd("/") => e1 / parse_term()
-    | e =>
-      push(e)
-      e1
-    }
-  and parse_expr = () => parse_expr_aux(parse_term())
-  and parse_expr_aux = e1 =>
-    switch token() {
-    | Kwd("+") => e1 + parse_expr()
-    | Kwd("-") => e1 - parse_expr()
-    | e =>
-      /* [%debugger]; */ push(e)
-      e1
-    }
-
-  let r = parse_expr()
-  (r, Queue.fold((acc, x) => list{x, ...acc}, list{}, look_ahead))
-}
-let lexer = Genlex.make_lexer(list{"(", "*", "/", "+", "-", ")"})
-let token = chars => {
-  let strm = lexer(chars)
-  () => Stream.next(strm)
-}
-
-/*
-
-http://www.engr.mun.ca/~theo/Misc/exp_parsing.htm
-
-E 
-| T { + T}
-T 
-| F { * F}
-F
-| Int 
-| (E)
-
-*/
-
-let l_parse = (token: unit => Genlex.token) => {
-  let look_ahead = Queue.create()
-  let token = () =>
-    if Queue.is_empty(look_ahead) {
-      try token() catch {
-      | _ => Kwd("==")
-      }
-    } else {
-      Queue.pop(look_ahead)
-    }
-  let push = e => Queue.push(e, look_ahead)
-  let rec parse_e = () => parse_t_aux(parse_t())
-  and parse_t_aux = a =>
-    switch token() {
-    | Kwd("+") => parse_t_aux(a + parse_t())
-    | Kwd("-") => parse_t_aux(a - parse_t())
-    | t =>
-      push(t)
-      a
-    }
-  and parse_t = () => parse_f_aux(parse_f())
-  and parse_f_aux = a =>
-    switch token() {
-    | Kwd("*") => parse_f_aux(a * parse_f())
-    | Kwd("/") => parse_f_aux(a / parse_f())
-    | t =>
-      push(t)
-      a
-    }
-  and parse_f = () =>
-    switch token() {
-    | Int(i) => i
-    | Kwd("(") =>
-      let v = parse_e()
-      switch token() {
-      | Kwd(")") => v
-      | t => raise(Parse_error("Unbalanced )"))
-      }
-    | t => raise(Parse_error("Unexpected token"))
-    }
-
-  let r = parse_e()
-  (r, Queue.fold((acc, x) => list{x, ...acc}, list{}, look_ahead))
-}
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let () = {
-  let (a, b) = parse(token(Stream.of_string("1 + 2 + (3  - 2) * 3 * 3  - 2 a")))
-
-  eq(__LOC__, (a, b), (10, list{Ident("a")}))
-  eq(__LOC__, (2, list{Genlex.Kwd("==")}), parse(token(Stream.of_string("3 - 2  - 1"))))
-  eq(__LOC__, (0, list{Genlex.Kwd("==")}), l_parse(token(Stream.of_string("3 - 2  - 1"))))
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/string_bound_get_test.js b/jscomp/test/string_bound_get_test.js
deleted file mode 100644
index 6e5079d..0000000
--- a/jscomp/test/string_bound_get_test.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-
-var v = "ghos";
-
-var u_a = Caml_string.get(v, 0);
-
-function u_b(param) {
-  return Caml_string.get(v, -1);
-}
-
-var u_c = Caml_string.get("ghos", 0);
-
-function u_d(param) {
-  return Caml_string.get("ghos", -1);
-}
-
-var u_e = Caml_bytes.create(32);
-
-var u_f = Caml_bytes.get(u_e, 0);
-
-function u_g(param) {
-  return Caml_bytes.get(u_e, -1);
-}
-
-exports.v = v;
-exports.u_a = u_a;
-exports.u_b = u_b;
-exports.u_c = u_c;
-exports.u_d = u_d;
-exports.u_e = u_e;
-exports.u_f = u_f;
-exports.u_g = u_g;
-/* No side effect */
diff --git a/jscomp/test/string_bound_get_test.res b/jscomp/test/string_bound_get_test.res
deleted file mode 100644
index 6a6b5cc..0000000
--- a/jscomp/test/string_bound_get_test.res
+++ /dev/null
@@ -1,14 +0,0 @@
-let v = "ghos"
-
-let u_a = String.get(v, 0)
-
-let u_b = () => String.get(v, -1)
-let u_c = String.get("ghos", 0)
-
-let u_d = () => String.get("ghos", -1)
-
-let u_e = Bytes.create(32)
-
-let u_f = Bytes.get(u_e, 0)
-
-let u_g = () => Bytes.get(u_e, -1)
diff --git a/jscomp/test/string_constant_compare.js b/jscomp/test/string_constant_compare.js
deleted file mode 100644
index 453349d..0000000
--- a/jscomp/test/string_constant_compare.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var a1 = true;
-
-var a2 = false;
-
-var a3 = "'" === "\'";
-
-var a4 = "'" !== "\'";
-
-exports.a1 = a1;
-exports.a2 = a2;
-exports.a3 = a3;
-exports.a4 = a4;
-/* a1 Not a pure module */
diff --git a/jscomp/test/string_constant_compare.res b/jscomp/test/string_constant_compare.res
deleted file mode 100644
index 27f96fa..0000000
--- a/jscomp/test/string_constant_compare.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let a1 = "'" == "'"
-let a2 = "'" != "'"
-let a3 = "'" == "\'"
-let a4 = "'" != "\'"
diff --git a/jscomp/test/string_get_set_test.js b/jscomp/test/string_get_set_test.js
deleted file mode 100644
index e3c044a..0000000
--- a/jscomp/test/string_get_set_test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-
-Mt.from_pair_suites("string_get_set_test.res", {
-      hd: [
-        "File \"string_get_set_test.res\", line 4, characters 36-43",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: Caml_string.get("h", 0),
-                    _1: /* 'h' */104
-                  };
-          })
-      ],
-      tl: /* [] */0
-    });
-
-/*  Not a pure module */
diff --git a/jscomp/test/string_get_set_test.res b/jscomp/test/string_get_set_test.res
deleted file mode 100644
index 6399809..0000000
--- a/jscomp/test/string_get_set_test.res
+++ /dev/null
@@ -1,66 +0,0 @@
-@@bs.config({no_export: no_export})
-let \".%()" = (s: string, i) => String.get(s, i)
-
-Mt.from_pair_suites(__FILE__, list{(__LOC__, _ => Eq(\".%()"("h", 0), 'h'))})
-/* external caml_string_get_16 : string -> int -> int = "%caml_string_get16"
-external caml_string_get_32 : string -> int -> int32 = "%caml_string_get32"
-external caml_string_get_64 : string -> int -> int64 = "%caml_string_get64" */
-
-/* TODO: endian-aware ? */
-/* ;; Mt.from_pair_suites __MODULE__ Mt.[
-    __LOC__ , (fun _ -> Eq (caml_string_get_16 "2\000" 0, 50));
-    __LOC__ , (fun _ -> Eq (caml_string_get_16 "20" 0, 12338));
-    __LOC__, (fun _ -> Eq(caml_string_get_32 "0123" 0, 858927408l));
-    __LOC__, (fun _ -> Eq(caml_string_get_32 "0123" 0, 858927408l));
-    __LOC__, (fun _ -> Eq(caml_string_get_32 "3210" 0, 808530483l));
-    __LOC__, (fun _ -> Eq(caml_string_get_64 "12345678" 0, 4050765991979987505L));
-    __LOC__, (fun _ -> Eq(caml_string_get_64 "87654321" 0, 3544952156018063160L))
-] */
-
-/* (\** does not make sense under immutable string setting *\) */
-/* external caml_string_set_16 : string -> int -> int -> unit = */
-/* "%caml_string_set16" */
-/* external caml_string_set_32 : string -> int -> int32 -> unit = */
-/* "%caml_string_set32" */
-/* external caml_string_set_64 : string -> int -> int64 -> unit = */
-/* "%caml_string_set64" */
-
-/* let s = String.make 10 '\x00' */
-/* let empty_s = "" */
-
-/* let assert_bound_check2 f v1 v2 = */
-/* try */
-/* ignore(f v1 v2); */
-/* assert false */
-/* with */
-/* | Invalid_argument("index out of bounds") -> () */
-
-/* let assert_bound_check3 f v1 v2 v3 = */
-/* try */
-/* ignore(f v1 v2 v3); */
-/* assert false */
-/* with */
-/* | Invalid_argument("index out of bounds") -> () */
-
-/* let f () = */
-/* assert_bound_check2 caml_string_get_16 s (-1); */
-/* assert_bound_check2 caml_string_get_16 s 9; */
-/* assert_bound_check2 caml_string_get_32 s (-1); */
-/* assert_bound_check2 caml_string_get_32 s 7; */
-/* assert_bound_check2 caml_string_get_64 s (-1); */
-/* assert_bound_check2 caml_string_get_64 s 3; */
-
-/* assert_bound_check3 caml_string_set_16 s (-1) 0; */
-/* assert_bound_check3 caml_string_set_16 s 9 0; */
-/* assert_bound_check3 caml_string_set_32 s (-1) 0l; */
-/* assert_bound_check3 caml_string_set_32 s 7 0l; */
-/* assert_bound_check3 caml_string_set_64 s (-1) 0L; */
-/* assert_bound_check3 caml_string_set_64 s 3 0L; */
-
-/* assert_bound_check2 caml_string_get_16 empty_s 0; */
-/* assert_bound_check2 caml_string_get_32 empty_s 0; */
-/* assert_bound_check2 caml_string_get_64 empty_s 0; */
-
-/* assert_bound_check3 caml_string_set_16 empty_s 0 0; */
-/* assert_bound_check3 caml_string_set_32 empty_s 0 0l; */
-/* assert_bound_check3 caml_string_set_64 empty_s 0 0L */
diff --git a/jscomp/test/string_runtime_test.js b/jscomp/test/string_runtime_test.js
deleted file mode 100644
index e6f5944..0000000
--- a/jscomp/test/string_runtime_test.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var Bytes = require("../../lib/js/bytes.js");
-var Test_char = require("./test_char.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-
-var suites_0 = [
-  "?is_printable",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: Test_char.caml_is_printable(/* 'a' */97),
-              _1: true
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "?string_of_bytes",
-    (function (param) {
-        var match = List.split(List.map((function (x) {
-                    var b = Caml_bytes.create(x);
-                    Bytes.fill(b, 0, x, /* 'c' */99);
-                    return [
-                            Bytes.to_string(b),
-                            Bytes.unsafe_to_string(Bytes.init(x, (function (param) {
-                                        return /* 'c' */99;
-                                      })))
-                          ];
-                  }), {
-                  hd: 1000,
-                  tl: {
-                    hd: 1024,
-                    tl: {
-                      hd: 1025,
-                      tl: {
-                        hd: 4095,
-                        tl: {
-                          hd: 4096,
-                          tl: {
-                            hd: 5000,
-                            tl: {
-                              hd: 10000,
-                              tl: /* [] */0
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }));
-        return {
-                TAG: "Eq",
-                _0: match[0],
-                _1: match[1]
-              };
-      })
-  ],
-  tl: /* [] */0
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("String_runtime_test", suites);
-
-var S;
-
-var B;
-
-exports.S = S;
-exports.B = B;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/string_runtime_test.res b/jscomp/test/string_runtime_test.res
deleted file mode 100644
index 112b92a..0000000
--- a/jscomp/test/string_runtime_test.res
+++ /dev/null
@@ -1,35 +0,0 @@
-module S = Caml_string
-/** TODO: performance could be improved, however, 
-    this function is not in critical Path
- */
-module B = Caml_bytes
-
-/** TODO: performance could be improved, however, 
-    this function is not in critical Path
- */
-let suites = {
-  open Mt
-  list{
-    /* "string_of_char_array", (fun _ -> 
-    Eq(S.caml_string_of_char_array [|'a';'b';'c'|], "abc")
-                          ); */
-    ("?is_printable", _ => Eq(Test_char.caml_is_printable('a'), true)),
-    (
-      "?string_of_bytes",
-      _ => {
-        let f = len => {
-          let b = Bytes.create(len)
-          Bytes.fill(b, 0, len, 'c')
-          (Bytes.to_string(b), String.init(len, _ => 'c'))
-        }
-        let (a, b) = \"@@"(
-          List.split,
-          List.map(x => f(x), list{1000, 1024, 1025, 4095, 4096, 5000, 10000}),
-        )
-        Eq(a, b)
-      },
-    ),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/string_set.js b/jscomp/test/string_set.js
deleted file mode 100644
index dd33e53..0000000
--- a/jscomp/test/string_set.js
+++ /dev/null
@@ -1,349 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var $$String = require("../../lib/js/string.js");
-var Set_gen = require("./set_gen.js");
-
-function split(x, tree) {
-  if (typeof tree !== "object") {
-    return [
-            "Empty",
-            false,
-            "Empty"
-          ];
-  }
-  var r = tree._2;
-  var v = tree._1;
-  var l = tree._0;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    return [
-            l,
-            true,
-            r
-          ];
-  }
-  if (c < 0) {
-    var match = split(x, l);
-    return [
-            match[0],
-            match[1],
-            Set_gen.internal_join(match[2], v, r)
-          ];
-  }
-  var match$1 = split(x, r);
-  return [
-          Set_gen.internal_join(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
-}
-
-function add(x, tree) {
-  if (typeof tree !== "object") {
-    return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: "Empty",
-            _3: 1
-          };
-  }
-  var r = tree._2;
-  var v = tree._1;
-  var l = tree._0;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    return tree;
-  } else if (c < 0) {
-    return Set_gen.internal_bal(add(x, l), v, r);
-  } else {
-    return Set_gen.internal_bal(l, v, add(x, r));
-  }
-}
-
-function union(s1, s2) {
-  if (typeof s1 !== "object") {
-    return s2;
-  }
-  var h1 = s1._3;
-  var v1 = s1._1;
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var h2 = s2._3;
-  var v2 = s2._1;
-  if (h1 >= h2) {
-    if (h2 === 1) {
-      return add(v2, s1);
-    }
-    var match = split(v1, s2);
-    return Set_gen.internal_join(union(s1._0, match[0]), v1, union(s1._2, match[2]));
-  }
-  if (h1 === 1) {
-    return add(v1, s2);
-  }
-  var match$1 = split(v2, s1);
-  return Set_gen.internal_join(union(match$1[0], s2._0), v2, union(match$1[2], s2._2));
-}
-
-function inter(s1, s2) {
-  if (typeof s1 !== "object") {
-    return "Empty";
-  }
-  if (typeof s2 !== "object") {
-    return "Empty";
-  }
-  var r1 = s1._2;
-  var v1 = s1._1;
-  var l1 = s1._0;
-  var match = split(v1, s2);
-  var l2 = match[0];
-  if (match[1]) {
-    return Set_gen.internal_join(inter(l1, l2), v1, inter(r1, match[2]));
-  } else {
-    return Set_gen.internal_concat(inter(l1, l2), inter(r1, match[2]));
-  }
-}
-
-function diff(s1, s2) {
-  if (typeof s1 !== "object") {
-    return "Empty";
-  }
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var r1 = s1._2;
-  var v1 = s1._1;
-  var l1 = s1._0;
-  var match = split(v1, s2);
-  var l2 = match[0];
-  if (match[1]) {
-    return Set_gen.internal_concat(diff(l1, l2), diff(r1, match[2]));
-  } else {
-    return Set_gen.internal_join(diff(l1, l2), v1, diff(r1, match[2]));
-  }
-}
-
-function mem(x, _tree) {
-  while(true) {
-    var tree = _tree;
-    if (typeof tree !== "object") {
-      return false;
-    }
-    var c = Caml.string_compare(x, tree._1);
-    if (c === 0) {
-      return true;
-    }
-    _tree = c < 0 ? tree._0 : tree._2;
-    continue ;
-  };
-}
-
-function remove(x, tree) {
-  if (typeof tree !== "object") {
-    return "Empty";
-  }
-  var r = tree._2;
-  var v = tree._1;
-  var l = tree._0;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    return Set_gen.internal_merge(l, r);
-  } else if (c < 0) {
-    return Set_gen.internal_bal(remove(x, l), v, r);
-  } else {
-    return Set_gen.internal_bal(l, v, remove(x, r));
-  }
-}
-
-function compare(s1, s2) {
-  return Set_gen.compare($$String.compare, s1, s2);
-}
-
-function equal(s1, s2) {
-  return Set_gen.compare($$String.compare, s1, s2) === 0;
-}
-
-function subset(_s1, _s2) {
-  while(true) {
-    var s2 = _s2;
-    var s1 = _s1;
-    if (typeof s1 !== "object") {
-      return true;
-    }
-    var r1 = s1._2;
-    var v1 = s1._1;
-    var l1 = s1._0;
-    if (typeof s2 !== "object") {
-      return false;
-    }
-    var r2 = s2._2;
-    var l2 = s2._0;
-    var c = Caml.string_compare(v1, s2._1);
-    if (c === 0) {
-      if (!subset(l1, l2)) {
-        return false;
-      }
-      _s2 = r2;
-      _s1 = r1;
-      continue ;
-    }
-    if (c < 0) {
-      if (!subset({
-              TAG: "Node",
-              _0: l1,
-              _1: v1,
-              _2: "Empty",
-              _3: 0
-            }, l2)) {
-        return false;
-      }
-      _s1 = r1;
-      continue ;
-    }
-    if (!subset({
-            TAG: "Node",
-            _0: "Empty",
-            _1: v1,
-            _2: r1,
-            _3: 0
-          }, r2)) {
-      return false;
-    }
-    _s1 = l1;
-    continue ;
-  };
-}
-
-function find(x, _tree) {
-  while(true) {
-    var tree = _tree;
-    if (typeof tree !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = tree._1;
-    var c = Caml.string_compare(x, v);
-    if (c === 0) {
-      return v;
-    }
-    _tree = c < 0 ? tree._0 : tree._2;
-    continue ;
-  };
-}
-
-function of_list(l) {
-  if (!l) {
-    return "Empty";
-  }
-  var match = l.tl;
-  var x0 = l.hd;
-  if (!match) {
-    return Set_gen.singleton(x0);
-  }
-  var match$1 = match.tl;
-  var x1 = match.hd;
-  if (!match$1) {
-    return add(x1, Set_gen.singleton(x0));
-  }
-  var match$2 = match$1.tl;
-  var x2 = match$1.hd;
-  if (!match$2) {
-    return add(x2, add(x1, Set_gen.singleton(x0)));
-  }
-  var match$3 = match$2.tl;
-  var x3 = match$2.hd;
-  if (match$3) {
-    if (match$3.tl) {
-      return Set_gen.of_sorted_list(List.sort_uniq($$String.compare, l));
-    } else {
-      return add(match$3.hd, add(x3, add(x2, add(x1, Set_gen.singleton(x0)))));
-    }
-  } else {
-    return add(x3, add(x2, add(x1, Set_gen.singleton(x0))));
-  }
-}
-
-function of_array(l) {
-  return $$Array.fold_left((function (acc, x) {
-                return add(x, acc);
-              }), "Empty", l);
-}
-
-function invariant(t) {
-  Set_gen.check(t);
-  return Set_gen.is_ordered($$String.compare, t);
-}
-
-var compare_elt = $$String.compare;
-
-var empty = "Empty";
-
-var is_empty = Set_gen.is_empty;
-
-var iter = Set_gen.iter;
-
-var fold = Set_gen.fold;
-
-var for_all = Set_gen.for_all;
-
-var exists = Set_gen.exists;
-
-var singleton = Set_gen.singleton;
-
-var cardinal = Set_gen.cardinal;
-
-var elements = Set_gen.elements;
-
-var min_elt = Set_gen.min_elt;
-
-var max_elt = Set_gen.max_elt;
-
-var choose = Set_gen.choose;
-
-var partition = Set_gen.partition;
-
-var filter = Set_gen.filter;
-
-var of_sorted_list = Set_gen.of_sorted_list;
-
-var of_sorted_array = Set_gen.of_sorted_array;
-
-exports.compare_elt = compare_elt;
-exports.empty = empty;
-exports.is_empty = is_empty;
-exports.iter = iter;
-exports.fold = fold;
-exports.for_all = for_all;
-exports.exists = exists;
-exports.singleton = singleton;
-exports.cardinal = cardinal;
-exports.elements = elements;
-exports.min_elt = min_elt;
-exports.max_elt = max_elt;
-exports.choose = choose;
-exports.partition = partition;
-exports.filter = filter;
-exports.of_sorted_list = of_sorted_list;
-exports.of_sorted_array = of_sorted_array;
-exports.split = split;
-exports.add = add;
-exports.union = union;
-exports.inter = inter;
-exports.diff = diff;
-exports.mem = mem;
-exports.remove = remove;
-exports.compare = compare;
-exports.equal = equal;
-exports.subset = subset;
-exports.find = find;
-exports.of_list = of_list;
-exports.of_array = of_array;
-exports.invariant = invariant;
-/* No side effect */
diff --git a/jscomp/test/string_set.res b/jscomp/test/string_set.res
deleted file mode 100644
index c8e41c0..0000000
--- a/jscomp/test/string_set.res
+++ /dev/null
@@ -1,204 +0,0 @@
-/* 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
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * 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 elt = string
-let compare_elt = String.compare
-type t = Set_gen.t<elt>
-
-let empty = Set_gen.empty
-let is_empty = Set_gen.is_empty
-let iter = Set_gen.iter
-let fold = Set_gen.fold
-let for_all = Set_gen.for_all
-let exists = Set_gen.exists
-let singleton = Set_gen.singleton
-let cardinal = Set_gen.cardinal
-let elements = Set_gen.elements
-let min_elt = Set_gen.min_elt
-let max_elt = Set_gen.max_elt
-let choose = Set_gen.choose
-let of_sorted_list = Set_gen.of_sorted_list
-let of_sorted_array = Set_gen.of_sorted_array
-let partition = Set_gen.partition
-let filter = Set_gen.filter
-let of_sorted_list = Set_gen.of_sorted_list
-let of_sorted_array = Set_gen.of_sorted_array
-
-let rec split = (x, tree: Set_gen.t<_>): (Set_gen.t<_>, bool, Set_gen.t<_>) =>
-  switch tree {
-  | Empty => (Empty, false, Empty)
-  | Node(l, v, r, _) =>
-    let c = compare_elt(x, v)
-    if c == 0 {
-      (l, true, r)
-    } else if c < 0 {
-      let (ll, pres, rl) = split(x, l)
-      (ll, pres, Set_gen.internal_join(rl, v, r))
-    } else {
-      let (lr, pres, rr) = split(x, r)
-      (Set_gen.internal_join(l, v, lr), pres, rr)
-    }
-  }
-let rec add = (x, tree: Set_gen.t<_>): Set_gen.t<_> =>
-  switch tree {
-  | Empty => Node(Empty, x, Empty, 1)
-  | Node(l, v, r, _) as t =>
-    let c = compare_elt(x, v)
-    if c == 0 {
-      t
-    } else if c < 0 {
-      Set_gen.internal_bal(add(x, l), v, r)
-    } else {
-      Set_gen.internal_bal(l, v, add(x, r))
-    }
-  }
-
-let rec union = (s1: Set_gen.t<_>, s2: Set_gen.t<_>): Set_gen.t<_> =>
-  switch (s1, s2) {
-  | (Empty, t2) => t2
-  | (t1, Empty) => t1
-  | (Node(l1, v1, r1, h1), Node(l2, v2, r2, h2)) =>
-    if h1 >= h2 {
-      if h2 == 1 {
-        add(v2, s1)
-      } else {
-        let (l2, _, r2) = split(v1, s2)
-        Set_gen.internal_join(union(l1, l2), v1, union(r1, r2))
-      }
-    } else if h1 == 1 {
-      add(v1, s2)
-    } else {
-      let (l1, _, r1) = split(v2, s1)
-      Set_gen.internal_join(union(l1, l2), v2, union(r1, r2))
-    }
-  }
-
-let rec inter = (s1: Set_gen.t<_>, s2: Set_gen.t<_>): Set_gen.t<_> =>
-  switch (s1, s2) {
-  | (Empty, t2) => Empty
-  | (t1, Empty) => Empty
-  | (Node(l1, v1, r1, _), t2) =>
-    switch split(v1, t2) {
-    | (l2, false, r2) => Set_gen.internal_concat(inter(l1, l2), inter(r1, r2))
-    | (l2, true, r2) => Set_gen.internal_join(inter(l1, l2), v1, inter(r1, r2))
-    }
-  }
-
-let rec diff = (s1: Set_gen.t<_>, s2: Set_gen.t<_>): Set_gen.t<_> =>
-  switch (s1, s2) {
-  | (Empty, t2) => Empty
-  | (t1, Empty) => t1
-  | (Node(l1, v1, r1, _), t2) =>
-    switch split(v1, t2) {
-    | (l2, false, r2) => Set_gen.internal_join(diff(l1, l2), v1, diff(r1, r2))
-    | (l2, true, r2) => Set_gen.internal_concat(diff(l1, l2), diff(r1, r2))
-    }
-  }
-
-let rec mem = (x, tree: Set_gen.t<_>) =>
-  switch tree {
-  | Empty => false
-  | Node(l, v, r, _) =>
-    let c = compare_elt(x, v)
-    c == 0 ||
-      mem(
-        x,
-        if c < 0 {
-          l
-        } else {
-          r
-        },
-      )
-  }
-
-let rec remove = (x, tree: Set_gen.t<_>): Set_gen.t<_> =>
-  switch tree {
-  | Empty => Empty
-  | Node(l, v, r, _) =>
-    let c = compare_elt(x, v)
-    if c == 0 {
-      Set_gen.internal_merge(l, r)
-    } else if c < 0 {
-      Set_gen.internal_bal(remove(x, l), v, r)
-    } else {
-      Set_gen.internal_bal(l, v, remove(x, r))
-    }
-  }
-
-let compare = (s1, s2) => Set_gen.compare(compare_elt, s1, s2)
-
-let equal = (s1, s2) => compare(s1, s2) == 0
-
-let rec subset = (s1: Set_gen.t<_>, s2: Set_gen.t<_>) =>
-  switch (s1, s2) {
-  | (Empty, _) => true
-  | (_, Empty) => false
-  | (Node(l1, v1, r1, _), Node(l2, v2, r2, _) as t2) =>
-    let c = compare_elt(v1, v2)
-    if c == 0 {
-      subset(l1, l2) && subset(r1, r2)
-    } else if c < 0 {
-      subset(Node(l1, v1, Empty, 0), l2) && subset(r1, t2)
-    } else {
-      subset(Node(Empty, v1, r1, 0), r2) && subset(l1, t2)
-    }
-  }
-
-let rec find = (x, tree: Set_gen.t<_>) =>
-  switch tree {
-  | Empty => raise(Not_found)
-  | Node(l, v, r, _) =>
-    let c = compare_elt(x, v)
-    if c == 0 {
-      v
-    } else {
-      find(
-        x,
-        if c < 0 {
-          l
-        } else {
-          r
-        },
-      )
-    }
-  }
-
-let of_list = l =>
-  switch l {
-  | list{} => empty
-  | list{x0} => singleton(x0)
-  | list{x0, x1} => add(x1, singleton(x0))
-  | list{x0, x1, x2} => add(x2, add(x1, singleton(x0)))
-  | list{x0, x1, x2, x3} => add(x3, add(x2, add(x1, singleton(x0))))
-  | list{x0, x1, x2, x3, x4} => add(x4, add(x3, add(x2, add(x1, singleton(x0)))))
-  | _ => of_sorted_list(List.sort_uniq(compare_elt, l))
-  }
-
-let of_array = l => Array.fold_left((acc, x) => add(x, acc), empty, l)
-
-/* also check order */
-let invariant = t => {
-  Set_gen.check(t)
-  Set_gen.is_ordered(compare_elt, t)
-}
diff --git a/jscomp/test/string_set_test.js b/jscomp/test/string_set_test.js
deleted file mode 100644
index 724e4e1..0000000
--- a/jscomp/test/string_set_test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var String_set = require("./string_set.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var s = String_set.empty;
-
-for(var i = 0; i <= 99999; ++i){
-  s = String_set.add(String(i), s);
-}
-
-eq("File \"string_set_test.res\", line 15, characters 5-12", String_set.cardinal(s), 100000);
-
-Mt.from_pair_suites("String_set_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-/*  Not a pure module */
diff --git a/jscomp/test/string_set_test.res b/jscomp/test/string_set_test.res
deleted file mode 100644
index d2ca0a4..0000000
--- a/jscomp/test/string_set_test.res
+++ /dev/null
@@ -1,18 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let () = {
-  let number = 1_000_00
-  let s = ref(String_set.empty)
-  for i in 0 to number - 1 {
-    s := String_set.add(string_of_int(i), s.contents)
-  }
-  eq(__LOC__, String_set.cardinal(s.contents), number)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/string_test.js b/jscomp/test/string_test.js
deleted file mode 100644
index 30571dd..0000000
--- a/jscomp/test/string_test.js
+++ /dev/null
@@ -1,388 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var List = require("../../lib/js/list.js");
-var $$Array = require("../../lib/js/array.js");
-var Bytes = require("../../lib/js/bytes.js");
-var $$String = require("../../lib/js/string.js");
-var Ext_string_test = require("./ext_string_test.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function ff(x) {
-  var a;
-  switch (x) {
-    case "0" :
-    case "1" :
-    case "2" :
-        a = 3;
-        break;
-    case "3" :
-        a = 4;
-        break;
-    case "4" :
-        a = 6;
-        break;
-    case "7" :
-        a = 7;
-        break;
-    default:
-      a = 8;
-  }
-  return a + 3 | 0;
-}
-
-function gg(x) {
-  var a;
-  switch (x) {
-    case 0 :
-    case 1 :
-    case 2 :
-        a = 3;
-        break;
-    case 3 :
-        a = 4;
-        break;
-    case 4 :
-        a = 6;
-        break;
-    case 8 :
-        a = 7;
-        break;
-    default:
-      a = 8;
-  }
-  return a + 3 | 0;
-}
-
-function rev_split_by_char(c, s) {
-  var loop = function (i, l) {
-    try {
-      var i$p = $$String.index_from(s, i, c);
-      var s$p = $$String.sub(s, i, i$p - i | 0);
-      return loop(i$p + 1 | 0, s$p === "" ? l : ({
-                      hd: s$p,
-                      tl: l
-                    }));
-    }
-    catch (raw_exn){
-      var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-      if (exn.RE_EXN_ID === "Not_found") {
-        return {
-                hd: $$String.sub(s, i, s.length - i | 0),
-                tl: l
-              };
-      }
-      throw exn;
-    }
-  };
-  return loop(0, /* [] */0);
-}
-
-function xsplit(delim, s) {
-  var len = s.length;
-  if (len !== 0) {
-    var _l = /* [] */0;
-    var _x = len;
-    while(true) {
-      var x = _x;
-      var l = _l;
-      if (x === 0) {
-        return l;
-      }
-      var i$p;
-      try {
-        i$p = $$String.rindex_from(s, x - 1 | 0, delim);
-      }
-      catch (raw_exn){
-        var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-        if (exn.RE_EXN_ID === "Not_found") {
-          return {
-                  hd: $$String.sub(s, 0, x),
-                  tl: l
-                };
-        }
-        throw exn;
-      }
-      var l_0 = $$String.sub(s, i$p + 1 | 0, (x - i$p | 0) - 1 | 0);
-      var l$1 = {
-        hd: l_0,
-        tl: l
-      };
-      var l$2 = i$p === 0 ? ({
-            hd: "",
-            tl: l$1
-          }) : l$1;
-      _x = i$p;
-      _l = l$2;
-      continue ;
-    };
-  } else {
-    return /* [] */0;
-  }
-}
-
-function string_of_chars(x) {
-  var xs = List.map((function (prim) {
-          return String.fromCharCode(prim);
-        }), x);
-  return $$Array.of_list(xs).join("");
-}
-
-Mt.from_pair_suites("String_test", {
-      hd: [
-        "mutliple switch",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: 9,
-                    _1: ff("4")
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "int switch",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: 9,
-                      _1: gg(4)
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "escape_normal",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: "haha",
-                        _1: $$String.escaped("haha")
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "escape_bytes",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: Bytes.of_string("haha"),
-                          _1: Bytes.escaped(Bytes.of_string("haha"))
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "escape_quote",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: "\\\"\\\"",
-                            _1: $$String.escaped("\"\"")
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "rev_split_by_char",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: {
-                                hd: "",
-                                tl: {
-                                  hd: "bbbb",
-                                  tl: {
-                                    hd: "bbbb",
-                                    tl: /* [] */0
-                                  }
-                                }
-                              },
-                              _1: rev_split_by_char(/* 'a' */97, "bbbbabbbba")
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "File \"string_test.res\", line 86, characters 5-12",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: {
-                                  hd: "aaaa",
-                                  tl: /* [] */0
-                                },
-                                _1: rev_split_by_char(/* ',' */44, "aaaa")
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "xsplit",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: {
-                                    hd: "a",
-                                    tl: {
-                                      hd: "b",
-                                      tl: {
-                                        hd: "c",
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  },
-                                  _1: xsplit(/* '.' */46, "a.b.c")
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "split_empty",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: /* [] */0,
-                                    _1: Ext_string_test.split(undefined, "", /* '_' */95)
-                                  };
-                          })
-                      ],
-                      tl: {
-                        hd: [
-                          "split_empty2",
-                          (function (param) {
-                              return {
-                                      TAG: "Eq",
-                                      _0: {
-                                        hd: "test_unsafe_obj_ffi_ppx.cmi",
-                                        tl: /* [] */0
-                                      },
-                                      _1: Ext_string_test.split(false, " test_unsafe_obj_ffi_ppx.cmi", /* ' ' */32)
-                                    };
-                            })
-                        ],
-                        tl: {
-                          hd: [
-                            "rfind",
-                            (function (param) {
-                                return {
-                                        TAG: "Eq",
-                                        _0: 7,
-                                        _1: Ext_string_test.rfind("__", "__index__js")
-                                      };
-                              })
-                          ],
-                          tl: {
-                            hd: [
-                              "rfind_2",
-                              (function (param) {
-                                  return {
-                                          TAG: "Eq",
-                                          _0: 0,
-                                          _1: Ext_string_test.rfind("__", "__index_js")
-                                        };
-                                })
-                            ],
-                            tl: {
-                              hd: [
-                                "rfind_3",
-                                (function (param) {
-                                    return {
-                                            TAG: "Eq",
-                                            _0: -1,
-                                            _1: Ext_string_test.rfind("__", "_index_js")
-                                          };
-                                  })
-                              ],
-                              tl: {
-                                hd: [
-                                  "find",
-                                  (function (param) {
-                                      return {
-                                              TAG: "Eq",
-                                              _0: 0,
-                                              _1: Ext_string_test.find(undefined, "__", "__index__js")
-                                            };
-                                    })
-                                ],
-                                tl: {
-                                  hd: [
-                                    "find_2",
-                                    (function (param) {
-                                        return {
-                                                TAG: "Eq",
-                                                _0: 6,
-                                                _1: Ext_string_test.find(undefined, "__", "_index__js")
-                                              };
-                                      })
-                                  ],
-                                  tl: {
-                                    hd: [
-                                      "find_3",
-                                      (function (param) {
-                                          return {
-                                                  TAG: "Eq",
-                                                  _0: -1,
-                                                  _1: Ext_string_test.find(undefined, "__", "_index_js")
-                                                };
-                                        })
-                                    ],
-                                    tl: {
-                                      hd: [
-                                        "of_char",
-                                        (function (param) {
-                                            return {
-                                                    TAG: "Eq",
-                                                    _0: String.fromCharCode(/* '0' */48),
-                                                    _1: "0"
-                                                  };
-                                          })
-                                      ],
-                                      tl: {
-                                        hd: [
-                                          "of_chars",
-                                          (function (param) {
-                                              return {
-                                                      TAG: "Eq",
-                                                      _0: string_of_chars({
-                                                            hd: /* '0' */48,
-                                                            tl: {
-                                                              hd: /* '1' */49,
-                                                              tl: {
-                                                                hd: /* '2' */50,
-                                                                tl: /* [] */0
-                                                              }
-                                                            }
-                                                          }),
-                                                      _1: "012"
-                                                    };
-                                            })
-                                        ],
-                                        tl: /* [] */0
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    });
-
-exports.ff = ff;
-exports.gg = gg;
-exports.rev_split_by_char = rev_split_by_char;
-exports.xsplit = xsplit;
-exports.string_of_chars = string_of_chars;
-/*  Not a pure module */
diff --git a/jscomp/test/string_test.res b/jscomp/test/string_test.res
deleted file mode 100644
index 92ddcbf..0000000
--- a/jscomp/test/string_test.res
+++ /dev/null
@@ -1,105 +0,0 @@
-let ff = x => {
-  let a = switch x {
-  | "0"
-  | "1"
-  | "2" => 3
-  | "3" => 4
-  | "4" => 6
-  | "7" => 7
-  | _ => 8
-  }
-  a + 3
-}
-
-let gg = x => {
-  let a = switch x {
-  | 0
-  | 1
-  | 2 => 3
-  | 3 => 4
-  | 4 => 6
-  | 8 => 7
-  | _ => 8
-  }
-  a + 3
-}
-
-let rev_split_by_char = (c, s) => {
-  let rec loop = (i, l) =>
-    try {
-      let i' = String.index_from(s, i, c)
-      let s' = String.sub(s, i, i' - i)
-      loop(
-        i' + 1,
-        if s' == "" {
-          l
-        } else {
-          list{s', ...l}
-        },
-      )
-    } catch {
-    | Not_found => list{String.sub(s, i, String.length(s) - i), ...l}
-    }
-
-  loop(0, list{})
-}
-
-let xsplit = (~delim, s) => {
-  let rec loop = (l, x) =>
-    switch x {
-    | 0 => l
-    | i =>
-      switch String.rindex_from(s, i - 1, delim) {
-      | i' =>
-        let l = list{String.sub(s, i' + 1, i - i' - 1), ...l}
-        let l = if i' == 0 {
-          list{"", ...l}
-        } else {
-          l
-        }
-        loop(l, i')
-      | exception Not_found => list{String.sub(s, 0, i), ...l}
-      }
-    }
-
-  let len = String.length(s)
-  switch len {
-  | 0 => list{}
-  | _ => loop(list{}, len)
-  }
-}
-
-@val external string_of_char: char => string = "String.fromCharCode"
-
-let string_of_chars = x => \"@@"(String.concat(""), List.map(string_of_char, x))
-
-Mt.from_pair_suites(
-  __MODULE__,
-  list{
-    ("mutliple switch", _ => Eq(9, ff("4"))),
-    ("int switch", _ => Eq(9, gg(4))),
-    ("escape_normal", _ => Eq("haha", String.escaped("haha"))),
-    ("escape_bytes", _ => Eq(Bytes.of_string("haha"), Bytes.escaped(Bytes.of_string("haha")))),
-    /* FIXME it used char pattern match */
-    ("escape_quote", _ => Eq("\\\"\\\"", String.escaped(`""`))),
-    ("rev_split_by_char", _ => Eq(list{"", "bbbb", "bbbb"}, rev_split_by_char('a', "bbbbabbbba"))),
-    (__LOC__, _ => Eq(list{"aaaa"}, rev_split_by_char(',', "aaaa"))),
-    ("xsplit", _ => Eq(list{"a", "b", "c"}, xsplit(~delim='.', "a.b.c"))),
-    ("split_empty", _ => Eq(list{}, Ext_string_test.split("", '_'))),
-    (
-      "split_empty2",
-      _ => Eq(
-        list{"test_unsafe_obj_ffi_ppx.cmi"},
-        Ext_string_test.split(" test_unsafe_obj_ffi_ppx.cmi", ~keep_empty=false, ' '),
-      ),
-    ),
-    ("rfind", _ => Eq(7, Ext_string_test.rfind("__index__js", ~sub="__"))),
-    ("rfind_2", _ => Eq(0, Ext_string_test.rfind("__index_js", ~sub="__"))),
-    ("rfind_3", _ => Eq(-1, Ext_string_test.rfind("_index_js", ~sub="__"))),
-    ("find", _ => Eq(0, Ext_string_test.find("__index__js", ~sub="__"))),
-    ("find_2", _ => Eq(6, Ext_string_test.find("_index__js", ~sub="__"))),
-    ("find_3", _ => Eq(-1, Ext_string_test.find("_index_js", ~sub="__"))),
-    ("of_char", _ => Eq(string_of_char('0'), String.make(1, '0'))),
-    ("of_chars", _ => Eq(string_of_chars(list{'0', '1', '2'}), "012")),
-  },
-)
diff --git a/jscomp/test/string_unicode_test.js b/jscomp/test/string_unicode_test.js
deleted file mode 100644
index 112e0cd..0000000
--- a/jscomp/test/string_unicode_test.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-console.log("你好");
-
-console.log("你好");
-
-console.log("你好");
-
-function f(x) {
-  if (x !== 333) {
-    if (x >= 256) {
-      return 3;
-    } else {
-      return 0;
-    }
-  } else {
-    return 2;
-  }
-}
-
-eq("File \"string_unicode_test.res\", line 23, characters 5-12", f(/* '{' */123), 0);
-
-eq("File \"string_unicode_test.res\", line 24, characters 5-12", f(/* 'ō' */333), 2);
-
-eq("File \"string_unicode_test.res\", line 25, characters 5-12", f(/* 'Ƽ' */444), 3);
-
-Mt.from_pair_suites("string_unicode_test.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/string_unicode_test.res b/jscomp/test/string_unicode_test.res
deleted file mode 100644
index 6f066c6..0000000
Binary files a/jscomp/test/string_unicode_test.res and /dev/null differ
diff --git a/jscomp/test/stringmatch_test.js b/jscomp/test/stringmatch_test.js
deleted file mode 100644
index becccea..0000000
--- a/jscomp/test/stringmatch_test.js
+++ /dev/null
@@ -1,4299 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function tst01(s) {
-  if (s === "") {
-    return 0;
-  } else {
-    return 1;
-  }
-}
-
-if (tst01("") !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          22,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst01("\x00\x00\x00\x03") !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          23,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst01("\x00\x00\x00\x00\x00\x00\x00\x07") !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          24,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function tst02(s) {
-  var len = s.length;
-  if (s === "") {
-    if (len >= 0) {
-      return 1;
-    }
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "stringmatch_test.res",
-            33,
-            21
-          ],
-          Error: new Error()
-        };
-  }
-  if (len === 0) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "stringmatch_test.res",
-            35,
-            21
-          ],
-          Error: new Error()
-        };
-  }
-  if (s === "A") {
-    return 2;
-  } else {
-    return 3;
-  }
-}
-
-if (tst02("") !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          42,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst02("A") !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          43,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst02("B") !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          44,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst02("\x00\x00\x00\x00\x00\x00\x00\x07") !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          45,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst02("\x00\x00\x00\x03") !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          46,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function tst03(s) {
-  switch (s) {
-    case "app_const" :
-        return 5;
-    case "app_const_const" :
-        return 9;
-    case "app_const_env" :
-        return 11;
-    case "app_const_meth" :
-        return 12;
-    case "app_const_var" :
-        return 10;
-    case "app_env" :
-        return 7;
-    case "app_env_const" :
-        return 14;
-    case "app_meth" :
-        return 8;
-    case "app_meth_const" :
-        return 15;
-    case "app_var" :
-        return 6;
-    case "app_var_const" :
-        return 13;
-    case "get_const" :
-        return 0;
-    case "get_env" :
-        return 2;
-    case "get_meth" :
-        return 3;
-    case "get_var" :
-        return 1;
-    case "meth_app_const" :
-        return 16;
-    case "meth_app_env" :
-        return 18;
-    case "meth_app_meth" :
-        return 19;
-    case "meth_app_var" :
-        return 17;
-    case "send_const" :
-        return 20;
-    case "send_env" :
-        return 22;
-    case "send_meth" :
-        return 23;
-    case "send_var" :
-        return 21;
-    case "set_var" :
-        return 4;
-    default:
-      return -1;
-  }
-}
-
-if (tst03("get_const") !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          131,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("set_congt") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          132,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("get_var") !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          133,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("gat_ver") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          134,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("get_env") !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          135,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("get_env") !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          136,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("get_meth") !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          137,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("met_geth") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          138,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("set_var") !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          139,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("sev_tar") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          140,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_const") !== 5) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          141,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("ppa_const") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          142,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_var") !== 6) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          143,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_var") !== 6) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          144,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_env") !== 7) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          145,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("epp_anv") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          146,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_meth") !== 8) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          147,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("atp_meph") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          148,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_const_const") !== 9) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          149,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_const_const") !== 9) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          150,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_const_var") !== 10) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          151,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("atp_consp_var") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          152,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_const_env") !== 11) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          153,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_constne_v") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          154,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_const_meth") !== 12) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          155,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("spp_conat_meth") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          156,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_var_const") !== 13) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          157,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_va_rconst") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          158,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_env_const") !== 14) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          159,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_env_const") !== 14) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          160,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_meth_const") !== 15) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          161,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("app_teth_consm") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          162,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("meth_app_const") !== 16) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          163,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("math_epp_const") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          164,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("meth_app_var") !== 17) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          165,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("meth_app_var") !== 17) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          166,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("meth_app_env") !== 18) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          167,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("eeth_app_mnv") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          168,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("meth_app_meth") !== 19) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          169,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("meth_apt_meph") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          170,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("send_const") !== 20) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          171,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("tend_conss") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          172,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("send_var") !== 21) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          173,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("serd_van") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          174,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("send_env") !== 22) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          175,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("sen_denv") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          176,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("send_meth") !== 23) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          177,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst03("tend_mesh") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          178,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function tst04(s) {
-  switch (s) {
-    case "AAAAAAAA" :
-        return 0;
-    case "AAAAAAAAAAAAAAAA" :
-        return 1;
-    case "AAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 2;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 3;
-    case "BBBBBBBB" :
-        return 4;
-    case "BBBBBBBBBBBBBBBB" :
-        return 5;
-    case "BBBBBBBBBBBBBBBBBBBBBBBB" :
-        return 6;
-    case "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" :
-        return 7;
-    case "CCCCCCCC" :
-        return 8;
-    case "CCCCCCCCCCCCCCCC" :
-        return 9;
-    case "CCCCCCCCCCCCCCCCCCCCCCCC" :
-        return 10;
-    case "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" :
-        return 11;
-    default:
-      return -1;
-  }
-}
-
-if (tst04("AAAAAAAA") !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          215,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("AAAAAAAAAAAAAAAA") !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          216,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("AAAAAAAAAAAAAAAAAAAAAAAA") !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          217,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA") !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          218,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("BBBBBBBB") !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          219,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("BBBBBBBBBBBBBBBB") !== 5) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          220,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("BBBBBBBBBBBBBBBBBBBBBBBB") !== 6) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          221,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB") !== 7) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          222,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("CCCCCCCC") !== 8) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          223,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("CCCCCCCCCCCCCCCC") !== 9) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          224,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("CCCCCCCCCCCCCCCCCCCCCCCC") !== 10) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          225,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC") !== 11) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          226,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          227,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("DDD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          228,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("DDDDDDD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          229,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("AAADDDD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          230,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("AAAAAAADDDDDDDD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          231,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("AAAAAAADDDD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          232,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst04("AAAAAAAAAAAAAAADDDD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          233,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function tst05(s) {
-  switch (s) {
-    case "AAA" :
-        return 0;
-    case "AAAA" :
-        return 1;
-    case "AAAAA" :
-        return 2;
-    case "AAAAAA" :
-        return 3;
-    case "AAAAAAA" :
-        return 4;
-    case "AAAAAAAAAAAA" :
-        return 5;
-    case "AAAAAAAAAAAAAAAA" :
-        return 6;
-    case "AAAAAAAAAAAAAAAAAAAA" :
-        return 7;
-    case "BBB" :
-        return 8;
-    case "BBBB" :
-        return 9;
-    case "BBBBB" :
-        return 10;
-    case "BBBBBB" :
-        return 11;
-    case "BBBBBBB" :
-        return 12;
-    default:
-      return -1;
-  }
-}
-
-if (tst05("AAA") !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          272,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAAA") !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          273,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAAAA") !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          274,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAAAAA") !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          275,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAAAAAA") !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          276,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAAAAAAAAAAA") !== 5) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          277,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAAAAAAAAAAAAAAA") !== 6) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          278,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAAAAAAAAAAAAAAAAAAA") !== 7) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          279,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("BBB") !== 8) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          280,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("BBBB") !== 9) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          281,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("BBBBB") !== 10) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          282,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("BBBBBB") !== 11) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          283,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("BBBBBBB") !== 12) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          284,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          285,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          286,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAAD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          287,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAAAAAD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          288,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("AAAAAAAD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          289,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("BBD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          290,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("BBBD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          291,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("BBBBBBD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          292,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst05("BBBBBBBD") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          293,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var s00 = "and";
-
-var t00 = "nad";
-
-var s01 = "as";
-
-var t01 = "sa";
-
-var s02 = "assert";
-
-var t02 = "asesrt";
-
-var s03 = "begin";
-
-var t03 = "negib";
-
-var s04 = "class";
-
-var t04 = "lcass";
-
-var s05 = "constraint";
-
-var t05 = "constiarnt";
-
-var s06 = "do";
-
-var t06 = "od";
-
-var s07 = "done";
-
-var t07 = "eond";
-
-var s08 = "downto";
-
-var t08 = "dowtno";
-
-var s09 = "else";
-
-var t09 = "lese";
-
-var s10 = "end";
-
-var t10 = "edn";
-
-var s11 = "exception";
-
-var t11 = "exception";
-
-var s12 = "external";
-
-var t12 = "external";
-
-var s13 = "false";
-
-var t13 = "fslae";
-
-var s14 = "for";
-
-var t14 = "ofr";
-
-var s15 = "fun";
-
-var t15 = "fnu";
-
-var s16 = "function";
-
-var t16 = "function";
-
-var s17 = "functor";
-
-var t17 = "ounctfr";
-
-var s18 = "if";
-
-var t18 = "fi";
-
-var s19 = "in";
-
-var t19 = "in";
-
-var s20 = "include";
-
-var t20 = "inculde";
-
-var s21 = "inherit";
-
-var t21 = "iehnrit";
-
-var s22 = "initializer";
-
-var t22 = "enitializir";
-
-var s23 = "lazy";
-
-var t23 = "zaly";
-
-var s24 = "let";
-
-var t24 = "elt";
-
-var s25 = "match";
-
-var t25 = "match";
-
-var s26 = "method";
-
-var t26 = "methdo";
-
-var s27 = "module";
-
-var t27 = "modelu";
-
-var s28 = "mutable";
-
-var t28 = "butamle";
-
-var s29 = "new";
-
-var t29 = "wen";
-
-var s30 = "object";
-
-var t30 = "objcet";
-
-var s31 = "of";
-
-var t31 = "of";
-
-var s32 = "open";
-
-var t32 = "epon";
-
-var s33 = "or";
-
-var t33 = "ro";
-
-var s34 = "private";
-
-var t34 = "privaet";
-
-var s35 = "rec";
-
-var t35 = "rec";
-
-var s36 = "sig";
-
-var t36 = "gis";
-
-var s37 = "struct";
-
-var t37 = "scrutt";
-
-var s38 = "then";
-
-var t38 = "hten";
-
-var s39 = "to";
-
-var t39 = "to";
-
-var s40 = "true";
-
-var t40 = "teur";
-
-var s41 = "try";
-
-var t41 = "try";
-
-var s42 = "type";
-
-var t42 = "pyte";
-
-var s43 = "val";
-
-var t43 = "val";
-
-var s44 = "virtual";
-
-var t44 = "vritual";
-
-var s45 = "when";
-
-var t45 = "whne";
-
-var s46 = "while";
-
-var t46 = "wlihe";
-
-var s47 = "with";
-
-var t47 = "iwth";
-
-var s48 = "mod";
-
-var t48 = "mod";
-
-var s49 = "land";
-
-var t49 = "alnd";
-
-var s50 = "lor";
-
-var t50 = "rol";
-
-var s51 = "lxor";
-
-var t51 = "lxor";
-
-var s52 = "lsl";
-
-var t52 = "lsl";
-
-var s53 = "lsr";
-
-var t53 = "lsr";
-
-var s54 = "asr";
-
-var t54 = "sar";
-
-var s55 = "A";
-
-var t55 = "A";
-
-var s56 = "AA";
-
-var t56 = "AA";
-
-var s57 = "AAA";
-
-var t57 = "AAA";
-
-var s58 = "AAAA";
-
-var t58 = "AAAA";
-
-var s59 = "AAAAA";
-
-var t59 = "AAAAA";
-
-var s60 = "AAAAAA";
-
-var t60 = "AAAAAA";
-
-var s61 = "AAAAAAA";
-
-var t61 = "AAAAAAA";
-
-var s62 = "AAAAAAAA";
-
-var t62 = "AAAAAAAA";
-
-var s63 = "AAAAAAAAA";
-
-var t63 = "AAAAAAAAA";
-
-var s64 = "AAAAAAAAAA";
-
-var t64 = "AAAAAAAAAA";
-
-var s65 = "AAAAAAAAAAA";
-
-var t65 = "AAAAAAAAAAA";
-
-var s66 = "AAAAAAAAAAAA";
-
-var t66 = "AAAAAAAAAAAA";
-
-var s67 = "AAAAAAAAAAAAA";
-
-var t67 = "AAAAAAAAAAAAA";
-
-var s68 = "AAAAAAAAAAAAAA";
-
-var t68 = "AAAAAAAAAAAAAA";
-
-var s69 = "AAAAAAAAAAAAAAA";
-
-var t69 = "AAAAAAAAAAAAAAA";
-
-var s70 = "AAAAAAAAAAAAAAAA";
-
-var t70 = "AAAAAAAAAAAAAAAA";
-
-var s71 = "AAAAAAAAAAAAAAAAA";
-
-var t71 = "AAAAAAAAAAAAAAAAA";
-
-var s72 = "AAAAAAAAAAAAAAAAAA";
-
-var t72 = "AAAAAAAAAAAAAAAAAA";
-
-var s73 = "AAAAAAAAAAAAAAAAAAA";
-
-var t73 = "AAAAAAAAAAAAAAAAAAA";
-
-var s74 = "AAAAAAAAAAAAAAAAAAAA";
-
-var t74 = "AAAAAAAAAAAAAAAAAAAA";
-
-var s75 = "AAAAAAAAAAAAAAAAAAAAA";
-
-var t75 = "AAAAAAAAAAAAAAAAAAAAA";
-
-var s76 = "AAAAAAAAAAAAAAAAAAAAAA";
-
-var t76 = "AAAAAAAAAAAAAAAAAAAAAA";
-
-var s77 = "AAAAAAAAAAAAAAAAAAAAAAA";
-
-var t77 = "AAAAAAAAAAAAAAAAAAAAAAA";
-
-var s78 = "AAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t78 = "AAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s79 = "AAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t79 = "AAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s80 = "AAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t80 = "AAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s81 = "AAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t81 = "AAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s82 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t82 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s83 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t83 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s84 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t84 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s85 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t85 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s86 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t86 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s87 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t87 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s88 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var t88 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-
-var s89 = "BBBBBBBBBBBBBBB";
-
-var t89 = "BBBBBBBBBBBBBBB";
-
-var s90 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB";
-
-var t90 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB";
-
-var s91 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB";
-
-var t91 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB";
-
-function tst06(s) {
-  switch (s) {
-    case "A" :
-        return 55;
-    case "AA" :
-        return 56;
-    case "AAA" :
-        return 57;
-    case "AAAA" :
-        return 58;
-    case "AAAAA" :
-        return 59;
-    case "AAAAAA" :
-        return 60;
-    case "AAAAAAA" :
-        return 61;
-    case "AAAAAAAA" :
-        return 62;
-    case "AAAAAAAAA" :
-        return 63;
-    case "AAAAAAAAAA" :
-        return 64;
-    case "AAAAAAAAAAA" :
-        return 65;
-    case "AAAAAAAAAAAA" :
-        return 66;
-    case "AAAAAAAAAAAAA" :
-        return 67;
-    case "AAAAAAAAAAAAAA" :
-        return 68;
-    case "AAAAAAAAAAAAAAA" :
-        return 69;
-    case "AAAAAAAAAAAAAAAA" :
-        return 70;
-    case "AAAAAAAAAAAAAAAAA" :
-        return 71;
-    case "AAAAAAAAAAAAAAAAAA" :
-        return 72;
-    case "AAAAAAAAAAAAAAAAAAA" :
-        return 73;
-    case "AAAAAAAAAAAAAAAAAAAA" :
-        return 74;
-    case "AAAAAAAAAAAAAAAAAAAAA" :
-        return 75;
-    case "AAAAAAAAAAAAAAAAAAAAAA" :
-        return 76;
-    case "AAAAAAAAAAAAAAAAAAAAAAA" :
-        return 77;
-    case "AAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 78;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 79;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 80;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 81;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 82;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 83;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 84;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 85;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 86;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 87;
-    case "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" :
-        return 88;
-    case "BBBBBBBBBBBBBBB" :
-        return 89;
-    case "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" :
-        return 90;
-    case "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" :
-        return 91;
-    case "and" :
-        return 0;
-    case "as" :
-        return 1;
-    case "asr" :
-        return 54;
-    case "assert" :
-        return 2;
-    case "begin" :
-        return 3;
-    case "class" :
-        return 4;
-    case "constraint" :
-        return 5;
-    case "do" :
-        return 6;
-    case "done" :
-        return 7;
-    case "downto" :
-        return 8;
-    case "else" :
-        return 9;
-    case "end" :
-        return 10;
-    case "exception" :
-        return 11;
-    case "external" :
-        return 12;
-    case "false" :
-        return 13;
-    case "for" :
-        return 14;
-    case "fun" :
-        return 15;
-    case "function" :
-        return 16;
-    case "functor" :
-        return 17;
-    case "if" :
-        return 18;
-    case "in" :
-        return 19;
-    case "include" :
-        return 20;
-    case "inherit" :
-        return 21;
-    case "initializer" :
-        return 22;
-    case "land" :
-        return 49;
-    case "lazy" :
-        return 23;
-    case "let" :
-        return 24;
-    case "lor" :
-        return 50;
-    case "lsl" :
-        return 52;
-    case "lsr" :
-        return 53;
-    case "lxor" :
-        return 51;
-    case "match" :
-        return 25;
-    case "method" :
-        return 26;
-    case "mod" :
-        return 48;
-    case "module" :
-        return 27;
-    case "mutable" :
-        return 28;
-    case "new" :
-        return 29;
-    case "object" :
-        return 30;
-    case "of" :
-        return 31;
-    case "open" :
-        return 32;
-    case "or" :
-        return 33;
-    case "private" :
-        return 34;
-    case "rec" :
-        return 35;
-    case "sig" :
-        return 36;
-    case "struct" :
-        return 37;
-    case "then" :
-        return 38;
-    case "to" :
-        return 39;
-    case "true" :
-        return 40;
-    case "try" :
-        return 41;
-    case "type" :
-        return 42;
-    case "val" :
-        return 43;
-    case "virtual" :
-        return 44;
-    case "when" :
-        return 45;
-    case "while" :
-        return 46;
-    case "with" :
-        return 47;
-    default:
-      return -1;
-  }
-}
-
-if (tst06(s00) !== 0) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          582,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t00) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          583,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s01) !== 1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          584,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t01) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          585,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s02) !== 2) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          586,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t02) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          587,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s03) !== 3) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          588,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t03) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          589,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s04) !== 4) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          590,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t04) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          591,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s05) !== 5) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          592,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t05) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          593,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s06) !== 6) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          594,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t06) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          595,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s07) !== 7) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          596,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t07) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          597,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s08) !== 8) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          598,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t08) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          599,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s09) !== 9) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          600,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t09) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          601,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s10) !== 10) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          602,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t10) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          603,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s11) !== 11) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          604,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t11) !== 11) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          605,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s12) !== 12) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          606,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t12) !== 12) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          607,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s13) !== 13) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          608,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t13) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          609,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s14) !== 14) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          610,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t14) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          611,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s15) !== 15) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          612,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t15) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          613,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s16) !== 16) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          614,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t16) !== 16) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          615,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s17) !== 17) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          616,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t17) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          617,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s18) !== 18) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          618,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t18) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          619,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s19) !== 19) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          620,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t19) !== 19) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          621,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s20) !== 20) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          622,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t20) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          623,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s21) !== 21) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          624,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t21) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          625,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s22) !== 22) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          626,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t22) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          627,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s23) !== 23) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          628,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t23) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          629,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s24) !== 24) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          630,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t24) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          631,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s25) !== 25) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          632,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t25) !== 25) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          633,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s26) !== 26) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          634,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t26) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          635,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s27) !== 27) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          636,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t27) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          637,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s28) !== 28) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          638,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t28) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          639,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s29) !== 29) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          640,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t29) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          641,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s30) !== 30) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          642,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t30) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          643,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s31) !== 31) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          644,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t31) !== 31) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          645,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s32) !== 32) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          646,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t32) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          647,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s33) !== 33) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          648,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t33) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          649,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s34) !== 34) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          650,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t34) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          651,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s35) !== 35) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          652,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t35) !== 35) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          653,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s36) !== 36) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          654,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t36) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          655,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s37) !== 37) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          656,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t37) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          657,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s38) !== 38) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          658,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t38) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          659,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s39) !== 39) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          660,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t39) !== 39) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          661,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s40) !== 40) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          662,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t40) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          663,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s41) !== 41) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          664,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t41) !== 41) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          665,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s42) !== 42) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          666,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t42) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          667,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s43) !== 43) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          668,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t43) !== 43) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          669,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s44) !== 44) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          670,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t44) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          671,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s45) !== 45) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          672,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t45) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          673,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s46) !== 46) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          674,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t46) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          675,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s47) !== 47) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          676,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t47) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          677,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s48) !== 48) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          678,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t48) !== 48) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          679,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s49) !== 49) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          680,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t49) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          681,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s50) !== 50) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          682,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t50) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          683,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s51) !== 51) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          684,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t51) !== 51) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          685,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s52) !== 52) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          686,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t52) !== 52) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          687,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s53) !== 53) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          688,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t53) !== 53) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          689,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s54) !== 54) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          690,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t54) !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          691,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s55) !== 55) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          692,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t55) !== 55) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          693,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s56) !== 56) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          694,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t56) !== 56) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          695,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s57) !== 57) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          696,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t57) !== 57) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          697,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s58) !== 58) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          698,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t58) !== 58) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          699,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s59) !== 59) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          700,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t59) !== 59) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          701,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s60) !== 60) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          702,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t60) !== 60) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          703,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s61) !== 61) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          704,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t61) !== 61) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          705,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s62) !== 62) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          706,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t62) !== 62) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          707,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s63) !== 63) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          708,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t63) !== 63) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          709,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s64) !== 64) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          710,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t64) !== 64) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          711,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s65) !== 65) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          712,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t65) !== 65) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          713,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s66) !== 66) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          714,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t66) !== 66) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          715,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s67) !== 67) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          716,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t67) !== 67) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          717,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s68) !== 68) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          718,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t68) !== 68) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          719,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s69) !== 69) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          720,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t69) !== 69) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          721,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s70) !== 70) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          722,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t70) !== 70) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          723,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s71) !== 71) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          724,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t71) !== 71) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          725,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s72) !== 72) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          726,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t72) !== 72) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          727,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s73) !== 73) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          728,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t73) !== 73) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          729,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s74) !== 74) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          730,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t74) !== 74) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          731,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s75) !== 75) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          732,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t75) !== 75) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          733,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s76) !== 76) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          734,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t76) !== 76) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          735,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s77) !== 77) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          736,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t77) !== 77) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          737,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s78) !== 78) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          738,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t78) !== 78) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          739,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s79) !== 79) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          740,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t79) !== 79) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          741,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s80) !== 80) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          742,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t80) !== 80) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          743,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s81) !== 81) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          744,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t81) !== 81) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          745,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s82) !== 82) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          746,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t82) !== 82) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          747,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s83) !== 83) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          748,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t83) !== 83) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          749,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s84) !== 84) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          750,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t84) !== 84) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          751,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s85) !== 85) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          752,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t85) !== 85) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          753,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s86) !== 86) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          754,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t86) !== 86) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          755,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s87) !== 87) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          756,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t87) !== 87) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          757,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s88) !== 88) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          758,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t88) !== 88) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          759,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s89) !== 89) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          760,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t89) !== 89) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          761,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s90) !== 90) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          762,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t90) !== 90) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          763,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(s91) !== 91) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          764,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06(t91) !== 91) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          765,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (tst06("") !== -1) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "stringmatch_test.res",
-          766,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-exports.tst01 = tst01;
-exports.tst02 = tst02;
-exports.tst03 = tst03;
-exports.tst04 = tst04;
-exports.tst05 = tst05;
-exports.s00 = s00;
-exports.t00 = t00;
-exports.s01 = s01;
-exports.t01 = t01;
-exports.s02 = s02;
-exports.t02 = t02;
-exports.s03 = s03;
-exports.t03 = t03;
-exports.s04 = s04;
-exports.t04 = t04;
-exports.s05 = s05;
-exports.t05 = t05;
-exports.s06 = s06;
-exports.t06 = t06;
-exports.s07 = s07;
-exports.t07 = t07;
-exports.s08 = s08;
-exports.t08 = t08;
-exports.s09 = s09;
-exports.t09 = t09;
-exports.s10 = s10;
-exports.t10 = t10;
-exports.s11 = s11;
-exports.t11 = t11;
-exports.s12 = s12;
-exports.t12 = t12;
-exports.s13 = s13;
-exports.t13 = t13;
-exports.s14 = s14;
-exports.t14 = t14;
-exports.s15 = s15;
-exports.t15 = t15;
-exports.s16 = s16;
-exports.t16 = t16;
-exports.s17 = s17;
-exports.t17 = t17;
-exports.s18 = s18;
-exports.t18 = t18;
-exports.s19 = s19;
-exports.t19 = t19;
-exports.s20 = s20;
-exports.t20 = t20;
-exports.s21 = s21;
-exports.t21 = t21;
-exports.s22 = s22;
-exports.t22 = t22;
-exports.s23 = s23;
-exports.t23 = t23;
-exports.s24 = s24;
-exports.t24 = t24;
-exports.s25 = s25;
-exports.t25 = t25;
-exports.s26 = s26;
-exports.t26 = t26;
-exports.s27 = s27;
-exports.t27 = t27;
-exports.s28 = s28;
-exports.t28 = t28;
-exports.s29 = s29;
-exports.t29 = t29;
-exports.s30 = s30;
-exports.t30 = t30;
-exports.s31 = s31;
-exports.t31 = t31;
-exports.s32 = s32;
-exports.t32 = t32;
-exports.s33 = s33;
-exports.t33 = t33;
-exports.s34 = s34;
-exports.t34 = t34;
-exports.s35 = s35;
-exports.t35 = t35;
-exports.s36 = s36;
-exports.t36 = t36;
-exports.s37 = s37;
-exports.t37 = t37;
-exports.s38 = s38;
-exports.t38 = t38;
-exports.s39 = s39;
-exports.t39 = t39;
-exports.s40 = s40;
-exports.t40 = t40;
-exports.s41 = s41;
-exports.t41 = t41;
-exports.s42 = s42;
-exports.t42 = t42;
-exports.s43 = s43;
-exports.t43 = t43;
-exports.s44 = s44;
-exports.t44 = t44;
-exports.s45 = s45;
-exports.t45 = t45;
-exports.s46 = s46;
-exports.t46 = t46;
-exports.s47 = s47;
-exports.t47 = t47;
-exports.s48 = s48;
-exports.t48 = t48;
-exports.s49 = s49;
-exports.t49 = t49;
-exports.s50 = s50;
-exports.t50 = t50;
-exports.s51 = s51;
-exports.t51 = t51;
-exports.s52 = s52;
-exports.t52 = t52;
-exports.s53 = s53;
-exports.t53 = t53;
-exports.s54 = s54;
-exports.t54 = t54;
-exports.s55 = s55;
-exports.t55 = t55;
-exports.s56 = s56;
-exports.t56 = t56;
-exports.s57 = s57;
-exports.t57 = t57;
-exports.s58 = s58;
-exports.t58 = t58;
-exports.s59 = s59;
-exports.t59 = t59;
-exports.s60 = s60;
-exports.t60 = t60;
-exports.s61 = s61;
-exports.t61 = t61;
-exports.s62 = s62;
-exports.t62 = t62;
-exports.s63 = s63;
-exports.t63 = t63;
-exports.s64 = s64;
-exports.t64 = t64;
-exports.s65 = s65;
-exports.t65 = t65;
-exports.s66 = s66;
-exports.t66 = t66;
-exports.s67 = s67;
-exports.t67 = t67;
-exports.s68 = s68;
-exports.t68 = t68;
-exports.s69 = s69;
-exports.t69 = t69;
-exports.s70 = s70;
-exports.t70 = t70;
-exports.s71 = s71;
-exports.t71 = t71;
-exports.s72 = s72;
-exports.t72 = t72;
-exports.s73 = s73;
-exports.t73 = t73;
-exports.s74 = s74;
-exports.t74 = t74;
-exports.s75 = s75;
-exports.t75 = t75;
-exports.s76 = s76;
-exports.t76 = t76;
-exports.s77 = s77;
-exports.t77 = t77;
-exports.s78 = s78;
-exports.t78 = t78;
-exports.s79 = s79;
-exports.t79 = t79;
-exports.s80 = s80;
-exports.t80 = t80;
-exports.s81 = s81;
-exports.t81 = t81;
-exports.s82 = s82;
-exports.t82 = t82;
-exports.s83 = s83;
-exports.t83 = t83;
-exports.s84 = s84;
-exports.t84 = t84;
-exports.s85 = s85;
-exports.t85 = t85;
-exports.s86 = s86;
-exports.t86 = t86;
-exports.s87 = s87;
-exports.t87 = t87;
-exports.s88 = s88;
-exports.t88 = t88;
-exports.s89 = s89;
-exports.t89 = t89;
-exports.s90 = s90;
-exports.t90 = t90;
-exports.s91 = s91;
-exports.t91 = t91;
-exports.tst06 = tst06;
-/*  Not a pure module */
diff --git a/jscomp/test/stringmatch_test.res b/jscomp/test/stringmatch_test.res
deleted file mode 100644
index eb57d18..0000000
--- a/jscomp/test/stringmatch_test.res
+++ /dev/null
@@ -1,768 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Luc Maranget, projet Gallium, INRIA Rocquencourt */
-/*  */
-/* Copyright 2014 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
-/*  */
-/* ********************************************************************* */
-
-/* Empty string oddities */
-
-let rec tst01 = s =>
-  switch s {
-  | "" => 0
-  | _ => 1
-  }
-
-let () = {
-  assert (tst01("") == 0)
-  assert (tst01("\000\000\000\003") == 1)
-  assert (tst01("\000\000\000\000\000\000\000\007") == 1)
-  ()
-}
-
-/* A few when clauses */
-
-let tst02 = s => {
-  let len = String.length(s)
-  switch s {
-  | "" if len < 0 => assert(false)
-  | "" => 1
-  | _ if len == 0 => assert(false)
-  | "A" => 2
-  | _ => 3
-  }
-}
-
-let () = {
-  assert (tst02("") == 1)
-  assert (tst02("A") == 2)
-  assert (tst02("B") == 3)
-  assert (tst02("\000\000\000\000\000\000\000\007") == 3)
-  assert (tst02("\000\000\000\003") == 3)
-  ()
-}
-
-/* Keword reckognition */
-
-let s00 = "get_const"
-let t00 = "set_congt"
-let s01 = "get_var"
-let t01 = "gat_ver"
-let s02 = "get_env"
-let t02 = "get_env"
-let s03 = "get_meth"
-let t03 = "met_geth"
-let s04 = "set_var"
-let t04 = "sev_tar"
-let s05 = "app_const"
-let t05 = "ppa_const"
-let s06 = "app_var"
-let t06 = "app_var"
-let s07 = "app_env"
-let t07 = "epp_anv"
-let s08 = "app_meth"
-let t08 = "atp_meph"
-let s09 = "app_const_const"
-let t09 = "app_const_const"
-let s10 = "app_const_var"
-let t10 = "atp_consp_var"
-let s11 = "app_const_env"
-let t11 = "app_constne_v"
-let s12 = "app_const_meth"
-let t12 = "spp_conat_meth"
-let s13 = "app_var_const"
-let t13 = "app_va_rconst"
-let s14 = "app_env_const"
-let t14 = "app_env_const"
-let s15 = "app_meth_const"
-let t15 = "app_teth_consm"
-let s16 = "meth_app_const"
-let t16 = "math_epp_const"
-let s17 = "meth_app_var"
-let t17 = "meth_app_var"
-let s18 = "meth_app_env"
-let t18 = "eeth_app_mnv"
-let s19 = "meth_app_meth"
-let t19 = "meth_apt_meph"
-let s20 = "send_const"
-let t20 = "tend_conss"
-let s21 = "send_var"
-let t21 = "serd_van"
-let s22 = "send_env"
-let t22 = "sen_denv"
-let s23 = "send_meth"
-let t23 = "tend_mesh"
-
-let tst03 = s =>
-  switch s {
-  | "get_const" => 0
-  | "get_var" => 1
-  | "get_env" => 2
-  | "get_meth" => 3
-  | "set_var" => 4
-  | "app_const" => 5
-  | "app_var" => 6
-  | "app_env" => 7
-  | "app_meth" => 8
-  | "app_const_const" => 9
-  | "app_const_var" => 10
-  | "app_const_env" => 11
-  | "app_const_meth" => 12
-  | "app_var_const" => 13
-  | "app_env_const" => 14
-  | "app_meth_const" => 15
-  | "meth_app_const" => 16
-  | "meth_app_var" => 17
-  | "meth_app_env" => 18
-  | "meth_app_meth" => 19
-  | "send_const" => 20
-  | "send_var" => 21
-  | "send_env" => 22
-  | "send_meth" => 23
-  | _ => -1
-  }
-
-let () = {
-  assert (tst03(s00) == 0)
-  assert (tst03(t00) == -1)
-  assert (tst03(s01) == 1)
-  assert (tst03(t01) == -1)
-  assert (tst03(s02) == 2)
-  assert (tst03(t02) == 2)
-  assert (tst03(s03) == 3)
-  assert (tst03(t03) == -1)
-  assert (tst03(s04) == 4)
-  assert (tst03(t04) == -1)
-  assert (tst03(s05) == 5)
-  assert (tst03(t05) == -1)
-  assert (tst03(s06) == 6)
-  assert (tst03(t06) == 6)
-  assert (tst03(s07) == 7)
-  assert (tst03(t07) == -1)
-  assert (tst03(s08) == 8)
-  assert (tst03(t08) == -1)
-  assert (tst03(s09) == 9)
-  assert (tst03(t09) == 9)
-  assert (tst03(s10) == 10)
-  assert (tst03(t10) == -1)
-  assert (tst03(s11) == 11)
-  assert (tst03(t11) == -1)
-  assert (tst03(s12) == 12)
-  assert (tst03(t12) == -1)
-  assert (tst03(s13) == 13)
-  assert (tst03(t13) == -1)
-  assert (tst03(s14) == 14)
-  assert (tst03(t14) == 14)
-  assert (tst03(s15) == 15)
-  assert (tst03(t15) == -1)
-  assert (tst03(s16) == 16)
-  assert (tst03(t16) == -1)
-  assert (tst03(s17) == 17)
-  assert (tst03(t17) == 17)
-  assert (tst03(s18) == 18)
-  assert (tst03(t18) == -1)
-  assert (tst03(s19) == 19)
-  assert (tst03(t19) == -1)
-  assert (tst03(s20) == 20)
-  assert (tst03(t20) == -1)
-  assert (tst03(s21) == 21)
-  assert (tst03(t21) == -1)
-  assert (tst03(s22) == 22)
-  assert (tst03(t22) == -1)
-  assert (tst03(s23) == 23)
-  assert (tst03(t23) == -1)
-  ()
-}
-
-/* Activate the test first column first heuristics */
-
-let s00 = "AAAAAAAA"
-let s01 = "AAAAAAAAAAAAAAAA"
-let s02 = "AAAAAAAAAAAAAAAAAAAAAAAA"
-let s03 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let s04 = "BBBBBBBB"
-let s05 = "BBBBBBBBBBBBBBBB"
-let s06 = "BBBBBBBBBBBBBBBBBBBBBBBB"
-let s07 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
-let s08 = "CCCCCCCC"
-let s09 = "CCCCCCCCCCCCCCCC"
-let s10 = "CCCCCCCCCCCCCCCCCCCCCCCC"
-let s11 = "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"
-
-let tst04 = s =>
-  switch s {
-  | "AAAAAAAA" => 0
-  | "AAAAAAAAAAAAAAAA" => 1
-  | "AAAAAAAAAAAAAAAAAAAAAAAA" => 2
-  | "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" => 3
-  | "BBBBBBBB" => 4
-  | "BBBBBBBBBBBBBBBB" => 5
-  | "BBBBBBBBBBBBBBBBBBBBBBBB" => 6
-  | "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" => 7
-  | "CCCCCCCC" => 8
-  | "CCCCCCCCCCCCCCCC" => 9
-  | "CCCCCCCCCCCCCCCCCCCCCCCC" => 10
-  | "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC" => 11
-  | _ => -1
-  }
-
-let () = {
-  assert (tst04(s00) == 0)
-  assert (tst04(s01) == 1)
-  assert (tst04(s02) == 2)
-  assert (tst04(s03) == 3)
-  assert (tst04(s04) == 4)
-  assert (tst04(s05) == 5)
-  assert (tst04(s06) == 6)
-  assert (tst04(s07) == 7)
-  assert (tst04(s08) == 8)
-  assert (tst04(s09) == 9)
-  assert (tst04(s10) == 10)
-  assert (tst04(s11) == 11)
-  assert (tst04("") == -1)
-  assert (tst04("DDD") == -1)
-  assert (tst04("DDDDDDD") == -1)
-  assert (tst04("AAADDDD") == -1)
-  assert (tst04("AAAAAAADDDDDDDD") == -1)
-  assert (tst04("AAAAAAADDDD") == -1)
-  assert (tst04("AAAAAAAAAAAAAAADDDD") == -1)
-  ()
-}
-
-/* Similar */
-
-let s00 = "AAA"
-let s01 = "AAAA"
-let s02 = "AAAAA"
-let s03 = "AAAAAA"
-let s04 = "AAAAAAA"
-let s05 = "AAAAAAAAAAAA"
-let s06 = "AAAAAAAAAAAAAAAA"
-let s07 = "AAAAAAAAAAAAAAAAAAAA"
-let s08 = "BBB"
-let s09 = "BBBB"
-let s10 = "BBBBB"
-let s11 = "BBBBBB"
-let s12 = "BBBBBBB"
-
-let tst05 = s =>
-  switch s {
-  | "AAA" => 0
-  | "AAAA" => 1
-  | "AAAAA" => 2
-  | "AAAAAA" => 3
-  | "AAAAAAA" => 4
-  | "AAAAAAAAAAAA" => 5
-  | "AAAAAAAAAAAAAAAA" => 6
-  | "AAAAAAAAAAAAAAAAAAAA" => 7
-  | "BBB" => 8
-  | "BBBB" => 9
-  | "BBBBB" => 10
-  | "BBBBBB" => 11
-  | "BBBBBBB" => 12
-  | _ => -1
-  }
-
-let () = {
-  assert (tst05(s00) == 0)
-  assert (tst05(s01) == 1)
-  assert (tst05(s02) == 2)
-  assert (tst05(s03) == 3)
-  assert (tst05(s04) == 4)
-  assert (tst05(s05) == 5)
-  assert (tst05(s06) == 6)
-  assert (tst05(s07) == 7)
-  assert (tst05(s08) == 8)
-  assert (tst05(s09) == 9)
-  assert (tst05(s10) == 10)
-  assert (tst05(s11) == 11)
-  assert (tst05(s12) == 12)
-  assert (tst05("") == -1)
-  assert (tst05("AAD") == -1)
-  assert (tst05("AAAD") == -1)
-  assert (tst05("AAAAAAD") == -1)
-  assert (tst05("AAAAAAAD") == -1)
-  assert (tst05("BBD") == -1)
-  assert (tst05("BBBD") == -1)
-  assert (tst05("BBBBBBD") == -1)
-  assert (tst05("BBBBBBBD") == -1)
-  ()
-}
-
-/* Big test */
-
-let s00 = "and"
-let t00 = "nad"
-let s01 = "as"
-let t01 = "sa"
-let s02 = "assert"
-let t02 = "asesrt"
-let s03 = "begin"
-let t03 = "negib"
-let s04 = "class"
-let t04 = "lcass"
-let s05 = "constraint"
-let t05 = "constiarnt"
-let s06 = "do"
-let t06 = "od"
-let s07 = "done"
-let t07 = "eond"
-let s08 = "downto"
-let t08 = "dowtno"
-let s09 = "else"
-let t09 = "lese"
-let s10 = "end"
-let t10 = "edn"
-let s11 = "exception"
-let t11 = "exception"
-let s12 = "external"
-let t12 = "external"
-let s13 = "false"
-let t13 = "fslae"
-let s14 = "for"
-let t14 = "ofr"
-let s15 = "fun"
-let t15 = "fnu"
-let s16 = "function"
-let t16 = "function"
-let s17 = "functor"
-let t17 = "ounctfr"
-let s18 = "if"
-let t18 = "fi"
-let s19 = "in"
-let t19 = "in"
-let s20 = "include"
-let t20 = "inculde"
-let s21 = "inherit"
-let t21 = "iehnrit"
-let s22 = "initializer"
-let t22 = "enitializir"
-let s23 = "lazy"
-let t23 = "zaly"
-let s24 = "let"
-let t24 = "elt"
-let s25 = "match"
-let t25 = "match"
-let s26 = "method"
-let t26 = "methdo"
-let s27 = "module"
-let t27 = "modelu"
-let s28 = "mutable"
-let t28 = "butamle"
-let s29 = "new"
-let t29 = "wen"
-let s30 = "object"
-let t30 = "objcet"
-let s31 = "of"
-let t31 = "of"
-let s32 = "open"
-let t32 = "epon"
-let s33 = "or"
-let t33 = "ro"
-let s34 = "private"
-let t34 = "privaet"
-let s35 = "rec"
-let t35 = "rec"
-let s36 = "sig"
-let t36 = "gis"
-let s37 = "struct"
-let t37 = "scrutt"
-let s38 = "then"
-let t38 = "hten"
-let s39 = "to"
-let t39 = "to"
-let s40 = "true"
-let t40 = "teur"
-let s41 = "try"
-let t41 = "try"
-let s42 = "type"
-let t42 = "pyte"
-let s43 = "val"
-let t43 = "val"
-let s44 = "virtual"
-let t44 = "vritual"
-let s45 = "when"
-let t45 = "whne"
-let s46 = "while"
-let t46 = "wlihe"
-let s47 = "with"
-let t47 = "iwth"
-let s48 = "mod"
-let t48 = "mod"
-let s49 = "land"
-let t49 = "alnd"
-let s50 = "lor"
-let t50 = "rol"
-let s51 = "lxor"
-let t51 = "lxor"
-let s52 = "lsl"
-let t52 = "lsl"
-let s53 = "lsr"
-let t53 = "lsr"
-let s54 = "asr"
-let t54 = "sar"
-let s55 = "A"
-let t55 = "A"
-let s56 = "AA"
-let t56 = "AA"
-let s57 = "AAA"
-let t57 = "AAA"
-let s58 = "AAAA"
-let t58 = "AAAA"
-let s59 = "AAAAA"
-let t59 = "AAAAA"
-let s60 = "AAAAAA"
-let t60 = "AAAAAA"
-let s61 = "AAAAAAA"
-let t61 = "AAAAAAA"
-let s62 = "AAAAAAAA"
-let t62 = "AAAAAAAA"
-let s63 = "AAAAAAAAA"
-let t63 = "AAAAAAAAA"
-let s64 = "AAAAAAAAAA"
-let t64 = "AAAAAAAAAA"
-let s65 = "AAAAAAAAAAA"
-let t65 = "AAAAAAAAAAA"
-let s66 = "AAAAAAAAAAAA"
-let t66 = "AAAAAAAAAAAA"
-let s67 = "AAAAAAAAAAAAA"
-let t67 = "AAAAAAAAAAAAA"
-let s68 = "AAAAAAAAAAAAAA"
-let t68 = "AAAAAAAAAAAAAA"
-let s69 = "AAAAAAAAAAAAAAA"
-let t69 = "AAAAAAAAAAAAAAA"
-let s70 = "AAAAAAAAAAAAAAAA"
-let t70 = "AAAAAAAAAAAAAAAA"
-let s71 = "AAAAAAAAAAAAAAAAA"
-let t71 = "AAAAAAAAAAAAAAAAA"
-let s72 = "AAAAAAAAAAAAAAAAAA"
-let t72 = "AAAAAAAAAAAAAAAAAA"
-let s73 = "AAAAAAAAAAAAAAAAAAA"
-let t73 = "AAAAAAAAAAAAAAAAAAA"
-let s74 = "AAAAAAAAAAAAAAAAAAAA"
-let t74 = "AAAAAAAAAAAAAAAAAAAA"
-let s75 = "AAAAAAAAAAAAAAAAAAAAA"
-let t75 = "AAAAAAAAAAAAAAAAAAAAA"
-let s76 = "AAAAAAAAAAAAAAAAAAAAAA"
-let t76 = "AAAAAAAAAAAAAAAAAAAAAA"
-let s77 = "AAAAAAAAAAAAAAAAAAAAAAA"
-let t77 = "AAAAAAAAAAAAAAAAAAAAAAA"
-let s78 = "AAAAAAAAAAAAAAAAAAAAAAAA"
-let t78 = "AAAAAAAAAAAAAAAAAAAAAAAA"
-let s79 = "AAAAAAAAAAAAAAAAAAAAAAAAA"
-let t79 = "AAAAAAAAAAAAAAAAAAAAAAAAA"
-let s80 = "AAAAAAAAAAAAAAAAAAAAAAAAAA"
-let t80 = "AAAAAAAAAAAAAAAAAAAAAAAAAA"
-let s81 = "AAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let t81 = "AAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let s82 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let t82 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let s83 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let t83 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let s84 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let t84 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let s85 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let t85 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let s86 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let t86 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let s87 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let t87 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let s88 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let t88 = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-let s89 = "BBBBBBBBBBBBBBB"
-let t89 = "BBBBBBBBBBBBBBB"
-let s90 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
-let t90 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
-let s91 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
-let t91 = "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
-
-let tst06 = s =>
-  switch s {
-  | "and" => 0
-  | "as" => 1
-  | "assert" => 2
-  | "begin" => 3
-  | "class" => 4
-  | "constraint" => 5
-  | "do" => 6
-  | "done" => 7
-  | "downto" => 8
-  | "else" => 9
-  | "end" => 10
-  | "exception" => 11
-  | "external" => 12
-  | "false" => 13
-  | "for" => 14
-  | "fun" => 15
-  | "function" => 16
-  | "functor" => 17
-  | "if" => 18
-  | "in" => 19
-  | "include" => 20
-  | "inherit" => 21
-  | "initializer" => 22
-  | "lazy" => 23
-  | "let" => 24
-  | "match" => 25
-  | "method" => 26
-  | "module" => 27
-  | "mutable" => 28
-  | "new" => 29
-  | "object" => 30
-  | "of" => 31
-  | "open" => 32
-  | "or" => 33
-  | "private" => 34
-  | "rec" => 35
-  | "sig" => 36
-  | "struct" => 37
-  | "then" => 38
-  | "to" => 39
-  | "true" => 40
-  | "try" => 41
-  | "type" => 42
-  | "val" => 43
-  | "virtual" => 44
-  | "when" => 45
-  | "while" => 46
-  | "with" => 47
-  | "mod" => 48
-  | "land" => 49
-  | "lor" => 50
-  | "lxor" => 51
-  | "lsl" => 52
-  | "lsr" => 53
-  | "asr" => 54
-  | "A" => 55
-  | "AA" => 56
-  | "AAA" => 57
-  | "AAAA" => 58
-  | "AAAAA" => 59
-  | "AAAAAA" => 60
-  | "AAAAAAA" => 61
-  | "AAAAAAAA" => 62
-  | "AAAAAAAAA" => 63
-  | "AAAAAAAAAA" => 64
-  | "AAAAAAAAAAA" => 65
-  | "AAAAAAAAAAAA" => 66
-  | "AAAAAAAAAAAAA" => 67
-  | "AAAAAAAAAAAAAA" => 68
-  | "AAAAAAAAAAAAAAA" => 69
-  | "AAAAAAAAAAAAAAAA" => 70
-  | "AAAAAAAAAAAAAAAAA" => 71
-  | "AAAAAAAAAAAAAAAAAA" => 72
-  | "AAAAAAAAAAAAAAAAAAA" => 73
-  | "AAAAAAAAAAAAAAAAAAAA" => 74
-  | "AAAAAAAAAAAAAAAAAAAAA" => 75
-  | "AAAAAAAAAAAAAAAAAAAAAA" => 76
-  | "AAAAAAAAAAAAAAAAAAAAAAA" => 77
-  | "AAAAAAAAAAAAAAAAAAAAAAAA" => 78
-  | "AAAAAAAAAAAAAAAAAAAAAAAAA" => 79
-  | "AAAAAAAAAAAAAAAAAAAAAAAAAA" => 80
-  | "AAAAAAAAAAAAAAAAAAAAAAAAAAA" => 81
-  | "AAAAAAAAAAAAAAAAAAAAAAAAAAAA" => 82
-  | "AAAAAAAAAAAAAAAAAAAAAAAAAAAAA" => 83
-  | "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" => 84
-  | "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" => 85
-  | "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" => 86
-  | "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" => 87
-  | "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" => 88
-  | "BBBBBBBBBBBBBBB" => 89
-  | "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" => 90
-  | "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" => 91
-  | _ => -1
-  }
-
-let () = {
-  assert (tst06(s00) == 0)
-  assert (tst06(t00) == -1)
-  assert (tst06(s01) == 1)
-  assert (tst06(t01) == -1)
-  assert (tst06(s02) == 2)
-  assert (tst06(t02) == -1)
-  assert (tst06(s03) == 3)
-  assert (tst06(t03) == -1)
-  assert (tst06(s04) == 4)
-  assert (tst06(t04) == -1)
-  assert (tst06(s05) == 5)
-  assert (tst06(t05) == -1)
-  assert (tst06(s06) == 6)
-  assert (tst06(t06) == -1)
-  assert (tst06(s07) == 7)
-  assert (tst06(t07) == -1)
-  assert (tst06(s08) == 8)
-  assert (tst06(t08) == -1)
-  assert (tst06(s09) == 9)
-  assert (tst06(t09) == -1)
-  assert (tst06(s10) == 10)
-  assert (tst06(t10) == -1)
-  assert (tst06(s11) == 11)
-  assert (tst06(t11) == 11)
-  assert (tst06(s12) == 12)
-  assert (tst06(t12) == 12)
-  assert (tst06(s13) == 13)
-  assert (tst06(t13) == -1)
-  assert (tst06(s14) == 14)
-  assert (tst06(t14) == -1)
-  assert (tst06(s15) == 15)
-  assert (tst06(t15) == -1)
-  assert (tst06(s16) == 16)
-  assert (tst06(t16) == 16)
-  assert (tst06(s17) == 17)
-  assert (tst06(t17) == -1)
-  assert (tst06(s18) == 18)
-  assert (tst06(t18) == -1)
-  assert (tst06(s19) == 19)
-  assert (tst06(t19) == 19)
-  assert (tst06(s20) == 20)
-  assert (tst06(t20) == -1)
-  assert (tst06(s21) == 21)
-  assert (tst06(t21) == -1)
-  assert (tst06(s22) == 22)
-  assert (tst06(t22) == -1)
-  assert (tst06(s23) == 23)
-  assert (tst06(t23) == -1)
-  assert (tst06(s24) == 24)
-  assert (tst06(t24) == -1)
-  assert (tst06(s25) == 25)
-  assert (tst06(t25) == 25)
-  assert (tst06(s26) == 26)
-  assert (tst06(t26) == -1)
-  assert (tst06(s27) == 27)
-  assert (tst06(t27) == -1)
-  assert (tst06(s28) == 28)
-  assert (tst06(t28) == -1)
-  assert (tst06(s29) == 29)
-  assert (tst06(t29) == -1)
-  assert (tst06(s30) == 30)
-  assert (tst06(t30) == -1)
-  assert (tst06(s31) == 31)
-  assert (tst06(t31) == 31)
-  assert (tst06(s32) == 32)
-  assert (tst06(t32) == -1)
-  assert (tst06(s33) == 33)
-  assert (tst06(t33) == -1)
-  assert (tst06(s34) == 34)
-  assert (tst06(t34) == -1)
-  assert (tst06(s35) == 35)
-  assert (tst06(t35) == 35)
-  assert (tst06(s36) == 36)
-  assert (tst06(t36) == -1)
-  assert (tst06(s37) == 37)
-  assert (tst06(t37) == -1)
-  assert (tst06(s38) == 38)
-  assert (tst06(t38) == -1)
-  assert (tst06(s39) == 39)
-  assert (tst06(t39) == 39)
-  assert (tst06(s40) == 40)
-  assert (tst06(t40) == -1)
-  assert (tst06(s41) == 41)
-  assert (tst06(t41) == 41)
-  assert (tst06(s42) == 42)
-  assert (tst06(t42) == -1)
-  assert (tst06(s43) == 43)
-  assert (tst06(t43) == 43)
-  assert (tst06(s44) == 44)
-  assert (tst06(t44) == -1)
-  assert (tst06(s45) == 45)
-  assert (tst06(t45) == -1)
-  assert (tst06(s46) == 46)
-  assert (tst06(t46) == -1)
-  assert (tst06(s47) == 47)
-  assert (tst06(t47) == -1)
-  assert (tst06(s48) == 48)
-  assert (tst06(t48) == 48)
-  assert (tst06(s49) == 49)
-  assert (tst06(t49) == -1)
-  assert (tst06(s50) == 50)
-  assert (tst06(t50) == -1)
-  assert (tst06(s51) == 51)
-  assert (tst06(t51) == 51)
-  assert (tst06(s52) == 52)
-  assert (tst06(t52) == 52)
-  assert (tst06(s53) == 53)
-  assert (tst06(t53) == 53)
-  assert (tst06(s54) == 54)
-  assert (tst06(t54) == -1)
-  assert (tst06(s55) == 55)
-  assert (tst06(t55) == 55)
-  assert (tst06(s56) == 56)
-  assert (tst06(t56) == 56)
-  assert (tst06(s57) == 57)
-  assert (tst06(t57) == 57)
-  assert (tst06(s58) == 58)
-  assert (tst06(t58) == 58)
-  assert (tst06(s59) == 59)
-  assert (tst06(t59) == 59)
-  assert (tst06(s60) == 60)
-  assert (tst06(t60) == 60)
-  assert (tst06(s61) == 61)
-  assert (tst06(t61) == 61)
-  assert (tst06(s62) == 62)
-  assert (tst06(t62) == 62)
-  assert (tst06(s63) == 63)
-  assert (tst06(t63) == 63)
-  assert (tst06(s64) == 64)
-  assert (tst06(t64) == 64)
-  assert (tst06(s65) == 65)
-  assert (tst06(t65) == 65)
-  assert (tst06(s66) == 66)
-  assert (tst06(t66) == 66)
-  assert (tst06(s67) == 67)
-  assert (tst06(t67) == 67)
-  assert (tst06(s68) == 68)
-  assert (tst06(t68) == 68)
-  assert (tst06(s69) == 69)
-  assert (tst06(t69) == 69)
-  assert (tst06(s70) == 70)
-  assert (tst06(t70) == 70)
-  assert (tst06(s71) == 71)
-  assert (tst06(t71) == 71)
-  assert (tst06(s72) == 72)
-  assert (tst06(t72) == 72)
-  assert (tst06(s73) == 73)
-  assert (tst06(t73) == 73)
-  assert (tst06(s74) == 74)
-  assert (tst06(t74) == 74)
-  assert (tst06(s75) == 75)
-  assert (tst06(t75) == 75)
-  assert (tst06(s76) == 76)
-  assert (tst06(t76) == 76)
-  assert (tst06(s77) == 77)
-  assert (tst06(t77) == 77)
-  assert (tst06(s78) == 78)
-  assert (tst06(t78) == 78)
-  assert (tst06(s79) == 79)
-  assert (tst06(t79) == 79)
-  assert (tst06(s80) == 80)
-  assert (tst06(t80) == 80)
-  assert (tst06(s81) == 81)
-  assert (tst06(t81) == 81)
-  assert (tst06(s82) == 82)
-  assert (tst06(t82) == 82)
-  assert (tst06(s83) == 83)
-  assert (tst06(t83) == 83)
-  assert (tst06(s84) == 84)
-  assert (tst06(t84) == 84)
-  assert (tst06(s85) == 85)
-  assert (tst06(t85) == 85)
-  assert (tst06(s86) == 86)
-  assert (tst06(t86) == 86)
-  assert (tst06(s87) == 87)
-  assert (tst06(t87) == 87)
-  assert (tst06(s88) == 88)
-  assert (tst06(t88) == 88)
-  assert (tst06(s89) == 89)
-  assert (tst06(t89) == 89)
-  assert (tst06(s90) == 90)
-  assert (tst06(t90) == 90)
-  assert (tst06(s91) == 91)
-  assert (tst06(t91) == 91)
-  assert (tst06("") == -1)
-  ()
-}
diff --git a/jscomp/test/submodule.js b/jscomp/test/submodule.js
deleted file mode 100644
index bc7b49d..0000000
--- a/jscomp/test/submodule.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log(2);
-
-function a0(x, y) {
-  return (x + y | 0) + 1 | 0;
-}
-
-console.log(5);
-
-function a1(x, y) {
-  return a0(x, y) + 1 | 0;
-}
-
-console.log(8);
-
-function a2(x, y) {
-  return a1(x, y) + 1 | 0;
-}
-
-console.log(11);
-
-function a3(x, y) {
-  return a2(x, y) + 1 | 0;
-}
-
-console.log(14);
-
-function a4(x, y) {
-  return a3(x, y) + 1 | 0;
-}
-
-var A4 = {
-  a4: a4
-};
-
-var A3 = {
-  a3: a3,
-  A4: A4
-};
-
-var A2 = {
-  a2: a2,
-  A3: A3
-};
-
-var A1 = {
-  a1: a1,
-  A2: A2
-};
-
-var A0 = {
-  a0: a0,
-  A1: A1
-};
-
-var v1 = a1(1, 2);
-
-var v2 = a2(1, 2);
-
-var v3 = a3(1, 2);
-
-var v4 = a4(1, 2);
-
-var v0 = 4;
-
-exports.A0 = A0;
-exports.v0 = v0;
-exports.v1 = v1;
-exports.v2 = v2;
-exports.v3 = v3;
-exports.v4 = v4;
-/*  Not a pure module */
diff --git a/jscomp/test/submodule.res b/jscomp/test/submodule.res
deleted file mode 100644
index ff28846..0000000
--- a/jscomp/test/submodule.res
+++ /dev/null
@@ -1,26 +0,0 @@
-module A0 = {
-  let () = Js.log(__LINE__)
-  let a0 = (x, y) => x + y + 1
-  module A1 = {
-    let () = Js.log(__LINE__)
-    let a1 = (x, y) => a0(x, y) + 1
-    module A2 = {
-      let () = Js.log(__LINE__)
-      let a2 = (x, y) => a1(x, y) + 1
-      module A3 = {
-        let () = Js.log(__LINE__)
-        let a3 = (x, y) => a2(x, y) + 1
-        module A4 = {
-          let () = Js.log(__LINE__)
-          let a4 = (x, y) => a3(x, y) + 1
-        }
-      }
-    }
-  }
-}
-
-let v0 = A0.a0(1, 2)
-let v1 = A0.A1.a1(1, 2)
-let v2 = A0.A1.A2.a2(1, 2)
-let v3 = A0.A1.A2.A3.a3(1, 2)
-let v4 = A0.A1.A2.A3.A4.a4(1, 2)
diff --git a/jscomp/test/submodule_call.js b/jscomp/test/submodule_call.js
deleted file mode 100644
index 331d3eb..0000000
--- a/jscomp/test/submodule_call.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Submodule = require("./submodule.js");
-
-var a0 = Submodule.A0.a0(1, 2);
-
-var a1 = Curry._2(Submodule.A0.A1.a1, 1, 2);
-
-var a2 = Curry._2(Submodule.A0.A1.A2.a2, 1, 2);
-
-var a3 = Curry._2(Submodule.A0.A1.A2.A3.a3, 1, 2);
-
-var a4 = Curry._2(Submodule.A0.A1.A2.A3.A4.a4, 1, 2);
-
-exports.a0 = a0;
-exports.a1 = a1;
-exports.a2 = a2;
-exports.a3 = a3;
-exports.a4 = a4;
-/* a0 Not a pure module */
diff --git a/jscomp/test/submodule_call.res b/jscomp/test/submodule_call.res
deleted file mode 100644
index ba8c017..0000000
--- a/jscomp/test/submodule_call.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let a0 = Submodule.A0.a0(1, 2)
-let a1 = Submodule.A0.A1.a1(1, 2)
-let a2 = Submodule.A0.A1.A2.a2(1, 2)
-let a3 = Submodule.A0.A1.A2.A3.a3(1, 2)
-let a4 = Submodule.A0.A1.A2.A3.A4.a4(1, 2)
diff --git a/jscomp/test/switch_case_test.js b/jscomp/test/switch_case_test.js
deleted file mode 100644
index 230d6f7..0000000
--- a/jscomp/test/switch_case_test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(x) {
-  switch (x) {
-    case "xx'''" :
-        return 0;
-    case "xx\"" :
-        return 1;
-    case "xx\\\"" :
-        return 2;
-    case "xx\\\"\"" :
-        return 3;
-    default:
-      return 4;
-  }
-}
-
-eq("File \"switch_case_test.res\", line 19, characters 5-12", f("xx'''"), 0);
-
-eq("File \"switch_case_test.res\", line 20, characters 5-12", f("xx\""), 1);
-
-eq("File \"switch_case_test.res\", line 21, characters 5-12", f("xx\\\""), 2);
-
-eq("File \"switch_case_test.res\", line 22, characters 5-12", f("xx\\\"\""), 3);
-
-Mt.from_pair_suites("Switch_case_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/switch_case_test.res b/jscomp/test/switch_case_test.res
deleted file mode 100644
index ec1c4ef..0000000
--- a/jscomp/test/switch_case_test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let f = x =>
-  switch x {
-  | "xx'''" => 0
-  | "xx\"" => 1
-  | `xx\\"` => 2
-  | `xx\\""` => 3
-  | _ => 4
-  }
-
-let () = {
-  eq(__LOC__, f("xx'''"), 0)
-  eq(__LOC__, f("xx\""), 1)
-  eq(__LOC__, f(`xx\\"`), 2)
-  eq(__LOC__, f(`xx\\""`), 3)
-}
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/switch_string.js b/jscomp/test/switch_string.js
deleted file mode 100644
index 41ef914..0000000
--- a/jscomp/test/switch_string.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function foo(x) {
-  if (x === "\"") {
-    return "\"";
-  } else {
-    return "";
-  }
-}
-
-function bar(x) {
-  switch (x) {
-    case "\\" :
-        return "\\";
-    case "😀" :
-        return "😀";
-    default:
-      return "";
-  }
-}
-
-var s = "😀";
-
-exports.foo = foo;
-exports.s = s;
-exports.bar = bar;
-/* No side effect */
diff --git a/jscomp/test/switch_string.res b/jscomp/test/switch_string.res
deleted file mode 100644
index 2a164ab..0000000
--- a/jscomp/test/switch_string.res
+++ /dev/null
@@ -1,13 +0,0 @@
-let foo = x =>
-  switch x {
-  | "\"" => "\""
-  | _ => ""
-  }
-
-let s = "😀"
-
-let bar = x => switch x {
-  | "\\" => "\\"
-  | "😀" => "😀"
-  | _ => ""
-}
diff --git a/jscomp/test/tagged_template_lib.js b/jscomp/test/tagged_template_lib.js
deleted file mode 100644
index 5b4a6ed..0000000
--- a/jscomp/test/tagged_template_lib.js
+++ /dev/null
@@ -1,12 +0,0 @@
-exports.sql = (strings, ...values) => {
-    let result = "";
-    for (let i = 0; i < values.length; i++) {
-        result += strings[i] + "'" + values[i] + "'";
-    }
-    result += strings[values.length];
-    return result;
-};
-
-exports.length = (strings, ...values) => 
-    strings.reduce((acc, curr) => acc + curr.length, 0) + 
-        values.reduce((acc, curr) => acc + curr, 0);
diff --git a/jscomp/test/tagged_template_test.js b/jscomp/test/tagged_template_test.js
deleted file mode 100644
index 467f73a..0000000
--- a/jscomp/test/tagged_template_test.js
+++ /dev/null
@@ -1,117 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_splice_call = require("../../lib/js/caml_splice_call.js");
-var Tagged_template_libJs = require("./tagged_template_lib.js");
-
-function sql(prim0, prim1) {
-  return Caml_splice_call.spliceApply(Tagged_template_libJs.sql, [
-              prim0,
-              prim1
-            ]);
-}
-
-var Pg = {
-  sql: sql
-};
-
-var table = "users";
-
-var id = "5";
-
-var queryWithModule = Tagged_template_libJs.sql`SELECT * FROM ${table} WHERE id = ${id}`;
-
-var query = Tagged_template_libJs.sql`SELECT * FROM ${table} WHERE id = ${id}`;
-
-var length = Tagged_template_libJs.length`hello ${10} what's the total length? Is it ${3}?`;
-
-function foo(strings, values) {
-  var res = "";
-  var valueCount = values.length;
-  for(var i = 0; i < valueCount; ++i){
-    res = res + Caml_array.get(strings, i) + String(Math.imul(Caml_array.get(values, i), 10));
-  }
-  return res + Caml_array.get(strings, valueCount);
-}
-
-var res = foo([
-      "| 5 × 10 = ",
-      " |"
-    ], [5]);
-
-Mt.from_pair_suites("tagged templates", {
-      hd: [
-        "with externals, it should return a string with the correct interpolations",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: query,
-                    _1: "SELECT * FROM 'users' WHERE id = '5'"
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "with module scoped externals, it should also return a string with the correct interpolations",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: queryWithModule,
-                      _1: "SELECT * FROM 'users' WHERE id = '5'"
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "with externals, it should return the result of the function",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: length,
-                        _1: 52
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "with rescript function, it should return a string with the correct encoding and interpolations",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: res,
-                          _1: "| 5 × 10 = 50 |"
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "a template literal tagged with json should generate a regular string interpolation for now",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: "some random " + "string",
-                            _1: "some random string"
-                          };
-                  })
-              ],
-              tl: /* [] */0
-            }
-          }
-        }
-      }
-    });
-
-var extraLength = 10;
-
-exports.Pg = Pg;
-exports.table = table;
-exports.id = id;
-exports.queryWithModule = queryWithModule;
-exports.query = query;
-exports.extraLength = extraLength;
-exports.length = length;
-exports.foo = foo;
-exports.res = res;
-/* queryWithModule Not a pure module */
diff --git a/jscomp/test/tagged_template_test.res b/jscomp/test/tagged_template_test.res
deleted file mode 100644
index bb302d7..0000000
--- a/jscomp/test/tagged_template_test.res
+++ /dev/null
@@ -1,55 +0,0 @@
-module Pg = {
-  @module("./tagged_template_lib.js") @taggedTemplate
-  external sql: (array<string>, array<string>) => string = "sql"
-}
-
-let table = "users"
-let id = "5"
-
-let queryWithModule = Pg.sql`SELECT * FROM ${table} WHERE id = ${id}`
-
-open Pg 
-let query = sql`SELECT * FROM ${table} WHERE id = ${id}`
-
-@module("./tagged_template_lib.js") @taggedTemplate
-external length: (array<string>, array<int>) => int = "length"
-
-let extraLength = 10
-let length = length`hello ${extraLength} what's the total length? Is it ${3}?`
-
-let foo = (strings, values) => {
-  let res = ref("")
-  let valueCount = Array.length(values)
-  for i in 0 to valueCount - 1 {
-    res := res.contents ++ strings[i] ++ string_of_int(values[i] * 10)
-  }
-  res.contents ++ strings[valueCount]
-}
-
-let res = foo`| 5 × 10 = ${5} |`
-
-Mt.from_pair_suites(
-  "tagged templates",
-  list{
-    (
-      "with externals, it should return a string with the correct interpolations",
-      () => Eq(query, "SELECT * FROM 'users' WHERE id = '5'"),
-    ),
-    (
-      "with module scoped externals, it should also return a string with the correct interpolations",
-      () => Eq(queryWithModule, "SELECT * FROM 'users' WHERE id = '5'"),
-    ),
-        (
-      "with externals, it should return the result of the function",
-      () => Eq(length, 52),
-    ),
-    (
-      "with rescript function, it should return a string with the correct encoding and interpolations",
-      () => Eq(res, "| 5 × 10 = 50 |"),
-    ),
-    (
-      "a template literal tagged with json should generate a regular string interpolation for now",
-      () => Eq(json`some random ${"string"}`, "some random string"),
-    ),
-  },
-)
\ No newline at end of file
diff --git a/jscomp/test/tailcall_inline_test.js b/jscomp/test/tailcall_inline_test.js
deleted file mode 100644
index 491916a..0000000
--- a/jscomp/test/tailcall_inline_test.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var $$Array = require("../../lib/js/array.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function f(param) {
-  var f$1 = function (_acc, _n) {
-    while(true) {
-      var n = _n;
-      var acc = _acc;
-      if (n <= 0) {
-        return acc;
-      }
-      _n = n - 1 | 0;
-      _acc = acc + n | 0;
-      continue ;
-    };
-  };
-  var v = Caml_array.make(10, 0);
-  for(var i = 0; i <= 9; ++i){
-    Caml_array.set(v, i, f$1(0, i));
-  }
-  return v;
-}
-
-var suites_0 = [
-  "acc",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: f(),
-              _1: [
-                0,
-                1,
-                3,
-                6,
-                10,
-                15,
-                21,
-                28,
-                36,
-                45
-              ]
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "array_to_list",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: {
-                  hd: 1,
-                  tl: {
-                    hd: 2,
-                    tl: {
-                      hd: 3,
-                      tl: /* [] */0
-                    }
-                  }
-                },
-                _1: $$Array.to_list([
-                      1,
-                      2,
-                      3
-                    ])
-              };
-      })
-  ],
-  tl: /* [] */0
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Tailcall_inline_test", suites);
-
-exports.f = f;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/tailcall_inline_test.res b/jscomp/test/tailcall_inline_test.res
deleted file mode 100644
index e769c8c..0000000
--- a/jscomp/test/tailcall_inline_test.res
+++ /dev/null
@@ -1,24 +0,0 @@
-let f = () => {
-  let rec f = (acc, n) =>
-    if n > 0 {
-      f(acc + n, n - 1)
-    } else {
-      acc
-    }
-  let len = 10
-  let v = Array.make(len, 0)
-  for i in 0 to len - 1 {
-    v[i] = f(0, i)
-  }
-  v
-}
-
-let suites = {
-  open Mt
-  list{
-    ("acc", _ => Eq(f(), [0, 1, 3, 6, 10, 15, 21, 28, 36, 45])),
-    ("array_to_list", _ => Eq(list{1, 2, 3}, Array.to_list([1, 2, 3]))),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/template.js b/jscomp/test/template.js
deleted file mode 100644
index 16c848d..0000000
--- a/jscomp/test/template.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var bla2 = "";
-
-function concat(param) {
-  return "\n    display:\r flex;\n   " + bla2;
-}
-
-exports.bla2 = bla2;
-exports.concat = concat;
-/* No side effect */
diff --git a/jscomp/test/template.res b/jscomp/test/template.res
deleted file mode 100644
index 42a4168..0000000
--- a/jscomp/test/template.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let bla2 = ``
-
-let concat = () => {
-  let bla = `
-    display:\r flex;
-   `
-
-  `${bla}${bla2}`
-}
diff --git a/jscomp/test/test.js b/jscomp/test/test.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/test.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/test.res b/jscomp/test/test.res
deleted file mode 100644
index 864f496..0000000
--- a/jscomp/test/test.res
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Js.Undefined.to_opt (if Js.typeof [%raw {|x|}] then
- [%raw{|x|}] else Js.Undefined.empty ) */
-/*
-let a = 
-  match Js.Undefined.to_opt [%raw {|___undefined_value|}] with 
-  | None -> 1 
-  | Some _ -> 2 
-
-
-external file : string option = "__filename" 
-[@@bs.val] [@@bs.return{undefined_to_opt}]
-
-
-let a = 
-    match file with 
-    | None -> 0
-    | Some x ->  Js.log x ; 1
-
-(*
-let b = 
-    match [%external __filename] with 
-    | None -> 0
-    | Some x -> Js.log x ; 1
-*)
-
-let c = 
-    let v = 
-        if Js.typeof [%raw {|__filename|} ] == "undefined" then 
-            [%raw {|__filename|}
-            ]  else
-    Js.undefined  in 
-    match Js.Undefined.to_opt v  with 
-    | None -> 0
-    | Some _  -> 1  
-(* let f x = Js.Undefined.test x*)
-*/
diff --git a/jscomp/test/test2.js b/jscomp/test/test2.js
deleted file mode 100644
index 7a06ae7..0000000
--- a/jscomp/test/test2.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var H = {};
-
-var U = {
-  H: H
-};
-
-exports.U = U;
-/* No side effect */
diff --git a/jscomp/test/test2.res b/jscomp/test/test2.res
deleted file mode 100644
index 4a5967a..0000000
--- a/jscomp/test/test2.res
+++ /dev/null
@@ -1,5 +0,0 @@
-module U = {
-  module H = {
-    type t = string
-  }
-}
diff --git a/jscomp/test/test_alias.js b/jscomp/test/test_alias.js
deleted file mode 100644
index 2f62e8b..0000000
--- a/jscomp/test/test_alias.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-
-var v = List.length;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/test_alias.res b/jscomp/test/test_alias.res
deleted file mode 100644
index 4222ad9..0000000
--- a/jscomp/test/test_alias.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = Test_global_print.V.length
diff --git a/jscomp/test/test_ari.js b/jscomp/test/test_ari.js
deleted file mode 100644
index 123c7b7..0000000
--- a/jscomp/test/test_ari.js
+++ /dev/null
@@ -1,212 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var U = require("U");
-var VV = require("VV");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-
-function f(x) {
-  return function (param) {
-    return x + param | 0;
-  };
-}
-
-function f1(x, y) {
-  return x + y | 0;
-}
-
-function f3(g, x) {
-  return Curry._1(g, x);
-}
-
-function f2(param) {
-  return 3 + param | 0;
-}
-
-var g = 7;
-
-function ff(param) {
-  return U.test_primit(3, param);
-}
-
-var fff = VV.test_primit2(3);
-
-function length_aux(_len, _x) {
-  while(true) {
-    var x = _x;
-    var len = _len;
-    if (!x) {
-      return len;
-    }
-    _x = x.tl;
-    _len = len + 1 | 0;
-    continue ;
-  };
-}
-
-var length = List.length;
-
-var compare_lengths = List.compare_lengths;
-
-var compare_length_with = List.compare_length_with;
-
-var cons = List.cons;
-
-var hd = List.hd;
-
-var tl = List.tl;
-
-var nth = List.nth;
-
-var nth_opt = List.nth_opt;
-
-var rev = List.rev;
-
-var init = List.init;
-
-var append = List.append;
-
-var rev_append = List.rev_append;
-
-var concat = List.concat;
-
-var flatten = List.flatten;
-
-var iter = List.iter;
-
-var iteri = List.iteri;
-
-var map = List.map;
-
-var mapi = List.mapi;
-
-var rev_map = List.rev_map;
-
-var fold_left = List.fold_left;
-
-var fold_right = List.fold_right;
-
-var iter2 = List.iter2;
-
-var map2 = List.map2;
-
-var rev_map2 = List.rev_map2;
-
-var fold_left2 = List.fold_left2;
-
-var fold_right2 = List.fold_right2;
-
-var for_all = List.for_all;
-
-var exists = List.exists;
-
-var for_all2 = List.for_all2;
-
-var exists2 = List.exists2;
-
-var mem = List.mem;
-
-var memq = List.memq;
-
-var find = List.find;
-
-var find_opt = List.find_opt;
-
-var filter = List.filter;
-
-var find_all = List.find_all;
-
-var partition = List.partition;
-
-var assoc = List.assoc;
-
-var assoc_opt = List.assoc_opt;
-
-var assq = List.assq;
-
-var assq_opt = List.assq_opt;
-
-var mem_assoc = List.mem_assoc;
-
-var mem_assq = List.mem_assq;
-
-var remove_assoc = List.remove_assoc;
-
-var remove_assq = List.remove_assq;
-
-var split = List.split;
-
-var combine = List.combine;
-
-var sort = List.sort;
-
-var stable_sort = List.stable_sort;
-
-var fast_sort = List.fast_sort;
-
-var sort_uniq = List.sort_uniq;
-
-var merge = List.merge;
-
-exports.f = f;
-exports.f1 = f1;
-exports.f3 = f3;
-exports.f2 = f2;
-exports.g = g;
-exports.ff = ff;
-exports.fff = fff;
-exports.length_aux = length_aux;
-exports.length = length;
-exports.compare_lengths = compare_lengths;
-exports.compare_length_with = compare_length_with;
-exports.cons = cons;
-exports.hd = hd;
-exports.tl = tl;
-exports.nth = nth;
-exports.nth_opt = nth_opt;
-exports.rev = rev;
-exports.init = init;
-exports.append = append;
-exports.rev_append = rev_append;
-exports.concat = concat;
-exports.flatten = flatten;
-exports.iter = iter;
-exports.iteri = iteri;
-exports.map = map;
-exports.mapi = mapi;
-exports.rev_map = rev_map;
-exports.fold_left = fold_left;
-exports.fold_right = fold_right;
-exports.iter2 = iter2;
-exports.map2 = map2;
-exports.rev_map2 = rev_map2;
-exports.fold_left2 = fold_left2;
-exports.fold_right2 = fold_right2;
-exports.for_all = for_all;
-exports.exists = exists;
-exports.for_all2 = for_all2;
-exports.exists2 = exists2;
-exports.mem = mem;
-exports.memq = memq;
-exports.find = find;
-exports.find_opt = find_opt;
-exports.filter = filter;
-exports.find_all = find_all;
-exports.partition = partition;
-exports.assoc = assoc;
-exports.assoc_opt = assoc_opt;
-exports.assq = assq;
-exports.assq_opt = assq_opt;
-exports.mem_assoc = mem_assoc;
-exports.mem_assq = mem_assq;
-exports.remove_assoc = remove_assoc;
-exports.remove_assq = remove_assq;
-exports.split = split;
-exports.combine = combine;
-exports.sort = sort;
-exports.stable_sort = stable_sort;
-exports.fast_sort = fast_sort;
-exports.sort_uniq = sort_uniq;
-exports.merge = merge;
-/* fff Not a pure module */
diff --git a/jscomp/test/test_ari.res b/jscomp/test/test_ari.res
deleted file mode 100644
index cfdf3b6..0000000
--- a/jscomp/test/test_ari.res
+++ /dev/null
@@ -1,34 +0,0 @@
-let f = x => \"+"(x)
-/*
-{[
- f = function (x){ function(x,y){x + y} (x) }
-]}
-  after optimization
-{[
-  f = \x -> \y -> ..
-]}
-actually will become 
-{[
-  f = \(x,y) ->  x + y 
-]}
-
-*/
-let f1 = (x, y) => x + y
-let f3 = (g, x) => g(x)
-let f2 = \"+"(3)
-let g = f(3, 4)
-
-@val("test_primit") @module("U") external ext: (int, int) => int = "test_primit"
-
-let ff = ext(3)
-type u = int => int
-@val("test_primit2") @module("VV") external ext: int => u = "test_primit2"
-let fff = ext(3)
-
-let rec length_aux = (len, x) =>
-  switch x {
-  | list{} => len
-  | list{a, ...l} => length_aux(len + 1, l)
-  }
-
-include List
diff --git a/jscomp/test/test_array.js b/jscomp/test/test_array.js
deleted file mode 100644
index 2d020e4..0000000
--- a/jscomp/test/test_array.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Array = require("../../lib/js/array.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-var v = Caml_array.make(6, 5);
-
-Caml_array.make_float(30);
-
-var h = $$Array.sub(v, 0, 2);
-
-var hhh = $$Array.append([
-      1,
-      2,
-      3,
-      4
-    ], [
-      1,
-      2,
-      3,
-      5
-    ]);
-
-var u = Caml_array.concat({
-      hd: [
-        1,
-        2
-      ],
-      tl: {
-        hd: [
-          2,
-          3
-        ],
-        tl: {
-          hd: [
-            3,
-            4
-          ],
-          tl: /* [] */0
-        }
-      }
-    });
-
-var hh = $$Array.blit;
-
-exports.v = v;
-exports.h = h;
-exports.hh = hh;
-exports.hhh = hhh;
-exports.u = u;
-/*  Not a pure module */
diff --git a/jscomp/test/test_array.res b/jscomp/test/test_array.res
deleted file mode 100644
index dbca25c..0000000
--- a/jscomp/test/test_array.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let v = Array.make(6, 5)
-
-let u = Array.make_float(30)
-let h = Array.sub(v, 0, 2)
-let hh = Array.blit
-
-let hhh = Array.append([1, 2, 3, 4], [1, 2, 3, 5])
-
-let u = Array.concat(list{[1, 2], [2, 3], [3, 4]})
-/* console.log(v ) */
diff --git a/jscomp/test/test_array_append.js b/jscomp/test/test_array_append.js
deleted file mode 100644
index 32b5953..0000000
--- a/jscomp/test/test_array_append.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Array = require("../../lib/js/array.js");
-
-var const_v = $$Array.append([
-      1,
-      2
-    ], [3]);
-
-exports.const_v = const_v;
-/* const_v Not a pure module */
diff --git a/jscomp/test/test_array_append.res b/jscomp/test/test_array_append.res
deleted file mode 100644
index 4cf4d58..0000000
--- a/jscomp/test/test_array_append.res
+++ /dev/null
@@ -1 +0,0 @@
-let const_v = Array.append([1, 2], [3])
diff --git a/jscomp/test/test_array_primitive.js b/jscomp/test/test_array_primitive.js
deleted file mode 100644
index ac0913d..0000000
--- a/jscomp/test/test_array_primitive.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function caml_array_sub(x, offset, len) {
-  var result = new Array(len);
-  for(var j = 0; j < len; ++j){
-    Caml_array.set(result, j, Caml_array.get(x, offset + j | 0));
-  }
-  return result;
-}
-
-function caml_array_set(xs, index, newval) {
-  if (index < 0 || index >= xs.length) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
-  }
-  Caml_array.set(xs, index, newval);
-}
-
-function caml_array_get(xs, index) {
-  if (index < 0 || index >= xs.length) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "index out of bounds",
-          Error: new Error()
-        };
-  }
-  return Caml_array.get(xs, index);
-}
-
-function caml_make_vect(len, init) {
-  var b = new Array(len);
-  for(var i = 0; i < len; ++i){
-    Caml_array.set(b, i, init);
-  }
-  return b;
-}
-
-exports.caml_array_sub = caml_array_sub;
-exports.caml_array_set = caml_array_set;
-exports.caml_array_get = caml_array_get;
-exports.caml_make_vect = caml_make_vect;
-/* No side effect */
diff --git a/jscomp/test/test_array_primitive.res b/jscomp/test/test_array_primitive.res
deleted file mode 100644
index f971831..0000000
--- a/jscomp/test/test_array_primitive.res
+++ /dev/null
@@ -1,40 +0,0 @@
-@new("Array") external new_uninitialized_array: int => array<'a> = ""
-
-let caml_array_sub = (x: array<'a>, offset: int, len: int) => {
-  let result = new_uninitialized_array(len)
-  for j in 0 to len - 1 {
-    result[j] = x[offset + j]
-  }
-  result
-}
-
-/* let rec len l  = */
-/* match l with */
-/* | [] -> 0 */
-/* | x::xs -> Array.length x + len xs */
-
-/* let  caml_array_concat (l : 'a array list) : 'a array = */
-/* let v = len l in */
-/* let result = new_uninitialized_array v in */
-
-let caml_array_set = (xs, index, newval) =>
-  if index < 0 || index >= Array.length(xs) {
-    invalid_arg("index out of bounds")
-  } else {
-    xs[index] = newval
-  }
-
-let caml_array_get = (xs, index) =>
-  if index < 0 || index >= Array.length(xs) {
-    invalid_arg("index out of bounds")
-  } else {
-    xs[index]
-  }
-
-let caml_make_vect = (len, init) => {
-  let b = new_uninitialized_array(len)
-  for i in 0 to len - 1 {
-    b[i] = init
-  }
-  b
-}
diff --git a/jscomp/test/test_bool_equal.js b/jscomp/test/test_bool_equal.js
deleted file mode 100644
index cc6a99b..0000000
--- a/jscomp/test/test_bool_equal.js
+++ /dev/null
@@ -1,146 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function bool_equal(x, y) {
-  if (x) {
-    if (y) {
-      return true;
-    } else {
-      return false;
-    }
-  } else if (y) {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-function assertions(param) {
-  if (!bool_equal(true, true)) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "test_bool_equal.res",
-            16,
-            2
-          ],
-          Error: new Error()
-        };
-  }
-  if (!bool_equal(false, false)) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "test_bool_equal.res",
-            17,
-            2
-          ],
-          Error: new Error()
-        };
-  }
-  if (bool_equal(true, false)) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "test_bool_equal.res",
-            18,
-            2
-          ],
-          Error: new Error()
-        };
-  }
-  if (bool_equal(false, true)) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "test_bool_equal.res",
-            19,
-            2
-          ],
-          Error: new Error()
-        };
-  }
-  
-}
-
-function f0(x) {
-  if (x === true) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function f1(x) {
-  if (x !== true) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function f2(x) {
-  if (x === true) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function f3(x) {
-  if (x === false) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function f4(x) {
-  if (x !== true) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function f5(x) {
-  if (x) {
-    return 2;
-  } else {
-    return 1;
-  }
-}
-
-function f6(x) {
-  if (x === /* [] */0) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function f7(x) {
-  if (x.length !== 0) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-function f8(x) {
-  return 1;
-}
-
-exports.bool_equal = bool_equal;
-exports.assertions = assertions;
-exports.f0 = f0;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.f5 = f5;
-exports.f6 = f6;
-exports.f7 = f7;
-exports.f8 = f8;
-/* No side effect */
diff --git a/jscomp/test/test_bool_equal.res b/jscomp/test/test_bool_equal.res
deleted file mode 100644
index 304644a..0000000
--- a/jscomp/test/test_bool_equal.res
+++ /dev/null
@@ -1,84 +0,0 @@
-let bool_equal = (x, y) =>
-  switch (x, y) {
-  | (true, true)
-  | (false, false) => true
-  | (false, true)
-  | (true, false) => false
-  }
-
-/* TODO: 
-   There is a problem for the ffi,
-   for boolean function, we might do 
-   [x !==0 ]
-   which return the same value whether user input [true] or [false]
-   u.bool_equal(false,true) */
-let assertions = () => {
-  assert(bool_equal(true, true))
-  assert(bool_equal(false, false))
-  assert(!bool_equal(true, false))
-  assert(!bool_equal(false, true))
-  assert(true == true)
-  assert(false == false)
-  assert(!(true == false))
-  assert(!(false == true))
-}
-
-let f0 = x =>
-  if x == true {
-    1
-  } else {
-    2
-  }
-let f1 = x =>
-  if !(x == true) {
-    1
-  } else {
-    2
-  }
-
-let f2 = x =>
-  if x == true {
-    1
-  } else {
-    2
-  }
-let f3 = x =>
-  if x == false {
-    1
-  } else {
-    2
-  }
-
-let f4 = x =>
-  if !(x == true) {
-    1
-  } else {
-    2
-  }
-
-let f5 = x =>
-  switch x {
-  | list{} => 1
-  | _ => 2
-  }
-
-let f6 = x =>
-  if x == list{} {
-    1
-  } else {
-    2
-  }
-
-let f7 = x =>
-  if Belt.Array.length(x) > 0 {
-    1
-  } else {
-    2
-  }
-
-let f8 = x =>
-  if Belt.Array.length(x) >= 0 {
-    1
-  } else {
-    2
-  }
diff --git a/jscomp/test/test_bs_this.js b/jscomp/test/test_bs_this.js
deleted file mode 100644
index e699bfe..0000000
--- a/jscomp/test/test_bs_this.js
+++ /dev/null
@@ -1,59 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function uux_this(x, y) {
-  var o = this ;
-  return (o.length + x | 0) + y | 0;
-}
-
-function even(x) {
-  var o = this ;
-  return x + o | 0;
-}
-
-function bark(param) {
-  return function (x, y) {
-    var o = this ;
-    console.log([
-          o.length,
-          o.x,
-          o.y,
-          x,
-          y
-        ]);
-    return x + y | 0;
-  };
-}
-
-var js_obj = {
-  bark: (function (x, y) {
-      var o = this ;
-      console.log(o);
-      return x + y | 0;
-    })
-};
-
-function f(x) {
-  x.onload = (function () {
-      var o = this ;
-      console.log(o);
-    });
-  return Curry._2(x.addEventListener, "onload", (function () {
-                var o = this ;
-                console.log(o.response);
-              }));
-}
-
-function u(x) {
-  return x;
-}
-
-exports.uux_this = uux_this;
-exports.even = even;
-exports.bark = bark;
-exports.js_obj = js_obj;
-exports.f = f;
-exports.u = u;
-/* uux_this Not a pure module */
diff --git a/jscomp/test/test_bs_this.res b/jscomp/test/test_bs_this.res
deleted file mode 100644
index af32b4d..0000000
--- a/jscomp/test/test_bs_this.res
+++ /dev/null
@@ -1,25 +0,0 @@
-let uux_this: @this ({"length": int}, int, int) => int = @this (o, x, y) => o["length"] + x + y
-
-let even = @this (o, x) => x + o
-
-let bark = () =>
-  @this
-  (o: 'self, x, y) => {
-    Js.log((o["length"], o["x"], o["y"], x, y))
-    x + y
-  }
-
-let js_obj: 'self = {
-  "bark": @this
-  (o: 'self, x, y) => {
-    Js.log(o)
-    x + y
-  },
-}
-
-let f = x => {
-  x["onload"] = @this o => Js.log(o)
-  x["addEventListener"]("onload", @this o => Js.log(o["response"]))
-}
-
-let u = @this (_: int, x: int) => x
diff --git a/jscomp/test/test_bug.js b/jscomp/test/test_bug.js
deleted file mode 100644
index 57ff83d..0000000
--- a/jscomp/test/test_bug.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Bytes = require("../../lib/js/bytes.js");
-var Test_char = require("./test_char.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-
-function escaped(s) {
-  var n = 0;
-  for(var i = 0 ,i_finish = s.length; i < i_finish; ++i){
-    var c = s[i];
-    var tmp;
-    var exit = 0;
-    if (c >= 14) {
-      if (c !== 34 && c !== 92) {
-        exit = 1;
-      } else {
-        tmp = 2;
-      }
-    } else if (c >= 11) {
-      if (c >= 13) {
-        tmp = 2;
-      } else {
-        exit = 1;
-      }
-    } else if (c >= 8) {
-      tmp = 2;
-    } else {
-      exit = 1;
-    }
-    if (exit === 1) {
-      tmp = Test_char.caml_is_printable(c) ? 1 : 4;
-    }
-    n = n + tmp | 0;
-  }
-  if (n === s.length) {
-    return Bytes.copy(s);
-  }
-  var s$p = Caml_bytes.create(n);
-  n = 0;
-  for(var i$1 = 0 ,i_finish$1 = s.length; i$1 < i_finish$1; ++i$1){
-    var c$1 = s[i$1];
-    var exit$1 = 0;
-    if (c$1 > 92 || c$1 < 34) {
-      if (c$1 >= 14) {
-        exit$1 = 1;
-      } else {
-        switch (c$1) {
-          case 8 :
-              s$p[n] = /* '\\' */92;
-              n = n + 1 | 0;
-              s$p[n] = /* 'b' */98;
-              break;
-          case 9 :
-              s$p[n] = /* '\\' */92;
-              n = n + 1 | 0;
-              s$p[n] = /* 't' */116;
-              break;
-          case 10 :
-              s$p[n] = /* '\\' */92;
-              n = n + 1 | 0;
-              s$p[n] = /* 'n' */110;
-              break;
-          case 0 :
-          case 1 :
-          case 2 :
-          case 3 :
-          case 4 :
-          case 5 :
-          case 6 :
-          case 7 :
-          case 11 :
-          case 12 :
-              exit$1 = 1;
-              break;
-          case 13 :
-              s$p[n] = /* '\\' */92;
-              n = n + 1 | 0;
-              s$p[n] = /* 'r' */114;
-              break;
-          
-        }
-      }
-    } else if (c$1 > 91 || c$1 < 35) {
-      s$p[n] = /* '\\' */92;
-      n = n + 1 | 0;
-      s$p[n] = c$1;
-    } else {
-      exit$1 = 1;
-    }
-    if (exit$1 === 1) {
-      if (Test_char.caml_is_printable(c$1)) {
-        s$p[n] = c$1;
-      } else {
-        s$p[n] = /* '\\' */92;
-        n = n + 1 | 0;
-        s$p[n] = 48 + (c$1 / 100 | 0) | 0;
-        n = n + 1 | 0;
-        s$p[n] = 48 + (c$1 / 10 | 0) % 10 | 0;
-        n = n + 1 | 0;
-        s$p[n] = 48 + c$1 % 10 | 0;
-      }
-    }
-    n = n + 1 | 0;
-  }
-  return s$p;
-}
-
-exports.escaped = escaped;
-/* No side effect */
diff --git a/jscomp/test/test_bug.res b/jscomp/test/test_bug.res
deleted file mode 100644
index c24452d..0000000
--- a/jscomp/test/test_bug.res
+++ /dev/null
@@ -1,67 +0,0 @@
-external string_length: string => int = "%string_length"
-external unsafe_blit_string: (string, int, bytes, int, int) => unit = "?blit_string"
-
-external char_code: char => int = "%identity"
-external char_chr: int => char = "%identity"
-open Bytes
-let escaped = s => {
-  let n = ref(0)
-  for i in 0 to length(s) - 1 {
-    n :=
-      n.contents +
-      switch unsafe_get(s, i) {
-      | '"' | '\\' | '\n' | '\t' | '\r' | '\b' => 2
-      | c =>
-        if Test_char.caml_is_printable(c) {
-          1
-        } else {
-          4
-        }
-      }
-  }
-  if n.contents == length(s) {
-    copy(s)
-  } else {
-    let s' = create(n.contents)
-    n := 0
-    for i in 0 to length(s) - 1 {
-      switch unsafe_get(s, i) {
-      | ('"' | '\\') as c =>
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, c)
-      | '\n' =>
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, 'n')
-      | '\t' =>
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, 't')
-      | '\r' =>
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, 'r')
-      | '\b' =>
-        unsafe_set(s', n.contents, '\\')
-        incr(n)
-        unsafe_set(s', n.contents, 'b')
-      | c =>
-        if Test_char.caml_is_printable(c) {
-          unsafe_set(s', n.contents, c)
-        } else {
-          let a = char_code(c)
-          unsafe_set(s', n.contents, '\\')
-          incr(n)
-          unsafe_set(s', n.contents, char_chr(48 + a / 100))
-          incr(n)
-          unsafe_set(s', n.contents, char_chr(48 + mod(a / 10, 10)))
-          incr(n)
-          unsafe_set(s', n.contents, char_chr(48 + mod(a, 10)))
-        }
-      }
-      incr(n)
-    }
-    s'
-  }
-}
diff --git a/jscomp/test/test_bytes.js b/jscomp/test/test_bytes.js
deleted file mode 100644
index ce36538..0000000
--- a/jscomp/test/test_bytes.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Bytes = require("../../lib/js/bytes.js");
-
-var f = Bytes.unsafe_to_string;
-
-var ff = Bytes.to_string;
-
-exports.f = f;
-exports.ff = ff;
-/* No side effect */
diff --git a/jscomp/test/test_bytes.res b/jscomp/test/test_bytes.res
deleted file mode 100644
index b9d8ca2..0000000
--- a/jscomp/test/test_bytes.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let f = v => Bytes.unsafe_to_string(v)
-
-external uu: bytes => string = "%bytes_to_string"
-let ff = v => uu(v)
diff --git a/jscomp/test/test_case_opt_collision.js b/jscomp/test/test_case_opt_collision.js
deleted file mode 100644
index 294ddcb..0000000
--- a/jscomp/test/test_case_opt_collision.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function f(xOpt, y) {
-  var x = xOpt !== undefined ? xOpt : 3;
-  var xOpt$1 = x + 2 | 0;
-  console.log(xOpt$1);
-  return xOpt$1 + y | 0;
-}
-
-console.log(f(undefined, 2));
-
-eq("File \"test_case_opt_collision.res\", line 13, characters 3-10", f(undefined, 2), 7);
-
-eq("File \"test_case_opt_collision.res\", line 15, characters 3-10", f(4, 2), 8);
-
-Mt.from_pair_suites("test_case_opt_collision.res", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/test_case_opt_collision.res b/jscomp/test/test_case_opt_collision.res
deleted file mode 100644
index 9a2599e..0000000
--- a/jscomp/test/test_case_opt_collision.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-let f = (~x=3, y: int) => {
-  let xOpt = x + 2
-  Js.log(xOpt)
-  xOpt + y
-}
-
-Js.log(f(2))
-
-eq(__LOC__, f(2), 7)
-
-eq(__LOC__, f(~x=4, 2), 8)
-
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/test_case_set.js b/jscomp/test/test_case_set.js
deleted file mode 100644
index 829ae40..0000000
--- a/jscomp/test/test_case_set.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function f(x) {
-  x.case = 3;
-}
-
-function g(x) {
-  return Curry._1(x.item, 3);
-}
-
-exports.f = f;
-exports.g = g;
-/* No side effect */
diff --git a/jscomp/test/test_case_set.res b/jscomp/test/test_case_set.res
deleted file mode 100644
index 08536eb..0000000
--- a/jscomp/test/test_case_set.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let f = x => x["case"] = 3
-
-let g = x => x["item"](3)
diff --git a/jscomp/test/test_char.js b/jscomp/test/test_char.js
deleted file mode 100644
index 636c789..0000000
--- a/jscomp/test/test_char.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function caml_is_printable(c) {
-  if (c > 31) {
-    return c < 127;
-  } else {
-    return false;
-  }
-}
-
-exports.caml_is_printable = caml_is_printable;
-/* No side effect */
diff --git a/jscomp/test/test_char.res b/jscomp/test/test_char.res
deleted file mode 100644
index 22d0122..0000000
--- a/jscomp/test/test_char.res
+++ /dev/null
@@ -1,4 +0,0 @@
-let caml_is_printable = c => {
-  let code = Char.code(c)
-  code > 31 && code < 127
-}
diff --git a/jscomp/test/test_closure.js b/jscomp/test/test_closure.js
deleted file mode 100644
index a9d1b9d..0000000
--- a/jscomp/test/test_closure.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-var v = {
-  contents: 0
-};
-
-function f(param) {
-  var arr = Caml_array.make(10, (function (param) {
-          
-        }));
-  for(var i = 0; i <= 9; ++i){
-    Caml_array.set(arr, i, (function(i){
-        return function (param) {
-          v.contents = v.contents + i | 0;
-        }
-        }(i)));
-  }
-  return arr;
-}
-
-var u = f();
-
-$$Array.iter((function (x) {
-        Curry._1(x, undefined);
-      }), u);
-
-if (v.contents !== 45) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "test_closure.res",
-          52,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-exports.v = v;
-exports.f = f;
-/* u Not a pure module */
diff --git a/jscomp/test/test_closure.res b/jscomp/test/test_closure.res
deleted file mode 100644
index 8feacb1..0000000
--- a/jscomp/test/test_closure.res
+++ /dev/null
@@ -1,53 +0,0 @@
-let v = ref(0)
-
-/** Test when i is captured 
-    {[
-    ((fun _ -> j = i; (fun _ -> v := !v + j)) ())
-    ]}
-
-    babel does this way:
-{[
-var arr = []
-var f = function(){
-  for(let i = 0; i < 10 ; ++ i){
-    arr [i] = ()=>{console.log(i)}
-    
-  }
-}]}
-
-
-{[
-var arr = [];
-var f = function f() {
-  var _loop = function (i) {
-    arr[i] = function () {
-      console.log(i);
-    };
-  };
-
-  for (var i = 0; i < 10; ++i) {
-    _loop(i);
-  }
-};
-]}    
-
-This means inline is tricky in javascript, here we try to inline [_loop]?
-
-    
-
-
- */
-let f = () => {
-  let n = 10
-  let arr = Array.make(10, _ => ())
-  for i in 0 to n - 1 {
-    arr[i] = _ => v := v.contents + i
-  }
-  arr
-}
-
-let () = {
-  let u = f()
-  Array.iter(x => x(), u)
-  assert (v.contents == 45)
-}
diff --git a/jscomp/test/test_common.js b/jscomp/test/test_common.js
deleted file mode 100644
index fcb9fce..0000000
--- a/jscomp/test/test_common.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var U = /* @__PURE__ */Caml_exceptions.create("Test_common.U");
-
-var H = /* @__PURE__ */Caml_exceptions.create("Test_common.H");
-
-exports.U = U;
-exports.H = H;
-/* No side effect */
diff --git a/jscomp/test/test_common.res b/jscomp/test/test_common.res
deleted file mode 100644
index e88cb23..0000000
--- a/jscomp/test/test_common.res
+++ /dev/null
@@ -1,2 +0,0 @@
-exception U(int)
-exception H
diff --git a/jscomp/test/test_const_elim.js b/jscomp/test/test_const_elim.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/test_const_elim.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/test_const_elim.res b/jscomp/test/test_const_elim.res
deleted file mode 100644
index ff7f399..0000000
--- a/jscomp/test/test_const_elim.res
+++ /dev/null
@@ -1,9 +0,0 @@
-include (
-  {
-    let f = x => {
-      let u = (1, 2)
-      let v = (x, x)
-      (fst(u), snd(v))
-    }
-  }: {}
-)
diff --git a/jscomp/test/test_const_propogate.js b/jscomp/test/test_const_propogate.js
deleted file mode 100644
index 2107e1e..0000000
--- a/jscomp/test/test_const_propogate.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  return x;
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_const_propogate.res b/jscomp/test/test_const_propogate.res
deleted file mode 100644
index 9949fa3..0000000
--- a/jscomp/test/test_const_propogate.res
+++ /dev/null
@@ -1,6 +0,0 @@
-let f = x =>
-  if 5 > 3 {
-    x
-  } else {
-    x + 1
-  }
diff --git a/jscomp/test/test_cpp.js b/jscomp/test/test_cpp.js
deleted file mode 100644
index 7326284..0000000
--- a/jscomp/test/test_cpp.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-
-var f = Caml.int_compare;
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_cpp.res b/jscomp/test/test_cpp.res
deleted file mode 100644
index 4235e3c..0000000
--- a/jscomp/test/test_cpp.res
+++ /dev/null
@@ -1,2 +0,0 @@
-type t = int
-let f = (x: t, y) => Pervasives.compare(x, y)
diff --git a/jscomp/test/test_cps.js b/jscomp/test/test_cps.js
deleted file mode 100644
index d5b7fd5..0000000
--- a/jscomp/test/test_cps.js
+++ /dev/null
@@ -1,45 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function f(_n, _acc) {
-  while(true) {
-    var acc = _acc;
-    var n = _n;
-    if (n === 0) {
-      return Curry._1(acc, undefined);
-    }
-    _acc = (function(n,acc){
-    return function (param) {
-      console.log(String(n));
-      return Curry._1(acc, undefined);
-    }
-    }(n,acc));
-    _n = n - 1 | 0;
-    continue ;
-  };
-}
-
-function test_closure(param) {
-  var arr = Caml_array.make(6, (function (x) {
-          return x;
-        }));
-  for(var i = 0; i <= 6; ++i){
-    Caml_array.set(arr, i, (function(i){
-        return function (param) {
-          return i;
-        }
-        }(i)));
-  }
-  return arr;
-}
-
-f(10, (function (param) {
-        
-      }));
-
-exports.f = f;
-exports.test_closure = test_closure;
-/*  Not a pure module */
diff --git a/jscomp/test/test_cps.res b/jscomp/test/test_cps.res
deleted file mode 100644
index c7eb46f..0000000
--- a/jscomp/test/test_cps.res
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-   To do the right [tail call] conversion
-   when the arguments are functions which captures some variables, 
-   we need create a scope to capture it 
-   the naive version:
-   {[
-   var f = 
-   function(n,acc)
-   {f_tailcall_0001:
-     while(/* true */1)
-     {if(n===0)
-       {return acc(/* () */0);}
-      else
-       {n=n-1;
-        acc=
-        function()
-         {console.log(Pervasives.string_of_int(n));
-          return acc(/* () */0);};
-        continue f_tailcall_0001;}};};
-   
-   ]}
-
-   A correct but less optimal version: 
-   {[
-   var f = 
-   function(n,acc)
-   {f_tailcall_0001:
-     while(/* true */1)
-     { (funtcion(n,acc){if(n===0)
-       {return acc(/* () */0);}
-      else
-       {n=n-1;
-        acc=
-        function()
-         {console.log(Pervasives.string_of_int(n));
-          return acc(/* () */0);};
-        continue f_tailcall_0001;}}(n,acc)) };};   
-   ]}
-
-   It does not work, since `continue` can not cross functions
-
-
-   the right version: 
-   {[
-   var f = 
-    function(n,acc)
-      {f_tailcall_0001:
-     while(/* true */1)
-     {if(n===0)
-       {return acc(/* () */0);}
-      else
-       {
-        acc = (function(){
-            var acc1 = acc ;
-            var n1 = n;
-            return function() {
-                console.log(Pervasives.string_of_int(n1));
-                return acc1(/* () */0);}
-        }());
-           n=n-1;
-        continue f_tailcall_0001;}};};
-
-   ]}
-
-   with [let]
-*/
-
-let rec f = (n, acc) =>
-  if n == 0 {
-    acc()
-  } else {
-    f(n - 1, _ => {
-      print_endline(string_of_int(n))
-      acc()
-    })
-  }
-
-/**
-    Here a naive version would be 
-    {[
-    for(var i = 0;i<=n;++i)
-     {arr[i]=function(){return i;};}
-    ]}
-
-    The correct version should be 
-    {[
-    for(var i = 0;i<=n;++i)
-     {arr[i]= (function(){ var i$1 = i; function(){return i$1;};}())
-    ]}
- */
-let test_closure = () => {
-  let n = 6
-  let arr = Array.make(n, x => x)
-  for i in 0 to n {
-    arr[i] = _ => i
-  }
-  arr
-}
-
-f(10, _ => ())
diff --git a/jscomp/test/test_demo.js b/jscomp/test/test_demo.js
deleted file mode 100644
index ab0151c..0000000
--- a/jscomp/test/test_demo.js
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-
-function fib(x) {
-  if (x === 2 || x === 1) {
-    return 1;
-  } else {
-    return fib(x - 1 | 0) + fib(x - 2 | 0) | 0;
-  }
-}
-
-function cons(x, y) {
-  return {
-          TAG: "Cons",
-          _0: x,
-          _1: y
-        };
-}
-
-function map(f, x) {
-  if (typeof x !== "object") {
-    return "Nil";
-  } else {
-    return {
-            TAG: "Cons",
-            _0: Curry._1(f, x._0),
-            _1: map(f, x._1)
-          };
-  }
-}
-
-function sum(n) {
-  var v = 0;
-  for(var i = 0; i <= n; ++i){
-    v = v + i | 0;
-  }
-  return v;
-}
-
-function f(x, y, z) {
-  return (x + y | 0) + z | 0;
-}
-
-function g(x, y) {
-  var u = x + y | 0;
-  return function (z) {
-    return u + z | 0;
-  };
-}
-
-function g1(x, y) {
-  var u = x + y | 0;
-  return function (xx, yy) {
-    return (xx + yy | 0) + u | 0;
-  };
-}
-
-var u = 8;
-
-var x = u + 6 | 0;
-
-var u$1 = 7;
-
-function v(param) {
-  return (6 + param | 0) + u$1 | 0;
-}
-
-var nil = "Nil";
-
-var len = List.length;
-
-exports.fib = fib;
-exports.nil = nil;
-exports.cons = cons;
-exports.map = map;
-exports.sum = sum;
-exports.len = len;
-exports.f = f;
-exports.g = g;
-exports.g1 = g1;
-exports.x = x;
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/test_demo.res b/jscomp/test/test_demo.res
deleted file mode 100644
index 163e78d..0000000
--- a/jscomp/test/test_demo.res
+++ /dev/null
@@ -1,111 +0,0 @@
-let f = x => x + 1
-let rec fib = x =>
-  switch x {
-  | 1 | 2 => 1
-  | n => fib(n - 1) + fib(n - 2)
-  }
-
-type rec intlist =
-  | Nil
-  | Cons(int, intlist)
-
-let nil = Nil
-let cons = (x, y) => Cons(x, y)
-
-let rec map = (f, x) =>
-  switch x {
-  | Nil => Nil
-  | Cons(x, xs) => Cons(f(x), map(f, xs))
-  }
-
-let sum = n => {
-  let v = ref(0)
-  for i in 0 to n {
-    v := v.contents + i
-  }
-  v.contents
-}
-
-let len = List.length
-
-let f = (g, x) => {
-  let u = switch g(x) {
-  | "aabb" => 0
-  | "bbc" => 1
-  | _ => 2
-  }
-  u + 3
-}
-
-@@warning("-37-8")
-
-let f = (g, x) => {
-  let u = switch g(x) {
-  | "aabb" => 0
-  | "bbc" => 1
-  }
-  u + 3
-}
-
-let v = (a, ()): unit =>
-  while {
-    ignore(true)
-    a(3)
-  } {
-    ignore(print_int(3))
-  }
-
-type cxt =
-  | A
-  | B(int)
-  | C(int, string)
-  | D
-  | E
-  | F(string)
-
-let f = (x: cxt) => {
-  let u = switch x {
-  | A => 0
-  | B(_) => 1
-  | C(_) => 2
-  | D => 3
-  | E => 4
-  | F(_) => 5
-  }
-  u + 3
-}
-
-let f = (g, x: cxt) =>
-  \"@@"(
-    g,
-    switch x {
-    | A => 0
-    | B(_) => 1
-    | C(_) => 2
-    | D => 3
-    | E => 4
-    | F(_) => 5
-    },
-  )
-
-let f = (h, g, x) =>
-  \"@@"(
-    h,
-    try g(x) catch {
-    | Not_found => 0
-    },
-  )
-
-let f = (x, y, z) => x + y + z
-let g = (x, y) => {
-  let u = x + y
-  z => u + z
-}
-
-let g1 = (x, y) => {
-  let u = x + y
-  (xx, yy) => xx + yy + u
-}
-let x = g(3, 5, 6)
-
-let v = g1(3, 4, 6)
diff --git a/jscomp/test/test_dup_param.js b/jscomp/test/test_dup_param.js
deleted file mode 100644
index 9930299..0000000
--- a/jscomp/test/test_dup_param.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x, x$1) {
-  return x$1;
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_dup_param.res b/jscomp/test/test_dup_param.res
deleted file mode 100644
index 3bea3e2..0000000
--- a/jscomp/test/test_dup_param.res
+++ /dev/null
@@ -1 +0,0 @@
-let f = (x, x) => x
diff --git a/jscomp/test/test_eq.js b/jscomp/test/test_eq.js
deleted file mode 100644
index 4ce016e..0000000
--- a/jscomp/test/test_eq.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x, y) {
-  return x + y | 0;
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_eq.res b/jscomp/test/test_eq.res
deleted file mode 100644
index 31f9185..0000000
--- a/jscomp/test/test_eq.res
+++ /dev/null
@@ -1 +0,0 @@
-let f = (x, y) => x + y
diff --git a/jscomp/test/test_exception.js b/jscomp/test/test_exception.js
deleted file mode 100644
index 106d3e9..0000000
--- a/jscomp/test/test_exception.js
+++ /dev/null
@@ -1,61 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Test_common = require("./test_common.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var Local = /* @__PURE__ */Caml_exceptions.create("Test_exception.Local");
-
-function f(param) {
-  throw {
-        RE_EXN_ID: Local,
-        _1: 3,
-        Error: new Error()
-      };
-}
-
-function g(param) {
-  throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
-}
-
-function h(param) {
-  throw {
-        RE_EXN_ID: Test_common.U,
-        _1: 3,
-        Error: new Error()
-      };
-}
-
-function x(param) {
-  throw {
-        RE_EXN_ID: Test_common.H,
-        Error: new Error()
-      };
-}
-
-function xx(param) {
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "x",
-        Error: new Error()
-      };
-}
-
-var Nullary = /* @__PURE__ */Caml_exceptions.create("Test_exception.Nullary");
-
-var a = {
-  RE_EXN_ID: Nullary
-};
-
-exports.Local = Local;
-exports.f = f;
-exports.g = g;
-exports.h = h;
-exports.x = x;
-exports.xx = xx;
-exports.Nullary = Nullary;
-exports.a = a;
-/* No side effect */
diff --git a/jscomp/test/test_exception.res b/jscomp/test/test_exception.res
deleted file mode 100644
index ee7b437..0000000
--- a/jscomp/test/test_exception.res
+++ /dev/null
@@ -1,14 +0,0 @@
-exception Local(int)
-
-let f = () => raise(Local(3))
-
-let g = () => raise(Not_found)
-
-let h = () => raise(Test_common.U(3))
-let x = () => raise(Test_common.H)
-
-let xx = () => raise(Invalid_argument("x"))
-
-exception Nullary
-
-let a = Nullary
diff --git a/jscomp/test/test_exception_escape.js b/jscomp/test/test_exception_escape.js
deleted file mode 100644
index 23d380f..0000000
--- a/jscomp/test/test_exception_escape.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var A = /* @__PURE__ */Caml_exceptions.create("Test_exception_escape.N.A");
-
-var f;
-
-try {
-  throw {
-        RE_EXN_ID: A,
-        _1: 3,
-        Error: new Error()
-      };
-}
-catch (exn){
-  f = 3;
-}
-
-var N = {
-  f: f
-};
-
-exports.N = N;
-/* f Not a pure module */
diff --git a/jscomp/test/test_exception_escape.res b/jscomp/test/test_exception_escape.res
deleted file mode 100644
index 9c90719..0000000
--- a/jscomp/test/test_exception_escape.res
+++ /dev/null
@@ -1,8 +0,0 @@
-module N: {
-  let f: int
-} = {
-  exception A(int)
-  let f = try raise(A(3)) catch {
-  | _ => 3
-  }
-}
diff --git a/jscomp/test/test_export2.js b/jscomp/test/test_export2.js
deleted file mode 100644
index b40a0f3..0000000
--- a/jscomp/test/test_export2.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x, y) {
-  return Math.imul(x, y);
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_export2.res b/jscomp/test/test_export2.res
deleted file mode 100644
index a4b6533..0000000
--- a/jscomp/test/test_export2.res
+++ /dev/null
@@ -1,3 +0,0 @@
-let f = (x, y) => x + y
-
-let f = (x, y) => x * y
diff --git a/jscomp/test/test_external.js b/jscomp/test/test_external.js
deleted file mode 100644
index ff64767..0000000
--- a/jscomp/test/test_external.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-var xx = document();
-
-alert("hehha");
-
-var b = Curry._1(ff("x"), 3);
-
-exports.xx = xx;
-exports.b = b;
-/* xx Not a pure module */
diff --git a/jscomp/test/test_external.res b/jscomp/test/test_external.res
deleted file mode 100644
index 0baaa3b..0000000
--- a/jscomp/test/test_external.res
+++ /dev/null
@@ -1,18 +0,0 @@
-type any /* just pass it through --
- we need find an elegant way to walk around ocaml's type system */
-
-/** It's okay to do this in javascript, you will never get segfault" */
-external \"~~": 'a => 'b = "%identity"
-
-type document
-@val("document") external doc: unit => document = ""
-@val("alert") external alert: string => unit = ""
-
-type v = int => int
-@val("ff") external f: string => v = "x"
-
-let xx = doc()
-
-let () = alert("hehha")
-
-let b = f("x", 3)
diff --git a/jscomp/test/test_external_unit.js b/jscomp/test/test_external_unit.js
deleted file mode 100644
index 14120eb..0000000
--- a/jscomp/test/test_external_unit.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log(3);
-
-var v = console.log(3);
-
-var u;
-
-exports.u = u;
-exports.v = v;
-/*  Not a pure module */
diff --git a/jscomp/test/test_external_unit.res b/jscomp/test/test_external_unit.res
deleted file mode 100644
index 9e3b562..0000000
--- a/jscomp/test/test_external_unit.res
+++ /dev/null
@@ -1,9 +0,0 @@
-type v = unit
-
-@val external log: 'a => unit = "console.log"
-
-@val external log2: 'a => v = "console.log"
-
-let u = log(3)
-
-let v = log2(3) /* FIXME: [unit] here */
diff --git a/jscomp/test/test_ffi.js b/jscomp/test/test_ffi.js
deleted file mode 100644
index e063b04..0000000
--- a/jscomp/test/test_ffi.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function v(u) {
-  log(u);
-  console.log(u);
-  console.log(u);
-  return u;
-}
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/test_ffi.res b/jscomp/test/test_ffi.res
deleted file mode 100644
index 2b32373..0000000
--- a/jscomp/test/test_ffi.res
+++ /dev/null
@@ -1,15 +0,0 @@
-@val("console.log")
-/** we should also allow js function call from an external js module 
-
-*/
-external log: 'a => unit = "?ignore"
-
-@scope("console") external log2: 'a => unit = "log"
-
-external log3: 'a => unit = "log"
-let v = u => {
-  log3(u)
-  log2(u)
-  log(u)
-  u
-}
diff --git a/jscomp/test/test_fib.js b/jscomp/test/test_fib.js
deleted file mode 100644
index 9bf0ba6..0000000
--- a/jscomp/test/test_fib.js
+++ /dev/null
@@ -1,106 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function fib(x) {
-  if (x === 0 || x === 1) {
-    return 1;
-  } else {
-    return fib(x - 1 | 0) + fib(x - 2 | 0) | 0;
-  }
-}
-
-function fib2(x) {
-  if (x === 2 || x === 1) {
-    return 1;
-  } else {
-    return fib2(x - 1 | 0) + fib2(x - 2 | 0) | 0;
-  }
-}
-
-var v = 0;
-
-for(var i = 0; i <= 10; ++i){
-  v = v + i | 0;
-}
-
-var sum = v;
-
-var v$1 = 0;
-
-for(var i$1 = 10; i$1 >= 0; --i$1){
-  v$1 = v$1 + i$1 | 0;
-}
-
-var sumdown = v$1;
-
-function cons(x, y) {
-  return {
-          TAG: "Cons",
-          _0: x,
-          _1: y
-        };
-}
-
-function length(x) {
-  if (typeof x !== "object") {
-    return 0;
-  } else {
-    return 1 + length(x._1) | 0;
-  }
-}
-
-function map(f, x) {
-  if (typeof x !== "object") {
-    return "Nil";
-  } else {
-    return {
-            TAG: "Cons",
-            _0: Curry._1(f, x._0),
-            _1: map(f, x._1)
-          };
-  }
-}
-
-function f(x) {
-  var v = x;
-  var sum = 0;
-  while(v > 0) {
-    sum = sum + v | 0;
-    v = v - 1 | 0;
-  };
-  return sum;
-}
-
-function fib3(n) {
-  var _a = 0;
-  var _b = 1;
-  var _n = n;
-  while(true) {
-    var n$1 = _n;
-    var b = _b;
-    var a = _a;
-    if (n$1 <= 0) {
-      return a;
-    }
-    _n = n$1 - 1 | 0;
-    _b = a + b | 0;
-    _a = b;
-    continue ;
-  };
-}
-
-var b = fib;
-
-exports.fib = fib;
-exports.fib2 = fib2;
-exports.b = b;
-exports.sum = sum;
-exports.sumdown = sumdown;
-exports.cons = cons;
-exports.length = length;
-exports.map = map;
-exports.f = f;
-exports.fib3 = fib3;
-/*  Not a pure module */
diff --git a/jscomp/test/test_fib.res b/jscomp/test/test_fib.res
deleted file mode 100644
index 1311d61..0000000
--- a/jscomp/test/test_fib.res
+++ /dev/null
@@ -1,72 +0,0 @@
-let rec fib = x =>
-  switch x {
-  | 0
-  | 1 => 1
-  | n => fib(n - 1) + fib(n - 2)
-  }
-
-let rec fib2 = x =>
-  switch x {
-  | 1
-  | 2 => 1
-  | n => fib2(n - 1) + fib2(n - 2)
-  }
-
-/* let n = List.length */
-
-let b = fib
-
-let sum = {
-  let v = ref(0)
-  for i in 0 to 10 {
-    v := v.contents + i
-  }
-  v.contents
-}
-
-let sumdown = {
-  let v = ref(0)
-  for i in 10 downto 0 {
-    v := v.contents + i
-  }
-  v.contents
-}
-
-type rec list =
-  | Nil
-  | Cons(int, list)
-
-let cons = (x, y) => Cons(x, y)
-
-/* let cons2 (x,y) = Cons(x,y) (\* this seems to need be fixed *\) */
-let rec length = x =>
-  switch x {
-  | Nil => 0
-  | Cons(_, y) => 1 + length(y)
-  }
-
-let rec map = (f, x) =>
-  switch x {
-  | Nil => Nil
-  | Cons(x, y) => Cons(f(x), map(f, y))
-  }
-
-let f = x => {
-  let v = ref(x)
-  let sum = ref(0)
-  while v.contents > 0 {
-    sum := sum.contents + v.contents
-    decr(v)
-  }
-  sum.contents
-}
-
-let fib3 = n => {
-  let rec fib_help = (a, b, n) =>
-    if n > 0 {
-      fib_help(b, a + b, n - 1)
-    } else {
-      a
-    }
-  fib_help(0, 1, n)
-}
diff --git a/jscomp/test/test_filename.js b/jscomp/test/test_filename.js
deleted file mode 100644
index 01cffab..0000000
--- a/jscomp/test/test_filename.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Filename = require("../../lib/js/filename.js");
-
-var u = Filename.chop_extension;
-
-var v = List.length;
-
-exports.u = u;
-exports.v = v;
-/* Filename Not a pure module */
diff --git a/jscomp/test/test_filename.res b/jscomp/test/test_filename.res
deleted file mode 100644
index fe3fb8d..0000000
--- a/jscomp/test/test_filename.res
+++ /dev/null
@@ -1,7 +0,0 @@
-open Filename
-
-let v = chop_extension
-
-let u = v
-open List
-let v = List.length
diff --git a/jscomp/test/test_for_loop.js b/jscomp/test/test_for_loop.js
deleted file mode 100644
index b870467..0000000
--- a/jscomp/test/test_for_loop.js
+++ /dev/null
@@ -1,128 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function for_(x) {
-  for(var i = 0 ,i_finish = (console.log("hi"), x.length); i <= i_finish; ++i){
-    console.log(Caml_array.get(x, i));
-  }
-}
-
-function for_2(x) {
-  for(var i = 0 ,i_finish = x.length; i <= i_finish; ++i){
-    console.log(Caml_array.get(x, i));
-  }
-}
-
-function for_3(x) {
-  var v = {
-    contents: 0
-  };
-  var arr = $$Array.map((function (param, param$1) {
-          
-        }), x);
-  for(var i = 0 ,i_finish = x.length; i <= i_finish; ++i){
-    var j = (i << 1);
-    Caml_array.set(arr, i, (function(j){
-        return function (param) {
-          v.contents = v.contents + j | 0;
-        }
-        }(j)));
-  }
-  $$Array.iter((function (x) {
-          Curry._1(x, undefined);
-        }), arr);
-  return v.contents;
-}
-
-function for_4(x) {
-  var v = {
-    contents: 0
-  };
-  var arr = $$Array.map((function (param, param$1) {
-          
-        }), x);
-  for(var i = 0 ,i_finish = x.length; i <= i_finish; ++i){
-    var j = (i << 1);
-    var k = (j << 1);
-    Caml_array.set(arr, i, (function(k){
-        return function (param) {
-          v.contents = v.contents + k | 0;
-        }
-        }(k)));
-  }
-  $$Array.iter((function (x) {
-          Curry._1(x, undefined);
-        }), arr);
-  return v.contents;
-}
-
-function for_5(x, u) {
-  var v = {
-    contents: 0
-  };
-  var arr = $$Array.map((function (param, param$1) {
-          
-        }), x);
-  for(var i = 0 ,i_finish = x.length; i <= i_finish; ++i){
-    var k = Math.imul((u << 1), u);
-    Caml_array.set(arr, i, (function(k){
-        return function (param) {
-          v.contents = v.contents + k | 0;
-        }
-        }(k)));
-  }
-  $$Array.iter((function (x) {
-          Curry._1(x, undefined);
-        }), arr);
-  return v.contents;
-}
-
-function for_6(x, u) {
-  var v = {
-    contents: 0
-  };
-  var arr = $$Array.map((function (param, param$1) {
-          
-        }), x);
-  var v4 = {
-    contents: 0
-  };
-  var v5 = {
-    contents: 0
-  };
-  v4.contents = v4.contents + 1 | 0;
-  for(var j = 0; j <= 1; ++j){
-    v5.contents = v5.contents + 1 | 0;
-    var v2 = {
-      contents: 0
-    };
-    (function(v2){
-    for(var i = 0 ,i_finish = x.length; i <= i_finish; ++i){
-      var k = Math.imul((u << 1), u);
-      var h = (v5.contents << 1);
-      v2.contents = v2.contents + 1 | 0;
-      Caml_array.set(arr, i, (function(k,h){
-          return function (param) {
-            v.contents = (((((v.contents + k | 0) + v2.contents | 0) + u | 0) + v4.contents | 0) + v5.contents | 0) + h | 0;
-          }
-          }(k,h)));
-    }
-    }(v2));
-  }
-  $$Array.iter((function (x) {
-          Curry._1(x, undefined);
-        }), arr);
-  return v.contents;
-}
-
-exports.for_ = for_;
-exports.for_2 = for_2;
-exports.for_3 = for_3;
-exports.for_4 = for_4;
-exports.for_5 = for_5;
-exports.for_6 = for_6;
-/* No side effect */
diff --git a/jscomp/test/test_for_loop.res b/jscomp/test/test_for_loop.res
deleted file mode 100644
index 5b7e25d..0000000
--- a/jscomp/test/test_for_loop.res
+++ /dev/null
@@ -1,70 +0,0 @@
-let for_ = x =>
-  for i in 0 to {
-    print_endline("hi")
-    ignore(3)
-    Array.length(x)
-  } {
-    print_endline(x[i])
-  }
-
-let for_2 = x =>
-  for i in 0 to Array.length(x) {
-    print_endline(x[i])
-  }
-
-let for_3 = x => {
-  let v = ref(0)
-  let arr = Array.map((_, _) => (), x)
-  for i in 0 to Array.length(x) {
-    let j = i * 2
-    arr[i] = _ => v := v.contents + j
-  }
-  Array.iter(x => x(), arr)
-  v.contents
-}
-
-let for_4 = x => {
-  let v = ref(0)
-  let arr = Array.map((_, _) => (), x)
-  for i in 0 to Array.length(x) {
-    let j = i * 2
-    let k = 2 * j
-    arr[i] = _ => v := v.contents + k
-  }
-  Array.iter(x => x(), arr)
-  v.contents
-}
-
-let for_5 = (x, u) => {
-  let v = ref(0)
-  let arr = Array.map((_, _) => (), x)
-  for i in 0 to Array.length(x) {
-    let _j = i * 2
-    let k = 2 * u * u
-    arr[i] = _ => v := v.contents + k
-  }
-  Array.iter(x => x(), arr)
-  v.contents
-}
-
-let for_6 = (x, u) => {
-  let v = ref(0)
-  let arr = Array.map((_, _) => (), x)
-  let v4 = ref(0)
-  let v5 = ref(0)
-  incr(v4)
-  for j in 0 to 1 {
-    incr(v5)
-    let v2 = ref(0)
-    let v3 = u
-    for i in 0 to Array.length(x) {
-      let _j = i * 2
-      let k = 2 * u * u
-      let h = 2 * v5.contents
-      incr(v2)
-      arr[i] = _ => v := v.contents + k + v2.contents + v3 + v4.contents + v5.contents + h
-    }
-  }
-  Array.iter(x => x(), arr)
-  v.contents
-}
diff --git a/jscomp/test/test_for_map.js b/jscomp/test/test_for_map.js
deleted file mode 100644
index 3e2f06a..0000000
--- a/jscomp/test/test_for_map.js
+++ /dev/null
@@ -1,1003 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function singleton(x, d) {
-  return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          d: d,
-          r: "Empty",
-          h: 1
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function is_empty(param) {
-  if (typeof param !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function add(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = add(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function find(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml.int_compare(x, param.v);
-    if (c === 0) {
-      return param.d;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function find_first(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_first_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_last(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_last_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_opt(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var c = Caml.int_compare(x, param.v);
-    if (c === 0) {
-      return Caml_option.some(param.d);
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function mem(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    var c = Caml.int_compare(x, param.v);
-    if (c === 0) {
-      return true;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function min_binding(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function min_binding_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function max_binding(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function max_binding_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function remove_min_binding(param) {
-  if (typeof param !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.remove_min_elt",
-          Error: new Error()
-        };
-  }
-  var l = param.l;
-  if (typeof l !== "object") {
-    return param.r;
-  } else {
-    return bal(remove_min_binding(l), param.v, param.d, param.r);
-  }
-}
-
-function merge(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  }
-  if (typeof t2 !== "object") {
-    return t1;
-  }
-  var match = min_binding(t2);
-  return bal(t1, match[0], match[1], remove_min_binding(t2));
-}
-
-function remove(x, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    return merge(l, r);
-  }
-  if (c < 0) {
-    var ll = remove(x, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = remove(x, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function update(x, f, param) {
-  if (typeof param !== "object") {
-    var data = Curry._1(f, undefined);
-    if (data !== undefined) {
-      return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: "Empty",
-              h: 1
-            };
-    } else {
-      return "Empty";
-    }
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    var data$1 = Curry._1(f, Caml_option.some(d));
-    if (data$1 === undefined) {
-      return merge(l, r);
-    }
-    var data$2 = Caml_option.valFromOption(data$1);
-    if (d === data$2) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = update(x, f, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = update(x, f, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function iter(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    iter(f, param.l);
-    Curry._2(f, param.v, param.d);
-    _param = param.r;
-    continue ;
-  };
-}
-
-function map(f, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var l$p = map(f, param.l);
-  var d$p = Curry._1(f, param.d);
-  var r$p = map(f, param.r);
-  return {
-          TAG: "Node",
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
-}
-
-function mapi(f, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var v = param.v;
-  var l$p = mapi(f, param.l);
-  var d$p = Curry._2(f, v, param.d);
-  var r$p = mapi(f, param.r);
-  return {
-          TAG: "Node",
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
-}
-
-function fold(f, _m, _accu) {
-  while(true) {
-    var accu = _accu;
-    var m = _m;
-    if (typeof m !== "object") {
-      return accu;
-    }
-    _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu));
-    _m = m.r;
-    continue ;
-  };
-}
-
-function for_all(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return true;
-    }
-    if (!Curry._2(p, param.v, param.d)) {
-      return false;
-    }
-    if (!for_all(p, param.l)) {
-      return false;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function exists(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    if (Curry._2(p, param.v, param.d)) {
-      return true;
-    }
-    if (exists(p, param.l)) {
-      return true;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function add_min_binding(k, x, param) {
-  if (typeof param !== "object") {
-    return singleton(k, x);
-  } else {
-    return bal(add_min_binding(k, x, param.l), param.v, param.d, param.r);
-  }
-}
-
-function add_max_binding(k, x, param) {
-  if (typeof param !== "object") {
-    return singleton(k, x);
-  } else {
-    return bal(param.l, param.v, param.d, add_max_binding(k, x, param.r));
-  }
-}
-
-function join(l, v, d, r) {
-  if (typeof l !== "object") {
-    return add_min_binding(v, d, r);
-  }
-  var lh = l.h;
-  if (typeof r !== "object") {
-    return add_max_binding(v, d, l);
-  }
-  var rh = r.h;
-  if (lh > (rh + 2 | 0)) {
-    return bal(l.l, l.v, l.d, join(l.r, v, d, r));
-  } else if (rh > (lh + 2 | 0)) {
-    return bal(join(l, v, d, r.l), r.v, r.d, r.r);
-  } else {
-    return create(l, v, d, r);
-  }
-}
-
-function concat(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  }
-  if (typeof t2 !== "object") {
-    return t1;
-  }
-  var match = min_binding(t2);
-  return join(t1, match[0], match[1], remove_min_binding(t2));
-}
-
-function concat_or_join(t1, v, d, t2) {
-  if (d !== undefined) {
-    return join(t1, v, Caml_option.valFromOption(d), t2);
-  } else {
-    return concat(t1, t2);
-  }
-}
-
-function split(x, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            undefined,
-            "Empty"
-          ];
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
-  }
-  if (c < 0) {
-    var match = split(x, l);
-    return [
-            match[0],
-            match[1],
-            join(match[2], v, d, r)
-          ];
-  }
-  var match$1 = split(x, r);
-  return [
-          join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
-}
-
-function merge$1(f, s1, s2) {
-  if (typeof s1 !== "object") {
-    if (typeof s2 !== "object") {
-      return "Empty";
-    }
-    
-  } else {
-    var v1 = s1.v;
-    if (s1.h >= height(s2)) {
-      var match = split(v1, s2);
-      return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2]));
-    }
-    
-  }
-  if (typeof s2 !== "object") {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "map.res",
-            552,
-            11
-          ],
-          Error: new Error()
-        };
-  }
-  var v2 = s2.v;
-  var match$1 = split(v2, s1);
-  return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r));
-}
-
-function union(f, s1, s2) {
-  if (typeof s1 !== "object") {
-    return s2;
-  }
-  var d1 = s1.d;
-  var v1 = s1.v;
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var d2 = s2.d;
-  var v2 = s2.v;
-  if (s1.h >= s2.h) {
-    var match = split(v1, s2);
-    var d2$1 = match[1];
-    var l = union(f, s1.l, match[0]);
-    var r = union(f, s1.r, match[2]);
-    if (d2$1 !== undefined) {
-      return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r);
-    } else {
-      return join(l, v1, d1, r);
-    }
-  }
-  var match$1 = split(v2, s1);
-  var d1$1 = match$1[1];
-  var l$1 = union(f, match$1[0], s2.l);
-  var r$1 = union(f, match$1[2], s2.r);
-  if (d1$1 !== undefined) {
-    return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1);
-  } else {
-    return join(l$1, v2, d2, r$1);
-  }
-}
-
-function filter(p, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var l$p = filter(p, l);
-  var pvd = Curry._2(p, v, d);
-  var r$p = filter(p, r);
-  if (pvd) {
-    if (l === l$p && r === r$p) {
-      return param;
-    } else {
-      return join(l$p, v, d, r$p);
-    }
-  } else {
-    return concat(l$p, r$p);
-  }
-}
-
-function partition(p, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            "Empty"
-          ];
-  }
-  var d = param.d;
-  var v = param.v;
-  var match = partition(p, param.l);
-  var lf = match[1];
-  var lt = match[0];
-  var pvd = Curry._2(p, v, d);
-  var match$1 = partition(p, param.r);
-  var rf = match$1[1];
-  var rt = match$1[0];
-  if (pvd) {
-    return [
-            join(lt, v, d, rt),
-            concat(lf, rf)
-          ];
-  } else {
-    return [
-            concat(lt, rt),
-            join(lf, v, d, rf)
-          ];
-  }
-}
-
-function cons_enum(_m, _e) {
-  while(true) {
-    var e = _e;
-    var m = _m;
-    if (typeof m !== "object") {
-      return e;
-    }
-    _e = {
-      TAG: "More",
-      _0: m.v,
-      _1: m.d,
-      _2: m.r,
-      _3: e
-    };
-    _m = m.l;
-    continue ;
-  };
-}
-
-function compare(cmp, m1, m2) {
-  var _e1 = cons_enum(m1, "End");
-  var _e2 = cons_enum(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return 0;
-      } else {
-        return -1;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return 1;
-    }
-    var c = Caml.int_compare(e1._0, e2._0);
-    if (c !== 0) {
-      return c;
-    }
-    var c$1 = Curry._2(cmp, e1._1, e2._1);
-    if (c$1 !== 0) {
-      return c$1;
-    }
-    _e2 = cons_enum(e2._2, e2._3);
-    _e1 = cons_enum(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function equal(cmp, m1, m2) {
-  var _e1 = cons_enum(m1, "End");
-  var _e2 = cons_enum(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return true;
-      } else {
-        return false;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return false;
-    }
-    if (e1._0 !== e2._0) {
-      return false;
-    }
-    if (!Curry._2(cmp, e1._1, e2._1)) {
-      return false;
-    }
-    _e2 = cons_enum(e2._2, e2._3);
-    _e1 = cons_enum(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function cardinal(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0;
-  }
-}
-
-function bindings_aux(_accu, _param) {
-  while(true) {
-    var param = _param;
-    var accu = _accu;
-    if (typeof param !== "object") {
-      return accu;
-    }
-    _param = param.l;
-    _accu = {
-      hd: [
-        param.v,
-        param.d
-      ],
-      tl: bindings_aux(accu, param.r)
-    };
-    continue ;
-  };
-}
-
-function bindings(s) {
-  return bindings_aux(/* [] */0, s);
-}
-
-var IntMap = {
-  empty: "Empty",
-  is_empty: is_empty,
-  mem: mem,
-  add: add,
-  update: update,
-  singleton: singleton,
-  remove: remove,
-  merge: merge$1,
-  union: union,
-  compare: compare,
-  equal: equal,
-  iter: iter,
-  fold: fold,
-  for_all: for_all,
-  exists: exists,
-  filter: filter,
-  partition: partition,
-  cardinal: cardinal,
-  bindings: bindings,
-  min_binding: min_binding,
-  min_binding_opt: min_binding_opt,
-  max_binding: max_binding,
-  max_binding_opt: max_binding_opt,
-  choose: min_binding,
-  choose_opt: min_binding_opt,
-  split: split,
-  find: find,
-  find_opt: find_opt,
-  find_first: find_first,
-  find_first_opt: find_first_opt,
-  find_last: find_last,
-  find_last_opt: find_last_opt,
-  map: map,
-  mapi: mapi
-};
-
-function assertion_test(param) {
-  var m = "Empty";
-  for(var i = 0; i <= 1000000; ++i){
-    m = add(i, i, m);
-  }
-  for(var i$1 = 0; i$1 <= 1000000; ++i$1){
-    find(i$1, m);
-  }
-}
-
-exports.IntMap = IntMap;
-exports.assertion_test = assertion_test;
-/* No side effect */
diff --git a/jscomp/test/test_for_map.res b/jscomp/test/test_for_map.res
deleted file mode 100644
index f0c651c..0000000
--- a/jscomp/test/test_for_map.res
+++ /dev/null
@@ -1,15 +0,0 @@
-module IntMap = Map.Make({
-  type t = int
-  let compare = (x: int, y) => compare(x, y)
-})
-
-let assertion_test = () => {
-  let m = ref(IntMap.empty)
-  let count = 1000000
-  for i in 0 to count {
-    m := IntMap.add(i, i, m.contents)
-  }
-  for i in 0 to count {
-    ignore(IntMap.find(i, m.contents))
-  }
-}
diff --git a/jscomp/test/test_for_map2.js b/jscomp/test/test_for_map2.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/test_for_map2.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/test_for_map2.res b/jscomp/test/test_for_map2.res
deleted file mode 100644
index 775b8ea..0000000
--- a/jscomp/test/test_for_map2.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let assertion_test = () => {
-  let m = ref(Int_map.empty)
-  let count = 1000000
-  for i in 0 to count {
-    m := Int_map.add(i, i, m.contents)
-  }
-  for i in 0 to count {
-    ignore(Int_map.find(i, m.contents))
-  }
-}
diff --git a/jscomp/test/test_for_map2.resi b/jscomp/test/test_for_map2.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/test_for_map2.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/test_format.js b/jscomp/test/test_format.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/test_format.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/test_format.res b/jscomp/test/test_format.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/test_format.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/test_formatter.js b/jscomp/test/test_formatter.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/test_formatter.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/test_formatter.res b/jscomp/test/test_formatter.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/test_formatter.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/test_functor_dead_code.js b/jscomp/test/test_functor_dead_code.js
deleted file mode 100644
index ed29947..0000000
--- a/jscomp/test/test_functor_dead_code.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v = true;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/test_functor_dead_code.res b/jscomp/test/test_functor_dead_code.res
deleted file mode 100644
index c127b6b..0000000
--- a/jscomp/test/test_functor_dead_code.res
+++ /dev/null
@@ -1,8 +0,0 @@
-include (
-  {
-    module M = Map.Make(String)
-    let v = M.is_empty(M.empty)
-  }: {
-    let v: bool
-  }
-)
diff --git a/jscomp/test/test_generative_module.js b/jscomp/test/test_generative_module.js
deleted file mode 100644
index e48fb05..0000000
--- a/jscomp/test/test_generative_module.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function M($star) {
-  return {
-          v: 3
-        };
-}
-
-var V = {
-  v: 3
-};
-
-exports.M = M;
-exports.V = V;
-/* No side effect */
diff --git a/jscomp/test/test_generative_module.res b/jscomp/test/test_generative_module.res
deleted file mode 100644
index 0fefced..0000000
--- a/jscomp/test/test_generative_module.res
+++ /dev/null
@@ -1,9 +0,0 @@
-module M = (): {
-  type t
-  let v: t
-} => {
-  type t = int
-  let v = 3
-}
-
-module V = M()
diff --git a/jscomp/test/test_global_print.js b/jscomp/test/test_global_print.js
deleted file mode 100644
index 8aa92d7..0000000
--- a/jscomp/test/test_global_print.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var List = {
-  u: 3
-};
-
-var X = {
-  List: List
-};
-
-var Hashtbl;
-
-var V;
-
-exports.X = X;
-exports.Hashtbl = Hashtbl;
-exports.V = V;
-/* No side effect */
diff --git a/jscomp/test/test_global_print.res b/jscomp/test/test_global_print.res
deleted file mode 100644
index e987681..0000000
--- a/jscomp/test/test_global_print.res
+++ /dev/null
@@ -1,7 +0,0 @@
-module X = {
-  module List = {
-    let u = 3
-  }
-}
-module Hashtbl = Hashtbl
-module V = List
diff --git a/jscomp/test/test_google_closure.js b/jscomp/test/test_google_closure.js
deleted file mode 100644
index 3fa12e3..0000000
--- a/jscomp/test/test_google_closure.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Array = require("../../lib/js/array.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function f(a, b, param) {
-  return a + b | 0;
-}
-
-function f2(a) {
-  return function (param) {
-    return a + 1 | 0;
-  };
-}
-
-var a = String(3);
-
-var b = 101;
-
-var arr = $$Array.init(2, (function (param) {
-        return 0;
-      }));
-
-for(var i = 0; i <= 1; ++i){
-  Caml_array.set(arr, i, i + 1 | 0);
-}
-
-console.log([
-      a,
-      b,
-      arr
-    ]);
-
-var c = arr;
-
-exports.f = f;
-exports.f2 = f2;
-exports.a = a;
-exports.b = b;
-exports.c = c;
-/* a Not a pure module */
diff --git a/jscomp/test/test_google_closure.res b/jscomp/test/test_google_closure.res
deleted file mode 100644
index 97e50d2..0000000
--- a/jscomp/test/test_google_closure.res
+++ /dev/null
@@ -1,21 +0,0 @@
-let f = (a, b, _) => a + b
-
-let f2 = a => f(a, 1)
-
-let (a, b, c) = (
-  string_of_int(f(1, 2, 3)),
-  {
-    let f3 = f2(100)
-    f3(2)
-  },
-  {
-    let arr = Array.init(2, _ => 0)
-    for i in 0 to 1 {
-      let f3 = f2(i)
-      arr[i] = f3(2)
-    }
-    arr
-  },
-)
-
-let () = Js.log((a, b, c))
diff --git a/jscomp/test/test_include.js b/jscomp/test/test_include.js
deleted file mode 100644
index 65938e3..0000000
--- a/jscomp/test/test_include.js
+++ /dev/null
@@ -1,212 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var $$String = require("../../lib/js/string.js");
-var Test_order = require("./test_order.js");
-
-function Make(U) {
-  var compare = U.compare;
-  return {
-          compare: compare,
-          v: compare
-        };
-}
-
-var X = {
-  compare: $$String.compare,
-  v: $$String.compare
-};
-
-var U = {
-  compare: Test_order.compare,
-  v: Test_order.compare
-};
-
-var N;
-
-var v = List.length;
-
-var N0;
-
-var N1;
-
-var N2;
-
-var N3;
-
-var N4;
-
-var N5;
-
-var N6;
-
-var length = List.length;
-
-var compare_lengths = List.compare_lengths;
-
-var compare_length_with = List.compare_length_with;
-
-var cons = List.cons;
-
-var hd = List.hd;
-
-var tl = List.tl;
-
-var nth = List.nth;
-
-var nth_opt = List.nth_opt;
-
-var rev = List.rev;
-
-var init = List.init;
-
-var append = List.append;
-
-var rev_append = List.rev_append;
-
-var concat = List.concat;
-
-var flatten = List.flatten;
-
-var iter = List.iter;
-
-var iteri = List.iteri;
-
-var map = List.map;
-
-var mapi = List.mapi;
-
-var rev_map = List.rev_map;
-
-var fold_left = List.fold_left;
-
-var fold_right = List.fold_right;
-
-var iter2 = List.iter2;
-
-var map2 = List.map2;
-
-var rev_map2 = List.rev_map2;
-
-var fold_left2 = List.fold_left2;
-
-var fold_right2 = List.fold_right2;
-
-var for_all = List.for_all;
-
-var exists = List.exists;
-
-var for_all2 = List.for_all2;
-
-var exists2 = List.exists2;
-
-var mem = List.mem;
-
-var memq = List.memq;
-
-var find = List.find;
-
-var find_opt = List.find_opt;
-
-var filter = List.filter;
-
-var find_all = List.find_all;
-
-var partition = List.partition;
-
-var assoc = List.assoc;
-
-var assoc_opt = List.assoc_opt;
-
-var assq = List.assq;
-
-var assq_opt = List.assq_opt;
-
-var mem_assoc = List.mem_assoc;
-
-var mem_assq = List.mem_assq;
-
-var remove_assoc = List.remove_assoc;
-
-var remove_assq = List.remove_assq;
-
-var split = List.split;
-
-var combine = List.combine;
-
-var sort = List.sort;
-
-var stable_sort = List.stable_sort;
-
-var fast_sort = List.fast_sort;
-
-var sort_uniq = List.sort_uniq;
-
-var merge = List.merge;
-
-exports.N = N;
-exports.v = v;
-exports.Make = Make;
-exports.X = X;
-exports.U = U;
-exports.N0 = N0;
-exports.N1 = N1;
-exports.N2 = N2;
-exports.N3 = N3;
-exports.N4 = N4;
-exports.N5 = N5;
-exports.N6 = N6;
-exports.length = length;
-exports.compare_lengths = compare_lengths;
-exports.compare_length_with = compare_length_with;
-exports.cons = cons;
-exports.hd = hd;
-exports.tl = tl;
-exports.nth = nth;
-exports.nth_opt = nth_opt;
-exports.rev = rev;
-exports.init = init;
-exports.append = append;
-exports.rev_append = rev_append;
-exports.concat = concat;
-exports.flatten = flatten;
-exports.iter = iter;
-exports.iteri = iteri;
-exports.map = map;
-exports.mapi = mapi;
-exports.rev_map = rev_map;
-exports.fold_left = fold_left;
-exports.fold_right = fold_right;
-exports.iter2 = iter2;
-exports.map2 = map2;
-exports.rev_map2 = rev_map2;
-exports.fold_left2 = fold_left2;
-exports.fold_right2 = fold_right2;
-exports.for_all = for_all;
-exports.exists = exists;
-exports.for_all2 = for_all2;
-exports.exists2 = exists2;
-exports.mem = mem;
-exports.memq = memq;
-exports.find = find;
-exports.find_opt = find_opt;
-exports.filter = filter;
-exports.find_all = find_all;
-exports.partition = partition;
-exports.assoc = assoc;
-exports.assoc_opt = assoc_opt;
-exports.assq = assq;
-exports.assq_opt = assq_opt;
-exports.mem_assoc = mem_assoc;
-exports.mem_assq = mem_assq;
-exports.remove_assoc = remove_assoc;
-exports.remove_assq = remove_assq;
-exports.split = split;
-exports.combine = combine;
-exports.sort = sort;
-exports.stable_sort = stable_sort;
-exports.fast_sort = fast_sort;
-exports.sort_uniq = sort_uniq;
-exports.merge = merge;
-/* No side effect */
diff --git a/jscomp/test/test_include.res b/jscomp/test/test_include.res
deleted file mode 100644
index 1181425..0000000
--- a/jscomp/test/test_include.res
+++ /dev/null
@@ -1,33 +0,0 @@
-/** luckily we have module alias 
-    so global module alias is fine
-*/
-include List
-module N = List
-let v = N.length
-
-module Make = (U: Set.OrderedType) => {
-  include U
-  let v = compare
-}
-
-/* var $$let=$$String; */
-module X = Make(String)
-module U = Make(Test_order)
-/* var X=Make([0,$$let[25]]); */
-include N
-
-/* Missing optimization
-  alias to a number could also be removed, especially 0
-*/
-
-module N0 = N
-
-module N1 = N0
-
-module N2 = N1
-module N3 = N2
-module N4 = N3
-module N5 = N4
-module N6 = N5
-
-include N6
diff --git a/jscomp/test/test_incomplete.js b/jscomp/test/test_incomplete.js
deleted file mode 100644
index d9a2d21..0000000
--- a/jscomp/test/test_incomplete.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  if (!(x > 3 || x < 1)) {
-    return /* 'a' */97;
-  }
-  throw {
-        RE_EXN_ID: "Match_failure",
-        _1: [
-          "test_incomplete.res",
-          3,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function f2(x) {
-  if (x !== undefined) {
-    return 0;
-  } else {
-    return 1;
-  }
-}
-
-function f3(x) {
-  switch (x.TAG) {
-    case "A" :
-    case "C" :
-        return x._0 + 1 | 0;
-    case "B" :
-    case "D" :
-        return x._0 + 2 | 0;
-    
-  }
-}
-
-exports.f = f;
-exports.f2 = f2;
-exports.f3 = f3;
-/* No side effect */
diff --git a/jscomp/test/test_incomplete.res b/jscomp/test/test_incomplete.res
deleted file mode 100644
index f8c4a7d..0000000
--- a/jscomp/test/test_incomplete.res
+++ /dev/null
@@ -1,51 +0,0 @@
-@@warning("-a")
-let f = x =>
-  switch x {
-  | 1
-  | 2
-  | 3 => 'a'
-  }
-
-type t =
-  | A(int)
-  | B(int)
-  | C(int)
-  | D(int)
-
-let f2 = x =>
-  switch x {
-  | Some(_) => 0
-  | None => 1
-  }
-
-/** if there is [default] in [Lswitch] it means 
-    its patten match are complete, 
-    in that case
-    we can transform
-    {[
-        switch(x[0]){
-                  case 0:
-                  case 2:return x[1]+1;
-                  case 1:
-                  case 3:return x[1]+2;
-                  
-                }
-
-    ]}
-
-    into 
-
-    {[
-    var v = x[0] 
-    if (v ===0 || v ===2)
-    { return v[1] + 1 }
-    else {return v[1] + 2 }
-    ]}
- */
-let f3 = x =>
-  switch x {
-  | A(v) => v + 1
-  | B(v) => v + 2
-  | C(v) => v + 1
-  | D(v) => v + 2
-  }
diff --git a/jscomp/test/test_incr_ref.js b/jscomp/test/test_incr_ref.js
deleted file mode 100644
index b0e40db..0000000
--- a/jscomp/test/test_incr_ref.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var u = 0;
-
-u = u + 1 | 0;
-
-var v;
-
-exports.v = v;
-/* v Not a pure module */
diff --git a/jscomp/test/test_incr_ref.res b/jscomp/test/test_incr_ref.res
deleted file mode 100644
index 938e94e..0000000
--- a/jscomp/test/test_incr_ref.res
+++ /dev/null
@@ -1,8 +0,0 @@
-include (
-  {
-    let u = ref(0)
-    let v = incr(u)
-  }: {
-    let v: unit
-  }
-)
diff --git a/jscomp/test/test_int_map_find.js b/jscomp/test/test_int_map_find.js
deleted file mode 100644
index 44bcc8a..0000000
--- a/jscomp/test/test_int_map_find.js
+++ /dev/null
@@ -1,165 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.int_compare(x, v);
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = add(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-List.fold_left((function (acc, param) {
-        return add(param[0], param[1], acc);
-      }), "Empty", {
-      hd: [
-        10,
-        /* 'a' */97
-      ],
-      tl: {
-        hd: [
-          3,
-          /* 'b' */98
-        ],
-        tl: {
-          hd: [
-            7,
-            /* 'c' */99
-          ],
-          tl: {
-            hd: [
-              20,
-              /* 'd' */100
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-/*  Not a pure module */
diff --git a/jscomp/test/test_int_map_find.res b/jscomp/test/test_int_map_find.res
deleted file mode 100644
index d205fa2..0000000
--- a/jscomp/test/test_int_map_find.res
+++ /dev/null
@@ -1,27 +0,0 @@
-include (
-  {
-    module IntMap = Map.Make({
-      type t = int
-      let compare = (x: t, y) => compare(x, y)
-    })
-
-    let empty = IntMap.empty
-
-    let m = List.fold_left(
-      (acc, (k, v)) => IntMap.add(k, v, acc),
-      empty,
-      list{(10, 'a'), (3, 'b'), (7, 'c'), (20, 'd')},
-    )
-
-    /* external log : 'a -> unit = "" [@@bs.val "console.log"] */
-
-    let assert_test = () =>
-      if IntMap.find(10, m) == 'a' {
-        prerr_endline("hi")
-      } else {
-        /* log ('a', "succeed") */
-
-        prerr_endline("hi")
-      }
-  }: {}
-)
diff --git a/jscomp/test/test_internalOO.js b/jscomp/test/test_internalOO.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/test_internalOO.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/test_internalOO.res b/jscomp/test/test_internalOO.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/test_internalOO.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/test_is_js.js b/jscomp/test/test_is_js.js
deleted file mode 100644
index 19bec05..0000000
--- a/jscomp/test/test_is_js.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function b(loc, x) {
-  Mt.bool_suites(test_id, suites, loc, x);
-}
-
-b("File \"test_is_js.res\", line 8, characters 2-9", true);
-
-b("File \"test_is_js.res\", line 10, characters 2-9", true);
-
-b("File \"test_is_js.res\", line 12, characters 2-9", true);
-
-Mt.from_pair_suites("Test_is_js", suites.contents);
-
-/*  Not a pure module */
diff --git a/jscomp/test/test_is_js.res b/jscomp/test/test_is_js.res
deleted file mode 100644
index 1a9c9a1..0000000
--- a/jscomp/test/test_is_js.res
+++ /dev/null
@@ -1,14 +0,0 @@
-let v = true
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-let b = (loc, x) => Mt.bool_suites(~test_id, ~suites, loc, x)
-
-b(__LOC__, true)
-
-b(__LOC__, true)
-
-b(__LOC__, true)
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/test_is_js.resi b/jscomp/test/test_is_js.resi
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/test_is_js.resi
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/test_js_ffi.js b/jscomp/test/test_js_ffi.js
deleted file mode 100644
index 290254d..0000000
--- a/jscomp/test/test_js_ffi.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$String = require("../../lib/js/string.js");
-
-function v(u) {
-  t({
-        compare: $$String.compare
-      });
-}
-
-function u(v) {
-  return v;
-}
-
-var s = $$String;
-
-exports.v = v;
-exports.u = u;
-exports.s = s;
-/* No side effect */
diff --git a/jscomp/test/test_js_ffi.res b/jscomp/test/test_js_ffi.res
deleted file mode 100644
index e33cf31..0000000
--- a/jscomp/test/test_js_ffi.res
+++ /dev/null
@@ -1,20 +0,0 @@
-@val("console.log")
-/** we should also allow js function call from an external js module 
-    
-*/
-external log: 'a => unit = "?ignore"
-
-let v = u => {
-  log(u)
-  u
-}
-
-@val("t") external test_f: module(Set.OrderedType) => unit = "?update_dummy"
-
-let v = u => test_f(module(String))
-
-module type X = module type of String
-
-let u = (v: module(X)) => v
-
-let s = u(module(String))
diff --git a/jscomp/test/test_let.js b/jscomp/test/test_let.js
deleted file mode 100644
index 364420b..0000000
--- a/jscomp/test/test_let.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-console.log(String(3));
-
-var b = 3;
-
-exports.b = b;
-/*  Not a pure module */
diff --git a/jscomp/test/test_let.res b/jscomp/test/test_let.res
deleted file mode 100644
index 04a968c..0000000
--- a/jscomp/test/test_let.res
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  let a = 3
-  print_int(a)
-}
-let b = 3
diff --git a/jscomp/test/test_list.js b/jscomp/test/test_list.js
deleted file mode 100644
index 9ce963a..0000000
--- a/jscomp/test/test_list.js
+++ /dev/null
@@ -1,1550 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-function length_aux(_len, _x) {
-  while(true) {
-    var x = _x;
-    var len = _len;
-    if (!x) {
-      return len;
-    }
-    _x = x.tl;
-    _len = len + 1 | 0;
-    continue ;
-  };
-}
-
-function length(l) {
-  return length_aux(0, l);
-}
-
-function hd(x) {
-  if (x) {
-    return x.hd;
-  }
-  throw {
-        RE_EXN_ID: "Failure",
-        _1: "hd",
-        Error: new Error()
-      };
-}
-
-function tl(x) {
-  if (x) {
-    return x.tl;
-  }
-  throw {
-        RE_EXN_ID: "Failure",
-        _1: "tl",
-        Error: new Error()
-      };
-}
-
-function nth(l, n) {
-  if (n < 0) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.nth",
-          Error: new Error()
-        };
-  }
-  var _l = l;
-  var _n = n;
-  while(true) {
-    var n$1 = _n;
-    var l$1 = _l;
-    if (l$1) {
-      if (n$1 === 0) {
-        return l$1.hd;
-      }
-      _n = n$1 - 1 | 0;
-      _l = l$1.tl;
-      continue ;
-    }
-    throw {
-          RE_EXN_ID: "Failure",
-          _1: "nth",
-          Error: new Error()
-        };
-  };
-}
-
-function rev_append(_l1, _l2) {
-  while(true) {
-    var l2 = _l2;
-    var l1 = _l1;
-    if (!l1) {
-      return l2;
-    }
-    _l2 = {
-      hd: l1.hd,
-      tl: l2
-    };
-    _l1 = l1.tl;
-    continue ;
-  };
-}
-
-function rev(l) {
-  return rev_append(l, /* [] */0);
-}
-
-function flatten(x) {
-  if (x) {
-    return Pervasives.$at(x.hd, flatten(x.tl));
-  } else {
-    return /* [] */0;
-  }
-}
-
-function map(f, x) {
-  if (!x) {
-    return /* [] */0;
-  }
-  var r = Curry._1(f, x.hd);
-  return {
-          hd: r,
-          tl: map(f, x.tl)
-        };
-}
-
-function mapi(i, f, x) {
-  if (!x) {
-    return /* [] */0;
-  }
-  var r = Curry._2(f, i, x.hd);
-  return {
-          hd: r,
-          tl: mapi(i + 1 | 0, f, x.tl)
-        };
-}
-
-function mapi$1(f, l) {
-  return mapi(0, f, l);
-}
-
-function rev_map(f, l) {
-  var _accu = /* [] */0;
-  var _x = l;
-  while(true) {
-    var x = _x;
-    var accu = _accu;
-    if (!x) {
-      return accu;
-    }
-    _x = x.tl;
-    _accu = {
-      hd: Curry._1(f, x.hd),
-      tl: accu
-    };
-    continue ;
-  };
-}
-
-function iter(f, _x) {
-  while(true) {
-    var x = _x;
-    if (!x) {
-      return ;
-    }
-    Curry._1(f, x.hd);
-    _x = x.tl;
-    continue ;
-  };
-}
-
-function iteri(f, l) {
-  var _i = 0;
-  var _x = l;
-  while(true) {
-    var x = _x;
-    var i = _i;
-    if (!x) {
-      return ;
-    }
-    Curry._2(f, i, x.hd);
-    _x = x.tl;
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function fold_left(f, _accu, _l) {
-  while(true) {
-    var l = _l;
-    var accu = _accu;
-    if (!l) {
-      return accu;
-    }
-    _l = l.tl;
-    _accu = Curry._2(f, accu, l.hd);
-    continue ;
-  };
-}
-
-function fold_right(f, l, accu) {
-  if (l) {
-    return Curry._2(f, l.hd, fold_right(f, l.tl, accu));
-  } else {
-    return accu;
-  }
-}
-
-function map2(f, l1, l2) {
-  if (l1) {
-    if (l2) {
-      var r = Curry._2(f, l1.hd, l2.hd);
-      return {
-              hd: r,
-              tl: map2(f, l1.tl, l2.tl)
-            };
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.map2",
-          Error: new Error()
-        };
-  }
-  if (!l2) {
-    return /* [] */0;
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.map2",
-        Error: new Error()
-      };
-}
-
-function rev_map2(f, l1, l2) {
-  var _accu = /* [] */0;
-  var _l1 = l1;
-  var _l2 = l2;
-  while(true) {
-    var l2$1 = _l2;
-    var l1$1 = _l1;
-    var accu = _accu;
-    if (l1$1) {
-      if (l2$1) {
-        _l2 = l2$1.tl;
-        _l1 = l1$1.tl;
-        _accu = {
-          hd: Curry._2(f, l1$1.hd, l2$1.hd),
-          tl: accu
-        };
-        continue ;
-      }
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
-    }
-    if (l2$1) {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.rev_map2",
-            Error: new Error()
-          };
-    }
-    return accu;
-  };
-}
-
-function iter2(f, _l1, _l2) {
-  while(true) {
-    var l2 = _l2;
-    var l1 = _l1;
-    if (l1) {
-      if (l2) {
-        Curry._2(f, l1.hd, l2.hd);
-        _l2 = l2.tl;
-        _l1 = l1.tl;
-        continue ;
-      }
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.iter2",
-            Error: new Error()
-          };
-    }
-    if (!l2) {
-      return ;
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.iter2",
-          Error: new Error()
-        };
-  };
-}
-
-function fold_left2(f, _accu, _l1, _l2) {
-  while(true) {
-    var l2 = _l2;
-    var l1 = _l1;
-    var accu = _accu;
-    if (l1) {
-      if (l2) {
-        _l2 = l2.tl;
-        _l1 = l1.tl;
-        _accu = Curry._3(f, accu, l1.hd, l2.hd);
-        continue ;
-      }
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
-    }
-    if (l2) {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.fold_left2",
-            Error: new Error()
-          };
-    }
-    return accu;
-  };
-}
-
-function fold_right2(f, l1, l2, accu) {
-  if (l1) {
-    if (l2) {
-      return Curry._3(f, l1.hd, l2.hd, fold_right2(f, l1.tl, l2.tl, accu));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
-  }
-  if (l2) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.fold_right2",
-          Error: new Error()
-        };
-  }
-  return accu;
-}
-
-function for_all(p, _x) {
-  while(true) {
-    var x = _x;
-    if (!x) {
-      return true;
-    }
-    if (!Curry._1(p, x.hd)) {
-      return false;
-    }
-    _x = x.tl;
-    continue ;
-  };
-}
-
-function exists(p, _x) {
-  while(true) {
-    var x = _x;
-    if (!x) {
-      return false;
-    }
-    if (Curry._1(p, x.hd)) {
-      return true;
-    }
-    _x = x.tl;
-    continue ;
-  };
-}
-
-function for_all2(p, _l1, _l2) {
-  while(true) {
-    var l2 = _l2;
-    var l1 = _l1;
-    if (l1) {
-      if (l2) {
-        if (!Curry._2(p, l1.hd, l2.hd)) {
-          return false;
-        }
-        _l2 = l2.tl;
-        _l1 = l1.tl;
-        continue ;
-      }
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.for_all2",
-            Error: new Error()
-          };
-    }
-    if (!l2) {
-      return true;
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.for_all2",
-          Error: new Error()
-        };
-  };
-}
-
-function exists2(p, _l1, _l2) {
-  while(true) {
-    var l2 = _l2;
-    var l1 = _l1;
-    if (l1) {
-      if (l2) {
-        if (Curry._2(p, l1.hd, l2.hd)) {
-          return true;
-        }
-        _l2 = l2.tl;
-        _l1 = l1.tl;
-        continue ;
-      }
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "List.exists2",
-            Error: new Error()
-          };
-    }
-    if (!l2) {
-      return false;
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.exists2",
-          Error: new Error()
-        };
-  };
-}
-
-function mem(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (!x_) {
-      return false;
-    }
-    if (Caml_obj.equal(x_.hd, x)) {
-      return true;
-    }
-    _x_ = x_.tl;
-    continue ;
-  };
-}
-
-function memq(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (!x_) {
-      return false;
-    }
-    if (x_.hd === x) {
-      return true;
-    }
-    _x_ = x_.tl;
-    continue ;
-  };
-}
-
-function assoc(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (x_) {
-      var match = x_.hd;
-      if (Caml_obj.equal(match[0], x)) {
-        return match[1];
-      }
-      _x_ = x_.tl;
-      continue ;
-    }
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  };
-}
-
-function assq(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (x_) {
-      var match = x_.hd;
-      if (match[0] === x) {
-        return match[1];
-      }
-      _x_ = x_.tl;
-      continue ;
-    }
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  };
-}
-
-function mem_assoc(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (!x_) {
-      return false;
-    }
-    if (Caml_obj.equal(x_.hd[0], x)) {
-      return true;
-    }
-    _x_ = x_.tl;
-    continue ;
-  };
-}
-
-function mem_assq(x, _x_) {
-  while(true) {
-    var x_ = _x_;
-    if (!x_) {
-      return false;
-    }
-    if (x_.hd[0] === x) {
-      return true;
-    }
-    _x_ = x_.tl;
-    continue ;
-  };
-}
-
-function remove_assoc(x, x_) {
-  if (!x_) {
-    return /* [] */0;
-  }
-  var l = x_.tl;
-  var pair = x_.hd;
-  if (Caml_obj.equal(pair[0], x)) {
-    return l;
-  } else {
-    return {
-            hd: pair,
-            tl: remove_assoc(x, l)
-          };
-  }
-}
-
-function remove_assq(x, x_) {
-  if (!x_) {
-    return /* [] */0;
-  }
-  var l = x_.tl;
-  var pair = x_.hd;
-  if (pair[0] === x) {
-    return l;
-  } else {
-    return {
-            hd: pair,
-            tl: remove_assq(x, l)
-          };
-  }
-}
-
-function find(p, _x) {
-  while(true) {
-    var x = _x;
-    if (x) {
-      var x$1 = x.hd;
-      if (Curry._1(p, x$1)) {
-        return x$1;
-      }
-      _x = x.tl;
-      continue ;
-    }
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  };
-}
-
-function find_all(p) {
-  return function (param) {
-    var _accu = /* [] */0;
-    var _x = param;
-    while(true) {
-      var x = _x;
-      var accu = _accu;
-      if (!x) {
-        return rev_append(accu, /* [] */0);
-      }
-      var l = x.tl;
-      var x$1 = x.hd;
-      if (Curry._1(p, x$1)) {
-        _x = l;
-        _accu = {
-          hd: x$1,
-          tl: accu
-        };
-        continue ;
-      }
-      _x = l;
-      continue ;
-    };
-  };
-}
-
-function partition(p, l) {
-  var _yes = /* [] */0;
-  var _no = /* [] */0;
-  var _x = l;
-  while(true) {
-    var x = _x;
-    var no = _no;
-    var yes = _yes;
-    if (!x) {
-      return [
-              rev_append(yes, /* [] */0),
-              rev_append(no, /* [] */0)
-            ];
-    }
-    var l$1 = x.tl;
-    var x$1 = x.hd;
-    if (Curry._1(p, x$1)) {
-      _x = l$1;
-      _yes = {
-        hd: x$1,
-        tl: yes
-      };
-      continue ;
-    }
-    _x = l$1;
-    _no = {
-      hd: x$1,
-      tl: no
-    };
-    continue ;
-  };
-}
-
-function split(x) {
-  if (!x) {
-    return [
-            /* [] */0,
-            /* [] */0
-          ];
-  }
-  var match = x.hd;
-  var match$1 = split(x.tl);
-  return [
-          {
-            hd: match[0],
-            tl: match$1[0]
-          },
-          {
-            hd: match[1],
-            tl: match$1[1]
-          }
-        ];
-}
-
-function combine(l1, l2) {
-  if (l1) {
-    if (l2) {
-      return {
-              hd: [
-                l1.hd,
-                l2.hd
-              ],
-              tl: combine(l1.tl, l2.tl)
-            };
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "List.combine",
-          Error: new Error()
-        };
-  }
-  if (!l2) {
-    return /* [] */0;
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "List.combine",
-        Error: new Error()
-      };
-}
-
-function merge(cmp, l1, l2) {
-  if (!l1) {
-    return l2;
-  }
-  if (!l2) {
-    return l1;
-  }
-  var h2 = l2.hd;
-  var h1 = l1.hd;
-  if (Curry._2(cmp, h1, h2) <= 0) {
-    return {
-            hd: h1,
-            tl: merge(cmp, l1.tl, l2)
-          };
-  } else {
-    return {
-            hd: h2,
-            tl: merge(cmp, l1, l2.tl)
-          };
-  }
-}
-
-function chop(_k, _l) {
-  while(true) {
-    var l = _l;
-    var k = _k;
-    if (k === 0) {
-      return l;
-    }
-    if (l) {
-      _l = l.tl;
-      _k = k - 1 | 0;
-      continue ;
-    }
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "test_list.res",
-            343,
-            11
-          ],
-          Error: new Error()
-        };
-  };
-}
-
-function stable_sort(cmp, l) {
-  var sort = function (n, l) {
-    if (n !== 2) {
-      if (n === 3 && l) {
-        var match = l.tl;
-        if (match) {
-          var match$1 = match.tl;
-          if (match$1) {
-            var x3 = match$1.hd;
-            var x2 = match.hd;
-            var x1 = l.hd;
-            if (Curry._2(cmp, x1, x2) <= 0) {
-              if (Curry._2(cmp, x2, x3) <= 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              } else if (Curry._2(cmp, x1, x3) <= 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              } else {
-                return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              }
-            } else if (Curry._2(cmp, x1, x3) <= 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            } else if (Curry._2(cmp, x2, x3) <= 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            } else {
-              return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            }
-          }
-          
-        }
-        
-      }
-      
-    } else if (l) {
-      var match$2 = l.tl;
-      if (match$2) {
-        var x2$1 = match$2.hd;
-        var x1$1 = l.hd;
-        if (Curry._2(cmp, x1$1, x2$1) <= 0) {
-          return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
-        } else {
-          return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
-        }
-      }
-      
-    }
-    var n1 = (n >> 1);
-    var n2 = n - n1 | 0;
-    var l2 = chop(n1, l);
-    var s1 = rev_sort(n1, l);
-    var s2 = rev_sort(n2, l2);
-    var _l1 = s1;
-    var _l2 = s2;
-    var _accu = /* [] */0;
-    while(true) {
-      var accu = _accu;
-      var l2$1 = _l2;
-      var l1 = _l1;
-      if (!l1) {
-        return rev_append(l2$1, accu);
-      }
-      if (!l2$1) {
-        return rev_append(l1, accu);
-      }
-      var h2 = l2$1.hd;
-      var h1 = l1.hd;
-      if (Curry._2(cmp, h1, h2) > 0) {
-        _accu = {
-          hd: h1,
-          tl: accu
-        };
-        _l1 = l1.tl;
-        continue ;
-      }
-      _accu = {
-        hd: h2,
-        tl: accu
-      };
-      _l2 = l2$1.tl;
-      continue ;
-    };
-  };
-  var rev_sort = function (n, l) {
-    if (n !== 2) {
-      if (n === 3 && l) {
-        var match = l.tl;
-        if (match) {
-          var match$1 = match.tl;
-          if (match$1) {
-            var x3 = match$1.hd;
-            var x2 = match.hd;
-            var x1 = l.hd;
-            if (Curry._2(cmp, x1, x2) > 0) {
-              if (Curry._2(cmp, x2, x3) > 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              } else if (Curry._2(cmp, x1, x3) > 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              } else {
-                return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              }
-            } else if (Curry._2(cmp, x1, x3) > 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            } else if (Curry._2(cmp, x2, x3) > 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            } else {
-              return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            }
-          }
-          
-        }
-        
-      }
-      
-    } else if (l) {
-      var match$2 = l.tl;
-      if (match$2) {
-        var x2$1 = match$2.hd;
-        var x1$1 = l.hd;
-        if (Curry._2(cmp, x1$1, x2$1) > 0) {
-          return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
-        } else {
-          return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
-        }
-      }
-      
-    }
-    var n1 = (n >> 1);
-    var n2 = n - n1 | 0;
-    var l2 = chop(n1, l);
-    var s1 = sort(n1, l);
-    var s2 = sort(n2, l2);
-    var _l1 = s1;
-    var _l2 = s2;
-    var _accu = /* [] */0;
-    while(true) {
-      var accu = _accu;
-      var l2$1 = _l2;
-      var l1 = _l1;
-      if (!l1) {
-        return rev_append(l2$1, accu);
-      }
-      if (!l2$1) {
-        return rev_append(l1, accu);
-      }
-      var h2 = l2$1.hd;
-      var h1 = l1.hd;
-      if (Curry._2(cmp, h1, h2) <= 0) {
-        _accu = {
-          hd: h1,
-          tl: accu
-        };
-        _l1 = l1.tl;
-        continue ;
-      }
-      _accu = {
-        hd: h2,
-        tl: accu
-      };
-      _l2 = l2$1.tl;
-      continue ;
-    };
-  };
-  var len = length_aux(0, l);
-  if (len < 2) {
-    return l;
-  } else {
-    return sort(len, l);
-  }
-}
-
-function sort_uniq(cmp, l) {
-  var sort = function (n, l) {
-    if (n !== 2) {
-      if (n === 3 && l) {
-        var match = l.tl;
-        if (match) {
-          var match$1 = match.tl;
-          if (match$1) {
-            var x3 = match$1.hd;
-            var x2 = match.hd;
-            var x1 = l.hd;
-            var c = Curry._2(cmp, x1, x2);
-            if (c === 0) {
-              var c$1 = Curry._2(cmp, x2, x3);
-              if (c$1 === 0) {
-                return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
-              } else if (c$1 < 0) {
-                return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
-              } else {
-                return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
-              }
-            }
-            if (c < 0) {
-              var c$2 = Curry._2(cmp, x2, x3);
-              if (c$2 === 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
-              }
-              if (c$2 < 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              }
-              var c$3 = Curry._2(cmp, x1, x3);
-              if (c$3 === 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
-              } else if (c$3 < 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              } else {
-                return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              }
-            }
-            var c$4 = Curry._2(cmp, x1, x3);
-            if (c$4 === 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
-            }
-            if (c$4 < 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            }
-            var c$5 = Curry._2(cmp, x2, x3);
-            if (c$5 === 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
-            } else if (c$5 < 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            } else {
-              return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            }
-          }
-          
-        }
-        
-      }
-      
-    } else if (l) {
-      var match$2 = l.tl;
-      if (match$2) {
-        var x2$1 = match$2.hd;
-        var x1$1 = l.hd;
-        var c$6 = Curry._2(cmp, x1$1, x2$1);
-        if (c$6 === 0) {
-          return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
-        } else if (c$6 < 0) {
-          return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
-        } else {
-          return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
-        }
-      }
-      
-    }
-    var n1 = (n >> 1);
-    var n2 = n - n1 | 0;
-    var l2 = chop(n1, l);
-    var s1 = rev_sort(n1, l);
-    var s2 = rev_sort(n2, l2);
-    var _l1 = s1;
-    var _l2 = s2;
-    var _accu = /* [] */0;
-    while(true) {
-      var accu = _accu;
-      var l2$1 = _l2;
-      var l1 = _l1;
-      if (!l1) {
-        return rev_append(l2$1, accu);
-      }
-      if (!l2$1) {
-        return rev_append(l1, accu);
-      }
-      var t2 = l2$1.tl;
-      var h2 = l2$1.hd;
-      var t1 = l1.tl;
-      var h1 = l1.hd;
-      var c$7 = Curry._2(cmp, h1, h2);
-      if (c$7 === 0) {
-        _accu = {
-          hd: h1,
-          tl: accu
-        };
-        _l2 = t2;
-        _l1 = t1;
-        continue ;
-      }
-      if (c$7 > 0) {
-        _accu = {
-          hd: h1,
-          tl: accu
-        };
-        _l1 = t1;
-        continue ;
-      }
-      _accu = {
-        hd: h2,
-        tl: accu
-      };
-      _l2 = t2;
-      continue ;
-    };
-  };
-  var rev_sort = function (n, l) {
-    if (n !== 2) {
-      if (n === 3 && l) {
-        var match = l.tl;
-        if (match) {
-          var match$1 = match.tl;
-          if (match$1) {
-            var x3 = match$1.hd;
-            var x2 = match.hd;
-            var x1 = l.hd;
-            var c = Curry._2(cmp, x1, x2);
-            if (c === 0) {
-              var c$1 = Curry._2(cmp, x2, x3);
-              if (c$1 === 0) {
-                return {
-                        hd: x2,
-                        tl: /* [] */0
-                      };
-              } else if (c$1 > 0) {
-                return {
-                        hd: x2,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      };
-              } else {
-                return {
-                        hd: x3,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
-              }
-            }
-            if (c > 0) {
-              var c$2 = Curry._2(cmp, x2, x3);
-              if (c$2 === 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
-              }
-              if (c$2 > 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: {
-                            hd: x3,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              }
-              var c$3 = Curry._2(cmp, x1, x3);
-              if (c$3 === 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x2,
-                          tl: /* [] */0
-                        }
-                      };
-              } else if (c$3 > 0) {
-                return {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              } else {
-                return {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: {
-                            hd: x2,
-                            tl: /* [] */0
-                          }
-                        }
-                      };
-              }
-            }
-            var c$4 = Curry._2(cmp, x1, x3);
-            if (c$4 === 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
-            }
-            if (c$4 > 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: {
-                          hd: x3,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            }
-            var c$5 = Curry._2(cmp, x2, x3);
-            if (c$5 === 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x1,
-                        tl: /* [] */0
-                      }
-                    };
-            } else if (c$5 > 0) {
-              return {
-                      hd: x2,
-                      tl: {
-                        hd: x3,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            } else {
-              return {
-                      hd: x3,
-                      tl: {
-                        hd: x2,
-                        tl: {
-                          hd: x1,
-                          tl: /* [] */0
-                        }
-                      }
-                    };
-            }
-          }
-          
-        }
-        
-      }
-      
-    } else if (l) {
-      var match$2 = l.tl;
-      if (match$2) {
-        var x2$1 = match$2.hd;
-        var x1$1 = l.hd;
-        var c$6 = Curry._2(cmp, x1$1, x2$1);
-        if (c$6 === 0) {
-          return {
-                  hd: x1$1,
-                  tl: /* [] */0
-                };
-        } else if (c$6 > 0) {
-          return {
-                  hd: x1$1,
-                  tl: {
-                    hd: x2$1,
-                    tl: /* [] */0
-                  }
-                };
-        } else {
-          return {
-                  hd: x2$1,
-                  tl: {
-                    hd: x1$1,
-                    tl: /* [] */0
-                  }
-                };
-        }
-      }
-      
-    }
-    var n1 = (n >> 1);
-    var n2 = n - n1 | 0;
-    var l2 = chop(n1, l);
-    var s1 = sort(n1, l);
-    var s2 = sort(n2, l2);
-    var _l1 = s1;
-    var _l2 = s2;
-    var _accu = /* [] */0;
-    while(true) {
-      var accu = _accu;
-      var l2$1 = _l2;
-      var l1 = _l1;
-      if (!l1) {
-        return rev_append(l2$1, accu);
-      }
-      if (!l2$1) {
-        return rev_append(l1, accu);
-      }
-      var t2 = l2$1.tl;
-      var h2 = l2$1.hd;
-      var t1 = l1.tl;
-      var h1 = l1.hd;
-      var c$7 = Curry._2(cmp, h1, h2);
-      if (c$7 === 0) {
-        _accu = {
-          hd: h1,
-          tl: accu
-        };
-        _l2 = t2;
-        _l1 = t1;
-        continue ;
-      }
-      if (c$7 < 0) {
-        _accu = {
-          hd: h1,
-          tl: accu
-        };
-        _l1 = t1;
-        continue ;
-      }
-      _accu = {
-        hd: h2,
-        tl: accu
-      };
-      _l2 = t2;
-      continue ;
-    };
-  };
-  var len = length_aux(0, l);
-  if (len < 2) {
-    return l;
-  } else {
-    return sort(len, l);
-  }
-}
-
-var u = List.length;
-
-var append = Pervasives.$at;
-
-var concat = flatten;
-
-var filter = find_all;
-
-var sort = stable_sort;
-
-var fast_sort = stable_sort;
-
-exports.u = u;
-exports.length_aux = length_aux;
-exports.length = length;
-exports.hd = hd;
-exports.tl = tl;
-exports.nth = nth;
-exports.append = append;
-exports.rev_append = rev_append;
-exports.rev = rev;
-exports.flatten = flatten;
-exports.concat = concat;
-exports.map = map;
-exports.mapi = mapi$1;
-exports.rev_map = rev_map;
-exports.iter = iter;
-exports.iteri = iteri;
-exports.fold_left = fold_left;
-exports.fold_right = fold_right;
-exports.map2 = map2;
-exports.rev_map2 = rev_map2;
-exports.iter2 = iter2;
-exports.fold_left2 = fold_left2;
-exports.fold_right2 = fold_right2;
-exports.for_all = for_all;
-exports.exists = exists;
-exports.for_all2 = for_all2;
-exports.exists2 = exists2;
-exports.mem = mem;
-exports.memq = memq;
-exports.assoc = assoc;
-exports.assq = assq;
-exports.mem_assoc = mem_assoc;
-exports.mem_assq = mem_assq;
-exports.remove_assoc = remove_assoc;
-exports.remove_assq = remove_assq;
-exports.find = find;
-exports.find_all = find_all;
-exports.filter = filter;
-exports.partition = partition;
-exports.split = split;
-exports.combine = combine;
-exports.merge = merge;
-exports.chop = chop;
-exports.stable_sort = stable_sort;
-exports.sort = sort;
-exports.fast_sort = fast_sort;
-exports.sort_uniq = sort_uniq;
-/* No side effect */
diff --git a/jscomp/test/test_list.res b/jscomp/test/test_list.res
deleted file mode 100644
index acda86c..0000000
--- a/jscomp/test/test_list.res
+++ /dev/null
@@ -1,614 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-/* List operations */
-
-let u = List.length
-let rec length_aux = (len, x) =>
-  switch x {
-  | list{} => len
-  | list{a, ...l} => length_aux(len + 1, l)
-  }
-
-let length = l => length_aux(0, l)
-
-let hd = x =>
-  switch x {
-  | list{} => failwith("hd")
-  | list{a, ...l} => a
-  }
-
-let tl = x =>
-  switch x {
-  | list{} => failwith("tl")
-  | list{a, ...l} => l
-  }
-
-let nth = (l, n) =>
-  if n < 0 {
-    invalid_arg("List.nth")
-  } else {
-    let rec nth_aux = (l, n) =>
-      switch l {
-      | list{} => failwith("nth")
-      | list{a, ...l} =>
-        if n == 0 {
-          a
-        } else {
-          nth_aux(l, n - 1)
-        }
-      }
-    nth_aux(l, n)
-  }
-
-let append = \"@"
-
-let rec rev_append = (l1, l2) =>
-  switch l1 {
-  | list{} => l2
-  | list{a, ...l} => rev_append(l, list{a, ...l2})
-  }
-
-let rev = l => rev_append(l, list{})
-
-let rec flatten = x =>
-  switch x {
-  | list{} => list{}
-  | list{l, ...r} => \"@"(l, flatten(r))
-  }
-
-let concat = flatten
-
-let rec map = (f, x) =>
-  switch x {
-  | list{} => list{}
-  | list{a, ...l} =>
-    let r = f(a)
-    list{r, ...map(f, l)}
-  }
-
-let rec mapi = (i, f, x) =>
-  switch x {
-  | list{} => list{}
-  | list{a, ...l} =>
-    let r = f(i, a)
-    list{r, ...mapi(i + 1, f, l)}
-  }
-
-let mapi = (f, l) => mapi(0, f, l)
-
-let rev_map = (f, l) => {
-  let rec rmap_f = (accu, x) =>
-    switch x {
-    | list{} => accu
-    | list{a, ...l} => rmap_f(list{f(a), ...accu}, l)
-    }
-
-  rmap_f(list{}, l)
-}
-
-let rec iter = (f, x) =>
-  switch x {
-  | list{} => ()
-  | list{a, ...l} =>
-    f(a)
-    iter(f, l)
-  }
-
-let rec iteri = (i, f, x) =>
-  switch x {
-  | list{} => ()
-  | list{a, ...l} =>
-    f(i, a)
-    iteri(i + 1, f, l)
-  }
-
-let iteri = (f, l) => iteri(0, f, l)
-
-let rec fold_left = (f, accu, l) =>
-  switch l {
-  | list{} => accu
-  | list{a, ...l} => fold_left(f, f(accu, a), l)
-  }
-
-let rec fold_right = (f, l, accu) =>
-  switch l {
-  | list{} => accu
-  | list{a, ...l} => f(a, fold_right(f, l, accu))
-  }
-
-let rec map2 = (f, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => list{}
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    let r = f(a1, a2)
-    list{r, ...map2(f, l1, l2)}
-  | (_, _) => invalid_arg("List.map2")
-  }
-
-let rev_map2 = (f, l1, l2) => {
-  let rec rmap2_f = (accu, l1, l2) =>
-    switch (l1, l2) {
-    | (list{}, list{}) => accu
-    | (list{a1, ...l1}, list{a2, ...l2}) => rmap2_f(list{f(a1, a2), ...accu}, l1, l2)
-    | (_, _) => invalid_arg("List.rev_map2")
-    }
-
-  rmap2_f(list{}, l1, l2)
-}
-
-let rec iter2 = (f, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => ()
-  | (list{a1, ...l1}, list{a2, ...l2}) =>
-    f(a1, a2)
-    iter2(f, l1, l2)
-  | (_, _) => invalid_arg("List.iter2")
-  }
-
-let rec fold_left2 = (f, accu, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => accu
-  | (list{a1, ...l1}, list{a2, ...l2}) => fold_left2(f, f(accu, a1, a2), l1, l2)
-  | (_, _) => invalid_arg("List.fold_left2")
-  }
-
-let rec fold_right2 = (f, l1, l2, accu) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => accu
-  | (list{a1, ...l1}, list{a2, ...l2}) => f(a1, a2, fold_right2(f, l1, l2, accu))
-  | (_, _) => invalid_arg("List.fold_right2")
-  }
-
-let rec for_all = (p, x) =>
-  switch x {
-  | list{} => true
-  | list{a, ...l} => p(a) && for_all(p, l)
-  }
-
-let rec exists = (p, x) =>
-  switch x {
-  | list{} => false
-  | list{a, ...l} => p(a) || exists(p, l)
-  }
-
-let rec for_all2 = (p, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => true
-  | (list{a1, ...l1}, list{a2, ...l2}) => p(a1, a2) && for_all2(p, l1, l2)
-  | (_, _) => invalid_arg("List.for_all2")
-  }
-
-let rec exists2 = (p, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => false
-  | (list{a1, ...l1}, list{a2, ...l2}) => p(a1, a2) || exists2(p, l1, l2)
-  | (_, _) => invalid_arg("List.exists2")
-  }
-
-let rec mem = (x, x_) =>
-  switch x_ {
-  | list{} => false
-  | list{a, ...l} => compare(a, x) == 0 || mem(x, l)
-  }
-
-let rec memq = (x, x_) =>
-  switch x_ {
-  | list{} => false
-  | list{a, ...l} => a === x || memq(x, l)
-  }
-
-let rec assoc = (x, x_) =>
-  switch x_ {
-  | list{} => raise(Not_found)
-  | list{(a, b), ...l} =>
-    if compare(a, x) == 0 {
-      b
-    } else {
-      assoc(x, l)
-    }
-  }
-
-let rec assq = (x, x_) =>
-  switch x_ {
-  | list{} => raise(Not_found)
-  | list{(a, b), ...l} =>
-    if a === x {
-      b
-    } else {
-      assq(x, l)
-    }
-  }
-
-let rec mem_assoc = (x, x_) =>
-  switch x_ {
-  | list{} => false
-  | list{(a, b), ...l} => compare(a, x) == 0 || mem_assoc(x, l)
-  }
-
-let rec mem_assq = (x, x_) =>
-  switch x_ {
-  | list{} => false
-  | list{(a, b), ...l} => a === x || mem_assq(x, l)
-  }
-
-let rec remove_assoc = (x, x_) =>
-  switch x_ {
-  | list{} => list{}
-  | list{(a, b) as pair, ...l} =>
-    if compare(a, x) == 0 {
-      l
-    } else {
-      list{pair, ...remove_assoc(x, l)}
-    }
-  }
-
-let rec remove_assq = (x, x_) =>
-  switch x_ {
-  | list{} => list{}
-  | list{(a, b) as pair, ...l} =>
-    if a === x {
-      l
-    } else {
-      list{pair, ...remove_assq(x, l)}
-    }
-  }
-
-let rec find = (p, x) =>
-  switch x {
-  | list{} => raise(Not_found)
-  | list{x, ...l} =>
-    if p(x) {
-      x
-    } else {
-      find(p, l)
-    }
-  }
-
-let find_all = p => {
-  let rec find = (accu, x) =>
-    switch x {
-    | list{} => rev(accu)
-    | list{x, ...l} =>
-      if p(x) {
-        find(list{x, ...accu}, l)
-      } else {
-        find(accu, l)
-      }
-    }
-  find(list{})
-}
-
-let filter = find_all
-
-let partition = (p, l) => {
-  let rec part = (yes, no, x) =>
-    switch x {
-    | list{} => (rev(yes), rev(no))
-    | list{x, ...l} =>
-      if p(x) {
-        part(list{x, ...yes}, no, l)
-      } else {
-        part(yes, list{x, ...no}, l)
-      }
-    }
-  part(list{}, list{}, l)
-}
-
-let rec split = x =>
-  switch x {
-  | list{} => (list{}, list{})
-  | list{(x, y), ...l} =>
-    let (rx, ry) = split(l)
-    (list{x, ...rx}, list{y, ...ry})
-  }
-
-let rec combine = (l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, list{}) => list{}
-  | (list{a1, ...l1}, list{a2, ...l2}) => list{(a1, a2), ...combine(l1, l2)}
-  | (_, _) => invalid_arg("List.combine")
-  }
-
-/* sorting */
-
-let rec merge = (cmp, l1, l2) =>
-  switch (l1, l2) {
-  | (list{}, l2) => l2
-  | (l1, list{}) => l1
-  | (list{h1, ...t1}, list{h2, ...t2}) =>
-    if cmp(h1, h2) <= 0 {
-      list{h1, ...merge(cmp, t1, l2)}
-    } else {
-      list{h2, ...merge(cmp, l1, t2)}
-    }
-  }
-
-let rec chop = (k, l) =>
-  if k == 0 {
-    l
-  } else {
-    switch l {
-    | list{x, ...t} => chop(k - 1, t)
-    | _ => assert(false)
-    }
-  }
-
-let stable_sort = (cmp, l) => {
-  let rec rev_merge = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      if cmp(h1, h2) <= 0 {
-        rev_merge(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec rev_merge_rev = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      if cmp(h1, h2) > 0 {
-        rev_merge_rev(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge_rev(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      if cmp(x1, x2) <= 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      if cmp(x1, x2) <= 0 {
-        if cmp(x2, x3) <= 0 {
-          list{x1, x2, x3}
-        } else if cmp(x1, x3) <= 0 {
-          list{x1, x3, x2}
-        } else {
-          list{x3, x1, x2}
-        }
-      } else if cmp(x1, x3) <= 0 {
-        list{x2, x1, x3}
-      } else if cmp(x2, x3) <= 0 {
-        list{x2, x3, x1}
-      } else {
-        list{x3, x2, x1}
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = rev_sort(n1, l)
-      let s2 = rev_sort(n2, l2)
-      rev_merge_rev(s1, s2, list{})
-    }
-  and rev_sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      if cmp(x1, x2) > 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      if cmp(x1, x2) > 0 {
-        if cmp(x2, x3) > 0 {
-          list{x1, x2, x3}
-        } else if cmp(x1, x3) > 0 {
-          list{x1, x3, x2}
-        } else {
-          list{x3, x1, x2}
-        }
-      } else if cmp(x1, x3) > 0 {
-        list{x2, x1, x3}
-      } else if cmp(x2, x3) > 0 {
-        list{x2, x3, x1}
-      } else {
-        list{x3, x2, x1}
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = sort(n1, l)
-      let s2 = sort(n2, l2)
-      rev_merge(s1, s2, list{})
-    }
-
-  let len = length(l)
-  if len < 2 {
-    l
-  } else {
-    sort(len, l)
-  }
-}
-
-let sort = stable_sort
-let fast_sort = stable_sort
-
-/* sorting + removing duplicates */
-
-let sort_uniq = (cmp, l) => {
-  let rec rev_merge = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      let c = cmp(h1, h2)
-      if c == 0 {
-        rev_merge(t1, t2, list{h1, ...accu})
-      } else if c < 0 {
-        rev_merge(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec rev_merge_rev = (l1, l2, accu) =>
-    switch (l1, l2) {
-    | (list{}, l2) => rev_append(l2, accu)
-    | (l1, list{}) => rev_append(l1, accu)
-    | (list{h1, ...t1}, list{h2, ...t2}) =>
-      let c = cmp(h1, h2)
-      if c == 0 {
-        rev_merge_rev(t1, t2, list{h1, ...accu})
-      } else if c > 0 {
-        rev_merge_rev(t1, l2, list{h1, ...accu})
-      } else {
-        rev_merge_rev(l1, t2, list{h2, ...accu})
-      }
-    }
-
-  let rec sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        list{x1}
-      } else if c < 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x2}
-        } else if c < 0 {
-          list{x2, x3}
-        } else {
-          list{x3, x2}
-        }
-      } else if c < 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x1, x2}
-        } else if c < 0 {
-          list{x1, x2, x3}
-        } else {
-          let c = cmp(x1, x3)
-          if c == 0 {
-            list{x1, x2}
-          } else if c < 0 {
-            list{x1, x3, x2}
-          } else {
-            list{x3, x1, x2}
-          }
-        }
-      } else {
-        let c = cmp(x1, x3)
-        if c == 0 {
-          list{x2, x1}
-        } else if c < 0 {
-          list{x2, x1, x3}
-        } else {
-          let c = cmp(x2, x3)
-          if c == 0 {
-            list{x2, x1}
-          } else if c < 0 {
-            list{x2, x3, x1}
-          } else {
-            list{x3, x2, x1}
-          }
-        }
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = rev_sort(n1, l)
-      let s2 = rev_sort(n2, l2)
-      rev_merge_rev(s1, s2, list{})
-    }
-  and rev_sort = (n, l) =>
-    switch (n, l) {
-    | (2, list{x1, x2, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        list{x1}
-      } else if c > 0 {
-        list{x1, x2}
-      } else {
-        list{x2, x1}
-      }
-    | (3, list{x1, x2, x3, ..._}) =>
-      let c = cmp(x1, x2)
-      if c == 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x2}
-        } else if c > 0 {
-          list{x2, x3}
-        } else {
-          list{x3, x2}
-        }
-      } else if c > 0 {
-        let c = cmp(x2, x3)
-        if c == 0 {
-          list{x1, x2}
-        } else if c > 0 {
-          list{x1, x2, x3}
-        } else {
-          let c = cmp(x1, x3)
-          if c == 0 {
-            list{x1, x2}
-          } else if c > 0 {
-            list{x1, x3, x2}
-          } else {
-            list{x3, x1, x2}
-          }
-        }
-      } else {
-        let c = cmp(x1, x3)
-        if c == 0 {
-          list{x2, x1}
-        } else if c > 0 {
-          list{x2, x1, x3}
-        } else {
-          let c = cmp(x2, x3)
-          if c == 0 {
-            list{x2, x1}
-          } else if c > 0 {
-            list{x2, x3, x1}
-          } else {
-            list{x3, x2, x1}
-          }
-        }
-      }
-    | (n, l) =>
-      let n1 = asr(n, 1)
-      let n2 = n - n1
-      let l2 = chop(n1, l)
-      let s1 = sort(n1, l)
-      let s2 = sort(n2, l2)
-      rev_merge(s1, s2, list{})
-    }
-
-  let len = length(l)
-  if len < 2 {
-    l
-  } else {
-    sort(len, l)
-  }
-}
diff --git a/jscomp/test/test_literal.js b/jscomp/test/test_literal.js
deleted file mode 100644
index ba37619..0000000
--- a/jscomp/test/test_literal.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var Custom_inline = /* @__PURE__ */Caml_exceptions.create("Test_literal.Custom_inline");
-
-var v = {
-  RE_EXN_ID: Custom_inline,
-  _1: 1,
-  _2: 2
-};
-
-var vv = [
-  1,
-  2,
-  3
-];
-
-var long_v = [
-  1,
-  2,
-  3,
-  4,
-  5,
-  6
-];
-
-var long_int_v = [
-  1,
-  2,
-  3,
-  4,
-  5,
-  6
-];
-
-var short_int_v = [1];
-
-var empty = [];
-
-exports.Custom_inline = Custom_inline;
-exports.v = v;
-exports.vv = vv;
-exports.long_v = long_v;
-exports.long_int_v = long_int_v;
-exports.short_int_v = short_int_v;
-exports.empty = empty;
-/* No side effect */
diff --git a/jscomp/test/test_literal.res b/jscomp/test/test_literal.res
deleted file mode 100644
index be8759f..0000000
--- a/jscomp/test/test_literal.res
+++ /dev/null
@@ -1,14 +0,0 @@
-exception Custom_inline(int, int)
-
-let v = Custom_inline(1, 2)
-
-let vv = [1., 2., 3.]
-
-let long_v = [1., 2., 3., 4., 5., 6.]
-
-let long_int_v = [1, 2, 3, 4, 5, 6]
-
-let short_int_v = [1]
-let empty: array<int> = []
-
-/* compile error */
diff --git a/jscomp/test/test_literals.js b/jscomp/test/test_literals.js
deleted file mode 100644
index 0c9081d..0000000
--- a/jscomp/test/test_literals.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var node_modules_length = "node_modules".length;
-
-var node_modules = "node_modules";
-
-var bsconfig_json = "bsconfig.json";
-
-exports.node_modules = node_modules;
-exports.node_modules_length = node_modules_length;
-exports.bsconfig_json = bsconfig_json;
-/* No side effect */
diff --git a/jscomp/test/test_literals.res b/jscomp/test/test_literals.res
deleted file mode 100644
index 1ce0973..0000000
--- a/jscomp/test/test_literals.res
+++ /dev/null
@@ -1,5 +0,0 @@
-/** nodejs */
-let node_modules = "node_modules"
-let node_modules_length = String.length("node_modules")
-
-let bsconfig_json = "bsconfig.json"
diff --git a/jscomp/test/test_match_exception.js b/jscomp/test/test_match_exception.js
deleted file mode 100644
index bade3d2..0000000
--- a/jscomp/test/test_match_exception.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function f(g, x) {
-  try {
-    return Curry._1(g, x);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Not_found") {
-      return 3;
-    }
-    throw exn;
-  }
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_match_exception.res b/jscomp/test/test_match_exception.res
deleted file mode 100644
index ab6e115..0000000
--- a/jscomp/test/test_match_exception.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let f = (g, x) =>
-  switch g(x) {
-  | y => y
-  | exception Not_found => 3
-  }
diff --git a/jscomp/test/test_mutliple.js b/jscomp/test/test_mutliple.js
deleted file mode 100644
index 1d1fe0a..0000000
--- a/jscomp/test/test_mutliple.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-
-var f = List.length(/* [] */0);
-
-exports.f = f;
-/* f Not a pure module */
diff --git a/jscomp/test/test_mutliple.res b/jscomp/test/test_mutliple.res
deleted file mode 100644
index 6550ffc..0000000
--- a/jscomp/test/test_mutliple.res
+++ /dev/null
@@ -1 +0,0 @@
-let f = List.length(list{})
diff --git a/jscomp/test/test_nat64.js b/jscomp/test/test_nat64.js
deleted file mode 100644
index 7bab970..0000000
--- a/jscomp/test/test_nat64.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-
-var v = Caml_int64.zero;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/test_nat64.res b/jscomp/test/test_nat64.res
deleted file mode 100644
index f668843..0000000
--- a/jscomp/test/test_nat64.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = 0L
diff --git a/jscomp/test/test_nested_let.js b/jscomp/test/test_nested_let.js
deleted file mode 100644
index 57cec0c..0000000
--- a/jscomp/test/test_nested_let.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v = 68;
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/test_nested_let.res b/jscomp/test/test_nested_let.res
deleted file mode 100644
index c973ca1..0000000
--- a/jscomp/test/test_nested_let.res
+++ /dev/null
@@ -1,6 +0,0 @@
-let v = {
-  let a = 3
-  let b = 32
-  let c = 33
-  a + b + c
-}
diff --git a/jscomp/test/test_nested_print.js b/jscomp/test/test_nested_print.js
deleted file mode 100644
index fe3e1aa..0000000
--- a/jscomp/test/test_nested_print.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function u(x, x$1) {
-  return x$1 + x$1 | 0;
-}
-
-function f(g, x) {
-  var u = Curry._1(g, x);
-  return u + u | 0;
-}
-
-exports.u = u;
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_nested_print.res b/jscomp/test/test_nested_print.res
deleted file mode 100644
index e6cebc6..0000000
--- a/jscomp/test/test_nested_print.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let u = (x, x) => x + x
-let f = (g, x) => {
-  let u = g(x)
-  u + u
-}
diff --git a/jscomp/test/test_non_export.js b/jscomp/test/test_non_export.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/test_non_export.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/test_non_export.res b/jscomp/test/test_non_export.res
deleted file mode 100644
index 964cbd9..0000000
--- a/jscomp/test/test_non_export.res
+++ /dev/null
@@ -1,20 +0,0 @@
-include (
-  {
-    module V = String
-    module U = V
-
-    let u = U.make
-    let v = module(U: Set.OrderedType)
-
-    let pack = h => {
-      module U = unpack(h: Set.OrderedType)
-      module V = Set.Make(U)
-      module(V: Set.S)
-    }
-
-    let g = pack(v)
-    let gg = pack(module(String))
-    module N = Set.Make(U)
-    module NN = Set.Make(String)
-  }: {}
-)
diff --git a/jscomp/test/test_nullary.js b/jscomp/test/test_nullary.js
deleted file mode 100644
index 286a047..0000000
--- a/jscomp/test/test_nullary.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(param) {
-  console.log("hey");
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_nullary.res b/jscomp/test/test_nullary.res
deleted file mode 100644
index 4ae890b..0000000
--- a/jscomp/test/test_nullary.res
+++ /dev/null
@@ -1 +0,0 @@
-let f = _ => print_endline("hey")
diff --git a/jscomp/test/test_obj.js b/jscomp/test/test_obj.js
deleted file mode 100644
index e34804b..0000000
--- a/jscomp/test/test_obj.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  return x.say_hi;
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_obj.res b/jscomp/test/test_obj.res
deleted file mode 100644
index 6658942..0000000
--- a/jscomp/test/test_obj.res
+++ /dev/null
@@ -1 +0,0 @@
-let f = x => x["say_hi"]
diff --git a/jscomp/test/test_order.js b/jscomp/test/test_order.js
deleted file mode 100644
index 78fd323..0000000
--- a/jscomp/test/test_order.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-
-var compare = Caml.int_compare;
-
-exports.compare = compare;
-/* No side effect */
diff --git a/jscomp/test/test_order.res b/jscomp/test/test_order.res
deleted file mode 100644
index 036f080..0000000
--- a/jscomp/test/test_order.res
+++ /dev/null
@@ -1,2 +0,0 @@
-type t = int
-let compare = (x: int, y: int) => Pervasives.compare(x, y)
diff --git a/jscomp/test/test_order_tailcall.js b/jscomp/test/test_order_tailcall.js
deleted file mode 100644
index 93bc5b2..0000000
--- a/jscomp/test/test_order_tailcall.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(_x, _y) {
-  while(true) {
-    var y = _y;
-    var x = _x;
-    _y = x;
-    _x = y;
-    continue ;
-  };
-}
-
-function f1(_x, _y, _z) {
-  while(true) {
-    var z = _z;
-    var y = _y;
-    var x = _x;
-    console.log(z);
-    _z = x;
-    _y = z;
-    _x = y;
-    continue ;
-  };
-}
-
-function f2(x, _y) {
-  while(true) {
-    var y = _y;
-    _y = y + 10 | 0;
-    continue ;
-  };
-}
-
-function f3(_x, _y) {
-  while(true) {
-    var y = _y;
-    var x = _x;
-    _y = x + 10 | 0;
-    _x = y;
-    continue ;
-  };
-}
-
-function f4(_x, _y) {
-  while(true) {
-    var y = _y;
-    var x = _x;
-    _y = y + x | 0;
-    _x = x + 10 | 0;
-    continue ;
-  };
-}
-
-function f5(_x, _y, z) {
-  while(true) {
-    var y = _y;
-    _y = z + 20 | 0;
-    _x = y + 10 | 0;
-    continue ;
-  };
-}
-
-function f6(b) {
-  while(true) {
-    if (!b) {
-      return false;
-    }
-    continue ;
-  };
-}
-
-function f7(b) {
-  while(true) {
-    if (b) {
-      return true;
-    }
-    continue ;
-  };
-}
-
-function f8(_x, _y) {
-  while(true) {
-    var y = _y;
-    var x = _x;
-    if (x > 10) {
-      _y = y + 1 | 0;
-      continue ;
-    }
-    if (x < 5) {
-      _x = x - 1 | 0;
-      continue ;
-    }
-    if (x <= 6) {
-      return f8(x, y + 1 | 0) + f8(x - 1 | 0, y) | 0;
-    }
-    _x = x - 2 | 0;
-    continue ;
-  };
-}
-
-exports.f = f;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.f5 = f5;
-exports.f6 = f6;
-exports.f7 = f7;
-exports.f8 = f8;
-/* No side effect */
diff --git a/jscomp/test/test_order_tailcall.res b/jscomp/test/test_order_tailcall.res
deleted file mode 100644
index 1a4ac64..0000000
--- a/jscomp/test/test_order_tailcall.res
+++ /dev/null
@@ -1,30 +0,0 @@
-let rec f = (x, y) => f(y, x)
-
-let rec f1 = (x, y, z) => {
-  print_endline(z)
-  f1(y, z, x)
-}
-
-let rec f2 = (x, y) => f2(x, y + 10)
-
-let rec f3 = (x, y) => f3(y, x + 10)
-
-let rec f4 = (x, y) => f4(x + 10, y + x)
-
-let rec f5 = (x, y, z) => f5(y + 10, z + 20, z)
-
-/** tail call as well */
-let rec f6 = b => b && f6(b)
-
-let rec f7 = b => b || f7(b)
-
-let rec f8 = (x, y) =>
-  if x > 10 {
-    f8(x, y + 1)
-  } else if x < 5 {
-    f8(x - 1, y)
-  } else if x > 6 {
-    f8(x - 2, y)
-  } else {
-    f8(x, y + 1) + f8(x - 1, y)
-  }
diff --git a/jscomp/test/test_other_exn.js b/jscomp/test/test_other_exn.js
deleted file mode 100644
index 3fce1d9..0000000
--- a/jscomp/test/test_other_exn.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function Make($star) {
-  return {};
-}
-
-var U = {};
-
-var V = {};
-
-exports.Make = Make;
-exports.U = U;
-exports.V = V;
-/* No side effect */
diff --git a/jscomp/test/test_other_exn.res b/jscomp/test/test_other_exn.res
deleted file mode 100644
index db9deba..0000000
--- a/jscomp/test/test_other_exn.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module Make = () => {
-  type t = ..
-}
-
-module U = {
-  type t = ..
-}
-
-module V = {
-  type t = ..
-}
diff --git a/jscomp/test/test_pack.js b/jscomp/test/test_pack.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/test_pack.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/test_pack.res b/jscomp/test/test_pack.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/test_pack.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/test_per.js b/jscomp/test/test_per.js
deleted file mode 100644
index 27edfb8..0000000
--- a/jscomp/test/test_per.js
+++ /dev/null
@@ -1,502 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_sys = require("../../lib/js/caml_sys.js");
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-var Caml_int64 = require("../../lib/js/caml_int64.js");
-var Caml_format = require("../../lib/js/caml_format.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js");
-
-Caml_external_polyfill.resolve("register_named_value")("Pervasives.array_bound_error", {
-      RE_EXN_ID: "Invalid_argument",
-      _1: "index out of bounds"
-    });
-
-function failwith(s) {
-  throw {
-        RE_EXN_ID: "Failure",
-        _1: s,
-        Error: new Error()
-      };
-}
-
-function invalid_arg(s) {
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: s,
-        Error: new Error()
-      };
-}
-
-var Exit = /* @__PURE__ */Caml_exceptions.create("Test_per.Exit");
-
-function min(x, y) {
-  if (Caml_obj.lessequal(x, y)) {
-    return x;
-  } else {
-    return y;
-  }
-}
-
-function max(x, y) {
-  if (Caml_obj.greaterequal(x, y)) {
-    return x;
-  } else {
-    return y;
-  }
-}
-
-function abs(x) {
-  if (x >= 0) {
-    return x;
-  } else {
-    return -x | 0;
-  }
-}
-
-function lnot(x) {
-  return x ^ -1;
-}
-
-var min_int = -2147483648;
-
-var infinity = Caml_int64.float_of_bits([
-      2146435072,
-      0
-    ]);
-
-var neg_infinity = Caml_int64.float_of_bits([
-      -1048576,
-      0
-    ]);
-
-var nan = Caml_int64.float_of_bits([
-      2146435072,
-      1
-    ]);
-
-var max_float = Caml_int64.float_of_bits([
-      2146435071,
-      4294967295
-    ]);
-
-var min_float = Caml_int64.float_of_bits([
-      1048576,
-      0
-    ]);
-
-var epsilon_float = Caml_int64.float_of_bits([
-      1018167296,
-      0
-    ]);
-
-function $caret(s1, s2) {
-  var l1 = s1.length;
-  var l2 = s2.length;
-  var s = Caml_bytes.create(l1 + l2 | 0);
-  Caml_external_polyfill.resolve("blit_string")(s1, 0, s, 0, l1);
-  Caml_external_polyfill.resolve("blit_string")(s2, 0, s, l1, l2);
-  return s;
-}
-
-function char_of_int(n) {
-  if (n < 0 || n > 255) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "char_of_int",
-          Error: new Error()
-        };
-  }
-  return n;
-}
-
-function string_of_bool(b) {
-  if (b) {
-    return "true";
-  } else {
-    return "false";
-  }
-}
-
-function bool_of_string(x) {
-  switch (x) {
-    case "false" :
-        return false;
-    case "true" :
-        return true;
-    default:
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "bool_of_string",
-            Error: new Error()
-          };
-  }
-}
-
-function string_of_int(n) {
-  return Caml_format.format_int("%d", n);
-}
-
-function valid_float_lexem(s) {
-  var l = s.length;
-  var _i = 0;
-  while(true) {
-    var i = _i;
-    if (i >= l) {
-      return $caret(s, ".");
-    }
-    var match = Caml_string.get(s, i);
-    if (match >= 48) {
-      if (match >= 58) {
-        return s;
-      }
-      _i = i + 1 | 0;
-      continue ;
-    }
-    if (match !== 45) {
-      return s;
-    }
-    _i = i + 1 | 0;
-    continue ;
-  };
-}
-
-function string_of_float(f) {
-  return valid_float_lexem(Caml_format.format_float("%.12g", f));
-}
-
-function $at(l1, l2) {
-  if (l1) {
-    return {
-            hd: l1.hd,
-            tl: $at(l1.tl, l2)
-          };
-  } else {
-    return l2;
-  }
-}
-
-function open_out_gen(mode, perm, name) {
-  return Caml_external_polyfill.resolve("ml_open_descriptor_out")(Caml_external_polyfill.resolve("sys_open")(name, mode, perm));
-}
-
-function open_out(name) {
-  return open_out_gen({
-              hd: "Open_wronly",
-              tl: {
-                hd: "Open_creat",
-                tl: {
-                  hd: "Open_trunc",
-                  tl: {
-                    hd: "Open_text",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }, 438, name);
-}
-
-function open_out_bin(name) {
-  return open_out_gen({
-              hd: "Open_wronly",
-              tl: {
-                hd: "Open_creat",
-                tl: {
-                  hd: "Open_trunc",
-                  tl: {
-                    hd: "Open_binary",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }, 438, name);
-}
-
-function flush_all(param) {
-  var _x = Caml_external_polyfill.resolve("ml_out_channels_list")();
-  while(true) {
-    var x = _x;
-    if (!x) {
-      return ;
-    }
-    try {
-      Caml_external_polyfill.resolve("ml_flush")(x.hd);
-    }
-    catch (exn){
-      
-    }
-    _x = x.tl;
-    continue ;
-  };
-}
-
-function output_bytes(oc, s) {
-  Caml_external_polyfill.resolve("ml_output")(oc, s, 0, s.length);
-}
-
-function output_string(oc, s) {
-  Caml_external_polyfill.resolve("ml_output")(oc, s, 0, s.length);
-}
-
-function output(oc, s, ofs, len) {
-  if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "output",
-          Error: new Error()
-        };
-  }
-  Caml_external_polyfill.resolve("ml_output")(oc, s, ofs, len);
-}
-
-function output_substring(oc, s, ofs, len) {
-  if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "output_substring",
-          Error: new Error()
-        };
-  }
-  Caml_external_polyfill.resolve("ml_output")(oc, s, ofs, len);
-}
-
-function output_value(chan, v) {
-  Caml_external_polyfill.resolve("output_value")(chan, v, /* [] */0);
-}
-
-function close_out(oc) {
-  Caml_external_polyfill.resolve("ml_flush")(oc);
-  Caml_external_polyfill.resolve("ml_close_channel")(oc);
-}
-
-function close_out_noerr(oc) {
-  try {
-    Caml_external_polyfill.resolve("ml_flush")(oc);
-  }
-  catch (exn){
-    
-  }
-  try {
-    return Caml_external_polyfill.resolve("ml_close_channel")(oc);
-  }
-  catch (exn$1){
-    return ;
-  }
-}
-
-function open_in_gen(mode, perm, name) {
-  return Caml_external_polyfill.resolve("ml_open_descriptor_in")(Caml_external_polyfill.resolve("sys_open")(name, mode, perm));
-}
-
-function open_in(name) {
-  return open_in_gen({
-              hd: "Open_rdonly",
-              tl: {
-                hd: "Open_text",
-                tl: /* [] */0
-              }
-            }, 0, name);
-}
-
-function open_in_bin(name) {
-  return open_in_gen({
-              hd: "Open_rdonly",
-              tl: {
-                hd: "Open_binary",
-                tl: /* [] */0
-              }
-            }, 0, name);
-}
-
-function input(ic, s, ofs, len) {
-  if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "input",
-          Error: new Error()
-        };
-  }
-  return Caml_external_polyfill.resolve("ml_input")(ic, s, ofs, len);
-}
-
-function unsafe_really_input(ic, s, _ofs, _len) {
-  while(true) {
-    var len = _len;
-    var ofs = _ofs;
-    if (len <= 0) {
-      return ;
-    }
-    var r = Caml_external_polyfill.resolve("ml_input")(ic, s, ofs, len);
-    if (r === 0) {
-      throw {
-            RE_EXN_ID: "End_of_file",
-            Error: new Error()
-          };
-    }
-    _len = len - r | 0;
-    _ofs = ofs + r | 0;
-    continue ;
-  };
-}
-
-function really_input(ic, s, ofs, len) {
-  if (ofs < 0 || len < 0 || ofs > (s.length - len | 0)) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "really_input",
-          Error: new Error()
-        };
-  }
-  unsafe_really_input(ic, s, ofs, len);
-}
-
-function really_input_string(ic, len) {
-  var s = Caml_bytes.create(len);
-  really_input(ic, s, 0, len);
-  return s;
-}
-
-function input_line(chan) {
-  var build_result = function (buf, _pos, _x) {
-    while(true) {
-      var x = _x;
-      var pos = _pos;
-      if (!x) {
-        return buf;
-      }
-      var hd = x.hd;
-      var len = hd.length;
-      Caml_external_polyfill.resolve("blit_string")(hd, 0, buf, pos - len | 0, len);
-      _x = x.tl;
-      _pos = pos - len | 0;
-      continue ;
-    };
-  };
-  var _accu = /* [] */0;
-  var _len = 0;
-  while(true) {
-    var len = _len;
-    var accu = _accu;
-    var n = Caml_external_polyfill.resolve("ml_input_scan_line")(chan);
-    if (n === 0) {
-      if (accu) {
-        return build_result(Caml_bytes.create(len), len, accu);
-      }
-      throw {
-            RE_EXN_ID: "End_of_file",
-            Error: new Error()
-          };
-    }
-    if (n > 0) {
-      var res = Caml_bytes.create(n - 1 | 0);
-      Caml_external_polyfill.resolve("ml_input")(chan, res, 0, n - 1 | 0);
-      Caml_external_polyfill.resolve("ml_input_char")(chan);
-      if (!accu) {
-        return res;
-      }
-      var len$1 = (len + n | 0) - 1 | 0;
-      return build_result(Caml_bytes.create(len$1), len$1, {
-                  hd: res,
-                  tl: accu
-                });
-    }
-    var beg = Caml_bytes.create(-n | 0);
-    Caml_external_polyfill.resolve("ml_input")(chan, beg, 0, -n | 0);
-    _len = len - n | 0;
-    _accu = {
-      hd: beg,
-      tl: accu
-    };
-    continue ;
-  };
-}
-
-function close_in_noerr(ic) {
-  try {
-    return Caml_external_polyfill.resolve("ml_close_channel")(ic);
-  }
-  catch (exn){
-    return ;
-  }
-}
-
-var LargeFile = {};
-
-var exit_function = {
-  contents: flush_all
-};
-
-function at_exit(f) {
-  var g = exit_function.contents;
-  exit_function.contents = (function (param) {
-      Curry._1(f, undefined);
-      Curry._1(g, undefined);
-    });
-}
-
-function do_at_exit(param) {
-  Curry._1(exit_function.contents, undefined);
-}
-
-function exit(retcode) {
-  Curry._1(exit_function.contents, undefined);
-  return Caml_sys.sys_exit(retcode);
-}
-
-Caml_external_polyfill.resolve("register_named_value")("Pervasives.do_at_exit", do_at_exit);
-
-var max_int = 2147483647;
-
-exports.failwith = failwith;
-exports.invalid_arg = invalid_arg;
-exports.Exit = Exit;
-exports.min = min;
-exports.max = max;
-exports.abs = abs;
-exports.lnot = lnot;
-exports.max_int = max_int;
-exports.min_int = min_int;
-exports.infinity = infinity;
-exports.neg_infinity = neg_infinity;
-exports.nan = nan;
-exports.max_float = max_float;
-exports.min_float = min_float;
-exports.epsilon_float = epsilon_float;
-exports.$caret = $caret;
-exports.char_of_int = char_of_int;
-exports.string_of_bool = string_of_bool;
-exports.bool_of_string = bool_of_string;
-exports.string_of_int = string_of_int;
-exports.valid_float_lexem = valid_float_lexem;
-exports.string_of_float = string_of_float;
-exports.$at = $at;
-exports.open_out_gen = open_out_gen;
-exports.open_out = open_out;
-exports.open_out_bin = open_out_bin;
-exports.flush_all = flush_all;
-exports.output_bytes = output_bytes;
-exports.output_string = output_string;
-exports.output = output;
-exports.output_substring = output_substring;
-exports.output_value = output_value;
-exports.close_out = close_out;
-exports.close_out_noerr = close_out_noerr;
-exports.open_in_gen = open_in_gen;
-exports.open_in = open_in;
-exports.open_in_bin = open_in_bin;
-exports.input = input;
-exports.unsafe_really_input = unsafe_really_input;
-exports.really_input = really_input;
-exports.really_input_string = really_input_string;
-exports.input_line = input_line;
-exports.close_in_noerr = close_in_noerr;
-exports.LargeFile = LargeFile;
-exports.exit_function = exit_function;
-exports.at_exit = at_exit;
-exports.do_at_exit = do_at_exit;
-exports.exit = exit;
-/*  Not a pure module */
diff --git a/jscomp/test/test_per.res b/jscomp/test/test_per.res
deleted file mode 100644
index d27a252..0000000
--- a/jscomp/test/test_per.res
+++ /dev/null
@@ -1,498 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-@@warning("a")
-/* type 'a option = None | Some of 'a */
-
-/* Exceptions */
-
-external register_named_value: (string, 'a) => unit = "?register_named_value"
-
-let () = /* for asmrun/fail.c */
-register_named_value("Pervasives.array_bound_error", Invalid_argument("index out of bounds"))
-
-external raise: exn => 'a = "%raise"
-external raise_notrace: exn => 'a = "%raise_notrace"
-
-let failwith = s => raise(Failure(s))
-let invalid_arg = s => raise(Invalid_argument(s))
-
-exception Exit
-
-/* Composition operators */
-
-external \"|>": ('a, 'a => 'b) => 'b = "%revapply"
-external \"@@": ('a => 'b, 'a) => 'b = "%apply"
-
-/* Debugging */
-
-external __LOC__: string = "%loc_LOC"
-external __MODULE__: string = "%loc_FILE"
-external __LINE__: int = "%loc_LINE"
-external __MODULE__: string = "%loc_MODULE"
-external __POS__: (string, int, int, int) = "%loc_POS"
-
-external __LOC_OF__: 'a => (string, 'a) = "%loc_LOC"
-external __LINE_OF__: 'a => (int, 'a) = "%loc_LINE"
-external __POS_OF__: 'a => ((string, int, int, int), 'a) = "%loc_POS"
-
-/* Comparisons */
-
-external \"=": ('a, 'a) => bool = "%equal"
-external \"<>": ('a, 'a) => bool = "%notequal"
-external \"<": ('a, 'a) => bool = "%lessthan"
-external \">": ('a, 'a) => bool = "%greaterthan"
-external \"<=": ('a, 'a) => bool = "%lessequal"
-external \">=": ('a, 'a) => bool = "%greaterequal"
-external compare: ('a, 'a) => int = "%compare"
-
-let min = (x, y) =>
-  if x <= y {
-    x
-  } else {
-    y
-  }
-let max = (x, y) =>
-  if x >= y {
-    x
-  } else {
-    y
-  }
-
-external \"==": ('a, 'a) => bool = "%eq"
-external \"!=": ('a, 'a) => bool = "%noteq"
-
-/* Boolean operations */
-
-external not: bool => bool = "%boolnot"
-external \"&": (bool, bool) => bool = "%sequand"
-external \"&&": (bool, bool) => bool = "%sequand"
-external or: (bool, bool) => bool = "%sequor"
-external \"||": (bool, bool) => bool = "%sequor"
-
-/* Integer operations */
-
-external \"~-": int => int = "%negint"
-external \"~+": int => int = "%identity"
-external succ: int => int = "%succint"
-external pred: int => int = "%predint"
-external \"+": (int, int) => int = "%addint"
-external \"-": (int, int) => int = "%subint"
-external \"*": (int, int) => int = "%mulint"
-external \"/": (int, int) => int = "%divint"
-external mod: (int, int) => int = "%modint"
-
-let abs = x =>
-  if x >= 0 {
-    x
-  } else {
-    -x
-  }
-
-external land: (int, int) => int = "%andint"
-external lor: (int, int) => int = "%orint"
-external lxor: (int, int) => int = "%xorint"
-
-let lnot = x => lxor(x, -1)
-
-external lsl: (int, int) => int = "%lslint"
-external lsr: (int, int) => int = "%lsrint"
-external asr: (int, int) => int = "%asrint"
-
-let max_int = lsr(-1, 1)
-let min_int = max_int + 1
-
-/* Floating-point operations */
-
-external \"~-.": float => float = "%negfloat"
-external \"~+.": float => float = "%identity"
-external \"+.": (float, float) => float = "%addfloat"
-external \"-.": (float, float) => float = "%subfloat"
-external \"*.": (float, float) => float = "%mulfloat"
-external \"/.": (float, float) => float = "%divfloat"
-external \"**": (float, float) => float = "?power_float"
-external exp: float => float = "?exp_float"
-external expm1: float => float = "?expm1_float"
-external acos: float => float = "?acos_float"
-external asin: float => float = "?asin_float"
-external atan: float => float = "?atan_float"
-external atan2: (float, float) => float = "?atan2_float"
-external hypot: (float, float) => float = "?hypot_float"
-external cos: float => float = "?cos_float"
-external cosh: float => float = "?cosh_float"
-external log: float => float = "?log_float"
-external log10: float => float = "?log10_float"
-external log1p: float => float = "?log1p_float"
-external sin: float => float = "?sin_float"
-external sinh: float => float = "?sinh_float"
-external sqrt: float => float = "?sqrt_float"
-external tan: float => float = "?tan_float"
-external tanh: float => float = "?tanh_float"
-external ceil: float => float = "?ceil_float"
-external floor: float => float = "?floor_float"
-external abs_float: float => float = "%absfloat"
-external copysign: (float, float) => float = "?copysign_float"
-external mod_float: (float, float) => float = "?fmod_float"
-external frexp: float => (float, int) = "?frexp_float"
-external ldexp: (float, int) => float = "?ldexp_float"
-external modf: float => (float, float) = "?modf_float"
-external float: int => float = "%floatofint"
-external float_of_int: int => float = "%floatofint"
-external truncate: float => int = "%intoffloat"
-external int_of_float: float => int = "%intoffloat"
-external float_of_bits: int64 => float = "?int64_float_of_bits"
-let infinity = float_of_bits(0x7F_F0_00_00_00_00_00_00L)
-let neg_infinity = float_of_bits(0xFF_F0_00_00_00_00_00_00L)
-let nan = float_of_bits(0x7F_F0_00_00_00_00_00_01L)
-let max_float = float_of_bits(0x7F_EF_FF_FF_FF_FF_FF_FFL)
-let min_float = float_of_bits(0x00_10_00_00_00_00_00_00L)
-let epsilon_float = float_of_bits(0x3C_B0_00_00_00_00_00_00L)
-
-type fpclass =
-  | FP_normal
-  | FP_subnormal
-  | FP_zero
-  | FP_infinite
-  | FP_nan
-external classify_float: float => fpclass = "?classify_float"
-
-/* String and byte sequence operations -- more in modules String and Bytes */
-
-external string_length: string => int = "%string_length"
-external bytes_length: bytes => int = "%string_length"
-external bytes_create: int => bytes = "?create_bytes"
-external string_blit: (string, int, bytes, int, int) => unit = "?blit_string"
-external bytes_blit: (bytes, int, bytes, int, int) => unit = "?blit_string"
-external bytes_unsafe_to_string: bytes => string = "%identity"
-external bytes_unsafe_of_string: string => bytes = "%identity"
-
-let \"^" = (s1, s2) => {
-  let l1 = string_length(s1) and l2 = string_length(s2)
-  let s = bytes_create(l1 + l2)
-  string_blit(s1, 0, s, 0, l1)
-  string_blit(s2, 0, s, l1, l2)
-  bytes_unsafe_to_string(s)
-}
-
-/* Character operations -- more in module Char */
-
-external int_of_char: char => int = "%identity"
-external unsafe_char_of_int: int => char = "%identity"
-let char_of_int = n =>
-  if n < 0 || n > 255 {
-    invalid_arg("char_of_int")
-  } else {
-    unsafe_char_of_int(n)
-  }
-
-/* Unit operations */
-
-external ignore: 'a => unit = "%ignore"
-
-/* Pair operations */
-
-external fst: (('a, 'b)) => 'a = "%field0"
-external snd: (('a, 'b)) => 'b = "%field1"
-
-/* References */
-
-type ref<'a> = {mutable contents: 'a}
-external ref: 'a => ref<'a> = "%makemutable"
-external \"!": ref<'a> => 'a = "%bs_ref_field0"
-external \":=": (ref<'a>, 'a) => unit = "%bs_ref_setfield0"
-external incr: ref<int> => unit = "%incr"
-external decr: ref<int> => unit = "%decr"
-
-/* String conversion functions */
-
-external format_int: (string, int) => string = "?format_int"
-external format_float: (string, float) => string = "?format_float"
-
-let string_of_bool = b =>
-  if b {
-    "true"
-  } else {
-    "false"
-  }
-let bool_of_string = x =>
-  switch x {
-  | "true" => true
-  | "false" => false
-  | _ => invalid_arg("bool_of_string")
-  }
-
-let string_of_int = n => format_int("%d", n)
-
-external int_of_string: string => int = "?int_of_string"
-external string_get: (string, int) => char = "%string_safe_get"
-
-let valid_float_lexem = s => {
-  let l = string_length(s)
-  let rec loop = i =>
-    if i >= l {
-      s ++ "."
-    } else {
-      switch string_get(s, i) {
-      | '0' .. '9' | '-' => loop(i + 1)
-      | _ => s
-      }
-    }
-
-  loop(0)
-}
-
-let string_of_float = f => valid_float_lexem(format_float("%.12g", f))
-
-external float_of_string: string => float = "?float_of_string"
-
-/* List operations -- more in module List */
-
-let rec \"@" = (l1, l2) =>
-  switch l1 {
-  | list{} => l2
-  | list{hd, ...tl} => list{hd, ...\"@"(tl, l2)}
-  }
-
-/* I/O operations */
-
-type in_channel
-type out_channel
-
-external open_descriptor_out: int => out_channel = "?ml_open_descriptor_out"
-external open_descriptor_in: int => in_channel = "?ml_open_descriptor_in"
-
-/* General output functions */
-
-type open_flag =
-  | Open_rdonly
-  | Open_wronly
-  | Open_append
-  | Open_creat
-  | Open_trunc
-  | Open_excl
-  | Open_binary
-  | Open_text
-  | Open_nonblock
-
-external open_desc: (string, list<open_flag>, int) => int = "?sys_open"
-
-let open_out_gen = (mode, perm, name) => open_descriptor_out(open_desc(name, mode, perm))
-
-let open_out = name =>
-  open_out_gen(list{Open_wronly, Open_creat, Open_trunc, Open_text}, 0o666, name)
-
-let open_out_bin = name =>
-  open_out_gen(list{Open_wronly, Open_creat, Open_trunc, Open_binary}, 0o666, name)
-
-external flush: out_channel => unit = "?ml_flush"
-
-external out_channels_list: unit => list<out_channel> = "?ml_out_channels_list"
-
-let flush_all = () => {
-  let rec iter = x =>
-    switch x {
-    | list{} => ()
-    | list{a, ...l} =>
-      try flush(a) catch {
-      | _ => ()
-      }
-      iter(l)
-    }
-  iter(out_channels_list())
-}
-
-external unsafe_output: (out_channel, bytes, int, int) => unit = "?ml_output"
-external unsafe_output_string: (out_channel, string, int, int) => unit = "?ml_output"
-
-external output_char: (out_channel, char) => unit = "?ml_output_char"
-
-let output_bytes = (oc, s) => unsafe_output(oc, s, 0, bytes_length(s))
-
-let output_string = (oc, s) => unsafe_output_string(oc, s, 0, string_length(s))
-
-let output = (oc, s, ofs, len) =>
-  if ofs < 0 || (len < 0 || ofs > bytes_length(s) - len) {
-    invalid_arg("output")
-  } else {
-    unsafe_output(oc, s, ofs, len)
-  }
-
-let output_substring = (oc, s, ofs, len) =>
-  if ofs < 0 || (len < 0 || ofs > string_length(s) - len) {
-    invalid_arg("output_substring")
-  } else {
-    unsafe_output_string(oc, s, ofs, len)
-  }
-
-external output_byte: (out_channel, int) => unit = "?ml_output_char"
-external output_binary_int: (out_channel, int) => unit = "?ml_output_int"
-
-external marshal_to_channel: (out_channel, 'a, list<unit>) => unit = "?output_value"
-let output_value = (chan, v) => marshal_to_channel(chan, v, list{})
-
-external seek_out: (out_channel, int) => unit = "?ml_seek_out"
-external pos_out: out_channel => int = "?ml_pos_out"
-external out_channel_length: out_channel => int = "?ml_channel_size"
-external close_out_channel: out_channel => unit = "?ml_close_channel"
-let close_out = oc => {
-  flush(oc)
-  close_out_channel(oc)
-}
-let close_out_noerr = oc => {
-  try flush(oc) catch {
-  | _ => ()
-  }
-  try close_out_channel(oc) catch {
-  | _ => ()
-  }
-}
-external set_binary_mode_out: (out_channel, bool) => unit = "?ml_set_binary_mode"
-
-/* General input functions */
-
-let open_in_gen = (mode, perm, name) => open_descriptor_in(open_desc(name, mode, perm))
-
-let open_in = name => open_in_gen(list{Open_rdonly, Open_text}, 0, name)
-
-let open_in_bin = name => open_in_gen(list{Open_rdonly, Open_binary}, 0, name)
-
-external input_char: in_channel => char = "?ml_input_char"
-
-external unsafe_input: (in_channel, bytes, int, int) => int = "?ml_input"
-
-let input = (ic, s, ofs, len) =>
-  if ofs < 0 || (len < 0 || ofs > bytes_length(s) - len) {
-    invalid_arg("input")
-  } else {
-    unsafe_input(ic, s, ofs, len)
-  }
-
-let rec unsafe_really_input = (ic, s, ofs, len) =>
-  if len <= 0 {
-    ()
-  } else {
-    let r = unsafe_input(ic, s, ofs, len)
-    if r == 0 {
-      raise(End_of_file)
-    } else {
-      unsafe_really_input(ic, s, ofs + r, len - r)
-    }
-  }
-
-let really_input = (ic, s, ofs, len) =>
-  if ofs < 0 || (len < 0 || ofs > bytes_length(s) - len) {
-    invalid_arg("really_input")
-  } else {
-    unsafe_really_input(ic, s, ofs, len)
-  }
-
-let really_input_string = (ic, len) => {
-  let s = bytes_create(len)
-  really_input(ic, s, 0, len)
-  bytes_unsafe_to_string(s)
-}
-
-external input_scan_line: in_channel => int = "?ml_input_scan_line"
-
-let input_line = chan => {
-  let rec build_result = (buf, pos, x) =>
-    switch x {
-    | list{} => buf
-    | list{hd, ...tl} =>
-      let len = bytes_length(hd)
-      bytes_blit(hd, 0, buf, pos - len, len)
-      build_result(buf, pos - len, tl)
-    }
-  let rec scan = (accu, len) => {
-    let n = input_scan_line(chan)
-    if n == 0 {
-      switch /* n = 0: we are at EOF */
-      accu {
-      | list{} => raise(End_of_file)
-      | _ => build_result(bytes_create(len), len, accu)
-      }
-    } else if n > 0 {
-      /* n > 0: newline found in buffer */
-      let res = bytes_create(n - 1)
-      ignore(unsafe_input(chan, res, 0, n - 1))
-      ignore(input_char(chan)) /* skip the newline */
-      switch accu {
-      | list{} => res
-      | _ =>
-        let len = len + n - 1
-        build_result(bytes_create(len), len, list{res, ...accu})
-      }
-    } else {
-      /* n < 0: newline not found */
-      let beg = bytes_create(-n)
-      ignore(unsafe_input(chan, beg, 0, -n))
-      scan(list{beg, ...accu}, len - n)
-    }
-  }
-  bytes_unsafe_to_string(scan(list{}, 0))
-}
-
-external input_byte: in_channel => int = "?ml_input_char"
-external input_binary_int: in_channel => int = "?ml_input_int"
-external input_value: in_channel => 'a = "?input_value"
-external seek_in: (in_channel, int) => unit = "?ml_seek_in"
-external pos_in: in_channel => int = "?ml_pos_in"
-external in_channel_length: in_channel => int = "?ml_channel_size"
-external close_in: in_channel => unit = "?ml_close_channel"
-let close_in_noerr = ic =>
-  try close_in(ic) catch {
-  | _ => ()
-  }
-external set_binary_mode_in: (in_channel, bool) => unit = "?ml_set_binary_mode"
-
-/* Output functions on standard output */
-
-/* Output functions on standard error */
-
-/* Input functions on standard input */
-
-/* Operations on large files */
-
-module LargeFile = {
-  external seek_out: (out_channel, int64) => unit = "?ml_seek_out_64"
-  external pos_out: out_channel => int64 = "?ml_pos_out_64"
-  external out_channel_length: out_channel => int64 = "?ml_channel_size_64"
-  external seek_in: (in_channel, int64) => unit = "?ml_seek_in_64"
-  external pos_in: in_channel => int64 = "?ml_pos_in_64"
-  external in_channel_length: in_channel => int64 = "?ml_channel_size_64"
-}
-
-/* Formats */
-
-external sys_exit: int => 'a = "?sys_exit"
-
-let exit_function = ref(flush_all)
-
-let at_exit = f => {
-  let g = exit_function.contents
-  exit_function :=
-    (
-      () => {
-        f()
-        g()
-      }
-    )
-}
-
-let do_at_exit = () => exit_function.contents()
-
-let exit = retcode => {
-  do_at_exit()
-  sys_exit(retcode)
-}
-
-let _ = register_named_value("Pervasives.do_at_exit", do_at_exit)
diff --git a/jscomp/test/test_pervasive.js b/jscomp/test/test_pervasive.js
deleted file mode 100644
index 128440f..0000000
--- a/jscomp/test/test_pervasive.js
+++ /dev/null
@@ -1,195 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-var Pervasives$1 = {
-  length: List.length,
-  compare_lengths: List.compare_lengths,
-  compare_length_with: List.compare_length_with,
-  cons: List.cons,
-  hd: List.hd,
-  tl: List.tl,
-  nth: List.nth,
-  nth_opt: List.nth_opt,
-  rev: List.rev,
-  init: List.init,
-  append: List.append,
-  rev_append: List.rev_append,
-  concat: List.concat,
-  flatten: List.flatten,
-  iter: List.iter,
-  iteri: List.iteri,
-  map: List.map,
-  mapi: List.mapi,
-  rev_map: List.rev_map,
-  fold_left: List.fold_left,
-  fold_right: List.fold_right,
-  iter2: List.iter2,
-  map2: List.map2,
-  rev_map2: List.rev_map2,
-  fold_left2: List.fold_left2,
-  fold_right2: List.fold_right2,
-  for_all: List.for_all,
-  exists: List.exists,
-  for_all2: List.for_all2,
-  exists2: List.exists2,
-  mem: List.mem,
-  memq: List.memq,
-  find: List.find,
-  find_opt: List.find_opt,
-  filter: List.filter,
-  find_all: List.find_all,
-  partition: List.partition,
-  assoc: List.assoc,
-  assoc_opt: List.assoc_opt,
-  assq: List.assq,
-  assq_opt: List.assq_opt,
-  mem_assoc: List.mem_assoc,
-  mem_assq: List.mem_assq,
-  remove_assoc: List.remove_assoc,
-  remove_assq: List.remove_assq,
-  split: List.split,
-  combine: List.combine,
-  sort: List.sort,
-  stable_sort: List.stable_sort,
-  fast_sort: List.fast_sort,
-  sort_uniq: List.sort_uniq,
-  merge: List.merge,
-  Jsx: Pervasives.Jsx,
-  JsxEvent: Pervasives.JsxEvent,
-  JsxDOM: Pervasives.JsxDOM,
-  JsxPPXReactSupport: Pervasives.JsxPPXReactSupport,
-  JsxModules: Pervasives.JsxModules,
-  invalid_arg: Pervasives.invalid_arg,
-  failwith: Pervasives.failwith,
-  Exit: Pervasives.Exit,
-  abs: Pervasives.abs,
-  max_int: Pervasives.max_int,
-  min_int: Pervasives.min_int,
-  lnot: Pervasives.lnot,
-  infinity: Pervasives.infinity,
-  neg_infinity: Pervasives.neg_infinity,
-  max_float: Pervasives.max_float,
-  min_float: Pervasives.min_float,
-  epsilon_float: Pervasives.epsilon_float,
-  classify_float: Pervasives.classify_float,
-  char_of_int: Pervasives.char_of_int,
-  string_of_bool: Pervasives.string_of_bool,
-  bool_of_string: Pervasives.bool_of_string,
-  bool_of_string_opt: Pervasives.bool_of_string_opt,
-  int_of_string_opt: Pervasives.int_of_string_opt,
-  string_of_float: Pervasives.string_of_float,
-  float_of_string_opt: Pervasives.float_of_string_opt,
-  $at: Pervasives.$at,
-  print_string: Pervasives.print_string,
-  print_int: Pervasives.print_int,
-  print_float: Pervasives.print_float,
-  print_newline: Pervasives.print_newline,
-  prerr_newline: Pervasives.prerr_newline,
-  exit: Pervasives.exit,
-  at_exit: Pervasives.at_exit,
-  valid_float_lexem: Pervasives.valid_float_lexem
-};
-
-function a0(prim) {
-  return Math.abs(prim);
-}
-
-function a1(prim) {
-  return Math.acos(prim);
-}
-
-function a2(prim) {
-  return Math.tan(prim);
-}
-
-function a3(prim) {
-  return Math.tanh(prim);
-}
-
-function a4(prim) {
-  return Math.asin(prim);
-}
-
-function a5(prim0, prim1) {
-  return Math.atan2(prim0, prim1);
-}
-
-function a6(prim) {
-  return Math.atan(prim);
-}
-
-function a7(prim) {
-  return Math.ceil(prim);
-}
-
-function a8(prim) {
-  return Math.cos(prim);
-}
-
-function a9(prim) {
-  return Math.cosh(prim);
-}
-
-function a10(prim) {
-  return Math.exp(prim);
-}
-
-function a11(prim) {
-  return Math.sin(prim);
-}
-
-function a12(prim) {
-  return Math.sinh(prim);
-}
-
-function a13(prim) {
-  return Math.sqrt(prim);
-}
-
-function a14(prim) {
-  return Math.floor(prim);
-}
-
-function a15(prim) {
-  return Math.log(prim);
-}
-
-function a16(prim) {
-  return Math.log10(prim);
-}
-
-function a17(prim) {
-  return Math.log1p(prim);
-}
-
-function a18(prim0, prim1) {
-  return Math.pow(prim0, prim1);
-}
-
-var f = Pervasives.$at;
-
-exports.Pervasives = Pervasives$1;
-exports.f = f;
-exports.a0 = a0;
-exports.a1 = a1;
-exports.a2 = a2;
-exports.a3 = a3;
-exports.a4 = a4;
-exports.a5 = a5;
-exports.a6 = a6;
-exports.a7 = a7;
-exports.a8 = a8;
-exports.a9 = a9;
-exports.a10 = a10;
-exports.a11 = a11;
-exports.a12 = a12;
-exports.a13 = a13;
-exports.a14 = a14;
-exports.a15 = a15;
-exports.a16 = a16;
-exports.a17 = a17;
-exports.a18 = a18;
-/* No side effect */
diff --git a/jscomp/test/test_pervasive.res b/jscomp/test/test_pervasive.res
deleted file mode 100644
index 7463c6d..0000000
--- a/jscomp/test/test_pervasive.res
+++ /dev/null
@@ -1,29 +0,0 @@
-module Pervasives = {
-  include List
-  include Pervasives
-}
-
-let f = Pervasives.\"@"
-
-let a0 = abs_float
-let a1 = acos
-let a2 = tan
-let a3 = tanh
-let a4 = asin
-let a5 = atan2
-let a6 = atan
-let a7 = ceil
-let a8 = cos
-let a9 = cosh
-let a10 = exp
-let a11 = sin
-let a12 = sinh
-let a13 = sqrt
-let a14 = floor
-let a15 = log
-let a16 = log10
-let a17 = log1p
-let a18 = \"**"
-/* local variables: */
-/* compile-command: "ocamlc -dlambda -c test_pervasive.ml" */
-/* end: */
diff --git a/jscomp/test/test_pervasives2.js b/jscomp/test/test_pervasives2.js
deleted file mode 100644
index f12c45a..0000000
--- a/jscomp/test/test_pervasives2.js
+++ /dev/null
@@ -1,156 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Stack = require("../../lib/js/stack.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-var List$1 = {
-  length: List.length,
-  compare_lengths: List.compare_lengths,
-  compare_length_with: List.compare_length_with,
-  cons: List.cons,
-  hd: List.hd,
-  tl: List.tl,
-  nth: List.nth,
-  nth_opt: List.nth_opt,
-  rev: List.rev,
-  init: List.init,
-  append: List.append,
-  rev_append: List.rev_append,
-  concat: List.concat,
-  flatten: List.flatten,
-  iter: List.iter,
-  iteri: List.iteri,
-  map: List.map,
-  mapi: List.mapi,
-  rev_map: List.rev_map,
-  fold_left: List.fold_left,
-  fold_right: List.fold_right,
-  iter2: List.iter2,
-  map2: List.map2,
-  rev_map2: List.rev_map2,
-  fold_left2: List.fold_left2,
-  fold_right2: List.fold_right2,
-  for_all: List.for_all,
-  exists: List.exists,
-  for_all2: List.for_all2,
-  exists2: List.exists2,
-  mem: List.mem,
-  memq: List.memq,
-  find: List.find,
-  find_opt: List.find_opt,
-  filter: List.filter,
-  find_all: List.find_all,
-  partition: List.partition,
-  assoc: List.assoc,
-  assoc_opt: List.assoc_opt,
-  assq: List.assq,
-  assq_opt: List.assq_opt,
-  mem_assoc: List.mem_assoc,
-  mem_assq: List.mem_assq,
-  remove_assoc: List.remove_assoc,
-  remove_assq: List.remove_assq,
-  split: List.split,
-  combine: List.combine,
-  sort: List.sort,
-  stable_sort: List.stable_sort,
-  fast_sort: List.fast_sort,
-  sort_uniq: List.sort_uniq,
-  merge: List.merge,
-  Jsx: Pervasives.Jsx,
-  JsxEvent: Pervasives.JsxEvent,
-  JsxDOM: Pervasives.JsxDOM,
-  JsxPPXReactSupport: Pervasives.JsxPPXReactSupport,
-  JsxModules: Pervasives.JsxModules,
-  invalid_arg: Pervasives.invalid_arg,
-  failwith: Pervasives.failwith,
-  Exit: Pervasives.Exit,
-  abs: Pervasives.abs,
-  max_int: Pervasives.max_int,
-  min_int: Pervasives.min_int,
-  lnot: Pervasives.lnot,
-  infinity: Pervasives.infinity,
-  neg_infinity: Pervasives.neg_infinity,
-  max_float: Pervasives.max_float,
-  min_float: Pervasives.min_float,
-  epsilon_float: Pervasives.epsilon_float,
-  classify_float: Pervasives.classify_float,
-  char_of_int: Pervasives.char_of_int,
-  string_of_bool: Pervasives.string_of_bool,
-  bool_of_string: Pervasives.bool_of_string,
-  bool_of_string_opt: Pervasives.bool_of_string_opt,
-  int_of_string_opt: Pervasives.int_of_string_opt,
-  string_of_float: Pervasives.string_of_float,
-  float_of_string_opt: Pervasives.float_of_string_opt,
-  $at: Pervasives.$at,
-  print_string: Pervasives.print_string,
-  print_int: Pervasives.print_int,
-  print_float: Pervasives.print_float,
-  print_newline: Pervasives.print_newline,
-  prerr_newline: Pervasives.prerr_newline,
-  exit: Pervasives.exit,
-  at_exit: Pervasives.at_exit,
-  valid_float_lexem: Pervasives.valid_float_lexem
-};
-
-var U = {
-  Empty: Stack.Empty,
-  create: Stack.create,
-  push: Stack.push,
-  pop: Stack.pop,
-  top: Stack.top,
-  clear: Stack.clear,
-  copy: Stack.copy,
-  is_empty: Stack.is_empty,
-  length: Stack.length,
-  iter: Stack.iter,
-  fold: Stack.fold,
-  Jsx: Pervasives.Jsx,
-  JsxEvent: Pervasives.JsxEvent,
-  JsxDOM: Pervasives.JsxDOM,
-  JsxPPXReactSupport: Pervasives.JsxPPXReactSupport,
-  JsxModules: Pervasives.JsxModules,
-  invalid_arg: Pervasives.invalid_arg,
-  failwith: Pervasives.failwith,
-  Exit: Pervasives.Exit,
-  abs: Pervasives.abs,
-  max_int: Pervasives.max_int,
-  min_int: Pervasives.min_int,
-  lnot: Pervasives.lnot,
-  infinity: Pervasives.infinity,
-  neg_infinity: Pervasives.neg_infinity,
-  max_float: Pervasives.max_float,
-  min_float: Pervasives.min_float,
-  epsilon_float: Pervasives.epsilon_float,
-  classify_float: Pervasives.classify_float,
-  char_of_int: Pervasives.char_of_int,
-  string_of_bool: Pervasives.string_of_bool,
-  bool_of_string: Pervasives.bool_of_string,
-  bool_of_string_opt: Pervasives.bool_of_string_opt,
-  int_of_string_opt: Pervasives.int_of_string_opt,
-  string_of_float: Pervasives.string_of_float,
-  float_of_string_opt: Pervasives.float_of_string_opt,
-  $at: Pervasives.$at,
-  print_string: Pervasives.print_string,
-  print_int: Pervasives.print_int,
-  print_float: Pervasives.print_float,
-  print_newline: Pervasives.print_newline,
-  prerr_newline: Pervasives.prerr_newline,
-  exit: Pervasives.exit,
-  at_exit: Pervasives.at_exit,
-  valid_float_lexem: Pervasives.valid_float_lexem
-};
-
-var f = Pervasives.$at;
-
-var ff = List.length;
-
-var fff = Pervasives.$at;
-
-exports.List = List$1;
-exports.U = U;
-exports.f = f;
-exports.ff = ff;
-exports.fff = fff;
-/* No side effect */
diff --git a/jscomp/test/test_pervasives2.res b/jscomp/test/test_pervasives2.res
deleted file mode 100644
index 4163ca8..0000000
--- a/jscomp/test/test_pervasives2.res
+++ /dev/null
@@ -1,14 +0,0 @@
-module List = {
-  include List
-  include Pervasives
-}
-
-module U = {
-  include Stack
-  include Pervasives
-}
-
-let f = List.\"@"
-let ff = List.length
-
-let fff = U.\"@"
diff --git a/jscomp/test/test_pervasives3.js b/jscomp/test/test_pervasives3.js
deleted file mode 100644
index c85f066..0000000
--- a/jscomp/test/test_pervasives3.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-var Pervasives$1 = {
-  Jsx: Pervasives.Jsx,
-  JsxEvent: Pervasives.JsxEvent,
-  JsxDOM: Pervasives.JsxDOM,
-  JsxPPXReactSupport: Pervasives.JsxPPXReactSupport,
-  JsxModules: Pervasives.JsxModules,
-  invalid_arg: Pervasives.invalid_arg,
-  failwith: Pervasives.failwith,
-  Exit: Pervasives.Exit,
-  abs: Pervasives.abs,
-  max_int: Pervasives.max_int,
-  min_int: Pervasives.min_int,
-  lnot: Pervasives.lnot,
-  infinity: Pervasives.infinity,
-  neg_infinity: Pervasives.neg_infinity,
-  max_float: Pervasives.max_float,
-  min_float: Pervasives.min_float,
-  epsilon_float: Pervasives.epsilon_float,
-  classify_float: Pervasives.classify_float,
-  char_of_int: Pervasives.char_of_int,
-  string_of_bool: Pervasives.string_of_bool,
-  bool_of_string: Pervasives.bool_of_string,
-  bool_of_string_opt: Pervasives.bool_of_string_opt,
-  int_of_string_opt: Pervasives.int_of_string_opt,
-  string_of_float: Pervasives.string_of_float,
-  float_of_string_opt: Pervasives.float_of_string_opt,
-  $at: Pervasives.$at,
-  print_string: Pervasives.print_string,
-  print_int: Pervasives.print_int,
-  print_float: Pervasives.print_float,
-  print_newline: Pervasives.print_newline,
-  prerr_newline: Pervasives.prerr_newline,
-  exit: Pervasives.exit,
-  at_exit: Pervasives.at_exit,
-  valid_float_lexem: Pervasives.valid_float_lexem,
-  length: List.length,
-  compare_lengths: List.compare_lengths,
-  compare_length_with: List.compare_length_with,
-  cons: List.cons,
-  hd: List.hd,
-  tl: List.tl,
-  nth: List.nth,
-  nth_opt: List.nth_opt,
-  rev: List.rev,
-  init: List.init,
-  append: List.append,
-  rev_append: List.rev_append,
-  concat: List.concat,
-  flatten: List.flatten,
-  iter: List.iter,
-  iteri: List.iteri,
-  map: List.map,
-  mapi: List.mapi,
-  rev_map: List.rev_map,
-  fold_left: List.fold_left,
-  fold_right: List.fold_right,
-  iter2: List.iter2,
-  map2: List.map2,
-  rev_map2: List.rev_map2,
-  fold_left2: List.fold_left2,
-  fold_right2: List.fold_right2,
-  for_all: List.for_all,
-  exists: List.exists,
-  for_all2: List.for_all2,
-  exists2: List.exists2,
-  mem: List.mem,
-  memq: List.memq,
-  find: List.find,
-  find_opt: List.find_opt,
-  filter: List.filter,
-  find_all: List.find_all,
-  partition: List.partition,
-  assoc: List.assoc,
-  assoc_opt: List.assoc_opt,
-  assq: List.assq,
-  assq_opt: List.assq_opt,
-  mem_assoc: List.mem_assoc,
-  mem_assq: List.mem_assq,
-  remove_assoc: List.remove_assoc,
-  remove_assq: List.remove_assq,
-  split: List.split,
-  combine: List.combine,
-  sort: List.sort,
-  stable_sort: List.stable_sort,
-  fast_sort: List.fast_sort,
-  sort_uniq: List.sort_uniq,
-  merge: List.merge
-};
-
-var v = Pervasives.$at;
-
-exports.Pervasives = Pervasives$1;
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/test_pervasives3.res b/jscomp/test/test_pervasives3.res
deleted file mode 100644
index d9118e4..0000000
--- a/jscomp/test/test_pervasives3.res
+++ /dev/null
@@ -1,5 +0,0 @@
-module Pervasives = {
-  include Pervasives
-  include List
-}
-let v = Pervasives.\"@"
diff --git a/jscomp/test/test_primitive.js b/jscomp/test/test_primitive.js
deleted file mode 100644
index a66ce82..0000000
--- a/jscomp/test/test_primitive.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-var CamlinternalLazy = require("../../lib/js/camlinternalLazy.js");
-
-function a4(prim) {
-  return [
-          "File \"test_primitive.res\", line 29, characters 9-19",
-          prim
-        ];
-}
-
-function a5(prim) {
-  return [
-          30,
-          prim
-        ];
-}
-
-function a6(prim) {
-  return [
-          [
-            "test_primitive.res",
-            31,
-            9,
-            19
-          ],
-          prim
-        ];
-}
-
-var test_float = 3;
-
-var test_abs = Math.abs(3.0);
-
-var v = [
-  1.0,
-  2.0
-];
-
-var xxx = "a";
-
-var a = Caml_string.get(xxx, 0);
-
-function u(b) {
-  if (b) {
-    console.log(String(1));
-    return 32;
-  } else {
-    return 7;
-  }
-}
-
-function f2(h, b, param) {
-  return Curry._1(h, b ? 32 : 7);
-}
-
-Caml_array.set(v, 1, 3.0);
-
-var unboxed_x = {
-  u: 0,
-  v: 0
-};
-
-function gg(x) {
-  x.u = 0;
-}
-
-function f(x) {
-  return x.length;
-}
-
-var is_lazy_force = CamlinternalLazy.force;
-
-function fib(n) {
-  if (n === 0 || n === 1) {
-    return 1;
-  }
-  var fib1 = fib(n - 1 | 0);
-  var fib2 = fib(n - 2 | 0);
-  return (fib1 + fib2 | 0) + 3 | 0;
-}
-
-var a0 = "File \"test_primitive.res\", line 25, characters 9-16";
-
-var a1 = "Test_primitive";
-
-var a2 = 27;
-
-var a3 = "Test_primitive";
-
-var xx = [
-  0,
-  0
-];
-
-exports.a0 = a0;
-exports.a1 = a1;
-exports.a2 = a2;
-exports.a3 = a3;
-exports.a4 = a4;
-exports.a5 = a5;
-exports.a6 = a6;
-exports.test_float = test_float;
-exports.test_abs = test_abs;
-exports.v = v;
-exports.xxx = xxx;
-exports.a = a;
-exports.u = u;
-exports.f2 = f2;
-exports.xx = xx;
-exports.unboxed_x = unboxed_x;
-exports.gg = gg;
-exports.f = f;
-exports.is_lazy_force = is_lazy_force;
-exports.fib = fib;
-/* test_abs Not a pure module */
diff --git a/jscomp/test/test_primitive.res b/jscomp/test/test_primitive.res
deleted file mode 100644
index 711372a..0000000
--- a/jscomp/test/test_primitive.res
+++ /dev/null
@@ -1,98 +0,0 @@
-/* include ( module X : sig val fib : int -> int end = struct let rec fib = function */
-/* | 0 | 1 -> 1 */
-/* | n -> fib (n - 1) + fib (n - 2) */
-
-/* let u = List.length */
-/* end ) */
-
-/* type u = Leaf | Node of u * u */
-
-/* let rec sum = function */
-/* | Leaf -> 1 */
-/* | Node (l,r)  -> sum l + sum r */
-
-/* let leaf = Leaf */
-/* let node l r = Node (l,r) */
-
-/* let f = Math.abs 3.0 
-Original definition at externs.zip//es3.js:888
-var Math=require("Math");
-*/
-/* import List from "List" */
-/* let g f x =  x |> f */
-
-/* raise Not_found;; */ /* Test alone next time */
-let a0 = __LOC__
-let a1 = __MODULE__
-let a2 = __LINE__
-let a3 = __MODULE__
-let a4 = __LOC_OF__
-let a5 = __LINE_OF__
-let a6 = __POS_OF__
-let test_float = float(3)
-let test_abs = abs_float(3.0)
-/* Clflags.dump_lambda:=true */
-let v = [1.0, 2.0]
-let xxx = "a"
-let a = String.get(xxx, 0)
-let u = b => {
-  let a = if b {
-    print_int(1)
-    32
-  } else {
-    3 + 4
-  }
-  a
-}
-let f = (h, b, ()) =>
-  h(
-    if b {
-      print_int(1)
-      32
-    } else {
-      3 + 4
-    },
-  )
-let f2 = (h, b, ()) =>
-  h(
-    if b {
-      32
-    } else {
-      3 + 4
-    },
-  )
-@@warning("-26")
-let f2 = (h, b, ()) =>
-  h(
-    if b {
-      let c = 3
-      32
-    } else {
-      3 + 4
-    },
-  )
-let () = v[1] = 3.0
-
-type u = {
-  mutable u: float,
-  v: float,
-}
-let xx = (0., 0.)
-let unboxed_x = {u: 0., v: 0.}
-let f = ({u}) => u
-
-let gg = x => x.u = 0.
-
-let f = (x: string) => String.length(x)
-
-let is_lazy_force = x => Lazy.force(x)
-
-let rec fib = (n: int) =>
-  switch n {
-  | 0 | 1 => 1
-  | n =>
-    let fib1 = fib(n - 1)
-    let fib2 = fib(n - 2)
-    let fib3 = 3
-    fib1 + fib2 + fib3
-  }
diff --git a/jscomp/test/test_ramification.js b/jscomp/test/test_ramification.js
deleted file mode 100644
index 3550639..0000000
--- a/jscomp/test/test_ramification.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function ff(x) {
-  var a;
-  switch (x) {
-    case "0" :
-    case "1" :
-    case "2" :
-        a = 3;
-        break;
-    case "3" :
-        a = 4;
-        break;
-    case "4" :
-        a = 6;
-        break;
-    case "7" :
-        a = 7;
-        break;
-    default:
-      a = 8;
-  }
-  return a + 3 | 0;
-}
-
-function f(x) {
-  var y;
-  y = x.TAG === "A" ? 3 : 4;
-  return y + 32 | 0;
-}
-
-function f2(x) {
-  var v = 0;
-  var y;
-  v = 1;
-  if (x.TAG === "A") {
-    var z = 33;
-    y = z + 3 | 0;
-  } else {
-    var z$1 = 33;
-    y = z$1 + 4 | 0;
-  }
-  return y + 32 | 0;
-}
-
-function f3(x) {
-  var v = 0;
-  var y;
-  v = 1;
-  y = x.TAG === "A" ? 3 : 4;
-  return y + 32 | 0;
-}
-
-exports.ff = ff;
-exports.f = f;
-exports.f2 = f2;
-exports.f3 = f3;
-/* No side effect */
diff --git a/jscomp/test/test_ramification.res b/jscomp/test/test_ramification.res
deleted file mode 100644
index 6a38640..0000000
--- a/jscomp/test/test_ramification.res
+++ /dev/null
@@ -1,65 +0,0 @@
-let ff = x => {
-  let a = switch x {
-  | "0"
-  | "1"
-  | "2" => 3
-  | "3" => 4
-  | "4" => 6
-  | "7" => 7
-  | _ => 8
-  }
-  a + 3
-}
-
-let f2 = x =>
-  switch x {
-  | "0"
-  | "1"
-  | "2" => 3
-  | "3" => 4
-  | "4" => 6
-  | "7" => 7
-  | _ => 8
-  } + 3
-
-type u = A(int, int) | B(int)
-
-let f = (x: u) => {
-  let y = switch x {
-  | A(_) => 3
-  | B(_) => 4
-  }
-  y + 32
-}
-
-let f2 = (x: u) => {
-  let v = ref(0)
-  let y = switch x {
-  | A(_) =>
-    v := 1
-    let z = 1
-    let z = z + 32
-    z + 3
-  | B(_) =>
-    v := 1
-    let z = 1
-    let z = z + 32
-    z + 4
-  }
-
-  y + 32
-}
-
-let f3 = (x: u) => {
-  let v = ref(0)
-  let y = switch x {
-  | A(_) =>
-    v := 1
-    3
-  | B(_) =>
-    v := 1
-    4
-  }
-
-  y + 32
-}
diff --git a/jscomp/test/test_react.js b/jscomp/test/test_react.js
deleted file mode 100644
index ffc39f0..0000000
--- a/jscomp/test/test_react.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var C = require("c");
-var C$1 = require("b/c");
-var Xxx = require("xxx");
-var C$2 = require("a/b/c");
-var React = require("react");
-var ReactDom = require("react-dom");
-
-console.log(32);
-
-ReactDom.render(React.createClass({
-          render: (function (param) {
-              return React.DOM.div({
-                          alt: "pic"
-                        }, React.DOM.h1(undefined, "hello react"), React.DOM.h2(undefined, "type safe!"), React.DOM.h3(undefined, "type safe!"));
-            })
-        }), document.getElementById("hi"));
-
-function f(param) {
-  Xxx();
-  Xxx.xx();
-  Xxx.xxx();
-  C$2.x();
-  C$2.y();
-  C$1.x();
-  C$1.y();
-  C.x();
-  C.y();
-}
-
-var v;
-
-var u = 33;
-
-exports.v = v;
-exports.u = u;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/test_react.res b/jscomp/test/test_react.res
deleted file mode 100644
index f740f87..0000000
--- a/jscomp/test/test_react.res
+++ /dev/null
@@ -1,93 +0,0 @@
-/* TODO: binding -- document.getElementById -- to mount node */
-
-type html_element
-
-@val("console.log") external log: 'a => unit = ""
-let v = log(32)
-type t
-type element
-@val external document: t = "document"
-@send external getElementById: (t, string) => element = "getElementById"
-
-type config
-type component
-@obj external config: (~display_name: string=?, ~render: unit => component, unit) => config = ""
-
-type attrs
-@obj external attrs: (~alt: string=?, ~autoPlay: bool=?, unit) => attrs = ""
-
-external str: string => component = "%identity"
-type vdom
-@module("react") @val external vdom: vdom = "DOM"
-
-/* FIXME: investigate 
-   cases:
-   {[
-     [@@bs.module "package1" "same_name"]
-     [@@bs.module "package2" "same_name"]
-   ]}
-   {[
-     [@@bs.module "package" "name1"]
-     [@@bs.module "package" "name2"]
-   ]}
-*/
-@send @variadic external h1: (vdom, ~attrs: attrs=?, array<component>) => component = "h1"
-@send @variadic external h2: (vdom, ~attrs: attrs=?, array<component>) => component = "h2"
-
-@send @variadic external h3: (vdom, ~attrs: attrs=?, array<component>) => component = "h3"
-
-@send @variadic external h4: (vdom, ~attrs: attrs=?, array<component>) => component = "h4"
-
-@send @variadic external div: (vdom, ~attrs: attrs=?, array<component>) => component = "div"
-
-type component_class
-@val("createClass") @module("react") external createClass: config => component_class = "createClass"
-
-@val("render") @module("react-dom")
-external render: (component_class, element) => unit =
-  "" /* TODO: error checking -- attributes todo */
-
-render(
-  createClass(
-    config(
-      ~render=_ =>
-        div(
-          vdom,
-          ~attrs=attrs(~alt="pic", ()),
-          [
-            h1(vdom, [str("hello react")]),
-            h2(vdom, [str("type safe!")]),
-            h3(vdom, [str("type safe!")]),
-          ],
-        ),
-      (),
-    ),
-  ),
-  getElementById(document, "hi"),
-)
-
-let u = 33
-
-@module external make: unit => unit = "xxx"
-@module("xxx") external make2: unit => unit = "xx"
-@module("xxx") external make3: unit => unit = "xxx"
-@module("a/b/c") external make4: unit => unit = "x"
-@module("a/b/c") external make5: unit => unit = "y"
-
-@module("b/c") external make6: unit => unit = "x"
-@module("b/c") external make7: unit => unit = "y"
-
-@module("c") external make8: unit => unit = "x"
-@module("c") external make9: unit => unit = "y"
-
-let f = () => {
-  make()
-  make2()
-  make3()
-  make4()
-  make5()
-  make6()
-  make7()
-  make8()
-  make9()
-}
diff --git a/jscomp/test/test_react_case.js b/jscomp/test/test_react_case.js
deleted file mode 100644
index 182b8c2..0000000
--- a/jscomp/test/test_react_case.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function v(prim) {
-  return {};
-}
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/test_react_case.res b/jscomp/test/test_react_case.res
deleted file mode 100644
index 70b7a1e..0000000
--- a/jscomp/test/test_react_case.res
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
-var CommentBox = React.createClass({
-  render: function() {
-    return (
-      <div className=\"commentBox\">
-        Hello, world! I am a CommentBox.
-      </div>
-    );
-    }
-});
-*/
-type obj_spec
-type react_dom_element
-@val
-external react_create_class: obj_spec => react_dom_element /* "createClass" "React" */ =
-  "react_create_class"
-type react_dom_component
-@obj
-external mk_obj_spec: (
-  ~display_name: string=?,
-  ~render: unit => react_dom_component,
-  unit,
-) => obj_spec = ""
-
-@obj external empty_obj: unit => _ = ""
-
-let v = empty_obj
diff --git a/jscomp/test/test_regex.js b/jscomp/test/test_regex.js
deleted file mode 100644
index 7a48b54..0000000
--- a/jscomp/test/test_regex.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v = /b/ig;
-
-var r = /Bucklescript是一个程序语言/;
-
-var c = v;
-
-exports.v = v;
-exports.r = r;
-exports.c = c;
-/* No side effect */
diff --git a/jscomp/test/test_regex.res b/jscomp/test/test_regex.res
deleted file mode 100644
index 778ba14..0000000
--- a/jscomp/test/test_regex.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let v = %re("/b/ig")
-let r = %re("/Bucklescript是一个程序语言/")
-
-/* Js.log(v);;
- Js.log(r);; */
-
-let c = v
diff --git a/jscomp/test/test_runtime_encoding.js b/jscomp/test/test_runtime_encoding.js
deleted file mode 100644
index bbc132b..0000000
--- a/jscomp/test/test_runtime_encoding.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_array = require("../../lib/js/caml_array.js");
-
-function g(x) {
-  return [
-          3,
-          x
-        ];
-}
-
-function ff(v, u) {
-  return {
-          v: v,
-          u: u
-        };
-}
-
-function fff(vv, uu) {
-  return {
-          vv: vv,
-          uu: uu
-        };
-}
-
-function a(x) {
-  return Caml_array.get(x, 0);
-}
-
-function aa(x) {
-  return Caml_array.get(x, 0);
-}
-
-function aaa(x) {
-  return x.v;
-}
-
-function aaaa(x) {
-  return x.vv;
-}
-
-function f(x) {
-  for(var i = 0; i <= 10; ++i){
-    Caml_array.set(x, i, i);
-  }
-}
-
-exports.g = g;
-exports.ff = ff;
-exports.fff = fff;
-exports.a = a;
-exports.aa = aa;
-exports.aaa = aaa;
-exports.aaaa = aaaa;
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_runtime_encoding.res b/jscomp/test/test_runtime_encoding.res
deleted file mode 100644
index 4c5a4df..0000000
--- a/jscomp/test/test_runtime_encoding.res
+++ /dev/null
@@ -1,19 +0,0 @@
-let f = x => [3, x]
-let g = x => [3., x]
-type u = {v: int, u: float}
-type uu = {vv: float, uu: float}
-
-let ff = (v, u) => {v, u}
-let fff = (vv, uu) => {vv, uu}
-
-let a = (x: array<int>) => x[0]
-let aa = (x: array<float>) => x[0]
-let aaa = (x: u) => x.v
-let aaaa = (x: uu) => x.vv
-
-let f = x => x[0] = 1
-
-let f = x =>
-  for i in 0 to 10 {
-    x[i] = i
-  }
diff --git a/jscomp/test/test_scope.js b/jscomp/test/test_scope.js
deleted file mode 100644
index 31ebe6e..0000000
--- a/jscomp/test/test_scope.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var h = x(3);
-
-var hh = x(3);
-
-function f(x, y) {
-  return x + y;
-}
-
-exports.h = h;
-exports.hh = hh;
-exports.f = f;
-/* h Not a pure module */
diff --git a/jscomp/test/test_scope.res b/jscomp/test/test_scope.res
deleted file mode 100644
index df1ac22..0000000
--- a/jscomp/test/test_scope.res
+++ /dev/null
@@ -1,6 +0,0 @@
-@val("x") external f: int => int = ""
-/* [@@bs.scope "u"] [@@bs.scope "uuu"] */
-@val("x") external ff: int => int = ""
-let h = f(3)
-let hh = ff(3)
-let f = (x, y) => x ++ y
diff --git a/jscomp/test/test_seq.js b/jscomp/test/test_seq.js
deleted file mode 100644
index 2c9252d..0000000
--- a/jscomp/test/test_seq.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var Bad = /* @__PURE__ */Caml_exceptions.create("Test_seq.Bad");
-
-var Help = /* @__PURE__ */Caml_exceptions.create("Test_seq.Help");
-
-var Stop = /* @__PURE__ */Caml_exceptions.create("Test_seq.Stop");
-
-function assoc3(x, _l) {
-  while(true) {
-    var l = _l;
-    if (l) {
-      var match = l.hd;
-      if (Caml_obj.equal(match[0], x)) {
-        return match[1];
-      }
-      _l = l.tl;
-      continue ;
-    }
-    throw {
-          RE_EXN_ID: "Not_found",
-          Error: new Error()
-        };
-  };
-}
-
-function help_action(param) {
-  throw {
-        RE_EXN_ID: Stop,
-        _1: {
-          TAG: "Unknown",
-          _0: "-help"
-        },
-        Error: new Error()
-      };
-}
-
-function v(speclist) {
-  assoc3("-help", speclist);
-  return /* [] */0;
-}
-
-function f(g, speclist) {
-  return Curry._1(g, assoc3("-help", speclist));
-}
-
-function add_help(speclist) {
-  var add1;
-  try {
-    assoc3("-help", speclist);
-    add1 = /* [] */0;
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Not_found") {
-      add1 = {
-        hd: [
-          "-help",
-          {
-            TAG: "Unit",
-            _0: help_action
-          },
-          " Display this list of options"
-        ],
-        tl: /* [] */0
-      };
-    } else {
-      throw exn;
-    }
-  }
-  var add2;
-  try {
-    assoc3("--help", speclist);
-    add2 = /* [] */0;
-  }
-  catch (raw_exn$1){
-    var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
-    if (exn$1.RE_EXN_ID === "Not_found") {
-      add2 = {
-        hd: [
-          "--help",
-          {
-            TAG: "Unit",
-            _0: help_action
-          },
-          " Display this list of options"
-        ],
-        tl: /* [] */0
-      };
-    } else {
-      throw exn$1;
-    }
-  }
-  return Pervasives.$at(speclist, Pervasives.$at(add1, add2));
-}
-
-exports.Bad = Bad;
-exports.Help = Help;
-exports.Stop = Stop;
-exports.assoc3 = assoc3;
-exports.help_action = help_action;
-exports.v = v;
-exports.f = f;
-exports.add_help = add_help;
-/* No side effect */
diff --git a/jscomp/test/test_seq.res b/jscomp/test/test_seq.res
deleted file mode 100644
index 753ef98..0000000
--- a/jscomp/test/test_seq.res
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Damien Doligez, projet Para, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-type key = string
-type doc = string
-type usage_msg = string
-type anon_fun = string => unit
-
-type rec spec =
-  | Unit(unit => unit) /* Call the function with unit argument */
-  | Bool(bool => unit) /* Call the function with a bool argument */
-  | Set(ref<bool>) /* Set the reference to true */
-  | Clear(ref<bool>) /* Set the reference to false */
-  | String(string => unit) /* Call the function with a string argument */
-  | Set_string(ref<string>) /* Set the reference to the string argument */
-  | Int(int => unit) /* Call the function with an int argument */
-  | Set_int(ref<int>) /* Set the reference to the int argument */
-  | Float(float => unit) /* Call the function with a float argument */
-  | Set_float(ref<float>) /* Set the reference to the float argument */
-  | Tuple(list<spec>) /* Take several arguments according to the
-   spec list */
-
-  | Symbol(list<string>, string => unit)
-  /* Take one of the symbols as argument and
-   call the function with the symbol. */
-  | Rest(string => unit) /* Stop interpreting keywords and call the
- function with each remaining argument */
-
-exception Bad(string)
-exception Help(string)
-
-type error =
-  | Unknown(string)
-  | Wrong(string, string, string) /* option, actual, expected */
-  | Missing(string)
-  | Message(string)
-
-exception Stop(error) /* used internally */
-
-let rec assoc3 = (x, l) =>
-  switch l {
-  | list{} => raise(Not_found)
-  | list{(y1, y2, y3), ...t} if y1 == x => y2
-  | list{_, ...t} => assoc3(x, t)
-  }
-
-/* let make_symlist prefix sep suffix l = */
-/* match l with */
-/* | [] -> "<none>" */
-/* | h::t -> (List.fold_left (fun x y -> x ^ sep ^ y) (prefix ^ h) t) ^ suffix */
-/* ;; */
-
-/* let print_spec buf (key, spec, doc) = */
-/* if String.length doc > 0 then */
-/* match spec with */
-/* | Symbol (l, _) -> */
-/* bprintf buf "  %s %s%s\n" key (make_symlist "{" "|" "}" l) doc */
-/* | _ -> */
-/* bprintf buf "  %s %s\n" key doc */
-/* ;; */
-
-let help_action = () => raise(Stop(Unknown("-help")))
-let v = speclist => {
-  ignore(assoc3("-help", speclist))
-  list{}
-}
-
-let f = (g, speclist) => g(assoc3("-help", speclist))
-let add_help = speclist => {
-  let add1 = try {
-    ignore(assoc3("-help", speclist))
-    list{}
-  } catch {
-  | Not_found => list{("-help", Unit(help_action), " Display this list of options")}
-  }
-  and add2 = try {
-    ignore(assoc3("--help", speclist))
-    list{}
-  } catch {
-  | Not_found => list{("--help", Unit(help_action), " Display this list of options")}
-  }
-
-  \"@"(speclist, \"@"(add1, add2))
-}
-
-/* FIXME- not compatible with strict mode */
-/* let f x x   =  x */
diff --git a/jscomp/test/test_set.js b/jscomp/test/test_set.js
deleted file mode 100644
index 3a494d2..0000000
--- a/jscomp/test/test_set.js
+++ /dev/null
@@ -1,768 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-
-function Make(Ord) {
-  var height = function (x) {
-    if (typeof x !== "object") {
-      return 0;
-    } else {
-      return x._3;
-    }
-  };
-  var create = function (l, v, r) {
-    var hl;
-    hl = typeof l !== "object" ? 0 : l._3;
-    var hr;
-    hr = typeof r !== "object" ? 0 : r._3;
-    return {
-            TAG: "Node",
-            _0: l,
-            _1: v,
-            _2: r,
-            _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  };
-  var bal = function (l, v, r) {
-    var hl;
-    hl = typeof l !== "object" ? 0 : l._3;
-    var hr;
-    hr = typeof r !== "object" ? 0 : r._3;
-    if (hl > (hr + 2 | 0)) {
-      if (typeof l !== "object") {
-        throw {
-              RE_EXN_ID: "Invalid_argument",
-              _1: "Set.bal",
-              Error: new Error()
-            };
-      }
-      var lr = l._2;
-      var lv = l._1;
-      var ll = l._0;
-      if (height(ll) >= height(lr)) {
-        return create(ll, lv, create(lr, v, r));
-      }
-      if (typeof lr === "object") {
-        return create(create(ll, lv, lr._0), lr._1, create(lr._2, v, r));
-      }
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
-    }
-    if (hr <= (hl + 2 | 0)) {
-      return {
-              TAG: "Node",
-              _0: l,
-              _1: v,
-              _2: r,
-              _3: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-            };
-    }
-    if (typeof r !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
-    }
-    var rr = r._2;
-    var rv = r._1;
-    var rl = r._0;
-    if (height(rr) >= height(rl)) {
-      return create(create(l, v, rl), rv, rr);
-    }
-    if (typeof rl === "object") {
-      return create(create(l, v, rl._0), rl._1, create(rl._2, rv, rr));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
-  };
-  var add = function (x, x_) {
-    if (typeof x_ !== "object") {
-      return {
-              TAG: "Node",
-              _0: "Empty",
-              _1: x,
-              _2: "Empty",
-              _3: 1
-            };
-    }
-    var r = x_._2;
-    var v = x_._1;
-    var l = x_._0;
-    var c = Curry._2(Ord.compare, x, v);
-    if (c === 0) {
-      return x_;
-    } else if (c < 0) {
-      return bal(add(x, l), v, r);
-    } else {
-      return bal(l, v, add(x, r));
-    }
-  };
-  var singleton = function (x) {
-    return {
-            TAG: "Node",
-            _0: "Empty",
-            _1: x,
-            _2: "Empty",
-            _3: 1
-          };
-  };
-  var add_min_element = function (v, x) {
-    if (typeof x !== "object") {
-      return singleton(v);
-    } else {
-      return bal(add_min_element(v, x._0), x._1, x._2);
-    }
-  };
-  var add_max_element = function (v, x) {
-    if (typeof x !== "object") {
-      return singleton(v);
-    } else {
-      return bal(x._0, x._1, add_max_element(v, x._2));
-    }
-  };
-  var join = function (l, v, r) {
-    if (typeof l !== "object") {
-      return add_min_element(v, r);
-    }
-    var lh = l._3;
-    if (typeof r !== "object") {
-      return add_max_element(v, l);
-    }
-    var rh = r._3;
-    if (lh > (rh + 2 | 0)) {
-      return bal(l._0, l._1, join(l._2, v, r));
-    } else if (rh > (lh + 2 | 0)) {
-      return bal(join(l, v, r._0), r._1, r._2);
-    } else {
-      return create(l, v, r);
-    }
-  };
-  var min_elt = function (_x) {
-    while(true) {
-      var x = _x;
-      if (typeof x !== "object") {
-        throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
-      }
-      var l = x._0;
-      if (typeof l !== "object") {
-        return x._1;
-      }
-      _x = l;
-      continue ;
-    };
-  };
-  var max_elt = function (_x) {
-    while(true) {
-      var x = _x;
-      if (typeof x !== "object") {
-        throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
-      }
-      var r = x._2;
-      if (typeof r !== "object") {
-        return x._1;
-      }
-      _x = r;
-      continue ;
-    };
-  };
-  var remove_min_elt = function (x) {
-    if (typeof x !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.remove_min_elt",
-            Error: new Error()
-          };
-    }
-    var l = x._0;
-    if (typeof l !== "object") {
-      return x._2;
-    } else {
-      return bal(remove_min_elt(l), x._1, x._2);
-    }
-  };
-  var merge = function (t1, t2) {
-    if (typeof t1 !== "object") {
-      return t2;
-    } else if (typeof t2 !== "object") {
-      return t1;
-    } else {
-      return bal(t1, min_elt(t2), remove_min_elt(t2));
-    }
-  };
-  var concat = function (t1, t2) {
-    if (typeof t1 !== "object") {
-      return t2;
-    } else if (typeof t2 !== "object") {
-      return t1;
-    } else {
-      return join(t1, min_elt(t2), remove_min_elt(t2));
-    }
-  };
-  var split = function (x, x_) {
-    if (typeof x_ !== "object") {
-      return [
-              "Empty",
-              false,
-              "Empty"
-            ];
-    }
-    var r = x_._2;
-    var v = x_._1;
-    var l = x_._0;
-    var c = Curry._2(Ord.compare, x, v);
-    if (c === 0) {
-      return [
-              l,
-              true,
-              r
-            ];
-    }
-    if (c < 0) {
-      var match = split(x, l);
-      return [
-              match[0],
-              match[1],
-              join(match[2], v, r)
-            ];
-    }
-    var match$1 = split(x, r);
-    return [
-            join(l, v, match$1[0]),
-            match$1[1],
-            match$1[2]
-          ];
-  };
-  var is_empty = function (x) {
-    if (typeof x !== "object") {
-      return true;
-    } else {
-      return false;
-    }
-  };
-  var mem = function (x, _x_) {
-    while(true) {
-      var x_ = _x_;
-      if (typeof x_ !== "object") {
-        return false;
-      }
-      var c = Curry._2(Ord.compare, x, x_._1);
-      if (c === 0) {
-        return true;
-      }
-      _x_ = c < 0 ? x_._0 : x_._2;
-      continue ;
-    };
-  };
-  var remove = function (x, x_) {
-    if (typeof x_ !== "object") {
-      return "Empty";
-    }
-    var r = x_._2;
-    var v = x_._1;
-    var l = x_._0;
-    var c = Curry._2(Ord.compare, x, v);
-    if (c === 0) {
-      return merge(l, r);
-    } else if (c < 0) {
-      return bal(remove(x, l), v, r);
-    } else {
-      return bal(l, v, remove(x, r));
-    }
-  };
-  var union = function (s1, s2) {
-    if (typeof s1 !== "object") {
-      return s2;
-    }
-    var h1 = s1._3;
-    var v1 = s1._1;
-    if (typeof s2 !== "object") {
-      return s1;
-    }
-    var h2 = s2._3;
-    var v2 = s2._1;
-    if (h1 >= h2) {
-      if (h2 === 1) {
-        return add(v2, s1);
-      }
-      var match = split(v1, s2);
-      return join(union(s1._0, match[0]), v1, union(s1._2, match[2]));
-    }
-    if (h1 === 1) {
-      return add(v1, s2);
-    }
-    var match$1 = split(v2, s1);
-    return join(union(match$1[0], s2._0), v2, union(match$1[2], s2._2));
-  };
-  var inter = function (s1, s2) {
-    if (typeof s1 !== "object") {
-      return "Empty";
-    }
-    if (typeof s2 !== "object") {
-      return "Empty";
-    }
-    var r1 = s1._2;
-    var v1 = s1._1;
-    var l1 = s1._0;
-    var match = split(v1, s2);
-    var l2 = match[0];
-    if (match[1]) {
-      return join(inter(l1, l2), v1, inter(r1, match[2]));
-    } else {
-      return concat(inter(l1, l2), inter(r1, match[2]));
-    }
-  };
-  var diff = function (s1, s2) {
-    if (typeof s1 !== "object") {
-      return "Empty";
-    }
-    if (typeof s2 !== "object") {
-      return s1;
-    }
-    var r1 = s1._2;
-    var v1 = s1._1;
-    var l1 = s1._0;
-    var match = split(v1, s2);
-    var l2 = match[0];
-    if (match[1]) {
-      return concat(diff(l1, l2), diff(r1, match[2]));
-    } else {
-      return join(diff(l1, l2), v1, diff(r1, match[2]));
-    }
-  };
-  var cons_enum = function (_s, _e) {
-    while(true) {
-      var e = _e;
-      var s = _s;
-      if (typeof s !== "object") {
-        return e;
-      }
-      _e = {
-        TAG: "More",
-        _0: s._1,
-        _1: s._2,
-        _2: e
-      };
-      _s = s._0;
-      continue ;
-    };
-  };
-  var compare_aux = function (_e1, _e2) {
-    while(true) {
-      var e2 = _e2;
-      var e1 = _e1;
-      if (typeof e1 !== "object") {
-        if (typeof e2 !== "object") {
-          return 0;
-        } else {
-          return -1;
-        }
-      }
-      if (typeof e2 !== "object") {
-        return 1;
-      }
-      var c = Curry._2(Ord.compare, e1._0, e2._0);
-      if (c !== 0) {
-        return c;
-      }
-      _e2 = cons_enum(e2._1, e2._2);
-      _e1 = cons_enum(e1._1, e1._2);
-      continue ;
-    };
-  };
-  var compare = function (s1, s2) {
-    return compare_aux(cons_enum(s1, "End"), cons_enum(s2, "End"));
-  };
-  var equal = function (s1, s2) {
-    return compare(s1, s2) === 0;
-  };
-  var subset = function (_s1, _s2) {
-    while(true) {
-      var s2 = _s2;
-      var s1 = _s1;
-      if (typeof s1 !== "object") {
-        return true;
-      }
-      var r1 = s1._2;
-      var v1 = s1._1;
-      var l1 = s1._0;
-      if (typeof s2 !== "object") {
-        return false;
-      }
-      var r2 = s2._2;
-      var l2 = s2._0;
-      var c = Curry._2(Ord.compare, v1, s2._1);
-      if (c === 0) {
-        if (!subset(l1, l2)) {
-          return false;
-        }
-        _s2 = r2;
-        _s1 = r1;
-        continue ;
-      }
-      if (c < 0) {
-        if (!subset({
-                TAG: "Node",
-                _0: l1,
-                _1: v1,
-                _2: "Empty",
-                _3: 0
-              }, l2)) {
-          return false;
-        }
-        _s1 = r1;
-        continue ;
-      }
-      if (!subset({
-              TAG: "Node",
-              _0: "Empty",
-              _1: v1,
-              _2: r1,
-              _3: 0
-            }, r2)) {
-        return false;
-      }
-      _s1 = l1;
-      continue ;
-    };
-  };
-  var iter = function (f, _x_) {
-    while(true) {
-      var x_ = _x_;
-      if (typeof x_ !== "object") {
-        return ;
-      }
-      iter(f, x_._0);
-      Curry._1(f, x_._1);
-      _x_ = x_._2;
-      continue ;
-    };
-  };
-  var fold = function (f, _s, _accu) {
-    while(true) {
-      var accu = _accu;
-      var s = _s;
-      if (typeof s !== "object") {
-        return accu;
-      }
-      _accu = Curry._2(f, s._1, fold(f, s._0, accu));
-      _s = s._2;
-      continue ;
-    };
-  };
-  var for_all = function (p, _x) {
-    while(true) {
-      var x = _x;
-      if (typeof x !== "object") {
-        return true;
-      }
-      if (!Curry._1(p, x._1)) {
-        return false;
-      }
-      if (!for_all(p, x._0)) {
-        return false;
-      }
-      _x = x._2;
-      continue ;
-    };
-  };
-  var exists = function (p, _x) {
-    while(true) {
-      var x = _x;
-      if (typeof x !== "object") {
-        return false;
-      }
-      if (Curry._1(p, x._1)) {
-        return true;
-      }
-      if (exists(p, x._0)) {
-        return true;
-      }
-      _x = x._2;
-      continue ;
-    };
-  };
-  var filter = function (p, x) {
-    if (typeof x !== "object") {
-      return "Empty";
-    }
-    var v = x._1;
-    var l$p = filter(p, x._0);
-    var pv = Curry._1(p, v);
-    var r$p = filter(p, x._2);
-    if (pv) {
-      return join(l$p, v, r$p);
-    } else {
-      return concat(l$p, r$p);
-    }
-  };
-  var partition = function (p, x) {
-    if (typeof x !== "object") {
-      return [
-              "Empty",
-              "Empty"
-            ];
-    }
-    var v = x._1;
-    var match = partition(p, x._0);
-    var lf = match[1];
-    var lt = match[0];
-    var pv = Curry._1(p, v);
-    var match$1 = partition(p, x._2);
-    var rf = match$1[1];
-    var rt = match$1[0];
-    if (pv) {
-      return [
-              join(lt, v, rt),
-              concat(lf, rf)
-            ];
-    } else {
-      return [
-              concat(lt, rt),
-              join(lf, v, rf)
-            ];
-    }
-  };
-  var cardinal = function (x) {
-    if (typeof x !== "object") {
-      return 0;
-    } else {
-      return (cardinal(x._0) + 1 | 0) + cardinal(x._2) | 0;
-    }
-  };
-  var elements_aux = function (_accu, _x) {
-    while(true) {
-      var x = _x;
-      var accu = _accu;
-      if (typeof x !== "object") {
-        return accu;
-      }
-      _x = x._0;
-      _accu = {
-        hd: x._1,
-        tl: elements_aux(accu, x._2)
-      };
-      continue ;
-    };
-  };
-  var elements = function (s) {
-    return elements_aux(/* [] */0, s);
-  };
-  var find = function (x, _x_) {
-    while(true) {
-      var x_ = _x_;
-      if (typeof x_ !== "object") {
-        throw {
-              RE_EXN_ID: "Not_found",
-              Error: new Error()
-            };
-      }
-      var v = x_._1;
-      var c = Curry._2(Ord.compare, x, v);
-      if (c === 0) {
-        return v;
-      }
-      _x_ = c < 0 ? x_._0 : x_._2;
-      continue ;
-    };
-  };
-  var of_sorted_list = function (l) {
-    var sub = function (n, l) {
-      switch (n) {
-        case 0 :
-            return [
-                    "Empty",
-                    l
-                  ];
-        case 1 :
-            if (l) {
-              return [
-                      {
-                        TAG: "Node",
-                        _0: "Empty",
-                        _1: l.hd,
-                        _2: "Empty",
-                        _3: 1
-                      },
-                      l.tl
-                    ];
-            }
-            break;
-        case 2 :
-            if (l) {
-              var match = l.tl;
-              if (match) {
-                return [
-                        {
-                          TAG: "Node",
-                          _0: {
-                            TAG: "Node",
-                            _0: "Empty",
-                            _1: l.hd,
-                            _2: "Empty",
-                            _3: 1
-                          },
-                          _1: match.hd,
-                          _2: "Empty",
-                          _3: 2
-                        },
-                        match.tl
-                      ];
-              }
-              
-            }
-            break;
-        case 3 :
-            if (l) {
-              var match$1 = l.tl;
-              if (match$1) {
-                var match$2 = match$1.tl;
-                if (match$2) {
-                  return [
-                          {
-                            TAG: "Node",
-                            _0: {
-                              TAG: "Node",
-                              _0: "Empty",
-                              _1: l.hd,
-                              _2: "Empty",
-                              _3: 1
-                            },
-                            _1: match$1.hd,
-                            _2: {
-                              TAG: "Node",
-                              _0: "Empty",
-                              _1: match$2.hd,
-                              _2: "Empty",
-                              _3: 1
-                            },
-                            _3: 2
-                          },
-                          match$2.tl
-                        ];
-                }
-                
-              }
-              
-            }
-            break;
-        default:
-          
-      }
-      var nl = n / 2 | 0;
-      var match$3 = sub(nl, l);
-      var l$1 = match$3[1];
-      if (l$1) {
-        var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
-        return [
-                create(match$3[0], l$1.hd, match$4[0]),
-                match$4[1]
-              ];
-      }
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "test_set.res",
-              497,
-              20
-            ],
-            Error: new Error()
-          };
-    };
-    return sub(List.length(l), l)[0];
-  };
-  var of_list = function (l) {
-    if (!l) {
-      return "Empty";
-    }
-    var match = l.tl;
-    var x0 = l.hd;
-    if (!match) {
-      return singleton(x0);
-    }
-    var match$1 = match.tl;
-    var x1 = match.hd;
-    if (!match$1) {
-      return add(x1, singleton(x0));
-    }
-    var match$2 = match$1.tl;
-    var x2 = match$1.hd;
-    if (!match$2) {
-      return add(x2, add(x1, singleton(x0)));
-    }
-    var match$3 = match$2.tl;
-    var x3 = match$2.hd;
-    if (match$3) {
-      if (match$3.tl) {
-        return of_sorted_list(List.sort_uniq(Ord.compare, l));
-      } else {
-        return add(match$3.hd, add(x3, add(x2, add(x1, singleton(x0)))));
-      }
-    } else {
-      return add(x3, add(x2, add(x1, singleton(x0))));
-    }
-  };
-  return {
-          height: height,
-          create: create,
-          bal: bal,
-          add: add,
-          singleton: singleton,
-          add_min_element: add_min_element,
-          add_max_element: add_max_element,
-          join: join,
-          min_elt: min_elt,
-          max_elt: max_elt,
-          remove_min_elt: remove_min_elt,
-          merge: merge,
-          concat: concat,
-          split: split,
-          empty: "Empty",
-          is_empty: is_empty,
-          mem: mem,
-          remove: remove,
-          union: union,
-          inter: inter,
-          diff: diff,
-          cons_enum: cons_enum,
-          compare_aux: compare_aux,
-          compare: compare,
-          equal: equal,
-          subset: subset,
-          iter: iter,
-          fold: fold,
-          for_all: for_all,
-          exists: exists,
-          filter: filter,
-          partition: partition,
-          cardinal: cardinal,
-          elements_aux: elements_aux,
-          elements: elements,
-          choose: min_elt,
-          find: find,
-          of_sorted_list: of_sorted_list,
-          of_list: of_list
-        };
-}
-
-var N = {
-  a: 3
-};
-
-exports.Make = Make;
-exports.N = N;
-/* No side effect */
diff --git a/jscomp/test/test_set.res b/jscomp/test/test_set.res
deleted file mode 100644
index 5d95e32..0000000
--- a/jscomp/test/test_set.res
+++ /dev/null
@@ -1,520 +0,0 @@
-/* ********************************************************************* */
-/*  */
-/* OCaml */
-/*  */
-/* Xavier Leroy, projet Cristal, INRIA Rocquencourt */
-/*  */
-/* Copyright 1996 Institut National de Recherche en Informatique et */
-/* en Automatique.  All rights reserved.  This file is distributed */
-/* under the terms of the GNU Library General Public License, with */
-/* the special exception on linking described in file ../LICENSE. */
-/*  */
-/* ********************************************************************* */
-
-/* Sets over ordered types */
-
-module type OrderedType = {
-  type t
-  let compare: (t, t) => int
-}
-
-module type S = {
-  type elt
-  type t
-  let empty: t
-  let is_empty: t => bool
-  let mem: (elt, t) => bool
-  let add: (elt, t) => t
-  let singleton: elt => t
-  let remove: (elt, t) => t
-  let union: (t, t) => t
-  let inter: (t, t) => t
-  let diff: (t, t) => t
-  let compare: (t, t) => int
-  let equal: (t, t) => bool
-  let subset: (t, t) => bool
-  let iter: (elt => unit, t) => unit
-  let fold: ((elt, 'a) => 'a, t, 'a) => 'a
-  let for_all: (elt => bool, t) => bool
-  let exists: (elt => bool, t) => bool
-  let filter: (elt => bool, t) => t
-  let partition: (elt => bool, t) => (t, t)
-  let cardinal: t => int
-  let elements: t => list<elt>
-  let min_elt: t => elt
-  let max_elt: t => elt
-  let choose: t => elt
-  let split: (elt, t) => (t, bool, t)
-  let find: (elt, t) => elt
-  let of_list: list<elt> => t
-}
-
-module Make = (Ord: OrderedType) => {
-  type elt = Ord.t
-  type rec t = Empty | Node(t, elt, t, int)
-
-  /* Sets are represented by balanced binary trees (the heights of the
-   children differ by at most 2 */
-
-  let height = x =>
-    switch x {
-    | Empty => 0
-    | Node(_, _, _, h) => h
-    }
-
-  /* Creates a new node with left son l, value v and right son r.
-       We must have all elements of l < v < all elements of r.
-       l and r must be balanced and | height l - height r | <= 2.
-       Inline expansion of height for better speed. */
-
-  let create = (l, v, r) => {
-    let hl = switch l {
-    | Empty => 0
-    | Node(_, _, _, h) => h
-    }
-    let hr = switch r {
-    | Empty => 0
-    | Node(_, _, _, h) => h
-    }
-    Node(
-      l,
-      v,
-      r,
-      if hl >= hr {
-        hl + 1
-      } else {
-        hr + 1
-      },
-    )
-  }
-
-  /* Same as create, but performs one step of rebalancing if necessary.
-       Assumes l and r balanced and | height l - height r | <= 3.
-       Inline expansion of create for better speed in the most frequent case
-       where no rebalancing is required. */
-
-  let bal = (l, v, r) => {
-    let hl = switch l {
-    | Empty => 0
-    | Node(_, _, _, h) => h
-    }
-    let hr = switch r {
-    | Empty => 0
-    | Node(_, _, _, h) => h
-    }
-    if hl > hr + 2 {
-      switch l {
-      | Empty => invalid_arg("Set.bal")
-      | Node(ll, lv, lr, _) =>
-        if height(ll) >= height(lr) {
-          create(ll, lv, create(lr, v, r))
-        } else {
-          switch lr {
-          | Empty => invalid_arg("Set.bal")
-          | Node(lrl, lrv, lrr, _) => create(create(ll, lv, lrl), lrv, create(lrr, v, r))
-          }
-        }
-      }
-    } else if hr > hl + 2 {
-      switch r {
-      | Empty => invalid_arg("Set.bal")
-      | Node(rl, rv, rr, _) =>
-        if height(rr) >= height(rl) {
-          create(create(l, v, rl), rv, rr)
-        } else {
-          switch rl {
-          | Empty => invalid_arg("Set.bal")
-          | Node(rll, rlv, rlr, _) => create(create(l, v, rll), rlv, create(rlr, rv, rr))
-          }
-        }
-      }
-    } else {
-      Node(
-        l,
-        v,
-        r,
-        if hl >= hr {
-          hl + 1
-        } else {
-          hr + 1
-        },
-      )
-    }
-  }
-
-  /* Insertion of one element */
-
-  let rec add = (x, x_) =>
-    switch x_ {
-    | Empty => Node(Empty, x, Empty, 1)
-    | Node(l, v, r, _) as t =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        t
-      } else if c < 0 {
-        bal(add(x, l), v, r)
-      } else {
-        bal(l, v, add(x, r))
-      }
-    }
-
-  let singleton = x => Node(Empty, x, Empty, 1)
-
-  /* Beware: those two functions assume that the added v is *strictly*
-       smaller (or bigger) than all the present elements in the tree; it
-       does not test for equality with the current min (or max) element.
-       Indeed, they are only used during the "join" operation which
-       respects this precondition.
- */
-
-  let rec add_min_element = (v, x) =>
-    switch x {
-    | Empty => singleton(v)
-    | Node(l, x, r, h) => bal(add_min_element(v, l), x, r)
-    }
-
-  let rec add_max_element = (v, x) =>
-    switch x {
-    | Empty => singleton(v)
-    | Node(l, x, r, h) => bal(l, x, add_max_element(v, r))
-    }
-
-  /* Same as create and bal, but no assumptions are made on the
-   relative heights of l and r. */
-
-  let rec join = (l, v, r) =>
-    switch (l, r) {
-    | (Empty, _) => add_min_element(v, r)
-    | (_, Empty) => add_max_element(v, l)
-    | (Node(ll, lv, lr, lh), Node(rl, rv, rr, rh)) =>
-      if lh > rh + 2 {
-        bal(ll, lv, join(lr, v, r))
-      } else if rh > lh + 2 {
-        bal(join(l, v, rl), rv, rr)
-      } else {
-        create(l, v, r)
-      }
-    }
-
-  /* Smallest and greatest element of a set */
-
-  let rec min_elt = x =>
-    switch x {
-    | Empty => raise(Not_found)
-    | Node(Empty, v, r, _) => v
-    | Node(l, v, r, _) => min_elt(l)
-    }
-
-  let rec max_elt = x =>
-    switch x {
-    | Empty => raise(Not_found)
-    | Node(l, v, Empty, _) => v
-    | Node(l, v, r, _) => max_elt(r)
-    }
-
-  /* Remove the smallest element of the given set */
-
-  let rec remove_min_elt = x =>
-    switch x {
-    | Empty => invalid_arg("Set.remove_min_elt")
-    | Node(Empty, v, r, _) => r
-    | Node(l, v, r, _) => bal(remove_min_elt(l), v, r)
-    }
-
-  /* Merge two trees l and r into one.
-       All elements of l must precede the elements of r.
-       Assume | height l - height r | <= 2. */
-
-  let merge = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) => bal(t1, min_elt(t2), remove_min_elt(t2))
-    }
-
-  /* Merge two trees l and r into one.
-       All elements of l must precede the elements of r.
-       No assumption on the heights of l and r. */
-
-  let concat = (t1, t2) =>
-    switch (t1, t2) {
-    | (Empty, t) => t
-    | (t, Empty) => t
-    | (_, _) => join(t1, min_elt(t2), remove_min_elt(t2))
-    }
-
-  /* Splitting.  split x s returns a triple (l, present, r) where
-        - l is the set of elements of s that are < x
-        - r is the set of elements of s that are > x
-        - present is false if s contains no element equal to x,
-          or true if s contains an element equal to x. */
-
-  let rec split = (x, x_) =>
-    switch x_ {
-    | Empty => (Empty, false, Empty)
-    | Node(l, v, r, _) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        (l, true, r)
-      } else if c < 0 {
-        let (ll, pres, rl) = split(x, l)
-        (ll, pres, join(rl, v, r))
-      } else {
-        let (lr, pres, rr) = split(x, r)
-        (join(l, v, lr), pres, rr)
-      }
-    }
-
-  /* Implementation of the set operations */
-
-  let empty = Empty
-
-  let is_empty = x =>
-    switch x {
-    | Empty => true
-    | _ => false
-    }
-
-  let rec mem = (x, x_) =>
-    switch x_ {
-    | Empty => false
-    | Node(l, v, r, _) =>
-      let c = Ord.compare(x, v)
-      c == 0 ||
-        mem(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-    }
-
-  let rec remove = (x, x_) =>
-    switch x_ {
-    | Empty => Empty
-    | Node(l, v, r, _) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        merge(l, r)
-      } else if c < 0 {
-        bal(remove(x, l), v, r)
-      } else {
-        bal(l, v, remove(x, r))
-      }
-    }
-
-  let rec union = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, t2) => t2
-    | (t1, Empty) => t1
-    | (Node(l1, v1, r1, h1), Node(l2, v2, r2, h2)) =>
-      if h1 >= h2 {
-        if h2 == 1 {
-          add(v2, s1)
-        } else {
-          let (l2, _, r2) = split(v1, s2)
-          join(union(l1, l2), v1, union(r1, r2))
-        }
-      } else if h1 == 1 {
-        add(v1, s2)
-      } else {
-        let (l1, _, r1) = split(v2, s1)
-        join(union(l1, l2), v2, union(r1, r2))
-      }
-    }
-
-  let rec inter = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, t2) => Empty
-    | (t1, Empty) => Empty
-    | (Node(l1, v1, r1, _), t2) =>
-      switch split(v1, t2) {
-      | (l2, false, r2) => concat(inter(l1, l2), inter(r1, r2))
-      | (l2, true, r2) => join(inter(l1, l2), v1, inter(r1, r2))
-      }
-    }
-
-  let rec diff = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, t2) => Empty
-    | (t1, Empty) => t1
-    | (Node(l1, v1, r1, _), t2) =>
-      switch split(v1, t2) {
-      | (l2, false, r2) => join(diff(l1, l2), v1, diff(r1, r2))
-      | (l2, true, r2) => concat(diff(l1, l2), diff(r1, r2))
-      }
-    }
-
-  type rec enumeration = End | More(elt, t, enumeration)
-
-  let rec cons_enum = (s, e) =>
-    switch s {
-    | Empty => e
-    | Node(l, v, r, _) => cons_enum(l, More(v, r, e))
-    }
-
-  let rec compare_aux = (e1, e2) =>
-    switch (e1, e2) {
-    | (End, End) => 0
-    | (End, _) => -1
-    | (_, End) => 1
-    | (More(v1, r1, e1), More(v2, r2, e2)) =>
-      let c = Ord.compare(v1, v2)
-      if c != 0 {
-        c
-      } else {
-        compare_aux(cons_enum(r1, e1), cons_enum(r2, e2))
-      }
-    }
-
-  let compare = (s1, s2) => compare_aux(cons_enum(s1, End), cons_enum(s2, End))
-
-  let equal = (s1, s2) => compare(s1, s2) == 0
-
-  let rec subset = (s1, s2) =>
-    switch (s1, s2) {
-    | (Empty, _) => true
-    | (_, Empty) => false
-    | (Node(l1, v1, r1, _), Node(l2, v2, r2, _) as t2) =>
-      let c = Ord.compare(v1, v2)
-      if c == 0 {
-        subset(l1, l2) && subset(r1, r2)
-      } else if c < 0 {
-        subset(Node(l1, v1, Empty, 0), l2) && subset(r1, t2)
-      } else {
-        subset(Node(Empty, v1, r1, 0), r2) && subset(l1, t2)
-      }
-    }
-
-  let rec iter = (f, x_) =>
-    switch x_ {
-    | Empty => ()
-    | Node(l, v, r, _) =>
-      iter(f, l)
-      f(v)
-      iter(f, r)
-    }
-
-  let rec fold = (f, s, accu) =>
-    switch s {
-    | Empty => accu
-    | Node(l, v, r, _) => fold(f, r, f(v, fold(f, l, accu)))
-    }
-
-  let rec for_all = (p, x) =>
-    switch x {
-    | Empty => true
-    | Node(l, v, r, _) => p(v) && (for_all(p, l) && for_all(p, r))
-    }
-
-  let rec exists = (p, x) =>
-    switch x {
-    | Empty => false
-    | Node(l, v, r, _) => p(v) || (exists(p, l) || exists(p, r))
-    }
-
-  let rec filter = (p, x) =>
-    switch x {
-    | Empty => Empty
-    | Node(l, v, r, _) =>
-      /* call [p] in the expected left-to-right order */
-      let l' = filter(p, l)
-      let pv = p(v)
-      let r' = filter(p, r)
-      if pv {
-        join(l', v, r')
-      } else {
-        concat(l', r')
-      }
-    }
-
-  let rec partition = (p, x) =>
-    switch x {
-    | Empty => (Empty, Empty)
-    | Node(l, v, r, _) =>
-      /* call [p] in the expected left-to-right order */
-      let (lt, lf) = partition(p, l)
-      let pv = p(v)
-      let (rt, rf) = partition(p, r)
-      if pv {
-        (join(lt, v, rt), concat(lf, rf))
-      } else {
-        (concat(lt, rt), join(lf, v, rf))
-      }
-    }
-
-  let rec cardinal = x =>
-    switch x {
-    | Empty => 0
-    | Node(l, v, r, _) => cardinal(l) + 1 + cardinal(r)
-    }
-
-  let rec elements_aux = (accu, x) =>
-    switch x {
-    | Empty => accu
-    | Node(l, v, r, _) => elements_aux(list{v, ...elements_aux(accu, r)}, l)
-    }
-
-  let elements = s => elements_aux(list{}, s)
-
-  let choose = min_elt
-
-  let rec find = (x, x_) =>
-    switch x_ {
-    | Empty => raise(Not_found)
-    | Node(l, v, r, _) =>
-      let c = Ord.compare(x, v)
-      if c == 0 {
-        v
-      } else {
-        find(
-          x,
-          if c < 0 {
-            l
-          } else {
-            r
-          },
-        )
-      }
-    }
-
-  let of_sorted_list = l => {
-    let rec sub = (n, l) =>
-      switch (n, l) {
-      | (0, l) => (Empty, l)
-      | (1, list{x0, ...l}) => (Node(Empty, x0, Empty, 1), l)
-      | (2, list{x0, x1, ...l}) => (Node(Node(Empty, x0, Empty, 1), x1, Empty, 2), l)
-      | (3, list{x0, x1, x2, ...l}) => (
-          Node(Node(Empty, x0, Empty, 1), x1, Node(Empty, x2, Empty, 1), 2),
-          l,
-        )
-      | (n, l) =>
-        let nl = n / 2
-        let (left, l) = sub(nl, l)
-        switch l {
-        | list{} => assert(false)
-        | list{mid, ...l} =>
-          let (right, l) = sub(n - nl - 1, l)
-          (create(left, mid, right), l)
-        }
-      }
-
-    fst(sub(List.length(l), l))
-  }
-
-  let of_list = l =>
-    switch l {
-    | list{} => empty
-    | list{x0} => singleton(x0)
-    | list{x0, x1} => add(x1, singleton(x0))
-    | list{x0, x1, x2} => add(x2, add(x1, singleton(x0)))
-    | list{x0, x1, x2, x3} => add(x3, add(x2, add(x1, singleton(x0))))
-    | list{x0, x1, x2, x3, x4} => add(x4, add(x3, add(x2, add(x1, singleton(x0)))))
-    | _ => of_sorted_list(List.sort_uniq(Ord.compare, l))
-    }
-}
-module N = {
-  let a = 3
-}
diff --git a/jscomp/test/test_side_effect_functor.js b/jscomp/test/test_side_effect_functor.js
deleted file mode 100644
index 89d7147..0000000
--- a/jscomp/test/test_side_effect_functor.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v = 0;
-
-v = v + 1 | 0;
-
-console.log(String(v));
-
-function unuse_v(param) {
-  return 35;
-}
-
-var h = unuse_v;
-
-exports.h = h;
-/*  Not a pure module */
diff --git a/jscomp/test/test_side_effect_functor.res b/jscomp/test/test_side_effect_functor.res
deleted file mode 100644
index a8a57df..0000000
--- a/jscomp/test/test_side_effect_functor.res
+++ /dev/null
@@ -1,21 +0,0 @@
-include (
-  {
-    module M = () => {
-      let v = ref(0)
-      {
-        incr(v)
-        print_endline(string_of_int(v.contents))
-      }
-      let u = 3
-      let use_v = () => v.contents
-      let unuse_v = () => u + 32
-    }
-
-    module N = M()
-
-    /* let v  = N.use_v */
-    let h = N.unuse_v
-  }: {
-    let h: unit => int
-  }
-)
diff --git a/jscomp/test/test_simple_include.js b/jscomp/test/test_simple_include.js
deleted file mode 100644
index 41d1457..0000000
--- a/jscomp/test/test_simple_include.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Array = require("../../lib/js/array.js");
-
-var v = {
-  contents: 32
-};
-
-v.contents = 0;
-
-var N = {
-  a: 3,
-  v: v
-};
-
-var v$1 = {
-  contents: 32
-};
-
-var NN = {
-  a: 3,
-  v: v$1
-};
-
-var make_float = $$Array.make_float;
-
-var init = $$Array.init;
-
-var make_matrix = $$Array.make_matrix;
-
-var create_matrix = $$Array.create_matrix;
-
-var append = $$Array.append;
-
-var concat = $$Array.concat;
-
-var sub = $$Array.sub;
-
-var copy = $$Array.copy;
-
-var fill = $$Array.fill;
-
-var blit = $$Array.blit;
-
-var to_list = $$Array.to_list;
-
-var of_list = $$Array.of_list;
-
-var iter = $$Array.iter;
-
-var iteri = $$Array.iteri;
-
-var map = $$Array.map;
-
-var mapi = $$Array.mapi;
-
-var fold_left = $$Array.fold_left;
-
-var fold_right = $$Array.fold_right;
-
-var iter2 = $$Array.iter2;
-
-var map2 = $$Array.map2;
-
-var for_all = $$Array.for_all;
-
-var exists = $$Array.exists;
-
-var mem = $$Array.mem;
-
-var memq = $$Array.memq;
-
-var sort = $$Array.sort;
-
-var stable_sort = $$Array.stable_sort;
-
-var fast_sort = $$Array.fast_sort;
-
-var Floatarray = $$Array.Floatarray;
-
-var a = 3;
-
-exports.make_float = make_float;
-exports.init = init;
-exports.make_matrix = make_matrix;
-exports.create_matrix = create_matrix;
-exports.append = append;
-exports.concat = concat;
-exports.sub = sub;
-exports.copy = copy;
-exports.fill = fill;
-exports.blit = blit;
-exports.to_list = to_list;
-exports.of_list = of_list;
-exports.iter = iter;
-exports.iteri = iteri;
-exports.map = map;
-exports.mapi = mapi;
-exports.fold_left = fold_left;
-exports.fold_right = fold_right;
-exports.iter2 = iter2;
-exports.map2 = map2;
-exports.for_all = for_all;
-exports.exists = exists;
-exports.mem = mem;
-exports.memq = memq;
-exports.sort = sort;
-exports.stable_sort = stable_sort;
-exports.fast_sort = fast_sort;
-exports.Floatarray = Floatarray;
-exports.N = N;
-exports.NN = NN;
-exports.a = a;
-exports.v = v;
-/*  Not a pure module */
diff --git a/jscomp/test/test_simple_include.res b/jscomp/test/test_simple_include.res
deleted file mode 100644
index 1a891ad..0000000
--- a/jscomp/test/test_simple_include.res
+++ /dev/null
@@ -1,21 +0,0 @@
-include Array
-
-include {
-  assert (1 + 2 == 3)
-  let a = 3
-}
-
-module N = {
-  /* ;; prerr_endline "hello " */
-  assert (1 + 2 == 3)
-  let a = 3
-  let v = ref(32)
-  v := 0
-}
-
-module NN = {
-  let a = 3
-  let v = ref(32)
-}
-
-include N
diff --git a/jscomp/test/test_simple_pattern_match.js b/jscomp/test/test_simple_pattern_match.js
deleted file mode 100644
index f6a8ad3..0000000
--- a/jscomp/test/test_simple_pattern_match.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Sys = require("../../lib/js/sys.js");
-
-var match;
-
-switch (Sys.os_type) {
-  case "Cygwin" :
-  case "Unix" :
-      match = [
-        1,
-        2
-      ];
-      break;
-  default:
-    match = [
-      3,
-      4
-    ];
-}
-
-var a = match[0];
-
-var b = match[1];
-
-exports.a = a;
-exports.b = b;
-/* match Not a pure module */
diff --git a/jscomp/test/test_simple_pattern_match.res b/jscomp/test/test_simple_pattern_match.res
deleted file mode 100644
index ef35367..0000000
--- a/jscomp/test/test_simple_pattern_match.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let (a, b) = switch Sys.os_type {
-| "Unix"
-| "Cygwin" => (1, 2)
-| _ => (3, 4)
-}
diff --git a/jscomp/test/test_simple_ref.js b/jscomp/test/test_simple_ref.js
deleted file mode 100644
index 82aacb5..0000000
--- a/jscomp/test/test_simple_ref.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-var v = {
-  contents: 0
-};
-
-function gen(param) {
-  v.contents = v.contents + 1 | 0;
-  return v.contents;
-}
-
-var h = {
-  contents: 0
-};
-
-var a = 0;
-
-var c = {
-  contents: 0
-};
-
-var not_real_escape = a;
-
-function real_escape(f, v) {
-  return Curry._1(f, c);
-}
-
-var u = h;
-
-exports.u = u;
-exports.gen = gen;
-exports.not_real_escape = not_real_escape;
-exports.real_escape = real_escape;
-/* No side effect */
diff --git a/jscomp/test/test_simple_ref.res b/jscomp/test/test_simple_ref.res
deleted file mode 100644
index c0b11c4..0000000
--- a/jscomp/test/test_simple_ref.res
+++ /dev/null
@@ -1,31 +0,0 @@
-include (
-  {
-    let v = ref(0)
-
-    let gen = () => {
-      incr(v)
-      v.contents
-    }
-    let h = ref(0)
-
-    let a = ref(0)
-    let c = ref(0)
-    let escape = v => v
-
-    let not_real_escape = {
-      let b = a
-      b.contents
-    }
-    let real_escape = (f, v) => {
-      let b = c
-      f(b)
-    }
-
-    let u = escape(h)
-  }: {
-    let u: ref<int>
-    let gen: unit => int
-    let not_real_escape: int
-    let real_escape: (ref<int> => unit, int) => unit
-  }
-)
diff --git a/jscomp/test/test_simple_tailcall.js b/jscomp/test/test_simple_tailcall.js
deleted file mode 100644
index 2733ac1..0000000
--- a/jscomp/test/test_simple_tailcall.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function tailcall(x) {
-  while(true) {
-    continue ;
-  };
-}
-
-function non_length(x) {
-  if (x) {
-    return 1 + non_length(x.tl) | 0;
-  } else {
-    return 0;
-  }
-}
-
-function length(_acc, _x) {
-  while(true) {
-    var x = _x;
-    var acc = _acc;
-    if (!x) {
-      return acc;
-    }
-    var tl = x.tl;
-    if (tl) {
-      return 1 + length(acc + 1 | 0, tl.tl) | 0;
-    }
-    _x = tl;
-    _acc = acc + 1 | 0;
-    continue ;
-  };
-}
-
-exports.tailcall = tailcall;
-exports.non_length = non_length;
-exports.length = length;
-/* No side effect */
diff --git a/jscomp/test/test_simple_tailcall.res b/jscomp/test/test_simple_tailcall.res
deleted file mode 100644
index 6a2d8f4..0000000
--- a/jscomp/test/test_simple_tailcall.res
+++ /dev/null
@@ -1,19 +0,0 @@
-let rec length = (acc, x) =>
-  switch x {
-  | list{} => acc
-  | list{_, ...tl} => length(acc + 1, tl)
-  }
-let rec tailcall = x => tailcall(x)
-
-let rec non_length = x =>
-  switch x {
-  | list{} => 0
-  | list{_, ...tl} => 1 + non_length(tl)
-  }
-
-let rec length = (acc, x) =>
-  switch x {
-  | list{} => acc
-  | list{x, y, ...tl} => 1 + length(acc + 1, tl)
-  | list{_, ...tl} => length(acc + 1, tl)
-  }
diff --git a/jscomp/test/test_small.js b/jscomp/test/test_small.js
deleted file mode 100644
index b833b6f..0000000
--- a/jscomp/test/test_small.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var fib = 3;
-
-var u = 3;
-
-exports.fib = fib;
-exports.u = u;
-/* No side effect */
diff --git a/jscomp/test/test_small.res b/jscomp/test/test_small.res
deleted file mode 100644
index 1cec3c4..0000000
--- a/jscomp/test/test_small.res
+++ /dev/null
@@ -1,2 +0,0 @@
-let fib = 3
-let u = fib
diff --git a/jscomp/test/test_sprintf.js b/jscomp/test/test_sprintf.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/test_sprintf.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/test_sprintf.res b/jscomp/test/test_sprintf.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/test_sprintf.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/test_stack.js b/jscomp/test/test_stack.js
deleted file mode 100644
index 4c31d78..0000000
--- a/jscomp/test/test_stack.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function v(x) {
-  return x.c === /* [] */0;
-}
-
-exports.v = v;
-/* No side effect */
diff --git a/jscomp/test/test_stack.res b/jscomp/test/test_stack.res
deleted file mode 100644
index 7e2db0e..0000000
--- a/jscomp/test/test_stack.res
+++ /dev/null
@@ -1 +0,0 @@
-let v = x => Stack.is_empty(x)
diff --git a/jscomp/test/test_static_catch_ident.js b/jscomp/test/test_static_catch_ident.js
deleted file mode 100644
index 6e9819d..0000000
--- a/jscomp/test/test_static_catch_ident.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-var Scan_failure = /* @__PURE__ */Caml_exceptions.create("Test_static_catch_ident.Scan_failure");
-
-function scanf_bad_input(ib, x) {
-  var s;
-  if (x.RE_EXN_ID === Scan_failure || x.RE_EXN_ID === "Failure") {
-    s = x._1;
-  } else {
-    throw x;
-  }
-  for(var i = 0; i <= 100; ++i){
-    console.log(s);
-    console.log("don't inlinie");
-  }
-}
-
-exports.Scan_failure = Scan_failure;
-exports.scanf_bad_input = scanf_bad_input;
-/* No side effect */
diff --git a/jscomp/test/test_static_catch_ident.res b/jscomp/test/test_static_catch_ident.res
deleted file mode 100644
index be49281..0000000
--- a/jscomp/test/test_static_catch_ident.res
+++ /dev/null
@@ -1,11 +0,0 @@
-exception Scan_failure(string)
-
-let scanf_bad_input = (ib, x) =>
-  switch x {
-  | Scan_failure(s) | Failure(s) =>
-    for i in 0 to 100 {
-      print_endline(s) /* necessary */
-      print_endline("don't inlinie")
-    }
-  | x => raise(x)
-  }
diff --git a/jscomp/test/test_string.js b/jscomp/test/test_string.js
deleted file mode 100644
index 301f034..0000000
--- a/jscomp/test/test_string.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_bytes = require("../../lib/js/caml_bytes.js");
-var Caml_string = require("../../lib/js/caml_string.js");
-
-function f(x) {
-  switch (x) {
-    case "aaaabb" :
-        return 0;
-    case "bbbb" :
-        return 1;
-    default:
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "test_string.res",
-              5,
-              17
-            ],
-            Error: new Error()
-          };
-  }
-}
-
-function a(x) {
-  return "helloworldhello" + x;
-}
-
-function b(y, x) {
-  return y + ("helloworldhello" + x);
-}
-
-function c(x, y) {
-  return x + "hellohiuhi" + y;
-}
-
-var v = "xx".length;
-
-function h(s, b) {
-  if (Caml_string.get(s, 0) === /* 'a' */97 && Caml_bytes.get(b, 0) === /* 'b' */98) {
-    return Caml_string.get(s, 1) === Caml_bytes.get(b, 2);
-  } else {
-    return false;
-  }
-}
-
-exports.f = f;
-exports.a = a;
-exports.b = b;
-exports.c = c;
-exports.v = v;
-exports.h = h;
-/* No side effect */
diff --git a/jscomp/test/test_string.res b/jscomp/test/test_string.res
deleted file mode 100644
index bf06d03..0000000
--- a/jscomp/test/test_string.res
+++ /dev/null
@@ -1,17 +0,0 @@
-let f = x =>
-  switch x {
-  | "aaaabb" => 0
-  | "bbbb" => 1
-  | _ => /* 2 */ assert(false)
-  }
-
-let a = x => "hello" ++ ("world" ++ ("hello" ++ x))
-
-let b = (y, x) => y ++ ("hello" ++ ("world" ++ ("hello" ++ x)))
-
-let c = (x, y) => x ++ "hello" ++ ("hi" ++ ("u" ++ ("hi" ++ y)))
-
-let v = String.length("xx")
-
-let h = (s: string, b: bytes) =>
-  String.get(s, 0) == 'a' && (Bytes.get(b, 0) == 'b' && String.get(s, 1) == Bytes.get(b, 2))
diff --git a/jscomp/test/test_string_case.js b/jscomp/test/test_string_case.js
deleted file mode 100644
index 617b1d1..0000000
--- a/jscomp/test/test_string_case.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  switch (x) {
-    case "abcd" :
-        return 0;
-    case "bcde" :
-        return 1;
-    default:
-      throw {
-            RE_EXN_ID: "Assert_failure",
-            _1: [
-              "test_string_case.res",
-              5,
-              9
-            ],
-            Error: new Error()
-          };
-  }
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_string_case.res b/jscomp/test/test_string_case.res
deleted file mode 100644
index 8003b11..0000000
--- a/jscomp/test/test_string_case.res
+++ /dev/null
@@ -1,10 +0,0 @@
-let f = x =>
-  switch x {
-  | "abcd" => 0
-  | "bcde" => 1
-  | _ => assert(false)
-  }
-
-/* local variables: */
-/* compile-command: "ocamlc -dlambda -c string_case.ml && js_of_ocaml string_case.cmo --pretty -o string_case.1.js" */
-/* end: */
diff --git a/jscomp/test/test_string_const.js b/jscomp/test/test_string_const.js
deleted file mode 100644
index 78cce05..0000000
--- a/jscomp/test/test_string_const.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_string = require("../../lib/js/caml_string.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var f = Caml_string.get("ghsogh", 3);
-
-var hh;
-
-try {
-  hh = Caml_string.get("ghsogh", -3);
-}
-catch (raw_e){
-  var e = Caml_js_exceptions.internalToOCamlException(raw_e);
-  if (e.RE_EXN_ID === "Invalid_argument") {
-    console.log(e._1);
-    hh = /* 'a' */97;
-  } else {
-    throw e;
-  }
-}
-
-exports.f = f;
-exports.hh = hh;
-/* hh Not a pure module */
diff --git a/jscomp/test/test_string_const.res b/jscomp/test/test_string_const.res
deleted file mode 100644
index e9b89d5..0000000
--- a/jscomp/test/test_string_const.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let f = String.get("ghsogh", 3)
-
-let hh = try String.get("ghsogh", -3) catch {
-| Invalid_argument(e) =>
-  Js.log(e)
-  'a'
-}
diff --git a/jscomp/test/test_string_map.js b/jscomp/test/test_string_map.js
deleted file mode 100644
index b749520..0000000
--- a/jscomp/test/test_string_map.js
+++ /dev/null
@@ -1,178 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var Curry = require("../../lib/js/curry.js");
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = add(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function find(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml.string_compare(x, param.v);
-    if (c === 0) {
-      return param.d;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function timing(label, f) {
-  console.time(label);
-  Curry._1(f, undefined);
-  console.timeEnd(label);
-}
-
-function assertion_test(param) {
-  var m = {
-    contents: "Empty"
-  };
-  timing("building", (function (param) {
-          for(var i = 0; i <= 1000000; ++i){
-            m.contents = add(String(i), String(i), m.contents);
-          }
-        }));
-  timing("querying", (function (param) {
-          for(var i = 0; i <= 1000000; ++i){
-            find(String(i), m.contents);
-          }
-        }));
-}
-
-exports.assertion_test = assertion_test;
-/* No side effect */
diff --git a/jscomp/test/test_string_map.res b/jscomp/test/test_string_map.res
deleted file mode 100644
index b58fc23..0000000
--- a/jscomp/test/test_string_map.res
+++ /dev/null
@@ -1,33 +0,0 @@
-include (
-  {
-    module StringMap = Map.Make({
-      type t = string
-      let compare = (x: string, y) => compare(x, y)
-    })
-    @val("console.time") external time: string => unit = ""
-    @val("console.timeEnd") external timeEnd: string => unit = ""
-
-    let timing = (label, f) => {
-      time(label)
-      f()
-      timeEnd(label)
-    }
-
-    let assertion_test = () => {
-      let m = ref(StringMap.empty)
-      let count = 1000000
-      \"@@"(timing("building"), _ =>
-        for i in 0 to count {
-          m := StringMap.add(string_of_int(i), string_of_int(i), m.contents)
-        }
-      )
-      \"@@"(timing("querying"), _ =>
-        for i in 0 to count {
-          ignore(StringMap.find(string_of_int(i), m.contents))
-        }
-      )
-    }
-  }: {
-    let assertion_test: unit => unit
-  }
-)
diff --git a/jscomp/test/test_string_switch.js b/jscomp/test/test_string_switch.js
deleted file mode 100644
index be516c2..0000000
--- a/jscomp/test/test_string_switch.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Sys = require("../../lib/js/sys.js");
-
-var os_version;
-
-switch (Sys.os_type) {
-  case "Cygwin" :
-      os_version = 2;
-      break;
-  case "Unix" :
-      os_version = 1;
-      break;
-  default:
-    os_version = 3;
-}
-
-exports.os_version = os_version;
-/* os_version Not a pure module */
diff --git a/jscomp/test/test_string_switch.res b/jscomp/test/test_string_switch.res
deleted file mode 100644
index 0f5147f..0000000
--- a/jscomp/test/test_string_switch.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let os_version = switch Sys.os_type {
-| "Unix" => 1
-| "Cygwin" => 2
-| _ => 3
-}
diff --git a/jscomp/test/test_switch.js b/jscomp/test/test_switch.js
deleted file mode 100644
index 5c53c83..0000000
--- a/jscomp/test/test_switch.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function f(x) {
-  if (typeof x !== "object") {
-    if (x === "G") {
-      return 4;
-    } else {
-      return 5;
-    }
-  }
-  switch (x.TAG) {
-    case "A" :
-        return 0;
-    case "B" :
-        return 1;
-    case "C" :
-        return 2;
-    case "F" :
-        return 3;
-    
-  }
-}
-
-function bind(x, f) {
-  if (x.TAG === "Left") {
-    return {
-            TAG: "Left",
-            _0: Curry._1(f, x._0)
-          };
-  } else {
-    return x;
-  }
-}
-
-exports.f = f;
-exports.bind = bind;
-/* No side effect */
diff --git a/jscomp/test/test_switch.res b/jscomp/test/test_switch.res
deleted file mode 100644
index 703d191..0000000
--- a/jscomp/test/test_switch.res
+++ /dev/null
@@ -1,21 +0,0 @@
-type rec u = A(int) | B(u) | C((int, int)) | F(u, int) | G | H
-
-let f = x =>
-  switch x {
-  | A(_) => 0
-  | B(_) => 1
-  | C(_) => 2
-  | F(_) => 3
-  | G => 4
-  | H => 5
-  }
-
-type result<'a, 'b> =
-  | Left('a)
-  | Error('b)
-
-let bind = (x, f) =>
-  switch x {
-  | Left(x) => Left(f(x))
-  | Error(_) as y => y
-  }
diff --git a/jscomp/test/test_trywith.js b/jscomp/test/test_trywith.js
deleted file mode 100644
index efba275..0000000
--- a/jscomp/test/test_trywith.js
+++ /dev/null
@@ -1,157 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var Out_of_memory = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Out_of_memory");
-
-var Sys_error = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Sys_error");
-
-var Stack_overflow = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Stack_overflow");
-
-var Sys_blocked_io = /* @__PURE__ */Caml_exceptions.create("Test_trywith.Sys_blocked_io");
-
-function ff(g, x) {
-  try {
-    Curry._1(g, x);
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID !== "Not_found") {
-      throw exn;
-    }
-    
-  }
-  try {
-    Curry._1(g, x);
-  }
-  catch (raw_exn$1){
-    var exn$1 = Caml_js_exceptions.internalToOCamlException(raw_exn$1);
-    if (exn$1.RE_EXN_ID !== Out_of_memory) {
-      throw exn$1;
-    }
-    
-  }
-  try {
-    Curry._1(g, x);
-  }
-  catch (raw_exn$2){
-    var exn$2 = Caml_js_exceptions.internalToOCamlException(raw_exn$2);
-    if (exn$2.RE_EXN_ID !== Sys_error) {
-      throw exn$2;
-    }
-    
-  }
-  try {
-    Curry._1(g, x);
-  }
-  catch (raw_exn$3){
-    var exn$3 = Caml_js_exceptions.internalToOCamlException(raw_exn$3);
-    if (exn$3.RE_EXN_ID !== "Invalid_argument") {
-      throw exn$3;
-    }
-    
-  }
-  try {
-    Curry._1(g, x);
-  }
-  catch (raw_exn$4){
-    var exn$4 = Caml_js_exceptions.internalToOCamlException(raw_exn$4);
-    if (exn$4.RE_EXN_ID !== "End_of_file") {
-      throw exn$4;
-    }
-    
-  }
-  try {
-    Curry._1(g, x);
-  }
-  catch (raw_exn$5){
-    var exn$5 = Caml_js_exceptions.internalToOCamlException(raw_exn$5);
-    if (exn$5.RE_EXN_ID !== "Match_failure") {
-      throw exn$5;
-    }
-    
-  }
-  try {
-    Curry._1(g, x);
-  }
-  catch (raw_exn$6){
-    var exn$6 = Caml_js_exceptions.internalToOCamlException(raw_exn$6);
-    if (exn$6.RE_EXN_ID !== Stack_overflow) {
-      throw exn$6;
-    }
-    
-  }
-  try {
-    Curry._1(g, x);
-  }
-  catch (raw_exn$7){
-    var exn$7 = Caml_js_exceptions.internalToOCamlException(raw_exn$7);
-    if (exn$7.RE_EXN_ID !== Sys_blocked_io) {
-      throw exn$7;
-    }
-    
-  }
-  try {
-    Curry._1(g, x);
-  }
-  catch (raw_exn$8){
-    var exn$8 = Caml_js_exceptions.internalToOCamlException(raw_exn$8);
-    if (exn$8.RE_EXN_ID !== "Assert_failure") {
-      throw exn$8;
-    }
-    
-  }
-  try {
-    return Curry._1(g, x);
-  }
-  catch (raw_exn$9){
-    var exn$9 = Caml_js_exceptions.internalToOCamlException(raw_exn$9);
-    if (exn$9.RE_EXN_ID === "Undefined_recursive_module") {
-      return ;
-    }
-    throw exn$9;
-  }
-}
-
-function u(param) {
-  throw {
-        RE_EXN_ID: "Not_found",
-        Error: new Error()
-      };
-}
-
-function f(x) {
-  if (typeof x !== "object") {
-    return 2;
-  }
-  if (x.TAG === "D") {
-    return 1;
-  }
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "test_trywith.res",
-          59,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-var u1 = "bad character decimal encoding \\";
-
-var v = "bad character decimal encoding \\%c%c%c";
-
-exports.Out_of_memory = Out_of_memory;
-exports.Sys_error = Sys_error;
-exports.Stack_overflow = Stack_overflow;
-exports.Sys_blocked_io = Sys_blocked_io;
-exports.ff = ff;
-exports.u = u;
-exports.u1 = u1;
-exports.v = v;
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_trywith.res b/jscomp/test/test_trywith.res
deleted file mode 100644
index 271fc25..0000000
--- a/jscomp/test/test_trywith.res
+++ /dev/null
@@ -1,60 +0,0 @@
-exception Out_of_memory
-exception Sys_error(string)
-exception Stack_overflow
-exception Sys_blocked_io
-let ff = (g, x) => {
-  try g(x) catch {
-  | Not_found => ()
-  }
-  try g(x) catch {
-  | Out_of_memory => ()
-  }
-  try g(x) catch {
-  | Sys_error(_) => ()
-  }
-  try g(x) catch {
-  | Invalid_argument(_) => ()
-  }
-  try g(x) catch {
-  | End_of_file => ()
-  }
-  try g(x) catch {
-  | Match_failure(_) => ()
-  }
-  try g(x) catch {
-  | Stack_overflow => ()
-  }
-  try g(x) catch {
-  | Sys_blocked_io => ()
-  }
-
-  try g(x) catch {
-  | Assert_failure(_) => ()
-  }
-  try g(x) catch {
-  | Undefined_recursive_module(_) => ()
-  }
-}
-
-@@warning("-21")
-
-let u = () => {
-  raise(Not_found)
-  let f = 3 + 3
-  f + f
-}
-let u1 = "bad character decimal encoding \\"
-let v = "bad character decimal encoding \\%c%c%c"
-
-/** test default branch */
-type u = A | B | C | D(int) | E(char)
-
-let f = (x: u) =>
-  switch x {
-  | D(_) => 1
-  | A
-  | B
-  | C => 2
-
-  | _ => assert(false)
-  }
diff --git a/jscomp/test/test_tuple.js b/jscomp/test/test_tuple.js
deleted file mode 100644
index eb571fc..0000000
--- a/jscomp/test/test_tuple.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var r = 0;
-
-for(var k = 1; k <= 10; ++k){
-  for(var i = 1; i <= 10; ++i){
-    var match = i % 2 === 0 ? [
-        1,
-        (i << 1)
-      ] : [
-        2,
-        Math.imul(i, 3)
-      ];
-    r = Math.imul(r, match[0]) + match[1] | 0;
-  }
-}
-
-/*  Not a pure module */
diff --git a/jscomp/test/test_tuple.res b/jscomp/test/test_tuple.res
deleted file mode 100644
index 455cfb6..0000000
--- a/jscomp/test/test_tuple.res
+++ /dev/null
@@ -1,14 +0,0 @@
-let () = {
-  let r = ref(0)
-  for k in 1 to 10 {
-    for i in 1 to 10 {
-      let (x, y) = if mod(i, 2) == 0 {
-        (1, i * 2)
-      } else {
-        (2, i * 3)
-      }
-
-      r := r.contents * x + y
-    }
-  }
-}
diff --git a/jscomp/test/test_tuple_destructring.js b/jscomp/test/test_tuple_destructring.js
deleted file mode 100644
index 9f31f9f..0000000
--- a/jscomp/test/test_tuple_destructring.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var N = {
-  b: 3
-};
-
-var v = 3;
-
-var u = 3;
-
-var h = 4;
-
-var g = 3;
-
-var gg = 4;
-
-exports.N = N;
-exports.v = v;
-exports.u = u;
-exports.h = h;
-exports.g = g;
-exports.gg = gg;
-/* No side effect */
diff --git a/jscomp/test/test_tuple_destructring.res b/jscomp/test/test_tuple_destructring.res
deleted file mode 100644
index bfafa71..0000000
--- a/jscomp/test/test_tuple_destructring.res
+++ /dev/null
@@ -1,11 +0,0 @@
-module N = {
-  let b = 3
-}
-
-let v = N.b
-
-/** TODO: 
-    (3,4) belongs to ImmutableBlock
- */
-let (u, h) = (3, 4)
-let (g, gg) = (u, h)
diff --git a/jscomp/test/test_type_based_arity.js b/jscomp/test/test_type_based_arity.js
deleted file mode 100644
index 5446551..0000000
--- a/jscomp/test/test_type_based_arity.js
+++ /dev/null
@@ -1,91 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function f0(g, x) {
-  return Curry._1(g, x);
-}
-
-function f1(g, x) {
-  Curry._1(g, x);
-}
-
-var X = {};
-
-function f2(g, x) {
-  return Curry._1(g, x);
-}
-
-function f3(g, x) {
-  Curry._1(g, x);
-}
-
-function f4(g, x) {
-  return Curry._1(g, x);
-}
-
-function f5(g, x) {
-  return Curry._1(g, x);
-}
-
-function f6(g, x) {
-  return Curry._1(g, x);
-}
-
-function f7(g, x) {
-  return Curry._1(g, x);
-}
-
-var X0 = {};
-
-function f8(g, x) {
-  return Curry._1(g, x);
-}
-
-function f9(g, x) {
-  return Curry._1(g, x);
-}
-
-function f10(g, x) {
-  return Curry._1(g, x);
-}
-
-function f11(g, x) {
-  return Curry._1(g, x);
-}
-
-function f12(g, x) {
-  return Curry._1(g, x);
-}
-
-function f13(g, x) {
-  return Curry._1(g, x);
-}
-
-var X2 = {
-  f13: f13
-};
-
-function f14(h, g, x) {
-  Curry._2(h, g, x);
-}
-
-exports.f0 = f0;
-exports.f1 = f1;
-exports.X = X;
-exports.f2 = f2;
-exports.f3 = f3;
-exports.f4 = f4;
-exports.f5 = f5;
-exports.f6 = f6;
-exports.f7 = f7;
-exports.X0 = X0;
-exports.f8 = f8;
-exports.f9 = f9;
-exports.f10 = f10;
-exports.f11 = f11;
-exports.f12 = f12;
-exports.X2 = X2;
-exports.f14 = f14;
-/* No side effect */
diff --git a/jscomp/test/test_type_based_arity.res b/jscomp/test/test_type_based_arity.res
deleted file mode 100644
index ff4dc45..0000000
--- a/jscomp/test/test_type_based_arity.res
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Checkout [Ctype.arity] [Btype.repr] 
-    [Predef]
-    
-    Note that [f g x] can also be [(f g) x] 
-    even though we get a non-function return type
- */
-
-let f0 = (g, x) => g(x)
-
-let f1 = (g, x): unit => g(x)
-
-module X: {
-  type t
-} = {
-  type t = int => int
-}
-
-let f2 = (g, x): X.t => g(x)
-
-let f3 = (g, x) => \"@@"(ignore, g(x))
-
-let f4 = (g, x): ('a, 'b) => g(x)
-
-let f5 = (g, x): list<_> => g(x)
-
-let f6 = (g, x): int => g(x)
-
-let f7 = (g, x): (_ => _) => g(x)
-
-module X0 = {
-  type t = int => int
-}
-
-let f8 = (g, x): X0.t => g(x)
-
-let f9 = (g, x): Abstract_type.t => g(x)
-
-let f10 = (g, x): Abstract_type.arrow_type => g(x)
-
-let f11 = (g, x): Abstract_type.poly_type<_> => g(x)
-
-let f12 = (g, x): Abstract_type.poly_abstract_type<_> => g(x)
-
-module X2: {
-  type t
-  let f13: ('a => t, 'a) => t
-} = {
-  type t = int => int
-  let f13 = (g, x): t => g(x)
-}
-
-let f14 = (h, g, x): unit => h(g, x)
diff --git a/jscomp/test/test_u.js b/jscomp/test/test_u.js
deleted file mode 100644
index e0205ad..0000000
--- a/jscomp/test/test_u.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  var v = x;
-  var sum = 0;
-  while(v > 0) {
-    sum = sum + v | 0;
-    v = v - 1 | 0;
-  };
-  return sum;
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_u.res b/jscomp/test/test_u.res
deleted file mode 100644
index 50e01af..0000000
--- a/jscomp/test/test_u.res
+++ /dev/null
@@ -1,9 +0,0 @@
-let f = x => {
-  let v = ref(x)
-  let sum = ref(0)
-  while v.contents > 0 {
-    sum := sum.contents + v.contents
-    decr(v)
-  }
-  sum.contents
-}
diff --git a/jscomp/test/test_unknown.js b/jscomp/test/test_unknown.js
deleted file mode 100644
index 3b5276c..0000000
--- a/jscomp/test/test_unknown.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_option = require("../../lib/js/caml_option.js");
-
-function some(x) {
-  return Caml_option.some(x);
-}
-
-function some2(x) {
-  return Caml_option.some(x);
-}
-
-var h = [
-  3,
-  2,
-  2
-];
-
-exports.some = some;
-exports.some2 = some2;
-exports.h = h;
-/* No side effect */
diff --git a/jscomp/test/test_unknown.res b/jscomp/test/test_unknown.res
deleted file mode 100644
index 7873d11..0000000
--- a/jscomp/test/test_unknown.res
+++ /dev/null
@@ -1,11 +0,0 @@
-@unboxed type rec t = unknown = Unknown(_): t
-
-let some = (x: unknown) => Some(x)
-
-let some2 = x => Some(Unknown(x))
-
-let h = [Unknown(3), Unknown(2), Unknown(Some(Unknown(2)))]
-
-@unboxed type rec t0 = Any(_): t0
-
-@unboxed type rec t1 = t0 = Any(_): t1
diff --git a/jscomp/test/test_unsafe_cmp.js b/jscomp/test/test_unsafe_cmp.js
deleted file mode 100644
index 790a292..0000000
--- a/jscomp/test/test_unsafe_cmp.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x, y) {
-  return [
-          x < y,
-          x <= y,
-          x > y,
-          x >= y
-        ];
-}
-
-function ff(x, y) {
-  if (x < y) {
-    return 1;
-  } else {
-    return 2;
-  }
-}
-
-exports.f = f;
-exports.ff = ff;
-/* No side effect */
diff --git a/jscomp/test/test_unsafe_cmp.res b/jscomp/test/test_unsafe_cmp.res
deleted file mode 100644
index ab65ea9..0000000
--- a/jscomp/test/test_unsafe_cmp.res
+++ /dev/null
@@ -1,11 +0,0 @@
-let f = (x, y) => {
-  open Js
-  (unsafe_lt(x, y), unsafe_le(x, y), unsafe_gt(x, y), unsafe_ge(x, y))
-}
-
-let ff = (x, y) =>
-  if Js.unsafe_lt(x, y) {
-    1
-  } else {
-    2
-  }
diff --git a/jscomp/test/test_unsafe_obj_ffi.js b/jscomp/test/test_unsafe_obj_ffi.js
deleted file mode 100644
index 2f4592c..0000000
--- a/jscomp/test/test_unsafe_obj_ffi.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  return x.height + x.width | 0;
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/test_unsafe_obj_ffi.res b/jscomp/test/test_unsafe_obj_ffi.res
deleted file mode 100644
index 36e3d36..0000000
--- a/jscomp/test/test_unsafe_obj_ffi.res
+++ /dev/null
@@ -1,63 +0,0 @@
-/* open Js_internalOO */
-
-let f = x => x["height"] + x["width"]
-
-let h = (x): unit => {
-  x["height"] = 3
-  x["width"] = 3
-}
-
-/* can not write set api without syntax extension, any more
- */
-
-/*
-imagine you have 
-   {[
-     let h = x ##_set_height in 
-     h 3 (* this does not make sense *)
-   ]}
-
-the type should be 
-   {[
-       < _set_height : int -> unit>      
-   ]}
-or 
-   {[
-     < _set_height : (int, unit) t > 
-   ]}   
-
-so {[
-     x #. height ;
-     x ## _set_height 3;
-     x ## hey (1,2,3);
-     x ## hey [| 1;2;3 |]
-   ]}
-
-we can not use tuple since ambiguity (there is no single tuple), 
-list or array is okay, prefer array to list 
-
-other edge cases 
-   {[ x ## hey A.[| 1;2;3;4 |] ]}
-
-so x will be of type 
-   {[
-     < _set_height : int -> unit ,
-       hey : (int * int * int * unit) t ;
-     ..     
-     >     
-   ]}
-
-For the invariant, we can force [_set_*]
-
-also try to make it still work for 
-   {[
-     x # _set_height 3 
-   ]}
-
-we introduce special syntax for property ready is mainly to distinguish
-such cases,
-if it is already a property read, there ? how about 
-
-   {[ x #.property_fun 1 2   ]} 
-this is mostly an error in FFI binding
-*/
\ No newline at end of file
diff --git a/jscomp/test/test_unsafe_obj_ffi.resi b/jscomp/test/test_unsafe_obj_ffi.resi
deleted file mode 100644
index 710f703..0000000
--- a/jscomp/test/test_unsafe_obj_ffi.resi
+++ /dev/null
@@ -1 +0,0 @@
-let f: {.."height": int, "width": int} => int
diff --git a/jscomp/test/test_unsafe_obj_ffi_ppx.js b/jscomp/test/test_unsafe_obj_ffi_ppx.js
deleted file mode 100644
index fab0000..0000000
--- a/jscomp/test/test_unsafe_obj_ffi_ppx.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(x) {
-  return x.length + x.width;
-}
-
-function chain(x) {
-  return x.element.length + x.element.length | 0;
-}
-
-exports.f = f;
-exports.chain = chain;
-/* No side effect */
diff --git a/jscomp/test/test_unsafe_obj_ffi_ppx.res b/jscomp/test/test_unsafe_obj_ffi_ppx.res
deleted file mode 100644
index 3100760..0000000
--- a/jscomp/test/test_unsafe_obj_ffi_ppx.res
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-let f = x => x["length"] +. x["width"]
-let i = () => ()
-
-let h = (x): unit => {
-  x["height"] = 3
-  \"@@"(i, x["width"] = 3)
-}
-
-let chain = x => x["element"]["length"] + x["element"]["length"]
-
-/* current error message : 
-   Error: '##' is not a valid value identifier.
-*/
-/* let syntax_error x = */
-/* x ## _set_height 3 3 */
-
-let g = x => {
-  let () = x["method1"](3)
-  x["method2"](3, 3)
-}
diff --git a/jscomp/test/test_unsafe_obj_ffi_ppx.resi b/jscomp/test/test_unsafe_obj_ffi_ppx.resi
deleted file mode 100644
index 638f813..0000000
--- a/jscomp/test/test_unsafe_obj_ffi_ppx.resi
+++ /dev/null
@@ -1,3 +0,0 @@
-let f: {.."length": float, "width": float} => float
-
-let chain: {.."element": {.."length": int}} => int
diff --git a/jscomp/test/test_unsupported_primitive.js b/jscomp/test/test_unsupported_primitive.js
deleted file mode 100644
index a6d2728..0000000
--- a/jscomp/test/test_unsupported_primitive.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml_external_polyfill = require("../../lib/js/caml_external_polyfill.js");
-
-function to_buffer(buff, ofs, len, v, flags) {
-  if (ofs < 0 || len < 0 || ofs > (buff.length - len | 0)) {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Marshal.to_buffer: substring out of bounds",
-          Error: new Error()
-        };
-  }
-  return Caml_external_polyfill.resolve("caml_output_value_to_buffer")(buff, ofs, len, v, flags);
-}
-
-exports.to_buffer = to_buffer;
-/* No side effect */
diff --git a/jscomp/test/test_unsupported_primitive.res b/jscomp/test/test_unsupported_primitive.res
deleted file mode 100644
index 8120d92..0000000
--- a/jscomp/test/test_unsupported_primitive.res
+++ /dev/null
@@ -1,14 +0,0 @@
-type extern_flags =
-  | No_sharing
-  | Closures
-  | Compat_32
-
-external to_buffer_unsafe: (bytes, int, int, 'a, list<extern_flags>) => int =
-  "?caml_output_value_to_buffer"
-
-let to_buffer = (buff, ofs, len, v, flags) =>
-  if ofs < 0 || (len < 0 || ofs > Bytes.length(buff) - len) {
-    invalid_arg("Marshal.to_buffer: substring out of bounds")
-  } else {
-    to_buffer_unsafe(buff, ofs, len, v, flags)
-  }
diff --git a/jscomp/test/test_while_closure.js b/jscomp/test/test_while_closure.js
deleted file mode 100644
index 430c530..0000000
--- a/jscomp/test/test_while_closure.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var $$Array = require("../../lib/js/array.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_array = require("../../lib/js/caml_array.js");
-
-var v = {
-  contents: 0
-};
-
-var arr = Caml_array.make(10, (function (param) {
-        
-      }));
-
-function f(param) {
-  var n = 0;
-  while(n < 10) {
-    var j = n;
-    Caml_array.set(arr, j, (function(j){
-        return function (param) {
-          v.contents = v.contents + j | 0;
-        }
-        }(j)));
-    n = n + 1 | 0;
-  };
-}
-
-f();
-
-$$Array.iter((function (x) {
-        Curry._1(x, undefined);
-      }), arr);
-
-console.log(String(v.contents));
-
-if (v.contents !== 45) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "test_while_closure.res",
-          55,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var count = 10;
-
-exports.v = v;
-exports.count = count;
-exports.arr = arr;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/test_while_closure.res b/jscomp/test/test_while_closure.res
deleted file mode 100644
index a0981d3..0000000
--- a/jscomp/test/test_while_closure.res
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Test when i is captured 
-    {[
-    ((fun _ -> j = i; (fun _ -> v := !v + j)) ())
-    ]}
-
-    babel does this way:
-{[
-var arr = []
-var f = function(){
-  for(let i = 0; i < 10 ; ++ i){
-    arr [i] = ()=>{console.log(i)}
-    
-  }
-}]}
-
-
-{[
-var arr = [];
-var f = function f() {
-  var _loop = function (i) {
-    arr[i] = function () {
-      console.log(i);
-    };
-  };
-
-  for (var i = 0; i < 10; ++i) {
-    _loop(i);
-  }
-};
-]}    
-
-This means inline is tricky in javascript, here we try to inline [_loop]?
-
-    
-
-
- */
-
-let v = ref(0)
-let count = 10
-let arr = Array.make(count, _ => ())
-let f = () => {
-  let n = ref(0)
-  while n.contents < count {
-    let j = n.contents
-    arr[j] = _ => v := v.contents + j
-    incr(n)
-  }
-}
-
-let () = {
-  f()
-  Array.iter(x => x(), arr)
-  print_endline(string_of_int(v.contents))
-  assert (v.contents == 45)
-}
diff --git a/jscomp/test/test_while_side_effect.js b/jscomp/test/test_while_side_effect.js
deleted file mode 100644
index 2539827..0000000
--- a/jscomp/test/test_while_side_effect.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var v = {
-  contents: 0
-};
-
-while(console.log(String(v.contents)), v.contents = v.contents + 1 | 0, v.contents < 10) {
-  
-};
-
-function fib(x) {
-  if (x === 0 || x === 1) {
-    return 1;
-  } else {
-    return fib(x - 1 | 0) + fib(x - 2 | 0) | 0;
-  }
-}
-
-var x = {
-  contents: 3
-};
-
-while((function () {
-        var y = 3;
-        console.log(String(x.contents));
-        y = y + 1 | 0;
-        x.contents = x.contents + 1 | 0;
-        return (fib(x.contents) + fib(x.contents) | 0) < 20;
-      })()) {
-  console.log(String(3));
-};
-
-exports.v = v;
-exports.fib = fib;
-exports.x = x;
-/*  Not a pure module */
diff --git a/jscomp/test/test_while_side_effect.res b/jscomp/test/test_while_side_effect.res
deleted file mode 100644
index a1a1701..0000000
--- a/jscomp/test/test_while_side_effect.res
+++ /dev/null
@@ -1,26 +0,0 @@
-let v = ref(0)
-
-while {
-  print_endline(string_of_int(v.contents))
-  incr(v)
-  v.contents < 10
-} {
-  ignore()
-}
-let rec fib = x =>
-  switch x {
-  | 0 | 1 => 1
-  | n => fib(n - 1) + fib(n - 2)
-  }
-
-let x = ref(3)
-
-while {
-  let y = ref(3)
-  print_endline(string_of_int(x.contents))
-  incr(y)
-  incr(x)
-  fib(x.contents) + fib(x.contents) < 20
-} {
-  print_endline(string_of_int(3))
-}
diff --git a/jscomp/test/test_zero_nullable.js b/jscomp/test/test_zero_nullable.js
deleted file mode 100644
index 8feee60..0000000
--- a/jscomp/test/test_zero_nullable.js
+++ /dev/null
@@ -1,308 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f1(x) {
-  if (x !== null) {
-    return x + 1 | 0;
-  } else {
-    return 3;
-  }
-}
-
-function f2(x) {
-  if (x !== null) {
-    return x + 1 | 0;
-  } else {
-    return 3;
-  }
-}
-
-function f5(h, x) {
-  var u = Curry._1(h, 32);
-  if (u !== null) {
-    return u + 1 | 0;
-  } else {
-    return 3;
-  }
-}
-
-function f4(h, x) {
-  var u = Curry._1(h, 32);
-  var v = 32 + x | 0;
-  if (u !== null) {
-    return u + 1 | 0;
-  } else {
-    return 1 + v | 0;
-  }
-}
-
-function f6(x, y) {
-  return x === y;
-}
-
-function f7(x) {
-  return x;
-}
-
-function f8(x) {
-  if (x !== null) {
-    if (x !== null) {
-      return 0;
-    } else {
-      return 1;
-    }
-  } else {
-    return 2;
-  }
-}
-
-var u = f8(undefined);
-
-function f9(x) {
-  if (x === null) {
-    return ;
-  } else {
-    return Caml_option.some(x);
-  }
-}
-
-function f10(x) {
-  return x === null;
-}
-
-var f11 = false;
-
-var Test_null = {
-  f1: f1,
-  f2: f2,
-  f5: f5,
-  f4: f4,
-  f6: f6,
-  f7: f7,
-  f8: f8,
-  u: u,
-  f9: f9,
-  f10: f10,
-  f11: f11
-};
-
-function f1$1(x) {
-  if (x !== undefined) {
-    return x + 1 | 0;
-  } else {
-    return 3;
-  }
-}
-
-function f2$1(x) {
-  if (x !== undefined) {
-    return x + 1 | 0;
-  } else {
-    return 3;
-  }
-}
-
-function f5$1(h, x) {
-  var u = Curry._1(h, 32);
-  if (u !== undefined) {
-    return u + 1 | 0;
-  } else {
-    return 3;
-  }
-}
-
-function f4$1(h, x) {
-  var u = Curry._1(h, 32);
-  var v = 32 + x | 0;
-  if (u !== undefined) {
-    return u + 1 | 0;
-  } else {
-    return 1 + v | 0;
-  }
-}
-
-function f6$1(x, y) {
-  return x === y;
-}
-
-function f7$1(x) {
-  return x;
-}
-
-function f8$1(x) {
-  if (x !== undefined) {
-    if (x !== undefined) {
-      return 0;
-    } else {
-      return 1;
-    }
-  } else {
-    return 2;
-  }
-}
-
-var u$1 = f8$1(undefined);
-
-function f9$1(x) {
-  if (x === undefined) {
-    return ;
-  } else {
-    return Caml_option.some(x);
-  }
-}
-
-function f10$1(x) {
-  return x === undefined;
-}
-
-var f11$1 = false;
-
-var Test_def = {
-  f1: f1$1,
-  f2: f2$1,
-  f5: f5$1,
-  f4: f4$1,
-  f6: f6$1,
-  f7: f7$1,
-  f8: f8$1,
-  u: u$1,
-  f9: f9$1,
-  f10: f10$1,
-  f11: f11$1
-};
-
-function f1$2(x) {
-  if (x == null) {
-    return 3;
-  } else {
-    return x + 1 | 0;
-  }
-}
-
-function f2$2(x) {
-  if (x == null) {
-    return 3;
-  } else {
-    return x + 1 | 0;
-  }
-}
-
-function f5$2(h, x) {
-  var u = Curry._1(h, 32);
-  if (u == null) {
-    return 3;
-  } else {
-    return u + 1 | 0;
-  }
-}
-
-function f4$2(h, x) {
-  var u = Curry._1(h, 32);
-  var v = 32 + x | 0;
-  if (u == null) {
-    return 1 + v | 0;
-  } else {
-    return u + 1 | 0;
-  }
-}
-
-function f6$2(x, y) {
-  return x === y;
-}
-
-function f7$2(x) {
-  return x;
-}
-
-function f8$2(x) {
-  if (x == null) {
-    return 2;
-  } else if (x == null) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-var u$2 = f8$2(undefined);
-
-function f9$2(x) {
-  if (x == null) {
-    return ;
-  } else {
-    return Caml_option.some(x);
-  }
-}
-
-function f10$2(x) {
-  return x == null;
-}
-
-var f11$2 = false;
-
-var Test_null_def = {
-  f1: f1$2,
-  f2: f2$2,
-  f5: f5$2,
-  f4: f4$2,
-  f6: f6$2,
-  f7: f7$2,
-  f8: f8$2,
-  u: u$2,
-  f9: f9$2,
-  f10: f10$2,
-  f11: f11$2
-};
-
-eq("File \"test_zero_nullable.res\", line 244, characters 5-12", f1$2(0), 1);
-
-eq("File \"test_zero_nullable.res\", line 245, characters 5-12", f1$2(null), 3);
-
-eq("File \"test_zero_nullable.res\", line 246, characters 5-12", f1$2(undefined), 3);
-
-eq("File \"test_zero_nullable.res\", line 248, characters 5-12", f1(0), 1);
-
-eq("File \"test_zero_nullable.res\", line 249, characters 5-12", f1(null), 3);
-
-eq("File \"test_zero_nullable.res\", line 251, characters 5-12", f1$1(0), 1);
-
-eq("File \"test_zero_nullable.res\", line 252, characters 5-12", f1$1(undefined), 3);
-
-Mt.from_pair_suites("Test_zero_nullable", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.Test_null = Test_null;
-exports.Test_def = Test_def;
-exports.Test_null_def = Test_null_def;
-/* u Not a pure module */
diff --git a/jscomp/test/test_zero_nullable.res b/jscomp/test/test_zero_nullable.res
deleted file mode 100644
index d181bec..0000000
--- a/jscomp/test/test_zero_nullable.res
+++ /dev/null
@@ -1,255 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-module Test_null = {
-  let f1 = x =>
-    switch Js.Null.toOption(x) {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, 2)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-
-  let f2 = x => {
-    let u = Js.Null.toOption(x)
-    switch u {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, 2)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-  }
-
-  let f5 = (h, x) => {
-    let u = \"@@"(Js.Null.toOption, h(32))
-    switch u {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, 2)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-  }
-
-  let f4 = (h, x) => {
-    let u = \"@@"(Js.Null.toOption, h(32))
-    let v = 32 + x
-    switch u {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, v)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-  }
-
-  let f6 = (x, y) => x === y
-
-  let f7 = x =>
-    switch Some(x) {
-    | None => None
-    | Some(x) => x
-    }
-
-  /* can [from_opt x ]  generate [Some None] which has type ['a Js.opt Js.opt] ?
-   No, if [x] is [null] then None else [Some x]
-*/
-  let f8 = (x: Js.Null.t<Js.Null.t<'a>>) =>
-    switch Js.Null.toOption(x) {
-    | Some(x) =>
-      switch Js.Null.toOption(x) {
-      | Some(_) => 0
-      | None => 1
-      }
-    | None => 2
-    }
-
-  let u = f8(Js.Null.return(Js.Null.return(None)))
-
-  let f9 = x => Js.Null.toOption(x)
-
-  let f10 = x => x == Js.null
-
-  let f11 = Js.Null.return(3) == Js.null
-}
-
-module Test_def = {
-  let f1 = x =>
-    switch Js.Undefined.toOption(x) {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, 2)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-
-  let f2 = x => {
-    let u = Js.Undefined.toOption(x)
-    switch u {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, 2)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-  }
-
-  let f5 = (h, x) => {
-    let u = \"@@"(Js.Undefined.toOption, h(32))
-    switch u {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, 2)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-  }
-
-  let f4 = (h, x) => {
-    let u = \"@@"(Js.Undefined.toOption, h(32))
-    let v = 32 + x
-    switch u {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, v)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-  }
-
-  let f6 = (x, y) => x === y
-
-  let f7 = x =>
-    switch Some(x) {
-    | None => None
-    | Some(x) => x
-    }
-
-  /* can [from_def x ]  generate [Some None] which has type ['a Js.opt Js.opt] ?
-     No, if [x] is [null] then None else [Some x]
- */
-  let f8 = x =>
-    switch Js.Undefined.toOption(x) {
-    | Some(x) =>
-      switch Js.Undefined.toOption(x) {
-      | Some(_) => 0
-      | None => 1
-      }
-    | None => 2
-    }
-
-  let u = f8(Js.Undefined.return(Js.Undefined.return(None)))
-
-  let f9 = x => Js.Undefined.toOption(x)
-
-  let f10 = x => x == Js.undefined
-  let f11 = Js.Undefined.return(3) == Js.undefined
-}
-
-module Test_null_def = {
-  open Js.Null_undefined
-  let f1 = x =>
-    switch toOption(x) {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, 2)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-
-  let f2 = x => {
-    let u = toOption(x)
-    switch u {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, 2)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-  }
-
-  let f5 = (h, x) => {
-    let u = \"@@"(toOption, h(32))
-    switch u {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, 2)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-  }
-
-  let f4 = (h, x) => {
-    let u = \"@@"(toOption, h(32))
-    let v = 32 + x
-    switch u {
-    | None =>
-      let sum = (x, y) => x + y
-      sum(1, v)
-    | Some(x) =>
-      let sum = (x, y) => x + y
-      sum(x, 1)
-    }
-  }
-
-  let f6 = (x, y) => x === y
-
-  let f7 = x =>
-    switch Some(x) {
-    | None => None
-    | Some(x) => x
-    }
-
-  /* can [from_opt x ]  generate [Some None] which has type ['a Js.opt Js.opt] ?
-     No, if [x] is [null] then None else [Some x]
- */
-  let f8 = (x: t<t<'a>>) =>
-    switch toOption(x) {
-    | Some(x) =>
-      switch toOption(x) {
-      | Some(_) => 0
-      | None => 1
-      }
-    | None => 2
-    }
-
-  let u = f8(return(return(None)))
-
-  let f9 = x => toOption(x)
-
-  let f10 = x => isNullable(x)
-
-  let f11 = \"@@"(isNullable, return(3))
-}
-
-let () = {
-  eq(__LOC__, Test_null_def.f1(Js.Null_undefined.return(0)), 1)
-  eq(__LOC__, Test_null_def.f1(%raw("null")), 3)
-  eq(__LOC__, Test_null_def.f1(%raw("undefined")), 3)
-
-  eq(__LOC__, Test_null.f1(Js.Null.return(0)), 1)
-  eq(__LOC__, Test_null.f1(%raw("null")), 3)
-
-  eq(__LOC__, Test_def.f1(Js.Undefined.return(0)), 1)
-  eq(__LOC__, Test_def.f1(%raw("undefined")), 3)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/then_mangle_test.js b/jscomp/test/then_mangle_test.js
deleted file mode 100644
index 3a80c8e..0000000
--- a/jscomp/test/then_mangle_test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function then(a, b) {
-  console.log("no inline");
-  return Math.imul(a, a) + Math.imul(b, b) | 0;
-}
-
-eq("File \"then_mangle_test.res\", line 14, characters 3-10", then(1, 2), 5);
-
-Mt.from_pair_suites("then_mangle_test.res", suites.contents);
-
-/*  Not a pure module */
diff --git a/jscomp/test/then_mangle_test.res b/jscomp/test/then_mangle_test.res
deleted file mode 100644
index dcc8fa8..0000000
--- a/jscomp/test/then_mangle_test.res
+++ /dev/null
@@ -1,17 +0,0 @@
-@@config({no_export})
-
-let suites :  ref<Mt.pair_suites> = ref (list{})
-let test_id = ref(0)
-
-let {eq_suites} = module (Mt)
-let eq = (loc,x,y) => eq_suites(loc,x,y,~test_id,~suites)
-
-let then = (a,b)=>{
-    Js.log("no inline")
-    a*a+b*b
-}
-
-eq(__LOC__,then(1,2),5)
-
-
-Mt.from_pair_suites(__FILE__ ,suites.contents)
\ No newline at end of file
diff --git a/jscomp/test/ticker.js b/jscomp/test/ticker.js
deleted file mode 100644
index 7ba853f..0000000
--- a/jscomp/test/ticker.js
+++ /dev/null
@@ -1,1443 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var $$String = require("../../lib/js/string.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_format = require("../../lib/js/caml_format.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function split(delim, s) {
-  var len = s.length;
-  if (len !== 0) {
-    var _l = /* [] */0;
-    var _x = len;
-    while(true) {
-      var x = _x;
-      var l = _l;
-      if (x === 0) {
-        return l;
-      }
-      var i$p;
-      try {
-        i$p = $$String.rindex_from(s, x - 1 | 0, delim);
-      }
-      catch (raw_exn){
-        var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-        if (exn.RE_EXN_ID === "Not_found") {
-          return {
-                  hd: $$String.sub(s, 0, x),
-                  tl: l
-                };
-        }
-        throw exn;
-      }
-      var l_0 = $$String.sub(s, i$p + 1 | 0, (x - i$p | 0) - 1 | 0);
-      var l$1 = {
-        hd: l_0,
-        tl: l
-      };
-      var l$2 = i$p === 0 ? ({
-            hd: "",
-            tl: l$1
-          }) : l$1;
-      _x = i$p;
-      _l = l$2;
-      continue ;
-    };
-  } else {
-    return /* [] */0;
-  }
-}
-
-function string_of_float_option(x) {
-  if (x !== undefined) {
-    return Pervasives.string_of_float(x);
-  } else {
-    return "nan";
-  }
-}
-
-var Util = {
-  split: split,
-  string_of_float_option: string_of_float_option
-};
-
-function string_of_rank(x) {
-  if (typeof x !== "object") {
-    if (x === "Uninitialized") {
-      return "Uninitialized";
-    } else {
-      return "Visited";
-    }
-  } else {
-    return "Ranked(" + x._0 + ")";
-  }
-}
-
-function find_ticker_by_name(all_tickers, ticker) {
-  return List.find((function (param) {
-                return param.ticker_name === ticker;
-              }), all_tickers);
-}
-
-function print_all_composite(all_tickers) {
-  List.iter((function (x) {
-          var tmp = x.type_;
-          if (typeof tmp !== "object") {
-            return ;
-          }
-          console.log(x.ticker_name);
-        }), all_tickers);
-}
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, x, d, r) {
-  var hl = height(l);
-  var hr = height(r);
-  return {
-          TAG: "Node",
-          l: l,
-          v: x,
-          d: d,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function singleton(x, d) {
-  return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          d: d,
-          r: "Empty",
-          h: 1
-        };
-}
-
-function bal(l, x, d, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Map.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var ld = l.d;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, ld, create(lr, x, d, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, ld, lr.l), lr.v, lr.d, create(lr.r, x, d, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: x,
-            d: d,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rd = r.d;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, x, d, rl), rv, rd, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, x, d, rl.l), rl.v, rl.d, create(rl.r, rv, rd, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Map.bal",
-        Error: new Error()
-      };
-}
-
-function is_empty(param) {
-  if (typeof param !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function add(x, data, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            d: data,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml_obj.compare(x, v);
-  if (c === 0) {
-    if (d === data) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = add(x, data, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = add(x, data, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function find(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var c = Caml_obj.compare(x, param.v);
-    if (c === 0) {
-      return param.d;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function find_first(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_first_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_last(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_last_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _d0 = param.d;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var d0 = _d0;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return [
-                  v0,
-                  d0
-                ];
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _d0 = param$1.d;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_opt(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var c = Caml_obj.compare(x, param.v);
-    if (c === 0) {
-      return Caml_option.some(param.d);
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function mem(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    var c = Caml_obj.compare(x, param.v);
-    if (c === 0) {
-      return true;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function min_binding(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function min_binding_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function max_binding(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function max_binding_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return [
-              param.v,
-              param.d
-            ];
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function remove_min_binding(param) {
-  if (typeof param !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Map.remove_min_elt",
-          Error: new Error()
-        };
-  }
-  var l = param.l;
-  if (typeof l !== "object") {
-    return param.r;
-  } else {
-    return bal(remove_min_binding(l), param.v, param.d, param.r);
-  }
-}
-
-function merge(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  }
-  if (typeof t2 !== "object") {
-    return t1;
-  }
-  var match = min_binding(t2);
-  return bal(t1, match[0], match[1], remove_min_binding(t2));
-}
-
-function remove(x, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml_obj.compare(x, v);
-  if (c === 0) {
-    return merge(l, r);
-  }
-  if (c < 0) {
-    var ll = remove(x, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = remove(x, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function update(x, f, param) {
-  if (typeof param !== "object") {
-    var data = Curry._1(f, undefined);
-    if (data !== undefined) {
-      return {
-              TAG: "Node",
-              l: "Empty",
-              v: x,
-              d: Caml_option.valFromOption(data),
-              r: "Empty",
-              h: 1
-            };
-    } else {
-      return "Empty";
-    }
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml_obj.compare(x, v);
-  if (c === 0) {
-    var data$1 = Curry._1(f, Caml_option.some(d));
-    if (data$1 === undefined) {
-      return merge(l, r);
-    }
-    var data$2 = Caml_option.valFromOption(data$1);
-    if (d === data$2) {
-      return param;
-    } else {
-      return {
-              TAG: "Node",
-              l: l,
-              v: x,
-              d: data$2,
-              r: r,
-              h: param.h
-            };
-    }
-  }
-  if (c < 0) {
-    var ll = update(x, f, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, d, r);
-    }
-  }
-  var rr = update(x, f, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, d, rr);
-  }
-}
-
-function iter(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    iter(f, param.l);
-    Curry._2(f, param.v, param.d);
-    _param = param.r;
-    continue ;
-  };
-}
-
-function map(f, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var l$p = map(f, param.l);
-  var d$p = Curry._1(f, param.d);
-  var r$p = map(f, param.r);
-  return {
-          TAG: "Node",
-          l: l$p,
-          v: param.v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
-}
-
-function mapi(f, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var v = param.v;
-  var l$p = mapi(f, param.l);
-  var d$p = Curry._2(f, v, param.d);
-  var r$p = mapi(f, param.r);
-  return {
-          TAG: "Node",
-          l: l$p,
-          v: v,
-          d: d$p,
-          r: r$p,
-          h: param.h
-        };
-}
-
-function fold(f, _m, _accu) {
-  while(true) {
-    var accu = _accu;
-    var m = _m;
-    if (typeof m !== "object") {
-      return accu;
-    }
-    _accu = Curry._3(f, m.v, m.d, fold(f, m.l, accu));
-    _m = m.r;
-    continue ;
-  };
-}
-
-function for_all(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return true;
-    }
-    if (!Curry._2(p, param.v, param.d)) {
-      return false;
-    }
-    if (!for_all(p, param.l)) {
-      return false;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function exists(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    if (Curry._2(p, param.v, param.d)) {
-      return true;
-    }
-    if (exists(p, param.l)) {
-      return true;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function add_min_binding(k, x, param) {
-  if (typeof param !== "object") {
-    return singleton(k, x);
-  } else {
-    return bal(add_min_binding(k, x, param.l), param.v, param.d, param.r);
-  }
-}
-
-function add_max_binding(k, x, param) {
-  if (typeof param !== "object") {
-    return singleton(k, x);
-  } else {
-    return bal(param.l, param.v, param.d, add_max_binding(k, x, param.r));
-  }
-}
-
-function join(l, v, d, r) {
-  if (typeof l !== "object") {
-    return add_min_binding(v, d, r);
-  }
-  var lh = l.h;
-  if (typeof r !== "object") {
-    return add_max_binding(v, d, l);
-  }
-  var rh = r.h;
-  if (lh > (rh + 2 | 0)) {
-    return bal(l.l, l.v, l.d, join(l.r, v, d, r));
-  } else if (rh > (lh + 2 | 0)) {
-    return bal(join(l, v, d, r.l), r.v, r.d, r.r);
-  } else {
-    return create(l, v, d, r);
-  }
-}
-
-function concat(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  }
-  if (typeof t2 !== "object") {
-    return t1;
-  }
-  var match = min_binding(t2);
-  return join(t1, match[0], match[1], remove_min_binding(t2));
-}
-
-function concat_or_join(t1, v, d, t2) {
-  if (d !== undefined) {
-    return join(t1, v, Caml_option.valFromOption(d), t2);
-  } else {
-    return concat(t1, t2);
-  }
-}
-
-function split$1(x, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            undefined,
-            "Empty"
-          ];
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml_obj.compare(x, v);
-  if (c === 0) {
-    return [
-            l,
-            Caml_option.some(d),
-            r
-          ];
-  }
-  if (c < 0) {
-    var match = split$1(x, l);
-    return [
-            match[0],
-            match[1],
-            join(match[2], v, d, r)
-          ];
-  }
-  var match$1 = split$1(x, r);
-  return [
-          join(l, v, d, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
-}
-
-function merge$1(f, s1, s2) {
-  if (typeof s1 !== "object") {
-    if (typeof s2 !== "object") {
-      return "Empty";
-    }
-    
-  } else {
-    var v1 = s1.v;
-    if (s1.h >= height(s2)) {
-      var match = split$1(v1, s2);
-      return concat_or_join(merge$1(f, s1.l, match[0]), v1, Curry._3(f, v1, Caml_option.some(s1.d), match[1]), merge$1(f, s1.r, match[2]));
-    }
-    
-  }
-  if (typeof s2 !== "object") {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "map.res",
-            552,
-            11
-          ],
-          Error: new Error()
-        };
-  }
-  var v2 = s2.v;
-  var match$1 = split$1(v2, s1);
-  return concat_or_join(merge$1(f, match$1[0], s2.l), v2, Curry._3(f, v2, match$1[1], Caml_option.some(s2.d)), merge$1(f, match$1[2], s2.r));
-}
-
-function union(f, s1, s2) {
-  if (typeof s1 !== "object") {
-    return s2;
-  }
-  var d1 = s1.d;
-  var v1 = s1.v;
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var d2 = s2.d;
-  var v2 = s2.v;
-  if (s1.h >= s2.h) {
-    var match = split$1(v1, s2);
-    var d2$1 = match[1];
-    var l = union(f, s1.l, match[0]);
-    var r = union(f, s1.r, match[2]);
-    if (d2$1 !== undefined) {
-      return concat_or_join(l, v1, Curry._3(f, v1, d1, Caml_option.valFromOption(d2$1)), r);
-    } else {
-      return join(l, v1, d1, r);
-    }
-  }
-  var match$1 = split$1(v2, s1);
-  var d1$1 = match$1[1];
-  var l$1 = union(f, match$1[0], s2.l);
-  var r$1 = union(f, match$1[2], s2.r);
-  if (d1$1 !== undefined) {
-    return concat_or_join(l$1, v2, Curry._3(f, v2, Caml_option.valFromOption(d1$1), d2), r$1);
-  } else {
-    return join(l$1, v2, d2, r$1);
-  }
-}
-
-function filter(p, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var d = param.d;
-  var v = param.v;
-  var l = param.l;
-  var l$p = filter(p, l);
-  var pvd = Curry._2(p, v, d);
-  var r$p = filter(p, r);
-  if (pvd) {
-    if (l === l$p && r === r$p) {
-      return param;
-    } else {
-      return join(l$p, v, d, r$p);
-    }
-  } else {
-    return concat(l$p, r$p);
-  }
-}
-
-function partition(p, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            "Empty"
-          ];
-  }
-  var d = param.d;
-  var v = param.v;
-  var match = partition(p, param.l);
-  var lf = match[1];
-  var lt = match[0];
-  var pvd = Curry._2(p, v, d);
-  var match$1 = partition(p, param.r);
-  var rf = match$1[1];
-  var rt = match$1[0];
-  if (pvd) {
-    return [
-            join(lt, v, d, rt),
-            concat(lf, rf)
-          ];
-  } else {
-    return [
-            concat(lt, rt),
-            join(lf, v, d, rf)
-          ];
-  }
-}
-
-function cons_enum(_m, _e) {
-  while(true) {
-    var e = _e;
-    var m = _m;
-    if (typeof m !== "object") {
-      return e;
-    }
-    _e = {
-      TAG: "More",
-      _0: m.v,
-      _1: m.d,
-      _2: m.r,
-      _3: e
-    };
-    _m = m.l;
-    continue ;
-  };
-}
-
-function compare(cmp, m1, m2) {
-  var _e1 = cons_enum(m1, "End");
-  var _e2 = cons_enum(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return 0;
-      } else {
-        return -1;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return 1;
-    }
-    var c = Caml_obj.compare(e1._0, e2._0);
-    if (c !== 0) {
-      return c;
-    }
-    var c$1 = Curry._2(cmp, e1._1, e2._1);
-    if (c$1 !== 0) {
-      return c$1;
-    }
-    _e2 = cons_enum(e2._2, e2._3);
-    _e1 = cons_enum(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function equal(cmp, m1, m2) {
-  var _e1 = cons_enum(m1, "End");
-  var _e2 = cons_enum(m2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return true;
-      } else {
-        return false;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return false;
-    }
-    if (!Caml_obj.equal(e1._0, e2._0)) {
-      return false;
-    }
-    if (!Curry._2(cmp, e1._1, e2._1)) {
-      return false;
-    }
-    _e2 = cons_enum(e2._2, e2._3);
-    _e1 = cons_enum(e1._2, e1._3);
-    continue ;
-  };
-}
-
-function cardinal(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0;
-  }
-}
-
-function bindings_aux(_accu, _param) {
-  while(true) {
-    var param = _param;
-    var accu = _accu;
-    if (typeof param !== "object") {
-      return accu;
-    }
-    _param = param.l;
-    _accu = {
-      hd: [
-        param.v,
-        param.d
-      ],
-      tl: bindings_aux(accu, param.r)
-    };
-    continue ;
-  };
-}
-
-function bindings(s) {
-  return bindings_aux(/* [] */0, s);
-}
-
-var Ticker_map = {
-  empty: "Empty",
-  is_empty: is_empty,
-  mem: mem,
-  add: add,
-  update: update,
-  singleton: singleton,
-  remove: remove,
-  merge: merge$1,
-  union: union,
-  compare: compare,
-  equal: equal,
-  iter: iter,
-  fold: fold,
-  for_all: for_all,
-  exists: exists,
-  filter: filter,
-  partition: partition,
-  cardinal: cardinal,
-  bindings: bindings,
-  min_binding: min_binding,
-  min_binding_opt: min_binding_opt,
-  max_binding: max_binding,
-  max_binding_opt: max_binding_opt,
-  choose: min_binding,
-  choose_opt: min_binding_opt,
-  split: split$1,
-  find: find,
-  find_opt: find_opt,
-  find_first: find_first,
-  find_first_opt: find_first_opt,
-  find_last: find_last,
-  find_last_opt: find_last_opt,
-  map: map,
-  mapi: mapi
-};
-
-function compute_update_sequences(all_tickers) {
-  List.fold_left((function (counter, ticker) {
-          var loop = function (counter, ticker) {
-            var rank = ticker.rank;
-            if (typeof rank === "object") {
-              return counter;
-            }
-            if (rank !== "Uninitialized") {
-              return counter;
-            }
-            ticker.rank = "Visited";
-            var match = ticker.type_;
-            if (typeof match !== "object") {
-              var counter$1 = counter + 1 | 0;
-              ticker.rank = {
-                TAG: "Ranked",
-                _0: counter$1
-              };
-              return counter$1;
-            }
-            var match$1 = match._0;
-            var counter$2 = loop(counter, match$1.lhs);
-            var counter$3 = loop(counter$2, match$1.rhs);
-            var counter$4 = counter$3 + 1 | 0;
-            ticker.rank = {
-              TAG: "Ranked",
-              _0: counter$4
-            };
-            return counter$4;
-          };
-          return loop(counter, ticker);
-        }), 0, all_tickers);
-  var map = List.fold_left((function (map, ticker) {
-          var tmp = ticker.type_;
-          if (typeof tmp !== "object") {
-            return add(ticker.ticker_name, {
-                        hd: ticker,
-                        tl: /* [] */0
-                      }, map);
-          }
-          var loop = function (_up, _map, _ticker) {
-            while(true) {
-              var ticker = _ticker;
-              var map = _map;
-              var up = _up;
-              var type_ = ticker.type_;
-              var ticker_name = ticker.ticker_name;
-              if (typeof type_ !== "object") {
-                var l = find(ticker_name, map);
-                return add(ticker_name, Pervasives.$at(up, l), map);
-              }
-              var match = type_._0;
-              var map$1 = loop({
-                    hd: ticker,
-                    tl: up
-                  }, map, match.lhs);
-              _ticker = match.rhs;
-              _map = map$1;
-              _up = {
-                hd: ticker,
-                tl: up
-              };
-              continue ;
-            };
-          };
-          return loop(/* [] */0, map, ticker);
-        }), "Empty", List.rev(all_tickers));
-  return fold((function (k, l, map) {
-                var l$1 = List.sort_uniq((function (lhs, rhs) {
-                        var x = lhs.rank;
-                        if (typeof x !== "object") {
-                          if (x === "Uninitialized") {
-                            throw {
-                                  RE_EXN_ID: "Failure",
-                                  _1: "All nodes should be ranked",
-                                  Error: new Error()
-                                };
-                          }
-                          throw {
-                                RE_EXN_ID: "Failure",
-                                _1: "All nodes should be ranked",
-                                Error: new Error()
-                              };
-                        } else {
-                          var y = rhs.rank;
-                          if (typeof y === "object") {
-                            return Caml.int_compare(x._0, y._0);
-                          }
-                          if (y === "Uninitialized") {
-                            throw {
-                                  RE_EXN_ID: "Failure",
-                                  _1: "All nodes should be ranked",
-                                  Error: new Error()
-                                };
-                          }
-                          throw {
-                                RE_EXN_ID: "Failure",
-                                _1: "All nodes should be ranked",
-                                Error: new Error()
-                              };
-                        }
-                      }), l);
-                return add(k, l$1, map);
-              }), map, map);
-}
-
-function process_quote(ticker_map, new_ticker, new_value) {
-  var update_sequence = find(new_ticker, ticker_map);
-  List.iter((function (ticker) {
-          var match = ticker.type_;
-          if (typeof match !== "object") {
-            if (ticker.ticker_name === new_ticker) {
-              ticker.value = new_value;
-              return ;
-            }
-            throw {
-                  RE_EXN_ID: "Failure",
-                  _1: "Only single Market ticker should be udpated upon a new quote",
-                  Error: new Error()
-                };
-          }
-          var match$1 = match._0;
-          var match$2 = match$1.lhs.value;
-          var match$3 = match$1.rhs.value;
-          var value = match$2 !== undefined && match$3 !== undefined ? (
-              match$1.op === "PLUS" ? match$2 + match$3 : match$2 - match$3
-            ) : undefined;
-          ticker.value = value;
-        }), update_sequence);
-}
-
-function process_input_line(ticker_map, all_tickers, line) {
-  var make_binary_op = function (ticker_name, lhs, rhs, op) {
-    var lhs$1 = find_ticker_by_name(all_tickers, lhs);
-    var rhs$1 = find_ticker_by_name(all_tickers, rhs);
-    return {
-            value: undefined,
-            rank: "Uninitialized",
-            ticker_name: ticker_name,
-            type_: {
-              TAG: "Binary_op",
-              _0: {
-                op: op,
-                rhs: rhs$1,
-                lhs: lhs$1
-              }
-            }
-          };
-  };
-  var tokens = split(/* '|' */124, line);
-  if (tokens) {
-    switch (tokens.hd) {
-      case "Q" :
-          var match = tokens.tl;
-          if (match) {
-            var match$1 = match.tl;
-            if (match$1) {
-              if (match$1.tl) {
-                throw {
-                      RE_EXN_ID: "Failure",
-                      _1: "Invalid input line",
-                      Error: new Error()
-                    };
-              }
-              var ticker_map$1 = ticker_map !== undefined ? Caml_option.valFromOption(ticker_map) : compute_update_sequences(all_tickers);
-              var value = Caml_format.float_of_string(match$1.hd);
-              process_quote(ticker_map$1, match.hd, value);
-              return [
-                      all_tickers,
-                      Caml_option.some(ticker_map$1)
-                    ];
-            }
-            throw {
-                  RE_EXN_ID: "Failure",
-                  _1: "Invalid input line",
-                  Error: new Error()
-                };
-          }
-          throw {
-                RE_EXN_ID: "Failure",
-                _1: "Invalid input line",
-                Error: new Error()
-              };
-      case "R" :
-          var match$2 = tokens.tl;
-          if (match$2) {
-            var match$3 = match$2.tl;
-            if (match$3) {
-              var ticker_name = match$2.hd;
-              switch (match$3.hd) {
-                case "+" :
-                    var match$4 = match$3.tl;
-                    if (match$4) {
-                      var match$5 = match$4.tl;
-                      if (match$5) {
-                        if (match$5.tl) {
-                          throw {
-                                RE_EXN_ID: "Failure",
-                                _1: "Invalid input line",
-                                Error: new Error()
-                              };
-                        }
-                        return [
-                                {
-                                  hd: make_binary_op(ticker_name, match$4.hd, match$5.hd, "PLUS"),
-                                  tl: all_tickers
-                                },
-                                ticker_map
-                              ];
-                      }
-                      throw {
-                            RE_EXN_ID: "Failure",
-                            _1: "Invalid input line",
-                            Error: new Error()
-                          };
-                    }
-                    throw {
-                          RE_EXN_ID: "Failure",
-                          _1: "Invalid input line",
-                          Error: new Error()
-                        };
-                case "-" :
-                    var match$6 = match$3.tl;
-                    if (match$6) {
-                      var match$7 = match$6.tl;
-                      if (match$7) {
-                        if (match$7.tl) {
-                          throw {
-                                RE_EXN_ID: "Failure",
-                                _1: "Invalid input line",
-                                Error: new Error()
-                              };
-                        }
-                        return [
-                                {
-                                  hd: make_binary_op(ticker_name, match$6.hd, match$7.hd, "MINUS"),
-                                  tl: all_tickers
-                                },
-                                ticker_map
-                              ];
-                      }
-                      throw {
-                            RE_EXN_ID: "Failure",
-                            _1: "Invalid input line",
-                            Error: new Error()
-                          };
-                    }
-                    throw {
-                          RE_EXN_ID: "Failure",
-                          _1: "Invalid input line",
-                          Error: new Error()
-                        };
-                case "S" :
-                    if (match$3.tl) {
-                      throw {
-                            RE_EXN_ID: "Failure",
-                            _1: "Invalid input line",
-                            Error: new Error()
-                          };
-                    }
-                    return [
-                            {
-                              hd: {
-                                value: undefined,
-                                rank: "Uninitialized",
-                                ticker_name: ticker_name,
-                                type_: "Market"
-                              },
-                              tl: all_tickers
-                            },
-                            ticker_map
-                          ];
-                default:
-                  throw {
-                        RE_EXN_ID: "Failure",
-                        _1: "Invalid input line",
-                        Error: new Error()
-                      };
-              }
-            } else {
-              throw {
-                    RE_EXN_ID: "Failure",
-                    _1: "Invalid input line",
-                    Error: new Error()
-                  };
-            }
-          } else {
-            throw {
-                  RE_EXN_ID: "Failure",
-                  _1: "Invalid input line",
-                  Error: new Error()
-                };
-          }
-      default:
-        throw {
-              RE_EXN_ID: "Failure",
-              _1: "Invalid input line",
-              Error: new Error()
-            };
-    }
-  } else {
-    throw {
-          RE_EXN_ID: "Failure",
-          _1: "Invalid input line",
-          Error: new Error()
-        };
-  }
-}
-
-function loop(_lines, _param) {
-  while(true) {
-    var param = _param;
-    var lines = _lines;
-    var all_tickers = param[0];
-    if (!lines) {
-      return print_all_composite(all_tickers);
-    }
-    _param = process_input_line(param[1], all_tickers, lines.hd);
-    _lines = lines.tl;
-    continue ;
-  };
-}
-
-var lines = {
-  hd: "R|MSFT|S",
-  tl: {
-    hd: "R|IBM|S",
-    tl: {
-      hd: "R|FB|S",
-      tl: {
-        hd: "R|CP1|+|MSFT|IBM",
-        tl: {
-          hd: "R|CP2|-|FB|IBM",
-          tl: {
-            hd: "R|CP12|+|CP1|CP2",
-            tl: {
-              hd: "Q|MSFT|120.",
-              tl: {
-                hd: "Q|IBM|130.",
-                tl: {
-                  hd: "Q|FB|80.",
-                  tl: /* [] */0
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-exports.Util = Util;
-exports.string_of_rank = string_of_rank;
-exports.find_ticker_by_name = find_ticker_by_name;
-exports.print_all_composite = print_all_composite;
-exports.Ticker_map = Ticker_map;
-exports.compute_update_sequences = compute_update_sequences;
-exports.process_quote = process_quote;
-exports.process_input_line = process_input_line;
-exports.lines = lines;
-exports.loop = loop;
-/* No side effect */
diff --git a/jscomp/test/ticker.res b/jscomp/test/ticker.res
deleted file mode 100644
index e81690e..0000000
--- a/jscomp/test/ticker.res
+++ /dev/null
@@ -1,250 +0,0 @@
-/** General purpose utility functions
-  */
-module Util = {
-  let split = (~delim, s) => {
-    let rec loop = (l, x) =>
-      switch x {
-      | 0 => l
-      | i =>
-        switch String.rindex_from(s, i - 1, delim) {
-        | i' =>
-          let l = list{String.sub(s, i' + 1, i - i' - 1), ...l}
-          let l = if i' == 0 {
-            list{"", ...l}
-          } else {
-            l
-          }
-          loop(l, i')
-        | exception Not_found => list{String.sub(s, 0, i), ...l}
-        }
-      }
-
-    let len = String.length(s)
-    switch len {
-    | 0 => list{}
-    | _ => loop(list{}, len)
-    }
-  }
-
-  let string_of_float_option = x =>
-    switch x {
-    | Some(x) => string_of_float(x)
-    | None => "nan"
-    }
-}
-
-/* AST for the tickers */
-
-type binary_op =
-  | PLUS
-  | MINUS
-
-type rank =
-  | Uninitialized
-  | Visited
-  | Ranked(int)
-
-type rec binary_op_ticker = {
-  op: binary_op,
-  rhs: ticker,
-  lhs: ticker,
-}
-
-and ticker_type =
-  | Market
-  | Binary_op(binary_op_ticker)
-
-and ticker = {
-  mutable value: option<float>,
-  mutable rank: rank,
-  ticker_name: string,
-  type_: ticker_type,
-}
-
-let string_of_rank = x =>
-  switch x {
-  | Uninitialized => "Uninitialized"
-  | Visited => "Visited"
-  | Ranked(i) => "Ranked(" ++ __unsafe_cast(i) ++ ")"
-  }
-
-let find_ticker_by_name = (all_tickers, ticker) =>
-  List.find(({ticker_name, _}) => ticker_name == ticker, all_tickers)
-
-let print_all_composite = all_tickers => List.iter(x =>
-    switch x {
-    | {type_: Market, _} => ()
-    | {type_: Binary_op(_), ticker_name, value} =>
-      switch value {
-      | Some(v) => print_endline(ticker_name)
-      | None => print_endline(ticker_name)
-      }
-    }
-  , all_tickers)
-
-module Ticker_map = Map.Make({
-  type t = string
-  let compare = Pervasives.compare
-})
-
-/** For each market tickers, this function will compute 
-    the associated list of tickers value to be updated
-    based on the correct graph ordering 
-
-    We first rank all the tickers with a depth first search 
-    algorithm (lowest rank for the deepest nodes). 
-
-    We then collect all the tickers which depends on each of the 
-    market tickers and finally we `sort_uniq` that list by rank to 
-    guarantee that a composite ticker is update only once and in 
-    the correct order. 
- */
-let compute_update_sequences = all_tickers => {
-  /* Ranking */
-
-  \"@@"(ignore, List.fold_left((counter, ticker) => {
-      let rec loop = (counter, {rank, _} as ticker) =>
-        switch rank {
-        | Ranked(_) => counter
-        | Visited => counter
-        | Uninitialized =>
-          ticker.rank = Visited
-          switch ticker.type_ {
-          | Market =>
-            let counter = counter + 1
-            ticker.rank = Ranked(counter)
-            counter
-          | Binary_op({lhs, rhs, _}) =>
-            let counter = loop(counter, lhs)
-            let counter = loop(counter, rhs)
-            let counter = counter + 1
-            ticker.rank = Ranked(counter)
-            counter
-          }
-        }
-
-      loop(counter, ticker)
-    }, 0, all_tickers))
-
-  /* collect all dependencies of market tickers */
-
-  let map = List.fold_left((map, {ticker_name, type_, _} as ticker) =>
-    switch type_ {
-    | Market => Ticker_map.add(ticker_name, list{ticker}, map)
-    | _ =>
-      let rec loop = (up, map, {ticker_name, type_} as ticker) =>
-        switch type_ {
-        | Market =>
-          let l = Ticker_map.find(ticker_name, map)
-          Ticker_map.add(ticker_name, \"@"(up, l), map)
-        | Binary_op({lhs, rhs, _}) =>
-          let map = loop(list{ticker, ...up}, map, lhs)
-          loop(list{ticker, ...up}, map, rhs)
-        }
-
-      loop(list{}, map, ticker)
-    }
-  , Ticker_map.empty, List.rev(all_tickers))
-  /* `List.rev is needed to process the node in the order they were processed
-      TODO: this code should be more robust
- */
-
-  /* order dependencies based on rank */
-
-  Ticker_map.fold((k, l, map) => {
-    let l = List.sort_uniq((lhs, rhs) =>
-      switch (lhs, rhs) {
-      | ({rank: Ranked(x)}, {rank: Ranked(y)}) => Pervasives.compare(x, y)
-      | (_, _) => failwith("All nodes should be ranked")
-      }
-    , l)
-    Ticker_map.add(k, l, map)
-  }, map, map)
-}
-
-/** Process a new quote for a market ticker 
- */
-let process_quote = (ticker_map, new_ticker, new_value) => {
-  let update_sequence = Ticker_map.find(new_ticker, ticker_map)
-
-  List.iter(ticker =>
-    switch ticker {
-    | {type_: Market, ticker_name, _} if ticker_name == new_ticker => ticker.value = Some(new_value)
-
-    | {type_: Market, _} => failwith("Only single Market ticker should be udpated upon a new quote")
-
-    | {type_: Binary_op({lhs, rhs, op}), ticker_name, _} =>
-      let value = switch (lhs.value, rhs.value) {
-      | (None, None)
-      | (None, _)
-      | (_, None) =>
-        None
-      | (Some(x), Some(y)) =>
-        switch op {
-        | PLUS => Some(x +. y)
-        | MINUS => Some(x -. y)
-        }
-      }
-      ticker.value = value
-    }
-  , update_sequence)
-}
-
-let process_input_line = (ticker_map, all_tickers, line) => {
-  let make_binary_op = (ticker_name, lhs, rhs, op) => {
-    let lhs = find_ticker_by_name(all_tickers, lhs)
-    let rhs = find_ticker_by_name(all_tickers, rhs)
-    {
-      rank: Uninitialized,
-      ticker_name,
-      type_: Binary_op({lhs, rhs, op}),
-      value: None,
-    }
-  }
-
-  let tokens = Util.split(~delim='|', line)
-
-  let all_tickers = switch tokens {
-  | list{"R", ticker_name, "S"} => (
-      list{{ticker_name, rank: Uninitialized, type_: Market, value: None}, ...all_tickers},
-      ticker_map,
-    )
-  | list{"R", ticker_name, "+", lhs, rhs} => (
-      list{make_binary_op(ticker_name, lhs, rhs, PLUS), ...all_tickers},
-      ticker_map,
-    )
-  | list{"R", ticker_name, "-", lhs, rhs} => (
-      list{make_binary_op(ticker_name, lhs, rhs, MINUS), ...all_tickers},
-      ticker_map,
-    )
-  | list{"Q", ticker_name, value} =>
-    let ticker_map = switch ticker_map {
-    | Some(ticker_map) => ticker_map
-    | None => compute_update_sequences(all_tickers)
-    }
-    let value = float_of_string(value)
-    process_quote(ticker_map, ticker_name, value)
-    (all_tickers, Some(ticker_map))
-  | _ => failwith("Invalid input line")
-  }
-
-  all_tickers
-}
-
-let lines = list{
-  "R|MSFT|S",
-  "R|IBM|S",
-  "R|FB|S",
-  "R|CP1|+|MSFT|IBM",
-  "R|CP2|-|FB|IBM",
-  "R|CP12|+|CP1|CP2",
-  "Q|MSFT|120.",
-  "Q|IBM|130.",
-  "Q|FB|80.",
-}
-
-let rec loop = (lines, (all_tickers, ticker_map)) =>
-  switch lines {
-  | list{line, ...lines} => loop(lines, process_input_line(ticker_map, all_tickers, line))
-  | list{} => print_all_composite(all_tickers)
-  }
diff --git a/jscomp/test/to_string_test.js b/jscomp/test/to_string_test.js
deleted file mode 100644
index 4bdfdba..0000000
--- a/jscomp/test/to_string_test.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-
-var ff = Pervasives.string_of_float;
-
-function f(v) {
-  return String(v);
-}
-
-Mt.from_pair_suites("To_string_test", {
-      hd: [
-        "File \"to_string_test.res\", line 6, characters 8-15",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: Pervasives.string_of_float(Pervasives.infinity),
-                    _1: "inf"
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "File \"to_string_test.res\", line 6, characters 49-56",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: Pervasives.string_of_float(Pervasives.neg_infinity),
-                      _1: "-inf"
-                    };
-            })
-        ],
-        tl: /* [] */0
-      }
-    });
-
-exports.ff = ff;
-exports.f = f;
-/*  Not a pure module */
diff --git a/jscomp/test/to_string_test.res b/jscomp/test/to_string_test.res
deleted file mode 100644
index 45b79dc..0000000
--- a/jscomp/test/to_string_test.res
+++ /dev/null
@@ -1,7 +0,0 @@
-let ff = v => string_of_float(v)
-let f = v => string_of_int(v)
-
-Mt.from_pair_suites(
-  __MODULE__,
-  list{(__LOC__, _ => Eq(ff(infinity), "inf")), (__LOC__, _ => Eq(ff(neg_infinity), "-inf"))},
-)
diff --git a/jscomp/test/topsort_test.js b/jscomp/test/topsort_test.js
deleted file mode 100644
index 99cc0d5..0000000
--- a/jscomp/test/topsort_test.js
+++ /dev/null
@@ -1,1604 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Caml = require("../../lib/js/caml.js");
-var List = require("../../lib/js/list.js");
-var Curry = require("../../lib/js/curry.js");
-var $$String = require("../../lib/js/string.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-var graph = {
-  hd: [
-    "a",
-    "b"
-  ],
-  tl: {
-    hd: [
-      "a",
-      "c"
-    ],
-    tl: {
-      hd: [
-        "a",
-        "d"
-      ],
-      tl: {
-        hd: [
-          "b",
-          "e"
-        ],
-        tl: {
-          hd: [
-            "c",
-            "f"
-          ],
-          tl: {
-            hd: [
-              "d",
-              "e"
-            ],
-            tl: {
-              hd: [
-                "e",
-                "f"
-              ],
-              tl: {
-                hd: [
-                  "e",
-                  "g"
-                ],
-                tl: /* [] */0
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-function nexts(x, g) {
-  return List.fold_left((function (acc, param) {
-                if (param[0] === x) {
-                  return {
-                          hd: param[1],
-                          tl: acc
-                        };
-                } else {
-                  return acc;
-                }
-              }), /* [] */0, g);
-}
-
-function dfs1(_nodes, graph, _visited) {
-  while(true) {
-    var visited = _visited;
-    var nodes = _nodes;
-    if (!nodes) {
-      return List.rev(visited);
-    }
-    var xs = nodes.tl;
-    var x = nodes.hd;
-    if (List.mem(x, visited)) {
-      _nodes = xs;
-      continue ;
-    }
-    console.log(x);
-    _visited = {
-      hd: x,
-      tl: visited
-    };
-    _nodes = Pervasives.$at(nexts(x, graph), xs);
-    continue ;
-  };
-}
-
-if (!Caml_obj.equal(dfs1({
-            hd: "a",
-            tl: /* [] */0
-          }, graph, /* [] */0), {
-        hd: "a",
-        tl: {
-          hd: "d",
-          tl: {
-            hd: "e",
-            tl: {
-              hd: "g",
-              tl: {
-                hd: "f",
-                tl: {
-                  hd: "c",
-                  tl: {
-                    hd: "b",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          35,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-console.log("");
-
-if (!Caml_obj.equal(dfs1({
-            hd: "b",
-            tl: /* [] */0
-          }, {
-            hd: [
-              "f",
-              "d"
-            ],
-            tl: graph
-          }, /* [] */0), {
-        hd: "b",
-        tl: {
-          hd: "e",
-          tl: {
-            hd: "g",
-            tl: {
-              hd: "f",
-              tl: {
-                hd: "d",
-                tl: /* [] */0
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          38,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function dfs2(nodes, graph, visited) {
-  var aux = function (_nodes, graph, _visited) {
-    while(true) {
-      var visited = _visited;
-      var nodes = _nodes;
-      if (!nodes) {
-        return visited;
-      }
-      var xs = nodes.tl;
-      var x = nodes.hd;
-      if (List.mem(x, visited)) {
-        _nodes = xs;
-        continue ;
-      }
-      _visited = aux(nexts(x, graph), graph, {
-            hd: x,
-            tl: visited
-          });
-      _nodes = xs;
-      continue ;
-    };
-  };
-  return List.rev(aux(nodes, graph, visited));
-}
-
-if (!Caml_obj.equal(dfs2({
-            hd: "a",
-            tl: /* [] */0
-          }, graph, /* [] */0), {
-        hd: "a",
-        tl: {
-          hd: "d",
-          tl: {
-            hd: "e",
-            tl: {
-              hd: "g",
-              tl: {
-                hd: "f",
-                tl: {
-                  hd: "c",
-                  tl: {
-                    hd: "b",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          57,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(dfs2({
-            hd: "b",
-            tl: /* [] */0
-          }, {
-            hd: [
-              "f",
-              "d"
-            ],
-            tl: graph
-          }, /* [] */0), {
-        hd: "b",
-        tl: {
-          hd: "e",
-          tl: {
-            hd: "g",
-            tl: {
-              hd: "f",
-              tl: {
-                hd: "d",
-                tl: /* [] */0
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          58,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-function dfs3(nodes, graph) {
-  var visited = {
-    contents: /* [] */0
-  };
-  var aux = function (node, graph) {
-    if (!List.mem(node, visited.contents)) {
-      visited.contents = {
-        hd: node,
-        tl: visited.contents
-      };
-      return List.iter((function (x) {
-                    aux(x, graph);
-                  }), nexts(node, graph));
-    }
-    
-  };
-  List.iter((function (node) {
-          aux(node, graph);
-        }), nodes);
-  return List.rev(visited.contents);
-}
-
-if (!Caml_obj.equal(dfs3({
-            hd: "a",
-            tl: /* [] */0
-          }, graph), {
-        hd: "a",
-        tl: {
-          hd: "d",
-          tl: {
-            hd: "e",
-            tl: {
-              hd: "g",
-              tl: {
-                hd: "f",
-                tl: {
-                  hd: "c",
-                  tl: {
-                    hd: "b",
-                    tl: /* [] */0
-                  }
-                }
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          74,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-if (!Caml_obj.equal(dfs3({
-            hd: "b",
-            tl: /* [] */0
-          }, {
-            hd: [
-              "f",
-              "d"
-            ],
-            tl: graph
-          }), {
-        hd: "b",
-        tl: {
-          hd: "e",
-          tl: {
-            hd: "g",
-            tl: {
-              hd: "f",
-              tl: {
-                hd: "d",
-                tl: /* [] */0
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          75,
-          2
-        ],
-        Error: new Error()
-      };
-}
-
-var grwork = {
-  hd: [
-    "wake",
-    "shower"
-  ],
-  tl: {
-    hd: [
-      "shower",
-      "dress"
-    ],
-    tl: {
-      hd: [
-        "dress",
-        "go"
-      ],
-      tl: {
-        hd: [
-          "wake",
-          "eat"
-        ],
-        tl: {
-          hd: [
-            "eat",
-            "washup"
-          ],
-          tl: {
-            hd: [
-              "washup",
-              "go"
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    }
-  }
-};
-
-function unsafe_topsort(graph) {
-  var visited = {
-    contents: /* [] */0
-  };
-  var sort_node = function (node) {
-    if (List.mem(node, visited.contents)) {
-      return ;
-    }
-    var nodes = nexts(node, graph);
-    List.iter(sort_node, nodes);
-    visited.contents = {
-      hd: node,
-      tl: visited.contents
-    };
-  };
-  List.iter((function (param) {
-          sort_node(param[0]);
-        }), graph);
-  return visited.contents;
-}
-
-if (!Caml_obj.equal(unsafe_topsort(grwork), {
-        hd: "wake",
-        tl: {
-          hd: "shower",
-          tl: {
-            hd: "dress",
-            tl: {
-              hd: "eat",
-              tl: {
-                hd: "washup",
-                tl: {
-                  hd: "go",
-                  tl: /* [] */0
-                }
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          112,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-function height(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return param.h;
-  }
-}
-
-function create(l, v, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  return {
-          TAG: "Node",
-          l: l,
-          v: v,
-          r: r,
-          h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-        };
-}
-
-function bal(l, v, r) {
-  var hl;
-  hl = typeof l !== "object" ? 0 : l.h;
-  var hr;
-  hr = typeof r !== "object" ? 0 : r.h;
-  if (hl > (hr + 2 | 0)) {
-    if (typeof l !== "object") {
-      throw {
-            RE_EXN_ID: "Invalid_argument",
-            _1: "Set.bal",
-            Error: new Error()
-          };
-    }
-    var lr = l.r;
-    var lv = l.v;
-    var ll = l.l;
-    if (height(ll) >= height(lr)) {
-      return create(ll, lv, create(lr, v, r));
-    }
-    if (typeof lr === "object") {
-      return create(create(ll, lv, lr.l), lr.v, create(lr.r, v, r));
-    }
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
-  }
-  if (hr <= (hl + 2 | 0)) {
-    return {
-            TAG: "Node",
-            l: l,
-            v: v,
-            r: r,
-            h: hl >= hr ? hl + 1 | 0 : hr + 1 | 0
-          };
-  }
-  if (typeof r !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.bal",
-          Error: new Error()
-        };
-  }
-  var rr = r.r;
-  var rv = r.v;
-  var rl = r.l;
-  if (height(rr) >= height(rl)) {
-    return create(create(l, v, rl), rv, rr);
-  }
-  if (typeof rl === "object") {
-    return create(create(l, v, rl.l), rl.v, create(rl.r, rv, rr));
-  }
-  throw {
-        RE_EXN_ID: "Invalid_argument",
-        _1: "Set.bal",
-        Error: new Error()
-      };
-}
-
-function add(x, param) {
-  if (typeof param !== "object") {
-    return {
-            TAG: "Node",
-            l: "Empty",
-            v: x,
-            r: "Empty",
-            h: 1
-          };
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    return param;
-  }
-  if (c < 0) {
-    var ll = add(x, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, r);
-    }
-  }
-  var rr = add(x, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, rr);
-  }
-}
-
-function singleton(x) {
-  return {
-          TAG: "Node",
-          l: "Empty",
-          v: x,
-          r: "Empty",
-          h: 1
-        };
-}
-
-function add_min_element(x, param) {
-  if (typeof param !== "object") {
-    return singleton(x);
-  } else {
-    return bal(add_min_element(x, param.l), param.v, param.r);
-  }
-}
-
-function add_max_element(x, param) {
-  if (typeof param !== "object") {
-    return singleton(x);
-  } else {
-    return bal(param.l, param.v, add_max_element(x, param.r));
-  }
-}
-
-function join(l, v, r) {
-  if (typeof l !== "object") {
-    return add_min_element(v, r);
-  }
-  var lh = l.h;
-  if (typeof r !== "object") {
-    return add_max_element(v, l);
-  }
-  var rh = r.h;
-  if (lh > (rh + 2 | 0)) {
-    return bal(l.l, l.v, join(l.r, v, r));
-  } else if (rh > (lh + 2 | 0)) {
-    return bal(join(l, v, r.l), r.v, r.r);
-  } else {
-    return create(l, v, r);
-  }
-}
-
-function min_elt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return param.v;
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function min_elt_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var l = param.l;
-    if (typeof l !== "object") {
-      return Caml_option.some(param.v);
-    }
-    _param = l;
-    continue ;
-  };
-}
-
-function max_elt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return param.v;
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function max_elt_opt(_param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var r = param.r;
-    if (typeof r !== "object") {
-      return Caml_option.some(param.v);
-    }
-    _param = r;
-    continue ;
-  };
-}
-
-function remove_min_elt(param) {
-  if (typeof param !== "object") {
-    throw {
-          RE_EXN_ID: "Invalid_argument",
-          _1: "Set.remove_min_elt",
-          Error: new Error()
-        };
-  }
-  var l = param.l;
-  if (typeof l !== "object") {
-    return param.r;
-  } else {
-    return bal(remove_min_elt(l), param.v, param.r);
-  }
-}
-
-function concat(t1, t2) {
-  if (typeof t1 !== "object") {
-    return t2;
-  } else if (typeof t2 !== "object") {
-    return t1;
-  } else {
-    return join(t1, min_elt(t2), remove_min_elt(t2));
-  }
-}
-
-function split(x, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            false,
-            "Empty"
-          ];
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    return [
-            l,
-            true,
-            r
-          ];
-  }
-  if (c < 0) {
-    var match = split(x, l);
-    return [
-            match[0],
-            match[1],
-            join(match[2], v, r)
-          ];
-  }
-  var match$1 = split(x, r);
-  return [
-          join(l, v, match$1[0]),
-          match$1[1],
-          match$1[2]
-        ];
-}
-
-function is_empty(param) {
-  if (typeof param !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function mem(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    var c = Caml.string_compare(x, param.v);
-    if (c === 0) {
-      return true;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function remove(x, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var c = Caml.string_compare(x, v);
-  if (c === 0) {
-    if (typeof l !== "object") {
-      return r;
-    } else if (typeof r !== "object") {
-      return l;
-    } else {
-      return bal(l, min_elt(r), remove_min_elt(r));
-    }
-  }
-  if (c < 0) {
-    var ll = remove(x, l);
-    if (l === ll) {
-      return param;
-    } else {
-      return bal(ll, v, r);
-    }
-  }
-  var rr = remove(x, r);
-  if (r === rr) {
-    return param;
-  } else {
-    return bal(l, v, rr);
-  }
-}
-
-function union(s1, s2) {
-  if (typeof s1 !== "object") {
-    return s2;
-  }
-  var h1 = s1.h;
-  var v1 = s1.v;
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var h2 = s2.h;
-  var v2 = s2.v;
-  if (h1 >= h2) {
-    if (h2 === 1) {
-      return add(v2, s1);
-    }
-    var match = split(v1, s2);
-    return join(union(s1.l, match[0]), v1, union(s1.r, match[2]));
-  }
-  if (h1 === 1) {
-    return add(v1, s2);
-  }
-  var match$1 = split(v2, s1);
-  return join(union(match$1[0], s2.l), v2, union(match$1[2], s2.r));
-}
-
-function inter(s1, s2) {
-  if (typeof s1 !== "object") {
-    return "Empty";
-  }
-  if (typeof s2 !== "object") {
-    return "Empty";
-  }
-  var r1 = s1.r;
-  var v1 = s1.v;
-  var l1 = s1.l;
-  var match = split(v1, s2);
-  var l2 = match[0];
-  if (match[1]) {
-    return join(inter(l1, l2), v1, inter(r1, match[2]));
-  } else {
-    return concat(inter(l1, l2), inter(r1, match[2]));
-  }
-}
-
-function diff(s1, s2) {
-  if (typeof s1 !== "object") {
-    return "Empty";
-  }
-  if (typeof s2 !== "object") {
-    return s1;
-  }
-  var r1 = s1.r;
-  var v1 = s1.v;
-  var l1 = s1.l;
-  var match = split(v1, s2);
-  var l2 = match[0];
-  if (match[1]) {
-    return concat(diff(l1, l2), diff(r1, match[2]));
-  } else {
-    return join(diff(l1, l2), v1, diff(r1, match[2]));
-  }
-}
-
-function cons_enum(_s, _e) {
-  while(true) {
-    var e = _e;
-    var s = _s;
-    if (typeof s !== "object") {
-      return e;
-    }
-    _e = {
-      TAG: "More",
-      _0: s.v,
-      _1: s.r,
-      _2: e
-    };
-    _s = s.l;
-    continue ;
-  };
-}
-
-function compare(s1, s2) {
-  var _e1 = cons_enum(s1, "End");
-  var _e2 = cons_enum(s2, "End");
-  while(true) {
-    var e2 = _e2;
-    var e1 = _e1;
-    if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return 0;
-      } else {
-        return -1;
-      }
-    }
-    if (typeof e2 !== "object") {
-      return 1;
-    }
-    var c = Caml.string_compare(e1._0, e2._0);
-    if (c !== 0) {
-      return c;
-    }
-    _e2 = cons_enum(e2._1, e2._2);
-    _e1 = cons_enum(e1._1, e1._2);
-    continue ;
-  };
-}
-
-function equal(s1, s2) {
-  return compare(s1, s2) === 0;
-}
-
-function subset(_s1, _s2) {
-  while(true) {
-    var s2 = _s2;
-    var s1 = _s1;
-    if (typeof s1 !== "object") {
-      return true;
-    }
-    var r1 = s1.r;
-    var v1 = s1.v;
-    var l1 = s1.l;
-    if (typeof s2 !== "object") {
-      return false;
-    }
-    var r2 = s2.r;
-    var l2 = s2.l;
-    var c = Caml.string_compare(v1, s2.v);
-    if (c === 0) {
-      if (!subset(l1, l2)) {
-        return false;
-      }
-      _s2 = r2;
-      _s1 = r1;
-      continue ;
-    }
-    if (c < 0) {
-      if (!subset({
-              TAG: "Node",
-              l: l1,
-              v: v1,
-              r: "Empty",
-              h: 0
-            }, l2)) {
-        return false;
-      }
-      _s1 = r1;
-      continue ;
-    }
-    if (!subset({
-            TAG: "Node",
-            l: "Empty",
-            v: v1,
-            r: r1,
-            h: 0
-          }, r2)) {
-      return false;
-    }
-    _s1 = l1;
-    continue ;
-  };
-}
-
-function iter(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    iter(f, param.l);
-    Curry._1(f, param.v);
-    _param = param.r;
-    continue ;
-  };
-}
-
-function fold(f, _s, _accu) {
-  while(true) {
-    var accu = _accu;
-    var s = _s;
-    if (typeof s !== "object") {
-      return accu;
-    }
-    _accu = Curry._2(f, s.v, fold(f, s.l, accu));
-    _s = s.r;
-    continue ;
-  };
-}
-
-function for_all(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return true;
-    }
-    if (!Curry._1(p, param.v)) {
-      return false;
-    }
-    if (!for_all(p, param.l)) {
-      return false;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function exists(p, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return false;
-    }
-    if (Curry._1(p, param.v)) {
-      return true;
-    }
-    if (exists(p, param.l)) {
-      return true;
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function filter(p, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var l$p = filter(p, l);
-  var pv = Curry._1(p, v);
-  var r$p = filter(p, r);
-  if (pv) {
-    if (l === l$p && r === r$p) {
-      return param;
-    } else {
-      return join(l$p, v, r$p);
-    }
-  } else {
-    return concat(l$p, r$p);
-  }
-}
-
-function partition(p, param) {
-  if (typeof param !== "object") {
-    return [
-            "Empty",
-            "Empty"
-          ];
-  }
-  var v = param.v;
-  var match = partition(p, param.l);
-  var lf = match[1];
-  var lt = match[0];
-  var pv = Curry._1(p, v);
-  var match$1 = partition(p, param.r);
-  var rf = match$1[1];
-  var rt = match$1[0];
-  if (pv) {
-    return [
-            join(lt, v, rt),
-            concat(lf, rf)
-          ];
-  } else {
-    return [
-            concat(lt, rt),
-            join(lf, v, rf)
-          ];
-  }
-}
-
-function cardinal(param) {
-  if (typeof param !== "object") {
-    return 0;
-  } else {
-    return (cardinal(param.l) + 1 | 0) + cardinal(param.r) | 0;
-  }
-}
-
-function elements_aux(_accu, _param) {
-  while(true) {
-    var param = _param;
-    var accu = _accu;
-    if (typeof param !== "object") {
-      return accu;
-    }
-    _param = param.l;
-    _accu = {
-      hd: param.v,
-      tl: elements_aux(accu, param.r)
-    };
-    continue ;
-  };
-}
-
-function elements(s) {
-  return elements_aux(/* [] */0, s);
-}
-
-function find(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    var c = Caml.string_compare(x, v);
-    if (c === 0) {
-      return v;
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function find_first(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return v0;
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_first_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.l;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return Caml_option.some(v0);
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.l;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.r;
-        continue ;
-      };
-    }
-    _param = param.r;
-    continue ;
-  };
-}
-
-function find_last(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      throw {
-            RE_EXN_ID: "Not_found",
-            Error: new Error()
-          };
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return v0;
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_last_opt(f, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    if (Curry._1(f, v)) {
-      var _v0 = v;
-      var _param$1 = param.r;
-      while(true) {
-        var param$1 = _param$1;
-        var v0 = _v0;
-        if (typeof param$1 !== "object") {
-          return Caml_option.some(v0);
-        }
-        var v$1 = param$1.v;
-        if (Curry._1(f, v$1)) {
-          _param$1 = param$1.r;
-          _v0 = v$1;
-          continue ;
-        }
-        _param$1 = param$1.l;
-        continue ;
-      };
-    }
-    _param = param.l;
-    continue ;
-  };
-}
-
-function find_opt(x, _param) {
-  while(true) {
-    var param = _param;
-    if (typeof param !== "object") {
-      return ;
-    }
-    var v = param.v;
-    var c = Caml.string_compare(x, v);
-    if (c === 0) {
-      return Caml_option.some(v);
-    }
-    _param = c < 0 ? param.l : param.r;
-    continue ;
-  };
-}
-
-function map(f, param) {
-  if (typeof param !== "object") {
-    return "Empty";
-  }
-  var r = param.r;
-  var v = param.v;
-  var l = param.l;
-  var l$p = map(f, l);
-  var v$p = Curry._1(f, v);
-  var r$p = map(f, r);
-  if (l === l$p && v === v$p && r === r$p) {
-    return param;
-  } else if ((l$p === "Empty" || Caml.string_compare(max_elt(l$p), v$p) < 0) && (r$p === "Empty" || Caml.string_compare(v$p, min_elt(r$p)) < 0)) {
-    return join(l$p, v$p, r$p);
-  } else {
-    return union(l$p, add(v$p, r$p));
-  }
-}
-
-function of_list(l) {
-  if (!l) {
-    return "Empty";
-  }
-  var match = l.tl;
-  var x0 = l.hd;
-  if (!match) {
-    return singleton(x0);
-  }
-  var match$1 = match.tl;
-  var x1 = match.hd;
-  if (!match$1) {
-    return add(x1, singleton(x0));
-  }
-  var match$2 = match$1.tl;
-  var x2 = match$1.hd;
-  if (!match$2) {
-    return add(x2, add(x1, singleton(x0)));
-  }
-  var match$3 = match$2.tl;
-  var x3 = match$2.hd;
-  if (match$3) {
-    if (match$3.tl) {
-      var l$1 = List.sort_uniq($$String.compare, l);
-      var sub = function (n, l) {
-        switch (n) {
-          case 0 :
-              return [
-                      "Empty",
-                      l
-                    ];
-          case 1 :
-              if (l) {
-                return [
-                        {
-                          TAG: "Node",
-                          l: "Empty",
-                          v: l.hd,
-                          r: "Empty",
-                          h: 1
-                        },
-                        l.tl
-                      ];
-              }
-              break;
-          case 2 :
-              if (l) {
-                var match = l.tl;
-                if (match) {
-                  return [
-                          {
-                            TAG: "Node",
-                            l: {
-                              TAG: "Node",
-                              l: "Empty",
-                              v: l.hd,
-                              r: "Empty",
-                              h: 1
-                            },
-                            v: match.hd,
-                            r: "Empty",
-                            h: 2
-                          },
-                          match.tl
-                        ];
-                }
-                
-              }
-              break;
-          case 3 :
-              if (l) {
-                var match$1 = l.tl;
-                if (match$1) {
-                  var match$2 = match$1.tl;
-                  if (match$2) {
-                    return [
-                            {
-                              TAG: "Node",
-                              l: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: l.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              v: match$1.hd,
-                              r: {
-                                TAG: "Node",
-                                l: "Empty",
-                                v: match$2.hd,
-                                r: "Empty",
-                                h: 1
-                              },
-                              h: 2
-                            },
-                            match$2.tl
-                          ];
-                  }
-                  
-                }
-                
-              }
-              break;
-          default:
-            
-        }
-        var nl = n / 2 | 0;
-        var match$3 = sub(nl, l);
-        var l$1 = match$3[1];
-        if (l$1) {
-          var match$4 = sub((n - nl | 0) - 1 | 0, l$1.tl);
-          return [
-                  create(match$3[0], l$1.hd, match$4[0]),
-                  match$4[1]
-                ];
-        }
-        throw {
-              RE_EXN_ID: "Assert_failure",
-              _1: [
-                "set.res",
-                691,
-                20
-              ],
-              Error: new Error()
-            };
-      };
-      return sub(List.length(l$1), l$1)[0];
-    } else {
-      return add(match$3.hd, add(x3, add(x2, add(x1, singleton(x0)))));
-    }
-  } else {
-    return add(x3, add(x2, add(x1, singleton(x0))));
-  }
-}
-
-var String_set = {
-  empty: "Empty",
-  is_empty: is_empty,
-  mem: mem,
-  add: add,
-  singleton: singleton,
-  remove: remove,
-  union: union,
-  inter: inter,
-  diff: diff,
-  compare: compare,
-  equal: equal,
-  subset: subset,
-  iter: iter,
-  map: map,
-  fold: fold,
-  for_all: for_all,
-  exists: exists,
-  filter: filter,
-  partition: partition,
-  cardinal: cardinal,
-  elements: elements,
-  min_elt: min_elt,
-  min_elt_opt: min_elt_opt,
-  max_elt: max_elt,
-  max_elt_opt: max_elt_opt,
-  choose: min_elt,
-  choose_opt: min_elt_opt,
-  split: split,
-  find: find,
-  find_opt: find_opt,
-  find_first: find_first,
-  find_first_opt: find_first_opt,
-  find_last: find_last,
-  find_last_opt: find_last_opt,
-  of_list: of_list
-};
-
-var Cycle = /* @__PURE__ */Caml_exceptions.create("Topsort_test.Cycle");
-
-function pathsort(graph) {
-  var visited = {
-    contents: /* [] */0
-  };
-  var empty_path = [
-    "Empty",
-    /* [] */0
-  ];
-  var $plus$great = function (node, param) {
-    var stack = param[1];
-    var set = param[0];
-    if (mem(node, set)) {
-      throw {
-            RE_EXN_ID: Cycle,
-            _1: {
-              hd: node,
-              tl: stack
-            },
-            Error: new Error()
-          };
-    }
-    return [
-            add(node, set),
-            {
-              hd: node,
-              tl: stack
-            }
-          ];
-  };
-  var sort_nodes = function (path, nodes) {
-    List.iter((function (node) {
-            sort_node(path, node);
-          }), nodes);
-  };
-  var sort_node = function (path, node) {
-    if (!List.mem(node, visited.contents)) {
-      sort_nodes($plus$great(node, path), nexts(node, graph));
-      visited.contents = {
-        hd: node,
-        tl: visited.contents
-      };
-      return ;
-    }
-    
-  };
-  List.iter((function (param) {
-          sort_node(empty_path, param[0]);
-        }), graph);
-  return visited.contents;
-}
-
-if (!Caml_obj.equal(pathsort(grwork), {
-        hd: "wake",
-        tl: {
-          hd: "shower",
-          tl: {
-            hd: "dress",
-            tl: {
-              hd: "eat",
-              tl: {
-                hd: "washup",
-                tl: {
-                  hd: "go",
-                  tl: /* [] */0
-                }
-              }
-            }
-          }
-        }
-      })) {
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          144,
-          9
-        ],
-        Error: new Error()
-      };
-}
-
-try {
-  pathsort({
-        hd: [
-          "go",
-          "eat"
-        ],
-        tl: grwork
-      });
-  throw {
-        RE_EXN_ID: "Assert_failure",
-        _1: [
-          "topsort_test.res",
-          148,
-          2
-        ],
-        Error: new Error()
-      };
-}
-catch (raw_exn){
-  var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-  var exit = 0;
-  if (exn.RE_EXN_ID === Cycle) {
-    var match = exn._1;
-    if (match && match.hd === "go") {
-      var match$1 = match.tl;
-      if (match$1 && match$1.hd === "washup") {
-        var match$2 = match$1.tl;
-        if (match$2 && match$2.hd === "eat") {
-          var match$3 = match$2.tl;
-          if (!(match$3 && match$3.hd === "go" && !match$3.tl)) {
-            exit = 1;
-          }
-          
-        } else {
-          exit = 1;
-        }
-      } else {
-        exit = 1;
-      }
-    } else {
-      exit = 1;
-    }
-  } else {
-    exit = 1;
-  }
-  if (exit === 1) {
-    throw {
-          RE_EXN_ID: "Assert_failure",
-          _1: [
-            "topsort_test.res",
-            151,
-            7
-          ],
-          Error: new Error()
-        };
-  }
-  
-}
-
-exports.graph = graph;
-exports.nexts = nexts;
-exports.dfs1 = dfs1;
-exports.dfs2 = dfs2;
-exports.dfs3 = dfs3;
-exports.grwork = grwork;
-exports.unsafe_topsort = unsafe_topsort;
-exports.String_set = String_set;
-exports.Cycle = Cycle;
-exports.pathsort = pathsort;
-/*  Not a pure module */
diff --git a/jscomp/test/topsort_test.res b/jscomp/test/topsort_test.res
deleted file mode 100644
index 54e132c..0000000
--- a/jscomp/test/topsort_test.res
+++ /dev/null
@@ -1,152 +0,0 @@
-type graph = list<(string, string)>
-
-let graph: graph = list{
-  ("a", "b"),
-  ("a", "c"),
-  ("a", "d"),
-  ("b", "e"),
-  ("c", "f"),
-  ("d", "e"),
-  ("e", "f"),
-  ("e", "g"),
-}
-
-let nexts = (x: string, g: graph): list<string> => List.fold_left((acc, (a, b)) =>
-    if a == x {
-      list{b, ...acc}
-    } else {
-      acc
-    }
-  , list{}, g)
-
-let rec dfs1 = (nodes, graph, visited) =>
-  switch nodes {
-  | list{} => List.rev(visited)
-  | list{x, ...xs} =>
-    if List.mem(x, visited) {
-      dfs1(xs, graph, visited)
-    } else {
-      print_endline(x)
-      dfs1(\"@"(nexts(x, graph), xs), graph, list{x, ...visited})
-    }
-  }
-
-let () = {
-  assert (dfs1(list{"a"}, graph, list{}) == list{"a", "d", "e", "g", "f", "c", "b"})
-
-  print_newline()
-  assert (dfs1(list{"b"}, list{("f", "d"), ...graph}, list{}) == list{"b", "e", "g", "f", "d"})
-}
-
-let rec dfs2 = (nodes, graph, visited) => {
-  let rec aux = (nodes, graph, visited) =>
-    switch nodes {
-    | list{} => visited
-    | list{x, ...xs} =>
-      if List.mem(x, visited) {
-        aux(xs, graph, visited)
-      } else {
-        aux(xs, graph, aux(nexts(x, graph), graph, list{x, ...visited}))
-      }
-    }
-  \"@@"(List.rev, aux(nodes, graph, visited))
-}
-
-let () = {
-  let dfs1 = dfs2
-  assert (dfs1(list{"a"}, graph, list{}) == list{"a", "d", "e", "g", "f", "c", "b"})
-  assert (dfs1(list{"b"}, list{("f", "d"), ...graph}, list{}) == list{"b", "e", "g", "f", "d"})
-}
-
-let dfs3 = (nodes, graph) => {
-  let visited = ref(list{})
-  let rec aux = (node, graph) =>
-    if \"@@"(not, List.mem(node, visited.contents)) {
-      visited := list{node, ...visited.contents}
-      List.iter(x => aux(x, graph), nexts(node, graph))
-    }
-  List.iter(node => aux(node, graph), nodes)
-  List.rev(visited.contents)
-}
-
-let () = {
-  let dfs1 = dfs3
-  assert (dfs1(list{"a"}, graph) == list{"a", "d", "e", "g", "f", "c", "b"})
-  assert (dfs1(list{"b"}, list{("f", "d"), ...graph}) == list{"b", "e", "g", "f", "d"})
-}
-
-/* since [x] is recorded before visiting its successors, so even with 
-    cycles, it is still terminating
-*/
-
-let grwork = list{
-  ("wake", "shower"),
-  ("shower", "dress"),
-  ("dress", "go"),
-  ("wake", "eat"),
-  ("eat", "washup"),
-  ("washup", "go"),
-}
-
-let unsafe_topsort = graph => {
-  let visited = ref(list{})
-  let rec sort_nodes = nodes => List.iter(node => sort_node(node), nodes)
-  and sort_node = node =>
-    if \"@@"(not, List.mem(node, visited.contents)) {
-      /* This check does not prevent cycle ,
-           but it is still necessary? yes! 
-           since a node can have multiple parents
- */
-
-      sort_nodes(nexts(node, graph))
-      /* different from dfs, recorded after its 
-            successors have been searched for toplogoical
-            sort, downside: can not detect cycles
- */
-      visited := list{node, ...visited.contents}
-    }
-  List.iter(((x, _)) => sort_node(x), graph)
-  visited.contents
-}
-
-let () = assert (unsafe_topsort(grwork) == list{"wake", "shower", "dress", "eat", "washup", "go"})
-
-module String_set = Set.Make(String)
-exception Cycle(list<string>)
-let pathsort = graph => {
-  let visited = ref(list{})
-  let empty_path = (String_set.empty, list{})
-  let \"+>" = (node, (set, stack)) =>
-    if String_set.mem(node, set) {
-      raise(Cycle(list{node, ...stack}))
-    } else {
-      (String_set.add(node, set), list{node, ...stack})
-    }
-
-  /* let check node (set,stack) = 
-      if String_set.mem node set then 
-        raise (Cycle (node::stack))  in */
-  let rec sort_nodes = (path, nodes) => List.iter(node => sort_node(path, node), nodes)
-  and sort_node = (path, node) =>
-    if \"@@"(not, List.mem(node, visited.contents)) {
-      /* check node path ; */
-      sort_nodes(\"+>"(node, path), nexts(node, graph))
-      /* different from dfs, recorded after its 
-            successors have been searched for toplogoical
-            sort, downside: can not detect cycles
- */
-      visited := list{node, ...visited.contents}
-    }
-  List.iter(((x, _)) => sort_node(empty_path, x), graph)
-  visited.contents
-}
-
-let () = assert (pathsort(grwork) == list{"wake", "shower", "dress", "eat", "washup", "go"})
-
-let () = try {
-  \"@@"(ignore, pathsort(list{("go", "eat"), ...grwork}))
-  assert(false)
-} catch {
-| Cycle(list{"go", "washup", "eat", "go"}) => ()
-| _ => assert(false)
-}
diff --git a/jscomp/test/tramp_fib.js b/jscomp/test/tramp_fib.js
deleted file mode 100644
index 11f7db3..0000000
--- a/jscomp/test/tramp_fib.js
+++ /dev/null
@@ -1,108 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function fib(n, k) {
-  if (n === 0 || n === 1) {
-    return k(1);
-  } else {
-    return {
-            TAG: "Suspend",
-            _0: (function () {
-                return fib(n - 1 | 0, (function (v0) {
-                              return fib(n - 2 | 0, (function (v1) {
-                                            return k(v0 + v1 | 0);
-                                          }));
-                            }));
-              })
-          };
-  }
-}
-
-var u = fib(10, (function (x) {
-        return {
-                TAG: "Continue",
-                _0: x
-              };
-      }));
-
-function iter(_bounce) {
-  while(true) {
-    var bounce = _bounce;
-    if (bounce.TAG === "Continue") {
-      return bounce._0;
-    }
-    _bounce = bounce._0();
-    continue ;
-  };
-}
-
-function isEven(n) {
-  if (n !== 0) {
-    if (n !== 1) {
-      return {
-              TAG: "Suspend",
-              _0: (function () {
-                  return isOdd(n - 1 | 0);
-                })
-            };
-    } else {
-      return {
-              TAG: "Continue",
-              _0: false
-            };
-    }
-  } else {
-    return {
-            TAG: "Continue",
-            _0: true
-          };
-  }
-}
-
-function isOdd(n) {
-  if (n !== 0) {
-    if (n !== 1) {
-      return isEven(n - 1 | 0);
-    } else {
-      return {
-              TAG: "Continue",
-              _0: true
-            };
-    }
-  } else {
-    return {
-            TAG: "Continue",
-            _0: false
-          };
-  }
-}
-
-eq("File \"tramp_fib.res\", line 57, characters 3-10", iter(u), 89);
-
-eq("File \"tramp_fib.res\", line 59, characters 3-10", iter(isEven(20000)), true);
-
-Mt.from_pair_suites("File \"tramp_fib.res\", line 61, characters 20-27", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.fib = fib;
-exports.u = u;
-exports.iter = iter;
-exports.isEven = isEven;
-exports.isOdd = isOdd;
-/* u Not a pure module */
diff --git a/jscomp/test/tramp_fib.res b/jscomp/test/tramp_fib.res
deleted file mode 100644
index da165a9..0000000
--- a/jscomp/test/tramp_fib.res
+++ /dev/null
@@ -1,61 +0,0 @@
-@@bs.config({flags: ["-w", "a", "-bs-noassertfalse"]})
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-type rec bounce<'a> = Continue('a) | Suspend((. unit) => bounce<'a>)
-/* https://eli.thegreenplace.net/2017/on-recursion-continuations-and-trampolines/ */
-/* http://gallium.inria.fr/seminaires/transparents/20141027.Frederic.Bour.pdf */
-/* http://www.usrsb.in/blog/blog/2012/08/12/bouncing-pythons-generators-with-a-trampoline/ */
-/* http://glat.info/jscheck/tomrec.html */
-let rec fib = (n, k) =>
-  switch n {
-  | 0 | 1 =>
-    /* k (Continue 1) [@bs] */
-    /* Suspend (fun [@bs]() -> k (Continue 1 ) [@bs]) */
-    k(. 1)
-  | _ =>
-    Suspend(
-      (. ()) =>
-        fib(n - 1, (. v0) =>
-          fib(n - 2, (. v1) =>
-            k(. v0 + v1)
-            /* match v0,v1 with
-             | Continue v0, Continue v1 -> */
-            /* k (Continue (v0 + v1)) [@bs] */
-            /* Suspend (fun [@bs]() -> k (Continue (v0 + v1)) [@bs]) */
-            /* | _ -> assert false */
-            /* FIXME: this branch completly gone */
-          )
-        ),
-    )
-  }
-
-let u = fib(10, (. x) => Continue(x))
-
-let rec iter = (bounce: bounce<'a>): 'a =>
-  switch bounce {
-  | Continue(v) => v
-  | Suspend(f) => iter(f(.))
-  }
-
-/* first it needs to be tailcall */
-let rec isEven = n =>
-  switch n {
-  | 0 => Continue(true)
-  | 1 => Continue(false)
-  | _ => Suspend((. ()) => isOdd(n - 1))
-  }
-and isOdd = n =>
-  switch n {
-  | 0 => Continue(false)
-  | 1 => Continue(true)
-  | _ => isEven(n - 1)
-  }
-/* Suspend (fun [@bs] () -> isEven (n - 1)) */
-eq(__LOC__, iter(u), 89)
-
-eq(__LOC__, isEven(20_000)->iter, true)
-
-Mt.from_pair_suites(__LOC__, suites.contents)
diff --git a/jscomp/test/tuple_alloc.js b/jscomp/test/tuple_alloc.js
deleted file mode 100644
index da5ac77..0000000
--- a/jscomp/test/tuple_alloc.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-var v = {
-  contents: 0
-};
-
-function reset(param) {
-  v.contents = 0;
-}
-
-function incr(param) {
-  v.contents = v.contents + 1 | 0;
-}
-
-var vv = {
-  contents: 0
-};
-
-function reset2(param) {
-  vv.contents = 0;
-}
-
-function incr2(param) {
-  v.contents = v.contents + 1 | 0;
-}
-
-function f(a, b, d, e) {
-  var h = Curry._1(a, b);
-  var u = Curry._1(d, h);
-  var v = Curry._1(e, h);
-  return u + v | 0;
-}
-
-function kf(cb, v) {
-  Curry._1(cb, v);
-  return v + v | 0;
-}
-
-function ikf(v) {
-  return kf((function (prim) {
-                
-              }), v);
-}
-
-exports.v = v;
-exports.reset = reset;
-exports.incr = incr;
-exports.reset2 = reset2;
-exports.incr2 = incr2;
-exports.f = f;
-exports.kf = kf;
-exports.ikf = ikf;
-/* No side effect */
diff --git a/jscomp/test/tuple_alloc.res b/jscomp/test/tuple_alloc.res
deleted file mode 100644
index 4ae3738..0000000
--- a/jscomp/test/tuple_alloc.res
+++ /dev/null
@@ -1,23 +0,0 @@
-let v = ref(0)
-
-let (reset, incr) = (_ => v := 0, _ => incr(v))
-
-let (reset2, incr2) = {
-  let vv = ref(0)
-  (() => vv := 0, () => incr(vv))
-}
-
-let f = (a, b, d, e) => {
-  let (u, v) = {
-    let h = a(b)
-    (d(h), e(h))
-  }
-  u + v
-}
-
-let kf = (cb, v) => {
-  cb(v)
-  v + v
-}
-
-let ikf = v => kf(ignore, v)
diff --git a/jscomp/test/type_disambiguate.js b/jscomp/test/type_disambiguate.js
deleted file mode 100644
index 430222f..0000000
--- a/jscomp/test/type_disambiguate.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var N = {};
-
-function f(e) {
-  return (e.a + e.b | 0) + e.c | 0;
-}
-
-function f1(e) {
-  var c = e.c;
-  return ((e.a + e.b | 0) + c | 0) + e.d(c) | 0;
-}
-
-exports.N = N;
-exports.f = f;
-exports.f1 = f1;
-/* No side effect */
diff --git a/jscomp/test/type_disambiguate.res b/jscomp/test/type_disambiguate.res
deleted file mode 100644
index 02c9400..0000000
--- a/jscomp/test/type_disambiguate.res
+++ /dev/null
@@ -1,20 +0,0 @@
-module N = {
-  type t<'a> = {
-    a: int,
-    b: int,
-    c: int,
-    d: 'a,
-  }
-}
-
-let f = (e: N.t<_>) => {
-  let {a, b, c} = e
-  a + b + c
-}
-
-type e = N.t<(. int) => int>
-
-let f1 = (e: e) => {
-  let {a, b, c, d} = e
-  a + b + c + d(. c)
-}
diff --git a/jscomp/test/typeof_test.js b/jscomp/test/typeof_test.js
deleted file mode 100644
index 0985549..0000000
--- a/jscomp/test/typeof_test.js
+++ /dev/null
@@ -1,191 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Js_types = require("../../lib/js/js_types.js");
-
-function string_or_number(x) {
-  var ty = Js_types.classify(x);
-  if (typeof ty !== "object") {
-    switch (ty) {
-      default:
-        return false;
-    }
-  } else {
-    switch (ty.TAG) {
-      case "JSNumber" :
-          console.log(ty._0 + 3);
-          return true;
-      case "JSString" :
-          console.log(ty._0 + "hei");
-          return true;
-      case "JSFunction" :
-          console.log("Function");
-          return false;
-      default:
-        return false;
-    }
-  }
-}
-
-var suites_0 = [
-  "int_type",
-  (function (param) {
-      return {
-              TAG: "Eq",
-              _0: "number",
-              _1: "number"
-            };
-    })
-];
-
-var suites_1 = {
-  hd: [
-    "string_type",
-    (function (param) {
-        return {
-                TAG: "Eq",
-                _0: "string",
-                _1: "string"
-              };
-      })
-  ],
-  tl: {
-    hd: [
-      "number_gadt_test",
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: Js_types.test(3, "Number"),
-                  _1: true
-                };
-        })
-    ],
-    tl: {
-      hd: [
-        "boolean_gadt_test",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: Js_types.test(true, "Boolean"),
-                    _1: true
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "undefined_gadt_test",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: Js_types.test(undefined, "Undefined"),
-                      _1: true
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "string_on_number1",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: string_or_number("xx"),
-                        _1: true
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "string_on_number2",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: string_or_number(3.02),
-                          _1: true
-                        };
-                })
-            ],
-            tl: {
-              hd: [
-                "string_on_number3",
-                (function (param) {
-                    return {
-                            TAG: "Eq",
-                            _0: string_or_number(function (x) {
-                                  return x;
-                                }),
-                            _1: false
-                          };
-                  })
-              ],
-              tl: {
-                hd: [
-                  "string_gadt_test",
-                  (function (param) {
-                      return {
-                              TAG: "Eq",
-                              _0: Js_types.test("3", "String"),
-                              _1: true
-                            };
-                    })
-                ],
-                tl: {
-                  hd: [
-                    "string_gadt_test_neg",
-                    (function (param) {
-                        return {
-                                TAG: "Eq",
-                                _0: Js_types.test(3, "String"),
-                                _1: false
-                              };
-                      })
-                  ],
-                  tl: {
-                    hd: [
-                      "function_gadt_test",
-                      (function (param) {
-                          return {
-                                  TAG: "Eq",
-                                  _0: Js_types.test((function (x) {
-                                          return x;
-                                        }), "Function"),
-                                  _1: true
-                                };
-                        })
-                    ],
-                    tl: {
-                      hd: [
-                        "object_gadt_test",
-                        (function (param) {
-                            return {
-                                    TAG: "Eq",
-                                    _0: Js_types.test({
-                                          x: 3
-                                        }, "Object"),
-                                    _1: true
-                                  };
-                          })
-                      ],
-                      tl: /* [] */0
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-var suites = {
-  hd: suites_0,
-  tl: suites_1
-};
-
-Mt.from_pair_suites("Typeof_test", suites);
-
-exports.string_or_number = string_or_number;
-exports.suites = suites;
-/*  Not a pure module */
diff --git a/jscomp/test/typeof_test.res b/jscomp/test/typeof_test.res
deleted file mode 100644
index 29119c2..0000000
--- a/jscomp/test/typeof_test.res
+++ /dev/null
@@ -1,43 +0,0 @@
-let string_or_number = (type t, x) => {
-  let ty = Js.Types.classify(x)
-  switch ty {
-  | JSString(v) =>
-    Js.log(v ++ "hei")
-    true /* type check */
-  | JSNumber(v) =>
-    Js.log(v +. 3.)
-    true /* type check */
-  | JSUndefined => false
-  | JSNull => false
-  | JSFalse | JSTrue => false
-  | JSFunction(_) =>
-    Js.log("Function")
-    false
-  | JSObject(_) => false
-  | JSSymbol(_) => false
-  | JSBigInt(_) => false
-  }
-}
-
-let suites = {
-  open Mt
-  list{
-    ("int_type", _ => Eq(Js.typeof(3), "number")),
-    ("string_type", _ => Eq(Js.typeof("x"), "string")),
-    ("number_gadt_test", _ => Eq(Js.Types.test(3, Number), true)),
-    ("boolean_gadt_test", _ => Eq(Js.Types.test(true, Boolean), true)),
-    /* assert.notDeepEqual(undefined,null) raises .. */
-    ("undefined_gadt_test", _ => Eq(Js.Types.test(Js.undefined, Undefined), true)),
-    /* "null_gadt_test", (fun _ -> Neq (Js.Types.test Js.null  Js.Null, Js.null )); */
-    /* there ['a Js.null] is one case that the value is already null  ' */
-    ("string_on_number1", _ => Eq(string_or_number("xx"), true)),
-    ("string_on_number2", _ => Eq(string_or_number(3.02), true)),
-    ("string_on_number3", _ => Eq(string_or_number(x => x), false)),
-    ("string_gadt_test", _ => Eq(Js.Types.test("3", String), true)),
-    ("string_gadt_test_neg", _ => Eq(Js.Types.test(3, String), false)),
-    ("function_gadt_test", _ => Eq(Js.Types.test(x => x, Function), true)),
-    ("object_gadt_test", _ => Eq(Js.Types.test({"x": 3}, Object), true)),
-  }
-}
-
-Mt.from_pair_suites(__MODULE__, suites)
diff --git a/jscomp/test/unboxed_attribute.js b/jscomp/test/unboxed_attribute.js
deleted file mode 100644
index 6f17c3a..0000000
--- a/jscomp/test/unboxed_attribute.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function u(param) {
-  return [
-          3,
-          u
-        ];
-}
-
-exports.u = u;
-/* No side effect */
diff --git a/jscomp/test/unboxed_attribute.res b/jscomp/test/unboxed_attribute.res
deleted file mode 100644
index cea831c..0000000
--- a/jscomp/test/unboxed_attribute.res
+++ /dev/null
@@ -1,4 +0,0 @@
-type rec func<'a, 'b, 'i> = ('i => res<'a, 'b, 'i>)
-@unboxed and res<'a, 'b, 'i> = Val(('b, func<'a, 'b, 'i>))
-
-let rec u = _ => Val(3, u)
\ No newline at end of file
diff --git a/jscomp/test/unboxed_attribute_test.js b/jscomp/test/unboxed_attribute_test.js
deleted file mode 100644
index 3e25b6f..0000000
--- a/jscomp/test/unboxed_attribute_test.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function make(x) {
-  return x;
-}
-
-function get(x) {
-  return x;
-}
-
-var x = "foo";
-
-eq("File \"unboxed_attribute_test.res\", line 19, characters 4-11", x, x);
-
-var x$1 = "foo";
-
-eq("File \"unboxed_attribute_test.res\", line 34, characters 5-12", x$1, x$1);
-
-var x$2 = "foo";
-
-eq("File \"unboxed_attribute_test.res\", line 43, characters 4-11", x$2, x$2);
-
-var y = {};
-
-y._0 = y;
-
-Mt.from_pair_suites("unboxed_attribute_test.res", suites.contents);
-
-var v0 = 3;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.v0 = v0;
-exports.make = make;
-exports.get = get;
-exports.y = y;
-/*  Not a pure module */
diff --git a/jscomp/test/unboxed_attribute_test.res b/jscomp/test/unboxed_attribute_test.res
deleted file mode 100644
index f8d62e4..0000000
--- a/jscomp/test/unboxed_attribute_test.res
+++ /dev/null
@@ -1,56 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-@unboxed type t = A(int)
-
-let v0 = A(3)
-
-let make = x => A(x)
-
-let get = (A(x)) => x
-
-/* For concrete types */
-@unboxed type t1 = A(string)
-
-{
-  let x = A("foo")
-  eq(
-    __LOC__,
-    Obj.repr(x),
-    Obj.repr(
-      switch x {
-      | A(s) => s
-      },
-    ),
-  )
-}
-
-/* For records */
-@unboxed type t2 = {f: string}
-
-{
-  let x = {f: "foo"}
-  eq(__LOC__, Obj.repr(x), Obj.repr(x.f))
-}
-
-/* For inline records */
-@unboxed type t3 = B({g: string})
-
-{
-  let x = B({g: "foo"})
-  eq(
-    __LOC__,
-    Obj.repr(x),
-    Obj.repr(
-      switch x {
-      | B({g}) => g
-      },
-    ),
-  )
-}
-
-type rec r = A(r)
-let rec y = A(y)
-
-let () = Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/unboxed_crash.js b/jscomp/test/unboxed_crash.js
deleted file mode 100644
index 59df909..0000000
--- a/jscomp/test/unboxed_crash.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function g(x) {
-  return Curry._1(x, x);
-}
-
-var loop = g(g);
-
-exports.g = g;
-exports.loop = loop;
-/* loop Not a pure module */
diff --git a/jscomp/test/unboxed_crash.res b/jscomp/test/unboxed_crash.res
deleted file mode 100644
index 691a871..0000000
--- a/jscomp/test/unboxed_crash.res
+++ /dev/null
@@ -1,21 +0,0 @@
-@@config({
-  flags: [
-    "-w",
-    "@A",
-    /* "-drawlambda"; */
-    /* "-dtypedtree"; */
-    /* "-bs-diagnose" */
-    /* "-dparsetree"; */
-    /* "-dsource"; */
-    /* "-bs-no-builtin-ppx"; */
-  ],
-})
-
-@unboxed type rec t = A(t => int)
-
-let g = x =>
-  switch x {
-  | A(v) => v(x)
-  }
-
-let loop = g(A(g))
diff --git a/jscomp/test/unboxed_use_case.js b/jscomp/test/unboxed_use_case.js
deleted file mode 100644
index 1be44ce..0000000
--- a/jscomp/test/unboxed_use_case.js
+++ /dev/null
@@ -1,48 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-function map_pair(r, param) {
-  return [
-          Curry._1(r, param[0]),
-          Curry._1(r, param[1])
-        ];
-}
-
-function u(x) {
-  return x;
-}
-
-map_pair(u, [
-      3,
-      true
-    ]);
-
-var hi = [
-  3,
-  2,
-  "x"
-];
-
-console.log(3);
-
-console.log("x");
-
-var v0 = {};
-
-Caml_obj.update_dummy(v0, {
-      NAME: "A",
-      VAL: v0
-    });
-
-var v1 = {
-  NAME: "A",
-  VAL: "B"
-};
-
-exports.hi = hi;
-exports.v0 = v0;
-exports.v1 = v1;
-/*  Not a pure module */
diff --git a/jscomp/test/unboxed_use_case.res b/jscomp/test/unboxed_use_case.res
deleted file mode 100644
index d05f2af..0000000
--- a/jscomp/test/unboxed_use_case.res
+++ /dev/null
@@ -1,55 +0,0 @@
-@unboxed type r = {f: 'a. 'a => 'a}
-
-let map_pair = (r, (p1, p2)) => (r.f(p1), r.f(p2))
-
-let u = {f: x => x}
-
-let sample = map_pair(u, (3, true))
-
-type para<_> = C
-@unboxed type rec t = H(para<_>): t
-
-@unboxed type rec any = Any('a): any
-
-let hi = [Any(3), Any(2), Any("x")]
-
-let dump = (any: any) =>
-  switch any {
-  | Any(v) => Js.log(v)
-  }
-
-let () = {
-  dump(Any(3))
-  dump(Any("x"))
-}
-
-/* https://inbox.ocaml.org/caml-list/CAAxsn=HhhmAAYfSCLzWgMW0Q-duTZNQBLQYDx8yETwWTjm16tw@mail.gmail.com/t/#u */
-type rec t3<'a, 'b> = [
-  | #A(t3_aux<int, string>)
-  | #B
-]
-@unboxed and t3_aux<'a, 'b> = {field: t3<'a, 'b>}
-
-let rec v0: t3<_> = #A({field: v0})
-let rec v1: t3<_> = #A({field: #B})
-
-/*
-module rec R:
-   sig
-     class ['a] container : 'a ->
-       object
-         method map : 'b. ('a -> 'b) -> 'b R.container_aux
-       end
-     type 'a container_aux = 
-        { container: 'a container }
-        [@@unboxed]
-   end =
-   struct
-     class ['a] container (v:'a) = object
-       method map : 'b. ('a -> 'b) -> 'b R.container_aux =
-         fun f -> { R.container = new R.container (f v) }
-     end
-     type 'a container_aux = 
-        { container: 'a container }
-        [@@unboxed]
-   end */
diff --git a/jscomp/test/unboxed_use_case.resi b/jscomp/test/unboxed_use_case.resi
deleted file mode 100644
index 32fe5d4..0000000
--- a/jscomp/test/unboxed_use_case.resi
+++ /dev/null
@@ -1,17 +0,0 @@
-type para<_>
-
-@unboxed type rec t = H(para<_>): t
-
-@unboxed type rec any = Any('a): any
-
-let hi: array<any>
-
-/* https://inbox.ocaml.org/caml-list/CAAxsn=HhhmAAYfSCLzWgMW0Q-duTZNQBLQYDx8yETwWTjm16tw@mail.gmail.com/t/#u */
-type rec t3<'a, 'b> = [
-  | #A(t3_aux<int, string>)
-  | #B
-]
-@unboxed and t3_aux<'a, 'b> = {field: t3<'a, 'b>}
-
-let v0: t3<'a, 'b>
-let v1: t3<'a, 'b>
diff --git a/jscomp/test/uncurried_cast.js b/jscomp/test/uncurried_cast.js
deleted file mode 100644
index 0e633f6..0000000
--- a/jscomp/test/uncurried_cast.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Belt_List = require("../../lib/js/belt_List.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-
-function raise(e) {
-  throw e;
-}
-
-var map = Belt_List.mapU;
-
-var List = {
-  map: map
-};
-
-var Uncurried = {
-  raise: raise,
-  List: List
-};
-
-var E = /* @__PURE__ */Caml_exceptions.create("Uncurried_cast.E");
-
-function testRaise(param) {
-  throw {
-        RE_EXN_ID: E,
-        Error: new Error()
-      };
-}
-
-var l = Belt_List.mapU({
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: /* [] */0
-      }
-    }, (function (x) {
-        return x + 1 | 0;
-      }));
-
-var partial_arg = {
-  hd: 1,
-  tl: {
-    hd: 2,
-    tl: /* [] */0
-  }
-};
-
-function partial(param) {
-  return map(partial_arg, param);
-}
-
-var ll = partial(function (x) {
-      return x + 1 | 0;
-    });
-
-function withOpts(xOpt, y, zOpt, w) {
-  var x = xOpt !== undefined ? xOpt : 3;
-  var z = zOpt !== undefined ? zOpt : 4;
-  return ((x + y | 0) + z | 0) + w | 0;
-}
-
-function still2Args(param, param$1) {
-  return withOpts(undefined, 4, param, param$1);
-}
-
-var anInt = Curry._1(still2Args, 3)(5);
-
-var StandardNotation = {
-  testRaise: testRaise,
-  l: l,
-  partial: partial,
-  ll: ll,
-  withOpts: withOpts,
-  still2Args: still2Args,
-  anInt: anInt
-};
-
-function testRaise$1() {
-  throw {
-        RE_EXN_ID: E,
-        Error: new Error()
-      };
-}
-
-var l$1 = Belt_List.mapU({
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: /* [] */0
-      }
-    }, (function (x) {
-        return x + 1 | 0;
-      }));
-
-var partial_arg$1 = {
-  hd: 1,
-  tl: {
-    hd: 2,
-    tl: /* [] */0
-  }
-};
-
-function partial$1(param) {
-  return map(partial_arg$1, param);
-}
-
-var ll$1 = partial$1(function (x) {
-      return x + 1 | 0;
-    });
-
-function withOpts$1(xOpt, y, zOpt, w) {
-  var x = xOpt !== undefined ? xOpt : 3;
-  var z = zOpt !== undefined ? zOpt : 4;
-  return ((x + y | 0) + z | 0) + w | 0;
-}
-
-function still2Args$1(param, param$1) {
-  return withOpts$1(undefined, 4, param, param$1);
-}
-
-var partial_arg$2 = 3;
-
-var anInt$1 = (function (param) {
-      return still2Args$1(partial_arg$2, param);
-    })(5);
-
-exports.Uncurried = Uncurried;
-exports.E = E;
-exports.StandardNotation = StandardNotation;
-exports.testRaise = testRaise$1;
-exports.l = l$1;
-exports.partial = partial$1;
-exports.ll = ll$1;
-exports.withOpts = withOpts$1;
-exports.still2Args = still2Args$1;
-exports.anInt = anInt$1;
-/* l Not a pure module */
diff --git a/jscomp/test/uncurried_cast.res b/jscomp/test/uncurried_cast.res
deleted file mode 100644
index 4a4684f..0000000
--- a/jscomp/test/uncurried_cast.res
+++ /dev/null
@@ -1,39 +0,0 @@
-module Uncurried = {
-  let raise = (. e) => raise(e)
-
-  module List = {
-    let map = (. l, f) => Belt.List.mapU(l, f)
-  }
-}
-
-exception E
-
-module StandardNotation = {
-  open Uncurried
-
-  let testRaise = () => raise(E)
-
-  let l = List.map(.list{1, 2}, (. x) => x + 1)
-  let partial = List.map(list{1, 2})
-  let ll = partial((. x) => x + 1)
-
-  let withOpts = (. ~x=3, y, ~z=4, w) => x + y + z + w
-  type unc2 = (. ~z: int=?, int) => int
-  let still2Args : unc2 = withOpts(4)
-  let anInt = still2Args(~z=3)(. 5)
-}
-
-@@uncurried.swap
-
-open Uncurried
-
-let testRaise = () => raise(E)
-
-let l = List.map(list{1, 2}, x => x + 1)
-let partial = List.map(. list{1, 2})
-let ll = partial(.x => x + 1)
-
-let withOpts = (~x=3, y, ~z=4, w) => x + y + z + w
-type unc2 = (~z: int=?, int) => int
-let still2Args : unc2 = withOpts(. 4)
-let anInt = still2Args(. ~z=3)(5)
diff --git a/jscomp/test/uncurried_default.args.js b/jscomp/test/uncurried_default.args.js
deleted file mode 100644
index 1c24e3b..0000000
--- a/jscomp/test/uncurried_default.args.js
+++ /dev/null
@@ -1,125 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-
-function withOpt(xOpt, y) {
-  var x = xOpt !== undefined ? xOpt : 1;
-  return function (zOpt, w) {
-    var z = zOpt !== undefined ? zOpt : 1;
-    return ((x + y | 0) + z | 0) + w | 0;
-  };
-}
-
-var testWithOpt = withOpt(undefined, 3)(undefined, 4);
-
-var partial_arg = 10;
-
-var partial = Curry._1((function (param) {
-            return withOpt(partial_arg, param);
-          })(3), 4)(11);
-
-var total = withOpt(10, 3)(4, 11);
-
-function foo1(xOpt, y) {
-  var x = xOpt !== undefined ? xOpt : 3;
-  return x + y | 0;
-}
-
-var x = 3;
-
-var r1 = x + 11 | 0;
-
-function foo2(y, xOpt, zOpt) {
-  var x = xOpt !== undefined ? xOpt : 3;
-  var z = zOpt !== undefined ? zOpt : 4;
-  return (x + y | 0) + z | 0;
-}
-
-var r2 = foo2(11, undefined, undefined);
-
-function foo3(xOpt, yOpt) {
-  var x = xOpt !== undefined ? xOpt : 3;
-  var y = yOpt !== undefined ? yOpt : 4;
-  return x + y | 0;
-}
-
-var r3 = foo3(undefined, undefined);
-
-var StandardNotation = {
-  withOpt: withOpt,
-  testWithOpt: testWithOpt,
-  partial: partial,
-  total: total,
-  foo1: foo1,
-  r1: r1,
-  foo2: foo2,
-  r2: r2,
-  foo3: foo3,
-  r3: r3
-};
-
-function withOpt$1(xOpt, y) {
-  var x = xOpt !== undefined ? xOpt : 1;
-  return function (zOpt, w) {
-    var z = zOpt !== undefined ? zOpt : 1;
-    return ((x + y | 0) + z | 0) + w | 0;
-  };
-}
-
-var testWithOpt$1 = withOpt$1(undefined, 3)(undefined, 4);
-
-var partial_arg$1 = 10;
-
-var partial$1 = Curry._1((function (param) {
-            return withOpt$1(partial_arg$1, param);
-          })(3), 4)(11);
-
-var total$1 = withOpt$1(10, 3)(4, 11);
-
-function foo1$1(xOpt, y) {
-  var x = xOpt !== undefined ? xOpt : 3;
-  return x + y | 0;
-}
-
-var x$1 = 3;
-
-var r1$1 = x$1 + 11 | 0;
-
-function foo2$1(y, xOpt, zOpt) {
-  var x = xOpt !== undefined ? xOpt : 3;
-  var z = zOpt !== undefined ? zOpt : 4;
-  return (x + y | 0) + z | 0;
-}
-
-var r2$1 = foo2$1(11, undefined, undefined);
-
-function foo3$1(xOpt, yOpt) {
-  var x = xOpt !== undefined ? xOpt : 3;
-  var y = yOpt !== undefined ? yOpt : 4;
-  return x + y | 0;
-}
-
-var r3$1 = foo3$1(undefined, undefined);
-
-function foo(func) {
-  return func() + 1 | 0;
-}
-
-var M = {
-  foo: foo
-};
-
-exports.StandardNotation = StandardNotation;
-exports.withOpt = withOpt$1;
-exports.testWithOpt = testWithOpt$1;
-exports.partial = partial$1;
-exports.total = total$1;
-exports.foo1 = foo1$1;
-exports.r1 = r1$1;
-exports.foo2 = foo2$1;
-exports.r2 = r2$1;
-exports.foo3 = foo3$1;
-exports.r3 = r3$1;
-exports.M = M;
-/* testWithOpt Not a pure module */
diff --git a/jscomp/test/uncurried_default.args.res b/jscomp/test/uncurried_default.args.res
deleted file mode 100644
index 386e426..0000000
--- a/jscomp/test/uncurried_default.args.res
+++ /dev/null
@@ -1,39 +0,0 @@
-module StandardNotation = {
-  let withOpt = (. ~x=1, y) => (. ~z=1, w) => x+y+z+w
-  let testWithOpt = withOpt(. 3)(. 4)
-  let partial = withOpt(~x=10)(3)(~z=4)(11)
-  let total = withOpt(. ~x=10, 3)(. ~z=4, 11)
-
-  let foo1 = (. ~x=3, ~y) => x+y
-  let r1 = foo1(. ~y=11)
-
-  let foo2 = (. ~y, ~x=3, ~z=4) => x+y+z
-  let r2 = foo2(. ~y=11)
-
-  let foo3 = (. ~x=3, ~y=4) => x+y
-  let r3 = foo3(. )
-}
-
-@@uncurried.swap
-
-open StandardNotation
-
-let withOpt = (~x=1, y) => (~z=1, w) => x+y+z+w
-let testWithOpt = withOpt(3)(4)
-let partial = withOpt(. ~x=10)(. 3)(. ~z=4)(. 11)
-let total = withOpt(~x=10, 3)(~z=4, 11)
-
-let foo1 = (~x=3, ~y) => x+y
-let r1 = foo1(~y=11)
-
-let foo2 = (~y, ~x=3, ~z=4) => x+y+z
-let r2 = foo2(~y=11)
-
-let foo3 = (~x=3, ~y=4) => x+y
-let r3 = foo3()
-
-module M: {
-  let foo: (unit => int) => int
-} = {
-  let foo = func => func() + 1
-}
diff --git a/jscomp/test/uncurried_pipe.js b/jscomp/test/uncurried_pipe.js
deleted file mode 100644
index 99620a8..0000000
--- a/jscomp/test/uncurried_pipe.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function add(x, y) {
-  return x + y | 0;
-}
-
-function addC(x, y) {
-  return x + y | 0;
-}
-
-var v7 = 7;
-
-var v17 = 17;
-
-var v27 = 27;
-
-var v37 = 37;
-
-function unary(x) {
-  return x + 1 | 0;
-}
-
-var StandardNotation = {
-  add: add,
-  addC: addC,
-  v7: v7,
-  v17: v17,
-  v27: v27,
-  v37: v37,
-  unary: unary
-};
-
-var v7$1 = 7;
-
-var v17$1 = 17;
-
-var v27$1 = 27;
-
-var v37$1 = 37;
-
-var v100 = 100;
-
-exports.StandardNotation = StandardNotation;
-exports.v7 = v7$1;
-exports.v17 = v17$1;
-exports.v27 = v27$1;
-exports.v37 = v37$1;
-exports.v100 = v100;
-/* No side effect */
diff --git a/jscomp/test/uncurried_pipe.res b/jscomp/test/uncurried_pipe.res
deleted file mode 100644
index 3bc4f17..0000000
--- a/jscomp/test/uncurried_pipe.res
+++ /dev/null
@@ -1,22 +0,0 @@
-module StandardNotation = {
-  let add = (. x, y) => x + y
-  let addC = (x, y) => x + y
-
-  let v7 = 3->add(. 4)
-  let v17 = 10->add(. 3->add(. 4))
-  let v27 = 20->add(. 3->addC(4))
-  let v37 = 30->addC(3->add(. 4))
-
-  let unary = (. x) => x + 1
-}
-
-@@uncurried.swap
-
-open StandardNotation
-
-let v7 = 3->add(4)
-let v17 = 10->add(3->add(4))
-let v27 = 20->add(3->addC(. 4))
-let v37 = 30->addC(. 3->add(4))
-
-let v100 = 99->unary
diff --git a/jscomp/test/uncurry_external_test.js b/jscomp/test/uncurry_external_test.js
deleted file mode 100644
index 7c8ecf3..0000000
--- a/jscomp/test/uncurry_external_test.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function sum(a,b){
-  return a + b
-}
-;
-
-var h = sum(1.0, 2.0);
-
-eq("File \"uncurry_external_test.res\", line 19, characters 12-19", h, 3);
-
-Mt.from_pair_suites("Uncurry_external_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.h = h;
-/*  Not a pure module */
diff --git a/jscomp/test/uncurry_external_test.res b/jscomp/test/uncurry_external_test.res
deleted file mode 100644
index 6d4f17e..0000000
--- a/jscomp/test/uncurry_external_test.res
+++ /dev/null
@@ -1,20 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-%%raw(`
-function sum(a,b){
-  return a + b
-}
-`)
-
-external sum: (. float, float) => float = "sum"
-
-let h = sum(. 1.0, 2.0)
-
-let () = eq(__LOC__, h, 3.)
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/uncurry_glob_test.js b/jscomp/test/uncurry_glob_test.js
deleted file mode 100644
index 0c9c40a..0000000
--- a/jscomp/test/uncurry_glob_test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function M(U) {
-  var v = U.f(100, "x");
-  return {
-          v: v
-        };
-}
-
-function f() {
-  return 3;
-}
-
-function $plus$great(a, h) {
-  return h(a);
-}
-
-function u(h) {
-  return h(3);
-}
-
-exports.M = M;
-exports.f = f;
-exports.$plus$great = $plus$great;
-exports.u = u;
-/* No side effect */
diff --git a/jscomp/test/uncurry_glob_test.res b/jscomp/test/uncurry_glob_test.res
deleted file mode 100644
index dbac292..0000000
--- a/jscomp/test/uncurry_glob_test.res
+++ /dev/null
@@ -1,15 +0,0 @@
-module M = (
-  U: {
-    let f: (. int, string) => string
-  },
-) => {
-  let v = U.f(. 100, "x")
-}
-
-let f = (. ()) => 3
-
-let u = f(.)
-
-let \"+>" = (. a, h: (. _) => int) => h(. a)
-
-let u = h => \"+>"(. 3, h)
diff --git a/jscomp/test/uncurry_test.js b/jscomp/test/uncurry_test.js
deleted file mode 100644
index bca59b1..0000000
--- a/jscomp/test/uncurry_test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f0() {
-  return 0;
-}
-
-function f1(a0) {
-  return a0;
-}
-
-function f2(a0, a1) {
-  return [
-          a0,
-          a1
-        ];
-}
-
-console.log(0);
-
-console.log(0);
-
-console.log([
-      0,
-      1
-    ]);
-
-function xx() {
-  while(true) {
-    continue ;
-  };
-}
-
-function log2(logger, message, obj) {
-  logger.log2(message, obj);
-}
-
-exports.f0 = f0;
-exports.f1 = f1;
-exports.f2 = f2;
-exports.xx = xx;
-exports.log2 = log2;
-/*  Not a pure module */
diff --git a/jscomp/test/uncurry_test.res b/jscomp/test/uncurry_test.res
deleted file mode 100644
index 04dd1e3..0000000
--- a/jscomp/test/uncurry_test.res
+++ /dev/null
@@ -1,16 +0,0 @@
-type t<'a0, 'a1> = (. 'a0) => 'a1
-
-let f0 = (. ()) => 0
-let f1 = (. a0) => a0
-let f2 = (. a0, a1) => (a0, a1)
-
-f0(.)->Js.log
-f1(. 0)->Js.log
-
-f2(. 0, 1)->Js.log
-
-let rec xx = (. ()) => xx(.)
-
-type logger = {log2: 'a. (. string, 'a) => unit}
-
-let log2 = (logger, message, obj) => logger.log2(. message, obj)
diff --git a/jscomp/test/uncurry_test.resi b/jscomp/test/uncurry_test.resi
deleted file mode 100644
index e7a17bb..0000000
--- a/jscomp/test/uncurry_test.resi
+++ /dev/null
@@ -1,10 +0,0 @@
-type t<'a0, 'a1> = (. 'a0) => 'a1
-let f0: (. unit) => int
-let f1: (. 'a) => 'a
-let f2: (. 'a, 'b) => ('a, 'b)
-
-let xx: (. unit) => 'a
-
-type logger = {log2: 'a. (. string, 'a) => unit}
-
-let log2 :(logger, string, 'a) => unit
diff --git a/jscomp/test/undef_regression2_test.js b/jscomp/test/undef_regression2_test.js
deleted file mode 100644
index 4339df8..0000000
--- a/jscomp/test/undef_regression2_test.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function ok(loc, x) {
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Ok",
-                  _0: x
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-var match = typeof ___undefined_value === "undefined" ? undefined : ___undefined_value;
-
-var a = match !== undefined ? 2 : 1;
-
-function test(param) {
-  var match = typeof __DEV__ === "undefined" ? undefined : __DEV__;
-  if (match !== undefined) {
-    console.log("dev mode");
-  } else {
-    console.log("producton mode");
-  }
-}
-
-function test2(param) {
-  var f = typeof __filename === "undefined" ? undefined : __filename;
-  if (f !== undefined) {
-    console.log(f);
-  } else {
-    console.log("non node environment");
-  }
-}
-
-function test3(param) {
-  if (Caml_option.undefined_to_opt(typeof __DEV__ === "undefined" ? undefined : __DEV__) === undefined) {
-    console.log("production mode");
-    return ;
-  }
-  
-}
-
-function f(x) {
-  return x === undefined;
-}
-
-ok("File \"undef_regression2_test.res\", line 40, characters 5-12", a > 0);
-
-eq("File \"undef_regression2_test.res\", line 41, characters 5-12", a, 1);
-
-Mt.from_pair_suites("Undef_regression2_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.ok = ok;
-exports.a = a;
-exports.test = test;
-exports.test2 = test2;
-exports.test3 = test3;
-exports.f = f;
-/* match Not a pure module */
diff --git a/jscomp/test/undef_regression2_test.res b/jscomp/test/undef_regression2_test.res
deleted file mode 100644
index 4a7bbab..0000000
--- a/jscomp/test/undef_regression2_test.res
+++ /dev/null
@@ -1,44 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-let ok = (loc, x) => {
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Ok(x)), ...suites.contents}
-}
-
-let a = switch %external(___undefined_value) {
-| None => 1
-| Some(_) => 2
-}
-
-let test = () =>
-  switch %external(__DEV__) {
-  | Some(_) => Js.log("dev mode")
-  | None => Js.log("producton mode")
-  }
-
-let test2 = () =>
-  switch %external(__filename) {
-  | Some(f) => Js.log(f)
-  | None => Js.log("non node environment")
-  }
-
-let test3 = () =>
-  if %external(__DEV__) == None {
-    Js.log("production mode")
-  }
-
-let f = x => x == Js.undefined
-
-let () = {
-  ok(__LOC__, a > 0)
-  eq(__LOC__, a, 1)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/undef_regression_test.js b/jscomp/test/undef_regression_test.js
deleted file mode 100644
index 35ece56..0000000
--- a/jscomp/test/undef_regression_test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(obj) {
-  if (typeof obj === "function") {
-    return ;
-  }
-  var size = obj.length;
-  if (size !== undefined) {
-    console.log(size);
-    return ;
-  }
-  
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/undef_regression_test.res b/jscomp/test/undef_regression_test.res
deleted file mode 100644
index b81e30f..0000000
--- a/jscomp/test/undef_regression_test.res
+++ /dev/null
@@ -1,12 +0,0 @@
-@get external size_of_t: Obj.t => Js.undefined<'a> = "length"
-
-let f = obj =>
-  if Js.typeof(obj) == "function" {
-    ()
-  } else {
-    let size = size_of_t(obj)
-    switch Js.Undefined.toOption(size) {
-    | None => ()
-    | Some(s) => Js.log(s)
-    }
-  } /* TODO: This case should be peepwholed .. */
diff --git a/jscomp/test/undefine_conditional.js b/jscomp/test/undefine_conditional.js
deleted file mode 100644
index 1124e51..0000000
--- a/jscomp/test/undefine_conditional.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-var x = 3;
-
-var y = 6;
-
-var has_ocaml_version = true;
-
-exports.x = x;
-exports.y = y;
-exports.has_ocaml_version = has_ocaml_version;
-/* No side effect */
diff --git a/jscomp/test/undefine_conditional.res b/jscomp/test/undefine_conditional.res
deleted file mode 100644
index 3ff37fa..0000000
--- a/jscomp/test/undefine_conditional.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let x = 3
-
-let y = 6
-
-let has_ocaml_version = true
diff --git a/jscomp/test/unicode_type_error.js b/jscomp/test/unicode_type_error.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/unicode_type_error.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/unicode_type_error.res b/jscomp/test/unicode_type_error.res
deleted file mode 100644
index 4ae3c50..0000000
--- a/jscomp/test/unicode_type_error.res
+++ /dev/null
@@ -1,5 +0,0 @@
-/* let f () = */
-
-/* {j|这是一串很长的中文啊|j} */
-
-/* let x = 1 + "x" */
diff --git a/jscomp/test/unit_undefined_test.js b/jscomp/test/unit_undefined_test.js
deleted file mode 100644
index 4a43c97..0000000
--- a/jscomp/test/unit_undefined_test.js
+++ /dev/null
@@ -1,82 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_option = require("../../lib/js/caml_option.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  Mt.eq_suites(test_id, suites, loc, x, y);
-}
-
-function f_01(param) {
-  return hi(function (x) {
-              if (x === undefined) {
-                console.log("x");
-                return ;
-              }
-              
-            });
-}
-
-function u(x) {
-  if (x > 3) {
-    return 1;
-  } else if (x < 2) {
-    return 2;
-  } else if (x > 4) {
-    return 0;
-  } else {
-    return 3;
-  }
-}
-
-function fx(param) {
-  
-}
-
-function u0(x) {
-  return Caml_option.some(x);
-}
-
-var u1 = Caml_option.some(undefined);
-
-function u2(x) {
-  return Caml_option.some(x);
-}
-
-var u3 = Caml_option.some(undefined);
-
-eq("File \"unit_undefined_test.res\", line 41, characters 3-10", Caml_option.some(), Caml_option.some(undefined));
-
-eq("File \"unit_undefined_test.res\", line 42, characters 3-10", u1, Caml_option.some(undefined));
-
-eq("File \"unit_undefined_test.res\", line 43, characters 3-10", Caml_option.some(), Caml_option.some(undefined));
-
-eq("File \"unit_undefined_test.res\", line 44, characters 3-10", u3, Caml_option.some(undefined));
-
-eq("File \"unit_undefined_test.res\", line 45, characters 3-10", undefined, undefined);
-
-Mt.from_pair_suites("unit_undefined_test.res", suites.contents);
-
-var u4;
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f_01 = f_01;
-exports.u = u;
-exports.fx = fx;
-exports.u0 = u0;
-exports.u1 = u1;
-exports.u2 = u2;
-exports.u3 = u3;
-exports.u4 = u4;
-/*  Not a pure module */
diff --git a/jscomp/test/unit_undefined_test.res b/jscomp/test/unit_undefined_test.res
deleted file mode 100644
index 492cc01..0000000
--- a/jscomp/test/unit_undefined_test.res
+++ /dev/null
@@ -1,47 +0,0 @@
-@@bs.config({
-  flags: [
-    /* "-bs-diagnose" */
-    /* ; "-drawlambda" */
-    /* ; "-dtypedtree" */
-  ],
-})
-
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => Mt.eq_suites(~test_id, ~suites, loc, x, y)
-
-@val external hi: (@uncurry(1) (unit => unit)) => int = "hi"
-
-let f_01 = () =>
-  hi((() as x) =>
-    if x == () {
-      Js.log("x")
-    }
-  ) /* FIXME: not inlined */
-
-let u = x =>
-  switch () {
-  | () if x > 3 => 1
-  | () if x < 2 => 2
-  | () if x > 4 => 0
-  | () => 3
-  }
-
-let fx = () => ()
-
-let u0 = (x: unit) => Some(x)
-
-let u1 = Some()
-type t = unit
-
-let u2 = (x: t) => Some(x)
-let u3: option<t> = Some()
-let u4: t = ()
-
-eq(__LOC__, u0(), Obj.magic(Some(None)))
-eq(__LOC__, u1, Obj.magic(Some(None)))
-eq(__LOC__, u2(), Obj.magic(Some(None)))
-eq(__LOC__, u3, Obj.magic(Some(None)))
-eq(__LOC__, u4, Obj.magic(None))
-
-Mt.from_pair_suites(__FILE__, suites.contents)
diff --git a/jscomp/test/unitest_string.js b/jscomp/test/unitest_string.js
deleted file mode 100644
index d856702..0000000
--- a/jscomp/test/unitest_string.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
diff --git a/jscomp/test/unitest_string.res b/jscomp/test/unitest_string.res
deleted file mode 100644
index 8b13789..0000000
--- a/jscomp/test/unitest_string.res
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/jscomp/test/unsafe_full_apply_primitive.js b/jscomp/test/unsafe_full_apply_primitive.js
deleted file mode 100644
index 49880f3..0000000
--- a/jscomp/test/unsafe_full_apply_primitive.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function f(a) {
-  while(true) {
-    continue ;
-  };
-}
-
-exports.f = f;
-/* No side effect */
diff --git a/jscomp/test/unsafe_full_apply_primitive.res b/jscomp/test/unsafe_full_apply_primitive.res
deleted file mode 100644
index b4e7de1..0000000
--- a/jscomp/test/unsafe_full_apply_primitive.res
+++ /dev/null
@@ -1,5 +0,0 @@
-let rec f = (. a) => f(. a)
-
-/* not allowed due to special encoding of unit */
-/* let rec f1 = fun [@bs] () -> f1 () [@bs] */
-/* let rec f2 = Sys.opaque_identity (fun () -> f2 ()) */
diff --git a/jscomp/test/unsafe_ppx_test.js b/jscomp/test/unsafe_ppx_test.js
deleted file mode 100644
index e3ec3bd..0000000
--- a/jscomp/test/unsafe_ppx_test.js
+++ /dev/null
@@ -1,117 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Curry = require("../../lib/js/curry.js");
-var Pervasives = require("../../lib/js/pervasives.js");
-var Ffi_js_test = require("./ffi_js_test.js");
-
-var x = "\\x01\\x02\\x03";
-
-var max = Math.max;
-
-function $$test(x,y){
-  return x + y;
-}
-;
-
-var regression3 = Math.max;
-
-var regression4 = Math.max;
-
-function g(a) {
-  var regression = (function(x,y){
-   return ""
-});
-  var regression2 = Math.max;
-  regression(a, Pervasives.failwith);
-  Curry._2(regression2, 3, 2);
-  regression3(3, 2);
-  regression4(3, (function (x) {
-          return x;
-        }));
-}
-
-var max2 = Math.max;
-
-function umax(a, b) {
-  return max2(a, b);
-}
-
-function u(h) {
-  return max2(3, h);
-}
-
-var max3 = Math.max;
-
-function uu(h) {
-  return max2(3, h);
-}
-
-var empty = Object.keys(3);
-
-var v = $$test(1, 2);
-
-Mt.from_pair_suites("Unsafe_ppx_test", {
-      hd: [
-        "unsafe_max",
-        (function (param) {
-            return {
-                    TAG: "Eq",
-                    _0: 2,
-                    _1: max(1, 2)
-                  };
-          })
-      ],
-      tl: {
-        hd: [
-          "unsafe_test",
-          (function (param) {
-              return {
-                      TAG: "Eq",
-                      _0: 3,
-                      _1: v
-                    };
-            })
-        ],
-        tl: {
-          hd: [
-            "unsafe_max2",
-            (function (param) {
-                return {
-                        TAG: "Eq",
-                        _0: 2,
-                        _1: Math.max(1, 2)
-                      };
-              })
-          ],
-          tl: {
-            hd: [
-              "ffi_keys",
-              (function (param) {
-                  return {
-                          TAG: "Eq",
-                          _0: ["a"],
-                          _1: Ffi_js_test.keys({a : 3})
-                        };
-                })
-            ],
-            tl: /* [] */0
-          }
-        }
-      }
-    });
-
-exports.x = x;
-exports.max = max;
-exports.regression3 = regression3;
-exports.regression4 = regression4;
-exports.g = g;
-exports.max2 = max2;
-exports.umax = umax;
-exports.u = u;
-exports.max3 = max3;
-exports.uu = uu;
-exports.empty = empty;
-exports.v = v;
-/* max Not a pure module */
diff --git a/jscomp/test/unsafe_ppx_test.res b/jscomp/test/unsafe_ppx_test.res
deleted file mode 100644
index 7bc594e..0000000
--- a/jscomp/test/unsafe_ppx_test.res
+++ /dev/null
@@ -1,62 +0,0 @@
-let x: string = %raw(`"\\x01\\x02\\x03"`)
-
-let max: (. float, float) => float = %raw("Math.max")
-
-let u = v => max(. 1., v)
-/* let max2 : float -> float -> float = [%bs.raw {Math.max} ] */
-%%raw(`
-
-function $$test(x,y){
-  return x + y;
-}
-`)
-
-let regression3: (. float, float) => float = %raw("Math.max")
-
-let regression4: (. float, (. float) => float) => float = %raw("Math.max")
-let g = a => {
-  let regression: (float, string => 'a) => string = %raw(`function(x,y){
-   return ""
-}`)
-
-  let regression2: (float, float) => float = %raw("Math.max")
-  \"@@"(ignore, regression(a, failwith))
-  \"@@"(ignore, regression2(3., 2.))
-  \"@@"(ignore, regression3(. 3., 2.))
-  \"@@"(ignore, regression4(.3., (. x) => x))
-}
-
-let max2: (. float, float) => float = %raw("Math.max")
-
-let umax = (a, b) => max2(. a, b)
-let u = h => max2(. 3., h)
-
-let max3: (. (float, float)) => float = %raw("Math.max")
-let uu = h => max2(. 3., h)
-
-@val("$$test") external test: (int, int) => int = ""
-
-let empty = (%raw(` Object.keys`): (. _) => array<string>)(. 3)
-
-let v = test(1, 2)
-
-/* type v = width:int -> int [@bs] */
-/* class type t = object */
-/* method exit : ?code:int -> unit -> unit */
-/* end [@bs] */
-/* see #570 */
-
-type vv = (. int) => int
-
-Mt.from_pair_suites(
-  __MODULE__,
-  {
-    open Mt
-    list{
-      ("unsafe_max", _ => Eq(2., max(. 1., 2.))),
-      ("unsafe_test", _ => Eq(3, v)),
-      ("unsafe_max2", _ => Eq(2, (%raw(`Math.max`): (. int, int) => int)(. 1, 2))),
-      ("ffi_keys", _ => Eq(["a"], Ffi_js_test.keys(. %raw(` {a : 3}`)))),
-    }
-  },
-)
diff --git a/jscomp/test/update_record_test.js b/jscomp/test/update_record_test.js
deleted file mode 100644
index d02cbf8..0000000
--- a/jscomp/test/update_record_test.js
+++ /dev/null
@@ -1,84 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Mt = require("./mt.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-
-var suites = {
-  contents: /* [] */0
-};
-
-var test_id = {
-  contents: 0
-};
-
-function eq(loc, x, y) {
-  console.log([
-        x,
-        y
-      ]);
-  test_id.contents = test_id.contents + 1 | 0;
-  suites.contents = {
-    hd: [
-      loc + (" id " + String(test_id.contents)),
-      (function (param) {
-          return {
-                  TAG: "Eq",
-                  _0: x,
-                  _1: y
-                };
-        })
-    ],
-    tl: suites.contents
-  };
-}
-
-function f(x) {
-  var y = Caml_obj.obj_dup(x);
-  return {
-          a0: 1,
-          a1: y.a1,
-          a2: y.a2,
-          a3: y.a3,
-          a4: y.a4,
-          a5: y.a5
-        };
-}
-
-eq("File \"update_record_test.res\", line 28, characters 5-12", 1, f({
-          a0: 0,
-          a1: 0,
-          a2: 0,
-          a3: 0,
-          a4: 0,
-          a5: 0
-        }).a0);
-
-var val0 = {
-  "invalid_js_id'": 3,
-  x: 2
-};
-
-function fff(x) {
-  return {
-          "invalid_js_id'": x["invalid_js_id'"] + 2 | 0,
-          x: x.x
-        };
-}
-
-var val1 = fff(val0);
-
-eq("File \"update_record_test.res\", line 41, characters 5-12", 3, 3);
-
-eq("File \"update_record_test.res\", line 42, characters 5-12", val1["invalid_js_id'"], 5);
-
-Mt.from_pair_suites("Update_record_test", suites.contents);
-
-exports.suites = suites;
-exports.test_id = test_id;
-exports.eq = eq;
-exports.f = f;
-exports.val0 = val0;
-exports.fff = fff;
-exports.val1 = val1;
-/*  Not a pure module */
diff --git a/jscomp/test/update_record_test.res b/jscomp/test/update_record_test.res
deleted file mode 100644
index c545774..0000000
--- a/jscomp/test/update_record_test.res
+++ /dev/null
@@ -1,45 +0,0 @@
-let suites: ref<Mt.pair_suites> = ref(list{})
-let test_id = ref(0)
-let eq = (loc, x, y) => {
-  Js.log((x, y))
-  incr(test_id)
-  suites :=
-    list{(loc ++ (" id " ++ string_of_int(test_id.contents)), _ => Mt.Eq(x, y)), ...suites.contents}
-}
-
-type t = {
-  a0: int,
-  a1: int,
-  a2: int,
-  a3: int,
-  a4: int,
-  a5: int,
-  /* a6 : int ; */
-  /* mutable a7 : int ; */
-}
-
-let f = (x: t) => {
-  let y: t = Obj.magic(Obj.dup(Obj.repr(x)))
-  {...y, a0: 1}
-}
-
-let () = {
-  let v = {a0: 0, a1: 0, a2: 0, a3: 0, a4: 0, a5: 0}
-  eq(__LOC__, v.a0 + 1, f(v).a0)
-}
-
-type t0 = {
-  invalid_js_id': int,
-  x: int,
-}
-let val0 = {invalid_js_id': 3, x: 2}
-let fff = x => {...x, invalid_js_id': x.invalid_js_id' + 2}
-
-let val1 = fff(val0)
-
-let () = {
-  eq(__LOC__, val0.invalid_js_id', 3)
-  eq(__LOC__, val1.invalid_js_id', 5)
-}
-
-let () = Mt.from_pair_suites(__MODULE__, suites.contents)
diff --git a/jscomp/test/variant.js b/jscomp/test/variant.js
deleted file mode 100644
index dfdf630..0000000
--- a/jscomp/test/variant.js
+++ /dev/null
@@ -1,183 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Curry = require("../../lib/js/curry.js");
-var Caml_obj = require("../../lib/js/caml_obj.js");
-var Caml_exceptions = require("../../lib/js/caml_exceptions.js");
-var Caml_js_exceptions = require("../../lib/js/caml_js_exceptions.js");
-
-function foo(x) {
-  if (typeof x !== "object") {
-    if (x === "A1") {
-      return 1;
-    } else {
-      return 2;
-    }
-  }
-  switch (x.TAG) {
-    case "B" :
-        return x._0;
-    case "C" :
-        return x._0 + x._1 | 0;
-    case "D" :
-        var match = x._0;
-        return match[0] + match[1] | 0;
-    
-  }
-}
-
-function fooA1(x) {
-  if (typeof x !== "object" && x === "A1") {
-    return 1;
-  } else {
-    return 42;
-  }
-}
-
-function fooC(x) {
-  if (typeof x !== "object" || x.TAG !== "C") {
-    return 42;
-  } else {
-    return x._0 + x._1 | 0;
-  }
-}
-
-function switchNum(x) {
-  switch (x) {
-    case 0 :
-        return "0";
-    case 1 :
-        return "1";
-    case 2 :
-        return "2";
-    default:
-      return "_";
-  }
-}
-
-var same = Caml_obj.equal;
-
-var compare = Caml_obj.compare;
-
-var Path = {
-  same: same,
-  compare: compare
-};
-
-function Make(M) {
-  var find = function (x) {
-    
-  };
-  return {
-          find: find
-        };
-}
-
-function find(x) {
-  
-}
-
-var M = {
-  find: find
-};
-
-function rollback_path(subst, p) {
-  try {
-    return "try";
-  }
-  catch (raw_exn){
-    var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
-    if (exn.RE_EXN_ID === "Not_found") {
-      switch (p.TAG) {
-        case "Pdot" :
-            return "Pdot";
-        case "Pident" :
-        case "Papply" :
-            return "Pident | Papply";
-        
-      }
-    } else {
-      throw exn;
-    }
-  }
-}
-
-var EA1 = /* @__PURE__ */Caml_exceptions.create("Variant.EA1");
-
-var EA2 = /* @__PURE__ */Caml_exceptions.create("Variant.EA2");
-
-var EB = /* @__PURE__ */Caml_exceptions.create("Variant.EB");
-
-var EC = /* @__PURE__ */Caml_exceptions.create("Variant.EC");
-
-var ED = /* @__PURE__ */Caml_exceptions.create("Variant.ED");
-
-function fooExn(f) {
-  try {
-    return Curry._1(f, undefined);
-  }
-  catch (raw_n){
-    var n = Caml_js_exceptions.internalToOCamlException(raw_n);
-    if (n.RE_EXN_ID === EA1) {
-      return 1;
-    }
-    if (n.RE_EXN_ID === EA2) {
-      return 2;
-    }
-    if (n.RE_EXN_ID === EB) {
-      return n._1;
-    }
-    if (n.RE_EXN_ID === EC) {
-      return n._1 + n._2 | 0;
-    }
-    if (n.RE_EXN_ID === ED) {
-      var match = n._1;
-      return match[0] + match[1] | 0;
-    }
-    throw n;
-  }
-}
-
-var a1 = "A1";
-
-var a2 = "A2";
-
-var b = {
-  TAG: "B",
-  _0: 34
-};
-
-var c = {
-  TAG: "C",
-  _0: 4,
-  _1: 2
-};
-
-var d = {
-  TAG: "D",
-  _0: [
-    4,
-    2
-  ]
-};
-
-exports.a1 = a1;
-exports.a2 = a2;
-exports.b = b;
-exports.c = c;
-exports.d = d;
-exports.foo = foo;
-exports.fooA1 = fooA1;
-exports.fooC = fooC;
-exports.switchNum = switchNum;
-exports.Path = Path;
-exports.Make = Make;
-exports.M = M;
-exports.rollback_path = rollback_path;
-exports.EA1 = EA1;
-exports.EA2 = EA2;
-exports.EB = EB;
-exports.EC = EC;
-exports.ED = ED;
-exports.fooExn = fooExn;
-/* No side effect */
diff --git a/jscomp/test/variant.res b/jscomp/test/variant.res
deleted file mode 100644
index ece2b81..0000000
--- a/jscomp/test/variant.res
+++ /dev/null
@@ -1,87 +0,0 @@
-type pair = (int, int)
-
-type v = A1 | A2 | B(int) | C(int, int) | D(pair)
-
-let a1 = A1
-let a2 = A2
-
-let b = B(34)
-
-let c = C(4, 2)
-
-let d = D(4, 2)
-
-let foo = x =>
-  switch x {
-  | A1 => 1
-  | A2 => 2
-  | B(n) => n
-  | C(n, m) => n + m
-  | D(n, m) => n + m
-  }
-
-let fooA1 = x =>
-  switch x {
-  | A1 => 1
-  | _ => 42
-  }
-
-let fooC = x =>
-  switch x {
-  | C(n, m) => n + m
-  | _ => 42
-  }
-
-let switchNum = x =>
-  switch x {
-  | 0 => "0"
-  | 1 => "1"
-  | 2 => "2"
-  | _ => "_"
-  }
-
-module Path = {
-  type rec t =
-    | Pident(string)
-    | Pdot(t, string, int)
-    | Papply(t, t)
-  let same = \"="
-  let compare = compare
-}
-
-module Make = (
-  M: {
-    type t = Path.t
-  },
-) => {
-  type t = M.t
-  let find = (x: t) => ()
-}
-
-module M = Make(Path)
-
-let rollback_path = (subst, p) => {
-  let _ = M.find(p)
-  try "try" catch {
-  | Not_found =>
-    switch p {
-    | Pident(_) | Papply(_) => "Pident | Papply"
-    | Pdot(_) => "Pdot"
-    }
-  }
-}
-
-exception EA1
-exception EA2
-exception EB(int)
-exception EC(int, int)
-exception ED(pair)
-
-let fooExn = f =>
-  try f() catch {
-  | EA1 => 1
-  | EA2 => 2
-  | EB(n) => n
-  | EC(n, m) => n + m
-  | ED(n, m) => n + m
-  }
diff --git a/jscomp/test/variantsMatching.gen.tsx b/jscomp/test/variantsMatching.gen.tsx
deleted file mode 100644
index b1344de..0000000
--- a/jscomp/test/variantsMatching.gen.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-/* TypeScript file generated from variantsMatching.res by genType. */
-
-/* eslint-disable */
-/* tslint:disable */
-
-export type t = "thisIsA" | 42 | null | "D" | 3.14;
-
-export type tNU = null | undefined;
-
-export type MyUndefined_t<a> = undefined | a;
-
-export type MyNull_t<a> = null | a;
-
-export type MyNullable_t<a> = null | undefined | a;
-
-export type MyNullableExtended_t<a> = null | undefined | "WhyNotAnotherOne" | a;
-
-export type UntaggedWithBool_t = string | number | boolean | string;
-
-export type UntaggedWithTuple_t = string | [number, number, string];
diff --git a/jscomp/test/variantsMatching.js b/jscomp/test/variantsMatching.js
deleted file mode 100644
index 3008087..0000000
--- a/jscomp/test/variantsMatching.js
+++ /dev/null
@@ -1,445 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-
-function toEnum(x) {
-  switch (x) {
-    case "thisIsA" :
-        return 0;
-    case 42 :
-        return 1;
-    case null :
-        return 2;
-    case "D" :
-        return 3;
-    case 3.14 :
-        return 5;
-    
-  }
-}
-
-function toString(x) {
-  switch (x) {
-    case "thisIsA" :
-        return "A";
-    case 42 :
-        return "B";
-    case null :
-        return "C";
-    case "D" :
-        return "D";
-    case 3.14 :
-        return "Pi";
-    
-  }
-}
-
-function bar(x) {
-  switch (x) {
-    case "thisIsA" :
-    case 3.14 :
-        return 10;
-    default:
-      return 0;
-  }
-}
-
-function and_(x, y) {
-  if (x === "True" && y === "True") {
-    return "True";
-  } else {
-    return "False";
-  }
-}
-
-function id(x) {
-  if (x === "True") {
-    return "True";
-  } else {
-    return "False";
-  }
-}
-
-function not_(x) {
-  if (x === "True") {
-    return "False";
-  } else {
-    return "True";
-  }
-}
-
-function st(state) {
-  if (typeof state !== "object") {
-    return 0;
-  } else {
-    return 23;
-  }
-}
-
-function showToJs(x) {
-  if (typeof x !== "object" && x === "No") {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-function third(l) {
-  if (!l) {
-    return false;
-  }
-  if (l.hd !== 1) {
-    return false;
-  }
-  var match = l.tl;
-  if (!match) {
-    return false;
-  }
-  if (match.hd !== 2) {
-    return false;
-  }
-  var match$1 = match.tl;
-  if (match$1 && !(match$1.hd !== 3 || match$1.tl)) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function third2(l) {
-  if (typeof l !== "object") {
-    return false;
-  }
-  if (l._0 !== 1) {
-    return false;
-  }
-  var match = l._1;
-  if (typeof match !== "object") {
-    return false;
-  }
-  if (match._0 !== 2) {
-    return false;
-  }
-  var match$1 = match._1;
-  if (typeof match$1 !== "object") {
-    return false;
-  }
-  if (match$1._0 !== 3) {
-    return false;
-  }
-  var tmp = match$1._1;
-  if (typeof tmp !== "object") {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-function foo(x) {
-  if (typeof x !== "object") {
-    switch (x) {
-      case "dd" :
-          return 1;
-      case 12 :
-          return 2;
-      case false :
-          return 3;
-      
-    }
-  } else {
-    switch (x.TAG) {
-      case "qq" :
-          return 4;
-      case 42 :
-          return 5;
-      case "F" :
-          return 6;
-      
-    }
-  }
-}
-
-var CustomizeTags_d = {
-  TAG: "qq",
-  _0: 42
-};
-
-var CustomizeTags_e = {
-  TAG: 42,
-  _0: 0
-};
-
-var CustomizeTags = {
-  foo: foo,
-  a: "dd",
-  b: 12,
-  c: false,
-  d: CustomizeTags_d,
-  e: CustomizeTags_e
-};
-
-function isUndefined(x) {
-  return x === undefined;
-}
-
-function plus(x, y) {
-  if (x === undefined) {
-    return y;
-  } else if (y === undefined) {
-    return x;
-  } else {
-    return x + y | 0;
-  }
-}
-
-var MyUndefined = {
-  $$undefined: undefined,
-  isUndefined: isUndefined,
-  plus: plus
-};
-
-function isNull(x) {
-  return x === null;
-}
-
-function plus$1(x, y) {
-  if (x === null) {
-    return y;
-  } else if (y === null) {
-    return x;
-  } else {
-    return x + y | 0;
-  }
-}
-
-var MyNull_null = null;
-
-var MyNull = {
-  $$null: MyNull_null,
-  isNull: isNull,
-  plus: plus$1
-};
-
-function isNull$1(x) {
-  return x === null;
-}
-
-function isUndefined$1(x) {
-  return x === undefined;
-}
-
-function plus$2(x, y) {
-  if (x === null || x === undefined) {
-    return y;
-  } else if (y === null || y === undefined) {
-    return x;
-  } else {
-    return x + y | 0;
-  }
-}
-
-function kind(x) {
-  if (x === null || x === undefined) {
-    if (x === null) {
-      return "null";
-    } else {
-      return "undefined";
-    }
-  } else {
-    return "present";
-  }
-}
-
-var expectSeven = plus$2(3, 4);
-
-console.log("expect 7:", expectSeven);
-
-var MyNullable_null = null;
-
-var MyNullable = {
-  $$null: MyNullable_null,
-  $$undefined: undefined,
-  isNull: isNull$1,
-  isUndefined: isUndefined$1,
-  plus: plus$2,
-  kind: kind,
-  expectSeven: expectSeven
-};
-
-function isNull$2(x) {
-  return x === null;
-}
-
-function isUndefined$2(x) {
-  return x === undefined;
-}
-
-function isWhyNot(x) {
-  return x === "WhyNotAnotherOne";
-}
-
-function plus$3(x, y) {
-  if (x === undefined || x === null || x === "WhyNotAnotherOne") {
-    switch (x) {
-      case null :
-      case undefined :
-          return y;
-      case "WhyNotAnotherOne" :
-          break;
-      
-    }
-  } else if (!(y === undefined || y === null || y === "WhyNotAnotherOne")) {
-    return {
-            x: x.x + y.x,
-            y: x.y + y.y
-          };
-  }
-  if (!(y === undefined || y === null || y === "WhyNotAnotherOne")) {
-    return "WhyNotAnotherOne";
-  }
-  switch (y) {
-    case null :
-    case undefined :
-        return x;
-    case "WhyNotAnotherOne" :
-        return "WhyNotAnotherOne";
-    
-  }
-}
-
-function kind$1(x) {
-  if (!(x === undefined || x === null || x === "WhyNotAnotherOne")) {
-    return "present";
-  }
-  switch (x) {
-    case null :
-        return "null";
-    case undefined :
-        return "undefined";
-    case "WhyNotAnotherOne" :
-        return "whynot";
-    
-  }
-}
-
-var expectSeven$1 = plus$3({
-      x: 4,
-      y: 3
-    }, {
-      x: 3,
-      y: 4
-    });
-
-console.log("expect {x:7, y:7}:", expectSeven$1);
-
-var MyNullableExtended_null = null;
-
-var MyNullableExtended = {
-  $$null: MyNullableExtended_null,
-  $$undefined: undefined,
-  whynot: "WhyNotAnotherOne",
-  isNull: isNull$2,
-  isUndefined: isUndefined$2,
-  isWhyNot: isWhyNot,
-  plus: plus$3,
-  kind: kind$1,
-  expectSeven: expectSeven$1
-};
-
-function area(shape) {
-  switch (shape.kind) {
-    case 1 :
-        return Math.PI * Math.pow(shape.radius, 2);
-    case "square" :
-        return Math.pow(shape.sideLength, 2);
-    case "rectangle" :
-        return shape.width * shape.height;
-    
-  }
-}
-
-var TaggedUnions_circle = {
-  kind: 1,
-  radius: 10
-};
-
-var TaggedUnions_square = {
-  kind: "square",
-  sideLength: 10
-};
-
-var TaggedUnions = {
-  area: area,
-  circle: TaggedUnions_circle,
-  square: TaggedUnions_square
-};
-
-var CustomTagNotInline_a = {
-  "custom-tag": "A",
-  _0: 10
-};
-
-var CustomTagNotInline_b = {
-  "custom-tag": "B",
-  _0: 20
-};
-
-var CustomTagNotInline = {
-  a: CustomTagNotInline_a,
-  b: CustomTagNotInline_b
-};
-
-function classify(x) {
-  switch (typeof x) {
-    case "string" :
-        return "string";
-    case "number" :
-        return "int";
-    case "boolean" :
-        if (x) {
-          return "true";
-        } else {
-          return "boolean";
-        }
-    case "object" :
-        return "Object" + x.name;
-    
-  }
-}
-
-var UntaggedWithBool = {
-  classify: classify
-};
-
-function classify$1(x) {
-  if (typeof x === "string") {
-    return "string";
-  } else {
-    return "tuple";
-  }
-}
-
-var UntaggedWithTuple = {
-  classify: classify$1
-};
-
-exports.toEnum = toEnum;
-exports.toString = toString;
-exports.bar = bar;
-exports.and_ = and_;
-exports.id = id;
-exports.not_ = not_;
-exports.st = st;
-exports.showToJs = showToJs;
-exports.third = third;
-exports.third2 = third2;
-exports.CustomizeTags = CustomizeTags;
-exports.MyUndefined = MyUndefined;
-exports.MyNull = MyNull;
-exports.MyNullable = MyNullable;
-exports.MyNullableExtended = MyNullableExtended;
-exports.TaggedUnions = TaggedUnions;
-exports.CustomTagNotInline = CustomTagNotInline;
-exports.UntaggedWithBool = UntaggedWithBool;
-exports.UntaggedWithTuple = UntaggedWithTuple;
-/* expectSeven Not a pure module */
diff --git a/jscomp/test/variantsMatching.res b/jscomp/test/variantsMatching.res
deleted file mode 100644
index 7770393..0000000
--- a/jscomp/test/variantsMatching.res
+++ /dev/null
@@ -1,299 +0,0 @@
-@@config({flags: ["-bs-gentype"]})
-
-@genType
-type t = | @as("thisIsA") A | @as(42) B | @as(null) C | D | @as(3.14) Pi
-
-@genType
-type tNU = | @as(null) N | @as(undefined) U
-
-let toEnum = x =>
-  switch x {
-  | A => 0
-  | B => 1
-  | C => 2
-  | D => 3
-  | Pi => 5
-  }
-
-let toString = x =>
-  switch x {
-  | A => "A"
-  | B => "B"
-  | C => "C"
-  | D => "D"
-  | Pi => "Pi"
-  }
-
-let bar = x =>
-  switch x {
-  | A => 10
-  | B | C | D => 0
-  | Pi => 10
-  }
-
-type b = True | False
-
-let and_ = (x, y) =>
-  switch (x, y) {
-  | (True, False) => False
-  | (False, True) => False
-  | (False, False) => False
-  | (True, True) => True
-  }
-
-let id = x =>
-  switch x {
-  | True => True
-  | False => False
-  }
-
-let not_ = x =>
-  switch x {
-  | True => False
-  | False => True
-  }
-
-type state =
-  | Empty
-  | Int1(int)
-  | Int2(int)
-let st = state =>
-  switch state {
-  | Empty => 0
-  | Int2(intValue)
-  | Int1(intValue) => 23
-  }
-
-type show = No | After(int) | Yes
-
-let showToJs = x =>
-  switch x {
-  | Yes | After(_) => true
-  | No => false
-  }
-
-let third = l =>
-  switch l {
-  | list{1, 2, 3} => true
-  | _ => false
-  }
-
-type rec lst = Empty | Cons(int, lst)
-
-let third2 = l =>
-  switch l {
-  | Cons(1, Cons(2, Cons(3, Empty))) => true
-  | _ => false
-  }
-
-module CustomizeTags = {
-  type t = | @as("dd") A | @as(12) B | @as(false) C | @as("qq") D(int) | @as(42) E(int) | F(string)
-
-  let foo = x =>
-    switch x {
-    | A => 1
-    | B => 2
-    | C => 3
-    | D(_) => 4
-    | E(_) => 5
-    | F(_) => 6
-    }
-
-  let a = A
-  let b = B
-  let c = C
-  let d = D(42)
-  let e = E(0)
-}
-
-module MyUndefined = {
-  @genType @unboxed
-  type t<'a> = | @as(undefined) Undefined | Present('a)
-  // Note: 'a must not have undefined as value
-  // There can be only one with payload, with 1 argument, to use unboxed
-
-  let undefined = Undefined
-
-  let isUndefined = x => x == Undefined
-
-  let plus = (x, y) =>
-    switch (x, y) {
-    | (Undefined, _) => y
-    | (_, Undefined) => x
-    | (Present(n), Present(m)) => Present(n + m)
-    }
-}
-
-module MyNull = {
-  @genType @unboxed
-  type t<'a> = | @as(null) Null | Present('a)
-  // Note: 'a must not have null as value
-  // There can be only one with payload, with 1 argument, to use unboxed
-
-  let null = Null
-
-  let isNull = x => x == Null
-
-  let plus = (x, y) =>
-    switch (x, y) {
-    | (Null, _) => y
-    | (_, Null) => x
-    | (Present(n), Present(m)) => Present(n + m)
-    }
-}
-
-module MyNullable = {
-  @genType @unboxed
-  type t<'a> =
-    | @as(null) Null
-    | @as(undefined) Undefined
-    | Present('a)
-  // Note: 'a must not have null or undefined as value
-  // There can be only one with payload, with 1 argument, to use unboxed
-
-  let null = Null
-  let undefined = Undefined
-
-  let isNull = x => x == Null
-  let isUndefined = x => x == Undefined
-
-  let plus = (x, y) =>
-    switch (x, y) {
-    | (Null | Undefined, _) => y
-    | (_, Null | Undefined) => x
-    | (Present(x), Present(y)) => Present(x + y)
-    }
-
-  let kind = x =>
-    switch x {
-    | Null => "null"
-    | Undefined => "undefined"
-    | Present(_) => "present"
-    }
-
-  let expectSeven = plus(Present(3), Present(4))
-  Js.log2("expect 7:", expectSeven)
-}
-
-module MyNullableExtended = {
-  @genType @unboxed
-  type t<'a> =
-    | @as(null) Null
-    | @as(undefined) Undefined
-    | Present('a)
-    | WhyNotAnotherOne
-  // Note: 'a must be a not have null or something that's not an object as value
-  // There can be only one with payload, with 1 argument, to use unboxed
-
-  let null = Null
-  let undefined = Undefined
-  let whynot = WhyNotAnotherOne
-
-  let isNull = x => x == Null
-  let isUndefined = x => x == Undefined
-  let isWhyNot = x => x == WhyNotAnotherOne
-
-  type vector = {x: float, y: float}
-
-  let plus = (x, y) =>
-    switch (x, y) {
-    | (Null | Undefined, _) => y
-    | (_, Null | Undefined) => x
-    | (WhyNotAnotherOne, _) | (_, WhyNotAnotherOne) => WhyNotAnotherOne
-    | (Present({x: x1, y: y1}), Present({x: x2, y: y2})) => Present({x: x1 +. x2, y: y1 +. y2})
-    }
-
-  let kind = x =>
-    switch x {
-    | Null => "null"
-    | Undefined => "undefined"
-    | Present(_) => "present"
-    | WhyNotAnotherOne => "whynot"
-    }
-
-  let expectSeven = plus(Present({x: 4., y: 3.}), Present({x: 3., y: 4.}))
-  Js.log2("expect {x:7, y:7}:", expectSeven)
-}
-
-module TaggedUnions = {
-  /*
-  type Circle = {
-    kind: 1; // Number literal
-    radius: number;
-  };
-
-  type Square = {
-    kind: "square"; // String literal
-    sideLength: number;
-  };
-
-  type Rectangle = {
-    kind: "rectangle"; // String literal
-    width: number;
-    height: number;
-  };
-
-  type Shape = Circle | Square | Rectangle;
-
-  function area(shape: Shape): number {
-    switch (shape.kind) {
-      case 1: // Circle
-        return Math.PI * shape.radius ** 2;
-      case "square": // Square
-        return shape.sideLength ** 2;
-      case "rectangle": // Rectangle
-        return shape.width * shape.height;
-      default:
-        throw new Error("Invalid shape kind");
-    }
-  }
-*/
-  @tag("kind")
-  type shape =
-    | @as(1) Circle({radius: float})
-    | @as("square") Square({sideLength: float})
-    | @as("rectangle") Rectangle({width: float, height: float})
-
-  let area = (shape: shape): float => {
-    switch shape {
-    | Circle({radius}) => Js.Math._PI *. radius ** 2.
-    | Square({sideLength}) => sideLength ** 2.
-    | Rectangle({width, height}) => width *. height
-    }
-  }
-
-  let circle = Circle({radius: 10.})
-  let square = Square({sideLength: 10.})
-}
-
-module CustomTagNotInline = {
-  @tag("custom-tag")
-  type t = A(int) | B(int)
-  let a = A(10)
-  let b = B(20)
-}
-
-module UntaggedWithBool = {
-  @unboxed @genType
-  type t = String(string) | Float(float) | Bool(bool) | Object({name: string})
-
-  let classify = x =>
-    switch x {
-    | String(_) => "string"
-    | Float(_) => "int"
-    | Bool(true) => "true"
-    | Bool(_) => "boolean"
-    | Object({name}) => "Object" ++ name
-    }
-}
-
-module UntaggedWithTuple = {
-  @unboxed @genType
-  type t = String(string) | Tuple((int, float, string)) 
-
-  let classify = x =>
-    switch x {
-    | String(_) => "string"
-    | Tuple(_) => "tuple"
-    }
-}
diff --git a/jscomp/test/webpack_config.js b/jscomp/test/webpack_config.js
deleted file mode 100644
index eea17ea..0000000
--- a/jscomp/test/webpack_config.js
+++ /dev/null
@@ -1,81 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var List = require("../../lib/js/list.js");
-var List$1 = require("List");
-var List$2 = require("reactV");
-var List$3 = require("reactX");
-var Local = require("./local");
-var WebpackConfigJs = require("../../../webpack.config.js");
-var WebpackMiddlewareConfigJs = require("../../../webpack.middleware.config.js");
-
-var configx = WebpackConfigJs;
-
-var WebpackConfig = {
-  configx: configx
-};
-
-var configx$1 = WebpackMiddlewareConfigJs;
-
-var WebpackDevMiddlewareConfig = {
-  configx: configx$1
-};
-
-function configX(prim) {
-  return WebpackMiddlewareConfigJs.configX();
-}
-
-function configX$1(prim) {
-  return WebpackConfigJs.configX();
-}
-
-var U = {
-  configX: configX$1
-};
-
-var A = {};
-
-var B = {};
-
-function f(param) {
-  return [
-          (function (prim) {
-              List$3.ff();
-            }),
-          (function (prim) {
-              List$3.ff2();
-            }),
-          (function (prim) {
-              List$2.ff();
-            }),
-          (function (prim) {
-              List$2.ff2();
-            })
-        ];
-}
-
-List$1.xx();
-
-List.length({
-      hd: 1,
-      tl: {
-        hd: 2,
-        tl: /* [] */0
-      }
-    });
-
-List.length(/* [] */0);
-
-function ff(prim) {
-  return Local.ff();
-}
-
-exports.WebpackConfig = WebpackConfig;
-exports.WebpackDevMiddlewareConfig = WebpackDevMiddlewareConfig;
-exports.configX = configX;
-exports.U = U;
-exports.A = A;
-exports.B = B;
-exports.f = f;
-exports.ff = ff;
-/* configx Not a pure module */
diff --git a/jscomp/test/webpack_config.res b/jscomp/test/webpack_config.res
deleted file mode 100644
index 96f6ede..0000000
--- a/jscomp/test/webpack_config.res
+++ /dev/null
@@ -1,37 +0,0 @@
-module type Config = {
-  let configx: Js.Json.t
-}
-module WebpackConfig: Config = {
-  @module external configx: Js.Json.t = "../../../webpack.config.js"
-}
-
-module WebpackDevMiddlewareConfig: Config = {
-  @module external configx: Js.Json.t = "../../../webpack.middleware.config.js"
-}
-
-@module("../../../webpack.middleware.config.js") @val
-external configX: unit => Js.Json.t = "configX"
-
-let configX = configX
-module U: {
-  let configX: unit => Js.Json.t
-} = {
-  @module("../../../webpack.config.js") @val external configX: unit => Js.Json.t = "configX"
-}
-@module("List") external hey: unit => unit = "xx"
-module A = {
-  @module(("reactX", "List")) external ff: unit => unit = "ff"
-  @module(("reactX", "List")) external ff2: unit => unit = "ff2"
-}
-module B = {
-  @module(("reactV", "List")) external ff: unit => unit = "ff"
-  @module(("reactV", "List")) external ff2: unit => unit = "ff2"
-}
-
-let f = () => (A.ff, A.ff2, B.ff, B.ff2)
-hey()
-
-(List.length(list{1, 2}), List.length(list{}))->ignore
-
-type t
-@module("./local") external ff: unit => t = "ff"
diff --git a/lib/Iterator.ml b/lib/Iterator.ml
index ec34579..60a3574 100644
--- a/lib/Iterator.ml
+++ b/lib/Iterator.ml
@@ -78,14 +78,6 @@ let withModuleBinding iterator f callback =
         (match res with Rule.LintError (msg, loc) -> callback (msg, loc) | Rule.LintOk -> ()) ;
         iterator.Ast_iterator.module_binding iterator1 module_binding ) }
 
-let withClassTypeDeclaration iterator f callback =
-  { iterator with
-    Ast_iterator.class_type_declaration=
-      (fun iterator1 class_type_declaration ->
-        let res = f class_type_declaration in
-        (match res with Rule.LintError (msg, loc) -> callback (msg, loc) | Rule.LintOk -> ()) ;
-        iterator.Ast_iterator.class_type_declaration iterator1 class_type_declaration ) }
-
 (* Callbacks for linting errors vs warnings *)
 type callbacks = {errorCallback: string * Location.t -> unit; warningCallback: string * Location.t -> unit}
 
@@ -106,7 +98,6 @@ let makeIterator rules callbacks =
       | Rule.LintValueBinding lintFunc -> withValueBinding iterator lintFunc callback
       | Rule.LintTypeDeclaration lintFunc -> withTypeDeclaration iterator lintFunc callback
       | Rule.LintModuleBinding lintFunc -> withModuleBinding iterator lintFunc callback
-      | Rule.LintClassTypeDeclaration lintFunc -> withClassTypeDeclaration iterator lintFunc callback
     in
     List.fold_left buildIterator iterator R.linters
   in
diff --git a/lib/Linter.ml b/lib/Linter.ml
index e0b628d..d2634b6 100644
--- a/lib/Linter.ml
+++ b/lib/Linter.ml
@@ -61,7 +61,7 @@ let run configPath path (outputJson : bool) =
   (* if you want to target the printer use: let mode = Res_parser.Default in*)
   let p = Res_parser.make ~mode:Res_parser.Default src path in
   let comments = p.comments in
-  let ast = Res_core.parseImplementation p in
+  let ast = Res_core.parse_implementation p in
   match p.diagnostics with
   | [] -> (
       let errors, warnings = lint rules ast comments in
@@ -84,5 +84,5 @@ let run configPath path (outputJson : bool) =
               Printer.printHelp () ; exit 1 ) )
   | diagnostics ->
       (* parser contains problems *)
-      Res_diagnostics.printReport diagnostics src ;
+      Res_diagnostics.print_report diagnostics src ;
       exit 1
diff --git a/lib/Printer.ml b/lib/Printer.ml
index 269bbfb..82be460 100644
--- a/lib/Printer.ml
+++ b/lib/Printer.ml
@@ -60,27 +60,25 @@ module PrettyPrint = struct
 
   let header_of_message_kind = function `error -> "-- Lint Error! --" | `warning -> "-- Lint Warning --"
 
-  let print message_kind src msg d =
+  let print message_kind _src msg d =
     Misc.Color.setup !Clflags.color ;
     Code_frame.setup !Clflags.color ;
-    Format.fprintf Format.std_formatter "@[<v>@,  %a@,  %s@,@]"
-      (Location.print ~src:(Some src) ~message_kind (header_of_message_kind message_kind))
+    Format.fprintf Format.std_formatter "@[<v>@,  %s@,  %a@,  %s@,@]"
+      (header_of_message_kind message_kind)
+      Location.print_loc
       Location.{loc_start= d.loc_start; loc_end= d.loc_end; loc_ghost= false}
-      msg ;
-    List.iter
-      (Format.fprintf Format.std_formatter "@,@[%a@]" (Location.default_error_reporter ~src:(Some src)))
-      []
+      msg
 
-  let asOutput message_kind src msg d =
+  let asOutput message_kind _src msg d =
     let buf = Buffer.create 128 in
     let fmt = Format.formatter_of_buffer buf in
     Misc.Color.setup !Clflags.color ;
     Code_frame.setup !Clflags.color ;
-    Format.fprintf fmt "@[<v>@,  %a@,  %s@,@]"
-      (Location.print ~src:(Some src) ~message_kind (header_of_message_kind message_kind))
+    Format.fprintf fmt "@[<v>@,  %s@,  %a@,  %s@,@]"
+      (header_of_message_kind message_kind)
+      Location.print_loc
       Location.{loc_start= d.loc_start; loc_end= d.loc_end; loc_ghost= false}
       msg ;
-    List.iter (Format.fprintf fmt "@,@[%a@]" (Location.default_error_reporter ~src:(Some src))) [] ;
     Format.pp_print_flush fmt () ;
     Buffer.contents buf
 
diff --git a/lib/Rule.ml b/lib/Rule.ml
index b3d8160..6eb70fb 100644
--- a/lib/Rule.ml
+++ b/lib/Rule.ml
@@ -11,7 +11,7 @@ type linter =
   | LintValueBinding of (Parsetree.value_binding -> lintResult)
   | LintTypeDeclaration of (Parsetree.type_declaration -> lintResult)
   | LintModuleBinding of (Parsetree.module_binding -> lintResult)
-  | LintClassTypeDeclaration of (Parsetree.class_type_declaration -> lintResult)
+(* | LintClassTypeDeclaration of (Parsetree.class_type_declaration -> lintResult) *)
 
 (* These are additional options that are parsed along side the rule name and the rule-specific options
  * These rules are common to all rules and can be used to modify the behavior of the rule
diff --git a/lib/dune b/lib/dune
index 6c7ee79..eb6b99f 100644
--- a/lib/dune
+++ b/lib/dune
@@ -2,6 +2,6 @@
 
 (library
  (name rescript_linter)
- (libraries unix yojson ppx_deriving_yojson.runtime rescript_compiler)
+ (libraries unix yojson ppx_deriving_yojson.runtime compiler)
  (preprocess
   (pps ppx_deriving_yojson)))
diff --git a/lib/rules/DisallowModuleRule.ml b/lib/rules/DisallowModuleRule.ml
index 2a64ea2..afd2893 100644
--- a/lib/rules/DisallowModuleRule.ml
+++ b/lib/rules/DisallowModuleRule.ml
@@ -69,9 +69,10 @@ module Make (OPT : Rule.OPTIONS with type options = Options.options) (LinterOpti
         (* match M.function or M.attribute *)
         | { Parsetree.pexp_desc=
               Pexp_apply
-                ( { pexp_desc= Pexp_ident {txt= Longident.Ldot (Longident.Lident ident, _)}
-                  ; Parsetree.pexp_loc= loc }
-                , _ ) }
+                { funct=
+                    { pexp_desc= Pexp_ident {txt= Longident.Ldot (Longident.Lident ident, _)}
+                    ; Parsetree.pexp_loc= loc }
+                ; args= _ } }
           when ident = op ->
             Rule.LintError (meta.ruleDescription, loc)
         | _ -> Rule.LintOk )
diff --git a/lib/rules/DisallowedAttributeRule.ml b/lib/rules/DisallowedAttributeRule.ml
index dd7ad9c..fdf371f 100644
--- a/lib/rules/DisallowedAttributeRule.ml
+++ b/lib/rules/DisallowedAttributeRule.ml
@@ -59,9 +59,6 @@ module Make (OPT : Rule.OPTIONS with type options = Options.options) (LinterOpti
         | Pstr_modtype mtd -> makeResult "module type" description_with_type mtd.pmtd_attributes
         | Pstr_open open_declaration ->
             makeResult "open" description_with_type open_declaration.popen_attributes
-        | Pstr_class () -> Rule.LintOk
-        (* Handled by lintClassTypeDeclaration *)
-        | Pstr_class_type _class_type_decls -> Rule.LintOk
         | Pstr_include include_declaration ->
             makeResult "include" description_with_type include_declaration.pincl_attributes
         | Pstr_attribute attr -> makeResult "attribute" description_with_type [attr]
@@ -91,8 +88,10 @@ module Make (OPT : Rule.OPTIONS with type options = Options.options) (LinterOpti
   let lintModuleBinding =
     Rule.LintModuleBinding (fun mb -> makeResult "module" description_with_type mb.pmb_attributes)
 
+  (*
   let lintClassTypeDeclaration =
     Rule.LintClassTypeDeclaration (fun ctd -> makeResult "class type" description_with_type ctd.pci_attributes)
+  *)
 
   let linters =
     [ lintExpresion
@@ -102,6 +101,6 @@ module Make (OPT : Rule.OPTIONS with type options = Options.options) (LinterOpti
     ; lintLabelDeclaration
     ; lintValueBinding
     ; lintTypeDeclaration
-    ; lintModuleBinding
-    ; lintClassTypeDeclaration ]
+    ; lintModuleBinding ]
+  (*; lintClassTypeDeclaration ] *)
 end
diff --git a/lib/rules/DisallowedEmbeddedRegexLiteralRule.ml b/lib/rules/DisallowedEmbeddedRegexLiteralRule.ml
index cb88683..1705387 100644
--- a/lib/rules/DisallowedEmbeddedRegexLiteralRule.ml
+++ b/lib/rules/DisallowedEmbeddedRegexLiteralRule.ml
@@ -60,7 +60,8 @@ let getAllVariablesUsedInJsReTest src =
   let callback (pair : string * Warnings.loc) = variables := !variables @ [pair] in
   let lintFunc expr =
     match expr with
-    | {Parsetree.pexp_desc= Parsetree.Pexp_apply ({pexp_desc= Pexp_ident {txt= exprTxt; loc= expr_loc}}, args)}
+    | { Parsetree.pexp_desc=
+          Parsetree.Pexp_apply {funct= {pexp_desc= Pexp_ident {txt= exprTxt; loc= expr_loc}}; args} }
       when contains (intercalate "." (Longident.flatten exprTxt)) "Js.Re.test_" -> (
       match safeHead args with
       | Some (_label, {Parsetree.pexp_desc= Parsetree.Pexp_ident {txt= lident}}) ->
@@ -69,11 +70,11 @@ let getAllVariablesUsedInJsReTest src =
     | _ -> LintOk
   in
   let iterator = Iterator.withExpression Ast_iterator.default_iterator lintFunc callback in
-  let ast = Res_core.parseImplementation p in
+  let ast = Res_core.parse_implementation p in
   match p.diagnostics with
   | [] -> iterator.structure iterator ast ; !variables
   | diagnostics ->
-      Res_diagnostics.printReport diagnostics src ;
+      Res_diagnostics.print_report diagnostics src ;
       exit 1
 
 let getAllVariablesUsedInJsReTests path =
@@ -108,7 +109,7 @@ module Make (OPT : Rule.OPTIONS with type options = Options.options) (LinterOpti
       (fun expr ->
         match expr with
         (* matches some_func(..., %re("regex")) *)
-        | {Parsetree.pexp_desc= Pexp_apply (_, args)} when containsRegex args ->
+        | {Parsetree.pexp_desc= Pexp_apply {args; _}} when containsRegex args ->
             (* Rescript_parser.Printast.expression 0 Format.err_formatter expr ; *)
             let inner_loc = find_arg_loc args in
             Rule.LintError (meta.ruleDescription, inner_loc)
diff --git a/lib/rules/DisallowedFunctionRule.ml b/lib/rules/DisallowedFunctionRule.ml
index 29f0de4..9319f32 100644
--- a/lib/rules/DisallowedFunctionRule.ml
+++ b/lib/rules/DisallowedFunctionRule.ml
@@ -25,12 +25,13 @@ module Make (OPT : Rule.OPTIONS with type options = Options.options) (LinterOpti
         match expr with
         (* matches string_of_int(x) *)
         | { Parsetree.pexp_desc=
-              Pexp_apply ({pexp_desc= Pexp_ident {txt= Longident.Lident ident}; Parsetree.pexp_loc= loc}, _)
-          }
+              Pexp_apply
+                { funct= {pexp_desc= Pexp_ident {txt= Longident.Lident ident}; Parsetree.pexp_loc= loc}
+                ; args= _ } }
           when ident = function_name ->
             Rule.LintError (meta.ruleDescription, loc)
         (* matches x->string_of_int *)
-        | {Parsetree.pexp_desc= Pexp_apply (_, xs); Parsetree.pexp_loc= loc} -> (
+        | {Parsetree.pexp_desc= Pexp_apply {args= xs; _}; Parsetree.pexp_loc= loc} -> (
             let f expr =
               match expr with
               | Asttypes.Nolabel, {Parsetree.pexp_desc= Pexp_ident {txt= Longident.Lident ident}}
diff --git a/lib/rules/DisallowedOperatorRule.ml b/lib/rules/DisallowedOperatorRule.ml
index c60c293..85c4ffc 100644
--- a/lib/rules/DisallowedOperatorRule.ml
+++ b/lib/rules/DisallowedOperatorRule.ml
@@ -25,8 +25,9 @@ module Make (OPT : Rule.OPTIONS with type options = Options.options) (LinterOpti
         match expr with
         (* matches string_of_int(x) *)
         | { Parsetree.pexp_desc=
-              Pexp_apply ({pexp_desc= Pexp_ident {txt= Longident.Lident ident}; Parsetree.pexp_loc= loc}, _)
-          }
+              Pexp_apply
+                { funct= {pexp_desc= Pexp_ident {txt= Longident.Lident ident}; Parsetree.pexp_loc= loc}
+                ; args= _ } }
           when ident == op ->
             Rule.LintError (meta.ruleDescription, loc)
         | _ -> Rule.LintOk )
diff --git a/lib/rules/NoReactComponentRule.ml b/lib/rules/NoReactComponentRule.ml
index d7bf179..8b436b3 100644
--- a/lib/rules/NoReactComponentRule.ml
+++ b/lib/rules/NoReactComponentRule.ml
@@ -26,20 +26,31 @@ module Make (OPT : Rule.OPTIONS with type options = Options.options) (LinterOpti
     Rule.LintExpression
       (fun expr ->
         match expr with
-        (* Parse React dom like <input /> *)
-        | { Parsetree.pexp_desc= Pexp_apply ({pexp_desc= Pexp_ident {txt= Longident.Lident ident}}, _)
-          ; Parsetree.pexp_attributes= [({Asttypes.txt= "JSX"}, _)]
+        (* Parse React dom like <input /> (unary element) *)
+        | { Parsetree.pexp_desc=
+              Pexp_jsx_element (Jsx_unary_element {jsx_unary_element_tag_name= {txt= JsxLowerTag name; _}; _})
+          ; Parsetree.pexp_loc= loc }
+          when name = disallowed_component_name ->
+            Rule.LintError (meta.ruleDescription, loc)
+        (* Parse React dom like <input>...</input> (container element) *)
+        | { Parsetree.pexp_desc=
+              Pexp_jsx_element
+                (Jsx_container_element {jsx_container_element_tag_name_start= {txt= JsxLowerTag name; _}; _})
+          ; Parsetree.pexp_loc= loc }
+          when name = disallowed_component_name ->
+            Rule.LintError (meta.ruleDescription, loc)
+        (* Parse custom React component like <Component /> (unary element) *)
+        | { Parsetree.pexp_desc=
+              Pexp_jsx_element (Jsx_unary_element {jsx_unary_element_tag_name= {txt= JsxUpperTag path; _}; _})
           ; Parsetree.pexp_loc= loc }
-          when ident = disallowed_component_name ->
-            print_endline ident ;
+          when String.concat "." (Longident.flatten path) = disallowed_component_name ->
             Rule.LintError (meta.ruleDescription, loc)
-        (* Parse custom React component like <Component /> *)
+        (* Parse custom React component like <Component>...</Component> (container element) *)
         | { Parsetree.pexp_desc=
-              Pexp_apply
-                ({pexp_desc= Pexp_ident {txt= Longident.Ldot (Longident.Lident ident, "createElement")}}, _)
-          ; Parsetree.pexp_attributes= [({Asttypes.txt= "JSX"}, _)]
+              Pexp_jsx_element
+                (Jsx_container_element {jsx_container_element_tag_name_start= {txt= JsxUpperTag path; _}; _})
           ; Parsetree.pexp_loc= loc }
-          when ident = disallowed_component_name ->
+          when String.concat "." (Longident.flatten path) = disallowed_component_name ->
             Rule.LintError (meta.ruleDescription, loc)
         | _ -> Rule.LintOk )
 
diff --git a/rescript_linter.opam b/rescript_linter.opam
index 3b84bfa..a0a7644 100644
--- a/rescript_linter.opam
+++ b/rescript_linter.opam
@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.3.3"
+version: "0.4.0"
 synopsis: "AST-based linter for ReScript"
 description: "AST-based linter for ReScript"
 maintainer: ["Shulhi Sapli"]
@@ -11,6 +11,7 @@ bug-reports: "https://github.com/plow-technologies/rescript-linter/issues"
 depends: [
   "dune" {>= "3.14"}
   "yojson"
+  "flow_parser"
   "odoc" {with-doc}
 ]
 build: [
@@ -28,3 +29,6 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/plow-technologies/rescript-linter.git"
+pin-depends: [
+  ["flow_parser.0.267.0" "git+https://github.com/rescript-lang/flow.git#9ea4062c0b7e037415c4413a7634c459ebd5c31b"]
+]
diff --git a/rescript_linter.opam.template b/rescript_linter.opam.template
new file mode 100644
index 0000000..5f168c6
--- /dev/null
+++ b/rescript_linter.opam.template
@@ -0,0 +1,3 @@
+pin-depends: [
+  ["flow_parser.0.267.0" "git+https://github.com/rescript-lang/flow.git#9ea4062c0b7e037415c4413a7634c459ebd5c31b"]
+]
diff --git a/test/dune b/test/dune
index b0ed8df..db99ddf 100644
--- a/test/dune
+++ b/test/dune
@@ -1,5 +1,5 @@
 (test
  (name rescript_linter_test)
- (libraries alcotest rescript_compiler rescript_linter)
+ (libraries alcotest compiler rescript_linter)
  (deps
   (glob_files "testData/*")))
diff --git a/test/rescript_linter_test.ml b/test/rescript_linter_test.ml
index 4230c5c..2333cb2 100644
--- a/test/rescript_linter_test.ml
+++ b/test/rescript_linter_test.ml
@@ -116,7 +116,7 @@ let parseAst path =
   let src = Linter.processFile path in
   (* if you want to target the printer use: let mode = Res_parser.Default in*)
   let p = Res_parser.make ~mode:Res_parser.Default src path in
-  {ast= Res_core.parseImplementation p; comments= p.comments}
+  {ast= Res_core.parse_implementation p; comments= p.comments}
 
 module Tests = struct
   (* The tests *)